From edd2fd5e6334f73ab6abcb3329589b6a4c705d91 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:37:33 +0100
Subject: [PATCH 0001/2040] Renamed aarch64 to arm64

---
 .github/workflows/build-cmake.yml | 2 +-
 TargetArch.cmake                  | 2 +-
 code/qcommon/q_platform.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index ef9e80e3..0c99c3a1 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -22,7 +22,7 @@ jobs:
         architecture: [
           {name: 'amd64',   triple: 'x86_64-linux-gnu'},
           {name: 'i686',    triple: 'i686-linux-gnu'},
-          {name: 'aarch64', triple: 'aarch64-linux-gnu'},
+          {name: 'arm64',   triple: 'aarch64-linux-gnu'},
           {name: 'armhf',   triple: 'arm-linux-gnueabihf'}
         ]
 
diff --git a/TargetArch.cmake b/TargetArch.cmake
index fd4ba8d9..933c1646 100644
--- a/TargetArch.cmake
+++ b/TargetArch.cmake
@@ -22,7 +22,7 @@ set(archdetect_c_code "
 #elif defined __arm__ || defined (_M_ARM)
 #  error cmake_ARCH arm
 #elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
-#  error cmake_ARCH aarch64
+#  error cmake_ARCH arm64
 #elif defined __cris__
 #  error cmake_ARCH cris
 #elif defined __hppa__
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 50f18140..fdf0c25f 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -208,7 +208,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #elif defined __arm__
 #  define ARCH_STRING "arm"
 #elif defined(__aarch64__) || defined(__ARM64__)
-#  define ARCH_STRING "aarch64"
+#  define ARCH_STRING "arm64"
 #elif defined __cris__
 #  define ARCH_STRING "cris"
 #elif defined __hppa__

From ff5b0b760796e5d820e9af004c5f55095adedb2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 19:43:47 +0100
Subject: [PATCH 0002/2040] Added snd_mem_new.c

---
 code/client/CMakeLists.txt |   2 +
 code/client/snd_mem_new.c  | 171 +++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)
 create mode 100644 code/client/snd_mem_new.c

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index babaf736..6bdd9d49 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -31,6 +31,8 @@ if (USE_SOUND_NEW)
 	endif()
 
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")
+	file(GLOB_RECURSE SOURCES_CLIENT_SND "./snd_*_new.c*")
+	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 endif()
 
 if (USE_OPENAL)
diff --git a/code/client/snd_mem_new.c b/code/client/snd_mem_new.c
new file mode 100644
index 00000000..af0ccc19
--- /dev/null
+++ b/code/client/snd_mem_new.c
@@ -0,0 +1,171 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#if USE_SOUND_NEW
+
+#    include "snd_local.h"
+
+byte *data_p;
+byte *iff_end;
+byte *last_chunk;
+byte *iff_data;
+int   iff_chunk_len;
+
+qboolean S_LoadMP3(const char *fileName, sfx_t *sfx);
+
+short int GetLittleShort()
+{
+    union {
+        short value;
+        byte  bytes[2];
+    } val;
+
+#    ifdef Q3_LITTLE_ENDIAN
+    val.bytes[1] = data_p[0];
+    val.bytes[0] = data_p[1];
+#    else
+    val.bytes[0] = data_p[0];
+    val.bytes[1] = data_p[1];
+#    endif
+
+    data_p += sizeof(short);
+    return val.value;
+}
+
+int GetLittleLong()
+{
+    union {
+        int  value;
+        byte bytes[4];
+    } val;
+
+#    ifdef Q3_LITTLE_ENDIAN
+    val.bytes[3] = data_p[0];
+    val.bytes[2] = data_p[1];
+    val.bytes[1] = data_p[2];
+    val.bytes[0] = data_p[3];
+#    else
+    val.bytes[0] = data_p[0];
+    val.bytes[1] = data_p[1];
+    val.bytes[2] = data_p[2];
+    val.bytes[3] = data_p[3];
+#    endif
+
+    data_p += sizeof(int);
+    return val.value;
+}
+
+void SetLittleShort(int i)
+{
+    union {
+        short value;
+        byte  bytes[2];
+    } val;
+
+    val.value = i;
+
+#    ifdef Q3_LITTLE_ENDIAN
+    data_p[0] = val.bytes[1];
+    data_p[1] = val.bytes[0];
+#    else
+    data_p[0] = val.bytes[0];
+    data_p[1] = val.bytes[1];
+#    endif
+
+    data_p += sizeof(short);
+}
+
+void SetLittleLong(int i)
+{
+    union {
+        int  value;
+        byte bytes[2];
+    } val;
+
+    val.value = i;
+
+#    ifdef Q3_LITTLE_ENDIAN
+    data_p[0] = val.bytes[3];
+    data_p[1] = val.bytes[2];
+    data_p[2] = val.bytes[1];
+    data_p[3] = val.bytes[0];
+#    else
+    data_p[0] = val.bytes[0];
+    data_p[1] = val.bytes[1];
+    data_p[2] = val.bytes[2];
+    data_p[3] = val.bytes[3];
+#    endif
+
+    data_p += sizeof(int);
+}
+
+void FindNextChunk(const char *name)
+{
+    // FIXME: unimplemented
+}
+
+void FindChunk(const char *name)
+{
+    // FIXME: unimplemented
+}
+
+void DumpChunks()
+{
+    // FIXME: unimplemented
+}
+
+wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
+{
+    wavinfo_t info;
+    int       samples;
+
+    memset(&info, 0, sizeof(wavinfo_t));
+
+    // FIXME: unimplemented
+    return info;
+}
+
+int DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+int DownSampleWav_MILES(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean force_load)
+{
+    // FIXME: unimplemented
+    return qfalse;
+}
+
+qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
+{
+    // FIXME: unimplemented
+    return qfalse;
+}
+
+#endif

From e936a0b995b3fe6cb627b62112e490aa2a915a3e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 19:44:04 +0100
Subject: [PATCH 0003/2040] Added more declarations

---
 code/client/cl_ui.h            |  1 +
 code/client/snd_local_new.h    | 19 +++++++++++++++++++
 code/client/snd_openal_new.cpp |  2 +-
 code/client/snd_openal_new.h   |  3 ++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 257161a7..329880f0 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -49,6 +49,7 @@ void CL_ShutdownUI(void);
 extern inventory_t client_inv;
 extern bind_t      client_bind;
 extern cvar_t     *cl_greenfps;
+extern qboolean    server_loading;
 
 const char *CvarGetForUI(const char *name, const char *defval);
 void        UI_ClearState(void);
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 8707f56c..f7cf6118 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -130,10 +130,18 @@ typedef struct {
     channelbasesavegame_t Channels[96];
 } soundsystemsavegame_t;
 
+enum sfx_flags_t {
+    SFX_FLAG_DEFAULT_SOUND = 1
+};
+
 // The current sound driver.
 // Currently OPENAL
 #define SOUND_DRIVER OPENAL
 
+//
+// snd_dma_new.cpp
+//
+
 sfx_t *S_FindName(const char *name, int sequenceNumber);
 void   S_DefaultSound(sfx_t *sfx);
 
@@ -141,6 +149,11 @@ void S_LoadData(soundsystemsavegame_t *pSave);
 void S_SaveData(soundsystemsavegame_t *pSave);
 void S_ClearSoundBuffer();
 
+//
+// snd_mem.c
+//
+qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean force_load);
+
 #define S_StopAllSounds2 S_StopAllSounds
 
 //
@@ -150,6 +163,7 @@ void S_ClearSoundBuffer();
 #define S_Call_SndDriverX(driver, func) S_Call_SndDriver(driver, func)
 
 #define S_Driver_Init                   S_Call_SndDriverX(SOUND_DRIVER, Init)
+#define S_Driver_Shutdown               S_Call_SndDriverX(SOUND_DRIVER, Shutdown)
 #define S_Driver_StartSound             S_Call_SndDriverX(SOUND_DRIVER, StartSound)
 #define S_Driver_AddLoopingSound        S_Call_SndDriverX(SOUND_DRIVER, AddLoopingSound)
 #define S_Driver_ClearLoopingSounds     S_Call_SndDriverX(SOUND_DRIVER, ClearLoopingSounds)
@@ -159,6 +173,11 @@ void S_ClearSoundBuffer();
 #define S_Driver_SetReverb              S_Call_SndDriverX(SOUND_DRIVER, SetReverb)
 #define S_Driver_Update                 S_Call_SndDriverX(SOUND_DRIVER, Update)
 
+void S_PrintInfo();
+void S_DumpInfo();
+
+extern cvar_t *s_show_sounds;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index e2146254..caeee87f 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -316,7 +316,7 @@ void S_OPENAL_StopLoopingSounds()
     // FIXME: unimplemented
 }
 
-void S_OPENAL_StopSound(int iEntNum)
+void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
 {
     // FIXME: unimplemented
 }
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index a7b54ace..83648019 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -137,6 +137,7 @@ extern "C" {
 #endif
 
 qboolean S_OPENAL_Init();
+void     S_OPENAL_Shutdown();
 void     S_OPENAL_StartSound(
         const vec3_t vOrigin,
         int          iEntNum,
@@ -159,7 +160,7 @@ void S_OPENAL_AddLoopingSound(
     int          iFlags
 );
 void S_OPENAL_ClearLoopingSounds();
-void S_OPENAL_StopSound(int iEntNum);
+void S_OPENAL_StopSound(int iEntNum, int iEntChannel);
 void S_OPENAL_StopAllSounds(qboolean bStopMusic);
 void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxis[3]);
 void S_OPENAL_SetReverb(int iType, float fLevel);

From 88ccaee5cc176502e3712ccbdb6413c11d1e4d38 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 20:07:26 +0100
Subject: [PATCH 0004/2040] Implemented C++ sound DMA

---
 code/client/snd_dma_new.cpp | 625 ++++++++++++++++++++++++++++++++++--
 1 file changed, 593 insertions(+), 32 deletions(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index f08bb524..00289bc0 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -22,8 +22,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if USE_SOUND_NEW
 
-#include "snd_local.h"
-#include "snd_openal_new.h"
+#    include "snd_local.h"
+#    include "snd_openal_new.h"
+#    include "client.h"
+#    include "cl_ui.h"
 
 typedef struct {
     vec3_t origin;
@@ -70,81 +72,401 @@ cvar_t *s_dialogscale;
 int         numLoopSounds;
 loopSound_t loopSounds[MAX_LOOP_SOUNDS];
 
+/*
+==============
+S_SoundInfo_f
+==============
+*/
 void S_SoundInfo_f()
 {
-    // FIXME: unimplemented
+    S_PrintInfo();
 }
 
+/*
+==============
+S_SoundDump_f
+==============
+*/
 void S_SoundDump_f()
 {
-    // FIXME: unimplemented
+    S_DumpInfo();
 }
 
+/*
+==============
+S_Init
+==============
+*/
 void S_Init(qboolean full_startup)
 {
-    // FIXME: unimplemented
+    int     iStart, iEnd;
+    cvar_t *cv;
+
+    Com_Printf("------- Sound Initialization (%s) -------\n", full_startup ? "full" : "partial");
+
+    iStart = Sys_Milliseconds();
+
+    s_volume         = Cvar_Get("s_volume", "0.9", CVAR_ARCHIVE);
+    s_musicVolume    = Cvar_Get("s_musicvolume", "0.9", CVAR_ARCHIVE);
+    s_ambientVolume  = Cvar_Get("s_ambientvolume", "1.00", CVAR_ARCHIVE);
+    s_separation     = Cvar_Get("s_separation", "0.5", CVAR_ARCHIVE);
+    s_khz            = Cvar_Get("s_khz", "11", CVAR_ARCHIVE | CVAR_SOUND_LATCH);
+    s_loadas8bit     = Cvar_Get("s_loadas8bit", "0", CVAR_ARCHIVE | CVAR_LATCH);
+    s_mixPreStep     = Cvar_Get("s_mixPreStep", "0.05", CVAR_ARCHIVE);
+    s_show           = Cvar_Get("s_show", "0", CVAR_CHEAT);
+    s_testsound      = Cvar_Get("s_testsound", "0", CVAR_CHEAT);
+    s_dialogscale    = Cvar_Get("s_dialogscale", "1", CVAR_ARCHIVE);
+    s_bLastInitSound = false;
+
+    cv = Cvar_Get("s_initsound", "1", 0);
+
+    if (cv->integer) {
+        Cmd_AddCommand("play", S_Play);
+        Cmd_AddCommand("soundlist", S_SoundList);
+        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
+        Cmd_AddCommand("sounddump", S_SoundDump_f);
+
+        if (S_Driver_Init()) {
+            s_bLastInitSound = true;
+            s_bSoundStarted  = true;
+
+            if (full_startup) {
+                s_numSfx = 0;
+                S_StopAllSounds(true);
+            }
+
+            S_FindName("***DEFAULT***", -1);
+            S_SoundInfo_f();
+        }
+    } else {
+        Com_Printf("Sound Not Initializing.\n");
+        s_bSoundStarted = 0;
+    }
+
+    iEnd = Sys_Milliseconds();
+    Com_Printf("------- Sound Initialization Complete ------- %i ms\n", iEnd - iStart);
 }
 
+/*
+==============
+S_Shutdown
+==============
+*/
 void S_Shutdown(qboolean full_shutdown)
 {
-    // FIXME: unimplemented
+    int    i;
+    sfx_t *sfx;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    Com_Printf("------- Sound Shutdown (%s) -------\n", full_shutdown ? "full" : "partial");
+
+    S_Driver_Shutdown();
+    s_bSoundStarted = false;
+
+    Cmd_RemoveCommand("play");
+    Cmd_RemoveCommand("music");
+    Cmd_RemoveCommand("stopsound");
+    Cmd_RemoveCommand("soundlist");
+    Cmd_RemoveCommand("soundinfo");
+
+    if (full_shutdown) {
+        for (i = 0; i < s_numSfx; i++) {
+            sfx = &s_knownSfx[i];
+
+            if (sfx->name[0]) {
+                if (sfx->data) {
+                    Z_Free(sfx->data);
+                }
+
+                *sfx = {};
+            }
+        }
+
+        s_numSfx = 0;
+    }
+
+    Com_Printf("------- Sound Shutdown Complete -------\n");
 }
 
+/*
+==============
+S_NameExists
+==============
+*/
 qboolean S_NameExists(const char *name)
 {
-    // FIXME: unimplemented
+    int i;
+
+    if (strlen(name) >= MAX_RES_NAME) {
+        Com_DPrintf("Sound name too long: %s", name);
+        return qfalse;
+    }
+
+    for (i = 0; i < s_numSfx; i++) {
+        if (!strcmp(s_knownSfx[i].name, name)) {
+            return qtrue;
+        }
+    }
+
     return qfalse;
 }
 
+/*
+==============
+S_FindName
+==============
+*/
 sfx_t *S_FindName(const char *name, int sequenceNumber)
 {
-    // FIXME: unimplemented
-    return NULL;
+    int    i;
+    sfx_t *sfx;
+
+    if (!name) {
+        Com_DPrintf("S_FindName: NULL\n");
+        return NULL;
+    }
+
+    if (!name[0]) {
+        Com_DPrintf("S_FindName: empty name\n");
+        return NULL;
+    }
+
+    if (strlen(name) >= MAX_RES_NAME) {
+        Com_DPrintf("Sound name too long: %s", name);
+        return NULL;
+    }
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+
+        if (!strcmp(sfx->name, name)) {
+            if (sfx->registration_sequence != -1) {
+                sfx->registration_sequence = sequenceNumber;
+            }
+
+            return sfx;
+        }
+    }
+
+    sfx = &s_knownSfx[0];
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+        if (!sfx->name[0]) {
+            break;
+        }
+    }
+
+    if (i == s_numSfx) {
+        if (i == MAX_SFX) {
+            Com_Error(ERR_FATAL, "S_FindName: out of sfx_t");
+        }
+
+        s_numSfx++;
+    }
+
+    *sfx = {};
+    // Fixed in OPM
+    //  strcpy was used before
+    //strcpy(sfx->name, name);
+    Q_strncpyz(sfx->name, name, sizeof(sfx->name));
+    sfx->registration_sequence = sequenceNumber;
+
+    return sfx;
 }
 
+/*
+==============
+S_BeginRegistration
+==============
+*/
 void S_BeginRegistration()
 {
-    // FIXME: unimplemented
+    Com_Printf("------- Sound Begin Registration -------\n");
+
+    S_StopAllSounds(true);
+
+    ++s_registrationSequence;
+    s_inRegistration                    = true;
+    s_knownSfx[0].registration_sequence = s_registrationSequence;
+
+    Com_Printf("------- Sound Begin Registration Complete -------\n");
 }
 
+/*
+==============
+S_DefaultSound
+==============
+*/
 void S_DefaultSound(sfx_t *sfx)
 {
-    // FIXME: unimplemented
+    sfx->data = NULL;
+    sfx->iFlags |= SFX_FLAG_DEFAULT_SOUND;
 }
 
+/*
+==============
+S_IsSoundRegistered
+==============
+*/
 qboolean S_IsSoundRegistered(const char *name)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    char szCacheName[MAX_QPATH];
+    int  i;
+
+    if (!s_bSoundStarted) {
+        return qfalse;
+    }
+
+    for (i = 0; name[i] && i < MAX_QPATH; i++) {
+        szCacheName[i] = tolower(name[i]);
+    }
+    szCacheName[i] = 0;
+
+    if (i >= MAX_QPATH) {
+        Com_Printf("Sound name exceeds MAX_QPATH\n");
+        return qfalse;
+    }
+
+    return S_NameExists(szCacheName);
 }
 
+/*
+==============
+S_RegisterSound
+==============
+*/
 sfxHandle_t S_RegisterSound(const char *name, int streamed, qboolean force_load)
 {
-    // FIXME: unimplemented
-    return 0;
+    char   szCacheName[MAX_QPATH];
+    sfx_t *sfx;
+    int    i;
+
+    if (!s_bSoundStarted) {
+        Com_Printf("ERROR:  Trying to register sound %s when soundsystem hasn't started.\n", name);
+        return 0;
+    }
+
+    if (!name) {
+        return 0;
+    }
+
+    for (i = 0; name[i] && i < MAX_QPATH; i++) {
+        szCacheName[i] = tolower(name[i]);
+    }
+    szCacheName[i] = 0;
+
+    if (i >= MAX_QPATH) {
+        Com_Printf("Sound name exceeds MAX_QPATH\n");
+        return 0;
+    }
+
+    sfx = S_FindName(szCacheName, s_registrationSequence);
+    if (!sfx) {
+        return 0;
+    }
+
+    if (!sfx->data) {
+        if (!S_LoadSound(sfx->name, sfx, streamed, force_load)) {
+            Com_DPrintf("Couldn't load sound: %s\n", sfx->name);
+            if (!S_LoadSound("sound/default.wav", sfx, streamed, 0)) {
+                Com_DPrintf("Couldn't load sound: sound/default.wav\n");
+                sfx->iFlags |= SFX_FLAG_DEFAULT_SOUND;
+                return 0;
+            }
+        }
+
+        sfx->iFlags &= ~SFX_FLAG_DEFAULT_SOUND;
+        sfx->sfx_info_index = 0;
+
+        for (i = 0; i < number_of_sfx_infos; i++) {
+            if (!Q_stricmp(sfx->name, sfx_infos[i].name)) {
+                sfx->sfx_info_index = i;
+                break;
+            }
+        }
+    }
+
+    return sfx - s_knownSfx;
 }
 
+/*
+==============
+S_GetSoundTime
+==============
+*/
 float S_GetSoundTime(sfxHandle_t handle)
 {
-    // FIXME: unimplemented
-    return 0;
+    return s_knownSfx[handle].time_length;
 }
 
+/*
+==============
+S_EndRegistration
+==============
+*/
 void S_EndRegistration()
 {
-    // FIXME: unimplemented
+    int    i;
+    sfx_t *sfx;
+
+    Com_Printf("------- Sound End Registration -------\n");
+    s_inRegistration = qfalse;
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+
+        if (!sfx->name[0]) {
+            continue;
+        }
+
+        if (sfx->registration_sequence && sfx->registration_sequence != s_registrationSequence) {
+            if (sfx->data) {
+                Z_Free(sfx->data);
+            }
+
+            *sfx = {};
+        }
+    }
+
+    Com_Printf("------- Sound End Registration Complete -------\n");
 }
 
+/*
+==============
+S_UpdateEntity
+==============
+*/
 void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t vel, qboolean use_listener)
 {
-    // FIXME: unimplemented
+    if (entityNum > MAX_GENTITIES) {
+        Com_Error(ERR_DROP, "S_UpdateEntityPosition: bad entitynum %i", entityNum);
+    }
+
+    VectorCopy(origin, s_entity[entityNum].position);
+    VectorCopy(vel, s_entity[entityNum].velocity);
+    s_entity[entityNum].use_listener = use_listener;
+    s_entity[entityNum].time         = cl.serverTime;
 }
 
+/*
+==============
+S_SetGlobalAmbientVolumeLevel
+==============
+*/
 void S_SetGlobalAmbientVolumeLevel(float volume)
 {
-    // FIXME: unimplemented
+    s_fAmbientVolume = volume;
 }
 
+/*
+==============
+S_StartSound
+==============
+*/
 void S_StartSound(
     const vec3_t origin,
     int          entnum,
@@ -157,29 +479,171 @@ void S_StartSound(
     int          streamed
 )
 {
-    // FIXME: unimplemented
+    if (s_show_sounds->integer > 0 && sfxHandle > 0 && sfxHandle < s_numSfx) {
+        Com_DPrintf("S_StartSound: %s\n", s_knownSfx[sfxHandle].name);
+    }
+
+    if (!s_bSoundStarted) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("^~^~^ sound system not yet started\n");
+        }
+        return;
+    }
+
+    if (server_loading) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("^~^~^ cannot start sounds while loading a server\n");
+        }
+        return;
+    }
+
+    if (sfxHandle < 0 || sfxHandle >= s_numSfx) {
+        Com_Error(ERR_DROP, "S_StartSound: handle %i out of range", sfxHandle);
+    }
+
+    if (!sfxHandle) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("^~^~^ null handle\n");
+        }
+        return;
+    }
+
+    if (entnum && (entchannel == CHAN_DIALOG || entchannel == CHAN_DIALOG_SECONDARY) && s_dialogscale->value > 0) {
+        volume *= s_dialogscale->value;
+    }
+
+    S_Driver_StartSound(origin, entnum, entchannel, sfxHandle, volume, min_dist, pitch, maxDist, streamed);
 }
 
+/*
+==============
+S_StartLocalSound
+==============
+*/
 void S_StartLocalSound(const char *sound_name, qboolean force_load)
 {
-    // FIXME: unimplemented
+    sfxHandle_t      sfxHandle;
+    const char      *name;
+    AliasListNode_t *pSoundAlias;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!sound_name) {
+        return;
+    }
+
+    name = Alias_FindRandom(sound_name, &pSoundAlias);
+    if (!name) {
+        name = sound_name;
+    }
+
+    sfxHandle = S_RegisterSound(name, pSoundAlias ? pSoundAlias->streamed : qfalse, force_load);
+
+    if (!pSoundAlias) {
+        S_StartSound(NULL, s_iListenerNumber, CHAN_MENU, sfxHandle, -1.0, -1.0, 1.0, -1.0, qfalse);
+        return;
+    }
+
+    S_StartSound(
+        0,
+        s_iListenerNumber,
+        CHAN_MENU,
+        sfxHandle,
+        pSoundAlias->volume + random() * pSoundAlias->volumeMod,
+        -1.0,
+        pSoundAlias->pitch + random() * pSoundAlias->pitchMod,
+        pSoundAlias->maxDist,
+        pSoundAlias->streamed
+    );
 }
 
+/*
+==============
+S_StartLocalSoundChannel
+
+Added in 2.0
+Starts a local sound, with the specified channel
+==============
+*/
 void S_StartLocalSoundChannel(const char *sound_name, qboolean force_load, soundChannel_t channel)
 {
-    // FIXME: unimplemented
+    sfxHandle_t      sfxHandle;
+    const char      *name;
+    AliasListNode_t *pSoundAlias;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!sound_name) {
+        return;
+    }
+
+    name = Alias_FindRandom(sound_name, &pSoundAlias);
+    if (!name) {
+        name = sound_name;
+    }
+
+    sfxHandle = S_RegisterSound(name, pSoundAlias ? pSoundAlias->streamed : qfalse, force_load);
+
+    if (!pSoundAlias) {
+        S_StartSound(NULL, s_iListenerNumber, channel, sfxHandle, -1.0, -1.0, 1.0, -1.0, qfalse);
+        return;
+    }
+
+    S_StartSound(
+        0,
+        s_iListenerNumber,
+        channel,
+        sfxHandle,
+        pSoundAlias->volume + random() * pSoundAlias->volumeMod,
+        -1.0,
+        pSoundAlias->pitch + random() * pSoundAlias->pitchMod,
+        pSoundAlias->maxDist,
+        pSoundAlias->streamed
+    );
 }
 
+/*
+==============
+S_StopAllSounds
+==============
+*/
 void S_StopAllSounds(qboolean stop_music)
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    Com_Printf("------- S_StopAllSounds (%s) -------\n", stop_music ? "stop music" : "don't stop music");
+
+    // Tell the driver to stop all sounds
+    S_Driver_StopAllSounds(stop_music);
+
+    Com_Printf("------- S_StopAllSounds Complete-------\n");
 }
 
+/*
+==============
+S_ClearLoopingSounds
+==============
+*/
 void S_ClearLoopingSounds()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_ClearLoopingSounds();
 }
 
+/*
+==============
+S_AddLoopingSound
+==============
+*/
 void S_AddLoopingSound(
     const vec3_t origin,
     const vec3_t velocity,
@@ -191,39 +655,136 @@ void S_AddLoopingSound(
     int          flags
 )
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (sfxHandle < 0 || sfxHandle >= s_numSfx) {
+        Com_Error(ERR_DROP, "S_AddLoopingSound: handle %i out of range", sfxHandle);
+    }
+
+    if (!sfxHandle) {
+        return;
+    }
+
+    S_Driver_AddLoopingSound(origin, velocity, sfxHandle, volume, min_dist, max_dist, pitch, flags);
 }
 
+/*
+==============
+S_Respatialize
+==============
+*/
 void S_Respatialize(int entityNum, const vec3_t head, vec3_t axis[3])
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_Respatialize(entityNum, head, axis);
 }
 
+/*
+==============
+S_Update
+==============
+*/
 void S_Update()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (server_loading) {
+        return;
+    }
+
+    S_Driver_Update();
 }
 
+/*
+==============
+S_StopSound
+==============
+*/
 void S_StopSound(int entnum, int channel)
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (channel == CHAN_AUTO) {
+        return;
+    }
+
+    S_Driver_StopSound(entnum, channel);
 }
 
+/*
+==============
+S_SetReverb
+==============
+*/
 void S_SetReverb(int reverb_type, float reverb_level)
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_SetReverb(reverb_type, reverb_level);
 }
 
+/*
+==============
+S_Play
+==============
+*/
 void S_Play()
 {
-    // FIXME: unimplemented
+    int  i;
+    char name[MAX_QPATH];
+
+    for (i = 1; i < Cmd_Argc(); i++) {
+        if (strrchr(Cmd_Argv(i), '.')) {
+            Q_strncpyz(name, Cmd_Argv(i), sizeof(name));
+        } else {
+            Com_sprintf(name, sizeof(name), "%s.wav", Cmd_Argv(1));
+        }
+    }
+
+    S_StartLocalSound(name, qfalse);
 }
 
+/*
+==============
+S_SoundList
+==============
+*/
 void S_SoundList()
 {
-    // FIXME: unimplemented
+    int    i;
+    sfx_t *sfx;
+    int    size;
+    int    total = 0;
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+
+        if (sfx->registration_sequence) {
+            size = sfx->length * sfx->width;
+            total += size;
+            Com_Printf("(%2db) %6i : %s\n", sfx->width * 8, size, sfx->name);
+        }
+    }
+
+    Com_Printf("Total resident: %i\n", total);
 }
 
+/*
+==============
+S_ClearSoundBuffer
+==============
+*/
 void S_ClearSoundBuffer()
 {
     // TODO: Remove once AL is fully implemented

From 09ad42ba478a0800070ef7712dcb4c5aa2580fa7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:56:26 +0100
Subject: [PATCH 0005/2040] Fixed players not being able to use while firing,
 below 2.0

---
 code/fgame/player.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index f94913bf..5b524fa0 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3433,12 +3433,14 @@ void Player::DoUse(Event *ev)
         return;
     }
 
-    if ((buttons & BUTTON_ATTACKLEFT) || (buttons & BUTTON_ATTACKRIGHT)) {
-        //
-        // Added in 2.0
-        //  Only allow use if the player isn't holding attack buttons
-        //
-        return;
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        if ((buttons & BUTTON_ATTACKLEFT) || (buttons & BUTTON_ATTACKRIGHT)) {
+            //
+            // Added in 2.0
+            //  Only allow use if the player isn't holding attack buttons
+            //
+            return;
+        }
     }
 
     num = getUseableEntities(touch, MAX_GENTITIES, true);

From 2e10a96d11be296ebc1885d529706b49cae6b265 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:05:21 +0100
Subject: [PATCH 0006/2040] Crosshair must always be shown in 1.11 and below
 regardless of the property

---
 code/fgame/weapon.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index f6921757..a4336227 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -4149,6 +4149,11 @@ void Weapon::FallingAngleAdjust(Event *ev)
 //======================
 qboolean Weapon::GetUseCrosshair() const
 {
+    if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+        // Always show the crosshair in 1.11 and below
+        return qtrue;
+    }
+
     if (m_fMaxFireMovement >= 1.f) {
         return crosshair;
     }

From 5c4c14a17d38de15dd7296546e9e915cd1291e41 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:15:09 +0100
Subject: [PATCH 0007/2040] Added SFX flags

---
 code/client/snd_local_new.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index f7cf6118..7c128643 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
+extern cvar_t *s_khz;
+
 typedef struct {
     int   format;
     float rate;
@@ -131,7 +133,10 @@ typedef struct {
 } soundsystemsavegame_t;
 
 enum sfx_flags_t {
-    SFX_FLAG_DEFAULT_SOUND = 1
+    SFX_FLAG_DEFAULT_SOUND = 1,
+    SFX_FLAG_MP3           = 2,
+    SFX_FLAG_NO_DATA       = 4,
+    SFX_FLAG_NO_OFFSET     = 8,
 };
 
 // The current sound driver.

From 028489d673171d73dcfc24a88dce68364da6163e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:15:12 +0100
Subject: [PATCH 0008/2040] Implemented snd_mem_new.c

---
 code/client/snd_mem_new.c | 395 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 383 insertions(+), 12 deletions(-)

diff --git a/code/client/snd_mem_new.c b/code/client/snd_mem_new.c
index af0ccc19..b9eee6c6 100644
--- a/code/client/snd_mem_new.c
+++ b/code/client/snd_mem_new.c
@@ -32,6 +32,11 @@ int   iff_chunk_len;
 
 qboolean S_LoadMP3(const char *fileName, sfx_t *sfx);
 
+/*
+==============
+GetLittleShort
+==============
+*/
 short int GetLittleShort()
 {
     union {
@@ -51,6 +56,11 @@ short int GetLittleShort()
     return val.value;
 }
 
+/*
+==============
+GetLittleLong
+==============
+*/
 int GetLittleLong()
 {
     union {
@@ -74,6 +84,11 @@ int GetLittleLong()
     return val.value;
 }
 
+/*
+==============
+SetLittleShort
+==============
+*/
 void SetLittleShort(int i)
 {
     union {
@@ -94,6 +109,11 @@ void SetLittleShort(int i)
     data_p += sizeof(short);
 }
 
+/*
+==============
+SetLittleLong
+==============
+*/
 void SetLittleLong(int i)
 {
     union {
@@ -118,21 +138,83 @@ void SetLittleLong(int i)
     data_p += sizeof(int);
 }
 
+/*
+==============
+FindNextChunk
+==============
+*/
 void FindNextChunk(const char *name)
 {
-    // FIXME: unimplemented
+    int value;
+
+    while (1) {
+        data_p = last_chunk;
+
+        if (last_chunk >= (byte *)iff_end) {
+            break;
+        }
+
+        data_p = last_chunk + 4;
+        value  = GetLittleLong();
+
+        iff_chunk_len = value;
+        if (value < 0) {
+            break;
+        }
+
+        data_p -= 8;
+        value++;
+        value &= ~1;
+
+        last_chunk = data_p + value * 8;
+        if (!strncmp((const char *)data_p, name, 4u)) {
+            return;
+        }
+    }
+
+    data_p = NULL;
 }
 
+/*
+==============
+FindChunk
+==============
+*/
 void FindChunk(const char *name)
 {
-    // FIXME: unimplemented
+    last_chunk = iff_data;
+    FindNextChunk(name);
 }
 
+/*
+==============
+DumpChunks
+==============
+*/
 void DumpChunks()
 {
-    // FIXME: unimplemented
+    char str[5];
+
+    str[4] = 0;
+
+    data_p = iff_data;
+    do {
+        memcpy(str, data_p, 4);
+        data_p += 4;
+
+        iff_chunk_len = GetLittleLong();
+
+        Com_Printf("0x%x : %s (%d)\n", data_p - 4, str, iff_chunk_len);
+
+        data_p += (iff_chunk_len + 1) & ~1;
+    } while (data_p < (byte *)iff_end);
 }
 
+/*
+==============
+GetWavinfo
+==============
+*/
 wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
 {
     wavinfo_t info;
@@ -140,32 +222,321 @@ wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
 
     memset(&info, 0, sizeof(wavinfo_t));
 
-    // FIXME: unimplemented
+    if (!wav) {
+        return info;
+    }
+
+    iff_data = wav;
+    iff_end  = &wav[wavlength];
+    FindChunk("RIFF");
+
+    if (!data_p || strncmp((const char *)data_p + 8, "WAVE", 4u)) {
+        Com_Printf("Missing RIFF/WAVE chunks\n");
+        return info;
+    }
+
+    iff_data = data_p + 12;
+    FindChunk("fmt ");
+    if (!data_p) {
+        Com_Printf("Missing fmt chunk\n");
+        return info;
+    }
+
+    data_p += 8;
+
+    info.format = GetLittleShort();
+    if (info.format == 17) {
+        info.channels = GetLittleShort();
+        info.rate     = (float)GetLittleLong();
+        data_p += 6;
+        info.width = (float)GetLittleShort() / 8.f;
+        data_p += 2;
+
+        FindChunk("data");
+        if (!data_p) {
+            Com_Printf("Missing data chunk\n");
+            return info;
+        }
+
+        data_p += 4;
+        if (info.width >= 1.0) {
+            samples = (int)((float)GetLittleLong() / info.width);
+        } else {
+            samples = (int)((float)GetLittleLong() * info.width);
+        }
+
+        if (!info.samples) {
+            info.samples = samples;
+        } else if (samples < info.samples) {
+            Com_Error(ERR_DROP, "Sound %s has a bad loop length", name);
+        }
+
+        info.dataofs = 0;
+    } else if (info.format == 1) {
+        info.channels = GetLittleShort();
+        info.rate     = (float)GetLittleLong();
+        data_p += 6;
+        info.width = (float)(GetLittleShort() / 8);
+
+        FindChunk("data");
+        if (!data_p) {
+            Com_Printf("Missing data chunk\n");
+            return info;
+        }
+
+        data_p += 4;
+        samples = (float)GetLittleLong() / info.width;
+
+        if (!info.samples) {
+            info.samples = samples;
+        } else if (samples < info.samples) {
+            Com_Error(ERR_DROP, "Sound %s has a bad loop length", name);
+        }
+
+        info.dataofs = data_p - wav;
+    } else {
+        Com_Printf("Microsoft PCM format only\n");
+        return info;
+    }
+
+    info.datasize = iff_chunk_len;
+
     return info;
 }
 
-int DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
+/*
+==============
+DownSampleWav
+==============
+*/
+qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
 {
-    // FIXME: unimplemented
-    return 0;
+    int newdatasize;
+    byte* datap;
+    int i;
+    int ii;
+    int error;
+    int width;
+    int oldsamples;
+    int oldrate;
+
+    newdatasize = 0;
+    datap = &wav[info->dataofs];
+
+    if (info->channels > 1)
+    {
+        Com_DPrintf("Could not downsample WAV file. Stereo WAVs not supported!\n");
+        return 0;
+    }
+
+    if (info->format != 1 || !info->dataofs)
+    {
+        Com_DPrintf("Could not downsample WAV file. Not PCM format!\n");
+        return 0;
+    }
+
+    if (info->rate <= newkhz) {
+        return 0;
+    }
+
+    error = 0;
+    width = info->width;
+    for (i = 0; i < info->samples; i++) {
+        error += newkhz;
+        while (error > info->rate) {
+            error -= info->rate;
+            newdatasize += width;
+        }
+    }
+
+    oldsamples = info->samples;
+    oldrate = info->rate;
+    info->samples = newdatasize / width;
+    info->rate = (float)newkhz;
+    newdatasize += info->dataofs;
+
+    *newdata = Z_TagMalloc(newdatasize, TAG_SOUND);
+    memcpy(*newdata, wav, info->dataofs);
+
+    iff_data = *newdata;
+    iff_end = *newdata + newdatasize;
+    FindChunk("RIFF");
+
+    if (!data_p || strncmp((const char*)data_p + 8, "WAVE", 4u))
+    {
+        Com_DPrintf("Missing RIFF/WAVE chunks\n");
+        return 0;
+    }
+
+    iff_data = data_p + 12;
+    FindChunk("fmt ");
+    if (!data_p)
+    {
+        Com_DPrintf("Missing fmt chunk\n");
+        return 0;
+    }
+
+    data_p += 12;
+    SetLittleShort((int)info->rate);
+    data_p += 8;
+
+    FindChunk("data");
+    if (!data_p)
+    {
+        Com_DPrintf("Missing data chunk\n");
+        return 0;
+    }
+
+    data_p += 4;
+    SetLittleLong((int)(info->samples * info->width));
+
+    error = 0;
+    for (i = 0; i < oldsamples; i++) {
+        error += newkhz;
+        while (error > oldrate) {
+            error -= oldrate;
+            for (ii = 0; ii < width; i++) {
+                data_p[ii] = datap[ii];
+            }
+
+            data_p += width;
+        }
+
+        datap += width;
+    }
+
+    return newdatasize;
 }
 
+/*
+==============
+DownSampleWav_MILES
+==============
+*/
 int DownSampleWav_MILES(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
 {
-    // FIXME: unimplemented
+    STUB_DESC("sound stuff");
     return 0;
 }
 
+/*
+==============
+S_LoadSound
+==============
+*/
 qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean force_load)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    int size;
+    fileHandle_t file_handle;
+    char tempName[MAX_RES_NAME + 1];
+    int realKhz;
+
+    sfx->buffer = NULL;
+
+    if (fileName[0] == '*') {
+        return qfalse;
+    }
+
+    if (strstr(fileName, ".mp3")) {
+        return S_LoadMP3(fileName, sfx);
+    }
+
+    size = FS_FOpenFileRead(fileName, &file_handle, qfalse, qtrue);
+    if (size <= 0)
+    {
+        if (file_handle) {
+            FS_FCloseFile(file_handle);
+        }
+        return qfalse;
+    }
+
+    sfx->data = Z_TagMalloc(size, TAG_SOUND);
+
+    FS_Read(sfx->data, size, file_handle);
+    FS_FCloseFile(file_handle);
+    sfx->info = GetWavinfo(fileName, sfx->data, size);
+
+    if (sfx->info.channels != 1)
+    {
+        Com_Printf("%s is a stereo wav file\n", fileName);
+        Z_Free(sfx->data);
+        sfx->data = NULL;
+        return qfalse;
+    }
+
+    if (!sfx->info.dataofs) {
+        sfx->iFlags |= SFX_FLAG_NO_OFFSET;
+    }
+
+    realKhz = 11025;
+
+    if (s_khz->integer != 11)
+    {
+        realKhz = 22050;
+        if (s_khz->integer == 44) {
+            realKhz = 44100;
+        }
+    }
+
+    if (!(sfx->iFlags & SFX_FLAG_NO_DATA) && realKhz < sfx->info.rate) {
+        byte* newdata;
+        int newdatasize;
+
+        newdata = NULL;
+        if (sfx->iFlags & SFX_FLAG_NO_OFFSET) {
+            newdatasize = DownSampleWav_MILES(&sfx->info, sfx->data, size, realKhz, &newdata);
+        } else {
+            newdatasize = DownSampleWav(&sfx->info, sfx->data, size, realKhz, &newdata);
+        }
+
+        if (newdatasize) {
+            Z_Free(sfx->data);
+            sfx->data = newdata;
+        }
+    }
+
+    sfx->length = sfx->info.samples;
+    sfx->width = sfx->info.width;
+    sfx->time_length = sfx->info.samples / sfx->info.rate * 1000.f;
+
+    if (sfx->iFlags & SFX_FLAG_NO_DATA) {
+        Z_Free(sfx->data);
+        sfx->data = NULL;
+    }
+
+    sprintf(tempName, "k%s", fileName);
+    UI_LoadResource(tempName);
+    return qtrue;
 }
 
+/*
+==============
+S_LoadMP3
+==============
+*/
 qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    int length;
+    fileHandle_t file_handle;
+
+    length = FS_FOpenFileRead(fileName, &file_handle, 0, 1);
+    if (length <= 0) {
+        if (file_handle) {
+            FS_FCloseFile(file_handle);
+        }
+        return qfalse;
+    }
+
+    memset(&sfx->info, 0, sizeof(sfx->info));
+    sfx->data = Z_TagMalloc(length, TAG_SOUND);
+    sfx->length = length;
+    sfx->width = 1;
+    FS_Read(sfx->data, length, file_handle);
+    FS_FCloseFile(file_handle);
+
+    sfx->iFlags |= SFX_FLAG_MP3;
+
+    return qtrue;
 }
 
 #endif

From 8b85e4e0756fc751f9c3570ff55b0499011633e6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:25:41 +0100
Subject: [PATCH 0009/2040] Export number_of_sfx_infos and sfx_infos

---
 code/client/snd_dma_new.cpp | 4 ----
 code/client/snd_local_new.h | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index 00289bc0..35c78787 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -34,10 +34,6 @@ typedef struct {
     int    mergeFrame;
 } loopSound_t;
 
-#    define MAX_SFX         1400
-#    define MAX_SFX_INFOS   1000
-#    define MAX_LOOP_SOUNDS 64
-
 qboolean s_bLastInitSound  = qfalse;
 qboolean s_bSoundStarted   = qfalse;
 qboolean s_bSoundPaused    = qfalse;
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 7c128643..a3412466 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -139,6 +139,13 @@ enum sfx_flags_t {
     SFX_FLAG_NO_OFFSET     = 8,
 };
 
+#define MAX_SFX         1400
+#define MAX_SFX_INFOS   1000
+#define MAX_LOOP_SOUNDS 64
+
+extern int        number_of_sfx_infos;
+extern sfx_info_t sfx_infos[];
+
 // The current sound driver.
 // Currently OPENAL
 #define SOUND_DRIVER OPENAL

From 71dba1b7dc530a92f2614616bb6ca086eaf61118 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:25:48 +0100
Subject: [PATCH 0010/2040] Added snd_info.cpp

---
 code/client/snd_info.cpp | 99 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 code/client/snd_info.cpp

diff --git a/code/client/snd_info.cpp b/code/client/snd_info.cpp
new file mode 100644
index 00000000..6cbdc02b
--- /dev/null
+++ b/code/client/snd_info.cpp
@@ -0,0 +1,99 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#if USE_SOUND_NEW
+
+#    include "snd_local.h"
+#    include "../qcommon/tiki.h"
+
+void load_sfx_info()
+{
+    TikiScript  tiki;
+    const char *token;
+    int         current_sound_file;
+    char        file_name[MAX_QPATH];
+
+    sfx_infos[0].name[0]            = 0;
+    sfx_infos[0].max_factor         = -1.0;
+    sfx_infos[0].loop_start         = -1;
+    sfx_infos[0].loop_end           = -1;
+    sfx_infos[0].max_number_playing = 5;
+    number_of_sfx_infos             = 1;
+
+    for (current_sound_file = 0; current_sound_file < 10; current_sound_file++) {
+        Com_sprintf(file_name, sizeof(file_name), "global/sound%d.txt", current_sound_file);
+
+        if (!tiki.LoadFile(file_name, qtrue)) {
+            continue;
+        }
+
+        Com_Printf("Loading %s\n", file_name);
+
+        while (tiki.TokenAvailable(qtrue)) {
+            token = tiki.GetToken(qtrue);
+
+            if (!Q_stricmp(token, "sound")) {
+                if (tiki.TokenAvailable(qtrue)) {
+                    token = tiki.GetToken(qtrue);
+
+                    if (number_of_sfx_infos == 1000) {
+                        Com_DPrintf("Too many sound infos specified\n");
+                        break;
+                    }
+
+                    Q_strncpyz(sfx_infos[number_of_sfx_infos].name, token, sizeof(sfx_infos[number_of_sfx_infos].name));
+                    sfx_infos[number_of_sfx_infos].max_factor         = -1.f;
+                    sfx_infos[number_of_sfx_infos].loop_start         = -1;
+                    sfx_infos[number_of_sfx_infos].loop_end           = -1;
+                    sfx_infos[number_of_sfx_infos].max_number_playing = 5;
+                    number_of_sfx_infos++;
+                }
+            } else if (!Q_stricmp(token, "loopstart")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                         = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].loop_start = atoi(token);
+                }
+            } else if (!Q_stricmp(token, "loopend")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                       = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].loop_end = atoi(token);
+                }
+            } else if (!Q_stricmp(token, "maxnumber")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                                 = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].max_number_playing = atoi(token);
+                }
+            } else if (!Q_stricmp(token, "maxfactor")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                         = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].max_factor = atoi(token);
+                }
+            }
+        }
+    }
+
+    tiki.Close();
+
+    sfx_infos[0].name[0] = 0;
+}
+
+#endif

From aac9dd40def57cf7f762cd9d7e1fc99aade0a758 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:27:51 +0100
Subject: [PATCH 0011/2040] Add USE_OPENAL=1 definition when USE_SOUND_NEW is
 defined

---
 code/client/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index 6bdd9d49..af694882 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -9,6 +9,7 @@ file(GLOB_RECURSE SOURCES_UILIB "../uilib/*.c*")
 # Made as an interface and not static, as static only links used methods
 add_library(omohclient INTERFACE)
 target_compile_definitions(omohclient INTERFACE APP_MODULE)
+target_compile_definitions(omohclient INTERFACE USE_OPENAL_DLOPEN=1)
 target_compile_features(omohclient INTERFACE cxx_nullptr)
 target_compile_features(omohclient INTERFACE c_variadic_macros)
 target_link_libraries(omohclient INTERFACE omohsdl)
@@ -21,7 +22,7 @@ if (USE_SOUND_NEW)
 	# Try to use OpenAL
 	find_package(OpenAL)
 	if (OPENAL_FOUND)
-		target_compile_definitions(omohclient INTERFACE USE_SOUND_NEW=1)
+		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1 USE_SOUND_NEW=1)
 		if (MSVC)
 			target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR}/AL)
 		else()

From 46aa58d0cd5c4da10c9e24c7d602ea41f0ec79d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:28:01 +0100
Subject: [PATCH 0012/2040] Made qal.h C++ aware

---
 code/client/qal.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/client/qal.h b/code/client/qal.h
index a478eb53..c72285b3 100644
--- a/code/client/qal.h
+++ b/code/client/qal.h
@@ -55,6 +55,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  define ALC_ALL_DEVICES_SPECIFIER                0x1013
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef USE_OPENAL_DLOPEN
 extern LPALENABLE qalEnable;
 extern LPALDISABLE qalDisable;
@@ -248,4 +252,8 @@ extern LPALCCAPTURESAMPLES qalcCaptureSamples;
 qboolean QAL_Init(const char *libname);
 void QAL_Shutdown( void );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	// __QAL_H__

From 26c50f15dcd2e46749433a92f12101d8c85e3b59 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:28:28 +0100
Subject: [PATCH 0013/2040] Added s_volume and sfx exports + added
 load_sfx_info() declaration

---
 code/client/snd_local_new.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index a3412466..9dfdd0aa 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
+extern cvar_t *s_volume;
 extern cvar_t *s_khz;
 
 typedef struct {
@@ -145,11 +146,18 @@ enum sfx_flags_t {
 
 extern int        number_of_sfx_infos;
 extern sfx_info_t sfx_infos[];
+extern sfx_t      s_knownSfx[];
+extern int        s_numSfx;
 
 // The current sound driver.
 // Currently OPENAL
 #define SOUND_DRIVER OPENAL
 
+//
+// snd_info.cpp
+//
+void load_sfx_info();
+
 //
 // snd_dma_new.cpp
 //

From 13f23ace767332f4cf5623efd2c4451037963e19 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:30:29 +0100
Subject: [PATCH 0014/2040] Added macros for more clarity

---
 code/client/snd_openal_new.h | 110 ++++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 41 deletions(-)

diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index 83648019..14f14230 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -29,6 +29,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 typedef int          S32;
 typedef unsigned int U32;
 
+#define MAX_OPENAL_CHANNELS_3D        32
+#define MAX_OPENAL_CHANNELS_2D        32
+#define MAX_OPENAL_CHANNELS_2D_STREAM 32
+#define MAX_OPENAL_SONGS              2
+#define MAX_OPENAL_CHANNELS \
+    (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + MAX_OPENAL_SONGS + 3)
+#define MAX_OPENAL_LOOP_SOUNDS 64
+
+#define OPENAL_CHANNEL_MP3_ID \
+    (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + MAX_OPENAL_SONGS)
+#define OPENAL_CHANNEL_TRIGGER_MUSIC_ID (OPENAL_CHANNEL_MP3_ID + 1)
+#define OPENAL_CHANNEL_MOVIE_ID         (OPENAL_CHANNEL_TRIGGER_MUSIC_ID + 1)
+
 typedef enum {
     FADE_NONE,
     FADE_IN,
@@ -36,46 +49,56 @@ typedef enum {
 } fade_t;
 
 typedef struct {
-    vec3_t   vOrigin;
-    vec3_t   vRelativeOrigin;
-    vec3_t   vVelocity;
+    vec3_t vOrigin;
+    vec3_t vRelativeOrigin;
+    vec3_t vVelocity;
+
     sfx_t   *pSfx;
     qboolean bPlaying;
-    int      iChannel;
-    float    fVolume;
-    float    fPitch;
+
+    int   iChannel;
+    float fVolume;
+    float fPitch;
+
     int      iStartTime;
     qboolean bInUse;
     qboolean bCombine;
-    float    fBaseVolume;
-    float    fMinDist;
-    float    fMaxDist;
-    int      iFlags;
+
+    float fBaseVolume;
+    float fMinDist;
+    float fMaxDist;
+    int   iFlags;
 } openal_loop_sound_t;
 
 struct openal_channel {
-    sfx_t   *pSfx;
-    int      iEntNum;
-    int      iEntChannel;
-    vec3_t   vOrigin;
-    float    fVolume;
-    int      iBaseRate;
-    float    fNewPitchMult;
-    float    fMinDist;
-    float    fMaxDist;
-    int      iStartTime;
-    int      iTime;
-    int      iEndTime;
-    int      iFlags;
-    int      iPausedOffset;
-    int      song_number;
-    fade_t   fading;
-    int      fade_time;
-    int      fade_start_time;
+    sfx_t *pSfx;
+    int    iEntNum;
+    int    iEntChannel;
+    vec3_t vOrigin;
+
+    float fVolume;
+    int   iBaseRate;
+    float fNewPitchMult;
+    float fMinDist;
+    float fMaxDist;
+
+    int iStartTime;
+    int iTime;
+    int iEndTime;
+    int iFlags;
+    int iPausedOffset;
+
+    int song_number;
+
+    fade_t fading;
+    int    fade_time;
+    int    fade_start_time;
+
     ALuint   source;
     ALuint   buffer;
     ALubyte *bufferdata;
 
+public:
     void play();
     void stop();
     void pause();
@@ -117,19 +140,24 @@ struct openal_channel {
 };
 
 struct openal_internal_t {
-    openal_channel      chan_3D[32];
-    openal_channel      chan_2D[32];
-    openal_channel      chan_2D_stream[32];
-    openal_channel      chan_song[2];
-    openal_channel      chan_mp3;
-    openal_channel      chan_trig_music;
-    openal_channel      chan_movie;
-    openal_channel     *channel[101];
-    openal_loop_sound_t loop_sounds[64];
-    openal_channel      movieChannel;
-    sfx_t               movieSFX;
-    char                tm_filename[64];
-    int                 tm_loopcount;
+    openal_channel chan_3D[MAX_OPENAL_CHANNELS_3D];
+    openal_channel chan_2D[MAX_OPENAL_CHANNELS_2D];
+    openal_channel chan_2D_stream[MAX_OPENAL_CHANNELS_2D_STREAM];
+    openal_channel chan_song[MAX_OPENAL_SONGS];
+    openal_channel chan_mp3;
+    openal_channel chan_trig_music;
+    openal_channel chan_movie;
+
+    // Pointers to channels
+    openal_channel *channel[MAX_OPENAL_CHANNELS];
+
+    openal_loop_sound_t loop_sounds[MAX_OPENAL_LOOP_SOUNDS];
+
+    openal_channel movieChannel;
+    sfx_t          movieSFX;
+
+    char tm_filename[MAX_RES_NAME];
+    int  tm_loopcount;
 };
 
 #ifdef __cplusplus

From 3be1673eb9eace4be9ee1e5569e1e98670a40ebd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Jan 2024 19:32:44 +0100
Subject: [PATCH 0015/2040] Added boolean sound DMA variables

---
 code/client/snd_local_new.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 9dfdd0aa..01e27197 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -144,6 +144,10 @@ enum sfx_flags_t {
 #define MAX_SFX_INFOS   1000
 #define MAX_LOOP_SOUNDS 64
 
+extern qboolean   s_bLastInitSound;
+extern qboolean   s_bSoundStarted;
+extern qboolean   s_bSoundPaused;
+extern qboolean   s_bTryUnpause;
 extern int        number_of_sfx_infos;
 extern sfx_info_t sfx_infos[];
 extern sfx_t      s_knownSfx[];

From d3de937ee0d38d7809bed2556e72cf481a154d4c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Jan 2024 19:45:53 +0100
Subject: [PATCH 0016/2040] Added FS_CorrectCase

---
 code/qcommon/qcommon.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 6fc4385a..dd1cabcc 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -700,6 +700,8 @@ void	FS_FreeFileList( char **list );
 
 qboolean FS_FileExists( const char *file );
 
+void FS_CorrectCase(char* path);
+
 char   *FS_BuildOSPath( const char *base, const char *game, const char *qpath );
 
 qboolean FS_CreatePath(char *OSPath);

From 8d327cd0a0797ebaca4230368d79a202f30fafe9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Jan 2024 23:02:30 +0100
Subject: [PATCH 0017/2040] Added more SFX flags and exports

---
 code/client/snd_local_new.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 01e27197..e379933e 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -31,6 +31,7 @@ extern "C" {
 
 extern cvar_t *s_volume;
 extern cvar_t *s_khz;
+extern cvar_t *s_loadas8bit;
 
 typedef struct {
     int   format;
@@ -134,10 +135,13 @@ typedef struct {
 } soundsystemsavegame_t;
 
 enum sfx_flags_t {
-    SFX_FLAG_DEFAULT_SOUND = 1,
-    SFX_FLAG_MP3           = 2,
-    SFX_FLAG_NO_DATA       = 4,
-    SFX_FLAG_NO_OFFSET     = 8,
+    SFX_FLAG_DEFAULT_SOUND  = 1,
+    SFX_FLAG_MP3            = 2,
+    SFX_FLAG_NO_DATA        = 4,
+    SFX_FLAG_NO_OFFSET      = 8,
+    SFX_FLAG_LOCAL_LISTENER = 16,
+    SFX_FLAG_NO_ENTITY      = 32,
+    SFX_FLAG_PAUSED         = 64,
 };
 
 #define MAX_SFX         1400
@@ -148,6 +152,7 @@ extern qboolean   s_bLastInitSound;
 extern qboolean   s_bSoundStarted;
 extern qboolean   s_bSoundPaused;
 extern qboolean   s_bTryUnpause;
+extern int        s_iListenerNumber;
 extern int        number_of_sfx_infos;
 extern sfx_info_t sfx_infos[];
 extern sfx_t      s_knownSfx[];

From 318dc1889145f4de2b33f345afd28db20001f606 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Jan 2024 23:03:03 +0100
Subject: [PATCH 0018/2040] Added MAX_OPENAL_POSITION_CHANNELS

---
 code/client/snd_openal_new.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index 14f14230..1fbec8ba 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -32,9 +32,12 @@ typedef unsigned int U32;
 #define MAX_OPENAL_CHANNELS_3D        32
 #define MAX_OPENAL_CHANNELS_2D        32
 #define MAX_OPENAL_CHANNELS_2D_STREAM 32
+#define MAX_OPENAL_POSITION_CHANNELS  (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM)
 #define MAX_OPENAL_SONGS              2
-#define MAX_OPENAL_CHANNELS \
-    (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + MAX_OPENAL_SONGS + 3)
+#define MAX_OPENAL_MISC_CHANNELS      3
+#define MAX_OPENAL_CHANNELS                                                                             \
+    (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + MAX_OPENAL_SONGS \
+     + MAX_OPENAL_MISC_CHANNELS)
 #define MAX_OPENAL_LOOP_SOUNDS 64
 
 #define OPENAL_CHANNEL_MP3_ID \

From 9ea7b772314f1e71895ea286e238949eabe4c0e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 12 Jan 2024 00:04:20 +0100
Subject: [PATCH 0019/2040] Added channel flags and loopsound flags

---
 code/client/snd_local_new.h | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index e379933e..26e7eb24 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -134,14 +134,23 @@ typedef struct {
     channelbasesavegame_t Channels[96];
 } soundsystemsavegame_t;
 
+enum channel_flags_t {
+    CHANNEL_FLAG_PLAYABLE       = 1,
+    CHANNEL_FLAG_LOCAL_LISTENER = 16,
+    CHANNEL_FLAG_NO_ENTITY      = 32,
+    CHANNEL_FLAG_PAUSED         = 64,
+    CHANNEL_FLAG_LOOPING        = 128,
+};
+
 enum sfx_flags_t {
-    SFX_FLAG_DEFAULT_SOUND  = 1,
-    SFX_FLAG_MP3            = 2,
-    SFX_FLAG_NO_DATA        = 4,
-    SFX_FLAG_NO_OFFSET      = 8,
-    SFX_FLAG_LOCAL_LISTENER = 16,
-    SFX_FLAG_NO_ENTITY      = 32,
-    SFX_FLAG_PAUSED         = 64,
+    SFX_FLAG_DEFAULT_SOUND = 1,
+    SFX_FLAG_MP3           = 2,
+    SFX_FLAG_NO_DATA       = 4,
+    SFX_FLAG_NO_OFFSET     = 8,
+};
+
+enum loopsound_flags_t {
+    LOOPSOUND_FLAG_NO_PAN = 1
 };
 
 #define MAX_SFX         1400

From 032eb11cfb2d405c654701455e1a612e0e4ace43 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 12 Jan 2024 00:04:36 +0100
Subject: [PATCH 0020/2040] Implemented various methods

---
 code/client/snd_openal_new.cpp | 1286 ++++++++++++++++++++++++++++++--
 1 file changed, 1230 insertions(+), 56 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index caeee87f..25aa813f 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -24,6 +24,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #    include "snd_local.h"
 #    include "snd_openal_new.h"
+#    include "client.h"
+#    include "../server/server.h"
+
+#    include <sys/stat.h>
 
 typedef struct {
     char  *funcname;
@@ -63,7 +67,7 @@ static bool         al_initialized            = false;
 static bool         al_use_reverb             = false;
 static float        al_current_volume         = 0;
 static unsigned int al_frequency              = 22050;
-static void        *al_context_id             = NULL;
+static ALCcontext  *al_context_id             = NULL;
 static ALCdevice   *al_device                 = NULL;
 
 static ALboolean (*_alutLoadMP3_LOKI)(unsigned int buffer, const byte *data, int length);
@@ -90,172 +94,848 @@ static float      s_fFadeStartTime;
 static float      s_fFadeStopTime;
 static char       current_soundtrack[128];
 
-static void __alDieIfError(char *file)
+static void S_OPENAL_PlayMP3();
+static void S_OPENAL_StopMP3();
+static void S_OPENAL_Pitch();
+static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
+
+#    define alDieIfError() __alDieIfError(__FILE__, __LINE__)
+
+static void __alDieIfError(const char *file, int line)
 {
-    // FIXME: unimplemented
+    ALint alErr = qalGetError();
+    if (alErr) {
+        Com_DPrintf("OpenAL error, %s, line %i: [%s].\n", file, line, qalGetString(alErr));
+    }
 }
 
 static void S_OPENAL_NukeSource(ALuint *srcptr)
 {
-    // FIXME: unimplemented
+    ALuint source;
+
+    source = *srcptr;
+    if (!*srcptr) {
+        return;
+    }
+
+    if (!qalIsSource(*srcptr)) {
+        return;
+    }
+
+    alDieIfError();
+    qalSourceStop(source);
+
+    alDieIfError();
+    qalSourcei(source, AL_BUFFER, 0);
+
+    alDieIfError();
+    qalDeleteSources(1, srcptr);
+
+    alDieIfError();
+    *srcptr = 0;
 }
 
 static void S_OPENAL_NukeBuffer(ALuint *bufptr)
 {
+    if (!*bufptr) {
+        return;
+    }
+
+    if (!qalIsBuffer(*bufptr)) {
+        return;
+    }
+
+    alDieIfError();
+    qalDeleteBuffers(1, bufptr);
+
+    alDieIfError();
+    *bufptr = 0;
     // FIXME: unimplemented
 }
 
 static void S_OPENAL_NukeChannel(openal_channel *channel)
 {
-    // FIXME: unimplemented
+    if (!channel) {
+        return;
+    }
+
+    S_OPENAL_NukeSource(&channel->source);
+    S_OPENAL_NukeBuffer(&channel->buffer);
+
+    if (channel->bufferdata) {
+        delete[] channel->bufferdata;
+    }
 }
 
 static void S_OPENAL_NukeContext()
 {
-    // FIXME: unimplemented
+    int i;
+
+    Com_Printf("OpenAL: Destroying channels...\n");
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS; ++i) {
+        S_OPENAL_NukeChannel(openal.channel[i]);
+    }
+
+    Com_Printf("OpenAL: Channels destroyed successfully.\n");
+
+    for (i = 0; i < s_numSfx; i++) {
+        S_OPENAL_NukeBuffer(&s_knownSfx[i].buffer);
+    }
+
+    S_OPENAL_NukeBuffer(&openal.movieSFX.buffer);
+
+    if (al_context_id) {
+        Com_Printf("OpenAL: Destroying context...\n");
+
+        qalcSuspendContext(al_context_id);
+        qalcMakeContextCurrent(NULL);
+        qalcDestroyContext(al_context_id);
+        al_context_id = NULL;
+
+        Com_Printf("OpenAL: Context destroyed successfully.\n");
+    }
+
+    if (al_device) {
+        Com_Printf("OpenAL: Closing device...\n");
+
+        qalcCloseDevice(al_device);
+        al_device = NULL;
+
+        Com_Printf("OpenAL: Device closed successfully.\n");
+    }
 }
 
 static bool S_OPENAL_InitContext()
 {
-    // FIXME: unimplemented
-    return false;
+    const char *dev;
+    int         attrlist[6];
+
+    dev = 0;
+    if (s_openaldevice) {
+        dev = s_openaldevice->string;
+    }
+
+    if (dev && !*dev) {
+        dev = NULL;
+    }
+
+    Com_Printf("OpenAL: Opening device %s...\n", dev ? dev : "{default}");
+
+    al_device = qalcOpenDevice(dev);
+    if (!al_device) {
+        Com_Printf("OpenAL: Could not open device\n");
+        S_OPENAL_NukeContext();
+        return false;
+    }
+
+    Com_Printf("OpenAL: Device opened successfully.\n");
+    al_frequency = 22050;
+    if (s_khz->integer == 11) {
+        al_frequency = 11025;
+    } else if (s_khz->integer == 44) {
+        al_frequency = 44100;
+    }
+
+    attrlist[0] = 256;
+    attrlist[1] = al_frequency;
+    attrlist[2] = 258;
+    attrlist[3] = 0;
+    attrlist[4] = 0;
+    attrlist[5] = 0;
+
+    Com_Printf("OpenAL: Creating AL context...\n");
+    al_context_id = qalcCreateContext(al_device, attrlist);
+    if (!al_context_id) {
+        Com_Printf("OpenAL: Could not create context\n");
+        S_OPENAL_NukeContext();
+        return false;
+    }
+
+    Com_Printf("OpenAL: Context created successfully.\n");
+
+    qalcMakeContextCurrent(al_context_id);
+    alDieIfError();
+
+    Com_Printf("AL_VENDOR: %s\n", qalGetString(AL_VENDOR));
+    alDieIfError();
+
+    Com_Printf("AL_VERSION: %s\n", qalGetString(AL_VERSION));
+    alDieIfError();
+
+    Com_Printf("AL_RENDERER: %s\n", qalGetString(AL_RENDERER));
+    alDieIfError();
+
+    Com_Printf("AL_EXTENSIONS: %s\n", qalGetString(AL_EXTENSIONS));
+    alDieIfError();
+
+    qalDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
+    alDieIfError();
+
+    qalcProcessContext(al_context_id);
+    alDieIfError();
+
+    return true;
 }
 
 static bool S_OPENAL_InitExtensions()
 {
-    // FIXME: unimplemented
-    return false;
+    extensions_table_t extensions_table[4] = {
+        "alutLoadMP3_LOKI",
+        (void **)_alutLoadMP3_LOKI,
+        true,
+        "alReverbScale_LOKI",
+        (void **)_alReverbScale_LOKI,
+        true,
+        "alReverbDelay_LOKI",
+        (void **)_alReverbDelay_LOKI,
+        true
+    };
+    extensions_table_t *i;
+
+    for (i = extensions_table; i->funcname; ++i) {
+        *i->funcptr = NULL;
+    }
+
+    for (i = extensions_table; i->funcname; ++i) {
+        Com_Printf("AL extension: Looking up %ssymbol \"%s\"...", i->required ? "required " : "", i->funcname);
+
+        *i->funcptr = qalGetProcAddress(i->funcname);
+        if (!*i->funcptr) {
+            Com_Printf("...not found! [%s]\n", qalGetError());
+            if (i->required) {
+                S_OPENAL_NukeContext();
+                return false;
+            }
+            continue;
+        }
+
+        Com_Printf("...found.\n");
+    }
+
+    qalGetError();
+    return true;
 }
 
 static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
 {
-    // FIXME: unimplemented
-    return false;
+    openal.channel[idx]   = chan;
+    chan->vOrigin[2]      = 0.0;
+    chan->vOrigin[1]      = 0.0;
+    chan->vOrigin[0]      = 0.0;
+    chan->fVolume         = 1.0;
+    chan->fNewPitchMult   = 0.0;
+    chan->fMinDist        = 0.0;
+    chan->fMaxDist        = 0.0;
+    chan->pSfx            = 0;
+    chan->iEntNum         = 0;
+    chan->iEntChannel     = 0;
+    chan->iBaseRate       = 0;
+    chan->iStartTime      = 0;
+    chan->iTime           = 0;
+    chan->iEndTime        = 0;
+    chan->iFlags          = 0;
+    chan->iPausedOffset   = 0;
+    chan->source          = 0;
+    chan->buffer          = 0;
+    chan->bufferdata      = 0;
+    chan->fading          = FADE_NONE;
+    chan->fade_time       = 0;
+    chan->fade_start_time = 0;
+    chan->song_number     = 0;
+
+    qalGenSources(1, &chan->source);
+    alDieIfError();
+    qalSourcei(chan->source, 514, 1);
+    alDieIfError();
+
+    return true;
 }
 
 qboolean S_OPENAL_Init()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    int i;
+
+    if (al_initialized) {
+        Com_DPrintf("S_OPENAL_Init(): Called when sound is already initialized!\n");
+        return qtrue;
+    }
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS; i++) {
+        openal.channel[i] = NULL;
+    }
+
+    for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
+        openal.loop_sounds[i] = {};
+    }
+
+    s_milesdriver            = Cvar_Get("s_milesdriver", "auto", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
+    s_openaldevice           = Cvar_Get("s_openaldevice", "", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
+    s_reverb                 = Cvar_Get("s_reverb", "0", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
+    s_show_cpu               = Cvar_Get("s_show_cpu", "0", 0);
+    s_show_num_active_sounds = Cvar_Get("s_show_num_active_sounds", "0", 0);
+    s_show_sounds            = Cvar_Get("s_show_sounds", "0", 0);
+    s_speaker_type           = Cvar_Get("s_speaker_type", "0", CVAR_ARCHIVE);
+    s_obstruction_cal_time   = Cvar_Get("s_obstruction_cal_time", "500", CVAR_ARCHIVE);
+
+    if (!Cvar_Get("s_initsound", "1", 0)->integer) {
+        Com_Printf("OpenAL: s_initsound set to zero...disabling audio.\n");
+        return true;
+    }
+
+    if (!S_OPENAL_InitContext()) {
+        Com_Printf("OpenAL: initialization failed. No audio will play.\n");
+        return false;
+    }
+
+    if (!S_OPENAL_InitExtensions()) {
+        Com_Printf("OpenAL: A required extension is missing. No audio will play.\n");
+        return false;
+    }
+
+    al_use_reverb = false;
+    if (s_reverb->integer) {
+        STUB_DESC("reenable reverb support later.");
+
+        if (al_use_reverb) {
+            S_OPENAL_SetReverb(s_iReverbType, s_fReverbLevel);
+        } else {
+            Com_Printf("OpenAL: No reverb support. Reverb is disabled.\n");
+        }
+    }
+
+    al_current_volume = s_volume->value * s_volume->value;
+    qalListenerf(AL_GAIN, al_current_volume);
+    alDieIfError();
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS_3D; i++) {
+        if (!S_OPENAL_InitChannel(i, &openal.chan_3D[i])) {
+            return false;
+        }
+    }
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS_2D; i++) {
+        if (!S_OPENAL_InitChannel(i, &openal.chan_2D[i])) {
+            return false;
+        }
+    }
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS_2D_STREAM; i++) {
+        if (!S_OPENAL_InitChannel(i, &openal.chan_2D_stream[i])) {
+            return false;
+        }
+    }
+
+    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+        if (!S_OPENAL_InitChannel(i, &openal.chan_song[i])) {
+            return false;
+        }
+    }
+
+    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_MP3_ID, &openal.chan_mp3)) {
+        return false;
+    }
+
+    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_mp3)) {
+        return false;
+    }
+
+    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_MOVIE_ID, &openal.chan_mp3)) {
+        return false;
+    }
+
+    Cmd_AddCommand("playmp3", S_OPENAL_PlayMP3);
+    Cmd_AddCommand("stopmp3", S_OPENAL_StopMP3);
+    Cmd_AddCommand("loadsoundtrack", S_loadsoundtrack);
+    Cmd_AddCommand("playsong", S_PlaySong);
+    Cmd_AddCommand("pitch", S_OPENAL_Pitch);
+    Cmd_AddCommand("tmstart", S_TriggeredMusic_Start);
+    Cmd_AddCommand("tmstartloop", S_TriggeredMusic_StartLoop);
+    Cmd_AddCommand("tmstop", S_TriggeredMusic_Stop);
+
+    S_OPENAL_ClearLoopingSounds();
+    load_sfx_info();
+    s_bProvidersEmunerated = true;
+    al_initialized         = true;
+
+    return true;
 }
 
 void S_OPENAL_Shutdown()
 {
-    // FIXME: unimplemented
+    if (!al_initialized) {
+        Com_DPrintf("S_OPENAL_Shutdown(): Called when sound is NOT initialized!\n");
+        return;
+    }
+
+    S_OPENAL_StopAllSounds(true);
+
+    Cmd_RemoveCommand("playmp3");
+    Cmd_RemoveCommand("stopmp3");
+    Cmd_RemoveCommand("loadsoundtrack");
+    Cmd_RemoveCommand("playsong");
+    Cmd_RemoveCommand("pitch");
+    Cmd_RemoveCommand("tmstart");
+    Cmd_RemoveCommand("tmstartloop");
+    Cmd_RemoveCommand("tmstop");
+
+    S_OPENAL_NukeContext();
+
+    s_bProvidersEmunerated = false;
+    al_initialized         = false;
 }
 
 void S_FadeSound(float fTime)
 {
-    // FIXME: unimplemented
+    Com_Printf("Called FadeSound with: %f\n", fTime);
+
+    if (fTime > 0) {
+        s_bFading        = true;
+        s_fFadeStartTime = cls.realtime;
+        s_fFadeVolume    = 1;
+        s_fFadeStopTime  = cls.realtime + fTime;
+    } else {
+        s_fFadeVolume = 1;
+        s_bFading     = false;
+    }
 }
 
 float S_GetBaseVolume()
 {
-    // FIXME: unimplemented
-    return 0;
+    return s_volume->value * s_fFadeVolume;
 }
 
 qboolean S_NeedFullRestart()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return Cvar_Get("s_initsound", "1", 0)->integer != s_bLastInitSound;
 }
 
 void S_PrintInfo()
 {
-    // FIXME: unimplemented
+    const char *dev;
+
+    Com_Printf("----- Sound Info -----\n");
+
+    if (s_bSoundStarted) {
+        dev = NULL;
+        if (s_openaldevice) {
+            dev = s_openaldevice->string;
+        }
+        if (!dev || !*dev) {
+            dev = "{default}";
+        }
+        Com_Printf("device - %s\n", dev);
+        if (al_use_reverb) {
+            Com_Printf("reverb - ON\n");
+        } else {
+            Com_Printf("reverb - OFF\n");
+        }
+        Com_Printf("samplebits - 16\n");
+        Com_Printf("speed - %d\n", al_frequency);
+        if (s_loadas8bit->integer) {
+            Com_Printf("Can NOT force all sounds to 8 bit in OpenAL, I think.\n");
+        }
+    } else {
+        Com_Printf("sound system not started\n");
+    }
+
+    Com_Printf("----------------------\n");
 }
 
 static void S_DumpStatus(const char *pszChanName, int iChanNum, openal_channel *channel)
 {
-    // FIXME: unimplemented
+    sfx_t *sfx;
+    ALint  status;
+
+    sfx = channel->pSfx;
+
+    qalGetSourceiv(channel->source, AL_SOURCE_STATE, &status);
+    alDieIfError();
+
+    if (status == AL_PLAYING || status == AL_PAUSED) {
+        const char *pszMode = status == AL_PLAYING ? "playing" : "paused";
+
+        if (sfx) {
+            if (sfx != (sfx_t *)-16 && sfx->name[0]) {
+                Com_Printf("%s channel %i - %s sfx %s\n", pszChanName, iChanNum, pszMode, sfx->name);
+            } else {
+                Com_Printf("%s channel %i - %s with nameless sfx\n", pszChanName, iChanNum, pszMode);
+            }
+        } else {
+            Com_Printf("%s channel %i - %s with NULL sfx\n", pszChanName, iChanNum, pszMode);
+        }
+    }
 }
 
 void S_DumpInfo()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS_3D; i++) {
+        S_DumpStatus("3D", i, openal.channel[i]);
+    }
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS_2D; i++) {
+        S_DumpStatus("2D", i, openal.channel[MAX_OPENAL_CHANNELS_3D + i]);
+    }
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS_2D_STREAM; i++) {
+        S_DumpStatus("2D stream", i, openal.channel[MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + i]);
+    }
+
+    for (i = 0; i < MAX_OPENAL_MISC_CHANNELS; i++) {
+        S_DumpStatus(
+            "Misc",
+            i,
+            openal.channel[MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + i]
+        );
+    }
 }
 
 static void S_OPENAL_Pitch()
 {
-    // FIXME: unimplemented
+    Com_Printf("S_OPENAL_Pitch() needs to be implemented!\n");
 }
 
 static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 {
-    // FIXME: unimplemented
-    return false;
+    char   path[MAX_QPATH];
+    FILE  *in;
+    size_t len;
+    size_t rc;
+    bool   failed;
+
+    chan->stop();
+
+    qalSourcei(chan->source, AL_BUFFER, 0);
+    alDieIfError();
+
+    S_OPENAL_NukeBuffer(&chan->buffer);
+    alDieIfError();
+
+    Q_strncpyz(path, _path, sizeof(path));
+    path[MAX_QPATH - 1] = 0;
+
+    FS_CorrectCase(path);
+
+    in = fopen(path, "rb");
+    if (!in) {
+        Com_DPrintf("Failed to open MP3 \"%s\" for playback\n", path);
+        return false;
+    }
+
+    fseek(in, 0, SEEK_END);
+    len = ftell(in);
+    fseek(in, 0, SEEK_SET);
+
+    chan->bufferdata = new ALubyte[len];
+    rc               = fread(chan->bufferdata, 1, len, in);
+    fclose(in);
+
+    if (rc != len) {
+        delete[] chan->bufferdata;
+        chan->bufferdata = NULL;
+        Com_DPrintf("Failed to read MP3 \"%s\" from disk\n", path);
+
+        return false;
+    }
+
+    qalGenBuffers(1, &chan->buffer);
+    alDieIfError();
+
+    failed = !_alutLoadMP3_LOKI(chan->buffer, chan->bufferdata, rc);
+    alDieIfError();
+
+    delete[] chan->bufferdata;
+    chan->bufferdata = NULL;
+
+    if (failed) {
+        Com_DPrintf("Failed to decode MP3 file \"%s\"\n", path);
+        return false;
+    }
+
+    qalSourcei(chan->source, AL_BUFFER, chan->buffer);
+    alDieIfError();
+
+    chan->set_no_3d();
+
+    return true;
 }
 
 static void S_OPENAL_PlayMP3()
 {
-    // FIXME: unimplemented
+    const char *path;
+
+    if (Cmd_Argc() != 2) {
+        Com_Printf("playmp3 <mp3 file>\n");
+        return;
+    }
+
+    path = Cmd_Argv(1);
+    if (!S_OPENAL_LoadMP3(path, &openal.chan_mp3)) {
+        Com_Printf("Failed to play mp3 - %s\n", path);
+        return;
+    }
+
+    openal.chan_mp3.play();
+    Com_Printf("Playing mp3 - %s\n", path);
 }
 
 static void S_OPENAL_StopMP3()
 {
-    // FIXME: unimplemented
+    S_OPENAL_NukeChannel(&openal.chan_mp3);
 }
 
 void MUSIC_Pause()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+        openal.chan_song[i].pause();
+    }
 }
 
 void MUSIC_Unpause()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+        if (openal.chan_song[i].is_paused()) {
+            openal.chan_song[i].play();
+        }
+    }
 }
 
 void S_PauseSound()
 {
-    // FIXME: unimplemented
+    int i;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    s_bSoundPaused = true;
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (pChannel->iEntChannel == CHAN_MENU) {
+            continue;
+        }
+
+        if (!pChannel->is_playing()) {
+            continue;
+        }
+
+        pChannel->pause();
+    }
+
+    if (openal.chan_mp3.is_playing()) {
+        openal.chan_mp3.pause();
+    }
+
+    MUSIC_Pause();
+    S_TriggeredMusic_Pause();
 }
 
 void S_UnpauseSound()
 {
-    // FIXME: unimplemented
+    int i;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    s_bSoundPaused = true;
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (!pChannel->is_paused()) {
+            continue;
+        }
+
+        pChannel->play();
+    }
+
+    if (openal.chan_mp3.is_paused()) {
+        openal.chan_mp3.play();
+    }
+
+    MUSIC_Unpause();
+    S_TriggeredMusic_Unpause();
+
+    s_bSoundPaused = false;
 }
 
 static qboolean S_OPENAL_ShouldPlay(sfx_t *pSfx)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    if (sfx_infos[pSfx->sfx_info_index].max_number_playing <= 0) {
+        return qtrue;
+    }
+
+    int iRemainingTimesToPlay;
+    int i;
+
+    iRemainingTimesToPlay = sfx_infos[pSfx->sfx_info_index].max_number_playing;
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (pChannel->pSfx == pSfx && pChannel->is_playing()) {
+            iRemainingTimesToPlay--;
+            if (!iRemainingTimesToPlay) {
+                return qfalse;
+            }
+        }
+    }
+
+    return qtrue;
 }
 
 static qboolean S_OPENAL_ShouldStart(const vec3_t vOrigin, float fMinDist, float fMaxDist)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    vec3_t vDir;
+    vec3_t vListenerOrigin;
+    vec3_t alvec;
+
+    if (!al_initialized) {
+        return false;
+    }
+
+    qalGetListenerfv(AL_POSITION, alvec);
+
+    VectorScale(alvec, 52.49f, vListenerOrigin);
+    VectorSubtract(vOrigin, vListenerOrigin, vDir);
+
+    return Square(fMaxDist) > VectorLengthSquared(vDir);
 }
 
 static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChannel, int iLastChannel)
 {
-    // FIXME: unimplemented
-    return 0;
+    int             i;
+    int             iBestChannel;
+    openal_channel *pChannel;
+
+    iBestChannel = -1;
+    if (iEntNum != ENTITYNUM_NONE && iEntChannel) {
+        bool bStoppedChannel = false;
+
+        for (i = iFirstChannel; i <= iLastChannel; i++) {
+            pChannel = openal.channel[i];
+            if (!pChannel) {
+                continue;
+            }
+
+            if (pChannel->is_free()) {
+                iBestChannel = i;
+                continue;
+            }
+
+            if (pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+                pChannel->end_sample();
+                bStoppedChannel = 1;
+                iBestChannel    = i;
+                break;
+            }
+        }
+
+        if (!bStoppedChannel) {
+            for (i = 0; i < iFirstChannel; ++i) {
+                pChannel = openal.channel[i];
+                if (!pChannel || pChannel->is_free()) {
+                    continue;
+                }
+
+                if (pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+                    bStoppedChannel = 1;
+                    break;
+                }
+            }
+
+            if (!bStoppedChannel) {
+                i = iLastChannel;
+                while (++i <= 95) {
+                    pChannel = openal.channel[i];
+                    if (!pChannel || pChannel->is_free()) {
+                        continue;
+                    }
+
+                    if (pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    if (iBestChannel < 0) {
+        int iBestTime = 0x7FFFFFFF;
+
+        for (i = iFirstChannel; i <= iLastChannel; i++) {
+            pChannel = openal.channel[i];
+            if (!pChannel) {
+                continue;
+            }
+
+            if (pChannel->is_free()) {
+                return i;
+            }
+
+            if (pChannel->iEntNum == s_iListenerNumber && iEntNum != pChannel->iEntNum) {
+                continue;
+            }
+
+            if (pChannel->iEntChannel < iEntChannel
+                || (pChannel->iEntChannel == iEntChannel && pChannel->iStartTime < iBestTime)) {
+                iBestChannel = i;
+                iEntChannel  = pChannel->iEntChannel;
+                iBestTime    = pChannel->iStartTime;
+            }
+        }
+    }
+
+    return iBestChannel;
 }
 
 static int S_OPENAL_PickChannel3D(int iEntNum, int iEntChannel)
 {
-    // FIXME: unimplemented
-    return 0;
+    return S_OPENAL_PickChannelBase(iEntNum, iEntChannel, 0, MAX_OPENAL_CHANNELS_3D - 1);
 }
 
 static int S_OPENAL_PickChannel2D(int iEntNum, int iEntChannel)
 {
-    // FIXME: unimplemented
-    return 0;
+    return S_OPENAL_PickChannelBase(
+        iEntNum, iEntChannel, MAX_OPENAL_CHANNELS_3D, MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D - 1
+    );
 }
 
 static int S_OPENAL_PickChannel2DStreamed(int iEntNum, int iEntChannel)
 {
-    // FIXME: unimplemented
-    return 0;
+    return S_OPENAL_PickChannelBase(
+        iEntNum,
+        iEntChannel,
+        MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D,
+        MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM - 1
+    );
 }
 
 void callbackServer(int entnum, int channel_number, const char *name)
 {
-    // FIXME: unimplemented
+    if (!com_sv_running->integer) {
+        return;
+    }
+
+    SV_SoundCallback(entnum, channel_number, name);
 }
 
 static void S_OPENAL_Start2DSound(
@@ -269,7 +949,129 @@ static void S_OPENAL_Start2DSound(
     float        fMaxDistance
 )
 {
-    // FIXME: unimplemented
+    int             iRealEntNum;
+    int             iFreeChannel;
+    openal_channel *pChannel;
+    float           fRealVolume;
+    bool            bSupportWaitTillSoundDone;
+
+    iRealEntNum = iEntNum & ~S_FLAG_DO_CALLBACK;
+
+    if (pSfx->iFlags & SFX_FLAG_NO_DATA) {
+        iFreeChannel = S_OPENAL_PickChannel2DStreamed(iRealEntNum, iEntChannel);
+    } else {
+        iFreeChannel = S_OPENAL_PickChannel2D(iRealEntNum, iEntChannel);
+    }
+
+    if (iFreeChannel < 0) {
+        Com_DPrintf(
+            "Couldn't play %s sound '%s' for entity %i on channel %s\n",
+            (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "2Dstreamed" : "2D",
+            pSfx->name,
+            iEntNum & ~S_FLAG_DO_CALLBACK,
+            S_ChannelNumToName(iEntChannel)
+        );
+        return;
+    }
+
+    if (iEntNum & S_FLAG_DO_CALLBACK) {
+        callbackServer(iEntNum, iFreeChannel, pSfx->name);
+    }
+
+    pChannel = openal.channel[iFreeChannel];
+    pChannel->force_free();
+
+    if (fVolume < 0) {
+        fVolume = 1;
+    }
+
+    fRealVolume       = S_GetBaseVolume() * fVolume;
+    pChannel->fVolume = fVolume;
+
+    if (pChannel->iEntChannel == CHAN_LOCAL) {
+        pChannel->iFlags |= CHANNEL_FLAG_LOCAL_LISTENER;
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_LOCAL_LISTENER;
+    }
+    pChannel->iFlags &= ~CHANNEL_FLAG_PAUSED;
+
+    if (fMinDistance < 0.0) {
+        fMinDistance = 200.0;
+    }
+    pChannel->fMinDist = fMinDistance;
+
+    if (fMaxDistance < 0.0) {
+        fMaxDistance = pChannel->fMinDist * 64;
+    }
+    pChannel->fMaxDist = fMaxDistance;
+
+    pChannel->fNewPitchMult = fPitch;
+    pChannel->pSfx          = pSfx;
+    pChannel->iEntNum       = iRealEntNum;
+    pChannel->iEntChannel   = iEntChannel;
+    if (iEntNum == ENTITYNUM_NONE) {
+        VectorClear(pChannel->vOrigin);
+        pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = 0;
+
+        if (vOrigin) {
+            pChannel->vOrigin[0] = -vOrigin[0];
+            pChannel->vOrigin[1] = vOrigin[2];
+            pChannel->vOrigin[2] = -vOrigin[1];
+        }
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = iRealEntNum;
+        if (vOrigin) {
+            pChannel->vOrigin[0] = -vOrigin[0];
+            pChannel->vOrigin[1] = vOrigin[2];
+            pChannel->vOrigin[2] = -vOrigin[1];
+
+            bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
+            pChannel->iTime = cl.serverTime - 1;
+            if (bSupportWaitTillSoundDone) {
+                pChannel->iTime = 0;
+            }
+        } else {
+            VectorClear(pChannel->vOrigin);
+            pChannel->iTime = 0;
+        }
+    }
+
+    pChannel->iStartTime = cl.serverTime;
+    pChannel->iEndTime   = (int)(cl.serverTime + pSfx->time_length + 250.f);
+
+    if (iFreeChannel > MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D) {
+        // streamed
+        if (!pChannel->set_sfx(pSfx)) {
+            Com_DPrintf("Set stream error - %s\n", pSfx->name);
+            return;
+        }
+
+        pChannel->iBaseRate = pChannel->sample_playback_rate();
+        pChannel->set_no_3d();
+        fRealVolume = fRealVolume * 84.f;
+        pChannel->set_gain(fRealVolume);
+        pChannel->play();
+    } else {
+        pChannel->stop();
+        pChannel->set_no_3d();
+        pChannel->set_sfx(pSfx);
+        pChannel->set_gain(fRealVolume);
+        pChannel->play();
+    }
+
+    if (s_show_sounds->integer > 0) {
+        Com_DPrintf(
+            "2D - %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
+            cl.serverTime,
+            iFreeChannel,
+            pSfx->name,
+            fVolume,
+            fMinDistance,
+            fMaxDistance
+        );
+    }
 }
 
 void S_OPENAL_StartSound(
@@ -284,7 +1086,147 @@ void S_OPENAL_StartSound(
     qboolean     bStreamed
 )
 {
-    // FIXME: unimplemented
+    int iChannel;
+    openal_channel* pChannel;
+    sfx_info_t* pSfxInfo;
+    sfx_t* pSfx;
+    ALint state;
+    bool bOnlyUpdate;
+    bool bSupportWaitTillSoundDone;
+
+    bOnlyUpdate = false;
+    pSfx = &s_knownSfx[sfxHandle];
+    if (bStreamed) {
+        pSfx->iFlags |= SFX_FLAG_NO_DATA;
+    }
+
+    if (!S_OPENAL_ShouldPlay(pSfx))
+    {
+        Com_DPrintf("^~^~^ Not playing sound '%s'\n", pSfx->name);
+        return;
+    }
+
+    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)) || iEntChannel == CHAN_MENU || iEntChannel == CHAN_LOCAL)
+    {
+        S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
+        return;
+    }
+
+    bSupportWaitTillSoundDone = (iEntNum & S_FLAG_DO_CALLBACK) != 0;
+    iEntNum &= ~S_FLAG_DO_CALLBACK;
+
+    pSfxInfo = &sfx_infos[pSfx->sfx_info_index];
+    if (pSfx->iFlags & SFX_FLAG_NO_DATA) {
+        Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
+        return;
+    }
+
+    iChannel = S_OPENAL_PickChannel3D(iEntNum, iEntChannel);
+    if (iChannel < 0)
+    {
+        Com_DPrintf("Couldn't play %s sound '%s' for entity %i on channel %s\n", (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "3Dstreamed" : "3D", pSfx->name, iEntNum, S_ChannelNumToName(iEntChannel));
+        return;
+    }
+
+    if (bSupportWaitTillSoundDone) {
+        callbackServer(iEntNum, iChannel, pSfx->name);
+    }
+
+    pChannel = &openal.chan_3D[iChannel];
+    pChannel->fNewPitchMult = fPitch;
+    pChannel->iEntChannel = iEntChannel;
+    pChannel->iFlags &= ~(CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
+    state = pChannel->get_state();
+
+    if (pChannel->iEntNum == iEntNum && (state == AL_PLAYING || state == AL_PAUSED) && pChannel->pSfx == pSfx) {
+        bOnlyUpdate = true;
+    } else {
+        pChannel->stop();
+        pChannel->iFlags &= ~(CHANNEL_FLAG_LOOPING | CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
+        if (!pChannel->set_sfx(pSfx)) {
+            Com_DPrintf("Set sample error - %s\n", pSfx->name);
+            return;
+        }
+    }
+
+    if (fMinDist < 0.0)
+    {
+        fMinDist = 200.0;
+        fMaxDist = 12800.0;
+    }
+    pChannel->fMinDist = fMinDist;
+    pChannel->fMaxDist = fMaxDist;
+
+    if (fVolume < 0.0) {
+        fVolume = 1.0;
+    }
+
+    pChannel->fVolume = S_GetBaseVolume() * fVolume;
+    pChannel->set_gain(pChannel->fVolume);
+
+    if (s_show_sounds->integer > 0) {
+        Com_DPrintf(
+            "%d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
+            cl.serverTime,
+            iChannel,
+            pSfx->name,
+            pChannel->fVolume,
+            fMinDist,
+            fMaxDist);
+    }
+
+    pChannel->set_velocity(0, 0, 0);
+    if (iEntNum == ENTITYNUM_NONE) {
+        if (vOrigin) {
+            pChannel->vOrigin[0] = -vOrigin[0];
+            pChannel->vOrigin[1] = vOrigin[2];
+            pChannel->vOrigin[2] = -vOrigin[1];
+        } else {
+            //VectorClear(vOrigin);
+            // Fixed in OPM
+            //  Tiny mistake found in original where the vOrigin parameter is set to 0
+            VectorClear(pChannel->vOrigin);
+        }
+
+        pChannel->set_position(pChannel->vOrigin[0] / 52.49f, pChannel->vOrigin[1] / 52.49f, pChannel->vOrigin[2] / 52.49f);
+        pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = 0;
+    } else {
+        pChannel->iEntNum = iEntNum;
+        if (vOrigin) {
+            pChannel->vOrigin[0] = -*vOrigin;
+            pChannel->vOrigin[1] = vOrigin[2];
+            pChannel->vOrigin[2] = -vOrigin[1];
+            bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
+            pChannel->iTime = cl.serverTime - 1;
+            if (bSupportWaitTillSoundDone) {
+                pChannel->iTime = 0;
+            }
+        } else {
+            VectorClear(pChannel->vOrigin);
+            pChannel->iTime = 0;
+        }
+    }
+
+    if (pSfxInfo->loop_start != -1) {
+        pChannel->set_sample_loop_block(pSfxInfo->loop_start, pSfxInfo->loop_end);
+        pChannel->set_sample_loop_count(0);
+
+        pChannel->iFlags |= CHANNEL_FLAG_LOOPING;
+        if (s_show_sounds->integer) {
+            Com_DPrintf("loopblock - %d to %d\n", pSfxInfo->loop_start, pSfxInfo->loop_end);
+        }
+    } else {
+        pChannel->set_sample_loop_count(1);
+    }
+
+    if (!bOnlyUpdate && S_OPENAL_ShouldStart(pChannel->vOrigin, pChannel->fMinDist, pChannel->fMaxDist))
+    {
+        pChannel->play();
+        pChannel->iEndTime = cl.serverTime + (int)pChannel->pSfx->time_length + 250;
+        pChannel->iBaseRate = pChannel->sample_playback_rate();
+        pChannel->iStartTime = cl.serverTime;
+    }
 }
 
 void S_OPENAL_AddLoopingSound(
@@ -298,31 +1240,166 @@ void S_OPENAL_AddLoopingSound(
     int          iFlags
 )
 {
-    // FIXME: unimplemented
+    int i;
+    int iFreeLoopSound;
+    sfx_t* pSfx;
+    openal_loop_sound_t* pLoopSound;
+
+    iFreeLoopSound = -1;
+    pSfx = &s_knownSfx[sfxHandle];
+    if (!pSfx) {
+        return;
+    }
+
+    for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        pLoopSound = &openal.loop_sounds[i];
+        if (pLoopSound->pSfx == pSfx && !pLoopSound->bInUse) {
+            iFreeLoopSound = i;
+            break;
+        }
+
+    }
+
+    if (iFreeLoopSound < 0) {
+        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+            pLoopSound = &openal.loop_sounds[i];
+            if (!pLoopSound->pSfx && !pLoopSound->bInUse) {
+                iFreeLoopSound = i;
+                pLoopSound->bPlaying = false;
+                break;
+            }
+        }
+    }
+
+    if (iFreeLoopSound < 0) {
+        if (cls.realtime >= s_iNextLoopingWarning) {
+            Com_DPrintf("Too many looping sounds\n");
+            s_iNextLoopingWarning = cls.realtime + 1000;
+        }
+        return;
+    }
+
+    pLoopSound = &openal.loop_sounds[iFreeLoopSound];
+    pLoopSound->vOrigin[0] = -vOrigin[0];
+    pLoopSound->vOrigin[1] = vOrigin[2];
+    pLoopSound->vOrigin[2] = -vOrigin[1];
+    pLoopSound->vVelocity[0] = -vVelocity[0] / 52.49f / 500.f;
+    pLoopSound->vVelocity[1] = vVelocity[2] / 52.49f / 500.f;
+    pLoopSound->vVelocity[2] = -vVelocity[1] / 52.49f / 500.f;
+    pLoopSound->pSfx = pSfx;
+    pLoopSound->bInUse = true;
+    pLoopSound->iStartTime = cls.realtime;
+    pLoopSound->fBaseVolume = fVolume;
+    pLoopSound->fMinDist = fMinDist;
+    pLoopSound->fMaxDist = fMaxDist;
+    pLoopSound->fPitch = fPitch;
+    pLoopSound->iFlags = iFlags;
+    pLoopSound->bCombine = VectorCompare(vVelocity, vec_zero) == 0;
+
+    if (pLoopSound->bCombine) {
+        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+            if (openal.loop_sounds[i].pSfx == pSfx && openal.loop_sounds[i].bInUse) {
+                pLoopSound->iStartTime = openal.loop_sounds[i].iStartTime;
+                if (openal.loop_sounds[i].bPlaying) {
+                    pLoopSound->bPlaying = true;
+                    pLoopSound->iChannel = openal.loop_sounds[i].iChannel;
+                }
+            }
+        }
+    }
 }
 
 void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
 {
-    // FIXME: unimplemented
+    bool bMayStop;
+    int i;
+    openal_channel* pChannel;
+
+    if (!pLoopSound->bPlaying) {
+        return;
+    }
+    bMayStop = true;
+
+    if (pLoopSound->bCombine) {
+        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+            if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx && openal.loop_sounds[i].bInUse) {
+                bMayStop = false;
+                break;
+            }
+        }
+    }
+
+    if (bMayStop) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("%d (#%i) - stopped loop - %s\n", cl.serverTime, pLoopSound->iChannel, openal.channel[pLoopSound->iChannel]->pSfx->name);
+        }
+        openal.channel[pLoopSound->iChannel]->force_free();
+    }
+    pLoopSound->pSfx = NULL;
+    pLoopSound->bPlaying = false;
+
+    if (pLoopSound->bCombine) {
+        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+            if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx)
+            {
+                openal.loop_sounds[i].bPlaying = false;
+                openal.loop_sounds[i].pSfx = NULL;
+            }
+        }
+    }
 }
 
 void S_OPENAL_ClearLoopingSounds()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        openal.loop_sounds[i].bInUse = false;
+    }
 }
 
 void S_OPENAL_StopLoopingSounds()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        openal.loop_sounds[i].bInUse = false;
+        S_OPENAL_StopLoopingSound(&openal.loop_sounds[i]);
+    }
 }
 
 void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        openal_channel* pChannel = openal.channel[i];
+        if (!pChannel->is_free() && pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+            pChannel->end_sample();
+            break;
+        }
+    }
 }
 
 void S_OPENAL_StopAllSounds(qboolean bStopMusic)
 {
+    int i;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        openal_channel* pChannel = openal.channel[i];
+        if (pChannel) {
+            pChannel->force_free();
+        }
+    }
+
+    if (bStopMusic) {
+        MUSIC_FreeAllSongs();
+        S_TriggeredMusic_Stop();
+    }
     // FIXME: unimplemented
 }
 
@@ -330,8 +1407,60 @@ static int S_OPENAL_Start2DLoopSound(
     openal_loop_sound_t *pLoopSound, float fVolume, float fVolumeToPlay, float fMinDistance, const vec3_t vLoopOrigin
 )
 {
-    // FIXME: unimplemented
-    return 0;
+    int iChannel;
+    int iSoundOFfset;
+    openal_channel* pChannel;
+
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_NO_DATA) {
+        iChannel = S_OPENAL_PickChannel2DStreamed(0, 0);
+    }
+    else {
+        iChannel = S_OPENAL_PickChannel2D(0, 0);
+    }
+
+    if (iChannel < 0) {
+        Com_DPrintf("Could not find a free 2D sound channel\n");
+        return iChannel;
+    }
+
+    pChannel = openal.channel[iChannel];
+    pChannel->force_free();
+    pChannel->fVolume = fVolume;
+
+    if (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN) {
+        pChannel->iFlags |= CHANNEL_FLAG_LOCAL_LISTENER;
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_LOCAL_LISTENER;
+    }
+    pChannel->fMinDist = fMinDistance;
+
+    if (!pChannel->set_sfx(pLoopSound->pSfx)) {
+        Com_DPrintf("Set sample error\n");
+        pChannel->iFlags &= ~CHANNEL_FLAG_PLAYABLE;
+        return -1;
+    }
+
+    pChannel->iEntNum = 0;
+    pChannel->iEntChannel = 0;
+    pChannel->pSfx = pLoopSound->pSfx;
+    pChannel->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
+    pChannel->iBaseRate = pChannel->sample_playback_rate();
+    VectorCopy(vLoopOrigin, pChannel->vOrigin);
+    pChannel->set_sample_offset((int)(pLoopSound->pSfx->info.width
+        * pLoopSound->pSfx->info.rate
+        * (float)(cls.realtime - pLoopSound->iStartTime)
+        / 1000.0)
+        % pLoopSound->pSfx->length);
+
+    pChannel->set_sample_loop_count(0);
+    pChannel->fVolume = fVolumeToPlay;
+    pChannel->set_gain(fVolumeToPlay);
+    pChannel->start_sample();
+    if (s_show_sounds->integer > 0) {
+        Com_DPrintf("%d (#%i) - %s (vol %f)\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name, fVolume);
+    }
+
+    return iChannel;
 }
 
 static int S_OPENAL_Start3DLoopSound(
@@ -343,8 +1472,53 @@ static int S_OPENAL_Start3DLoopSound(
     const vec3_t         vListenerOrigin
 )
 {
-    // FIXME: unimplemented
-    return 0;
+    int iChannel;
+    vec3_t vDir;
+    int iSoundOffset;
+    openal_channel* pChan3D;
+
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_NO_DATA) {
+        return -1;
+    }
+
+    iChannel = S_OPENAL_PickChannel3D(0, 0);
+    if (iChannel < 0)
+    {
+        Com_DPrintf("Could not find a free channel\n");
+        return iChannel;
+    }
+
+    pChan3D = &openal.chan_3D[iChannel];
+    pChan3D->force_free();
+    pChan3D->iEntNum = 0;
+    pChan3D->iEntChannel = 0;
+    pChan3D->set_3d();
+
+    if (!pChan3D->set_sfx(pLoopSound->pSfx)) {
+        Com_DPrintf("Set sample error - %s\n", pLoopSound->pSfx->name);
+        return -1;
+    }
+
+    pChan3D->set_position(vLoopOrigin[0] / 52.49f, pLoopSound->vVelocity[1] / 52.49f, vLoopOrigin[2] / 52.49f);
+    pChan3D->set_velocity(pLoopSound->vVelocity[0] / 52.49f, vLoopOrigin[1] / 52.49f, pLoopSound->vVelocity[2] / 52.49f);
+    pChan3D->pSfx = pLoopSound->pSfx;
+    pChan3D->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
+    pChan3D->iBaseRate = pChan3D->sample_playback_rate();
+
+    iSoundOffset = (int)((int)pLoopSound->pSfx->info.width
+        * pLoopSound->pSfx->info.rate
+        * (float)(cls.realtime - pLoopSound->iStartTime)
+        / 1000.0)
+        % pLoopSound->pSfx->length;
+    pChan3D->set_sample_offset(iSoundOffset);
+    pChan3D->set_sample_loop_count(0);
+    pChan3D->fVolume = fVolumeToPlay;
+    pChan3D->set_gain(fVolumeToPlay);
+    pChan3D->play();
+
+    S_OPENAL_reverb(iChannel, s_iReverbType, s_fReverbLevel);
+
+    return iChannel;
 }
 
 static bool S_OPENAL_UpdateLoopSound(

From 9b35e13923075ba198fe705a42df9888452df055 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 15 Jan 2024 23:04:01 +0100
Subject: [PATCH 0021/2040] Added qalGetSourceiv / qalGetBufferfv

---
 code/client/qal.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/client/qal.c b/code/client/qal.c
index 5cc40de2..4e33a292 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -66,6 +66,7 @@ LPALGETSOURCEF qalGetSourcef;
 LPALGETSOURCE3F qalGetSource3f;
 LPALGETSOURCEFV qalGetSourcefv;
 LPALGETSOURCEI qalGetSourcei;
+LPALGETSOURCEIV qalGetSourceiv;
 LPALSOURCEPLAYV qalSourcePlayv;
 LPALSOURCESTOPV qalSourceStopv;
 LPALSOURCEREWINDV qalSourceRewindv;
@@ -81,6 +82,7 @@ LPALDELETEBUFFERS qalDeleteBuffers;
 LPALISBUFFER qalIsBuffer;
 LPALBUFFERDATA qalBufferData;
 LPALGETBUFFERF qalGetBufferf;
+LPALGETBUFFERFV qalGetBufferfv;
 LPALGETBUFFERI qalGetBufferi;
 LPALDOPPLERFACTOR qalDopplerFactor;
 LPALSPEEDOFSOUND qalSpeedOfSound;
@@ -184,6 +186,7 @@ qboolean QAL_Init(const char *libname)
 	qalGetSource3f = GPA("alGetSource3f");
 	qalGetSourcefv = GPA("alGetSourcefv");
 	qalGetSourcei = GPA("alGetSourcei");
+	qalGetSourceiv = GPA("alGetSourceiv");
 	qalSourcePlayv = GPA("alSourcePlayv");
 	qalSourceStopv = GPA("alSourceStopv");
 	qalSourceRewindv = GPA("alSourceRewindv");
@@ -199,6 +202,7 @@ qboolean QAL_Init(const char *libname)
 	qalIsBuffer = GPA("alIsBuffer");
 	qalBufferData = GPA("alBufferData");
 	qalGetBufferf = GPA("alGetBufferf");
+	qalGetBufferfv = GPA("alGetBufferfv");
 	qalGetBufferi = GPA("alGetBufferi");
 	qalDopplerFactor = GPA("alDopplerFactor");
 	qalSpeedOfSound = GPA("alSpeedOfSound");
@@ -283,6 +287,7 @@ void QAL_Shutdown( void )
 	qalGetSource3f = NULL;
 	qalGetSourcefv = NULL;
 	qalGetSourcei = NULL;
+	qalGetSourceiv = NULL;
 	qalSourcePlayv = NULL;
 	qalSourceStopv = NULL;
 	qalSourceRewindv = NULL;
@@ -298,6 +303,7 @@ void QAL_Shutdown( void )
 	qalIsBuffer = NULL;
 	qalBufferData = NULL;
 	qalGetBufferf = NULL;
+	qalGetBufferfv = NULL;
 	qalGetBufferi = NULL;
 	qalDopplerFactor = NULL;
 	qalSpeedOfSound = NULL;

From d88870bc0405c71055cd139622405450f1397784 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 15 Jan 2024 23:04:13 +0100
Subject: [PATCH 0022/2040] Added more exports

---
 code/client/snd_local_new.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 26e7eb24..8fcd7e6a 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -32,6 +32,9 @@ extern "C" {
 extern cvar_t *s_volume;
 extern cvar_t *s_khz;
 extern cvar_t *s_loadas8bit;
+extern cvar_t *s_separation;
+extern cvar_t *s_musicVolume;
+extern cvar_t *s_ambientVolume;
 
 typedef struct {
     int   format;
@@ -162,10 +165,12 @@ extern qboolean   s_bSoundStarted;
 extern qboolean   s_bSoundPaused;
 extern qboolean   s_bTryUnpause;
 extern int        s_iListenerNumber;
+extern float      s_fAmbientVolume;
 extern int        number_of_sfx_infos;
 extern sfx_info_t sfx_infos[];
 extern sfx_t      s_knownSfx[];
 extern int        s_numSfx;
+extern s_entity_t s_entity[];
 
 // The current sound driver.
 // Currently OPENAL

From 970d72cf0781f84930ca4f438ff06d43dfffdbc7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 15 Jan 2024 23:04:25 +0100
Subject: [PATCH 0023/2040] Implemented snd_openal_new.cpp

---
 code/client/snd_openal_new.cpp | 2329 +++++++++++++++++++++++++++++---
 1 file changed, 2139 insertions(+), 190 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 25aa813f..e86fa40a 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -97,10 +97,17 @@ static char       current_soundtrack[128];
 static void S_OPENAL_PlayMP3();
 static void S_OPENAL_StopMP3();
 static void S_OPENAL_Pitch();
+static int
+S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
 static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
 
 #    define alDieIfError() __alDieIfError(__FILE__, __LINE__)
 
+/*
+==============
+__alDieIfError
+==============
+*/
 static void __alDieIfError(const char *file, int line)
 {
     ALint alErr = qalGetError();
@@ -109,6 +116,11 @@ static void __alDieIfError(const char *file, int line)
     }
 }
 
+/*
+==============
+S_OPENAL_NukeSource
+==============
+*/
 static void S_OPENAL_NukeSource(ALuint *srcptr)
 {
     ALuint source;
@@ -135,6 +147,11 @@ static void S_OPENAL_NukeSource(ALuint *srcptr)
     *srcptr = 0;
 }
 
+/*
+==============
+S_OPENAL_NukeBuffer
+==============
+*/
 static void S_OPENAL_NukeBuffer(ALuint *bufptr)
 {
     if (!*bufptr) {
@@ -150,9 +167,13 @@ static void S_OPENAL_NukeBuffer(ALuint *bufptr)
 
     alDieIfError();
     *bufptr = 0;
-    // FIXME: unimplemented
 }
 
+/*
+==============
+S_OPENAL_NukeChannel
+==============
+*/
 static void S_OPENAL_NukeChannel(openal_channel *channel)
 {
     if (!channel) {
@@ -167,6 +188,11 @@ static void S_OPENAL_NukeChannel(openal_channel *channel)
     }
 }
 
+/*
+==============
+S_OPENAL_NukeContext
+==============
+*/
 static void S_OPENAL_NukeContext()
 {
     int i;
@@ -206,6 +232,11 @@ static void S_OPENAL_NukeContext()
     }
 }
 
+/*
+==============
+S_OPENAL_InitContext
+==============
+*/
 static bool S_OPENAL_InitContext()
 {
     const char *dev;
@@ -278,6 +309,11 @@ static bool S_OPENAL_InitContext()
     return true;
 }
 
+/*
+==============
+S_OPENAL_InitExtensions
+==============
+*/
 static bool S_OPENAL_InitExtensions()
 {
     extensions_table_t extensions_table[4] = {
@@ -317,6 +353,11 @@ static bool S_OPENAL_InitExtensions()
     return true;
 }
 
+/*
+==============
+S_OPENAL_InitChannel
+==============
+*/
 static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
 {
     openal.channel[idx]   = chan;
@@ -352,6 +393,11 @@ static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
     return true;
 }
 
+/*
+==============
+S_OPENAL_Init
+==============
+*/
 qboolean S_OPENAL_Init()
 {
     int i;
@@ -461,6 +507,11 @@ qboolean S_OPENAL_Init()
     return true;
 }
 
+/*
+==============
+S_OPENAL_Shutdown
+==============
+*/
 void S_OPENAL_Shutdown()
 {
     if (!al_initialized) {
@@ -485,6 +536,11 @@ void S_OPENAL_Shutdown()
     al_initialized         = false;
 }
 
+/*
+==============
+S_FadeSound
+==============
+*/
 void S_FadeSound(float fTime)
 {
     Com_Printf("Called FadeSound with: %f\n", fTime);
@@ -500,16 +556,31 @@ void S_FadeSound(float fTime)
     }
 }
 
+/*
+==============
+S_GetBaseVolume
+==============
+*/
 float S_GetBaseVolume()
 {
     return s_volume->value * s_fFadeVolume;
 }
 
+/*
+==============
+S_NeedFullRestart
+==============
+*/
 qboolean S_NeedFullRestart()
 {
     return Cvar_Get("s_initsound", "1", 0)->integer != s_bLastInitSound;
 }
 
+/*
+==============
+S_PrintInfo
+==============
+*/
 void S_PrintInfo()
 {
     const char *dev;
@@ -542,6 +613,11 @@ void S_PrintInfo()
     Com_Printf("----------------------\n");
 }
 
+/*
+==============
+S_DumpStatus
+==============
+*/
 static void S_DumpStatus(const char *pszChanName, int iChanNum, openal_channel *channel)
 {
     sfx_t *sfx;
@@ -567,6 +643,11 @@ static void S_DumpStatus(const char *pszChanName, int iChanNum, openal_channel *
     }
 }
 
+/*
+==============
+S_DumpInfo
+==============
+*/
 void S_DumpInfo()
 {
     int i;
@@ -592,11 +673,21 @@ void S_DumpInfo()
     }
 }
 
+/*
+==============
+S_OPENAL_Pitch
+==============
+*/
 static void S_OPENAL_Pitch()
 {
     Com_Printf("S_OPENAL_Pitch() needs to be implemented!\n");
 }
 
+/*
+==============
+S_OPENAL_LoadMP3
+==============
+*/
 static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 {
     char   path[MAX_QPATH];
@@ -662,6 +753,11 @@ static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
     return true;
 }
 
+/*
+==============
+S_OPENAL_PlayMP3
+==============
+*/
 static void S_OPENAL_PlayMP3()
 {
     const char *path;
@@ -681,11 +777,21 @@ static void S_OPENAL_PlayMP3()
     Com_Printf("Playing mp3 - %s\n", path);
 }
 
+/*
+==============
+S_OPENAL_StopMP3
+==============
+*/
 static void S_OPENAL_StopMP3()
 {
     S_OPENAL_NukeChannel(&openal.chan_mp3);
 }
 
+/*
+==============
+MUSIC_Pause
+==============
+*/
 void MUSIC_Pause()
 {
     int i;
@@ -695,6 +801,11 @@ void MUSIC_Pause()
     }
 }
 
+/*
+==============
+MUSIC_Unpause
+==============
+*/
 void MUSIC_Unpause()
 {
     int i;
@@ -706,6 +817,11 @@ void MUSIC_Unpause()
     }
 }
 
+/*
+==============
+S_PauseSound
+==============
+*/
 void S_PauseSound()
 {
     int i;
@@ -741,6 +857,11 @@ void S_PauseSound()
     S_TriggeredMusic_Pause();
 }
 
+/*
+==============
+S_UnpauseSound
+==============
+*/
 void S_UnpauseSound()
 {
     int i;
@@ -774,6 +895,11 @@ void S_UnpauseSound()
     s_bSoundPaused = false;
 }
 
+/*
+==============
+S_OPENAL_ShouldPlay
+==============
+*/
 static qboolean S_OPENAL_ShouldPlay(sfx_t *pSfx)
 {
     if (sfx_infos[pSfx->sfx_info_index].max_number_playing <= 0) {
@@ -802,6 +928,11 @@ static qboolean S_OPENAL_ShouldPlay(sfx_t *pSfx)
     return qtrue;
 }
 
+/*
+==============
+S_OPENAL_ShouldStart
+==============
+*/
 static qboolean S_OPENAL_ShouldStart(const vec3_t vOrigin, float fMinDist, float fMaxDist)
 {
     vec3_t vDir;
@@ -820,6 +951,11 @@ static qboolean S_OPENAL_ShouldStart(const vec3_t vOrigin, float fMinDist, float
     return Square(fMaxDist) > VectorLengthSquared(vDir);
 }
 
+/*
+==============
+S_OPENAL_PickChannelBase
+==============
+*/
 static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChannel, int iLastChannel)
 {
     int             i;
@@ -907,11 +1043,21 @@ static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChan
     return iBestChannel;
 }
 
+/*
+==============
+S_OPENAL_PickChannel3D
+==============
+*/
 static int S_OPENAL_PickChannel3D(int iEntNum, int iEntChannel)
 {
     return S_OPENAL_PickChannelBase(iEntNum, iEntChannel, 0, MAX_OPENAL_CHANNELS_3D - 1);
 }
 
+/*
+==============
+S_OPENAL_PickChannel2D
+==============
+*/
 static int S_OPENAL_PickChannel2D(int iEntNum, int iEntChannel)
 {
     return S_OPENAL_PickChannelBase(
@@ -919,6 +1065,11 @@ static int S_OPENAL_PickChannel2D(int iEntNum, int iEntChannel)
     );
 }
 
+/*
+==============
+S_OPENAL_PickChannel2DStreamed
+==============
+*/
 static int S_OPENAL_PickChannel2DStreamed(int iEntNum, int iEntChannel)
 {
     return S_OPENAL_PickChannelBase(
@@ -929,6 +1080,11 @@ static int S_OPENAL_PickChannel2DStreamed(int iEntNum, int iEntChannel)
     );
 }
 
+/*
+==============
+callbackServer
+==============
+*/
 void callbackServer(int entnum, int channel_number, const char *name)
 {
     if (!com_sv_running->integer) {
@@ -938,6 +1094,11 @@ void callbackServer(int entnum, int channel_number, const char *name)
     SV_SoundCallback(entnum, channel_number, name);
 }
 
+/*
+==============
+S_OPENAL_Start2DSound
+==============
+*/
 static void S_OPENAL_Start2DSound(
     const vec3_t vOrigin,
     int          iEntNum,
@@ -1028,7 +1189,7 @@ static void S_OPENAL_Start2DSound(
             pChannel->vOrigin[2] = -vOrigin[1];
 
             bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
-            pChannel->iTime = cl.serverTime - 1;
+            pChannel->iTime           = cl.serverTime - 1;
             if (bSupportWaitTillSoundDone) {
                 pChannel->iTime = 0;
             }
@@ -1074,6 +1235,11 @@ static void S_OPENAL_Start2DSound(
     }
 }
 
+/*
+==============
+S_OPENAL_StartSound
+==============
+*/
 void S_OPENAL_StartSound(
     const vec3_t vOrigin,
     int          iEntNum,
@@ -1086,28 +1252,27 @@ void S_OPENAL_StartSound(
     qboolean     bStreamed
 )
 {
-    int iChannel;
-    openal_channel* pChannel;
-    sfx_info_t* pSfxInfo;
-    sfx_t* pSfx;
-    ALint state;
-    bool bOnlyUpdate;
-    bool bSupportWaitTillSoundDone;
+    int             iChannel;
+    openal_channel *pChannel;
+    sfx_info_t     *pSfxInfo;
+    sfx_t          *pSfx;
+    ALint           state;
+    bool            bOnlyUpdate;
+    bool            bSupportWaitTillSoundDone;
 
     bOnlyUpdate = false;
-    pSfx = &s_knownSfx[sfxHandle];
+    pSfx        = &s_knownSfx[sfxHandle];
     if (bStreamed) {
         pSfx->iFlags |= SFX_FLAG_NO_DATA;
     }
 
-    if (!S_OPENAL_ShouldPlay(pSfx))
-    {
+    if (!S_OPENAL_ShouldPlay(pSfx)) {
         Com_DPrintf("^~^~^ Not playing sound '%s'\n", pSfx->name);
         return;
     }
 
-    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)) || iEntChannel == CHAN_MENU || iEntChannel == CHAN_LOCAL)
-    {
+    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)) || iEntChannel == CHAN_MENU
+        || iEntChannel == CHAN_LOCAL) {
         S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
         return;
     }
@@ -1122,9 +1287,14 @@ void S_OPENAL_StartSound(
     }
 
     iChannel = S_OPENAL_PickChannel3D(iEntNum, iEntChannel);
-    if (iChannel < 0)
-    {
-        Com_DPrintf("Couldn't play %s sound '%s' for entity %i on channel %s\n", (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "3Dstreamed" : "3D", pSfx->name, iEntNum, S_ChannelNumToName(iEntChannel));
+    if (iChannel < 0) {
+        Com_DPrintf(
+            "Couldn't play %s sound '%s' for entity %i on channel %s\n",
+            (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "3Dstreamed" : "3D",
+            pSfx->name,
+            iEntNum,
+            S_ChannelNumToName(iEntChannel)
+        );
         return;
     }
 
@@ -1132,9 +1302,9 @@ void S_OPENAL_StartSound(
         callbackServer(iEntNum, iChannel, pSfx->name);
     }
 
-    pChannel = &openal.chan_3D[iChannel];
+    pChannel                = &openal.chan_3D[iChannel];
     pChannel->fNewPitchMult = fPitch;
-    pChannel->iEntChannel = iEntChannel;
+    pChannel->iEntChannel   = iEntChannel;
     pChannel->iFlags &= ~(CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
     state = pChannel->get_state();
 
@@ -1149,8 +1319,7 @@ void S_OPENAL_StartSound(
         }
     }
 
-    if (fMinDist < 0.0)
-    {
+    if (fMinDist < 0.0) {
         fMinDist = 200.0;
         fMaxDist = 12800.0;
     }
@@ -1172,7 +1341,8 @@ void S_OPENAL_StartSound(
             pSfx->name,
             pChannel->fVolume,
             fMinDist,
-            fMaxDist);
+            fMaxDist
+        );
     }
 
     pChannel->set_velocity(0, 0, 0);
@@ -1188,17 +1358,19 @@ void S_OPENAL_StartSound(
             VectorClear(pChannel->vOrigin);
         }
 
-        pChannel->set_position(pChannel->vOrigin[0] / 52.49f, pChannel->vOrigin[1] / 52.49f, pChannel->vOrigin[2] / 52.49f);
+        pChannel->set_position(
+            pChannel->vOrigin[0] / 52.49f, pChannel->vOrigin[1] / 52.49f, pChannel->vOrigin[2] / 52.49f
+        );
         pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = 0;
     } else {
         pChannel->iEntNum = iEntNum;
         if (vOrigin) {
-            pChannel->vOrigin[0] = -*vOrigin;
-            pChannel->vOrigin[1] = vOrigin[2];
-            pChannel->vOrigin[2] = -vOrigin[1];
+            pChannel->vOrigin[0]      = -*vOrigin;
+            pChannel->vOrigin[1]      = vOrigin[2];
+            pChannel->vOrigin[2]      = -vOrigin[1];
             bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
-            pChannel->iTime = cl.serverTime - 1;
+            pChannel->iTime           = cl.serverTime - 1;
             if (bSupportWaitTillSoundDone) {
                 pChannel->iTime = 0;
             }
@@ -1220,15 +1392,19 @@ void S_OPENAL_StartSound(
         pChannel->set_sample_loop_count(1);
     }
 
-    if (!bOnlyUpdate && S_OPENAL_ShouldStart(pChannel->vOrigin, pChannel->fMinDist, pChannel->fMaxDist))
-    {
+    if (!bOnlyUpdate && S_OPENAL_ShouldStart(pChannel->vOrigin, pChannel->fMinDist, pChannel->fMaxDist)) {
         pChannel->play();
-        pChannel->iEndTime = cl.serverTime + (int)pChannel->pSfx->time_length + 250;
-        pChannel->iBaseRate = pChannel->sample_playback_rate();
+        pChannel->iEndTime   = cl.serverTime + (int)pChannel->pSfx->time_length + 250;
+        pChannel->iBaseRate  = pChannel->sample_playback_rate();
         pChannel->iStartTime = cl.serverTime;
     }
 }
 
+/*
+==============
+S_OPENAL_AddLoopingSound
+==============
+*/
 void S_OPENAL_AddLoopingSound(
     const vec3_t vOrigin,
     const vec3_t vVelocity,
@@ -1240,13 +1416,13 @@ void S_OPENAL_AddLoopingSound(
     int          iFlags
 )
 {
-    int i;
-    int iFreeLoopSound;
-    sfx_t* pSfx;
-    openal_loop_sound_t* pLoopSound;
+    int                  i;
+    int                  iFreeLoopSound;
+    sfx_t               *pSfx;
+    openal_loop_sound_t *pLoopSound;
 
     iFreeLoopSound = -1;
-    pSfx = &s_knownSfx[sfxHandle];
+    pSfx           = &s_knownSfx[sfxHandle];
     if (!pSfx) {
         return;
     }
@@ -1257,14 +1433,13 @@ void S_OPENAL_AddLoopingSound(
             iFreeLoopSound = i;
             break;
         }
-
     }
 
     if (iFreeLoopSound < 0) {
         for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
             pLoopSound = &openal.loop_sounds[i];
             if (!pLoopSound->pSfx && !pLoopSound->bInUse) {
-                iFreeLoopSound = i;
+                iFreeLoopSound       = i;
                 pLoopSound->bPlaying = false;
                 break;
             }
@@ -1279,22 +1454,22 @@ void S_OPENAL_AddLoopingSound(
         return;
     }
 
-    pLoopSound = &openal.loop_sounds[iFreeLoopSound];
-    pLoopSound->vOrigin[0] = -vOrigin[0];
-    pLoopSound->vOrigin[1] = vOrigin[2];
-    pLoopSound->vOrigin[2] = -vOrigin[1];
+    pLoopSound               = &openal.loop_sounds[iFreeLoopSound];
+    pLoopSound->vOrigin[0]   = -vOrigin[0];
+    pLoopSound->vOrigin[1]   = vOrigin[2];
+    pLoopSound->vOrigin[2]   = -vOrigin[1];
     pLoopSound->vVelocity[0] = -vVelocity[0] / 52.49f / 500.f;
     pLoopSound->vVelocity[1] = vVelocity[2] / 52.49f / 500.f;
     pLoopSound->vVelocity[2] = -vVelocity[1] / 52.49f / 500.f;
-    pLoopSound->pSfx = pSfx;
-    pLoopSound->bInUse = true;
-    pLoopSound->iStartTime = cls.realtime;
-    pLoopSound->fBaseVolume = fVolume;
-    pLoopSound->fMinDist = fMinDist;
-    pLoopSound->fMaxDist = fMaxDist;
-    pLoopSound->fPitch = fPitch;
-    pLoopSound->iFlags = iFlags;
-    pLoopSound->bCombine = VectorCompare(vVelocity, vec_zero) == 0;
+    pLoopSound->pSfx         = pSfx;
+    pLoopSound->bInUse       = true;
+    pLoopSound->iStartTime   = cls.realtime;
+    pLoopSound->fBaseVolume  = fVolume;
+    pLoopSound->fMinDist     = fMinDist;
+    pLoopSound->fMaxDist     = fMaxDist;
+    pLoopSound->fPitch       = fPitch;
+    pLoopSound->iFlags       = iFlags;
+    pLoopSound->bCombine     = VectorCompare(vVelocity, vec_zero) == 0;
 
     if (pLoopSound->bCombine) {
         for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
@@ -1309,11 +1484,16 @@ void S_OPENAL_AddLoopingSound(
     }
 }
 
+/*
+==============
+S_OPENAL_StopLoopingSound
+==============
+*/
 void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
 {
-    bool bMayStop;
-    int i;
-    openal_channel* pChannel;
+    bool            bMayStop;
+    int             i;
+    openal_channel *pChannel;
 
     if (!pLoopSound->bPlaying) {
         return;
@@ -1331,24 +1511,33 @@ void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
 
     if (bMayStop) {
         if (s_show_sounds->integer > 0) {
-            Com_DPrintf("%d (#%i) - stopped loop - %s\n", cl.serverTime, pLoopSound->iChannel, openal.channel[pLoopSound->iChannel]->pSfx->name);
+            Com_DPrintf(
+                "%d (#%i) - stopped loop - %s\n",
+                cl.serverTime,
+                pLoopSound->iChannel,
+                openal.channel[pLoopSound->iChannel]->pSfx->name
+            );
         }
         openal.channel[pLoopSound->iChannel]->force_free();
     }
-    pLoopSound->pSfx = NULL;
+    pLoopSound->pSfx     = NULL;
     pLoopSound->bPlaying = false;
 
     if (pLoopSound->bCombine) {
         for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
-            if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx)
-            {
+            if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx) {
                 openal.loop_sounds[i].bPlaying = false;
-                openal.loop_sounds[i].pSfx = NULL;
+                openal.loop_sounds[i].pSfx     = NULL;
             }
         }
     }
 }
 
+/*
+==============
+S_OPENAL_ClearLoopingSounds
+==============
+*/
 void S_OPENAL_ClearLoopingSounds()
 {
     int i;
@@ -1358,6 +1547,11 @@ void S_OPENAL_ClearLoopingSounds()
     }
 }
 
+/*
+==============
+S_OPENAL_StopLoopingSounds
+==============
+*/
 void S_OPENAL_StopLoopingSounds()
 {
     int i;
@@ -1368,12 +1562,17 @@ void S_OPENAL_StopLoopingSounds()
     }
 }
 
+/*
+==============
+S_OPENAL_StopSound
+==============
+*/
 void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
 {
     int i;
 
     for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
-        openal_channel* pChannel = openal.channel[i];
+        openal_channel *pChannel = openal.channel[i];
         if (!pChannel->is_free() && pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
             pChannel->end_sample();
             break;
@@ -1381,6 +1580,11 @@ void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
     }
 }
 
+/*
+==============
+S_OPENAL_StopAllSounds
+==============
+*/
 void S_OPENAL_StopAllSounds(qboolean bStopMusic)
 {
     int i;
@@ -1390,7 +1594,7 @@ void S_OPENAL_StopAllSounds(qboolean bStopMusic)
     }
 
     for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
-        openal_channel* pChannel = openal.channel[i];
+        openal_channel *pChannel = openal.channel[i];
         if (pChannel) {
             pChannel->force_free();
         }
@@ -1400,21 +1604,24 @@ void S_OPENAL_StopAllSounds(qboolean bStopMusic)
         MUSIC_FreeAllSongs();
         S_TriggeredMusic_Stop();
     }
-    // FIXME: unimplemented
 }
 
+/*
+==============
+S_OPENAL_Start2DLoopSound
+==============
+*/
 static int S_OPENAL_Start2DLoopSound(
     openal_loop_sound_t *pLoopSound, float fVolume, float fVolumeToPlay, float fMinDistance, const vec3_t vLoopOrigin
 )
 {
-    int iChannel;
-    int iSoundOFfset;
-    openal_channel* pChannel;
+    int             iChannel;
+    int             iSoundOFfset;
+    openal_channel *pChannel;
 
     if (pLoopSound->pSfx->iFlags & SFX_FLAG_NO_DATA) {
         iChannel = S_OPENAL_PickChannel2DStreamed(0, 0);
-    }
-    else {
+    } else {
         iChannel = S_OPENAL_PickChannel2D(0, 0);
     }
 
@@ -1440,17 +1647,17 @@ static int S_OPENAL_Start2DLoopSound(
         return -1;
     }
 
-    pChannel->iEntNum = 0;
+    pChannel->iEntNum     = 0;
     pChannel->iEntChannel = 0;
-    pChannel->pSfx = pLoopSound->pSfx;
+    pChannel->pSfx        = pLoopSound->pSfx;
     pChannel->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
     pChannel->iBaseRate = pChannel->sample_playback_rate();
     VectorCopy(vLoopOrigin, pChannel->vOrigin);
-    pChannel->set_sample_offset((int)(pLoopSound->pSfx->info.width
-        * pLoopSound->pSfx->info.rate
-        * (float)(cls.realtime - pLoopSound->iStartTime)
-        / 1000.0)
-        % pLoopSound->pSfx->length);
+    pChannel->set_sample_offset(
+        (int)(pLoopSound->pSfx->info.width * pLoopSound->pSfx->info.rate
+              * (float)(cls.realtime - pLoopSound->iStartTime) / 1000.0)
+        % pLoopSound->pSfx->length
+    );
 
     pChannel->set_sample_loop_count(0);
     pChannel->fVolume = fVolumeToPlay;
@@ -1463,6 +1670,11 @@ static int S_OPENAL_Start2DLoopSound(
     return iChannel;
 }
 
+/*
+==============
+S_OPENAL_Start3DLoopSound
+==============
+*/
 static int S_OPENAL_Start3DLoopSound(
     openal_loop_sound_t *pLoopSound,
     float                fVolumeToPlay,
@@ -1472,25 +1684,24 @@ static int S_OPENAL_Start3DLoopSound(
     const vec3_t         vListenerOrigin
 )
 {
-    int iChannel;
-    vec3_t vDir;
-    int iSoundOffset;
-    openal_channel* pChan3D;
+    int             iChannel;
+    vec3_t          vDir;
+    int             iSoundOffset;
+    openal_channel *pChan3D;
 
     if (pLoopSound->pSfx->iFlags & SFX_FLAG_NO_DATA) {
         return -1;
     }
 
     iChannel = S_OPENAL_PickChannel3D(0, 0);
-    if (iChannel < 0)
-    {
+    if (iChannel < 0) {
         Com_DPrintf("Could not find a free channel\n");
         return iChannel;
     }
 
     pChan3D = &openal.chan_3D[iChannel];
     pChan3D->force_free();
-    pChan3D->iEntNum = 0;
+    pChan3D->iEntNum     = 0;
     pChan3D->iEntChannel = 0;
     pChan3D->set_3d();
 
@@ -1500,16 +1711,16 @@ static int S_OPENAL_Start3DLoopSound(
     }
 
     pChan3D->set_position(vLoopOrigin[0] / 52.49f, pLoopSound->vVelocity[1] / 52.49f, vLoopOrigin[2] / 52.49f);
-    pChan3D->set_velocity(pLoopSound->vVelocity[0] / 52.49f, vLoopOrigin[1] / 52.49f, pLoopSound->vVelocity[2] / 52.49f);
+    pChan3D->set_velocity(
+        pLoopSound->vVelocity[0] / 52.49f, vLoopOrigin[1] / 52.49f, pLoopSound->vVelocity[2] / 52.49f
+    );
     pChan3D->pSfx = pLoopSound->pSfx;
     pChan3D->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
     pChan3D->iBaseRate = pChan3D->sample_playback_rate();
 
-    iSoundOffset = (int)((int)pLoopSound->pSfx->info.width
-        * pLoopSound->pSfx->info.rate
-        * (float)(cls.realtime - pLoopSound->iStartTime)
-        / 1000.0)
-        % pLoopSound->pSfx->length;
+    iSoundOffset = (int)((int)pLoopSound->pSfx->info.width * pLoopSound->pSfx->info.rate
+                         * (float)(cls.realtime - pLoopSound->iStartTime) / 1000.0)
+                 % pLoopSound->pSfx->length;
     pChan3D->set_sample_offset(iSoundOffset);
     pChan3D->set_sample_loop_count(0);
     pChan3D->fVolume = fVolumeToPlay;
@@ -1521,6 +1732,11 @@ static int S_OPENAL_Start3DLoopSound(
     return iChannel;
 }
 
+/*
+==============
+S_OPENAL_UpdateLoopSound
+==============
+*/
 static bool S_OPENAL_UpdateLoopSound(
     openal_loop_sound_t *pLoopSound,
     float                fVolumeToPlay,
@@ -1531,400 +1747,2133 @@ static bool S_OPENAL_UpdateLoopSound(
     const vec3_t         vLoopOrigin
 )
 {
-    // FIXME: unimplemented
-    return false;
+    openal_channel *pChannel;
+    float           fVolume;
+    float           fMaxVolume;
+    vec3_t          vDir;
+    float           fDistance;
+
+    pChannel = openal.channel[pLoopSound->iChannel];
+    if (!pChannel) {
+        return false;
+    }
+
+    if (pChannel->pSfx != pLoopSound->pSfx) {
+        pLoopSound->bPlaying = 0;
+        return false;
+    }
+
+    pChannel->iStartTime = cl.serverTime;
+
+    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)
+        || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
+        vec3_t vOrigin;
+        int    iPan;
+
+        pChannel->fVolume = fVolumeToPlay / 84.0;
+        fVolume           = S_GetBaseVolume() * pChannel->fVolume;
+        fMaxVolume        = fVolume;
+
+        if (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN) {
+            // Center the sound
+            iPan = 64;
+        } else {
+            VectorCopy(vLoopOrigin, vOrigin);
+            iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
+
+            VectorSubtract(vListenerOrigin, vOrigin, vDir);
+            // Clamp the volume by distance
+            fDistance = VectorLength(vDir);
+            if (pChannel->fMinDist >= fDistance) {
+                fVolume = fMaxVolume;
+            } else {
+                fVolume = pChannel->fMinDist / fDistance * fMaxVolume;
+            }
+        }
+
+        pChannel->set_gain(fVolume);
+        pChannel->set_sample_pan(iPan);
+    } else {
+        pChannel->set_position(vLoopOrigin[0] / 52.49f, vLoopOrigin[1] / 52.49f, vLoopOrigin[2] / 52.49f);
+        pChannel->fVolume = fVolumeToPlay;
+        pChannel->set_gain(fVolumeToPlay);
+    }
+
+    if (s_bReverbChanged) {
+        // Make sure to update the reverb
+        S_OPENAL_reverb(pLoopSound->iChannel, s_iReverbType, s_fReverbLevel);
+    }
+
+    return true;
 }
 
+/*
+==============
+S_OPENAL_AddLoopSounds
+==============
+*/
 void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
 {
-    // FIXME: unimplemented
+    int                  i, j;
+    static int           iLoopFrame = 0;
+    float                fDistance;
+    int                  iChannel;
+    vec3_t               vListenerOrigin;
+    vec3_t               vLoopOrigin;
+    openal_loop_sound_t *pLoopSound;
+    float                fTotalVolume;
+    float                fVolumeToPlay;
+    float                fMinDistance, fMaxDistance;
+    float                fVolume;
+    float                fPitch;
+    float                fMaxVolume, fMaxFactor;
+    openal_channel      *pChannel;
+    bool                 bAlreadyAdded[MAX_OPENAL_LOOP_SOUNDS] = {false};
+    vec3_t               alvec;
+
+    qalGetListenerfv(AL_POSITION, alvec);
+    VectorScale(alvec, 52.49f, vListenerOrigin);
+
+    for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
+        vec3_t vDir;
+
+        if (bAlreadyAdded[i]) {
+            continue;
+        }
+
+        pLoopSound = &openal.loop_sounds[i];
+        if (!pLoopSound->pSfx) {
+            continue;
+        }
+        pChannel = openal.channel[pLoopSound->iChannel];
+
+        fMinDistance = pLoopSound->fMinDist;
+        if (fMinDistance < 0) {
+            fMinDistance = 200;
+        }
+
+        fMaxDistance = pLoopSound->fMaxDist;
+        if (fMaxDistance < 0) {
+            fMaxDistance = fMinDistance * 64;
+        }
+
+        fVolume = pLoopSound->fBaseVolume;
+        if (fVolume < 0) {
+            fVolume = 1;
+        }
+        fVolume = fVolume * s_fAmbientVolume;
+
+        fTotalVolume = 0.0;
+        fMaxVolume   = 0.0;
+
+        if (pLoopSound->bPlaying) {
+            pChannel->fNewPitchMult = pLoopSound->fPitch;
+        }
+
+        if (pLoopSound->bCombine) {
+            for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                    VectorSubtract(pLoopSound2->vOrigin, vListenerOrigin, vDir);
+                    VectorCopy(vDir, pLoopSound2->vRelativeOrigin);
+                    fDistance = VectorLength(pLoopSound2->vRelativeOrigin);
+
+                    if (fDistance <= fMinDistance) {
+                        fVolumeToPlay = fVolume;
+                    } else if (fDistance >= fMaxDistance) {
+                        fVolumeToPlay = 0;
+                    } else {
+                        fVolumeToPlay = fMinDistance * fMinDistance * fVolume / (fDistance * fDistance);
+                    }
+
+                    if (fMaxVolume < fVolumeToPlay) {
+                        fMaxVolume = fVolumeToPlay;
+                    }
+                    fTotalVolume += fVolumeToPlay;
+                    bAlreadyAdded[j] = true;
+                }
+            }
+        } else {
+            VectorSubtract(pLoopSound->vOrigin, vListenerOrigin, vDir);
+            VectorCopy(vDir, pLoopSound->vRelativeOrigin);
+            fDistance = VectorLength(pLoopSound->vRelativeOrigin);
+
+            if (fDistance <= fMinDistance) {
+                fTotalVolume = fVolume;
+            } else if (fDistance >= fMaxDistance) {
+                fTotalVolume = 0;
+            } else {
+                fTotalVolume = fMinDistance * fMinDistance * fVolume / (fDistance * fDistance);
+            }
+            pLoopSound->fVolume = fTotalVolume;
+            fMaxVolume          = fTotalVolume;
+        }
+
+        fMaxFactor = sfx_infos[pLoopSound->pSfx->sfx_info_index].max_factor;
+        if (fMaxFactor >= 1 && fMaxVolume * fMaxFactor < fTotalVolume) {
+            fTotalVolume = fMaxVolume * fMaxFactor;
+        }
+
+        if (fTotalVolume <= 0 && !(pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
+            if (pLoopSound->bPlaying) {
+                if (s_show_sounds->integer > 0) {
+                    Com_DPrintf(
+                        "%d (#%i) - stopped loop - %s\n",
+                        cl.serverTime,
+                        pLoopSound->iChannel,
+                        openal.channel[pLoopSound->iChannel]->pSfx->name
+                    );
+                }
+
+                pChannel->stop();
+                pLoopSound->bPlaying = false;
+                if (pLoopSound->bCombine) {
+                    for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                        openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                        if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                            pLoopSound2->bPlaying = false;
+                        }
+                    }
+                }
+            }
+
+            continue;
+        }
+
+        VectorClear(vLoopOrigin);
+
+        if (pLoopSound->bCombine) {
+            for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                    VectorNormalize(pLoopSound2->vRelativeOrigin);
+
+                    VectorScale(
+                        pLoopSound2->vRelativeOrigin, pLoopSound2->fVolume / fTotalVolume, pLoopSound2->vRelativeOrigin
+                    );
+                    VectorAdd(pLoopSound2->vRelativeOrigin, vLoopOrigin, vLoopOrigin);
+                }
+            }
+
+            VectorNormalize(vLoopOrigin);
+            VectorMA(vListenerOrigin, fMinDistance * 0.5f, vLoopOrigin, vLoopOrigin);
+        } else {
+            VectorCopy(pLoopSound->vOrigin, vLoopOrigin);
+        }
+
+        if (pLoopSound->bPlaying) {
+            S_OPENAL_UpdateLoopSound(
+                pLoopSound,
+                S_GetBaseVolume() * 84.0 * fTotalVolume,
+                fMinDistance,
+                fMaxDistance,
+                vListenerOrigin,
+                vTempAxis,
+                vLoopOrigin
+            );
+
+            continue;
+        }
+
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
+        }
+
+        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)
+            || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
+            iChannel = S_OPENAL_Start2DLoopSound(
+                pLoopSound, fVolume, S_GetBaseVolume() * 84.0 * fTotalVolume, fMinDistance, vLoopOrigin
+            );
+        } else {
+            iChannel = S_OPENAL_Start3DLoopSound(
+                pLoopSound,
+                S_GetBaseVolume() * 84.0 * fTotalVolume,
+                fMinDistance,
+                fMaxDistance,
+                vLoopOrigin,
+                vListenerOrigin
+            );
+        }
+
+        if (iChannel < 0) {
+            continue;
+        }
+
+        pLoopSound->bPlaying = 1;
+        pLoopSound->iChannel = iChannel;
+
+        if (pLoopSound->bCombine) {
+            for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                    pLoopSound2->bPlaying = true;
+                    pLoopSound2->iChannel = iChannel;
+                }
+            }
+        }
+    }
 }
 
+/*
+==============
+S_OPENAL_Respatialize
+==============
+*/
 void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxis[3])
 {
-    // FIXME: unimplemented
+    int             i;
+    vec3_t          vOrigin;
+    vec3_t          vVelocity;
+    vec3_t          vEntOrigin;
+    vec3_t          vEntVelocity;
+    vec3_t          vDir;
+    vec3_t          vUp;
+    vec3_t          vListenerOrigin;
+    int             iPan;
+    vec3_t          vTempAxis;
+    float           fMaxVolume;
+    float           fVolume;
+    float           fDist;
+    openal_channel *pChannel;
+    vec3_t          alvec {0};
+    vec3_t          alorientation[2];
+
+    if (cls.no_menus) {
+        return;
+    }
+
+    s_iListenerNumber = iEntNum;
+
+    //
+    // Velocity
+    //
+    qalListenerfv(AL_VELOCITY, alvec);
+    alDieIfError();
+
+    //
+    // Position
+    //
+    alvec[0] = -vHeadPos[0] / 52.49f;
+    alvec[1] = vHeadPos[2] / 52.49f;
+    alvec[2] = -vHeadPos[1] / 52.49f;
+    VectorCopy(alvec, vListenerOrigin);
+    qalListenerfv(AL_POSITION, alvec);
+    alDieIfError();
+
+    //
+    // Orientation
+    //
+    alorientation[0][0] = -vAxis[0][0];
+    alorientation[0][1] = vAxis[2][0];
+    alorientation[0][2] = -vAxis[1][0];
+    alorientation[1][0] = -vAxis[0][2];
+    alorientation[1][1] = vAxis[2][2];
+    alorientation[1][2] = -vAxis[1][2];
+    qalListenerfv(AL_ORIENTATION, (const ALfloat *)alorientation);
+    alDieIfError();
+
+    vTempAxis[0] = -vAxis[0][1];
+    vTempAxis[1] = vAxis[2][1];
+    vTempAxis[2] = -vAxis[1][1];
+
+    fVolume = 1;
+    iPan    = 64;
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        pChannel   = openal.channel[i];
+        fMaxVolume = S_GetBaseVolume() * pChannel->fVolume;
+
+        if (!pChannel) {
+            continue;
+        }
+
+        if (!pChannel->is_playing()) {
+            continue;
+        }
+
+        if (pChannel->iFlags & CHANNEL_FLAG_PAUSED) {
+            continue;
+        }
+
+        if (pChannel->iFlags & CHANNEL_FLAG_NO_ENTITY) {
+            VectorCopy(pChannel->vOrigin, vOrigin);
+
+            if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
+                VectorCopy(vListenerOrigin, vOrigin);
+                if (i >= MAX_OPENAL_CHANNELS_3D) {
+                    fVolume = fMaxVolume;
+                    iPan    = 64;
+                } else {
+                    pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                }
+            } else {
+                if (i >= MAX_OPENAL_CHANNELS_3D) {
+                    iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
+                    VectorSubtract(vListenerOrigin, vOrigin, vDir);
+
+                    fDist = VectorLength(vDir);
+                    if (fDist <= pChannel->fMinDist + 0.001f) {
+                        fVolume = fMaxVolume;
+                    } else if (fDist >= pChannel->fMaxDist - 0.001f) {
+                        fVolume = 0;
+                    } else {
+                        fVolume = (1.0 - (fDist - pChannel->fMinDist) / (pChannel->fMaxDist - pChannel->fMinDist))
+                                * fMaxVolume;
+                    }
+                } else {
+                    pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                }
+            }
+        } else if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
+            VectorCopy(vListenerOrigin, vOrigin);
+            if (i >= MAX_OPENAL_CHANNELS_3D) {
+                fVolume = fMaxVolume;
+                iPan    = 64;
+            } else {
+                pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+            }
+        } else {
+            if (s_entity[pChannel->iEntNum].time < pChannel->iTime) {
+                VectorCopy(pChannel->vOrigin, vOrigin);
+                if (!(pChannel->iFlags & CHANNEL_FLAG_LOOPING)) {
+                    pChannel->end_sample();
+                    continue;
+                }
+            } else {
+                VectorCopy(s_entity[pChannel->iEntNum].position, vEntOrigin);
+                vOrigin[1] = vEntOrigin[2];
+                vOrigin[0] = -vEntOrigin[0];
+                vOrigin[2] = -vEntOrigin[1];
+                VectorCopy(vOrigin, pChannel->vOrigin);
+                pChannel->iTime = s_entity[pChannel->iEntNum].time;
+            }
+
+            if (s_entity[pChannel->iEntNum].use_listener) {
+                VectorCopy(vListenerOrigin, vOrigin);
+            }
+
+            if (pChannel->iEntNum == s_iListenerNumber) {
+                if (vListenerOrigin[0] == vOrigin[0] && vListenerOrigin[2] == vOrigin[2]) {
+                    float fDelta = vListenerOrigin[1] - vOrigin[1];
+
+                    if (fDelta > 89.9f && fDelta < 90.09f) {
+                        VectorCopy(vListenerOrigin, vOrigin);
+                    }
+                }
+            }
+
+            if (i >= MAX_OPENAL_CHANNELS_3D) {
+                iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
+                VectorSubtract(vListenerOrigin, vOrigin, vDir);
+                fDist = VectorLength(vDir);
+                if (fDist <= pChannel->fMinDist + 0.001f) {
+                    fVolume = fMaxVolume;
+                } else if (fDist >= pChannel->fMaxDist - 0.001f) {
+                    fVolume = 0;
+                } else {
+                    fVolume =
+                        (1.0 - (fDist - pChannel->fMinDist) / (pChannel->fMaxDist - pChannel->fMinDist)) * fMaxVolume;
+                }
+            } else {
+                pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                VectorCopy(s_entity[pChannel->iEntNum].velocity, vEntVelocity);
+
+                vVelocity[0] = -vEntVelocity[0] / 52.49f / 500.f;
+                vVelocity[1] = vEntVelocity[2] / 52.49f / 500.f;
+                vVelocity[2] = -vEntVelocity[1] / 52.49f / 500.f;
+                pChannel->set_velocity(vVelocity[0] / 52.49f, vVelocity[1] / 52.49f, vVelocity[2] / 52.49f);
+            }
+        }
+
+        if (i >= MAX_OPENAL_CHANNELS_3D) {
+            pChannel->set_gain(fVolume);
+            pChannel->set_sample_pan(iPan);
+        }
+
+        if (s_bReverbChanged) {
+            S_OPENAL_reverb(i, s_iReverbType, s_fReverbLevel);
+        }
+    }
+
+    S_OPENAL_AddLoopSounds(vTempAxis);
+    s_bReverbChanged = false;
 }
 
+/*
+==============
+S_OPENAL_SpatializeStereoSound
+==============
+*/
 static int S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin)
 {
-    // FIXME: unimplemented
-    return 0;
+    float  lscale, rscale;
+    vec3_t source_vec;
+    int    pan;
+
+    VectorSubtract(origin, listener_origin, source_vec);
+    VectorNormalize(source_vec);
+
+    pan = s_separation->value + (1.f - s_separation->value) * -DotProduct(listener_left, source_vec);
+
+    if (pan < 0) {
+        pan = 0;
+    }
+
+    return pan * 128.f;
 }
 
+/*
+==============
+S_OPENAL_reverb
+==============
+*/
 static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel)
 {
-    // FIXME: unimplemented
+    // No reverb.
 }
 
+/*
+==============
+S_OPENAL_SetReverb
+==============
+*/
 void S_OPENAL_SetReverb(int iType, float fLevel)
 {
-    // FIXME: unimplemented
+    s_fReverbLevel = fLevel;
+    s_iReverbType  = iType;
+    if (al_use_reverb) {
+        s_bReverbChanged = true;
+    }
 }
 
+/*
+==============
+S_OPENAL_Update
+==============
+*/
 void S_OPENAL_Update()
 {
-    // FIXME: unimplemented
+    int             i;
+    openal_channel *pChannel;
+
+    if (cl.snap.ps.stats[STAT_CINEMATIC]) {
+        S_SetGlobalAmbientVolumeLevel(0.5f);
+    } else {
+        S_SetGlobalAmbientVolumeLevel(1.f);
+    }
+
+    if (paused->integer && !s_bSoundPaused) {
+        S_PauseSound();
+    } else if (!paused->integer && s_bSoundPaused) {
+        S_UnpauseSound();
+    }
+
+    if (s_bFading) {
+        s_fFadeVolume = 1.f - (cls.realtime - s_fFadeStartTime) / (s_fFadeStopTime - s_fFadeStartTime);
+        if (s_fFadeVolume < 0) {
+            s_fFadeVolume = 0;
+        }
+        music_volume_changed = true;
+    }
+
+    if (s_volume->modified) {
+        if (s_volume->value > 1) {
+            Cvar_Set("s_volume", "1.0");
+        } else if (s_volume->value < 0) {
+            Cvar_Set("s_volume", "0.0");
+        }
+
+        music_volume_changed = true;
+        s_volume->modified   = 0;
+        al_current_volume    = Square(s_volume->value * s_volume->value);
+        qalListenerf(AL_GAIN, al_current_volume);
+        alDieIfError();
+    }
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (!pChannel->is_playing()) {
+            continue;
+        }
+
+        if (pChannel->fNewPitchMult <= 0) {
+            continue;
+        }
+
+        pChannel->set_sample_playback_rate(pChannel->iBaseRate * pChannel->fNewPitchMult);
+        pChannel->fNewPitchMult = 0;
+    }
+
+    if (s_speaker_type->modified) {
+        if (s_speaker_type->integer) {
+            Com_Printf("FIXME: Allow different speaker types in OpenAL code.\n");
+            Cvar_Set("s_speaker_type", "0");
+        }
+        s_speaker_type->modified = false;
+    }
+
+    if (s_reverb->modified) {
+        s_reverb->modified = false;
+        Com_Printf("FIXME: Allow reverb toggle at runtime in OpenAL code.\n");
+    }
+
+    if (s_show_num_active_sounds->integer == 1) {
+        int num = 0;
+
+        for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+            pChannel = openal.channel[i];
+            if (pChannel && pChannel->is_playing()) {
+                ++num;
+            }
+        }
+        Com_DPrintf("Number of active sounds = %d\n", num);
+    }
+
+    Music_Update();
+
+    for (i = 0; i < MAX_LOOP_SOUNDS; i++) {
+        if (!openal.loop_sounds[i].bInUse) {
+            S_OPENAL_StopLoopingSound(&openal.loop_sounds[i]);
+        }
+    }
 }
 
+/*
+==============
+S_IsSoundPlaying
+==============
+*/
 qboolean S_IsSoundPlaying(int channel_number, const char *sfxName)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    openal_channel *pChannel = openal.channel[channel_number];
+    if (!pChannel) {
+        return false;
+    }
+
+    if (s_bSoundPaused) {
+        return false;
+    }
+
+    if (!pChannel->is_playing()) {
+        return false;
+    }
+
+    if (!pChannel->pSfx || pChannel->pSfx == (sfx_t *)-16) {
+        return false;
+    }
+
+    return !strcmp(sfxName, pChannel->pSfx->name);
 }
 
+/*
+==============
+S_StoreBase
+==============
+*/
 static void S_StoreBase(channelbasesavegame_t *pBase, openal_channel *pChannel)
 {
-    // FIXME: unimplemented
+    if (!pChannel) {
+        return;
+    }
+
+    if (pChannel->iEntChannel == CHAN_MENU || pChannel->is_free()) {
+        pBase->bPlaying      = false;
+        pBase->iOffset       = 0;
+        pBase->iLoopCount    = 0;
+        pBase->sfx.szName[0] = 0;
+        pBase->sfx.iFlags    = 0;
+        pBase->fNewPitchMult = 1.f;
+        pBase->iBaseRate     = pChannel->iBaseRate;
+        pBase->iStatus       = 0;
+    } else {
+        pBase->bPlaying   = true;
+        pBase->iOffset    = pChannel->sample_offset();
+        pBase->iLoopCount = pChannel->sample_loop_count();
+        memcpy(pBase->sfx.szName, pChannel->pSfx->name, sizeof(pBase->sfx.szName));
+        pBase->sfx.iFlags    = pChannel->pSfx->iFlags;
+        pBase->iBaseRate     = pChannel->iBaseRate;
+        pBase->iStatus       = 0;
+        pBase->fNewPitchMult = (float)pBase->iBaseRate / (float)pChannel->sample_playback_rate();
+    }
+
+    pBase->iStartTime                = pChannel->iStartTime - cl.serverTime;
+    pBase->iEndTime                  = pChannel->iEndTime - cl.serverTime;
+    pBase->iEntChannel               = pChannel->iEntChannel;
+    pBase->iEntNum                   = pChannel->iEntNum;
+    pBase->iFlags                    = pChannel->iFlags;
+    pBase->fMaxDist                  = pChannel->fMaxDist;
+    pBase->fMinDist                  = pChannel->fMinDist;
+    pBase->iNextCheckObstructionTime = 0;
+    VectorCopy(pChannel->vOrigin, pBase->vOrigin);
+    pBase->iTime   = pChannel->iTime - cl.serverTime;
+    pBase->fVolume = pChannel->fVolume;
 }
 
+/*
+==============
+S_StartSoundFromBase
+==============
+*/
 static void
 S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx_t *pSfx, bool bStartUnpaused)
 {
-    // FIXME: unimplemented
+    if (!pChannel->set_sfx(pSfx)) {
+        Com_DPrintf("Set sample error - %s\n", pSfx->name);
+        pChannel->iFlags &= ~CHANNEL_FLAG_PLAYABLE;
+        return;
+    }
+
+    pChannel->iBaseRate = pChannel->sample_playback_rate();
+    pChannel->set_gain(pChannel->fVolume);
+    pChannel->set_sample_offset(pBase->iOffset);
+    pChannel->set_sample_playback_rate(pChannel->iBaseRate * pBase->fNewPitchMult);
+
+    if (sfx_infos[pSfx->sfx_info_index].loop_start != -1) {
+        pChannel->set_sample_loop_block(
+            sfx_infos[pSfx->sfx_info_index].loop_start, sfx_infos[pSfx->sfx_info_index].loop_end
+        );
+        pChannel->set_sample_loop_count(1);
+        pChannel->iFlags |= CHANNEL_FLAG_LOOPING;
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf(
+                "loopblock - %d to %d\n",
+                sfx_infos[pSfx->sfx_info_index].loop_start,
+                sfx_infos[pSfx->sfx_info_index].loop_end
+            );
+        }
+    } else {
+        pChannel->set_sample_loop_count(1);
+    }
+
+    if (bStartUnpaused) {
+        pChannel->resume_sample();
+    } else {
+        pChannel->iFlags |= CHANNEL_FLAG_PLAYABLE;
+    }
 }
 
+/*
+==============
+S_LoadBase
+==============
+*/
 static void S_LoadBase(channelbasesavegame_t *pBase, openal_channel *pChannel, bool bStartUnpaused)
 {
-    // FIXME: unimplemented
+    sfxHandle_t handle;
+
+    if (!pChannel) {
+        return;
+    }
+
+    if (!pBase->bPlaying) {
+        return;
+    }
+
+    if (strstr(pBase->sfx.szName, "null.wav")) {
+        return;
+    }
+
+    handle = S_RegisterSound(pBase->sfx.szName, (pBase->sfx.iFlags & SFX_FLAG_DEFAULT_SOUND), false);
+
+    pChannel->iBaseRate     = pBase->iBaseRate;
+    pChannel->iStartTime    = pBase->iStartTime;
+    pChannel->iEndTime      = pBase->iEndTime;
+    pChannel->iEntChannel   = pBase->iEntChannel;
+    pChannel->iEntNum       = pBase->iEntNum;
+    pChannel->iFlags        = pBase->iFlags;
+    pChannel->fMaxDist      = pBase->fMaxDist;
+    pChannel->fMinDist      = pBase->fMinDist;
+    pChannel->fNewPitchMult = pBase->fNewPitchMult;
+    VectorCopy(pBase->vOrigin, pChannel->vOrigin);
+    pChannel->iTime   = pBase->iTime;
+    pChannel->fVolume = pBase->fVolume;
+    pChannel->pSfx    = &s_knownSfx[handle];
+
+    S_StartSoundFromBase(pBase, pChannel, &s_knownSfx[handle], bStartUnpaused);
 }
 
+/*
+==============
+S_SaveData
+==============
+*/
 void S_SaveData(soundsystemsavegame_t *pSave)
 {
-    // FIXME: unimplemented
+    int  i;
+    bool bSoundWasUnpaused;
+
+    bSoundWasUnpaused = !s_bSoundPaused;
+    if (!s_bSoundPaused) {
+        S_PauseSound();
+    }
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        S_StoreBase(&pSave->Channels[i], openal.channel[i]);
+    }
+
+    if (bSoundWasUnpaused) {
+        S_UnpauseSound();
+    }
 }
 
+/*
+==============
+S_ReLoad
+==============
+*/
 void S_ReLoad(soundsystemsavegame_t *pSave)
 {
-    // FIXME: unimplemented
+    int  i;
+    bool bSoundWasUnpaused;
+
+    bSoundWasUnpaused = !s_bSoundPaused;
+    if (!s_bSoundPaused) {
+        S_PauseSound();
+    }
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        S_LoadBase(&pSave->Channels[i], openal.channel[i], bSoundWasUnpaused);
+    }
+
+    if (bSoundWasUnpaused) {
+        S_UnpauseSound();
+    }
 }
 
+/*
+==============
+S_InitBase
+==============
+*/
 static void S_InitBase(channelbasesavegame_t *pBase)
 {
-    // FIXME: unimplemented
+    if (!pBase->bPlaying) {
+        return;
+    }
+
+    if (strstr(pBase->sfx.szName, "null.wav")) {
+        return;
+    }
+
+    SV_AddSvsTimeFixup(&pBase->iStartTime);
+    SV_AddSvsTimeFixup(&pBase->iEndTime);
+    SV_AddSvsTimeFixup(&pBase->iTime);
 }
 
+/*
+==============
+S_LoadData
+==============
+*/
 void S_LoadData(soundsystemsavegame_t *pSave)
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        S_InitBase(&pSave->Channels[i]);
+    }
 }
 
+/*
+==============
+openal_channel::set_velocity
+==============
+*/
 void openal_channel::set_velocity(float v0, float v1, float v2)
 {
-    // FIXME: unimplemented
+    qalSource3f(source, AL_VELOCITY, v0, v1, v2);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_position
+==============
+*/
 void openal_channel::set_position(float v0, float v1, float v2)
 {
-    // FIXME: unimplemented
+    qalSource3f(source, AL_POSITION, v0, v1, v2);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_gain
+==============
+*/
 void openal_channel::set_gain(float gain)
 {
-    // FIXME: unimplemented
+    qalSourcef(source, AL_GAIN, gain);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_no_3d
+==============
+*/
 void openal_channel::set_no_3d()
 {
-    // FIXME: unimplemented
+    qalSource3f(source, AL_POSITION, 0, 0, 0);
+    alDieIfError();
+    qalSource3f(source, AL_VELOCITY, 0, 0, 0);
+    alDieIfError();
+    qalSourcei(source, AL_SOURCE_RELATIVE, true);
+    alDieIfError();
+    qalSourcei(source, AL_LOOPING, false);
+    alDieIfError();
+    qalSourcei(source, AL_ROLLOFF_FACTOR, 0);
+    alDieIfError();
+    qalSourcef(source, AL_GAIN, S_GetBaseVolume());
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_3d
+==============
+*/
 void openal_channel::set_3d()
 {
-    // FIXME: unimplemented
+    qalSourcei(source, AL_SOURCE_RELATIVE, true);
+    alDieIfError();
+    qalSourcei(source, AL_LOOPING, false);
+    alDieIfError();
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 1.f);
+    alDieIfError();
+    qalSourcef(source, AL_GAIN, S_GetBaseVolume());
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::play
+==============
+*/
 void openal_channel::play()
 {
-    // FIXME: unimplemented
+    qalSourcePlay(source);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::pause
+==============
+*/
 void openal_channel::pause()
 {
-    // FIXME: unimplemented
+    qalSourcePause(source);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::stop
+==============
+*/
 void openal_channel::stop()
 {
-    // FIXME: unimplemented
+    qalSourceStop(source);
+    alDieIfError();
 }
 
+/*
+==============
+openal_channel::get_state
+==============
+*/
 ALint openal_channel::get_state()
 {
-    // FIXME: unimplemented
-    return 0;
+    ALint retval;
+
+    qalGetSourcei(source, AL_SOURCE_STATE, &retval);
+    alDieIfError();
+
+    return retval;
 }
 
+/*
+==============
+openal_channel::is_free
+==============
+*/
 bool openal_channel::is_free()
 {
-    // FIXME: unimplemented
-    return false;
+    ALint state = get_state();
+
+    return state == AL_INITIAL || state == AL_STOPPED;
 }
 
+/*
+==============
+openal_channel::is_paused
+==============
+*/
 bool openal_channel::is_paused()
 {
-    // FIXME: unimplemented
-    return false;
+    ALint state = get_state();
+
+    return state == AL_PAUSED;
 }
 
+/*
+==============
+openal_channel::is_playing
+==============
+*/
 bool openal_channel::is_playing()
 {
-    // FIXME: unimplemented
-    return false;
+    ALint state = get_state();
+
+    return state == AL_PLAYING;
 }
 
+/*
+==============
+openal_channel::force_free
+==============
+*/
 void openal_channel::force_free()
 {
-    // FIXME: unimplemented
+    stop();
 }
 
+/*
+==============
+openal_channel::set_sfx
+==============
+*/
 bool openal_channel::set_sfx(sfx_t *pSfx)
 {
-    // FIXME: unimplemented
-    return false;
+    ALfloat freq;
+
+    this->pSfx = pSfx;
+    if (!pSfx->buffer || !qalIsBuffer(pSfx->buffer)) {
+        if (pSfx->iFlags & SFX_FLAG_MP3) {
+            qalGenBuffers(1, &pSfx->buffer);
+            alDieIfError();
+
+            if (!_alutLoadMP3_LOKI(pSfx->buffer, pSfx->data, pSfx->length)) {
+                qalDeleteBuffers(1, &pSfx->buffer);
+                alDieIfError();
+
+                Com_Printf("OpenAL: Failed to load MP3.\n");
+                return false;
+            }
+
+            alDieIfError();
+        } else {
+            ALenum fmt = 0;
+
+            if (pSfx->info.channels == 1) {
+                if (pSfx->info.width == 1) {
+                    fmt = AL_FORMAT_MONO8;
+                } else if (pSfx->info.width == 2) {
+                    fmt = AL_FORMAT_MONO16;
+                }
+            } else if (pSfx->info.channels == 2) {
+                if (pSfx->info.width == 1) {
+                    fmt = AL_FORMAT_STEREO8;
+                } else if (pSfx->info.width == 2) {
+                    fmt = AL_FORMAT_STEREO16;
+                }
+            }
+
+            if (!fmt) {
+                Com_Printf(
+                    "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
+                    pSfx->info.channels,
+                    (int)(pSfx->info.width * 8.f),
+                    pSfx->name
+                );
+                return false;
+            }
+
+            qalGenBuffers(1, &pSfx->buffer);
+            alDieIfError();
+
+            qalBufferData(
+                pSfx->buffer,
+                fmt,
+                &pSfx->data[pSfx->info.dataofs],
+                pSfx->info.samples * pSfx->info.width,
+                pSfx->info.rate
+            );
+            alDieIfError();
+        }
+    }
+
+    qalSourceStop(source);
+    alDieIfError();
+
+    qalSourcei(source, AL_BUFFER, pSfx->buffer);
+    alDieIfError();
+
+    // Get the base frequency
+    qalGetBufferfv(pSfx->buffer, AL_FREQUENCY, &freq);
+    alDieIfError();
+
+    iBaseRate = freq;
+
+    return true;
 }
 
+/*
+==============
+openal_channel::start_sample
+==============
+*/
 void openal_channel::start_sample()
 {
-    // FIXME: unimplemented
+    play();
 }
 
+/*
+==============
+openal_channel::stop_sample
+==============
+*/
 void openal_channel::stop_sample()
 {
-    // FIXME: unimplemented
+    pause();
 }
 
+/*
+==============
+openal_channel::resume_sample
+==============
+*/
 void openal_channel::resume_sample()
 {
-    // FIXME: unimplemented
+    play();
 }
 
+/*
+==============
+openal_channel::end_sample
+==============
+*/
 void openal_channel::end_sample()
 {
-    // FIXME: unimplemented
+    stop();
 }
 
-void openal_channel::set_sample_pan(S32 pan)
-{
-    // FIXME: unimplemented
-}
+/*
+==============
+openal_channel::set_sample_pan
+==============
+*/
+void openal_channel::set_sample_pan(S32 pan) {}
 
-void openal_channel::set_sample_playback_rate(S32 rate)
-{
-    // FIXME: unimplemented
-}
+/*
+==============
+openal_channel::set_sample_playback_rate
+==============
+*/
+void openal_channel::set_sample_playback_rate(S32 rate) {}
 
+/*
+==============
+openal_channel::sample_playback_rate
+==============
+*/
 S32 openal_channel::sample_playback_rate()
 {
-    // FIXME: unimplemented
-    return 0;
+    return 22050;
 }
 
+/*
+==============
+openal_channel::sample_volume
+==============
+*/
 S32 openal_channel::sample_volume()
 {
-    // FIXME: unimplemented
-    return 0;
+    STUB_DESC("sample_volume");
+    return 127;
 }
 
+/*
+==============
+openal_channel::sample_offset
+==============
+*/
 U32 openal_channel::sample_offset()
 {
-    // FIXME: unimplemented
-    return 0;
+    STUB_DESC("sample_offset");
+    return 127;
 }
 
+/*
+==============
+openal_channel::sample_ms_offset
+==============
+*/
 U32 openal_channel::sample_ms_offset()
 {
-    // FIXME: unimplemented
-    return 0;
+    STUB_DESC("sample_ms_offset");
+    return 127;
 }
 
+/*
+==============
+openal_channel::sample_loop_count
+==============
+*/
 U32 openal_channel::sample_loop_count()
 {
-    // FIXME: unimplemented
-    return 0;
+    ALuint queued;
+    ALuint processed;
+    S32    left;
+
+    qalGetSourceiv(source, AL_BUFFERS_QUEUED, (ALint *)&queued);
+    alDieIfError();
+    qalGetSourcei(source, AL_BUFFERS_PROCESSED, (ALint *)&processed);
+    alDieIfError();
+
+    left = queued + ~processed;
+    if (left < 0) {
+        left = 0;
+    }
+    return left;
 }
 
+/*
+==============
+openal_channel::set_sample_offset
+==============
+*/
 void openal_channel::set_sample_offset(U32 offset)
 {
-    // FIXME: unimplemented
+    STUB_DESC("sample_offset");
 }
 
+/*
+==============
+openal_channel::set_sample_ms_offset
+==============
+*/
 void openal_channel::set_sample_ms_offset(U32 offset)
 {
-    // FIXME: unimplemented
+    STUB_DESC("sample_ms_offset");
 }
 
+/*
+==============
+openal_channel::set_sample_loop_count
+==============
+*/
 void openal_channel::set_sample_loop_count(S32 count)
 {
-    // FIXME: unimplemented
+    ALuint processed;
+
+    stop();
+
+    qalGetSourceiv(source, AL_BUFFERS_PROCESSED, (ALint *)&processed);
+    alDieIfError();
+
+    for (ALuint i = 0; i < processed; i++) {
+        ALuint bufName;
+
+        qalSourceUnqueueBuffers(source, 1, &bufName);
+        alDieIfError();
+    }
+
+    for (S32 i = 0; i < count; i++) {
+        qalSourceQueueBuffers(source, 1, &buffer);
+        alDieIfError();
+    }
 }
 
+/*
+==============
+openal_channel::set_sample_loop_block
+==============
+*/
 void openal_channel::set_sample_loop_block(S32 start_offset, S32 end_offset)
 {
-    // FIXME: unimplemented
+    STUB_DESC("sample_loop_block");
 }
 
+/*
+==============
+openal_channel::sample_status
+==============
+*/
 U32 openal_channel::sample_status()
 {
-    // FIXME: unimplemented
-    return 0;
+    STUB_DESC("sample_status");
+    return 127;
 }
 
+/*
+==============
+MUSIC_LoadSoundtrackFile
+==============
+*/
 qboolean MUSIC_LoadSoundtrackFile(const char *filename)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    song_t *psong = NULL;
+    char    args[MAX_MUSIC_SONGS][MAX_RES_NAME];
+    int     numargs;
+    char    com_token[MAX_STRING_CHARS];
+    char    alias[128];
+    char    file[128];
+    char    load_path[128];
+    char   *buffer;
+    char    path[MAX_RES_NAME];
+    int     i;
+    byte   *data;
+
+    if (strrchr(filename, '.')) {
+        Com_sprintf(path, sizeof(path), "%s", filename);
+    } else {
+        Com_sprintf(path, sizeof(path), "%s.mus", filename);
+    }
+
+    FS_ReadFile(path, (void **)&data);
+    if (!data) {
+        Com_DPrintf("Couldn't load %s\n", path);
+        return false;
+    }
+    Com_DPrintf("SOUNDTRACK: Loading %s\n", path);
+
+    MUSIC_StopAllSongs();
+    music_numsongs = 0;
+
+    buffer       = (char *)data;
+    load_path[0] = 0;
+
+    while (1) {
+        strcpy(com_token, COM_GetToken(&buffer, true));
+        if (!com_token[0]) {
+            break;
+        }
+
+        if (strlen(com_token) >= MAX_RES_NAME) {
+            Com_Printf("MUSIC_LoadSoundtrackFile: argument too long, truncating in %s\n", path);
+            com_token[MAX_RES_NAME - 1] = 0;
+        }
+
+        numargs = 1;
+        strcpy(args[0], com_token);
+
+        while (1) {
+            strcpy(com_token, COM_GetToken(&buffer, false));
+            if (!com_token[0]) {
+                break;
+            }
+
+            if (strlen(com_token) >= MAX_RES_NAME) {
+                Com_Printf("MUSIC_LoadSoundtrackFile: argument too long, truncating in %s\n", path);
+                com_token[MAX_RES_NAME - 1] = 0;
+            }
+
+            strcpy(args[numargs], com_token);
+            numargs++;
+        }
+
+        if (!Q_stricmp(args[0], "path")) {
+            strcpy(load_path, args[1]);
+            if (load_path[strlen(load_path) - 1] != '/' && load_path[strlen(load_path) - 1] != '\\') {
+                strcat(load_path, "/");
+            }
+        } else if (args[0][0] == '!') {
+            for (i = 0; i < music_numsongs; i++) {
+                psong = &music_songs[i];
+                if (!Q_stricmp(psong->alias, &args[0][1])) {
+                    break;
+                }
+            }
+
+            if (i == music_numsongs) {
+                Com_Printf("MUSIC_LoadSoundtrackFile: song %s not found, command skipped in %s.\n", &args[0][1], path);
+                continue;
+            }
+
+            if (!Q_stricmp(args[1], "volume")) {
+                psong->volume = atoi(args[2]);
+            } else if (!Q_stricmp(args[1], "fadetime")) {
+                psong->fadetime = atoi(args[2]);
+            } else if (!Q_stricmp(args[1], "loop")) {
+                psong->flags |= 1;
+            } else if (!Q_stricmp(args[1], "restart")) {
+                psong->flags |= 2;
+            } else if (!Q_stricmp(args[1], "interrupt")) {
+                psong->fadetime = 0;
+                psong->flags |= 4 | 2;
+            } else {
+                Com_Printf(
+                    "MUSIC_LoadSoundtrackFile: unknown command %s for song %s in %s.\n", args[1], &args[0][1], path
+                );
+            }
+        } else if (numargs > 1) {
+            strcpy(alias, args[0]);
+            strcpy(file, load_path);
+            strcat(file, args[1]);
+        } else {
+            strcpy(file, load_path);
+            strcat(file, args[1]);
+
+            strncpy(alias, args[0], strlen(args[0]) - 4);
+            file[strlen(args[0]) + MAX_RES_NAME * 2 - 4] = 0;
+
+            if (music_numsongs >= MAX_MUSIC_SONGS) {
+                Com_Printf("MUSIC_LoadSoundtrackFile: Too many songs in %s, skipping %s.\n", path, alias);
+                continue;
+            }
+
+            psong = &music_songs[music_numsongs];
+            strcpy(psong->alias, alias);
+            strcpy(psong->path, file);
+            music_songs[music_numsongs].fadetime    = 1.0;
+            music_songs[music_numsongs].volume      = 1.0;
+            music_songs[music_numsongs].flags       = 0;
+            music_songs[music_numsongs].current_pos = 0;
+            music_songs[music_numsongs].mood_num    = MusicMood_NameToNum(alias);
+            music_numsongs++;
+        }
+    }
+
+    if (!music_numsongs) {
+        Com_Printf("MUSIC_LoadSoundtrackFile: could not load %s, no songs defined.\n", path);
+        FS_FreeFile(data);
+        return false;
+    }
+
+    music_currentsong = -1;
+    FS_FreeFile(data);
+
+    if (music_current_mood == mood_none) {
+        MUSIC_UpdateMood(mood_normal, mood_normal);
+    }
+
+    return true;
 }
 
+/*
+==============
+MUSIC_SongValid
+==============
+*/
 qboolean MUSIC_SongValid(const char *mood)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return MUSIC_FindSong(mood) != -1;
 }
 
+/*
+==============
+MUSIC_Loaded
+==============
+*/
 qboolean MUSIC_Loaded()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return music_loaded;
 }
 
+/*
+==============
+Music_Update
+==============
+*/
 void Music_Update()
 {
-    // FIXME: unimplemented
+    int currentsong;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!music_active) {
+        return;
+    }
+
+    if (s_bSoundPaused) {
+        return;
+    }
+
+    MUSIC_CheckForStoppedSongs();
+
+    if (!MUSIC_Loaded() && music_active && strlen(current_soundtrack)) {
+        MUSIC_LoadSoundtrackFile(current_soundtrack);
+        music_loaded = true;
+    }
+
+    if (music_currentsong >= 0) {
+        currentsong = music_songs[music_currentsong].mood_num;
+    } else {
+        currentsong = -1;
+    }
+
+    if (!music_current_mood) {
+        if (MUSIC_Playing()) {
+            MUSIC_StopAllSongs();
+        }
+    } else if (music_current_mood != currentsong) {
+        const char *mood = MusicMood_NumToName(music_current_mood);
+        if (MUSIC_SongValid(mood) && MUSIC_Loaded() && strlen(current_soundtrack)) {
+            Com_DebugPrintf("Playing %s.\n", mood);
+            MUSIC_PlaySong(mood);
+        }
+    }
+
+    if (new_music_volume != music_volume) {
+        if (music_volume_fade_time > 0) {
+            if (music_volume_direction == 0) {
+                music_volume = (cls.realtime - music_volume_start_time) * (new_music_volume - old_music_volume)
+                                 / (music_volume_fade_time * 1000.f)
+                             + old_music_volume;
+
+                if (music_volume > new_music_volume) {
+                    music_volume         = new_music_volume;
+                    music_volume_changed = 1;
+                } else {
+                    music_volume_changed = 1;
+                }
+            } else if (music_volume_direction == 1) {
+                music_volume = 1.0
+                             - (cls.realtime - music_volume_start_time) * (old_music_volume - new_music_volume)
+                                   / (music_volume_fade_time * 1000.f);
+
+                if (music_volume >= new_music_volume) {
+                    music_volume_changed = true;
+                } else {
+                    music_volume         = new_music_volume;
+                    music_volume_changed = true;
+                }
+            } else {
+                music_volume_changed = true;
+            }
+        } else {
+            music_volume         = new_music_volume;
+            music_volume_changed = true;
+        }
+    }
+
+    MUSIC_UpdateMusicVolumes();
 }
 
+/*
+==============
+MUSIC_SongEnded
+==============
+*/
 void MUSIC_SongEnded()
 {
-    // FIXME: unimplemented
+    Com_DPrintf(
+        "MUSIC: Song ended, changing from [ %s ] to [ %s ]\n",
+        MusicMood_NumToName(music_current_mood),
+        MusicMood_NumToName(music_fallback_mood)
+    );
+    music_current_mood = music_fallback_mood;
 }
 
+/*
+==============
+MUSIC_NewSoundtrack
+==============
+*/
 void MUSIC_NewSoundtrack(const char *name)
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!Q_stricmp(name, current_soundtrack)) {
+        return;
+    }
+
+    // Fixed in OPM
+    //  Make sure to not get past the end of the buffer
+    //strcpy(current_soundtrack, name);
+    Q_strncpyz(current_soundtrack, name, sizeof(current_soundtrack));
+
+    if (!Q_stricmp(current_soundtrack, "none") || !Q_stricmp(current_soundtrack, "")) {
+        music_active = qfalse;
+        if (MUSIC_Playing()) {
+            MUSIC_StopAllSongs();
+        } else {
+            music_active = qtrue;
+            MUSIC_LoadSoundtrackFile(name);
+            music_loaded = qtrue;
+        }
+    }
 }
 
+/*
+==============
+MUSIC_UpdateMood
+==============
+*/
 void MUSIC_UpdateMood(int current, int fallback)
 {
-    // FIXME: unimplemented
+    static int last_current_mood  = -1;
+    static int last_fallback_mood = -1;
+    static int current_mood       = -1;
+    static int fallback_mood      = -1;
+    qboolean   was_action;
+
+    if (current == current_mood && fallback == fallback_mood) {
+        return;
+    }
+
+    was_action          = current == last_current_mood && fallback == last_fallback_mood && current_mood == mood_action;
+    last_current_mood   = current_mood;
+    last_fallback_mood  = fallback_mood;
+    current_mood        = current;
+    music_current_mood  = current;
+    fallback_mood       = fallback;
+    music_fallback_mood = fallback;
+    music_active        = qtrue;
+
+    Com_DPrintf(
+        "MUSIC: changing from [ %s | %s ] to [ %s | %s ]\n",
+        MusicMood_NumToName(last_current_mood),
+        MusicMood_NumToName(last_fallback_mood),
+        MusicMood_NumToName(current_mood),
+        MusicMood_NumToName(fallback)
+    );
+
+    if (was_action) {
+        int songnum = MUSIC_FindSong(MusicMood_NumToName(current_mood));
+
+        if (songnum != -1 && (music_songs[songnum].flags & 4)) {
+            Com_DPrintf(
+                "MUSIC: restoring music from action state, skipping [ %s ] for [ %s ]\n",
+                MusicMood_NumToName(current_mood),
+                MusicMood_NumToName(fallback_mood)
+            );
+            music_current_mood = music_fallback_mood;
+        }
+    }
 }
 
+/*
+==============
+MUSIC_UpdateVolume
+==============
+*/
 void MUSIC_UpdateVolume(float volume, float fade_time)
 {
-    // FIXME: unimplemented
+    if (new_music_volume == volume && music_volume_fade_time == fade_time) {
+        return;
+    }
+
+    old_music_volume        = music_volume;
+    new_music_volume        = volume;
+    music_volume_fade_time  = fade_time;
+    music_volume_start_time = cls.realtime;
+
+    if (volume > music_volume) {
+        music_volume_direction = 0;
+    } else if (volume < music_volume) {
+        music_volume_direction = 1;
+    }
 }
 
+/*
+==============
+MUSIC_StopAllSongs
+==============
+*/
 void MUSIC_StopAllSongs()
 {
-    // FIXME: unimplemented
+    for (int i = 0; i < MAX_OPENAL_SONGS; i++) {
+        MUSIC_StopChannel(i);
+    }
+
+    music_currentsong = -1;
 }
 
+/*
+==============
+MUSIC_FreeAllSongs
+==============
+*/
 void MUSIC_FreeAllSongs()
 {
-    // FIXME: unimplemented
+    MUSIC_StopAllSongs();
+    MUSIC_UpdateMood(mood_none, mood_none);
+    current_soundtrack[0] = 0;
+    music_loaded          = false;
 }
 
+/*
+==============
+MUSIC_Playing
+==============
+*/
 qboolean MUSIC_Playing()
 {
-    // FIXME: unimplemented
-    return qfalse;
+    return MUSIC_CurrentSongChannel() != -1;
 }
 
+/*
+==============
+MUSIC_FindSong
+==============
+*/
 int MUSIC_FindSong(const char *name)
 {
-    // FIXME: unimplemented
-    return 0;
+    int i;
+
+    for (i = 0; i < music_numsongs; i++) {
+        if (!Q_stricmp(music_songs[i].alias, name)) {
+            return i;
+        }
+    }
+
+    return -1;
 }
 
+/*
+==============
+S_loadsoundtrack
+==============
+*/
 void S_loadsoundtrack()
 {
-    // FIXME: unimplemented
+    if (Cmd_Argc() != 2) {
+        Com_Printf("loadsoundtrack <sound track file>\n");
+        return;
+    }
+
+    MUSIC_LoadSoundtrackFile(Cmd_Argv(1));
+    music_loaded = true;
+    Q_strncpyz(current_soundtrack, Cmd_Argv(1), sizeof(current_soundtrack));
 }
 
+/*
+==============
+S_CurrentSoundtrack
+==============
+*/
 const char *S_CurrentSoundtrack()
 {
-    // FIXME: unimplemented
-    return NULL;
+    return current_soundtrack;
 }
 
+/*
+==============
+S_PlaySong
+==============
+*/
 void S_PlaySong()
 {
-    // FIXME: unimplemented
+    if (Cmd_Argc() != 2) {
+        Com_Printf("playsong <song alias>\n");
+        return;
+    }
+
+    MUSIC_PlaySong(Cmd_Argv(1));
+    music_active = true;
 }
 
+/*
+==============
+MUSIC_CurrentSongChannel
+==============
+*/
 int MUSIC_CurrentSongChannel()
 {
-    // FIXME: unimplemented
-    return 0;
+    int channel_number = -1;
+    int ch_idx         = 0;
+
+    for (ch_idx = 0; ch_idx < MAX_OPENAL_SONGS; ch_idx++) {
+        if (openal.chan_song[ch_idx].is_playing() && openal.chan_song[ch_idx].song_number == music_currentsong) {
+            channel_number = ch_idx;
+        }
+    }
+
+    return channel_number;
 }
 
+/*
+==============
+MUSIC_StopChannel
+==============
+*/
 void MUSIC_StopChannel(int channel_number)
 {
-    // FIXME: unimplemented
+    openal_channel *channel = &openal.chan_song[channel_number];
+
+    channel->pause();
+    if (music_songs[channel->song_number].flags & 2) {
+        music_songs[channel->song_number].current_pos = 0;
+    } else {
+        music_songs[channel->song_number].current_pos = channel->sample_ms_offset();
+    }
+
+    channel->stop();
 }
 
+/*
+==============
+MUSIC_PlaySong
+==============
+*/
 qboolean MUSIC_PlaySong(const char *alias)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    int             channel_number;
+    song_t         *song;
+    int             songnum;
+    int             channel_to_play_on;
+    int             fading_song;
+    openal_channel *song_channel;
+    unsigned int    loop_start;
+    int             rate;
+
+    fading_song = 0;
+    songnum     = MUSIC_FindSong(alias);
+
+    if (songnum == -1) {
+        return true;
+    }
+
+    song = &music_songs[songnum];
+
+    if (MUSIC_Playing() && songnum == music_currentsong) {
+        return true;
+    }
+
+    channel_number    = MUSIC_CurrentSongChannel();
+    music_currentsong = songnum;
+
+    if (channel_number != -1) {
+        if (song->flags & 4) {
+            MUSIC_StopChannel(channel_number);
+        } else {
+            song_channel                  = &openal.chan_song[channel_number];
+            song_channel->fading          = FADE_OUT;
+            song_channel->fade_time       = (int)song->fadetime;
+            song_channel->fade_start_time = cls.realtime;
+            fading_song                   = true;
+        }
+    }
+    channel_to_play_on = (fading_song != 0) && (channel_number == 0);
+    song_channel       = &openal.chan_song[channel_to_play_on];
+
+    if (song_channel->is_playing() || song_channel->is_paused()) {
+        MUSIC_StopChannel(channel_to_play_on);
+    }
+
+    if (!S_OPENAL_LoadMP3(FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), song->path), song_channel)) {
+        Com_DPrintf("Could not start music file '%s'!", song->path);
+        return false;
+    }
+
+    rate = song_channel->sample_playback_rate();
+
+    song_channel->song_number = songnum;
+    if (song->current_pos) {
+        song_channel->set_sample_ms_offset(song->current_pos);
+    } else {
+        song_channel->set_sample_offset(rate * 0.063f);
+    }
+
+    if (song->flags & 1) {
+        song_channel->set_sample_loop_count(0);
+        song_channel->set_sample_loop_block(rate * 0.063f, -1);
+    } else {
+        song_channel->set_sample_loop_count(1);
+    }
+
+    if (fading_song) {
+        song_channel->fading    = FADE_IN;
+        song_channel->fade_time = (int)song->fadetime;
+        song_channel->set_gain(0.0);
+        song_channel->fade_start_time = cls.realtime;
+    } else {
+        song_channel->fading = FADE_NONE;
+        song_channel->set_gain(S_GetBaseVolume() * (song->volume * s_ambientVolume->value) * 84.f);
+    }
+
+    song_channel->play();
+
+    return true;
 }
 
+/*
+==============
+MUSIC_UpdateMusicVolumes
+==============
+*/
 void MUSIC_UpdateMusicVolumes()
 {
-    // FIXME: unimplemented
+    int          i;
+    unsigned int current_time;
+    float        new_volume, max_volume;
+
+    if (s_ambientVolume->modified || music_volume_changed) {
+        s_ambientVolume->modified = false;
+
+        for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+            if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
+                continue;
+            }
+
+            if (openal.chan_song[i].fading != FADE_NONE) {
+                continue;
+            }
+
+            openal.chan_song[i].set_gain(
+                S_GetBaseVolume() * (music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value)
+                * 84.0 * music_volume
+            );
+        }
+    }
+
+    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+        if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
+            continue;
+        }
+
+        switch (openal.chan_song[i].fading) {
+        case fade_t::FADE_IN:
+            max_volume = music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value;
+            new_volume = (unsigned int)(cls.realtime - openal.chan_song[i].fade_start_time)
+                       / (openal.chan_song[i].fade_time * 1000.f) * max_volume;
+
+            if (new_volume > max_volume) {
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (max_volume * 84.f * music_volume));
+                openal.chan_song[i].fading = FADE_NONE;
+            } else {
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * 84.f * music_volume));
+            }
+            break;
+        case fade_t::FADE_OUT:
+            max_volume = music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value;
+            new_volume = (unsigned int)(cls.realtime - openal.chan_song[i].fade_start_time)
+                       / (openal.chan_song[i].fade_time * 1000.f) * max_volume;
+
+            if (new_volume > 0) {
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * 84.f * music_volume));
+            } else {
+                MUSIC_StopChannel(i);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    if (s_musicVolume->modified || music_volume_changed) {
+        s_musicVolume->modified = false;
+        if (openal.chan_trig_music.is_playing() || openal.chan_trig_music.is_paused()) {
+            openal.chan_trig_music.set_gain(
+                S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * 84.f
+            );
+        }
+    }
+
+    music_volume_changed = false;
 }
 
+/*
+==============
+MUSIC_CheckForStoppedSongs
+==============
+*/
 void MUSIC_CheckForStoppedSongs()
 {
-    // FIXME: unimplemented
+    int i;
+
+    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+        if (!openal.chan_song[i].is_playing()) {
+            continue;
+        }
+
+        if (openal.chan_song[i].sample_loop_count()) {
+            continue;
+        }
+
+        MUSIC_FindSong(MusicMood_NumToName(music_fallback_mood));
+        if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
+            MUSIC_SongEnded();
+        }
+    }
 }
 
+/*
+==============
+S_TriggeredMusic_SetupHandle
+==============
+*/
 void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffset, qboolean autostart)
 {
-    // FIXME: unimplemented
+    char            *pszFilename;
+    const char      *pszRealName;
+    float            fVolume     = 1.0;
+    AliasListNode_t *pSoundAlias = NULL;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_playing() || openal.chan_trig_music.is_paused()) {
+        Com_DPrintf("Didn't start new triggered music because some was already playing\n");
+        return;
+    }
+
+    openal.chan_trig_music.stop();
+    // Fixed in OPM
+    //  Use strncpy instead
+    //strcpy(openal.tm_filename, pszName);
+    Q_strncpyz(openal.tm_filename, pszName, sizeof(openal.tm_filename));
+
+    openal.tm_loopcount = iLoopCount;
+    openal.chan_trig_music.set_sample_loop_count(iLoopCount);
+    pszRealName = Alias_FindRandom(pszName, &pSoundAlias);
+
+    if (!pszRealName) {
+        pszRealName = pszName;
+    } else if (pSoundAlias) {
+        fVolume = random() * pSoundAlias->volumeMod + pSoundAlias->volume;
+    }
+
+    pszFilename = FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), pszRealName);
+
+    if (!S_OPENAL_LoadMP3(pszFilename, &openal.chan_trig_music)) {
+        S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music);
+        Com_DPrintf("Could not start triggered music '%s'\n", pszName);
+        return;
+    }
+
+    openal.chan_trig_music.fVolume = fVolume;
+    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (fVolume * s_musicVolume->value) * 84.f);
+    openal.chan_trig_music.set_sample_loop_count(iLoopCount);
+    openal.chan_trig_music.set_sample_offset(iOffset);
+
+    if (autostart) {
+        openal.chan_trig_music.play();
+    }
 }
 
+/*
+==============
+S_TriggeredMusic_Start
+==============
+*/
 void S_TriggeredMusic_Start()
 {
-    // FIXME: unimplemented
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstart <sound file>\n");
+        return;
+    }
+
+    S_TriggeredMusic_SetupHandle(Cmd_Argv(1), 1, 0, true);
 }
 
+/*
+==============
+S_TriggeredMusic_StartLoop
+==============
+*/
 void S_TriggeredMusic_StartLoop()
 {
-    // FIXME: unimplemented
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstartloop <sound file>\n");
+        return;
+    }
+
+    S_TriggeredMusic_SetupHandle(Cmd_Argv(1), 0, 0, true);
 }
 
+/*
+==============
+S_TriggeredMusic_Stop
+==============
+*/
 void S_TriggeredMusic_Stop()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    openal.chan_trig_music.stop();
 }
 
+/*
+==============
+S_TriggeredMusic_Pause
+==============
+*/
 void S_TriggeredMusic_Pause()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_playing()) {
+        openal.chan_trig_music.pause();
+    }
 }
 
+/*
+==============
+S_TriggeredMusic_Unpause
+==============
+*/
 void S_TriggeredMusic_Unpause()
 {
-    // FIXME: unimplemented
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_paused()) {
+        openal.chan_trig_music.play();
+    }
+
+    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * 84.f);
 }
 
+/*
+==============
+S_TriggeredMusic_PlayIntroMusic
+==============
+*/
 void S_TriggeredMusic_PlayIntroMusic()
 {
-    // FIXME: unimplemented
+    S_TriggeredMusic_SetupHandle("sound/music/mus_MainTheme.mp3", 0, 0, true);
 }
 
+/*
+==============
+S_StopMovieAudio
+==============
+*/
 void S_StopMovieAudio()
 {
-    // FIXME: unimplemented
+    STUB_DESC("sound stuff.");
 }
 
+/*
+==============
+S_SetupMovieAudio
+==============
+*/
 void S_SetupMovieAudio(const char *pszMovieName)
 {
-    // FIXME: unimplemented
+    STUB_DESC("sound stuff");
 }
 
+/*
+==============
+S_CurrentMoviePosition
+==============
+*/
 int S_CurrentMoviePosition()
 {
-    // FIXME: unimplemented
+    STUB_DESC("sound stuff");
     return 0;
 }
 

From 9b63625c2ba6625779d50728466fb58db5466c37 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:27:10 +0100
Subject: [PATCH 0024/2040] Add snd_codec

---
 code/client/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index af694882..c1761c24 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -32,7 +32,7 @@ if (USE_SOUND_NEW)
 	endif()
 
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")
-	file(GLOB_RECURSE SOURCES_CLIENT_SND "./snd_*_new.c*")
+	file(GLOB_RECURSE SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 endif()
 

From 2629ef17c3a3424d58dc625d78eeab2fca99d64b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:27:20 +0100
Subject: [PATCH 0025/2040] Made snd_codec c++ aware

---
 code/client/snd_codec.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/client/snd_codec.h b/code/client/snd_codec.h
index 49970dff..1ec4b110 100644
--- a/code/client/snd_codec.h
+++ b/code/client/snd_codec.h
@@ -27,6 +27,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct snd_info_s
 {
 	int rate;
@@ -113,4 +117,8 @@ void S_OggOpus_CodecCloseStream(snd_stream_t *stream);
 int S_OggOpus_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer);
 #endif // USE_CODEC_OPUS
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // !_SND_CODEC_H_

From 4e8a51db81704d1587c8c8db3fb68cc4d50d86ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:27:32 +0100
Subject: [PATCH 0026/2040] Fixed Wav not loading properly

---
 code/client/snd_mem_new.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/client/snd_mem_new.c b/code/client/snd_mem_new.c
index b9eee6c6..8317fc54 100644
--- a/code/client/snd_mem_new.c
+++ b/code/client/snd_mem_new.c
@@ -45,11 +45,11 @@ short int GetLittleShort()
     } val;
 
 #    ifdef Q3_LITTLE_ENDIAN
-    val.bytes[1] = data_p[0];
-    val.bytes[0] = data_p[1];
-#    else
     val.bytes[0] = data_p[0];
     val.bytes[1] = data_p[1];
+#    else
+    val.bytes[0] = data_p[1];
+    val.bytes[1] = data_p[0];
 #    endif
 
     data_p += sizeof(short);
@@ -69,15 +69,15 @@ int GetLittleLong()
     } val;
 
 #    ifdef Q3_LITTLE_ENDIAN
-    val.bytes[3] = data_p[0];
-    val.bytes[2] = data_p[1];
-    val.bytes[1] = data_p[2];
-    val.bytes[0] = data_p[3];
-#    else
     val.bytes[0] = data_p[0];
     val.bytes[1] = data_p[1];
     val.bytes[2] = data_p[2];
     val.bytes[3] = data_p[3];
+#    else
+    val.bytes[0] = data_p[3];
+    val.bytes[1] = data_p[2];
+    val.bytes[2] = data_p[1];
+    val.bytes[3] = data_p[0];
 #    endif
 
     data_p += sizeof(int);
@@ -99,11 +99,11 @@ void SetLittleShort(int i)
     val.value = i;
 
 #    ifdef Q3_LITTLE_ENDIAN
-    data_p[0] = val.bytes[1];
-    data_p[1] = val.bytes[0];
-#    else
     data_p[0] = val.bytes[0];
     data_p[1] = val.bytes[1];
+#    else
+    data_p[0] = val.bytes[1];
+    data_p[1] = val.bytes[0];
 #    endif
 
     data_p += sizeof(short);
@@ -124,15 +124,15 @@ void SetLittleLong(int i)
     val.value = i;
 
 #    ifdef Q3_LITTLE_ENDIAN
-    data_p[0] = val.bytes[3];
-    data_p[1] = val.bytes[2];
-    data_p[2] = val.bytes[1];
-    data_p[3] = val.bytes[0];
-#    else
     data_p[0] = val.bytes[0];
     data_p[1] = val.bytes[1];
     data_p[2] = val.bytes[2];
     data_p[3] = val.bytes[3];
+#    else
+    data_p[0] = val.bytes[3];
+    data_p[1] = val.bytes[2];
+    data_p[2] = val.bytes[1];
+    data_p[3] = val.bytes[0];
 #    endif
 
     data_p += sizeof(int);
@@ -166,7 +166,7 @@ void FindNextChunk(const char *name)
         value++;
         value &= ~1;
 
-        last_chunk = data_p + value * 8;
+        last_chunk = data_p + value + 8;
         if (!strncmp((const char *)data_p, name, 4u)) {
             return;
         }

From 3418691f88bc8f45762cc0a18ce873ab9cffe116 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:27:43 +0100
Subject: [PATCH 0027/2040] Added S_NeedFullRestart and S_ReLoad

---
 code/client/snd_local_new.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 8fcd7e6a..707ecc1e 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -218,6 +218,8 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
 
 void S_PrintInfo();
 void S_DumpInfo();
+qboolean S_NeedFullRestart();
+void S_ReLoad(soundsystemsavegame_t* pSave);
 
 extern cvar_t *s_show_sounds;
 

From 5ae88b816dc5c1858f8fc1f0fd41f57411c51b58 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:27:56 +0100
Subject: [PATCH 0028/2040] Initialize pSoundAlias to NULL

---
 code/client/snd_dma_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index 35c78787..816e6043 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -520,7 +520,7 @@ void S_StartLocalSound(const char *sound_name, qboolean force_load)
 {
     sfxHandle_t      sfxHandle;
     const char      *name;
-    AliasListNode_t *pSoundAlias;
+    AliasListNode_t *pSoundAlias = NULL;
 
     if (!s_bSoundStarted) {
         return;

From 187ee87f10fa77564584881746e5bad0bad38017 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:28:13 +0100
Subject: [PATCH 0029/2040] Make sure to initialize new sound system

---
 code/client/cl_main.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 5f836f81..8d63814e 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1579,8 +1579,44 @@ void CL_Snd_Restart_f( void ) {
 	S_Shutdown();
 	S_Init();
 #else
+	qboolean full;
+	soundsystemsavegame_t save;
+	char tm_filename[MAX_RES_NAME];
+	int tm_loopcount;
+	int tm_offset;
+	char current_soundtrack[128];
+
+	full = S_NeedFullRestart();
+
+	//
+	// FIXME: there is a stub function
+	tm_loopcount = 0;
+	tm_offset = 0;
+	//
+
+	SV_ClearSvsTimeFixups();
+
+	S_SaveData(&save);
+	strcpy(current_soundtrack, S_CurrentSoundtrack());
+
 	S_Shutdown(qfalse);
 	S_Init(qfalse);
+
+	s_bSoundPaused = true;
+
+	S_LoadData(&save);
+
+	SV_FinishSvsTimeFixups();
+	S_ReLoad(&save);
+
+	if (tm_filename[0]) {
+		S_TriggeredMusic_SetupHandle(tm_filename, tm_loopcount, tm_offset, 0);
+	}
+
+	MUSIC_NewSoundtrack(current_soundtrack);
+	if (full) {
+		CL_Vid_Restart_f();
+	}
 #endif
 
 	CL_Vid_Restart_f();
@@ -2486,6 +2522,7 @@ void CL_Frame ( int msec ) {
 		&& !com_sv_running->integer ) {
 		// if disconnected, bring up the menu
 		S_StopAllSounds2( qtrue );
+		S_TriggeredMusic_PlayIntroMusic();
 		UI_MenuEscape( "main" );
 	}
 
@@ -3400,6 +3437,8 @@ void CL_Init( void ) {
 
 #if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
 	S_Init2();
+#else
+	S_Init(qtrue);
 #endif
 
 	// fixme: should we leave it?

From 1234bd89c7833ca5c712cf47bd7e84204ccc113a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:54:10 +0100
Subject: [PATCH 0030/2040] Fixed wrong configstring for the soundtrack

---
 code/fgame/g_utils.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 7eb27bf1..828271c7 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1549,22 +1549,20 @@ void RestoreMusicVolume(float fade_time)
 }
 
 void ChangeSoundtrack(const char *soundtrack)
-
 {
     level.saved_soundtrack   = level.current_soundtrack;
     level.current_soundtrack = soundtrack;
 
-    gi.setConfigstring(CS_SOUNDTRACK, soundtrack);
+    gi.setConfigstring(CS_MUSIC, soundtrack);
     gi.DPrintf("soundtrack switched to %s.\n", soundtrack);
 }
 
 void RestoreSoundtrack(void)
-
 {
     if (level.saved_soundtrack.length()) {
         level.current_soundtrack = level.saved_soundtrack;
         level.saved_soundtrack   = "";
-        gi.setConfigstring(CS_SOUNDTRACK, level.current_soundtrack.c_str());
+        gi.setConfigstring(CS_MUSIC, level.current_soundtrack.c_str());
         gi.DPrintf("soundtrack restored %s.\n", level.current_soundtrack.c_str());
     }
 }

From 1fd7bd3fa53e98782c2d09345f226a2ff878a5d0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:54:41 +0100
Subject: [PATCH 0031/2040] Fixed MP3 loading and improperly configured
 channels

---
 code/client/snd_openal_new.cpp | 166 +++++++++++++++++++++++++++------
 1 file changed, 139 insertions(+), 27 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index e86fa40a..c97d34cf 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    include "snd_openal_new.h"
 #    include "client.h"
 #    include "../server/server.h"
-
-#    include <sys/stat.h>
+#    include "snd_codec.h"
 
 typedef struct {
     char  *funcname;
@@ -53,6 +52,8 @@ cvar_t *s_show_sounds;
 cvar_t *s_speaker_type;
 cvar_t *s_obstruction_cal_time;
 cvar_t *s_lastSoundTime;
+// Added in OPM
+cvar_t *s_openaldriver;
 
 static float reverb_table[] = {
     0.5f,   0.25f,        0.417f, 0.653f,      0.208f,      0.5f,   0.403f, 0.5f,   0.5f,
@@ -100,9 +101,22 @@ static void S_OPENAL_Pitch();
 static int
 S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
 static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
+static bool S_OPENAL_LoadMP3_Codec(const char* _path, openal_channel* chan);
 
 #    define alDieIfError() __alDieIfError(__FILE__, __LINE__)
 
+#if defined(_WIN64)
+#define ALDRIVER_DEFAULT "OpenAL64.dll"
+#elif defined(_WIN32)
+#define ALDRIVER_DEFAULT "OpenAL32.dll"
+#elif defined(__APPLE__)
+#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+#elif defined(__OpenBSD__)
+#define ALDRIVER_DEFAULT "libopenal.so"
+#else
+#define ALDRIVER_DEFAULT "libopenal.so.1"
+#endif
+
 /*
 ==============
 __alDieIfError
@@ -242,7 +256,7 @@ static bool S_OPENAL_InitContext()
     const char *dev;
     int         attrlist[6];
 
-    dev = 0;
+    dev = NULL;
     if (s_openaldevice) {
         dev = s_openaldevice->string;
     }
@@ -316,15 +330,18 @@ S_OPENAL_InitExtensions
 */
 static bool S_OPENAL_InitExtensions()
 {
+    Com_Printf("AL extensions ignored\n");
+    return true;
+
     extensions_table_t extensions_table[4] = {
         "alutLoadMP3_LOKI",
-        (void **)_alutLoadMP3_LOKI,
+        (void **)&_alutLoadMP3_LOKI,
         true,
         "alReverbScale_LOKI",
-        (void **)_alReverbScale_LOKI,
+        (void **)&_alReverbScale_LOKI,
         true,
         "alReverbDelay_LOKI",
-        (void **)_alReverbDelay_LOKI,
+        (void **)&_alReverbDelay_LOKI,
         true
     };
     extensions_table_t *i;
@@ -387,7 +404,7 @@ static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
 
     qalGenSources(1, &chan->source);
     alDieIfError();
-    qalSourcei(chan->source, 514, 1);
+    qalSourcei(chan->source, AL_SOURCE_RELATIVE, 1);
     alDieIfError();
 
     return true;
@@ -423,6 +440,17 @@ qboolean S_OPENAL_Init()
     s_show_sounds            = Cvar_Get("s_show_sounds", "0", 0);
     s_speaker_type           = Cvar_Get("s_speaker_type", "0", CVAR_ARCHIVE);
     s_obstruction_cal_time   = Cvar_Get("s_obstruction_cal_time", "500", CVAR_ARCHIVE);
+    //
+    // Added in OPM
+    //  Initialize the AL driver DLL
+    s_openaldriver           = Cvar_Get("s_openaldriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED);
+
+    if (!QAL_Init(s_openaldriver->string)) {
+        Com_Printf("Failed to load library: \"%s\".\n", s_openaldriver->string);
+        if (!Q_stricmp(s_openaldriver->string, ALDRIVER_DEFAULT) || !QAL_Init(ALDRIVER_DEFAULT)) {
+            return qfalse;
+        }
+    }
 
     if (!Cvar_Get("s_initsound", "1", 0)->integer) {
         Com_Printf("OpenAL: s_initsound set to zero...disabling audio.\n");
@@ -461,19 +489,19 @@ qboolean S_OPENAL_Init()
     }
 
     for (i = 0; i < MAX_OPENAL_CHANNELS_2D; i++) {
-        if (!S_OPENAL_InitChannel(i, &openal.chan_2D[i])) {
+        if (!S_OPENAL_InitChannel(i + MAX_OPENAL_CHANNELS_3D, &openal.chan_2D[i])) {
             return false;
         }
     }
 
     for (i = 0; i < MAX_OPENAL_CHANNELS_2D_STREAM; i++) {
-        if (!S_OPENAL_InitChannel(i, &openal.chan_2D_stream[i])) {
+        if (!S_OPENAL_InitChannel(i + MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D, &openal.chan_2D_stream[i])) {
             return false;
         }
     }
 
     for (i = 0; i < MAX_OPENAL_SONGS; i++) {
-        if (!S_OPENAL_InitChannel(i, &openal.chan_song[i])) {
+        if (!S_OPENAL_InitChannel(i + MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM, &openal.chan_song[i])) {
             return false;
         }
     }
@@ -482,11 +510,11 @@ qboolean S_OPENAL_Init()
         return false;
     }
 
-    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_mp3)) {
+    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music)) {
         return false;
     }
 
-    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_MOVIE_ID, &openal.chan_mp3)) {
+    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_MOVIE_ID, &openal.chan_movie)) {
         return false;
     }
 
@@ -504,6 +532,9 @@ qboolean S_OPENAL_Init()
     s_bProvidersEmunerated = true;
     al_initialized         = true;
 
+    // Added in OPM
+    S_CodecInit();
+
     return true;
 }
 
@@ -690,6 +721,8 @@ S_OPENAL_LoadMP3
 */
 static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 {
+    return S_OPENAL_LoadMP3_Codec(_path, chan);
+
     char   path[MAX_QPATH];
     FILE  *in;
     size_t len;
@@ -2754,7 +2787,7 @@ openal_channel::set_sfx
 */
 bool openal_channel::set_sfx(sfx_t *pSfx)
 {
-    ALfloat freq;
+    ALfloat freq = 0;
 
     this->pSfx = pSfx;
     if (!pSfx->buffer || !qalIsBuffer(pSfx->buffer)) {
@@ -2974,7 +3007,7 @@ openal_channel::set_sample_loop_count
 */
 void openal_channel::set_sample_loop_count(S32 count)
 {
-    ALuint processed;
+    ALuint processed = 0;
 
     stop();
 
@@ -3116,16 +3149,18 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
                     "MUSIC_LoadSoundtrackFile: unknown command %s for song %s in %s.\n", args[1], &args[0][1], path
                 );
             }
-        } else if (numargs > 1) {
-            strcpy(alias, args[0]);
-            strcpy(file, load_path);
-            strcat(file, args[1]);
         } else {
-            strcpy(file, load_path);
-            strcat(file, args[1]);
+            if (numargs > 1) {
+                strcpy(alias, args[0]);
+                strcpy(file, load_path);
+                strcat(file, args[1]);
+            } else {
+                strcpy(file, load_path);
+                strcat(file, args[1]);
 
-            strncpy(alias, args[0], strlen(args[0]) - 4);
-            file[strlen(args[0]) + MAX_RES_NAME * 2 - 4] = 0;
+                strncpy(alias, args[0], strlen(args[0]) - 4);
+                file[strlen(args[0]) + MAX_RES_NAME * 2 - 4] = 0;
+            }
 
             if (music_numsongs >= MAX_MUSIC_SONGS) {
                 Com_Printf("MUSIC_LoadSoundtrackFile: Too many songs in %s, skipping %s.\n", path, alias);
@@ -3301,11 +3336,11 @@ void MUSIC_NewSoundtrack(const char *name)
         music_active = qfalse;
         if (MUSIC_Playing()) {
             MUSIC_StopAllSongs();
-        } else {
-            music_active = qtrue;
-            MUSIC_LoadSoundtrackFile(name);
-            music_loaded = qtrue;
         }
+    } else {
+        music_active = qtrue;
+        MUSIC_LoadSoundtrackFile(name);
+        music_loaded = qtrue;
     }
 }
 
@@ -3742,7 +3777,8 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
 
     pszFilename = FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), pszRealName);
 
-    if (!S_OPENAL_LoadMP3(pszFilename, &openal.chan_trig_music)) {
+    //if (!S_OPENAL_LoadMP3(pszFilename, &openal.chan_trig_music)) {
+    if (!S_OPENAL_LoadMP3(pszRealName, &openal.chan_trig_music)) {
         S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music);
         Com_DPrintf("Could not start triggered music '%s'\n", pszName);
         return;
@@ -3877,4 +3913,80 @@ int S_CurrentMoviePosition()
     return 0;
 }
 
+
+/*
+=================
+S_AL_Format
+=================
+*/
+static ALuint S_OPENAL_Format(int width, int channels)
+{
+    ALuint format = AL_FORMAT_MONO16;
+
+    // Work out format
+    if (width == 1)
+    {
+        if (channels == 1)
+            format = AL_FORMAT_MONO8;
+        else if (channels == 2)
+            format = AL_FORMAT_STEREO8;
+    }
+    else if (width == 2)
+    {
+        if (channels == 1)
+            format = AL_FORMAT_MONO16;
+        else if (channels == 2)
+            format = AL_FORMAT_STEREO16;
+    }
+
+    return format;
+}
+
+/*
+==============
+S_OPENAL_LoadMP3_Codec
+==============
+*/
+static bool S_OPENAL_LoadMP3_Codec(const char* _path, openal_channel* chan) {
+    void* data;
+    snd_info_t info;
+    ALuint format;
+
+    // Try to load
+    data = S_CodecLoad(_path, &info);
+    if (!data) {
+        return false;
+    }
+
+    format = S_OPENAL_Format(info.width, info.channels);
+
+    // Create a buffer
+    qalGenBuffers(1, &chan->buffer);
+    alDieIfError();
+
+    // Fill the buffer
+    if (info.size == 0)
+    {
+        // We have no data to buffer, so buffer silence
+        byte dummyData[2] = { 0 };
+
+        qalBufferData(chan->buffer, AL_FORMAT_MONO16, (void*)dummyData, 2, 22050);
+    }
+    else {
+        qalBufferData(chan->buffer, format, data, info.size, info.rate);
+    }
+
+    alDieIfError();
+
+    // Free the memory
+    Hunk_FreeTempMemory(data);
+
+    qalSourcei(chan->source, AL_BUFFER, chan->buffer);
+    alDieIfError();
+
+    chan->set_no_3d();
+
+    return true;
+}
+
 #endif

From ad917d96c8353782f9f43272a7ef6a0d4e00e5dd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 17 Jan 2024 19:33:07 +0100
Subject: [PATCH 0032/2040] Use roundf() for more clarity

---
 code/fgame/scriptthread.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 7146f58b..f4b4a4ca 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2707,12 +2707,12 @@ void ScriptThread::EventDelayThrow(Event *ev)
 
 void ScriptThread::EventWait(Event *ev)
 {
-    Wait((int)(ev->GetFloat(1) * 1000.0f + 0.5f));
+    Wait((int)roundf(ev->GetFloat(1) * 1000.0f));
 }
 
 void ScriptThread::EventWaitFrame(Event *ev)
 {
-    Wait((int)(level.frametime * 1000.0f + 0.5f));
+    Wait((int)roundf(level.frametime * 1000.0f));
 }
 
 void ScriptThread::EventResume(Event *ev)
@@ -4022,7 +4022,7 @@ void ScriptThread::EventDebugInt3(Event *ev)
 
 void ScriptThread::EventTimeout(Event *ev)
 {
-    Director.maxTime = ev->GetFloat(1) * 1000.0f + 0.5f;
+    Director.maxTime = roundf(ev->GetFloat(1) * 1000.0f);
 }
 
 void ScriptThread::EventLandmineDamage(Event *ev)
@@ -4139,7 +4139,7 @@ void ScriptThread::EventEarthquake(Event *ev)
 {
     earthquake_t e;
 
-    e.duration = (int)(ev->GetFloat(1) * 1000.0f + 0.5f);
+    e.duration = (int)roundf(ev->GetFloat(1) * 1000.0f);
     if (e.duration <= 0) {
         return;
     }

From 56b2971deecc00d48dc33716cc3963b92d3f7622 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 17 Jan 2024 20:44:32 +0100
Subject: [PATCH 0033/2040] Fixed AL positioning and volume

---
 code/client/snd_openal_new.cpp | 195 +++++++++++++++++++--------------
 1 file changed, 115 insertions(+), 80 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index c97d34cf..666cfce2 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -101,21 +101,21 @@ static void S_OPENAL_Pitch();
 static int
 S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
 static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
-static bool S_OPENAL_LoadMP3_Codec(const char* _path, openal_channel* chan);
+static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan);
 
 #    define alDieIfError() __alDieIfError(__FILE__, __LINE__)
 
-#if defined(_WIN64)
-#define ALDRIVER_DEFAULT "OpenAL64.dll"
-#elif defined(_WIN32)
-#define ALDRIVER_DEFAULT "OpenAL32.dll"
-#elif defined(__APPLE__)
-#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
-#elif defined(__OpenBSD__)
-#define ALDRIVER_DEFAULT "libopenal.so"
-#else
-#define ALDRIVER_DEFAULT "libopenal.so.1"
-#endif
+#    if defined(_WIN64)
+#        define ALDRIVER_DEFAULT "OpenAL64.dll"
+#    elif defined(_WIN32)
+#        define ALDRIVER_DEFAULT "OpenAL32.dll"
+#    elif defined(__APPLE__)
+#        define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+#    elif defined(__OpenBSD__)
+#        define ALDRIVER_DEFAULT "libopenal.so"
+#    else
+#        define ALDRIVER_DEFAULT "libopenal.so.1"
+#    endif
 
 /*
 ==============
@@ -404,7 +404,7 @@ static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
 
     qalGenSources(1, &chan->source);
     alDieIfError();
-    qalSourcei(chan->source, AL_SOURCE_RELATIVE, 1);
+    qalSourcei(chan->source, AL_SOURCE_RELATIVE, true);
     alDieIfError();
 
     return true;
@@ -443,7 +443,7 @@ qboolean S_OPENAL_Init()
     //
     // Added in OPM
     //  Initialize the AL driver DLL
-    s_openaldriver           = Cvar_Get("s_openaldriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED);
+    s_openaldriver = Cvar_Get("s_openaldriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED);
 
     if (!QAL_Init(s_openaldriver->string)) {
         Com_Printf("Failed to load library: \"%s\".\n", s_openaldriver->string);
@@ -501,7 +501,10 @@ qboolean S_OPENAL_Init()
     }
 
     for (i = 0; i < MAX_OPENAL_SONGS; i++) {
-        if (!S_OPENAL_InitChannel(i + MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM, &openal.chan_song[i])) {
+        if (!S_OPENAL_InitChannel(
+                i + MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM,
+                &openal.chan_song[i]
+            )) {
             return false;
         }
     }
@@ -978,7 +981,8 @@ static qboolean S_OPENAL_ShouldStart(const vec3_t vOrigin, float fMinDist, float
 
     qalGetListenerfv(AL_POSITION, alvec);
 
-    VectorScale(alvec, 52.49f, vListenerOrigin);
+    //VectorScale(alvec, 52.49f, vListenerOrigin);
+    VectorCopy(alvec, vListenerOrigin);
     VectorSubtract(vOrigin, vListenerOrigin, vDir);
 
     return Square(fMaxDist) > VectorLengthSquared(vDir);
@@ -1340,6 +1344,9 @@ void S_OPENAL_StartSound(
     pChannel->iEntChannel   = iEntChannel;
     pChannel->iFlags &= ~(CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
     state = pChannel->get_state();
+    // Fixed in OPM
+    //  Setup the channel for 3D
+    pChannel->set_3d();
 
     if (pChannel->iEntNum == iEntNum && (state == AL_PLAYING || state == AL_PAUSED) && pChannel->pSfx == pSfx) {
         bOnlyUpdate = true;
@@ -1381,9 +1388,10 @@ void S_OPENAL_StartSound(
     pChannel->set_velocity(0, 0, 0);
     if (iEntNum == ENTITYNUM_NONE) {
         if (vOrigin) {
-            pChannel->vOrigin[0] = -vOrigin[0];
-            pChannel->vOrigin[1] = vOrigin[2];
-            pChannel->vOrigin[2] = -vOrigin[1];
+            //pChannel->vOrigin[0] = -vOrigin[0];
+            //pChannel->vOrigin[1] = vOrigin[2];
+            //pChannel->vOrigin[2] = -vOrigin[1];
+            VectorCopy(vOrigin, pChannel->vOrigin);
         } else {
             //VectorClear(vOrigin);
             // Fixed in OPM
@@ -1391,17 +1399,22 @@ void S_OPENAL_StartSound(
             VectorClear(pChannel->vOrigin);
         }
 
+        /*
         pChannel->set_position(
             pChannel->vOrigin[0] / 52.49f, pChannel->vOrigin[1] / 52.49f, pChannel->vOrigin[2] / 52.49f
         );
+        */
+        pChannel->set_position(pChannel->vOrigin[0], pChannel->vOrigin[1], pChannel->vOrigin[2]);
         pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = 0;
     } else {
         pChannel->iEntNum = iEntNum;
         if (vOrigin) {
-            pChannel->vOrigin[0]      = -*vOrigin;
-            pChannel->vOrigin[1]      = vOrigin[2];
-            pChannel->vOrigin[2]      = -vOrigin[1];
+            //pChannel->vOrigin[0] = -vOrigin[0];
+            //pChannel->vOrigin[1] = vOrigin[2];
+            //pChannel->vOrigin[2] = -vOrigin[1];
+            VectorCopy(vOrigin, pChannel->vOrigin);
+
             bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
             pChannel->iTime           = cl.serverTime - 1;
             if (bSupportWaitTillSoundDone) {
@@ -1411,6 +1424,7 @@ void S_OPENAL_StartSound(
             VectorClear(pChannel->vOrigin);
             pChannel->iTime = 0;
         }
+        pChannel->set_position(pChannel->vOrigin[0], pChannel->vOrigin[1], pChannel->vOrigin[2]);
     }
 
     if (pSfxInfo->loop_start != -1) {
@@ -1487,22 +1501,23 @@ void S_OPENAL_AddLoopingSound(
         return;
     }
 
-    pLoopSound               = &openal.loop_sounds[iFreeLoopSound];
-    pLoopSound->vOrigin[0]   = -vOrigin[0];
-    pLoopSound->vOrigin[1]   = vOrigin[2];
-    pLoopSound->vOrigin[2]   = -vOrigin[1];
-    pLoopSound->vVelocity[0] = -vVelocity[0] / 52.49f / 500.f;
-    pLoopSound->vVelocity[1] = vVelocity[2] / 52.49f / 500.f;
-    pLoopSound->vVelocity[2] = -vVelocity[1] / 52.49f / 500.f;
-    pLoopSound->pSfx         = pSfx;
-    pLoopSound->bInUse       = true;
-    pLoopSound->iStartTime   = cls.realtime;
-    pLoopSound->fBaseVolume  = fVolume;
-    pLoopSound->fMinDist     = fMinDist;
-    pLoopSound->fMaxDist     = fMaxDist;
-    pLoopSound->fPitch       = fPitch;
-    pLoopSound->iFlags       = iFlags;
-    pLoopSound->bCombine     = VectorCompare(vVelocity, vec_zero) == 0;
+    pLoopSound             = &openal.loop_sounds[iFreeLoopSound];
+    pLoopSound->vOrigin[0] = -vOrigin[0];
+    pLoopSound->vOrigin[1] = vOrigin[2];
+    pLoopSound->vOrigin[2] = -vOrigin[1];
+    //pLoopSound->vVelocity[0] = -vVelocity[0] / 52.49f / 500.f;
+    //pLoopSound->vVelocity[1] = vVelocity[2] / 52.49f / 500.f;
+    //pLoopSound->vVelocity[2] = -vVelocity[1] / 52.49f / 500.f;
+    VectorCopy(vVelocity, pLoopSound->vVelocity);
+    pLoopSound->pSfx        = pSfx;
+    pLoopSound->bInUse      = true;
+    pLoopSound->iStartTime  = cls.realtime;
+    pLoopSound->fBaseVolume = fVolume;
+    pLoopSound->fMinDist    = fMinDist;
+    pLoopSound->fMaxDist    = fMaxDist;
+    pLoopSound->fPitch      = fPitch;
+    pLoopSound->iFlags      = iFlags;
+    pLoopSound->bCombine    = VectorCompare(vVelocity, vec_zero) == 0;
 
     if (pLoopSound->bCombine) {
         for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
@@ -1743,10 +1758,14 @@ static int S_OPENAL_Start3DLoopSound(
         return -1;
     }
 
+    /*
     pChan3D->set_position(vLoopOrigin[0] / 52.49f, pLoopSound->vVelocity[1] / 52.49f, vLoopOrigin[2] / 52.49f);
     pChan3D->set_velocity(
         pLoopSound->vVelocity[0] / 52.49f, vLoopOrigin[1] / 52.49f, pLoopSound->vVelocity[2] / 52.49f
     );
+    */
+    pChan3D->set_position(vLoopOrigin[0], pLoopSound->vVelocity[1], vLoopOrigin[2]);
+    pChan3D->set_velocity(pLoopSound->vVelocity[0], vLoopOrigin[1], pLoopSound->vVelocity[2]);
     pChan3D->pSfx = pLoopSound->pSfx;
     pChan3D->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
     pChan3D->iBaseRate = pChan3D->sample_playback_rate();
@@ -1827,7 +1846,8 @@ static bool S_OPENAL_UpdateLoopSound(
         pChannel->set_gain(fVolume);
         pChannel->set_sample_pan(iPan);
     } else {
-        pChannel->set_position(vLoopOrigin[0] / 52.49f, vLoopOrigin[1] / 52.49f, vLoopOrigin[2] / 52.49f);
+        //pChannel->set_position(vLoopOrigin[0] / 52.49f, vLoopOrigin[1] / 52.49f, vLoopOrigin[2] / 52.49f);
+        pChannel->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
         pChannel->fVolume = fVolumeToPlay;
         pChannel->set_gain(fVolumeToPlay);
     }
@@ -1865,7 +1885,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
     vec3_t               alvec;
 
     qalGetListenerfv(AL_POSITION, alvec);
-    VectorScale(alvec, 52.49f, vListenerOrigin);
+    //VectorScale(alvec, 52.49f, vListenerOrigin);
 
     for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
         vec3_t vDir;
@@ -2090,9 +2110,10 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Position
     //
-    alvec[0] = -vHeadPos[0] / 52.49f;
-    alvec[1] = vHeadPos[2] / 52.49f;
-    alvec[2] = -vHeadPos[1] / 52.49f;
+    //alvec[0] = -vHeadPos[0] / 52.49f;
+    //alvec[1] = vHeadPos[2] / 52.49f;
+    //alvec[2] = -vHeadPos[1] / 52.49f;
+    VectorCopy(vHeadPos, alvec);
     VectorCopy(alvec, vListenerOrigin);
     qalListenerfv(AL_POSITION, alvec);
     alDieIfError();
@@ -2100,18 +2121,27 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Orientation
     //
+    /*
     alorientation[0][0] = -vAxis[0][0];
     alorientation[0][1] = vAxis[2][0];
     alorientation[0][2] = -vAxis[1][0];
     alorientation[1][0] = -vAxis[0][2];
     alorientation[1][1] = vAxis[2][2];
     alorientation[1][2] = -vAxis[1][2];
+    */
+    alorientation[0][0] = vAxis[0][0];
+    alorientation[0][1] = vAxis[0][1];
+    alorientation[0][2] = vAxis[0][2];
+    alorientation[1][0] = vAxis[2][0];
+    alorientation[1][1] = vAxis[2][1];
+    alorientation[1][2] = vAxis[2][2];
     qalListenerfv(AL_ORIENTATION, (const ALfloat *)alorientation);
     alDieIfError();
 
-    vTempAxis[0] = -vAxis[0][1];
-    vTempAxis[1] = vAxis[2][1];
-    vTempAxis[2] = -vAxis[1][1];
+    //vTempAxis[0] = -vAxis[0][1];
+    //vTempAxis[1] = vAxis[2][1];
+    //vTempAxis[2] = -vAxis[1][1];
+    VectorCopy(vAxis[0], vTempAxis);
 
     fVolume = 1;
     iPan    = 64;
@@ -2141,7 +2171,8 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                     fVolume = fMaxVolume;
                     iPan    = 64;
                 } else {
-                    pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                    //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                    pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 }
             } else {
                 if (i >= MAX_OPENAL_CHANNELS_3D) {
@@ -2158,7 +2189,8 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                                 * fMaxVolume;
                     }
                 } else {
-                    pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                    //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                    pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 }
             }
         } else if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
@@ -2167,7 +2199,8 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                 fVolume = fMaxVolume;
                 iPan    = 64;
             } else {
-                pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
             }
         } else {
             if (s_entity[pChannel->iEntNum].time < pChannel->iTime) {
@@ -2178,9 +2211,10 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                 }
             } else {
                 VectorCopy(s_entity[pChannel->iEntNum].position, vEntOrigin);
-                vOrigin[1] = vEntOrigin[2];
-                vOrigin[0] = -vEntOrigin[0];
-                vOrigin[2] = -vEntOrigin[1];
+                //vOrigin[1] = vEntOrigin[2] / 52.49f;
+                //vOrigin[0] = -vEntOrigin[0] / 52.49f;
+                //vOrigin[2] = -vEntOrigin[1] / 52.49f;
+                VectorCopy(vEntOrigin, vOrigin);
                 VectorCopy(vOrigin, pChannel->vOrigin);
                 pChannel->iTime = s_entity[pChannel->iEntNum].time;
             }
@@ -2212,13 +2246,16 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                         (1.0 - (fDist - pChannel->fMinDist) / (pChannel->fMaxDist - pChannel->fMinDist)) * fMaxVolume;
                 }
             } else {
-                pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
+                pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 VectorCopy(s_entity[pChannel->iEntNum].velocity, vEntVelocity);
 
-                vVelocity[0] = -vEntVelocity[0] / 52.49f / 500.f;
-                vVelocity[1] = vEntVelocity[2] / 52.49f / 500.f;
-                vVelocity[2] = -vEntVelocity[1] / 52.49f / 500.f;
-                pChannel->set_velocity(vVelocity[0] / 52.49f, vVelocity[1] / 52.49f, vVelocity[2] / 52.49f);
+                //vVelocity[0] = -vEntVelocity[0] / 52.49f / 500.f;
+                //vVelocity[1] = vEntVelocity[2] / 52.49f / 500.f;
+                //vVelocity[2] = -vEntVelocity[1] / 52.49f / 500.f;
+                VectorCopy(vEntVelocity, vVelocity);
+                //pChannel->set_velocity(vVelocity[0] / 52.49f, vVelocity[1] / 52.49f, vVelocity[2] / 52.49f);
+                pChannel->set_velocity(vVelocity[0], vVelocity[1], vVelocity[2]);
             }
         }
 
@@ -2676,11 +2713,11 @@ openal_channel::set_3d
 */
 void openal_channel::set_3d()
 {
-    qalSourcei(source, AL_SOURCE_RELATIVE, true);
+    qalSourcei(source, AL_SOURCE_RELATIVE, false);
     alDieIfError();
     qalSourcei(source, AL_LOOPING, false);
     alDieIfError();
-    qalSourcef(source, AL_ROLLOFF_FACTOR, 1.f);
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 0.019f);
     alDieIfError();
     qalSourcef(source, AL_GAIN, S_GetBaseVolume());
     alDieIfError();
@@ -3249,7 +3286,7 @@ void Music_Update()
         currentsong = -1;
     }
 
-    if (!music_current_mood) {
+    if (music_current_mood == mood_none) {
         if (MUSIC_Playing()) {
             MUSIC_StopAllSongs();
         }
@@ -3601,7 +3638,8 @@ qboolean MUSIC_PlaySong(const char *alias)
         MUSIC_StopChannel(channel_to_play_on);
     }
 
-    if (!S_OPENAL_LoadMP3(FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), song->path), song_channel)) {
+    //if (!S_OPENAL_LoadMP3(FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), song->path), song_channel)) {
+    if (!S_OPENAL_LoadMP3(song->path, song_channel)) {
         Com_DPrintf("Could not start music file '%s'!", song->path);
         return false;
     }
@@ -3913,7 +3951,6 @@ int S_CurrentMoviePosition()
     return 0;
 }
 
-
 /*
 =================
 S_AL_Format
@@ -3924,19 +3961,18 @@ static ALuint S_OPENAL_Format(int width, int channels)
     ALuint format = AL_FORMAT_MONO16;
 
     // Work out format
-    if (width == 1)
-    {
-        if (channels == 1)
+    if (width == 1) {
+        if (channels == 1) {
             format = AL_FORMAT_MONO8;
-        else if (channels == 2)
+        } else if (channels == 2) {
             format = AL_FORMAT_STEREO8;
-    }
-    else if (width == 2)
-    {
-        if (channels == 1)
+        }
+    } else if (width == 2) {
+        if (channels == 1) {
             format = AL_FORMAT_MONO16;
-        else if (channels == 2)
+        } else if (channels == 2) {
             format = AL_FORMAT_STEREO16;
+        }
     }
 
     return format;
@@ -3947,10 +3983,11 @@ static ALuint S_OPENAL_Format(int width, int channels)
 S_OPENAL_LoadMP3_Codec
 ==============
 */
-static bool S_OPENAL_LoadMP3_Codec(const char* _path, openal_channel* chan) {
-    void* data;
+static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan)
+{
+    void      *data;
     snd_info_t info;
-    ALuint format;
+    ALuint     format;
 
     // Try to load
     data = S_CodecLoad(_path, &info);
@@ -3965,14 +4002,12 @@ static bool S_OPENAL_LoadMP3_Codec(const char* _path, openal_channel* chan) {
     alDieIfError();
 
     // Fill the buffer
-    if (info.size == 0)
-    {
+    if (info.size == 0) {
         // We have no data to buffer, so buffer silence
-        byte dummyData[2] = { 0 };
+        byte dummyData[2] = {0};
 
-        qalBufferData(chan->buffer, AL_FORMAT_MONO16, (void*)dummyData, 2, 22050);
-    }
-    else {
+        qalBufferData(chan->buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
+    } else {
         qalBufferData(chan->buffer, format, data, info.size, info.rate);
     }
 

From cb9e69238c81f149d0de12149fc1fe7e9cc27732 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 17 Jan 2024 23:15:38 +0100
Subject: [PATCH 0034/2040] Initialize buffer to 0 (integer)

---
 code/client/snd_mem_new.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_mem_new.c b/code/client/snd_mem_new.c
index 8317fc54..13dc44a2 100644
--- a/code/client/snd_mem_new.c
+++ b/code/client/snd_mem_new.c
@@ -431,7 +431,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
     char tempName[MAX_RES_NAME + 1];
     int realKhz;
 
-    sfx->buffer = NULL;
+    sfx->buffer = 0;
 
     if (fileName[0] == '*') {
         return qfalse;

From f1e2a45520e2b7feeaabc9c3675d689828b96938 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:05:57 +0100
Subject: [PATCH 0035/2040] Don't crash if the length is 0

---
 code/client/snd_dma.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c
index dd0fbfca..ac0a29f5 100644
--- a/code/client/snd_dma.c
+++ b/code/client/snd_dma.c
@@ -848,7 +848,11 @@ void S_Base_AddRealLoopingSound( int entityNum, const vec3_t origin, const vec3_
 	}
 
 	if ( !sfx->soundLength ) {
-		Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		// Fixed in OPM
+		//  Why should it crash???
+		//Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		Com_Printf( "%s has length 0", sfx->soundName );
+		return;
 	}
 	VectorCopy( origin, loopSounds[entityNum].origin );
 	VectorCopy( velocity, loopSounds[entityNum].velocity );

From 9255c5259da8c205c35b4f95c633a5ef661c3683 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:23:41 +0100
Subject: [PATCH 0036/2040] Fixed spawnpoint issues

---
 code/fgame/g_client.cpp | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index c11b7f24..a1020954 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -578,6 +578,10 @@ Chooses a player start, deathmatch start, etc
 PlayerStart *SelectSpawnPoint(Player *player)
 {
     PlayerStart *spot = NULL;
+    PlayerStart *spawnpoint;
+    const char  *classID;
+    int          i;
+    int          nFound;
 
     switch (g_gametype->integer) {
     case GT_SINGLE_PLAYER:
@@ -602,15 +606,38 @@ PlayerStart *SelectSpawnPoint(Player *player)
 
     // find a single player start spot
     if (!spot) {
-        while ((spot = (PlayerStart *)G_FindArchivedClass(spot, "info_player_start")) != NULL) {
-            if (level.spawnpoint.icmp(spot->TargetName()) == 0) {
-                break;
+        for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
+            SimpleArchivedEntity *arc = level.m_SimpleArchivedEntities.ObjectAt(i);
+
+            classID = arc->classinfo()->classID;
+            if (!Q_stricmp(classID, "info_player_start")) {
+                spawnpoint = static_cast<PlayerStart *>(arc);
+                if (!str::icmp(level.spawnpoint, spawnpoint->TargetName())) {
+                    spot = spawnpoint;
+                    break;
+                }
             }
         }
 
         if (!spot && !level.spawnpoint.length()) {
-            // there wasn't a spawnpoint without a target, so use any
-            spot = (PlayerStart *)G_FindArchivedClass(NULL, "info_player_start");
+            nFound = 0;
+
+            for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
+                SimpleArchivedEntity *arc = level.m_SimpleArchivedEntities.ObjectAt(i);
+
+                classID = arc->classinfo()->classID;
+                if (!Q_stricmp(classID, "info_player_start")) {
+                    int randVal;
+
+                    spawnpoint = static_cast<PlayerStart *>(arc);
+                    nFound++;
+
+                    randVal = rand();
+                    if (randVal == randVal / nFound * nFound) {
+                        spot = spawnpoint;
+                    }
+                }
+            }
         }
 
         if (!spot) {
@@ -786,7 +813,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
     Q_strncpyz(client->pers.userinfo, u, sizeof(client->pers.userinfo));
 }
 
-void G_BotConnect(int clientNum, const char* userinfo)
+void G_BotConnect(int clientNum, const char *userinfo)
 {
     gclient_t *client;
     gentity_t *ent;

From 55582a85abee387b054ecac13a5307bf8ab25f62 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:39:04 +0100
Subject: [PATCH 0037/2040] Fixed entityNum callback

---
 code/client/snd_openal_new.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 666cfce2..0337eb56 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1166,14 +1166,14 @@ static void S_OPENAL_Start2DSound(
             "Couldn't play %s sound '%s' for entity %i on channel %s\n",
             (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "2Dstreamed" : "2D",
             pSfx->name,
-            iEntNum & ~S_FLAG_DO_CALLBACK,
+            iRealEntNum,
             S_ChannelNumToName(iEntChannel)
         );
         return;
     }
 
     if (iEntNum & S_FLAG_DO_CALLBACK) {
-        callbackServer(iEntNum, iFreeChannel, pSfx->name);
+        callbackServer(iRealEntNum, iFreeChannel, pSfx->name);
     }
 
     pChannel = openal.channel[iFreeChannel];
@@ -1207,7 +1207,7 @@ static void S_OPENAL_Start2DSound(
     pChannel->pSfx          = pSfx;
     pChannel->iEntNum       = iRealEntNum;
     pChannel->iEntChannel   = iEntChannel;
-    if (iEntNum == ENTITYNUM_NONE) {
+    if (iRealEntNum == ENTITYNUM_NONE) {
         VectorClear(pChannel->vOrigin);
         pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = 0;

From d9fb37581261048e38a1873324cbcc86336aacd2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Jan 2024 20:46:15 +0100
Subject: [PATCH 0038/2040] Fixed collision issues due to steps

---
 code/fgame/bg_slidemove.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/fgame/bg_slidemove.cpp b/code/fgame/bg_slidemove.cpp
index 59e79211..bbdfee39 100644
--- a/code/fgame/bg_slidemove.cpp
+++ b/code/fgame/bg_slidemove.cpp
@@ -49,7 +49,6 @@ qboolean	PM_SlideMove( qboolean gravity )
 	float		d;
 	int			numplanes;
 	vec3_t		planes[ MAX_CLIP_PLANES ];
-	vec3_t		primal_velocity;
 	vec3_t		clipVelocity;
 	int			i, j, k;
 	trace_t	trace;
@@ -61,13 +60,11 @@ qboolean	PM_SlideMove( qboolean gravity )
 
 	numbumps = 4;
 
-	VectorCopy( pm->ps->velocity, primal_velocity );
+	VectorCopy( pm->ps->velocity, endVelocity );
 
 	if( gravity ) {
-		VectorCopy( pm->ps->velocity, endVelocity );
 		endVelocity[ 2 ] -= pm->ps->gravity * pml.frametime;
 		pm->ps->velocity[ 2 ] = ( pm->ps->velocity[ 2 ] + endVelocity[ 2 ] ) * 0.5;
-		primal_velocity[ 2 ] = endVelocity[ 2 ];
 		if( pml.groundPlane ) {
 			// slide along the ground plane
 			PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal,
@@ -113,7 +110,7 @@ qboolean	PM_SlideMove( qboolean gravity )
 			break;		// moved the entire distance
 		}
 
-		if( ( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL ) && ( trace.plane.normal[ 2 ] > 0 ) )
+		if( ( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL ) && ( trace.plane.normal[ 2 ] > 0 ) && DotProduct(trace.plane.normal, pm->ps->velocity) <= 0 )
 		{
 			// treat steep walls as vertical
 			trace.plane.normal[ 2 ] = 0;
@@ -301,6 +298,13 @@ void PM_StepSlideMove( qboolean gravity )
 	down[ 2 ] -= STEPSIZE;
 
 	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+	if (trace.startsolid) {
+		// Fixed in OPM
+		VectorCopy(nostep_o, pm->ps->origin);
+		VectorCopy(nostep_v, pm->ps->velocity);
+		return;
+	}
+	
 	if( !trace.allsolid )
 	{
 		if( bWasOnGoodGround && trace.fraction < 1.0 && trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )

From 748934edcd35e3bde7506f676a1aabbdffaab81a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Jan 2024 23:30:38 +0100
Subject: [PATCH 0039/2040] Fixed incorrect box in brush testing

---
 code/qcommon/cm_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
index 9fbc5f34..85b5f4fe 100644
--- a/code/qcommon/cm_trace.c
+++ b/code/qcommon/cm_trace.c
@@ -183,7 +183,7 @@ void CM_TestBoxInBrush( traceWork_t *tw, cbrush_t *brush ) {
 			t = DotProduct( plane->normal, sphere.offset );
 
 			// adjust the plane distance apropriately for radius
-			dist = t + plane->dist + sphere.radius;
+			dist = fabs(t) + plane->dist + sphere.radius;
 
 			d1 = DotProduct( tw->start, plane->normal ) - dist;
 			// if completely in front of face, no intersection

From bff58ae6159d4db10a001d0c2024d68c8eee0b2d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Jan 2024 23:30:48 +0100
Subject: [PATCH 0040/2040] Removed trace.startsolid check

---
 code/fgame/bg_slidemove.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/fgame/bg_slidemove.cpp b/code/fgame/bg_slidemove.cpp
index bbdfee39..a90e2a46 100644
--- a/code/fgame/bg_slidemove.cpp
+++ b/code/fgame/bg_slidemove.cpp
@@ -298,13 +298,6 @@ void PM_StepSlideMove( qboolean gravity )
 	down[ 2 ] -= STEPSIZE;
 
 	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if (trace.startsolid) {
-		// Fixed in OPM
-		VectorCopy(nostep_o, pm->ps->origin);
-		VectorCopy(nostep_v, pm->ps->velocity);
-		return;
-	}
-	
 	if( !trace.allsolid )
 	{
 		if( bWasOnGoodGround && trace.fraction < 1.0 && trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )

From ac02afaae622d81bd7a2445bfa94aee143a25890 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Jan 2024 23:48:49 +0100
Subject: [PATCH 0041/2040] Don't spam the console with OpenAL errors

---
 code/client/snd_openal_new.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 0337eb56..8361df5a 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -126,7 +126,9 @@ static void __alDieIfError(const char *file, int line)
 {
     ALint alErr = qalGetError();
     if (alErr) {
-        Com_DPrintf("OpenAL error, %s, line %i: [%s].\n", file, line, qalGetString(alErr));
+        if (s_show_sounds->integer) {
+            Com_DPrintf("OpenAL error, %s, line %i: [%s].\n", file, line, qalGetString(alErr));
+        }
     }
 }
 

From cc048f50991f325cf6c48f036e11368ce1d0d761 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Jan 2024 23:50:15 +0100
Subject: [PATCH 0042/2040] Fixed some sounds being improperly replaced

---
 code/client/snd_dma_new.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index 816e6043..8458bd18 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -261,6 +261,7 @@ sfx_t *S_FindName(const char *name, int sequenceNumber)
             Com_Error(ERR_FATAL, "S_FindName: out of sfx_t");
         }
 
+        sfx = &s_knownSfx[s_numSfx];
         s_numSfx++;
     }
 

From dd378db4d08e0e42558bfca95cb8028f82b572c2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jan 2024 00:08:27 +0100
Subject: [PATCH 0043/2040] Avoid the use of fabs() for dot product

---
 code/qcommon/cm_trace.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
index 85b5f4fe..10460b29 100644
--- a/code/qcommon/cm_trace.c
+++ b/code/qcommon/cm_trace.c
@@ -181,9 +181,13 @@ void CM_TestBoxInBrush( traceWork_t *tw, cbrush_t *brush ) {
 
 			// find the closest point on the capsule to the plane
 			t = DotProduct( plane->normal, sphere.offset );
+			if( t < 0 )
+			{
+				t = -t;
+			}
 
 			// adjust the plane distance apropriately for radius
-			dist = fabs(t) + plane->dist + sphere.radius;
+			dist = t + plane->dist + sphere.radius;
 
 			d1 = DotProduct( tw->start, plane->normal ) - dist;
 			// if completely in front of face, no intersection

From b8e8aead93c19e7f2cd0e0d3c693ee1a5c4e52cd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jan 2024 22:19:15 +0100
Subject: [PATCH 0044/2040] Fixed issues with multiple consecutive dollars

This fixes the issue with scripts, like `m6l1c` that accidentally use double dollars for targetnames, like `$$player`
---
 code/parser/lex_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 6f3bb3d2..e61c6654 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -286,7 +286,7 @@ varname		[a-zA-Z0-9_\"]+
 "&="							{ YYLEX( TOKEN_AND_EQUALS ); }
 "^="							{ YYLEX( TOKEN_EXCL_OR_EQUALS ); }
 "|="							{ YYLEX( TOKEN_OR_EQUALS ); }
-"$"								{ BEGIN( VARIABLES ); YYLEX( TOKEN_DOLLAR ); }
+[$]+							{ BEGIN( VARIABLES ); YYLEX( TOKEN_DOLLAR ); }
 "!"								{ YYLEX( TOKEN_NOT ); }
 "~"								{ YYLEX( TOKEN_COMPLEMENT ); }
 

From b6b35079efb9735a3e2b489d01b819ae364b14e4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jan 2024 23:53:13 +0100
Subject: [PATCH 0045/2040] Fixed crouch height bounding box

---
 code/fgame/player.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 5b524fa0..87df5a5f 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3949,24 +3949,25 @@ void Player::ClientMove(usercmd_t *ucmd)
         client->ps.pm_flags |= PMF_NO_PREDICTION;
         client->ps.pm_flags |= PMF_NO_MOVE;
     }
-
-    /*
-    if (maxs.z == 60.0f) {
-        client->ps.pm_flags |= PMF_DUCKED;
-    } else if (maxs.z == 54.0f) {
-        client->ps.pm_flags |= PMF_DUCKED | PMF_VIEW_PRONE;
-    } else if (maxs.z == 20.0f) {
-        client->ps.pm_flags |= PMF_VIEW_PRONE;
-    } else if (maxs.z == 53.0f) {
-        client->ps.pm_flags |= PMF_VIEW_DUCK_RUN;
-    } else if (viewheight == 52) {
-        client->ps.pm_flags |= PMF_VIEW_JUMP_START;
-    }
-    */
-    if (maxs.z == 54.0f || maxs.z == 60.0f) {
-        client->ps.pm_flags |= PMF_DUCKED;
-    } else if (viewheight == 52) {
-        client->ps.pm_flags |= PMF_VIEW_JUMP_START;
+    
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        if (maxs.z == 54.0f || maxs.z == 60.0f) {
+            client->ps.pm_flags |= PMF_DUCKED;
+        } else if (viewheight == JUMP_START_VIEWHEIGHT) {
+            client->ps.pm_flags |= PMF_VIEW_JUMP_START;
+        }
+    } else {
+        if (maxs.z == 60.0f) {
+            client->ps.pm_flags |= PMF_DUCKED;
+        } else if (maxs.z == 54.0f) {
+            client->ps.pm_flags |= PMF_DUCKED | PMF_VIEW_PRONE;
+        } else if (maxs.z == 20.0f) {
+            client->ps.pm_flags |= PMF_VIEW_PRONE;
+        } else if (maxs.z == 53.0f) {
+            client->ps.pm_flags |= PMF_VIEW_DUCK_RUN;
+        } else if (viewheight == JUMP_START_VIEWHEIGHT) {
+            client->ps.pm_flags |= PMF_VIEW_JUMP_START;
+        }
     }
 
     switch (movecontrol) {

From ef4b79b1f54b1c889d9d2265c7df4e617236d658 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jan 2024 23:53:25 +0100
Subject: [PATCH 0046/2040] Fixed pm_flags being wrong on Allied Assault

---
 code/qcommon/bg_compat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/bg_compat.cpp b/code/qcommon/bg_compat.cpp
index e30396d3..d53cd2e2 100644
--- a/code/qcommon/bg_compat.cpp
+++ b/code/qcommon/bg_compat.cpp
@@ -54,7 +54,7 @@ static uint32_t CPT_NormalizePlayerStateFlags_ver_6(uint32_t flags) {
 
     // Convert AA PlayerMove flags to SH/BT flags
     normalizedFlags |= flags & (1 << 0);
-    for (size_t i = 2; i < 32; ++i)
+    for (size_t i = 1; i < 32; ++i)
     {
         if (flags & (1 << (i + 2))) {
             normalizedFlags |= (1 << i);
@@ -70,7 +70,7 @@ static uint32_t CPT_DenormalizePlayerStateFlags_ver_6(uint32_t flags) {
 
     // Convert AA PlayerMove flags to SH/BT flags
     normalizedFlags |= flags & (1 << 0);
-    for (size_t i = 2; i < 32; ++i)
+    for (size_t i = 1; i < 32; ++i)
     {
 		if (flags & (1 << i)) {
             normalizedFlags |= (1 << (i + 2));

From 840501c8dd9f9ddedad907e7f3e33162d2d7c8b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 23 Jan 2024 00:04:41 +0100
Subject: [PATCH 0047/2040] Fixed waffenss skin name

---
 code/client/cl_ui.cpp                  | 1 +
 code/client/cl_uiplayermodelpicker.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 56e01306..3b2e6769 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3333,6 +3333,7 @@ void UI_GetPlayerModel_f(void)
     Cvar_Set("ui_dm_playergermanmodel_set", pszUIPlayerModel);
 
     if (!strncmp(pszUIPlayerModel, "german_waffen_", 14)) {
+        Q_strncpyz(donotshowssindeorfr, "german_waffenss_", sizeof(donotshowssindeorfr));
         Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), pszUIPlayerModel + 14);
         Cvar_Set("ui_disp_playergermanmodel", va("models/player/%s.tik", donotshowssindeorfr));
     } else {
diff --git a/code/client/cl_uiplayermodelpicker.cpp b/code/client/cl_uiplayermodelpicker.cpp
index 1ef4e1e5..e7af68a1 100644
--- a/code/client/cl_uiplayermodelpicker.cpp
+++ b/code/client/cl_uiplayermodelpicker.cpp
@@ -295,7 +295,7 @@ void PlayerModelPickerClass::FileSelected(Event *ev)
     fullname = PM_DisplaynameToFilename(name);
 
     if (!Q_stricmpn(fullname, "german_waffen_", 14)) {
-        Q_strncpyz(donotshowssindeorfr, "german_waffen_", sizeof(donotshowssindeorfr));
+        Q_strncpyz(donotshowssindeorfr, "german_waffenss_", sizeof(donotshowssindeorfr));
         Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), fullname.c_str() + 14);
     } else {
         Q_strncpyz(donotshowssindeorfr, fullname, sizeof(donotshowssindeorfr));

From 9ab28dc7da8f6f1db31090678475e236776ca78f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 23 Jan 2024 22:42:27 +0100
Subject: [PATCH 0048/2040] Fixed objective maps appearing twice

---
 code/client/cl_uimpmappicker.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/code/client/cl_uimpmappicker.cpp b/code/client/cl_uimpmappicker.cpp
index 577f9b48..453dbfca 100644
--- a/code/client/cl_uimpmappicker.cpp
+++ b/code/client/cl_uimpmappicker.cpp
@@ -180,12 +180,14 @@ void MpMapPickerClass::SetupFiles(void)
         FS_FreeFileList(filenames);
     }
 
-    if (currentDirectory.length()) {
-        if (currentDirectory == "maps/-/") {
-            SetupSecondaryFiles(currentDirectory, bTugOfWar, bObjective, bLiberation);
-        } else {
-            SetupSecondaryFiles("maps/obj/", bTugOfWar, bObjective, bLiberation);
-            SetupSecondaryFiles("maps/lib/", bTugOfWar, bObjective, bLiberation);
+    if (com_target_game->integer > target_game_e::TG_MOH) {
+        if (currentDirectory.length()) {
+            if (currentDirectory == "maps/-/") {
+                SetupSecondaryFiles(currentDirectory, bTugOfWar, bObjective, bLiberation);
+            } else {
+                SetupSecondaryFiles("maps/obj/", bTugOfWar, bObjective, bLiberation);
+                SetupSecondaryFiles("maps/lib/", bTugOfWar, bObjective, bLiberation);
+            }
         }
     }
 
@@ -278,9 +280,9 @@ void MpMapPickerClass::FileSelected(Event *ev)
 
     uii.Snd_PlaySound("sound/menu/apply.wav");
 
-    UIListCtrlItem* item = listbox->GetItem(listbox->getCurrentItem());
-    str name = item->getListItemString(0);
-    str directory = item->getListItemString(1);
+    UIListCtrlItem *item      = listbox->GetItem(listbox->getCurrentItem());
+    str             name      = item->getListItemString(0);
+    str             directory = item->getListItemString(1);
 
     FileSelected(directory, name, directory + name);
 }
@@ -305,9 +307,9 @@ void MpMapPickerClass::FileChosen(Event *ev)
 
     uii.Snd_PlaySound("sound/menu/apply.wav");
 
-    UIListCtrlItem* item = listbox->GetItem(listbox->getCurrentItem());
-    str name = item->getListItemString(0);
-    str directory = item->getListItemString(1);
+    UIListCtrlItem *item      = listbox->GetItem(listbox->getCurrentItem());
+    str             name      = item->getListItemString(0);
+    str             directory = item->getListItemString(1);
 
     FileSelected(directory, name, directory + name);
 }

From 92ee1d9caf8f71d5d5fdbcb47add9fc7c783722b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:19:22 +0100
Subject: [PATCH 0049/2040] Reset location print after sending it

---
 code/server/sv_snapshot.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index b319f97e..1abafffe 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -222,6 +222,7 @@ static void SV_WriteSnapshotToClient( client_t *client, msg_t *msg ) {
 			MSG_WriteShort( msg, client->XOffset );
 			MSG_WriteShort( msg, client->YOffset );
 			MSG_WriteScrambledString( msg, client->stringToPrint );
+			client->locprint = qfalse;
 		}
 		else {
 			MSG_WriteSVC( msg, svc_centerprint );

From 97a0bd90ec8b72ca4de4f8a8ab6937c9bc2cd26b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:37:43 +0100
Subject: [PATCH 0050/2040] Set default values for `sv_invulnerabletime` and
 `sv_team_spawn_interval` depending on the target protocol

---
 code/fgame/gamecvars.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index f0fd97d2..e93ce97b 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -258,7 +258,7 @@ cvar_t *g_no_seasick;
 
 cvar_t *g_aistats;
 
-cvar_t* g_obituarylocation;
+cvar_t *g_obituarylocation;
 
 cvar_t *sv_scriptfiles;
 
@@ -332,7 +332,7 @@ void CVAR_Init(void)
     sv_waterspeed    = gi.Cvar_Get("sv_waterspeed", "400", 0);
 
     sv_cheats    = gi.Cvar_Get("cheats", "0", CVAR_USERINFO | CVAR_SERVERINFO | CVAR_LATCH);
-    sv_fps       = gi.Cvar_Get("sv_fps", "20",  CVAR_SAVEGAME);
+    sv_fps       = gi.Cvar_Get("sv_fps", "20", CVAR_SAVEGAME);
     sv_cinematic = gi.Cvar_Get("sv_cinematic", "0", CVAR_ROM);
 
     sv_maplist = gi.Cvar_Get("sv_maplist", "", CVAR_ARCHIVE | CVAR_SERVERINFO);
@@ -348,8 +348,8 @@ void CVAR_Init(void)
     sv_sprinttime_dm = gi.Cvar_Get("sv_sprinttime_dm", "5.0", 0);
     sv_sprintmult_dm = gi.Cvar_Get("sv_sprintmult_dm", "1.20", 0);
 
-	if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		sv_sprinton = gi.Cvar_Get("sv_sprinton", "1", 0);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        sv_sprinton = gi.Cvar_Get("sv_sprinton", "1", 0);
     } else {
         // mohaa doesn't have sprint support
         sv_sprinton = gi.Cvar_Get("sv_sprinton", "0", 0);
@@ -359,8 +359,13 @@ void CVAR_Init(void)
         gi.cvar_set("sv_runspeed", "250");
     }
 
-    sv_invulnerabletime    = gi.Cvar_Get("sv_invulnerabletime", "3.0", CVAR_ARCHIVE | CVAR_SERVERINFO);
-    sv_team_spawn_interval = gi.Cvar_Get("sv_team_spawn_interval", "15", CVAR_ARCHIVE | CVAR_SERVERINFO);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        sv_invulnerabletime    = gi.Cvar_Get("sv_invulnerabletime", "3.0", CVAR_ARCHIVE | CVAR_SERVERINFO);
+        sv_team_spawn_interval = gi.Cvar_Get("sv_team_spawn_interval", "15", CVAR_ARCHIVE | CVAR_SERVERINFO);
+    } else {
+        sv_invulnerabletime    = gi.Cvar_Get("sv_invulnerabletime", "0", CVAR_ARCHIVE | CVAR_SERVERINFO);
+        sv_team_spawn_interval = gi.Cvar_Get("sv_team_spawn_interval", "0", CVAR_ARCHIVE | CVAR_SERVERINFO);
+    }
 
     g_showmem         = gi.Cvar_Get("g_showmem", "0", 0);
     g_timeents        = gi.Cvar_Get("g_timeents", "0", 0);
@@ -461,7 +466,7 @@ void CVAR_Init(void)
         gi.cvar_set("deathmatch", "1");
     }
 
-    if (g_protocol >= PROTOCOL_MOHTA_MIN) {
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
         if (gi.Cvar_Get("com_target_game", "", 0)->integer == target_game_e::TG_MOHTT) {
             // Set the server type to mohaab
             gi.cvar_set("g_servertype", va("%d", target_game_e::TG_MOHTT));
@@ -591,11 +596,11 @@ void CVAR_Init(void)
     g_rifles_for_sweepers     = gi.Cvar_Get("g_rifles_for_sweepers", "0", 0);
     g_no_seasick              = gi.Cvar_Get("g_no_seasick", "0", 0);
 
-	if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "0", 0);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "0", 0);
     } else {
         // Defaults to 1 on vanilla mohaa
-		g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "1", 0);
+        g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "1", 0);
     }
 
     sv_scriptfiles               = gi.Cvar_Get("sv_scriptfiles", "0", 0);

From 5a447405927cf8383f25c2773cb2f90f99d0d278 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:51:46 +0100
Subject: [PATCH 0051/2040] Fixed invalid event name causing crashes

---
 code/qcommon/listener.cpp | 70 ++++++++++++++++++++++++++-------------
 code/qcommon/listener.h   | 16 +++++----
 2 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 4f6f4152..d2c1b38e 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -396,7 +396,7 @@ int HashCode<Event *>(Event *const& key)
 template<>
 int HashCode<command_t>(const command_t& key)
 {
-    const char* p;
+    const char *p;
     int         hash = 0;
 
     for (p = key.command; *p; p++) {
@@ -1322,7 +1322,7 @@ void Event::PendingEvents(const char *mask)
     EVENT_Printf("%d pending events as of %.2f\n", num, EVENT_time);
 }
 
-bool Event::Exists(const char* command)
+bool Event::Exists(const char *command)
 {
     return FindEventNum(command) != 0;
 }
@@ -1641,6 +1641,10 @@ Event::Event()
     data        = NULL;
     dataSize    = 0;
     maxDataSize = 0;
+
+#ifdef _DEBUG
+    name = NULL;
+#endif
 }
 
 /*
@@ -1676,6 +1680,10 @@ Event::Event(
     maxDataSize = 0;
     data        = NULL;
     eventnum    = 0;
+
+#ifdef _DEBUG
+    name = NULL;
+#endif
 }
 
 /*
@@ -1737,10 +1745,18 @@ Event::Event(Event&& ev)
     maxDataSize = ev.maxDataSize;
     data        = ev.data;
 
+#ifdef _DEBUG
+    name = ev.name;
+#endif
+
     ev.data        = NULL;
     ev.dataSize    = 0;
     ev.maxDataSize = 0;
     ev.eventnum    = 0;
+
+#ifdef _DEBUG
+    ev.name = NULL;
+#endif
 }
 
 /*
@@ -1881,11 +1897,19 @@ Event& Event::operator=(Event&& ev)
     maxDataSize = ev.maxDataSize;
     data        = ev.data;
 
+#ifdef _DEBUG
+    name = ev.name;
+#endif
+
     ev.data        = NULL;
     ev.dataSize    = 0;
     ev.maxDataSize = 0;
     ev.eventnum    = 0;
 
+#ifdef _DEBUG
+    ev.name = NULL;
+#endif
+
     return *this;
 }
 
@@ -2049,10 +2073,10 @@ void Event::AddVector(const Vector& vector)
 SetValue
 =======================
 */
-void Event::CopyValues(const ScriptVariable* values, size_t count)
+void Event::CopyValues(const ScriptVariable *values, size_t count)
 {
     assert(count <= maxDataSize);
-   
+
     for (size_t i = 0; i < count; i++) {
         data[i] = values[i];
     }
@@ -2227,16 +2251,16 @@ GetValue
 */
 ScriptVariable& Event::GetValue(void)
 {
-    ScriptVariable* tmp;
-    int i;
+    ScriptVariable *tmp;
+    int             i;
 
     if (fromScript) {
         // an event method will emit the return value
         // to the first index of the array
         // so there is no reallocation
         if (!data) {
-            data = new ScriptVariable[1];
-            dataSize = 1;
+            data        = new ScriptVariable[1];
+            dataSize    = 1;
             maxDataSize = 1;
         }
         return data[0];
@@ -3066,7 +3090,7 @@ BroadcastEvent
 */
 bool Listener::BroadcastEvent(const_str name, Event& event)
 {
-    ConList* listeners;
+    ConList *listeners;
 
     if (!m_NotifyList) {
         return false;
@@ -3090,10 +3114,10 @@ Broadcast an event to the notify list
 */
 bool Listener::BroadcastEvent(Event& event, ConList *listeners)
 {
-    Listener* listener;
-    int num = listeners->NumObjects();
-    int i;
-    bool found;
+    Listener *listener;
+    int       num = listeners->NumObjects();
+    int       i;
+    bool      found;
 
     if (!num) {
         return false;
@@ -3151,7 +3175,7 @@ CancelWaiting
 */
 void Listener::CancelWaiting(const_str name)
 {
-    ConList* list;
+    ConList *list;
 
     if (!m_WaitForList) {
         return;
@@ -3442,7 +3466,7 @@ void Listener::Unregister(const_str name)
     }
 
     for (int i = stoppedListeners.NumObjects(); i > 0; i--) {
-        Listener* listener = stoppedListeners.ObjectAt(i);
+        Listener *listener = stoppedListeners.ObjectAt(i);
 
         if (listener && !DisableListenerNotify) {
             listener->StoppedWaitFor(name, false);
@@ -3530,7 +3554,7 @@ UnregisterSource
 */
 bool Listener::UnregisterSource(const_str name, Listener *listener)
 {
-    ConList* list;
+    ConList *list;
 
     if (!m_NotifyList) {
         return false;
@@ -3568,7 +3592,7 @@ UnregisterTarget
 */
 bool Listener::UnregisterTarget(const_str name, Listener *listener)
 {
-    ConList* list;
+    ConList *list;
 
     if (!m_WaitForList) {
         return false;
@@ -4036,7 +4060,7 @@ ExecuteScriptInternal
 */
 void Listener::ExecuteScriptInternal(Event *ev, ScriptVariable& returnValue)
 {
-    ScriptThread* thread = CreateScriptInternal(ev->GetValue(1));
+    ScriptThread *thread = CreateScriptInternal(ev->GetValue(1));
 
     thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
@@ -4048,7 +4072,7 @@ ExecuteThreadInternal
 */
 void Listener::ExecuteThreadInternal(Event *ev, ScriptVariable& returnValue)
 {
-    ScriptThread* thread = CreateThreadInternal(ev->GetValue(1));
+    ScriptThread *thread = CreateThreadInternal(ev->GetValue(1));
 
     thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
@@ -4061,7 +4085,7 @@ WaitExecuteScriptInternal
 void Listener::WaitExecuteScriptInternal(Event *ev, ScriptVariable& returnValue)
 {
     ScriptThread *currentThread = Director.CurrentScriptThread();
-    ScriptThread *thread = CreateScriptInternal(ev->GetValue(1));
+    ScriptThread *thread        = CreateScriptInternal(ev->GetValue(1));
 
     thread->GetScriptClass()->Register(0, currentThread);
 
@@ -4076,7 +4100,7 @@ WaitExecuteThreadInternal
 void Listener::WaitExecuteThreadInternal(Event *ev, ScriptVariable& returnValue)
 {
     ScriptThread *currentThread = Director.CurrentScriptThread();
-    ScriptThread *thread = CreateThreadInternal(ev->GetValue(1));
+    ScriptThread *thread        = CreateThreadInternal(ev->GetValue(1));
 
     thread->Register(0, currentThread);
 
@@ -4131,11 +4155,11 @@ ScriptThread *Listener::CreateThreadInternal(const ScriptVariable& label)
 {
     GameScript   *scr;
     ScriptThread *thread = NULL;
-    ScriptClass* scriptClass;
+    ScriptClass  *scriptClass;
 
     if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
         scriptClass = Director.CurrentScriptClass();
-        scr = scriptClass->GetScript();
+        scr         = scriptClass->GetScript();
 
         if (label.GetType() == VARIABLE_CONSTSTRING) {
             thread = Director.CreateScriptThread(scr, this, label.constStringValue());
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 66d3d77e..ef3b8c12 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -90,7 +90,7 @@ class EventQueueNode;
 // are parsed.
 
 #define EV_REMOVE              -9.0f // remove any unused entities before spawnargs are parsed
-#define EV_LINKBEAMS           -9.0f  // for finding out the endpoints of beams
+#define EV_LINKBEAMS           -9.0f // for finding out the endpoints of beams
 #define EV_VEHICLE             -9.0f
 #define EV_PRIORITY_SPAWNARG   -8.0f // for priority spawn args passed in by the bsp file
 #define EV_SETUP_ROPEPIECE     -8.0f
@@ -310,7 +310,7 @@ public:
 
     virtual void ErrorInternal(Listener *l, str text) const;
 
-    static bool Exists(const char* command);
+    static bool         Exists(const char *command);
     static unsigned int FindEventNum(const char *s);
     static unsigned int FindNormalEventNum(const_str s);
     static unsigned int FindNormalEventNum(str s);
@@ -378,7 +378,7 @@ public:
     void AddTokens(int argc, const char **argv);
     void AddValue(const ScriptVariable& value);
     void AddVector(const Vector& vector);
-    void CopyValues(const ScriptVariable* values, size_t count);
+    void CopyValues(const ScriptVariable *values, size_t count);
 
     void Clear(void);
 
@@ -438,13 +438,17 @@ public:
     EventQueueNode *next;
 
 #ifdef _DEBUG
-    str name;
+    const char *name;
 #endif
 
     EventQueueNode()
     {
         prev = this;
         next = this;
+
+#ifdef _DEBUG
+        name = NULL;
+#endif
     }
 
     Listener *GetSourceObject(void) { return m_sourceobject; }
@@ -514,9 +518,9 @@ public:
     qboolean PostponeAllEvents(float time);
     qboolean PostponeEvent(Event& ev, float time);
 
-    bool            ProcessEvent(const Event           &ev);
+    bool            ProcessEvent(const Event& ev);
     bool            ProcessEvent(Event *ev);
-    bool            ProcessEvent(Event           &ev);
+    bool            ProcessEvent(Event& ev);
     ScriptVariable& ProcessEventReturn(Event *ev);
 
     void ProcessContainerEvent(const Container<Event *>& conev);

From adaeaea59685571046d1f2145b99176e8c7cb53b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:48:34 +0100
Subject: [PATCH 0052/2040] Fixed other code that makes the game crash when
 length is 0

---
 code/client/snd_dma.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c
index ac0a29f5..584f3c7a 100644
--- a/code/client/snd_dma.c
+++ b/code/client/snd_dma.c
@@ -785,7 +785,11 @@ void S_Base_AddLoopingSound( int entityNum, const vec3_t origin, const vec3_t ve
 	}
 
 	if ( !sfx->soundLength ) {
-		Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		// Fixed in OPM
+		//  Why should it crash???
+		//Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		Com_Printf( "%s has length 0", sfx->soundName );
+		return;
 	}
 
 	VectorCopy( origin, loopSounds[entityNum].origin );

From dd768ec9ef54792c80879163bdd35e42b222489a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jan 2024 21:54:44 +0100
Subject: [PATCH 0053/2040] Formatted VehicleSoundEntity source files

---
 code/fgame/VehicleSoundEntity.cpp | 201 +++++++++++++-----------------
 code/fgame/VehicleSoundEntity.h   |  48 ++++---
 2 files changed, 106 insertions(+), 143 deletions(-)

diff --git a/code/fgame/VehicleSoundEntity.cpp b/code/fgame/VehicleSoundEntity.cpp
index cc3f2c5a..1305fdfc 100644
--- a/code/fgame/VehicleSoundEntity.cpp
+++ b/code/fgame/VehicleSoundEntity.cpp
@@ -26,159 +26,128 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "vehicle.h"
 
 Event EV_VehicleSoundEntity_PostSpawn
-	(
-	"vehiclesoundentity_post",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"PostSpawn of a Vehicle Sound Entity"
-	);
+(
+    "vehiclesoundentity_post",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "PostSpawn of a Vehicle Sound Entity"
+);
 
 Event EV_VehicleSoundEntity_UpdateTraces
-	(
-	"vehiclesoudnentity_updatetraces",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Updates the traces of a Vehicle Sound Entity"
-	);
+(
+    "vehiclesoudnentity_updatetraces",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Updates the traces of a Vehicle Sound Entity"
+);
 
-CLASS_DECLARATION( Entity, VehicleSoundEntity, NULL )
-{
-	{ &EV_VehicleSoundEntity_PostSpawn,							&VehicleSoundEntity::EventPostSpawn },
-	{ &EV_VehicleSoundEntity_UpdateTraces,						&VehicleSoundEntity::EventUpdateTraces },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, VehicleSoundEntity, NULL) {
+    {&EV_VehicleSoundEntity_PostSpawn,    &VehicleSoundEntity::EventPostSpawn   },
+    {&EV_VehicleSoundEntity_UpdateTraces, &VehicleSoundEntity::EventUpdateTraces},
+    {NULL,                                NULL                                  }
 };
 
 VehicleSoundEntity::VehicleSoundEntity()
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	gi.Error( ERR_DROP, "VehicleSoundEntity Created with no parameters!\n" );
+    gi.Error(ERR_DROP, "VehicleSoundEntity Created with no parameters!\n");
 }
 
-VehicleSoundEntity::VehicleSoundEntity( Vehicle *owner )
+VehicleSoundEntity::VehicleSoundEntity(Vehicle *owner)
 {
-	m_pVehicle = owner;
-	m_bDoSoundStuff = false;
-	m_iTraceSurfaceFlags = 0;
+    m_pVehicle           = owner;
+    m_bDoSoundStuff      = false;
+    m_iTraceSurfaceFlags = 0;
 
-	PostEvent( EV_VehicleSoundEntity_PostSpawn, EV_POSTSPAWN );
+    PostEvent(EV_VehicleSoundEntity_PostSpawn, EV_POSTSPAWN);
 }
 
-void VehicleSoundEntity::Start
-	(
-	void
-	)
+void VehicleSoundEntity::Start(void)
 {
-	m_bDoSoundStuff = true;
+    m_bDoSoundStuff = true;
 }
 
-void VehicleSoundEntity::Stop
-	(
-	void
-	)
+void VehicleSoundEntity::Stop(void)
 {
-	m_bDoSoundStuff = false;
+    m_bDoSoundStuff = false;
 }
 
-void VehicleSoundEntity::Think
-	(
-	void
-	)
+void VehicleSoundEntity::Think(void)
 {
-	DoSoundStuff();
+    DoSoundStuff();
 }
 
-void VehicleSoundEntity::EventPostSpawn
-	(
-	Event *ev
-	)
+void VehicleSoundEntity::EventPostSpawn(Event *ev)
 {
-	setModel( "models/vehicles/vehiclesoundentity.tik" );
+    setModel("models/vehicles/vehiclesoundentity.tik");
 
-	PostEvent( EV_VehicleSoundEntity_UpdateTraces, 1.0f );
-	flags |= FL_THINK;
+    PostEvent(EV_VehicleSoundEntity_UpdateTraces, 1.0f);
+    flags |= FL_THINK;
 }
 
-void VehicleSoundEntity::EventUpdateTraces
-	(
-	Event *ev
-	)
+void VehicleSoundEntity::EventUpdateTraces(Event *ev)
 {
-	if( m_bDoSoundStuff )
-	{
-		m_pVehicle->SetSlotsNonSolid();
+    if (m_bDoSoundStuff) {
+        m_pVehicle->SetSlotsNonSolid();
 
-		trace_t trace = G_Trace(
-			origin,
-			vec3_origin,
-			vec3_origin,
-			Vector( origin[ 0 ], origin[ 1 ], origin[ 2 ] - 256.0f ),
-			m_pVehicle->edict,
-			MASK_SOUND,
-			qfalse,
-			"VehicleSoundEntity::DoSoundStuff"
-			);
+        trace_t trace = G_Trace(
+            origin,
+            vec3_origin,
+            vec3_origin,
+            Vector(origin[0], origin[1], origin[2] - 256.0f),
+            m_pVehicle->edict,
+            MASK_SOUND,
+            qfalse,
+            "VehicleSoundEntity::DoSoundStuff"
+        );
 
-		if( trace.fraction >= 1.0f )
-			m_iTraceSurfaceFlags = 0;
-		else
-			m_iTraceSurfaceFlags = trace.surfaceFlags;
+        if (trace.fraction >= 1.0f) {
+            m_iTraceSurfaceFlags = 0;
+        } else {
+            m_iTraceSurfaceFlags = trace.surfaceFlags;
+        }
 
-		m_pVehicle->SetSlotsSolid();
-	}
+        m_pVehicle->SetSlotsSolid();
+    }
 
-	PostEvent( EV_VehicleSoundEntity_UpdateTraces, 1.0f );
+    PostEvent(EV_VehicleSoundEntity_UpdateTraces, 1.0f);
 }
 
-void VehicleSoundEntity::DoSoundStuff
-	(
-	void
-	)
+void VehicleSoundEntity::DoSoundStuff(void)
 {
-	float pitch;
+    float pitch;
 
-	if( !m_bDoSoundStuff )
-	{
-		StopLoopSound();
-		return;
-	}
+    if (!m_bDoSoundStuff) {
+        StopLoopSound();
+        return;
+    }
 
-	pitch = ( velocity.length() - m_pVehicle->m_fSoundMinSpeed ) / ( m_pVehicle->m_fSoundMaxSpeed - m_pVehicle->m_fSoundMinSpeed );
-	if( pitch > 1.0f ) {
-		pitch = 1.0f;
-	} else if( pitch < 0.0f ) {
-		pitch = 0.0f;
-	}
+    pitch = (velocity.length() - m_pVehicle->m_fSoundMinSpeed)
+          / (m_pVehicle->m_fSoundMaxSpeed - m_pVehicle->m_fSoundMinSpeed);
+    if (pitch > 1.0f) {
+        pitch = 1.0f;
+    } else if (pitch < 0.0f) {
+        pitch = 0.0f;
+    }
 
-	pitch *= m_pVehicle->m_fSoundMinPitch + ( m_pVehicle->m_fSoundMaxPitch - m_pVehicle->m_fSoundMinPitch );
+    pitch *= m_pVehicle->m_fSoundMinPitch + (m_pVehicle->m_fSoundMaxPitch - m_pVehicle->m_fSoundMinPitch);
 
-	if( m_iTraceSurfaceFlags & SURF_DIRT )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_dirt", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & SURF_GRASS )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_grass", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & SURF_WOOD )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_wood", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & SURF_MUD )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_mud", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & ( SURF_GRAVEL | SURF_ROCK ) )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_stone", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else
-	{
-		StopLoopSound();
-	}
+    if (m_iTraceSurfaceFlags & SURF_DIRT) {
+        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_dirt", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & SURF_GRASS) {
+        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_grass", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & SURF_WOOD) {
+        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_wood", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & SURF_MUD) {
+        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_mud", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & (SURF_GRAVEL | SURF_ROCK)) {
+        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_stone", -1.0f, -1.0f, -1.0f, pitch);
+    } else {
+        StopLoopSound();
+    }
 }
diff --git a/code/fgame/VehicleSoundEntity.h b/code/fgame/VehicleSoundEntity.h
index fa41dc65..2b5c93d5 100644
--- a/code/fgame/VehicleSoundEntity.h
+++ b/code/fgame/VehicleSoundEntity.h
@@ -21,47 +21,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // VehicleSoundEntity.h : Sound helper for vehicles
 
-#ifndef __VEHICLESOUNDENTITY_H__
-#define __VEHICLESOUNDENTITY_H__
+#pragma once
 
 #include "entity.h"
 
 class Vehicle;
 
-class VehicleSoundEntity : public Entity {
+class VehicleSoundEntity : public Entity
+{
 private:
-	SafePtr<Vehicle> m_pVehicle;
-	bool m_bDoSoundStuff;
-	int m_iTraceSurfaceFlags;
+    SafePtr<Vehicle> m_pVehicle;
+    bool             m_bDoSoundStuff;
+    int              m_iTraceSurfaceFlags;
 
 public:
-	CLASS_PROTOTYPE( VehicleSoundEntity );
+    CLASS_PROTOTYPE(VehicleSoundEntity);
 
-	VehicleSoundEntity();
-	VehicleSoundEntity( Vehicle *owner );
+    VehicleSoundEntity();
+    VehicleSoundEntity(Vehicle *owner);
 
-	void			Start( void );
-	void			Stop( void );
-	void Think( void ) override;
-	void Archive( Archiver& arc ) override;
+    void Start(void);
+    void Stop(void);
+    void Think(void) override;
+    void Archive(Archiver& arc) override;
 
 private:
-	void			EventPostSpawn( Event *ev );
-	void			EventUpdateTraces( Event *ev );
-	void			DoSoundStuff( void );
+    void EventPostSpawn(Event *ev);
+    void EventUpdateTraces(Event *ev);
+    void DoSoundStuff(void);
 };
 
-inline
-void VehicleSoundEntity::Archive
-	(
-	Archiver& arc
-	)
+inline void VehicleSoundEntity::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveSafePointer( &m_pVehicle );
-	arc.ArchiveBool( &m_bDoSoundStuff );
-	arc.ArchiveInteger( &m_iTraceSurfaceFlags );
+    arc.ArchiveSafePointer(&m_pVehicle);
+    arc.ArchiveBool(&m_bDoSoundStuff);
+    arc.ArchiveInteger(&m_iTraceSurfaceFlags);
 }
-
-#endif // __VEHICLECOLLISIONENTITY_H__
\ No newline at end of file

From 2c441ee541e9880d69956acc623f2c5d5fd94a3d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jan 2024 21:55:03 +0100
Subject: [PATCH 0054/2040] Fixed vehicle sound entity using bad sound prefix

---
 code/fgame/VehicleSoundEntity.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/VehicleSoundEntity.cpp b/code/fgame/VehicleSoundEntity.cpp
index 1305fdfc..284b4094 100644
--- a/code/fgame/VehicleSoundEntity.cpp
+++ b/code/fgame/VehicleSoundEntity.cpp
@@ -138,15 +138,15 @@ void VehicleSoundEntity::DoSoundStuff(void)
     pitch *= m_pVehicle->m_fSoundMinPitch + (m_pVehicle->m_fSoundMaxPitch - m_pVehicle->m_fSoundMinPitch);
 
     if (m_iTraceSurfaceFlags & SURF_DIRT) {
-        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_dirt", -1.0f, -1.0f, -1.0f, pitch);
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_dirt", -1.0f, -1.0f, -1.0f, pitch);
     } else if (m_iTraceSurfaceFlags & SURF_GRASS) {
-        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_grass", -1.0f, -1.0f, -1.0f, pitch);
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_grass", -1.0f, -1.0f, -1.0f, pitch);
     } else if (m_iTraceSurfaceFlags & SURF_WOOD) {
-        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_wood", -1.0f, -1.0f, -1.0f, pitch);
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_wood", -1.0f, -1.0f, -1.0f, pitch);
     } else if (m_iTraceSurfaceFlags & SURF_MUD) {
-        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_mud", -1.0f, -1.0f, -1.0f, pitch);
-    } else if (m_iTraceSurfaceFlags & (SURF_GRAVEL | SURF_ROCK)) {
-        LoopSound(m_pVehicle->m_sSoundSet + "treat_snd_stone", -1.0f, -1.0f, -1.0f, pitch);
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_mud", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & (SURF_GRAVEL | SURF_ROCK) || m_iTraceSurfaceFlags == 0) {
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_stone", -1.0f, -1.0f, -1.0f, pitch);
     } else {
         StopLoopSound();
     }

From e209290073dbc7c3c226aace65bbffe83f5d16c7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jan 2024 21:55:21 +0100
Subject: [PATCH 0055/2040] Fixed cSpline using wrong positions

---
 code/fgame/spline.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/spline.h b/code/fgame/spline.h
index aa6ab59b..34be2d74 100644
--- a/code/fgame/spline.h
+++ b/code/fgame/spline.h
@@ -85,7 +85,7 @@ int cSpline<cGrids, cPoints>::Add(float *fAdd, int flags)
     int ii;
     int insertIndex;
 
-    if (m_iPoints + 1 > 512) {
+    if (m_iPoints + 1 > cPoints) {
         return -1;
     }
 
@@ -115,8 +115,8 @@ void cSpline<cGrids, cPoints>::UniformAdd(float *pos)
     int i;
     int ii;
 
-    for (i = m_iPoints; i > 0; i--) {
-        for (ii = 0; ii <= cGrids; ii++) {
+    for (i = 0; i < m_iPoints; i++) {
+        for (ii = 0; ii < cGrids; ii++) {
             m_vPoints[i][ii] += pos[ii];
         }
     }
@@ -221,11 +221,11 @@ float *cSpline<cGrids, cPoints>::GetByNode(float x, int *flags)
         }
     } else {
         if (flags) {
-            *flags = m_iPointFlags[rp - 1];
+            *flags = m_iPointFlags[m_iPoints - 1];
         }
 
         for (i = 0; i < cGrids; i++) {
-            r[i] = m_vPoints[rp - 1][i];
+            r[i] = m_vPoints[m_iPoints - 1][i];
         }
     }
 
@@ -240,7 +240,7 @@ int cSpline<cGrids, cPoints>::Append(cSpline<cGrids, cPoints> *pNew)
     float  fIndexAdd;
     int    i;
     int    ii;
-    int    iFlags;
+    int    iFlags = 0;
 
     if (!pNew || pNew->m_iPoints == 0) {
         return -1;

From 946a7a406c2aca889268404bcf430f676e3eee1f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:45:56 +0100
Subject: [PATCH 0056/2040] Fixed client not quitting when dedicated is set to
 1

---
 code/qcommon/common.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index cd18527d..75c4971d 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -2161,6 +2161,11 @@ void Com_Frame( void ) {
 		if ( !com_dedicated->integer ) {
 			SV_Shutdown( "dedicated set to 0" );
 			CL_FlushMemory();
+		} else {
+			CL_Shutdown("dedicated set to 1", qtrue, qtrue);
+			Sys_CloseMutex();
+			Sys_ShowConsole(0, 0);
+			NET_Init();
 		}
 	}
 

From 23a866f6f8df3304c84eb8e0da29c936b5c93615 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:53:17 +0100
Subject: [PATCH 0057/2040] Implemented R_GetInlineModelBounds

---
 code/renderer/tr_world.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
index 7253c812..68b6bf36 100644
--- a/code/renderer/tr_world.c
+++ b/code/renderer/tr_world.c
@@ -426,7 +426,11 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 
 void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
 {
-	// FIXME: unimplemented
+	bmodel_t* bmodel;
+
+	bmodel = &tr.world->bmodels[iIndex];
+	VectorCopy(bmodel->bounds[0], vMins);
+	VectorCopy(bmodel->bounds[1], vMaxs);
 }
 
 

From 9b7f192dce9587f3018b5feb197bfd1b10821549 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jan 2024 21:14:13 +0100
Subject: [PATCH 0058/2040] Corrected marks not working on entities like doors

---
 code/cgame/cg_marks.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 4c413d1a..33934aa6 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -191,7 +191,7 @@ int CG_GetMarkFragments(
         }
 
         iNewPoints = 0;
-        for (j = 0, pFragment = pCurrFragment; j < iNewPoints; j++, pFragment++) {
+        for (j = 0, pFragment = pCurrFragment; j < iNewFragments; j++, pFragment++) {
             pFragment->firstPoint += iCurrPoints;
             pFragment->iIndex = -pEnt->number;
             iNewPoints += pFragment->numPoints;
@@ -219,10 +219,11 @@ static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
     }
 
     pCEnt = &cg_entities[-iIndex];
-    if (pCEnt->currentValid && pCEnt->currentState.modelindex < cgs.inlineDrawModel[ENTITYNUM_NONE])
+    if (pCEnt->currentValid && pCEnt->currentState.modelindex < cgs.numInlineModels)
     {
         VectorCopy(pCEnt->lerpAngles, cg_vEntAngles);
         VectorCopy(pCEnt->lerpOrigin, cg_vEntOrigin);
+        cg_bLastEntValid = qtrue;
 
         if (cg_vEntAngles[0] || cg_vEntAngles[1] || cg_vEntAngles[2]) {
             AngleVectorsLeft(cg_vEntAngles, cg_fEntAxis[0], cg_fEntAxis[1], cg_fEntAxis[2]);
@@ -937,15 +938,15 @@ void CG_AddMarks(void)
         }
 
         if (pMark->markPolys->iIndex < 0) {
-            if (CG_FrustumCullSphere(pMark->pos, pMark->radius)) {
-                continue;
-            }
-        } else {
             vec3_t vWorldPos;
             CG_FragmentPosToWorldPos(pMark->pos, vWorldPos);
             if (CG_FrustumCullSphere(vWorldPos, pMark->radius)) {
                 continue;
             }
+        } else {
+            if (CG_FrustumCullSphere(pMark->pos, pMark->radius)) {
+                continue;
+            }
         }
 
         pMark->lastVisTime = cg.time;

From ceea855c6f87588c4f46641fa64aa8483f99fb19 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jan 2024 21:26:11 +0100
Subject: [PATCH 0059/2040] Also play Widget motion if there is a fade sequence

---
 code/uilib/uiwidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 8a8ac499..1f7afce2 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -2423,7 +2423,7 @@ void UIWidget::Display
 		if( !m_enabledCvar.length() && !IsVisible() )
 			return;
 
-		if (m_direction || m_fadetime > 0.0) {
+		if (m_direction || m_fadetime || m_fadeSequenceState != fadesequence_t::SEQUENCE_NONE) {
 			Motion();
 		}
 

From 8d188073b46a1018c8f1e49f0aa8a31e6ef900af Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jan 2024 21:26:37 +0100
Subject: [PATCH 0060/2040] When pushing a menu, the max motion time must be
 taken from the head menu

---
 code/uilib/uimenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uimenu.cpp b/code/uilib/uimenu.cpp
index ecc9e316..063b368b 100644
--- a/code/uilib/uimenu.cpp
+++ b/code/uilib/uimenu.cpp
@@ -697,7 +697,7 @@ bool MenuManager::PushMenu
 
 	if( head )
 	{
-		maxouttime = m->GetMaxMotionTime();
+		maxouttime = head->GetMaxMotionTime();
 		head->ProcessEvent( Event( "hidemenu" ) );
 	}
 

From eb70b30e7a78cab38c7a19241690c9532fef55df Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:40:32 +0100
Subject: [PATCH 0061/2040] Fixed an issue with the lexer (space before thhe
 dot)

---
 code/parser/lex_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index e61c6654..bf8c3094 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -205,7 +205,7 @@ varname		[a-zA-Z0-9_\"]+
 "//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
 
 <VARIABLES>"size"				{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>"."					{ YYLEX(TOKEN_PERIOD); }
+<VARIABLES>[ ]*"."				{ YYLEX(TOKEN_PERIOD); }
 <VARIABLES>\"{string}\"			{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
 <VARIABLES>{varname}			{
 									TextValue(yytext, strlen(yytext));

From 0a634c633b8b0088c0152146e372817aa9ea5071 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:41:31 +0100
Subject: [PATCH 0062/2040] Fixed crash when loading MP3 in OpenAL

---
 code/client/snd_openal_new.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 8361df5a..2a1ca925 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2834,7 +2834,8 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
-            if (!_alutLoadMP3_LOKI(pSfx->buffer, pSfx->data, pSfx->length)) {
+            //if (!_alutLoadMP3_LOKI(pSfx->buffer, pSfx->data, pSfx->length)) {
+            if (!S_OPENAL_LoadMP3_Codec(pSfx->name, this)) {
                 qalDeleteBuffers(1, &pSfx->buffer);
                 alDieIfError();
 

From 665c35d089332ff874bc28a1a63aace8e5d8ffba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:18:09 +0100
Subject: [PATCH 0063/2040] Added TIKI array max values

---
 code/qcommon/tiki.h | 47 +++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/code/qcommon/tiki.h b/code/qcommon/tiki.h
index c1b07304..9e288c3c 100644
--- a/code/qcommon/tiki.h
+++ b/code/qcommon/tiki.h
@@ -33,6 +33,19 @@ class Archiver;
 #    include "../qcommon/str.h"
 #endif
 
+#define MAX_TIKI_LOAD_ANIMS                 4095
+#define MAX_TIKI_LOAD_SKEL_INDEX            12
+#define MAX_TIKI_LOAD_SERVER_INIT_COMMANDS  160
+#define MAX_TIKI_LOAD_CLIENT_INIT_COMMANDS  180
+#define MAX_TIKI_LOAD_HEADMODELS_LENGTH     4096
+#define MAX_TIKI_LOAD_HEADSKINS_LENGTH      4096
+#define MAX_TIKI_LOAD_MODEL_BUFFER          8192
+
+#define MAX_TIKI_LOAD_FRAME_SERVER_COMMANDS 32
+#define MAX_TIKI_LOAD_FRAME_CLIENT_COMMANDS 128
+
+#define MAX_TIKI_LOAD_SHADERS               4
+
 typedef struct AliasList_s     AliasList_t;
 typedef struct AliasListNode_s AliasListNode_t;
 typedef struct msg_s           msg_t;
@@ -42,7 +55,7 @@ typedef struct {
 } tikiTriangle_t;
 
 typedef struct {
-    float st[2];
+    vec2_t st;
 } tikiSt_t;
 
 typedef struct {
@@ -51,8 +64,8 @@ typedef struct {
 } tikiXyzNormal_t;
 
 typedef struct {
-    float origin[3];
-    float axis[3][3];
+    vec3_t origin;
+    vec3_t axis[3];
 } tikiTagData_t;
 
 typedef struct {
@@ -81,7 +94,7 @@ typedef struct {
     int    frame_num;
     int    num_args;
     char **args;
-    char   location[256];
+    char   location[MAX_QPATH];
 } dloadframecmd_t;
 
 typedef struct {
@@ -90,8 +103,8 @@ typedef struct {
 } dloadinitcmd_t;
 
 typedef struct {
-    char  name[32];
-    char  shader[4][64];
+    char  name[MAX_NAME_LENGTH];
+    char  shader[MAX_TIKI_LOAD_SHADERS][MAX_RES_NAME];
     int   numskins;
     int   flags;
     float damage_multiplier;
@@ -99,15 +112,15 @@ typedef struct {
 
 typedef struct {
     char            *alias;
-    char             name[128];
-    char             location[256];
+    char             name[MAX_QPATH];
+    char             location[MAX_QPATH];
     float            weight;
     float            blendtime;
     int              flags;
     int              num_client_cmds;
     int              num_server_cmds;
-    dloadframecmd_t *loadservercmds[32];
-    dloadframecmd_t *loadclientcmds[128];
+    dloadframecmd_t *loadservercmds[MAX_TIKI_LOAD_FRAME_SERVER_COMMANDS];
+    dloadframecmd_t *loadclientcmds[MAX_TIKI_LOAD_FRAME_CLIENT_COMMANDS];
 } dloadanim_t;
 
 typedef struct dloaddef_s dloaddef_t;
@@ -120,21 +133,21 @@ typedef struct dloaddef_s {
     const char      *path;
     class TikiScript tikiFile;
 
-    dloadanim_t    *loadanims[4095];
-    dloadinitcmd_t *loadserverinitcmds[160];
-    dloadinitcmd_t *loadclientinitcmds[160];
+    dloadanim_t    *loadanims[MAX_TIKI_LOAD_ANIMS];
+    dloadinitcmd_t *loadserverinitcmds[MAX_TIKI_LOAD_SERVER_INIT_COMMANDS];
+    dloadinitcmd_t *loadclientinitcmds[MAX_TIKI_LOAD_CLIENT_INIT_COMMANDS];
 
-    int skelIndex_ld[12];
+    int skelIndex_ld[MAX_TIKI_LOAD_SKEL_INDEX];
     int numanims;
     int numserverinitcmds;
     int numclientinitcmds;
 
-    char     headmodels[4096];
-    char     headskins[4096];
+    char     headmodels[MAX_TIKI_LOAD_HEADMODELS_LENGTH];
+    char     headskins[MAX_TIKI_LOAD_HEADSKINS_LENGTH];
     qboolean bIsCharacter;
 
     struct msg_s *modelBuf;
-    unsigned char modelData[8192];
+    unsigned char modelData[MAX_TIKI_LOAD_MODEL_BUFFER];
 
     qboolean bInIncludesSection;
 } dloaddef_t;

From 4a66a41f910fa4e30792a471d4ae0bcf080aa045 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:19:14 +0100
Subject: [PATCH 0064/2040] Added idle skel and number of skeletons

---
 code/qcommon/tiki.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/tiki.h b/code/qcommon/tiki.h
index 9e288c3c..194e9b13 100644
--- a/code/qcommon/tiki.h
+++ b/code/qcommon/tiki.h
@@ -36,7 +36,7 @@ class Archiver;
 #define MAX_TIKI_LOAD_ANIMS                 4095
 #define MAX_TIKI_LOAD_SKEL_INDEX            12
 #define MAX_TIKI_LOAD_SERVER_INIT_COMMANDS  160
-#define MAX_TIKI_LOAD_CLIENT_INIT_COMMANDS  180
+#define MAX_TIKI_LOAD_CLIENT_INIT_COMMANDS  180 // 2.30: Increased from 160 to 180
 #define MAX_TIKI_LOAD_HEADMODELS_LENGTH     4096
 #define MAX_TIKI_LOAD_HEADSKINS_LENGTH      4096
 #define MAX_TIKI_LOAD_MODEL_BUFFER          8192
@@ -150,6 +150,13 @@ typedef struct dloaddef_s {
     unsigned char modelData[MAX_TIKI_LOAD_MODEL_BUFFER];
 
     qboolean bInIncludesSection;
+
+    // Added in 2.0
+    //====
+    char     idleSkel[MAX_QPATH];
+    int      numskels;
+    qboolean hasSkel;
+    //====
 } dloaddef_t;
 
 #endif

From cb9ac23b23dc1f5e056fc92a66512a6c9b92341e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:23:05 +0100
Subject: [PATCH 0065/2040] Added TIKI_AllocAnim

---
 code/tiki/tiki_parse.cpp | 16 ++++++++++++++++
 code/tiki/tiki_parse.h   | 19 ++++++++++---------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index e11b2ad1..106fbd21 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -353,6 +353,22 @@ qboolean TIKI_ParseIncludes(dloaddef_t *ld)
     return false;
 }
 
+dloadanim_t *TIKI_AllocAnim(dloaddef_t *ld)
+{
+    dloadanim_t *panim;
+
+    panim                         = static_cast<dloadanim_t *>(TIKI_AllocateLoadData(sizeof(dloadanim_t)));
+    panim->weight                 = 1.f;
+    panim->location[0]            = 0;
+    panim->num_client_cmds        = 0;
+    panim->num_server_cmds        = 0;
+    panim->flags                  = 0;
+    panim->blendtime              = 0.2f;
+    ld->loadanims[ld->numanims++] = panim;
+
+    return panim;
+}
+
 /*
 ===============
 TIKI_ParseAnimations
diff --git a/code/tiki/tiki_parse.h b/code/tiki/tiki_parse.h
index b3829ca0..5babdef7 100644
--- a/code/tiki/tiki_parse.h
+++ b/code/tiki/tiki_parse.h
@@ -26,15 +26,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
-    const char *TIKI_FileExtension(const char *in);
-    void        TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxcmds, int *numcmds);
-    void        TIKI_ParseAnimationCommands(dloaddef_t *ld, dloadanim_t *anim);
-    void        TIKI_ParseAnimationFlags(dloaddef_t *ld, dloadanim_t *anim);
-    void        TIKI_ParseAnimationsFail(dloaddef_t *ld);
-    qboolean    TIKI_ParseIncludes(dloaddef_t *ld);
-    void        TIKI_ParseAnimations(dloaddef_t *ld);
-    int         TIKI_ParseSurfaceFlag(const char *token);
-    void        TIKI_InitSetup(dloaddef_t *ld);
+    const char  *TIKI_FileExtension(const char *in);
+    void         TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxcmds, int *numcmds);
+    void         TIKI_ParseAnimationCommands(dloaddef_t *ld, dloadanim_t *anim);
+    void         TIKI_ParseAnimationFlags(dloaddef_t *ld, dloadanim_t *anim);
+    void         TIKI_ParseAnimationsFail(dloaddef_t *ld);
+    qboolean     TIKI_ParseIncludes(dloaddef_t *ld);
+    void         TIKI_ParseAnimations(dloaddef_t *ld);
+    int          TIKI_ParseSurfaceFlag(const char *token);
+    void         TIKI_InitSetup(dloaddef_t *ld);
+    dloadanim_t *TIKI_AllocAnim(dloaddef_t *ld);
 
 #ifdef __cplusplus
     qboolean TIKI_LoadSetupCaseHeader(

From 7eca455795caf0980f14b7a03a59ffdb251774b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:24:04 +0100
Subject: [PATCH 0066/2040] Set the idle skelmodel and increase the number of
 skels

---
 code/tiki/tiki_parse.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 106fbd21..c5ca72d3 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -555,6 +555,9 @@ static void WriteSkelmodel(dloaddef_t *ld, const char *name)
 {
     MSG_WriteByte(ld->modelBuf, 3);
     MSG_WriteString(ld->modelBuf, name);
+
+    Q_strncpyz(ld->idleSkel, name, sizeof(ld->idleSkel));
+    ld->numskels++;
 }
 
 /*

From c4a9a87929fbf0baee1a480567dde64d8ff10949 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:24:17 +0100
Subject: [PATCH 0067/2040] Added TIKI_AddDefaultIdleAnim

---
 code/tiki/tiki_files.cpp | 47 ++++++++++++++++++++++++++++++++++++++++
 code/tiki/tiki_files.h   |  2 ++
 2 files changed, 49 insertions(+)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 71a50f0d..43ef4db8 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -93,6 +93,52 @@ void *TIKI_AllocateLoadData(size_t length)
     return TIKI_allocator.Alloc(length);
 }
 
+/*
+===============
+TIKI_AliasExists
+===============
+*/
+qboolean TIKI_AliasExists(dloaddef_t* ld, const char* name) {
+    int i;
+
+    for (i = 0; i < ld->numanims; i++) {
+        if (!Q_stricmp(ld->loadanims[i]->alias, name)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/*
+===============
+TIKI_AddDefaultIdleAnim
+===============
+*/
+void TIKI_AddDefaultIdleAnim(dloaddef_t* ld) {
+    const char* ext;
+    dloadanim_t* panim;
+
+    if (ld->numskels != 1) {
+        return;
+    }
+
+    ext = strstr(ld->idleSkel, ".");
+    if (!ext) {
+        return;
+    }
+
+    if (TIKI_AliasExists(ld, "idle")) {
+        return;
+    }
+
+    panim = TIKI_AllocAnim(ld);
+    panim->alias = TIKI_CopyString("idle");
+    Q_strncpyz(panim->name, ld->idleSkel, ext - ld->idleSkel);
+    panim->name[ext - ld->idleSkel] = 0;
+    Q_strcat(panim->name, sizeof(panim->name), ".skc");
+}
+
 /*
 ===============
 TIKI_CopyString
@@ -190,6 +236,7 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
             TIKI_Error("TIKI_LoadTIKIfile: Include section in %s did not terminate\n", loaddef.tikiFile.Filename());
         }
 
+        TIKI_AddDefaultIdleAnim(&loaddef);
         if (loaddef.numanims) {
             sprintf(tempName, "a%s", path);
             UI_LoadResource(tempName);
diff --git a/code/tiki/tiki_files.h b/code/tiki/tiki_files.h
index 7126f80a..518d0f88 100644
--- a/code/tiki/tiki_files.h
+++ b/code/tiki/tiki_files.h
@@ -41,6 +41,8 @@ extern "C" {
 
     void         TIKI_FreeStorage(dloaddef_t *ld);
     void        *TIKI_AllocateLoadData(size_t length);
+    qboolean     TIKI_AliasExists(dloaddef_t* ld, const char* name);
+    void         TIKI_AddDefaultIdleAnim(dloaddef_t* ld);
     char        *TIKI_CopyString(const char *s);
     dtikianim_t *TIKI_LoadTikiAnim(const char *path);
 

From 3f8aeac7e67747c4b5b2847fb0e6889d5ba2d538 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:27:58 +0100
Subject: [PATCH 0068/2040] Exported WriteSkelmodel

---
 code/tiki/tiki_parse.cpp | 2 +-
 code/tiki/tiki_parse.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index c5ca72d3..1fe94eed 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -551,7 +551,7 @@ static void WriteLodBias(dloaddef_t *ld, float lod_bias)
 WriteSkelmodel
 ===============
 */
-static void WriteSkelmodel(dloaddef_t *ld, const char *name)
+void WriteSkelmodel(dloaddef_t *ld, const char *name)
 {
     MSG_WriteByte(ld->modelBuf, 3);
     MSG_WriteString(ld->modelBuf, name);
diff --git a/code/tiki/tiki_parse.h b/code/tiki/tiki_parse.h
index 5babdef7..1db2634f 100644
--- a/code/tiki/tiki_parse.h
+++ b/code/tiki/tiki_parse.h
@@ -76,3 +76,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+
+void WriteSkelmodel(dloaddef_t* ld, const char* name);

From 7518d7b41818fa22fd7ad090d5ea38d4fe44472a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 20:41:17 +0100
Subject: [PATCH 0069/2040] Reworked FS_CanonicalFilename

---
 code/qcommon/files.cpp | 44 +++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index bbf734f5..595c6a1a 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -4374,23 +4374,41 @@ FS_CanonicalFilename
 */
 void FS_CanonicalFilename(char* filename)
 {
-    char* p = filename;
+	char* source;
+	char* dest;
 
-    while (*p)
+	dest = filename;
+
+    for(source = filename; *source; source++)
     {
-        if (p[0] == '/' && p[1] == '/')
-        {
-            char* p2 = p + 1;
+		switch (*source) {
+		case '\t':
+		case ' ':
+			break;
+		case '\n':
+		case '\r':
+			*filename = 0;
+			break;
+		case '/':
+		case '\\':
+			if (dest == filename) {
+				*filename = 0;
+				return;
+			}
 
-            while (*p2)
-            {
-                p2[0] = p2[1];
-                p2++;
-            }
-        }
-
-        p++;
+			if (*(dest - 1) != '/') {
+				*dest = '/';
+				dest++;
+			}
+			break;
+		default:
+			*dest = tolower(*source);
+			dest++;
+			break;
+		}
     }
+
+	*dest = 0;
 }
 
 void FS_FileTime(const char* filename, char* date, char* size) {

From bca71ade85ac651bf2d408d308c115574107666f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:16:47 +0100
Subject: [PATCH 0070/2040] Added automatic addition of idle animation when
 there is none (from 2.30 code)

---
 code/tiki/tiki_files.cpp | 78 +++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 43ef4db8..b9d2816e 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -98,7 +98,8 @@ void *TIKI_AllocateLoadData(size_t length)
 TIKI_AliasExists
 ===============
 */
-qboolean TIKI_AliasExists(dloaddef_t* ld, const char* name) {
+qboolean TIKI_AliasExists(dloaddef_t *ld, const char *name)
+{
     int i;
 
     for (i = 0; i < ld->numanims; i++) {
@@ -115,9 +116,10 @@ qboolean TIKI_AliasExists(dloaddef_t* ld, const char* name) {
 TIKI_AddDefaultIdleAnim
 ===============
 */
-void TIKI_AddDefaultIdleAnim(dloaddef_t* ld) {
-    const char* ext;
-    dloadanim_t* panim;
+void TIKI_AddDefaultIdleAnim(dloaddef_t *ld)
+{
+    const char  *ext;
+    dloadanim_t *panim;
 
     if (ld->numskels != 1) {
         return;
@@ -132,9 +134,9 @@ void TIKI_AddDefaultIdleAnim(dloaddef_t* ld) {
         return;
     }
 
-    panim = TIKI_AllocAnim(ld);
+    panim        = TIKI_AllocAnim(ld);
     panim->alias = TIKI_CopyString("idle");
-    Q_strncpyz(panim->name, ld->idleSkel, ext - ld->idleSkel);
+    Q_strncpyz(panim->name, ld->idleSkel, ext - ld->idleSkel + 1);
     panim->name[ext - ld->idleSkel] = 0;
     Q_strcat(panim->name, sizeof(panim->name), ".skc");
 }
@@ -167,12 +169,18 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
     msg_t        modelBuf;
     str          s;
     char         tempName[257];
+    const char  *ext;
 
     memset(&loaddef, 0, sizeof(dloaddef_t));
     loaddef.modelBuf = &modelBuf;
 
     TIKI_InitSetup(&loaddef);
 
+    loaddef.path = path;
+    loaddef.numanims = 0;
+    loaddef.numserverinitcmds = 0;
+    loaddef.numclientinitcmds = 0;
+
     if (loaddef.tikiFile.LoadFile(path, qfalse)) {
         loaddef.path = path;
 
@@ -235,37 +243,49 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
         if (loaddef.bInIncludesSection) {
             TIKI_Error("TIKI_LoadTIKIfile: Include section in %s did not terminate\n", loaddef.tikiFile.Filename());
         }
+    } else {
+        loaddef.tikiFile.Close();
 
-        TIKI_AddDefaultIdleAnim(&loaddef);
-        if (loaddef.numanims) {
-            sprintf(tempName, "a%s", path);
+        ext = strstr(path, ".");
+        if (!ext) {
+            return false;
+        }
+
+        Q_strncpyz(tempName, path, ext - path + 1);
+        tempName[ext - path] = 0;
+        Q_strcat(tempName, sizeof(tempName), ".skd");
+        WriteSkelmodel(&loaddef, tempName);
+
+        loaddef.hasSkel = true;
+    }
+
+    TIKI_AddDefaultIdleAnim(&loaddef);
+    if (loaddef.numanims) {
+        sprintf(tempName, "a%s", path);
+        UI_LoadResource(tempName);
+
+        tiki = TIKI_FillTIKIStructureSkel(&loaddef);
+        if (tiki) {
+            sprintf(tempName, "b%s", path);
+            UI_LoadResource(tempName);
+            sprintf(tempName, "c%s", path);
             UI_LoadResource(tempName);
 
-            tiki = TIKI_FillTIKIStructureSkel(&loaddef);
-            if (tiki) {
-                sprintf(tempName, "b%s", path);
-                UI_LoadResource(tempName);
-                sprintf(tempName, "c%s", path);
-                UI_LoadResource(tempName);
-
-                VectorSubtract(tiki->maxs, tiki->mins, tempVec);
-                if (VectorLength(tempVec) > 100000.0f) {
-                    VectorSet(tiki->mins, -4.0f, -4.0f, -4.0f);
-                    VectorSet(tiki->maxs, 4.0f, 4.0f, 4.0f);
-                }
-
-                TIKI_FreeStorage(&loaddef);
-                sprintf(tempName, "d%s", path);
-                UI_LoadResource(tempName);
-            } else {
-                TIKI_FreeStorage(&loaddef);
+            VectorSubtract(tiki->maxs, tiki->mins, tempVec);
+            if (VectorLength(tempVec) > 100000.0f) {
+                VectorSet(tiki->mins, -4.0f, -4.0f, -4.0f);
+                VectorSet(tiki->maxs, 4.0f, 4.0f, 4.0f);
             }
+
+            TIKI_FreeStorage(&loaddef);
+            sprintf(tempName, "d%s", path);
+            UI_LoadResource(tempName);
         } else {
-            TIKI_Error("TIKI_LoadTIKIfile: No valid animations found in %s.\n", loaddef.tikiFile.Filename());
             TIKI_FreeStorage(&loaddef);
         }
     } else {
-        loaddef.tikiFile.Close();
+        TIKI_Error("TIKI_LoadTIKIfile: No valid animations found in %s.\n", loaddef.tikiFile.Filename());
+        TIKI_FreeStorage(&loaddef);
     }
 
     return tiki;

From d8505eff2be173d798f8ad647ce718aa4d114b58 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:17:00 +0100
Subject: [PATCH 0071/2040] Fixed label parameters being incorrectly
 case-sensitive

---
 code/script/scriptcompiler.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 49b80eea..26726266 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -910,14 +910,18 @@ void ScriptCompiler::EmitOpcode(int opcode, unsigned int sourcePos)
 
 void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
 {
+    str name_lowered;
+
     if (lhs.node[0].type != ENUM_field) {
         CompileError(sourcePos, "bad parameter lvalue: %d (expecting field)", lhs.node[0].type);
     }
 
     sval_u      listener_val = lhs.node[1];
     const char *name         = lhs.node[2].stringValue;
+    name_lowered = name;
+    name_lowered.tolower();
 
-    int eventnum = Event::FindSetterEventNum(name);
+    int eventnum = Event::FindSetterEventNum(name_lowered);
 
     if (listener_val.node[0].type != ENUM_listener
         || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
@@ -926,7 +930,7 @@ void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
         EmitOpcode(OP_STORE_PARAM, sourcePos);
         EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
 
-        unsigned int index = Director.AddString(name);
+        unsigned int index = Director.AddString(name_lowered);
         EmitOpcodeValue(index, sizeof(unsigned int));
     }
 }

From 24dbc1ce4efa882424c13de82e0de8dab986bc59 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:29:56 +0100
Subject: [PATCH 0072/2040] Use C vectors

---
 code/fgame/scriptthread.cpp | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index f4b4a4ca..f8dde9ad 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -3523,31 +3523,46 @@ void ScriptThread::Vector_CrossProduct(Event *ev)
 
 void ScriptThread::Vector_ToAngles(Event *ev)
 {
-    ev->AddVector(ev->GetVector(1).toAngles());
+    Vector v1;
+    Vector v3;
+
+    v1 = ev->GetVector(1);
+    vectoangles(v1, v3);
+
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_ToForward(Event *ev)
 {
-    Vector fwd;
+    Vector v1;
+    Vector v3;
 
-    ev->GetVector(1).AngleVectors(&fwd);
-    ev->AddVector(fwd);
+    v1 = ev->GetVector(1);
+
+    AngleVectors(v1, v3, NULL, NULL);
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_ToLeft(Event *ev)
 {
-    Vector left;
+    Vector v1;
+    Vector v3;
 
-    ev->GetVector(1).AngleVectors(NULL, &left);
-    ev->AddVector(left);
+    v1 = ev->GetVector(1);
+
+    AngleVectors(v1, NULL, v3, NULL);
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_ToUp(Event *ev)
 {
-    Vector up;
+    Vector v1;
+    Vector v3;
 
-    ev->GetVector(1).AngleVectors(NULL, NULL, &up);
-    ev->AddVector(up);
+    v1 = ev->GetVector(1);
+
+    AngleVectors(v1, NULL, NULL, v3);
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_PointAt(Event *ev)

From f83839e01bf7532e9b4c658949fb63e920ab01f6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:32:43 +0100
Subject: [PATCH 0073/2040] Fixed crash with WhatIs command if the entity
 doesn't have a model

---
 code/fgame/player_util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index aaf043e4..a04510d2 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -94,7 +94,7 @@ void Player::WhatIs(Event *ev)
         const char *animname;
 
         animname = NULL;
-        if (gi.modeltiki(ent->model)) {
+        if (ent->edict->tiki) {
             animname = gi.Anim_NameForNum(ent->edict->tiki, ent->edict->s.frameInfo[0].index);
         }
 

From 42c0605abf8f007cd1d670fb3be53f63e9d2c57e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:33:59 +0100
Subject: [PATCH 0074/2040] Fixed game message printing possible random
 characters if the string is empty

---
 code/client/cl_ui.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 3b2e6769..e5c6f22d 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1289,7 +1289,9 @@ void UI_PrintConsole(const char *msg)
             break;
         }
 
-        pszString++;
+        if (*pszString != 0) {
+            pszString++;
+        }
 
         //
         // print to the deathmatch console

From 45f50cfe2528d6d06c96d1933eb93e365223d1b5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jan 2024 23:53:02 +0100
Subject: [PATCH 0075/2040] Fixed array variable being case-sensitive

---
 code/script/scriptcompiler.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 26726266..807fc1dc 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -956,6 +956,7 @@ int ScriptCompiler::EmitParameterList(sval_t event_parameter_list)
 void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
 {
     unsigned int index;
+    str name_lowered;
 
     if (val.node[0].type != ENUM_field) {
         if (val.node[0].type == ENUM_array_expr) {
@@ -968,7 +969,9 @@ void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
         return;
     }
 
-    index = Director.AddString(val.node[2].stringValue);
+    name_lowered = val.node[2].stringValue;
+    name_lowered.tolower();
+    index = Director.AddString(name_lowered);
 
     EmitValue(val.node[1]);
     EmitOpcode(OP_STORE_FIELD_REF, sourcePos);

From 5f3ee10bc017860d0055b7ad7bfff03f49cb128e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jan 2024 00:01:39 +0100
Subject: [PATCH 0076/2040] Fixed Linux compilation error because of stupid CL
 accepting anything

---
 code/tiki/tiki_files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index b9d2816e..4f36dc6c 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -248,7 +248,7 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
 
         ext = strstr(path, ".");
         if (!ext) {
-            return false;
+            return NULL;
         }
 
         Q_strncpyz(tempName, path, ext - path + 1);

From 808916029e1dbd81db3f5417f627c2169ef7e315 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jan 2024 00:03:51 +0100
Subject: [PATCH 0077/2040] Formatted scriptthread source file

---
 code/fgame/scriptthread.cpp | 47 +++++++++++++++++--------------------
 code/fgame/scriptthread.h   | 40 +++++++++++++++----------------
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index f8dde9ad..468126f3 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -430,7 +430,8 @@ Event EV_ScriptThread_KillEnt
 );
 Event EV_ScriptThread_IsAlive
 (
-    "IsAlive", EV_DEFAULT,
+    "IsAlive",
+    EV_DEFAULT,
     "e",
     "ent",
     "Returns true if the specified entity exists and has health > 0.",
@@ -707,7 +708,8 @@ Event EV_ScriptThread_Vector_Normalize
 );
 Event EV_ScriptThread_Vector_Add
 (
-    "vector_add", EV_DEFAULT,
+    "vector_add",
+    EV_DEFAULT,
     "vv",
     "vector1 vector2",
     "Returns vector1 + vector2.",
@@ -724,7 +726,8 @@ Event EV_ScriptThread_Vector_Subtract
 );
 Event EV_ScriptThread_Vector_Scale
 (
-    "vector_scale", EV_DEFAULT,
+    "vector_scale",
+    EV_DEFAULT,
     "vf",
     "vector1 scale_factor",
     "Returns vector1 * scale_factor.",
@@ -732,7 +735,8 @@ Event EV_ScriptThread_Vector_Scale
 );
 Event EV_ScriptThread_Vector_DotProduct
 (
-    "vector_dot", EV_DEFAULT,
+    "vector_dot",
+    EV_DEFAULT,
     "vv",
     "vector1 vector2",
     "Returns vector1 * vector2.",
@@ -2273,7 +2277,7 @@ ScriptThread::ScriptThread(ScriptClass *scriptClass, unsigned char *pCodePos)
 
 ScriptThread::~ScriptThread()
 {
-    ScriptVM* vm;
+    ScriptVM *vm;
 
     if (g_scripttrace->integer && CanScriptTracePrint()) {
         gi.DPrintf2("---Destructor THREAD: %p\n", this);
@@ -2285,7 +2289,7 @@ ScriptThread::~ScriptThread()
         throw ScriptException("Attempting to delete a dead thread.");
     }
 
-    vm = m_ScriptVM;
+    vm         = m_ScriptVM;
     m_ScriptVM = NULL;
     if (vm->ThreadState() == THREAD_WAITING) {
         vm->m_ThreadState = THREAD_RUNNING;
@@ -2366,7 +2370,7 @@ void ScriptThread::ScriptExecuteInternal(ScriptVariable *data, int dataSize)
     SafePtr<ScriptThread> currentThread;
     SafePtr<ScriptThread> previousThread;
 
-    currentThread = Director.CurrentThread();
+    currentThread  = Director.CurrentThread();
     previousThread = this;
 
     Director.m_PreviousThread = Director.CurrentThread();
@@ -2489,7 +2493,7 @@ void ScriptThread::Pause()
 void ScriptThread::Getcvar(Event *ev)
 {
     str varName = ev->GetString(1);
-    str s = gi.Cvar_Get(varName.c_str(), "", 0)->string;
+    str s       = gi.Cvar_Get(varName.c_str(), "", 0)->string;
 
     if (strstr(s.c_str(), ".")) {
         for (int i = s.length() - 1; i >= 0; i--) {
@@ -2906,7 +2910,8 @@ void ScriptThread::TriggerEvent(Event *ev)
 void ScriptThread::RegisterAliasAndCache(Event *ev)
 {
     //assert(!"ScriptThread::RegisterAliasAndCache needs to be implemented like ClientGameCommandManager::AliasCache");
-    gi.DPrintf("ScriptThread::RegisterAliasAndCache needs to be implemented like ClientGameCommandManager::AliasCache\n");
+    gi.DPrintf("ScriptThread::RegisterAliasAndCache needs to be implemented like ClientGameCommandManager::AliasCache\n"
+    );
 }
 
 void ScriptThread::CacheResourceEvent(Event *ev)
@@ -3591,7 +3596,7 @@ void ScriptThread::Angles_PointAt(Event *ev)
 
 void ScriptThread::EventIsAlive(Event *ev)
 {
-    Entity* ent;
+    Entity *ent;
 
     if (!ev->IsEntityAt(1)) {
         ev->AddInteger(false);
@@ -4289,27 +4294,20 @@ void ScriptThread::SetCurrentObjective(int iObjective, int iTeam)
     gi.setConfigstring(CS_CURRENT_OBJECTIVE, va("%i", iObjective));
 
     if (iObjective == -1) {
-        level.m_vObjectiveLocation = vec_zero;
+        level.m_vObjectiveLocation       = vec_zero;
         level.m_vAlliedObjectiveLocation = vec_zero;
-        level.m_vAxisObjectiveLocation = vec_zero;
+        level.m_vAxisObjectiveLocation   = vec_zero;
     } else {
         const char *s   = gi.getConfigstring(CS_OBJECTIVES + iObjective);
         const char *loc = Info_ValueForKey(s, "loc");
-        Vector v;
+        Vector      v;
 
-        sscanf(
-            loc,
-            "%f %f %f",
-            &v[0],
-            &v[1],
-            &v[2]
-        );
+        sscanf(loc, "%f %f %f", &v[0], &v[1], &v[2]);
 
         //
         // Since 2.0, allow objective location per team
         //
-        switch (iTeam)
-        {
+        switch (iTeam) {
         case TEAM_NONE:
         default:
             level.m_vObjectiveLocation = v;
@@ -4390,14 +4388,13 @@ void ScriptThread::EventSetScoreboardToggle(Event *ev)
 void ScriptThread::EventSetCurrentObjective(Event *ev)
 {
     int iObjective = ev->GetInteger(1);
-    int iTeam = 0;
+    int iTeam      = 0;
 
     if (iObjective > MAX_OBJECTIVES) {
         ScriptError("Index Out Of Range");
     }
 
-    if (ev->NumArgs() >= 2)
-    {
+    if (ev->NumArgs() >= 2) {
         const_str teamStr = ev->GetConstString(2);
         if (teamStr == STRING_ALLIES) {
             iTeam = TEAM_ALLIES;
diff --git a/code/fgame/scriptthread.h b/code/fgame/scriptthread.h
index d46f3b1c..1c39e70b 100644
--- a/code/fgame/scriptthread.h
+++ b/code/fgame/scriptthread.h
@@ -131,14 +131,14 @@ protected:
     void GetRandomFloat(Event *ev);
     void GetRandomInt(Event *ev);
 
-	void GetAbs(Event* ev);
+    void GetAbs(Event *ev);
     //////////
     // Added in 2.30
-	void EventCos(Event* ev);
-	void EventSin(Event* ev);
-	void EventTan(Event* ev);
-	void EventATan(Event* ev);
-	void EventSqrt(Event* ev);
+    void EventCos(Event *ev);
+    void EventSin(Event *ev);
+    void EventTan(Event *ev);
+    void EventATan(Event *ev);
+    void EventSqrt(Event *ev);
     //////////
     void GetSelf(Event *ev);
     void Vector_Length(Event *ev);
@@ -192,13 +192,13 @@ public:
     ScriptThread(ScriptClass *scriptClass, unsigned char *pCodePos);
     virtual ~ScriptThread();
 
-    void                  Execute(Event                 &ev);
+    void                  Execute(Event& ev);
     void                  Execute(Event *ev);
     void                  Execute();
     void                  Execute(ScriptVariable *data, int dataSize);
     void                  Wait(float time);
     void                  Pause(void);
-    void                  ScriptExecute(ScriptVariable *data, int dataSize, ScriptVariable                 &returnValue);
+    void                  ScriptExecute(ScriptVariable *data, int dataSize, ScriptVariable& returnValue);
     void                  ScriptExecuteInternal(ScriptVariable *data = NULL, int dataSize = 0);
     void                  EventThrow(Event *ev);
     void                  StartWaiting();
@@ -225,22 +225,22 @@ public:
     //
     static void AddObjective(int index, int status, str text, Vector location);
     static void SetCurrentObjective(int iObjective, int iTeam);
-    void SendObjective();
-    void SendObjectives();
-    void ClearObjectives();
-    void EventAddObjective(Event *ev);
-    void EventSetScoreboardToggle(Event *ev); // Added in 2.30
-    void EventSetCurrentObjective(Event *ev);
-    void EventClearObjectives(Event *ev);
-    void SetObjectiveLocation(Vector vLocation);
-    void SetObjectiveLocation(Event *ev);
-    void ClearObjectiveLocation(void);
-    void ClearObjectiveLocation(Event *ev);
+    void        SendObjective();
+    void        SendObjectives();
+    void        ClearObjectives();
+    void        EventAddObjective(Event *ev);
+    void        EventSetScoreboardToggle(Event *ev); // Added in 2.30
+    void        EventSetCurrentObjective(Event *ev);
+    void        EventClearObjectives(Event *ev);
+    void        SetObjectiveLocation(Vector vLocation);
+    void        SetObjectiveLocation(Event *ev);
+    void        ClearObjectiveLocation(void);
+    void        ClearObjectiveLocation(Event *ev);
 
     void EventDrawHud(Event *ev);
 
     virtual void Archive(Archiver& arc) override;
-    void         ArchiveInternal(Archiver        &arc);
+    void         ArchiveInternal(Archiver& arc);
 
     //
     // Openmohaa addition

From bf27caa61e6f51eb56425a6b562b96362d685b58 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jan 2024 22:55:48 +0100
Subject: [PATCH 0078/2040] Fixed vehicle lacking gravity

---
 code/fgame/vehicle.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 1c20db88..e9dc3752 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4516,6 +4516,8 @@ void Vehicle::MoveVehicle(void)
     }
 
     if (bDoGravity) {
+        velocity[2] -= sv_gravity->value * level.frametime;
+
         tr = G_Trace(
             origin,
             mins,

From 92f7c3633f786c6bd2f2e8c1a871f4d55d158af0 Mon Sep 17 00:00:00 2001
From: DraGoN <51184732+ysdragon@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:54:13 +0000
Subject: [PATCH 0079/2040] Fixed compilation using Clang 16+

---
 code/server/sv_ccmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 5913d2c5..9c6c479a 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1593,7 +1593,7 @@ void SV_AddOperatorCommands(void) {
 		Cmd_AddCommand("say", SV_ConSay_f);
 		Cmd_AddCommand("tell", SV_ConTell_f);
 		Cmd_AddCommand("sayto", SV_ConSayto_f);
-		Cmd_SetCommandCompletionFunc("sayto", SV_CompletePlayerName);
+		Cmd_SetCommandCompletionFunc("sayto", (completionFunc_t)SV_CompletePlayerName);
     }
 
 	Cmd_AddCommand("rehashbans", SV_RehashBans_f);

From 368f94ce3bd8a9fda9ceff1ba82a9cd50176c624 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 2 Feb 2024 19:23:09 +0100
Subject: [PATCH 0080/2040] Fixed spline improperly returning the number of
 points when appending

---
 code/fgame/spline.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/spline.h b/code/fgame/spline.h
index 34be2d74..83ef4520 100644
--- a/code/fgame/spline.h
+++ b/code/fgame/spline.h
@@ -247,6 +247,9 @@ int cSpline<cGrids, cPoints>::Append(cSpline<cGrids, cPoints> *pNew)
     }
 
     if (m_iPoints) {
+        int points;
+
+        points = m_iPoints;
         fIndexAdd = *GetByNode(m_iPoints, NULL);
 
         for (i = 0; i < pNew->m_iPoints; i++) {
@@ -260,7 +263,7 @@ int cSpline<cGrids, cPoints>::Append(cSpline<cGrids, cPoints> *pNew)
             Add(o_fTmp, iFlags);
         }
 
-        return m_iPoints;
+        return points;
     } else {
         for (i = 0; i < pNew->m_iPoints; i++) {
             i_fTmp = pNew->GetByNode(i, &iFlags);

From 4388b7b187a81f1b6150f8f59bbd50026fd33f2c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 2 Feb 2024 19:26:11 +0100
Subject: [PATCH 0081/2040] AI_ThinkActive() must be used if the owner is an
 Actor

---
 code/fgame/weapturret.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 9b8a7229..6f0d806a 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1267,10 +1267,12 @@ void TurretGun::AI_ThinkActive()
 
 void TurretGun::Think(void)
 {
-    if (owner || (!m_bHadOwner && aim_target)) {
+    if (!owner && (m_bHadOwner || !aim_target)) {
+        ThinkIdle();
+    } else if (owner && owner->IsSubclassOfPlayer()) {
         P_ThinkActive();
     } else {
-        ThinkIdle();
+        AI_ThinkActive();
     }
 }
 

From ca2c2fb8feb9e6c63750546346e601ee83639c50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:05:18 +0100
Subject: [PATCH 0082/2040] Use floating-point operation in
 CalculateBoxPoints()

---
 code/fgame/movegrid.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/movegrid.cpp b/code/fgame/movegrid.cpp
index ee755b89..7adfdae5 100644
--- a/code/fgame/movegrid.cpp
+++ b/code/fgame/movegrid.cpp
@@ -82,7 +82,7 @@ void cMoveGrid::CalculateBoxPoints(void)
             for (z = 0; z < m_iZRes; z++) {
                 gridpoint_t *gridPoint = GetGridPoint(x, y, z);
 
-                gridPoint->origin = Vector(xdelta - rx, ydelta - ry, zdelta + rz / 2);
+                gridPoint->origin = Vector(xdelta - rx, ydelta - ry, zdelta + rz / 2.f);
                 zdelta += rz;
             }
             zdelta = 0;
@@ -107,18 +107,18 @@ void cMoveGrid::CalculateBoxPoints(void)
                 if (rx >= ry) {
                     Vector vec;
 
-                    vec = Vector(-ry / 2, -ry / 2, -rz / 2);
+                    vec = Vector(-ry / 2.f, -ry / 2.f, -rz / 2.f);
                     vec.copyTo(gridPoint->vm.mins);
 
-                    vec = Vector(ry / 2, ry / 2, rz / 2);
+                    vec = Vector(ry / 2.f, ry / 2.f, rz / 2.f);
                     vec.copyTo(gridPoint->vm.maxs);
                 } else {
                     Vector vec;
 
-                    vec = Vector(-rx / 2, -rx / 2, -rz / 2);
+                    vec = Vector(-rx / 2.f, -rx / 2.f, -rz / 2.f);
                     vec.copyTo(gridPoint->vm.mins);
 
-                    vec = Vector(rx / 2, rx / 2, rz / 2);
+                    vec = Vector(rx / 2.f, rx / 2.f, rz / 2.f);
                     vec.copyTo(gridPoint->vm.maxs);
                 }
             }

From 534176423e3ad2d4ee72f03db60ac71a91aab3bd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:05:55 +0100
Subject: [PATCH 0083/2040] Fixed trace error with `Vehicle Hit(MV2)`

---
 code/fgame/vehicle.cpp | 6 +-----
 code/fgame/vehicle.h   | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index e9dc3752..3ceb667d 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4411,14 +4411,10 @@ void Vehicle::MoveVehicle(void)
                     "Vehicle::MoveVehicle"
                 );
 
-                if (tr.fraction != 1.0f || tr.plane.normal[2] < 0.7f || tr.allsolid) {
+                if ((tr.fraction != 1.0f && tr.plane.normal[2] < 0.7f) || tr.allsolid) {
                     flMoveFrac = 0.0f;
                 }
 
-                if (tr.fraction == 1.0f && !tr.allsolid && !tr.startsolid) {
-                    break;
-                }
-
                 if (!tr.ent || !tr.ent->entity || tr.ent->entity == world) {
                     break;
                 }
diff --git a/code/fgame/vehicle.h b/code/fgame/vehicle.h
index d27ea5f5..143a7270 100644
--- a/code/fgame/vehicle.h
+++ b/code/fgame/vehicle.h
@@ -485,7 +485,7 @@ public:
     virtual qboolean ShowWeapon(void);
     Entity          *Driver(void);
     virtual qboolean IsDrivable(void);
-    void             Archive(Archiver            &arc) override;
+    void             Archive(Archiver& arc) override;
     str              GetSoundSet(void);
     virtual float    QuerySpeed(void);
     virtual int      QueryFreePassengerSlot(void);
@@ -503,7 +503,7 @@ public:
     virtual Entity  *QueryPassengerSlotEntity(int slot);
     virtual Entity  *QueryDriverSlotEntity(int slot);
     virtual Entity  *QueryTurretSlotEntity(int slot);
-    bool             FindExitPosition(Entity *pEnt, const Vector            &vOrigin, const Vector *vAngles); // added in 2.0
+    bool             FindExitPosition(Entity *pEnt, const Vector& vOrigin, const Vector *vAngles); // added in 2.0
     virtual void     AttachPassengerSlot(int slot, Entity *ent, Vector vExitPosition);
     virtual void     AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition);
     virtual void     AttachTurretSlot(int slot, Entity *ent, Vector vExitPosition, Vector *vExitAngles);
@@ -519,7 +519,7 @@ public:
     qboolean         isLocked(void);
     void             Lock(void);
     void             UnLock(void);
-    const str      & getName() const; // added in 2.0
+    const str&       getName() const; // added in 2.0
     VehicleCollisionEntity *GetCollisionEntity(void);
     // Added in 2.30
     //====
@@ -592,7 +592,7 @@ public:
     virtual void     CalculateOriginOffset() override;
     void             UpdateSound() override;
     //void             AttachDriverSlot(Event* ev) override;
-    void     AttachDriverSlot(int slot, Entity* ent, Vector vExitPosition) override;
+    void AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition) override;
 };
 
 class VehicleHalfTrack : public DrivableVehicle

From 570dddddd83e23d967831b8928fc93c3d89d7ebf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:07:49 +0100
Subject: [PATCH 0084/2040] Formatted cm_terrain source files

---
 code/qcommon/cm_terrain.c | 2390 +++++++++++++++++--------------------
 code/qcommon/cm_terrain.h |   50 +-
 2 files changed, 1151 insertions(+), 1289 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 12002e2c..ede3d330 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -27,43 +27,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cm_terrain.h"
 
 typedef struct varnodeIndex_s {
-	short unsigned int iTreeAndMask;
-	short unsigned int iNode;
+    short unsigned int iTreeAndMask;
+    short unsigned int iNode;
 } varnodeIndex_t;
 
 typedef struct worknode_s {
-	int i0;
-	int j0;
-	int i1;
-	int j1;
-	int i2;
-	int j2;
+    int i0;
+    int j0;
+    int i1;
+    int j1;
+    int i2;
+    int j2;
 } worknode_t;
 
 typedef struct pointtrace_s {
-	traceWork_t *tw;
-	terrainCollide_t *tc;
-	vec3_t vStart;
-	vec3_t vEnd;
-	int i;
-	int j;
-	float fSurfaceClipEpsilon;
+    traceWork_t      *tw;
+    terrainCollide_t *tc;
+    vec3_t            vStart;
+    vec3_t            vEnd;
+    int               i;
+    int               j;
+    float             fSurfaceClipEpsilon;
 } pointtrace_t;
 
-varnodeIndex_t g_vni[ 2 ][ 8 ][ 8 ][ 2 ];
+varnodeIndex_t      g_vni[2][8][8][2];
 static pointtrace_t g_trace;
 
-static int modeTable[] =
-{
-	2,
-	2,
-	5,
-	6,
-	4,
-	3,
-	0,
-	0
-};
+static int modeTable[] = {2, 2, 5, 6, 4, 3, 0, 0};
 
 /*
 =================
@@ -71,16 +61,17 @@ CM_SignbitsForNormal
 =================
 Copied over from cm_patch.c
 */
-static int CM_SignbitsForNormal( vec3_t normal ) {
-	int	bits, j;
+static int CM_SignbitsForNormal(vec3_t normal)
+{
+    int bits, j;
 
-	bits = 0;
-	for (j=0 ; j<3 ; j++) {
-		if ( normal[j] < 0 ) {
-			bits |= 1<<j;
-		}
-	}
-	return bits;
+    bits = 0;
+    for (j = 0; j < 3; j++) {
+        if (normal[j] < 0) {
+            bits |= 1 << j;
+        }
+    }
+    return bits;
 }
 
 /*
@@ -88,84 +79,72 @@ static int CM_SignbitsForNormal( vec3_t normal ) {
 CM_CalculateTerrainIndices
 ====================
 */
-void CM_CalculateTerrainIndices( worknode_t *worknode, int iDiagonal, int iTree )
+void CM_CalculateTerrainIndices(worknode_t *worknode, int iDiagonal, int iTree)
 {
-	int i;
-	int i2;
-	int j2;
-	varnodeIndex_t *vni;
+    int             i;
+    int             i2;
+    int             j2;
+    varnodeIndex_t *vni;
 
-	for( i = 0; i <= 30; i++ )
-	{
-		i2 = worknode[ i + 1 ].i0 + worknode[ i + 1 ].i1;
-		j2 = worknode[ i + 1 ].j0 + worknode[ i + 1 ].j1;
-		worknode[ i * 2 + 2 ].i0 = worknode[ i + 1 ].i1;
-		worknode[ i * 2 + 2 ].j0 = worknode[ i + 1 ].j1;
-		worknode[ i * 2 + 2 ].i1 = worknode[ i + 1 ].i2;
-		worknode[ i * 2 + 2 ].j1 = worknode[ i + 1 ].j2;
-		worknode[ i * 2 + 2 ].i2 = i2 >> 1;
-		worknode[ i * 2 + 2 ].j2 = j2 >> 1;
-		worknode[ i * 2 + 2 + 1 ].i0 = worknode[ i + 1 ].i2;
-		worknode[ i * 2 + 2 + 1 ].j0 = worknode[ i + 1 ].j2;
-		worknode[ i * 2 + 2 + 1 ].i1 = worknode[ i + 1 ].i0;
-		worknode[ i * 2 + 2 + 1 ].j1 = worknode[ i + 1 ].j0;
-		worknode[ i * 2 + 2 + 1 ].i2 = i2 >> 1;
-		worknode[ i * 2 + 2 + 1 ].j2 = j2 >> 1;
-	}
+    for (i = 0; i <= 30; i++) {
+        i2                         = worknode[i + 1].i0 + worknode[i + 1].i1;
+        j2                         = worknode[i + 1].j0 + worknode[i + 1].j1;
+        worknode[i * 2 + 2].i0     = worknode[i + 1].i1;
+        worknode[i * 2 + 2].j0     = worknode[i + 1].j1;
+        worknode[i * 2 + 2].i1     = worknode[i + 1].i2;
+        worknode[i * 2 + 2].j1     = worknode[i + 1].j2;
+        worknode[i * 2 + 2].i2     = i2 >> 1;
+        worknode[i * 2 + 2].j2     = j2 >> 1;
+        worknode[i * 2 + 2 + 1].i0 = worknode[i + 1].i2;
+        worknode[i * 2 + 2 + 1].j0 = worknode[i + 1].j2;
+        worknode[i * 2 + 2 + 1].i1 = worknode[i + 1].i0;
+        worknode[i * 2 + 2 + 1].j1 = worknode[i + 1].j0;
+        worknode[i * 2 + 2 + 1].i2 = i2 >> 1;
+        worknode[i * 2 + 2 + 1].j2 = j2 >> 1;
+    }
 
-	for( i = 32; i < 64; i++ )
-	{
-		i2 = ( worknode[ i ].i0 + worknode[ i ].i1 ) >> 1;
-		j2 = ( worknode[ i ].j0 + worknode[ i ].j1 ) >> 1;
+    for (i = 32; i < 64; i++) {
+        i2 = (worknode[i].i0 + worknode[i].i1) >> 1;
+        j2 = (worknode[i].j0 + worknode[i].j1) >> 1;
 
-		if( worknode[ i ].i0 == worknode[ i ].i1 )
-		{
-			if( worknode[ i ].j0 <= worknode[ i ].j1 )
-			{
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
+        if (worknode[i].i0 == worknode[i].i1) {
+            if (worknode[i].j0 <= worknode[i].j1) {
+                vni               = &g_vni[iDiagonal][i2][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
 
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
-			}
-			else
-			{
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
+                vni               = &g_vni[iDiagonal][i2][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
+            } else {
+                vni               = &g_vni[iDiagonal][i2 - 1][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
 
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
-			}
-		}
-		else
-		{
-			if( worknode[ i ].i0 <= worknode[ i ].i1 )
-			{
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
+                vni               = &g_vni[iDiagonal][i2 - 1][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
+            }
+        } else {
+            if (worknode[i].i0 <= worknode[i].i1) {
+                vni               = &g_vni[iDiagonal][i2][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
 
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
-			}
-			else
-			{
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
+                vni               = &g_vni[iDiagonal][i2 - 1][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
+            } else {
+                vni               = &g_vni[iDiagonal][i2][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
 
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
-			}
-		}
-
-	}
+                vni               = &g_vni[iDiagonal][i2 - 1][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
+            }
+        }
+    }
 }
 
 /*
@@ -173,70 +152,71 @@ void CM_CalculateTerrainIndices( worknode_t *worknode, int iDiagonal, int iTree
 CM_PrepareGenerateTerrainCollide
 ====================
 */
-void CM_PrepareGenerateTerrainCollide( void )
+void CM_PrepareGenerateTerrainCollide(void)
 {
-	worknode_t		worknode[ 64 ];
+    worknode_t worknode[64];
 
-	memset( &g_vni, 0, sizeof( g_vni ) );
+    memset(&g_vni, 0, sizeof(g_vni));
 
-	worknode[ 1 ].i0 = 8;
-	worknode[ 1 ].j0 = 8;
-	worknode[ 1 ].i1 = 0;
-	worknode[ 1 ].j1 = 0;
-	worknode[ 1 ].i2 = 0;
-	worknode[ 1 ].j2 = 8;
+    worknode[1].i0 = 8;
+    worknode[1].j0 = 8;
+    worknode[1].i1 = 0;
+    worknode[1].j1 = 0;
+    worknode[1].i2 = 0;
+    worknode[1].j2 = 8;
 
-	CM_CalculateTerrainIndices( worknode, 0, 0 );
+    CM_CalculateTerrainIndices(worknode, 0, 0);
 
-	worknode[ 1 ].i0 = 0;
-	worknode[ 1 ].j0 = 0;
-	worknode[ 1 ].i1 = 8;
-	worknode[ 1 ].j1 = 8;
-	worknode[ 1 ].i2 = 8;
-	worknode[ 1 ].j2 = 0;
+    worknode[1].i0 = 0;
+    worknode[1].j0 = 0;
+    worknode[1].i1 = 8;
+    worknode[1].j1 = 8;
+    worknode[1].i2 = 8;
+    worknode[1].j2 = 0;
 
-	CM_CalculateTerrainIndices( worknode, 0, 1 );
+    CM_CalculateTerrainIndices(worknode, 0, 1);
 
-	worknode[ 1 ].i0 = 8;
-	worknode[ 1 ].j0 = 0;
-	worknode[ 1 ].i1 = 0;
-	worknode[ 1 ].j1 = 8;
-	worknode[ 1 ].i2 = 8;
-	worknode[ 1 ].j2 = 8;
+    worknode[1].i0 = 8;
+    worknode[1].j0 = 0;
+    worknode[1].i1 = 0;
+    worknode[1].j1 = 8;
+    worknode[1].i2 = 8;
+    worknode[1].j2 = 8;
 
-	CM_CalculateTerrainIndices( worknode, 1, 0 );
+    CM_CalculateTerrainIndices(worknode, 1, 0);
 
-	worknode[ 1 ].i0 = 0;
-	worknode[ 1 ].j0 = 8;
-	worknode[ 1 ].i1 = 8;
-	worknode[ 1 ].j1 = 0;
-	worknode[ 1 ].i2 = 0;
-	worknode[ 1 ].j2 = 0;
+    worknode[1].i0 = 0;
+    worknode[1].j0 = 8;
+    worknode[1].i1 = 8;
+    worknode[1].j1 = 0;
+    worknode[1].i2 = 0;
+    worknode[1].j2 = 0;
 
-	CM_CalculateTerrainIndices( worknode, 1, 1 );
+    CM_CalculateTerrainIndices(worknode, 1, 1);
 }
 
-void CM_PickTerrainSquareMode( terrainCollideSquare_t *square, vec3_t vTest, int i, int j, cTerraPatch_t *patch ) {
-	int flags0, flags1;
-	varnodeIndex_t *vni;
+void CM_PickTerrainSquareMode(terrainCollideSquare_t *square, vec3_t vTest, int i, int j, cTerraPatch_t *patch)
+{
+    int             flags0, flags1;
+    varnodeIndex_t *vni;
 
-	vni = &g_vni[ ( patch->flags & 0x80 ) ? 1 : 0 ][ i ][ j ][ 0 ];
+    vni = &g_vni[(patch->flags & 0x80) ? 1 : 0][i][j][0];
 
-	flags0 = ( ( unsigned short )( patch->varTree[ vni->iTreeAndMask & 1 ][ vni->iNode ].flags & 0xFFFE & vni->iTreeAndMask ) != 0 );
-	flags1 = ( ( unsigned short )( patch->varTree[ vni[ 1 ].iTreeAndMask & 1 ][ vni[ 1 ].iNode ].flags & 0xFFFE & vni[ 1 ].iTreeAndMask ) != 0 );
+    flags0 =
+        ((unsigned short)(patch->varTree[vni->iTreeAndMask & 1][vni->iNode].flags & 0xFFFE & vni->iTreeAndMask) != 0);
+    flags1 =
+        ((unsigned short)(patch->varTree[vni[1].iTreeAndMask & 1][vni[1].iNode].flags & 0xFFFE & vni[1].iTreeAndMask)
+         != 0);
 
-	square->eMode = modeTable[ ( j + i ) & 1 | 2 * flags0 | 4 * flags1 ];
+    square->eMode = modeTable[(j + i) & 1 | 2 * flags0 | 4 * flags1];
 
-	if( square->eMode == 2 )
-	{
-		if( DotProduct( vTest, square->plane[ 0 ] ) < square->plane[ 0 ][ 3 ] ) {
-			square->eMode = 1;
-		}
-	}
-	else if( square->eMode == 5 || square->eMode == 6 )
-	{
-		VectorCopy( square->plane[ 1 ], square->plane[ 0 ] );
-	}
+    if (square->eMode == 2) {
+        if (DotProduct(vTest, square->plane[0]) < square->plane[0][3]) {
+            square->eMode = 1;
+        }
+    } else if (square->eMode == 5 || square->eMode == 6) {
+        VectorCopy(square->plane[1], square->plane[0]);
+    }
 }
 
 /*
@@ -244,107 +224,95 @@ void CM_PickTerrainSquareMode( terrainCollideSquare_t *square, vec3_t vTest, int
 CM_GenerateTerPatchCollide
 ====================
 */
-void CM_GenerateTerrainCollide( cTerraPatch_t *patch, terrainCollide_t *tc ) {
-	int i;
-	int j;
-	int x0, y0, z0;
-	float fMaxHeight;
-	float heightmap[ 9 ][ 9 ];
-	terrainCollideSquare_t *square;
-	vec3_t v1;
-	vec3_t v2;
-	vec3_t v3;
-	vec3_t v4;
-	
-	x0 = ( patch->x << 6 );
-	y0 = ( patch->y << 6 );
-	z0 = ( patch->iBaseHeight );
+void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc)
+{
+    int                     i;
+    int                     j;
+    int                     x0, y0, z0;
+    float                   fMaxHeight;
+    float                   heightmap[9][9];
+    terrainCollideSquare_t *square;
+    vec3_t                  v1;
+    vec3_t                  v2;
+    vec3_t                  v3;
+    vec3_t                  v4;
 
-	fMaxHeight = z0;
+    x0 = (patch->x << 6);
+    y0 = (patch->y << 6);
+    z0 = (patch->iBaseHeight);
 
-	for( j = 0; j < 9; j++ )
-	{
-		for( i = 0; i < 9; i++ )
-		{
-			heightmap[ i ][ j ] = ( float )( z0 + 2 * patch->heightmap[ j * 9 + i ] );
-		}
-	}
+    fMaxHeight = z0;
 
-	for( j = 0; j < 8; j++ )
-	{
-		for( i = 0; i < 8; i++ )
-		{
-			v1[ 0 ] = ( ( i << 6 ) + x0 );
-			v1[ 1 ] = ( ( j << 6 ) + y0 );
-			v1[ 2 ] = heightmap[ i ][ j ];
+    for (j = 0; j < 9; j++) {
+        for (i = 0; i < 9; i++) {
+            heightmap[i][j] = (float)(z0 + 2 * patch->heightmap[j * 9 + i]);
+        }
+    }
 
-			v2[ 0 ] = ( ( i << 6 ) + x0 ) + 64;
-			v2[ 1 ] = ( ( j << 6 ) + y0 );
-			v2[ 2 ] = heightmap[ i + 1 ][ j ];
+    for (j = 0; j < 8; j++) {
+        for (i = 0; i < 8; i++) {
+            v1[0] = ((i << 6) + x0);
+            v1[1] = ((j << 6) + y0);
+            v1[2] = heightmap[i][j];
 
-			v3[ 0 ] = ( ( i << 6 ) + x0 ) + 64;
-			v3[ 1 ] = ( ( j << 6 ) + y0 ) + 64;
-			v3[ 2 ] = heightmap[ i + 1 ][ j + 1 ];
+            v2[0] = ((i << 6) + x0) + 64;
+            v2[1] = ((j << 6) + y0);
+            v2[2] = heightmap[i + 1][j];
 
-			v4[ 0 ] = ( ( i << 6 ) + x0 );
-			v4[ 1 ] = ( ( j << 6 ) + y0 ) + 64;
-			v4[ 2 ] = heightmap[ i ][ j + 1 ];
+            v3[0] = ((i << 6) + x0) + 64;
+            v3[1] = ((j << 6) + y0) + 64;
+            v3[2] = heightmap[i + 1][j + 1];
 
-			if( fMaxHeight < v1[ 2 ] ) {
-				fMaxHeight = v1[ 2 ];
-			}
+            v4[0] = ((i << 6) + x0);
+            v4[1] = ((j << 6) + y0) + 64;
+            v4[2] = heightmap[i][j + 1];
 
-			if( fMaxHeight < v2[ 2 ] ) {
-				fMaxHeight = v2[ 2 ];
-			}
+            if (fMaxHeight < v1[2]) {
+                fMaxHeight = v1[2];
+            }
 
-			if( fMaxHeight < v3[ 2 ] ) {
-				fMaxHeight = v3[ 2 ];
-			}
+            if (fMaxHeight < v2[2]) {
+                fMaxHeight = v2[2];
+            }
 
-			if( fMaxHeight < v4[ 2 ] ) {
-				fMaxHeight = v4[ 2 ];
-			}
+            if (fMaxHeight < v3[2]) {
+                fMaxHeight = v3[2];
+            }
 
-			square = &tc->squares[ i ][ j ];
+            if (fMaxHeight < v4[2]) {
+                fMaxHeight = v4[2];
+            }
 
-			if( ( i + j ) & 1 )
-			{
-				if( patch->flags & 0x40 )
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v4, v2, v3 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v2, v4, v1 );
-				}
-				else
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v2, v4, v3 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v4, v2, v1 );
-				}
-				CM_PickTerrainSquareMode( square, v1, i, j, patch );
-			}
-			else
-			{
-				if( patch->flags & 0x40 )
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v1, v3, v4 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v3, v1, v2 );
-				}
-				else
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v3, v1, v4 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v1, v3, v2 );
-				}
-				CM_PickTerrainSquareMode( square, v2, i, j, patch );
-			}
-		}
-	}
+            square = &tc->squares[i][j];
 
-	tc->vBounds[ 0 ][ 0 ] = x0;
-	tc->vBounds[ 0 ][ 1 ] = y0;
-	tc->vBounds[ 0 ][ 2 ] = z0;
-	tc->vBounds[ 1 ][ 0 ] = ( x0 + 512 );
-	tc->vBounds[ 1 ][ 1 ] = ( y0 + 512 );
-	tc->vBounds[ 1 ][ 2 ] = fMaxHeight;
+            if ((i + j) & 1) {
+                if (patch->flags & 0x40) {
+                    CM_PlaneFromPoints(square->plane[0], v4, v2, v3);
+                    CM_PlaneFromPoints(square->plane[1], v2, v4, v1);
+                } else {
+                    CM_PlaneFromPoints(square->plane[0], v2, v4, v3);
+                    CM_PlaneFromPoints(square->plane[1], v4, v2, v1);
+                }
+                CM_PickTerrainSquareMode(square, v1, i, j, patch);
+            } else {
+                if (patch->flags & 0x40) {
+                    CM_PlaneFromPoints(square->plane[0], v1, v3, v4);
+                    CM_PlaneFromPoints(square->plane[1], v3, v1, v2);
+                } else {
+                    CM_PlaneFromPoints(square->plane[0], v3, v1, v4);
+                    CM_PlaneFromPoints(square->plane[1], v1, v3, v2);
+                }
+                CM_PickTerrainSquareMode(square, v2, i, j, patch);
+            }
+        }
+    }
+
+    tc->vBounds[0][0] = x0;
+    tc->vBounds[0][1] = y0;
+    tc->vBounds[0][2] = z0;
+    tc->vBounds[1][0] = (x0 + 512);
+    tc->vBounds[1][1] = (y0 + 512);
+    tc->vBounds[1][2] = fMaxHeight;
 }
 
 /*
@@ -352,40 +320,39 @@ void CM_GenerateTerrainCollide( cTerraPatch_t *patch, terrainCollide_t *tc ) {
 CM_CheckTerrainPlane
 ====================
 */
-float CM_CheckTerrainPlane( vec4_t plane )
+float CM_CheckTerrainPlane(vec4_t plane)
 {
-	float	d1, d2;
-	float	f;
+    float d1, d2;
+    float f;
 
-	d1 = DotProduct( g_trace.vStart, plane ) - plane[ 3 ];
-	d2 = DotProduct( g_trace.vEnd, plane ) - plane[ 3 ];
+    d1 = DotProduct(g_trace.vStart, plane) - plane[3];
+    d2 = DotProduct(g_trace.vEnd, plane) - plane[3];
 
-	// if completely in front of face, no intersection with the entire brush
-	if( d1 > 0 && ( d2 >= SURFACE_CLIP_EPSILON || d2 >= d1 ) ) {
-		return 1;
-	}
+    // if completely in front of face, no intersection with the entire brush
+    if (d1 > 0 && (d2 >= SURFACE_CLIP_EPSILON || d2 >= d1)) {
+        return 1;
+    }
 
-	if( d1 <= 0 && d2 <= 0 )
-	{
-		if( d1 >= -32 ) {
-			return 0;
-		}
+    if (d1 <= 0 && d2 <= 0) {
+        if (d1 >= -32) {
+            return 0;
+        }
 
-		if( d2 >= -32 ) {
-			return 0;
-		}
-		return 1;
-	}
+        if (d2 >= -32) {
+            return 0;
+        }
+        return 1;
+    }
 
-	if( d1 <= d2 ) {
-		return 1;
-	}
+    if (d1 <= d2) {
+        return 1;
+    }
 
-	f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
-	if( f < 0 ) {
-		f = 0;
-	}
-	return f;
+    f = (d1 - SURFACE_CLIP_EPSILON) / (d1 - d2);
+    if (f < 0) {
+        f = 0;
+    }
+    return f;
 }
 
 /*
@@ -393,68 +360,64 @@ float CM_CheckTerrainPlane( vec4_t plane )
 CM_CheckTerrainTriSpherePoint
 ====================
 */
-float CM_CheckTerrainTriSpherePoint( vec3_t v )
+float CM_CheckTerrainTriSpherePoint(vec3_t v)
 {
-	vec3_t	vDelta, vDir;
-	float	fLenSq;
-	float	fRadSq;
-	float	fA, fB;
-	float	fDiscr;
-	float	fFrac;
-	float	fSq;
-	float	f;
+    vec3_t vDelta, vDir;
+    float  fLenSq;
+    float  fRadSq;
+    float  fA, fB;
+    float  fDiscr;
+    float  fFrac;
+    float  fSq;
+    float  f;
 
-	VectorSubtract( g_trace.vStart, v, vDir );
+    VectorSubtract(g_trace.vStart, v, vDir);
 
-	fRadSq = sphere.radius * sphere.radius;
-	fLenSq = VectorLengthSquared( vDir );
+    fRadSq = sphere.radius * sphere.radius;
+    fLenSq = VectorLengthSquared(vDir);
 
-	if( fLenSq <= fRadSq ) {
-		g_trace.tw->trace.startsolid = qtrue;
-		g_trace.tw->trace.allsolid = qtrue;
-		return 0;
-	}
+    if (fLenSq <= fRadSq) {
+        g_trace.tw->trace.startsolid = qtrue;
+        g_trace.tw->trace.allsolid   = qtrue;
+        return 0;
+    }
 
-	VectorSubtract( g_trace.vEnd, g_trace.vStart, vDelta );
+    VectorSubtract(g_trace.vEnd, g_trace.vStart, vDelta);
 
-	fA = VectorLengthSquared( vDelta );
-	fB = DotProduct( vDelta, vDir );
-	fDiscr = fB * fB - ( fLenSq - fRadSq ) * fA;
+    fA     = VectorLengthSquared(vDelta);
+    fB     = DotProduct(vDelta, vDir);
+    fDiscr = fB * fB - (fLenSq - fRadSq) * fA;
 
-	if( fDiscr <= 0.0f ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (fDiscr <= 0.0f) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	fSq = sqrt( fDiscr );
+    fSq = sqrt(fDiscr);
 
-	if( fA > 0 )
-	{
-		fFrac = ( -fB - fSq ) / fA - g_trace.fSurfaceClipEpsilon;
+    if (fA > 0) {
+        fFrac = (-fB - fSq) / fA - g_trace.fSurfaceClipEpsilon;
 
-		if( fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction ) {
-			return fFrac;
-		}
+        if (fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction) {
+            return fFrac;
+        }
 
+        fFrac = -fB + fSq;
+    } else {
+        fFrac = (-fB + fSq) / fA - g_trace.fSurfaceClipEpsilon;
 
-		fFrac = -fB + fSq;
-	}
-	else
-	{
-		fFrac = ( -fB + fSq ) / fA - g_trace.fSurfaceClipEpsilon;
+        if (fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction) {
+            return fFrac;
+        }
 
-		if( fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction ) {
-			return fFrac;
-		}
+        fFrac = -fB - fSq;
+    }
 
-		fFrac = -fB - fSq;
-	}
+    f = fFrac / fA - g_trace.fSurfaceClipEpsilon;
+    if (f < 0 || f > g_trace.tw->trace.fraction) {
+        f = g_trace.tw->trace.fraction;
+    }
 
-	f = fFrac / fA - g_trace.fSurfaceClipEpsilon;
-	if( f < 0 || f > g_trace.tw->trace.fraction ) {
-		f = g_trace.tw->trace.fraction;
-	}
-
-	return f;
+    return f;
 }
 
 /*
@@ -462,15 +425,15 @@ float CM_CheckTerrainTriSpherePoint( vec3_t v )
 CM_CheckTerrainTriSphereCorner
 ====================
 */
-float CM_CheckTerrainTriSphereCorner( vec4_t plane, float x0, float y0, int i, int j )
+float CM_CheckTerrainTriSphereCorner(vec4_t plane, float x0, float y0, int i, int j)
 {
-	vec3_t	v;
+    vec3_t v;
 
-	v[ 0 ] = ( ( i << 6 ) + x0 );
-	v[ 1 ] = ( ( j << 6 ) + y0 );
-	v[ 2 ] = ( plane[ 3 ] - ( v[ 1 ] * plane[ 1 ] + v[ 0 ] * plane[ 0 ] ) ) / plane[ 2 ];
+    v[0] = ((i << 6) + x0);
+    v[1] = ((j << 6) + y0);
+    v[2] = (plane[3] - (v[1] * plane[1] + v[0] * plane[0])) / plane[2];
 
-	return CM_CheckTerrainTriSpherePoint( v );
+    return CM_CheckTerrainTriSpherePoint(v);
 }
 
 /*
@@ -478,92 +441,91 @@ float CM_CheckTerrainTriSphereCorner( vec4_t plane, float x0, float y0, int i, i
 CM_CheckTerrainTriSphereEdge
 ====================
 */
-float CM_CheckTerrainTriSphereEdge( float *plane, float x0, float y0, int i0, int j0, int i1, int j1 )
+float CM_CheckTerrainTriSphereEdge(float *plane, float x0, float y0, int i0, int j0, int i1, int j1)
 {
-	vec3_t	v0, v1;
-	float	fScale;
-	float	fRadSq;
-	float	S, T;
-	vec3_t	vDeltaStart;
-	vec3_t	vDirEdge;
-	vec3_t	vDirTrace;
-	float	fSFromT_Const;
-	float	fSFromT_Scale;
-	vec3_t	vRFromT_Const;
-	vec3_t	vRFromT_Scale;
+    vec3_t v0, v1;
+    float  fScale;
+    float  fRadSq;
+    float  S, T;
+    vec3_t vDeltaStart;
+    vec3_t vDirEdge;
+    vec3_t vDirTrace;
+    float  fSFromT_Const;
+    float  fSFromT_Scale;
+    vec3_t vRFromT_Const;
+    vec3_t vRFromT_Scale;
 
-	// junk variable(s) as usual
-	float	fLengthSq, fDot;
-	float	fFrac, fFracClip;
+    // junk variable(s) as usual
+    float fLengthSq, fDot;
+    float fFrac, fFracClip;
 
-	fScale = 1.0 / plane[ 2 ];
+    fScale = 1.0 / plane[2];
 
-	v0[ 0 ] = ( i0 << 6 ) + x0;
-	v0[ 1 ] = ( j0 << 6 ) + y0;
-	v0[ 2 ] = ( plane[ 3 ] - ( v0[ 0 ] * plane[ 0 ] + v0[ 1 ] * plane[ 1 ] ) ) * fScale;
+    v0[0] = (i0 << 6) + x0;
+    v0[1] = (j0 << 6) + y0;
+    v0[2] = (plane[3] - (v0[0] * plane[0] + v0[1] * plane[1])) * fScale;
 
-	v1[ 0 ] = ( i1 << 6 ) + x0;
-	v1[ 1 ] = ( j1 << 6 ) + y0;
-	v1[ 2 ] = ( plane[ 3 ] - ( v1[ 0 ] * plane[ 0 ] + v1[ 1 ] * plane[ 1 ] ) ) * fScale;
+    v1[0] = (i1 << 6) + x0;
+    v1[1] = (j1 << 6) + y0;
+    v1[2] = (plane[3] - (v1[0] * plane[0] + v1[1] * plane[1])) * fScale;
 
-	VectorSubtract( g_trace.vStart, v0, vDirTrace );
-	VectorSubtract( v1, v0, vDirEdge );
-	VectorSubtract( g_trace.vEnd, g_trace.vStart, vDeltaStart );
+    VectorSubtract(g_trace.vStart, v0, vDirTrace);
+    VectorSubtract(v1, v0, vDirEdge);
+    VectorSubtract(g_trace.vEnd, g_trace.vStart, vDeltaStart);
 
-	fScale = 1.0 / VectorLengthSquared( vDirEdge );
-	S = DotProduct( vDirTrace, vDirEdge ) * fScale;
-	T = DotProduct( vDeltaStart, vDirEdge ) * fScale;
+    fScale = 1.0 / VectorLengthSquared(vDirEdge);
+    S      = DotProduct(vDirTrace, vDirEdge) * fScale;
+    T      = DotProduct(vDeltaStart, vDirEdge) * fScale;
 
-	VectorMA( vDirTrace, -S, vDirEdge, vRFromT_Const );
-	VectorMA( vDeltaStart, -T, vDirEdge, vRFromT_Scale );
+    VectorMA(vDirTrace, -S, vDirEdge, vRFromT_Const);
+    VectorMA(vDeltaStart, -T, vDirEdge, vRFromT_Scale);
 
-	fRadSq = sphere.radius * sphere.radius;
-	fLengthSq = VectorLengthSquared( vRFromT_Const );
+    fRadSq    = sphere.radius * sphere.radius;
+    fLengthSq = VectorLengthSquared(vRFromT_Const);
 
-	if( fLengthSq <= fRadSq )
-	{
-		if( S < 0 || S > 1 ) {
-			return CM_CheckTerrainTriSpherePoint( v0 );
-		}
+    if (fLengthSq <= fRadSq) {
+        if (S < 0 || S > 1) {
+            return CM_CheckTerrainTriSpherePoint(v0);
+        }
 
-		g_trace.tw->trace.startsolid = qtrue;
-		g_trace.tw->trace.allsolid = qtrue;
-		return 1;
-	}
+        g_trace.tw->trace.startsolid = qtrue;
+        g_trace.tw->trace.allsolid   = qtrue;
+        return 1;
+    }
 
-	fDot = DotProduct( vRFromT_Scale, vRFromT_Const );
-	fSFromT_Scale = VectorLengthSquared( vRFromT_Scale );
-	fSFromT_Const = fDot * fDot - ( fLengthSq - fRadSq ) * fSFromT_Scale;
+    fDot          = DotProduct(vRFromT_Scale, vRFromT_Const);
+    fSFromT_Scale = VectorLengthSquared(vRFromT_Scale);
+    fSFromT_Const = fDot * fDot - (fLengthSq - fRadSq) * fSFromT_Scale;
 
-	if( fSFromT_Const <= 0 ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (fSFromT_Const <= 0) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	if( fSFromT_Scale > 0 ) {
-		fFrac = ( -fDot - sqrt( fSFromT_Const ) ) / fSFromT_Scale;
-	} else {
-		fFrac = ( -fDot + sqrt( fSFromT_Const ) ) / fSFromT_Scale;
-	}
+    if (fSFromT_Scale > 0) {
+        fFrac = (-fDot - sqrt(fSFromT_Const)) / fSFromT_Scale;
+    } else {
+        fFrac = (-fDot + sqrt(fSFromT_Const)) / fSFromT_Scale;
+    }
 
-	fFracClip = fFrac - g_trace.fSurfaceClipEpsilon;
-	if( fFrac <= 0 || fFracClip >= g_trace.tw->trace.fraction ) {
-		return g_trace.tw->trace.fraction;
-	}
+    fFracClip = fFrac - g_trace.fSurfaceClipEpsilon;
+    if (fFrac <= 0 || fFracClip >= g_trace.tw->trace.fraction) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	fFrac = fFrac * T + S;
+    fFrac = fFrac * T + S;
 
-	if( fFrac < 0 ) {
-		return CM_CheckTerrainTriSpherePoint( v0 );
-	}
+    if (fFrac < 0) {
+        return CM_CheckTerrainTriSpherePoint(v0);
+    }
 
-	if( fFrac > 1 ) {
-		return CM_CheckTerrainTriSpherePoint( v1 );
-	}
+    if (fFrac > 1) {
+        return CM_CheckTerrainTriSpherePoint(v1);
+    }
 
-	if( fFracClip < 0 ) {
-		fFracClip = 0;
-	}
-	return fFracClip;
+    if (fFracClip < 0) {
+        fFracClip = 0;
+    }
+    return fFracClip;
 }
 
 /*
@@ -571,200 +533,191 @@ float CM_CheckTerrainTriSphereEdge( float *plane, float x0, float y0, int i0, in
 CM_CheckTerrainTriSphere
 ====================
 */
-float CM_CheckTerrainTriSphere( float x0, float y0, int iPlane )
+float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
 {
-	float	*plane;
-	float	fMaxFraction;
-	float	d1, d2;
-	float	fSpherePlane;
-	int		eMode;
-	qboolean	bFitsX, bFitsY;
-	qboolean	bFitsDiag;
-	int		iX[ 3 ];
-	int		iY[ 3 ];
+    float   *plane;
+    float    fMaxFraction;
+    float    d1, d2;
+    float    fSpherePlane;
+    int      eMode;
+    qboolean bFitsX, bFitsY;
+    qboolean bFitsDiag;
+    int      iX[3];
+    int      iY[3];
 
-	plane = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ iPlane ];
-	d1 = DotProduct( g_trace.vStart, plane ) - plane[ 3 ];
-	d2 = DotProduct( g_trace.vEnd, plane ) - plane[ 3 ];
+    plane = g_trace.tc->squares[g_trace.i][g_trace.j].plane[iPlane];
+    d1    = DotProduct(g_trace.vStart, plane) - plane[3];
+    d2    = DotProduct(g_trace.vEnd, plane) - plane[3];
 
-	if( d1 > sphere.radius )
-	{
-		if( d2 >= sphere.radius + SURFACE_CLIP_EPSILON ) {
-			return g_trace.tw->trace.fraction;
-		}
+    if (d1 > sphere.radius) {
+        if (d2 >= sphere.radius + SURFACE_CLIP_EPSILON) {
+            return g_trace.tw->trace.fraction;
+        }
 
-		if( d2 >= d1 ) {
-			return g_trace.tw->trace.fraction;	
-		}
-	}
+        if (d2 >= d1) {
+            return g_trace.tw->trace.fraction;
+        }
+    }
 
-	if( d1 <= -sphere.radius && d2 <= -sphere.radius ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (d1 <= -sphere.radius && d2 <= -sphere.radius) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	if( d1 <= d2 ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (d1 <= d2) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	fMaxFraction = SURFACE_CLIP_EPSILON / ( d1 - d2 );
-	g_trace.fSurfaceClipEpsilon = fMaxFraction;
-	fSpherePlane = ( d1 - sphere.radius ) / ( d1 - d2 ) - fMaxFraction;
+    fMaxFraction                = SURFACE_CLIP_EPSILON / (d1 - d2);
+    g_trace.fSurfaceClipEpsilon = fMaxFraction;
+    fSpherePlane                = (d1 - sphere.radius) / (d1 - d2) - fMaxFraction;
 
-	if( fSpherePlane < 0 ) {
-		fSpherePlane = 0;
-	}
+    if (fSpherePlane < 0) {
+        fSpherePlane = 0;
+    }
 
-	if( fSpherePlane >= g_trace.tw->trace.fraction ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (fSpherePlane >= g_trace.tw->trace.fraction) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	d1 = ( g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ] ) * fSpherePlane + g_trace.vEnd[ 0 ] - sphere.radius * plane[ 0 ] - x0;
-	d2 = ( g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ] ) * fSpherePlane + g_trace.vEnd[ 1 ] - sphere.radius * plane[ 1 ] - y0;
+    d1 = (g_trace.vEnd[0] - g_trace.vStart[0]) * fSpherePlane + g_trace.vEnd[0] - sphere.radius * plane[0] - x0;
+    d2 = (g_trace.vEnd[1] - g_trace.vStart[1]) * fSpherePlane + g_trace.vEnd[1] - sphere.radius * plane[1] - y0;
 
-	eMode = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].eMode;
+    eMode = g_trace.tc->squares[g_trace.i][g_trace.j].eMode;
 
-	if( eMode == 1 || eMode == 2 )
-	{
-		if( ( g_trace.i + g_trace.j ) & 1 ) {
-			eMode = iPlane ? 6 : 3;
-		} else {
-			eMode = iPlane ? 5 : 4;
-		}
-	}
+    if (eMode == 1 || eMode == 2) {
+        if ((g_trace.i + g_trace.j) & 1) {
+            eMode = iPlane ? 6 : 3;
+        } else {
+            eMode = iPlane ? 5 : 4;
+        }
+    }
 
-	switch( eMode )
-	{
-	case 3:
-		if( d1 > 64 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 > 64 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+    switch (eMode) {
+    case 3:
+        if (d1 > 64) {
+            bFitsX = qfalse;
+        } else {
+            bFitsX = qtrue;
+        }
+        if (d2 > 64) {
+            bFitsY = qfalse;
+        } else {
+            bFitsY = qtrue;
+        }
 
-		if( d1 < 64 - d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 1;
-		iX[ 1 ] = 1;
-		iX[ 2 ] = 1;
-		iY[ 0 ] = 0;
-		iY[ 1 ] = 1;
-		iY[ 2 ] = 0;
-		break;
-	case 4:
-		if( d1 < 0 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 > 64 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+        if (d1 < 64 - d2) {
+            bFitsDiag = qfalse;
+        } else {
+            bFitsDiag = qtrue;
+        }
+        iX[0] = 1;
+        iX[1] = 1;
+        iX[2] = 1;
+        iY[0] = 0;
+        iY[1] = 1;
+        iY[2] = 0;
+        break;
+    case 4:
+        if (d1 < 0) {
+            bFitsX = qfalse;
+        } else {
+            bFitsX = qtrue;
+        }
+        if (d2 > 64) {
+            bFitsY = qfalse;
+        } else {
+            bFitsY = qtrue;
+        }
 
-		if( d1 > d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 0;
-		iX[ 1 ] = 1;
-		iX[ 2 ] = 1;
-		iY[ 0 ] = 1;
-		iY[ 1 ] = 0;
-		iY[ 2 ] = 0;
-		break;
-	case 5:
-		if( d1 > 64 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 < 0 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+        if (d1 > d2) {
+            bFitsDiag = qfalse;
+        } else {
+            bFitsDiag = qtrue;
+        }
+        iX[0] = 0;
+        iX[1] = 1;
+        iX[2] = 1;
+        iY[0] = 1;
+        iY[1] = 0;
+        iY[2] = 0;
+        break;
+    case 5:
+        if (d1 > 64) {
+            bFitsX = qfalse;
+        } else {
+            bFitsX = qtrue;
+        }
+        if (d2 < 0) {
+            bFitsY = qfalse;
+        } else {
+            bFitsY = qtrue;
+        }
 
-		if( d1 < d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 1;
-		iX[ 1 ] = 0;
-		iX[ 2 ] = 0;
-		iY[ 0 ] = 0;
-		iY[ 1 ] = 1;
-		iY[ 2 ] = 1;
-		break;
-	case 6:
-		if( d1 < 0 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 < 0 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+        if (d1 < d2) {
+            bFitsDiag = qfalse;
+        } else {
+            bFitsDiag = qtrue;
+        }
+        iX[0] = 1;
+        iX[1] = 0;
+        iX[2] = 0;
+        iY[0] = 0;
+        iY[1] = 1;
+        iY[2] = 1;
+        break;
+    case 6:
+        if (d1 < 0) {
+            bFitsX = qfalse;
+        } else {
+            bFitsX = qtrue;
+        }
+        if (d2 < 0) {
+            bFitsY = qfalse;
+        } else {
+            bFitsY = qtrue;
+        }
 
-		if( d1 > 64 - d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 0;
-		iX[ 1 ] = 0;
-		iX[ 2 ] = 0;
-		iY[ 0 ] = 1;
-		iY[ 1 ] = 0;
-		iY[ 2 ] = 1;
-		break;
-	default:
-		return 0;
-	}
+        if (d1 > 64 - d2) {
+            bFitsDiag = qfalse;
+        } else {
+            bFitsDiag = qtrue;
+        }
+        iX[0] = 0;
+        iX[1] = 0;
+        iX[2] = 0;
+        iY[0] = 1;
+        iY[1] = 0;
+        iY[2] = 1;
+        break;
+    default:
+        return 0;
+    }
 
-	if( bFitsX )
-	{
-		if( bFitsY )
-		{
-			if( bFitsDiag ) {
-				return fSpherePlane;
-			} else {
-				return CM_CheckTerrainTriSphereEdge( plane, x0, y0, iY[ 0 ], iX[ 1 ], iY[ 1 ], iY[ 2 ] );
-			}
-		} else if( bFitsDiag ) {
-			return CM_CheckTerrainTriSphereEdge( plane, x0, y0, iX[ 0 ], iX[ 2 ], iY[ 0 ], iX[ 1 ] );
-		} else {
-			return CM_CheckTerrainTriSphereCorner( plane, x0, y0, iY[ 0 ], iX[ 1 ] );
-		}
-	}
-	else if( bFitsY )
-	{
-		if( bFitsDiag ) {
-			return CM_CheckTerrainTriSphereEdge( plane, x0, y0, iX[ 0 ], iX[ 2 ], iY[ 1 ], iY[ 2 ] );
-		} else {
-			return CM_CheckTerrainTriSphereCorner( plane, x0, y0, iY[ 1 ], iY[ 2 ] );
-		}
-	}
-	else
-	{
-		if( bFitsDiag ) {
-			return CM_CheckTerrainTriSphereCorner( plane, x0, y0, iX[ 0 ], iX[ 2 ] );
-		} else {
-			return g_trace.tw->trace.fraction;
-		}
-	}
+    if (bFitsX) {
+        if (bFitsY) {
+            if (bFitsDiag) {
+                return fSpherePlane;
+            } else {
+                return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iY[0], iX[1], iY[1], iY[2]);
+            }
+        } else if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iX[2], iY[0], iX[1]);
+        } else {
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iY[0], iX[1]);
+        }
+    } else if (bFitsY) {
+        if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iX[2], iY[1], iY[2]);
+        } else {
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iY[1], iY[2]);
+        }
+    } else {
+        if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[0], iX[2]);
+        } else {
+            return g_trace.tw->trace.fraction;
+        }
+    }
 }
 
 /*
@@ -772,24 +725,23 @@ float CM_CheckTerrainTriSphere( float x0, float y0, int iPlane )
 CM_ValidateTerrainCollidePointSquare
 ====================
 */
-qboolean CM_ValidateTerrainCollidePointSquare( float frac )
+qboolean CM_ValidateTerrainCollidePointSquare(float frac)
 {
-	float f;
+    float f;
 
-	f = g_trace.vStart[ 0 ] + frac * ( g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ] )
-		- ( ( g_trace.i << 6 ) + g_trace.tc->vBounds[ 0 ][ 0 ] );
+    f = g_trace.vStart[0] + frac * (g_trace.vEnd[0] - g_trace.vStart[0])
+      - ((g_trace.i << 6) + g_trace.tc->vBounds[0][0]);
 
-	if( f >= 0 && f <= 64 )
-	{
-		f = g_trace.vStart[ 1 ] + frac * ( g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ] )
-			- ( ( g_trace.j << 6 ) + g_trace.tc->vBounds[ 0 ][ 1 ] );
+    if (f >= 0 && f <= 64) {
+        f = g_trace.vStart[1] + frac * (g_trace.vEnd[1] - g_trace.vStart[1])
+          - ((g_trace.j << 6) + g_trace.tc->vBounds[0][1]);
 
-		if( f >= 0 && f <= 64 ) {
-			return qtrue;
-		}
-	}
+        if (f >= 0 && f <= 64) {
+            return qtrue;
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -797,49 +749,48 @@ qboolean CM_ValidateTerrainCollidePointSquare( float frac )
 CM_ValidateTerrainCollidePointTri
 ====================
 */
-qboolean CM_ValidateTerrainCollidePointTri( int eMode, float frac )
+qboolean CM_ValidateTerrainCollidePointTri(int eMode, float frac)
 {
-	float	x0, y0;
-	float	x, y;
-	float	dx, dy;
+    float x0, y0;
+    float x, y;
+    float dx, dy;
 
-	x0 = ( g_trace.i << 6 ) + g_trace.tc->vBounds[ 0 ][ 0 ];
-	dx = g_trace.vStart[ 0 ] + ( g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ] ) * frac;
-	x = x0 + 64;
+    x0 = (g_trace.i << 6) + g_trace.tc->vBounds[0][0];
+    dx = g_trace.vStart[0] + (g_trace.vEnd[0] - g_trace.vStart[0]) * frac;
+    x  = x0 + 64;
 
-	if( x0 > dx ) {
-		return qfalse;
-	}
+    if (x0 > dx) {
+        return qfalse;
+    }
 
-	if( x < dx ) {
-		return qfalse;
-	}
+    if (x < dx) {
+        return qfalse;
+    }
 
-	y0 = ( g_trace.j << 6 ) + g_trace.tc->vBounds[ 0 ][ 1 ];
-	dy = g_trace.vStart[ 1 ] + ( g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ] ) * frac;
-	y = y0 + 64;
+    y0 = (g_trace.j << 6) + g_trace.tc->vBounds[0][1];
+    dy = g_trace.vStart[1] + (g_trace.vEnd[1] - g_trace.vStart[1]) * frac;
+    y  = y0 + 64;
 
-	if( y0 > dy ) {
-		return qfalse;
-	}
+    if (y0 > dy) {
+        return qfalse;
+    }
 
-	if( y < dy ) {
-		return qfalse;
-	}
+    if (y < dy) {
+        return qfalse;
+    }
 
-	switch( eMode )
-	{
-	case 3:
-		return ( dx - x0 ) >= ( 64 - ( dy - y0 ) );
-	case 4:
-		return ( dx - x0 ) <= ( dy - y0 );
-	case 5:
-		return ( dx - x0 ) >= ( dy - y0 );
-	case 6:
-		return ( dx - x0 ) <= ( 64 - ( dy - y0 ) );
-	default:
-		return qtrue;
-	}
+    switch (eMode) {
+    case 3:
+        return (dx - x0) >= (64 - (dy - y0));
+    case 4:
+        return (dx - x0) <= (dy - y0);
+    case 5:
+        return (dx - x0) >= (dy - y0);
+    case 6:
+        return (dx - x0) <= (64 - (dy - y0));
+    default:
+        return qtrue;
+    }
 }
 
 /*
@@ -847,63 +798,55 @@ qboolean CM_ValidateTerrainCollidePointTri( int eMode, float frac )
 CM_TestTerrainCollideSquare
 ====================
 */
-qboolean CM_TestTerrainCollideSquare( void )
+qboolean CM_TestTerrainCollideSquare(void)
 {
-	float	*plane;
-	float	frac0;
-	float	enterFrac;
-	int		eMode;
+    float *plane;
+    float  frac0;
+    float  enterFrac;
+    int    eMode;
 
-	eMode = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].eMode;
+    eMode = g_trace.tc->squares[g_trace.i][g_trace.j].eMode;
 
-	if( !eMode ) {
-		return qfalse;
-	}
+    if (!eMode) {
+        return qfalse;
+    }
 
-	if( eMode >= 0 && eMode <= 2 )
-	{
-		enterFrac = CM_CheckTerrainPlane( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ] );
+    if (eMode >= 0 && eMode <= 2) {
+        enterFrac = CM_CheckTerrainPlane(g_trace.tc->squares[g_trace.i][g_trace.j].plane[0]);
 
-		plane = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ];
-		frac0 = CM_CheckTerrainPlane( plane );
+        plane = g_trace.tc->squares[g_trace.i][g_trace.j].plane[1];
+        frac0 = CM_CheckTerrainPlane(plane);
 
-		if( eMode == 2 )
-		{
-			if( enterFrac > frac0 ) {
-				enterFrac = frac0;
-			}
-		}
-		else
-		{
-			if( enterFrac < frac0 ) {
-				enterFrac = frac0;
-			}
-		}
+        if (eMode == 2) {
+            if (enterFrac > frac0) {
+                enterFrac = frac0;
+            }
+        } else {
+            if (enterFrac < frac0) {
+                enterFrac = frac0;
+            }
+        }
 
-		if( enterFrac < g_trace.tw->trace.fraction && CM_ValidateTerrainCollidePointSquare( enterFrac ) )
-		{
-			g_trace.tw->trace.fraction = enterFrac;
-			VectorCopy( plane, g_trace.tw->trace.plane.normal );
-			g_trace.tw->trace.plane.dist = plane[ 3 ];
-			return qtrue;
-		}
-	}
-	else
-	{
-		plane = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ];
-		enterFrac = CM_CheckTerrainPlane( plane );
+        if (enterFrac < g_trace.tw->trace.fraction && CM_ValidateTerrainCollidePointSquare(enterFrac)) {
+            g_trace.tw->trace.fraction = enterFrac;
+            VectorCopy(plane, g_trace.tw->trace.plane.normal);
+            g_trace.tw->trace.plane.dist = plane[3];
+            return qtrue;
+        }
+    } else {
+        plane     = g_trace.tc->squares[g_trace.i][g_trace.j].plane[0];
+        enterFrac = CM_CheckTerrainPlane(plane);
 
-		if( enterFrac < g_trace.tw->trace.fraction
-			&& CM_ValidateTerrainCollidePointTri( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].eMode, enterFrac ) )
-		{
-			g_trace.tw->trace.fraction = enterFrac;
-			VectorCopy( plane, g_trace.tw->trace.plane.normal );
-			g_trace.tw->trace.plane.dist = plane[ 3 ];
-			return qtrue;
-		}
-	}
+        if (enterFrac < g_trace.tw->trace.fraction
+            && CM_ValidateTerrainCollidePointTri(g_trace.tc->squares[g_trace.i][g_trace.j].eMode, enterFrac)) {
+            g_trace.tw->trace.fraction = enterFrac;
+            VectorCopy(plane, g_trace.tw->trace.plane.normal);
+            g_trace.tw->trace.plane.dist = plane[3];
+            return qtrue;
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -911,63 +854,54 @@ qboolean CM_TestTerrainCollideSquare( void )
 CM_CheckStartInsideTerrain
 ====================
 */
-static qboolean CM_CheckStartInsideTerrain( int i, int j, float fx, float fy )
+static qboolean CM_CheckStartInsideTerrain(int i, int j, float fx, float fy)
 {
-	float	*plane;
-	float	fDot;
+    float *plane;
+    float  fDot;
 
-	if( i < 0 || i > 7 ) {
-		return qfalse;
-	}
-	if( j < 0 || j > 7 ) {
-		return qfalse;
-	}
+    if (i < 0 || i > 7) {
+        return qfalse;
+    }
+    if (j < 0 || j > 7) {
+        return qfalse;
+    }
 
-	if( !g_trace.tc->squares[ i ][ j ].eMode ) {
-		return qfalse;
-	}
+    if (!g_trace.tc->squares[i][j].eMode) {
+        return qfalse;
+    }
 
-	if( ( i + j ) & 1 )
-	{
-		if( fx + fy >= 1 )
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 6 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 0 ];
-		}
-		else
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 3 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 1 ];
-		}
-	}
-	else
-	{
-		if( fy >= fx )
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 5 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 0 ];
-		}
-		else
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 4 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 1 ];
-		}
-	}
+    if ((i + j) & 1) {
+        if (fx + fy >= 1) {
+            if (g_trace.tc->squares[i][j].eMode == 6) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[0];
+        } else {
+            if (g_trace.tc->squares[i][j].eMode == 3) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[1];
+        }
+    } else {
+        if (fy >= fx) {
+            if (g_trace.tc->squares[i][j].eMode == 5) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[0];
+        } else {
+            if (g_trace.tc->squares[i][j].eMode == 4) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[1];
+        }
+    }
 
-	fDot = DotProduct( g_trace.vStart, plane );
-	if( fDot <= plane[ 3 ] && fDot + 32.0f >= plane[ 3 ] ) {
-		return qtrue;
-	}
+    fDot = DotProduct(g_trace.vStart, plane);
+    if (fDot <= plane[3] && fDot + 32.0f >= plane[3]) {
+        return qtrue;
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -975,18 +909,18 @@ static qboolean CM_CheckStartInsideTerrain( int i, int j, float fx, float fy )
 CM_PositionTestPointInTerrainCollide
 ====================
 */
-qboolean CM_PositionTestPointInTerrainCollide( void )
+qboolean CM_PositionTestPointInTerrainCollide(void)
 {
-	int		i0, j0;
-	float	fx, fy;
+    int   i0, j0;
+    float fx, fy;
 
-	fx = ( g_trace.vStart[ 0 ] - g_trace.tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
-	fy = ( g_trace.vStart[ 1 ] - g_trace.tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
+    fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
+    fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
 
-	i0 = ( int )floor( fx );
-	j0 = ( int )floor( fy );
+    i0 = (int)floor(fx);
+    j0 = (int)floor(fy);
 
-	return CM_CheckStartInsideTerrain( i0, j0, fx - i0, fy - j0 );
+    return CM_CheckStartInsideTerrain(i0, j0, fx - i0, fy - j0);
 }
 
 /*
@@ -994,185 +928,168 @@ qboolean CM_PositionTestPointInTerrainCollide( void )
 CM_TracePointThroughTerrainCollide
 ====================
 */
-void CM_TracePointThroughTerrainCollide( void )
+void CM_TracePointThroughTerrainCollide(void)
 {
-	int i0, j0, i1, j1;
-	int di, dj;
-	int d1, d2;
-	//int nTotal;
-	float fx, fy;
-	float dx, dy, dx2, dy2;
+    int i0, j0, i1, j1;
+    int di, dj;
+    int d1, d2;
+    //int nTotal;
+    float fx, fy;
+    float dx, dy, dx2, dy2;
 
-	fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
-	fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
-	i0 = (int64_t)floor(fx);
-	j0 = (int64_t)floor(fy);
-	i1 = (int64_t)floor((g_trace.vEnd[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
-	j1 = (int64_t)floor((g_trace.vEnd[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
+    fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
+    fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
+    i0 = (int64_t)floor(fx);
+    j0 = (int64_t)floor(fy);
+    i1 = (int64_t)floor((g_trace.vEnd[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    j1 = (int64_t)floor((g_trace.vEnd[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
 
-	const float dfx = fx - i0;
-	const float dfy = fy - j0;
+    const float dfx = fx - i0;
+    const float dfy = fy - j0;
 
-	if (CM_CheckStartInsideTerrain(i0, j0, dfx, dfy))
-	{
-		g_trace.tw->trace.startsolid = qtrue;
-		g_trace.tw->trace.allsolid = qtrue;
-		g_trace.tw->trace.fraction = 0;
-		return;
-	}
+    if (CM_CheckStartInsideTerrain(i0, j0, dfx, dfy)) {
+        g_trace.tw->trace.startsolid = qtrue;
+        g_trace.tw->trace.allsolid   = qtrue;
+        g_trace.tw->trace.fraction   = 0;
+        return;
+    }
 
-	if (i0 == i1)
-	{
-		if (i0 < 0 || i0 > 7) {
-			return;
-		}
+    if (i0 == i1) {
+        if (i0 < 0 || i0 > 7) {
+            return;
+        }
 
-		if (j0 == j1)
-		{
-			if (j0 < 0 || j0 > 7) {
-				return;
-			}
+        if (j0 == j1) {
+            if (j0 < 0 || j0 > 7) {
+                return;
+            }
 
-			g_trace.i = i0;
-			g_trace.j = j0;
-			CM_TestTerrainCollideSquare();
-		}
-		else if (j0 >= j1)
-		{
-			if (j0 > 7)
-				j0 = 7;
-			if (j1 < 0)
-				j1 = 0;
+            g_trace.i = i0;
+            g_trace.j = j0;
+            CM_TestTerrainCollideSquare();
+        } else if (j0 >= j1) {
+            if (j0 > 7) {
+                j0 = 7;
+            }
+            if (j1 < 0) {
+                j1 = 0;
+            }
 
-			g_trace.i = i0;
-			for (g_trace.j = j0; g_trace.j >= j1; g_trace.j--) {
-				if (CM_TestTerrainCollideSquare()) {
-					return;
-				}
-			}
-		}
-		else
-		{
-			if (j0 < 0)
-				j0 = 0;
-			if (j1 > 7)
-				j1 = 7;
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j >= j1; g_trace.j--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return;
+                }
+            }
+        } else {
+            if (j0 < 0) {
+                j0 = 0;
+            }
+            if (j1 > 7) {
+                j1 = 7;
+            }
 
-			g_trace.i = i0;
-			for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
-				if (CM_TestTerrainCollideSquare()) {
-					return;
-				}
-			}
-		}
-	}
-	else if (j0 == j1)
-	{
-		if (j0 < 0 || j0 > 7) {
-			return;
-		}
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return;
+                }
+            }
+        }
+    } else if (j0 == j1) {
+        if (j0 < 0 || j0 > 7) {
+            return;
+        }
 
-		if (i0 >= i1)
-		{
-			if (i0 > 7)
-				i0 = 7;
-			if (i1 < 0)
-				i1 = 0;
+        if (i0 >= i1) {
+            if (i0 > 7) {
+                i0 = 7;
+            }
+            if (i1 < 0) {
+                i1 = 0;
+            }
 
-			g_trace.j = j0;
-			for (g_trace.i = i0; g_trace.i >= i1; g_trace.i--) {
-				if (CM_TestTerrainCollideSquare()) {
-					break;
-				}
-			}
-		}
-		else
-		{
-			if (i0 < 0)
-				i0 = 0;
-			if (i1 > 7)
-				i1 = 7;
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i >= i1; g_trace.i--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    break;
+                }
+            }
+        } else {
+            if (i0 < 0) {
+                i0 = 0;
+            }
+            if (i1 > 7) {
+                i1 = 7;
+            }
 
-			g_trace.j = j0;
-			for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
-				if (CM_TestTerrainCollideSquare()) {
-					break;
-				}
-			}
-		}
-	}
-	else
-	{
-		dx = g_trace.vEnd[0] - g_trace.vStart[0];
-		dy = g_trace.vEnd[1] - g_trace.vStart[1];
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    break;
+                }
+            }
+        }
+    } else {
+        dx = g_trace.vEnd[0] - g_trace.vStart[0];
+        dy = g_trace.vEnd[1] - g_trace.vStart[1];
 
-		// Fix
-		//==
-		// The original compares if delta float is zero
-		// not only it's slower, but it can be problematic if those floats are NaN
-		//==
-		if (i1 > i0)
-		{
-			// dx positive
-			d1 = 1;
-			di = i1 - i0;
-			dx2 = (i0 + 1 - fx) * dy;
-		}
-		else
-		{
-			d1 = -1;
-			di = i0 - i1;
-			dx = -dx;
-			dx2 = dfx * dy;
-		}
+        // Fix
+        //==
+        // The original compares if delta float is zero
+        // not only it's slower, but it can be problematic if those floats are NaN
+        //==
+        if (i1 > i0) {
+            // dx positive
+            d1  = 1;
+            di  = i1 - i0;
+            dx2 = (i0 + 1 - fx) * dy;
+        } else {
+            d1  = -1;
+            di  = i0 - i1;
+            dx  = -dx;
+            dx2 = dfx * dy;
+        }
 
-		if (j1 > j0)
-		{
-			// dy positive
-			d2 = 1;
-			dj = di + j1 - j0 + 1;
-			dy2 = (j0 + 1 - fy) * dx;
-		}
-		else
-		{
-			d2 = -1;
-			dy = -dy;
-			dj = di + j0 - j1 + 1;
-			dy2 = dfy * dx;
-			dx2 = -dx2;
-		}
+        if (j1 > j0) {
+            // dy positive
+            d2  = 1;
+            dj  = di + j1 - j0 + 1;
+            dy2 = (j0 + 1 - fy) * dx;
+        } else {
+            d2  = -1;
+            dy  = -dy;
+            dj  = di + j0 - j1 + 1;
+            dy2 = dfy * dx;
+            dx2 = -dx2;
+        }
 
-		g_trace.i = i0;
-		g_trace.j = j0;
+        g_trace.i = i0;
+        g_trace.j = j0;
 
-		while (1)
-		{
-			if (g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7)
-			{
-				if (CM_TestTerrainCollideSquare()) {
-					return;
-				}
-			}
+        while (1) {
+            if (g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return;
+                }
+            }
 
-			dj--;
-			if (!dj) {
-				break;
-			}
+            dj--;
+            if (!dj) {
+                break;
+            }
 
-			if (dx2 < dy2)
-			{
-				dy2 -= dx2;
-				dx2 = dy;
-				g_trace.i += d1;
-			}
-			else
-			{
-				dx2 -= dy2;
-				dy2 = dx;
-				g_trace.j += d2;
-			}
-		}
-	}
+            if (dx2 < dy2) {
+                dy2 -= dx2;
+                dx2 = dy;
+                g_trace.i += d1;
+            } else {
+                dx2 -= dy2;
+                dy2 = dx;
+                g_trace.j += d2;
+            }
+        }
+    }
 }
 
 /*
@@ -1180,87 +1097,88 @@ void CM_TracePointThroughTerrainCollide( void )
 CM_TraceCylinderThroughTerrainCollide
 ====================
 */
-void CM_TraceCylinderThroughTerrainCollide( traceWork_t *tw, const terrainCollide_t *tc )
+void CM_TraceCylinderThroughTerrainCollide(traceWork_t *tw, const terrainCollide_t *tc)
 {
-	int i0, j0, i1, j1;
-	float x0, y0;
-	float enterFrac;
+    int   i0, j0, i1, j1;
+    float x0, y0;
+    float enterFrac;
 
-	i0 = ( int )( floor( tw->bounds[ 0 ][ 0 ] - tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	i1 = ( int )( floor( tw->bounds[ 1 ][ 0 ] - tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	j0 = ( int )( floor( tw->bounds[ 0 ][ 1 ] - tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	j1 = ( int )( floor( tw->bounds[ 1 ][ 1 ] - tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
+    i0 = (int)(floor(tw->bounds[0][0] - tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    i1 = (int)(floor(tw->bounds[1][0] - tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    j0 = (int)(floor(tw->bounds[0][1] - tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
+    j1 = (int)(floor(tw->bounds[1][1] - tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
 
-	if( i0 < 0 )
-		i0 = 0;
-	if( j0 < 0 )
-		j0 = 0;
-	if( i1 > 7 )
-		i1 = 7;
-	if( j1 > 7 )
-		j1 = 7;
+    if (i0 < 0) {
+        i0 = 0;
+    }
+    if (j0 < 0) {
+        j0 = 0;
+    }
+    if (i1 > 7) {
+        i1 = 7;
+    }
+    if (j1 > 7) {
+        j1 = 7;
+    }
 
-	y0 = ( j0 << 6 ) + tc->vBounds[ 0 ][ 1 ];
-	for( g_trace.j = j0; g_trace.j <= j1; g_trace.j++ )
-	{
-		x0 = ( i0 << 6 ) + tc->vBounds[ 0 ][ 0 ];
-		for( g_trace.i = i0; g_trace.i <= i1; g_trace.i++ )
-		{
-			switch( tc->squares[ g_trace.i ][ g_trace.j ].eMode )
-			{
-			case 1:
-			case 2:
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 0 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ][ 3 ];
-				}
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 1 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ][ 3 ];
-				}
-				break;
-			case 3:	
-			case 4:
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 0 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ][ 3 ];
-				}
-				break;
-			case 5:
-			case 6:
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 1 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ][ 3 ];
-				}
-				break;
-			default:
-				break;
-			}
-			x0 += 64;
-		}
+    y0 = (j0 << 6) + tc->vBounds[0][1];
+    for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
+        x0 = (i0 << 6) + tc->vBounds[0][0];
+        for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
+            switch (tc->squares[g_trace.i][g_trace.j].eMode) {
+            case 1:
+            case 2:
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 0);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[0], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[0][3];
+                }
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 1);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[1], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[1][3];
+                }
+                break;
+            case 3:
+            case 4:
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 0);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[0], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[0][3];
+                }
+                break;
+            case 5:
+            case 6:
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 1);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[1], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[1][3];
+                }
+                break;
+            default:
+                break;
+            }
+            x0 += 64;
+        }
 
-		y0 += 64;
-	}
+        y0 += 64;
+    }
 }
 
 /*
@@ -1268,65 +1186,52 @@ void CM_TraceCylinderThroughTerrainCollide( traceWork_t *tw, const terrainCollid
 CM_TraceThroughTerrainCollide
 ====================
 */
-void CM_TraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *tc ) {
-	int i;
+void CM_TraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
+{
+    int i;
 
-	if( tw->bounds[ 0 ][ 0 ] >= tc->vBounds[ 1 ][ 0 ] ||
-		tw->bounds[ 0 ][ 1 ] >= tc->vBounds[ 1 ][ 1 ] ||
-		tw->bounds[ 0 ][ 2 ] >= tc->vBounds[ 1 ][ 2 ] ||
-		tw->bounds[ 1 ][ 0 ] <= tc->vBounds[ 0 ][ 0 ] ||
-		tw->bounds[ 1 ][ 1 ] <= tc->vBounds[ 0 ][ 1 ] ||
-		tw->bounds[ 1 ][ 2 ] <= tc->vBounds[ 0 ][ 2 ] )
-	{
-		return;
-	}
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[0][1] >= tc->vBounds[1][1]
+        || tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][0] <= tc->vBounds[0][0]
+        || tw->bounds[1][1] <= tc->vBounds[0][1] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return;
+    }
 
-	g_trace.tw = tw;
-	g_trace.tc = tc;
-	VectorCopy( tw->start, g_trace.vStart );
-	VectorCopy( tw->end, g_trace.vEnd );
+    g_trace.tw = tw;
+    g_trace.tc = tc;
+    VectorCopy(tw->start, g_trace.vStart);
+    VectorCopy(tw->end, g_trace.vEnd);
 
-	if( sphere.use && cm_ter_usesphere->integer )
-	{
-		VectorSubtract( tw->start, sphere.offset, g_trace.vStart );
-		VectorSubtract( tw->end, sphere.offset, g_trace.vEnd );
-		CM_TraceCylinderThroughTerrainCollide( tw, tc );
-	}
-	else if( tw->isPoint )
-	{
-		VectorCopy( tw->start, g_trace.vStart );
-		VectorCopy( tw->end, g_trace.vEnd );
-		CM_TracePointThroughTerrainCollide();
-	}
-	else
-	{
-		if( tc->squares[ 0 ][ 0 ].plane[ 0 ][ 2 ] >= 0 )
-		{
-			for( i = 0; i < 4; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    if (sphere.use && cm_ter_usesphere->integer) {
+        VectorSubtract(tw->start, sphere.offset, g_trace.vStart);
+        VectorSubtract(tw->end, sphere.offset, g_trace.vEnd);
+        CM_TraceCylinderThroughTerrainCollide(tw, tc);
+    } else if (tw->isPoint) {
+        VectorCopy(tw->start, g_trace.vStart);
+        VectorCopy(tw->end, g_trace.vEnd);
+        CM_TracePointThroughTerrainCollide();
+    } else {
+        if (tc->squares[0][0].plane[0][2] >= 0) {
+            for (i = 0; i < 4; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-				CM_TracePointThroughTerrainCollide();
-				if( tw->trace.allsolid ) {
-					return;
-				}
-			}
-		}
-		else
-		{
-			for( i = 4; i < 8; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+                CM_TracePointThroughTerrainCollide();
+                if (tw->trace.allsolid) {
+                    return;
+                }
+            }
+        } else {
+            for (i = 4; i < 8; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-				CM_TracePointThroughTerrainCollide();
-				if( tw->trace.allsolid ) {
-					return;
-				}
-			}
-		}
-	}
+                CM_TracePointThroughTerrainCollide();
+                if (tw->trace.allsolid) {
+                    return;
+                }
+            }
+        }
+    }
 }
 
 /*
@@ -1334,66 +1239,53 @@ void CM_TraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *tc ) {
 CM_PositionTestInTerrainCollide
 ====================
 */
-qboolean CM_PositionTestInTerrainCollide( traceWork_t *tw, terrainCollide_t *tc ) {
-	int i;
+qboolean CM_PositionTestInTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
+{
+    int i;
 
-	if( tw->bounds[ 0 ][ 0 ] >= tc->vBounds[ 1 ][ 0 ] ||
-		tw->bounds[ 0 ][ 1 ] >= tc->vBounds[ 1 ][ 1 ] ||
-		tw->bounds[ 0 ][ 2 ] >= tc->vBounds[ 1 ][ 2 ] ||
-		tw->bounds[ 1 ][ 0 ] <= tc->vBounds[ 0 ][ 0 ] ||
-		tw->bounds[ 1 ][ 1 ] <= tc->vBounds[ 0 ][ 1 ] ||
-		tw->bounds[ 1 ][ 2 ] <= tc->vBounds[ 0 ][ 2 ] )
-	{
-		return qfalse;
-	}
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[0][1] >= tc->vBounds[1][1]
+        || tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][0] <= tc->vBounds[0][0]
+        || tw->bounds[1][1] <= tc->vBounds[0][1] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return qfalse;
+    }
 
-	g_trace.tw = tw;
-	g_trace.tc = tc;
-	VectorCopy( tw->start, g_trace.vStart );
-	VectorCopy( tw->end, g_trace.vEnd );
+    g_trace.tw = tw;
+    g_trace.tc = tc;
+    VectorCopy(tw->start, g_trace.vStart);
+    VectorCopy(tw->end, g_trace.vEnd);
 
-	if( sphere.use && cm_ter_usesphere->integer )
-	{
-		VectorSubtract( tw->start, sphere.offset, g_trace.vStart );
-		VectorSubtract( tw->end, sphere.offset, g_trace.vEnd );
-		CM_TraceCylinderThroughTerrainCollide( tw, tc );
-		return tw->trace.startsolid;
-	}
-	else if( tw->isPoint )
-	{
-		VectorCopy( tw->start, g_trace.vStart );
-		VectorCopy( tw->end, g_trace.vEnd );
-		return CM_PositionTestPointInTerrainCollide();
-	}
-	else
-	{
-		if( tc->squares[ 0 ][ 0 ].plane[ 0 ][ 2 ] >= 0 )
-		{
-			for( i = 0; i < 4; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    if (sphere.use && cm_ter_usesphere->integer) {
+        VectorSubtract(tw->start, sphere.offset, g_trace.vStart);
+        VectorSubtract(tw->end, sphere.offset, g_trace.vEnd);
+        CM_TraceCylinderThroughTerrainCollide(tw, tc);
+        return tw->trace.startsolid;
+    } else if (tw->isPoint) {
+        VectorCopy(tw->start, g_trace.vStart);
+        VectorCopy(tw->end, g_trace.vEnd);
+        return CM_PositionTestPointInTerrainCollide();
+    } else {
+        if (tc->squares[0][0].plane[0][2] >= 0) {
+            for (i = 0; i < 4; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-				if( CM_PositionTestPointInTerrainCollide() ) {
-					return qtrue;
-				}
-			}
-		}
-		else
-		{
-			for( i = 4; i < 8; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+                if (CM_PositionTestPointInTerrainCollide()) {
+                    return qtrue;
+                }
+            }
+        } else {
+            for (i = 4; i < 8; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-				if( CM_PositionTestPointInTerrainCollide() ) {
-					return qtrue;
-				}
-			}
-		}
-	}
+                if (CM_PositionTestPointInTerrainCollide()) {
+                    return qtrue;
+                }
+            }
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -1401,173 +1293,157 @@ qboolean CM_PositionTestInTerrainCollide( traceWork_t *tw, terrainCollide_t *tc
 CM_SightTracePointThroughTerrainCollide
 ====================
 */
-qboolean CM_SightTracePointThroughTerrainCollide( void )
+qboolean CM_SightTracePointThroughTerrainCollide(void)
 {
-	int		i0, j0;
-	int		i1, j1;
-	int		di, dj;
-	float	fx, fy;
-	float	dx, dy, dx2, dy2;
-	float	d1, d2;
+    int   i0, j0;
+    int   i1, j1;
+    int   di, dj;
+    float fx, fy;
+    float dx, dy, dx2, dy2;
+    float d1, d2;
 
-	fx = ( g_trace.vStart[ 0 ] - g_trace.tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
-	fy = ( g_trace.vStart[ 1 ] - g_trace.tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
-	i0 = ( int )floor( fx );
-	j0 = ( int )floor( fy );
-	i1 = ( int )floor( ( g_trace.vEnd[ 0 ] - g_trace.tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	j1 = ( int )floor( ( g_trace.vEnd[ 1 ] - g_trace.tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
+    fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
+    fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
+    i0 = (int)floor(fx);
+    j0 = (int)floor(fy);
+    i1 = (int)floor((g_trace.vEnd[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    j1 = (int)floor((g_trace.vEnd[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
 
-	if( CM_CheckStartInsideTerrain( i0, j0, fx - i0, fy - j0 ) ) {
-		return qfalse;
-	}
+    if (CM_CheckStartInsideTerrain(i0, j0, fx - i0, fy - j0)) {
+        return qfalse;
+    }
 
-	if( i0 == i1 )
-	{
-		if( i0 < 0 || i0 > 7 ) {
-			return qtrue;
-		}
+    if (i0 == i1) {
+        if (i0 < 0 || i0 > 7) {
+            return qtrue;
+        }
 
-		if( j0 == j1 )
-		{
-			if( j0 < 0 || j0 > 7 ) {
-				return qtrue;
-			}
+        if (j0 == j1) {
+            if (j0 < 0 || j0 > 7) {
+                return qtrue;
+            }
 
-			g_trace.i = i0;
-			g_trace.j = j0;
-			return !CM_TestTerrainCollideSquare();
-		}
-		else if( j0 >= j1 )
-		{
-			if( j0 > 7 )
-				j0 = 7;
-			if( j1 < 0 )
-				j1 = 0;
+            g_trace.i = i0;
+            g_trace.j = j0;
+            return !CM_TestTerrainCollideSquare();
+        } else if (j0 >= j1) {
+            if (j0 > 7) {
+                j0 = 7;
+            }
+            if (j1 < 0) {
+                j1 = 0;
+            }
 
-			g_trace.i = i0;
-			for( g_trace.j = j0; g_trace.j >= j1; g_trace.j-- ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-		else
-		{
-			if( j0 < 0 )
-				j0 = 0;
-			if( j1 > 7 )
-				j1 = 7;
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j >= j1; g_trace.j--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        } else {
+            if (j0 < 0) {
+                j0 = 0;
+            }
+            if (j1 > 7) {
+                j1 = 7;
+            }
 
-			g_trace.i = i0;
-			for( g_trace.j = j0; g_trace.j <= j1; g_trace.j++ ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-	}
-	else if( j0 == j1 )
-	{
-		if( j0 < 0 || j0 > 7 ) {
-			return qtrue;
-		}
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        }
+    } else if (j0 == j1) {
+        if (j0 < 0 || j0 > 7) {
+            return qtrue;
+        }
 
-		if( i0 >= i1 )
-		{
-			if( i0 > 7 )
-				i0 = 7;
-			if( i1 < 0 )
-				i1 = 0;
+        if (i0 >= i1) {
+            if (i0 > 7) {
+                i0 = 7;
+            }
+            if (i1 < 0) {
+                i1 = 0;
+            }
 
-			g_trace.j = j0;
-			for( g_trace.i = i0; g_trace.i >= i1; g_trace.i-- ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-		else
-		{
-			if( i0 < 0 )
-				i0 = 0;
-			if( i1 > 7 )
-				i1 = 7;
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i >= i1; g_trace.i--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        } else {
+            if (i0 < 0) {
+                i0 = 0;
+            }
+            if (i1 > 7) {
+                i1 = 7;
+            }
 
-			g_trace.j = j0;
-			for( g_trace.i = i0; g_trace.i <= i1; g_trace.i++ ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-	}
-	else
-	{
-		dx = g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ];
-		dy = g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ];
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        }
+    } else {
+        dx = g_trace.vEnd[0] - g_trace.vStart[0];
+        dy = g_trace.vEnd[1] - g_trace.vStart[1];
 
-		if( dx > 0 )
-		{
-			d1 = 1;
-			di = i1 - i0;
-			dx2 = ( i0 + 1 - fx ) * dy;
-		}
-		else
-		{
-			d1 = -1;
-			di = i0 - i1;
-			dx = -dx;
-			dx2 = ( fx - i0 ) * dy;
-		}
+        if (dx > 0) {
+            d1  = 1;
+            di  = i1 - i0;
+            dx2 = (i0 + 1 - fx) * dy;
+        } else {
+            d1  = -1;
+            di  = i0 - i1;
+            dx  = -dx;
+            dx2 = (fx - i0) * dy;
+        }
 
-		if( dy > 0 )
-		{
-			d2 = 1;
-			dj = di + j1 - j0 + 1;
-			dy2 = ( j0 + 1 - fy ) * dx;
-		}
-		else
-		{
-			d2 = -1;
-			dy = -dy;
-			dj = di + j0 - j1 + 1;
-			dy2 = ( fy - j0 ) * dx;
-			dx2 = -dx2;
-		}
+        if (dy > 0) {
+            d2  = 1;
+            dj  = di + j1 - j0 + 1;
+            dy2 = (j0 + 1 - fy) * dx;
+        } else {
+            d2  = -1;
+            dy  = -dy;
+            dj  = di + j0 - j1 + 1;
+            dy2 = (fy - j0) * dx;
+            dx2 = -dx2;
+        }
 
-		g_trace.i = i0;
-		g_trace.j = j0;
+        g_trace.i = i0;
+        g_trace.j = j0;
 
-		while( 1 )
-		{
-			if( g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7 )
-			{
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
+        while (1) {
+            if (g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
 
-			dj--;
-			if( !dj ) {
-				break;
-			}
+            dj--;
+            if (!dj) {
+                break;
+            }
 
-			if( dx2 < dy2 )
-			{
-				dy2 -= dx2;
-				dx2 = dy;
-				g_trace.i += d1;
-			}
-			else
-			{
-				dx2 -= dy2;
-				dy2 = dx;
-				g_trace.j += d2;
-			}
-		}
-	}
+            if (dx2 < dy2) {
+                dy2 -= dx2;
+                dx2 = dy;
+                g_trace.i += d1;
+            } else {
+                dx2 -= dy2;
+                dy2 = dx;
+                g_trace.j += d2;
+            }
+        }
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -1575,60 +1451,48 @@ qboolean CM_SightTracePointThroughTerrainCollide( void )
 CM_SightTraceThroughTerrainCollide
 ====================
 */
-qboolean CM_SightTraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *tc )
+qboolean CM_SightTraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
 {
-	int i;
+    int i;
 
-	if( tw->bounds[ 0 ][ 0 ] >= tc->vBounds[ 1 ][ 0 ] ||
-		tw->bounds[ 0 ][ 1 ] >= tc->vBounds[ 1 ][ 1 ] ||
-		tw->bounds[ 0 ][ 2 ] >= tc->vBounds[ 1 ][ 2 ] ||
-		tw->bounds[ 1 ][ 0 ] <= tc->vBounds[ 0 ][ 0 ] ||
-		tw->bounds[ 1 ][ 1 ] <= tc->vBounds[ 0 ][ 1 ] ||
-		tw->bounds[ 1 ][ 2 ] <= tc->vBounds[ 0 ][ 2 ] )
-	{
-		return qtrue;
-	}
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[0][1] >= tc->vBounds[1][1]
+        || tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][0] <= tc->vBounds[0][0]
+        || tw->bounds[1][1] <= tc->vBounds[0][1] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return qtrue;
+    }
 
-	g_trace.tw = tw;
-	g_trace.tc = tc;
-	VectorCopy( tw->start, g_trace.vStart );
-	VectorCopy( tw->end, g_trace.vEnd );
+    g_trace.tw = tw;
+    g_trace.tc = tc;
+    VectorCopy(tw->start, g_trace.vStart);
+    VectorCopy(tw->end, g_trace.vEnd);
 
-	if( tw->isPoint )
-	{
-		VectorCopy( tw->start, g_trace.vStart );
-		VectorCopy( tw->end, g_trace.vEnd );
-		return CM_SightTracePointThroughTerrainCollide();
-	}
-	else
-	{
-		if( tc->squares[ 0 ][ 0 ].plane[ 0 ][ 2 ] >= 0 )
-		{
-			for( i = 0; i < 4; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    if (tw->isPoint) {
+        VectorCopy(tw->start, g_trace.vStart);
+        VectorCopy(tw->end, g_trace.vEnd);
+        return CM_SightTracePointThroughTerrainCollide();
+    } else {
+        if (tc->squares[0][0].plane[0][2] >= 0) {
+            for (i = 0; i < 4; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-				if( !CM_SightTracePointThroughTerrainCollide() ) {
-					return qfalse;
-				}
-			}
-		}
-		else
-		{
-			for( i = 4; i < 8; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+                if (!CM_SightTracePointThroughTerrainCollide()) {
+                    return qfalse;
+                }
+            }
+        } else {
+            for (i = 4; i < 8; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-				if( !CM_SightTracePointThroughTerrainCollide() ) {
-					return qfalse;
-				}
-			}
-		}
-	}
+                if (!CM_SightTracePointThroughTerrainCollide()) {
+                    return qfalse;
+                }
+            }
+        }
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -1636,7 +1500,7 @@ qboolean CM_SightTraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *
 CM_TerrainSquareType
 ====================
 */
-int CM_TerrainSquareType( int iTerrainPatch, int i, int j )
+int CM_TerrainSquareType(int iTerrainPatch, int i, int j)
 {
-	return cm.terrain[ iTerrainPatch ].tc.squares[ i ][ j ].eMode;
+    return cm.terrain[iTerrainPatch].tc.squares[i][j].eMode;
 }
diff --git a/code/qcommon/cm_terrain.h b/code/qcommon/cm_terrain.h
index 83fe5c15..7d2e7df0 100644
--- a/code/qcommon/cm_terrain.h
+++ b/code/qcommon/cm_terrain.h
@@ -28,45 +28,43 @@ void CM_TraceThroughTerPatchCollide(traceWork_t *tw, const struct terPatchCollid
 qboolean CM_PositionTestInTerPatchCollide(traceWork_t *tw, const struct terPatchCollide_s *tc);
 */
 
-#ifndef CM_TERRAIN_H
-#define CM_TERRAIN_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TER_QUADS_PER_ROW	8
-#define TER_TRIS_PER_PATCH	(TER_QUADS_PER_ROW * TER_QUADS_PER_ROW * 2)
-#define TER_PLANES_PER_TRI	5
+#define TER_QUADS_PER_ROW  8
+#define TER_TRIS_PER_PATCH (TER_QUADS_PER_ROW * TER_QUADS_PER_ROW * 2)
+#define TER_PLANES_PER_TRI 5
 
-typedef struct terTriangle_s {
-	cplane_t		planes[TER_PLANES_PER_TRI];	// 0 is the surface plane, 3 border planes follow and a cap to give it some finite volume
-} terTriangle_t;
+    typedef struct terTriangle_s {
+        cplane_t planes
+            [TER_PLANES_PER_TRI]; // 0 is the surface plane, 3 border planes follow and a cap to give it some finite volume
+    } terTriangle_t;
 
-typedef struct terPatchCollide_s {
-	vec3_t			bounds[2];
+    typedef struct terPatchCollide_s {
+        vec3_t bounds[2];
 
-	baseshader_t	*shader;
+        baseshader_t *shader;
 
-	terTriangle_t	tris[TER_TRIS_PER_PATCH];
-} terPatchCollide_t;
+        terTriangle_t tris[TER_TRIS_PER_PATCH];
+    } terPatchCollide_t;
 
-typedef struct terrainCollideSquare_s {
-	vec4_t plane[ 2 ];
-	int eMode;
-} terrainCollideSquare_t;
+    typedef struct terrainCollideSquare_s {
+        vec4_t plane[2];
+        int    eMode;
+    } terrainCollideSquare_t;
 
-typedef struct terrainCollide_s {
-	vec3_t vBounds[ 2 ];
-	terrainCollideSquare_t squares[ 8 ][ 8 ];
-} terrainCollide_t;
+    typedef struct terrainCollide_s {
+        vec3_t                 vBounds[2];
+        terrainCollideSquare_t squares[8][8];
+    } terrainCollide_t;
 
-void CM_PrepareGenerateTerrainCollide( void );
-void CM_GenerateTerrainCollide( cTerraPatch_t *patch, terrainCollide_t *tc );
-int CM_TerrainSquareType( int iTerrainPatch, int i, int j );
+    void CM_PrepareGenerateTerrainCollide(void);
+    void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc);
+    int  CM_TerrainSquareType(int iTerrainPatch, int i, int j);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // CM_TERRAIN_H

From aa209e0aaf5c5ab8aa1e3e36b4d45bc52fdde264 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:09:26 +0100
Subject: [PATCH 0085/2040] Fixed plane distance not being copied correctly
 with terrain square mode 5 or 6

---
 code/qcommon/cm_terrain.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index ede3d330..2babe2aa 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -216,6 +216,7 @@ void CM_PickTerrainSquareMode(terrainCollideSquare_t *square, vec3_t vTest, int
         }
     } else if (square->eMode == 5 || square->eMode == 6) {
         VectorCopy(square->plane[1], square->plane[0]);
+        square->plane[0][3] = square->plane[1][3];
     }
 }
 

From e73be7ef5ca8a034c5284369bae357ae734f1c55 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:19:04 +0100
Subject: [PATCH 0086/2040] Smoke grenades don't exist in vanilla Allied
 Assault

---
 code/fgame/player.cpp | 44 ++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 87df5a5f..56b47b62 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2586,17 +2586,21 @@ void Player::InitMaxAmmo(void)
     GiveAmmo("heavy", 0, 5);
     GiveAmmo("shotgun", 0, 50);
 
-    //
-    // Team tactics ammunition
-    //
-    GiveAmmo("landmine", 0, 5);
+    if (g_target_game >= target_game_e::TG_MOHTT) {
+        //
+        // Team tactics ammunition
+        //
+        GiveAmmo("landmine", 0, 5);
+    }
 
-    //
-    // Team assault ammunition
-    //
-    GiveAmmo("smokegrenade", 0, 5);
-    GiveAmmo("asmokegrenade", 0, 5);
-    GiveAmmo("riflegrenade", 0, 3);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        //
+        // Team assault ammunition
+        //
+        GiveAmmo("smokegrenade", 0, 5);
+        GiveAmmo("asmokegrenade", 0, 5);
+        GiveAmmo("riflegrenade", 0, 3);
+    }
 }
 
 void Player::InitWeapons(void)
@@ -8907,27 +8911,37 @@ void Player::EquipWeapons()
     switch (nationality) {
     case NA_BRITISH:
         giveItem("weapons/mills_grenade.tik");
-        giveItem("weapons/M18_smoke_grenade.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/M18_smoke_grenade.tik");
+        }
         giveItem("weapons/Webley_Revolver.tik");
         break;
     case NA_RUSSIAN:
         giveItem("weapons/Russian_F1_grenade.tik");
-        giveItem("weapons/RDG-1_Smoke_grenade.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/RDG-1_Smoke_grenade.tik");
+        }
         giveItem("weapons/Nagant_revolver.tik");
         break;
     case NA_GERMAN:
         giveItem("weapons/steilhandgranate.tik");
-        giveItem("weapons/nebelhandgranate.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/nebelhandgranate.tik");
+        }
         giveItem("weapons/p38.tik");
         break;
     case NA_ITALIAN:
         giveItem("weapons/it_w_bomba.tik");
-        giveItem("weapons/it_w_bombabreda.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/it_w_bombabreda.tik");
+        }
         giveItem("weapons/it_w_beretta.tik");
         break;
     default:
         giveItem("weapons/m2frag_grenade.tik");
-        giveItem("weapons/M18_smoke_grenade.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/M18_smoke_grenade.tik");
+        }
         giveItem("weapons/colt45.tik");
         break;
     }

From 0a31ab75587aa60881a583a873b54f780124e066 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:23:59 +0100
Subject: [PATCH 0087/2040] Use the correct view model animation for the kar98
 mortar

---
 code/cgame/cg_viewmodelanim.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/cgame/cg_viewmodelanim.c b/code/cgame/cg_viewmodelanim.c
index e53fe7ef..06fe1d94 100644
--- a/code/cgame/cg_viewmodelanim.c
+++ b/code/cgame/cg_viewmodelanim.c
@@ -308,6 +308,9 @@ int CG_GetVMAnimPrefixIndex()
         if (!Q_stricmp(szWeaponName, "Panzerschreck")) {
             return WPREFIX_PANZERSCHRECK;
         }
+        if (!Q_stricmp(szWeaponName, "Gewehrgranate")) {
+            return WPREFIX_KAR98_MORTAR;
+        }
         if (!Q_stricmp(szWeaponName, "Shotgun")) {
             return WPREFIX_SHOTGUN;
         }

From e8109076f489badd3f28c25e8ccf18bae86d58da Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:03:41 +0100
Subject: [PATCH 0088/2040] Assign shaders to surfaces that don't have a shader
 assigned

---
 code/tiki/tiki_files.cpp | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 4f36dc6c..3d87867d 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -176,8 +176,8 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
 
     TIKI_InitSetup(&loaddef);
 
-    loaddef.path = path;
-    loaddef.numanims = 0;
+    loaddef.path              = path;
+    loaddef.numanims          = 0;
     loaddef.numserverinitcmds = 0;
     loaddef.numclientinitcmds = 0;
 
@@ -451,6 +451,33 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
         }
     }
 
+    // Added in 2.0
+    //  For surfaces without shader
+    //  assign them the shader with the same name
+    surfOffset = 0;
+    for (i = 0; i < temp.tiki.numMeshes; i++, surfOffset += skelmodel->numSurfaces) {
+        skelmodel = TIKI_GetSkel(temp.tiki.mesh[i]);
+
+        surf = skelmodel->pSurfaces;
+
+        for (j = 0; j < skelmodel->numSurfaces; j++, surf = surf->pNext) {
+            tikiSurf = &tiki->surfaces[surfOffset + j];
+
+            if (tikiSurf->numskins) {
+                // Skip surfaces with skins
+                continue;
+            }
+
+            Q_strncpyz(tikiSurf->name, surf->name, sizeof(tikiSurf->name));
+
+            if (strlen(surf->name) != 9 || !Q_strncmp(surf->name, "material", 8)) {
+                Q_strncpyz(tikiSurf->shader[0], surf->name, sizeof(tikiSurf->shader[0]));
+            }
+
+            tikiSurf->numskins = 1;
+        }
+    }
+
     if (!tiki->radius) {
         TIKI_CalcRadius(tiki);
     }

From 56044dd8f8d5b04de648e6a7f9d8bda71da40e9c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:19:55 +0100
Subject: [PATCH 0089/2040] HideMouse doesn't take parameters

---
 code/fgame/scriptthread.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 468126f3..be8438a9 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -3725,13 +3725,6 @@ void ScriptThread::EventHideMouse(Event *ev)
 {
     gentity_t *ent;
     int        i;
-    str        name;
-
-    if (game.maxclients <= 0) {
-        return;
-    }
-
-    name = ev->GetString(1);
 
     for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
         if (!ent->inuse || !ent->client) {

From 0ed92943de43161ff0f41651be5c01dc3b39d39f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:22:06 +0100
Subject: [PATCH 0090/2040] Fixed commands not being executed properly on a
 specific type of array of listeners

---
 code/script/scriptvm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index ce0e0247..1f9e6cff 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -682,7 +682,7 @@ void ScriptVM::execCmdMethodCommon(op_parmNum_t param)
             array.CastConstArrayValue();
 
             for (uintptr_t i = array.arraysize(); i > 0; i--) {
-                Listener *const listener = array[i]->listenerAt(i);
+                Listener *const listener = array.listenerAt(i);
                 if (listener) {
                     executeCommand<true>(listener, param, eventNum);
                 }

From d50128505795d6099c4c4a3050a4e18865665773 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 15:47:48 +0100
Subject: [PATCH 0091/2040] Play pain animation only in 2.0 and above

---
 code/fgame/player.cpp | 250 +++++++++++++++++++++---------------------
 1 file changed, 126 insertions(+), 124 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 56b47b62..0ed199f1 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -6161,145 +6161,147 @@ void Player::DamageFeedback(void)
         damage_blend += (damage_blood / realcount) * bcolor;
     }
 
-    //
-    // Since 2.0: Try to find and play pain animation
-    //
-    if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
-        // use mg42 pain animation
-        painAnim = "mg42_tripod_";
-    } else {
-        Weapon     *pWeap;
-        const char *itemName;
-        // try to find an animation
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        //
+        // Since 2.0: Try to find and play pain animation
+        //
+        if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
+            // use mg42 pain animation
+            painAnim = "mg42_tripod_";
+        } else {
+            Weapon     *pWeap;
+            const char *itemName;
+            // try to find an animation
 
-        pWeap = GetActiveWeapon(WEAPON_MAIN);
-        if (pWeap) {
-            int weapon_class;
+            pWeap = GetActiveWeapon(WEAPON_MAIN);
+            if (pWeap) {
+                int weapon_class;
 
-            weapon_class = pWeap->GetWeaponClass();
-            if (weapon_class & WEAPON_CLASS_PISTOL) {
-                painAnim = "pistol_";
-            } else if (weapon_class & WEAPON_CLASS_RIFLE) {
-                painAnim = "rifle_";
-            } else if (weapon_class & WEAPON_CLASS_SMG) {
-                // get the animation name from the item name
-                itemName = pWeap->GetItemName();
+                weapon_class = pWeap->GetWeaponClass();
+                if (weapon_class & WEAPON_CLASS_PISTOL) {
+                    painAnim = "pistol_";
+                } else if (weapon_class & WEAPON_CLASS_RIFLE) {
+                    painAnim = "rifle_";
+                } else if (weapon_class & WEAPON_CLASS_SMG) {
+                    // get the animation name from the item name
+                    itemName = pWeap->GetItemName();
 
-                if (!Q_stricmp(itemName, "MP40")) {
-                    painAnim = "mp40_";
-                } else if (!Q_stricmp(itemName, "Sten Mark II")) {
-                    painAnim = "sten_";
+                    if (!Q_stricmp(itemName, "MP40")) {
+                        painAnim = "mp40_";
+                    } else if (!Q_stricmp(itemName, "Sten Mark II")) {
+                        painAnim = "sten_";
+                    } else {
+                        painAnim = "smg_";
+                    }
+                } else if (weapon_class & WEAPON_CLASS_MG) {
+                    itemName = pWeap->GetItemName();
+
+                    if (!Q_stricmp(itemName, "StG 44")) {
+                        painAnim = "mp44_";
+                    } else {
+                        painAnim = "mg_";
+                    }
+                } else if (weapon_class & WEAPON_CLASS_GRENADE) {
+                    itemName = pWeap->GetItemName();
+
+                    // 2.30: use landmine animations
+                    if (!Q_stricmp(itemName, "Minedetector")) {
+                        painAnim = "minedetector_";
+                    } else if (!Q_stricmp(itemName, "Minensuchgerat")) {
+                        painAnim = "minedetectoraxis_";
+                    } else if (!Q_stricmp(itemName, "LandmineAllies")) {
+                        painAnim = "mine_";
+                    } else if (!Q_stricmp(itemName, "LandmineAxis")) {
+                        painAnim = "mine_";
+                    } else if (!Q_stricmp(itemName, "LandmineAxis")) {
+                        painAnim = "grenade_";
+                    }
+                } else if (weapon_class & WEAPON_CLASS_HEAVY) {
+                    itemName = pWeap->GetItemName();
+
+                    if (!Q_stricmp(itemName, "Shotgun")) {
+                        painAnim = "shotgun_";
+                    } else {
+                        // Defaults to bazooka
+                        painAnim = "bazooka_";
+                    }
                 } else {
-                    painAnim = "smg_";
-                }
-            } else if (weapon_class & WEAPON_CLASS_MG) {
-                itemName = pWeap->GetItemName();
+                    itemName = pWeap->GetItemName();
 
-                if (!Q_stricmp(itemName, "StG 44")) {
-                    painAnim = "mp44_";
-                } else {
-                    painAnim = "mg_";
-                }
-            } else if (weapon_class & WEAPON_CLASS_GRENADE) {
-                itemName = pWeap->GetItemName();
-
-                // 2.30: use landmine animations
-                if (!Q_stricmp(itemName, "Minedetector")) {
-                    painAnim = "minedetector_";
-                } else if (!Q_stricmp(itemName, "Minensuchgerat")) {
-                    painAnim = "minedetectoraxis_";
-                } else if (!Q_stricmp(itemName, "LandmineAllies")) {
-                    painAnim = "mine_";
-                } else if (!Q_stricmp(itemName, "LandmineAxis")) {
-                    painAnim = "mine_";
-                } else if (!Q_stricmp(itemName, "LandmineAxis")) {
-                    painAnim = "grenade_";
-                }
-            } else if (weapon_class & WEAPON_CLASS_HEAVY) {
-                itemName = pWeap->GetItemName();
-
-                if (!Q_stricmp(itemName, "Shotgun")) {
-                    painAnim = "shotgun_";
-                } else {
-                    // Defaults to bazooka
-                    painAnim = "bazooka_";
+                    if (!Q_stricmp(itemName, "Packed MG42 Turret")) {
+                        painAnim = "mg42_";
+                    } else {
+                        // Default animation if not found
+                        painAnim = "unarmed_";
+                    }
                 }
             } else {
-                itemName = pWeap->GetItemName();
-
-                if (!Q_stricmp(itemName, "Packed MG42 Turret")) {
-                    painAnim = "mg42_";
-                } else {
-                    // Default animation if not found
-                    painAnim = "unarmed_";
-                }
+                painAnim = "unarmed_";
             }
+
+            // use the animation based on the movement
+            if (m_iMovePosFlags & MPF_POSITION_CROUCHING) {
+                painAnim += "crouch_";
+            } else {
+                painAnim += "stand_";
+            }
+        }
+
+        painAnim += "hit_";
+
+        if (pain_dir == PAIN_REAR || pain_location == HITLOC_TORSO_MID || HITLOC_TORSO_LOWER) {
+            painAnim += "back";
         } else {
-            painAnim = "unarmed_";
+            switch (pain_location) {
+            case HITLOC_HEAD:
+            case HITLOC_HELMET:
+            case HITLOC_NECK:
+                painAnim += "head";
+                break;
+            case HITLOC_TORSO_UPPER:
+            case HITLOC_TORSO_MID:
+                painAnim += "uppertorso";
+                break;
+            case HITLOC_TORSO_LOWER:
+            case HITLOC_PELVIS:
+                painAnim += "lowertorso";
+                break;
+            case HITLOC_R_ARM_UPPER:
+            case HITLOC_R_ARM_LOWER:
+            case HITLOC_R_HAND:
+                painAnim += "rarm";
+                break;
+            case HITLOC_L_ARM_UPPER:
+            case HITLOC_L_ARM_LOWER:
+            case HITLOC_L_HAND:
+                painAnim += "larm";
+                break;
+            case HITLOC_R_LEG_UPPER:
+            case HITLOC_L_LEG_UPPER:
+            case HITLOC_R_LEG_LOWER:
+            case HITLOC_L_LEG_LOWER:
+            case HITLOC_R_FOOT:
+            case HITLOC_L_FOOT:
+                painAnim += "leg";
+                break;
+            default:
+                painAnim += "uppertorso";
+                break;
+            }
         }
 
-        // use the animation based on the movement
-        if (m_iMovePosFlags & MPF_POSITION_CROUCHING) {
-            painAnim += "crouch_";
+        animnum = gi.Anim_NumForName(edict->tiki, painAnim.c_str());
+        if (animnum == -1) {
+            gi.DPrintf("WARNING: Could not find player pain animation '%s'\n", painAnim.c_str());
         } else {
-            painAnim += "stand_";
+            NewAnim(animnum, EV_Player_AnimLoop_Pain, ANIMSLOT_PAIN);
+            RestartAnimSlot(ANIMSLOT_PAIN);
+            m_sPainAnim   = painAnim;
+            m_fPainBlend  = 1.f;
+            animdone_Pain = false;
         }
     }
 
-    painAnim += "hit_";
-
-    if (pain_dir == PAIN_REAR || pain_location == HITLOC_TORSO_MID || HITLOC_TORSO_LOWER) {
-        painAnim += "back";
-    } else {
-        switch (pain_location) {
-        case HITLOC_HEAD:
-        case HITLOC_HELMET:
-        case HITLOC_NECK:
-            painAnim += "head";
-            break;
-        case HITLOC_TORSO_UPPER:
-        case HITLOC_TORSO_MID:
-            painAnim += "uppertorso";
-            break;
-        case HITLOC_TORSO_LOWER:
-        case HITLOC_PELVIS:
-            painAnim += "lowertorso";
-            break;
-        case HITLOC_R_ARM_UPPER:
-        case HITLOC_R_ARM_LOWER:
-        case HITLOC_R_HAND:
-            painAnim += "rarm";
-            break;
-        case HITLOC_L_ARM_UPPER:
-        case HITLOC_L_ARM_LOWER:
-        case HITLOC_L_HAND:
-            painAnim += "larm";
-            break;
-        case HITLOC_R_LEG_UPPER:
-        case HITLOC_L_LEG_UPPER:
-        case HITLOC_R_LEG_LOWER:
-        case HITLOC_L_LEG_LOWER:
-        case HITLOC_R_FOOT:
-        case HITLOC_L_FOOT:
-            painAnim += "leg";
-            break;
-        default:
-            painAnim += "uppertorso";
-            break;
-        }
-    }
-
-    animnum = gi.Anim_NumForName(edict->tiki, painAnim.c_str());
-    if (animnum == -1) {
-        gi.DPrintf("WARNING: Could not find player pain animation '%s'\n", painAnim.c_str());
-    } else {
-        NewAnim(animnum, EV_Player_AnimLoop_Pain, ANIMSLOT_PAIN);
-        RestartAnimSlot(ANIMSLOT_PAIN);
-        m_sPainAnim   = painAnim;
-        m_fPainBlend  = 1.f;
-        animdone_Pain = false;
-    }
-
     //
     // clear totals
     //

From 937f3993ec066a72360ed4f4027ac883a7f88f1e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 16:10:49 +0100
Subject: [PATCH 0092/2040] Removed unusable FX in 1.11 and below

---
 code/cgame/cg_specialfx.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/code/cgame/cg_specialfx.cpp b/code/cgame/cg_specialfx.cpp
index 8f5abb61..d1b1c970 100644
--- a/code/cgame/cg_specialfx.cpp
+++ b/code/cgame/cg_specialfx.cpp
@@ -234,9 +234,15 @@ void ClientSpecialEffectsManager::LoadEffects()
             szEffectModel = "models/fx/bazookaexp_base.tik";
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_base.tik";
             break;
         case SFX_EXP_TANK_BASE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_base.tik";
             break;
         case SFX_EXP_GREN_PAPER:
@@ -285,30 +291,57 @@ void ClientSpecialEffectsManager::LoadEffects()
             szEffectModel = "models/fx/grenexp_carpet.tik";
             break;
         case SFX_EXP_HEAVYSHELL_DIRT:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_dirt.tik";
             break;
         case SFX_EXP_HEAVYSHELL_STONE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_stone.tik";
             break;
         case SFX_EXP_HEAVYSHELL_SNOW:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_snow.tik";
             break;
         case SFX_EXP_TANK_DIRT:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_dirt.tik";
             break;
         case SFX_EXP_TANK_STONE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_stone.tik";
             break;
         case SFX_EXP_TANK_SNOW:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_snow.tik";
             break;
         case SFX_EXP_BAZOOKA_DIRT:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/bazookaexp_dirt.tik";
             break;
         case SFX_EXP_BAZOOKA_STONE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/bazookaexp_stone.tik";
             break;
         case SFX_EXP_BAZOOKA_SNOW:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/bazookaexp_snow.tik";
             break;
         case SFX_WATER_RIPPLE_STILL:

From 0290fa3351cd763f07b8806e0aafdfe97d60398f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 16:29:38 +0100
Subject: [PATCH 0093/2040] Set default animation on the attached model if the
 tag was not found

---
 code/fgame/entity.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index fe8f1d47..7cfe575b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -4385,6 +4385,7 @@ void Entity::AttachModelEvent(Event *ev)
         }
     } else {
         warning("AttachModelEvent", "Tag %s not found", bone.c_str());
+        obj->NewAnim("idle");
     }
 }
 

From 8cf3be3526da236f7f2abd0f03cb23b2a5a5ec91 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 16:30:22 +0100
Subject: [PATCH 0094/2040] If in thinks, don't delete the object immediately

---
 code/fgame/entity.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 7cfe575b..6f62e540 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -4380,7 +4380,12 @@ void Entity::AttachModelEvent(Event *ev)
         if (obj->attach(this->entnum, tagnum, true, offset)) {
             obj->NewAnim("idle");
         } else {
-            delete obj;
+            warning("AttachModelEvent", "Could not attach model %s to tag \"%s\" on entnum #%d (targetname = %s)", modelname.c_str(), bone.c_str(), entnum, targetname.c_str());
+            if (g_iInThinks) {
+                PostEvent(EV_Remove, 0);
+            } else {
+                delete obj;
+            }
             return;
         }
     } else {

From d5908bd75ccdc663af3d44554a9110d8dbdabd27 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 16:30:31 +0100
Subject: [PATCH 0095/2040] Fixed frag grenade spelling in SP

---
 code/fgame/weapon.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index a4336227..935e303d 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2954,6 +2954,7 @@ void Weapon::PickupWeapon(Event *ev)
 
         sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
+        /*
         if (!g_gametype->integer && other->IsSubclassOfPlayer()) {
             if (!sAmmoType.icmp("agrenade")) {
                 if (iGiveAmmo == 1) {
@@ -2963,8 +2964,9 @@ void Weapon::PickupWeapon(Event *ev)
                 }
             }
         }
+        */
 
-        if (!sAmmoType.icmp("grenade")) {
+        if (!sAmmoType.icmp("grenade") || !sAmmoType.icmp("agrenade")) {
             if (iGiveAmmo == 1) {
                 sMessage = gi.LV_ConvertString("Got 1 Grenade");
             } else {
@@ -2986,6 +2988,7 @@ void Weapon::PickupWeapon(Event *ev)
 
             sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
+            /*
             if (!g_gametype->integer && other->IsSubclassOfPlayer()) {
                 if (!sAmmoType.icmp("agrenade")) {
                     if (iGiveAmmo == 1) {
@@ -2995,8 +2998,9 @@ void Weapon::PickupWeapon(Event *ev)
                     }
                 }
             }
+            */
 
-            if (!sAmmoType.icmp("grenade")) {
+            if (!sAmmoType.icmp("grenade") || !sAmmoType.icmp("agrenade")) {
                 if (iGiveAmmo == 1) {
                     sMessage = gi.LV_ConvertString("Got 1 Grenade");
                 } else {

From ac40373c09c16f9c8c9d485a9519598370304ad3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:08:37 +0100
Subject: [PATCH 0096/2040] Use RemoveVehicleSoundEntities() to remove sound
 entities

---
 code/fgame/vehicle.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 3ceb667d..21f38dee 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -1194,11 +1194,7 @@ Vehicle::~Vehicle
 */
 Vehicle::~Vehicle()
 {
-    for (int i = 0; i < MAX_CORNERS; i++) {
-        if (m_pVehicleSoundEntities[i]) {
-            m_pVehicleSoundEntities[i]->PostEvent(EV_Remove, EV_LINKDOORS);
-        }
-    }
+    RemoveVehicleSoundEntities();
 
     if (m_pCollisionEntity) {
         m_pCollisionEntity->ProcessEvent(EV_Remove);

From 2174f2ff85328337c46f6e434f2fab7420d70c7e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:09:08 +0100
Subject: [PATCH 0097/2040] For "delete" and "remove", use
 Listener::ScriptRemove

---
 code/fgame/entity.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 6f62e540..904cd28a 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -1645,8 +1645,8 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_ConnectPaths,                 &Entity::EventConnectPaths        },
     {&EV_DisconnectPaths,              &Entity::EventDisconnectPaths     },
     {&EV_Remove,                       &Entity::Remove                   },
-    {&EV_Delete,                       &Entity::Remove                   },
-    {&EV_ScriptRemove,                 &Entity::Remove                   },
+    {&EV_Delete,                       &Listener::ScriptRemove           },
+    {&EV_ScriptRemove,                 &Listener::ScriptRemove           },
     {&EV_VolumeDamage,                 &Entity::EventVolumeDamage        },
     {&EV_GetNormalHealth,              &Entity::EventGetNormalHealth     },
     {&EV_NormalDamage,                 &Entity::EventNormalDamage        },

From 0fabdc8c4439495661f391163a8077b2c93d7fd0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:25:03 +0100
Subject: [PATCH 0098/2040] Added current objective index

---
 code/cgame/cg_local.h | 1 +
 code/cgame/cg_main.c  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 314bf2b9..caf1997e 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -340,6 +340,7 @@ extern "C" {
         float        ObjectivesBaseAlpha;
         float        ObjectivesDesiredAlpha;
         float        ObjectivesCurrentAlpha;
+        int          ObjectivesCurrentIndex;
 
         // misc
         crain_t      rain;
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 70f4346b..0b342c61 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -351,6 +351,9 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
                 }
             }
             return;
+        case CS_CURRENT_OBJECTIVE:
+            cg.ObjectivesCurrentIndex = atoi(str);
+            break;
         }
 
         if (num >= CS_OBJECTIVES && num < CS_OBJECTIVES + MAX_OBJECTIVES) {

From fce0f7b357a9766c6557617a8b4a63b8bf9e6bee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:36:34 +0100
Subject: [PATCH 0099/2040] Better rain handlijng

---
 code/cgame/cg_local.h |  1 +
 code/cgame/cg_main.c  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index caf1997e..500e259c 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -187,6 +187,7 @@ extern "C" {
         float min_dist;
         float width;
         char  shader[MAX_RAIN_SHADERS][MAX_STRING_CHARS];
+        char  currentShader[MAX_STRING_CHARS];
         int   numshaders;
     } crain_t;
 
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 0b342c61..5c74c473 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -335,25 +335,25 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             cg.rain.width = atof(str);
             return;
         case CS_RAIN_SHADER:
-            if (cg.rain.numshaders) {
-                for (i = 0; i < cg.rain.numshaders; i++) {
-                    sprintf(cg.rain.shader[i], "%s%i", str, i);
-                }
-            } else {
-                strcpy(cg.rain.shader[0], str);
+            Q_strncpyz(cg.rain.currentShader, str, sizeof(cg.rain.currentShader));
+            for (i = 0; i < cg.rain.numshaders; ++i) {
+                Com_sprintf(cg.rain.shader[i], sizeof(cg.rain.shader[i]), "%s%i", cg.rain.currentShader, i);
+            }
+            if (!cg.rain.numshaders) {
+                Q_strncpyz(cg.rain.shader[0], cg.rain.currentShader, sizeof(cg.rain.shader[0]));
             }
             return;
         case CS_RAIN_NUMSHADERS:
             cg.rain.numshaders = atoi(str);
             if (cg.rain.numshaders) {
                 for (i = 0; i < cg.rain.numshaders; i++) {
-                    sprintf(cg.rain.shader[i], "%s%i", str, i);
+                    Com_sprintf(cg.rain.shader[i], sizeof(cg.rain.shader[i]), "%s%i", cg.rain.currentShader, i);
                 }
             }
             return;
         case CS_CURRENT_OBJECTIVE:
             cg.ObjectivesCurrentIndex = atoi(str);
-            break;
+            return;
         }
 
         if (num >= CS_OBJECTIVES && num < CS_OBJECTIVES + MAX_OBJECTIVES) {

From 13ec3435b43e675728760a26159a599cbc999491 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:36:56 +0100
Subject: [PATCH 0100/2040] Fixed rain num shaders

---
 code/fgame/level.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index c98d4fa4..f2bff60c 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -695,8 +695,8 @@ CLASS_DECLARATION(Listener, Level, NULL) {
     {&EV_Level_Rain_Width_Get,                &Level::EventRainWidthGet            },
     {&EV_Level_Rain_Shader_Set,               &Level::EventRainShaderSet           },
     {&EV_Level_Rain_Shader_Get,               &Level::EventRainShaderGet           },
-    {&EV_Level_Rain_NumShaders_Set,           &Level::EventRainShaderSet           },
-    {&EV_Level_Rain_NumShaders_Get,           &Level::EventRainShaderGet           },
+    {&EV_Level_Rain_NumShaders_Set,           &Level::EventRainNumShadersSet       },
+    {&EV_Level_Rain_NumShaders_Get,           &Level::EventRainNumShadersGet       },
     {&EV_Level_AddBadPlace,                   &Level::EventAddBadPlace             },
     {&EV_Level_RemoveBadPlace,                &Level::EventRemoveBadPlace          },
     {&EV_Level_IgnoreClock,                   &Level::EventIgnoreClock             },

From cf1dbf07c75095fc3675344967af0cd55b9efc95 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 4 Feb 2024 20:46:05 +0100
Subject: [PATCH 0101/2040] Corrected MASK_CLICK tracemask (especially for
 patches surface)

---
 code/fgame/bg_public.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 079c74b7..890fa1d2 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -651,8 +651,7 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_VEHICLECLIP \
      | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_VEHICLE_TIRES (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_FENCE | CONTENTS_VEHICLECLIP | CONTENTS_TRIGGER)
-#define MASK_CLICK \
-    (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
+#define MASK_CLICK (CONTENTS_VEHICLECLIP | CONTENTS_WEAPONCLIP | CONTENTS_MONSTERCLIP | CONTENTS_PLAYERCLIP | CONTENTS_SOLID)
 #define MASK_CANSEE \
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)

From 500c70016f944f76c342a7f4da396e9a0b593b5d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:13:23 +0100
Subject: [PATCH 0102/2040] Don't crossblend with new weapons

---
 code/cgame/cg_viewmodelanim.c | 65 ++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/code/cgame/cg_viewmodelanim.c b/code/cgame/cg_viewmodelanim.c
index 06fe1d94..794fccd1 100644
--- a/code/cgame/cg_viewmodelanim.c
+++ b/code/cgame/cg_viewmodelanim.c
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static const char *AnimPrefixList[] = {
     "",
+    "unarmed",
     "papers",
     "colt45",
     "p38",
@@ -45,7 +46,6 @@ static const char *AnimPrefixList[] = {
     "bazooka",
     "panzerschreck",
     "shotgun",
-    "unarmed",
     //
     // Team Assault and Team Tactics weapons
     "mg42portable",
@@ -82,6 +82,7 @@ static const char *AnimPrefixList[] = {
 
 enum animPrefix_e {
     WPREFIX_NONE,
+    WPREFIX_UNARMED,
     WPREFIX_PAPERS,
     WPREFIX_COLT45,
     WPREFIX_P38,
@@ -99,7 +100,6 @@ enum animPrefix_e {
     WPREFIX_BAZOOKA,
     WPREFIX_PANZERSCHRECK,
     WPREFIX_SHOTGUN,
-    WPREFIX_UNARMED,
     //
     // Team Assault and Team Tactics weapons
     WPREFIX_MG42_PORTABLE,
@@ -338,9 +338,11 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
     char        szAnimName[MAX_QPATH];
     dtiki_t    *pTiki;
     qboolean    bAnimChanged;
+    qboolean    bWeaponChanged;
 
     fCrossblendFrac = 0.0;
-    bAnimChanged    = 0;
+    bAnimChanged    = qfalse;
+    bWeaponChanged  = qfalse; // Added in OPM
     pTiki           = pModel->tiki;
 
     if (cgi.anim->g_iLastEquippedWeaponStat == cg.snap->ps.stats[STAT_EQUIPPED_WEAPON]
@@ -351,7 +353,9 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
         cgi.anim->g_iLastEquippedWeaponStat = cg.snap->ps.stats[STAT_EQUIPPED_WEAPON];
         strcpy(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]));
         cgi.anim->g_iLastAnimPrefixIndex = iAnimPrefixIndex;
-        bAnimChanged                     = qtrue;
+
+        bAnimChanged   = qtrue;
+        bWeaponChanged = qtrue;
     }
 
     if (cgi.anim->g_iLastVMAnim == -1) {
@@ -425,20 +429,27 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
         }
 
         sprintf(szAnimName, "%s_%s", AnimPrefixList[iAnimPrefixIndex], pszAnimSuffix);
-        fCrossblendTime = cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
-        fCrossblendAmount = cgi.anim->g_iCurrentVMDuration / 1000.0;
+        if (!bWeaponChanged) {
+            fCrossblendTime =
+                cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
+            fCrossblendAmount = cgi.anim->g_iCurrentVMDuration / 1000.0;
 
-        if (fCrossblendAmount < fCrossblendTime && fCrossblendAmount > 0.0) {
-            fCrossblendFrac = fCrossblendAmount / fCrossblendTime;
-            for (i = 0; i < MAX_FRAMEINFOS; ++i) {
-                if (cgi.anim->g_VMFrameInfo[i].weight) {
-                    if (i == cgi.anim->g_iCurrentVMAnimSlot) {
-                        cgi.anim->g_VMFrameInfo[i].weight = fCrossblendFrac;
-                    } else {
-                        cgi.anim->g_VMFrameInfo[i].weight *= (1.0 - fCrossblendFrac);
+            if (fCrossblendAmount < fCrossblendTime && fCrossblendAmount > 0.0) {
+                fCrossblendFrac = fCrossblendAmount / fCrossblendTime;
+                for (i = 0; i < MAX_FRAMEINFOS; ++i) {
+                    if (cgi.anim->g_VMFrameInfo[i].weight) {
+                        if (i == cgi.anim->g_iCurrentVMAnimSlot) {
+                            cgi.anim->g_VMFrameInfo[i].weight = fCrossblendFrac;
+                        } else {
+                            cgi.anim->g_VMFrameInfo[i].weight *= (1.0 - fCrossblendFrac);
+                        }
                     }
                 }
             }
+        } else {
+            fCrossblendTime   = 0;
+            fCrossblendAmount = 0;
+            fCrossblendFrac   = 0;
         }
 
         cgi.anim->g_iCurrentVMAnimSlot = (cgi.anim->g_iCurrentVMAnimSlot + 1) % MAX_FRAMEINFOS;
@@ -453,17 +464,31 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
         cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].weight = 1.0;
         cgi.anim->g_iCurrentVMDuration                                 = 0;
 
-        fCrossblendTime = cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
-        if (!fCrossblendTime) {
+        if (!bWeaponChanged) {
+            fCrossblendTime =
+                cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
+            if (!fCrossblendTime) {
+                for (i = 0; i < MAX_FRAMEINFOS; ++i) {
+                    if (i != cgi.anim->g_iCurrentVMAnimSlot) {
+                        cgi.anim->g_VMFrameInfo[i].weight = 0.0;
+                    }
+                }
+
+                cgi.anim->g_bCrossblending = qfalse;
+            } else {
+                cgi.anim->g_bCrossblending = qtrue;
+            }
+        } else {
+            // Added in OPM
+            //  If there is a new weapon, don't do any crossblend
+            cgi.anim->g_bCrossblending = qfalse;
+
+            // clear crossblend values
             for (i = 0; i < MAX_FRAMEINFOS; ++i) {
                 if (i != cgi.anim->g_iCurrentVMAnimSlot) {
                     cgi.anim->g_VMFrameInfo[i].weight = 0.0;
                 }
             }
-
-            cgi.anim->g_bCrossblending = qfalse;
-        } else {
-            cgi.anim->g_bCrossblending = qtrue;
         }
     }
 

From c9aedf242d4925397b4321f82a7bfff0a4b5317d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Feb 2024 21:03:10 +0100
Subject: [PATCH 0103/2040] Fixed scoreboard sending incorrect data for
 spectators

---
 code/fgame/dm_manager.cpp | 52 ++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 65b50e78..6125e0c1 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -271,7 +271,8 @@ void DM_Team::AddKills(Player *player, int numKills)
     if (m_teamnumber > TEAM_FREEFORALL) {
         m_iKills += numKills;
 
-        if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW) || g_gametype->integer == GT_LIBERATION) {
+        if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW)
+            || g_gametype->integer == GT_LIBERATION) {
             player->AddDeaths(numKills);
         } else {
             m_teamwins += numKills;
@@ -285,7 +286,8 @@ void DM_Team::AddDeaths(Player *player, int numDeaths)
         return;
     }
 
-    if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW) || g_gametype->integer == GT_LIBERATION) {
+    if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW)
+        || g_gametype->integer == GT_LIBERATION) {
         return;
     }
 
@@ -626,7 +628,11 @@ Event EV_DM_Manager_DoRoundTransition
 );
 Event EV_DM_Manager_FinishRoundTransition
 (
-    "finishroundtransition", EV_DEFAULT, NULL, NULL, "delayed function call to do the actual restart for the next round"
+    "finishroundtransition",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "delayed function call to do the actual restart for the next round"
 );
 
 CLASS_DECLARATION(Listener, DM_Manager, NULL) {
@@ -667,7 +673,7 @@ DM_Manager::DM_Manager()
     m_csTeamBombPlantSide  = STRING_DRAW;
     m_iNumTargetsToDestroy = 1;
     m_iNumTargetsDestroyed = 0;
-    m_iNumBombsPlanted     = 0; 
+    m_iNumBombsPlanted     = 0;
     m_bAllowAxisRespawn    = true;
     m_bAllowAlliedRespawn  = true;
     m_bRoundActive         = false;
@@ -1048,11 +1054,11 @@ void DM_Manager::InitGame(void)
     }
 
     for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
-        SimpleArchivedEntity* const ent = level.m_SimpleArchivedEntities.ObjectAt(i);
-        const char* const classname = ent->getClassID();
+        SimpleArchivedEntity *const ent       = level.m_SimpleArchivedEntities.ObjectAt(i);
+        const char *const           classname = ent->getClassID();
 
         if (!Q_stricmp(classname, "info_player_deathmatch")) {
-            PlayerStart* const spawnpoint = static_cast<PlayerStart*>(ent);
+            PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
             m_team_spectator.m_spawnpoints.AddObject(spawnpoint);
             m_team_freeforall.m_spawnpoints.AddObject(spawnpoint);
 
@@ -1062,16 +1068,16 @@ void DM_Manager::InitGame(void)
             }
         } else if (!Q_stricmp(classname, "info_player_allied")) {
             if (g_gametype->integer >= GT_TEAM) {
-                PlayerStart* const spawnpoint = static_cast<PlayerStart*>(ent);
+                PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
                 m_team_allies.m_spawnpoints.AddObject(spawnpoint);
             }
         } else if (!Q_stricmp(classname, "info_player_axis")) {
             if (g_gametype->integer >= GT_TEAM) {
-                PlayerStart* const spawnpoint = static_cast<PlayerStart*>(ent);
+                PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
                 m_team_axis.m_spawnpoints.AddObject(spawnpoint);
             }
         } else if (!Q_stricmp(classname, "info_player_intermission")) {
-            PlayerStart* const spawnpoint = static_cast<PlayerStart*>(ent);
+            PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
             m_team_freeforall.m_spawnpoints.AddObject(spawnpoint);
         }
     }
@@ -1100,10 +1106,10 @@ void DM_Manager::InitGame(void)
             m_bRoundBasedGame = false;
         } else {
             if (g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
-                m_bAllowRespawns = true;
+                m_bAllowRespawns  = true;
                 m_bRoundBasedGame = true;
             } else {
-                m_bAllowRespawns = false;
+                m_bAllowRespawns  = false;
                 m_bRoundBasedGame = true;
             }
 
@@ -1534,7 +1540,7 @@ void DM_Manager::StartRound(void)
     }
 
     m_fRoundEndTime = 0.0f;
-    m_bRoundActive = true;
+    m_bRoundActive  = true;
 
     // respawn all players
     for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
@@ -1620,7 +1626,8 @@ float DM_Manager::GetMatchStartTime(void)
         return m_fRoundTime;
     }
 
-    if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE || g_gametype->integer == GT_LIBERATION) {
+    if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE
+        || g_gametype->integer == GT_LIBERATION) {
         if (m_fRoundTime > 0 && (m_team_allies.IsEmpty() || m_team_allies.IsEmpty())) {
             m_fRoundTime = 0;
             return -1;
@@ -1796,15 +1803,15 @@ void DM_Manager::InsertEntry(const char *entry)
     }
 }
 
-void DM_Manager::InsertEntryNoCount(const char* entry)
+void DM_Manager::InsertEntryNoCount(const char *entry)
 {
-	size_t len = strlen(entry);
+    size_t len = strlen(entry);
 
-	if (scoreLength + len < MAX_STRING_CHARS) {
-		strcpy(scoreString + scoreLength, entry);
+    if (scoreLength + len < MAX_STRING_CHARS) {
+        strcpy(scoreString + scoreLength, entry);
 
-		scoreLength += len;
-	}
+        scoreLength += len;
+    }
 }
 
 void DM_Manager::InsertEmpty(void)
@@ -1916,7 +1923,7 @@ void DM_Manager::BuildTeamInfo_ver15(DM_Team *dmTeam)
                 iPing
             );
         } else {
-            Com_sprintf(entry, sizeof(entry), "%i %i \"\" \"\" \"\" \"\" \"\" ", -1, dmTeam->m_teamnumber);
+            Com_sprintf(entry, sizeof(entry), "%i %i \"\" \"\" \"\" \"\" ", -1, dmTeam->m_teamnumber);
         }
     } else {
         Com_sprintf(entry, sizeof(entry), "%i \"\" \"\" \"\" \"\" ", -1 - dmTeam->m_teamnumber);
@@ -1977,7 +1984,8 @@ void DM_Manager::BuildPlayerTeamInfo(DM_Team *dmTeam, int *iPlayerList, DM_Team
 
 bool DM_Manager::IsAlivePlayer(Player *player) const
 {
-    return !player->IsDead() && !player->IsSpectator() && !player->IsInJail() || player->GetDM_Team() == &m_team_spectator;
+    return !player->IsDead() && !player->IsSpectator() && !player->IsInJail()
+        || player->GetDM_Team() == &m_team_spectator;
 }
 
 CTeamSpawnClock::CTeamSpawnClock()

From 336ba6181e7750f62afbd7c2cc2da7ec33305643 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:25:41 +0100
Subject: [PATCH 0104/2040] Don't allocate planes / facets if there are none

---
 code/qcommon/cm_patch.c | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index ef4e31e6..34f367e9 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -1131,10 +1131,37 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
 	// copy the results out
 	pf->numPlanes = numPlanes;
     pf->numFacets = numFacets;
-    pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
-    Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
-    pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
-    Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
+	if (numPlanes >= 1) {
+		pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
+		Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
+	} else {
+        pf->numPlanes = 0;
+        pf->planes = NULL;
+        Com_DPrintf(
+            "WARNING: CM_PatchCollideFromGrid: Degenerate patch - no planes (%i %i %i)-(%i %i %i)\n",
+            pf->bounds[0][0],
+            pf->bounds[0][1],
+            pf->bounds[0][2],
+            pf->bounds[1][0],
+            pf->bounds[1][1],
+            pf->bounds[1][2]);
+	}
+
+	if (numFacets >= 1) {
+		pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
+		Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
+	} else {
+        pf->numFacets = 0;
+        pf->facets = NULL;
+        Com_DPrintf(
+            "WARNING: CM_PatchCollideFromGrid: Degenerate patch - no facets (%i %i %i)-(%i %i %i)\n",
+            pf->bounds[0][0],
+            pf->bounds[0][1],
+            pf->bounds[0][2],
+            pf->bounds[1][0],
+            pf->bounds[1][1],
+            pf->bounds[1][2]);
+	}
 }
 
 
@@ -1436,11 +1463,8 @@ void CM_TraceThroughPatchCollide( traceWork_t *tw, const struct patchCollide_s *
 		//never clip against the back side
 		if (hitnum == facet->numBorders - 1) continue;
 
-		if (enterFrac < leaveFrac && enterFrac >= 0) {
+		if (enterFrac <= leaveFrac && enterFrac >= 0) {
 			if (enterFrac < tw->trace.fraction) {
-				if (enterFrac < 0) {
-					enterFrac = 0;
-				}
 #ifndef BSPC
 				if (!cv) {
 					cv = Cvar_Get( "r_debugSurfaceUpdate", "1", 0 );

From 4a39e5411f8c7aeaf8ceec04ccee30f445c902a9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:46:43 +0100
Subject: [PATCH 0105/2040] Fixed patch collision in position test

---
 code/qcommon/cm_patch.c | 106 ++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 69 deletions(-)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index 34f367e9..89a0c0ad 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -1498,84 +1498,52 @@ CM_PositionTestInPatchCollide
 ====================
 */
 qboolean CM_PositionTestInPatchCollide( traceWork_t *tw, const struct patchCollide_s *pc ) {
+    byte cross[4096];
+    patchPlane_t* planes;
+    facet_t* facet;
 	int i, j;
-	float offset, t;
-	patchPlane_t *planes;
-	facet_t	*facet;
-	float plane[4];
-	vec3_t startp;
+	float offset, d;
 
-	if (tw->isPoint) {
-		return qfalse;
+    // Check if it's within the patch bounds
+    for (i = 0; i < 3; i++) {
+        if (tw->bounds[0][i] > pc->bounds[1][i] || tw->bounds[1][i] < pc->bounds[0][i]) {
+            return qfalse;
+        }
 	}
-	//
+
+    // Check for planes that are crossing
+	for (i = 0; i < pc->numPlanes; i++) {
+		planes = &pc->planes[i];
+
+		offset = fabs(DotProduct(tw->offsets[planes->signbits], planes->plane));
+		d = DotProduct(tw->start, planes->plane) - planes->plane[3];
+
+		if (-offset > d) {
+			cross[i] = 0;
+		} else if (offset < d) {
+			cross[i] = 1;
+		} else {
+			cross[i] = 2;
+		}
+	}
+
+	j = 0;
 	facet = pc->facets;
-	for ( i = 0 ; i < pc->numFacets ; i++, facet++ ) {
-		planes = &pc->planes[ facet->surfacePlane ];
-		VectorCopy(planes->plane, plane);
-		plane[3] = planes->plane[3];
-		if ( sphere.use ) {
-			// adjust the plane distance apropriately for radius
-			plane[3] += sphere.radius;
-
-			// find the closest point on the capsule to the plane
-			t = DotProduct( plane, sphere.offset );
-			if ( t > 0 ) {
-				VectorSubtract( tw->start, sphere.offset, startp );
-			}
-			else {
-				VectorAdd( tw->start, sphere.offset, startp );
-			}
-		}
-		else {
-			offset = DotProduct( tw->offsets[ planes->signbits ], plane);
-			plane[3] -= offset;
-			VectorCopy( tw->start, startp );
-		}
-
-		if ( DotProduct( plane, startp ) - plane[3] > 0.0f ) {
-			continue;
-		}
-
-		for ( j = 0; j < facet->numBorders; j++ ) {
-			planes = &pc->planes[ facet->borderPlanes[j] ];
-			if (facet->borderInward[j]) {
-				VectorNegate(planes->plane, plane);
-				plane[3] = -planes->plane[3];
-			}
-			else {
-				VectorCopy(planes->plane, plane);
-				plane[3] = planes->plane[3];
-			}
-			if ( sphere.use ) {
-				// adjust the plane distance apropriately for radius
-				plane[3] += sphere.radius;
-
-				// find the closest point on the capsule to the plane
-				t = DotProduct( plane, sphere.offset );
-				if ( t > 0.0f ) {
-					VectorSubtract( tw->start, sphere.offset, startp );
-				}
-				else {
-					VectorAdd( tw->start, sphere.offset, startp );
+	for (i = 0; i < pc->numFacets; i++, facet++) {
+		if (cross[facet->surfacePlane] == 2) {
+			for (j = 0; j < facet->numBorders; j++) {
+				if (cross[facet->borderPlanes[j]] != 2 && cross[facet->borderPlanes[j]] != (uint8_t)facet->borderInward[j]) {
+					break;
 				}
 			}
-			else {
-				// NOTE: this works even though the plane might be flipped because the bbox is centered
-				offset = DotProduct( tw->offsets[ planes->signbits ], plane);
-				plane[3] += fabs(offset);
-				VectorCopy( tw->start, startp );
+
+			if (j < facet->numBorders) {
+				continue;
 			}
 
-			if ( DotProduct( plane, startp ) - plane[3] > 0.0f ) {
-				break;
-			}
+			// inside this patch facet
+			return qtrue;
 		}
-		if (j < facet->numBorders) {
-			continue;
-		}
-		// inside this patch facet
-		return qtrue;
 	}
 	return qfalse;
 }

From b848ee0fac8987bfe029319a589bbf559e049ee2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 19:48:55 +0100
Subject: [PATCH 0106/2040] Added rotateStart and rotateCoef for rotate tcMod

---
 code/renderer/tr_local.h      |  4 +++-
 code/renderer/tr_shade.c      |  4 +++-
 code/renderer/tr_shade_calc.c | 13 +++++++++++--
 code/renderer/tr_shader.c     | 26 +++++++++++++++++++++++++-
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 2e554c5f..157261d8 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -428,6 +428,8 @@ typedef struct {
 	// + = clockwise
 	// - = counterclockwise
 	float			rotateSpeed;
+    float			rotateStart;
+    float			rotateCoef;
 
 } texModInfo_t;
 
@@ -2216,7 +2218,7 @@ void	RB_DeformTessGeometry( void );
 void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
 void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
 void	RB_CalcScrollTexCoords( const float scroll[2], float *dstTexCoords );
-void	RB_CalcRotateTexCoords( float rotSpeed, float *dstTexCoords );
+void	RB_CalcRotateTexCoords( float degsPerSecond, float degsPerSecondCoef, float* st, float start );
 void	RB_CalcScaleTexCoords( const float scale[2], float *dstTexCoords );
 void	RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *dstTexCoords );
 void	RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *dstTexCoords );
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index 24ca74b3..fbd47618 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -1381,7 +1381,9 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 
 			case TMOD_ROTATE:
 				RB_CalcRotateTexCoords( pStage->bundle[b].texMods[tm].rotateSpeed,
-										( float * ) tess.svars.texcoords[b] );
+										pStage->bundle[b].texMods[tm].rotateCoef,
+										( float * ) tess.svars.texcoords[b],
+										pStage->bundle[b].texMods[tm].rotateStart );
 				break;
 
 			default:
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index 0f02b6d6..8297eaa6 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -1188,7 +1188,7 @@ void RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *st  )
 /*
 ** RB_CalcRotateTexCoords
 */
-void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
+void RB_CalcRotateTexCoords(float degsPerSecond, float degsPerSecondCoef, float* st, float start)
 {
 	float timeScale = tess.shaderTime;
 	float degs;
@@ -1196,7 +1196,16 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 	float sinValue, cosValue;
 	texModInfo_t tmi;
 
-	degs = -degsPerSecond * timeScale;
+    if (degsPerSecond != 1234567) {
+		degs = -degsPerSecond * degsPerSecondCoef * tess.shaderTime - start;
+	} else if (backEnd.currentEntity) {
+		degs = -backEnd.currentEntity->e.shader_data[0] * degsPerSecondCoef * tess.shaderTime - start;
+	} else {
+		degs = r_static_shaderdata0->value;
+	}
+	if (!backEnd.currentEntity) {
+		degs *= r_static_shadermultiplier0->value;
+	}
 	index = degs * ( FUNCTABLE_SIZE / 360.0f );
 
 	sinValue = tr.sinTable[ index & FUNCTABLE_MASK ];
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 25fa315c..ab0b2e1f 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -616,7 +616,31 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->rotateSpeed = atof( token );
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->rotateSpeed = 1234567;
+		} else {
+			tmi->rotateSpeed = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (!Q_stricmp(token, "fromEntity")) {
+				tmi->rotateStart = 1234567;
+			} else {
+				tmi->rotateStart = atof(token);
+			}
+		} else {
+			tmi->rotateStart = 0;
+        }
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			tmi->rotateCoef = atof(token);
+		} else {
+			tmi->rotateCoef = 1;
+		}
+
 		tmi->type = TMOD_ROTATE;
 	}
 	//

From fbf67fccc3c40b0fcbed78f05d81461046e55163 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 19:55:21 +0100
Subject: [PATCH 0107/2040] Added TMOD enum values from AA 1.11

---
 code/renderer/tr_local.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 157261d8..6c407af8 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -383,14 +383,21 @@ typedef struct {
 #define TR_MAX_TEXMODS 4
 
 typedef enum {
-	TMOD_NONE,
-	TMOD_TRANSFORM,
-	TMOD_TURBULENT,
-	TMOD_SCROLL,
-	TMOD_SCALE,
-	TMOD_STRETCH,
-	TMOD_ROTATE,
-	TMOD_ENTITY_TRANSLATE
+    TMOD_NONE,
+    TMOD_TRANSFORM,
+    TMOD_TURBULENT,
+    TMOD_SCROLL,
+    TMOD_SCALE,
+    TMOD_STRETCH,
+    TMOD_ROTATE,
+    TMOD_ENTITY_TRANSLATE,
+    TMOD_NOISE,
+    TMOD_OFFSET,
+    TMOD_PARALLAX,
+    TMOD_MACRO,
+    TMOD_WAVETRANS,
+    TMOD_WAVETRANT,
+    TMOD_BULGETRANS
 } texMod_t;
 
 #define	MAX_SHADER_DEFORMS	3

From 8bd30ffb2212214e85ed6755f0277f70b2a36e01 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 19:59:14 +0100
Subject: [PATCH 0108/2040] Added rate tmod variable

---
 code/renderer/tr_local.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 6c407af8..34a6b550 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -428,6 +428,9 @@ typedef struct {
 	float			scale[2];			// s *= scale[0]
 	                                    // t *= scale[1]
 
+	// used for TMOD_PARALLAX
+	float			rate[2];
+
 	// used for TMOD_SCROLL
 	float			scroll[2];			// s' = s + scroll[0] * time
 										// t' = t + scroll[1] * time

From 1f2b5dcc863534622741107c03450116dd108daa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:07:29 +0100
Subject: [PATCH 0109/2040] Added and fixed all missing tcMod parameters

---
 code/renderer/tr_shader.c | 212 ++++++++++++++++++++++++++++++--------
 1 file changed, 170 insertions(+), 42 deletions(-)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index ab0b2e1f..c356aebd 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -459,6 +459,8 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 		tmi->wave.frequency = atof( token );
 
 		tmi->type = TMOD_TURBULENT;
+
+		shader.flags |= 2;
 	}
 	//
 	// scale
@@ -493,62 +495,103 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->scroll[0] = atof( token );
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[0] = 1234567;
+		} else {
+			tmi->scroll[0] = atof(token);
+		}
+
 		token = COM_ParseExt( text, qfalse );
 		if ( token[0] == 0 )
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->scroll[1] = atof( token );
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[1] = 1234567;
+		} else {
+			tmi->scroll[1] = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			}
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			}
+		}
+
 		tmi->type = TMOD_SCROLL;
+
+		shader.flags |= 2;
 	}
 	//
 	// stretch
 	//
 	else if ( !Q_stricmp( token, "stretch" ) )
 	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.func = NameToGenFunc( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.base = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.amplitude = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.phase = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.frequency = atof( token );
-		
+		ParseWaveForm(text, &tmi->wave);
 		tmi->type = TMOD_STRETCH;
+		shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "wavetrans" ) )
+    {
+		ParseWaveForm(text, &tmi->wave);
+		tmi->type = TMOD_WAVETRANS;
+		shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "wavetrant" ) )
+    {
+        ParseWaveForm(text, &tmi->wave);
+        tmi->type = TMOD_WAVETRANT;
+        shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "bulge" ) )
+	{
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+			return;
+		}
+
+        tmi->wave.base = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.amplitude = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.frequency = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.phase = atof(token);
+
+		tmi->type = TMOD_BULGETRANS;
+		shader.flags |= 2;
 	}
 	//
 	// transform
@@ -643,6 +686,51 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 
 		tmi->type = TMOD_ROTATE;
 	}
+    else if (!Q_stricmp(token, "offset")) {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[0] = 1234567;
+		} else {
+			tmi->scroll[0] = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[1] = 1234567;
+		} else {
+			tmi->scroll[1] = atof(token);
+        }
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			}
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			}
+		}
+
+		tmi->type = TMOD_OFFSET;
+	}
 	//
 	// entityTranslate
 	//
@@ -650,6 +738,46 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 	{
 		tmi->type = TMOD_ENTITY_TRANSLATE;
 	}
+	else if ( !Q_stricmp( token, "parallax" ) )
+    {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		tmi->rate[0] = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		tmi->rate[1] = atof(token);
+		tmi->type = TMOD_PARALLAX;
+	}
+	else if ( !Q_stricmp( token, "macro" ) )
+    {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
+            return;
+        }
+
+		tmi->scale[0] = 1.0 / atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
+            return;
+        }
+
+		tmi->scale[1] = 1.0 / atof(token);
+
+		tmi->type = TMOD_MACRO;
+		shader.needsNormal = qtrue;
+	}
 	else
 	{
 		ri.Printf(PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name);

From e032a1a6275d7628e8552828e078d0f80060bf48 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:16:20 +0100
Subject: [PATCH 0110/2040] Implemented all tcMod values

---
 code/renderer/tr_local.h      |  10 ++
 code/renderer/tr_shade.c      |  26 ++++-
 code/renderer/tr_shade_calc.c | 184 ++++++++++++++++++++++++++++++++++
 3 files changed, 219 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 34a6b550..9b229b2c 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2227,6 +2227,11 @@ void	RB_DeformTessGeometry( void );
 
 void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
 void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
+void	RB_CalcOffsetTexCoords(const float* offset, float* st);
+void	RB_CalcParallaxTexCoords(const float* rate, float* st);
+void	RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv);
+void	RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2]);
+void	RB_CalcMacroTexCoords(const  float* rate, float* st);
 void	RB_CalcScrollTexCoords( const float scroll[2], float *dstTexCoords );
 void	RB_CalcRotateTexCoords( float degsPerSecond, float degsPerSecondCoef, float* st, float start );
 void	RB_CalcScaleTexCoords( const float scale[2], float *dstTexCoords );
@@ -2254,6 +2259,11 @@ void	RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaM
 void	RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax);
 void	RB_CalcDiffuseColor( unsigned char *colors );
 
+void	RB_CalcStretchTexCoords(const waveForm_t* wf, float* st);
+void	RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st);
+void	RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st);
+void	RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st);
+
 /*
 =============================================================
 
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index fbd47618..52f8e144 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -1386,8 +1386,32 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 										pStage->bundle[b].texMods[tm].rotateStart );
 				break;
 
+			case TMOD_OFFSET:
+				RB_CalcOffsetTexCoords(pStage->bundle[b].texMods[tm].scroll, tess.svars.texcoords[b][0]);
+				break;
+
+            case TMOD_PARALLAX:
+				RB_CalcParallaxTexCoords(pStage->bundle[b].texMods[tm].rate, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_MACRO:
+				RB_CalcMacroTexCoords(pStage->bundle[b].texMods[tm].scale, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_WAVETRANS:
+				RB_CalcTransWaveTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_WAVETRANT:
+				RB_CalcTransWaveTexCoordsT(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_BULGETRANS:
+				RB_CalcBulgeTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
 			default:
-				ri.Error( ERR_DROP, "ERROR: unknown texmod '%d' in shader '%s'\n", pStage->bundle[b].texMods[tm].type, tess.shader->name );
+				ri.Printf(PRINT_WARNING, "WARNING: invalid tcMod '%d' specified for shader '%s'\n", pStage->bundle[b].texMods[tm].type, tess.shader->name );
 				break;
 			}
 		}
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index 8297eaa6..fe9f8308 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -101,6 +101,64 @@ void RB_CalcStretchTexCoords( const waveForm_t *wf, float *st )
 	RB_CalcTransformTexCoords( &tmi, st );
 }
 
+/*
+========================
+RB_CalcTransWaveTexCoords
+
+========================
+*/
+void RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st)
+{
+	float p;
+	int i;
+
+    p = EvalWaveForm(wf);
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+        st[0] += p;
+    }
+}
+
+/*
+========================
+RB_CalcTransWaveTexCoordsT
+
+========================
+*/
+void RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st)
+{
+    float p;
+    int i;
+
+    p = EvalWaveForm(wf);
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+        st[1] += p;
+    }
+}
+
+/*
+========================
+RB_CalcBulgeTexCoords
+
+========================
+*/
+void RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st)
+{
+	int i;
+	int off;
+	float offset;
+	float now;
+	float amplitude;
+	float width;
+
+    amplitude = wf->amplitude;
+    width = wf->base;
+    now = backEnd.refdef.time / 1000.0 * wf->frequency + wf->phase;
+
+	for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		offset = tr.sinTable[(int)((now + st[0] * width) * FUNCTABLE_SIZE) & FUNCTABLE_MASK] * amplitude;
+	}
+}
+
 /*
 ====================================================================
 
@@ -1144,6 +1202,132 @@ void RB_CalcScaleTexCoords( const float scale[2], float *st )
 	}
 }
 
+/*
+** RB_CalcOffsetTexCoords
+*/
+void RB_CalcOffsetTexCoords( const float *offset, float *st )
+{
+	int i;
+	float offsetS, offsetT;
+
+	if (offset[0] != 1234567) {
+		offsetS = offset[0];
+	} else if (backEnd.currentEntity) {
+        offsetS = backEnd.currentEntity->e.shader_data[0];
+    } else {
+        offsetS = r_static_shaderdata0->value;
+    }
+
+	if (offset[0] != 1234567) {
+		offsetT = offset[1];
+	} else if (backEnd.currentEntity) {
+		offsetT = backEnd.currentEntity->e.shader_data[1];
+    } else {
+		offsetT = r_static_shaderdata1->value;
+    }
+
+    if (!backEnd.currentEntity) {
+        offsetS = offsetS * r_static_shadermultiplier0->value;
+        offsetT = offsetT * r_static_shadermultiplier1->value;
+    }
+
+	for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		float s, t;
+
+		s = st[0];
+		t = st[1];
+
+		st[0] = s + offsetS;
+		st[1] = t + offsetT;
+	}
+}
+
+/*
+** RB_CalcParallaxTexCoords
+*/
+void RB_CalcParallaxTexCoords( const float *rate, float *st )
+{
+	int i;
+	float offsetS, offsetT;
+
+    offsetS = tr.refdef.vieworg[0] * rate[0];
+    offsetT = tr.refdef.vieworg[1] * rate[1];
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		st[0] += offsetS;
+		st[1] += offsetT;
+    }
+}
+
+static vec3_t rb_baseaxis[18];
+
+
+void RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv)
+{
+	int bestaxis;
+	vec_t dot;
+	vec_t best;
+	int i;
+
+	if (normal[0] == 1) {
+		bestaxis = 2;
+	} else if (normal[0] == -1) {
+		bestaxis = 3;
+	} else if (normal[1] == 1) {
+		bestaxis = 4;
+	} else if (normal[1] == -1) {
+		bestaxis = 5;
+	} else if (normal[2] == 1) {
+		bestaxis = 0;
+	} else if (normal[2] == -1) {
+		bestaxis = 1;
+	} else {
+		best = 0;
+		bestaxis = 0;
+
+		for (i = 0; i < 6; i++) {
+			dot = DotProduct(rb_baseaxis[i * 3], normal);
+			if (dot > best) {
+				best = dot;
+				bestaxis = i;
+			}
+		}
+	}
+
+	VectorCopy(rb_baseaxis[bestaxis * 3 + 1], xv);
+	VectorCopy(rb_baseaxis[bestaxis * 3 + 2], yv);
+}
+
+void RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2])
+{
+	RB_TextureAxisFromPlane(normal, mappingVecs[0], mappingVecs[1]);
+
+	VectorScale(mappingVecs[0], scale[0], mappingVecs[0]);
+	VectorScale(mappingVecs[1], scale[1], mappingVecs[1]);
+}
+
+/*
+** RB_CalcMacroTexCoords
+*/
+void RB_CalcMacroTexCoords( const  float* rate, float *st )
+{
+	int i;
+	vec3_t vecs[2];
+	vec_t* v;
+	vec_t* normal;
+	float width, height;
+    v = tess.xyz[0];
+
+    normal = tess.normal[0];
+    width = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadWidth;
+    height = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadHeight;
+
+	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
+		RB_QuakeTextureVecs(normal, rate, vecs);
+		st[0] = DotProduct(vecs[0], v) / width;
+		st[1] = DotProduct(vecs[1], v) / height;
+	}
+}
+
 /*
 ** RB_CalcScrollTexCoords
 */

From 84791c42bc02f84f3191131da20b240ee8b3add0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:23:26 +0100
Subject: [PATCH 0111/2040] Implemented RB_CalcSunReflectionTexCoords

---
 code/renderer/tr_local.h      |  1 +
 code/renderer/tr_shade.c      |  2 +-
 code/renderer/tr_shade_calc.c | 45 +++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 9b229b2c..aeaee13d 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2227,6 +2227,7 @@ void	RB_DeformTessGeometry( void );
 
 void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
 void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
+void	RB_CalcSunReflectionTexCoords( float *dstTexCoords );
 void	RB_CalcOffsetTexCoords(const float* offset, float* st);
 void	RB_CalcParallaxTexCoords(const float* rate, float* st);
 void	RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv);
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index 52f8e144..2a4f7c60 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -1327,7 +1327,7 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
             RB_CalcEnvironmentTexCoords2((float*)tess.svars.texcoords[b]);
             break;
 		case TCGEN_SUN_REFLECTION:
-			// FIXME: unimplemented
+			RB_CalcSunReflectionTexCoords(tess.svars.texcoords[b][0]);
 			break;
         default:
             ri.Printf(
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index fe9f8308..d8d73276 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -1168,6 +1168,51 @@ void RB_CalcEnvironmentTexCoords2(float* st)
     }
 }
 
+/*
+** RB_CalcSunReflectionTexCoords
+*/
+void RB_CalcSunReflectionTexCoords(float* st) {
+	int i;
+	vec3_t viewer;
+	vec3_t reflected;
+	vec3_t sunReflected;
+	float d;
+	float* v;
+	float* normal;
+	vec3_t sunAxis[3];
+
+    v = tess.xyz[0];
+    normal = tess.normal[0];
+    sunAxis[0][0] = tr.sunDirection[0];
+    sunAxis[0][1] = tr.sunDirection[1];
+    sunAxis[0][2] = tr.sunDirection[2];
+    sunAxis[1][0] = tr.sunDirection[1];
+    sunAxis[1][1] = -tr.sunDirection[0];
+    sunAxis[1][2] = 0.0;
+    VectorNormalizeFast(sunAxis[1]);
+    CrossProduct(sunAxis, sunAxis[1], sunAxis[2]);
+
+	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
+		VectorSubtract(v, backEnd.ori.viewOrigin, viewer);
+		VectorNormalizeFast(viewer);
+
+		d = DotProduct(viewer, normal);
+		if (d > 0) {
+			VectorCopy(viewer, reflected);
+		} else {
+			d *= -2;
+			VectorMA(viewer, d, normal, reflected);
+		}
+
+		VectorScale(sunAxis[0], reflected[0], sunReflected);
+		VectorMA(sunReflected, reflected[2], sunAxis[1], sunReflected);
+		VectorMA(sunReflected, -reflected[1], sunAxis[2], sunReflected);
+
+		st[0] = sunReflected[1] + 0.5;
+		st[1] = sunReflected[2] + 0.5;
+	}
+}
+
 /*
 ** RB_CalcTurbulentTexCoords
 */

From c5dcf96717db7779bfd6fe5ddcf4c02f89b6b1ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:54:48 +0100
Subject: [PATCH 0112/2040] Implemented all RB_Calc functions

---
 code/renderer/tr_shade_calc.c | 192 ++++++++++++++++++++++++++++++++--
 1 file changed, 182 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index d8d73276..041729b5 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -155,7 +155,8 @@ void RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st)
     now = backEnd.refdef.time / 1000.0 * wf->frequency + wf->phase;
 
 	for (i = 0; i < tess.numVertexes; i++, st += 2) {
-		offset = tr.sinTable[(int)((now + st[0] * width) * FUNCTABLE_SIZE) & FUNCTABLE_MASK] * amplitude;
+		off = (now + st[0] * width) * FUNCTABLE_SIZE;
+		offset = tr.sinTable[off & FUNCTABLE_MASK] * amplitude;
 	}
 }
 
@@ -936,16 +937,66 @@ void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantC
 	}
 }
 
+/*
+** RB_CalcRGBFromDot
+*/
 void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
 {
-	// FIXME: unimplemented
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		union {
+			float f;
+			int i;
+		} u;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(tess.normal[i], viewInModel);
+        u.f *= u.f;
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+		u.i &= ~(u.i >> 31);
+		colors[0] = colors[1] = colors[2] = u.i;
+	}
 }
 
+/*
+** RB_CalcRGBFromOneMinusDot
+*/
 void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
 {
-	// FIXME: unimplemented
+	int i;
+	vec3_t viewInModel;
+	float dot;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		union {
+			float f;
+			int i;
+		} u;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        dot = DotProduct(tess.normal[i], viewInModel);
+		dot *= dot;
+
+        u.f = 1.0 - dot;
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+		u.i &= ~(u.i >> 31);
+		colors[0] = colors[1] = colors[2] = u.i;
+	}
 }
 
+/*
+** RB_CalcAlphaFromConstant
+*/
 void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
 {
 	int i;
@@ -955,11 +1006,36 @@ void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
 	}
 }
 
+/*
+** RB_CalcAlphaFromDot
+*/
 void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
 {
-	// FIXME: unimplemented
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		union {
+			float f;
+			int i;
+		} u;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(tess.normal[i], viewInModel);
+        u.f *= u.f;
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+		u.i &= ~(u.i >> 31);
+		colors[0] = colors[1] = colors[2] = u.i;
+	}
 }
 
+/*
+** RB_CalcAlphaFromHeightFade
+*/
 void RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax)
 {
 	int i;
@@ -975,19 +1051,72 @@ void RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alp
 	}
 }
 
+/*
+** RB_CalcAlphaFromOneMinusDot
+*/
 void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
 {
-	// FIXME: unimplemented
+	int i;
+	vec3_t viewInModel;
+	float dot;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		union {
+			float f;
+			int i;
+		} u;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        dot = DotProduct(tess.normal[i], viewInModel);
+		dot *= dot;
+
+        u.f = 1.0 - dot;
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+		u.i &= ~(u.i >> 31);
+		colors[0] = colors[1] = colors[2] = u.i;
+	}
 }
 
+/*
+** RB_CalcAlphaFromTexCoords
+*/
 void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
 {
-	// FIXME: unimplemented
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
+		float f;
+
+        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+        f = f - (float)(~((int)(f - (float)(byte)alphaCap) >> 31) & (int)(f - (float)(byte)alphaCap));
+        f = (float)((~((int)(f - (float)(byte)alphaMinCap) >> 31) & (int)(f - (float)(byte)alphaMinCap)) + (byte)alphaMinCap);
+	
+		colors[3] = f;
+	}
 }
 
+/*
+** RB_CalcRGBFromTexCoords
+*/
 void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
 {
-	// FIXME: unimplemented
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
+		float f;
+
+        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+        f = f - (float)(~((int)(f - (float)(byte)alphaCap) >> 31) & (int)(f - (float)(byte)alphaCap));
+        f = (float)((~((int)(f - (float)(byte)alphaMinCap) >> 31) & (int)(f - (float)(byte)alphaMinCap)) + (byte)alphaMinCap);
+
+		colors[0] = colors[1] = colors[2] = f;
+	}
 }
 
 /*
@@ -1190,7 +1319,7 @@ void RB_CalcSunReflectionTexCoords(float* st) {
     sunAxis[1][1] = -tr.sunDirection[0];
     sunAxis[1][2] = 0.0;
     VectorNormalizeFast(sunAxis[1]);
-    CrossProduct(sunAxis, sunAxis[1], sunAxis[2]);
+    CrossProduct(sunAxis[0], sunAxis[1], sunAxis[2]);
 
 	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
 		VectorSubtract(v, backEnd.ori.viewOrigin, viewer);
@@ -1562,12 +1691,55 @@ void RB_CalcLightGridColor(unsigned char* colors)
 
 void RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax)
 {
-	// FIXME/ unimplemented
+	int i;
+	vec3_t viewInModel;
+
+    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+        union {
+            float f;
+            int i;
+        } u;
+
+		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(viewInModel, tess.normal[i]);
+        u.f = fabs(u.f);
+        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+
+		u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+        u.i &= ~(u.i >> 31);
+		colors[3] = u.i;
+	}
 }
 
 void RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax)
 {
-	// FIXME/ unimplemented
+	int i;
+	vec3_t viewInModel;
+
+    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+        union {
+            float f;
+            int i;
+        } u;
+
+		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(viewInModel, tess.normal[i]);
+        u.f = fabs(u.f);
+		u.f = 1.0 - u.f;
+        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+        
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+        u.i &= ~(u.i >> 31);
+		colors[3] = u.i;
+	}
 }
 
 /*

From 434a48af7da4a95e8114a95b1d2917f761ce5443 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:57:37 +0100
Subject: [PATCH 0113/2040] Initialize m_iNumShotsFired

---
 code/fgame/weapon.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 935e303d..98a37e51 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1133,6 +1133,7 @@ Weapon::Weapon()
     INITIALIZE_WEAPONMODE_VAR(meansofdeath, MOD_NONE);
 
     // Set the stats
+    m_iNumShotsFired    = 0;
     m_iNumHits          = 0;
     m_iNumGroinShots    = 0;
     m_iNumHeadShots     = 0;

From ac63e6c62770de575210f80ee7b0020423f0de59 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:31:48 +0100
Subject: [PATCH 0114/2040] Rotate the client when blocked, and make sure the
 checked's velocity doesn't reach the push move speed

---
 code/fgame/g_phys.cpp | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index af01704d..fbb7c86a 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -729,6 +729,7 @@ qboolean G_Push
 	pushed_t	*pusher_p;
 	float       radius;
 	int         i, num;
+	int			j;
 	int         touch[ MAX_GENTITIES ];
 	Event		*ev;
 
@@ -860,12 +861,12 @@ qboolean G_Push
 		move2 = move;
 
 		// FIXME: doesn't rotate monsters?
-		/*if( check->client && amove[ YAW ] )
+		if( check->client && amove[ YAW ] )
 		{
 			Sentient *sent = ( Sentient * )check;
 			Vector a = sent->GetViewAngles() + Vector( 0, amove[ YAW ], 0 );
 			sent->SetViewAngles( a );
-		}*/
+		}
 
 		// get the radius of the entity
 		if( check->size.x > check->size.z )
@@ -917,7 +918,7 @@ qboolean G_Push
 
 			end = check->origin + fwd * ( length + 64.0f );
 
-			if( check->IsSubclassOfPlayer() )
+			if( check->IsSubclassOfSentient() )
 			{
 				trace = G_Trace( check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, true, "G_Push" );
 			}
@@ -928,7 +929,7 @@ qboolean G_Push
 
 			if( !trace.allsolid )
 			{
-				if( check->IsSubclassOfPlayer() )
+				if( check->IsSubclassOfSentient() )
 				{
 					trace = G_Trace( Vector( trace.endpos ), check->mins, check->maxs, neworg, check, check->edict->clipmask, true, "G_Push" );
 				}
@@ -949,6 +950,26 @@ qboolean G_Push
 			if( check->groundentity != pusher->edict )
 				check->groundentity = NULL;
 		}
+		else
+		{
+			move2 *= 1.f / level.frametime;
+
+			for (j = 0; j < 3; j++) {
+				if (!move2[j]) {
+					continue;
+				}
+
+				if (move2[j] < 0) {
+                    if (check->velocity[j] > move2[j]) {
+                        check->velocity[j] = move2[j];
+                    }
+				} else {
+					if (check->velocity[j] < move2[j]) {
+						check->velocity[j] = move2[j];
+					}
+				}
+			}
+		}
 
 		block = G_TestEntityPosition( check, check->origin );
 		if( block )

From 8fe054b063a60f56115a9793a0430f4f7ec3a827 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:32:33 +0100
Subject: [PATCH 0115/2040] Fixed door open direction

---
 code/fgame/doors.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 86296580..144c7d29 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -1311,8 +1311,6 @@ void RotatingDoor::DoOpen(Event *ev)
         } else {
             diropened = 0 - init_door_direction;
         }
-    } else {
-        diropened = -init_door_direction;
     }
 
     if (diropened < 0.0f) {
@@ -1321,7 +1319,16 @@ void RotatingDoor::DoOpen(Event *ev)
         ang = startangle - Vector(0.0f, angle, 0.0f);
     }
 
+    if (localangles.yaw() + 360 <= ang.yaw()) {
+        localangles.setYaw(localangles.yaw() + 360);
+    } else if (localangles.yaw() - 360 >= ang.yaw()) {
+        localangles.setYaw(localangles.yaw() - 360);
+    }
+
     MoveTo(origin, ang, fabs(speed * angle), EV_Door_OpenEnd);
+
+    setContents(CONTENTS_SOLID);
+    setSolidType(SOLID_BSP);
 }
 
 void RotatingDoor::DoClose(Event *ev)

From f0aad4bb2102f7b795ab976ea8c4cdf1b7943cc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Feb 2024 22:51:50 +0100
Subject: [PATCH 0116/2040] Don't mark the driver slot as unused by default

---
 code/fgame/vehicle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 21f38dee..f9795501 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -1213,7 +1213,7 @@ void Vehicle::ResetSlots(void)
     driver.ent                 = NULL;
     driver.boneindex           = -1;
     driver.enter_boneindex     = -1;
-    driver.flags               = SLOT_UNUSED;
+    driver.flags               = 0;
     lastdriver.ent             = NULL;
     lastdriver.boneindex       = -1;
     lastdriver.enter_boneindex = -1;

From 078aa01895ac16ed0d661f1642bfb110196a6c45 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Feb 2024 23:33:02 +0100
Subject: [PATCH 0117/2040] Reimplemented RefreshMaterial()

---
 code/uilib/uiwidget.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 1f7afce2..39151320 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -651,10 +651,9 @@ void UIReggedMaterial::RefreshMaterial
 	)
 
 {
-	if( !isGot )
+	if( isGot )
 	{
-		isGot = true;
-		this->hMat = uii.Rend_RefreshMaterial( name.c_str() );
+		this->hMat = uii.Rend_RegisterMaterial( name.c_str() );
 	}
 }
 

From 1b8ad12b250f1424f2ea41f77016416971a32bea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Feb 2024 23:33:12 +0100
Subject: [PATCH 0118/2040] Call RefreshMaterial() instead of
 ReregisterMaterial()

---
 code/uilib/uiwinman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index c988d08f..d5d7377b 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -667,7 +667,7 @@ void UIWindowManager::RefreshShadersFromList(void)
     num = m_materiallist.NumObjects();
     for (i = 1; i <= num; i++) {
         UIReggedMaterial *regged = m_materiallist.ObjectAt(i);
-        regged->ReregisterMaterial();
+        regged->RefreshMaterial();
     }
 }
 

From f018c2c15af2a89905ce9f11c6d6ce78f9fd77e4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Feb 2024 23:36:04 +0100
Subject: [PATCH 0119/2040] Ignore shaders for surface starting with the name
 "material"

---
 code/tiki/tiki_files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 3d87867d..dbfd5e76 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -470,7 +470,7 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
             Q_strncpyz(tikiSurf->name, surf->name, sizeof(tikiSurf->name));
 
-            if (strlen(surf->name) != 9 || !Q_strncmp(surf->name, "material", 8)) {
+            if (strlen(surf->name) != 9 || Q_strncmp(surf->name, "material", 8)) {
                 Q_strncpyz(tikiSurf->shader[0], surf->name, sizeof(tikiSurf->shader[0]));
             }
 

From 5aa70d91f333f84b4b33fa54f5f4e1cf0613fae1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Feb 2024 23:44:59 +0100
Subject: [PATCH 0120/2040] Fixed patch subdivisions

---
 code/renderer/tr_bsp.c   | 10 ++++++++--
 code/renderer/tr_curve.c |  4 ++--
 code/renderer/tr_local.h |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 79cec179..15541cdd 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -763,8 +763,14 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
 		R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
 	}
 
-	// pre-tesseleate
-	grid = R_SubdividePatchToGrid( width, height, points );
+    // pre-tesseleate
+	if (ds->subdivisions) {
+		grid = R_SubdividePatchToGrid(width, height, ds->subdivisions * (r_subdivisions->value / 10.0), points);
+    } else if (surf->shader->subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, surf->shader->subdivisions * (r_subdivisions->value / 10.0), points);
+    } else {
+        grid = R_SubdividePatchToGrid(width, height, r_subdivisions->value, points);
+    }
 	surf->data = (surfaceType_t *)grid;
 
 	if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
diff --git a/code/renderer/tr_curve.c b/code/renderer/tr_curve.c
index 14db39ad..446650f5 100644
--- a/code/renderer/tr_curve.c
+++ b/code/renderer/tr_curve.c
@@ -357,7 +357,7 @@ void R_FreeSurfaceGridMesh( srfGridMesh_t *grid ) {
 R_SubdividePatchToGrid
 =================
 */
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
+srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
 								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
 	int			i, j, k, l;
 	drawVert_t	prev, next, mid;
@@ -431,7 +431,7 @@ srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
 				continue;	// can't subdivide any more
 			}
 
-			if ( maxLen <= r_subdivisions->value ) {
+			if ( maxLen <= subdivide ) {
 				errorTable[dir][j+1] = 1.0f/maxLen;
 				continue;	// didn't need subdivision
 			}
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index aeaee13d..d99f8b6d 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2006,7 +2006,7 @@ CURVE TESSELATION
 
 #define PATCH_STITCHING
 
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
+srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
 								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] );
 srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror );
 srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror );

From 1d765125c735549c76c98d1c8f07147b85a24822 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:35:11 +0100
Subject: [PATCH 0121/2040] Fixed facets and planes being badly initialized

---
 code/qcommon/cm_patch.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index 89a0c0ad..b2fa6a99 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -1132,8 +1132,8 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
 	pf->numPlanes = numPlanes;
     pf->numFacets = numFacets;
 	if (numPlanes >= 1) {
-		pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
-		Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
+		pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
+		Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
 	} else {
         pf->numPlanes = 0;
         pf->planes = NULL;
@@ -1148,8 +1148,8 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
 	}
 
 	if (numFacets >= 1) {
-		pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
-		Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
+		pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
+		Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
 	} else {
         pf->numFacets = 0;
         pf->facets = NULL;

From 1fa2031f111ab20998c514a6db232c03ea5d4ecb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:41:33 +0100
Subject: [PATCH 0122/2040] When a player is inside a vehicle, use the
 vehicle's health for the health stat

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0ed199f1..d80e454a 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7216,7 +7216,7 @@ void Player::UpdateStats(void)
     healthfrac = (health / max_health * 100.0f);
 
     if (m_pVehicle && !m_pTurret) {
-        if (m_pVehicle->isSubclassOf(FixedTurret)) {
+        if (!m_pVehicle->isSubclassOf(FixedTurret)) {
             healthfrac = (m_pVehicle->health / m_pVehicle->max_health * 100.f);
         }
     }

From d3870309fbe4a191ade427650e5dfc9ac69ba2c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 22:56:44 +0100
Subject: [PATCH 0123/2040] Fixed MASK_MONSTERSOLID

---
 code/fgame/bg_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 890fa1d2..5822dd99 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -621,7 +621,7 @@ movement on the server game.
 #define MASK_PLAYERSTART  (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
 #define MASK_VIEWSOLID    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_TRIGGER)
 #define MASK_DEADSOLID    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_CORPSE | CONTENTS_NOTTEAM2 | CONTENTS_FENCE)
-#define MASK_MONSTERSOLID (CONTENTS_SOLID | CONTENTS_MONSTERCLIP | CONTENTS_BODY)
+#define MASK_MONSTERSOLID (CONTENTS_SOLID | CONTENTS_MONSTERCLIP | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
 #define MASK_WATER        (CONTENTS_WATER | CONTENTS_LAVA | CONTENTS_SLIME)
 #define MASK_OPAQUE       (CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA)
 #define MASK_SHOT                                                                                                   \

From e1f2a51f2bd246644ab6d8a92536416463779c8a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:07:32 +0100
Subject: [PATCH 0124/2040] Only move angles if there is an angular velocity

---
 code/fgame/g_phys.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index fbb7c86a..8be9e7a9 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -1258,8 +1258,10 @@ void G_Physics_Toss
 		G_AddGravity( ent );
 	}
 
-	// move angles
-	ent->setAngles( ent->angles + ent->avelocity * level.frametime );
+	if (ent->avelocity.lengthSquared()) {
+		// move angles
+		ent->setAngles(ent->angles + ent->avelocity * level.frametime);
+	}
 
 	// move origin
 	move = ( ent->velocity + basevel ) * level.frametime;

From ed3f212bd8a7f2256813223ddcf45fa66c9df47b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:10:21 +0100
Subject: [PATCH 0125/2040] Also check for slide with bounce movetype

---
 code/fgame/g_phys.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 8be9e7a9..27abbac2 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -1291,13 +1291,13 @@ void G_Physics_Toss
 		trace = G_PushEntity( ent, move );
 	}
 
-	if( ( trace.fraction == 0 ) && ( ent->movetype == MOVETYPE_SLIDE ) )
+	if( ( trace.fraction == 0 ) && ( ent->movetype == MOVETYPE_SLIDE || ent->movetype == MOVETYPE_BOUNCE ) )
 	{
 		// Check for slide by removing the downward velocity
 		Vector slide;
 
-		slide[ 0 ] = move[ 0 ] * 0.7f;
-		slide[ 1 ] = move[ 1 ] * 0.7f;
+		slide[ 0 ] = move[ 0 ] * level.frametime * 15;
+		slide[ 1 ] = move[ 1 ] * level.frametime * 15;
 		slide[ 2 ] = 0;
 		G_PushEntity( ent, slide );
 	}

From 6840df4eca9d9cef1a6a348e78111113eeb187a8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:11:11 +0100
Subject: [PATCH 0126/2040] backoff value should be 1.4 for bounce and 1.6 for
 Gib

---
 code/fgame/g_phys.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 27abbac2..4ceac5e7 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -1309,9 +1309,13 @@ void G_Physics_Toss
 
 	if( trace.fraction < 1 )
 	{
-		if( ent->movetype == MOVETYPE_BOUNCE || ent->movetype == MOVETYPE_GIB )
+		if( ent->movetype == MOVETYPE_BOUNCE )
 		{
-			backoff = 1.5;
+			backoff = 1.4;
+		}
+		else if ( ent->movetype == MOVETYPE_GIB )
+		{
+			backoff = 1.6;
 		}
 		else
 		{

From 109686aca20bbfb6d95e41146954c5a4d51afe03 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:14:08 +0100
Subject: [PATCH 0127/2040] Reduce the velocity when bouncing

---
 code/fgame/g_phys.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 4ceac5e7..f9a6495d 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -1326,6 +1326,12 @@ void G_Physics_Toss
 
 		G_ClipVelocity( ent->velocity, normal, ent->velocity, backoff );
 
+		if (ent->movetype == MOVETYPE_BOUNCE) {
+			// Reduce the velocity when bouncing
+			ent->velocity[0] -= level.frametime * 1.75f;
+			ent->velocity[1] -= level.frametime * 1.75f;
+		}
+
 		// stop if on ground
 		if( trace.plane.normal[ 2 ] > 0.7 )
 		{

From b893f4f89f142a0922eac7e445d997fdf5ba19bd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:20:52 +0100
Subject: [PATCH 0128/2040] Properly stop if on ground

---
 code/fgame/g_phys.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index f9a6495d..7eee0844 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -1311,11 +1311,11 @@ void G_Physics_Toss
 	{
 		if( ent->movetype == MOVETYPE_BOUNCE )
 		{
-			backoff = 1.4;
+			backoff = 1.4f;
 		}
 		else if ( ent->movetype == MOVETYPE_GIB )
 		{
-			backoff = 1.6;
+			backoff = 1.6f;
 		}
 		else
 		{
@@ -1335,20 +1335,22 @@ void G_Physics_Toss
 		// stop if on ground
 		if( trace.plane.normal[ 2 ] > 0.7 )
 		{
-			if( ( ent->velocity[ 2 ] < 60 || ( ent->movetype != MOVETYPE_BOUNCE && ent->movetype != MOVETYPE_GIB ) ) &&
+			ent->groundentity = trace.ent;
+			ent->groundplane = trace.plane;
+			ent->groundcontents = trace.contents;
+
+			if( ( ( ent->movetype == MOVETYPE_GIB && ent->velocity[ 2 ] < 60 ) || ( ent->movetype == MOVETYPE_BOUNCE && ent->velocity.length() < 40 ) ) &&
 				( ent->movetype != MOVETYPE_SLIDE ) )
 			{
-				ent->groundentity = trace.ent;
-				ent->groundplane = trace.plane;
-				ent->groundcontents = trace.contents;
 				ent->velocity = vec_zero;
 				ent->avelocity = vec_zero;
 				ent->ProcessEvent( EV_Stop );
 			}
-			else if( ent->movetype == MOVETYPE_GIB )
+			else if( ent->movetype == MOVETYPE_TOSS || ent->movetype == MOVETYPE_GIB )
 			{
 				// Stop spinning after we bounce on the ground
 				ent->avelocity = vec_zero;
+				ent->ProcessEvent( EV_Stop );
 			}
 		}
 	}

From ca7cacfdcc8cc140b0f4e95298329e1c041435cf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:23:24 +0100
Subject: [PATCH 0129/2040] Add a debug line when bouncing if enabled (for AI)

---
 code/fgame/g_phys.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 7eee0844..a8dcaaab 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "sentient.h"
 #include "actor.h"
 #include "player.h"
+#include "debuglines.h"
 
 /*
 
@@ -1399,6 +1400,10 @@ void G_Physics_Toss
 	{
 		G_TouchTriggers( ent );
 	}
+
+	if (ai_debug_grenades->integer && ent->movetype == MOVETYPE_BOUNCE) {
+		G_DebugLine(origin2, ent->origin, 1, 1, 0, 1);
+	}
 }
 
 /*

From bf700186d0face573ce32d103621c88e97700371 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:31:26 +0100
Subject: [PATCH 0130/2040] Fixed bounce velocity reduction

---
 code/fgame/g_phys.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index a8dcaaab..33133913 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -1329,8 +1329,8 @@ void G_Physics_Toss
 
 		if (ent->movetype == MOVETYPE_BOUNCE) {
 			// Reduce the velocity when bouncing
-			ent->velocity[0] -= level.frametime * 1.75f;
-			ent->velocity[1] -= level.frametime * 1.75f;
+			ent->velocity[0] -= ent->velocity[0] * level.frametime * 1.75f;
+			ent->velocity[1] -= ent->velocity[1] * level.frametime * 1.75f;
 		}
 
 		// stop if on ground

From 3853d1ef39959e27d6a87e7b1716d2534a5a238e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:38:14 +0100
Subject: [PATCH 0131/2040] Properly map the CGM message depending on the
 protocol version

---
 code/fgame/weaputils.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 166e74d9..b8ed2239 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2272,7 +2272,7 @@ float BulletAttack(
                     if (ent->edict->solid == SOLID_BBOX && !(trace.contents & CONTENTS_CLAYPIDGEON)) {
                         if (trace.surfaceFlags & MASK_SURF_TYPE) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_6);
+                            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_6));
                             gi.MSG_WriteCoord(vTmpEnd[0]);
                             gi.MSG_WriteCoord(vTmpEnd[1]);
                             gi.MSG_WriteCoord(vTmpEnd[2]);
@@ -2281,7 +2281,7 @@ float BulletAttack(
                             gi.MSG_EndCGM();
                         } else if (trace.location >= 0 && ent->IsSubclassOfPlayer()) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_8);
+                            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_8));
                             gi.MSG_WriteCoord(vTmpEnd[0]);
                             gi.MSG_WriteCoord(vTmpEnd[1]);
                             gi.MSG_WriteCoord(vTmpEnd[2]);
@@ -2290,7 +2290,7 @@ float BulletAttack(
                             gi.MSG_EndCGM();
                         } else if (ent->edict->r.contents & CONTENTS_SOLID) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_7);
+                            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_7));
                             gi.MSG_WriteCoord(vTmpEnd[0]);
                             gi.MSG_WriteCoord(vTmpEnd[1]);
                             gi.MSG_WriteCoord(vTmpEnd[2]);
@@ -2300,7 +2300,7 @@ float BulletAttack(
                         }
                     } else if (ent->edict->solid == SOLID_BSP && !(trace.contents & CONTENTS_CLAYPIDGEON)) {
                         gi.SetBroadcastVisible(vTmpEnd, NULL);
-                        gi.MSG_StartCGM(CGM_BULLET_6);
+                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_6));
                         gi.MSG_WriteCoord(vTmpEnd[0]);
                         gi.MSG_WriteCoord(vTmpEnd[1]);
                         gi.MSG_WriteCoord(vTmpEnd[2]);
@@ -2432,13 +2432,13 @@ float BulletAttack(
 
     if (count == 1) {
         if (iTracerCount) {
-            gi.MSG_StartCGM(CGM_BULLET_1);
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_1));
 
             gi.MSG_WriteCoord(vBarrel[0]);
             gi.MSG_WriteCoord(vBarrel[1]);
             gi.MSG_WriteCoord(vBarrel[2]);
         } else {
-            gi.MSG_StartCGM(CGM_BULLET_2);
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_2));
         }
 
         gi.MSG_WriteCoord(start[0]);
@@ -2463,7 +2463,7 @@ float BulletAttack(
         }
     } else {
         if (iTracerCount) {
-            gi.MSG_StartCGM(CGM_BULLET_3);
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_3));
 
             gi.MSG_WriteCoord(vBarrel[0]);
             gi.MSG_WriteCoord(vBarrel[1]);
@@ -2475,7 +2475,7 @@ float BulletAttack(
 
             gi.MSG_WriteBits(Q_min(iTracerCount, 63), 6);
         } else {
-            gi.MSG_StartCGM(CGM_BULLET_4);
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_4));
         }
 
         gi.MSG_WriteCoord(start[0]);

From 3e190ca4b37ea726331bd283059d270bb69f0b0e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:02:28 +0100
Subject: [PATCH 0132/2040] Added MASK_SHOT_FLUID (there are so many masks)

---
 code/fgame/bg_public.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 5822dd99..091508b7 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -630,6 +630,9 @@ movement on the server game.
 #define MASK_SHOT_TRIG                                                                                               \
     (CONTENTS_SOLID | CONTENTS_CLAYPIDGEON | CONTENTS_WATER | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_SHOT_FLUID                                                                                             \
+    (CONTENTS_SOLID | CONTENTS_WATER | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE \
+     | CONTENTS_WEAPONCLIP | CONTENTS_SHOOTONLY | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_PROJECTILE                                                                                           \
     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)

From b95b8c4c205e894197741668b421310a7ad30d9e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:17:30 +0100
Subject: [PATCH 0133/2040] Fixed water bullet effect

---
 code/cgame/cg_parsemsg.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 12fc0e4d..7b86d14e 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -160,49 +160,49 @@ static void CG_MakeBulletHoleType(
         float fVolume;
 
         switch (iEffectNum) {
-        case 0:
+        case SFX_BHIT_PAPER_LITE:
             sBulletHole += "paper";
             break;
-        case 2:
+        case SFX_BHIT_WOOD_LITE:
             sBulletHole += "wood";
             break;
-        case 4:
+        case SFX_BHIT_METAL_LITE:
             sBulletHole += "metal";
             break;
-        case 6:
+        case SFX_BHIT_STONE_LITE:
             sBulletHole += "stone";
             break;
-        case 8:
+        case SFX_BHIT_DIRT_LITE:
             sBulletHole += "dirt";
             break;
-        case 10:
+        case SFX_BHIT_GRILL_LITE:
             sBulletHole += "grill";
             break;
-        case 12:
+        case SFX_BHIT_GRASS_LITE:
             sBulletHole += "grass";
             break;
-        case 14:
+        case SFX_BHIT_MUD_LITE:
             sBulletHole += "mud";
             break;
-        case 16:
+        case SFX_BHIT_PUDDLE_LITE:
             sBulletHole += "puddle";
             break;
-        case 18:
+        case SFX_BHIT_GLASS_LITE:
             sBulletHole += "glass";
             break;
-        case 20:
+        case SFX_BHIT_GRAVEL_LITE:
             sBulletHole += "gravel";
             break;
-        case 22:
+        case SFX_BHIT_SAND_LITE:
             sBulletHole += "sand";
             break;
-        case 24:
+        case SFX_BHIT_FOLIAGE_LITE:
             sBulletHole += "foliage";
             break;
-        case 26:
+        case SFX_BHIT_SNOW_LITE:
             sBulletHole += "snow";
             break;
-        case 28:
+        case SFX_BHIT_CARPET_LITE:
             sBulletHole += "carpet";
             break;
         default:
@@ -366,7 +366,7 @@ static void CG_MakeBubbleTrail(const vec3_t i_vStart, const vec3_t i_vEnd, int i
     fDist -= fMove;
     while (fDist > 0.f) {
         VectorMA(vPos, fMove, vDir, vPos);
-        sfxManager.MakeEffect_Angles(32, vPos, vec_zero);
+        sfxManager.MakeEffect_Angles(SFX_WATER_TRAIL_BUBBLE, vPos, vec_zero);
 
         fMove = 16.f + crandom() * 8.f * alpha;
         fDist -= fMove;
@@ -535,7 +535,7 @@ static void CG_MakeBulletTracerInternal(
 
                 while (trace.fraction < 1) {
                     if (bIgnoreEntities) {
-                        cgi.CM_BoxTrace(&trace, vTraceStart, vTraceEnd, vec_zero, vec_zero, 0, MASK_SHOT, qfalse);
+                        cgi.CM_BoxTrace(&trace, vTraceStart, vTraceEnd, vec_zero, vec_zero, 0, MASK_SHOT_FLUID, qfalse);
 
                         if (trace.fraction == 1.0f) {
                             trace.entityNum = ENTITYNUM_NONE;
@@ -564,11 +564,11 @@ static void CG_MakeBulletTracerInternal(
                     if (trace.contents & CONTENTS_FLUID) {
                         fDist = DotProduct(vDir, trace.plane.normal) * -2.0f;
                         VectorMA(vDir, fDist, trace.plane.normal, vTmp);
-                        VectorAdd(vTmp, vTmp, trace.plane.normal);
+                        VectorMA(trace.plane.normal, 2.0, vTmp, trace.plane.normal);
                         VectorNormalizeFast(trace.plane.normal);
                     }
 
-                    if (!bInWater && trace.fraction < 1.0f && iNumImpacts <= 127) {
+                    if (!bInWater && trace.fraction < 1.0f && iNumImpacts < ARRAY_LEN(tImpacts)) {
                         memcpy(&tImpacts[iNumImpacts], &trace, sizeof(trace_t));
                         iNumImpacts++;
                     }

From 5cc599984d50b0bdcec136214bddedadaebfe1ec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 00:18:18 +0100
Subject: [PATCH 0134/2040] Fixed bullet hit effect for glass

---
 code/cgame/cg_parsemsg.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 7b86d14e..966b041d 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -283,7 +283,7 @@ CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t
         break;
     case SURF_GLASS:
         sBulletHole += "glass";
-        iEffect = SFX_BHIT_GRASS_LITE;
+        iEffect = SFX_BHIT_GLASS_LITE;
         break;
     case SURF_GRAVEL:
         fRadius = 0.f;
@@ -554,7 +554,7 @@ static void CG_MakeBulletTracerInternal(
                             vec_zero,
                             vTraceStart,
                             ENTITYNUM_NONE,
-                            MASK_SHOT,
+                            MASK_SHOT_FLUID,
                             qfalse,
                             qfalse,
                             "CG_MakeBulletTracerInternal"

From dd8b3f607a6a8d7d40dad66b4984b4d58cce7b29 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 13:36:56 +0100
Subject: [PATCH 0135/2040] Fixed terrain tri sphere collision not returning
 correct results with small objects

---
 code/qcommon/cm_terrain.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 2babe2aa..9aa58ff9 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -612,9 +612,9 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
             bFitsDiag = qtrue;
         }
         iX[0] = 1;
-        iX[1] = 1;
+        iX[1] = 0;
         iX[2] = 1;
-        iY[0] = 0;
+        iY[0] = 1;
         iY[1] = 1;
         iY[2] = 0;
         break;
@@ -637,9 +637,9 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
         }
         iX[0] = 0;
         iX[1] = 1;
-        iX[2] = 1;
+        iX[2] = 0;
         iY[0] = 1;
-        iY[1] = 0;
+        iY[1] = 1;
         iY[2] = 0;
         break;
     case 5:
@@ -661,9 +661,9 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
         }
         iX[0] = 1;
         iX[1] = 0;
-        iX[2] = 0;
+        iX[2] = 1;
         iY[0] = 0;
-        iY[1] = 1;
+        iY[1] = 0;
         iY[2] = 1;
         break;
     case 6:
@@ -684,9 +684,9 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
             bFitsDiag = qtrue;
         }
         iX[0] = 0;
-        iX[1] = 0;
+        iX[1] = 1;
         iX[2] = 0;
-        iY[0] = 1;
+        iY[0] = 0;
         iY[1] = 0;
         iY[2] = 1;
         break;
@@ -699,22 +699,22 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
             if (bFitsDiag) {
                 return fSpherePlane;
             } else {
-                return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iY[0], iX[1], iY[1], iY[2]);
+                return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[1], iY[1], iX[2], iY[2]);
             }
         } else if (bFitsDiag) {
-            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iX[2], iY[0], iX[1]);
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[1], iY[1]);
         } else {
-            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iY[0], iX[1]);
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[1], iY[1]);
         }
     } else if (bFitsY) {
         if (bFitsDiag) {
-            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iX[2], iY[1], iY[2]);
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[2], iY[2]);
         } else {
-            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iY[1], iY[2]);
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[2], iY[2]);
         }
     } else {
         if (bFitsDiag) {
-            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[0], iX[2]);
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[0], iY[0]);
         } else {
             return g_trace.tw->trace.fraction;
         }

From c40d073d7a678eb1af899a56c631c98373057c8c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 13:39:13 +0100
Subject: [PATCH 0136/2040] Refactored CM_CheckTerrainTriSphere

---
 code/qcommon/cm_terrain.c | 112 ++++++++++++--------------------------
 1 file changed, 35 insertions(+), 77 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 9aa58ff9..042b0ac9 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -595,22 +595,10 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
 
     switch (eMode) {
     case 3:
-        if (d1 > 64) {
-            bFitsX = qfalse;
-        } else {
-            bFitsX = qtrue;
-        }
-        if (d2 > 64) {
-            bFitsY = qfalse;
-        } else {
-            bFitsY = qtrue;
-        }
+        bFitsX = d1 <= 64;
+        bFitsY = d2 <= 64;
+        bFitsDiag = d1 >= 64 - d2;
 
-        if (d1 < 64 - d2) {
-            bFitsDiag = qfalse;
-        } else {
-            bFitsDiag = qtrue;
-        }
         iX[0] = 1;
         iX[1] = 0;
         iX[2] = 1;
@@ -619,22 +607,10 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
         iY[2] = 0;
         break;
     case 4:
-        if (d1 < 0) {
-            bFitsX = qfalse;
-        } else {
-            bFitsX = qtrue;
-        }
-        if (d2 > 64) {
-            bFitsY = qfalse;
-        } else {
-            bFitsY = qtrue;
-        }
+        bFitsX = d1 >= 0;
+        bFitsY = d2 <= 64;
+        bFitsDiag = d1 <= d2;
 
-        if (d1 > d2) {
-            bFitsDiag = qfalse;
-        } else {
-            bFitsDiag = qtrue;
-        }
         iX[0] = 0;
         iX[1] = 1;
         iX[2] = 0;
@@ -643,22 +619,10 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
         iY[2] = 0;
         break;
     case 5:
-        if (d1 > 64) {
-            bFitsX = qfalse;
-        } else {
-            bFitsX = qtrue;
-        }
-        if (d2 < 0) {
-            bFitsY = qfalse;
-        } else {
-            bFitsY = qtrue;
-        }
+        bFitsX = d1 <= 64;
+        bFitsY = d2 >= 0;
+        bFitsDiag = d1 >= d2;
 
-        if (d1 < d2) {
-            bFitsDiag = qfalse;
-        } else {
-            bFitsDiag = qtrue;
-        }
         iX[0] = 1;
         iX[1] = 0;
         iX[2] = 1;
@@ -667,22 +631,10 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
         iY[2] = 1;
         break;
     case 6:
-        if (d1 < 0) {
-            bFitsX = qfalse;
-        } else {
-            bFitsX = qtrue;
-        }
-        if (d2 < 0) {
-            bFitsY = qfalse;
-        } else {
-            bFitsY = qtrue;
-        }
+        bFitsX = d1 >= 0;
+        bFitsY = d2 >= 0;
+        bFitsDiag = d1 <= 64 - d2;
 
-        if (d1 > 64 - d2) {
-            bFitsDiag = qfalse;
-        } else {
-            bFitsDiag = qtrue;
-        }
         iX[0] = 0;
         iX[1] = 1;
         iX[2] = 0;
@@ -694,31 +646,37 @@ float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
         return 0;
     }
 
-    if (bFitsX) {
-        if (bFitsY) {
-            if (bFitsDiag) {
-                return fSpherePlane;
-            } else {
-                return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[1], iY[1], iX[2], iY[2]);
-            }
-        } else if (bFitsDiag) {
-            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[1], iY[1]);
-        } else {
-            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[1], iY[1]);
+    if (bFitsX && bFitsY) {
+        if (bFitsDiag) {
+            return fSpherePlane;
         }
-    } else if (bFitsY) {
+
+        return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[1], iY[1], iX[2], iY[2]);
+    }
+    
+    if (bFitsX && !bFitsY) {
+        if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[1], iY[1]);
+        }
+
+        return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[1], iY[1]);
+    }
+
+    if (!bFitsX && bFitsY) {
         if (bFitsDiag) {
             return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[2], iY[2]);
-        } else {
-            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[2], iY[2]);
         }
-    } else {
+
+        return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[2], iY[2]);
+    }
+
+    if (!bFitsX && !bFitsY) {
         if (bFitsDiag) {
             return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[0], iY[0]);
-        } else {
-            return g_trace.tw->trace.fraction;
         }
     }
+
+    return g_trace.tw->trace.fraction;
 }
 
 /*

From b0e597cf55d2ceed0d60b9eb8346cda247ff43fd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 15:02:49 +0100
Subject: [PATCH 0137/2040] Fixed vehicle collision orientation

---
 code/fgame/vehicleturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 7ed211fd..aae7c987 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -1502,7 +1502,7 @@ void VehicleTurretGun::UpdateCollisionEntity()
         vec3_t axis[3];
         vec3_t mat[3];
 
-        AnglesToAxis(m_vLocalAngles, mat);
+        AnglesToAxis(m_vLocalAngles, axis);
         MatrixMultiply(axis, m_mBaseOrientation, mat);
         MatrixToEulerAngles(mat, newAngles);
     } else {

From 7a1f7773bfdf9a099ca95c33afa7546ea4b93a58 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 15:05:33 +0100
Subject: [PATCH 0138/2040] Use sin/cos instead of sinf/cosf (accuracy)

---
 code/qcommon/q_math.c | 118 +++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index f21b52fe..a09fc656 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -650,10 +650,10 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point,
 	zrot[0][0] = zrot[1][1] = zrot[2][2] = 1.0F;
 
 	rad = DEG2RAD( degrees );
-	zrot[0][0] = cosf( rad );
-	zrot[0][1] = sinf( rad );
-	zrot[1][0] = -sinf( rad );
-	zrot[1][1] = cosf( rad );
+	zrot[0][0] = cos( rad );
+	zrot[0][1] = sin( rad );
+	zrot[1][0] = -sin( rad );
+	zrot[1][1] = cos( rad );
 
 	Matrix3x3Multiply( m, zrot, tmpmat );
 	Matrix3x3Multiply( tmpmat, im, rot );
@@ -768,14 +768,14 @@ void AnglesToAxis( const vec3_t angles, vec3_t axis[3] ) {
 	// static to help MS compiler fp bugs
 
 	angle = angles[ YAW ] * ( M_PI * 2 / 360 );
-	sy = sinf( angle );
-	cy = cosf( angle );
+	sy = sin( angle );
+	cy = cos( angle );
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
-	sp = sinf( angle );
-	cp = cosf( angle );
+	sp = sin( angle );
+	cp = cos( angle );
 	angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-	sr = sinf( angle );
-	cr = cosf( angle );
+	sr = sin( angle );
+	cr = cos( angle );
 
 	axis[ 0 ][ 0 ] = cp*cy;
 	axis[ 0 ][ 1 ] = cp*sy;
@@ -903,7 +903,7 @@ the msvc acos doesn't always return a value between -PI and PI:
 
 int i;
 i = 1065353246;
-acosf(*(float*) &i) == -1.#IND0
+acos(*(float*) &i) == -1.#IND0
 
 	This should go in q_math but it is too late to add new traps
 	to game and ui
@@ -912,7 +912,7 @@ acosf(*(float*) &i) == -1.#IND0
 float Q_acos(float c) {
 	float angle;
 
-	angle = acosf(c);
+	angle = acos(c);
 
 	if (angle > M_PI) {
 		return (float)M_PI;
@@ -2051,14 +2051,14 @@ void AngleVectors( const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up
 	// static to help MS compiler fp bugs
 
 	angle = angles[ YAW ] * ( M_PI * 2 / 360 );
-	sy = sinf( angle );
-	cy = cosf( angle );
+	sy = sin( angle );
+	cy = cos( angle );
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
-	sp = sinf( angle );
-	cp = cosf( angle );
+	sp = sin( angle );
+	cp = cos( angle );
 	angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-	sr = sinf( angle );
-	cr = cosf( angle );
+	sr = sin( angle );
+	cr = cos( angle );
 
 	if( forward )
 	{
@@ -2087,11 +2087,11 @@ void AngleVectorsLeft( const vec3_t angles, vec3_t forward, vec3_t left, vec3_t
 	// static to help MS compiler fp bugs
 
 	angle = angles[ YAW ] * ( M_PI * 2 / 360 );
-	sy = sinf( angle );
-	cy = cosf( angle );
+	sy = sin( angle );
+	cy = cos( angle );
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
-	sp = sinf( angle );
-	cp = cosf( angle );
+	sp = sin( angle );
+	cp = cos( angle );
 
 	if( forward )
 	{
@@ -2103,8 +2103,8 @@ void AngleVectorsLeft( const vec3_t angles, vec3_t forward, vec3_t left, vec3_t
 	if( left || up )
 	{
 		angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-		sr = sinf( angle );
-		cr = cosf( angle );
+		sr = sin( angle );
+		cr = cos( angle );
 
 		if( left )
 		{
@@ -2717,8 +2717,8 @@ void MatrixSetupXRotation(matrix_t m, vec_t degrees)
 	vec_t a = DEG2RAD(degrees);
 
 	m[ 0] = 1;      m[ 4] = 0;              m[ 8] = 0;              m[12] = 0;
-	m[ 1] = 0;      m[ 5] = cosf(a);         m[ 9] =-sinf(a);         m[13] = 0;
-	m[ 2] = 0;      m[ 6] = sinf(a);         m[10] = cosf(a);         m[14] = 0;
+	m[ 1] = 0;      m[ 5] = cos(a);         m[ 9] =-sin(a);         m[13] = 0;
+	m[ 2] = 0;      m[ 6] = sin(a);         m[10] = cos(a);         m[14] = 0;
 	m[ 3] = 0;      m[ 7] = 0;              m[11] = 0;              m[15] = 1;
 }
 
@@ -2726,9 +2726,9 @@ void MatrixSetupYRotation(matrix_t m, vec_t degrees)
 {
 	vec_t a = DEG2RAD(degrees);
 
-	m[ 0] = cosf(a);         m[ 4] = 0;      m[ 8] = sinf(a);         m[12] = 0;
+	m[ 0] = cos(a);         m[ 4] = 0;      m[ 8] = sin(a);         m[12] = 0;
 	m[ 1] = 0;              m[ 5] = 1;      m[ 9] = 0;              m[13] = 0;
-	m[ 2] =-sinf(a);         m[ 6] = 0;      m[10] = cosf(a);         m[14] = 0;
+	m[ 2] =-sin(a);         m[ 6] = 0;      m[10] = cos(a);         m[14] = 0;
 	m[ 3] = 0;              m[ 7] = 0;      m[11] = 0;              m[15] = 1;
 }
 
@@ -2736,8 +2736,8 @@ void MatrixSetupZRotation(matrix_t m, vec_t degrees)
 {
 	vec_t a = DEG2RAD(degrees);
 
-	m[ 0] = cosf(a);         m[ 4] =-sinf(a);         m[ 8] = 0;      m[12] = 0;
-	m[ 1] = sinf(a);         m[ 5] = cosf(a);         m[ 9] = 0;      m[13] = 0;
+	m[ 0] = cos(a);         m[ 4] =-sin(a);         m[ 8] = 0;      m[12] = 0;
+	m[ 1] = sin(a);         m[ 5] = cos(a);         m[ 9] = 0;      m[13] = 0;
 	m[ 2] = 0;              m[ 6] = 0;              m[10] = 1;      m[14] = 0;
 	m[ 3] = 0;              m[ 7] = 0;              m[11] = 0;      m[15] = 1;
 }
@@ -2939,8 +2939,8 @@ void MatrixToAngles(const matrix_t m, vec3_t angles)
 		sp = -1.0;
 	}
 
-	theta = -asinf(sp);
-	cp = cosf(theta);
+	theta = -asin(sp);
+	cp = cos(theta);
 
 	if(cp > 8192 * FLT_EPSILON)
 	{
@@ -2958,8 +2958,8 @@ void MatrixToAngles(const matrix_t m, vec3_t angles)
 	double          a;
 	double          ca;
 
-	a = asinf(-m[2]);
-	ca = cosf(a);
+	a = asin(-m[2]);
+	ca = cos(a);
 
 	if(fabs(ca) > 0.005)		// Gimbal lock?
 	{
@@ -2983,14 +2983,14 @@ void MatrixFromAngles(matrix_t m, vec_t pitch, vec_t yaw, vec_t roll)
 	static float    sr, sp, sy, cr, cp, cy;
 
     // static to help MS compiler fp bugs
-	sp = sinf(DEG2RAD(pitch));
-	cp = cosf(DEG2RAD(pitch));
+	sp = sin(DEG2RAD(pitch));
+	cp = cos(DEG2RAD(pitch));
 
-	sy = sinf(DEG2RAD(yaw));
-	cy = cosf(DEG2RAD(yaw));
+	sy = sin(DEG2RAD(yaw));
+	cy = cos(DEG2RAD(yaw));
 
-	sr = sinf(DEG2RAD(roll));
-	cr = cosf(DEG2RAD(roll));
+	sr = sin(DEG2RAD(roll));
+	cr = cos(DEG2RAD(roll));
 
 	m[ 0] = cp*cy;  m[ 4] = (sr*sp*cy+cr*-sy);      m[ 8] = (cr*sp*cy+-sr*-sy);     m[12] = 0;
 	m[ 1] = cp*sy;  m[ 5] = (sr*sp*sy+cr*cy);       m[ 9] = (cr*sp*sy+-sr*cy);      m[13] = 0;
@@ -3663,14 +3663,14 @@ void QuatFromAngles(quat_t q, vec_t pitch, vec_t yaw, vec_t roll)
 	static float    sr, sp, sy, cr, cp, cy;
 
 	// static to help MS compiler fp bugs
-	sp = sinf(DEG2RAD(pitch));
-	cp = cosf(DEG2RAD(pitch));
+	sp = sin(DEG2RAD(pitch));
+	cp = cos(DEG2RAD(pitch));
 
-	sy = sinf(DEG2RAD(yaw));
-	cy = cosf(DEG2RAD(yaw));
+	sy = sin(DEG2RAD(yaw));
+	cy = cos(DEG2RAD(yaw));
 
-	sr = sinf(DEG2RAD(roll));
-	cr = cosf(DEG2RAD(roll));
+	sr = sin(DEG2RAD(roll));
+	cr = cos(DEG2RAD(roll));
 
 	q[0] = sr * cp * cy - cr * sp * sy;	// x
 	q[1] = cr * sp * cy + sr * cp * sy;	// y
@@ -3818,19 +3818,19 @@ void QuatToRotAngle( const quat_t q, vec_t *angle ) {
 void QuatToRotAngleAxis( const quat_t q, vec_t *angle, vec3_t axis ) {
 
 	*angle = atan( VectorLength(q)/q[3] );
-	axis[0] = q[0] / sinf(*angle);
-	axis[1] = q[1] / sinf(*angle);
-	axis[2] = q[2] / sinf(*angle);
+	axis[0] = q[0] / sin(*angle);
+	axis[1] = q[1] / sin(*angle);
+	axis[2] = q[2] / sin(*angle);
 
 	*angle *= 360.0f / M_PI;
 }
 
 void QuatFromRotAngleAxis( quat_t q, vec_t angle, const vec3_t axis ) {
 
-	q[0] = axis[0] * sinf( angle*M_PI/360 );
-	q[1] = axis[1] * sinf( angle*M_PI/360 );
-	q[2] = axis[2] * sinf( angle*M_PI/360 );
-	q[3] = cosf( angle*M_PI/360 );
+	q[0] = axis[0] * sin( angle*M_PI/360 );
+	q[1] = axis[1] * sin( angle*M_PI/360 );
+	q[2] = axis[2] * sin( angle*M_PI/360 );
+	q[3] = cos( angle*M_PI/360 );
 }
 
 void QuatToAngles( const quat_t q, vec3_t angles )
@@ -3842,7 +3842,7 @@ void QuatToAngles( const quat_t q, vec3_t angles )
 	q2[ 2 ] = q[ 2 ] * q[ 2 ];
 	q2[ 3 ] = q[ 3 ] * q[ 3 ];
 
-	angles[ PITCH ] = RAD2DEG( asinf( -2 * ( q[ 2 ] * q[ 0 ] - q[ 3 ] * q[ 1 ] ) ) );
+	angles[ PITCH ] = RAD2DEG( asin( -2 * ( q[ 2 ] * q[ 0 ] - q[ 3 ] * q[ 1 ] ) ) );
 	angles[ YAW ] = RAD2DEG( atan2( 2 * ( q[ 2 ] * q[ 3 ] + q[ 0 ] * q[ 1 ] ), ( q2[ 2 ] - q2[ 3 ] - q2[ 0 ] + q2[ 1 ] ) ) );
 	angles[ ROLL ] = RAD2DEG( atan2( 2 * ( q[ 3 ] * q[ 0 ] + q[ 2 ] * q[ 1 ] ), ( -q2[ 2 ] - q2[ 3 ] + q2[ 0 ] + q2[ 1 ] ) ) );
 }
@@ -3869,7 +3869,7 @@ void QuatToAngles( const quat_t q, vec3_t angles )
 	}
 	else
 	{
-		angles[ PITCH ] = asinf( 2.f*( SingularityTest ) ) * RAD_TO_DEG;
+		angles[ PITCH ] = asin( 2.f*( SingularityTest ) ) * RAD_TO_DEG;
 		angles[ YAW ] = atan2( YawY, YawX ) * RAD_TO_DEG;
 		angles[ ROLL ] = atan2( -2.f*( q[W]*q[X] + q[Y]*q[Z] ), ( 1.f - 2.f*( Square( q[X] ) + Square( q[Y] ) ) ) ) * RAD_TO_DEG;
 	}
@@ -4006,8 +4006,8 @@ void QuatSlerp(const quat_t from, const quat_t to, float frac, quat_t out)
 		sinom = 1.0f / sqrtf(sinSqr);
 		omega = atan2f(sinSqr * sinom, absCosom);
 
-		scale0 = sinf((1.0f - frac) * omega) * sinom;
-		scale1 = sinf(frac * omega) * sinom;
+		scale0 = sin((1.0f - frac) * omega) * sinom;
+		scale1 = sin(frac * omega) * sinom;
 	}
 	else
 	{
@@ -4054,8 +4054,8 @@ void MatrixToEulerAngles
 		sp = -1.0;
 	}
 
-	theta = -asinf( sp );
-	cp = cosf( theta );
+	theta = -asin( sp );
+	cp = cos( theta );
 
 	if( cp > 8192 * FLT_EPSILON )
 	{

From 5a0aeb2f88a3b0b3fc18c423991b586fce345326 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 15:12:55 +0100
Subject: [PATCH 0139/2040] Fixed last fire time being incorrectly set in the
 future

---
 code/fgame/vehicleturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index aae7c987..674e95a6 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -949,7 +949,7 @@ void VehicleTurretGun::UpdateOwner(Sentient *pOwner)
 
 void VehicleTurretGun::TurretHasBeenMounted()
 {
-    m_fLastFireTime = level.time + m_fWarmupDelay + fire_delay[FIRE_PRIMARY];
+    m_fLastFireTime = (level.time + m_fWarmupDelay) - fire_delay[FIRE_PRIMARY];
     if (m_fWarmupDelay > 0.25) {
         Sound(m_sSoundSet + "snd_warmup");
     }

From 1577927d99c0f723899db133d7f3520c373b67df Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:48:58 +0100
Subject: [PATCH 0140/2040] Ignore collision if the brush has a trace content
 and the trace content wasn't specified in the trace flags

---
 code/qcommon/cm_trace.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
index 10460b29..7122f200 100644
--- a/code/qcommon/cm_trace.c
+++ b/code/qcommon/cm_trace.c
@@ -677,6 +677,11 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
 		leaveFrac2 = 1.0;
 		clipplane2 = NULL;
 		leadside2 = NULL;
+
+		if (!(tw->contents & CONTENTS_FENCE)) {
+			return;
+		}
+
 		//
 		// compare the trace against all planes of the brush
 		// find the latest time the trace crosses a plane towards the interior

From 5cadab46abdbf9366db1741c24cccf628b52e36c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:49:27 +0100
Subject: [PATCH 0141/2040] Fixed fence mask being incorrectly specified as
 transparent rather than opaque

---
 code/qcommon/cm_fencemask.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/cm_fencemask.c b/code/qcommon/cm_fencemask.c
index eacf6aad..a32291ac 100644
--- a/code/qcommon/cm_fencemask.c
+++ b/code/qcommon/cm_fencemask.c
@@ -468,11 +468,11 @@ qboolean CM_GenerateFenceMask( const char *szName, cfencemask_t **pMask )
 
 	for( i = 0; i < iImageSize; i++, pCurrImage += sizeof( unsigned int ) )
 	{
-		if( *pCurrImage >= 0 )
+		if( *pCurrImage & 0x80 )
 		{
-			bHasTrans = qtrue;
-		} else {
 			bHasOpaque = qtrue;
+		} else {
+			bHasTrans = qtrue;
 		}
 
 		if( bHasOpaque && bHasTrans ) {

From 74e8a38c00d5a7974a04131207826fc0508c528b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:59:20 +0100
Subject: [PATCH 0142/2040] When idle, limit the turret's pitch to the max idle
 pitch

---
 code/fgame/weapturret.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 6f0d806a..0a96c220 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -573,7 +573,12 @@ void TurretGun::ThinkIdle(void)
 
     m_fIdlePitchSpeed -= level.frametime * 300.0f;
 
-    vNewAngles = Vector(angles[0] + level.frametime * m_fIdlePitchSpeed, angles[1], angles[2]);
+    vNewAngles = Vector(
+        Q_max(angles[0] + level.frametime * m_fIdlePitchSpeed, m_fMaxIdlePitch),
+        angles[1],
+        angles[2]
+    );
+
     vNewAngles.AngleVectorsLeft(&vDir);
     vEnd = origin + vDir * m_vIdleCheckOffset[0];
 

From 0591152f99ea8b9ec23ba7a7e162423e7db05ef2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 17:18:51 +0100
Subject: [PATCH 0143/2040] Added ifCvar / ifCvarnot support

---
 code/renderer/tr_shader.c | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index c356aebd..3a919800 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -798,6 +798,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 	int cntBundle = 0;
 	int depthTestBits = 0;
 	int fogBits = 0;
+	qboolean shouldProcess = qtrue;
 
 	stage->active = qtrue;
 	stage->noMipMaps = shader_noMipMaps;
@@ -815,6 +816,13 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 
 		if (token[0] == '}')
 		{
+			// Added in 2.0
+			//  Ignore vars that didn't met with 'ifCvar' / 'ifCvarnot'
+			if (!shouldProcess) {
+				stage->active = qfalse;
+				stage->rgbGen = CGEN_BAD;
+				return qtrue;
+			}
 			break;
 		}
 		// no picmip adjustment
@@ -1628,6 +1636,43 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 			}
             continue;
         }
+		//
+		// Added in 2.0
+		//
+		else if (!Q_stricmp(token, "ifCvar") || !Q_stricmp(token, "ifCvarnot"))
+		{
+			cvar_t* var;
+			qboolean isNot = token[6] != 0;
+			qboolean evaluatedValue;
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar name in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			var = ri.Cvar_Get(token, "0", 0);
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar value in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			if (atof(token) != var->value) {
+				evaluatedValue = qfalse;
+			} else if (var->value) {
+				evaluatedValue = qtrue;
+			} else if (token[0] == '0' || (token[0] == '.' && token[1] == '0')) {
+				evaluatedValue = qtrue;
+			} else if (!Q_stricmp(var->string, token)) {
+				evaluatedValue = qtrue;
+			} else {
+				return qfalse;
+			}
+
+			shouldProcess &= evaluatedValue ^ isNot;
+		}
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );

From 304645d720de15f7889215094f821fe7e0bcb415 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 19:50:32 +0100
Subject: [PATCH 0144/2040] Ignore CGEN_BAD stages

---
 code/renderer/tr_shader.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 3a919800..019d88a2 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -2175,7 +2175,17 @@ static qboolean ParseShader( char **text )
 			{
 				return qfalse;
 			}
-			unfoggedStages[s].active = qtrue;
+			if (unfoggedStages[s].rgbGen != CGEN_BAD) {
+				unfoggedStages[s].active = qtrue;
+				if (s > 0) {
+					if (!(unfoggedStages[s].stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))) {
+						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has opaque maps defined after stage 0!!!\n", shader.name);
+					}
+					if (unfoggedStages[s].stateBits & GLS_DEPTHMASK_TRUE) {
+						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has depthmask enabled after stage 0!!!\n", shader.name);
+					}
+				}
+			}
 			s++;
 			continue;
 		}

From d5be69239a02fea0a867e94375f14d4b7b501306 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 20:18:52 +0100
Subject: [PATCH 0145/2040] Added GL 1.3 functions

---
 code/renderer/tr_local.h | 1 +
 code/sdl/sdl_glimp.c     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index d99f8b6d..eb782eb5 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 QGL_1_1_PROCS;
 QGL_1_1_FIXED_FUNCTION_PROCS;
+QGL_1_3_PROCS;
 QGL_DESKTOP_1_1_PROCS;
 QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
 QGL_3_0_PROCS;
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 30986ab1..528f3a06 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -293,6 +293,9 @@ static qboolean GLimp_GetProcAddresses( qboolean fixedFunction ) {
 		} else {
 			Com_Error( ERR_FATAL, "Unsupported OpenGL Version (%s), OpenGL 1.1 is required", version );
 		}
+		if ( QGL_VERSION_ATLEAST( 1, 3 ) ) {
+			QGL_1_3_PROCS;
+		}
 	} else {
 		if ( QGL_VERSION_ATLEAST( 2, 0 ) ) {
 			QGL_1_1_PROCS;

From 5475624b7fbea132acb075fb4eb38b27e423641f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 20:19:33 +0100
Subject: [PATCH 0146/2040] Added DDS support + handle compressed textures
 correctly

---
 code/renderer/tr_image.c | 245 ++++++++++++++++++++-------------------
 1 file changed, 127 insertions(+), 118 deletions(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 3333e12c..350e6835 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -519,7 +519,8 @@ static void Upload32(
 		scaled_height >>= 1;
 	}
 
-	scaledBuffer = ri.Hunk_AllocateTempMemory( sizeof( unsigned ) * scaled_width * scaled_height );
+	//scaledBuffer = ri.Hunk_AllocateTempMemory( 4 * scaled_width * scaled_height );
+	scaledBuffer = data;
 
 	//
 	// scan the texture for each channel's max values
@@ -622,10 +623,11 @@ static void Upload32(
 			*pUploadWidth = scaled_width;
 			*pUploadHeight = scaled_height;
 			*format = internalFormat;
+			*bytesUsed = samples * scaled_width * scaled_height;
 
 			goto done;
 		}
-		Com_Memcpy (scaledBuffer, data, width*height*4);
+		//Com_Memcpy (scaledBuffer, data, width*height*4);
 	}
 	else
 	{
@@ -641,7 +643,7 @@ static void Upload32(
 				height = 1;
 			}
 		}
-		Com_Memcpy( scaledBuffer, data, width * height * 4 );
+		//Com_Memcpy( scaledBuffer, data, width * height * 4 );
 	}
 
 	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !numMipmaps);
@@ -652,6 +654,8 @@ static void Upload32(
 
 	qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
 
+	*bytesUsed = samples * scaled_width * scaled_height;
+
 	if (numMipmaps)
 	{
 		int		miplevel;
@@ -697,13 +701,12 @@ done:
 
 	GL_CheckErrors();
 
-	if ( scaledBuffer != 0 )
-		ri.Hunk_FreeTempMemory( scaledBuffer );
+	//if ( scaledBuffer != 0 )
+	//	ri.Hunk_FreeTempMemory( scaledBuffer );
 	if ( resampledBuffer != 0 )
 		ri.Hunk_FreeTempMemory( resampledBuffer );
 }
 
-/*
 static void UploadCompressed(
 	byte* data,
 	int width,
@@ -813,7 +816,7 @@ static void UploadCompressed(
 			size = blockSize * w * h;
 			if (w > 1 && h > 1) *pBytesUsed += size;
 			
-			qglCompressedTexImage2DARB(3553, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, data);
+			qglCompressedTexImage2D(GL_TEXTURE_2D, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, data);
 			GL_CheckErrors();
 
 			if (i < iMipmapsAvailable)
@@ -858,7 +861,6 @@ static void UploadCompressed(
 
 	GL_CheckErrors();
 }
-*/
 
 /*
 ================
@@ -943,21 +945,38 @@ image_t* R_CreateImage(
 
 	GL_Bind(image);
 
-    Upload32(
-        (unsigned*)pic,
-        image->width,
-        image->height,
-        image->numMipmaps,
-        allowPicmip,
-        image->dynamicallyUpdated,
-        force32bit,
-        hasAlpha,
-        &image->internalFormat,
-        &image->uploadWidth,
-        &image->uploadHeight,
-        &image->bytesUsed,
-        isLightmap
-    );
+	if (glCompressMode) {
+		UploadCompressed(
+			(unsigned*)pic,
+			image->width,
+			image->height,
+			image->numMipmaps,
+			iMipmapsAvailable,
+			allowPicmip,
+			glCompressMode,
+			&image->internalFormat,
+			&image->uploadWidth,
+			&image->uploadHeight,
+			&image->bytesUsed
+		);
+	}
+	else {
+		Upload32(
+			(unsigned*)pic,
+			image->width,
+			image->height,
+			image->numMipmaps,
+			allowPicmip,
+			image->dynamicallyUpdated,
+			force32bit,
+			hasAlpha,
+			&image->internalFormat,
+			&image->uploadWidth,
+			&image->uploadHeight,
+			&image->bytesUsed,
+			isLightmap
+		);
+	}
 
 	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampModeX );
 	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampModeY );
@@ -1488,16 +1507,19 @@ typedef enum DXGI_FORMAT {
 
 
 static void LoadDDS(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
-	union {
-		byte* b;
-		void* v;
-	} buffer;
 	int len;
-	ddsHeader_t* ddsHeader = NULL;
+	unsigned int signature;
+	ddsHeader_t ddsHeader;
 	ddsHeaderDxt10_t* ddsHeaderDxt10 = NULL;
+	fileHandle_t handle;
 	byte* data;
+	int w, h;
+	int minWidth, minHeight;
+	int numMips = 0;
+	int size;
+	int intSize;
 
-	*pic = 0;
+	*pic = NULL;
 	*piMipmapsAvailable = 0;
 
 	if (width)
@@ -1505,126 +1527,113 @@ static void LoadDDS(const char* name, byte** pic, int* width, int* height, qbool
 	if (height)
 		*height = 0;
 
-	*pic = NULL;
-
 	//
 	// load the file
 	//
-	len = ri.FS_ReadFile((char*)name, &buffer.v);
-	if (!buffer.b || len < 0) {
+	len = ri.FS_OpenFile((char*)name, &handle, qtrue, qtrue);
+	if (len < 0) {
 		return;
 	}
 
 	//
 	// reject files that are too small to hold even a header
 	//
-	if (len < 4 + sizeof(*ddsHeader))
+	if (len < 4 + sizeof(ddsHeader))
 	{
 		ri.Printf(PRINT_ALL, "File %s is too small to be a DDS file.\n", name);
-		ri.FS_FreeFile(buffer.v);
+		ri.FS_CloseFile(handle);
 		return;
 	}
 
 	//
 	// reject files that don't start with "DDS "
 	//
-	if (*((ui32_t*)(buffer.b)) != EncodeFourCC("DDS "))
+	ri.FS_Read(&signature, sizeof(signature), handle);
+	if (signature != EncodeFourCC("DDS "))
 	{
 		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
-		ri.FS_FreeFile(buffer.v);
+		ri.FS_CloseFile(handle);
 		return;
 	}
 
-	//
-	// parse header and dx10 header if available
-	//
-	ddsHeader = (ddsHeader_t*)(buffer.b + 4);
-	if ((ddsHeader->pixelFormatFlags & DDSPF_FOURCC) && ddsHeader->fourCC == EncodeFourCC("DX10"))
-	{
-		if (len < 4 + sizeof(*ddsHeader) + sizeof(*ddsHeaderDxt10))
-		{
-			ri.Printf(PRINT_ALL, "File %s indicates a DX10 header it is too small to contain.\n", name);
-			ri.FS_FreeFile(buffer.v);
-			return;
-		}
-
-		ddsHeaderDxt10 = (ddsHeaderDxt10_t*)(buffer.b + 4 + sizeof(ddsHeader_t));
-		data = buffer.b + 4 + sizeof(*ddsHeader) + sizeof(*ddsHeaderDxt10);
-		len -= 4 + sizeof(*ddsHeader) + sizeof(*ddsHeaderDxt10);
-	}
-	else
-	{
-		data = buffer.b + 4 + sizeof(*ddsHeader);
-		len -= 4 + sizeof(*ddsHeader);
-	}
-
-	if (width)
-		*width = ddsHeader->width;
-	if (height)
-		*height = ddsHeader->height;
-
-	if (piMipmapsAvailable)
-	{
-		if (ddsHeader->flags & _DDSFLAGS_MIPMAPCOUNT)
-			*piMipmapsAvailable = ddsHeader->numMips;
-		else
-			*piMipmapsAvailable = 1;
-	}
-
-	// FIXME: handle cube map
-	//if ((ddsHeader->caps2 & DDSCAPS2_CUBEMAP) == DDSCAPS2_CUBEMAP)
+	ri.FS_Read(&ddsHeader, sizeof(ddsHeader), handle);
 
 	//
 	// Convert DXGI format/FourCC into OpenGL format
 	//
-	if (ddsHeaderDxt10)
-	{
-		ri.Printf(PRINT_ALL, "DDS File %s has unsupported DXGI format %d.", name, ddsHeaderDxt10->dxgiFormat);
-		ri.FS_FreeFile(buffer.v);
+	if (ddsHeader.fourCC == EncodeFourCC("DXT1")) {
+		intSize = 2;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT2")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT3")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT4")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT5")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+	} else {
+		ri.FS_CloseFile(handle);
 		return;
 	}
-	else
-	{
-		if (ddsHeader->pixelFormatFlags & DDSPF_FOURCC)
-		{
-			if (ddsHeader->fourCC == EncodeFourCC("DXT1"))
-				*glCompressMode = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT2"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT3"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT4"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT5"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-			else
-			{
-				ri.Printf(PRINT_ALL, "DDS File %s has unsupported FourCC.", name);
-				ri.FS_FreeFile(buffer.v);
-				return;
-			}
-		}
-		else if (ddsHeader->pixelFormatFlags == (DDSPF_RGB | DDSPF_ALPHAPIXELS)
-			&& ddsHeader->rgbBitCount == 32
-			&& ddsHeader->rBitMask == 0x000000ff
-			&& ddsHeader->gBitMask == 0x0000ff00
-			&& ddsHeader->bBitMask == 0x00ff0000
-			&& ddsHeader->aBitMask == 0xff000000)
-		{
-			*glCompressMode = GL_RGBA8;
-		}
-		else
-		{
-			ri.Printf(PRINT_ALL, "DDS File %s has unsupported RGBA format.", name);
-			ri.FS_FreeFile(buffer.v);
-			return;
+
+	minWidth = ddsHeader.width;
+	for (w = 1; w < ddsHeader.width; w *= 2) {}
+
+	minHeight = ddsHeader.height;
+	for (h = 1; h < ddsHeader.height; h *= 2) {}
+
+	if (w != ddsHeader.width || h != ddsHeader.height) {
+		ri.FS_CloseFile(handle);
+		if (w == ddsHeader.width) {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - height not a power of 2\n", name);
+		} else if (h == ddsHeader.height) {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width not a power of 2\n", name);
+		} else {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width and height not a powers of 2\n", name);
 		}
+
+		return;
 	}
 
-	*pic = ri.Malloc(len);
-	Com_Memcpy(*pic, data, len);
+	//
+	// Parse width and height
+	//
+	if (!minWidth) {
+		minWidth = 1;
+	}
+	*width = minWidth;
 
-	ri.FS_FreeFile(buffer.v);
+	if (!minHeight) {
+		minHeight = 1;
+	}
+	*height = minHeight;
+
+	*hasAlpha = ddsHeader.fourCC != EncodeFourCC("DXT1");
+
+	numMips = ddsHeader.numMips;
+	if (!numMips) {
+		numMips = 1;
+	}
+
+	*piMipmapsAvailable = numMips;
+	if (*numMipmaps) {
+		*numMipmaps = numMips;
+	}
+
+	size = ddsHeader.pitchOrFirstMipSize;
+	if (*piMipmapsAvailable > 1) {
+		size = intSize * ddsHeader.pitchOrFirstMipSize;
+	}
+
+	*pic = ri.Malloc(size);
+	ri.FS_Read(*pic, size, handle);
+
+	ri.FS_CloseFile(handle);
 }
 
 /*
@@ -2430,7 +2439,7 @@ static void R_LoadImage(const char* name, byte** pic, int* width, int* height, q
 
 	strcpy(altname, name);
 	len = strlen(altname);
-	if (glConfig.textureCompression == 1)
+	if (glConfig.textureCompression == TC_S3TC || glConfig.textureCompression == TC_S3TC_ARB)
 	{
 		len = strlen(altname);
 		altname[len - 3] = 'd';

From 186583148a44f8ad8822c8974143c26d51153484 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:10:00 +0100
Subject: [PATCH 0147/2040] Use proper values for GL_TEXTURE_WRAP_S and
 GL_TEXTURE_WRAP_T

---
 code/renderer/tr_backend.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index eb8c0e83..433beb78 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -448,19 +448,19 @@ void GL_State( unsigned long stateBits )
 		if (r_forceClampToEdge->value)
 		{
 			if (stateBits & GLS_CLAMP_EDGE) {
-				clampValue = 33071.0;
+				clampValue = GL_CLAMP_TO_EDGE;
 			}
 			else {
-				clampValue = 10497.0;
+				clampValue = GL_REPEAT;
 			}
 		}
 		else
 		{
 			if (stateBits & GLS_CLAMP_EDGE) {
-				clampValue = 10496.0;
+				clampValue = GL_CLAMP;
 			}
 			else {
-				clampValue = 10497.0;
+				clampValue = GL_REPEAT;
 			}
 		}
 

From 3b2223ad22658a829c8c9238a1ffb588b521a04b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:11:00 +0100
Subject: [PATCH 0148/2040] image validity check

---
 code/renderer/tr_backend.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 433beb78..4783749a 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -63,7 +63,9 @@ void GL_Bind( image_t *image ) {
 	}
 
 	if ( glState.currenttextures[glState.currenttmu] != texnum ) {
-		image->frameUsed = tr.frameCount;
+		if (image) {
+			image->frameUsed = tr.frameCount;
+		}
 		glState.currenttextures[glState.currenttmu] = texnum;
 		qglBindTexture (GL_TEXTURE_2D, texnum);
 	}

From 0b16d599d50219ee5629bfb7370dcaebfecdd562 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 22:11:15 +0100
Subject: [PATCH 0149/2040] Added UseCount for image_t

---
 code/renderer/tr_backend.c | 1 +
 code/renderer/tr_local.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 4783749a..373ed828 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -56,6 +56,7 @@ void GL_Bind( image_t *image ) {
 		texnum = tr.defaultImage->texnum;
 	} else {
 		texnum = image->texnum;
+		image->UseCount++;
 	}
 
 	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index eb782eb5..0f027be2 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -236,6 +236,7 @@ typedef struct image_s {
     int			wrapClampModeX;
     int			wrapClampModeY;
 	int			r_sequence;
+	int			UseCount;
 
 	struct image_s*	next;
 } image_t;

From 51ba1e295104385c9b00ad476f3cd936c855464c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Feb 2024 23:47:07 +0100
Subject: [PATCH 0150/2040] Properly use identity / identitylighting when cgen
 isn't explicitly specified

---
 code/renderer/tr_shader.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 019d88a2..e301f4fa 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -1684,10 +1684,11 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 	// if cgen isn't explicitly specified, use either identity or identitylighting
 	//
 	if ( stage->rgbGen == CGEN_BAD ) {
-		if ( (!cntBundle && !stage->bundle[0].isLightmap) ||
-			blendSrcBits == 0 ||
-			blendSrcBits == GLS_SRCBLEND_ONE || 
-			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) {
+		if (cntBundle || stage->bundle[0].isLightmap) {
+			stage->rgbGen = CGEN_IDENTITY;
+		} else if (blendSrcBits == 0 ||
+			blendSrcBits == GLS_SRCBLEND_ONE ||
+			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA) {
 			stage->rgbGen = CGEN_IDENTITY_LIGHTING;
 		} else {
 			stage->rgbGen = CGEN_IDENTITY;
@@ -1709,7 +1710,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 	}
 
 	// decide which agens we can skip
-	if ( stage->alphaGen == CGEN_IDENTITY ) {
+	if ( stage->alphaGen == AGEN_IDENTITY ) {
 		if ( stage->rgbGen == CGEN_IDENTITY
 			|| stage->rgbGen == CGEN_LIGHTING_GRID
 			|| stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) {

From 7c33f98ae9ff141811f5e703d55f9aa0849330a4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 00:57:37 +0100
Subject: [PATCH 0151/2040] Use m_fFollowRelativeYaw

---
 code/fgame/scriptslave.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index f2929f18..12956162 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1504,6 +1504,14 @@ void ScriptSlave::FollowingPath(Event *ev)
         if (vWishAngles.length() > 0.0f) {
             VectorNormalize(vWishAngles);
             VectorToAngles(vWishAngles, vNextWishAngles);
+
+            //
+            // Added in 2.0
+            //  Relative yaw
+            vNextWishAngles[1] += m_fFollowRelativeYaw;
+            if (m_fFollowRelativeYaw == 180) {
+                vNextWishAngles[0] *= -1;
+            }
         } else {
             AngleVectorsLeft(angles, vWishAngles, NULL, NULL);
             vNextWishAngles = angles;

From 0ef743d945c0425461aa6019e57c57cfe2713e32 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 01:01:39 +0100
Subject: [PATCH 0152/2040] Forgot newline

---
 code/client/snd_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c
index 584f3c7a..662b02a8 100644
--- a/code/client/snd_dma.c
+++ b/code/client/snd_dma.c
@@ -788,7 +788,7 @@ void S_Base_AddLoopingSound( int entityNum, const vec3_t origin, const vec3_t ve
 		// Fixed in OPM
 		//  Why should it crash???
 		//Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
-		Com_Printf( "%s has length 0", sfx->soundName );
+		Com_Printf( "%s has length 0\n", sfx->soundName );
 		return;
 	}
 

From 796a3a711fc772082e5bbfc86421038d81ffffce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 01:01:51 +0100
Subject: [PATCH 0153/2040] Fixed animation delta over time

---
 code/skeletor/skeletor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 13c395d1..1654f49a 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -105,6 +105,7 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
 
     if (frameNum1 < frameNum2) {
         delta = m_frame[frameNum1 % numFrames].delta;
+        VectorScale(delta, d, delta);
 
         for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
             delta += m_frame[currFrame % numFrames].delta;

From 6418d79d7652917408d68d1b225190f03219b582 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:22:18 +0100
Subject: [PATCH 0154/2040] Call PostThink() in Think_Alarm()

---
 code/fgame/actor_alarm.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/actor_alarm.cpp b/code/fgame/actor_alarm.cpp
index f485839d..57514a9e 100644
--- a/code/fgame/actor_alarm.cpp
+++ b/code/fgame/actor_alarm.cpp
@@ -120,6 +120,8 @@ void Actor::Think_Alarm(void)
         Com_Printf("Actor::Think_Alarm: invalid think state %i\n", m_State);
         break;
     }
+
+    PostThink(true);
 }
 
 void Actor::FinishedAnimation_Alarm(void)

From 4f5abb34126c358db2b99d49ae9f6571b45b2c27 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:22:39 +0100
Subject: [PATCH 0155/2040] Fixed int conversion when printing the awareness

---
 code/fgame/actorenemy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index f339e680..5c83595f 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -389,7 +389,7 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
                     "ent #%3i: enemy #%i: awareness = %5.1f%%, threat = %i\n",
                     pSelf->entnum,
                     pActorEnemy->GetEnemy()->entnum,
-                    (fVisibility * 100.0),
+                    (int)(fVisibility * 100.0),
                     0
                 );
             }

From eb993dbd4341e240169acfcd608eb852c64e5c2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:22:56 +0100
Subject: [PATCH 0156/2040] Fixed grenade toss location and wall facing

---
 code/fgame/actor.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 6a5ca672..2d7630c7 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -9823,7 +9823,7 @@ void Actor::GenericGrenadeTossThink(void)
     eGrenadeTossMode eGrenadeMode;
 
     if (m_Enemy && level.inttime >= m_iStateTime + 200) {
-        if (CanGetGrenadeFromAToB(origin, m_Enemy->velocity - m_Enemy->origin, false, &vGrenadeVel, &eGrenadeMode)) {
+        if (CanGetGrenadeFromAToB(origin, m_Enemy->origin + m_Enemy->velocity, false, &vGrenadeVel, &eGrenadeMode)) {
             m_vGrenadeVel  = vGrenadeVel;
             m_eGrenadeMode = eGrenadeMode;
         }
@@ -10924,15 +10924,9 @@ void Actor::DontFaceWall(void)
 
     VectorSub2D(m_vDfwPos, origin, vDelta);
 
-    if (Square(fErrorLerp * -14.0 + 16.0) > VectorLength2DSquared(vDelta)) {
-        if (AvoidingFacingWall()) {
-            SetDesiredYaw(m_fDfwDerivedYaw);
-        }
-        return;
-    }
-
-    if (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0
-        && fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0) {
+    if (Square(fErrorLerp * -14.0 + 16.0) > VectorLength2DSquared(vDelta) &&
+        (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0
+            || fabs(AngleNormalize180(m_fDfwDerivedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0)) {
         if (AvoidingFacingWall()) {
             SetDesiredYaw(m_fDfwDerivedYaw);
         }

From 1e5e5e24f68034da0932242d9fb01016fdae772c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:23:06 +0100
Subject: [PATCH 0157/2040] Fixed entity monitoring never printing

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 904cd28a..8d6b5d92 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5467,7 +5467,7 @@ void Entity::MPrintf(const char *fmt, ...)
     va_list argptr;
     char    msg[MAXPRINTMSG];
 
-    if (g_monitorNum->integer == entnum && g_monitor->string == targetname) {
+    if (g_monitorNum->integer == entnum || g_monitor->string == targetname) {
         va_start(argptr, fmt);
         Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);

From 03ceaf82ce4f88fb138e0eb041f3c95e3b122b42 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:23:47 +0100
Subject: [PATCH 0158/2040] Fixed AngleMod() being inaccurate

This caused issues with Actor never finishing turning (because it expected the desired yaw to be at the exact same angle rounded by 0.001)
---
 code/qcommon/q_math.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index a09fc656..1459f69a 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -1108,7 +1108,11 @@ void AnglesSubtract( vec3_t v1, vec3_t v2, vec3_t v3 ) {
 
 
 float	AngleMod(float a) {
-	a = (360.0/65536) * ((int)(a*(65536/360.0)) & 65535);
+	if (a >= 360) {
+		return a - 360 * (int)(a / 360.0);
+	} else if (a < 0) {
+		return 360 * ((int)(-a / 360) + 1) + a;
+	}
 	return a;
 }
 

From 0f37a8f6ea0e497c0f560ed38159d68e06c3d628 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:42:54 +0100
Subject: [PATCH 0159/2040] Fixed m_fLeashSquared initialization

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 2d7630c7..fc49017d 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2792,7 +2792,7 @@ Actor::Actor()
     m_fMaxDistance        = 1024;
     m_fMaxDistanceSquared = Square(m_fMaxDistanceSquared);
     m_fLeash              = 512;
-    m_fLeashSquared       = Square(m_fLeashSquared);
+    m_fLeashSquared       = Square(m_fLeash);
 
     m_iEyeUpdateTime = level.inttime;
     if (m_iEyeUpdateTime < 1000) {

From bc0d373dcdafcf30937905df93a1bbcf6d4b52f8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 17:37:28 +0100
Subject: [PATCH 0160/2040] Fixed AI getting blocked because of an obstacle

---
 code/fgame/actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index fc49017d..8ac5fd17 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -5400,8 +5400,6 @@ void Actor::MovePath(float fMoveSpeed)
             } else {
                 m_iWallDodgeTimeout = level.inttime + 1000;
             }
-
-            GetMoveInfo(&mm);
         } else {
             if (m_WallDir >= 0) {
                 mm.desired_dir[0] = mm.obstacle_normal[1];
@@ -5418,6 +5416,8 @@ void Actor::MovePath(float fMoveSpeed)
                 m_iWallDodgeTimeout = 0;
             }
         }
+
+        GetMoveInfo(&mm);
     }
 }
 

From 45108c6f4b888243860b962d518b74896bc8e38a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 17:38:06 +0100
Subject: [PATCH 0161/2040] Fixed curious' finished animation global function

This fixes AI being permanently stuck in a curious animation
---
 code/fgame/actor_curious.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor_curious.cpp b/code/fgame/actor_curious.cpp
index ba1720ea..fdaab297 100644
--- a/code/fgame/actor_curious.cpp
+++ b/code/fgame/actor_curious.cpp
@@ -31,7 +31,7 @@ void Actor::InitCurious(GlobalFuncs_t *func)
     func->EndState                   = &Actor::End_Curious;
     func->ResumeState                = &Actor::Resume_Curious;
     func->SuspendState               = &Actor::Suspend_Curious;
-    func->FinishedAnimation          = &Actor::FinishedAnimation_Cover;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Curious;
     func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Curious;
     func->IsState                    = &Actor::IsCuriousState;
 }

From 5e461786f9f94521ef4038e85514e1960f394ee9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:15:54 +0100
Subject: [PATCH 0162/2040] Added a comment about FriendlyInLineOfFire

---
 code/fgame/actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 8ac5fd17..c0c54567 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -3879,6 +3879,7 @@ bool Actor::CanShoot(Entity *ent)
     Vector vGunPos;
 
     if (FriendlyInLineOfFire(ent)) {
+        // This check was added in 2.0
         bCanShoot = false;
     } else if (ent->IsSubclassOfSentient()) {
         Sentient *sen = static_cast<Sentient *>(ent);

From a4003dd61cd406ab5b4029b4fe6e6b7ea27916a5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:16:52 +0100
Subject: [PATCH 0163/2040] Only execute anim/suppress.scr if targeting 2.0 and
 above

---
 code/fgame/actor_turret.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor_turret.cpp b/code/fgame/actor_turret.cpp
index c4e48fff..6b315cb0 100644
--- a/code/fgame/actor_turret.cpp
+++ b/code/fgame/actor_turret.cpp
@@ -233,6 +233,7 @@ void Actor::Turret_BeginRetarget(void)
     SetEnemyPos(m_Enemy->origin);
     AimAtEnemyBehavior();
 
+    // Was ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE before 2.0
     TransitionState(ACTOR_STATE_TURRET_RETARGET_SUPPRESS, 0);
 }
 
@@ -307,7 +308,9 @@ void Actor::State_Turret_Shoot(void)
     }
 
     AimAtTargetPos();
-    Anim_Suppress();
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        Anim_Suppress();
+    }
 
     if (level.inttime >= m_iStateTime + 15000) {
         Turret_SelectState();

From 651b86b066803ab7b492d69b5059814c40a81b30 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:23:00 +0100
Subject: [PATCH 0164/2040] Added comment for more clarity

---
 code/fgame/actor_turret.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor_turret.cpp b/code/fgame/actor_turret.cpp
index 6b315cb0..93dfbb3d 100644
--- a/code/fgame/actor_turret.cpp
+++ b/code/fgame/actor_turret.cpp
@@ -233,7 +233,9 @@ void Actor::Turret_BeginRetarget(void)
     SetEnemyPos(m_Enemy->origin);
     AimAtEnemyBehavior();
 
-    // Was ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE before 2.0
+    // Replaced in 2.0
+    //  Use the Retarget_Suppress state instead of the Retarget_Sniper_Node state
+    //TransitionState(ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE, 0);
     TransitionState(ACTOR_STATE_TURRET_RETARGET_SUPPRESS, 0);
 }
 

From ceb901e9ca30e27d5b506f962d727ffd352b4817 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 18:32:06 +0100
Subject: [PATCH 0165/2040] Fixed disconnected menu not being pushed properly

---
 code/client/cl_cgame.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 13471caa..238fed26 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -358,7 +358,9 @@ qboolean CL_ProcessServerCommand(const char* origString, const char* cmd, qboole
 		// because this function might be called from a module that would be unloaded
 		// inside Com_Error
         UI_ForceMenuOff(1);
-        Cbuf_AddText("disconnect;pushmenu disconnected");
+		// Fixed in OPM
+		//  Added a newline for next commands
+        Cbuf_AddText("disconnect;pushmenu disconnected\n");
         return qtrue;
     }
 

From 07ec6adecb7ddb3f4b4ee5ce2a98b2804ec9cef8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 18:40:34 +0100
Subject: [PATCH 0166/2040] Fixed ViewJitter never being removed

---
 code/fgame/earthquake.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/earthquake.cpp b/code/fgame/earthquake.cpp
index 4d008b6a..835e5603 100644
--- a/code/fgame/earthquake.cpp
+++ b/code/fgame/earthquake.cpp
@@ -133,7 +133,7 @@ ViewJitter::ViewJitter()
 
 	m_fDuration = 0;
 
-	m_bDoneDeath = qfalse;
+	m_bDoneDeath = false;
 }
 
 ViewJitter::ViewJitter( Vector vOrigin, float fRadius, float fEdgeEffect, Vector vStrength, float fDuration, Vector vTimeDecay, float fStartDecay )
@@ -154,7 +154,7 @@ ViewJitter::ViewJitter( Vector vOrigin, float fRadius, float fEdgeEffect, Vector
 
 	m_fDuration = fDuration;
 
-	m_bDoneDeath = false;
+	m_bDoneDeath = true;
 	m_fTimeRunning = 0;
 
 	PostEvent( EV_ViewJitter_Think, fStartDecay );

From a5c6654dcb84990298fe585a05dcc1c81892f866 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 19:22:19 +0100
Subject: [PATCH 0167/2040] Fixed m_fMaxDistanceSquared initialization value

---
 code/fgame/actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index c0c54567..5d617752 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2790,7 +2790,7 @@ Actor::Actor()
     m_fMinDistance        = 128;
     m_fMinDistanceSquared = Square(m_fMinDistance);
     m_fMaxDistance        = 1024;
-    m_fMaxDistanceSquared = Square(m_fMaxDistanceSquared);
+    m_fMaxDistanceSquared = Square(m_fMaxDistance);
     m_fLeash              = 512;
     m_fLeashSquared       = Square(m_fLeash);
 
@@ -2848,7 +2848,7 @@ Actor::Actor()
 
     m_iNextDisguiseTime       = 1;
     m_iDisguisePeriod         = 30000;
-    m_fMaxDisguiseDistSquared = 256 * 256;
+    m_fMaxDisguiseDistSquared = Square(256);
     m_iDisguiseLevel          = 1;
 
     m_patrolCurrentNode   = NULL;

From 33b403d6eb46047b12cf5d41f9f485a30f05417c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 19:58:29 +0100
Subject: [PATCH 0168/2040] Fixed MASK_CANSEE

---
 code/fgame/bg_public.h | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 091508b7..e9af867f 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -617,20 +617,21 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX        \
      | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_UNKNOWN3 | CONTENTS_FENCE | CONTENTS_BODY | CONTENTS_CORPSE \
      | CONTENTS_TRIGGER)
-#define MASK_FOOTSHADOW   (CONTENTS_FENCE | CONTENTS_SLIME | CONTENTS_LAVA | CONTENTS_SOLID)
-#define MASK_PLAYERSTART  (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
-#define MASK_VIEWSOLID    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_TRIGGER)
-#define MASK_DEADSOLID    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_CORPSE | CONTENTS_NOTTEAM2 | CONTENTS_FENCE)
-#define MASK_MONSTERSOLID (CONTENTS_SOLID | CONTENTS_MONSTERCLIP | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
-#define MASK_WATER        (CONTENTS_WATER | CONTENTS_LAVA | CONTENTS_SLIME)
-#define MASK_OPAQUE       (CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA)
+#define MASK_FOOTSHADOW  (CONTENTS_FENCE | CONTENTS_SLIME | CONTENTS_LAVA | CONTENTS_SOLID)
+#define MASK_PLAYERSTART (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
+#define MASK_VIEWSOLID   (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_TRIGGER)
+#define MASK_DEADSOLID   (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_CORPSE | CONTENTS_NOTTEAM2 | CONTENTS_FENCE)
+#define MASK_MONSTERSOLID \
+    (CONTENTS_SOLID | CONTENTS_MONSTERCLIP | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
+#define MASK_WATER  (CONTENTS_WATER | CONTENTS_LAVA | CONTENTS_SLIME)
+#define MASK_OPAQUE (CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA)
 #define MASK_SHOT                                                                                                   \
     (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP \
      | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_SHOT_TRIG                                                                                               \
     (CONTENTS_SOLID | CONTENTS_CLAYPIDGEON | CONTENTS_WATER | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
-#define MASK_SHOT_FLUID                                                                                             \
+#define MASK_SHOT_FLUID                                                                                        \
     (CONTENTS_SOLID | CONTENTS_WATER | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE \
      | CONTENTS_WEAPONCLIP | CONTENTS_SHOOTONLY | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_PROJECTILE                                                                                           \
@@ -654,13 +655,14 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_VEHICLECLIP \
      | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_VEHICLE_TIRES (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_FENCE | CONTENTS_VEHICLECLIP | CONTENTS_TRIGGER)
-#define MASK_CLICK (CONTENTS_VEHICLECLIP | CONTENTS_WEAPONCLIP | CONTENTS_MONSTERCLIP | CONTENTS_PLAYERCLIP | CONTENTS_SOLID)
-#define MASK_CANSEE \
-    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
+#define MASK_CLICK \
+    (CONTENTS_VEHICLECLIP | CONTENTS_WEAPONCLIP | CONTENTS_MONSTERCLIP | CONTENTS_PLAYERCLIP | CONTENTS_SOLID)
+#define MASK_CANSEE                                                                                           \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
 #define MASK_ITEM          (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
-#define MASK_TRANSITION \
-    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_NOTTEAM1 | CONTENTS_WEAPONCLIP)
+#define MASK_TRANSITION    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
 #define MASK_TARGETPATH \
     (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_MONSTERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
 #define MASK_ACTORPATH (CONTENTS_SOLID | CONTENTS_FENCE | CONTENTS_MONSTERCLIP | CONTENTS_TRIGGER)

From 4fa457118f62a80aeeb591a4f731efe95eb47c2d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:06:35 +0100
Subject: [PATCH 0169/2040] Fixed CanMovePathWithLeash() not returning the
 correct result

---
 code/fgame/actor.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 5d617752..af49f1f1 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -10076,11 +10076,8 @@ bool Actor::CanMovePathWithLeash(void) const
     }
 
     VectorSub2D(origin, m_vHome, delta);
-    if (VectorLength2DSquared(delta) >= m_fLeashSquared) {
-        return true;
-    }
-
-    if (DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
+    if (VectorLength2DSquared(delta) >= m_fLeashSquared
+        && DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
         return false;
     }
 

From c4855029a9cc6ab97ab6331736802144735885cf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:22:44 +0100
Subject: [PATCH 0170/2040] Fixed motion facing

---
 code/fgame/actor.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index af49f1f1..19ecc979 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8448,11 +8448,14 @@ void Actor::FaceEnemyOrMotion(int iTimeIntoMove)
         return;
     }
 
-    if (vDelta[0] >= 15 || vDelta[0] <= -15 || vDelta[1] >= 15 || vDelta[1] <= -15) {
-        vDelta[0] = -vDelta[0];
-        vDelta[1] = -vDelta[1];
-        FaceDirectionDuringMotion(vDelta);
+    if (vDelta[0] < 15 && vDelta[0] > -15 && vDelta[1] < 15 && vDelta[1] > -15) {
+        FaceMotion();
+        return;
     }
+
+    vDelta[0] = -vDelta[0];
+    vDelta[1] = -vDelta[1];
+    FaceDirectionDuringMotion(vDelta);
 }
 
 /*
@@ -8547,10 +8550,12 @@ void Actor::FaceMotion(void)
         VectorCopy2D(velocity, dir);
         VectorSub2D(origin, m_vOriginHistory[m_iCurrentHistory], vDelta);
 
-        if (VectorLength2DSquared(vDelta) >= 1 && DotProduct2D(velocity, vDelta) > 0) {
+        if (VectorLength2DSquared(vDelta) >= 1 && DotProduct2D(vDelta, dir) > 0) {
             VectorCopy2D(vDelta, dir);
         }
 
+        dir[2] = 0;
+
         if (m_ThinkState == THINKSTATE_IDLE) {
             IdleLook(dir);
         } else {

From 1533c02a41b23feb54c018f8d5aca3f3833993dc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:32:57 +0100
Subject: [PATCH 0171/2040] Fixed cover hide

---
 code/fgame/actor_cover.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor_cover.cpp b/code/fgame/actor_cover.cpp
index 97701778..456f2efc 100644
--- a/code/fgame/actor_cover.cpp
+++ b/code/fgame/actor_cover.cpp
@@ -79,7 +79,7 @@ bool Actor::Cover_SetPath(PathNode *node)
     fPathDist       = PathDist();
     fMinDistSquared = Square(fPathDist);
 
-    if ((node->origin - origin).lengthSquared() <= fMinDistSquared * 4.0f && fPathDist > 128.0f) {
+    if ((node->origin - origin).lengthSquared() * 4 <= fMinDistSquared && fPathDist > 128.0f) {
         return false;
     }
 
@@ -343,7 +343,7 @@ void Actor::State_Cover_Hide(void)
     bool      bCanShoot, bCanSee;
 
     if (m_Enemy) {
-        SetEnemyPos(origin);
+        SetEnemyPos(m_Enemy->origin);
     }
 
     if (!m_pCoverNode) {

From e450156bf7e63520488837241283869ab0933185 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:46:43 +0100
Subject: [PATCH 0172/2040] Fixed path goal movement

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 19ecc979..6d97726b 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -5459,7 +5459,7 @@ void Actor::MovePathGoal(float fMoveSpeed)
                 m_eAnimMode = ANIM_MODE_NORMAL;
             }
         }
-    } else if (fDeltaSquareLen < Square(fMoveSpeed * 0.5f)) {
+    } else if (fDeltaSquareLen < fMoveSpeed * Square(0.5f)) {
         fTimeToGo       = 0.5f;
         m_fPathGoalTime = level.time + fTimeToGo;
         if (m_csPathGoalEndAnimScript == STRING_EMPTY) {

From aab24260e27a46837a708ffe0cc4572e135ed90f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:47:54 +0100
Subject: [PATCH 0173/2040] FriendlyInLineOfFire should return false below 2.0

---
 code/fgame/actor.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 6d97726b..5c46fe70 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -4009,6 +4009,10 @@ bool Actor::FriendlyInLineOfFire(Entity *other)
     Vector delta;
     float  inverseDot;
 
+    if (g_target_game <= target_game_e::TG_MOH) {
+        return false;
+    }
+
     delta      = other->origin - origin;
     inverseDot = 1.0 / (delta * delta);
 
@@ -4022,7 +4026,7 @@ bool Actor::FriendlyInLineOfFire(Entity *other)
             Vector org;
 
             org = squadDot * inverseDot * delta - squadDelta;
-            if (org * org >= 4096) {
+            if (org * org >= Square(64)) {
                 return true;
             }
         }

From c9f2603692660b5fccf074180c69dae6ee5aa3bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:48:11 +0100
Subject: [PATCH 0174/2040] Don't suppress below 2.0

---
 code/fgame/actor_turret.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/code/fgame/actor_turret.cpp b/code/fgame/actor_turret.cpp
index 93dfbb3d..8db46a58 100644
--- a/code/fgame/actor_turret.cpp
+++ b/code/fgame/actor_turret.cpp
@@ -235,8 +235,11 @@ void Actor::Turret_BeginRetarget(void)
 
     // Replaced in 2.0
     //  Use the Retarget_Suppress state instead of the Retarget_Sniper_Node state
-    //TransitionState(ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE, 0);
-    TransitionState(ACTOR_STATE_TURRET_RETARGET_SUPPRESS, 0);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        TransitionState(ACTOR_STATE_TURRET_RETARGET_SUPPRESS, 0);
+    } else {
+        TransitionState(ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE, 0);
+    }
 }
 
 void Actor::Turret_NextRetarget(void)
@@ -290,30 +293,31 @@ void Actor::Turret_SideStep(int iStepSize, vec3_t vDir)
     AimAtEnemyBehavior();
     StrafeToAttack(iStepSize, vDir);
 
-    if (!PathExists() || PathComplete() || !PathAvoidsSquadMates()) {
-        StrafeToAttack(-iStepSize, vDir);
+    if (PathExists() && !PathComplete() && PathAvoidsSquadMates()) {
+        TransitionState(ACTOR_STATE_TURRET_REACQUIRE);
+        return;
     }
 
+    StrafeToAttack(-iStepSize, vDir);
+
     if (PathExists() && !PathComplete() && PathAvoidsSquadMates()) {
         TransitionState(ACTOR_STATE_TURRET_REACQUIRE);
-    } else {
-        Turret_NextRetarget();
+        return;
     }
+
+    Turret_NextRetarget();
 }
 
 void Actor::State_Turret_Shoot(void)
 {
+    assert(g_target_game > target_game_e::TG_MOH);
+
     if (CanSeeEnemy(200) || FriendlyInLineOfFire(m_Enemy)) {
         TransitionState(ACTOR_STATE_TURRET_COMBAT);
         State_Turret_Combat();
         return;
     }
 
-    AimAtTargetPos();
-    if (g_target_game >= target_game_e::TG_MOHTA) {
-        Anim_Suppress();
-    }
-
     if (level.inttime >= m_iStateTime + 15000) {
         Turret_SelectState();
         if (m_State == ACTOR_STATE_TURRET_SHOOT) {
@@ -326,6 +330,8 @@ void Actor::State_Turret_Retarget_Suppress(void)
 {
     trace_t trace;
 
+    assert(g_target_game > target_game_e::TG_MOH);
+
     if (rand() % 100 >= m_iSuppressChance) {
         AimAtEnemyBehavior();
         Turret_NextRetarget();

From efc1354dcb5105088255f8d77124795fe7fd65a8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:58:08 +0100
Subject: [PATCH 0175/2040] Fixed entity monitoring always used

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 8d6b5d92..3b9156dc 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5467,7 +5467,7 @@ void Entity::MPrintf(const char *fmt, ...)
     va_list argptr;
     char    msg[MAXPRINTMSG];
 
-    if (g_monitorNum->integer == entnum || g_monitor->string == targetname) {
+    if (g_monitorNum->integer == entnum || g_monitor->string[0] && g_monitor->string == targetname) {
         va_start(argptr, fmt);
         Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);

From abfdac59ba132b02f5490d229ecc93127c20fabf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 15 Feb 2024 00:21:01 +0100
Subject: [PATCH 0176/2040] Make aiMaxDeviation only supported on 2.0 and above

---
 code/fgame/actor.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 5c46fe70..600e02a6 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -10150,12 +10150,14 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     Vector dir = mTargetPos - EyePosition();
     dir.normalize();
 
-    if (DotProduct2D(forward, dir) < aiMaxDeviation->value) {
-        Vector vOut;
+    if (g_target_game > target_game_e::TG_MOH) {
+        if (DotProduct2D(forward, dir) < aiMaxDeviation->value) {
+            Vector vOut;
 
-        VectorMA(position, 2048, forward, vOut);
+            VectorMA(position, 2048, forward, vOut);
 
-        return vOut;
+            return vOut;
+        }
     }
 
     if (mTargetPos == vec_zero) {

From 373a35acf0dc4d48db4c0eff776183e9b72d0bc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 15 Feb 2024 20:23:17 +0100
Subject: [PATCH 0177/2040] Fixed target trigger being triggered by itself

---
 code/fgame/vehicle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index f9795501..123fbc92 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6923,7 +6923,7 @@ void DrivableVehicle::Killed(Event *ev)
     if (name && strcmp(name, "")) {
         for (ent = G_FindTarget(NULL, name); ent; ent = G_FindTarget(ent, name)) {
             event = new Event(EV_Activate);
-            event->AddEntity(ent);
+            event->AddEntity(attacker);
             ent->ProcessEvent(event);
         }
     }

From fdf1dac618a1e1f7b71c9956519768504adb6bab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 15 Feb 2024 20:23:46 +0100
Subject: [PATCH 0178/2040] Wrong condition for SetDesiredYawDest (should set
 only if values are non-zero)

---
 code/fgame/simpleactor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/simpleactor.h b/code/fgame/simpleactor.h
index 873a8885..4aea2112 100644
--- a/code/fgame/simpleactor.h
+++ b/code/fgame/simpleactor.h
@@ -469,7 +469,7 @@ inline void SimpleActor::SetDesiredYawDest(const vec3_t vec)
     vec2_t facedir;
     VectorSub2D(vec, origin, facedir);
 
-    if (!facedir[0] || !facedir[1]) {
+    if (facedir[0] || facedir[1]) {
         SetDesiredYawDir(facedir);
     }
 }

From 60f6bb17e31fe416533c7a6189ac23d65d1ca31c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 15 Feb 2024 20:40:55 +0100
Subject: [PATCH 0179/2040] Fixed AI parameters not fixing AI parameters

---
 code/fgame/actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 600e02a6..f24d9204 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8004,8 +8004,8 @@ void Actor::FixAIParameters(void)
     if (m_pTetherEnt) {
         fMinLeash = 64;
         if (m_pTetherEnt->IsSubclassOfEntity()) {
-            fMinLeash =
-                m_pTetherEnt->angles.y - m_pTetherEnt->origin.y + m_pTetherEnt->angles.z + m_pTetherEnt->origin.z;
+            Entity* pEnt = static_cast<Entity*>(m_pTetherEnt.Pointer());
+            fMinLeash = pEnt->maxs[0] - pEnt->mins[1] + pEnt->maxs[1] - pEnt->mins[1];
         }
 
         if (m_fLeash < fMinLeash) {

From f46078965d1b3c95130fd0cc9f28f4e372044d69 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 15 Feb 2024 21:15:37 +0100
Subject: [PATCH 0180/2040] info_null must inherits from Listener instead of
 Entity

This fixes Level::AllocEdict issues on some maps that use it a lot (like t2l4) #206
---
 code/fgame/misc.cpp | 2 +-
 code/fgame/misc.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index c2e95139..2165c049 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -91,7 +91,7 @@ Used as a positional target for spotlights, etc.
 
 ******************************************************************************/
 
-CLASS_DECLARATION(Entity, InfoNull, "info_null") {
+CLASS_DECLARATION(Listener, InfoNull, "info_null") {
     {NULL, NULL}
 };
 
diff --git a/code/fgame/misc.h b/code/fgame/misc.h
index 924fad3b..f164c072 100644
--- a/code/fgame/misc.h
+++ b/code/fgame/misc.h
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "mover.h"
 #include "animate.h"
 
-class InfoNull : public Entity
+class InfoNull : public Listener
 {
 public:
     CLASS_PROTOTYPE(InfoNull);

From bd999a6d9c18ac120889bfd409db15f3c9ac7fec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:48:23 +0100
Subject: [PATCH 0181/2040] Fixed Trace's pass_entities parameter (didn't
 properly ignore entities)

---
 code/fgame/scriptthread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index be8438a9..a5f74957 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -3759,7 +3759,7 @@ void ScriptThread::EventTrace(Event *ev)
         mins = ev->GetVector(4);
     case 3:
         if (ev->GetInteger(3)) {
-            content_mask = MASK_SOLID;
+            content_mask &= ~MASK_SCRIPT_SLAVE;
         }
     case 2:
         end = ev->GetVector(2);

From 8a3b62e93fb8acf0e062589554ba70d2d1b70f17 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 16 Feb 2024 23:50:57 +0100
Subject: [PATCH 0182/2040] Fixed targetname error

---
 code/script/scriptvm.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 1f9e6cff..c3251dd2 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1794,12 +1794,13 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 targetList = world->GetExistingTargetList(m_VMStack.GetTop().constStringValue());
 
                 if (!targetList || !targetList->NumObjects()) {
+                    str targetname = m_VMStack.GetTop().stringValue();
                     // the target name was not found
                     m_VMStack.GetTop().setListenerValue(NULL);
 
                     if ((*m_CodePos >= OP_BIN_EQUALITY && *m_CodePos <= OP_BIN_GREATER_THAN_OR_EQUAL)
                         || (*m_CodePos >= OP_BOOL_UN_NOT && *m_CodePos <= OP_UN_CAST_BOOLEAN)) {
-                        ScriptError("Targetname '%s' does not exist.", m_VMStack.GetTop().stringValue().c_str());
+                        ScriptError("Targetname '%s' does not exist.", targetname.c_str());
                     }
                 } else if (targetList->NumObjects() == 1) {
                     // single listener

From 6ba9f2655cc9af09ec3ac13cdf6a4b7fafca1cdd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 16 Feb 2024 23:51:34 +0100
Subject: [PATCH 0183/2040] Call PostSpawn after constructing the health
 instance

---
 code/fgame/health.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/health.cpp b/code/fgame/health.cpp
index 5af8fd15..eeaaec6a 100644
--- a/code/fgame/health.cpp
+++ b/code/fgame/health.cpp
@@ -44,12 +44,18 @@ SafePtr<Health> Health::mHealthQueue[MAX_HEALTH_QUEUE];
 
 Health::Health()
 {
+    if (LoadingSavegame) {
+        return;
+    }
+
     if (DM_FLAG(DF_NO_HEALTH)) {
         PostEvent(EV_Remove, EV_REMOVE);
         return;
     }
 
     setAmount(20);
+
+    PostEvent(EV_Health_PostSpawn, EV_POSTSPAWN);
 }
 
 void Health::PickupHealth(Event *ev)

From 776012fedfa82c000aeade4c33723331f6d9b88b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 16 Feb 2024 23:52:25 +0100
Subject: [PATCH 0184/2040] Health must have a targetname by default in 2.0 and
 above

---
 code/fgame/health.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/health.cpp b/code/fgame/health.cpp
index eeaaec6a..87e05825 100644
--- a/code/fgame/health.cpp
+++ b/code/fgame/health.cpp
@@ -55,6 +55,10 @@ Health::Health()
 
     setAmount(20);
 
+    // Added in 2.0
+    //  Set the targetname to health by default
+    SetTargetName("health");
+
     PostEvent(EV_Health_PostSpawn, EV_POSTSPAWN);
 }
 

From 685dc0336a8c03c98519d23661d7e37a7e241ee1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:05:39 +0100
Subject: [PATCH 0185/2040] Corrected loop ordering

---
 code/fgame/navigate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 4d786a95..b7b76eb9 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -1041,8 +1041,8 @@ void PathSearch::ResetNodes(void)
         }
     }
 
-    for (x = PATHMAP_GRIDSIZE - 1; x >= 0; x--) {
-        for (y = PATHMAP_GRIDSIZE - 1; y >= 0; y--) {
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++){
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
             PathMap[x][y].numnodes = 0;
             PathMap[x][y].nodes    = NULL;
         }

From 03943a23ac2ef836f56284fb39ac0702b1257874 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 17 Feb 2024 20:10:00 +0100
Subject: [PATCH 0186/2040] Fixed badplace and run and shoot think never
 working

---
 code/fgame/actor.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index f24d9204..e7344e3d 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2685,7 +2685,12 @@ const_str            Actor::m_csThinkNames[NUM_THINKS] = {
     STRING_BALCONY_KILLED,
     STRING_WEAPONLESS,
     STRING_NOCLIP,
-    STRING_DEAD};
+    STRING_DEAD,
+    // Added in 2.0
+    STRING_BADPLACE,
+    // Added in 2.30
+    STRING_RUNANDSHOOT
+};
 const_str Actor::m_csThinkStateNames[NUM_THINKSTATES] = {
     STRING_VOID,
     STRING_IDLE,
@@ -2695,7 +2700,9 @@ const_str Actor::m_csThinkStateNames[NUM_THINKSTATES] = {
     STRING_CURIOUS,
     STRING_DISGUISE,
     STRING_GRENADE,
-    STRING_NOCLIP};
+    STRING_BADPLACE, // Added in 2.0
+    STRING_NOCLIP
+};
 
 SafePtr<Actor> Actor::mBodyQueue[MAX_BODYQUEUE];
 int            Actor::mCurBody;
@@ -4080,7 +4087,7 @@ void Actor::ShowInfo(void)
 {
     Com_Printf("-------------------------------------------------------------------------------\n");
     Com_Printf("Info for Actor:\n");
-    Com_Printf("Current think type: %s %s\n", ThinkName().c_str(), ThinkStateName().c_str());
+    Com_Printf("Current think type: %s %s\n", ThinkStateName().c_str(), ThinkName().c_str());
     Com_Printf("leash: %f\n", m_fLeash);
     Com_Printf("mindist: %f\n", m_fMinDistance);
     Com_Printf("maxdist: %f\n", m_fMaxDistance);

From a770df1e0b6d0156ebf427013006a4f3174bb3e5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 17 Feb 2024 20:10:17 +0100
Subject: [PATCH 0187/2040] Fixed path not found spam

---
 code/fgame/simpleactor.cpp | 58 +++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp
index 7c4aecf6..ad76f12e 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -187,30 +187,42 @@ void SimpleActor::SetPath(
     m_Path.FindPath(origin, vDestPos, this, 0.0, vLeashHome, fLeashDistSquared);
 
     if (!PathExists()) {
-        if (g_patherror->integer && description
-            && (g_patherror->integer
-                || g_patherror->integer == 2
-                       && (static_cast<Actor *>(this)->m_ThinkState == THINKSTATE_IDLE
-                           || static_cast<Actor *>(this)->m_ThinkState == THINKSTATE_CURIOUS)
-                       && m_bPathErrorTime + 5000 < level.inttime)) {
-            m_bPathErrorTime = level.inttime;
-
-            Com_Printf(
-                "^~^~^ Path not found in '%s' for (entnum %d, radnum %d, targetname '%s') from (%f %f "
-                "%f) to (%f %f %f)\n",
-                description,
-                entnum,
-                radnum,
-                targetname.c_str(),
-                origin.x,
-                origin.y,
-                origin.z,
-                vDestPos.x,
-                vDestPos.y,
-                vDestPos.z
-            );
-            Com_Printf("Reason: %s\n", PathSearch::last_error);
+        if (!g_patherror->integer || !description) {
+            return;
         }
+
+        if (g_patherror->integer != 1 && g_patherror->integer != 2) {
+            return;
+        }
+
+        if (g_patherror->integer == 2) {
+            int thinkState = static_cast<Actor*>(this)->m_ThinkState;
+            if (thinkState != THINKSTATE_IDLE && thinkState != THINKSTATE_CURIOUS) {
+                return;
+            }
+        }
+
+        if (m_bPathErrorTime + 5000 >= level.inttime) {
+            return;
+        }
+
+        m_bPathErrorTime = level.inttime;
+
+        Com_Printf(
+            "^~^~^ Path not found in '%s' for (entnum %d, radnum %d, targetname '%s') from (%f %f "
+            "%f) to (%f %f %f)\n",
+            description,
+            entnum,
+            radnum,
+            targetname.c_str(),
+            origin.x,
+            origin.y,
+            origin.z,
+            vDestPos.x,
+            vDestPos.y,
+            vDestPos.z
+        );
+        Com_Printf("Reason: %s\n", PathSearch::last_error);
     }
 }
 

From 5521cf9ab39b7db44f610be970fa60e06f7bd9f8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 18 Feb 2024 20:10:18 +0100
Subject: [PATCH 0188/2040] Fixed m_fMaxSpeed being always set to 250

---
 code/fgame/vehicle.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 123fbc92..0baedf59 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3375,7 +3375,7 @@ void Vehicle::EventDriveInternal(Event *ev, bool wait)
     m_fLookAhead     = 256;
     m_fIdealAccel    = 35;
     m_fIdealSpeed    = 250;
-    m_fMaxSpeed      = 250;
+    m_fMaxSpeed      = 250; // Added in 2.30
 
     switch (ev->NumArgs()) {
     case 6:
@@ -3388,6 +3388,7 @@ void Vehicle::EventDriveInternal(Event *ev, bool wait)
         m_fIdealAccel = ev->GetFloat(3);
     case 2:
         m_fIdealSpeed = ev->GetFloat(2);
+        m_fMaxSpeed = m_fIdealSpeed;// Added in 2.30
     case 1:
         path = ev->GetSimpleEntity(1);
         if (!path) {
@@ -4088,21 +4089,22 @@ void Vehicle::SlidePush(Vector vPush)
             if (j == i && other->entity) {
                 other->entity->CheckGround();
 
-                if (other->entity->groundentity
-                    && (other->entity->groundentity == edict || other->entity == m_pCollisionEntity)) {
-                    // save the entity
-                    pSkippedEntities[iNumSkipped]  = other->entity;
-                    iContentsEntities[iNumSkipped] = other->r.contents;
-                    solidEntities[iNumSkipped]     = other->solid;
-                    iNumSkipped++;
+                if (other->entity->groundentity) {
+                    if (other->entity->groundentity == edict || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity) {
+                        // save the entity
+                        pSkippedEntities[iNumSkipped] = other->entity;
+                        iContentsEntities[iNumSkipped] = other->r.contents;
+                        solidEntities[iNumSkipped] = other->solid;
+                        iNumSkipped++;
 
-                    if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
-                        gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
-                        return;
+                        if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
+                            gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                            return;
+                        }
+
+                        other->entity->setSolidType(SOLID_NOT);
+                        iNumSkippedEntities++;
                     }
-
-                    other->entity->setSolidType(SOLID_NOT);
-                    iNumSkippedEntities++;
                 }
 
                 if (g_showvehiclemovedebug->integer) {

From 46cc00d66984985a02594d0f0c3bedd0a6704bd9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 18 Feb 2024 21:53:33 +0100
Subject: [PATCH 0189/2040] Set m_fMaxSpeed

---
 code/fgame/vehicle.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 0baedf59..33664086 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -1096,6 +1096,7 @@ Vehicle::Vehicle()
 
     m_bAutoPilot       = qfalse;
     m_fIdealSpeed      = 0;
+    m_fMaxSpeed        = 0;
     m_fIdealAccel      = 0;
     m_fIdealDistance   = 100;
     m_bBounceBackwards = false;

From 65b47a2b3a02390ec20f63170ab7dabee12481d8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 18 Feb 2024 21:54:18 +0100
Subject: [PATCH 0190/2040] Fixed AnimDone never being called

This fixes maps like e1l2 never starting because it waits for an anim to finish
---
 code/fgame/scriptslave.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 12956162..89157267 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1925,7 +1925,7 @@ void ScriptModel::SetAnimEvent(Event *ev)
 
         animnum = gi.Anim_NumForName(edict->tiki, animname);
         if (animnum >= 0) {
-            NewAnim(animnum);
+            NewAnim(animnum, EV_ScriptModel_AnimDone);
         }
     }
 }

From 10a8d13ade97158d9ca5a0efd9881c766ebf6170 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 18 Feb 2024 23:27:15 +0100
Subject: [PATCH 0191/2040] Added missing variables to archive

---
 code/fgame/vehicle.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 33664086..1d47f275 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6471,6 +6471,7 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveVector(&Corners[3]);
 
     arc.ArchiveBoolean(&drivable);
+    arc.ArchiveBoolean(&pathDrivable); // Added in 2.30
     arc.ArchiveBoolean(&locked);
     arc.ArchiveBoolean(&hasweapon);
     arc.ArchiveBoolean(&showweapon);
@@ -6478,6 +6479,11 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveBoolean(&jumpable);
 
     arc.ArchiveBoolean(&m_bMovementLocked);
+    arc.ArchiveBoolean(&m_bAnimMove); // Added in 2.0
+    arc.ArchiveBoolean(&m_bDamageSounds); // Added in 2.0
+    arc.ArchiveBoolean(&m_bRunSounds); // Added in 2.0
+    arc.ArchiveInteger(&m_iProjectileHitsRemaining); // Added in 2.30
+
     driver.Archive(arc);
     lastdriver.Archive(arc);
 
@@ -6714,6 +6720,8 @@ void Vehicle::Archive(Archiver& arc)
     m_sMoveGrid->Archive(arc);
 
     arc.ArchiveFloat(&m_fIdealSpeed);
+    arc.ArchiveFloat(&m_fMaxSpeed); // Added in 2.30
+    arc.ArchiveBool(&m_bBounceBackwards); // Added in 2.30
     arc.ArchiveVector(&m_vIdealPosition);
     arc.ArchiveVector(&m_vIdealDir);
     arc.ArchiveFloat(&m_fIdealAccel);
@@ -6727,6 +6735,10 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveSafePointer(&m_pVehicleSoundEntities[1]);
     arc.ArchiveSafePointer(&m_pVehicleSoundEntities[2]);
     arc.ArchiveSafePointer(&m_pVehicleSoundEntities[3]);
+
+    // Added in 2.30
+    arc.ArchiveFloat(&m_fMaxUseAngle);
+    arc.ArchiveBool(&m_bBounceStayFullSpeed);
 }
 
 /*

From 7956746b65587086cfa6cde708439638fb1226bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 19:23:27 +0100
Subject: [PATCH 0192/2040] Fixed inward sphere argument: the argument should
 be optional

See #209
---
 code/cgame/cg_commands.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 6103d7a9..30e45fda 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -2157,7 +2157,9 @@ void ClientGameCommandManager::SetInwardSphere(Event *ev)
     }
 
     m_spawnthing->cgd.flags |= T_INWARDSPHERE;
-    m_spawnthing->sphereRadius = ev->GetFloat(1);
+    if (ev->NumArgs() > 0) {
+        m_spawnthing->sphereRadius = ev->GetFloat(1);
+    }
 }
 
 //=============

From 1da41131101a443cded6a2c2154582becc157614 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 19:35:59 +0100
Subject: [PATCH 0193/2040] Added FuncLadder archive method

This fixes bug where ladder would get unusable after loading from save game (see #211)
---
 code/fgame/misc.cpp | 547 ++++++++++++++++++++++++++++++++++----------
 code/fgame/misc.h   |  14 +-
 2 files changed, 435 insertions(+), 126 deletions(-)

diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index 2165c049..333874f1 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -144,15 +144,62 @@ If PROJECTILES is set, the trigger will respond to projectiles (rockets, grenade
 #define ACCUMULATIVE (1 << 6)
 #define TWOSTAGE     (1 << 7)
 
-Event EV_ExplodingWall_StopRotating("stoprotating", EV_DEFAULT, NULL, NULL, "Stop rotating the wall.", EV_NORMAL);
-Event EV_ExplodingWall_OnGround(
-    "checkonground", EV_DEFAULT, NULL, NULL, "Check if exploding wall is on ground.", EV_NORMAL
+Event EV_ExplodingWall_StopRotating
+(
+    "stoprotating",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop rotating the wall.",
+    EV_NORMAL
 );
-Event EV_ExplodingWall_AngleSpeed("anglespeed", EV_DEFAULT, "f", "speed", "Set the angle speed.", EV_NORMAL);
-Event EV_ExplodingWall_LandRadius("land_radius", EV_DEFAULT, "f", "radius", "Set the land radius.", EV_NORMAL);
-Event EV_ExplodingWall_LandAngles("land_angles", EV_DEFAULT, "v", "angles", "Set the land angles.", EV_NORMAL);
-Event EV_ExplodingWall_BaseVelocity("base_velocity", EV_DEFAULT, "v", "velocity", "Set the base velocity.", EV_NORMAL);
-Event EV_ExplodingWall_RandomVelocity(
+Event EV_ExplodingWall_OnGround
+(
+    "checkonground",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Check if exploding wall is on ground.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_AngleSpeed
+(
+    "anglespeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the angle speed.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_LandRadius
+(
+    "land_radius",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the land radius.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_LandAngles
+(
+    "land_angles",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "Set the land angles.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_BaseVelocity
+(
+    "base_velocity",
+    EV_DEFAULT,
+    "v",
+    "velocity",
+    "Set the base velocity.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_RandomVelocity
+(
     "random_velocity",
     EV_DEFAULT,
     "v",
@@ -160,11 +207,33 @@ Event EV_ExplodingWall_RandomVelocity(
     "Set the amount of random variation of the base velocity.",
     EV_NORMAL
 );
-Event EV_ExplodingWall_SetDmg("dmg", EV_DEFAULT, "i", "dmg", "Set the damage from the exploding wall.", EV_NORMAL);
-Event EV_ExplodingWall_SetExplosions(
-    "explosions", EV_DEFAULT, "i", "explosions", "Set the number of explosions.", EV_NORMAL
+Event EV_ExplodingWall_SetDmg
+(
+    "dmg",
+    EV_DEFAULT,
+    "i",
+    "dmg",
+    "Set the damage from the exploding wall.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_SetExplosions
+(
+    "explosions",
+    EV_DEFAULT,
+    "i",
+    "explosions",
+    "Set the number of explosions.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_Setup
+(
+    "setup",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Initializes the exploding wall.",
+    EV_NORMAL
 );
-Event EV_ExplodingWall_Setup("setup", EV_CODEONLY, NULL, NULL, "Initializes the exploding wall.", EV_NORMAL);
 
 CLASS_DECLARATION(Trigger, ExplodingWall, "func_explodingwall") {
     {&EV_ExplodingWall_Setup,          &ExplodingWall::Setup         },
@@ -564,13 +633,26 @@ If NO_EFFECTS is set, the special effect will not happen and the teleport will b
 
 #define NO_EFFECTS (1 << 5)
 
-Event EV_Teleporter_Teleport("teleport", EV_CODEONLY, "e", "entity", "Teleports the entity to destination.", EV_NORMAL);
-
-Event EV_Teleporter_StopTeleport(
-    "stopteleport", EV_CODEONLY, "e", "entity", "Releases the entity at the end of the teleport.", EV_NORMAL
+Event EV_Teleporter_Teleport
+(
+    "teleport",
+    EV_CODEONLY,
+    "e",
+    "entity",
+    "Teleports the entity to destination.",
+    EV_NORMAL
 );
-
-Event EV_Teleporter_SetThread(
+Event EV_Teleporter_StopTeleport
+(
+    "stopteleport",
+    EV_CODEONLY,
+    "e",
+    "entity",
+    "Releases the entity at the end of the teleport.",
+    EV_NORMAL
+);
+Event EV_Teleporter_SetThread
+(
     "teleportthread",
     EV_CODEONLY,
     "s",
@@ -884,19 +966,35 @@ it waits until the player has left the trigger field.
 
 ******************************************************************************/
 
-Event EV_UseAnim_Reset(
-    "_reset", EV_CODEONLY, NULL, NULL, "Reset's the Use Anim after it has no longer been touched.", EV_NORMAL
+Event EV_UseAnim_Reset
+(
+    "_reset",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Reset's the Use Anim after it has no longer been touched.",
+    EV_NORMAL
 );
-
-Event EV_UseAnim_Thread(
-    "setthread", EV_DEFAULT, "s", "label", "Sets which thread to use when this UseAnim is triggered.", EV_NORMAL
+Event EV_UseAnim_Thread
+(
+    "setthread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which thread to use when this UseAnim is triggered.",
+    EV_NORMAL
 );
-
-Event EV_UseAnim_Count(
-    "count", EV_DEFAULT, "i", "newCount", "Sets how many times the UseAnim can be triggered.", EV_NORMAL
+Event EV_UseAnim_Count
+(
+    "count",
+    EV_DEFAULT,
+    "i",
+    "newCount",
+    "Sets how many times the UseAnim can be triggered.",
+    EV_NORMAL
 );
-
-Event EV_UseAnim_TriggerTarget(
+Event EV_UseAnim_TriggerTarget
+(
     "triggertarget",
     EV_DEFAULT,
     "s",
@@ -904,16 +1002,35 @@ Event EV_UseAnim_TriggerTarget(
     "Sets what should be triggered, when this UseAnim is triggered.",
     EV_NORMAL
 );
-
-Event EV_UseAnim_SetAnim("anim", EV_DEFAULT, "s", "animName", "set the animation to use for player.", EV_NORMAL);
-
-Event EV_UseAnim_SetKey(
-    "key", EV_DEFAULT, "s", "keyName", "set the key needed to make this UseAnim function.", EV_NORMAL
+Event EV_UseAnim_SetAnim
+(
+    "anim",
+    EV_DEFAULT,
+    "s",
+    "animName",
+    "set the animation to use for player.",
+    EV_NORMAL
 );
-
-Event EV_UseAnim_SetState("state", EV_CHEAT, "s", "stateName", "set the state to use for the player.", EV_NORMAL);
-
-Event EV_UseAnim_SetCamera(
+Event EV_UseAnim_SetKey
+(
+    "key",
+    EV_DEFAULT,
+    "s",
+    "keyName",
+    "set the key needed to make this UseAnim function.",
+    EV_NORMAL
+);
+Event EV_UseAnim_SetState
+(
+    "state",
+    EV_CHEAT,
+    "s",
+    "stateName",
+    "set the state to use for the player.",
+    EV_NORMAL
+);
+Event EV_UseAnim_SetCamera
+(
     "camera",
     EV_DEFAULT,
     "s",
@@ -922,12 +1039,17 @@ Event EV_UseAnim_SetCamera(
     "topdown, behind, front, side, behind_fixed, side_left, side_right",
     EV_NORMAL
 );
-
-Event EV_UseAnim_SetNumLoops(
-    "num_loops", EV_DEFAULT, "i", "loopCount", "set the number of times to loop an animation per use.", EV_NORMAL
+Event EV_UseAnim_SetNumLoops
+(
+    "num_loops",
+    EV_DEFAULT,
+    "i",
+    "loopCount",
+    "set the number of times to loop an animation per use.",
+    EV_NORMAL
 );
-
-Event EV_UseAnim_SetDelay(
+Event EV_UseAnim_SetDelay
+(
     "delay",
     EV_DEFAULT,
     "f",
@@ -1379,7 +1501,8 @@ int UseAnimDestination::GetNumLoops(void)
     return num_loops;
 }
 
-Event EV_UseObject_MoveThread(
+Event EV_UseObject_MoveThread
+(
     "move_thread",
     EV_DEFAULT,
     "s",
@@ -1387,38 +1510,80 @@ Event EV_UseObject_MoveThread(
     "Sets which move thread to use when this UseObject has finshed looping.",
     EV_NORMAL
 );
-
-Event EV_UseObject_StopThread(
-    "stop_thread", EV_DEFAULT, "s", "label", "Sets which stop thread to use when this UseObject is finished.", EV_NORMAL
+Event EV_UseObject_StopThread
+(
+    "stop_thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which stop thread to use when this UseObject is finished.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_ResetThread(
-    "reset_thread", EV_DEFAULT, "s", "label", "Sets which thread to call when resetting.", EV_NORMAL
+Event EV_UseObject_ResetThread
+(
+    "reset_thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which thread to call when resetting.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_Count(
-    "count", EV_DEFAULT, "i", "newCount", "Sets how many times the UseObject can be triggered.", EV_NORMAL
+Event EV_UseObject_Count
+(
+    "count",
+    EV_DEFAULT,
+    "i",
+    "newCount",
+    "Sets how many times the UseObject can be triggered.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_Cone(
-    "cone", EV_DEFAULT, "f", "newCone", "Sets the cone in angles of where the Useobject can be used.", EV_NORMAL
+Event EV_UseObject_Cone
+(
+    "cone",
+    EV_DEFAULT,
+    "f",
+    "newCone",
+    "Sets the cone in angles of where the Useobject can be used.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_Offset(
-    "offset", EV_DEFAULT, "v", "newOffset", "Sets the offset to use for this UseObject.", EV_NORMAL
+Event EV_UseObject_Offset
+(
+    "offset",
+    EV_DEFAULT,
+    "v",
+    "newOffset",
+    "Sets the offset to use for this UseObject.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_YawOffset(
-    "yaw_offset", EV_DEFAULT, "f", "newYawOffset", "Sets the yaw offset to use for this UseObject.", EV_NORMAL
+Event EV_UseObject_YawOffset
+(
+    "yaw_offset",
+    EV_DEFAULT,
+    "f",
+    "newYawOffset",
+    "Sets the yaw offset to use for this UseObject.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_State("state", EV_DEFAULT, "s", "newState", "Sets the state to use for this UseObject.", EV_NORMAL);
-
-Event EV_UseObject_StateBackwards(
-    "state_backwards", EV_DEFAULT, "s", "newState", "Sets the backward state to use for this UseObject.", EV_NORMAL
+Event EV_UseObject_State
+(
+    "state",
+    EV_DEFAULT,
+    "s",
+    "newState",
+    "Sets the state to use for this UseObject.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_TriggerTarget(
+Event EV_UseObject_StateBackwards
+(
+    "state_backwards",
+    EV_DEFAULT,
+    "s",
+    "newState",
+    "Sets the backward state to use for this UseObject.",
+    EV_NORMAL
+);
+Event EV_UseObject_TriggerTarget
+(
     "triggertarget",
     EV_DEFAULT,
     "s",
@@ -1426,8 +1591,8 @@ Event EV_UseObject_TriggerTarget(
     "Sets what should be triggered, when this UseObject is triggered.",
     EV_NORMAL
 );
-
-Event EV_UseObject_ResetTime(
+Event EV_UseObject_ResetTime
+(
     "reset_time",
     EV_DEFAULT,
     "f",
@@ -1435,8 +1600,8 @@ Event EV_UseObject_ResetTime(
     "Sets the time it takes for the UseObject to reset itself.",
     EV_NORMAL
 );
-
-Event EV_UseObject_DamageType(
+Event EV_UseObject_DamageType
+(
     "damage_type",
     EV_DEFAULT,
     "s",
@@ -1444,8 +1609,8 @@ Event EV_UseObject_DamageType(
     "Sets what kind of damage is needed to activate the trigger.",
     EV_NORMAL
 );
-
-Event EV_UseObject_Reset(
+Event EV_UseObject_Reset
+(
     "_useobject_reset",
     EV_DEFAULT,
     NULL,
@@ -1453,12 +1618,17 @@ Event EV_UseObject_Reset(
     "Resets the useobject to the start state after a certain amount of time.",
     EV_NORMAL
 );
-
-Event EV_UseObject_Resetting(
-    "_useobject_resetting", EV_DEFAULT, NULL, NULL, "Intermediate function for useobject reset.", EV_NORMAL
+Event EV_UseObject_Resetting
+(
+    "_useobject_resetting",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Intermediate function for useobject reset.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_DamageTriggered(
+Event EV_UseObject_DamageTriggered
+(
     "_useobject_damagetriggered",
     EV_DEFAULT,
     "e",
@@ -1466,18 +1636,41 @@ Event EV_UseObject_DamageTriggered(
     "Intermediate function for when the useobject was triggered by damage.",
     EV_NORMAL
 );
-
-Event EV_UseObject_Activate("activate", EV_DEFAULT, NULL, NULL, "Allow the useobject to be used.", EV_NORMAL);
-
-Event
-    EV_UseObject_Deactivate("deactivate", EV_DEFAULT, NULL, NULL, "Do not allow the useobject to be used.", EV_NORMAL);
-
-Event EV_UseObject_UseMaterial(
-    "usematerial", EV_DEFAULT, "s", "nameOfUseMaterial", "the name of the material that glows when active.", EV_NORMAL
+Event EV_UseObject_Activate
+(
+    "activate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Allow the useobject to be used.",
+    EV_NORMAL
 );
-
-Event EV_UseObject_SetActiveState(
-    "_setactivestate", EV_DEFAULT, NULL, NULL, "event that sets up the proper skin for the useobject.", EV_NORMAL
+Event EV_UseObject_Deactivate
+(
+    "deactivate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Do not allow the useobject to be used.",
+    EV_NORMAL
+);
+Event EV_UseObject_UseMaterial
+(
+    "usematerial",
+    EV_DEFAULT,
+    "s",
+    "nameOfUseMaterial",
+    "the name of the material that glows when active.",
+    EV_NORMAL
+);
+Event EV_UseObject_SetActiveState
+(
+    "_setactivestate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "event that sets up the proper skin for the useobject.",
+    EV_NORMAL
 );
 
 #define MULTI_STATE (1 << 0)
@@ -1979,7 +2172,14 @@ Like info_waypoints, but with spawnflags for vehicles.
 
 ******************************************************************************/
 
-Event EV_VehiclePoint_SetSpawnFlags("spawnflags", EV_DEFAULT, "i", "spawn_flags", "Sets the spawn flags.");
+Event EV_VehiclePoint_SetSpawnFlags
+(
+    "spawnflags",
+    EV_DEFAULT,
+    "i",
+    "spawn_flags",
+    "Sets the spawn flags."
+);
 
 CLASS_DECLARATION(Waypoint, VehiclePoint, "info_vehiclepoint") {
     {&EV_VehiclePoint_SetSpawnFlags, &VehiclePoint::SetSpawnFlags},
@@ -2061,11 +2261,16 @@ void HorizontalPipe::SetAngleEvent(Event *ev)
 // TossObject
 /*****************************************************************************/
 
-Event EV_TossObject_SetBounceSound(
-    "bouncesound", EV_DEFAULT, "s", "sound", "When bouncing, what sound to play on impact", EV_NORMAL
+Event EV_TossObject_SetBounceSound
+(
+    "bouncesound", EV_DEFAULT,
+    "s",
+    "sound",
+    "When bouncing, what sound to play on impact",
+    EV_NORMAL
 );
-
-Event EV_TossObject_SetBounceSoundChance(
+Event EV_TossObject_SetBounceSoundChance
+(
     "bouncesoundchance",
     EV_DEFAULT,
     "f[0,1]",
@@ -2206,11 +2411,35 @@ Pushable object
 
 ******************************************************************************/
 
-Event EV_PushObject_Start("start", EV_DEFAULT, NULL, NULL, "Sets up the pushobject.", EV_NORMAL);
+Event EV_PushObject_Start
+(
+    "start",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets up the pushobject.",
+    EV_NORMAL
+);
 
-Event EV_PushObject_SetDamage("dmg", EV_DEFAULT, "i", "damage", "Set the damage.", EV_NORMAL);
+Event EV_PushObject_SetDamage
+(
+    "dmg",
+    EV_DEFAULT,
+    "i",
+    "damage",
+    "Set the damage.",
+    EV_NORMAL
+);
 
-Event EV_PushObject_SetPushSound("pushsound", EV_DEFAULT, "s", "sound", "Set the pushing sound", EV_NORMAL);
+Event EV_PushObject_SetPushSound
+(
+    "pushsound",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "Set the pushing sound",
+    EV_NORMAL
+);
 
 CLASS_DECLARATION(Entity, PushObject, "func_pushobject") {
     {&EV_PushObject_Start,        &PushObject::Start       },
@@ -2341,21 +2570,68 @@ REMOVE_ON_GROUND - remove the rocks when done
 
 ******************************************************************************/
 
-Event EV_FallingRock_Bounce("bounce", EV_DEFAULT, NULL, NULL, "sent to entity when touched.", EV_NORMAL);
-
-Event EV_FallingRock_Rotate("rotate", EV_DEFAULT, NULL, NULL, "rotates the falling rock.", EV_NORMAL);
-
-Event
-    EV_FallingRock_SetWait("wait", EV_DEFAULT, "f", "wait", "How long to wait before rock starts falling.", EV_NORMAL);
-
-Event EV_FallingRock_Start("start", EV_DEFAULT, NULL, NULL, "Starts rock falling.", EV_NORMAL);
-
-Event EV_FallingRock_SetDmg("dmg", EV_DEFAULT, "i", "dmg", "Set the damage from the rock.", EV_NORMAL);
-
-Event EV_FallingRock_SetSpeed("speed", EV_DEFAULT, "f", "speed", "Set the speed that the rock moves at.", EV_NORMAL);
-
-Event EV_FallingRock_SetBounceSound(
-    "noise", EV_DEFAULT, "s", "sound", "Set the sound to play when the rock bounces", EV_NORMAL
+Event EV_FallingRock_Bounce
+(
+    "bounce",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sent to entity when touched.",
+    EV_NORMAL
+);
+Event EV_FallingRock_Rotate
+(
+    "rotate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "rotates the falling rock.",
+    EV_NORMAL
+);
+Event EV_FallingRock_SetWait
+(
+    "wait",
+    EV_DEFAULT,
+    "f",
+    "wait",
+    "How long to wait before rock starts falling.",
+    EV_NORMAL
+);
+Event EV_FallingRock_Start
+(
+    "start",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Starts rock falling.",
+    EV_NORMAL
+);
+Event EV_FallingRock_SetDmg
+(
+    "dmg",
+    EV_DEFAULT,
+    "i",
+    "dmg",
+    "Set the damage from the rock.",
+    EV_NORMAL
+);
+Event EV_FallingRock_SetSpeed
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the speed that the rock moves at.",
+    EV_NORMAL
+);
+Event EV_FallingRock_SetBounceSound
+(
+    "noise",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "Set the sound to play when the rock bounces",
+    EV_NORMAL
 );
 
 CLASS_DECLARATION(Entity, FallingRock, "func_fallingrock") {
@@ -2622,7 +2898,14 @@ Ladder trigger volume
 
 ******************************************************************************/
 
-Event EV_LadderSetup("_ladder_setup", EV_CODEONLY, NULL, NULL, "Does the post spawn setup of the ladder");
+Event EV_LadderSetup
+(
+    "_ladder_setup",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Does the post spawn setup of the ladder"
+);
 
 CLASS_DECLARATION(Entity, FuncLadder, "func_ladder") {
     {&EV_Use,         NULL                        },
@@ -2652,6 +2935,14 @@ void FuncLadder::LadderSetup(Event *ev)
     edict->r.svFlags |= SVF_NOCLIENT;
 }
 
+void FuncLadder::SetLadderFacing(Event *ev)
+{
+    m_vFacingAngles    = vec_zero;
+    m_vFacingAngles[1] = AngleMod(ev->GetFloat(1));
+
+    AngleVectorsLeft(m_vFacingAngles, m_vFacingDir, NULL, NULL);
+}
+
 qboolean FuncLadder::CanUseLadder(Entity *pUser)
 {
     int     iMask;
@@ -2764,14 +3055,6 @@ void FuncLadder::PositionOnLadder(Entity *pUser)
     pUser->setAngles(m_vFacingAngles);
 }
 
-void FuncLadder::SetLadderFacing(Event *ev)
-{
-    m_vFacingAngles    = vec_zero;
-    m_vFacingAngles[1] = AngleMod(ev->GetFloat(1));
-
-    AngleVectorsLeft(m_vFacingAngles, m_vFacingDir, NULL, NULL);
-}
-
 void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
 {
     float   fHeight;
@@ -2872,8 +3155,24 @@ void FuncLadder::EnsureForwardOffLadder(Entity *pUser)
     pUser->setOrigin(trace.endpos);
 }
 
-Event EV_InfoLandmark_Name("landmark_name", EV_DEFAULT, "s", "name", "Set the name of this landmark", EV_NORMAL);
-Event EV_InfoLandmark_SetOrigin("origin", EV_DEFAULT, "v", "origin", "Set the origin of the landmark.", EV_NORMAL);
+Event EV_InfoLandmark_Name
+(
+    "landmark_name",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Set the name of this landmark",
+    EV_NORMAL
+);
+Event EV_InfoLandmark_SetOrigin
+(
+    "origin",
+    EV_DEFAULT,
+    "v",
+    "origin",
+    "Set the origin of the landmark.",
+    EV_NORMAL
+);
 
 CLASS_DECLARATION(Listener, InfoLandmark, "info_landmark") {
     {&EV_InfoLandmark_Name,      &InfoLandmark::SetLandmarkName},
diff --git a/code/fgame/misc.h b/code/fgame/misc.h
index f164c072..3edc142a 100644
--- a/code/fgame/misc.h
+++ b/code/fgame/misc.h
@@ -133,7 +133,7 @@ public:
     virtual void Teleport(Event *ev);
     virtual void StopTeleport(Event *ev);
     void         SetThread(Event *ev);
-    void         Archive(Archiver        &arc) override;
+    void         Archive(Archiver& arc) override;
 };
 
 inline void Teleporter::Archive(Archiver& arc)
@@ -488,7 +488,7 @@ private:
     Entity *SetNextBounceDir(void);
     void    SetBounceSound(str sound);
     void    SetBounceSound(Event *ev);
-    void    Archive(Archiver   &arc) override;
+    void    Archive(Archiver& arc) override;
 
 public:
     CLASS_PROTOTYPE(FallingRock);
@@ -564,8 +564,18 @@ public:
 
     void EnsureOverLadder(Entity *pUser);
     void EnsureForwardOffLadder(Entity *pUser);
+
+    void Archive(Archiver& arc);
 };
 
+inline void FuncLadder::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveVector(&m_vFacingAngles);
+    arc.ArchiveVector(&m_vFacingDir);
+}
+
 class InfoLandmark : public Listener
 {
 private:

From ea6e865cc81054bc073de3c7e089308b881ad30d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 19:59:14 +0100
Subject: [PATCH 0194/2040] Added MASK_CLICKITEM

---
 code/fgame/bg_public.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index e9af867f..5d14c9a5 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -661,6 +661,7 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
+#define MASK_CLICKITEM   (MASK_SOLID | CONTENTS_UNKNOWN3)
 #define MASK_ITEM          (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
 #define MASK_TRANSITION    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
 #define MASK_TARGETPATH \

From a0728b4a8a47c5f15d11a772520c5a4f74237850 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 19:59:46 +0100
Subject: [PATCH 0195/2040] Using MASK_CLICKITEM mask for ClickItemAttack

---
 code/fgame/weaputils.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index b8ed2239..7e1f5db5 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1306,7 +1306,7 @@ void Projectile::SetOwner(Entity *owner)
         if (owner->IsSubclassOfPlayer()) {
             Player *p = (Player *)owner;
             m_iTeam   = p->GetTeam();
-			// Added in OPM
+            // Added in OPM
             //  this was added to prevent glitches, like when the player
             //  disconnects or when the player spectates
             m_bHadPlayerOwner = true;
@@ -1804,7 +1804,7 @@ void PlaceLandmine(const Vector& origin, Entity *owner, const str& model, Weapon
             weap->m_iNumShotsFired++;
 
             if (owner && owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
-                Player* p = static_cast<Player*>(owner);
+                Player *p = static_cast<Player *>(owner);
                 p->m_iNumShotsFired++;
             }
         }
@@ -2585,30 +2585,37 @@ void FakeBulletAttack(
 
 void ClickItemAttack(Vector vStart, Vector vForward, float fRange, Entity *pOwner)
 {
+    Event  *ev;
     Vector  vEnd;
     trace_t trace;
 
     vEnd = vStart + vForward * fRange;
 
-    trace = G_Trace(vStart, vec_zero, vec_zero, vEnd, pOwner, MASK_ALL, qfalse, "ClickItemAttack");
+    trace = G_Trace(vStart, vec_zero, vec_zero, vEnd, pOwner, MASK_CLICKITEM, qfalse, "ClickItemAttack");
 
     if (g_showbullettrace->integer) {
-        G_DebugLine(vStart, vEnd, 1, 1, 1, 1);
+        //G_DebugLine(vStart, vEnd, 1, 1, 1, 1);
+        // Added in OPM
+        //  White line between start and end trace position
+        G_DebugLine(vStart, trace.endpos, 1, 1, 1, 1);
+        G_DebugLine(trace.endpos, vEnd, 1, 0, 0, 1);
     }
 
-    if (trace.entityNum != ENTITYNUM_NONE && trace.ent && trace.ent->entity
-        && trace.ent->entity->isSubclassOf(TriggerClickItem)) {
-        Event *ev = new Event(EV_Activate);
-        ev->AddEntity(pOwner);
-        trace.ent->entity->PostEvent(ev, 0);
-    } else {
+    if (trace.entityNum == ENTITYNUM_WORLD || !trace.ent || !trace.ent->entity
+        || !trace.ent->entity->isSubclassOf(TriggerClickItem)) {
         ScriptThreadLabel failThread;
 
         // Try to execute a fail thread
         if (failThread.TrySet("clickitem_fail")) {
             failThread.Execute();
         }
+
+        return;
     }
+
+    ev = new Event(EV_Activate);
+    ev->AddEntity(pOwner);
+    trace.ent->entity->PostEvent(ev, 0);
 }
 
 Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float real_speed, Entity *owner, Weapon *weap)

From 783bf1b63cabb912422e09891098574b889bc19e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 23:22:53 +0100
Subject: [PATCH 0196/2040] Archive ignorevelocity member

---
 code/fgame/scriptslave.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h
index 9e1a6cfe..c37a133e 100644
--- a/code/fgame/scriptslave.h
+++ b/code/fgame/scriptslave.h
@@ -201,6 +201,7 @@ inline void ScriptSlave::Archive(Archiver& arc)
     arc.ArchiveFloat(&splineTime);
     arc.ArchiveBoolean(&splineangles);
     arc.ArchiveBoolean(&ignoreangles);
+    arc.ArchiveBoolean(&ignorevelocity);
     arc.ArchiveBoolean(&moving);
 
     if (arc.Saving()) {

From b77f62ab58843f09874eb6db87ef9fb151b7fc0c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 23:23:15 +0100
Subject: [PATCH 0197/2040] Load/Save SimpleArchivedEntity

This fixes #213 where elevator wouldn't go up because of missing waypoint
---
 code/fgame/g_main.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 7218e4db..83561eae 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1357,8 +1357,29 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             }
         }
 
+        //
+        // simple archived entities
+        //
+        if (!arc.Loading()) {
+            num = level.m_SimpleArchivedEntities.NumObjects();
+        }
+        arc.ArchiveInteger(&num);
+
+        if (arc.Saving()) {
+            for (i = 1; i <= num; i++) {
+                arc.ArchiveObject(level.m_SimpleArchivedEntities.ObjectAt(i));
+            }
+        } else {
+            for (i = 1; i <= num; i++) {
+                arc.ReadObject();
+            }
+        }
+
         ArchiveAliases(arc);
 
+        // Added in 2.0
+        G_ArchiveSmokeSprites(arc);
+
         currentArc = &arc;
         gi.ArchiveLevel(arc.Loading());
         currentArc = NULL;

From 4122ee41682ebcf6bc65b241cbc7f15980fb626b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 23:25:39 +0100
Subject: [PATCH 0198/2040] Fixed RunAndShoot state crash due to NULL moving
 patrol node (#214)

---
 code/fgame/actor_runandshoot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor_runandshoot.cpp b/code/fgame/actor_runandshoot.cpp
index e8a82958..13088e82 100644
--- a/code/fgame/actor_runandshoot.cpp
+++ b/code/fgame/actor_runandshoot.cpp
@@ -125,7 +125,7 @@ bool Actor::RunAndShoot_MoveToPatrolCurrentNode(void)
 {
     UpdatePatrolCurrentNode();
 
-    if (!m_patrolCurrentNode && m_bPatrolWaitTrigger) {
+    if (!m_patrolCurrentNode || m_bPatrolWaitTrigger) {
         IdleLook();
         Anim_Idle();
         return false;

From 7b6a558fe5e82928489738d2669b7dce3d29db48 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 19 Feb 2024 23:41:57 +0100
Subject: [PATCH 0199/2040] Check for valid turret gun in P_UserAim

When the player dies, it gets detached from turret can would cause crash (#216)
---
 code/fgame/vehicleturret.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 674e95a6..1f03349d 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -386,7 +386,9 @@ void VehicleTurretGun::P_UserAim(usercmd_t *ucmd)
         Entity *slotEnt;
 
         slotEnt = pVehicle->QueryTurretSlotEntity(newSlot);
-        if (slotEnt->IsSubclassOfVehicleTurretGun()) {
+        // slotEnt check:
+        //  Added in OPM
+        if (slotEnt && slotEnt->IsSubclassOfVehicleTurretGun()) {
             VehicleTurretGun *existing;
             Vector            newAng;
             bool              wasThisLocked, wasExistingLocked;

From af829772f921950428faa11018ce17dd046c7cf9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 18:54:59 +0100
Subject: [PATCH 0200/2040] Cleaned up VSS_CalcRepulsionForces and fixed vss
 index

---
 code/cgame/cg_volumetricsmoke.cpp | 467 +++++++++++++++---------------
 1 file changed, 234 insertions(+), 233 deletions(-)

diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index 33cf3769..ed0f0d57 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -42,7 +42,9 @@ const char *cg_vsstypes[] = {
     "debris"
 };
 
-cvssource_t *vss_sorttable[16384];
+#define MAX_VSS_SORTS 16384
+
+cvssource_t *vss_sorttable[MAX_VSS_SORTS];
 
 static int             lastVSSFrameTime;
 static constexpr float MAX_VSS_COORDS            = 8096.0;
@@ -890,251 +892,250 @@ void VSS_CalcRepulsionForces(cvssource_t *pActiveSources)
 {
     cvssource_t *pCurrent;
     cvssource_t *pComp;
+    qboolean     bXUp, bXDown;
+    qboolean     bYUp, bYDown;
+    qboolean     bZDown;
+    int          i;
+    int          iIndex;
+    int          iX, iY, iZ;
+    int          iMinX, iMinY, iMinZ;
+    int          iMaxX, iMaxY, iMaxZ;
+    float        fOfs;
+    cvssource_t *pSTLatch;
 
     pCurrent = pActiveSources->prev;
-    if (pCurrent != pActiveSources) {
-        qboolean     bXUp, bXDown;
-        qboolean     bYUp, bYDown;
-        qboolean     bZDown;
-        int          i;
-        int          iIndex;
-        int          iX, iY, iZ;
-        int          iMinX, iMinY, iMinZ;
-        int          iMaxX, iMaxY, iMaxZ;
-        float        fOfs;
-        cvssource_t *pSTLatch;
+    if (pCurrent == pActiveSources) {
+        return;
+    }
 
-        memset(vss_sorttable, 0, sizeof(vss_sorttable));
+    memset(vss_sorttable, 0, sizeof(vss_sorttable));
 
-        while (pCurrent != pActiveSources) {
-            VectorClear(pCurrent->repulsion);
+    for (pCurrent = pActiveSources->prev; pCurrent != pActiveSources; pCurrent = pCurrent->prev) {
+        VectorClear(pCurrent->repulsion);
 
-            iIndex = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
-            iIndex |= ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32;
-            iIndex |= (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
+        iIndex = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
+        iIndex |= (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32) << 5;
+        iIndex |= (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
 
-            pCurrent->stnext      = vss_sorttable[iIndex];
-            vss_sorttable[iIndex] = pCurrent;
-            pCurrent->stindex     = iIndex;
-            pCurrent              = pCurrent->prev;
+        pCurrent->stnext      = vss_sorttable[iIndex];
+        vss_sorttable[iIndex] = pCurrent;
+        pCurrent->stindex     = iIndex;
+    }
+
+    for (pCurrent = pActiveSources->prev; pCurrent != pActiveSources; pCurrent = pCurrent->prev) {
+        if (vss_sorttable[pCurrent->stindex] == pCurrent) {
+            pSTLatch = (cvssource_t *)-1;
+            pComp    = pCurrent->stnext;
+        } else {
+            pSTLatch = 0;
+            pComp    = vss_sorttable[pCurrent->stindex];
         }
 
-        for (pCurrent = pActiveSources->prev; pCurrent != pActiveSources; pCurrent = pCurrent->prev) {
-            if (vss_sorttable[pCurrent->stindex] == pCurrent) {
-                pSTLatch = (cvssource_t *)-1;
-                pComp    = pCurrent->stnext;
-            } else {
-                pSTLatch = 0;
-                pComp    = vss_sorttable[pCurrent->stindex];
+        while (pComp) {
+            VSS_AddRepulsion(pCurrent, pComp);
+            if (!pSTLatch && pComp->stnext == pCurrent) {
+                pSTLatch = pComp;
+                pComp    = pComp->stnext;
             }
 
-            while (pComp) {
+            pComp = pComp->stnext;
+        }
+
+        iX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
+        iY = (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32) << 5;
+        iZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
+
+        fOfs  = pCurrent->newRadius + 1.49 + 48.0;
+        iMaxX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 + fOfs) / 96) % 32;
+        iMaxY = (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 + fOfs) / 96) % 32) << 5;
+        iMaxZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 + fOfs) / 96) % 16) << 10;
+
+        iMinX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 - fOfs) / 96) % 32;
+        iMinY = (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 - fOfs) / 96) % 32) << 5;
+        iMinZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 - fOfs) / 96) % 16) << 10;
+
+        bXUp   = (iMaxX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
+        bXDown = (iMinX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
+        bYUp   = (iMaxY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
+        bYDown = (iMinY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
+
+        iIndex = iMinZ | (pCurrent->stindex & 0xFFFFC3FF);
+        bZDown = iIndex != pCurrent->stindex;
+
+        if (iIndex == pCurrent->stindex) {
+            iIndex = iMaxY | (pCurrent->stindex & 0xFFFFFC1F);
+
+            i = 9;
+        } else {
+            i = 0;
+        }
+
+        for (; i < (bZDown ? 26 : 17); i++) {
+            switch (i) {
+            case 0:
+                iIndex = iMaxZ | (pCurrent->stindex & 0xFFFFC3FF);
+                break;
+            case 1:
+                iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
+                if (bXUp) {
+                    break;
+                }
+                continue;
+            case 2:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYUp) {
+                    break;
+                }
+                continue;
+            case 3:
+                iIndex = iMinY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYDown) {
+                    break;
+                }
+                continue;
+            case 4:
+                iIndex = iMinY | (iIndex & 0xFFFFFFE0);
+                if (bYDown) {
+                    break;
+                }
+                continue;
+            case 5:
+                iIndex = iMinX | (iIndex & 0xFFFFFFE0);
+                if (bXDown && bYDown) {
+                    break;
+                }
+                continue;
+            case 6:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXDown) {
+                    break;
+                }
+                continue;
+            case 7:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXDown && bYUp) {
+                    break;
+                }
+                continue;
+            case 8:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYUp) {
+                    break;
+                }
+                continue;
+            case 9:
+                iIndex = iZ | (iIndex & 0xFFFFFFC3);
+                if (bYUp) {
+                    break;
+                }
+                continue;
+            case 10:
+                iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
+                if (bXUp && bYUp) {
+                    break;
+                }
+                continue;
+            case 11:
+                iIndex = iMinX | (iIndex & 0xFFFFFFE0);
+                if (bXDown && bYUp) {
+                    break;
+                }
+                continue;
+            case 12:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXDown) {
+                    break;
+                }
+                continue;
+            case 13:
+                iIndex = iMinY | (iIndex & 0xFFFFFC1F);
+                if (bXDown && bYDown) {
+                    break;
+                }
+                continue;
+            case 14:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYDown) {
+                    break;
+                }
+                continue;
+            case 15:
+                iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
+                if (bXUp && bYDown) {
+                    break;
+                }
+                continue;
+            case 16:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXUp) {
+                    break;
+                }
+                continue;
+            case 17:
+                iIndex = iMinZ | (iIndex & 0xFFFFFCC3);
+                if (bXUp) {
+                    break;
+                }
+                continue;
+            case 18:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYUp) {
+                    break;
+                }
+                continue;
+            case 19:
+                iIndex = iMinY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYDown) {
+                    break;
+                }
+                continue;
+            case 20:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYDown) {
+                    break;
+                }
+                continue;
+            case 21:
+                iIndex = iMinX | (iIndex & 0xFFFFFFE0);
+                if (bXDown && bYDown) {
+                    break;
+                }
+                continue;
+            case 22:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXDown) {
+                    break;
+                }
+                continue;
+            case 23:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXDown && bYUp) {
+                    break;
+                }
+                continue;
+            case 24:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYUp) {
+                    break;
+                }
+                continue;
+            case 25:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                break;
+            default:
+                assert(0); // This can't happen
+                break;
+            }
+
+            for (pComp = vss_sorttable[iIndex]; pComp; pComp = pComp->stnext) {
                 VSS_AddRepulsion(pCurrent, pComp);
-                if (!pSTLatch && pComp->stnext == pCurrent) {
-                    pSTLatch = pComp;
-                    pComp    = pComp->stnext;
-                }
-
-                pComp = pComp->stnext;
             }
-            iX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
-            iY = ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32;
-            iY *= 2;
-            iZ = ((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16;
-            iZ <<= 10;
+        }
 
-            fOfs  = pCurrent->newRadius + 1.49 + 48.0;
-            iMaxX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 + fOfs) / 96) % 32;
-            iMaxY = ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 + fOfs) / 96) % 32;
-            iMaxY *= 2;
-            iMaxZ = ((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 + fOfs) / 96) % 16;
-            iMaxZ <<= 10;
-
-            iMinX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 - fOfs) / 96) % 32;
-            iMinY = ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 - fOfs) / 96) % 32;
-            iMinY *= 2;
-            iMinZ = ((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 - fOfs) / 96) % 16;
-            iMinZ <<= 10;
-
-            bXUp   = (iMaxX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
-            bXDown = (iMinX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
-            bYUp   = (iMaxY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
-            bYDown = (iMinY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
-
-            iIndex = iMinZ | (pCurrent->stindex & 0xFFFFFCC3);
-            bZDown = iIndex != pCurrent->stindex;
-
-            if (iIndex == pCurrent->stindex) {
-                iIndex = iMaxY | pCurrent->stindex & 0xFFFFFC1F;
-                i      = 9;
-            } else {
-                i = 0;
-            }
-
-            for(; i < (bZDown ? 26 : 17); i++) {
-                switch (i) {
-                case 0:
-                    iIndex = iMaxZ | (pCurrent->stindex & 0xFFFFFCC3);
-                    break;
-                case 1:
-                    iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
-                    if (bXUp) {
-                        break;
-                    }
-                    continue;
-                case 2:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 3:
-                    iIndex = iMinY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 4:
-                    iIndex = iMinY | (iIndex & 0xFFFFFFE0);
-                    if (bYDown) {
-                        break;
-                    }
-                    continue;
-                case 5:
-                    iIndex = iMinX | (iIndex & 0xFFFFFFE0);
-                    if (bXDown && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 6:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown) {
-                        break;
-                    }
-                    continue;
-                case 7:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 8:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYUp) {
-                        break;
-                    }
-                    continue;
-                case 9:
-                    iIndex = iZ | (iIndex & 0xFFFFFFC3);
-                    if (bYUp) {
-                        break;
-                    }
-                    continue;
-                case 10:
-                    iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
-                    if (bXUp && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 11:
-                    iIndex = iMinX | (iIndex & 0xFFFFFFE0);
-                    if (bXDown && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 12:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown) {
-                        break;
-                    }
-                    continue;
-                case 13:
-                    iIndex = iMinY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 14:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYDown) {
-                        break;
-                    }
-                    continue;
-                case 15:
-                    iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
-                    if (bXUp && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 16:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp) {
-                        break;
-                    }
-                    continue;
-                case 17:
-                    iIndex = iMinZ | (iIndex & 0xFFFFFCC3);
-                    if (bXUp) {
-                        break;
-                    }
-                    continue;
-                case 18:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 19:
-                    iIndex = iMinY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 20:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYDown) {
-                        break;
-                    }
-                    continue;
-                case 21:
-                    iIndex = iMinX | (iIndex & 0xFFFFFFE0);
-                    if (bXDown && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 22:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown) {
-                        break;
-                    }
-                    continue;
-                case 23:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 24:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYUp) {
-                        break;
-                    }
-                    continue;
-                case 25:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    break;
-                }
-
-                for (pComp = vss_sorttable[iIndex]; pComp; pComp = pComp->stnext) {
-                    VSS_AddRepulsion(pCurrent, pComp);
-                }
-            }
-
-            if (pSTLatch == (cvssource_t *)-1) {
-                vss_sorttable[pCurrent->stindex] = pCurrent->stnext;
-            } else {
-                pSTLatch->stnext = pCurrent->stnext;
-            }
+        if (pSTLatch == (cvssource_t *)-1) {
+            vss_sorttable[pCurrent->stindex] = pCurrent->stnext;
+        } else {
+            pSTLatch->stnext = pCurrent->stnext;
         }
     }
 }

From 66fcc2cd14d9268fa04c665d2996ecda650972b6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 19:52:11 +0100
Subject: [PATCH 0201/2040] Cleaned up VSS_AddRepulsion

---
 code/cgame/cg_volumetricsmoke.cpp | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index ed0f0d57..05dc4712 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -80,56 +80,57 @@ void VSS_AddRepulsion(cvssource_t *pA, cvssource_t *pB)
 
     VectorSubtract(pA->newOrigin, pB->newOrigin, vPush);
 
-    if (vPush[0] || vPush[1] || vPush[2]) {
-        fDist = VectorNormalize(vPush);
-        f     = fDist - pB->newRadius;
-
-        if (f > 0.0) {
-            f *= pA->ooRadius;
-            if (f > 1.49) {
-                f = 0.0;
-            } else {
-                f = f * (f * 0.0161 + -0.3104) + 1.2887;
-            }
-
-            if (f < 0.0) {
-                f = f * 1.1;
-            }
-
-            fForce = f;
-        } else {
-            fForce = 1.0;
-        }
-
-        f = fDist - pA->newRadius;
-        if (f > 0.0) {
-            f *= pB->ooRadius;
-            if (f > 1.49) {
-                f = 0.0;
-            } else {
-                f = f * (f * 0.0161 + -0.3104) + 1.2887;
-            }
-
-            if (f < 0.0) {
-                f = f * 1.1;
-            }
-
-            fForce += f;
-        } else {
-            fForce += 1.0;
-        }
-
-        if (fForce <= -0.05 && fForce >= 0.05) {
-            fForce = (pA->newRadius + pB->newRadius) * 0.03 * fForce;
-            VectorScale(vPush, fForce, vPush);
-
-            VectorAdd(pA->repulsion, vPush, pA->repulsion);
-            VectorSubtract(pB->repulsion, vPush, pB->repulsion);
-        }
-    } else {
+    if (!vPush[0] && !vPush[1] && !vPush[2]) {
         VectorSet(vPush, crandom(), crandom(), crandom());
         VectorAdd(pA->repulsion, vPush, pA->repulsion);
         VectorSubtract(pB->repulsion, vPush, pB->repulsion);
+        return;
+    }
+
+    fDist = VectorNormalize(vPush);
+    f     = fDist - pB->newRadius;
+
+    if (f > 0.0f) {
+        f *= pA->ooRadius;
+        if (f > 1.49f) {
+            f = 0.0f;
+        } else {
+            f = f * (f * 0.0161f + -0.3104f) + 1.2887f;
+        }
+
+        if (f < 0.0) {
+            f *= 1.1f;
+        }
+
+        fForce = f;
+    } else {
+        fForce = 1.0;
+    }
+
+    f = fDist - pA->newRadius;
+    if (f > 0.0) {
+        f *= pB->ooRadius;
+        if (f > 1.49f) {
+            f = 0.0f;
+        } else {
+            f = f * (f * 0.0161f + -0.3104f) + 1.2887f;
+        }
+
+        if (f < 0.0) {
+            f *= 1.1f;
+        }
+
+        fForce += f;
+    } else {
+        fForce += 1.0f;
+    }
+
+    if (fForce <= -0.05f || fForce >= 0.05f) {
+        fForce = (pA->newRadius + pB->newRadius) * 0.03f * fForce;
+        VectorScale(vPush, fForce, vPush);
+
+        VectorAdd(pA->repulsion, vPush, pA->repulsion);
+        VectorSubtract(pB->repulsion, vPush, pB->repulsion);
     }
 }
 
@@ -931,14 +932,13 @@ void VSS_CalcRepulsionForces(cvssource_t *pActiveSources)
             pComp    = vss_sorttable[pCurrent->stindex];
         }
 
-        while (pComp) {
+        for(; pComp; pComp = pComp->stnext) {
             VSS_AddRepulsion(pCurrent, pComp);
             if (!pSTLatch && pComp->stnext == pCurrent) {
                 pSTLatch = pComp;
+                // skip current
                 pComp    = pComp->stnext;
             }
-
-            pComp = pComp->stnext;
         }
 
         iX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
@@ -946,13 +946,13 @@ void VSS_CalcRepulsionForces(cvssource_t *pActiveSources)
         iZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
 
         fOfs  = pCurrent->newRadius + 1.49 + 48.0;
-        iMaxX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 + fOfs) / 96) % 32;
-        iMaxY = (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 + fOfs) / 96) % 32) << 5;
-        iMaxZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 + fOfs) / 96) % 16) << 10;
+        iMaxX = ((int)floor(pCurrent->newOrigin[0] + fOfs + 8192.0 + 0.5) / 96) % 32;
+        iMaxY = (((int)floor(pCurrent->newOrigin[1] + fOfs + 8192.0 + 0.5) / 96) % 32) << 5;
+        iMaxZ = (((int)floor(pCurrent->newOrigin[2] + fOfs + 8192.0 + 0.5) / 96) % 16) << 10;
 
-        iMinX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 - fOfs) / 96) % 32;
-        iMinY = (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 - fOfs) / 96) % 32) << 5;
-        iMinZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 - fOfs) / 96) % 16) << 10;
+        iMinX = ((int)floor(pCurrent->newOrigin[0] - fOfs + 8192.0 + 0.5) / 96) % 32;
+        iMinY = (((int)floor(pCurrent->newOrigin[1] - fOfs + 8192.0 + 0.5) / 96) % 32) << 5;
+        iMinZ = (((int)floor(pCurrent->newOrigin[2] - fOfs + 8192.0 + 0.5) / 96) % 16) << 10;
 
         bXUp   = (iMaxX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
         bXDown = (iMinX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;

From 6b6e2c947c30328f76158b652511ac7ba64060ed Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 19:53:08 +0100
Subject: [PATCH 0202/2040] Fixed vNorm not being initializing causing crashes
 on rare occasions

This should fix #169
---
 code/cgame/cg_volumetricsmoke.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index 05dc4712..df318139 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -337,6 +337,8 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
             float  fDot;
             vec3_t vNorm;
 
+            VectorCopy(trace.plane.normal, vNorm);
+
             VectorAdd(trace.endpos, trace.plane.normal, pSource->newOrigin);
             fDot = DotProduct(vNorm, pSource->velocity);
             VectorMA(pSource->velocity, fDot, vNorm, pSource->velocity);

From cbe6d85bcd9de6876e137249f8d865d34b6da95a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 20:44:55 +0100
Subject: [PATCH 0203/2040] Added multiple cache per entity

---
 code/tiki/tiki_cache.cpp | 45 +++++++++++++++++++++++++++++-----------
 code/tiki/tiki_shared.h  |  4 ++++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index 6dea190b..4fbf5aa3 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -42,7 +42,7 @@ struct pchar {
 
 con_map<pchar, dtikianim_t *> *tikianimcache;
 con_map<pchar, dtiki_t *>     *tikicache;
-static skeletor_c             *skel_entity_cache[1024];
+static skeletor_c             *skel_entity_cache[TIKI_MAX_ENTITY_CACHE];
 
 template<>
 int HashCode<pchar>(const pchar& key)
@@ -300,6 +300,8 @@ static qboolean tiki_started;
 void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
 {
     skeletor_c *skel;
+    int i;
+    int index;
 
     if (entnum == ENTITYNUM_NONE) {
         if (!tiki->skeletor) {
@@ -307,17 +309,34 @@ void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
         }
         skel = (skeletor_c *)tiki->skeletor;
     } else {
-        skel = skel_entity_cache[entnum];
-        if (skel) {
-            if (skel->m_Tiki == tiki) {
-                return skel_entity_cache[entnum];
+        // Added in 2.30
+        //  Multiple caches per entity
+        for (i = 0; i < TIKI_MAX_ENTITY_CACHE_PER_ENT; i++) {
+            index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
+
+            skel = skel_entity_cache[index];
+            if (!skel) {
+                break;
             }
 
+            if (skel->m_Tiki == tiki) {
+                return skel;
+            }
+        }
+
+        if (i == TIKI_MAX_ENTITY_CACHE_PER_ENT) {
+            i = 0;
+        }
+
+        index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
+        skel = skel_entity_cache[index];
+
+        if (skel) {
             delete skel;
         }
 
         skel                      = new skeletor_c(tiki);
-        skel_entity_cache[entnum] = skel;
+        skel_entity_cache[index] = skel;
     }
 
     return skel;
@@ -331,15 +350,17 @@ TIKI_DeleteSkeletor
 static void TIKI_DeleteSkeletor(int entnum)
 {
     skeletor_c *skel;
+    int i;
 
     if (entnum == ENTITYNUM_NONE) {
         return;
     }
 
-    skel = skel_entity_cache[entnum];
-    if (skel) {
-        delete skel;
-        skel_entity_cache[entnum] = 0;
+    for (i = 0; i < TIKI_MAX_ENTITY_CACHE_PER_ENT; i++) {
+        skel = skel_entity_cache[entnum * TIKI_MAX_ENTITY_CACHE_PER_ENT + i];
+        if (skel) {
+            delete skel;
+        }
     }
 }
 
@@ -352,7 +373,7 @@ void TIKI_Begin(void)
 {
     int i;
 
-    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+    for (i = 0; i < MAX_GENTITIES; i++) {
         skel_entity_cache[i] = 0;
     }
 
@@ -368,7 +389,7 @@ void TIKI_End(void)
 {
     int i;
 
-    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+    for (i = 0; i < MAX_GENTITIES; i++) {
         TIKI_DeleteSkeletor(i);
     }
 
diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index ed40b76e..763054bc 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -77,6 +77,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TIKI_MAX_SKELCACHE 1024
 #define TIKI_MAX_COMMANDS  128
 
+#define TIKI_MAX_ENTITIES              2048
+#define TIKI_MAX_ENTITY_CACHE_PER_ENT  2
+#define TIKI_MAX_ENTITY_CACHE          (TIKI_MAX_ENTITIES*TIKI_MAX_ENTITY_CACHE_PER_ENT)
+
 // tiki surface flags
 #define TIKI_SURF_SKIN1     (1 << 0)
 #define TIKI_SURF_SKIN2     (1 << 1)

From 8af5da5fca424b8aed4b7d74fb81b5c1f2fa53fe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 20:45:05 +0100
Subject: [PATCH 0204/2040] tiki assert check

---
 code/server/sv_game.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 3c2f0c4c..05d4dc1e 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -991,6 +991,7 @@ PF_SetPoseInternal
 */
 void PF_SetPoseInternal( dtiki_t *tiki, int entnum, const frameInfo_t *frameInfo, int *bone_tag, vec4_t *bone_quat, float actionWeight )
 {
+	assert(tiki);
 	TIKI_SetPoseInternal( TIKI_GetSkeletor( tiki, entnum ), frameInfo, bone_tag, bone_quat, actionWeight );
 }
 

From b76f9a9a6cf8aa950465b4874530ef4390588881 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 22:42:34 +0100
Subject: [PATCH 0205/2040] Fixed skel_entity_cache initialization

---
 code/tiki/tiki_cache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index 4fbf5aa3..05d29b51 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -373,7 +373,7 @@ void TIKI_Begin(void)
 {
     int i;
 
-    for (i = 0; i < MAX_GENTITIES; i++) {
+    for (i = 0; i < TIKI_MAX_ENTITY_CACHE; i++) {
         skel_entity_cache[i] = 0;
     }
 

From 8b2b1a9a47cae874ccc863afbcc366560ad967e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 22:42:54 +0100
Subject: [PATCH 0206/2040] S_AddLoopingSound: ignore null sfx handle

---
 code/client/new/snd_main_new.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 3490119d..c6ba1b66 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -52,6 +52,10 @@ S_AddLoopingSound
 */
 void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t sfxHandle, float volume, float minDist, float maxDist, float pitch, int flags)
 {
+    if (!sfxHandle) {
+        return;
+    }
+
     // FIXME: unimplemented
     S_AddLoopingSound(ENTITYNUM_WORLD, origin, velocity, sfxHandle);
 }

From 7945c2ca6633e181fdc73426553a30d7e2d38e2f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 22:57:02 +0100
Subject: [PATCH 0207/2040] Fixed target's m_Team accidentally being
 overwritten

This causes NPC to look invulnerable (fixes #238)
---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index e7344e3d..805dfd90 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8936,7 +8936,7 @@ void Actor::WeaponSound(int iType, vec3_t sound_origin, float fDistSquared, floa
         if (pActor->m_Think[THINKLEVEL_IDLE] == THINK_MACHINEGUNNER && pWeapon->aim_target) {
             if (pWeapon->aim_target->IsSubclassOfSentient()) {
                 Sentient *pTarget = static_cast<Sentient *>(pWeapon->aim_target.Pointer());
-                if (pTarget->m_Team = m_Team) {
+                if (pTarget->m_Team == m_Team) {
                     pEnemy = pTarget;
                 }
             } else if (!m_Team) {

From b0c1d791320c1cf4f427b4eeaf6f0119b4e76cdd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 23:19:24 +0100
Subject: [PATCH 0208/2040] Fixed AI mg42 fire delay

---
 code/fgame/weapon.h       | 12 ++++++------
 code/fgame/weapturret.cpp | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index e5f223b9..769f67f7 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -399,12 +399,12 @@ public:
     virtual void GetMuzzlePosition(
         vec3_t position, vec3_t vBarrelPos = NULL, vec3_t forward = NULL, vec3_t right = NULL, vec3_t up = NULL
     );
-    qboolean AutoChange(void);
-    int      ClipAmmo(firemode_t mode);
-    qboolean IsDroppable(void);
-    float    FireDelay(firemode_t mode);
-    void     SetFireDelay(Event *ev);
-    void     SetDMFireDelay(Event *ev);
+    qboolean         AutoChange(void);
+    int              ClipAmmo(firemode_t mode);
+    qboolean         IsDroppable(void);
+    virtual float    FireDelay(firemode_t mode);
+    virtual void     SetFireDelay(Event *ev);
+    void             SetDMFireDelay(Event *ev);
 
     weaponstate_t GetState(void);
     void          ForceState(weaponstate_t state);
diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 0a96c220..dfff9acd 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1266,6 +1266,10 @@ void TurretGun::AI_DoFiring()
 
 void TurretGun::AI_ThinkActive()
 {
+    if (!g_ai->integer) {
+        return;
+    }
+
     AI_DoAiming();
     AI_DoFiring();
 }
@@ -1917,16 +1921,18 @@ void TurretGun::StopWeaponAnim(void)
 
 float TurretGun::FireDelay(firemode_t mode)
 {
-    if (owner && owner->IsSubclassOfPlayer()) {
-        return 0.06f;
-    } else {
-        return Weapon::FireDelay(mode);
-    }
+    return fire_delay[FIRE_PRIMARY];
 }
 
 void TurretGun::SetFireDelay(Event *ev)
 {
     fire_delay[FIRE_PRIMARY] = ev->GetFloat(1);
+    if (!m_fMaxBurstTime) {
+        // Added in OPM
+        //  default values if not set
+        m_fMaxBurstTime = m_fMinBurstTime = 0.001f;
+        m_fMaxBurstDelay = m_fMinBurstDelay = fire_delay[FIRE_PRIMARY];
+    }
 }
 
 void TurretGun::ShowInfo(float fDot, float fDist)

From 61f0fc665fef1c34adbd0836f123c5a3e431ab80 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 20 Feb 2024 23:29:47 +0100
Subject: [PATCH 0209/2040] Fixed MG42 reload anim name

---
 code/fgame/scriptmaster.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 56a1b9d8..c7730709 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -230,7 +230,7 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/shoot.scr",
     "anim/mg42_shoot.scr",
     "anim/mg42_idle.scr",
-    "anim_mg42_reload.scr",
+    "anim/mg42_reload.scr",
     "drive",
     "global/weapon.scr",
     "global/moveto.scr",

From b0180383dfac59d93f194f8842fb8ff3b1d335cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 19:37:49 +0100
Subject: [PATCH 0210/2040] Fixed FFA scores

This fixes #242
---
 code/fgame/dm_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 6125e0c1..1915b26e 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1871,7 +1871,7 @@ void DM_Manager::BuildTeamInfo_ver6(DM_Team *dmTeam)
             Com_sprintf(entry, sizeof(entry), "%i %i \"\" \"\" \"\" \"\" ", -1, dmTeam->m_teamnumber);
         }
     } else {
-        Com_sprintf(entry, sizeof(entry), "%i \"\" \"\" \"\" \"\" \"\" ", -1 - dmTeam->m_teamnumber);
+        Com_sprintf(entry, sizeof(entry), "%i \"\" \"\" \"\" \"\" ", -1 - dmTeam->m_teamnumber);
     }
 
     InsertEntry(entry);

From e55f5902d55c5c576b7b3cba497800e269fee5d4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:12:05 +0100
Subject: [PATCH 0211/2040] Avoid using constant values

---
 code/cgame/cg_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 5c74c473..ab3c46ee 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -154,9 +154,9 @@ void CG_RegisterCvars(void)
     cg_shadowdebug                = cgi.Cvar_Get("cg_shadowdebug", "0", 0);
     developer                     = cgi.Cvar_Get("developer", "0", 0);
     dm_playermodel                = cgi.Cvar_Get("dm_playermodel", "american_army", 3);
-    dm_playergermanmodel          = cgi.Cvar_Get("dm_playergermanmodel", "german_wehrmacht_soldier", 3);
+    dm_playergermanmodel          = cgi.Cvar_Get("dm_playergermanmodel", "german_wehrmacht_soldier", CVAR_ARCHIVE | CVAR_USERINFO);
     cg_forceModel                 = cgi.Cvar_Get("cg_forceModel", "0", CVAR_ARCHIVE);
-    cg_animationviewmodel         = cgi.Cvar_Get("cg_animationviewmodel", "0", 8);
+    cg_animationviewmodel         = cgi.Cvar_Get("cg_animationviewmodel", "0", CVAR_SYSTEMINFO);
     cg_hitmessages                = cgi.Cvar_Get("cg_hitmessages", "1", CVAR_ARCHIVE);
     cg_acidtrip                   = cgi.Cvar_Get("cg_acidtrip", "0", CVAR_CHEAT);
     cg_hud                        = cgi.Cvar_Get("cg_hud", "0", 0);

From 65d3a51a171485ef45493ffc3e306ea4c00076d7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:12:14 +0100
Subject: [PATCH 0212/2040] Use '\n' instead of 10

---
 code/client/cl_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 8d63814e..0e0dbd46 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1486,7 +1486,7 @@ void CL_SendPureChecksums( void ) {
 	Q_strcat(cMsg, sizeof(cMsg), va("%d ", cl.serverId) );
 	Q_strcat(cMsg, sizeof(cMsg), pChecksums);
 	for (i = 0; i < 2; i++) {
-		cMsg[i] += 10;
+		cMsg[i] += '\n';
 	}
 	CL_AddReliableCommand( cMsg, qfalse );
 }

From 416c568c5144d03fd794ef1a67b93daee708fb64 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:13:08 +0100
Subject: [PATCH 0213/2040] Make CVAR_ROM variables appear first in info
 strings

---
 code/qcommon/cvar.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index f05ae523..0e79aef2 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -1411,9 +1411,16 @@ char *Cvar_InfoString(int bit)
 
 	info[0] = 0;
 
+	// start with read-only variable so they appear first
+	for (var = cvar_vars; var; var = var->next)
+	{
+		if (var->name && (var->flags & bit) && (var->flags & CVAR_ROM))
+			Info_SetValueForKey(info, var->name, var->string);
+	}
+
 	for(var = cvar_vars; var; var = var->next)
 	{
-		if(var->name && (var->flags & bit))
+		if (var->name && (var->flags & bit) && !(var->flags & CVAR_ROM))
 			Info_SetValueForKey (info, var->name, var->string);
 	}
 
@@ -1434,9 +1441,16 @@ char *Cvar_InfoString_Big(int bit)
 
 	info[0] = 0;
 
+	// start with read-only variable so they appear first
 	for (var = cvar_vars; var; var = var->next)
 	{
-		if(var->name && (var->flags & bit))
+		if (var->name && (var->flags & bit) && (var->flags & CVAR_ROM))
+			Info_SetValueForKey(info, var->name, var->string);
+	}
+
+	for (var = cvar_vars; var; var = var->next)
+	{
+		if (var->name && (var->flags & bit) && !(var->flags & CVAR_ROM))
 			Info_SetValueForKey_Big (info, var->name, var->string);
 	}
 	return info;

From bb4b10d752c2555d1808b3d08090e01f45f74d29 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:13:24 +0100
Subject: [PATCH 0214/2040] Use result from Cvar_InfoString_Big for
 CS_SYSTEMINFO

---
 code/server/sv_init.c | 2 +-
 code/server/sv_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 1d883a3d..40209cd7 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -854,7 +854,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		Cvar_Set( "sv_referencedPakNames", p );
 
 		// save systeminfo and serverinfo strings
-		Q_strncpyz( systemInfo, Cvar_InfoString( CVAR_SYSTEMINFO ), sizeof( systemInfo ) );
+		Q_strncpyz( systemInfo, Cvar_InfoString_Big( CVAR_SYSTEMINFO ), sizeof( systemInfo ) );
 		cvar_modifiedFlags &= ~CVAR_SYSTEMINFO;
 		SV_SetConfigstring( CS_SYSTEMINFO, systemInfo );
 
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 3aa43ae3..259e0ea0 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -848,7 +848,7 @@ void SV_Frame( int msec ) {
 		cvar_modifiedFlags &= ~CVAR_SERVERINFO;
 	}
 	if ( cvar_modifiedFlags & CVAR_SYSTEMINFO ) {
-		SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString( CVAR_SYSTEMINFO ) );
+		SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString_Big( CVAR_SYSTEMINFO ) );
 		cvar_modifiedFlags &= ~CVAR_SYSTEMINFO;
 	}
 

From 7314543c881f89afc3e847ca4998f4b83c767d14 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:17:01 +0100
Subject: [PATCH 0215/2040] Fixed snow bullet hit effect

This fixes #246
---
 code/cgame/cg_parsemsg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 966b041d..f9ff0397 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -267,7 +267,7 @@ CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t
         break;
     case SURF_SNOW:
         sBulletHole += "snow";
-        iEffect = SFX_BHIT_FOLIAGE_LITE;
+        iEffect = SFX_BHIT_SNOW_LITE;
         break;
     case SURF_CARPET:
         sBulletHole += "carpet";

From 6eb20a3524aacc55fbd7003d363668d1f316f6c4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:59:28 +0100
Subject: [PATCH 0216/2040] Added PostSpawn for ammo

This fixed ammo being spawned in the air without falling (fixes #244)
---
 code/fgame/ammo.cpp | 40 +++++++++++++++++++++++++++++++++++-----
 code/fgame/ammo.h   |  7 ++-----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/code/fgame/ammo.cpp b/code/fgame/ammo.cpp
index 8a51a007..a6dc4869 100644
--- a/code/fgame/ammo.cpp
+++ b/code/fgame/ammo.cpp
@@ -30,13 +30,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ammo.h"
 #include "player.h"
+#include "g_phys.h"
+
+Event EV_AmmoEntity_PostSpawn
+(
+    "ammoentity_postspawn",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Ammo Entity Post Spawn"
+);
 
 CLASS_DECLARATION(Item, AmmoEntity, NULL) {
-    {NULL, NULL}
+    {&EV_AmmoEntity_PostSpawn, &AmmoEntity::EventPostSpawn},
+    {NULL,                     NULL                       }
 };
 
 AmmoEntity::AmmoEntity()
-
 {
     if (LoadingSavegame) {
         // all data will be setup by the archive function
@@ -44,13 +54,14 @@ AmmoEntity::AmmoEntity()
     }
     setName("UnknownAmmo");
     amount = 0;
+
+    PostEvent(EV_AmmoEntity_PostSpawn, EV_POSTSPAWN);
 }
 
 Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
-
 {
     Sentient *player;
-    Weapon* pWeap;
+    Weapon   *pWeap;
 
     if (!other->IsSubclassOfPlayer()) {
         return NULL;
@@ -86,7 +97,11 @@ Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
     Unregister(STRING_PICKUP);
 
     // Tell the player about the ammo being picked
-    gi.SendServerCommand(other->edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\"", gi.LV_ConvertString(va("Got %d %s Rounds", amount, item_name.c_str())));
+    gi.SendServerCommand(
+        other->edict - g_entities,
+        "print \"" HUD_MESSAGE_YELLOW "%s\"",
+        gi.LV_ConvertString(va("Got %d %s Rounds", amount, item_name.c_str()))
+    );
 
     // Give the ammo to the player
     player->GiveAmmo(item_name, amount);
@@ -100,6 +115,21 @@ Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
     return NULL; // This doesn't create any items
 }
 
+void AmmoEntity::EventPostSpawn(Event *ev)
+{
+    vec3_t fullmins;
+    vec3_t fullmaxs;
+
+    setMoveType(MOVETYPE_TOSS);
+    if (edict->tiki) {
+        gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, fullmins, fullmaxs);
+        setSize(fullmins, fullmaxs);
+        link();
+    }
+
+    droptofloor(256);
+}
+
 // This is the Class that is used to keep track of ammo in the player's inventory.
 // It is not an entit, just a name and an amount.
 
diff --git a/code/fgame/ammo.h b/code/fgame/ammo.h
index eb1a5ad7..3330f4c5 100644
--- a/code/fgame/ammo.h
+++ b/code/fgame/ammo.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // ammo.h: Base class for all ammunition for entities derived from the Weapon class.
 
-#ifndef __AMMO_H__
-#define __AMMO_H__
+#pragma once
 
 #include "g_local.h"
 #include "item.h"
@@ -35,6 +34,7 @@ public:
 
     AmmoEntity();
     Item *ItemPickup(Entity *other, qboolean add_to_inventory) override;
+    void  EventPostSpawn(Event *ev);
 };
 
 class Ammo : public Class
@@ -61,7 +61,6 @@ public:
 };
 
 inline void Ammo::Archive(Archiver& arc)
-
 {
     Class::Archive(arc);
 
@@ -75,5 +74,3 @@ inline void Ammo::Archive(Archiver& arc)
         setName(name);
     }
 }
-
-#endif /* ammo.h */

From 9d619938788e804ebd50b05e8fcfe22633a84cdc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Feb 2024 20:59:41 +0100
Subject: [PATCH 0217/2040] Archive name_index

---
 code/fgame/ammo.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/ammo.h b/code/fgame/ammo.h
index 3330f4c5..24cb172c 100644
--- a/code/fgame/ammo.h
+++ b/code/fgame/ammo.h
@@ -67,6 +67,7 @@ inline void Ammo::Archive(Archiver& arc)
     arc.ArchiveInteger(&amount);
     arc.ArchiveInteger(&maxamount);
     arc.ArchiveString(&name);
+    arc.ArchiveInteger(&name_index);
     //
     // name_index not archived, because it is auto-generated by gi.itemindex
     //

From a86a707e4ab9e8b990f81f6ab9a9b201a74a7a13 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:29:16 +0100
Subject: [PATCH 0218/2040] Added more variables to initialize

---
 code/fgame/scriptslave.cpp | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 89157267..0ce2ec93 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -692,14 +692,23 @@ ScriptSlave::ScriptSlave()
     // this is a normal entity
     edict->s.eType = ET_GENERAL;
 
+    splineTime = 0;
+
+    ignoreangles   = false;
+    ignorevelocity = false;
+    moving         = false;
+
     speed           = 100;
     takedamage      = DAMAGE_YES;
     waypoint        = NULL;
-    NewAngles       = localangles;
-    NewPos          = localorigin;
     traveltime      = 0;
     commandswaiting = false;
 
+    splinePath           = NULL;
+    splineangles         = false;
+    m_fFollowRelativeYaw = 0;
+
+    attack_finished    = 0;
     dmg                = 2;
     dmg_means_of_death = MOD_CRUSH;
 
@@ -709,20 +718,16 @@ ScriptSlave::ScriptSlave()
         edict->s.renderfx = RF_ALWAYSDRAW;
     }
 
-    splinePath           = NULL;
-    m_pCurPath           = NULL;
-    m_iCurNode           = 0;
-    m_fLookAhead         = 0;
-    m_fCurSpeed          = 0;
-    m_fIdealSpeed        = 0;
-    m_fIdealAccel        = 0;
-    m_fIdealDistance     = 100;
-    splineangles         = false;
-    m_fFollowRelativeYaw = 0;
-    attack_finished      = 0;
-
     setSolidType(SOLID_NOT);
 
+    m_pCurPath       = NULL;
+    m_iCurNode       = 0;
+    m_fCurSpeed      = 0;
+    m_fLookAhead     = 0;
+    m_fIdealSpeed    = 0;
+    m_fIdealAccel    = 0;
+    m_fIdealDistance = 100;
+
     if (spawnflags & 1) {
         PostEvent(EV_BecomeNonSolid, EV_POSTSPAWN);
     }

From cf6335d180f40f6d275667831652dcf15681d94e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 18:29:31 +0100
Subject: [PATCH 0219/2040] Fixed VehicleTouched not handling damage properly
 if there is no driver

---
 code/fgame/vehicle.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 1d47f275..de064285 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4879,10 +4879,6 @@ void Vehicle::VehicleTouched(Event *ev)
         return;
     }
 
-    if (drivable && !driver.ent) {
-        return;
-    }
-
     delta = other->origin - last_origin;
     delta.normalize();
 

From 8919890dbe62df228db5b31006059c4b116f23eb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 19:59:28 +0100
Subject: [PATCH 0220/2040] Fixed entity collision for vehicles

This fixes vehicle not properly handling damage triggers (fixes #223, fixes #240)
---
 code/fgame/vehicle.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index de064285..ea8aa564 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4254,8 +4254,8 @@ void Vehicle::MoveVehicle(void)
                     tr.ent->entity->CheckGround();
 
                     if (!tr.ent->entity->groundentity
-                        || (tr.ent->entity->groundentity == edict
-                            && (!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity))) {
+                        || (tr.ent->entity->groundentity != edict
+                            && (!m_pCollisionEntity || tr.ent->entity->groundentity->entity != m_pCollisionEntity))) {
                         Event *event = new Event(EV_Touch);
                         event->AddEntity(this);
                         tr.ent->entity->ProcessEvent(event);
@@ -4336,8 +4336,8 @@ void Vehicle::MoveVehicle(void)
                 tr.ent->entity->CheckGround();
 
                 if (!tr.ent->entity->groundentity
-                    || (tr.ent->entity->groundentity == edict
-                        && (!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity))) {
+                    || (tr.ent->entity->groundentity != edict
+                        && (!m_pCollisionEntity || tr.ent->entity->groundentity->entity != m_pCollisionEntity))) {
                     Event *event = new Event(EV_Touch);
                     event->AddEntity(this);
                     tr.ent->entity->ProcessEvent(event);
@@ -4421,8 +4421,8 @@ void Vehicle::MoveVehicle(void)
                 tr.ent->entity->CheckGround();
 
                 if (!tr.ent->entity->groundentity
-                    || (tr.ent->entity->groundentity == edict
-                        && (!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity))) {
+                    || (tr.ent->entity->groundentity != edict
+                        && (!m_pCollisionEntity || tr.ent->entity->groundentity->entity != m_pCollisionEntity))) {
                     Event *event = new Event(EV_Touch);
                     event->AddEntity(this);
                     tr.ent->entity->ProcessEvent(event);

From ef08f1c8f3e94599364572cd6e879b3aced11cf2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:21:53 +0100
Subject: [PATCH 0221/2040] Fixed turret fire issues

---
 code/fgame/weapturret.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index dfff9acd..c8327663 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1243,11 +1243,26 @@ void TurretGun::AI_DoAiming()
 
 void TurretGun::AI_DoFiring()
 {
+    float minBurstTime, maxBurstTime;
+    float minBurstDelay, maxBurstDelay;
+
+    minBurstTime = m_fMinBurstTime;
+    maxBurstTime = m_fMaxBurstTime;
+    minBurstDelay = m_fMinBurstDelay;
+    maxBurstDelay = m_fMaxBurstDelay;
+
+    if (!maxBurstTime) {
+        // Added in OPM
+        //  default values if not set
+        maxBurstTime = minBurstTime = 0.001f;
+        maxBurstDelay = minBurstDelay = fire_delay[FIRE_PRIMARY];
+    }
+
     if (m_iFiring == 1) {
-        if (m_fMaxBurstTime > 0) {
+        if (maxBurstTime > 0) {
             if (m_fFireToggleTime < level.time) {
                 m_iFiring         = 4;
-                m_fFireToggleTime = level.time + m_fMinBurstTime + (m_fMaxBurstTime - m_fMinBurstTime) * random();
+                m_fFireToggleTime = level.time + minBurstTime + (maxBurstTime - minBurstTime) * random();
             }
         } else {
             m_iFiring = 4;
@@ -1255,10 +1270,10 @@ void TurretGun::AI_DoFiring()
     } else if (m_iFiring == 4) {
         Fire(FIRE_PRIMARY);
 
-        if (m_fMaxBurstTime > 0) {
+        if (maxBurstTime > 0) {
             if (m_fFireToggleTime < level.time) {
                 m_iFiring         = 1;
-                m_fFireToggleTime = level.time + m_fMinBurstDelay + (m_fMaxBurstDelay - m_fMinBurstDelay) * random();
+                m_fFireToggleTime = level.time + minBurstDelay + (maxBurstDelay - minBurstDelay) * random();
             }
         }
     }
@@ -1927,12 +1942,6 @@ float TurretGun::FireDelay(firemode_t mode)
 void TurretGun::SetFireDelay(Event *ev)
 {
     fire_delay[FIRE_PRIMARY] = ev->GetFloat(1);
-    if (!m_fMaxBurstTime) {
-        // Added in OPM
-        //  default values if not set
-        m_fMaxBurstTime = m_fMinBurstTime = 0.001f;
-        m_fMaxBurstDelay = m_fMinBurstDelay = fire_delay[FIRE_PRIMARY];
-    }
 }
 
 void TurretGun::ShowInfo(float fDot, float fDist)

From 1a5cac2c6a7449151d7d0f9f517b4cb6f8b823e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:22:47 +0100
Subject: [PATCH 0222/2040] Implemented all parm methods

This fixes, #249 and fixes #217
---
 code/fgame/parm.cpp | 154 ++++++++++++++++++++++++++++++++------------
 code/fgame/parm.h   |  42 ++++++------
 2 files changed, 136 insertions(+), 60 deletions(-)

diff --git a/code/fgame/parm.cpp b/code/fgame/parm.cpp
index 9b90a719..76fd8513 100644
--- a/code/fgame/parm.cpp
+++ b/code/fgame/parm.cpp
@@ -30,63 +30,135 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Parm parm;
 
-Event EV_Parm_GetOther
-(
-	"other",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"other",
-	EV_GETTER
-);
-
-Event EV_Parm_GetOwner
-(
-	"owner",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"owner",
-	EV_GETTER
-);
-
 Event EV_Parm_GetPreviousThread
 (
-	"previousthread",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"previousthread",
-	EV_GETTER
+    "previousthread",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "previousthread",
+    EV_GETTER
+);
+Event EV_Parm_GetOther
+(
+    "other",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "other",
+    EV_GETTER
+);
+Event EV_Parm_GetOwner
+(
+    "owner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "owner",
+    EV_GETTER
+);
+Event EV_Parm_Movedone
+(
+    "movedone",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "movedone",
+    EV_GETTER
+);
+Event EV_Parm_Movefail
+(
+    "movefail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "movefail",
+    EV_GETTER
+);
+Event EV_Parm_Motionfail
+(
+    "motionfail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "motionfail",
+    EV_GETTER
+);
+Event EV_Parm_Upperfail
+(
+    "upperfail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "upperfail",
+    EV_GETTER
+);
+Event EV_Parm_Sayfail
+(
+    "sayfail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sayfail",
+    EV_GETTER
 );
 
-void Parm::Archive( Archiver& arc )
+void Parm::Archive(Archiver& arc)
 {
-	Listener::Archive( arc );
+    Listener::Archive(arc);
 
-	arc.ArchiveSafePointer( &other );
-	arc.ArchiveSafePointer( &owner );
+    arc.ArchiveSafePointer(&other);
+    arc.ArchiveSafePointer(&owner);
 }
 
-void Parm::GetOther( Event *ev )
+void Parm::GetMotionFail(Event *ev)
 {
-	ev->AddListener( other );
+    ev->AddInteger(motionfail);
 }
 
-void Parm::GetOwner( Event *ev )
+void Parm::GetMovedone(Event *ev)
 {
-	ev->AddListener( owner );
+    ev->AddInteger(movedone);
 }
 
-void Parm::GetPreviousThread( Event *ev )
+void Parm::GetMovefail(Event *ev)
 {
-	ev->AddListener( Director.PreviousThread() );
+    ev->AddInteger(movefail);
 }
 
-CLASS_DECLARATION( Listener, Parm, NULL )
+void Parm::GetOther(Event *ev)
 {
-	{ &EV_Parm_GetOther,				&Parm::GetOther },
-	{ &EV_Parm_GetOwner,				&Parm::GetOwner },
-	{ &EV_Parm_GetPreviousThread,		&Parm::GetPreviousThread },
-	{ NULL, NULL }
+    ev->AddListener(other);
+}
+
+void Parm::GetOwner(Event *ev)
+{
+    ev->AddListener(owner);
+}
+
+void Parm::GetPreviousThread(Event *ev)
+{
+    ev->AddListener(Director.PreviousThread());
+}
+
+void Parm::GetSayFail(Event *ev)
+{
+    ev->AddInteger(sayfail);
+}
+
+void Parm::GetUpperFail(Event *ev)
+{
+    ev->AddInteger(upperfail);
+}
+
+CLASS_DECLARATION(Listener, Parm, NULL) {
+    {&EV_Parm_GetPreviousThread, &Parm::GetPreviousThread},
+    {&EV_Parm_GetOther,          &Parm::GetOther         },
+    {&EV_Parm_GetOwner,          &Parm::GetOwner         },
+    {&EV_Parm_Movedone,          &Parm::GetMovedone      },
+    {&EV_Parm_Movefail,          &Parm::GetMovefail      },
+    {&EV_Parm_Motionfail,        &Parm::GetMotionFail    },
+    {&EV_Parm_Upperfail,         &Parm::GetUpperFail     },
+    {&EV_Parm_Sayfail,           &Parm::GetSayFail       },
+    {NULL,                       NULL                    }
 };
diff --git a/code/fgame/parm.h b/code/fgame/parm.h
index b942324d..aa8ae00b 100644
--- a/code/fgame/parm.h
+++ b/code/fgame/parm.h
@@ -22,34 +22,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // parm.h: Event parameters
 
-#ifndef __PARM_H__
-#define __PARM_H__
+#pragma once
 
 #include "listener.h"
 
-class Parm : public Listener {
+class Parm : public Listener
+{
 public:
-	// General trigger variables
-	SafePtr< Listener > other;
-	SafePtr< Listener > owner;
+    // General trigger variables
+    SafePtr<Listener> other;
+    SafePtr<Listener> owner;
 
-	// Failure variables
-	qboolean	movedone;
-	qboolean	movefail;
-	qboolean	motionfail;
-	qboolean	upperfail;
-	qboolean	sayfail;
+    // Failure variables
+    qboolean movedone;
+    qboolean movefail;
+    qboolean motionfail;
+    qboolean upperfail;
+    qboolean sayfail;
 
 public:
-	CLASS_PROTOTYPE( Parm );
+    CLASS_PROTOTYPE(Parm);
 
-	void Archive( Archiver& arc ) override;
+    void GetPreviousThread(Event *ev);
+    void GetOther(Event *ev);
+    void GetOwner(Event *ev);
+    void GetPath(Event *ev);
+    void GetMovedone(Event *ev);
+    void GetMovefail(Event *ev);
+    void GetMotionFail(Event *ev);
+    void GetUpperFail(Event *ev);
+    void GetSayFail(Event *ev);
 
-	void				GetOther( Event *ev );
-	void				GetOwner( Event *ev );
-	void				GetPreviousThread( Event *ev );
+    void Archive(Archiver& arc) override;
 };
 
 extern Parm parm;
-
-#endif /* __PARM_H__ */

From cc721a3db630ca95fd870abfce50b504ce095418 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 21:36:31 +0100
Subject: [PATCH 0223/2040] Lexer fixes for integer

This fixes map loading issues (fixes #258)
---
 code/parser/lex_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index bf8c3094..0cca5359 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -312,7 +312,7 @@ varname		[a-zA-Z0-9_\"]+
 [\r\n]+							{ if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
 [ \t]							{ ; }
 
-[0-9]+									{
+[0-9^`]+									{
 											char* p = nullptr;
 											yylval.s.val.intValue = std::strtol(yytext, &p, 10);
 											YYLEX(TOKEN_INTEGER);

From 7a2735885f99ea5aa5e11a3955e28823a606bf2f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 22:50:36 +0100
Subject: [PATCH 0224/2040] Send information about sentient's team

This fixes #259
---
 code/fgame/sentient.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 46535362..a8f6b6d2 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -2515,6 +2515,11 @@ void Sentient::EventGerman(Event *ev)
     if (bRejoinSquads) {
         JoinNearbySquads(1024.0f);
     }
+
+    // Added in 2.0
+    //  Tell clients about sentient team
+    edict->s.eFlags &= ~EF_ALLIES;
+    edict->s.eFlags |= EF_AXIS;
 }
 
 void Sentient::EventAmerican(Event *ev)
@@ -2546,6 +2551,11 @@ void Sentient::EventAmerican(Event *ev)
         pActor->m_csMood     = STRING_NERVOUS;
         pActor->m_csIdleMood = STRING_NERVOUS;
     }
+
+    // Added in 2.0
+    //  Tell clients about sentient team
+    edict->s.eFlags &= ~EF_AXIS;
+    edict->s.eFlags |= EF_ALLIES;
 }
 
 void Sentient::EventGetTeam(Event *ev)

From 35e6435382379a2c6f7a49cae014f07e3709faf2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:12:04 +0100
Subject: [PATCH 0225/2040] Reimplemented DropInventoryItems from 2.30

---
 code/fgame/sentient.cpp | 140 +++++++++++++++++++---------------------
 1 file changed, 67 insertions(+), 73 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index a8f6b6d2..1f6d6213 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1962,17 +1962,49 @@ void Sentient::DropInventoryItems(void)
     int   i;
     Item *item;
 
+    if (m_bForceDropHealth) {
+        giveItem("ITEMS/item_25_healthbox.tik", 25);
+    } else if (skill->integer != 2 && !level.mbNoDropHealth) {
+        static cvar_t *ai_health_kar  = gi.Cvar_Get("ai_health_kar", "6", CVAR_CHEAT);
+        static cvar_t *ai_health_mp40 = gi.Cvar_Get("ai_health_mp40points", "2", CVAR_CHEAT);
+
+        Weapon *weapon = GetActiveWeapon(WEAPON_MAIN);
+        if (weapon) {
+            if (!Q_stricmp("rifle", Director.GetString(weapon->GetWeaponGroup()))) {
+                level.mHealthPopCount++;
+            } else {
+                level.mHealthPopCount += ai_health_mp40->integer;
+            }
+
+            if (level.mHealthPopCount >= ai_health_kar->integer) {
+                giveItem("ITEMS/item_25_healthbox.tik", 25);
+                level.mHealthPopCount -= ai_health_kar->integer;
+            }
+        }
+    }
+
     // Drop any inventory items
     num = inventory.NumObjects();
     for (i = num; i >= 1; i--) {
         item = (Item *)G_GetEntity(inventory.ObjectAt(i));
-        if (item->isSubclassOf(InventoryItem)) {
-            if (m_bDontDropWeapons && item->IsSubclassOfWeapon()) {
-                item->Delete();
-            } else {
-                item->Drop();
-            }
+        // Added in 2.30
+        //  Force drop the item when specified
+        if (m_bForceDropWeapon && item->IsSubclassOfWeapon()) {
+            item->Drop();
+            continue;
         }
+
+        if (!m_bDontDropWeapons && !level.mbNoDropWeapons) {
+            item->Drop();
+            continue;
+        }
+
+        if (!item->IsSubclassOfWeapon()) {
+            item->Drop();
+            continue;
+        }
+
+        item->Delete();
     }
 }
 
@@ -2537,7 +2569,6 @@ void Sentient::EventAmerican(Event *ev)
         DisbandSquadMate(this);
     }
 
-
     Unlink();
     m_Team = TEAM_AMERICAN;
     Link();
@@ -2955,26 +2986,27 @@ void Sentient::SetMinViewVariation(const Vector& vVariation)
     m_vViewVariation.z = Q_min(m_vViewVariation.z, vVariation.z);
 }
 
-void Sentient::SetHolsteredByCode(bool holstered) {
+void Sentient::SetHolsteredByCode(bool holstered)
+{
     weapons_holstered_by_code = holstered;
 }
 
-Vehicle* Sentient::GetVehicle() const
+Vehicle *Sentient::GetVehicle() const
 {
     return m_pVehicle;
 }
 
-void Sentient::SetVehicle(Vehicle* pVehicle)
+void Sentient::SetVehicle(Vehicle *pVehicle)
 {
     m_pVehicle = NULL;
 }
 
-TurretGun* Sentient::GetTurret() const
+TurretGun *Sentient::GetTurret() const
 {
     return m_pTurret;
 }
 
-void Sentient::SetTurret(TurretGun* pTurret)
+void Sentient::SetTurret(TurretGun *pTurret)
 {
     m_pTurret = pTurret;
 }
@@ -2982,15 +3014,15 @@ void Sentient::SetTurret(TurretGun* pTurret)
 #define GROUND_DISTANCE        8
 #define WATER_NO_SPLASH_HEIGHT 16
 
-void Sentient::EventClientLanding(Event* ev)
+void Sentient::EventClientLanding(Event *ev)
 {
-    float fVolume = ev->NumArgs() >= 1 ? ev->GetFloat(1) : 1;
-    int iEquipment = ev->NumArgs() >= 2 ? ev->GetInteger(2) : 1;
+    float fVolume    = ev->NumArgs() >= 1 ? ev->GetFloat(1) : 1;
+    int   iEquipment = ev->NumArgs() >= 2 ? ev->GetInteger(2) : 1;
 
     LandingSound(fVolume, iEquipment);
 }
 
-void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
+void Sentient::FootstepMain(trace_t *trace, int iRunning, int iEquipment)
 {
     int    contents;
     int    surftype;
@@ -3010,12 +3042,10 @@ void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
         contents = gi.pointcontents(midlegs, -1);
         if (contents & MASK_WATER) {
             sSoundName += "wade";
-        }
-        else {
+        } else {
             sSoundName += "puddle";
         }
-    }
-    else {
+    } else {
         surftype = trace->surfaceFlags & MASK_SURF_TYPE;
         switch (surftype) {
         case SURF_FOLIAGE:
@@ -3075,8 +3105,7 @@ void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
         } else {
             fVolume = 1.0;
         }
-    }
-    else {
+    } else {
         fVolume = 0.25;
     }
 
@@ -3092,7 +3121,7 @@ void Sentient::FootstepMain(trace_t* trace, int iRunning, int iEquipment)
     }
 }
 
-void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
+void Sentient::Footstep(const char *szTagName, int iRunning, int iEquipment)
 {
     int           i;
     int           iTagNum;
@@ -3125,8 +3154,7 @@ void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
 
         VectorSet(vMins, -2, -2, -8);
         VectorSet(vMaxs, 2, 2, 8);
-    }
-    else {
+    } else {
         VectorSet(vMins, -4, -4, 0);
         VectorSet(vMaxs, 4, 4, 2);
 
@@ -3137,28 +3165,9 @@ void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
     }
 
     if (IsSubclassOfPlayer()) {
-        trace = G_Trace(
-            vStart,
-            vMins,
-            vMaxs,
-            vEnd,
-            edict,
-            MASK_PLAYERSOLID,
-            qtrue,
-            "Player Footsteps"
-        );
-    }
-    else {
-        trace = G_Trace(
-            vStart,
-            vMins,
-            vMaxs,
-            vEnd,
-            edict,
-            MASK_MONSTERSOLID,
-            qfalse,
-            "Monster Footsteps"
-        );
+        trace = G_Trace(vStart, vMins, vMaxs, vEnd, edict, MASK_PLAYERSOLID, qtrue, "Player Footsteps");
+    } else {
+        trace = G_Trace(vStart, vMins, vMaxs, vEnd, edict, MASK_MONSTERSOLID, qfalse, "Monster Footsteps");
     }
 
     if (trace.fraction == 1.0f) {
@@ -3170,14 +3179,14 @@ void Sentient::Footstep(const char* szTagName, int iRunning, int iEquipment)
 
 void Sentient::LandingSound(float volume, int iEquipment)
 {
-    int     contents;
-    int     surftype;
-    vec3_t  vStart, vEnd;
-    vec3_t  midlegs;
-    str     sSoundName;
-    trace_t trace;
-    static vec3_t g_vFootstepMins = { -4, -4, 0 };
-    static vec3_t g_vFootstepMaxs = { 4, 4, 2 };
+    int           contents;
+    int           surftype;
+    vec3_t        vStart, vEnd;
+    vec3_t        midlegs;
+    str           sSoundName;
+    trace_t       trace;
+    static vec3_t g_vFootstepMins = {-4, -4, 0};
+    static vec3_t g_vFootstepMaxs = {4, 4, 2};
 
     if (this->iNextLandTime > level.inttime) {
         this->iNextLandTime = level.inttime + 200;
@@ -3192,26 +3201,11 @@ void Sentient::LandingSound(float volume, int iEquipment)
     vEnd[2] -= 64.0;
 
     if (IsSubclassOfPlayer()) {
-        trace = G_Trace(
-            vStart,
-            g_vFootstepMins,
-            g_vFootstepMaxs,
-            vEnd,
-            edict,
-            MASK_PLAYERSOLID,
-            qtrue,
-            "Player Footsteps"
-        );
+        trace =
+            G_Trace(vStart, g_vFootstepMins, g_vFootstepMaxs, vEnd, edict, MASK_PLAYERSOLID, qtrue, "Player Footsteps");
     } else {
         trace = G_Trace(
-            vStart,
-            g_vFootstepMins,
-            g_vFootstepMaxs,
-            vEnd,
-            edict,
-            MASK_MONSTERSOLID,
-            qfalse,
-            "Monster Footsteps"
+            vStart, g_vFootstepMins, g_vFootstepMaxs, vEnd, edict, MASK_MONSTERSOLID, qfalse, "Monster Footsteps"
         );
     }
 

From a67dbff603eac7fc89354897dfc8776133edcc4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 21:12:23 +0100
Subject: [PATCH 0226/2040] Reset state to STAND when the player has no physics

---
 code/fgame/player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index d80e454a..8fa3d7e5 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -9979,6 +9979,10 @@ void Player::EventGetCurrentDMWeaponType(Event *ev)
 
 void Player::PhysicsOff(Event *ev)
 {
+    // Added in 2.0
+    //  Reset the state to STAND before disabling physics
+    EvaluateState(statemap_Torso->FindState("STAND"), statemap_Legs->FindState("STAND"));
+
     flags |= FL_IMMOBILE;
 }
 

From efaea69c09e23399b76647b8f34543520bb2acca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 21:12:38 +0100
Subject: [PATCH 0227/2040] Don't evaluate state when immobile

---
 code/fgame/player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 8fa3d7e5..3a908b32 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5246,6 +5246,11 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
         return;
     }
 
+    if (flags & FL_IMMOBILE) {
+        // Don't evaluate state when immobile
+        return;
+    }
+
     // Evaluate the current state.
     // When the state changes, we reevaluate the state so that if the
     // conditions aren't met in the new state, we don't play one frame of

From 0f1de72ae64b6eb3af0b937a4024e64245a22bb7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 22:51:08 +0100
Subject: [PATCH 0228/2040] Initialize the ground entity number

---
 code/fgame/player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 3a908b32..6ff7c0a7 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3670,6 +3670,10 @@ void Player::SetMoveInfo(pmove_t *pm, usercmd_t *ucmd)
     }
 
     pm->protocol = g_protocol;
+
+    // Added in OPM
+    //  Initialize the ground entity
+    pm->ps->groundEntityNum = ENTITYNUM_NONE;
 }
 
 pmtype_t Player::GetMovePlayerMoveType(void)

From d2aa26248fef46cafb9a8036db25b8e563499dd7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:01:19 +0100
Subject: [PATCH 0229/2040] Don't allow ducking when physics are off

This fixes #251
---
 code/fgame/player_conditionals.cpp | 106 +++++++++++------------------
 1 file changed, 40 insertions(+), 66 deletions(-)

diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index c0b59831..e5043e33 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -63,7 +63,6 @@ qboolean Player::CondTrue(Conditional& condition)
 }
 
 qboolean Player::CondChance(Conditional& condition)
-
 {
     float percent_chance;
 
@@ -73,7 +72,6 @@ qboolean Player::CondChance(Conditional& condition)
 }
 
 qboolean Player::CondHealth(Conditional& condition)
-
 {
     return health < atoi(condition.getParm(1));
 }
@@ -96,7 +94,6 @@ qboolean Player::CondBlocked(Conditional& condition)
 }
 
 qboolean Player::CondPain(Conditional& condition)
-
 {
     return (pain != 0 || knockdown != 0);
 }
@@ -112,13 +109,11 @@ qboolean Player::CondOnGround(Conditional& condition)
 }
 
 qboolean Player::CondHasWeapon(Conditional& condition)
-
 {
     return WeaponsOut();
 }
 
 qboolean Player::CondNewWeapon(Conditional& condition)
-
 {
     Weapon *weapon;
 
@@ -144,7 +139,6 @@ qboolean Player::CondImmediateSwitch(Conditional& condition)
 
 // Check to see if a weapon has been raised
 qboolean Player::CondUseWeapon(Conditional& condition)
-
 {
     const char *weaponName;
     const char *parm;
@@ -507,7 +501,6 @@ qboolean Player::CondPutAwayMain(Conditional& condition)
 
 // Check to see if any of the active weapons need to be put away
 qboolean Player::CondPutAwayOffHand(Conditional& condition)
-
 {
     Weapon *weapon = GetActiveWeapon(WEAPON_OFFHAND);
 
@@ -516,7 +509,6 @@ qboolean Player::CondPutAwayOffHand(Conditional& condition)
 
 // Checks to see if any weapon is active in the specified hand
 qboolean Player::CondAnyWeaponActive(Conditional& condition)
-
 {
     weaponhand_t hand;
     Weapon      *weap;
@@ -532,7 +524,6 @@ qboolean Player::CondAnyWeaponActive(Conditional& condition)
 }
 
 qboolean Player::CondAttackBlocked(Conditional& condition)
-
 {
     if (attack_blocked) {
         attack_blocked = qfalse;
@@ -618,14 +609,12 @@ qboolean Player::CondMaxChargeTime(Conditional& condition)
 }
 
 qboolean Player::CondBlockDelay(Conditional& condition)
-
 {
     float t = atof(condition.getParm(1));
     return (level.time > (attack_blocked_time + t));
 }
 
 qboolean Player::CondMuzzleClear(Conditional& condition)
-
 {
     weaponhand_t hand;
 
@@ -641,7 +630,6 @@ qboolean Player::CondMuzzleClear(Conditional& condition)
 
 // Checks to see if any weapon is active in the specified hand
 qboolean Player::CondWeaponHasAmmo(Conditional& condition)
-
 {
     weaponhand_t hand;
     Weapon      *weap;
@@ -779,24 +767,35 @@ qboolean Player::CondStrafeLeft(Conditional& condition)
 }
 
 qboolean Player::CondStrafeRight(Conditional& condition)
-
 {
     return last_ucmd.rightmove > 0;
 }
 
 qboolean Player::CondJump(Conditional& condition)
-
 {
+    if (client->ps.pm_flags & PMF_NO_MOVE) {
+        return false;
+    }
+
     return last_ucmd.upmove > 0;
 }
 
 qboolean Player::CondCrouch(Conditional& condition)
 {
+    // Added in 2.0
+    //  Don't crouch if the player is not moving
+    if (client->ps.pm_flags & PMF_NO_MOVE) {
+        // Added in 2.30
+        //  Allow ducking if specified
+        if (!m_pGlueMaster || !m_bGlueDuckable) {
+            return viewheight != DEFAULT_VIEWHEIGHT;
+        }
+    }
+
     return (last_ucmd.upmove) < 0;
 }
 
 qboolean Player::CondJumpFlip(Conditional& condition)
-
 {
     return velocity.z < (sv_gravity->value * 0.5f);
 }
@@ -813,6 +812,8 @@ qboolean Player::CondAnimDoneTorso(Conditional& condition)
 
 qboolean Player::CondAttackPrimary(Conditional& condition)
 {
+    Weapon* weapon;
+
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
     }
@@ -821,21 +822,19 @@ qboolean Player::CondAttackPrimary(Conditional& condition)
         return false;
     }
 
-    if (last_ucmd.buttons & BUTTON_ATTACKLEFT) {
-        Weapon *weapon;
-
-        last_attack_button = BUTTON_ATTACKLEFT;
-
-        weapon = GetActiveWeapon(WEAPON_MAIN);
-        if (weapon) {
-            return true;
-        }
-
-        // No ammo
-        return false;
-    } else {
+    if (!(last_ucmd.buttons & BUTTON_ATTACKLEFT)) {
         return false;
     }
+
+    last_attack_button = BUTTON_ATTACKLEFT;
+
+    weapon = GetActiveWeapon(WEAPON_MAIN);
+    if (weapon) {
+        return true;
+    }
+
+    // No ammo
+    return false;
 }
 
 qboolean Player::CondAttackButtonPrimary(Conditional& condition)
@@ -853,6 +852,8 @@ qboolean Player::CondAttackButtonPrimary(Conditional& condition)
 
 qboolean Player::CondAttackSecondary(Conditional& condition)
 {
+    Weapon* weapon;
+
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
     }
@@ -861,21 +862,19 @@ qboolean Player::CondAttackSecondary(Conditional& condition)
         return false;
     }
 
-    if (last_ucmd.buttons & BUTTON_ATTACKRIGHT) {
-        Weapon *weapon;
-
-        last_attack_button = BUTTON_ATTACKRIGHT;
-
-        weapon = GetActiveWeapon(WEAPON_MAIN);
-        if (weapon) {
-            return true;
-        }
-
-        // No ammo
-        return false;
-    } else {
+    if (!(last_ucmd.buttons & BUTTON_ATTACKRIGHT)) {
         return false;
     }
+
+    last_attack_button = BUTTON_ATTACKRIGHT;
+
+    weapon = GetActiveWeapon(WEAPON_MAIN);
+    if (weapon) {
+        return true;
+    }
+
+    // No ammo
+    return false;
 }
 
 qboolean Player::CondAttackButtonSecondary(Conditional& condition)
@@ -935,13 +934,11 @@ qboolean Player::CondRun(Conditional& condition)
 }
 
 qboolean Player::CondUse(Conditional& condition)
-
 {
     return (last_ucmd.buttons & BUTTON_USE) != 0;
 }
 
 qboolean Player::CondCanTurn(Conditional& condition)
-
 {
     float    yaw;
     Vector   oldang(v_angle);
@@ -1042,7 +1039,6 @@ qboolean Player::CondHasVelocity(Conditional& condition)
 }
 
 qboolean Player::Cond22DegreeSlope(Conditional& condition)
-
 {
     if (client->ps.walking && client->ps.groundPlane && (client->ps.groundTrace.plane.normal[2] < SLOPE_22_MAX)
         && (client->ps.groundTrace.plane.normal[2] >= SLOPE_22_MIN)) {
@@ -1053,7 +1049,6 @@ qboolean Player::Cond22DegreeSlope(Conditional& condition)
 }
 
 qboolean Player::Cond45DegreeSlope(Conditional& condition)
-
 {
     if (client->ps.walking && client->ps.groundPlane && (client->ps.groundTrace.plane.normal[2] < SLOPE_45_MAX)
         && (client->ps.groundTrace.plane.normal[2] >= SLOPE_45_MIN)) {
@@ -1064,7 +1059,6 @@ qboolean Player::Cond45DegreeSlope(Conditional& condition)
 }
 
 qboolean Player::CondRightLegHigh(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1078,7 +1072,6 @@ qboolean Player::CondRightLegHigh(Conditional& condition)
 }
 
 qboolean Player::CondLeftLegHigh(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1092,7 +1085,6 @@ qboolean Player::CondLeftLegHigh(Conditional& condition)
 }
 
 qboolean Player::CondFacingUpSlope(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1106,7 +1098,6 @@ qboolean Player::CondFacingUpSlope(Conditional& condition)
 }
 
 qboolean Player::CondFacingDownSlope(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1120,13 +1111,11 @@ qboolean Player::CondFacingDownSlope(Conditional& condition)
 }
 
 qboolean Player::CondFalling(Conditional& condition)
-
 {
     return falling;
 }
 
 qboolean Player::CondGroundEntity(Conditional& condition)
-
 {
     return (groundentity != NULL);
 }
@@ -1147,14 +1136,12 @@ qboolean Player::CondCanFall(Conditional& condition)
 }
 
 qboolean Player::CondAtDoor(Conditional& condition)
-
 {
     // Check if the player is at a door
     return (atobject && atobject->isSubclassOf(Door));
 }
 
 qboolean Player::CondAtUseAnim(Conditional& condition)
-
 {
     // Check if the player is at a useanim
     if (atobject && atobject->isSubclassOf(UseAnim)) {
@@ -1165,7 +1152,6 @@ qboolean Player::CondAtUseAnim(Conditional& condition)
 }
 
 qboolean Player::CondTouchUseAnim(Conditional& condition)
-
 {
     if (toucheduseanim) {
         return ((UseAnim *)(Entity *)toucheduseanim)->canBeUsed(this);
@@ -1175,13 +1161,11 @@ qboolean Player::CondTouchUseAnim(Conditional& condition)
 }
 
 qboolean Player::CondUseAnimFinished(Conditional& condition)
-
 {
     return (useanim_numloops <= 0);
 }
 
 qboolean Player::CondAtUseObject(Conditional& condition)
-
 {
     // Check if the player is at a useanim
     if (atobject && atobject->isSubclassOf(UseObject)) {
@@ -1192,7 +1176,6 @@ qboolean Player::CondAtUseObject(Conditional& condition)
 }
 
 qboolean Player::CondLoopUseObject(Conditional& condition)
-
 {
     // Check if the player is at a useanim
     if (useitem_in_use && useitem_in_use->isSubclassOf(UseObject)) {
@@ -1203,13 +1186,11 @@ qboolean Player::CondLoopUseObject(Conditional& condition)
 }
 
 qboolean Player::CondDead(Conditional& condition)
-
 {
     return (deadflag);
 }
 
 qboolean Player::CondKnockDown(Conditional& condition)
-
 {
     if (knockdown) {
         knockdown = false;
@@ -1294,7 +1275,6 @@ qboolean Player::CondPainLocation(Conditional& condition)
 }
 
 qboolean Player::CondPainThreshold(Conditional& condition)
-
 {
     float threshold = atof(condition.getParm(1));
 
@@ -1307,7 +1287,6 @@ qboolean Player::CondPainThreshold(Conditional& condition)
 }
 
 qboolean Player::CondLegsState(Conditional& condition)
-
 {
     if (currentState_Legs) {
         str current = currentState_Legs->getName();
@@ -1322,7 +1301,6 @@ qboolean Player::CondLegsState(Conditional& condition)
 }
 
 qboolean Player::CondTorsoState(Conditional& condition)
-
 {
     if (currentState_Torso) {
         str current = currentState_Torso->getName();
@@ -1337,7 +1315,6 @@ qboolean Player::CondTorsoState(Conditional& condition)
 }
 
 qboolean Player::CondStateName(Conditional& condition)
-
 {
     str part      = condition.getParm(1);
     str statename = condition.getParm(2);
@@ -1352,7 +1329,6 @@ qboolean Player::CondStateName(Conditional& condition)
 }
 
 qboolean Player::CondPush(Conditional& condition)
-
 {
     // Check if the player is at a pushobject
     if (atobject && atobject->isSubclassOf(PushObject) && (atobject_dist < (PUSH_OBJECT_DISTANCE + 15.0f))) {
@@ -1366,7 +1342,6 @@ qboolean Player::CondPush(Conditional& condition)
 }
 
 qboolean Player::CondPull(Conditional& condition)
-
 {
     // Check if the player is at a pushobject
     if (atobject && atobject->isSubclassOf(PushObject) && (atobject_dist < (PUSH_OBJECT_DISTANCE + 15.0f))) {
@@ -1511,7 +1486,6 @@ qboolean Player::CondLookingUp(Conditional& condition)
 }
 
 qboolean Player::CondCanStand(Conditional& condition)
-
 {
     Vector  newmins(mins);
     Vector  newmaxs(maxs);

From e8a48184b923a95dc379b0545cc761c28e8967a4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:09:29 +0100
Subject: [PATCH 0230/2040] Set the ground entity number to the glue master

---
 code/fgame/player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 6ff7c0a7..45c9aa60 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3574,6 +3574,10 @@ void Player::GetMoveInfo(pmove_t *pm)
         if (groundentity->entity && groundentity->entity != this && groundentity->entity->velocity[2] != 0) {
             pm->ps->pm_flags |= PMF_NO_PREDICTION;
         }
+    } else if (m_pGlueMaster) {
+        // Added in OPM
+        //  Use the glue master for the ground entity to make the viewmodel will stay still
+        pm->ps->groundEntityNum = m_pGlueMaster->entnum;
     }
 
     velocity = Vector(pm->ps->velocity[0], pm->ps->velocity[1], pm->ps->velocity[2]);

From a0cb46d4a1d957c6a79793d22c1dbde4d22a15fc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:09:57 +0100
Subject: [PATCH 0231/2040] Formatting

---
 code/fgame/player.cpp | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 45c9aa60..88451905 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2304,7 +2304,6 @@ void Player::InitEdict(void)
 }
 
 void Player::InitSound(void)
-
 {
     //
     // reset the music
@@ -2390,7 +2389,6 @@ void Player::InitState(void)
 }
 
 void Player::InitHealth(void)
-
 {
     static cvar_t *pMaxHealth = gi.Cvar_Get("g_maxplayerhealth", "250", 0);
     static cvar_t *pDMHealth  = gi.Cvar_Get("g_playerdmhealth", "100", 0);
@@ -2562,7 +2560,6 @@ void Player::InitPhysics(void)
 }
 
 void Player::InitPowerups(void)
-
 {
     // powerups
     poweruptimer = 0;
@@ -2667,7 +2664,6 @@ void Player::ChooseSpawnPoint(void)
 }
 
 void Player::EndLevel(Event *ev)
-
 {
     InitPowerups();
     if (health > max_health) {
@@ -2725,7 +2721,6 @@ void Player::Respawn(Event *ev)
 }
 
 void Player::SetDeltaAngles(void)
-
 {
     int i;
 
@@ -3751,7 +3746,6 @@ qboolean Player::AnimMove(Vector& move, Vector *endpos)
 }
 
 qboolean Player::TestMove(Vector& move, Vector *endpos)
-
 {
     trace_t trace;
     Vector  pos(origin + move);
@@ -3804,7 +3798,6 @@ qboolean Player::TestMove(Vector& move, Vector *endpos)
 }
 
 float Player::TestMoveDist(Vector& move)
-
 {
     Vector endpos;
 
@@ -3890,7 +3883,6 @@ qboolean Player::CheckMove(Vector& move, Vector *endpos)
 }
 
 float Player::CheckMoveDist(Vector& move)
-
 {
     Vector endpos;
 
@@ -4988,7 +4980,6 @@ void Player::ResetState(Event *ev)
 }
 
 void Player::StartPush(void)
-
 {
     trace_t trace;
     Vector  end(origin + yaw_forward * 64.0f);
@@ -5004,7 +4995,6 @@ void Player::StartPush(void)
 }
 
 void Player::StartClimbLadder(void)
-
 {
     trace_t trace;
     Vector  end(origin + yaw_forward * 20.0f);
@@ -5081,13 +5071,11 @@ void Player::StartUseAnim(void)
 }
 
 void Player::StartLoopUseAnim(void)
-
 {
     useanim_numloops--;
 }
 
 void Player::FinishUseAnim(Event *ev)
-
 {
     UseAnim *ua;
 
@@ -5101,7 +5089,6 @@ void Player::FinishUseAnim(Event *ev)
 }
 
 void Player::SetupUseObject(void)
-
 {
     UseObject *uo;
     Vector     neworg;
@@ -5151,7 +5138,6 @@ void Player::SetupUseObject(void)
 }
 
 void Player::StartUseObject(Event *ev)
-
 {
     UseObject *uo;
 
@@ -5164,7 +5150,6 @@ void Player::StartUseObject(Event *ev)
 }
 
 void Player::FinishUseObject(Event *ev)
-
 {
     UseObject *uo;
 
@@ -5178,7 +5163,6 @@ void Player::FinishUseObject(Event *ev)
 }
 
 void Player::Turn(Event *ev)
-
 {
     float  yaw;
     Vector oldang(v_angle);
@@ -5202,7 +5186,6 @@ void Player::Turn(Event *ev)
 }
 
 void Player::TurnUpdate(Event *ev)
-
 {
     float  yaw;
     float  timeleft;
@@ -5231,7 +5214,6 @@ void Player::TurnUpdate(Event *ev)
 }
 
 void Player::TurnLegs(Event *ev)
-
 {
     float yaw;
 
@@ -5611,13 +5593,11 @@ void Player::DropCurrentWeapon(Event *ev)
 }
 
 void Player::GiveWeaponCheat(Event *ev)
-
 {
     giveItem(ev->GetString(1));
 }
 
 void Player::GiveCheat(Event *ev)
-
 {
     str name;
 
@@ -5806,7 +5786,6 @@ void Player::NoclipCheat(Event *ev)
 }
 
 void Player::GameVersion(Event *ev)
-
 {
     gi.SendServerCommand(edict - g_entities, "print \"%s : %s\n\"", GAMEVERSION, __DATE__);
 }
@@ -5865,7 +5844,6 @@ CalcRoll
 ===============
 */
 float Player::CalcRoll(void)
-
 {
     float  sign;
     float  side;
@@ -5976,7 +5954,6 @@ AddBlend
 =============
 */
 void Player::AddBlend(float r, float g, float b, float a)
-
 {
     float a2;
     float a3;
@@ -6003,7 +5980,6 @@ CalcBlend
 =============
 */
 void Player::CalcBlend(void)
-
 {
     int    contents;
     Vector vieworg;
@@ -6763,7 +6739,6 @@ void Player::SetupView(void)
 }
 
 Vector Player::GetAngleToTarget(Entity *ent, str tag, float yawclamp, float pitchclamp, Vector baseangles)
-
 {
     assert(ent);
 
@@ -6808,7 +6783,6 @@ Vector Player::GetAngleToTarget(Entity *ent, str tag, float yawclamp, float pitc
 }
 
 void Player::DebugWeaponTags(int controller_tag, Weapon *weapon, str weapon_tagname)
-
 {
     int           i;
     orientation_t bone_or, tag_weapon_or, barrel_or, final_barrel_or;
@@ -7506,14 +7480,12 @@ void Player::UpdateMusic(void)
 }
 
 void Player::SetReverb(int type, float level)
-
 {
     reverb_type  = type;
     reverb_level = level;
 }
 
 void Player::SetReverb(str type, float level)
-
 {
     reverb_type  = EAXMode_NameToNum(type);
     reverb_level = level;
@@ -7591,7 +7563,6 @@ void Player::EndFrame(void)
 }
 
 void Player::GotKill(Event *ev)
-
 {
     /*
     Entity *victim;
@@ -7614,7 +7585,6 @@ void Player::GotKill(Event *ev)
 }
 
 void Player::SetPowerupTimer(Event *ev)
-
 {
     Event *event;
 
@@ -7625,7 +7595,6 @@ void Player::SetPowerupTimer(Event *ev)
 }
 
 void Player::UpdatePowerupTimer(Event *ev)
-
 {
     poweruptimer -= 1;
     if (poweruptimer > 0) {
@@ -7663,7 +7632,6 @@ void Player::ChangeMusic(const char *current, const char *fallback, qboolean for
 }
 
 void Player::ChangeMusicVolume(float volume, float fade_time)
-
 {
     music_volume_fade_time = fade_time;
     music_saved_volume     = music_current_volume;
@@ -7671,7 +7639,6 @@ void Player::ChangeMusicVolume(float volume, float fade_time)
 }
 
 void Player::RestoreMusicVolume(float fade_time)
-
 {
     music_volume_fade_time = fade_time;
     music_current_volume   = music_saved_volume;
@@ -7688,7 +7655,6 @@ void Player::addOrigin(Vector org)
 }
 
 void Player::Jump(Event *ev)
-
 {
     float maxheight;
 
@@ -7750,7 +7716,6 @@ void Player::SetTargetViewAngles(Vector angles)
 }
 
 void Player::DumpState(Event *ev)
-
 {
     gi.DPrintf(
         "Legs: %s Torso: %s\n", currentState_Legs ? currentState_Legs->getName() : "NULL", currentState_Torso->getName()
@@ -7904,7 +7869,6 @@ void Player::Holster(Event *ev)
 }
 
 void Player::WatchActor(Event *ev)
-
 {
     if (camera || currentState_Torso->getCameraType() != CAMERA_BEHIND) {
         return;
@@ -7914,7 +7878,6 @@ void Player::WatchActor(Event *ev)
 }
 
 void Player::StopWatchingActor(Event *ev)
-
 {
     Actor *old_actor;
 
@@ -7937,7 +7900,6 @@ void Player::setAngles(Vector ang)
 }
 
 painDirection_t Player::Pain_string_to_int(str pain)
-
 {
     if (!pain.icmp(pain, "Front")) {
         return PAIN_FRONT;
@@ -11203,7 +11165,6 @@ void Player::EventSetPerferredWeapon(Event *ev)
 }
 
 void Player::SetMouthAngle(Event *ev)
-
 {
     int    tag_num;
     float  angle_percent;

From 35e9f9982cae8dc2f759b72acad62d27f7bb1d75 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:19:59 +0100
Subject: [PATCH 0232/2040] Preallocate arguments for sp/dm commands

---
 code/fgame/entity.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 3b9156dc..711eaa05 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -6084,7 +6084,7 @@ void Entity::EventGetRotatedBbox(Event *ev)
 void Entity::EventSinglePlayerCommand(Event *ev)
 {
     if (g_gametype->integer == GT_SINGLE_PLAYER && !g_realismmode->integer) {
-        Event *newev = new Event(ev->GetToken(1));
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6097,7 +6097,7 @@ void Entity::EventSinglePlayerCommand(Event *ev)
 void Entity::EventMultiPlayerCommand(Event *ev)
 {
     if (g_gametype->integer != GT_SINGLE_PLAYER && !g_realismmode->integer) {
-        Event *newev = new Event(ev->GetToken(1));
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6110,7 +6110,7 @@ void Entity::EventMultiPlayerCommand(Event *ev)
 void Entity::EventRealismModeCommand(Event *ev)
 {
     if (g_realismmode->integer) {
-        Event *newev = new Event(ev->GetToken(1));
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6122,8 +6122,8 @@ void Entity::EventRealismModeCommand(Event *ev)
 
 void Entity::EventSPRealismModeCommand(Event *ev)
 {
-    if (g_realismmode->integer && g_gametype->integer == GT_SINGLE_PLAYER) {
-        Event *newev = new Event(ev->GetToken(1));
+    if (g_gametype->integer == GT_SINGLE_PLAYER && g_realismmode->integer) {
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6135,8 +6135,8 @@ void Entity::EventSPRealismModeCommand(Event *ev)
 
 void Entity::EventDMRealismModeCommand(Event *ev)
 {
-    if (g_realismmode->integer && g_gametype->integer != GT_SINGLE_PLAYER) {
-        Event *newev = new Event(ev->GetToken(1));
+    if (g_gametype->integer != GT_SINGLE_PLAYER && g_realismmode->integer) {
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));

From f229c1c5a82a05103ca4e9a949d852c0d84d4d6f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:21:44 +0100
Subject: [PATCH 0233/2040] Fixed player health in SP

---
 code/fgame/player.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 88451905..bcd25456 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2399,23 +2399,17 @@ void Player::InitHealth(void)
         return;
     }
 
-    if (g_gametype->integer != GT_SINGLE_PLAYER) {
-        if (pDMHealth->integer > 0) {
-            max_health = pDMHealth->integer;
-        } else {
-            max_health = 100.f;
-        }
-
-        health = max_health;
-    } else if (!g_realismmode->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER && !g_realismmode->integer) {
         max_health = pMaxHealth->integer;
-        health     = max_health;
+    } else if (g_gametype->integer != GT_SINGLE_PLAYER && pDMHealth->integer > 0) {
+        max_health = pDMHealth->integer;
     } else {
         // reset the health values
-        health     = 100;
-        max_health = health;
+        max_health = 100;
     }
 
+    health = max_health;
+
     // 2.0:
     //  Make sure to clear the heal rate and the dead flag when respawning
     //

From 593982d58649125774bb401063817a7fe138f982 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:53:18 +0100
Subject: [PATCH 0234/2040] Added assertion test

---
 code/renderer/tr_terrain.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 7ed98a69..80c4bb01 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -424,6 +424,8 @@ static void R_ForceSplit(terraInt iTri)
 	terraTri_t* pBase = &g_pTris[iBase];
 	if (iBase && pBase->lod != pTri->lod)
 	{
+		assert(g_pTris[pBase->iBase].iBase != iTri);
+
 		R_ForceSplit(iBase);
 		iBase = pTri->iBase;
 		pBase = &g_pTris[iBase];

From 9960884e3c8890383e034a7b6144cbef569f8cc4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:53:27 +0100
Subject: [PATCH 0235/2040] Initialize watchFadeTime

---
 code/fgame/camera.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/camera.cpp b/code/fgame/camera.cpp
index 1f118927..c54b51d8 100644
--- a/code/fgame/camera.cpp
+++ b/code/fgame/camera.cpp
@@ -725,6 +725,7 @@ Camera::Camera()
     fadeTime       = 2.0f;
     fovFadeTime    = 1.0f;
     followFadeTime = 1.0f;
+    watchFadeTime  = 1.0f;
     m_bShowquakes  = false;
 
     setSolidType(SOLID_NOT);

From 64604b5c44646920307e334c0ab5af654affeefe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 18:43:42 +0100
Subject: [PATCH 0236/2040] Disable non-pvs sound in single-player

This fixes #267 where configstrings are full
---
 code/fgame/entity.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 711eaa05..655c3fc4 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -6308,6 +6308,11 @@ void Entity::PlayNonPvsSound(const str& soundName, float volume)
     AliasListNode_t* ret;
     str name;
 
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        // Ignore in single-player
+        return;
+    }
+
     if (edict->r.num_nonpvs_sounds >= MAX_NONPVS_SOUNDS) {
         return;
     }

From 57870103a66ce7876d3b263c890feee01d6c5da0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 18:54:42 +0100
Subject: [PATCH 0237/2040] Fixed TriggerVehicle not responding to
 VehicleCollisionEntity

---
 code/fgame/trigger.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index a62fde94..1c504090 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -839,7 +839,7 @@ CLASS_DECLARATION(Trigger, TriggerVehicle, "trigger_vehicle") {
 
 qboolean TriggerVehicle::respondTo(Entity *other)
 {
-    if ((other->IsSubclassOfVehicle()) || isSubclassOf(VehicleCollisionEntity)) {
+    if ((other->IsSubclassOfVehicle()) || other->isSubclassOf(VehicleCollisionEntity)) {
         return qtrue;
     } else {
         return qfalse;

From 2d6ac6f0be433932287ab0a7e1bb5037c4f339ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 19:15:41 +0100
Subject: [PATCH 0238/2040] Fixed weapon melee AI broadcast

---
 code/fgame/weapon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 98a37e51..cc26ed6e 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2004,7 +2004,7 @@ void Weapon::Shoot(Event *ev)
             break;
         }
 
-        if (!quiet[firemodeindex]) {
+        if (!quiet[mode]) {
             if (next_noise_time <= level.time) {
                 BroadcastAIEvent(AI_EVENT_WEAPON_FIRE);
                 next_noise_time = level.time + 1;

From 73c9e6f1d89ad4dd02a78a7d72f3c87b3006ad7a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 19:16:07 +0100
Subject: [PATCH 0239/2040] Ignore disabled ennemies

---
 code/fgame/actorenemy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index 5c83595f..cb463d68 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -353,7 +353,7 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
         pActorEnemy = &m_Enemies[i - 1];
         if (!pActorEnemy->GetEnemy() || pActorEnemy->GetEnemy()->m_Team == pSelf->m_Team
             || pActorEnemy->GetEnemy()->IsDead() || level.inttime > pActorEnemy->m_iAddTime + 10000
-            || pActorEnemy->GetEnemy()->m_iThreatBias == THREATBIAS_IGNOREME) {
+            || pActorEnemy->GetEnemy()->m_iThreatBias == THREATBIAS_IGNOREME || pActorEnemy->GetEnemy()->IsDisabled()) {
             m_Enemies.RemoveObjectAt(i);
         } else {
             i++;

From c391605f616e6080ff887a7b881a74446401bc81 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 20:10:02 +0100
Subject: [PATCH 0240/2040] Fixed AI attacking the disguised player

This fixes #203
---
 code/fgame/actor_disguise_salute.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor_disguise_salute.cpp b/code/fgame/actor_disguise_salute.cpp
index d55235ba..c1b0f62a 100644
--- a/code/fgame/actor_disguise_salute.cpp
+++ b/code/fgame/actor_disguise_salute.cpp
@@ -51,7 +51,7 @@ void Actor::Begin_DisguiseSalute(void)
         SetDesiredYawDest(m_Enemy->origin);
         SetDesiredLookDir(m_Enemy->origin - origin);
 
-        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_PAPERS_SCR);
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_SALUTE_SCR);
     } else {
         SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
     }
@@ -85,7 +85,12 @@ void Actor::Think_DisguiseSalute(void)
         return;
     }
 
-    if ((!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET)) || level.m_bAlarm != qtrue) {
+    if (!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET)) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
+
+    if (level.m_bAlarm == qtrue) {
         SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
         return;
     }

From e5275c0f055eda873bb5a3ee9a27414a77781a79 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Feb 2024 21:26:08 +0100
Subject: [PATCH 0241/2040] Fixed MASK_TRANSITION being wrong

---
 code/fgame/bg_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 5d14c9a5..3fce4de4 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -663,7 +663,7 @@ movement on the server game.
 #define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
 #define MASK_CLICKITEM   (MASK_SOLID | CONTENTS_UNKNOWN3)
 #define MASK_ITEM          (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
-#define MASK_TRANSITION    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
+#define MASK_TRANSITION    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
 #define MASK_TARGETPATH \
     (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_MONSTERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
 #define MASK_ACTORPATH (CONTENTS_SOLID | CONTENTS_FENCE | CONTENTS_MONSTERCLIP | CONTENTS_TRIGGER)

From 49a7a1f8ffee54d7f0ec015b04ca91df94ac43ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 15:53:17 +0100
Subject: [PATCH 0242/2040] minimum visibility is 0.999 and not 1.0

---
 code/fgame/actorenemy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index cb463d68..f99020b4 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -389,7 +389,7 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
                     "ent #%3i: enemy #%i: awareness = %5.1f%%, threat = %i\n",
                     pSelf->entnum,
                     pActorEnemy->GetEnemy()->entnum,
-                    (int)(fVisibility * 100.0),
+                    (fVisibility * 100.0),
                     0
                 );
             }
@@ -420,7 +420,7 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
     m_iCurrentThreat = 0;
     fRangeSquared    = 1e37f;
 
-    if (m_fCurrentVisibility >= 1) {
+    if (m_fCurrentVisibility >= 0.999f) {
         iThreat = 0;
 
         for (i = 1; i <= m_Enemies.NumObjects(); i++) {

From e32222884d59e37cb8ca9d8b4ddab6953be66b5d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 15:53:38 +0100
Subject: [PATCH 0243/2040] Fixed DisguiseSalute never finishing animation

---
 code/fgame/actor_disguise_salute.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/actor_disguise_salute.cpp b/code/fgame/actor_disguise_salute.cpp
index c1b0f62a..75aa6041 100644
--- a/code/fgame/actor_disguise_salute.cpp
+++ b/code/fgame/actor_disguise_salute.cpp
@@ -31,6 +31,7 @@ void Actor::InitDisguiseSalute(GlobalFuncs_t *func)
     func->EndState                   = &Actor::End_DisguiseSalute;
     func->ResumeState                = &Actor::Resume_DisguiseSalute;
     func->SuspendState               = &Actor::Suspend_DisguiseSalute;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_DisguiseSalute;
     func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Disguise;
     func->IsState                    = &Actor::IsDisguiseState;
 }

From a6c1cbfd5041c3c1d3224c2a145451cee55c903d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 16:34:31 +0100
Subject: [PATCH 0244/2040] Added MASK_USE

---
 code/fgame/bg_public.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 3fce4de4..0824473c 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -661,6 +661,7 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
+#define MASK_USE (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_CLICKITEM   (MASK_SOLID | CONTENTS_UNKNOWN3)
 #define MASK_ITEM          (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
 #define MASK_TRANSITION    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)

From 58d0e43f78615e3262eb199a103431d948a9be79 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:37:38 +0100
Subject: [PATCH 0245/2040] Use MASK_USE instead of MASK_SOLID

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index bcd25456..57da2398 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -12441,7 +12441,7 @@ int Player::getUseableEntities(int *touch, int maxcount, bool requiresLookAt)
             end[2] = start[2] + (offset[2] * 88.f);
         }
 
-        trace = G_Trace(start, min, max, end, this, MASK_SOLID, false, "Player::getUseableEntity");
+        trace = G_Trace(start, min, max, end, this, MASK_USE, false, "Player::getUseableEntity");
 
         offset = trace.endpos;
 

From e27ac45f44bffcb51fadc1d92529665609f3b354 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 19:08:21 +0100
Subject: [PATCH 0246/2040] Don't load TGA without alpha for collision

---
 code/qcommon/cm_fencemask.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/cm_fencemask.c b/code/qcommon/cm_fencemask.c
index a32291ac..70747b69 100644
--- a/code/qcommon/cm_fencemask.c
+++ b/code/qcommon/cm_fencemask.c
@@ -123,10 +123,14 @@ qboolean CM_LoadTGA( const char *name, byte **pic, int *width, int *height )
 	if(targa_header.colormap_type!=0)
 		Com_Error (ERR_DROP, "LoadTGA: colormaps not supported\n");
 
-	if (targa_header.colormap_type !=0 
-		|| (targa_header.pixel_size!=32 && targa_header.pixel_size!=24))
-		Com_Error (ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+	if (targa_header.pixel_size != 32) {
+        if (targa_header.pixel_size != 24 && targa_header.image_type != 3) {
+            Com_Error(ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+		}
 
+		FS_FreeFile(buffer);
+		return qfalse;
+	}
 	columns = targa_header.width;
 	rows = targa_header.height;
 	numPixels = columns * rows;

From 4f868d9585fa66e1ab00904f72a1fde8d4b50582 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 19:19:38 +0100
Subject: [PATCH 0247/2040] Fixed a collision bug with fence masks

---
 code/qcommon/cm_trace.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
index 7122f200..d7238063 100644
--- a/code/qcommon/cm_trace.c
+++ b/code/qcommon/cm_trace.c
@@ -753,17 +753,17 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
 					return;
 				}
 			}
-		}
 
-		if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
-			if( leaveFrac2 < tw->trace.fraction ) {
-				if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
-					tw->trace.fraction = leaveFrac2;
-					tw->trace.plane = *clipplane2;
-					tw->trace.surfaceFlags = leadside2->surfaceFlags;
-					tw->trace.shaderNum = leadside2->shaderNum;
-					tw->trace.contents = brush->contents;
-					return;
+			if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
+				if( leaveFrac2 < tw->trace.fraction ) {
+					if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
+						tw->trace.fraction = leaveFrac2;
+						tw->trace.plane = *clipplane2;
+						tw->trace.surfaceFlags = leadside2->surfaceFlags;
+						tw->trace.shaderNum = leadside2->shaderNum;
+						tw->trace.contents = brush->contents;
+						return;
+					}
 				}
 			}
 		}
@@ -1754,12 +1754,12 @@ qboolean CM_SightTraceThroughBrush( traceWork_t *tw, cbrush_t *brush )
 					return qfalse;
 				}
 			}
-		}
 
-		if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
-			if( leaveFrac2 < tw->trace.fraction ) {
-				if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
-					return qfalse;
+			if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
+				if( leaveFrac2 < tw->trace.fraction ) {
+					if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
+						return qfalse;
+					}
 				}
 			}
 		}

From d8b9abe7f52076b90d102934b1a254f501f20f27 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 19:21:12 +0100
Subject: [PATCH 0248/2040] Fixed call to GunTarget()

It was specifying the position in the boolean parameter which lead to wrong results
---
 code/fgame/vehicleturret.cpp | 2 +-
 code/fgame/weapturret.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 1f03349d..5e58c1c9 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -1104,7 +1104,7 @@ void VehicleTurretGun::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec
             VectorCopy(position, vBarrelPos);
         }
 
-        delta      = viewer->GunTarget(position) - position;
+        delta      = viewer->GunTarget(false, position) - position;
         aim_angles = delta.toAngles();
 
         if (IsSubclassOfVehicleTurretGun()) {
diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index c8327663..96685089 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -2111,7 +2111,7 @@ void TurretGun::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t for
             VectorCopy(position, vBarrelPos);
         }
 
-        delta      = viewer->GunTarget(position) - position;
+        delta      = viewer->GunTarget(false, position) - position;
         aim_angles = delta.toAngles();
 
         if (IsSubclassOfVehicleTurretGun()) {

From d972c85fba7b7b299a60739996db374eb471d9e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 19:33:52 +0100
Subject: [PATCH 0249/2040] Formatted debuglines source file

---
 code/fgame/debuglines.cpp | 1312 ++++++++++++++++---------------------
 code/fgame/debuglines.h   |    5 +-
 2 files changed, 565 insertions(+), 752 deletions(-)

diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp
index 7aa7dfa2..16a4023d 100644
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
@@ -21,371 +21,279 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // debuglines.cpp:
-// 
+//
 
 #include "debuglines.h"
 #include "game.h"
 
 #define NUM_CIRCLE_SEGMENTS 24
 
-debugline_t		*DebugLines = NULL;
-debugstring_t	*DebugStrings = NULL;
-Vector		   currentVertex( 0, 0, 0 );
-Vector		   vertColor( 1, 1, 1 );
-float			   vertAlpha = 1;
-float			   vertexIndex = 0;
-float          linewidth = 1;
+debugline_t   *DebugLines   = NULL;
+debugstring_t *DebugStrings = NULL;
+Vector         currentVertex(0, 0, 0);
+Vector         vertColor(1, 1, 1);
+float          vertAlpha         = 1;
+float          vertexIndex       = 0;
+float          linewidth         = 1;
 unsigned short lineStippleFactor = 1;
-unsigned short linePattern = 0xffff;
-int g_iFirstLine;
-int g_iCurrFrameLineCounter;
-int g_iFrameLineCount[ 100 ];
+unsigned short linePattern       = 0xffff;
+int            g_iFirstLine;
+int            g_iCurrFrameLineCounter;
+int            g_iFrameLineCount[100];
 
-void G_InitDebugLines
-	(
-	void
-	)
+void G_InitDebugLines(void)
 {
-	if( g_numdebuglinedelays->integer <= 0 )
-	{
-		*gi.DebugLines = DebugLines;
-		*gi.numDebugLines = 0;
-		g_iFirstLine = 0;
+    if (g_numdebuglinedelays->integer <= 0) {
+        *gi.DebugLines    = DebugLines;
+        *gi.numDebugLines = 0;
+        g_iFirstLine      = 0;
 
-		for( int i = 0; i < 100; i++ )
-		{
-			g_iFrameLineCount[ i ] = 0;
-		}
+        for (int i = 0; i < 100; i++) {
+            g_iFrameLineCount[i] = 0;
+        }
 
-		g_iCurrFrameLineCounter = 0;
-	}
-	else
-	{
-		int iNumDelays = g_numdebuglinedelays->integer;
-		int iCount;
+        g_iCurrFrameLineCounter = 0;
+    } else {
+        int iNumDelays = g_numdebuglinedelays->integer;
+        int iCount;
 
-		if( iNumDelays > 99 )
-			iNumDelays = 99;
+        if (iNumDelays > 99) {
+            iNumDelays = 99;
+        }
 
-		iCount = g_iFrameLineCount[ ( g_iCurrFrameLineCounter - iNumDelays + 100 ) % 100 ];
-		if( iCount )
-		{
-			g_iFirstLine += iCount;
-			*gi.numDebugLines -= iCount;
-			g_iFrameLineCount[ ( g_iCurrFrameLineCounter - iNumDelays + 100 ) % 100 ] = 0;
-		}
+        iCount = g_iFrameLineCount[(g_iCurrFrameLineCounter - iNumDelays + 100) % 100];
+        if (iCount) {
+            g_iFirstLine += iCount;
+            *gi.numDebugLines -= iCount;
+            g_iFrameLineCount[(g_iCurrFrameLineCounter - iNumDelays + 100) % 100] = 0;
+        }
 
-		g_iCurrFrameLineCounter = ( g_iCurrFrameLineCounter + 1 ) % 100;
-		*gi.DebugLines = &DebugLines[ g_iFirstLine ];
-	}
+        g_iCurrFrameLineCounter = (g_iCurrFrameLineCounter + 1) % 100;
+        *gi.DebugLines          = &DebugLines[g_iFirstLine];
+    }
 
-	currentVertex = vec_zero;
-	vertColor = Vector( 1, 1, 1 );
-	vertAlpha = 1;
-	vertexIndex = 0;
+    currentVertex = vec_zero;
+    vertColor     = Vector(1, 1, 1);
+    vertAlpha     = 1;
+    vertexIndex   = 0;
 
-	linewidth = 1;
-	lineStippleFactor = 1;
-	linePattern = 0xffff;
+    linewidth         = 1;
+    lineStippleFactor = 1;
+    linePattern       = 0xffff;
 }
 
-void G_InitDebugStrings
-	(
-	void
-	)
+void G_InitDebugStrings(void)
 {
-	*gi.DebugStrings = DebugStrings;
-	*gi.numDebugStrings = 0;
+    *gi.DebugStrings    = DebugStrings;
+    *gi.numDebugStrings = 0;
 }
 
-void G_AllocDebugLines
-	(
-	void
-	)
+void G_AllocDebugLines(void)
 {
-	// we do a malloc here so that we don't interfere with the game's memory footprint
-	DebugLines = ( debugline_t * )malloc( ( int )g_numdebuglines->integer * sizeof( debugline_t ) );
+    // we do a malloc here so that we don't interfere with the game's memory footprint
+    DebugLines = (debugline_t *)malloc((int)g_numdebuglines->integer * sizeof(debugline_t));
 
-	G_InitDebugLines();
+    G_InitDebugLines();
 
-	for( int i = 0; i < 100; i++ )
-	{
-		g_iFrameLineCount[ i ] = 0;
-	}
+    for (int i = 0; i < 100; i++) {
+        g_iFrameLineCount[i] = 0;
+    }
 
-	g_iCurrFrameLineCounter = 0;
+    g_iCurrFrameLineCounter = 0;
 }
 
-void G_AllocDebugStrings
-	(
-	void
-	)
+void G_AllocDebugStrings(void)
 {
-	DebugStrings = ( debugstring_t * )malloc( ( int )g_numdebugstrings->integer * sizeof( debugstring_t ) );
+    DebugStrings = (debugstring_t *)malloc((int)g_numdebugstrings->integer * sizeof(debugstring_t));
 
-	G_InitDebugStrings();
+    G_InitDebugStrings();
 }
 
-void G_DeAllocDebugLines
-	(
-	void
-	)
+void G_DeAllocDebugLines(void)
 {
-	if( DebugLines )
-	{
-		// we do a free here, because we used malloc above
-		free( DebugLines );
-		DebugLines = NULL;
-		*gi.DebugLines = DebugLines;
-		*gi.numDebugLines = 0;
-	}
+    if (DebugLines) {
+        // we do a free here, because we used malloc above
+        free(DebugLines);
+        DebugLines        = NULL;
+        *gi.DebugLines    = DebugLines;
+        *gi.numDebugLines = 0;
+    }
 }
 
-void G_ShiftDebugLines
-	(
-	void
-	)
+void G_ShiftDebugLines(void)
 {
-	int iNewPos;
-	int iOldPos;
+    int iNewPos;
+    int iOldPos;
 
-	for( iNewPos = 0; iNewPos < *gi.numDebugLines && iNewPos < g_numdebuglines->integer; iNewPos++ )
-	{
-		iOldPos = g_iFirstLine + iNewPos;
+    for (iNewPos = 0; iNewPos < *gi.numDebugLines && iNewPos < g_numdebuglines->integer; iNewPos++) {
+        iOldPos = g_iFirstLine + iNewPos;
 
-		DebugLines[ iNewPos ] = DebugLines[ iOldPos ];
-	}
+        DebugLines[iNewPos] = DebugLines[iOldPos];
+    }
 
-	g_iFirstLine = 0;
-	*gi.DebugLines = DebugLines;
+    g_iFirstLine   = 0;
+    *gi.DebugLines = DebugLines;
 }
 
-void G_DeAllocDebugStrings
-	(
-	void
-	)
+void G_DeAllocDebugStrings(void)
 {
-	if( DebugStrings )
-	{
-		// we do a free here, because we used malloc above
-		free( DebugStrings );
-		DebugStrings = NULL;
-		*gi.DebugStrings = DebugStrings;
-		*gi.numDebugStrings = 0;
-	}
+    if (DebugStrings) {
+        // we do a free here, because we used malloc above
+        free(DebugStrings);
+        DebugStrings        = NULL;
+        *gi.DebugStrings    = DebugStrings;
+        *gi.numDebugStrings = 0;
+    }
 }
 
-void G_DebugLine
-	(
-	Vector start,
-	Vector end,
-	float r,
-	float g,
-	float b,
-	float alpha
-	)
+void G_DebugLine(Vector start, Vector end, float r, float g, float b, float alpha)
 {
-	debugline_t *line;
-	static int printTime = 0;
+    debugline_t *line;
+    static int   printTime = 0;
 
-	if( !g_numdebuglines->integer )
-	{
-		return;
-	}
+    if (!g_numdebuglines->integer) {
+        return;
+    }
 
-	if( *gi.numDebugLines >= g_numdebuglines->integer )
-	{
-		if( level.svsTime >= printTime )
-		{
-			printTime = level.svsTime + 5000;
-			gi.DPrintf( "G_DebugLine: Exceeded MAX_DEBUG_LINES\n" );
-		}
+    if (*gi.numDebugLines >= g_numdebuglines->integer) {
+        if (level.svsTime >= printTime) {
+            printTime = level.svsTime + 5000;
+            gi.DPrintf("G_DebugLine: Exceeded MAX_DEBUG_LINES\n");
+        }
 
-		return;
-	}
+        return;
+    }
 
-	if( g_numdebuglinedelays->integer > 0 && g_iFirstLine > 0 && g_iFirstLine + *gi.numDebugLines + 1 >= g_numdebuglines->integer )
-	{
-		G_ShiftDebugLines();
-	}
+    if (g_numdebuglinedelays->integer > 0 && g_iFirstLine > 0
+        && g_iFirstLine + *gi.numDebugLines + 1 >= g_numdebuglines->integer) {
+        G_ShiftDebugLines();
+    }
 
-	line = &DebugLines[ *gi.numDebugLines ];
-	( *gi.numDebugLines )++;
-	g_iFrameLineCount[ g_iCurrFrameLineCounter ]++;
+    line = &DebugLines[*gi.numDebugLines];
+    (*gi.numDebugLines)++;
+    g_iFrameLineCount[g_iCurrFrameLineCounter]++;
 
-	VectorCopy( start, line->start );
-	VectorCopy( end, line->end );
-	VectorSet( line->color, r, g, b );
-	line->alpha = alpha;
+    VectorCopy(start, line->start);
+    VectorCopy(end, line->end);
+    VectorSet(line->color, r, g, b);
+    line->alpha = alpha;
 
-	line->width = linewidth;
-	line->factor = lineStippleFactor;
-	line->pattern = linePattern;
+    line->width   = linewidth;
+    line->factor  = lineStippleFactor;
+    line->pattern = linePattern;
 }
 
-void G_LineStipple
-   (
-   int factor,
-   unsigned short pattern
-   )
+void G_LineStipple(int factor, unsigned short pattern)
+{
+    lineStippleFactor = factor;
+    linePattern       = pattern;
+}
 
-   {
-   lineStippleFactor = factor;
-   linePattern = pattern;
-   }
+void G_LineWidth(float width)
+{
+    linewidth = width;
+}
 
-void G_LineWidth
-   (
-   float width
-   )
-   
-   {
-   linewidth = width;
-   }
+void G_Color3f(float r, float g, float b)
+{
+    vertColor = Vector(r, g, b);
+}
 
-void G_Color3f
-	(
-	float r,
-	float g,
-	float b
-	)
+void G_Color3v(Vector color)
+{
+    vertColor = color;
+}
 
-	{
-	vertColor = Vector( r, g, b );
-	}
+void G_Color4f(float r, float g, float b, float alpha)
+{
+    vertColor = Vector(r, g, b);
+    vertAlpha = alpha;
+}
 
-void G_Color3v
-	(
-	Vector color
-	)
+void G_Color3vf(Vector color, float alpha)
+{
+    vertColor = color;
+    vertAlpha = alpha;
+}
 
-	{
-	vertColor = color;
-	}
+void G_BeginLine(void)
+{
+    currentVertex = vec_zero;
+    vertexIndex   = 0;
+}
 
-void G_Color4f
-	(
-	float r,
-	float g,
-	float b,
-	float alpha
-	)
+void G_Vertex(Vector v)
+{
+    vertexIndex++;
+    if (vertexIndex > 1) {
+        G_DebugLine(currentVertex, v, vertColor[0], vertColor[1], vertColor[2], vertAlpha);
+    }
+    currentVertex = v;
+}
 
-	{
-	vertColor = Vector( r, g, b );
-	vertAlpha = alpha;
-	}
+void G_EndLine(void)
+{
+    currentVertex = vec_zero;
+    vertexIndex   = 0;
+}
 
-void G_Color3vf
-	(
-	Vector color,
-	float alpha
-	)
+void G_DebugBBox(Vector org, Vector mins, Vector maxs, float r, float g, float b, float alpha)
+{
+    int    i;
+    Vector points[8];
 
-	{
-	vertColor = color;
-	vertAlpha = alpha;
-	}
-
-void G_BeginLine
-	(
-	void
-	)
-
-	{
-	currentVertex = vec_zero;
-	vertexIndex = 0;
-	}
-
-void G_Vertex
-	(
-	Vector v
-	)
-
-	{
-	vertexIndex++;
-	if ( vertexIndex > 1 )
-		{
-		G_DebugLine( currentVertex, v, vertColor[ 0 ], vertColor[ 1 ], vertColor[ 2 ], vertAlpha );
-		}
-	currentVertex = v;
-	}
-
-void G_EndLine
-	(
-	void
-	)
-
-	{
-	currentVertex = vec_zero;
-	vertexIndex = 0;
-	}
-
-void G_DebugBBox
-   (
-   Vector org,
-   Vector mins,
-   Vector maxs,
-   float r,
-   float g,
-   float b,
-   float alpha
-   )
-   {
-   int i;
-   Vector points[8];
-
-	/*
+    /*
 	** compute a full bounding box
 	*/
-	for ( i = 0; i < 8; i++ )
-	   {
-		Vector   tmp;
+    for (i = 0; i < 8; i++) {
+        Vector tmp;
 
-		if ( i & 1 )
-			tmp[0] = org[0] +  mins[0];
-		else
-			tmp[0] = org[0] + maxs[0];
+        if (i & 1) {
+            tmp[0] = org[0] + mins[0];
+        } else {
+            tmp[0] = org[0] + maxs[0];
+        }
 
-		if ( i & 2 )
-			tmp[1] = org[1] + mins[1];
-		else
-			tmp[1] = org[1] + maxs[1];
+        if (i & 2) {
+            tmp[1] = org[1] + mins[1];
+        } else {
+            tmp[1] = org[1] + maxs[1];
+        }
 
-		if ( i & 4 )
-			tmp[2] = org[2] + mins[2];
-		else
-			tmp[2] = org[2] + maxs[2];
+        if (i & 4) {
+            tmp[2] = org[2] + mins[2];
+        } else {
+            tmp[2] = org[2] + maxs[2];
+        }
 
-		points[i] = tmp;
-	   }
+        points[i] = tmp;
+    }
 
-   G_Color4f( r, g, b, alpha );
+    G_Color4f(r, g, b, alpha);
 
-   G_BeginLine();
-   G_Vertex( points[0] );
-   G_Vertex( points[1] );
-   G_Vertex( points[3] );
-   G_Vertex( points[2] );
-   G_Vertex( points[0] );
-   G_EndLine();
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[1]);
+    G_Vertex(points[3]);
+    G_Vertex(points[2]);
+    G_Vertex(points[0]);
+    G_EndLine();
 
-   G_BeginLine();
-   G_Vertex( points[4] );
-   G_Vertex( points[5] );
-   G_Vertex( points[7] );
-   G_Vertex( points[6] );
-   G_Vertex( points[4] );
-   G_EndLine();
+    G_BeginLine();
+    G_Vertex(points[4]);
+    G_Vertex(points[5]);
+    G_Vertex(points[7]);
+    G_Vertex(points[6]);
+    G_Vertex(points[4]);
+    G_EndLine();
 
-	for ( i = 0; i < 4; i++ )
-      {
-      G_BeginLine();
-      G_Vertex( points[i] );
-      G_Vertex( points[4 + i] );
-      G_EndLine();
-      }
-   }
+    for (i = 0; i < 4; i++) {
+        G_BeginLine();
+        G_Vertex(points[i]);
+        G_Vertex(points[4 + i]);
+        G_EndLine();
+    }
+}
 
 //
 // LED style digits
@@ -401,500 +309,408 @@ void G_DebugBBox
 // ****3***  12**
 //             11
 
-static int Numbers[ 12 ][ 8 ] =
-	{
-		{ 1, 3, 4, 5, 6, 7, 0, 0 }, // 0
-		{ 4, 5, 0, 0, 0, 0, 0, 0 }, // 1
-		{ 1, 4, 2, 7, 3, 0, 0, 0 }, // 2
-		{ 1, 4, 2, 5, 3, 0, 0, 0 }, // 3
-		{ 6, 4, 2, 5, 0, 0, 0, 0 }, // 4
-		{ 1, 6, 2, 5, 3, 0, 0, 0 }, // 5
-		{ 1, 6, 2, 5, 7, 3, 0, 0 }, // 6
-		{ 1, 8, 0, 0, 0, 0, 0, 0 }, // 7
-		{ 1, 2, 3, 4, 5, 6, 7, 0 }, // 8
-		{ 1, 6, 4, 2, 5, 3, 0, 0 }, // 9
-		{ 9, 10, 11, 12, 0, 0, 0, 0 }, // .
-		{ 2, 0, 0, 0, 0, 0, 0, 0 }, // -
-	};
+static int Numbers[12][8] = {
+    {1, 3,  4,  5,  6, 7, 0, 0}, // 0
+    {4, 5,  0,  0,  0, 0, 0, 0}, // 1
+    {1, 4,  2,  7,  3, 0, 0, 0}, // 2
+    {1, 4,  2,  5,  3, 0, 0, 0}, // 3
+    {6, 4,  2,  5,  0, 0, 0, 0}, // 4
+    {1, 6,  2,  5,  3, 0, 0, 0}, // 5
+    {1, 6,  2,  5,  7, 3, 0, 0}, // 6
+    {1, 8,  0,  0,  0, 0, 0, 0}, // 7
+    {1, 2,  3,  4,  5, 6, 7, 0}, // 8
+    {1, 6,  4,  2,  5, 3, 0, 0}, // 9
+    {9, 10, 11, 12, 0, 0, 0, 0}, // .
+    {2, 0,  0,  0,  0, 0, 0, 0}, // -
+};
 
-static float Lines[ 13 ][ 4 ] =
-	{
-		{ 0, 0, 0, 0 },		// Unused
-		{ -4, 8, 4, 8 },		// 1
-		{ -4, 4, 4, 4 },		// 2
-		{ -4, 0, 4, 0 },		// 3
-		{ 4, 8, 4, 4 },		// 4
-		{ 4, 4, 4, 0 },		// 5
-		{ -4, 8, -4, 4 },		// 6
-		{ -4, 4, -4, 0 },		// 7
-		{ 4, 8, -4, 0 },		// 8
+static float Lines[13][4] = {
+    {0,  0, 0,  0}, // Unused
+    {-4, 8, 4,  8}, // 1
+    {-4, 4, 4,  4}, // 2
+    {-4, 0, 4,  0}, // 3
+    {4,  8, 4,  4}, // 4
+    {4,  4, 4,  0}, // 5
+    {-4, 8, -4, 4}, // 6
+    {-4, 4, -4, 0}, // 7
+    {4,  8, -4, 0}, // 8
 
-      { -1, 2, 1, 2 },		// 9
-      { 1, 2, 1, 0 },		// 10
-      { -1, 0, 1, 0 },		// 11
-      { -1, 0, -1, 2 },		// 12
-	};
+    {-1, 2, 1,  2}, // 9
+    {1,  2, 1,  0}, // 10
+    {-1, 0, 1,  0}, // 11
+    {-1, 0, -1, 2}, // 12
+};
 
-void G_DrawDebugNumber
-	(
-	Vector org,
-	float number,
-	float scale,
-	float r,
-	float g,
-	float b,
-	int precision
-	)
+void G_DrawDebugNumber(Vector org, float number, float scale, float r, float g, float b, int precision)
 {
-	int i;
-	int j;
-	int l;
-	int num;
-	Vector up;
-	Vector left;
-	Vector pos;
-	Vector start;
-	Vector ang;
-	str text;
-	Vector delta;
-	char format[ 20 ];
+    int    i;
+    int    j;
+    int    l;
+    int    num;
+    Vector up;
+    Vector left;
+    Vector pos;
+    Vector start;
+    Vector ang;
+    str    text;
+    Vector delta;
+    char   format[20];
 
-	// only draw entity numbers within a certain radius
-	delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if( ( delta * delta ) > ( 1000 * 1000 ) )
-	{
-		return;
-	}
+    // only draw entity numbers within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > (1000 * 1000)) {
+        return;
+    }
 
-	G_Color4f( r, g, b, 1.0 );
+    G_Color4f(r, g, b, 1.0);
 
-	ang = game.clients[ 0 ].ps.viewangles;
-	ang.AngleVectorsLeft( NULL, &left, &up );
+    ang = game.clients[0].ps.viewangles;
+    ang.AngleVectorsLeft(NULL, &left, &up);
 
-	up *= scale;
-	left *= scale;
+    up *= scale;
+    left *= scale;
 
-	if( precision > 0 )
-	{
-		sprintf( format, "%%.%df", precision );
-		text = va( format, number );
-	}
-	else
-	{
-		text = va( "%d", ( int )number );
-	}
+    if (precision > 0) {
+        sprintf(format, "%%.%df", precision);
+        text = va(format, number);
+    } else {
+        text = va("%d", (int)number);
+    }
 
-	start = org + ( text.length() - 1 ) * 5 * left;
+    start = org + (text.length() - 1) * 5 * left;
 
-	for( i = 0; i < text.length(); i++ )
-	{
-		if( text[ i ] == '.' )
-		{
-			num = 10;
-		}
-		else if( text[ i ] == '-' )
-		{
-			num = 11;
-		}
-		else
-		{
-			num = text[ i ] - '0';
-		}
+    for (i = 0; i < text.length(); i++) {
+        if (text[i] == '.') {
+            num = 10;
+        } else if (text[i] == '-') {
+            num = 11;
+        } else {
+            num = text[i] - '0';
+        }
 
-		for( j = 0; j < 8; j++ )
-		{
-			l = Numbers[ num ][ j ];
-			if( l == 0 )
-			{
-				break;
-			}
+        for (j = 0; j < 8; j++) {
+            l = Numbers[num][j];
+            if (l == 0) {
+                break;
+            }
 
-			G_BeginLine();
+            G_BeginLine();
 
-			pos = start - Lines[ l ][ 0 ] * left + Lines[ l ][ 1 ] * up;
-			G_Vertex( pos );
+            pos = start - Lines[l][0] * left + Lines[l][1] * up;
+            G_Vertex(pos);
 
-			pos = start - Lines[ l ][ 2 ] * left + Lines[ l ][ 3 ] * up;
-			G_Vertex( pos );
+            pos = start - Lines[l][2] * left + Lines[l][3] * up;
+            G_Vertex(pos);
 
-			G_EndLine();
-		}
+            G_EndLine();
+        }
 
-		start -= 10 * left;
-	}
+        start -= 10 * left;
+    }
 }
 
-void G_DebugCircle
-   ( 
-   float *org, 
-   float radius, 
-   float r, 
-   float g, 
-   float b, 
-   float alpha,
-   qboolean horizontal
-   )
-   {
-   int i;
-   float ang;
-   Vector angles;
-	Vector forward;
-	Vector left;
-	Vector pos;
-   Vector delta;
-
-	// only draw circles within a certain radius
-   delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if ( ( delta * delta ) > ( ( 1000 + radius ) * ( 1000 + radius ) ) )
-		{
-		return;
-		}
-
-   G_Color4f( r, g, b, alpha );
-
-   if ( horizontal )
-      {
-      forward = "1 0 0";
-      left = "0 -1 0";
-      }
-   else
-      {
-	   angles = game.clients[ 0 ].ps.viewangles;
-	   angles.AngleVectors( NULL, &left, &forward );
-      }
-
-   G_BeginLine();
-   for( i = 0; i <= NUM_CIRCLE_SEGMENTS; i++ )
-      {
-      ang = DEG2RAD( i * 360 / NUM_CIRCLE_SEGMENTS );
-      pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-      G_Vertex( pos );
-      }
-   G_EndLine();
-   }
-
-void G_DebugOrientedCircle
-   ( 
-   Vector org, 
-   float radius, 
-   float r, 
-   float g, 
-   float b, 
-   float alpha,
-   Vector angles
-   )
-   {
-   int i;
-   float ang;
-	Vector forward;
-	Vector left;
-	Vector pos;
-   Vector delta;
-
-	// only draw circles within a certain radius
-   delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if ( ( delta * delta ) > ( ( 1000 + radius ) * ( 1000 + radius ) ) )
-		{
-		return;
-		}
-
-   G_Color4f( r, g, b, alpha );
-
-   angles.AngleVectors( NULL, &left, &forward );
-
-   G_BeginLine();
-   for( i = 0; i <= NUM_CIRCLE_SEGMENTS; i++ )
-      {
-      ang = DEG2RAD( i * 360 / NUM_CIRCLE_SEGMENTS );
-      pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-      G_Vertex( pos );
-      }
-   G_EndLine();
-
-   //
-   // Draw the cross sign
-   //
-   G_BeginLine();
-   ang = DEG2RAD( 45 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-   ang = DEG2RAD( 225 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-
-   G_BeginLine();
-   ang = DEG2RAD( 315 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-   ang = DEG2RAD( 135 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-   }
-
-void G_DebugPyramid
-   ( 
-   Vector org, 
-   float radius, 
-   float r, 
-   float g, 
-   float b, 
-   float alpha 
-   )
-   {
-   Vector delta;
-   Vector points[ 4 ];
-
-	// only draw pyramids within a certain radius
-   delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if ( ( delta * delta ) > ( ( 1000 + radius ) * ( 1000 + radius ) ) )
-		{
-		return;
-		}
-
-   G_Color4f( r, g, b, alpha );
-
-   points[ 0 ] = org;
-   points[ 0 ].z += radius;
-
-   points[ 1 ] = org;
-   points[ 1 ].z -= radius;
-   points[ 2 ] = points[ 1 ];
-   points[ 3 ] = points[ 1 ];
-
-   points[ 1 ].x += cos( DEG2RAD( 0 ) ) * radius;
-   points[ 1 ].y += sin( DEG2RAD( 0 ) ) * radius;
-   points[ 2 ].x += cos( DEG2RAD( 120 ) ) * radius;
-   points[ 2 ].y += sin( DEG2RAD( 120 ) ) * radius;
-   points[ 3 ].x += cos( DEG2RAD( 240 ) ) * radius;
-   points[ 3 ].y += sin( DEG2RAD( 240 ) ) * radius;
-
-   G_BeginLine();
-   G_Vertex( points[ 0 ] );
-   G_Vertex( points[ 1 ] );
-   G_Vertex( points[ 2 ] );
-   G_Vertex( points[ 0 ] );
-   G_EndLine();
-
-   G_BeginLine();
-   G_Vertex( points[ 0 ] );
-   G_Vertex( points[ 2 ] );
-   G_Vertex( points[ 3 ] );
-   G_Vertex( points[ 0 ] );
-   G_EndLine();
-
-   G_BeginLine();
-   G_Vertex( points[ 0 ] );
-   G_Vertex( points[ 3 ] );
-   G_Vertex( points[ 1 ] );
-   G_Vertex( points[ 0 ] );
-   G_EndLine();
-
-   G_BeginLine();
-   G_Vertex( points[ 1 ] );
-   G_Vertex( points[ 2 ] );
-   G_Vertex( points[ 3 ] );
-   G_Vertex( points[ 1 ] );
-   G_EndLine();
-   }
-
-void G_DrawCoordSystem
-   (
-   Vector pos,
-   Vector forward,
-   Vector right,
-   Vector up,
-   int length
-   )
-
-   {
-   if ( g_showaxis->integer )
-      {
-      G_DebugLine( pos, pos + forward * length, 1,0,0,1 );
-      G_DebugLine( pos, pos + right * length, 0,1,0,1 );
-      G_DebugLine( pos, pos + up * length, 0,0,1,1 );
-      }
-   }
-
-void G_DrawCSystem
-	(
-	Vector pos,
-	Vector forward,
-	Vector right,
-	Vector up,
-	int length
-	)
+void G_DebugCircle(float *org, float radius, float r, float g, float b, float alpha, qboolean horizontal)
 {
-	G_DebugLine( pos, pos + forward * length, 1.0, 0, 0, 1 );
-	G_DebugLine( pos, pos + right * length, 0, 1.0, 0, 1 );
-	G_DebugLine( pos, pos + up * length, 0, 0, 1.0, 1 );
+    int    i;
+    float  ang;
+    Vector angles;
+    Vector forward;
+    Vector left;
+    Vector pos;
+    Vector delta;
+
+    // only draw circles within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > ((1000 + radius) * (1000 + radius))) {
+        return;
+    }
+
+    G_Color4f(r, g, b, alpha);
+
+    if (horizontal) {
+        forward = "1 0 0";
+        left    = "0 -1 0";
+    } else {
+        angles = game.clients[0].ps.viewangles;
+        angles.AngleVectors(NULL, &left, &forward);
+    }
+
+    G_BeginLine();
+    for (i = 0; i <= NUM_CIRCLE_SEGMENTS; i++) {
+        ang = DEG2RAD(i * 360 / NUM_CIRCLE_SEGMENTS);
+        pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+        G_Vertex(pos);
+    }
+    G_EndLine();
 }
 
-void G_DebugArrow
-   ( 
-   Vector   org, 
-   Vector   dir,
-   float    length,
-   float    r, 
-   float    g, 
-   float    b, 
-   float    alpha 
-   )
-   {
-   Vector right;
-   Vector up;
-   Vector startpoint;
-   Vector endpoint;
+void G_DebugOrientedCircle(Vector org, float radius, float r, float g, float b, float alpha, Vector angles)
+{
+    int    i;
+    float  ang;
+    Vector forward;
+    Vector left;
+    Vector pos;
+    Vector delta;
 
-   PerpendicularVector( right, dir );
-	up.CrossProduct( right, dir );
+    // only draw circles within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > ((1000 + radius) * (1000 + radius))) {
+        return;
+    }
 
-   startpoint = org;
+    G_Color4f(r, g, b, alpha);
 
-   endpoint = startpoint + dir * length;
-   length /= 6;
-   G_DebugLine( startpoint, endpoint, r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint - (right * length) - (dir * length), r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint + (right * length) - (dir * length), r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint - (up * length) - (dir * length), r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint + (up * length) - (dir * length), r, g, b, alpha );
-   }
+    angles.AngleVectors(NULL, &left, &forward);
 
-void G_DebugHighlightFacet
-   (
-   Vector org,
-   Vector mins,
-   Vector maxs,
-   facet_t facet,
-   float r,
-   float g,
-   float b,
-   float alpha
-   )
-   {
-   int i;
-   Vector points[8];
+    G_BeginLine();
+    for (i = 0; i <= NUM_CIRCLE_SEGMENTS; i++) {
+        ang = DEG2RAD(i * 360 / NUM_CIRCLE_SEGMENTS);
+        pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+        G_Vertex(pos);
+    }
+    G_EndLine();
 
-	/*
+    //
+    // Draw the cross sign
+    //
+    G_BeginLine();
+    ang = DEG2RAD(45 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+    ang = DEG2RAD(225 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+
+    G_BeginLine();
+    ang = DEG2RAD(315 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+    ang = DEG2RAD(135 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+}
+
+void G_DebugPyramid(Vector org, float radius, float r, float g, float b, float alpha)
+{
+    Vector delta;
+    Vector points[4];
+
+    // only draw pyramids within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > ((1000 + radius) * (1000 + radius))) {
+        return;
+    }
+
+    G_Color4f(r, g, b, alpha);
+
+    points[0] = org;
+    points[0].z += radius;
+
+    points[1] = org;
+    points[1].z -= radius;
+    points[2] = points[1];
+    points[3] = points[1];
+
+    points[1].x += cos(DEG2RAD(0)) * radius;
+    points[1].y += sin(DEG2RAD(0)) * radius;
+    points[2].x += cos(DEG2RAD(120)) * radius;
+    points[2].y += sin(DEG2RAD(120)) * radius;
+    points[3].x += cos(DEG2RAD(240)) * radius;
+    points[3].y += sin(DEG2RAD(240)) * radius;
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[1]);
+    G_Vertex(points[2]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[2]);
+    G_Vertex(points[3]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[3]);
+    G_Vertex(points[1]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[1]);
+    G_Vertex(points[2]);
+    G_Vertex(points[3]);
+    G_Vertex(points[1]);
+    G_EndLine();
+}
+
+void G_DrawCoordSystem(Vector pos, Vector forward, Vector right, Vector up, int length)
+{
+    if (g_showaxis->integer) {
+        G_DebugLine(pos, pos + forward * length, 1, 0, 0, 1);
+        G_DebugLine(pos, pos + right * length, 0, 1, 0, 1);
+        G_DebugLine(pos, pos + up * length, 0, 0, 1, 1);
+    }
+}
+
+void G_DrawCSystem(Vector pos, Vector forward, Vector right, Vector up, int length)
+{
+    G_DebugLine(pos, pos + forward * length, 1.0, 0, 0, 1);
+    G_DebugLine(pos, pos + right * length, 0, 1.0, 0, 1);
+    G_DebugLine(pos, pos + up * length, 0, 0, 1.0, 1);
+}
+
+void G_DebugArrow(Vector org, Vector dir, float length, float r, float g, float b, float alpha)
+{
+    Vector right;
+    Vector up;
+    Vector startpoint;
+    Vector endpoint;
+
+    PerpendicularVector(right, dir);
+    up.CrossProduct(right, dir);
+
+    startpoint = org;
+
+    endpoint = startpoint + dir * length;
+    length /= 6;
+    G_DebugLine(startpoint, endpoint, r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint - (right * length) - (dir * length), r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint + (right * length) - (dir * length), r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint - (up * length) - (dir * length), r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint + (up * length) - (dir * length), r, g, b, alpha);
+}
+
+void G_DebugHighlightFacet(Vector org, Vector mins, Vector maxs, facet_t facet, float r, float g, float b, float alpha)
+{
+    int    i;
+    Vector points[8];
+
+    /*
 	** compute a full bounding box
 	*/
-	for ( i = 0; i < 8; i++ )
-	   {
-		Vector   tmp;
+    for (i = 0; i < 8; i++) {
+        Vector tmp;
 
-		if ( i & 1 )
-			tmp[0] = org[0] +  mins[0];
-		else
-			tmp[0] = org[0] + maxs[0];
+        if (i & 1) {
+            tmp[0] = org[0] + mins[0];
+        } else {
+            tmp[0] = org[0] + maxs[0];
+        }
 
-		if ( i & 2 )
-			tmp[1] = org[1] + mins[1];
-		else
-			tmp[1] = org[1] + maxs[1];
+        if (i & 2) {
+            tmp[1] = org[1] + mins[1];
+        } else {
+            tmp[1] = org[1] + maxs[1];
+        }
 
-		if ( i & 4 )
-			tmp[2] = org[2] + mins[2];
-		else
-			tmp[2] = org[2] + maxs[2];
+        if (i & 4) {
+            tmp[2] = org[2] + mins[2];
+        } else {
+            tmp[2] = org[2] + maxs[2];
+        }
 
-		points[i] = tmp;
-	   }
+        points[i] = tmp;
+    }
 
-   G_Color4f( r, g, b, alpha );
+    G_Color4f(r, g, b, alpha);
 
-   switch( facet )
-      {
-      case north:
-         G_BeginLine();
-         G_Vertex( points[0] );
-         G_Vertex( points[5] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[1] );
-         G_Vertex( points[4] );
-         G_EndLine();
-         break;
-      case south:
-         G_BeginLine();
-         G_Vertex( points[2] );
-         G_Vertex( points[7] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[3] );
-         G_Vertex( points[6] );
-         G_EndLine();
-         break;
-      case east:
-         G_BeginLine();
-         G_Vertex( points[0] );
-         G_Vertex( points[6] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[4] );
-         G_Vertex( points[2] );
-         G_EndLine();
-         break;
-      case west:
-         G_BeginLine();
-         G_Vertex( points[1] );
-         G_Vertex( points[7] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[5] );
-         G_Vertex( points[3] );
-         G_EndLine();
-         break;
-      case up:
-         G_BeginLine();
-         G_Vertex( points[0] );
-         G_Vertex( points[3] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[1] );
-         G_Vertex( points[2] );
-         G_EndLine();
-         break;
-      case down:
-         G_BeginLine();
-         G_Vertex( points[4] );
-         G_Vertex( points[7] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[5] );
-         G_Vertex( points[6] );
-         G_EndLine();
-         break;
-      }
-   }
+    switch (facet) {
+    case north:
+        G_BeginLine();
+        G_Vertex(points[0]);
+        G_Vertex(points[5]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[1]);
+        G_Vertex(points[4]);
+        G_EndLine();
+        break;
+    case south:
+        G_BeginLine();
+        G_Vertex(points[2]);
+        G_Vertex(points[7]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[3]);
+        G_Vertex(points[6]);
+        G_EndLine();
+        break;
+    case east:
+        G_BeginLine();
+        G_Vertex(points[0]);
+        G_Vertex(points[6]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[4]);
+        G_Vertex(points[2]);
+        G_EndLine();
+        break;
+    case west:
+        G_BeginLine();
+        G_Vertex(points[1]);
+        G_Vertex(points[7]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[5]);
+        G_Vertex(points[3]);
+        G_EndLine();
+        break;
+    case up:
+        G_BeginLine();
+        G_Vertex(points[0]);
+        G_Vertex(points[3]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[1]);
+        G_Vertex(points[2]);
+        G_EndLine();
+        break;
+    case down:
+        G_BeginLine();
+        G_Vertex(points[4]);
+        G_Vertex(points[7]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[5]);
+        G_Vertex(points[6]);
+        G_EndLine();
+        break;
+    }
+}
 
-   void G_DebugString(Vector pos, float scale, float r, float g, float b, const char* pszText, ...)
-   {
-	   debugstring_t* string;
-	   va_list        va;
-	   char           szTemp[32768];
+void G_DebugString(Vector pos, float scale, float r, float g, float b, const char *pszText, ...)
+{
+    debugstring_t *string;
+    va_list        va;
+    char           szTemp[32768];
 
-	   if (!g_numdebugstrings) {
-		   return;
-	   }
+    if (!g_numdebugstrings) {
+        return;
+    }
 
-	   if (*gi.numDebugStrings < g_numdebugstrings->integer) {
-		   string = (debugstring_t*)&DebugStrings[*gi.numDebugStrings];
+    if (*gi.numDebugStrings < g_numdebugstrings->integer) {
+        string = (debugstring_t *)&DebugStrings[*gi.numDebugStrings];
 
-		   (*gi.numDebugStrings)++;
+        (*gi.numDebugStrings)++;
 
-		   va_start(va, pszText);
-		   vsprintf(szTemp, pszText, va);
-		   va_end(va);
+        va_start(va, pszText);
+        vsprintf(szTemp, pszText, va);
+        va_end(va);
 
-		   VectorCopy(pos, string->pos);
-		   string->scale = scale;
-		   string->color[0] = r;
-		   string->color[1] = g;
-		   string->color[2] = b;
-		   string->color[3] = 1.0f;
-		   strncpy(string->szText, szTemp, sizeof(string->szText));
-		   string->szText[sizeof(string->szText) - 1] = 0;
-	   }
-	   else {
-		   gi.DPrintf("G_DebugString: Exceeded g_numdebugstrings\n");
-	   }
-   }
+        VectorCopy(pos, string->pos);
+        string->scale    = scale;
+        string->color[0] = r;
+        string->color[1] = g;
+        string->color[2] = b;
+        string->color[3] = 1.0f;
+        strncpy(string->szText, szTemp, sizeof(string->szText));
+        string->szText[sizeof(string->szText) - 1] = 0;
+    } else {
+        gi.DPrintf("G_DebugString: Exceeded g_numdebugstrings\n");
+    }
+}
diff --git a/code/fgame/debuglines.h b/code/fgame/debuglines.h
index 9d497460..ebd1a6de 100644
--- a/code/fgame/debuglines.h
+++ b/code/fgame/debuglines.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // debuglines.h:
 
-#ifndef __DEBUGLINES_H__
-#define __DEBUGLINES_H__
+#pragma once
 
 #include "g_local.h"
 
@@ -67,5 +66,3 @@ void G_DebugHighlightFacet( Vector org, Vector mins, Vector maxs, facet_t facet,
 
 extern debugline_t *DebugLines;
 extern debugstring_t *DebugStrings;
-
-#endif /* !__DEBUGLINES_H__ */

From 8324c599de990163be68032e79a042bd471f1ea1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 19:56:23 +0100
Subject: [PATCH 0250/2040] Implemented G_DebugRotatedBBox

---
 code/fgame/debuglines.cpp | 62 +++++++++++++++++++++++++++++++++++++++
 code/fgame/debuglines.h   |  1 +
 2 files changed, 63 insertions(+)

diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp
index 16a4023d..b8e41309 100644
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
@@ -295,6 +295,68 @@ void G_DebugBBox(Vector org, Vector mins, Vector maxs, float r, float g, float b
     }
 }
 
+void G_DebugRotatedBBox(Vector org, Vector ang, Vector mins, Vector maxs, float r, float g, float b, float alpha) {
+    int i;
+    Vector tmp;
+    Vector points[8];
+    vec3_t axis[3];
+
+    AnglesToAxis(ang, axis);
+
+    /*
+	** compute a full bounding box
+	*/
+    for (i = 0; i < 8; i++) {
+        Vector tmp;
+
+        if (i & 1) {
+            tmp[0] = mins[0];
+        } else {
+            tmp[0] = maxs[0];
+        }
+
+        if (i & 2) {
+            tmp[1] = mins[1];
+        } else {
+            tmp[1] = maxs[1];
+        }
+
+        if (i & 4) {
+            tmp[2] = mins[2];
+        } else {
+            tmp[2] = maxs[2];
+        }
+
+        MatrixTransformVector(tmp, axis, points[i]);
+        points[i] += org;
+    }
+
+    G_Color4f(r, g, b, alpha);
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[1]);
+    G_Vertex(points[3]);
+    G_Vertex(points[2]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[4]);
+    G_Vertex(points[5]);
+    G_Vertex(points[7]);
+    G_Vertex(points[6]);
+    G_Vertex(points[4]);
+    G_EndLine();
+
+    for (i = 0; i < 4; i++) {
+        G_BeginLine();
+        G_Vertex(points[i]);
+        G_Vertex(points[4 + i]);
+        G_EndLine();
+    }
+}
+
 //
 // LED style digits
 //
diff --git a/code/fgame/debuglines.h b/code/fgame/debuglines.h
index ebd1a6de..e0656332 100644
--- a/code/fgame/debuglines.h
+++ b/code/fgame/debuglines.h
@@ -39,6 +39,7 @@ void G_BeginLine( void );
 void G_Vertex( Vector v );
 void G_EndLine( void );
 void G_DebugBBox( Vector org, Vector mins, Vector maxs, float r, float g, float b, float alpha );
+void G_DebugRotatedBBox(Vector org, Vector ang, Vector mins, Vector maxs, float r, float g, float b, float alpha);
 void G_DrawDebugNumber( Vector org, float number, float scale, float r, float g, float b, int precision = 0 );
 void G_DebugCircle( float *org, float radius, float r, float g, float b, float alpha, qboolean horizontal = qfalse );
 void G_DebugOrientedCircle( Vector org, float radius, float r, float g, float b, float alpha, Vector angles );

From 12e36b987ad54eeb8f79eb40ad8fb5013b0b96d8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 19:56:35 +0100
Subject: [PATCH 0251/2040] Use G_DebugRotatedBBox when drawing the entity's
 bounding box

---
 code/fgame/entity.cpp | 45 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 655c3fc4..471b4bff 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5933,7 +5933,7 @@ void Entity::DrawBoundingBox(int showbboxes)
     switch (showbboxes) {
     case 1:
         if (edict->s.solid) {
-            G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+            G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
         }
         break;
     case 2:
@@ -5943,13 +5943,48 @@ void Entity::DrawBoundingBox(int showbboxes)
         break;
     case 3:
         if (edict->tiki && !(edict->s.renderfx & RF_DONTDRAW)) {
-            G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+            G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
         }
         break;
     case 4:
-        G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+        G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
+        break;
+    case 7:
+        if (edict->tiki && !(edict->s.renderfx & RF_DONTDRAW)) {
+            Vector vMins, vMaxs;
+
+            gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, vMins, vMaxs);
+            if (!VectorCompare(vMins, vec_zero) || !VectorCompare(vMaxs, vec_zero)) {
+                if (edict->s.parent != ENTITYNUM_NONE && edict->s.tag_num >= 0) {
+                    int i;
+                    Vector vAng;
+                    orientation_t oTag, oBox;
+                    Entity* pParent;
+
+                    pParent = G_GetEntity(edict->s.parent);
+                    AnglesToAxis(pParent->angles, pParent->orientation);
+                    oTag = G_TIKI_Orientation(pParent->edict, edict->s.tag_num & TAG_MASK);
+
+                    VectorCopy(pParent->origin, oBox.origin);
+                    for (i = 0; i < 3; i++) {
+                        VectorMA(oBox.origin, oTag.origin[i], pParent->orientation[i], oBox.origin);
+                    }
+
+                    MatrixMultiply(oTag.axis, pParent->orientation, oBox.axis);
+                    MatrixToEulerAngles(oBox.axis, vAng);
+                    G_DebugRotatedBBox(oBox.origin, vAng, vMins, vMaxs, 0, 1, 1, 1);
+                } else {
+                    G_DebugRotatedBBox(origin, angles, vMins, vMaxs, 0, 1, 1, 1);
+                }
+            }
+        }
+        break;
+    case 8:
+        if (edict->tiki && !(edict->s.renderfx & RF_DONTDRAW)) {
+            G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
+            G_DebugBBox(origin, Vector(-4, -4, -4), Vector(4, 4, 4), 0, 1, 1, 1);
+        }
         break;
-    case 5:
     default:
         if (IsSubclassOfAnimate() && edict->tiki) {
             Animate *anim;
@@ -5963,6 +5998,8 @@ void Entity::DrawBoundingBox(int showbboxes)
         }
         break;
     }
+
+    // FIXME: not implemented (implement the rest...)
 }
 
 qboolean Entity::IsDead(void) const

From 1ed85387451ff697940ee5b741d81abee36307b3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 20:23:31 +0100
Subject: [PATCH 0252/2040] Bounds check clarity

---
 code/qcommon/cm_terrain.c | 40 ++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 042b0ac9..8fb8220d 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -1149,10 +1149,16 @@ void CM_TraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
 {
     int i;
 
-    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[0][1] >= tc->vBounds[1][1]
-        || tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][0] <= tc->vBounds[0][0]
-        || tw->bounds[1][1] <= tc->vBounds[0][1] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
-        return;
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
+        return qfalse;
+    }
+
+    if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
+        return qfalse;
+    }
+
+    if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return qfalse;
     }
 
     g_trace.tw = tw;
@@ -1202,9 +1208,15 @@ qboolean CM_PositionTestInTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
 {
     int i;
 
-    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[0][1] >= tc->vBounds[1][1]
-        || tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][0] <= tc->vBounds[0][0]
-        || tw->bounds[1][1] <= tc->vBounds[0][1] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
+        return qfalse;
+    }
+
+    if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
+        return qfalse;
+    }
+
+    if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
         return qfalse;
     }
 
@@ -1414,10 +1426,16 @@ qboolean CM_SightTraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *t
 {
     int i;
 
-    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[0][1] >= tc->vBounds[1][1]
-        || tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][0] <= tc->vBounds[0][0]
-        || tw->bounds[1][1] <= tc->vBounds[0][1] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
-        return qtrue;
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
+        return qfalse;
+    }
+
+    if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
+        return qfalse;
+    }
+
+    if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return qfalse;
     }
 
     g_trace.tw = tw;

From ea14ab56643ae2a439ca97974bd465ffcc7c0872 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:25:39 +0100
Subject: [PATCH 0253/2040] Implemented special func

---
 code/fgame/scriptslave.cpp | 60 +++++++++++++++++++++++++++-----------
 code/fgame/scriptslave.h   |  6 +++-
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 0ce2ec93..4633b8a9 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "game.h"
 #include "debuglines.h"
 #include "weaputils.h"
+#include "parm.h"
 
 /*****************************************************************************/
 /*QUAKED script_object (0 0.5 1) ? NOT_SOLID
@@ -654,6 +655,10 @@ CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
     {&EV_ScriptSlave_FollowPath_RelativeYaw, &ScriptSlave::FollowPathRelativeYaw},
     {&EV_ScriptSlave_EndPath,                &ScriptSlave::EndPath              },
     {&EV_ScriptSlave_FollowingPath,          &ScriptSlave::FollowingPath        },
+    {&EV_Touch,                              &ScriptSlave::TouchFunc            },
+    {&EV_Blocked,                            &ScriptSlave::BlockFunc            },
+    {&EV_Activate,                           &ScriptSlave::TriggerFunc          },
+    {&EV_Use,                                &ScriptSlave::UseFunc              },
     {&EV_ScriptSlave_MoveDone,               &ScriptSlave::MoveEnd              },
     {&EV_Damage,                             &ScriptSlave::DamageFunc           },
     {&EV_ScriptSlave_RotateDownTo,           &ScriptSlave::Rotatedownto         },
@@ -784,7 +789,6 @@ void ScriptSlave::NewMove(void)
 }
 
 void ScriptSlave::BindEvent(Event *ev)
-
 {
     Entity *ent;
 
@@ -799,7 +803,6 @@ void ScriptSlave::BindEvent(Event *ev)
 }
 
 void ScriptSlave::EventUnbind(Event *ev)
-
 {
     unbind();
 
@@ -825,7 +828,6 @@ void ScriptSlave::MoveEnd(Event *ev)
 }
 
 void ScriptSlave::SetAnglesEvent(Event *ev)
-
 {
     commandswaiting = true;
     SetAngles(ev);
@@ -833,7 +835,6 @@ void ScriptSlave::SetAnglesEvent(Event *ev)
 }
 
 void ScriptSlave::SetAngleEvent(Event *ev)
-
 {
     float angle;
 
@@ -885,7 +886,6 @@ void ScriptSlave::SetModelEvent(Event *ev)
 }
 
 void ScriptSlave::TriggerEvent(Event *ev)
-
 {
     Entity *ent;
     Event  *e;
@@ -903,7 +903,6 @@ void ScriptSlave::TriggerEvent(Event *ev)
 }
 
 void ScriptSlave::GotoNextWaypoint(Event *ev)
-
 {
     commandswaiting = true;
 
@@ -961,7 +960,6 @@ void ScriptSlave::JumpTo(Event *ev)
 }
 
 void ScriptSlave::MoveToEvent(Event *ev)
-
 {
     commandswaiting = true;
 
@@ -979,14 +977,12 @@ void ScriptSlave::MoveToEvent(Event *ev)
 }
 
 void ScriptSlave::SetSpeed(Event *ev)
-
 {
     speed      = ev->GetFloat(1);
     traveltime = 0;
 }
 
 void ScriptSlave::SetTime(Event *ev)
-
 {
     traveltime = ev->GetFloat(1);
 }
@@ -1281,25 +1277,21 @@ void ScriptSlave::RotateAxisup(Event *ev)
 }
 
 void ScriptSlave::RotateX(Event *ev)
-
 {
     avelocity[0] = ev->GetFloat(1);
 }
 
 void ScriptSlave::RotateY(Event *ev)
-
 {
     avelocity[1] = ev->GetFloat(1);
 }
 
 void ScriptSlave::RotateZ(Event *ev)
-
 {
     avelocity[2] = ev->GetFloat(1);
 }
 
 void ScriptSlave::RotateAxis(Event *ev)
-
 {
     int axis;
 
@@ -1307,25 +1299,60 @@ void ScriptSlave::RotateAxis(Event *ev)
     avelocity[axis] = ev->GetFloat(2);
 }
 
+void ScriptSlave::TouchFunc(Event* ev)
+{
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_TOUCH);
+}
+
+void ScriptSlave::BlockFunc(Event* ev)
+{
+    Entity* other;
+
+    other = ev->GetEntity(1);
+    if (level.time >= attack_finished) {
+        attack_finished = level.time + 0.5;
+        if (dmg) {
+            other->Damage(this, this, dmg, origin, vec_zero, vec_zero, 0, 0, dmg_means_of_death);
+        }
+    }
+
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_BLOCK);
+}
+
+void ScriptSlave::TriggerFunc(Event* ev)
+{
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_TRIGGER);
+}
+
+void ScriptSlave::UseFunc(Event* ev)
+{
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_USE);
+}
+
 void ScriptSlave::DamageFunc(Event *ev)
 {
     Unregister(STRING_DAMAGE);
 }
 
 void ScriptSlave::SetDamage(Event *ev)
-
 {
     dmg = ev->GetInteger(1);
 }
 
 void ScriptSlave::SetMeansOfDeath(Event *ev)
-
 {
     dmg_means_of_death = MOD_string_to_int(ev->GetString(1));
 }
 
 void ScriptSlave::CreatePath(SplinePath *path, splinetype_t type)
-
 {
     SplinePath *node;
 
@@ -1641,7 +1668,6 @@ void ScriptSlave::FollowingPath(Event *ev)
 }
 
 void ScriptSlave::Explode(Event *ev)
-
 {
     float damage;
 
diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h
index c37a133e..277ddfba 100644
--- a/code/fgame/scriptslave.h
+++ b/code/fgame/scriptslave.h
@@ -136,6 +136,11 @@ protected:
     void RotateY(Event *ev);
     void RotateZ(Event *ev);
     void RotateAxis(Event *ev);
+    void TouchFunc(Event *ev);
+    void BlockFunc(Event *ev);
+    void TriggerFunc(Event *ev);
+    void UseFunc(Event *ev);
+    void DamageFunc(Event *ev);
     void SetDamage(Event *ev);
     void SetMeansOfDeath(Event *ev);
     void FollowPath(Event *ev);
@@ -150,7 +155,6 @@ protected:
     void PhysicsOn(Event *ev);
     void PhysicsOff(Event *ev);
     void PhysicsVelocity(Event *ev);
-    void DamageFunc(Event *ev);
     void EventFlyPath(Event *ev);
     void EventModifyFlyPath(Event *ev);
     void EventNormalAngles(Event *ev); // Added in 2.0

From 36af9e65891a10afdbe1757260dcb51d33035263 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:02:20 +0100
Subject: [PATCH 0254/2040] Fixed a very boring mistake ignored by MSVC

---
 code/qcommon/cm_terrain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 8fb8220d..82dee2ed 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -1150,15 +1150,15 @@ void CM_TraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
     int i;
 
     if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
-        return qfalse;
+        return;
     }
 
     if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
-        return qfalse;
+        return;
     }
 
     if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
-        return qfalse;
+        return;
     }
 
     g_trace.tw = tw;

From 35a8c4edfa3b60ed5b5aee42b7a889a5c9b8aeb6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:10:07 +0100
Subject: [PATCH 0255/2040] g_droppeditemlife: make sure the value is non-null

---
 code/fgame/weapon.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index cc26ed6e..b754155c 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2394,7 +2394,10 @@ qboolean Weapon::Drop(void)
     // Remove this from the owner's item list
     RemoveFromOwner();
 
-    PostEvent(EV_Remove, g_droppeditemlife->value);
+    if (g_droppeditemlife->value > 0) {
+        PostEvent(EV_Remove, g_droppeditemlife->value);
+    }
+
     PostEvent(EV_Weapon_FallingAngleAdjust, level.frametime);
     return true;
 }

From 07c840a4a9beeb839e8d1e2d5d4eb527e6b00da7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:10:18 +0100
Subject: [PATCH 0256/2040] Don't assert for NULL owner

---
 code/fgame/weapon.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index b754155c..5a06f008 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2777,10 +2777,7 @@ void Weapon::GiveStartingAmmoToOwner(Event *ev)
     int mode;
     int i;
 
-    assert(owner);
-
     if (!owner) {
-        warning("Weapon::GiveStartingAmmoToOwner", "Owner not found\n");
         return;
     }
 

From 77ef0f35792ef6cac8d4460c4fde0e212ced6893 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:21:53 +0100
Subject: [PATCH 0257/2040] Implemented game.detail and game.skill

---
 code/fgame/game.cpp | 60 ++++++++++++++++++++++++++++++++++++++++-----
 code/fgame/game.h   | 10 ++++++--
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index 00030a35..c485a718 100644
--- a/code/fgame/game.cpp
+++ b/code/fgame/game.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,18 +31,66 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "player.h"
 #include "dm_manager.h"
 
+Event EV_Game_Detail
+(
+    "skill",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "game.skill"
+);
+
+Event EV_Game_Skill
+(
+    "detail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "game.detail"
+);
+
 Game game;
 
+void Game::GetSkill(Event *ev)
+{
+    switch (skill->integer) {
+    case 0:
+    case 1:
+        ev->AddString("easy");
+        break;
+    case 2:
+        ev->AddString("hard");
+        break;
+    default:
+        ev->AddString("unknown");
+        break;
+    }
+}
+
+void Game::GetDetail(Event *ev)
+{
+    ev->AddFloat(detail->value);
+}
+
+void Game::Init()
+{
+    clients     = NULL;
+    autosaved   = qfalse;
+    maxentities = 0;
+    maxclients  = 0;
+}
+
+void Game::Archive(Archiver& arc) {}
+
 Game::Game()
 {
-    clients    = NULL;
-    maxclients = 0;
+    Init();
 }
 
 Game::~Game() {}
 
-void Game::Archive(Archiver& arc) {}
-
 CLASS_DECLARATION(Listener, Game, NULL) {
-    {NULL, NULL}
+    {&EV_Game_Skill,  &Game::GetSkill },
+    {&EV_Game_Detail, &Game::GetDetail},
+    {NULL,            NULL            }
 };
diff --git a/code/fgame/game.h b/code/fgame/game.h
index b97c59d0..61f7821a 100644
--- a/code/fgame/game.h
+++ b/code/fgame/game.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -39,10 +39,16 @@ public:
 public:
     CLASS_PROTOTYPE(Game);
 
-    void Archive(Archiver& arc) override;
+protected:
+    void GetSkill(Event *ev);
+    void GetDetail(Event *ev);
 
+public:
     Game();
     ~Game();
+
+    void Init();
+    void Archive(Archiver& arc) override;
 };
 
 class SimpleArchivedEntity;

From 960469be77994cbeff9ccb3d7367f3518f7c5552 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:52:25 +0100
Subject: [PATCH 0258/2040] Implemented MakePrimitive()

---
 code/script/scriptvariable.cpp | 22 ++++++++++++++++++++++
 code/script/scriptvariable.h   | 17 +++++++++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index f079cae7..ef74bee0 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -281,6 +281,19 @@ void ScriptVariable::ArchiveInternal(Archiver& arc)
         break;
     }
 }
+
+void ScriptVariable::MakePrimitive()
+{
+    switch (type) {
+    case VARIABLE_LISTENER:
+    case VARIABLE_REF:
+    case VARIABLE_CONTAINER:
+    case VARIABLE_SAFECONTAINER:
+        Com_Error(ERR_DROP, "^~^~^ game.%s cannot be archived since it is of type '%s'.", getName().c_str(), GetTypeName());
+        Clear();
+        break;
+    }
+}
 #endif
 
 ScriptArrayHolder::ScriptArrayHolder()
@@ -2568,6 +2581,15 @@ void ScriptVariableList::Archive(Archiver& arc)
     list.Archive(arc);
 }
 
+void ScriptVariableList::MakePrimitive()
+{
+    con_set_enum<short3, ScriptVariable> en = list;
+
+    for (con_set_enum<short3, ScriptVariable>::Entry *entry = en.NextElement(); entry; entry = en.NextElement()) {
+        entry->value.MakePrimitive();
+    }
+}
+
 CLASS_DECLARATION(Class, ScriptVariableList, NULL) {
     {NULL, NULL}
 };
diff --git a/code/script/scriptvariable.h b/code/script/scriptvariable.h
index 92d349c7..49056942 100644
--- a/code/script/scriptvariable.h
+++ b/code/script/scriptvariable.h
@@ -111,10 +111,6 @@ public:
 
     ~ScriptVariable();
 
-    void        Archive(Archiver& arc);
-    static void Archive(Archiver& arc, ScriptVariable **obj);
-    void        ArchiveInternal(Archiver& arc);
-
     void CastBoolean(void);
     void CastConstArrayValue(void);
     void CastEntity(void);
@@ -235,6 +231,12 @@ public:
 
     ScriptVariable operator++(int);
     ScriptVariable operator--(int);
+
+    void        Archive(Archiver& arc);
+    static void Archive(Archiver& arc, ScriptVariable** obj);
+    void        ArchiveInternal(Archiver& arc);
+
+    void MakePrimitive();
 };
 
 class ScriptArrayHolder : public LightClass
@@ -293,6 +295,8 @@ class con_set_Entry<short3, ScriptVariable>
 
 private:
     con_set_Entry *next;
+
+public:
     ScriptVariable value;
 
 public:
@@ -318,8 +322,6 @@ public:
 
     ScriptVariableList();
 
-    void Archive(Archiver& arc) override;
-
     void ClearList(void);
 
     ScriptVariable *GetOrCreateVariable(str name);
@@ -338,6 +340,9 @@ public:
     ScriptVariable *SetVariable(const char *name, ScriptVariable& value);
     ScriptVariable *SetVariable(unsigned int name, ScriptVariable& value);
     ScriptVariable *SetVariable(unsigned int name, ScriptVariable&& value);
+
+    void Archive(Archiver& arc) override;
+    void MakePrimitive();
 };
 
 #endif

From 8b9840d37f9a9895f0fedcc1a390928e61ad1aa3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:52:44 +0100
Subject: [PATCH 0259/2040] Implemented Game::Archive()

---
 code/fgame/game.cpp | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index c485a718..b92d63ae 100644
--- a/code/fgame/game.cpp
+++ b/code/fgame/game.cpp
@@ -80,7 +80,48 @@ void Game::Init()
     maxclients  = 0;
 }
 
-void Game::Archive(Archiver& arc) {}
+void Game::Archive(Archiver& arc)
+{
+    static cvar_t *g_maxplayerhealth = gi.Cvar_Get("g_maxplayerhealth", "250", 0);
+    int            i;
+
+    if (arc.Saving()) {
+        Vars()->MakePrimitive();
+    }
+
+    Listener::Archive(arc);
+
+    if (arc.Saving()) {
+        float fTmp;
+        int   iTmp;
+
+        fTmp = skill->value;
+        arc.ArchiveFloat(&fTmp);
+
+        iTmp = g_maxplayerhealth->integer;
+        arc.ArchiveInteger(&iTmp);
+    } else {
+        float fTmp;
+        int   iTmp;
+
+        arc.ArchiveFloat(&fTmp);
+        gi.cvar_set("skill", va("%f", fTmp));
+        arc.ArchiveInteger(&iTmp);
+        gi.cvar_set("g_maxplayerhealth", va("%d", iTmp));
+    }
+
+    arc.ArchiveBoolean(&autosaved);
+    arc.ArchiveInteger(&maxentities);
+    arc.ArchiveInteger(&maxclients);
+
+    if (arc.Loading()) {
+        G_AllocGameData();
+    }
+
+    for (i = 0; i < maxclients; i++) {
+        arc.ArchiveRaw(&clients[i], sizeof(gclient_t));
+    }
+}
 
 Game::Game()
 {

From 06d8ddbfc75ce1d0ac339b6df5a0ba221694022d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:56:05 +0100
Subject: [PATCH 0260/2040] Fixed AI firing multiple bullets when it should
 fire one

This fixes AI killing the player almost instantly
---
 code/fgame/sentient_combat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index 6ebe3279..4aef186e 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -446,7 +446,7 @@ void Sentient::FireWeapon(int number, firemode_t mode)
 {
     Weapon *activeWeapon = activeWeaponList[number];
 
-    if (activeWeapon) {
+    if (activeWeapon && activeWeapon->ReadyToFire(mode)) {
         if (mode == FIRE_SECONDARY && activeWeapon->GetZoom() && !activeWeapon->GetAutoZoom() && IsSubclassOfPlayer()) {
             Player *p = (Player *)this;
             p->ToggleZoom(activeWeapon->GetZoom());

From 76c9e4e0484280b04b02cf845229bfc05259d5b5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 23:33:10 +0100
Subject: [PATCH 0261/2040] Fixed pickup message appearing twice

---
 code/fgame/weapon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 5a06f008..805fbd40 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2980,7 +2980,7 @@ void Weapon::PickupWeapon(Event *ev)
         gi.SendServerCommand(other->edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", sMessage.c_str());
     }
 
-    if (ammo_type[FIRE_SECONDARY] != ammo_type[FIRE_PRIMARY]) {
+    if (ammo_type[FIRE_SECONDARY] != ammo_type[FIRE_PRIMARY] && str::icmp(ammo_type[FIRE_SECONDARY], "none")) {
         if (startammo[FIRE_SECONDARY] && ammo_type[FIRE_SECONDARY].length() && other->isClient()) {
             str        sMessage;
             const str& sAmmoType = ammo_type[FIRE_PRIMARY];

From e06ee0f26ace669f9578d001a6981ab576a68b16 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Feb 2024 23:40:41 +0100
Subject: [PATCH 0262/2040] Bounce backwards check

---
 code/fgame/vehicle.cpp | 72 +++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index ea8aa564..fb6c53b1 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3134,19 +3134,26 @@ void Vehicle::AutoPilot(void)
             fCoef = ProjectLineOnPlane(vDelta, DotProduct(origin, vDelta), vPrev, vCur, NULL);
 
             if (g_showvehiclemovedebug->integer) {
-                Vector vColor;
-                G_DebugBBox(vColor, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
-                G_DebugBBox(vColor, Vector(-32, -32, -32), Vector(32, 32, 32), 1, 1, 0, 1);
-                G_DebugArrow(vColor, m_vIdealDir * -1, (1 - fCoef) * fTotal, 0, 1, 0, 1);
-                G_DebugArrow(vColor, m_vIdealDir * 1, fCoef * fTotal, 0, 0, 1, 1);
+                G_DebugBBox(vPrev, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
+                G_DebugBBox(vCur, Vector(-32, -32, -32), Vector(32, 32, 32), 1, 1, 0, 1);
+                G_DebugArrow(vCur, m_vIdealDir * -1, (1 - fCoef) * fTotal, 0, 1, 0, 1);
+                G_DebugArrow(vPrev, m_vIdealDir * 1, fCoef * fTotal, 0, 0, 1, 1);
             }
 
             vTmp             = m_pCurPath->GetByNode(m_iCurNode - (1.0 - fCoef), NULL);
             fCurPathPosition = vTmp[0];
-            vTmp             = m_pCurPath->Get(fCurPathPosition + m_fLookAhead, NULL);
-            vWishPosition    = vTmp + 1;
-            fDistToCurPos    = Vector(origin[0] - vWishPosition[0], origin[1] - vWishPosition[1], 0).length();
+            // Added in 2.30
+            //  Check if vehicle bounces backwards
+            if (m_bBounceBackwards) {
+                vTmp = m_pCurPath->Get(fCurPathPosition - m_fLookAhead, NULL);
+            } else {
+                vTmp = m_pCurPath->Get(fCurPathPosition + m_fLookAhead, NULL);
+            }
+            vWishPosition = vTmp + 1;
+            fDistToCurPos = Vector(origin[0] - vWishPosition[0], origin[1] - vWishPosition[1], 0).length();
 
+            // Added in 2.30
+            //  Check if vehicle bounces backwards
             if (fCoef > 1 && !m_bBounceBackwards) {
                 m_iCurNode++;
                 if (m_iCurNode >= m_pCurPath->m_iPoints) {
@@ -3254,7 +3261,8 @@ void Vehicle::AutoPilot(void)
             vDeltaSave[2] = 0;
 
             if (fDistToCurPos > 1) {
-                if (moveimpulse >= 0 && !m_bBounceBackwards) { // 2.30: checks if it doesn't bounce backwards
+                // Added 2.30: checks if it doesn't bounce backwards
+                if (moveimpulse >= 0 && !m_bBounceBackwards) {
                     vectoangles(vDelta, vDeltaAngles);
                     turnimpulse = angledist(vDeltaAngles.y - angles.y);
                 } else {
@@ -3307,13 +3315,19 @@ void Vehicle::AutoPilot(void)
 
             if (m_iNextPathStartNode >= 0 && m_pNextPath && m_pNextPath->m_iPoints
                 && m_iCurNode > m_iNextPathStartNode + 2) {
-                cVehicleSpline *spline = m_pCurPath;
-                m_pCurPath             = m_pNextPath;
-                m_pNextPath            = spline;
-                m_iCurNode             = 2;
+                cVehicleSpline *spline;
+
+                spline      = m_pCurPath;
+                m_pCurPath  = m_pNextPath;
+                m_pNextPath = spline;
+
+                m_iCurNode = 2;
                 m_pNextPath->Reset();
                 m_iNextPathStartNode = -1;
+
+                // notify scripts that the drive has finished
                 Unregister(STRING_DRIVE);
+
                 m_bStopEnabled    = false;
                 m_bEnableSkidding = false;
             }
@@ -3389,7 +3403,7 @@ void Vehicle::EventDriveInternal(Event *ev, bool wait)
         m_fIdealAccel = ev->GetFloat(3);
     case 2:
         m_fIdealSpeed = ev->GetFloat(2);
-        m_fMaxSpeed = m_fIdealSpeed;// Added in 2.30
+        m_fMaxSpeed   = m_fIdealSpeed; // Added in 2.30
     case 1:
         path = ev->GetSimpleEntity(1);
         if (!path) {
@@ -4091,11 +4105,12 @@ void Vehicle::SlidePush(Vector vPush)
                 other->entity->CheckGround();
 
                 if (other->entity->groundentity) {
-                    if (other->entity->groundentity == edict || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity) {
+                    if (other->entity->groundentity == edict
+                        || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity) {
                         // save the entity
-                        pSkippedEntities[iNumSkipped] = other->entity;
+                        pSkippedEntities[iNumSkipped]  = other->entity;
                         iContentsEntities[iNumSkipped] = other->r.contents;
-                        solidEntities[iNumSkipped] = other->solid;
+                        solidEntities[iNumSkipped]     = other->solid;
                         iNumSkipped++;
 
                         if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
@@ -5849,15 +5864,20 @@ void Vehicle::UpdateNormals(void)
     }
 
     if (m_iNumNormals > 1) {
+        float x, z;
+
         temp = m_vNormalSum / m_iNumNormals;
         i    = temp.CrossProduct(temp, j);
 
-        pitch     = i;
-        angles[0] = pitch.toPitch();
+        pitch = i;
+        x     = pitch.toPitch();
 
-        temp      = m_vNormalSum / m_iNumNormals;
-        pitch     = temp.CrossProduct(temp, i);
-        angles[2] = pitch.toPitch();
+        temp  = m_vNormalSum / m_iNumNormals;
+        pitch = temp.CrossProduct(temp, i);
+        z     = pitch.toPitch();
+
+        angles[0] = x;
+        angles[2] = z;
     }
 }
 
@@ -6475,9 +6495,9 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveBoolean(&jumpable);
 
     arc.ArchiveBoolean(&m_bMovementLocked);
-    arc.ArchiveBoolean(&m_bAnimMove); // Added in 2.0
-    arc.ArchiveBoolean(&m_bDamageSounds); // Added in 2.0
-    arc.ArchiveBoolean(&m_bRunSounds); // Added in 2.0
+    arc.ArchiveBoolean(&m_bAnimMove);                // Added in 2.0
+    arc.ArchiveBoolean(&m_bDamageSounds);            // Added in 2.0
+    arc.ArchiveBoolean(&m_bRunSounds);               // Added in 2.0
     arc.ArchiveInteger(&m_iProjectileHitsRemaining); // Added in 2.30
 
     driver.Archive(arc);
@@ -6716,7 +6736,7 @@ void Vehicle::Archive(Archiver& arc)
     m_sMoveGrid->Archive(arc);
 
     arc.ArchiveFloat(&m_fIdealSpeed);
-    arc.ArchiveFloat(&m_fMaxSpeed); // Added in 2.30
+    arc.ArchiveFloat(&m_fMaxSpeed);       // Added in 2.30
     arc.ArchiveBool(&m_bBounceBackwards); // Added in 2.30
     arc.ArchiveVector(&m_vIdealPosition);
     arc.ArchiveVector(&m_vIdealDir);

From e7cd70b8ee7ea8bc1e688c32a7ad3252ef581620 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 1 Mar 2024 22:19:18 +0100
Subject: [PATCH 0263/2040] Enable cg_rain by default

---
 code/cgame/cg_nature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_nature.cpp b/code/cgame/cg_nature.cpp
index 304f0906..c532144e 100644
--- a/code/cgame/cg_nature.cpp
+++ b/code/cgame/cg_nature.cpp
@@ -58,7 +58,7 @@ void ClientGameCommandManager::InitializeRainCvars()
 {
     int i;
 
-    cg_rain = cgi.Cvar_Get("cg_rain", "0", CVAR_ARCHIVE);
+    cg_rain = cgi.Cvar_Get("cg_rain", "1", CVAR_ARCHIVE);
     cg_rain_drawcoverage =
         cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_SERVER_CREATED | CVAR_SYSTEMINFO);
 

From 52c89f1de3e8d708875a93e618335df63890620a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 1 Mar 2024 22:31:33 +0100
Subject: [PATCH 0264/2040] Fixed comparison operator

---
 code/renderer/tr_light.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 5e7018b3..59c3bd62 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -932,7 +932,7 @@ static int RB_GetEntityGridLighting()
 	}
 
 	// normalize
-	if (vLight[0] < 255.0 || vLight[1] < 255.0 || vLight[2] < 255.0) {
+	if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
 		float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
 		VectorScale(vLight, scale, vLight);
 	}

From b77af7fced0714182656310a6b4abd7dec527b24 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 1 Mar 2024 22:59:06 +0100
Subject: [PATCH 0265/2040] Implemented R_GetLightingForDecal

---
 code/renderer/tr_light.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 59c3bd62..6c8c914d 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -884,8 +884,20 @@ void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
 
 void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
 {
-    // FIXME: unimplemented
-    VectorSet(vLight, 1.f, 1.f, 1.f);
+    float fMax;
+
+    R_GetLightingGridValue(vOrigin, vLight);
+
+    if (!tr.overbrightShift) {
+        return;
+    }
+
+    VectorScale(vLight, tr.overbrightMult, vLight);
+
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
 }
 
 void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)

From a7b3fdd70b50f33ed3f04ffdcd669435d36372e4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Mar 2024 14:06:32 +0100
Subject: [PATCH 0266/2040] Added getConfigStringIdNormalized client game
 import to normalize config strings

---
 code/cgame/cg_public.h     | 2 ++
 code/cgame/cg_servercmds.c | 2 +-
 code/client/cl_cgame.cpp   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index 1b895795..58d515d4 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -430,6 +430,8 @@ functions exported to the main executable
         void (*CL_RestoreSavedCgameState)();
         void (*CL_ClearSavedCgameState)();
 
+        size_t (*getConfigStringIdNormalized)(size_t num);
+
         cvar_t       *fsDebug;
         hdelement_t  *HudDrawElements;
         clientAnim_t *anim;
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 25c0e356..9f4ea4be 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -296,7 +296,7 @@ static void CG_ServerCommand(qboolean modelOnly)
     }
 
     if (!strcmp(cmd, "cs")) {
-        CG_ConfigStringModified(atoi(cgi.Argv(1)), modelOnly);
+        CG_ConfigStringModified(cgi.getConfigStringIdNormalized(atoi(cgi.Argv(1))), modelOnly);
         return;
     }
 
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 238fed26..4733b336 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -815,6 +815,8 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->CL_RestoreSavedCgameState	= CL_RestoreSavedCgameState;
 	cgi->CL_ClearSavedCgameState	= CL_ClearSavedCgameState;
 
+	cgi->getConfigStringIdNormalized = CPT_NormalizeConfigstring;
+
 	cgi->fsDebug					= fs_debug;
 	cgi->HudDrawElements			= cls.HudDrawElements;
 	cgi->anim						= &cls.anim;

From 40035f4df303e28595cd23465e2aa86098b4d99c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Mar 2024 14:23:32 +0100
Subject: [PATCH 0267/2040] Fixed multi-shaders snow

---
 code/cgame/cg_main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index ab3c46ee..4a59a432 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -336,6 +336,14 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             return;
         case CS_RAIN_SHADER:
             Q_strncpyz(cg.rain.currentShader, str, sizeof(cg.rain.currentShader));
+            if (cg.rain.numshaders) {
+                // Fixed in OPM
+                //  not sure why some maps set a digit at the end...
+                int len = strlen(cg.rain.currentShader);
+                if (isdigit(cg.rain.currentShader[len - 1])) {
+                    cg.rain.currentShader[len - 1] = 0;
+                }
+            }
             for (i = 0; i < cg.rain.numshaders; ++i) {
                 Com_sprintf(cg.rain.shader[i], sizeof(cg.rain.shader[i]), "%s%i", cg.rain.currentShader, i);
             }

From 9bd4d40f09b74110bc0c54e3ac1ceed539f8af38 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Mar 2024 15:00:56 +0100
Subject: [PATCH 0268/2040] Formatted document

---
 code/qcommon/cm_fencemask.c | 926 ++++++++++++++++++------------------
 1 file changed, 457 insertions(+), 469 deletions(-)

diff --git a/code/qcommon/cm_fencemask.c b/code/qcommon/cm_fencemask.c
index 70747b69..098081fb 100644
--- a/code/qcommon/cm_fencemask.c
+++ b/code/qcommon/cm_fencemask.c
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cm_local.h"
 #include "../client/client.h"
 
-byte cmf_dummy_trans_data;
+byte         cmf_dummy_trans_data;
 cfencemask_t cmf_dummy_trans;
 
 /*
@@ -31,40 +31,40 @@ cfencemask_t cmf_dummy_trans;
 CM_LoadFTX
 ====================
 */
-qboolean CM_LoadFTX( const char *name, byte **pic, int *width, int *height )
+qboolean CM_LoadFTX(const char *name, byte **pic, int *width, int *height)
 {
-	int length;
-	int numPixels;
-	fileHandle_t h;
-	ftx_t header;
+    int          length;
+    int          numPixels;
+    fileHandle_t h;
+    ftx_t        header;
 
-	*pic = NULL;
-	length = FS_FOpenFileRead( name, &h, qtrue, qtrue );
-	if( length <= 0 ) {
-		return qtrue;
-	}
+    *pic   = NULL;
+    length = FS_FOpenFileRead(name, &h, qtrue, qtrue);
+    if (length <= 0) {
+        return qtrue;
+    }
 
-	FS_Read( &header, sizeof( ftx_t ), h );
+    FS_Read(&header, sizeof(ftx_t), h);
 
-	header.has_alpha = LittleLong(header.has_alpha);
-	header.height = LittleLong(header.height);
-	header.width = LittleLong(header.width);
+    header.has_alpha = LittleLong(header.has_alpha);
+    header.height    = LittleLong(header.height);
+    header.width     = LittleLong(header.width);
 
-	if( !header.has_alpha ) {
-		FS_FCloseFile( h );
-		return qfalse;
-	}
+    if (!header.has_alpha) {
+        FS_FCloseFile(h);
+        return qfalse;
+    }
 
-	// Load the FTX data
-	numPixels = header.width * header.height;
-	*height = header.height;
-	*width = header.width;
-	*pic = Hunk_AllocateTempMemory( numPixels * 4 );
+    // Load the FTX data
+    numPixels = header.width * header.height;
+    *height   = header.height;
+    *width    = header.width;
+    *pic      = Hunk_AllocateTempMemory(numPixels * 4);
 
-	FS_Read( *pic, numPixels * 4, h );
-	FS_FCloseFile( h );
+    FS_Read(*pic, numPixels * 4, h);
+    FS_FCloseFile(h);
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -72,190 +72,193 @@ qboolean CM_LoadFTX( const char *name, byte **pic, int *width, int *height )
 CM_LoadTGA
 ====================
 */
-qboolean CM_LoadTGA( const char *name, byte **pic, int *width, int *height )
+qboolean CM_LoadTGA(const char *name, byte **pic, int *width, int *height)
 {
-	int		columns, rows, numPixels;
-	byte	*pixbuf;
-	int		row, column;
-	byte	*buf_p;
-	byte	*buffer;
-	int		length;
-	TargaHeader		targa_header;
-	byte			*targa_rgba;
+    int         columns, rows, numPixels;
+    byte       *pixbuf;
+    int         row, column;
+    byte       *buf_p;
+    byte       *buffer;
+    int         length;
+    TargaHeader targa_header;
+    byte       *targa_rgba;
 
-	*pic = NULL;
+    *pic = NULL;
 
-	//
-	// load the file
-	//
-	length = FS_ReadFile (name, (void **)&buffer);
-	if (!buffer) {
-		return qfalse;
-	}
+    //
+    // load the file
+    //
+    length = FS_ReadFile(name, (void **)&buffer);
+    if (!buffer) {
+        return qfalse;
+    }
 
-	buf_p = buffer;
+    buf_p = buffer;
 
-	targa_header.id_length = *buf_p++;
-	targa_header.colormap_type = *buf_p++;
-	targa_header.image_type = *buf_p++;
-	
-	targa_header.colormap_index = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.colormap_length = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.colormap_size = *buf_p++;
-	targa_header.x_origin = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.y_origin = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.width = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.height = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.pixel_size = *buf_p++;
-	targa_header.attributes = *buf_p++;
+    targa_header.id_length     = *buf_p++;
+    targa_header.colormap_type = *buf_p++;
+    targa_header.image_type    = *buf_p++;
 
-	if (targa_header.image_type!=2
-		&& targa_header.image_type!=10
-		&& targa_header.image_type!=3) 
-		Com_Error (ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
+    targa_header.colormap_index = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.colormap_length = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.colormap_size = *buf_p++;
+    targa_header.x_origin      = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.y_origin = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.width = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.height = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.pixel_size = *buf_p++;
+    targa_header.attributes = *buf_p++;
 
-	if(targa_header.colormap_type!=0)
-		Com_Error (ERR_DROP, "LoadTGA: colormaps not supported\n");
+    if (targa_header.image_type != 2 && targa_header.image_type != 10 && targa_header.image_type != 3) {
+        Com_Error(ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
+    }
 
-	if (targa_header.pixel_size != 32) {
+    if (targa_header.colormap_type != 0) {
+        Com_Error(ERR_DROP, "LoadTGA: colormaps not supported\n");
+    }
+
+    if (targa_header.pixel_size != 32) {
         if (targa_header.pixel_size != 24 && targa_header.image_type != 3) {
             Com_Error(ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
-		}
+        }
 
-		FS_FreeFile(buffer);
-		return qfalse;
-	}
-	columns = targa_header.width;
-	rows = targa_header.height;
-	numPixels = columns * rows;
+        FS_FreeFile(buffer);
+        return qfalse;
+    }
+    columns   = targa_header.width;
+    rows      = targa_header.height;
+    numPixels = columns * rows;
 
-	if (width)
-		*width = columns;
-	if (height)
-		*height = rows;
+    if (width) {
+        *width = columns;
+    }
+    if (height) {
+        *height = rows;
+    }
 
-	targa_rgba = Hunk_AllocateTempMemory (numPixels*4);
-	*pic = targa_rgba;
+    targa_rgba = Hunk_AllocateTempMemory(numPixels * 4);
+    *pic       = targa_rgba;
 
-	if (targa_header.id_length != 0)
-		buf_p += targa_header.id_length;  // skip TARGA image comment
-	
-	if(targa_header.image_type == 2 || targa_header.image_type == 3) {  // Uncompressed, RGB images
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; column++) {
-				unsigned char red,green,blue,alphabyte;
-				switch (targa_header.pixel_size) {
-					case 24:
-							
-							blue = *buf_p++;
-							green = *buf_p++;
-							red = *buf_p++;
-							*pixbuf++ = red;
-							*pixbuf++ = green;
-							*pixbuf++ = blue;
-							*pixbuf++ = 255;
-							break;
-					case 32:
-							blue = *buf_p++;
-							green = *buf_p++;
-							red = *buf_p++;
-							alphabyte = *buf_p++;
-							*pixbuf++ = red;
-							*pixbuf++ = green;
-							*pixbuf++ = blue;
-							*pixbuf++ = alphabyte;
-							break;
-				}
-			}
-		}
-	}
-	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
-		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; ) {
-				packetHeader= *buf_p++;
-				packetSize = 1 + (packetHeader & 0x7f);
-				if (packetHeader & 0x80) {        // run-length packet
-					switch (targa_header.pixel_size) {
-						case 24:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = 255;
-								break;
-						case 32:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = *buf_p++;
-								break;
-					}
-	
-					for(j=0;j<packetSize;j++) {
-						*pixbuf++=red;
-						*pixbuf++=green;
-						*pixbuf++=blue;
-						*pixbuf++=alphabyte;
-						column++;
-						if (column==columns) { // run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}
-					}
-				}
-				else {                            // non run-length packet
-					for(j=0;j<packetSize;j++) {
-						switch (targa_header.pixel_size) {
-							case 24:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = 255;
-									break;
-							case 32:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									alphabyte = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = alphabyte;
-									break;
-						}
-						column++;
-						if (column==columns) { // pixel packet run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}						
-					}
-				}
-			}
-			breakOut:;
-		}
-	}
+    if (targa_header.id_length != 0) {
+        buf_p += targa_header.id_length; // skip TARGA image comment
+    }
 
-	FS_FreeFile (buffer);
-	return qtrue;
+    if (targa_header.image_type == 2 || targa_header.image_type == 3) { // Uncompressed, RGB images
+        for (row = rows - 1; row >= 0; row--) {
+            pixbuf = targa_rgba + row * columns * 4;
+            for (column = 0; column < columns; column++) {
+                unsigned char red, green, blue, alphabyte;
+                switch (targa_header.pixel_size) {
+                case 24:
+
+                    blue      = *buf_p++;
+                    green     = *buf_p++;
+                    red       = *buf_p++;
+                    *pixbuf++ = red;
+                    *pixbuf++ = green;
+                    *pixbuf++ = blue;
+                    *pixbuf++ = 255;
+                    break;
+                case 32:
+                    blue      = *buf_p++;
+                    green     = *buf_p++;
+                    red       = *buf_p++;
+                    alphabyte = *buf_p++;
+                    *pixbuf++ = red;
+                    *pixbuf++ = green;
+                    *pixbuf++ = blue;
+                    *pixbuf++ = alphabyte;
+                    break;
+                }
+            }
+        }
+    } else if (targa_header.image_type == 10) { // Runlength encoded RGB images
+        unsigned char red, green, blue, alphabyte, packetHeader, packetSize, j;
+        for (row = rows - 1; row >= 0; row--) {
+            pixbuf = targa_rgba + row * columns * 4;
+            for (column = 0; column < columns;) {
+                packetHeader = *buf_p++;
+                packetSize   = 1 + (packetHeader & 0x7f);
+                if (packetHeader & 0x80) { // run-length packet
+                    switch (targa_header.pixel_size) {
+                    case 24:
+                        blue      = *buf_p++;
+                        green     = *buf_p++;
+                        red       = *buf_p++;
+                        alphabyte = 255;
+                        break;
+                    case 32:
+                        blue      = *buf_p++;
+                        green     = *buf_p++;
+                        red       = *buf_p++;
+                        alphabyte = *buf_p++;
+                        break;
+                    }
+
+                    for (j = 0; j < packetSize; j++) {
+                        *pixbuf++ = red;
+                        *pixbuf++ = green;
+                        *pixbuf++ = blue;
+                        *pixbuf++ = alphabyte;
+                        column++;
+                        if (column == columns) { // run spans across rows
+                            column = 0;
+                            if (row > 0) {
+                                row--;
+                            } else {
+                                goto breakOut;
+                            }
+                            pixbuf = targa_rgba + row * columns * 4;
+                        }
+                    }
+                } else { // non run-length packet
+                    for (j = 0; j < packetSize; j++) {
+                        switch (targa_header.pixel_size) {
+                        case 24:
+                            blue      = *buf_p++;
+                            green     = *buf_p++;
+                            red       = *buf_p++;
+                            *pixbuf++ = red;
+                            *pixbuf++ = green;
+                            *pixbuf++ = blue;
+                            *pixbuf++ = 255;
+                            break;
+                        case 32:
+                            blue      = *buf_p++;
+                            green     = *buf_p++;
+                            red       = *buf_p++;
+                            alphabyte = *buf_p++;
+                            *pixbuf++ = red;
+                            *pixbuf++ = green;
+                            *pixbuf++ = blue;
+                            *pixbuf++ = alphabyte;
+                            break;
+                        }
+                        column++;
+                        if (column == columns) { // pixel packet run spans across rows
+                            column = 0;
+                            if (row > 0) {
+                                row--;
+                            } else {
+                                goto breakOut;
+                            }
+                            pixbuf = targa_rgba + row * columns * 4;
+                        }
+                    }
+                }
+            }
+        breakOut:;
+        }
+    }
+
+    FS_FreeFile(buffer);
+    return qtrue;
 }
 
 /*
@@ -263,64 +266,62 @@ qboolean CM_LoadTGA( const char *name, byte **pic, int *width, int *height )
 CM_LoadFCM
 ====================
 */
-qboolean CM_LoadFCM( const char *szName, cfencemask_t **pMask )
+qboolean CM_LoadFCM(const char *szName, cfencemask_t **pMask)
 {
-	unsigned int version;
-	int length;
-	int iDataSize;
-	fileHandle_t h;
-	fcm_t header;
-	cfencemask_t *m;
-	char tempName[ 256 ];
+    unsigned int  version;
+    int           length;
+    int           iDataSize;
+    fileHandle_t  h;
+    fcm_t         header;
+    cfencemask_t *m;
+    char          tempName[256];
 
-	*pMask = NULL;
+    *pMask = NULL;
 
-	COM_StripExtension( szName, tempName, sizeof( tempName ) );
-	strcat( tempName, ".fcm" );
+    COM_StripExtension(szName, tempName, sizeof(tempName));
+    strcat(tempName, ".fcm");
 
-	length = FS_FOpenFileRead( tempName, &h, qtrue, qtrue );
-	if( length <= 0 ) {
-		return qfalse;
-	}
+    length = FS_FOpenFileRead(tempName, &h, qtrue, qtrue);
+    if (length <= 0) {
+        return qfalse;
+    }
 
-	FS_Read( &version, sizeof( int ), h );
+    FS_Read(&version, sizeof(int), h);
 
-	if( LittleLong( version ) != FENCEMASK_VERSION )
-	{
-		FS_FCloseFile( h );
-		Com_Printf( "CM_LoadFCM: %s is not correct version, skipping\n", tempName );
-		return qfalse;
-	}
+    if (LittleLong(version) != FENCEMASK_VERSION) {
+        FS_FCloseFile(h);
+        Com_Printf("CM_LoadFCM: %s is not correct version, skipping\n", tempName);
+        return qfalse;
+    }
 
-	FS_Read( &header, sizeof( fcm_t ), h );
+    FS_Read(&header, sizeof(fcm_t), h);
 
-	iDataSize = LittleLong( header.iWidth ) * LittleLong( header.iHeight ) + 7;
-	if( iDataSize < 0 ) {
-		iDataSize = LittleLong( header.iWidth ) * LittleLong( header.iHeight ) + 14;
-	}
+    iDataSize = LittleLong(header.iWidth) * LittleLong(header.iHeight) + 7;
+    if (iDataSize < 0) {
+        iDataSize = LittleLong(header.iWidth) * LittleLong(header.iHeight) + 14;
+    }
 
-	iDataSize >>= 3;
+    iDataSize >>= 3;
 
-	if( iDataSize != ( length - sizeof( fcm_t ) - sizeof( unsigned int ) ) )
-	{
-		FS_FCloseFile( h );
-		Com_Printf( "CM_LoadFCM: size mismatch in %s, skipping\n", tempName );
-		return qfalse;
-	}
+    if (iDataSize != (length - sizeof(fcm_t) - sizeof(unsigned int))) {
+        FS_FCloseFile(h);
+        Com_Printf("CM_LoadFCM: size mismatch in %s, skipping\n", tempName);
+        return qfalse;
+    }
 
-    m = (cfencemask_t*)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
-	*pMask = m;
-	strcpy( m->name, szName );
-	m->iWidth = header.iWidth;
+    m      = (cfencemask_t *)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
+    *pMask = m;
+    strcpy(m->name, szName);
+    m->iWidth  = header.iWidth;
     m->iHeight = header.iHeight;
-    m->pData = (byte*)Hunk_Alloc(iDataSize, h_dontcare);
-	FS_Read( m->pData, iDataSize, h );
-	FS_FCloseFile( h );
+    m->pData   = (byte *)Hunk_Alloc(iDataSize, h_dontcare);
+    FS_Read(m->pData, iDataSize, h);
+    FS_FCloseFile(h);
 
-	sprintf( tempName, "f%s", szName );
-	UI_LoadResource( tempName );
+    sprintf(tempName, "f%s", szName);
+    UI_LoadResource(tempName);
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -328,72 +329,69 @@ qboolean CM_LoadFCM( const char *szName, cfencemask_t **pMask )
 CM_SaveFCM
 ====================
 */
-void CM_SaveFCM( const char *szName, cfencemask_t **pMask )
+void CM_SaveFCM(const char *szName, cfencemask_t **pMask)
 {
-	fileHandle_t h;
-	unsigned int version;
-	byte *pData;
-	int i, j;
-	int iMaskPos;
-	char endline, solid, clear;
-	char tempName[ 256 ];
+    fileHandle_t h;
+    unsigned int version;
+    byte        *pData;
+    int          i, j;
+    int          iMaskPos;
+    char         endline, solid, clear;
+    char         tempName[256];
 
-	COM_StripExtension( szName, tempName, sizeof( tempName ) );
-	strcat( tempName, ".fcm" );
-	h = FS_FOpenFileWrite( tempName );
+    COM_StripExtension(szName, tempName, sizeof(tempName));
+    strcat(tempName, ".fcm");
+    h = FS_FOpenFileWrite(tempName);
 
-	if( !h ) {
-		return;
-	}
+    if (!h) {
+        return;
+    }
 
-	version = FENCEMASK_VERSION;
-	FS_Write( &version, sizeof( unsigned int ), h );
-	FS_Write( &( *pMask )->iWidth, sizeof( int ), h );
-	FS_Write( &( *pMask )->iHeight, sizeof( int ), h );
+    version = FENCEMASK_VERSION;
+    FS_Write(&version, sizeof(unsigned int), h);
+    FS_Write(&(*pMask)->iWidth, sizeof(int), h);
+    FS_Write(&(*pMask)->iHeight, sizeof(int), h);
 
-	iMaskPos = ( *pMask )->iHeight * ( *pMask )->iWidth + 7;
-	if( iMaskPos < 0 ) {
-		iMaskPos = ( *pMask )->iHeight * ( *pMask )->iWidth + 7 * 2;
-	}
-	FS_Write( ( *pMask )->pData, iMaskPos >> 3, h );
-	FS_FCloseFile( h );
+    iMaskPos = (*pMask)->iHeight * (*pMask)->iWidth + 7;
+    if (iMaskPos < 0) {
+        iMaskPos = (*pMask)->iHeight * (*pMask)->iWidth + 7 * 2;
+    }
+    FS_Write((*pMask)->pData, iMaskPos >> 3, h);
+    FS_FCloseFile(h);
 
-	// save debug info
-	if( developer->integer && cm_FCMdebug->integer )
-	{
-		endline = '\n';
-		solid = 'X';
-		clear = '.';
+    // save debug info
+    if (developer->integer && cm_FCMdebug->integer) {
+        endline = '\n';
+        solid   = 'X';
+        clear   = '.';
 
-		COM_StripExtension( szName, tempName, sizeof( tempName ) );
-		strcat( tempName, ".fcm" );
-		h = FS_FOpenFileWrite( tempName );
-		if( !h ) {
-			return;
-		}
+        COM_StripExtension(szName, tempName, sizeof(tempName));
+        strcat(tempName, ".fcm");
+        h = FS_FOpenFileWrite(tempName);
+        if (!h) {
+            return;
+        }
 
-		pData = ( *pMask )->pData;
-		for( i = 0; i < ( *pMask )->iHeight; i++ )
-		{
-			for( j = 0; j < ( *pMask )->iWidth; j++ )
-			{
-				int b1, b2;
+        pData = (*pMask)->pData;
+        for (i = 0; i < (*pMask)->iHeight; i++) {
+            for (j = 0; j < (*pMask)->iWidth; j++) {
+                int b1, b2;
 
-				b1 = ( j + ( *pMask )->iWidth * i ) & 7;
-				b2 = pData[ ( j + ( *pMask )->iWidth * i ) >> 3 ];
+                b1 = (j + (*pMask)->iWidth * i) & 7;
+                b2 = pData[(j + (*pMask)->iWidth * i) >> 3];
 
-				if(b2 & (1 << b1)) {
-					FS_Write( &solid, 1, h );
-				} else {
-					FS_Write( &clear, 1, h );
-				}
-			}
+                if (b2 & (1 << b1)) {
+                    FS_Write(&solid, 1, h);
+                } else {
+                    FS_Write(&clear, 1, h);
+                }
+            }
 
-			FS_Write( &endline, 1, h );
-		}
+            FS_Write(&endline, 1, h);
+        }
 
-		FS_FCloseFile( h );
-	}
+        FS_FCloseFile(h);
+    }
 }
 
 /*
@@ -401,22 +399,22 @@ void CM_SaveFCM( const char *szName, cfencemask_t **pMask )
 CM_GenerateDummyFenceMask
 ====================
 */
-cfencemask_t *CM_GenerateDummyFenceMask( const char *szName, qboolean bOpaque )
+cfencemask_t *CM_GenerateDummyFenceMask(const char *szName, qboolean bOpaque)
 {
-	cfencemask_t *pMask;
+    cfencemask_t *pMask;
 
-    pMask = Hunk_Alloc(sizeof(cfencemask_t) + sizeof(byte), h_dontcare);
-	pMask->iWidth = 2;
-	pMask->iHeight = 2;
-	pMask->pData = ( byte * )( ( char * )pMask + sizeof( cfencemask_t ) );
+    pMask          = Hunk_Alloc(sizeof(cfencemask_t) + sizeof(byte), h_dontcare);
+    pMask->iWidth  = 2;
+    pMask->iHeight = 2;
+    pMask->pData   = (byte *)((char *)pMask + sizeof(cfencemask_t));
 
-	if( bOpaque ) {
-		*( byte * )pMask->pData = -1;
-	} else {
-		*( byte * )pMask->pData = 0;
-	}
+    if (bOpaque) {
+        *(byte *)pMask->pData = -1;
+    } else {
+        *(byte *)pMask->pData = 0;
+    }
 
-	return pMask;
+    return pMask;
 }
 
 /*
@@ -424,89 +422,84 @@ cfencemask_t *CM_GenerateDummyFenceMask( const char *szName, qboolean bOpaque )
 CM_GenerateFenceMask
 ====================
 */
-qboolean CM_GenerateFenceMask( const char *szName, cfencemask_t **pMask )
+qboolean CM_GenerateFenceMask(const char *szName, cfencemask_t **pMask)
 {
-	int i;
-	int iImageWidth;
-	int iImageHeight;
-	int iImageSize;
-	int iMaskSize;
-	int iWidth;
-	int iHeight;
-	byte *pImage;
-	byte *pCurrImage;
-	byte *pCurrMask;
-	qboolean bHasTrans = qfalse;
-	qboolean bHasOpaque = qfalse;
-	char tempName[ 256 ];
+    int      i;
+    int      iImageWidth;
+    int      iImageHeight;
+    int      iImageSize;
+    int      iMaskSize;
+    int      iWidth;
+    int      iHeight;
+    byte    *pImage;
+    byte    *pCurrImage;
+    byte    *pCurrMask;
+    qboolean bHasTrans  = qfalse;
+    qboolean bHasOpaque = qfalse;
+    char     tempName[256];
 
-	*pMask = NULL;
+    *pMask = NULL;
 
-	COM_StripExtension( szName, tempName, sizeof( tempName ) );
-	strcat( tempName, ".ftx" );
+    COM_StripExtension(szName, tempName, sizeof(tempName));
+    strcat(tempName, ".ftx");
 
-	if( !CM_LoadFTX( tempName, &pImage, &iImageWidth, &iImageHeight ) ) {
-		return qfalse;
-	}
+    if (!CM_LoadFTX(tempName, &pImage, &iImageWidth, &iImageHeight)) {
+        return qfalse;
+    }
 
-	if( !pImage )
-	{
-		if( !CM_LoadTGA( szName, &pImage, &iImageWidth, &iImageHeight ) ) {
-			return qfalse;
-		}
+    if (!pImage) {
+        if (!CM_LoadTGA(szName, &pImage, &iImageWidth, &iImageHeight)) {
+            return qfalse;
+        }
 
-		if( !pImage ) {
-			return qfalse;
-		}
-	}
+        if (!pImage) {
+            return qfalse;
+        }
+    }
 
-	iWidth = iImageWidth;
-	iHeight = iImageHeight;
-	iImageSize = iImageWidth * iImageHeight;
-	iMaskSize = iImageSize + 7;
-	if( iMaskSize < 0 ) {
-		iMaskSize = iImageSize + 7 * 2;
-	}
+    iWidth     = iImageWidth;
+    iHeight    = iImageHeight;
+    iImageSize = iImageWidth * iImageHeight;
+    iMaskSize  = iImageSize + 7;
+    if (iMaskSize < 0) {
+        iMaskSize = iImageSize + 7 * 2;
+    }
 
-	pCurrImage = pImage + 3;
+    pCurrImage = pImage + 3;
 
-	for( i = 0; i < iImageSize; i++, pCurrImage += sizeof( unsigned int ) )
-	{
-		if( *pCurrImage & 0x80 )
-		{
-			bHasOpaque = qtrue;
-		} else {
-			bHasTrans = qtrue;
-		}
+    for (i = 0; i < iImageSize; i++, pCurrImage += sizeof(unsigned int)) {
+        if (*pCurrImage & 0x80) {
+            bHasOpaque = qtrue;
+        } else {
+            bHasTrans = qtrue;
+        }
 
-		if( bHasOpaque && bHasTrans ) {
-			break;
-		}
-	}
+        if (bHasOpaque && bHasTrans) {
+            break;
+        }
+    }
 
-	// load the mask if it has transparence and is opaque
-	if( bHasOpaque && bHasTrans )
-    {
+    // load the mask if it has transparence and is opaque
+    if (bHasOpaque && bHasTrans) {
         *pMask = Hunk_Alloc((iMaskSize >> 3) + sizeof(cfencemask_t), h_dontcare);
-		strcpy( ( *pMask )->name, szName );
-		( *pMask )->iWidth = iWidth;
-		( *pMask )->iHeight = iHeight;
-		( *pMask )->pData = ( byte * )( ( char * )*pMask + sizeof( cfencemask_t ) );
+        strcpy((*pMask)->name, szName);
+        (*pMask)->iWidth  = iWidth;
+        (*pMask)->iHeight = iHeight;
+        (*pMask)->pData   = (byte *)((char *)*pMask + sizeof(cfencemask_t));
 
-		pCurrMask = ( *pMask )->pData;
-		pCurrImage = pImage + 3;
-		for( i = 0; i < iImageSize; i++, pCurrImage += sizeof( unsigned int ) )
-		{
-			if( *pCurrImage < 0 ) {
-				pCurrMask[ i >> 3 ] |= 1 << ( i & 7 );
-			}
-		}
-	} else {
-		*pMask = CM_GenerateDummyFenceMask( szName, bHasOpaque );
-	}
+        pCurrMask  = (*pMask)->pData;
+        pCurrImage = pImage + 3;
+        for (i = 0; i < iImageSize; i++, pCurrImage += sizeof(unsigned int)) {
+            if (*pCurrImage < 0) {
+                pCurrMask[i >> 3] |= 1 << (i & 7);
+            }
+        }
+    } else {
+        *pMask = CM_GenerateDummyFenceMask(szName, bHasOpaque);
+    }
 
-	Hunk_FreeTempMemory( pImage );
-	return qtrue;
+    Hunk_FreeTempMemory(pImage);
+    return qtrue;
 }
 
 /*
@@ -514,13 +507,13 @@ qboolean CM_GenerateFenceMask( const char *szName, cfencemask_t **pMask )
 CM_CheckFCMFileRefresh
 ====================
 */
-qboolean CM_CheckFCMFileRefresh( const char *szFile  )
+qboolean CM_CheckFCMFileRefresh(const char *szFile)
 {
-	char tempName[ 256 ];
+    char tempName[256];
 
-	COM_StripExtension( szFile, tempName, sizeof( tempName ) );
-	strcat( tempName, ".fcm" );
-	return FS_FileNewer( szFile, tempName ) > 0;
+    COM_StripExtension(szFile, tempName, sizeof(tempName));
+    strcat(tempName, ".fcm");
+    return FS_FileNewer(szFile, tempName) > 0;
 }
 
 /*
@@ -528,70 +521,63 @@ qboolean CM_CheckFCMFileRefresh( const char *szFile  )
 CM_GetFenceMask
 ====================
 */
-cfencemask_t *CM_GetFenceMask( const char *szMaskName )
+cfencemask_t *CM_GetFenceMask(const char *szMaskName)
 {
-	qboolean save;
-	cfencemask_t *pMask;
+    qboolean      save;
+    cfencemask_t *pMask;
 
-	if( !szMaskName || !*szMaskName ) {
-		return NULL;
-	}
+    if (!szMaskName || !*szMaskName) {
+        return NULL;
+    }
 
-	if( !memcmp( szMaskName, "nomask", 7 ) ) {
-		return NULL;
-	}
+    if (!memcmp(szMaskName, "nomask", 7)) {
+        return NULL;
+    }
 
-	if( !memcmp( szMaskName, "ignore", 7 ) ) {
-		return &cmf_dummy_trans;
-	}
+    if (!memcmp(szMaskName, "ignore", 7)) {
+        return &cmf_dummy_trans;
+    }
 
-	for( pMask = cm.fencemasks; pMask != NULL; pMask = pMask->pNext )
-	{
-		if( !strcmp( szMaskName, pMask->name ) ) {
-			if( pMask->pData ) {
-				return pMask;
-			} else {
-				return NULL;
-			}
-		}
-	}
+    for (pMask = cm.fencemasks; pMask != NULL; pMask = pMask->pNext) {
+        if (!strcmp(szMaskName, pMask->name)) {
+            if (pMask->pData) {
+                return pMask;
+            } else {
+                return NULL;
+            }
+        }
+    }
 
-	save = qfalse;
+    save = qfalse;
 
-	if( developer->integer )
-	{
-		if( cm_FCMcacheall->integer )
-		{
-			save = qtrue;
-		}
-		else
-		{
-			if( CM_CheckFCMFileRefresh( szMaskName ) ) {
-				save = qtrue;
-			}
-		}
-	}
+    if (developer->integer) {
+        if (cm_FCMcacheall->integer) {
+            save = qtrue;
+        } else {
+            if (CM_CheckFCMFileRefresh(szMaskName)) {
+                save = qtrue;
+            }
+        }
+    }
 
-	if( save || !CM_LoadFCM( szMaskName, &pMask ) )
-	{
-		if( !CM_GenerateFenceMask( szMaskName, &pMask ) )
-        {
-            pMask = (cfencemask_t*)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
-			strcpy( pMask->name, szMaskName );
-			pMask->pData = NULL;
-			pMask->pNext = cm.fencemasks;
-			cm.fencemasks = pMask;
-			return NULL;
-		}
-	}
+    if (save || !CM_LoadFCM(szMaskName, &pMask)) {
+        if (!CM_GenerateFenceMask(szMaskName, &pMask)) {
+            pMask = (cfencemask_t *)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
+            strcpy(pMask->name, szMaskName);
+            pMask->pData  = NULL;
+            pMask->pNext  = cm.fencemasks;
+            cm.fencemasks = pMask;
+            return NULL;
+        }
+    }
 
-	if( save ) {
-		CM_SaveFCM( szMaskName, &pMask );
-	}
+    if (save) {
+        CM_SaveFCM(szMaskName, &pMask);
+    }
 
-	pMask->pNext = cm.fencemasks;
-	cm.fencemasks = pMask;
-	return pMask;
+    pMask->pNext  = cm.fencemasks;
+    cm.fencemasks = pMask;
+    return pMask;
 }
 
 /*
@@ -599,47 +585,49 @@ cfencemask_t *CM_GetFenceMask( const char *szMaskName )
 CM_TraceThroughFence
 ====================
 */
-qboolean CM_TraceThroughFence( traceWork_t *tw, cbrush_t *brush, cbrushside_t *side, float fTraceFraction )
+qboolean CM_TraceThroughFence(traceWork_t *tw, cbrush_t *brush, cbrushside_t *side, float fTraceFraction)
 {
-	int				i;
-	int				iMaskPos;
-	float			fS;
-	float			fT;
-	float			*vNorm;
-	vec3_t			vPos;
-	cfencemask_t	*pMask;
+    int           i;
+    int           iMaskPos;
+    float         fS;
+    float         fT;
+    float        *vNorm;
+    vec3_t        vPos;
+    cfencemask_t *pMask;
 
-	pMask = cm.shaders[ side->shaderNum ].mask;
-	if( !pMask ) {
-		return qtrue;
-	}
+    pMask = cm.shaders[side->shaderNum].mask;
+    if (!pMask) {
+        return qtrue;
+    }
 
-	if( pMask == &cmf_dummy_trans ) {
-		return qfalse;
-	}
+    if (pMask == &cmf_dummy_trans) {
+        return qfalse;
+    }
 
-	if( !side->pEq ) {
-		return qtrue;
-	}
+    if (!side->pEq) {
+        return qtrue;
+    }
 
-	for( i = 0; i < 3; i++ )
-	{
-		vNorm = side->plane->normal;
-		vPos[ i ] = tw->start[ i ] + fTraceFraction * ( tw->end[ i ] - tw->start[ i ] ) - SURFACE_CLIP_EPSILON * vNorm[ i ];
-	}
+    for (i = 0; i < 3; i++) {
+        vNorm   = side->plane->normal;
+        vPos[i] = tw->start[i] + fTraceFraction * (tw->end[i] - tw->start[i]) - SURFACE_CLIP_EPSILON * vNorm[i];
+    }
 
-	fS = DotProduct( vPos, side->pEq->fSeq ) + side->pEq->fSeq[ 3 ];
-	fS = fS - floor( fS );
-	fT = DotProduct( vPos, side->pEq->fTeq ) + side->pEq->fTeq[ 3 ];
-	fT = fT - floor( fT );
+    fS = DotProduct(vPos, side->pEq->fSeq) + side->pEq->fSeq[3];
+    fS = fS - floor(fS);
+    fT = DotProduct(vPos, side->pEq->fTeq) + side->pEq->fTeq[3];
+    fT = fT - floor(fT);
 
-	if( cm_FCMdebug->integer )
-	{
-		Com_Printf( "Trace ST coords: (%.2f %.2f) or (%i %i)\n",
-			fS, fT,
-			( int )( ( float )pMask->iWidth * fS ), ( int )( ( float )pMask->iHeight * fT ) );
-	}
+    if (cm_FCMdebug->integer) {
+        Com_Printf(
+            "Trace ST coords: (%.2f %.2f) or (%i %i)\n",
+            fS,
+            fT,
+            (int)((float)pMask->iWidth * fS),
+            (int)((float)pMask->iHeight * fT)
+        );
+    }
 
-	iMaskPos = ( int )( ( float )pMask->iWidth * fS ) + pMask->iWidth * ( int )( ( float )pMask->iHeight * fT );
-	return ( 1 << ( iMaskPos & 7 ) ) & pMask->pData[ iMaskPos >> 3 ];
+    iMaskPos = (int)((float)pMask->iWidth * fS) + pMask->iWidth * (int)((float)pMask->iHeight * fT);
+    return (1 << (iMaskPos & 7)) & pMask->pData[iMaskPos >> 3];
 }

From e930b5481a6102c3dfd6ed6b62ef4fc3ad151fc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Mar 2024 15:27:35 +0100
Subject: [PATCH 0269/2040] Mark the trigger as dead after kill

---
 code/fgame/trigger.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 1c504090..11cc3392 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -788,6 +788,10 @@ void Trigger::DamageEvent(Event *ev)
     if (health <= 0) {
         Event *event;
 
+        if (max_health) {
+            deadflag = DEAD_DEAD;
+        }
+
         event = new Event(EV_Activate, 1);
         event->AddEntity(attacker);
         ProcessEvent(event);

From 01e68fd5eeb6ebbc5856ce640951630e94c33ca0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Mar 2024 15:29:08 +0100
Subject: [PATCH 0270/2040] Fixed turret gun never being killed

This fixes #231
---
 code/fgame/vehicleturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 5e58c1c9..a100b02b 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -756,7 +756,7 @@ void VehicleTurretGun::EventDamage(Event *ev)
             break;
         }
 
-        DamageEvent(ev);
+        Entity::DamageEvent(ev);
         return;
     }
 

From bf5fdb8f06d454ecab8011748ddbc86b1075167f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Mar 2024 15:29:25 +0100
Subject: [PATCH 0271/2040] Fixed improper fence masks

This fixes #284, fixes #280
---
 code/qcommon/cm_fencemask.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/cm_fencemask.c b/code/qcommon/cm_fencemask.c
index 098081fb..42c53357 100644
--- a/code/qcommon/cm_fencemask.c
+++ b/code/qcommon/cm_fencemask.c
@@ -468,7 +468,8 @@ qboolean CM_GenerateFenceMask(const char *szName, cfencemask_t **pMask)
     pCurrImage = pImage + 3;
 
     for (i = 0; i < iImageSize; i++, pCurrImage += sizeof(unsigned int)) {
-        if (*pCurrImage & 0x80) {
+        if (*pCurrImage >= 128) {
+            // Treat pixels with > 128 alpha value as opaque
             bHasOpaque = qtrue;
         } else {
             bHasTrans = qtrue;
@@ -485,12 +486,12 @@ qboolean CM_GenerateFenceMask(const char *szName, cfencemask_t **pMask)
         strcpy((*pMask)->name, szName);
         (*pMask)->iWidth  = iWidth;
         (*pMask)->iHeight = iHeight;
-        (*pMask)->pData   = (byte *)((char *)*pMask + sizeof(cfencemask_t));
+        (*pMask)->pData   = (byte *)((byte *)*pMask + sizeof(**pMask));
 
         pCurrMask  = (*pMask)->pData;
         pCurrImage = pImage + 3;
         for (i = 0; i < iImageSize; i++, pCurrImage += sizeof(unsigned int)) {
-            if (*pCurrImage < 0) {
+            if (*pCurrImage >= 128) {
                 pCurrMask[i >> 3] |= 1 << (i & 7);
             }
         }

From 4c4ac9f90e1087296947af835273fdfe74839880 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 14:03:38 +0100
Subject: [PATCH 0272/2040] Added more assertions for consistency

---
 code/renderer/tr_terrain.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 80c4bb01..831f409a 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -99,6 +99,8 @@ static terraInt R_AllocateVert(cTerraPatchUnpacked_t* patch)
 
 	patch->drawinfo.iVertHead = iVert;
 	patch->drawinfo.nVerts++;
+
+	assert(g_vert.nFree > 0);
 	g_vert.nFree--;
 
 	g_pVert[iVert].nRef = 0;
@@ -170,6 +172,7 @@ terraInt R_AllocateTri(cTerraPatchUnpacked_t* patch, qboolean check)
 	}
 
 	patch->drawinfo.nTris++;
+	assert(g_tri.nFree > 0);
 	g_tri.nFree--;
 
 	g_pTris[iTri].byConstChecks = check ? 0 : 4;
@@ -424,9 +427,13 @@ static void R_ForceSplit(terraInt iTri)
 	terraTri_t* pBase = &g_pTris[iBase];
 	if (iBase && pBase->lod != pTri->lod)
 	{
-		assert(g_pTris[pBase->iBase].iBase != iTri);
+        assert(g_pTris[pTri->iBase].iBase != iTri);
+        assert(g_tri.nFree >= 8);
 
 		R_ForceSplit(iBase);
+
+		assert(g_tri.nFree >= 4);
+
 		iBase = pTri->iBase;
 		pBase = &g_pTris[iBase];
 	}
@@ -1158,7 +1165,7 @@ void R_TessellateTerrain()
 	R_DoTriSplitting();
 	// Morph geometry according to the view
 	R_DoGeomorphs();
-	// Split vertices
+	// Merge vertices
 	R_DoTriMerging();
 }
 

From 26495fe0f800473fe4844bf88a52ecb7ef6290f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 16:43:27 +0100
Subject: [PATCH 0273/2040] Refactored R_TerraTriNeighbor

---
 code/renderer/tr_terrain.c | 77 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 831f409a..4e637206 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -516,7 +516,7 @@ static void R_ForceMerge(terraInt iTri)
 	{
 		terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
 
-		g_pTris[iTri].iLeft = iLeft;
+		pTri->iLeft = iLeft;
 		if (iLeft)
 		{
 			if (g_pTris[iLeft].lod == pTri->lod)
@@ -538,7 +538,8 @@ static void R_ForceMerge(terraInt iTri)
 	if (pTri->iRightChild)
 	{
 		terraInt iRight = g_pTris[pTri->iRightChild].iBase;
-		g_pTris[iTri].iRight = iRight;
+
+		pTri->iRight = iRight;
 		if (iRight)
 		{
 			if (g_pTris[iRight].lod == pTri->lod)
@@ -585,45 +586,41 @@ static void R_ForceMerge(terraInt iTri)
 
 static int R_TerraTriNeighbor(cTerraPatchUnpacked_t* terraPatches, int iPatch, int dir)
 {
-	if (iPatch >= 0)
-	{
-		int iNeighbor = 2 * iPatch + 1;
+	int iNeighbor;
 
-		if (dir == 1)
-		{
-			if (terraPatches[iPatch].flags & 0x80)
-			{
-				return iNeighbor;
-			}
-			else
-			{
-				return iNeighbor + 1;
-			}
-		}
-		else if (dir > 1)
-		{
-			if (dir == 2)
-			{
-				return 2 * iPatch + 2;
-			}
-			if (dir == 3)
-			{
-				if (terraPatches[iPatch].flags & 0x80)
-				{
-					return iNeighbor + 1;
-				}
-				else
-				{
-					return iNeighbor;
-				}
-			}
-		}
-		else if (!dir)
-		{
-			return 2 * iPatch + 1;
-		}
+	if (iPatch < 0) {
+		return 0;
 	}
 
+    iNeighbor = 2 * iPatch + 1;
+
+    switch (dir) {
+    case 0:
+        return iNeighbor;
+    case 1:
+        if (terraPatches[iPatch].flags & 0x80)
+        {
+            return iNeighbor;
+        }
+        else
+        {
+            return iNeighbor + 1;
+        }
+        break;
+    case 2:
+        return iNeighbor + 1;
+    case 3:
+        if (terraPatches[iPatch].flags & 0x80)
+        {
+            return iNeighbor + 1;
+        }
+        else
+        {
+            return iNeighbor;
+        }
+        break;
+    }
+
 	return 0;
 }
 
@@ -1181,6 +1178,10 @@ void R_TerrainPrepareFrame()
 		return;
 	}
 
+	if (tr.viewParms.isPortalSky) {
+		return;
+	}
+
 	g_terVisCount++;
 	tr.world->activeTerraPatches = NULL;
 

From bebe117487e743e96ed6ab5271fdc737a8c5b62f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:34:01 +0100
Subject: [PATCH 0274/2040] Formatted document

---
 code/renderer/tr_terrain.c | 2145 +++++++++++++++++-------------------
 1 file changed, 1003 insertions(+), 1142 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 4e637206..0c787b73 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -24,15 +24,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-cvar_t* ter_maxlod;
-cvar_t* ter_maxtris;
-cvar_t* ter_cull;
-cvar_t* ter_lock;
-cvar_t* ter_error;
-cvar_t* ter_cautiousframes;
-cvar_t* ter_count;
+cvar_t *ter_maxlod;
+cvar_t *ter_maxtris;
+cvar_t *ter_cull;
+cvar_t *ter_lock;
+cvar_t *ter_error;
+cvar_t *ter_cautiousframes;
+cvar_t *ter_count;
 
-#define TERRAIN_TABLE_SIZE	180
+#define TERRAIN_TABLE_SIZE 180
 
 static float g_fDistanceTable[TERRAIN_TABLE_SIZE];
 static float g_fClipDotProductTable[TERRAIN_TABLE_SIZE];
@@ -46,551 +46,510 @@ static vec3_t g_vClipVector;
 static vec3_t g_vViewOrigin;
 static vec3_t g_vViewVector;
 
-static int g_terVisCount;
-static float g_fCheck;
+static int    g_terVisCount;
+static float  g_fCheck;
 static size_t g_nTris;
 static size_t g_nVerts;
-static int g_nMerge;
-static int g_nSplit;
-unsigned int g_uiTerDist;
-vec2_t g_vTerOrg;
-vec3_t g_vTerFwd;
+static int    g_nMerge;
+static int    g_nSplit;
+unsigned int  g_uiTerDist;
+vec2_t        g_vTerOrg;
+vec3_t        g_vTerFwd;
 
-static const unsigned int MAX_TERRAIN_LOD = 6;
-static const float TERRAIN_LIGHTMAP_SIZE = 128.0f;
+static const unsigned int MAX_TERRAIN_LOD       = 6;
+static const float        TERRAIN_LIGHTMAP_SIZE = 128.0f;
 
-typedef struct poolInfo_s
-{
-	terraInt iFreeHead;
-	terraInt iCur;
-	size_t nFree;
+typedef struct poolInfo_s {
+    terraInt iFreeHead;
+    terraInt iCur;
+    size_t   nFree;
 } poolInfo_t;
 
 static int modeTable[8];
 
-terraTri_t* g_pTris;
-terrainVert_t* g_pVert;
+terraTri_t    *g_pTris;
+terrainVert_t *g_pVert;
 
 poolInfo_t g_tri;
 poolInfo_t g_vert;
 
-static void R_ValidateHeightmapForVertex(terraTri_t* pTri)
+static void R_ValidateHeightmapForVertex(terraTri_t *pTri)
 {
-	for (terraInt i = 0; i < 3; i++)
-	{
-		terrainVert_t* pVert = &g_pVert[pTri->iPt[i]];
-		if (pVert->pHgt < pTri->patch->heightmap || pVert->pHgt > &pTri->patch->heightmap[80])
-		{
-			pVert->pHgt = pTri->patch->heightmap;
-		}
-	}
+    for (terraInt i = 0; i < 3; i++) {
+        terrainVert_t *pVert = &g_pVert[pTri->iPt[i]];
+        if (pVert->pHgt < pTri->patch->heightmap || pVert->pHgt > &pTri->patch->heightmap[80]) {
+            pVert->pHgt = pTri->patch->heightmap;
+        }
+    }
 }
 
-static terraInt R_AllocateVert(cTerraPatchUnpacked_t* patch)
+static terraInt R_AllocateVert(cTerraPatchUnpacked_t *patch)
 {
-	terraInt iVert = g_vert.iFreeHead;
+    terraInt iVert = g_vert.iFreeHead;
 
-	g_vert.iFreeHead = g_pVert[g_vert.iFreeHead].iNext;
-	g_pVert[g_vert.iFreeHead].iPrev = 0;
+    g_vert.iFreeHead                = g_pVert[g_vert.iFreeHead].iNext;
+    g_pVert[g_vert.iFreeHead].iPrev = 0;
 
-	g_pVert[iVert].iPrev = 0;
-	g_pVert[iVert].iNext = patch->drawinfo.iVertHead;
-	g_pVert[patch->drawinfo.iVertHead].iPrev = iVert;
+    g_pVert[iVert].iPrev                     = 0;
+    g_pVert[iVert].iNext                     = patch->drawinfo.iVertHead;
+    g_pVert[patch->drawinfo.iVertHead].iPrev = iVert;
 
-	patch->drawinfo.iVertHead = iVert;
-	patch->drawinfo.nVerts++;
+    patch->drawinfo.iVertHead = iVert;
+    patch->drawinfo.nVerts++;
 
-	assert(g_vert.nFree > 0);
-	g_vert.nFree--;
+    assert(g_vert.nFree > 0);
+    g_vert.nFree--;
 
-	g_pVert[iVert].nRef = 0;
-	g_pVert[iVert].uiDistRecalc = 0;
+    g_pVert[iVert].nRef         = 0;
+    g_pVert[iVert].uiDistRecalc = 0;
 
-	return iVert;
+    return iVert;
 }
 
-static void R_InterpolateVert(terraTri_t* pTri, terrainVert_t* pVert)
+static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
 {
-	const terrainVert_t* pVert0 = &g_pVert[pTri->iPt[0]];
-	const terrainVert_t* pVert1 = &g_pVert[pTri->iPt[1]];
-	const cTerraPatchUnpacked_t* pPatch = pTri->patch;
+    const terrainVert_t         *pVert0 = &g_pVert[pTri->iPt[0]];
+    const terrainVert_t         *pVert1 = &g_pVert[pTri->iPt[1]];
+    const cTerraPatchUnpacked_t *pPatch = pTri->patch;
 
-	// Interpolate texture coordinates
-	pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
-	pVert->texCoords[0][1] = (pVert0->texCoords[0][1] + pVert1->texCoords[0][1]) * 0.5f;
-	pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
-	pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
+    // Interpolate texture coordinates
+    pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
+    pVert->texCoords[0][1] = (pVert0->texCoords[0][1] + pVert1->texCoords[0][1]) * 0.5f;
+    pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
+    pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
 
-	pVert->pHgt = (uint8_t*)(((size_t)pVert0->pHgt + (size_t)pVert1->pHgt) >> 1);
-	pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
-	pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
-	pVert->fHgtAvg += pPatch->z0;
-	pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
-	pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
-	pVert->xyz[2] = pVert->fHgtAvg;
+    pVert->pHgt    = (uint8_t *)(((size_t)pVert0->pHgt + (size_t)pVert1->pHgt) >> 1);
+    pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
+    pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
+    pVert->fHgtAvg += pPatch->z0;
+    pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
+    pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
+    pVert->xyz[2] = pVert->fHgtAvg;
 }
 
-static void R_ReleaseVert(cTerraPatchUnpacked_t* patch, int iVert)
+static void R_ReleaseVert(cTerraPatchUnpacked_t *patch, int iVert)
 {
-	terrainVert_t* pVert = &g_pVert[iVert];
+    terrainVert_t *pVert = &g_pVert[iVert];
 
-	terraInt iPrev = pVert->iPrev;
-	terraInt iNext = pVert->iNext;
-	g_pVert[iPrev].iNext = iNext;
-	g_pVert[iNext].iPrev = iPrev;
+    terraInt iPrev       = pVert->iPrev;
+    terraInt iNext       = pVert->iNext;
+    g_pVert[iPrev].iNext = iNext;
+    g_pVert[iNext].iPrev = iPrev;
 
-	assert(patch->drawinfo.nVerts > 0);
-	patch->drawinfo.nVerts--;
+    assert(patch->drawinfo.nVerts > 0);
+    patch->drawinfo.nVerts--;
 
-	if (patch->drawinfo.iVertHead == iVert)
-	{
-		patch->drawinfo.iVertHead = iNext;
-	}
+    if (patch->drawinfo.iVertHead == iVert) {
+        patch->drawinfo.iVertHead = iNext;
+    }
 
-	pVert->iPrev = 0;
-	pVert->iNext = g_vert.iFreeHead;
-	g_pVert[g_vert.iFreeHead].iPrev = iVert;
-	g_vert.iFreeHead = iVert;
-	g_vert.nFree++;
+    pVert->iPrev                    = 0;
+    pVert->iNext                    = g_vert.iFreeHead;
+    g_pVert[g_vert.iFreeHead].iPrev = iVert;
+    g_vert.iFreeHead                = iVert;
+    g_vert.nFree++;
 }
 
-terraInt R_AllocateTri(cTerraPatchUnpacked_t* patch, qboolean check)
+terraInt R_AllocateTri(cTerraPatchUnpacked_t *patch, qboolean check)
 {
-	terraInt iTri = g_tri.iFreeHead;
+    terraInt iTri = g_tri.iFreeHead;
 
-	g_tri.iFreeHead = g_pTris[iTri].iNext;
-	g_pTris[g_tri.iFreeHead].iPrev = 0;
+    g_tri.iFreeHead                = g_pTris[iTri].iNext;
+    g_pTris[g_tri.iFreeHead].iPrev = 0;
 
-	g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
-	g_pTris[iTri].iNext = 0;
-	g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
-	patch->drawinfo.iTriTail = iTri;
+    g_pTris[iTri].iPrev                     = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext                     = 0;
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+    patch->drawinfo.iTriTail                = iTri;
 
-	if (!patch->drawinfo.iTriHead)
-	{
-		patch->drawinfo.iTriHead = iTri;
-	}
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
 
-	patch->drawinfo.nTris++;
-	assert(g_tri.nFree > 0);
-	g_tri.nFree--;
+    patch->drawinfo.nTris++;
+    assert(g_tri.nFree > 0);
+    g_tri.nFree--;
 
-	g_pTris[iTri].byConstChecks = check ? 0 : 4;
-	g_pTris[iTri].uiDistRecalc = 0;
-	patch->uiDistRecalc = 0;
+    g_pTris[iTri].byConstChecks = check ? 0 : 4;
+    g_pTris[iTri].uiDistRecalc  = 0;
+    patch->uiDistRecalc         = 0;
 
-	return iTri;
+    return iTri;
 }
 
-static void R_ReleaseTri(cTerraPatchUnpacked_t* patch, terraInt iTri)
+static void R_ReleaseTri(cTerraPatchUnpacked_t *patch, terraInt iTri)
 {
-	terraTri_t* pTri = &g_pTris[iTri];
+    terraTri_t *pTri = &g_pTris[iTri];
 
-	terraInt iPrev = pTri->iPrev;
-	terraInt iNext = pTri->iNext;
-	g_pTris[iPrev].iNext = iNext;
-	g_pTris[iNext].iPrev = iPrev;
+    terraInt iPrev       = pTri->iPrev;
+    terraInt iNext       = pTri->iNext;
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
 
-	if (g_tri.iCur == iTri)
-	{
-		g_tri.iCur = iNext;
-	}
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
 
-	patch->uiDistRecalc = 0;
+    patch->uiDistRecalc = 0;
 
-	assert(patch->drawinfo.nTris > 0);
-	patch->drawinfo.nTris--;
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
 
-	if (patch->drawinfo.iTriHead == iTri)
-	{
-		patch->drawinfo.iTriHead = iNext;
-	}
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
 
-	if (patch->drawinfo.iTriTail == iTri)
-	{
-		patch->drawinfo.iTriTail = iPrev;
-	}
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
 
-	pTri->iPrev = 0;
-	pTri->iNext = g_tri.iFreeHead;
-	g_pTris[g_tri.iFreeHead].iPrev = iTri;
-	g_tri.iFreeHead = iTri;
-	g_tri.nFree++;
+    pTri->iPrev                    = 0;
+    pTri->iNext                    = g_tri.iFreeHead;
+    g_pTris[g_tri.iFreeHead].iPrev = iTri;
+    g_tri.iFreeHead                = iTri;
+    g_tri.nFree++;
 
-	for (int i = 0; i < 3; i++)
-	{
-		terraInt ptNum = pTri->iPt[i];
+    for (int i = 0; i < 3; i++) {
+        terraInt ptNum = pTri->iPt[i];
 
-		g_pVert[ptNum].nRef--;
-		if (!g_pVert[ptNum].nRef) {
-			R_ReleaseVert(patch, ptNum);
-		}
-	}
+        g_pVert[ptNum].nRef--;
+        if (!g_pVert[ptNum].nRef) {
+            R_ReleaseVert(patch, ptNum);
+        }
+    }
 }
 
-static int R_ConstChecksForTri(terraTri_t* pTri)
+static int R_ConstChecksForTri(terraTri_t *pTri)
 {
-	varnodeUnpacked_t vn;
+    varnodeUnpacked_t vn;
 
-	if (pTri->lod == MAX_TERRAIN_LOD) {
-		return 2;
-	}
+    if (pTri->lod == MAX_TERRAIN_LOD) {
+        return 2;
+    }
 
-	vn = *pTri->varnode;
-	vn.s.flags &= 0xF0u;
+    vn = *pTri->varnode;
+    vn.s.flags &= 0xF0u;
 
-	if (vn.fVariance == 0.0 && !(pTri->varnode->s.flags & 8)) {
-		return 2;
-	} else if (pTri->varnode->s.flags & 8) {
-		return 3;
-	} else if ((pTri->byConstChecks & 4) && !(pTri->varnode->s.flags & 4) && pTri->lod < ter_maxlod->integer) {
-		return 0;
-	}
+    if (vn.fVariance == 0.0 && !(pTri->varnode->s.flags & 8)) {
+        return 2;
+    } else if (pTri->varnode->s.flags & 8) {
+        return 3;
+    } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->s.flags & 4) && pTri->lod < ter_maxlod->integer) {
+        return 0;
+    }
 
-	return 2;
+    return 2;
 }
 
-static void R_DemoteInAncestry(cTerraPatchUnpacked_t* patch, terraInt iTri)
+static void R_DemoteInAncestry(cTerraPatchUnpacked_t *patch, terraInt iTri)
 {
-	terraInt iPrev = g_pTris[iTri].iPrev;
-	terraInt iNext = g_pTris[iTri].iNext;
+    terraInt iPrev = g_pTris[iTri].iPrev;
+    terraInt iNext = g_pTris[iTri].iNext;
 
-	g_pTris[iPrev].iNext = iNext;
-	g_pTris[iNext].iPrev = iPrev;
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
 
-	if (g_tri.iCur == iTri)
-	{
-		g_tri.iCur = iNext;
-	}
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
 
-	assert(patch->drawinfo.nTris > 0);
-	patch->drawinfo.nTris--;
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
 
-	if (patch->drawinfo.iTriHead == iTri)
-	{
-		patch->drawinfo.iTriHead = iNext;
-	}
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
 
-	if (patch->drawinfo.iTriTail == iTri)
-	{
-		patch->drawinfo.iTriTail = iPrev;
-	}
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
 
-	g_pTris[iTri].iPrev = 0;
-	g_pTris[iTri].iNext = patch->drawinfo.iMergeHead;
-	g_pTris[patch->drawinfo.iMergeHead].iPrev = iTri;
-	patch->drawinfo.iMergeHead = iTri;
+    g_pTris[iTri].iPrev                       = 0;
+    g_pTris[iTri].iNext                       = patch->drawinfo.iMergeHead;
+    g_pTris[patch->drawinfo.iMergeHead].iPrev = iTri;
+    patch->drawinfo.iMergeHead                = iTri;
 }
 
 static void R_TerrainHeapInit()
 {
-	g_tri.iFreeHead = 1;
-	g_tri.nFree = g_nTris - 1;
-	g_vert.iFreeHead = 1;
-	g_vert.nFree = g_nVerts - 1;
+    g_tri.iFreeHead  = 1;
+    g_tri.nFree      = g_nTris - 1;
+    g_vert.iFreeHead = 1;
+    g_vert.nFree     = g_nVerts - 1;
 
-	for (size_t i = 0; i < g_nTris; i++)
-	{
-		g_pTris[i].iPrev = (terraInt)i - 1;
-		g_pTris[i].iNext = (terraInt)i + 1;
-	}
+    for (size_t i = 0; i < g_nTris; i++) {
+        g_pTris[i].iPrev = (terraInt)i - 1;
+        g_pTris[i].iNext = (terraInt)i + 1;
+    }
 
-	g_pTris[0].iPrev = 0;
-	g_pTris[g_nTris - 1].iNext = 0;
+    g_pTris[0].iPrev           = 0;
+    g_pTris[g_nTris - 1].iNext = 0;
 
-	for (size_t i = 0; i < g_nVerts; i++)
-	{
-		g_pVert[i].iPrev = (terraInt)i - 1;
-		g_pVert[i].iNext = (terraInt)i + 1;
-	}
+    for (size_t i = 0; i < g_nVerts; i++) {
+        g_pVert[i].iPrev = (terraInt)i - 1;
+        g_pVert[i].iNext = (terraInt)i + 1;
+    }
 
-	g_pVert[0].iPrev = 0;
-	g_pVert[g_nVerts - 1].iNext = 0;
+    g_pVert[0].iPrev            = 0;
+    g_pVert[g_nVerts - 1].iNext = 0;
 }
 
 static void R_TerrainPatchesInit()
 {
-	int i;
+    int i;
 
-	for (i = 0; i < tr.world->numTerraPatches; i++)
-	{
-		cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[i];
-		patch->drawinfo.iTriHead = 0;
-		patch->drawinfo.iTriTail = 0;
-		patch->drawinfo.iMergeHead = 0;
-		patch->drawinfo.iVertHead = 0;
-		patch->drawinfo.nTris = 0;
-		patch->drawinfo.nVerts = 0;
-	}
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+        patch->drawinfo.iTriHead     = 0;
+        patch->drawinfo.iTriTail     = 0;
+        patch->drawinfo.iMergeHead   = 0;
+        patch->drawinfo.iVertHead    = 0;
+        patch->drawinfo.nTris        = 0;
+        patch->drawinfo.nVerts       = 0;
+    }
 }
 
-void R_SplitTri(terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight)
+void R_SplitTri(
+    terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight
+)
 {
-	terraTri_t* pSplit = &g_pTris[iSplit];
+    terraTri_t *pSplit = &g_pTris[iSplit];
 
-	terraTri_t* pLeft;
-	if (iLeft) {
-		pLeft = &g_pTris[iLeft];
-	} else {
-		pLeft = NULL;
-	}
+    terraTri_t *pLeft;
+    if (iLeft) {
+        pLeft = &g_pTris[iLeft];
+    } else {
+        pLeft = NULL;
+    }
 
-	terraTri_t* pRight;
-	if (iRight) {
-		pRight = &g_pTris[iRight];
-	} else {
-		pRight = NULL;
-	}
+    terraTri_t *pRight;
+    if (iRight) {
+        pRight = &g_pTris[iRight];
+    } else {
+        pRight = NULL;
+    }
 
-	int iNextLod = pSplit->lod + 1;
-	int index = pSplit->index;
-	varnodeUnpacked_t* varnode = &pSplit->varnode[index];
+    int                iNextLod = pSplit->lod + 1;
+    int                index    = pSplit->index;
+    varnodeUnpacked_t *varnode  = &pSplit->varnode[index];
 
-	if (pLeft)
-	{
-		pLeft->patch = pSplit->patch;
-		pLeft->index = index * 2;
-		pLeft->varnode = varnode;
-		pLeft->lod = iNextLod;
-		pLeft->iLeft = iRight;
-		pLeft->iRight = iRightOfLeft;
-		pLeft->iBase = pSplit->iLeft;
-		pLeft->iPt[0] = pSplit->iPt[1];
-		pLeft->iPt[1] = pSplit->iPt[2];
-		pLeft->iPt[2] = iNewPt;
+    if (pLeft) {
+        pLeft->patch   = pSplit->patch;
+        pLeft->index   = index * 2;
+        pLeft->varnode = varnode;
+        pLeft->lod     = iNextLod;
+        pLeft->iLeft   = iRight;
+        pLeft->iRight  = iRightOfLeft;
+        pLeft->iBase   = pSplit->iLeft;
+        pLeft->iPt[0]  = pSplit->iPt[1];
+        pLeft->iPt[1]  = pSplit->iPt[2];
+        pLeft->iPt[2]  = iNewPt;
 
-		R_ValidateHeightmapForVertex(pLeft);
-		pLeft->byConstChecks |= R_ConstChecksForTri(pLeft);
+        R_ValidateHeightmapForVertex(pLeft);
+        pLeft->byConstChecks |= R_ConstChecksForTri(pLeft);
 
-		g_pVert[pLeft->iPt[0]].nRef++;
-		g_pVert[pLeft->iPt[1]].nRef++;
-		g_pVert[pLeft->iPt[2]].nRef++;
-		g_pTris[pSplit->iParent].nSplit++;
-		pLeft->nSplit = 0;
-	}
+        g_pVert[pLeft->iPt[0]].nRef++;
+        g_pVert[pLeft->iPt[1]].nRef++;
+        g_pVert[pLeft->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pLeft->nSplit = 0;
+    }
 
-	if (pSplit->iLeft)
-	{
-		if (g_pTris[pSplit->iLeft].lod == iNextLod)
-		{
-			g_pTris[pSplit->iLeft].iBase = iLeft;
-		}
-		else
-		{
-			g_pTris[pSplit->iLeft].iRight = iLeft;
-		}
-	}
+    if (pSplit->iLeft) {
+        if (g_pTris[pSplit->iLeft].lod == iNextLod) {
+            g_pTris[pSplit->iLeft].iBase = iLeft;
+        } else {
+            g_pTris[pSplit->iLeft].iRight = iLeft;
+        }
+    }
 
-	if (pRight)
-	{
-		pRight->patch = pSplit->patch;
-		pRight->index = index * 2 + 1;
-		pRight->varnode = varnode + 1;
-		pRight->lod = iNextLod;
-		pRight->iLeft = iLeftOfRight;
-		pRight->iRight = iLeft;
-		pRight->iBase = pSplit->iRight;
-		pRight->iPt[0] = pSplit->iPt[2];
-		pRight->iPt[1] = pSplit->iPt[0];
-		pRight->iPt[2] = iNewPt;
+    if (pRight) {
+        pRight->patch   = pSplit->patch;
+        pRight->index   = index * 2 + 1;
+        pRight->varnode = varnode + 1;
+        pRight->lod     = iNextLod;
+        pRight->iLeft   = iLeftOfRight;
+        pRight->iRight  = iLeft;
+        pRight->iBase   = pSplit->iRight;
+        pRight->iPt[0]  = pSplit->iPt[2];
+        pRight->iPt[1]  = pSplit->iPt[0];
+        pRight->iPt[2]  = iNewPt;
 
-		R_ValidateHeightmapForVertex(pRight);
-		pRight->byConstChecks |= R_ConstChecksForTri(pRight);
+        R_ValidateHeightmapForVertex(pRight);
+        pRight->byConstChecks |= R_ConstChecksForTri(pRight);
 
-		g_pVert[pRight->iPt[0]].nRef++;
-		g_pVert[pRight->iPt[1]].nRef++;
-		g_pVert[pRight->iPt[2]].nRef++;
-		g_pTris[pSplit->iParent].nSplit++;
-		pRight->nSplit = 0;
-	}
+        g_pVert[pRight->iPt[0]].nRef++;
+        g_pVert[pRight->iPt[1]].nRef++;
+        g_pVert[pRight->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pRight->nSplit = 0;
+    }
 
-	if (pSplit->iRight)
-	{
-		if (g_pTris[pSplit->iRight].lod == iNextLod)
-		{
-			g_pTris[pSplit->iRight].iBase = iRight;
-		}
-		else
-		{
-			g_pTris[pSplit->iRight].iLeft = iRight;
-		}
-	}
+    if (pSplit->iRight) {
+        if (g_pTris[pSplit->iRight].lod == iNextLod) {
+            g_pTris[pSplit->iRight].iBase = iRight;
+        } else {
+            g_pTris[pSplit->iRight].iLeft = iRight;
+        }
+    }
 }
 
 static void R_ForceSplit(terraInt iTri)
 {
-	terraTri_t* pTri = &g_pTris[iTri];
+    terraTri_t *pTri = &g_pTris[iTri];
 
-	g_nSplit++;
+    g_nSplit++;
 
-	terraInt iBase = pTri->iBase;
-	terraTri_t* pBase = &g_pTris[iBase];
-	if (iBase && pBase->lod != pTri->lod)
-	{
+    terraInt    iBase = pTri->iBase;
+    terraTri_t *pBase = &g_pTris[iBase];
+    if (iBase && pBase->lod != pTri->lod) {
         assert(g_pTris[pTri->iBase].iBase != iTri);
         assert(g_tri.nFree >= 8);
 
-		R_ForceSplit(iBase);
+        R_ForceSplit(iBase);
 
-		assert(g_tri.nFree >= 4);
+        assert(g_tri.nFree >= 4);
 
-		iBase = pTri->iBase;
-		pBase = &g_pTris[iBase];
-	}
+        iBase = pTri->iBase;
+        pBase = &g_pTris[iBase];
+    }
 
-	uint8_t flags = pTri->varnode->s.flags;
+    uint8_t flags = pTri->varnode->s.flags;
 
-	terraInt iTriLeft = R_AllocateTri(pTri->patch, (flags & 2));
-	terraInt iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
+    terraInt iTriLeft  = R_AllocateTri(pTri->patch, (flags & 2));
+    terraInt iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
 
-	terraInt iNewPt = R_AllocateVert(pTri->patch);
-	R_InterpolateVert(pTri, &g_pVert[iNewPt]);
+    terraInt iNewPt = R_AllocateVert(pTri->patch);
+    R_InterpolateVert(pTri, &g_pVert[iNewPt]);
 
-	g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
+    g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
 
-	terraInt iBaseLeft = 0;
-	terraInt iBaseRight = 0;
+    terraInt iBaseLeft  = 0;
+    terraInt iBaseRight = 0;
 
-	if (iBase)
-	{
-		uint8_t flags2 = pBase->varnode->s.flags;
-		flags |= flags2;
+    if (iBase) {
+        uint8_t flags2 = pBase->varnode->s.flags;
+        flags |= flags2;
 
-		iBaseLeft = R_AllocateTri(pBase->patch, (flags2 & 2));
-		iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
+        iBaseLeft  = R_AllocateTri(pBase->patch, (flags2 & 2));
+        iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
 
-		terraInt iNewBasePt = iNewPt;
-		if (pBase->patch != pTri->patch)
-		{
-			iNewBasePt = R_AllocateVert(pBase->patch);
-			terrainVert_t* pVert = &g_pVert[iNewBasePt];
-			R_InterpolateVert(pBase, pVert);
+        terraInt iNewBasePt = iNewPt;
+        if (pBase->patch != pTri->patch) {
+            iNewBasePt           = R_AllocateVert(pBase->patch);
+            terrainVert_t *pVert = &g_pVert[iNewBasePt];
+            R_InterpolateVert(pBase, pVert);
 
-			pVert->fVariance = g_pVert[iNewPt].fVariance;
-			if (flags & 8)
-			{
-				pVert->fHgtAvg += pVert->fHgtAdd;
-				pVert->fHgtAdd = 0.0;
-				pVert->fVariance = 0.0;
-				pVert->xyz[2] = pVert->fHgtAvg;
-			}
-		}
+            pVert->fVariance = g_pVert[iNewPt].fVariance;
+            if (flags & 8) {
+                pVert->fHgtAvg += pVert->fHgtAdd;
+                pVert->fHgtAdd   = 0.0;
+                pVert->fVariance = 0.0;
+                pVert->xyz[2]    = pVert->fHgtAvg;
+            }
+        }
 
-		R_SplitTri(iBase, iNewBasePt, iBaseLeft, iBaseRight, iTriRight, iTriLeft);
+        R_SplitTri(iBase, iNewBasePt, iBaseLeft, iBaseRight, iTriRight, iTriLeft);
 
-		pBase->iLeftChild = iBaseLeft;
-		pBase->iRightChild = iBaseRight;
-		g_pTris[iBaseLeft].iParent = iBase;
-		g_pTris[iBaseRight].iParent = iBase;
-		R_DemoteInAncestry(pBase->patch, iBase);
-	}
+        pBase->iLeftChild           = iBaseLeft;
+        pBase->iRightChild          = iBaseRight;
+        g_pTris[iBaseLeft].iParent  = iBase;
+        g_pTris[iBaseRight].iParent = iBase;
+        R_DemoteInAncestry(pBase->patch, iBase);
+    }
 
-	if (flags & 8)
-	{
-		terrainVert_t* pVert = &g_pVert[iNewPt];
-		pVert->fHgtAvg += pVert->fHgtAdd;
-		pVert->fHgtAdd = 0.0;
-		pVert->fVariance = 0.0;
-		pVert->xyz[2] = pVert->fHgtAvg;
-	}
+    if (flags & 8) {
+        terrainVert_t *pVert = &g_pVert[iNewPt];
+        pVert->fHgtAvg += pVert->fHgtAdd;
+        pVert->fHgtAdd   = 0.0;
+        pVert->fVariance = 0.0;
+        pVert->xyz[2]    = pVert->fHgtAvg;
+    }
 
-	R_SplitTri(iTri, iNewPt, iTriLeft, iTriRight, iBaseRight, iBaseLeft);
+    R_SplitTri(iTri, iNewPt, iTriLeft, iTriRight, iBaseRight, iBaseLeft);
 
-	pTri->iLeftChild = iTriLeft;
-	pTri->iRightChild = iTriRight;
-	g_pTris[iTriLeft].iParent = iTri;
-	g_pTris[iTriRight].iParent = iTri;
-	R_DemoteInAncestry(pTri->patch, iTri);
+    pTri->iLeftChild           = iTriLeft;
+    pTri->iRightChild          = iTriRight;
+    g_pTris[iTriLeft].iParent  = iTri;
+    g_pTris[iTriRight].iParent = iTri;
+    R_DemoteInAncestry(pTri->patch, iTri);
 }
 
 static void R_ForceMerge(terraInt iTri)
 {
-	terraTri_t* pTri = &g_pTris[iTri];
-	cTerraPatchUnpacked_t* patch = pTri->patch;
-	terraInt iPrev = pTri->iPrev;
-	terraInt iNext = pTri->iNext;
+    terraTri_t            *pTri  = &g_pTris[iTri];
+    cTerraPatchUnpacked_t *patch = pTri->patch;
+    terraInt               iPrev = pTri->iPrev;
+    terraInt               iNext = pTri->iNext;
 
-	g_nMerge++;
+    g_nMerge++;
 
-	if (pTri->iLeftChild)
-	{
-		terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
+    if (pTri->iLeftChild) {
+        terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
 
-		pTri->iLeft = iLeft;
-		if (iLeft)
-		{
-			if (g_pTris[iLeft].lod == pTri->lod)
-			{
-				g_pTris[iLeft].iRight = iTri;
-			}
-			else
-			{
-				g_pTris[iLeft].iBase = iTri;
-			}
-		}
+        pTri->iLeft = iLeft;
+        if (iLeft) {
+            if (g_pTris[iLeft].lod == pTri->lod) {
+                g_pTris[iLeft].iRight = iTri;
+            } else {
+                g_pTris[iLeft].iBase = iTri;
+            }
+        }
 
-		R_ReleaseTri(pTri->patch, pTri->iLeftChild);
+        R_ReleaseTri(pTri->patch, pTri->iLeftChild);
 
-		pTri->iLeftChild = 0;
-		g_pTris[pTri->iParent].nSplit--;
-	}
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
 
-	if (pTri->iRightChild)
-	{
-		terraInt iRight = g_pTris[pTri->iRightChild].iBase;
+    if (pTri->iRightChild) {
+        terraInt iRight = g_pTris[pTri->iRightChild].iBase;
 
-		pTri->iRight = iRight;
-		if (iRight)
-		{
-			if (g_pTris[iRight].lod == pTri->lod)
-			{
-				g_pTris[iRight].iLeft = iTri;
-			}
-			else
-			{
-				g_pTris[iRight].iBase = iTri;
-			}
-		}
+        pTri->iRight = iRight;
+        if (iRight) {
+            if (g_pTris[iRight].lod == pTri->lod) {
+                g_pTris[iRight].iLeft = iTri;
+            } else {
+                g_pTris[iRight].iBase = iTri;
+            }
+        }
 
-		R_ReleaseTri(pTri->patch, pTri->iRightChild);
+        R_ReleaseTri(pTri->patch, pTri->iRightChild);
 
-		pTri->iLeftChild = 0;
-		g_pTris[pTri->iParent].nSplit--;
-	}
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
 
-	g_pTris[iPrev].iNext = iNext;
-	g_pTris[iNext].iPrev = iPrev;
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
 
-	if (g_tri.iCur == iTri)
-	{
-		g_tri.iCur = iNext;
-	}
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
 
-	patch->drawinfo.nTris++;
-	if (patch->drawinfo.iMergeHead == iTri)
-	{
-		patch->drawinfo.iMergeHead = iNext;
-	}
+    patch->drawinfo.nTris++;
+    if (patch->drawinfo.iMergeHead == iTri) {
+        patch->drawinfo.iMergeHead = iNext;
+    }
 
-	g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
-	g_pTris[iTri].iNext = 0;
+    g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext = 0;
 
-	g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
 
-	patch->drawinfo.iTriTail = iTri;
-	if (!patch->drawinfo.iTriHead)
-	{
-		patch->drawinfo.iTriHead = iTri;
-	}
+    patch->drawinfo.iTriTail = iTri;
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
 }
 
-static int R_TerraTriNeighbor(cTerraPatchUnpacked_t* terraPatches, int iPatch, int dir)
+static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, int dir)
 {
-	int iNeighbor;
+    int iNeighbor;
 
-	if (iPatch < 0) {
-		return 0;
-	}
+    if (iPatch < 0) {
+        return 0;
+    }
 
     iNeighbor = 2 * iPatch + 1;
 
@@ -598,756 +557,654 @@ static int R_TerraTriNeighbor(cTerraPatchUnpacked_t* terraPatches, int iPatch, i
     case 0:
         return iNeighbor;
     case 1:
-        if (terraPatches[iPatch].flags & 0x80)
-        {
+        if (terraPatches[iPatch].flags & 0x80) {
             return iNeighbor;
-        }
-        else
-        {
+        } else {
             return iNeighbor + 1;
         }
         break;
     case 2:
         return iNeighbor + 1;
     case 3:
-        if (terraPatches[iPatch].flags & 0x80)
-        {
+        if (terraPatches[iPatch].flags & 0x80) {
             return iNeighbor + 1;
-        }
-        else
-        {
+        } else {
             return iNeighbor;
         }
         break;
     }
 
-	return 0;
+    return 0;
 }
 
 static void R_PreTessellateTerrain()
 {
-	size_t numTerrainPatches = tr.world->numTerraPatches;
+    size_t numTerrainPatches = tr.world->numTerraPatches;
 
-	if (!numTerrainPatches) {
-		return;
-	}
+    if (!numTerrainPatches) {
+        return;
+    }
 
-	R_SyncRenderThread();
+    R_SyncRenderThread();
 
-	if (ter_maxtris->integer < 4 * numTerrainPatches) {
-		Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
-	}
-	else if (ter_maxtris->integer > 65535) {
-		Cvar_SetValue("ter_maxtris", 65535);
-	}
+    if (ter_maxtris->integer < 4 * numTerrainPatches) {
+        Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
+    } else if (ter_maxtris->integer > 65535) {
+        Cvar_SetValue("ter_maxtris", 65535);
+    }
 
-	Com_DPrintf("Using ter_maxtris = %d\n", ter_maxtris->integer);
+    Com_DPrintf("Using ter_maxtris = %d\n", ter_maxtris->integer);
 
-	g_nTris = ter_maxtris->integer * 2 + 1;
-	g_nVerts = ter_maxtris->integer + 1;
-	g_pTris = ri.Hunk_Alloc(g_nTris * sizeof(terraTri_t), h_dontcare);
-	g_pVert = ri.Hunk_Alloc(g_nVerts * sizeof(terrainVert_t), h_dontcare);
+    g_nTris  = ter_maxtris->integer * 2 + 1;
+    g_nVerts = ter_maxtris->integer + 1;
+    g_pTris  = ri.Hunk_Alloc(g_nTris * sizeof(terraTri_t), h_dontcare);
+    g_pVert  = ri.Hunk_Alloc(g_nVerts * sizeof(terrainVert_t), h_dontcare);
 
-	// Init triangles & vertices
-	R_TerrainHeapInit();
-	R_TerrainPatchesInit();
+    // Init triangles & vertices
+    R_TerrainHeapInit();
+    R_TerrainPatchesInit();
 
-	for (size_t i = 0; i < numTerrainPatches; i++)
-	{
-		cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[i];
+    for (size_t i = 0; i < numTerrainPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
 
-		patch->drawinfo.surfaceType = SF_TERRAIN_PATCH;
-		patch->drawinfo.nTris = 0;
-		patch->drawinfo.nVerts = 0;
-		patch->drawinfo.iTriHead = 0;
-		patch->drawinfo.iTriTail = 0;
-		patch->drawinfo.iVertHead = 0;
+        patch->drawinfo.surfaceType = SF_TERRAIN_PATCH;
+        patch->drawinfo.nTris       = 0;
+        patch->drawinfo.nVerts      = 0;
+        patch->drawinfo.iTriHead    = 0;
+        patch->drawinfo.iTriTail    = 0;
+        patch->drawinfo.iVertHead   = 0;
 
-		float sMin, tMin;
+        float sMin, tMin;
 
-		if (patch->texCoord[0][0][0] < patch->texCoord[0][1][0])
-		{
-			sMin = patch->texCoord[0][0][0];
-		}
-		else
-		{
-			sMin = patch->texCoord[0][1][0];
-		}
+        if (patch->texCoord[0][0][0] < patch->texCoord[0][1][0]) {
+            sMin = patch->texCoord[0][0][0];
+        } else {
+            sMin = patch->texCoord[0][1][0];
+        }
 
-		float sMin2;
-		if (patch->texCoord[1][0][0] < patch->texCoord[1][1][0])
-		{
-			sMin2 = patch->texCoord[1][0][0];
-		}
-		else
-		{
-			sMin2 = patch->texCoord[1][1][0];
-		}
+        float sMin2;
+        if (patch->texCoord[1][0][0] < patch->texCoord[1][1][0]) {
+            sMin2 = patch->texCoord[1][0][0];
+        } else {
+            sMin2 = patch->texCoord[1][1][0];
+        }
 
-		if (sMin >= sMin2)
-		{
-			if (patch->texCoord[1][0][0] >= patch->texCoord[1][1][0])
-			{
-				sMin = floor(patch->texCoord[1][1][0]);
-			}
-			else
-			{
-				sMin = floor(patch->texCoord[1][0][0]);
-			}
-		}
-		else if (patch->texCoord[0][0][0] >= patch->texCoord[0][1][0])
-		{
-			sMin = floor(patch->texCoord[0][1][0]);
-		}
-		else
-		{
-			sMin = floor(patch->texCoord[0][0][0]);
-		}
+        if (sMin >= sMin2) {
+            if (patch->texCoord[1][0][0] >= patch->texCoord[1][1][0]) {
+                sMin = floor(patch->texCoord[1][1][0]);
+            } else {
+                sMin = floor(patch->texCoord[1][0][0]);
+            }
+        } else if (patch->texCoord[0][0][0] >= patch->texCoord[0][1][0]) {
+            sMin = floor(patch->texCoord[0][1][0]);
+        } else {
+            sMin = floor(patch->texCoord[0][0][0]);
+        }
 
-		if (patch->texCoord[0][0][1] < patch->texCoord[0][1][1])
-		{
-			tMin = patch->texCoord[0][0][1];
-		}
-		else
-		{
-			tMin = patch->texCoord[0][1][1];
-		}
+        if (patch->texCoord[0][0][1] < patch->texCoord[0][1][1]) {
+            tMin = patch->texCoord[0][0][1];
+        } else {
+            tMin = patch->texCoord[0][1][1];
+        }
 
-		float tMin2;
-		if (patch->texCoord[1][0][1] < patch->texCoord[1][1][1])
-		{
-			tMin2 = patch->texCoord[1][0][1];
-		}
-		else
-		{
-			tMin2 = patch->texCoord[1][1][1];
-		}
+        float tMin2;
+        if (patch->texCoord[1][0][1] < patch->texCoord[1][1][1]) {
+            tMin2 = patch->texCoord[1][0][1];
+        } else {
+            tMin2 = patch->texCoord[1][1][1];
+        }
 
-		if (tMin >= tMin2)
-		{
-			if (patch->texCoord[1][0][1] >= patch->texCoord[1][1][1])
-			{
-				tMin = floor(patch->texCoord[1][1][1]);
-			}
-			else
-			{
-				tMin = floor(patch->texCoord[1][0][1]);
-			}
-		}
-		else if (patch->texCoord[0][0][1] >= patch->texCoord[0][1][1])
-		{
-			tMin = floor(patch->texCoord[0][1][1]);
-		}
-		else
-		{
-			tMin = floor(patch->texCoord[0][0][1]);
-		}
+        if (tMin >= tMin2) {
+            if (patch->texCoord[1][0][1] >= patch->texCoord[1][1][1]) {
+                tMin = floor(patch->texCoord[1][1][1]);
+            } else {
+                tMin = floor(patch->texCoord[1][0][1]);
+            }
+        } else if (patch->texCoord[0][0][1] >= patch->texCoord[0][1][1]) {
+            tMin = floor(patch->texCoord[0][1][1]);
+        } else {
+            tMin = floor(patch->texCoord[0][0][1]);
+        }
 
-		const float s00 = patch->texCoord[0][0][0] - sMin;
-		const float s01 = patch->texCoord[0][1][0] - sMin;
-		const float s10 = patch->texCoord[1][0][0] - sMin;
-		const float s11 = patch->texCoord[1][1][0] - sMin;
+        const float s00 = patch->texCoord[0][0][0] - sMin;
+        const float s01 = patch->texCoord[0][1][0] - sMin;
+        const float s10 = patch->texCoord[1][0][0] - sMin;
+        const float s11 = patch->texCoord[1][1][0] - sMin;
 
-		const float t00 = patch->texCoord[0][0][1] - tMin;
-		const float t01 = patch->texCoord[0][1][1] - tMin;
-		const float t10 = patch->texCoord[1][0][1] - tMin;
-		const float t11 = patch->texCoord[1][1][1] - tMin;
+        const float t00 = patch->texCoord[0][0][1] - tMin;
+        const float t01 = patch->texCoord[0][1][1] - tMin;
+        const float t10 = patch->texCoord[1][0][1] - tMin;
+        const float t11 = patch->texCoord[1][1][1] - tMin;
 
-		const float lmapSize = (float)(patch->drawinfo.lmapSize - 1) / TERRAIN_LIGHTMAP_SIZE;
-		const float ls = patch->s + lmapSize;
-		const float lt = patch->t + lmapSize;
+        const float lmapSize = (float)(patch->drawinfo.lmapSize - 1) / TERRAIN_LIGHTMAP_SIZE;
+        const float ls       = patch->s + lmapSize;
+        const float lt       = patch->t + lmapSize;
 
-		terraInt iTri0 = R_AllocateTri(patch, qfalse);
-		terraInt iTri1 = R_AllocateTri(patch, qfalse);
-		terraInt i00 = R_AllocateVert(patch);
-		terraInt i01 = R_AllocateVert(patch);
-		terraInt i10 = R_AllocateVert(patch);
-		terraInt i11 = R_AllocateVert(patch);
+        terraInt iTri0 = R_AllocateTri(patch, qfalse);
+        terraInt iTri1 = R_AllocateTri(patch, qfalse);
+        terraInt i00   = R_AllocateVert(patch);
+        terraInt i01   = R_AllocateVert(patch);
+        terraInt i10   = R_AllocateVert(patch);
+        terraInt i11   = R_AllocateVert(patch);
 
-		terrainVert_t* pVert;
-		pVert = &g_pVert[i00];
-		pVert->xyz[0] = patch->x0;
-		pVert->xyz[1] = patch->y0;
-		pVert->xyz[2] = (float)(patch->heightmap[0] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[0];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s00;
-		pVert->texCoords[0][1] = t00;
-		pVert->texCoords[1][0] = patch->s;
-		pVert->texCoords[1][1] = patch->t;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
+        terrainVert_t *pVert;
+        pVert                  = &g_pVert[i00];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[0] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[0];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s00;
+        pVert->texCoords[0][1] = t00;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
 
-		pVert = &g_pVert[i01];
-		pVert->xyz[0] = patch->x0;
-		pVert->xyz[1] = patch->y0 + 512.0f;
-		pVert->xyz[2] = (float)(patch->heightmap[72] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[72];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s01;
-		pVert->texCoords[0][1] = t01;
-		pVert->texCoords[1][0] = patch->s;
-		pVert->texCoords[1][1] = lt;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
+        pVert                  = &g_pVert[i01];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[72] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[72];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s01;
+        pVert->texCoords[0][1] = t01;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
 
-		pVert = &g_pVert[i10];
-		pVert->xyz[0] = patch->x0 + 512.0f;
-		pVert->xyz[1] = patch->y0;
-		pVert->xyz[2] = (float)(patch->heightmap[8] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[8];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s10;
-		pVert->texCoords[0][1] = t10;
-		pVert->texCoords[1][0] = ls;
-		pVert->texCoords[1][1] = patch->t;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
+        pVert                  = &g_pVert[i10];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[8] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[8];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s10;
+        pVert->texCoords[0][1] = t10;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
 
-		pVert = &g_pVert[i11];
-		pVert->xyz[0] = patch->x0 + 512.0f;
-		pVert->xyz[1] = patch->y0 + 512.0f;
-		pVert->xyz[2] = (float)(patch->heightmap[80] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[80];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s11;
-		pVert->texCoords[0][1] = t11;
-		pVert->texCoords[1][0] = ls;
-		pVert->texCoords[1][1] = lt;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
+        pVert                  = &g_pVert[i11];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[80] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[80];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s11;
+        pVert->texCoords[0][1] = t11;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
 
-		terraTri_t* pTri = &g_pTris[iTri0];
-		pTri->patch = patch;
-		pTri->varnode = &patch->varTree[0][0];
-		pTri->index = 1;
-		pTri->lod = 0;
-		pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+        terraTri_t *pTri = &g_pTris[iTri0];
+        pTri->patch      = patch;
+        pTri->varnode    = &patch->varTree[0][0];
+        pTri->index      = 1;
+        pTri->lod        = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
 
-		pTri->iBase = iTri1;
-		if ((patch->flags & 0x80u) == 0)
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i00;
-				pTri->iPt[1] = i11;
-			}
-			else
-			{
-				pTri->iPt[0] = i11;
-				pTri->iPt[1] = i00;
-			}
-			pTri->iPt[2] = i01;
-		}
-		else
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i01;
-				pTri->iPt[1] = i10;
-			}
-			else
-			{
-				pTri->iPt[0] = i10;
-				pTri->iPt[1] = i01;
-			}
-			pTri->iPt[2] = i11;
-		}
+        pTri->iBase = iTri1;
+        if ((patch->flags & 0x80u) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            } else {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            }
+            pTri->iPt[2] = i01;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            } else {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            }
+            pTri->iPt[2] = i11;
+        }
 
-		R_ValidateHeightmapForVertex(pTri);
+        R_ValidateHeightmapForVertex(pTri);
 
-		pTri = &g_pTris[iTri1];
-		pTri->patch = patch;
-		pTri->varnode = &patch->varTree[1][0];
-		pTri->index = 1;
-		pTri->lod = 0;
-		pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+        pTri          = &g_pTris[iTri1];
+        pTri->patch   = patch;
+        pTri->varnode = &patch->varTree[1][0];
+        pTri->index   = 1;
+        pTri->lod     = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
 
-		pTri->iBase = iTri0;
-		if ((patch->flags & 0x80u) == 0)
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i11;
-				pTri->iPt[1] = i00;
-			}
-			else
-			{
-				pTri->iPt[0] = i00;
-				pTri->iPt[1] = i11;
-			}
-			pTri->iPt[2] = i10;
-		}
-		else
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i10;
-				pTri->iPt[1] = i01;
-			}
-			else
-			{
-				pTri->iPt[0] = i01;
-				pTri->iPt[1] = i10;
-			}
-			pTri->iPt[2] = i00;
-		}
+        pTri->iBase = iTri0;
+        if ((patch->flags & 0x80u) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            } else {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            }
+            pTri->iPt[2] = i10;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            } else {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            }
+            pTri->iPt[2] = i00;
+        }
 
-		R_ValidateHeightmapForVertex(pTri);
-	}
+        R_ValidateHeightmapForVertex(pTri);
+    }
 }
 
-static qboolean R_NeedSplitTri(terraTri_t * pTri)
+static qboolean R_NeedSplitTri(terraTri_t *pTri)
 {
-	uint8_t byConstChecks = pTri->byConstChecks;
-	if (byConstChecks & 2) {
-		return byConstChecks & 1;
-	}
+    uint8_t byConstChecks = pTri->byConstChecks;
+    if (byConstChecks & 2) {
+        return byConstChecks & 1;
+    }
 
-	if (pTri->uiDistRecalc > g_uiTerDist) {
-		return qfalse;
-	}
+    if (pTri->uiDistRecalc > g_uiTerDist) {
+        return qfalse;
+    }
 
-	float fRatio = ((g_pVert[pTri->iPt[0]].xyz[0] + g_pVert[pTri->iPt[1]].xyz[0]) * g_vViewVector[0]
-		+ (g_pVert[pTri->iPt[0]].xyz[1] + g_pVert[pTri->iPt[1]].xyz[1]) * g_vViewVector[1])
-		* 0.5
-		+ g_vViewVector[2]
-		- pTri->varnode->fVariance * g_fCheck;
+    float fRatio = ((g_pVert[pTri->iPt[0]].xyz[0] + g_pVert[pTri->iPt[1]].xyz[0]) * g_vViewVector[0]
+                    + (g_pVert[pTri->iPt[0]].xyz[1] + g_pVert[pTri->iPt[1]].xyz[1]) * g_vViewVector[1])
+                     * 0.5
+                 + g_vViewVector[2] - pTri->varnode->fVariance * g_fCheck;
 
-	if (fRatio > 0)
-	{
-		pTri->uiDistRecalc = floor(fRatio) + g_uiTerDist;
-		return qfalse;
-	}
+    if (fRatio > 0) {
+        pTri->uiDistRecalc = floor(fRatio) + g_uiTerDist;
+        return qfalse;
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
-static void R_CalcVertMorphHeight(terrainVert_t* pVert)
+static void R_CalcVertMorphHeight(terrainVert_t *pVert)
 {
-	float dot;
+    float dot;
 
-	pVert->xyz[2] = pVert->fHgtAvg;
-	pVert->uiDistRecalc = g_uiTerDist + 1;
-	dot = (pVert->fVariance * g_fCheck) - (g_vViewVector[0] * pVert->xyz[0] + g_vViewVector[1] * pVert->xyz[1] + g_vViewVector[2]);
+    pVert->xyz[2]       = pVert->fHgtAvg;
+    pVert->uiDistRecalc = g_uiTerDist + 1;
+    dot                 = (pVert->fVariance * g_fCheck)
+        - (g_vViewVector[0] * pVert->xyz[0] + g_vViewVector[1] * pVert->xyz[1] + g_vViewVector[2]);
 
-	if (dot > 0.0)
-	{
-		float calc = dot / 400.0;
+    if (dot > 0.0) {
+        float calc = dot / 400.0;
 
-		if (calc > 1.0)
-		{
-			pVert->uiDistRecalc = (unsigned int)((g_uiTerDist - 400) + floor(dot));
-			calc = 1.0;
-		}
+        if (calc > 1.0) {
+            pVert->uiDistRecalc = (unsigned int)((g_uiTerDist - 400) + floor(dot));
+            calc                = 1.0;
+        }
 
-		pVert->xyz[2] += pVert->fHgtAdd * calc;
-	}
-	else
-	{
-		pVert->uiDistRecalc = g_uiTerDist - (int)ceil(dot);
-	}
+        pVert->xyz[2] += pVert->fHgtAdd * calc;
+    } else {
+        pVert->uiDistRecalc = g_uiTerDist - (int)ceil(dot);
+    }
 }
 
-static void R_UpdateVertMorphHeight(terrainVert_t* pVert)
+static void R_UpdateVertMorphHeight(terrainVert_t *pVert)
 {
-	if (pVert->uiDistRecalc <= g_uiTerDist) {
-		R_CalcVertMorphHeight(pVert);
-	}
+    if (pVert->uiDistRecalc <= g_uiTerDist) {
+        R_CalcVertMorphHeight(pVert);
+    }
 }
 
 static void R_DoTriSplitting()
 {
-	cTerraPatchUnpacked_t* patch;
+    cTerraPatchUnpacked_t *patch;
 
-	for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive)
-	{
-		if (patch->uiDistRecalc > g_uiTerDist) {
-			continue;
-		}
+    for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+        if (patch->uiDistRecalc > g_uiTerDist) {
+            continue;
+        }
 
-		patch->uiDistRecalc = -1;
-		g_tri.iCur = patch->drawinfo.iTriHead;
-		while (g_tri.iCur != 0)
-		{
-			terraTri_t* pTri = &g_pTris[g_tri.iCur];
+        patch->uiDistRecalc = -1;
+        g_tri.iCur          = patch->drawinfo.iTriHead;
+        while (g_tri.iCur != 0) {
+            terraTri_t *pTri = &g_pTris[g_tri.iCur];
 
-			if (R_NeedSplitTri(pTri))
-			{
-				//
-				// make sure there are sufficient number of tris
-				//
-				if (g_tri.nFree < 14 || g_vert.nFree < 14) {
-					Com_DPrintf("WARNING: aborting terrain tessellation -- insufficient tris\n");
-					return;
-				}
+            if (R_NeedSplitTri(pTri)) {
+                //
+                // make sure there are sufficient number of tris
+                //
+                if (g_tri.nFree < 14 || g_vert.nFree < 14) {
+                    Com_DPrintf("WARNING: aborting terrain tessellation -- insufficient tris\n");
+                    return;
+                }
 
-				patch->uiDistRecalc = 0;
-				R_ForceSplit(g_tri.iCur);
+                patch->uiDistRecalc = 0;
+                R_ForceSplit(g_tri.iCur);
 
-				if (&g_pTris[g_tri.iCur] == pTri)
-				{
-					g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-				}
-			}
-			else
-			{
-				if ((pTri->byConstChecks & 3) != 2)
-				{
-					if (patch->uiDistRecalc > pTri->uiDistRecalc)
-					{
-						patch->uiDistRecalc = pTri->uiDistRecalc;
-					}
-				}
+                if (&g_pTris[g_tri.iCur] == pTri) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            } else {
+                if ((pTri->byConstChecks & 3) != 2) {
+                    if (patch->uiDistRecalc > pTri->uiDistRecalc) {
+                        patch->uiDistRecalc = pTri->uiDistRecalc;
+                    }
+                }
 
-				g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-			}
-		}
-	}
+                g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+            }
+        }
+    }
 }
 
 static void R_DoGeomorphs()
 {
-	for (size_t n = 0; n < tr.world->numTerraPatches; n++)
-	{
-		cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[n];
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
 
-		g_vert.iCur = patch->drawinfo.iVertHead;
+        g_vert.iCur = patch->drawinfo.iVertHead;
 
-		if (patch->visCountDraw == g_terVisCount)
-		{
-			if (patch->byDirty)
-			{
-				while (g_vert.iCur)
-				{
-					terrainVert_t* pVert = &g_pVert[g_vert.iCur];
-					R_CalcVertMorphHeight(pVert);
-					g_vert.iCur = pVert->iNext;
-				}
+        if (patch->visCountDraw == g_terVisCount) {
+            if (patch->byDirty) {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_CalcVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
 
-				patch->byDirty = qfalse;
-			}
-			else
-			{
-				while (g_vert.iCur)
-				{
-					terrainVert_t* pVert = &g_pVert[g_vert.iCur];
-					R_UpdateVertMorphHeight(pVert);
-					g_vert.iCur = pVert->iNext;
-				}
-			}
-		}
-		else
-		{
-			if (!patch->byDirty)
-			{
-				patch->byDirty = qtrue;
-				while (g_vert.iCur)
-				{
-					terrainVert_t* pVert = &g_pVert[g_vert.iCur];
-					pVert->xyz[2] = pVert->fHgtAvg + pVert->fHgtAdd;
-					g_vert.iCur = pVert->iNext;
-				}
-			}
-		}
-	}
+                patch->byDirty = qfalse;
+            } else {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_UpdateVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+            }
+        } else {
+            if (!patch->byDirty) {
+                patch->byDirty = qtrue;
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    pVert->xyz[2]        = pVert->fHgtAvg + pVert->fHgtAdd;
+                    g_vert.iCur          = pVert->iNext;
+                }
+            }
+        }
+    }
 }
 
 static qboolean R_MergeInternalAggressive()
 {
-	terraTri_t* pTri = &g_pTris[g_tri.iCur];
-	terraTri_t* pBase;
+    terraTri_t *pTri = &g_pTris[g_tri.iCur];
+    terraTri_t *pBase;
 
-	if (pTri->nSplit) {
-		return qfalse;
-	}
+    if (pTri->nSplit) {
+        return qfalse;
+    }
 
-	if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
-		return qfalse;
-	}
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
 
-	if (pTri->iBase)
-	{
-		pBase = &g_pTris[pTri->iBase];
-		if (pBase->nSplit) {
-			return qfalse;
-		}
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit) {
+            return qfalse;
+        }
 
-		R_ForceMerge(pTri->iBase);
-	}
+        R_ForceMerge(pTri->iBase);
+    }
 
-	R_ForceMerge(g_tri.iCur);
-	return qtrue;
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
 }
 
 static qboolean R_MergeInternalCautious()
 {
-	terraTri_t* pTri;
-	terraTri_t* pBase;
+    terraTri_t *pTri;
+    terraTri_t *pBase;
 
-	pTri = &g_pTris[g_tri.iCur];
+    pTri = &g_pTris[g_tri.iCur];
 
-	if (pTri->nSplit) {
-		return qfalse;
-	}
+    if (pTri->nSplit) {
+        return qfalse;
+    }
 
-	if (pTri->varnode->s.flags & 8) {
-		return qfalse;
-	}
+    if (pTri->varnode->s.flags & 8) {
+        return qfalse;
+    }
 
-	if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
-		return qfalse;
-	}
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
 
-	if (pTri->iBase)
-	{
-		pBase = &g_pTris[pTri->iBase];
-		if (pBase->nSplit || (pBase->varnode->s.flags & 8)) {
-			return qfalse;
-		}
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit || (pBase->varnode->s.flags & 8)) {
+            return qfalse;
+        }
 
-		R_ForceMerge(pTri->iBase);
-	}
+        R_ForceMerge(pTri->iBase);
+    }
 
-	R_ForceMerge(g_tri.iCur);
-	return qtrue;
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
 }
 
 static void R_DoTriMerging()
 {
-	int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
+    int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
 
-	for (size_t n = 0; n < tr.world->numTerraPatches; n++)
-	{
-		const cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[n];
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        const cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
 
-		g_tri.iCur = patch->drawinfo.iMergeHead;
-		if (patch->visCountDraw >= iCautiousFrame)
-		{
-			while (g_tri.iCur)
-			{
-				if (!R_MergeInternalCautious())
-				{
-					g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-				}
-			}
-		}
-		else if(patch->visCountDraw > iCautiousFrame - 10)
-		{
-			while (g_tri.iCur)
-			{
-				if (!R_MergeInternalAggressive())
-				{
-					g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-				}
-			}
-		}
-	}
+        g_tri.iCur = patch->drawinfo.iMergeHead;
+        if (patch->visCountDraw >= iCautiousFrame) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalCautious()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        } else if (patch->visCountDraw > iCautiousFrame - 10) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalAggressive()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        }
+    }
 }
 
 void R_TessellateTerrain()
 {
-	if (glConfig.smpActive) {
-		R_SyncRenderThread();
-	}
+    if (glConfig.smpActive) {
+        R_SyncRenderThread();
+    }
 
-	R_DoTriSplitting();
-	// Morph geometry according to the view
-	R_DoGeomorphs();
-	// Merge vertices
-	R_DoTriMerging();
+    R_DoTriSplitting();
+    // Morph geometry according to the view
+    R_DoGeomorphs();
+    // Merge vertices
+    R_DoTriMerging();
 }
 
 void R_TerrainPrepareFrame()
 {
-	float distance;
-	int index;
-	float fFov;
-	float fCheck;
-	float fDistBound;
+    float distance;
+    int   index;
+    float fFov;
+    float fCheck;
+    float fDistBound;
 
-	if (ter_lock->integer) {
-		return;
-	}
+    if (ter_lock->integer) {
+        return;
+    }
 
-	if (tr.viewParms.isPortalSky) {
-		return;
-	}
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
 
-	g_terVisCount++;
-	tr.world->activeTerraPatches = NULL;
+    g_terVisCount++;
+    tr.world->activeTerraPatches = NULL;
 
-	if (ter_error->value < 0.1) {
-		ri.Cvar_Set("ter_error", "0.1");
-	}
+    if (ter_error->value < 0.1) {
+        ri.Cvar_Set("ter_error", "0.1");
+    }
 
-	distance = 1.0;
-	fFov = tr.refdef.fov_x;
-	if (fFov < 1.0) {
-		fFov = 1.0;
-	}
+    distance = 1.0;
+    fFov     = tr.refdef.fov_x;
+    if (fFov < 1.0) {
+        fFov = 1.0;
+    }
 
-	fCheck = 1.0 / (tan(fFov / 114.0) * ter_error->value / 320.0);
-	if (g_terVisCount)
-	{
-		float fFarPlane = tr.viewParms.farplane_distance;
-		if (fFarPlane == 0.0) {
-			fFarPlane = 4096.0;
-		}
+    fCheck = 1.0 / (tan(fFov / 114.0) * ter_error->value / 320.0);
+    if (g_terVisCount) {
+        float fFarPlane = tr.viewParms.farplane_distance;
+        if (fFarPlane == 0.0) {
+            fFarPlane = 4096.0;
+        }
 
-		fDistBound = fabs((fCheck - g_fCheck) * 510.0)
-			+ fabs((tr.refdef.vieworg[0] - g_vTerOrg[0]) * g_vTerFwd[0])
-			+ fabs((tr.refdef.vieworg[1] - g_vTerOrg[1]) * g_vTerFwd[1])
-			+ fabs((tr.refdef.viewaxis[0][0] - g_vTerFwd[0]) * fFarPlane)
-			+ fabs((tr.refdef.viewaxis[0][1] - g_vTerFwd[1]) * fFarPlane);
+        fDistBound = fabs((fCheck - g_fCheck) * 510.0) + fabs((tr.refdef.vieworg[0] - g_vTerOrg[0]) * g_vTerFwd[0])
+                   + fabs((tr.refdef.vieworg[1] - g_vTerOrg[1]) * g_vTerFwd[1])
+                   + fabs((tr.refdef.viewaxis[0][0] - g_vTerFwd[0]) * fFarPlane)
+                   + fabs((tr.refdef.viewaxis[0][1] - g_vTerFwd[1]) * fFarPlane);
 
-		g_uiTerDist = (ceil(fDistBound) + (float)g_uiTerDist);
-		if (g_uiTerDist > 0xF0000000)
-		{
-			for (index = 0; index < tr.world->numTerraPatches; index++) {
-				tr.world->terraPatches[index].uiDistRecalc = 0;
-			}
+        g_uiTerDist = (ceil(fDistBound) + (float)g_uiTerDist);
+        if (g_uiTerDist > 0xF0000000) {
+            for (index = 0; index < tr.world->numTerraPatches; index++) {
+                tr.world->terraPatches[index].uiDistRecalc = 0;
+            }
 
-			for (index = 0; index < g_nTris; index++) {
-				g_pTris[index].uiDistRecalc = 0;
-			}
+            for (index = 0; index < g_nTris; index++) {
+                g_pTris[index].uiDistRecalc = 0;
+            }
 
-			for (index = 0; index < g_nVerts; index++) {
-				g_pVert[index].uiDistRecalc = 0;
-			}
+            for (index = 0; index < g_nVerts; index++) {
+                g_pVert[index].uiDistRecalc = 0;
+            }
 
-			g_uiTerDist = 0;
-		}
-	}
-	else
-	{
-		fDistBound = 0.0;
-		g_uiTerDist = 0;
-	}
+            g_uiTerDist = 0;
+        }
+    } else {
+        fDistBound  = 0.0;
+        g_uiTerDist = 0;
+    }
 
+    VectorCopy2D(tr.refdef.vieworg, g_vTerOrg);
+    VectorCopy(tr.refdef.viewaxis[0], g_vTerFwd);
+    g_fCheck = fCheck;
 
-	VectorCopy2D(tr.refdef.vieworg, g_vTerOrg);
-	VectorCopy(tr.refdef.viewaxis[0], g_vTerFwd);
-	g_fCheck = fCheck;
+    if (fDistBound != 0.0) {
+        index    = (int)tr.refdef.fov_x;
+        distance = g_fDistanceTable[index];
 
-	if (fDistBound != 0.0)
-	{
-		index = (int)tr.refdef.fov_x;
-		distance = g_fDistanceTable[index];
+        g_fClipDotSquared = g_fClipDotSquaredTable[index];
+        g_fClipDotProduct = g_fClipDotProductTable[index];
+        VectorCopy(tr.refdef.viewaxis[0], g_vClipVector);
+        g_vClipOrigin[0] = tr.refdef.vieworg[0] - distance * tr.refdef.viewaxis[0][0] - 256.0;
+        g_vClipOrigin[1] = tr.refdef.vieworg[1] - distance * tr.refdef.viewaxis[0][1] - 256.0;
+        g_vClipOrigin[2] = tr.refdef.vieworg[2] - distance * tr.refdef.viewaxis[0][2] - 255.0;
+        g_vViewVector[0] = tr.refdef.viewaxis[0][0];
+        g_vViewVector[1] = tr.refdef.viewaxis[0][1];
+        g_vViewVector[2] =
+            -(tr.refdef.viewaxis[0][0] * tr.refdef.vieworg[0] + tr.refdef.viewaxis[0][1] * tr.refdef.vieworg[1]);
+        VectorCopy(tr.refdef.vieworg, g_vViewOrigin);
 
-		g_fClipDotSquared = g_fClipDotSquaredTable[index];
-		g_fClipDotProduct = g_fClipDotProductTable[index];
-		VectorCopy(tr.refdef.viewaxis[0], g_vClipVector);
-		g_vClipOrigin[0] = tr.refdef.vieworg[0] - distance * tr.refdef.viewaxis[0][0] - 256.0;
-		g_vClipOrigin[1] = tr.refdef.vieworg[1] - distance * tr.refdef.viewaxis[0][1] - 256.0;
-		g_vClipOrigin[2] = tr.refdef.vieworg[2] - distance * tr.refdef.viewaxis[0][2] - 255.0;
-		g_vViewVector[0] = tr.refdef.viewaxis[0][0];
-		g_vViewVector[1] = tr.refdef.viewaxis[0][1];
-		g_vViewVector[2] = -(tr.refdef.viewaxis[0][0] * tr.refdef.vieworg[0] + tr.refdef.viewaxis[0][1] * tr.refdef.vieworg[1]);
-		VectorCopy(tr.refdef.vieworg, g_vViewOrigin);
-
-		if (tr.viewParms.farplane_distance > 0) {
-			g_fFogDistance = distance + tr.viewParms.farplane_distance + 768.0;
-		} else {
-			g_fFogDistance = 999999.0;
-		}
-	}
+        if (tr.viewParms.farplane_distance > 0) {
+            g_fFogDistance = distance + tr.viewParms.farplane_distance + 768.0;
+        } else {
+            g_fFogDistance = 999999.0;
+        }
+    }
 }
 
-void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch)
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t *pPatch)
 {
-	if (pPatch->visCountCheck == g_terVisCount) {
-		return;
-	}
+    if (pPatch->visCountCheck == g_terVisCount) {
+        return;
+    }
 
-	pPatch->visCountCheck = g_terVisCount;
-	if (ter_cull->integer)
-	{
-		vec3_t v;
-		float dot;
+    pPatch->visCountCheck = g_terVisCount;
+    if (ter_cull->integer) {
+        vec3_t v;
+        float  dot;
 
-		v[0] = pPatch->x0 - g_vClipOrigin[0];
-		v[1] = pPatch->y0 - g_vClipOrigin[1];
-		v[2] = pPatch->z0 - g_vClipOrigin[2];
+        v[0] = pPatch->x0 - g_vClipOrigin[0];
+        v[1] = pPatch->y0 - g_vClipOrigin[1];
+        v[2] = pPatch->z0 - g_vClipOrigin[2];
 
-		dot = DotProduct(v, g_vClipVector);
-		if (dot > g_fFogDistance) {
-			return;
-		}
+        dot = DotProduct(v, g_vClipVector);
+        if (dot > g_fFogDistance) {
+            return;
+        }
 
-		if (VectorLengthSquared(v) * g_fClipDotSquared > dot * dot) {
-			return;
-		}
-	}
+        if (VectorLengthSquared(v) * g_fClipDotSquared > dot * dot) {
+            return;
+        }
+    }
 
-	pPatch->visCountDraw = g_terVisCount;
-	pPatch->pNextActive = tr.world->activeTerraPatches;
-	tr.world->activeTerraPatches = pPatch;
+    pPatch->visCountDraw         = g_terVisCount;
+    pPatch->pNextActive          = tr.world->activeTerraPatches;
+    tr.world->activeTerraPatches = pPatch;
 }
 
 void R_AddTerrainSurfaces()
 {
-	int i;
-	int dlight;
-	cTerraPatchUnpacked_t* patch;
+    int                    i;
+    int                    dlight;
+    cTerraPatchUnpacked_t *patch;
 
-	if (tr.world->numTerraPatches < 0) {
-		return;
-	}
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
 
-	if (!ter_lock->integer) {
-		R_TessellateTerrain();
-	}
+    if (!ter_lock->integer) {
+        R_TessellateTerrain();
+    }
 
-	if (ter_count->integer || ter_lock->integer == 2)
-	{
-		for (i = 0; i < tr.world->numTerraPatches; i++)
-		{
-			patch = &tr.world->terraPatches[i];
+    if (ter_count->integer || ter_lock->integer == 2) {
+        for (i = 0; i < tr.world->numTerraPatches; i++) {
+            patch = &tr.world->terraPatches[i];
 
-			if (ter_lock->integer == 2 || patch->visCountDraw == g_terVisCount)
-			{
-				assert(patch->shader);
+            if (ter_lock->integer == 2 || patch->visCountDraw == g_terVisCount) {
+                assert(patch->shader);
 
-				dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
-				R_AddDrawSurf((surfaceType_t*)&patch->drawinfo, patch->shader, dlight);
-			}
+                dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+                R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, dlight);
+            }
 
-			if (ter_count->integer && (g_nSplit || g_nMerge))
-			{
-				if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge)
-				{
-					Com_DPrintf(
-						"%5d tris / %5d verts / %4d splits / %4d merges\n",
-						g_nTris - g_tri.nFree,
-						g_nVerts - g_vert.nFree,
-						g_nSplit,
-						g_nMerge);
-				}
+            if (ter_count->integer && (g_nSplit || g_nMerge)) {
+                if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
+                    Com_DPrintf(
+                        "%5d tris / %5d verts / %4d splits / %4d merges\n",
+                        g_nTris - g_tri.nFree,
+                        g_nVerts - g_vert.nFree,
+                        g_nSplit,
+                        g_nMerge
+                    );
+                }
 
-				g_nSplit = 0;
-				g_nMerge = 0;
-			}
-		}
-	}
-	else
-	{
-		for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive)
-		{
-			assert(patch->shader);
+                g_nSplit = 0;
+                g_nMerge = 0;
+            }
+        }
+    } else {
+        for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+            assert(patch->shader);
 
-			dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
-			R_AddDrawSurf((surfaceType_t*)&patch->drawinfo, patch->shader, dlight);
-		}
-	}
+            dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+            R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, dlight);
+        }
+    }
 }
 
 /**
@@ -1359,178 +1216,182 @@ void R_AddTerrainSurfaces()
  *
  * ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
  */
-qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts)
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVerts, int nVerts)
 {
-	float x0 = 0;
-	float y0 = 0;
-	float x1 = 0;
-	float y1 = 0;
-	float x2 = 0;
-	float y2 = 0;
-	float fKx[3] = { 0 }, fKy[3] = { 0 }, fKz[3] = { 0 }, fArea[3] = { 0 };
-	float fAreaTotal = 0;
+    float x0     = 0;
+    float y0     = 0;
+    float x1     = 0;
+    float y1     = 0;
+    float x2     = 0;
+    float y2     = 0;
+    float fKx[3] = {0}, fKy[3] = {0}, fKz[3] = {0}, fArea[3] = {0};
+    float fAreaTotal = 0;
 
-	float x = pVerts->xyz[0];
-	float y = pVerts->xyz[1];
+    float x = pVerts->xyz[0];
+    float y = pVerts->xyz[1];
 
-	// Calculate the average of the x and y coordinates of all vertices
-	if (nVerts > 1)
-	{
-		for (int i = 1; i < nVerts; i++)
-		{
-			x += pVerts[i].xyz[0];
-			y += pVerts[i].xyz[1];
-		}
+    // Calculate the average of the x and y coordinates of all vertices
+    if (nVerts > 1) {
+        for (int i = 1; i < nVerts; i++) {
+            x += pVerts[i].xyz[0];
+            y += pVerts[i].xyz[1];
+        }
 
-		// Use the averaged values from this point onwards
-		x = x / nVerts;
-		y = y / nVerts;
-	}
+        // Use the averaged values from this point onwards
+        x = x / nVerts;
+        y = y / nVerts;
+    }
 
-	// Get the first valid triangle in the patch
-	terraInt iTri = pPatch->drawinfo.iTriHead;
-	if (!iTri)
-	{
-		assert(!pPatch->drawinfo.iTriHead &&
-				va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-					x, y, pPatch->x0, pPatch->y0, pPatch->z0));
-		return qfalse;
-	}
+    // Get the first valid triangle in the patch
+    terraInt iTri = pPatch->drawinfo.iTriHead;
+    if (!iTri) {
+        assert(
+            !pPatch->drawinfo.iTriHead
+            && va(
+                "R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
+                x,
+                y,
+                pPatch->x0,
+                pPatch->y0,
+                pPatch->z0
+            )
+        );
+        return qfalse;
+    }
 
-	// Find a triangle that contains the point (x, y)
-	while (qtrue)
-	{
-		if (g_pTris[iTri].byConstChecks & 4)
-		{
-			// Get all three x-y coordinates of the current triangle's vertices
-			x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
-			y0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[1];
-			x1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[0];
-			y1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[1];
-			x2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[0];
-			y2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[1];
+    // Find a triangle that contains the point (x, y)
+    while (qtrue) {
+        if (g_pTris[iTri].byConstChecks & 4) {
+            // Get all three x-y coordinates of the current triangle's vertices
+            x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
+            y0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[1];
+            x1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[0];
+            y1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[1];
+            x2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[0];
+            y2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[1];
 
-			// Calculate the signed areas of the three sub-triangles
-			fArea[0] = (x - x1) * (y2 - y1) - (y - y1) * (x2 - x1);
-			if (fArea[0] < -0.1)
-			{
-				// The point is outside the triangle
-				continue;
-			}
+            // Calculate the signed areas of the three sub-triangles
+            fArea[0] = (x - x1) * (y2 - y1) - (y - y1) * (x2 - x1);
+            if (fArea[0] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
 
-			fArea[1] = (x - x2) * (y0 - y2) - (y - y2) * (x0 - x2);
-			if (fArea[1] < -0.1)
-			{
-				// The point is outside the triangle
-				continue;
-			}
+            fArea[1] = (x - x2) * (y0 - y2) - (y - y2) * (x0 - x2);
+            if (fArea[1] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
 
-			fArea[2] = (x - x0) * (y1 - y0) - (y - y0) * (x1 - x0);
-			if (fArea[2] < -0.1)
-			{
-				// The point is outside the triangle
-				continue;
-			}
+            fArea[2] = (x - x0) * (y1 - y0) - (y - y0) * (x1 - x0);
+            if (fArea[2] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
 
-			fAreaTotal = fArea[0] + fArea[1] + fArea[2];
-			if (fAreaTotal > 0.0)
-			{
-				// Found it - the point is inside the triangle
-				break;
-			}
-		}
+            fAreaTotal = fArea[0] + fArea[1] + fArea[2];
+            if (fAreaTotal > 0.0) {
+                // Found it - the point is inside the triangle
+                break;
+            }
+        }
 
-		iTri = g_pTris[iTri].iNext;
-		if (!iTri)
-		{
-			// There's no triangle that contains point (x, y) - bail out
-			assert(!g_pTris[iTri].iNext &&
-				va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-					x, y, pPatch->x0, pPatch->y0, pPatch->z0));
-			return qfalse;
-		}
-	}
+        iTri = g_pTris[iTri].iNext;
+        if (!iTri) {
+            // There's no triangle that contains point (x, y) - bail out
+            assert(
+                !g_pTris[iTri].iNext
+                && va(
+                    "R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
+                    x,
+                    y,
+                    pPatch->x0,
+                    pPatch->y0,
+                    pPatch->z0
+                )
+            );
+            return qfalse;
+        }
+    }
 
-	// Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
-	float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
-	float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
-	float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
+    // Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
+    float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
+    float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
+    float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
 
-	fKy[0] = z0 * (x2 - x1);
-	fKy[1] = z1 * (x0 - x2);
-	fKy[2] = z2 * (x1 - x0);
+    fKy[0] = z0 * (x2 - x1);
+    fKy[1] = z1 * (x0 - x2);
+    fKy[2] = z2 * (x1 - x0);
 
-	fKx[0] = z0 * (y2 - y1);
-	fKx[1] = z1 * (y0 - y2);
-	fKx[2] = z2 * (y1 - y0);
+    fKx[0] = z0 * (y2 - y1);
+    fKx[1] = z1 * (y0 - y2);
+    fKx[2] = z2 * (y1 - y0);
 
-	// Note: this could be done with the CrossProduct macro if everything were in a vector
-	fKz[0] = fKx[0] * x1 - y1 * fKy[0];
-	fKz[1] = fKx[1] * x2 - y2 * fKy[1];
-	fKz[2] = fKx[2] * x0 - y0 * fKy[2];
+    // Note: this could be done with the CrossProduct macro if everything were in a vector
+    fKz[0] = fKx[0] * x1 - y1 * fKy[0];
+    fKz[1] = fKx[1] * x2 - y2 * fKy[1];
+    fKz[2] = fKx[2] * x0 - y0 * fKy[2];
 
-	// Calculate the height for each vertex
-	for (int i = 0; i < nVerts; i++)
-	{
-		float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
-		float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
-		float fConstZ = fKz[0] + fKz[1] + fKz[2];
+    // Calculate the height for each vertex
+    for (int i = 0; i < nVerts; i++) {
+        float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
+        float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
+        float fConstZ = fKz[0] + fKz[1] + fKz[2];
 
-		// Write back the calculated height into the vertex
-		pVerts[i].xyz[2] = fScaleY - fScaleX - fConstZ;
-	}
+        // Write back the calculated height into the vertex
+        pVerts[i].xyz[2] = fScaleY - fScaleX - fConstZ;
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 void R_TerrainRestart_f(void)
 {
-	if (tr.world->numTerraPatches < 0) {
-		return;
-	}
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
 
-	ri.Free(g_pVert);
-	g_pVert = NULL;
-	ri.Free(g_pTris);
-	g_pTris = NULL;
+    ri.Free(g_pVert);
+    g_pVert = NULL;
+    ri.Free(g_pTris);
+    g_pTris = NULL;
 
-	R_PreTessellateTerrain();
+    R_PreTessellateTerrain();
 }
 
-void R_CraterTerrain(vec_t* pos /* 0x8 */, vec_t* dir, float fDepth, float fRadius)
+void R_CraterTerrain(vec_t *pos /* 0x8 */, vec_t *dir, float fDepth, float fRadius)
 {
-	// FIXME: unimplemented
+    // FIXME: unimplemented
 }
 
 void R_TerrainCrater_f()
 {
-	vec3_t dir;
-	VectorNegate(tr.refdef.viewaxis[2], dir);
+    vec3_t dir;
+    VectorNegate(tr.refdef.viewaxis[2], dir);
 
-	R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
-	R_TerrainRestart_f();
+    R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
+    R_TerrainRestart_f();
 }
 
 void R_InitTerrain()
 {
-	int i;
+    int i;
 
-	ter_maxlod = ri.Cvar_Get("ter_maxlod", "3", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
-	ter_cull = ri.Cvar_Get("ter_cull", "1", 0);
-	ter_lock = ri.Cvar_Get("ter_lock", "0", 0);
-	ter_error = ri.Cvar_Get("ter_error", "10", CVAR_ARCHIVE);
-	ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
-	ter_maxtris = ri.Cvar_Get("ter_maxtris", "16384", CVAR_TERRAIN_LATCH);
-	ter_count = ri.Cvar_Get("ter_count", "0", 0);
+    ter_maxlod         = ri.Cvar_Get("ter_maxlod", "3", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ter_cull           = ri.Cvar_Get("ter_cull", "1", 0);
+    ter_lock           = ri.Cvar_Get("ter_lock", "0", 0);
+    ter_error          = ri.Cvar_Get("ter_error", "10", CVAR_ARCHIVE);
+    ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
+    ter_maxtris        = ri.Cvar_Get("ter_maxtris", "16384", CVAR_TERRAIN_LATCH);
+    ter_count          = ri.Cvar_Get("ter_count", "0", 0);
 
-	Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
-	R_PreTessellateTerrain();
+    Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
+    R_PreTessellateTerrain();
 
-	for (i = 0; i < TERRAIN_TABLE_SIZE; i++)
-	{
-		float dot = (1.0 / (0.82 - cos((float)i / 57.29) * 0.18) - 1.0) * (16.0 / 9.0);
-		g_fClipDotSquaredTable[i] = dot;
-		g_fClipDotProductTable[i] = sqrt(dot);
-		g_fDistanceTable[i] = 443.5 / sqrt(1.0 - dot);
-	}
+    for (i = 0; i < TERRAIN_TABLE_SIZE; i++) {
+        float dot                 = (1.0 / (0.82 - cos((float)i / 57.29) * 0.18) - 1.0) * (16.0 / 9.0);
+        g_fClipDotSquaredTable[i] = dot;
+        g_fClipDotProductTable[i] = sqrt(dot);
+        g_fDistanceTable[i]       = 443.5 / sqrt(1.0 - dot);
+    }
 }

From 5fa1b98d34f49f369efb520f41362155033e6a73 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:52:29 +0100
Subject: [PATCH 0275/2040] Fixed vert Z coord not matching average height

This caused issue where verts would never be merged. This should fix #232
---
 code/renderer/tr_terrain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 0c787b73..3151d781 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -934,7 +934,7 @@ static void R_DoGeomorphs()
                 patch->byDirty = qtrue;
                 while (g_vert.iCur) {
                     terrainVert_t *pVert = &g_pVert[g_vert.iCur];
-                    pVert->xyz[2]        = pVert->fHgtAvg + pVert->fHgtAdd;
+                    pVert->xyz[2]        = pVert->fHgtAvg;
                     g_vert.iCur          = pVert->iNext;
                 }
             }

From fe35e02ed49c552d0d9eb393794e1ecfd35d8e20 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:09:19 +0100
Subject: [PATCH 0276/2040] Fixed weapon pickup logic, like player picking up
 the weapon indefinitely when reaching max ammo

---
 code/fgame/weapon.cpp | 134 +++++++++++++++++++++++++-----------------
 1 file changed, 81 insertions(+), 53 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 805fbd40..c03c777c 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2889,70 +2889,98 @@ void Weapon::PickupWeapon(Event *ev)
                 "print \"" HUD_MESSAGE_YELLOW "%s\n\"",
                 gi.LV_ConvertString(va("Picked Up %s", item_name.c_str()))
             );
-
-            if (!(spawnflags & DROPPED_PLAYER_ITEM) && !(spawnflags & DROPPED_ITEM)) {
-                ItemPickup(other);
-                return;
-            }
-
-            if (Pickupable(other)) {
-                setMoveType(MOVETYPE_NONE);
-                setSolidType(SOLID_NOT);
-
-                hideModel();
-
-                velocity  = vec_zero;
-                avelocity = vec_zero;
-
-                CancelEventsOfType(EV_Remove);
-                CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
-
-                DetachFromOwner();
-                current_attachToTag        = "";
-                lastValid                  = qfalse;
-                edict->s.tag_num           = -1;
-                edict->s.attach_use_angles = qfalse;
-                VectorClear(edict->s.attach_offset);
-
-                setOrigin(vec_zero);
-                setAngles(vec_zero);
-                SetOwner(sen);
-
-                sen->AddItem(this);
-                sen->ReceivedItem(this);
-
-                Sound(sPickupSound);
-            }
         }
+
+        if (!(spawnflags & DROPPED_PLAYER_ITEM) && !(spawnflags & DROPPED_ITEM)) {
+            ItemPickup(other);
+            return;
+        }
+
+        if (!Pickupable(other)) {
+            return;
+        }
+
+        setMoveType(MOVETYPE_NONE);
+        setSolidType(SOLID_NOT);
+
+        hideModel();
+
+        velocity = vec_zero;
+        avelocity = vec_zero;
+
+        CancelEventsOfType(EV_Remove);
+        CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
+
+        DetachFromOwner();
+        current_attachToTag = "";
+        lastValid = qfalse;
+        edict->s.tag_num = -1;
+        edict->s.attach_use_angles = qfalse;
+        VectorClear(edict->s.attach_offset);
+
+        setOrigin(vec_zero);
+        setAngles(vec_zero);
+        SetOwner(sen);
+
+        sen->AddItem(this);
+        sen->ReceivedItem(this);
+
+        iGiveAmmo = startammo[FIRE_PRIMARY];
+
+        Sound(sPickupSound);
     } else {
-        str sAmmoName = ammo_type[FIRE_PRIMARY];
+        bool bSameAmmo[MAX_FIREMODES] = { false };
 
-        if (sen->AmmoCount(sAmmoName) != sen->MaxAmmoCount(sAmmoName)) {
-            setSolidType(SOLID_NOT);
-            hideModel();
-
-            CancelEventsOfType(EV_Item_DropToFloor);
-            CancelEventsOfType(EV_Item_Respawn);
-            CancelEventsOfType(EV_FadeOut);
-            CancelEventsOfType(EV_Remove);
-            CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
-
-            if (Respawnable()) {
-                PostEvent(EV_Item_Respawn, 0);
-            } else {
-                PostEvent(EV_Remove, 0);
+        if (sen->AmmoCount(ammo_type[FIRE_PRIMARY]) == sen->MaxAmmoCount(ammo_type[FIRE_PRIMARY])) {
+            bSameAmmo[FIRE_PRIMARY] = true;
+            if (ammo_type[0] == ammo_type[1]) {
+                bSameAmmo[FIRE_SECONDARY] = true;
             }
-
-            Sound(m_sAmmoPickupSound);
         }
+
+        if (!bSameAmmo[FIRE_SECONDARY]) {
+            if (sen->AmmoCount(ammo_type[FIRE_SECONDARY]) == sen->MaxAmmoCount(ammo_type[FIRE_SECONDARY])) {
+                bSameAmmo[FIRE_SECONDARY] = true;
+            }
+        }
+
+        if (bSameAmmo[FIRE_PRIMARY] && bSameAmmo[FIRE_SECONDARY]) {
+            return;
+        }
+
+        if (bSameAmmo[FIRE_PRIMARY]) {
+            startammo[FIRE_PRIMARY] = 0;
+        }
+
+        if (bSameAmmo[FIRE_SECONDARY]) {
+            startammo[FIRE_SECONDARY] = 0;
+        }
+
+        setSolidType(SOLID_NOT);
+        hideModel();
+
+        CancelEventsOfType(EV_Item_DropToFloor);
+        CancelEventsOfType(EV_Item_Respawn);
+        CancelEventsOfType(EV_FadeOut);
+        CancelEventsOfType(EV_Remove);
+        CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
+
+        if (Respawnable()) {
+            PostEvent(EV_Item_Respawn, 0);
+        }
+        else {
+            PostEvent(EV_Remove, 0);
+        }
+
+        iGiveAmmo = ammo_in_clip[FIRE_PRIMARY] + startammo[FIRE_PRIMARY];
+
+        Sound(m_sAmmoPickupSound);
     }
 
     if (startammo[FIRE_PRIMARY] && ammo_type[FIRE_PRIMARY].length() && other->isClient()) {
         str        sMessage;
         const str& sAmmoType = ammo_type[FIRE_PRIMARY];
 
-        iGiveAmmo = startammo[FIRE_PRIMARY];
-
         sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
         /*

From 4cf4ca29434429ac5b1fb92da42acf99a3e48bcc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:53:22 +0100
Subject: [PATCH 0277/2040] Fixed crash on pSoundAlias

---
 code/client/snd_dma_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index 8458bd18..fbe46aed 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -568,7 +568,7 @@ void S_StartLocalSoundChannel(const char *sound_name, qboolean force_load, sound
 {
     sfxHandle_t      sfxHandle;
     const char      *name;
-    AliasListNode_t *pSoundAlias;
+    AliasListNode_t *pSoundAlias = NULL;
 
     if (!s_bSoundStarted) {
         return;

From 302f06f8d2d711e84a4cee2594e2414d3a3675d6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:54:22 +0100
Subject: [PATCH 0278/2040] Clear the variable if the field cannot be found

---
 code/script/scriptvm.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index c3251dd2..a2bcb5fd 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1590,6 +1590,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                         }
                     } catch (...) {
                         skipField();
+                        m_VMStack.GetTop().Clear();
                         throw;
                     }
 
@@ -1616,6 +1617,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                     }
                 } catch (...) {
                     skipField();
+                    m_VMStack.GetTop().Clear();
                     throw;
                 }
 

From d04ed0aace6d6258dca42a49205082370d391a5f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 19:46:32 +0100
Subject: [PATCH 0279/2040] Made M_PI double

---
 code/qcommon/q_shared.h | 2 +-
 code/qcommon/vector.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index a435874b..c053806c 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -421,7 +421,7 @@ typedef	int	fixed8_t;
 typedef	int	fixed16_t;
 
 #ifndef M_PI
-#define M_PI		3.14159265358979323846f	// matches value in gcc v2 math.h
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
 #endif
 
 #ifndef M_SQRT2
diff --git a/code/qcommon/vector.h b/code/qcommon/vector.h
index e4dfa120..b533f849 100644
--- a/code/qcommon/vector.h
+++ b/code/qcommon/vector.h
@@ -975,15 +975,15 @@ inline void Vector::AngleVectorsLeft(Vector *forward, Vector *left, Vector *up)
     float        angle;
     static float sr, sp, sy, cr, cp, cy; // static to help MS compiler fp bugs
 
-    angle = yaw() * (M_PI * 2.0f / 360.0f);
+    angle = yaw() * (M_PI * 2 / 360);
     sy    = sin(angle);
     cy    = cos(angle);
 
-    angle = pitch() * (M_PI * 2.0f / 360.0f);
+    angle = pitch() * (M_PI * 2 / 360);
     sp    = sin(angle);
     cp    = cos(angle);
 
-    angle = roll() * (M_PI * 2.0f / 360.0f);
+    angle = roll() * (M_PI * 2 / 360);
     sr    = sin(angle);
     cr    = cos(angle);
 

From 2e32395cf22b3a973a50d63c11e5cd4cedf13214 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 19:51:56 +0100
Subject: [PATCH 0280/2040] VectorNormalize optimization

---
 code/qcommon/q_math.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index 1459f69a..c5fe665e 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -36,6 +36,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Z 2
 #define W 3
 
+#ifndef FLT_EPSILON
+#define FLT_EPSILON 1.19209290E-07F
+#endif
+
 vec3_t	vec3_origin = {0,0,0};
 vec3_t	axisDefault[3] = { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 } };
 matrix_t matrixIdentity = {	1, 0, 0, 0,
@@ -1827,13 +1831,13 @@ vec_t VectorNormalize( vec3_t v ) {
 	float	length, ilength;
 
 	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
-	length = sqrt (length);
+    if (length > FLT_EPSILON) {
+        length = sqrt(length);
 
-	if ( length ) {
-		ilength = 1/length;
-		v[0] *= ilength;
-		v[1] *= ilength;
-		v[2] *= ilength;
+        ilength = 1 / length;
+        v[0] *= ilength;
+        v[1] *= ilength;
+        v[2] *= ilength;
 	}
 		
 	return length;
@@ -2921,9 +2925,6 @@ void MatrixMultiplyShear(matrix_t m, vec_t x, vec_t y)
 	Matrix4x4Multiply(tmp, shear, m);
 }
 
-#ifndef FLT_EPSILON
-#define FLT_EPSILON 1.19209290E-07F
-#endif
 void MatrixToAngles(const matrix_t m, vec3_t angles)
 {
 #if 1

From 63456beeb0c2bc13621ea611d1aee44f73caec7d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Mar 2024 22:47:31 +0100
Subject: [PATCH 0281/2040] Code clarity

---
 code/fgame/vehicle.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index fb6c53b1..6392bfa1 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3465,23 +3465,24 @@ void Vehicle::SetupPath(cVehicleSpline *pPath, SimpleEntity *se)
         Vector vDelta = vLastOrigin - ent->origin;
         float  vTmp[4];
 
-        if (vDelta.length() == 0.0f && i > 1) {
+        if (vDelta.length() == 0 && i > 1) {
             Com_Printf("^~^~^Warning: Vehicle Driving with a Path that contains 2 equal points\n");
-        } else {
-            fCurLength += vDelta.length();
-
-            vTmp[0] = fCurLength;
-            VectorCopy(ent->origin, vTmp + 1);
-
-            if (ent->IsSubclassOfVehiclePoint()) {
-                pPath->Add(vTmp, static_cast<VehiclePoint *>(ent)->spawnflags);
-            } else {
-                pPath->Add(vTmp, 0);
-            }
-
-            vLastOrigin = ent->origin;
+            continue;
         }
 
+        fCurLength += vDelta.length();
+
+        vTmp[0] = fCurLength;
+        VectorCopy(ent->origin, vTmp + 1);
+
+        if (ent->IsSubclassOfVehiclePoint()) {
+            pPath->Add(vTmp, static_cast<VehiclePoint*>(ent)->spawnflags);
+        } else {
+            pPath->Add(vTmp, 0);
+        }
+
+        vLastOrigin = ent->origin;
+
         if (ent == se && i > 1) {
             break;
         }

From 25bbc1793d6f48b00fb07c26160ecaaa2bb5fcf3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:06:35 +0100
Subject: [PATCH 0282/2040] Fixed AngleNormalize360

---
 code/qcommon/q_math.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index c5fe665e..222b31e0 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -1129,7 +1129,12 @@ returns angle normalized to the range [0 <= angle < 360]
 =================
 */
 float AngleNormalize360 ( float angle ) {
-	return (360.0 / 65536) * ((int)(angle * (65536 / 360.0)) & 65535);
+	if (angle >= 360) {
+		return angle - 360 * (int)(angle / 360.0);
+	} else if (angle < 0) {
+		return 360 * ((int)(-angle / 360) + 1) + angle;
+    }
+    return angle;
 }
 
 

From 3acb796b59e4f059eb7eabd74c3f2530c4592ad2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:06:50 +0100
Subject: [PATCH 0283/2040] Call VectorNormalize() directly in
 Vector::normalize()

---
 code/qcommon/vector.h | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/code/qcommon/vector.h b/code/qcommon/vector.h
index b533f849..49400ad3 100644
--- a/code/qcommon/vector.h
+++ b/code/qcommon/vector.h
@@ -604,17 +604,7 @@ inline float Vector::lengthXYSquared() const
 //----------------------------------------------------------------
 inline float Vector::normalize(void)
 {
-    float length, ilength;
-
-    length = this->length();
-    if (length) {
-        ilength = 1.0f / length;
-        x *= ilength;
-        y *= ilength;
-        z *= ilength;
-    }
-
-    return length;
+    return VectorNormalize(*this);
 }
 
 //----------------------------------------------------------------
@@ -927,7 +917,7 @@ inline float Vector::toPitch(void) const
     float pitch;
 
     forward = (float)sqrt((x * x) + (y * y));
-    pitch = (float)((int)(atan2(z, forward) * 180.0f / M_PI));
+    pitch = (float)((int)(atan2(z, forward) * 180 / M_PI));
     if (pitch < 0.0f) {
         pitch += 360.0f;
     }

From 7b07be15023308b3cf40de5a79b33c60f6e368b5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:25:31 +0100
Subject: [PATCH 0284/2040] use double instead of float

---
 code/fgame/spline.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/spline.h b/code/fgame/spline.h
index 83ef4520..a32dc460 100644
--- a/code/fgame/spline.h
+++ b/code/fgame/spline.h
@@ -197,7 +197,7 @@ float *cSpline<cGrids, cPoints>::GetByNode(float x, int *flags)
     static float r[cGrids];
     double       delta[cGrids];
 
-    rp = (int)(floor(x) + 1.0f);
+    rp = (int)(floor(x) + 1.0);
 
     if (rp <= 0) {
         if (flags) {

From 5d3b76b24970d149c310e723aff901928899802e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:26:06 +0100
Subject: [PATCH 0285/2040] Cleaned up SetMoveInfo() / SetCEMoveInfo()

---
 code/fgame/vehicle.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 6392bfa1..361ed6f6 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3301,12 +3301,12 @@ void Vehicle::AutoPilot(void)
                         moveimpulse = -m_fIdealSpeed;
                     }
                 }
-            } else if (m_fIdealSpeed > moveimpulse) {
+            } else if (moveimpulse < m_fIdealSpeed) {
                 moveimpulse += m_fIdealAccel * level.frametime;
                 if (moveimpulse > m_fIdealSpeed) {
                     moveimpulse = m_fIdealSpeed;
                 }
-            } else if (m_fIdealSpeed < moveimpulse) {
+            } else if (moveimpulse > m_fIdealSpeed) {
                 moveimpulse -= m_fIdealAccel * level.frametime;
                 if (moveimpulse < m_fIdealSpeed) {
                     moveimpulse = m_fIdealSpeed;
@@ -3849,15 +3849,15 @@ void Vehicle::SetMoveInfo(vmove_t *vm)
 {
     memset(vm, 0, sizeof(vmove_t));
 
-    VectorCopy(origin, vs.origin);
+    origin.copyTo(vs.origin);
     vs.useGravity = false;
     vs.entityNum  = entnum;
 
     vm->vs        = &vs;
     vm->frametime = level.frametime;
     vm->tracemask = edict->clipmask;
-    VectorCopy(mins, vm->mins);
-    VectorCopy(maxs, vm->maxs);
+    mins.copyTo(vm->mins);
+    maxs.copyTo(vm->maxs);
 
     vs.entityNum      = edict->s.number;
     vs.desired_dir[0] = velocity[0];
@@ -3894,14 +3894,17 @@ Vehicle::SetCEMoveInfo
 */
 void Vehicle::SetCEMoveInfo(vmove_t *vm)
 {
+    Vector mins, maxs;
+
     SetMoveInfo(vm);
 
-    vm->mins[0] = m_pCollisionEntity->mins[0] - 24.0f;
-    vm->mins[1] = m_pCollisionEntity->mins[1] - 24.0f;
-    vm->mins[2] = m_pCollisionEntity->mins[2];
-    vm->maxs[0] = m_pCollisionEntity->maxs[0] + 24.0f;
-    vm->maxs[1] = m_pCollisionEntity->maxs[1] + 24.0f;
-    vm->maxs[2] = m_pCollisionEntity->maxs[2];
+    mins = m_pCollisionEntity->mins;
+    maxs = m_pCollisionEntity->maxs;
+    mins -= Vector(24, 24, 0);
+    maxs += Vector(24, 24, 0);
+
+    mins.copyTo(vm->mins);
+    maxs.copyTo(vm->maxs);
 }
 
 /*
@@ -4688,8 +4691,8 @@ void Vehicle::Postthink(void)
     velocity.z = drivespeed * jumpimpulse;
     avelocity *= 0.05f;
 
-    if (steerinplace && drivespeed < 350.0f) {
-        drivespeed = 350.0f;
+    if (steerinplace && drivespeed < 350) {
+        drivespeed = 350;
     }
 
     avelocity.y += turn * drivespeed;

From 22d279073506634ece23cfac9de03b239bf44f52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:27:00 +0100
Subject: [PATCH 0286/2040] Fixed vehicle stepping

---
 code/fgame/g_vmove.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/fgame/g_vmove.cpp b/code/fgame/g_vmove.cpp
index ec762b88..85b8e638 100644
--- a/code/fgame/g_vmove.cpp
+++ b/code/fgame/g_vmove.cpp
@@ -179,18 +179,16 @@ qboolean VM_SlideMove(qboolean gravity)
             break;
         }
 
-        if (trace.plane.normal[2] >= 0.7f) {
+        if (trace.plane.normal[2] >= MIN_WALK_NORMAL) {
             memcpy(&vm->vs->groundTrace, &trace, sizeof(vm->vs->groundTrace));
             vml.validGroundTrace = qtrue;
-        } else if (trace.plane.normal[2] > -0.999f) {
-            if (vm->vs->groundPlane) {
-                if (!vm->vs->hit_obstacle) {
-                    vm->vs->hit_obstacle = qtrue;
-                    VectorCopy(vm->vs->origin, vm->vs->hit_origin);
-                }
-
-                VectorAdd(vm->vs->obstacle_normal, trace.plane.normal, vm->vs->obstacle_normal);
+        } else if (trace.plane.normal[2] > -0.999f && vm->vs->groundPlane) {
+            if (!vm->vs->hit_obstacle) {
+                vm->vs->hit_obstacle = qtrue;
+                VectorCopy(vm->vs->origin, vm->vs->hit_origin);
             }
+
+            VectorAdd(vm->vs->obstacle_normal, trace.plane.normal, vm->vs->obstacle_normal);
         }
 
         // save entity for contact
@@ -439,11 +437,14 @@ void VM_StepSlideMove(void)
         bWasOnGoodGround = qfalse;
     }
 
+    VectorCopy(start_o, up);
+    up[2] += STEPSIZE;
+
     VectorCopy(vm->vs->origin, nostep_o);
     VectorCopy(vm->vs->velocity, nostep_v);
     memcpy(&nostep_groundTrace, &vm->vs->groundTrace, sizeof(trace_t));
 
-    VectorCopy(start_o, vm->vs->origin);
+    VectorCopy(up, vm->vs->origin);
     VectorCopy(start_v, vm->vs->velocity);
 
     first_hit_wall = vm->vs->hit_obstacle;
@@ -453,7 +454,7 @@ void VM_StepSlideMove(void)
     vm->vs->hit_obstacle = start_hit_wall;
     VectorCopy(start_hit_origin, vm->vs->hit_origin);
     VectorCopy(start_wall_normal, vm->vs->obstacle_normal);
-    VM_SlideMove(qtrue);
+    VM_SlideMove(vm->vs->useGravity);
 
     VectorCopy(vm->vs->origin, down);
     down[2] -= STEPSIZE * 2;

From c6e3dfdbe684b889a11c645169915bf264ee9db7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:40:49 +0100
Subject: [PATCH 0287/2040] Fixed velocity clip (sliding along plane)

This fixes the issue where vehicles would not be moving precisely where it should be moving (incorrect clipping of the velocity). For example, the minesweeper tank in e1l2 kept getting stuck because it didn't move appropriately (fixes #261)
---
 code/fgame/g_vmove.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_vmove.cpp b/code/fgame/g_vmove.cpp
index 85b8e638..1cdbb4a8 100644
--- a/code/fgame/g_vmove.cpp
+++ b/code/fgame/g_vmove.cpp
@@ -237,8 +237,8 @@ qboolean VM_SlideMove(qboolean gravity)
                     }
 
                     // slide along the plane
-                    VM_ClipVelocity(vm->vs->velocity, planes[j], clipVelocity, OVERCLIP);
-                    VM_ClipVelocity(endVelocity, planes[j], endClipVelocity, OVERCLIP);
+                    VM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+                    VM_ClipVelocity(endClipVelocity, planes[j], endClipVelocity, OVERCLIP);
 
                     if (DotProduct(clipVelocity, planes[j]) >= 0.0f) {
                         continue; // move doesn't interact with the plane

From b4bce3431b033e793b6ed41285456a4f6ecad8c4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:51:29 +0100
Subject: [PATCH 0288/2040] Archive LightClass object pointer instead of a
 Class object pointer

---
 code/script/scriptvariable.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index ef74bee0..5f32a1b9 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -104,7 +104,7 @@ void ScriptArrayHolder::Archive(Archiver& arc, ScriptArrayHolder *& arrayValue)
         arrayValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&arrayValue);
+        arc.ArchiveObjectPointer((LightClass **)&arrayValue);
     }
 }
 
@@ -142,7 +142,7 @@ void ScriptConstArrayHolder::Archive(Archiver& arc, ScriptConstArrayHolder *& co
         constArrayValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&constArrayValue);
+        arc.ArchiveObjectPointer((LightClass **)&constArrayValue);
     }
 }
 
@@ -171,7 +171,7 @@ void ScriptPointer::Archive(Archiver& arc, ScriptPointer *& pointerValue)
         pointerValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&pointerValue);
+        arc.ArchiveObjectPointer((LightClass **)&pointerValue);
     }
 }
 
@@ -194,7 +194,7 @@ void ScriptVariable::Archive(Archiver& arc)
 
 void ScriptVariable::Archive(Archiver& arc, ScriptVariable **obj)
 {
-    arc.ArchiveObjectPointer((Class **)obj);
+    arc.ArchiveObjectPointer((LightClass **)obj);
 }
 
 void ScriptVariable::ArchiveInternal(Archiver& arc)
@@ -254,7 +254,7 @@ void ScriptVariable::ArchiveInternal(Archiver& arc)
 
     case VARIABLE_REF:
     case VARIABLE_CONTAINER:
-        arc.ArchiveObjectPointer((Class **)&m_data.refValue);
+        arc.ArchiveObjectPointer((LightClass **)&m_data.refValue);
         break;
 
     case VARIABLE_SAFECONTAINER:

From cebb351505777d335367fe2f682b31da19fc45de Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:07:16 +0100
Subject: [PATCH 0289/2040] Added and implemented TargetList

---
 code/fgame/worldspawn.cpp | 46 +++++++++++++++++++++++++++++++++++++++
 code/fgame/worldspawn.h   | 19 ++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index cd677728..e15f6047 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -1197,3 +1197,49 @@ bool WithinFarplaneDistance(const Vector& org)
 
     return org.lengthSquared() < (Square(distance) * Square(0.828f));
 }
+
+CLASS_DECLARATION(Class, TargetList, NULL) {
+    {NULL, NULL}
+};
+
+TargetList::TargetList() {}
+
+TargetList::TargetList(const str& tname)
+    : targetname(tname)
+{}
+
+void TargetList::AddEntity(Listener *ent)
+{
+    list.AddObject(static_cast<SimpleEntity *>(ent));
+}
+
+void TargetList::AddEntityAt(Listener *ent, int i)
+{
+    list.AddObjectAt(i, static_cast<SimpleEntity *>(ent));
+}
+
+int TargetList::GetEntityIndex(Listener *ent)
+{
+    return list.IndexOfObject(static_cast<SimpleEntity *>(ent));
+}
+
+void TargetList::RemoveEntity(Listener *ent)
+{
+    list.RemoveObject(static_cast<SimpleEntity *>(ent));
+}
+
+SimpleEntity *TargetList::GetNextEntity(SimpleEntity *ent)
+{
+    int index;
+
+    for (index = list.IndexOfObject(ent); index <= list.NumObjects(); index++) {
+        Listener *objptr;
+
+        objptr = list.ObjectAt(index);
+        if (objptr->isSubclassOf(SimpleEntity)) {
+            return static_cast<SimpleEntity *>(objptr);
+        }
+    }
+
+    return NULL;
+}
diff --git a/code/fgame/worldspawn.h b/code/fgame/worldspawn.h
index 3e1a05f9..15a3fadf 100644
--- a/code/fgame/worldspawn.h
+++ b/code/fgame/worldspawn.h
@@ -39,6 +39,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 typedef Container<SafePtr<SimpleEntity>> ConSimple;
 
+class TargetList : public Class {
+public:
+    CLASS_PROTOTYPE(TargetList);
+
+public:
+    ConSimple list;
+    str targetname;
+
+public:
+    TargetList();
+    TargetList(const str& tname);
+
+    void AddEntity(Listener* ent);
+    void AddEntityAt(Listener* ent, int i);
+    int GetEntityIndex(Listener* ent);
+    void RemoveEntity(Listener* ent);
+    SimpleEntity* GetNextEntity(SimpleEntity* ent);
+};
+
 class World : public Entity
 {
     con_set<const_str, ConSimple> m_targetList; // moh could have used con_set instead of TargetList

From 7b8be9fed1d7f2d95e7be284afe8c7b84034dc82 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:34:31 +0100
Subject: [PATCH 0290/2040] Added ArchiveObject() that accepts a SafePtr

---
 code/fgame/archive.cpp | 5 +++++
 code/fgame/archive.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index 99bc9b53..fbeb14aa 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -938,6 +938,11 @@ void Archiver::ArchiveObject(Class *obj)
     }
 }
 
+void Archiver::ArchiveObject(SafePtrBase* obj)
+{
+    ArchiveSafePointer(obj);
+}
+
 void Archiver::ArchiveObjectPosition(LightClass *obj)
 {
     int index = 0;
diff --git a/code/fgame/archive.h b/code/fgame/archive.h
index c2c7b120..42e38602 100644
--- a/code/fgame/archive.h
+++ b/code/fgame/archive.h
@@ -154,6 +154,7 @@ public:
 
     void ArchiveRaw(void *data, size_t size);
     void ArchiveObject(Class *obj);
+    void ArchiveObject(SafePtrBase* obj); // Added in OPM
 
     qboolean ObjectPositionExists(void *obj);
 

From 897c2322b90a503f84aeff1271f93e30db507616 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:35:22 +0100
Subject: [PATCH 0291/2040] Archive the target list

This fixes crashes related to scripts using entities by target name
---
 code/fgame/worldspawn.cpp | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index e15f6047..65085c3a 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -542,6 +542,43 @@ CLASS_DECLARATION(Entity, World, "worldspawn") {
     {NULL,                               NULL                            }
 };
 
+template<>
+class con_set_Entry<const_str, ConSimple>
+{
+    friend con_set<const_str, ConSimple>;
+    friend con_set_enum<const_str, ConSimple>;
+
+private:
+    con_set_Entry *next;
+
+public:
+    const_str key;
+    ConSimple value;
+
+public:
+    void *operator new(size_t size) { return con_set<const_str, ConSimple>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_set<const_str, ConSimple>::DeleteEntry(ptr); }
+
+    void Archive(Archiver& arc) {
+        int num;
+
+        arc.ArchiveUnsigned(&key);
+        arc.ArchiveObjectPosition((LightClass*)&value);
+
+        if (arc.Loading()) {
+            arc.ArchiveInteger(&num);
+            value.Resize(num);
+        } else {
+            num = value.NumObjects();
+            arc.ArchiveInteger(&num);
+        }
+    }
+    const_str& GetKey() { return key; }
+
+    void SetKey(const const_str& newKey) { key = newKey; }
+};
+
 World::World()
 {
     world       = this;
@@ -1146,6 +1183,9 @@ void World::FreeTargetList()
 
 void World::Archive(Archiver& arc)
 {
+    // FIXME: this is not the original way of archiving target list
+    m_targetList.Archive(arc);
+
     Entity::Archive(arc);
 
     arc.ArchiveFloat(&farplane_distance);

From 61e9146385ec1bc01bc43a1a2efd488cfedaf2d8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:30:31 +0100
Subject: [PATCH 0292/2040] Moved con_set entry to the header file

This fixes compilation issue with GCC (fixes #288)
---
 code/fgame/worldspawn.cpp | 37 -------------------------------------
 code/fgame/worldspawn.h   | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index 65085c3a..14fe1548 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -542,43 +542,6 @@ CLASS_DECLARATION(Entity, World, "worldspawn") {
     {NULL,                               NULL                            }
 };
 
-template<>
-class con_set_Entry<const_str, ConSimple>
-{
-    friend con_set<const_str, ConSimple>;
-    friend con_set_enum<const_str, ConSimple>;
-
-private:
-    con_set_Entry *next;
-
-public:
-    const_str key;
-    ConSimple value;
-
-public:
-    void *operator new(size_t size) { return con_set<const_str, ConSimple>::NewEntry(size); }
-
-    void operator delete(void *ptr) { con_set<const_str, ConSimple>::DeleteEntry(ptr); }
-
-    void Archive(Archiver& arc) {
-        int num;
-
-        arc.ArchiveUnsigned(&key);
-        arc.ArchiveObjectPosition((LightClass*)&value);
-
-        if (arc.Loading()) {
-            arc.ArchiveInteger(&num);
-            value.Resize(num);
-        } else {
-            num = value.NumObjects();
-            arc.ArchiveInteger(&num);
-        }
-    }
-    const_str& GetKey() { return key; }
-
-    void SetKey(const const_str& newKey) { key = newKey; }
-};
-
 World::World()
 {
     world       = this;
diff --git a/code/fgame/worldspawn.h b/code/fgame/worldspawn.h
index 15a3fadf..ce260537 100644
--- a/code/fgame/worldspawn.h
+++ b/code/fgame/worldspawn.h
@@ -58,6 +58,43 @@ public:
     SimpleEntity* GetNextEntity(SimpleEntity* ent);
 };
 
+template<>
+class con_set_Entry<const_str, ConSimple>
+{
+    friend con_set<const_str, ConSimple>;
+    friend con_set_enum<const_str, ConSimple>;
+
+private:
+    con_set_Entry *next;
+
+public:
+    const_str key;
+    ConSimple value;
+
+public:
+    void *operator new(size_t size) { return con_set<const_str, ConSimple>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_set<const_str, ConSimple>::DeleteEntry(ptr); }
+
+    void Archive(Archiver& arc) {
+        int num;
+
+        arc.ArchiveUnsigned(&key);
+        arc.ArchiveObjectPosition((LightClass*)&value);
+
+        if (arc.Loading()) {
+            arc.ArchiveInteger(&num);
+            value.Resize(num);
+        } else {
+            num = value.NumObjects();
+            arc.ArchiveInteger(&num);
+        }
+    }
+    const_str& GetKey() { return key; }
+
+    void SetKey(const const_str& newKey) { key = newKey; }
+};
+
 class World : public Entity
 {
     con_set<const_str, ConSimple> m_targetList; // moh could have used con_set instead of TargetList

From 9fb559bdb125606f390f22f7067b976bbfc6eb4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Mar 2024 22:52:19 +0100
Subject: [PATCH 0293/2040] Added an assertion check for lastRadarTime

---
 code/server/sv_snapshot.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index 1abafffe..f7503500 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1031,7 +1031,8 @@ static void SV_BuildClientSnapshot( client_t *client ) {
 	for ( i = 0 ; i < entityNumbers.numSnapshotEntities ; i++ ) {
 		ent = SV_GentityNum(entityNumbers.snapshotEntities[i]);
 		if (ent->client) {
-			client->lastRadarTime[ent->s.number + 1] = svs.time;
+			assert(ent->s.number < MAX_CLIENTS);
+			client->lastRadarTime[ent->s.number] = svs.time;
 		}
 
 		state = &svs.snapshotEntities[svs.nextSnapshotEntities % svs.numSnapshotEntities];

From e970e29953b7feac81d6083bb9fcb3e7be9d14ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Mar 2024 22:57:57 +0100
Subject: [PATCH 0294/2040] Use a constant expression for clarity

---
 code/server/sv_init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 40209cd7..3145e386 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -421,9 +421,9 @@ void SV_ClientsAlloc( void )
 	svs.clients = Z_Malloc( svs.iNumClients * sizeof( client_t ) );
 	Com_Memset( svs.clients, 0, svs.iNumClients * sizeof( client_t ) );
 	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
-		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * 64;
+		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * MAX_CLIENTS;
 	} else {
-		svs.numSnapshotEntities = 1 * 32 * 64;
+		svs.numSnapshotEntities = 1 * PACKET_BACKUP * MAX_CLIENTS;
 	}
 
 	SV_InitAllCGMessages();
@@ -515,9 +515,9 @@ void SV_ChangeMaxClients( void ) {
 	Z_Free( oldClients );
 
 	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
-		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * 64;
+		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * MAX_CLIENTS;
 	} else {
-		svs.numSnapshotEntities = 1 * 32 * 64;
+		svs.numSnapshotEntities = 1 * PACKET_BACKUP * MAX_CLIENTS;
 	}
 }
 

From 9f5df368d145033a088ed8b75e986758a537f237 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Mar 2024 23:30:25 +0100
Subject: [PATCH 0295/2040] Fixed infinite player team spectate

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 57da2398..683e7be2 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4686,7 +4686,7 @@ void Player::Think(void)
                     if (!ent->inuse || !ent->entity) {
                         // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator() || IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator() || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
                     }
                 }

From b6485ad7dbd0c187c0d3ef3f038d4c2ebd4a396e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:54:25 +0100
Subject: [PATCH 0296/2040] Configstring optimization so that there is only one
 occurence of a configstring index in pending server commands

This fixes configstring overflow in big maps like t1l2 (fixes #289)
---
 code/server/sv_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 259e0ea0..95c73afc 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -159,9 +159,9 @@ void SV_AddServerCommand( client_t *client, const char *cmd ) {
 
 	// this is very ugly but it's also a waste to for instance send multiple config string updates
 	// for the same config string index in one snapshot
-//	if ( SV_ReplacePendingServerCommands( client, cmd ) ) {
-//		return;
-//	}
+	if ( !strncmp(cmd, "cs ", 3) && SV_ReplacePendingServerCommands(client, cmd) ) {
+		return;
+	}
 
 	// do not send commands until the gamestate has been sent
 	if( client->state < CS_PRIMED )

From 6675a491be04bfa530253eba3a74927a76000a05 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:29:07 +0100
Subject: [PATCH 0297/2040] Fixed the model name when archiving persistant data

This fixes a crash when the next mission map is loaded and then saving/loading afterwards (fixes #237)
---
 code/fgame/player.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 683e7be2..6dcac54d 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7911,6 +7911,7 @@ painDirection_t Player::Pain_string_to_int(str pain)
 void Player::ArchivePersistantData(Archiver& arc)
 {
     str model_name;
+    str name;
 
     Sentient::ArchivePersistantData(arc);
 
@@ -7922,11 +7923,9 @@ void Player::ArchivePersistantData(Archiver& arc)
         // set the cvar
         gi.cvar_set("g_playermodel", model_name.c_str());
 
-        model_name += ".tik";
-        setModel(model_name.c_str());
+        setModel("models/player/" + model_name + ".tik");
     }
 
-    str name;
     if (arc.Saving()) {
         if (holsteredWeapon) {
             name = holsteredWeapon->getName();
@@ -7934,11 +7933,10 @@ void Player::ArchivePersistantData(Archiver& arc)
             name = "none";
         }
     }
+
     arc.ArchiveString(&name);
-    if (arc.Loading()) {
-        if (name != "none") {
-            holsteredWeapon = (Weapon *)FindItem(name);
-        }
+    if (arc.Loading() && name != "none") {
+        holsteredWeapon = (Weapon*)FindItem(name);
     }
 
     UpdateWeapons();

From 98c61529b9a470896282e4d8046a84fc35c6a8cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:33:39 +0100
Subject: [PATCH 0298/2040] Archive the weapon clip amount in persistent data

---
 code/fgame/sentient.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 1f6d6213..1603fa6f 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -2214,11 +2214,25 @@ void Sentient::ArchivePersistantData(Archiver& arc)
                 error("ArchivePersistantData", "Non Item in inventory\n");
             }
         }
+
         arc.ArchiveString(&name);
         arc.ArchiveInteger(&amount);
         if (arc.Loading()) {
             item = giveItem(name, amount);
+        }
+
+        if (item && item->IsSubclassOfWeapon()) {
+            Weapon* pWeap = static_cast<Weapon*>(item);
+
             item->CancelEventsOfType(EV_Weapon_GiveStartingAmmo);
+            if (arc.Saving()) {
+                amount = pWeap->ClipAmmo(FIRE_PRIMARY);
+            }
+            arc.ArchiveInteger(&amount);
+
+            if (arc.Loading()) {
+                pWeap->SetAmmoAmount(amount, FIRE_PRIMARY);
+            }
         }
     }
 

From cacf1ca1b7cf3d00c28168668097e42864049aef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:35:15 +0100
Subject: [PATCH 0299/2040] Set the unarmed flag when archiving persistent 
 data

---
 code/fgame/sentient.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 1603fa6f..ea046b2f 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -2287,6 +2287,12 @@ void Sentient::ArchivePersistantData(Archiver& arc)
         }
     }
 
+    if (GetActiveWeapon(WEAPON_MAIN)) {
+        edict->s.eFlags &= ~EF_UNARMED;
+    } else {
+        edict->s.eFlags |= EF_UNARMED;
+    }
+
     arc.ArchiveFloat(&health);
     arc.ArchiveFloat(&max_health);
 }

From b4de0b53e4182e4240ddc5ed4c0ffc83b8d2b55f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:43:37 +0100
Subject: [PATCH 0300/2040] Special items must not be archived in persistent
 data

---
 code/fgame/sentient.cpp | 45 +++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index ea046b2f..94305ef4 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -2184,11 +2184,27 @@ static bool IsItemName(const char *name)
 
 void Sentient::ArchivePersistantData(Archiver& arc)
 {
-    int i;
-    int num;
+    int     i;
+    int     num;
+    str     name;
+    int     amount;
+    Item   *item;
+    Entity *ent;
 
     // archive the inventory
     if (arc.Saving()) {
+        // remove all special items before persistence
+        for (i = inventory.NumObjects(); i > 0; i--) {
+            int index;
+
+            index = inventory.ObjectAt(i);
+            ent   = G_GetEntity(index);
+            name  = ent->model;
+
+            if (IsItemName(name)) {
+                ent->Delete();
+            }
+        }
         // count up the total number
         num = inventory.NumObjects();
     } else {
@@ -2198,10 +2214,6 @@ void Sentient::ArchivePersistantData(Archiver& arc)
     arc.ArchiveInteger(&num);
     // archive each item
     for (i = 1; i <= num; i++) {
-        str   name;
-        int   amount;
-        Item *item;
-
         if (arc.Saving()) {
             Entity *ent;
 
@@ -2217,12 +2229,13 @@ void Sentient::ArchivePersistantData(Archiver& arc)
 
         arc.ArchiveString(&name);
         arc.ArchiveInteger(&amount);
+
         if (arc.Loading()) {
             item = giveItem(name, amount);
         }
 
         if (item && item->IsSubclassOfWeapon()) {
-            Weapon* pWeap = static_cast<Weapon*>(item);
+            Weapon *pWeap = static_cast<Weapon *>(item);
 
             item->CancelEventsOfType(EV_Weapon_GiveStartingAmmo);
             if (arc.Saving()) {
@@ -2258,16 +2271,17 @@ void Sentient::ArchivePersistantData(Archiver& arc)
             amount    = ptr->getAmount();
             maxamount = ptr->getMaxAmount();
         }
+
         arc.ArchiveString(&name);
         arc.ArchiveInteger(&amount);
         arc.ArchiveInteger(&maxamount);
+
         if (arc.Loading()) {
             GiveAmmo(name, amount, maxamount);
         }
     }
 
     for (i = 0; i < MAX_ACTIVE_WEAPONS; i++) {
-        str name;
         if (arc.Saving()) {
             if (activeWeaponList[i]) {
                 name = activeWeaponList[i]->getName();
@@ -2275,14 +2289,15 @@ void Sentient::ArchivePersistantData(Archiver& arc)
                 name = "none";
             }
         }
+
         arc.ArchiveString(&name);
-        if (arc.Loading()) {
-            if (name != "none") {
-                Weapon *weapon;
-                weapon = (Weapon *)FindItem(name);
-                if (weapon) {
-                    ChangeWeapon(weapon, (weaponhand_t)i);
-                }
+
+        if (arc.Loading() && name != "none") {
+            Weapon *weapon;
+
+            weapon = (Weapon *)FindItem(name);
+            if (weapon) {
+                ChangeWeapon(weapon, (weaponhand_t)i);
             }
         }
     }

From 25418b7857edd7adf2dc05ef36f37e0c49cc64f9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Mar 2024 23:45:03 +0100
Subject: [PATCH 0301/2040] Ammo name must be case-insensitive

This fixes some maps like t1l3 where the player would have a pistol with 6 bullets and no ammo
---
 code/fgame/sentient_combat.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index 4aef186e..adc0241d 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -74,7 +74,6 @@ void Sentient::EventGiveAmmo(Event *ev)
 }
 
 int Sentient::AmmoIndex(str type)
-
 {
     Ammo *ammo;
 
@@ -146,7 +145,6 @@ void Sentient::GiveAmmo(str type, int amount, int maxamount)
 }
 
 int Sentient::UseAmmo(str type, int amount)
-
 {
     int count, i;
 
@@ -154,7 +152,7 @@ int Sentient::UseAmmo(str type, int amount)
 
     for (i = 1; i <= count; i++) {
         Ammo *ammo = ammo_inventory.ObjectAt(i);
-        if (type == ammo->getName()) {
+        if (!str::icmp(type, ammo->getName())) {
             int ammo_amount = ammo->getAmount();
 
             // Less ammo than what we specified to use
@@ -180,7 +178,9 @@ void Sentient::AmmoAmountInClipChanged(str type, int amount_in_clip)
 
     for (i = 1; i <= count; i++) {
         Ammo *ammo = ammo_inventory.ObjectAt(i);
-        if (type == ammo->getName()) {
+        // Fixed in OPM
+        //  Original uses strcmp
+        if (!str::icmp(type, ammo->getName())) {
             AmmoAmountChanged(ammo, amount_in_clip);
         }
     }
@@ -1035,7 +1035,6 @@ Weapon *Sentient::GetActiveWeapon(weaponhand_t hand) const
 }
 
 qboolean Sentient::IsActiveWeapon(Weapon *weapon)
-
 {
     int i;
 
@@ -1246,7 +1245,7 @@ Ammo *Sentient::FindAmmoByName(str name)
 
     for (i = 1; i <= count; i++) {
         Ammo *ammo = ammo_inventory.ObjectAt(i);
-        if (name == ammo->getName()) {
+        if (!str::icmp(name, ammo->getName())) {
             return ammo;
         }
     }

From 6fdc756b590cecaff1786450b2dfaba071336688 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Mar 2024 22:38:44 +0100
Subject: [PATCH 0302/2040] Set terrain rendering settings to max detail by
 default

---
 code/renderer/tr_terrain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 3151d781..2e921216 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1377,12 +1377,12 @@ void R_InitTerrain()
 {
     int i;
 
-    ter_maxlod         = ri.Cvar_Get("ter_maxlod", "3", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ter_maxlod         = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
     ter_cull           = ri.Cvar_Get("ter_cull", "1", 0);
     ter_lock           = ri.Cvar_Get("ter_lock", "0", 0);
-    ter_error          = ri.Cvar_Get("ter_error", "10", CVAR_ARCHIVE);
+    ter_error          = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
     ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
-    ter_maxtris        = ri.Cvar_Get("ter_maxtris", "16384", CVAR_TERRAIN_LATCH);
+    ter_maxtris        = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
     ter_count          = ri.Cvar_Get("ter_count", "0", 0);
 
     Cmd_AddCommand("ter_restart", R_TerrainRestart_f);

From 724aeb22ed51f768d333bddf2b8b729688c3bd26 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:15:19 +0200
Subject: [PATCH 0303/2040] Fixed MM_SlideMove() velocity clip and interaction

---
 code/fgame/g_mmove.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index 9bdcdb90..a17ee607 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -211,6 +211,8 @@ qboolean MM_SlideMove(qboolean gravity)
             //
             // modify velocity so it parallels all of the clip planes
             //
+            VectorCopy(trace.plane.normal, planes[numplanes]);
+            numplanes++;
 
             // find a plane that it enters
             for (i = 0; i < numplanes; i++) {
@@ -227,10 +229,14 @@ qboolean MM_SlideMove(qboolean gravity)
                         continue;
                     }
 
-                    // slide along the plane
-                    MM_ClipVelocity(mm->velocity, planes[j], clipVelocity, OVERCLIP);
+                    if (DotProduct(clipVelocity, planes[j]) >= 0.1) { 
+                        continue; // move doesn't interact with the plane
+                    }
 
-                    if (DotProduct(clipVelocity, planes[j]) >= 0.0f) {
+                    // slide along the plane
+                    MM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+
+                    if (DotProduct(clipVelocity, planes[i]) >= 0) {
                         continue; // move doesn't interact with the plane
                     }
 
@@ -246,7 +252,7 @@ qboolean MM_SlideMove(qboolean gravity)
                             continue;
                         }
 
-                        if (DotProduct(clipVelocity, planes[k]) >= 0.1f) {
+                        if (DotProduct(clipVelocity, planes[k]) >= 0.1) {
                             continue; // move doesn't interact with the plane
                         }
 

From 5a8cc83e6ed2a3d16b8d125326662d69e09dcef2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:52:30 +0200
Subject: [PATCH 0304/2040] Fixed MM stepping

This fixes actors being slow and it also fixes actors going under the map
---
 code/fgame/g_mmove.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index a17ee607..3bb107c5 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -404,12 +404,14 @@ void MM_StepSlideMove(void)
         bWasOnGoodGround = qfalse;
     }
 
-    start_o[2] += 18;
+    VectorCopy(start_o, up);
+    up[2] += 18;
+
     VectorCopy(mm->origin, nostep_o);
     VectorCopy(mm->velocity, nostep_v);
     memcpy(&nostep_groundTrace, &mml.groundTrace, sizeof(trace_t));
 
-    VectorCopy(start_o, mm->origin);
+    VectorCopy(up, mm->origin);
     VectorCopy(start_v, mm->velocity);
 
     first_hit_wall = mm->hit_obstacle;
@@ -425,7 +427,7 @@ void MM_StepSlideMove(void)
     down[2] -= STEPSIZE * 2;
 
     // test the player position if they were a stepheight higher
-    gi.trace(&trace, start_o, mm->mins, mm->maxs, down, mm->entityNum, mm->tracemask, qtrue, qfalse);
+    gi.trace(&trace, mm->origin, mm->mins, mm->maxs, down, mm->entityNum, mm->tracemask, qtrue, qfalse);
     if (trace.entityNum != ENTITYNUM_WORLD && trace.entityNum != ENTITYNUM_NONE) {
         VectorCopy(nostep_o, mm->origin);
         VectorCopy(nostep_v, mm->velocity);

From 9eec50d69fcfc7cc8f62d1f76ab63a64809a6556 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Apr 2024 20:52:58 +0200
Subject: [PATCH 0305/2040] Fixed script model animation issues, especially
 when they're looping

This fixes #220.
---
 code/fgame/scriptslave.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 4633b8a9..b99d1e06 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1957,6 +1957,7 @@ void ScriptModel::SetAnimEvent(Event *ev)
         animnum = gi.Anim_NumForName(edict->tiki, animname);
         if (animnum >= 0) {
             NewAnim(animnum, EV_ScriptModel_AnimDone);
+            RestartAnimSlot(0);
         }
     }
 }

From e3beec985e6a69b885781725545ed242a859f9e5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:00:48 +0200
Subject: [PATCH 0306/2040] When parsing and compiling a script, return the
 length in an output parameter instead so the method can return a boolean to
 indicate success.

This fixes #221 where a script with no code would fail.
---
 code/fgame/gamescript.cpp      | 45 +++++++++++++++++++---------------
 code/script/scriptcompiler.cpp | 24 ++++++++++--------
 code/script/scriptcompiler.h   |  4 +--
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index fd3a18eb..cad742e0 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -104,7 +104,7 @@ void AbstractScript::PrintSourcePos(sourceinfo_t *sourcePos, bool dev)
     if (GetSourceAt(sourcePos->sourcePos, &sourceLine, column, line)) {
         PrintSourcePos(sourceLine, column, line, dev);
     } else {
-        glbs.DPrintf(
+        gi.DPrintf(
             "file '%s', source pos %d line %d column %d:\n",
             Filename().c_str(),
             sourcePos->sourcePos,
@@ -123,7 +123,7 @@ void AbstractScript::PrintSourcePos(size_t sourcePos, bool dev)
     if (GetSourceAt(sourcePos, &sourceLine, column, line)) {
         PrintSourcePos(sourceLine, column, line, dev);
     } else {
-        glbs.DPrintf("file '%s', source pos %d:\n", Filename().c_str(), sourcePos);
+        gi.DPrintf("file '%s', source pos %d:\n", Filename().c_str(), sourcePos);
     }
 }
 
@@ -153,7 +153,7 @@ void AbstractScript::PrintSourcePos(str sourceLine, int column, int line, bool d
 
     markerLine.append("^");
 
-    glbs.DPrintf("(%s, %d):\n%s\n%s\n", Filename().c_str(), line, sourceLine.c_str(), markerLine.c_str());
+    gi.DPrintf("(%s, %d):\n%s\n%s\n", Filename().c_str(), line, sourceLine.c_str(), markerLine.c_str());
 }
 
 AbstractScript::AbstractScript()
@@ -493,7 +493,7 @@ void GameScript::Archive(Archiver& arc)
 	}
 	else
 	{
-		m_ProgBuffer = ( unsigned char * )glbs.Malloc( m_ProgLength );
+		m_ProgBuffer = ( unsigned char * )gi.Malloc( m_ProgLength );
 		code_pos = m_ProgBuffer;
 		code_end = m_ProgBuffer + m_ProgLength;
 
@@ -591,14 +591,14 @@ void GameScript::Archive(Archiver& arc)
 	{
 		fileHandle_t filehandle = NULL;
 
-		m_SourceLength = glbs.FS_ReadFile( Filename().c_str(), ( void ** )&m_SourceBuffer, true );
+		m_SourceLength = gi.FS_ReadFile( Filename().c_str(), ( void ** )&m_SourceBuffer, true );
 
 		if( m_SourceLength > 0 )
 		{
-			m_SourceBuffer = ( char * )glbs.Malloc( m_SourceLength );
+			m_SourceBuffer = ( char * )gi.Malloc( m_SourceLength );
 
-			glbs.FS_Read( m_SourceBuffer, m_SourceLength, filehandle );
-			glbs.FS_FCloseFile( filehandle );
+			gi.FS_Read( m_SourceBuffer, m_SourceLength, filehandle );
+			gi.FS_FCloseFile( filehandle );
 		}
 	}
 
@@ -661,12 +661,12 @@ void GameScript::Close(void)
     }
 
     if (m_ProgBuffer) {
-        glbs.Free(m_ProgBuffer);
+        gi.Free(m_ProgBuffer);
         m_ProgBuffer = NULL;
     }
 
     if (m_SourceBuffer) {
-        glbs.Free(m_SourceBuffer);
+        gi.Free(m_SourceBuffer);
         m_SourceBuffer = NULL;
     }
 
@@ -680,7 +680,7 @@ void GameScript::Load(const void *sourceBuffer, size_t sourceLength)
     size_t nodeLength;
     char  *m_PreprocessedBuffer;
 
-    m_SourceBuffer = (char *)glbs.Malloc(sourceLength + 2);
+    m_SourceBuffer = (char *)gi.Malloc(sourceLength + 2);
     m_SourceLength = sourceLength;
 
     // Original mohaa doesn't reallocate the input string to append a newline
@@ -694,19 +694,24 @@ void GameScript::Load(const void *sourceBuffer, size_t sourceLength)
     Compiler.Reset();
 
     m_PreprocessedBuffer = Compiler.Preprocess(m_SourceBuffer);
-    nodeLength           = Compiler.Parse(this, m_PreprocessedBuffer, "script");
-    Compiler.Preclean(m_PreprocessedBuffer);
-
-    if (!nodeLength) {
-        glbs.DPrintf2("^~^~^ Script file compile error:  Couldn't parse '%s'\n", Filename().c_str());
+    if (!Compiler.Parse(this, m_PreprocessedBuffer, "script", nodeLength)) {
+        gi.DPrintf2("^~^~^ Script file compile error:  Couldn't parse '%s'\n", Filename().c_str());
         return Close();
     }
 
-    m_ProgBuffer = (unsigned char *)glbs.Malloc(nodeLength);
-    m_ProgLength = Compiler.Compile(this, m_ProgBuffer);
+    if (nodeLength == 0) {
+        // No code, assume success
+        requiredStackSize = 0;
+        successCompile = true;
+        return;
+    }
 
-    if (!m_ProgLength) {
-        glbs.DPrintf2("^~^~^ Script file compile error:  Couldn't compile '%s'\n", Filename().c_str());
+    Compiler.Preclean(m_PreprocessedBuffer);
+
+    m_ProgBuffer = (unsigned char *)gi.Malloc(nodeLength);
+
+    if (!Compiler.Compile(this, m_ProgBuffer, m_ProgLength)) {
+        gi.DPrintf2("^~^~^ Script file compile error:  Couldn't compile '%s'\n", Filename().c_str());
         return Close();
     }
 
diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 807fc1dc..9e6eeaeb 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -1497,7 +1497,7 @@ int yyerror(const char *msg)
     return 1;
 }
 
-size_t ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const char *type)
+bool ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const char *type, size_t& outLength)
 {
     parsedata = yyparsedata();
 
@@ -1515,6 +1515,8 @@ size_t ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const c
     script      = gameScript;
     stateScript = &gameScript->m_State;
 
+    outLength = 0;
+
     yy_init_script();
     parsetree_init();
 
@@ -1531,22 +1533,23 @@ size_t ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const c
             }
 
             yylex_destroy();
-            return 0;
+            return false;
         }
     } catch (ScriptException& exc) {
         yylex_destroy();
         exc;
-        return 0;
+        return false;
     }
 
     yylex_destroy();
 
-    return parsedata.total_length;
+    outLength = parsedata.total_length;
+    return true;
 }
 
-size_t ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer)
+bool ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer, size_t& outLength)
 {
-    size_t length;
+    bool success = false;
 
     if (progBuffer == NULL) {
         glbs.DPrintf("Invalid program buffer\n");
@@ -1570,21 +1573,22 @@ size_t ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer
         if (compileSuccess) {
             stateScript->AddLabel("", code_ptr);
 
-            length = code_pos - code_ptr;
+            outLength = code_pos - code_ptr;
+            success = true;
         } else {
-            length = 0;
+            outLength = 0;
         }
 
         prog_end_ptr = code_pos;
     } catch (ScriptException& exc) {
         exc;
-        length       = 0;
+        outLength = 0;
         prog_end_ptr = code_pos;
     }
 
     parsetree_freeall();
 
-    return length;
+    return success;
 }
 
 str ScriptCompiler::GetLine(str content, int line)
diff --git a/code/script/scriptcompiler.h b/code/script/scriptcompiler.h
index 0dce5227..48592872 100644
--- a/code/script/scriptcompiler.h
+++ b/code/script/scriptcompiler.h
@@ -163,8 +163,8 @@ public:
 
     char  *Preprocess(char *sourceBuffer);
     void   Preclean(char *processedBuffer);
-    size_t Parse(GameScript *m_GameScript, char *sourceBuffer, const char *type);
-    size_t Compile(GameScript *m_GameScript, unsigned char *progBuffer);
+    bool Parse(GameScript *m_GameScript, char *sourceBuffer, const char *type, size_t& outLength);
+    bool Compile(GameScript *m_GameScript, unsigned char *progBuffer, size_t& outLength);
 
     static str GetLine(str content, int line);
 

From e859bba61de976f1d09987c12e0faa0a1ee19778 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:30:52 +0200
Subject: [PATCH 0307/2040] Added a forgotten call to SetupNextCycle when
 turning on the projectile generator and fixed the uninitialized delay before
 beginning the cycle.

This fixes artillery system not working on t2l3, t2l4, e1l1... (fixes #224)
---
 code/fgame/Entities.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 139d6e8f..95990fe7 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -492,6 +492,7 @@ void ProjectileGenerator::TurnOn(Event *ev)
     if (!m_bIsTurnedOn) {
         CancelEventsOfType(EV_PG_BeginCycle);
         CancelEventsOfType(EV_TickCycle);
+        SetupNextCycle();
         m_bIsTurnedOn = true;
     }
 }
@@ -519,6 +520,7 @@ void ProjectileGenerator::SetupNextCycle()
 
     // get a random delay
     m_fShotsPerSec = numShots / m_fCycleTime;
+    delay = 0.01f;
     if (m_bIsTurnedOn || !m_bFireOnStartUp) {
         delay = G_Random(m_fMaxDelay - m_fMinDelay) + m_fMinDelay;
     }

From 881df7193bcf07be3b9a83953d231f5fbc458c05 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:47:24 +0200
Subject: [PATCH 0308/2040] Fixed ThrowObject not usable when spawned from
 script.

This fixes #218
---
 code/fgame/object.cpp | 4 ++--
 code/fgame/object.h   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/fgame/object.cpp b/code/fgame/object.cpp
index fdf81e4a..b4ff17b7 100644
--- a/code/fgame/object.cpp
+++ b/code/fgame/object.cpp
@@ -213,7 +213,7 @@ Event EV_ThrowObject_ThrowSound
     EV_NORMAL
 );
 
-CLASS_DECLARATION(Object, ThrowObject, "func_throwobject") {
+CLASS_DECLARATION(Animate, ThrowObject, "func_throwobject") {
     {&EV_Touch,                    &ThrowObject::Touch       },
     {&EV_ThrowObject_Pickup,       &ThrowObject::Pickup      },
     {&EV_ThrowObject_Throw,        &ThrowObject::Throw       },
@@ -385,7 +385,7 @@ void ThrowObject::Pickup(Event *ev)
 
 void ThrowObject::Archive(Archiver& arc)
 {
-    Object::Archive(arc);
+    Animate::Archive(arc);
 
     arc.ArchiveInteger(&owner);
     arc.ArchiveVector(&pickup_offset);
diff --git a/code/fgame/object.h b/code/fgame/object.h
index 310edf76..24cefb0a 100644
--- a/code/fgame/object.h
+++ b/code/fgame/object.h
@@ -56,7 +56,10 @@ public:
 extern Event EV_ThrowObject_Pickup;
 extern Event EV_ThrowObject_Throw;
 
-class ThrowObject : public Object
+// Fixed in 2.0
+//  Before 2.0, ThrowObject was inheriting from Object.
+//  This caused issue when spawning the ThrowObject from script.
+class ThrowObject : public Animate
 {
 private:
     int    owner;

From 52424f63f0686d9ae8766531f28b93f6ddadde48 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:51:03 +0200
Subject: [PATCH 0309/2040] Make ThrowObject::Throw throws an exception when
 the owner and targetent is NULL, also use centroid if the target entity is
 not a sentient

---
 code/fgame/object.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/code/fgame/object.cpp b/code/fgame/object.cpp
index b4ff17b7..0cd08c65 100644
--- a/code/fgame/object.cpp
+++ b/code/fgame/object.cpp
@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "specialfx.h"
 #include "g_phys.h"
 #include "game.h"
+#include "../script/scriptexception.h"
 
 Event EV_Object_HandleSetModel
 (
@@ -46,7 +47,14 @@ CLASS_DECLARATION(Animate, Object, NULL) {
     {NULL, NULL}
 };
 
-Event EV_InteractObject_Setup("_setup", EV_DEFAULT, NULL, NULL, "Sets up an object.");
+Event EV_InteractObject_Setup
+(
+    "_setup",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets up an object."
+);
 
 Event EV_InteractObject_KilledEffect
 (
@@ -118,10 +126,10 @@ void InteractObject::Damaged(Event *ev)
 
 void InteractObject::Killed(Event *ev)
 {
-    Entity       *ent;
-    Entity       *attacker;
-    Vector        dir;
-    const char   *name;
+    Entity     *ent;
+    Entity     *attacker;
+    Vector      dir;
+    const char *name;
 
     takedamage = DAMAGE_NO;
     deadflag   = DEAD_NO;
@@ -242,7 +250,6 @@ void ThrowObject::ThrowSound(Event *ev)
 }
 
 void ThrowObject::Touch(Event *ev)
-
 {
     Entity *other;
 
@@ -283,7 +290,6 @@ void ThrowObject::Touch(Event *ev)
 }
 
 void ThrowObject::Throw(Event *ev)
-
 {
     Entity   *owner;
     Sentient *targetent;
@@ -300,6 +306,7 @@ void ThrowObject::Throw(Event *ev)
     assert(owner);
 
     if (!owner) {
+        ScriptError("owner == NULL");
         return;
     }
 
@@ -311,6 +318,7 @@ void ThrowObject::Throw(Event *ev)
     targetent = (Sentient *)ev->GetEntity(3);
     assert(targetent);
     if (!targetent) {
+        ScriptError("targetent == NULL");
         return;
     }
 
@@ -328,8 +336,12 @@ void ThrowObject::Throw(Event *ev)
 
     gravity = grav;
 
-    target = targetent->origin;
-    target.z += targetent->viewheight;
+    if (targetent->IsSubclassOfSentient()) {
+        target = targetent->origin;
+        target.z += targetent->viewheight;
+    } else {
+        target = targetent->centroid;
+    }
 
     setMoveType(MOVETYPE_BOUNCE);
     setSolidType(SOLID_BBOX);
@@ -359,7 +371,6 @@ void ThrowObject::Throw(Event *ev)
 }
 
 void ThrowObject::Pickup(Event *ev)
-
 {
     Entity *ent;
     Event  *e;

From ccc98e4c62348c83e023cf10ffbab4492db558ee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 8 Apr 2024 23:38:51 +0200
Subject: [PATCH 0310/2040] Implemented missing ThrobbingBox_Stickybomb()

---
 code/fgame/Entities.cpp | 20 +++++++++++++
 code/fgame/Entities.h   | 62 +++++++++++++++++++++--------------------
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 95990fe7..67d59f00 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1988,6 +1988,26 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_Stickybomb, "ThrobbingBox
     {NULL,              NULL                                     }
 };
 
+ThrobbingBox_Stickybomb::ThrobbingBox_Stickybomb()
+{
+    if (LoadingSavegame) {
+        return;
+    }
+
+    setModel("items/pulse_stickybomb.tik");
+    m_sUsedModel = "items/stickybomb.tik";
+    m_sSound = "explode_flak88";
+    m_sActivateSound = "stickybomb_plant";
+    m_sTickSound = "stickybomb_fuse";
+
+    health = 10;
+    m_fStopwatchStartTime = 0;
+
+    setSolidType(SOLID_BBOX);
+    takedamage = DAMAGE_NO;
+    setContents(CONTENTS_WEAPONCLIP);
+}
+
 void ThrobbingBox_Stickybomb::OnStickyBombWet(Event *ev)
 {
     Player *player;
diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index c08365f8..75fce27c 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -26,19 +26,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "animate.h"
 
 typedef enum {
-	CONTROLLER_ALLIES,
-	CONTROLLER_AXIS,
+    CONTROLLER_ALLIES,
+    CONTROLLER_AXIS,
     CONTROLLER_DRAW
 } eController;
 
-#define PT_SPAWNFLAG_PLAY_FIRE_SOUND    1
-#define PT_SPAWNFLAG_PLAY_MOTION_SOUND  2
-#define PT_SPAWNFLAG_TARGET_RANDOM      4
-#define PT_SPAWNFLAG_TURN_ON            8
-#define PT_SPAWNFLAG_ROTATE_YAW         16
-#define PT_SPAWNFLAG_ROTATE_ROLL        32
-#define PT_SPAWNFLAG_TARGET_PLAYER      64
-#define PT_SPAWNFLAG_HIDDEN             128
+#define PT_SPAWNFLAG_PLAY_FIRE_SOUND   1
+#define PT_SPAWNFLAG_PLAY_MOTION_SOUND 2
+#define PT_SPAWNFLAG_TARGET_RANDOM     4
+#define PT_SPAWNFLAG_TURN_ON           8
+#define PT_SPAWNFLAG_ROTATE_YAW        16
+#define PT_SPAWNFLAG_ROTATE_ROLL       32
+#define PT_SPAWNFLAG_TARGET_PLAYER     64
+#define PT_SPAWNFLAG_HIDDEN            128
 
 void ClearProjectileTargets();
 
@@ -53,7 +53,7 @@ public:
     ProjectileTarget();
 
     void EventSetId(Event *ev);
-    int GetTarget() const;
+    int  GetTarget() const;
 };
 
 #define MAX_PROJECTILE_GENERATOR_TARGETS 16
@@ -106,16 +106,16 @@ public:
     bool ShouldRotateYaw() const;
     bool ShouldRotateRoll() const;
 
-    void EventIsTurnedOn(Event *ev);
-    void EventGetTargetEntity(Event *ev);
-    void EventLaunchSound(Event *ev);
-    void SetTarget(Event *ev);
-    void SetTarget(Entity* ent);
-    void OnInitialize(Event *ev);
-    void TurnOff(Event *ev);
-    void TurnOn(Event *ev);
-    bool ShouldTargetRandom() const;
-    Entity* ChooseTarget();
+    void    EventIsTurnedOn(Event *ev);
+    void    EventGetTargetEntity(Event *ev);
+    void    EventLaunchSound(Event *ev);
+    void    SetTarget(Event *ev);
+    void    SetTarget(Entity *ent);
+    void    OnInitialize(Event *ev);
+    void    TurnOff(Event *ev);
+    void    TurnOn(Event *ev);
+    bool    ShouldTargetRandom() const;
+    Entity *ChooseTarget();
 
     void         GetLocalTargets();
     bool         ShouldTargetPlayer() const;
@@ -123,7 +123,7 @@ public:
     void         GetMuzzlePos(Vector& pos);
     void         Fire();
     void         TryLaunchSound();
-    void         SetWeaponAnim(const char* name, Event* ev);
+    void         SetWeaponAnim(const char *name, Event *ev);
     void         EventAccuracy(Event *ev);
     void         EventMaxDelay(Event *ev);
     void         EventMinDelay(Event *ev);
@@ -134,11 +134,11 @@ public:
     void         EventMaxDuration(Event *ev);
     void         EventMinDuration(Event *ev);
     void         SetWeaponModel(Event *ev);
-	void         EventSetId(Event* ev);
-	void         EventmaxDonut(Event* ev);
-	void         EventminDonut(Event* ev);
-	void         EventarcDonut(Event* ev);
-	void         EventisDonut(Event* ev);
+    void         EventSetId(Event *ev);
+    void         EventmaxDonut(Event *ev);
+    void         EventminDonut(Event *ev);
+    void         EventarcDonut(Event *ev);
+    void         EventisDonut(Event *ev);
     virtual bool Attack(int count);
 
     void Archive(Archiver& arc) override;
@@ -164,8 +164,8 @@ public:
     void SetProjectileModel(Event *ev);
 
     float EstimateImpactTime(const Vector& targetOrigin, const Vector& fromOrigin, float speed) const;
-    bool Attack(int count) override;
-    void Archive(Archiver& arc) override;
+    bool  Attack(int count) override;
+    void  Archive(Archiver& arc) override;
 };
 
 class ProjectileGenerator_Gun : public ProjectileGenerator
@@ -306,6 +306,8 @@ private:
 public:
     CLASS_PROTOTYPE(ThrobbingBox_Stickybomb);
 
+    ThrobbingBox_Stickybomb();
+
     void OnStickyBombWet(Event *ev);
     void OnStickyBombUse(Event *ev);
 
@@ -325,7 +327,7 @@ public:
 
     Objective();
 
-    void   Archive(Archiver  &arc) override;
+    void   Archive(Archiver& arc) override;
     void   TurnOn(Event *ev);
     void   TurnOff(Event *ev);
     void   Complete(Event *ev);

From ab5efa5a641ede393b2091bb903bd705eb6c48c1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Apr 2024 00:12:02 +0200
Subject: [PATCH 0311/2040] Fixed sentient being improperly attached/detached
 from/to the turret

This fixes #255
---
 code/fgame/vehicle.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 361ed6f6..0ce9fad1 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3735,14 +3735,12 @@ void Vehicle::DriverUse(Event *ev)
             slot = FindTurretSlotByEntity(sent->GetTurret());
 
             if (slot >= 0) {
-                if (bHasExitPosition) {
-                    if (bHasExitAngles) {
-                        AttachTurretSlot(slot, sentTurret, vExitPosition, &vExitAngles);
-                    } else {
-                        AttachTurretSlot(slot, sentTurret, vExitPosition, NULL);
-                    }
+                if (!bHasExitPosition) {
+                    AttachTurretSlot(slot, sent, vec_zero, NULL);
+                } else if (!bHasExitAngles) {
+                    AttachTurretSlot(slot, sent, vExitPosition, NULL);
                 } else {
-                    AttachTurretSlot(slot, sentTurret, vec_zero, NULL);
+                    AttachTurretSlot(slot, sent, vExitPosition, &vExitAngles);
                 }
 
                 sent->SetVehicle(NULL);
@@ -3753,7 +3751,7 @@ void Vehicle::DriverUse(Event *ev)
 
     // Check for passengers slots
     for (slot = 0; slot < MAX_PASSENGERS; slot++) {
-        if (!(Passengers[0].flags & SLOT_FREE)) {
+        if (!(Passengers[slot].flags & SLOT_FREE)) {
             continue;
         }
 
@@ -3771,7 +3769,7 @@ void Vehicle::DriverUse(Event *ev)
     // Check for turrets slots
     if (ent->IsSubclassOfWeapon()) {
         for (slot = 0; slot < MAX_TURRETS; slot++) {
-            if (!(Turrets[0].flags & SLOT_FREE)) {
+            if (!(Turrets[slot].flags & SLOT_FREE)) {
                 continue;
             }
 
@@ -3787,7 +3785,7 @@ void Vehicle::DriverUse(Event *ev)
         }
     } else {
         for (slot = 0; slot < MAX_TURRETS; slot++) {
-            if (!(Turrets[0].flags & SLOT_BUSY)) {
+            if (!(Turrets[slot].flags & SLOT_BUSY)) {
                 continue;
             }
 
@@ -6507,11 +6505,11 @@ void Vehicle::Archive(Archiver& arc)
     driver.Archive(arc);
     lastdriver.Archive(arc);
 
-    for (int i = MAX_PASSENGERS - 1; i >= 0; i--) {
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
         Passengers[i].Archive(arc);
     }
 
-    for (int i = MAX_TURRETS - 1; i >= 0; i--) {
+    for (int i = 0; i < MAX_TURRETS; i++) {
         Turrets[i].Archive(arc);
     }
 

From 2bf1144a14af9e5e5ff5c70c9a8460f1f55b45e1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Apr 2024 21:43:56 +0200
Subject: [PATCH 0312/2040] Removed unused source files

---
 code/fgame/g_bot.cpp                        |   49 +-
 cross-make-mingw.sh                         |    6 -
 make-macosx-ub.sh                           |  232 --
 misc/build_increment.bat                    |   14 -
 misc/setup/MacOSX/SLA-dmg.sh                |   73 -
 misc/setup/Makefile                         |   15 -
 misc/setup/Solaris_pkg.sh                   |  135 --
 misc/setup/doit                             |  112 -
 misc/setup/ioq3demo.sh                      |   50 -
 misc/setup/ioquake3.SlackBuild              |   77 -
 misc/setup/ioquake3.sh                      |   50 -
 misc/setup/pkg/ioq3ded.sh                   |   41 -
 misc/setup/pkg/ioquake3.sh                  |   41 -
 misc/setup/pkg/ioquake3/depend              |    3 -
 misc/setup/pkg/ioquake3/pkginfo.template    |   12 -
 misc/setup/pkg/ioquake3/postinstall         |   21 -
 misc/setup/pkg/ioquake3/postremove          |   21 -
 misc/setup/pkg/ioquake3/preinstall          |   10 -
 misc/setup/pkg/ioquake3/preremove           |   10 -
 misc/setup/pkg/ioquake3/prototype.template  |    8 -
 misc/setup/pkg/ioquake3/space               |    1 -
 misc/setup/pkg/ioquake3d/depend             |    2 -
 misc/setup/pkg/ioquake3d/pkginfo.template   |   12 -
 misc/setup/pkg/ioquake3d/postinstall        |   10 -
 misc/setup/pkg/ioquake3d/postremove         |   10 -
 misc/setup/pkg/ioquake3d/preinstall         |   10 -
 misc/setup/pkg/ioquake3d/preremove          |   10 -
 misc/setup/pkg/ioquake3d/prototype.template |    7 -
 misc/setup/pkg/ioquake3d/space              |    1 -
 misc/setup/preuninstall.sh                  |    2 -
 misc/setup/setup.xml.in                     |  111 -
 misc/setup/slack-desc                       |   12 -
 misc/setup/splash.xpm                       | 2289 -------------------
 33 files changed, 43 insertions(+), 3414 deletions(-)
 delete mode 100644 cross-make-mingw.sh
 delete mode 100644 make-macosx-ub.sh
 delete mode 100644 misc/build_increment.bat
 delete mode 100644 misc/setup/MacOSX/SLA-dmg.sh
 delete mode 100644 misc/setup/Makefile
 delete mode 100644 misc/setup/Solaris_pkg.sh
 delete mode 100644 misc/setup/doit
 delete mode 100644 misc/setup/ioq3demo.sh
 delete mode 100644 misc/setup/ioquake3.SlackBuild
 delete mode 100644 misc/setup/ioquake3.sh
 delete mode 100644 misc/setup/pkg/ioq3ded.sh
 delete mode 100644 misc/setup/pkg/ioquake3.sh
 delete mode 100644 misc/setup/pkg/ioquake3/depend
 delete mode 100644 misc/setup/pkg/ioquake3/pkginfo.template
 delete mode 100644 misc/setup/pkg/ioquake3/postinstall
 delete mode 100644 misc/setup/pkg/ioquake3/postremove
 delete mode 100644 misc/setup/pkg/ioquake3/preinstall
 delete mode 100644 misc/setup/pkg/ioquake3/preremove
 delete mode 100644 misc/setup/pkg/ioquake3/prototype.template
 delete mode 100644 misc/setup/pkg/ioquake3/space
 delete mode 100644 misc/setup/pkg/ioquake3d/depend
 delete mode 100644 misc/setup/pkg/ioquake3d/pkginfo.template
 delete mode 100644 misc/setup/pkg/ioquake3d/postinstall
 delete mode 100644 misc/setup/pkg/ioquake3d/postremove
 delete mode 100644 misc/setup/pkg/ioquake3d/preinstall
 delete mode 100644 misc/setup/pkg/ioquake3d/preremove
 delete mode 100644 misc/setup/pkg/ioquake3d/prototype.template
 delete mode 100644 misc/setup/pkg/ioquake3d/space
 delete mode 100644 misc/setup/preuninstall.sh
 delete mode 100644 misc/setup/setup.xml.in
 delete mode 100644 misc/setup/slack-desc
 delete mode 100644 misc/setup/splash.xpm

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 0942f0ce..a885390c 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -172,11 +172,11 @@ void G_AddBot(unsigned int num, saved_bot_t* saved)
 
 void G_RemoveBot(unsigned int num)
 {
-	num = Q_min(atoi(gi.Argv(1)), sv_maxbots->integer);
+	num = Q_min(num, sv_maxbots->integer);
 
 	for( int n = 0; n < num; n++ )
 	{
-		gentity_t *e = &g_entities[ game.maxclients - 1 - n ];
+		gentity_t *e = &g_entities[maxclients->integer + n];
 		if( e->inuse && e->client )
 		{
 			G_ClientDisconnect( e );
@@ -230,6 +230,27 @@ void G_RestoreBots() {
 	saved_bots = NULL;
 }
 
+int G_CountClients() {
+	gentity_t* other;
+	unsigned int n;
+	unsigned int count = 0;
+
+	for (n = 0; n < maxclients->integer; n++) {
+		other = &g_entities[n];
+		if (other->inuse && other->client) {
+			Player* p = static_cast<Player*>(other->entity);
+			if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
+				// ignore spectators
+				continue;
+			}
+
+			count++;
+		}
+	}
+
+	return count;
+}
+
 void G_ResetBots() {
 	G_SaveBots();
 
@@ -237,13 +258,29 @@ void G_ResetBots() {
 }
 
 void G_SpawnBots() {
+	unsigned int numClients;
+	unsigned int numBotsToSpawn;
+
 	if (saved_bots) {
 		G_RestoreBots();
 	}
 
-	if (sv_numbots->integer > current_bot_count) {
-		G_AddBot(sv_numbots->integer - current_bot_count);
-	} else if (sv_numbots->integer < current_bot_count) {
-		G_RemoveBot(current_bot_count - sv_numbots->integer);
+	//
+	// Check the minimum bot count
+	//
+	numClients = G_CountClients() + sv_numbots->integer;
+	if (numClients < sv_minPlayers->integer) {
+		numBotsToSpawn = sv_minPlayers->integer - numClients;
+	} else {
+		numBotsToSpawn = sv_numbots->integer;
+	}
+
+	//
+	// Spawn bots
+	//
+	if (numBotsToSpawn > current_bot_count) {
+		G_AddBot(numBotsToSpawn - current_bot_count);
+	} else if (numBotsToSpawn < current_bot_count) {
+		G_RemoveBot(current_bot_count - numBotsToSpawn);
 	}
 }
diff --git a/cross-make-mingw.sh b/cross-make-mingw.sh
deleted file mode 100644
index c6dbe377..00000000
--- a/cross-make-mingw.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export CC=i586-mingw32msvc-gcc
-export WINDRES=i586-mingw32msvc-windres
-export PLATFORM=mingw32
-exec make $*
diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh
deleted file mode 100644
index a7833e2d..00000000
--- a/make-macosx-ub.sh
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/bin/sh
-APPBUNDLE=openmohaa.app
-BINARY=openmohaa.ub
-DEDBIN=omohaaded.ub
-PKGINFO=APPLOMOHAA
-ICNS=misc/openmohaa.icns
-DESTDIR=build/release-darwin-ub
-BASEDIR=main
-MPACKDIR=missionpack
-Q3_VERSION=`grep "\#define Q3_VERSION" code/qcommon/q_shared.h | \
-	sed -e 's/.*".* \([^ ]*\)"/\1/'`;
-
-BIN_OBJ="
-	build/release-darwin-ppc/openmohaa-smp.ppc
-	build/release-darwin-i386/openmohaa-smp.i386
-"
-BIN_DEDOBJ="
-	build/release-darwin-ub/omohaaded.ppc
-	build/release-darwin-i386/omohaaded.i386
-"
-BASE_OBJ="
-	build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
-	build/release-darwin-i386/$BASEDIR/cgamei386.dylib
-	build/release-darwin-ppc/$BASEDIR/uippc.dylib
-	build/release-darwin-i386/$BASEDIR/uii386.dylib
-	build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
-	build/release-darwin-i386/$BASEDIR/qagamei386.dylib
-"
-MPACK_OBJ="
-	build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib
-	build/release-darwin-i386/$MPACKDIR/cgamei386.dylib
-	build/release-darwin-ppc/$MPACKDIR/uippc.dylib
-	build/release-darwin-i386/$MPACKDIR/uii386.dylib
-	build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib
-	build/release-darwin-i386/$MPACKDIR/qagamei386.dylib
-"
-if [ ! -f Makefile ]; then
-	echo "This script must be run from the openmohaa build directory";
-fi
-
-TIGERHOST=0
-if uname -r | grep ^8. > /dev/null; then
-	TIGERHOST=1
-fi
-
-# we want to use the oldest available SDK for max compatiblity
-unset PPC_CLIENT_SDK
-PPC_CLIENT_CC=gcc
-unset PPC_CLIENT_CFLAGS
-unset PPC_CLIENT_LDFLAGS
-unset PPC_SERVER_SDK
-unset PPC_SERVER_CFLAGS
-unset PPC_SERVER_LDFLAGS
-unset X86_SDK
-unset X86_CFLAGS
-unset X86_LDFLAGS
-if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.5.sdk
-	PPC_CLIENT_CC=gcc-4.0
-	PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-			-isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-mmacosx-version-min=10.5"
-	PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.5.sdk
-	PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
-	PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
-
-	X86_SDK=/Developer/SDKs/MacOSX10.5.sdk
-	X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
-	X86_LDFLAGS="-arch i386 \
-			-isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-mmacosx-version-min=10.5"
-	X86_ENV="CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS"
-fi
-
-if [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	PPC_CLIENT_CC=gcc-4.0
-	PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-			-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-mmacosx-version-min=10.4"
-	PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
-	PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
-
-	X86_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
-	X86_LDFLAGS="-arch i386 \
-			-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-mmacosx-version-min=10.4"
-	X86_ENV="CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS"
-fi
-
-if [ -d /Developer/SDKs/MacOSX10.3.9.sdk ] && [ $TIGERHOST ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-	PPC_CLIENT_CC=gcc-4.0
-	PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1030"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-			-isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-			-mmacosx-version-min=10.3"
-	PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-	PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
-	PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
-fi
-
-if [ -d /Developer/SDKs/MacOSX10.2.8.sdk ] && [ -x /usr/bin/gcc-3.3 ] && [ $TIGERHOST ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.2.8.sdk
-	PPC_CLIENT_CC=gcc-3.3
-	PPC_CLIENT_CFLAGS="-arch ppc \
-		-nostdinc \
-		-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
-		-I/Developer/SDKs/MacOSX10.2.8.sdk/usr/include/gcc/darwin/3.3 \
-		-isystem /Developer/SDKs/MacOSX10.2.8.sdk/usr/include \
-		-DMAC_OS_X_VERSION_MIN_REQUIRED=1020"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-		-L/Developer/SDKs/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3 \
-		-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
-		-Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk,-m"
-fi
-
-echo "Building PPC Dedicated Server against \"$PPC_SERVER_SDK\""
-echo "Building PPC Client against \"$PPC_CLIENT_SDK\""
-echo "Building X86 Client/Dedicated Server against \"$X86_SDK\""
-if [ "$PPC_CLIENT_SDK" != "/Developer/SDKs/MacOSX10.2.8.sdk" ] || \
-	[ "$PPC_SERVER_SDK" != "/Developer/SDKs/MacOSX10.3.9.sdk" ] || \
-	[ "$X86_SDK" != "/Developer/SDKs/MacOSX10.4u.sdk" ]; then
-	echo "\
-WARNING: in order to build a binary with maximum compatibility you must
-         build on Mac OS X 10.4 using Xcode 2.3 or 2.5 and have the
-         MacOSX10.2.8, MacOSX10.3.9, and MacOSX10.4u SDKs installed
-         from the Xcode install disk Packages folder."
-fi
-
-if [ -z $PPC_CLIENT_SDK ] || [ -z $PPC_SERVER_SDK ] || [ -z $X86_SDK ]; then
-	echo "\
-ERROR: This script is for building a Universal Binary.  You cannot build
-       for a different architecture unless you have the proper Mac OS X SDKs
-       installed.  If you just want to to compile for your own system run
-       'make' instead of this script."
-	exit 1
-fi
-sleep 3
-
-if [ ! -d $DESTDIR ]; then
-	mkdir -p $DESTDIR
-fi
-
-# ppc dedicated server
-echo "Building Dedicated Server using $PPC_SERVER_SDK"
-sleep 2
-if [ -d build/release-darwin-ppc ]; then
-	rm -r build/release-darwin-ppc
-fi
-(ARCH=ppc BUILD_CLIENT_SMP=0 BUILD_CLIENT=0 BUILD_GAME_VM=0 BUILD_GAME_SO=0 \
-	CFLAGS=$PPC_SERVER_CFLAGS LDFLAGS=$PPC_SERVER_LDFLAGS make) || exit 1;
-cp build/release-darwin-ppc/omohaaded.ppc $DESTDIR
-
-# ppc client
-if [ -d build/release-darwin-ppc ]; then
-	rm -r build/release-darwin-ppc
-fi
-(ARCH=ppc USE_OPENAL_DLOPEN=1 BUILD_SERVER=0 CC=$PPC_CLIENT_CC \
-	CFLAGS=$PPC_CLIENT_CFLAGS LDFLAGS=$PPC_CLIENT_LDFLAGS make) || exit 1;
-
-# intel client and server
-if [ -d build/release-darwin-i386 ]; then
-	rm -r build/release-darwin-i386
-fi
-(ARCH=i386 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make) || exit 1;
-
-echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/Resources ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/Resources
-fi
-cp $ICNS $DESTDIR/$APPBUNDLE/Contents/Resources/openmohaa.icns || exit 1;
-echo $PKGINFO > $DESTDIR/$APPBUNDLE/Contents/PkgInfo
-echo "
-	<?xml version=\"1.0\" encoding="UTF-8"?>
-	<!DOCTYPE plist
-		PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"
-		\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-	<plist version=\"1.0\">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleExecutable</key>
-		<string>$BINARY</string>
-		<key>CFBundleGetInfoString</key>
-		<string>openmohaa $Q3_VERSION</string>
-		<key>CFBundleIconFile</key>
-		<string>openmohaa.icns</string>
-		<key>CFBundleIdentifier</key>
-		<string>org.icculus.quake3</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>opemohaa</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$Q3_VERSION</string>
-		<key>CFBundleSignature</key>
-		<string>$PKGINFO</string>
-		<key>CFBundleVersion</key>
-		<string>$Q3_VERSION</string>
-		<key>NSExtensions</key>
-		<dict/>
-		<key>NSPrincipalClass</key>
-		<string>NSApplication</string>
-	</dict>
-	</plist>
-	" > $DESTDIR/$APPBUNDLE/Contents/Info.plist
-
-lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ
-lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ
-rm $DESTDIR/omohaaded.ppc
-cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/
-cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
-cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/
-
diff --git a/misc/build_increment.bat b/misc/build_increment.bat
deleted file mode 100644
index a0c38aaf..00000000
--- a/misc/build_increment.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-
-set BUILD=
-
-IF EXIST %1.txt (
-	set /p BUILD=<%1.txt
-) ELSE (
-	set BUILD=0
-)
-
-set /a BUILD=%BUILD%+1
-@echo %BUILD% >%1.txt
-
-echo Successfully wrote build number to %1.txt.
\ No newline at end of file
diff --git a/misc/setup/MacOSX/SLA-dmg.sh b/misc/setup/MacOSX/SLA-dmg.sh
deleted file mode 100644
index af268f32..00000000
--- a/misc/setup/MacOSX/SLA-dmg.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# This script appends the text from Q3A_EULA.txt to a .dmg as a SLA resource
-#
-# usage is './SLA-dmg.sh /path/to/Q3A_EULA.txt /path/to/ioquake3.dmg'
-#
-
-if [ "x$1" = "x" ] || [ "x$2" = "x" ]; then
-	echo "usage: ./SLA-dmg.sh /path/to/Q3A_EULA.txt /path/to/ioquake3.dmg"
-	exit 1;
-fi
-
-if [ ! -r $1 ]; then
-	echo "$1 is not a readable Q3A_EULA.txt file"
-	exit 1;
-fi
-if [ ! -w $2 ]; then
-	echo "$2 is not writable .dmg file"
-	exit 1;
-fi
-touch tmp.r
-if [ ! -w tmp.r ]; then
-	echo "Could not create temporary file tmp.r for writing"
-	exit 1;
-fi
-
-echo "  
-data 'LPic' (5000) {
-    \$\"0002 0011 0003 0001 0000 0000 0002 0000\"
-    \$\"0008 0003 0000 0001 0004 0000 0004 0005\"
-    \$\"0000 000E 0006 0001 0005 0007 0000 0007\"
-    \$\"0008 0000 0047 0009 0000 0034 000A 0001\"
-    \$\"0035 000B 0001 0020 000C 0000 0011 000D\"
-    \$\"0000 005B 0004 0000 0033 000F 0001 000C\"
-    \$\"0010 0000 000B 000E 0000\"
-};
-
-data 'TEXT' (5002, \"English\") {
-" > tmp.r
-
-sed -e 's/"/\\"/g' -e 's/\(.*\)$/"\1\\n"/g' $1 >> tmp.r
-
-echo "
-};
-
-resource 'STR#' (5002, \"English\") {
-    {   
-        \"English\",
-        \"Agree\",
-        \"Disagree\",
-        \"Print\",
-        \"Save...\",
-        \"IMPORTANT - Read this License Agreement carefully before clicking on \"
-        \"the \\\"Agree\\\" button.  By clicking on the \\\"Agree\\\" button, you agree \"
-        \"to be bound by the terms of the License Agreement.\",
-        \"Software License Agreement\",
-        \"This text cannot be saved. This disk may be full or locked, or the \"
-	\"file may be locked.\",
-        \"Unable to print. Make sure you have selected a printer.\"
-    }
-};
-" >> tmp.r
-
-hdiutil convert -format UDCO -o tmp.dmg $2 || exit 1
-hdiutil unflatten tmp.dmg || exit 1
-/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r tmp.r -a -o tmp.dmg \
-	|| exit 1
-hdiutil flatten tmp.dmg || exit 1
-hdiutil internet-enable -yes tmp.dmg || exit 1
-mv tmp.dmg $2 || (echo "Could not copy tmp.dmg to $2" && exit 1)
-rm tmp.dmg
-rm tmp.r
-echo "SLA $1 successfully added to $2"
diff --git a/misc/setup/Makefile b/misc/setup/Makefile
deleted file mode 100644
index 286831c7..00000000
--- a/misc/setup/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-VERSION=1.34
-RELEASE=svn
-
-all:
-	VERSION=$(VERSION) RELEASE=$(RELEASE) ./doit
-
-sign:
-	for i in *.run; do \
-		gpg -bao $$i.asc $$i; \
-	done
-
-clean:
-	rm -rf *.run image
-
-.PHONY: all sign clean
diff --git a/misc/setup/Solaris_pkg.sh b/misc/setup/Solaris_pkg.sh
deleted file mode 100644
index 6b64201f..00000000
--- a/misc/setup/Solaris_pkg.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-# Source directory
-MOUNT_DIR="../.."
-
-# Solaris stuff
-PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-if [ "X`uname -m`" = "Xi86pc" ]; then
-	ARCH=i386
-else
-	ARCH=sparc
-fi
-
-# Packages
-PKG_SOLARIS_NAME=ioquake3
-PKG_DATA_NAME=ioquake3d
-BUILD_DATE="`/usr/bin/date '+%Y%m%d%H%M%S'`"
-SVNVERSION=/usr/local/bin/svnversion
-if [ -x /usr/local/bin/svnversion ]; then
-	SVN_BANNER=`/usr/local/bin/svnversion ${MOUNT_DIR}|sed -e 's/S$//' -e 's/M$//' `
-	BUILD_VERSION="1.34-r${SVN_BANNER}"
-else
-	BUILD_VERSION="1.34-rSVN"
-fi
-PKG_VERSION="`date '+%Y%m%d%H%M'`"
-PKG_MAINT_ID="quake@cojot.name"
-SOLARIS_PKGFILE="${PKG_SOLARIS_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
-DATA_PKGFILE="${PKG_DATA_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
-
-# build directories
-BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}"
-PKG_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_SOLARIS_NAME}"
-PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}"
-PKG_DATA_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_DATA_NAME}"
-PKG_DATA_BUILD_DIR="/usr/local/src/quake3-data/quake3"
-
-# Tools
-RM="/usr/bin/rm"
-TOUCH="/usr/bin/touch"
-SED="/usr/bin/sed"
-CAT="/usr/bin/cat"
-NAWK="/usr/bin/nawk"
-MKDIR="gmkdir -v -p"
-INSTALL_BIN="ginstall -D -m 755"
-INSTALL_DATA="ginstall -D -m 644"
-PKGPROTO="/usr/bin/pkgproto"
-PKGMK="/usr/bin/pkgmk"
-PKGTRANS="/usr/bin/pkgtrans"
-
-#############################################################################
-# SOLARIS PACKAGE
-#############################################################################
-
-if [ -d ${BUILD_DIR} ]; then
-	if [ ! -d ${BUILD_DIR}/pkg ]; then
-		${MKDIR} ${BUILD_DIR}/pkg
-	fi
-	echo "Building ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE}"
-        ${RM} -f ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE}
-        ${TOUCH} ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE}
-        ${SED} -e "/VERSION=/s/.*/VERSION=${BUILD_VERSION}-${PKG_VERSION}/" \
-                < ${PKG_SRC_DIR}/pkginfo.template \
-                > ${PKG_SRC_DIR}/pkginfo
-        ${CAT} ${PKG_SRC_DIR}/prototype.template > ${PKG_SRC_DIR}/prototype
-
-	${INSTALL_DATA} ${MOUNT_DIR}/COPYING.txt ${PKG_SRC_DIR}/copyright
-	for EXEC_READ in README id-readme.txt
-	do
-		if [ -f ${MOUNT_DIR}/${EXEC_READ} ]; then
-			${INSTALL_DATA} ${MOUNT_DIR}/${EXEC_READ} ${PKG_BUILD_DIR}/${EXEC_READ}
-		fi
-	done
-
-	for EXEC_BIN in ioq3ded ioquake3-smp ioquake3
-	do
-		if [ -f ${BUILD_DIR}/${EXEC_BIN}.${ARCH} ]; then
-        		${INSTALL_BIN} ${BUILD_DIR}/${EXEC_BIN}.${ARCH} ${PKG_BUILD_DIR}/${EXEC_BIN}.${ARCH}
-		fi
-	done
-
-	for EXEC_SH in ioq3ded.sh ioquake3.sh
-	do
-		if [ -f ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ]; then
-        		${INSTALL_BIN} ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ${PKG_BUILD_DIR}/${EXEC_SH}
-		fi
-	done
-
-	for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so
-	do
-		if [ -f ${BUILD_DIR}/baseq3/${EXEC_SO} ]; then
-        		${INSTALL_BIN} ${BUILD_DIR}/baseq3/${EXEC_SO} ${PKG_BUILD_DIR}/baseq3/${EXEC_SO}
-		fi
-		if [ -f ${BUILD_DIR}/missionpack/${EXEC_SO} ]; then
-        		${INSTALL_BIN} ${BUILD_DIR}/missionpack/${EXEC_SO} ${PKG_BUILD_DIR}/missionpack/${EXEC_SO}
-		fi
-	done
-
-        ${PKGPROTO} ${PKG_BUILD_DIR}=quake3 | \
-                ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_SRC_DIR}/prototype
-        ${PKGMK} -o -p "${PKG_MAINT_ID}${BUILD_DATE}" \
-                -b ${PKG_SRC_DIR} -f ${PKG_SRC_DIR}/prototype \
-                -d /tmp -a ${ARCH} owner=root group=bin mode=0755
-        ${PKGTRANS} -s /tmp ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE} ${PKG_SOLARIS_NAME}
-
-	echo "Building ${BUILD_DIR}/pkg/${DATA_PKGFILE}"
-        ${RM} -f ${BUILD_DIR}/pkg/${DATA_PKGFILE}
-        ${TOUCH} ${BUILD_DIR}/pkg/${DATA_PKGFILE}
-        ${SED} -e "/VERSION=/s/.*/VERSION=${BUILD_VERSION}.${PKG_VERSION}/" \
-                < ${PKG_DATA_SRC_DIR}/pkginfo.template \
-                > ${PKG_DATA_SRC_DIR}/pkginfo
-        ${CAT} ${PKG_DATA_SRC_DIR}/prototype.template > ${PKG_DATA_SRC_DIR}/prototype
-
-	if [ -d ${MOUNT_DIR}/../webspace/include ]; then
-		EULA_DIR=${MOUNT_DIR}/../webspace/include
-	else
-		if [ -d ${MOUNT_DIR}/../../webspace/include ]; then
-			EULA_DIR=${MOUNT_DIR}/../../webspace/include
-		fi
-	fi
-	if [ -f ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ]; then
-		${INSTALL_DATA} ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
-	fi
-
-        ${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \
-                ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_DATA_SRC_DIR}/prototype
-        ${PKGMK} -o -p "${PKG_MAINT_ID}${BUILD_DATE}" \
-                -b ${PKG_DATA_SRC_DIR} -f ${PKG_DATA_SRC_DIR}/prototype \
-                -d /tmp -a ${ARCH} owner=root group=bin mode=0755
-        ${PKGTRANS} -s /tmp ${BUILD_DIR}/pkg/${DATA_PKGFILE} ${PKG_DATA_NAME}
-else
-	echo "Directory ${BUILD_DIR} not found!"
-	exit 1
-fi
-
-
diff --git a/misc/setup/doit b/misc/setup/doit
deleted file mode 100644
index 834cff90..00000000
--- a/misc/setup/doit
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-: ${MAKESELF:=/usr/share/loki-setup/makeself}
-: ${SETUPIMAGE:=/usr/share/loki-setup/image}
-
-: ${VERSION:=0.0_`date +%Y%m%d%H%M`}
-: ${RELEASE:=0}
-
-set -e
-set -x
-
-shopt -s nullglob
-
-rm -rf image
-mkdir image
-
-### loki-setup files
-cp -a $SETUPIMAGE/{setup.data,setup.sh} image/
-
-### splash
-rm -f image/setup.data/splash.xpm
-[ -e splash.xpm ] && cp splash.xpm image/setup.data/splash.xpm
-rm -f image/quake3.png
-cp ../quake3.png image/quake3.png
-
-### binaries
-topdir="../.."
-
-echo "changequote(\`[', \`]')dnl" > defines.m4
-echo "define(VERSION,$VERSION)dnl" >> defines.m4
-
-copystartscript()
-{
-	local arch="$1"
-	mkdir -p image/bin/Linux/$arch
-	if [ "$arch" = x86_64 ]; then
-		ln -s x86_64 image/bin/Linux/amd64
-	fi
-	install -m 755 ioquake3.sh image/bin/Linux/$arch/ioquake3
-	install -m 755 ioq3demo.sh image/bin/Linux/$arch/ioq3demo
-}
-
-archs=()
-for arch in $topdir/build/release-*; do
-	arch=${arch##*-}
-	case "$arch" in
-		i386) echo "define(HAVE_I386,yes)dnl" >> defines.m4
-			copystartscript x86
-		;;
-		x86_64) echo "define(HAVE_X86_64,yes)dnl" >> defines.m4
-			copystartscript $arch
-		;;
-		ppc) echo "define(HAVE_PPC,yes)dnl" >> defines.m4
-			copystartscript $arch
-		;;
-		*)
-			echo "architecture $arch unsupported"
-			continue;
-		;;
-	esac
-	archs[${#archs[@]}]=$arch
-done
-
-for arch in "${archs[@]}"; do
-	dst=image/tmp
-	mkdir $dst
-	mkdir $dst/baseq3 $dst/demoq3 $dst/missionpack
-	install -m 755 $topdir/build/release-linux-$arch/ioquake3.$arch $dst/ioquake3.$arch
-	install -m 755 $topdir/build/release-linux-$arch/ioq3ded.$arch $dst/ioq3ded.$arch
-	install -m 644 $topdir/build/release-linux-$arch/baseq3/*.so $dst/baseq3
-	install -m 644 $topdir/build/release-linux-$arch/missionpack/*.so $dst/missionpack
-	for i in cgame qagame ui; do
-		ln -s ../baseq3/$i$arch.so $dst/demoq3
-	done
-
-	tar --owner=root --group=root -C $dst -cf ./image/ioquake3.$arch.tar .
-	rm -rf ./image/tmp
-done
-
-# patch pk3 files
-if [ -e ./idpatchpk3s.tar -a -e ./idtapatchpk3s.tar ]; then
-	install -m 644 ./idpatchpk3s.tar image/idpatchpk3s.tar
-	install -m 644 ./idtapatchpk3s.tar image/idtapatchpk3s.tar
-	install -m 644 ./id_patch_pk3s_Q3A_EULA.txt image/id_patch_pk3s_Q3A_EULA.txt
-	echo "define(HAVE_PATCHPK3,yes)dnl" >> defines.m4
-elif [ -e quake3-latest-pk3s.zip ]; then
-	unzip quake3-latest-pk3s.zip
-	chmod 644 quake3-latest-pk3s/*/*.pk3
-	tar -C quake3-latest-pk3s/baseq3 -cf image/idpatchpk3s.tar .
-	tar -C quake3-latest-pk3s/missionpack -cf image/idtapatchpk3s.tar .
-	rm -r quake3-latest-pk3s
-	install -m 644 id_patch_pk3s_Q3A_EULA.txt image/id_patch_pk3s_Q3A_EULA.txt
-	echo "define(HAVE_PATCHPK3,yes)dnl" >> defines.m4
-fi
-
-### uninstall script
-install -m 755 ./preuninstall.sh image/preuninstall.sh
-
-
-### README, COPYING and EULA
-install -m 644 $topdir/README image/README
-install -m 644 $topdir/COPYING.txt image/COPYING
-
-# create setup.xml
-m4 defines.m4 setup.xml.in > image/setup.data/setup.xml
-
-### makeself installer
-ARCH=
-if [ "${#archs[@]}" -eq 1 ]; then
-	ARCH=.$arch
-fi
-$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE$ARCH.run "ioquake3 $VERSION-$RELEASE" ./setup.sh
diff --git a/misc/setup/ioq3demo.sh b/misc/setup/ioq3demo.sh
deleted file mode 100644
index 05df7ff8..00000000
--- a/misc/setup/ioq3demo.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-readlink() {
-    local path=$1 ll
-    
-    if [ -L "$path" ]; then 
-        ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
-        echo "${ll/* -> }"
-    else    
-        return 1
-    fi
-}
-
-script=$0
-count=0
-while [ -L "$script" ]  
-do
-    script=$(readlink "$script")
-    count=`expr $count + 1`
-    if [ $count -gt 100 ]   
-    then    
-        echo "Too many symbolic links"
-        exit 1
-    fi
-done
-cd "`dirname $script`"
-
-
-lib=lib
-test -e lib64 && lib=lib64
-
-if test "x$LD_LIBRARY_PATH" = x; then
-	LD_LIBRARY_PATH="`pwd`/$lib"
-else
-	LD_LIBRARY_PATH="`pwd`/$lib:$LD_LIBRARY_PATH"
-fi
-export LD_LIBRARY_PATH
-
-archs=`uname -m`
-case "$archs" in
-	i?86) archs=i386 ;;
-	x86_64) archs="x86_64 i386" ;;
-	ppc64) archs="ppc64 ppc" ;;
-esac
-
-for arch in $archs; do
-	test -x ./ioquake3.$arch || continue
-	exec ./ioquake3.$arch +set sv_pure 0 +set vm_cgame 0 +set vm_game 0 +set vm_ui 0 +set fs_game demoq3 "$@"
-done
-echo "could not execute ioquake3" >&2
diff --git a/misc/setup/ioquake3.SlackBuild b/misc/setup/ioquake3.SlackBuild
deleted file mode 100644
index af261b72..00000000
--- a/misc/setup/ioquake3.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-CWD=`pwd`
-BASE=$CWD/../..
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
-
-# clean, update
-make -C $BASE clean || exit 1
-svn up $BASE || exit 1
-
-# extract version info
-VERSION=`grep "\#define *PRODUCT_VERSION" $BASE/code/qcommon/q_shared.h | \
-  sed -e 's/[^"]*"\(.*\)"/\1/'`
-
-SVN_REV=`LANG=C svnversion $BASE`
-if [ ! "$SVN_REV" = "" ]; then
-  VERSION=${VERSION}_SVN${SVN_REV}
-fi
-
-PKG_VERSION=$VERSION
-
-ARCH=${ARCH:-i586}
-
-BUILD=${BUILD:-1_io}
-
-APP=ioquake3
-
-PKG=$TMP/package-$APP
-
-rm -rf $PKG
-mkdir -p $PKG
-
-# build
-make -C $BASE release copyfiles COPYDIR="$PKG"/usr/games/$APP|| exit 1
-
-# copy additional files
-cp $BASE/BUGS $BASE/COPYING.txt $BASE/ChangeLog $BASE/README $PKG/usr/games/$APP/
-cat $CWD/$APP.SlackBuild > $PKG/usr/games/$APP/$APP.SlackBuild
-
-mkdir -p $PKG/usr/share/$APP/icons
-cp $BASE/misc/quake3.png $PKG/usr/share/$APP/icons/ioquake3.png
-
-mkdir -p $PKG/usr/bin
-cat >> $PKG/usr/bin/ioquake3 << EOF
-#!/bin/sh
-cd /usr/games/$APP/
-./ioquake3.i386 \$*
-exit \$? 
-EOF
-chmod 754 $PKG/usr/bin/ioquake3
-
-mkdir -p $PKG/usr/bin
-cat >> $PKG/usr/bin/ioq3ded << EOF
-#!/bin/sh
-cd /usr/games/$APP/
-./ioq3ded.i386 \$*
-exit \$? 
-EOF
-chmod 754 $PKG/usr/bin/ioq3ded
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cat >> $PKG/install/doinst.sh << EOF
-chmod 754 /usr/games/$APP/*.i386
-chmod 754 /usr/bin/ioquake3 /usr/bin/ioq3ded
-EOF
-chmod +x $PKG/install/doinst.sh
-
-pushd $PKG
-chown -R root:root install/ || exit 1
-chown -R root:games usr/ || exit 1
-/sbin/makepkg -l y -c n $TMP/$APP-$VERSION-$ARCH-$BUILD.tgz
-popd
-
diff --git a/misc/setup/ioquake3.sh b/misc/setup/ioquake3.sh
deleted file mode 100644
index fbef5676..00000000
--- a/misc/setup/ioquake3.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-readlink() {
-    local path=$1 ll
-    
-    if [ -L "$path" ]; then 
-        ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
-        echo "${ll##* -> }"
-    else    
-        return 1
-    fi
-}
-
-script=$0
-count=0
-while [ -L "$script" ]  
-do
-    script=$(readlink "$script")
-    count=`expr $count + 1`
-    if [ $count -gt 100 ]   
-    then    
-        echo "Too many symbolic links"
-        exit 1
-    fi
-done
-cd "`dirname $script`"
-
-
-lib=lib
-test -e lib64 && lib=lib64
-
-if test "x$LD_LIBRARY_PATH" = x; then
-	LD_LIBRARY_PATH="`pwd`/$lib"
-else
-	LD_LIBRARY_PATH="`pwd`/$lib:$LD_LIBRARY_PATH"
-fi
-export LD_LIBRARY_PATH
-
-archs=`uname -m`
-case "$archs" in
-	i?86) archs=i386 ;;
-	x86_64) archs="x86_64 i386" ;;
-	ppc64) archs="ppc64 ppc" ;;
-esac
-
-for arch in $archs; do
-	test -x ./ioquake3.$arch || continue
-	exec ./ioquake3.$arch "$@"
-done
-echo "could not execute ioquake3" >&2
diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh
deleted file mode 100644
index 5f2d7e50..00000000
--- a/misc/setup/pkg/ioq3ded.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Rev: $Id: ioq3ded.sh,v 1.9 2006/01/18 13:47:42 raistlin Exp raistlin $
-# Needed to make symlinks/shortcuts work.
-# the binaries must run with correct working directory
-
-IOQ3_DIR=/usr/local/share/games/quake3
-
-COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/`
-
-EXEC_REL=release
-
-# EXEC_BIN=ioquake3.${COMPILE_ARCH}
-# EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
-EXEC_BIN=ioq3ded.${COMPILE_ARCH}
-
-EXEC_FLAGS="+set fs_basepath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set com_ansiColor 0"
-
-EXEC_DIR_LIST="${IOQ3_DIR}"
-
-for d in ${EXEC_DIR_LIST}
-do
-	if [ -d $d ]; then
-		EXEC_DIR=${d}
-		break
-	fi
-done
-
-if [ "X${EXEC_DIR}" != "X" ]; then
-	if [ ! -x  ${EXEC_DIR}/${EXEC_BIN} ]; then
-		echo "Executable ${EXEC_DIR}/${EXEC_BIN} not found!" ; exit 1
-	fi
-	cd ${IOQ3_DIR} && \
-	${EXEC_DIR}/${EXEC_BIN} ${EXEC_FLAGS} $*
-	exit $? 
-else
-	echo "No ioq3 binaries found!"
-	exit 1
-fi
-  
-
diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh
deleted file mode 100644
index b2fe7856..00000000
--- a/misc/setup/pkg/ioquake3.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Rev: $Id: ioquake3.sh,v 1.11 2006/01/18 13:47:42 raistlin Exp raistlin $
-# Needed to make symlinks/shortcuts work.
-# the binaries must run with correct working directory
-
-IOQ3_DIR=/usr/local/share/games/quake3
-
-COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/`
-
-EXEC_REL=release
-
-EXEC_BIN=ioquake3.${COMPILE_ARCH}
-# EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
-# EXEC_BIN=ioq3ded.${COMPILE_ARCH}
-
-EXEC_FLAGS="+set fs_basepath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set com_ansiColor 0"
-
-EXEC_DIR_LIST="${IOQ3_DIR}"
-
-for d in ${EXEC_DIR_LIST}
-do
-	if [ -d $d ]; then
-		EXEC_DIR=${d}
-		break
-	fi
-done
-
-if [ "X${EXEC_DIR}" != "X" ]; then
-	if [ ! -x  ${EXEC_DIR}/${EXEC_BIN} ]; then
-		echo "Executable ${EXEC_DIR}/${EXEC_BIN} not found!" ; exit 1
-	fi
-	cd ${IOQ3_DIR} && \
-	${EXEC_DIR}/${EXEC_BIN} ${EXEC_FLAGS} $*
-	exit $? 
-else
-	echo "No ioq3 binaries found!"
-	exit 1
-fi
-  
-
diff --git a/misc/setup/pkg/ioquake3/depend b/misc/setup/pkg/ioquake3/depend
deleted file mode 100644
index 11170caf..00000000
--- a/misc/setup/pkg/ioquake3/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-P SUNWxilrl XIL Runtime Environment
-P SFWsdl SDL - Simple DirectMedia Layer library
-P ioquake3d Icculus.Org Quake3 game data files for Solaris 10 (X11,GLX,SDL)
diff --git a/misc/setup/pkg/ioquake3/pkginfo.template b/misc/setup/pkg/ioquake3/pkginfo.template
deleted file mode 100644
index 34d5b1ff..00000000
--- a/misc/setup/pkg/ioquake3/pkginfo.template
+++ /dev/null
@@ -1,12 +0,0 @@
-CLASSES=none
-BASEDIR=/usr/local/share/games
-TZ=PST
-PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
-PKG=ioquake3
-NAME=ioquake3 1.34 for Solaris 10 (X11,GLX,SDL)
-VERSION=
-CATEGORY=application,graphics,opengl
-DESC=Icculus.Org Quake3 1.34 for Solaris 10 (http://www.ioquake3.org/)
-VENDOR=http://www.ioquake3.org/
-EMAIL=quake@cojot.name
-PKGSAV=/var/sadm/pkg/ioquake3/save
diff --git a/misc/setup/pkg/ioquake3/postinstall b/misc/setup/pkg/ioquake3/postinstall
deleted file mode 100644
index 2775d5ee..00000000
--- a/misc/setup/pkg/ioquake3/postinstall
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: postinstall,v 1.3 2006/01/21 12:54:52 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR/quake3
-dest_dir=${PKG_INSTALL_ROOT}/usr/local/bin
-
-if [ -d ${dest_dir} ]; then
-	for inst_script in ioq3ded.sh ioquake3.sh
-	do
-		dest_script=${dest_dir}/${inst_script}
-		if [ ! -h ${dest_script} ]; then
-			ln -s ${quake3_dir}/${inst_script} ${dest_script}
-		fi
-	done
-fi
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/postremove b/misc/setup/pkg/ioquake3/postremove
deleted file mode 100644
index 37690f61..00000000
--- a/misc/setup/pkg/ioquake3/postremove
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# @(#)postremove	$Id: postremove,v 1.3 2006/01/21 12:54:52 coyote Exp $
-#
-# postremove script for quake3
-
-quake3_dir=$BASEDIR
-dest_dir=${PKG_INSTALL_ROOT}/usr/local/bin
-
-if [ -d ${dest_dir} ]; then
-	for inst_script in ioq3ded.sh ioquake3.sh
-	do
-		dest_script=${dest_dir}/${inst_script}
-		if [ -h ${dest_script} ]; then
-			rm -f ${dest_script}
-		fi
-	done
-fi
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/preinstall b/misc/setup/pkg/ioquake3/preinstall
deleted file mode 100644
index ad126a11..00000000
--- a/misc/setup/pkg/ioquake3/preinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/preremove b/misc/setup/pkg/ioquake3/preremove
deleted file mode 100644
index 3f316f3c..00000000
--- a/misc/setup/pkg/ioquake3/preremove
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/prototype.template b/misc/setup/pkg/ioquake3/prototype.template
deleted file mode 100644
index f23af773..00000000
--- a/misc/setup/pkg/ioquake3/prototype.template
+++ /dev/null
@@ -1,8 +0,0 @@
-!default 0755 root bin
-i pkginfo
-i copyright
-i depend
-i postinstall
-i postremove
-i preinstall
-i preremove
diff --git a/misc/setup/pkg/ioquake3/space b/misc/setup/pkg/ioquake3/space
deleted file mode 100644
index 95b72949..00000000
--- a/misc/setup/pkg/ioquake3/space
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share 20000 15
diff --git a/misc/setup/pkg/ioquake3d/depend b/misc/setup/pkg/ioquake3d/depend
deleted file mode 100644
index b55ff884..00000000
--- a/misc/setup/pkg/ioquake3d/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-P SUNWxilrl XIL Runtime Environment
-P SFWsdl SDL - Simple DirectMedia Layer library
diff --git a/misc/setup/pkg/ioquake3d/pkginfo.template b/misc/setup/pkg/ioquake3d/pkginfo.template
deleted file mode 100644
index a351c4de..00000000
--- a/misc/setup/pkg/ioquake3d/pkginfo.template
+++ /dev/null
@@ -1,12 +0,0 @@
-CLASSES=none
-BASEDIR=/usr/local/share/games
-TZ=PST
-PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
-PKG=ioquake3d
-NAME=ioquake3 game data files for Solaris 10 (X11,GLX,SDL)
-VERSION=
-CATEGORY=application,graphics,opengl
-DESC=ioquake3 game data files for Solaris 10 (http://www.ioquake3.org/)
-VENDOR=http://www.ioquake3.org/
-EMAIL=quake@cojot.name
-PKGSAV=/var/sadm/pkg/ioquake3d/save
diff --git a/misc/setup/pkg/ioquake3d/postinstall b/misc/setup/pkg/ioquake3d/postinstall
deleted file mode 100644
index f116fc3d..00000000
--- a/misc/setup/pkg/ioquake3d/postinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: postinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/postremove b/misc/setup/pkg/ioquake3d/postremove
deleted file mode 100644
index 7614348d..00000000
--- a/misc/setup/pkg/ioquake3d/postremove
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: postremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/preinstall b/misc/setup/pkg/ioquake3d/preinstall
deleted file mode 100644
index ad126a11..00000000
--- a/misc/setup/pkg/ioquake3d/preinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/preremove b/misc/setup/pkg/ioquake3d/preremove
deleted file mode 100644
index 3f316f3c..00000000
--- a/misc/setup/pkg/ioquake3d/preremove
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/prototype.template b/misc/setup/pkg/ioquake3d/prototype.template
deleted file mode 100644
index 26bd06a1..00000000
--- a/misc/setup/pkg/ioquake3d/prototype.template
+++ /dev/null
@@ -1,7 +0,0 @@
-!default 0755 root bin
-i pkginfo
-i depend
-i postinstall
-i postremove
-i preinstall
-i preremove
diff --git a/misc/setup/pkg/ioquake3d/space b/misc/setup/pkg/ioquake3d/space
deleted file mode 100644
index a8d224c3..00000000
--- a/misc/setup/pkg/ioquake3d/space
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share 50000 100
diff --git a/misc/setup/preuninstall.sh b/misc/setup/preuninstall.sh
deleted file mode 100644
index 49e80564..00000000
--- a/misc/setup/preuninstall.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rmdir --ignore-fail-on-non-empty demoq3 missionpack >& /dev/null
diff --git a/misc/setup/setup.xml.in b/misc/setup/setup.xml.in
deleted file mode 100644
index 65dd1b9d..00000000
--- a/misc/setup/setup.xml.in
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<install product="ioquake3"
-	desc="ioquake3"
-	version="VERSION"
-	update_url="http://www.ioquake3.org/updates.txt"
-	promptbinaries="yes"
-	reinstall="yes"
-	nopromptoverwrite="yes"
-	preuninstall="preuninstall.sh">
-  <readme>
-    README
-  </readme>
-
-  <component name="Default" version="VERSION" default="yes">
-ifelse(HAVE_X86_64,yes,dnl
-    <option install="true" arch="x86_64">
-     ioq3 x86_64 binaries
-     <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
-     <files>
-       ioquake3.x86_64.tar
-     </files>
-     <help>you need the binaries to play the game</help>
-    </option>
-)dnl
-ifelse(HAVE_I386,yes,dnl
-    <option install="true" if="|(x86,x86_64)">
-     ioq3 x86 (32 bit) binaries
-     <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
-     <files>
-       ioquake3.i386.tar
-     </files>
-     <help>you need the binaries to play the game</help>
-    </option>
-)dnl
-ifelse(HAVE_PPC,yes,dnl
-    <option install="true">
-     <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
-     ioq3 ppc binaries
-     <files>
-       ioquake3.ppc.tar
-     </files>
-     <help>you need the binaries to play the game</help>
-    </option>
-)dnl
-    <option install="true" show="false">
-      shared data
-      <files>
-	quake3.png
-	COPYING
-      </files>
-    </option>
-  </component>
-ifelse(HAVE_PATCHPK3,yes,dnl
-
-  <component name="Quake III Arena" version="VERSION">
-    <eula>
-      id_patch_pk3s_Q3A_EULA.txt
-    </eula>
-
-   <option install="true">
-     Quake III Arena Point Release 1.32 data files
-     <files path="baseq3">
-       idpatchpk3s.tar
-     </files>
-   </option>
-
-   <option>
-     <help>
-       If you don't select this you need to copy pak0.pk3 to the baseq3 directory manually.
-     </help>
-     Quake III Arena CDROM data
-     <files cdromid="CD 1" path="baseq3"
-       md5sum="1197ca3df1e65f3c380f8abc10ca43bf"
-       size="458M" mode="0664">
-       Quake3/baseq3/pak0.pk3
-     </files>
-   </option>
-  </component>
-
-  <component name="Quake III Team Arena" version="VERSION">
-    <eula>
-      id_patch_pk3s_Q3A_EULA.txt
-    </eula>
-
-   <option install="true">
-     Quake III Team Arena Point Release 1.32 data files
-     <files path="missionpack">
-       idtapatchpk3s.tar
-     </files>
-   </option>
-   <option>
-     <help>
-       If you don't select this you need to copy the TA pak0.pk3 to the missionpack directory manually.
-     </help>
-     Quake III Team Arena CDROM data
-     <files cdromid="CD 2" path="missionpack" size="336M"
-       md5sum="e8ba9e3bf06210930bc0e7fdbcdd01c2" mode="0644">
-       Setup/missionpack/pak0.pk3
-     </files>
-   </option>
-  </component>
-
-  <cdrom id="CD 1" name="Quake 3 Arena installation CD">
-    Quake3/baseq3/pak0.pk3
-  </cdrom>
-  <cdrom id="CD 2" name="Quake 3 Team Arena installation CD">
-    Setup/missionpack/pak0.pk3
-  </cdrom>
-)dnl
-
-</install>
diff --git a/misc/setup/slack-desc b/misc/setup/slack-desc
deleted file mode 100644
index c88b4bcb..00000000
--- a/misc/setup/slack-desc
+++ /dev/null
@@ -1,12 +0,0 @@
-        |-----handy-ruler------------------------------------------------------|
-ioquake3: ioquake 3 - An open source Quake 3 distribution
-ioquake3: 
-ioquake3: ioquake3 aims to build upon id Software's Quake 3 source code release.
-ioquake3: The source code was released on August 20, 2005 under the GPL. Since
-ioquake3: then code has been cleaned up, bugs have been fixed and features been
-ioquake3: added.
-ioquake3: The permanent goal is to create THE open source Quake 3 distribution
-ioquake3: upon which people base their games and projects.
-ioquake3: 
-ioquake3: http://ioquake3.org/
-ioquake3:  
diff --git a/misc/setup/splash.xpm b/misc/setup/splash.xpm
deleted file mode 100644
index 27677676..00000000
--- a/misc/setup/splash.xpm
+++ /dev/null
@@ -1,2289 +0,0 @@
-/* XPM */
-static char * splash_xpm[] = {
-"296 296 1990 2",
-"  	c #999999",
-". 	c #989797",
-"+ 	c #999898",
-"@ 	c #938B8B",
-"# 	c #979494",
-"$ 	c #8D7D7D",
-"% 	c #958F8F",
-"& 	c #887070",
-"* 	c #928989",
-"= 	c #846666",
-"- 	c #8F7F7F",
-"; 	c #815C5C",
-"> 	c #8B7676",
-", 	c #7D5353",
-"' 	c #876C6C",
-") 	c #7A4949",
-"! 	c #846262",
-"~ 	c #764040",
-"{ 	c #805959",
-"] 	c #733636",
-"^ 	c #7D4F4F",
-"/ 	c #702C2C",
-"( 	c #794646",
-"_ 	c #6C2323",
-": 	c #763C3C",
-"< 	c #691919",
-"[ 	c #733232",
-"} 	c #979595",
-"| 	c #671313",
-"1 	c #6F2929",
-"2 	c #969090",
-"3 	c #660E0E",
-"4 	c #6C1F1F",
-"5 	c #948B8B",
-"6 	c #650A0A",
-"7 	c #691616",
-"8 	c #928686",
-"9 	c #640505",
-"0 	c #660C0C",
-"a 	c #918181",
-"b 	c #630101",
-"c 	c #640303",
-"d 	c #8D7878",
-"e 	c #630000",
-"f 	c #969292",
-"g 	c #8A6E6E",
-"h 	c #640000",
-"i 	c #938888",
-"j 	c #876565",
-"k 	c #907F7F",
-"l 	c #845B5B",
-"m 	c #650000",
-"n 	c #8D7575",
-"o 	c #815252",
-"p 	c #8A6B6B",
-"q 	c #7E4848",
-"r 	c #660000",
-"s 	c #876262",
-"t 	c #7B3E3E",
-"u 	c #670000",
-"v 	c #845858",
-"w 	c #783535",
-"x 	c #814F4F",
-"y 	c #762B2B",
-"z 	c #680000",
-"A 	c #7E4545",
-"B 	c #732222",
-"C 	c #7B3B3B",
-"D 	c #989696",
-"E 	c #711A1A",
-"F 	c #690000",
-"G 	c #793232",
-"H 	c #701313",
-"I 	c #6A0000",
-"J 	c #762828",
-"K 	c #979191",
-"L 	c #6E0C0C",
-"M 	c #731F1F",
-"N 	c #968F8F",
-"O 	c #6C0505",
-"P 	c #6B0000",
-"Q 	c #711515",
-"R 	c #948A8A",
-"S 	c #6F0D0D",
-"T 	c #928080",
-"U 	c #6C0000",
-"V 	c #6F0909",
-"W 	c #8F7777",
-"X 	c #6E0707",
-"Y 	c #958A8A",
-"Z 	c #8C6D6D",
-"` 	c #6D0000",
-" .	c #6E0404",
-"..	c #938383",
-"+.	c #8A6464",
-"@.	c #6E0202",
-"#.	c #917C7C",
-"$.	c #875A5A",
-"%.	c #6E0000",
-"&.	c #8F7474",
-"*.	c #855050",
-"=.	c #6F0000",
-"-.	c #8C6B6B",
-";.	c #824646",
-">.	c #8A6161",
-",.	c #803D3D",
-"'.	c #700000",
-").	c #875757",
-"!.	c #7E3333",
-"~.	c #854D4D",
-"{.	c #7C2929",
-"].	c #710000",
-"^.	c #834444",
-"/.	c #792020",
-"(.	c #803A3A",
-"_.	c #781616",
-":.	c #720000",
-"<.	c #7E3131",
-"[.	c #760D0D",
-"}.	c #730000",
-"|.	c #7D2727",
-"1.	c #740303",
-"2.	c #7A1D1D",
-"3.	c #979292",
-"4.	c #740000",
-"5.	c #791616",
-"6.	c #999797",
-"7.	c #958989",
-"8.	c #781111",
-"9.	c #937F7F",
-"0.	c #750000",
-"a.	c #780C0C",
-"b.	c #968E8E",
-"c.	c #917676",
-"d.	c #770707",
-"e.	c #8F6B6B",
-"f.	c #760000",
-"g.	c #770202",
-"h.	c #948484",
-"i.	c #8D6262",
-"j.	c #770000",
-"k.	c #937D7D",
-"l.	c #8B5858",
-"m.	c #917373",
-"n.	c #894F4F",
-"o.	c #780000",
-"p.	c #8F6A6A",
-"q.	c #874545",
-"r.	c #8D6060",
-"s.	c #853B3B",
-"t.	c #790000",
-"u.	c #8B5656",
-"v.	c #843232",
-"w.	c #7A0000",
-"x.	c #8A4D4D",
-"y.	c #822828",
-"z.	c #884343",
-"A.	c #811F1F",
-"B.	c #7B0000",
-"C.	c #863A3A",
-"D.	c #7F1515",
-"E.	c #843030",
-"F.	c #7E0D0D",
-"G.	c #7C0000",
-"H.	c #832626",
-"I.	c #989191",
-"J.	c #7E0909",
-"K.	c #821F1F",
-"L.	c #968A8A",
-"M.	c #7E0707",
-"N.	c #7D0000",
-"O.	c #811717",
-"P.	c #989595",
-"Q.	c #958383",
-"R.	c #7E0404",
-"S.	c #801010",
-"T.	c #989292",
-"U.	c #947C7C",
-"V.	c #7E0202",
-"W.	c #7E0000",
-"X.	c #7F0808",
-"Y.	c #979090",
-"Z.	c #937474",
-"`.	c #7F0000",
-" +	c #7F0202",
-".+	c #978E8E",
-"++	c #916A6A",
-"@+	c #968585",
-"#+	c #906161",
-"$+	c #800000",
-"%+	c #8E5757",
-"&+	c #937373",
-"*+	c #8D4D4D",
-"=+	c #810000",
-"-+	c #916969",
-";+	c #8C4444",
-">+	c #905F5F",
-",+	c #8B3A3A",
-"'+	c #820000",
-")+	c #8F5555",
-"!+	c #8A3131",
-"~+	c #830000",
-"{+	c #8E4C4C",
-"]+	c #892727",
-"^+	c #8D4343",
-"/+	c #881D1D",
-"(+	c #840000",
-"_+	c #8C3838",
-":+	c #871616",
-"<+	c #8A2F2F",
-"[+	c #871111",
-"}+	c #850000",
-"|+	c #8A2525",
-"1+	c #988E8E",
-"2+	c #870C0C",
-"3+	c #891C1C",
-"4+	c #978989",
-"5+	c #870707",
-"6+	c #860000",
-"7+	c #881212",
-"8+	c #968383",
-"9+	c #870202",
-"0+	c #870000",
-"a+	c #880808",
-"b+	c #967C7C",
-"c+	c #870101",
-"d+	c #957373",
-"e+	c #880000",
-"f+	c #946969",
-"g+	c #978585",
-"h+	c #935F5F",
-"i+	c #890000",
-"j+	c #967B7B",
-"k+	c #925656",
-"l+	c #8A0000",
-"m+	c #957171",
-"n+	c #914C4C",
-"o+	c #946868",
-"p+	c #9F9191",
-"q+	c #AB7E7E",
-"r+	c #BD6262",
-"s+	c #CF4848",
-"t+	c #DB3636",
-"u+	c #E72525",
-"v+	c #EB1F1F",
-"w+	c #E12C2C",
-"x+	c #CD4B4B",
-"y+	c #B76C6C",
-"z+	c #9E9191",
-"A+	c #914343",
-"B+	c #8B0000",
-"C+	c #945E5E",
-"D+	c #AA7F7F",
-"E+	c #C15C5C",
-"F+	c #D83A3A",
-"G+	c #E82222",
-"H+	c #E91F1F",
-"I+	c #E02D2D",
-"J+	c #D43F3F",
-"K+	c #C55555",
-"L+	c #B47070",
-"M+	c #A38989",
-"N+	c #9B9595",
-"O+	c #9D9292",
-"P+	c #B17474",
-"Q+	c #CB4D4D",
-"R+	c #E32828",
-"S+	c #F70B0B",
-"T+	c #FE0000",
-"U+	c #FC0202",
-"V+	c #EE1919",
-"W+	c #D34141",
-"X+	c #B76B6B",
-"Y+	c #903939",
-"Z+	c #935555",
-"`+	c #9D9494",
-" @	c #AD7B7B",
-".@	c #C45757",
-"+@	c #E12B2B",
-"@@	c #F60A0A",
-"#@	c #FD0000",
-"$@	c #FB0202",
-"%@	c #ED1919",
-"&@	c #D63B3B",
-"*@	c #BD6161",
-"=@	c #A58686",
-"-@	c #B46F6F",
-";@	c #D63C3C",
-">@	c #F11313",
-",@	c #FD0101",
-"'@	c #EE1717",
-")@	c #CE4949",
-"!@	c #AC7C7C",
-"~@	c #902F2F",
-"{@	c #8C0000",
-"]@	c #924B4B",
-"^@	c #A28B8B",
-"/@	c #BC6363",
-"(@	c #DE2E2E",
-"_@	c #F80707",
-":@	c #FC0000",
-"<@	c #F70707",
-"[@	c #E32525",
-"}@	c #C45656",
-"|@	c #A58787",
-"1@	c #CB4C4C",
-"2@	c #EE1515",
-"3@	c #FB0101",
-"4@	c #DD2F2F",
-"5@	c #B37070",
-"6@	c #9C9494",
-"7@	c #8F2626",
-"8@	c #924141",
-"9@	c #C94E4E",
-"0@	c #F11010",
-"a@	c #FB0000",
-"b@	c #B86969",
-"c@	c #9A9898",
-"d@	c #AB7D7D",
-"e@	c #D73838",
-"f@	c #F90404",
-"g@	c #F80505",
-"h@	c #D53B3B",
-"i@	c #A78383",
-"j@	c #8F1E1E",
-"k@	c #8D0000",
-"l@	c #913838",
-"m@	c #9C9595",
-"n@	c #BC6161",
-"o@	c #EB1717",
-"p@	c #FA0000",
-"q@	c #EB1818",
-"r@	c #BE5E5E",
-"s@	c #A88181",
-"t@	c #D83636",
-"u@	c #F80303",
-"v@	c #F90101",
-"w@	c #DB3131",
-"x@	c #999595",
-"y@	c #8F1717",
-"z@	c #912E2E",
-"A@	c #9D9393",
-"B@	c #C35656",
-"C@	c #EF1010",
-"D@	c #F90000",
-"E@	c #ED1414",
-"F@	c #BD5F5F",
-"G@	c #9F9090",
-"H@	c #CD4646",
-"I@	c #F40808",
-"J@	c #EE1111",
-"K@	c #B96666",
-"L@	c #999292",
-"M@	c #8F1010",
-"N@	c #8E0000",
-"O@	c #912525",
-"P@	c #D73535",
-"Q@	c #F70101",
-"R@	c #F80000",
-"S@	c #E32222",
-"T@	c #B17272",
-"U@	c #EA1717",
-"V@	c #D93232",
-"W@	c #989090",
-"X@	c #900808",
-"Y@	c #8F0000",
-"Z@	c #911B1B",
-"`@	c #9A9797",
-" #	c #BA6464",
-".#	c #F10A0A",
-"+#	c #F70000",
-"@#	c #F40404",
-"##	c #CE4343",
-"$#	c #CD4444",
-"%#	c #F70202",
-"&#	c #C55252",
-"*#	c #988D8D",
-"=#	c #8F0101",
-"-#	c #901111",
-";#	c #A78282",
-">#	c #E61A1A",
-",#	c #F60000",
-"'#	c #E91616",
-")#	c #AC7A7A",
-"!#	c #A18B8B",
-"~#	c #DD2929",
-"{#	c #F40505",
-"]#	c #BD5E5E",
-"^#	c #988585",
-"/#	c #900000",
-"(#	c #910B0B",
-"_#	c #999696",
-":#	c #A28A8A",
-"<#	c #E02222",
-"[#	c #F50000",
-"}#	c #F00909",
-"|#	c #B96363",
-"1#	c #A88080",
-"2#	c #E71818",
-"3#	c #F40303",
-"4#	c #BD5D5D",
-"5#	c #977B7B",
-"6#	c #988F8F",
-"7#	c #A18C8C",
-"8#	c #E31D1D",
-"9#	c #F40000",
-"0#	c #F20303",
-"a#	c #C74C4C",
-"b#	c #E91414",
-"c#	c #F50101",
-"d#	c #C84B4B",
-"e#	c #977171",
-"f#	c #910000",
-"g#	c #910606",
-"h#	c #988888",
-"i#	c #A48787",
-"j#	c #EC0D0D",
-"k#	c #F30101",
-"l#	c #A68383",
-"m#	c #E91313",
-"n#	c #DB2B2B",
-"o#	c #9B9696",
-"p#	c #966868",
-"q#	c #910404",
-"r#	c #988080",
-"s#	c #B26F6F",
-"t#	c #F10303",
-"u#	c #F30000",
-"v#	c #C44F4F",
-"w#	c #E11F1F",
-"x#	c #EF0707",
-"y#	c #A58585",
-"z#	c #965E5E",
-"A#	c #920000",
-"B#	c #920101",
-"C#	c #987979",
-"D#	c #CE3E3E",
-"E#	c #F20000",
-"F#	c #F10202",
-"G#	c #B76565",
-"H#	c #CE3D3D",
-"I#	c #C64C4C",
-"J#	c #965555",
-"K#	c #930000",
-"L#	c #A28989",
-"M#	c #EA0D0D",
-"N#	c #F10000",
-"O#	c #A87F7F",
-"P#	c #B66767",
-"Q#	c #F00202",
-"R#	c #EA0C0C",
-"S#	c #A08C8C",
-"T#	c #964B4B",
-"U#	c #976767",
-"V#	c #C74949",
-"W#	c #F00000",
-"X#	c #DC2323",
-"Y#	c #E31717",
-"Z#	c #CB4141",
-"`#	c #964141",
-" $	c #940000",
-".$	c #975D5D",
-"+$	c #A48585",
-"@$	c #EC0606",
-"#$	c #EF0000",
-"$$	c #BA5E5E",
-"%$	c #C25050",
-"&$	c #EE0202",
-"*$	c #AC7777",
-"=$	c #963838",
-"-$	c #975353",
-";$	c #D72929",
-">$	c #EE0000",
-",$	c #E51010",
-"'$	c #9E8F8F",
-")$	c #E41212",
-"!$	c #962E2E",
-"~$	c #950000",
-"{$	c #974A4A",
-"]$	c #BE5555",
-"^$	c #ED0000",
-"/$	c #B86060",
-"($	c #D23131",
-"_$	c #962424",
-":$	c #974040",
-"<$	c #A97B7B",
-"[$	c #EC0000",
-"}$	c #DF1919",
-"|$	c #D62929",
-"1$	c #C34C4C",
-"2$	c #971A1A",
-"3$	c #960000",
-"4$	c #973737",
-"5$	c #EA0202",
-"6$	c #EB0000",
-"7$	c #AB7777",
-"8$	c #E90404",
-"9$	c #B76161",
-"0$	c #971111",
-"a$	c #970000",
-"b$	c #982D2D",
-"c$	c #E11111",
-"d$	c #EA0000",
-"e$	c #C14D4D",
-"f$	c #AD7373",
-"g$	c #B16B6B",
-"h$	c #970707",
-"i$	c #972323",
-"j$	c #DA1C1C",
-"k$	c #E90000",
-"l$	c #D42929",
-"m$	c #BC5656",
-"n$	c #AE7272",
-"o$	c #980101",
-"p$	c #980000",
-"q$	c #981A1A",
-"r$	c #D72323",
-"s$	c #DF1313",
-"t$	c #C64343",
-"u$	c #B46666",
-"v$	c #998D8D",
-"w$	c #981414",
-"x$	c #DC1717",
-"y$	c #E80000",
-"z$	c #E40808",
-"A$	c #A18A8A",
-"B$	c #CC3636",
-"C$	c #C93D3D",
-"D$	c #998383",
-"E$	c #990000",
-"F$	c #990F0F",
-"G$	c #999191",
-"H$	c #A38585",
-"I$	c #E70101",
-"J$	c #E70000",
-"K$	c #E60202",
-"L$	c #A48383",
-"M$	c #CE3232",
-"N$	c #E20A0A",
-"O$	c #997A7A",
-"P$	c #9A0000",
-"Q$	c #9A0A0A",
-"R$	c #998C8C",
-"S$	c #C73E3E",
-"T$	c #E60000",
-"U$	c #A58181",
-"V$	c #CB3535",
-"W$	c #D12929",
-"X$	c #997070",
-"Y$	c #9A0505",
-"Z$	c #998787",
-"`$	c #AF6B6B",
-" %	c #E30404",
-".%	c #E50000",
-"+%	c #E40202",
-"@%	c #C34444",
-"#%	c #E30000",
-"$%	c #B23434",
-"%%	c #6A6A6A",
-"&%	c #626262",
-"*%	c #717171",
-"=%	c #8F8F8F",
-"-%	c #9A6767",
-";%	c #9B0000",
-">%	c #9B0101",
-",%	c #998282",
-"'%	c #AC7171",
-")%	c #DF0A0A",
-"!%	c #E40000",
-"~%	c #E00909",
-"{%	c #A08B8B",
-"]%	c #B46262",
-"^%	c #BF0000",
-"/%	c #450000",
-"(%	c #050000",
-"_%	c #000000",
-":%	c #0A0A0A",
-"<%	c #494949",
-"[%	c #929292",
-"}%	c #9A5D5D",
-"|%	c #997979",
-"1%	c #B75A5A",
-"2%	c #E00707",
-"3%	c #D61B1B",
-"4%	c #9F8C8C",
-"5%	c #E20303",
-"6%	c #AF0000",
-"7%	c #120000",
-"8%	c #272727",
-"9%	c #9A5353",
-"0%	c #9C0000",
-"a%	c #9A7070",
-"b%	c #C73A3A",
-"c%	c #E10101",
-"d%	c #E20000",
-"e%	c #C14545",
-"f%	c #CB3131",
-"g%	c #D90000",
-"h%	c #1B0000",
-"i%	c #3D3D3D",
-"j%	c #989898",
-"k%	c #9B4A4A",
-"l%	c #9A6666",
-"m%	c #919191",
-"n%	c #868686",
-"o%	c #8E8E8E",
-"p%	c #878585",
-"q%	c #9F5858",
-"r%	c #D40E0E",
-"s%	c #E10000",
-"t%	c #DF0404",
-"u%	c #A77C7C",
-"v%	c #A87979",
-"w%	c #E10303",
-"x%	c #040404",
-"y%	c #858585",
-"z%	c #9B4040",
-"A%	c #9D0000",
-"B%	c #9B5C5C",
-"C%	c #575757",
-"D%	c #434343",
-"E%	c #7A7A7A",
-"F%	c #373737",
-"G%	c #0B0B0B",
-"H%	c #010000",
-"I%	c #250000",
-"J%	c #CE0000",
-"K%	c #E00000",
-"L%	c #C93232",
-"M%	c #C43D3D",
-"N%	c #480000",
-"O%	c #742F2F",
-"P%	c #A77A7A",
-"Q%	c #9C3636",
-"R%	c #9B5353",
-"S%	c #949494",
-"T%	c #454545",
-"U%	c #030303",
-"V%	c #170000",
-"W%	c #DF0000",
-"X%	c #DB0808",
-"Y%	c #A38383",
-"Z%	c #D51919",
-"`%	c #360000",
-" &	c #DF0303",
-".&	c #D02323",
-"+&	c #B45E5E",
-"@&	c #9D9191",
-"#&	c #9D2C2C",
-"$&	c #9E0000",
-"%&	c #9C4949",
-"&&	c #979797",
-"*&	c #3A3A3A",
-"=&	c #080000",
-"-&	c #DE0000",
-";&	c #DD0101",
-">&	c #B55B5B",
-",&	c #A57F7F",
-"'&	c #D90D0D",
-")&	c #4A0000",
-"!&	c #DA0C0C",
-"~&	c #C53838",
-"{&	c #AD6D6D",
-"]&	c #9E2323",
-"^&	c #9F0000",
-"/&	c #9D4040",
-"(&	c #5E5E5E",
-"_&	c #010101",
-":&	c #0F0000",
-"<&	c #C90000",
-"[&	c #BF4444",
-"}&	c #AA7474",
-"|&	c #DB0606",
-"1&	c #090000",
-"2&	c #C60000",
-"3&	c #D80D0D",
-"4&	c #C33C3C",
-"5&	c #AE6B6B",
-"6&	c #9D8F8F",
-"7&	c #9E1919",
-"8&	c #9D3636",
-"9&	c #959595",
-"0&	c #0F0F0F",
-"a&	c #5E0000",
-"b&	c #DD0000",
-"c&	c #C63434",
-"d&	c #AB7070",
-"e&	c #D70D0D",
-"f&	c #D70000",
-"g&	c #DC0000",
-"h&	c #D80B0B",
-"i&	c #C83030",
-"j&	c #B35D5D",
-"k&	c #9A9696",
-"l&	c #9F1010",
-"m&	c #A00000",
-"n&	c #9E2C2C",
-"o&	c #040000",
-"p&	c #1C0000",
-"q&	c #130000",
-"r&	c #180000",
-"s&	c #D50000",
-"t&	c #C33838",
-"u&	c #9C9393",
-"v&	c #D41313",
-"w&	c #B70000",
-"x&	c #1D0000",
-"y&	c #D30000",
-"z&	c #DA0404",
-"A&	c #D01A1A",
-"B&	c #C04040",
-"C&	c #AE6969",
-"D&	c #A08989",
-"E&	c #A00A0A",
-"F&	c #9B9494",
-"G&	c #A67A7A",
-"H&	c #B65555",
-"I&	c #681E1E",
-"J&	c #A80000",
-"K&	c #D00000",
-"L&	c #D60000",
-"M&	c #CC0000",
-"N&	c #B80000",
-"O&	c #DA0101",
-"P&	c #BD4444",
-"Q&	c #A18686",
-"R&	c #CB2626",
-"S&	c #DB0000",
-"T&	c #580000",
-"U&	c #1A0000",
-"V&	c #D80707",
-"W&	c #C13D3D",
-"X&	c #B16161",
-"Y&	c #A28484",
-"Z&	c #9A8E8E",
-"`&	c #A10808",
-" *	c #A10000",
-".*	c #A01C1C",
-"+*	c #9C9292",
-"@*	c #AA7171",
-"#*	c #B94F4F",
-"$*	c #C82B2B",
-"%*	c #D50D0D",
-"&*	c #D90202",
-"**	c #DA0000",
-"=*	c #610000",
-"-*	c #A40707",
-";*	c #B35C5C",
-">*	c #BB4B4B",
-",*	c #D80404",
-"'*	c #D40000",
-")*	c #AD0000",
-"!*	c #D40F0F",
-"~*	c #C53232",
-"{*	c #A77979",
-"]*	c #9A8686",
-"^*	c #A10505",
-"/*	c #A01414",
-"(*	c #999494",
-"_*	c #A08787",
-":*	c #AE6666",
-"<*	c #BD4343",
-"[*	c #CC2020",
-"}*	c #D80202",
-"|*	c #5C0000",
-"1*	c #786969",
-"2*	c #A97272",
-"3*	c #CD1C1C",
-"4*	c #D40B0B",
-"5*	c #CB2222",
-"6*	c #BF3E3E",
-"7*	c #9B7F7F",
-"8*	c #A20303",
-"9*	c #A20000",
-"0*	c #A10D0D",
-"a*	c #9B9393",
-"b*	c #AD6A6A",
-"c*	c #B94C4C",
-"d*	c #C42F2F",
-"e*	c #CF1616",
-"f*	c #D70202",
-"g*	c #D80000",
-"h*	c #5F0000",
-"i*	c #060000",
-"j*	c #260000",
-"k*	c #737373",
-"l*	c #747474",
-"m*	c #5D5D5D",
-"n*	c #605656",
-"o*	c #791A1A",
-"p*	c #B60000",
-"q*	c #D80101",
-"r*	c #D40A0A",
-"s*	c #C13838",
-"t*	c #B55656",
-"u*	c #9F8989",
-"v*	c #9B7878",
-"w*	c #A30101",
-"x*	c #A30000",
-"y*	c #A30606",
-"z*	c #9A8F8F",
-"A*	c #A47E7E",
-"B*	c #AE6464",
-"C*	c #BB4646",
-"D*	c #C62929",
-"E*	c #D01212",
-"F*	c #D60404",
-"G*	c #C70000",
-"H*	c #BC0000",
-"I*	c #3B3B3B",
-"J*	c #C00000",
-"K*	c #3C0000",
-"L*	c #200000",
-"M*	c #100000",
-"N*	c #240000",
-"O*	c #4C0000",
-"P*	c #D10000",
-"Q*	c #D70101",
-"R*	c #D40707",
-"S*	c #CF1313",
-"T*	c #C52C2C",
-"U*	c #BB4545",
-"V*	c #B15E5E",
-"W*	c #A77777",
-"X*	c #9C6F6F",
-"Y*	c #9A8B8B",
-"Z*	c #A28383",
-"`*	c #AC6A6A",
-" =	c #B65151",
-".=	c #C03838",
-"+=	c #CA1F1F",
-"@=	c #D20B0B",
-"#=	c #D50303",
-"$=	c #CB0000",
-"%=	c #620000",
-"&=	c #070000",
-"*=	c #D01010",
-"==	c #BB4343",
-"-=	c #B25B5B",
-";=	c #A87474",
-">=	c #9F8A8A",
-",=	c #7C7C7C",
-"'=	c #6E6E6E",
-")=	c #6D6D6D",
-"!=	c #767676",
-"~=	c #888888",
-"{=	c #969696",
-"]=	c #707070",
-"^=	c #757575",
-"/=	c #9D6565",
-"(=	c #A40000",
-"_=	c #6D5D5D",
-":=	c #909090",
-"<=	c #A37F7F",
-"[=	c #AD6767",
-"}=	c #B54E4E",
-"|=	c #B13535",
-"1=	c #970505",
-"2=	c #A70000",
-"3=	c #C10000",
-"4=	c #D00D0D",
-"5=	c #1D1717",
-"6=	c #BB0000",
-"7=	c #2F0000",
-"8=	c #020000",
-"9=	c #560000",
-"0=	c #CD0000",
-"a=	c #D50101",
-"b=	c #CF0E0E",
-"c=	c #9F1F1F",
-"d=	c #3A2525",
-"e=	c #020202",
-"f=	c #1F1F1F",
-"g=	c #5F5F5F",
-"h=	c #8D8D8D",
-"i=	c #727272",
-"j=	c #1C1C1C",
-"k=	c #9D5B5B",
-"l=	c #090909",
-"m=	c #313131",
-"n=	c #797979",
-"o=	c #323232",
-"p=	c #9A9595",
-"q=	c #9E8B8B",
-"r=	c #A37E7E",
-"s=	c #AC6969",
-"t=	c #B45353",
-"u=	c #BC3E3E",
-"v=	c #C42828",
-"w=	c #CB1616",
-"x=	c #D10707",
-"y=	c #3F0000",
-"z=	c #0B0000",
-"A=	c #350000",
-"B=	c #B74C4C",
-"C=	c #1B1B1B",
-"D=	c #3C3C3C",
-"E=	c #673D3D",
-"F=	c #C32F2F",
-"G=	c #D40202",
-"H=	c #2B0000",
-"I=	c #4E0000",
-"J=	c #2B2B2B",
-"K=	c #8B8B8B",
-"L=	c #9F5252",
-"M=	c #A50000",
-"N=	c #515151",
-"O=	c #444444",
-"P=	c #020101",
-"Q=	c #8B4C4C",
-"R=	c #B64F4F",
-"S=	c #BD3B3B",
-"T=	c #C52626",
-"U=	c #CC1414",
-"V=	c #D00A0A",
-"W=	c #D40101",
-"X=	c #CF0000",
-"Y=	c #CC1313",
-"Z=	c #B45252",
-"`=	c #9E8C8C",
-" -	c #5B5B5B",
-".-	c #A47C7C",
-"+-	c #BC3D3D",
-"@-	c #500000",
-"#-	c #222121",
-"$-	c #948686",
-"%-	c #9F4848",
-"&-	c #A18383",
-"*-	c #5B4F4F",
-"=-	c #2C0000",
-"--	c #C80000",
-";-	c #D20000",
-">-	c #420000",
-",-	c #C71E1E",
-"'-	c #AF5F5F",
-")-	c #9C9191",
-"!-	c #9D8E8E",
-"~-	c #B35555",
-"{-	c #CA1717",
-"]-	c #D30101",
-"^-	c #B50000",
-"/-	c #5B0000",
-"(-	c #D00505",
-"_-	c #CB1515",
-":-	c #C42626",
-"<-	c #BE3737",
-"[-	c #B74848",
-"}-	c #B15959",
-"|-	c #AB6A6A",
-"1-	c #A57979",
-"2-	c #9F8888",
-"3-	c #9C9090",
-"4-	c #8F8888",
-"5-	c #A13E3E",
-"6-	c #A60000",
-"7-	c #777777",
-"8-	c #493030",
-"9-	c #AE6161",
-"0-	c #B45050",
-"a-	c #BB3F3F",
-"b-	c #C12E2E",
-"c-	c #C71D1D",
-"d-	c #CE0C0C",
-"e-	c #D20101",
-"f-	c #030000",
-"g-	c #BE0000",
-"h-	c #CF0808",
-"i-	c #BE3535",
-"j-	c #A67676",
-"k-	c #A87070",
-"l-	c #BD3737",
-"m-	c #550505",
-"n-	c #BA0000",
-"o-	c #BB1111",
-"p-	c #0F0202",
-"q-	c #A67474",
-"r-	c #A28181",
-"s-	c #A23535",
-"t-	c #0D0000",
-"u-	c #2F2F2F",
-"v-	c #A08585",
-"w-	c #A47A7A",
-"x-	c #A96D6D",
-"y-	c #AD6161",
-"z-	c #B25353",
-"A-	c #B84343",
-"B-	c #6B1F1F",
-"C-	c #0E0000",
-"D-	c #AB0000",
-"E-	c #D00202",
-"F-	c #C61D1D",
-"G-	c #B25555",
-"H-	c #141414",
-"I-	c #161414",
-"J-	c #440000",
-"K-	c #CA0000",
-"L-	c #1E0000",
-"M-	c #340000",
-"N-	c #470000",
-"O-	c #380000",
-"P-	c #D10101",
-"Q-	c #CF0707",
-"R-	c #CC0D0D",
-"S-	c #CA1414",
-"T-	c #C12B2B",
-"U-	c #BD3838",
-"V-	c #B74545",
-"W-	c #B35252",
-"X-	c #AE5F5F",
-"Y-	c #A96C6C",
-"Z-	c #A57878",
-"`-	c #795F5F",
-" ;	c #A32B2B",
-".;	c #390000",
-"+;	c #371818",
-"@;	c #353535",
-"#;	c #363131",
-"$;	c #392828",
-"%;	c #311515",
-"&;	c #080202",
-"*;	c #090505",
-"=;	c #B32222",
-"-;	c #C81717",
-";;	c #CA1010",
-">;	c #CC0A0A",
-",;	c #CF0303",
-"';	c #5A0000",
-");	c #0A0000",
-"!;	c #C40000",
-"~;	c #2A0000",
-"{;	c #BA3E3E",
-"];	c #A57777",
-"^;	c #7D7D7D",
-"/;	c #050505",
-"(;	c #7B7B7B",
-"_;	c #3E3E3E",
-":;	c #570000",
-"<;	c #D00101",
-"[;	c #9A0202",
-"};	c #A52222",
-"|;	c #A23E3E",
-"1;	c #C41F1F",
-"2;	c #CC0808",
-"3;	c #CD0505",
-"4;	c #9C0101",
-"5;	c #C30000",
-"6;	c #B90000",
-"7;	c #160000",
-"8;	c #BC3737",
-"9;	c #505050",
-"0;	c #404040",
-"a;	c #0E0E0E",
-"b;	c #070707",
-"c;	c #4D0000",
-"d;	c #B10000",
-"e;	c #5D0000",
-"f;	c #A61919",
-"g;	c #A33535",
-"h;	c #C41C1C",
-"i;	c #210000",
-"j;	c #CE0101",
-"k;	c #CA0D0D",
-"l;	c #BC3535",
-"m;	c #AB6565",
-"n;	c #8A8A8A",
-"o;	c #0B0707",
-"p;	c #AC4F4F",
-"q;	c #C22323",
-"r;	c #CC0707",
-"s;	c #1F0000",
-"t;	c #430000",
-"u;	c #9A9494",
-"v;	c #A71313",
-"w;	c #A90000",
-"x;	c #A42B2B",
-"y;	c #C22020",
-"z;	c #590000",
-"A;	c #540000",
-"B;	c #3A0000",
-"C;	c #600000",
-"D;	c #CD0101",
-"E;	c #C71313",
-"F;	c #B93B3B",
-"G;	c #A86C6C",
-"H;	c #9F8787",
-"I;	c #AD5F5F",
-"J;	c #BC3333",
-"K;	c #C90D0D",
-"L;	c #AE0000",
-"M;	c #BD0000",
-"N;	c #A80E0E",
-"O;	c #AA0000",
-"P;	c #A62222",
-"Q;	c #BF2626",
-"R;	c #C50000",
-"S;	c #3B0000",
-"T;	c #CB0303",
-"U;	c #C21F1F",
-"V;	c #B34A4A",
-"W;	c #A57676",
-"X;	c #9B9292",
-"Y;	c #282828",
-"Z;	c #3F3F3F",
-"`;	c #A67272",
-" >	c #B54848",
-".>	c #C12020",
-"+>	c #9D0202",
-"@>	c #9B8B8B",
-"#>	c #A90A0A",
-"$>	c #A71818",
-"%>	c #BC2E2E",
-"&>	c #4F3232",
-"*>	c #9F8686",
-"=>	c #777171",
-"->	c #9B8686",
-";>	c #AB0404",
-">>	c #A90E0E",
-",>	c #BA3535",
-"'>	c #CA0101",
-")>	c #5C0303",
-"!>	c #484848",
-"~>	c #AC0000",
-"{>	c #9C8080",
-"]>	c #AB0101",
-"^>	c #510000",
-"/>	c #510404",
-"(>	c #571C1C",
-"_>	c #150000",
-":>	c #C60A0A",
-"<>	c #BE2323",
-"[>	c #B24A4A",
-"}>	c #A57272",
-"|>	c #494040",
-"1>	c #101010",
-"2>	c #1A0606",
-"3>	c #C21A1A",
-"4>	c #C90303",
-"5>	c #9D7979",
-"6>	c #4B0000",
-"7>	c #0C0000",
-"8>	c #C50D0D",
-"9>	c #BC2A2A",
-"0>	c #B14D4D",
-"a>	c #A67171",
-"b>	c #464646",
-"c>	c #151515",
-"d>	c #9E8989",
-"e>	c #A86969",
-"f>	c #B44444",
-"g>	c #BF2121",
-"h>	c #C70404",
-"i>	c #9C7F7F",
-"j>	c #BF0E0E",
-"k>	c #590101",
-"l>	c #2D0101",
-"m>	c #260D0D",
-"n>	c #231919",
-"o>	c #212020",
-"p>	c #202020",
-"q>	c #414141",
-"r>	c #A47474",
-"s>	c #AF5252",
-"t>	c #9C2E2E",
-"u>	c #410000",
-"v>	c #9C8585",
-"w>	c #AC0404",
-"x>	c #302020",
-"y>	c #9F8585",
-"z>	c #5C5B5B",
-"A>	c #828282",
-"B>	c #1D0202",
-"C>	c #C60404",
-"D>	c #9B8A8A",
-"E>	c #AC0808",
-"F>	c #190000",
-"G>	c #C60101",
-"H>	c #C30B0B",
-"I>	c #BD1F1F",
-"J>	c #812828",
-"K>	c #2C2C2C",
-"L>	c #171616",
-"M>	c #9F8383",
-"N>	c #A76868",
-"O>	c #B04B4B",
-"P>	c #B82E2E",
-"Q>	c #C01616",
-"R>	c #C50303",
-"S>	c #AC0D0D",
-"T>	c #C20C0C",
-"U>	c #BB2222",
-"V>	c #B43D3D",
-"W>	c #AB5959",
-"X>	c #A27878",
-"Y>	c #9D8C8C",
-"Z>	c #363636",
-"`>	c #424242",
-" ,	c #171717",
-".,	c #9D8B8B",
-"+,	c #A47171",
-"@,	c #AC5555",
-"#,	c #B53838",
-"$,	c #BD1C1C",
-"%,	c #C40404",
-"&,	c #AC1313",
-"*,	c #2E0000",
-"=,	c #631515",
-"-,	c #595959",
-";,	c #613C3C",
-">,	c #140000",
-",,	c #C00E0E",
-"',	c #B82B2B",
-"),	c #B04747",
-"!,	c #A86464",
-"~,	c #A08080",
-"{,	c #9B9191",
-"],	c #4A4A4A",
-"^,	c #A07F7F",
-"/,	c #683030",
-"(,	c #400000",
-"_,	c #B40000",
-":,	c #AC1717",
-"<,	c #A92C2C",
-"[,	c #A56D6D",
-"},	c #550000",
-"|,	c #9C0707",
-"1,	c #B92323",
-"2,	c #B23D3D",
-"3,	c #AB5858",
-"4,	c #A47272",
-"5,	c #121212",
-"6,	c #5C5C5C",
-"7,	c #3A1616",
-"8,	c #B53333",
-"9,	c #BB1D1D",
-"0,	c #C20404",
-"a,	c #AB2020",
-"b,	c #B00000",
-"c,	c #A83636",
-"d,	c #A37474",
-"e,	c #C20000",
-"f,	c #230000",
-"g,	c #700101",
-"h,	c #050101",
-"i,	c #7F7F7F",
-"j,	c #7E7E7E",
-"k,	c #9B9090",
-"l,	c #9F8484",
-"m,	c #A47070",
-"n,	c #AA5959",
-"o,	c #B04343",
-"p,	c #B62C2C",
-"q,	c #BC1818",
-"r,	c #B10707",
-"s,	c #AA2A2A",
-"t,	c #A64040",
-"u,	c #A17B7B",
-"v,	c #4B2525",
-"w,	c #A76565",
-"x,	c #A07C7C",
-"y,	c #5A5757",
-"z,	c #8F8585",
-"A,	c #0C0B0B",
-"B,	c #A93434",
-"C,	c #A64949",
-"D,	c #9F8181",
-"E,	c #C00101",
-"F,	c #B81F1F",
-"G,	c #B23838",
-"H,	c #AD4D4D",
-"I,	c #603535",
-"J,	c #0C0C0C",
-"K,	c #898989",
-"L,	c #585858",
-"M,	c #656565",
-"N,	c #A73D3D",
-"O,	c #A45353",
-"P,	c #9E8585",
-"Q,	c #BF0404",
-"R,	c #9F8080",
-"S,	c #838383",
-"T,	c #A64747",
-"U,	c #B20000",
-"V,	c #A35D5D",
-"W,	c #9D8989",
-"X,	c #BD0707",
-"Y,	c #939393",
-"Z,	c #161616",
-"`,	c #A55050",
-" '	c #B30000",
-".'	c #A26666",
-"+'	c #9C8C8C",
-"@'	c #BB0B0B",
-"#'	c #BA0F0F",
-"$'	c #2D2D2D",
-"%'	c #212121",
-"&'	c #555555",
-"*'	c #A45A5A",
-"='	c #A07070",
-"-'	c #9B8F8F",
-";'	c #BA0E0E",
-">'	c #B81717",
-",'	c #606060",
-"''	c #262626",
-")'	c #343434",
-"!'	c #292929",
-"~'	c #A26464",
-"{'	c #320000",
-"]'	c #9F7A7A",
-"^'	c #9A9393",
-"/'	c #B81111",
-"('	c #B42525",
-"_'	c #616161",
-":'	c #080808",
-"<'	c #1D1D1D",
-"['	c #686868",
-"}'	c #333333",
-"|'	c #A16E6E",
-"1'	c #715D5D",
-"2'	c #6E6B6B",
-"3'	c #820F0F",
-"4'	c #B03434",
-"5'	c #6F6F6F",
-"6'	c #878787",
-"7'	c #676767",
-"8'	c #131313",
-"9'	c #111111",
-"0'	c #9F7777",
-"a'	c #B50101",
-"b'	c #220000",
-"c'	c #AC4343",
-"d'	c #222222",
-"e'	c #808080",
-"f'	c #9E7E7E",
-"g'	c #B40303",
-"h'	c #3D0000",
-"i'	c #A85252",
-"j'	c #646464",
-"k'	c #565656",
-"l'	c #666666",
-"m'	c #4C4C4C",
-"n'	c #9D8585",
-"o'	c #B50505",
-"p'	c #300000",
-"q'	c #A46161",
-"r'	c #8C8C8C",
-"s'	c #0D0D0D",
-"t'	c #787878",
-"u'	c #9B8C8C",
-"v'	c #B50808",
-"w'	c #280000",
-"x'	c #A17070",
-"y'	c #1A1A1A",
-"z'	c #4D4D4D",
-"A'	c #4F4F4F",
-"B'	c #B50A0A",
-"C'	c #330000",
-"D'	c #520000",
-"E'	c #B60202",
-"F'	c #9E7D7D",
-"G'	c #060606",
-"H'	c #818181",
-"I'	c #2E2E2E",
-"J'	c #181818",
-"K'	c #232323",
-"L'	c #636363",
-"M'	c #2A2A2A",
-"N'	c #6B6B6B",
-"O'	c #4D2020",
-"P'	c #3E0000",
-"Q'	c #353030",
-"R'	c #B50E0E",
-"S'	c #3B0D0D",
-"T'	c #B40606",
-"U'	c #9C8888",
-"V'	c #696969",
-"W'	c #525252",
-"X'	c #A74E4E",
-"Y'	c #B40404",
-"Z'	c #B31818",
-"`'	c #AF2E2E",
-" )	c #A94444",
-".)	c #B30A0A",
-"+)	c #A35E5E",
-"@)	c #B20A0A",
-"#)	c #9A9191",
-"$)	c #B22222",
-"%)	c #AD3838",
-"&)	c #A74B4B",
-"*)	c #B11414",
-"=)	c #A16C6C",
-"-)	c #B00F0F",
-";)	c #9A9292",
-">)	c #B12B2B",
-",)	c #AC4141",
-"')	c #A55252",
-"))	c #AD2323",
-"!)	c #9E7C7C",
-"~)	c #AF1414",
-"{)	c #AF3535",
-"])	c #AA4B4B",
-"^)	c #A35959",
-"/)	c #AA3232",
-"()	c #B20101",
-"_)	c #AE1919",
-":)	c #AD3F3F",
-"<)	c #A85555",
-"[)	c #A26060",
-"})	c #A74141",
-"|)	c #AF0A0A",
-"1)	c #AC1F1F",
-"2)	c #AB4949",
-"3)	c #A65E5E",
-"4)	c #A16767",
-"5)	c #A45050",
-"6)	c #AD1414",
-"7)	c #AB2424",
-"8)	c #A95252",
-"9)	c #A46868",
-"0)	c #9F6E6E",
-"a)	c #A15F5F",
-"b)	c #AA2020",
-"c)	c #A92B2B",
-"d)	c #A75C5C",
-"e)	c #A27171",
-"f)	c #9E7474",
-"g)	c #A82E2E",
-"h)	c #A73232",
-"i)	c #A56565",
-"j)	c #9D7A7A",
-"k)	c #AD0202",
-"l)	c #9D7D7D",
-"m)	c #A53D3D",
-"n)	c #A63939",
-"o)	c #A36F6F",
-"p)	c #BD0202",
-"q)	c #9E8383",
-"r)	c #AC0303",
-"s)	c #A34C4C",
-"t)	c #A44040",
-"u)	c #A17979",
-"v)	c #BC0707",
-"w)	c #9D8888",
-"x)	c #9B8585",
-"y)	c #AA0505",
-"z)	c #A05B5B",
-"A)	c #A34747",
-"B)	c #9F8282",
-"C)	c #BC0B0B",
-"D)	c #9C8D8D",
-"E)	c #A90707",
-"F)	c #A81212",
-"G)	c #9E6B6B",
-"H)	c #A14E4E",
-"I)	c #BB1010",
-"J)	c #A90808",
-"K)	c #A62121",
-"L)	c #9C7A7A",
-"M)	c #A05555",
-"N)	c #BB1515",
-"O)	c #A80A0A",
-"P)	c #A43030",
-"Q)	c #A80404",
-"R)	c #9F5C5C",
-"S)	c #BE0606",
-"T)	c #B91C1C",
-"U)	c #A70D0D",
-"V)	c #A23F3F",
-"W)	c #9A8C8C",
-"X)	c #A60B0B",
-"Y)	c #9E6363",
-"Z)	c #BD1010",
-"`)	c #B72626",
-" !	c #A51414",
-".!	c #A04E4E",
-"+!	c #A51313",
-"@!	c #9D6A6A",
-"#!	c #BA1A1A",
-"$!	c #B43030",
-"%!	c #A41B1B",
-"&!	c #9E5E5E",
-"*!	c #A41D1D",
-"=!	c #9C7171",
-"-!	c #B33A3A",
-";!	c #A22222",
-">!	c #9C6D6D",
-",!	c #A22C2C",
-"'!	c #9C7878",
-")!	c #B72C2C",
-"!!	c #B14343",
-"~!	c #A12929",
-"{!	c #9B7C7C",
-"]!	c #A03B3B",
-"^!	c #B43737",
-"/!	c #AE4D4D",
-"(!	c #A03030",
-"_!	c #9A8A8A",
-":!	c #9E4B4B",
-"<!	c #A30202",
-"[!	c #9A8484",
-"}!	c #B24040",
-"|!	c #AC5656",
-"1!	c #9F3737",
-"2!	c #A10A0A",
-"3!	c #9D5A5A",
-"4!	c #A20606",
-"5!	c #9A8888",
-"6!	c #AF4A4A",
-"7!	c #A96060",
-"8!	c #9E3E3E",
-"9!	c #A01515",
-"0!	c #9C6969",
-"a!	c #AD5353",
-"b!	c #A76A6A",
-"c!	c #9D4545",
-"d!	c #9F2020",
-"e!	c #9B7777",
-"f!	c #A00101",
-"g!	c #9F0D0D",
-"h!	c #998E8E",
-"i!	c #AA5D5D",
-"j!	c #A47373",
-"k!	c #9C4C4C",
-"l!	c #9D2E2E",
-"m!	c #9A8383",
-"n!	c #9F0404",
-"o!	c #9E1010",
-"p!	c #A86767",
-"q!	c #C50202",
-"r!	c #A27C7C",
-"s!	c #9C5353",
-"t!	c #9D3E3E",
-"u!	c #9E0808",
-"v!	c #9D1414",
-"w!	c #A57070",
-"x!	c #A08383",
-"y!	c #9B5A5A",
-"z!	c #9B4D4D",
-"A!	c #9D0E0E",
-"B!	c #9C1818",
-"C!	c #A27A7A",
-"D!	c #C50707",
-"E!	c #9E8A8A",
-"F!	c #9A6161",
-"G!	c #9B1C1C",
-"H!	c #9B1E1E",
-"I!	c #C50909",
-"J!	c #9A6868",
-"K!	c #9A6B6B",
-"L!	c #9B2B2B",
-"M!	c #9B2525",
-"N!	c #C80101",
-"O!	c #C40C0C",
-"P!	c #9A6F6F",
-"Q!	c #9A3A3A",
-"R!	c #9A2C2C",
-"S!	c #9C8F8F",
-"T!	c #C70707",
-"U!	c #C31414",
-"V!	c #997676",
-"W!	c #9A0404",
-"X!	c #998585",
-"Y!	c #9A4949",
-"Z!	c #9A3333",
-"`!	c #C50E0E",
-" ~	c #C01E1E",
-".~	c #997D7D",
-"+~	c #990B0B",
-"@~	c #995858",
-"#~	c #993A3A",
-"$~	c #C31616",
-"%~	c #BD2828",
-"&~	c #998484",
-"*~	c #981313",
-"=~	c #996767",
-"-~	c #984141",
-";~	c #C21D1D",
-">~	c #BB3232",
-",~	c #998B8B",
-"'~	c #971E1E",
-")~	c #984848",
-"!~	c #BF2525",
-"~~	c #B83B3B",
-"{~	c #972D2D",
-"]~	c #984F4F",
-"^~	c #BD2E2E",
-"/~	c #B54545",
-"(~	c #950101",
-"_~	c #973C3C",
-":~	c #975656",
-"<~	c #B93838",
-"[~	c #B24F4F",
-"}~	c #940707",
-"|~	c #940B0B",
-"1~	c #B74141",
-"2~	c #AF5858",
-"3~	c #940E0E",
-"4~	c #975A5A",
-"5~	c #941A1A",
-"6~	c #976464",
-"7~	c #B44B4B",
-"8~	c #AC6262",
-"9~	c #941515",
-"0~	c #976969",
-"a~	c #942929",
-"b~	c #976B6B",
-"c~	c #B15555",
-"d~	c #A96B6B",
-"e~	c #931C1C",
-"f~	c #977777",
-"g~	c #943838",
-"h~	c #977272",
-"i~	c #AD5E5E",
-"j~	c #A67575",
-"k~	c #932323",
-"l~	c #988383",
-"m~	c #954747",
-"n~	c #910101",
-"o~	c #977979",
-"p~	c #AA6868",
-"q~	c #A27F7F",
-"r~	c #922A2A",
-"s~	c #955656",
-"t~	c #900202",
-"u~	c #977D7D",
-"v~	c #A77171",
-"w~	c #923131",
-"x~	c #900E0E",
-"y~	c #966565",
-"z~	c #8F0404",
-"A~	c #A47B7B",
-"B~	c #923838",
-"C~	c #901C1C",
-"D~	c #967474",
-"E~	c #8E0606",
-"F~	c #D00303",
-"G~	c #923F3F",
-"H~	c #902B2B",
-"I~	c #978484",
-"J~	c #8E0808",
-"K~	c #924646",
-"L~	c #913A3A",
-"M~	c #8C0404",
-"N~	c #8D0A0A",
-"O~	c #9D8D8D",
-"P~	c #CE0B0B",
-"Q~	c #CA1616",
-"R~	c #924D4D",
-"S~	c #924949",
-"T~	c #8C1010",
-"U~	c #8C0B0B",
-"V~	c #CD1010",
-"W~	c #C72020",
-"X~	c #925454",
-"Y~	c #935858",
-"Z~	c #8D1B1B",
-"`~	c #8C1111",
-" {	c #C32929",
-".{	c #925B5B",
-"+{	c #946767",
-"@{	c #8D2828",
-"#{	c #8C1919",
-"${	c #C91C1C",
-"%{	c #C03434",
-"&{	c #936262",
-"*{	c #957777",
-"={	c #8E3737",
-"-{	c #8B1F1F",
-";{	c #978686",
-">{	c #8F4646",
-",{	c #8C2626",
-"'{	c #C22F2F",
-"){	c #B94747",
-"!{	c #947070",
-"~{	c #989494",
-"{{	c #915555",
-"]{	c #8C2D2D",
-"^{	c #BF3939",
-"/{	c #B55050",
-"({	c #870B0B",
-"_{	c #926464",
-":{	c #8C3434",
-"<{	c #B25A5A",
-"[{	c #957E7E",
-"}{	c #881A1A",
-"|{	c #947373",
-"1{	c #8D3B3B",
-"2{	c #B84C4C",
-"3{	c #AF6464",
-"4{	c #8A2929",
-"5{	c #968181",
-"6{	c #840101",
-"7{	c #8D4242",
-"8{	c #B45656",
-"9{	c #AB6D6D",
-"0{	c #978C8C",
-"a{	c #8B3838",
-"b{	c #840808",
-"c{	c #8E4949",
-"d{	c #B15F5F",
-"e{	c #978F8F",
-"f{	c #830404",
-"g{	c #8D4747",
-"h{	c #841010",
-"i{	c #8E5050",
-"j{	c #A38181",
-"k{	c #830A0A",
-"l{	c #8F5757",
-"m{	c #851818",
-"n{	c #8F5858",
-"o{	c #A97373",
-"p{	c #916666",
-"q{	c #862626",
-"r{	c #8F5E5E",
-"s{	c #A67B7B",
-"t{	c #D70505",
-"u{	c #821414",
-"v{	c #937575",
-"w{	c #883535",
-"x{	c #906565",
-"y{	c #A38282",
-"z{	c #D50C0C",
-"A{	c #821919",
-"B{	c #958484",
-"C{	c #8A4444",
-"D{	c #916C6C",
-"E{	c #D21414",
-"F{	c #831F1F",
-"G{	c #7F0505",
-"H{	c #8C5353",
-"I{	c #927373",
-"J{	c #D70909",
-"K{	c #CF1B1B",
-"L{	c #842424",
-"M{	c #8F6262",
-"N{	c #937A7A",
-"O{	c #D70C0C",
-"P{	c #CD2222",
-"Q{	c #842B2B",
-"R{	c #811B1B",
-"S{	c #917171",
-"T{	c #948181",
-"U{	c #D31414",
-"V{	c #C92B2B",
-"W{	c #853232",
-"X{	c #832828",
-"Y{	c #947E7E",
-"Z{	c #7C0303",
-"`{	c #968888",
-" ]	c #D01D1D",
-".]	c #C53535",
-"+]	c #863939",
-"@]	c #853737",
-"#]	c #968989",
-"$]	c #7B0707",
-"%]	c #CC2727",
-"&]	c #C13F3F",
-"*]	c #864040",
-"=]	c #884646",
-"-]	c #7B0A0A",
-";]	c #C83131",
-">]	c #BD4949",
-",]	c #874747",
-"']	c #8A5555",
-")]	c #7C1414",
-"!]	c #790404",
-"~]	c #C43A3A",
-"{]	c #B95252",
-"]]	c #884E4E",
-"^]	c #8D6464",
-"/]	c #7F2424",
-"(]	c #7A0B0B",
-"_]	c #C04444",
-":]	c #B55C5C",
-"<]	c #895555",
-"[]	c #907373",
-"}]	c #823333",
-"|]	c #7A1313",
-"1]	c #BC4E4E",
-"2]	c #B16565",
-"3]	c #8B5C5C",
-"4]	c #750101",
-"5]	c #938181",
-"6]	c #854242",
-"7]	c #7B1919",
-"8]	c #B85757",
-"9]	c #AC6F6F",
-"0]	c #8C6363",
-"a]	c #760808",
-"b]	c #885151",
-"c]	c #7C2020",
-"d]	c #B46161",
-"e]	c #8D6A6A",
-"f]	c #771010",
-"g]	c #8B6161",
-"h]	c #7D2828",
-"i]	c #E00101",
-"j]	c #A48282",
-"k]	c #8F7171",
-"l]	c #791818",
-"m]	c #8E7070",
-"n]	c #7E2E2E",
-"o]	c #DF0505",
-"p]	c #A28787",
-"q]	c #917878",
-"r]	c #7C2626",
-"s]	c #927F7F",
-"t]	c #7F3535",
-"u]	c #A67E7E",
-"v]	c #DE0A0A",
-"w]	c #803C3C",
-"x]	c #A18888",
-"y]	c #DC0F0F",
-"z]	c #938484",
-"A]	c #710202",
-"B]	c #824444",
-"C]	c #710505",
-"D]	c #824343",
-"E]	c #DA1414",
-"F]	c #948787",
-"G]	c #710606",
-"H]	c #865353",
-"I]	c #741313",
-"J]	c #834A4A",
-"K]	c #E30202",
-"L]	c #D71A1A",
-"M]	c #958B8B",
-"N]	c #710A0A",
-"O]	c #8A6262",
-"P]	c #782222",
-"Q]	c #855252",
-"R]	c #DF0B0B",
-"S]	c #D32323",
-"T]	c #710D0D",
-"U]	c #8E7171",
-"V]	c #7B3131",
-"W]	c #865858",
-"X]	c #DB1515",
-"Y]	c #CF2D2D",
-"Z]	c #711010",
-"`]	c #6D0303",
-" ^	c #917E7E",
-".^	c #7F4141",
-"+^	c #885F5F",
-"@^	c #D71F1F",
-"#^	c #CA3737",
-"$^	c #711414",
-"%^	c #6D0707",
-"&^	c #948989",
-"*^	c #835050",
-"=^	c #8A6767",
-"-^	c #D32828",
-";^	c #C64141",
-">^	c #711717",
-",^	c #6D0B0B",
-"'^	c #875F5F",
-")^	c #C14A4A",
-"!^	c #721E1E",
-"~^	c #701515",
-"{^	c #8B6E6E",
-"]^	c #8E7474",
-"^^	c #C93B3B",
-"/^	c #BD5454",
-"(^	c #742525",
-"_^	c #742424",
-":^	c #907D7D",
-"<^	c #907C7C",
-"[^	c #C44646",
-"}^	c #B85E5E",
-"|^	c #762C2C",
-"1^	c #793434",
-"2^	c #670101",
-"3^	c #928282",
-"4^	c #C04F4F",
-"5^	c #B36767",
-"6^	c #783333",
-"7^	c #7D4343",
-"8^	c #969191",
-"9^	c #690A0A",
-"0^	c #BB5959",
-"a^	c #AE7171",
-"b^	c #793A3A",
-"c^	c #6C1616",
-"d^	c #660202",
-"e^	c #958E8E",
-"f^	c #B66262",
-"g^	c #E90101",
-"h^	c #AA7979",
-"i^	c #7B4141",
-"j^	c #866161",
-"k^	c #702222",
-"l^	c #680808",
-"m^	c #B16C6C",
-"n^	c #A68080",
-"o^	c #7D4848",
-"p^	c #8B7070",
-"q^	c #680D0D",
-"r^	c #AC7676",
-"s^	c #E80606",
-"t^	c #A28888",
-"u^	c #7F4F4F",
-"v^	c #793F3F",
-"w^	c #691212",
-"x^	c #979393",
-"y^	c #A77F7F",
-"z^	c #E70808",
-"A^	c #9F8F8F",
-"B^	c #815656",
-"C^	c #7E4E4E",
-"D^	c #6A1717",
-"E^	c #E60B0B",
-"F^	c #835D5D",
-"G^	c #630505",
-"H^	c #6C1D1D",
-"I^	c #EB0404",
-"J^	c #E31212",
-"K^	c #856464",
-"L^	c #886C6C",
-"M^	c #6D2222",
-"N^	c #E70B0B",
-"O^	c #DE1C1C",
-"P^	c #886B6B",
-"Q^	c #6C2222",
-"R^	c #8E7B7B",
-"S^	c #6E2828",
-"T^	c #E41313",
-"U^	c #D92525",
-"V^	c #8A7272",
-"W^	c #713232",
-"X^	c #723434",
-"Y^	c #E01A1A",
-"Z^	c #D52F2F",
-"`^	c #8C7878",
-" /	c #774141",
-"./	c #774343",
-"+/	c #DC2121",
-"@/	c #CF3939",
-"#/	c #8E7D7D",
-"$/	c #7C5151",
-"%/	c #D82A2A",
-"&/	c #CA4242",
-"*/	c #908383",
-"=/	c #846464",
-"-/	c #836363",
-";/	c #D33434",
-">/	c #C54C4C",
-",/	c #928888",
-"'/	c #8A7474",
-")/	c #8C7979",
-"!/	c #C05656",
-"~/	c #948D8D",
-"{/	c #918585",
-"]/	c #C84747",
-"^/	c #BA5F5F",
-"//	c #C35050",
-"(/	c #B56969",
-"_/	c #BE5A5A",
-":/	c #B07373",
-"</	c #B86464",
-"[/	c #AA7C7C",
-"}/	c #B36D6D",
-"|/	c #A48686",
-"1/	c #AD7777",
-"2/	c #F40101",
-"3/	c #F30404",
-"4/	c #F00A0A",
-"5/	c #F10909",
-"6/	c #EA1414",
-"7/	c #EF0E0E",
-"8/	c #E51D1D",
-"9/	c #EC1313",
-"0/	c #DF2727",
-"a/	c #E91818",
-"b/	c #DA3131",
-"c/	c #D43A3A",
-"d/	c #DE2B2B",
-"e/	c #CE4444",
-"f/	c #D93535",
-"g/	c #C94D4D",
-"h/	c #D23E3E",
-"i/	c #C35757",
-"j/	c #CD4848",
-"k/	c #C75252",
-"l/	c #C15B5B",
-"m/	c #B07474",
-"n/	c #BB6565",
-"o/	c #AA7E7E",
-"p/	c #B56E6E",
-"q/	c #A48888",
-"r/	c #A08F8F",
-"s/	c #9B9797",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            . +                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            @ #                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            $ %                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            & *                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            = -                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ; >                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            , '                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ) !                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ~ {                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ] ^                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            / (                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            _ :                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          + < [                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          } | 1                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          2 3 4                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          5 6 7                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          8 9 0                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          a b c +                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          d e e f                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          g h h i                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          j h h k                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          l m m n                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          o m m p                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          q r r s                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          t u u v                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          w u u x                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          y z z A                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        + B z z C                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        D E F F G                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        # H I I J                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        K L I I M                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        N O P P Q                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        R P P P S +                                                                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                                                                        T U U U V K                                                                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                                                                        W U U U X Y                                                                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                                                                        Z ` ` `  ...                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        +.` ` ` @.#.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        $.%.%.%.%.&.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        *.=.=.=.=.-.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        ;.=.=.=.=.>.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        ,.'.'.'.'.).                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        !.'.'.'.'.~.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        {.].].].].^.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        /.].].].].(.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        _.:.:.:.:.<.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        [.}.}.}.}.|.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        1.}.}.}.}.2.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                      3.4.4.4.4.4.5.6.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      7.4.4.4.4.4.8.3.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      9.0.0.0.0.0.a.b.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      c.0.0.0.0.0.d.7.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      e.f.f.f.f.f.g.h.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      i.j.j.j.j.j.j.k.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      l.j.j.j.j.j.j.m.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      n.o.o.o.o.o.o.p.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      q.o.o.o.o.o.o.r.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      s.t.t.t.t.t.t.u.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      v.w.w.w.w.w.w.x.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      y.w.w.w.w.w.w.z.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      A.B.B.B.B.B.B.C.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      D.B.B.B.B.B.B.E.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                    + F.G.G.G.G.G.G.H.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                    I.J.G.G.G.G.G.G.K.6.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    L.M.N.N.N.N.N.N.O.P.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    Q.R.N.N.N.N.N.N.S.T.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    U.V.W.W.W.W.W.W.X.Y.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    Z.`.`.`.`.`.`.`. +.+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ++`.`.`.`.`.`.`.`.@+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    #+$+$+$+$+$+$+$+$+U.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    %+$+$+$+$+$+$+$+$+&+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    *+=+=+=+=+=+=+=+=+-+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ;+=+=+=+=+=+=+=+=+>+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ,+'+'+'+'+'+'+'+'+)+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    !+~+~+~+~+~+~+~+~+{+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ]+~+~+~+~+~+~+~+~+^+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    /+(+(+(+(+(+(+(+(+_+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  6.:+(+(+(+(+(+(+(+(+<+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  T.[+}+}+}+}+}+}+}+}+|+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  1+2+}+}+}+}+}+}+}+}+3+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  4+5+6+6+6+6+6+6+6+6+7+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  8+9+0+0+0+0+0+0+0+0+a+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  b+0+0+0+0+0+0+0+0+0+c+6.                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  d+e+e+e+e+e+e+e+e+e+e+1+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  f+e+e+e+e+e+e+e+e+e+e+g+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  h+i+i+i+i+i+i+i+i+i+i+j+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  k+l+l+l+l+l+l+l+l+l+l+m+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  n+l+l+l+l+l+l+l+l+l+l+o+                                                                                                                                                                                                                                                                                      ",
-"                                                                          + p+q+r+s+t+u+v+w+x+y+z+                                                                                                                                                                                                A+B+B+B+B+B+B+B+B+B+B+C+                                                                                                                                                                                              + D+E+F+G+H+I+J+K+L+M+N+                                                                ",
-"                                                                    O+P+Q+R+S+T+U+V+W+X+M+                                                                                                                                                                                                        Y+B+B+B+B+B+B+B+B+B+B+Z+                                                                                                                                                                                                      `+ @.@+@@@#@$@%@&@*@=@+                                                         ",
-"                                                              N+-@;@>@,@#@,@'@)@!@N+                                                                                                                                                                                                              ~@{@{@{@{@{@{@{@{@{@{@]@                                                                                                                                                                                                              ^@/@(@_@:@:@<@[@}@|@                                                    ",
-"                                                          |@1@2@3@:@:@3@4@5@6@                                                                                                                                                                                                                    7@{@{@{@{@{@{@{@{@{@{@8@                                                                                                                                                                                                                  + M+9@0@a@a@a@<@4@b@+                                               ",
-"                                                    c@d@e@f@a@a@a@g@h@i@                                                                                                                                                                                                                        6.j@k@k@k@k@k@k@k@k@k@k@l@                                                                                                                                                                                                                        m@n@o@p@p@p@p@q@r@z+                                          ",
-"                                                  s@t@u@p@p@p@v@w@d@                                                                                                                                                                                                                            x@y@k@k@k@k@k@k@k@k@k@k@z@                                                                                                                                                                                                                            A@B@C@D@D@D@D@E@F@m@                                      ",
-"                                              G@H@I@D@D@D@D@J@K@+                                                                                                                                                                                                                               L@M@N@N@N@N@N@N@N@N@N@N@O@                                                                                                                                                                                                                                M+P@Q@R@R@R@R@S@T@                                    ",
-"                                            T@U@R@R@R@R@R@V@M+                                                                                                                                                                                                                                  W@X@Y@Y@Y@Y@Y@Y@Y@Y@Y@Y@Z@                                                                                                                                                                                                                                  `@ #.#+#+#+#+#@###O+                                ",
-"                                        6@$#%#R@R@R@R@%#&#c@                                                                                                                                                                                                                                    *#=#Y@Y@Y@Y@Y@Y@Y@Y@Y@Y@-#                                                                                                                                                                                                                                      ;#>#,#,#,#,#,#'#)#                              ",
-"                                      !#~#+#+#+#+#+#{#]#                                                                                                                                                                                                                                        ^#/#/#/#/#/#/#/#/#/#/#/#(#_#                                                                                                                                                                                                                                      :#<#[#[#[#[#[#}#|#c@                          ",
-"                                    1#2#,#,#,#,#,#3#4#+                                                                                                                                                                                                                                         5#/#/#/#/#/#/#/#/#/#/#/#X@6#                                                                                                                                                                                                                                        7#8#9#9#9#9#9#0#a#c@                        ",
-"                                  ;#b#[#[#[#[#[#c#d#+                                                                                                                                                                                                                                           e#f#f#f#f#f#f#f#f#f#f#f#g#h#                                                                                                                                                                                                                                          i#j#9#9#9#9#9#k#a#                        ",
-"                                l#m#9#9#9#9#9#9#n#o#                                                                                                                                                                                                                                            p#f#f#f#f#f#f#f#f#f#f#f#q#r#                                                                                                                                                                                                                                            s#t#u#u#u#u#u#u#v#+                     ",
-"                              O+w#u#u#u#u#u#u#x#y#                                                                                                                                                                                                                                              z#A#A#A#A#A#A#A#A#A#A#A#B#C#                                                                                                                                                                                                                                            + D#E#E#E#E#E#E#F#G#                    ",
-"                            c@H#E#E#E#E#E#E#E#I#                                                                                                                                                                                                                                                J#K#K#K#K#K#K#K#K#K#K#K#K#e#                                                                                                                                                                                                                                              L#M#N#N#N#N#N#N#M#O#                  ",
-"                            P#Q#N#N#N#N#N#N#R#S#                                                                                                                                                                                                                                                T#K#K#K#K#K#K#K#K#K#K#K#K#U#                                                                                                                                                                                                                                                V#W#W#W#W#W#W#W#X#N+                ",
-"                          z+Y#W#W#W#W#W#W#W#Z#                                                                                                                                                                                                                                                  `# $ $ $ $ $ $ $ $ $ $ $ $.$                                                                                                                                                                                                                                                +$@$#$#$#$#$#$#$#$$$                ",
-"                          %$#$#$#$#$#$#$#$&$*$                                                                                                                                                                                                                                                  =$ $ $ $ $ $ $ $ $ $ $ $ $-$                                                                                                                                                                                                                                                  ;$>$>$>$>$>$>$>$,$z+              ",
-"                        '$,$>$>$>$>$>$>$>$)$O+                                                                                                                                                                                                                                                  !$~$~$~$~$~$~$~$~$~$~$~$~${$                                                                                                                                                                                                                                                  ]$^$^$^$^$^$^$^$^$]$              ",
-"                        /$^$^$^$^$^$^$^$^$($                                                                                                                                                                                                                                                    _$~$~$~$~$~$~$~$~$~$~$~$~$:$                                                                                                                                                                                                                                                  <$[$[$[$[$[$[$[$[$}$`@            ",
-"                        |$^$^$^$^$^$^$^$^$1$                                                                                                                                                                                                                                                    2$3$3$3$3$3$3$3$3$3$3$3$3$4$                                                                                                                                                                                                                                                  6@5$6$6$6$6$6$6$6$5$7$            ",
-"                      O+8$[$[$[$[$[$[$[$[$9$                                                                                                                                                                                                                                                    0$a$a$a$a$a$a$a$a$a$a$a$a$b$                                                                                                                                                                                                                                                    c$d$d$d$d$d$d$d$d$e$            ",
-"                      f$6$6$6$6$6$6$6$6$6$g$                                                                                                                                                                                                                                                    h$a$a$a$a$a$a$a$a$a$a$a$a$i$                                                                                                                                                                                                                                                    j$k$k$k$k$k$k$k$k$l$            ",
-"                      m$d$d$d$d$d$d$d$d$d$n$                                                                                                                                                                                                                                                  6.o$p$p$p$p$p$p$p$p$p$p$p$p$q$                                                                                                                                                                                                                                                    r$k$k$k$k$k$k$k$k$s$6@          ",
-"                      t$k$k$k$k$k$k$k$k$k$u$                                                                                                                                                                                                                                                  v$p$p$p$p$p$p$p$p$p$p$p$p$p$w$x@                                                                                                                                                                                                                                                  x$y$y$y$y$y$y$y$y$z$A$          ",
-"                      B$y$y$y$y$y$y$y$y$y$C$                                                                                                                                                                                                                                                  D$E$E$E$E$E$E$E$E$E$E$E$E$E$F$G$                                                                                                                                                                                                                                                H$I$J$J$J$J$J$J$J$J$K$L$          ",
-"                      M$J$J$J$J$J$J$J$J$J$N$L$                                                                                                                                                                                                                                                O$P$P$P$P$P$P$P$P$P$P$P$P$P$Q$R$                                                                                                                                                                                                                                                S$T$T$T$T$T$T$T$T$T$T$U$          ",
-"                      V$T$T$T$T$T$T$T$T$T$T$W$N+                                                                                                                                                                                                                                              X$P$P$P$P$P$P$P$P$P$P$P$P$P$Y$Z$                                                                                                                                                                                                                                              `$ %.%.%.%.%.%.%.%.%.%+%L$          ",
-"                      @%.%.%.%.%.%.%.%.%.%.%#%$%%%&%*%=%                                                                                                                                                                                                                                      -%;%;%;%;%;%;%;%;%;%;%;%;%;%>%,%                                                                                                                                                                                                                                            '%)%!%!%!%!%!%!%!%!%!%!%~%{%          ",
-"                      ]%!%!%!%!%!%!%!%!%!%^%/%(%_%_%_%:%<%[%                                                                                                                                                                                                                                  }%;%;%;%;%;%;%;%;%;%;%;%;%;%;%|%                                                                                                                                                                                                                                        c@1%2%#%#%#%#%#%#%#%#%#%#%#%3%`@          ",
-"                      4%5%#%#%#%#%#%#%#%6%7%_%_%_%_%_%_%_%8%=%                                                                                                                                                                                                                                9%0%0%0%0%0%0%0%0%0%0%0%0%0%0%a%                                                                                                                                                                                                                                      {%b%c%d%d%d%d%d%d%d%d%d%d%d%d%e%            ",
-"                        f%d%d%d%d%d%d%g%h%_%_%_%_%_%_%_%_%_%i%j%                                                                                                                                                                                                                              k%0%0%0%0%0%0%0%0%0%0%0%0%0%0%l%                                                    m%n%n%n%n%n%o%                                                                                                                                            =%n%n%n%n%n%n%n%n%n%p%q%r%s%s%s%s%s%s%s%s%s%s%s%s%s%t%u%            ",
-"                        v%w%d%d%d%d%d%~+_%_%_%_%_%_%_%_%_%_%x%y%                                                                                                                                                                                                                              z%A%A%A%A%A%A%A%A%A%A%A%A%A%A%B%                                                    C%_%_%_%_%_%D%                                                                                                                                    j%E%F%G%_%_%_%_%_%_%_%_%_%_%_%_%H%I%}.J%K%K%K%K%K%K%K%K%K%K%L%              ",
-"                        + M%s%s%s%s%s%N%_%_%_%_%_%_%_%_%_%_%_%O%P%`@                                                                                                                                                                                                                          Q%A%A%A%A%A%A%A%A%A%A%A%A%A%A%R%                                                    C%_%_%_%_%_%D%                                                                                                                                  S%T%U%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%V%A%W%W%W%W%W%W%W%W%X%Y%              ",
-"                          4%Z%K%K%K%K%`%_%_%_%_%_%_%_%_%_%_%_%f. &.&+&@&                                                                                                                                                                                                                      #&$&$&$&$&$&$&$&$&$&$&$&$&$&$&%&                                                    C%_%_%_%_%_%D%                                                                                                                                &&*&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%=&P$-&-&-&-&-&-&;&>&                ",
-"                            ,&'&W%W%W%)&_%_%_%_%_%_%_%_%_%_%_%B+W%W%W%!&~&{&N+                                                                                                                                                                                                                ]&^&^&^&^&^&^&^&^&^&^&^&^&^&^&/&                                                    C%_%_%_%_%_%D%                                                                                                                                (&_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%:&<&-&-&-&-&-&[&`@                ",
-"                              }&|&-&-&l+_%_%_%_%_%_%_%_%_%_%1&2&-&-&-&-&-&-&3&4&5&6&+                                                                                                                                                                                                         7&^&^&^&^&^&^&^&^&^&^&^&^&^&^&8&                                                    C%_%_%_%_%_%D%                                                                                                                              9&0&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%a&b&b&b&b&c&N+                  ",
-"                                d&e&b&f&I%_%_%_%_%_%_%_%_%_%r g&b&b&b&b&b&b&b&b&b&h&i&j&Y%k&                                                                                                                                                                                                  l&m&m&m&m&m&m&m&m&m&m&m&m&m&m&n&                                                    C%_%_%_%_%_%D%                                                                                                                              *%_%_%_%_%_%_%o&V%p&p&p&p&p&p&p&p&p&q&H%_%_%_%_%_%r&s&g&g&t&u&                    ",
-"                                  P%v&g&w&x&_%_%_%_%_%_%H%)&y&g&g&g&g&g&g&g&g&g&g&g&g&g&z&A&B&C&D&                                                                                                                                                                                          x@E&m&m&m&m&m&m&m&m&m&m&m&m&m&m&]&+                                                   C%_%_%_%_%_%D%                                                                                                                        F&G&H&I&_%_%_%_%_%r&J&K&L&L&L&L&L&L&L&L&s&M&}.H%_%_%_%_%(%N&O&P&k&                      ",
-"                                    Q&R&S&2&T&1&_%_%_%U&'+f&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&V&A&W&X&Y&+                                                                                                                                                                                 Z&`& * * * * * * * * * * * * * *.*6.                                                  C%_%_%_%_%_%D%                                                                                                                +*@*#*$*%*&***=*_%_%_%_%_%z ************************s&q&_%_%_%_%H%-*;*`@                        ",
-"                                      `@>*,***'*)* *N&g%**************************************************!*~*H&{*@&c@                                                                                                                                                                      ]*^* * * * * * * * * * * * * * */*(*                                                  C%_%_%_%_%_%D%                                                                                                      N+_*:*<*[*}*g%g%g%g%g%g%|*_%_%_%_%_%N.g%g%g%g%g%g%g%g%g%g%g%g%g%I%_%_%_%_%_%1*                            ",
-"                                          2*3*g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%4*5*6*;*{*4%c@                                                                                                                                                            7*8*9*9*9*9*9*9*9*9*9*9*9*9*9*9*0*L@                                                  C%_%_%_%_%_%D%                                                                                            a*Y&b*c*d*e*f*g*g*g*g*g*g*g*g*g*g*h*i*i*i*i*i*`.g*g*g*g*g*g*g*g*g*g*g*g*g*j*_%_%_%_%_%k*                            ",
-"                                        l*m*n*o*(+(+(+(+(+(+p*g*g*g*g*g*g*g*g*g*g*g*g*g*g*g*g*g*L&y&y&y&y&y&y&y&y&y&y&f&g*q*r*3*s*t*2*u*+                                                                                                                                                   v*w*x*x*x*x*x*x*x*x*x*x*x*x*x*x*y*z*                                                  C%_%_%_%_%_%D%                                                                                  a*A*B*C*D*E*F*f&f&f&f&f&f&f&f&f&f&f&f&f&f&f&G*H*H*H*H*H*M&f&f&f&f&f&f&f&f&f&f&f&f&f&j*_%_%_%_%_%k*                            ",
-"                                        I*_%_%_%_%_%_%_%_%_%=+f&f&f&f&f&f&f&f&f&f&f&f&f&J*j.K*L*M*:&:&:&:&:&:&:&:&:&:&q&N*O*B+P*f&f&Q*R*S*T*U*V*W*6&                                                                                                                                        X*x*x*x*x*x*x*x*x*x*x*x*x*x*x*x*w*Y*                                                  C%_%_%_%_%_%D%                                                                      `@Z*`* =.=+=@=#=L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&I%_%_%_%_%_%k*                            ",
-"                                        I*_%_%_%_%_%_%_%_%_%$+f&f&f&f&f&f&f&f&f&f&f&$=%=&=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%r&i+'*f&f&f&f&f&f&f&Q**=D*==-=;=>=+*`@j%=%,='=)=)=)=)=)=)=)=)=)=)=!=~={=                            9&]=)=)=)=)=)=                          o%)=)=)=)=)=^=    /=(=(=(=(=(=(=(=(=(=(=(=;%w.0.0.0._=)=)=)=)=)=)=)='=,=o%j%                            C%_%_%_%_%_%D%                    m%'=)=)=)=)=)=:=                    N+6&<=[=}=|=.*1=p$p$p$p$p$p$p$p$p$p$2=3=y&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&4= =5=_%_%_%_%_%k*                            ",
-"                                        I*_%_%_%_%_%_%_%_%_%$+L&L&L&L&L&L&L&L&L&L&6=7=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%8=9=0=L&L&L&L&L&L&L&s&s&s&s&s&a=b=c=d=:%_%_%_%_%_%_%_%_%_%_%_%_%_%e=f=g=9&                        h=G%_%_%_%_%_&                          i=_%_%_%_%_%j=    k=(=(=(=(=(=(=(=(=(=(=$&I%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l=m=n=                          C%_%_%_%_%_%D%                  S%o=_%_%_%_%_%_&E%      p=q=r=s=t=u=v=w=x='*x*y=z=_%_%_%_%_%_%_%_%_%_%_%_%_%(%A=A#K&'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*b=B=q=  C=_%_%_%_%_%k*                            ",
-"                                        D=_%_%_%_%_%_%_%_%_%E=F=G=s&s&s&s&s&s&s&2&H=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%I=K&s&s&s&s&s&s&s&'*'*'*'*'*j.&=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%J=K=                      h=G%_%_%_%_%_&                          i=_%_%_%_%_%j=    L=M=M=M=M=M=M=M=M=M=M==+H%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%x%N=&&                      C%_%_%_%_%_%D%                j%O=_&_%_%_%_%_%P=Q=R=S=T=U=V=W='*'*'*'*'*X=u (%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%8=O*<&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&Y=Z=`=      C=_%_%_%_%_%k*                            ",
-"                                        D=_%_%_%_%_%_%_%_%_% -+ .-+-x='*'*'*'*'*@-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%H%4.'*'*'*'*'*'*y&y&y&y&y&`.8=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%#-$-+                   h=G%_%_%_%_%_&                          i=_%_%_%_%_%j=    %-M=M=M=M=M=M=M=M=M=M='._%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_&N=                      C%_%_%_%_%_%D%            F&&-*-_&_%_%_%_%_%_%=---y&y&y&y&y&y&y&y&y&y&;-u H%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%>-P*;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-,-'-)-          C=_%_%_%_%_%k*                            ",
-"                                        i%_%_%_%_%_%_%_%_%_% -      !-~-{-]-y&2=H%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%z=3=y&y&y&y&y&y&y&y&y&^-1&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%/-(-_-:-<-[-}-|-1-2-3-4-G%_%_%_%_%_&                          i=_%_%_%_%_%j=    5-6-6-6-6-6-6-6-6-6-6-t._%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%x%7-                    C%_%_%_%_%_%8-9-0-a-b-c-d-e-A#f-_%_%_%_%_%_%p&g-;-;-;-;-;-;-;-;-;-;-;-m&8=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o.;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-h-i-j-+               C=_%_%_%_%_%k*                            ",
-"                                        i%_%_%_%_%_%_%_%_%_% -          p=k-l-m-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%G.;-;-;-;-;-;-;-;-;-T&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%=&n-;-;-;-;-;-;-;-;-h-o-p-_%_%_%_%_&q-r-2-6&p=                i=_%_%_%_%_%j=    s-2=2=2=2=2=2=2=2=2=2=a$t-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%u-j%+ +*q=v-w-x-y-z-A-B-_%_%_%_%_%/-P*P*P*P*P*P*M=C-_%_%_%_%_%_%7%D-P*P*P*P*P*P*P*P*P*P*P*P*K*_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%r&--P*P*P*P*P*P*P*P*P*P*P*P*P*P*P*E-F-G-u*                    H-_%_%_%_%_%l*                            ",
-"                                        i%_%_%_%_%_%_%_%_%_% -                I-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%J-P*P*P*P*P*P*P*P*K-L-_%_%_%_%_%(%M-N-N%N%N%N%N%N%N%N%O-1&_%_%_%_%_%_%N.P*P*P*P*P*P*P*P*P*J*M*_%_%_%_%H%P*P-Q-R-S-F-T-U-V-W-X-Y-Z-`-_%_%_%_%_%j=     ;2=2=2=2=2=2=2=2=2=2=2=B.y=.;.;.;+;@;@;@;@;@;#;$;%;&;_%_%_%_%_%*;=;-;;;>;,;K&K&K&K&K&f._%_%_%_%_%';K&K&K&K&K&^-h%_%_%_%_%_%_%);p$K&K&K&K&K&K&K&K&K&K&K&K&!;(%_%_%_%_%_%H%~;N-N-N-N-N-N-N-N-N-y=q&_%_%_%_%_%H%E$K&K&K&K&K&K&K&K&K&K&K&K&K&;;{;];k&                      ^;/;_%_%_%_%e=(;                            ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              [%:%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%=-K&K&K&K&K&K&K&K&n-);_%_%_%_%_%N@X=K&K&K&K&K&K&K&K&K&X=x*t-_%_%_%_%_%:;K&K&K&K&K&K&K&K&K&J*M*_%_%_%_%H%K&K&K&K&K&K&K&K&K&K&K&K&<;[;_%_%_%_%_%j=    };J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&|;        p=1;2;3;4;o&_%_%_%_%_%(=X=X=X=X=X=X=X=X=X=f._%_%_%_%_%';X=X=X=X=5;H=_%_%_%_%_%_%f-~+X=X=X=X=X=X=X=X=X=X=X=X=X=6-_%_%_%_%_%H%].M&X=X=X=X=X=X=X=X=X=X=6;7;_%_%_%_%_%4.X=X=X=X=X=X=X=X=X=X=2;8;Y-+*          n%9;9;9;9;9;9;9;0;a;_%_%_%_%_%l==%                            ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              K=b;_%_%_%_%_%_%_%_%i*m %.%.%.%.%.%.%.%.c;_%_%_%_%_%_%_%_%_%x&X=X=X=X=X=X=X=X=d;H%_%_%_%_%M*X=X=X=X=X=X=X=X=X=X=X=X=X=e;_%_%_%_%_%/%X=X=X=X=X=X=X=X=X=^%M*_%_%_%_%H%X=X=X=X=X=X=X=X=X=X=X=X=X=P$_%_%_%_%_%j=  + f;J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&g;        `@h;J%J%$=N*_%_%_%_%_%A#J%J%J%J%J%J%J%J%J%0._%_%_%_%_%';J%J%J%K-K*_%_%_%_%_%_%H%` J%J%J%J%J%J%J%J%J%J%J%J%J%J% $_%_%_%_%_%i;K-J%J%J%J%J%J%J%J%J%J%J%J%@-_%_%_%_%_%%=J%J%J%J%J%J%j;k;l;m;a*                *%_%_%_%_%_%_%_%_%_%_%_%_%_%_%m=                              ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%o;p;q;r;J%J%J%J%J%J%^&_%_%_%_%_%_%_%_%_%p&J%J%J%J%J%J%J%J%6%H%_%_%_%_%s;J%J%J%J%J%J%J%J%J%J%J%J%J%B._%_%_%_%_%t;J%J%J%J%J%J%J%J%J%g-:&_%_%_%_%H%J%J%J%J%J%J%J%J%J%J%J%J%J%E$_%_%_%_%_%j=  u;v;w;w;w;w;w;w;w;w;w;w;w;w;w;w;w;w;x;        + y;0=0=0=7=_%_%_%_%_%/#0=0=0=0=0=0=0=0=0=0._%_%_%_%_%z;0=0=$=T&_%_%_%_%_%_%_%A;M&0=0=0=0=0=0=0=0=0=0=0=0=0=0=A#_%_%_%_%_%B;0=0=0=0=0=0=0=0=0=0=0=0=0=a&_%_%_%_%_%C;0=0=0=D;E;F;G;)-                      *%_%_%_%_%_%_%_%_%_%_%_%_%_%e=n=                              ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%+ H;I;J;K;0=0=0=$&_%_%_%_%_%_%_%_%_%p&0=0=0=0=0=0=0=0=L;H%_%_%_%_%s;0=0=0=0=0=0=0=0=0=0=0=0=0=B._%_%_%_%_%t;0=0=0=0=0=0=0=0=0=M;:&_%_%_%_%H%0=0=0=0=0=0=0=0=0=0=0=0=0=E$_%_%_%_%_%j=  z*N;O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;P;          Q;M&M&M&7=_%_%_%_%_%Y@M&M&M&M&M&M&M&M&M&4._%_%_%_%_%z;M&M&].8=_%_%_%_%_%_%y=R;M&M&M&M&M&M&M&M&M&M&M&M&M&M&M&A#_%_%_%_%_%S;M&M&M&M&M&M&M&M&M&M&M&M&M&a&_%_%_%_%_%C;T;U;V;W;X;                            *%_%_%_%_%_%_%_%_%_%_%_%_%_%Y;                                ",
-"                                        Z;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%        )-`; >.>+>_%_%_%_%_%_%_%_%_%p&M&M&M&M&M&M&M&M&)*H%_%_%_%_%L-M&M&M&M&M&M&M&M&M&M&M&M&M&B._%_%_%_%_%t;M&M&M&M&M&M&M&M&M&H*:&_%_%_%_%H%M&M&M&M&M&M&M&M&M&M&M&M&M&p$_%_%_%_%_%j=  @>#>O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;$>          %>$=$=$=7=_%_%_%_%_%N@$=$=$=$=$=$=$=$=$=4._%_%_%_%_%T&$=l+i*_%_%_%_%_%_%H=M;$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=f#_%_%_%_%_%S;$=$=$=$=$=$=$=$=$=$=$=$=$=e;_%_%_%_%_%&>*>`@                                  *%_%_%_%_%_%_%_%_%_%_%_%_%_%e=n=                              ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                =>_%_%_%_%_%_%_%_%_%p&M&M&M&M&M&$=$=$=)*H%_%_%_%_%L-$=$=$=$=$=$=$=$=$=$=$=$=$=w._%_%_%_%_%t;$=$=$=$=$=$=$=$=$=6=:&_%_%_%_%H%$=$=$=$=$=$=$=$=$=$=$=$=$=a$_%_%_%_%_%j=  ->;>D-D-D-D-D-D-D-D-D-D-D-D-D-D-D-D->>          ,>$=$=$=7=_%_%_%_%_%N@$=$=$=$=$=$=$=$=$=}._%_%_%_%_%T&$&z=_%_%_%_%_%_%p&^-$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=/#_%_%_%_%_%S;K-K-K-K-K-K-K-K-K-K-K-K-'>)>_%_%_%_%_%!>                                      *%_%_%_%_%_%_%_%_%_%_%_%_%_%_%u-                              ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%p&$=$=$=$=$=K-K-K-~>H%_%_%_%_%L-K-K-K-K-K-K-K-K-K-K-K-K-K-w._%_%_%_%_%>-K-K-K-K-K-K-K-K-K-n-:&_%_%_%_%H%K-K-K-K-K-K-K-K-K-K-K-K-K-a$_%_%_%_%_%j=  {>]>D-D-D-D-D-D-D-D-D-D-D-0%4.|*^>^>/>!>!>!>!>!>(>C;=*'.p&_%_%_%_%_%k@K-K-K-K-K-K-K-K-K-:._%_%_%_%_%y=_>_%_%_%_%_%_%:&6-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-Y@_%_%_%_%_%S;<&<&<&<&<&<&<&<&<&:><>[>}>|>_%_%_%_%_%!>                                      n%N=N=N=N=N=N=9;0;1>_%_%_%_%_%l=o%                            ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%2>3>4>K-K-K-K-<&<&D-H%_%_%_%_%L-<&<&<&<&<&<&<&<&<&<&<&<&<&t._%_%_%_%_%>-<&<&<&<&<&<&<&<&<&n-:&_%_%_%_%H%<&<&<&<&<&<&<&<&<&<&<&<&<&3$_%_%_%_%_%j=  5>~>~>~>~>~>~>~>~>~>~>$&6>7>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%{@<&<&<&<&<&<&<&<&<&:._%_%_%_%_%H%_%_%_%_%_%_%=&A#<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&Y@_%_%_%_%_%B;----------8>9>0>a>q=      b>_%_%_%_%_%!>                                                        ,=/;_%_%_%_%e=,=                            ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>p=d>e>f>g>h>----O;H%_%_%_%_%L---------------------------t._%_%_%_%_%>-------------------6;:&_%_%_%_%H%--------------------------~$_%_%_%_%_%j=  i>~>~>~>~>~>~>~>~>~> $h%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%{@------------------]._%_%_%_%_%_%_%_%_%_%_%f-N.G*--------------------------------------N@_%_%_%_%_%B;G*j>k>l>m>n>o>p>p>p>p>p>p>0&_%_%_%_%_%!>                                                          H-_%_%_%_%_%l*                            ",
-"                                        q>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>          a*r>s>t>_%_%_%_%_%L---------------------------o._%_%_%_%_%u>------------------N&:&_%_%_%_%H%--------------------------~$_%_%_%_%_%j=  v>w>)*)*)*)*)*)*)*^&h%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%B+G*G*G*G*G*G*G*G*G*]._%_%_%_%_%_%_%_%_%_%_%z;G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*k@_%_%_%_%_%x>y>z>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        q>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_%B>C>G*G*G*G*G*G*G*G*G*G*G*G*o._%_%_%_%_%u>G*G*G*G*G*G*G*G*G*w&:&_%_%_%_%H%G*G*G*G*G*G*G*G*G*G*G*G*G* $_%_%_%_%_%j=  D>E>)*)*)*)*)*)*)*6>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l+2&2&2&2&2&2&2&2&2&'._%_%_%_%_%_%_%_%_%_%_%F>x*2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&G>H>I>J>_%_%_%_%_%K>  I*_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        q>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_%L>M>N>O>P>Q>R>2&2&2&2&2&2&2&j._%_%_%_%_%u>2&2&2&2&2&2&2&2&2&p*:&_%_%_%_%H%2&2&2&2&2&2&2&2&2&2&2&2&2&K#_%_%_%_%_%j=  z*S>L;L;L;L;L;L;$&7>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l+R;R;R;R;R;R;R;R;R;'._%_%_%_%_%_%_%_%_%_%_%_%V%9*R;R;R;R;R;R;R;R;R;R;R;R;T>U>V>W>X>Y>+ )=_%_%_%_%_%K>  Z>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        `>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,        u;.,+,@,#,$,%,R;R;f._%_%_%_%_%u>R;R;R;R;R;R;R;R;R;^-:&_%_%_%_%H%R;R;R;R;R;R;R;R;R;R;R;R;R;K#_%_%_%_%_%j=  u;&,6%6%6%6%6%6%o._%_%_%_%_%_%*,|*r =,-,-,-,-,-,;,:.|*7>_%_%_%_%_%_%i+!;!;!;!;!;!;!;!;!;=._%_%_%_%_%_%_%_%_%_%_%_%_%>,x*!;!;!;!;!;!;,,',),!,~,{,+           )=_%_%_%_%_%K>  ],_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        `>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                    p=^,!,/,_%_%_%_%_%(,!;!;!;!;!;!;!;!;!;_,:&_%_%_%_%H%!;!;!;!;!;!;!;!;!;!;!;!;!;A#_%_%_%_%_%j=  + :,6%6%6%6%6%6%C;_%_%_%_%_%~;6%6%6%<,          [,5;5;p$o&_%_%_%_%_%i+5;5;5;5;5;5;5;5;5;=._%_%_%_%_%},'.f-_%_%_%_%_%_%q&|,1,2,3,4,Y>                        )=_%_%_%_%_%K>  n%5,U%U%U%U%U%U%U%U%U%U%U%U%U%U%U%U%<%                                                          C=_%_%_%_%_%k*                            ",
-"                                        D%_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%7,8,9,j>0,5;5;5;5;5;_,:&_%_%_%_%H%5;5;5;5;5;5;5;5;5;5;5;5;5;f#_%_%_%_%_%j=    a,b,b,b,b,b,b,},_%_%_%_%_%9=b,b,b,c,          d,e,e,^%f,_%_%_%_%_%e+e,e,e,e,e,e,e,e,e,%._%_%_%_%_%A;3=g,h,_%_%_%_%_%_%1>n=                                )=_%_%_%_%_%K>    m%i,j,j,j,j,j,j,j,j,j,j,j,j,j,j,j,K=                                                          C=_%_%_%_%_%k*                            ",
-"                                        D%_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=  + k,l,m,n,o,p,q,r,C-_%_%_%_%H%e,e,e,e,e,e,e,e,e,e,e,e,e,f#_%_%_%_%_%j=    s,b,b,b,b,b,b,},_%_%_%_%_%|*b,b,b,t,          u,3=3=3==-_%_%_%_%_%0+3=3=3=3=3=3=3=3=3=%._%_%_%_%_%v,w,x,y,U%_%_%_%_%_%_%a;n=                              )=_%_%_%_%_%K>                                                                                                  C=_%_%_%_%_%k*                            ",
-"                                        D%_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                p=z,A,_%_%_%_%H%3=3=3=3=3=3=3=3=3=3=3=3=3=/#_%_%_%_%_%j=    B,d;d;d;d;d;d;},_%_%_%_%_%|*d;d;d;C,          D,E,J*J*=-_%_%_%_%_%0+J*J*J*J*J*J*F,G,H,I,_%_%_%_%_%D%    j% -_&_%_%_%_%_%_%J,E%                            )=_%_%_%_%_%K>                                                            K,&%L,M,=%                            C=_%_%_%_%_%k*                            ",
-"                                        O=_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                  h=G%_%_%_%_%H%J*J*J*J*J*J*J*J*J*J*J*J*J*Y@_%_%_%_%_%j=    N,d;d;d;d;d;d;},_%_%_%_%_%e;d;d;d;O,          P,Q,J*J*=-_%_%_%_%_%6+J*J*J*J*J*E,R,    C%_%_%_%_%_%D%        6,x%_%_%_%_%_%_%G%!=                          )=_%_%_%_%_%K>                                                          l*x%_%_%_%G%S,                          C=_%_%_%_%_%k*                            ",
-"                                        O=_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                  h=G%_%_%_%_%H%^%^%^%^%^%^%^%^%^%^%^%^%^%N@_%_%_%_%_%j=    T,U,U,U,U,U,U,9=_%_%_%_%_%e;U,U,U,V,          W,X,^%g-=-_%_%_%_%_%}+^%^%^%^%^%X,W,    C%_%_%_%_%_%D%        j%6,x%_%_%_%_%_%_%J,l*                        )=_%_%_%_%_%K>                                                          T%_%_%_%_%_%6,                          C=_%_%_%_%_%k*                            ",
-"                                        O=_%_%_%_%_%_%_%_%_%m=Y,            K=b;_%_%_%_%_%_%_%_%e=D=b>b>b>b>b>b>b>b>m=_%_%_%_%_%_%_%_%_%Z,                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                  h=G%_%_%_%_%H%g-g-g-g-g-g-g-g-g-g-g-g-g-N@_%_%_%_%_%j=    `, ' ' ' ' ' '9=_%_%_%_%_%e; ' ' '.'          +'@'g-g-=-_%_%_%_%_%}+g-g-g-g-g-#'k,    C%_%_%_%_%_%D%          j%(&x%_%_%_%_%_%_%G%k*                      )=_%_%_%_%_%K>                                                          q>_%_%_%_%_%L,                          C=_%_%_%_%_%k*                            ",
-"                                        T%_%_%_%_%_%_%_%_%_%_%$'Y,          S%:%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%%'                A>_&_%_%_%_%H-                          &'_%_%_%_%_%o=                  h=G%_%_%_%_%H%n-M;M;M;M;M;M;M;M;M;M;M;M;k@_%_%_%_%_%j=    *' ' ' ' ' ' '9=_%_%_%_%_%T& ' ' '='          -';'M;6;L*_%_%_%_%_%(+M;M;M;M;M;>'6.    C%_%_%_%_%_%D%            j%,'e=_%_%_%_%_%_%l=l*                    )=_%_%_%_%_%Y;                                                          q>_%_%_%_%_%&'                          H-_%_%_%_%_%k*                            ",
-"                                        T%_%_%_%_%_%_%_%_%_%_%_%''=%           ,_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%)'                n%/;_%_%_%_%e=n;                      9&!'_%_%_%_%_%o=                  m%1>_%_%_%_%_%A#M;M;M;M;M;M;M;M;M;M;M;M;k@_%_%_%_%_%j=    ~'_,_,_,_,_,_,C;_%_%_%_%_%{' '_,_,]'          ^'/'H*l+8=_%_%_%_%_%N@H*H*H*H*H*('      C%_%_%_%_%_%D%                _'x%_%_%_%_%_%_%:']=                  ^=_%_%_%_%_%1>=%                                                        <%_%_%_%_%_%@;j%                      n=x%_%_%_%_%e=E%                            ",
-"                                        b>_%_%_%_%_%_%_%_%_%_%_%_%_;          `>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%g=                =%a;_%_%_%_%_%<'6,)='='='='='='='='=['}'_&_%_%_%_%_%o=                  j%j=_%_%_%_%_%F>P }+6+6+6+6+6+6+6+6+6+6+h _%_%_%_%_%j=    |'_,_,_,_,_,_,f._%_%_%_%_%_%N%t.=+1''='='='='=2'3'm t-_%_%_%_%_%8=x*6=6=6=6=6=4'      C%_%_%_%_%_%D%                j%_'/;_%_%_%_%_%_%:%5'                6'_%_%_%_%_%_%!'&%'='='='='='='='='='='='='='='='=5'S%                  6,_%_%_%_%_%U%_;7''='='='='='='='=)=-,8'_%_%_%_%_%b;K,                            ",
-"                                        k*:'_%_%_%_%_%_%_%_%_%_%_%9'[%        n=_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%G%o%                  u-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                    T%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    0'a'^-^-^-^-^-^&=&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%b'p*n-n-n-n-n-c'      C%_%_%_%_%_%D%                  j%&%/;_%_%_%_%_%_%J=                   ,_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%/;n%                  n%_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%d'j%                            ",
-"                                          %%/;_%_%_%_%_%_%_%_%_%_%9'Y,          @;_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%L,                    '=e=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                    e'/;_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    f'g'^-^-^-^-^-_,h'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%%.6;6;6;6;6;6;i'      C%_%_%_%_%_%D%                      j'e=_%_%_%_%_%!'                  k'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%/;n%                    u-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j'                              ",
-"                                            l'/;_%_%_%_%_%_%_%_%_%m=            o%C=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_&I*&&                    j%F%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                      m'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    n'o'p*p*p*p*p*p*0%M*_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%p'U,N&N&N&N&N&N&q'      C%_%_%_%_%_%D%                        M,/;_%_%_%_%!'                  Y,%'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%:'r'                    A>s'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%$'j%                              ",
-"                                              ,'U%_%_%_%_%_%_%_%b;t'              y%d'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%e=0;S%                        [%J=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                      &&I*_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    u'v'w&w&w&w&w&w&w&6+t-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%w'M=w&w&w&w&w&w&w&x'      C%_%_%_%_%_%D%                          M,b;_%_%_%!'                    y%y'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%<'j%                      5's'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%''o%                                ",
-"                                                M,:%_%_%_%_%_%x%,'                  m%z'G%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%y'7'j%                            S%A'G%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                        && -9'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    u;B'w&w&w&w&w&w&w&w&3$C'8=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%1&D')*p*p*p*p*p*p*p*E'F'      C%_%_%_%_%_%D%                            M,G'_%_%!'                      r'i%x%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%:%k*                          i,K>_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l=<%m%                                  ",
-"                                                  H'I'_&_%_%J'*%                        K=,'F%K'Z,8'8'8'8'8'8'8'8'8'8'J'''`>'=S%                                    r'L'O=@;)')')')')')')')')')'I*M'_%_%_%_%_%o=                            :=N'O'>-P'P'P'P'P'P'P'P'P'P'P'P'h'Q')')')'b>      R'N&N&N&N&N&N&N&N&N&^-3$e )&P'S')')')')')')')'7,y=I=].x*^-^-^-^-^-^-^-^-^-T'U'      )=)')')')')','                              V')')'A'                        j%n%-,q>@;)')')')')')')')')')'F%I*0;m'_'K,                              &&^;W'i%)')')')')')')')')')'Z>D%g=K=                                      ",
-"                                                      ~='=,=j%                                                                                                                                    6,_%_%_%_%_%o=                                X'^-^-^-^-^-^-^-^-^-^-^-^-^-Y'-'              Z'N&N&N&N&N&N&N&N&N&N&N&N&N&N&`'               )^-^-^-^-^-^-^-^-^-^-^-^-^-.)u;                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                +)_,_,_,_,_,_,_,_,_,_,_,_,_,@)#)              $)6;6;6;6;6;6;6;6;6;6;6;6;6;6;%)              &)_,_,_,_,_,_,_,_,_,_,_,_,_,*)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                =) ' ' ' ' ' ' ' ' ' ' ' ' '-);)              >)n-n-n-n-n-n-n-n-n-n-n-n-n-n-,)              ') ' ' ' ' ' ' ' ' ' ' ' ' '))                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                !)U,U,U,U,U,U,U,U,U,U,U,U,U,~)u;              {)n-n-n-n-n-n-n-n-n-n-n-n-n-n-])              ^)U,U,U,U,U,U,U,U,U,U,U,U,U,/)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                D>()U,U,U,U,U,U,U,U,U,U,U,U,_)_#              :)6=6=6=6=6=6=6=6=6=6=6=6=6=6=<)              [)d;d;d;d;d;d;d;d;d;d;d;d;d;})                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                #)|)d;d;d;d;d;d;d;d;d;d;d;d;1)6.              2)6=6=6=6=6=6=6=6=6=6=6=6=6=6=3)              4)b,b,b,b,b,b,b,b,b,b,b,b,b,5)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                u;6)b,b,b,b,b,b,b,b,b,b,b,b,7)                8)H*H*H*H*H*H*H*H*H*H*H*H*H*H*9)              0)6%6%6%6%6%6%6%6%6%6%6%6%6%a)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                + b)6%6%6%6%6%6%6%6%6%6%6%6%c)                d)H*H*H*H*H*H*H*H*H*H*H*H*H*H*e)              f)L;L;L;L;L;L;L;L;L;L;L;L;L;0)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  g)L;L;L;L;L;L;L;L;L;L;L;L;h)                i)M;M;M;M;M;M;M;M;M;M;M;M;M;M;x,              j)k))*)*)*)*)*)*)*)*)*)*)*)*l)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  m))*)*)*)*)*)*)*)*)*)*)*)*n)                o)M;M;M;M;M;M;M;M;M;M;M;M;M;p)q)              {>r)~>~>~>~>~>~>~>~>~>~>~>~>u'                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  s)~>~>~>~>~>~>~>~>~>~>~>~>t)                u)g-g-g-g-g-g-g-g-g-g-g-g-g-v)w)              x)y)D-D-D-D-D-D-D-D-D-D-D-;>+                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  z)D-D-D-D-D-D-D-D-D-D-D-D-A)                B)^%^%^%^%^%^%^%^%^%^%^%^%^%C)D)              D>E)O;O;O;O;O;O;O;O;O;O;O;F)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                  i,L,L,L,L,L,)=                                  G)O;O;O;O;O;O;O;O;O;O;O;O;H)                +'^%^%^%^%^%^%^%^%^%^%^%^%^%I)X;              z*J)O;O;O;O;O;O;O;O;O;O;O;K)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  L)w;w;w;w;w;w;w;w;w;w;w;w;M)                p=J*J*J*J*J*J*J*J*J*J*J*J*J*N)`@              x@O)w;w;w;w;w;w;w;w;w;w;w;P)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  x)Q)J&J&J&J&J&J&J&J&J&J&J&R)                  S)J*J*J*J*J*J*J*J*J*J*J*J*T)                + U)J&J&J&J&J&J&J&J&J&J&J&V)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  W)X)2=2=2=2=2=2=2=2=2=2=2=Y)                  Z)3=3=3=3=3=3=3=3=3=3=3=3=`)                   !2=2=2=2=2=2=2=2=2=2=2=.!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  (*+!2=2=2=2=2=2=2=2=2=2=2=@!                  #!3=3=3=3=3=3=3=3=3=3=3=3=$!                  %!6-6-6-6-6-6-6-6-6-6-6-&!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    *!6-6-6-6-6-6-6-6-6-6-6-=!                  1,e,e,e,e,e,e,e,e,e,e,e,e,-!                  ;!M=M=M=M=M=M=M=M=M=M=M=>!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    ,!M=M=M=M=M=M=M=M=M=M=M='!                  )!5;5;5;5;5;5;5;5;5;5;5;5;!!                  ~!(=(=(=(=(=(=(=(=(=(=(={!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    ]!(=(=(=(=(=(=(=(=(=(=(=7*                  ^!5;5;5;5;5;5;5;5;5;5;5;5;/!                  (!x*x*x*x*x*x*x*x*x*x*w*_!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    :!x*x*x*x*x*x*x*x*x*x*<![!                  }!!;!;!;!;!;!;!;!;!;!;!;!;|!                  1!9*9*9*9*9*9*9*9*9*9*2!G$                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    3!9*9*9*9*9*9*9*9*9*9*4!5!                  6!!;!;!;!;!;!;!;!;!;!;!;!;7!                  8! * * * * * * * * * *9!(*                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    0! * * * * * * * * * *E&Y*                  a!R;R;R;R;R;R;R;R;R;R;R;R;b!                  c!m&m&m&m&m&m&m&m&m&m&d!+                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                    e!f!m&m&m&m&m&m&m&m&m&g!h!                  i!R;R;R;R;R;R;R;R;R;R;R;R;j!                  k!^&^&^&^&^&^&^&^&^&^&l!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                    m!n!^&^&^&^&^&^&^&^&^&o!L@                  p!2&2&2&2&2&2&2&2&2&2&2&q!r!                  s!^&^&^&^&^&^&^&^&^&^&t!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                    h!u!$&$&$&$&$&$&$&$&$&v!x@                  w!G*G*G*G*G*G*G*G*G*G*G*C>x!                  y!$&$&$&$&$&$&$&$&$&$&z!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                    + A!A%A%A%A%A%A%A%A%A%B!+                   C!G*G*G*G*G*G*G*G*G*G*G*D!E!                  F!A%A%A%A%A%A%A%A%A%A%B%                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      G!0%0%0%0%0%0%0%0%0%H!                    x!----------------------I!{,                  J!0%0%0%0%0%0%0%0%0%0%K!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      L!0%0%0%0%0%0%0%0%0%M!                    Y>N!--------------------O!+                   P!;%;%;%;%;%;%;%;%;%;%O$                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      Q!;%;%;%;%;%;%;%;%;%R!                    S!T!<&<&<&<&<&<&<&<&<&<&U!                    V!P$P$P$P$P$P$P$P$P$W!X!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      Y!P$P$P$P$P$P$P$P$P$Z!                    X;`!K-K-K-K-K-K-K-K-K-K- ~                    .~E$E$E$E$E$E$E$E$E$+~v$                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      @~E$E$E$E$E$E$E$E$E$#~                    F&$~K-K-K-K-K-K-K-K-K-K-%~                    &~p$p$p$p$p$p$p$p$p$*~(*                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      =~p$p$p$p$p$p$p$p$p$-~                    `@;~$=$=$=$=$=$=$=$=$=$=>~                    ,~a$a$a$a$a$a$a$a$a$'~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                      V!a$a$a$a$a$a$a$a$a$)~                      !~$=$=$=$=$=$=$=$=$=$=~~                    L@3$3$3$3$3$3$3$3$3${~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                      X!3$3$3$3$3$3$3$3$3$]~                      ^~M&M&M&M&M&M&M&M&M&M&/~                    + (~~$~$~$~$~$~$~$~$_~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                      (*(~~$~$~$~$~$~$~$~$:~                      <~M&M&M&M&M&M&M&M&M&M&[~                      }~ $ $ $ $ $ $ $ $T#                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        |~ $ $ $ $ $ $ $ $.$                      1~0=0=0=0=0=0=0=0=0=0=2~                      3~ $ $ $ $ $ $ $ $4~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        5~K#K#K#K#K#K#K#K#6~                      7~0=0=0=0=0=0=0=0=0=0=8~                      9~K#K#K#K#K#K#K#K#0~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        a~A#A#A#A#A#A#A#A#b~                      c~J%J%J%J%J%J%J%J%J%J%d~                      e~A#A#A#A#A#A#A#B#f~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        g~f#f#f#f#f#f#f#f#h~                      i~X=X=X=X=X=X=X=X=X=X=j~                      k~f#f#f#f#f#f#f#q#l~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        m~f#f#f#f#f#f#f#n~o~                      p~X=X=X=X=X=X=X=X=X=X=q~                      r~/#/#/#/#/#/#/#X@1+                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        s~/#/#/#/#/#/#/#t~u~                      v~K&K&K&K&K&K&K&K&K&K&u*                      w~Y@Y@Y@Y@Y@Y@Y@x~+                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                        y~Y@Y@Y@Y@Y@Y@Y@z~l~                      A~K&K&K&K&K&K&K&K&K&K&X;                      B~N@N@N@N@N@N@N@C~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        D~N@N@N@N@N@N@N@E~h#                      &-E-P*P*P*P*P*P*P*P*F~                        G~k@k@k@k@k@k@k@H~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        I~k@k@k@k@k@k@k@J~1+                      2-Q-P*P*P*P*P*P*P*P*R-                        K~{@{@{@{@{@{@{@L~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        6#M~{@{@{@{@{@{@N~T.                      O~P~;-;-;-;-;-;-;-;-Q~                        R~B+B+B+B+B+B+B+S~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        T.T~B+B+B+B+B+B+U~+                       +*V~y&y&y&y&y&y&y&y&W~                        X~l+l+l+l+l+l+l+Y~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        _#Z~l+l+l+l+l+l+`~                        `@_-y&y&y&y&y&y&y&y& {                        .{i+i+i+i+i+i+i++{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          @{i+i+i+i+i+i+#{                          ${'*'*'*'*'*'*'*'*%{                        &{i+i+i+i+i+i+i+*{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          ={e+e+e+e+e+e+-{                          T='*'*'*'*'*'*'*'*+-                        f+e+e+e+e+e+e+e+;{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          >{0+0+0+0+0+0+,{                          '{s&s&s&s&s&s&s&s&){                        !{0+0+0+0+0+0+c+~{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          {{6+6+6+6+6+6+]{                          ^{s&s&s&s&s&s&s&s&/{                        *{6+6+6+6+6+6+({                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          _{6+6+6+6+6+6+:{                          ==L&L&L&L&L&L&L&L&<{                        [{}+}+}+}+}+}+}{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          |{}+}+}+}+}+}+1{                          2{f&f&f&f&f&f&f&f&3{                        @+(+(+(+(+(+(+4{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          5{6{(+(+(+(+(+7{                          8{f&f&f&f&f&f&f&f&9{                        0{~+~+~+~+~+~+a{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          4+b{~+~+~+~+~+c{                          d{g*g*g*g*g*g*g*g*W*                        e{f{'+'+'+'+'+g{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          I.h{'+'+'+'+'+i{                          b*g*g*g*g*g*g*g*g*j{                        I.k{=+=+=+=+=+l{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          + m{=+=+=+=+=+n{                          o{g%g%g%g%g%g%g%g%>=                        T.3'$+$+$+$+$+p{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            q{$+$+$+$+$+r{                          s{&*************t{6&                        ~{u{`.`.`.`.`.v{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            w{`.`.`.`.`.x{                          y{,*************z{)-                        P.A{W.W.W.W.W.B{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            C{W.W.W.W.W.D{                          D&V&S&S&S&S&S&S&E{F&                        6.F{W.W.W.W.G{e{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            H{N.N.N.N.N.I{                          @&J{S&S&S&S&S&S&K{k&                          L{N.N.N.N.S.T.                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            M{G.G.G.G.G.N{                          `@O{g&g&g&g&g&g&P{+                           Q{G.G.G.G.R{D                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                            S{B.B.B.B.B.T{                            U{g&g&g&g&g&g&V{                            W{B.B.B.B.X{                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                            Y{Z{B.B.B.B.`{                             ]b&b&b&b&b&b&.]                            +]w.w.w.w.@]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                            #]$]w.w.w.w.e{                            %]b&b&b&b&b&b&&]                            *]t.t.t.t.=]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                            ~{-]t.t.t.t.D                             ;]-&-&-&-&-&-&>]                            ,]o.o.o.o.']                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              )]o.o.o.!]                              ~]W%W%W%W%W%W%{]                            ]]j.j.j.j.^]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              /]j.j.j.(]                              _]W%W%W%W%W%W%:]                            <]f.f.f.f.[]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              }]f.f.f.|]                              1]K%K%K%K%K%K%2]                            3]0.0.0.4]5]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              6]0.0.0.7]                              8]K%K%K%K%K%K%9]                            0]4.4.4.a]7.                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              b]4.4.4.c]                              d]s%s%s%s%s%s%v%                            e]}.}.}.f]K                                                                                                                                                                                                                                                   ",
-"                                                                                                                                                                                                                                                              g]}.}.}.h]                              `$s%s%s%s%s%i]j]                            k]}.}.}.l]+                                                                                                                                                                                                                                                   ",
-"                                                                                                                                                                                                                                                              m]:.:.:.n]                              }&d%d%d%d%d%o]p]                            q]:.:.:.r]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                              s]].].].t]                              u]#%#%#%#%#%v]4%                            s]].].].t]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                              b.'.'.'.w]                              x]#%#%#%#%#%y]@&                            z]A]'.'.B]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                              + C]'.'.D]                              @&!%!%!%!%!%E]N+                            F]G]=.=.H]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                I]=.=.J]                              + K]!%!%!%!%L]                              M]N]%.%.O]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                P]%.%.Q]                                R].%.%.%.%S]                              b.T]` ` U]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                V]` ` W]                                X]T$T$T$T$Y]                              3.Z]U `] ^                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                .^U U +^                                @^T$T$T$T$#^                              P.$^P %^&^                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                *^P P =^                                -^J$J$J$J$;^                              + >^I ,^~{                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                '^I I Z                                 M$J$J$J$J$)^                                !^F ~^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                {^F F ]^                                ^^y$y$y$y$/^                                (^z _^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                :^z z <^                                [^y$y$y$y$}^                                |^z 1^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                5 2^u 3^                                4^k$k$k$k$5^                                6^u 7^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                8^9^r &^                                0^d$d$d$d$a^                                b^r o                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                # c^d^e^                                f^d$d$d$g^h^                                i^m j^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                + k^l^2                                 m^6$6$6$8$n^                                o^h p^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                  O%q^3.                                r^6$6$6$s^t^                                u^e k                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                  v^w^x^                                y^[$[$[$z^A^                                B^%=e^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                  C^D^}                                 L#[$[$[$E^o#                                F^G^+                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                  F^H^.                                 A^I^^$^$J^                                  K^|                                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                                  L^M^+                                 @&N^^$^$O^                                  P^Q^                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                  R^S^                                  6@T^>$>$U^                                  V^W^                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                  8 X^                                  o#Y^#$#$Z^                                  `^ /                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                  e^./                                  + +/#$#$@/                                  #/,                                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                                  } $/                                    %/W#W#&/                                  */=/                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                    -/                                    ;/W#W#>/                                  ,/'/                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                    )/                                    H#N#N#!/                                  ~/{/                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                    %                                     ]/N#N#^/                                  # }                                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                                                                          //E#E#(/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          _/u#u#:/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          </u#u#[/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          }/9#9#|/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          1/9#9#A^                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          1#c#2/c@                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          =@3/4/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          ^@5/6/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          A^7/8/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          6@9/0/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          + a/b/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            S@c/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            d/e/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            f/g/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            h/i/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            j/n@                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            k/X+                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            l/m/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            n/o/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            p/q/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                             @r/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            M+`+                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            s/+                                                                                                                                                                                                                                                                                                 "};

From dc60cb45b2bc7358d556df80c56c4dd0288f6cc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Apr 2024 23:22:45 +0200
Subject: [PATCH 0313/2040] Fixed scripts using syntax like $self

---
 code/parser/bison_source.txt |  2 +-
 code/parser/parsetree.cpp    |  9 +++++++++
 code/parser/parsetree.h      | 13 +++++++++++++
 code/script/scriptcompiler.h | 12 ------------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index e5d393ef..a4e1d4ce 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -294,7 +294,7 @@ identifier
 	;
 
 listener_identifier
-	: identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+	: identifier_prim { $$ = node_listener($1, TOKPOS(@1)); }
 	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
 	;
 
diff --git a/code/parser/parsetree.cpp b/code/parser/parsetree.cpp
index a139f2fc..30b9d7d0 100644
--- a/code/parser/parsetree.cpp
+++ b/code/parser/parsetree.cpp
@@ -342,3 +342,12 @@ sval_u node6(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4, sval_
 
     return val;
 }
+
+sval_u node_listener(sval_u val1, sval_u val2)
+{
+    if (!str::icmp(val1.stringValue, "self")) {
+        return node2(ENUM_listener, node1_(method_self), val2);
+    } else {
+        return node2(ENUM_string, val1, val2);
+    }
+}
diff --git a/code/parser/parsetree.h b/code/parser/parsetree.h
index f2769266..53133513 100644
--- a/code/parser/parsetree.h
+++ b/code/parser/parsetree.h
@@ -101,6 +101,18 @@ enum parseStage_e {
     PS_BODY_END
 };
 
+enum {
+    method_game,
+    method_level,
+    method_local,
+    method_parm,
+    method_self,
+    method_group,
+    method_owner,
+    method_field,
+    method_array,
+};
+
 void   parsetree_freeall();
 void   parsetree_init();
 size_t parsetree_length();
@@ -124,6 +136,7 @@ sval_u node3(int type, sval_u val1, sval_u val2, sval_u val3);
 sval_u node4(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4);
 sval_u node5(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4, sval_u val5);
 sval_u node6(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4, sval_u val5, sval_u val6);
+sval_u node_listener(sval_u val1, sval_u val2);
 
 typedef struct parse_pos_s {
     int sourcePos;
diff --git a/code/script/scriptcompiler.h b/code/script/scriptcompiler.h
index 48592872..34c53dcc 100644
--- a/code/script/scriptcompiler.h
+++ b/code/script/scriptcompiler.h
@@ -32,18 +32,6 @@ class ScriptVariable;
 
 typedef void (*ScriptDisplayTokenFunc)(const char *type, const char *name);
 
-enum {
-    method_game,
-    method_level,
-    method_local,
-    method_parm,
-    method_self,
-    method_group,
-    method_owner,
-    method_field,
-    method_array,
-};
-
 typedef struct scriptmacro {
     str name;
     str parameters;

From a23de7b3611fa74a3b8e39c73405b5efc7ba50ee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 9 Apr 2024 23:39:32 +0200
Subject: [PATCH 0314/2040] Made Killed() a virtual method

---
 code/fgame/entity.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.h b/code/fgame/entity.h
index cd9b1f12..4e8fd2f1 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -502,7 +502,7 @@ public:
     void         BroadcastAIEvent(int iType = AI_EVENT_MISC, float rad = SOUND_RADIUS);
     void         BroadcastAIEvent(Event *ev);
     void         Kill(Event *ev);
-    void         Killed(Event *ev);
+    virtual void Killed(Event *ev);
     void         SurfaceModelEvent(Event *ev);
     void         SurfaceCommand(const char *surf_name, const char *token);
     virtual void Postthink(void);

From fa80e0bd75a4a72073b512933d81ead6fc877081 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 00:05:00 +0200
Subject: [PATCH 0315/2040] Implemented FencePost

---
 code/fgame/Entities.cpp | 123 ++++++++++++++++++++++++++++++++++++----
 code/fgame/Entities.h   |   4 ++
 code/fgame/bg_public.h  |   2 +-
 3 files changed, 118 insertions(+), 11 deletions(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 67d59f00..4f4a279e 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -80,7 +80,8 @@ Event EV_PG_MaxDuration
     "Sets the maximum duration of bursts(in seconds)\nDefault=3",
     EV_NORMAL
 );
-Event EV_PG_MinNumShots(
+Event EV_PG_MinNumShots
+(
     "MinNumShots",
     EV_DEFAULT,
     "i",
@@ -88,7 +89,8 @@ Event EV_PG_MinNumShots(
     "Sets the minimum # of shots to fire in a cycle\nDefault=1",
     EV_NORMAL
 );
-Event EV_PG_MaxNumShots(
+Event EV_PG_MaxNumShots
+(
     "MaxNumShots",
     EV_DEFAULT,
     "i",
@@ -275,7 +277,8 @@ Event EV_PG_SetPreImpactSoundTime
     "Set the time before impact to play the preimpact sound.",
     EV_NORMAL
 );
-Event EV_PG_SetPreImpactSoundProbability(
+Event EV_PG_SetPreImpactSoundProbability
+(
     "preimpactsoundprob",
     EV_DEFAULT,
     "f",
@@ -520,7 +523,7 @@ void ProjectileGenerator::SetupNextCycle()
 
     // get a random delay
     m_fShotsPerSec = numShots / m_fCycleTime;
-    delay = 0.01f;
+    delay          = 0.01f;
     if (m_bIsTurnedOn || !m_bFireOnStartUp) {
         delay = G_Random(m_fMaxDelay - m_fMinDelay) + m_fMinDelay;
     }
@@ -1995,12 +1998,12 @@ ThrobbingBox_Stickybomb::ThrobbingBox_Stickybomb()
     }
 
     setModel("items/pulse_stickybomb.tik");
-    m_sUsedModel = "items/stickybomb.tik";
-    m_sSound = "explode_flak88";
+    m_sUsedModel     = "items/stickybomb.tik";
+    m_sSound         = "explode_flak88";
     m_sActivateSound = "stickybomb_plant";
-    m_sTickSound = "stickybomb_fuse";
+    m_sTickSound     = "stickybomb_fuse";
 
-    health = 10;
+    health                = 10;
     m_fStopwatchStartTime = 0;
 
     setSolidType(SOLID_BBOX);
@@ -2215,10 +2218,110 @@ int Objective::GetObjectiveIndex() const
 */
 
 CLASS_DECLARATION(Entity, FencePost, "func_fencepost") {
-    {&EV_Killed, NULL},
-    {NULL,       NULL}
+    {&EV_Killed, &FencePost::Killed},
+    {NULL,       NULL              }
 };
 
+FencePost::FencePost()
+{
+    max_health  = 20;
+    health      = 20;
+    damage_type = MOD_AAGUN;
+
+    if (!LoadingSavegame) {
+        PostEvent(EV_BecomeSolid, EV_POSTSPAWN);
+    }
+
+    takedamage = DAMAGE_YES;
+}
+
+void FencePost::Killed(Event *ev)
+{
+    Vector vMins, vMaxs;
+    Vector vStart, vEnd;
+    Vector vCenter;
+    float  fHalf;
+
+    vCenter = mins - maxs;
+    vCenter *= 0.5;
+
+    if (size.x > size.y) {
+        if (size.x > size.z) {
+            if (size.y > size.z) {
+                fHalf = size.y / 2.f;
+            } else {
+                fHalf = size.z / 2.f;
+            }
+
+            vMins[0] = mins[0];
+            vMaxs[0] = maxs[0];
+            vMins[1] = vCenter[1];
+            vMaxs[1] = vCenter[1];
+            vMins[2] = vCenter[2];
+            vMaxs[2] = vCenter[2];
+        } else {
+            fHalf = size.x / 2.f;
+
+            vMins[2] = mins[2];
+            vMaxs[2] = maxs[2];
+            vMins[1] = vCenter[1];
+            vMaxs[1] = vCenter[1];
+            vMins[0] = vCenter[0];
+            vMaxs[0] = vCenter[0];
+        }
+    } else {
+        if (size.y > size.z) {
+            if (size.x > size.z) {
+                fHalf = size.x / 2.f;
+            } else {
+                fHalf = size.z / 2.f;
+            }
+
+            vMins[1] = mins[1];
+            vMaxs[1] = maxs[1];
+            vMins[0] = vCenter[0];
+            vMaxs[0] = vCenter[0];
+            vMins[2] = vCenter[2];
+            vMaxs[2] = vCenter[2];
+        } else {
+            fHalf = size.y / 2.f;
+
+            vMins[2] = mins[2];
+            vMaxs[2] = maxs[2];
+            vMins[1] = vCenter[1];
+            vMaxs[1] = vCenter[1];
+            vMins[0] = vCenter[0];
+            vMaxs[0] = vCenter[0];
+        }
+    }
+
+    MatrixTransformVector(vMins, orientation, vStart);
+    MatrixTransformVector(vMaxs, orientation, vEnd);
+
+    vStart += origin;
+    vEnd += origin;
+
+    if (fHalf > 255) {
+        fHalf = 255;
+    }
+
+    gi.SetBroadcastVisible(vStart, vEnd);
+    gi.MSG_StartCGM(CGM_FENCEPOST);
+    gi.MSG_WriteCoord(vStart[0]);
+    gi.MSG_WriteCoord(vStart[1]);
+    gi.MSG_WriteCoord(vStart[2]);
+    gi.MSG_WriteCoord(vEnd[0]);
+    gi.MSG_WriteCoord(vEnd[1]);
+    gi.MSG_WriteCoord(vEnd[2]);
+    gi.MSG_WriteByte((int)fHalf);
+    gi.MSG_WriteByte(0);
+    gi.MSG_EndCGM();
+
+    deadflag = DEAD_DEAD;
+
+    PostEvent(EV_Remove, 0);
+}
+
 Event EV_SetEnemyName
 (
     "enemyname",
diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index 75fce27c..806ef6b4 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -342,6 +342,10 @@ class FencePost : public Entity
 {
 public:
     CLASS_PROTOTYPE(FencePost);
+
+    FencePost();
+
+    void Killed(Event* ev) override;
 };
 
 class AISpawnPoint : public SimpleArchivedEntity
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 0824473c..9cfed026 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -753,7 +753,7 @@ movement on the server game.
         CGM_NOTIFY_KILL,
         CGM_NOTIFY_HIT,
         CGM_VOICE_CHAT,
-        CGM_UNKNOWN_1,
+        CGM_FENCEPOST,
     };
 
     enum cg_message_ver_6_e {

From 048a97329028b10967700eff7748b75a20ed0325 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 00:20:32 +0200
Subject: [PATCH 0316/2040] Added GetProjectileHitsRemaining

---
 code/fgame/vehicle.cpp | 4 ++++
 code/fgame/vehicle.h   | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 0ce9fad1..76cc8825 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6459,6 +6459,10 @@ void Vehicle::EventCanUse(Event *ev)
     }
 }
 
+int Vehicle::GetProjectileHitsRemaining() const {
+    return m_iProjectileHitsRemaining;
+}
+
 /*
 ====================
 Vehicle::Archive
diff --git a/code/fgame/vehicle.h b/code/fgame/vehicle.h
index 143a7270..cac1a6e1 100644
--- a/code/fgame/vehicle.h
+++ b/code/fgame/vehicle.h
@@ -326,11 +326,6 @@ protected:
     virtual void VehicleStart(Event *ev);
     virtual void VehicleTouched(Event *ev);
     virtual void VehicleBlocked(Event *ev);
-    // Added in 2.30
-    //====
-    void SetProjectileVulnerable(Event *ev);
-    void DoProjectileVulnerability(Entity *pProjectile, Entity *pOwner, meansOfDeath_t meansOfDeath);
-    //====
     void         Think(void) override;
     void         Postthink(void) override;
     virtual void Drivable(Event *ev);
@@ -525,6 +520,9 @@ public:
     //====
     void EventSetMaxUseAngle(Event *ev);
     void EventCanUse(Event *ev);
+    int GetProjectileHitsRemaining() const;
+    void SetProjectileVulnerable(Event* ev);
+    void DoProjectileVulnerability(Entity* pProjectile, Entity* pOwner, meansOfDeath_t meansOfDeath);
     //====
 };
 

From a5d637dbb3f96f9b7321efd6d56ee44c28f30836 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 00:21:23 +0200
Subject: [PATCH 0317/2040] Added GetOwner()

---
 code/fgame/VehicleCollisionEntity.cpp | 77 +++++++++++----------------
 code/fgame/VehicleCollisionEntity.h   | 32 +++++------
 2 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/code/fgame/VehicleCollisionEntity.cpp b/code/fgame/VehicleCollisionEntity.cpp
index a63a51e6..c6520698 100644
--- a/code/fgame/VehicleCollisionEntity.cpp
+++ b/code/fgame/VehicleCollisionEntity.cpp
@@ -24,69 +24,56 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "VehicleCollisionEntity.h"
 #include "g_phys.h"
 
-CLASS_DECLARATION( Entity, VehicleCollisionEntity, NULL )
-{
-	{ &EV_Damage,			&VehicleCollisionEntity::EventDamage },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, VehicleCollisionEntity, NULL) {
+    {&EV_Damage, &VehicleCollisionEntity::EventDamage},
+    {NULL,       NULL                                }
 };
 
-VehicleCollisionEntity::VehicleCollisionEntity
-	(
-	Entity *ent
-	)
+VehicleCollisionEntity::VehicleCollisionEntity(Entity *ent)
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	edict->s.eType = ET_GENERAL;
+    edict->s.eType = ET_GENERAL;
 
-	m_pOwner = ent;
-	takedamage = DAMAGE_YES;
+    m_pOwner   = ent;
+    takedamage = DAMAGE_YES;
 
-	showModel();
-	setMoveType( MOVETYPE_PUSH );
-	setSolidType(SOLID_NOT);
+    showModel();
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_NOT);
 
-	edict->clipmask |= MASK_VEHICLE;
-	edict->s.eFlags |= EF_LINKANGLES;
+    edict->clipmask |= MASK_VEHICLE;
+    edict->s.eFlags |= EF_LINKANGLES;
 }
 
-VehicleCollisionEntity::VehicleCollisionEntity
-	(
-	void
-	)
+VehicleCollisionEntity::VehicleCollisionEntity(void)
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	gi.Error( ERR_DROP, "VehicleCollisionEntity Created with no parameters!\n" );
+    gi.Error(ERR_DROP, "VehicleCollisionEntity Created with no parameters!\n");
 }
 
-void VehicleCollisionEntity::EventDamage
-	(
-	Event *ev
-	)
+void VehicleCollisionEntity::EventDamage(Event *ev)
 {
-	m_pOwner->ProcessEvent(*ev);
+    m_pOwner->ProcessEvent(*ev);
 }
 
-void VehicleCollisionEntity::Solid
-	(
-	void
-	)
+void VehicleCollisionEntity::Solid(void)
 {
-	setContents( CONTENTS_SOLID );
-	setSolidType( SOLID_BSP );
+    setContents(CONTENTS_SOLID);
+    setSolidType(SOLID_BSP);
 }
 
-void VehicleCollisionEntity::NotSolid
-	(
-	void
-	)
+void VehicleCollisionEntity::NotSolid(void)
 {
-	setSolidType( SOLID_NOT );
+    setSolidType(SOLID_NOT);
+}
+
+Entity *VehicleCollisionEntity::GetOwner() const
+{
+    return m_pOwner;
 }
diff --git a/code/fgame/VehicleCollisionEntity.h b/code/fgame/VehicleCollisionEntity.h
index f2b508a1..4d08b04c 100644
--- a/code/fgame/VehicleCollisionEntity.h
+++ b/code/fgame/VehicleCollisionEntity.h
@@ -21,40 +21,34 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // VehicleCollisionEntity.h : MOHAA vehicle collision
 
-#ifndef __VEHICLECOLLISIONENTITY_H__
-#define __VEHICLECOLLISIONENTITY_H__
+#pragma once
 
 #include "entity.h"
 
 class VehicleCollisionEntity : public Entity
 {
 private:
-	EntityPtr m_pOwner;
+    EntityPtr m_pOwner;
 
 private:
-	void			EventDamage( Event *ev );
+    void EventDamage(Event *ev);
 
 public:
-	CLASS_PROTOTYPE( VehicleCollisionEntity );
+    CLASS_PROTOTYPE(VehicleCollisionEntity);
 
-	VehicleCollisionEntity( Entity *ent );
-	VehicleCollisionEntity();
+    VehicleCollisionEntity(Entity *ent);
+    VehicleCollisionEntity();
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 
-	void		Solid( void );
-	void		NotSolid( void );
+    void    Solid(void);
+    void    NotSolid(void);
+    Entity *GetOwner() const;
 };
 
-inline
-void VehicleCollisionEntity::Archive
-	(
-	Archiver& arc
-	)
+inline void VehicleCollisionEntity::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveSafePointer( &m_pOwner );
+    arc.ArchiveSafePointer(&m_pOwner);
 }
-
-#endif // __VEHICLECOLLISIONENTITY_H__
\ No newline at end of file

From 99647e677a71852797973124cc45a01cbbf805e2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 00:22:35 +0200
Subject: [PATCH 0318/2040] Do projectile vulnerability for vehicles

---
 code/fgame/weaputils.cpp | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 7e1f5db5..52918e5a 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1231,8 +1231,8 @@ void Projectile::Touch(Event *ev)
             weap->m_iNumTorsoShots++;
 
             if (weap->IsSubclassOfVehicleTurretGun()) {
-                VehicleTurretGun *t = (VehicleTurretGun *)weap.Pointer();
-                Player           *p = (Player *)t->GetRemoteOwner().Pointer();
+                VehicleTurretGun* t = (VehicleTurretGun*)weap.Pointer();
+                Player* p = (Player*)t->GetRemoteOwner().Pointer();
 
                 if (p && p->IsSubclassOfPlayer()) {
                     p->m_iNumHits++;
@@ -1260,10 +1260,33 @@ void Projectile::Touch(Event *ev)
     PostEvent(EV_Remove, 0);
 
     // Call the explosion event
-    Event *explEv;
+    Event* explEv;
     explEv = new Event(EV_Projectile_Explode);
     explEv->AddEntity(other);
     ProcessEvent(explEv);
+
+    Vehicle* pVehicle = NULL;
+
+    // Added in 2.30
+    if (other->IsSubclassOfVehicle()) {
+        pVehicle = static_cast<Vehicle*>(other);
+    } else if (other->IsSubclassOfVehicleTurretGun()) {
+        VehicleTurretGun* pTurret = static_cast<VehicleTurretGun*>(other);
+        Entity* pEnt = pTurret->GetVehicle();
+        if (pEnt->IsSubclassOfVehicle()) {
+            pVehicle = static_cast<Vehicle*>(pEnt);
+        }
+    } else if (other->isSubclassOf(VehicleCollisionEntity)) {
+        VehicleCollisionEntity* pCollision = static_cast<VehicleCollisionEntity*>(other);
+
+        if (pCollision && pCollision->GetOwner()->IsSubclassOfVehicle()) {
+            pVehicle = static_cast<Vehicle*>(pCollision->GetOwner());
+        }
+    }
+
+    if (pVehicle && pVehicle->GetProjectileHitsRemaining() > 0) {
+        pVehicle->DoProjectileVulnerability(this, owner, meansofdeath);
+    }
 }
 
 void Projectile::SetCanHitOwner(Event *ev)

From eea8c4226856de4a30483db49bcb554bde80dce5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 21:37:49 +0200
Subject: [PATCH 0319/2040] Added GetOwner event

---
 code/fgame/VehicleCollisionEntity.cpp | 25 +++++++++++++++++++++++--
 code/fgame/VehicleCollisionEntity.h   |  2 ++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/code/fgame/VehicleCollisionEntity.cpp b/code/fgame/VehicleCollisionEntity.cpp
index c6520698..8c53faa6 100644
--- a/code/fgame/VehicleCollisionEntity.cpp
+++ b/code/fgame/VehicleCollisionEntity.cpp
@@ -24,8 +24,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "VehicleCollisionEntity.h"
 #include "g_phys.h"
 
+Event EV_Owner
+(
+    "owner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "owner",
+    EV_GETTER
+);
+
 CLASS_DECLARATION(Entity, VehicleCollisionEntity, NULL) {
     {&EV_Damage, &VehicleCollisionEntity::EventDamage},
+    {&EV_Owner,  &VehicleCollisionEntity::GetOwner   },
     {NULL,       NULL                                }
 };
 
@@ -57,9 +68,9 @@ VehicleCollisionEntity::VehicleCollisionEntity(void)
     gi.Error(ERR_DROP, "VehicleCollisionEntity Created with no parameters!\n");
 }
 
-void VehicleCollisionEntity::EventDamage(Event *ev)
+void VehicleCollisionEntity::GetOwner(Event *ev)
 {
-    m_pOwner->ProcessEvent(*ev);
+    ev->AddListener(m_pOwner);
 }
 
 void VehicleCollisionEntity::Solid(void)
@@ -73,6 +84,16 @@ void VehicleCollisionEntity::NotSolid(void)
     setSolidType(SOLID_NOT);
 }
 
+void VehicleCollisionEntity::EventDamage(Event *ev)
+{
+    m_pOwner->ProcessEvent(*ev);
+}
+
+void VehicleCollisionEntity::Used(Event *ev)
+{
+    m_pOwner->ProcessEvent(*ev);
+}
+
 Entity *VehicleCollisionEntity::GetOwner() const
 {
     return m_pOwner;
diff --git a/code/fgame/VehicleCollisionEntity.h b/code/fgame/VehicleCollisionEntity.h
index 4d08b04c..5185fc3c 100644
--- a/code/fgame/VehicleCollisionEntity.h
+++ b/code/fgame/VehicleCollisionEntity.h
@@ -32,6 +32,8 @@ private:
 
 private:
     void EventDamage(Event *ev);
+    void GetOwner(Event *ev);
+    void Used(Event *ev);
 
 public:
     CLASS_PROTOTYPE(VehicleCollisionEntity);

From d6870ecbeec0410352713927ac31cb84aaf00d10 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 21:44:03 +0200
Subject: [PATCH 0320/2040] Added trigger_sideduse from 2.30

---
 code/fgame/trigger.cpp | 23 ++++++++++++++++++++++-
 code/fgame/trigger.h   | 11 +++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 11cc3392..f2aebed3 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -457,7 +457,7 @@ void Trigger::TriggerStuff(Event *ev)
     // if we setup an angle for this trigger, only trigger if other is within ~60 degrees of the triggers origin
     // only test for this case if we were touched, activating or killed should never go through this code
     //
-    if (useTriggerDir && (*ev == EV_Touch)) {
+    if (useTriggerDir && (*ev == EV_Touch || (*ev == EV_Use && isSubclassOf(TriggerSidedUse)))) {
         Vector norm;
         float  dot;
 
@@ -1951,6 +1951,27 @@ CLASS_DECLARATION(Trigger, TriggerUse, "trigger_use") {
 
 TriggerUse::TriggerUse() {}
 
+/*****************************************************************************/
+/*QUAKED trigger_sideduse (1 0 0) ? x x NOT_PLAYERS MONSTERS
+
+Activates targets when 'used' by an entity. It is usable only within specific degrees.
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+If NOT_PLAYERS is set, the trigger does not respond to players
+If MONSTERS is set, the trigger will respond to monsters
+
+******************************************************************************/
+
+CLASS_DECLARATION(TriggerUse, TriggerSidedUse, "trigger_sideduse") {
+    {NULL, NULL}
+};
+
+TriggerSidedUse::TriggerSidedUse() {}
+
 /*****************************************************************************/
 /*QUAKED trigger_useonce (1 0 0) ? x x NOT_PLAYERS MONSTERS
 
diff --git a/code/fgame/trigger.h b/code/fgame/trigger.h
index d8adabe4..aabcc2c1 100644
--- a/code/fgame/trigger.h
+++ b/code/fgame/trigger.h
@@ -401,6 +401,17 @@ public:
     TriggerUse();
 };
 
+//
+// Added in 2.30
+//  Can only be triggered if within specific degrees
+class TriggerSidedUse : public TriggerUse
+{
+public:
+    CLASS_PROTOTYPE(TriggerSidedUse);
+
+    TriggerSidedUse();
+};
+
 class TriggerUseOnce : public TriggerUse
 {
 public:

From 6731f56aead3a52cc8ae33f237dc8c1be78781ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 10 Apr 2024 23:42:09 +0200
Subject: [PATCH 0321/2040] Fixed m_PrevCodePos usage

---
 code/script/scriptvm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index a2bcb5fd..168ce2a3 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1800,8 +1800,8 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                     // the target name was not found
                     m_VMStack.GetTop().setListenerValue(NULL);
 
-                    if ((*m_CodePos >= OP_BIN_EQUALITY && *m_CodePos <= OP_BIN_GREATER_THAN_OR_EQUAL)
-                        || (*m_CodePos >= OP_BOOL_UN_NOT && *m_CodePos <= OP_UN_CAST_BOOLEAN)) {
+                    if ((*m_PrevCodePos >= OP_BIN_EQUALITY && *m_PrevCodePos <= OP_BIN_GREATER_THAN_OR_EQUAL)
+                        || (*m_PrevCodePos >= OP_BOOL_UN_NOT && *m_PrevCodePos <= OP_UN_CAST_BOOLEAN)) {
                         ScriptError("Targetname '%s' does not exist.", targetname.c_str());
                     }
                 } else if (targetList->NumObjects() == 1) {

From f9901787b596047b85678d8a5309d645c4947996 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:26:45 +0200
Subject: [PATCH 0322/2040] Removed "touch" unregistration

---
 code/fgame/g_phys.cpp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 33133913..7e4314fb 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -190,16 +190,11 @@ void G_Impact
 	trace_t *trace
 	)
 {
-	gentity_t   *e2;
-	Event		   *ev;
-	SafePtr< Entity > safe1;
-	SafePtr< Entity > safe2;
+	gentity_t *e2;
+	Event *ev;
 
 	e2 = trace->ent;
 
-	safe1 = e1;
-	safe2 = e2->entity;
-
 	level.impact_trace = *trace;
 
 	// touch anything, including the world
@@ -208,10 +203,6 @@ void G_Impact
 		ev = new Event( EV_Touch );
 		ev->AddEntity( e2->entity );
 		e1->ProcessEvent( ev );
-
-		if( safe1 ) {
-			safe1->Unregister( "touch" );
-		}
 	}
 
 	// entity could have been removed, so check if he's in use before sending the event
@@ -225,10 +216,6 @@ void G_Impact
 		ev = new Event( EV_Touch );
 		ev->AddEntity( e1 );
 		e2->entity->ProcessEvent( ev );
-
-		if( safe2 ) {
-			safe2->Unregister( "touch" );
-		}
 	}
 
 	memset( &level.impact_trace, 0, sizeof( level.impact_trace ) );

From 927f4bb4bd74267108a418d9c157ccbb252c67af Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:30:00 +0200
Subject: [PATCH 0323/2040] Marked overridden virtual methods

---
 code/fgame/camera.h     | 2 +-
 code/fgame/misc.h       | 2 +-
 code/fgame/object.h     | 2 +-
 code/fgame/player.h     | 2 +-
 code/fgame/playerbot.h  | 2 +-
 code/fgame/vehicle.h    | 2 +-
 code/fgame/weapturret.h | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/fgame/camera.h b/code/fgame/camera.h
index c0f077ff..fafde254 100644
--- a/code/fgame/camera.h
+++ b/code/fgame/camera.h
@@ -241,7 +241,7 @@ protected:
     Vector       CalculatePosition(void);
     Vector       CalculateOrientation(void);
     float        CalculateFov(void);
-    virtual void bind(Entity *master, qboolean use_my_angles = false);
+    virtual void bind(Entity *master, qboolean use_my_angles = false) override;
     void         unbind(void) override;
 
 public:
diff --git a/code/fgame/misc.h b/code/fgame/misc.h
index 3edc142a..51909c7f 100644
--- a/code/fgame/misc.h
+++ b/code/fgame/misc.h
@@ -565,7 +565,7 @@ public:
     void EnsureOverLadder(Entity *pUser);
     void EnsureForwardOffLadder(Entity *pUser);
 
-    void Archive(Archiver& arc);
+    void Archive(Archiver& arc) override;
 };
 
 inline void FuncLadder::Archive(Archiver& arc)
diff --git a/code/fgame/object.h b/code/fgame/object.h
index 24cefb0a..fe3fedfe 100644
--- a/code/fgame/object.h
+++ b/code/fgame/object.h
@@ -46,7 +46,7 @@ public:
 
     InteractObject();
     void Damaged(Event *ev);
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void Setup(Event *ev);
     void EventHitEffect(Event *ev);
     void EventKilledEffect(Event *ev);
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 03501e3c..5eebc593 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -539,7 +539,7 @@ public:
 
     void DoUse(Event *ev);
     void Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int iLocation);
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void Dead(Event *ev);
     void Pain(Event *ev);
 
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index c39954fe..e7f24707 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -174,7 +174,7 @@ public:
 
     void Spawned(void) override;
 
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void GotKill(Event *ev);
     void EventStuffText(Event *ev);
 };
diff --git a/code/fgame/vehicle.h b/code/fgame/vehicle.h
index cac1a6e1..b8709df2 100644
--- a/code/fgame/vehicle.h
+++ b/code/fgame/vehicle.h
@@ -533,7 +533,7 @@ public:
 
     DrivableVehicle(void);
 
-    virtual void Killed(Event *ev);
+    virtual void Killed(Event *ev) override;
 };
 
 class VehicleWheelsX4 : public DrivableVehicle
diff --git a/code/fgame/weapturret.h b/code/fgame/weapturret.h
index 1b200081..6646dbf9 100644
--- a/code/fgame/weapturret.h
+++ b/code/fgame/weapturret.h
@@ -200,8 +200,8 @@ public:
     void     StopWeaponAnim() override;
 
     bool          AI_CanTarget(const vec3_t org);
-    virtual float FireDelay(firemode_t mode);
-    virtual void  SetFireDelay(Event *ev); // added in 2.0
+    virtual float FireDelay(firemode_t mode) override;
+    virtual void  SetFireDelay(Event *ev) override; // added in 2.0
     void          ShowInfo(float fDot, float fDist) override;
 
     // added in 2.0

From 0e20d7e880358174354af53a9f3c61968193e2d6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 14 Apr 2024 23:03:46 +0200
Subject: [PATCH 0324/2040] Fixed arm/arm64 binary loading on Windows

(fixes #295)
---
 code/qcommon/q_platform.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index fdf0c25f..86d28c81 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -107,9 +107,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PATH_SEP '\\'
 
 #if defined(_WIN64) || defined( __WIN64__ ) 
-#define ARCH_STRING "x86_64"
+#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+#  define ARCH_STRING "x86_64"
+#elif defined(__aarch64__) || defined(__ARM64__) || defined (_M_ARM64)
+#  define ARCH_STRING "arm64"
+#endif
 #elif defined _M_ALPHA
-#define ARCH_STRING "AXP"
+#  define ARCH_STRING "AXP"
 #endif
 
 #define Q3_LITTLE_ENDIAN

From f39a4c0bc7c35159f49a941a1eb805751cb9a356 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Apr 2024 17:47:39 +0200
Subject: [PATCH 0325/2040] Fixed projectile explosion origin.

This fixes exploder triggers sometimes never being triggered (fixes #294)
---
 code/fgame/weaputils.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 52918e5a..f675709b 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -892,11 +892,13 @@ void Projectile::Explode(Event *ev)
         // Move the projectile back off the surface a bit so we can see
         // explosion effects.
         Vector dir, v;
-        v = velocity;
-        v.normalize();
-        dir = v;
-        v   = origin - v * 36;
-        setOrigin(v);
+        dir = velocity;
+        if (dir.normalize() == 0) {
+            vec3_t forward;
+            AngleVectors(angles, forward, NULL, NULL);
+            dir = forward;
+        }
+        v = origin;
 
         ExplosionAttack(v, owner, explosionmodel, dir, ignoreEnt, 1.0f, weap, m_bHurtOwnerOnly);
     }

From 054201bea997bb948b7cfab3c102224da37c3af6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Apr 2024 19:07:08 +0200
Subject: [PATCH 0326/2040] Fixed character assertion fail when the character
 was a value below 0

---
 code/sys/win_localization.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index 02eb35ee..fbda671c 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -228,20 +228,20 @@ static int bjb_strnscmp( const char *a, const char *b, size_t n )
 {
 	while( 1 )
 	{
-		while( isspace( *a ) )
+		while( isspace( (unsigned char)*a ) )
 			a++;
-		while( isspace( *b ) )
+		while( isspace( (unsigned char)*b ) )
 			b++;
 		while( *a && *a == *b )
 			a++, b++;
-		if( isspace( *a ) )
+		if( isspace( (unsigned char)*a ) )
 		{
-			if( isalnum( a[ -1 ] ) && isalnum( *b ) )
+			if( isalnum( (unsigned char)a[ -1 ] ) && isalnum( (unsigned char)*b ) )
 				break;
 		}
-		else if( isspace( *b ) )
+		else if( isspace( (unsigned char)*b ) )
 		{
-			if( isalnum( b[ -1 ] ) && isalnum( *a ) )
+			if( isalnum( (unsigned char)b[ -1 ] ) && isalnum( (unsigned char)*a ) )
 				break;
 		}
 		else

From 06dab5d8b0a688187eb848e4076e6ff0a42262a9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Apr 2024 19:39:32 +0200
Subject: [PATCH 0327/2040] Refactored ScriptThread::EventPointsWithinDist for
 more clarity

---
 code/fgame/scriptthread.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index a5f74957..9cbd5bd9 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -4183,12 +4183,16 @@ void ScriptThread::EventAIsCloserThanBToC(Event *ev)
 void ScriptThread::EventPointsWithinDist(Event *ev)
 {
     Vector delta;
-    float  dist = ev->GetFloat(3);
-
-    delta = ev->GetVector(1) - ev->GetVector(2);
+    Vector v1, v2;
+    float fDistance;
+   
+    v1 = ev->GetVector(1);
+    v2 = ev->GetVector(2);
+    fDistance = ev->GetFloat(3);
+    delta = v1 - v2;
 
     // check squared distance
-    ev->AddInteger(((delta * delta) < (dist * dist)));
+    ev->AddInteger(delta.lengthSquared() < Square(fDistance));
 }
 
 bool ScriptThread::CanScriptTracePrint(void)

From 4630a1f386e0e51898a4447c9f8a865e6786716e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Apr 2024 19:40:33 +0200
Subject: [PATCH 0328/2040] Fixed wrong return values for Vehicle::EventCanUse

It fixes Modello being hardly usable on maps like e3l2
---
 code/fgame/vehicle.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 76cc8825..93684170 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6453,9 +6453,9 @@ void Vehicle::EventCanUse(Event *ev)
     VectorNormalize(vDir);
 
     if (fabs(GetAngleBetweenVectors2D(vForward, vDir)) > m_fMaxUseAngle) {
-        ev->AddInteger(1);
+        ev->AddInteger(false);
     } else {
-        ev->AddInteger(0);
+        ev->AddInteger(true);
     }
 }
 

From 5ee7cb16bb76b209b030f8fd960023b8b2aa51da Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Apr 2024 20:28:54 +0200
Subject: [PATCH 0329/2040] for ANIM_MODE_SCRIPTED and ANIM_MODE_NOCLIP, set
 the yaw based on the angular delta

---
 code/fgame/actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 805dfd90..c21d4820 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -3674,6 +3674,7 @@ void Actor::DoMove(void)
         MoveDest(frame_delta.length() / level.frametime);
         break;
     case ANIM_MODE_SCRIPTED:
+        setAngles(angles + Vector(0, angular_delta, 0));
         trace = G_Trace(
             origin, mins, maxs, origin + frame_delta, this, edict->clipmask & ~MASK_SCRIPT_SLAVE, qtrue, "Actor"
         );
@@ -3681,6 +3682,7 @@ void Actor::DoMove(void)
         velocity = frame_delta / level.frametime;
         break;
     case ANIM_MODE_NOCLIP:
+        setAngles(angles + Vector(0, angular_delta, 0));
         SafeSetOrigin(origin + frame_delta);
         velocity = frame_delta / level.frametime;
         break;

From 19c68aa25d2887bcfdff1b5d3f159109a6d8476d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 21 Apr 2024 20:33:31 +0200
Subject: [PATCH 0330/2040] Ignore player collision if the actor is already
 nonsolid

This fixes #277 where the vehicle could get stuck due to the actor being solid afterwards
---
 code/fgame/actor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index c21d4820..3c417781 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -3625,7 +3625,9 @@ void Actor::SafeSetOrigin(vec3_t newOrigin)
     if (!m_bNoPlayerCollision) {
         Player *p = (Player *)G_GetEntity(0);
 
-        if (p && IsTouching(p)) {
+        // Solidity check added in 2.30
+        //  If the Actor is already nonsolid the player won't get stuck
+        if (p && IsTouching(p) && getSolidType() != SOLID_NOT) {
             Com_Printf("(entnum %d, radnum %d) is going not solid to not get stuck in the player\n", entnum, radnum);
             m_bNoPlayerCollision = true;
             setSolidType(SOLID_NOT);

From 6d10ed27c54af1d11c3709abe4a13c464b13076e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:48:24 +0200
Subject: [PATCH 0331/2040] Fixed preferred weapon not showing on stats screen

Fixes #271
---
 code/fgame/player.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 6dcac54d..40fd9b37 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10087,7 +10087,9 @@ void Player::Stats(Event *ev)
         }
     }
 
-    szPreferredWeapon = m_sPerferredWeaponOverride;
+    if (m_sPerferredWeaponOverride.length()) {
+        szPreferredWeapon = m_sPerferredWeaponOverride;
+    }
 
     if (iNumHits) {
         Com_sprintf(

From ee48193f15f5e4042907b8f1b5c699ef6e229460 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:21:13 +0200
Subject: [PATCH 0332/2040] Added notagaxis

Fixes #222
---
 code/cgame/cg_commands.cpp | 24 ++++++++++++++++++++++--
 code/cgame/cg_commands.h   |  2 ++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 30e45fda..9ea70dd0 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -196,7 +196,8 @@ Event EV_Client_SetColorVelocity
     "rVel gVel bVel",
     "Set the color velocity of the spawned dlight tempmodel"
 );
-Event EV_Client_SetRandomVelocity(
+Event EV_Client_SetRandomVelocity
+(
     "randvel",
     EV_DEFAULT,
     "SfFSfFSfF",
@@ -210,7 +211,8 @@ Event EV_Client_SetRandomVelocity(
     "without randomness.\n"
     "This velocity is applied using the world axis"
 );
-Event EV_Client_SetRandomVelocityAlongAxis(
+Event EV_Client_SetRandomVelocityAlongAxis
+(
     "randvelaxis",
     EV_DEFAULT,
     "SfFSfFSfF",
@@ -225,6 +227,14 @@ Event EV_Client_SetRandomVelocityAlongAxis(
     "without randomness.\n"
     "This velocity is applied using the parent axis"
 );
+Event EV_Client_NoTagAxis
+(
+    "notagaxis",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Forces the effect to use the model's orientation for randvelaxis and offsetalongaxis"
+);
 Event EV_Client_SetAccel
 (
     "accel",
@@ -1221,6 +1231,7 @@ CLASS_DECLARATION(Listener, ClientGameCommandManager, NULL) {
     {&EV_Client_SetColorVelocity,           &ClientGameCommandManager::SetAngularVelocity        },
     {&EV_Client_SetRandomVelocity,          &ClientGameCommandManager::SetRandomVelocity         },
     {&EV_Client_SetRandomVelocityAlongAxis, &ClientGameCommandManager::SetRandomVelocityAlongAxis},
+    {&EV_Client_NoTagAxis,                  &ClientGameCommandManager::SetNoTagAxis              },
     {&EV_Client_SetAccel,                   &ClientGameCommandManager::SetAccel                  },
     {&EV_Client_SetFriction,                &ClientGameCommandManager::SetFriction               },
     {&EV_Client_SetSpin,                    &ClientGameCommandManager::SetSpin                   },
@@ -2668,6 +2679,15 @@ void ClientGameCommandManager::SetRandomVelocityAlongAxis(Event *ev)
     SetRandomVelocity(ev);
 }
 
+void ClientGameCommandManager::SetNoTagAxis(Event* ev)
+{
+    if (!m_spawnthing) {
+        return;
+    }
+
+    m_spawnthing->cgd.flags2 |= T2_NOTAGAXIS;
+}
+
 void ClientGameCommandManager::SetRadialVelocity(Event *ev)
 {
     if (!m_spawnthing) {
diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h
index 7bd22fd2..27565d81 100644
--- a/code/cgame/cg_commands.h
+++ b/code/cgame/cg_commands.h
@@ -113,6 +113,7 @@ TIKI file, similar to ScriptMaster in the server game dll.
 #define T2_VARYCOLOR          (1 << 20)
 #define T2_SPIN               (1 << 21)
 #define T2_RELATIVEANGLES     (1 << 22)
+#define T2_NOTAGAXIS          (1 << 23)
 
 class spawnthing_t;
 class specialeffect_t;
@@ -788,6 +789,7 @@ private:
     void          SetScaleRate(Event *ev);
     void          SetRandomVelocity(Event *ev);
     void          SetRandomVelocityAlongAxis(Event *ev);
+    void          SetNoTagAxis(Event *ev); // Added in 2.0
     void          SetAccel(Event *ev);
     void          SetFriction(Event *ev);
     void          SetSpin(Event *ev);

From e89543710c74fe1cc66e460d624865e880fce3c3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 18:04:14 +0200
Subject: [PATCH 0333/2040] Check for max use angle when using the vehicle

---
 code/fgame/vehicle.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 93684170..97404b67 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3678,6 +3678,23 @@ void Vehicle::DriverUse(Event *ev)
         return;
     }
 
+    // Added in 2.30
+    //  Check use angle
+    if (!driver.ent && m_fMaxUseAngle && ent && Turrets[0].ent) {
+        Vector vForward;
+        Vector vDir;
+
+        AngleVectors(Turrets[0].ent->angles, vForward, NULL, NULL);
+
+        vDir = Turrets[0].ent->origin - ent->origin;
+        VectorNormalize(vDir);
+
+        if (fabs(GetAngleBetweenVectors2D(vForward, vDir)) > m_fMaxUseAngle) {
+            // Not usable
+            return;
+        }
+    }
+
     if (ev->NumArgs() == 2) {
         if (ev->IsVectorAt(2)) {
             vExitPosition    = ev->GetVector(2);

From 26c33751127e341866be26f544c3d49f528a5bc2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 18:28:56 +0200
Subject: [PATCH 0334/2040] When there is no enter_boneindex for turret slot,
 use the boneindex instead

This fixes #208
---
 code/fgame/vehicle.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 97404b67..b521598c 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -1503,6 +1503,9 @@ void Vehicle::QueryTurretSlotPosition(int slot, float *pos)
     if (Turrets[slot].enter_boneindex >= 0) {
         GetTagPositionAndOrientation(Turrets[slot].enter_boneindex, &orient);
         VectorCopy(orient.origin, pos);
+    } else if (Turrets[slot].boneindex >= 0) {
+        GetTagPositionAndOrientation(Turrets[slot].boneindex, &orient);
+        VectorCopy(orient.origin, pos);
     } else {
         VectorCopy(origin, pos);
     }

From 48fc5a72b836ccbc0ffb44aa8561f844068a4d45 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:59:20 +0200
Subject: [PATCH 0335/2040] Fixed some setters and getters being inverted

---
 code/fgame/Entities.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 4f4a279e..18e7e1c1 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -2338,7 +2338,7 @@ Event EV_SetEnemyName2
     "s",
     "enemyname",
     "",
-    EV_GETTER
+    EV_SETTER
 );
 Event EV_GetEnemyName
 (
@@ -2347,7 +2347,7 @@ Event EV_GetEnemyName
     "s",
     "enemyname",
     "",
-    EV_SETTER
+    EV_GETTER
 );
 Event EV_Sentient_GetDontDropWeapons
 (
@@ -2663,12 +2663,12 @@ void AISpawnPoint::SetFov(Event *ev)
 
 void AISpawnPoint::SetSight(Event *ev)
 {
-    ev->AddFloat(m_fSight);
+    m_fSight = ev->GetFloat(1);
 }
 
 void AISpawnPoint::GetSight(Event *ev)
 {
-    m_fSight = ev->GetFloat(1);
+    ev->AddFloat(m_fSight);
 }
 
 void AISpawnPoint::GetHearing(Event *ev)

From 3cd5acf3aaed83c7e1f6d2472412def1732c07ff Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 20:10:01 +0200
Subject: [PATCH 0336/2040] Fixed issue with case-sensitive variables.

normal/return commands are case-insensitive
getter/setter commands are case-sensitive
---
 code/fgame/scriptmaster.cpp    |  5 ++++-
 code/qcommon/listener.cpp      | 37 ++++++++++++++++++++++++++-----
 code/qcommon/listener.h        | 17 ---------------
 code/script/scriptcompiler.cpp | 40 +++++++++++++++++++---------------
 4 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index c7730709..40232cd9 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -541,7 +541,10 @@ void ScriptMaster::InitConstStrings(void)
         eventDef    = en.CurrentValue();
         eventnum    = (*en.CurrentKey())->eventnum;
         str command = eventDef->command.c_str();
-        command.tolower();
+
+        if (eventDef->type == EV_NORMAL || eventDef->type == EV_RETURN) {
+            command.tolower();
+        }
 
         name = AddString(command);
 
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index d2c1b38e..fb30bc4b 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -399,8 +399,14 @@ int HashCode<command_t>(const command_t& key)
     const char *p;
     int         hash = 0;
 
-    for (p = key.command; *p; p++) {
-        hash = tolower(*p) + 31 * hash;
+    if (key.type == EV_NORMAL || key.type == EV_RETURN) {
+        for (p = key.command; *p; p++) {
+            hash = tolower(*p) + 31 * hash;
+        }
+    } else {
+        for (p = key.command; *p; p++) {
+            hash = *p + 31 * hash;
+        }
     }
 
     return hash;
@@ -1424,7 +1430,6 @@ FindSetterEventNum
 */
 unsigned int Event::FindSetterEventNum(str s)
 {
-    s.tolower();
     return FindSetterEventNum(Director.AddString(s));
 }
 
@@ -1435,7 +1440,6 @@ FindGetterEventNum
 */
 unsigned int Event::FindGetterEventNum(str s)
 {
-    s.tolower();
     return FindGetterEventNum(Director.AddString(s));
 }
 
@@ -1452,8 +1456,10 @@ int Event::GetEventWithFlags(str name, int flags, uchar type)
     con_map<const_str, unsigned int> *cmdList;
 
     if (type == EV_NORMAL) {
+        name.tolower();
         cmdList = &normalCommandList;
     } else if (type == EV_RETURN) {
+        name.tolower();
         cmdList = &returnCommandList;
     } else if (type == EV_GETTER) {
         cmdList = &getterCommandList;
@@ -1463,8 +1469,6 @@ int Event::GetEventWithFlags(str name, int flags, uchar type)
         return 0;
     }
 
-    name.tolower();
-
     index = cmdList->find(Director.GetString(name));
 
     if (!index || !(GetEventFlags(*index) & flags)) {
@@ -4352,3 +4356,24 @@ command_t::command_t(const char *name, byte t)
     : command(name)
     , type(t)
 {}
+
+bool operator==(const char* name, const command_t& command)
+{
+    if (command.type == EV_NORMAL || command.type == EV_RETURN) {
+        return !str::icmp(name, command.command);
+    } else {
+        return !str::cmp(name, command.command);
+    }
+}
+
+#ifdef WITH_SCRIPT_ENGINE
+bool operator==(const command_t& cmd1, const command_t& cmd2)
+{
+    return (!str::icmp(cmd1.command, cmd2.command) && (cmd2.type == (uchar)-1 || cmd2.type == cmd1.type));
+}
+#else
+bool operator==(const command_t& cmd1, const command_t& cmd2)
+{
+    return (!str::icmp(cmd1.command, cmd2.command));
+}
+#endif
\ No newline at end of file
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index ef3b8c12..70acb320 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -242,23 +242,6 @@ public:
     friend bool operator==(const command_t& cmd1, const command_t& cmd2);
 };
 
-inline bool operator==(const char *name, const command_t& command)
-{
-    return !str::icmp(name, command.command);
-}
-
-#ifdef WITH_SCRIPT_ENGINE
-inline bool operator==(const command_t& cmd1, const command_t& cmd2)
-{
-    return (!str::icmp(cmd1.command, cmd2.command) && (cmd2.type == (uchar)-1 || cmd2.type == cmd1.type));
-}
-#else
-inline bool operator==(const command_t& cmd1, const command_t& cmd2)
-{
-    return (!str::icmp(cmd1.command, cmd2.command));
-}
-#endif
-
 class Event : public Class
 {
 public:
diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 9e6eeaeb..17dfcf18 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -252,7 +252,7 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
     unsigned int index;
     sval_t       listener_val;
     const char  *name = lhs.node[2].stringValue;
-    str name_lowered;
+    //str name_lowered;
 
     if (lhs.node[0].type != ENUM_field) {
         if (lhs.node[0].type == ENUM_array_expr) {
@@ -265,10 +265,10 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
         return;
     }
 
-    name_lowered = name;
-    name_lowered.tolower();
-    index    = Director.AddString(name_lowered);
-    eventnum = Event::FindSetterEventNum(name_lowered);
+    //name_lowered = name;
+    //name_lowered.tolower();
+    index    = Director.AddString(name);
+    eventnum = Event::FindSetterEventNum(name);
 
     listener_val = lhs.node[1];
 
@@ -477,7 +477,8 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
     unsigned int eventnum = 0;
     unsigned int index    = -1;
     unsigned int prev_index;
-    str name_lowered;
+    const  char* name;
+    //str name_lowered;
 
     /*
     if (field_val.node[0].stringValue) {
@@ -494,10 +495,11 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
     }
     */
 
-    name_lowered = field_val.stringValue;
-    name_lowered.tolower();
-    index    = Director.AddString(name_lowered);
-    eventnum = Event::FindGetterEventNum(name_lowered);
+    name = field_val.stringValue;
+    //name_lowered = name;
+    //name_lowered.tolower();
+    index    = Director.AddString(name);
+    eventnum = Event::FindGetterEventNum(name);
 
     prev_index = GetOpcodeValue<unsigned int>(sizeof(unsigned int), sizeof(unsigned int));
 
@@ -918,10 +920,10 @@ void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
 
     sval_u      listener_val = lhs.node[1];
     const char *name         = lhs.node[2].stringValue;
-    name_lowered = name;
-    name_lowered.tolower();
+    //name_lowered = name;
+    //name_lowered.tolower();
 
-    int eventnum = Event::FindSetterEventNum(name_lowered);
+    int eventnum = Event::FindSetterEventNum(name);
 
     if (listener_val.node[0].type != ENUM_listener
         || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
@@ -930,7 +932,7 @@ void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
         EmitOpcode(OP_STORE_PARAM, sourcePos);
         EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
 
-        unsigned int index = Director.AddString(name_lowered);
+        unsigned int index = Director.AddString(name);
         EmitOpcodeValue(index, sizeof(unsigned int));
     }
 }
@@ -956,7 +958,8 @@ int ScriptCompiler::EmitParameterList(sval_t event_parameter_list)
 void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
 {
     unsigned int index;
-    str name_lowered;
+    const char* name;
+    //str name_lowered;
 
     if (val.node[0].type != ENUM_field) {
         if (val.node[0].type == ENUM_array_expr) {
@@ -969,9 +972,10 @@ void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
         return;
     }
 
-    name_lowered = val.node[2].stringValue;
-    name_lowered.tolower();
-    index = Director.AddString(name_lowered);
+    name = val.node[2].stringValue;
+    //name_lowered = name;
+    //name_lowered.tolower();
+    index = Director.AddString(name);
 
     EmitValue(val.node[1]);
     EmitOpcode(OP_STORE_FIELD_REF, sourcePos);

From 56dce21538d0b5f6518d8282d70cc8127b7fbf92 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:38:45 +0200
Subject: [PATCH 0337/2040] Fixed an invalid access to lighting sphere leaves

It was causing crashes on some occasions
---
 code/renderer/tr_sphere_shade.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index b0e0fdb3..fb411ada 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -1047,7 +1047,8 @@ static void RB_Sphere_BuildStaticLights()
     if (tr.world->vis) {
         int cntarea;
 
-        for (curleaf = 0, leaf = backEnd.currentSphere->leaves[curleaf]; curleaf < 8 && leaf; curleaf++, leaf++) {
+        for (curleaf = 0, leaf = backEnd.currentSphere->leaves[curleaf]; curleaf < 8 && leaf;
+             curleaf++, leaf   = backEnd.currentSphere->leaves[curleaf]) {
             cntarea = leaf->numlights;
 
             if (cntarea) {

From cc85d0c1002ce4aa1ede8e7bd0de3cd7d27cffd6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:40:00 +0200
Subject: [PATCH 0338/2040] Bumped version number

---
 code/qcommon/q_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 333a1d0a..743ea48c 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			61
+#define PRODUCT_VERSION_MINOR			62
 #define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			"alpha"
 

From 4b05c400b2de5e2b5ae8a27bc3aa2d498ca53af6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Apr 2024 19:29:54 +0200
Subject: [PATCH 0339/2040] Round to integer for vectoyaw()

This fixes Actor never finishing TurnTo as the DesiredYaw was set to a very precise value
---
 code/qcommon/q_shared.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 703d130e..293e1afc 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -86,7 +86,7 @@ float vectoyaw(const vec3_t vec)
 	}
 	else {
 		//if (vec[PITCH]) {
-		yaw = (atan2(vec[YAW], vec[PITCH]) * 180 / M_PI);
+		yaw = (int)(atan2(vec[YAW], vec[PITCH]) * 180 / M_PI);
 		//} else if (vec[YAW] > 0) {
 		//	yaw = 90;
 		//} else {

From ac8c18250d89ae46b07d0687e4c69087cd97ee63 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Apr 2024 20:39:54 +0200
Subject: [PATCH 0340/2040] If the actor is an american, always call
 ThinkHoldGun_TurretGun() without checking for enemy

---
 code/fgame/actor_machinegunner.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor_machinegunner.cpp b/code/fgame/actor_machinegunner.cpp
index 07ddaf0e..30e075a1 100644
--- a/code/fgame/actor_machinegunner.cpp
+++ b/code/fgame/actor_machinegunner.cpp
@@ -89,8 +89,11 @@ void Actor::End_MachineGunner(void)
     }
 
     Unholster();
-    if (m_pTurret && m_pTurret->GetOwner() == this) {
-        m_pTurret->TurretEndUsed();
+    if (m_pTurret) {
+        m_pTurret->m_bHadOwner = true;
+        if (m_pTurret->GetOwner() == this) {
+            m_pTurret->TurretEndUsed();
+        }
     }
 }
 
@@ -207,6 +210,12 @@ void Actor::Think_MachineGunner_TurretGun(void)
 
     UpdateEnemyInternal();
 
+    if (m_Team == TEAM_AMERICAN) {
+        // Added in 2.30
+        ThinkHoldGun_TurretGun();
+        return;
+    }
+
     if (m_pTurret->AI_CanTarget(G_GetEntity(0)->centroid)) {
         ThinkHoldGun_TurretGun();
         return;

From 41c322ec81b82dbd76f56107fbf53a0994b572eb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Apr 2024 19:59:16 +0200
Subject: [PATCH 0341/2040] Refactored ScriptSlave::FollowingPath and
 ScriptSlave::SetupPath with bugfixes

---
 code/fgame/scriptslave.cpp | 164 ++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 83 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index b99d1e06..03e816d1 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1478,27 +1478,7 @@ void ScriptSlave::FollowingPath(Event *ev)
             }
         }
 
-        if (m_iCurNode <= 0) {
-            vTmp          = m_pCurPath->GetByNode(m_iCurNode, NULL);
-            vWishPosition = (vTmp + 1);
-            vDelta        = vWishPosition - origin;
-
-            if (vDelta.length() <= 32.0f) {
-                m_iCurNode++;
-
-                if (m_iCurNode >= m_pCurPath->m_iPoints) {
-                    velocity  = vec_zero;
-                    avelocity = vec_zero;
-
-                    delete m_pCurPath;
-                    m_pCurPath = NULL;
-                    m_iCurNode = 0;
-                    moving     = false;
-                    ProcessEvent(EV_ScriptSlave_MoveDone);
-                    return;
-                }
-            }
-        } else {
+        if (m_iCurNode > 0) {
             vTmp  = m_pCurPath->GetByNode(m_iCurNode - 1, NULL);
             vPrev = (vTmp + 1);
             vTmp  = m_pCurPath->GetByNode(m_iCurNode, NULL);
@@ -1509,7 +1489,7 @@ void ScriptSlave::FollowingPath(Event *ev)
             angles.AngleVectorsLeft(&vWishAngles);
 
             fCoef = ProjectLineOnPlane(vWishAngles, DotProduct(origin, vWishAngles), vPrev, vCur, NULL);
-
+            
             vTmp          = m_pCurPath->GetByNode((m_iCurNode - (1.0f - fCoef)), NULL);
             vTmp          = m_pCurPath->Get(vTmp[0] + m_fLookAhead, NULL);
             vWishPosition = (vTmp + 1);
@@ -1517,6 +1497,26 @@ void ScriptSlave::FollowingPath(Event *ev)
             if (fCoef > 1.0f) {
                 m_iCurNode++;
 
+                if (m_iCurNode >= m_pCurPath->m_iPoints) {
+                    velocity  = vec_zero;
+                    avelocity = vec_zero;
+
+                    delete m_pCurPath;
+                    m_pCurPath = NULL;
+                    m_iCurNode = 0;
+                    moving     = false;
+                    ProcessEvent(EV_ScriptSlave_MoveDone);
+                    return;
+                }
+            }
+        } else {
+            vTmp          = m_pCurPath->GetByNode(m_iCurNode, NULL);
+            vWishPosition = (vTmp + 1);
+            vDelta        = vWishPosition - origin;
+
+            if (vDelta.length() <= 32.0f) {
+                m_iCurNode++;
+
                 if (m_iCurNode >= m_pCurPath->m_iPoints) {
                     velocity  = vec_zero;
                     avelocity = vec_zero;
@@ -1531,11 +1531,11 @@ void ScriptSlave::FollowingPath(Event *ev)
             }
         }
 
-        vWishAngles = vWishPosition - origin;
+        vDelta = vWishPosition - origin;
 
-        if (vWishAngles.length() > 0.0f) {
-            VectorNormalize(vWishAngles);
-            VectorToAngles(vWishAngles, vNextWishAngles);
+        if (vDelta.length() > 0.0f) {
+            vDelta.normalize();
+            VectorToAngles(vDelta, vNextWishAngles);
 
             //
             // Added in 2.0
@@ -1545,33 +1545,33 @@ void ScriptSlave::FollowingPath(Event *ev)
                 vNextWishAngles[0] *= -1;
             }
         } else {
-            AngleVectorsLeft(angles, vWishAngles, NULL, NULL);
             vNextWishAngles = angles;
+            AngleVectorsLeft(angles, vDelta, NULL, NULL);
         }
 
         vAngles = angles;
 
         for (int i = 0; i < 3; i++) {
+            float change, error;
+
             n_angles[i] = vNextWishAngles[i] - angles[i];
 
-            if (n_angles[i] <= 180.0f) {
-                if (n_angles[i] < -180.0f) {
-                    n_angles[i] += 360.0f;
-                }
-            } else {
-                n_angles[i] -= 360.0f;
+            if (n_angles[i] > 180) {
+                n_angles[i] -= 360;
+            } else if (n_angles[i] < -180) {
+                n_angles[i] += 360;
             }
 
-            float change = level.frametime * 360.0f;
-            float error  = 0.33f * n_angles[i];
+            change = level.frametime * 360.0f;
+            error  = 0.33f * n_angles[i];
 
-            if (-change > error) {
+            if (error < -change) {
                 error = -change;
-            } else if (error <= change) {
-                change = error;
+            } else if (error > change) {
+                error = change;
             }
 
-            primal_angles[i] = change + angles[i];
+            primal_angles[i] = angles[i] + error;
         }
 
         setAngles(primal_angles);
@@ -1603,15 +1603,15 @@ void ScriptSlave::FollowingPath(Event *ev)
         }
 
         avelocity = vDeltaAngles;
-        velocity  = vWishAngles * m_fCurSpeed;
+        velocity  = vDelta * m_fCurSpeed;
 
-        if (m_fCurSpeed < m_fIdealSpeed) {
+        if (m_fIdealSpeed > m_fCurSpeed) {
             m_fCurSpeed += m_fIdealAccel * level.frametime;
 
             if (m_fCurSpeed > m_fIdealSpeed) {
                 m_fCurSpeed = m_fIdealSpeed;
             }
-        } else if (m_fCurSpeed > m_fIdealSpeed) {
+        } else if (m_fIdealSpeed < m_fCurSpeed) {
             m_fCurSpeed -= m_fIdealAccel * level.frametime;
 
             if (m_fCurSpeed < m_fIdealSpeed) {
@@ -1797,15 +1797,11 @@ void ScriptSlave::EventNormalAngles(Event *ev)
 void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
 {
     str name;
-    //int iObjNum;
+    int                     iObjNum = 0;
     Vector                  vLastOrigin;
     SimpleEntity           *ent;
     int                     i;
-    static cSpline<4, 512> *pTmpPath = NULL;
-
-    if (!pTmpPath) {
-        pTmpPath = new cSpline<4, 512>;
-    }
+    static cSpline<4, 512> *pTmpPath = new cSpline<4, 512>;
 
     if (!pPath) {
         return;
@@ -1818,25 +1814,24 @@ void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
 
     name = se->Target();
 
-    if (name.c_str()) {
-        Vector vDelta;
-        vec4_t origin;
-        float  fCurLength;
+    if (name.length()) {
+        i = 0;
 
-        i          = 0;
-        fCurLength = 0;
-        ent        = se;
-        while (ent) {
-            if (vLastOrigin.length() == 0.0f && i > 1) {
+        for(ent = se; ent; ent = ent->Next()) {
+            Vector vDelta;
+            vec4_t vTmp;
+
+            vDelta = vLastOrigin - ent->origin;
+
+            if (vDelta.length() == 0 && i > 1) {
                 Com_Printf("^~^~^Warning: ScriptSlave Flying with a Path that contains 2 equal points\n");
             } else {
-                origin[0] = fCurLength;
-                origin[1] = ent->origin[0];
-                origin[2] = ent->origin[1];
-                origin[3] = ent->origin[2];
-                pTmpPath->Add(origin, 0);
+                vTmp[0] = iObjNum++;
+                vTmp[1] = ent->origin[0];
+                vTmp[2] = ent->origin[1];
+                vTmp[3] = ent->origin[2];
+                pTmpPath->Add(vTmp, 0);
                 vLastOrigin = ent->origin;
-                fCurLength++;
             }
 
             if (ent == se && i > 1) {
@@ -1844,35 +1839,38 @@ void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
             }
 
             i++;
-            ent = ent->Next();
         }
+    }
 
-        if (pTmpPath->m_iPoints > 2) {
-            float *vTmp;
+    if (pTmpPath->m_iPoints > 2) {
+        float* vTmp;
+        float fCurLength = 0;
+        vec3_t vLastOrigin;
+        vec3_t origin;
+        vec3_t vDelta;
 
-            pPath->Reset();
-            vTmp = pTmpPath->GetByNode(0.0f, 0);
+        pPath->Reset();
 
-            vLastOrigin[0] = vTmp[1];
-            vLastOrigin[1] = vTmp[2];
-            vLastOrigin[2] = vTmp[3];
+        vTmp = pTmpPath->GetByNode(0, NULL);
+        VectorCopy((vTmp + 1), vLastOrigin);
+        VectorCopy((vTmp + 1), origin);
 
-            fCurLength = 0;
+        for (i = 0; i < pTmpPath->m_iPoints; i++) {
+            vec4_t vTmp2;
 
-            for (i = 0; i < pTmpPath->m_iPoints; i++) {
-                vTmp = pTmpPath->GetByNode(i, 0);
+            vTmp = pTmpPath->GetByNode(i, NULL);
 
-                vDelta = (vTmp + 1) - vLastOrigin;
+            VectorCopy((vTmp + 1), vLastOrigin);
+            VectorSubtract(vLastOrigin, origin, vDelta);
 
-                fCurLength += vDelta.length();
-                origin[0] = fCurLength;
-                origin[1] = vTmp[1];
-                origin[2] = vTmp[2];
-                origin[3] = vTmp[3];
+            fCurLength += VectorLength(vDelta);
+            vTmp2[0] = fCurLength;
+            vTmp2[1] = vLastOrigin[0];
+            vTmp2[2] = vLastOrigin[1];
+            vTmp2[3] = vLastOrigin[2];
 
-                pPath->Add(origin, 0);
-                vLastOrigin = (vTmp + 1);
-            }
+            pPath->Add(vTmp2, 0);
+            VectorCopy(vLastOrigin, origin);
         }
     }
 }

From af919dadca924122c31ba8310baa7cc198d10e5c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Apr 2024 20:04:21 +0200
Subject: [PATCH 0342/2040] Simplified code for g_showflypath

---
 code/fgame/scriptslave.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 03e816d1..12602121 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1463,17 +1463,17 @@ void ScriptSlave::FollowingPath(Event *ev)
         if (g_showflypath && g_showflypath->integer) {
             for (int i = 0; i < m_pCurPath->m_iPoints; i++) {
                 vTmp = m_pCurPath->GetByNode(i, NULL);
-                G_DebugBBox((vTmp + 1), Vector(-32, -32, -32), Vector(32, 32, 32), 0.0f, 1.0f, 1.0f, 1.0f);
+                VectorCopy((vTmp + 1), vCur);
+
+                G_DebugBBox(vCur, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
 
                 for (int ii = 0; ii <= 8; ii++) {
-                    G_DebugLine(
-                        (m_pCurPath->GetByNode((ii / 10.0f + (i + 1)), NULL) + 1),
-                        (m_pCurPath->GetByNode(m_fLookAhead + (ii / 10.0f + (i + 1)), NULL) + 1),
-                        0.0f,
-                        1.0f,
-                        1.0f,
-                        1.0f
-                    );
+                    vTmp = m_pCurPath->GetByNode(i + ii / 10.0, NULL);
+                    VectorCopy((vTmp + 1), vPrev);
+                    vTmp = m_pCurPath->GetByNode(i + ii / 10.0 + m_fLookAhead, NULL);
+                    VectorCopy((vTmp + 1), vCur);
+
+                    G_DebugLine(vPrev, vCur, 0, 1, 0, 1);
                 }
             }
         }

From 16f775c78c6f9f7546bab7482b721e460e877ada Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Apr 2024 23:04:09 +0200
Subject: [PATCH 0343/2040] Fixed ScriptSlave path with 2 equal points

This fixes the script slave moving infinitely and not sending movedone notifications as it would never advance to the next path. e3l4's outro is now fixed because of that (was stuck).
---
 code/fgame/scriptslave.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 12602121..91e67eaf 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1479,19 +1479,22 @@ void ScriptSlave::FollowingPath(Event *ev)
         }
 
         if (m_iCurNode > 0) {
+            // Get previous node
             vTmp  = m_pCurPath->GetByNode(m_iCurNode - 1, NULL);
             vPrev = (vTmp + 1);
-            vTmp  = m_pCurPath->GetByNode(m_iCurNode, NULL);
-            vCur  = (vTmp + 1);
+            // Get current node
+            vTmp = m_pCurPath->GetByNode(m_iCurNode, NULL);
+            vCur = (vTmp + 1);
 
-            m_vIdealDir = vCur - vPrev;
+            vDelta = vCur - vPrev;
+            m_vIdealDir = vDelta;
             VectorNormalize(m_vIdealDir);
             angles.AngleVectorsLeft(&vWishAngles);
 
             fCoef = ProjectLineOnPlane(vWishAngles, DotProduct(origin, vWishAngles), vPrev, vCur, NULL);
             
-            vTmp          = m_pCurPath->GetByNode((m_iCurNode - (1.0f - fCoef)), NULL);
-            vTmp          = m_pCurPath->Get(vTmp[0] + m_fLookAhead, NULL);
+            vTmp = m_pCurPath->GetByNode(m_iCurNode - (1.0 - fCoef), NULL);
+            vTmp = m_pCurPath->Get(vTmp[0] + m_fLookAhead, NULL);
             vWishPosition = (vTmp + 1);
 
             if (fCoef > 1.0f) {
@@ -1505,6 +1508,7 @@ void ScriptSlave::FollowingPath(Event *ev)
                     m_pCurPath = NULL;
                     m_iCurNode = 0;
                     moving     = false;
+
                     ProcessEvent(EV_ScriptSlave_MoveDone);
                     return;
                 }
@@ -1800,7 +1804,7 @@ void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
     int                     iObjNum = 0;
     Vector                  vLastOrigin;
     SimpleEntity           *ent;
-    int                     i;
+    int                     i = 1;
     static cSpline<4, 512> *pTmpPath = new cSpline<4, 512>;
 
     if (!pPath) {
@@ -1815,8 +1819,6 @@ void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
     name = se->Target();
 
     if (name.length()) {
-        i = 0;
-
         for(ent = se; ent; ent = ent->Next()) {
             Vector vDelta;
             vec4_t vTmp;

From 05a6b43e0893295b1279983cb5cf52818e68f1ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 19:25:02 +0200
Subject: [PATCH 0344/2040] Check for __APPLE__ to detect MacOS

---
 code/gamespy/common/gsPlatform.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/gamespy/common/gsPlatform.h b/code/gamespy/common/gsPlatform.h
index a4daf16e..6264efc4 100644
--- a/code/gamespy/common/gsPlatform.h
+++ b/code/gamespy/common/gsPlatform.h
@@ -8,7 +8,7 @@
 // Windows:          _WIN32
 // Xbox:             _WIN32 + _XBOX
 // Xbox360:          _WIN32 + _XBOX + _X360
-// MacOSX:           _MACOSX + _UNIX
+// MacOSX:           _MACOSX + _UNIX + __APPLE__
 // Linux:            _LINUX + _UNIX
 // Nintendo DS:      _NITRO
 // PSP:              _PSP
@@ -34,7 +34,7 @@
 	#endif
 #endif
 
-#if defined(_LINUX) || defined(_MACOSX)
+#if defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__)
 	#define _UNIX
 #endif
 

From d4dfde334088be3558e447a1bce388e506e8d72c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 30 Apr 2024 20:26:08 +0200
Subject: [PATCH 0345/2040] Trigger must not be effective when being damaged if
 it does not take damage

This fixes issue with vehicles damaging triggers by touching them (like the ClickItemTrigger on m5l3 with tanks)
---
 code/fgame/trigger.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index f2aebed3..5cbe0cba 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -766,6 +766,10 @@ void Trigger::DamageEvent(Event *ev)
     Vector  dir;
     Vector  momentum;
 
+    if (!takedamage) {
+        return;
+    }
+
     if (Immune(ev->GetInteger(9))) {
         // trigger is immune
         return;

From 35681e7a1f25ad578750aff2627dfe49e9ffe58c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 17:42:02 +0200
Subject: [PATCH 0346/2040] Added MASK_IGNORE_ENTS

---
 code/fgame/bg_public.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 9cfed026..dcdbc48a 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -705,6 +705,7 @@ movement on the server game.
      | CONTENTS_WEAPONCLIP)
 #define MASK_CORNER_NODE \
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
+#define MASK_IGNORE_ENTS (CONTENTS_CORPSE | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_CLAYPIDGEON | CONTENTS_LADDER)
 
     void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result);
 

From daa7aceecf33d8a130384eec52d9b7939ea8270e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 17:43:04 +0200
Subject: [PATCH 0347/2040] Fixed sighttrace not properly passing entities

This fixes the issue where some scripts (like e2l3's BattleHouse) expect sighttrace to ignore entities (fixes #202)
---
 code/fgame/scriptthread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 9cbd5bd9..fb0710ab 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -3778,7 +3778,7 @@ void ScriptThread::EventTrace(Event *ev)
 
 void ScriptThread::EventSightTrace(Event *ev)
 {
-    int    content_mask = MASK_LINE;
+    int    content_mask = MASK_SOLID;
     Vector start;
     Vector mins;
     Vector maxs;
@@ -3794,7 +3794,7 @@ void ScriptThread::EventSightTrace(Event *ev)
         mins = ev->GetVector(4);
     case 3:
         if (ev->GetInteger(3)) {
-            content_mask = MASK_SOLID;
+            content_mask &= ~MASK_IGNORE_ENTS;
         }
     case 2:
         end = ev->GetVector(2);

From e5dbfba55e6f4bdccae68a6d90afdab5a1a33851 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 17:54:41 +0200
Subject: [PATCH 0348/2040] Fixed an issue where scripts would get compiled
 every time they are executed, causing a performance issue

---
 code/fgame/scriptmaster.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 40232cd9..b036e08e 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -800,16 +800,16 @@ GameScript *ScriptMaster::GetGameScriptInternal(str& filename)
         gi.Error(ERR_DROP, "Script filename '%s' exceeds maximum length of %d\n", filename.c_str(), MAX_QPATH);
     }
 
+    strcpy(filepath, filename.c_str());
+    gi.FS_CanonicalFilename(filepath);
+    filename = filepath;
+
     scr = m_GameScripts[StringDict.findKeyIndex(filename)];
 
     if (scr != NULL) {
         return scr;
     }
 
-    strcpy(filepath, filename.c_str());
-    gi.FS_CanonicalFilename(filepath);
-    filename = filepath;
-
     scr = new GameScript(filename);
 
     m_GameScripts[StringDict.addKeyIndex(filename)] = scr;

From c5b46529b0876cc07ed140b9c46b1ed91e12dc5b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 18:24:44 +0200
Subject: [PATCH 0349/2040] Check the client if it has a valid entity for
 MSG_SetBroadcastVisible()

---
 code/server/sv_game.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 05d4dc1e..6ff8229f 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -446,10 +446,16 @@ void MSG_SetBroadcastVisible( const vec_t *vPos, const vec_t *vPosB)
 	pCGM = g_CGMessages;
 	pClient = svs.clients;
 	for(i = 0; i < svs.iNumClients; i++,pCGM++,pClient++) {
-		if(pClient->state != CS_ACTIVE) {
+		if (!pClient->gentity || !pClient->gentity->inuse) {
+			// The entity can be null on map load
+			continue;
+		}
+
+		if(pClient->state == CS_FREE) {
 			g_CGMRecieve[i] = qfalse;
 			continue;
 		}
+
 		leafnum = CM_PointLeafnum(pClient->gentity->s.origin);
 		clientcluster = CM_LeafCluster(leafnum);
 		clientarea = CM_LeafArea(leafnum);

From 88bc0e1e85b2cd62ce351662cde8232fbdab452a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 18:36:27 +0200
Subject: [PATCH 0350/2040] Reimplemented MSG_SetBroadcastVisible() and
 MSG_SetBroadcastAll()

---
 code/server/sv_game.c | 96 ++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 38 deletions(-)

diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 6ff8229f..0be5e071 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -113,7 +113,8 @@ void SV_ClearCGMessage (int iClient)
 		g_CGMessages[iClient].datatypes = 0;
 	}
 	g_CGMRecieve[iClient] = 0;
-} 
+}
+
 void SV_ClearAllCGMessages ()
 {
 	cgm_t *pCGM;
@@ -133,8 +134,10 @@ void SV_ClearAllCGMessages ()
 		g_CGMRecieve[i] = 0;
 	}
 }
+
 #define CGM_DATA_SIZE 4096
 #define CGM_DATATYPES_SIZE 8192
+
 void SV_InitCGMessage (int iClient)
 {
 	cgm_t *pCGM;
@@ -211,6 +214,7 @@ static void MSG_WriteCGMBits (cgm_t *pCGM, int value, int bits)
 	pCGM->datatypes[pCGM->dtindex] = bits;
 	pCGM->dtindex++;
 }
+
 void PF_MSG_WriteBits (int value, int bits)
 {
 	cgm_t *pCGM;
@@ -234,7 +238,8 @@ void PF_MSG_WriteChar (int c)
 		// write 8 bit character
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
-} 
+}
+
 void PF_MSG_WriteByte (int c)
 {
 	cgm_t *pCGM;
@@ -247,6 +252,7 @@ void PF_MSG_WriteByte (int c)
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
 }
+
 void PF_MSG_WriteSVC (int c)
 {
 	cgm_t *pCGM;
@@ -258,6 +264,7 @@ void PF_MSG_WriteSVC (int c)
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
 }
+
 void PF_MSG_WriteShort (int c)
 {
 	cgm_t *pCGM;
@@ -269,6 +276,7 @@ void PF_MSG_WriteShort (int c)
 		MSG_WriteCGMBits(pCGM,c,16);
 	}
 }
+
 void PF_MSG_WriteLong (int c)
 {
  	cgm_t *pCGM;
@@ -280,6 +288,7 @@ void PF_MSG_WriteLong (int c)
 		MSG_WriteCGMBits(pCGM,c,32);
 	}
 }
+
 void PF_MSG_WriteFloat (float f)
 {
 	union {
@@ -296,6 +305,7 @@ void PF_MSG_WriteFloat (float f)
 		MSG_WriteCGMBits(pCGM,dat.l,32);
 	}
 }
+
 void PF_MSG_WriteString (const char *s)
 {
  	cgm_t *pCGM;
@@ -312,6 +322,7 @@ void PF_MSG_WriteString (const char *s)
 		}
 	}
 }
+
 void PF_MSG_WriteAngle8 (float f)
 {
  	cgm_t *pCGM;
@@ -323,6 +334,7 @@ void PF_MSG_WriteAngle8 (float f)
 		MSG_WriteCGMBits(pCGM,f * 256.0 / 360.0,8);
 	}
 }
+
 void PF_MSG_WriteAngle16 (float f)
 {
  	cgm_t *pCGM;
@@ -334,6 +346,7 @@ void PF_MSG_WriteAngle16 (float f)
 		MSG_WriteCGMBits(pCGM,ANGLE2SHORT(f),16);
 	}
 }
+
 void PF_MSG_WriteCoord (float f)
 {
  	cgm_t *pCGM;
@@ -354,6 +367,7 @@ void PF_MSG_WriteCoord (float f)
 		MSG_WriteCGMBits(pCGM, write, 19);
 	}
 }
+
 void PF_MSG_WriteDir (vec_t *dir)
 {
  	cgm_t *pCGM;
@@ -367,6 +381,7 @@ void PF_MSG_WriteDir (vec_t *dir)
 		MSG_WriteCGMBits(pCGM,b,8);
 	}
 }
+
 void PF_MSG_StartCGM (int type)
 {
     cgm_t *pCGM;
@@ -387,10 +402,12 @@ void PF_MSG_StartCGM (int type)
 		MSG_WriteCGMBits(pCGM, type, 6);
 	}
 }
+
 void PF_MSG_EndCGM ()
 {
 	memset(g_CGMRecieve,0,sizeof(g_CGMRecieve));
 }
+
 void PF_MSG_SetClient (int iClient)
 {
 	memset(g_CGMRecieve,0,sizeof(g_CGMRecieve));
@@ -400,7 +417,7 @@ void PF_MSG_SetClient (int iClient)
 	}
 }
 
-void MSG_SetBroadcastAll ()
+void MSG_SetBroadcastAll()
 {
 	cgm_t *pCGM;
 	client_t* client;
@@ -410,16 +427,24 @@ void MSG_SetBroadcastAll ()
 	for(i = 0; i < svs.iNumClients; i++,pCGM++) {
 		client = &svs.clients[i];
 
-		if (client->gentity && client->gentity->inuse && client->state != CS_FREE) {
-			if (pCGM->data && pCGM->cursize < 3968) {
-				g_CGMRecieve[i] = qtrue;
-			} else {
-				MSG_HandleCGMBufferOverflow(pCGM, 0);
-			}
+		if (!client->gentity || !client->gentity->inuse) {
+			continue;
 		}
+
+		if (client->state == CS_FREE) {
+			continue;
+		}
+
+		if (!pCGM->data || pCGM->cursize >= 3968) {
+			MSG_HandleCGMBufferOverflow(pCGM, qfalse);
+			continue;
+		}
+
+		g_CGMRecieve[i] = qtrue;
 	}
 }
-void MSG_SetBroadcastVisible( const vec_t *vPos, const vec_t *vPosB)
+
+void MSG_SetBroadcastVisible(const vec_t* vPos, const vec_t* vPosB)
 {
     byte *clientpvs;
     int posBcluster;
@@ -435,16 +460,22 @@ void MSG_SetBroadcastVisible( const vec_t *vPos, const vec_t *vPosB)
     int i;
 	cgm_t *pCGM;
 
-#if 0
-	MSG_SetBroadcastAll();
-#else
-	// dont check the same pos twice
-	if(vPosB && VectorCompare(vPos,vPosB)) {
-		vPosB = 0;
+	posleaf = CM_PointLeafnum(vPos);
+	posarea = CM_LeafArea(posleaf);
+	poscluster = CM_LeafCluster(posleaf);
+
+	if (vPosB) {
+		posBleaf = CM_PointLeafnum(vPosB);
+		posBarea = CM_LeafArea(posBleaf);
+		posBcluster = CM_LeafCluster(posBleaf);
+	} else {
+		posBarea = 0;
+		posBcluster = 0;
 	}
 
 	pCGM = g_CGMessages;
 	pClient = svs.clients;
+
 	for(i = 0; i < svs.iNumClients; i++,pCGM++,pClient++) {
 		if (!pClient->gentity || !pClient->gentity->inuse) {
 			// The entity can be null on map load
@@ -452,40 +483,29 @@ void MSG_SetBroadcastVisible( const vec_t *vPos, const vec_t *vPosB)
 		}
 
 		if(pClient->state == CS_FREE) {
-			g_CGMRecieve[i] = qfalse;
 			continue;
 		}
 
 		leafnum = CM_PointLeafnum(pClient->gentity->s.origin);
-		clientcluster = CM_LeafCluster(leafnum);
 		clientarea = CM_LeafArea(leafnum);
+		clientcluster = CM_LeafCluster(leafnum);
 		clientpvs = CM_ClusterPVS(clientcluster);
 
-		posleaf = CM_PointLeafnum(vPos);
-		poscluster = CM_LeafCluster(posleaf);
-		posarea = CM_LeafArea(posleaf);
-
-		if ( clientpvs[poscluster >> 3] & (1 << (poscluster&7) ) ) {
-			// visible.
-			g_CGMRecieve[i] = qtrue;
+		if (CM_AreasConnected(clientarea, posarea) && (!vPosB || !CM_AreasConnected(clientarea, posBarea))) {
 			continue;
 		}
-	
-		if(vPosB) {
-			posBleaf = CM_PointLeafnum(vPosB);
-			posBcluster = CM_LeafCluster(posBleaf);
-			posBarea = CM_LeafArea(posBleaf);
 
-			if ( clientpvs[posBcluster >> 3] & (1 << (posBcluster&7) ) ) {
-				// visible.
-				g_CGMRecieve[i] = qtrue;
-				continue;
-			}
+		if (!(clientpvs[poscluster >> 3] & (1 << (poscluster & 7))) && (!vPosB || !(clientpvs[posBcluster >> 3] & (1 << (posBcluster & 7))))) {
+			continue;
 		}
-		// not visible
-		g_CGMRecieve[i] = qfalse;
+
+		if (!pCGM->data || pCGM->cursize >= 3968) {
+			MSG_HandleCGMBufferOverflow(pCGM, qfalse);
+			continue;
+		}
+
+		g_CGMRecieve[i] = qtrue;
 	}
-#endif
 }
 void MSG_SetBroadcastHearable ( const vec_t *vPos, const vec_t *vPosB)
 {

From ff6e81d44f453c38932d0b269b2ed709155f7486 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 18:55:25 +0200
Subject: [PATCH 0351/2040] Fixed CL_GetSnapshot sometimes wrongfully assigning
 parents multiple times and displaying errors

This should fix #170
---
 code/client/cl_cgame.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 4733b336..da55bb05 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -211,20 +211,20 @@ qboolean	CL_GetSnapshot( int snapshotNumber, snapshot_t *snapshot ) {
 	}
 
 	snapshot->numEntities = 0;
-	for ( i = 0 ; i < count ; i++ ) {
+	for(i = 0; i < MAX_ENTITIES_IN_SNAPSHOT; i++) {
+		parents[i] = -1;
+	}
+
+	for (i = 0; i < count; i++) {
 		s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
 		pnum = s1->parent;
 
 		if (pnum == ENTITYNUM_NONE) {
 			parents[s1->number] = -2;
-		}
-		else
-		{
+		} else {
 			if (parents[pnum] == -2) {
 				parents[s1->number] = -2;
-			}
-			else
-			{
+			} else {
 				// add it later
 				parents[s1->number] = pnum;
 				continue;
@@ -234,20 +234,20 @@ qboolean	CL_GetSnapshot( int snapshotNumber, snapshot_t *snapshot ) {
 		snapshot->entities[snapshot->numEntities++] = *s1;
 	}
 
-	for(pcount = 0; pcount < 8 && snapshot->numEntities != count; pcount++)
-	{
-		for (i = 0; i < count; i++)
-		{
+	for(pcount = 0; pcount < 8 && snapshot->numEntities != count; pcount++) {
+		for (i = 0; i < count; i++) {
 			s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
 			pnum = parents[s1->number];
 			if (pnum >= 0 && parents[pnum] == -2) {
+				parents[s1->number] = -2;
 				snapshot->entities[snapshot->numEntities++] = *s1;
 			}
 		}
 	}
 
-	if (pcount >= 8)
-	{
+	if (snapshot->numEntities != count) {
+		Com_DPrintf("CL_GetSnapshot: Not all children could find their parents.\n");
+
 		for (i = count; i < snapshot->numEntities; i++)
 		{
 			s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
@@ -261,6 +261,8 @@ qboolean	CL_GetSnapshot( int snapshotNumber, snapshot_t *snapshot ) {
 					s1->origin[1],
 					s1->origin[2]
 				);
+
+				parents[s1->number] = -2;
 			}
 		}
 	}

From 170b4b0972f9aa6b957f7ded6905382f105ce860 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 20:11:22 +0200
Subject: [PATCH 0352/2040] Fixed ScriptAimedStrafingGunfire aimTarget never
 set nor used

This fixes the gunfire incorrectly damaging things it shouldn't damage.

For example, the sniper3 balcony AI on e3l1:
The bomber caused this AI to fall before initialization (by damaging them when it shouldn't), the AI became nonsolid. After initialization, the AI had enemy enabled, however it remained nonsolid because of the balcony fall. It was constantly shooting at the player and it was unkillable because it was nonsolid.
The mission wasn't able to be completed because of this issue.
---
 code/fgame/scriptslave.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 91e67eaf..0d6d8601 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -2251,8 +2251,9 @@ Event EV_ScriptAimedStrafingGunfire_AimTarget
 );
 
 CLASS_DECLARATION(ScriptSimpleStrafingGunfire, ScriptAimedStrafingGunfire, "script_aimedstrafinggunfire") {
-    {&EV_ScriptSimpleStrafingGunfire_Fire, &ScriptAimedStrafingGunfire::GunFire},
-    {NULL,                                 NULL                                }
+    {&EV_ScriptAimedStrafingGunfire_AimTarget, &ScriptAimedStrafingGunfire::SetAimTarget},
+    {&EV_ScriptSimpleStrafingGunfire_Fire,     &ScriptAimedStrafingGunfire::GunFire     },
+    {NULL,                                 NULL                                         }
 };
 
 ScriptAimedStrafingGunfire::ScriptAimedStrafingGunfire()
@@ -2270,8 +2271,8 @@ void ScriptAimedStrafingGunfire::GunFire(Event *ev)
     Vector dir, right, up;
     Vector horzAngles;
 
-    AngleVectors(angles, NULL, NULL, up);
-    dir = -1 * up;
+    dir = aimTarget->origin - origin;
+    dir.normalize();
 
     VectorToAngles(dir, horzAngles);
     AngleVectors(horzAngles, NULL, right, up);

From db01f72adc4c060ce697290954d806600931cc1d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 May 2024 20:41:39 +0200
Subject: [PATCH 0353/2040] Reimplemented ScriptVariable::entityValue

Some script events don't check if it's an actual entity, it would cause crashes.
E3L3 would crash after the player got out of the AB41: the AB41 was targetting a VehiclePoint and vehicles_thinkers.scr script set the `self.collisionent` to `self.target` which caused a crash as `VehiclePoint` doesn't inherit from `Entity`
---
 code/script/scriptvariable.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index 5f32a1b9..b7d2c77a 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -900,10 +900,30 @@ void ScriptVariable::SetKey(const short3& key)
 
 #endif
 
-Entity *ScriptVariable::entityValue(void)
+Entity* ScriptVariable::entityValue(void)
 {
 #if defined(GAME_DLL)
-    return (Entity *)listenerValue();
+    Entity* ent;
+
+    switch (type) {
+    case VARIABLE_CONSTSTRING:
+        ent = static_cast<Entity*>(world->GetScriptTarget(Director.GetString(m_data.intValue)));
+        break;
+    case VARIABLE_STRING:
+        ent = static_cast<Entity*>(world->GetScriptTarget(stringValue()));
+        break;
+    case VARIABLE_LISTENER:
+        ent = static_cast<Entity*>(m_data.listenerValue->Pointer());
+        break;
+    default:
+        throw ScriptException("Cannot cast '%s' to entity", typenames[type]);
+    }
+
+    if (ent && !ent->isSubclassOf(Entity)) {
+        ScriptError("Cannot cast '%s' to entity", ent->getClassname());
+    }
+
+    return ent;
 #else
     return NULL;
 #endif

From dc7caf04a8c40e91bc556eb849482bb2738411b0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 12 May 2024 23:40:11 +0200
Subject: [PATCH 0354/2040] Fixed MoveTo not working on waypoints.

This fixes an issue where objects using waypoint (like elevators) would move at `(0 0 0)`. Closes #298
---
 code/fgame/scriptslave.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 0d6d8601..90c2b365 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -969,9 +969,18 @@ void ScriptSlave::MoveToEvent(Event *ev)
     if (ev->IsVectorAt(1)) {
         NewPos = ev->GetVector(1);
     } else {
-        waypoint = (Waypoint *)ev->GetEntity(1);
-        if (waypoint) {
-            NewPos = waypoint->origin;
+        SimpleEntity* ent;
+
+        ent = ev->GetSimpleEntity(1);
+        if (ent) {
+            //
+            // see if it is a waypoint
+            //
+            if (ent->IsSubclassOfWaypoint()) {
+                waypoint = static_cast<Waypoint*>(ent);
+            }
+            // use the entity's origin
+            NewPos = ent->origin;
         }
     }
 }

From 98239050d892cf9d92997c448bcdb52024d3d46b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 12 May 2024 23:49:19 +0200
Subject: [PATCH 0355/2040] Correctly archive the active weapon (safe pointer)

This fixes the player sometimes being holstered after loading from a save (closes #270)
---
 code/fgame/sentient_combat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index adc0241d..0e957210 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -33,7 +33,7 @@ ActiveWeapon::ActiveWeapon()
 
 void ActiveWeapon::Archive(Archiver& arc)
 {
-    arc.ArchiveObjectPointer((Class **)&weapon);
+    arc.ArchiveSafePointer(&weapon);
     ArchiveEnum(hand, weaponhand_t);
 }
 

From c3abbd901404bbe1e025ddc4fb9677a4b3e855ff Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 20 May 2024 13:10:12 +0200
Subject: [PATCH 0356/2040] Added assertion checks

---
 code/renderer/tr_model.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index 19a4514e..137ae4a4 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -1058,7 +1058,7 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
     skelHeaderGame_t* skelmodel;
     skelSurfaceGame_t* psurface;
     qboolean bFound;
-    short collapse[1000];
+    short collapse[TIKI_MAX_VERTEXES];
 
 	if (!r_drawentitypoly->integer) {
 		return;
@@ -1185,15 +1185,22 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 	}
 	else
     {
+		assert(sf->numVerts < TIKI_MAX_VERTEXES);
+
         for (i = 0; i < render_count; i++) {
             collapse[i] = i;
         }
+
         for (i = render_count; i < sf->numVerts; i++) {
             collapse[i] = collapse[collapse_map[i]];
         }
 
         for (i = 0; i < indexes; i += 3)
         {
+			assert(collapse[triangles[i]] < sf->numVerts);
+			assert(collapse[triangles[i + 1]] < sf->numVerts);
+			assert(collapse[triangles[i + 2]] < sf->numVerts);
+
             if (collapse[triangles[i]] == collapse[triangles[i + 1]] ||
                 collapse[triangles[i + 1]] == collapse[triangles[i + 2]] ||
                 collapse[triangles[i + 2]] == collapse[triangles[i]])

From 85c8769512aff9290a9c2ca7cff6b8d8ea0409d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 20 May 2024 13:11:48 +0200
Subject: [PATCH 0357/2040] Fixed incorrect usage of the grid lighting

This fixes some entities being invisible when `r_fastentlight` is set to 1, due to the alpha color being 0 (cast from int to char for each color value). Fixes #299
---
 code/renderer/tr_shade_calc.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index 041729b5..792e38db 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -1661,18 +1661,18 @@ void RB_CalcLightGridColor(unsigned char* colors)
 
 	if (!backEnd.currentEntity) {
 		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = backEnd.currentStaticModel->iGridLighting;
-			colors[i * 4 + 1] = backEnd.currentStaticModel->iGridLighting;
-			colors[i * 4 + 2] = backEnd.currentStaticModel->iGridLighting;
-			colors[i * 4 + 3] = backEnd.currentStaticModel->iGridLighting;
+			colors[i * 4] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[0];
+			colors[i * 4 + 1] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[1];
+			colors[i * 4 + 2] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[2];
+			colors[i * 4 + 3] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[3];
 		}
 	}
 	else if (backEnd.currentEntity != &tr.worldEntity) {
 		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = backEnd.currentEntity->iGridLighting;
-			colors[i * 4 + 1] = backEnd.currentEntity->iGridLighting;
-			colors[i * 4 + 2] = backEnd.currentEntity->iGridLighting;
-			colors[i * 4 + 3] = backEnd.currentEntity->iGridLighting;
+			colors[i * 4] = ((byte*)&backEnd.currentEntity->iGridLighting)[0];
+			colors[i * 4 + 1] = ((byte*)&backEnd.currentEntity->iGridLighting)[1];
+			colors[i * 4 + 2] = ((byte*)&backEnd.currentEntity->iGridLighting)[2];
+			colors[i * 4 + 3] = ((byte*)&backEnd.currentEntity->iGridLighting)[3];
 		}
 	}
 	else {

From 16464c5a6813f84788d6b808a2848f9124953afa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 27 May 2024 23:28:12 +0200
Subject: [PATCH 0358/2040] Removed zone events from entity

This fixes a conflict where some scripts would store stuff in a variable named `zone` in an entity
---
 code/fgame/entity.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 471b4bff..07f264a1 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -1471,6 +1471,7 @@ Event EV_Entity_SetDHack
     "Enable or disable depth hack.",
     EV_NORMAL
 );
+/*
 Event EV_Entity_GetZone
 (
     "getzone",
@@ -1498,6 +1499,7 @@ Event EV_Entity_IsInZone
     "Returns 1 if the entity is in the specified zone. 0 otherwise",
     EV_RETURN
 );
+*/
 Event EV_Entity_SetHintRequireLookAt
 (
     "setuselookat",
@@ -1667,9 +1669,11 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_ShootableOnly,                &Entity::EventShootableOnly       },
     {&EV_SetShaderTime,                &Entity::SetShaderTime            },
     {&EV_NoTarget,                     &Entity::NoTarget                 },
+    /*
     {&EV_Entity_GetZone,               &Entity::GetZone                  },
     {&EV_Entity_Zone,                  &Entity::GetZone                  },
     {&EV_Entity_IsInZone,              &Entity::IsInZone                 },
+    */
     {&EV_Entity_SetDHack,              &Entity::SetDepthHack             },
     {&EV_Entity_SetHintRequireLookAt,  &Entity::SetHintRequireLookAt     },
     {&EV_Entity_SetHintString,         &Entity::SetHintString            },

From a85694b5489c01e8874e0f07f0f3a8292afdeeae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 May 2024 20:49:03 +0200
Subject: [PATCH 0359/2040] Fixed incorrect method for
 `EV_ScriptThread_Showmenu`.

This fixes #302 where screen text with the mission date would never be shown.
---
 code/fgame/scriptthread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index fb0710ab..1f28c78f 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2113,7 +2113,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_MissionFailed,           &ScriptThread::MissionFailed           },
     {&EV_ScriptThread_IsAlive,                 &ScriptThread::EventIsAlive            },
     {&EV_ScriptThread_Popmenu,                 &ScriptThread::EventPopmenu            },
-    {&EV_ScriptThread_Showmenu,                &ScriptThread::EventPopmenu            },
+    {&EV_ScriptThread_Showmenu,                &ScriptThread::EventShowmenu           },
     {&EV_ScriptThread_Hidemenu,                &ScriptThread::EventHidemenu           },
     {&EV_ScriptThread_PlayMovie,               &ScriptThread::EventPlayMovie          },
     {&EV_ScriptThread_Pushmenu,                &ScriptThread::EventPushmenu           },

From 21fda4cabd82065e852bc9b447ff52f91727a482 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 May 2024 21:31:28 +0200
Subject: [PATCH 0360/2040] Removed redundant code

---
 code/tiki/tiki_files.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index dbfd5e76..18bfae60 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -182,7 +182,7 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
     loaddef.numclientinitcmds = 0;
 
     if (loaddef.tikiFile.LoadFile(path, qfalse)) {
-        loaddef.path = path;
+        loaddef.bInIncludesSection = false;
 
         token = loaddef.tikiFile.GetToken(true);
         if (strcmp(token, "TIKI")) {
@@ -195,11 +195,6 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
             return NULL;
         }
 
-        loaddef.numanims           = 0;
-        loaddef.numserverinitcmds  = 0;
-        loaddef.numclientinitcmds  = 0;
-        loaddef.bInIncludesSection = false;
-
         while (loaddef.tikiFile.TokenAvailable(true)) {
             token = loaddef.tikiFile.GetToken(true);
 

From e89262ed3ba5d6640a82fca986bbf2aecea02fd6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 May 2024 21:38:17 +0200
Subject: [PATCH 0361/2040] Fixed TIKI_ParseAnimations improperly returning,
 even when a map was specified, causing parsing issues

---
 code/tiki/tiki_parse.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 1fe94eed..6765a268 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -322,9 +322,9 @@ qboolean TIKI_ParseIncludes(dloaddef_t *ld)
     }
 
     while (1) {
-        if (!strncmp(token, mapname, strlen(token)) || !strncmp(token, servertype, strlen(token))) {
+        if (!Q_stricmpn(token, mapname, strlen(token)) || !Q_stricmpn(token, servertype, strlen(token))) {
             b_incl = true;
-        } else if ((!stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true))) {
+        } else if (!stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true)) {
             break;
         }
 
@@ -387,7 +387,11 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
         if (!stricmp(token, "}")) {
-            return;
+            if (!b_mapspec) {
+                // Return when there is no mapspec
+                return;
+            }
+            b_mapspec = false;
         } else if (!stricmp(token, "$mapspec")) {
             token = ld->tikiFile.GetToken(true);
             if (sv_mapname) {
@@ -415,7 +419,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
 
                     if (strstr(token, "}")) {
                         if (!depth) {
-                            break;
+                            continue;
                         }
 
                         depth--;
@@ -423,7 +427,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
                 }
             }
         } else {
-            if (ld->numanims > 4094) {
+            if (ld->numanims >= MAX_TIKI_LOAD_ANIMS) {
                 TIKI_Error("TIKI_ParseAnimations: Too many animations in '%s'.\n", ld->path);
                 continue;
             }
@@ -440,8 +444,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
                 continue;
             }
 
-            depth = strlen(token);
-            if (depth < 48) {
+            if (strlen(token) < 48) {
                 anim->alias = (char *)TIKI_CopyString(token);
 
                 token = ld->tikiFile.GetToken(false);

From 0a3a23af41677dbdf0224026e4b631e5bfd8907e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 29 May 2024 23:54:48 +0200
Subject: [PATCH 0362/2040] Using AI_EVENT_MAX to check for max ai events

---
 code/fgame/entity.h    |  3 ++-
 code/fgame/g_utils.cpp | 24 ++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/code/fgame/entity.h b/code/fgame/entity.h
index 4e8fd2f1..901dc457 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -81,7 +81,8 @@ enum eAIEvent {
     AI_EVENT_MISC_LOUD,
     AI_EVENT_FOOTSTEP,
     AI_EVENT_GRENADE,
-    AI_EVENT_BADPLACE // Added in 2.0
+    AI_EVENT_BADPLACE, // Added in 2.0
+    AI_EVENT_MAX
 };
 
 //deadflag
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 828271c7..8fca9c03 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1641,14 +1641,30 @@ int G_AIEventTypeFromString(const char *pszType)
 float G_AIEventRadius(int iType)
 {
     static float fRadius[] = {
-        2048.0f, 384.0f, 4096.0f, 1024.0f, 1024.0f, 1536.0f, 1536.0f, 1500.0f, 2250.0f, 512.0f, 384.0f, 0, 0, 0, 0};
+        0,
+        2048,
+        384,
+        4096,
+        1024,
+        1024,
+        1536,
+        1536,
+        1500,
+        2250,
+        512,
+        384,
+        32768,
+        0,
+        0,
+        0
+    };
 
-    if (iType <= AI_EVENT_GRENADE) {
-        return fRadius[iType];
-    } else {
+    if (iType >= AI_EVENT_MAX) {
         Com_Printf("G_AIEventRadius: invalid event type\n");
         return 1500.0f;
     }
+
+    return fRadius[iType];
 }
 
 void G_BroadcastAIEvent(Entity *originator, Vector origin, char *pszType)

From 7fe7e74fe2020153130d6d5e857005ed3778bb1b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Jun 2024 19:44:06 +0200
Subject: [PATCH 0363/2040] Replaced all stricmp calls with Q_stricmp

---
 code/tiki/tiki_files.cpp |  18 +++---
 code/tiki/tiki_parse.cpp | 128 +++++++++++++++++++--------------------
 2 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 18bfae60..f50421ba 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -198,16 +198,16 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
         while (loaddef.tikiFile.TokenAvailable(true)) {
             token = loaddef.tikiFile.GetToken(true);
 
-            if (!stricmp(token, "setup")) {
+            if (!Q_stricmp(token, "setup")) {
                 if (!TIKI_ParseSetup(&loaddef)) {
                     TIKI_FreeStorage(&loaddef);
                     return NULL;
                 }
-            } else if (!stricmp(token, "init")) {
+            } else if (!Q_stricmp(token, "init")) {
                 TIKI_ParseInit(&loaddef);
-            } else if (!stricmp(token, "animations")) {
+            } else if (!Q_stricmp(token, "animations")) {
                 TIKI_ParseAnimations(&loaddef);
-            } else if (!stricmp(token, "includes")) {
+            } else if (!Q_stricmp(token, "includes")) {
                 if (!loaddef.bInIncludesSection) {
                     loaddef.bInIncludesSection = TIKI_ParseIncludes(&loaddef);
                 } else {
@@ -218,7 +218,7 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
                         loaddef.tikiFile.Filename()
                     );
                 }
-            } else if (!stricmp(token, "}") && loaddef.bInIncludesSection) {
+            } else if (!Q_stricmp(token, "}") && loaddef.bInIncludesSection) {
                 loaddef.bInIncludesSection = false;
             } else {
                 TIKI_Error(
@@ -385,7 +385,7 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
         surfOffset = 0;
 
-        if (strptr || !stricmp(loadsurf->name, "all")) {
+        if (strptr || !Q_stricmp(loadsurf->name, "all")) {
             for (j = 0; j < temp.tiki.numMeshes; j++) {
                 mesh      = temp.tiki.mesh[j];
                 skelmodel = TIKI_GetSkel(mesh);
@@ -396,7 +396,7 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
                     if ((strptr && strptr != loadsurf->name
                          && !strnicmp(loadsurf->name, surf->name, strptr - loadsurf->name))
-                        || !stricmp(loadsurf->name, "all")) {
+                        || !Q_stricmp(loadsurf->name, "all")) {
                         TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
                         found = true;
                     }
@@ -415,7 +415,7 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
                 tikiSurf = &tiki->surfaces[surfOffset];
 
                 for (k = 0; k < skelmodel->numSurfaces; k++) {
-                    if (!stricmp(loadsurf->name, surf->name)) {
+                    if (!Q_stricmp(loadsurf->name, surf->name)) {
                         TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
                         if (!tikiSurf->name[0]) {
                             TIKI_Warning(
@@ -629,7 +629,7 @@ bool SkeletorCacheFindFilename(const char *path, int *indexPtr)
     upperBound = m_numInCache - 1;
     while (lowerBound <= upperBound) {
         index     = (lowerBound + upperBound) / 2;
-        sortValue = stricmp(path, m_cachedData[m_cachedDataLookup[index]].path);
+        sortValue = Q_stricmp(path, m_cachedData[m_cachedDataLookup[index]].path);
         if (!sortValue) {
             if (indexPtr) {
                 *indexPtr = index;
diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 6765a268..5ea4ad38 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -71,7 +71,7 @@ void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxc
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "}")) {
+        if (!Q_stricmp(token, "}")) {
             break;
         }
 
@@ -90,22 +90,22 @@ void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxc
             cmds->num_args = 0;
             (*numcmds)++;
 
-            if (!stricmp(token, "start") || !stricmp(token, "first")) {
+            if (!Q_stricmp(token, "start") || !Q_stricmp(token, "first")) {
                 framenum = TIKI_FRAME_FIRST;
-            } else if (!stricmp(token, "end")) {
+            } else if (!Q_stricmp(token, "end")) {
                 framenum = TIKI_FRAME_END;
-            } else if (!stricmp(token, "last")) {
+            } else if (!Q_stricmp(token, "last")) {
                 framenum = TIKI_FRAME_LAST;
-            } else if (!stricmp(token, "every")) {
+            } else if (!Q_stricmp(token, "every")) {
                 framenum = TIKI_FRAME_EVERY;
-            } else if (!stricmp(token, "exit")) {
+            } else if (!Q_stricmp(token, "exit")) {
                 framenum = TIKI_FRAME_EXIT;
-            } else if (!stricmp(token, "entry") || !stricmp(token, "enter")) {
+            } else if (!Q_stricmp(token, "entry") || !Q_stricmp(token, "enter")) {
                 framenum = TIKI_FRAME_ENTRY;
-            } else if (!stricmp(token, "(")) {
+            } else if (!Q_stricmp(token, "(")) {
                 usecurrentframe = true;
                 ld->tikiFile.UnGetToken();
-            } else if (!stricmp(token, ")")) {
+            } else if (!Q_stricmp(token, ")")) {
                 usecurrentframe = false;
                 ld->tikiFile.UnGetToken();
             } else if (!usecurrentframe) {
@@ -175,21 +175,21 @@ void TIKI_ParseAnimationCommands(dloaddef_t *ld, dloadanim_t *anim)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "client")) {
+        if (!Q_stricmp(token, "client")) {
             TIKI_ParseFrameCommands(
                 ld,
                 anim->loadclientcmds,
                 sizeof(anim->loadclientcmds) / sizeof(anim->loadclientcmds[0]),
                 &anim->num_client_cmds
             );
-        } else if (!stricmp(token, "server")) {
+        } else if (!Q_stricmp(token, "server")) {
             TIKI_ParseFrameCommands(
                 ld,
                 anim->loadservercmds,
                 sizeof(anim->loadservercmds) / sizeof(anim->loadservercmds[0]),
                 &anim->num_server_cmds
             );
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             break;
         } else {
             TIKI_Error(
@@ -221,26 +221,26 @@ void TIKI_ParseAnimationFlags(dloaddef_t *ld, dloadanim_t *anim)
     while (ld->tikiFile.TokenAvailable(false)) {
         token = ld->tikiFile.GetToken(false);
 
-        if (!stricmp(token, "weight")) {
+        if (!Q_stricmp(token, "weight")) {
             anim->weight = ld->tikiFile.GetFloat(false);
             anim->flags |= TAF_RANDOM;
-        } else if (!stricmp(token, "deltadriven")) {
+        } else if (!Q_stricmp(token, "deltadriven")) {
             anim->flags |= TAF_DELTADRIVEN;
-        } else if (!stricmp(token, "default_angles")) {
+        } else if (!Q_stricmp(token, "default_angles")) {
             anim->flags |= TAF_DEFAULT_ANGLES;
-        } else if (!stricmp(token, "notimecheck")) {
+        } else if (!Q_stricmp(token, "notimecheck")) {
             anim->flags |= TAF_NOTIMECHECK;
-        } else if (!stricmp(token, "crossblend")) {
+        } else if (!Q_stricmp(token, "crossblend")) {
             anim->blendtime = ld->tikiFile.GetFloat(false);
-        } else if (!stricmp(token, "dontrepeate")) {
+        } else if (!Q_stricmp(token, "dontrepeate")) {
             anim->flags |= TAF_NOREPEAT;
-        } else if (!stricmp(token, "random")) {
+        } else if (!Q_stricmp(token, "random")) {
             anim->flags |= TAF_RANDOM;
-        } else if (!stricmp(token, "autosteps_run")) {
+        } else if (!Q_stricmp(token, "autosteps_run")) {
             anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_RUNNING | TAF_AUTOSTEPS_EQUIPMENT;
-        } else if (!stricmp(token, "autosteps_walk")) {
+        } else if (!Q_stricmp(token, "autosteps_walk")) {
             anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_EQUIPMENT;
-        } else if (!stricmp(token, "autosteps_dog")) {
+        } else if (!Q_stricmp(token, "autosteps_dog")) {
             anim->flags |= TAF_AUTOSTEPS;
         } else {
             TIKI_Error(
@@ -272,7 +272,7 @@ void TIKI_ParseAnimationsFail(dloaddef_t *ld)
     }
 
     token = ld->tikiFile.GetToken(true);
-    if (stricmp(token, "{")) {
+    if (Q_stricmp(token, "{")) {
         ld->tikiFile.UnGetToken();
         return;
     }
@@ -281,9 +281,9 @@ void TIKI_ParseAnimationsFail(dloaddef_t *ld)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "{")) {
+        if (!Q_stricmp(token, "{")) {
             nestcount++;
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             nestcount--;
             if (!nestcount) {
                 break;
@@ -324,7 +324,7 @@ qboolean TIKI_ParseIncludes(dloaddef_t *ld)
     while (1) {
         if (!Q_stricmpn(token, mapname, strlen(token)) || !Q_stricmpn(token, servertype, strlen(token))) {
             b_incl = true;
-        } else if (!stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true)) {
+        } else if (!Q_stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true)) {
             break;
         }
 
@@ -386,13 +386,13 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "}")) {
+        if (!Q_stricmp(token, "}")) {
             if (!b_mapspec) {
                 // Return when there is no mapspec
                 return;
             }
             b_mapspec = false;
-        } else if (!stricmp(token, "$mapspec")) {
+        } else if (!Q_stricmp(token, "$mapspec")) {
             token = ld->tikiFile.GetToken(true);
             if (sv_mapname) {
                 mapname = sv_mapname->string;
@@ -401,9 +401,9 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
             }
 
             while (ld->tikiFile.TokenAvailable(true)) {
-                if (!strncmp(token, mapname, strlen(token))) {
+                if (!Q_strncmp(token, mapname, strlen(token))) {
                     b_mapspec = true;
-                } else if (!stricmp(token, "{")) {
+                } else if (!Q_stricmp(token, "{")) {
                     break;
                 }
 
@@ -468,7 +468,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
 
                 if (ld->tikiFile.TokenAvailable(true)) {
                     token = ld->tikiFile.GetToken(true);
-                    if (!stricmp(token, "{")) {
+                    if (!Q_stricmp(token, "{")) {
                         TIKI_ParseAnimationCommands(ld, anim);
                     } else {
                         ld->tikiFile.UnGetToken();
@@ -493,21 +493,21 @@ int TIKI_ParseSurfaceFlag(const char *token)
 {
     int flags = 0;
 
-    if (!stricmp(token, "skin1")) {
+    if (!Q_stricmp(token, "skin1")) {
         flags = TIKI_SURF_SKIN1;
-    } else if (!stricmp(token, "skin2")) {
+    } else if (!Q_stricmp(token, "skin2")) {
         flags = TIKI_SURF_SKIN2;
-    } else if (!stricmp(token, "skin3")) {
+    } else if (!Q_stricmp(token, "skin3")) {
         flags = TIKI_SURF_SKIN3;
-    } else if (!stricmp(token, "nodraw")) {
+    } else if (!Q_stricmp(token, "nodraw")) {
         flags = TIKI_SURF_NODRAW;
-    } else if (!stricmp(token, "nodamage")) {
+    } else if (!Q_stricmp(token, "nodamage")) {
         flags = TIKI_SURF_NODAMAGE;
-    } else if (!stricmp(token, "crossfade")) {
+    } else if (!Q_stricmp(token, "crossfade")) {
         flags = TIKI_SURF_CROSSFADE;
-    } else if (!stricmp(token, "nomipmaps")) {
+    } else if (!Q_stricmp(token, "nomipmaps")) {
         flags = TIKI_SURF_NOMIPMAPS;
-    } else if (!stricmp(token, "nopicmip")) {
+    } else if (!Q_stricmp(token, "nopicmip")) {
         flags = TIKI_SURF_NOPICMIP;
     } else {
         TIKI_Error("Unknown surface flag %s\n", token);
@@ -741,7 +741,7 @@ qboolean TIKI_LoadSetupCaseHeader(
             }
 
             val = keyValues->find(key);
-            if (val && !stricmp(val->c_str(), value)) {
+            if (val && !Q_stricmp(val->c_str(), value)) {
                 match = true;
             }
             break;
@@ -862,7 +862,7 @@ qboolean TIKI_LoadSetupCase(
             }
 
             for (currentSurface = 0; currentSurface < *numSurfacesSetUp; currentSurface++) {
-                if (!stricmp(loadsurfaces[currentSurface].name, name)) {
+                if (!Q_stricmp(loadsurfaces[currentSurface].name, name)) {
                     break;
                 }
             }
@@ -1001,21 +1001,21 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
 
-        if (!stricmp(token, "scale")) {
+        if (!Q_stricmp(token, "scale")) {
             load_scale = ld->tikiFile.GetFloat(false);
             WriteScale(ld, load_scale);
-        } else if (!stricmp(token, "lod_scale")) {
+        } else if (!Q_stricmp(token, "lod_scale")) {
             lod_scale = ld->tikiFile.GetFloat(false) / 5.0f;
             WriteLoadScale(ld, lod_scale);
-        } else if (!stricmp(token, "lod_bias")) {
+        } else if (!Q_stricmp(token, "lod_bias")) {
             lod_bias = ld->tikiFile.GetFloat(false);
             WriteLodBias(ld, lod_bias);
-        } else if (!stricmp(token, "skelmodel")) {
+        } else if (!Q_stricmp(token, "skelmodel")) {
             token = ld->tikiFile.GetToken(false);
             strcpy(name, ld->tikiFile.currentScript->path);
             strcat(name, token);
             WriteSkelmodel(ld, name);
-        } else if (!stricmp(token, "path")) {
+        } else if (!Q_stricmp(token, "path")) {
             token = ld->tikiFile.GetToken(false);
             strcpy(ld->tikiFile.currentScript->path, token);
             length = strlen(ld->tikiFile.currentScript->path);
@@ -1024,32 +1024,32 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
             if (*token != '/' && *token != '\\') {
                 strcat(ld->tikiFile.currentScript->path, "/");
             }
-        } else if (!stricmp(token, "orgin")) {
+        } else if (!Q_stricmp(token, "orgin")) {
             tmpVec[0] = ld->tikiFile.GetFloat(false);
             tmpVec[1] = ld->tikiFile.GetFloat(false);
             tmpVec[2] = ld->tikiFile.GetFloat(false);
             WriteOrigin(ld, tmpVec[0], tmpVec[1], tmpVec[2]);
-        } else if (!stricmp(token, "lightoffset")) {
+        } else if (!Q_stricmp(token, "lightoffset")) {
             tmpVec[0] = ld->tikiFile.GetFloat(false);
             tmpVec[1] = ld->tikiFile.GetFloat(false);
             tmpVec[2] = ld->tikiFile.GetFloat(false);
             WriteLightOffset(ld, tmpVec[0], tmpVec[1], tmpVec[2]);
-        } else if (!stricmp(token, "radius")) {
+        } else if (!Q_stricmp(token, "radius")) {
             tmpFloat = ld->tikiFile.GetFloat(false);
             WriteRadius(ld, tmpFloat);
-        } else if (!stricmp(token, "surface")) {
+        } else if (!Q_stricmp(token, "surface")) {
             token = ld->tikiFile.GetToken(false);
             WriteSurface(ld, token);
             while (ld->tikiFile.TokenAvailable(false)) {
                 token = ld->tikiFile.GetToken(false);
-                if (!stricmp(token, "flags")) {
+                if (!Q_stricmp(token, "flags")) {
                     token  = ld->tikiFile.GetToken(false);
                     tmpInt = TIKI_ParseSurfaceFlag(token);
                     WriteFlags(ld, tmpInt);
-                } else if (!stricmp(token, "damage")) {
+                } else if (!Q_stricmp(token, "damage")) {
                     tmpFloat = ld->tikiFile.GetFloat(false);
                     WriteDamage(ld, tmpFloat);
-                } else if (!stricmp(token, "shader")) {
+                } else if (!Q_stricmp(token, "shader")) {
                     token = ld->tikiFile.GetToken(false);
                     if (strstr(token, ".")) {
                         strcpy(name, ld->tikiFile.currentScript->path);
@@ -1060,13 +1060,13 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
                     }
                 }
             }
-        } else if (!stricmp(token, "ischaracter")) {
+        } else if (!Q_stricmp(token, "ischaracter")) {
             ld->bIsCharacter = true;
-        } else if (!stricmp(token, "case")) {
+        } else if (!Q_stricmp(token, "case")) {
             if (!TIKI_ParseCase(ld)) {
                 return false;
             }
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             return true;
         } else {
             TIKI_Error(
@@ -1102,7 +1102,7 @@ void TIKI_ParseInitCommands(dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcmd
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
 
-        if (!stricmp(token, "}")) {
+        if (!Q_stricmp(token, "}")) {
             break;
         }
 
@@ -1157,11 +1157,11 @@ void TIKI_ParseInit(dloaddef_t *ld)
 
     while (ld->tikiFile.TokenAvailable(true)) {
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "client")) {
+        if (!Q_stricmp(token, "client")) {
             TIKI_ParseInitCommands(ld, ld->loadclientinitcmds, 160, &ld->numclientinitcmds);
-        } else if (!stricmp(token, "server")) {
+        } else if (!Q_stricmp(token, "server")) {
             TIKI_ParseInitCommands(ld, ld->loadserverinitcmds, 160, &ld->numserverinitcmds);
-        } else if (!stricmp(token, "}")) {
+        } else if (!Q_stricmp(token, "}")) {
             break;
         } else {
             TIKI_Error(
@@ -1195,8 +1195,8 @@ qboolean TIKI_ParseCase(dloaddef_t *ld)
 __newcase:
     token = ld->tikiFile.GetToken(false);
     WriteCaseKey(ld, token);
-    isheadmodel = !stricmp(token, "headmodel");
-    isheadskin  = !stricmp(token, "headskin");
+    isheadmodel = !Q_stricmp(token, "headmodel");
+    isheadskin  = !Q_stricmp(token, "headskin");
 
     while (1) {
         if (!ld->tikiFile.TokenAvailable(true)) {
@@ -1209,9 +1209,9 @@ __newcase:
         }
 
         token = ld->tikiFile.GetToken(true);
-        if (!stricmp(token, "case")) {
+        if (!Q_stricmp(token, "case")) {
             goto __newcase;
-        } else if (!stricmp(token, "{")) {
+        } else if (!Q_stricmp(token, "{")) {
             break;
         }
 

From 2ee1a2099db01d10c5d2e38b1d378e5eeed5aaaa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Jun 2024 19:45:50 +0200
Subject: [PATCH 0364/2040] Ignore map name case sensitivity when parsing
 map-specific animations

---
 code/tiki/tiki_parse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 5ea4ad38..f4300ec9 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -401,7 +401,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
             }
 
             while (ld->tikiFile.TokenAvailable(true)) {
-                if (!Q_strncmp(token, mapname, strlen(token))) {
+                if (!Q_stricmpn(token, mapname, strlen(token))) {
                     b_mapspec = true;
                 } else if (!Q_stricmp(token, "{")) {
                     break;

From b7a0607d52a55839b3ab47a01ad0f1e9d06af607 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Jun 2024 19:55:42 +0200
Subject: [PATCH 0365/2040] Using parameters that take the entity rather than
 raw values

---
 code/fgame/actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.h b/code/fgame/actor.h
index a31d4fd6..7274f8ce 100644
--- a/code/fgame/actor.h
+++ b/code/fgame/actor.h
@@ -1714,7 +1714,7 @@ inline bool Actor::CanSeeFOV(Entity *ent)
 
     bCanSee = false;
 
-    if (InFOV(ent->centroid) && gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum)) {
+    if (InFOV(ent) && AreasConnected(ent)) {
         bCanSee = CanSee(ent, 0, 0, false);
     }
 

From 135b519dd8a37b7edff2ec5970422759b7a0b491 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Jun 2024 23:47:06 +0200
Subject: [PATCH 0366/2040] Reduced actor's change of getting curious

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 3c417781..997e7798 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8852,7 +8852,7 @@ void Actor::CuriousSound(int iType, vec3_t sound_origin, float fDistSquared, flo
         }
     }
 
-    if ((fRangeFactor * m_fSoundAwareness) < (rand() / 21474836.0)) {
+    if ((fRangeFactor * m_fSoundAwareness) < (rand() / 327.67f)) {
         return;
     }
 

From b75c7b64f1480a1e5f6e79c00c0ccd4a2a452659 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 20:28:34 +0200
Subject: [PATCH 0367/2040] Still allow crouch when glued in 1.0 and in
 Single-player mode

This fixes #303 where the player is standing in the truck in m4l2
---
 code/fgame/player_conditionals.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index e5043e33..71dd43ad 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -784,7 +784,8 @@ qboolean Player::CondCrouch(Conditional& condition)
 {
     // Added in 2.0
     //  Don't crouch if the player is not moving
-    if (client->ps.pm_flags & PMF_NO_MOVE) {
+    if (client->ps.pm_flags & PMF_NO_MOVE
+        && (g_target_game > target_game_e::TG_MOH || g_gametype->integer != GT_SINGLE_PLAYER)) {
         // Added in 2.30
         //  Allow ducking if specified
         if (!m_pGlueMaster || !m_bGlueDuckable) {
@@ -812,7 +813,7 @@ qboolean Player::CondAnimDoneTorso(Conditional& condition)
 
 qboolean Player::CondAttackPrimary(Conditional& condition)
 {
-    Weapon* weapon;
+    Weapon *weapon;
 
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
@@ -852,7 +853,7 @@ qboolean Player::CondAttackButtonPrimary(Conditional& condition)
 
 qboolean Player::CondAttackSecondary(Conditional& condition)
 {
-    Weapon* weapon;
+    Weapon *weapon;
 
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
@@ -1949,7 +1950,7 @@ Condition<Player> Player::Conditions[] = {
     {"ATTACK_SECONDARY_BUTTON",         &Player::CondAttackButtonSecondary   },
     {"CHECK_MOVEMENT_SPEED",            &Player::CondCheckMovementSpeed      },
 
- // Weapon conditions
+    // Weapon conditions
     {"ANIMDONE_VM",                     &Player::CondAnimDoneVM              },
     {"CLIENT_COMMAND",                  &Player::CondClientCommand           },
     {"IS_VM_ANIM",                      &Player::CondVMAnim                  },

From 911e87c6ec26ec42ef5360ea1c3af317538ce4b5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 20:29:41 +0200
Subject: [PATCH 0368/2040] `physics_off`: Don't reset the physics in 1.0 in
 Single-player mode

This fixes #303 in m4l2 where the player doesn't have their gun holstered in the truck
---
 code/fgame/player.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 40fd9b37..6b5a791d 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -9946,9 +9946,11 @@ void Player::EventGetCurrentDMWeaponType(Event *ev)
 
 void Player::PhysicsOff(Event *ev)
 {
-    // Added in 2.0
-    //  Reset the state to STAND before disabling physics
-    EvaluateState(statemap_Torso->FindState("STAND"), statemap_Legs->FindState("STAND"));
+    if (g_target_game > TG_MOH || g_gametype->integer != GT_SINGLE_PLAYER) {
+        // Added in 2.0
+        //  Reset the state to STAND before disabling physics
+        EvaluateState(statemap_Torso->FindState("STAND"), statemap_Legs->FindState("STAND"));
+    }
 
     flags |= FL_IMMOBILE;
 }

From d64ef13b795efb64ef3f33dc7ceadecec46b1e2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:34:48 +0200
Subject: [PATCH 0369/2040] Fixed script_skyorigin never being sent to clients

---
 code/fgame/scriptslave.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 90c2b365..71b0f33b 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -2113,6 +2113,7 @@ CLASS_DECLARATION(ScriptSlave, ScriptSkyOrigin, "script_skyorigin") {
 ScriptSkyOrigin::ScriptSkyOrigin()
 {
     edict->s.renderfx |= RF_SKYORIGIN;
+    edict->r.svFlags &= ~SVF_NOCLIENT;
     setContents(0);
     setSolidType(SOLID_NOT);
 }

From 57ac7d8c19fb7f228685d57a11d779afec1e6f3b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:36:12 +0200
Subject: [PATCH 0370/2040] Removed code that is already present in
 CG_SetupFog() and CG_SetupPortalSky()

---
 code/cgame/cg_view.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 6e7a63ef..cc2721e3 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -560,17 +560,6 @@ static int CG_CalcViewValues(void)
     CG_CalcVrect();
     CG_SetupFog();
 
-    // setup fog and far clipping plane
-    cg.refdef.farplane_distance = cg.farplane_distance;
-    VectorCopy(cg.farplane_color, cg.refdef.farplane_color);
-    cg.refdef.farplane_cull = cg.farplane_cull;
-
-    // setup portal sky
-    cg.refdef.sky_alpha  = cg.sky_alpha;
-    cg.refdef.sky_portal = cg.sky_portal;
-    memcpy(cg.refdef.sky_axis, cg.sky_axis, sizeof(cg.sky_axis));
-    VectorCopy(cg.sky_origin, cg.refdef.sky_origin);
-
     ps = &cg.predicted_player_state;
 
     VectorCopy(ps->origin, cg.refdef.vieworg);

From c753dcafd815ba681161db8c8f9193ee65610562 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:36:35 +0200
Subject: [PATCH 0371/2040] SurfIsOffscreen: use raw surface values rather than
 tess values

---
 code/renderer/tr_main.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 1fadb640..a836d705 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -993,12 +993,12 @@ qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int
 		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
 	}
 
-	for ( i = 0; i < tess.numVertexes; i++ )
+	for ( i = 0; i < surface->numPoints; i++ )
 	{
 		int j;
 		unsigned int pointFlags = 0;
 
-		R_TransformModelToClip( tess.xyz[i], tr.ori.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
+		R_TransformModelToClip( surface->points[i], surfOr.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
 
 		for ( j = 0; j < 3; j++ )
 		{
@@ -1026,20 +1026,25 @@ qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int
 	// based on vertex distance isn't 100% correct (we should be checking for
 	// range to the surface), but it's good enough for the types of portals
 	// we have in the game right now.
-	numTriangles = tess.numIndexes / 3;
+	numTriangles = surface->numIndices / 3;
 
-	for ( i = 0; i < tess.numIndexes; i += 3 )
+	for ( i = 0; i < surface->numIndices; i += 3 )
 	{
 		vec3_t normal;
 		float dot;
 		float len;
+		unsigned* indices;
 
-		VectorSubtract( tess.xyz[tess.indexes[i]], tr.viewParms.ori.origin, normal );
+		indices = (unsigned*)(((char*)surface) + surface->ofsIndices);
 
-		len = VectorLengthSquared( normal );			// lose the sqrt
-		if ( len < shortest )
-		{
-			shortest = len;
+		VectorSubtract( surface->points[indices[i]], surfOr.viewOrigin, normal);
+
+		if (shader->fDistRange > 0) {
+			len = VectorLengthSquared(normal);			// lose the sqrt
+			if (len < shortest)
+			{
+				shortest = len;
+			}
 		}
 
 		if ( ( dot = DotProduct( normal, tess.normal[tess.indexes[i]] ) ) >= 0 )

From e1f2433c36206e0852656f4d88c13b8bc738cd50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:36:58 +0200
Subject: [PATCH 0372/2040] Fixed sky portal rendering

This fixes #260
---
 code/renderer/tr_sky_portal.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_sky_portal.cpp b/code/renderer/tr_sky_portal.cpp
index 66d88b98..d79747c6 100644
--- a/code/renderer/tr_sky_portal.cpp
+++ b/code/renderer/tr_sky_portal.cpp
@@ -99,9 +99,7 @@ void R_Sky_Render() {
         return;
     }
 
-	if (tr.viewParms.isPortalSky)
-	{
-		ri.Printf(PRINT_WARNING, "WARNING: Recursive skies found!  Make that not happen!\n");
+	if (tr.viewParms.isPortalSky) {
 		return;
 	}
 
@@ -115,7 +113,6 @@ void R_Sky_Render() {
         return;
     }
 
-    tr.skyRendered = qtrue;
     oldParms = tr.viewParms;
     newParms = tr.viewParms;
 
@@ -133,8 +130,16 @@ void R_Sky_Render() {
 		MatrixMultiply(newParms.ori.axis, tr.refdef.sky_axis, newParms.ori.axis);
 	}
 
-    tr.viewParms.isPortalSky = qtrue;
     VectorCopy(newParms.ori.origin, newParms.pvsOrigin);
+	newParms.isPortalSky = qtrue;
+	newParms.farplane_distance = tr.refdef.skybox_farplane;
+	newParms.renderTerrain = tr.refdef.render_terrain;
+
+	if (oldParms.farplane_bias == 0.0 || oldParms.farplane_distance == 0.0) {
+		newParms.farplane_bias = 0.0;
+	} else {
+		newParms.farplane_bias = newParms.farplane_distance / oldParms.farplane_distance * oldParms.farplane_bias;
+	}
 
     leaf = R_PointInLeaf(newParms.pvsOrigin);
     if (leaf) {
@@ -143,8 +148,8 @@ void R_Sky_Render() {
 
     tr.viewParms = oldParms;
 
-	tr.viewParms.isPortalSky = qfalse;
 	tr.portalsky.numSurfs = 0;
+	tr.skyRendered = qtrue;
 	R_RotateForViewer();
 	R_SetupFrustum();
 }

From 0181fbcfa09952a4312a94a5b5f17d30ed63332c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:52:32 +0200
Subject: [PATCH 0373/2040] Use the weight's bone index if there is no morph

---
 code/renderer/tr_model.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index 137ae4a4..a50d2931 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -1250,7 +1250,12 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 					morph++;
 				}
 
-				channelNum = skelmodel->pBones[ morph->morphIndex ].channel;
+				if (newVerts->numMorphs) {
+					channelNum = skelmodel->pBones[morph->morphIndex].channel;
+				} else {
+					channelNum = skelmodel->pBones[weight->boneIndex].channel;
+				}
+
 				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
 				bone = &bones[ boneNum ];
 
@@ -1282,7 +1287,12 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 					morph++;
 				}
 
-				bone = &bones[ morph->morphIndex ];
+				if (newVerts->numMorphs) {
+					bone = &bones[morph->morphIndex];
+				} else {
+					bone = &bones[weight->boneIndex];
+				}
+
 				SkelVertGetNormal( newVerts, bone, normal );
 
 				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {

From 77de0b78baa2c7a5b3f3a6bcb4fb6b069a85693e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:56:01 +0200
Subject: [PATCH 0374/2040] First test if the entity has morphs before
 proceeding to loop through vertices

---
 code/renderer/tr_model.cpp | 218 ++++++++++++++++++++++++-------------
 1 file changed, 141 insertions(+), 77 deletions(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index a50d2931..6ce0c1db 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -1172,9 +1172,6 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
     outNormal = &tess.normal[baseVertex];
     newVerts = sf->pVerts;
 
-    bones = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
-    morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
-
 	if (render_count == sf->numVerts)
 	{
 		for (i = 0; i < indexes; i++) {
@@ -1218,33 +1215,33 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 	//
 	// just copy the vertexes
 	//
-	for( vertNum = 0; vertNum < render_count; vertNum++ )
+	bones = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
+	morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
+
+	if (backEnd.currentEntity->e.hasMorph)
 	{
-		vec3_t normal;
-		vec3_t out;
-
-		VectorClear( out );
-		VectorClear( outXyz );
-
-		weight = ( skelWeight_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs );
-
-		if( backEnd.currentEntity->e.hasMorph )
+		if (mesh > 0)
 		{
-			vec3_t totalmorph;
-
-			VectorClear( totalmorph );
-			morph = ( skeletorMorph_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) );
-
-			if( mesh > 0 )
+			for (vertNum = 0; vertNum < render_count; vertNum++)
 			{
+				vec3_t normal;
+				vec3_t out;
+				vec3_t totalmorph;
 				int channelNum;
 				int boneNum;
 
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
+				VectorClear(out);
+				VectorClear(outXyz);
+				VectorClear(totalmorph);
 
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
+				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+				morph = (skeletorMorph_t*)((byte*)newVerts + sizeof(skeletorVertex_t));
+
+				for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+					morphcache = &morphs[morph->morphIndex];
+
+					if (*morphcache) {
+						SkelMorphGetXyz(morph, morphcache, totalmorph);
 					}
 
 					morph++;
@@ -1256,32 +1253,57 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
 				}
 
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
+				boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+				bone = &bones[boneNum];
 
-				SkelVertGetNormal( newVerts, bone, normal );
+				SkelVertGetNormal(newVerts, bone, normal);
 
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
+				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+					channelNum = skelmodel->pBones[weight->boneIndex].channel;
+					boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+					bone = &bones[boneNum];
 
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
+					if (!weightNum) {
+						SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
 					} else {
-						SkelWeightGetXyz( weight, bone, out );
+						SkelWeightGetXyz(weight, bone, out);
 					}
 
 					weight++;
 				}
-			}
-			else
-			{
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
 
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
+				VectorCopy(normal, *outNormal);
+				VectorScale(out, scale, outXyz);
+
+				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+				// FIXME: fill in lightmapST for completeness?
+
+				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
+				outXyz += 4;
+				outNormal++;
+			}
+		}
+		else
+		{
+			for (vertNum = 0; vertNum < render_count; vertNum++)
+			{
+				vec3_t normal;
+				vec3_t out;
+				vec3_t totalmorph;
+
+				VectorClear(out);
+				VectorClear(outXyz);
+				VectorClear(totalmorph);
+
+				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+				morph = (skeletorMorph_t*)((byte*)newVerts + sizeof(skeletorVertex_t));
+
+				for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+					morphcache = &morphs[morph->morphIndex];
+
+					if (*morphcache) {
+						SkelMorphGetXyz(morph, morphcache, totalmorph);
 					}
 
 					morph++;
@@ -1293,70 +1315,112 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 					bone = &bones[weight->boneIndex];
 				}
 
-				SkelVertGetNormal( newVerts, bone, normal );
+				SkelVertGetNormal(newVerts, bone, normal);
 
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
+				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+					bone = &bones[weight->boneIndex];
 
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
+					if (!weightNum) {
+						SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
 					} else {
-						SkelWeightGetXyz( weight, bone, out );
+						SkelWeightGetXyz(weight, bone, out);
 					}
 
 					weight++;
 				}
+
+				VectorCopy(normal, *outNormal);
+				VectorScale(out, scale, outXyz);
+
+				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+				// FIXME: fill in lightmapST for completeness?
+
+				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
+				outXyz += 4;
+				outNormal++;
 			}
 		}
-		else
-        {
-			if( mesh > 0 )
+	}
+	else
+	{
+		if (mesh > 0)
+		{
+			for (vertNum = 0; vertNum < render_count; vertNum++)
 			{
+				vec3_t normal;
+				vec3_t out;
 				int channelNum;
 				int boneNum;
 
-				channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
+				VectorClear(out);
+				VectorClear(outXyz);
 
-                SkelVertGetNormal(newVerts, bone, normal);
+				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
 
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
+				channelNum = skelmodel->pBones[weight->boneIndex].channel;
+				boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+				bone = &bones[boneNum];
 
-					SkelWeightGetXyz( weight, bone, out );
+				SkelVertGetNormal(newVerts, bone, normal);
+
+				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+					channelNum = skelmodel->pBones[weight->boneIndex].channel;
+					boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+					bone = &bones[boneNum];
+
+					SkelWeightGetXyz(weight, bone, out);
 
 					weight++;
 				}
-			}
-			else
-            {
-				bone = &bones[weight->boneIndex];
-                SkelVertGetNormal(newVerts, bone, normal);
 
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
+				VectorCopy(normal, *outNormal);
+				VectorScale(out, scale, outXyz);
 
-					SkelWeightGetXyz( weight, bone, out );
+				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+				// FIXME: fill in lightmapST for completeness?
 
-					weight++;
-				}
+				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
+				outXyz += 4;
+				outNormal++;
 			}
 		}
+		else
+		{
+			for (vertNum = 0; vertNum < render_count; vertNum++)
+			{
+				vec3_t normal;
+				vec3_t out;
 
-		VectorCopy(normal, *outNormal);
+				VectorClear(out);
+				VectorClear(outXyz);
 
-		VectorScale( out, scale, outXyz );
+				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
 
-        tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
-        tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
-		// FIXME: fill in lightmapST for completeness?
+				bone = &bones[weight->boneIndex];
+				SkelVertGetNormal(newVerts, bone, normal);
 
-		newVerts = ( skeletorVertex_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs + sizeof( skelWeight_t ) * newVerts->numWeights );
-		outXyz += 4;
-		outNormal++;
+				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+					bone = &bones[weight->boneIndex];
+
+					SkelWeightGetXyz(weight, bone, out);
+
+					weight++;
+				}
+
+				VectorCopy(normal, *outNormal);
+				VectorScale(out, scale, outXyz);
+
+				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+				// FIXME: fill in lightmapST for completeness?
+
+				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
+				outXyz += 4;
+				outNormal++;
+			}
+		}
 	}
 
 #if 0

From 2b66672d2df435e696884584445da6c0099e0acc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:50:08 +0200
Subject: [PATCH 0375/2040] Added MAX_GLOBAL_FROM_LOCAL constant and
 implemented `skelChannelList_s::GlobalChannel` and
 `skelChannelList_s::LocalChannel`

---
 code/skeletor/skeletor_utilities.cpp | 12 ++++++++++++
 code/tiki/tiki_shared.h              |  9 +++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index 8dc6f80b..75f28a8c 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.cpp
@@ -71,6 +71,18 @@ int FileLength(FILE *pFile)
     return iEnd;
 }
 
+
+int skelChannelList_s::GlobalChannel(int localchannel) const
+{
+    assert(localchannel < MAX_GLOBAL_FROM_LOCAL);
+    return m_chanGlobalFromLocal[localchannel];
+}
+
+int skelChannelList_s::LocalChannel(int channel) const
+{
+    return m_chanLocalFromGlobal[channel];
+}
+
 int skelChannelList_s::GetLocalFromGlobal(int globalChannel) const
 {
     if (m_chanLocalFromGlobal && globalChannel < m_numLocalFromGlobal) {
diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index 763054bc..d3863c6e 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -91,9 +91,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TIKI_SURF_NOMIPMAPS (1 << 8)
 #define TIKI_SURF_NOPICMIP  (1 << 9)
 
-#define MAX_SKELMODELS      12
-#define MAX_TIKI_SHADER     4
-#define MAX_TIKI_ALIASES    4095
+#define MAX_SKELMODELS        12
+#define MAX_TIKI_SHADER       4
+#define MAX_TIKI_ALIASES      4095
+#define MAX_GLOBAL_FROM_LOCAL 200
 
 typedef struct AliasList_s     AliasList_t;
 typedef struct AliasListNode_s AliasListNode_t;
@@ -120,7 +121,7 @@ private:
     short int *m_chanLocalFromGlobal;
 
 public:
-    short int m_chanGlobalFromLocal[200];
+    short int m_chanGlobalFromLocal[MAX_GLOBAL_FROM_LOCAL];
 
     int         NumChannels(void) const;
     void        ZeroChannels(void);

From c4523db991a8cfc3a70865aa3e8505c9f74bfb28 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:48:29 +0200
Subject: [PATCH 0376/2040] Added GetBoneChannelType

---
 code/skeletor/bonetable.cpp         | 32 +++++++++++++++++++++++++++++
 code/skeletor/skeletor_name_lists.h |  1 +
 2 files changed, 33 insertions(+)

diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 02c8594a..46a86723 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -241,6 +241,38 @@ bool IsBogusChannelName(const char *name)
     return false;
 }
 
+int GetBoneChannelType(const char* name)
+{
+    size_t len;
+
+    if (!name) {
+        return 2;
+    }
+
+    if (IsBogusChannelName(name)) {
+        return 2;
+    }
+
+    len = strlen(name);
+    if (len < 4) {
+        return 3;
+    }
+
+    if (!strcmp(name + len - 4, " rot")) {
+        return 0;
+    }
+
+    if (!strcmp(name + len - 4, " pos")) {
+        return 1;
+    }
+
+    if (len >= 6 && !strcmp(name + len - 6, " rotFK")) {
+        return 2;
+    }
+
+    return 3;
+}
+
 int GetChannelTypeFromName(const char *name)
 {
     int    i;
diff --git a/code/skeletor/skeletor_name_lists.h b/code/skeletor/skeletor_name_lists.h
index c26f1ccd..56b5f251 100644
--- a/code/skeletor/skeletor_name_lists.h
+++ b/code/skeletor/skeletor_name_lists.h
@@ -57,6 +57,7 @@ private:
     void        SetChannelName(ChannelName_t *channel, const char *newName);
 };
 
+int GetBoneChannelType(const char* name);
 int GetChannelTypeFromName(const char *name);
 
 #else

From 091c8b4d1260f36ce85d3f6aad8040006af75f80 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:40:43 +0200
Subject: [PATCH 0377/2040] Optimized channel data memory and performance
 (feature from moh 2.0 and above)

---
 code/skeletor/skeletor.cpp                    |  64 +--
 .../skeletor/skeletor_animation_file_format.h |   4 +-
 code/skeletor/skeletor_loadanimation.cpp      | 406 +++++++++++++-----
 code/skeletor/skeletorbones.cpp               |  48 ++-
 4 files changed, 364 insertions(+), 158 deletions(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 1654f49a..40febcfd 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -1047,31 +1047,39 @@ int skeletor_c::GetMorphWeightFrame(int index, float time, int *data)
     return GetMorphWeightFrame(data);
 }
 
-vec4_t *DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+float *DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
     skanGameFrame *foundFrame;
+    size_t         frameSize;
     int            i;
 
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
+
     foundFrame = channelFrames->ary_frames;
 
     for (i = 0; i < channelFrames->nFramesInChannel; i++) {
-        if (channelFrames->ary_frames[i].nFrameNum >= desiredFrameNum) {
-            foundFrame = &channelFrames->ary_frames[i];
+        if (foundFrame->nFrameNum >= desiredFrameNum) {
             break;
         }
+
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
     }
 
-    return &foundFrame->pChannelData;
+    if (foundFrame->nFrameNum > desiredFrameNum) {
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
+
+    return foundFrame->pChannelData;
 }
 
 int skeletor_c::GetMorphWeightFrame(int *data)
 {
-    int     numTargets;
-    int     animChannelNum;
-    int     blendNum;
-    float   weight;
-    int     modelChannelNum;
-    vec4_t *channelData;
+    int    numTargets;
+    int    animChannelNum;
+    int    blendNum;
+    float  weight;
+    int    modelChannelNum;
+    float *channelData;
 
     numTargets = m_morphTargetList.NumChannels();
 
@@ -1082,38 +1090,36 @@ int skeletor_c::GetMorphWeightFrame(int *data)
     memset(data, 0, sizeof(*data) * numTargets);
 
     for (blendNum = 0; blendNum < m_frameList.numMovementFrames; blendNum++) {
-        weight = m_frameList.m_blendInfo[blendNum].weight;
+        const skanBlendInfo& blendInfo = m_frameList.m_blendInfo[blendNum];
+        weight                         = blendInfo.weight;
 
         if (weight > 0.001) {
-            for (modelChannelNum = 0; modelChannelNum < m_morphTargetList.NumChannels(); modelChannelNum++) {
-                animChannelNum = m_morphTargetList.m_chanGlobalFromLocal[modelChannelNum];
-                animChannelNum = m_morphTargetList.GetLocalFromGlobal(animChannelNum);
+            for (modelChannelNum = 0; modelChannelNum < numTargets; modelChannelNum++) {
+                animChannelNum = m_morphTargetList.GlobalChannel(modelChannelNum);
+                animChannelNum = blendInfo.pAnimationData->channelList.GetLocalFromGlobal(animChannelNum);
 
                 if (animChannelNum >= 0) {
-                    channelData = DecodeFrameValue(
-                        &m_frameList.m_blendInfo[blendNum].pAnimationData->ary_channels[animChannelNum],
-                        m_frameList.m_blendInfo[blendNum].frame
-                    );
-                    data[modelChannelNum] += (int)((*channelData)[0] * weight);
+                    channelData =
+                        DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData[0] * weight);
                 }
             }
         }
     }
 
     for (blendNum = 32; blendNum < m_frameList.numActionFrames + 32; blendNum++) {
-        weight = m_frameList.m_blendInfo[blendNum].weight;
+        const skanBlendInfo& blendInfo = m_frameList.m_blendInfo[blendNum];
+        weight                         = blendInfo.weight;
 
         if (weight > 0.001) {
-            for (modelChannelNum = 0; modelChannelNum < m_morphTargetList.NumChannels(); modelChannelNum++) {
-                animChannelNum = m_morphTargetList.m_chanGlobalFromLocal[modelChannelNum];
-                animChannelNum = m_morphTargetList.GetLocalFromGlobal(animChannelNum);
+            for (modelChannelNum = 0; modelChannelNum < numTargets; modelChannelNum++) {
+                animChannelNum = m_morphTargetList.GlobalChannel(modelChannelNum);
+                animChannelNum = blendInfo.pAnimationData->channelList.GetLocalFromGlobal(animChannelNum);
 
                 if (animChannelNum >= 0) {
-                    channelData = DecodeFrameValue(
-                        &m_frameList.m_blendInfo[blendNum].pAnimationData->ary_channels[animChannelNum],
-                        m_frameList.m_blendInfo[blendNum].frame
-                    );
-                    data[modelChannelNum] += (int)((*channelData)[0] * weight);
+                    channelData =
+                        DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData[0] * weight);
                 }
             }
         }
diff --git a/code/skeletor/skeletor_animation_file_format.h b/code/skeletor/skeletor_animation_file_format.h
index 58db9451..0b953174 100644
--- a/code/skeletor/skeletor_animation_file_format.h
+++ b/code/skeletor/skeletor_animation_file_format.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -59,7 +59,7 @@ typedef struct {
 typedef struct {
     short int nFrameNum;
     short int nPrevFrameIndex;
-    vec4_t    pChannelData;
+    float     pChannelData[1];
 } skanGameFrame;
 
 typedef struct {
diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index 612bb083..c930a469 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,52 +26,29 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "skeletor.h"
 
-qboolean Compress(
-    skelAnimGameFrame_t *current,
-    skelAnimGameFrame_t *last,
-    int                  channelIndex,
-    skelChannelList_c   *channelList,
-    ChannelNameTable    *channelNames
-)
+qboolean Compress(skelAnimGameFrame_t *current, skelAnimGameFrame_t *last, int channelIndex, int numChannels)
 {
     float tolerance;
     float difference;
+    int   i;
 
     // high-end PC don't need to compress...
     return false;
 
-    tolerance = current->pChannels[channelIndex][0];
-    if (tolerance > -0.000001 && tolerance < 0.000001) {
-        current->pChannels[channelIndex][0] = 0.0f;
+    for (i = 0; i < numChannels; i++) {
+        tolerance = current->pChannels[channelIndex][i];
+        if (tolerance > -0.000001 && tolerance < 0.000001) {
+            current->pChannels[channelIndex][i] = 0.0f;
+        }
     }
 
-    tolerance = current->pChannels[channelIndex][1];
-    if (tolerance > -0.000001 && tolerance < 0.000001) {
-        current->pChannels[channelIndex][1] = 0.0f;
-    }
-
-    tolerance = current->pChannels[channelIndex][2];
-    if (tolerance > -0.000001 && tolerance < 0.000001) {
-        current->pChannels[channelIndex][2] = 0.0f;
-    }
-
-    if (!last) {
-        return false;
-    }
-
-    difference = last->pChannels[channelIndex][0] - current->pChannels[channelIndex][0];
-    if (difference < -0.001f || difference >= 0.001f) {
-        return false;
-    }
-
-    difference = last->pChannels[channelIndex][1] - current->pChannels[channelIndex][1];
-    if (difference < -0.001f || difference >= 0.001f) {
-        return false;
-    }
-
-    difference = last->pChannels[channelIndex][2] - current->pChannels[channelIndex][2];
-    if (difference < -0.001f || difference >= 0.001f) {
-        return false;
+    if (last) {
+        for (i = 0; i < numChannels; i++) {
+            difference = last->pChannels[channelIndex][i] - current->pChannels[channelIndex][i];
+            if (difference < -0.001f || difference >= 0.001f) {
+                return false;
+            }
+        }
     }
 
     return true;
@@ -92,7 +69,9 @@ skelAnimDataGameHeader_t *EncodeFrames(
     skelAnimGameFrame_t *pCurrFrame;
     skelAnimGameFrame_t *pLastFrame;
     skanGameFrame       *pFrame;
+    size_t               frameSize;
     int                  indexLastFrameAdded;
+    int                  channelType;
 
     pChannel    = enAnim->ary_channels;
     endFrameCap = enAnim->numFrames - 2;
@@ -101,45 +80,138 @@ skelAnimDataGameHeader_t *EncodeFrames(
         pLastFrame = NULL;
         pCurrFrame = m_frame;
 
-        frameCnt = 0;
-        for (j = 0; j < enAnim->numFrames; j++) {
-            if (!Compress(pCurrFrame, pLastFrame, i, channelList, channelNames) || j >= endFrameCap) {
-                frameCnt++;
-                pLastFrame = pCurrFrame;
-            }
-
-            pCurrFrame++;
-        }
-
-        pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameCnt * sizeof(skanGameFrame));
-        pChannel->nFramesInChannel = frameCnt;
-        enAnim->nBytesUsed += frameCnt * sizeof(skanGameFrame);
-
-        pLastFrame          = NULL;
-        indexLastFrameAdded = 0;
-
-        pCurrFrame = m_frame;
-        pFrame     = pChannel->ary_frames;
-
-        for (j = 0; j < enAnim->numFrames; j++) {
-            if (!Compress(pCurrFrame, pLastFrame, i, channelList, channelNames) || j >= endFrameCap) {
-                pFrame->nFrameNum       = j;
-                pFrame->nPrevFrameIndex = indexLastFrameAdded;
-
-                if (j > 0) {
-                    indexLastFrameAdded++;
+        channelType = GetBoneChannelType(enAnim->channelList.ChannelName(channelNames, i));
+        switch (channelType) {
+        case 0:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+            frameCnt  = 0;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 4) || j >= endFrameCap) {
+                    frameCnt++;
+                    pLastFrame = pCurrFrame;
                 }
 
-                pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
-                pFrame->pChannelData[1] = pCurrFrame->pChannels[i][1];
-                pFrame->pChannelData[2] = pCurrFrame->pChannels[i][2];
-                pFrame->pChannelData[3] = pCurrFrame->pChannels[i][3];
-                pFrame++;
-
-                pLastFrame = pCurrFrame;
+                pCurrFrame++;
             }
 
-            pCurrFrame++;
+            pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->nFramesInChannel = frameCnt;
+            enAnim->nBytesUsed += frameSize * frameCnt;
+
+            pLastFrame          = NULL;
+            indexLastFrameAdded = 0;
+
+            pCurrFrame = m_frame;
+            pFrame     = pChannel->ary_frames;
+
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 4) || j >= endFrameCap) {
+                    pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                    pFrame->nFrameNum       = j;
+                    pFrame->nPrevFrameIndex = indexLastFrameAdded;
+
+                    if (j > 0) {
+                        indexLastFrameAdded++;
+                    }
+
+                    pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
+                    pFrame->pChannelData[1] = pCurrFrame->pChannels[i][1];
+                    pFrame->pChannelData[2] = pCurrFrame->pChannels[i][2];
+                    pFrame->pChannelData[3] = pCurrFrame->pChannels[i][3];
+
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+            break;
+        case 1:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+            frameCnt  = 0;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 3) || j >= endFrameCap) {
+                    frameCnt++;
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+
+            pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->nFramesInChannel = frameCnt;
+            enAnim->nBytesUsed += frameSize * frameCnt;
+
+            pLastFrame          = NULL;
+            indexLastFrameAdded = 0;
+
+            pCurrFrame = m_frame;
+            pFrame     = pChannel->ary_frames;
+
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 1) || j >= endFrameCap) {
+                    pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                    pFrame->nFrameNum       = j;
+                    pFrame->nPrevFrameIndex = indexLastFrameAdded;
+
+                    if (j > 0) {
+                        indexLastFrameAdded++;
+                    }
+
+                    pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
+                    pFrame->pChannelData[1] = pCurrFrame->pChannels[i][1];
+                    pFrame->pChannelData[2] = pCurrFrame->pChannels[i][2];
+
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+            break;
+        case 2:
+            pChannel->ary_frames       = NULL;
+            pChannel->nFramesInChannel = 0;
+            break;
+        case 3:
+        default:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
+            frameCnt  = 0;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 1) || j >= endFrameCap) {
+                    frameCnt++;
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+
+            pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->nFramesInChannel = frameCnt;
+            enAnim->nBytesUsed += frameSize * frameCnt;
+
+            pLastFrame          = NULL;
+            indexLastFrameAdded = 0;
+
+            pCurrFrame = m_frame;
+            pFrame     = pChannel->ary_frames;
+
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 3) || j >= endFrameCap) {
+                    pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                    pFrame->nFrameNum       = j;
+                    pFrame->nPrevFrameIndex = indexLastFrameAdded;
+
+                    if (j > 0) {
+                        indexLastFrameAdded++;
+                    }
+
+                    pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
+
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+            break;
         }
     }
 
@@ -335,25 +407,83 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
     skanChannelHdr *pChannel;
     skanGameFrame  *pFrame;
+    size_t          frameSize;
     int             frameCnt;
     int             i, j;
-
-    enAnim->numFrames      = MSG_ReadLong(msg);
-    enAnim->nTotalChannels = MSG_ReadShort(msg);
+    int             channelType;
+    vec4_t          channelData;
 
     for (i = 0; i < enAnim->nTotalChannels; i++) {
         pChannel = &enAnim->ary_channels[i];
-        frameCnt = MSG_ReadShort(msg);
 
-        pFrame                     = (skanGameFrame *)Skel_Alloc(frameCnt * sizeof(skanGameFrame));
-        pChannel->ary_frames       = pFrame;
-        pChannel->nFramesInChannel = frameCnt;
+        channelType = GetBoneChannelType(enAnim->channelList.ChannelName(&skeletor_c::m_channelNames, i));
+        frameCnt    = MSG_ReadShort(msg);
 
-        for (j = 0; j < pChannel->nFramesInChannel; j++) {
-            pFrame                  = &pChannel->ary_frames[j];
-            pFrame->nFrameNum       = MSG_ReadShort(msg);
-            pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
-            MSG_ReadData(msg, pFrame->pChannelData, sizeof(vec4_t));
+        switch (channelType) {
+        case 0:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < frameCnt; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+
+                pFrame->pChannelData[0] = channelData[0];
+                pFrame->pChannelData[1] = channelData[1];
+                pFrame->pChannelData[2] = channelData[2];
+                pFrame->pChannelData[3] = channelData[3];
+            }
+            break;
+        case 1:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < frameCnt; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+
+                pFrame->pChannelData[0] = channelData[0];
+                pFrame->pChannelData[1] = channelData[1];
+                pFrame->pChannelData[2] = channelData[2];
+            }
+            break;
+        case 2:
+            pChannel->ary_frames       = NULL;
+            pChannel->nFramesInChannel = 0;
+
+            for (j = 0; j < frameCnt; j++) {
+                MSG_ReadShort(msg);
+                MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+            }
+            break;
+        case 3:
+        default:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
+
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < frameCnt; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+
+                pFrame->pChannelData[0] = channelData[0];
+            }
+            break;
         }
     }
 
@@ -364,6 +494,7 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
     skanChannelHdr *pChannel;
     skanGameFrame  *pFrame;
+    size_t          frameSize;
     int             frameCnt;
     int             i, j;
     const char     *name;
@@ -376,35 +507,18 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         type     = GetChannelTypeFromName(name);
         frameCnt = MSG_ReadShort(msg);
 
-        pFrame                     = (skanGameFrame *)Skel_Alloc(frameCnt * sizeof(skanGameFrame));
-        pChannel->ary_frames       = pFrame;
-        pChannel->nFramesInChannel = frameCnt;
+        switch (type) {
+        //
+        // 4 channels (Quat)
+        //
+        case 0:
+            frameSize                  = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
 
-        if (type) {
-            if (type == 1) {
-                for (j = 0; j < pChannel->nFramesInChannel; j++) {
-                    pFrame                  = &pChannel->ary_frames[j];
-                    pFrame->nFrameNum       = MSG_ReadShort(msg);
-                    pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
-                    pFrame->pChannelData[0] = MSG_ReadFloat(msg);
-                    pFrame->pChannelData[1] = MSG_ReadFloat(msg);
-                    pFrame->pChannelData[2] = MSG_ReadFloat(msg);
-                    pFrame->pChannelData[3] = 0;
-                }
-            } else if (type == 3) {
-                for (j = 0; j < pChannel->nFramesInChannel; j++) {
-                    pFrame                  = &pChannel->ary_frames[j];
-                    pFrame->nFrameNum       = MSG_ReadShort(msg);
-                    pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
-                    pFrame->pChannelData[0] = MSG_ReadFloat(msg);
-                    pFrame->pChannelData[1] = 0;
-                    pFrame->pChannelData[2] = 0;
-                    pFrame->pChannelData[3] = 0;
-                }
-            }
-        } else {
             for (j = 0; j < pChannel->nFramesInChannel; j++) {
-                pFrame                  = &pChannel->ary_frames[j];
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
                 pFrame->nFrameNum       = MSG_ReadShort(msg);
                 pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
                 pFrame->pChannelData[0] = MSG_ReadFloat(msg);
@@ -412,6 +526,41 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->pChannelData[2] = MSG_ReadFloat(msg);
                 pFrame->pChannelData[3] = MSG_ReadFloat(msg);
             }
+            break;
+        //
+        // 3 channels (Position)
+        //
+        case 1:
+            frameSize                  = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < pChannel->nFramesInChannel; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                pFrame->pChannelData[0] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[1] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[2] = MSG_ReadFloat(msg);
+            }
+            break;
+        //
+        // 1 channel (frame)
+        //
+        case 3:
+            frameSize            = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float) * 1);
+            pFrame               = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < pChannel->nFramesInChannel; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                pFrame->pChannelData[0] = MSG_ReadFloat(msg);
+            }
+            break;
         }
     }
 }
@@ -419,8 +568,9 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnim(const char *path, void *buffer, int len, const char *name)
 {
     skelAnimDataGameHeader_t *enAnim;
-    int                       i;
+    int                       i, j;
     msg_t                     msg;
+    msg_t                     msgForAnim;
     int                       numChannels;
     skelAnimGameFrame_t      *newFrame;
 
@@ -467,15 +617,37 @@ skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnim(const char *path, void *
     enAnim->bounds[1][0] = MSG_ReadFloat(&msg);
     enAnim->bounds[1][1] = MSG_ReadFloat(&msg);
     enAnim->bounds[1][2] = MSG_ReadFloat(&msg);
-    ReadEncodedFrames(&msg, enAnim);
-    numChannels = MSG_ReadLong(&msg);
+
+    enAnim->numFrames      = MSG_ReadLong(&msg);
+    enAnim->nTotalChannels = MSG_ReadShort(&msg);
+
+    msgForAnim = msg;
+
+    for (i = 0; i < enAnim->nTotalChannels; i++) {
+        int    frameCnt = MSG_ReadShort(&msgForAnim);
+        vec4_t channelData;
+
+        for (j = 0; j < frameCnt; j++) {
+            MSG_ReadShort(&msgForAnim);
+            MSG_ReadShort(&msgForAnim);
+            MSG_ReadData(&msgForAnim, channelData, sizeof(vec4_t));
+        }
+    }
+
+    enAnim->nBytesUsed = MSG_ReadLong(&msgForAnim);
+
+    numChannels = MSG_ReadLong(&msgForAnim);
     enAnim->channelList.ZeroChannels();
 
     for (i = 0; i < numChannels; i++) {
-        enAnim->channelList.AddChannel(m_channelNames.RegisterChannel(MSG_ReadString(&msg)));
+        const char *name = MSG_ReadString(&msgForAnim);
+
+        if (enAnim->channelList.AddChannel(m_channelNames.RegisterChannel(name)) != i) {
+            Com_Printf("^~^~^ Animation '%s' has duplicate channel '%s'\n", path, name);
+        }
     }
 
-    enAnim->channelList.PackChannels();
+    ReadEncodedFrames(&msg, enAnim);
     return enAnim;
 }
 
diff --git a/code/skeletor/skeletorbones.cpp b/code/skeletor/skeletorbones.cpp
index 4f454d3a..92ca3a19 100644
--- a/code/skeletor/skeletorbones.cpp
+++ b/code/skeletor/skeletorbones.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -163,21 +163,47 @@ void SkeletorLoadBonesFromBuffer(skelChannelList_c *boneList, skelHeaderGame_t *
     }
 }
 
-float *DecodeRLEValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+float *DecodeRLEPosValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
     skanGameFrame *foundFrame = channelFrames->ary_frames;
+    size_t         frameSize;
     int            i;
 
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+
     for (i = 0; i < channelFrames->nFramesInChannel; i++) {
         if (foundFrame->nFrameNum >= desiredFrameNum) {
             break;
         }
 
-        foundFrame++;
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
     }
 
     if (foundFrame->nFrameNum > desiredFrameNum) {
-        foundFrame = &channelFrames->ary_frames[foundFrame->nPrevFrameIndex];
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
+
+    return foundFrame->pChannelData;
+}
+
+float *DecodeRLERotValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+{
+    skanGameFrame *foundFrame = channelFrames->ary_frames;
+    size_t         frameSize;
+    int            i;
+
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+
+    for (i = 0; i < channelFrames->nFramesInChannel; i++) {
+        if (foundFrame->nFrameNum >= desiredFrameNum) {
+            break;
+        }
+
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
+    }
+
+    if (foundFrame->nFrameNum > desiredFrameNum) {
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
     }
 
     return foundFrame->pChannelData;
@@ -214,8 +240,9 @@ SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
                 if (incomingWeight == 0.0) {
                     continue;
                 }
-                pIncomingQuat =
-                    (SkelQuat *)DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+                pIncomingQuat = (SkelQuat *)DecodeRLERotValue(
+                    &pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame
+                );
                 totalWeight += incomingWeight;
                 nTotal++;
 
@@ -263,8 +290,9 @@ SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
                 if (incomingWeight == 0.0) {
                     continue;
                 }
-                pIncomingQuat =
-                    (SkelQuat *)DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+                pIncomingQuat = (SkelQuat *)DecodeRLERotValue(
+                    &pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame
+                );
                 totalWeight += incomingWeight;
                 nTotal++;
 
@@ -358,7 +386,7 @@ void skelAnimStoreFrameList_c::GetLerpValue3(int globalChannelNum, SkelVec3 *out
             localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
             if (localChannelNum >= 0) {
                 incomingWeight = pFrame->weight;
-                incomingVec    = DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+                incomingVec = DecodeRLEPosValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
                 totalWeight += incomingWeight;
                 result[0] += incomingVec[0] * incomingWeight;
                 result[1] += incomingVec[1] * incomingWeight;
@@ -389,7 +417,7 @@ void skelAnimStoreFrameList_c::GetLerpValue3(int globalChannelNum, SkelVec3 *out
         localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
         if (localChannelNum >= 0) {
             incomingWeight = pFrame->weight;
-            incomingVec    = DecodeRLEValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+            incomingVec    = DecodeRLEPosValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
             totalWeight += incomingWeight;
             result[0] += incomingVec[0] * incomingWeight;
             result[1] += incomingVec[1] * incomingWeight;

From 31ea9513570ce60130b82ec25e3f3516d8332601 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:43:08 +0200
Subject: [PATCH 0378/2040] Fixed SkelMorphGetXyz implementation

---
 code/renderer/tr_model.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index 6ce0c1db..f478554e 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -966,17 +966,7 @@ SkelMorphGetXyz
 =============
 */
 static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
-	out[ 0 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 1 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 2 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
+	VectorMA(out, *morphcache, morph->offset, out);
 }
 
 /*

From 6bb475abe746e95579ab05af2084513f8260d79c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:04:11 +0200
Subject: [PATCH 0379/2040] Fixed PowerPC platform support with proper checks
 for endianness and ppc64

---
 TargetArch.cmake          |  8 ++++++--
 code/qcommon/q_platform.h | 28 ++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/TargetArch.cmake b/TargetArch.cmake
index 933c1646..d51cc015 100644
--- a/TargetArch.cmake
+++ b/TargetArch.cmake
@@ -3,8 +3,12 @@ set(archdetect_c_code "
 #  error cmake_ARCH x86
 #elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
 #  error cmake_ARCH x86_64
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#  error cmake_ARCH ppc64
+#elif defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64)
+#  if __BIG_ENDIAN__
+#    error cmake_ARCH ppc64
+#  else
+#    error cmake_ARCH ppc64el
+#  endif
 #elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__)
 #  error cmake_ARCH ppc
 #elif defined __s390__
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 86d28c81..75208757 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -163,11 +163,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PATH_SEP '/'
 
 #ifdef __ppc__
-#define ARCH_STRING "ppc"
-#define Q3_BIG_ENDIAN
+#  define ARCH_STRING "ppc"
+#  define Q3_BIG_ENDIAN
 #elif defined __i386__
-#define ARCH_STRING "i386"
-#define Q3_LITTLE_ENDIAN
+#  define ARCH_STRING "i386"
+#  define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".dylib"
@@ -193,8 +193,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  define ARCH_STRING "x86"
 #elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
 #  define ARCH_STRING "x86_64"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#  define ARCH_STRING "ppc64"
+#elif defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64)
+#  if __BIG_ENDIAN__
+#    define ARCH_STRING "ppc64"
+#  else
+#    define ARCH_STRING "ppc64el"
+#  endif
 #elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__)
 #  define ARCH_STRING "ppc"
 #elif defined __s390__
@@ -229,10 +233,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  endif
 #endif
 
-#if __FLOAT_WORD_ORDER == __BIG_ENDIAN
-#define Q3_BIG_ENDIAN
+#if __BIG_ENDIAN__
+#  define Q3_BIG_ENDIAN
 #else
-#define Q3_LITTLE_ENDIAN
+#  define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".so"
@@ -294,10 +298,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ARCH_STRING "alpha"
 #endif
 
-#if BYTE_ORDER == BIG_ENDIAN
-#define Q3_BIG_ENDIAN
+#if __BIG_ENDIAN__
+#  define Q3_BIG_ENDIAN
 #else
-#define Q3_LITTLE_ENDIAN
+#  define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".so"

From 6250380f61d7c66db9abde20560c922bd8929103 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:13:33 +0200
Subject: [PATCH 0380/2040] Added PowerPC into the build system

---
 .github/workflows/build-cmake.yml     | 11 +++++++----
 .github/workflows/publish-release.yml |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 0c99c3a1..2628b791 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -20,10 +20,13 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'amd64',   triple: 'x86_64-linux-gnu'},
-          {name: 'i686',    triple: 'i686-linux-gnu'},
-          {name: 'arm64',   triple: 'aarch64-linux-gnu'},
-          {name: 'armhf',   triple: 'arm-linux-gnueabihf'}
+          {name: 'amd64',    triple: 'x86_64-linux-gnu'},
+          {name: 'i686',     triple: 'i686-linux-gnu'},
+          {name: 'arm64',    triple: 'aarch64-linux-gnu'},
+          {name: 'armhf',    triple: 'arm-linux-gnueabihf'},
+          {name: 'powerpc',  triple: 'powerpc-linux-gnu'},
+          {name: 'ppc64',    triple: 'powerpc64-linux-gnu'},
+          {name: 'ppc64el',  triple: 'powerpc64le-linux-gnu'}
         ]
 
     name: "Building for platform linux-${{matrix.architecture.name}}"
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 1ff4bcd0..81b35639 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -25,8 +25,11 @@ jobs:
         target_os: [
           'linux-amd64',
           'linux-i686',
-          'linux-aarch64',
+          'linux-arm64',
           'linux-armhf',
+          'linux-powerpc',
+          'linux-ppc64',
+          'linux-ppc64el',
           'windows-x64',
           'windows-x86',
           'windows-x64-pdb',

From 1d887b46551c31c565e0ab96156faca59bd93a12 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:21:35 +0200
Subject: [PATCH 0381/2040] Fixed leaf light being incorrectly reassigned

---
 code/renderer/tr_sphere_shade.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index fb411ada..001b94b2 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -1368,18 +1368,16 @@ int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightI
     iLightCount = 0;
 
     if (s_sun.exists) {
-        if (leaf) {
-            if (leaf->lights[0] = &tr.sSunLight) {
-                VectorMA(vPos, 16384.0, s_sun.direction, vEnd);
-                ri.CM_BoxTrace(&trace, vPos, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+        if (leaf && leaf->lights[0] == &tr.sSunLight) {
+            VectorMA(vPos, 16384.0, s_sun.direction, vEnd);
+            ri.CM_BoxTrace(&trace, vPos, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
 
-                if (trace.surfaceFlags & SURF_SKY) {
-                    VectorMA(vPos, 16384.0, s_sun.direction, pvLightPos[0]);
-                    pvLightIntensity[0][0] = s_sun.color[0] * (1.0 / 510.0);
-                    pvLightIntensity[0][1] = s_sun.color[1] * (1.0 / 510.0);
-                    pvLightIntensity[0][2] = s_sun.color[2] * (1.0 / 510.0);
-                    iLightCount            = 1;
-                }
+            if (trace.surfaceFlags & SURF_SKY) {
+                VectorMA(vPos, 16384.0, s_sun.direction, pvLightPos[0]);
+                pvLightIntensity[0][0] = s_sun.color[0] * (1.0 / 510.0);
+                pvLightIntensity[0][1] = s_sun.color[1] * (1.0 / 510.0);
+                pvLightIntensity[0][2] = s_sun.color[2] * (1.0 / 510.0);
+                iLightCount            = 1;
             }
         }
     }

From 5f2827e2abc7796eea1206599d1baf3696aa1b5d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:32:36 +0200
Subject: [PATCH 0382/2040] Added hardware requirements

---
 docs/getting_started_installation.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 129353eb..5f366f2b 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -7,6 +7,17 @@ Ensure that you download the binaries compatible with your platform in the relea
 - A valid MOH:AA installation
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 may be required.
 
+## System requirements
+
+This matches the hardware requirements (x86) of the original game:
+
+|Hardware|Minimum
+|--------|-------
+|CPU     |450 MHz
+|Memory  |128MB
+|Storage |1.2GB
+|GPU     |16MB
+
 ## Client
 
 a) extract archive to your MOHAA installation directory.

From 34ea099d8776840057b4d4d00533bee5bcf72483 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 6 Jun 2024 22:18:23 +0200
Subject: [PATCH 0383/2040] Define _FILE_OFFSET_BITS to 64 due to a bug in
 readdir() affecting 32-bit architectures

readdir() would return NULL, setting errno to EOVERFLOW, unable to load pk3 files
---
 code/sys/sys_unix.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index 63a29644..42b5f1b5 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#define _FILE_OFFSET_BITS 64
+
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 #include "sys_local.h"

From e03b976ffdfd768e896513431dd729d051c004b3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:42:10 +0200
Subject: [PATCH 0384/2040] Added missing header on scriptclass.cpp source file

---
 code/script/scriptclass.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/code/script/scriptclass.cpp b/code/script/scriptclass.cpp
index e76d5aa5..379d1339 100644
--- a/code/script/scriptclass.cpp
+++ b/code/script/scriptclass.cpp
@@ -1,3 +1,27 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// scriptclass.h: Script class.
+
 #include "scriptclass.h"
 #include "../fgame/scriptmaster.h"
 #include "../fgame/scriptthread.h"

From 468341b7d078cf0250bf1706cea500dfa66a7f95 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:49:29 +0200
Subject: [PATCH 0385/2040] Explicitly mark as override

---
 code/fgame/damagemodel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/damagemodel.h b/code/fgame/damagemodel.h
index eba9bf65..2190568d 100644
--- a/code/fgame/damagemodel.h
+++ b/code/fgame/damagemodel.h
@@ -39,7 +39,7 @@ public:
 
     void Setup(Event *ev);
     void Damaged(Event *ev);
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void KillTrace(Event *ev);
     void SpawnOrientedBoundingBox(Event *ev);
     void EventSetKillThread(Event *ev);

From 18e5c6e714624cf2b28539451b1959be099228ba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:49:51 +0200
Subject: [PATCH 0386/2040] Use unsigned format specifier to match
 `MAX_VOTEOPTIONS_BUFFER_LENGTH`'s type

---
 code/fgame/bg_voteoptions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_voteoptions.cpp b/code/fgame/bg_voteoptions.cpp
index 0edff416..99f38629 100644
--- a/code/fgame/bg_voteoptions.cpp
+++ b/code/fgame/bg_voteoptions.cpp
@@ -114,7 +114,7 @@ void VoteOptions::SetupVoteOptions(const char *configFileName, int length, const
     if (length >= MAX_VOTEOPTIONS_BUFFER_LENGTH) {
         Com_Error(
             ERR_DROP,
-            "VoteOptions: Options file '%s' is too big. Max size is %i bytes\n",
+            "VoteOptions: Options file '%s' is too big. Max size is %u bytes\n",
             configFileName,
             MAX_VOTEOPTIONS_BUFFER_LENGTH
         );

From 884a76db4c6e0f58ee50a4078693544b0f3ada5d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:55:33 +0200
Subject: [PATCH 0387/2040] Drop error instead of throwing an exception to meet
 non-throwing exception specification

---
 code/fgame/scriptthread.cpp | 3 ++-
 code/script/scriptclass.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 1f28c78f..4f141b12 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2286,7 +2286,8 @@ ScriptThread::~ScriptThread()
     assert(m_ScriptVM);
     if (!m_ScriptVM) {
         // should never happen
-        throw ScriptException("Attempting to delete a dead thread.");
+        //throw ScriptException("Attempting to delete a dead thread.");
+        gi.Error(ERR_DROP, "Attempting to delete a dead thread.");
     }
 
     vm         = m_ScriptVM;
diff --git a/code/script/scriptclass.cpp b/code/script/scriptclass.cpp
index 379d1339..3ace7aaf 100644
--- a/code/script/scriptclass.cpp
+++ b/code/script/scriptclass.cpp
@@ -89,7 +89,8 @@ ScriptClass::ScriptClass()
 ScriptClass::~ScriptClass()
 {
     if (m_Script == NULL) {
-        throw ScriptException("Attempting to delete dead class.");
+        //throw ScriptException("Attempting to delete dead class.");
+        gi.Error(ERR_DROP, "Attempting to delete a dead thread.");
     }
 
     KillThreads();

From db7ae4ffefccfe4d04d2df710abff8b9ac1bf04e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:57:14 +0200
Subject: [PATCH 0388/2040] Properly clear the color values

---
 code/cgame/cg_lightstyles.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_lightstyles.cpp b/code/cgame/cg_lightstyles.cpp
index dfb9e76f..3a280a66 100644
--- a/code/cgame/cg_lightstyles.cpp
+++ b/code/cgame/cg_lightstyles.cpp
@@ -59,7 +59,7 @@ qboolean CG_LightStyleColor(int style, int realtime, vec4_t color, qboolean clam
 
     time = realtime / 50;
     frac = (realtime - (time * 50.0f)) / 50.0f;
-    memset(color, 0, sizeof(color));
+    VectorClear4(color);
     if ((style < 0) || (style >= (MAX_LIGHTSTYLES * 2))) {
         cgi.DPrintf("CG_LightStyleColor: style out of range.\n");
         return qtrue;

From be222b64a1fb48c8977503af4fbe69cb6fd2f323 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:10:01 +0200
Subject: [PATCH 0389/2040] Fixed one tiny instruction mistake that could cause
 issues with dynamic lights on terrains

---
 code/renderer/tr_light.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 6c8c914d..804f096d 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -543,7 +543,7 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
 			vec[0] += srf->drawinfo.lmapStep;
 
 			z01 = srf->heightmap[k];
-            vec[2] = srf->z0; z00 + z01;
+            vec[2] = srf->z0 + z00 + z01;
             added |= R_DlightSample(src, vec, dst);
 
 			src += 3;

From 50264c496803a3684eed83fdfe7b34bf3d56d6b9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:24:21 +0200
Subject: [PATCH 0390/2040] Make sure to cast the float number to int when
 using it in the format specifier

---
 code/qcommon/cm_patch.c   | 24 ++++++++++++------------
 code/renderer/tr_util.cpp |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index b2fa6a99..67175192 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -1139,12 +1139,12 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
         pf->planes = NULL;
         Com_DPrintf(
             "WARNING: CM_PatchCollideFromGrid: Degenerate patch - no planes (%i %i %i)-(%i %i %i)\n",
-            pf->bounds[0][0],
-            pf->bounds[0][1],
-            pf->bounds[0][2],
-            pf->bounds[1][0],
-            pf->bounds[1][1],
-            pf->bounds[1][2]);
+            (int)pf->bounds[0][0],
+            (int)pf->bounds[0][1],
+            (int)pf->bounds[0][2],
+            (int)pf->bounds[1][0],
+            (int)pf->bounds[1][1],
+            (int)pf->bounds[1][2]);
 	}
 
 	if (numFacets >= 1) {
@@ -1155,12 +1155,12 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
         pf->facets = NULL;
         Com_DPrintf(
             "WARNING: CM_PatchCollideFromGrid: Degenerate patch - no facets (%i %i %i)-(%i %i %i)\n",
-            pf->bounds[0][0],
-            pf->bounds[0][1],
-            pf->bounds[0][2],
-            pf->bounds[1][0],
-            pf->bounds[1][1],
-            pf->bounds[1][2]);
+            (int)pf->bounds[0][0],
+            (int)pf->bounds[0][1],
+            (int)pf->bounds[0][2],
+            (int)pf->bounds[1][0],
+            (int)pf->bounds[1][1],
+            (int)pf->bounds[1][2]);
 	}
 }
 
diff --git a/code/renderer/tr_util.cpp b/code/renderer/tr_util.cpp
index e79816b8..1ac9589a 100644
--- a/code/renderer/tr_util.cpp
+++ b/code/renderer/tr_util.cpp
@@ -265,7 +265,7 @@ void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, fl
 		sprintf(format, "%%.%df", precision);
         text = va(format, number);
 	} else {
-		text = va("%d", number);
+		text = va("%d", (int)number);
 	}
 
 	// NOTE: this cast here is needed!

From 74ccb03e543fdcba0fcb3c174cb738844d4dddca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:34:13 +0200
Subject: [PATCH 0391/2040] Reduced compilation warnings

---
 code/cgame/cg_archive.cpp         | 4 ++--
 code/cgame/cg_drawtools.cpp       | 2 +-
 code/client/cl_inv.cpp            | 4 ++--
 code/fgame/actor.cpp              | 2 +-
 code/fgame/actor_balcony.cpp      | 2 +-
 code/fgame/actor_curious.cpp      | 4 ++--
 code/fgame/bg_voteoptions.cpp     | 4 ++--
 code/fgame/g_local.h              | 9 +++------
 code/fgame/scriptthread.cpp       | 2 +-
 code/gamespy/sv_gqueryreporting.c | 4 ++--
 code/qcommon/msg.cpp              | 2 +-
 code/renderer/tr_image.c          | 8 ++++----
 code/renderer/tr_init.c           | 2 +-
 code/renderer/tr_main.c           | 8 ++++----
 code/renderer/tr_marks.c          | 2 ++
 code/renderer/tr_noise.c          | 2 --
 code/renderer/tr_sphere_shade.cpp | 2 ++
 code/renderer/tr_terrain.c        | 2 +-
 code/server/sv_client.c           | 4 ++--
 code/uilib/uifield.cpp            | 2 +-
 code/uilib/uihorizscroll.cpp      | 2 ++
 21 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/code/cgame/cg_archive.cpp b/code/cgame/cg_archive.cpp
index 3a1b260e..29fa32c7 100644
--- a/code/cgame/cg_archive.cpp
+++ b/code/cgame/cg_archive.cpp
@@ -113,7 +113,7 @@ void CG_ArchiveModelHandle(MemArchiver& archiver, qhandle_t* handle)
 		if (tmp.length()) {
 			*handle = cgi.R_RegisterModel(tmp.c_str());
 		} else {
-			*handle = NULL;
+			*handle = (qhandle_t)0;
 		}
 	} else {
 		if (*handle) {
@@ -135,7 +135,7 @@ void CG_ArchiveShaderHandle(MemArchiver& archiver, qhandle_t* handle)
 		if (tmp.length()) {
 			*handle = cgi.R_RegisterShader(tmp.c_str());
 		} else {
-			*handle = NULL;
+			*handle = (qhandle_t)0;
 		}
 	} else {
 		if (*handle) {
diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index da1fb632..a416eede 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -1180,7 +1180,7 @@ void CG_DrawCrosshair()
     float      x, y;
     float      width, height;
 
-    shader = NULL;
+    shader = (qhandle_t)0;
 
     if (!cg_hud->integer || !ui_crosshair->integer) {
         return;
diff --git a/code/client/cl_inv.cpp b/code/client/cl_inv.cpp
index a4c50dd4..850d766d 100644
--- a/code/client/cl_inv.cpp
+++ b/code/client/cl_inv.cpp
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_ui.h"
 
 typedef struct {
-    char *string;
-    int   value;
+    const char *string;
+    int         value;
 } equipment_event_table_t;
 
 static equipment_event_table_t s_equipTable[] = {
diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 997e7798..f74215c2 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -5355,7 +5355,7 @@ void Actor::MovePath(float fMoveSpeed)
         VectorCopy(m_groundPlaneNormal, mm.groundPlaneNormal);
         VectorCopy2D(mm.obstacle_normal, m_PrevObstacleNormal);
 
-        if (m_WallDir == -1) {
+        if (m_WallDir == (char)-1) {
             mm.desired_dir[0] = -mm.obstacle_normal[1];
             mm.desired_dir[1] = mm.obstacle_normal[0];
         } else {
diff --git a/code/fgame/actor_balcony.cpp b/code/fgame/actor_balcony.cpp
index 538e6563..ab181089 100644
--- a/code/fgame/actor_balcony.cpp
+++ b/code/fgame/actor_balcony.cpp
@@ -264,7 +264,7 @@ bool Actor::CalcFallPath(void)
     loop = currentPos;
 
     mm.desired_speed = 0;
-    mm.groundPlane = NULL;
+    mm.groundPlane = qfalse;
     mm.walking = false;
     VectorSet(mm.velocity, 0, 0, -171);
 
diff --git a/code/fgame/actor_curious.cpp b/code/fgame/actor_curious.cpp
index fdaab297..19e51e5d 100644
--- a/code/fgame/actor_curious.cpp
+++ b/code/fgame/actor_curious.cpp
@@ -246,8 +246,8 @@ void Actor::LookAtCuriosity(void)
 
     iSeed = 0x19660D * (m_iCuriousTime - 0x2EB71B09 * ((level.inttime - m_iCuriousTime) & 0xFFFFFF00)) + 0x3C6EF35F;
 
-    vAngles[0] = m_DesiredLookAngles[0] + (float)iSeed / 0x4444444 * fLookScale;
-    vAngles[1] = m_DesiredLookAngles[1] + (float)iSeed / 0x2222222 * fLookScale;
+    vAngles[0] = m_DesiredLookAngles[0] + (float)iSeed / (float)0x4444444 * fLookScale;
+    vAngles[1] = m_DesiredLookAngles[1] + (float)iSeed / (float)0x2222222 * fLookScale;
     vAngles[2] = m_DesiredLookAngles[2];
     // clamp
     vAngles[0] = Q_clamp_float(vAngles[0], -90, 90);
diff --git a/code/fgame/bg_voteoptions.cpp b/code/fgame/bg_voteoptions.cpp
index 99f38629..7a7ed594 100644
--- a/code/fgame/bg_voteoptions.cpp
+++ b/code/fgame/bg_voteoptions.cpp
@@ -114,7 +114,7 @@ void VoteOptions::SetupVoteOptions(const char *configFileName, int length, const
     if (length >= MAX_VOTEOPTIONS_BUFFER_LENGTH) {
         Com_Error(
             ERR_DROP,
-            "VoteOptions: Options file '%s' is too big. Max size is %u bytes\n",
+            "VoteOptions: Options file '%s' is too big. Max size is %lu bytes\n",
             configFileName,
             MAX_VOTEOPTIONS_BUFFER_LENGTH
         );
@@ -564,7 +564,7 @@ void CG_PushCallVoteSubClient_f(void)
         if (!strlen(cg.clientinfo[i].name)) {
             continue;
         }
-
+        
         VO_ExecuteCommand(
             va("globalwidgetcommand voteclientlist additem \"%i: %s\" \"callvote %i %i;popmenu 0\"\n",
                i,
diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index fcf18650..73c8ad5a 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // g_local.h -- local definitions for game module
 
-#ifndef __G_LOCAL_H__
-#define __G_LOCAL_H__
+#pragma once
 
 #include "q_shared.h"
 #include "bg_public.h"
@@ -417,8 +416,8 @@ void       G_RunThink(gentity_t *ent);
 void QDECL G_LogPrintf(const char *fmt, ...);
 void       SendScoreboardMessageToAllClients(void);
 void QDECL G_Printf(const char *fmt, ...);
-void QDECL G_Error(const char *fmt, ...);
-void QDECL G_Error(errorParm_t type, const char *fmt, ...);
+void QDECL G_Error(const char *fmt, ...) __attribute__ ((noreturn, format(printf, 1, 2)));
+void QDECL G_Error(errorParm_t type, const char *fmt, ...) __attribute__((noreturn, format(printf, 2, 3)));
 
 //
 // g_client.c
@@ -530,5 +529,3 @@ extern gentity_t *g_entities;
 #define FOFS(x) ((size_t) & (((gentity_t *)0)->x))
 
 #include "g_utils.h"
-
-#endif /* g_local.h */
diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 4f141b12..62e48659 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -4632,7 +4632,7 @@ void ScriptThread::RestoreSound(Event *ev)
 
     time = delaytime * 1000.0f;
 
-    gi.SendServerCommand(player != NULL ? player->edict - g_entities : NULL, "restoresound %0.2f %f", time, max_vol);
+    gi.SendServerCommand(player != NULL ? player->edict - g_entities : 0, "restoresound %0.2f %f", time, max_vol);
 }
 
 void ScriptThread::EventHudDraw3d(Event *ev)
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 2e464d4b..4828db27 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -295,8 +295,8 @@ static void send_echo(qr_t qrec, struct sockaddr *sender, char *outbuf, const ch
 static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *validation)
 {
     char keyvalue[256];
-    char encrypted_val[128];
-    char encoded_val[200];
+    uchar encrypted_val[128];
+    uchar encoded_val[200];
     int  keylen;
 
     if (*validation) {
diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 77f4c338..1555aba6 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2756,7 +2756,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 	// su44: trying to find the cause of "unrecognized entity field type" error.
 	// Number of changed fields (lc) should never be larger than total field count....
 	if(numFields < lc) {
-		Com_Error( ERR_DROP, "MSG_ReadDeltaEntity: number of changed fields (%i) is higher than total field count (%i)\n",
+		Com_Error( ERR_DROP, "MSG_ReadDeltaEntity: number of changed fields (%i) is higher than total field count (%zu)\n",
 			lc, numFields);
 	}
 
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 350e6835..50013d6c 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -947,7 +947,7 @@ image_t* R_CreateImage(
 
 	if (glCompressMode) {
 		UploadCompressed(
-			(unsigned*)pic,
+			(byte*)pic,
 			image->width,
 			image->height,
 			image->numMipmaps,
@@ -962,7 +962,7 @@ image_t* R_CreateImage(
 	}
 	else {
 		Upload32(
-			(unsigned*)pic,
+			(unsigned int*)pic,
 			image->width,
 			image->height,
 			image->numMipmaps,
@@ -1089,7 +1089,7 @@ static void LoadBMP( const char *name, byte **pic, int *width, int *height )
 	}
 	if ( bmpHeader.fileSize != length )
 	{
-		ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%d vs. %d) (%s)\n", bmpHeader.fileSize, length, name );
+		ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%lu vs. %d) (%s)\n", bmpHeader.fileSize, length, name );
 	}
 	if ( bmpHeader.compression != 0 )
 	{
@@ -1213,7 +1213,7 @@ static void LoadPCX ( const char *filename, byte **pic, byte **palette, int *wid
 	// parse the PCX file
 	//
 	pcx = (pcx_t *)raw;
-	raw = &pcx->data;
+	raw = (byte*)pcx->data;
 
   	xmax = LittleShort(pcx->xmax);
     ymax = LittleShort(pcx->ymax);
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 963b302f..3ab56925 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1275,7 +1275,7 @@ void R_Init( void ) {
 
 //	Swap_Init();
 
-	if ( (int)tess.xyz & 15 ) {
+	if ( (size_t)tess.xyz & 15 ) {
 		Com_Printf( "WARNING: tess.xyz not 16 byte aligned\n" );
 	}
 	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index a836d705..800ff499 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1229,8 +1229,8 @@ recurse:
            that a median-of-three algorithm does not, in general, increase
            performance. */
 
-        mid = lo + (size / 2) * width;      /* find middle element */
-		SwapDrawSurf(mid, lo);               /* swap it to beginning of array */
+        mid = lo + (size / 2) * width;                   /* find middle element */
+		SwapDrawSurf((drawSurf_t*)mid, (drawSurf_t*)lo);  /* swap it to beginning of array */
 
         /* We now wish to partition the array into three pieces, one
            consisiting of elements <= partition element, one of elements
@@ -1271,7 +1271,7 @@ recurse:
                A[loguy] > A[lo], A[higuy] < A[lo],
                loguy < hi, highy > lo */
 
-			SwapDrawSurf(loguy, higuy);
+			SwapDrawSurf((drawSurf_t*)loguy, (drawSurf_t*)higuy);
 
             /* A[loguy] < A[lo], A[higuy] > A[lo]; so condition at top
                of loop is re-established */
@@ -1285,7 +1285,7 @@ recurse:
                A[i] <= A[lo] for lo <= i <= higuy,
                A[i] = A[lo] for higuy < i < loguy */
 
-		SwapDrawSurf(lo, higuy);     /* put partition element in place */
+		SwapDrawSurf((drawSurf_t*)lo, (drawSurf_t*)higuy);     /* put partition element in place */
 
         /* OK, now we have the following:
               A[i] >= A[higuy] for loguy <= i <= hi,
diff --git a/code/renderer/tr_marks.c b/code/renderer/tr_marks.c
index 0ce4db24..8c15f000 100644
--- a/code/renderer/tr_marks.c
+++ b/code/renderer/tr_marks.c
@@ -833,6 +833,8 @@ void R_BoxSurfacesForBModel_r(bmodel_t* pBmodel, const vec3_t mins, const vec3_t
             case SF_GRID:
                 surf->viewCount = tr.viewCount;
 				break;
+			default:
+				break;
 			}
 		}
 		else
diff --git a/code/renderer/tr_noise.c b/code/renderer/tr_noise.c
index 7e172fbe..9789433c 100644
--- a/code/renderer/tr_noise.c
+++ b/code/renderer/tr_noise.c
@@ -31,8 +31,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 static float s_noise_table[NOISE_SIZE];
 static int s_noise_perm[NOISE_SIZE];
 
-#define LERP( a, b, w ) ( a * ( 1.0f - w ) + b * w )
-
 static float GetNoiseValue( int x, int y, int z, int t )
 {
 	int index = INDEX( ( int ) x, ( int ) y, ( int ) z, ( int ) t );
diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 001b94b2..0a039ef2 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -250,6 +250,8 @@ static void RB_OptimizeLights()
                 VectorNormalize2(pLight->vOrigin, pLight->vDirection);
             }
             break;
+        default:
+            break;
         }
     }
 }
diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 2e921216..b22be9dc 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1185,7 +1185,7 @@ void R_AddTerrainSurfaces()
             if (ter_count->integer && (g_nSplit || g_nMerge)) {
                 if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
                     Com_DPrintf(
-                        "%5d tris / %5d verts / %4d splits / %4d merges\n",
+                        "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
                         g_nTris - g_tri.nFree,
                         g_nVerts - g_vert.nFree,
                         g_nSplit,
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 81006431..e262ca9c 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -1519,7 +1519,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 		// Since 2.0, displays chat messages
 		// NOTE: this should be handled by fgame, not server
 		//
-		Com_Printf("%s (%d): %s", cl->name, cl - svs.clients, s);
+		Com_Printf("%s (%ld): %s", cl->name, cl - svs.clients, s);
 	}
 
 	if (clientOK) {
@@ -1530,7 +1530,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 			if (ge->errorMessage)
 			{
 				// if an error has occured while processing the command, halt the server
-				Com_Error(ERR_DROP, ge->errorMessage);
+				Com_Error(ERR_DROP, "%s", ge->errorMessage);
 			}
 		}
 	}
diff --git a/code/uilib/uifield.cpp b/code/uilib/uifield.cpp
index a2a19b3f..952e3f7f 100644
--- a/code/uilib/uifield.cpp
+++ b/code/uilib/uifield.cpp
@@ -287,7 +287,7 @@ void UIField::CharEvent(int ch)
     // if the character was inserted at the end of the string,
     // make sure it remains NULL-terminated
     if (m_edit.m_cursor == len) {
-        m_edit.m_buffer[m_edit.m_cursor] = NULL;
+        m_edit.m_buffer[m_edit.m_cursor] = 0;
     }
 
     if (m_cvarname.length()) {
diff --git a/code/uilib/uihorizscroll.cpp b/code/uilib/uihorizscroll.cpp
index 54f14b83..14730727 100644
--- a/code/uilib/uihorizscroll.cpp
+++ b/code/uilib/uihorizscroll.cpp
@@ -161,6 +161,8 @@ void UIHorizScroll::DrawThumb(void)
             m_local_alpha
         );
         break;
+    default:
+        break;
     }
 }
 

From ebd885f053ab39cfa93967607c3c2e233629bf63 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:36:55 +0200
Subject: [PATCH 0392/2040] Fixed Subclient not having the correct client name

---
 code/fgame/bg_voteoptions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_voteoptions.cpp b/code/fgame/bg_voteoptions.cpp
index 7a7ed594..714eafe0 100644
--- a/code/fgame/bg_voteoptions.cpp
+++ b/code/fgame/bg_voteoptions.cpp
@@ -568,7 +568,7 @@ void CG_PushCallVoteSubClient_f(void)
         VO_ExecuteCommand(
             va("globalwidgetcommand voteclientlist additem \"%i: %s\" \"callvote %i %i;popmenu 0\"\n",
                i,
-               cg.clientinfo[i],
+               cg.clientinfo[i].name,
                index,
                i)
         );

From 0fa380ecfff52fd6e3a783d7d4a85cc1fcc37738 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:01:24 +0200
Subject: [PATCH 0393/2040] Correctly read the BSP checksum on big-endian
 systems

---
 code/qcommon/cm_load.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index 0b11e7b6..b0a38e57 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -766,7 +766,7 @@ unsigned CM_Checksum( dheader_t *header ) {
 
 	return LittleLong(Com_BlockChecksum(checksums, 11 * 4));
 	*/
-	return header->checksum;
+	return LittleLong(header->checksum);
 }
 
 /*
@@ -883,7 +883,7 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 
 	FS_Read( &header, sizeof( dheader_t ), h );
 
-	last_checksum = header.checksum;
+	last_checksum = LittleLong(header.checksum);
 	*checksum = last_checksum;
 
 	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {

From 026b6b2562baccfe7e41e9d51b9790f2cc851d52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:08:46 +0200
Subject: [PATCH 0394/2040] Ignore endianness on skd/skb header signature, as
 it's a string

---
 code/tiki/tiki_skel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index ebc99e4f..42d20c9f 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -573,7 +573,7 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
     memset(cache, 0, sizeof(skelcache_t));
     strncpy(cache->path, path, sizeof(cache->path));
 
-    header = LittleLong(pheader->ident);
+    header = pheader->ident;
     if (header != TIKI_SKB_HEADER_IDENT) {
         TIKI_Error("TIKI_LoadSKB: Tried to load '%s' as a skeletal base frame (File has invalid header)\n", path);
         TIKI_Free(pheader);
@@ -842,7 +842,7 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     strncpy(cache->path, path, sizeof(cache->path));
 
     // Check the signature
-    header = LittleLong(pheader->ident);
+    header = pheader->ident;
     if (header != TIKI_SKD_HEADER_IDENT) {
         TIKI_Error("TIKI_LoadSKD: Tried to load '%s' as a skeletal base frame (File has invalid header)\n", path);
         TIKI_FreeFile(pheader);

From e3b9e48d8c9c99fc1cb0496d6b5fe30c56803fac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:38:45 +0200
Subject: [PATCH 0395/2040] Added TIKI_SKEL_LOD_INDEXES

---
 code/tiki/tiki_shared.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index d3863c6e..f9259d6f 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -55,6 +55,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TIKI_FRAME_FIRST        0  // exec at first frame
 #define TIKI_FRAME_MAXFRAMERATE 60
 
+#define TIKI_SKEL_LOD_INDEXES 10
+
 // skb skeletor
 #define TIKI_SKB_HEADER_IDENT   (*(int *)"SKL ")
 #define TIKI_SKB_HEADER_VER_3   3
@@ -71,11 +73,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TIKI_SKC_HEADER_VERSION     14
 
 // tiki limitations
-#define TIKI_MAX_BONES     100
-#define TIKI_MAX_VERTEXES  1000
-#define TIKI_MAX_TRIANGLES 2000
-#define TIKI_MAX_SKELCACHE 1024
-#define TIKI_MAX_COMMANDS  128
+#define TIKI_MAX_BONES       100
+#define TIKI_MAX_VERTEXES    1000
+#define TIKI_MAX_TRIANGLES   2000
+#define TIKI_MAX_SKELCACHE   1024
+#define TIKI_MAX_COMMANDS    128
 
 #define TIKI_MAX_ENTITIES              2048
 #define TIKI_MAX_ENTITY_CACHE_PER_ENT  2
@@ -199,7 +201,7 @@ typedef struct {
     int  ofsBones;
     int  ofsSurfaces;
     int  ofsEnd;
-    int  lodIndex[10];
+    int  lodIndex[TIKI_SKEL_LOD_INDEXES];
     int  numBoxes;
     int  ofsBoxes;
     int  numMorphTargets;
@@ -254,7 +256,7 @@ typedef struct skelHeaderGame_s {
     int                  numBones;
     struct boneData_s   *pBones;
     skelSurfaceGame_t   *pSurfaces;
-    int                  lodIndex[10];
+    int                  lodIndex[TIKI_SKEL_LOD_INDEXES];
     int                  numBoxes;
     struct skelHitBox_s *pBoxes;
     struct lodControl_s *pLOD;

From 28ea95b9ffd493d00030a1ca6d6f3fa28b42a6c9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 00:08:54 +0200
Subject: [PATCH 0396/2040] Added scale field

---
 code/tiki/tiki_shared.h | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index f9259d6f..dc6de490 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -193,19 +193,21 @@ typedef struct dtiki_s {
 } dtiki_t;
 
 typedef struct {
-    int  ident;
-    int  version;
-    char name[64];
-    int  numSurfaces;
-    int  numBones;
-    int  ofsBones;
-    int  ofsSurfaces;
-    int  ofsEnd;
-    int  lodIndex[TIKI_SKEL_LOD_INDEXES];
-    int  numBoxes;
-    int  ofsBoxes;
-    int  numMorphTargets;
-    int  ofsMorphTargets;
+    int   ident;
+    int   version;
+    char  name[64];
+    int   numSurfaces;
+    int   numBones;
+    int   ofsBones;
+    int   ofsSurfaces;
+    int   ofsEnd;
+    int   lodIndex[TIKI_SKEL_LOD_INDEXES];
+    int   numBoxes;
+    int   ofsBoxes;
+    int   numMorphTargets;
+    int   ofsMorphTargets;
+    // Added in 2.0 (SKD version 6)
+    float scale;
 } skelHeader_t;
 
 typedef struct {

From a1e0bc5d7c4ab585be8e379c8f29653b45468577 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 00:40:52 +0200
Subject: [PATCH 0397/2040] Implemented TIKI_SwapSkel (used on Big-Endian
 systems)

---
 code/qcommon/tiki_main.cpp | 169 +++++++++++++++++++++++++++++++++++++
 code/qcommon/tiki_main.h   |   1 +
 2 files changed, 170 insertions(+)

diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index 629866e4..9bf56356 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.cpp
@@ -220,3 +220,172 @@ dtikianim_t *TIKI_FillTIKIStructureSkel(dloaddef_t *ld)
 
     return TIKI_InitTiki(ld, PAD(animdefsize + defsize, sizeof(void *)));
 }
+
+/*
+===============
+TIKI_SwapSkel
+
+Swap the skeleton header on Big-Endian systems
+===============
+*/
+void TIKI_SwapSkel(skelHeader_t* pheader)
+{
+#ifdef Q3_BIG_ENDIAN
+    skelSurface_t* pSurf;
+    int i, j, k;
+
+    //pheader->ident = LittleLong(pheader->ident);
+    pheader->version = LittleLong(pheader->version);
+    pheader->numSurfaces = LittleLong(pheader->numSurfaces);
+    pheader->numBones = LittleLong(pheader->numBones);
+    pheader->ofsBones = LittleLong(pheader->ofsBones);
+    pheader->ofsSurfaces = LittleLong(pheader->ofsSurfaces);
+    pheader->ofsEnd = LittleLong(pheader->ofsEnd);
+
+    if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
+        for (i = 0; i < TIKI_SKEL_LOD_INDEXES; i++) {
+            pheader->lodIndex[i] = LittleLong(pheader->lodIndex[i]);
+        }
+
+        pheader->numBoxes = LittleLong(pheader->numBoxes);
+        pheader->ofsBoxes = LittleLong(pheader->ofsBoxes);
+    }
+
+    if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
+        pheader->numMorphTargets = LittleLong(pheader->numMorphTargets);
+        pheader->ofsMorphTargets = LittleLong(pheader->ofsMorphTargets);
+    }
+
+    if (pheader->version >= TIKI_SKD_HEADER_VERSION) {
+        pheader->scale = LittleFloat(pheader->scale);
+    }
+
+    if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
+        boneFileData_t* boneBuffer;
+
+        boneBuffer = (boneFileData_t*)((byte*)pheader + pheader->ofsBones);
+        for (i = 0; i < pheader->numBones; i++) {
+            boneBuffer->boneType = (boneType_t)LittleLong(boneBuffer->boneType);
+            boneBuffer->ofsBaseData = LittleLong(boneBuffer->ofsBaseData);
+            boneBuffer->ofsChannelNames = LittleLong(boneBuffer->ofsChannelNames);
+            boneBuffer->ofsBoneNames = LittleLong(boneBuffer->ofsBoneNames);
+            boneBuffer->ofsEnd = LittleLong(boneBuffer->ofsEnd);
+
+            boneBuffer = (boneFileData_t*)((byte*)boneBuffer + boneBuffer->ofsEnd);
+        }
+    } else {
+        skelBoneName_t* TIKI_bones;
+
+        TIKI_bones = (skelBoneName_t*)((byte*)pheader + pheader->ofsBones);
+
+        for (i = 0; i < pheader->numBones; i++) {
+            TIKI_bones->parent = LittleShort(TIKI_bones->parent);
+            TIKI_bones->boxIndex = LittleShort(TIKI_bones->boxIndex);
+            TIKI_bones->flags = LittleLong(TIKI_bones->flags);
+
+            TIKI_bones++;
+        }
+    }
+
+    pSurf = (skelSurface_t*)((byte*)pheader + pheader->ofsSurfaces);
+    for (i = 0; i < pheader->numSurfaces; i++) {
+        skeletorVertex_t* pVert;
+        skeletorMorph_t* pMorph;
+        skelWeight_t* pWeight;
+        int* pTriangles;
+        int* pCollapse, * pCollapseIndex;
+
+        pSurf->ident = LittleLong(pSurf->ident);
+        pSurf->numTriangles = LittleLong(pSurf->numTriangles);
+        pSurf->numVerts = LittleLong(pSurf->numVerts);
+        pSurf->staticSurfProcessed = LittleLong(pSurf->staticSurfProcessed);
+        pSurf->ofsTriangles = LittleLong(pSurf->ofsTriangles);
+        pSurf->ofsVerts = LittleLong(pSurf->ofsVerts);
+        pSurf->ofsCollapse = LittleLong(pSurf->ofsCollapse);
+        pSurf->ofsEnd = LittleLong(pSurf->ofsEnd);
+
+        if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
+            pSurf->ofsCollapseIndex = LittleLong(pSurf->ofsCollapseIndex);
+        }
+
+        pTriangles = (int*)((byte*)pSurf + pSurf->ofsTriangles);
+        for (j = 0; j < pSurf->numTriangles; j++) {
+            pTriangles[j * 3 + 0] = LittleLong(pTriangles[j * 3 + 0]);
+            pTriangles[j * 3 + 1] = LittleLong(pTriangles[j * 3 + 1]);
+            pTriangles[j * 3 + 2] = LittleLong(pTriangles[j * 3 + 2]);
+        }
+
+        if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
+            pVert = (skeletorVertex_t*)((byte*)pSurf + pSurf->ofsVerts);
+
+            for (j = 0; j < pSurf->numVerts; j++) {
+                pVert->normal[0] = LittleFloat(pVert->normal[0]);
+                pVert->normal[1] = LittleFloat(pVert->normal[1]);
+                pVert->normal[2] = LittleFloat(pVert->normal[2]);
+                pVert->texCoords[0] = LittleFloat(pVert->texCoords[0]);
+                pVert->texCoords[1] = LittleFloat(pVert->texCoords[1]);
+
+                pVert->numMorphs = LittleLong(pVert->numMorphs);
+                pMorph = (skeletorMorph_t*)((byte*)pVert + sizeof(*pVert));
+
+                for (k = 0; k < pVert->numMorphs; k++, pMorph++) {
+                    pMorph->morphIndex = LittleLong(pMorph->morphIndex);
+                    pMorph->offset[0] = LittleFloat(pMorph->offset[0]);
+                    pMorph->offset[1] = LittleFloat(pMorph->offset[1]);
+                    pMorph->offset[2] = LittleFloat(pMorph->offset[2]);
+                }
+
+                pVert->numWeights = LittleLong(pVert->numWeights);
+                pWeight = (skelWeight_t*)pMorph;
+
+                for (k = 0; k < pVert->numWeights; k++, pWeight++) {
+                    pWeight->boneIndex = LittleLong(pWeight->boneIndex);
+                    pWeight->boneWeight = LittleFloat(pWeight->boneWeight);
+                    pWeight->offset[0] = LittleFloat(pWeight->offset[0]);
+                    pWeight->offset[1] = LittleFloat(pWeight->offset[1]);
+                    pWeight->offset[2] = LittleFloat(pWeight->offset[2]);
+                }
+
+                pVert = (skeletorVertex_t*)pWeight;
+            }
+        } else {
+            pVert = (skeletorVertex_t*)((byte*)pSurf + pSurf->ofsVerts);
+
+            for (j = 0; j < pSurf->numVerts; j++) {
+                pVert->normal[0] = LittleFloat(pVert->normal[0]);
+                pVert->normal[1] = LittleFloat(pVert->normal[1]);
+                pVert->normal[2] = LittleFloat(pVert->normal[2]);
+                pVert->texCoords[0] = LittleFloat(pVert->texCoords[0]);
+                pVert->texCoords[1] = LittleFloat(pVert->texCoords[1]);
+                pVert->numWeights = LittleLong(pVert->numWeights);
+
+                pWeight = (skelWeight_t*)((byte*)pVert + sizeof(*pVert));
+
+                for (k = 0; k < pVert->numWeights; k++, pWeight++) {
+                    pWeight->boneIndex = LittleLong(pWeight->boneIndex);
+                    pWeight->boneWeight = LittleFloat(pWeight->boneWeight);
+                    pWeight->offset[0] = LittleFloat(pWeight->offset[0]);
+                    pWeight->offset[1] = LittleFloat(pWeight->offset[1]);
+                    pWeight->offset[2] = LittleFloat(pWeight->offset[2]);
+                }
+
+                pVert = (skeletorVertex_t*)pWeight;
+            }
+        }
+
+        pCollapse = (int*)((byte*)pSurf + pSurf->ofsCollapse);
+        for (j = 0; j < pSurf->numVerts; j++) {
+            pCollapse[j] = LittleLong(pCollapse[j]);
+        }
+
+        if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
+            pCollapseIndex = (int*)((byte*)pSurf + pSurf->ofsCollapseIndex);
+            for (j = 0; j < pSurf->numVerts; j++) {
+                pCollapseIndex[j] = LittleLong(pCollapseIndex[j]);
+            }
+        }
+
+        pSurf = (skelSurface_t*)((byte*)pSurf + pSurf->ofsEnd);
+    }
+#endif
+}
diff --git a/code/qcommon/tiki_main.h b/code/qcommon/tiki_main.h
index b0f63109..7230dad7 100644
--- a/code/qcommon/tiki_main.h
+++ b/code/qcommon/tiki_main.h
@@ -40,6 +40,7 @@ extern "C" {
     TIKI_SetupIndividualSurface(const char *filename, dtikisurface_t *surf, const char *name, dloadsurface_t *loadsurf);
     size_t       TIKI_CalcAnimDefSize(dloaddef_t *ld);
     dtikianim_t *TIKI_FillTIKIStructureSkel(dloaddef_t *ld);
+    void         TIKI_SwapSkel(skelHeader_t* pheader);
 
 #ifdef __cplusplus
 }

From e27f2443e843880974bcdb6667b7ab6b3bb74bca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 00:53:39 +0200
Subject: [PATCH 0398/2040] Fixed skel loading on big-endian systems

---
 code/tiki/tiki_skel.cpp | 154 ++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 78 deletions(-)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 42d20c9f..b267117e 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -156,21 +156,17 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     byte              *max_gs_ptr;
     byte              *gs_ptr = NULL;
 
-    pSurf      = (skelSurface_t *)((byte *)pHeader + LittleLong(pHeader->ofsSurfaces));
+    pSurf      = (skelSurface_t *)((byte *)pHeader + pHeader->ofsSurfaces);
     nSurfBytes = 0;
 
-    int numSurfaces = 0, version;
-    CopyLittleLong(&numSurfaces, &pHeader->numSurfaces);
-    CopyLittleLong(&version, &pHeader->version);
-
-    for (i = 0; i < numSurfaces; i++) {
-        skeletorVertex_t *pVert    = (skeletorVertex_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsVerts));
-        const int         numVerts = LittleLongPtr(pSurf->numVerts);
+    for (i = 0; i < pHeader->numSurfaces; i++) {
+        skeletorVertex_t *pVert    = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
+        const int         numVerts = LongNoSwapPtr(&pSurf->numVerts);
 
         nVertBytes = 0;
         for (j = 0; j < numVerts; j++) {
-            const int numMorphs  = LittleLongPtr(pVert->numMorphs);
-            const int numWeights = LittleLongPtr(pVert->numWeights);
+            const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+            const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
             int iOffset = sizeof(skeletorMorph_t) * numMorphs;
             iOffset += sizeof(skelWeight_t) * numWeights;
@@ -182,7 +178,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
         nSurfBytes += sizeof(skelSurfaceGame_t);
         // triangles
-        nSurfBytes += LittleLongPtr(pSurf->numTriangles) * sizeof(skelIndex_t) * 3;
+        nSurfBytes += LongNoSwapPtr(&pSurf->numTriangles) * sizeof(skelIndex_t) * 3;
         nSurfBytes = PAD(nSurfBytes, sizeof(void *));
         // vertices
         nSurfBytes += nVertBytes;
@@ -190,38 +186,36 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         // collapse
         nSurfBytes += numVerts * sizeof(skelIndex_t);
 
-        if (version > TIKI_SKB_HEADER_VER_3) {
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
             // collapse indices
             nSurfBytes += numVerts * sizeof(skelIndex_t);
         }
 
-        pSurf = (skelSurface_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsEnd));
+        pSurf = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
     }
 
-    nBoneBytes  = LittleLong(pHeader->numBones) * sizeof(boneData_t);
+    nBoneBytes  = pHeader->numBones * sizeof(boneData_t);
     nBoxBytes   = 0;
     nMorphBytes = 0;
 
-    if (version > TIKI_SKB_HEADER_VERSION) {
+    if (pHeader->version > TIKI_SKB_HEADER_VERSION) {
         char    *pMorphTargets;
         intptr_t nLen;
 
-        nBoxBytes                 = LittleLong(pHeader->numBoxes) * sizeof(skelHitBox_t);
-        const int ofsMorphTargets = LittleLongPtr(pHeader->ofsMorphTargets);
-        const int numMorphTargets = LittleLongPtr(pHeader->numMorphTargets);
-        pMorphTargets             = (char *)((byte *)pHeader + ofsMorphTargets);
+        nBoxBytes                 = pHeader->numBoxes * sizeof(skelHitBox_t);
+        pMorphTargets             = (char *)((byte *)pHeader + pHeader->ofsMorphTargets);
 
-        if (ofsMorphTargets > 0 || (ofsMorphTargets + numMorphTargets) < length) {
-            for (i = 0; i < numMorphTargets; i++) {
+        if (pHeader->ofsMorphTargets > 0 || (pHeader->ofsMorphTargets + pHeader->numMorphTargets) < length) {
+            for (i = 0; i < pHeader->numMorphTargets; i++) {
                 nLen = strlen(pMorphTargets) + 1;
                 nMorphBytes += nLen;
                 pMorphTargets += nLen;
             }
         } else {
-            nMorphBytes = numMorphTargets;
+            nMorphBytes = pHeader->numMorphTargets;
         }
-    } else if (version == TIKI_SKB_HEADER_VERSION) {
-        nBoxBytes = LittleLong(pHeader->numBoxes) * sizeof(skelHitBox_t);
+    } else if (pHeader->version == TIKI_SKB_HEADER_VERSION) {
+        nBoxBytes = pHeader->numBoxes * sizeof(skelHitBox_t);
     }
 
     cache->size = sizeof(skelHeaderGame_t);
@@ -238,51 +232,51 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     byte *max_ptr       = start_ptr + cache->size;
     byte *ptr           = start_ptr + sizeof(skelHeaderGame_t);
 
-    pSkel->version     = version;
-    pSkel->numSurfaces = numSurfaces;
-    pSkel->numBones    = LittleLong(pHeader->numBones);
+    pSkel->version     = pHeader->version;
+    pSkel->numSurfaces = pHeader->numSurfaces;
+    pSkel->numBones    = pHeader->numBones;
     pSkel->pSurfaces   = (skelSurfaceGame_t *)ptr;
     ptr += nSurfBytes;
     ptr           = (byte *)PADP(ptr, sizeof(void *));
     pSkel->pBones = (boneData_t *)ptr;
     ptr += nBoneBytes;
     ptr             = (byte *)PADP(ptr, sizeof(void *));
-    pSkel->numBoxes = LittleLong(pHeader->numBoxes);
+    pSkel->numBoxes = pHeader->numBoxes;
     pSkel->pBoxes   = (skelHitBox_t *)ptr;
     ptr += nBoxBytes;
     ptr                    = (byte *)PADP(ptr, sizeof(void *));
     pSkel->pLOD            = NULL;
-    pSkel->numMorphTargets = LittleLong(pHeader->numMorphTargets);
+    pSkel->numMorphTargets = pHeader->numMorphTargets;
     pSkel->pMorphTargets   = (char *)ptr;
     ptr += nMorphBytes;
     ptr = (byte *)PADP(ptr, sizeof(void *));
     memcpy(pSkel->name, pHeader->name, sizeof(pSkel->name));
 
     for (i = 0; i < sizeof(pSkel->lodIndex) / sizeof(pSkel->lodIndex[0]); i++) {
-        CopyLittleLong(&pSkel->lodIndex[0], &pHeader->lodIndex[0]);
+        Com_Memcpy(&pSkel->lodIndex[i], &pHeader->lodIndex[i], sizeof(pSkel->lodIndex[i]));
     }
 
-    pSurf     = (skelSurface_t *)((byte *)pHeader + LittleLongPtr(pHeader->ofsSurfaces));
+    pSurf     = (skelSurface_t *)((byte *)pHeader + pHeader->ofsSurfaces);
     pGameSurf = pSkel->pSurfaces;
 
-    for (i = 0; i < numSurfaces; i++) {
+    for (i = 0; i < pHeader->numSurfaces; i++) {
         size_t            nBytesUsed;
         skeletorVertex_t *pVert;
-        const int         numTriangles = LittleLongPtr(pSurf->numTriangles);
-        const int         numVerts     = LittleLongPtr(pSurf->numVerts);
+        const int         numTriangles = LongNoSwapPtr(&pSurf->numTriangles);
+        const int         numVerts     = LongNoSwapPtr(&pSurf->numVerts);
 
         nTriBytes  = numTriangles * sizeof(skelIndex_t) * 3;
         nSurfBytes = 0;
-        if (version > TIKI_SKB_HEADER_VER_3) {
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
             nSurfBytes = numVerts * sizeof(skelIndex_t);
         }
 
-        pVert = (skeletorVertex_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsVerts));
+        pVert = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
         nVertBytes = 0;
         for (j = 0; j < numVerts; j++) {
-            const int numMorphs  = LittleLongPtr(pVert->numMorphs);
-            const int numWeights = LittleLongPtr(pVert->numWeights);
+            const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+            const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
             int iOffset = sizeof(skeletorMorph_t) * numMorphs;
             iOffset += sizeof(skelWeight_t) * numWeights;
@@ -303,7 +297,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         max_gs_ptr   = (byte *)pGameSurf + nBytesUsed;
         gs_ptr       = start_gs_ptr + sizeof(skelSurfaceGame_t);
 
-        pGameSurf->ident            = LittleLongPtr(pSurf->ident);
+        pGameSurf->ident            = LongNoSwapPtr(&pSurf->ident);
         pGameSurf->numTriangles     = numTriangles;
         pGameSurf->numVerts         = numVerts;
         pGameSurf->pStaticXyz       = NULL;
@@ -317,7 +311,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         gs_ptr               = (byte *)PADP(gs_ptr, sizeof(void *));
         pGameSurf->pCollapse = (skelIndex_t *)gs_ptr;
         gs_ptr += sizeof(*pGameSurf->pCollapse) * numVerts;
-        if (version > TIKI_SKB_HEADER_VER_3) {
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
             pGameSurf->pCollapseIndex = (skelIndex_t*)gs_ptr;
             gs_ptr += sizeof(*pGameSurf->pCollapseIndex) * numVerts;
         }
@@ -325,9 +319,9 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         memcpy(pGameSurf->name, pSurf->name, sizeof(pGameSurf->name));
 
         if (pGameSurf->numTriangles) {
-            const int *pTriangles = (const int *)((byte *)pSurf + LittleLongPtr(pSurf->ofsTriangles));
+            const int *pTriangles = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsTriangles));
             for (j = 0; j < numTriangles * 3; j++) {
-                CopyLittleLong(&pGameSurf->pTriangles[j], &pTriangles[j]);
+                Com_Memcpy(&pGameSurf->pTriangles[j], &pTriangles[j], sizeof(pGameSurf->pTriangles[j]));
             }
         } else {
             pGameSurf->pTriangles = NULL;
@@ -335,21 +329,21 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
         if (pGameSurf->numVerts) {
             skeletorVertex_t *skelVert = pGameSurf->pVerts;
-            pVert                      = (skeletorVertex_t *)((char *)pSurf + LittleLongPtr(pSurf->ofsVerts));
+            pVert                      = (skeletorVertex_t *)((char *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
             for (j = 0; j < pGameSurf->numVerts; j++) {
-                const int numMorphs  = LittleLongPtr(pVert->numMorphs);
-                const int numWeights = LittleLongPtr(pVert->numWeights);
+                const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+                const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
                 int iOffset = sizeof(skeletorMorph_t) * numMorphs;
                 iOffset += sizeof(skelWeight_t) * numWeights;
                 iOffset += sizeof(skeletorVertex_t);
 
-                skelVert->normal[0]    = LittleFloatPtr(pVert->normal[0]);
-                skelVert->normal[1]    = LittleFloatPtr(pVert->normal[1]);
-                skelVert->normal[2]    = LittleFloatPtr(pVert->normal[2]);
-                skelVert->texCoords[0] = LittleFloatPtr(pVert->texCoords[0]);
-                skelVert->texCoords[1] = LittleFloatPtr(pVert->texCoords[1]);
+                skelVert->normal[0]    = FloatNoSwapPtr(&pVert->normal[0]);
+                skelVert->normal[1]    = FloatNoSwapPtr(&pVert->normal[1]);
+                skelVert->normal[2]    = FloatNoSwapPtr(&pVert->normal[2]);
+                skelVert->texCoords[0] = FloatNoSwapPtr(&pVert->texCoords[0]);
+                skelVert->texCoords[1] = FloatNoSwapPtr(&pVert->texCoords[1]);
                 skelVert->numWeights   = numWeights;
                 skelVert->numMorphs    = numMorphs;
 
@@ -357,20 +351,20 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
                 skeletorMorph_t *pMorph    = (skeletorMorph_t *)((byte *)pVert + sizeof(skeletorVertex_t));
                 skeletorMorph_t *skelMorph = (skeletorMorph_t *)((byte *)skelVert + sizeof(skeletorVertex_t));
                 for (k = 0; k < numMorphs; k++, pMorph++, skelMorph++) {
-                    skelMorph->morphIndex = LittleLongPtr(pMorph->morphIndex);
-                    skelMorph->offset[0]  = LittleFloatPtr(pMorph->offset[0]);
-                    skelMorph->offset[1]  = LittleFloatPtr(pMorph->offset[1]);
-                    skelMorph->offset[2]  = LittleFloatPtr(pMorph->offset[2]);
+                    skelMorph->morphIndex = LongNoSwapPtr(&pMorph->morphIndex);
+                    skelMorph->offset[0]  = FloatNoSwapPtr(&pMorph->offset[0]);
+                    skelMorph->offset[1]  = FloatNoSwapPtr(&pMorph->offset[1]);
+                    skelMorph->offset[2]  = FloatNoSwapPtr(&pMorph->offset[2]);
                 }
 
                 skelWeight_t *pWeight    = (skelWeight_t *)((byte *)pMorph);
                 skelWeight_t *skelWeight = (skelWeight_t *)((byte *)skelMorph);
                 for (k = 0; k < numWeights; k++, skelWeight++, pWeight++) {
-                    skelWeight->boneIndex  = LittleLongPtr(pWeight->boneIndex);
-                    skelWeight->boneWeight = LittleFloatPtr(pWeight->boneWeight);
-                    skelWeight->offset[0]  = LittleFloatPtr(pWeight->offset[0]);
-                    skelWeight->offset[1]  = LittleFloatPtr(pWeight->offset[1]);
-                    skelWeight->offset[2]  = LittleFloatPtr(pWeight->offset[2]);
+                    skelWeight->boneIndex  = LongNoSwapPtr(&pWeight->boneIndex);
+                    skelWeight->boneWeight = FloatNoSwapPtr(&pWeight->boneWeight);
+                    skelWeight->offset[0]  = FloatNoSwapPtr(&pWeight->offset[0]);
+                    skelWeight->offset[1]  = FloatNoSwapPtr(&pWeight->offset[1]);
+                    skelWeight->offset[2]  = FloatNoSwapPtr(&pWeight->offset[2]);
                 }
 
                 pVert    = (skeletorVertex_t *)((byte *)pVert + iOffset);
@@ -379,15 +373,15 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
             assert((byte *)skelVert - (byte *)pGameSurf <= (byte *)pGameSurf->pCollapse - (byte *)pGameSurf);
 
-            const int *pCollapse = (const int *)((byte *)pSurf + LittleLongPtr(pSurf->ofsCollapse));
+            const int *pCollapse = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapse));
             for (j = 0; j < numVerts; j++) {
-                pGameSurf->pCollapse[j] = LittleLongPtr(pCollapse[j]);
+                pGameSurf->pCollapse[j] = LongNoSwapPtr(&pCollapse[j]);
             }
 
-            if (version > TIKI_SKB_HEADER_VER_3) {
-                const int *pCollapseIndex = (const int *)((byte *)pSurf + LittleLongPtr(pSurf->ofsCollapseIndex));
+            if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
+                const int *pCollapseIndex = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapseIndex));
                 for (j = 0; j < numVerts; j++) {
-                    pGameSurf->pCollapseIndex[j] = LittleLongPtr(pCollapseIndex[j]);
+                    pGameSurf->pCollapseIndex[j] = LongNoSwapPtr(&pCollapseIndex[j]);
                 }
             } else {
                 pGameSurf->pCollapseIndex = NULL;
@@ -398,10 +392,10 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
             pGameSurf->pCollapseIndex = NULL;
         }
 
-        if (i != numSurfaces - 1) {
+        if (i != pHeader->numSurfaces - 1) {
             pGameSurf->pNext = (skelSurfaceGame_t *)gs_ptr;
             pGameSurf        = pGameSurf->pNext;
-            pSurf            = (skelSurface_t *)((byte *)pSurf + LittleLongPtr(pSurf->ofsEnd));
+            pSurf            = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
         }
     }
 
@@ -410,8 +404,8 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     assert(((byte *)pGameSurf - (byte *)pSkel) <= cache->size);
 
     if (nBoneBytes) {
-        if (version <= TIKI_SKB_HEADER_VERSION) {
-            skelBoneName_t *TIKI_bones = (skelBoneName_t *)((byte *)pHeader + LittleLongPtr(pHeader->ofsBones));
+        if (pHeader->version <= TIKI_SKB_HEADER_VERSION) {
+            skelBoneName_t *TIKI_bones = (skelBoneName_t *)((byte *)pHeader + LongNoSwapPtr(&pHeader->ofsBones));
             for (i = 0; i < pSkel->numBones; i++) {
                 const char *boneName;
 
@@ -425,10 +419,10 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
                 TIKI_bones++;
             }
         } else {
-            boneFileData_t *boneBuffer = (boneFileData_t *)((byte *)pHeader + LittleLongPtr(pHeader->ofsBones));
+            boneFileData_t *boneBuffer = (boneFileData_t *)((byte *)pHeader + LongNoSwapPtr(&pHeader->ofsBones));
             for (i = 0; i < pSkel->numBones; i++) {
                 LoadBoneFromBuffer2(boneBuffer, &pSkel->pBones[i]);
-                boneBuffer = (boneFileData_t *)((byte *)boneBuffer + LittleLongPtr(boneBuffer->ofsEnd));
+                boneBuffer = (boneFileData_t *)((byte *)boneBuffer + LongNoSwapPtr(&boneBuffer->ofsEnd));
             }
         }
     } else {
@@ -436,7 +430,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         pSkel->pBones   = NULL;
     }
 
-    if (version <= TIKI_SKB_HEADER_VER_3) {
+    if (pHeader->version <= TIKI_SKB_HEADER_VER_3) {
         pSkel->numBoxes        = 0;
         pSkel->pBoxes          = NULL;
         pSkel->numMorphTargets = 0;
@@ -445,7 +439,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     }
 
     if (nBoxBytes) {
-        const int ofsBoxes = LittleLongPtr(pHeader->ofsBoxes);
+        const int ofsBoxes = LongNoSwapPtr(&pHeader->ofsBoxes);
 
         if (ofsBoxes <= 0 || (nBoxBytes + ofsBoxes) >= length) {
             Com_Printf("^~^~^ Box data is corrupted for '%s'\n", cache->path);
@@ -459,14 +453,14 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         pSkel->pBoxes   = NULL;
     }
 
-    if (version <= TIKI_SKB_HEADER_VERSION) {
+    if (pHeader->version <= TIKI_SKB_HEADER_VERSION) {
         pSkel->numMorphTargets = 0;
         pSkel->pMorphTargets   = NULL;
         return;
     }
 
     if (nMorphBytes) {
-        const int ofsMorphTargets = LittleLongPtr(pHeader->ofsBoxes);
+        const int ofsMorphTargets = LongNoSwapPtr(&pHeader->ofsBoxes);
 
         if (ofsMorphTargets <= 0 || (nMorphBytes + ofsMorphTargets) >= length) {
             Com_Printf("^~^~^ Morph targets data is corrupted for '%s'\n", cache->path);
@@ -656,7 +650,7 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
             newSurf->ofsCollapse += sizeof(unsigned int) * newSurf->numVerts;
         }
         if (newSurf->ofsCollapseIndex > newSurf->ofsVerts) {
-            newSurf->ofsCollapse += sizeof(unsigned int) * newSurf->numVerts;
+            newSurf->ofsCollapseIndex += sizeof(unsigned int) * newSurf->numVerts;
         }
         if (newSurf->ofsTriangles > newSurf->ofsVerts) {
             newSurf->ofsTriangles += sizeof(unsigned int) * newSurf->numVerts;
@@ -832,7 +826,7 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     }
 
     // The SKD must have at least one surface
-    if (pheader->numSurfaces <= 0) {
+    if (LittleLong(pheader->numSurfaces) <= 0) {
         TIKI_Error("^~^~^ TIKI_LoadSKD: %s has no surfaces\n", path);
         TIKI_FreeFile(pheader);
         return qfalse;
@@ -857,12 +851,15 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
         return qfalse;
     }
 
+    TIKI_SwapSkel(pheader);
+
     surf = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
 
     for (i = 0; i < pheader->numSurfaces; i++) {
         if (surf->numVerts > TIKI_MAX_VERTEXES) {
             TIKI_Error(
-                "TIKI_LoadSKD: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts
+                "TIKI_LoadSKD: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES,
+                surf->numVerts
             );
             TIKI_FreeFile(pheader);
             return qfalse;
@@ -896,7 +893,8 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     // Get the lod file associated with the skeleton
     GetLODFile(cache);
     TIKI_SortLOD(cache->skel);
-    return 1;
+
+    return true;
 }
 
 /*

From b54db17069d9f5f9dcbe323be63e22083d758294 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 01:03:08 +0200
Subject: [PATCH 0399/2040] Added unsigned swaps

---
 code/qcommon/q_platform.h |  7 +++++++
 code/qcommon/q_shared.c   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 75208757..25feb84c 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -392,7 +392,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 void CopyShortSwap(void* dest, const void* src);
 void CopyLongSwap(void* dest, const void* src);
 short ShortSwap(short l);
+unsigned short UnsignedShortSwap(unsigned short l);
 int LongSwap(int l);
+unsigned int UnsignedLongSwap(unsigned int l);
 float FloatSwap(const float* f);
 short ShortSwapPtr(const void* l);
 int LongSwapPtr(const void* l);
@@ -413,7 +415,9 @@ float FloatNoSwapPtr(const void* l);
 //
 
 #define LittleShort(x) ShortSwap(x)
+#define LittleUnsignedShort(x) UnsignedShortSwap(x)
 #define LittleLong(x) LongSwap(x)
+#define LittleUnsignedLong(x) UnsignedLongSwap(x)
 #define LittleFloat(x) FloatSwap(&x)
 #define LittleShortPtr(x) ShortSwapPtr(&x)
 #define LittleLongPtr(x) LongSwapPtr(&x)
@@ -431,6 +435,7 @@ float FloatNoSwapPtr(const void* l);
 #define CopyLittleLong(dest, src) Com_Memcpy(dest, src, 4)
 
 #define LittleShort
+#define LittleUnsignedShort
 #define LittleLong
 #define LittleFloat
 #define LittleShortPtr(x) ShortNoSwapPtr(&x)
@@ -438,7 +443,9 @@ float FloatNoSwapPtr(const void* l);
 #define LittleFloatPtr(x) FloatNoSwapPtr(&x)
 
 #define BigShort(x) ShortSwap(x)
+#define BigUnsignedShort(x) UnsignedShortSwap(x)
 #define BigLong(x) LongSwap(x)
+#define BigUnsignedLong(x) UnsignedLongSwap(x)
 #define BigFloat(x) FloatSwap(&x)
 #define BigShortPtr(x) ShortSwapPtr(&x)
 #define BigLongPtr(x) LongSwapPtr(&x)
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 293e1afc..164284f2 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1502,11 +1502,26 @@ short ShortSwap(short l)
 	return (b1 << 8) + b2;
 }
 
+unsigned short UnsignedShortSwap(unsigned short l)
+{
+	byte b1, b2;
+
+	b1 = l & 255;
+	b2 = (l >> 8) & 255;
+
+	return (b1 << 8) + b2;
+}
+
 short ShortNoSwap(short l)
 {
 	return l;
 }
 
+unsigned short UnsignedShortNoSwap(unsigned short l)
+{
+	return l;
+}
+
 int LongSwap(int l)
 {
 	byte b1, b2, b3, b4;
@@ -1519,11 +1534,28 @@ int LongSwap(int l)
 	return ((int)b1 << 24) + ((int)b2 << 16) + ((int)b3 << 8) + b4;
 }
 
+unsigned int UnsignedLongSwap(unsigned int l)
+{
+	byte b1, b2, b3, b4;
+
+	b1 = l & 255;
+	b2 = (l >> 8) & 255;
+	b3 = (l >> 16) & 255;
+	b4 = (l >> 24) & 255;
+
+	return ((unsigned int)b1 << 24) + ((unsigned int)b2 << 16) + ((unsigned int)b3 << 8) + b4;
+}
+
 int LongNoSwap(int l)
 {
 	return l;
 }
 
+unsigned int UnsignedLongNoSwap(unsigned int l)
+{
+	return l;
+}
+
 qint64 Long64Swap(qint64 ll)
 {
 	qint64 result;

From 819dffcb869a43de5d47a5f00e9c94ead296b355 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 01:05:47 +0200
Subject: [PATCH 0400/2040] Added MAX_TERRAIN_VARNODES

---
 code/qcommon/qfiles.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/qfiles.h b/code/qcommon/qfiles.h
index 405f0108..c367ab00 100644
--- a/code/qcommon/qfiles.h
+++ b/code/qcommon/qfiles.h
@@ -424,6 +424,8 @@ typedef struct fcm_s {
 	int iHeight;
 } fcm_t;
 
+#define MAX_TERRAIN_VARNODES 63
+
 typedef struct varnode_s {
 	unsigned short flags;
 } varnode_t;
@@ -448,7 +450,7 @@ typedef struct cTerraPatch_s {
 	short	iSouth;
 	short	iWest;
 
-	varnode_t		varTree[ 2 ][ 63 ];
+	varnode_t varTree[2][MAX_TERRAIN_VARNODES];
 
 	unsigned char	heightmap[ 9 * 9 ];
 } cTerraPatch_t;

From 6796a8b3fe61b27715e3aca9ff843f4cbb1b340b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 01:08:58 +0200
Subject: [PATCH 0401/2040] Properly swap terrain patch values on big-endian
 systems

---
 code/qcommon/cm_load.c    |  1 +
 code/qcommon/cm_terrain.c | 34 ++++++++++++++++++++++++++++++++++
 code/qcommon/cm_terrain.h |  1 +
 3 files changed, 36 insertions(+)

diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index b0a38e57..5c8e0578 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -709,6 +709,7 @@ void CMod_LoadTerrain( gamelump_t *lump ) {
 	CM_PrepareGenerateTerrainCollide();
 
 	for( i = 0; i < numTerraPatches; i++ ) {
+		CM_SwapTerraPatch(&terraPatches[i]);
 		// Generate collision
 		CM_GenerateTerrainCollide( &terraPatches[ i ], &cm.terrain[ i ].tc );
 		cm.terrain[ i ].contents = cm.shaders[ terraPatches[ i ].iShader ].contentFlags;
diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 82dee2ed..168766c0 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -1481,3 +1481,37 @@ int CM_TerrainSquareType(int iTerrainPatch, int i, int j)
 {
     return cm.terrain[iTerrainPatch].tc.squares[i][j].eMode;
 }
+
+/*
+====================
+CM_SwapTerraPatch
+
+Swaps the patch on big-endian
+====================
+*/
+void CM_SwapTerraPatch(cTerraPatch_t* pPatch) {
+#ifdef Q3_BIG_ENDIAN
+    int i;
+
+    pPatch->texCoord[0][0][0] = LittleFloat(pPatch->texCoord[0][0][0]);
+    pPatch->texCoord[0][0][1] = LittleFloat(pPatch->texCoord[0][0][1]);
+    pPatch->texCoord[0][1][0] = LittleFloat(pPatch->texCoord[0][1][0]);
+    pPatch->texCoord[0][1][1] = LittleFloat(pPatch->texCoord[0][1][1]);
+    pPatch->texCoord[1][0][0] = LittleFloat(pPatch->texCoord[1][0][0]);
+    pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
+    pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
+    pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
+    pPatch->iBaseHeight = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth = LittleShort(pPatch->iNorth);
+    pPatch->iEast = LittleShort(pPatch->iEast);
+    pPatch->iSouth = LittleShort(pPatch->iSouth);
+    pPatch->iWest = LittleShort(pPatch->iWest);
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
+        pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);
+        pPatch->varTree[1][i].flags = LittleUnsignedShort(pPatch->varTree[1][i].flags);
+    }
+#endif
+}
diff --git a/code/qcommon/cm_terrain.h b/code/qcommon/cm_terrain.h
index 7d2e7df0..f29597bc 100644
--- a/code/qcommon/cm_terrain.h
+++ b/code/qcommon/cm_terrain.h
@@ -64,6 +64,7 @@ extern "C" {
     void CM_PrepareGenerateTerrainCollide(void);
     void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc);
     int  CM_TerrainSquareType(int iTerrainPatch, int i, int j);
+    void CM_SwapTerraPatch(cTerraPatch_t* pPatch);
 
 #ifdef __cplusplus
 }

From a5535fa78963f3dade5c0517d81a3825269fb4bd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 01:40:36 +0200
Subject: [PATCH 0402/2040] Make sure to initialize the widget's command
 handler to NULL.

This should fix #305
---
 code/uilib/uiwidget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 39151320..3f0dca85 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -679,6 +679,7 @@ UIWidget::UIWidget()
 	m_visible = true;
 	m_enabled = true;
 	m_canactivate = false;
+	m_commandhandler = NULL;
 	m_font = NULL;
 	m_material = NULL;
 	m_hovermaterial = NULL;

From 41244095b1fb204439745a3aeca5a4b8c3c18dac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 12:47:18 +0200
Subject: [PATCH 0403/2040] CMod_LoadTerrainIndexes: big-endian compatibility

---
 code/qcommon/cm_load.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index 5c8e0578..d3ef6509 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -744,7 +744,7 @@ void CMod_LoadTerrainIndexes( gamelump_t *lump ) {
 
 	for( i = 0; i < cm.numLeafTerrains; i++, in++ )
 	{
-		cm.leafterrains[ i ] = &cm.terrain[ *in ];
+		cm.leafterrains[ i ] = &cm.terrain[ LittleShort( *in ) ];
 	}
 }
 

From 28c6e3b3982540de1c92630eb87986da581b5fa1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 12:48:30 +0200
Subject: [PATCH 0404/2040] Properly swap terrain patches for rendering on
 big-endian architectures

---
 code/renderer/tr_bsp.c     |  3 ++-
 code/renderer/tr_local.h   |  1 +
 code/renderer/tr_terrain.c | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 15541cdd..3d42dd44 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -566,6 +566,7 @@ void R_LoadTerrain(gamelump_t* lump) {
     out = s_worldData.terraPatches;
 
     for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
+		R_SwapTerraPatch(in);
         R_UnpackTerraPatch(in, out);
     }
 }
@@ -597,7 +598,7 @@ void R_LoadTerrainIndexes(gamelump_t* lump) {
     out = s_worldData.visTerraPatches;
 
     for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
-        *out = &s_worldData.terraPatches[*in];
+        *out = &s_worldData.terraPatches[LittleShort(*in)];
     }
 }
 
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 0f027be2..c2bfa15e 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2146,6 +2146,7 @@ void R_AddTerrainMarkSurfaces();
 void R_InitTerrain();
 void R_TerrainPrepareFrame();
 qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
+void R_SwapTerraPatch(cTerraPatch_t* pPatch);
 
 /*
 =============================================================
diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index b22be9dc..e870b85e 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1395,3 +1395,37 @@ void R_InitTerrain()
         g_fDistanceTable[i]       = 443.5 / sqrt(1.0 - dot);
     }
 }
+
+/*
+====================
+R_SwapTerraPatch
+
+Swaps the patch on big-endian
+====================
+*/
+void R_SwapTerraPatch(cTerraPatch_t* pPatch) {
+#ifdef Q3_BIG_ENDIAN
+    int i;
+
+    pPatch->texCoord[0][0][0] = LittleFloat(pPatch->texCoord[0][0][0]);
+    pPatch->texCoord[0][0][1] = LittleFloat(pPatch->texCoord[0][0][1]);
+    pPatch->texCoord[0][1][0] = LittleFloat(pPatch->texCoord[0][1][0]);
+    pPatch->texCoord[0][1][1] = LittleFloat(pPatch->texCoord[0][1][1]);
+    pPatch->texCoord[1][0][0] = LittleFloat(pPatch->texCoord[1][0][0]);
+    pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
+    pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
+    pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
+    pPatch->iBaseHeight = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth = LittleShort(pPatch->iNorth);
+    pPatch->iEast = LittleShort(pPatch->iEast);
+    pPatch->iSouth = LittleShort(pPatch->iSouth);
+    pPatch->iWest = LittleShort(pPatch->iWest);
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
+        pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);
+        pPatch->varTree[1][i].flags = LittleUnsignedShort(pPatch->varTree[1][i].flags);
+    }
+#endif
+}

From 5155c101362e8a6dcfc5480f442b00fb4684cd17 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 14:40:35 +0200
Subject: [PATCH 0405/2040] Fixed scripts not working on big-endian
 architectures

---
 code/script/scriptcompiler.cpp | 47 +++++++++++++++++++---------------
 code/script/scriptcompiler.h   |  3 +++
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 17dfcf18..f3fdcf3c 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -146,7 +146,7 @@ void ScriptCompiler::AddJumpBackLocation(unsigned char *pos)
 {
     int offset = (code_pos - pos);
 
-    EmitOpcodeValue(offset, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)offset, sizeof(unsigned int));
     ClearPrevOpcode();
 }
 
@@ -154,7 +154,7 @@ void ScriptCompiler::AddJumpToLocation(unsigned char *pos)
 {
     int offset = (pos - code_pos - 1);
 
-    EmitOpcodeValue(offset, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)offset, sizeof(unsigned int));
     ClearPrevOpcode();
 }
 
@@ -280,7 +280,7 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
         EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
     }
 
-    EmitOpcodeValue(index, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitBoolJumpFalse(unsigned int sourcePos)
@@ -394,7 +394,7 @@ void ScriptCompiler::EmitConstArrayOpcode(int iCount)
     SetOpcodeVarStackOffset(OP_LOAD_CONST_ARRAY1, 1 - iCount);
     EmitOpcode(OP_LOAD_CONST_ARRAY1, -1);
 
-    EmitOpcodeValue(iCount, sizeof(short));
+    EmitOpcodeValue((short)iCount, sizeof(short));
 }
 
 void ScriptCompiler::EmitContinue(unsigned int sourcePos)
@@ -507,10 +507,10 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
         || (eventnum && BuiltinReadVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
         EmitValue(listener_val);
         EmitOpcode(OP_STORE_FIELD, sourcePos);
-        EmitOpcodeValue(index, sizeof(unsigned int));
+        EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
     } else if (PrevOpcode() != (OP_LOAD_GAME_VAR + listener_val.node[1].byteValue) || prev_index != index) {
         EmitOpcode(OP_STORE_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
-        EmitOpcodeValue(index, sizeof(unsigned int));
+        EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
     } else {
         AbsorbPrevOpcode();
         EmitOpcode(OP_LOAD_STORE_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
@@ -645,16 +645,16 @@ void ScriptCompiler::EmitInteger(unsigned int value, unsigned int sourcePos)
         EmitOpcode(OP_STORE_INT0, sourcePos);
     } else if (value < 127) {
         EmitOpcode(OP_STORE_INT1, sourcePos);
-        EmitOpcodeValue(value, sizeof(byte));
+        EmitOpcodeValue((byte)value, sizeof(byte));
     } else if (value < 32767) {
         EmitOpcode(OP_STORE_INT2, sourcePos);
-        EmitOpcodeValue(value, sizeof(short));
+        EmitOpcodeValue((short)value, sizeof(short));
     } else if (value < 8388607) {
         EmitOpcode(OP_STORE_INT3, sourcePos);
-        EmitOpcodeValue(value, sizeof(short3));
+        EmitOpcodeValue((short3)value, sizeof(short3));
     } else {
         EmitOpcode(OP_STORE_INT4, sourcePos);
-        EmitOpcodeValue(value, sizeof(int));
+        EmitOpcodeValue((int)value, sizeof(int));
     }
 }
 
@@ -799,12 +799,12 @@ void ScriptCompiler::EmitMethodExpression(int iParamCount, int eventnum, unsigne
         SetOpcodeVarStackOffset(OP_EXEC_METHOD_COUNT1, -iParamCount);
         EmitOpcode(OP_EXEC_METHOD_COUNT1, sourcePos);
 
-        EmitOpcodeValue(iParamCount, sizeof(byte));
+        EmitOpcodeValue((byte)iParamCount, sizeof(byte));
     } else {
         EmitOpcode(OP_EXEC_METHOD0 + iParamCount, sourcePos);
     }
 
-    EmitOpcodeValue(eventnum, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)eventnum, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitNil(unsigned int sourcePos)
@@ -907,7 +907,7 @@ void ScriptCompiler::EmitOpcode(int opcode, unsigned int sourcePos)
     prev_opcodes[prev_opcode_pos].VarStackOffset     = iVarStackOffset;
     prev_opcodes[(prev_opcode_pos + 1) % 100].opcode = OP_PREVIOUS;
 
-    EmitOpcodeValue(opcode, sizeof(byte));
+    EmitOpcodeValue((byte)opcode, sizeof(byte));
 }
 
 void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
@@ -933,7 +933,7 @@ void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
         EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
 
         unsigned int index = Director.AddString(name);
-        EmitOpcodeValue(index, sizeof(unsigned int));
+        EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
     }
 }
 
@@ -979,7 +979,7 @@ void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
 
     EmitValue(val.node[1]);
     EmitOpcode(OP_STORE_FIELD_REF, sourcePos);
-    EmitOpcodeValue(index, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitStatementList(sval_t val)
@@ -1000,7 +1000,7 @@ void ScriptCompiler::EmitString(str value, unsigned int sourcePos)
     }
 
     EmitOpcode(OP_STORE_STRING, sourcePos);
-    EmitOpcodeValue(index, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitSwitch(sval_t val, unsigned int sourcePos)
@@ -1130,12 +1130,12 @@ __emit:
                 SetOpcodeVarStackOffset(OP_EXEC_CMD_COUNT1, -(int32_t)iParamCount);
                 EmitOpcode(OP_EXEC_CMD_COUNT1, val.node[3].sourcePosValue);
 
-                EmitOpcodeValue(iParamCount, sizeof(byte));
+                EmitOpcodeValue((byte)iParamCount, sizeof(byte));
             } else {
                 EmitOpcode(OP_EXEC_CMD0 + iParamCount, val.node[3].sourcePosValue);
             }
 
-            EmitOpcodeValue((op_ev_t)eventnum, sizeof(unsigned int));
+            EmitOpcodeValue((op_ev_t)eventnum, sizeof(op_ev_t));
             break;
         }
 
@@ -1170,12 +1170,12 @@ __emit:
                 SetOpcodeVarStackOffset(OP_EXEC_CMD_COUNT1, -(int32_t)iParamCount);
                 EmitOpcode(OP_EXEC_CMD_METHOD_COUNT1, val.node[4].sourcePosValue);
 
-                EmitOpcodeValue(iParamCount, sizeof(byte));
+                EmitOpcodeValue((byte)iParamCount, sizeof(byte));
             } else {
                 EmitOpcode(OP_EXEC_CMD_METHOD0 + iParamCount, val.node[4].sourcePosValue);
             }
 
-            EmitOpcodeValue(eventnum, sizeof(unsigned int));
+            EmitOpcodeValue((op_ev_t)eventnum, sizeof(op_ev_t));
             break;
         }
 
@@ -1626,6 +1626,13 @@ void ScriptCompiler::EmitOpcodeValue(const Value& value, size_t size)
     code_pos += size;
 }
 
+template<typename Value>
+void ScriptCompiler::EmitOpcodeValue(const Value& value)
+{
+    Com_Memcpy(code_pos, &value, sizeof(value));
+    code_pos += sizeof(value);
+}
+
 template<typename Value>
 void ScriptCompiler::EmitAt(unsigned char *location, const Value& value, size_t size)
 {
diff --git a/code/script/scriptcompiler.h b/code/script/scriptcompiler.h
index 34c53dcc..81e85be2 100644
--- a/code/script/scriptcompiler.h
+++ b/code/script/scriptcompiler.h
@@ -160,6 +160,9 @@ private:
     template<typename Value>
     void EmitOpcodeValue(const Value& value, size_t size);
 
+    template<typename Value>
+    void EmitOpcodeValue(const Value& value);
+
     template<typename Value>
     void EmitAt(unsigned char *location, const Value& value, size_t size);
 

From c1604c0c8cd75c335f89233d918571fb183ec247 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 14:59:52 +0200
Subject: [PATCH 0406/2040] Handle animation file endianness

---
 code/tiki/tiki_files.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index f50421ba..8ebe3ca0 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -565,6 +565,21 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
 
         if (version == TIKI_SKC_HEADER_OLD_VERSION) {
             Com_Printf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
+
+            //
+            // Handle the endianness
+            //
+            pHeader->flags = LittleLong(pHeader->flags);
+            pHeader->nBytesUsed = LittleLong(pHeader->nBytesUsed);
+            pHeader->frameTime = LittleFloat(pHeader->frameTime);
+            pHeader->totalDelta.x = LittleFloat(pHeader->totalDelta.x);
+            pHeader->totalDelta.y = LittleFloat(pHeader->totalDelta.y);
+            pHeader->totalDelta.z = LittleFloat(pHeader->totalDelta.z);
+            pHeader->totalAngleDelta = LittleFloat(pHeader->totalAngleDelta);
+            pHeader->numChannels = LittleLong(pHeader->numChannels);
+            pHeader->ofsChannelNames = LittleLong(pHeader->ofsChannelNames);
+            pHeader->numFrames = LittleLong(pHeader->numFrames);
+
             finishedHeader = skeletor_c::ConvertSkelFileToGame(pHeader, iBuffLength, path);
             if (convertAnims && convertAnims->integer) {
                 skeletor_c::SaveProcessedAnim(finishedHeader, path, pHeader);

From 005afcd53d094d409ee67c3f0d276421b34987c1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 15:05:10 +0200
Subject: [PATCH 0407/2040] Simplified `CM_PickTerrainSquareMode`

---
 code/qcommon/cm_terrain.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 168766c0..8893481d 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -200,15 +200,25 @@ void CM_PickTerrainSquareMode(terrainCollideSquare_t *square, vec3_t vTest, int
     int             flags0, flags1;
     varnodeIndex_t *vni;
 
-    vni = &g_vni[(patch->flags & 0x80) ? 1 : 0][i][j][0];
+    if (patch->flags & 0x80) {
+        vni = g_vni[1][i][j];
+    } else {
+        vni = g_vni[0][i][j];
+    }
 
-    flags0 =
-        ((unsigned short)(patch->varTree[vni->iTreeAndMask & 1][vni->iNode].flags & 0xFFFE & vni->iTreeAndMask) != 0);
-    flags1 =
-        ((unsigned short)(patch->varTree[vni[1].iTreeAndMask & 1][vni[1].iNode].flags & 0xFFFE & vni[1].iTreeAndMask)
-         != 0);
+    if ((vni[0].iTreeAndMask & patch->varTree[vni[0].iTreeAndMask & 1][vni[0].iNode].flags & 0xFFFE) != 0) {
+        flags0 = 2;
+    } else {
+        flags0 = 0;
+    }
 
-    square->eMode = modeTable[(j + i) & 1 | 2 * flags0 | 4 * flags1];
+    if ((vni[1].iTreeAndMask & patch->varTree[vni[1].iTreeAndMask & 1][vni[1].iNode].flags & 0xFFFFFFFE) != 0) {
+        flags1 = 4;
+    } else {
+        flags1 = 0;
+    }
+
+    square->eMode = modeTable[(j + i) & 1 | flags0 | flags1];
 
     if (square->eMode == 2) {
         if (DotProduct(vTest, square->plane[0]) < square->plane[0][3]) {

From ab91ade685b406e2f1b26ae16e8cd4ac04e158c5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 19:56:24 +0200
Subject: [PATCH 0408/2040] Explicitly use signed char for patch xy because
 some platforms use unsigned char by default

---
 code/qcommon/qfiles.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/qfiles.h b/code/qcommon/qfiles.h
index c367ab00..d43426d3 100644
--- a/code/qcommon/qfiles.h
+++ b/code/qcommon/qfiles.h
@@ -438,8 +438,8 @@ typedef struct cTerraPatch_s {
 
 	vec2_t	texCoord[ 2 ][ 2 ];
 
-	char	x;
-	char	y;
+	signed char		x;
+	signed char		y;
 
 	short			iBaseHeight;
 	unsigned short	iShader;

From 0333fd86f82474df60804fee4f89e03fa6e2806c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Jun 2024 21:52:28 +0200
Subject: [PATCH 0409/2040] MSG_DeltaNeeded_ver_15 was never called

---
 code/qcommon/msg.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 1555aba6..3655a30a 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2645,11 +2645,12 @@ void MSG_WritePackedCoordExtra(msg_t* msg, float fromValue, float toValue, int b
 	}
 }
 
-qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits)
-{
-    // Unoptimized in base game
-    // Doesn't compare packed values
-    return *(int*)fromField != *(int*)toField;
+qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits) {
+	if (MSG_IsProtocolVersion15()) {
+		return MSG_DeltaNeeded_ver_15(fromField, toField, fieldType, bits);
+    } else {
+		return MSG_DeltaNeeded_ver_6(fromField, toField, fieldType, bits);
+	}
 }
 
 float MSG_ReadPackedVelocity(msg_t* msg, int bits)

From 72824267366bee71180a8a8a52207aec92bea035 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 00:02:00 +0200
Subject: [PATCH 0410/2040] Improved the networking code for big-endian
 architectures

---
 code/qcommon/msg.cpp   | 153 ++++++++++++++++++++++++++++-------------
 code/qcommon/qcommon.h |   2 +-
 2 files changed, 108 insertions(+), 47 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 3655a30a..b1bd6ee6 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -1280,13 +1280,30 @@ typedef enum netFieldType_e {
 typedef struct {
 	const char *name;
 	size_t offset;
+	size_t size;
 	// bits: 0 = float
 	int bits;
 	int type;
 } netField_t;
 
+byte* LittleOffset(void* value, size_t size, size_t targetSize) {
+#ifdef Q3_BIG_ENDIAN
+	return (byte*)value + size - targetSize;
+#else
+	return (byte*)value;
+#endif
+}
+
+void CopyToLittleField(void* toF, const void* value, size_t size, size_t targetSize) {
+	Com_Memcpy(toF, LittleOffset((byte*)value, size, targetSize), targetSize);
+}
+
+void CopyFromLittleField(void* value, const void* fromF, size_t size, size_t targetSize) {
+	Com_Memcpy(LittleOffset((byte*)value, size, targetSize), fromF, targetSize);
+}
+
 // using the stringizing operator to save typing...
-#define	NETF(x) #x,(size_t)&((entityState_t*)0)->x
+#define	NETF(x) #x,(size_t)&((entityState_t*)0)->x,sizeof(entityState_t::x)
 
 netField_t	entityStateFields_ver_15[] =
 {
@@ -1610,7 +1627,7 @@ netField_t* MSG_GetEntityStateFields(size_t& outNumFields)
 #define	FLOAT_INT_BITS	13
 #define	FLOAT_INT_BIAS	(1<<(FLOAT_INT_BITS-1))
 
-void MSG_ReadRegular_ver_15(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegular_ver_15(msg_t* sb, int bits, int size, void* toF)
 {
 	if (bits == 0)
 	{
@@ -1642,20 +1659,21 @@ void MSG_ReadRegular_ver_15(msg_t* sb, int bits, void* toF)
 	else
 	{
 		if (MSG_ReadBits(sb, 1)) {
-			*(int*)toF = MSG_ReadBits(sb, bits);
+			int tmp = MSG_ReadBits(sb, bits);
+			CopyToLittleField(toF, &tmp, sizeof(int), size);
 		}
 		else {
-			*(int*)toF = 0;
+			Com_Memset(toF, 0, size);
 		}
 	}
 }
 
-void MSG_ReadRegularSimple_ver_15(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegularSimple_ver_15(msg_t* sb, int bits, int size, void* toF)
 {
-	MSG_ReadRegular_ver_15(sb, bits, toF);
+	MSG_ReadRegular_ver_15(sb, bits, size, toF);
 }
 
-void MSG_WriteRegular_ver_15(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegular_ver_15(msg_t* sb, int bits, int size, const void* toF)
 {
 	float fullFloat;
 	int trunc;
@@ -1688,20 +1706,36 @@ void MSG_WriteRegular_ver_15(msg_t* sb, int bits, const void* toF)
 		}
 	}
 	else {
-		if (!*(int*)toF) {
+		qboolean hasValue = qfalse;
+		for (size_t i = 0; i < size; ++i)
+		{
+			if (((byte*)toF)[i] != 0)
+			{
+				hasValue = qtrue;
+				break;
+			}
+		}
+
+		if (!hasValue) {
 			MSG_WriteBits(sb, 0, 1);
 		}
 		else {
+			//
+			// Added in OPM
+			//  Properly swap on little-endian architectures
+			int tmp = 0;
+			CopyFromLittleField(&tmp, toF, sizeof(int), size);
+
 			MSG_WriteBits(sb, 1, 1);
 			// integer
-			MSG_WriteBits(sb, *(int*)toF, bits);
+			MSG_WriteBits(sb, tmp, bits);
 		}
 	}
 }
 
-void MSG_WriteRegularSimple_ver_15(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegularSimple_ver_15(msg_t* sb, int bits, int size, const void* toF)
 {
-	MSG_WriteRegular_ver_15(sb, bits, toF);
+	MSG_WriteRegular_ver_15(sb, bits, size, toF);
 }
 
 void MSG_WriteEntityNum_ver_15(msg_t* sb, short number)
@@ -1715,7 +1749,7 @@ unsigned short MSG_ReadEntityNum_ver_15(msg_t* sb)
 	return (unsigned short)(MSG_ReadBits(sb, GENTITYNUM_BITS) - 1) % MAX_GENTITIES;
 }
 
-void MSG_ReadRegular_ver_6(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegular_ver_6(msg_t* sb, int bits, int size, void* toF)
 {
 	if (bits == 0)
 	{
@@ -1738,15 +1772,16 @@ void MSG_ReadRegular_ver_6(msg_t* sb, int bits, void* toF)
 	else
 	{
 		if (MSG_ReadBits(sb, 1)) {
-			*(int*)toF = MSG_ReadBits(sb, bits);
+			int tmp = MSG_ReadBits(sb, bits);
+			CopyToLittleField(toF, &tmp, sizeof(int), size);
 		}
 		else {
-			*(int*)toF = 0;
+			Com_Memset(toF, 0, size);
 		}
 	}
 }
 
-void MSG_ReadRegularSimple_ver_6(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegularSimple_ver_6(msg_t* sb, int bits, int size, void* toF)
 {
 	if (bits == 0) {
 		// float
@@ -1764,11 +1799,12 @@ void MSG_ReadRegularSimple_ver_6(msg_t* sb, int bits, void* toF)
 	}
 	else {
 		// integer
-		*(int*)toF = MSG_ReadBits(sb, bits);
+		int tmp = MSG_ReadBits(sb, bits);
+		CopyToLittleField(toF, &tmp, sizeof(int), size);
 	}
 }
 
-void MSG_WriteRegular_ver_6(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegular_ver_6(msg_t* sb, int bits, int size, const void* toF)
 {
 	float fullFloat;
 	int trunc;
@@ -1802,14 +1838,20 @@ void MSG_WriteRegular_ver_6(msg_t* sb, int bits, const void* toF)
 			MSG_WriteBits(sb, 0, 1);
 		}
 		else {
+			//
+			// Added in OPM
+			//  Properly swap on little-endian architectures
+			int tmp = 0;
+			CopyFromLittleField(&tmp, toF, sizeof(int), size);
+
 			MSG_WriteBits(sb, 1, 1);
 			// integer
-			MSG_WriteBits(sb, *(int*)toF, bits);
+			MSG_WriteBits(sb, tmp, bits);
 		}
 	}
 }
 
-void MSG_WriteRegularSimple_ver_6(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegularSimple_ver_6(msg_t* sb, int bits, int size, const void* toF)
 {
 	float fullFloat;
 	int trunc;
@@ -1833,7 +1875,14 @@ void MSG_WriteRegularSimple_ver_6(msg_t* sb, int bits, const void* toF)
 	}
 	else {
 		// integer
-		MSG_WriteBits(sb, *(int*)toF, bits);
+		//
+		// Added in OPM
+		//  Properly swap on little-endian architectures
+		int tmp = 0;
+		CopyFromLittleField(&tmp, toF, sizeof(int), size);
+
+		// integer
+		MSG_WriteBits(sb, tmp, bits);
 	}
 }
 
@@ -1847,39 +1896,39 @@ unsigned short MSG_ReadEntityNum_ver_6(msg_t* sb)
 	return MSG_ReadBits(sb, GENTITYNUM_BITS) % MAX_GENTITIES;
 }
 
-void MSG_ReadRegular(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegular(msg_t* sb, int bits, int size, void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_ReadRegular_ver_15(sb, bits, toF);
+		return MSG_ReadRegular_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_ReadRegular_ver_6(sb, bits, toF);
+		return MSG_ReadRegular_ver_6(sb, bits, size, toF);
 	}
 }
 
-void MSG_ReadRegularSimple(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegularSimple(msg_t* sb, int bits, int size, void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_ReadRegularSimple_ver_15(sb, bits, toF);
+		return MSG_ReadRegularSimple_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_ReadRegularSimple_ver_6(sb, bits, toF);
+		return MSG_ReadRegularSimple_ver_6(sb, bits, size, toF);
 	}
 }
 
-void MSG_WriteRegular(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegular(msg_t* sb, int bits, int size, const void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_WriteRegular_ver_15(sb, bits, toF);
+		return MSG_WriteRegular_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_WriteRegular_ver_6(sb, bits, toF);
+		return MSG_WriteRegular_ver_6(sb, bits, size, toF);
 	}
 }
 
-void MSG_WriteRegularSimple(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegularSimple(msg_t* sb, int bits, int size, const void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_WriteRegularSimple_ver_15(sb, bits, toF);
+		return MSG_WriteRegularSimple_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_WriteRegularSimple_ver_6(sb, bits, toF);
+		return MSG_WriteRegularSimple_ver_6(sb, bits, size, toF);
 	}
 }
 
@@ -1950,7 +1999,7 @@ void MSG_WriteDeltaEntity( msg_t *msg, struct entityState_s *from, struct entity
 	for ( i = 0, field = entityStateFields ; i < numFields; i++, field++ ) {
 		fromF = (int *)( (byte *)from + field->offset );
 		toF = (int *)( (byte *)to + field->offset );
-		deltasNeeded[i] = MSG_DeltaNeeded(fromF, toF, field->type, field->bits);
+		deltasNeeded[i] = MSG_DeltaNeeded(fromF, toF, field->type, field->bits, field->size);
 		if (deltasNeeded[i]) {
 			lc = i+1;
 		}
@@ -1992,7 +2041,7 @@ void MSG_WriteDeltaEntity( msg_t *msg, struct entityState_s *from, struct entity
 		switch ( field->type ) {
 			// normal style
 			case netFieldType_e::regular:
-				MSG_WriteRegular(msg, field->bits, toF);
+				MSG_WriteRegular(msg, field->bits, field->size, toF);
 				break;
 			case netFieldType_e::angle:
 				MSG_WritePackedAngle(msg, *(float*)toF, field->bits);
@@ -2283,13 +2332,16 @@ void MSG_WritePackedCoordExtra_ver_15(msg_t* msg, float fromValue, float toValue
 	MSG_WriteDeltaCoordExtra(msg, packedFrom, packedTo);
 }
 
-qboolean MSG_DeltaNeeded_ver_15(const void* fromField, const void* toField, int fieldType, int bits)
+qboolean MSG_DeltaNeeded_ver_15(const void* fromField, const void* toField, int fieldType, int bits, int size)
 {
 	int packedFrom;
 	int packedTo;
 	int maxValue;
+	int xoredValue;
+	int i;
 
-	if (*(int*)fromField == *(int*)toField) {
+	if (!memcmp(fromField, toField, size)) {
+		// same values, not needed
 		return qfalse;
 	}
 
@@ -2301,7 +2353,16 @@ qboolean MSG_DeltaNeeded_ver_15(const void* fromField, const void* toField, int
 		}
 
 		maxValue = (1 << abs(bits)) - 1;
-		return ((*(int*)fromField ^ *(int*)toField) & maxValue) != 0;
+		xoredValue = 0;
+
+		for (i = 0; i < size; i++) {
+			byte fromVal, toVal;
+
+			fromVal = ((byte*)fromField)[i];
+			toVal = ((byte*)toField)[i];
+			xoredValue += fromVal ^ toVal;
+		}
+		return (xoredValue & maxValue) != 0;
 	case netFieldType_e::angle:
 		packedFrom = MSG_PackAngle(*(float*)fromField, bits);
 		packedTo = MSG_PackAngle(*(float*)toField, bits);
@@ -2524,11 +2585,11 @@ void MSG_WritePackedCoordExtra_ver_6(msg_t* msg, float fromValue, float toValue,
 	// Don't implement
 }
 
-qboolean MSG_DeltaNeeded_ver_6(const void* fromField, const void* toField, int fieldType, int bits)
+qboolean MSG_DeltaNeeded_ver_6(const void* fromField, const void* toField, int fieldType, int bits, int size)
 {
 	// Unoptimized in base game
 	// Doesn't compare packed values
-	return *(int*)fromField != *(int*)toField;
+	return memcmp(fromField, toField, size);
 }
 
 float MSG_ReadPackedAngle(msg_t* msg, int bits) {
@@ -2645,11 +2706,11 @@ void MSG_WritePackedCoordExtra(msg_t* msg, float fromValue, float toValue, int b
 	}
 }
 
-qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits) {
+qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits, int size) {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_DeltaNeeded_ver_15(fromField, toField, fieldType, bits);
+		return MSG_DeltaNeeded_ver_15(fromField, toField, fieldType, bits, size);
     } else {
-		return MSG_DeltaNeeded_ver_6(fromField, toField, fieldType, bits);
+		return MSG_DeltaNeeded_ver_6(fromField, toField, fieldType, bits, size);
 	}
 }
 
@@ -2788,7 +2849,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 		} else {
 			switch (field->type) {
 				case netFieldType_e::regular:
-					MSG_ReadRegular(msg, field->bits, toF);
+					MSG_ReadRegular(msg, field->bits, field->size, toF);
 					break;
 				case netFieldType_e::angle: // angles, what a mess! it wouldnt surprise me if something goes wrong here ;)
 					*(float*)toF = MSG_ReadPackedAngle(msg, field->bits);
@@ -3073,7 +3134,7 @@ plyer_state_t communication
 */
 
 // using the stringizing operator to save typing...
-#define	PSF(x) #x,(size_t)&((playerState_t*)0)->x
+#define	PSF(x) #x,(size_t)&((playerState_t*)0)->x,sizeof(playerState_t::x)
 
 netField_t	playerStateFields_ver_15[] =
 {
@@ -3267,7 +3328,7 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 		switch ( field->type ) {
 			case netFieldType_e::regular:
-				MSG_WriteRegularSimple(msg, field->bits, toF);
+				MSG_WriteRegularSimple(msg, field->bits, field->size, toF);
 				break;
 			case netFieldType_e::angle:
 				MSG_WritePackedAngle(msg, *(float*)toF, field->bits);
@@ -3456,7 +3517,7 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 		} else {
 			switch ( field->type ) {
 				case netFieldType_e::regular:
-					MSG_ReadRegularSimple(msg, field->bits, toF);
+					MSG_ReadRegularSimple(msg, field->bits, field->size, toF);
 					break;
 				case netFieldType_e::angle:
 					*(float*)toF = MSG_ReadPackedAngle(msg, field->bits);
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index dd1cabcc..8ddcf7d4 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -154,7 +154,7 @@ int MSG_PackScale(float scale, int bits);
 int MSG_PackAlpha(float alpha, int bits);
 int MSG_PackCoord(float coord);
 int MSG_PackCoordExtra(float coord);
-qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits);
+qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits, int size);
 
 void MSG_WritePackedAngle(msg_t* msg, float value, int bits);
 void MSG_WritePackedAnimTime(msg_t* msg, float fromValue, float toValue, float frameTime, int bits);

From a7c506747538b144db9f74a58738dee5d8604eab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 00:05:32 +0200
Subject: [PATCH 0411/2040] Fixed the execution of a method on the correct
 class

---
 code/script/scriptcompiler.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index f3fdcf3c..928de100 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -273,11 +273,11 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
     listener_val = lhs.node[1];
 
     if (listener_val.node[0].type != ENUM_listener
-        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
+        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].intValue, eventnum))) {
         EmitValue(listener_val);
         EmitOpcode(OP_LOAD_FIELD_VAR, sourcePos);
     } else {
-        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].intValue, sourcePos);
     }
 
     EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
@@ -504,16 +504,16 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
     prev_index = GetOpcodeValue<unsigned int>(sizeof(unsigned int), sizeof(unsigned int));
 
     if (listener_val.node[0].type != ENUM_listener
-        || (eventnum && BuiltinReadVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
+        || (eventnum && BuiltinReadVariable(sourcePos, listener_val.node[1].intValue, eventnum))) {
         EmitValue(listener_val);
         EmitOpcode(OP_STORE_FIELD, sourcePos);
         EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
-    } else if (PrevOpcode() != (OP_LOAD_GAME_VAR + listener_val.node[1].byteValue) || prev_index != index) {
-        EmitOpcode(OP_STORE_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+    } else if (PrevOpcode() != (OP_LOAD_GAME_VAR + listener_val.node[1].intValue) || prev_index != index) {
+        EmitOpcode(OP_STORE_GAME_VAR + listener_val.node[1].intValue, sourcePos);
         EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
     } else {
         AbsorbPrevOpcode();
-        EmitOpcode(OP_LOAD_STORE_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+        EmitOpcode(OP_LOAD_STORE_GAME_VAR + listener_val.node[1].intValue, sourcePos);
         code_pos += sizeof(unsigned int);
     }
 }
@@ -926,11 +926,11 @@ void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
     int eventnum = Event::FindSetterEventNum(name);
 
     if (listener_val.node[0].type != ENUM_listener
-        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
+        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].intValue, eventnum))) {
         CompileError(sourcePos, "built-in field '%s' not allowed", name);
     } else {
         EmitOpcode(OP_STORE_PARAM, sourcePos);
-        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].intValue, sourcePos);
 
         unsigned int index = Director.AddString(name);
         EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
@@ -1266,7 +1266,7 @@ __emit:
         break;
 
     case ENUM_listener:
-        EmitOpcode(OP_STORE_GAME + val.node[1].byteValue, val.node[2].sourcePosValue);
+        EmitOpcode(OP_STORE_GAME + val.node[1].intValue, val.node[2].sourcePosValue);
         break;
 
     case ENUM_NIL:

From de621f6acb3832d60f60e9eed5e68fb27496e0e2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 00:59:23 +0200
Subject: [PATCH 0412/2040] Made short3 implementation endianness independant

This fixes scripts not working properly as script variables key are using short3
---
 code/qcommon/short3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/short3.h b/code/qcommon/short3.h
index 33c80e0d..542850d4 100644
--- a/code/qcommon/short3.h
+++ b/code/qcommon/short3.h
@@ -39,8 +39,8 @@ private:
 	short3_data_t data;
 
 protected:
-	int				get() const { return *( int * )this & 0xFFFFFF; }
-	void			set( int value ) { data.highmid = value; data.low = *( ( unsigned char * )&value + 2 ); }
+	int				get() const { return data.highmid | (data.low << 16); }
+	void			set( int value ) { data.highmid = value & 0xFFFF; data.low = value >> 16; }
 
 public :
 	operator		int( void ) const { return get(); }

From d3d2082e41ea3c37dad5d34f62c12875f8096084 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 13:08:01 +0200
Subject: [PATCH 0413/2040] Removed useless print

---
 code/fgame/navigate.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index b7b76eb9..887bc04e 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2698,8 +2698,6 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
         if (DotProduct2D(dir, mm.desired_dir) <= 0.1f) {
             error = mm.origin[2] - pos[2];
 
-            gi.Printf("error = %f\n", error);
-
             *path_fallheight = (short)fallheight;
             if (fabs(error) <= 94.0f) {
                 if (error <= 0.0f || mm.groundPlane) {

From 69766ae87a6db6656d64cb22e778f0e52b554fdf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 13:19:31 +0200
Subject: [PATCH 0414/2040] Added SwapValue

---
 code/qcommon/q_platform.h |  5 +++++
 code/qcommon/q_shared.c   | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 25feb84c..d7fcce1e 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -402,6 +402,7 @@ short ShortNoSwapPtr(const void* l);
 int LongNoSwapPtr(const void* l);
 float FloatSwapPtr(const void* l);
 float FloatNoSwapPtr(const void* l);
+void SwapValue(void* dest, size_t size);
 
 #if defined( Q3_BIG_ENDIAN ) && defined( Q3_LITTLE_ENDIAN )
 #error "Endianness defined as both big and little"
@@ -422,12 +423,14 @@ float FloatNoSwapPtr(const void* l);
 #define LittleShortPtr(x) ShortSwapPtr(&x)
 #define LittleLongPtr(x) LongSwapPtr(&x)
 #define LittleFloatPtr(x) FloatSwapPtr(&x)
+#define LittleSwap(x, size) SwapValue(x, size)
 
 #define BigShort
 #define BigLong
 #define BigFloat
 #define BigShortPtr(x) ShortNoSwapPtr(&x)
 #define BigLongPtr(x) LongNoSwapPtr(&x)
+#define BigSwap(x, size) x
 
 #elif defined( Q3_LITTLE_ENDIAN )
 
@@ -441,6 +444,7 @@ float FloatNoSwapPtr(const void* l);
 #define LittleShortPtr(x) ShortNoSwapPtr(&x)
 #define LittleLongPtr(x) LongNoSwapPtr(&x)
 #define LittleFloatPtr(x) FloatNoSwapPtr(&x)
+#define LittleSwap(x, size) x
 
 #define BigShort(x) ShortSwap(x)
 #define BigUnsignedShort(x) UnsignedShortSwap(x)
@@ -449,6 +453,7 @@ float FloatNoSwapPtr(const void* l);
 #define BigFloat(x) FloatSwap(&x)
 #define BigShortPtr(x) ShortSwapPtr(&x)
 #define BigLongPtr(x) LongSwapPtr(&x)
+#define BigSwap(x, size) SwapValue(x, size)
 
 #else
 #error "Endianness not defined"
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 164284f2..485f016b 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1492,6 +1492,21 @@ void CopyLongSwap(void* dest, const void* src)
 	to[3] = from[0];
 }
 
+void SwapValue(void* dest, size_t size) {
+	byte* data = (byte*)dest;
+
+	// swap values
+	for (size_t i = size / 2; i > 0; --i)
+	{
+		uint8_t* in = data + i - 1;
+		uint8_t* out = data + size - i;
+
+		const uint8_t tmp = *in;
+		*in = *out;
+		*out = tmp;
+	}
+}
+
 short ShortSwap(short l)
 {
 	byte b1, b2;

From 8aacdcefb8ca02dde87aa70c8a852fe0fec04982 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:14:11 +0200
Subject: [PATCH 0415/2040] Fixed lz77 endianness

---
 code/qcommon/lz77.cpp | 228 +++++++++++++++++++++---------------------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/code/qcommon/lz77.cpp b/code/qcommon/lz77.cpp
index 779fb634..cf105e76 100644
--- a/code/qcommon/lz77.cpp
+++ b/code/qcommon/lz77.cpp
@@ -151,59 +151,59 @@ cLZ77::cLZ77()
 
 unsigned int cLZ77::CompressData( unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len )
 {
-	uint8_t* ip; // eax
-	unsigned int v7; // edi
-	unsigned int v8; // edx
-	unsigned int v9; // edx
-	unsigned int v10; // esi
-	unsigned int m_off; // edx
-	uint8_t* v12; // ebp
-	unsigned int v13; // edx
-	unsigned int v14; // esi
-	unsigned int v15; // edx
-	unsigned int v16; // ebp
-	uint8_t* v17; // esi
-	unsigned int v18; // edx
-	uint8_t* v19; // esi
-	uint8_t* v20; // eax
-	int v22; // eax
-	uint8_t v23; // bl
-	uint8_t* v24; // esi
-	unsigned int v25; // edx
-	uint8_t* v26; // esi
-	uint8_t* m_pos; // eax
-	uint8_t* v28; // ebp
-	bool v29; // zf
-	uint8_t v30; // al
-	uint8_t v31; // dl
-	uint8_t v32; // dl
-	uint8_t v33; // al
-	uint8_t v34; // al
-	uint8_t v35; // dl
-	uint8_t v36; // dl
-	uint8_t v37; // al
-	uint8_t v38; // al
-	uint8_t v39; // dl
-	uint8_t* in_end; // edi
-	uint8_t* v41; // eax
-	uint8_t* v42; // esi
-	unsigned int v43; // edx
-	unsigned int v44; // eax
-	uint8_t* v45; // edi
-	uint8_t* i; // edx
-	uint8_t* v47; // edi
-	unsigned int v48; // edx
-	unsigned int v49; // edx
-	unsigned int m_len; // eax
-	uint8_t* v51; // edi
-	uint8_t* v52; // edi
-	uint8_t* ii; // esi
-	uint8_t* v54; // edi
-	unsigned int v55; // edx
-	char v56; // dl
-	uint8_t* v57; // eax
-	uint8_t v58; // dl
-	uint8_t* v59; // edi
+	uint8_t* ip;
+	unsigned int v7;
+	unsigned int v8;
+	unsigned int v9;
+	unsigned int v10;
+	unsigned int m_off;
+	uint8_t* v12;
+	unsigned int v13;
+	unsigned int v14;
+	unsigned int v15;
+	unsigned int v16;
+	uint8_t* v17;
+	unsigned int v18;
+	uint8_t* v19;
+	uint8_t* v20;
+	int v22;
+	uint8_t v23;
+	uint8_t* v24;
+	unsigned int v25;
+	uint8_t* v26;
+	uint8_t* m_pos;
+	uint8_t* v28;
+	bool v29;
+	uint8_t v30;
+	uint8_t v31;
+	uint8_t v32;
+	uint8_t v33;
+	uint8_t v34;
+	uint8_t v35;
+	uint8_t v36;
+	uint8_t v37;
+	uint8_t v38;
+	uint8_t v39;
+	uint8_t* in_end;
+	uint8_t* v41;
+	uint8_t* v42;
+	unsigned int v43;
+	unsigned int v44;
+	uint8_t* v45;
+	uint8_t* i;
+	uint8_t* v47;
+	unsigned int v48;
+	unsigned int v49;
+	unsigned int m_len;
+	uint8_t* v51;
+	uint8_t* v52;
+	uint8_t* ii;
+	uint8_t* v54;
+	unsigned int v55;
+	char v56;
+	uint8_t* v57;
+	uint8_t v58;
+	uint8_t* v59;
 
 	this->in_end = &in[in_len];
 	this->ip_end = &in[in_len - 13];
@@ -583,65 +583,65 @@ LABEL_19:
 *************************************************************************/
 int cLZ77::Decompress( unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len )
 {
-	unsigned int v5; // eax
-	uint8_t* v6; // esi
-	unsigned int v7; // eax
-	uint8_t* v8; // esi
-	int v9; // edx
-	uint8_t* v10; // edx
-	uint8_t* v11; // ebp
-	unsigned int v12; // eax
-	uint8_t* v13; // esi
-	uint8_t* v14; // edi
-	uint8_t* v15; // esi
-	uint8_t* v16; // esi
-	uint8_t* v17; // esi
-	uint8_t* op; // edi
-	uint8_t* v19; // eax
-	uint8_t* v20; // eax
-	uint8_t* v21; // ebp
-	uint8_t* v22; // edi
-	uint8_t* v23; // edi
-	uint8_t* ip; // ebp
-	uint8_t* v25; // esi
-	uint8_t* v26; // esi
-	int v27; // ebp
-	uint8_t* v28; // edi
-	uint8_t* v29; // esi
-	uint8_t* v30; // edx
-	uint8_t* v31; // eax
-	uint8_t* v32; // edi
-	uint8_t* v33; // esi
-	unsigned int v34; // eax
-	uint8_t* v35; // edx
-	int v36; // edx
-	uint8_t* v37; // esi
-	uint8_t* v38; // edi
-	uint8_t* v39; // edx
-	uint8_t* v40; // edi
-	uint8_t* v41; // edx
-	int v42; // edx
-	uint8_t* v43; // ebp
-	uint8_t* v44; // ebp
-	uint8_t* v45; // edi
-	uint8_t* v46; // edx
-	unsigned int v47; // eax
-	uint8_t* v48; // ebp
-	uint8_t* v49; // esi
-	uint8_t* v50; // ebp
-	uint8_t* v51; // edi
-	uint8_t* v52; // esi
-	uint8_t* v53; // edx
-	uint8_t* v54; // ebp
-	uint8_t* v55; // edi
-	uint8_t* v56; // edi
-	uint8_t* v57; // eax
-	uint8_t* v58; // eax
-	uint8_t* v59; // edx
-	uint8_t* v60; // eax
-	uint8_t* v61; // edi
-	uint8_t* v62; // eax
-	uint8_t* ip_end; // ecx
+	unsigned int v5;
+	uint8_t* v6;
+	unsigned int v7;
+	uint8_t* v8;
+	int v9;
+	uint8_t* v10;
+	uint8_t* v11;
+	unsigned int v12;
+	uint8_t* v13;
+	uint8_t* v14;
+	uint8_t* v15;
+	uint8_t* v16;
+	uint8_t* v17;
+	uint8_t* op;
+	uint8_t* v19;
+	uint8_t* v20;
+	uint8_t* v21;
+	uint8_t* v22;
+	uint8_t* v23;
+	uint8_t* ip;
+	uint8_t* v25;
+	uint8_t* v26;
+	int v27;
+	uint8_t* v28;
+	uint8_t* v29;
+	uint8_t* v30;
+	uint8_t* v31;
+	uint8_t* v32;
+	uint8_t* v33;
+	unsigned int v34;
+	uint8_t* v35;
+	int v36;
+	uint8_t* v37;
+	uint8_t* v38;
+	uint8_t* v39;
+	uint8_t* v40;
+	uint8_t* v41;
+	int v42;
+	uint8_t* v43;
+	uint8_t* v44;
+	uint8_t* v45;
+	uint8_t* v46;
+	unsigned int v47;
+	uint8_t* v48;
+	uint8_t* v49;
+	uint8_t* v50;
+	uint8_t* v51;
+	uint8_t* v52;
+	uint8_t* v53;
+	uint8_t* v54;
+	uint8_t* v55;
+	uint8_t* v56;
+	uint8_t* v57;
+	uint8_t* v58;
+	uint8_t* v59;
+	uint8_t* v60;
+	uint8_t* v61;
+	uint8_t* v62;
+	uint8_t* ip_end;
 
 	this->ip_end = in + in_len;
 	*out_len = 0;
@@ -802,7 +802,7 @@ LABEL_5:
 			v37 = this->op;
 			v38 = this->ip;
 			this->m_pos = v37 - 1;
-			v39 = v37 - (*(uint16_t*)v38 >> 2) - 1;
+			v39 = v37 - (LittleShort(*(unsigned short*)v38) >> 2) - 1;
 			this->ip = v38 + 2;
 			goto LABEL_36;
 		}
@@ -835,7 +835,7 @@ LABEL_5:
 			v42 = *this->ip++;
 			v34 += v42 + 7;
 		}
-		this->m_pos -= *(unsigned short*)this->ip >> 2;
+		this->m_pos -= LittleShort(*(unsigned short*)this->ip) >> 2;
 		this->ip += 2;
 		if (this->m_pos == v37)
 			break;

From 57175cfa5c3206f83178bdc516284ef4b4ebdd63 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 16:45:10 +0200
Subject: [PATCH 0416/2040] Simplified the decompression algorithm and fixed it
 for big-endian

---
 code/qcommon/lz77.cpp | 385 +++++++++++++-----------------------------
 1 file changed, 120 insertions(+), 265 deletions(-)

diff --git a/code/qcommon/lz77.cpp b/code/qcommon/lz77.cpp
index cf105e76..57eacd3e 100644
--- a/code/qcommon/lz77.cpp
+++ b/code/qcommon/lz77.cpp
@@ -583,337 +583,192 @@ LABEL_19:
 *************************************************************************/
 int cLZ77::Decompress( unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len )
 {
-	unsigned int v5;
-	uint8_t* v6;
-	unsigned int v7;
-	uint8_t* v8;
-	int v9;
-	uint8_t* v10;
-	uint8_t* v11;
-	unsigned int v12;
-	uint8_t* v13;
-	uint8_t* v14;
-	uint8_t* v15;
-	uint8_t* v16;
-	uint8_t* v17;
-	uint8_t* op;
-	uint8_t* v19;
-	uint8_t* v20;
-	uint8_t* v21;
-	uint8_t* v22;
-	uint8_t* v23;
-	uint8_t* ip;
-	uint8_t* v25;
-	uint8_t* v26;
-	int v27;
-	uint8_t* v28;
-	uint8_t* v29;
-	uint8_t* v30;
-	uint8_t* v31;
-	uint8_t* v32;
-	uint8_t* v33;
-	unsigned int v34;
-	uint8_t* v35;
-	int v36;
-	uint8_t* v37;
-	uint8_t* v38;
-	uint8_t* v39;
-	uint8_t* v40;
-	uint8_t* v41;
-	int v42;
-	uint8_t* v43;
-	uint8_t* v44;
-	uint8_t* v45;
-	uint8_t* v46;
-	unsigned int v47;
-	uint8_t* v48;
-	uint8_t* v49;
-	uint8_t* v50;
-	uint8_t* v51;
-	uint8_t* v52;
-	uint8_t* v53;
-	uint8_t* v54;
-	uint8_t* v55;
-	uint8_t* v56;
-	uint8_t* v57;
-	uint8_t* v58;
-	uint8_t* v59;
-	uint8_t* v60;
-	uint8_t* v61;
-	uint8_t* v62;
-	uint8_t* ip_end;
+	unsigned int t;
 
-	this->ip_end = in + in_len;
+	this->ip_end = &in[in_len];
 	*out_len = 0;
 	this->op = out;
 	this->ip = in;
-	if (*in > 17u)
+	if (*this->ip > 17u)
 	{
-		v5 = *in - 17;
-		this->ip = in + 1;
-		if (v5 < 4)
-			goto LABEL_49;
+		t = *this->ip++ - 17;
+		if (t <= 3)
+			goto LABEL_52;
 		do
 		{
-			*this->op = *this->ip;
-			v6 = this->ip + 1;
-			--v5;
-			++this->op;
-			this->ip = v6;
-		} while (v5);
+			*this->op++ = *this->ip++;
+			--t;
+		} while (t);
 		goto LABEL_17;
 	}
+
 LABEL_5:
-	v7 = *this->ip;
-	v8 = this->ip + 1;
-	this->ip = v8;
-	if (v7 < 16)
+	t = *this->ip++;
+	if (t <= 15)
 	{
-		if (!v7)
+		if (!t)
 		{
-			for (; !*v8; this->ip = v8)
+			while (!*this->ip)
 			{
-				v7 += 255;
-				++v8;
+				t += 255;
+				++this->ip;
 			}
-			v9 = *v8;
-			this->ip = v8 + 1;
-			v7 += v9 + 15;
+			t += 15 + *this->ip++;
 		}
-		*(int*)this->op = *(int*)this->ip;
-		v10 = this->op + 4;
-		v11 = this->ip + 4;
-		v12 = v7 - 1;
-		this->op = v10;
-		this->ip = v11;
-		v13 = v11;
-		if (v12)
+		*(unsigned int*)this->op = *(unsigned int*)this->ip;
+		this->op += 4;
+		this->ip += 4;
+		if (--t)
 		{
-			if (v12 < 4)
+			if (t <= 3)
 			{
 				do
 				{
-					*this->op = *this->ip;
-					v16 = this->ip + 1;
-					--v12;
-					++this->op;
-					this->ip = v16;
-				} while (v12);
+					*this->op++ = *this->ip++;
+					--t;
+				} while (t);
 			}
 			else
 			{
 				do
 				{
-					v12 -= 4;
-					*(int*)v10 = *(int*)v13;
-					v14 = this->op + 4;
-					v13 = this->ip + 4;
-					this->op = v14;
-					v10 = v14;
-					this->ip = v13;
-				} while (v12 >= 4);
-				for (; v12; this->ip = v15)
-				{
-					*this->op = *this->ip;
-					v15 = this->ip + 1;
-					--v12;
-					++this->op;
-				}
+					*(unsigned int*)this->op = *(unsigned int*)this->ip;
+					this->op += 4;
+					this->ip += 4;
+					t -= 4;
+				} while (t > 3);
+				for (; t; --t)
+					*this->op++ = *this->ip++;
 			}
 		}
 	LABEL_17:
-		v7 = *this->ip;
-		v17 = this->ip + 1;
-		this->ip = v17;
-		if (v7 < 16)
+		t = *this->ip++;
+		if (t <= 0xF)
 		{
-			op = this->op;
-			v19 = op - (v7 >> 2) - 2049;
-			this->m_pos = v19;
-			v20 = v19 - 4 * *v17;
-			this->m_pos = v20;
-			this->ip = v17 + 1;
-			*op = *v20;
-			v21 = this->op + 1;
-			v22 = this->m_pos + 1;
-			this->op = v21;
-			this->m_pos = v22;
-			*v21 = *v22;
-		LABEL_47:
-			v59 = this->m_pos + 1;
-			v60 = ++this->op;
-			this->m_pos = v59;
-			*v60 = *v59;
+			this->m_pos = this->op - 2049;
+			this->m_pos -= t >> 2;
+			this->m_pos -= 4 * *this->ip++;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos++;
+			*++this->op = *this->m_pos;
 			++this->op;
-			goto LABEL_48;
+			goto LABEL_51;
 		}
 	}
 	while (1)
 	{
-		if (v7 >= 64)
+		if (t > 0x3F)
 		{
-			v23 = this->op;
-			ip = this->ip;
-			v25 = v23 - ((v7 >> 2) & 7) - 1;
-			this->m_pos = v25;
-			v26 = v25 - 8 * *ip;
-			this->ip = ip + 1;
-			v27 = (v7 >> 5) - 1;
-			this->m_pos = v26;
-			*v23 = *v26;
-			v28 = this->op + 1;
-			v29 = this->m_pos + 1;
-			this->op = v28;
-			this->m_pos = v29;
-			*v28 = *v29;
-			v30 = this->op + 1;
-			v31 = this->m_pos + 1;
-			this->op = v30;
-			this->m_pos = v31;
+			this->m_pos = this->op - 1;
+			this->m_pos -= (t >> 2) & 7;
+			this->m_pos -= 8 * *this->ip++;
+			t = (t >> 5) - 1;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos++;
+			++this->op;
 			do
 			{
-				*v30 = *this->m_pos;
-				v32 = this->op + 1;
-				v33 = this->m_pos + 1;
-				--v27;
-				this->op = v32;
-				v30 = v32;
-				this->m_pos = v33;
-			} while (v27);
-			goto LABEL_48;
+				*this->op++ = *this->m_pos++;
+				--t;
+			} while (t);
+			goto LABEL_51;
 		}
-		if (v7 >= 32)
+		if (t > 0x1F)
 		{
-			v34 = v7 & 31;
-			if (!v34)
+			t &= 0x1Fu;
+			if (!t)
 			{
-				if (!*this->ip)
+				while (!*this->ip)
 				{
-					do
-					{
-						v34 += 255;
-						v35 = this->ip + 1;
-						this->ip = v35;
-					} while (!*v35);
+					t += 255;
+					++this->ip;
 				}
-				v36 = *this->ip++;
-				v34 += v36 + 31;
+				t += 31 + *this->ip++;
 			}
-			v37 = this->op;
-			v38 = this->ip;
-			this->m_pos = v37 - 1;
-			v39 = v37 - (LittleShort(*(unsigned short*)v38) >> 2) - 1;
-			this->ip = v38 + 2;
-			goto LABEL_36;
+			this->m_pos = this->op - 1;
+			this->m_pos -= LittleUnsignedShort(*(unsigned short*)this->ip) >> 2;
+			this->ip += 2;
+			goto LABEL_42;
 		}
-		v37 = this->op;
-		if (v7 < 0x10)
+		if (t <= 0xF)
 		{
-			v56 = this->ip;
-			v57 = v37 - (v7 >> 2) - 1;
-			this->m_pos = v57;
-			v58 = v57 - 4 * *v56;
-			this->m_pos = v58;
-			this->ip = v56 + 1;
-			*v37 = *v58;
-			goto LABEL_47;
+			this->m_pos = this->op - 1;
+			this->m_pos -= t >> 2;
+			this->m_pos -= 4 * *this->ip++;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos;
+			++this->op;
+			goto LABEL_51;
 		}
-		v40 = v37 - 2048 * (v7 & 8);
-		v34 = v7 & 7;
-		this->m_pos = v40;
-		if (!v34)
+		this->m_pos = this->op;
+		this->m_pos -= 2048 * (t & 8);
+		t &= 7u;
+		if (!t)
 		{
-			if (!*this->ip)
+			while (!*this->ip)
 			{
-				do
-				{
-					v34 += 255;
-					v41 = this->ip + 1;
-					this->ip = v41;
-				} while (!*v41);
+				t += 255;
+				++this->ip;
 			}
-			v42 = *this->ip++;
-			v34 += v42 + 7;
+			t += 7 + *this->ip++;
 		}
-		this->m_pos -= LittleShort(*(unsigned short*)this->ip) >> 2;
+		this->m_pos -= LittleUnsignedShort(*(unsigned short*)this->ip) >> 2;
 		this->ip += 2;
-		if (this->m_pos == v37)
+		if (this->m_pos == this->op)
 			break;
-		v39 = this->m_pos - 0x4000;
-	LABEL_36:
-		this->m_pos = v39;
-		if (v34 < 6 || v37 - v39 < 4)
+		this->m_pos -= 0x4000;
+	LABEL_42:
+		if (t <= 5 || this->op - this->m_pos <= 3)
 		{
-			*v37 = *this->m_pos;
-			v50 = this->op + 1;
-			v51 = this->m_pos + 1;
-			this->op = v50;
-			this->m_pos = v51;
-			*v50 = *v51;
-			v52 = this->op + 1;
-			v53 = this->m_pos + 1;
-			this->op = v52;
-			this->m_pos = v53;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos++;
+			++this->op;
 			do
 			{
-				*v52 = *this->m_pos;
-				v54 = this->op + 1;
-				v55 = this->m_pos + 1;
-				--v34;
-				this->op = v54;
-				v52 = v54;
-				this->m_pos = v55;
-			} while (v34);
+				*this->op++ = *this->m_pos++;
+				--t;
+			} while (t);
 		}
 		else
 		{
-			*(int*)v37 = *(int*)v39;
-			v44 = this->op + 4;
-			v45 = this->m_pos + 4;
-			this->op = v44;
-			v46 = v44;
-			this->m_pos = v45;
-			v47 = v34 - 2;
+			*(unsigned int*)this->op = *(unsigned int*)this->m_pos;
+			this->op += 4;
+			this->m_pos += 4;
+			t -= 2;
 			do
 			{
-				v47 -= 4;
-				*(int*)v46 = *(int*)this->m_pos;
-				v46 = this->op + 4;
-				v48 = this->m_pos + 4;
-				this->op = v46;
-				this->m_pos = v48;
-			} while (v47 >= 4);
-			for (; v47; this->m_pos = v49)
-			{
-				*this->op = *this->m_pos;
-				v49 = this->m_pos + 1;
-				--v47;
-				++this->op;
-			}
+				*(unsigned int*)this->op = *(unsigned int*)this->m_pos;
+				this->op += 4;
+				this->m_pos += 4;
+				t -= 4;
+			} while (t > 3);
+			for (; t; --t)
+				*this->op++ = *this->m_pos++;
 		}
-	LABEL_48:
-		v5 = *(this->ip - 2) & 3;
-		if ((*(this->ip - 2) & 3) == 0)
+	LABEL_51:
+		t = *(this->ip - 2) & 3;
+
+		if (!t)
 			goto LABEL_5;
+
+	LABEL_52:
 		do
 		{
-		LABEL_49:
-			*this->op = *this->ip;
-			v61 = this->ip + 1;
-			--v5;
-			++this->op;
-			this->ip = v61;
-		} while (v5);
-		v7 = *v61;
-		this->ip = v61 + 1;
+			*this->op++ = *this->ip++;
+			--t;
+		} while (t);
+
+		t = *this->ip++;
 	}
+
 	*out_len = this->op - out;
-	v62 = this->ip;
-	ip_end = this->ip_end;
-	if (v62 == ip_end)
+
+	if (this->ip == this->ip_end)
 		return 0;
-	else
-		return (v62 < ip_end) - 2;
+
+	if (this->ip >= this->ip_end)
+		return -2;
+	return -1;
 }
 
 static unsigned char in[ 0x40000 ];

From 0ce70b9f8f9c2da3cfd5994a9befc1fd95693a41 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 16:52:10 +0200
Subject: [PATCH 0417/2040] Improved/fixed archive support for big-endian
 platforms

---
 code/fgame/archive.cpp | 148 ++++++++++++++++++++++++++++++-----------
 1 file changed, 109 insertions(+), 39 deletions(-)

diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index fbeb14aa..28b91b36 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -66,7 +66,7 @@ static const char *typenames[] = {
     "object", "objectpointer", "safepointer",    "eventpointer", "quaternion", "entity",   "bool",     "position",
     "size"};
 
-#define ArchiveHeader  (*(int *)"MHAA")
+#define ArchiveHeader  (LittleLong(*(int *)"MHAA"))
 #define ArchiveVersion 14                             // This must be changed any time the format changes!
 #define ArchiveInfo    "OPENMOHAA Archive Version 14" // This must be changed any time the format changes!
 
@@ -208,6 +208,7 @@ qboolean ArchiveFile::OpenRead(const char *name)
 
         new_len = 0;
         Read(&new_len, sizeof(uint32_t));
+        new_len = LittleLong(new_len);
         tempbuf = (byte *)gi.Malloc(new_len);
 
         if (g_lz77.Decompress(pos, length - 8, tempbuf, &iCSVGLength) || iCSVGLength != new_len) {
@@ -487,11 +488,44 @@ File Archive functions
 
 //#define ARCHIVE_USE_TYPES 1
 
-#define ARCHIVE(func, type)                       \
-    void Archiver::Archive##func(type *v)         \
-                                                  \
-    {                                             \
-        ArchiveData(ARC_##func, v, sizeof(type)); \
+template<typename v>
+void ArchiveSwapValue(v* value) {
+    LittleSwap(value, sizeof(v));
+}
+
+template<typename v>
+void ArchiveSwapValue(v* value, size_t size) {
+    for (size_t i = 0; i < size; i++) {
+        LittleSwap(&value[i], sizeof(value[i]));
+    }
+}
+
+template<>
+void ArchiveSwapValue<Vector>(Vector* value) {
+    for (int i = 0; i < 3; i++) {
+        (*value)[i] = LittleFloat((*value)[i]);
+    }
+}
+
+template<>
+void ArchiveSwapValue<Quat>(Quat* value) {
+    for (int i = 0; i < 4; i++) {
+        (*value)[i] = LittleFloat((*value)[i]);
+    }
+}
+
+#define ARCHIVE(func, type)                             \
+    void Archiver::Archive##func(type *v)               \
+    {                                                   \
+        int i;                                          \
+        if (archivemode == ARCHIVE_WRITE) {             \
+            type nv = *v;                               \
+            ArchiveSwapValue(&nv);                      \
+            ArchiveData(ARC_##func, &nv, sizeof(type)); \
+        } else {                                        \
+            ArchiveData(ARC_##func, v, sizeof(type));   \
+            ArchiveSwapValue(v);                        \
+        }                                               \
     }
 
 ARCHIVE(Vector, Vector);
@@ -525,17 +559,41 @@ void Archiver::ArchiveSvsTime(int *time)
 
 void Archiver::ArchiveVec2(vec2_t vec)
 {
-    ArchiveData(ARC_Vec2, vec, sizeof(vec2_t));
+    int i;
+    if (archivemode == ARCHIVE_WRITE) {
+        vec2_t nv = { vec[0], vec[1] };
+        ArchiveSwapValue(nv, 2);
+        ArchiveData(ARC_Vec2, nv, sizeof(vec2_t));
+    } else {
+        ArchiveData(ARC_Vec2, vec, sizeof(vec2_t));
+        ArchiveSwapValue(vec, 2);
+    }
 }
 
 void Archiver::ArchiveVec3(vec3_t vec)
 {
-    ArchiveData(ARC_Vec3, vec, sizeof(vec3_t));
+    int i;
+    if (archivemode == ARCHIVE_WRITE) {
+        vec3_t nv = { vec[0], vec[1], vec[2]};
+        ArchiveSwapValue(nv, 3);
+        ArchiveData(ARC_Vec3, nv, sizeof(vec3_t));
+    } else {
+        ArchiveData(ARC_Vec3, vec, sizeof(vec3_t));
+        ArchiveSwapValue(vec, 3);
+    }
 }
 
 void Archiver::ArchiveVec4(vec4_t vec)
 {
-    ArchiveData(ARC_Vec4, vec, sizeof(vec4_t));
+    int i;
+    if (archivemode == ARCHIVE_WRITE) {
+        vec4_t nv = { vec[0], vec[1], vec[2], vec[3] };
+        ArchiveSwapValue(nv, 4);
+        ArchiveData(ARC_Vec4, nv, sizeof(vec4_t));
+    } else {
+        ArchiveData(ARC_Vec4, vec, sizeof(vec4_t));
+        ArchiveSwapValue(vec, 4);
+    }
 }
 
 void Archiver::ArchiveObjectPointer(LightClass **ptr)
@@ -544,7 +602,9 @@ void Archiver::ArchiveObjectPointer(LightClass **ptr)
 
     if (archivemode == ARCHIVE_READ) {
         pointer_fixup_t *fixup;
+
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+        index = LittleLong(index);
 
         //
         // see if the variable was NULL
@@ -567,6 +627,8 @@ void Archiver::ArchiveObjectPointer(LightClass **ptr)
         } else {
             index = ARCHIVE_NULL_POINTER;
         }
+
+        index = LittleLong(index);
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
     }
 }
@@ -577,7 +639,9 @@ void Archiver::ArchiveObjectPointer(Class **ptr)
 
     if (archivemode == ARCHIVE_READ) {
         pointer_fixup_t *fixup;
+
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+        index = LittleLong(index);
 
         //
         // see if the variable was NULL
@@ -600,6 +664,8 @@ void Archiver::ArchiveObjectPointer(Class **ptr)
         } else {
             index = ARCHIVE_NULL_POINTER;
         }
+
+        index = LittleLong(index);
         ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
     }
 }
@@ -612,6 +678,7 @@ void Archiver::ArchiveSafePointer(SafePtrBase *ptr)
         pointer_fixup_t *fixup;
 
         ArchiveData(ARC_SafePointer, &index, sizeof(index));
+        index = LittleLong(index);
 
         //
         // see if the variable was NULL
@@ -638,6 +705,7 @@ void Archiver::ArchiveSafePointer(SafePtrBase *ptr)
         } else {
             index = ARCHIVE_NULL_POINTER;
         }
+        index = LittleLong(index);
         ArchiveData(ARC_SafePointer, &index, sizeof(index));
     }
 }
@@ -646,12 +714,13 @@ void Archiver::ArchiveEventPointer(Event **ev)
 {
     int index;
 
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(ARC_EventPointer);
+#endif
+
     if (archivemode == ARCHIVE_READ) {
 #ifndef NDEBUG
         CheckRead();
-#endif
-#ifdef ARCHIVE_USE_TYPES
-        CheckType(ARC_EventPointer);
 #endif
         ArchiveInteger(&index);
 
@@ -673,10 +742,6 @@ void Archiver::ArchiveEventPointer(Event **ev)
             index = ARCHIVE_NULL_POINTER;
         }
 
-#ifdef ARCHIVE_USE_TYPES
-        WriteType(ARC_EventPointer);
-#endif
-
         ArchiveInteger(&index);
         if (*ev) {
             (*ev)->Archive(*this);
@@ -691,6 +756,10 @@ void Archiver::ArchiveRaw(void *data, size_t size)
 
 void Archiver::ArchiveString(str *string)
 {
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(ARC_String);
+#endif
+
     if (archivemode == ARCHIVE_READ) {
         fileSize_t s;
         char      *data;
@@ -698,10 +767,6 @@ void Archiver::ArchiveString(str *string)
 #ifndef NDEBUG
         CheckRead();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        CheckType(ARC_String);
-#endif
-
         if (!fileerror) {
             s = ReadSize();
             if (!fileerror) {
@@ -719,13 +784,12 @@ void Archiver::ArchiveString(str *string)
             }
         }
     } else {
+        fileSize_t s;
+
 #ifndef NDEBUG
         CheckWrite();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        WriteType(ARC_String);
-#endif
-        WriteSize((fileSize_t)string->length());
+        WriteSize(string->length());
         archivefile.Write(string->c_str(), string->length());
     }
 }
@@ -1019,6 +1083,7 @@ fileSize_t Archiver::ReadSize(void)
     s = 0;
     if (!fileerror) {
         archivefile.Read(&s, sizeof(s));
+        LittleSwap(&s, sizeof(s));
     }
 
     return s;
@@ -1039,6 +1104,7 @@ void Archiver::CheckSize(int type, fileSize_t size)
 
 void Archiver::WriteSize(fileSize_t size)
 {
+    LittleSwap(&size, sizeof(size));
     archivefile.Write(&size, sizeof(fileSize_t));
 }
 
@@ -1048,6 +1114,7 @@ int Archiver::ReadType(void)
 
     if (!fileerror) {
         archivefile.Read(&t, sizeof(t));
+        t = LittleLong(t);
 
         return t;
     }
@@ -1066,29 +1133,35 @@ void Archiver::CheckType(int type)
 
     assert((type >= 0) && (type < ARC_NUMTYPES));
 
-    if (!fileerror) {
-        t = ReadType();
-        if (t != type) {
-            if (t < ARC_NUMTYPES) {
-                FileError("Expecting %s, Should be %s", typenames[type], typenames[t]);
-                assert(0);
-            } else {
-                FileError("Expecting %s, Should be %i (Unknown type)", typenames[type], t);
+    if (archivemode == ARCHIVE_READ) {
+        if (!fileerror) {
+            t = ReadType();
+            if (t != type) {
+                if (t < ARC_NUMTYPES) {
+                    FileError("Expecting %s, Should be %s", typenames[type], typenames[t]);
+                    assert(0);
+                }
+                else {
+                    FileError("Expecting %s, Should be %i (Unknown type)", typenames[type], t);
+                }
             }
         }
+    } else {
+        int nt = LittleLong(type);
+        archivefile.Write(&nt, sizeof(nt));
     }
 }
 
 void Archiver::ArchiveData(int type, void *data, size_t size)
 {
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(type);
+#endif
+
     if (archivemode == ARCHIVE_READ) {
 #ifndef NDEBUG
         CheckRead();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        CheckType(type);
-#endif
-
         if (!fileerror && size) {
             m_iNumBytesIO += size;
             archivefile.Read(data, size);
@@ -1097,9 +1170,6 @@ void Archiver::ArchiveData(int type, void *data, size_t size)
 #ifndef NDEBUG
         CheckWrite();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-        WriteType(type);
-#endif
 
         if (!fileerror && size) {
             m_iNumBytesIO += size;

From cb59edc9630c957cba98d6d3976bffd8b2980059 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 16:56:42 +0200
Subject: [PATCH 0418/2040] Handle script exceptions in G_ServerSpawned

---
 code/fgame/g_main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 83561eae..6e971646 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -360,7 +360,11 @@ Called when server finished initializating
 */
 void G_ServerSpawned(void)
 {
-    level.ServerSpawned();
+    try {
+        level.ServerSpawned();
+    } catch (const ScriptException& e) {
+        G_ExitWithError(e.string.c_str());
+    }
 }
 
 /*

From 1fd238567edd9dfc826c32d15ed5fae053527050 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 17:55:57 +0200
Subject: [PATCH 0419/2040] Fixed animation loading endian

---
 code/skeletor/skeletor_loadanimation.cpp | 63 ++++++++++++++++--------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index c930a469..c1740af0 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -221,7 +221,7 @@ skelAnimDataGameHeader_t *EncodeFrames(
 skelAnimDataGameHeader_t *
 skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLength, const char *path)
 {
-    int                       i;
+    int                       i, j;
     skelAnimFileFrame_t      *pFileFrame;
     skelAnimGameFrame_t      *pGameFrame;
     skelChannelName_t        *pChannelNames;
@@ -230,6 +230,9 @@ skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLe
     skelAnimGameFrame_t      *newFrame;
     int                       channelIndex;
 
+    static_assert(sizeof(skelAnimDataFileHeader_t) == 96, "Skeletor anim header size doesn't match!");
+    static_assert(sizeof(skelAnimFileFrame_t) == 48, "Skeletor anim file frame size doesn't match!");
+
     if (pHeader->numFrames <= 0) {
         return NULL;
     }
@@ -239,17 +242,30 @@ skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLe
     newFrame   = pGameFrame;
 
     for (i = 0; i < pHeader->numFrames; i++) {
-        newFrame->bounds[0]  = pFileFrame->bounds[0];
-        newFrame->bounds[1]  = pFileFrame->bounds[1];
-        newFrame->delta      = pFileFrame->delta;
-        newFrame->angleDelta = pFileFrame->angleDelta;
+        vec4_t* pChannels;
+
+        newFrame->bounds[0][0] = LittleFloat(pFileFrame->bounds[0][0]);
+        newFrame->bounds[0][1] = LittleFloat(pFileFrame->bounds[0][1]);
+        newFrame->bounds[1][2] = LittleFloat(pFileFrame->bounds[0][2]);
+        newFrame->bounds[1][0] = LittleFloat(pFileFrame->bounds[1][0]);
+        newFrame->bounds[1][1] = LittleFloat(pFileFrame->bounds[1][1]);
+        newFrame->bounds[1][2] = LittleFloat(pFileFrame->bounds[1][2]);
+        newFrame->delta[0] = LittleFloat(pFileFrame->delta[0]);
+        newFrame->delta[1] = LittleFloat(pFileFrame->delta[1]);
+        newFrame->delta[2] = LittleFloat(pFileFrame->delta[2]);
+        newFrame->angleDelta = LittleFloat(pFileFrame->angleDelta);
+        //
+        // Load channels
+        //
         newFrame->pChannels  = new vec4_t[pHeader->numChannels];
-        memcpy(
-            newFrame->pChannels,
-            (char *)pHeader
-                + (sizeof(vec4_t) * (3 * pHeader->numFrames - 3) + sizeof(vec4_t) * pHeader->numChannels * i + 96),
-            pHeader->numChannels * sizeof(vec4_t)
-        );
+        pChannels = (vec4_t*)((byte*)pHeader + (sizeof(skelAnimDataFileHeader_t) + sizeof(skelAnimFileFrame_t) * (pHeader->numFrames - 1) + sizeof(vec4_t) * pHeader->numChannels * i));
+        for (j = 0; j < pHeader->numChannels; j++) {
+            newFrame->pChannels[j][0] = LittleFloat(pChannels[j][0]);
+            newFrame->pChannels[j][1] = LittleFloat(pChannels[j][1]);
+            newFrame->pChannels[j][2] = LittleFloat(pChannels[j][2]);
+            newFrame->pChannels[j][3] = LittleFloat(pChannels[j][3]);
+        }
+
         AddToBounds(newFrame->bounds, pFileFrame->bounds);
 
         pFileFrame++;
@@ -376,10 +392,17 @@ void WriteEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         MSG_WriteShort(msg, pChannel->nFramesInChannel);
 
         for (j = 0; j < pChannel->nFramesInChannel; j++) {
+            vec3_t channelData;
+
             pFrame = &pChannel->ary_frames[i];
             MSG_WriteShort(msg, pFrame->nFrameNum);
             MSG_WriteShort(msg, pFrame->nPrevFrameIndex);
-            MSG_WriteData(msg, pFrame->pChannelData, sizeof(vec4_t));
+
+            channelData[0] = LittleFloat(pFrame->pChannelData[0]);
+            channelData[1] = LittleFloat(pFrame->pChannelData[1]);
+            channelData[2] = LittleFloat(pFrame->pChannelData[2]);
+            channelData[3] = LittleFloat(pFrame->pChannelData[3]);
+            MSG_WriteData(msg, channelData, sizeof(vec4_t));
         }
     }
 
@@ -433,10 +456,10 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
                 MSG_ReadData(msg, channelData, sizeof(vec4_t));
 
-                pFrame->pChannelData[0] = channelData[0];
-                pFrame->pChannelData[1] = channelData[1];
-                pFrame->pChannelData[2] = channelData[2];
-                pFrame->pChannelData[3] = channelData[3];
+                pFrame->pChannelData[0] = LittleFloat(channelData[0]);
+                pFrame->pChannelData[1] = LittleFloat(channelData[1]);
+                pFrame->pChannelData[2] = LittleFloat(channelData[2]);
+                pFrame->pChannelData[3] = LittleFloat(channelData[3]);
             }
             break;
         case 1:
@@ -452,9 +475,9 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
                 MSG_ReadData(msg, channelData, sizeof(vec4_t));
 
-                pFrame->pChannelData[0] = channelData[0];
-                pFrame->pChannelData[1] = channelData[1];
-                pFrame->pChannelData[2] = channelData[2];
+                pFrame->pChannelData[0] = LittleFloat(channelData[0]);
+                pFrame->pChannelData[1] = LittleFloat(channelData[1]);
+                pFrame->pChannelData[2] = LittleFloat(channelData[2]);
             }
             break;
         case 2:
@@ -481,7 +504,7 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
                 MSG_ReadData(msg, channelData, sizeof(vec4_t));
 
-                pFrame->pChannelData[0] = channelData[0];
+                pFrame->pChannelData[0] = LittleFloat(channelData[0]);
             }
             break;
         }

From 2b01f092b33e64aa414514aa01a48029dce17cb3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:23:06 +0200
Subject: [PATCH 0420/2040] Fixed german model always being set to
 `german_wehrmacht_soldier`

---
 code/fgame/player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 6b5a791d..59e79c2f 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2430,8 +2430,8 @@ void Player::InitModel(void)
     if (g_gametype->integer == GT_SINGLE_PLAYER) {
         setModel("models/player/" + str(g_playermodel->string) + ".tik");
     } else if (dm_team == TEAM_AXIS) {
-        if (Q_stricmpn(client->pers.dm_playermodel, "german", 6)
-            && Q_stricmpn(client->pers.dm_playermodel, "axis", 4)
+        if (Q_stricmpn(client->pers.dm_playergermanmodel, "german", 6)
+            && Q_stricmpn(client->pers.dm_playergermanmodel, "axis", 4)
             //
             // 2.30 models
             //

From 8e0aa5185ba3cc5ce7d3b3f95af38ec15cc87800 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:40:03 +0200
Subject: [PATCH 0421/2040] Fixed CGM endianness

---
 code/server/sv_game.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 0be5e071..0cc0f1b4 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -203,11 +203,11 @@ static void MSG_WriteCGMBits (cgm_t *pCGM, int value, int bits)
 		pCGM->cursize++;
 	} else if(bits <= 16) {
 		// append short (two bytes)
-		*((short*)(&pCGM->data[pCGM->cursize])) = LittleShort(value);
+		*((short*)(&pCGM->data[pCGM->cursize])) = value;
 		pCGM->cursize+=2;
 	} else if(bits <= 32) {
 		// append integer (4 bytes)
-		*((int*)(&pCGM->data[pCGM->cursize])) = LittleLong(value);	
+		*((int*)(&pCGM->data[pCGM->cursize])) = value;	
 		pCGM->cursize+=4;
 	}
 	// save datatype

From 13c63d3e1f9c5789435b8701d173655957b40508 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:51:39 +0200
Subject: [PATCH 0422/2040] Fixed wrong condition with msg broadcast visibility

---
 code/server/sv_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 0cc0f1b4..14df8cc3 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -491,7 +491,7 @@ void MSG_SetBroadcastVisible(const vec_t* vPos, const vec_t* vPosB)
 		clientcluster = CM_LeafCluster(leafnum);
 		clientpvs = CM_ClusterPVS(clientcluster);
 
-		if (CM_AreasConnected(clientarea, posarea) && (!vPosB || !CM_AreasConnected(clientarea, posBarea))) {
+		if (!CM_AreasConnected(clientarea, posarea) && (!vPosB || !CM_AreasConnected(clientarea, posBarea))) {
 			continue;
 		}
 

From 618223f01be4d9f4ff2706d2090dcf6f60524670 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 19:32:15 +0200
Subject: [PATCH 0423/2040] Ignore NumShaders in protocol version 8 and below

---
 code/fgame/level.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index f2bff60c..b0bbe7f4 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -2312,6 +2312,12 @@ void Level::EventRainShaderGet(Event *ev)
 
 void Level::EventRainNumShadersSet(Event *ev)
 {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH) {
+        // There is a mistake in 1.11 and below where the NumShader event doesn't work
+        // Because the response points to EventRainShaderSet
+        return;
+    }
+
     gi.setConfigstring(CS_RAIN_NUMSHADERS, ev->GetString(1));
 }
 

From 8b16e948298b40d2f953f45d297b3c4153af4593 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 19:56:19 +0200
Subject: [PATCH 0424/2040] Fixed grenade bounce sound overly playing

---
 code/fgame/weaputils.cpp | 86 +++++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index f675709b..4e036956 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -1146,6 +1146,7 @@ void Projectile::Touch(Event *ev)
     // Bouncy Projectile
     if ((projFlags & P_BOUNCE_TOUCH)) {
         str snd;
+        int flags;
 
         if (level.time - fLastBounceTime < 0.1f) {
             fLastBounceTime = level.time;
@@ -1157,49 +1158,60 @@ void Projectile::Touch(Event *ev)
             if (bouncesound_water.length()) {
                 this->Sound(bouncesound_water, CHAN_BODY);
             }
-        } else {
-            if (bouncesound_metal.length()) {
-                snd = bouncesound_metal;
-            } else if (bouncesound_hard.length()) {
-                snd = bouncesound_hard;
-            } else {
-                snd = bouncesound;
+
+            //
+            // Added in 2.30
+            //
+            if (m_bDieInWater) {
+                PostEvent(EV_Remove, 0.5f);
             }
 
-            int flags = level.impact_trace.surfaceFlags;
+            return;
+        }
 
-            if (flags & SURF_MUD) {
-                if (bouncesound.length()) {
-                    Sound(bouncesound, CHAN_BODY);
-                }
-            } else if (flags & SURF_ROCK) {
-                if (bouncesound_hard.length()) {
-                    Sound(bouncesound_hard, CHAN_BODY);
-                }
-            } else if (flags & SURF_GRILL) {
-                if (bouncesound_metal.length()) {
-                    Sound(bouncesound_metal, CHAN_BODY);
-                }
-            } else if (flags & SURF_WOOD) {
-                if (bouncesound_hard.length()) {
-                    Sound(bouncesound_hard, CHAN_BODY);
-                }
-            } else if (flags & SURF_METAL) {
-                if (bouncesound_metal.length()) {
-                    Sound(bouncesound_metal, CHAN_BODY);
-                }
-            } else if (flags & SURF_GLASS) {
-                if (bouncesound_hard.length()) {
-                    Sound(bouncesound_hard, CHAN_BODY);
-                }
-            } else {
-                if (bouncesound.length()) {
-                    Sound(bouncesound, CHAN_BODY);
-                }
+        if (bouncesound_metal.length()) {
+            snd = bouncesound_metal;
+        } else if (bouncesound_hard.length()) {
+            snd = bouncesound_hard;
+        } else {
+            snd = bouncesound;
+        }
+
+        flags = level.impact_trace.surfaceFlags;
+
+        if (flags & SURF_MUD) {
+            if (bouncesound.length()) {
+                Sound(bouncesound, CHAN_BODY);
+            }
+        } else if (flags & SURF_ROCK) {
+            if (bouncesound_hard.length()) {
+                Sound(bouncesound_hard, CHAN_BODY);
+            }
+        } else if (flags & SURF_GRILL) {
+            if (bouncesound_metal.length()) {
+                Sound(bouncesound_metal, CHAN_BODY);
+            }
+        } else if (flags & SURF_WOOD) {
+            if (bouncesound_hard.length()) {
+                Sound(bouncesound_hard, CHAN_BODY);
+            }
+        } else if (flags & SURF_METAL) {
+            if (bouncesound_metal.length()) {
+                Sound(bouncesound_metal, CHAN_BODY);
+            }
+        } else if (flags & SURF_GLASS) {
+            if (bouncesound_hard.length()) {
+                Sound(bouncesound_hard, CHAN_BODY);
+            }
+        } else {
+            if (bouncesound.length()) {
+                Sound(bouncesound, CHAN_BODY);
             }
         }
 
         BroadcastAIEvent(AI_EVENT_WEAPON_IMPACT);
+        fLastBounceTime = level.time;
+
         return;
     }
 

From e08b2fe382106be0e098e66cc38f0ed9f5be727c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 20:10:30 +0200
Subject: [PATCH 0425/2040] Added cg_target_game

---
 code/cgame/cg_local.h |  1 +
 code/cgame/cg_main.c  | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 500e259c..b75a2131 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -431,6 +431,7 @@ extern "C" {
     extern cgs_t              cgs;
     extern cg_t               cg;
     extern clientGameImport_t cgi;
+    extern target_game_e      cg_target_game;
     extern int                cg_protocol;
     extern centity_t          cg_entities[MAX_GENTITIES];
     extern markPoly_t         *cg_markPolys;
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 4a59a432..fe29dfcb 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -35,12 +35,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 clientGameImport_t        cgi;
 static clientGameExport_t cge;
 
-cvar_t   *paused;
-cvar_t   *developer;
-cg_t      cg;
-cgs_t     cgs;
-int       cg_protocol;
-centity_t cg_entities[MAX_GENTITIES];
+cvar_t       *paused;
+cvar_t       *developer;
+cg_t          cg;
+cgs_t         cgs;
+target_game_e cg_target_game = TG_INVALID;
+int           cg_protocol;
+centity_t     cg_entities[MAX_GENTITIES];
 
 cvar_t *cg_animSpeed;
 cvar_t *cg_debugAnim;
@@ -634,6 +635,8 @@ void CG_Init(clientGameImport_t *imported, int serverMessageNum, int serverComma
     cgi = *imported;
 
     cg_protocol = cgi.Cvar_Get("com_protocol", "", 0)->integer;
+    cg_target_game = (target_game_e)cgi.Cvar_Get("com_target_game", "0", 0)->integer;
+
     CG_InitCGMessageAPI(&cge);
     CG_InitScoresAPI(&cge);
 

From 8a28ad0c36e76ed6746772a8122d97feb0827df9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 9 Jun 2024 20:16:14 +0200
Subject: [PATCH 0426/2040] Fixed explosion effects on protocol below 2.0

---
 code/cgame/cg_parsemsg.cpp | 77 +++++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index f9ff0397..5b261792 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -1031,22 +1031,33 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         return;
     }
 
-    switch (iType) {
-    case 13:
-        iBaseEffect = SFX_EXP_GREN_BASE;
-        break;
-    case 14:
-        iBaseEffect = SFX_EXP_BAZOOKA_BASE;
-        break;
-    case 15:
-        iBaseEffect = SFX_EXP_HEAVYSHELL_BASE;
-        break;
-    case 16:
-        iBaseEffect = SFX_EXP_TANK_BASE;
-        break;
-    default:
-        iBaseEffect = SFX_EXP_GREN_BASE;
-        break;
+    if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        switch (iType) {
+        case 13:
+            iBaseEffect = SFX_EXP_GREN_BASE;
+            break;
+        case 14:
+            iBaseEffect = SFX_EXP_BAZOOKA_BASE;
+            break;
+        case 15:
+            iBaseEffect = SFX_EXP_HEAVYSHELL_BASE;
+            break;
+        case 16:
+            iBaseEffect = SFX_EXP_TANK_BASE;
+            break;
+        default:
+            iBaseEffect = SFX_EXP_GREN_BASE;
+            break;
+        }
+    } else {
+        switch (iType) {
+        case 13:
+            iBaseEffect = SFX_EXP_BAZOOKA_BASE;
+            break;
+        default:
+            iBaseEffect = SFX_EXP_GREN_BASE;
+            break;
+        }
     }
 
     CG_Trace(
@@ -1074,14 +1085,18 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             break;
         case SFX_EXP_BAZOOKA_BASE:
             iSurfEffect = SFX_EXP_BAZOOKA_SNOW;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
             iSurfEffect = SFX_EXP_HEAVYSHELL_SNOW;
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_SNOW;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
         fRadius = 0;
@@ -1115,14 +1130,18 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             break;
         case SFX_EXP_BAZOOKA_BASE:
             iSurfEffect = SFX_EXP_BAZOOKA_DIRT;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
             iSurfEffect = SFX_EXP_HEAVYSHELL_DIRT;
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_DIRT;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
         fRadius = 0;
@@ -1144,7 +1163,9 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_GRASS;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
         fRadius = 0;
@@ -1156,14 +1177,18 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             break;
         case SFX_EXP_BAZOOKA_BASE:
             iSurfEffect = SFX_EXP_BAZOOKA_STONE;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
             iSurfEffect = SFX_EXP_HEAVYSHELL_STONE;
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_STONE;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
         break;
@@ -1211,7 +1236,9 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         );
     }
 
-    sfxManager.MakeEffect_Normal(iBaseEffect, vEnd, trace.plane.normal);
+    if (iBaseEffect != -1) {
+        sfxManager.MakeEffect_Normal(iBaseEffect, vEnd, trace.plane.normal);
+    }
 }
 
 void CG_MakeVehicleEffect(vec3_t i_vStart, vec3_t i_vEnd, vec3_t i_vDir)

From 4da5e26cdcc3f491db3d3266e56233734de12c61 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:59:10 +0200
Subject: [PATCH 0427/2040] Move CTRL macro to q_shared.h

---
 code/qcommon/q_shared.h | 3 +++
 code/sdl/sdl_input.c    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index c053806c..ff792ed9 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1188,6 +1188,9 @@ typedef enum {
 
 //=============================================
 
+// get the control character for the given key (moved from sdl_input.c)
+#define CTRL(a) ((a)-'a'+1)
+
 int Q_isprint( int c );
 int Q_islower( int c );
 int Q_isupper( int c );
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 33979c2d..db10b914 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -59,8 +59,6 @@ static int in_eventTime = 0;
 
 static SDL_Window *SDL_window = NULL;
 
-#define CTRL(a) ((a)-'a'+1)
-
 /*
 ===============
 IN_PrintKey

From 9a35d34fc326c60434411470480a1d7e30e95baf Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:02:10 +0200
Subject: [PATCH 0428/2040] Implement UINotepad

Also fix several original game bugs within, some cosmetical, some memory corrupting
---
 code/uilib/uinotepad.cpp | 746 ++++++++++++++++++++++++++++++---------
 code/uilib/uinotepad.h   |   4 +-
 2 files changed, 587 insertions(+), 163 deletions(-)

diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index 22abf163..0e375cb5 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,245 +22,667 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-CLASS_DECLARATION( UIMultiLineEdit, UINotepadEdit, NULL )
-{
-	{ NULL, NULL }
+Event EV_Notepad_SaveAs
+(
+    "_notepad_saveas",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Save As..."
+);
+
+Event EV_Notepad_Save
+(
+    "_notepad_save",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Save"
+);
+
+Event EV_Notepad_Open
+(
+    "_notepad_open",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Open"
+);
+
+Event EV_Notepad_OpenFile
+(
+    "openfile",
+    EV_DEFAULT,
+    "s",
+    "nameOfFile",
+    "called to open a file in the notepad"
+);
+
+Event EV_Notepad_Find
+(
+    "_notepad_find",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Find"
+);
+
+Event EV_Notepad_Goto
+(
+    "_notepad_goto",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Go to line"
+);
+
+Event EV_Notepad_Copy
+(
+    "_notepad_copy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Copy"
+);
+
+Event EV_Notepad_Cut
+(
+    "_notepad_cut",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Cut"
+);
+
+Event EV_Notepad_Paste
+(
+    "_notepad_paste",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Paste"
+);
+
+Event W_Notepad_ChildSizeChanged
+(
+    "_notepad_childsizechanged",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signal that the child area of the floating window has changed"
+);
+
+CLASS_DECLARATION(UIMultiLineEdit, UINotepadEdit, NULL) {
+    {&W_LeftMouseDown, &UINotepadEdit::MousePressed},
+    {NULL,             NULL                        }
 };
 
-bool UI_LoadNotepadFile( const char *filename )
+CLASS_DECLARATION(UIFloatingWindow, UINotepad, NULL) {
+    {&W_Notepad_ChildSizeChanged,       &UINotepad::ChildSizeChanged},
+    {&EV_Notepad_SaveAs,                &UINotepad::SaveAs          },
+    {&EV_Notepad_Save,                  &UINotepad::Save            },
+    {&EV_Notepad_Open,                  &UINotepad::Open            },
+    {&EV_Notepad_OpenFile,              &UINotepad::OpenFile        },
+    {&UIFloatingWindow::W_ClosePressed, &UINotepad::ClosePressed    },
+    {&EV_Notepad_Find,                  &UINotepad::OnFind          },
+    {&EV_Notepad_Goto,                  &UINotepad::OnGoto          },
+    {&EV_Notepad_Copy,                  &UINotepad::OnCopy          },
+    {&EV_Notepad_Paste,                 &UINotepad::OnPaste         },
+    {&EV_Notepad_Cut,                   &UINotepad::OnCut           },
+    {NULL,                              NULL                        }
+};
+
+#define CTRL_EVENT_COUNT 10
+static ctrlevent_s controlEvents[CTRL_EVENT_COUNT] = {
+    {'o',  &EV_Notepad_Open                 },
+    {'s',  &EV_Notepad_Save                 },
+    {'a',  &EV_Notepad_SaveAs               },
+    {'w',  &UIFloatingWindow::W_ClosePressed},
+    {'f',  &EV_Notepad_Find                 },
+    {'g',  &EV_Notepad_Goto                 },
+    {'c',  &EV_Notepad_Copy                 },
+    {'x',  &EV_Notepad_Cut                  },
+    {'v',  &EV_Notepad_Paste                },
+    {NULL, NULL                             },
+};
+
+bool UI_LoadNotepadFile(const char *filename)
 {
-	return false;
+    UINotepad *uinp = new UINotepad();
+    if (uinp->Create(NULL, UIRect2D(100.0f, 100.0f, 450.0f, 300.0f), filename)) {
+        uWinMan.ActivateControl(uinp);
+        return true;
+    }
+
+    if (uinp) {
+        delete uinp;
+    }
+
+    return false;
 }
 
 UINotepadEdit::UINotepadEdit()
 {
-	// FIXME: stub
+    m_notepad = NULL;
 }
 
-void UINotepadEdit::CharEvent
-	(
-	int ch
-	)
-
+void UINotepadEdit::CharEvent(int ch)
 {
-	// FIXME: stub
+    if (!m_notepad->ProcessCharEvent(ch)) {
+        UIMultiLineEdit::CharEvent(ch);
+    }
 }
 
-void UINotepadEdit::setNotepad
-	(
-	UINotepad *notepad
-	)
-
+void UINotepadEdit::setNotepad(UINotepad *notepad)
 {
-	// FIXME: stub
+    m_notepad = notepad;
 }
 
-bool UINotepadEdit::GotoLine
-	(
-	int line
-	)
-
+bool UINotepadEdit::GotoLine(int line)
 {
-	// FIXME: stub
-	return false;
+    if (line < 1 || line - 1 >= m_lines.getCount()) {
+        return false;
+    }
+
+    m_selection.begin.line = m_selection.end.line = line - 1;
+    m_selection.begin.column                      = 0;
+    m_selection.end.column                        = 999999;
+    BoundSelectionPoint(m_selection.end);
+    EnsureSelectionPointVisible(m_selection.end);
+    return true;
 }
 
-bool UINotepadEdit::FindText
-	(
-	const char *text,
-	int offsetFromSel
-	)
-
+bool UINotepadEdit::FindText(const char *text, int offsetFromSel)
 {
-	// FIXME: stub
-	return false;
+    if (!text) {
+        return false;
+    }
+
+    str lowersearch = text;
+    lowersearch.tolower();
+
+    selectionpoint_s *topsel, *botsel;
+    SortSelection(&topsel, &botsel);
+
+    int  foundat       = -1;
+    bool searchfromtop = false;
+
+    // This loop runs at most twice:
+    //  - once for searchfromtop == false,
+    //  - optionally for searchfromtop == true,
+    // but only if text couldn't be found between the cursor and the end of the file
+    while (true) {
+        int i = 0;
+        m_lines.IterateFromHead();
+        for (; m_lines.IsCurrentValid(); i++, m_lines.IterateNext()) {
+            if (i < topsel->line && !searchfromtop) {
+                // skip lines before the cursor if not searching from the top
+                continue;
+            }
+            if (i > topsel->line && searchfromtop) {
+                // no need to continue if we've looped back to the cursor
+                return false;
+            }
+
+            str findin = m_lines.getCurrent();
+            findin.tolower();
+            const char *where = findin.c_str();
+
+            // Added in OPM to avoid code repetition
+            bool searchLineFromCursor = i == topsel->line && !searchfromtop;
+            if (searchLineFromCursor) {
+                // Start searching on the current line, BUT ONLY from the cursor position.
+                // Offset it with the selection offset:
+                // the purpose of this is to prevent matching
+                // on a string that was just found and is still selected,
+                // by offsetting it
+                if (findin.length() <= topsel->column + offsetFromSel) {
+                    // cursor is at the end of the line, nothing left to search in this one
+                    continue;
+                }
+
+                where = &where[topsel->column + offsetFromSel];
+            }
+
+            const char *found = strstr(where, lowersearch);
+
+            if (found) {
+                // use the beginning of the line to calculate where the matched text is
+                foundat = found - where;
+                if (searchLineFromCursor) {
+                    // take cursor pos. into account if a match is found on the same line as the cursor
+                    foundat += topsel->column + offsetFromSel;
+                }
+                break;
+            }
+        }
+
+        if (foundat == -1) {
+            // couldn't find text in current search iteration
+            if (!searchfromtop) {
+                // try searching from the beginning of the document
+                searchfromtop = true;
+                continue;
+            }
+
+            // text not found
+            return false;
+        } else {
+            // jump to found text and select it
+            m_selection.begin.column = foundat;
+            m_selection.end.column   = foundat + strlen(text);
+            m_selection.begin.line = m_selection.end.line = i;
+            EnsureSelectionPointVisible(m_selection.end);
+            return true;
+        }
+    }
 }
 
-void UINotepadEdit::MousePressed
-	(
-	Event *ev
-	)
-
+void UINotepadEdit::MousePressed(Event *ev)
 {
-	// FIXME: stub
+    if (m_notepad->m_state != STATE_TIMED_MESSAGE) {
+        m_notepad->m_state = STATE_NONE;
+    }
+
+    UIMultiLineEdit::MouseDown(ev);
 }
 
-CLASS_DECLARATION( UIFloatingWindow, UINotepad, NULL )
-{
-	{ NULL, NULL }
-};
-
-
 UINotepad::UINotepad()
 {
-	// FIXME: stub
+    m_state  = STATE_NONE;
+    m_edit   = NULL;
+    m_menu   = NULL;
+    m_status = NULL;
 }
 
-void UINotepad::TimeMessage
-	(
-	const char *message,
-	int howlong
-	)
-
+UINotepad::~UINotepad()
 {
-	// FIXME: stub
+    for (int i = m_popups.NumObjects(); i > 0; i--) {
+        Container<uipopup_describe *> *inner = m_popups.ObjectAt(i);
+        for (int j = inner->NumObjects(); j > 0; j--) {
+            uipopup_describe *uipd = inner->ObjectAt(j);
+            inner->RemoveObjectAt(j);
+            // NOTE: `delete uipd` is intentionally missing here!
+            // Since uipds created for this class have data fields
+            // that contain pointers only to static Event objects,
+            // the fields don't need to be cleaned up as they weren't
+            // dynamically allocated in the first place.
+            // See UINotepad::Create for reference.
+            // However, FIXME: the uipds themselves should still
+            // get cleaned up, but that doesn't happen yet.
+        }
+    }
 }
 
-bool UINotepad::OpenFile
-	(
-	const char *filename
-	)
-
+void UINotepad::TimeMessage(const char *message, int howlong)
 {
-	// FIXME: stub
-	return false;
+    m_state             = STATE_TIMED_MESSAGE;
+    m_timedmessage.die  = uid.time + howlong;
+    m_timedmessage.text = message;
 }
 
-bool UINotepad::Create
-	(
-	UIWidget *parent,
-	UIRect2D& rect,
-	const char *filename
-	)
-
+bool UINotepad::OpenFile(const char *filename)
 {
-	// FIXME: stub
-	return false;
+    char *data = NULL;
+    if (!filename || FS_ReadFile(filename, (void **)&data) == -1) {
+        return false;
+    }
+
+    setFileName(filename);
+    if (m_edit) {
+        m_edit->Empty();
+        m_edit->setData(data);
+    }
+
+    FS_FreeFile(data);
+    return true;
 }
 
-void UINotepad::ChildSizeChanged
-	(
-	Event *ev
-	)
-
+bool UINotepad::Create(UIWidget *parent, UIRect2D& rect, const char *filename)
 {
-	// FIXME: stub
+    UIFloatingWindow::Create(parent, rect, "", UColor(0.15f, 0.196f, 0.278f), UHudColor);
+
+    m_edit = new UINotepadEdit();
+    m_edit->setNotepad(this);
+
+    m_edit->InitFrame(getChildSpace(), 0.0f, 0.0f, 20.0f, 20.0f, 0, "verdana-12");
+    m_edit->setBackgroundColor(UWhite, true);
+    m_edit->setForegroundColor(UBlack);
+    m_edit->setFont("verdana-14");
+
+    m_status = new UIStatusBar(WND_ALIGN_BOTTOM, 20.0f);
+    m_status->InitFrame(getChildSpace(), 0.0f, 0.0f, 20.0f, 20.0f, 0, "verdana-12");
+    m_status->EnableSizeBox(this);
+
+    m_menu = new UIPulldownMenu();
+    m_menu->CreateAligned(getChildSpace(), this);
+    // Fixed in OPM: menu text was hard to read when notepad is active
+    //m_menu->setForegroundColor(UBlack);
+    m_menu->setForegroundColor(UHudColor);
+
+    Container<uipopup_describe *> *pops = new Container<uipopup_describe *>();
+
+    uipopup_describe *uipd = new uipopup_describe("Open (Ctrl-O)", UIP_EVENT, &EV_Notepad_Open, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Save (Ctrl-S)", UIP_EVENT, &EV_Notepad_Save, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Save As...(Ctrl-A)", UIP_EVENT, &EV_Notepad_SaveAs, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe(NULL, UIP_SEPARATOR, NULL, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe("Close (Ctrl-W)", UIP_EVENT, &UIFloatingWindow::W_ClosePressed, NULL);
+    pops->AddObject(uipd);
+
+    m_popups.AddObject(pops);
+    for (int i = 1; i <= pops->NumObjects(); i++) {
+        m_menu->AddUIPopupDescribe("File", pops->ObjectAt(i));
+    }
+
+    pops = new Container<uipopup_describe *>();
+    uipd = new uipopup_describe("Copy (Ctrl-C)", UIP_EVENT, &EV_Notepad_Copy, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Cut (Ctrl-X)", UIP_EVENT, &EV_Notepad_Cut, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Paste (Ctrl-V)", UIP_EVENT, &EV_Notepad_Paste, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe(NULL, UIP_SEPARATOR, NULL, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe("Find (Ctrl-F)", UIP_EVENT, &EV_Notepad_Find, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Go to line... (Ctrl-G)", UIP_EVENT, &EV_Notepad_Goto, NULL);
+    pops->AddObject(uipd);
+
+    m_popups.AddObject(pops);
+    for (int i = 1; i <= pops->NumObjects(); i++) {
+        m_menu->AddUIPopupDescribe("Edit", pops->ObjectAt(i));
+    }
+
+    setFileName("");
+    OpenFile(filename);
+    getChildSpace()->Connect(this, W_SizeChanged, W_Notepad_ChildSizeChanged);
+    getChildSpace()->SendSignal(W_SizeChanged);
+    getChildSpace()->AllowActivate(false);
+    return true;
 }
 
-void UINotepad::SaveAs
-	(
-	Event *ev
-	)
-
+void UINotepad::ChildSizeChanged(Event *ev)
 {
-	// FIXME: stub
+    m_menu->Realign();
+    UISize2D menuSize       = m_menu->getSize();
+    UISize2D childSpaceSize = getChildSpace()->getSize();
+
+    UIRect2D frame(0.0f, menuSize.height, childSpaceSize.width, childSpaceSize.height - 20.0f - menuSize.height);
+
+    m_edit->setFrame(frame);
 }
 
-void UINotepad::Save
-	(
-	Event *ev
-	)
-
+void UINotepad::SaveAs(Event *ev)
 {
-	// FIXME: stub
+    m_state          = STATE_SAVE_AS;
+    m_textinput.text = "";
 }
 
-void UINotepad::Open
-	(
-	Event *ev
-	)
-
+void UINotepad::Save(Event *ev)
 {
-	// FIXME: stub
+    if (!m_filename.length()) {
+        SaveAs(NULL);
+    }
+
+    str filecontents;
+    m_edit->getData(filecontents);
+    m_edit->setChanged(false);
+
+    // FIXME: m_filename could be blank
+    FS_WriteTextFile(m_filename, filecontents, filecontents.length());
+
+    str result = "Saved " + m_filename;
+    TimeMessage(result, 3000);
 }
 
-void UINotepad::OpenFile
-	(
-	Event *ev
-	)
-
+void UINotepad::Open(Event *ev)
 {
-	// FIXME: stub
+    PickFile(m_filename, this, EV_Notepad_OpenFile);
 }
 
-void UINotepad::ClosePressed
-	(
-	Event *ev
-	)
-
+void UINotepad::OpenFile(Event *ev)
 {
-	// FIXME: stub
+    OpenFile(ev->GetString(1));
 }
 
-void UINotepad::OnFind
-	(
-	Event *ev
-	)
-
+void UINotepad::ClosePressed(Event *ev)
 {
-	// FIXME: stub
+    uWinMan.ActivateControl(this);
+    if (m_edit->IsChanged()) {
+        m_state          = STATE_CONFIRMCLOSE;
+        m_textinput.text = "y";
+    } else {
+        PostEvent(EV_Remove, 0.0f);
+
+        // Fixed in OPM:
+        // in the original game, the control is not deactivated after removal,
+        // so the already heap-freed UINotepad instance still "reacts" to
+        // KeyEvents and CharEvents, creating a use-after-free scenario
+        // that causes crashes when debug heap is enabled
+        uWinMan.DeactivateCurrentControl();
+    }
 }
 
-void UINotepad::OnGoto
-	(
-	Event *ev
-	)
-
+void UINotepad::OnFind(Event *ev)
 {
-	// FIXME: stub
+    m_state          = STATE_FIND_TEXT;
+    m_textinput.text = m_lastfind;
 }
 
-void UINotepad::OnCopy
-	(
-	Event *ev
-	)
-
+void UINotepad::OnGoto(Event *ev)
 {
-	// FIXME: stub
+    m_state          = STATE_GOTO_LINE;
+    m_textinput.text = "";
 }
 
-void UINotepad::OnPaste
-	(
-	Event *ev
-	)
-
+void UINotepad::OnCopy(Event *ev)
 {
-	// FIXME: stub
+    m_edit->CopySelection();
 }
 
-void UINotepad::OnCut
-	(
-	Event *ev
-	)
-
+void UINotepad::OnPaste(Event *ev)
 {
-	// FIXME: stub
+    m_edit->PasteSelection();
 }
 
-bool UINotepad::ProcessControlEvents
-	(
-	int ch
-	)
-
+void UINotepad::OnCut(Event *ev)
 {
-	// FIXME: stub
-	return false;
+    m_edit->CopySelection();
+    m_edit->DeleteSelection();
 }
 
-bool UINotepad::ProcessCharEvent
-	(
-	int ch
-	)
-
+bool UINotepad::ProcessControlEvents(int ch)
 {
-	// FIXME: stub
-	return false;
+    if (ch < CTRL('a') || ch > CTRL('z')) {
+        // not a control character
+        return false;
+    }
+
+    // Fixed in OPM:
+    // Original code didn't bounds-check controlEvents
+    for (int i = 0; i < CTRL_EVENT_COUNT; i++) {
+        ctrlevent_s *event = &controlEvents[i];
+        if (!event->ev) {
+            // no event assigned
+            return false;
+        }
+
+        if (ch == CTRL(event->ch)) {
+            // found it
+            PostEvent(
+                new Event(*event->ev), 0.0f
+            ); // create a new Event as it will be deleted by ProcessEvent in L_ProcessPendingEvents
+            return true;
+        }
+    }
+
+    return false;
 }
 
-void UINotepad::Draw
-	(
-	void
-	)
-
+bool UINotepad::ProcessCharEvent(int ch)
 {
-	// FIXME: stub
+    if (ProcessControlEvents(ch)) {
+        return true;
+    }
+
+    if (m_state == STATE_NONE || m_state == STATE_TIMED_MESSAGE) {
+        return false;
+    }
+
+    str text;
+    switch (ch) {
+    case '\b': // Backspace
+        m_textinput.text.CapLength(m_textinput.text.length() - 1);
+        break;
+    case K_ENTER:
+        switch (m_state) {
+        case STATE_GOTO_LINE:
+            {
+                if (!m_textinput.text.length()) {
+                    m_state = STATE_NONE;
+                    return true;
+                }
+
+                int line = atoi(m_textinput.text);
+                if (m_edit->GotoLine(line)) {
+                    m_state = STATE_NONE;
+                    return true;
+                }
+
+                text = "Line '" + m_textinput.text + "' doesn't exist.";
+                TimeMessage(text, 3000);
+                break;
+            }
+        case STATE_FIND_TEXT:
+            if (!m_textinput.text.length()) {
+                m_state = STATE_NONE;
+                return true;
+            }
+
+            if (!m_edit->FindText(m_textinput.text, 1)) {
+                text = "Text: '" + m_textinput.text + "' could not be found.";
+                TimeMessage(text, 3000);
+            }
+
+            m_lastfind = m_textinput.text;
+            return true;
+        case STATE_SAVE_AS:
+            m_state = STATE_NONE;
+
+            if (!m_textinput.text.length()) {
+                return true;
+            }
+
+            setFileName(m_textinput.text);
+            Save(NULL);
+            return true;
+        case STATE_CONFIRMCLOSE:
+            {
+                m_state = STATE_NONE;
+
+                if (!m_textinput.text.length()) {
+                    return true;
+                }
+
+                char choice = tolower(m_textinput.text[0]);
+                if (choice != 'n' && choice != 'y') {
+                    return true;
+                }
+
+                if (choice == 'y') {
+                    Save(NULL);
+                }
+
+                // close window
+                PostEvent(new Event(EV_Remove), 0.0f);
+
+                // Fixed in OPM:
+                // in the original game, the control is not deactivated after removal,
+                // so the already heap-freed UINotepad instance still "reacts" to
+                // KeyEvents and CharEvents, creating a use-after-free scenario,
+                // causing crashes when debug heap is enabled
+                uWinMan.DeactivateCurrentControl();
+
+                return true;
+            }
+        default:
+            m_state = STATE_NONE;
+            return true;
+        }
+        return true;
+    case K_ESCAPE:
+    case K_TAB:
+        m_state = STATE_NONE;
+        return true;
+    }
+
+    if (!isprint(ch)) {
+        return true;
+    }
+
+    if (m_state == STATE_CONFIRMCLOSE) {
+        m_textinput.text = "";
+    }
+
+    m_textinput.text += (char)ch;
+    return true;
 }
 
-void UINotepad::setFileName
-	(
-	const char *filename
-	)
-
+void UINotepad::Draw(void)
 {
-	// FIXME: stub
+    UColor out = URed;
+    out.ScaleColor(0.5f);
+    out.ScaleAlpha(0.5f);
+
+    m_status->setBackgroundColor(out, true);
+    m_status->setForegroundColor(UHudColor);
+
+    str text;
+    switch (m_state) {
+    case STATE_GOTO_LINE:
+        text = "Goto line (tab cancels): " + m_textinput.text;
+        break;
+    case STATE_FIND_TEXT:
+        text = "Find text (tab cancels): " + m_textinput.text;
+        break;
+    case STATE_SAVE_AS:
+        text = "Save As (tab cancels): " + m_textinput.text;
+        break;
+    case STATE_CONFIRMCLOSE:
+        text = "Save " + m_filename + "? (yes/no/cancel) " + m_textinput.text;
+        break;
+    case STATE_TIMED_MESSAGE:
+        if (uid.time > m_timedmessage.die) {
+            m_state = STATE_NONE;
+        default:
+            m_status->setBackgroundColor(getBackgroundColor(), true);
+            m_status->setForegroundColor(getForegroundColor()); // Fixed in OPM
+            m_menu->setForegroundColor(getForegroundColor());   // Fixed in OPM
+            UIPoint2D selpoint = m_edit->getEndSelPoint();
+            text               = va("Line %d, column %d", (int)selpoint.y + 1, (int)selpoint.x + 1);
+        } else {
+            m_status->setBackgroundColor(getBackgroundColor(), true);
+            m_status->setForegroundColor(URed);
+            text = m_timedmessage.text;
+        }
+        break;
+    }
+
+    m_status->setTitle(text);
+    UIFloatingWindow::Draw();
+}
+
+void UINotepad::setFileName(const char *filename)
+{
+    str text = str(filename) + " - Notepad";
+    setTitle(text);
+    m_filename = filename;
 }
diff --git a/code/uilib/uinotepad.h b/code/uilib/uinotepad.h
index 7075130d..1d2c90e9 100644
--- a/code/uilib/uinotepad.h
+++ b/code/uilib/uinotepad.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -59,6 +59,7 @@ typedef struct ctrlevent_s {
 } ctrlevent_t;
 
 class UINotepad : public UIFloatingWindow {
+	friend class UINotepadEdit; // UINotepadEdit needs m_state
 private:
 	Container<Container<uipopup_describe *> *> m_popups;
 
@@ -80,6 +81,7 @@ protected:
 
 public:
 	UINotepad();
+	~UINotepad();
 
 	bool	OpenFile( const char *filename );
 	bool	Create( UIWidget *parent, UIRect2D& rect, const char *filename );

From 3254b3f0447f2f9370a31b0a016cc3ce71e527b7 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:04:55 +0200
Subject: [PATCH 0429/2040] Send SE_CHAR events (CharEvent) for ENTER, TAB and
 ESCAPE keys

So that UINotepad registers them as valid keypresses when typing
---
 code/sdl/sdl_input.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index db10b914..829363de 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -1016,6 +1016,8 @@ static void IN_ProcessEvents( void )
 
 				if( key == K_BACKSPACE )
 					Com_QueueEvent( in_eventTime, SE_CHAR, CTRL('h'), 0, 0, NULL );
+				else if (key == K_ENTER || key == K_TAB || key == K_ESCAPE) // mostly used by UINotepad
+					Com_QueueEvent( in_eventTime, SE_CHAR, key, 0, 0, NULL);
 				else if( keys[K_CTRL].down && key >= 'a' && key <= 'z' )
 					Com_QueueEvent( in_eventTime, SE_CHAR, CTRL(key), 0, 0, NULL );
 

From c60c2c09e18ab1f27c3682b7854cbccbbf38005b Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:06:30 +0200
Subject: [PATCH 0430/2040] Fix incorrect TAB character width calculation and
 refactor logic

---
 code/uilib/uifont.cpp | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 4bfeee3b..89192f2b 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -500,6 +500,7 @@ int UIFont::getCharWidth(unsigned short ch)
 {
     int index;
     int indirected;
+    float widthMul = 1.0f; // Added in OPM for easier readability
 
     if (!m_font) {
         return 0;
@@ -507,6 +508,7 @@ int UIFont::getCharWidth(unsigned short ch)
 
     if (ch == '\t') {
         ch = ' ';
+        widthMul = 3.0f;
     }
 
     if (m_font->numPages) {
@@ -526,11 +528,7 @@ int UIFont::getCharWidth(unsigned short ch)
         index = 0;
     }
 
-    if (ch == '\t') {
-        return m_font->sgl[index]->locations[indirected].size[0] * 256.0 * 3.0;
-    } else {
-        return m_font->sgl[index]->locations[indirected].size[0] * 256.0;
-    }
+    return m_font->sgl[index]->locations[indirected].size[0] * 256.0 * widthMul;
 }
 
 int UIFont::getHeight(const char *text, int maxlen, qboolean bVirtual)
@@ -631,6 +629,7 @@ float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
 {
     int index;
     int indirected;
+    float widthMul = 1.0f; // Added in OPM for easier readability
 
     if (!font) {
         return 0.f;
@@ -638,6 +637,7 @@ float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
 
     if (uch == '\t') {
         uch = ' ';
+        widthMul = 3.0f;
     }
 
     if (font->numPages) {
@@ -657,11 +657,7 @@ float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
         index = 0;
     }
 
-    if (uch == '\t') {
-        return font->sgl[index]->locations[indirected].size[0] * 3.0;
-    } else {
-        return font->sgl[index]->locations[indirected].size[0];
-    }
+    return font->sgl[index]->locations[indirected].size[0] * widthMul;
 }
 
 int UI_FontStringMaxWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
@@ -674,13 +670,8 @@ int UI_FontStringMaxWidth(fontheader_t *pFont, const char *pszString, int iMaxLe
         return 0;
     }
 
-    i = 0;
-    for (;;) {
-        unsigned short uch = pszString[i++];
-
-        if (uch == 0 || (iMaxLen != -1 && i > iMaxLen)) {
-            break;
-        }
+    for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
+        unsigned short uch = pszString[i];
 
         if (UI_FontDBCSIsLeadByte(pFont, uch)) {
             uch = (uch << 8) | pszString[i];
@@ -709,19 +700,13 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 {
     float widths    = 0.0;
     float maxwidths = 0.0;
-    int   i;
 
     if (!pFont) {
         return 0;
     }
 
-    i = 0;
-    for (;;) {
-        unsigned short uch = pszString[i++];
-
-        if (uch == 0 || (iMaxLen != -1 && i > iMaxLen)) {
-            break;
-        }
+    for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
+        unsigned short uch = pszString[i];
 
         if (UI_FontDBCSIsLeadByte(pFont, uch)) {
             uch = (uch << 8) | pszString[i];

From 849f1ee7d1456e3f445a45b80a7e232c6660a59e Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:13:21 +0200
Subject: [PATCH 0431/2040] Fix several bugs in UIMultiLineEdit

These are necessary so that UINotepad can actually be used for editing text
---
 code/uilib/uimledit.cpp | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 8bda5646..efc13c1e 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -103,10 +103,10 @@ void UIMultiLineEdit::setData(const char *data)
             toadd = "";
         } else if (*p == '\r') {
             continue;
+        } else {
+            s[0] = *p;
+            toadd += s;
         }
-
-        s[0] = *p;
-        toadd += s;
     }
 
     m_lines.AddTail(toadd);
@@ -146,7 +146,7 @@ void UIMultiLineEdit::FrameInitialized(void)
     m_vertscroll->InitFrameAlignRight(this, 0, 0);
 
     Connect(this, W_SizeChanged, W_SizeChanged);
-    AllowActivate(false);
+    AllowActivate(true);
 }
 
 void UIMultiLineEdit::SizeChanged(Event *ev)
@@ -266,7 +266,13 @@ void UIMultiLineEdit::Draw(void)
 
                     if (cur.length() != botsel->column) {
                         m_font->setColor(m_foreground_color);
-                        m_font->Print(botlen, aty, &cur[botsel->column], m_bVirtual, false);
+
+                        // Fixed in OPM:
+                        // highlighting text made the rest of the text after the selection on the line disappear.
+                        // Cause: the last two arguments were incorrectly passed in originally,
+                        // always specifying maxlen as m_bVirtual (which is usually zero).
+                        // m_font->Print(botlen, aty, &cur[botsel->column], m_bVirtual, false);
+                        m_font->Print(botlen, aty, &cur[botsel->column], -1, m_bVirtual);
                     }
 
                     caret = botlen;
@@ -438,10 +444,12 @@ qboolean UIMultiLineEdit::KeyEvent(int key, unsigned int time)
     case K_UPARROW:
         m_selection.end.line--;
         caret_moved = true;
+        key_rec     = true;
         break;
     case K_DOWNARROW:
         m_selection.end.line++;
         caret_moved = true;
+        key_rec     = true;
         break;
     case K_LEFTARROW:
         m_selection.end.column--;
@@ -485,16 +493,21 @@ qboolean UIMultiLineEdit::KeyEvent(int key, unsigned int time)
         }
         break;
     case K_DEL:
+        // Fixed in OPM:
+        // DEL key needed to be pressed twice to delete a single character,
+        // as the first hit would only create an "internal" selection,
+        // but wouldn't actually delete the character after the cursor.
+        // The DeleteSelection() method should ALWAYS be called,
+        // not only when there's an active selection.
         if (IsSelectionEmpty()) {
             m_shiftForcedDown = true;
             KeyEvent(K_RIGHTARROW, 0);
             m_shiftForcedDown = false;
         } else if (uii.Sys_IsKeyDown(K_SHIFT)) {
             CopySelection();
-            DeleteSelection();
-        } else {
-            DeleteSelection();
         }
+
+        DeleteSelection();
         break;
     case K_PGDN:
         if (m_selection.end.line == (m_vertscroll->getTopItem() + m_vertscroll->getPageHeight() - 1)) {
@@ -584,6 +597,7 @@ void UIMultiLineEdit::DeleteSelection(void)
         line.CapLength(newlen);
         *botsel = *topsel;
         EnsureSelectionPointVisible(*topsel);
+        return;
     } else if (botsel->line - topsel->line > 1) {
         for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < topsel->line;
              i++, m_lines.IterateNext()) {

From a19c7afce0d86a99a31ad4a79114bf4cee201a09 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:15:06 +0200
Subject: [PATCH 0432/2040] Add placeholders for handling clipboard operations
 in UIMultiLineEdit

Actual clipboard functionality will be added later
---
 code/uilib/uimledit.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index efc13c1e..a3ac0823 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -708,6 +708,9 @@ void UIMultiLineEdit::CopySelection(void)
         line.CapLength(botsel->column);
         clipText += "\n" + line;
     }
+
+    // FIXME: clipboard not implemented yet
+    uii.Sys_SetClipboard(clipText);
 }
 
 void UIMultiLineEdit::PasteSelection(void)
@@ -715,7 +718,16 @@ void UIMultiLineEdit::PasteSelection(void)
     str sel;
     int i;
 
-    sel = uii.Sys_GetClipboard();
+    // temporary variable added in OPM as str cannot handle NULL assignment
+    // will be removed when Sys_GetClipboard is properly implemented
+    const char *clipboardData = uii.Sys_GetClipboard();
+    if (clipboardData == NULL)
+    {
+        // FIXME: clipboard not implemented yet
+        return;
+    }
+
+    sel = clipboardData;
 
     DeleteSelection();
 

From edd2a9d8f60592b70403e36da7c10d8ce5eeec74 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:17:35 +0200
Subject: [PATCH 0433/2040] UIMultiLineEdit::Draw documentation

---
 code/uilib/uimledit.cpp | 45 +++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index a3ac0823..668286ef 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -201,70 +201,86 @@ void UIMultiLineEdit::Draw(void)
         int  caret = 0;
 
         if (i < topsel->line || i > botsel->line) {
+            // Print regular line without any selection or cursor present
             m_font->setColor(m_foreground_color);
             m_font->Print(0, aty, cur, -1, m_bVirtual);
         } else {
+            // Current line contains cursor and/or selected text
             float linewidth = m_font->getWidth(cur, -1);
 
             if (i > topsel->line && i < botsel->line) {
-                DrawBox(0, aty, linewidth, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
+                // all text in current line is selected, it's part of a larger selection,
+                // print entire line with the selection highlight box around it
+                DrawBox(0.0f, aty, linewidth, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
                 m_font->setColor(selectionColor);
                 m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
             } else if (i != topsel->line) {
-                if (i == botsel->line) {
-                    int toplen = m_font->getWidth(cur, botsel->column);
+                // part of this line is selected, and selection continues/began above
+                if (i == botsel->line) { // sanity check, should always be true
+                    int toplen = m_font->getWidth(cur, botsel->column); // X coord of highlighting end
                     if (toplen) {
+                        // selection contains text from the beginning of the line,
+                        // print it with the selection highlight box around it
                         m_font->setColor(selectionColor);
                         DrawBox(0, aty, toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
                         m_font->Print(0, aty, cur, botsel->column, m_bVirtual);
                     }
 
-                    if (toplen < linewidth) {
+                    if (toplen < linewidth) { // is there still text on this line after the selection?
                         m_font->setColor(m_foreground_color);
                         m_font->Print(toplen, aty, &cur[botsel->column], -1, m_bVirtual);
                     }
 
                     if (botsel == &m_selection.end) {
+                        // Place cursor at the end of the selection if it was started from above
                         caret = toplen;
                     }
                 }
             } else if (i != botsel->line) {
-                int toplen = m_font->getWidth(cur, topsel->column);
-                if (topsel->column) {
+                // part of this line is selected, and selection continues/began below
+                int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start
+                if (topsel->column) { // is there any text on this line before the selection?
                     m_font->setColor(m_foreground_color);
                     m_font->Print(0, aty, cur, topsel->column, m_bVirtual);
                 }
 
-                if (toplen < linewidth) {
+                if (toplen < linewidth) { // is there any selected text before the end of the line?
+                    // print the selected text with the selection highlight box around it
                     m_font->setColor(selectionColor);
                     DrawBox(toplen, aty, linewidth - toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
                     m_font->Print(toplen, aty, &cur[topsel->column], -1, m_bVirtual);
                 }
 
                 if (topsel == &m_selection.end) {
+                    // Place cursor before the highlight box if selection was made from the bottom up
                     caret = toplen;
                 }
             } else {
+                // current line contains the cursor
                 if (topsel->column == botsel->column) {
+                    // no selection or highlighted text
                     caret = m_font->getWidth(cur, topsel->column);
                     m_font->setColor(m_foreground_color);
                     m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
                 } else {
-                    int toplen = m_font->getWidth(cur, topsel->column);
-                    int botlen = toplen + m_font->getWidth(&cur[topsel->column], botsel->column - topsel->column);
+                    // selection starts and ends on this line
+                    int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start
+                    int botlen = toplen + m_font->getWidth(&cur[topsel->column], botsel->column - topsel->column); // X coord of selection end
 
-                    if (toplen) {
+                    if (toplen) { // is there any text on this line before the selection?
                         m_font->setColor(m_foreground_color);
                         m_font->Print(0, aty, cur, topsel->column, m_bVirtual);
                     }
 
-                    if (botlen != toplen) {
+                    if (botlen != toplen) { // is the selection wider than 0 pixels? (sanity check, always true)
+                        // print the selected text with the selection highlight box around it
                         DrawBox(toplen, aty, botlen - toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
                         m_font->setColor(selectionColor);
                         m_font->Print(toplen, aty, &cur[topsel->column], botsel->column - topsel->column, m_bVirtual);
                     }
 
-                    if (cur.length() != botsel->column) {
+                    if (cur.length() != botsel->column) { // is there still text on this line after the selection?
+                        // print the leftover text
                         m_font->setColor(m_foreground_color);
 
                         // Fixed in OPM:
@@ -275,8 +291,10 @@ void UIMultiLineEdit::Draw(void)
                         m_font->Print(botlen, aty, &cur[botsel->column], -1, m_bVirtual);
                     }
 
+                    // Place the cursor at the end of the selection...
                     caret = botlen;
                     if (topsel == &m_selection.end) {
+                        // ... except if selection was made from the bottom up
                         caret = toplen;
                     }
                 }
@@ -286,7 +304,8 @@ void UIMultiLineEdit::Draw(void)
             }
         }
 
-        if (m_selection.end.line == i && (uid.time % 750) > 374 && IsActive()) {
+        if (m_selection.end.line == i && (uid.time % 750) >= 375 && IsActive()) {
+            // draw cursor caret
             DrawBox(caret, aty, 2.f, m_font->getHeight(m_bVirtual), UBlack, 1.f);
         }
 

From c84702b49094e06eb2e7c53812f8a8068c51831f Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:18:49 +0200
Subject: [PATCH 0434/2040] Fix file picker crash on AA

---
 code/client/cl_uimaprunner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uimaprunner.cpp b/code/client/cl_uimaprunner.cpp
index 6a5cf205..40b0730d 100644
--- a/code/client/cl_uimaprunner.cpp
+++ b/code/client/cl_uimaprunner.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -94,7 +94,7 @@ void PickFile(const char *name, Listener *obj, Event& event)
         currentpath = "";
     }
 
-    picker->Setup("", currentpath, ".*");
+    picker->Setup("", currentpath, ".*", "");
 }
 
 CLASS_DECLARATION(FilePickerClass, ViewSpawnerClass, NULL) {

From ac01ad67516685d68ff3894269440644f1968ff0 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:19:29 +0200
Subject: [PATCH 0435/2040] Take over va() memory safety fix from ioquake3

---
 code/qcommon/q_shared.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 485f016b..7dd4afa7 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1659,7 +1659,6 @@ va
 
 does a varargs printf into a temp buffer, so I don't need to have
 varargs versions of all text functions.
-FIXME: make this buffer size safe someday
 ============
 */
 const char *va( const char *format, ... )
@@ -1673,7 +1672,7 @@ const char *va( const char *format, ... )
 	index++;
 
 	va_start( argptr, format );
-	vsprintf( buf, format, argptr );
+	Q_vsnprintf( buf, sizeof(*string), format, argptr );
 	va_end( argptr );
 
 	return buf;

From 907aa21ba8d1f059dd0c08a0fb61d71fdfa19d33 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:24:39 +0200
Subject: [PATCH 0436/2040] Fix UIPopupMenu crashes caused by dereferencing
 already freed instance

---
 code/uilib/uipopupmenu.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/uilib/uipopupmenu.cpp b/code/uilib/uipopupmenu.cpp
index 4e37663d..59e378f4 100644
--- a/code/uilib/uipopupmenu.cpp
+++ b/code/uilib/uipopupmenu.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015-2023 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -405,6 +405,11 @@ void UIPopupMenu::MouseReleased
 		return;
 	}
 
+	// NOTE: Dismiss() below can delete this entire instance!
+	// Save the m_listener pointer for later, as `this->m_listener`
+	// cannot be used after the instance was freed.
+	Listener* listener = m_listener;
+
 	if (m_autodismiss)
 	{
 		Dismiss();
@@ -413,10 +418,11 @@ void UIPopupMenu::MouseReleased
 	switch (desc->type)
 	{
 	case UIP_EVENT:
-		ProcessEvent((Event*)desc->data);
+		// make sure it's passed in as an Event&, as ProcessEvent(Event*) would try to delete the static event!
+		listener->ProcessEvent(*(Event*)desc->data);
 		break;
 	case UIP_EVENT_STRING:
-		ProcessEvent(new Event((const char*)desc->data));
+		listener->ProcessEvent(new Event((const char*)desc->data));
 		break;
 	case UIP_CMD:
 	case UIP_CVAR:
@@ -466,7 +472,7 @@ void UIPopupMenu::Dismiss
 	{
 		m_parentMenu->Dismiss();
 	}
-	else
+	else if (this)
 	{
 		// this is the topmost menu, self-destruct
 		delete this;

From 52f43a3aa6e22490699af2f9e7f4e6b00f39e7bc Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:25:30 +0200
Subject: [PATCH 0437/2040] Document OPM fix for center-justified UINotepad
 statusbar

---
 code/uilib/uistatus.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/uilib/uistatus.cpp b/code/uilib/uistatus.cpp
index 92dd1238..19d6d2a5 100644
--- a/code/uilib/uistatus.cpp
+++ b/code/uilib/uistatus.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -161,7 +161,10 @@ UIStatusBar::UIStatusBar
 	alignment_t align,
 	float height
 	)
-	: UIStatusBar()
+	: UIStatusBar() // Fixed in OPM:
+					// original builds didn't call this ctor,
+					// so statusbar text got center-justified due to
+					// m_iFontAlignmentHorizontal defaulting to FONT_JUSTHORZ_CENTER (0)
 
 {
 	AlignBar(align, height);

From 6e454cdfb36d2ebb2e22656ae250f22350b46470 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:26:38 +0200
Subject: [PATCH 0438/2040] Fix subtle bugs and refactor in UIWindowManager

---
 code/uilib/uiwinman.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index d5d7377b..9e986d97 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -525,7 +525,7 @@ qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
 {
     UIWidget *selwidget = NULL;
 
-    if (key == K_TAB && (uii.Sys_IsKeyDown(K_CTRL) || uii.Sys_IsKeyDown(K_DEL))) {
+    if (key == K_TAB && uii.Sys_IsKeyDown(K_CTRL)) {
         UIWidget *wid;
 
         if (m_activeControl && m_activeControl != this) {
@@ -540,13 +540,13 @@ qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
             selwidget = getFirstChild();
         }
 
-        for (wid = selwidget->getNextChild(selwidget); wid != NULL; wid = wid->getNextChild(wid)) {
+        for (wid = getNextChild(selwidget); wid != NULL; wid = getNextChild(wid)) {
             if (!(selwidget->m_flags & WF_ALWAYS_BOTTOM) && selwidget->CanActivate()) {
                 ActivateControl(wid);
                 return true;
             }
         }
-        for (wid = getFirstChild(); wid != selwidget && wid != NULL; wid = wid->getNextChild(wid)) {
+        for (wid = getFirstChild(); wid != selwidget && wid != NULL; wid = getNextChild(wid)) {
             if (!(selwidget->m_flags & WF_ALWAYS_BOTTOM) && selwidget->CanActivate()) {
                 ActivateControl(wid);
                 return true;
@@ -555,7 +555,7 @@ qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
     } else {
         if (m_bindactive) {
             m_bindactive->KeyEvent(key, time);
-        } else if (!m_activeControl || !m_activeControl->KeyEvent(key, time) && (key != K_UPARROW || key != K_DOWNARROW)) {
+        } else if (!(m_activeControl && m_activeControl->KeyEvent(key, time)) && (key == K_DOWNARROW || key == K_UPARROW)) {
             selwidget = m_activeControl;
             if (selwidget && selwidget != this) {
                 for (selwidget = m_activeControl; selwidget != NULL; selwidget = selwidget->getParent()) {

From fa5a97031d2a00ddbde077682923c7e6c9a501cf Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:43:40 +0200
Subject: [PATCH 0439/2040] Fix assignment of a temporary to a non-const
 reference error on GCC

---
 code/uilib/uinotepad.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index 0e375cb5..556b6b6f 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -149,7 +149,8 @@ static ctrlevent_s controlEvents[CTRL_EVENT_COUNT] = {
 bool UI_LoadNotepadFile(const char *filename)
 {
     UINotepad *uinp = new UINotepad();
-    if (uinp->Create(NULL, UIRect2D(100.0f, 100.0f, 450.0f, 300.0f), filename)) {
+    UIRect2D  rect  = UIRect2D(100.0f, 100.0f, 450.0f, 300.0f);
+    if (uinp->Create(NULL, rect, filename)) {
         uWinMan.ActivateControl(uinp);
         return true;
     }

From e550d244dfee23c9dca2f0d863a634c1330bd041 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:05:39 +0200
Subject: [PATCH 0440/2040] Reimplemented skelChannelList_s::LocalChannel

---
 code/skeletor/skeletor_utilities.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index 75f28a8c..78b2006c 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.cpp
@@ -80,16 +80,20 @@ int skelChannelList_s::GlobalChannel(int localchannel) const
 
 int skelChannelList_s::LocalChannel(int channel) const
 {
-    return m_chanLocalFromGlobal[channel];
+    return GetLocalFromGlobal(channel);
 }
 
 int skelChannelList_s::GetLocalFromGlobal(int globalChannel) const
 {
-    if (m_chanLocalFromGlobal && globalChannel < m_numLocalFromGlobal) {
-        return m_chanLocalFromGlobal[globalChannel];
-    } else {
+    if (!m_chanLocalFromGlobal) {
         return -1;
     }
+
+    if (globalChannel >= m_numLocalFromGlobal) {
+        return -1;
+    }
+
+    return m_chanLocalFromGlobal[globalChannel];
 }
 
 int skelChannelList_s::NumChannels(void) const

From abefdd772cd03719969ab1d7394b35293cfe360c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:06:25 +0200
Subject: [PATCH 0441/2040] DecodeFrameValue should only return a float value

---
 code/skeletor/skeletor.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 40febcfd..be9ef4ec 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -1047,7 +1047,7 @@ int skeletor_c::GetMorphWeightFrame(int index, float time, int *data)
     return GetMorphWeightFrame(data);
 }
 
-float *DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
+float DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
     skanGameFrame *foundFrame;
     size_t         frameSize;
@@ -1069,7 +1069,7 @@ float *DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
         foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
     }
 
-    return foundFrame->pChannelData;
+    return foundFrame->pChannelData[0];
 }
 
 int skeletor_c::GetMorphWeightFrame(int *data)
@@ -1079,7 +1079,7 @@ int skeletor_c::GetMorphWeightFrame(int *data)
     int    blendNum;
     float  weight;
     int    modelChannelNum;
-    float *channelData;
+    float  channelData;
 
     numTargets = m_morphTargetList.NumChannels();
 
@@ -1096,12 +1096,11 @@ int skeletor_c::GetMorphWeightFrame(int *data)
         if (weight > 0.001) {
             for (modelChannelNum = 0; modelChannelNum < numTargets; modelChannelNum++) {
                 animChannelNum = m_morphTargetList.GlobalChannel(modelChannelNum);
-                animChannelNum = blendInfo.pAnimationData->channelList.GetLocalFromGlobal(animChannelNum);
+                animChannelNum = blendInfo.pAnimationData->channelList.LocalChannel(animChannelNum);
 
                 if (animChannelNum >= 0) {
-                    channelData =
-                        DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
-                    data[modelChannelNum] += (int)(channelData[0] * weight);
+                    channelData = DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData * weight);
                 }
             }
         }
@@ -1114,12 +1113,11 @@ int skeletor_c::GetMorphWeightFrame(int *data)
         if (weight > 0.001) {
             for (modelChannelNum = 0; modelChannelNum < numTargets; modelChannelNum++) {
                 animChannelNum = m_morphTargetList.GlobalChannel(modelChannelNum);
-                animChannelNum = blendInfo.pAnimationData->channelList.GetLocalFromGlobal(animChannelNum);
+                animChannelNum = blendInfo.pAnimationData->channelList.LocalChannel(animChannelNum);
 
                 if (animChannelNum >= 0) {
-                    channelData =
-                        DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
-                    data[modelChannelNum] += (int)(channelData[0] * weight);
+                    channelData = DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData * weight);
                 }
             }
         }

From c16f2029b10093ab187d06b826065a3ccd832fef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:06:35 +0200
Subject: [PATCH 0442/2040] Implemented skeletor_c::ChannelNames()

---
 code/skeletor/skeletor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index be9ef4ec..33745932 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -29,6 +29,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define EPSILON 0.000000000001f
 
+ChannelNameTable* skeletor_c::ChannelNames()
+{
+    return m_channelNames;
+}
+
 int skelAnimDataGameHeader_s::GetFrameNums(
     float timeSeconds, float timeTolerance, int *beforeFrame, int *afterFrame, float *beforeWeight, float *afterWeight
 )

From ebb3173322060d94b71f4923e84457f27a5de848 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:06:47 +0200
Subject: [PATCH 0443/2040] Added skeletorMorphCache_t as an alias to int

---
 code/tiki/tiki_shared.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index dc6de490..57318d05 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -425,3 +425,5 @@ typedef struct {
     size_t            size;
     int               numuses;
 } skelcache_t;
+
+typedef int skeletorMorphCache_t;

From 445814b14485d245ecbe133cda267c621c7bef24 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:15:10 +0200
Subject: [PATCH 0444/2040] Fixed skeletor_c::ChannelNames return value

---
 code/skeletor/skeletor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 33745932..ad4e5c9a 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 ChannelNameTable* skeletor_c::ChannelNames()
 {
-    return m_channelNames;
+    return &m_channelNames;
 }
 
 int skelAnimDataGameHeader_s::GetFrameNums(

From 79b0e6998d293409b67de9b6e31260b66db405ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:40:34 +0200
Subject: [PATCH 0445/2040] Fixed implementations

---
 code/skeletor/bonetable.cpp          |  6 +++---
 code/skeletor/skeletor_utilities.cpp | 20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 46a86723..22a919f6 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -348,9 +348,9 @@ int ChannelNameTable::RegisterChannel(const char *name)
 
 const char *ChannelNameTable::FindNameFromLookup(int index)
 {
-    if (index < m_iNumChannels) {
-        return m_Channels[index].name;
-    } else {
+    if (index >= m_iNumChannels) {
         return NULL;
     }
+
+    return m_Channels[index].name;
 }
diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index 78b2006c..a580ceb7 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.cpp
@@ -182,24 +182,20 @@ qboolean skelChannelList_s::HasChannel(ChannelNameTable *nameTable, const char *
 {
     short int iGlobalChannel = nameTable->FindNameLookup(channelName);
 
-    if (iGlobalChannel >= 0) {
-        if (m_chanLocalFromGlobal && iGlobalChannel < m_numLocalFromGlobal) {
-            return (unsigned int)~m_chanLocalFromGlobal[iGlobalChannel] >> 31;
-        } else {
-            return qtrue;
-        }
-    } else {
-        return qfalse;
-    }
+    return iGlobalChannel >= 0 && LocalChannel(iGlobalChannel) >= 0;
 }
 
 const char *skelChannelList_s::ChannelName(ChannelNameTable *nameTable, int localChannelNum) const
 {
-    if (localChannelNum >= 0 && localChannelNum < m_numChannels) {
-        return nameTable->FindName(m_chanGlobalFromLocal[localChannelNum]);
-    } else {
+    if (localChannelNum >= this->m_numChannels || localChannelNum < 0) {
         return NULL;
     }
+
+    if (m_chanGlobalFromLocal[localChannelNum] < 0) {
+        return 0;
+    }
+
+    return nameTable->FindName(m_chanGlobalFromLocal[localChannelNum]);
 }
 
 void Skel_ExtractFilePath(const char *path, char *dest)

From 6b6e5291ddf5d5a1399202cdd105b76cac556276 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:40:50 +0200
Subject: [PATCH 0446/2040] Fixed `EYES_up` length

---
 code/skeletor/skeletor_model_files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor_model_files.cpp b/code/skeletor/skeletor_model_files.cpp
index a7b6d543..4cbc6fed 100644
--- a/code/skeletor/skeletor_model_files.cpp
+++ b/code/skeletor/skeletor_model_files.cpp
@@ -209,7 +209,7 @@ void skeletor_c::LoadMorphTargetNames(skelHeaderGame_t *modelHeader)
             m_targetLookLeft = morphTargetIndex;
         } else if (!strncmp(newTargetName, "EYES_right", 10)) {
             m_targetLookRight = morphTargetIndex;
-        } else if (!strncmp(newTargetName, "EYES_up", 70)) {
+        } else if (!strncmp(newTargetName, "EYES_up", 7)) {
             m_targetLookUp = morphTargetIndex;
         } else if (!strncmp(newTargetName, "EYES_down", 9)) {
             m_targetLookDown = morphTargetIndex;

From 531340627d3f2501ce92c32b7539b735eef27b9b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:53:42 +0200
Subject: [PATCH 0447/2040] Call LocalChannel() instead

---
 code/skeletor/skeletor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index ad4e5c9a..6d3920aa 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -1252,5 +1252,5 @@ int dtiki_s::GetBoneNumFromName(const char *name)
         return -1;
     }
 
-    return m_boneList.GetLocalFromGlobal(iGlobalChannel);
+    return m_boneList.LocalChannel(iGlobalChannel);
 }

From dd85118a9c3b32f30e046ea4fb9c547f75b80b4d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:01:41 +0200
Subject: [PATCH 0448/2040] Don't pack channels when reading encoded frames
 from mohsh and above (they're already packed in the animation file)

---
 code/skeletor/skeletor_loadanimation.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index c1740af0..611407ff 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -527,7 +527,7 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         pChannel = &enAnim->ary_channels[i];
 
         name     = enAnim->channelList.ChannelName(&skeletor_c::m_channelNames, i);
-        type     = GetChannelTypeFromName(name);
+        type     = GetBoneChannelType(name);
         frameCnt = MSG_ReadShort(msg);
 
         switch (type) {
@@ -704,8 +704,6 @@ skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnimEx(const char *path, void
         enAnim->channelList.AddChannel(m_channelNames.RegisterChannel(MSG_ReadString(&msg)));
     }
 
-    enAnim->channelList.PackChannels();
-
     newFrame        = (skelAnimGameFrame_t *)Skel_Alloc(enAnim->numFrames * sizeof(skelAnimGameFrame_t));
     enAnim->m_frame = newFrame;
 

From 4d231fbc50a3bd0a1d5e9faf52b37014362c928e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:05:28 +0200
Subject: [PATCH 0449/2040] Call `LocalChannel` instead of `GetLocalFromGlobal`

---
 code/renderer/tr_model.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index f478554e..c8cd21e9 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -1243,14 +1243,14 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
 				}
 
-				boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+				boneNum = tiki->m_boneList.LocalChannel(channelNum);
 				bone = &bones[boneNum];
 
 				SkelVertGetNormal(newVerts, bone, normal);
 
 				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+					boneNum = tiki->m_boneList.LocalChannel(channelNum);
 					bone = &bones[boneNum];
 
 					if (!weightNum) {
@@ -1349,14 +1349,14 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
 
 				channelNum = skelmodel->pBones[weight->boneIndex].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+				boneNum = tiki->m_boneList.LocalChannel(channelNum);
 				bone = &bones[boneNum];
 
 				SkelVertGetNormal(newVerts, bone, normal);
 
 				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal(channelNum);
+					boneNum = tiki->m_boneList.LocalChannel(channelNum);
 					bone = &bones[boneNum];
 
 					SkelWeightGetXyz(weight, bone, out);

From fb15f0f2b33c33f96d0c535c01113d08378dcc9c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:06:31 +0200
Subject: [PATCH 0450/2040] Fixed a tiny mistake that prevented morphs from
 working correctly

Actors now have a working dynamic facial expression (moving eyes/mouth/brown...)
---
 code/skeletor/skeletor_model_files.cpp |  2 +-
 code/tiki/tiki_skel.cpp                | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/code/skeletor/skeletor_model_files.cpp b/code/skeletor/skeletor_model_files.cpp
index 4cbc6fed..db5a359a 100644
--- a/code/skeletor/skeletor_model_files.cpp
+++ b/code/skeletor/skeletor_model_files.cpp
@@ -217,6 +217,6 @@ void skeletor_c::LoadMorphTargetNames(skelHeaderGame_t *modelHeader)
             m_targetBlink = morphTargetIndex;
         }
 
-        newTargetName += strlen(newTargetName + 1);
+        newTargetName += strlen(newTargetName) + 1;
     }
 }
diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index b267117e..17e649b4 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -439,14 +439,12 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     }
 
     if (nBoxBytes) {
-        const int ofsBoxes = LongNoSwapPtr(&pHeader->ofsBoxes);
-
-        if (ofsBoxes <= 0 || (nBoxBytes + ofsBoxes) >= length) {
+        if (pHeader->ofsBoxes <= 0 || (nBoxBytes + pHeader->ofsBoxes) > length) {
             Com_Printf("^~^~^ Box data is corrupted for '%s'\n", cache->path);
-            pSkel->numMorphTargets = 0;
-            pSkel->pMorphTargets   = NULL;
+            pSkel->numBoxes = 0;
+            pSkel->pBoxes = NULL;
         } else {
-            memcpy(pSkel->pBoxes, ((byte *)pHeader + ofsBoxes), nBoxBytes);
+            memcpy(pSkel->pBoxes, ((byte *)pHeader + pHeader->ofsBoxes), nBoxBytes);
         }
     } else {
         pSkel->numBoxes = 0;
@@ -460,14 +458,12 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     }
 
     if (nMorphBytes) {
-        const int ofsMorphTargets = LongNoSwapPtr(&pHeader->ofsBoxes);
-
-        if (ofsMorphTargets <= 0 || (nMorphBytes + ofsMorphTargets) >= length) {
+        if (pHeader->ofsMorphTargets <= 0 || (nMorphBytes + pHeader->ofsMorphTargets) > length) {
             Com_Printf("^~^~^ Morph targets data is corrupted for '%s'\n", cache->path);
             pSkel->numMorphTargets = 0;
             pSkel->pMorphTargets   = NULL;
         } else {
-            memcpy(pSkel->pMorphTargets, ((byte *)pHeader + ofsMorphTargets), nMorphBytes);
+            memcpy(pSkel->pMorphTargets, ((byte *)pHeader + pHeader->ofsMorphTargets), nMorphBytes);
         }
     } else {
         pSkel->numMorphTargets = 0;

From dfb2cb6bbf3477e5e093254332204d26987ed48c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:19:15 +0200
Subject: [PATCH 0451/2040] Fixed buffer overrun

---
 code/skeletor/skeletor_loadanimation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index 611407ff..ed019ebd 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -392,7 +392,7 @@ void WriteEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         MSG_WriteShort(msg, pChannel->nFramesInChannel);
 
         for (j = 0; j < pChannel->nFramesInChannel; j++) {
-            vec3_t channelData;
+            vec4_t channelData;
 
             pFrame = &pChannel->ary_frames[i];
             MSG_WriteShort(msg, pFrame->nFrameNum);

From 874b034698b54c1032f7f011714675ff223d4432 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:24:01 +0200
Subject: [PATCH 0452/2040] Corrected some compilation warnings

---
 code/gamespy/sv_gqueryreporting.c | 2 +-
 code/server/sv_client.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 4828db27..f0559f0e 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -306,7 +306,7 @@ static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *v
             return;
         }
 
-        strcpy(encrypted_val, validation);
+        strcpy((char*)encrypted_val, validation);
 
         gs_encrypt((uchar *)qrec->secret_key, (int)strlen(qrec->secret_key), encrypted_val, keylen);
         gs_encode(encrypted_val, keylen, encoded_val);
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index e262ca9c..beacfbaa 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -1519,7 +1519,7 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 		// Since 2.0, displays chat messages
 		// NOTE: this should be handled by fgame, not server
 		//
-		Com_Printf("%s (%ld): %s", cl->name, cl - svs.clients, s);
+		Com_Printf("%s (%zu): %s", cl->name, (size_t)(cl - svs.clients), s);
 	}
 
 	if (clientOK) {

From ee5faedaf9c70a3f4b94e3c97d9330321eb6f587 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:25:38 +0200
Subject: [PATCH 0453/2040] Removed the value of LittleSwap/BigSwap on
 little-endian/big-endian

---
 code/qcommon/q_platform.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index d7fcce1e..32e8f31f 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -430,7 +430,7 @@ void SwapValue(void* dest, size_t size);
 #define BigFloat
 #define BigShortPtr(x) ShortNoSwapPtr(&x)
 #define BigLongPtr(x) LongNoSwapPtr(&x)
-#define BigSwap(x, size) x
+#define BigSwap(x, size)
 
 #elif defined( Q3_LITTLE_ENDIAN )
 
@@ -444,7 +444,7 @@ void SwapValue(void* dest, size_t size);
 #define LittleShortPtr(x) ShortNoSwapPtr(&x)
 #define LittleLongPtr(x) LongNoSwapPtr(&x)
 #define LittleFloatPtr(x) FloatNoSwapPtr(&x)
-#define LittleSwap(x, size) x
+#define LittleSwap(x, size)
 
 #define BigShort(x) ShortSwap(x)
 #define BigUnsignedShort(x) UnsignedShortSwap(x)

From a26e5b74c29d7216ac77d3b7d7f8d3e9893fa92f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:05:09 +0200
Subject: [PATCH 0454/2040] Use `armhf` and `armel` suffix to distinguish
 between ARM variants

---
 TargetArch.cmake          |  8 ++++++--
 code/qcommon/q_platform.h | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/TargetArch.cmake b/TargetArch.cmake
index d51cc015..6d1d8dd8 100644
--- a/TargetArch.cmake
+++ b/TargetArch.cmake
@@ -23,10 +23,14 @@ set(archdetect_c_code "
 #  error cmake_ARCH alpha
 #elif defined __sparc__
 #  error cmake_ARCH sparc
-#elif defined __arm__ || defined (_M_ARM)
-#  error cmake_ARCH arm
 #elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
 #  error cmake_ARCH arm64
+#elif defined __arm__ || defined (_M_ARM)
+#  if defined(__ARM_PCS_VFP) && (__ARM_PCS_VFP)
+#    error cmake_ARCH armhf
+#  else
+#    error cmake_ARCH armel
+#  endif
 #elif defined __cris__
 #  error cmake_ARCH cris
 #elif defined __hppa__
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 32e8f31f..bc4960c5 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -213,10 +213,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  define ARCH_STRING "alpha"
 #elif defined __sparc__
 #  define ARCH_STRING "sparc"
-#elif defined __arm__
-#  define ARCH_STRING "arm"
-#elif defined(__aarch64__) || defined(__ARM64__)
+#elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
 #  define ARCH_STRING "arm64"
+#elif defined __arm__ || defined (_M_ARM)
+#  if defined(__ARM_PCS_VFP) && (__ARM_PCS_VFP)
+#    define ARCH_STRING "armhf"
+#  else
+#    define ARCH_STRING "armel"
+#  endif
 #elif defined __cris__
 #  define ARCH_STRING "cris"
 #elif defined __hppa__

From 42c20ac008691efb88f4e05b3f71df27e2184237 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:35:18 +0200
Subject: [PATCH 0455/2040] Portal sky mustn't cause entity surface to be
 r-eadded

This fixes an issue where an entity would get re-added with a really lower LOD. Fixes #307
---
 code/renderer/tr_main.c | 48 +++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 800ff499..96a7445f 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1047,7 +1047,7 @@ qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int
 			}
 		}
 
-		if ( ( dot = DotProduct( normal, tess.normal[tess.indexes[i]] ) ) >= 0 )
+		if ( ( dot = DotProduct( normal, surface->plane.normal ) ) >= 0 )
 		{
 			numTriangles--;
 		}
@@ -1485,6 +1485,27 @@ void R_AddEntitySurfaces (void) {
 			continue;
 		}
 
+		if (tr.viewParms.isPortalSky) {
+			// Expecting a sky entity in a sky portal
+			if (!(ent->e.renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+		} else {
+			if (ent->e.renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+
+		if (tr.viewParms.isPortal) {
+			if (!(ent->e.renderfx & (RF_WRAP_FRAMES | RF_SHADOW_PLANE))) {
+				continue;
+			}
+		} else {
+			if (ent->e.renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
 		// simple generated models, like sprites and beams, are not culled
 		switch ( ent->e.reType ) {
 		case RT_PORTALSURFACE:
@@ -1552,25 +1573,24 @@ void R_AddSpriteSurfaces()
 	{
 		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
 
-        if (tr.viewParms.isPortalSky)
-        {
-			if ((sprite->renderfx & RF_SKYENTITY) == 0) {
+        if (tr.viewParms.isPortalSky) {
+			if (!(sprite->renderfx & RF_SKYENTITY)) {
 				continue;
 			}
-        }
-        else if ((sprite->renderfx & RF_SKYENTITY) != 0)
-        {
-            continue;
-        }
+        } else {
+			if (sprite->renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
         
-		if (tr.viewParms.isPortal)
-        {
+		if (tr.viewParms.isPortal) {
 			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
 				continue;
 			}
-        }
-		else if (sprite->renderfx & RF_SHADOW_PLANE) {
-			continue;
+		} else {
+			if (sprite->renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
 		}
 
 		tr.currentEntityNum = ENTITYNUM_WORLD;

From ca4b1ebdeea1649691f3c8a5fb567ee7e7e7a45d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:37:45 +0200
Subject: [PATCH 0456/2040] Don't render terrain when `refdef.render_terrain`
 is set to false

---
 code/renderer/tr_world.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
index 68b6bf36..36c4f5d8 100644
--- a/code/renderer/tr_world.c
+++ b/code/renderer/tr_world.c
@@ -58,6 +58,10 @@ static qboolean	R_CullGrid( srfGridMesh_t *cv ) {
 		return qtrue;
 	}
 
+	if (!tr.refdef.render_terrain) {
+		return qtrue;
+	}
+
 	if ( tr.currentEntityNum != ENTITYNUM_WORLD ) {
 		sphereCull = R_CullLocalPointAndRadius( cv->localOrigin, cv->meshRadius );
 	} else {
@@ -559,7 +563,7 @@ static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits )
 			}
 		}
 
-		if (r_drawterrain->integer)
+		if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky)
 		{
 			int i;
 
@@ -791,7 +795,7 @@ void R_AddWorldSurfaces (void) {
 	tr.currentEntityNum = ENTITYNUM_WORLD;
 	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
 
-	if (r_drawterrain->integer) {
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
 		R_TerrainPrepareFrame();
 	}
 
@@ -808,7 +812,7 @@ void R_AddWorldSurfaces (void) {
 	R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.viewParms.world);
 	R_RecursiveWorldNode(tr.world->nodes, tr.viewParms.fog.extrafrustums ? 31 : 15, (1 << tr.refdef.num_dlights) - 1);
 
-	if (r_drawterrain->integer) {
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
 		R_AddTerrainSurfaces();
 	}
 	if (r_drawstaticmodels->integer) {

From a74b966b7c075abc8eea374eb93418d38423f026 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:44:02 +0200
Subject: [PATCH 0457/2040] Update fog when changing whether or not the terrain
 must be rendered

---
 code/fgame/worldspawn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index 14fe1548..b91f32eb 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -920,6 +920,7 @@ void World::GetRenderTerrain(Event *ev)
 void World::SetRenderTerrain(Event *ev)
 {
     render_terrain = ev->GetInteger(1);
+    UpdateFog();
 }
 
 void World::GetSkyboxSpeed(Event *ev)

From de02c868a27f3206688a2e474207f397028b704f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:46:50 +0200
Subject: [PATCH 0458/2040] Fixed bullet tracers being incorrect

This should fix almost immobile bullet tracers on t1l1
---
 code/fgame/weaputils.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 4e036956..d611e81c 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2524,8 +2524,12 @@ float BulletAttack(
             if (tracerspeed == 1.f) {
                 gi.MSG_WriteBits(0, 1);
             } else {
+                int speed;
+
+                speed = tracerspeed * (1 << 9);
+
                 gi.MSG_WriteBits(1, 1);
-                gi.MSG_WriteBits(Q_clamp(tracerspeed, 1, 1023), 10);
+                gi.MSG_WriteBits(Q_clamp(speed, 1, 1023), 10);
             }
         }
 
@@ -2611,8 +2615,12 @@ void FakeBulletAttack(
             if (tracerspeed == 1.f) {
                 gi.MSG_WriteBits(0, 1);
             } else {
+                int speed;
+
+                speed = tracerspeed * (1 << 9);
+
                 gi.MSG_WriteBits(1, 1);
-                gi.MSG_WriteBits(Q_clamp(tracerspeed, 1, 1023), 10);
+                gi.MSG_WriteBits(Q_clamp(speed, 1, 1023), 10);
             }
         }
 

From 332a63503172c167d5ea8ca2cc6e5585fda1a55e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:25:02 +0200
Subject: [PATCH 0459/2040] Use MAX_GLOBAL_FROM_LOCAL

---
 code/tiki/tiki_shared.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index 57318d05..1834c5b5 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -146,7 +146,7 @@ typedef struct skelChannelList_s {
     short int  m_numChannels;
     short int  m_numLocalFromGlobal;
     short int *m_chanLocalFromGlobal;
-    short int  m_chanGlobalFromLocal[200];
+    short int  m_chanGlobalFromLocal[MAX_GLOBAL_FROM_LOCAL];
 } skelChannelList_c;
 
 #endif

From 546ded324e0b9680c63875a40362e39149068e99 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:25:45 +0200
Subject: [PATCH 0460/2040] Made ChannelNames() method public

---
 code/skeletor/skeletor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.h b/code/skeletor/skeletor.h
index a6cf90e8..3f7e23e6 100644
--- a/code/skeletor/skeletor.h
+++ b/code/skeletor/skeletor.h
@@ -130,10 +130,10 @@ public:
     void SetPose(const frameInfo_t *frameInfo, const int *contIndices, const vec4_t *contValues, float actionWeight);
     void SetEyeTargetPos(const float *pEyeTargetPos);
     int  GetBoneParent(int boneIndex);
+    static class ChannelNameTable* ChannelNames();
 
 private:
     void                           Init();
-    static class ChannelNameTable *ChannelNames();
     SkelMat4                      *BoneTransformation(int, int *, float (*)[4]);
 };
 

From 1d50fa088aa9dc39a8c550997f62e2deb1a50c77 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:26:24 +0200
Subject: [PATCH 0461/2040] Don't dealloc if there is no frame in the channel

---
 code/skeletor/skeletor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 6d3920aa..0987e17a 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -261,15 +261,17 @@ void skelAnimDataGameHeader_s::DeallocAnimData(skelAnimDataGameHeader_t *data)
 {
     skanChannelHdr *pChannel;
     int             i;
+    int             channelType;
 
-    if (!data || data == (skelAnimDataGameHeader_t *)-476) {
+    if (!data) {
         return;
     }
 
     for (i = 0; i < data->nTotalChannels; i++) {
         pChannel = &data->ary_channels[i];
+        channelType = GetBoneChannelType(data->channelList.ChannelName(skeletor_c::ChannelNames(), i));
 
-        if (pChannel->ary_frames) {
+        if (channelType != 2) {
             Skel_Free(pChannel->ary_frames);
         }
     }

From f8fa944054064b794a45b7ce0c418a50635cea92 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:26:51 +0200
Subject: [PATCH 0462/2040] Some refactoring, + implemented
 SetLocalFromGlobal()

---
 code/skeletor/skeletor_utilities.cpp | 42 ++++++++++++++++++----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index a580ceb7..d369aa51 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -96,6 +96,12 @@ int skelChannelList_s::GetLocalFromGlobal(int globalChannel) const
     return m_chanLocalFromGlobal[globalChannel];
 }
 
+
+void skelChannelList_s::SetLocalFromGlobal(int channel, int localchannel)
+{
+    m_chanLocalFromGlobal[channel] = localchannel;
+}
+
 int skelChannelList_s::NumChannels(void) const
 {
     return m_numChannels;
@@ -117,26 +123,31 @@ void skelChannelList_s::ZeroChannels()
 void skelChannelList_s::PackChannels()
 {
     m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1;
-
-    if (m_chanLocalFromGlobal[m_numLocalFromGlobal] == -1) {
-        do {
-            m_numLocalFromGlobal--;
-        } while (m_chanLocalFromGlobal[m_numLocalFromGlobal] == -1 && m_numLocalFromGlobal >= 0);
+    for (m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1; m_numLocalFromGlobal >= 0; m_numLocalFromGlobal--) {
+        if (m_chanLocalFromGlobal[m_numLocalFromGlobal] != -1) {
+            break;
+        }
     }
 
     if (m_numLocalFromGlobal < MAX_SKELETOR_CHANNELS) {
         m_numLocalFromGlobal++;
     }
 
-    if (m_numLocalFromGlobal <= 0) {
+    if (m_numLocalFromGlobal > 0) {
+        short *old_array      = m_chanLocalFromGlobal;
+        int    i;
+
+        m_chanLocalFromGlobal = (short *)Skel_Alloc(m_numLocalFromGlobal * sizeof(m_chanLocalFromGlobal[0]));
+
+        for (i = 0; i < m_numLocalFromGlobal; i++) {
+            m_chanLocalFromGlobal[i] = old_array[i];
+        }
+
+        Skel_Free(old_array);
+    } else {
         Skel_Free(m_chanLocalFromGlobal);
         m_chanLocalFromGlobal = NULL;
         m_numLocalFromGlobal  = -1;
-    } else {
-        short *old_array      = m_chanLocalFromGlobal;
-        m_chanLocalFromGlobal = (short *)Skel_Alloc(m_numLocalFromGlobal * sizeof(m_chanLocalFromGlobal[0]));
-        memcpy(m_chanLocalFromGlobal, old_array, m_numLocalFromGlobal * sizeof(m_chanLocalFromGlobal[0]));
-        Skel_Free(old_array);
     }
 }
 
@@ -170,9 +181,10 @@ int skelChannelList_s::AddChannel(int newGlobalChannelNum)
     iLocalChannel = GetLocalFromGlobal(newGlobalChannelNum);
 
     if (iLocalChannel < 0) {
-        iLocalChannel                              = m_numChannels++;
-        m_chanGlobalFromLocal[iLocalChannel]       = newGlobalChannelNum;
-        m_chanLocalFromGlobal[newGlobalChannelNum] = iLocalChannel;
+        iLocalChannel = m_numChannels++;
+
+        m_chanGlobalFromLocal[iLocalChannel] = newGlobalChannelNum;
+        SetLocalFromGlobal(newGlobalChannelNum, iLocalChannel);
     }
 
     return iLocalChannel;

From aeba0e0f6fae97926ae5801efe201e1333b9a763 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:26:59 +0200
Subject: [PATCH 0463/2040] Set the real limit of MAX_SKELETOR_CHANNELS

---
 code/skeletor/skeletor_name_lists.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor_name_lists.h b/code/skeletor/skeletor_name_lists.h
index 56b5f251..75322bfd 100644
--- a/code/skeletor/skeletor_name_lists.h
+++ b/code/skeletor/skeletor_name_lists.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
-#define MAX_SKELETOR_CHANNELS 16384
+#define MAX_SKELETOR_CHANNELS 2560 // Limit was 2048 before 2.30
 #define MAX_CHANNEL_NAME      32
 
 typedef struct ChannelName_s {

From 02ef85e390e89730497d5666b96ac2c532f81162 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:28:49 +0200
Subject: [PATCH 0464/2040] Removed GetChannelTypeFromName(), was useless

---
 code/skeletor/bonetable.cpp         | 42 -----------------------------
 code/skeletor/skeletor_name_lists.h |  1 -
 2 files changed, 43 deletions(-)

diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 22a919f6..4c1a19d0 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -273,48 +273,6 @@ int GetBoneChannelType(const char* name)
     return 3;
 }
 
-int GetChannelTypeFromName(const char *name)
-{
-    int    i;
-    size_t len;
-
-    if (!name) {
-        return 2;
-    }
-
-    for (i = 0; i < sizeof(bogusNameTable) / sizeof(bogusNameTable[0]); i++) {
-        if (!Q_stricmp(name, bogusNameTable[i])) {
-            return 2;
-        }
-    }
-
-    if (strstr(name, "Bip0") && !strstr(name, "Bip01") && !strstr(name, "Footsteps")) {
-        return 2;
-    }
-
-    len = strlen(name);
-
-    if (len >= 4) {
-        if (!memcmp(name + len - 4, " rot", 5)) {
-            return 0;
-        } else if (!memcmp(name + len - 4, " pos", 5)) {
-            return 1;
-        } else if (len >= 6) {
-            if (!memcmp(name + len - 4, " rotFK", 7)) {
-                return 2;
-            } else {
-                return 3;
-            }
-        } else {
-            return 3;
-        }
-    } else {
-        return 3;
-    }
-
-    return false;
-}
-
 int ChannelNameTable::RegisterChannel(const char *name)
 {
     int index;
diff --git a/code/skeletor/skeletor_name_lists.h b/code/skeletor/skeletor_name_lists.h
index 75322bfd..33008594 100644
--- a/code/skeletor/skeletor_name_lists.h
+++ b/code/skeletor/skeletor_name_lists.h
@@ -58,7 +58,6 @@ private:
 };
 
 int GetBoneChannelType(const char* name);
-int GetChannelTypeFromName(const char *name);
 
 #else
 

From 72e315bce1ac91082631cb3b0f8a2e6cbf511da6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:04:33 +0200
Subject: [PATCH 0465/2040] Using an enum `channelType_e` rather than raw
 values for bone channel types

---
 code/skeletor/bonetable.cpp                   | 16 +++++------
 .../skeletor/skeletor_animation_file_format.h |  2 +-
 code/skeletor/skeletor_loadanimation.cpp      | 28 +++++++++----------
 code/skeletor/skeletor_name_lists.h           |  9 +++++-
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 4c1a19d0..53c236b5 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -241,36 +241,36 @@ bool IsBogusChannelName(const char *name)
     return false;
 }
 
-int GetBoneChannelType(const char* name)
+channelType_t GetBoneChannelType(const char* name)
 {
     size_t len;
 
     if (!name) {
-        return 2;
+        return CHANNEL_NONE;
     }
 
     if (IsBogusChannelName(name)) {
-        return 2;
+        return CHANNEL_NONE;
     }
 
     len = strlen(name);
     if (len < 4) {
-        return 3;
+        return CHANNEL_VALUE;
     }
 
     if (!strcmp(name + len - 4, " rot")) {
-        return 0;
+        return CHANNEL_ROTATION;
     }
 
     if (!strcmp(name + len - 4, " pos")) {
-        return 1;
+        return CHANNEL_POSITION;
     }
 
     if (len >= 6 && !strcmp(name + len - 6, " rotFK")) {
-        return 2;
+        return CHANNEL_NONE;
     }
 
-    return 3;
+    return CHANNEL_VALUE;
 }
 
 int ChannelNameTable::RegisterChannel(const char *name)
diff --git a/code/skeletor/skeletor_animation_file_format.h b/code/skeletor/skeletor_animation_file_format.h
index 0b953174..5a679f50 100644
--- a/code/skeletor/skeletor_animation_file_format.h
+++ b/code/skeletor/skeletor_animation_file_format.h
@@ -79,7 +79,7 @@ typedef struct skelAnimDataGameHeader_s skelAnimDataGameHeader_t;
 
 typedef struct skelAnimDataGameHeader_s {
     int                  flags;
-    int                  nBytesUsed;
+    size_t               nBytesUsed;
     bool                 bHasDelta;
     bool                 bHasMorph;
     bool                 bHasUpper;
diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index ed019ebd..ab0c3b31 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -71,7 +71,7 @@ skelAnimDataGameHeader_t *EncodeFrames(
     skanGameFrame       *pFrame;
     size_t               frameSize;
     int                  indexLastFrameAdded;
-    int                  channelType;
+    channelType_t        channelType;
 
     pChannel    = enAnim->ary_channels;
     endFrameCap = enAnim->numFrames - 2;
@@ -82,7 +82,7 @@ skelAnimDataGameHeader_t *EncodeFrames(
 
         channelType = GetBoneChannelType(enAnim->channelList.ChannelName(channelNames, i));
         switch (channelType) {
-        case 0:
+        case CHANNEL_ROTATION:
             frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
             frameCnt  = 0;
             for (j = 0; j < enAnim->numFrames; j++) {
@@ -125,7 +125,7 @@ skelAnimDataGameHeader_t *EncodeFrames(
                 pCurrFrame++;
             }
             break;
-        case 1:
+        case CHANNEL_POSITION:
             frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
             frameCnt  = 0;
             for (j = 0; j < enAnim->numFrames; j++) {
@@ -167,11 +167,11 @@ skelAnimDataGameHeader_t *EncodeFrames(
                 pCurrFrame++;
             }
             break;
-        case 2:
+        case CHANNEL_NONE:
             pChannel->ary_frames       = NULL;
             pChannel->nFramesInChannel = 0;
             break;
-        case 3:
+        case CHANNEL_VALUE:
         default:
             frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
             frameCnt  = 0;
@@ -433,7 +433,7 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
     size_t          frameSize;
     int             frameCnt;
     int             i, j;
-    int             channelType;
+    channelType_t   channelType;
     vec4_t          channelData;
 
     for (i = 0; i < enAnim->nTotalChannels; i++) {
@@ -443,7 +443,7 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         frameCnt    = MSG_ReadShort(msg);
 
         switch (channelType) {
-        case 0:
+        case CHANNEL_ROTATION:
             frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
 
             pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
@@ -462,7 +462,7 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->pChannelData[3] = LittleFloat(channelData[3]);
             }
             break;
-        case 1:
+        case CHANNEL_POSITION:
             frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
 
             pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
@@ -480,7 +480,7 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->pChannelData[2] = LittleFloat(channelData[2]);
             }
             break;
-        case 2:
+        case CHANNEL_NONE:
             pChannel->ary_frames       = NULL;
             pChannel->nFramesInChannel = 0;
 
@@ -490,7 +490,7 @@ void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 MSG_ReadData(msg, channelData, sizeof(vec4_t));
             }
             break;
-        case 3:
+        case CHANNEL_VALUE:
         default:
             frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
 
@@ -521,7 +521,7 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
     int             frameCnt;
     int             i, j;
     const char     *name;
-    int             type;
+    channelType_t   type;
 
     for (i = 0; i < enAnim->nTotalChannels; i++) {
         pChannel = &enAnim->ary_channels[i];
@@ -534,7 +534,7 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         //
         // 4 channels (Quat)
         //
-        case 0:
+        case CHANNEL_ROTATION:
             frameSize                  = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
             pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
             pChannel->ary_frames       = pFrame;
@@ -553,7 +553,7 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         //
         // 3 channels (Position)
         //
-        case 1:
+        case CHANNEL_POSITION:
             frameSize                  = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
             pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
             pChannel->ary_frames       = pFrame;
@@ -571,7 +571,7 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
         //
         // 1 channel (frame)
         //
-        case 3:
+        case CHANNEL_VALUE:
             frameSize            = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float) * 1);
             pFrame               = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
             pChannel->ary_frames = pFrame;
diff --git a/code/skeletor/skeletor_name_lists.h b/code/skeletor/skeletor_name_lists.h
index 33008594..71d2fdd7 100644
--- a/code/skeletor/skeletor_name_lists.h
+++ b/code/skeletor/skeletor_name_lists.h
@@ -57,7 +57,14 @@ private:
     void        SetChannelName(ChannelName_t *channel, const char *newName);
 };
 
-int GetBoneChannelType(const char* name);
+typedef enum channelType_e {
+    CHANNEL_ROTATION,
+    CHANNEL_POSITION,
+    CHANNEL_NONE,
+    CHANNEL_VALUE
+} channelType_t;
+
+channelType_t GetBoneChannelType(const char* name);
 
 #else
 

From de874874e4acd9357b55b53934c58ab6d71e8eda Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:10:28 +0200
Subject: [PATCH 0466/2040] Use an enum for setup case rather than raw values

---
 code/tiki/tiki_parse.cpp | 87 ++++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 34 deletions(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index f4300ec9..87500c9f 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -28,6 +28,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../skeletor/skeletor.h"
 #include <tiki.h>
 
+typedef enum tiki_setupcase_e {
+    SETUP_END_MESSAGE = -1,
+    SETUP_LOAD_SCALE,
+    SETUP_LOD_SCALE,
+    SETUP_LOD_BIAS,
+    SETUP_SKELMODEL,
+    SETUP_LOAD_ORIGIN,
+    SETUP_LIGHT_OFFSET,
+    SETUP_RADIUS,
+    SETUP_SURFACE,
+    SETUP_FLAGS,
+    SETUP_DAMAGE,
+    SETUP_SHADER,
+    SETUP_CASE_KEY,
+    SETUP_CASE_VALUE,
+    SETUP_BEGIN_CASE,
+    SETUP_BEGIN_CASE_BODY,
+    SETUP_END_CASE
+} tiki_setupcase_t;
+
 /*
 ===============
 TIKI_FileExtension
@@ -523,7 +543,7 @@ WriteScale
 */
 static void WriteScale(dloaddef_t *ld, float scale)
 {
-    MSG_WriteByte(ld->modelBuf, 0);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOAD_SCALE);
     MSG_WriteFloat(ld->modelBuf, scale);
 }
 
@@ -534,7 +554,7 @@ WriteLoadScale
 */
 static void WriteLoadScale(dloaddef_t *ld, float lod_scale)
 {
-    MSG_WriteByte(ld->modelBuf, 1);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOD_SCALE);
     MSG_WriteFloat(ld->modelBuf, lod_scale);
 }
 
@@ -545,7 +565,7 @@ WriteLodBias
 */
 static void WriteLodBias(dloaddef_t *ld, float lod_bias)
 {
-    MSG_WriteByte(ld->modelBuf, 2);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOD_BIAS);
     MSG_WriteFloat(ld->modelBuf, lod_bias);
 }
 
@@ -556,7 +576,7 @@ WriteSkelmodel
 */
 void WriteSkelmodel(dloaddef_t *ld, const char *name)
 {
-    MSG_WriteByte(ld->modelBuf, 3);
+    MSG_WriteByte(ld->modelBuf, SETUP_SKELMODEL);
     MSG_WriteString(ld->modelBuf, name);
 
     Q_strncpyz(ld->idleSkel, name, sizeof(ld->idleSkel));
@@ -570,7 +590,7 @@ WriteOrigin
 */
 static void WriteOrigin(dloaddef_t *ld, float origin_x, float origin_y, float origin_z)
 {
-    MSG_WriteByte(ld->modelBuf, 4);
+    MSG_WriteByte(ld->modelBuf, SETUP_LOAD_ORIGIN);
     MSG_WriteFloat(ld->modelBuf, origin_x);
     MSG_WriteFloat(ld->modelBuf, origin_y);
     MSG_WriteFloat(ld->modelBuf, origin_z);
@@ -583,7 +603,7 @@ WriteLightOffset
 */
 static void WriteLightOffset(dloaddef_t *ld, float light_offset_x, float light_offset_y, float light_offset_z)
 {
-    MSG_WriteByte(ld->modelBuf, 5);
+    MSG_WriteByte(ld->modelBuf, SETUP_LIGHT_OFFSET);
     MSG_WriteFloat(ld->modelBuf, light_offset_x);
     MSG_WriteFloat(ld->modelBuf, light_offset_y);
     MSG_WriteFloat(ld->modelBuf, light_offset_z);
@@ -596,7 +616,7 @@ WriteRadius
 */
 static void WriteRadius(dloaddef_t *ld, float radius)
 {
-    MSG_WriteByte(ld->modelBuf, 6);
+    MSG_WriteByte(ld->modelBuf, SETUP_RADIUS);
     MSG_WriteFloat(ld->modelBuf, radius);
 }
 
@@ -607,7 +627,7 @@ WriteSurface
 */
 static void WriteSurface(dloaddef_t *ld, const char *surface)
 {
-    MSG_WriteByte(ld->modelBuf, 7);
+    MSG_WriteByte(ld->modelBuf, SETUP_SURFACE);
     MSG_WriteString(ld->modelBuf, surface);
 }
 
@@ -618,7 +638,7 @@ WriteFlags
 */
 static void WriteFlags(dloaddef_t *ld, int flags)
 {
-    MSG_WriteByte(ld->modelBuf, 8);
+    MSG_WriteByte(ld->modelBuf, SETUP_FLAGS);
     MSG_WriteLong(ld->modelBuf, flags);
 }
 
@@ -629,7 +649,7 @@ WriteDamage
 */
 static void WriteDamage(dloaddef_t *ld, float damage)
 {
-    MSG_WriteByte(ld->modelBuf, 9);
+    MSG_WriteByte(ld->modelBuf, SETUP_DAMAGE);
     MSG_WriteFloat(ld->modelBuf, damage);
 }
 
@@ -640,7 +660,7 @@ WriteShader
 */
 static void WriteShader(dloaddef_t *ld, const char *shader)
 {
-    MSG_WriteByte(ld->modelBuf, 10);
+    MSG_WriteByte(ld->modelBuf, SETUP_SHADER);
     MSG_WriteString(ld->modelBuf, shader);
 }
 
@@ -651,7 +671,7 @@ WriteBeginCase
 */
 static void WriteBeginCase(dloaddef_t *ld)
 {
-    MSG_WriteByte(ld->modelBuf, 13);
+    MSG_WriteByte(ld->modelBuf, SETUP_BEGIN_CASE);
 }
 
 /*
@@ -661,7 +681,7 @@ WriteCaseKey
 */
 static void WriteCaseKey(dloaddef_t *ld, const char *key)
 {
-    MSG_WriteByte(ld->modelBuf, 11);
+    MSG_WriteByte(ld->modelBuf, SETUP_CASE_KEY);
     MSG_WriteString(ld->modelBuf, key);
 }
 
@@ -672,7 +692,7 @@ WriteCaseValue
 */
 static void WriteCaseValue(dloaddef_t *ld, const char *value)
 {
-    MSG_WriteByte(ld->modelBuf, 12);
+    MSG_WriteByte(ld->modelBuf, SETUP_CASE_VALUE);
     MSG_WriteString(ld->modelBuf, value);
 }
 
@@ -683,7 +703,7 @@ WriteBeginCaseBody
 */
 static void WriteBeginCaseBody(dloaddef_t *ld)
 {
-    MSG_WriteByte(ld->modelBuf, 14);
+    MSG_WriteByte(ld->modelBuf, SETUP_BEGIN_CASE_BODY);
 }
 
 /*
@@ -693,7 +713,7 @@ WriteEndCase
 */
 static void WriteEndCase(dloaddef_t *ld)
 {
-    MSG_WriteByte(ld->modelBuf, 15);
+    MSG_WriteByte(ld->modelBuf, SETUP_END_CASE);
 }
 
 /*
@@ -727,14 +747,14 @@ qboolean TIKI_LoadSetupCaseHeader(
     const char *value;
     qboolean    match = false;
 
-    while (c != 14) {
+    while (c != SETUP_BEGIN_CASE_BODY) {
         c = MSG_ReadByte(msg);
         switch (c) {
-        case 11:
+        case SETUP_CASE_KEY:
             value = MSG_ReadString(msg);
             key   = value;
             break;
-        case 12:
+        case SETUP_CASE_VALUE:
             value = MSG_ReadString(msg);
             if (skip || match || !keyValues) {
                 break;
@@ -745,7 +765,6 @@ qboolean TIKI_LoadSetupCaseHeader(
                 match = true;
             }
             break;
-        case 14:
         default:
             break;
         }
@@ -788,28 +807,28 @@ qboolean TIKI_LoadSetupCase(
         switch (c) {
         default:
             break;
-        case 0:
+        case SETUP_LOAD_SCALE:
             load_scale = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->load_scale = load_scale;
             break;
-        case 1:
+        case SETUP_LOD_SCALE:
             lod_scale = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->lod_scale = lod_scale;
             break;
-        case 2:
+        case SETUP_LOD_BIAS:
             lod_bias = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->lod_bias = lod_bias;
             break;
-        case 3:
+        case SETUP_SKELMODEL:
             name = MSG_ReadString(msg);
             if (skip) {
                 break;
@@ -830,7 +849,7 @@ qboolean TIKI_LoadSetupCase(
             tiki->num_surfaces += skelmodel->numSurfaces;
             tiki->numMeshes++;
             break;
-        case 4:
+        case SETUP_LOAD_ORIGIN:
             load_origin[0] = MSG_ReadFloat(msg);
             load_origin[1] = MSG_ReadFloat(msg);
             load_origin[2] = MSG_ReadFloat(msg);
@@ -839,7 +858,7 @@ qboolean TIKI_LoadSetupCase(
             }
             VectorCopy(load_origin, tiki->load_origin);
             break;
-        case 5:
+        case SETUP_LIGHT_OFFSET:
             light_offset[0] = MSG_ReadFloat(msg);
             light_offset[1] = MSG_ReadFloat(msg);
             light_offset[2] = MSG_ReadFloat(msg);
@@ -848,14 +867,14 @@ qboolean TIKI_LoadSetupCase(
             }
             VectorCopy(light_offset, tiki->load_origin);
             break;
-        case 6:
+        case SETUP_RADIUS:
             radius = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             tiki->radius = radius;
             break;
-        case 7:
+        case SETUP_SURFACE:
             name = MSG_ReadString(msg);
             if (skip) {
                 break;
@@ -873,21 +892,21 @@ qboolean TIKI_LoadSetupCase(
             }
             strcpy(loadsurfaces[currentSurface].name, name);
             break;
-        case 8:
+        case SETUP_FLAGS:
             flags = MSG_ReadLong(msg);
             if (skip) {
                 break;
             }
             loadsurfaces[currentSurface].flags |= flags;
             break;
-        case 9:
+        case SETUP_DAMAGE:
             damage_multiplier = MSG_ReadFloat(msg);
             if (skip) {
                 break;
             }
             loadsurfaces[currentSurface].damage_multiplier = damage_multiplier;
             break;
-        case 10:
+        case SETUP_SHADER:
             name = MSG_ReadString(msg);
             if (skip) {
                 break;
@@ -909,13 +928,13 @@ qboolean TIKI_LoadSetupCase(
             );
             loadsurfaces[currentSurface].numskins++;
             break;
-        case 13:
+        case SETUP_BEGIN_CASE:
             if (!TIKI_LoadSetupCaseHeader(tiki, filename, loadsurfaces, numSurfacesSetUp, msg, skip, keyValues)) {
                 return false;
             }
             break;
-        case -1:
-        case 15:
+        case SETUP_END_MESSAGE:
+        case SETUP_END_CASE:
             return true;
         }
     }

From 10e3192f856cc9520f3a8848f1cfd136d6bfeeb8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:24:01 +0200
Subject: [PATCH 0467/2040] Fixed MASK_PLAYERSOLID being wrong

---
 code/fgame/bg_public.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index dcdbc48a..af881c1e 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -610,9 +610,7 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_FENCE)
 #define MASK_SAFESOLID (CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_USABLE    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
-#define MASK_PLAYERSOLID                                                                                          \
-    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_UNKNOWN2 \
-     | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
+#define MASK_PLAYERSOLID (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_WEAPONCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
 #define MASK_GUNTARGET                                                                                               \
     (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX        \
      | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_UNKNOWN3 | CONTENTS_FENCE | CONTENTS_BODY | CONTENTS_CORPSE \

From fd3a36f162e84da9a5e3388910338e4792fd7b13 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:30:19 +0200
Subject: [PATCH 0468/2040] Fixed melee sometimes not making the hit sound

---
 code/fgame/weaputils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index d611e81c..fb737103 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -168,7 +168,7 @@ qboolean MeleeAttack(
 
                 victim->Damage(attacker, attacker, damage, pos, dir, vec_zero, knockback, 0, means_of_death);
 
-                if (victim->edict->r.contents & CONTENTS_SOLID) {
+                if (!(victim->edict->r.contents & CONTENTS_CLAYPIDGEON)) {
                     victim->Sound("pistol_hit");
                 }
             }

From 84d702838d72f2d523b65ad16ee1e531cc691947 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:58:31 +0200
Subject: [PATCH 0469/2040] Implemented Player::MeasureLandmineDistances()

This makes minedetector actually detect mines, especially on `e1l2`
---
 code/fgame/player_conditionals.cpp | 85 +++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index 71dd43ad..4c2d5d93 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -433,7 +433,90 @@ qboolean Player::CondNearLandmine(Conditional& condition)
 
 void Player::MeasureLandmineDistances()
 {
-    // FIXME: unimplemented
+    Weapon* weapon;
+    float previousMineDist;
+    float maxrange;
+    int i;
+
+    if (m_fMineCheckTime == level.time) {
+        return;
+    }
+    m_fMineCheckTime = level.time;
+    previousMineDist = m_fMineDist;
+    m_fMineDist = 1000;
+
+    weapon = GetActiveWeapon(WEAPON_MAIN);
+    if (!weapon) {
+        weapon = GetActiveWeapon(WEAPON_OFFHAND);
+    }
+
+    maxrange = 40;
+    if (weapon) {
+        maxrange = weapon->GetMaxRange();
+    }
+
+    for (i = 0; i < globals.max_entities; i++) {
+        TriggerLandmine* landmine;
+        Entity* ent;
+        vec3_t forward;
+        Vector delta;
+        float radius;
+
+        ent = G_GetEntity(i);
+        if (!ent) {
+            continue;
+        }
+
+        if (!ent->isSubclassOf(TriggerLandmine)) {
+            continue;
+        }
+
+        landmine = static_cast<TriggerLandmine*>(ent);
+        // This could be from an allied player
+        if (landmine->IsImmune(this)) {
+            continue;
+        }
+
+        AngleVectorsLeft(angles, forward, NULL, NULL);
+        delta = landmine->origin - origin;
+        radius = delta.length();
+
+        if (radius < maxrange) {
+            ent->PostEvent(EV_Show, level.frametime);
+        }
+
+        if (radius > m_fMineDist) {
+            continue;
+        }
+
+        if (radius >= 40) {
+            float dot;
+
+            delta.normalize();
+
+            dot = DotProduct(delta, forward);
+            if (dot > 0 && radius / Square(dot) < m_fMineDist) {
+                m_fMineDist = radius / Square(dot);
+            }
+        } else if (radius < m_fMineDist) {
+            m_fMineDist = radius;
+        }
+    }
+
+    m_fMineDist /= maxrange;
+
+    if (m_fMineDist > 3) {
+        StopLoopSound();
+        return;
+    }
+
+    if (floorf(previousMineDist * 20) != floorf(m_fMineDist * 20)) {
+        float pitch;
+
+        pitch = 2.f - log(m_fMineDist + 1.0);
+
+        LoopSound("minedetector_on", -1, -1, -1, pitch);
+    }
 }
 
 qboolean Player::CondIsAssistingEscape(Conditional& condition)

From 85bf56ae03df0e4a0493cd7f6439846440f8ec1a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:19:04 +0200
Subject: [PATCH 0470/2040] Call SetWeight() rather than setting it manually

---
 code/fgame/animate.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/fgame/animate.cpp b/code/fgame/animate.cpp
index 56eef6c7..38483961 100644
--- a/code/fgame/animate.cpp
+++ b/code/fgame/animate.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -508,9 +508,8 @@ void Animate::StopAnimating(int slot)
         edict->s.frameInfo[slot].index = 1;
     }
 
-    edict->s.frameInfo[slot].weight = 0.0f;
-
     animFlags[slot] = ANIM_LOOP | ANIM_NODELTA | ANIM_NOEXIT | ANIM_PAUSED;
+    SetWeight(slot, 0);
     animtimes[slot] = 0.0f;
 
     SlotChanged(slot);

From 91497d8fa7d58f1d3770347c5d3e9fde3aa4383a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:20:15 +0200
Subject: [PATCH 0471/2040] Implements `Player::EventTestAnim()`

---
 code/fgame/player.h             |  5 +++--
 code/fgame/player_animation.cpp | 27 +++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/code/fgame/player.h b/code/fgame/player.h
index 5eebc593..a67ece67 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -68,7 +68,8 @@ enum painDirection_t {
 };
 
 typedef enum {
-    ANIMSLOT_PAIN = 4
+    ANIMSLOT_PAIN = 4,
+    ANIMSLOT_TESTANIM = 7
 } playerAnimSlot_t;
 
 typedef enum {
diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index a8098fe1..5f9070e1 100644
--- a/code/fgame/player_animation.cpp
+++ b/code/fgame/player_animation.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -515,5 +515,28 @@ void Player::PlayerAnimDelta(float *vDelta)
 
 void Player::EventTestAnim(Event *ev)
 {
-    // FIXME: unimplemented
+    str name;
+    float weight;
+    int animNum;
+
+    weight = ev->GetFloat(1);
+    if (weight <= 0) {
+        SetWeight(ANIMSLOT_TESTANIM, 0);
+        StopAnimating(ANIMSLOT_TESTANIM);
+        return;
+    }
+
+    if (ev->NumArgs() > 1) {
+        name = ev->GetString(1);
+        animNum = gi.Anim_NumForName(edict->tiki, name.c_str());
+        if (animNum == -1) {
+            gi.Printf("Couldn't find anim '%s'\n", name.c_str());
+            return;
+        }
+
+        NewAnim(animNum, ANIMSLOT_TESTANIM, weight);
+        RestartAnimSlot(ANIMSLOT_TESTANIM);
+    }
+
+    SetWeight(ANIMSLOT_TESTANIM, weight);
 }

From 6b869c4c0d9e0849dd8eb8a88cf22378c41aac41 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:26:44 +0200
Subject: [PATCH 0472/2040] Use an enumeration instead of raw values

---
 code/cgame/cg_parsemsg.cpp | 246 +++++++++++++++++++------------------
 1 file changed, 124 insertions(+), 122 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 5b261792..9d7ebfe6 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -859,14 +859,14 @@ void CG_AddBulletImpacts()
             }
 
             if (fImpSndDistRA < fImpSndDistLA) {
-                if (wall_impact_type[iImpSndIndexRA]) {
+                if (wall_impact_type[iImpSndIndexRA] != SFX_BHIT_PAPER_LITE) {
                     if (wall_impact_large[iImpSndIndexRA]) {
                         fVolume = 1.f;
                     } else {
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[iImpSndIndexRA] == 2 || wall_impact_type[iImpSndIndexRA] == 3) {
+                    if (wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_LITE || wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
                     } else {
                         sSoundName = "snd_bh_wood";
@@ -897,7 +897,7 @@ void CG_AddBulletImpacts()
                             fVolume = 0.75f;
                         }
 
-                        if (wall_impact_type[iImpSndIndexRB] == 2 || wall_impact_type[iImpSndIndexRB] == 3) {
+                        if (wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_LITE || wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_HARD) {
                             sSoundName = "snd_bh_metal";
                         } else {
                             sSoundName = "snd_bh_wood";
@@ -923,14 +923,14 @@ void CG_AddBulletImpacts()
             }
 
             if (fImpSndDistLA > 9999.0f) {
-                if (wall_impact_type[0]) {
+                if (wall_impact_type[0] != SFX_BHIT_PAPER_LITE) {
                     if (wall_impact_large[0]) {
                         fVolume = 1.f;
                     } else {
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[0] == 2 || wall_impact_type[0] == 3) {
+                    if (wall_impact_type[0] == SFX_BHIT_WOOD_LITE || wall_impact_type[0] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
                     } else {
                         sSoundName = "snd_bh_wood";
@@ -945,14 +945,14 @@ void CG_AddBulletImpacts()
             }
 
             if (fImpSndDistLB < fImpSndDistLA) {
-                if (wall_impact_type[iImpSndIndexLB]) {
+                if (wall_impact_type[iImpSndIndexLB] != SFX_BHIT_PAPER_LITE) {
                     if (wall_impact_large[iImpSndIndexLB]) {
                         fVolume = 1.f;
                     } else {
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[iImpSndIndexLB] == 2 || wall_impact_type[iImpSndIndexLB] == 3) {
+                    if (wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_LITE || wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
                     } else {
                         sSoundName = "snd_bh_wood";
@@ -1033,16 +1033,16 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
 
     if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
         switch (iType) {
-        case 13:
+        case CGM_EXPLOSION_EFFECT_1:
             iBaseEffect = SFX_EXP_GREN_BASE;
             break;
-        case 14:
+        case CGM_EXPLOSION_EFFECT_2:
             iBaseEffect = SFX_EXP_BAZOOKA_BASE;
             break;
-        case 15:
+        case CGM_EXPLOSION_EFFECT_3:
             iBaseEffect = SFX_EXP_HEAVYSHELL_BASE;
             break;
-        case 16:
+        case CGM_EXPLOSION_EFFECT_4:
             iBaseEffect = SFX_EXP_TANK_BASE;
             break;
         default:
@@ -1051,7 +1051,7 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         }
     } else {
         switch (iType) {
-        case 13:
+        case CGM6_EXPLOSION_EFFECT_2:
             iBaseEffect = SFX_EXP_BAZOOKA_BASE;
             break;
         default:
@@ -1274,10 +1274,10 @@ void CG_ParseCGMessage_ver_15()
         iType = cgi.MSG_ReadBits(6);
 
         switch (iType) {
-        case 1:
-        case 2:
-        case 5:
-            if (iType == 1) {
+        case CGM_BULLET_1:
+        case CGM_BULLET_2:
+        case CGM_BULLET_5:
+            if (iType == CGM_BULLET_1) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1286,7 +1286,7 @@ void CG_ParseCGMessage_ver_15()
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
 
-            if (iType != 1) {
+            if (iType != CGM_BULLET_1) {
                 vTmp[0] = vStart[0];
                 vTmp[1] = vStart[1];
                 vTmp[2] = vStart[2];
@@ -1306,18 +1306,18 @@ void CG_ParseCGMessage_ver_15()
                 alpha = 1.0f;
             }
 
-            if (iType == 1) {
-                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue, alpha);
-            } else if (iType == 2) {
+            if (iType == CGM_BULLET_1) {
+                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue, alpha);
+            } else if (iType == CGM_BULLET_2) {
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue, alpha);
             } else {
                 CG_MakeBubbleTrail(vStart, vEndArray[0], iLarge, alpha);
             }
 
             break;
-        case 3:
-        case 4:
-            if (iType == 3) {
+        case CGM_BULLET_3:
+        case CGM_BULLET_4:
+            if (iType == CGM_BULLET_3) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1351,12 +1351,12 @@ void CG_ParseCGMessage_ver_15()
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, iCount, iLarge, iInfo, qtrue, alpha);
             }
             break;
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
+        case CGM_BULLET_6:
+        case CGM_BULLET_7:
+        case CGM_BULLET_8:
+        case CGM_BULLET_9:
+        case CGM_BULLET_10:
+        case CGM_BULLET_11:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1364,7 +1364,7 @@ void CG_ParseCGMessage_ver_15()
             iLarge = cgi.MSG_ReadBits(2);
 
             switch (iType) {
-            case 6:
+            case CGM_BULLET_6:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
@@ -1373,16 +1373,16 @@ void CG_ParseCGMessage_ver_15()
                     wall_impact_count++;
                 }
                 break;
-            case 7:
+            case CGM_BULLET_7:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 6;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_STONE_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 8:
+            case CGM_BULLET_8:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1392,7 +1392,7 @@ void CG_ParseCGMessage_ver_15()
                     flesh_impact_count++;
                 }
                 break;
-            case 9:
+            case CGM_BULLET_9:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1402,21 +1402,21 @@ void CG_ParseCGMessage_ver_15()
                     flesh_impact_count++;
                 }
                 break;
-            case 10:
+            case CGM_BULLET_10:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 2;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_WOOD_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 11:
+            case CGM_BULLET_11:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 4;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_METAL_LITE;
                     wall_impact_count++;
                 }
                 break;
@@ -1425,7 +1425,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 12:
+        case CGM_MELEE_IMPACT:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1434,33 +1434,33 @@ void CG_ParseCGMessage_ver_15()
             vEnd[2]   = cgi.MSG_ReadCoord();
             CG_MeleeImpact(vStart, vEnd);
             break;
-        case 13:
-        case 14:
-        case 15:
-        case 16:
+        case CGM_EXPLOSION_EFFECT_1:
+        case CGM_EXPLOSION_EFFECT_2:
+        case CGM_EXPLOSION_EFFECT_3:
+        case CGM_EXPLOSION_EFFECT_4:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             CG_MakeExplosionEffect(vStart, iType);
             break;
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-        case 25:
+        case CGM_MAKE_EFFECT_1:
+        case CGM_MAKE_EFFECT_2:
+        case CGM_MAKE_EFFECT_3:
+        case CGM_MAKE_EFFECT_4:
+        case CGM_MAKE_EFFECT_5:
+        case CGM_MAKE_EFFECT_6:
+        case CGM_MAKE_EFFECT_7:
+        case CGM_MAKE_EFFECT_8:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             cgi.MSG_ReadDir(vEnd);
 
-            sfxManager.MakeEffect_Normal(iType + SFX_EXP_GREN_PUDDLE, vStart, vEnd);
+            sfxManager.MakeEffect_Normal(SFX_EXP_GREN_PUDDLE + iType, vStart, vEnd);
             break;
 
-        case 26:
-        case 27:
+        case CGM_MAKE_CRATE_DEBRIS:
+        case CGM_MAKE_WINDOW_DEBRIS:
             {
                 str    sEffect;
                 char   cTmp[8];
@@ -1473,7 +1473,7 @@ void CG_ParseCGMessage_ver_15()
                 // get the integer as string
                 snprintf(cTmp, sizeof(cTmp), "%d", iLarge);
 
-                if (iType == 26) {
+                if (iType == CGM_MAKE_CRATE_DEBRIS) {
                     sEffect = "models/fx/crates/debris_";
                 } else {
                     sEffect = "models/fx/windows/debris_";
@@ -1490,7 +1490,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 28:
+        case CGM_BULLET_NO_BARREL_1:
             vTmp[0]         = cgi.MSG_ReadCoord();
             vTmp[1]         = cgi.MSG_ReadCoord();
             vTmp[2]         = cgi.MSG_ReadCoord();
@@ -1501,6 +1501,7 @@ void CG_ParseCGMessage_ver_15()
             vEndArray[0][1] = cgi.MSG_ReadCoord();
             vEndArray[0][2] = cgi.MSG_ReadCoord();
             iLarge          = cgi.MSG_ReadBits(2);
+
             if (cgi.MSG_ReadBits(1)) {
                 int iAlpha = cgi.MSG_ReadBits(10);
                 alpha      = (float)iAlpha / 512.0;
@@ -1514,7 +1515,7 @@ void CG_ParseCGMessage_ver_15()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue, alpha);
             break;
 
-        case 29:
+        case CGM_BULLET_NO_BARREL_2:
             memset(vTmp, 0, sizeof(vTmp));
             vStart[0]       = cgi.MSG_ReadCoord();
             vStart[1]       = cgi.MSG_ReadCoord();
@@ -1523,6 +1524,7 @@ void CG_ParseCGMessage_ver_15()
             vEndArray[0][1] = cgi.MSG_ReadCoord();
             vEndArray[0][2] = cgi.MSG_ReadCoord();
             iLarge          = cgi.MSG_ReadBits(1);
+
             if (cgi.MSG_ReadBits(1)) {
                 int iAlpha = cgi.MSG_ReadBits(10);
                 alpha      = (float)iAlpha / 512.0;
@@ -1536,7 +1538,7 @@ void CG_ParseCGMessage_ver_15()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue, alpha);
             break;
 
-        case 30:
+        case CGM_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
             strcpy(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString());
             cgi.HudDrawElements[iInfo].string[0]   = 0;
@@ -1546,13 +1548,13 @@ void CG_ParseCGMessage_ver_15()
             CG_HudDrawShader(iInfo);
             break;
 
-        case 31:
+        case CGM_HUDDRAW_ALIGN:
             iInfo                                       = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iHorizontalAlign = cgi.MSG_ReadBits(2);
             cgi.HudDrawElements[iInfo].iVerticalAlign   = cgi.MSG_ReadBits(2);
             break;
 
-        case 32:
+        case CGM_HUDDRAW_RECT:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iX      = cgi.MSG_ReadShort();
             cgi.HudDrawElements[iInfo].iY      = cgi.MSG_ReadShort();
@@ -1560,30 +1562,30 @@ void CG_ParseCGMessage_ver_15()
             cgi.HudDrawElements[iInfo].iHeight = cgi.MSG_ReadShort();
             break;
 
-        case 33:
+        case CGM_HUDDRAW_VIRTUALSIZE:
             iInfo                                     = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].bVirtualScreen = cgi.MSG_ReadBits(1);
             break;
 
-        case 34:
+        case CGM_HUDDRAW_COLOR:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[0] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[1] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[2] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 35:
+        case CGM_HUDDRAW_ALPHA:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[3] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 36:
+        case CGM_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
             strcpy(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString());
             break;
 
-        case 37:
+        case CGM_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
             strcpy(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString());
             cgi.HudDrawElements[iInfo].hShader       = 0;
@@ -1592,14 +1594,14 @@ void CG_ParseCGMessage_ver_15()
             CG_HudDrawFont(iInfo);
             break;
 
-        case 38:
-        case 39:
+        case CGM_NOTIFY_KILL:
+        case CGM_NOTIFY_HIT:
             {
                 int iOldEnt;
 
                 iOldEnt               = current_entity_number;
                 current_entity_number = cg.snap->ps.clientNum;
-                if (iType == 36) {
+                if (iType == CGM_NOTIFY_HIT) {
                     commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 } else {
                     commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
@@ -1609,7 +1611,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 40:
+        case CGM_VOICE_CHAT:
             {
                 int iOldEnt;
 
@@ -1635,7 +1637,7 @@ void CG_ParseCGMessage_ver_15()
                 current_entity_number = iOldEnt;
             }
             break;
-        case 41:
+        case CGM_FENCEPOST:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1674,10 +1676,10 @@ void CG_ParseCGMessage_ver_6()
         iType = cgi.MSG_ReadBits(6);
 
         switch (iType) {
-        case 1:
-        case 2:
-        case 5:
-            if (iType == 1) {
+        case CGM6_BULLET_1:
+        case CGM6_BULLET_2:
+        case CGM6_BULLET_5:
+            if (iType == CGM6_BULLET_1) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1686,7 +1688,7 @@ void CG_ParseCGMessage_ver_6()
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
 
-            if (iType != 1) {
+            if (iType != CGM6_BULLET_1) {
                 vTmp[0] = vStart[0];
                 vTmp[1] = vStart[1];
                 vTmp[2] = vStart[2];
@@ -1697,18 +1699,18 @@ void CG_ParseCGMessage_ver_6()
             vEndArray[0][2] = cgi.MSG_ReadCoord();
             iLarge          = cgi.MSG_ReadBits(1);
 
-            if (iType == 1) {
+            if (iType == CGM6_BULLET_1) {
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
-            } else if (iType == 2) {
+            } else if (iType == CGM6_BULLET_2) {
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
             } else {
                 CG_MakeBubbleTrail(vStart, vEndArray[0], iLarge);
             }
 
             break;
-        case 3:
-        case 4:
-            if (iType == 3) {
+        case CGM6_BULLET_3:
+        case CGM6_BULLET_4:
+            if (iType == CGM6_BULLET_3) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1732,11 +1734,11 @@ void CG_ParseCGMessage_ver_6()
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, iCount, iLarge, iInfo, qtrue);
             }
             break;
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
+        case CGM6_BULLET_6:
+        case CGM6_BULLET_7:
+        case CGM6_BULLET_8:
+        case CGM6_BULLET_9:
+        case CGM6_BULLET_10:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1744,16 +1746,16 @@ void CG_ParseCGMessage_ver_6()
             iLarge = cgi.MSG_ReadBits(1);
 
             switch (iType) {
-            case 6:
+            case CGM6_BULLET_6:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 0;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_PAPER_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 7:
+            case CGM6_BULLET_7:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1763,7 +1765,7 @@ void CG_ParseCGMessage_ver_6()
                     flesh_impact_count++;
                 }
                 break;
-            case 8:
+            case CGM6_BULLET_8:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1773,21 +1775,21 @@ void CG_ParseCGMessage_ver_6()
                     flesh_impact_count++;
                 }
                 break;
-            case 9:
+            case CGM6_BULLET_9:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = (iLarge != 0) + 2;
+                    wall_impact_type[wall_impact_count]  = iLarge ? SFX_BHIT_WOOD_HARD : SFX_BHIT_WOOD_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 10:
+            case CGM6_BULLET_10:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = (iLarge != 0) + 4;
+                    wall_impact_type[wall_impact_count]  = iLarge ? SFX_BHIT_METAL_HARD : SFX_BHIT_METAL_LITE;
                     wall_impact_count++;
                 }
                 break;
@@ -1796,7 +1798,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 11:
+        case CGM6_MELEE_IMPACT:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1805,31 +1807,31 @@ void CG_ParseCGMessage_ver_6()
             vEnd[2]   = cgi.MSG_ReadCoord();
             CG_MeleeImpact(vStart, vEnd);
             break;
-        case 12:
-        case 13:
+        case CGM6_EXPLOSION_EFFECT_1:
+        case CGM6_EXPLOSION_EFFECT_2:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             CG_MakeExplosionEffect(vStart, iType);
             break;
-        case 15:
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
+        case CGM6_MAKE_EFFECT_1:
+        case CGM6_MAKE_EFFECT_2:
+        case CGM6_MAKE_EFFECT_3:
+        case CGM6_MAKE_EFFECT_4:
+        case CGM6_MAKE_EFFECT_5:
+        case CGM6_MAKE_EFFECT_6:
+        case CGM6_MAKE_EFFECT_7:
+        case CGM6_MAKE_EFFECT_8:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             cgi.MSG_ReadDir(vEnd);
 
-            sfxManager.MakeEffect_Normal(iType + SFX_EXP_GREN_PUDDLE, vStart, vEnd);
+            sfxManager.MakeEffect_Normal(SFX_EXP_GREN_PUDDLE + iType, vStart, vEnd);
             break;
 
-        case 23:
-        case 24:
+        case CGM6_MAKE_CRATE_DEBRIS:
+        case CGM6_MAKE_WINDOW_DEBRIS:
             {
                 str    sEffect;
                 char   cTmp[8];
@@ -1842,7 +1844,7 @@ void CG_ParseCGMessage_ver_6()
                 // get the integer as string
                 snprintf(cTmp, sizeof(cTmp), "%d", iLarge);
 
-                if (iType == 23) {
+                if (iType == CGM6_MAKE_CRATE_DEBRIS) {
                     sEffect = "models/fx/crates/debris_";
                 } else {
                     sEffect = "models/fx/windows/debris_";
@@ -1859,7 +1861,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 25:
+        case CGM6_BULLET_NO_BARREL_1:
             vTmp[0]         = cgi.MSG_ReadCoord();
             vTmp[1]         = cgi.MSG_ReadCoord();
             vTmp[2]         = cgi.MSG_ReadCoord();
@@ -1874,7 +1876,7 @@ void CG_ParseCGMessage_ver_6()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue);
             break;
 
-        case 26:
+        case CGM6_BULLET_NO_BARREL_2:
             memset(vTmp, 0, sizeof(vTmp));
             vStart[0]       = cgi.MSG_ReadCoord();
             vStart[1]       = cgi.MSG_ReadCoord();
@@ -1887,7 +1889,7 @@ void CG_ParseCGMessage_ver_6()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
             break;
 
-        case 27:
+        case CGM6_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
             strcpy(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString());
             cgi.HudDrawElements[iInfo].string[0]   = 0;
@@ -1897,13 +1899,13 @@ void CG_ParseCGMessage_ver_6()
             CG_HudDrawShader(iInfo);
             break;
 
-        case 28:
+        case CGM6_HUDDRAW_ALIGN:
             iInfo                                       = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iHorizontalAlign = cgi.MSG_ReadBits(2);
             cgi.HudDrawElements[iInfo].iVerticalAlign   = cgi.MSG_ReadBits(2);
             break;
 
-        case 29:
+        case CGM6_HUDDRAW_RECT:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iX      = cgi.MSG_ReadShort();
             cgi.HudDrawElements[iInfo].iY      = cgi.MSG_ReadShort();
@@ -1911,30 +1913,30 @@ void CG_ParseCGMessage_ver_6()
             cgi.HudDrawElements[iInfo].iHeight = cgi.MSG_ReadShort();
             break;
 
-        case 30:
+        case CGM6_HUDDRAW_VIRTUALSIZE:
             iInfo                                     = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].bVirtualScreen = cgi.MSG_ReadBits(1);
             break;
 
-        case 31:
+        case CGM6_HUDDRAW_COLOR:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[0] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[1] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[2] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 32:
+        case CGM6_HUDDRAW_ALPHA:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[3] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 33:
+        case CGM6_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
             strcpy(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString());
             break;
 
-        case 34:
+        case CGM6_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
             strcpy(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString());
             cgi.HudDrawElements[iInfo].hShader       = 0;
@@ -1943,14 +1945,14 @@ void CG_ParseCGMessage_ver_6()
             CG_HudDrawFont(iInfo);
             break;
 
-        case 35:
-        case 36:
+        case CGM6_NOTIFY_KILL:
+        case CGM6_NOTIFY_HIT:
             {
                 int iOldEnt;
 
                 iOldEnt               = current_entity_number;
                 current_entity_number = cg.snap->ps.clientNum;
-                if (iType == 36) {
+                if (iType == CGM6_NOTIFY_HIT) {
                     commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 } else {
                     commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
@@ -1960,7 +1962,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 37:
+        case CGM6_VOICE_CHAT:
             {
                 int iOldEnt;
 

From 7ddee0100e11ff1c869731711fa3b303060697fe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 14 Jun 2024 22:24:55 +0200
Subject: [PATCH 0473/2040] Implements CG_BodyFallSound()

---
 code/cgame/cg_specialfx.cpp | 146 +++++++++++++++++++++++++++++++++++-
 1 file changed, 142 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_specialfx.cpp b/code/cgame/cg_specialfx.cpp
index d1b1c970..76e9843c 100644
--- a/code/cgame/cg_specialfx.cpp
+++ b/code/cgame/cg_specialfx.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -38,7 +38,8 @@ static vec3_t g_vLadderstepMaxs;
 
 ClientSpecialEffectsManager sfxManager;
 
-Event EV_SFX_EffectDelay(
+Event EV_SFX_EffectDelay
+(
     "effectdelay",
     EV_DEFAULT,
     "iivvvvv",
@@ -519,7 +520,7 @@ void ClientSpecialEffectsManager::ExecuteEffect(
                 AxisCopy(axis, pCommand->emitter->tag_axis);
                 pCommand->emitter->cgd.createTime = cg.time;
                 commandManager.SetSpawnthing(pCommand->emitter);
-            
+
                 (commandManager.*pCommand->endfcn)();
             }
         }
@@ -937,7 +938,144 @@ void CG_LandingSound(centity_t *ent, refEntity_t *pREnt, float volume, int iEqui
 
 void CG_BodyFallSound(centity_t *ent, refEntity_t *pREnt, float volume)
 {
-    // FIXME: unimplemented
+    int     contents;
+    int     surftype;
+    int     iEffectNum = -1;
+    vec3_t  vStart, vEnd;
+    vec3_t  midlegs;
+    str     sSoundName;
+    trace_t trace;
+
+    VectorCopy(ent->lerpOrigin, vStart);
+    vStart[2] += 8;
+
+    VectorCopy(vStart, vEnd);
+    vEnd[2] -= 64;
+
+    if (ent->currentState.eType == ET_PLAYER) {
+        CG_Trace(
+            &trace,
+            vStart,
+            g_vFootstepMins,
+            g_vFootstepMaxs,
+            vEnd,
+            ent->currentState.number,
+            MASK_PLAYERSOLID,
+            qtrue,
+            qtrue,
+            "Player Landing"
+        );
+    } else {
+        CG_Trace(
+            &trace,
+            vStart,
+            g_vFootstepMins,
+            g_vFootstepMaxs,
+            vEnd,
+            ent->currentState.number,
+            MASK_MONSTERSOLID,
+            qfalse,
+            qfalse,
+            "Monster Landing"
+        );
+    }
+
+    if (trace.fraction == 1) {
+        return;
+    }
+
+    sSoundName = "snd_bodyfall_";
+    contents   = CG_PointContents(trace.endpos, -1);
+    if (contents & MASK_WATER) {
+        // take our ground position and trace upwards
+        VectorCopy(trace.endpos, midlegs);
+        midlegs[2] += WATER_NO_SPLASH_HEIGHT;
+        contents = CG_PointContents(midlegs, -1);
+        if (contents & MASK_WATER) {
+            sSoundName += "wade";
+        } else {
+            sSoundName += "puddle";
+            iEffectNum = SFX_FOOT_PUDDLE;
+        }
+    } else {
+        surftype = trace.surfaceFlags & MASK_SURF_TYPE;
+        switch (surftype) {
+        case SURF_FOLIAGE:
+            sSoundName += "foliage";
+            iEffectNum = SFX_FOOT_GRASS;
+            break;
+        case SURF_SNOW:
+            sSoundName += "snow";
+            iEffectNum = SFX_FOOT_SNOW;
+            break;
+        case SURF_CARPET:
+            sSoundName += "carpet";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_SAND:
+            sSoundName += "sand";
+            iEffectNum = SFX_FOOT_SAND;
+            break;
+        case SURF_PUDDLE:
+            sSoundName += "puddle";
+            iEffectNum = SFX_FOOT_PUDDLE;
+            break;
+        case SURF_GLASS:
+            sSoundName += "glass";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_GRAVEL:
+            sSoundName += "gravel";
+            iEffectNum = SFX_FOOT_HEAVY_DUST;
+            break;
+        case SURF_MUD:
+            sSoundName += "mud";
+            iEffectNum = SFX_FOOT_MUD;
+            break;
+        case SURF_DIRT:
+            sSoundName += "dirt";
+            iEffectNum = SFX_FOOT_DIRT;
+            break;
+        case SURF_GRILL:
+            sSoundName += "grill";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_GRASS:
+            sSoundName += "grass";
+            iEffectNum = SFX_FOOT_GRASS;
+            break;
+        case SURF_ROCK:
+            sSoundName += "stone";
+            iEffectNum = SFX_FOOT_HEAVY_DUST;
+            break;
+        case SURF_PAPER:
+            sSoundName += "paper";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_WOOD:
+            sSoundName += "wood";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_METAL:
+            sSoundName += "metal";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        default:
+            sSoundName += "stone";
+            iEffectNum = SFX_FOOT_HEAVY_DUST;
+            break;
+        }
+    }
+
+    if (cg_debugFootsteps->integer) {
+        cgi.DPrintf("BodyFall: %s    volume: %.2f   effect = %i\n", sSoundName.c_str(), volume, iEffectNum);
+    }
+
+    commandManager.PlaySound(sSoundName, trace.endpos, -1, volume, -1, -1, 1);
+
+    if (iEffectNum != -1) {
+        sfxManager.MakeEffect_Angles(iEffectNum, trace.endpos, Vector(270, 0, 0));
+    }
 }
 
 /*

From 40e39776646eded73ccdc46a69a181e8072334ea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 00:15:51 +0200
Subject: [PATCH 0474/2040] Continue using entities even when attached to a
 turret, in 1.11 and below for backwards compatibility!

Fixes #140 where the MG42 objective in m1l1 would not trigger
---
 code/fgame/player.cpp | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 59e79c2f..b5e17d3f 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3438,20 +3438,44 @@ void Player::DoUse(Event *ev)
 
     num = getUseableEntities(touch, MAX_GENTITIES, true);
 
-    for (i = 0; i < num; i++) {
-        hit = &g_entities[touch[i]];
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        // Fixed in 2.0
+        //  Since 2.0, the loop stops when the player
+        //  uses a turret, this prevents the turret from being deleted
+        //  after being attached to the player
+        //
+        for (i = 0; i < num; i++) {
+            hit = &g_entities[touch[i]];
 
-        if (!hit->inuse) {
-            continue;
+            if (!hit->inuse) {
+                continue;
+            }
+
+            Event* event = new Event(EV_Use);
+            event->AddListener(this);
+
+            hit->entity->ProcessEvent(event);
+
+            if (m_pVehicle || m_pTurret) {
+                break;
+            }
         }
+    } else {
+        //
+        // Backward compatibility
+        // It still allows 1.11 SP to work properly
+        // Such as in m1l1 when the player must man the mounted machine gun
+        for (i = 0; i < num; i++) {
+            hit = &g_entities[touch[i]];
 
-        Event *event = new Event(EV_Use);
-        event->AddListener(this);
+            if (!hit->inuse) {
+                continue;
+            }
 
-        hit->entity->ProcessEvent(event);
+            Event* event = new Event(EV_Use);
+            event->AddListener(this);
 
-        if (m_pVehicle || m_pTurret) {
-            break;
+            hit->entity->ProcessEvent(event);
         }
     }
 

From 2df8ed10d06d018b82566f847874ab60e09fa75b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 14:56:30 +0200
Subject: [PATCH 0475/2040] Improves timeout checking, properly show the
 timeout menu and shutdown the server

---
 code/client/cl_main.cpp | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 0e0dbd46..41e3d57f 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2426,10 +2426,37 @@ void CL_CheckTimeout( void ) {
 		&& clc.state >= CA_CONNECTED && clc.state != CA_CINEMATIC
 	    && cls.realtime - clc.lastPacketTime > cl_timeout->value*1000) {
 		if (++cl.timeoutcount > 5) {	// timeoutcount saves debugger
-			Com_Printf ("\nServer connection timed out.\n");
-			Cbuf_AddText( "pushmenu servertimeout\n" );
-			CL_Disconnect();
-			return;
+			const char* info;
+			const char* maxclients;
+
+			info = &cl.gameState.stringData[cl.gameState.stringOffsets[CS_SERVERINFO]];
+			maxclients = Info_ValueForKey(info, "maxclients");
+			//
+			// Disconnect if the player isn't alone (single-player mode)
+			//
+			if (!maxclients || atoi(maxclients) != 1) {
+				qboolean bConsoleState;
+
+				bConsoleState = UI_ConsoleIsOpen();
+
+				Com_Printf("\nServer connection timed out.\n");
+				SV_Shutdown("\nServer connection timed out\n");
+
+				if (com_cl_running && com_cl_running->integer) {
+					CL_AbnormalDisconnect();
+					CL_FlushMemory();
+					CL_StartHunkUsers(qfalse);
+				}
+
+				UI_ForceMenuOff(qtrue);
+				UI_PushMenu("servertimeout");
+
+				if (bConsoleState) {
+					UI_OpenConsole();
+				} else {
+					UI_CloseConsole();
+				}
+			}
 		}
 	} else {
 		cl.timeoutcount = 0;

From 141574a0d71ae976afbf52d49d067e0736f19776 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:22:21 +0200
Subject: [PATCH 0476/2040] Ignore mouse events when paused

---
 code/client/cl_input.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index 7f763b44..fc52a69f 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -432,7 +432,7 @@ void CL_MouseEvent( int dx, int dy, int time ) {
 		if( cl.mousey > cls.glconfig.vidHeight )
 			cl.mousey = cls.glconfig.vidHeight;
 	}
-	else
+	else if ( !paused->integer )
 	{
 		cl.mouseDx[cl.mouseIndex] += dx;
 		cl.mouseDy[cl.mouseIndex] += dy;
@@ -999,7 +999,7 @@ void CL_SendCmd( void ) {
 	}
 
 	// don't send commands if paused
-	if ( com_sv_running->integer && paused->integer && paused->integer ) {
+	if ( com_sv_running->integer && paused->integer  ) {
 		return;
 	}
 

From cc716c3fa4577249d1d5b7b258dd02155ca92a45 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:22:34 +0200
Subject: [PATCH 0477/2040] Don't process loopsound yet when spawning

---
 code/fgame/entity.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 07f264a1..19159bfa 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3221,6 +3221,15 @@ void Entity::LoopSound(Event *ev)
         return;
     }
 
+    if (level.spawning) {
+        // If the server is currently spawning
+        // repost the event as loopsound wouldn't work properly
+        // on the client
+        Event* newev = new Event(*ev);
+        PostEvent(newev, level.frametime);
+        return;
+    }
+
     // Get parameters
 
     sound_name = ev->GetString(1);

From d7a5eb5d2f720c670191927f951aa8b7aefba836 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:26:35 +0200
Subject: [PATCH 0478/2040] Use LEVEL_WIDE_MIN_DIST instead of 10000 constant

---
 code/server/sv_snapshot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index f7503500..fed722de 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -643,7 +643,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 			continue;
 		}
 
-		if ((ent->s.loopSound && ent->s.loopSoundMinDist == 10000) || ent->s.renderfx & RF_VIEWMODEL) {
+		if ((ent->s.loopSound && ent->s.loopSoundMinDist == LEVEL_WIDE_MIN_DIST) || ent->s.renderfx & RF_VIEWMODEL) {
             // loopsound entities should be sent regardless
 			SV_AddEntToSnapshot(svEnt, ent, eNums, portalEnt, portalsky);
             continue;

From bbb54ea36dec5eb9f85354e14bddc948bf2b2c8a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:33:02 +0200
Subject: [PATCH 0479/2040] Uses LoopSounds() parameters instead of just the
 alias

---
 code/fgame/entity.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 19159bfa..95fbb02e 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3280,10 +3280,10 @@ void Entity::LoopSound(str sound_name, float volume, float min_dist, float max_d
             // Add the looping sound to the entity
 
             edict->s.loopSound        = gi.soundindex(name, aliasstreamed);
-            edict->s.loopSoundVolume  = aliasvolume;
-            edict->s.loopSoundMinDist = aliasmin_dist;
-            edict->s.loopSoundMaxDist = aliasmax_dist;
-            edict->s.loopSoundPitch   = aliaspitch;
+            edict->s.loopSoundVolume  = volume < 0 ? (aliasvolume) : (aliasvolume * volume);
+            edict->s.loopSoundMinDist = min_dist < 0 ? (aliasmin_dist) : (min_dist);
+            edict->s.loopSoundMaxDist = max_dist < 0 ? (aliasmax_dist) : (max_dist);
+            edict->s.loopSoundPitch   = pitch < 0 ? (aliaspitch) : (aliaspitch * pitch);
 
             // Local sound will always be heard
             edict->s.loopSoundFlags = aliaschannel == CHAN_LOCAL;

From f5aadbb788cf2e40f7294d6e8c4975df462a9370 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:38:02 +0200
Subject: [PATCH 0480/2040] If the loopSound has no origin, make it local

This should fix #309
---
 code/client/new/snd_main_new.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index c6ba1b66..7fd517d6 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "../snd_local.h"
+#include "../client.h"
 
 #if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
 
@@ -57,6 +58,13 @@ void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t s
     }
 
     // FIXME: unimplemented
+
+    if (VectorCompare(origin, vec3_origin)) {
+        // Consider it to be a local sound, uses the player origin
+        S_AddLoopingSound(cl.snap.ps.clientNum, cl.snap.ps.origin, velocity, sfxHandle);
+        return;
+    }
+
     S_AddLoopingSound(ENTITYNUM_WORLD, origin, velocity, sfxHandle);
 }
 

From 46b3f4eb5e6fa16dbf51d7145a8d066eb051e074 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:14:26 +0200
Subject: [PATCH 0481/2040] Adds `differentMap` parameter for G_ClientConnect,
 it clears the selected DM weapon.

On each map change, the player gets asked for the primary weapon like in 2.0 and above
---
 code/fgame/g_client.cpp | 12 ++++++++----
 code/fgame/g_local.h    |  2 +-
 code/fgame/g_public.h   |  2 +-
 code/server/sv_client.c |  2 +-
 code/server/sv_init.c   |  4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index a1020954..b7ffc894 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -855,7 +855,7 @@ to the server machine, but qfalse on map changes and tournement
 restarts.
 ============
 */
-const char *G_ClientConnect(int clientNum, qboolean firstTime)
+const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differentMap)
 {
     char      *ip, *port, *value;
     gclient_t *client;
@@ -863,7 +863,7 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
     char       userinfo[MAX_INFO_STRING];
 
     gi.DPrintf("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\n");
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return NULL;
     }
 
@@ -879,6 +879,7 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
     port = Info_ValueForKey(userinfo, "port");
 
     // FIXME: what is fucking wrong with G_FilterPacket...
+    // NOTE: IP banning is directly handled by the server
     //if ( G_FilterPacket( value ) ) {
     //	return "Banned IP";
     //}
@@ -903,6 +904,9 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
         G_InitSessionData(client, userinfo);
     } else {
         G_ReadSessionData(client);
+        if (differentMap) {
+            client->pers.dm_primary[0] = 0;
+        }
     }
 
     Q_strncpyz(client->pers.ip, ip, sizeof(client->pers.ip));
@@ -922,7 +926,7 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
 #endif
 
     // don't do the "xxx connected" messages if they were caried over from previous level
-    if (firstTime && g_gametype->integer) {
+    if (firstTime && g_gametype->integer != GT_SINGLE_PLAYER) {
         if (dedicated->integer) {
             gi.Printf("%s is preparing for deployment\n", client->pers.netname);
         }
@@ -971,7 +975,7 @@ void G_ClientBegin(gentity_t *ent, usercmd_t *cmd)
         } else {
             ent->client->pers.enterTime = level.svsFloatTime;
 
-            if (g_gametype->integer) {
+            if (g_gametype->integer != GT_SINGLE_PLAYER) {
                 // send effect if in a multiplayer game
                 if (dedicated->integer) {
                     gi.Printf("%s has entered the battle\n", ent->client->pers.netname);
diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index 73c8ad5a..1d2b21a2 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -423,7 +423,7 @@ void QDECL G_Error(errorParm_t type, const char *fmt, ...) __attribute__((noretu
 // g_client.c
 //
 void        G_BotConnect(int clientNum, const char* userinfo);
-const char *G_ClientConnect(int clientNum, qboolean firstTime);
+const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differentMap);
 void        G_ClientUserinfoChanged(gentity_t *ent, const char *userinfo);
 void        G_ClientDisconnect(gentity_t *ent);
 void        G_ClientBegin(gentity_t *ent, usercmd_t *cmd);
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 31a7b373..bf8dc73b 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -490,7 +490,7 @@ typedef struct gameExport_s {
 
     // return NULL if the client is allowed to connect, otherwise return
     // a text string with the reason for denial
-    const char *(*ClientConnect)(int clientNum, qboolean firstTime);
+    const char *(*ClientConnect)(int clientNum, qboolean firstTime, qboolean differentMap);
 
     void (*ClientBegin)(gentity_t *ent, usercmd_t *cmd);
     void (*ClientUserinfoChanged)(gentity_t *ent, const char *userinfo);
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index beacfbaa..a62031d3 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -496,7 +496,7 @@ gotnewcl:
 	Q_strncpyz( newcl->userinfo, userinfo, sizeof( newcl->userinfo ) );
 
 	// get the game a chance to reject this connection or modify the userinfo
-	denied = ge->ClientConnect( clientNum, qtrue );
+	denied = ge->ClientConnect( clientNum, qtrue, qfalse );
 
 	if ( denied ) {
 		NET_OutOfBandPrint( NS_SERVER, from, "droperror\n%s\n", denied );
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 3145e386..7af49781 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -805,7 +805,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 					|| Cvar_VariableIntegerValue( "g_gametype" ) == 0 )
 				{
 					// connect the client again
-					denied = ge->ClientConnect( i, qfalse );
+					denied = ge->ClientConnect( i, qfalse, qtrue );
 
 					p = ge->errorMessage;
 					if( p )
@@ -887,7 +887,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 				const char	*denied;
 
 				// connect the client again
-				denied = ge->ClientConnect( i, qfalse );
+				denied = ge->ClientConnect( i, qfalse, qfalse );
 
 				p = ge->errorMessage;
 				if( p )

From 15f2f6c79898a06a0111bf03e37d649c396bf709 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:16:14 +0200
Subject: [PATCH 0482/2040] Renamed g_session functions

---
 code/fgame/g_client.cpp  | 6 +++---
 code/fgame/g_local.h     | 4 ++--
 code/fgame/g_session.cpp | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index b7ffc894..aa87f11b 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -827,7 +827,7 @@ void G_BotConnect(int clientNum, const char *userinfo)
 
     // read the session data
     memset(client, 0, sizeof(*client));
-    G_InitSessionData(client, userinfo);
+    G_InitClientPersistant(client, userinfo);
 
     Q_strncpyz(client->pers.ip, "localhost", sizeof(client->pers.ip));
     client->pers.port = 0;
@@ -901,9 +901,9 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     // read or initialize the session data
     if (firstTime) {
         memset(client, 0, sizeof(*client));
-        G_InitSessionData(client, userinfo);
+        G_InitClientPersistant(client, userinfo);
     } else {
-        G_ReadSessionData(client);
+        G_ReadClientSessionData(client);
         if (differentMap) {
             client->pers.dm_primary[0] = 0;
         }
diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index 1d2b21a2..90b2c965 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -455,8 +455,8 @@ void  Svcmd_GameMem_f(void);
 //
 // g_session.c
 //
-void G_ReadSessionData(gclient_t *client);
-void G_InitSessionData(gclient_t *client, const char *userinfo);
+void G_ReadClientSessionData(gclient_t *client);
+void G_InitClientPersistant(gclient_t *client, const char *userinfo);
 
 void G_InitWorldSession(void);
 void G_WriteSessionData(void);
diff --git a/code/fgame/g_session.cpp b/code/fgame/g_session.cpp
index 7056c800..465e2405 100644
--- a/code/fgame/g_session.cpp
+++ b/code/fgame/g_session.cpp
@@ -58,7 +58,7 @@ G_ReadSessionData
 Called on a reconnect
 ================
 */
-void G_ReadSessionData( gclient_t *client )
+void G_ReadClientSessionData( gclient_t *client )
 {
 	cvar_t *session;
 
@@ -83,7 +83,7 @@ G_InitSessionData
 Called on a first-time connect
 ================
 */
-void G_InitSessionData( gclient_t *client, const char *userinfo )
+void G_InitClientPersistant( gclient_t *client, const char *userinfo )
 {
 	G_WriteClientSessionData( client );
 }

From 5482b31c6634f3f40ffa95ae59c7b34d629e5d0a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:18:14 +0200
Subject: [PATCH 0483/2040] Reads the `sv_privatePassword` value

---
 code/fgame/g_client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index aa87f11b..09d7d2f7 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -890,7 +890,7 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     if ((strcmp(ip, "localhost") != 0)) {
         // check for a password
         value = Info_ValueForKey(userinfo, "password");
-        if (password->string[0] && Q_stricmp(password->string, "none") && strcmp(password->string, value) != 0) {
+        if (strcmp(sv_privatePassword->string, value) != 0 && *password->string && strcmp(password->string, value) != 0) {
             return "Invalid password";
         }
     }

From d1ecd4a3c8c01542a899b92536bf7f2805273259 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:19:11 +0200
Subject: [PATCH 0484/2040] Don't initialize client persistant data during
 autosave

---
 code/fgame/g_client.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 09d7d2f7..4df3f97e 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -901,7 +901,9 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     // read or initialize the session data
     if (firstTime) {
         memset(client, 0, sizeof(*client));
-        G_InitClientPersistant(client, userinfo);
+        if (!game.autosaved) {
+            G_InitClientPersistant(client, userinfo);
+        }
     } else {
         G_ReadClientSessionData(client);
         if (differentMap) {

From a5691d777953e8c088732c639c46beac7d8c8ab4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 16 Jun 2024 19:46:14 +0200
Subject: [PATCH 0485/2040] Allows clients to join a single-player game

---
 code/fgame/g_client.cpp |  8 +++++---
 code/server/sv_client.c | 15 ++++++++++++---
 code/server/sv_init.c   |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 4df3f97e..50b0e8f5 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -863,9 +863,11 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     char       userinfo[MAX_INFO_STRING];
 
     gi.DPrintf("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\n");
-    if (g_gametype->integer == GT_SINGLE_PLAYER) {
-        return NULL;
-    }
+    // Removed in OPM
+    //  Accepts remote clients
+    //if (g_gametype->integer == GT_SINGLE_PLAYER) {
+    //    return NULL;
+    //}
 
     ent = &g_entities[clientNum];
 
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index a62031d3..a2868930 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -52,9 +52,11 @@ void SV_GetChallenge( netadr_t from ) {
 	challenge_t	*challenge;
 
 	// ignore if we are in single player
-	if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER ) {
-		return;
-	}
+	// Removed in OPM
+	//  Allow servers to accept players in a single-player game
+	//if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER ) {
+	//	return;
+	//}
 
 	challenge = FindChallenge(from, qtrue);
 
@@ -759,6 +761,13 @@ void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd ) {
 
 	// call the game begin function
 	ge->ClientBegin( ( gentity_t * )ent, cmd );
+
+	//
+	// Added in OPM
+	//  In a dedicated server, start the game when the first client enters the game
+	if (com_dedicated->integer) {
+		SV_ServerLoaded();
+	}
 }
 
 /*
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 7af49781..0f474265 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -915,7 +915,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 
 	UI_LoadResource( "*143" );
 
-	if( g_gametype->integer ) {
+	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
 		SV_ServerLoaded();
 	}
 }

From 40492daecd867f282f4abb72354cc75126b61721 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 16 Jun 2024 23:20:30 +0200
Subject: [PATCH 0486/2040] Avoid creating a new sound index when there is no
 active client

---
 code/server/sv_snd.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_snd.c b/code/server/sv_snd.c
index 8dab16dc..e51060f2 100644
--- a/code/server/sv_snd.c
+++ b/code/server/sv_snd.c
@@ -70,9 +70,17 @@ void SV_Sound( vec3_t *org, int entnum, int channel, const char *sound_name, flo
 {
     int i;
 
-    for (i = 0; i < sv_maxclients->integer; i++)
+    for (i = 0; i < svs.iNumClients; i++)
     {
         client_t* client = &svs.clients[i];
+		if (client->state != CS_ACTIVE) {
+			continue;
+        }
+
+		if (client->number_of_server_sounds >= MAX_SERVER_SOUNDS) {
+			continue;
+		}
+
         SV_ClientSound(client, org, entnum, channel, SV_SoundIndex(sound_name, streamed), volume, mindist, pitch, maxdist, streamed);
     }
 }

From a7df73073d4bf9bf0902710e9151b9954588e739 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 21 Jun 2024 20:54:09 +0200
Subject: [PATCH 0487/2040] Adds a condition to check if static model poly can
 be rendered

---
 code/renderer/tr_staticmodels.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 03ac0b85..6b8ca1e4 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -489,6 +489,10 @@ void RB_StaticMesh(staticSurface_t* staticSurf) {
     int					baseIndex, baseVertex;
     short				collapse[1000];
 
+    if (!r_drawstaticmodelpoly->integer) {
+        return;
+    }
+
     assert(backEnd.currentStaticModel);
     tiki = backEnd.currentStaticModel->tiki;
     surf = staticSurf->surface;

From 64626a767c3b51c0b57b475ed9f62bc199f5b086 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 21 Jun 2024 21:48:55 +0200
Subject: [PATCH 0488/2040] Fixes entities not being rendered after number 1023

This fixes #310 where some static models would not be rendered, making it look like there are invisible walls.
---
 code/renderer/tr_local.h | 4 ++--
 code/renderer/tr_main.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index c2bfa15e..02d29a24 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1189,11 +1189,11 @@ the bits are allocated as follows:
 2-6   : fog index
 0-1   : dlightmap index
 */
-#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.0
+#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.30
 #define	QSORT_ENTITYNUM_SHIFT	8
 #define	QSORT_FOGNUM_SHIFT		2
 #define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.0
+#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.30
 
 extern	int			gl_filter_min, gl_filter_max;
 
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 96a7445f..899581fd 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1384,7 +1384,7 @@ R_DecomposeSort
 */
 void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel) {
 	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
-	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 1023;
+	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 4095;
 	*dlightMap = sort & 15;
 	*bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
 }

From 907ff36018d21075ed61913b55f7ae91193618cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 21 Jun 2024 21:49:13 +0200
Subject: [PATCH 0489/2040] Fixes `r_showstaticbboxes` freezing the game

---
 code/renderer/tr_staticmodels.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 6b8ca1e4..97cc91c6 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -294,7 +294,7 @@ R_AddStaticModelSurfaces
 */
 void R_AddStaticModelSurfaces(void) {
     cStaticModelUnpacked_t* SM;
-    int i, j;
+    int i, j, k;
     int ofsStaticData;
     int iRadiusCull;
     dtiki_t* tiki;
@@ -418,10 +418,10 @@ void R_AddStaticModelSurfaces(void) {
                     if (r_showstaticbboxes->integer) {
                         vec3_t vMins, vMaxs;
 
-                        for (i = 0; i < 3; i++)
+                        for (k = 0; k < 3; k++)
                         {
-                            vMins[i] = tiki->a->mins[i] * tiki->load_scale * SM->scale;
-                            vMaxs[i] = tiki->a->maxs[i] * tiki->load_scale * SM->scale;
+                            vMins[k] = tiki->a->mins[k] * tiki->load_scale * SM->scale;
+                            vMaxs[k] = tiki->a->maxs[k] * tiki->load_scale * SM->scale;
                         }
 
                         R_DebugRotatedBBox(SM->origin, SM->angles, vMins, vMaxs, 1.0, 0.0, 1.0, 0.75);

From d9dc34f06d97be36da409a0ddadd1dd6f8f3aa5d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 21 Jun 2024 22:02:11 +0200
Subject: [PATCH 0490/2040] Checks for `AGEN_TIKI_DIST_FADE` and
 `AGEN_ONE_MINUS_TIKI_DIST_FADE` for static models

---
 code/renderer/tr_staticmodels.cpp | 36 ++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 97cc91c6..b1f2d57f 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -358,6 +358,8 @@ void R_AddStaticModelSurfaces(void) {
                 skelSurfaceGame_t* surface;
                 staticSurface_t* s_surface;
                 shader_t* shader;
+                float fDist;
+                vec3_t vDelta;
 
                 if (!skelmodel) {
                     continue;
@@ -383,20 +385,34 @@ void R_AddStaticModelSurfaces(void) {
 
                     shader = tr.shaders[dsurf->hShader[0]];
 
-                    if (shader->numUnfoggedPasses == 1)
+                    if (shader->numUnfoggedPasses == 1 && !r_nocull->integer)
                     {
-                        if (shader->unfoggedStages[0]->alphaGen == AGEN_DIST_FADE)
-                        {
+                        switch (shader->unfoggedStages[0]->alphaGen) {
+                        case AGEN_DIST_FADE:
                             if (R_DistanceCullPointAndRadius(shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius) == CULL_OUT) {
                                 continue;
                             }
-						}
-						else if (shader->unfoggedStages[0]->alphaGen == AGEN_ONE_MINUS_DIST_FADE)
-						{
-							if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius) == CULL_IN) {
-								continue;
-							}
-						}
+                            break;
+                        case AGEN_ONE_MINUS_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius) == CULL_IN) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.ori.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) >= Square(fDist)) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.ori.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) <= Square(shader->fDistNear)) {
+                                continue;
+                            }
+                            break;
+                        }
                     }
 
                     SM->bRendered = qtrue;

From 835c0b0d9a282c0b660337097ca82354278a8bac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 15:28:58 +0200
Subject: [PATCH 0491/2040] Adds constants for LOD curve values

---
 code/tiki/tiki_shared.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index 1834c5b5..39f8df0b 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -98,6 +98,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MAX_TIKI_ALIASES      4095
 #define MAX_GLOBAL_FROM_LOCAL 200
 
+#define MAX_LOD_CURVE_POINTS  5
+#define MAX_LOD_CURVE_CONSTS  4
+
 typedef struct AliasList_s     AliasList_t;
 typedef struct AliasListNode_s AliasListNode_t;
 
@@ -415,8 +418,8 @@ typedef struct {
 typedef struct lodControl_s {
     float                    minMetric;
     float                    maxMetric;
-    lodCurvePoint_t          curve[5];
-    lodCurvePointConstants_t consts[4];
+    lodCurvePoint_t          curve[MAX_LOD_CURVE_POINTS];
+    lodCurvePointConstants_t consts[MAX_LOD_CURVE_CONSTS];
 } lodControl_t;
 
 typedef struct {

From f41e92de6e0548ac9bfb6f3b1694254cc8008412 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 15:34:00 +0200
Subject: [PATCH 0492/2040] Fixes possible memory corruption when generating a
 LOD curve

---
 code/tiki/tiki_skel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 17e649b4..24028e27 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -762,7 +762,7 @@ void GetLODFile(skelcache_t *cache)
         LOD->curve[3].val = (float)cache->skel->lodIndex[1];
         LOD->curve[4].pos = 1.0f;
 
-        for (i = 9; cache->skel->lodIndex[i] > cache->skel->lodIndex[3]; i--) {
+        for (i = TIKI_SKEL_LOD_INDEXES; cache->skel->lodIndex[i] > cache->skel->lodIndex[3]; i--) {
             if (i <= 2) {
                 break;
             }
@@ -770,8 +770,8 @@ void GetLODFile(skelcache_t *cache)
 
         LOD->curve[4].val = (float)cache->skel->lodIndex[i];
 
-        for (i = 8; i >= 0; i--) {
-            if (LOD->curve[i - 1].pos > LOD->curve[i].pos) {
+        for (i = 1; i < MAX_LOD_CURVE_POINTS - 1; i++) {
+            if (LOD->curve[i].pos < LOD->curve[i - 1].pos) {
                 LOD->curve[i].val = LOD->curve[i - 1].pos;
             }
         }

From 2a485a6b693a2de10d9a7c64c6339a9f8a95a5dd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 15:34:38 +0200
Subject: [PATCH 0493/2040] Fixes the endianness when loading LOD from file

---
 code/tiki/tiki_skel.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 24028e27..0f183dbe 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -748,6 +748,20 @@ void GetLODFile(skelcache_t *cache)
         LOD = (lodControl_t *)TIKI_Alloc(sizeof(lodControl_t));
         memcpy(LOD, buf, length);
         TIKI_FreeFile(buf);
+
+        LOD->minMetric = LittleFloat(LOD->minMetric);
+        LOD->maxMetric = LittleFloat(LOD->maxMetric);
+
+        for (i = 0; i < MAX_LOD_CURVE_POINTS; i++) {
+            LOD->curve[i].pos = LittleFloat(LOD->curve[i].pos);
+            LOD->curve[i].val = LittleFloat(LOD->curve[i].val);
+        }
+
+        for (i = 0; i < MAX_LOD_CURVE_CONSTS; i++) {
+            LOD->consts[i].base = LittleFloat(LOD->consts[i].base);
+            LOD->consts[i].scale = LittleFloat(LOD->consts[i].scale);
+            LOD->consts[i].cutoff = LittleFloat(LOD->consts[i].cutoff);
+        }
     } else {
         LOD               = (lodControl_t *)TIKI_Alloc(sizeof(lodControl_t));
         LOD->minMetric    = 1.0f;

From 11349f9ad5586a197b0d48c631ffb6a0e45da9aa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:08:33 +0200
Subject: [PATCH 0494/2040] Fixes the source pos access for `ENUM_if_statement`
 (out of bounds index)

---
 code/script/scriptcompiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 928de100..a7acb868 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -1217,7 +1217,7 @@ __emit:
 
     case ENUM_if_statement:
         EmitValue(val.node[1]);
-        EmitVarToBool(val.node[4].sourcePosValue);
+        EmitVarToBool(val.node[3].sourcePosValue);
         EmitIfJump(val.node[2], val.node[3].sourcePosValue);
         break;
 

From bef1b456e156d57306e1609aa03cc9025532aa28 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:10:36 +0200
Subject: [PATCH 0495/2040] Initialize all Ammo members

---
 code/fgame/ammo.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/code/fgame/ammo.cpp b/code/fgame/ammo.cpp
index a6dc4869..de9b8c53 100644
--- a/code/fgame/ammo.cpp
+++ b/code/fgame/ammo.cpp
@@ -138,7 +138,9 @@ CLASS_DECLARATION(Class, Ammo, NULL) {
 };
 
 Ammo::Ammo()
-
+    : amount(0)
+    , maxamount(0)
+    , name_index(0)
 {
     if (LoadingSavegame) {
         // all data will be setup by the archive function
@@ -150,7 +152,6 @@ Ammo::Ammo()
 }
 
 void Ammo::setAmount(int a)
-
 {
     amount = a;
 
@@ -160,38 +161,32 @@ void Ammo::setAmount(int a)
 }
 
 int Ammo::getAmount(void)
-
 {
     return amount;
 }
 
 void Ammo::setMaxAmount(int a)
-
 {
     maxamount = a;
 }
 
 int Ammo::getMaxAmount(void)
-
 {
     return maxamount;
 }
 
 void Ammo::setName(str n)
-
 {
     name       = n;
     name_index = gi.itemindex(name) + CS_WEAPONS;
 }
 
 str Ammo::getName(void)
-
 {
     return name;
 }
 
 int Ammo::getIndex(void)
-
 {
     return name_index;
 }

From e207715b5e2186eac826d8d7b0a5be8f97fd1af8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:12:29 +0200
Subject: [PATCH 0496/2040] Initialize `m_iLastTiresUpdate`

---
 code/fgame/vehicle.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index b521598c..158ee1dd 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -1174,6 +1174,7 @@ Vehicle::Vehicle()
     m_sAnimationSet = "";
     m_sSoundSet     = "";
 
+    m_iLastTiresUpdate = -1;
     for (i = 0; i < NUM_VEHICLE_TIRES; i++) {
         m_vTireEnd[i] = origin;
         m_bTireHit[i] = false;

From 0b747bf1c5fb386705f7297fb32283c1b9a32e2c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:39:00 +0200
Subject: [PATCH 0497/2040] Use `memmove` rather than `strcpy` for removing key
 values

---
 code/qcommon/q_shared.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 7dd4afa7..91622016 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1854,7 +1854,9 @@ void Info_RemoveKey( char *s, const char *key ) {
 
 		if (!strcmp (key, pkey) )
 		{
-			strcpy (start, s);	// remove this part
+			//strcpy (start, s);	// remove this part
+			// Fixed in OPM
+			memmove(start, s, strlen(s));
 			return;
 		}
 

From e4d20c3fa1185e072bb45600ab62585b381d32b9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:39:08 +0200
Subject: [PATCH 0498/2040] Initialize explosion flash

---
 code/fgame/weaputils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index fb737103..640104e5 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1530,6 +1530,11 @@ Explosion::Explosion()
         return;
     }
 
+    flash_r            = 0;
+    flash_g            = 0;
+    flash_b            = 0;
+    flash_a            = 0;
+    flash_radius       = 0;
     radius             = 0;
     constant_damage    = false;
     damage_every_frame = false;

From cb208b9ad2645bd26cbccec9e993b86266de20dc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:39:26 +0200
Subject: [PATCH 0499/2040] Initialize the message buffer to avoid leaking
 private data

---
 code/server/sv_snapshot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index fed722de..fb4f82d2 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1076,7 +1076,7 @@ Also called by SV_FinalMessage
 =======================
 */
 void SV_SendClientSnapshot( client_t *client ) {
-	byte		msg_buf[MAX_MSGLEN];
+	byte		msg_buf[MAX_MSGLEN]{ 0 };
 	msg_t		msg;
 
 	// build the snapshot

From dfb6c37c9e6cab7714698e14354f68ef6747362f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:42:28 +0200
Subject: [PATCH 0500/2040] Don't copy the server name if it's from the same
 string address

---
 code/server/sv_init.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 0f474265..0faebf3a 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -573,7 +573,11 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 	
 	differentmap = qtrue;
 
-	strncpy( svs.rawServerName, server, sizeof( svs.rawServerName ) );
+	if (svs.rawServerName != server) {
+		// Fixed in OPM
+		//  Make sure to not copy from the same string...
+		strncpy( svs.rawServerName, server, sizeof( svs.rawServerName ) );
+	}
 
 	// check for a spawn position
 	spawnpos = strchr( server, '$' );

From 5192d36f8127bc2b0707db835b247cc61a29a280 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:43:03 +0200
Subject: [PATCH 0501/2040] Fixes gametype incorrectly checked in
 `G_InitWorldSession`

---
 code/fgame/g_session.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/fgame/g_session.cpp b/code/fgame/g_session.cpp
index 465e2405..bbd3a076 100644
--- a/code/fgame/g_session.cpp
+++ b/code/fgame/g_session.cpp
@@ -96,16 +96,13 @@ G_InitWorldSession
 ==================
 */
 void G_InitWorldSession( void ) {
-	char	s[MAX_STRING_CHARS];
-	int			gt;
+	int gt;
 
-	cvar_t *v = gi.Cvar_Get( "session", "", 0 );
-
-	gt = atoi( s );
+	cvar_t *v = gi.Cvar_Get( "session", "-1", 0 );
 	
 	// if the gametype changed since the last session, don't use any
 	// client sessions
-	if ( g_gametype->integer != gt ) {
+	if ( g_gametype->integer != v->integer ) {
 		G_Printf( "Gametype changed, clearing session data.\n" );
 	}
 }

From 186d7a12e570614a3352e880b966fefd6b500976 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 16:51:20 +0200
Subject: [PATCH 0502/2040] typo

---
 code/server/sv_snapshot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index fb4f82d2..fe190bca 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1076,7 +1076,7 @@ Also called by SV_FinalMessage
 =======================
 */
 void SV_SendClientSnapshot( client_t *client ) {
-	byte		msg_buf[MAX_MSGLEN]{ 0 };
+	byte		msg_buf[MAX_MSGLEN] = { 0 };
 	msg_t		msg;
 
 	// build the snapshot

From 01d938b5ba8047dd8a82bf7403cfb9c66a050854 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 19:03:04 +0200
Subject: [PATCH 0503/2040] Fixes some variables being uninitialized

---
 code/fgame/actor.cpp      | 5 +++++
 code/fgame/sentient.cpp   | 3 ++-
 code/server/sv_snapshot.c | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index f74215c2..61fd1a3a 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2952,6 +2952,11 @@ Actor::Actor()
     }
 
     mVoiceType = -1;
+
+    //
+    // Added in OPM
+    //
+    m_bSilent = false;
 }
 
 /*
diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 94305ef4..900e6da7 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -690,7 +690,8 @@ void Sentient::EventGiveDynItem(Event *ev)
 }
 
 Sentient::Sentient()
-    : m_bIsAnimal(false)
+    : mAccuracy(0.2f)
+    , m_bIsAnimal(false)
 {
     SentientList.AddObject((Sentient *)this);
     entflags |= ECF_SENTIENT;
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index fe190bca..7ac89133 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1076,7 +1076,7 @@ Also called by SV_FinalMessage
 =======================
 */
 void SV_SendClientSnapshot( client_t *client ) {
-	byte		msg_buf[MAX_MSGLEN] = { 0 };
+	byte		msg_buf[MAX_MSGLEN];
 	msg_t		msg;
 
 	// build the snapshot
@@ -1088,6 +1088,7 @@ void SV_SendClientSnapshot( client_t *client ) {
 		return;
 	}
 
+	memset(msg_buf, 0, sizeof(msg_buf));
 	MSG_Init (&msg, msg_buf, sizeof(msg_buf));
 	msg.allowoverflow = qtrue;
 

From 2f48ca6adb5c09ecf896b76b1695b220ae24efc3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 19:03:27 +0200
Subject: [PATCH 0504/2040] Adds assertion check to check if top stack is out
 of bounds

---
 code/script/scriptvm.cpp | 15 ++++++++++-----
 code/script/scriptvm.h   |  9 +++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 168ce2a3..6b614acd 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -79,6 +79,7 @@ ScriptVMStack::ScriptVMStack()
     : localStack(nullptr)
     , stackBottom(nullptr)
     , pTop(nullptr)
+    , m_bMarkStack(false)
 {}
 
 ScriptVMStack::ScriptVMStack(size_t stackSize)
@@ -157,11 +158,13 @@ ScriptVariable& ScriptVMStack::SetTop(ScriptVariable& newTop)
 
 ScriptVariable& ScriptVMStack::GetTop() const
 {
+    assert(m_bMarkStack || pTop < stackBottom);
     return *pTop;
 }
 
 ScriptVariable& ScriptVMStack::GetTop(size_t offset) const
 {
+    assert(m_bMarkStack || (pTop + offset) < stackBottom);
     return *(pTop + offset);
 }
 
@@ -210,23 +213,27 @@ ScriptVariable& ScriptVMStack::PopAndGet(size_t offset)
 
 ScriptVariable& ScriptVMStack::Push()
 {
+    assert(!m_bMarkStack && (pTop + 1) < stackBottom);
     return *(pTop++);
 }
 
 ScriptVariable& ScriptVMStack::Push(size_t offset)
 {
     ScriptVariable& old = *pTop;
+    assert(!m_bMarkStack && (pTop + offset) < stackBottom);
     pTop += offset;
     return old;
 }
 
 ScriptVariable& ScriptVMStack::PushAndGet()
 {
+    assert(!m_bMarkStack && (pTop + 1) < stackBottom);
     return *++pTop;
 }
 
 ScriptVariable& ScriptVMStack::PushAndGet(size_t offset)
 {
+    assert(!m_bMarkStack && (pTop + offset) < stackBottom);
     pTop += offset;
     return *pTop;
 }
@@ -305,7 +312,6 @@ ScriptVM::ScriptVM()
     m_pOldData    = NULL;
     m_OldDataSize = 0;
 
-    m_bMarkStack = false;
     m_StackPos   = NULL;
 }
 
@@ -333,7 +339,6 @@ ScriptVM::ScriptVM(ScriptClass *scriptClass, unsigned char *pCodePos, ScriptThre
     m_pOldData    = NULL;
     m_OldDataSize = 0;
 
-    m_bMarkStack = false;
     m_StackPos   = NULL;
 
     m_ScriptClass->AddThread(this);
@@ -1081,7 +1086,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 Director.cmdCount = 0;
             }
 
-            if (!m_bMarkStack) {
+            if (!m_VMStack.m_bMarkStack) {
                 /*
 				assert(pTop >= localStack && pTop < localStack + localStackSize);
 				if (pTop < localStack)
@@ -1549,7 +1554,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_MARK_STACK_POS:
                 m_StackPos   = &m_VMStack.GetTop();
-                m_bMarkStack = true;
+                m_VMStack.m_bMarkStack = true;
                 break;
 
             case OP_STORE_PARAM:
@@ -1564,7 +1569,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_RESTORE_STACK_POS:
                 m_VMStack.SetTop(*m_StackPos);
-                m_bMarkStack = false;
+                m_VMStack.m_bMarkStack = false;
                 break;
 
             case OP_STORE_ARRAY:
diff --git a/code/script/scriptvm.h b/code/script/scriptvm.h
index 2d74153a..7f4b0e6c 100644
--- a/code/script/scriptvm.h
+++ b/code/script/scriptvm.h
@@ -123,7 +123,12 @@ private:
     /** The local stack size. */
     ScriptVariable *stackBottom;
     /** Variable from the top stack of the local stack. */
-    ScriptVariable *pTop;
+    ScriptVariable* pTop;
+
+public:
+    /** Whether or not the stack is marked. */
+    /** changed by OP_MARK_STACK_POS and OP_RESTORE_STACK_POS */
+    bool m_bMarkStack;
 };
 
 class ScriptVM
@@ -159,7 +164,7 @@ public:
     // parameters variables
     ScriptVariable *m_pOldData; // old fastEvent data, to cleanup
     int             m_OldDataSize;
-    bool            m_bMarkStack; // changed by OP_MARK_STACK_POS and OP_RESTORE_STACK_POS
+    //bool            m_bMarkStack; // changed by OP_MARK_STACK_POS and OP_RESTORE_STACK_POS
     Event           fastEvent;    // parameter list, set when the VM is executed
 
 private:

From 13197acb3ae09dc729bc8cc0fa5912c22971f20c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 19:17:58 +0200
Subject: [PATCH 0505/2040] Uses a `signed char` instead of a `char` for opcode
 stack offset. On some platforms like ARM, `char` is unsigned by default

This fixes #311 where a memory corruption that occurred in ARM was caused because of insufficient ScriptVM stack size. The stack size was incorrectly calculated because the stack offset was using unsigned values instead of signed in ARM.
---
 code/script/scriptcompiler.cpp | 2 +-
 code/script/scriptcompiler.h   | 2 +-
 code/script/scriptopcodes.h    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index a7acb868..eef31697 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -77,7 +77,7 @@ unsigned char ScriptCompiler::PrevOpcode()
     return prev_opcodes[prev_opcode_pos].opcode;
 }
 
-char ScriptCompiler::PrevVarStackOffset()
+signed char ScriptCompiler::PrevVarStackOffset()
 {
     return prev_opcodes[prev_opcode_pos].VarStackOffset;
 }
diff --git a/code/script/scriptcompiler.h b/code/script/scriptcompiler.h
index 81e85be2..42203b01 100644
--- a/code/script/scriptcompiler.h
+++ b/code/script/scriptcompiler.h
@@ -77,7 +77,7 @@ public:
     void Reset();
 
     unsigned char PrevOpcode();
-    char          PrevVarStackOffset();
+    signed char   PrevVarStackOffset();
     void          AbsorbPrevOpcode();
     void          ClearPrevOpcode();
     void          AccumulatePrevOpcode(int opcode, int iVarStackOffset);
diff --git a/code/script/scriptopcodes.h b/code/script/scriptopcodes.h
index 62ade8fd..ddddfb43 100644
--- a/code/script/scriptopcodes.h
+++ b/code/script/scriptopcodes.h
@@ -50,7 +50,7 @@ typedef struct {
 
 typedef struct {
     unsigned char opcode;
-    char          VarStackOffset;
+    signed char   VarStackOffset;
 } opcode_info_t;
 
 typedef enum {

From 1f0f5764a8146e8115a22cc9597e244ff3692f2b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Jun 2024 21:41:28 +0200
Subject: [PATCH 0506/2040] Added PathInfo() constructor initialization

---
 code/fgame/navigate.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 8d6934df..69c3af2e 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -103,9 +103,20 @@ public:
     vec2_t dir;
 
 public:
+    PathInfo();
+
     void Archive(Archiver& arc);
 };
 
+
+inline PathInfo::PathInfo()
+    : bAccurate(false)
+    , point{ 0, 0, 0 }
+    , dist(0)
+    , dir{ 0, 0 }
+{
+}
+
 inline void PathInfo::Archive(Archiver& arc)
 {
     arc.ArchiveBool(&bAccurate);

From 9407b64fe3726a136547af6b9cf40c077e161db1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Jun 2024 00:18:22 +0200
Subject: [PATCH 0507/2040] Q_strncpyz: don't copy if the src is the same as
 the dest

---
 code/qcommon/q_shared.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 91622016..b9d679a0 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1195,18 +1195,24 @@ Safe strncpy that ensures a trailing zero
 =============
 */
 void Q_strncpyz( char *dest, const char *src, size_t destsize ) {
-  if ( !dest ) {
-    Com_Error( ERR_FATAL, "Q_strncpyz: NULL dest" );
-  }
-	if ( !src ) {
-		Com_Error( ERR_FATAL, "Q_strncpyz: NULL src" );
-	}
-	if ( destsize < 1 ) {
-		Com_Error(ERR_FATAL,"Q_strncpyz: destsize < 1" ); 
-	}
+    if ( !dest ) {
+        Com_Error( ERR_FATAL, "Q_strncpyz: NULL dest" );
+    }
 
-	strncpy( dest, src, destsize-1 );
-  dest[destsize-1] = 0;
+    if ( !src ) {
+        Com_Error( ERR_FATAL, "Q_strncpyz: NULL src" );
+    }
+
+    if ( destsize < 1 ) {
+        Com_Error( ERR_FATAL, "Q_strncpyz: destsize < 1" );
+    }
+
+    if ( dest == src ) {
+        return;
+    }
+
+    strncpy( dest, src, destsize - 1 );
+    dest[ destsize - 1 ] = 0;
 }
                  
 int Q_stricmpn( const char *s1, const char *s2, size_t n ) {

From 9d654faa3ddcd1379cc772685690f9ae0ae629a7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Jun 2024 00:24:20 +0200
Subject: [PATCH 0508/2040] As `m_BlockedPaths` is an array of `pathway_ref`,
 the proper `delete` call must be used

---
 code/fgame/entity.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 95fbb02e..547c3061 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -1847,8 +1847,8 @@ Entity::~Entity()
     }
 
     if (m_BlockedPaths) {
-        delete m_BlockedPaths;
-        m_BlockedPaths = 0;
+        delete[] m_BlockedPaths;
+        m_BlockedPaths = NULL;
     }
 
     level.FreeEdict(edict);
@@ -5643,7 +5643,7 @@ void Entity::ConnectPaths(void)
 
     m_iNumBlockedPaths = 0;
     if (m_BlockedPaths) {
-        delete m_BlockedPaths;
+        delete[] m_BlockedPaths;
         m_BlockedPaths = NULL;
     }
 }

From 0a6c745ffb35be67baa23c6f40e4c050be5df39d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Jun 2024 17:10:58 +0200
Subject: [PATCH 0509/2040] Use VectorNormalize() instead of VectorNormalize2()

---
 code/qcommon/cm_polylib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/cm_polylib.c b/code/qcommon/cm_polylib.c
index 569b0299..5450c6df 100644
--- a/code/qcommon/cm_polylib.c
+++ b/code/qcommon/cm_polylib.c
@@ -236,7 +236,7 @@ winding_t *BaseWindingForPlane (vec3_t normal, vec_t dist)
 
 	v = DotProduct (vup, normal);
 	VectorMA (vup, -v, normal, vup);
-	VectorNormalize2(vup, vup);
+	VectorNormalize(vup);
 		
 	VectorScale (normal, dist, org);
 	

From 303ed30a3813c1fbad188fb164fddbb384b6485d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Jun 2024 17:19:52 +0200
Subject: [PATCH 0510/2040] Don't remove the facet is there is no border
 planeCM_PlaneEqual

---
 code/qcommon/cm_patch.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index 67175192..17b9e5de 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -766,10 +766,6 @@ static qboolean CM_ValidateFacet( facet_t *facet ) {
 	Vector4Copy( planes[ facet->surfacePlane ].plane, plane );
 	w = BaseWindingForPlane( plane,  plane[3] );
 	for ( j = 0 ; j < facet->numBorders && w ; j++ ) {
-		if ( facet->borderPlanes[j] == -1 ) {
-			FreeWinding( w );
-			return qfalse;
-		}
 		Vector4Copy( planes[ facet->borderPlanes[j] ].plane, plane );
 		if ( !facet->borderInward[j] ) {
 			VectorSubtract( vec3_origin, plane, plane );
@@ -790,12 +786,6 @@ static qboolean CM_ValidateFacet( facet_t *facet ) {
 		if ( bounds[1][j] - bounds[0][j] > MAX_MAP_BOUNDS ) {
 			return qfalse;		// we must be missing a plane
 		}
-		if ( bounds[0][j] >= MAX_MAP_BOUNDS ) {
-			return qfalse;
-		}
-		if ( bounds[1][j] <= -MAX_MAP_BOUNDS ) {
-			return qfalse;
-		}
 	}
 	return qtrue;		// winding is fine
 }
@@ -1314,7 +1304,7 @@ void CM_TracePointThroughPatchCollide( traceWork_t *tw, const struct patchCollid
 		}
 		for ( j = 0 ; j < facet->numBorders ; j++ ) {
 			k = facet->borderPlanes[j];
-			if ( frontFacing[k] ^ facet->borderInward[j] ) {
+			if ( frontFacing[k] != facet->borderInward[j] ) {
 				if ( intersection[k] > intersect ) {
 					break;
 				}

From 563182c14c4510516b8354f7fe8bb3e8b1ce91f2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Jun 2024 17:25:23 +0200
Subject: [PATCH 0511/2040] Added FloatRoundedBitError() (currently unused)

---
 code/qcommon/q_math.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index 222b31e0..f81c121c 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -4136,4 +4136,24 @@ float PointToSegmentDistanceSquared(const vec3_t origin, const vec3_t a, const v
 	}
 
     return VectorLengthSquared(final);
-}
\ No newline at end of file
+}
+
+/*
+=================
+FloatRoundedBitError
+
+On x86 with FP87, some float operations may have results that are off by 1 bit.
+This returns whether or not the operation lost 1 bit.
+=================
+*/
+qboolean FloatRoundedBitError() {
+    float a, b, c;
+    float value;
+
+    a = 91.0000610;
+    b = 40.0000038;
+    c = 0.00005;
+    value = a * b + c;
+
+    return value != 3640.00269f;
+}

From cda6225659d9c99da2be70e4cc52fa068dcf0e23 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Jun 2024 17:26:07 +0200
Subject: [PATCH 0512/2040] Adds a workaround against a bit that was lost on
 x86 with FP87.

This fixes #312 where a rounding error caused facets to be removed due to windings points being outside of the epsilon
---
 code/qcommon/cm_polylib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/cm_polylib.c b/code/qcommon/cm_polylib.c
index 5450c6df..bed23de9 100644
--- a/code/qcommon/cm_polylib.c
+++ b/code/qcommon/cm_polylib.c
@@ -440,9 +440,9 @@ void ChopWindingInPlace (winding_t **inout, vec3_t normal, vec_t dist, vec_t eps
 		dot = DotProduct (in->p[i], normal);
 		dot -= dist;
 		dists[i] = dot;
-		if (dot > epsilon)
+		if ((dot + 0.0005) > epsilon)
 			sides[i] = SIDE_FRONT;
-		else if (dot < -epsilon)
+		else if ((dot - 0.0005) < -epsilon)
 			sides[i] = SIDE_BACK;
 		else
 		{

From d709dda87a50c4499d2c718404a967662bf83514 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 30 Jun 2024 23:57:32 +0200
Subject: [PATCH 0513/2040] Use shader's distance range instead of the portal
 range

---
 code/renderer/tr_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 899581fd..968228b7 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1059,7 +1059,7 @@ qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int
 
 	if (shader->fDistRange > 0.0)
 	{
-		if (shortest > (tess.shader->portalRange * tess.shader->portalRange))
+		if (shortest > Square(shader->fDistRange))
 		{
 			return qtrue;
 		}

From 408c90134299c12343be77c87589a8c114b983ec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 30 Jun 2024 23:58:10 +0200
Subject: [PATCH 0514/2040] Fixes skyboxSpeed using an integer rather than a
 float

This fixes #313 where the skybox would be misplaced
---
 code/fgame/worldspawn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index b91f32eb..07b68725 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -925,12 +925,12 @@ void World::SetRenderTerrain(Event *ev)
 
 void World::GetSkyboxSpeed(Event *ev)
 {
-    ev->AddInteger(skybox_speed);
+    ev->AddFloat(skybox_speed);
 }
 
 void World::SetSkyboxSpeed(Event *ev)
 {
-    skybox_speed = ev->GetInteger(1);
+    skybox_speed = ev->GetFloat(1);
 }
 
 void World::SetSkyAlpha(Event *ev)

From 87baa69d7cb03d5953a972a267bfb651e851d900 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 00:20:33 +0200
Subject: [PATCH 0515/2040] Fixes incorrect lighting color normalization

This fixes #314 where mark colors would have their values warped back to 0, making holes blue
---
 code/renderer/tr_light.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 804f096d..2a8dd722 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -895,7 +895,7 @@ void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOr
     VectorScale(vLight, tr.overbrightMult, vLight);
 
     if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-        float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
+        float scale = 255.0 / fmax(vLight[0], fmax(vLight[1], vLight[2]));
         VectorScale(vLight, scale, vLight);
     }
 }
@@ -945,7 +945,7 @@ static int RB_GetEntityGridLighting()
 
 	// normalize
 	if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-		float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
+		float scale = 255.0 / fmax(vLight[0], fmax(vLight[1], vLight[2]));
 		VectorScale(vLight, scale, vLight);
 	}
 

From 7059f32eccdbdce9a482fb0a55cf6d37afd11c88 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 01:09:39 +0200
Subject: [PATCH 0516/2040] Don't timeout if the client hosts the game

---
 code/client/cl_main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 41e3d57f..f668bc43 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2419,6 +2419,13 @@ CL_CheckTimeout
 ==================
 */
 void CL_CheckTimeout( void ) {
+	if (com_sv_running->integer) {
+		// Added in OPM
+		//  Timeout should not be possible if the client is hosting the game
+		//  (like in single-player mode)
+		return;
+	}
+
 	//
 	// check timeout
 	//

From 0d394a7e679be831900ce4c7372611334a452ab5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 14:15:00 +0200
Subject: [PATCH 0517/2040] Fixes strings printing on the same line

---
 code/client/cl_input.cpp | 6 +++---
 code/server/sv_ccmds.c   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index fc52a69f..f3152d0d 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -577,9 +577,9 @@ void CL_MouseMove( usercmd_t *cmd ) {
 		cmd->forwardmove = ClampChar(cmd->forwardmove - m_forward->value * my);
 
 	if (!isfinite(cl.viewangles[PITCH]) || !isfinite(cl.viewangles[YAW])) {
-		Com_Printf("Invalid client viewangles encountered!\n");
-		Com_Printf("cgameSensitivity: %f - mx: %f - my: %f - m_pitch: %f - m_yaw: %f", cgameSensitivity, mx, my, m_pitch->value, m_yaw->value);
-		Com_Printf("Resetting client viewangles");
+		Com_DPrintf("Invalid client viewangles encountered (view pitch: %f, view yaw: %f)!\n", cl.viewangles[PITCH], cl.viewangles[YAW]);
+		Com_DPrintf("cgameSensitivity: %f | mx: %f | my: %f | m_pitch: %f | m_yaw: %f\n", cgameSensitivity, mx, my, m_pitch->value, m_yaw->value);
+		Com_DPrintf("Resetting client viewangles\n");
 		cl.viewangles[PITCH] = 0;
 		cl.viewangles[YAW] = 0;
 	}
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 9c6c479a..1e601533 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -2265,9 +2265,9 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 
 	Com_Printf( "Saving to %s", name );
 	if( autosave ) {
-		Com_DPrintf( " (autosave)...\n" );
+		Com_Printf( " (autosave)...\n" );
 	} else {
-		Com_DPrintf( "...\n" );
+		Com_Printf( "...\n" );
 	}
 
 	strcpy( svs.gameName, name );

From f866dcbcfc016fa37d3ade17f686684d4ec15aae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:10:37 +0200
Subject: [PATCH 0518/2040] Adds triggered music support

This allows the main menu music to play, as well as single-player musics
---
 code/client/new/snd_main_new.cpp | 51 +++++++++++++++++++++++++++++++-
 code/client/new/snd_public_new.h |  4 +++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 7fd517d6..0007453a 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -33,6 +33,10 @@ void S_Init2()
     // HACK: S_RegisterSound returns 0 when unsuccessful, or it returns the the sfx handle
     // But the first sfx handle is also 0...
     S_RegisterSound("sound/null.wav", qfalse);
+
+    Cmd_AddCommand("tmstart", S_TriggeredMusic_Start);
+    Cmd_AddCommand("tmstartloop", S_TriggeredMusic_StartLoop);
+    Cmd_AddCommand("tmstop", S_TriggeredMusic_Stop);
 }
 
 /*
@@ -439,8 +443,53 @@ void S_FadeSound(float fTime)
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_TriggeredMusic_Start
+==============
+*/
+void S_TriggeredMusic_Start()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstart <sound file>\n");
+        return;
+    }
+
+    S_StartBackgroundTrack(Cmd_Argv(1), "");
+}
+
+/*
+==============
+S_TriggeredMusic_StartLoop
+==============
+*/
+void S_TriggeredMusic_StartLoop()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstartloop <sound file>\n");
+        return;
+    }
+
+    S_StartBackgroundTrack(Cmd_Argv(1), Cmd_Argv(1));
+}
+
+/*
+==============
+S_TriggeredMusic_Stop
+==============
+*/
+void S_TriggeredMusic_Stop()
+{
+    S_StopBackgroundTrack();
+}
+
+/*
+==============
+S_TriggeredMusic_PlayIntroMusic
+==============
+*/
 void S_TriggeredMusic_PlayIntroMusic() {
-    // FIXME: unimplemented
+    S_StartBackgroundTrack("sound/music/mus_MainTheme.mp3", "");
 }
 
 void callbackServer(int entnum, int channel_number, const char* name) {
diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h
index 0b298c01..1e7d32a2 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -64,6 +64,10 @@ qboolean MUSIC_PlaySong(const char* alias);
 void MUSIC_UpdateMusicVolumes(void);
 void MUSIC_CheckForStoppedSongs(void);
 
+void S_TriggeredMusic_Start();
+void S_TriggeredMusic_StartLoop();
+void S_TriggeredMusic_Stop();
+
 void S_StopSound(int entnum, int channel);
 void S_StopAllSounds2(qboolean stop_music);
 float S_GetSoundTime(sfxHandle_t handle);

From 2cd6b981f1988cf46d45f7b4e0594434fa04e5bd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:46:47 +0200
Subject: [PATCH 0519/2040] Puts the volume gain constant in a variable

---
 code/client/snd_openal_new.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 2a1ca925..c9e2007f 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -43,6 +43,8 @@ static bool  s_bReverbChanged      = false;
 static bool  s_bFading             = false;
 static float s_fFadeVolume         = 1.f;
 
+static constexpr float s_fVolumeGain = 1.f; // = 84.f;
+
 cvar_t *s_milesdriver;
 cvar_t *s_openaldevice;
 cvar_t *s_reverb;
@@ -380,9 +382,7 @@ S_OPENAL_InitChannel
 static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
 {
     openal.channel[idx]   = chan;
-    chan->vOrigin[2]      = 0.0;
-    chan->vOrigin[1]      = 0.0;
-    chan->vOrigin[0]      = 0.0;
+    VectorClear(chan->vOrigin);
     chan->fVolume         = 1.0;
     chan->fNewPitchMult   = 0.0;
     chan->fMinDist        = 0.0;
@@ -1250,7 +1250,7 @@ static void S_OPENAL_Start2DSound(
 
         pChannel->iBaseRate = pChannel->sample_playback_rate();
         pChannel->set_no_3d();
-        fRealVolume = fRealVolume * 84.f;
+        fRealVolume = fRealVolume * s_fVolumeGain;
         pChannel->set_gain(fRealVolume);
         pChannel->play();
     } else {
@@ -1824,7 +1824,7 @@ static bool S_OPENAL_UpdateLoopSound(
         vec3_t vOrigin;
         int    iPan;
 
-        pChannel->fVolume = fVolumeToPlay / 84.0;
+        pChannel->fVolume = fVolumeToPlay / s_fVolumeGain;
         fVolume           = S_GetBaseVolume() * pChannel->fVolume;
         fMaxVolume        = fVolume;
 
@@ -2022,7 +2022,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
         if (pLoopSound->bPlaying) {
             S_OPENAL_UpdateLoopSound(
                 pLoopSound,
-                S_GetBaseVolume() * 84.0 * fTotalVolume,
+                S_GetBaseVolume() * s_fVolumeGain * fTotalVolume,
                 fMinDistance,
                 fMaxDistance,
                 vListenerOrigin,
@@ -2040,12 +2040,12 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
         if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)
             || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
             iChannel = S_OPENAL_Start2DLoopSound(
-                pLoopSound, fVolume, S_GetBaseVolume() * 84.0 * fTotalVolume, fMinDistance, vLoopOrigin
+                pLoopSound, fVolume, S_GetBaseVolume() * s_fVolumeGain * fTotalVolume, fMinDistance, vLoopOrigin
             );
         } else {
             iChannel = S_OPENAL_Start3DLoopSound(
                 pLoopSound,
-                S_GetBaseVolume() * 84.0 * fTotalVolume,
+                S_GetBaseVolume() * s_fVolumeGain * fTotalVolume,
                 fMinDistance,
                 fMaxDistance,
                 vLoopOrigin,
@@ -3670,7 +3670,7 @@ qboolean MUSIC_PlaySong(const char *alias)
         song_channel->fade_start_time = cls.realtime;
     } else {
         song_channel->fading = FADE_NONE;
-        song_channel->set_gain(S_GetBaseVolume() * (song->volume * s_ambientVolume->value) * 84.f);
+        song_channel->set_gain(S_GetBaseVolume() * (song->volume * s_ambientVolume->value) * s_fVolumeGain);
     }
 
     song_channel->play();
@@ -3703,7 +3703,7 @@ void MUSIC_UpdateMusicVolumes()
 
             openal.chan_song[i].set_gain(
                 S_GetBaseVolume() * (music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value)
-                * 84.0 * music_volume
+                * s_fVolumeGain * music_volume
             );
         }
     }
@@ -3720,10 +3720,10 @@ void MUSIC_UpdateMusicVolumes()
                        / (openal.chan_song[i].fade_time * 1000.f) * max_volume;
 
             if (new_volume > max_volume) {
-                openal.chan_song[i].set_gain(S_GetBaseVolume() * (max_volume * 84.f * music_volume));
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (max_volume * s_fVolumeGain * music_volume));
                 openal.chan_song[i].fading = FADE_NONE;
             } else {
-                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * 84.f * music_volume));
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * s_fVolumeGain * music_volume));
             }
             break;
         case fade_t::FADE_OUT:
@@ -3732,7 +3732,7 @@ void MUSIC_UpdateMusicVolumes()
                        / (openal.chan_song[i].fade_time * 1000.f) * max_volume;
 
             if (new_volume > 0) {
-                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * 84.f * music_volume));
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * s_fVolumeGain * music_volume));
             } else {
                 MUSIC_StopChannel(i);
             }
@@ -3746,7 +3746,7 @@ void MUSIC_UpdateMusicVolumes()
         s_musicVolume->modified = false;
         if (openal.chan_trig_music.is_playing() || openal.chan_trig_music.is_paused()) {
             openal.chan_trig_music.set_gain(
-                S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * 84.f
+                S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * s_fVolumeGain
             );
         }
     }
@@ -3826,7 +3826,7 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
     }
 
     openal.chan_trig_music.fVolume = fVolume;
-    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (fVolume * s_musicVolume->value) * 84.f);
+    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (fVolume * s_musicVolume->value) * s_fVolumeGain);
     openal.chan_trig_music.set_sample_loop_count(iLoopCount);
     openal.chan_trig_music.set_sample_offset(iOffset);
 
@@ -3910,7 +3910,7 @@ void S_TriggeredMusic_Unpause()
         openal.chan_trig_music.play();
     }
 
-    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * 84.f);
+    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * s_fVolumeGain);
 }
 
 /*

From 74ff3b920e18aa35943afa44cf0ff6fa527ab7ff Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 17:39:32 +0200
Subject: [PATCH 0520/2040] Fixes OpenAL 2D origin

---
 code/client/snd_openal_new.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index c9e2007f..1673afd8 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1038,8 +1038,7 @@ static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChan
             }
 
             if (!bStoppedChannel) {
-                i = iLastChannel;
-                while (++i <= 95) {
+                for(i = iLastChannel + 1; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
                     pChannel = openal.channel[i];
                     if (!pChannel || pChannel->is_free()) {
                         continue;
@@ -1215,17 +1214,19 @@ static void S_OPENAL_Start2DSound(
         pChannel->iEntNum = 0;
 
         if (vOrigin) {
-            pChannel->vOrigin[0] = -vOrigin[0];
-            pChannel->vOrigin[1] = vOrigin[2];
-            pChannel->vOrigin[2] = -vOrigin[1];
+            //pChannel->vOrigin[0] = -vOrigin[0];
+            //pChannel->vOrigin[1] = vOrigin[2];
+            //pChannel->vOrigin[2] = -vOrigin[1];
+            VectorCopy(vOrigin, pChannel->vOrigin);
         }
     } else {
         pChannel->iFlags &= ~CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = iRealEntNum;
         if (vOrigin) {
-            pChannel->vOrigin[0] = -vOrigin[0];
-            pChannel->vOrigin[1] = vOrigin[2];
-            pChannel->vOrigin[2] = -vOrigin[1];
+            //pChannel->vOrigin[0] = -vOrigin[0];
+            //pChannel->vOrigin[1] = vOrigin[2];
+            //pChannel->vOrigin[2] = -vOrigin[1];
+            VectorCopy(vOrigin, pChannel->vOrigin);
 
             bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
             pChannel->iTime           = cl.serverTime - 1;

From ae13be0c37b1f89f8150b873e6895054f5840f2c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 17:39:47 +0200
Subject: [PATCH 0521/2040] Fixes OpenAL errors

---
 code/client/snd_openal_new.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 1673afd8..a04c9364 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2827,7 +2827,7 @@ openal_channel::set_sfx
 */
 bool openal_channel::set_sfx(sfx_t *pSfx)
 {
-    ALfloat freq = 0;
+    ALint freq = 0;
 
     this->pSfx = pSfx;
     if (!pSfx->buffer || !qalIsBuffer(pSfx->buffer)) {
@@ -2893,7 +2893,7 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
     alDieIfError();
 
     // Get the base frequency
-    qalGetBufferfv(pSfx->buffer, AL_FREQUENCY, &freq);
+    qalGetBufferi(pSfx->buffer, AL_FREQUENCY, &freq);
     alDieIfError();
 
     iBaseRate = freq;
@@ -3062,9 +3062,11 @@ void openal_channel::set_sample_loop_count(S32 count)
         alDieIfError();
     }
 
-    for (S32 i = 0; i < count; i++) {
-        qalSourceQueueBuffers(source, 1, &buffer);
-        alDieIfError();
+    if (buffer) {
+        for (S32 i = 0; i < count; i++) {
+            qalSourceQueueBuffers(source, 1, &buffer);
+            alDieIfError();
+        }
     }
 }
 

From 140242a761ebf6c28a2cfb9056966da505d4f886 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:00:15 +0200
Subject: [PATCH 0522/2040] Fixes MP3 files like dialog improperly working

---
 code/client/snd_openal_new.cpp | 68 ++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index a04c9364..3302fa7e 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -103,7 +103,8 @@ static void S_OPENAL_Pitch();
 static int
 S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
 static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
-static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan);
+static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx);
+static ALuint S_OPENAL_Format(int width, int channels);
 
 #    define alDieIfError() __alDieIfError(__FILE__, __LINE__)
 
@@ -726,8 +727,55 @@ S_OPENAL_LoadMP3
 */
 static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 {
-    return S_OPENAL_LoadMP3_Codec(_path, chan);
+    char path[MAX_QPATH];
+    snd_info_t info;
+    ALuint format;
 
+    chan->stop();
+
+    qalSourcei(chan->source, AL_BUFFER, 0);
+    alDieIfError();
+
+    Q_strncpyz(path, _path, sizeof(path));
+    path[MAX_QPATH - 1] = 0;
+
+    FS_CorrectCase(path);
+
+    // Try to load
+    chan->bufferdata = (ALubyte*)S_CodecLoad(path, &info);
+    if (!chan->bufferdata) {
+        return false;
+    }
+
+    format = S_OPENAL_Format(info.width, info.channels);
+
+    // Create a buffer
+    qalGenBuffers(1, &chan->buffer);
+    alDieIfError();
+
+    // Fill the buffer
+    if (info.size == 0) {
+        // We have no data to buffer, so buffer silence
+        byte dummyData[2] = {0};
+
+        qalBufferData(chan->buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
+    } else {
+        qalBufferData(chan->buffer, format, chan->bufferdata, info.size, info.rate);
+    }
+
+    alDieIfError();
+
+    // Free the memory
+    Hunk_FreeTempMemory(chan->bufferdata);
+
+    qalSourcei(chan->source, AL_BUFFER, chan->buffer);
+    alDieIfError();
+
+    chan->set_no_3d();
+
+    return true;
+
+#if 0
     char   path[MAX_QPATH];
     FILE  *in;
     size_t len;
@@ -789,6 +837,7 @@ static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
     chan->set_no_3d();
 
     return true;
+#endif
 }
 
 /*
@@ -2836,7 +2885,7 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             alDieIfError();
 
             //if (!_alutLoadMP3_LOKI(pSfx->buffer, pSfx->data, pSfx->length)) {
-            if (!S_OPENAL_LoadMP3_Codec(pSfx->name, this)) {
+            if (!S_OPENAL_LoadMP3_Codec(pSfx->name, pSfx)) {
                 qalDeleteBuffers(1, &pSfx->buffer);
                 alDieIfError();
 
@@ -3989,7 +4038,7 @@ static ALuint S_OPENAL_Format(int width, int channels)
 S_OPENAL_LoadMP3_Codec
 ==============
 */
-static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan)
+static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx)
 {
     void      *data;
     snd_info_t info;
@@ -4004,7 +4053,7 @@ static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan)
     format = S_OPENAL_Format(info.width, info.channels);
 
     // Create a buffer
-    qalGenBuffers(1, &chan->buffer);
+    qalGenBuffers(1, &pSfx->buffer);
     alDieIfError();
 
     // Fill the buffer
@@ -4012,9 +4061,9 @@ static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan)
         // We have no data to buffer, so buffer silence
         byte dummyData[2] = {0};
 
-        qalBufferData(chan->buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
+        qalBufferData(pSfx->buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
     } else {
-        qalBufferData(chan->buffer, format, data, info.size, info.rate);
+        qalBufferData(pSfx->buffer, format, data, info.size, info.rate);
     }
 
     alDieIfError();
@@ -4022,11 +4071,6 @@ static bool S_OPENAL_LoadMP3_Codec(const char *_path, openal_channel *chan)
     // Free the memory
     Hunk_FreeTempMemory(data);
 
-    qalSourcei(chan->source, AL_BUFFER, chan->buffer);
-    alDieIfError();
-
-    chan->set_no_3d();
-
     return true;
 }
 

From edb1cb0ebee4a1591bf950647abd8aca1d95ebe5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:05:24 +0200
Subject: [PATCH 0523/2040] Renamed `SFX_FLAG_NO_DATA` to `SFX_FLAG_STREAMED`

---
 code/client/snd_local_new.h    |  2 +-
 code/client/snd_mem_new.c      |  4 ++--
 code/client/snd_openal_new.cpp | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 707ecc1e..20358ddb 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -148,7 +148,7 @@ enum channel_flags_t {
 enum sfx_flags_t {
     SFX_FLAG_DEFAULT_SOUND = 1,
     SFX_FLAG_MP3           = 2,
-    SFX_FLAG_NO_DATA       = 4,
+    SFX_FLAG_STREAMED      = 4,
     SFX_FLAG_NO_OFFSET     = 8,
 };
 
diff --git a/code/client/snd_mem_new.c b/code/client/snd_mem_new.c
index 13dc44a2..2cd06435 100644
--- a/code/client/snd_mem_new.c
+++ b/code/client/snd_mem_new.c
@@ -478,7 +478,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         }
     }
 
-    if (!(sfx->iFlags & SFX_FLAG_NO_DATA) && realKhz < sfx->info.rate) {
+    if (!(sfx->iFlags & SFX_FLAG_STREAMED) && realKhz < sfx->info.rate) {
         byte* newdata;
         int newdatasize;
 
@@ -499,7 +499,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
     sfx->width = sfx->info.width;
     sfx->time_length = sfx->info.samples / sfx->info.rate * 1000.f;
 
-    if (sfx->iFlags & SFX_FLAG_NO_DATA) {
+    if (sfx->iFlags & SFX_FLAG_STREAMED) {
         Z_Free(sfx->data);
         sfx->data = NULL;
     }
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 3302fa7e..fabe7a92 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1205,7 +1205,7 @@ static void S_OPENAL_Start2DSound(
 
     iRealEntNum = iEntNum & ~S_FLAG_DO_CALLBACK;
 
-    if (pSfx->iFlags & SFX_FLAG_NO_DATA) {
+    if (pSfx->iFlags & SFX_FLAG_STREAMED) {
         iFreeChannel = S_OPENAL_PickChannel2DStreamed(iRealEntNum, iEntChannel);
     } else {
         iFreeChannel = S_OPENAL_PickChannel2D(iRealEntNum, iEntChannel);
@@ -1214,7 +1214,7 @@ static void S_OPENAL_Start2DSound(
     if (iFreeChannel < 0) {
         Com_DPrintf(
             "Couldn't play %s sound '%s' for entity %i on channel %s\n",
-            (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "2Dstreamed" : "2D",
+            (pSfx->iFlags & SFX_FLAG_STREAMED) ? "2Dstreamed" : "2D",
             pSfx->name,
             iRealEntNum,
             S_ChannelNumToName(iEntChannel)
@@ -1352,7 +1352,7 @@ void S_OPENAL_StartSound(
     bOnlyUpdate = false;
     pSfx        = &s_knownSfx[sfxHandle];
     if (bStreamed) {
-        pSfx->iFlags |= SFX_FLAG_NO_DATA;
+        pSfx->iFlags |= SFX_FLAG_STREAMED;
     }
 
     if (!S_OPENAL_ShouldPlay(pSfx)) {
@@ -1360,7 +1360,7 @@ void S_OPENAL_StartSound(
         return;
     }
 
-    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)) || iEntChannel == CHAN_MENU
+    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_STREAMED | SFX_FLAG_MP3)) || iEntChannel == CHAN_MENU
         || iEntChannel == CHAN_LOCAL) {
         S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
         return;
@@ -1370,7 +1370,7 @@ void S_OPENAL_StartSound(
     iEntNum &= ~S_FLAG_DO_CALLBACK;
 
     pSfxInfo = &sfx_infos[pSfx->sfx_info_index];
-    if (pSfx->iFlags & SFX_FLAG_NO_DATA) {
+    if (pSfx->iFlags & SFX_FLAG_STREAMED) {
         Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
         return;
     }
@@ -1379,7 +1379,7 @@ void S_OPENAL_StartSound(
     if (iChannel < 0) {
         Com_DPrintf(
             "Couldn't play %s sound '%s' for entity %i on channel %s\n",
-            (pSfx->iFlags & SFX_FLAG_NO_DATA) ? "3Dstreamed" : "3D",
+            (pSfx->iFlags & SFX_FLAG_STREAMED) ? "3Dstreamed" : "3D",
             pSfx->name,
             iEntNum,
             S_ChannelNumToName(iEntChannel)
@@ -1719,7 +1719,7 @@ static int S_OPENAL_Start2DLoopSound(
     int             iSoundOFfset;
     openal_channel *pChannel;
 
-    if (pLoopSound->pSfx->iFlags & SFX_FLAG_NO_DATA) {
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
         iChannel = S_OPENAL_PickChannel2DStreamed(0, 0);
     } else {
         iChannel = S_OPENAL_PickChannel2D(0, 0);
@@ -1789,7 +1789,7 @@ static int S_OPENAL_Start3DLoopSound(
     int             iSoundOffset;
     openal_channel *pChan3D;
 
-    if (pLoopSound->pSfx->iFlags & SFX_FLAG_NO_DATA) {
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
         return -1;
     }
 
@@ -1869,7 +1869,7 @@ static bool S_OPENAL_UpdateLoopSound(
 
     pChannel->iStartTime = cl.serverTime;
 
-    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)
+    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_STREAMED | SFX_FLAG_MP3)
         || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
         vec3_t vOrigin;
         int    iPan;
@@ -2087,7 +2087,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
         }
 
-        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_NO_DATA | SFX_FLAG_MP3)
+        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_STREAMED | SFX_FLAG_MP3)
             || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
             iChannel = S_OPENAL_Start2DLoopSound(
                 pLoopSound, fVolume, S_GetBaseVolume() * s_fVolumeGain * fTotalVolume, fMinDistance, vLoopOrigin

From eefe8ee2d1ba57f61bc3bad0dcf82e92ebe6d6d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:17:04 +0200
Subject: [PATCH 0524/2040] Allow 3D / pan with streamed or MP3 sounds

---
 code/client/snd_openal_new.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index fabe7a92..d2f7aa6e 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1360,8 +1360,10 @@ void S_OPENAL_StartSound(
         return;
     }
 
-    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_STREAMED | SFX_FLAG_MP3)) || iEntChannel == CHAN_MENU
-        || iEntChannel == CHAN_LOCAL) {
+    // Fixed in OPM
+    //  3D streamed or MP3 sound should be supported
+    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET)) //|| pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+        || iEntChannel == CHAN_MENU || iEntChannel == CHAN_LOCAL) {
         S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
         return;
     }
@@ -1370,10 +1372,12 @@ void S_OPENAL_StartSound(
     iEntNum &= ~S_FLAG_DO_CALLBACK;
 
     pSfxInfo = &sfx_infos[pSfx->sfx_info_index];
-    if (pSfx->iFlags & SFX_FLAG_STREAMED) {
-        Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
-        return;
-    }
+    // Fixed in OPM
+    //  3D streamed sound should be supported
+    //if (pSfx->iFlags & SFX_FLAG_STREAMED) {
+    //    Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
+    //    return;
+    //}
 
     iChannel = S_OPENAL_PickChannel3D(iEntNum, iEntChannel);
     if (iChannel < 0) {
@@ -1789,9 +1793,11 @@ static int S_OPENAL_Start3DLoopSound(
     int             iSoundOffset;
     openal_channel *pChan3D;
 
-    if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
-        return -1;
-    }
+    // Fixed in OPM
+    //  3D streamed sound should be supported
+    //if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
+    //    return -1;
+    //}
 
     iChannel = S_OPENAL_PickChannel3D(0, 0);
     if (iChannel < 0) {
@@ -2107,7 +2113,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             continue;
         }
 
-        pLoopSound->bPlaying = 1;
+        pLoopSound->bPlaying = true;
         pLoopSound->iChannel = iChannel;
 
         if (pLoopSound->bCombine) {

From 63445c4fc1e292f22e28099dd99c52a445033dce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:20:22 +0200
Subject: [PATCH 0525/2040] Added a note to use the experimental openal-based
 sound system

---
 docs/compiling.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/compiling.md b/docs/compiling.md
index 39faec5f..dd9c6f4f 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -11,6 +11,8 @@ The installation directory can be set to the MOHAA directory.
 
 By default, the build will produce both the client and dedicated server versions. The client can be omitted from the build by appending `-DBUILD_NO_CLIENT=1` to the CMake command-line arguments. Using this parameter will result in only the server portion being built.
 
+The experimental OpenAL-based sound system can be used by appending `-DUSE_SOUND_NEW=1` to the CMake command-line arguments.
+
 ## Compiling for Linux
 
 These are the tools required on Linux :

From 5fc2425f3a0be1a40fbd4dcee702f7afb026ec32 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:52:04 +0200
Subject: [PATCH 0526/2040] Set the mindist/maxdist for 3D sounds

---
 code/client/snd_openal_new.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index d2f7aa6e..d641e456 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2775,10 +2775,17 @@ void openal_channel::set_3d()
     alDieIfError();
     qalSourcei(source, AL_LOOPING, false);
     alDieIfError();
-    qalSourcef(source, AL_ROLLOFF_FACTOR, 0.019f);
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 0.5f);
     alDieIfError();
     qalSourcef(source, AL_GAIN, S_GetBaseVolume());
     alDieIfError();
+    //
+    // Added in OPM
+    //
+    qalSourcef(source, AL_REFERENCE_DISTANCE, fMinDist);
+    alDieIfError();
+    qalSourcef(source, AL_MAX_DISTANCE, fMaxDist);
+    alDieIfError();
 }
 
 /*

From 9615fafc1e31bf7629cfee14967671329b2b47a0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 19:03:21 +0200
Subject: [PATCH 0527/2040] Fixes incorrect usage of DotProduct result in an
 integer

---
 code/client/snd_openal_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index d641e456..051ed0ba 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2340,7 +2340,7 @@ static int S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const ve
 {
     float  lscale, rscale;
     vec3_t source_vec;
-    int    pan;
+    float  pan;
 
     VectorSubtract(origin, listener_origin, source_vec);
     VectorNormalize(source_vec);

From a0d3333ebbbeadb6ca2438e7ccee8a3e42eee1ec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 1 Jul 2024 19:39:51 +0200
Subject: [PATCH 0528/2040] Fixes chan->bufferdata not being set to NULL when
 released

---
 code/client/snd_openal_new.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 051ed0ba..e675e49e 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -767,6 +767,7 @@ static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 
     // Free the memory
     Hunk_FreeTempMemory(chan->bufferdata);
+    chan->bufferdata = NULL;
 
     qalSourcei(chan->source, AL_BUFFER, chan->buffer);
     alDieIfError();
@@ -2782,10 +2783,14 @@ void openal_channel::set_3d()
     //
     // Added in OPM
     //
-    qalSourcef(source, AL_REFERENCE_DISTANCE, fMinDist);
-    alDieIfError();
-    qalSourcef(source, AL_MAX_DISTANCE, fMaxDist);
-    alDieIfError();
+    if (fMinDist > 0) {
+        qalSourcef(source, AL_REFERENCE_DISTANCE, fMinDist);
+        alDieIfError();
+    }
+    if (fMaxDist > 0) {
+        qalSourcef(source, AL_MAX_DISTANCE, fMaxDist);
+        alDieIfError();
+    }
 }
 
 /*

From d6571820fe30062c7d2c0608b626fa6d2dca4615 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:46:27 +0200
Subject: [PATCH 0529/2040] Fixes g_pVert/g_pTris being freed even when they
 are NULL

---
 code/renderer/tr_terrain.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index e870b85e..97bba6c3 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1351,10 +1351,14 @@ void R_TerrainRestart_f(void)
         return;
     }
 
-    ri.Free(g_pVert);
-    g_pVert = NULL;
-    ri.Free(g_pTris);
-    g_pTris = NULL;
+    if (g_pVert) {
+        ri.Free(g_pVert);
+        g_pVert = NULL;
+    }
+    if (g_pTris) {
+        ri.Free(g_pTris);
+        g_pTris = NULL;
+    }
 
     R_PreTessellateTerrain();
 }

From dca9709b122a32741a1df9edc72d96692f1208c5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:48:02 +0200
Subject: [PATCH 0530/2040] Fixes `MASK_PLAYERSOLID` incorrectly using
 `CONTENTS_WEAPONCLIP` instead of `CONTENTS_PLAYERCLIP` for invisible player
 collision

This fixes #317, fixes #319 and fixes #320 where the player would bypass clip/playerclip
---
 code/fgame/bg_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index af881c1e..6bf408ae 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -610,7 +610,7 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_FENCE)
 #define MASK_SAFESOLID (CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_USABLE    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
-#define MASK_PLAYERSOLID (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_WEAPONCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
+#define MASK_PLAYERSOLID (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
 #define MASK_GUNTARGET                                                                                               \
     (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX        \
      | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_UNKNOWN3 | CONTENTS_FENCE | CONTENTS_BODY | CONTENTS_CORPSE \

From 14927df9fa0630223eb5f825eb868b1af5ca0e7a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:03:27 +0200
Subject: [PATCH 0531/2040] Moves `MAX_SUBTITLES` to `q_shared.h|

---
 code/client/cl_uiview3d.cpp | 2 --
 code/qcommon/q_shared.h     | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 71a127b6..51efab8f 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -30,8 +30,6 @@ CLASS_DECLARATION(UIWidget, View3D, NULL) {
     {NULL,             NULL                 }
 };
 
-#define MAX_SUBTITLES 4
-
 cvar_t *subs[MAX_SUBTITLES];
 cvar_t *teams[MAX_SUBTITLES];
 float   fadeTime[MAX_SUBTITLES];
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index ff792ed9..accd20d1 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1661,6 +1661,8 @@ typedef enum
 #define	MAX_CONFIGSTRINGS	2736
 #define MAX_HUDDRAW_ELEMENTS 256
 
+#define MAX_SUBTITLES 4
+
 // these are the only configstrings that the system reserves, all the
 // other ones are strictly for servergame to clientgame communication
 #define	CS_SERVERINFO		0		// an info string with all the serverinfo cvars

From 040f8db0ef84f004eab571d6d96f288e150cd275 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:10:48 +0200
Subject: [PATCH 0532/2040] Fixes wrong sound volume and pitch

---
 code/fgame/actor.cpp  |  2 +-
 code/fgame/entity.cpp | 82 ++++++++++++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 61fd1a3a..a1e213c0 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -6878,7 +6878,7 @@ bool Actor::SoundSayAnim(const_str name, byte bLevelSayAnim)
         edict->tiki->a->name
     );
 
-    Sound(Director.GetString(name), 0, 0, 0, NULL, 0, 1, 1, -1);
+    Sound(Director.GetString(name), CHAN_AUTO, 0, 0, 0, NULL, 0, 1, 1, -1);
 
     return true;
 }
diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 547c3061..57af734b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3615,6 +3615,11 @@ void Entity::Sound(
     static cvar_t   *g_subtitle = NULL;
     static bool      _tmp       = false;
     int              num;
+    int              aliaschannel;
+    float            aliasvolume;
+    float            aliasmin_dist;
+    float            aliasmax_dist;
+    float            aliaspitch;
 
     if (!_tmp) {
         g_subtitle = gi.Cvar_Get("g_subtitle", "0", CVAR_ARCHIVE);
@@ -3643,6 +3648,12 @@ void Entity::Sound(
 
         if (name != NULL) {
             if (ret) {
+                aliaschannel = ret->channel;
+                aliasvolume = G_Random() * ret->volumeMod + ret->volume;
+                aliaspitch = G_Random() * ret->pitchMod + ret->pitch;
+                aliasmin_dist = ret->dist;
+                aliasmax_dist = ret->maxDist;
+
                 if (channel < 0) {
                     channel = ret->channel;
                 }
@@ -3659,51 +3670,72 @@ void Entity::Sound(
                     }
                 }
 
-                if (argstype == 0) {
-                    volume   = G_Random() * ret->volumeMod + ret->volume;
-                    pitch    = G_Random() * ret->pitchMod + ret->pitch;
-                    min_dist = ret->dist;
-                    max_dist = ret->maxDist;
-                } else if (argstype == 1) {
+                switch (argstype) {
+                case 0:
+                    volume = aliasvolume;
+                    pitch = aliaspitch;
+                    min_dist = aliasmin_dist;
+                    max_dist = aliasmax_dist;
+                    channel = aliaschannel;
+                    break;
+                case 1:
                     if (volume >= 0.0f) {
-                        volume = G_Random() * ret->volumeMod + volume;
+                        volume = volume * aliasvolume;
                     } else {
-                        volume = G_Random() * ret->volumeMod + volume;
+                        volume = aliasvolume;
                     }
 
                     if (pitch >= 0.0f) {
-                        pitch = G_Random() * ret->pitchMod + pitch;
+                        pitch = pitch * aliaspitch;
                     } else {
-                        pitch = G_Random() * ret->pitchMod + ret->pitch;
-                    }
-                } else {
-                    if (volume <= 0.0f) {
-                        volume = G_Random() * ret->volumeMod + ret->volume;
-                    }
-
-                    if (pitch >= 0.0f) {
-                        pitch = G_Random() * ret->pitchMod + pitch;
-                    } else {
-                        pitch = G_Random() * ret->pitchMod + ret->pitch;
+                        pitch = aliaspitch;
                     }
 
                     if (min_dist < 0.0f) {
-                        min_dist = ret->dist;
+                        min_dist = aliasmin_dist;
                     }
 
                     if (max_dist < 0.0f) {
-                        max_dist = ret->maxDist;
+                        max_dist = aliasmax_dist;
                     }
+
+                    if (channel < 0) {
+                        channel = aliaschannel;
+                    }
+                    break;
+                default:
+                    if (volume < 0.0) {
+                        volume = aliasvolume;
+                    }
+                    if (pitch < 0.0) {
+                        pitch = aliaspitch;
+                    }
+                    if (min_dist < 0.0) {
+                        min_dist = aliasmin_dist;
+                    }
+                    if (max_dist < 0.0) {
+                        max_dist = aliasmax_dist;
+                    }
+                    if (channel < 0) {
+                        channel = aliaschannel;
+                    }
+                    break;
                 }
 
-                if (g_gametype->integer == GT_SINGLE_PLAYER && (!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
+                if ((!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
                     Entity *p = G_GetEntity(0);
 
-                    if (g_subtitle->integer == 2 || max_dist * max_dist > DistanceSquared(org, p->edict->s.origin)) {
+                    if (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin)) {
                         cvar_t *curSubtitle = gi.Cvar_Get("curSubtitle", "0", 0);
+                        int curSub;
 
                         gi.cvar_set(va("subtitle%d", curSubtitle->integer), va("%s", ret->subtitle));
-                        gi.cvar_set("curSubtitle", va("%d", curSubtitle->integer + 1));
+                        curSub = curSubtitle->integer + 1;
+                        if (curSubtitle->integer + 1 < 0) {
+                            curSub = curSubtitle->integer + MAX_SUBTITLES;
+                        }
+                        
+                        gi.cvar_set("curSubtitle", va("%d", (curSubtitle->integer + 1) - MAX_SUBTITLES * (curSub >> 2)));
                     }
                 }
 

From 02e2e92d361b29a053242fe5126f0ae480d7dc15 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:30:29 +0200
Subject: [PATCH 0533/2040] Uses linear sound distance model

---
 code/client/snd_openal_new.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index e675e49e..49d07659 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2780,6 +2780,8 @@ void openal_channel::set_3d()
     alDieIfError();
     qalSourcef(source, AL_GAIN, S_GetBaseVolume());
     alDieIfError();
+    qalSourcef(source, AL_DISTANCE_MODEL, AL_LINEAR_DISTANCE);
+    alDieIfError();
     //
     // Added in OPM
     //

From d5f435ee90fb8ac6901e975fd2ac2d96b4f7c099 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:01:01 +0200
Subject: [PATCH 0534/2040] Makes loops work as they should

---
 code/client/snd_openal_new.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 49d07659..8cde8cea 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3137,6 +3137,11 @@ void openal_channel::set_sample_loop_count(S32 count)
             alDieIfError();
         }
     }
+
+    if (count == 0) {
+        qalSourcei(source, AL_LOOPING, true);
+        alDieIfError();
+    }
 }
 
 /*

From 543c00037a3b0ab40d1bfeb5b6d2a76946a9d997 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:10:54 +0200
Subject: [PATCH 0535/2040] Implements sample playback rate

---
 code/client/snd_openal_new.cpp | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 8cde8cea..acfaccf5 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3022,7 +3022,12 @@ void openal_channel::set_sample_pan(S32 pan) {}
 openal_channel::set_sample_playback_rate
 ==============
 */
-void openal_channel::set_sample_playback_rate(S32 rate) {}
+void openal_channel::set_sample_playback_rate(S32 rate) {
+    // Fixed in OPM
+    //  Set the pitch in OpenAL
+    qalSourcef(source, AL_PITCH, rate / (float)iBaseRate);
+    alDieIfError();
+}
 
 /*
 ==============
@@ -3031,7 +3036,25 @@ openal_channel::sample_playback_rate
 */
 S32 openal_channel::sample_playback_rate()
 {
-    return 22050;
+    float pitch = 1;
+    ALint freq = 0;
+
+    // Fixed in OPM
+    //  The sample rate varies according to the pitch
+    qalGetSourcef(source, AL_PITCH, &pitch);
+    alDieIfError();
+
+    if (buffer) {
+        qalGetBufferi(buffer, AL_FREQUENCY, &freq);
+        alDieIfError();
+    } else if (pSfx) {
+        qalGetBufferi(pSfx->buffer, AL_FREQUENCY, &freq);
+        alDieIfError();
+    } else {
+        freq = 22050;
+    }
+
+    return freq * pitch;
 }
 
 /*

From 5816391e9bda01476bdeb42557d42edddc73ae8b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:25:08 +0200
Subject: [PATCH 0536/2040] Fixes loopsound not properly working (not playing,
 or not being 3D)

---
 code/client/snd_openal_new.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index acfaccf5..a8c65c5a 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1559,12 +1559,13 @@ void S_OPENAL_AddLoopingSound(
     }
 
     pLoopSound             = &openal.loop_sounds[iFreeLoopSound];
-    pLoopSound->vOrigin[0] = -vOrigin[0];
-    pLoopSound->vOrigin[1] = vOrigin[2];
-    pLoopSound->vOrigin[2] = -vOrigin[1];
+    //pLoopSound->vOrigin[0] = -vOrigin[0];
+    //pLoopSound->vOrigin[1] = vOrigin[2];
+    //pLoopSound->vOrigin[2] = -vOrigin[1];
     //pLoopSound->vVelocity[0] = -vVelocity[0] / 52.49f / 500.f;
     //pLoopSound->vVelocity[1] = vVelocity[2] / 52.49f / 500.f;
     //pLoopSound->vVelocity[2] = -vVelocity[1] / 52.49f / 500.f;
+    VectorCopy(vOrigin, pLoopSound->vOrigin);
     VectorCopy(vVelocity, pLoopSound->vVelocity);
     pLoopSound->pSfx        = pSfx;
     pLoopSound->bInUse      = true;
@@ -1823,8 +1824,8 @@ static int S_OPENAL_Start3DLoopSound(
         pLoopSound->vVelocity[0] / 52.49f, vLoopOrigin[1] / 52.49f, pLoopSound->vVelocity[2] / 52.49f
     );
     */
-    pChan3D->set_position(vLoopOrigin[0], pLoopSound->vVelocity[1], vLoopOrigin[2]);
-    pChan3D->set_velocity(pLoopSound->vVelocity[0], vLoopOrigin[1], pLoopSound->vVelocity[2]);
+    pChan3D->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
+    pChan3D->set_velocity(pLoopSound->vVelocity[0], pLoopSound->vVelocity[1], pLoopSound->vVelocity[2]);
     pChan3D->pSfx = pLoopSound->pSfx;
     pChan3D->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
     pChan3D->iBaseRate = pChan3D->sample_playback_rate();
@@ -1876,7 +1877,7 @@ static bool S_OPENAL_UpdateLoopSound(
 
     pChannel->iStartTime = cl.serverTime;
 
-    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) // || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
         || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
         vec3_t vOrigin;
         int    iPan;
@@ -1944,6 +1945,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
     vec3_t               alvec;
 
     qalGetListenerfv(AL_POSITION, alvec);
+    VectorCopy(alvec, vListenerOrigin);
     //VectorScale(alvec, 52.49f, vListenerOrigin);
 
     for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
@@ -2094,7 +2096,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
         }
 
-        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET | SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) //|| pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
             || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
             iChannel = S_OPENAL_Start2DLoopSound(
                 pLoopSound, fVolume, S_GetBaseVolume() * s_fVolumeGain * fTotalVolume, fMinDistance, vLoopOrigin

From 5317b8424fd28f25ece15785318fd6bedea65da9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 22:16:13 +0200
Subject: [PATCH 0537/2040] Prevents the player from walking

This fixes #275
---
 code/fgame/player.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index b5e17d3f..86b41dd3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4154,6 +4154,10 @@ void Player::VehicleMove(usercmd_t *ucmd)
 
     if (m_pVehicle->Drive(current_ucmd)) {
         client->ps.commandTime = ucmd->serverTime;
+        // Added in OPM
+        //  The player can't walk while attached to a vehicle
+        client->ps.groundEntityNum = ENTITYNUM_NONE;
+        client->ps.walking = false;
     } else {
         ClientMove(ucmd);
     }
@@ -4186,10 +4190,14 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     client->ps.gravity = gravity * sv_gravity->value;
 
-    if (!m_pTurret->IsSubclassOfTurretGun() || !m_pTurret->UserAim(current_ucmd)) {
-        ClientMove(ucmd);
-    } else {
+    if (m_pTurret->IsSubclassOfTurretGun() && m_pTurret->UserAim(current_ucmd)) {
         client->ps.commandTime = ucmd->serverTime;
+        // Added in OPM
+        //  The player can't walk while attached to a turret
+        client->ps.groundEntityNum = ENTITYNUM_NONE;
+        client->ps.walking = false;
+    } else {
+        ClientMove(ucmd);
     }
 }
 

From 551fccb76140643ebdfcc1d6e03304b3e6192754 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 2 Jul 2024 22:47:41 +0200
Subject: [PATCH 0538/2040] Fixes wrong handle being compared for uniqueness

This should fix invisible models (fixes #322)
---
 code/cgame/cg_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index fe29dfcb..57e855dc 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -253,13 +253,11 @@ CG_IsHandleUnique
 Check if the model handle is unique
 ================
 */
-static qboolean CG_IsHandleUnique(int num) {
-    qhandle_t handle;
+static qboolean CG_IsHandleUnique(qhandle_t handle) {
     int i;
     int numRef;
 
     numRef = 0;
-    handle = cgs.model_draw[num];
     for (i = 0; i < MAX_MODELS; i++) {
         if (cgs.model_draw[i] == handle) {
             numRef++;

From d56498e622da05ec4cc0af7ec78ba71dcf425ad3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:04:03 +0200
Subject: [PATCH 0539/2040] Adds CHANNEL_NONE case statement even if there is
 nothing to do

---
 code/skeletor/skeletor_loadanimation.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index ab0c3b31..46f6a3d2 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -584,6 +584,9 @@ void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
                 pFrame->pChannelData[0] = MSG_ReadFloat(msg);
             }
             break;
+        case CHANNEL_NONE:
+            // Nothing to do
+            break;
         }
     }
 }

From eac8580f64dfa8691b19bebb1f3548b38d03b90e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:54:41 +0200
Subject: [PATCH 0540/2040] Add libmad 0.16.4

This new version introduces patches against crashes and exploits. CMake is also fully supported and platforms are properly detected so architecture specific optimizations are used.

To use it, USE_SOUND_NEW must be non-zero when configuring the project
---
 code/client/CMakeLists.txt               |   12 +-
 code/client/snd_codec_mp3.c              |    6 +-
 code/libmad/.github/workflows/build.yml  |   44 +
 code/libmad/.gitignore                   |    1 +
 code/libmad/CHANGES                      |  360 +
 code/libmad/CMakeLists.txt               |  240 +
 code/libmad/COPYING                      |  340 +
 code/libmad/COPYRIGHT                    |   21 +
 code/libmad/CREDITS                      |  116 +
 code/libmad/D.dat                        |  607 ++
 code/libmad/README.md                    |  178 +
 code/libmad/TODO                         |   69 +
 code/libmad/bit.c                        |  236 +
 code/libmad/decoder.c                    |  589 ++
 code/libmad/fixed.c                      |   77 +
 code/libmad/frame.c                      |  510 ++
 code/libmad/global.h                     |   58 +
 code/libmad/huffman.c                    | 3105 ++++++++
 code/libmad/huffman.h                    |   66 +
 code/libmad/imdct_l_arm.S                | 1000 +++
 code/libmad/imdct_s.dat                  |   62 +
 code/libmad/layer12.c                    |  621 ++
 code/libmad/layer12.h                    |   30 +
 code/libmad/layer3.c                     | 2779 +++++++
 code/libmad/layer3.h                     |   29 +
 code/libmad/mad.h.in                     |  956 +++
 code/libmad/minimad.c                    |  222 +
 code/libmad/packaging/mad.pc.in          |   10 +
 code/libmad/packaging/madConfig.cmake.in |    5 +
 code/libmad/qc_table.dat                 |   77 +
 code/libmad/rq_table.dat                 | 8747 ++++++++++++++++++++++
 code/libmad/sf_table.dat                 |  106 +
 code/libmad/stream.c                     |  156 +
 code/libmad/synth.c                      |  851 +++
 code/libmad/timer.c                      |  481 ++
 code/libmad/version.c                    |   87 +
 36 files changed, 22850 insertions(+), 4 deletions(-)
 create mode 100644 code/libmad/.github/workflows/build.yml
 create mode 100644 code/libmad/.gitignore
 create mode 100644 code/libmad/CHANGES
 create mode 100644 code/libmad/CMakeLists.txt
 create mode 100644 code/libmad/COPYING
 create mode 100644 code/libmad/COPYRIGHT
 create mode 100644 code/libmad/CREDITS
 create mode 100644 code/libmad/D.dat
 create mode 100644 code/libmad/README.md
 create mode 100644 code/libmad/TODO
 create mode 100644 code/libmad/bit.c
 create mode 100644 code/libmad/decoder.c
 create mode 100644 code/libmad/fixed.c
 create mode 100644 code/libmad/frame.c
 create mode 100644 code/libmad/global.h
 create mode 100644 code/libmad/huffman.c
 create mode 100644 code/libmad/huffman.h
 create mode 100644 code/libmad/imdct_l_arm.S
 create mode 100644 code/libmad/imdct_s.dat
 create mode 100644 code/libmad/layer12.c
 create mode 100644 code/libmad/layer12.h
 create mode 100644 code/libmad/layer3.c
 create mode 100644 code/libmad/layer3.h
 create mode 100644 code/libmad/mad.h.in
 create mode 100644 code/libmad/minimad.c
 create mode 100644 code/libmad/packaging/mad.pc.in
 create mode 100644 code/libmad/packaging/madConfig.cmake.in
 create mode 100644 code/libmad/qc_table.dat
 create mode 100644 code/libmad/rq_table.dat
 create mode 100644 code/libmad/sf_table.dat
 create mode 100644 code/libmad/stream.c
 create mode 100644 code/libmad/synth.c
 create mode 100644 code/libmad/timer.c
 create mode 100644 code/libmad/version.c

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index c1761c24..77a5f515 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -34,6 +34,15 @@ if (USE_SOUND_NEW)
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")
 	file(GLOB_RECURSE SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
+
+	set(OLD_VALUE ${BUILD_SHARED_LIBS})
+	set(BUILD_SHARED_LIBS OFF)
+	add_subdirectory("../libmad" "./libmad")
+	set(BUILD_SHARED_LIBS ${OLD_VALUE})
+	target_link_libraries(omohclient INTERFACE mad)
+else()
+	add_subdirectory("../libmad-0.15.1b" "./libmad")
+	target_link_libraries(omohclient INTERFACE libmad)
 endif()
 
 if (USE_OPENAL)
@@ -47,6 +56,3 @@ if (USE_OPENAL)
 endif()
 
 target_sources(omohclient INTERFACE ${SOURCES_CLIENT} ${SOURCES_UILIB})
-
-add_subdirectory("../libmad-0.15.1b" "./libmad")
-target_link_libraries(omohclient INTERFACE libmad)
\ No newline at end of file
diff --git a/code/client/snd_codec_mp3.c b/code/client/snd_codec_mp3.c
index 80a02326..06d1f1c7 100644
--- a/code/client/snd_codec_mp3.c
+++ b/code/client/snd_codec_mp3.c
@@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "snd_codec.h"
 
 // includes for the MP3 codec
-#include "../libmad-0.15.1b/synth.h"
+#if USE_SOUND_NEW
+#   include "mad.h"
+#else
+#   include "../libmad-0.15.1b/synth.h"
+#endif
 
 #define MP3_SAMPLE_WIDTH		2
 #define MP3_PCMSAMPLES_PERSLICE		32
diff --git a/code/libmad/.github/workflows/build.yml b/code/libmad/.github/workflows/build.yml
new file mode 100644
index 00000000..ba50e409
--- /dev/null
+++ b/code/libmad/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu
+            os: ubuntu-latest
+            install_dir: ~/libmad
+            cmake_extras: -DCMAKE_BUILD_TYPE=RelWithDebInfo
+          - name: macOS
+            os: macos-latest
+            install_dir: ~/libmad
+            cmake_extras: -DCMAKE_BUILD_TYPE=RelWithDebInfo
+          - name: Windows
+            os: windows-latest
+            install_dir: C:\libmad
+            cmake_config: --config RelWithDebInfo
+
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Check out Git repository
+      uses: actions/checkout@v2
+    - name: Configure
+      run: cmake -DCMAKE_INSTALL_PREFIX=${{ matrix.install_dir }} ${{ matrix.cmake_extras }} -S . -B build
+    - name: Build
+      run: cmake --build build ${{ matrix.cmake_config }}
+      env:
+        CMAKE_BUILD_PARALLEL_LEVEL: 2
+    - name: Install
+      run: cmake --install . ${{ matrix.cmake_config }}
+      working-directory: build
+    - name: Upload Build Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.name }} libmad build
+        path: ${{ matrix.install_dir }}
diff --git a/code/libmad/.gitignore b/code/libmad/.gitignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/code/libmad/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/code/libmad/CHANGES b/code/libmad/CHANGES
new file mode 100644
index 00000000..45a94436
--- /dev/null
+++ b/code/libmad/CHANGES
@@ -0,0 +1,360 @@
+
+ libmad - MPEG audio decoder library
+ Copyright (C) 2000-2004 Underbit Technologies, Inc.
+
+ $Id: CHANGES,v 1.14 2004/02/17 02:02:03 rob Exp $
+
+===============================================================================
+
+Verison 0.16.4
+  * Fix compatibility with libmad 0.15.1b
+
+Version 0.16.3
+  * Disable assembly optimizations for all 64 bit CPU architectures; they are
+    only for 32 and 16 bit architectures
+  * Fix CPU architecture detection for PowerPC
+
+Version 0.16.2
+  * Fix building assembly file on ARM
+  * Fix pkgconfig file when CMAKE_INSTALL_{INCLUDE,LIB}DIR are absolute paths
+
+Version 0.16.1
+  * Fix generation of mad.h broken by move to CMake
+  * Add CMake options for CPU architecture-specific optimizations
+
+Version 0.16.0
+  * Add CMake build system
+  * Remove autotools build system
+  * Add pkgconfig and CMake config files
+  * Apply patches from Debian and Fedora
+
+Version 0.15.1 (beta)
+
+  * Updated to autoconf 2.59, automake 1.8.2, libtool 1.5.2.
+
+  * Replaced Layer III IMDCT routine with one based on a faster algorithm,
+    improving both speed and accuracy.
+
+  * Improved portability of the Huffman table initialization.
+
+  * Fixed a problem that could result in an assertion failure in layer3.c
+    due to an invalid Layer III free format bitrate.
+
+  * Improved the robustness of Layer II bitrate/mode combinations, and added
+    a new MAD_ERROR_BADMODE error enum. The allowability of low-bitrate
+    stereo streams is influenced by the --enable-strict-iso option to
+    `configure'.
+
+Version 0.15.0 (beta)
+
+  * Updated to autoconf 2.57, automake 1.7.5, libtool 1.4.3.
+
+  * Added new mad_f_div() API routine.
+
+  * Added a 64th entry to the Layer I/Layer II scalefactor table, for better
+    compatibility with existing streams. The --enable-strict-iso option to
+    `configure' can be used to disable use of this entry.
+
+  * Modified the header decoding routine to allow the reserved emphasis
+    value, for better compatibility with existing streams. The
+    --enable-strict-iso option to `configure' can be used to restore the
+    previous behavior of reporting this value as an error.
+
+  * Added new MAD_EMPHASIS_RESERVED enumeration constant.
+
+  * Fixed a bug in the ARM version of mad_f_scale64() discovered by Andre
+    McCurdy.
+
+  * Rewrote PowerPC assembly for minor gains.
+
+  * Modified mad_timer_fraction() to avoid the possibility of division by
+    zero when 0 is passed as the second argument.
+
+  * Fixed a non-fatal problem caused by attempting to designate ancillary
+    bits in Layer III after a decoding error.
+
+  * Changed to build a shared library by default.
+
+  * Changed to use native Cygwin build by default; give --host=mingw32 to
+    `configure' to use MinGW (and avoid a dependency on the Cygwin DLL).
+
+Version 0.14.2 (beta)
+
+  * Changed Cygwin builds to use MinGW; resulting Win32 executables no
+    longer have a dependency on Cygwin DLLs.
+
+  * Added a new mad_stream_errorstr() API function to libmad for retrieving
+    a string description of the current error condition.
+
+Version 0.14.1 (beta)
+
+  * Updated config.guess and config.sub to latest upstream versions.
+
+  * Enabled libtool versioning rather than release numbering.
+
+  * Improved the documentation in minimad.c.
+
+  * Several other small fixes.
+
+Version 0.14.0 (beta)
+
+  * Added a 64-bit FPM negation operation to improve performance of subband
+    synthesis on some platforms.
+
+  * Improved MSVC++ portability and added MSVC++ project files.
+
+  * Added rounding to Layer III requantization for slightly better accuracy.
+
+Version 0.13.0 (beta)
+
+  * Ancillary data is now properly extracted from Layer III streams.
+
+  * Rewrote the Layer III joint stereo decoding routine to correct a major
+    MPEG-2 problem and a minor MPEG-1 problem decoding intensity stereo.
+
+  * Eliminated the dependency on sign-extending right shifts for Layer I and
+    Layer II.
+
+  * Renamed `private' field to `private_bits' for better C++ compatibility.
+
+  * Gratuitously renamed `sfreq' field to `samplerate' and
+    MAD_ERROR_BADSAMPLEFREQ constant to MAD_ERROR_BADSAMPLERATE.
+
+  * Added `samplerate' and `channels' fields to synth.pcm struct to allow
+    these to be different from the decoded frame, and for simpler access.
+
+  * Added new mad_stream_options() and mad_decoder_options() API entries for
+    special runtime decoding options.
+
+  * Added new MAD_OPTION_IGNORECRC and MAD_OPTION_HALFSAMPLERATE options.
+
+  * Added new MAD_FLAG_FREEFORMAT indicator flag.
+
+  * Fixed some bugs in the async decoder.
+
+  * Added a new mad_timer_multiply() API routine.
+
+  * Eliminated `+' from asm constraints under Intel for better compatibility
+    with some compilers.
+
+  * Fixed a PIC-related problem in imdct_l_arm.S.
+
+  * Eliminated a static variable to make libmad thread-safe.
+
+Version 0.12.5 (beta)
+
+  * Modified Layer III requantization to occur during Huffman decoding for
+    significant performance gains.
+
+  * Optimized short block IMDCT by eliminating redundant calculations.
+
+  * Made several other Layer III performance improvements; added
+    ASO_INTERLEAVE1, ASO_INTERLEAVE2, and ASO_ZEROCHECK
+    architecture-specific options for best performance on various
+    architectures.
+
+  * Optimized synthesis DCT to store result values as soon as they are
+    calculated.
+
+Version 0.12.4 (beta)
+
+  * New PowerPC fixed-point assembly courtesy of David Blythe.
+
+  * Reorganized fixed-point assembly routines for easier maintenance and
+    better performance.
+
+  * Improved performance of subband synthesis through better indexing and
+    fewer local variables.
+
+  * Added alias reduction for the lower two subbands of mixed short blocks,
+    per a report of ambiguity with ISO/IEC 11172-3 and for uniformity with
+    most other implementations. Also improved alias reduction performance
+    using multiply/accumulate.
+
+  * Added --enable-strict-iso option to `configure' to override best
+    accepted practices such as the alias reduction for mixed short blocks.
+
+  * Improved performance of Layer III IMDCT by using longer
+    multiply/accumulate runs where possible.
+
+Version 0.12.3 (beta)
+
+  * Added MPEG 2.5 support.
+
+  * Added preliminary support for parameterizing the binary point position
+    in the fixed-point representation.
+
+  * Added multiply/accumulate optimization to the Layer III IMDCT for long
+    blocks.
+
+  * Fixed a bug in the handling of Layer III mixed_block_flag.
+
+  * Fixed a configure problem when multiple -O CFLAGS are present.
+
+Version 0.12.2 (beta)
+
+  * Rearranged the synthesis polyphase filterbank memory vector for better
+    locality of reference, and rewrote mad_synth_frame() to accommodate,
+    resulting in improved performance.
+
+  * Discovered a combination of compiler optimization flags that further
+    improve performance.
+
+  * Changed some array references in layer3.c to pointer derefs.
+
+Version 0.12.1 (beta)
+
+  * Resolved the intensity + MS joint stereo issue (a simple bug).
+    OPT_ISKLUGE is no longer considered to be a kluge.
+
+  * Fixed another, hopefully last main_data memory bug.
+
+  * Split part of struct mad_frame into struct mad_header for convenience
+    and size.
+
+Version 0.12.0 (alpha)
+
+  * Changed the build environment to use automake and libtool. A libmad
+    shared library can now be built using the --enable-shared option to
+    `configure'.
+
+  * Added another callback to MAD's high-level decoder API after the frame
+    header has been read but before the frame's audio data is decoded.
+
+  * Streamlined header processing so that mad_frame_decode() can be called
+    with or without having already called mad_frame_header().
+
+  * Fixed some other header reading miscellany, including CRC handling and
+    free bitrate detection, and frame length verification with free
+    bitrates.
+
+  * Fixed a problem with Layer III free bitrates > 320 kbps. The main_data
+    buffer size should now be large enough to handle any size frame, by
+    virtue of the maximum possible part2_3_length.
+
+  * Further developed the async API; arbitrary messages can now be passed to
+    the subsidiary decoding process.
+
+  * Streamlined timer.c and extended its interface. It now has support for
+    video frame/field lengths, including output support for drop-frame
+    encoding.
+
+  * Replaced many constant integer preprocessor defines with enums.
+
+Version 0.11.4 (beta)
+
+  * Fixed free format bitrate discovery.
+
+  * Changed the timer implementation and extended its interface.
+
+  * Integrated Nicolas Pitre's patch for pre-shifting at compile-time and
+    for better multiply/accumulate code output.
+
+  * Applied Simon Burge's patch to imdct_l_arm.S for a.out compatibility.
+
+  * Added -mtune=strongarm for all ARM targets.
+
+Version 0.11.3 (beta)
+
+  * Added new --enable-speed and --enable-accuracy options for `configure'
+    to automatically select appropriate SSO/ASO options, et al.
+
+  * Modified subband synthesis to use multiply/accumulate optimization (if
+    available) for better speed and/or accuracy.
+
+  * Incorporated Andre McCurdy's changes for further rounding optimizations
+    in the rest of his code.
+
+Version 0.11.2 (beta)
+
+  * Incorporated Nicolas Pitre's ARM assembly and parameterized scaling
+    changes.
+
+  * Incorporated Andre McCurdy's ARM assembly optimization (used only if
+    --enable-aso is given to `configure' to enable architecture-specific
+    optimizations.)
+
+  * Reduced FPM_INTEL assembly to two instructions.
+
+  * Fixed accuracy problems with certain FPM modes in synth.c.
+
+  * Improved the accuracy of FPM_APPROX.
+
+  * Improved the accuracy of SSO.
+
+  * Improved sync discovery by checking for a sync word in the following
+    frame.
+
+  * Minor code clean-up.
+
+  * Added experimental rules for generating a libmad.so shared library.
+
+Version 0.11.1 (beta)
+
+  * Moved libmad code into a separate directory.
+
+  * Changed SSO to be disabled by default, as output accuracy is deemed to
+    be more important than speed in the general case.
+
+  * Fixed a bug in Layer III sanity checking that could cause a crash on
+    certain random data input.
+
+  * Extended the Layer III requantization table from 8191 to 8206 as some
+    encoders are known to use these values, even though ISO/IEC 11172-3
+    suggests the maximum should be 8191.
+
+Version 0.11.0 (beta)
+
+  * Implemented MPEG-2 extension to Lower Sampling Frequencies.
+
+  * Improved Layer III performance by avoiding IMDCT calculation when all
+    input samples are zero.
+
+  * Significantly reduced size of Layer II tables.
+
+Version 0.10.3 (beta)
+
+  * Improved SSO output quality.
+
+  * Made portable to cygwin.
+
+  * Localized memory references in III_huffdecode() for better performance.
+
+Version 0.10.2 (beta)
+
+  * Rewrote Layer III long block 36-point IMDCT routine for better
+    performance.
+
+  * Improved subband synthesis fixed-point games somewhat.
+
+Version 0.10.1 (beta)
+
+  * Added a subband synthesis optimization (SSO) which involves modifying
+    the fixed-point multiplication method during windowing. This produces
+    subtle differences in the output but improves performance greatly.
+
+  * Added I_STEREO and MS_STEREO flags to frame struct.
+
+  * Eliminated privately-used CRCFAILED flag.
+
+  * Fixed a bug where Layer III decoding could crash on some badly-formatted
+    (e.g. non-MPEG) bitstreams.
+
+  * Miscellaneous code clean-up.
+
+Version 0.10.0 (beta)
+
+  * Added SPARC fixed-point math support.
+
+  * Revamped libmad API for better high- and low-level support.
+
+  * Documented more of the code.
+
+  * Changed sync semantics such that new stream buffers are assumed to be
+    sync-aligned.
+
+  * Changed Layer III to dynamically allocate static memory so as not to
+    waste it (about 6.4K) when only decoding Layer I or Layer II.
+
+===============================================================================
+
diff --git a/code/libmad/CMakeLists.txt b/code/libmad/CMakeLists.txt
new file mode 100644
index 00000000..6524ce5d
--- /dev/null
+++ b/code/libmad/CMakeLists.txt
@@ -0,0 +1,240 @@
+cmake_minimum_required(VERSION 3.1.0)
+project(mad VERSION 0.16.4)
+
+option(BUILD_SHARED_LIBS "Build dynamic library" ON)
+
+# The library SOVERSION. This is set to 0 for backward compatibility.
+# The general policy is that minor versions of the library (e.g., 0.16.1,
+# 0.16.2) don't constitute a major ABI breakage. Major versions (e.g., 0.17,
+# 0.18) do.
+set(LIBRARY_SOVERSION 0)
+
+include(GNUInstallDirs)
+include(CheckTypeSize)
+
+#
+# Build
+#
+
+add_library(mad
+    bit.c
+    decoder.c
+    fixed.c
+    frame.c
+    huffman.c
+    layer12.c
+    layer3.c
+    stream.c
+    synth.c
+    timer.c
+    version.c
+)
+target_include_directories(mad PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+if(WIN32 AND BUILD_SHARED_LIBS)
+    set_target_properties(mad PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+set_target_properties(mad PROPERTIES
+  VERSION ${PROJECT_VERSION}
+  SOVERSION ${LIBRARY_SOVERSION}
+)
+
+#
+# Compile definitions
+#
+
+option(OPTIMIZE "Optimize for SPEED (default) or ACCURACY" SPEED)
+if(OPTIMIZE STREQUAL "SPEED")
+  message(STATUS "Optimizing for speed over accuracy.")
+  target_compile_definitions(mad PRIVATE OPT_SPEED)
+else()
+  message(STATUS "Optimizing for accuracy over speed.")
+  target_compile_definitions(mad PRIVATE OPT_ACCURACY)
+endif()
+
+option(ASO "Enable CPU Architecture Specific Optimizations (x86, ARM, and MIPS only)" ON)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  message(STATUS "Using 64 bit fixed point math")
+  option(FPM_64BIT "64 bit fixed point math" ON)
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86" OR "i386")
+  message(STATUS "Using x86 fixed point math")
+  option (FPM_INTEL "x86 fixed point math" ON)
+  if(ASO)
+    target_compile_definitions(mad PRIVATE ASO_ZEROCHECK)
+  endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(arm|ARM).*")
+  message(STATUS "Using ARM fixed point math")
+  option (FPM_ARM "ARM fixed point math" ON)
+  if(ASO)
+    enable_language(ASM)
+    target_compile_definitions(mad PRIVATE ASO_INTERLEAVE1 ASO_IMDCT)
+    target_sources(mad PRIVATE imdct_l_arm.S)
+  endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(mips|MIPS).*")
+  message(STATUS "Using MIPS fixed point math")
+  option(FPM_MIPS "MIPS fixed point math" ON)
+  if(ASO)
+    target_compile_definitions(mad PRIVATE ASO_INTERLEAVE2 ASO_ZEROCHECK)
+  endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(sparc|SPARC).*")
+  message(STATUS "Using SPARC fixed point math")
+  option(FPM_SPARC "SPARC fixed point math" ON)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".(ppc|PPC|powerpc).*")
+  message(STATUS "Using PowerPC fixed point math")
+  option(FPM_PPC "PowerPC fixed point math" ON)
+else()
+  message(WARNING "Target CPU architecture not detected. Fixed-point math will yield limited accuracy.")
+  option(FPM_DEFAULT "Generic fixed-point math" ON)
+endif()
+
+
+check_type_size(int SIZEOF_INT BUILTIN_TYPES_ONLY LANGUAGE C)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mad.h.in ${CMAKE_CURRENT_BINARY_DIR}/mad.h @ONLY)
+
+include(CheckIncludeFile)
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+if(HAVE_SYS_TYPES_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_TYPES_H)
+endif()
+
+check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
+if(HAVE_SYS_WAIT_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_WAIT_H)
+endif()
+
+check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
+if(HAVE_SYS_MMAN_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_MMAN_H)
+endif()
+
+check_include_file(sys/stat.h HAVE_SYS_STAT_H)
+if(HAVE_SYS_STAT_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_STAT_H)
+endif()
+
+check_include_file(unistd.h HAVE_UNISTD_H)
+if(HAVE_UNISTD_H)
+  target_compile_definitions(mad PRIVATE HAVE_UNISTD_H)
+endif()
+
+check_include_file(assert.h HAVE_ASSERT_H)
+if(HAVE_ASSERT_H)
+  target_compile_definitions(mad PRIVATE HAVE_ASSERT_H)
+endif()
+
+check_include_file(fcntl.h HAVE_FCNTL_H)
+if(HAVE_FCNTL_H)
+  target_compile_definitions(mad PRIVATE HAVE_FCNTL_H)
+endif()
+
+check_include_file(limits.h HAVE_LIMITS_H)
+if(HAVE_LIMITS_H)
+  target_compile_definitions(mad PRIVATE HAVE_LIMITS_H)
+endif()
+
+include(CheckFunctionExists)
+check_function_exists(ftruncate HAVE_FTRUNCATE)
+if(HAVE_FTRUNCATE)
+  target_compile_definitions(mad PRIVATE HAVE_FTRUNCATE)
+endif()
+
+check_function_exists(pipe HAVE_PIPE)
+if(HAVE_PIPE)
+  target_compile_definitions(mad PRIVATE HAVE_PIPE)
+endif()
+
+check_function_exists(fork HAVE_FORK)
+if(HAVE_FORK)
+  target_compile_definitions(mad PRIVATE HAVE_FORK)
+endif()
+
+check_function_exists(waitpid HAVE_WAITPID)
+if(HAVE_WAITPID)
+  target_compile_definitions(mad PRIVATE HAVE_WAITPID)
+endif()
+
+option(MADD_ASM "Enable if your MIPS CPU supports a 2-operand MADD instruction." OFF)
+if(MADD_ASM)
+  target_compile_definitions(mad PRIVATE HAVE_MADD_ASM)
+endif()
+
+option(MADD16_ASM "Enable if your MIPS CPU supports a 2-operand MADD16 instruction." OFF)
+if(MADD16_ASM)
+  target_compile_definitions(mad PRIVATE HAVE_MADD_ASM)
+endif()
+
+#
+# Example application
+#
+
+include(CMakeDependentOption)
+cmake_dependent_option(EXAMPLE "Build example executable" ON "HAVE_UNISTD_H;HAVE_SYS_STAT_H;HAVE_SYS_MMAN_H" OFF)
+if(EXAMPLE)
+  add_executable(mad_example minimad.c)
+  target_link_libraries(mad_example PRIVATE mad)
+endif()
+
+#
+# Installation
+#
+
+include(CMakePackageConfigHelpers)
+
+# Library files
+install(TARGETS mad
+  EXPORT madTargets
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+  INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+# Header files
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/mad.h"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+# pkgconfig
+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+  set(PKGCONFIG_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(PKGCONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+  set(PKGCONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+  set(PKGCONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packaging/mad.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/packaging/mad.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/mad.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
+# CMake config
+set(MAD_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/mad")
+install(
+  EXPORT madTargets
+  FILE madTargets.cmake
+  NAMESPACE mad::
+  DESTINATION "${MAD_INSTALL_CMAKEDIR}"
+)
+configure_package_config_file(packaging/madConfig.cmake.in
+  "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfig.cmake"
+  INSTALL_DESTINATION "${MAD_INSTALL_CMAKEDIR}"
+)
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfigVersion.cmake"
+  VERSION "${PROJECT_VERSION}"
+  COMPATIBILITY SameMajorVersion
+)
+install(
+  FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfigVersion.cmake"
+  DESTINATION "${MAD_INSTALL_CMAKEDIR}"
+)
diff --git a/code/libmad/COPYING b/code/libmad/COPYING
new file mode 100644
index 00000000..d60c31a9
--- /dev/null
+++ b/code/libmad/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/code/libmad/COPYRIGHT b/code/libmad/COPYRIGHT
new file mode 100644
index 00000000..ed91d2ba
--- /dev/null
+++ b/code/libmad/COPYRIGHT
@@ -0,0 +1,21 @@
+
+ libmad - MPEG audio decoder library
+ Copyright (C) 2000-2004 Underbit Technologies, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ If you would like to negotiate alternate licensing terms, you may do
+ so by contacting: Underbit Technologies, Inc. <info@underbit.com>
+
diff --git a/code/libmad/CREDITS b/code/libmad/CREDITS
new file mode 100644
index 00000000..72ec72ed
--- /dev/null
+++ b/code/libmad/CREDITS
@@ -0,0 +1,116 @@
+
+ libmad - MPEG audio decoder library
+ Copyright (C) 2000-2004 Underbit Technologies, Inc.
+
+ $Id: CREDITS,v 1.5 2004/02/17 02:02:03 rob Exp $
+
+===============================================================================
+
+AUTHOR
+
+  Except where otherwise noted, all code was authored by:
+
+      Robert Leslie <rob@underbit.com>
+
+CONTRIBUTORS
+
+  Significant contributions have been incorporated with thanks to:
+
+      Anonymous
+        2002/03/15: frame.c
+          - Reported problem with use of reserved emphasis value.
+        2003/08/31: layer12.c
+          - Suggested support for certain disallowed bitrate/mode
+            combinations.
+
+      Niek Albers <info@daansystems.com>
+        2003/04/21: layer3.c
+          - Reported runtime uninitialized use of `ptr' in designating
+            ancillary bits after a decoding error.
+
+      Christian Biere <cbiere@users.sourceforge.net>
+        2003/02/01: frame.c
+          - Reported assertion failure in layer3.c due to an
+            invalid/unsupported Layer III free format bitrate.
+
+      David Blythe <blythe@routefree.com>
+        2001/01/30: fixed.h
+          - Provided initial PowerPC fixed-point assembly.
+
+      Simon Burge <simonb@wasabisystems.com>
+        2000/09/20: imdct_l_arm.S
+          - Suggested patch for a.out compatibility.
+
+      Brian Cameron <Brian.Cameron@sun.com>
+        2003/07/02: huffman.c
+          - Suggested changes for improved portability.
+
+      Joshua Haberman <joshua@haberman.com>
+        2001/08/10: decoder.c, huffman.c
+          - Suggested portability fixes.
+
+      Timothy King <lordzork@lordzork.com>
+        2002/05/04: sf_table.dat, layer12.c
+          - Reported problem with use of (missing) scalefactor index 63.
+
+      Felix von Leitner <felix-mad@fefe.de>
+        2003/01/21: fixed.h
+          - Suggested Intel scaling alternative for possible speedup.
+
+      Andre McCurdy <armccurdy@yahoo.co.uk>
+        2000/08/10: imdct_l_arm.S
+          - ARM optimized assembly replacement for III_imdct_l().
+        2000/09/15: imdct_l_arm.S
+          - Applied Nicolas Pitre's rounding optimisation in all remaining
+            places.
+        2001/02/10: layer3.c
+          - Inspiration for Huffman decoding and requantization rewrite, and
+            other miscellany.
+        2001/03/24: imdct_l_arm.S
+          - Corrected PIC unsafe code.
+        2002/02/16: fixed.h
+          - Discovered bug in ARM version of mad_f_scale64().
+
+      Haruhiko OGASAWARA <theta@m1.interq.or.jp>
+        2001/01/28: layer3.c
+          - Reported discrepancy in alias reduction for mixed short blocks.
+
+      Brett Paterson <brett@fmod.org>
+        2001/10/28: global.h
+          - Reported missing <assert.h> et al. under MS Embedded Visual C.
+
+      Sean 'Shaleh' Perry <shaleh@via.net>
+        2000/04/04: fixed.h
+          - Suggested use of size-dependent typedefs.
+        2001/10/22: config.guess, config.sub
+          - Keep up to date for proper Debian packaging.
+
+      Bertrand Petit <eemad@phoe.frmug.org>
+        2001/11/05: synth.h
+          - Suggested PCM channel enumeration constants.
+        2001/11/05: stream.h
+          - Suggested MAD_ERROR_NONE enumeration constant.
+        2001/11/05: stream.c
+          - Suggested mad_stream_errorstr() function.
+
+      Nicolas Pitre <nico@cam.org>
+        2000/09/09: fixed.h
+          - Parameterized all scaling for correct use of all multiplication
+            methods within mad_synth_frame().
+          - Rewrote the FPM_ARM version of mad_f_mul() so we have 64-bit
+            multiplication result, rounding and scaling with 3 instructions.
+        2000/09/09: imdct_l_arm.S
+          - Optimized rounding + scaling operations.
+        2000/09/17: synth.c
+          - Changed D[] run-time shifts to compile-time.
+          - Modified synthesis for better multiply/accumulate code output.
+        2001/08/11: fixed.h, synth.c
+          - Suggested 64-bit FPM negation and negative term factorization
+            during synthesis.
+        2001/08/11: fixed.h
+          - Suggested unrounded behavior for FPM_DEFAULT when OPT_SPEED.
+        2001/11/19: fixed.c
+          - Suggested computation of any resampling ratio.
+
+===============================================================================
+
diff --git a/code/libmad/D.dat b/code/libmad/D.dat
new file mode 100644
index 00000000..4a7fa4fa
--- /dev/null
+++ b/code/libmad/D.dat
@@ -0,0 +1,607 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: D.dat,v 1.9 2004/01/23 09:41:32 rob Exp $
+ */
+
+/*
+ * These are the coefficients for the subband synthesis window. This is a
+ * reordered version of Table B.3 from ISO/IEC 11172-3.
+ *
+ * Every value is parameterized so that shift optimizations can be made at
+ * compile-time. For example, every value can be right-shifted 12 bits to
+ * minimize multiply instruction times without any loss of accuracy.
+ */
+
+  {  PRESHIFT(0x00000000) /*  0.000000000 */,	/*  0 */
+    -PRESHIFT(0x0001d000) /* -0.000442505 */,
+     PRESHIFT(0x000d5000) /*  0.003250122 */,
+    -PRESHIFT(0x001cb000) /* -0.007003784 */,
+     PRESHIFT(0x007f5000) /*  0.031082153 */,
+    -PRESHIFT(0x01421000) /* -0.078628540 */,
+     PRESHIFT(0x019ae000) /*  0.100311279 */,
+    -PRESHIFT(0x09271000) /* -0.572036743 */,
+     PRESHIFT(0x1251e000) /*  1.144989014 */,
+     PRESHIFT(0x09271000) /*  0.572036743 */,
+     PRESHIFT(0x019ae000) /*  0.100311279 */,
+     PRESHIFT(0x01421000) /*  0.078628540 */,
+     PRESHIFT(0x007f5000) /*  0.031082153 */,
+     PRESHIFT(0x001cb000) /*  0.007003784 */,
+     PRESHIFT(0x000d5000) /*  0.003250122 */,
+     PRESHIFT(0x0001d000) /*  0.000442505 */,
+
+     PRESHIFT(0x00000000) /*  0.000000000 */,
+    -PRESHIFT(0x0001d000) /* -0.000442505 */,
+     PRESHIFT(0x000d5000) /*  0.003250122 */,
+    -PRESHIFT(0x001cb000) /* -0.007003784 */,
+     PRESHIFT(0x007f5000) /*  0.031082153 */,
+    -PRESHIFT(0x01421000) /* -0.078628540 */,
+     PRESHIFT(0x019ae000) /*  0.100311279 */,
+    -PRESHIFT(0x09271000) /* -0.572036743 */,
+     PRESHIFT(0x1251e000) /*  1.144989014 */,
+     PRESHIFT(0x09271000) /*  0.572036743 */,
+     PRESHIFT(0x019ae000) /*  0.100311279 */,
+     PRESHIFT(0x01421000) /*  0.078628540 */,
+     PRESHIFT(0x007f5000) /*  0.031082153 */,
+     PRESHIFT(0x001cb000) /*  0.007003784 */,
+     PRESHIFT(0x000d5000) /*  0.003250122 */,
+     PRESHIFT(0x0001d000) /*  0.000442505 */ },
+
+  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  1 */
+    -PRESHIFT(0x0001f000) /* -0.000473022 */,
+     PRESHIFT(0x000da000) /*  0.003326416 */,
+    -PRESHIFT(0x00207000) /* -0.007919312 */,
+     PRESHIFT(0x007d0000) /*  0.030517578 */,
+    -PRESHIFT(0x0158d000) /* -0.084182739 */,
+     PRESHIFT(0x01747000) /*  0.090927124 */,
+    -PRESHIFT(0x099a8000) /* -0.600219727 */,
+     PRESHIFT(0x124f0000) /*  1.144287109 */,
+     PRESHIFT(0x08b38000) /*  0.543823242 */,
+     PRESHIFT(0x01bde000) /*  0.108856201 */,
+     PRESHIFT(0x012b4000) /*  0.073059082 */,
+     PRESHIFT(0x0080f000) /*  0.031478882 */,
+     PRESHIFT(0x00191000) /*  0.006118774 */,
+     PRESHIFT(0x000d0000) /*  0.003173828 */,
+     PRESHIFT(0x0001a000) /*  0.000396729 */,
+
+    -PRESHIFT(0x00001000) /* -0.000015259 */,
+    -PRESHIFT(0x0001f000) /* -0.000473022 */,
+     PRESHIFT(0x000da000) /*  0.003326416 */,
+    -PRESHIFT(0x00207000) /* -0.007919312 */,
+     PRESHIFT(0x007d0000) /*  0.030517578 */,
+    -PRESHIFT(0x0158d000) /* -0.084182739 */,
+     PRESHIFT(0x01747000) /*  0.090927124 */,
+    -PRESHIFT(0x099a8000) /* -0.600219727 */,
+     PRESHIFT(0x124f0000) /*  1.144287109 */,
+     PRESHIFT(0x08b38000) /*  0.543823242 */,
+     PRESHIFT(0x01bde000) /*  0.108856201 */,
+     PRESHIFT(0x012b4000) /*  0.073059082 */,
+     PRESHIFT(0x0080f000) /*  0.031478882 */,
+     PRESHIFT(0x00191000) /*  0.006118774 */,
+     PRESHIFT(0x000d0000) /*  0.003173828 */,
+     PRESHIFT(0x0001a000) /*  0.000396729 */ },
+
+  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  2 */
+    -PRESHIFT(0x00023000) /* -0.000534058 */,
+     PRESHIFT(0x000de000) /*  0.003387451 */,
+    -PRESHIFT(0x00245000) /* -0.008865356 */,
+     PRESHIFT(0x007a0000) /*  0.029785156 */,
+    -PRESHIFT(0x016f7000) /* -0.089706421 */,
+     PRESHIFT(0x014a8000) /*  0.080688477 */,
+    -PRESHIFT(0x0a0d8000) /* -0.628295898 */,
+     PRESHIFT(0x12468000) /*  1.142211914 */,
+     PRESHIFT(0x083ff000) /*  0.515609741 */,
+     PRESHIFT(0x01dd8000) /*  0.116577148 */,
+     PRESHIFT(0x01149000) /*  0.067520142 */,
+     PRESHIFT(0x00820000) /*  0.031738281 */,
+     PRESHIFT(0x0015b000) /*  0.005294800 */,
+     PRESHIFT(0x000ca000) /*  0.003082275 */,
+     PRESHIFT(0x00018000) /*  0.000366211 */,
+
+    -PRESHIFT(0x00001000) /* -0.000015259 */,
+    -PRESHIFT(0x00023000) /* -0.000534058 */,
+     PRESHIFT(0x000de000) /*  0.003387451 */,
+    -PRESHIFT(0x00245000) /* -0.008865356 */,
+     PRESHIFT(0x007a0000) /*  0.029785156 */,
+    -PRESHIFT(0x016f7000) /* -0.089706421 */,
+     PRESHIFT(0x014a8000) /*  0.080688477 */,
+    -PRESHIFT(0x0a0d8000) /* -0.628295898 */,
+     PRESHIFT(0x12468000) /*  1.142211914 */,
+     PRESHIFT(0x083ff000) /*  0.515609741 */,
+     PRESHIFT(0x01dd8000) /*  0.116577148 */,
+     PRESHIFT(0x01149000) /*  0.067520142 */,
+     PRESHIFT(0x00820000) /*  0.031738281 */,
+     PRESHIFT(0x0015b000) /*  0.005294800 */,
+     PRESHIFT(0x000ca000) /*  0.003082275 */,
+     PRESHIFT(0x00018000) /*  0.000366211 */ },
+
+  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  3 */
+    -PRESHIFT(0x00026000) /* -0.000579834 */,
+     PRESHIFT(0x000e1000) /*  0.003433228 */,
+    -PRESHIFT(0x00285000) /* -0.009841919 */,
+     PRESHIFT(0x00765000) /*  0.028884888 */,
+    -PRESHIFT(0x0185d000) /* -0.095169067 */,
+     PRESHIFT(0x011d1000) /*  0.069595337 */,
+    -PRESHIFT(0x0a7fe000) /* -0.656219482 */,
+     PRESHIFT(0x12386000) /*  1.138763428 */,
+     PRESHIFT(0x07ccb000) /*  0.487472534 */,
+     PRESHIFT(0x01f9c000) /*  0.123474121 */,
+     PRESHIFT(0x00fdf000) /*  0.061996460 */,
+     PRESHIFT(0x00827000) /*  0.031845093 */,
+     PRESHIFT(0x00126000) /*  0.004486084 */,
+     PRESHIFT(0x000c4000) /*  0.002990723 */,
+     PRESHIFT(0x00015000) /*  0.000320435 */,
+
+    -PRESHIFT(0x00001000) /* -0.000015259 */,
+    -PRESHIFT(0x00026000) /* -0.000579834 */,
+     PRESHIFT(0x000e1000) /*  0.003433228 */,
+    -PRESHIFT(0x00285000) /* -0.009841919 */,
+     PRESHIFT(0x00765000) /*  0.028884888 */,
+    -PRESHIFT(0x0185d000) /* -0.095169067 */,
+     PRESHIFT(0x011d1000) /*  0.069595337 */,
+    -PRESHIFT(0x0a7fe000) /* -0.656219482 */,
+     PRESHIFT(0x12386000) /*  1.138763428 */,
+     PRESHIFT(0x07ccb000) /*  0.487472534 */,
+     PRESHIFT(0x01f9c000) /*  0.123474121 */,
+     PRESHIFT(0x00fdf000) /*  0.061996460 */,
+     PRESHIFT(0x00827000) /*  0.031845093 */,
+     PRESHIFT(0x00126000) /*  0.004486084 */,
+     PRESHIFT(0x000c4000) /*  0.002990723 */,
+     PRESHIFT(0x00015000) /*  0.000320435 */ },
+
+  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  4 */
+    -PRESHIFT(0x00029000) /* -0.000625610 */,
+     PRESHIFT(0x000e3000) /*  0.003463745 */,
+    -PRESHIFT(0x002c7000) /* -0.010848999 */,
+     PRESHIFT(0x0071e000) /*  0.027801514 */,
+    -PRESHIFT(0x019bd000) /* -0.100540161 */,
+     PRESHIFT(0x00ec0000) /*  0.057617187 */,
+    -PRESHIFT(0x0af15000) /* -0.683914185 */,
+     PRESHIFT(0x12249000) /*  1.133926392 */,
+     PRESHIFT(0x075a0000) /*  0.459472656 */,
+     PRESHIFT(0x0212c000) /*  0.129577637 */,
+     PRESHIFT(0x00e79000) /*  0.056533813 */,
+     PRESHIFT(0x00825000) /*  0.031814575 */,
+     PRESHIFT(0x000f4000) /*  0.003723145 */,
+     PRESHIFT(0x000be000) /*  0.002899170 */,
+     PRESHIFT(0x00013000) /*  0.000289917 */,
+
+    -PRESHIFT(0x00001000) /* -0.000015259 */,
+    -PRESHIFT(0x00029000) /* -0.000625610 */,
+     PRESHIFT(0x000e3000) /*  0.003463745 */,
+    -PRESHIFT(0x002c7000) /* -0.010848999 */,
+     PRESHIFT(0x0071e000) /*  0.027801514 */,
+    -PRESHIFT(0x019bd000) /* -0.100540161 */,
+     PRESHIFT(0x00ec0000) /*  0.057617187 */,
+    -PRESHIFT(0x0af15000) /* -0.683914185 */,
+     PRESHIFT(0x12249000) /*  1.133926392 */,
+     PRESHIFT(0x075a0000) /*  0.459472656 */,
+     PRESHIFT(0x0212c000) /*  0.129577637 */,
+     PRESHIFT(0x00e79000) /*  0.056533813 */,
+     PRESHIFT(0x00825000) /*  0.031814575 */,
+     PRESHIFT(0x000f4000) /*  0.003723145 */,
+     PRESHIFT(0x000be000) /*  0.002899170 */,
+     PRESHIFT(0x00013000) /*  0.000289917 */ },
+
+  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  5 */
+    -PRESHIFT(0x0002d000) /* -0.000686646 */,
+     PRESHIFT(0x000e4000) /*  0.003479004 */,
+    -PRESHIFT(0x0030b000) /* -0.011886597 */,
+     PRESHIFT(0x006cb000) /*  0.026535034 */,
+    -PRESHIFT(0x01b17000) /* -0.105819702 */,
+     PRESHIFT(0x00b77000) /*  0.044784546 */,
+    -PRESHIFT(0x0b619000) /* -0.711318970 */,
+     PRESHIFT(0x120b4000) /*  1.127746582 */,
+     PRESHIFT(0x06e81000) /*  0.431655884 */,
+     PRESHIFT(0x02288000) /*  0.134887695 */,
+     PRESHIFT(0x00d17000) /*  0.051132202 */,
+     PRESHIFT(0x0081b000) /*  0.031661987 */,
+     PRESHIFT(0x000c5000) /*  0.003005981 */,
+     PRESHIFT(0x000b7000) /*  0.002792358 */,
+     PRESHIFT(0x00011000) /*  0.000259399 */,
+
+    -PRESHIFT(0x00001000) /* -0.000015259 */,
+    -PRESHIFT(0x0002d000) /* -0.000686646 */,
+     PRESHIFT(0x000e4000) /*  0.003479004 */,
+    -PRESHIFT(0x0030b000) /* -0.011886597 */,
+     PRESHIFT(0x006cb000) /*  0.026535034 */,
+    -PRESHIFT(0x01b17000) /* -0.105819702 */,
+     PRESHIFT(0x00b77000) /*  0.044784546 */,
+    -PRESHIFT(0x0b619000) /* -0.711318970 */,
+     PRESHIFT(0x120b4000) /*  1.127746582 */,
+     PRESHIFT(0x06e81000) /*  0.431655884 */,
+     PRESHIFT(0x02288000) /*  0.134887695 */,
+     PRESHIFT(0x00d17000) /*  0.051132202 */,
+     PRESHIFT(0x0081b000) /*  0.031661987 */,
+     PRESHIFT(0x000c5000) /*  0.003005981 */,
+     PRESHIFT(0x000b7000) /*  0.002792358 */,
+     PRESHIFT(0x00011000) /*  0.000259399 */ },
+
+  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  6 */
+    -PRESHIFT(0x00031000) /* -0.000747681 */,
+     PRESHIFT(0x000e4000) /*  0.003479004 */,
+    -PRESHIFT(0x00350000) /* -0.012939453 */,
+     PRESHIFT(0x0066c000) /*  0.025085449 */,
+    -PRESHIFT(0x01c67000) /* -0.110946655 */,
+     PRESHIFT(0x007f5000) /*  0.031082153 */,
+    -PRESHIFT(0x0bd06000) /* -0.738372803 */,
+     PRESHIFT(0x11ec7000) /*  1.120223999 */,
+     PRESHIFT(0x06772000) /*  0.404083252 */,
+     PRESHIFT(0x023b3000) /*  0.139450073 */,
+     PRESHIFT(0x00bbc000) /*  0.045837402 */,
+     PRESHIFT(0x00809000) /*  0.031387329 */,
+     PRESHIFT(0x00099000) /*  0.002334595 */,
+     PRESHIFT(0x000b0000) /*  0.002685547 */,
+     PRESHIFT(0x00010000) /*  0.000244141 */,
+
+    -PRESHIFT(0x00001000) /* -0.000015259 */,
+    -PRESHIFT(0x00031000) /* -0.000747681 */,
+     PRESHIFT(0x000e4000) /*  0.003479004 */,
+    -PRESHIFT(0x00350000) /* -0.012939453 */,
+     PRESHIFT(0x0066c000) /*  0.025085449 */,
+    -PRESHIFT(0x01c67000) /* -0.110946655 */,
+     PRESHIFT(0x007f5000) /*  0.031082153 */,
+    -PRESHIFT(0x0bd06000) /* -0.738372803 */,
+     PRESHIFT(0x11ec7000) /*  1.120223999 */,
+     PRESHIFT(0x06772000) /*  0.404083252 */,
+     PRESHIFT(0x023b3000) /*  0.139450073 */,
+     PRESHIFT(0x00bbc000) /*  0.045837402 */,
+     PRESHIFT(0x00809000) /*  0.031387329 */,
+     PRESHIFT(0x00099000) /*  0.002334595 */,
+     PRESHIFT(0x000b0000) /*  0.002685547 */,
+     PRESHIFT(0x00010000) /*  0.000244141 */ },
+
+  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/*  7 */
+    -PRESHIFT(0x00035000) /* -0.000808716 */,
+     PRESHIFT(0x000e3000) /*  0.003463745 */,
+    -PRESHIFT(0x00397000) /* -0.014022827 */,
+     PRESHIFT(0x005ff000) /*  0.023422241 */,
+    -PRESHIFT(0x01dad000) /* -0.115921021 */,
+     PRESHIFT(0x0043a000) /*  0.016510010 */,
+    -PRESHIFT(0x0c3d9000) /* -0.765029907 */,
+     PRESHIFT(0x11c83000) /*  1.111373901 */,
+     PRESHIFT(0x06076000) /*  0.376800537 */,
+     PRESHIFT(0x024ad000) /*  0.143264771 */,
+     PRESHIFT(0x00a67000) /*  0.040634155 */,
+     PRESHIFT(0x007f0000) /*  0.031005859 */,
+     PRESHIFT(0x0006f000) /*  0.001693726 */,
+     PRESHIFT(0x000a9000) /*  0.002578735 */,
+     PRESHIFT(0x0000e000) /*  0.000213623 */,
+
+    -PRESHIFT(0x00002000) /* -0.000030518 */,
+    -PRESHIFT(0x00035000) /* -0.000808716 */,
+     PRESHIFT(0x000e3000) /*  0.003463745 */,
+    -PRESHIFT(0x00397000) /* -0.014022827 */,
+     PRESHIFT(0x005ff000) /*  0.023422241 */,
+    -PRESHIFT(0x01dad000) /* -0.115921021 */,
+     PRESHIFT(0x0043a000) /*  0.016510010 */,
+    -PRESHIFT(0x0c3d9000) /* -0.765029907 */,
+     PRESHIFT(0x11c83000) /*  1.111373901 */,
+     PRESHIFT(0x06076000) /*  0.376800537 */,
+     PRESHIFT(0x024ad000) /*  0.143264771 */,
+     PRESHIFT(0x00a67000) /*  0.040634155 */,
+     PRESHIFT(0x007f0000) /*  0.031005859 */,
+     PRESHIFT(0x0006f000) /*  0.001693726 */,
+     PRESHIFT(0x000a9000) /*  0.002578735 */,
+     PRESHIFT(0x0000e000) /*  0.000213623 */ },
+
+  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/*  8 */
+    -PRESHIFT(0x0003a000) /* -0.000885010 */,
+     PRESHIFT(0x000e0000) /*  0.003417969 */,
+    -PRESHIFT(0x003df000) /* -0.015121460 */,
+     PRESHIFT(0x00586000) /*  0.021575928 */,
+    -PRESHIFT(0x01ee6000) /* -0.120697021 */,
+     PRESHIFT(0x00046000) /*  0.001068115 */,
+    -PRESHIFT(0x0ca8d000) /* -0.791213989 */,
+     PRESHIFT(0x119e9000) /*  1.101211548 */,
+     PRESHIFT(0x05991000) /*  0.349868774 */,
+     PRESHIFT(0x02578000) /*  0.146362305 */,
+     PRESHIFT(0x0091a000) /*  0.035552979 */,
+     PRESHIFT(0x007d1000) /*  0.030532837 */,
+     PRESHIFT(0x00048000) /*  0.001098633 */,
+     PRESHIFT(0x000a1000) /*  0.002456665 */,
+     PRESHIFT(0x0000d000) /*  0.000198364 */,
+
+    -PRESHIFT(0x00002000) /* -0.000030518 */,
+    -PRESHIFT(0x0003a000) /* -0.000885010 */,
+     PRESHIFT(0x000e0000) /*  0.003417969 */,
+    -PRESHIFT(0x003df000) /* -0.015121460 */,
+     PRESHIFT(0x00586000) /*  0.021575928 */,
+    -PRESHIFT(0x01ee6000) /* -0.120697021 */,
+     PRESHIFT(0x00046000) /*  0.001068115 */,
+    -PRESHIFT(0x0ca8d000) /* -0.791213989 */,
+     PRESHIFT(0x119e9000) /*  1.101211548 */,
+     PRESHIFT(0x05991000) /*  0.349868774 */,
+     PRESHIFT(0x02578000) /*  0.146362305 */,
+     PRESHIFT(0x0091a000) /*  0.035552979 */,
+     PRESHIFT(0x007d1000) /*  0.030532837 */,
+     PRESHIFT(0x00048000) /*  0.001098633 */,
+     PRESHIFT(0x000a1000) /*  0.002456665 */,
+     PRESHIFT(0x0000d000) /*  0.000198364 */ },
+
+  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/*  9 */
+    -PRESHIFT(0x0003f000) /* -0.000961304 */,
+     PRESHIFT(0x000dd000) /*  0.003372192 */,
+    -PRESHIFT(0x00428000) /* -0.016235352 */,
+     PRESHIFT(0x00500000) /*  0.019531250 */,
+    -PRESHIFT(0x02011000) /* -0.125259399 */,
+    -PRESHIFT(0x003e6000) /* -0.015228271 */,
+    -PRESHIFT(0x0d11e000) /* -0.816864014 */,
+     PRESHIFT(0x116fc000) /*  1.089782715 */,
+     PRESHIFT(0x052c5000) /*  0.323318481 */,
+     PRESHIFT(0x02616000) /*  0.148773193 */,
+     PRESHIFT(0x007d6000) /*  0.030609131 */,
+     PRESHIFT(0x007aa000) /*  0.029937744 */,
+     PRESHIFT(0x00024000) /*  0.000549316 */,
+     PRESHIFT(0x0009a000) /*  0.002349854 */,
+     PRESHIFT(0x0000b000) /*  0.000167847 */,
+
+    -PRESHIFT(0x00002000) /* -0.000030518 */,
+    -PRESHIFT(0x0003f000) /* -0.000961304 */,
+     PRESHIFT(0x000dd000) /*  0.003372192 */,
+    -PRESHIFT(0x00428000) /* -0.016235352 */,
+     PRESHIFT(0x00500000) /*  0.019531250 */,
+    -PRESHIFT(0x02011000) /* -0.125259399 */,
+    -PRESHIFT(0x003e6000) /* -0.015228271 */,
+    -PRESHIFT(0x0d11e000) /* -0.816864014 */,
+     PRESHIFT(0x116fc000) /*  1.089782715 */,
+     PRESHIFT(0x052c5000) /*  0.323318481 */,
+     PRESHIFT(0x02616000) /*  0.148773193 */,
+     PRESHIFT(0x007d6000) /*  0.030609131 */,
+     PRESHIFT(0x007aa000) /*  0.029937744 */,
+     PRESHIFT(0x00024000) /*  0.000549316 */,
+     PRESHIFT(0x0009a000) /*  0.002349854 */,
+     PRESHIFT(0x0000b000) /*  0.000167847 */ },
+
+  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/* 10 */
+    -PRESHIFT(0x00044000) /* -0.001037598 */,
+     PRESHIFT(0x000d7000) /*  0.003280640 */,
+    -PRESHIFT(0x00471000) /* -0.017349243 */,
+     PRESHIFT(0x0046b000) /*  0.017257690 */,
+    -PRESHIFT(0x0212b000) /* -0.129562378 */,
+    -PRESHIFT(0x0084a000) /* -0.032379150 */,
+    -PRESHIFT(0x0d78a000) /* -0.841949463 */,
+     PRESHIFT(0x113be000) /*  1.077117920 */,
+     PRESHIFT(0x04c16000) /*  0.297210693 */,
+     PRESHIFT(0x02687000) /*  0.150497437 */,
+     PRESHIFT(0x0069c000) /*  0.025817871 */,
+     PRESHIFT(0x0077f000) /*  0.029281616 */,
+     PRESHIFT(0x00002000) /*  0.000030518 */,
+     PRESHIFT(0x00093000) /*  0.002243042 */,
+     PRESHIFT(0x0000a000) /*  0.000152588 */,
+
+    -PRESHIFT(0x00002000) /* -0.000030518 */,
+    -PRESHIFT(0x00044000) /* -0.001037598 */,
+     PRESHIFT(0x000d7000) /*  0.003280640 */,
+    -PRESHIFT(0x00471000) /* -0.017349243 */,
+     PRESHIFT(0x0046b000) /*  0.017257690 */,
+    -PRESHIFT(0x0212b000) /* -0.129562378 */,
+    -PRESHIFT(0x0084a000) /* -0.032379150 */,
+    -PRESHIFT(0x0d78a000) /* -0.841949463 */,
+     PRESHIFT(0x113be000) /*  1.077117920 */,
+     PRESHIFT(0x04c16000) /*  0.297210693 */,
+     PRESHIFT(0x02687000) /*  0.150497437 */,
+     PRESHIFT(0x0069c000) /*  0.025817871 */,
+     PRESHIFT(0x0077f000) /*  0.029281616 */,
+     PRESHIFT(0x00002000) /*  0.000030518 */,
+     PRESHIFT(0x00093000) /*  0.002243042 */,
+     PRESHIFT(0x0000a000) /*  0.000152588 */ },
+
+  { -PRESHIFT(0x00003000) /* -0.000045776 */,	/* 11 */
+    -PRESHIFT(0x00049000) /* -0.001113892 */,
+     PRESHIFT(0x000d0000) /*  0.003173828 */,
+    -PRESHIFT(0x004ba000) /* -0.018463135 */,
+     PRESHIFT(0x003ca000) /*  0.014801025 */,
+    -PRESHIFT(0x02233000) /* -0.133590698 */,
+    -PRESHIFT(0x00ce4000) /* -0.050354004 */,
+    -PRESHIFT(0x0ddca000) /* -0.866363525 */,
+     PRESHIFT(0x1102f000) /*  1.063217163 */,
+     PRESHIFT(0x04587000) /*  0.271591187 */,
+     PRESHIFT(0x026cf000) /*  0.151596069 */,
+     PRESHIFT(0x0056c000) /*  0.021179199 */,
+     PRESHIFT(0x0074e000) /*  0.028533936 */,
+    -PRESHIFT(0x0001d000) /* -0.000442505 */,
+     PRESHIFT(0x0008b000) /*  0.002120972 */,
+     PRESHIFT(0x00009000) /*  0.000137329 */,
+
+    -PRESHIFT(0x00003000) /* -0.000045776 */,
+    -PRESHIFT(0x00049000) /* -0.001113892 */,
+     PRESHIFT(0x000d0000) /*  0.003173828 */,
+    -PRESHIFT(0x004ba000) /* -0.018463135 */,
+     PRESHIFT(0x003ca000) /*  0.014801025 */,
+    -PRESHIFT(0x02233000) /* -0.133590698 */,
+    -PRESHIFT(0x00ce4000) /* -0.050354004 */,
+    -PRESHIFT(0x0ddca000) /* -0.866363525 */,
+     PRESHIFT(0x1102f000) /*  1.063217163 */,
+     PRESHIFT(0x04587000) /*  0.271591187 */,
+     PRESHIFT(0x026cf000) /*  0.151596069 */,
+     PRESHIFT(0x0056c000) /*  0.021179199 */,
+     PRESHIFT(0x0074e000) /*  0.028533936 */,
+    -PRESHIFT(0x0001d000) /* -0.000442505 */,
+     PRESHIFT(0x0008b000) /*  0.002120972 */,
+     PRESHIFT(0x00009000) /*  0.000137329 */ },
+
+  { -PRESHIFT(0x00003000) /* -0.000045776 */,	/* 12 */
+    -PRESHIFT(0x0004f000) /* -0.001205444 */,
+     PRESHIFT(0x000c8000) /*  0.003051758 */,
+    -PRESHIFT(0x00503000) /* -0.019577026 */,
+     PRESHIFT(0x0031a000) /*  0.012115479 */,
+    -PRESHIFT(0x02326000) /* -0.137298584 */,
+    -PRESHIFT(0x011b5000) /* -0.069168091 */,
+    -PRESHIFT(0x0e3dd000) /* -0.890090942 */,
+     PRESHIFT(0x10c54000) /*  1.048156738 */,
+     PRESHIFT(0x03f1b000) /*  0.246505737 */,
+     PRESHIFT(0x026ee000) /*  0.152069092 */,
+     PRESHIFT(0x00447000) /*  0.016708374 */,
+     PRESHIFT(0x00719000) /*  0.027725220 */,
+    -PRESHIFT(0x00039000) /* -0.000869751 */,
+     PRESHIFT(0x00084000) /*  0.002014160 */,
+     PRESHIFT(0x00008000) /*  0.000122070 */,
+
+    -PRESHIFT(0x00003000) /* -0.000045776 */,
+    -PRESHIFT(0x0004f000) /* -0.001205444 */,
+     PRESHIFT(0x000c8000) /*  0.003051758 */,
+    -PRESHIFT(0x00503000) /* -0.019577026 */,
+     PRESHIFT(0x0031a000) /*  0.012115479 */,
+    -PRESHIFT(0x02326000) /* -0.137298584 */,
+    -PRESHIFT(0x011b5000) /* -0.069168091 */,
+    -PRESHIFT(0x0e3dd000) /* -0.890090942 */,
+     PRESHIFT(0x10c54000) /*  1.048156738 */,
+     PRESHIFT(0x03f1b000) /*  0.246505737 */,
+     PRESHIFT(0x026ee000) /*  0.152069092 */,
+     PRESHIFT(0x00447000) /*  0.016708374 */,
+     PRESHIFT(0x00719000) /*  0.027725220 */,
+    -PRESHIFT(0x00039000) /* -0.000869751 */,
+     PRESHIFT(0x00084000) /*  0.002014160 */,
+     PRESHIFT(0x00008000) /*  0.000122070 */ },
+
+  { -PRESHIFT(0x00004000) /* -0.000061035 */,	/* 13 */
+    -PRESHIFT(0x00055000) /* -0.001296997 */,
+     PRESHIFT(0x000bd000) /*  0.002883911 */,
+    -PRESHIFT(0x0054c000) /* -0.020690918 */,
+     PRESHIFT(0x0025d000) /*  0.009231567 */,
+    -PRESHIFT(0x02403000) /* -0.140670776 */,
+    -PRESHIFT(0x016ba000) /* -0.088775635 */,
+    -PRESHIFT(0x0e9be000) /* -0.913055420 */,
+     PRESHIFT(0x1082d000) /*  1.031936646 */,
+     PRESHIFT(0x038d4000) /*  0.221984863 */,
+     PRESHIFT(0x026e7000) /*  0.151962280 */,
+     PRESHIFT(0x0032e000) /*  0.012420654 */,
+     PRESHIFT(0x006df000) /*  0.026840210 */,
+    -PRESHIFT(0x00053000) /* -0.001266479 */,
+     PRESHIFT(0x0007d000) /*  0.001907349 */,
+     PRESHIFT(0x00007000) /*  0.000106812 */,
+
+    -PRESHIFT(0x00004000) /* -0.000061035 */,
+    -PRESHIFT(0x00055000) /* -0.001296997 */,
+     PRESHIFT(0x000bd000) /*  0.002883911 */,
+    -PRESHIFT(0x0054c000) /* -0.020690918 */,
+     PRESHIFT(0x0025d000) /*  0.009231567 */,
+    -PRESHIFT(0x02403000) /* -0.140670776 */,
+    -PRESHIFT(0x016ba000) /* -0.088775635 */,
+    -PRESHIFT(0x0e9be000) /* -0.913055420 */,
+     PRESHIFT(0x1082d000) /*  1.031936646 */,
+     PRESHIFT(0x038d4000) /*  0.221984863 */,
+     PRESHIFT(0x026e7000) /*  0.151962280 */,
+     PRESHIFT(0x0032e000) /*  0.012420654 */,
+     PRESHIFT(0x006df000) /*  0.026840210 */,
+    -PRESHIFT(0x00053000) /* -0.001266479 */,
+     PRESHIFT(0x0007d000) /*  0.001907349 */,
+     PRESHIFT(0x00007000) /*  0.000106812 */ },
+
+  { -PRESHIFT(0x00004000) /* -0.000061035 */,	/* 14 */
+    -PRESHIFT(0x0005b000) /* -0.001388550 */,
+     PRESHIFT(0x000b1000) /*  0.002700806 */,
+    -PRESHIFT(0x00594000) /* -0.021789551 */,
+     PRESHIFT(0x00192000) /*  0.006134033 */,
+    -PRESHIFT(0x024c8000) /* -0.143676758 */,
+    -PRESHIFT(0x01bf2000) /* -0.109161377 */,
+    -PRESHIFT(0x0ef69000) /* -0.935195923 */,
+     PRESHIFT(0x103be000) /*  1.014617920 */,
+     PRESHIFT(0x032b4000) /*  0.198059082 */,
+     PRESHIFT(0x026bc000) /*  0.151306152 */,
+     PRESHIFT(0x00221000) /*  0.008316040 */,
+     PRESHIFT(0x006a2000) /*  0.025909424 */,
+    -PRESHIFT(0x0006a000) /* -0.001617432 */,
+     PRESHIFT(0x00075000) /*  0.001785278 */,
+     PRESHIFT(0x00007000) /*  0.000106812 */,
+
+    -PRESHIFT(0x00004000) /* -0.000061035 */,
+    -PRESHIFT(0x0005b000) /* -0.001388550 */,
+     PRESHIFT(0x000b1000) /*  0.002700806 */,
+    -PRESHIFT(0x00594000) /* -0.021789551 */,
+     PRESHIFT(0x00192000) /*  0.006134033 */,
+    -PRESHIFT(0x024c8000) /* -0.143676758 */,
+    -PRESHIFT(0x01bf2000) /* -0.109161377 */,
+    -PRESHIFT(0x0ef69000) /* -0.935195923 */,
+     PRESHIFT(0x103be000) /*  1.014617920 */,
+     PRESHIFT(0x032b4000) /*  0.198059082 */,
+     PRESHIFT(0x026bc000) /*  0.151306152 */,
+     PRESHIFT(0x00221000) /*  0.008316040 */,
+     PRESHIFT(0x006a2000) /*  0.025909424 */,
+    -PRESHIFT(0x0006a000) /* -0.001617432 */,
+     PRESHIFT(0x00075000) /*  0.001785278 */,
+     PRESHIFT(0x00007000) /*  0.000106812 */ },
+
+  { -PRESHIFT(0x00005000) /* -0.000076294 */,	/* 15 */
+    -PRESHIFT(0x00061000) /* -0.001480103 */,
+     PRESHIFT(0x000a3000) /*  0.002487183 */,
+    -PRESHIFT(0x005da000) /* -0.022857666 */,
+     PRESHIFT(0x000b9000) /*  0.002822876 */,
+    -PRESHIFT(0x02571000) /* -0.146255493 */,
+    -PRESHIFT(0x0215c000) /* -0.130310059 */,
+    -PRESHIFT(0x0f4dc000) /* -0.956481934 */,
+     PRESHIFT(0x0ff0a000) /*  0.996246338 */,
+     PRESHIFT(0x02cbf000) /*  0.174789429 */,
+     PRESHIFT(0x0266e000) /*  0.150115967 */,
+     PRESHIFT(0x00120000) /*  0.004394531 */,
+     PRESHIFT(0x00662000) /*  0.024932861 */,
+    -PRESHIFT(0x0007f000) /* -0.001937866 */,
+     PRESHIFT(0x0006f000) /*  0.001693726 */,
+     PRESHIFT(0x00006000) /*  0.000091553 */,
+
+    -PRESHIFT(0x00005000) /* -0.000076294 */,
+    -PRESHIFT(0x00061000) /* -0.001480103 */,
+     PRESHIFT(0x000a3000) /*  0.002487183 */,
+    -PRESHIFT(0x005da000) /* -0.022857666 */,
+     PRESHIFT(0x000b9000) /*  0.002822876 */,
+    -PRESHIFT(0x02571000) /* -0.146255493 */,
+    -PRESHIFT(0x0215c000) /* -0.130310059 */,
+    -PRESHIFT(0x0f4dc000) /* -0.956481934 */,
+     PRESHIFT(0x0ff0a000) /*  0.996246338 */,
+     PRESHIFT(0x02cbf000) /*  0.174789429 */,
+     PRESHIFT(0x0266e000) /*  0.150115967 */,
+     PRESHIFT(0x00120000) /*  0.004394531 */,
+     PRESHIFT(0x00662000) /*  0.024932861 */,
+    -PRESHIFT(0x0007f000) /* -0.001937866 */,
+     PRESHIFT(0x0006f000) /*  0.001693726 */,
+     PRESHIFT(0x00006000) /*  0.000091553 */ },
+
+  { -PRESHIFT(0x00005000) /* -0.000076294 */,	/* 16 */
+    -PRESHIFT(0x00068000) /* -0.001586914 */,
+     PRESHIFT(0x00092000) /*  0.002227783 */,
+    -PRESHIFT(0x0061f000) /* -0.023910522 */,
+    -PRESHIFT(0x0002d000) /* -0.000686646 */,
+    -PRESHIFT(0x025ff000) /* -0.148422241 */,
+    -PRESHIFT(0x026f7000) /* -0.152206421 */,
+    -PRESHIFT(0x0fa13000) /* -0.976852417 */,
+     PRESHIFT(0x0fa13000) /*  0.976852417 */,
+     PRESHIFT(0x026f7000) /*  0.152206421 */,
+     PRESHIFT(0x025ff000) /*  0.148422241 */,
+     PRESHIFT(0x0002d000) /*  0.000686646 */,
+     PRESHIFT(0x0061f000) /*  0.023910522 */,
+    -PRESHIFT(0x00092000) /* -0.002227783 */,
+     PRESHIFT(0x00068000) /*  0.001586914 */,
+     PRESHIFT(0x00005000) /*  0.000076294 */,
+
+    -PRESHIFT(0x00005000) /* -0.000076294 */,
+    -PRESHIFT(0x00068000) /* -0.001586914 */,
+     PRESHIFT(0x00092000) /*  0.002227783 */,
+    -PRESHIFT(0x0061f000) /* -0.023910522 */,
+    -PRESHIFT(0x0002d000) /* -0.000686646 */,
+    -PRESHIFT(0x025ff000) /* -0.148422241 */,
+    -PRESHIFT(0x026f7000) /* -0.152206421 */,
+    -PRESHIFT(0x0fa13000) /* -0.976852417 */,
+     PRESHIFT(0x0fa13000) /*  0.976852417 */,
+     PRESHIFT(0x026f7000) /*  0.152206421 */,
+     PRESHIFT(0x025ff000) /*  0.148422241 */,
+     PRESHIFT(0x0002d000) /*  0.000686646 */,
+     PRESHIFT(0x0061f000) /*  0.023910522 */,
+    -PRESHIFT(0x00092000) /* -0.002227783 */,
+     PRESHIFT(0x00068000) /*  0.001586914 */,
+     PRESHIFT(0x00005000) /*  0.000076294 */ }
diff --git a/code/libmad/README.md b/code/libmad/README.md
new file mode 100644
index 00000000..fa8a2db6
--- /dev/null
+++ b/code/libmad/README.md
@@ -0,0 +1,178 @@
+# libmad - MPEG audio decoder library
+Copyright (C) 2000-2004 Underbit Technologies, Inc.
+Copyright (C) 2021-2023 Tenacity Team and Contributors
+
+`$Id: README,v 1.4 2004/01/23 09:41:32 rob Exp $`
+
+---
+
+# Introduction
+
+MAD (libmad) is a high-quality MPEG audio decoder. It currently supports
+MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as
+the so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
+and Layer III a.k.a. MP3) are fully implemented.
+
+MAD does not yet support MPEG-2 multichannel audio (although it should be
+backward compatible with such streams) nor does it currently support AAC.
+
+MAD has the following special features:
+
+  - 24-bit PCM output
+  - 100% fixed-point (integer) computation
+  - completely new implementation based on the ISO/IEC standards
+  - distributed under the terms of the GNU General Public License (GPL)
+
+Because MAD provides full 24-bit PCM output, applications using MAD are
+able to produce high quality audio. Even when the output device supports
+only 16-bit PCM, applications can use the extra resolution to increase the
+audible dynamic range through the use of dithering or noise shaping.
+
+Because MAD uses integer computation rather than floating point, it is
+well suited for architectures without a floating point unit. All
+calculations are performed with a 32-bit fixed-point integer
+representation.
+
+Because MAD is a new implementation of the ISO/IEC standards, it is
+unencumbered by the errors of other implementations. MAD is NOT a
+derivation of the ISO reference source or any other code. Considerable
+effort has been expended to ensure a correct implementation, even in cases
+where the standards are ambiguous or misleading.
+
+Because MAD is distributed under the terms of the GPL, its redistribution
+is not generally restricted, so long as the terms of the GPL are followed.
+This means MAD can be incorporated into other software as long as that
+software is also distributed under the GPL. (Should this be undesirable,
+alternate arrangements may be possible by contacting Underbit.)
+
+# About The Code
+
+The code is optimized and performs very well, although specific
+improvements can still be made. The output from the decoder library
+consists of 32-bit signed linear fixed-point values that can be easily
+scaled for any size PCM output, up to 24 bits per sample.
+
+The API for libmad can be found in the `mad.h' header file. Note that this
+file is automatically generated, and will not exist until after you have
+built the library.
+
+There are two APIs available, one high-level, and the other low-level.
+With the low-level API, each step of the decoding process must be handled
+explicitly, offering the greatest amount of control. With the high-level
+API, after callbacks are configured, a single routine will decode an
+entire bitstream.
+
+The high-level API may either be used synchronously or asynchronously. If
+used asynchronously, decoding will occur in a separate process.
+Communication is possible with the decoding process by passing control
+messages.
+
+The file `minimad.c' contains an example usage of the libmad API that
+shows only the bare minimum required to implement a useful decoder. It
+expects a regular file to be redirected to standard input, and it sends
+decoded 16-bit signed little-endian PCM samples to standard output. If a
+decoding error occurs, it is reported to standard error and decoding
+continues. Note that the scale() routine in this code is only provided as
+an example; it rounds MAD's high-resolution samples down to 16 bits, but
+does not perform any dithering or noise shaping. It is therefore not
+recommended to use this routine as-is in your own code if sound quality is
+important.
+
+## Integer Performance
+
+To get the best possible performance, it is recommended that an assembly
+version of the fixed-point multiply and related routines be selected.
+Several such assembly routines have been written for various CPUs.
+
+If an assembly version is not available, a fast approximation version will
+be used. This will result in reduced accuracy of the decoder.
+
+Alternatively, if 64-bit integers are supported as a datatype by the
+compiler, another version can be used that is much more accurate.
+However, using an assembly version is generally much faster and just as
+accurate.
+
+More information can be gathered from the `fixed.h' header file.
+
+MAD's CPU-intensive subband synthesis routine can be further optimized at
+the expense of a slight loss in output accuracy due to a modified method
+for fixed-point multiplication with a small windowing constant. While this
+is helpful for performance and the output accuracy loss is generally
+undetectable, it is disabled by default and must be explicitly enabled.
+
+Under some architectures, other special optimizations may also be
+available.
+
+## Audio Quality
+
+The output from MAD has been found to satisfy the ISO/IEC 11172-4
+computational accuracy requirements for compliance. In most
+configurations, MAD is a Full Layer III ISO/IEC 11172-3 audio decoder as
+defined by the standard.
+
+When the approximation version of the fixed-point multiply is used, MAD is
+a limited accuracy ISO/IEC 11172-3 audio decoder as defined by the
+standard.
+
+MAD can alternatively be configured to produce output with less or more
+accuracy than the default, as a tradeoff with performance.
+
+MAD produces output samples with a precision greater than 24 bits. Because
+most output formats use fewer bits, typically 16, it is recommended that a
+dithering algorithm be used (rather than rounding or truncating) to obtain
+the highest quality audio. However, dithering may unfavorably affect an
+analytic examination of the output (such as compliance testing); you may
+therefore wish to use rounding in this case instead.
+
+## Portability Issues
+
+GCC is preferred to compile the code, but other compilers may also work.
+The assembly code in `fixed.h' depends on the inline assembly features of
+your compiler. If you're not using GCC or MSVC++, you can either write
+your own assembly macros or use the default (low quality output) version.
+
+The union initialization of `huffman.c' may not be portable to all
+platforms when GCC is not used.
+
+The code should not be sensitive to word sizes or byte ordering, however
+it does assume A % B has the same sign as A.
+
+# Building and Installing
+
+libmad uses the CMake build system and has no dependencies. To build it, run:
+
+``` bash
+cmake -D CMAKE_INSTALL_PREFIX=/where/you/want/to/install/to -S . -B build
+cmake --build build --parallel number-of-cpu-cores
+cmake --install build
+```
+
+The following CMake options are available which can be toggled by passing
+'-D OPTION=VALUE' to the CMake configure step (the first call to cmake above):
+
+  * ASO (ON|OFF): Enable CPU Architecture Specific Optimizations
+    (x86, ARM, and MIPS only). ON by default.
+  * EXAMPLE (ON|OFF): Build the example application. Only works on POSIX
+    operating systems. ON by default on POSIX operating systems. The example
+    application is not installed.
+
+## Supported Platforms
+
+libmad relies on a POSIX environment. On Windows, you should use Cygwin to
+build libmad.
+
+It is planned that in a future release
+
+# Copyright
+
+Please read the `COPYRIGHT` file for copyright and warranty information.
+Also, the file `COPYING` contains the full text of the GNU GPL.
+
+Send inquiries, comments, bug reports, suggestions, patches, etc. to:
+
+    Underbit Technologies, Inc. <support@underbit.com>
+
+See also the MAD home page on the Web:
+
+    http://www.underbit.com/products/mad/
+
diff --git a/code/libmad/TODO b/code/libmad/TODO
new file mode 100644
index 00000000..1ea107c2
--- /dev/null
+++ b/code/libmad/TODO
@@ -0,0 +1,69 @@
+
+ libmad - MPEG audio decoder library
+ Copyright (C) 2000-2004 Underbit Technologies, Inc.
+
+ $Id: TODO,v 1.3 2004/02/05 09:02:39 rob Exp $
+
+===============================================================================
+
+libmad:
+  - more API layers (buffering, PCM samples, dithering, etc.)
+  - x86 performance optimization compiler flags
+  - function documentation, general docs
+  - finish async API
+  - parse system streams?
+  - MPEG-2 MC, AAC?
+  - logarithmic multiplication?
+  - multiple frame decoding for better locality of reference?
+  - frame serial numbers, Layer III frame continuity checks
+
+fixed.h:
+  - experiment with FPM_INTEL:
+
+# if 1
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("shrl %3,%1\n\t"  \
+	    "shll %4,%2\n\t"  \
+	    "orl %2,%1"  \
+	    : "=rm" (__result)  \
+	    : "0" (lo), "r" (hi),  \
+	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       __result;  \
+    })
+# else
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed64hi_t __hi_;  \
+       mad_fixed64lo_t __lo_;  \
+       mad_fixed_t __result;  \
+       asm ("sall %2,%1"  \
+	    : "=r" (__hi_)  \
+	    : "0" (hi), "I" (32 - MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       asm ("shrl %2,%1"  \
+	    : "=r" (__lo_)  \
+	    : "0" (lo), "I" (MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       asm ("orl %1,%2"  \
+	    : "=rm" (__result)  \
+	    : "r" (__hi_), "0" (__lo_)  \
+	    : "cc");  \
+       __result;  \
+    })
+# endif
+
+libmad Layer I:
+  - check frame length sanity
+
+libmad Layer II:
+  - check frame length sanity
+
+libmad Layer III:
+  - circular buffer
+  - optimize zero_part from Huffman decoding throughout
+  - MPEG 2.5 8000 Hz sf bands? mixed blocks?
+  - stereo->mono conversion optimization?
+  - enable frame-at-a-time decoding
+  - improve portability of huffman.c
+
diff --git a/code/libmad/bit.c b/code/libmad/bit.c
new file mode 100644
index 00000000..72a094ca
--- /dev/null
+++ b/code/libmad/bit.c
@@ -0,0 +1,236 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: bit.c,v 1.12 2004/01/23 09:41:32 rob Exp $
+ */
+
+# include "global.h"
+
+# ifdef HAVE_LIMITS_H
+#  include <limits.h>
+# else
+#  define CHAR_BIT  8
+# endif
+
+# include "mad.h"
+
+/*
+ * This is the lookup table for computing the CRC-check word.
+ * As described in section 2.4.3.1 and depicted in Figure A.9
+ * of ISO/IEC 11172-3, the generator polynomial is:
+ *
+ * G(X) = X^16 + X^15 + X^2 + 1
+ */
+static
+unsigned short const crc_table[256] = {
+  0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
+  0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
+  0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
+  0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,
+  0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,
+  0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,
+  0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,
+  0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,
+
+  0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,
+  0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,
+  0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,
+  0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,
+  0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,
+  0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,
+  0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,
+  0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,
+
+  0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,
+  0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,
+  0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,
+  0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,
+  0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,
+  0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,
+  0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,
+  0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,
+
+  0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,
+  0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,
+  0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,
+  0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,
+  0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,
+  0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,
+  0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,
+  0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202
+};
+
+# define CRC_POLY  0x8005
+
+/*
+ * NAME:	bit->init()
+ * DESCRIPTION:	initialize bit pointer struct
+ */
+void mad_bit_init(struct mad_bitptr *bitptr, unsigned char const *byte)
+{
+  bitptr->byte  = byte;
+  bitptr->cache = 0;
+  bitptr->left  = CHAR_BIT;
+}
+
+/*
+ * NAME:	bit->length()
+ * DESCRIPTION:	return number of bits between start and end points
+ */
+unsigned int mad_bit_length(struct mad_bitptr const *begin,
+			    struct mad_bitptr const *end)
+{
+  return begin->left +
+    CHAR_BIT * (end->byte - (begin->byte + 1)) + (CHAR_BIT - end->left);
+}
+
+/*
+ * NAME:	bit->nextbyte()
+ * DESCRIPTION:	return pointer to next unprocessed byte
+ */
+unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *bitptr)
+{
+  return bitptr->left == CHAR_BIT ? bitptr->byte : bitptr->byte + 1;
+}
+
+/*
+ * NAME:	bit->skip()
+ * DESCRIPTION:	advance bit pointer
+ */
+void mad_bit_skip(struct mad_bitptr *bitptr, unsigned int len)
+{
+  bitptr->byte += len / CHAR_BIT;
+  bitptr->left -= len % CHAR_BIT;
+
+  if (bitptr->left > CHAR_BIT) {
+    bitptr->byte++;
+    bitptr->left += CHAR_BIT;
+  }
+
+  if (bitptr->left < CHAR_BIT)
+    bitptr->cache = *bitptr->byte;
+}
+
+/*
+ * NAME:	bit->read()
+ * DESCRIPTION:	read an arbitrary number of bits and return their UIMSBF value
+ */
+unsigned long mad_bit_read(struct mad_bitptr *bitptr, unsigned int len)
+{
+  register unsigned long value;
+
+  if (len == 0)
+    return 0;
+
+  if (bitptr->left == CHAR_BIT)
+    bitptr->cache = *bitptr->byte;
+
+  if (len < bitptr->left) {
+    value = (bitptr->cache & ((1 << bitptr->left) - 1)) >>
+      (bitptr->left - len);
+    bitptr->left -= len;
+
+    return value;
+  }
+
+  /* remaining bits in current byte */
+
+  value = bitptr->cache & ((1 << bitptr->left) - 1);
+  len  -= bitptr->left;
+
+  bitptr->byte++;
+  bitptr->left = CHAR_BIT;
+
+  /* more bytes */
+
+  while (len >= CHAR_BIT) {
+    value = (value << CHAR_BIT) | *bitptr->byte++;
+    len  -= CHAR_BIT;
+  }
+
+  if (len > 0) {
+    bitptr->cache = *bitptr->byte;
+
+    value = (value << len) | (bitptr->cache >> (CHAR_BIT - len));
+    bitptr->left -= len;
+  }
+
+  return value;
+}
+
+# if 0
+/*
+ * NAME:	bit->write()
+ * DESCRIPTION:	write an arbitrary number of bits
+ */
+void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len,
+		   unsigned long value)
+{
+  unsigned char *ptr;
+
+  ptr = (unsigned char *) bitptr->byte;
+
+  /* ... */
+}
+# endif
+
+/*
+ * NAME:	bit->crc()
+ * DESCRIPTION:	compute CRC-check word
+ */
+unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len,
+			   unsigned short init)
+{
+  register unsigned int crc;
+
+  for (crc = init; len >= 32; len -= 32) {
+    register unsigned long data;
+
+    data = mad_bit_read(&bitptr, 32);
+
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 24)) & 0xff];
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 16)) & 0xff];
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  8)) & 0xff];
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  0)) & 0xff];
+  }
+
+  switch (len / 8) {
+  case 3: crc = (crc << 8) ^
+	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
+  case 2: crc = (crc << 8) ^
+	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
+  case 1: crc = (crc << 8) ^
+	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
+
+  len %= 8;
+
+  case 0: break;
+  }
+
+  while (len--) {
+    register unsigned int msb;
+
+    msb = mad_bit_read(&bitptr, 1) ^ (crc >> 15);
+
+    crc <<= 1;
+    if (msb & 1)
+      crc ^= CRC_POLY;
+  }
+
+  return crc & 0xffff;
+}
diff --git a/code/libmad/decoder.c b/code/libmad/decoder.c
new file mode 100644
index 00000000..b631a686
--- /dev/null
+++ b/code/libmad/decoder.c
@@ -0,0 +1,589 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: decoder.c,v 1.22 2004/01/23 09:41:32 rob Exp $
+ */
+
+# include "global.h"
+
+# ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+# endif
+
+# ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+# endif
+
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+
+# ifdef HAVE_FCNTL_H
+#  include <fcntl.h>
+# endif
+
+# include <stdlib.h>
+
+# ifdef HAVE_ERRNO_H
+#  include <errno.h>
+# endif
+
+# include "mad.h"
+
+/*
+ * NAME:	decoder->init()
+ * DESCRIPTION:	initialize a decoder object with callback routines
+ */
+void mad_decoder_init(struct mad_decoder *decoder, void *data,
+		      enum mad_flow (*input_func)(void *,
+						  struct mad_stream *),
+		      enum mad_flow (*header_func)(void *,
+						   struct mad_header const *),
+		      enum mad_flow (*filter_func)(void *,
+						   struct mad_stream const *,
+						   struct mad_frame *),
+		      enum mad_flow (*output_func)(void *,
+						   struct mad_header const *,
+						   struct mad_pcm *),
+		      enum mad_flow (*error_func)(void *,
+						  struct mad_stream *,
+						  struct mad_frame *),
+		      enum mad_flow (*message_func)(void *,
+						    void *, unsigned int *))
+{
+  decoder->mode         = -1;
+
+  decoder->options      = 0;
+
+  decoder->async.pid    = 0;
+  decoder->async.in     = -1;
+  decoder->async.out    = -1;
+
+  decoder->sync         = 0;
+
+  decoder->cb_data      = data;
+
+  decoder->input_func   = input_func;
+  decoder->header_func  = header_func;
+  decoder->filter_func  = filter_func;
+  decoder->output_func  = output_func;
+  decoder->error_func   = error_func;
+  decoder->message_func = message_func;
+}
+
+int mad_decoder_finish(struct mad_decoder *decoder)
+{
+# if defined(USE_ASYNC)
+  if (decoder->mode == MAD_DECODER_MODE_ASYNC && decoder->async.pid) {
+    pid_t pid;
+    int status;
+
+    close(decoder->async.in);
+
+    do
+      pid = waitpid(decoder->async.pid, &status, 0);
+    while (pid == -1 && errno == EINTR);
+
+    decoder->mode = -1;
+
+    close(decoder->async.out);
+
+    decoder->async.pid = 0;
+    decoder->async.in  = -1;
+    decoder->async.out = -1;
+
+    if (pid == -1)
+      return -1;
+
+    return (!WIFEXITED(status) || WEXITSTATUS(status)) ? -1 : 0;
+  }
+# endif
+
+  return 0;
+}
+
+# if defined(USE_ASYNC)
+static
+enum mad_flow send_io(int fd, void const *data, size_t len)
+{
+  char const *ptr = data;
+  ssize_t count;
+
+  while (len) {
+    do
+      count = write(fd, ptr, len);
+    while (count == -1 && errno == EINTR);
+
+    if (count == -1)
+      return MAD_FLOW_BREAK;
+
+    len -= count;
+    ptr += count;
+  }
+
+  return MAD_FLOW_CONTINUE;
+}
+
+static
+enum mad_flow receive_io(int fd, void *buffer, size_t len)
+{
+  char *ptr = buffer;
+  ssize_t count;
+
+  while (len) {
+    do
+      count = read(fd, ptr, len);
+    while (count == -1 && errno == EINTR);
+
+    if (count == -1)
+      return (errno == EAGAIN) ? MAD_FLOW_IGNORE : MAD_FLOW_BREAK;
+    else if (count == 0)
+      return MAD_FLOW_STOP;
+
+    len -= count;
+    ptr += count;
+  }
+
+  return MAD_FLOW_CONTINUE;
+}
+
+static
+enum mad_flow receive_io_blocking(int fd, void *buffer, size_t len)
+{
+  int flags, blocking;
+  enum mad_flow result;
+
+  flags = fcntl(fd, F_GETFL);
+  if (flags == -1)
+    return MAD_FLOW_BREAK;
+
+  blocking = flags & ~O_NONBLOCK;
+
+  if (blocking != flags &&
+      fcntl(fd, F_SETFL, blocking) == -1)
+    return MAD_FLOW_BREAK;
+
+  result = receive_io(fd, buffer, len);
+
+  if (flags != blocking &&
+      fcntl(fd, F_SETFL, flags) == -1)
+    return MAD_FLOW_BREAK;
+
+  return result;
+}
+
+static
+enum mad_flow send(int fd, void const *message, unsigned int size)
+{
+  enum mad_flow result;
+
+  /* send size */
+
+  result = send_io(fd, &size, sizeof(size));
+
+  /* send message */
+
+  if (result == MAD_FLOW_CONTINUE)
+    result = send_io(fd, message, size);
+
+  return result;
+}
+
+static
+enum mad_flow receive(int fd, void **message, unsigned int *size)
+{
+  enum mad_flow result;
+  unsigned int actual;
+
+  if (*message == 0)
+    *size = 0;
+
+  /* receive size */
+
+  result = receive_io(fd, &actual, sizeof(actual));
+
+  /* receive message */
+
+  if (result == MAD_FLOW_CONTINUE) {
+    if (actual > *size)
+      actual -= *size;
+    else {
+      *size  = actual;
+      actual = 0;
+    }
+
+    if (*size > 0) {
+      if (*message == 0) {
+	      *message = malloc(*size);
+	      if (*message == 0)
+      	  return MAD_FLOW_BREAK;
+      }
+
+      result = receive_io_blocking(fd, *message, *size);
+    }
+
+    /* throw away remainder of message */
+
+    while (actual && result == MAD_FLOW_CONTINUE) {
+      char sink[256];
+      unsigned int len;
+
+      len = actual > sizeof(sink) ? sizeof(sink) : actual;
+
+      result = receive_io_blocking(fd, sink, len);
+
+      actual -= len;
+    }
+  }
+
+  return result;
+}
+
+static
+enum mad_flow check_message(struct mad_decoder *decoder)
+{
+  enum mad_flow result;
+  void *message = 0;
+  unsigned int size;
+
+  result = receive(decoder->async.in, &message, &size);
+
+  if (result == MAD_FLOW_CONTINUE) {
+    if (decoder->message_func == 0)
+      size = 0;
+    else {
+      result = decoder->message_func(decoder->cb_data, message, &size);
+
+      if (result == MAD_FLOW_IGNORE ||
+	      result == MAD_FLOW_BREAK)
+	    size = 0;
+    }
+
+    if (send(decoder->async.out, message, size) != MAD_FLOW_CONTINUE)
+      result = MAD_FLOW_BREAK;
+  }
+
+  if (message)
+    free(message);
+
+  return result;
+}
+# endif
+
+static
+enum mad_flow error_default(void *data, struct mad_stream *stream,
+			    struct mad_frame *frame)
+{
+  int *bad_last_frame = data;
+
+  switch (stream->error) {
+  case MAD_ERROR_BADCRC:
+    if (*bad_last_frame)
+      mad_frame_mute(frame);
+    else
+      *bad_last_frame = 1;
+
+    return MAD_FLOW_IGNORE;
+
+  default:
+    return MAD_FLOW_CONTINUE;
+  }
+}
+
+static
+int run_sync(struct mad_decoder *decoder)
+{
+  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
+  void *error_data;
+  int bad_last_frame = 0;
+  struct mad_stream *stream;
+  struct mad_frame *frame;
+  struct mad_synth *synth;
+  int result = 0;
+
+  if (decoder->input_func == 0)
+    return 0;
+
+  if (decoder->error_func) {
+    error_func = decoder->error_func;
+    error_data = decoder->cb_data;
+  }
+  else {
+    error_func = error_default;
+    error_data = &bad_last_frame;
+  }
+
+  stream = &decoder->sync->stream;
+  frame  = &decoder->sync->frame;
+  synth  = &decoder->sync->synth;
+
+  mad_stream_init(stream);
+  mad_frame_init(frame);
+  mad_synth_init(synth);
+
+  mad_stream_options(stream, decoder->options);
+
+  do {
+    switch (decoder->input_func(decoder->cb_data, stream)) {
+      case MAD_FLOW_STOP:
+        goto done;
+      case MAD_FLOW_BREAK:
+        goto fail;
+      case MAD_FLOW_IGNORE:
+        continue;
+      case MAD_FLOW_CONTINUE:
+        break;
+    }
+
+    while (1)
+    {
+      #if defined(USE_ASYNC)
+      if (decoder->mode == MAD_DECODER_MODE_ASYNC) {
+        switch (check_message(decoder)) {
+          case MAD_FLOW_IGNORE:
+          case MAD_FLOW_CONTINUE:
+            break;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_STOP:
+            goto done;
+        }
+      }
+      #endif
+
+      if (decoder->header_func)
+      {
+        if (mad_header_decode(&frame->header, stream) == -1)
+        {
+          if (!MAD_RECOVERABLE(stream->error))
+          {
+            break;
+          }
+
+          switch (error_func(error_data, stream, frame))
+          {
+            case MAD_FLOW_STOP:
+              goto done;
+            case MAD_FLOW_BREAK:
+              goto fail;
+            case MAD_FLOW_IGNORE:
+            case MAD_FLOW_CONTINUE:
+            default:
+              continue;
+          }
+        }
+
+        switch (decoder->header_func(decoder->cb_data, &frame->header))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+            continue;
+          case MAD_FLOW_CONTINUE:
+            break;
+        }
+      }
+
+      if (mad_frame_decode(frame, stream) == -1)
+      {
+        if (!MAD_RECOVERABLE(stream->error))
+          break;
+
+        switch (error_func(error_data, stream, frame))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+            break;
+          case MAD_FLOW_CONTINUE:
+          default:
+            continue;
+        }
+      } else
+      {
+        bad_last_frame = 0;
+      }
+
+      if (decoder->filter_func)
+      {
+        switch (decoder->filter_func(decoder->cb_data, stream, frame))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+            continue;
+          case MAD_FLOW_CONTINUE:
+            break;
+        }
+      }
+
+      mad_synth_frame(synth, frame);
+
+      if (decoder->output_func)
+      {
+        switch (decoder->output_func(decoder->cb_data,
+                  &frame->header, &synth->pcm))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+          case MAD_FLOW_CONTINUE:
+            break;
+        }
+      }
+    }
+  }
+  while (stream->error == MAD_ERROR_BUFLEN);
+
+fail:
+  result = -1;
+
+done:
+  mad_synth_finish(synth);
+  mad_frame_finish(frame);
+  mad_stream_finish(stream);
+
+  return result;
+}
+
+# if defined(USE_ASYNC)
+static
+int run_async(struct mad_decoder *decoder)
+{
+  pid_t pid;
+  int ptoc[2], ctop[2], flags;
+
+  if (pipe(ptoc) == -1)
+    return -1;
+
+  if (pipe(ctop) == -1) {
+    close(ptoc[0]);
+    close(ptoc[1]);
+    return -1;
+  }
+
+  flags = fcntl(ptoc[0], F_GETFL);
+  if (flags == -1 ||
+      fcntl(ptoc[0], F_SETFL, flags | O_NONBLOCK) == -1) {
+    close(ctop[0]);
+    close(ctop[1]);
+    close(ptoc[0]);
+    close(ptoc[1]);
+    return -1;
+  }
+
+  pid = fork();
+  if (pid == -1) {
+    close(ctop[0]);
+    close(ctop[1]);
+    close(ptoc[0]);
+    close(ptoc[1]);
+    return -1;
+  }
+
+  decoder->async.pid = pid;
+
+  if (pid) {
+    /* parent */
+
+    close(ptoc[0]);
+    close(ctop[1]);
+
+    decoder->async.in  = ctop[0];
+    decoder->async.out = ptoc[1];
+
+    return 0;
+  }
+
+  /* child */
+
+  close(ptoc[1]);
+  close(ctop[0]);
+
+  decoder->async.in  = ptoc[0];
+  decoder->async.out = ctop[1];
+
+  _exit(run_sync(decoder));
+
+  /* not reached */
+  return -1;
+}
+# endif
+
+/*
+ * NAME:	decoder->run()
+ * DESCRIPTION:	run the decoder thread either synchronously or asynchronously
+ */
+int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
+{
+  int result;
+  int (*run)(struct mad_decoder *) = 0;
+
+  switch (decoder->mode = mode) {
+  case MAD_DECODER_MODE_SYNC:
+    run = run_sync;
+    break;
+
+  case MAD_DECODER_MODE_ASYNC:
+# if defined(USE_ASYNC)
+    run = run_async;
+# endif
+    break;
+  }
+
+  if (run == 0)
+    return -1;
+
+  decoder->sync = malloc(sizeof(*decoder->sync));
+  if (decoder->sync == 0)
+    return -1;
+
+  result = run(decoder);
+
+  free(decoder->sync);
+  decoder->sync = 0;
+
+  return result;
+}
+
+/*
+ * NAME:	decoder->message()
+ * DESCRIPTION:	send a message to and receive a reply from the decoder process
+ */
+int mad_decoder_message(struct mad_decoder *decoder,
+			void *message, unsigned int *len)
+{
+# if defined(USE_ASYNC)
+  if (decoder->mode != MAD_DECODER_MODE_ASYNC ||
+      send(decoder->async.out, message, *len) != MAD_FLOW_CONTINUE ||
+      receive(decoder->async.in, &message, len) != MAD_FLOW_CONTINUE)
+    return -1;
+
+  return 0;
+# else
+  return -1;
+# endif
+}
diff --git a/code/libmad/fixed.c b/code/libmad/fixed.c
new file mode 100644
index 00000000..3e4055f8
--- /dev/null
+++ b/code/libmad/fixed.c
@@ -0,0 +1,77 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: fixed.c,v 1.13 2004/01/23 09:41:32 rob Exp $
+ */
+
+# include "global.h"
+
+# include "mad.h"
+
+/*
+ * NAME:	fixed->abs()
+ * DESCRIPTION:	return absolute value of a fixed-point number
+ */
+mad_fixed_t mad_f_abs(mad_fixed_t x)
+{
+  return x < 0 ? -x : x;
+}
+
+/*
+ * NAME:	fixed->div()
+ * DESCRIPTION:	perform division using fixed-point math
+ */
+mad_fixed_t mad_f_div(mad_fixed_t x, mad_fixed_t y)
+{
+  mad_fixed_t q, r;
+  unsigned int bits;
+
+  q = mad_f_abs(x / y);
+
+  if (x < 0) {
+    x = -x;
+    y = -y;
+  }
+
+  r = x % y;
+
+  if (y < 0) {
+    x = -x;
+    y = -y;
+  }
+
+  if (q > mad_f_intpart(MAD_F_MAX) &&
+      !(q == -mad_f_intpart(MAD_F_MIN) && r == 0 && (x < 0) != (y < 0)))
+    return 0;
+
+  for (bits = MAD_F_FRACBITS; bits && r; --bits) {
+    q <<= 1, r <<= 1;
+    if (r >= y)
+      r -= y, ++q;
+  }
+
+  /* round */
+  if (2 * r >= y)
+    ++q;
+
+  /* fix sign */
+  if ((x < 0) != (y < 0))
+    q = -q;
+
+  return q << bits;
+}
diff --git a/code/libmad/frame.c b/code/libmad/frame.c
new file mode 100644
index 00000000..03c94bfe
--- /dev/null
+++ b/code/libmad/frame.c
@@ -0,0 +1,510 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: frame.c,v 1.29 2004/02/04 22:59:19 rob Exp $
+ */
+
+# include "global.h"
+
+# include <stdlib.h>
+
+# include "mad.h"
+# include "layer12.h"
+# include "layer3.h"
+
+static
+unsigned long const bitrate_table[5][15] = {
+  /* MPEG-1 */
+  { 0,  32000,  64000,  96000, 128000, 160000, 192000, 224000,  /* Layer I   */
+       256000, 288000, 320000, 352000, 384000, 416000, 448000 },
+  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer II  */
+       128000, 160000, 192000, 224000, 256000, 320000, 384000 },
+  { 0,  32000,  40000,  48000,  56000,  64000,  80000,  96000,  /* Layer III */
+       112000, 128000, 160000, 192000, 224000, 256000, 320000 },
+
+  /* MPEG-2 LSF */
+  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer I   */
+       128000, 144000, 160000, 176000, 192000, 224000, 256000 },
+  { 0,   8000,  16000,  24000,  32000,  40000,  48000,  56000,  /* Layers    */
+        64000,  80000,  96000, 112000, 128000, 144000, 160000 } /* II & III  */
+};
+
+static
+unsigned int const samplerate_table[3] = { 44100, 48000, 32000 };
+
+static
+int (*const decoder_table[3])(struct mad_stream *, struct mad_frame *) = {
+  mad_layer_I,
+  mad_layer_II,
+  mad_layer_III
+};
+
+/*
+ * NAME:	header->init()
+ * DESCRIPTION:	initialize header struct
+ */
+void mad_header_init(struct mad_header *header)
+{
+  header->layer          = 0;
+  header->mode           = 0;
+  header->mode_extension = 0;
+  header->emphasis       = 0;
+
+  header->bitrate        = 0;
+  header->samplerate     = 0;
+
+  header->crc_check      = 0;
+  header->crc_target     = 0;
+
+  header->flags          = 0;
+  header->private_bits   = 0;
+
+  header->duration       = mad_timer_zero;
+}
+
+/*
+ * NAME:	frame->init()
+ * DESCRIPTION:	initialize frame struct
+ */
+void mad_frame_init(struct mad_frame *frame)
+{
+  mad_header_init(&frame->header);
+
+  frame->options = 0;
+
+  frame->overlap = 0;
+  mad_frame_mute(frame);
+}
+
+/*
+ * NAME:	frame->finish()
+ * DESCRIPTION:	deallocate any dynamic memory associated with frame
+ */
+void mad_frame_finish(struct mad_frame *frame)
+{
+  mad_header_finish(&frame->header);
+
+  if (frame->overlap) {
+    free(frame->overlap);
+    frame->overlap = 0;
+  }
+}
+
+/*
+ * NAME:	decode_header()
+ * DESCRIPTION:	read header data and following CRC word
+ */
+static
+int decode_header(struct mad_header *header, struct mad_stream *stream)
+{
+  unsigned int index;
+  struct mad_bitptr bufend_ptr;
+
+  header->flags        = 0;
+  header->private_bits = 0;
+
+  mad_bit_init(&bufend_ptr, stream->bufend);
+
+  /* header() */
+  if (mad_bit_length(&stream->ptr, &bufend_ptr) < 32) {
+    stream->error = MAD_ERROR_BUFLEN;
+    return -1;
+  }
+
+  /* syncword */
+  mad_bit_skip(&stream->ptr, 11);
+
+  /* MPEG 2.5 indicator (really part of syncword) */
+  if (mad_bit_read(&stream->ptr, 1) == 0)
+    header->flags |= MAD_FLAG_MPEG_2_5_EXT;
+
+  /* ID */
+  if (mad_bit_read(&stream->ptr, 1) == 0)
+    header->flags |= MAD_FLAG_LSF_EXT;
+  else if (header->flags & MAD_FLAG_MPEG_2_5_EXT) {
+    stream->error = MAD_ERROR_LOSTSYNC;
+    return -1;
+  }
+
+  /* layer */
+  header->layer = 4 - mad_bit_read(&stream->ptr, 2);
+
+  if (header->layer == 4) {
+    stream->error = MAD_ERROR_BADLAYER;
+    return -1;
+  }
+
+  /* protection_bit */
+  if (mad_bit_read(&stream->ptr, 1) == 0) {
+    header->flags    |= MAD_FLAG_PROTECTION;
+    header->crc_check = mad_bit_crc(stream->ptr, 16, 0xffff);
+  }
+
+  /* bitrate_index */
+  index = mad_bit_read(&stream->ptr, 4);
+
+  if (index == 15) {
+    stream->error = MAD_ERROR_BADBITRATE;
+    return -1;
+  }
+
+  if (header->flags & MAD_FLAG_LSF_EXT)
+    header->bitrate = bitrate_table[3 + (header->layer >> 1)][index];
+  else
+    header->bitrate = bitrate_table[header->layer - 1][index];
+
+  /* sampling_frequency */
+  index = mad_bit_read(&stream->ptr, 2);
+
+  if (index == 3) {
+    stream->error = MAD_ERROR_BADSAMPLERATE;
+    return -1;
+  }
+
+  header->samplerate = samplerate_table[index];
+
+  if (header->flags & MAD_FLAG_LSF_EXT) {
+    header->samplerate /= 2;
+
+    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
+      header->samplerate /= 2;
+  }
+
+  /* padding_bit */
+  if (mad_bit_read(&stream->ptr, 1))
+    header->flags |= MAD_FLAG_PADDING;
+
+  /* private_bit */
+  if (mad_bit_read(&stream->ptr, 1))
+    header->private_bits |= MAD_PRIVATE_HEADER;
+
+  /* mode */
+  header->mode = 3 - mad_bit_read(&stream->ptr, 2);
+
+  /* mode_extension */
+  header->mode_extension = mad_bit_read(&stream->ptr, 2);
+
+  /* copyright */
+  if (mad_bit_read(&stream->ptr, 1))
+    header->flags |= MAD_FLAG_COPYRIGHT;
+
+  /* original/copy */
+  if (mad_bit_read(&stream->ptr, 1))
+    header->flags |= MAD_FLAG_ORIGINAL;
+
+  /* emphasis */
+  header->emphasis = mad_bit_read(&stream->ptr, 2);
+
+# if defined(OPT_STRICT)
+  /*
+   * ISO/IEC 11172-3 says this is a reserved emphasis value, but
+   * streams exist which use it anyway. Since the value is not important
+   * to the decoder proper, we allow it unless OPT_STRICT is defined.
+   */
+  if (header->emphasis == MAD_EMPHASIS_RESERVED) {
+    stream->error = MAD_ERROR_BADEMPHASIS;
+    return -1;
+  }
+# endif
+
+  /* error_check() */
+
+  /* crc_check */
+  if (header->flags & MAD_FLAG_PROTECTION) {
+    if (mad_bit_length(&stream->ptr, &bufend_ptr) < 16) {
+      stream->error = MAD_ERROR_BUFLEN;
+      return -1;
+    }
+    header->crc_target = mad_bit_read(&stream->ptr, 16);
+  }
+
+  return 0;
+}
+
+/*
+ * NAME:	free_bitrate()
+ * DESCRIPTION:	attempt to discover the bitstream's free bitrate
+ */
+static
+int free_bitrate(struct mad_stream *stream, struct mad_header const *header)
+{
+  struct mad_bitptr keep_ptr;
+  unsigned long rate = 0;
+  unsigned int pad_slot, slots_per_frame;
+  unsigned char const *ptr = 0;
+
+  keep_ptr = stream->ptr;
+
+  pad_slot = (header->flags & MAD_FLAG_PADDING) ? 1 : 0;
+  slots_per_frame = (header->layer == MAD_LAYER_III &&
+		     (header->flags & MAD_FLAG_LSF_EXT)) ? 72 : 144;
+
+  while (mad_stream_sync(stream) == 0) {
+    struct mad_stream peek_stream;
+    struct mad_header peek_header;
+
+    peek_stream = *stream;
+    peek_header = *header;
+
+    if (decode_header(&peek_header, &peek_stream) == 0 &&
+	peek_header.layer == header->layer &&
+	peek_header.samplerate == header->samplerate) {
+      unsigned int N;
+
+      ptr = mad_bit_nextbyte(&stream->ptr);
+
+      N = ptr - stream->this_frame;
+
+      if (header->layer == MAD_LAYER_I) {
+	rate = (unsigned long) header->samplerate *
+	  (N - 4 * pad_slot + 4) / 48 / 1000;
+      }
+      else {
+	rate = (unsigned long) header->samplerate *
+	  (N - pad_slot + 1) / slots_per_frame / 1000;
+      }
+
+      if (rate >= 8)
+	break;
+    }
+
+    mad_bit_skip(&stream->ptr, 8);
+  }
+
+  stream->ptr = keep_ptr;
+
+  if (rate < 8 || (header->layer == MAD_LAYER_III && rate > 640)) {
+    stream->error = MAD_ERROR_LOSTSYNC;
+    return -1;
+  }
+
+  stream->freerate = rate * 1000;
+
+  return 0;
+}
+
+/*
+ * NAME:	header->decode()
+ * DESCRIPTION:	read the next frame header from the stream
+ */
+int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
+{
+  register unsigned char const *ptr, *end;
+  unsigned int pad_slot, N;
+
+  ptr = stream->next_frame;
+  end = stream->bufend;
+
+  if (ptr == 0) {
+    stream->error = MAD_ERROR_BUFPTR;
+    goto fail;
+  }
+
+  /* stream skip */
+  if (stream->skiplen) {
+    if (!stream->sync)
+      ptr = stream->this_frame;
+
+    if (end - ptr < stream->skiplen) {
+      stream->skiplen   -= end - ptr;
+      stream->next_frame = end;
+
+      stream->error = MAD_ERROR_BUFLEN;
+      goto fail;
+    }
+
+    ptr += stream->skiplen;
+    stream->skiplen = 0;
+
+    stream->sync = 1;
+  }
+
+ sync:
+  /* synchronize */
+  if (stream->sync) {
+    if (end - ptr < MAD_BUFFER_GUARD) {
+      stream->next_frame = ptr;
+
+      stream->error = MAD_ERROR_BUFLEN;
+      goto fail;
+    }
+    else if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
+      /* mark point where frame sync word was expected */
+      stream->this_frame = ptr;
+      stream->next_frame = ptr + 1;
+
+      stream->error = MAD_ERROR_LOSTSYNC;
+      goto fail;
+    }
+  }
+  else {
+    mad_bit_init(&stream->ptr, ptr);
+
+    if (mad_stream_sync(stream) == -1) {
+      if (end - stream->next_frame >= MAD_BUFFER_GUARD)
+	stream->next_frame = end - MAD_BUFFER_GUARD;
+
+      stream->error = MAD_ERROR_BUFLEN;
+      goto fail;
+    }
+
+    ptr = mad_bit_nextbyte(&stream->ptr);
+  }
+
+  stream->error = MAD_ERROR_NONE;
+
+  /* begin processing */
+  stream->this_frame = ptr;
+  stream->next_frame = ptr + 1;  /* possibly bogus sync word */
+
+  mad_bit_init(&stream->ptr, stream->this_frame);
+
+  if (decode_header(header, stream) == -1)
+    goto fail;
+
+  /* calculate frame duration */
+  mad_timer_set(&header->duration, 0,
+		32 * MAD_NSBSAMPLES(header), header->samplerate);
+
+  /* calculate free bit rate */
+  if (header->bitrate == 0) {
+    if ((stream->freerate == 0 || !stream->sync ||
+	 (header->layer == MAD_LAYER_III && stream->freerate > 640000)) &&
+	free_bitrate(stream, header) == -1)
+      goto fail;
+
+    header->bitrate = stream->freerate;
+    header->flags  |= MAD_FLAG_FREEFORMAT;
+  }
+
+  /* calculate beginning of next frame */
+  pad_slot = (header->flags & MAD_FLAG_PADDING) ? 1 : 0;
+
+  if (header->layer == MAD_LAYER_I)
+    N = ((12 * header->bitrate / header->samplerate) + pad_slot) * 4;
+  else {
+    unsigned int slots_per_frame;
+
+    slots_per_frame = (header->layer == MAD_LAYER_III &&
+		       (header->flags & MAD_FLAG_LSF_EXT)) ? 72 : 144;
+
+    N = (slots_per_frame * header->bitrate / header->samplerate) + pad_slot;
+  }
+
+  /* verify there is enough data left in buffer to decode this frame */
+  if (N + MAD_BUFFER_GUARD > end - stream->this_frame) {
+    stream->next_frame = stream->this_frame;
+
+    stream->error = MAD_ERROR_BUFLEN;
+    goto fail;
+  }
+
+  stream->next_frame = stream->this_frame + N;
+
+  if (!stream->sync) {
+    /* check that a valid frame header follows this frame */
+
+    ptr = stream->next_frame;
+    if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
+      ptr = stream->next_frame = stream->this_frame + 1;
+      goto sync;
+    }
+
+    stream->sync = 1;
+  }
+
+  header->flags |= MAD_FLAG_INCOMPLETE;
+
+  return 0;
+
+ fail:
+  stream->sync = 0;
+
+  return -1;
+}
+
+/*
+ * NAME:	frame->decode()
+ * DESCRIPTION:	decode a single frame from a bitstream
+ */
+int mad_frame_decode(struct mad_frame *frame, struct mad_stream *stream)
+{
+  frame->options = stream->options;
+
+  /* header() */
+  /* error_check() */
+
+  if (!(frame->header.flags & MAD_FLAG_INCOMPLETE) &&
+      mad_header_decode(&frame->header, stream) == -1)
+    goto fail;
+
+  /* audio_data() */
+
+  frame->header.flags &= ~MAD_FLAG_INCOMPLETE;
+
+  if (decoder_table[frame->header.layer - 1](stream, frame) == -1) {
+    if (!MAD_RECOVERABLE(stream->error))
+      stream->next_frame = stream->this_frame;
+
+    goto fail;
+  }
+
+  /* ancillary_data() */
+
+  if (frame->header.layer != MAD_LAYER_III) {
+    struct mad_bitptr next_frame;
+
+    mad_bit_init(&next_frame, stream->next_frame);
+
+    stream->anc_ptr    = stream->ptr;
+    stream->anc_bitlen = mad_bit_length(&stream->ptr, &next_frame);
+
+    mad_bit_finish(&next_frame);
+  }
+
+  return 0;
+
+ fail:
+  stream->anc_bitlen = 0;
+  return -1;
+}
+
+/*
+ * NAME:	frame->mute()
+ * DESCRIPTION:	zero all subband values so the frame becomes silent
+ */
+void mad_frame_mute(struct mad_frame *frame)
+{
+  unsigned int s, sb;
+
+  for (s = 0; s < 36; ++s) {
+    for (sb = 0; sb < 32; ++sb) {
+      frame->sbsample[0][s][sb] =
+      frame->sbsample[1][s][sb] = 0;
+    }
+  }
+
+  if (frame->overlap) {
+    for (s = 0; s < 18; ++s) {
+      for (sb = 0; sb < 32; ++sb) {
+	(*frame->overlap)[0][sb][s] =
+	(*frame->overlap)[1][sb][s] = 0;
+      }
+    }
+  }
+}
diff --git a/code/libmad/global.h b/code/libmad/global.h
new file mode 100644
index 00000000..a6debfd8
--- /dev/null
+++ b/code/libmad/global.h
@@ -0,0 +1,58 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: global.h,v 1.11 2004/01/23 09:41:32 rob Exp $
+ */
+
+# ifndef LIBMAD_GLOBAL_H
+# define LIBMAD_GLOBAL_H
+
+/* conditional debugging */
+
+# if defined(DEBUG) && defined(NDEBUG)
+#  error "cannot define both DEBUG and NDEBUG"
+# endif
+
+# if defined(DEBUG)
+#  include <stdio.h>
+# endif
+
+/* conditional features */
+
+# if defined(OPT_SPEED) && defined(OPT_ACCURACY)
+#  error "cannot optimize for both speed and accuracy"
+# endif
+
+# if defined(OPT_SPEED) && !defined(OPT_SSO)
+#  define OPT_SSO
+# endif
+
+# if defined(HAVE_UNISTD_H) && defined(HAVE_WAITPID) &&  \
+    defined(HAVE_FCNTL) && defined(HAVE_PIPE) && defined(HAVE_FORK)
+#  define USE_ASYNC
+# endif
+
+# if !defined(HAVE_ASSERT_H)
+#  if defined(NDEBUG)
+#   define assert(x)	/* nothing */
+#  else
+#   define assert(x)	do { if (!(x)) abort(); } while (0)
+#  endif
+# endif
+
+# endif
diff --git a/code/libmad/huffman.c b/code/libmad/huffman.c
new file mode 100644
index 00000000..9050c700
--- /dev/null
+++ b/code/libmad/huffman.c
@@ -0,0 +1,3105 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: huffman.c,v 1.10 2004/01/23 09:41:32 rob Exp $
+ */
+
+# include "global.h"
+
+# include "huffman.h"
+
+/*
+ * These are the Huffman code words for Layer III.
+ * The data for these tables are derived from Table B.7 of ISO/IEC 11172-3.
+ *
+ * These tables support decoding up to 4 Huffman code bits at a time.
+ */
+
+# if defined(__GNUC__) ||  \
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901)
+#  define PTR(offs, bits)	{ .ptr   = { 0, bits, offs       } }
+#  define V(v, w, x, y, hlen)	{ .value = { 1, hlen, v, w, x, y } }
+# else
+#  define PTR(offs, bits)	{ { 0, bits, offs } }
+#  if defined(WORDS_BIGENDIAN)
+#   define V(v, w, x, y, hlen)	{ { 1, hlen, (v << 11) | (w << 10) |  \
+                                             (x <<  9) | (y <<  8) } }
+#  else
+#   define V(v, w, x, y, hlen)	{ { 1, hlen, (v <<  0) | (w <<  1) |  \
+                                             (x <<  2) | (y <<  3) } }
+#  endif
+# endif
+
+static
+union huffquad const hufftabA[] = {
+  /* 0000 */ PTR(16, 2),
+  /* 0001 */ PTR(20, 2),
+  /* 0010 */ PTR(24, 1),
+  /* 0011 */ PTR(26, 1),
+  /* 0100 */ V(0, 0, 1, 0, 4),
+  /* 0101 */ V(0, 0, 0, 1, 4),
+  /* 0110 */ V(0, 1, 0, 0, 4),
+  /* 0111 */ V(1, 0, 0, 0, 4),
+  /* 1000 */ V(0, 0, 0, 0, 1),
+  /* 1001 */ V(0, 0, 0, 0, 1),
+  /* 1010 */ V(0, 0, 0, 0, 1),
+  /* 1011 */ V(0, 0, 0, 0, 1),
+  /* 1100 */ V(0, 0, 0, 0, 1),
+  /* 1101 */ V(0, 0, 0, 0, 1),
+  /* 1110 */ V(0, 0, 0, 0, 1),
+  /* 1111 */ V(0, 0, 0, 0, 1),
+
+  /* 0000 ... */
+  /* 00   */ V(1, 0, 1, 1, 2),	/* 16 */
+  /* 01   */ V(1, 1, 1, 1, 2),
+  /* 10   */ V(1, 1, 0, 1, 2),
+  /* 11   */ V(1, 1, 1, 0, 2),
+
+  /* 0001 ... */
+  /* 00   */ V(0, 1, 1, 1, 2),	/* 20 */
+  /* 01   */ V(0, 1, 0, 1, 2),
+  /* 10   */ V(1, 0, 0, 1, 1),
+  /* 11   */ V(1, 0, 0, 1, 1),
+
+  /* 0010 ... */
+  /* 0    */ V(0, 1, 1, 0, 1),	/* 24 */
+  /* 1    */ V(0, 0, 1, 1, 1),
+
+  /* 0011 ... */
+  /* 0    */ V(1, 0, 1, 0, 1),	/* 26 */
+  /* 1    */ V(1, 1, 0, 0, 1)
+};
+
+static
+union huffquad const hufftabB[] = {
+  /* 0000 */ V(1, 1, 1, 1, 4),
+  /* 0001 */ V(1, 1, 1, 0, 4),
+  /* 0010 */ V(1, 1, 0, 1, 4),
+  /* 0011 */ V(1, 1, 0, 0, 4),
+  /* 0100 */ V(1, 0, 1, 1, 4),
+  /* 0101 */ V(1, 0, 1, 0, 4),
+  /* 0110 */ V(1, 0, 0, 1, 4),
+  /* 0111 */ V(1, 0, 0, 0, 4),
+  /* 1000 */ V(0, 1, 1, 1, 4),
+  /* 1001 */ V(0, 1, 1, 0, 4),
+  /* 1010 */ V(0, 1, 0, 1, 4),
+  /* 1011 */ V(0, 1, 0, 0, 4),
+  /* 1100 */ V(0, 0, 1, 1, 4),
+  /* 1101 */ V(0, 0, 1, 0, 4),
+  /* 1110 */ V(0, 0, 0, 1, 4),
+  /* 1111 */ V(0, 0, 0, 0, 4)
+};
+
+# undef V
+# undef PTR
+
+# if defined(__GNUC__) ||  \
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901)
+#  define PTR(offs, bits)	{ .ptr   = { 0, bits, offs } }
+#  define V(x, y, hlen)		{ .value = { 1, hlen, x, y } }
+# else
+#  define PTR(offs, bits)	{ { 0, bits, offs } }
+#  if defined(WORDS_BIGENDIAN)
+#   define V(x, y, hlen)	{ { 1, hlen, (x << 8) | (y << 4) } }
+#  else
+#   define V(x, y, hlen)	{ { 1, hlen, (x << 0) | (y << 4) } }
+#  endif
+# endif
+
+static
+union huffpair const hufftab0[] = {
+  /*      */ V(0, 0, 0)
+};
+
+static
+union huffpair const hufftab1[] = {
+  /* 000  */ V(1, 1, 3),
+  /* 001  */ V(0, 1, 3),
+  /* 010  */ V(1, 0, 2),
+  /* 011  */ V(1, 0, 2),
+  /* 100  */ V(0, 0, 1),
+  /* 101  */ V(0, 0, 1),
+  /* 110  */ V(0, 0, 1),
+  /* 111  */ V(0, 0, 1)
+};
+
+static
+union huffpair const hufftab2[] = {
+  /* 000  */ PTR(8, 3),
+  /* 001  */ V(1, 1, 3),
+  /* 010  */ V(0, 1, 3),
+  /* 011  */ V(1, 0, 3),
+  /* 100  */ V(0, 0, 1),
+  /* 101  */ V(0, 0, 1),
+  /* 110  */ V(0, 0, 1),
+  /* 111  */ V(0, 0, 1),
+
+  /* 000 ... */
+  /* 000  */ V(2, 2, 3),	/* 8 */
+  /* 001  */ V(0, 2, 3),
+  /* 010  */ V(1, 2, 2),
+  /* 011  */ V(1, 2, 2),
+  /* 100  */ V(2, 1, 2),
+  /* 101  */ V(2, 1, 2),
+  /* 110  */ V(2, 0, 2),
+  /* 111  */ V(2, 0, 2)
+};
+
+static
+union huffpair const hufftab3[] = {
+  /* 000  */ PTR(8, 3),
+  /* 001  */ V(1, 0, 3),
+  /* 010  */ V(1, 1, 2),
+  /* 011  */ V(1, 1, 2),
+  /* 100  */ V(0, 1, 2),
+  /* 101  */ V(0, 1, 2),
+  /* 110  */ V(0, 0, 2),
+  /* 111  */ V(0, 0, 2),
+
+  /* 000 ... */
+  /* 000  */ V(2, 2, 3),	/* 8 */
+  /* 001  */ V(0, 2, 3),
+  /* 010  */ V(1, 2, 2),
+  /* 011  */ V(1, 2, 2),
+  /* 100  */ V(2, 1, 2),
+  /* 101  */ V(2, 1, 2),
+  /* 110  */ V(2, 0, 2),
+  /* 111  */ V(2, 0, 2)
+};
+
+static
+union huffpair const hufftab5[] = {
+  /* 000  */ PTR(8, 4),
+  /* 001  */ V(1, 1, 3),
+  /* 010  */ V(0, 1, 3),
+  /* 011  */ V(1, 0, 3),
+  /* 100  */ V(0, 0, 1),
+  /* 101  */ V(0, 0, 1),
+  /* 110  */ V(0, 0, 1),
+  /* 111  */ V(0, 0, 1),
+
+  /* 000 ... */
+  /* 0000 */ PTR(24, 1),	/* 8 */
+  /* 0001 */ V(3, 2, 4),
+  /* 0010 */ V(3, 1, 3),
+  /* 0011 */ V(3, 1, 3),
+  /* 0100 */ V(1, 3, 4),
+  /* 0101 */ V(0, 3, 4),
+  /* 0110 */ V(3, 0, 4),
+  /* 0111 */ V(2, 2, 4),
+  /* 1000 */ V(1, 2, 3),
+  /* 1001 */ V(1, 2, 3),
+  /* 1010 */ V(2, 1, 3),
+  /* 1011 */ V(2, 1, 3),
+  /* 1100 */ V(0, 2, 3),
+  /* 1101 */ V(0, 2, 3),
+  /* 1110 */ V(2, 0, 3),
+  /* 1111 */ V(2, 0, 3),
+
+  /* 000 0000 ... */
+  /* 0    */ V(3, 3, 1),	/* 24 */
+  /* 1    */ V(2, 3, 1)
+};
+
+static
+union huffpair const hufftab6[] = {
+  /* 0000 */ PTR(16, 3),
+  /* 0001 */ PTR(24, 1),
+  /* 0010 */ PTR(26, 1),
+  /* 0011 */ V(1, 2, 4),
+  /* 0100 */ V(2, 1, 4),
+  /* 0101 */ V(2, 0, 4),
+  /* 0110 */ V(0, 1, 3),
+  /* 0111 */ V(0, 1, 3),
+  /* 1000 */ V(1, 1, 2),
+  /* 1001 */ V(1, 1, 2),
+  /* 1010 */ V(1, 1, 2),
+  /* 1011 */ V(1, 1, 2),
+  /* 1100 */ V(1, 0, 3),
+  /* 1101 */ V(1, 0, 3),
+  /* 1110 */ V(0, 0, 3),
+  /* 1111 */ V(0, 0, 3),
+
+  /* 0000 ... */
+  /* 000  */ V(3, 3, 3),	/* 16 */
+  /* 001  */ V(0, 3, 3),
+  /* 010  */ V(2, 3, 2),
+  /* 011  */ V(2, 3, 2),
+  /* 100  */ V(3, 2, 2),
+  /* 101  */ V(3, 2, 2),
+  /* 110  */ V(3, 0, 2),
+  /* 111  */ V(3, 0, 2),
+
+  /* 0001 ... */
+  /* 0    */ V(1, 3, 1),	/* 24 */
+  /* 1    */ V(3, 1, 1),
+
+  /* 0010 ... */
+  /* 0    */ V(2, 2, 1),	/* 26 */
+  /* 1    */ V(0, 2, 1)
+};
+
+static
+union huffpair const hufftab7[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 2),
+  /* 0011 */ V(1, 1, 4),
+  /* 0100 */ V(0, 1, 3),
+  /* 0101 */ V(0, 1, 3),
+  /* 0110 */ V(1, 0, 3),
+  /* 0111 */ V(1, 0, 3),
+  /* 1000 */ V(0, 0, 1),
+  /* 1001 */ V(0, 0, 1),
+  /* 1010 */ V(0, 0, 1),
+  /* 1011 */ V(0, 0, 1),
+  /* 1100 */ V(0, 0, 1),
+  /* 1101 */ V(0, 0, 1),
+  /* 1110 */ V(0, 0, 1),
+  /* 1111 */ V(0, 0, 1),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(52, 2),	/* 16 */
+  /* 0001 */ PTR(56, 1),
+  /* 0010 */ PTR(58, 1),
+  /* 0011 */ V(1, 5, 4),
+  /* 0100 */ V(5, 1, 4),
+  /* 0101 */ PTR(60, 1),
+  /* 0110 */ V(5, 0, 4),
+  /* 0111 */ PTR(62, 1),
+  /* 1000 */ V(2, 4, 4),
+  /* 1001 */ V(4, 2, 4),
+  /* 1010 */ V(1, 4, 3),
+  /* 1011 */ V(1, 4, 3),
+  /* 1100 */ V(4, 1, 3),
+  /* 1101 */ V(4, 1, 3),
+  /* 1110 */ V(4, 0, 3),
+  /* 1111 */ V(4, 0, 3),
+
+  /* 0001 ... */
+  /* 0000 */ V(0, 4, 4),	/* 32 */
+  /* 0001 */ V(2, 3, 4),
+  /* 0010 */ V(3, 2, 4),
+  /* 0011 */ V(0, 3, 4),
+  /* 0100 */ V(1, 3, 3),
+  /* 0101 */ V(1, 3, 3),
+  /* 0110 */ V(3, 1, 3),
+  /* 0111 */ V(3, 1, 3),
+  /* 1000 */ V(3, 0, 3),
+  /* 1001 */ V(3, 0, 3),
+  /* 1010 */ V(2, 2, 3),
+  /* 1011 */ V(2, 2, 3),
+  /* 1100 */ V(1, 2, 2),
+  /* 1101 */ V(1, 2, 2),
+  /* 1110 */ V(1, 2, 2),
+  /* 1111 */ V(1, 2, 2),
+
+  /* 0010 ... */
+  /* 00   */ V(2, 1, 1),	/* 48 */
+  /* 01   */ V(2, 1, 1),
+  /* 10   */ V(0, 2, 2),
+  /* 11   */ V(2, 0, 2),
+
+  /* 0000 0000 ... */
+  /* 00   */ V(5, 5, 2),	/* 52 */
+  /* 01   */ V(4, 5, 2),
+  /* 10   */ V(5, 4, 2),
+  /* 11   */ V(5, 3, 2),
+
+  /* 0000 0001 ... */
+  /* 0    */ V(3, 5, 1),	/* 56 */
+  /* 1    */ V(4, 4, 1),
+
+  /* 0000 0010 ... */
+  /* 0    */ V(2, 5, 1),	/* 58 */
+  /* 1    */ V(5, 2, 1),
+
+  /* 0000 0101 ... */
+  /* 0    */ V(0, 5, 1),	/* 60 */
+  /* 1    */ V(3, 4, 1),
+
+  /* 0000 0111 ... */
+  /* 0    */ V(4, 3, 1),	/* 62 */
+  /* 1    */ V(3, 3, 1)
+};
+
+# if 0
+/* this version saves 8 entries (16 bytes) at the expense of
+   an extra lookup in 4 out of 36 cases */
+static
+union huffpair const hufftab8[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 2),
+  /* 0010 */ V(1, 2, 4),
+  /* 0011 */ V(2, 1, 4),
+  /* 0100 */ V(1, 1, 2),
+  /* 0101 */ V(1, 1, 2),
+  /* 0110 */ V(1, 1, 2),
+  /* 0111 */ V(1, 1, 2),
+  /* 1000 */ V(0, 1, 3),
+  /* 1001 */ V(0, 1, 3),
+  /* 1010 */ V(1, 0, 3),
+  /* 1011 */ V(1, 0, 3),
+  /* 1100 */ V(0, 0, 2),
+  /* 1101 */ V(0, 0, 2),
+  /* 1110 */ V(0, 0, 2),
+  /* 1111 */ V(0, 0, 2),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(36, 3),	/* 16 */
+  /* 0001 */ PTR(44, 2),
+  /* 0010 */ PTR(48, 1),
+  /* 0011 */ V(1, 5, 4),
+  /* 0100 */ V(5, 1, 4),
+  /* 0101 */ PTR(50, 1),
+  /* 0110 */ PTR(52, 1),
+  /* 0111 */ V(2, 4, 4),
+  /* 1000 */ V(4, 2, 4),
+  /* 1001 */ V(1, 4, 4),
+  /* 1010 */ V(4, 1, 3),
+  /* 1011 */ V(4, 1, 3),
+  /* 1100 */ V(0, 4, 4),
+  /* 1101 */ V(4, 0, 4),
+  /* 1110 */ V(2, 3, 4),
+  /* 1111 */ V(3, 2, 4),
+
+  /* 0001 ... */
+  /* 00   */ PTR(54, 2),	/* 32 */
+  /* 01   */ V(2, 2, 2),
+  /* 10   */ V(0, 2, 2),
+  /* 11   */ V(2, 0, 2),
+
+  /* 0000 0000 ... */
+  /* 000  */ V(5, 5, 3),	/* 36 */
+  /* 001  */ V(5, 4, 3),
+  /* 010  */ V(4, 5, 2),
+  /* 011  */ V(4, 5, 2),
+  /* 100  */ V(5, 3, 1),
+  /* 101  */ V(5, 3, 1),
+  /* 110  */ V(5, 3, 1),
+  /* 111  */ V(5, 3, 1),
+
+  /* 0000 0001 ... */
+  /* 00   */ V(3, 5, 2),	/* 44 */
+  /* 01   */ V(4, 4, 2),
+  /* 10   */ V(2, 5, 1),
+  /* 11   */ V(2, 5, 1),
+
+  /* 0000 0010 ... */
+  /* 0    */ V(5, 2, 1),	/* 48 */
+  /* 1    */ V(0, 5, 1),
+
+  /* 0000 0101 ... */
+  /* 0    */ V(3, 4, 1),	/* 50 */
+  /* 1    */ V(4, 3, 1),
+
+  /* 0000 0110 ... */
+  /* 0    */ V(5, 0, 1),	/* 52 */
+  /* 1    */ V(3, 3, 1),
+
+  /* 0001 00 ... */
+  /* 00   */ V(1, 3, 2),	/* 54 */
+  /* 01   */ V(3, 1, 2),
+  /* 10   */ V(0, 3, 2),
+  /* 11   */ V(3, 0, 2),
+};
+# else
+static
+union huffpair const hufftab8[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ V(1, 2, 4),
+  /* 0011 */ V(2, 1, 4),
+  /* 0100 */ V(1, 1, 2),
+  /* 0101 */ V(1, 1, 2),
+  /* 0110 */ V(1, 1, 2),
+  /* 0111 */ V(1, 1, 2),
+  /* 1000 */ V(0, 1, 3),
+  /* 1001 */ V(0, 1, 3),
+  /* 1010 */ V(1, 0, 3),
+  /* 1011 */ V(1, 0, 3),
+  /* 1100 */ V(0, 0, 2),
+  /* 1101 */ V(0, 0, 2),
+  /* 1110 */ V(0, 0, 2),
+  /* 1111 */ V(0, 0, 2),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(48, 3),	/* 16 */
+  /* 0001 */ PTR(56, 2),
+  /* 0010 */ PTR(60, 1),
+  /* 0011 */ V(1, 5, 4),
+  /* 0100 */ V(5, 1, 4),
+  /* 0101 */ PTR(62, 1),
+  /* 0110 */ PTR(64, 1),
+  /* 0111 */ V(2, 4, 4),
+  /* 1000 */ V(4, 2, 4),
+  /* 1001 */ V(1, 4, 4),
+  /* 1010 */ V(4, 1, 3),
+  /* 1011 */ V(4, 1, 3),
+  /* 1100 */ V(0, 4, 4),
+  /* 1101 */ V(4, 0, 4),
+  /* 1110 */ V(2, 3, 4),
+  /* 1111 */ V(3, 2, 4),
+
+  /* 0001 ... */
+  /* 0000 */ V(1, 3, 4),	/* 32 */
+  /* 0001 */ V(3, 1, 4),
+  /* 0010 */ V(0, 3, 4),
+  /* 0011 */ V(3, 0, 4),
+  /* 0100 */ V(2, 2, 2),
+  /* 0101 */ V(2, 2, 2),
+  /* 0110 */ V(2, 2, 2),
+  /* 0111 */ V(2, 2, 2),
+  /* 1000 */ V(0, 2, 2),
+  /* 1001 */ V(0, 2, 2),
+  /* 1010 */ V(0, 2, 2),
+  /* 1011 */ V(0, 2, 2),
+  /* 1100 */ V(2, 0, 2),
+  /* 1101 */ V(2, 0, 2),
+  /* 1110 */ V(2, 0, 2),
+  /* 1111 */ V(2, 0, 2),
+
+  /* 0000 0000 ... */
+  /* 000  */ V(5, 5, 3),	/* 48 */
+  /* 001  */ V(5, 4, 3),
+  /* 010  */ V(4, 5, 2),
+  /* 011  */ V(4, 5, 2),
+  /* 100  */ V(5, 3, 1),
+  /* 101  */ V(5, 3, 1),
+  /* 110  */ V(5, 3, 1),
+  /* 111  */ V(5, 3, 1),
+
+  /* 0000 0001 ... */
+  /* 00   */ V(3, 5, 2),	/* 56 */
+  /* 01   */ V(4, 4, 2),
+  /* 10   */ V(2, 5, 1),
+  /* 11   */ V(2, 5, 1),
+
+  /* 0000 0010 ... */
+  /* 0    */ V(5, 2, 1),	/* 60 */
+  /* 1    */ V(0, 5, 1),
+
+  /* 0000 0101 ... */
+  /* 0    */ V(3, 4, 1),	/* 62 */
+  /* 1    */ V(4, 3, 1),
+
+  /* 0000 0110 ... */
+  /* 0    */ V(5, 0, 1),	/* 64 */
+  /* 1    */ V(3, 3, 1)
+};
+# endif
+
+static
+union huffpair const hufftab9[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 3),
+  /* 0010 */ PTR(40, 2),
+  /* 0011 */ PTR(44, 2),
+  /* 0100 */ PTR(48, 1),
+  /* 0101 */ V(1, 2, 4),
+  /* 0110 */ V(2, 1, 4),
+  /* 0111 */ V(2, 0, 4),
+  /* 1000 */ V(1, 1, 3),
+  /* 1001 */ V(1, 1, 3),
+  /* 1010 */ V(0, 1, 3),
+  /* 1011 */ V(0, 1, 3),
+  /* 1100 */ V(1, 0, 3),
+  /* 1101 */ V(1, 0, 3),
+  /* 1110 */ V(0, 0, 3),
+  /* 1111 */ V(0, 0, 3),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(50, 1),	/* 16 */
+  /* 0001 */ V(3, 5, 4),
+  /* 0010 */ V(5, 3, 4),
+  /* 0011 */ PTR(52, 1),
+  /* 0100 */ V(4, 4, 4),
+  /* 0101 */ V(2, 5, 4),
+  /* 0110 */ V(5, 2, 4),
+  /* 0111 */ V(1, 5, 4),
+  /* 1000 */ V(5, 1, 3),
+  /* 1001 */ V(5, 1, 3),
+  /* 1010 */ V(3, 4, 3),
+  /* 1011 */ V(3, 4, 3),
+  /* 1100 */ V(4, 3, 3),
+  /* 1101 */ V(4, 3, 3),
+  /* 1110 */ V(5, 0, 4),
+  /* 1111 */ V(0, 4, 4),
+
+  /* 0001 ... */
+  /* 000  */ V(2, 4, 3),	/* 32 */
+  /* 001  */ V(4, 2, 3),
+  /* 010  */ V(3, 3, 3),
+  /* 011  */ V(4, 0, 3),
+  /* 100  */ V(1, 4, 2),
+  /* 101  */ V(1, 4, 2),
+  /* 110  */ V(4, 1, 2),
+  /* 111  */ V(4, 1, 2),
+
+  /* 0010 ... */
+  /* 00   */ V(2, 3, 2),	/* 40 */
+  /* 01   */ V(3, 2, 2),
+  /* 10   */ V(1, 3, 1),
+  /* 11   */ V(1, 3, 1),
+
+  /* 0011 ... */
+  /* 00   */ V(3, 1, 1),	/* 44 */
+  /* 01   */ V(3, 1, 1),
+  /* 10   */ V(0, 3, 2),
+  /* 11   */ V(3, 0, 2),
+
+  /* 0100 ... */
+  /* 0    */ V(2, 2, 1),	/* 48 */
+  /* 1    */ V(0, 2, 1),
+
+  /* 0000 0000 ... */
+  /* 0    */ V(5, 5, 1),	/* 50 */
+  /* 1    */ V(4, 5, 1),
+
+  /* 0000 0011 ... */
+  /* 0    */ V(5, 4, 1),	/* 52 */
+  /* 1    */ V(0, 5, 1)
+};
+
+static
+union huffpair const hufftab10[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 2),
+  /* 0011 */ V(1, 1, 4),
+  /* 0100 */ V(0, 1, 3),
+  /* 0101 */ V(0, 1, 3),
+  /* 0110 */ V(1, 0, 3),
+  /* 0111 */ V(1, 0, 3),
+  /* 1000 */ V(0, 0, 1),
+  /* 1001 */ V(0, 0, 1),
+  /* 1010 */ V(0, 0, 1),
+  /* 1011 */ V(0, 0, 1),
+  /* 1100 */ V(0, 0, 1),
+  /* 1101 */ V(0, 0, 1),
+  /* 1110 */ V(0, 0, 1),
+  /* 1111 */ V(0, 0, 1),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(52, 3),	/* 16 */
+  /* 0001 */ PTR(60, 2),
+  /* 0010 */ PTR(64, 3),
+  /* 0011 */ PTR(72, 1),
+  /* 0100 */ PTR(74, 2),
+  /* 0101 */ PTR(78, 2),
+  /* 0110 */ PTR(82, 2),
+  /* 0111 */ V(1, 7, 4),
+  /* 1000 */ V(7, 1, 4),
+  /* 1001 */ PTR(86, 1),
+  /* 1010 */ PTR(88, 2),
+  /* 1011 */ PTR(92, 2),
+  /* 1100 */ V(1, 6, 4),
+  /* 1101 */ V(6, 1, 4),
+  /* 1110 */ V(6, 0, 4),
+  /* 1111 */ PTR(96, 1),
+
+  /* 0001 ... */
+  /* 0000 */ PTR(98, 1),	/* 32 */
+  /* 0001 */ PTR(100, 1),
+  /* 0010 */ V(1, 4, 4),
+  /* 0011 */ V(4, 1, 4),
+  /* 0100 */ V(4, 0, 4),
+  /* 0101 */ V(2, 3, 4),
+  /* 0110 */ V(3, 2, 4),
+  /* 0111 */ V(0, 3, 4),
+  /* 1000 */ V(1, 3, 3),
+  /* 1001 */ V(1, 3, 3),
+  /* 1010 */ V(3, 1, 3),
+  /* 1011 */ V(3, 1, 3),
+  /* 1100 */ V(3, 0, 3),
+  /* 1101 */ V(3, 0, 3),
+  /* 1110 */ V(2, 2, 3),
+  /* 1111 */ V(2, 2, 3),
+
+  /* 0010 ... */
+  /* 00   */ V(1, 2, 2),	/* 48 */
+  /* 01   */ V(2, 1, 2),
+  /* 10   */ V(0, 2, 2),
+  /* 11   */ V(2, 0, 2),
+
+  /* 0000 0000 ... */
+  /* 000  */ V(7, 7, 3),	/* 52 */
+  /* 001  */ V(6, 7, 3),
+  /* 010  */ V(7, 6, 3),
+  /* 011  */ V(5, 7, 3),
+  /* 100  */ V(7, 5, 3),
+  /* 101  */ V(6, 6, 3),
+  /* 110  */ V(4, 7, 2),
+  /* 111  */ V(4, 7, 2),
+
+  /* 0000 0001 ... */
+  /* 00   */ V(7, 4, 2),	/* 60 */
+  /* 01   */ V(5, 6, 2),
+  /* 10   */ V(6, 5, 2),
+  /* 11   */ V(3, 7, 2),
+
+  /* 0000 0010 ... */
+  /* 000  */ V(7, 3, 2),	/* 64 */
+  /* 001  */ V(7, 3, 2),
+  /* 010  */ V(4, 6, 2),
+  /* 011  */ V(4, 6, 2),
+  /* 100  */ V(5, 5, 3),
+  /* 101  */ V(5, 4, 3),
+  /* 110  */ V(6, 3, 2),
+  /* 111  */ V(6, 3, 2),
+
+  /* 0000 0011 ... */
+  /* 0    */ V(2, 7, 1),	/* 72 */
+  /* 1    */ V(7, 2, 1),
+
+  /* 0000 0100 ... */
+  /* 00   */ V(6, 4, 2),	/* 74 */
+  /* 01   */ V(0, 7, 2),
+  /* 10   */ V(7, 0, 1),
+  /* 11   */ V(7, 0, 1),
+
+  /* 0000 0101 ... */
+  /* 00   */ V(6, 2, 1),	/* 78 */
+  /* 01   */ V(6, 2, 1),
+  /* 10   */ V(4, 5, 2),
+  /* 11   */ V(3, 5, 2),
+
+  /* 0000 0110 ... */
+  /* 00   */ V(0, 6, 1),	/* 82 */
+  /* 01   */ V(0, 6, 1),
+  /* 10   */ V(5, 3, 2),
+  /* 11   */ V(4, 4, 2),
+
+  /* 0000 1001 ... */
+  /* 0    */ V(3, 6, 1),	/* 86 */
+  /* 1    */ V(2, 6, 1),
+
+  /* 0000 1010 ... */
+  /* 00   */ V(2, 5, 2),	/* 88 */
+  /* 01   */ V(5, 2, 2),
+  /* 10   */ V(1, 5, 1),
+  /* 11   */ V(1, 5, 1),
+
+  /* 0000 1011 ... */
+  /* 00   */ V(5, 1, 1),	/* 92 */
+  /* 01   */ V(5, 1, 1),
+  /* 10   */ V(3, 4, 2),
+  /* 11   */ V(4, 3, 2),
+
+  /* 0000 1111 ... */
+  /* 0    */ V(0, 5, 1),	/* 96 */
+  /* 1    */ V(5, 0, 1),
+
+  /* 0001 0000 ... */
+  /* 0    */ V(2, 4, 1),	/* 98 */
+  /* 1    */ V(4, 2, 1),
+
+  /* 0001 0001 ... */
+  /* 0    */ V(3, 3, 1),	/* 100 */
+  /* 1    */ V(0, 4, 1)
+};
+
+static
+union huffpair const hufftab11[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 4),
+  /* 0011 */ PTR(64, 3),
+  /* 0100 */ V(1, 2, 4),
+  /* 0101 */ PTR(72, 1),
+  /* 0110 */ V(1, 1, 3),
+  /* 0111 */ V(1, 1, 3),
+  /* 1000 */ V(0, 1, 3),
+  /* 1001 */ V(0, 1, 3),
+  /* 1010 */ V(1, 0, 3),
+  /* 1011 */ V(1, 0, 3),
+  /* 1100 */ V(0, 0, 2),
+  /* 1101 */ V(0, 0, 2),
+  /* 1110 */ V(0, 0, 2),
+  /* 1111 */ V(0, 0, 2),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(74, 2),	/* 16 */
+  /* 0001 */ PTR(78, 3),
+  /* 0010 */ PTR(86, 2),
+  /* 0011 */ PTR(90, 1),
+  /* 0100 */ PTR(92, 2),
+  /* 0101 */ V(2, 7, 4),
+  /* 0110 */ V(7, 2, 4),
+  /* 0111 */ PTR(96, 1),
+  /* 1000 */ V(7, 1, 3),
+  /* 1001 */ V(7, 1, 3),
+  /* 1010 */ V(1, 7, 4),
+  /* 1011 */ V(7, 0, 4),
+  /* 1100 */ V(3, 6, 4),
+  /* 1101 */ V(6, 3, 4),
+  /* 1110 */ V(6, 0, 4),
+  /* 1111 */ PTR(98, 1),
+
+  /* 0001 ... */
+  /* 0000 */ PTR(100, 1),	/* 32 */
+  /* 0001 */ V(1, 5, 4),
+  /* 0010 */ V(6, 2, 3),
+  /* 0011 */ V(6, 2, 3),
+  /* 0100 */ V(2, 6, 4),
+  /* 0101 */ V(0, 6, 4),
+  /* 0110 */ V(1, 6, 3),
+  /* 0111 */ V(1, 6, 3),
+  /* 1000 */ V(6, 1, 3),
+  /* 1001 */ V(6, 1, 3),
+  /* 1010 */ V(5, 1, 4),
+  /* 1011 */ V(3, 4, 4),
+  /* 1100 */ V(5, 0, 4),
+  /* 1101 */ PTR(102, 1),
+  /* 1110 */ V(2, 4, 4),
+  /* 1111 */ V(4, 2, 4),
+
+  /* 0010 ... */
+  /* 0000 */ V(1, 4, 4),	/* 48 */
+  /* 0001 */ V(4, 1, 4),
+  /* 0010 */ V(0, 4, 4),
+  /* 0011 */ V(4, 0, 4),
+  /* 0100 */ V(2, 3, 3),
+  /* 0101 */ V(2, 3, 3),
+  /* 0110 */ V(3, 2, 3),
+  /* 0111 */ V(3, 2, 3),
+  /* 1000 */ V(1, 3, 2),
+  /* 1001 */ V(1, 3, 2),
+  /* 1010 */ V(1, 3, 2),
+  /* 1011 */ V(1, 3, 2),
+  /* 1100 */ V(3, 1, 2),
+  /* 1101 */ V(3, 1, 2),
+  /* 1110 */ V(3, 1, 2),
+  /* 1111 */ V(3, 1, 2),
+
+  /* 0011 ... */
+  /* 000  */ V(0, 3, 3),	/* 64 */
+  /* 001  */ V(3, 0, 3),
+  /* 010  */ V(2, 2, 2),
+  /* 011  */ V(2, 2, 2),
+  /* 100  */ V(2, 1, 1),
+  /* 101  */ V(2, 1, 1),
+  /* 110  */ V(2, 1, 1),
+  /* 111  */ V(2, 1, 1),
+
+  /* 0101 ... */
+  /* 0    */ V(0, 2, 1),	/* 72 */
+  /* 1    */ V(2, 0, 1),
+
+  /* 0000 0000 ... */
+  /* 00   */ V(7, 7, 2),	/* 74 */
+  /* 01   */ V(6, 7, 2),
+  /* 10   */ V(7, 6, 2),
+  /* 11   */ V(7, 5, 2),
+
+  /* 0000 0001 ... */
+  /* 000  */ V(6, 6, 2),	/* 78 */
+  /* 001  */ V(6, 6, 2),
+  /* 010  */ V(4, 7, 2),
+  /* 011  */ V(4, 7, 2),
+  /* 100  */ V(7, 4, 2),
+  /* 101  */ V(7, 4, 2),
+  /* 110  */ V(5, 7, 3),
+  /* 111  */ V(5, 5, 3),
+
+  /* 0000 0010 ... */
+  /* 00   */ V(5, 6, 2),	/* 86 */
+  /* 01   */ V(6, 5, 2),
+  /* 10   */ V(3, 7, 1),
+  /* 11   */ V(3, 7, 1),
+
+  /* 0000 0011 ... */
+  /* 0    */ V(7, 3, 1),	/* 90 */
+  /* 1    */ V(4, 6, 1),
+
+  /* 0000 0100 ... */
+  /* 00   */ V(4, 5, 2),	/* 92 */
+  /* 01   */ V(5, 4, 2),
+  /* 10   */ V(3, 5, 2),
+  /* 11   */ V(5, 3, 2),
+
+  /* 0000 0111 ... */
+  /* 0    */ V(6, 4, 1),	/* 96 */
+  /* 1    */ V(0, 7, 1),
+
+  /* 0000 1111 ... */
+  /* 0    */ V(4, 4, 1),	/* 98 */
+  /* 1    */ V(2, 5, 1),
+
+  /* 0001 0000 ... */
+  /* 0    */ V(5, 2, 1),	/* 100 */
+  /* 1    */ V(0, 5, 1),
+
+  /* 0001 1101 ... */
+  /* 0    */ V(4, 3, 1),	/* 102 */
+  /* 1    */ V(3, 3, 1)
+};
+
+static
+union huffpair const hufftab12[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 4),
+  /* 0011 */ PTR(64, 2),
+  /* 0100 */ PTR(68, 3),
+  /* 0101 */ PTR(76, 1),
+  /* 0110 */ V(1, 2, 4),
+  /* 0111 */ V(2, 1, 4),
+  /* 1000 */ PTR(78, 1),
+  /* 1001 */ V(0, 0, 4),
+  /* 1010 */ V(1, 1, 3),
+  /* 1011 */ V(1, 1, 3),
+  /* 1100 */ V(0, 1, 3),
+  /* 1101 */ V(0, 1, 3),
+  /* 1110 */ V(1, 0, 3),
+  /* 1111 */ V(1, 0, 3),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(80, 2),	/* 16 */
+  /* 0001 */ PTR(84, 1),
+  /* 0010 */ PTR(86, 1),
+  /* 0011 */ PTR(88, 1),
+  /* 0100 */ V(5, 6, 4),
+  /* 0101 */ V(3, 7, 4),
+  /* 0110 */ PTR(90, 1),
+  /* 0111 */ V(2, 7, 4),
+  /* 1000 */ V(7, 2, 4),
+  /* 1001 */ V(4, 6, 4),
+  /* 1010 */ V(6, 4, 4),
+  /* 1011 */ V(1, 7, 4),
+  /* 1100 */ V(7, 1, 4),
+  /* 1101 */ PTR(92, 1),
+  /* 1110 */ V(3, 6, 4),
+  /* 1111 */ V(6, 3, 4),
+
+  /* 0001 ... */
+  /* 0000 */ V(4, 5, 4),	/* 32 */
+  /* 0001 */ V(5, 4, 4),
+  /* 0010 */ V(4, 4, 4),
+  /* 0011 */ PTR(94, 1),
+  /* 0100 */ V(2, 6, 3),
+  /* 0101 */ V(2, 6, 3),
+  /* 0110 */ V(6, 2, 3),
+  /* 0111 */ V(6, 2, 3),
+  /* 1000 */ V(6, 1, 3),
+  /* 1001 */ V(6, 1, 3),
+  /* 1010 */ V(1, 6, 4),
+  /* 1011 */ V(6, 0, 4),
+  /* 1100 */ V(3, 5, 4),
+  /* 1101 */ V(5, 3, 4),
+  /* 1110 */ V(2, 5, 4),
+  /* 1111 */ V(5, 2, 4),
+
+  /* 0010 ... */
+  /* 0000 */ V(1, 5, 3),	/* 48 */
+  /* 0001 */ V(1, 5, 3),
+  /* 0010 */ V(5, 1, 3),
+  /* 0011 */ V(5, 1, 3),
+  /* 0100 */ V(3, 4, 3),
+  /* 0101 */ V(3, 4, 3),
+  /* 0110 */ V(4, 3, 3),
+  /* 0111 */ V(4, 3, 3),
+  /* 1000 */ V(5, 0, 4),
+  /* 1001 */ V(0, 4, 4),
+  /* 1010 */ V(2, 4, 3),
+  /* 1011 */ V(2, 4, 3),
+  /* 1100 */ V(4, 2, 3),
+  /* 1101 */ V(4, 2, 3),
+  /* 1110 */ V(1, 4, 3),
+  /* 1111 */ V(1, 4, 3),
+
+  /* 0011 ... */
+  /* 00   */ V(3, 3, 2),	/* 64 */
+  /* 01   */ V(4, 1, 2),
+  /* 10   */ V(2, 3, 2),
+  /* 11   */ V(3, 2, 2),
+
+  /* 0100 ... */
+  /* 000  */ V(4, 0, 3),	/* 68 */
+  /* 001  */ V(0, 3, 3),
+  /* 010  */ V(3, 0, 2),
+  /* 011  */ V(3, 0, 2),
+  /* 100  */ V(1, 3, 1),
+  /* 101  */ V(1, 3, 1),
+  /* 110  */ V(1, 3, 1),
+  /* 111  */ V(1, 3, 1),
+
+  /* 0101 ... */
+  /* 0    */ V(3, 1, 1),	/* 76 */
+  /* 1    */ V(2, 2, 1),
+
+  /* 1000 ... */
+  /* 0    */ V(0, 2, 1),	/* 78 */
+  /* 1    */ V(2, 0, 1),
+
+  /* 0000 0000 ... */
+  /* 00   */ V(7, 7, 2),	/* 80 */
+  /* 01   */ V(6, 7, 2),
+  /* 10   */ V(7, 6, 1),
+  /* 11   */ V(7, 6, 1),
+
+  /* 0000 0001 ... */
+  /* 0    */ V(5, 7, 1),	/* 84 */
+  /* 1    */ V(7, 5, 1),
+
+  /* 0000 0010 ... */
+  /* 0    */ V(6, 6, 1),	/* 86 */
+  /* 1    */ V(4, 7, 1),
+
+  /* 0000 0011 ... */
+  /* 0    */ V(7, 4, 1),	/* 88 */
+  /* 1    */ V(6, 5, 1),
+
+  /* 0000 0110 ... */
+  /* 0    */ V(7, 3, 1),	/* 90 */
+  /* 1    */ V(5, 5, 1),
+
+  /* 0000 1101 ... */
+  /* 0    */ V(0, 7, 1),	/* 92 */
+  /* 1    */ V(7, 0, 1),
+
+  /* 0001 0011 ... */
+  /* 0    */ V(0, 6, 1),	/* 94 */
+  /* 1    */ V(0, 5, 1)
+};
+
+static
+union huffpair const hufftab13[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 4),
+  /* 0011 */ PTR(64, 2),
+  /* 0100 */ V(1, 1, 4),
+  /* 0101 */ V(0, 1, 4),
+  /* 0110 */ V(1, 0, 3),
+  /* 0111 */ V(1, 0, 3),
+  /* 1000 */ V(0, 0, 1),
+  /* 1001 */ V(0, 0, 1),
+  /* 1010 */ V(0, 0, 1),
+  /* 1011 */ V(0, 0, 1),
+  /* 1100 */ V(0, 0, 1),
+  /* 1101 */ V(0, 0, 1),
+  /* 1110 */ V(0, 0, 1),
+  /* 1111 */ V(0, 0, 1),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(68, 4),	/* 16 */
+  /* 0001 */ PTR(84, 4),
+  /* 0010 */ PTR(100, 4),
+  /* 0011 */ PTR(116, 4),
+  /* 0100 */ PTR(132, 4),
+  /* 0101 */ PTR(148, 4),
+  /* 0110 */ PTR(164, 3),
+  /* 0111 */ PTR(172, 3),
+  /* 1000 */ PTR(180, 3),
+  /* 1001 */ PTR(188, 3),
+  /* 1010 */ PTR(196, 3),
+  /* 1011 */ PTR(204, 3),
+  /* 1100 */ PTR(212, 1),
+  /* 1101 */ PTR(214, 2),
+  /* 1110 */ PTR(218, 3),
+  /* 1111 */ PTR(226, 1),
+
+  /* 0001 ... */
+  /* 0000 */ PTR(228, 2),	/* 32 */
+  /* 0001 */ PTR(232, 2),
+  /* 0010 */ PTR(236, 2),
+  /* 0011 */ PTR(240, 2),
+  /* 0100 */ V(8, 1, 4),
+  /* 0101 */ PTR(244, 1),
+  /* 0110 */ PTR(246, 1),
+  /* 0111 */ PTR(248, 1),
+  /* 1000 */ PTR(250, 2),
+  /* 1001 */ PTR(254, 1),
+  /* 1010 */ V(1, 5, 4),
+  /* 1011 */ V(5, 1, 4),
+  /* 1100 */ PTR(256, 1),
+  /* 1101 */ PTR(258, 1),
+  /* 1110 */ PTR(260, 1),
+  /* 1111 */ V(1, 4, 4),
+
+  /* 0010 ... */
+  /* 0000 */ V(4, 1, 3),	/* 48 */
+  /* 0001 */ V(4, 1, 3),
+  /* 0010 */ V(0, 4, 4),
+  /* 0011 */ V(4, 0, 4),
+  /* 0100 */ V(2, 3, 4),
+  /* 0101 */ V(3, 2, 4),
+  /* 0110 */ V(1, 3, 3),
+  /* 0111 */ V(1, 3, 3),
+  /* 1000 */ V(3, 1, 3),
+  /* 1001 */ V(3, 1, 3),
+  /* 1010 */ V(0, 3, 3),
+  /* 1011 */ V(0, 3, 3),
+  /* 1100 */ V(3, 0, 3),
+  /* 1101 */ V(3, 0, 3),
+  /* 1110 */ V(2, 2, 3),
+  /* 1111 */ V(2, 2, 3),
+
+  /* 0011 ... */
+  /* 00   */ V(1, 2, 2),	/* 64 */
+  /* 01   */ V(2, 1, 2),
+  /* 10   */ V(0, 2, 2),
+  /* 11   */ V(2, 0, 2),
+
+  /* 0000 0000 ... */
+  /* 0000 */ PTR(262, 4),	/* 68 */
+  /* 0001 */ PTR(278, 4),
+  /* 0010 */ PTR(294, 4),
+  /* 0011 */ PTR(310, 3),
+  /* 0100 */ PTR(318, 2),
+  /* 0101 */ PTR(322, 2),
+  /* 0110 */ PTR(326, 3),
+  /* 0111 */ PTR(334, 2),
+  /* 1000 */ PTR(338, 1),
+  /* 1001 */ PTR(340, 2),
+  /* 1010 */ PTR(344, 2),
+  /* 1011 */ PTR(348, 2),
+  /* 1100 */ PTR(352, 2),
+  /* 1101 */ PTR(356, 2),
+  /* 1110 */ V(1, 15, 4),
+  /* 1111 */ V(15, 1, 4),
+
+  /* 0000 0001 ... */
+  /* 0000 */ V(15, 0, 4),	/* 84 */
+  /* 0001 */ PTR(360, 1),
+  /* 0010 */ PTR(362, 1),
+  /* 0011 */ PTR(364, 1),
+  /* 0100 */ V(14, 2, 4),
+  /* 0101 */ PTR(366, 1),
+  /* 0110 */ V(1, 14, 4),
+  /* 0111 */ V(14, 1, 4),
+  /* 1000 */ PTR(368, 1),
+  /* 1001 */ PTR(370, 1),
+  /* 1010 */ PTR(372, 1),
+  /* 1011 */ PTR(374, 1),
+  /* 1100 */ PTR(376, 1),
+  /* 1101 */ PTR(378, 1),
+  /* 1110 */ V(12, 6, 4),
+  /* 1111 */ V(3, 13, 4),
+
+  /* 0000 0010 ... */
+  /* 0000 */ PTR(380, 1),	/* 100 */
+  /* 0001 */ V(2, 13, 4),
+  /* 0010 */ V(13, 2, 4),
+  /* 0011 */ V(1, 13, 4),
+  /* 0100 */ V(11, 7, 4),
+  /* 0101 */ PTR(382, 1),
+  /* 0110 */ PTR(384, 1),
+  /* 0111 */ V(12, 3, 4),
+  /* 1000 */ PTR(386, 1),
+  /* 1001 */ V(4, 11, 4),
+  /* 1010 */ V(13, 1, 3),
+  /* 1011 */ V(13, 1, 3),
+  /* 1100 */ V(0, 13, 4),
+  /* 1101 */ V(13, 0, 4),
+  /* 1110 */ V(8, 10, 4),
+  /* 1111 */ V(10, 8, 4),
+
+  /* 0000 0011 ... */
+  /* 0000 */ V(4, 12, 4),	/* 116 */
+  /* 0001 */ V(12, 4, 4),
+  /* 0010 */ V(6, 11, 4),
+  /* 0011 */ V(11, 6, 4),
+  /* 0100 */ V(3, 12, 3),
+  /* 0101 */ V(3, 12, 3),
+  /* 0110 */ V(2, 12, 3),
+  /* 0111 */ V(2, 12, 3),
+  /* 1000 */ V(12, 2, 3),
+  /* 1001 */ V(12, 2, 3),
+  /* 1010 */ V(5, 11, 3),
+  /* 1011 */ V(5, 11, 3),
+  /* 1100 */ V(11, 5, 4),
+  /* 1101 */ V(8, 9, 4),
+  /* 1110 */ V(1, 12, 3),
+  /* 1111 */ V(1, 12, 3),
+
+  /* 0000 0100 ... */
+  /* 0000 */ V(12, 1, 3),	/* 132 */
+  /* 0001 */ V(12, 1, 3),
+  /* 0010 */ V(9, 8, 4),
+  /* 0011 */ V(0, 12, 4),
+  /* 0100 */ V(12, 0, 3),
+  /* 0101 */ V(12, 0, 3),
+  /* 0110 */ V(11, 4, 4),
+  /* 0111 */ V(6, 10, 4),
+  /* 1000 */ V(10, 6, 4),
+  /* 1001 */ V(7, 9, 4),
+  /* 1010 */ V(3, 11, 3),
+  /* 1011 */ V(3, 11, 3),
+  /* 1100 */ V(11, 3, 3),
+  /* 1101 */ V(11, 3, 3),
+  /* 1110 */ V(8, 8, 4),
+  /* 1111 */ V(5, 10, 4),
+
+  /* 0000 0101 ... */
+  /* 0000 */ V(2, 11, 3),	/* 148 */
+  /* 0001 */ V(2, 11, 3),
+  /* 0010 */ V(10, 5, 4),
+  /* 0011 */ V(6, 9, 4),
+  /* 0100 */ V(10, 4, 3),
+  /* 0101 */ V(10, 4, 3),
+  /* 0110 */ V(7, 8, 4),
+  /* 0111 */ V(8, 7, 4),
+  /* 1000 */ V(9, 4, 3),
+  /* 1001 */ V(9, 4, 3),
+  /* 1010 */ V(7, 7, 4),
+  /* 1011 */ V(7, 6, 4),
+  /* 1100 */ V(11, 2, 2),
+  /* 1101 */ V(11, 2, 2),
+  /* 1110 */ V(11, 2, 2),
+  /* 1111 */ V(11, 2, 2),
+
+  /* 0000 0110 ... */
+  /* 000  */ V(1, 11, 2),	/* 164 */
+  /* 001  */ V(1, 11, 2),
+  /* 010  */ V(11, 1, 2),
+  /* 011  */ V(11, 1, 2),
+  /* 100  */ V(0, 11, 3),
+  /* 101  */ V(11, 0, 3),
+  /* 110  */ V(9, 6, 3),
+  /* 111  */ V(4, 10, 3),
+
+  /* 0000 0111 ... */
+  /* 000  */ V(3, 10, 3),	/* 172 */
+  /* 001  */ V(10, 3, 3),
+  /* 010  */ V(5, 9, 3),
+  /* 011  */ V(9, 5, 3),
+  /* 100  */ V(2, 10, 2),
+  /* 101  */ V(2, 10, 2),
+  /* 110  */ V(10, 2, 2),
+  /* 111  */ V(10, 2, 2),
+
+  /* 0000 1000 ... */
+  /* 000  */ V(1, 10, 2),	/* 180 */
+  /* 001  */ V(1, 10, 2),
+  /* 010  */ V(10, 1, 2),
+  /* 011  */ V(10, 1, 2),
+  /* 100  */ V(0, 10, 3),
+  /* 101  */ V(6, 8, 3),
+  /* 110  */ V(10, 0, 2),
+  /* 111  */ V(10, 0, 2),
+
+  /* 0000 1001 ... */
+  /* 000  */ V(8, 6, 3),	/* 188 */
+  /* 001  */ V(4, 9, 3),
+  /* 010  */ V(9, 3, 2),
+  /* 011  */ V(9, 3, 2),
+  /* 100  */ V(3, 9, 3),
+  /* 101  */ V(5, 8, 3),
+  /* 110  */ V(8, 5, 3),
+  /* 111  */ V(6, 7, 3),
+
+  /* 0000 1010 ... */
+  /* 000  */ V(2, 9, 2),	/* 196 */
+  /* 001  */ V(2, 9, 2),
+  /* 010  */ V(9, 2, 2),
+  /* 011  */ V(9, 2, 2),
+  /* 100  */ V(5, 7, 3),
+  /* 101  */ V(7, 5, 3),
+  /* 110  */ V(3, 8, 2),
+  /* 111  */ V(3, 8, 2),
+
+  /* 0000 1011 ... */
+  /* 000  */ V(8, 3, 2),	/* 204 */
+  /* 001  */ V(8, 3, 2),
+  /* 010  */ V(6, 6, 3),
+  /* 011  */ V(4, 7, 3),
+  /* 100  */ V(7, 4, 3),
+  /* 101  */ V(5, 6, 3),
+  /* 110  */ V(6, 5, 3),
+  /* 111  */ V(7, 3, 3),
+
+  /* 0000 1100 ... */
+  /* 0    */ V(1, 9, 1),	/* 212 */
+  /* 1    */ V(9, 1, 1),
+
+  /* 0000 1101 ... */
+  /* 00   */ V(0, 9, 2),	/* 214 */
+  /* 01   */ V(9, 0, 2),
+  /* 10   */ V(4, 8, 2),
+  /* 11   */ V(8, 4, 2),
+
+  /* 0000 1110 ... */
+  /* 000  */ V(7, 2, 2),	/* 218 */
+  /* 001  */ V(7, 2, 2),
+  /* 010  */ V(4, 6, 3),
+  /* 011  */ V(6, 4, 3),
+  /* 100  */ V(2, 8, 1),
+  /* 101  */ V(2, 8, 1),
+  /* 110  */ V(2, 8, 1),
+  /* 111  */ V(2, 8, 1),
+
+  /* 0000 1111 ... */
+  /* 0    */ V(8, 2, 1),	/* 226 */
+  /* 1    */ V(1, 8, 1),
+
+  /* 0001 0000 ... */
+  /* 00   */ V(3, 7, 2),	/* 228 */
+  /* 01   */ V(2, 7, 2),
+  /* 10   */ V(1, 7, 1),
+  /* 11   */ V(1, 7, 1),
+
+  /* 0001 0001 ... */
+  /* 00   */ V(7, 1, 1),	/* 232 */
+  /* 01   */ V(7, 1, 1),
+  /* 10   */ V(5, 5, 2),
+  /* 11   */ V(0, 7, 2),
+
+  /* 0001 0010 ... */
+  /* 00   */ V(7, 0, 2),	/* 236 */
+  /* 01   */ V(3, 6, 2),
+  /* 10   */ V(6, 3, 2),
+  /* 11   */ V(4, 5, 2),
+
+  /* 0001 0011 ... */
+  /* 00   */ V(5, 4, 2),	/* 240 */
+  /* 01   */ V(2, 6, 2),
+  /* 10   */ V(6, 2, 2),
+  /* 11   */ V(3, 5, 2),
+
+  /* 0001 0101 ... */
+  /* 0    */ V(0, 8, 1),	/* 244 */
+  /* 1    */ V(8, 0, 1),
+
+  /* 0001 0110 ... */
+  /* 0    */ V(1, 6, 1),	/* 246 */
+  /* 1    */ V(6, 1, 1),
+
+  /* 0001 0111 ... */
+  /* 0    */ V(0, 6, 1),	/* 248 */
+  /* 1    */ V(6, 0, 1),
+
+  /* 0001 1000 ... */
+  /* 00   */ V(5, 3, 2),	/* 250 */
+  /* 01   */ V(4, 4, 2),
+  /* 10   */ V(2, 5, 1),
+  /* 11   */ V(2, 5, 1),
+
+  /* 0001 1001 ... */
+  /* 0    */ V(5, 2, 1),	/* 254 */
+  /* 1    */ V(0, 5, 1),
+
+  /* 0001 1100 ... */
+  /* 0    */ V(3, 4, 1),	/* 256 */
+  /* 1    */ V(4, 3, 1),
+
+  /* 0001 1101 ... */
+  /* 0    */ V(5, 0, 1),	/* 258 */
+  /* 1    */ V(2, 4, 1),
+
+  /* 0001 1110 ... */
+  /* 0    */ V(4, 2, 1),	/* 260 */
+  /* 1    */ V(3, 3, 1),
+
+  /* 0000 0000 0000 ... */
+  /* 0000 */ PTR(388, 3),	/* 262 */
+  /* 0001 */ V(15, 15, 4),
+  /* 0010 */ V(14, 15, 4),
+  /* 0011 */ V(13, 15, 4),
+  /* 0100 */ V(14, 14, 4),
+  /* 0101 */ V(12, 15, 4),
+  /* 0110 */ V(13, 14, 4),
+  /* 0111 */ V(11, 15, 4),
+  /* 1000 */ V(15, 11, 4),
+  /* 1001 */ V(12, 14, 4),
+  /* 1010 */ V(13, 12, 4),
+  /* 1011 */ PTR(396, 1),
+  /* 1100 */ V(14, 12, 3),
+  /* 1101 */ V(14, 12, 3),
+  /* 1110 */ V(13, 13, 3),
+  /* 1111 */ V(13, 13, 3),
+
+  /* 0000 0000 0001 ... */
+  /* 0000 */ V(15, 10, 4),	/* 278 */
+  /* 0001 */ V(12, 13, 4),
+  /* 0010 */ V(11, 14, 3),
+  /* 0011 */ V(11, 14, 3),
+  /* 0100 */ V(14, 11, 3),
+  /* 0101 */ V(14, 11, 3),
+  /* 0110 */ V(9, 15, 3),
+  /* 0111 */ V(9, 15, 3),
+  /* 1000 */ V(15, 9, 3),
+  /* 1001 */ V(15, 9, 3),
+  /* 1010 */ V(14, 10, 3),
+  /* 1011 */ V(14, 10, 3),
+  /* 1100 */ V(11, 13, 3),
+  /* 1101 */ V(11, 13, 3),
+  /* 1110 */ V(13, 11, 3),
+  /* 1111 */ V(13, 11, 3),
+
+  /* 0000 0000 0010 ... */
+  /* 0000 */ V(8, 15, 3),	/* 294 */
+  /* 0001 */ V(8, 15, 3),
+  /* 0010 */ V(15, 8, 3),
+  /* 0011 */ V(15, 8, 3),
+  /* 0100 */ V(12, 12, 3),
+  /* 0101 */ V(12, 12, 3),
+  /* 0110 */ V(10, 14, 4),
+  /* 0111 */ V(9, 14, 4),
+  /* 1000 */ V(8, 14, 3),
+  /* 1001 */ V(8, 14, 3),
+  /* 1010 */ V(7, 15, 4),
+  /* 1011 */ V(7, 14, 4),
+  /* 1100 */ V(15, 7, 2),
+  /* 1101 */ V(15, 7, 2),
+  /* 1110 */ V(15, 7, 2),
+  /* 1111 */ V(15, 7, 2),
+
+  /* 0000 0000 0011 ... */
+  /* 000  */ V(13, 10, 2),	/* 310 */
+  /* 001  */ V(13, 10, 2),
+  /* 010  */ V(10, 13, 3),
+  /* 011  */ V(11, 12, 3),
+  /* 100  */ V(12, 11, 3),
+  /* 101  */ V(15, 6, 3),
+  /* 110  */ V(6, 15, 2),
+  /* 111  */ V(6, 15, 2),
+
+  /* 0000 0000 0100 ... */
+  /* 00   */ V(14, 8, 2),	/* 318 */
+  /* 01   */ V(5, 15, 2),
+  /* 10   */ V(9, 13, 2),
+  /* 11   */ V(13, 9, 2),
+
+  /* 0000 0000 0101 ... */
+  /* 00   */ V(15, 5, 2),	/* 322 */
+  /* 01   */ V(14, 7, 2),
+  /* 10   */ V(10, 12, 2),
+  /* 11   */ V(11, 11, 2),
+
+  /* 0000 0000 0110 ... */
+  /* 000  */ V(4, 15, 2),	/* 326 */
+  /* 001  */ V(4, 15, 2),
+  /* 010  */ V(15, 4, 2),
+  /* 011  */ V(15, 4, 2),
+  /* 100  */ V(12, 10, 3),
+  /* 101  */ V(14, 6, 3),
+  /* 110  */ V(15, 3, 2),
+  /* 111  */ V(15, 3, 2),
+
+  /* 0000 0000 0111 ... */
+  /* 00   */ V(3, 15, 1),	/* 334 */
+  /* 01   */ V(3, 15, 1),
+  /* 10   */ V(8, 13, 2),
+  /* 11   */ V(13, 8, 2),
+
+  /* 0000 0000 1000 ... */
+  /* 0    */ V(2, 15, 1),	/* 338 */
+  /* 1    */ V(15, 2, 1),
+
+  /* 0000 0000 1001 ... */
+  /* 00   */ V(6, 14, 2),	/* 340 */
+  /* 01   */ V(9, 12, 2),
+  /* 10   */ V(0, 15, 1),
+  /* 11   */ V(0, 15, 1),
+
+  /* 0000 0000 1010 ... */
+  /* 00   */ V(12, 9, 2),	/* 344 */
+  /* 01   */ V(5, 14, 2),
+  /* 10   */ V(10, 11, 1),
+  /* 11   */ V(10, 11, 1),
+
+  /* 0000 0000 1011 ... */
+  /* 00   */ V(7, 13, 2),	/* 348 */
+  /* 01   */ V(13, 7, 2),
+  /* 10   */ V(4, 14, 1),
+  /* 11   */ V(4, 14, 1),
+
+  /* 0000 0000 1100 ... */
+  /* 00   */ V(12, 8, 2),	/* 352 */
+  /* 01   */ V(13, 6, 2),
+  /* 10   */ V(3, 14, 1),
+  /* 11   */ V(3, 14, 1),
+
+  /* 0000 0000 1101 ... */
+  /* 00   */ V(11, 9, 1),	/* 356 */
+  /* 01   */ V(11, 9, 1),
+  /* 10   */ V(9, 11, 2),
+  /* 11   */ V(10, 10, 2),
+
+  /* 0000 0001 0001 ... */
+  /* 0    */ V(11, 10, 1),	/* 360 */
+  /* 1    */ V(14, 5, 1),
+
+  /* 0000 0001 0010 ... */
+  /* 0    */ V(14, 4, 1),	/* 362 */
+  /* 1    */ V(8, 12, 1),
+
+  /* 0000 0001 0011 ... */
+  /* 0    */ V(6, 13, 1),	/* 364 */
+  /* 1    */ V(14, 3, 1),
+
+  /* 0000 0001 0101 ... */
+  /* 0    */ V(2, 14, 1),	/* 366 */
+  /* 1    */ V(0, 14, 1),
+
+  /* 0000 0001 1000 ... */
+  /* 0    */ V(14, 0, 1),	/* 368 */
+  /* 1    */ V(5, 13, 1),
+
+  /* 0000 0001 1001 ... */
+  /* 0    */ V(13, 5, 1),	/* 370 */
+  /* 1    */ V(7, 12, 1),
+
+  /* 0000 0001 1010 ... */
+  /* 0    */ V(12, 7, 1),	/* 372 */
+  /* 1    */ V(4, 13, 1),
+
+  /* 0000 0001 1011 ... */
+  /* 0    */ V(8, 11, 1),	/* 374 */
+  /* 1    */ V(11, 8, 1),
+
+  /* 0000 0001 1100 ... */
+  /* 0    */ V(13, 4, 1),	/* 376 */
+  /* 1    */ V(9, 10, 1),
+
+  /* 0000 0001 1101 ... */
+  /* 0    */ V(10, 9, 1),	/* 378 */
+  /* 1    */ V(6, 12, 1),
+
+  /* 0000 0010 0000 ... */
+  /* 0    */ V(13, 3, 1),	/* 380 */
+  /* 1    */ V(7, 11, 1),
+
+  /* 0000 0010 0101 ... */
+  /* 0    */ V(5, 12, 1),	/* 382 */
+  /* 1    */ V(12, 5, 1),
+
+  /* 0000 0010 0110 ... */
+  /* 0    */ V(9, 9, 1),	/* 384 */
+  /* 1    */ V(7, 10, 1),
+
+  /* 0000 0010 1000 ... */
+  /* 0    */ V(10, 7, 1),	/* 386 */
+  /* 1    */ V(9, 7, 1),
+
+  /* 0000 0000 0000 0000 ... */
+  /* 000  */ V(15, 14, 3),	/* 388 */
+  /* 001  */ V(15, 12, 3),
+  /* 010  */ V(15, 13, 2),
+  /* 011  */ V(15, 13, 2),
+  /* 100  */ V(14, 13, 1),
+  /* 101  */ V(14, 13, 1),
+  /* 110  */ V(14, 13, 1),
+  /* 111  */ V(14, 13, 1),
+
+  /* 0000 0000 0000 1011 ... */
+  /* 0    */ V(10, 15, 1),	/* 396 */
+  /* 1    */ V(14, 9, 1)
+};
+
+static
+union huffpair const hufftab15[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 4),
+  /* 0011 */ PTR(64, 4),
+  /* 0100 */ PTR(80, 4),
+  /* 0101 */ PTR(96, 3),
+  /* 0110 */ PTR(104, 3),
+  /* 0111 */ PTR(112, 2),
+  /* 1000 */ PTR(116, 1),
+  /* 1001 */ PTR(118, 1),
+  /* 1010 */ V(1, 1, 3),
+  /* 1011 */ V(1, 1, 3),
+  /* 1100 */ V(0, 1, 4),
+  /* 1101 */ V(1, 0, 4),
+  /* 1110 */ V(0, 0, 3),
+  /* 1111 */ V(0, 0, 3),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(120, 4),	/* 16 */
+  /* 0001 */ PTR(136, 4),
+  /* 0010 */ PTR(152, 4),
+  /* 0011 */ PTR(168, 4),
+  /* 0100 */ PTR(184, 4),
+  /* 0101 */ PTR(200, 3),
+  /* 0110 */ PTR(208, 3),
+  /* 0111 */ PTR(216, 4),
+  /* 1000 */ PTR(232, 3),
+  /* 1001 */ PTR(240, 3),
+  /* 1010 */ PTR(248, 3),
+  /* 1011 */ PTR(256, 3),
+  /* 1100 */ PTR(264, 2),
+  /* 1101 */ PTR(268, 3),
+  /* 1110 */ PTR(276, 3),
+  /* 1111 */ PTR(284, 2),
+
+  /* 0001 ... */
+  /* 0000 */ PTR(288, 2),	/* 32 */
+  /* 0001 */ PTR(292, 2),
+  /* 0010 */ PTR(296, 2),
+  /* 0011 */ PTR(300, 2),
+  /* 0100 */ PTR(304, 2),
+  /* 0101 */ PTR(308, 2),
+  /* 0110 */ PTR(312, 2),
+  /* 0111 */ PTR(316, 2),
+  /* 1000 */ PTR(320, 1),
+  /* 1001 */ PTR(322, 1),
+  /* 1010 */ PTR(324, 1),
+  /* 1011 */ PTR(326, 2),
+  /* 1100 */ PTR(330, 1),
+  /* 1101 */ PTR(332, 1),
+  /* 1110 */ PTR(334, 2),
+  /* 1111 */ PTR(338, 1),
+
+  /* 0010 ... */
+  /* 0000 */ PTR(340, 1),	/* 48 */
+  /* 0001 */ PTR(342, 1),
+  /* 0010 */ V(9, 1, 4),
+  /* 0011 */ PTR(344, 1),
+  /* 0100 */ PTR(346, 1),
+  /* 0101 */ PTR(348, 1),
+  /* 0110 */ PTR(350, 1),
+  /* 0111 */ PTR(352, 1),
+  /* 1000 */ V(2, 8, 4),
+  /* 1001 */ V(8, 2, 4),
+  /* 1010 */ V(1, 8, 4),
+  /* 1011 */ V(8, 1, 4),
+  /* 1100 */ PTR(354, 1),
+  /* 1101 */ PTR(356, 1),
+  /* 1110 */ PTR(358, 1),
+  /* 1111 */ PTR(360, 1),
+
+  /* 0011 ... */
+  /* 0000 */ V(2, 7, 4),	/* 64 */
+  /* 0001 */ V(7, 2, 4),
+  /* 0010 */ V(6, 4, 4),
+  /* 0011 */ V(1, 7, 4),
+  /* 0100 */ V(5, 5, 4),
+  /* 0101 */ V(7, 1, 4),
+  /* 0110 */ PTR(362, 1),
+  /* 0111 */ V(3, 6, 4),
+  /* 1000 */ V(6, 3, 4),
+  /* 1001 */ V(4, 5, 4),
+  /* 1010 */ V(5, 4, 4),
+  /* 1011 */ V(2, 6, 4),
+  /* 1100 */ V(6, 2, 4),
+  /* 1101 */ V(1, 6, 4),
+  /* 1110 */ PTR(364, 1),
+  /* 1111 */ V(3, 5, 4),
+
+  /* 0100 ... */
+  /* 0000 */ V(6, 1, 3),	/* 80 */
+  /* 0001 */ V(6, 1, 3),
+  /* 0010 */ V(5, 3, 4),
+  /* 0011 */ V(4, 4, 4),
+  /* 0100 */ V(2, 5, 3),
+  /* 0101 */ V(2, 5, 3),
+  /* 0110 */ V(5, 2, 3),
+  /* 0111 */ V(5, 2, 3),
+  /* 1000 */ V(1, 5, 3),
+  /* 1001 */ V(1, 5, 3),
+  /* 1010 */ V(5, 1, 3),
+  /* 1011 */ V(5, 1, 3),
+  /* 1100 */ V(0, 5, 4),
+  /* 1101 */ V(5, 0, 4),
+  /* 1110 */ V(3, 4, 3),
+  /* 1111 */ V(3, 4, 3),
+
+  /* 0101 ... */
+  /* 000  */ V(4, 3, 3),	/* 96 */
+  /* 001  */ V(2, 4, 3),
+  /* 010  */ V(4, 2, 3),
+  /* 011  */ V(3, 3, 3),
+  /* 100  */ V(4, 1, 2),
+  /* 101  */ V(4, 1, 2),
+  /* 110  */ V(1, 4, 3),
+  /* 111  */ V(0, 4, 3),
+
+  /* 0110 ... */
+  /* 000  */ V(2, 3, 2),	/* 104 */
+  /* 001  */ V(2, 3, 2),
+  /* 010  */ V(3, 2, 2),
+  /* 011  */ V(3, 2, 2),
+  /* 100  */ V(4, 0, 3),
+  /* 101  */ V(0, 3, 3),
+  /* 110  */ V(1, 3, 2),
+  /* 111  */ V(1, 3, 2),
+
+  /* 0111 ... */
+  /* 00   */ V(3, 1, 2),	/* 112 */
+  /* 01   */ V(3, 0, 2),
+  /* 10   */ V(2, 2, 1),
+  /* 11   */ V(2, 2, 1),
+
+  /* 1000 ... */
+  /* 0    */ V(1, 2, 1),	/* 116 */
+  /* 1    */ V(2, 1, 1),
+
+  /* 1001 ... */
+  /* 0    */ V(0, 2, 1),	/* 118 */
+  /* 1    */ V(2, 0, 1),
+
+  /* 0000 0000 ... */
+  /* 0000 */ PTR(366, 1),	/* 120 */
+  /* 0001 */ PTR(368, 1),
+  /* 0010 */ V(14, 14, 4),
+  /* 0011 */ PTR(370, 1),
+  /* 0100 */ PTR(372, 1),
+  /* 0101 */ PTR(374, 1),
+  /* 0110 */ V(15, 11, 4),
+  /* 0111 */ PTR(376, 1),
+  /* 1000 */ V(13, 13, 4),
+  /* 1001 */ V(10, 15, 4),
+  /* 1010 */ V(15, 10, 4),
+  /* 1011 */ V(11, 14, 4),
+  /* 1100 */ V(14, 11, 4),
+  /* 1101 */ V(12, 13, 4),
+  /* 1110 */ V(13, 12, 4),
+  /* 1111 */ V(9, 15, 4),
+
+  /* 0000 0001 ... */
+  /* 0000 */ V(15, 9, 4),	/* 136 */
+  /* 0001 */ V(14, 10, 4),
+  /* 0010 */ V(11, 13, 4),
+  /* 0011 */ V(13, 11, 4),
+  /* 0100 */ V(8, 15, 4),
+  /* 0101 */ V(15, 8, 4),
+  /* 0110 */ V(12, 12, 4),
+  /* 0111 */ V(9, 14, 4),
+  /* 1000 */ V(14, 9, 4),
+  /* 1001 */ V(7, 15, 4),
+  /* 1010 */ V(15, 7, 4),
+  /* 1011 */ V(10, 13, 4),
+  /* 1100 */ V(13, 10, 4),
+  /* 1101 */ V(11, 12, 4),
+  /* 1110 */ V(6, 15, 4),
+  /* 1111 */ PTR(378, 1),
+
+  /* 0000 0010 ... */
+  /* 0000 */ V(12, 11, 3),	/* 152 */
+  /* 0001 */ V(12, 11, 3),
+  /* 0010 */ V(15, 6, 3),
+  /* 0011 */ V(15, 6, 3),
+  /* 0100 */ V(8, 14, 4),
+  /* 0101 */ V(14, 8, 4),
+  /* 0110 */ V(5, 15, 4),
+  /* 0111 */ V(9, 13, 4),
+  /* 1000 */ V(15, 5, 3),
+  /* 1001 */ V(15, 5, 3),
+  /* 1010 */ V(7, 14, 3),
+  /* 1011 */ V(7, 14, 3),
+  /* 1100 */ V(14, 7, 3),
+  /* 1101 */ V(14, 7, 3),
+  /* 1110 */ V(10, 12, 3),
+  /* 1111 */ V(10, 12, 3),
+
+  /* 0000 0011 ... */
+  /* 0000 */ V(12, 10, 3),	/* 168 */
+  /* 0001 */ V(12, 10, 3),
+  /* 0010 */ V(11, 11, 3),
+  /* 0011 */ V(11, 11, 3),
+  /* 0100 */ V(13, 9, 4),
+  /* 0101 */ V(8, 13, 4),
+  /* 0110 */ V(4, 15, 3),
+  /* 0111 */ V(4, 15, 3),
+  /* 1000 */ V(15, 4, 3),
+  /* 1001 */ V(15, 4, 3),
+  /* 1010 */ V(3, 15, 3),
+  /* 1011 */ V(3, 15, 3),
+  /* 1100 */ V(15, 3, 3),
+  /* 1101 */ V(15, 3, 3),
+  /* 1110 */ V(13, 8, 3),
+  /* 1111 */ V(13, 8, 3),
+
+  /* 0000 0100 ... */
+  /* 0000 */ V(14, 6, 3),	/* 184 */
+  /* 0001 */ V(14, 6, 3),
+  /* 0010 */ V(2, 15, 3),
+  /* 0011 */ V(2, 15, 3),
+  /* 0100 */ V(15, 2, 3),
+  /* 0101 */ V(15, 2, 3),
+  /* 0110 */ V(6, 14, 4),
+  /* 0111 */ V(15, 0, 4),
+  /* 1000 */ V(1, 15, 3),
+  /* 1001 */ V(1, 15, 3),
+  /* 1010 */ V(15, 1, 3),
+  /* 1011 */ V(15, 1, 3),
+  /* 1100 */ V(9, 12, 3),
+  /* 1101 */ V(9, 12, 3),
+  /* 1110 */ V(12, 9, 3),
+  /* 1111 */ V(12, 9, 3),
+
+  /* 0000 0101 ... */
+  /* 000  */ V(5, 14, 3),	/* 200 */
+  /* 001  */ V(10, 11, 3),
+  /* 010  */ V(11, 10, 3),
+  /* 011  */ V(14, 5, 3),
+  /* 100  */ V(7, 13, 3),
+  /* 101  */ V(13, 7, 3),
+  /* 110  */ V(4, 14, 3),
+  /* 111  */ V(14, 4, 3),
+
+  /* 0000 0110 ... */
+  /* 000  */ V(8, 12, 3),	/* 208 */
+  /* 001  */ V(12, 8, 3),
+  /* 010  */ V(3, 14, 3),
+  /* 011  */ V(6, 13, 3),
+  /* 100  */ V(13, 6, 3),
+  /* 101  */ V(14, 3, 3),
+  /* 110  */ V(9, 11, 3),
+  /* 111  */ V(11, 9, 3),
+
+  /* 0000 0111 ... */
+  /* 0000 */ V(2, 14, 3),	/* 216 */
+  /* 0001 */ V(2, 14, 3),
+  /* 0010 */ V(10, 10, 3),
+  /* 0011 */ V(10, 10, 3),
+  /* 0100 */ V(14, 2, 3),
+  /* 0101 */ V(14, 2, 3),
+  /* 0110 */ V(1, 14, 3),
+  /* 0111 */ V(1, 14, 3),
+  /* 1000 */ V(14, 1, 3),
+  /* 1001 */ V(14, 1, 3),
+  /* 1010 */ V(0, 14, 4),
+  /* 1011 */ V(14, 0, 4),
+  /* 1100 */ V(5, 13, 3),
+  /* 1101 */ V(5, 13, 3),
+  /* 1110 */ V(13, 5, 3),
+  /* 1111 */ V(13, 5, 3),
+
+  /* 0000 1000 ... */
+  /* 000  */ V(7, 12, 3),	/* 232 */
+  /* 001  */ V(12, 7, 3),
+  /* 010  */ V(4, 13, 3),
+  /* 011  */ V(8, 11, 3),
+  /* 100  */ V(13, 4, 2),
+  /* 101  */ V(13, 4, 2),
+  /* 110  */ V(11, 8, 3),
+  /* 111  */ V(9, 10, 3),
+
+  /* 0000 1001 ... */
+  /* 000  */ V(10, 9, 3),	/* 240 */
+  /* 001  */ V(6, 12, 3),
+  /* 010  */ V(12, 6, 3),
+  /* 011  */ V(3, 13, 3),
+  /* 100  */ V(13, 3, 2),
+  /* 101  */ V(13, 3, 2),
+  /* 110  */ V(13, 2, 2),
+  /* 111  */ V(13, 2, 2),
+
+  /* 0000 1010 ... */
+  /* 000  */ V(2, 13, 3),	/* 248 */
+  /* 001  */ V(0, 13, 3),
+  /* 010  */ V(1, 13, 2),
+  /* 011  */ V(1, 13, 2),
+  /* 100  */ V(7, 11, 2),
+  /* 101  */ V(7, 11, 2),
+  /* 110  */ V(11, 7, 2),
+  /* 111  */ V(11, 7, 2),
+
+  /* 0000 1011 ... */
+  /* 000  */ V(13, 1, 2),	/* 256 */
+  /* 001  */ V(13, 1, 2),
+  /* 010  */ V(5, 12, 3),
+  /* 011  */ V(13, 0, 3),
+  /* 100  */ V(12, 5, 2),
+  /* 101  */ V(12, 5, 2),
+  /* 110  */ V(8, 10, 2),
+  /* 111  */ V(8, 10, 2),
+
+  /* 0000 1100 ... */
+  /* 00   */ V(10, 8, 2),	/* 264 */
+  /* 01   */ V(4, 12, 2),
+  /* 10   */ V(12, 4, 2),
+  /* 11   */ V(6, 11, 2),
+
+  /* 0000 1101 ... */
+  /* 000  */ V(11, 6, 2),	/* 268 */
+  /* 001  */ V(11, 6, 2),
+  /* 010  */ V(9, 9, 3),
+  /* 011  */ V(0, 12, 3),
+  /* 100  */ V(3, 12, 2),
+  /* 101  */ V(3, 12, 2),
+  /* 110  */ V(12, 3, 2),
+  /* 111  */ V(12, 3, 2),
+
+  /* 0000 1110 ... */
+  /* 000  */ V(7, 10, 2),	/* 276 */
+  /* 001  */ V(7, 10, 2),
+  /* 010  */ V(10, 7, 2),
+  /* 011  */ V(10, 7, 2),
+  /* 100  */ V(10, 6, 2),
+  /* 101  */ V(10, 6, 2),
+  /* 110  */ V(12, 0, 3),
+  /* 111  */ V(0, 11, 3),
+
+  /* 0000 1111 ... */
+  /* 00   */ V(12, 2, 1),	/* 284 */
+  /* 01   */ V(12, 2, 1),
+  /* 10   */ V(2, 12, 2),
+  /* 11   */ V(5, 11, 2),
+
+  /* 0001 0000 ... */
+  /* 00   */ V(11, 5, 2),	/* 288 */
+  /* 01   */ V(1, 12, 2),
+  /* 10   */ V(8, 9, 2),
+  /* 11   */ V(9, 8, 2),
+
+  /* 0001 0001 ... */
+  /* 00   */ V(12, 1, 2),	/* 292 */
+  /* 01   */ V(4, 11, 2),
+  /* 10   */ V(11, 4, 2),
+  /* 11   */ V(6, 10, 2),
+
+  /* 0001 0010 ... */
+  /* 00   */ V(3, 11, 2),	/* 296 */
+  /* 01   */ V(7, 9, 2),
+  /* 10   */ V(11, 3, 1),
+  /* 11   */ V(11, 3, 1),
+
+  /* 0001 0011 ... */
+  /* 00   */ V(9, 7, 2),	/* 300 */
+  /* 01   */ V(8, 8, 2),
+  /* 10   */ V(2, 11, 2),
+  /* 11   */ V(5, 10, 2),
+
+  /* 0001 0100 ... */
+  /* 00   */ V(11, 2, 1),	/* 304 */
+  /* 01   */ V(11, 2, 1),
+  /* 10   */ V(10, 5, 2),
+  /* 11   */ V(1, 11, 2),
+
+  /* 0001 0101 ... */
+  /* 00   */ V(11, 1, 1),	/* 308 */
+  /* 01   */ V(11, 1, 1),
+  /* 10   */ V(11, 0, 2),
+  /* 11   */ V(6, 9, 2),
+
+  /* 0001 0110 ... */
+  /* 00   */ V(9, 6, 2),	/* 312 */
+  /* 01   */ V(4, 10, 2),
+  /* 10   */ V(10, 4, 2),
+  /* 11   */ V(7, 8, 2),
+
+  /* 0001 0111 ... */
+  /* 00   */ V(8, 7, 2),	/* 316 */
+  /* 01   */ V(3, 10, 2),
+  /* 10   */ V(10, 3, 1),
+  /* 11   */ V(10, 3, 1),
+
+  /* 0001 1000 ... */
+  /* 0    */ V(5, 9, 1),	/* 320 */
+  /* 1    */ V(9, 5, 1),
+
+  /* 0001 1001 ... */
+  /* 0    */ V(2, 10, 1),	/* 322 */
+  /* 1    */ V(10, 2, 1),
+
+  /* 0001 1010 ... */
+  /* 0    */ V(1, 10, 1),	/* 324 */
+  /* 1    */ V(10, 1, 1),
+
+  /* 0001 1011 ... */
+  /* 00   */ V(0, 10, 2),	/* 326 */
+  /* 01   */ V(10, 0, 2),
+  /* 10   */ V(6, 8, 1),
+  /* 11   */ V(6, 8, 1),
+
+  /* 0001 1100 ... */
+  /* 0    */ V(8, 6, 1),	/* 330 */
+  /* 1    */ V(4, 9, 1),
+
+  /* 0001 1101 ... */
+  /* 0    */ V(9, 4, 1),	/* 332 */
+  /* 1    */ V(3, 9, 1),
+
+  /* 0001 1110 ... */
+  /* 00   */ V(9, 3, 1),	/* 334 */
+  /* 01   */ V(9, 3, 1),
+  /* 10   */ V(7, 7, 2),
+  /* 11   */ V(0, 9, 2),
+
+  /* 0001 1111 ... */
+  /* 0    */ V(5, 8, 1),	/* 338 */
+  /* 1    */ V(8, 5, 1),
+
+  /* 0010 0000 ... */
+  /* 0    */ V(2, 9, 1),	/* 340 */
+  /* 1    */ V(6, 7, 1),
+
+  /* 0010 0001 ... */
+  /* 0    */ V(7, 6, 1),	/* 342 */
+  /* 1    */ V(9, 2, 1),
+
+  /* 0010 0011 ... */
+  /* 0    */ V(1, 9, 1),	/* 344 */
+  /* 1    */ V(9, 0, 1),
+
+  /* 0010 0100 ... */
+  /* 0    */ V(4, 8, 1),	/* 346 */
+  /* 1    */ V(8, 4, 1),
+
+  /* 0010 0101 ... */
+  /* 0    */ V(5, 7, 1),	/* 348 */
+  /* 1    */ V(7, 5, 1),
+
+  /* 0010 0110 ... */
+  /* 0    */ V(3, 8, 1),	/* 350 */
+  /* 1    */ V(8, 3, 1),
+
+  /* 0010 0111 ... */
+  /* 0    */ V(6, 6, 1),	/* 352 */
+  /* 1    */ V(4, 7, 1),
+
+  /* 0010 1100 ... */
+  /* 0    */ V(7, 4, 1),	/* 354 */
+  /* 1    */ V(0, 8, 1),
+
+  /* 0010 1101 ... */
+  /* 0    */ V(8, 0, 1),	/* 356 */
+  /* 1    */ V(5, 6, 1),
+
+  /* 0010 1110 ... */
+  /* 0    */ V(6, 5, 1),	/* 358 */
+  /* 1    */ V(3, 7, 1),
+
+  /* 0010 1111 ... */
+  /* 0    */ V(7, 3, 1),	/* 360 */
+  /* 1    */ V(4, 6, 1),
+
+  /* 0011 0110 ... */
+  /* 0    */ V(0, 7, 1),	/* 362 */
+  /* 1    */ V(7, 0, 1),
+
+  /* 0011 1110 ... */
+  /* 0    */ V(0, 6, 1),	/* 364 */
+  /* 1    */ V(6, 0, 1),
+
+  /* 0000 0000 0000 ... */
+  /* 0    */ V(15, 15, 1),	/* 366 */
+  /* 1    */ V(14, 15, 1),
+
+  /* 0000 0000 0001 ... */
+  /* 0    */ V(15, 14, 1),	/* 368 */
+  /* 1    */ V(13, 15, 1),
+
+  /* 0000 0000 0011 ... */
+  /* 0    */ V(15, 13, 1),	/* 370 */
+  /* 1    */ V(12, 15, 1),
+
+  /* 0000 0000 0100 ... */
+  /* 0    */ V(15, 12, 1),	/* 372 */
+  /* 1    */ V(13, 14, 1),
+
+  /* 0000 0000 0101 ... */
+  /* 0    */ V(14, 13, 1),	/* 374 */
+  /* 1    */ V(11, 15, 1),
+
+  /* 0000 0000 0111 ... */
+  /* 0    */ V(12, 14, 1),	/* 376 */
+  /* 1    */ V(14, 12, 1),
+
+  /* 0000 0001 1111 ... */
+  /* 0    */ V(10, 14, 1),	/* 378 */
+  /* 1    */ V(0, 15, 1)
+};
+
+static
+union huffpair const hufftab16[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 4),
+  /* 0011 */ PTR(64, 2),
+  /* 0100 */ V(1, 1, 4),
+  /* 0101 */ V(0, 1, 4),
+  /* 0110 */ V(1, 0, 3),
+  /* 0111 */ V(1, 0, 3),
+  /* 1000 */ V(0, 0, 1),
+  /* 1001 */ V(0, 0, 1),
+  /* 1010 */ V(0, 0, 1),
+  /* 1011 */ V(0, 0, 1),
+  /* 1100 */ V(0, 0, 1),
+  /* 1101 */ V(0, 0, 1),
+  /* 1110 */ V(0, 0, 1),
+  /* 1111 */ V(0, 0, 1),
+
+  /* 0000 ... */
+  /* 0000 */ PTR(68, 3),	/* 16 */
+  /* 0001 */ PTR(76, 3),
+  /* 0010 */ PTR(84, 2),
+  /* 0011 */ V(15, 15, 4),
+  /* 0100 */ PTR(88, 2),
+  /* 0101 */ PTR(92, 1),
+  /* 0110 */ PTR(94, 4),
+  /* 0111 */ V(15, 2, 4),
+  /* 1000 */ PTR(110, 1),
+  /* 1001 */ V(1, 15, 4),
+  /* 1010 */ V(15, 1, 4),
+  /* 1011 */ PTR(112, 4),
+  /* 1100 */ PTR(128, 4),
+  /* 1101 */ PTR(144, 4),
+  /* 1110 */ PTR(160, 4),
+  /* 1111 */ PTR(176, 4),
+
+  /* 0001 ... */
+  /* 0000 */ PTR(192, 4),	/* 32 */
+  /* 0001 */ PTR(208, 3),
+  /* 0010 */ PTR(216, 3),
+  /* 0011 */ PTR(224, 3),
+  /* 0100 */ PTR(232, 3),
+  /* 0101 */ PTR(240, 3),
+  /* 0110 */ PTR(248, 3),
+  /* 0111 */ PTR(256, 3),
+  /* 1000 */ PTR(264, 2),
+  /* 1001 */ PTR(268, 2),
+  /* 1010 */ PTR(272, 1),
+  /* 1011 */ PTR(274, 2),
+  /* 1100 */ PTR(278, 2),
+  /* 1101 */ PTR(282, 1),
+  /* 1110 */ V(5, 1, 4),
+  /* 1111 */ PTR(284, 1),
+
+  /* 0010 ... */
+  /* 0000 */ PTR(286, 1),	/* 48 */
+  /* 0001 */ PTR(288, 1),
+  /* 0010 */ PTR(290, 1),
+  /* 0011 */ V(1, 4, 4),
+  /* 0100 */ V(4, 1, 4),
+  /* 0101 */ PTR(292, 1),
+  /* 0110 */ V(2, 3, 4),
+  /* 0111 */ V(3, 2, 4),
+  /* 1000 */ V(1, 3, 3),
+  /* 1001 */ V(1, 3, 3),
+  /* 1010 */ V(3, 1, 3),
+  /* 1011 */ V(3, 1, 3),
+  /* 1100 */ V(0, 3, 4),
+  /* 1101 */ V(3, 0, 4),
+  /* 1110 */ V(2, 2, 3),
+  /* 1111 */ V(2, 2, 3),
+
+  /* 0011 ... */
+  /* 00   */ V(1, 2, 2),	/* 64 */
+  /* 01   */ V(2, 1, 2),
+  /* 10   */ V(0, 2, 2),
+  /* 11   */ V(2, 0, 2),
+
+  /* 0000 0000 ... */
+  /* 000  */ V(14, 15, 3),	/* 68 */
+  /* 001  */ V(15, 14, 3),
+  /* 010  */ V(13, 15, 3),
+  /* 011  */ V(15, 13, 3),
+  /* 100  */ V(12, 15, 3),
+  /* 101  */ V(15, 12, 3),
+  /* 110  */ V(11, 15, 3),
+  /* 111  */ V(15, 11, 3),
+
+  /* 0000 0001 ... */
+  /* 000  */ V(10, 15, 2),	/* 76 */
+  /* 001  */ V(10, 15, 2),
+  /* 010  */ V(15, 10, 3),
+  /* 011  */ V(9, 15, 3),
+  /* 100  */ V(15, 9, 3),
+  /* 101  */ V(15, 8, 3),
+  /* 110  */ V(8, 15, 2),
+  /* 111  */ V(8, 15, 2),
+
+  /* 0000 0010 ... */
+  /* 00   */ V(7, 15, 2),	/* 84 */
+  /* 01   */ V(15, 7, 2),
+  /* 10   */ V(6, 15, 2),
+  /* 11   */ V(15, 6, 2),
+
+  /* 0000 0100 ... */
+  /* 00   */ V(5, 15, 2),	/* 88 */
+  /* 01   */ V(15, 5, 2),
+  /* 10   */ V(4, 15, 1),
+  /* 11   */ V(4, 15, 1),
+
+  /* 0000 0101 ... */
+  /* 0    */ V(15, 4, 1),	/* 92 */
+  /* 1    */ V(15, 3, 1),
+
+  /* 0000 0110 ... */
+  /* 0000 */ V(15, 0, 1),	/* 94 */
+  /* 0001 */ V(15, 0, 1),
+  /* 0010 */ V(15, 0, 1),
+  /* 0011 */ V(15, 0, 1),
+  /* 0100 */ V(15, 0, 1),
+  /* 0101 */ V(15, 0, 1),
+  /* 0110 */ V(15, 0, 1),
+  /* 0111 */ V(15, 0, 1),
+  /* 1000 */ V(3, 15, 2),
+  /* 1001 */ V(3, 15, 2),
+  /* 1010 */ V(3, 15, 2),
+  /* 1011 */ V(3, 15, 2),
+  /* 1100 */ PTR(294, 4),
+  /* 1101 */ PTR(310, 3),
+  /* 1110 */ PTR(318, 3),
+  /* 1111 */ PTR(326, 3),
+
+  /* 0000 1000 ... */
+  /* 0    */ V(2, 15, 1),	/* 110 */
+  /* 1    */ V(0, 15, 1),
+
+  /* 0000 1011 ... */
+  /* 0000 */ PTR(334, 2),	/* 112 */
+  /* 0001 */ PTR(338, 2),
+  /* 0010 */ PTR(342, 2),
+  /* 0011 */ PTR(346, 1),
+  /* 0100 */ PTR(348, 2),
+  /* 0101 */ PTR(352, 2),
+  /* 0110 */ PTR(356, 1),
+  /* 0111 */ PTR(358, 2),
+  /* 1000 */ PTR(362, 2),
+  /* 1001 */ PTR(366, 2),
+  /* 1010 */ PTR(370, 2),
+  /* 1011 */ V(14, 3, 4),
+  /* 1100 */ PTR(374, 1),
+  /* 1101 */ PTR(376, 1),
+  /* 1110 */ PTR(378, 1),
+  /* 1111 */ PTR(380, 1),
+
+  /* 0000 1100 ... */
+  /* 0000 */ PTR(382, 1),	/* 128 */
+  /* 0001 */ PTR(384, 1),
+  /* 0010 */ PTR(386, 1),
+  /* 0011 */ V(0, 13, 4),
+  /* 0100 */ PTR(388, 1),
+  /* 0101 */ PTR(390, 1),
+  /* 0110 */ PTR(392, 1),
+  /* 0111 */ V(3, 12, 4),
+  /* 1000 */ PTR(394, 1),
+  /* 1001 */ V(1, 12, 4),
+  /* 1010 */ V(12, 0, 4),
+  /* 1011 */ PTR(396, 1),
+  /* 1100 */ V(14, 2, 3),
+  /* 1101 */ V(14, 2, 3),
+  /* 1110 */ V(2, 14, 4),
+  /* 1111 */ V(1, 14, 4),
+
+  /* 0000 1101 ... */
+  /* 0000 */ V(13, 3, 4),	/* 144 */
+  /* 0001 */ V(2, 13, 4),
+  /* 0010 */ V(13, 2, 4),
+  /* 0011 */ V(13, 1, 4),
+  /* 0100 */ V(3, 11, 4),
+  /* 0101 */ PTR(398, 1),
+  /* 0110 */ V(1, 13, 3),
+  /* 0111 */ V(1, 13, 3),
+  /* 1000 */ V(12, 4, 4),
+  /* 1001 */ V(6, 11, 4),
+  /* 1010 */ V(12, 3, 4),
+  /* 1011 */ V(10, 7, 4),
+  /* 1100 */ V(2, 12, 3),
+  /* 1101 */ V(2, 12, 3),
+  /* 1110 */ V(12, 2, 4),
+  /* 1111 */ V(11, 5, 4),
+
+  /* 0000 1110 ... */
+  /* 0000 */ V(12, 1, 4),	/* 160 */
+  /* 0001 */ V(0, 12, 4),
+  /* 0010 */ V(4, 11, 4),
+  /* 0011 */ V(11, 4, 4),
+  /* 0100 */ V(6, 10, 4),
+  /* 0101 */ V(10, 6, 4),
+  /* 0110 */ V(11, 3, 3),
+  /* 0111 */ V(11, 3, 3),
+  /* 1000 */ V(5, 10, 4),
+  /* 1001 */ V(10, 5, 4),
+  /* 1010 */ V(2, 11, 3),
+  /* 1011 */ V(2, 11, 3),
+  /* 1100 */ V(11, 2, 3),
+  /* 1101 */ V(11, 2, 3),
+  /* 1110 */ V(1, 11, 3),
+  /* 1111 */ V(1, 11, 3),
+
+  /* 0000 1111 ... */
+  /* 0000 */ V(11, 1, 3),	/* 176 */
+  /* 0001 */ V(11, 1, 3),
+  /* 0010 */ V(0, 11, 4),
+  /* 0011 */ V(11, 0, 4),
+  /* 0100 */ V(6, 9, 4),
+  /* 0101 */ V(9, 6, 4),
+  /* 0110 */ V(4, 10, 4),
+  /* 0111 */ V(10, 4, 4),
+  /* 1000 */ V(7, 8, 4),
+  /* 1001 */ V(8, 7, 4),
+  /* 1010 */ V(10, 3, 3),
+  /* 1011 */ V(10, 3, 3),
+  /* 1100 */ V(3, 10, 4),
+  /* 1101 */ V(5, 9, 4),
+  /* 1110 */ V(2, 10, 3),
+  /* 1111 */ V(2, 10, 3),
+
+  /* 0001 0000 ... */
+  /* 0000 */ V(9, 5, 4),	/* 192 */
+  /* 0001 */ V(6, 8, 4),
+  /* 0010 */ V(10, 1, 3),
+  /* 0011 */ V(10, 1, 3),
+  /* 0100 */ V(8, 6, 4),
+  /* 0101 */ V(7, 7, 4),
+  /* 0110 */ V(9, 4, 3),
+  /* 0111 */ V(9, 4, 3),
+  /* 1000 */ V(4, 9, 4),
+  /* 1001 */ V(5, 7, 4),
+  /* 1010 */ V(6, 7, 3),
+  /* 1011 */ V(6, 7, 3),
+  /* 1100 */ V(10, 2, 2),
+  /* 1101 */ V(10, 2, 2),
+  /* 1110 */ V(10, 2, 2),
+  /* 1111 */ V(10, 2, 2),
+
+  /* 0001 0001 ... */
+  /* 000  */ V(1, 10, 2),	/* 208 */
+  /* 001  */ V(1, 10, 2),
+  /* 010  */ V(0, 10, 3),
+  /* 011  */ V(10, 0, 3),
+  /* 100  */ V(3, 9, 3),
+  /* 101  */ V(9, 3, 3),
+  /* 110  */ V(5, 8, 3),
+  /* 111  */ V(8, 5, 3),
+
+  /* 0001 0010 ... */
+  /* 000  */ V(2, 9, 2),	/* 216 */
+  /* 001  */ V(2, 9, 2),
+  /* 010  */ V(9, 2, 2),
+  /* 011  */ V(9, 2, 2),
+  /* 100  */ V(7, 6, 3),
+  /* 101  */ V(0, 9, 3),
+  /* 110  */ V(1, 9, 2),
+  /* 111  */ V(1, 9, 2),
+
+  /* 0001 0011 ... */
+  /* 000  */ V(9, 1, 2),	/* 224 */
+  /* 001  */ V(9, 1, 2),
+  /* 010  */ V(9, 0, 3),
+  /* 011  */ V(4, 8, 3),
+  /* 100  */ V(8, 4, 3),
+  /* 101  */ V(7, 5, 3),
+  /* 110  */ V(3, 8, 3),
+  /* 111  */ V(8, 3, 3),
+
+  /* 0001 0100 ... */
+  /* 000  */ V(6, 6, 3),	/* 232 */
+  /* 001  */ V(2, 8, 3),
+  /* 010  */ V(8, 2, 2),
+  /* 011  */ V(8, 2, 2),
+  /* 100  */ V(4, 7, 3),
+  /* 101  */ V(7, 4, 3),
+  /* 110  */ V(1, 8, 2),
+  /* 111  */ V(1, 8, 2),
+
+  /* 0001 0101 ... */
+  /* 000  */ V(8, 1, 2),	/* 240 */
+  /* 001  */ V(8, 1, 2),
+  /* 010  */ V(8, 0, 2),
+  /* 011  */ V(8, 0, 2),
+  /* 100  */ V(0, 8, 3),
+  /* 101  */ V(5, 6, 3),
+  /* 110  */ V(3, 7, 2),
+  /* 111  */ V(3, 7, 2),
+
+  /* 0001 0110 ... */
+  /* 000  */ V(7, 3, 2),	/* 248 */
+  /* 001  */ V(7, 3, 2),
+  /* 010  */ V(6, 5, 3),
+  /* 011  */ V(4, 6, 3),
+  /* 100  */ V(2, 7, 2),
+  /* 101  */ V(2, 7, 2),
+  /* 110  */ V(7, 2, 2),
+  /* 111  */ V(7, 2, 2),
+
+  /* 0001 0111 ... */
+  /* 000  */ V(6, 4, 3),	/* 256 */
+  /* 001  */ V(5, 5, 3),
+  /* 010  */ V(0, 7, 2),
+  /* 011  */ V(0, 7, 2),
+  /* 100  */ V(1, 7, 1),
+  /* 101  */ V(1, 7, 1),
+  /* 110  */ V(1, 7, 1),
+  /* 111  */ V(1, 7, 1),
+
+  /* 0001 1000 ... */
+  /* 00   */ V(7, 1, 1),	/* 264  */
+  /* 01   */ V(7, 1, 1),
+  /* 10   */ V(7, 0, 2),
+  /* 11   */ V(3, 6, 2),
+
+  /* 0001 1001 ... */
+  /* 00   */ V(6, 3, 2),	/* 268 */
+  /* 01   */ V(4, 5, 2),
+  /* 10   */ V(5, 4, 2),
+  /* 11   */ V(2, 6, 2),
+
+  /* 0001 1010 ... */
+  /* 0    */ V(6, 2, 1),	/* 272 */
+  /* 1    */ V(1, 6, 1),
+
+  /* 0001 1011 ... */
+  /* 00   */ V(6, 1, 1),	/* 274 */
+  /* 01   */ V(6, 1, 1),
+  /* 10   */ V(0, 6, 2),
+  /* 11   */ V(6, 0, 2),
+
+  /* 0001 1100 ... */
+  /* 00   */ V(5, 3, 1),	/* 278 */
+  /* 01   */ V(5, 3, 1),
+  /* 10   */ V(3, 5, 2),
+  /* 11   */ V(4, 4, 2),
+
+  /* 0001 1101 ... */
+  /* 0    */ V(2, 5, 1),	/* 282 */
+  /* 1    */ V(5, 2, 1),
+
+  /* 0001 1111 ... */
+  /* 0    */ V(1, 5, 1),	/* 284 */
+  /* 1    */ V(0, 5, 1),
+
+  /* 0010 0000 ... */
+  /* 0    */ V(3, 4, 1),	/* 286 */
+  /* 1    */ V(4, 3, 1),
+
+  /* 0010 0001 ... */
+  /* 0    */ V(5, 0, 1),	/* 288 */
+  /* 1    */ V(2, 4, 1),
+
+  /* 0010 0010 ... */
+  /* 0    */ V(4, 2, 1),	/* 290 */
+  /* 1    */ V(3, 3, 1),
+
+  /* 0010 0101 ... */
+  /* 0    */ V(0, 4, 1),	/* 292 */
+  /* 1    */ V(4, 0, 1),
+
+  /* 0000 0110 1100 ... */
+  /* 0000 */ V(12, 14, 4),	/* 294 */
+  /* 0001 */ PTR(400, 1),
+  /* 0010 */ V(13, 14, 3),
+  /* 0011 */ V(13, 14, 3),
+  /* 0100 */ V(14, 9, 3),
+  /* 0101 */ V(14, 9, 3),
+  /* 0110 */ V(14, 10, 4),
+  /* 0111 */ V(13, 9, 4),
+  /* 1000 */ V(14, 14, 2),
+  /* 1001 */ V(14, 14, 2),
+  /* 1010 */ V(14, 14, 2),
+  /* 1011 */ V(14, 14, 2),
+  /* 1100 */ V(14, 13, 3),
+  /* 1101 */ V(14, 13, 3),
+  /* 1110 */ V(14, 11, 3),
+  /* 1111 */ V(14, 11, 3),
+
+  /* 0000 0110 1101 ... */
+  /* 000  */ V(11, 14, 2),	/* 310 */
+  /* 001  */ V(11, 14, 2),
+  /* 010  */ V(12, 13, 2),
+  /* 011  */ V(12, 13, 2),
+  /* 100  */ V(13, 12, 3),
+  /* 101  */ V(13, 11, 3),
+  /* 110  */ V(10, 14, 2),
+  /* 111  */ V(10, 14, 2),
+
+  /* 0000 0110 1110 ... */
+  /* 000  */ V(12, 12, 2),	/* 318 */
+  /* 001  */ V(12, 12, 2),
+  /* 010  */ V(10, 13, 3),
+  /* 011  */ V(13, 10, 3),
+  /* 100  */ V(7, 14, 3),
+  /* 101  */ V(10, 12, 3),
+  /* 110  */ V(12, 10, 2),
+  /* 111  */ V(12, 10, 2),
+
+  /* 0000 0110 1111 ... */
+  /* 000  */ V(12, 9, 3),	/* 326 */
+  /* 001  */ V(7, 13, 3),
+  /* 010  */ V(5, 14, 2),
+  /* 011  */ V(5, 14, 2),
+  /* 100  */ V(11, 13, 1),
+  /* 101  */ V(11, 13, 1),
+  /* 110  */ V(11, 13, 1),
+  /* 111  */ V(11, 13, 1),
+
+  /* 0000 1011 0000 ... */
+  /* 00   */ V(9, 14, 1),	/* 334 */
+  /* 01   */ V(9, 14, 1),
+  /* 10   */ V(11, 12, 2),
+  /* 11   */ V(12, 11, 2),
+
+  /* 0000 1011 0001 ... */
+  /* 00   */ V(8, 14, 2),	/* 338 */
+  /* 01   */ V(14, 8, 2),
+  /* 10   */ V(9, 13, 2),
+  /* 11   */ V(14, 7, 2),
+
+  /* 0000 1011 0010 ... */
+  /* 00   */ V(11, 11, 2),	/* 342 */
+  /* 01   */ V(8, 13, 2),
+  /* 10   */ V(13, 8, 2),
+  /* 11   */ V(6, 14, 2),
+
+  /* 0000 1011 0011 ... */
+  /* 0    */ V(14, 6, 1),	/* 346 */
+  /* 1    */ V(9, 12, 1),
+
+  /* 0000 1011 0100 ... */
+  /* 00   */ V(10, 11, 2),	/* 348 */
+  /* 01   */ V(11, 10, 2),
+  /* 10   */ V(14, 5, 2),
+  /* 11   */ V(13, 7, 2),
+
+  /* 0000 1011 0101 ... */
+  /* 00   */ V(4, 14, 1),	/* 352 */
+  /* 01   */ V(4, 14, 1),
+  /* 10   */ V(14, 4, 2),
+  /* 11   */ V(8, 12, 2),
+
+  /* 0000 1011 0110 ... */
+  /* 0    */ V(12, 8, 1),	/* 356 */
+  /* 1    */ V(3, 14, 1),
+
+  /* 0000 1011 0111 ... */
+  /* 00   */ V(6, 13, 1),	/* 358 */
+  /* 01   */ V(6, 13, 1),
+  /* 10   */ V(13, 6, 2),
+  /* 11   */ V(9, 11, 2),
+
+  /* 0000 1011 1000 ... */
+  /* 00   */ V(11, 9, 2),	/* 362 */
+  /* 01   */ V(10, 10, 2),
+  /* 10   */ V(14, 1, 1),
+  /* 11   */ V(14, 1, 1),
+
+  /* 0000 1011 1001 ... */
+  /* 00   */ V(13, 4, 1),	/* 366 */
+  /* 01   */ V(13, 4, 1),
+  /* 10   */ V(11, 8, 2),
+  /* 11   */ V(10, 9, 2),
+
+  /* 0000 1011 1010 ... */
+  /* 00   */ V(7, 11, 1),	/* 370 */
+  /* 01   */ V(7, 11, 1),
+  /* 10   */ V(11, 7, 2),
+  /* 11   */ V(13, 0, 2),
+
+  /* 0000 1011 1100 ... */
+  /* 0    */ V(0, 14, 1),	/* 374 */
+  /* 1    */ V(14, 0, 1),
+
+  /* 0000 1011 1101 ... */
+  /* 0    */ V(5, 13, 1),	/* 376 */
+  /* 1    */ V(13, 5, 1),
+
+  /* 0000 1011 1110 ... */
+  /* 0    */ V(7, 12, 1),	/* 378 */
+  /* 1    */ V(12, 7, 1),
+
+  /* 0000 1011 1111 ... */
+  /* 0    */ V(4, 13, 1),	/* 380 */
+  /* 1    */ V(8, 11, 1),
+
+  /* 0000 1100 0000 ... */
+  /* 0    */ V(9, 10, 1),	/* 382 */
+  /* 1    */ V(6, 12, 1),
+
+  /* 0000 1100 0001 ... */
+  /* 0    */ V(12, 6, 1),	/* 384 */
+  /* 1    */ V(3, 13, 1),
+
+  /* 0000 1100 0010 ... */
+  /* 0    */ V(5, 12, 1),	/* 386 */
+  /* 1    */ V(12, 5, 1),
+
+  /* 0000 1100 0100 ... */
+  /* 0    */ V(8, 10, 1),	/* 388 */
+  /* 1    */ V(10, 8, 1),
+
+  /* 0000 1100 0101 ... */
+  /* 0    */ V(9, 9, 1),	/* 390 */
+  /* 1    */ V(4, 12, 1),
+
+  /* 0000 1100 0110 ... */
+  /* 0    */ V(11, 6, 1),	/* 392 */
+  /* 1    */ V(7, 10, 1),
+
+  /* 0000 1100 1000 ... */
+  /* 0    */ V(5, 11, 1),	/* 394 */
+  /* 1    */ V(8, 9, 1),
+
+  /* 0000 1100 1011 ... */
+  /* 0    */ V(9, 8, 1),	/* 396 */
+  /* 1    */ V(7, 9, 1),
+
+  /* 0000 1101 0101 ... */
+  /* 0    */ V(9, 7, 1),	/* 398 */
+  /* 1    */ V(8, 8, 1),
+
+  /* 0000 0110 1100 0001 ... */
+  /* 0    */ V(14, 12, 1),	/* 400 */
+  /* 1    */ V(13, 13, 1)
+};
+
+static
+union huffpair const hufftab24[] = {
+  /* 0000 */ PTR(16, 4),
+  /* 0001 */ PTR(32, 4),
+  /* 0010 */ PTR(48, 4),
+  /* 0011 */ V(15, 15, 4),
+  /* 0100 */ PTR(64, 4),
+  /* 0101 */ PTR(80, 4),
+  /* 0110 */ PTR(96, 4),
+  /* 0111 */ PTR(112, 4),
+  /* 1000 */ PTR(128, 4),
+  /* 1001 */ PTR(144, 4),
+  /* 1010 */ PTR(160, 3),
+  /* 1011 */ PTR(168, 2),
+  /* 1100 */ V(1, 1, 4),
+  /* 1101 */ V(0, 1, 4),
+  /* 1110 */ V(1, 0, 4),
+  /* 1111 */ V(0, 0, 4),
+
+  /* 0000 ... */
+  /* 0000 */ V(14, 15, 4),	/* 16 */
+  /* 0001 */ V(15, 14, 4),
+  /* 0010 */ V(13, 15, 4),
+  /* 0011 */ V(15, 13, 4),
+  /* 0100 */ V(12, 15, 4),
+  /* 0101 */ V(15, 12, 4),
+  /* 0110 */ V(11, 15, 4),
+  /* 0111 */ V(15, 11, 4),
+  /* 1000 */ V(15, 10, 3),
+  /* 1001 */ V(15, 10, 3),
+  /* 1010 */ V(10, 15, 4),
+  /* 1011 */ V(9, 15, 4),
+  /* 1100 */ V(15, 9, 3),
+  /* 1101 */ V(15, 9, 3),
+  /* 1110 */ V(15, 8, 3),
+  /* 1111 */ V(15, 8, 3),
+
+  /* 0001 ... */
+  /* 0000 */ V(8, 15, 4),	/* 32 */
+  /* 0001 */ V(7, 15, 4),
+  /* 0010 */ V(15, 7, 3),
+  /* 0011 */ V(15, 7, 3),
+  /* 0100 */ V(6, 15, 3),
+  /* 0101 */ V(6, 15, 3),
+  /* 0110 */ V(15, 6, 3),
+  /* 0111 */ V(15, 6, 3),
+  /* 1000 */ V(5, 15, 3),
+  /* 1001 */ V(5, 15, 3),
+  /* 1010 */ V(15, 5, 3),
+  /* 1011 */ V(15, 5, 3),
+  /* 1100 */ V(4, 15, 3),
+  /* 1101 */ V(4, 15, 3),
+  /* 1110 */ V(15, 4, 3),
+  /* 1111 */ V(15, 4, 3),
+
+  /* 0010 ... */
+  /* 0000 */ V(3, 15, 3),	/* 48 */
+  /* 0001 */ V(3, 15, 3),
+  /* 0010 */ V(15, 3, 3),
+  /* 0011 */ V(15, 3, 3),
+  /* 0100 */ V(2, 15, 3),
+  /* 0101 */ V(2, 15, 3),
+  /* 0110 */ V(15, 2, 3),
+  /* 0111 */ V(15, 2, 3),
+  /* 1000 */ V(15, 1, 3),
+  /* 1001 */ V(15, 1, 3),
+  /* 1010 */ V(1, 15, 4),
+  /* 1011 */ V(15, 0, 4),
+  /* 1100 */ PTR(172, 3),
+  /* 1101 */ PTR(180, 3),
+  /* 1110 */ PTR(188, 3),
+  /* 1111 */ PTR(196, 3),
+
+  /* 0100 ... */
+  /* 0000 */ PTR(204, 4),	/* 64 */
+  /* 0001 */ PTR(220, 3),
+  /* 0010 */ PTR(228, 3),
+  /* 0011 */ PTR(236, 3),
+  /* 0100 */ PTR(244, 2),
+  /* 0101 */ PTR(248, 2),
+  /* 0110 */ PTR(252, 2),
+  /* 0111 */ PTR(256, 2),
+  /* 1000 */ PTR(260, 2),
+  /* 1001 */ PTR(264, 2),
+  /* 1010 */ PTR(268, 2),
+  /* 1011 */ PTR(272, 2),
+  /* 1100 */ PTR(276, 2),
+  /* 1101 */ PTR(280, 3),
+  /* 1110 */ PTR(288, 2),
+  /* 1111 */ PTR(292, 2),
+
+  /* 0101 ... */
+  /* 0000 */ PTR(296, 2),	/* 80 */
+  /* 0001 */ PTR(300, 3),
+  /* 0010 */ PTR(308, 2),
+  /* 0011 */ PTR(312, 3),
+  /* 0100 */ PTR(320, 1),
+  /* 0101 */ PTR(322, 2),
+  /* 0110 */ PTR(326, 2),
+  /* 0111 */ PTR(330, 1),
+  /* 1000 */ PTR(332, 2),
+  /* 1001 */ PTR(336, 1),
+  /* 1010 */ PTR(338, 1),
+  /* 1011 */ PTR(340, 1),
+  /* 1100 */ PTR(342, 1),
+  /* 1101 */ PTR(344, 1),
+  /* 1110 */ PTR(346, 1),
+  /* 1111 */ PTR(348, 1),
+
+  /* 0110 ... */
+  /* 0000 */ PTR(350, 1),	/* 96 */
+  /* 0001 */ PTR(352, 1),
+  /* 0010 */ PTR(354, 1),
+  /* 0011 */ PTR(356, 1),
+  /* 0100 */ PTR(358, 1),
+  /* 0101 */ PTR(360, 1),
+  /* 0110 */ PTR(362, 1),
+  /* 0111 */ PTR(364, 1),
+  /* 1000 */ PTR(366, 1),
+  /* 1001 */ PTR(368, 1),
+  /* 1010 */ PTR(370, 2),
+  /* 1011 */ PTR(374, 1),
+  /* 1100 */ PTR(376, 2),
+  /* 1101 */ V(7, 3, 4),
+  /* 1110 */ PTR(380, 1),
+  /* 1111 */ V(7, 2, 4),
+
+  /* 0111 ... */
+  /* 0000 */ V(4, 6, 4),	/* 112 */
+  /* 0001 */ V(6, 4, 4),
+  /* 0010 */ V(5, 5, 4),
+  /* 0011 */ V(7, 1, 4),
+  /* 0100 */ V(3, 6, 4),
+  /* 0101 */ V(6, 3, 4),
+  /* 0110 */ V(4, 5, 4),
+  /* 0111 */ V(5, 4, 4),
+  /* 1000 */ V(2, 6, 4),
+  /* 1001 */ V(6, 2, 4),
+  /* 1010 */ V(1, 6, 4),
+  /* 1011 */ V(6, 1, 4),
+  /* 1100 */ PTR(382, 1),
+  /* 1101 */ V(3, 5, 4),
+  /* 1110 */ V(5, 3, 4),
+  /* 1111 */ V(4, 4, 4),
+
+  /* 1000 ... */
+  /* 0000 */ V(2, 5, 4),	/* 128 */
+  /* 0001 */ V(5, 2, 4),
+  /* 0010 */ V(1, 5, 4),
+  /* 0011 */ PTR(384, 1),
+  /* 0100 */ V(5, 1, 3),
+  /* 0101 */ V(5, 1, 3),
+  /* 0110 */ V(3, 4, 4),
+  /* 0111 */ V(4, 3, 4),
+  /* 1000 */ V(2, 4, 3),
+  /* 1001 */ V(2, 4, 3),
+  /* 1010 */ V(4, 2, 3),
+  /* 1011 */ V(4, 2, 3),
+  /* 1100 */ V(3, 3, 3),
+  /* 1101 */ V(3, 3, 3),
+  /* 1110 */ V(1, 4, 3),
+  /* 1111 */ V(1, 4, 3),
+
+  /* 1001 ... */
+  /* 0000 */ V(4, 1, 3),	/* 144 */
+  /* 0001 */ V(4, 1, 3),
+  /* 0010 */ V(0, 4, 4),
+  /* 0011 */ V(4, 0, 4),
+  /* 0100 */ V(2, 3, 3),
+  /* 0101 */ V(2, 3, 3),
+  /* 0110 */ V(3, 2, 3),
+  /* 0111 */ V(3, 2, 3),
+  /* 1000 */ V(1, 3, 2),
+  /* 1001 */ V(1, 3, 2),
+  /* 1010 */ V(1, 3, 2),
+  /* 1011 */ V(1, 3, 2),
+  /* 1100 */ V(3, 1, 2),
+  /* 1101 */ V(3, 1, 2),
+  /* 1110 */ V(3, 1, 2),
+  /* 1111 */ V(3, 1, 2),
+
+  /* 1010 ... */
+  /* 000  */ V(0, 3, 3),	/* 160 */
+  /* 001  */ V(3, 0, 3),
+  /* 010  */ V(2, 2, 2),
+  /* 011  */ V(2, 2, 2),
+  /* 100  */ V(1, 2, 1),
+  /* 101  */ V(1, 2, 1),
+  /* 110  */ V(1, 2, 1),
+  /* 111  */ V(1, 2, 1),
+
+  /* 1011 ... */
+  /* 00   */ V(2, 1, 1),	/* 168 */
+  /* 01   */ V(2, 1, 1),
+  /* 10   */ V(0, 2, 2),
+  /* 11   */ V(2, 0, 2),
+
+  /* 0010 1100 ... */
+  /* 000  */ V(0, 15, 1),	/* 172 */
+  /* 001  */ V(0, 15, 1),
+  /* 010  */ V(0, 15, 1),
+  /* 011  */ V(0, 15, 1),
+  /* 100  */ V(14, 14, 3),
+  /* 101  */ V(13, 14, 3),
+  /* 110  */ V(14, 13, 3),
+  /* 111  */ V(12, 14, 3),
+
+  /* 0010 1101 ... */
+  /* 000  */ V(14, 12, 3),	/* 180 */
+  /* 001  */ V(13, 13, 3),
+  /* 010  */ V(11, 14, 3),
+  /* 011  */ V(14, 11, 3),
+  /* 100  */ V(12, 13, 3),
+  /* 101  */ V(13, 12, 3),
+  /* 110  */ V(10, 14, 3),
+  /* 111  */ V(14, 10, 3),
+
+  /* 0010 1110 ... */
+  /* 000  */ V(11, 13, 3),	/* 188 */
+  /* 001  */ V(13, 11, 3),
+  /* 010  */ V(12, 12, 3),
+  /* 011  */ V(9, 14, 3),
+  /* 100  */ V(14, 9, 3),
+  /* 101  */ V(10, 13, 3),
+  /* 110  */ V(13, 10, 3),
+  /* 111  */ V(11, 12, 3),
+
+  /* 0010 1111 ... */
+  /* 000  */ V(12, 11, 3),	/* 196 */
+  /* 001  */ V(8, 14, 3),
+  /* 010  */ V(14, 8, 3),
+  /* 011  */ V(9, 13, 3),
+  /* 100  */ V(13, 9, 3),
+  /* 101  */ V(7, 14, 3),
+  /* 110  */ V(14, 7, 3),
+  /* 111  */ V(10, 12, 3),
+
+  /* 0100 0000 ... */
+  /* 0000 */ V(12, 10, 3),	/* 204 */
+  /* 0001 */ V(12, 10, 3),
+  /* 0010 */ V(11, 11, 3),
+  /* 0011 */ V(11, 11, 3),
+  /* 0100 */ V(8, 13, 3),
+  /* 0101 */ V(8, 13, 3),
+  /* 0110 */ V(13, 8, 3),
+  /* 0111 */ V(13, 8, 3),
+  /* 1000 */ V(0, 14, 4),
+  /* 1001 */ V(14, 0, 4),
+  /* 1010 */ V(0, 13, 3),
+  /* 1011 */ V(0, 13, 3),
+  /* 1100 */ V(14, 6, 2),
+  /* 1101 */ V(14, 6, 2),
+  /* 1110 */ V(14, 6, 2),
+  /* 1111 */ V(14, 6, 2),
+
+  /* 0100 0001 ... */
+  /* 000  */ V(6, 14, 3),	/* 220 */
+  /* 001  */ V(9, 12, 3),
+  /* 010  */ V(12, 9, 2),
+  /* 011  */ V(12, 9, 2),
+  /* 100  */ V(5, 14, 2),
+  /* 101  */ V(5, 14, 2),
+  /* 110  */ V(11, 10, 2),
+  /* 111  */ V(11, 10, 2),
+
+  /* 0100 0010 ... */
+  /* 000  */ V(14, 5, 2),	/* 228 */
+  /* 001  */ V(14, 5, 2),
+  /* 010  */ V(10, 11, 3),
+  /* 011  */ V(7, 13, 3),
+  /* 100  */ V(13, 7, 2),
+  /* 101  */ V(13, 7, 2),
+  /* 110  */ V(14, 4, 2),
+  /* 111  */ V(14, 4, 2),
+
+  /* 0100 0011 ... */
+  /* 000  */ V(8, 12, 2),	/* 236 */
+  /* 001  */ V(8, 12, 2),
+  /* 010  */ V(12, 8, 2),
+  /* 011  */ V(12, 8, 2),
+  /* 100  */ V(4, 14, 3),
+  /* 101  */ V(2, 14, 3),
+  /* 110  */ V(3, 14, 2),
+  /* 111  */ V(3, 14, 2),
+
+  /* 0100 0100 ... */
+  /* 00   */ V(6, 13, 2),	/* 244 */
+  /* 01   */ V(13, 6, 2),
+  /* 10   */ V(14, 3, 2),
+  /* 11   */ V(9, 11, 2),
+
+  /* 0100 0101 ... */
+  /* 00   */ V(11, 9, 2),	/* 248 */
+  /* 01   */ V(10, 10, 2),
+  /* 10   */ V(14, 2, 2),
+  /* 11   */ V(1, 14, 2),
+
+  /* 0100 0110 ... */
+  /* 00   */ V(14, 1, 2),	/* 252 */
+  /* 01   */ V(5, 13, 2),
+  /* 10   */ V(13, 5, 2),
+  /* 11   */ V(7, 12, 2),
+
+  /* 0100 0111 ... */
+  /* 00   */ V(12, 7, 2),	/* 256 */
+  /* 01   */ V(4, 13, 2),
+  /* 10   */ V(8, 11, 2),
+  /* 11   */ V(11, 8, 2),
+
+  /* 0100 1000 ... */
+  /* 00   */ V(13, 4, 2),	/* 260 */
+  /* 01   */ V(9, 10, 2),
+  /* 10   */ V(10, 9, 2),
+  /* 11   */ V(6, 12, 2),
+
+  /* 0100 1001 ... */
+  /* 00   */ V(12, 6, 2),	/* 264 */
+  /* 01   */ V(3, 13, 2),
+  /* 10   */ V(13, 3, 2),
+  /* 11   */ V(2, 13, 2),
+
+  /* 0100 1010 ... */
+  /* 00   */ V(13, 2, 2),	/* 268 */
+  /* 01   */ V(1, 13, 2),
+  /* 10   */ V(7, 11, 2),
+  /* 11   */ V(11, 7, 2),
+
+  /* 0100 1011 ... */
+  /* 00   */ V(13, 1, 2),	/* 272 */
+  /* 01   */ V(5, 12, 2),
+  /* 10   */ V(12, 5, 2),
+  /* 11   */ V(8, 10, 2),
+
+  /* 0100 1100 ... */
+  /* 00   */ V(10, 8, 2),	/* 276 */
+  /* 01   */ V(9, 9, 2),
+  /* 10   */ V(4, 12, 2),
+  /* 11   */ V(12, 4, 2),
+
+  /* 0100 1101 ... */
+  /* 000  */ V(6, 11, 2),	/* 280 */
+  /* 001  */ V(6, 11, 2),
+  /* 010  */ V(11, 6, 2),
+  /* 011  */ V(11, 6, 2),
+  /* 100  */ V(13, 0, 3),
+  /* 101  */ V(0, 12, 3),
+  /* 110  */ V(3, 12, 2),
+  /* 111  */ V(3, 12, 2),
+
+  /* 0100 1110 ... */
+  /* 00   */ V(12, 3, 2),	/* 288 */
+  /* 01   */ V(7, 10, 2),
+  /* 10   */ V(10, 7, 2),
+  /* 11   */ V(2, 12, 2),
+
+  /* 0100 1111 ... */
+  /* 00   */ V(12, 2, 2),	/* 292 */
+  /* 01   */ V(5, 11, 2),
+  /* 10   */ V(11, 5, 2),
+  /* 11   */ V(1, 12, 2),
+
+  /* 0101 0000 ... */
+  /* 00   */ V(8, 9, 2),	/* 296 */
+  /* 01   */ V(9, 8, 2),
+  /* 10   */ V(12, 1, 2),
+  /* 11   */ V(4, 11, 2),
+
+  /* 0101 0001 ... */
+  /* 000  */ V(12, 0, 3),	/* 300 */
+  /* 001  */ V(0, 11, 3),
+  /* 010  */ V(3, 11, 2),
+  /* 011  */ V(3, 11, 2),
+  /* 100  */ V(11, 0, 3),
+  /* 101  */ V(0, 10, 3),
+  /* 110  */ V(1, 10, 2),
+  /* 111  */ V(1, 10, 2),
+
+  /* 0101 0010 ... */
+  /* 00   */ V(11, 4, 1),	/* 308 */
+  /* 01   */ V(11, 4, 1),
+  /* 10   */ V(6, 10, 2),
+  /* 11   */ V(10, 6, 2),
+
+  /* 0101 0011 ... */
+  /* 000  */ V(7, 9, 2),	/* 312 */
+  /* 001  */ V(7, 9, 2),
+  /* 010  */ V(9, 7, 2),
+  /* 011  */ V(9, 7, 2),
+  /* 100  */ V(10, 0, 3),
+  /* 101  */ V(0, 9, 3),
+  /* 110  */ V(9, 0, 2),
+  /* 111  */ V(9, 0, 2),
+
+  /* 0101 0100 ... */
+  /* 0    */ V(11, 3, 1),	/* 320 */
+  /* 1    */ V(8, 8, 1),
+
+  /* 0101 0101 ... */
+  /* 00   */ V(2, 11, 2),	/* 322 */
+  /* 01   */ V(5, 10, 2),
+  /* 10   */ V(11, 2, 1),
+  /* 11   */ V(11, 2, 1),
+
+  /* 0101 0110 ... */
+  /* 00   */ V(10, 5, 2),	/* 326 */
+  /* 01   */ V(1, 11, 2),
+  /* 10   */ V(11, 1, 2),
+  /* 11   */ V(6, 9, 2),
+
+  /* 0101 0111 ... */
+  /* 0    */ V(9, 6, 1),	/* 330 */
+  /* 1    */ V(10, 4, 1),
+
+  /* 0101 1000 ... */
+  /* 00   */ V(4, 10, 2),	/* 332 */
+  /* 01   */ V(7, 8, 2),
+  /* 10   */ V(8, 7, 1),
+  /* 11   */ V(8, 7, 1),
+
+  /* 0101 1001 ... */
+  /* 0    */ V(3, 10, 1),	/* 336 */
+  /* 1    */ V(10, 3, 1),
+
+  /* 0101 1010 ... */
+  /* 0    */ V(5, 9, 1),	/* 338 */
+  /* 1    */ V(9, 5, 1),
+
+  /* 0101 1011 ... */
+  /* 0    */ V(2, 10, 1),	/* 340 */
+  /* 1    */ V(10, 2, 1),
+
+  /* 0101 1100 ... */
+  /* 0    */ V(10, 1, 1),	/* 342 */
+  /* 1    */ V(6, 8, 1),
+
+  /* 0101 1101 ... */
+  /* 0    */ V(8, 6, 1),	/* 344 */
+  /* 1    */ V(7, 7, 1),
+
+  /* 0101 1110 ... */
+  /* 0    */ V(4, 9, 1),	/* 346 */
+  /* 1    */ V(9, 4, 1),
+
+  /* 0101 1111 ... */
+  /* 0    */ V(3, 9, 1),	/* 348 */
+  /* 1    */ V(9, 3, 1),
+
+  /* 0110 0000 ... */
+  /* 0    */ V(5, 8, 1),	/* 350 */
+  /* 1    */ V(8, 5, 1),
+
+  /* 0110 0001 ... */
+  /* 0    */ V(2, 9, 1),	/* 352 */
+  /* 1    */ V(6, 7, 1),
+
+  /* 0110 0010 ... */
+  /* 0    */ V(7, 6, 1),	/* 354 */
+  /* 1    */ V(9, 2, 1),
+
+  /* 0110 0011 ... */
+  /* 0    */ V(1, 9, 1),	/* 356 */
+  /* 1    */ V(9, 1, 1),
+
+  /* 0110 0100 ... */
+  /* 0    */ V(4, 8, 1),	/* 358 */
+  /* 1    */ V(8, 4, 1),
+
+  /* 0110 0101 ... */
+  /* 0    */ V(5, 7, 1),	/* 360 */
+  /* 1    */ V(7, 5, 1),
+
+  /* 0110 0110 ... */
+  /* 0    */ V(3, 8, 1),	/* 362 */
+  /* 1    */ V(8, 3, 1),
+
+  /* 0110 0111 ... */
+  /* 0    */ V(6, 6, 1),	/* 364 */
+  /* 1    */ V(2, 8, 1),
+
+  /* 0110 1000 ... */
+  /* 0    */ V(8, 2, 1),	/* 366 */
+  /* 1    */ V(1, 8, 1),
+
+  /* 0110 1001 ... */
+  /* 0    */ V(4, 7, 1),	/* 368 */
+  /* 1    */ V(7, 4, 1),
+
+  /* 0110 1010 ... */
+  /* 00   */ V(8, 1, 1),	/* 370 */
+  /* 01   */ V(8, 1, 1),
+  /* 10   */ V(0, 8, 2),
+  /* 11   */ V(8, 0, 2),
+
+  /* 0110 1011 ... */
+  /* 0    */ V(5, 6, 1),	/* 374 */
+  /* 1    */ V(6, 5, 1),
+
+  /* 0110 1100 ... */
+  /* 00   */ V(1, 7, 1),	/* 376 */
+  /* 01   */ V(1, 7, 1),
+  /* 10   */ V(0, 7, 2),
+  /* 11   */ V(7, 0, 2),
+
+  /* 0110 1110 ... */
+  /* 0    */ V(3, 7, 1),	/* 380  */
+  /* 1    */ V(2, 7, 1),
+
+  /* 0111 1100 ... */
+  /* 0    */ V(0, 6, 1),	/* 382 */
+  /* 1    */ V(6, 0, 1),
+
+  /* 1000 0011 ... */
+  /* 0    */ V(0, 5, 1),	/* 384 */
+  /* 1    */ V(5, 0, 1)
+};
+
+# undef V
+# undef PTR
+
+/* external tables */
+
+union huffquad const *const mad_huff_quad_table[2] = { hufftabA, hufftabB };
+
+struct hufftable const mad_huff_pair_table[32] = {
+  /*  0 */ { hufftab0,   0, 0 },
+  /*  1 */ { hufftab1,   0, 3 },
+  /*  2 */ { hufftab2,   0, 3 },
+  /*  3 */ { hufftab3,   0, 3 },
+  /*  4 */ { 0 /* not used */ },
+  /*  5 */ { hufftab5,   0, 3 },
+  /*  6 */ { hufftab6,   0, 4 },
+  /*  7 */ { hufftab7,   0, 4 },
+  /*  8 */ { hufftab8,   0, 4 },
+  /*  9 */ { hufftab9,   0, 4 },
+  /* 10 */ { hufftab10,  0, 4 },
+  /* 11 */ { hufftab11,  0, 4 },
+  /* 12 */ { hufftab12,  0, 4 },
+  /* 13 */ { hufftab13,  0, 4 },
+  /* 14 */ { 0 /* not used */ },
+  /* 15 */ { hufftab15,  0, 4 },
+  /* 16 */ { hufftab16,  1, 4 },
+  /* 17 */ { hufftab16,  2, 4 },
+  /* 18 */ { hufftab16,  3, 4 },
+  /* 19 */ { hufftab16,  4, 4 },
+  /* 20 */ { hufftab16,  6, 4 },
+  /* 21 */ { hufftab16,  8, 4 },
+  /* 22 */ { hufftab16, 10, 4 },
+  /* 23 */ { hufftab16, 13, 4 },
+  /* 24 */ { hufftab24,  4, 4 },
+  /* 25 */ { hufftab24,  5, 4 },
+  /* 26 */ { hufftab24,  6, 4 },
+  /* 27 */ { hufftab24,  7, 4 },
+  /* 28 */ { hufftab24,  8, 4 },
+  /* 29 */ { hufftab24,  9, 4 },
+  /* 30 */ { hufftab24, 11, 4 },
+  /* 31 */ { hufftab24, 13, 4 }
+};
diff --git a/code/libmad/huffman.h b/code/libmad/huffman.h
new file mode 100644
index 00000000..6325db44
--- /dev/null
+++ b/code/libmad/huffman.h
@@ -0,0 +1,66 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: huffman.h,v 1.11 2004/01/23 09:41:32 rob Exp $
+ */
+
+# ifndef LIBMAD_HUFFMAN_H
+# define LIBMAD_HUFFMAN_H
+
+union huffquad {
+  struct {
+    unsigned short final  :  1;
+    unsigned short bits   :  3;
+    unsigned short offset : 12;
+  } ptr;
+  struct {
+    unsigned short final  :  1;
+    unsigned short hlen   :  3;
+    unsigned short v      :  1;
+    unsigned short w      :  1;
+    unsigned short x      :  1;
+    unsigned short y      :  1;
+  } value;
+  unsigned short final    :  1;
+};
+
+union huffpair {
+  struct {
+    unsigned short final  :  1;
+    unsigned short bits   :  3;
+    unsigned short offset : 12;
+  } ptr;
+  struct {
+    unsigned short final  :  1;
+    unsigned short hlen   :  3;
+    unsigned short x      :  4;
+    unsigned short y      :  4;
+  } value;
+  unsigned short final    :  1;
+};
+
+struct hufftable {
+  union huffpair const *table;
+  unsigned short linbits;
+  unsigned short startbits;
+};
+
+extern union huffquad const *const mad_huff_quad_table[2];
+extern struct hufftable const mad_huff_pair_table[32];
+
+# endif
diff --git a/code/libmad/imdct_l_arm.S b/code/libmad/imdct_l_arm.S
new file mode 100644
index 00000000..92d67e1a
--- /dev/null
+++ b/code/libmad/imdct_l_arm.S
@@ -0,0 +1,1000 @@
+/*****************************************************************************
+* Copyright (C) 2000-2001 Andre McCurdy  <armccurdy@yahoo.co.uk>
+*
+* This program is free software. you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation@ either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY, without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program@ if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*****************************************************************************
+*
+* Notes:
+*
+*
+*****************************************************************************
+*
+* $Id: imdct_l_arm.S,v 1.7 2001/03/25 20:03:34 rob Rel $
+*
+* 2001/03/24:  Andre McCurdy <armccurdy@yahoo.co.uk>
+*   - Corrected PIC unsafe loading of address of 'imdct36_long_karray'
+*
+* 2000/09/20:  Robert Leslie <rob@mars.org>
+*   - Added a global symbol with leading underscore per suggestion of
+*     Simon Burge to support linking with the a.out format.
+*
+* 2000/09/15:  Robert Leslie <rob@mars.org>
+*   - Fixed a small bug where flags were changed before a conditional branch.
+*
+* 2000/09/15:  Andre McCurdy <armccurdy@yahoo.co.uk>
+*   - Applied Nicolas Pitre's rounding optimisation in all remaining places.
+*
+* 2000/09/09:  Nicolas Pitre <nico@cam.org>
+*   - Optimized rounding + scaling operations.
+*
+* 2000/08/09:  Andre McCurdy <armccurdy@yahoo.co.uk>
+*   - Original created.
+*
+****************************************************************************/
+
+
+/*
+   On entry:
+
+      r0 = pointer to 18 element input  array
+      r1 = pointer to 36 element output array
+      r2 = windowing block type
+
+
+   Stack frame created during execution of the function:
+
+   Initial   Holds:
+   Stack
+   pointer
+   minus:
+
+       0
+       4     lr
+       8     r11
+      12     r10
+      16     r9
+      20     r8
+      24     r7
+      28     r6
+      32     r5
+      36     r4
+
+      40     r2 : windowing block type
+
+      44     ct00 high
+      48     ct00 low
+      52     ct01 high
+      56     ct01 low
+      60     ct04 high
+      64     ct04 low
+      68     ct06 high
+      72     ct06 low
+      76     ct05 high
+      80     ct05 low
+      84     ct03 high
+      88     ct03 low
+      92    -ct05 high
+      96    -ct05 low
+     100    -ct07 high
+     104    -ct07 low
+     108     ct07 high
+     112     ct07 low
+     116     ct02 high
+     120     ct02 low
+*/
+
+#define BLOCK_MODE_NORMAL   0
+#define BLOCK_MODE_START    1
+#define BLOCK_MODE_STOP     3
+
+
+#define X0   0x00
+#define X1   0x04
+#define X2   0x08
+#define X3   0x0C
+#define X4   0x10
+#define X5   0x14
+#define X6   0x18
+#define X7   0x1c
+#define X8   0x20
+#define X9   0x24
+#define X10  0x28
+#define X11  0x2c
+#define X12  0x30
+#define X13  0x34
+#define X14  0x38
+#define X15  0x3c
+#define X16  0x40
+#define X17  0x44
+
+#define x0   0x00
+#define x1   0x04
+#define x2   0x08
+#define x3   0x0C
+#define x4   0x10
+#define x5   0x14
+#define x6   0x18
+#define x7   0x1c
+#define x8   0x20
+#define x9   0x24
+#define x10  0x28
+#define x11  0x2c
+#define x12  0x30
+#define x13  0x34
+#define x14  0x38
+#define x15  0x3c
+#define x16  0x40
+#define x17  0x44
+#define x18  0x48
+#define x19  0x4c
+#define x20  0x50
+#define x21  0x54
+#define x22  0x58
+#define x23  0x5c
+#define x24  0x60
+#define x25  0x64
+#define x26  0x68
+#define x27  0x6c
+#define x28  0x70
+#define x29  0x74
+#define x30  0x78
+#define x31  0x7c
+#define x32  0x80
+#define x33  0x84
+#define x34  0x88
+#define x35  0x8c
+
+#define K00  0x0ffc19fd
+#define K01  0x00b2aa3e
+#define K02  0x0fdcf549
+#define K03  0x0216a2a2
+#define K04  0x0f9ee890
+#define K05  0x03768962
+#define K06  0x0f426cb5
+#define K07  0x04cfb0e2
+#define K08  0x0ec835e8
+#define K09  0x061f78aa
+#define K10  0x0e313245
+#define K11  0x07635284
+#define K12  0x0d7e8807
+#define K13  0x0898c779
+#define K14  0x0cb19346
+#define K15  0x09bd7ca0
+#define K16  0x0bcbe352
+#define K17  0x0acf37ad
+
+#define minus_K02 0xf0230ab7
+
+#define WL0  0x00b2aa3e
+#define WL1  0x0216a2a2
+#define WL2  0x03768962
+#define WL3  0x04cfb0e2
+#define WL4  0x061f78aa
+#define WL5  0x07635284
+#define WL6  0x0898c779
+#define WL7  0x09bd7ca0
+#define WL8  0x0acf37ad
+#define WL9  0x0bcbe352
+#define WL10 0x0cb19346
+#define WL11 0x0d7e8807
+#define WL12 0x0e313245
+#define WL13 0x0ec835e8
+#define WL14 0x0f426cb5
+#define WL15 0x0f9ee890
+#define WL16 0x0fdcf549
+#define WL17 0x0ffc19fd
+
+
+@*****************************************************************************
+
+
+    .text
+    .align
+
+    .global III_imdct_l
+    .global _III_imdct_l
+
+III_imdct_l:
+_III_imdct_l:
+
+    stmdb   sp!, { r2, r4 - r11, lr }   @ all callee saved regs, plus arg3
+
+    ldr     r4, =K08                    @ r4 =  K08
+    ldr     r5, =K09                    @ r5 =  K09
+    ldr     r8, [r0, #X4]               @ r8 =  X4
+    ldr     r9, [r0, #X13]              @ r9 =  X13
+    rsb     r6, r4, #0                  @ r6 = -K08
+    rsb     r7, r5, #0                  @ r7 = -K09
+
+    smull   r2, r3, r4, r8              @ r2..r3  = (X4 * K08)
+    smlal   r2, r3, r5, r9              @ r2..r3  = (X4 * K08) + (X13 *  K09) = ct01
+
+    smull   r10, lr, r8, r5             @ r10..lr = (X4 * K09)
+    smlal   r10, lr, r9, r6             @ r10..lr = (X4 * K09) + (X13 * -K08) = ct00
+
+    ldr     r8, [r0, #X7]               @ r8 = X7
+    ldr     r9, [r0, #X16]              @ r9 = X16
+
+    stmdb   sp!, { r2, r3, r10, lr }    @ stack ct00_h, ct00_l, ct01_h, ct01_l
+
+    add     r8, r8, r9                  @ r8 = (X7 + X16)
+    ldr     r9, [r0, #X1]               @ r9 = X1
+
+    smlal   r2, r3, r6, r8              @ r2..r3  = ct01 + ((X7 + X16) * -K08)
+    smlal   r2, r3, r7, r9              @ r2..r3 += (X1  * -K09)
+
+    ldr     r7, [r0, #X10]              @ r7 = X10
+
+    rsbs    r10, r10, #0
+    rsc     lr, lr, #0                  @ r10..lr  = -ct00
+
+    smlal   r2, r3, r5, r7              @ r2..r3  += (X10 *  K09) = ct06
+
+    smlal   r10, lr, r9, r6             @ r10..lr  = -ct00 + ( X1        * -K08)
+    smlal   r10, lr, r8, r5             @ r10..lr +=         ((X7 + X16) *  K09)
+    smlal   r10, lr, r7, r4             @ r10..lr +=         ( X10       *  K08) = ct04
+
+    stmdb   sp!, { r2, r3, r10, lr }    @ stack ct04_h, ct04_l, ct06_h, ct06_l
+
+    @----
+
+    ldr     r7, [r0, #X0]
+    ldr     r8, [r0, #X11]
+    ldr     r9, [r0, #X12]
+    sub     r7, r7, r8
+    sub     r7, r7, r9                  @ r7 = (X0 - X11 -X12) = ct14
+
+    ldr     r9,  [r0, #X3]
+    ldr     r8,  [r0, #X8]
+    ldr     r11, [r0, #X15]
+    sub     r8, r8, r9
+    add     r8, r8, r11                 @ r8 = (X8 - X3 + X15) = ct16
+
+    add     r11, r7, r8                 @ r11 = ct14 + ct16 = ct18
+
+    smlal   r2, r3, r6, r11             @ r2..r3 = ct06 + ((X0 - X11 - X3 + X15 + X8 - X12) * -K08)
+
+    ldr     r6,  [r0, #X2]
+    ldr     r9,  [r0, #X9]
+    ldr     r12, [r0, #X14]
+    sub     r6, r6, r9
+    sub     r6, r6, r12                 @ r6 = (X2 - X9 - X14) = ct15
+
+    ldr     r9,  [r0, #X5]
+    ldr     r12, [r0, #X6]
+    sub     r9, r9, r12
+    ldr     r12, [r0, #X17]
+    sub     r9, r9, r12                 @ r9 = (X5 - X6 - X17) = ct17
+
+    add     r12, r9, r6                 @ r12 = ct15 + ct17 = ct19
+
+    smlal   r2, r3, r5, r12             @ r2..r3 += ((X2 - X9 + X5 - X6 - X17 - X14) * K09)
+
+    smlal   r10, lr, r11, r5            @ r10..lr = ct04 + (ct18 * K09)
+    smlal   r10, lr, r12, r4            @ r10..lr = ct04 + (ct18 * K09) + (ct19 * K08)
+
+    movs    r2, r2, lsr #28
+    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
+    str     r2, [r1, #x22]              @ store result x22
+
+    movs    r10, r10, lsr #28
+    adc     r10, r10, lr, lsl #4        @ r10 = bits[59..28] of r10..lr
+    str     r10, [r1, #x4]              @ store result x4
+
+    @----
+
+    ldmia   sp, { r2, r3, r4, r5 }      @ r2..r3 = ct06, r4..r5 = ct04 (dont update sp)
+
+    @ r2..r3 = ct06
+    @ r4..r5 = ct04
+    @ r6     = ct15
+    @ r7     = ct14
+    @ r8     = ct16
+    @ r9     = ct17
+    @ r10    = .
+    @ r11    = .
+    @ r12    = .
+    @ lr     = .
+
+    ldr     r10, =K03                   @ r10 = K03
+    ldr     lr,  =K15                   @ lr  = K15
+
+    smlal   r2, r3, r10, r7             @ r2..r3 = ct06 + (ct14 * K03)
+    smlal   r4, r5,  lr, r7             @ r4..r5 = ct04 + (ct14 * K15)
+
+    ldr     r12, =K14                   @ r12 =  K14
+    rsb     r10, r10, #0                @ r10 = -K03
+
+    smlal   r2, r3,  lr, r6             @ r2..r3 += (ct15 *  K15)
+    smlal   r4, r5, r10, r6             @ r4..r5 += (ct15 * -K03)
+    smlal   r2, r3, r12, r8             @ r2..r3 += (ct16 *  K14)
+
+    ldr     r11, =minus_K02             @ r11 = -K02
+    rsb     r12, r12, #0                @ r12 = -K14
+
+    smlal   r4, r5, r12, r9             @ r4..r5 += (ct17 * -K14)
+    smlal   r2, r3, r11, r9             @ r2..r3 += (ct17 * -K02)
+    smlal   r4, r5, r11, r8             @ r4..r5 += (ct16 * -K02)
+
+    movs    r2, r2, lsr #28
+    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
+    str     r2, [r1, #x7]               @ store result x7
+
+    movs    r4, r4, lsr #28
+    adc     r4, r4, r5, lsl #4          @ r4 = bits[59..28] of r4..r5
+    str     r4, [r1, #x1]               @ store result x1
+
+    @----
+
+    ldmia   sp, { r2, r3, r4, r5 }      @ r2..r3 = ct06, r4..r5 = ct04 (dont update sp)
+
+    @ r2..r3 = ct06
+    @ r4..r5 = ct04
+    @ r6     = ct15
+    @ r7     = ct14
+    @ r8     = ct16
+    @ r9     = ct17
+    @ r10    = -K03
+    @ r11    = -K02
+    @ r12    = -K14
+    @ lr     =  K15
+
+    rsbs    r2, r2, #0
+    rsc     r3, r3, #0                  @ r2..r3 = -ct06
+
+    smlal   r2, r3, r12, r7             @ r2..r3  = -ct06 + (ct14 * -K14)
+    smlal   r2, r3, r10, r8             @ r2..r3 += (ct16 * -K03)
+
+    smlal   r4, r5, r12, r6             @ r4..r5  =  ct04 + (ct15 * -K14)
+    smlal   r4, r5, r10, r9             @ r4..r5 += (ct17 * -K03)
+    smlal   r4, r5,  lr, r8             @ r4..r5 += (ct16 *  K15)
+    smlal   r4, r5, r11, r7             @ r4..r5 += (ct14 * -K02)
+
+    rsb     lr, lr, #0                  @ lr  = -K15
+    rsb     r11, r11, #0                @ r11 =  K02
+
+    smlal   r2, r3,  lr, r9             @ r2..r3 += (ct17 * -K15)
+    smlal   r2, r3, r11, r6             @ r2..r3 += (ct15 *  K02)
+
+    movs    r4, r4, lsr #28
+    adc     r4, r4, r5, lsl #4          @ r4 = bits[59..28] of r4..r5
+    str     r4, [r1, #x25]              @ store result x25
+
+    movs    r2, r2, lsr #28
+    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
+    str     r2, [r1, #x19]              @ store result x19
+
+    @----
+
+    ldr     r2, [sp, #16]               @ r2 = ct01_l
+    ldr     r3, [sp, #20]               @ r3 = ct01_h
+
+    ldr     r6, [r0, #X1]
+    ldr     r8, [r0, #X7]
+    ldr     r9, [r0, #X10]
+    ldr     r7, [r0, #X16]
+
+    rsbs    r2, r2, #0
+    rsc     r3, r3, #0                  @ r2..r3 = -ct01
+
+    mov     r4, r2
+    mov     r5, r3                      @ r4..r5 = -ct01
+
+    @ r2..r3 = -ct01
+    @ r4..r5 = -ct01
+    @ r6     =  X1
+    @ r7     =  X16
+    @ r8     =  X7
+    @ r9     =  X10
+    @ r10    = -K03
+    @ r11    =  K02
+    @ r12    = -K14
+    @ lr     = -K15
+
+    smlal   r4, r5, r12, r7             @ r4..r5 = -ct01 + (X16 * -K14)
+    smlal   r2, r3,  lr, r9             @ r2..r3 = -ct01 + (X10 * -K15)
+
+    smlal   r4, r5, r10, r8             @ r4..r5 += (X7  * -K03)
+    smlal   r2, r3, r10, r7             @ r2..r3 += (X16 * -K03)
+
+    smlal   r4, r5, r11, r9             @ r4..r5 += (X10 *  K02)
+    smlal   r2, r3, r12, r8             @ r2..r3 += (X7  * -K14)
+
+    rsb     lr, lr, #0                  @ lr  =  K15
+    rsb     r11, r11, #0                @ r11 = -K02
+
+    smlal   r4, r5,  lr, r6             @ r4..r5 += (X1  *  K15) = ct05
+    smlal   r2, r3, r11, r6             @ r2..r3 += (X1  * -K02) = ct03
+
+    stmdb   sp!, { r2, r3, r4, r5 }     @ stack ct05_h, ct05_l, ct03_h, ct03_l
+
+    rsbs    r4, r4, #0
+    rsc     r5, r5, #0                  @ r4..r5 = -ct05
+
+    stmdb   sp!, { r4, r5 }             @ stack -ct05_h, -ct05_l
+
+    ldr     r2, [sp, #48]               @ r2 = ct00_l
+    ldr     r3, [sp, #52]               @ r3 = ct00_h
+
+    rsb     r10, r10, #0                @ r10 = K03
+
+    rsbs    r4, r2, #0
+    rsc     r5, r3, #0                  @ r4..r5 = -ct00
+
+    @ r2..r3 =  ct00
+    @ r4..r5 = -ct00
+    @ r6     =  X1
+    @ r7     =  X16
+    @ r8     =  X7
+    @ r9     =  X10
+    @ r10    =  K03
+    @ r11    = -K02
+    @ r12    = -K14
+    @ lr     =  K15
+
+    smlal   r4, r5, r10, r6             @ r4..r5 = -ct00 + (X1  * K03)
+    smlal   r2, r3, r10, r9             @ r2..r3 =  ct00 + (X10 * K03)
+
+    smlal   r4, r5, r12, r9             @ r4..r5 += (X10 * -K14)
+    smlal   r2, r3, r12, r6             @ r2..r3 += (X1  * -K14)
+
+    smlal   r4, r5, r11, r7             @ r4..r5 += (X16 * -K02)
+    smlal   r4, r5,  lr, r8             @ r4..r5 += (X7  *  K15) = ct07
+
+    rsb     lr, lr, #0                  @ lr  = -K15
+    rsb     r11, r11, #0                @ r11 =  K02
+
+    smlal   r2, r3, r11, r8             @ r2..r3 += (X7  *  K02)
+    smlal   r2, r3,  lr, r7             @ r2..r3 += (X16 * -K15) = ct02
+
+    rsbs    r6, r4, #0
+    rsc     r7, r5, #0                  @ r6..r7 = -ct07
+
+    stmdb   sp!, { r2 - r7 }            @ stack -ct07_h, -ct07_l, ct07_h, ct07_l, ct02_h, ct02_l
+
+
+    @----
+
+    adr     r2, imdct36_long_karray
+
+
+loop:
+    ldr     r12, [r0, #X0]
+
+    ldmia   r2!, { r5 - r11 }           @ first 7 words from Karray element
+
+    smull   r3, r4, r5, r12             @ sum =  (Kxx * X0)
+    ldr     r12, [r0, #X2]
+    ldr     r5,  [r0, #X3]
+    smlal   r3, r4, r6, r12             @ sum += (Kxx * X2)
+    ldr     r12, [r0, #X5]
+    ldr     r6,  [r0, #X6]
+    smlal   r3, r4, r7, r5              @ sum += (Kxx * X3)
+    smlal   r3, r4, r8, r12             @ sum += (Kxx * X5)
+    ldr     r12, [r0, #X8]
+    ldr     r5,  [r0, #X9]
+    smlal   r3, r4, r9, r6              @ sum += (Kxx * X6)
+    smlal   r3, r4, r10, r12            @ sum += (Kxx * X8)
+    smlal   r3, r4, r11, r5             @ sum += (Kxx * X9)
+
+    ldmia   r2!, { r5 - r10 }           @ final 6 words from Karray element
+
+    ldr     r11, [r0, #X11]
+    ldr     r12, [r0, #X12]
+    smlal   r3, r4, r5, r11             @ sum += (Kxx * X11)
+    ldr     r11, [r0, #X14]
+    ldr     r5,  [r0, #X15]
+    smlal   r3, r4, r6, r12             @ sum += (Kxx * X12)
+    smlal   r3, r4, r7, r11             @ sum += (Kxx * X14)
+    ldr     r11, [r0, #X17]
+    smlal   r3, r4, r8, r5              @ sum += (Kxx * X15)
+    smlal   r3, r4, r9, r11             @ sum += (Kxx * X17)
+
+    add     r5, sp, r10, lsr #16        @ create index back into stack for required ctxx
+
+    ldmia   r5, { r6, r7 }              @ r6..r7 = ctxx
+
+    mov     r8, r10, lsl #16            @ push ctxx index off the top end
+
+    adds    r3, r3, r6                  @ add low words
+    adc     r4, r4, r7                  @ add high words, with carry
+    movs    r3, r3, lsr #28
+    adc     r3, r3, r4, lsl #4          @ r3 = bits[59..28] of r3..r4
+
+    str     r3, [r1, r8, lsr #24]       @ push completion flag off the bottom end
+
+    movs    r8, r8, lsl #8              @ push result location index off the top end
+    beq     loop                        @ loop back if completion flag not set
+    b       imdct_l_windowing           @ branch to windowing stage if looping finished
+
+imdct36_long_karray:
+
+    .word   K17, -K13,  K10, -K06, -K05,  K01, -K00,  K04, -K07,  K11,  K12, -K16, 0x00000000
+    .word   K13,  K07,  K16,  K01,  K10, -K05,  K04, -K11,  K00, -K17,  K06, -K12, 0x00200800
+    .word   K11,  K17,  K05,  K12, -K01,  K06, -K07,  K00, -K13,  K04, -K16,  K10, 0x00200c00
+    .word   K07,  K00, -K12,  K05, -K16, -K10,  K11, -K17,  K04,  K13,  K01,  K06, 0x00001400
+    .word   K05,  K10, -K00, -K17,  K07, -K13,  K12,  K06, -K16,  K01, -K11, -K04, 0x00181800
+    .word   K01,  K05, -K07, -K11,  K13,  K17, -K16, -K12,  K10,  K06, -K04, -K00, 0x00102000
+    .word  -K16,  K12, -K11,  K07,  K04, -K00, -K01,  K05, -K06,  K10,  K13, -K17, 0x00284800
+    .word  -K12,  K06,  K17, -K00, -K11,  K04,  K05, -K10,  K01,  K16, -K07, -K13, 0x00085000
+    .word  -K10,  K16,  K04, -K13, -K00,  K07,  K06, -K01, -K12, -K05,  K17,  K11, 0x00105400
+    .word  -K06, -K01,  K13,  K04,  K17, -K11, -K10, -K16, -K05,  K12,  K00,  K07, 0x00185c00
+    .word  -K04, -K11, -K01,  K16,  K06,  K12,  K13, -K07, -K17, -K00, -K10, -K05, 0x00006000
+    .word  -K00, -K04, -K06, -K10, -K12, -K16, -K17, -K13, -K11, -K07, -K05, -K01, 0x00206801
+
+
+    @----
+    @-------------------------------------------------------------------------
+    @----
+
+imdct_l_windowing:
+
+    ldr     r11, [sp, #80]              @ fetch function parameter 3 from out of the stack
+    ldmia   r1!, { r0, r2 - r9 }        @ load 9 words from x0, update pointer
+
+    @ r0     = x0
+    @ r1     = &x[9]
+    @ r2     = x1
+    @ r3     = x2
+    @ r4     = x3
+    @ r5     = x4
+    @ r6     = x5
+    @ r7     = x6
+    @ r8     = x7
+    @ r9     = x8
+    @ r10    = .
+    @ r11    = window mode: (0 == normal), (1 == start block), (3 == stop block)
+    @ r12    = .
+    @ lr     = .
+
+    cmp     r11, #BLOCK_MODE_STOP       @ setup flags
+    rsb     r10, r0, #0                 @ r10 = -x0 (DONT change flags !!)
+    beq     stop_block_x0_to_x17
+
+
+    @ start and normal blocks are treated the same for x[0]..x[17]
+
+normal_block_x0_to_x17:
+
+    ldr     r12, =WL9                   @ r12 = window_l[9]
+
+    rsb     r0,  r9, #0                 @ r0  = -x8
+    rsb     r9,  r2, #0                 @ r9  = -x1
+    rsb     r2,  r8, #0                 @ r2  = -x7
+    rsb     r8,  r3, #0                 @ r8  = -x2
+    rsb     r3,  r7, #0                 @ r3  = -x6
+    rsb     r7,  r4, #0                 @ r7  = -x3
+    rsb     r4,  r6, #0                 @ r4  = -x5
+    rsb     r6,  r5, #0                 @ r6  = -x4
+
+    @ r0     = -x8
+    @ r1     = &x[9]
+    @ r2     = -x7
+    @ r3     = -x6
+    @ r4     = -x5
+    @ r5     = .
+    @ r6     = -x4
+    @ r7     = -x3
+    @ r8     = -x2
+    @ r9     = -x1
+    @ r10    = -x0
+    @ r11    = window mode: (0 == normal), (1 == start block), (3 == stop block)
+    @ r12    = window_l[9]
+    @ lr     = .
+
+    smull   r5, lr, r12, r0             @ r5..lr = (window_l[9]  * (x[9]  == -x[8]))
+    ldr     r12, =WL10                  @ r12 = window_l[10]
+    movs    r5, r5, lsr #28
+    adc     r0, r5, lr, lsl #4          @ r0 = bits[59..28] of windowed x9
+
+    smull   r5, lr, r12, r2             @ r5..lr = (window_l[10] * (x[10] == -x[7]))
+    ldr     r12, =WL11                  @ r12 = window_l[11]
+    movs    r5, r5, lsr #28
+    adc     r2, r5, lr, lsl #4          @ r2 = bits[59..28] of windowed x10
+
+    smull   r5, lr, r12, r3             @ r5..lr = (window_l[11] * (x[11] == -x[6]))
+    ldr     r12, =WL12                  @ r12 = window_l[12]
+    movs    r5, r5, lsr #28
+    adc     r3, r5, lr, lsl #4          @ r3 = bits[59..28] of windowed x11
+
+    smull   r5, lr, r12, r4             @ r5..lr = (window_l[12] * (x[12] == -x[5]))
+    ldr     r12, =WL13                  @ r12 = window_l[13]
+    movs    r5, r5, lsr #28
+    adc     r4, r5, lr, lsl #4          @ r4 = bits[59..28] of windowed x12
+
+    smull   r5, lr, r12, r6             @ r5..lr = (window_l[13] * (x[13] == -x[4]))
+    ldr     r12, =WL14                  @ r12 = window_l[14]
+    movs    r5, r5, lsr #28
+    adc     r6, r5, lr, lsl #4          @ r6 = bits[59..28] of windowed x13
+
+    smull   r5, lr, r12, r7             @ r5..lr = (window_l[14] * (x[14] == -x[3]))
+    ldr     r12, =WL15                  @ r12 = window_l[15]
+    movs    r5, r5, lsr #28
+    adc     r7, r5, lr, lsl #4          @ r7 = bits[59..28] of windowed x14
+
+    smull   r5, lr, r12, r8             @ r5..lr = (window_l[15] * (x[15] == -x[2]))
+    ldr     r12, =WL16                  @ r12 = window_l[16]
+    movs    r5, r5, lsr #28
+    adc     r8, r5, lr, lsl #4          @ r8 = bits[59..28] of windowed x15
+
+    smull   r5, lr, r12, r9             @ r5..lr = (window_l[16] * (x[16] == -x[1]))
+    ldr     r12, =WL17                  @ r12 = window_l[17]
+    movs    r5, r5, lsr #28
+    adc     r9, r5, lr, lsl #4          @ r9 = bits[59..28] of windowed x16
+
+    smull   r5, lr, r12, r10            @ r5..lr = (window_l[17] * (x[17] == -x[0]))
+    ldr     r12, =WL0                   @ r12 = window_l[0]
+    movs    r5, r5, lsr #28
+    adc     r10, r5, lr, lsl #4         @ r10 = bits[59..28] of windowed x17
+
+
+    stmia   r1,  { r0, r2 - r4, r6 - r10 } @ store windowed x[9] .. x[17]
+    ldmdb   r1!, { r0, r2 - r9 }           @ load 9 words downto (and including) x0
+
+
+    smull   r10, lr, r12, r0            @ r10..lr = (window_l[0] * x[0])
+    ldr     r12, =WL1                   @ r12 = window_l[1]
+    movs    r10, r10, lsr #28
+    adc     r0, r10, lr, lsl #4         @ r0 = bits[59..28] of windowed x0
+
+    smull   r10, lr, r12, r2            @ r10..lr = (window_l[1] * x[1])
+    ldr     r12, =WL2                   @ r12 = window_l[2]
+    movs    r10, r10, lsr #28
+    adc     r2, r10, lr, lsl #4         @ r2 = bits[59..28] of windowed x1
+
+    smull   r10, lr, r12, r3            @ r10..lr = (window_l[2] * x[2])
+    ldr     r12, =WL3                   @ r12 = window_l[3]
+    movs    r10, r10, lsr #28
+    adc     r3, r10, lr, lsl #4         @ r3 = bits[59..28] of windowed x2
+
+    smull   r10, lr, r12, r4            @ r10..lr = (window_l[3] * x[3])
+    ldr     r12, =WL4                   @ r12 = window_l[4]
+    movs    r10, r10, lsr #28
+    adc     r4, r10, lr, lsl #4         @ r4 = bits[59..28] of windowed x3
+
+    smull   r10, lr, r12, r5            @ r10..lr = (window_l[4] * x[4])
+    ldr     r12, =WL5                   @ r12 = window_l[5]
+    movs    r10, r10, lsr #28
+    adc     r5, r10, lr, lsl #4         @ r5 = bits[59..28] of windowed x4
+
+    smull   r10, lr, r12, r6            @ r10..lr = (window_l[5] * x[5])
+    ldr     r12, =WL6                   @ r12 = window_l[6]
+    movs    r10, r10, lsr #28
+    adc     r6, r10, lr, lsl #4         @ r6 = bits[59..28] of windowed x5
+
+    smull   r10, lr, r12, r7            @ r10..lr = (window_l[6] * x[6])
+    ldr     r12, =WL7                   @ r12 = window_l[7]
+    movs    r10, r10, lsr #28
+    adc     r7, r10, lr, lsl #4         @ r7 = bits[59..28] of windowed x6
+
+    smull   r10, lr, r12, r8            @ r10..lr = (window_l[7] * x[7])
+    ldr     r12, =WL8                   @ r12 = window_l[8]
+    movs    r10, r10, lsr #28
+    adc     r8, r10, lr, lsl #4         @ r8 = bits[59..28] of windowed x7
+
+    smull   r10, lr, r12, r9            @ r10..lr = (window_l[8] * x[8])
+    movs    r10, r10, lsr #28
+    adc     r9, r10, lr, lsl #4         @ r9 = bits[59..28] of windowed x8
+
+    stmia   r1, { r0, r2 - r9 }         @ store windowed x[0] .. x[8]
+
+    cmp     r11, #BLOCK_MODE_START
+    beq     start_block_x18_to_x35
+
+
+    @----
+
+
+normal_block_x18_to_x35:
+
+    ldr     r11, =WL3                   @ r11 = window_l[3]
+    ldr     r12, =WL4                   @ r12 = window_l[4]
+
+    add     r1, r1, #(18*4)             @ r1 = &x[18]
+
+    ldmia   r1!, { r0, r2 - r4, r6 - r10 }  @ load 9 words from x18, update pointer
+
+    @ r0     = x18
+    @ r1     = &x[27]
+    @ r2     = x19
+    @ r3     = x20
+    @ r4     = x21
+    @ r5     = .
+    @ r6     = x22
+    @ r7     = x23
+    @ r8     = x24
+    @ r9     = x25
+    @ r10    = x26
+    @ r11    = window_l[3]
+    @ r12    = window_l[4]
+    @ lr     = .
+
+    smull   r5, lr, r12, r6             @ r5..lr = (window_l[4] * (x[22] == x[31]))
+    movs    r5, r5, lsr #28
+    adc     r5, r5, lr, lsl #4          @ r5 = bits[59..28] of windowed x31
+
+    smull   r6, lr, r11, r4             @ r5..lr = (window_l[3] * (x[21] == x[32]))
+    ldr     r12, =WL5                   @ r12    =  window_l[5]
+    movs    r6, r6, lsr #28
+    adc     r6, r6, lr, lsl #4          @ r6 = bits[59..28] of windowed x32
+
+    smull   r4, lr, r12, r7             @ r4..lr = (window_l[5] * (x[23] == x[30]))
+    ldr     r11, =WL1                   @ r11    =  window_l[1]
+    ldr     r12, =WL2                   @ r12    =  window_l[2]
+    movs    r4, r4, lsr #28
+    adc     r4, r4, lr, lsl #4          @ r4 = bits[59..28] of windowed x30
+
+    smull   r7, lr, r12, r3             @ r7..lr = (window_l[2] * (x[20] == x[33]))
+    ldr     r12, =WL6                   @ r12 = window_l[6]
+    movs    r7, r7, lsr #28
+    adc     r7, r7, lr, lsl #4          @ r7 = bits[59..28] of windowed x33
+
+    smull   r3, lr, r12, r8             @ r3..lr = (window_l[6] * (x[24] == x[29]))
+    movs    r3, r3, lsr #28
+    adc     r3, r3, lr, lsl #4          @ r3 = bits[59..28] of windowed x29
+
+    smull   r8, lr, r11, r2             @ r7..lr = (window_l[1] * (x[19] == x[34]))
+    ldr     r12, =WL7                   @ r12    =  window_l[7]
+    ldr     r11, =WL8                   @ r11    =  window_l[8]
+    movs    r8, r8, lsr #28
+    adc     r8, r8, lr, lsl #4          @ r8 = bits[59..28] of windowed x34
+
+    smull   r2, lr, r12, r9             @ r7..lr = (window_l[7] * (x[25] == x[28]))
+    ldr     r12, =WL0                   @ r12 = window_l[0]
+    movs    r2, r2, lsr #28
+    adc     r2, r2, lr, lsl #4          @ r2 = bits[59..28] of windowed x28
+
+    smull   r9, lr, r12, r0             @ r3..lr = (window_l[0] * (x[18] == x[35]))
+    movs    r9, r9, lsr #28
+    adc     r9, r9, lr, lsl #4          @ r9 = bits[59..28] of windowed x35
+
+    smull   r0, lr, r11, r10            @ r7..lr = (window_l[8] * (x[26] == x[27]))
+    ldr     r11, =WL16                  @ r11    =  window_l[16]
+    ldr     r12, =WL17                  @ r12    =  window_l[17]
+    movs    r0, r0, lsr #28
+    adc     r0, r0, lr, lsl #4          @ r0 = bits[59..28] of windowed x27
+
+
+    stmia   r1,  { r0, r2 - r9 }        @ store windowed x[27] .. x[35]
+    ldmdb   r1!, { r0, r2 - r9 }        @ load 9 words downto (and including) x18
+
+
+    smull   r10, lr, r12, r0            @ r10..lr = (window_l[17] * x[18])
+    movs    r10, r10, lsr #28
+    adc     r0,  r10, lr, lsl #4        @ r0 = bits[59..28] of windowed x0
+
+    smull   r10, lr, r11, r2            @ r10..lr = (window_l[16] * x[19])
+    ldr     r11, =WL14                  @ r11     =  window_l[14]
+    ldr     r12, =WL15                  @ r12     =  window_l[15]
+    movs    r10, r10, lsr #28
+    adc     r2,  r10, lr, lsl #4        @ r2 = bits[59..28] of windowed x1
+
+    smull   r10, lr, r12, r3            @ r10..lr = (window_l[15] * x[20])
+    movs    r10, r10, lsr #28
+    adc     r3,  r10, lr, lsl #4        @ r3 = bits[59..28] of windowed x2
+
+    smull   r10, lr, r11, r4            @ r10..lr = (window_l[14] * x[21])
+    ldr     r11, =WL12                  @ r11     =  window_l[12]
+    ldr     r12, =WL13                  @ r12     =  window_l[13]
+    movs    r10, r10, lsr #28
+    adc     r4,  r10, lr, lsl #4        @ r4 = bits[59..28] of windowed x3
+
+    smull   r10, lr, r12, r5            @ r10..lr = (window_l[13] * x[22])
+    movs    r10, r10, lsr #28
+    adc     r5,  r10, lr, lsl #4        @ r5 = bits[59..28] of windowed x4
+
+    smull   r10, lr, r11, r6            @ r10..lr = (window_l[12] * x[23])
+    ldr     r11, =WL10                  @ r12 = window_l[10]
+    ldr     r12, =WL11                  @ r12 = window_l[11]
+    movs    r10, r10, lsr #28
+    adc     r6,  r10, lr, lsl #4        @ r6 = bits[59..28] of windowed x5
+
+    smull   r10, lr, r12, r7            @ r10..lr = (window_l[11] * x[24])
+    movs    r10, r10, lsr #28
+    adc     r7,  r10, lr, lsl #4        @ r7 = bits[59..28] of windowed x6
+
+    smull   r10, lr, r11, r8            @ r10..lr = (window_l[10] * x[25])
+    ldr     r12, =WL9                   @ r12 = window_l[9]
+    movs    r10, r10, lsr #28
+    adc     r8,  r10, lr, lsl #4        @ r8 = bits[59..28] of windowed x7
+
+    smull   r10, lr, r12, r9            @ r10..lr = (window_l[9] * x[26])
+
+    movs    r10, r10, lsr #28
+    adc     r9,  r10, lr, lsl #4        @ r9 = bits[59..28] of windowed x8
+
+    stmia   r1, { r0, r2 - r9 }         @ store windowed x[18] .. x[26]
+
+    @----
+    @ NB there are 2 possible exits from this function - this is only one of them
+    @----
+
+    add     sp, sp, #(21*4)             @ return stack frame
+    ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
+
+    @----
+
+
+stop_block_x0_to_x17:
+
+    @ r0     =  x0
+    @ r1     = &x[9]
+    @ r2     =  x1
+    @ r3     =  x2
+    @ r4     =  x3
+    @ r5     =  x4
+    @ r6     =  x5
+    @ r7     =  x6
+    @ r8     =  x7
+    @ r9     =  x8
+    @ r10    = -x0
+    @ r11    =  window mode: (0 == normal), (1 == start block), (3 == stop block)
+    @ r12    =  .
+    @ lr     =  .
+
+    rsb     r0, r6, #0                  @ r0 = -x5
+    rsb     r6, r2, #0                  @ r6 = -x1
+    rsb     r2, r5, #0                  @ r2 = -x4
+    rsb     r5, r3, #0                  @ r5 = -x2
+    rsb     r3, r4, #0                  @ r3 = -x3
+
+    add     r1, r1, #(3*4)                      @ r1 = &x[12]
+    stmia   r1, { r0, r2, r3, r5, r6, r10 }     @ store unchanged x[12] .. x[17]
+
+    ldr     r0, =WL1                    @ r0 = window_l[1]  == window_s[0]
+
+    rsb     r10, r9, #0                 @ r10 = -x8
+    rsb     r12, r8, #0                 @ r12 = -x7
+    rsb     lr,  r7, #0                 @ lr  = -x6
+
+    @ r0     =  WL1
+    @ r1     = &x[12]
+    @ r2     =  .
+    @ r3     =  .
+    @ r4     =  .
+    @ r5     =  .
+    @ r6     =  .
+    @ r7     =  x6
+    @ r8     =  x7
+    @ r9     =  x8
+    @ r10    = -x8
+    @ r11    =  window mode: (0 == normal), (1 == start block), (3 == stop block)
+    @ r12    = -x7
+    @ lr     = -x6
+
+    smull   r5, r6, r0, r7              @ r5..r6 = (window_l[1] * x[6])
+    ldr     r2, =WL4                    @ r2     =  window_l[4] == window_s[1]
+    movs    r5, r5, lsr #28
+    adc     r7, r5, r6, lsl #4          @ r7 = bits[59..28] of windowed x6
+
+    smull   r5, r6, r2, r8              @ r5..r6 = (window_l[4] * x[7])
+    ldr     r3, =WL7                    @ r3     =  window_l[7] == window_s[2]
+    movs    r5, r5, lsr #28
+    adc     r8, r5, r6, lsl #4          @ r8 = bits[59..28] of windowed x7
+
+    smull   r5, r6, r3, r9              @ r5..r6 = (window_l[7] * x[8])
+    ldr     r4, =WL10                   @ r4     =  window_l[10] == window_s[3]
+    movs    r5, r5, lsr #28
+    adc     r9, r5, r6, lsl #4          @ r9 = bits[59..28] of windowed x8
+
+    smull   r5, r6, r4, r10             @ r5..r6 = (window_l[10] * (x[9] == -x[8]))
+    ldr     r0, =WL13                   @ r0     =  window_l[13] == window_s[4]
+    movs    r5, r5, lsr #28
+    adc     r10, r5, r6, lsl #4         @ r10 = bits[59..28] of windowed x9
+
+    smull   r5, r6, r0, r12             @ r5..r6 = (window_l[13] * (x[10] == -x[7]))
+    ldr     r2, =WL16                   @ r2     =  window_l[16] == window_s[5]
+    movs    r5, r5, lsr #28
+    adc     r12, r5, r6, lsl #4         @ r10 = bits[59..28] of windowed x9
+
+    smull   r5, r6, r2, lr              @ r5..r6 = (window_l[16] * (x[11] == -x[6]))
+
+    ldr     r0, =0x00
+
+    movs    r5, r5, lsr #28
+    adc     lr, r5, r6, lsl #4          @ r10 = bits[59..28] of windowed x9
+
+    stmdb   r1!, { r7 - r10, r12, lr }  @ store windowed x[6] .. x[11]
+
+    ldr     r5, =0x00
+    ldr     r6, =0x00
+    ldr     r2, =0x00
+    ldr     r3, =0x00
+    ldr     r4, =0x00
+
+    stmdb   r1!, { r0, r2 - r6 }        @ store windowed x[0] .. x[5]
+
+    b       normal_block_x18_to_x35
+
+
+    @----
+
+
+start_block_x18_to_x35:
+
+    ldr     r4, =WL1                    @ r0 = window_l[1]  == window_s[0]
+
+    add     r1, r1, #(24*4)             @ r1 = &x[24]
+
+    ldmia   r1, { r0, r2, r3 }          @ load 3 words from x24, dont update pointer
+
+    @ r0     = x24
+    @ r1     = &x[24]
+    @ r2     = x25
+    @ r3     = x26
+    @ r4     = WL1
+    @ r5     = WL4
+    @ r6     = WL7
+    @ r7     = WL10
+    @ r8     = WL13
+    @ r9     = WL16
+    @ r10    = .
+    @ r11    = .
+    @ r12    = .
+    @ lr     = .
+
+    ldr     r5, =WL4                    @ r5 = window_l[4] == window_s[1]
+
+    smull   r10, r11, r4, r0            @ r10..r11 = (window_l[1] * (x[24] == x[29]))
+    ldr     r6, =WL7                    @ r6       =  window_l[7]  == window_s[2]
+    movs    r10, r10, lsr #28
+    adc     lr, r10, r11, lsl #4        @ lr = bits[59..28] of windowed x29
+
+    smull   r10, r11, r5, r2            @ r10..r11 = (window_l[4] * (x[25] == x[28]))
+    ldr     r7, =WL10                   @ r7       =  window_l[10] == window_s[3]
+    movs    r10, r10, lsr #28
+    adc     r12, r10, r11, lsl #4       @ r12 = bits[59..28] of windowed x28
+
+    smull   r10, r11, r6, r3            @ r10..r11 = (window_l[7] * (x[26] == x[27]))
+    ldr     r8, =WL13                   @ r8       =  window_l[13] == window_s[4]
+    movs    r10, r10, lsr #28
+    adc     r4, r10, r11, lsl #4        @ r4 = bits[59..28] of windowed x27
+
+    smull   r10, r11, r7, r3            @ r10..r11 = (window_l[10] * x[26])
+    ldr     r9, =WL16                   @ r9       =  window_l[16] == window_s[5]
+    movs    r10, r10, lsr #28
+    adc     r3, r10, r11, lsl #4        @ r3 = bits[59..28] of windowed x26
+
+    smull   r10, r11, r8, r2            @ r10..r11 = (window_l[13] * x[25])
+    ldr     r5, =0x00
+    movs    r10, r10, lsr #28
+    adc     r2, r10, r11, lsl #4        @ r2 = bits[59..28] of windowed x25
+
+    smull   r10, r11, r9, r0            @ r10..r11 = (window_l[16] * x[24])
+    ldr     r6, =0x00
+    movs    r10, r10, lsr #28
+    adc     r0, r10, r11, lsl #4        @ r0 = bits[59..28] of windowed x24
+
+    stmia   r1!, { r0, r2, r3, r4, r12, lr }    @ store windowed x[24] .. x[29]
+
+    ldr     r7, =0x00
+    ldr     r8, =0x00
+    ldr     r9, =0x00
+    ldr     r10, =0x00
+
+    stmia   r1!, { r5 - r10 }           @ store windowed x[30] .. x[35]
+
+    @----
+    @ NB there are 2 possible exits from this function - this is only one of them
+    @----
+
+    add     sp, sp, #(21*4)             @ return stack frame
+    ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
+
+    @----
+    @END
+    @----
+
diff --git a/code/libmad/imdct_s.dat b/code/libmad/imdct_s.dat
new file mode 100644
index 00000000..476710ea
--- /dev/null
+++ b/code/libmad/imdct_s.dat
@@ -0,0 +1,62 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: imdct_s.dat,v 1.8 2004/01/23 09:41:32 rob Exp $
+ */
+
+  /*  0 */  {  MAD_F(0x09bd7ca0) /*  0.608761429 */,
+	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
+	      -MAD_F(0x0216a2a2) /* -0.130526192 */,
+	       MAD_F(0x0fdcf549) /*  0.991444861 */,
+	      -MAD_F(0x061f78aa) /* -0.382683432 */,
+	      -MAD_F(0x0cb19346) /* -0.793353340 */ },
+
+  /*  6 */  { -MAD_F(0x0cb19346) /* -0.793353340 */,
+	       MAD_F(0x061f78aa) /*  0.382683432 */,
+	       MAD_F(0x0fdcf549) /*  0.991444861 */,
+	       MAD_F(0x0216a2a2) /*  0.130526192 */,
+	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
+	      -MAD_F(0x09bd7ca0) /* -0.608761429 */ },
+
+  /*  1 */  {  MAD_F(0x061f78aa) /*  0.382683432 */,
+	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
+	       MAD_F(0x0ec835e8) /*  0.923879533 */,
+	      -MAD_F(0x061f78aa) /* -0.382683432 */,
+	      -MAD_F(0x061f78aa) /* -0.382683432 */,
+	       MAD_F(0x0ec835e8) /*  0.923879533 */ },
+
+  /*  7 */  { -MAD_F(0x0ec835e8) /* -0.923879533 */,
+	      -MAD_F(0x061f78aa) /* -0.382683432 */,
+	       MAD_F(0x061f78aa) /*  0.382683432 */,
+	       MAD_F(0x0ec835e8) /*  0.923879533 */,
+	       MAD_F(0x0ec835e8) /*  0.923879533 */,
+	       MAD_F(0x061f78aa) /*  0.382683432 */ },
+
+  /*  2 */  {  MAD_F(0x0216a2a2) /*  0.130526192 */,
+	      -MAD_F(0x061f78aa) /* -0.382683432 */,
+	       MAD_F(0x09bd7ca0) /*  0.608761429 */,
+	      -MAD_F(0x0cb19346) /* -0.793353340 */,
+	       MAD_F(0x0ec835e8) /*  0.923879533 */,
+	      -MAD_F(0x0fdcf549) /* -0.991444861 */ },
+
+  /*  8 */  { -MAD_F(0x0fdcf549) /* -0.991444861 */,
+	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
+	      -MAD_F(0x0cb19346) /* -0.793353340 */,
+	      -MAD_F(0x09bd7ca0) /* -0.608761429 */,
+	      -MAD_F(0x061f78aa) /* -0.382683432 */,
+	      -MAD_F(0x0216a2a2) /* -0.130526192 */ }
diff --git a/code/libmad/layer12.c b/code/libmad/layer12.c
new file mode 100644
index 00000000..a334a27e
--- /dev/null
+++ b/code/libmad/layer12.c
@@ -0,0 +1,621 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: layer12.c,v 1.17 2004/02/05 09:02:39 rob Exp $
+ */
+
+# include "global.h"
+
+# ifdef HAVE_LIMITS_H
+#  include <limits.h>
+# else
+#  define CHAR_BIT  8
+# endif
+
+# include "mad.h"
+# include "layer12.h"
+
+/*
+ * scalefactor table
+ * used in both Layer I and Layer II decoding
+ */
+static
+mad_fixed_t const sf_table[64] = {
+# include "sf_table.dat"
+};
+
+/* --- Layer I ------------------------------------------------------------- */
+
+/* linear scaling table */
+static
+mad_fixed_t const linear_table[14] = {
+  MAD_F(0x15555555),  /* 2^2  / (2^2  - 1) == 1.33333333333333 */
+  MAD_F(0x12492492),  /* 2^3  / (2^3  - 1) == 1.14285714285714 */
+  MAD_F(0x11111111),  /* 2^4  / (2^4  - 1) == 1.06666666666667 */
+  MAD_F(0x10842108),  /* 2^5  / (2^5  - 1) == 1.03225806451613 */
+  MAD_F(0x10410410),  /* 2^6  / (2^6  - 1) == 1.01587301587302 */
+  MAD_F(0x10204081),  /* 2^7  / (2^7  - 1) == 1.00787401574803 */
+  MAD_F(0x10101010),  /* 2^8  / (2^8  - 1) == 1.00392156862745 */
+  MAD_F(0x10080402),  /* 2^9  / (2^9  - 1) == 1.00195694716243 */
+  MAD_F(0x10040100),  /* 2^10 / (2^10 - 1) == 1.00097751710655 */
+  MAD_F(0x10020040),  /* 2^11 / (2^11 - 1) == 1.00048851978505 */
+  MAD_F(0x10010010),  /* 2^12 / (2^12 - 1) == 1.00024420024420 */
+  MAD_F(0x10008004),  /* 2^13 / (2^13 - 1) == 1.00012208521548 */
+  MAD_F(0x10004001),  /* 2^14 / (2^14 - 1) == 1.00006103888177 */
+  MAD_F(0x10002000)   /* 2^15 / (2^15 - 1) == 1.00003051850948 */
+};
+
+/*
+ * NAME:	I_sample()
+ * DESCRIPTION:	decode one requantized Layer I sample from a bitstream
+ */
+static
+mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb, struct mad_stream *stream)
+{
+  mad_fixed_t sample;
+  struct mad_bitptr frameend_ptr;
+
+  mad_bit_init(&frameend_ptr, stream->next_frame);
+
+  if (mad_bit_length(ptr, &frameend_ptr) < nb) {
+    stream->error = MAD_ERROR_LOSTSYNC;
+    stream->sync = 0;
+    return 0;
+  }
+  sample = mad_bit_read(ptr, nb);
+
+  /* invert most significant bit, extend sign, then scale to fixed format */
+
+  sample ^= 1 << (nb - 1);
+  sample |= -(sample & (1 << (nb - 1)));
+
+  sample <<= MAD_F_FRACBITS - (nb - 1);
+
+  /* requantize the sample */
+
+  /* s'' = (2^nb / (2^nb - 1)) * (s''' + 2^(-nb + 1)) */
+
+  sample += MAD_F_ONE >> (nb - 1);
+
+  return mad_f_mul(sample, linear_table[nb - 2]);
+
+  /* s' = factor * s'' */
+  /* (to be performed by caller) */
+}
+
+/*
+ * NAME:	layer->I()
+ * DESCRIPTION:	decode a single Layer I frame
+ */
+int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+{
+  struct mad_header *header = &frame->header;
+  unsigned int nch, bound, ch, s, sb, nb;
+  unsigned char allocation[2][32], scalefactor[2][32];
+  struct mad_bitptr bufend_ptr, frameend_ptr;
+
+  mad_bit_init(&bufend_ptr, stream->bufend);
+  mad_bit_init(&frameend_ptr, stream->next_frame);
+
+  nch = MAD_NCHANNELS(header);
+
+  bound = 32;
+  if (header->mode == MAD_MODE_JOINT_STEREO) {
+    header->flags |= MAD_FLAG_I_STEREO;
+    bound = 4 + header->mode_extension * 4;
+  }
+
+  /* check CRC word */
+
+  if (header->flags & MAD_FLAG_PROTECTION) {
+    if (mad_bit_length(&stream->ptr, &bufend_ptr)
+		< 4 * (bound * nch + (32 - bound))) {
+      stream->error = MAD_ERROR_BADCRC;
+      return -1;
+    }
+    header->crc_check =
+      mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)),
+		  header->crc_check);
+
+    if (header->crc_check != header->crc_target &&
+	!(frame->options & MAD_OPTION_IGNORECRC)) {
+      stream->error = MAD_ERROR_BADCRC;
+      return -1;
+    }
+  }
+
+  /* decode bit allocations */
+
+  for (sb = 0; sb < bound; ++sb) {
+    for (ch = 0; ch < nch; ++ch) {
+      if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
+	stream->error = MAD_ERROR_LOSTSYNC;
+	stream->sync = 0;
+	return -1;
+      }
+      nb = mad_bit_read(&stream->ptr, 4);
+
+      if (nb == 15) {
+	stream->error = MAD_ERROR_BADBITALLOC;
+	return -1;
+      }
+
+      allocation[ch][sb] = nb ? nb + 1 : 0;
+    }
+  }
+
+  for (sb = bound; sb < 32; ++sb) {
+    if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
+      stream->error = MAD_ERROR_LOSTSYNC;
+      stream->sync = 0;
+      return -1;
+    }
+    nb = mad_bit_read(&stream->ptr, 4);
+
+    if (nb == 15) {
+      stream->error = MAD_ERROR_BADBITALLOC;
+      return -1;
+    }
+
+    allocation[0][sb] =
+    allocation[1][sb] = nb ? nb + 1 : 0;
+  }
+
+  /* decode scalefactors */
+
+  for (sb = 0; sb < 32; ++sb) {
+    for (ch = 0; ch < nch; ++ch) {
+      if (allocation[ch][sb]) {
+        if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+	  return -1;
+	}
+	scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
+
+# if defined(OPT_STRICT)
+	/*
+	 * Scalefactor index 63 does not appear in Table B.1 of
+	 * ISO/IEC 11172-3. Nonetheless, other implementations accept it,
+	 * so we only reject it if OPT_STRICT is defined.
+	 */
+	if (scalefactor[ch][sb] == 63) {
+	  stream->error = MAD_ERROR_BADSCALEFACTOR;
+	  return -1;
+	}
+# endif
+      }
+    }
+  }
+
+  /* decode samples */
+
+  for (s = 0; s < 12; ++s) {
+    for (sb = 0; sb < bound; ++sb) {
+      for (ch = 0; ch < nch; ++ch) {
+	nb = allocation[ch][sb];
+	frame->sbsample[ch][s][sb] = nb ?
+	  mad_f_mul(I_sample(&stream->ptr, nb, stream),
+		    sf_table[scalefactor[ch][sb]]) : 0;
+	if (stream->error != 0)
+	  return -1;
+      }
+    }
+
+    for (sb = bound; sb < 32; ++sb) {
+      if ((nb = allocation[0][sb])) {
+	mad_fixed_t sample;
+
+	if (mad_bit_length(&stream->ptr, &frameend_ptr) < nb) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+          return -1;
+	}
+	sample = I_sample(&stream->ptr, nb, stream);
+        if (stream->error != 0)
+	  return -1;
+
+	for (ch = 0; ch < nch; ++ch) {
+	  frame->sbsample[ch][s][sb] =
+	    mad_f_mul(sample, sf_table[scalefactor[ch][sb]]);
+	}
+      }
+      else {
+	for (ch = 0; ch < nch; ++ch)
+	  frame->sbsample[ch][s][sb] = 0;
+      }
+    }
+  }
+
+  return 0;
+}
+
+/* --- Layer II ------------------------------------------------------------ */
+
+/* possible quantization per subband table */
+static
+struct {
+  unsigned int sblimit;
+  unsigned char const offsets[30];
+} const sbquant_table[5] = {
+  /* ISO/IEC 11172-3 Table B.2a */
+  { 27, { 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3,	/* 0 */
+	  3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0 } },
+  /* ISO/IEC 11172-3 Table B.2b */
+  { 30, { 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3,	/* 1 */
+	  3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0 } },
+  /* ISO/IEC 11172-3 Table B.2c */
+  {  8, { 5, 5, 2, 2, 2, 2, 2, 2 } },				/* 2 */
+  /* ISO/IEC 11172-3 Table B.2d */
+  { 12, { 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } },		/* 3 */
+  /* ISO/IEC 13818-3 Table B.1 */
+  { 30, { 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1,	/* 4 */
+	  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } }
+};
+
+/* bit allocation table */
+static
+struct {
+  unsigned short nbal;
+  unsigned short offset;
+} const bitalloc_table[8] = {
+  { 2, 0 },  /* 0 */
+  { 2, 3 },  /* 1 */
+  { 3, 3 },  /* 2 */
+  { 3, 1 },  /* 3 */
+  { 4, 2 },  /* 4 */
+  { 4, 3 },  /* 5 */
+  { 4, 4 },  /* 6 */
+  { 4, 5 }   /* 7 */
+};
+
+/* offsets into quantization class table */
+static
+unsigned char const offset_table[6][15] = {
+  { 0, 1, 16                                             },  /* 0 */
+  { 0, 1,  2, 3, 4, 5, 16                                },  /* 1 */
+  { 0, 1,  2, 3, 4, 5,  6, 7,  8,  9, 10, 11, 12, 13, 14 },  /* 2 */
+  { 0, 1,  3, 4, 5, 6,  7, 8,  9, 10, 11, 12, 13, 14, 15 },  /* 3 */
+  { 0, 1,  2, 3, 4, 5,  6, 7,  8,  9, 10, 11, 12, 13, 16 },  /* 4 */
+  { 0, 2,  4, 5, 6, 7,  8, 9, 10, 11, 12, 13, 14, 15, 16 }   /* 5 */
+};
+
+/* quantization class table */
+static
+struct quantclass {
+  unsigned short nlevels;
+  unsigned char group;
+  unsigned char bits;
+  mad_fixed_t C;
+  mad_fixed_t D;
+} const qc_table[17] = {
+# include "qc_table.dat"
+};
+
+/*
+ * NAME:	II_samples()
+ * DESCRIPTION:	decode three requantized Layer II samples from a bitstream
+ */
+static
+void II_samples(struct mad_bitptr *ptr,
+		struct quantclass const *quantclass,
+		mad_fixed_t output[3], struct mad_stream *stream)
+{
+  unsigned int nb, s, sample[3];
+  struct mad_bitptr frameend_ptr;
+
+  mad_bit_init(&frameend_ptr, stream->next_frame);
+
+  if ((nb = quantclass->group)) {
+    unsigned int c, nlevels;
+
+    if (mad_bit_length(ptr, &frameend_ptr) < quantclass->bits) {
+      stream->error = MAD_ERROR_LOSTSYNC;
+      stream->sync = 0;
+      return;
+    }
+    /* degrouping */
+    c = mad_bit_read(ptr, quantclass->bits);
+    nlevels = quantclass->nlevels;
+
+    for (s = 0; s < 3; ++s) {
+      sample[s] = c % nlevels;
+      c /= nlevels;
+    }
+  }
+  else {
+    nb = quantclass->bits;
+
+    for (s = 0; s < 3; ++s) {
+      if (mad_bit_length(ptr, &frameend_ptr) < nb) {
+	stream->error = MAD_ERROR_LOSTSYNC;
+	stream->sync = 0;
+	return;
+      }
+      sample[s] = mad_bit_read(ptr, nb);
+    }
+  }
+
+  for (s = 0; s < 3; ++s) {
+    mad_fixed_t requantized;
+
+    /* invert most significant bit, extend sign, then scale to fixed format */
+
+    requantized  = sample[s] ^ (1 << (nb - 1));
+    requantized |= -(requantized & (1 << (nb - 1)));
+
+    requantized <<= MAD_F_FRACBITS - (nb - 1);
+
+    /* requantize the sample */
+
+    /* s'' = C * (s''' + D) */
+
+    output[s] = mad_f_mul(requantized + quantclass->D, quantclass->C);
+
+    /* s' = factor * s'' */
+    /* (to be performed by caller) */
+  }
+}
+
+/*
+ * NAME:	layer->II()
+ * DESCRIPTION:	decode a single Layer II frame
+ */
+int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+{
+  struct mad_header *header = &frame->header;
+  struct mad_bitptr start;
+  unsigned int index, sblimit, nbal, nch, bound, gr, ch, s, sb;
+  unsigned char const *offsets;
+  unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3];
+  mad_fixed_t samples[3];
+  struct mad_bitptr frameend_ptr;
+
+  mad_bit_init(&frameend_ptr, stream->next_frame);
+
+  nch = MAD_NCHANNELS(header);
+
+  if (header->flags & MAD_FLAG_LSF_EXT)
+    index = 4;
+  else if (header->flags & MAD_FLAG_FREEFORMAT)
+    goto freeformat;
+  else {
+    unsigned long bitrate_per_channel;
+
+    bitrate_per_channel = header->bitrate;
+    if (nch == 2) {
+      bitrate_per_channel /= 2;
+
+# if defined(OPT_STRICT)
+      /*
+       * ISO/IEC 11172-3 allows only single channel mode for 32, 48, 56, and
+       * 80 kbps bitrates in Layer II, but some encoders ignore this
+       * restriction. We enforce it if OPT_STRICT is defined.
+       */
+      if (bitrate_per_channel <= 28000 || bitrate_per_channel == 40000) {
+	stream->error = MAD_ERROR_BADMODE;
+	return -1;
+      }
+# endif
+    }
+    else {  /* nch == 1 */
+      if (bitrate_per_channel > 192000) {
+	/*
+	 * ISO/IEC 11172-3 does not allow single channel mode for 224, 256,
+	 * 320, or 384 kbps bitrates in Layer II.
+	 */
+	stream->error = MAD_ERROR_BADMODE;
+	return -1;
+      }
+    }
+
+    if (bitrate_per_channel <= 48000)
+      index = (header->samplerate == 32000) ? 3 : 2;
+    else if (bitrate_per_channel <= 80000)
+      index = 0;
+    else {
+    freeformat:
+      index = (header->samplerate == 48000) ? 0 : 1;
+    }
+  }
+
+  sblimit = sbquant_table[index].sblimit;
+  offsets = sbquant_table[index].offsets;
+
+  bound = 32;
+  if (header->mode == MAD_MODE_JOINT_STEREO) {
+    header->flags |= MAD_FLAG_I_STEREO;
+    bound = 4 + header->mode_extension * 4;
+  }
+
+  if (bound > sblimit)
+    bound = sblimit;
+
+  start = stream->ptr;
+
+  /* decode bit allocations */
+
+  for (sb = 0; sb < bound; ++sb) {
+    nbal = bitalloc_table[offsets[sb]].nbal;
+
+    for (ch = 0; ch < nch; ++ch) {
+      if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
+	stream->error = MAD_ERROR_LOSTSYNC;
+	stream->sync = 0;
+	return -1;
+      }
+      allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
+    }
+  }
+
+  for (sb = bound; sb < sblimit; ++sb) {
+    nbal = bitalloc_table[offsets[sb]].nbal;
+
+    if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
+      stream->error = MAD_ERROR_LOSTSYNC;
+      stream->sync = 0;
+      return -1;
+    }
+    allocation[0][sb] =
+    allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
+  }
+
+  /* decode scalefactor selection info */
+
+  for (sb = 0; sb < sblimit; ++sb) {
+    for (ch = 0; ch < nch; ++ch) {
+      if (allocation[ch][sb]) {
+	if (mad_bit_length(&stream->ptr, &frameend_ptr) < 2) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+	  return -1;
+	}
+	scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
+      }
+    }
+  }
+
+  /* check CRC word */
+
+  if (header->flags & MAD_FLAG_PROTECTION) {
+    header->crc_check =
+      mad_bit_crc(start, mad_bit_length(&start, &stream->ptr),
+		  header->crc_check);
+
+    if (header->crc_check != header->crc_target &&
+	!(frame->options & MAD_OPTION_IGNORECRC)) {
+      stream->error = MAD_ERROR_BADCRC;
+      return -1;
+    }
+  }
+
+  /* decode scalefactors */
+
+  for (sb = 0; sb < sblimit; ++sb) {
+    for (ch = 0; ch < nch; ++ch) {
+      if (allocation[ch][sb]) {
+	if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+	  return -1;
+	}
+	scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
+
+	switch (scfsi[ch][sb]) {
+	case 2:
+	  scalefactor[ch][sb][2] =
+	  scalefactor[ch][sb][1] =
+	  scalefactor[ch][sb][0];
+	  break;
+
+	case 0:
+	  if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	    stream->error = MAD_ERROR_LOSTSYNC;
+	    stream->sync = 0;
+	    return -1;
+	  }
+	  scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
+	  /* fall through */
+
+	case 1:
+	case 3:
+	  if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	    stream->error = MAD_ERROR_LOSTSYNC;
+	    stream->sync = 0;
+	    return -1;
+	  }
+	  scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
+	}
+
+	if (scfsi[ch][sb] & 1)
+	  scalefactor[ch][sb][1] = scalefactor[ch][sb][scfsi[ch][sb] - 1];
+
+# if defined(OPT_STRICT)
+	/*
+	 * Scalefactor index 63 does not appear in Table B.1 of
+	 * ISO/IEC 11172-3. Nonetheless, other implementations accept it,
+	 * so we only reject it if OPT_STRICT is defined.
+	 */
+	if (scalefactor[ch][sb][0] == 63 ||
+	    scalefactor[ch][sb][1] == 63 ||
+	    scalefactor[ch][sb][2] == 63) {
+	  stream->error = MAD_ERROR_BADSCALEFACTOR;
+	  return -1;
+	}
+# endif
+      }
+    }
+  }
+
+  /* decode samples */
+
+  for (gr = 0; gr < 12; ++gr) {
+    for (sb = 0; sb < bound; ++sb) {
+      for (ch = 0; ch < nch; ++ch) {
+	if ((index = allocation[ch][sb])) {
+	  index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+
+	  II_samples(&stream->ptr, &qc_table[index], samples, stream);
+	  if (stream->error != 0)
+            return -1;
+
+	  for (s = 0; s < 3; ++s) {
+	    frame->sbsample[ch][3 * gr + s][sb] =
+	      mad_f_mul(samples[s], sf_table[scalefactor[ch][sb][gr / 4]]);
+	  }
+	}
+	else {
+	  for (s = 0; s < 3; ++s)
+	    frame->sbsample[ch][3 * gr + s][sb] = 0;
+	}
+      }
+    }
+
+    for (sb = bound; sb < sblimit; ++sb) {
+      if ((index = allocation[0][sb])) {
+	index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+
+	II_samples(&stream->ptr, &qc_table[index], samples, stream);
+	if (stream->error != 0)
+          return -1;
+
+	for (ch = 0; ch < nch; ++ch) {
+	  for (s = 0; s < 3; ++s) {
+	    frame->sbsample[ch][3 * gr + s][sb] =
+	      mad_f_mul(samples[s], sf_table[scalefactor[ch][sb][gr / 4]]);
+	  }
+	}
+      }
+      else {
+	for (ch = 0; ch < nch; ++ch) {
+	  for (s = 0; s < 3; ++s)
+	    frame->sbsample[ch][3 * gr + s][sb] = 0;
+	}
+      }
+    }
+
+    for (ch = 0; ch < nch; ++ch) {
+      for (s = 0; s < 3; ++s) {
+	for (sb = sblimit; sb < 32; ++sb)
+	  frame->sbsample[ch][3 * gr + s][sb] = 0;
+      }
+    }
+  }
+
+  return 0;
+}
diff --git a/code/libmad/layer12.h b/code/libmad/layer12.h
new file mode 100644
index 00000000..8caa3f75
--- /dev/null
+++ b/code/libmad/layer12.h
@@ -0,0 +1,30 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: layer12.h,v 1.10 2004/01/23 09:41:32 rob Exp $
+ */
+
+# ifndef LIBMAD_LAYER12_H
+# define LIBMAD_LAYER12_H
+
+# include "mad.h"
+
+int mad_layer_I(struct mad_stream *, struct mad_frame *);
+int mad_layer_II(struct mad_stream *, struct mad_frame *);
+
+# endif
diff --git a/code/libmad/layer3.c b/code/libmad/layer3.c
new file mode 100644
index 00000000..7f18fd72
--- /dev/null
+++ b/code/libmad/layer3.c
@@ -0,0 +1,2779 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: layer3.c,v 1.43 2004/01/23 09:41:32 rob Exp $
+ */
+
+# include "global.h"
+
+# include <stdlib.h>
+# include <string.h>
+
+# ifdef HAVE_ASSERT_H
+#  include <assert.h>
+# endif
+
+# ifdef HAVE_LIMITS_H
+#  include <limits.h>
+# else
+#  define CHAR_BIT  8
+# endif
+
+# include "mad.h"
+# include "huffman.h"
+# include "layer3.h"
+
+/* --- Layer III ----------------------------------------------------------- */
+
+enum {
+  count1table_select = 0x01,
+  scalefac_scale     = 0x02,
+  preflag	     = 0x04,
+  mixed_block_flag   = 0x08
+};
+
+enum {
+  I_STEREO  = 0x1,
+  MS_STEREO = 0x2
+};
+
+struct sideinfo {
+  unsigned int main_data_begin;
+  unsigned int private_bits;
+
+  unsigned char scfsi[2];
+
+  struct granule {
+    struct channel {
+      /* from side info */
+      unsigned short part2_3_length;
+      unsigned short big_values;
+      unsigned short global_gain;
+      unsigned short scalefac_compress;
+
+      unsigned char flags;
+      unsigned char block_type;
+      unsigned char table_select[3];
+      unsigned char subblock_gain[3];
+      unsigned char region0_count;
+      unsigned char region1_count;
+
+      /* from main_data */
+      unsigned char scalefac[39];	/* scalefac_l and/or scalefac_s */
+    } ch[2];
+  } gr[2];
+};
+
+/*
+ * scalefactor bit lengths
+ * derived from section 2.4.2.7 of ISO/IEC 11172-3
+ */
+static
+struct {
+  unsigned char slen1;
+  unsigned char slen2;
+} const sflen_table[16] = {
+  { 0, 0 }, { 0, 1 }, { 0, 2 }, { 0, 3 },
+  { 3, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
+  { 2, 1 }, { 2, 2 }, { 2, 3 }, { 3, 1 },
+  { 3, 2 }, { 3, 3 }, { 4, 2 }, { 4, 3 }
+};
+
+/*
+ * number of LSF scalefactor band values
+ * derived from section 2.4.3.2 of ISO/IEC 13818-3
+ */
+static
+unsigned char const nsfb_table[6][3][4] = {
+  { {  6,  5,  5, 5 },
+    {  9,  9,  9, 9 },
+    {  6,  9,  9, 9 } },
+
+  { {  6,  5,  7, 3 },
+    {  9,  9, 12, 6 },
+    {  6,  9, 12, 6 } },
+
+  { { 11, 10,  0, 0 },
+    { 18, 18,  0, 0 },
+    { 15, 18,  0, 0 } },
+
+  { {  7,  7,  7, 0 },
+    { 12, 12, 12, 0 },
+    {  6, 15, 12, 0 } },
+
+  { {  6,  6,  6, 3 },
+    { 12,  9,  9, 6 },
+    {  6, 12,  9, 6 } },
+
+  { {  8,  8,  5, 0 },
+    { 15, 12,  9, 0 },
+    {  6, 18,  9, 0 } }
+};
+
+/*
+ * MPEG-1 scalefactor band widths
+ * derived from Table B.8 of ISO/IEC 11172-3
+ */
+static
+unsigned char const sfb_48000_long[] = {
+   4,  4,  4,  4,  4,  4,  6,  6,  6,   8,  10,
+  12, 16, 18, 22, 28, 34, 40, 46, 54,  54, 192
+};
+
+static
+unsigned char const sfb_44100_long[] = {
+   4,  4,  4,  4,  4,  4,  6,  6,  8,   8,  10,
+  12, 16, 20, 24, 28, 34, 42, 50, 54,  76, 158
+};
+
+static
+unsigned char const sfb_32000_long[] = {
+   4,  4,  4,  4,  4,  4,  6,  6,  8,  10,  12,
+  16, 20, 24, 30, 38, 46, 56, 68, 84, 102,  26
+};
+
+static
+unsigned char const sfb_48000_short[] = {
+   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
+   6,  6,  6,  6,  6, 10, 10, 10, 12, 12, 12, 14, 14,
+  14, 16, 16, 16, 20, 20, 20, 26, 26, 26, 66, 66, 66
+};
+
+static
+unsigned char const sfb_44100_short[] = {
+   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
+   6,  6,  8,  8,  8, 10, 10, 10, 12, 12, 12, 14, 14,
+  14, 18, 18, 18, 22, 22, 22, 30, 30, 30, 56, 56, 56
+};
+
+static
+unsigned char const sfb_32000_short[] = {
+   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
+   6,  6,  8,  8,  8, 12, 12, 12, 16, 16, 16, 20, 20,
+  20, 26, 26, 26, 34, 34, 34, 42, 42, 42, 12, 12, 12
+};
+
+static
+unsigned char const sfb_48000_mixed[] = {
+  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
+  /* short */  4,  4,  4,  6,  6,  6,  6,  6,  6, 10,
+              10, 10, 12, 12, 12, 14, 14, 14, 16, 16,
+              16, 20, 20, 20, 26, 26, 26, 66, 66, 66
+};
+
+static
+unsigned char const sfb_44100_mixed[] = {
+  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
+  /* short */  4,  4,  4,  6,  6,  6,  8,  8,  8, 10,
+              10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
+              18, 22, 22, 22, 30, 30, 30, 56, 56, 56
+};
+
+static
+unsigned char const sfb_32000_mixed[] = {
+  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
+  /* short */  4,  4,  4,  6,  6,  6,  8,  8,  8, 12,
+              12, 12, 16, 16, 16, 20, 20, 20, 26, 26,
+              26, 34, 34, 34, 42, 42, 42, 12, 12, 12
+};
+
+/*
+ * MPEG-2 scalefactor band widths
+ * derived from Table B.2 of ISO/IEC 13818-3
+ */
+static
+unsigned char const sfb_24000_long[] = {
+   6,  6,  6,  6,  6,  6,  8, 10, 12,  14,  16,
+  18, 22, 26, 32, 38, 46, 54, 62, 70,  76,  36
+};
+
+static
+unsigned char const sfb_22050_long[] = {
+   6,  6,  6,  6,  6,  6,  8, 10, 12,  14,  16,
+  20, 24, 28, 32, 38, 46, 52, 60, 68,  58,  54
+};
+
+# define sfb_16000_long  sfb_22050_long
+
+static
+unsigned char const sfb_24000_short[] = {
+   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  8,
+   8,  8, 10, 10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
+  18, 24, 24, 24, 32, 32, 32, 44, 44, 44, 12, 12, 12
+};
+
+static
+unsigned char const sfb_22050_short[] = {
+   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,
+   6,  6,  8,  8,  8, 10, 10, 10, 14, 14, 14, 18, 18,
+  18, 26, 26, 26, 32, 32, 32, 42, 42, 42, 18, 18, 18
+};
+
+static
+unsigned char const sfb_16000_short[] = {
+   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  8,
+   8,  8, 10, 10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
+  18, 24, 24, 24, 30, 30, 30, 40, 40, 40, 18, 18, 18
+};
+
+static
+unsigned char const sfb_24000_mixed[] = {
+  /* long */   6,  6,  6,  6,  6,  6,
+  /* short */  6,  6,  6,  8,  8,  8, 10, 10, 10, 12,
+              12, 12, 14, 14, 14, 18, 18, 18, 24, 24,
+              24, 32, 32, 32, 44, 44, 44, 12, 12, 12
+};
+
+static
+unsigned char const sfb_22050_mixed[] = {
+  /* long */   6,  6,  6,  6,  6,  6,
+  /* short */  6,  6,  6,  6,  6,  6,  8,  8,  8, 10,
+              10, 10, 14, 14, 14, 18, 18, 18, 26, 26,
+              26, 32, 32, 32, 42, 42, 42, 18, 18, 18
+};
+
+static
+unsigned char const sfb_16000_mixed[] = {
+  /* long */   6,  6,  6,  6,  6,  6,
+  /* short */  6,  6,  6,  8,  8,  8, 10, 10, 10, 12,
+              12, 12, 14, 14, 14, 18, 18, 18, 24, 24,
+              24, 30, 30, 30, 40, 40, 40, 18, 18, 18
+};
+
+/*
+ * MPEG 2.5 scalefactor band widths
+ * derived from public sources
+ */
+# define sfb_12000_long  sfb_16000_long
+# define sfb_11025_long  sfb_12000_long
+
+static
+unsigned char const sfb_8000_long[] = {
+  12, 12, 12, 12, 12, 12, 16, 20, 24,  28,  32,
+  40, 48, 56, 64, 76, 90,  2,  2,  2,   2,   2
+};
+
+# define sfb_12000_short  sfb_16000_short
+# define sfb_11025_short  sfb_12000_short
+
+static
+unsigned char const sfb_8000_short[] = {
+   8,  8,  8,  8,  8,  8,  8,  8,  8, 12, 12, 12, 16,
+  16, 16, 20, 20, 20, 24, 24, 24, 28, 28, 28, 36, 36,
+  36,  2,  2,  2,  2,  2,  2,  2,  2,  2, 26, 26, 26
+};
+
+# define sfb_12000_mixed  sfb_16000_mixed
+# define sfb_11025_mixed  sfb_12000_mixed
+
+/* the 8000 Hz short block scalefactor bands do not break after
+   the first 36 frequency lines, so this is probably wrong */
+static
+unsigned char const sfb_8000_mixed[] = {
+  /* long */  12, 12, 12,
+  /* short */  4,  4,  4,  8,  8,  8, 12, 12, 12, 16, 16, 16,
+              20, 20, 20, 24, 24, 24, 28, 28, 28, 36, 36, 36,
+               2,  2,  2,  2,  2,  2,  2,  2,  2, 26, 26, 26
+};
+
+static
+struct {
+  unsigned char const *l;
+  unsigned char const *s;
+  unsigned char const *m;
+} const sfbwidth_table[9] = {
+  { sfb_48000_long, sfb_48000_short, sfb_48000_mixed },
+  { sfb_44100_long, sfb_44100_short, sfb_44100_mixed },
+  { sfb_32000_long, sfb_32000_short, sfb_32000_mixed },
+  { sfb_24000_long, sfb_24000_short, sfb_24000_mixed },
+  { sfb_22050_long, sfb_22050_short, sfb_22050_mixed },
+  { sfb_16000_long, sfb_16000_short, sfb_16000_mixed },
+  { sfb_12000_long, sfb_12000_short, sfb_12000_mixed },
+  { sfb_11025_long, sfb_11025_short, sfb_11025_mixed },
+  {  sfb_8000_long,  sfb_8000_short,  sfb_8000_mixed }
+};
+
+/*
+ * scalefactor band preemphasis (used only when preflag is set)
+ * derived from Table B.6 of ISO/IEC 11172-3
+ */
+static
+unsigned char const pretab[22] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 2, 0
+};
+
+/*
+ * table for requantization
+ *
+ * rq_table[x].mantissa * 2^(rq_table[x].exponent) = x^(4/3)
+ */
+static
+struct fixedfloat {
+  unsigned long mantissa  : 27;
+  unsigned short exponent :  5;
+} const rq_table[8207] = {
+# include "rq_table.dat"
+};
+
+/*
+ * fractional powers of two
+ * used for requantization and joint stereo decoding
+ *
+ * root_table[3 + x] = 2^(x/4)
+ */
+static
+mad_fixed_t const root_table[7] = {
+  MAD_F(0x09837f05) /* 2^(-3/4) == 0.59460355750136 */,
+  MAD_F(0x0b504f33) /* 2^(-2/4) == 0.70710678118655 */,
+  MAD_F(0x0d744fcd) /* 2^(-1/4) == 0.84089641525371 */,
+  MAD_F(0x10000000) /* 2^( 0/4) == 1.00000000000000 */,
+  MAD_F(0x1306fe0a) /* 2^(+1/4) == 1.18920711500272 */,
+  MAD_F(0x16a09e66) /* 2^(+2/4) == 1.41421356237310 */,
+  MAD_F(0x1ae89f99) /* 2^(+3/4) == 1.68179283050743 */
+};
+
+/*
+ * coefficients for aliasing reduction
+ * derived from Table B.9 of ISO/IEC 11172-3
+ *
+ *  c[]  = { -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037 }
+ * cs[i] =    1 / sqrt(1 + c[i]^2)
+ * ca[i] = c[i] / sqrt(1 + c[i]^2)
+ */
+static
+mad_fixed_t const cs[8] = {
+  +MAD_F(0x0db84a81) /* +0.857492926 */, +MAD_F(0x0e1b9d7f) /* +0.881741997 */,
+  +MAD_F(0x0f31adcf) /* +0.949628649 */, +MAD_F(0x0fbba815) /* +0.983314592 */,
+  +MAD_F(0x0feda417) /* +0.995517816 */, +MAD_F(0x0ffc8fc8) /* +0.999160558 */,
+  +MAD_F(0x0fff964c) /* +0.999899195 */, +MAD_F(0x0ffff8d3) /* +0.999993155 */
+};
+
+static
+mad_fixed_t const ca[8] = {
+  -MAD_F(0x083b5fe7) /* -0.514495755 */, -MAD_F(0x078c36d2) /* -0.471731969 */,
+  -MAD_F(0x05039814) /* -0.313377454 */, -MAD_F(0x02e91dd1) /* -0.181913200 */,
+  -MAD_F(0x0183603a) /* -0.094574193 */, -MAD_F(0x00a7cb87) /* -0.040965583 */,
+  -MAD_F(0x003a2847) /* -0.014198569 */, -MAD_F(0x000f27b4) /* -0.003699975 */
+};
+
+/*
+ * IMDCT coefficients for short blocks
+ * derived from section 2.4.3.4.10.2 of ISO/IEC 11172-3
+ *
+ * imdct_s[i/even][k] = cos((PI / 24) * (2 *       (i / 2) + 7) * (2 * k + 1))
+ * imdct_s[i /odd][k] = cos((PI / 24) * (2 * (6 + (i-1)/2) + 7) * (2 * k + 1))
+ */
+static
+mad_fixed_t const imdct_s[6][6] = {
+# include "imdct_s.dat"
+};
+
+# if !defined(ASO_IMDCT)
+/*
+ * windowing coefficients for long blocks
+ * derived from section 2.4.3.4.10.3 of ISO/IEC 11172-3
+ *
+ * window_l[i] = sin((PI / 36) * (i + 1/2))
+ */
+static
+mad_fixed_t const window_l[36] = {
+  MAD_F(0x00b2aa3e) /* 0.043619387 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
+  MAD_F(0x03768962) /* 0.216439614 */, MAD_F(0x04cfb0e2) /* 0.300705800 */,
+  MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x07635284) /* 0.461748613 */,
+  MAD_F(0x0898c779) /* 0.537299608 */, MAD_F(0x09bd7ca0) /* 0.608761429 */,
+  MAD_F(0x0acf37ad) /* 0.675590208 */, MAD_F(0x0bcbe352) /* 0.737277337 */,
+  MAD_F(0x0cb19346) /* 0.793353340 */, MAD_F(0x0d7e8807) /* 0.843391446 */,
+
+  MAD_F(0x0e313245) /* 0.887010833 */, MAD_F(0x0ec835e8) /* 0.923879533 */,
+  MAD_F(0x0f426cb5) /* 0.953716951 */, MAD_F(0x0f9ee890) /* 0.976296007 */,
+  MAD_F(0x0fdcf549) /* 0.991444861 */, MAD_F(0x0ffc19fd) /* 0.999048222 */,
+  MAD_F(0x0ffc19fd) /* 0.999048222 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
+  MAD_F(0x0f9ee890) /* 0.976296007 */, MAD_F(0x0f426cb5) /* 0.953716951 */,
+  MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0e313245) /* 0.887010833 */,
+
+  MAD_F(0x0d7e8807) /* 0.843391446 */, MAD_F(0x0cb19346) /* 0.793353340 */,
+  MAD_F(0x0bcbe352) /* 0.737277337 */, MAD_F(0x0acf37ad) /* 0.675590208 */,
+  MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0898c779) /* 0.537299608 */,
+  MAD_F(0x07635284) /* 0.461748613 */, MAD_F(0x061f78aa) /* 0.382683432 */,
+  MAD_F(0x04cfb0e2) /* 0.300705800 */, MAD_F(0x03768962) /* 0.216439614 */,
+  MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x00b2aa3e) /* 0.043619387 */,
+};
+# endif  /* ASO_IMDCT */
+
+/*
+ * windowing coefficients for short blocks
+ * derived from section 2.4.3.4.10.3 of ISO/IEC 11172-3
+ *
+ * window_s[i] = sin((PI / 12) * (i + 1/2))
+ */
+static
+mad_fixed_t const window_s[12] = {
+  MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x061f78aa) /* 0.382683432 */,
+  MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0cb19346) /* 0.793353340 */,
+  MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
+  MAD_F(0x0fdcf549) /* 0.991444861 */, MAD_F(0x0ec835e8) /* 0.923879533 */,
+  MAD_F(0x0cb19346) /* 0.793353340 */, MAD_F(0x09bd7ca0) /* 0.608761429 */,
+  MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
+};
+
+/*
+ * coefficients for intensity stereo processing
+ * derived from section 2.4.3.4.9.3 of ISO/IEC 11172-3
+ *
+ * is_ratio[i] = tan(i * (PI / 12))
+ * is_table[i] = is_ratio[i] / (1 + is_ratio[i])
+ */
+static
+mad_fixed_t const is_table[7] = {
+  MAD_F(0x00000000) /* 0.000000000 */,
+  MAD_F(0x0361962f) /* 0.211324865 */,
+  MAD_F(0x05db3d74) /* 0.366025404 */,
+  MAD_F(0x08000000) /* 0.500000000 */,
+  MAD_F(0x0a24c28c) /* 0.633974596 */,
+  MAD_F(0x0c9e69d1) /* 0.788675135 */,
+  MAD_F(0x10000000) /* 1.000000000 */
+};
+
+/*
+ * coefficients for LSF intensity stereo processing
+ * derived from section 2.4.3.2 of ISO/IEC 13818-3
+ *
+ * is_lsf_table[0][i] = (1 / sqrt(sqrt(2)))^(i + 1)
+ * is_lsf_table[1][i] = (1 /      sqrt(2)) ^(i + 1)
+ */
+static
+mad_fixed_t const is_lsf_table[2][15] = {
+  {
+    MAD_F(0x0d744fcd) /* 0.840896415 */,
+    MAD_F(0x0b504f33) /* 0.707106781 */,
+    MAD_F(0x09837f05) /* 0.594603558 */,
+    MAD_F(0x08000000) /* 0.500000000 */,
+    MAD_F(0x06ba27e6) /* 0.420448208 */,
+    MAD_F(0x05a8279a) /* 0.353553391 */,
+    MAD_F(0x04c1bf83) /* 0.297301779 */,
+    MAD_F(0x04000000) /* 0.250000000 */,
+    MAD_F(0x035d13f3) /* 0.210224104 */,
+    MAD_F(0x02d413cd) /* 0.176776695 */,
+    MAD_F(0x0260dfc1) /* 0.148650889 */,
+    MAD_F(0x02000000) /* 0.125000000 */,
+    MAD_F(0x01ae89fa) /* 0.105112052 */,
+    MAD_F(0x016a09e6) /* 0.088388348 */,
+    MAD_F(0x01306fe1) /* 0.074325445 */
+  }, {
+    MAD_F(0x0b504f33) /* 0.707106781 */,
+    MAD_F(0x08000000) /* 0.500000000 */,
+    MAD_F(0x05a8279a) /* 0.353553391 */,
+    MAD_F(0x04000000) /* 0.250000000 */,
+    MAD_F(0x02d413cd) /* 0.176776695 */,
+    MAD_F(0x02000000) /* 0.125000000 */,
+    MAD_F(0x016a09e6) /* 0.088388348 */,
+    MAD_F(0x01000000) /* 0.062500000 */,
+    MAD_F(0x00b504f3) /* 0.044194174 */,
+    MAD_F(0x00800000) /* 0.031250000 */,
+    MAD_F(0x005a827a) /* 0.022097087 */,
+    MAD_F(0x00400000) /* 0.015625000 */,
+    MAD_F(0x002d413d) /* 0.011048543 */,
+    MAD_F(0x00200000) /* 0.007812500 */,
+    MAD_F(0x0016a09e) /* 0.005524272 */
+  }
+};
+
+/*
+ * NAME:	III_sideinfo()
+ * DESCRIPTION:	decode frame side information from a bitstream
+ */
+static
+enum mad_error III_sideinfo(struct mad_bitptr *ptr, unsigned int nch,
+			    int lsf, struct sideinfo *si,
+			    unsigned int *data_bitlen,
+			    unsigned int *priv_bitlen)
+{
+  unsigned int ngr, gr, ch, i;
+  enum mad_error result = MAD_ERROR_NONE;
+
+  *data_bitlen = 0;
+  *priv_bitlen = lsf ? ((nch == 1) ? 1 : 2) : ((nch == 1) ? 5 : 3);
+
+  si->main_data_begin = mad_bit_read(ptr, lsf ? 8 : 9);
+  si->private_bits    = mad_bit_read(ptr, *priv_bitlen);
+
+  ngr = 1;
+  if (!lsf) {
+    ngr = 2;
+
+    for (ch = 0; ch < nch; ++ch)
+      si->scfsi[ch] = mad_bit_read(ptr, 4);
+  }
+
+  for (gr = 0; gr < ngr; ++gr) {
+    struct granule *granule = &si->gr[gr];
+
+    for (ch = 0; ch < nch; ++ch) {
+      struct channel *channel = &granule->ch[ch];
+
+      channel->part2_3_length    = mad_bit_read(ptr, 12);
+      channel->big_values        = mad_bit_read(ptr, 9);
+      channel->global_gain       = mad_bit_read(ptr, 8);
+      channel->scalefac_compress = mad_bit_read(ptr, lsf ? 9 : 4);
+
+      *data_bitlen += channel->part2_3_length;
+
+      if (channel->big_values > 288 && result == 0)
+	result = MAD_ERROR_BADBIGVALUES;
+
+      channel->flags = 0;
+
+      /* window_switching_flag */
+      if (mad_bit_read(ptr, 1)) {
+	channel->block_type = mad_bit_read(ptr, 2);
+
+	if (channel->block_type == 0 && result == 0)
+	  result = MAD_ERROR_BADBLOCKTYPE;
+
+	if (!lsf && channel->block_type == 2 && si->scfsi[ch] && result == 0)
+	  result = MAD_ERROR_BADSCFSI;
+
+	channel->region0_count = 7;
+	channel->region1_count = 36;
+
+	if (mad_bit_read(ptr, 1))
+	  channel->flags |= mixed_block_flag;
+	else if (channel->block_type == 2)
+	  channel->region0_count = 8;
+
+	for (i = 0; i < 2; ++i)
+	  channel->table_select[i] = mad_bit_read(ptr, 5);
+
+# if defined(DEBUG)
+	channel->table_select[2] = 4;  /* not used */
+# endif
+
+	for (i = 0; i < 3; ++i)
+	  channel->subblock_gain[i] = mad_bit_read(ptr, 3);
+      }
+      else {
+	channel->block_type = 0;
+
+	for (i = 0; i < 3; ++i)
+	  channel->table_select[i] = mad_bit_read(ptr, 5);
+
+	channel->region0_count = mad_bit_read(ptr, 4);
+	channel->region1_count = mad_bit_read(ptr, 3);
+      }
+
+      /* [preflag,] scalefac_scale, count1table_select */
+      channel->flags |= mad_bit_read(ptr, lsf ? 2 : 3);
+    }
+  }
+
+  return result;
+}
+
+/*
+ * NAME:	III_scalefactors_lsf()
+ * DESCRIPTION:	decode channel scalefactors for LSF from a bitstream
+ */
+static
+unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
+				  struct channel *channel,
+				  struct channel *gr1ch, int mode_extension,
+				  unsigned int bits_left, unsigned int *part2_length)
+{
+  struct mad_bitptr start;
+  unsigned int scalefac_compress, index, slen[4], part, n, i;
+  unsigned char const *nsfb;
+
+  start = *ptr;
+
+  scalefac_compress = channel->scalefac_compress;
+  index = (channel->block_type == 2) ?
+    ((channel->flags & mixed_block_flag) ? 2 : 1) : 0;
+
+  if (!((mode_extension & I_STEREO) && gr1ch)) {
+    if (scalefac_compress < 400) {
+      slen[0] = (scalefac_compress >> 4) / 5;
+      slen[1] = (scalefac_compress >> 4) % 5;
+      slen[2] = (scalefac_compress % 16) >> 2;
+      slen[3] =  scalefac_compress %  4;
+
+      nsfb = nsfb_table[0][index];
+    }
+    else if (scalefac_compress < 500) {
+      scalefac_compress -= 400;
+
+      slen[0] = (scalefac_compress >> 2) / 5;
+      slen[1] = (scalefac_compress >> 2) % 5;
+      slen[2] =  scalefac_compress %  4;
+      slen[3] = 0;
+
+      nsfb = nsfb_table[1][index];
+    }
+    else {
+      scalefac_compress -= 500;
+
+      slen[0] = scalefac_compress / 3;
+      slen[1] = scalefac_compress % 3;
+      slen[2] = 0;
+      slen[3] = 0;
+
+      channel->flags |= preflag;
+
+      nsfb = nsfb_table[2][index];
+    }
+
+    n = 0;
+    for (part = 0; part < 4; ++part) {
+      for (i = 0; i < nsfb[part]; ++i) {
+	if (bits_left < slen[part])
+	  return MAD_ERROR_BADSCFSI;
+	channel->scalefac[n++] = mad_bit_read(ptr, slen[part]);
+	bits_left -= slen[part];
+      }
+    }
+
+    while (n < 39)
+      channel->scalefac[n++] = 0;
+  }
+  else {  /* (mode_extension & I_STEREO) && gr1ch (i.e. ch == 1) */
+    scalefac_compress >>= 1;
+
+    if (scalefac_compress < 180) {
+      slen[0] =  scalefac_compress / 36;
+      slen[1] = (scalefac_compress % 36) / 6;
+      slen[2] = (scalefac_compress % 36) % 6;
+      slen[3] = 0;
+
+      nsfb = nsfb_table[3][index];
+    }
+    else if (scalefac_compress < 244) {
+      scalefac_compress -= 180;
+
+      slen[0] = (scalefac_compress % 64) >> 4;
+      slen[1] = (scalefac_compress % 16) >> 2;
+      slen[2] =  scalefac_compress %  4;
+      slen[3] = 0;
+
+      nsfb = nsfb_table[4][index];
+    }
+    else {
+      scalefac_compress -= 244;
+
+      slen[0] = scalefac_compress / 3;
+      slen[1] = scalefac_compress % 3;
+      slen[2] = 0;
+      slen[3] = 0;
+
+      nsfb = nsfb_table[5][index];
+    }
+
+    n = 0;
+    for (part = 0; part < 4; ++part) {
+      unsigned int max, is_pos;
+
+      max = (1 << slen[part]) - 1;
+
+      for (i = 0; i < nsfb[part]; ++i) {
+	if (bits_left < slen[part])
+	  return MAD_ERROR_BADSCFSI;
+	is_pos = mad_bit_read(ptr, slen[part]);
+	bits_left -= slen[part];
+
+	channel->scalefac[n] = is_pos;
+	gr1ch->scalefac[n++] = (is_pos == max);
+      }
+    }
+
+    while (n < 39) {
+      channel->scalefac[n] = 0;
+      gr1ch->scalefac[n++] = 0;  /* apparently not illegal */
+    }
+  }
+
+  *part2_length = mad_bit_length(&start, ptr);
+  return MAD_ERROR_NONE;
+}
+
+/*
+ * NAME:	III_scalefactors()
+ * DESCRIPTION:	decode channel scalefactors of one granule from a bitstream
+ */
+static
+unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+			      struct channel const *gr0ch, unsigned int scfsi,
+			      unsigned int bits_left, unsigned int *part2_length)
+{
+  struct mad_bitptr start;
+  unsigned int slen1, slen2, sfbi;
+
+  start = *ptr;
+
+  slen1 = sflen_table[channel->scalefac_compress].slen1;
+  slen2 = sflen_table[channel->scalefac_compress].slen2;
+
+  if (channel->block_type == 2) {
+    unsigned int nsfb;
+
+    sfbi = 0;
+
+    nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3;
+    while (nsfb--) {
+      if (bits_left < slen1)
+	return MAD_ERROR_BADSCFSI;
+      channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1);
+      bits_left -= slen1;
+    }
+
+    nsfb = 6 * 3;
+    while (nsfb--) {
+      if (bits_left < slen2)
+	return MAD_ERROR_BADSCFSI;
+      channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2);
+      bits_left -= slen2;
+    }
+
+    nsfb = 1 * 3;
+    while (nsfb--)
+      channel->scalefac[sfbi++] = 0;
+  }
+  else {  /* channel->block_type != 2 */
+    if (scfsi & 0x8) {
+      for (sfbi = 0; sfbi < 6; ++sfbi)
+	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+    }
+    else {
+      for (sfbi = 0; sfbi < 6; ++sfbi) {
+	if (bits_left < slen1)
+	  return MAD_ERROR_BADSCFSI;
+	channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
+	bits_left -= slen1;
+      }
+    }
+
+    if (scfsi & 0x4) {
+      for (sfbi = 6; sfbi < 11; ++sfbi)
+	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+    }
+    else {
+      for (sfbi = 6; sfbi < 11; ++sfbi) {
+	if (bits_left < slen1)
+	  return MAD_ERROR_BADSCFSI;
+	channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
+	bits_left -= slen1;
+      }
+    }
+
+    if (scfsi & 0x2) {
+      for (sfbi = 11; sfbi < 16; ++sfbi)
+	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+    }
+    else {
+      for (sfbi = 11; sfbi < 16; ++sfbi) {
+	if (bits_left < slen2)
+	  return MAD_ERROR_BADSCFSI;
+	channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
+	bits_left -= slen2;
+      }
+    }
+
+    if (scfsi & 0x1) {
+      for (sfbi = 16; sfbi < 21; ++sfbi)
+	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+    }
+    else {
+      for (sfbi = 16; sfbi < 21; ++sfbi) {
+	if (bits_left < slen2)
+	  return MAD_ERROR_BADSCFSI;
+	channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
+	bits_left -= slen2;
+      }
+    }
+
+    channel->scalefac[21] = 0;
+  }
+
+  *part2_length = mad_bit_length(&start, ptr);
+  return MAD_ERROR_NONE;
+}
+
+/*
+ * The Layer III formula for requantization and scaling is defined by
+ * section 2.4.3.4.7.1 of ISO/IEC 11172-3, as follows:
+ *
+ *   long blocks:
+ *   xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
+ *           2^((1/4) * (global_gain - 210)) *
+ *           2^-(scalefac_multiplier *
+ *               (scalefac_l[sfb] + preflag * pretab[sfb]))
+ *
+ *   short blocks:
+ *   xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
+ *           2^((1/4) * (global_gain - 210 - 8 * subblock_gain[w])) *
+ *           2^-(scalefac_multiplier * scalefac_s[sfb][w])
+ *
+ *   where:
+ *   scalefac_multiplier = (scalefac_scale + 1) / 2
+ *
+ * The routines III_exponents() and III_requantize() facilitate this
+ * calculation.
+ */
+
+/*
+ * NAME:	III_exponents()
+ * DESCRIPTION:	calculate scalefactor exponents
+ */
+static
+void III_exponents(struct channel const *channel,
+		   unsigned char const *sfbwidth, signed int exponents[39])
+{
+  signed int gain;
+  unsigned int scalefac_multiplier, sfbi;
+
+  gain = (signed int) channel->global_gain - 210;
+  scalefac_multiplier = (channel->flags & scalefac_scale) ? 2 : 1;
+
+  if (channel->block_type == 2) {
+    unsigned int l;
+    signed int gain0, gain1, gain2;
+
+    sfbi = l = 0;
+
+    if (channel->flags & mixed_block_flag) {
+      unsigned int premask;
+
+      premask = (channel->flags & preflag) ? ~0 : 0;
+
+      /* long block subbands 0-1 */
+
+      while (l < 36) {
+	exponents[sfbi] = gain -
+	  (signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) <<
+			scalefac_multiplier);
+
+	l += sfbwidth[sfbi++];
+      }
+    }
+
+    /* this is probably wrong for 8000 Hz short/mixed blocks */
+
+    gain0 = gain - 8 * (signed int) channel->subblock_gain[0];
+    gain1 = gain - 8 * (signed int) channel->subblock_gain[1];
+    gain2 = gain - 8 * (signed int) channel->subblock_gain[2];
+
+    while (l < 576) {
+      exponents[sfbi + 0] = gain0 -
+	(signed int) (channel->scalefac[sfbi + 0] << scalefac_multiplier);
+      exponents[sfbi + 1] = gain1 -
+	(signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier);
+      exponents[sfbi + 2] = gain2 -
+	(signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier);
+
+      l    += 3 * sfbwidth[sfbi];
+      sfbi += 3;
+    }
+  }
+  else {  /* channel->block_type != 2 */
+    if (channel->flags & preflag) {
+      for (sfbi = 0; sfbi < 22; ++sfbi) {
+	exponents[sfbi] = gain -
+	  (signed int) ((channel->scalefac[sfbi] + pretab[sfbi]) <<
+			scalefac_multiplier);
+      }
+    }
+    else {
+      for (sfbi = 0; sfbi < 22; ++sfbi) {
+	exponents[sfbi] = gain -
+	  (signed int) (channel->scalefac[sfbi] << scalefac_multiplier);
+      }
+    }
+  }
+}
+
+/*
+ * NAME:	III_requantize()
+ * DESCRIPTION:	requantize one (positive) value
+ */
+static
+mad_fixed_t III_requantize(unsigned int value, signed int exp)
+{
+  mad_fixed_t requantized;
+  signed int frac;
+  struct fixedfloat const *power;
+
+  frac = exp % 4;  /* assumes sign(frac) == sign(exp) */
+  exp /= 4;
+
+  power = &rq_table[value];
+  requantized = power->mantissa;
+  exp += power->exponent;
+
+  if (exp < 0) {
+    if (-exp >= sizeof(mad_fixed_t) * CHAR_BIT) {
+      /* underflow */
+      requantized = 0;
+    }
+    else {
+      requantized += 1L << (-exp - 1);
+      requantized >>= -exp;
+    }
+  }
+  else {
+    if (exp >= 5) {
+      /* overflow */
+# if defined(DEBUG)
+      fprintf(stderr, "requantize overflow (%f * 2^%d)\n",
+	      mad_f_todouble(requantized), exp);
+# endif
+      requantized = MAD_F_MAX;
+    }
+    else
+      requantized <<= exp;
+  }
+
+  return frac ? mad_f_mul(requantized, root_table[3 + frac]) : requantized;
+}
+
+/* we must take care that sz >= bits and sz < sizeof(long) lest bits == 0 */
+# define MASK(cache, sz, bits)	\
+    (((cache) >> ((sz) - (bits))) & ((1 << (bits)) - 1))
+# define MASK1BIT(cache, sz)  \
+    ((cache) & (1 << ((sz) - 1)))
+
+/*
+ * NAME:	III_huffdecode()
+ * DESCRIPTION:	decode Huffman code words of one channel of one granule
+ */
+static
+enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+			      struct channel *channel,
+			      unsigned char const *sfbwidth,
+			      signed int part3_length)
+{
+  signed int exponents[39], exp;
+  signed int const *expptr;
+  struct mad_bitptr peek;
+  signed int bits_left, cachesz, fakebits;
+  register mad_fixed_t *xrptr;
+  mad_fixed_t const *sfbound;
+  register unsigned long bitcache;
+
+  bits_left = part3_length;
+
+  III_exponents(channel, sfbwidth, exponents);
+
+  peek = *ptr;
+  mad_bit_skip(ptr, bits_left);
+
+  /* align bit reads to byte boundaries */
+  cachesz  = mad_bit_bitsleft(&peek);
+  cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7;
+
+  if (bits_left < cachesz) {
+    cachesz = bits_left;
+  }
+  bitcache   = mad_bit_read(&peek, cachesz);
+  bits_left -= cachesz;
+  fakebits = 0;
+
+  xrptr = &xr[0];
+
+  /* big_values */
+  {
+    unsigned int region, rcount;
+    struct hufftable const *entry;
+    union huffpair const *table;
+    unsigned int linbits, startbits, big_values, reqhits;
+    mad_fixed_t reqcache[16];
+
+    sfbound = xrptr + *sfbwidth++;
+    rcount  = channel->region0_count + 1;
+
+    entry     = &mad_huff_pair_table[channel->table_select[region = 0]];
+    table     = entry->table;
+    linbits   = entry->linbits;
+    startbits = entry->startbits;
+
+    if (table == 0)
+      return MAD_ERROR_BADHUFFTABLE;
+
+    expptr  = &exponents[0];
+    exp     = *expptr++;
+    reqhits = 0;
+
+    big_values = channel->big_values;
+
+    while (big_values-- && cachesz + bits_left - fakebits > 0) {
+      union huffpair const *pair;
+      unsigned int clumpsz, value;
+      register mad_fixed_t requantized;
+
+      if (xrptr == sfbound) {
+	sfbound += *sfbwidth++;
+
+	/* change table if region boundary */
+
+	if (--rcount == 0) {
+	  if (region == 0)
+	    rcount = channel->region1_count + 1;
+	  else
+	    rcount = 0;  /* all remaining */
+
+	  entry     = &mad_huff_pair_table[channel->table_select[++region]];
+	  table     = entry->table;
+	  linbits   = entry->linbits;
+	  startbits = entry->startbits;
+
+	  if (table == 0)
+	    return MAD_ERROR_BADHUFFTABLE;
+	}
+
+	if (exp != *expptr) {
+	  exp = *expptr;
+	  reqhits = 0;
+	}
+
+	++expptr;
+      }
+
+      if (cachesz < 21) {
+	unsigned int bits;
+
+	bits       = ((32 - 1 - 21) + (21 - cachesz)) & ~7;
+	if (bits_left < bits) {
+	  bits = bits_left;
+	}
+	bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	cachesz   += bits;
+	bits_left -= bits;
+      }
+      if (cachesz < 21) {
+	unsigned int bits = 21 - cachesz;
+	bitcache <<= bits;
+	cachesz += bits;
+	fakebits += bits;
+      }
+
+      /* hcod (0..19) */
+
+      clumpsz = startbits;
+      pair    = &table[MASK(bitcache, cachesz, clumpsz)];
+
+      while (!pair->final) {
+	cachesz -= clumpsz;
+
+	clumpsz = pair->ptr.bits;
+	pair    = &table[pair->ptr.offset + MASK(bitcache, cachesz, clumpsz)];
+      }
+
+      cachesz -= pair->value.hlen;
+      if (cachesz < fakebits)
+	return MAD_ERROR_BADHUFFDATA;
+
+      if (linbits) {
+	/* x (0..14) */
+
+	value = pair->value.x;
+
+	switch (value) {
+	case 0:
+	  xrptr[0] = 0;
+	  break;
+
+	case 15:
+	  if (cachesz < linbits + 2) {
+	    unsigned int bits = 16;
+	    if (bits_left < 16)
+	      bits = bits_left;
+	    bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	    cachesz   += bits;
+	    bits_left -= bits;
+	  }
+	  if (cachesz - fakebits < linbits)
+	    return MAD_ERROR_BADHUFFDATA;
+
+	  value += MASK(bitcache, cachesz, linbits);
+	  cachesz -= linbits;
+
+	  requantized = III_requantize(value, exp);
+	  goto x_final;
+
+	default:
+	  if (reqhits & (1 << value))
+	    requantized = reqcache[value];
+	  else {
+	    reqhits |= (1 << value);
+	    requantized = reqcache[value] = III_requantize(value, exp);
+	  }
+
+	x_final:
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
+	  xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
+	    -requantized : requantized;
+	}
+
+	/* y (0..14) */
+
+	value = pair->value.y;
+
+	switch (value) {
+	case 0:
+	  xrptr[1] = 0;
+	  break;
+
+	case 15:
+	  if (cachesz < linbits + 1) {
+	    unsigned int bits = 16;
+	    if (bits_left < 16)
+	      bits = bits_left;
+	    bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	    cachesz   += bits;
+	    bits_left -= bits;
+	  }
+	  if (cachesz - fakebits < linbits)
+	    return MAD_ERROR_BADHUFFDATA;
+
+	  value += MASK(bitcache, cachesz, linbits);
+	  cachesz -= linbits;
+
+	  requantized = III_requantize(value, exp);
+	  goto y_final;
+
+	default:
+	  if (reqhits & (1 << value))
+	    requantized = reqcache[value];
+	  else {
+	    reqhits |= (1 << value);
+	    requantized = reqcache[value] = III_requantize(value, exp);
+	  }
+
+	y_final:
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
+	  xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
+	    -requantized : requantized;
+	}
+      }
+      else {
+	/* x (0..1) */
+
+	value = pair->value.x;
+
+	if (value == 0)
+	  xrptr[0] = 0;
+	else {
+	  if (reqhits & (1 << value))
+	    requantized = reqcache[value];
+	  else {
+	    reqhits |= (1 << value);
+	    requantized = reqcache[value] = III_requantize(value, exp);
+	  }
+
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
+	  xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
+	    -requantized : requantized;
+	}
+
+	/* y (0..1) */
+
+	value = pair->value.y;
+
+	if (value == 0)
+	  xrptr[1] = 0;
+	else {
+	  if (reqhits & (1 << value))
+	    requantized = reqcache[value];
+	  else {
+	    reqhits |= (1 << value);
+	    requantized = reqcache[value] = III_requantize(value, exp);
+	  }
+
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
+	  xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
+	    -requantized : requantized;
+	}
+      }
+
+      xrptr += 2;
+    }
+  }
+
+  /* count1 */
+  {
+    union huffquad const *table;
+    register mad_fixed_t requantized;
+
+    table = mad_huff_quad_table[channel->flags & count1table_select];
+
+    requantized = III_requantize(1, exp);
+
+    while (cachesz + bits_left - fakebits > 0 && xrptr <= &xr[572]) {
+      union huffquad const *quad;
+
+      /* hcod (1..6) */
+
+      if (cachesz < 10) {
+	unsigned int bits = 16;
+	if (bits_left < 16)
+	  bits = bits_left;
+	bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	cachesz   += bits;
+	bits_left -= bits;
+      }
+      if (cachesz < 10) {
+	unsigned int bits = 10 - cachesz;
+	bitcache <<= bits;
+	cachesz += bits;
+	fakebits += bits;
+      }
+
+      quad = &table[MASK(bitcache, cachesz, 4)];
+
+      /* quad tables guaranteed to have at most one extra lookup */
+      if (!quad->final) {
+	cachesz -= 4;
+
+	quad = &table[quad->ptr.offset +
+		      MASK(bitcache, cachesz, quad->ptr.bits)];
+      }
+
+      if (cachesz - fakebits < quad->value.hlen + quad->value.v
+        + quad->value.w + quad->value.x + quad->value.y)
+	/* We don't have enough bits to read one more entry, consider them
+	 * stuffing bits. */
+	break;
+      cachesz -= quad->value.hlen;
+
+      if (xrptr == sfbound) {
+	sfbound += *sfbwidth++;
+
+	if (exp != *expptr) {
+	  exp = *expptr;
+	  requantized = III_requantize(1, exp);
+	}
+
+	++expptr;
+      }
+
+      /* v (0..1) */
+
+      xrptr[0] = quad->value.v ?
+	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
+
+      /* w (0..1) */
+
+      xrptr[1] = quad->value.w ?
+	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
+
+      xrptr += 2;
+
+      if (xrptr == sfbound) {
+	sfbound += *sfbwidth++;
+
+	if (exp != *expptr) {
+	  exp = *expptr;
+	  requantized = III_requantize(1, exp);
+	}
+
+	++expptr;
+      }
+
+      /* x (0..1) */
+
+      xrptr[0] = quad->value.x ?
+	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
+
+      /* y (0..1) */
+
+      xrptr[1] = quad->value.y ?
+	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
+
+      xrptr += 2;
+    }
+  }
+
+# if 0 && defined(DEBUG)
+  if (bits_left < 0)
+    fprintf(stderr, "read %d bits too many\n", -bits_left);
+  else if (cachesz + bits_left > 0)
+    fprintf(stderr, "%d stuffing bits\n", cachesz + bits_left);
+# endif
+
+  /* rzero */
+  while (xrptr < &xr[576]) {
+    xrptr[0] = 0;
+    xrptr[1] = 0;
+
+    xrptr += 2;
+  }
+
+  return MAD_ERROR_NONE;
+}
+
+# undef MASK
+# undef MASK1BIT
+
+/*
+ * NAME:	III_reorder()
+ * DESCRIPTION:	reorder frequency lines of a short block into subband order
+ */
+static
+void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
+		 unsigned char const sfbwidth[39])
+{
+  mad_fixed_t tmp[32][3][6];
+  unsigned int sb, l, f, w, sbw[3], sw[3];
+
+  /* this is probably wrong for 8000 Hz mixed blocks */
+
+  sb = 0;
+  if (channel->flags & mixed_block_flag) {
+    sb = 2;
+
+    l = 0;
+    while (l < 36)
+      l += *sfbwidth++;
+  }
+
+  for (w = 0; w < 3; ++w) {
+    sbw[w] = sb;
+    sw[w]  = 0;
+  }
+
+  f = *sfbwidth++;
+  w = 0;
+
+  for (l = 18 * sb; l < 576; ++l) {
+    if (f-- == 0) {
+      f = *sfbwidth++ - 1;
+      w = (w + 1) % 3;
+    }
+
+    tmp[sbw[w]][w][sw[w]++] = xr[l];
+
+    if (sw[w] == 6) {
+      sw[w] = 0;
+      ++sbw[w];
+    }
+  }
+
+  memcpy(&xr[18 * sb], &tmp[sb], (576 - 18 * sb) * sizeof(mad_fixed_t));
+}
+
+/*
+ * NAME:	III_stereo()
+ * DESCRIPTION:	perform joint stereo processing on a granule
+ */
+static
+enum mad_error III_stereo(mad_fixed_t xr[2][576],
+			  struct granule const *granule,
+			  struct mad_header *header,
+			  unsigned char const *sfbwidth)
+{
+  short modes[39];
+  unsigned int sfbi, l, n, i;
+
+  if (granule->ch[0].block_type !=
+      granule->ch[1].block_type ||
+      (granule->ch[0].flags & mixed_block_flag) !=
+      (granule->ch[1].flags & mixed_block_flag))
+    return MAD_ERROR_BADSTEREO;
+
+  for (i = 0; i < 39; ++i)
+    modes[i] = header->mode_extension;
+
+  /* intensity stereo */
+
+  if (header->mode_extension & I_STEREO) {
+    struct channel const *right_ch = &granule->ch[1];
+    mad_fixed_t const *right_xr = xr[1];
+    unsigned int is_pos;
+
+    header->flags |= MAD_FLAG_I_STEREO;
+
+    /* first determine which scalefactor bands are to be processed */
+
+    if (right_ch->block_type == 2) {
+      unsigned int lower, start, max, bound[3], w;
+
+      lower = start = max = bound[0] = bound[1] = bound[2] = 0;
+
+      sfbi = l = 0;
+
+      if (right_ch->flags & mixed_block_flag) {
+	while (l < 36) {
+	  n = sfbwidth[sfbi++];
+
+	  for (i = 0; i < n; ++i) {
+	    if (right_xr[i]) {
+	      lower = sfbi;
+	      break;
+	    }
+	  }
+
+	  right_xr += n;
+	  l += n;
+	}
+
+	start = sfbi;
+      }
+
+      w = 0;
+      while (l < 576) {
+	n = sfbwidth[sfbi++];
+
+	for (i = 0; i < n; ++i) {
+	  if (right_xr[i]) {
+	    max = bound[w] = sfbi;
+	    break;
+	  }
+	}
+
+	right_xr += n;
+	l += n;
+	w = (w + 1) % 3;
+      }
+
+      if (max)
+	lower = start;
+
+      /* long blocks */
+
+      for (i = 0; i < lower; ++i)
+	modes[i] = header->mode_extension & ~I_STEREO;
+
+      /* short blocks */
+
+      w = 0;
+      for (i = start; i < max; ++i) {
+	if (i < bound[w])
+	  modes[i] = header->mode_extension & ~I_STEREO;
+
+	w = (w + 1) % 3;
+      }
+    }
+    else {  /* right_ch->block_type != 2 */
+      unsigned int bound;
+
+      bound = 0;
+      for (sfbi = l = 0; l < 576; l += n) {
+	n = sfbwidth[sfbi++];
+
+	for (i = 0; i < n; ++i) {
+	  if (right_xr[i]) {
+	    bound = sfbi;
+	    break;
+	  }
+	}
+
+	right_xr += n;
+      }
+
+      for (i = 0; i < bound; ++i)
+	modes[i] = header->mode_extension & ~I_STEREO;
+    }
+
+    /* now do the actual processing */
+
+    if (header->flags & MAD_FLAG_LSF_EXT) {
+      unsigned char const *illegal_pos = granule[1].ch[1].scalefac;
+      mad_fixed_t const *lsf_scale;
+
+      /* intensity_scale */
+      lsf_scale = is_lsf_table[right_ch->scalefac_compress & 0x1];
+
+      for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
+	n = sfbwidth[sfbi];
+
+	if (!(modes[sfbi] & I_STEREO))
+	  continue;
+
+	if (illegal_pos[sfbi]) {
+	  modes[sfbi] &= ~I_STEREO;
+	  continue;
+	}
+
+	is_pos = right_ch->scalefac[sfbi];
+
+	for (i = 0; i < n; ++i) {
+	  register mad_fixed_t left;
+
+	  left = xr[0][l + i];
+
+	  if (is_pos == 0)
+	    xr[1][l + i] = left;
+	  else {
+	    register mad_fixed_t opposite;
+
+	    opposite = mad_f_mul(left, lsf_scale[(is_pos - 1) / 2]);
+
+	    if (is_pos & 1) {
+	      xr[0][l + i] = opposite;
+	      xr[1][l + i] = left;
+	    }
+	    else
+	      xr[1][l + i] = opposite;
+	  }
+	}
+      }
+    }
+    else {  /* !(header->flags & MAD_FLAG_LSF_EXT) */
+      for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
+	n = sfbwidth[sfbi];
+
+	if (!(modes[sfbi] & I_STEREO))
+	  continue;
+
+	is_pos = right_ch->scalefac[sfbi];
+
+	if (is_pos >= 7) {  /* illegal intensity position */
+	  modes[sfbi] &= ~I_STEREO;
+	  continue;
+	}
+
+	for (i = 0; i < n; ++i) {
+	  register mad_fixed_t left;
+
+	  left = xr[0][l + i];
+
+	  xr[0][l + i] = mad_f_mul(left, is_table[    is_pos]);
+	  xr[1][l + i] = mad_f_mul(left, is_table[6 - is_pos]);
+	}
+      }
+    }
+  }
+
+  /* middle/side stereo */
+
+  if (header->mode_extension & MS_STEREO) {
+    register mad_fixed_t invsqrt2;
+
+    header->flags |= MAD_FLAG_MS_STEREO;
+
+    invsqrt2 = root_table[3 + -2];
+
+    for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
+      n = sfbwidth[sfbi];
+
+      if (modes[sfbi] != MS_STEREO)
+	continue;
+
+      for (i = 0; i < n; ++i) {
+	register mad_fixed_t m, s;
+
+	m = xr[0][l + i];
+	s = xr[1][l + i];
+
+	xr[0][l + i] = mad_f_mul(m + s, invsqrt2);  /* l = (m + s) / sqrt(2) */
+	xr[1][l + i] = mad_f_mul(m - s, invsqrt2);  /* r = (m - s) / sqrt(2) */
+      }
+    }
+  }
+
+  return MAD_ERROR_NONE;
+}
+
+/*
+ * NAME:	III_aliasreduce()
+ * DESCRIPTION:	perform frequency line alias reduction
+ */
+static
+void III_aliasreduce(mad_fixed_t xr[576], int lines)
+{
+  mad_fixed_t const *bound;
+  int i;
+
+  bound = &xr[lines];
+  for (xr += 18; xr < bound; xr += 18) {
+    for (i = 0; i < 8; ++i) {
+      register mad_fixed_t a, b;
+      register mad_fixed64hi_t hi;
+      register mad_fixed64lo_t lo;
+
+      a = xr[-1 - i];
+      b = xr[     i];
+
+# if defined(ASO_ZEROCHECK)
+      if (a | b) {
+# endif
+	MAD_F_ML0(hi, lo,  a, cs[i]);
+	MAD_F_MLA(hi, lo, -b, ca[i]);
+
+	xr[-1 - i] = MAD_F_MLZ(hi, lo);
+
+	MAD_F_ML0(hi, lo,  b, cs[i]);
+	MAD_F_MLA(hi, lo,  a, ca[i]);
+
+	xr[     i] = MAD_F_MLZ(hi, lo);
+# if defined(ASO_ZEROCHECK)
+      }
+# endif
+    }
+  }
+}
+
+# if defined(ASO_IMDCT)
+void III_imdct_l(mad_fixed_t const [18], mad_fixed_t [36], unsigned int);
+# else
+#  if 1
+static
+void fastsdct(mad_fixed_t const x[9], mad_fixed_t y[18])
+{
+  mad_fixed_t a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10, a11, a12;
+  mad_fixed_t a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25;
+  mad_fixed_t m0,  m1,  m2,  m3,  m4,  m5,  m6,  m7;
+
+  enum {
+    c0 =  MAD_F(0x1f838b8d),  /* 2 * cos( 1 * PI / 18) */
+    c1 =  MAD_F(0x1bb67ae8),  /* 2 * cos( 3 * PI / 18) */
+    c2 =  MAD_F(0x18836fa3),  /* 2 * cos( 4 * PI / 18) */
+    c3 =  MAD_F(0x1491b752),  /* 2 * cos( 5 * PI / 18) */
+    c4 =  MAD_F(0x0af1d43a),  /* 2 * cos( 7 * PI / 18) */
+    c5 =  MAD_F(0x058e86a0),  /* 2 * cos( 8 * PI / 18) */
+    c6 = -MAD_F(0x1e11f642)   /* 2 * cos(16 * PI / 18) */
+  };
+
+  a0 = x[3] + x[5];
+  a1 = x[3] - x[5];
+  a2 = x[6] + x[2];
+  a3 = x[6] - x[2];
+  a4 = x[1] + x[7];
+  a5 = x[1] - x[7];
+  a6 = x[8] + x[0];
+  a7 = x[8] - x[0];
+
+  a8  = a0  + a2;
+  a9  = a0  - a2;
+  a10 = a0  - a6;
+  a11 = a2  - a6;
+  a12 = a8  + a6;
+  a13 = a1  - a3;
+  a14 = a13 + a7;
+  a15 = a3  + a7;
+  a16 = a1  - a7;
+  a17 = a1  + a3;
+
+  m0 = mad_f_mul(a17, -c3);
+  m1 = mad_f_mul(a16, -c0);
+  m2 = mad_f_mul(a15, -c4);
+  m3 = mad_f_mul(a14, -c1);
+  m4 = mad_f_mul(a5,  -c1);
+  m5 = mad_f_mul(a11, -c6);
+  m6 = mad_f_mul(a10, -c5);
+  m7 = mad_f_mul(a9,  -c2);
+
+  a18 =     x[4] + a4;
+  a19 = 2 * x[4] - a4;
+  a20 = a19 + m5;
+  a21 = a19 - m5;
+  a22 = a19 + m6;
+  a23 = m4  + m2;
+  a24 = m4  - m2;
+  a25 = m4  + m1;
+
+  /* output to every other slot for convenience */
+
+  y[ 0] = a18 + a12;
+  y[ 2] = m0  - a25;
+  y[ 4] = m7  - a20;
+  y[ 6] = m3;
+  y[ 8] = a21 - m6;
+  y[10] = a24 - m1;
+  y[12] = a12 - 2 * a18;
+  y[14] = a23 + m0;
+  y[16] = a22 + m7;
+}
+
+static inline
+void sdctII(mad_fixed_t const x[18], mad_fixed_t X[18])
+{
+  mad_fixed_t tmp[9];
+  int i;
+
+  /* scale[i] = 2 * cos(PI * (2 * i + 1) / (2 * 18)) */
+  static mad_fixed_t const scale[9] = {
+    MAD_F(0x1fe0d3b4), MAD_F(0x1ee8dd47), MAD_F(0x1d007930),
+    MAD_F(0x1a367e59), MAD_F(0x16a09e66), MAD_F(0x125abcf8),
+    MAD_F(0x0d8616bc), MAD_F(0x08483ee1), MAD_F(0x02c9fad7)
+  };
+
+  /* divide the 18-point SDCT-II into two 9-point SDCT-IIs */
+
+  /* even input butterfly */
+
+  for (i = 0; i < 9; i += 3) {
+    tmp[i + 0] = x[i + 0] + x[18 - (i + 0) - 1];
+    tmp[i + 1] = x[i + 1] + x[18 - (i + 1) - 1];
+    tmp[i + 2] = x[i + 2] + x[18 - (i + 2) - 1];
+  }
+
+  fastsdct(tmp, &X[0]);
+
+  /* odd input butterfly and scaling */
+
+  for (i = 0; i < 9; i += 3) {
+    tmp[i + 0] = mad_f_mul(x[i + 0] - x[18 - (i + 0) - 1], scale[i + 0]);
+    tmp[i + 1] = mad_f_mul(x[i + 1] - x[18 - (i + 1) - 1], scale[i + 1]);
+    tmp[i + 2] = mad_f_mul(x[i + 2] - x[18 - (i + 2) - 1], scale[i + 2]);
+  }
+
+  fastsdct(tmp, &X[1]);
+
+  /* output accumulation */
+
+  for (i = 3; i < 18; i += 8) {
+    X[i + 0] -= X[(i + 0) - 2];
+    X[i + 2] -= X[(i + 2) - 2];
+    X[i + 4] -= X[(i + 4) - 2];
+    X[i + 6] -= X[(i + 6) - 2];
+  }
+}
+
+static inline
+void dctIV(mad_fixed_t const y[18], mad_fixed_t X[18])
+{
+  mad_fixed_t tmp[18];
+  int i;
+
+  /* scale[i] = 2 * cos(PI * (2 * i + 1) / (4 * 18)) */
+  static mad_fixed_t const scale[18] = {
+    MAD_F(0x1ff833fa), MAD_F(0x1fb9ea93), MAD_F(0x1f3dd120),
+    MAD_F(0x1e84d969), MAD_F(0x1d906bcf), MAD_F(0x1c62648b),
+    MAD_F(0x1afd100f), MAD_F(0x1963268b), MAD_F(0x1797c6a4),
+    MAD_F(0x159e6f5b), MAD_F(0x137af940), MAD_F(0x11318ef3),
+    MAD_F(0x0ec6a507), MAD_F(0x0c3ef153), MAD_F(0x099f61c5),
+    MAD_F(0x06ed12c5), MAD_F(0x042d4544), MAD_F(0x0165547c)
+  };
+
+  /* scaling */
+
+  for (i = 0; i < 18; i += 3) {
+    tmp[i + 0] = mad_f_mul(y[i + 0], scale[i + 0]);
+    tmp[i + 1] = mad_f_mul(y[i + 1], scale[i + 1]);
+    tmp[i + 2] = mad_f_mul(y[i + 2], scale[i + 2]);
+  }
+
+  /* SDCT-II */
+
+  sdctII(tmp, X);
+
+  /* scale reduction and output accumulation */
+
+  X[0] /= 2;
+  for (i = 1; i < 17; i += 4) {
+    X[i + 0] = X[i + 0] / 2 - X[(i + 0) - 1];
+    X[i + 1] = X[i + 1] / 2 - X[(i + 1) - 1];
+    X[i + 2] = X[i + 2] / 2 - X[(i + 2) - 1];
+    X[i + 3] = X[i + 3] / 2 - X[(i + 3) - 1];
+  }
+  X[17] = X[17] / 2 - X[16];
+}
+
+/*
+ * NAME:	imdct36
+ * DESCRIPTION:	perform X[18]->x[36] IMDCT using Szu-Wei Lee's fast algorithm
+ */
+static inline
+void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36])
+{
+  mad_fixed_t tmp[18];
+  int i;
+
+  /* DCT-IV */
+
+  dctIV(x, tmp);
+
+  /* convert 18-point DCT-IV to 36-point IMDCT */
+
+  for (i =  0; i <  9; i += 3) {
+    y[i + 0] =  tmp[9 + (i + 0)];
+    y[i + 1] =  tmp[9 + (i + 1)];
+    y[i + 2] =  tmp[9 + (i + 2)];
+  }
+  for (i =  9; i < 27; i += 3) {
+    y[i + 0] = -tmp[36 - (9 + (i + 0)) - 1];
+    y[i + 1] = -tmp[36 - (9 + (i + 1)) - 1];
+    y[i + 2] = -tmp[36 - (9 + (i + 2)) - 1];
+  }
+  for (i = 27; i < 36; i += 3) {
+    y[i + 0] = -tmp[(i + 0) - 27];
+    y[i + 1] = -tmp[(i + 1) - 27];
+    y[i + 2] = -tmp[(i + 2) - 27];
+  }
+}
+#  else
+/*
+ * NAME:	imdct36
+ * DESCRIPTION:	perform X[18]->x[36] IMDCT
+ */
+static inline
+void imdct36(mad_fixed_t const X[18], mad_fixed_t x[36])
+{
+  mad_fixed_t t0, t1, t2,  t3,  t4,  t5,  t6,  t7;
+  mad_fixed_t t8, t9, t10, t11, t12, t13, t14, t15;
+  register mad_fixed64hi_t hi;
+  register mad_fixed64lo_t lo;
+
+  MAD_F_ML0(hi, lo, X[4],  MAD_F(0x0ec835e8));
+  MAD_F_MLA(hi, lo, X[13], MAD_F(0x061f78aa));
+
+  t6 = MAD_F_MLZ(hi, lo);
+
+  MAD_F_MLA(hi, lo, (t14 = X[1] - X[10]), -MAD_F(0x061f78aa));
+  MAD_F_MLA(hi, lo, (t15 = X[7] + X[16]), -MAD_F(0x0ec835e8));
+
+  t0 = MAD_F_MLZ(hi, lo);
+
+  MAD_F_MLA(hi, lo, (t8  = X[0] - X[11] - X[12]),  MAD_F(0x0216a2a2));
+  MAD_F_MLA(hi, lo, (t9  = X[2] - X[9]  - X[14]),  MAD_F(0x09bd7ca0));
+  MAD_F_MLA(hi, lo, (t10 = X[3] - X[8]  - X[15]), -MAD_F(0x0cb19346));
+  MAD_F_MLA(hi, lo, (t11 = X[5] - X[6]  - X[17]), -MAD_F(0x0fdcf549));
+
+  x[7]  = MAD_F_MLZ(hi, lo);
+  x[10] = -x[7];
+
+  MAD_F_ML0(hi, lo, t8,  -MAD_F(0x0cb19346));
+  MAD_F_MLA(hi, lo, t9,   MAD_F(0x0fdcf549));
+  MAD_F_MLA(hi, lo, t10,  MAD_F(0x0216a2a2));
+  MAD_F_MLA(hi, lo, t11, -MAD_F(0x09bd7ca0));
+
+  x[19] = x[34] = MAD_F_MLZ(hi, lo) - t0;
+
+  t12 = X[0] - X[3] + X[8] - X[11] - X[12] + X[15];
+  t13 = X[2] + X[5] - X[6] - X[9]  - X[14] - X[17];
+
+  MAD_F_ML0(hi, lo, t12, -MAD_F(0x0ec835e8));
+  MAD_F_MLA(hi, lo, t13,  MAD_F(0x061f78aa));
+
+  x[22] = x[31] = MAD_F_MLZ(hi, lo) + t0;
+
+  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x09bd7ca0));
+  MAD_F_MLA(hi, lo, X[7],   MAD_F(0x0216a2a2));
+  MAD_F_MLA(hi, lo, X[10], -MAD_F(0x0fdcf549));
+  MAD_F_MLA(hi, lo, X[16],  MAD_F(0x0cb19346));
+
+  t1 = MAD_F_MLZ(hi, lo) + t6;
+
+  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0f9ee890));
+
+  x[6]  = MAD_F_MLZ(hi, lo) + t1;
+  x[11] = -x[6];
+
+  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x04cfb0e2));
+
+  x[23] = x[30] = MAD_F_MLZ(hi, lo) + t1;
+
+  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0acf37ad));
+
+  x[18] = x[35] = MAD_F_MLZ(hi, lo) - t1;
+
+  MAD_F_ML0(hi, lo, X[4],   MAD_F(0x061f78aa));
+  MAD_F_MLA(hi, lo, X[13], -MAD_F(0x0ec835e8));
+
+  t7 = MAD_F_MLZ(hi, lo);
+
+  MAD_F_MLA(hi, lo, X[1],  -MAD_F(0x0cb19346));
+  MAD_F_MLA(hi, lo, X[7],   MAD_F(0x0fdcf549));
+  MAD_F_MLA(hi, lo, X[10],  MAD_F(0x0216a2a2));
+  MAD_F_MLA(hi, lo, X[16], -MAD_F(0x09bd7ca0));
+
+  t2 = MAD_F_MLZ(hi, lo);
+
+  MAD_F_MLA(hi, lo, X[0],   MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x0f426cb5));
+
+  x[5]  = MAD_F_MLZ(hi, lo);
+  x[12] = -x[5];
+
+  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0bcbe352));
+
+  x[0]  = MAD_F_MLZ(hi, lo) + t2;
+  x[17] = -x[0];
+
+  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x03768962));
+
+  x[24] = x[29] = MAD_F_MLZ(hi, lo) + t2;
+
+  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x0216a2a2));
+  MAD_F_MLA(hi, lo, X[7],  -MAD_F(0x09bd7ca0));
+  MAD_F_MLA(hi, lo, X[10],  MAD_F(0x0cb19346));
+  MAD_F_MLA(hi, lo, X[16],  MAD_F(0x0fdcf549));
+
+  t3 = MAD_F_MLZ(hi, lo) + t7;
+
+  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0ffc19fd));
+
+  x[8] = MAD_F_MLZ(hi, lo) + t3;
+  x[9] = -x[8];
+
+  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x07635284));
+
+  x[21] = x[32] = MAD_F_MLZ(hi, lo) + t3;
+
+  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0898c779));
+
+  x[20] = x[33] = MAD_F_MLZ(hi, lo) - t3;
+
+  MAD_F_ML0(hi, lo, t14, -MAD_F(0x0ec835e8));
+  MAD_F_MLA(hi, lo, t15,  MAD_F(0x061f78aa));
+
+  t4 = MAD_F_MLZ(hi, lo) - t7;
+
+  MAD_F_ML0(hi, lo, t12, MAD_F(0x061f78aa));
+  MAD_F_MLA(hi, lo, t13, MAD_F(0x0ec835e8));
+
+  x[4]  = MAD_F_MLZ(hi, lo) + t4;
+  x[13] = -x[4];
+
+  MAD_F_ML0(hi, lo, t8,   MAD_F(0x09bd7ca0));
+  MAD_F_MLA(hi, lo, t9,  -MAD_F(0x0216a2a2));
+  MAD_F_MLA(hi, lo, t10,  MAD_F(0x0fdcf549));
+  MAD_F_MLA(hi, lo, t11, -MAD_F(0x0cb19346));
+
+  x[1]  = MAD_F_MLZ(hi, lo) + t4;
+  x[16] = -x[1];
+
+  MAD_F_ML0(hi, lo, t8,  -MAD_F(0x0fdcf549));
+  MAD_F_MLA(hi, lo, t9,  -MAD_F(0x0cb19346));
+  MAD_F_MLA(hi, lo, t10, -MAD_F(0x09bd7ca0));
+  MAD_F_MLA(hi, lo, t11, -MAD_F(0x0216a2a2));
+
+  x[25] = x[28] = MAD_F_MLZ(hi, lo) + t4;
+
+  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x0fdcf549));
+  MAD_F_MLA(hi, lo, X[7],  -MAD_F(0x0cb19346));
+  MAD_F_MLA(hi, lo, X[10], -MAD_F(0x09bd7ca0));
+  MAD_F_MLA(hi, lo, X[16], -MAD_F(0x0216a2a2));
+
+  t5 = MAD_F_MLZ(hi, lo) - t6;
+
+  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0d7e8807));
+
+  x[2]  = MAD_F_MLZ(hi, lo) + t5;
+  x[15] = -x[2];
+
+  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x00b2aa3e));
+  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x0e313245));
+
+  x[3]  = MAD_F_MLZ(hi, lo) + t5;
+  x[14] = -x[3];
+
+  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0ffc19fd));
+  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x0f9ee890));
+  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0f426cb5));
+  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0e313245));
+  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0d7e8807));
+  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0bcbe352));
+  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0acf37ad));
+  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0898c779));
+  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x07635284));
+  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x04cfb0e2));
+  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x03768962));
+  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x00b2aa3e));
+
+  x[26] = x[27] = MAD_F_MLZ(hi, lo) + t5;
+}
+#  endif
+
+/*
+ * NAME:	III_imdct_l()
+ * DESCRIPTION:	perform IMDCT and windowing for long blocks
+ */
+static
+void III_imdct_l(mad_fixed_t const X[18], mad_fixed_t z[36],
+		 unsigned int block_type)
+{
+  unsigned int i;
+
+  /* IMDCT */
+
+  imdct36(X, z);
+
+  /* windowing */
+
+  switch (block_type) {
+  case 0:  /* normal window */
+# if defined(ASO_INTERLEAVE1)
+    {
+      register mad_fixed_t tmp1, tmp2;
+
+      tmp1 = window_l[0];
+      tmp2 = window_l[1];
+
+      for (i = 0; i < 34; i += 2) {
+	z[i + 0] = mad_f_mul(z[i + 0], tmp1);
+	tmp1 = window_l[i + 2];
+	z[i + 1] = mad_f_mul(z[i + 1], tmp2);
+	tmp2 = window_l[i + 3];
+      }
+
+      z[34] = mad_f_mul(z[34], tmp1);
+      z[35] = mad_f_mul(z[35], tmp2);
+    }
+# elif defined(ASO_INTERLEAVE2)
+    {
+      register mad_fixed_t tmp1, tmp2;
+
+      tmp1 = z[0];
+      tmp2 = window_l[0];
+
+      for (i = 0; i < 35; ++i) {
+	z[i] = mad_f_mul(tmp1, tmp2);
+	tmp1 = z[i + 1];
+	tmp2 = window_l[i + 1];
+      }
+
+      z[35] = mad_f_mul(tmp1, tmp2);
+    }
+# elif 1
+    for (i = 0; i < 36; i += 4) {
+      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
+      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
+      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
+      z[i + 3] = mad_f_mul(z[i + 3], window_l[i + 3]);
+    }
+# else
+    for (i =  0; i < 36; ++i) z[i] = mad_f_mul(z[i], window_l[i]);
+# endif
+    break;
+
+  case 1:  /* start block */
+    for (i =  0; i < 18; i += 3) {
+      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
+      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
+      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
+    }
+    /*  (i = 18; i < 24; ++i) z[i] unchanged */
+    for (i = 24; i < 30; ++i) z[i] = mad_f_mul(z[i], window_s[i - 18]);
+    for (i = 30; i < 36; ++i) z[i] = 0;
+    break;
+
+  case 3:  /* stop block */
+    for (i =  0; i <  6; ++i) z[i] = 0;
+    for (i =  6; i < 12; ++i) z[i] = mad_f_mul(z[i], window_s[i - 6]);
+    /*  (i = 12; i < 18; ++i) z[i] unchanged */
+    for (i = 18; i < 36; i += 3) {
+      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
+      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
+      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
+    }
+    break;
+  }
+}
+# endif  /* ASO_IMDCT */
+
+/*
+ * NAME:	III_imdct_s()
+ * DESCRIPTION:	perform IMDCT and windowing for short blocks
+ */
+static
+void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36])
+{
+  mad_fixed_t y[36], *yptr;
+  mad_fixed_t const *wptr;
+  int w, i;
+  register mad_fixed64hi_t hi;
+  register mad_fixed64lo_t lo;
+
+  /* IMDCT */
+
+  yptr = &y[0];
+
+  for (w = 0; w < 3; ++w) {
+    register mad_fixed_t const (*s)[6];
+
+    s = imdct_s;
+
+    for (i = 0; i < 3; ++i) {
+      MAD_F_ML0(hi, lo, X[0], (*s)[0]);
+      MAD_F_MLA(hi, lo, X[1], (*s)[1]);
+      MAD_F_MLA(hi, lo, X[2], (*s)[2]);
+      MAD_F_MLA(hi, lo, X[3], (*s)[3]);
+      MAD_F_MLA(hi, lo, X[4], (*s)[4]);
+      MAD_F_MLA(hi, lo, X[5], (*s)[5]);
+
+      yptr[i + 0] = MAD_F_MLZ(hi, lo);
+      yptr[5 - i] = -yptr[i + 0];
+
+      ++s;
+
+      MAD_F_ML0(hi, lo, X[0], (*s)[0]);
+      MAD_F_MLA(hi, lo, X[1], (*s)[1]);
+      MAD_F_MLA(hi, lo, X[2], (*s)[2]);
+      MAD_F_MLA(hi, lo, X[3], (*s)[3]);
+      MAD_F_MLA(hi, lo, X[4], (*s)[4]);
+      MAD_F_MLA(hi, lo, X[5], (*s)[5]);
+
+      yptr[ i + 6] = MAD_F_MLZ(hi, lo);
+      yptr[11 - i] = yptr[i + 6];
+
+      ++s;
+    }
+
+    yptr += 12;
+    X    += 6;
+  }
+
+  /* windowing, overlapping and concatenation */
+
+  yptr = &y[0];
+  wptr = &window_s[0];
+
+  for (i = 0; i < 6; ++i) {
+    z[i +  0] = 0;
+    z[i +  6] = mad_f_mul(yptr[ 0 + 0], wptr[0]);
+
+    MAD_F_ML0(hi, lo, yptr[ 0 + 6], wptr[6]);
+    MAD_F_MLA(hi, lo, yptr[12 + 0], wptr[0]);
+
+    z[i + 12] = MAD_F_MLZ(hi, lo);
+
+    MAD_F_ML0(hi, lo, yptr[12 + 6], wptr[6]);
+    MAD_F_MLA(hi, lo, yptr[24 + 0], wptr[0]);
+
+    z[i + 18] = MAD_F_MLZ(hi, lo);
+
+    z[i + 24] = mad_f_mul(yptr[24 + 6], wptr[6]);
+    z[i + 30] = 0;
+
+    ++yptr;
+    ++wptr;
+  }
+}
+
+/*
+ * NAME:	III_overlap()
+ * DESCRIPTION:	perform overlap-add of windowed IMDCT outputs
+ */
+static
+void III_overlap(mad_fixed_t const output[36], mad_fixed_t overlap[18],
+		 mad_fixed_t sample[18][32], unsigned int sb)
+{
+  unsigned int i;
+
+# if defined(ASO_INTERLEAVE2)
+  {
+    register mad_fixed_t tmp1, tmp2;
+
+    tmp1 = overlap[0];
+    tmp2 = overlap[1];
+
+    for (i = 0; i < 16; i += 2) {
+      sample[i + 0][sb] = output[i + 0 +  0] + tmp1;
+      overlap[i + 0]    = output[i + 0 + 18];
+      tmp1 = overlap[i + 2];
+
+      sample[i + 1][sb] = output[i + 1 +  0] + tmp2;
+      overlap[i + 1]    = output[i + 1 + 18];
+      tmp2 = overlap[i + 3];
+    }
+
+    sample[16][sb] = output[16 +  0] + tmp1;
+    overlap[16]    = output[16 + 18];
+    sample[17][sb] = output[17 +  0] + tmp2;
+    overlap[17]    = output[17 + 18];
+  }
+# elif 0
+  for (i = 0; i < 18; i += 2) {
+    sample[i + 0][sb] = output[i + 0 +  0] + overlap[i + 0];
+    overlap[i + 0]    = output[i + 0 + 18];
+
+    sample[i + 1][sb] = output[i + 1 +  0] + overlap[i + 1];
+    overlap[i + 1]    = output[i + 1 + 18];
+  }
+# else
+  for (i = 0; i < 18; ++i) {
+    sample[i][sb] = output[i +  0] + overlap[i];
+    overlap[i]    = output[i + 18];
+  }
+# endif
+}
+
+/*
+ * NAME:	III_overlap_z()
+ * DESCRIPTION:	perform "overlap-add" of zero IMDCT outputs
+ */
+static inline
+void III_overlap_z(mad_fixed_t overlap[18],
+		   mad_fixed_t sample[18][32], unsigned int sb)
+{
+  unsigned int i;
+
+# if defined(ASO_INTERLEAVE2)
+  {
+    register mad_fixed_t tmp1, tmp2;
+
+    tmp1 = overlap[0];
+    tmp2 = overlap[1];
+
+    for (i = 0; i < 16; i += 2) {
+      sample[i + 0][sb] = tmp1;
+      overlap[i + 0]    = 0;
+      tmp1 = overlap[i + 2];
+
+      sample[i + 1][sb] = tmp2;
+      overlap[i + 1]    = 0;
+      tmp2 = overlap[i + 3];
+    }
+
+    sample[16][sb] = tmp1;
+    overlap[16]    = 0;
+    sample[17][sb] = tmp2;
+    overlap[17]    = 0;
+  }
+# else
+  for (i = 0; i < 18; ++i) {
+    sample[i][sb] = overlap[i];
+    overlap[i]    = 0;
+  }
+# endif
+}
+
+/*
+ * NAME:	III_freqinver()
+ * DESCRIPTION:	perform subband frequency inversion for odd sample lines
+ */
+static
+void III_freqinver(mad_fixed_t sample[18][32], unsigned int sb)
+{
+  unsigned int i;
+
+# if 1 || defined(ASO_INTERLEAVE1) || defined(ASO_INTERLEAVE2)
+  {
+    register mad_fixed_t tmp1, tmp2;
+
+    tmp1 = sample[1][sb];
+    tmp2 = sample[3][sb];
+
+    for (i = 1; i < 13; i += 4) {
+      sample[i + 0][sb] = -tmp1;
+      tmp1 = sample[i + 4][sb];
+      sample[i + 2][sb] = -tmp2;
+      tmp2 = sample[i + 6][sb];
+    }
+
+    sample[13][sb] = -tmp1;
+    tmp1 = sample[17][sb];
+    sample[15][sb] = -tmp2;
+    sample[17][sb] = -tmp1;
+  }
+# else
+  for (i = 1; i < 18; i += 2)
+    sample[i][sb] = -sample[i][sb];
+# endif
+}
+
+/*
+ * NAME:	III_decode()
+ * DESCRIPTION:	decode frame main_data
+ */
+static
+enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
+			  struct sideinfo *si, unsigned int nch, unsigned int md_len)
+{
+  struct mad_header *header = &frame->header;
+  unsigned int sfreqi, ngr, gr;
+  int bits_left = md_len * CHAR_BIT;
+
+  {
+    unsigned int sfreq;
+
+    sfreq = header->samplerate;
+    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
+      sfreq *= 2;
+
+    /* 48000 => 0, 44100 => 1, 32000 => 2,
+       24000 => 3, 22050 => 4, 16000 => 5 */
+    sfreqi = ((sfreq >>  7) & 0x000f) +
+             ((sfreq >> 15) & 0x0001) - 8;
+
+    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
+      sfreqi += 3;
+  }
+
+  /* scalefactors, Huffman decoding, requantization */
+
+  ngr = (header->flags & MAD_FLAG_LSF_EXT) ? 1 : 2;
+
+  for (gr = 0; gr < ngr; ++gr) {
+    struct granule *granule = &si->gr[gr];
+    unsigned char const *sfbwidth[2];
+    mad_fixed_t xr[2][576];
+    unsigned int ch;
+    enum mad_error error;
+
+    for (ch = 0; ch < nch; ++ch) {
+      struct channel *channel = &granule->ch[ch];
+      unsigned int part2_length;
+      unsigned int part3_length;
+
+      sfbwidth[ch] = sfbwidth_table[sfreqi].l;
+      if (channel->block_type == 2) {
+	sfbwidth[ch] = (channel->flags & mixed_block_flag) ?
+	  sfbwidth_table[sfreqi].m : sfbwidth_table[sfreqi].s;
+      }
+
+      if (header->flags & MAD_FLAG_LSF_EXT) {
+	error = III_scalefactors_lsf(ptr, channel,
+					    ch == 0 ? 0 : &si->gr[1].ch[1],
+					    header->mode_extension, bits_left, &part2_length);
+      }
+      else {
+	error = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
+					gr == 0 ? 0 : si->scfsi[ch], bits_left, &part2_length);
+      }
+      if (error)
+        return error;
+
+      bits_left -= part2_length;
+
+      if (part2_length > channel->part2_3_length)
+        return MAD_ERROR_BADPART3LEN;
+
+      part3_length = channel->part2_3_length - part2_length;
+      if (part3_length > bits_left)
+        return MAD_ERROR_BADPART3LEN;
+
+      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part3_length);
+      if (error)
+	return error;
+      bits_left -= part3_length;
+    }
+
+    /* joint stereo processing */
+
+    if (header->mode == MAD_MODE_JOINT_STEREO && header->mode_extension) {
+      error = III_stereo(xr, granule, header, sfbwidth[0]);
+      if (error)
+	return error;
+    }
+
+    /* reordering, alias reduction, IMDCT, overlap-add, frequency inversion */
+
+    for (ch = 0; ch < nch; ++ch) {
+      struct channel const *channel = &granule->ch[ch];
+      mad_fixed_t (*sample)[32] = &frame->sbsample[ch][18 * gr];
+      unsigned int sb, l, i, sblimit;
+      mad_fixed_t output[36];
+
+      if (channel->block_type == 2) {
+	III_reorder(xr[ch], channel, sfbwidth[ch]);
+
+# if !defined(OPT_STRICT)
+	/*
+	 * According to ISO/IEC 11172-3, "Alias reduction is not applied for
+	 * granules with block_type == 2 (short block)." However, other
+	 * sources suggest alias reduction should indeed be performed on the
+	 * lower two subbands of mixed blocks. Most other implementations do
+	 * this, so by default we will too.
+	 */
+	if (channel->flags & mixed_block_flag)
+	  III_aliasreduce(xr[ch], 36);
+# endif
+      }
+      else
+	III_aliasreduce(xr[ch], 576);
+
+      l = 0;
+
+      /* subbands 0-1 */
+
+      if (channel->block_type != 2 || (channel->flags & mixed_block_flag)) {
+	unsigned int block_type;
+
+	block_type = channel->block_type;
+	if (channel->flags & mixed_block_flag)
+	  block_type = 0;
+
+	/* long blocks */
+	for (sb = 0; sb < 2; ++sb, l += 18) {
+	  III_imdct_l(&xr[ch][l], output, block_type);
+	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
+	}
+      }
+      else {
+	/* short blocks */
+	for (sb = 0; sb < 2; ++sb, l += 18) {
+	  III_imdct_s(&xr[ch][l], output);
+	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
+	}
+      }
+
+      III_freqinver(sample, 1);
+
+      /* (nonzero) subbands 2-31 */
+
+      i = 576;
+      while (i > 36 && xr[ch][i - 1] == 0)
+	--i;
+
+      sblimit = 32 - (576 - i) / 18;
+
+      if (channel->block_type != 2) {
+	/* long blocks */
+	for (sb = 2; sb < sblimit; ++sb, l += 18) {
+	  III_imdct_l(&xr[ch][l], output, channel->block_type);
+	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
+
+	  if (sb & 1)
+	    III_freqinver(sample, sb);
+	}
+      }
+      else {
+	/* short blocks */
+	for (sb = 2; sb < sblimit; ++sb, l += 18) {
+	  III_imdct_s(&xr[ch][l], output);
+	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
+
+	  if (sb & 1)
+	    III_freqinver(sample, sb);
+	}
+      }
+
+      /* remaining (zero) subbands */
+
+      for (sb = sblimit; sb < 32; ++sb) {
+	III_overlap_z((*frame->overlap)[ch][sb], sample, sb);
+
+	if (sb & 1)
+	  III_freqinver(sample, sb);
+      }
+    }
+  }
+
+  return MAD_ERROR_NONE;
+}
+
+/*
+ * NAME:	layer->III()
+ * DESCRIPTION:	decode a single Layer III frame
+ */
+int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
+{
+  struct mad_header *header = &frame->header;
+  unsigned int nch, priv_bitlen, next_md_begin = 0;
+  unsigned int si_len, data_bitlen, md_len;
+  unsigned int frame_space, frame_used, frame_free;
+  struct mad_bitptr ptr, bufend_ptr;
+  struct sideinfo si;
+  enum mad_error error;
+  int result = 0;
+
+  mad_bit_init(&bufend_ptr, stream->bufend);
+
+  /* allocate Layer III dynamic structures */
+
+  if (stream->main_data == 0) {
+    stream->main_data = malloc(MAD_BUFFER_MDLEN);
+    if (stream->main_data == 0) {
+      stream->error = MAD_ERROR_NOMEM;
+      return -1;
+    }
+  }
+
+  if (frame->overlap == 0) {
+    frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t));
+    if (frame->overlap == 0) {
+      stream->error = MAD_ERROR_NOMEM;
+      return -1;
+    }
+  }
+
+  nch = MAD_NCHANNELS(header);
+  si_len = (header->flags & MAD_FLAG_LSF_EXT) ?
+    (nch == 1 ? 9 : 17) : (nch == 1 ? 17 : 32);
+
+  /* check frame sanity */
+
+  if (stream->next_frame - mad_bit_nextbyte(&stream->ptr) <
+      (signed int) si_len) {
+    stream->error = MAD_ERROR_BADFRAMELEN;
+    stream->md_len = 0;
+    return -1;
+  }
+
+  /* check CRC word */
+
+  if (header->flags & MAD_FLAG_PROTECTION) {
+    header->crc_check =
+      mad_bit_crc(stream->ptr, si_len * CHAR_BIT, header->crc_check);
+
+    if (header->crc_check != header->crc_target &&
+	!(frame->options & MAD_OPTION_IGNORECRC)) {
+      stream->error = MAD_ERROR_BADCRC;
+      result = -1;
+    }
+  }
+
+  /* decode frame side information */
+
+  error = III_sideinfo(&stream->ptr, nch, header->flags & MAD_FLAG_LSF_EXT,
+		       &si, &data_bitlen, &priv_bitlen);
+  if (error && result == 0) {
+    stream->error = error;
+    result = -1;
+  }
+
+  header->flags        |= priv_bitlen;
+  header->private_bits |= si.private_bits;
+
+  /* find main_data of next frame */
+
+  {
+    struct mad_bitptr peek;
+    unsigned long header;
+
+    mad_bit_init(&peek, stream->next_frame);
+    if (mad_bit_length(&peek, &bufend_ptr) >= 57) {
+      header = mad_bit_read(&peek, 32);
+      if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
+        if (!(header & 0x00010000L))  /* protection_bit */
+	  mad_bit_skip(&peek, 16);  /* crc_check */
+
+        next_md_begin =
+	  mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
+      }
+    }
+
+    mad_bit_finish(&peek);
+  }
+
+  /* find main_data of this frame */
+
+  frame_space = stream->next_frame - mad_bit_nextbyte(&stream->ptr);
+
+  if (next_md_begin > si.main_data_begin + frame_space)
+    next_md_begin = 0;
+
+  md_len = si.main_data_begin + frame_space - next_md_begin;
+  if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN) {
+    stream->error = MAD_ERROR_LOSTSYNC;
+    stream->sync = 0;
+    return -1;
+  }
+
+  frame_used = 0;
+
+  if (si.main_data_begin == 0) {
+    ptr = stream->ptr;
+    stream->md_len = 0;
+
+    frame_used = md_len;
+  }
+  else {
+    if (si.main_data_begin > stream->md_len) {
+      if (result == 0) {
+	stream->error = MAD_ERROR_BADDATAPTR;
+	result = -1;
+      }
+    }
+    else {
+      memmove(stream->main_data,
+	*stream->main_data + stream->md_len - si.main_data_begin,
+	si.main_data_begin);
+      stream->md_len = si.main_data_begin;
+      mad_bit_init(&ptr, *stream->main_data);
+
+      if (md_len > si.main_data_begin) {
+	assert(stream->md_len + md_len -
+	       si.main_data_begin <= MAD_BUFFER_MDLEN);
+
+	memcpy(*stream->main_data + stream->md_len,
+	       mad_bit_nextbyte(&stream->ptr),
+	       frame_used = md_len - si.main_data_begin);
+	stream->md_len += frame_used;
+      }
+    }
+  }
+
+  frame_free = frame_space - frame_used;
+
+  /* decode main_data */
+
+  if (result == 0) {
+    error = III_decode(&ptr, frame, &si, nch, md_len);
+    if (error) {
+      stream->error = error;
+      result = -1;
+    }
+
+    /* designate ancillary bits */
+
+    stream->anc_ptr    = ptr;
+    stream->anc_bitlen = md_len * CHAR_BIT - data_bitlen;
+  }
+
+# if 0 && defined(DEBUG)
+  fprintf(stderr,
+	  "main_data_begin:%u, md_len:%u, frame_free:%u, "
+	  "data_bitlen:%u, anc_bitlen: %u\n",
+	  si.main_data_begin, md_len, frame_free,
+	  data_bitlen, stream->anc_bitlen);
+# endif
+
+  /* preload main_data buffer with up to 511 bytes for next frame(s) */
+
+  if (frame_free >= next_md_begin) {
+    memcpy(*stream->main_data,
+	   stream->next_frame - next_md_begin, next_md_begin);
+    stream->md_len = next_md_begin;
+  }
+  else {
+    if (md_len < si.main_data_begin) {
+      unsigned int extra;
+
+      extra = si.main_data_begin - md_len;
+      if (extra + frame_free > next_md_begin)
+	extra = next_md_begin - frame_free;
+
+      if (extra < stream->md_len) {
+	memmove(*stream->main_data,
+		*stream->main_data + stream->md_len - extra, extra);
+	stream->md_len = extra;
+      }
+    }
+    else
+      stream->md_len = 0;
+
+    memcpy(*stream->main_data + stream->md_len,
+	   stream->next_frame - frame_free, frame_free);
+    stream->md_len += frame_free;
+  }
+
+  return result;
+}
diff --git a/code/libmad/layer3.h b/code/libmad/layer3.h
new file mode 100644
index 00000000..618951b0
--- /dev/null
+++ b/code/libmad/layer3.h
@@ -0,0 +1,29 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: layer3.h,v 1.10 2004/01/23 09:41:32 rob Exp $
+ */
+
+# ifndef LIBMAD_LAYER3_H
+# define LIBMAD_LAYER3_H
+
+# include "mad.h"
+
+int mad_layer_III(struct mad_stream *, struct mad_frame *);
+
+# endif
diff --git a/code/libmad/mad.h.in b/code/libmad/mad.h.in
new file mode 100644
index 00000000..0e790d3e
--- /dev/null
+++ b/code/libmad/mad.h.in
@@ -0,0 +1,956 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * If you would like to negotiate alternate licensing terms, you may do
+ * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+#cmakedefine FPM_INTEL
+#cmakedefine FPM_ARM
+#cmakedefine FPM_MIPS
+#cmakedefine FPM_SPARC
+#cmakedefine FPM_PPC
+#cmakedefine FPM_64BIT
+#cmakedefine FPM_DEFAULT
+
+# define SIZEOF_INT @SIZEOF_INT@
+
+/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
+
+# ifndef LIBMAD_VERSION_H
+# define LIBMAD_VERSION_H
+
+# define MAD_VERSION_MAJOR	@CMAKE_PROJECT_VERSION_MAJOR@
+# define MAD_VERSION_MINOR	@CMAKE_PROJECT_VERSION_MINOR@
+# define MAD_VERSION_PATCH	@CMAKE_PROJECT_VERSION_PATCH@
+# define MAD_VERSION_EXTRA	""
+
+# define MAD_VERSION_STRINGIZE(str)	#str
+# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
+
+# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
+				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
+				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
+				MAD_VERSION_EXTRA
+
+# define MAD_PUBLISHYEAR	"2000-2004"
+# define MAD_AUTHOR		"Underbit Technologies, Inc."
+# define MAD_EMAIL		"info@underbit.com"
+
+extern char const mad_version[];
+extern char const mad_copyright[];
+extern char const mad_author[];
+extern char const mad_build[];
+
+# endif
+
+/* Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp */
+
+# ifndef LIBMAD_FIXED_H
+# define LIBMAD_FIXED_H
+
+# include <stdint.h>
+
+# if SIZEOF_INT >= 4
+typedef   signed int mad_fixed_t;
+typedef   signed int mad_fixed64hi_t;
+typedef unsigned int mad_fixed64lo_t;
+# else
+typedef   signed long mad_fixed_t;
+typedef   signed long mad_fixed64hi_t;
+typedef unsigned long mad_fixed64lo_t;
+# endif
+
+typedef int64_t mad_fixed64_t;
+
+# if defined(FPM_FLOAT)
+typedef double mad_sample_t;
+# else
+typedef mad_fixed_t mad_sample_t;
+# endif
+
+/*
+ * Fixed-point format: 0xABBBBBBB
+ * A == whole part      (sign + 3 bits)
+ * B == fractional part (28 bits)
+ *
+ * Values are signed two's complement, so the effective range is:
+ * 0x80000000 to 0x7fffffff
+ *       -8.0 to +7.9999999962747097015380859375
+ *
+ * The smallest representable value is:
+ * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
+ *
+ * 28 bits of fractional accuracy represent about
+ * 8.6 digits of decimal accuracy.
+ *
+ * Fixed-point numbers can be added or subtracted as normal
+ * integers, but multiplication requires shifting the 64-bit result
+ * from 56 fractional bits back to 28 (and rounding.)
+ *
+ * Changing the definition of MAD_F_FRACBITS is only partially
+ * supported, and must be done with care.
+ */
+
+# define MAD_F_FRACBITS		28
+
+# if MAD_F_FRACBITS == 28
+#  define MAD_F(x)		((mad_fixed_t) (x##L))
+# else
+#  if MAD_F_FRACBITS < 28
+#   warning "MAD_F_FRACBITS < 28"
+#   define MAD_F(x)		((mad_fixed_t)  \
+				 (((x##L) +  \
+				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
+				  (28 - MAD_F_FRACBITS)))
+#  elif MAD_F_FRACBITS > 28
+#   error "MAD_F_FRACBITS > 28 not currently supported"
+#   define MAD_F(x)		((mad_fixed_t)  \
+				 ((x##L) << (MAD_F_FRACBITS - 28)))
+#  endif
+# endif
+
+# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
+# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
+
+# define MAD_F_ONE		MAD_F(0x10000000)
+
+# define mad_f_tofixed(x)	((mad_fixed_t)  \
+				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
+# define mad_f_todouble(x)	((double)  \
+				 ((x) / (double) (1L << MAD_F_FRACBITS)))
+
+# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
+# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
+				/* (x should be positive) */
+
+# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
+
+# define mad_f_add(x, y)	((x) + (y))
+# define mad_f_sub(x, y)	((x) - (y))
+
+# if defined(FPM_FLOAT)
+#  error "FPM_FLOAT not yet supported"
+
+#  undef MAD_F
+#  define MAD_F(x)		mad_f_todouble(x)
+
+#  define mad_f_mul(x, y)	((x) * (y))
+#  define mad_f_scale64
+
+#  undef ASO_ZEROCHECK
+
+# elif defined(FPM_64BIT)
+
+/*
+ * This version should be the most accurate if 64-bit types are supported by
+ * the compiler, although it may not be the most efficient.
+ */
+#  if defined(OPT_ACCURACY)
+#   define mad_f_mul(x, y)  \
+    ((mad_fixed_t)  \
+     ((((mad_fixed64_t) (x) * (y)) +  \
+       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
+#  else
+#   define mad_f_mul(x, y)  \
+    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
+#  endif
+
+#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
+
+/* --- Intel --------------------------------------------------------------- */
+
+# elif defined(FPM_INTEL)
+
+#  if defined(_MSC_VER)
+#   pragma warning(push)
+#   pragma warning(disable: 4035)  /* no return value */
+static __forceinline
+mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
+{
+  enum {
+    fracbits = MAD_F_FRACBITS
+  };
+
+  __asm {
+    mov eax, x
+    imul y
+    shrd eax, edx, fracbits
+  }
+
+  /* implicit return of eax */
+}
+#   pragma warning(pop)
+
+#   define mad_f_mul		mad_f_mul_inline
+#   define mad_f_scale64
+#  else
+/*
+ * This Intel version is fast and accurate; the disposition of the least
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+ */
+#   define MAD_F_MLX(hi, lo, x, y)  \
+    asm ("imull %3"  \
+	 : "=a" (lo), "=d" (hi)  \
+	 : "%a" (x), "rm" (y)  \
+	 : "cc")
+
+#   if defined(OPT_ACCURACY)
+/*
+ * This gives best accuracy but is not very fast.
+ */
+#    define MAD_F_MLA(hi, lo, x, y)  \
+    ({ mad_fixed64hi_t __hi;  \
+       mad_fixed64lo_t __lo;  \
+       MAD_F_MLX(__hi, __lo, (x), (y));  \
+       asm ("addl %2,%0\n\t"  \
+	    "adcl %3,%1"  \
+	    : "=rm" (lo), "=rm" (hi)  \
+	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
+	    : "cc");  \
+    })
+#   endif  /* OPT_ACCURACY */
+
+#   if defined(OPT_ACCURACY)
+/*
+ * Surprisingly, this is faster than SHRD followed by ADC.
+ */
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed64hi_t __hi_;  \
+       mad_fixed64lo_t __lo_;  \
+       mad_fixed_t __result;  \
+       asm ("addl %4,%2\n\t"  \
+	    "adcl %5,%3"  \
+	    : "=rm" (__lo_), "=rm" (__hi_)  \
+	    : "0" (lo), "1" (hi),  \
+	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
+	    : "cc");  \
+       asm ("shrdl %3,%2,%1"  \
+	    : "=rm" (__result)  \
+	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       __result;  \
+    })
+#   elif defined(OPT_INTEL)
+/*
+ * Alternate Intel scaling that may or may not perform better.
+ */
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("shrl %3,%1\n\t"  \
+	    "shll %4,%2\n\t"  \
+	    "orl %2,%1"  \
+	    : "=rm" (__result)  \
+	    : "0" (lo), "r" (hi),  \
+	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       __result;  \
+    })
+#   else
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("shrdl %3,%2,%1"  \
+	    : "=rm" (__result)  \
+	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       __result;  \
+    })
+#   endif  /* OPT_ACCURACY */
+
+#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
+#  endif
+
+/* --- ARM ----------------------------------------------------------------- */
+
+# elif defined(FPM_ARM)
+
+/* 
+ * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
+ * least significant bit is properly rounded at no CPU cycle cost!
+ */
+# if 1
+/*
+ * This is faster than the default implementation via MAD_F_MLX() and
+ * mad_f_scale64().
+ */
+#  define mad_f_mul(x, y)  \
+    ({ mad_fixed64hi_t __hi;  \
+       mad_fixed64lo_t __lo;  \
+       mad_fixed_t __result;  \
+       asm ("smull	%0, %1, %3, %4\n\t"  \
+	    "movs	%0, %0, lsr %5\n\t"  \
+	    "adc	%2, %0, %1, lsl %6"  \
+	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
+	    : "%r" (x), "r" (y),  \
+	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       __result;  \
+    })
+# endif
+
+#  define MAD_F_MLX(hi, lo, x, y)  \
+    asm ("smull	%0, %1, %2, %3"  \
+	 : "=&r" (lo), "=&r" (hi)  \
+	 : "%r" (x), "r" (y))
+
+#  define MAD_F_MLA(hi, lo, x, y)  \
+    asm ("smlal	%0, %1, %2, %3"  \
+	 : "+r" (lo), "+r" (hi)  \
+	 : "%r" (x), "r" (y))
+
+#ifdef __thumb__
+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
+	operand.  If needed this code can also support Thumb-1
+	(simply append "s" to the end of the second two instructions). */
+#  define MAD_F_MLN(hi, lo)  \
+    asm ("rsbs        %0, %0, #0\n\t"  \
+	 "sbc   %1, %1, %1\n\t"  \
+	 "sub   %1, %1, %2"  \
+	 : "+&r" (lo), "=&r" (hi)  \
+	 : "r" (hi)  \
+	 : "cc")
+#else /* ! __thumb__ */
+#  define MAD_F_MLN(hi, lo)  \
+    asm ("rsbs	%0, %2, #0\n\t"  \
+	 "rsc	%1, %3, #0"  \
+	 : "=&r" (lo), "=r" (hi)  \
+	 : "0" (lo), "1" (hi)  \
+	 : "cc")
+#endif /* __thumb__ */
+
+#  define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("movs	%0, %1, lsr %3\n\t"  \
+	    "adc	%0, %0, %2, lsl %4"  \
+	    : "=&r" (__result)  \
+	    : "r" (lo), "r" (hi),  \
+	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
+	    : "cc");  \
+       __result;  \
+    })
+
+#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
+
+/* --- MIPS ---------------------------------------------------------------- */
+
+# elif defined(FPM_MIPS)
+
+/*
+ * This MIPS version is fast and accurate; the disposition of the least
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+ */
+   typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
+#  define MAD_F_MLX(hi, lo, x, y) \
+   do { \
+      u64_di_t __ll = (u64_di_t) (x) * (y); \
+      hi = __ll >> 32; \
+      lo = __ll; \
+   } while (0)
+
+# if defined(OPT_SPEED)
+#  define mad_f_scale64(hi, lo)  \
+    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
+#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
+# endif
+
+/* --- SPARC --------------------------------------------------------------- */
+
+# elif defined(FPM_SPARC)
+
+/*
+ * This SPARC V8 version is fast and accurate; the disposition of the least
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+ */
+#  define MAD_F_MLX(hi, lo, x, y)  \
+    asm ("smul %2, %3, %0\n\t"  \
+	 "rd %%y, %1"  \
+	 : "=r" (lo), "=r" (hi)  \
+	 : "%r" (x), "rI" (y))
+
+/* --- PowerPC ------------------------------------------------------------- */
+
+# elif defined(FPM_PPC)
+
+/*
+ * This PowerPC version is fast and accurate; the disposition of the least
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+ */
+#  define MAD_F_MLX(hi, lo, x, y)  \
+    do {  \
+      asm ("mullw %0,%1,%2"  \
+	   : "=r" (lo)  \
+	   : "%r" (x), "r" (y));  \
+      asm ("mulhw %0,%1,%2"  \
+	   : "=r" (hi)  \
+	   : "%r" (x), "r" (y));  \
+    }  \
+    while (0)
+
+#  if defined(OPT_ACCURACY)
+/*
+ * This gives best accuracy but is not very fast.
+ */
+#   define MAD_F_MLA(hi, lo, x, y)  \
+    ({ mad_fixed64hi_t __hi;  \
+       mad_fixed64lo_t __lo;  \
+       MAD_F_MLX(__hi, __lo, (x), (y));  \
+       asm ("addc %0,%2,%3\n\t"  \
+	    "adde %1,%4,%5"  \
+	    : "=r" (lo), "=r" (hi)  \
+	    : "0" (lo), "r" (__lo), \
+	      "1" (hi), "r" (__hi) \
+	    : "xer");  \
+    })
+#  endif
+
+#  if defined(OPT_ACCURACY)
+/*
+ * This is slower than the truncating version below it.
+ */
+#   define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result, __round;  \
+       asm ("rotrwi %0,%1,%2"  \
+	    : "=r" (__result)  \
+	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
+       asm ("extrwi %0,%1,1,0"  \
+	    : "=r" (__round)  \
+	    : "r" (__result));  \
+       asm ("insrwi %0,%1,%2,0"  \
+	    : "+r" (__result)  \
+	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
+       asm ("add %0,%1,%2"  \
+	    : "=r" (__result)  \
+	    : "%r" (__result), "r" (__round));  \
+       __result;  \
+    })
+#  else
+#   define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("rotrwi %0,%1,%2"  \
+	    : "=r" (__result)  \
+	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
+       asm ("insrwi %0,%1,%2,0"  \
+	    : "+r" (__result)  \
+	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
+       __result;  \
+    })
+#  endif
+
+#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
+
+/* --- Default ------------------------------------------------------------- */
+
+# elif defined(FPM_DEFAULT)
+
+/*
+ * This version is the most portable but it loses significant accuracy.
+ * Furthermore, accuracy is biased against the second argument, so care
+ * should be taken when ordering operands.
+ *
+ * The scale factors are constant as this is not used with SSO.
+ *
+ * Pre-rounding is required to stay within the limits of compliance.
+ */
+#  if defined(OPT_SPEED)
+#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
+#  else
+#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
+				 (((y) + (1L << 15)) >> 16))
+#  endif
+
+/* ------------------------------------------------------------------------- */
+
+# else
+#  error "no FPM selected"
+# endif
+
+/* default implementations */
+
+# if !defined(mad_f_mul)
+#  define mad_f_mul(x, y)  \
+    ({ register mad_fixed64hi_t __hi;  \
+       register mad_fixed64lo_t __lo;  \
+       MAD_F_MLX(__hi, __lo, (x), (y));  \
+       mad_f_scale64(__hi, __lo);  \
+    })
+# endif
+
+# if !defined(MAD_F_MLA)
+#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
+#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
+#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
+#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
+# endif
+
+# if !defined(MAD_F_ML0)
+#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
+# endif
+
+# if !defined(MAD_F_MLN)
+#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
+# endif
+
+# if !defined(MAD_F_MLZ)
+#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
+# endif
+
+# if !defined(mad_f_scale64)
+#  if defined(OPT_ACCURACY)
+#   define mad_f_scale64(hi, lo)  \
+    ((((mad_fixed_t)  \
+       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
+	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
+#  else
+#   define mad_f_scale64(hi, lo)  \
+    ((mad_fixed_t)  \
+     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
+      ((lo) >> MAD_F_SCALEBITS)))
+#  endif
+#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
+# endif
+
+/* C routines */
+
+mad_fixed_t mad_f_abs(mad_fixed_t);
+mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
+
+# endif
+
+/* Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp */
+
+# ifndef LIBMAD_BIT_H
+# define LIBMAD_BIT_H
+
+struct mad_bitptr {
+  unsigned char const *byte;
+  unsigned short cache;
+  unsigned short left;
+};
+
+void mad_bit_init(struct mad_bitptr *, unsigned char const *);
+
+# define mad_bit_finish(bitptr)		/* nothing */
+
+unsigned int mad_bit_length(struct mad_bitptr const *,
+			    struct mad_bitptr const *);
+
+# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
+unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
+
+void mad_bit_skip(struct mad_bitptr *, unsigned int);
+unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
+void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
+
+unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
+
+# endif
+
+/* Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp */
+
+# ifndef LIBMAD_TIMER_H
+# define LIBMAD_TIMER_H
+
+typedef struct {
+  signed long seconds;		/* whole seconds */
+  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
+} mad_timer_t;
+
+extern mad_timer_t const mad_timer_zero;
+
+# define MAD_TIMER_RESOLUTION	352800000UL
+
+enum mad_units {
+  MAD_UNITS_HOURS	 =    -2,
+  MAD_UNITS_MINUTES	 =    -1,
+  MAD_UNITS_SECONDS	 =     0,
+
+  /* metric units */
+
+  MAD_UNITS_DECISECONDS	 =    10,
+  MAD_UNITS_CENTISECONDS =   100,
+  MAD_UNITS_MILLISECONDS =  1000,
+
+  /* audio sample units */
+
+  MAD_UNITS_8000_HZ	 =  8000,
+  MAD_UNITS_11025_HZ	 = 11025,
+  MAD_UNITS_12000_HZ	 = 12000,
+
+  MAD_UNITS_16000_HZ	 = 16000,
+  MAD_UNITS_22050_HZ	 = 22050,
+  MAD_UNITS_24000_HZ	 = 24000,
+
+  MAD_UNITS_32000_HZ	 = 32000,
+  MAD_UNITS_44100_HZ	 = 44100,
+  MAD_UNITS_48000_HZ	 = 48000,
+
+  /* video frame/field units */
+
+  MAD_UNITS_24_FPS	 =    24,
+  MAD_UNITS_25_FPS	 =    25,
+  MAD_UNITS_30_FPS	 =    30,
+  MAD_UNITS_48_FPS	 =    48,
+  MAD_UNITS_50_FPS	 =    50,
+  MAD_UNITS_60_FPS	 =    60,
+
+  /* CD audio frames */
+
+  MAD_UNITS_75_FPS	 =    75,
+
+  /* video drop-frame units */
+
+  MAD_UNITS_23_976_FPS	 =   -24,
+  MAD_UNITS_24_975_FPS	 =   -25,
+  MAD_UNITS_29_97_FPS	 =   -30,
+  MAD_UNITS_47_952_FPS	 =   -48,
+  MAD_UNITS_49_95_FPS	 =   -50,
+  MAD_UNITS_59_94_FPS	 =   -60
+};
+
+# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
+
+int mad_timer_compare(mad_timer_t, mad_timer_t);
+
+# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
+
+void mad_timer_negate(mad_timer_t *);
+mad_timer_t mad_timer_abs(mad_timer_t);
+
+void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
+void mad_timer_add(mad_timer_t *, mad_timer_t);
+void mad_timer_multiply(mad_timer_t *, signed long);
+
+signed long mad_timer_count(mad_timer_t, enum mad_units);
+unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
+void mad_timer_string(mad_timer_t, char *, char const *,
+		      enum mad_units, enum mad_units, unsigned long);
+
+# endif
+
+/* Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp */
+
+# ifndef LIBMAD_STREAM_H
+# define LIBMAD_STREAM_H
+
+
+# define MAD_BUFFER_GUARD	8
+# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
+
+enum mad_error {
+  MAD_ERROR_NONE	   = 0x0000,	/* no error */
+
+  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
+  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
+
+  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
+
+  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
+  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
+  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
+  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
+  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
+
+  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
+  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
+  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
+  MAD_ERROR_BADMODE        = 0x0222,	/* bad bitrate/mode combination */
+  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
+  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
+  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
+  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
+  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
+  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
+  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
+  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
+  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
+};
+
+# define MAD_RECOVERABLE(error)	((error) & 0xff00)
+
+struct mad_stream {
+  unsigned char const *buffer;		/* input bitstream buffer */
+  unsigned char const *bufend;		/* end of buffer */
+  unsigned long skiplen;		/* bytes to skip before next frame */
+
+  int sync;				/* stream sync found */
+  unsigned long freerate;		/* free bitrate (fixed) */
+
+  unsigned char const *this_frame;	/* start of current frame */
+  unsigned char const *next_frame;	/* start of next frame */
+  struct mad_bitptr ptr;		/* current processing bit pointer */
+
+  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
+  unsigned int anc_bitlen;		/* number of ancillary bits */
+
+  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
+					/* Layer III main_data() */
+  unsigned int md_len;			/* bytes in main_data */
+
+  int options;				/* decoding options (see below) */
+  enum mad_error error;			/* error code (see above) */
+};
+
+enum {
+  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
+  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
+# if 0  /* not yet implemented */
+  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
+  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
+  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
+# endif
+};
+
+void mad_stream_init(struct mad_stream *);
+void mad_stream_finish(struct mad_stream *);
+
+# define mad_stream_options(stream, opts)  \
+    ((void) ((stream)->options = (opts)))
+
+void mad_stream_buffer(struct mad_stream *,
+		       unsigned char const *, unsigned long);
+void mad_stream_skip(struct mad_stream *, unsigned long);
+
+int mad_stream_sync(struct mad_stream *);
+
+char const *mad_stream_errorstr(struct mad_stream const *);
+
+# endif
+
+/* Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp */
+
+# ifndef LIBMAD_FRAME_H
+# define LIBMAD_FRAME_H
+
+
+enum mad_layer {
+  MAD_LAYER_I   = 1,			/* Layer I */
+  MAD_LAYER_II  = 2,			/* Layer II */
+  MAD_LAYER_III = 3			/* Layer III */
+};
+
+enum mad_mode {
+  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
+  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
+  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
+  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
+};
+
+enum mad_emphasis {
+  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
+  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
+  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
+  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
+};
+
+struct mad_header {
+  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
+  enum mad_mode mode;			/* channel mode (see above) */
+  int mode_extension;			/* additional mode info */
+  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
+
+  unsigned long bitrate;		/* stream bitrate (bps) */
+  unsigned int samplerate;		/* sampling frequency (Hz) */
+
+  unsigned short crc_check;		/* frame CRC accumulator */
+  unsigned short crc_target;		/* final target CRC checksum */
+
+  int flags;				/* flags (see below) */
+  int private_bits;			/* private bits (see below) */
+
+  mad_timer_t duration;			/* audio playing time of frame */
+};
+
+struct mad_frame {
+  struct mad_header header;		/* MPEG audio header */
+
+  int options;				/* decoding options (from stream) */
+
+  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
+  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
+};
+
+# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
+# define MAD_NSBSAMPLES(header)  \
+  ((header)->layer == MAD_LAYER_I ? 12 :  \
+   (((header)->layer == MAD_LAYER_III &&  \
+     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
+
+enum {
+  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
+  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
+
+  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
+  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
+  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
+  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
+
+  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
+  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
+  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
+
+  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
+  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
+  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
+};
+
+enum {
+  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
+  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
+};
+
+void mad_header_init(struct mad_header *);
+
+# define mad_header_finish(header)  /* nothing */
+
+int mad_header_decode(struct mad_header *, struct mad_stream *);
+
+void mad_frame_init(struct mad_frame *);
+void mad_frame_finish(struct mad_frame *);
+
+int mad_frame_decode(struct mad_frame *, struct mad_stream *);
+
+void mad_frame_mute(struct mad_frame *);
+
+# endif
+
+/* Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp */
+
+# ifndef LIBMAD_SYNTH_H
+# define LIBMAD_SYNTH_H
+
+
+struct mad_pcm {
+  unsigned int samplerate;		/* sampling frequency (Hz) */
+  unsigned short channels;		/* number of channels */
+  unsigned short length;		/* number of samples per channel */
+  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
+};
+
+struct mad_synth {
+  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
+  					/* [ch][eo][peo][s][v] */
+
+  unsigned int phase;			/* current processing phase */
+
+  struct mad_pcm pcm;			/* PCM output */
+};
+
+/* single channel PCM selector */
+enum {
+  MAD_PCM_CHANNEL_SINGLE = 0
+};
+
+/* dual channel PCM selector */
+enum {
+  MAD_PCM_CHANNEL_DUAL_1 = 0,
+  MAD_PCM_CHANNEL_DUAL_2 = 1
+};
+
+/* stereo PCM selector */
+enum {
+  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
+  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
+};
+
+void mad_synth_init(struct mad_synth *);
+
+# define mad_synth_finish(synth)  /* nothing */
+
+void mad_synth_mute(struct mad_synth *);
+
+void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
+
+# endif
+
+/* Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp */
+
+# ifndef LIBMAD_DECODER_H
+# define LIBMAD_DECODER_H
+
+
+enum mad_decoder_mode {
+  MAD_DECODER_MODE_SYNC  = 0,
+  MAD_DECODER_MODE_ASYNC
+};
+
+enum mad_flow {
+  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
+  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
+  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
+  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
+};
+
+struct mad_decoder {
+  enum mad_decoder_mode mode;
+
+  int options;
+
+  struct {
+    long pid;
+    int in;
+    int out;
+  } async;
+
+  struct {
+    struct mad_stream stream;
+    struct mad_frame frame;
+    struct mad_synth synth;
+  } *sync;
+
+  void *cb_data;
+
+  enum mad_flow (*input_func)(void *, struct mad_stream *);
+  enum mad_flow (*header_func)(void *, struct mad_header const *);
+  enum mad_flow (*filter_func)(void *,
+			       struct mad_stream const *, struct mad_frame *);
+  enum mad_flow (*output_func)(void *,
+			       struct mad_header const *, struct mad_pcm *);
+  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
+  enum mad_flow (*message_func)(void *, void *, unsigned int *);
+};
+
+void mad_decoder_init(struct mad_decoder *, void *,
+		      enum mad_flow (*)(void *, struct mad_stream *),
+		      enum mad_flow (*)(void *, struct mad_header const *),
+		      enum mad_flow (*)(void *,
+					struct mad_stream const *,
+					struct mad_frame *),
+		      enum mad_flow (*)(void *,
+					struct mad_header const *,
+					struct mad_pcm *),
+		      enum mad_flow (*)(void *,
+					struct mad_stream *,
+					struct mad_frame *),
+		      enum mad_flow (*)(void *, void *, unsigned int *));
+int mad_decoder_finish(struct mad_decoder *);
+
+# define mad_decoder_options(decoder, opts)  \
+    ((void) ((decoder)->options = (opts)))
+
+int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
+int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
+
+# endif
+
+# ifdef __cplusplus
+}
+# endif
diff --git a/code/libmad/minimad.c b/code/libmad/minimad.c
new file mode 100644
index 00000000..ac412ae4
--- /dev/null
+++ b/code/libmad/minimad.c
@@ -0,0 +1,222 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: minimad.c,v 1.4 2004/01/23 09:41:32 rob Exp $
+ */
+
+# include <stdio.h>
+# include <unistd.h>
+# include <sys/stat.h>
+# include <sys/mman.h>
+
+# include "mad.h"
+
+/*
+ * This is perhaps the simplest example use of the MAD high-level API.
+ * Standard input is mapped into memory via mmap(), then the high-level API
+ * is invoked with three callbacks: input, output, and error. The output
+ * callback converts MAD's high-resolution PCM samples to 16 bits, then
+ * writes them to standard output in little-endian, stereo-interleaved
+ * format.
+ */
+
+static int decode(unsigned char const *, unsigned long);
+
+int main(int argc, char *argv[])
+{
+  struct stat stat;
+  void *fdm;
+
+  if (argc != 1)
+    return 1;
+
+  if (fstat(STDIN_FILENO, &stat) == -1 ||
+      stat.st_size == 0)
+    return 2;
+
+  fdm = mmap(0, stat.st_size, PROT_READ, MAP_SHARED, STDIN_FILENO, 0);
+  if (fdm == MAP_FAILED)
+    return 3;
+
+  decode(fdm, stat.st_size);
+
+  if (munmap(fdm, stat.st_size) == -1)
+    return 4;
+
+  return 0;
+}
+
+/*
+ * This is a private message structure. A generic pointer to this structure
+ * is passed to each of the callback functions. Put here any data you need
+ * to access from within the callbacks.
+ */
+
+struct buffer {
+  unsigned char const *start;
+  unsigned long length;
+};
+
+/*
+ * This is the input callback. The purpose of this callback is to (re)fill
+ * the stream buffer which is to be decoded. In this example, an entire file
+ * has been mapped into memory, so we just call mad_stream_buffer() with the
+ * address and length of the mapping. When this callback is called a second
+ * time, we are finished decoding.
+ */
+
+static
+enum mad_flow input(void *data,
+		    struct mad_stream *stream)
+{
+  struct buffer *buffer = data;
+
+  if (!buffer->length)
+    return MAD_FLOW_STOP;
+
+  mad_stream_buffer(stream, buffer->start, buffer->length);
+
+  buffer->length = 0;
+
+  return MAD_FLOW_CONTINUE;
+}
+
+/*
+ * The following utility routine performs simple rounding, clipping, and
+ * scaling of MAD's high-resolution samples down to 16 bits. It does not
+ * perform any dithering or noise shaping, which would be recommended to
+ * obtain any exceptional audio quality. It is therefore not recommended to
+ * use this routine if high-quality output is desired.
+ */
+
+static inline
+signed int scale(mad_fixed_t sample)
+{
+  /* round */
+  sample += (1L << (MAD_F_FRACBITS - 16));
+
+  /* clip */
+  if (sample >= MAD_F_ONE)
+    sample = MAD_F_ONE - 1;
+  else if (sample < -MAD_F_ONE)
+    sample = -MAD_F_ONE;
+
+  /* quantize */
+  return sample >> (MAD_F_FRACBITS + 1 - 16);
+}
+
+/*
+ * This is the output callback function. It is called after each frame of
+ * MPEG audio data has been completely decoded. The purpose of this callback
+ * is to output (or play) the decoded PCM audio.
+ */
+
+static
+enum mad_flow output(void *data,
+		     struct mad_header const *header,
+		     struct mad_pcm *pcm)
+{
+  unsigned int nchannels, nsamples;
+  mad_fixed_t const *left_ch, *right_ch;
+
+  /* pcm->samplerate contains the sampling frequency */
+
+  nchannels = pcm->channels;
+  nsamples  = pcm->length;
+  left_ch   = pcm->samples[0];
+  right_ch  = pcm->samples[1];
+
+  while (nsamples--) {
+    signed int sample;
+
+    /* output sample(s) in 16-bit signed little-endian PCM */
+
+    sample = scale(*left_ch++);
+    putchar((sample >> 0) & 0xff);
+    putchar((sample >> 8) & 0xff);
+
+    if (nchannels == 2) {
+      sample = scale(*right_ch++);
+      putchar((sample >> 0) & 0xff);
+      putchar((sample >> 8) & 0xff);
+    }
+  }
+
+  return MAD_FLOW_CONTINUE;
+}
+
+/*
+ * This is the error callback function. It is called whenever a decoding
+ * error occurs. The error is indicated by stream->error; the list of
+ * possible MAD_ERROR_* errors can be found in the mad.h (or stream.h)
+ * header file.
+ */
+
+static
+enum mad_flow error(void *data,
+		    struct mad_stream *stream,
+		    struct mad_frame *frame)
+{
+  struct buffer *buffer = data;
+
+  fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %u\n",
+	  stream->error, mad_stream_errorstr(stream),
+	  stream->this_frame - buffer->start);
+
+  /* return MAD_FLOW_BREAK here to stop decoding (and propagate an error) */
+
+  return MAD_FLOW_CONTINUE;
+}
+
+/*
+ * This is the function called by main() above to perform all the decoding.
+ * It instantiates a decoder object and configures it with the input,
+ * output, and error callback functions above. A single call to
+ * mad_decoder_run() continues until a callback function returns
+ * MAD_FLOW_STOP (to stop decoding) or MAD_FLOW_BREAK (to stop decoding and
+ * signal an error).
+ */
+
+static
+int decode(unsigned char const *start, unsigned long length)
+{
+  struct buffer buffer;
+  struct mad_decoder decoder;
+  int result;
+
+  /* initialize our private message structure */
+
+  buffer.start  = start;
+  buffer.length = length;
+
+  /* configure input, output, and error functions */
+
+  mad_decoder_init(&decoder, &buffer,
+		   input, 0 /* header */, 0 /* filter */, output,
+		   error, 0 /* message */);
+
+  /* start decoding */
+
+  result = mad_decoder_run(&decoder, MAD_DECODER_MODE_SYNC);
+
+  /* release the decoder */
+
+  mad_decoder_finish(&decoder);
+
+  return result;
+}
diff --git a/code/libmad/packaging/mad.pc.in b/code/libmad/packaging/mad.pc.in
new file mode 100644
index 00000000..7cb5dbb1
--- /dev/null
+++ b/code/libmad/packaging/mad.pc.in
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=@PKGCONFIG_INCLUDEDIR@
+libdir=@PKGCONFIG_LIBDIR@
+
+Name: MAD
+Description: MPEG audio decoder library
+Version: @CMAKE_PROJECT_VERSION@
+URL: https://codeberg.org/tenacityteam/libmad
+Libs: -L${libdir} -lmad
+Cflags: -I${includedir}
diff --git a/code/libmad/packaging/madConfig.cmake.in b/code/libmad/packaging/madConfig.cmake.in
new file mode 100644
index 00000000..2b2e2ce0
--- /dev/null
+++ b/code/libmad/packaging/madConfig.cmake.in
@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/madTargets.cmake")
+
+check_required_components(mad)
diff --git a/code/libmad/qc_table.dat b/code/libmad/qc_table.dat
new file mode 100644
index 00000000..35a22234
--- /dev/null
+++ b/code/libmad/qc_table.dat
@@ -0,0 +1,77 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: qc_table.dat,v 1.7 2004/01/23 09:41:32 rob Exp $
+ */
+
+/*
+ * These are the Layer II classes of quantization.
+ * The table is derived from Table B.4 of ISO/IEC 11172-3.
+ */
+
+  {     3, 2,  5,
+    MAD_F(0x15555555) /* 1.33333333333 => 1.33333333209, e  0.00000000124 */,
+    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
+  {     5, 3,  7,
+    MAD_F(0x1999999a) /* 1.60000000000 => 1.60000000149, e -0.00000000149 */,
+    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
+  {     7, 0,  3,
+    MAD_F(0x12492492) /* 1.14285714286 => 1.14285714179, e  0.00000000107 */,
+    MAD_F(0x04000000) /* 0.25000000000 => 0.25000000000, e  0.00000000000 */ },
+  {     9, 4, 10,
+    MAD_F(0x1c71c71c) /* 1.77777777777 => 1.77777777612, e  0.00000000165 */,
+    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
+  {    15, 0,  4,
+    MAD_F(0x11111111) /* 1.06666666666 => 1.06666666642, e  0.00000000024 */,
+    MAD_F(0x02000000) /* 0.12500000000 => 0.12500000000, e  0.00000000000 */ },
+  {    31, 0,  5,
+    MAD_F(0x10842108) /* 1.03225806452 => 1.03225806355, e  0.00000000097 */,
+    MAD_F(0x01000000) /* 0.06250000000 => 0.06250000000, e  0.00000000000 */ },
+  {    63, 0,  6,
+    MAD_F(0x10410410) /* 1.01587301587 => 1.01587301493, e  0.00000000094 */,
+    MAD_F(0x00800000) /* 0.03125000000 => 0.03125000000, e  0.00000000000 */ },
+  {   127, 0,  7,
+    MAD_F(0x10204081) /* 1.00787401575 => 1.00787401572, e  0.00000000003 */,
+    MAD_F(0x00400000) /* 0.01562500000 => 0.01562500000, e  0.00000000000 */ },
+  {   255, 0,  8,
+    MAD_F(0x10101010) /* 1.00392156863 => 1.00392156839, e  0.00000000024 */,
+    MAD_F(0x00200000) /* 0.00781250000 => 0.00781250000, e  0.00000000000 */ },
+  {   511, 0,  9,
+    MAD_F(0x10080402) /* 1.00195694716 => 1.00195694715, e  0.00000000001 */,
+    MAD_F(0x00100000) /* 0.00390625000 => 0.00390625000, e  0.00000000000 */ },
+  {  1023, 0, 10,
+    MAD_F(0x10040100) /* 1.00097751711 => 1.00097751617, e  0.00000000094 */,
+    MAD_F(0x00080000) /* 0.00195312500 => 0.00195312500, e  0.00000000000 */ },
+  {  2047, 0, 11,
+    MAD_F(0x10020040) /* 1.00048851979 => 1.00048851967, e  0.00000000012 */,
+    MAD_F(0x00040000) /* 0.00097656250 => 0.00097656250, e  0.00000000000 */ },
+  {  4095, 0, 12,
+    MAD_F(0x10010010) /* 1.00024420024 => 1.00024420023, e  0.00000000001 */,
+    MAD_F(0x00020000) /* 0.00048828125 => 0.00048828125, e  0.00000000000 */ },
+  {  8191, 0, 13,
+    MAD_F(0x10008004) /* 1.00012208522 => 1.00012208521, e  0.00000000001 */,
+    MAD_F(0x00010000) /* 0.00024414063 => 0.00024414062, e  0.00000000000 */ },
+  { 16383, 0, 14,
+    MAD_F(0x10004001) /* 1.00006103888 => 1.00006103888, e -0.00000000000 */,
+    MAD_F(0x00008000) /* 0.00012207031 => 0.00012207031, e -0.00000000000 */ },
+  { 32767, 0, 15,
+    MAD_F(0x10002000) /* 1.00003051851 => 1.00003051758, e  0.00000000093 */,
+    MAD_F(0x00004000) /* 0.00006103516 => 0.00006103516, e  0.00000000000 */ },
+  { 65535, 0, 16,
+    MAD_F(0x10001000) /* 1.00001525902 => 1.00001525879, e  0.00000000023 */,
+    MAD_F(0x00002000) /* 0.00003051758 => 0.00003051758, e  0.00000000000 */ }
diff --git a/code/libmad/rq_table.dat b/code/libmad/rq_table.dat
new file mode 100644
index 00000000..059c4f31
--- /dev/null
+++ b/code/libmad/rq_table.dat
@@ -0,0 +1,8747 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: rq_table.dat,v 1.7 2004/01/23 09:41:32 rob Exp $
+ */
+
+/*
+ * This is the lookup table used to compute x^(4/3) for Layer III
+ * requantization. To maintain the best possible accuracy, the value is
+ * stored as a normalized mantissa with exponent. The requantization
+ * algorithm recombines these parts with appropriate scaling.
+ */
+
+  /*    0 */  { MAD_F(0x00000000) /* 0.000000000 */,  0 },
+  /*    1 */  { MAD_F(0x04000000) /* 0.250000000 */,  2 },
+  /*    2 */  { MAD_F(0x050a28be) /* 0.314980262 */,  3 },
+  /*    3 */  { MAD_F(0x0453a5cd) /* 0.270421794 */,  4 },
+  /*    4 */  { MAD_F(0x06597fa9) /* 0.396850263 */,  4 },
+  /*    5 */  { MAD_F(0x04466275) /* 0.267183742 */,  5 },
+  /*    6 */  { MAD_F(0x05738c72) /* 0.340710111 */,  5 },
+  /*    7 */  { MAD_F(0x06b1fc81) /* 0.418453696 */,  5 },
+  /*    8 */  { MAD_F(0x04000000) /* 0.250000000 */,  6 },
+  /*    9 */  { MAD_F(0x04ae20d7) /* 0.292511788 */,  6 },
+  /*   10 */  { MAD_F(0x0562d694) /* 0.336630420 */,  6 },
+  /*   11 */  { MAD_F(0x061dae96) /* 0.382246578 */,  6 },
+  /*   12 */  { MAD_F(0x06de47f4) /* 0.429267841 */,  6 },
+  /*   13 */  { MAD_F(0x07a44f7a) /* 0.477614858 */,  6 },
+  /*   14 */  { MAD_F(0x0437be65) /* 0.263609310 */,  7 },
+  /*   15 */  { MAD_F(0x049fc824) /* 0.289009227 */,  7 },
+
+  /*   16 */  { MAD_F(0x050a28be) /* 0.314980262 */,  7 },
+  /*   17 */  { MAD_F(0x0576c6f5) /* 0.341498336 */,  7 },
+  /*   18 */  { MAD_F(0x05e58c0b) /* 0.368541759 */,  7 },
+  /*   19 */  { MAD_F(0x06566361) /* 0.396090870 */,  7 },
+  /*   20 */  { MAD_F(0x06c93a2e) /* 0.424127753 */,  7 },
+  /*   21 */  { MAD_F(0x073dff3e) /* 0.452635998 */,  7 },
+  /*   22 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */,  7 },
+  /*   23 */  { MAD_F(0x04168b05) /* 0.255503674 */,  8 },
+  /*   24 */  { MAD_F(0x0453a5cd) /* 0.270421794 */,  8 },
+  /*   25 */  { MAD_F(0x04919b6a) /* 0.285548607 */,  8 },
+  /*   26 */  { MAD_F(0x04d065fb) /* 0.300878507 */,  8 },
+  /*   27 */  { MAD_F(0x05100000) /* 0.316406250 */,  8 },
+  /*   28 */  { MAD_F(0x05506451) /* 0.332126919 */,  8 },
+  /*   29 */  { MAD_F(0x05918e15) /* 0.348035890 */,  8 },
+  /*   30 */  { MAD_F(0x05d378bb) /* 0.364128809 */,  8 },
+  /*   31 */  { MAD_F(0x06161ff3) /* 0.380401563 */,  8 },
+
+  /*   32 */  { MAD_F(0x06597fa9) /* 0.396850263 */,  8 },
+  /*   33 */  { MAD_F(0x069d9400) /* 0.413471222 */,  8 },
+  /*   34 */  { MAD_F(0x06e2594c) /* 0.430260942 */,  8 },
+  /*   35 */  { MAD_F(0x0727cc11) /* 0.447216097 */,  8 },
+  /*   36 */  { MAD_F(0x076de8fc) /* 0.464333519 */,  8 },
+  /*   37 */  { MAD_F(0x07b4ace3) /* 0.481610189 */,  8 },
+  /*   38 */  { MAD_F(0x07fc14bf) /* 0.499043224 */,  8 },
+  /*   39 */  { MAD_F(0x04220ed7) /* 0.258314934 */,  9 },
+  /*   40 */  { MAD_F(0x04466275) /* 0.267183742 */,  9 },
+  /*   41 */  { MAD_F(0x046b03e7) /* 0.276126771 */,  9 },
+  /*   42 */  { MAD_F(0x048ff1e8) /* 0.285142811 */,  9 },
+  /*   43 */  { MAD_F(0x04b52b3f) /* 0.294230696 */,  9 },
+  /*   44 */  { MAD_F(0x04daaec0) /* 0.303389310 */,  9 },
+  /*   45 */  { MAD_F(0x05007b49) /* 0.312617576 */,  9 },
+  /*   46 */  { MAD_F(0x05268fc6) /* 0.321914457 */,  9 },
+  /*   47 */  { MAD_F(0x054ceb2a) /* 0.331278957 */,  9 },
+
+  /*   48 */  { MAD_F(0x05738c72) /* 0.340710111 */,  9 },
+  /*   49 */  { MAD_F(0x059a72a5) /* 0.350206992 */,  9 },
+  /*   50 */  { MAD_F(0x05c19cd3) /* 0.359768701 */,  9 },
+  /*   51 */  { MAD_F(0x05e90a12) /* 0.369394372 */,  9 },
+  /*   52 */  { MAD_F(0x0610b982) /* 0.379083164 */,  9 },
+  /*   53 */  { MAD_F(0x0638aa48) /* 0.388834268 */,  9 },
+  /*   54 */  { MAD_F(0x0660db91) /* 0.398646895 */,  9 },
+  /*   55 */  { MAD_F(0x06894c90) /* 0.408520284 */,  9 },
+  /*   56 */  { MAD_F(0x06b1fc81) /* 0.418453696 */,  9 },
+  /*   57 */  { MAD_F(0x06daeaa1) /* 0.428446415 */,  9 },
+  /*   58 */  { MAD_F(0x07041636) /* 0.438497744 */,  9 },
+  /*   59 */  { MAD_F(0x072d7e8b) /* 0.448607009 */,  9 },
+  /*   60 */  { MAD_F(0x075722ef) /* 0.458773552 */,  9 },
+  /*   61 */  { MAD_F(0x078102b8) /* 0.468996735 */,  9 },
+  /*   62 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */,  9 },
+  /*   63 */  { MAD_F(0x07d571e0) /* 0.489610555 */,  9 },
+
+  /*   64 */  { MAD_F(0x04000000) /* 0.250000000 */, 10 },
+  /*   65 */  { MAD_F(0x04156381) /* 0.255221850 */, 10 },
+  /*   66 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 10 },
+  /*   67 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 10 },
+  /*   68 */  { MAD_F(0x045635cf) /* 0.271047409 */, 10 },
+  /*   69 */  { MAD_F(0x046c083e) /* 0.276375048 */, 10 },
+  /*   70 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 10 },
+  /*   71 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 10 },
+  /*   72 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 10 },
+  /*   73 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 10 },
+  /*   74 */  { MAD_F(0x04dab524) /* 0.303395408 */, 10 },
+  /*   75 */  { MAD_F(0x04f12624) /* 0.308874267 */, 10 },
+  /*   76 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 10 },
+  /*   77 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 10 },
+  /*   78 */  { MAD_F(0x053511cb) /* 0.325456423 */, 10 },
+  /*   79 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 10 },
+
+  /*   80 */  { MAD_F(0x0562d694) /* 0.336630420 */, 10 },
+  /*   81 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 10 },
+  /*   82 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 10 },
+  /*   83 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 10 },
+  /*   84 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 10 },
+  /*   85 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 10 },
+  /*   86 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 10 },
+  /*   87 */  { MAD_F(0x0606012b) /* 0.376465960 */, 10 },
+  /*   88 */  { MAD_F(0x061dae96) /* 0.382246578 */, 10 },
+  /*   89 */  { MAD_F(0x06357302) /* 0.388049134 */, 10 },
+  /*   90 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 10 },
+  /*   91 */  { MAD_F(0x0665402d) /* 0.399719406 */, 10 },
+  /*   92 */  { MAD_F(0x067d4896) /* 0.405586801 */, 10 },
+  /*   93 */  { MAD_F(0x06956753) /* 0.411475493 */, 10 },
+  /*   94 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 10 },
+  /*   95 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 10 },
+
+  /*   96 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 10 },
+  /*   97 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 10 },
+  /*   98 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 10 },
+  /*   99 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 10 },
+  /*  100 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 10 },
+  /*  101 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 10 },
+  /*  102 */  { MAD_F(0x07724f64) /* 0.465407744 */, 10 },
+  /*  103 */  { MAD_F(0x078b4514) /* 0.471501425 */, 10 },
+  /*  104 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 10 },
+  /*  105 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 10 },
+  /*  106 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 10 },
+  /*  107 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 10 },
+  /*  108 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 11 },
+  /*  109 */  { MAD_F(0x04115aca) /* 0.254236974 */, 11 },
+  /*  110 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 11 },
+  /*  111 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 11 },
+
+  /*  112 */  { MAD_F(0x0437be65) /* 0.263609310 */, 11 },
+  /*  113 */  { MAD_F(0x04449dee) /* 0.266752177 */, 11 },
+  /*  114 */  { MAD_F(0x04518733) /* 0.269904329 */, 11 },
+  /*  115 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 11 },
+  /*  116 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 11 },
+  /*  117 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 11 },
+  /*  118 */  { MAD_F(0x04858c83) /* 0.282604707 */, 11 },
+  /*  119 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 11 },
+  /*  120 */  { MAD_F(0x049fc824) /* 0.289009227 */, 11 },
+  /*  121 */  { MAD_F(0x04acf402) /* 0.292224893 */, 11 },
+  /*  122 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 11 },
+  /*  123 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 11 },
+  /*  124 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 11 },
+  /*  125 */  { MAD_F(0x04e20000) /* 0.305175781 */, 11 },
+  /*  126 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 11 },
+  /*  127 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 11 },
+
+  /*  128 */  { MAD_F(0x050a28be) /* 0.314980262 */, 11 },
+  /*  129 */  { MAD_F(0x05179da4) /* 0.318265572 */, 11 },
+  /*  130 */  { MAD_F(0x05251b73) /* 0.321559381 */, 11 },
+  /*  131 */  { MAD_F(0x0532a220) /* 0.324861647 */, 11 },
+  /*  132 */  { MAD_F(0x054031a0) /* 0.328172327 */, 11 },
+  /*  133 */  { MAD_F(0x054dc9e7) /* 0.331491377 */, 11 },
+  /*  134 */  { MAD_F(0x055b6ae9) /* 0.334818756 */, 11 },
+  /*  135 */  { MAD_F(0x0569149c) /* 0.338154423 */, 11 },
+  /*  136 */  { MAD_F(0x0576c6f5) /* 0.341498336 */, 11 },
+  /*  137 */  { MAD_F(0x058481e9) /* 0.344850455 */, 11 },
+  /*  138 */  { MAD_F(0x0592456d) /* 0.348210741 */, 11 },
+  /*  139 */  { MAD_F(0x05a01176) /* 0.351579152 */, 11 },
+  /*  140 */  { MAD_F(0x05ade5fa) /* 0.354955651 */, 11 },
+  /*  141 */  { MAD_F(0x05bbc2ef) /* 0.358340200 */, 11 },
+  /*  142 */  { MAD_F(0x05c9a84a) /* 0.361732758 */, 11 },
+  /*  143 */  { MAD_F(0x05d79601) /* 0.365133291 */, 11 },
+
+  /*  144 */  { MAD_F(0x05e58c0b) /* 0.368541759 */, 11 },
+  /*  145 */  { MAD_F(0x05f38a5d) /* 0.371958126 */, 11 },
+  /*  146 */  { MAD_F(0x060190ee) /* 0.375382356 */, 11 },
+  /*  147 */  { MAD_F(0x060f9fb3) /* 0.378814413 */, 11 },
+  /*  148 */  { MAD_F(0x061db6a5) /* 0.382254261 */, 11 },
+  /*  149 */  { MAD_F(0x062bd5b8) /* 0.385701865 */, 11 },
+  /*  150 */  { MAD_F(0x0639fce4) /* 0.389157191 */, 11 },
+  /*  151 */  { MAD_F(0x06482c1f) /* 0.392620204 */, 11 },
+  /*  152 */  { MAD_F(0x06566361) /* 0.396090870 */, 11 },
+  /*  153 */  { MAD_F(0x0664a2a0) /* 0.399569155 */, 11 },
+  /*  154 */  { MAD_F(0x0672e9d4) /* 0.403055027 */, 11 },
+  /*  155 */  { MAD_F(0x068138f3) /* 0.406548452 */, 11 },
+  /*  156 */  { MAD_F(0x068f8ff5) /* 0.410049398 */, 11 },
+  /*  157 */  { MAD_F(0x069deed1) /* 0.413557833 */, 11 },
+  /*  158 */  { MAD_F(0x06ac557f) /* 0.417073724 */, 11 },
+  /*  159 */  { MAD_F(0x06bac3f6) /* 0.420597041 */, 11 },
+
+  /*  160 */  { MAD_F(0x06c93a2e) /* 0.424127753 */, 11 },
+  /*  161 */  { MAD_F(0x06d7b81f) /* 0.427665827 */, 11 },
+  /*  162 */  { MAD_F(0x06e63dc0) /* 0.431211234 */, 11 },
+  /*  163 */  { MAD_F(0x06f4cb09) /* 0.434763944 */, 11 },
+  /*  164 */  { MAD_F(0x07035ff3) /* 0.438323927 */, 11 },
+  /*  165 */  { MAD_F(0x0711fc75) /* 0.441891153 */, 11 },
+  /*  166 */  { MAD_F(0x0720a087) /* 0.445465593 */, 11 },
+  /*  167 */  { MAD_F(0x072f4c22) /* 0.449047217 */, 11 },
+  /*  168 */  { MAD_F(0x073dff3e) /* 0.452635998 */, 11 },
+  /*  169 */  { MAD_F(0x074cb9d3) /* 0.456231906 */, 11 },
+  /*  170 */  { MAD_F(0x075b7bdb) /* 0.459834914 */, 11 },
+  /*  171 */  { MAD_F(0x076a454c) /* 0.463444993 */, 11 },
+  /*  172 */  { MAD_F(0x07791620) /* 0.467062117 */, 11 },
+  /*  173 */  { MAD_F(0x0787ee50) /* 0.470686258 */, 11 },
+  /*  174 */  { MAD_F(0x0796cdd4) /* 0.474317388 */, 11 },
+  /*  175 */  { MAD_F(0x07a5b4a5) /* 0.477955481 */, 11 },
+
+  /*  176 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */, 11 },
+  /*  177 */  { MAD_F(0x07c39812) /* 0.485252449 */, 11 },
+  /*  178 */  { MAD_F(0x07d294a0) /* 0.488911273 */, 11 },
+  /*  179 */  { MAD_F(0x07e1985f) /* 0.492576954 */, 11 },
+  /*  180 */  { MAD_F(0x07f0a348) /* 0.496249468 */, 11 },
+  /*  181 */  { MAD_F(0x07ffb554) /* 0.499928790 */, 11 },
+  /*  182 */  { MAD_F(0x0407673f) /* 0.251807447 */, 12 },
+  /*  183 */  { MAD_F(0x040ef75e) /* 0.253653877 */, 12 },
+  /*  184 */  { MAD_F(0x04168b05) /* 0.255503674 */, 12 },
+  /*  185 */  { MAD_F(0x041e2230) /* 0.257356825 */, 12 },
+  /*  186 */  { MAD_F(0x0425bcdd) /* 0.259213318 */, 12 },
+  /*  187 */  { MAD_F(0x042d5b07) /* 0.261073141 */, 12 },
+  /*  188 */  { MAD_F(0x0434fcad) /* 0.262936282 */, 12 },
+  /*  189 */  { MAD_F(0x043ca1c9) /* 0.264802730 */, 12 },
+  /*  190 */  { MAD_F(0x04444a5a) /* 0.266672472 */, 12 },
+  /*  191 */  { MAD_F(0x044bf65d) /* 0.268545497 */, 12 },
+
+  /*  192 */  { MAD_F(0x0453a5cd) /* 0.270421794 */, 12 },
+  /*  193 */  { MAD_F(0x045b58a9) /* 0.272301352 */, 12 },
+  /*  194 */  { MAD_F(0x04630eed) /* 0.274184158 */, 12 },
+  /*  195 */  { MAD_F(0x046ac896) /* 0.276070203 */, 12 },
+  /*  196 */  { MAD_F(0x047285a2) /* 0.277959474 */, 12 },
+  /*  197 */  { MAD_F(0x047a460c) /* 0.279851960 */, 12 },
+  /*  198 */  { MAD_F(0x048209d3) /* 0.281747652 */, 12 },
+  /*  199 */  { MAD_F(0x0489d0f4) /* 0.283646538 */, 12 },
+  /*  200 */  { MAD_F(0x04919b6a) /* 0.285548607 */, 12 },
+  /*  201 */  { MAD_F(0x04996935) /* 0.287453849 */, 12 },
+  /*  202 */  { MAD_F(0x04a13a50) /* 0.289362253 */, 12 },
+  /*  203 */  { MAD_F(0x04a90eba) /* 0.291273810 */, 12 },
+  /*  204 */  { MAD_F(0x04b0e66e) /* 0.293188507 */, 12 },
+  /*  205 */  { MAD_F(0x04b8c16c) /* 0.295106336 */, 12 },
+  /*  206 */  { MAD_F(0x04c09faf) /* 0.297027285 */, 12 },
+  /*  207 */  { MAD_F(0x04c88135) /* 0.298951346 */, 12 },
+
+  /*  208 */  { MAD_F(0x04d065fb) /* 0.300878507 */, 12 },
+  /*  209 */  { MAD_F(0x04d84dff) /* 0.302808759 */, 12 },
+  /*  210 */  { MAD_F(0x04e0393e) /* 0.304742092 */, 12 },
+  /*  211 */  { MAD_F(0x04e827b6) /* 0.306678497 */, 12 },
+  /*  212 */  { MAD_F(0x04f01963) /* 0.308617963 */, 12 },
+  /*  213 */  { MAD_F(0x04f80e44) /* 0.310560480 */, 12 },
+  /*  214 */  { MAD_F(0x05000655) /* 0.312506041 */, 12 },
+  /*  215 */  { MAD_F(0x05080195) /* 0.314454634 */, 12 },
+  /*  216 */  { MAD_F(0x05100000) /* 0.316406250 */, 12 },
+  /*  217 */  { MAD_F(0x05180194) /* 0.318360880 */, 12 },
+  /*  218 */  { MAD_F(0x0520064f) /* 0.320318516 */, 12 },
+  /*  219 */  { MAD_F(0x05280e2d) /* 0.322279147 */, 12 },
+  /*  220 */  { MAD_F(0x0530192e) /* 0.324242764 */, 12 },
+  /*  221 */  { MAD_F(0x0538274e) /* 0.326209359 */, 12 },
+  /*  222 */  { MAD_F(0x0540388a) /* 0.328178922 */, 12 },
+  /*  223 */  { MAD_F(0x05484ce2) /* 0.330151445 */, 12 },
+
+  /*  224 */  { MAD_F(0x05506451) /* 0.332126919 */, 12 },
+  /*  225 */  { MAD_F(0x05587ed5) /* 0.334105334 */, 12 },
+  /*  226 */  { MAD_F(0x05609c6e) /* 0.336086683 */, 12 },
+  /*  227 */  { MAD_F(0x0568bd17) /* 0.338070956 */, 12 },
+  /*  228 */  { MAD_F(0x0570e0cf) /* 0.340058145 */, 12 },
+  /*  229 */  { MAD_F(0x05790793) /* 0.342048241 */, 12 },
+  /*  230 */  { MAD_F(0x05813162) /* 0.344041237 */, 12 },
+  /*  231 */  { MAD_F(0x05895e39) /* 0.346037122 */, 12 },
+  /*  232 */  { MAD_F(0x05918e15) /* 0.348035890 */, 12 },
+  /*  233 */  { MAD_F(0x0599c0f4) /* 0.350037532 */, 12 },
+  /*  234 */  { MAD_F(0x05a1f6d5) /* 0.352042040 */, 12 },
+  /*  235 */  { MAD_F(0x05aa2fb5) /* 0.354049405 */, 12 },
+  /*  236 */  { MAD_F(0x05b26b92) /* 0.356059619 */, 12 },
+  /*  237 */  { MAD_F(0x05baaa69) /* 0.358072674 */, 12 },
+  /*  238 */  { MAD_F(0x05c2ec39) /* 0.360088563 */, 12 },
+  /*  239 */  { MAD_F(0x05cb3100) /* 0.362107278 */, 12 },
+
+  /*  240 */  { MAD_F(0x05d378bb) /* 0.364128809 */, 12 },
+  /*  241 */  { MAD_F(0x05dbc368) /* 0.366153151 */, 12 },
+  /*  242 */  { MAD_F(0x05e41105) /* 0.368180294 */, 12 },
+  /*  243 */  { MAD_F(0x05ec6190) /* 0.370210231 */, 12 },
+  /*  244 */  { MAD_F(0x05f4b507) /* 0.372242955 */, 12 },
+  /*  245 */  { MAD_F(0x05fd0b68) /* 0.374278458 */, 12 },
+  /*  246 */  { MAD_F(0x060564b1) /* 0.376316732 */, 12 },
+  /*  247 */  { MAD_F(0x060dc0e0) /* 0.378357769 */, 12 },
+  /*  248 */  { MAD_F(0x06161ff3) /* 0.380401563 */, 12 },
+  /*  249 */  { MAD_F(0x061e81e8) /* 0.382448106 */, 12 },
+  /*  250 */  { MAD_F(0x0626e6bc) /* 0.384497391 */, 12 },
+  /*  251 */  { MAD_F(0x062f4e6f) /* 0.386549409 */, 12 },
+  /*  252 */  { MAD_F(0x0637b8fd) /* 0.388604155 */, 12 },
+  /*  253 */  { MAD_F(0x06402666) /* 0.390661620 */, 12 },
+  /*  254 */  { MAD_F(0x064896a7) /* 0.392721798 */, 12 },
+  /*  255 */  { MAD_F(0x065109be) /* 0.394784681 */, 12 },
+
+  /*  256 */  { MAD_F(0x06597fa9) /* 0.396850263 */, 12 },
+  /*  257 */  { MAD_F(0x0661f867) /* 0.398918536 */, 12 },
+  /*  258 */  { MAD_F(0x066a73f5) /* 0.400989493 */, 12 },
+  /*  259 */  { MAD_F(0x0672f252) /* 0.403063128 */, 12 },
+  /*  260 */  { MAD_F(0x067b737c) /* 0.405139433 */, 12 },
+  /*  261 */  { MAD_F(0x0683f771) /* 0.407218402 */, 12 },
+  /*  262 */  { MAD_F(0x068c7e2f) /* 0.409300027 */, 12 },
+  /*  263 */  { MAD_F(0x069507b5) /* 0.411384303 */, 12 },
+  /*  264 */  { MAD_F(0x069d9400) /* 0.413471222 */, 12 },
+  /*  265 */  { MAD_F(0x06a6230f) /* 0.415560778 */, 12 },
+  /*  266 */  { MAD_F(0x06aeb4e0) /* 0.417652964 */, 12 },
+  /*  267 */  { MAD_F(0x06b74971) /* 0.419747773 */, 12 },
+  /*  268 */  { MAD_F(0x06bfe0c0) /* 0.421845199 */, 12 },
+  /*  269 */  { MAD_F(0x06c87acc) /* 0.423945235 */, 12 },
+  /*  270 */  { MAD_F(0x06d11794) /* 0.426047876 */, 12 },
+  /*  271 */  { MAD_F(0x06d9b714) /* 0.428153114 */, 12 },
+
+  /*  272 */  { MAD_F(0x06e2594c) /* 0.430260942 */, 12 },
+  /*  273 */  { MAD_F(0x06eafe3a) /* 0.432371356 */, 12 },
+  /*  274 */  { MAD_F(0x06f3a5dc) /* 0.434484348 */, 12 },
+  /*  275 */  { MAD_F(0x06fc5030) /* 0.436599912 */, 12 },
+  /*  276 */  { MAD_F(0x0704fd35) /* 0.438718042 */, 12 },
+  /*  277 */  { MAD_F(0x070dacea) /* 0.440838732 */, 12 },
+  /*  278 */  { MAD_F(0x07165f4b) /* 0.442961975 */, 12 },
+  /*  279 */  { MAD_F(0x071f1459) /* 0.445087765 */, 12 },
+  /*  280 */  { MAD_F(0x0727cc11) /* 0.447216097 */, 12 },
+  /*  281 */  { MAD_F(0x07308671) /* 0.449346964 */, 12 },
+  /*  282 */  { MAD_F(0x07394378) /* 0.451480360 */, 12 },
+  /*  283 */  { MAD_F(0x07420325) /* 0.453616280 */, 12 },
+  /*  284 */  { MAD_F(0x074ac575) /* 0.455754717 */, 12 },
+  /*  285 */  { MAD_F(0x07538a67) /* 0.457895665 */, 12 },
+  /*  286 */  { MAD_F(0x075c51fa) /* 0.460039119 */, 12 },
+  /*  287 */  { MAD_F(0x07651c2c) /* 0.462185072 */, 12 },
+
+  /*  288 */  { MAD_F(0x076de8fc) /* 0.464333519 */, 12 },
+  /*  289 */  { MAD_F(0x0776b867) /* 0.466484455 */, 12 },
+  /*  290 */  { MAD_F(0x077f8a6d) /* 0.468637872 */, 12 },
+  /*  291 */  { MAD_F(0x07885f0b) /* 0.470793767 */, 12 },
+  /*  292 */  { MAD_F(0x07913641) /* 0.472952132 */, 12 },
+  /*  293 */  { MAD_F(0x079a100c) /* 0.475112962 */, 12 },
+  /*  294 */  { MAD_F(0x07a2ec6c) /* 0.477276252 */, 12 },
+  /*  295 */  { MAD_F(0x07abcb5f) /* 0.479441997 */, 12 },
+  /*  296 */  { MAD_F(0x07b4ace3) /* 0.481610189 */, 12 },
+  /*  297 */  { MAD_F(0x07bd90f6) /* 0.483780825 */, 12 },
+  /*  298 */  { MAD_F(0x07c67798) /* 0.485953899 */, 12 },
+  /*  299 */  { MAD_F(0x07cf60c7) /* 0.488129404 */, 12 },
+  /*  300 */  { MAD_F(0x07d84c81) /* 0.490307336 */, 12 },
+  /*  301 */  { MAD_F(0x07e13ac5) /* 0.492487690 */, 12 },
+  /*  302 */  { MAD_F(0x07ea2b92) /* 0.494670459 */, 12 },
+  /*  303 */  { MAD_F(0x07f31ee6) /* 0.496855639 */, 12 },
+
+  /*  304 */  { MAD_F(0x07fc14bf) /* 0.499043224 */, 12 },
+  /*  305 */  { MAD_F(0x0402868e) /* 0.250616605 */, 13 },
+  /*  306 */  { MAD_F(0x040703ff) /* 0.251712795 */, 13 },
+  /*  307 */  { MAD_F(0x040b82b0) /* 0.252810180 */, 13 },
+  /*  308 */  { MAD_F(0x041002a1) /* 0.253908756 */, 13 },
+  /*  309 */  { MAD_F(0x041483d1) /* 0.255008523 */, 13 },
+  /*  310 */  { MAD_F(0x04190640) /* 0.256109476 */, 13 },
+  /*  311 */  { MAD_F(0x041d89ed) /* 0.257211614 */, 13 },
+  /*  312 */  { MAD_F(0x04220ed7) /* 0.258314934 */, 13 },
+  /*  313 */  { MAD_F(0x042694fe) /* 0.259419433 */, 13 },
+  /*  314 */  { MAD_F(0x042b1c60) /* 0.260525110 */, 13 },
+  /*  315 */  { MAD_F(0x042fa4fe) /* 0.261631960 */, 13 },
+  /*  316 */  { MAD_F(0x04342ed7) /* 0.262739982 */, 13 },
+  /*  317 */  { MAD_F(0x0438b9e9) /* 0.263849174 */, 13 },
+  /*  318 */  { MAD_F(0x043d4635) /* 0.264959533 */, 13 },
+  /*  319 */  { MAD_F(0x0441d3b9) /* 0.266071056 */, 13 },
+
+  /*  320 */  { MAD_F(0x04466275) /* 0.267183742 */, 13 },
+  /*  321 */  { MAD_F(0x044af269) /* 0.268297587 */, 13 },
+  /*  322 */  { MAD_F(0x044f8393) /* 0.269412589 */, 13 },
+  /*  323 */  { MAD_F(0x045415f3) /* 0.270528746 */, 13 },
+  /*  324 */  { MAD_F(0x0458a989) /* 0.271646056 */, 13 },
+  /*  325 */  { MAD_F(0x045d3e53) /* 0.272764515 */, 13 },
+  /*  326 */  { MAD_F(0x0461d451) /* 0.273884123 */, 13 },
+  /*  327 */  { MAD_F(0x04666b83) /* 0.275004875 */, 13 },
+  /*  328 */  { MAD_F(0x046b03e7) /* 0.276126771 */, 13 },
+  /*  329 */  { MAD_F(0x046f9d7e) /* 0.277249808 */, 13 },
+  /*  330 */  { MAD_F(0x04743847) /* 0.278373983 */, 13 },
+  /*  331 */  { MAD_F(0x0478d440) /* 0.279499294 */, 13 },
+  /*  332 */  { MAD_F(0x047d716a) /* 0.280625739 */, 13 },
+  /*  333 */  { MAD_F(0x04820fc3) /* 0.281753315 */, 13 },
+  /*  334 */  { MAD_F(0x0486af4c) /* 0.282882021 */, 13 },
+  /*  335 */  { MAD_F(0x048b5003) /* 0.284011853 */, 13 },
+
+  /*  336 */  { MAD_F(0x048ff1e8) /* 0.285142811 */, 13 },
+  /*  337 */  { MAD_F(0x049494fb) /* 0.286274891 */, 13 },
+  /*  338 */  { MAD_F(0x0499393a) /* 0.287408091 */, 13 },
+  /*  339 */  { MAD_F(0x049ddea5) /* 0.288542409 */, 13 },
+  /*  340 */  { MAD_F(0x04a2853c) /* 0.289677844 */, 13 },
+  /*  341 */  { MAD_F(0x04a72cfe) /* 0.290814392 */, 13 },
+  /*  342 */  { MAD_F(0x04abd5ea) /* 0.291952051 */, 13 },
+  /*  343 */  { MAD_F(0x04b08000) /* 0.293090820 */, 13 },
+  /*  344 */  { MAD_F(0x04b52b3f) /* 0.294230696 */, 13 },
+  /*  345 */  { MAD_F(0x04b9d7a7) /* 0.295371678 */, 13 },
+  /*  346 */  { MAD_F(0x04be8537) /* 0.296513762 */, 13 },
+  /*  347 */  { MAD_F(0x04c333ee) /* 0.297656947 */, 13 },
+  /*  348 */  { MAD_F(0x04c7e3cc) /* 0.298801231 */, 13 },
+  /*  349 */  { MAD_F(0x04cc94d1) /* 0.299946611 */, 13 },
+  /*  350 */  { MAD_F(0x04d146fb) /* 0.301093085 */, 13 },
+  /*  351 */  { MAD_F(0x04d5fa4b) /* 0.302240653 */, 13 },
+
+  /*  352 */  { MAD_F(0x04daaec0) /* 0.303389310 */, 13 },
+  /*  353 */  { MAD_F(0x04df6458) /* 0.304539056 */, 13 },
+  /*  354 */  { MAD_F(0x04e41b14) /* 0.305689888 */, 13 },
+  /*  355 */  { MAD_F(0x04e8d2f3) /* 0.306841804 */, 13 },
+  /*  356 */  { MAD_F(0x04ed8bf5) /* 0.307994802 */, 13 },
+  /*  357 */  { MAD_F(0x04f24618) /* 0.309148880 */, 13 },
+  /*  358 */  { MAD_F(0x04f7015d) /* 0.310304037 */, 13 },
+  /*  359 */  { MAD_F(0x04fbbdc3) /* 0.311460269 */, 13 },
+  /*  360 */  { MAD_F(0x05007b49) /* 0.312617576 */, 13 },
+  /*  361 */  { MAD_F(0x050539ef) /* 0.313775954 */, 13 },
+  /*  362 */  { MAD_F(0x0509f9b4) /* 0.314935403 */, 13 },
+  /*  363 */  { MAD_F(0x050eba98) /* 0.316095920 */, 13 },
+  /*  364 */  { MAD_F(0x05137c9a) /* 0.317257503 */, 13 },
+  /*  365 */  { MAD_F(0x05183fba) /* 0.318420150 */, 13 },
+  /*  366 */  { MAD_F(0x051d03f7) /* 0.319583859 */, 13 },
+  /*  367 */  { MAD_F(0x0521c950) /* 0.320748629 */, 13 },
+
+  /*  368 */  { MAD_F(0x05268fc6) /* 0.321914457 */, 13 },
+  /*  369 */  { MAD_F(0x052b5757) /* 0.323081342 */, 13 },
+  /*  370 */  { MAD_F(0x05302003) /* 0.324249281 */, 13 },
+  /*  371 */  { MAD_F(0x0534e9ca) /* 0.325418273 */, 13 },
+  /*  372 */  { MAD_F(0x0539b4ab) /* 0.326588316 */, 13 },
+  /*  373 */  { MAD_F(0x053e80a6) /* 0.327759407 */, 13 },
+  /*  374 */  { MAD_F(0x05434db9) /* 0.328931546 */, 13 },
+  /*  375 */  { MAD_F(0x05481be5) /* 0.330104730 */, 13 },
+  /*  376 */  { MAD_F(0x054ceb2a) /* 0.331278957 */, 13 },
+  /*  377 */  { MAD_F(0x0551bb85) /* 0.332454225 */, 13 },
+  /*  378 */  { MAD_F(0x05568cf8) /* 0.333630533 */, 13 },
+  /*  379 */  { MAD_F(0x055b5f81) /* 0.334807879 */, 13 },
+  /*  380 */  { MAD_F(0x05603321) /* 0.335986261 */, 13 },
+  /*  381 */  { MAD_F(0x056507d6) /* 0.337165677 */, 13 },
+  /*  382 */  { MAD_F(0x0569dda0) /* 0.338346125 */, 13 },
+  /*  383 */  { MAD_F(0x056eb47f) /* 0.339527604 */, 13 },
+
+  /*  384 */  { MAD_F(0x05738c72) /* 0.340710111 */, 13 },
+  /*  385 */  { MAD_F(0x05786578) /* 0.341893646 */, 13 },
+  /*  386 */  { MAD_F(0x057d3f92) /* 0.343078205 */, 13 },
+  /*  387 */  { MAD_F(0x05821abf) /* 0.344263788 */, 13 },
+  /*  388 */  { MAD_F(0x0586f6fd) /* 0.345450393 */, 13 },
+  /*  389 */  { MAD_F(0x058bd44e) /* 0.346638017 */, 13 },
+  /*  390 */  { MAD_F(0x0590b2b0) /* 0.347826659 */, 13 },
+  /*  391 */  { MAD_F(0x05959222) /* 0.349016318 */, 13 },
+  /*  392 */  { MAD_F(0x059a72a5) /* 0.350206992 */, 13 },
+  /*  393 */  { MAD_F(0x059f5438) /* 0.351398678 */, 13 },
+  /*  394 */  { MAD_F(0x05a436da) /* 0.352591376 */, 13 },
+  /*  395 */  { MAD_F(0x05a91a8c) /* 0.353785083 */, 13 },
+  /*  396 */  { MAD_F(0x05adff4c) /* 0.354979798 */, 13 },
+  /*  397 */  { MAD_F(0x05b2e51a) /* 0.356175519 */, 13 },
+  /*  398 */  { MAD_F(0x05b7cbf5) /* 0.357372244 */, 13 },
+  /*  399 */  { MAD_F(0x05bcb3de) /* 0.358569972 */, 13 },
+
+  /*  400 */  { MAD_F(0x05c19cd3) /* 0.359768701 */, 13 },
+  /*  401 */  { MAD_F(0x05c686d5) /* 0.360968429 */, 13 },
+  /*  402 */  { MAD_F(0x05cb71e2) /* 0.362169156 */, 13 },
+  /*  403 */  { MAD_F(0x05d05dfb) /* 0.363370878 */, 13 },
+  /*  404 */  { MAD_F(0x05d54b1f) /* 0.364573594 */, 13 },
+  /*  405 */  { MAD_F(0x05da394d) /* 0.365777304 */, 13 },
+  /*  406 */  { MAD_F(0x05df2885) /* 0.366982004 */, 13 },
+  /*  407 */  { MAD_F(0x05e418c7) /* 0.368187694 */, 13 },
+  /*  408 */  { MAD_F(0x05e90a12) /* 0.369394372 */, 13 },
+  /*  409 */  { MAD_F(0x05edfc66) /* 0.370602036 */, 13 },
+  /*  410 */  { MAD_F(0x05f2efc2) /* 0.371810684 */, 13 },
+  /*  411 */  { MAD_F(0x05f7e426) /* 0.373020316 */, 13 },
+  /*  412 */  { MAD_F(0x05fcd992) /* 0.374230929 */, 13 },
+  /*  413 */  { MAD_F(0x0601d004) /* 0.375442522 */, 13 },
+  /*  414 */  { MAD_F(0x0606c77d) /* 0.376655093 */, 13 },
+  /*  415 */  { MAD_F(0x060bbffd) /* 0.377868641 */, 13 },
+
+  /*  416 */  { MAD_F(0x0610b982) /* 0.379083164 */, 13 },
+  /*  417 */  { MAD_F(0x0615b40c) /* 0.380298661 */, 13 },
+  /*  418 */  { MAD_F(0x061aaf9c) /* 0.381515130 */, 13 },
+  /*  419 */  { MAD_F(0x061fac2f) /* 0.382732569 */, 13 },
+  /*  420 */  { MAD_F(0x0624a9c7) /* 0.383950977 */, 13 },
+  /*  421 */  { MAD_F(0x0629a863) /* 0.385170352 */, 13 },
+  /*  422 */  { MAD_F(0x062ea802) /* 0.386390694 */, 13 },
+  /*  423 */  { MAD_F(0x0633a8a3) /* 0.387611999 */, 13 },
+  /*  424 */  { MAD_F(0x0638aa48) /* 0.388834268 */, 13 },
+  /*  425 */  { MAD_F(0x063dacee) /* 0.390057497 */, 13 },
+  /*  426 */  { MAD_F(0x0642b096) /* 0.391281687 */, 13 },
+  /*  427 */  { MAD_F(0x0647b53f) /* 0.392506834 */, 13 },
+  /*  428 */  { MAD_F(0x064cbae9) /* 0.393732939 */, 13 },
+  /*  429 */  { MAD_F(0x0651c193) /* 0.394959999 */, 13 },
+  /*  430 */  { MAD_F(0x0656c93d) /* 0.396188012 */, 13 },
+  /*  431 */  { MAD_F(0x065bd1e7) /* 0.397416978 */, 13 },
+
+  /*  432 */  { MAD_F(0x0660db91) /* 0.398646895 */, 13 },
+  /*  433 */  { MAD_F(0x0665e639) /* 0.399877761 */, 13 },
+  /*  434 */  { MAD_F(0x066af1df) /* 0.401109575 */, 13 },
+  /*  435 */  { MAD_F(0x066ffe84) /* 0.402342335 */, 13 },
+  /*  436 */  { MAD_F(0x06750c26) /* 0.403576041 */, 13 },
+  /*  437 */  { MAD_F(0x067a1ac6) /* 0.404810690 */, 13 },
+  /*  438 */  { MAD_F(0x067f2a62) /* 0.406046281 */, 13 },
+  /*  439 */  { MAD_F(0x06843afb) /* 0.407282813 */, 13 },
+  /*  440 */  { MAD_F(0x06894c90) /* 0.408520284 */, 13 },
+  /*  441 */  { MAD_F(0x068e5f21) /* 0.409758693 */, 13 },
+  /*  442 */  { MAD_F(0x069372ae) /* 0.410998038 */, 13 },
+  /*  443 */  { MAD_F(0x06988735) /* 0.412238319 */, 13 },
+  /*  444 */  { MAD_F(0x069d9cb7) /* 0.413479532 */, 13 },
+  /*  445 */  { MAD_F(0x06a2b333) /* 0.414721679 */, 13 },
+  /*  446 */  { MAD_F(0x06a7caa9) /* 0.415964756 */, 13 },
+  /*  447 */  { MAD_F(0x06ace318) /* 0.417208762 */, 13 },
+
+  /*  448 */  { MAD_F(0x06b1fc81) /* 0.418453696 */, 13 },
+  /*  449 */  { MAD_F(0x06b716e2) /* 0.419699557 */, 13 },
+  /*  450 */  { MAD_F(0x06bc323b) /* 0.420946343 */, 13 },
+  /*  451 */  { MAD_F(0x06c14e8d) /* 0.422194054 */, 13 },
+  /*  452 */  { MAD_F(0x06c66bd6) /* 0.423442686 */, 13 },
+  /*  453 */  { MAD_F(0x06cb8a17) /* 0.424692240 */, 13 },
+  /*  454 */  { MAD_F(0x06d0a94e) /* 0.425942714 */, 13 },
+  /*  455 */  { MAD_F(0x06d5c97c) /* 0.427194106 */, 13 },
+  /*  456 */  { MAD_F(0x06daeaa1) /* 0.428446415 */, 13 },
+  /*  457 */  { MAD_F(0x06e00cbb) /* 0.429699640 */, 13 },
+  /*  458 */  { MAD_F(0x06e52fca) /* 0.430953779 */, 13 },
+  /*  459 */  { MAD_F(0x06ea53cf) /* 0.432208832 */, 13 },
+  /*  460 */  { MAD_F(0x06ef78c8) /* 0.433464796 */, 13 },
+  /*  461 */  { MAD_F(0x06f49eb6) /* 0.434721671 */, 13 },
+  /*  462 */  { MAD_F(0x06f9c597) /* 0.435979455 */, 13 },
+  /*  463 */  { MAD_F(0x06feed6d) /* 0.437238146 */, 13 },
+
+  /*  464 */  { MAD_F(0x07041636) /* 0.438497744 */, 13 },
+  /*  465 */  { MAD_F(0x07093ff2) /* 0.439758248 */, 13 },
+  /*  466 */  { MAD_F(0x070e6aa0) /* 0.441019655 */, 13 },
+  /*  467 */  { MAD_F(0x07139641) /* 0.442281965 */, 13 },
+  /*  468 */  { MAD_F(0x0718c2d3) /* 0.443545176 */, 13 },
+  /*  469 */  { MAD_F(0x071df058) /* 0.444809288 */, 13 },
+  /*  470 */  { MAD_F(0x07231ecd) /* 0.446074298 */, 13 },
+  /*  471 */  { MAD_F(0x07284e34) /* 0.447340205 */, 13 },
+  /*  472 */  { MAD_F(0x072d7e8b) /* 0.448607009 */, 13 },
+  /*  473 */  { MAD_F(0x0732afd2) /* 0.449874708 */, 13 },
+  /*  474 */  { MAD_F(0x0737e209) /* 0.451143300 */, 13 },
+  /*  475 */  { MAD_F(0x073d1530) /* 0.452412785 */, 13 },
+  /*  476 */  { MAD_F(0x07424946) /* 0.453683161 */, 13 },
+  /*  477 */  { MAD_F(0x07477e4b) /* 0.454954427 */, 13 },
+  /*  478 */  { MAD_F(0x074cb43e) /* 0.456226581 */, 13 },
+  /*  479 */  { MAD_F(0x0751eb20) /* 0.457499623 */, 13 },
+
+  /*  480 */  { MAD_F(0x075722ef) /* 0.458773552 */, 13 },
+  /*  481 */  { MAD_F(0x075c5bac) /* 0.460048365 */, 13 },
+  /*  482 */  { MAD_F(0x07619557) /* 0.461324062 */, 13 },
+  /*  483 */  { MAD_F(0x0766cfee) /* 0.462600642 */, 13 },
+  /*  484 */  { MAD_F(0x076c0b72) /* 0.463878102 */, 13 },
+  /*  485 */  { MAD_F(0x077147e2) /* 0.465156443 */, 13 },
+  /*  486 */  { MAD_F(0x0776853e) /* 0.466435663 */, 13 },
+  /*  487 */  { MAD_F(0x077bc385) /* 0.467715761 */, 13 },
+  /*  488 */  { MAD_F(0x078102b8) /* 0.468996735 */, 13 },
+  /*  489 */  { MAD_F(0x078642d6) /* 0.470278584 */, 13 },
+  /*  490 */  { MAD_F(0x078b83de) /* 0.471561307 */, 13 },
+  /*  491 */  { MAD_F(0x0790c5d1) /* 0.472844904 */, 13 },
+  /*  492 */  { MAD_F(0x079608ae) /* 0.474129372 */, 13 },
+  /*  493 */  { MAD_F(0x079b4c74) /* 0.475414710 */, 13 },
+  /*  494 */  { MAD_F(0x07a09124) /* 0.476700918 */, 13 },
+  /*  495 */  { MAD_F(0x07a5d6bd) /* 0.477987994 */, 13 },
+
+  /*  496 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */, 13 },
+  /*  497 */  { MAD_F(0x07b064a8) /* 0.480564746 */, 13 },
+  /*  498 */  { MAD_F(0x07b5acfb) /* 0.481854420 */, 13 },
+  /*  499 */  { MAD_F(0x07baf635) /* 0.483144957 */, 13 },
+  /*  500 */  { MAD_F(0x07c04056) /* 0.484436356 */, 13 },
+  /*  501 */  { MAD_F(0x07c58b5f) /* 0.485728617 */, 13 },
+  /*  502 */  { MAD_F(0x07cad74e) /* 0.487021738 */, 13 },
+  /*  503 */  { MAD_F(0x07d02424) /* 0.488315717 */, 13 },
+  /*  504 */  { MAD_F(0x07d571e0) /* 0.489610555 */, 13 },
+  /*  505 */  { MAD_F(0x07dac083) /* 0.490906249 */, 13 },
+  /*  506 */  { MAD_F(0x07e0100a) /* 0.492202799 */, 13 },
+  /*  507 */  { MAD_F(0x07e56078) /* 0.493500203 */, 13 },
+  /*  508 */  { MAD_F(0x07eab1ca) /* 0.494798460 */, 13 },
+  /*  509 */  { MAD_F(0x07f00401) /* 0.496097570 */, 13 },
+  /*  510 */  { MAD_F(0x07f5571d) /* 0.497397530 */, 13 },
+  /*  511 */  { MAD_F(0x07faab1c) /* 0.498698341 */, 13 },
+
+  /*  512 */  { MAD_F(0x04000000) /* 0.250000000 */, 14 },
+  /*  513 */  { MAD_F(0x0402aae3) /* 0.250651254 */, 14 },
+  /*  514 */  { MAD_F(0x04055638) /* 0.251302930 */, 14 },
+  /*  515 */  { MAD_F(0x040801ff) /* 0.251955030 */, 14 },
+  /*  516 */  { MAD_F(0x040aae37) /* 0.252607552 */, 14 },
+  /*  517 */  { MAD_F(0x040d5ae0) /* 0.253260495 */, 14 },
+  /*  518 */  { MAD_F(0x041007fa) /* 0.253913860 */, 14 },
+  /*  519 */  { MAD_F(0x0412b586) /* 0.254567645 */, 14 },
+  /*  520 */  { MAD_F(0x04156381) /* 0.255221850 */, 14 },
+  /*  521 */  { MAD_F(0x041811ee) /* 0.255876475 */, 14 },
+  /*  522 */  { MAD_F(0x041ac0cb) /* 0.256531518 */, 14 },
+  /*  523 */  { MAD_F(0x041d7018) /* 0.257186980 */, 14 },
+  /*  524 */  { MAD_F(0x04201fd5) /* 0.257842860 */, 14 },
+  /*  525 */  { MAD_F(0x0422d003) /* 0.258499157 */, 14 },
+  /*  526 */  { MAD_F(0x042580a0) /* 0.259155872 */, 14 },
+  /*  527 */  { MAD_F(0x042831ad) /* 0.259813002 */, 14 },
+
+  /*  528 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 14 },
+  /*  529 */  { MAD_F(0x042d9516) /* 0.261128510 */, 14 },
+  /*  530 */  { MAD_F(0x04304772) /* 0.261786886 */, 14 },
+  /*  531 */  { MAD_F(0x0432fa3d) /* 0.262445676 */, 14 },
+  /*  532 */  { MAD_F(0x0435ad76) /* 0.263104880 */, 14 },
+  /*  533 */  { MAD_F(0x0438611f) /* 0.263764497 */, 14 },
+  /*  534 */  { MAD_F(0x043b1536) /* 0.264424527 */, 14 },
+  /*  535 */  { MAD_F(0x043dc9bc) /* 0.265084969 */, 14 },
+  /*  536 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 14 },
+  /*  537 */  { MAD_F(0x04433414) /* 0.266407088 */, 14 },
+  /*  538 */  { MAD_F(0x0445e9e5) /* 0.267068763 */, 14 },
+  /*  539 */  { MAD_F(0x0448a024) /* 0.267730848 */, 14 },
+  /*  540 */  { MAD_F(0x044b56d1) /* 0.268393343 */, 14 },
+  /*  541 */  { MAD_F(0x044e0dec) /* 0.269056248 */, 14 },
+  /*  542 */  { MAD_F(0x0450c575) /* 0.269719560 */, 14 },
+  /*  543 */  { MAD_F(0x04537d6b) /* 0.270383281 */, 14 },
+
+  /*  544 */  { MAD_F(0x045635cf) /* 0.271047409 */, 14 },
+  /*  545 */  { MAD_F(0x0458ee9f) /* 0.271711944 */, 14 },
+  /*  546 */  { MAD_F(0x045ba7dd) /* 0.272376886 */, 14 },
+  /*  547 */  { MAD_F(0x045e6188) /* 0.273042234 */, 14 },
+  /*  548 */  { MAD_F(0x04611ba0) /* 0.273707988 */, 14 },
+  /*  549 */  { MAD_F(0x0463d625) /* 0.274374147 */, 14 },
+  /*  550 */  { MAD_F(0x04669116) /* 0.275040710 */, 14 },
+  /*  551 */  { MAD_F(0x04694c74) /* 0.275707677 */, 14 },
+  /*  552 */  { MAD_F(0x046c083e) /* 0.276375048 */, 14 },
+  /*  553 */  { MAD_F(0x046ec474) /* 0.277042822 */, 14 },
+  /*  554 */  { MAD_F(0x04718116) /* 0.277710999 */, 14 },
+  /*  555 */  { MAD_F(0x04743e25) /* 0.278379578 */, 14 },
+  /*  556 */  { MAD_F(0x0476fb9f) /* 0.279048558 */, 14 },
+  /*  557 */  { MAD_F(0x0479b984) /* 0.279717940 */, 14 },
+  /*  558 */  { MAD_F(0x047c77d6) /* 0.280387722 */, 14 },
+  /*  559 */  { MAD_F(0x047f3693) /* 0.281057905 */, 14 },
+
+  /*  560 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 14 },
+  /*  561 */  { MAD_F(0x0484b54e) /* 0.282399469 */, 14 },
+  /*  562 */  { MAD_F(0x0487754c) /* 0.283070849 */, 14 },
+  /*  563 */  { MAD_F(0x048a35b6) /* 0.283742628 */, 14 },
+  /*  564 */  { MAD_F(0x048cf68a) /* 0.284414805 */, 14 },
+  /*  565 */  { MAD_F(0x048fb7c8) /* 0.285087379 */, 14 },
+  /*  566 */  { MAD_F(0x04927972) /* 0.285760350 */, 14 },
+  /*  567 */  { MAD_F(0x04953b85) /* 0.286433717 */, 14 },
+  /*  568 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 14 },
+  /*  569 */  { MAD_F(0x049ac0eb) /* 0.287781640 */, 14 },
+  /*  570 */  { MAD_F(0x049d843e) /* 0.288456194 */, 14 },
+  /*  571 */  { MAD_F(0x04a047fa) /* 0.289131142 */, 14 },
+  /*  572 */  { MAD_F(0x04a30c20) /* 0.289806485 */, 14 },
+  /*  573 */  { MAD_F(0x04a5d0af) /* 0.290482221 */, 14 },
+  /*  574 */  { MAD_F(0x04a895a8) /* 0.291158351 */, 14 },
+  /*  575 */  { MAD_F(0x04ab5b0b) /* 0.291834873 */, 14 },
+
+  /*  576 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 14 },
+  /*  577 */  { MAD_F(0x04b0e70c) /* 0.293189094 */, 14 },
+  /*  578 */  { MAD_F(0x04b3adaa) /* 0.293866792 */, 14 },
+  /*  579 */  { MAD_F(0x04b674b1) /* 0.294544881 */, 14 },
+  /*  580 */  { MAD_F(0x04b93c21) /* 0.295223360 */, 14 },
+  /*  581 */  { MAD_F(0x04bc03fa) /* 0.295902229 */, 14 },
+  /*  582 */  { MAD_F(0x04becc3b) /* 0.296581488 */, 14 },
+  /*  583 */  { MAD_F(0x04c194e4) /* 0.297261136 */, 14 },
+  /*  584 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 14 },
+  /*  585 */  { MAD_F(0x04c72771) /* 0.298621598 */, 14 },
+  /*  586 */  { MAD_F(0x04c9f153) /* 0.299302411 */, 14 },
+  /*  587 */  { MAD_F(0x04ccbb9d) /* 0.299983611 */, 14 },
+  /*  588 */  { MAD_F(0x04cf864f) /* 0.300665198 */, 14 },
+  /*  589 */  { MAD_F(0x04d25169) /* 0.301347172 */, 14 },
+  /*  590 */  { MAD_F(0x04d51ceb) /* 0.302029532 */, 14 },
+  /*  591 */  { MAD_F(0x04d7e8d4) /* 0.302712277 */, 14 },
+
+  /*  592 */  { MAD_F(0x04dab524) /* 0.303395408 */, 14 },
+  /*  593 */  { MAD_F(0x04dd81dc) /* 0.304078923 */, 14 },
+  /*  594 */  { MAD_F(0x04e04efb) /* 0.304762823 */, 14 },
+  /*  595 */  { MAD_F(0x04e31c81) /* 0.305447106 */, 14 },
+  /*  596 */  { MAD_F(0x04e5ea6e) /* 0.306131773 */, 14 },
+  /*  597 */  { MAD_F(0x04e8b8c2) /* 0.306816823 */, 14 },
+  /*  598 */  { MAD_F(0x04eb877c) /* 0.307502256 */, 14 },
+  /*  599 */  { MAD_F(0x04ee569d) /* 0.308188071 */, 14 },
+  /*  600 */  { MAD_F(0x04f12624) /* 0.308874267 */, 14 },
+  /*  601 */  { MAD_F(0x04f3f612) /* 0.309560845 */, 14 },
+  /*  602 */  { MAD_F(0x04f6c666) /* 0.310247804 */, 14 },
+  /*  603 */  { MAD_F(0x04f99721) /* 0.310935143 */, 14 },
+  /*  604 */  { MAD_F(0x04fc6841) /* 0.311622862 */, 14 },
+  /*  605 */  { MAD_F(0x04ff39c7) /* 0.312310961 */, 14 },
+  /*  606 */  { MAD_F(0x05020bb3) /* 0.312999439 */, 14 },
+  /*  607 */  { MAD_F(0x0504de05) /* 0.313688296 */, 14 },
+
+  /*  608 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 14 },
+  /*  609 */  { MAD_F(0x050a83d8) /* 0.315067145 */, 14 },
+  /*  610 */  { MAD_F(0x050d575b) /* 0.315757136 */, 14 },
+  /*  611 */  { MAD_F(0x05102b42) /* 0.316447504 */, 14 },
+  /*  612 */  { MAD_F(0x0512ff8e) /* 0.317138249 */, 14 },
+  /*  613 */  { MAD_F(0x0515d440) /* 0.317829370 */, 14 },
+  /*  614 */  { MAD_F(0x0518a956) /* 0.318520867 */, 14 },
+  /*  615 */  { MAD_F(0x051b7ed1) /* 0.319212739 */, 14 },
+  /*  616 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 14 },
+  /*  617 */  { MAD_F(0x05212af5) /* 0.320597609 */, 14 },
+  /*  618 */  { MAD_F(0x0524019e) /* 0.321290606 */, 14 },
+  /*  619 */  { MAD_F(0x0526d8ab) /* 0.321983976 */, 14 },
+  /*  620 */  { MAD_F(0x0529b01d) /* 0.322677720 */, 14 },
+  /*  621 */  { MAD_F(0x052c87f2) /* 0.323371837 */, 14 },
+  /*  622 */  { MAD_F(0x052f602c) /* 0.324066327 */, 14 },
+  /*  623 */  { MAD_F(0x053238ca) /* 0.324761189 */, 14 },
+
+  /*  624 */  { MAD_F(0x053511cb) /* 0.325456423 */, 14 },
+  /*  625 */  { MAD_F(0x0537eb30) /* 0.326152028 */, 14 },
+  /*  626 */  { MAD_F(0x053ac4f9) /* 0.326848005 */, 14 },
+  /*  627 */  { MAD_F(0x053d9f25) /* 0.327544352 */, 14 },
+  /*  628 */  { MAD_F(0x054079b5) /* 0.328241070 */, 14 },
+  /*  629 */  { MAD_F(0x054354a8) /* 0.328938157 */, 14 },
+  /*  630 */  { MAD_F(0x05462ffe) /* 0.329635614 */, 14 },
+  /*  631 */  { MAD_F(0x05490bb7) /* 0.330333440 */, 14 },
+  /*  632 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 14 },
+  /*  633 */  { MAD_F(0x054ec453) /* 0.331730198 */, 14 },
+  /*  634 */  { MAD_F(0x0551a134) /* 0.332429129 */, 14 },
+  /*  635 */  { MAD_F(0x05547e79) /* 0.333128427 */, 14 },
+  /*  636 */  { MAD_F(0x05575c20) /* 0.333828093 */, 14 },
+  /*  637 */  { MAD_F(0x055a3a2a) /* 0.334528126 */, 14 },
+  /*  638 */  { MAD_F(0x055d1896) /* 0.335228525 */, 14 },
+  /*  639 */  { MAD_F(0x055ff764) /* 0.335929290 */, 14 },
+
+  /*  640 */  { MAD_F(0x0562d694) /* 0.336630420 */, 14 },
+  /*  641 */  { MAD_F(0x0565b627) /* 0.337331916 */, 14 },
+  /*  642 */  { MAD_F(0x0568961b) /* 0.338033777 */, 14 },
+  /*  643 */  { MAD_F(0x056b7671) /* 0.338736002 */, 14 },
+  /*  644 */  { MAD_F(0x056e5729) /* 0.339438592 */, 14 },
+  /*  645 */  { MAD_F(0x05713843) /* 0.340141545 */, 14 },
+  /*  646 */  { MAD_F(0x057419be) /* 0.340844862 */, 14 },
+  /*  647 */  { MAD_F(0x0576fb9a) /* 0.341548541 */, 14 },
+  /*  648 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 14 },
+  /*  649 */  { MAD_F(0x057cc077) /* 0.342956988 */, 14 },
+  /*  650 */  { MAD_F(0x057fa378) /* 0.343661754 */, 14 },
+  /*  651 */  { MAD_F(0x058286d9) /* 0.344366882 */, 14 },
+  /*  652 */  { MAD_F(0x05856a9b) /* 0.345072371 */, 14 },
+  /*  653 */  { MAD_F(0x05884ebe) /* 0.345778221 */, 14 },
+  /*  654 */  { MAD_F(0x058b3342) /* 0.346484431 */, 14 },
+  /*  655 */  { MAD_F(0x058e1827) /* 0.347191002 */, 14 },
+
+  /*  656 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 14 },
+  /*  657 */  { MAD_F(0x0593e311) /* 0.348605221 */, 14 },
+  /*  658 */  { MAD_F(0x0596c917) /* 0.349312869 */, 14 },
+  /*  659 */  { MAD_F(0x0599af7d) /* 0.350020876 */, 14 },
+  /*  660 */  { MAD_F(0x059c9643) /* 0.350729240 */, 14 },
+  /*  661 */  { MAD_F(0x059f7d6a) /* 0.351437963 */, 14 },
+  /*  662 */  { MAD_F(0x05a264f0) /* 0.352147044 */, 14 },
+  /*  663 */  { MAD_F(0x05a54cd6) /* 0.352856481 */, 14 },
+  /*  664 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 14 },
+  /*  665 */  { MAD_F(0x05ab1dc2) /* 0.354276426 */, 14 },
+  /*  666 */  { MAD_F(0x05ae06c7) /* 0.354986932 */, 14 },
+  /*  667 */  { MAD_F(0x05b0f02b) /* 0.355697795 */, 14 },
+  /*  668 */  { MAD_F(0x05b3d9f0) /* 0.356409012 */, 14 },
+  /*  669 */  { MAD_F(0x05b6c413) /* 0.357120585 */, 14 },
+  /*  670 */  { MAD_F(0x05b9ae95) /* 0.357832512 */, 14 },
+  /*  671 */  { MAD_F(0x05bc9977) /* 0.358544794 */, 14 },
+
+  /*  672 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 14 },
+  /*  673 */  { MAD_F(0x05c27057) /* 0.359970419 */, 14 },
+  /*  674 */  { MAD_F(0x05c55c56) /* 0.360683761 */, 14 },
+  /*  675 */  { MAD_F(0x05c848b3) /* 0.361397456 */, 14 },
+  /*  676 */  { MAD_F(0x05cb356e) /* 0.362111504 */, 14 },
+  /*  677 */  { MAD_F(0x05ce2289) /* 0.362825904 */, 14 },
+  /*  678 */  { MAD_F(0x05d11001) /* 0.363540655 */, 14 },
+  /*  679 */  { MAD_F(0x05d3fdd8) /* 0.364255759 */, 14 },
+  /*  680 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 14 },
+  /*  681 */  { MAD_F(0x05d9daa1) /* 0.365687018 */, 14 },
+  /*  682 */  { MAD_F(0x05dcc993) /* 0.366403174 */, 14 },
+  /*  683 */  { MAD_F(0x05dfb8e2) /* 0.367119680 */, 14 },
+  /*  684 */  { MAD_F(0x05e2a890) /* 0.367836535 */, 14 },
+  /*  685 */  { MAD_F(0x05e5989b) /* 0.368553740 */, 14 },
+  /*  686 */  { MAD_F(0x05e88904) /* 0.369271294 */, 14 },
+  /*  687 */  { MAD_F(0x05eb79cb) /* 0.369989197 */, 14 },
+
+  /*  688 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 14 },
+  /*  689 */  { MAD_F(0x05f15c70) /* 0.371426047 */, 14 },
+  /*  690 */  { MAD_F(0x05f44e4f) /* 0.372144994 */, 14 },
+  /*  691 */  { MAD_F(0x05f7408b) /* 0.372864289 */, 14 },
+  /*  692 */  { MAD_F(0x05fa3324) /* 0.373583930 */, 14 },
+  /*  693 */  { MAD_F(0x05fd261b) /* 0.374303918 */, 14 },
+  /*  694 */  { MAD_F(0x0600196e) /* 0.375024253 */, 14 },
+  /*  695 */  { MAD_F(0x06030d1e) /* 0.375744934 */, 14 },
+  /*  696 */  { MAD_F(0x0606012b) /* 0.376465960 */, 14 },
+  /*  697 */  { MAD_F(0x0608f595) /* 0.377187332 */, 14 },
+  /*  698 */  { MAD_F(0x060bea5c) /* 0.377909049 */, 14 },
+  /*  699 */  { MAD_F(0x060edf7f) /* 0.378631110 */, 14 },
+  /*  700 */  { MAD_F(0x0611d4fe) /* 0.379353516 */, 14 },
+  /*  701 */  { MAD_F(0x0614cada) /* 0.380076266 */, 14 },
+  /*  702 */  { MAD_F(0x0617c112) /* 0.380799360 */, 14 },
+  /*  703 */  { MAD_F(0x061ab7a6) /* 0.381522798 */, 14 },
+
+  /*  704 */  { MAD_F(0x061dae96) /* 0.382246578 */, 14 },
+  /*  705 */  { MAD_F(0x0620a5e3) /* 0.382970701 */, 14 },
+  /*  706 */  { MAD_F(0x06239d8b) /* 0.383695167 */, 14 },
+  /*  707 */  { MAD_F(0x0626958f) /* 0.384419975 */, 14 },
+  /*  708 */  { MAD_F(0x06298def) /* 0.385145124 */, 14 },
+  /*  709 */  { MAD_F(0x062c86aa) /* 0.385870615 */, 14 },
+  /*  710 */  { MAD_F(0x062f7fc1) /* 0.386596448 */, 14 },
+  /*  711 */  { MAD_F(0x06327934) /* 0.387322621 */, 14 },
+  /*  712 */  { MAD_F(0x06357302) /* 0.388049134 */, 14 },
+  /*  713 */  { MAD_F(0x06386d2b) /* 0.388775988 */, 14 },
+  /*  714 */  { MAD_F(0x063b67b0) /* 0.389503182 */, 14 },
+  /*  715 */  { MAD_F(0x063e6290) /* 0.390230715 */, 14 },
+  /*  716 */  { MAD_F(0x06415dcb) /* 0.390958588 */, 14 },
+  /*  717 */  { MAD_F(0x06445960) /* 0.391686799 */, 14 },
+  /*  718 */  { MAD_F(0x06475551) /* 0.392415349 */, 14 },
+  /*  719 */  { MAD_F(0x064a519c) /* 0.393144238 */, 14 },
+
+  /*  720 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 14 },
+  /*  721 */  { MAD_F(0x06504b44) /* 0.394603028 */, 14 },
+  /*  722 */  { MAD_F(0x0653489f) /* 0.395332930 */, 14 },
+  /*  723 */  { MAD_F(0x06564655) /* 0.396063168 */, 14 },
+  /*  724 */  { MAD_F(0x06594465) /* 0.396793743 */, 14 },
+  /*  725 */  { MAD_F(0x065c42d0) /* 0.397524655 */, 14 },
+  /*  726 */  { MAD_F(0x065f4195) /* 0.398255903 */, 14 },
+  /*  727 */  { MAD_F(0x066240b4) /* 0.398987487 */, 14 },
+  /*  728 */  { MAD_F(0x0665402d) /* 0.399719406 */, 14 },
+  /*  729 */  { MAD_F(0x06684000) /* 0.400451660 */, 14 },
+  /*  730 */  { MAD_F(0x066b402d) /* 0.401184249 */, 14 },
+  /*  731 */  { MAD_F(0x066e40b3) /* 0.401917173 */, 14 },
+  /*  732 */  { MAD_F(0x06714194) /* 0.402650431 */, 14 },
+  /*  733 */  { MAD_F(0x067442ce) /* 0.403384024 */, 14 },
+  /*  734 */  { MAD_F(0x06774462) /* 0.404117949 */, 14 },
+  /*  735 */  { MAD_F(0x067a464f) /* 0.404852209 */, 14 },
+
+  /*  736 */  { MAD_F(0x067d4896) /* 0.405586801 */, 14 },
+  /*  737 */  { MAD_F(0x06804b36) /* 0.406321726 */, 14 },
+  /*  738 */  { MAD_F(0x06834e2f) /* 0.407056983 */, 14 },
+  /*  739 */  { MAD_F(0x06865181) /* 0.407792573 */, 14 },
+  /*  740 */  { MAD_F(0x0689552c) /* 0.408528495 */, 14 },
+  /*  741 */  { MAD_F(0x068c5931) /* 0.409264748 */, 14 },
+  /*  742 */  { MAD_F(0x068f5d8e) /* 0.410001332 */, 14 },
+  /*  743 */  { MAD_F(0x06926245) /* 0.410738247 */, 14 },
+  /*  744 */  { MAD_F(0x06956753) /* 0.411475493 */, 14 },
+  /*  745 */  { MAD_F(0x06986cbb) /* 0.412213070 */, 14 },
+  /*  746 */  { MAD_F(0x069b727b) /* 0.412950976 */, 14 },
+  /*  747 */  { MAD_F(0x069e7894) /* 0.413689213 */, 14 },
+  /*  748 */  { MAD_F(0x06a17f05) /* 0.414427779 */, 14 },
+  /*  749 */  { MAD_F(0x06a485cf) /* 0.415166674 */, 14 },
+  /*  750 */  { MAD_F(0x06a78cf1) /* 0.415905897 */, 14 },
+  /*  751 */  { MAD_F(0x06aa946b) /* 0.416645450 */, 14 },
+
+  /*  752 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 14 },
+  /*  753 */  { MAD_F(0x06b0a468) /* 0.418125540 */, 14 },
+  /*  754 */  { MAD_F(0x06b3acea) /* 0.418866076 */, 14 },
+  /*  755 */  { MAD_F(0x06b6b5c4) /* 0.419606940 */, 14 },
+  /*  756 */  { MAD_F(0x06b9bef6) /* 0.420348132 */, 14 },
+  /*  757 */  { MAD_F(0x06bcc880) /* 0.421089650 */, 14 },
+  /*  758 */  { MAD_F(0x06bfd261) /* 0.421831494 */, 14 },
+  /*  759 */  { MAD_F(0x06c2dc9a) /* 0.422573665 */, 14 },
+  /*  760 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 14 },
+  /*  761 */  { MAD_F(0x06c8f213) /* 0.424058985 */, 14 },
+  /*  762 */  { MAD_F(0x06cbfd52) /* 0.424802133 */, 14 },
+  /*  763 */  { MAD_F(0x06cf08e9) /* 0.425545607 */, 14 },
+  /*  764 */  { MAD_F(0x06d214d7) /* 0.426289405 */, 14 },
+  /*  765 */  { MAD_F(0x06d5211c) /* 0.427033528 */, 14 },
+  /*  766 */  { MAD_F(0x06d82db8) /* 0.427777975 */, 14 },
+  /*  767 */  { MAD_F(0x06db3aaa) /* 0.428522746 */, 14 },
+
+  /*  768 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 14 },
+  /*  769 */  { MAD_F(0x06e15595) /* 0.430013259 */, 14 },
+  /*  770 */  { MAD_F(0x06e4638d) /* 0.430759001 */, 14 },
+  /*  771 */  { MAD_F(0x06e771db) /* 0.431505065 */, 14 },
+  /*  772 */  { MAD_F(0x06ea807f) /* 0.432251452 */, 14 },
+  /*  773 */  { MAD_F(0x06ed8f7b) /* 0.432998162 */, 14 },
+  /*  774 */  { MAD_F(0x06f09ecc) /* 0.433745193 */, 14 },
+  /*  775 */  { MAD_F(0x06f3ae75) /* 0.434492546 */, 14 },
+  /*  776 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 14 },
+  /*  777 */  { MAD_F(0x06f9cec8) /* 0.435988217 */, 14 },
+  /*  778 */  { MAD_F(0x06fcdf72) /* 0.436736534 */, 14 },
+  /*  779 */  { MAD_F(0x06fff073) /* 0.437485172 */, 14 },
+  /*  780 */  { MAD_F(0x070301ca) /* 0.438234130 */, 14 },
+  /*  781 */  { MAD_F(0x07061377) /* 0.438983408 */, 14 },
+  /*  782 */  { MAD_F(0x0709257a) /* 0.439733006 */, 14 },
+  /*  783 */  { MAD_F(0x070c37d2) /* 0.440482924 */, 14 },
+
+  /*  784 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 14 },
+  /*  785 */  { MAD_F(0x07125d84) /* 0.441983717 */, 14 },
+  /*  786 */  { MAD_F(0x071570de) /* 0.442734592 */, 14 },
+  /*  787 */  { MAD_F(0x0718848d) /* 0.443485785 */, 14 },
+  /*  788 */  { MAD_F(0x071b9891) /* 0.444237296 */, 14 },
+  /*  789 */  { MAD_F(0x071eaceb) /* 0.444989126 */, 14 },
+  /*  790 */  { MAD_F(0x0721c19a) /* 0.445741273 */, 14 },
+  /*  791 */  { MAD_F(0x0724d69e) /* 0.446493738 */, 14 },
+  /*  792 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 14 },
+  /*  793 */  { MAD_F(0x072b01a6) /* 0.447999618 */, 14 },
+  /*  794 */  { MAD_F(0x072e17a9) /* 0.448753033 */, 14 },
+  /*  795 */  { MAD_F(0x07312e01) /* 0.449506765 */, 14 },
+  /*  796 */  { MAD_F(0x073444ae) /* 0.450260813 */, 14 },
+  /*  797 */  { MAD_F(0x07375bb0) /* 0.451015176 */, 14 },
+  /*  798 */  { MAD_F(0x073a7307) /* 0.451769856 */, 14 },
+  /*  799 */  { MAD_F(0x073d8ab2) /* 0.452524850 */, 14 },
+
+  /*  800 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 14 },
+  /*  801 */  { MAD_F(0x0743bb06) /* 0.454035784 */, 14 },
+  /*  802 */  { MAD_F(0x0746d3af) /* 0.454791723 */, 14 },
+  /*  803 */  { MAD_F(0x0749ecac) /* 0.455547976 */, 14 },
+  /*  804 */  { MAD_F(0x074d05fe) /* 0.456304543 */, 14 },
+  /*  805 */  { MAD_F(0x07501fa3) /* 0.457061423 */, 14 },
+  /*  806 */  { MAD_F(0x0753399d) /* 0.457818618 */, 14 },
+  /*  807 */  { MAD_F(0x075653eb) /* 0.458576125 */, 14 },
+  /*  808 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 14 },
+  /*  809 */  { MAD_F(0x075c8983) /* 0.460092079 */, 14 },
+  /*  810 */  { MAD_F(0x075fa4cc) /* 0.460850524 */, 14 },
+  /*  811 */  { MAD_F(0x0762c06a) /* 0.461609282 */, 14 },
+  /*  812 */  { MAD_F(0x0765dc5b) /* 0.462368352 */, 14 },
+  /*  813 */  { MAD_F(0x0768f8a0) /* 0.463127733 */, 14 },
+  /*  814 */  { MAD_F(0x076c1538) /* 0.463887426 */, 14 },
+  /*  815 */  { MAD_F(0x076f3224) /* 0.464647430 */, 14 },
+
+  /*  816 */  { MAD_F(0x07724f64) /* 0.465407744 */, 14 },
+  /*  817 */  { MAD_F(0x07756cf7) /* 0.466168370 */, 14 },
+  /*  818 */  { MAD_F(0x07788add) /* 0.466929306 */, 14 },
+  /*  819 */  { MAD_F(0x077ba916) /* 0.467690552 */, 14 },
+  /*  820 */  { MAD_F(0x077ec7a3) /* 0.468452108 */, 14 },
+  /*  821 */  { MAD_F(0x0781e683) /* 0.469213973 */, 14 },
+  /*  822 */  { MAD_F(0x078505b5) /* 0.469976148 */, 14 },
+  /*  823 */  { MAD_F(0x0788253b) /* 0.470738632 */, 14 },
+  /*  824 */  { MAD_F(0x078b4514) /* 0.471501425 */, 14 },
+  /*  825 */  { MAD_F(0x078e653f) /* 0.472264527 */, 14 },
+  /*  826 */  { MAD_F(0x079185be) /* 0.473027937 */, 14 },
+  /*  827 */  { MAD_F(0x0794a68f) /* 0.473791655 */, 14 },
+  /*  828 */  { MAD_F(0x0797c7b2) /* 0.474555681 */, 14 },
+  /*  829 */  { MAD_F(0x079ae929) /* 0.475320014 */, 14 },
+  /*  830 */  { MAD_F(0x079e0af1) /* 0.476084655 */, 14 },
+  /*  831 */  { MAD_F(0x07a12d0c) /* 0.476849603 */, 14 },
+
+  /*  832 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 14 },
+  /*  833 */  { MAD_F(0x07a7723a) /* 0.478380420 */, 14 },
+  /*  834 */  { MAD_F(0x07aa954c) /* 0.479146288 */, 14 },
+  /*  835 */  { MAD_F(0x07adb8b0) /* 0.479912463 */, 14 },
+  /*  836 */  { MAD_F(0x07b0dc67) /* 0.480678943 */, 14 },
+  /*  837 */  { MAD_F(0x07b4006f) /* 0.481445729 */, 14 },
+  /*  838 */  { MAD_F(0x07b724ca) /* 0.482212820 */, 14 },
+  /*  839 */  { MAD_F(0x07ba4976) /* 0.482980216 */, 14 },
+  /*  840 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 14 },
+  /*  841 */  { MAD_F(0x07c093c5) /* 0.484515924 */, 14 },
+  /*  842 */  { MAD_F(0x07c3b967) /* 0.485284235 */, 14 },
+  /*  843 */  { MAD_F(0x07c6df5a) /* 0.486052849 */, 14 },
+  /*  844 */  { MAD_F(0x07ca059f) /* 0.486821768 */, 14 },
+  /*  845 */  { MAD_F(0x07cd2c36) /* 0.487590991 */, 14 },
+  /*  846 */  { MAD_F(0x07d0531e) /* 0.488360517 */, 14 },
+  /*  847 */  { MAD_F(0x07d37a57) /* 0.489130346 */, 14 },
+
+  /*  848 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 14 },
+  /*  849 */  { MAD_F(0x07d9c9be) /* 0.490670914 */, 14 },
+  /*  850 */  { MAD_F(0x07dcf1ec) /* 0.491441651 */, 14 },
+  /*  851 */  { MAD_F(0x07e01a6a) /* 0.492212691 */, 14 },
+  /*  852 */  { MAD_F(0x07e3433a) /* 0.492984033 */, 14 },
+  /*  853 */  { MAD_F(0x07e66c5a) /* 0.493755677 */, 14 },
+  /*  854 */  { MAD_F(0x07e995cc) /* 0.494527623 */, 14 },
+  /*  855 */  { MAD_F(0x07ecbf8e) /* 0.495299870 */, 14 },
+  /*  856 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 14 },
+  /*  857 */  { MAD_F(0x07f31405) /* 0.496845266 */, 14 },
+  /*  858 */  { MAD_F(0x07f63eba) /* 0.497618416 */, 14 },
+  /*  859 */  { MAD_F(0x07f969c0) /* 0.498391866 */, 14 },
+  /*  860 */  { MAD_F(0x07fc9516) /* 0.499165616 */, 14 },
+  /*  861 */  { MAD_F(0x07ffc0bc) /* 0.499939666 */, 14 },
+  /*  862 */  { MAD_F(0x04017659) /* 0.250357008 */, 15 },
+  /*  863 */  { MAD_F(0x04030c7d) /* 0.250744333 */, 15 },
+
+  /*  864 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 15 },
+  /*  865 */  { MAD_F(0x0406393d) /* 0.251519431 */, 15 },
+  /*  866 */  { MAD_F(0x0407cfd9) /* 0.251907204 */, 15 },
+  /*  867 */  { MAD_F(0x0409669d) /* 0.252295127 */, 15 },
+  /*  868 */  { MAD_F(0x040afd89) /* 0.252683198 */, 15 },
+  /*  869 */  { MAD_F(0x040c949e) /* 0.253071419 */, 15 },
+  /*  870 */  { MAD_F(0x040e2bda) /* 0.253459789 */, 15 },
+  /*  871 */  { MAD_F(0x040fc33e) /* 0.253848307 */, 15 },
+  /*  872 */  { MAD_F(0x04115aca) /* 0.254236974 */, 15 },
+  /*  873 */  { MAD_F(0x0412f27e) /* 0.254625790 */, 15 },
+  /*  874 */  { MAD_F(0x04148a5a) /* 0.255014755 */, 15 },
+  /*  875 */  { MAD_F(0x0416225d) /* 0.255403867 */, 15 },
+  /*  876 */  { MAD_F(0x0417ba89) /* 0.255793128 */, 15 },
+  /*  877 */  { MAD_F(0x041952dc) /* 0.256182537 */, 15 },
+  /*  878 */  { MAD_F(0x041aeb57) /* 0.256572095 */, 15 },
+  /*  879 */  { MAD_F(0x041c83fa) /* 0.256961800 */, 15 },
+
+  /*  880 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 15 },
+  /*  881 */  { MAD_F(0x041fb5b6) /* 0.257741653 */, 15 },
+  /*  882 */  { MAD_F(0x04214ed0) /* 0.258131801 */, 15 },
+  /*  883 */  { MAD_F(0x0422e811) /* 0.258522097 */, 15 },
+  /*  884 */  { MAD_F(0x04248179) /* 0.258912540 */, 15 },
+  /*  885 */  { MAD_F(0x04261b0a) /* 0.259303130 */, 15 },
+  /*  886 */  { MAD_F(0x0427b4c2) /* 0.259693868 */, 15 },
+  /*  887 */  { MAD_F(0x04294ea1) /* 0.260084752 */, 15 },
+  /*  888 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 15 },
+  /*  889 */  { MAD_F(0x042c82d6) /* 0.260866961 */, 15 },
+  /*  890 */  { MAD_F(0x042e1d2b) /* 0.261258286 */, 15 },
+  /*  891 */  { MAD_F(0x042fb7a8) /* 0.261649758 */, 15 },
+  /*  892 */  { MAD_F(0x0431524c) /* 0.262041376 */, 15 },
+  /*  893 */  { MAD_F(0x0432ed17) /* 0.262433140 */, 15 },
+  /*  894 */  { MAD_F(0x0434880a) /* 0.262825051 */, 15 },
+  /*  895 */  { MAD_F(0x04362324) /* 0.263217107 */, 15 },
+
+  /*  896 */  { MAD_F(0x0437be65) /* 0.263609310 */, 15 },
+  /*  897 */  { MAD_F(0x043959cd) /* 0.264001659 */, 15 },
+  /*  898 */  { MAD_F(0x043af55d) /* 0.264394153 */, 15 },
+  /*  899 */  { MAD_F(0x043c9113) /* 0.264786794 */, 15 },
+  /*  900 */  { MAD_F(0x043e2cf1) /* 0.265179580 */, 15 },
+  /*  901 */  { MAD_F(0x043fc8f6) /* 0.265572511 */, 15 },
+  /*  902 */  { MAD_F(0x04416522) /* 0.265965588 */, 15 },
+  /*  903 */  { MAD_F(0x04430174) /* 0.266358810 */, 15 },
+  /*  904 */  { MAD_F(0x04449dee) /* 0.266752177 */, 15 },
+  /*  905 */  { MAD_F(0x04463a8f) /* 0.267145689 */, 15 },
+  /*  906 */  { MAD_F(0x0447d756) /* 0.267539347 */, 15 },
+  /*  907 */  { MAD_F(0x04497445) /* 0.267933149 */, 15 },
+  /*  908 */  { MAD_F(0x044b115a) /* 0.268327096 */, 15 },
+  /*  909 */  { MAD_F(0x044cae96) /* 0.268721187 */, 15 },
+  /*  910 */  { MAD_F(0x044e4bf9) /* 0.269115423 */, 15 },
+  /*  911 */  { MAD_F(0x044fe983) /* 0.269509804 */, 15 },
+
+  /*  912 */  { MAD_F(0x04518733) /* 0.269904329 */, 15 },
+  /*  913 */  { MAD_F(0x0453250a) /* 0.270298998 */, 15 },
+  /*  914 */  { MAD_F(0x0454c308) /* 0.270693811 */, 15 },
+  /*  915 */  { MAD_F(0x0456612d) /* 0.271088768 */, 15 },
+  /*  916 */  { MAD_F(0x0457ff78) /* 0.271483869 */, 15 },
+  /*  917 */  { MAD_F(0x04599dea) /* 0.271879114 */, 15 },
+  /*  918 */  { MAD_F(0x045b3c82) /* 0.272274503 */, 15 },
+  /*  919 */  { MAD_F(0x045cdb41) /* 0.272670035 */, 15 },
+  /*  920 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 15 },
+  /*  921 */  { MAD_F(0x04601932) /* 0.273461530 */, 15 },
+  /*  922 */  { MAD_F(0x0461b864) /* 0.273857492 */, 15 },
+  /*  923 */  { MAD_F(0x046357bd) /* 0.274253597 */, 15 },
+  /*  924 */  { MAD_F(0x0464f73c) /* 0.274649846 */, 15 },
+  /*  925 */  { MAD_F(0x046696e2) /* 0.275046238 */, 15 },
+  /*  926 */  { MAD_F(0x046836ae) /* 0.275442772 */, 15 },
+  /*  927 */  { MAD_F(0x0469d6a0) /* 0.275839449 */, 15 },
+
+  /*  928 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 15 },
+  /*  929 */  { MAD_F(0x046d16f7) /* 0.276633232 */, 15 },
+  /*  930 */  { MAD_F(0x046eb75c) /* 0.277030337 */, 15 },
+  /*  931 */  { MAD_F(0x047057e8) /* 0.277427584 */, 15 },
+  /*  932 */  { MAD_F(0x0471f899) /* 0.277824973 */, 15 },
+  /*  933 */  { MAD_F(0x04739971) /* 0.278222505 */, 15 },
+  /*  934 */  { MAD_F(0x04753a6f) /* 0.278620179 */, 15 },
+  /*  935 */  { MAD_F(0x0476db92) /* 0.279017995 */, 15 },
+  /*  936 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 15 },
+  /*  937 */  { MAD_F(0x047a1e4c) /* 0.279814051 */, 15 },
+  /*  938 */  { MAD_F(0x047bbfe2) /* 0.280212292 */, 15 },
+  /*  939 */  { MAD_F(0x047d619e) /* 0.280610675 */, 15 },
+  /*  940 */  { MAD_F(0x047f0380) /* 0.281009199 */, 15 },
+  /*  941 */  { MAD_F(0x0480a588) /* 0.281407864 */, 15 },
+  /*  942 */  { MAD_F(0x048247b6) /* 0.281806670 */, 15 },
+  /*  943 */  { MAD_F(0x0483ea0a) /* 0.282205618 */, 15 },
+
+  /*  944 */  { MAD_F(0x04858c83) /* 0.282604707 */, 15 },
+  /*  945 */  { MAD_F(0x04872f22) /* 0.283003936 */, 15 },
+  /*  946 */  { MAD_F(0x0488d1e8) /* 0.283403307 */, 15 },
+  /*  947 */  { MAD_F(0x048a74d3) /* 0.283802818 */, 15 },
+  /*  948 */  { MAD_F(0x048c17e3) /* 0.284202470 */, 15 },
+  /*  949 */  { MAD_F(0x048dbb1a) /* 0.284602263 */, 15 },
+  /*  950 */  { MAD_F(0x048f5e76) /* 0.285002195 */, 15 },
+  /*  951 */  { MAD_F(0x049101f8) /* 0.285402269 */, 15 },
+  /*  952 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 15 },
+  /*  953 */  { MAD_F(0x0494496c) /* 0.286202836 */, 15 },
+  /*  954 */  { MAD_F(0x0495ed5f) /* 0.286603329 */, 15 },
+  /*  955 */  { MAD_F(0x04979177) /* 0.287003963 */, 15 },
+  /*  956 */  { MAD_F(0x049935b5) /* 0.287404737 */, 15 },
+  /*  957 */  { MAD_F(0x049ada19) /* 0.287805650 */, 15 },
+  /*  958 */  { MAD_F(0x049c7ea1) /* 0.288206703 */, 15 },
+  /*  959 */  { MAD_F(0x049e2350) /* 0.288607895 */, 15 },
+
+  /*  960 */  { MAD_F(0x049fc824) /* 0.289009227 */, 15 },
+  /*  961 */  { MAD_F(0x04a16d1d) /* 0.289410699 */, 15 },
+  /*  962 */  { MAD_F(0x04a3123b) /* 0.289812309 */, 15 },
+  /*  963 */  { MAD_F(0x04a4b77f) /* 0.290214059 */, 15 },
+  /*  964 */  { MAD_F(0x04a65ce8) /* 0.290615948 */, 15 },
+  /*  965 */  { MAD_F(0x04a80277) /* 0.291017976 */, 15 },
+  /*  966 */  { MAD_F(0x04a9a82b) /* 0.291420143 */, 15 },
+  /*  967 */  { MAD_F(0x04ab4e04) /* 0.291822449 */, 15 },
+  /*  968 */  { MAD_F(0x04acf402) /* 0.292224893 */, 15 },
+  /*  969 */  { MAD_F(0x04ae9a26) /* 0.292627476 */, 15 },
+  /*  970 */  { MAD_F(0x04b0406e) /* 0.293030197 */, 15 },
+  /*  971 */  { MAD_F(0x04b1e6dc) /* 0.293433057 */, 15 },
+  /*  972 */  { MAD_F(0x04b38d6f) /* 0.293836055 */, 15 },
+  /*  973 */  { MAD_F(0x04b53427) /* 0.294239192 */, 15 },
+  /*  974 */  { MAD_F(0x04b6db05) /* 0.294642466 */, 15 },
+  /*  975 */  { MAD_F(0x04b88207) /* 0.295045879 */, 15 },
+
+  /*  976 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 15 },
+  /*  977 */  { MAD_F(0x04bbd07a) /* 0.295853118 */, 15 },
+  /*  978 */  { MAD_F(0x04bd77ec) /* 0.296256944 */, 15 },
+  /*  979 */  { MAD_F(0x04bf1f82) /* 0.296660907 */, 15 },
+  /*  980 */  { MAD_F(0x04c0c73d) /* 0.297065009 */, 15 },
+  /*  981 */  { MAD_F(0x04c26f1d) /* 0.297469248 */, 15 },
+  /*  982 */  { MAD_F(0x04c41722) /* 0.297873624 */, 15 },
+  /*  983 */  { MAD_F(0x04c5bf4c) /* 0.298278137 */, 15 },
+  /*  984 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 15 },
+  /*  985 */  { MAD_F(0x04c9100d) /* 0.299087576 */, 15 },
+  /*  986 */  { MAD_F(0x04cab8a6) /* 0.299492500 */, 15 },
+  /*  987 */  { MAD_F(0x04cc6163) /* 0.299897562 */, 15 },
+  /*  988 */  { MAD_F(0x04ce0a44) /* 0.300302761 */, 15 },
+  /*  989 */  { MAD_F(0x04cfb34b) /* 0.300708096 */, 15 },
+  /*  990 */  { MAD_F(0x04d15c76) /* 0.301113568 */, 15 },
+  /*  991 */  { MAD_F(0x04d305c5) /* 0.301519176 */, 15 },
+
+  /*  992 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 15 },
+  /*  993 */  { MAD_F(0x04d658d2) /* 0.302330802 */, 15 },
+  /*  994 */  { MAD_F(0x04d80290) /* 0.302736820 */, 15 },
+  /*  995 */  { MAD_F(0x04d9ac72) /* 0.303142973 */, 15 },
+  /*  996 */  { MAD_F(0x04db5679) /* 0.303549263 */, 15 },
+  /*  997 */  { MAD_F(0x04dd00a4) /* 0.303955689 */, 15 },
+  /*  998 */  { MAD_F(0x04deaaf3) /* 0.304362251 */, 15 },
+  /*  999 */  { MAD_F(0x04e05567) /* 0.304768948 */, 15 },
+  /* 1000 */  { MAD_F(0x04e20000) /* 0.305175781 */, 15 },
+  /* 1001 */  { MAD_F(0x04e3aabd) /* 0.305582750 */, 15 },
+  /* 1002 */  { MAD_F(0x04e5559e) /* 0.305989854 */, 15 },
+  /* 1003 */  { MAD_F(0x04e700a3) /* 0.306397094 */, 15 },
+  /* 1004 */  { MAD_F(0x04e8abcd) /* 0.306804470 */, 15 },
+  /* 1005 */  { MAD_F(0x04ea571c) /* 0.307211980 */, 15 },
+  /* 1006 */  { MAD_F(0x04ec028e) /* 0.307619626 */, 15 },
+  /* 1007 */  { MAD_F(0x04edae25) /* 0.308027406 */, 15 },
+
+  /* 1008 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 15 },
+  /* 1009 */  { MAD_F(0x04f105bf) /* 0.308843373 */, 15 },
+  /* 1010 */  { MAD_F(0x04f2b1c3) /* 0.309251558 */, 15 },
+  /* 1011 */  { MAD_F(0x04f45dea) /* 0.309659879 */, 15 },
+  /* 1012 */  { MAD_F(0x04f60a36) /* 0.310068333 */, 15 },
+  /* 1013 */  { MAD_F(0x04f7b6a6) /* 0.310476923 */, 15 },
+  /* 1014 */  { MAD_F(0x04f9633a) /* 0.310885647 */, 15 },
+  /* 1015 */  { MAD_F(0x04fb0ff2) /* 0.311294505 */, 15 },
+  /* 1016 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 15 },
+  /* 1017 */  { MAD_F(0x04fe69ce) /* 0.312112625 */, 15 },
+  /* 1018 */  { MAD_F(0x050016f3) /* 0.312521885 */, 15 },
+  /* 1019 */  { MAD_F(0x0501c43b) /* 0.312931280 */, 15 },
+  /* 1020 */  { MAD_F(0x050371a7) /* 0.313340809 */, 15 },
+  /* 1021 */  { MAD_F(0x05051f37) /* 0.313750472 */, 15 },
+  /* 1022 */  { MAD_F(0x0506cceb) /* 0.314160269 */, 15 },
+  /* 1023 */  { MAD_F(0x05087ac2) /* 0.314570199 */, 15 },
+
+  /* 1024 */  { MAD_F(0x050a28be) /* 0.314980262 */, 15 },
+  /* 1025 */  { MAD_F(0x050bd6de) /* 0.315390460 */, 15 },
+  /* 1026 */  { MAD_F(0x050d8521) /* 0.315800790 */, 15 },
+  /* 1027 */  { MAD_F(0x050f3388) /* 0.316211255 */, 15 },
+  /* 1028 */  { MAD_F(0x0510e213) /* 0.316621852 */, 15 },
+  /* 1029 */  { MAD_F(0x051290c2) /* 0.317032582 */, 15 },
+  /* 1030 */  { MAD_F(0x05143f94) /* 0.317443446 */, 15 },
+  /* 1031 */  { MAD_F(0x0515ee8a) /* 0.317854442 */, 15 },
+  /* 1032 */  { MAD_F(0x05179da4) /* 0.318265572 */, 15 },
+  /* 1033 */  { MAD_F(0x05194ce1) /* 0.318676834 */, 15 },
+  /* 1034 */  { MAD_F(0x051afc42) /* 0.319088229 */, 15 },
+  /* 1035 */  { MAD_F(0x051cabc7) /* 0.319499756 */, 15 },
+  /* 1036 */  { MAD_F(0x051e5b6f) /* 0.319911417 */, 15 },
+  /* 1037 */  { MAD_F(0x05200b3a) /* 0.320323209 */, 15 },
+  /* 1038 */  { MAD_F(0x0521bb2a) /* 0.320735134 */, 15 },
+  /* 1039 */  { MAD_F(0x05236b3d) /* 0.321147192 */, 15 },
+
+  /* 1040 */  { MAD_F(0x05251b73) /* 0.321559381 */, 15 },
+  /* 1041 */  { MAD_F(0x0526cbcd) /* 0.321971703 */, 15 },
+  /* 1042 */  { MAD_F(0x05287c4a) /* 0.322384156 */, 15 },
+  /* 1043 */  { MAD_F(0x052a2cea) /* 0.322796742 */, 15 },
+  /* 1044 */  { MAD_F(0x052bddae) /* 0.323209460 */, 15 },
+  /* 1045 */  { MAD_F(0x052d8e96) /* 0.323622309 */, 15 },
+  /* 1046 */  { MAD_F(0x052f3fa1) /* 0.324035290 */, 15 },
+  /* 1047 */  { MAD_F(0x0530f0cf) /* 0.324448403 */, 15 },
+  /* 1048 */  { MAD_F(0x0532a220) /* 0.324861647 */, 15 },
+  /* 1049 */  { MAD_F(0x05345395) /* 0.325275023 */, 15 },
+  /* 1050 */  { MAD_F(0x0536052d) /* 0.325688530 */, 15 },
+  /* 1051 */  { MAD_F(0x0537b6e8) /* 0.326102168 */, 15 },
+  /* 1052 */  { MAD_F(0x053968c6) /* 0.326515938 */, 15 },
+  /* 1053 */  { MAD_F(0x053b1ac8) /* 0.326929839 */, 15 },
+  /* 1054 */  { MAD_F(0x053ccced) /* 0.327343870 */, 15 },
+  /* 1055 */  { MAD_F(0x053e7f35) /* 0.327758033 */, 15 },
+
+  /* 1056 */  { MAD_F(0x054031a0) /* 0.328172327 */, 15 },
+  /* 1057 */  { MAD_F(0x0541e42e) /* 0.328586751 */, 15 },
+  /* 1058 */  { MAD_F(0x054396df) /* 0.329001306 */, 15 },
+  /* 1059 */  { MAD_F(0x054549b4) /* 0.329415992 */, 15 },
+  /* 1060 */  { MAD_F(0x0546fcab) /* 0.329830808 */, 15 },
+  /* 1061 */  { MAD_F(0x0548afc6) /* 0.330245755 */, 15 },
+  /* 1062 */  { MAD_F(0x054a6303) /* 0.330660832 */, 15 },
+  /* 1063 */  { MAD_F(0x054c1663) /* 0.331076039 */, 15 },
+  /* 1064 */  { MAD_F(0x054dc9e7) /* 0.331491377 */, 15 },
+  /* 1065 */  { MAD_F(0x054f7d8d) /* 0.331906845 */, 15 },
+  /* 1066 */  { MAD_F(0x05513156) /* 0.332322443 */, 15 },
+  /* 1067 */  { MAD_F(0x0552e542) /* 0.332738170 */, 15 },
+  /* 1068 */  { MAD_F(0x05549951) /* 0.333154028 */, 15 },
+  /* 1069 */  { MAD_F(0x05564d83) /* 0.333570016 */, 15 },
+  /* 1070 */  { MAD_F(0x055801d8) /* 0.333986133 */, 15 },
+  /* 1071 */  { MAD_F(0x0559b64f) /* 0.334402380 */, 15 },
+
+  /* 1072 */  { MAD_F(0x055b6ae9) /* 0.334818756 */, 15 },
+  /* 1073 */  { MAD_F(0x055d1fa6) /* 0.335235262 */, 15 },
+  /* 1074 */  { MAD_F(0x055ed486) /* 0.335651898 */, 15 },
+  /* 1075 */  { MAD_F(0x05608988) /* 0.336068662 */, 15 },
+  /* 1076 */  { MAD_F(0x05623ead) /* 0.336485556 */, 15 },
+  /* 1077 */  { MAD_F(0x0563f3f5) /* 0.336902579 */, 15 },
+  /* 1078 */  { MAD_F(0x0565a960) /* 0.337319732 */, 15 },
+  /* 1079 */  { MAD_F(0x05675eed) /* 0.337737013 */, 15 },
+  /* 1080 */  { MAD_F(0x0569149c) /* 0.338154423 */, 15 },
+  /* 1081 */  { MAD_F(0x056aca6f) /* 0.338571962 */, 15 },
+  /* 1082 */  { MAD_F(0x056c8064) /* 0.338989630 */, 15 },
+  /* 1083 */  { MAD_F(0x056e367b) /* 0.339407426 */, 15 },
+  /* 1084 */  { MAD_F(0x056fecb5) /* 0.339825351 */, 15 },
+  /* 1085 */  { MAD_F(0x0571a311) /* 0.340243405 */, 15 },
+  /* 1086 */  { MAD_F(0x05735990) /* 0.340661587 */, 15 },
+  /* 1087 */  { MAD_F(0x05751032) /* 0.341079898 */, 15 },
+
+  /* 1088 */  { MAD_F(0x0576c6f5) /* 0.341498336 */, 15 },
+  /* 1089 */  { MAD_F(0x05787ddc) /* 0.341916903 */, 15 },
+  /* 1090 */  { MAD_F(0x057a34e4) /* 0.342335598 */, 15 },
+  /* 1091 */  { MAD_F(0x057bec0f) /* 0.342754421 */, 15 },
+  /* 1092 */  { MAD_F(0x057da35d) /* 0.343173373 */, 15 },
+  /* 1093 */  { MAD_F(0x057f5acc) /* 0.343592452 */, 15 },
+  /* 1094 */  { MAD_F(0x0581125e) /* 0.344011659 */, 15 },
+  /* 1095 */  { MAD_F(0x0582ca12) /* 0.344430993 */, 15 },
+  /* 1096 */  { MAD_F(0x058481e9) /* 0.344850455 */, 15 },
+  /* 1097 */  { MAD_F(0x058639e2) /* 0.345270045 */, 15 },
+  /* 1098 */  { MAD_F(0x0587f1fd) /* 0.345689763 */, 15 },
+  /* 1099 */  { MAD_F(0x0589aa3a) /* 0.346109608 */, 15 },
+  /* 1100 */  { MAD_F(0x058b629a) /* 0.346529580 */, 15 },
+  /* 1101 */  { MAD_F(0x058d1b1b) /* 0.346949679 */, 15 },
+  /* 1102 */  { MAD_F(0x058ed3bf) /* 0.347369906 */, 15 },
+  /* 1103 */  { MAD_F(0x05908c85) /* 0.347790260 */, 15 },
+
+  /* 1104 */  { MAD_F(0x0592456d) /* 0.348210741 */, 15 },
+  /* 1105 */  { MAD_F(0x0593fe77) /* 0.348631348 */, 15 },
+  /* 1106 */  { MAD_F(0x0595b7a3) /* 0.349052083 */, 15 },
+  /* 1107 */  { MAD_F(0x059770f1) /* 0.349472945 */, 15 },
+  /* 1108 */  { MAD_F(0x05992a61) /* 0.349893933 */, 15 },
+  /* 1109 */  { MAD_F(0x059ae3f3) /* 0.350315048 */, 15 },
+  /* 1110 */  { MAD_F(0x059c9da8) /* 0.350736290 */, 15 },
+  /* 1111 */  { MAD_F(0x059e577e) /* 0.351157658 */, 15 },
+  /* 1112 */  { MAD_F(0x05a01176) /* 0.351579152 */, 15 },
+  /* 1113 */  { MAD_F(0x05a1cb90) /* 0.352000773 */, 15 },
+  /* 1114 */  { MAD_F(0x05a385cc) /* 0.352422520 */, 15 },
+  /* 1115 */  { MAD_F(0x05a5402a) /* 0.352844394 */, 15 },
+  /* 1116 */  { MAD_F(0x05a6faa9) /* 0.353266393 */, 15 },
+  /* 1117 */  { MAD_F(0x05a8b54b) /* 0.353688519 */, 15 },
+  /* 1118 */  { MAD_F(0x05aa700e) /* 0.354110771 */, 15 },
+  /* 1119 */  { MAD_F(0x05ac2af3) /* 0.354533148 */, 15 },
+
+  /* 1120 */  { MAD_F(0x05ade5fa) /* 0.354955651 */, 15 },
+  /* 1121 */  { MAD_F(0x05afa123) /* 0.355378281 */, 15 },
+  /* 1122 */  { MAD_F(0x05b15c6d) /* 0.355801035 */, 15 },
+  /* 1123 */  { MAD_F(0x05b317d9) /* 0.356223916 */, 15 },
+  /* 1124 */  { MAD_F(0x05b4d367) /* 0.356646922 */, 15 },
+  /* 1125 */  { MAD_F(0x05b68f16) /* 0.357070053 */, 15 },
+  /* 1126 */  { MAD_F(0x05b84ae7) /* 0.357493310 */, 15 },
+  /* 1127 */  { MAD_F(0x05ba06da) /* 0.357916692 */, 15 },
+  /* 1128 */  { MAD_F(0x05bbc2ef) /* 0.358340200 */, 15 },
+  /* 1129 */  { MAD_F(0x05bd7f25) /* 0.358763832 */, 15 },
+  /* 1130 */  { MAD_F(0x05bf3b7c) /* 0.359187590 */, 15 },
+  /* 1131 */  { MAD_F(0x05c0f7f5) /* 0.359611472 */, 15 },
+  /* 1132 */  { MAD_F(0x05c2b490) /* 0.360035480 */, 15 },
+  /* 1133 */  { MAD_F(0x05c4714c) /* 0.360459613 */, 15 },
+  /* 1134 */  { MAD_F(0x05c62e2a) /* 0.360883870 */, 15 },
+  /* 1135 */  { MAD_F(0x05c7eb29) /* 0.361308252 */, 15 },
+
+  /* 1136 */  { MAD_F(0x05c9a84a) /* 0.361732758 */, 15 },
+  /* 1137 */  { MAD_F(0x05cb658c) /* 0.362157390 */, 15 },
+  /* 1138 */  { MAD_F(0x05cd22ef) /* 0.362582145 */, 15 },
+  /* 1139 */  { MAD_F(0x05cee074) /* 0.363007026 */, 15 },
+  /* 1140 */  { MAD_F(0x05d09e1b) /* 0.363432030 */, 15 },
+  /* 1141 */  { MAD_F(0x05d25be2) /* 0.363857159 */, 15 },
+  /* 1142 */  { MAD_F(0x05d419cb) /* 0.364282412 */, 15 },
+  /* 1143 */  { MAD_F(0x05d5d7d5) /* 0.364707789 */, 15 },
+  /* 1144 */  { MAD_F(0x05d79601) /* 0.365133291 */, 15 },
+  /* 1145 */  { MAD_F(0x05d9544e) /* 0.365558916 */, 15 },
+  /* 1146 */  { MAD_F(0x05db12bc) /* 0.365984665 */, 15 },
+  /* 1147 */  { MAD_F(0x05dcd14c) /* 0.366410538 */, 15 },
+  /* 1148 */  { MAD_F(0x05de8ffc) /* 0.366836535 */, 15 },
+  /* 1149 */  { MAD_F(0x05e04ece) /* 0.367262655 */, 15 },
+  /* 1150 */  { MAD_F(0x05e20dc1) /* 0.367688900 */, 15 },
+  /* 1151 */  { MAD_F(0x05e3ccd5) /* 0.368115267 */, 15 },
+
+  /* 1152 */  { MAD_F(0x05e58c0b) /* 0.368541759 */, 15 },
+  /* 1153 */  { MAD_F(0x05e74b61) /* 0.368968373 */, 15 },
+  /* 1154 */  { MAD_F(0x05e90ad9) /* 0.369395111 */, 15 },
+  /* 1155 */  { MAD_F(0x05eaca72) /* 0.369821973 */, 15 },
+  /* 1156 */  { MAD_F(0x05ec8a2b) /* 0.370248957 */, 15 },
+  /* 1157 */  { MAD_F(0x05ee4a06) /* 0.370676065 */, 15 },
+  /* 1158 */  { MAD_F(0x05f00a02) /* 0.371103295 */, 15 },
+  /* 1159 */  { MAD_F(0x05f1ca1f) /* 0.371530649 */, 15 },
+  /* 1160 */  { MAD_F(0x05f38a5d) /* 0.371958126 */, 15 },
+  /* 1161 */  { MAD_F(0x05f54abc) /* 0.372385725 */, 15 },
+  /* 1162 */  { MAD_F(0x05f70b3c) /* 0.372813448 */, 15 },
+  /* 1163 */  { MAD_F(0x05f8cbdc) /* 0.373241292 */, 15 },
+  /* 1164 */  { MAD_F(0x05fa8c9e) /* 0.373669260 */, 15 },
+  /* 1165 */  { MAD_F(0x05fc4d81) /* 0.374097350 */, 15 },
+  /* 1166 */  { MAD_F(0x05fe0e84) /* 0.374525563 */, 15 },
+  /* 1167 */  { MAD_F(0x05ffcfa8) /* 0.374953898 */, 15 },
+
+  /* 1168 */  { MAD_F(0x060190ee) /* 0.375382356 */, 15 },
+  /* 1169 */  { MAD_F(0x06035254) /* 0.375810936 */, 15 },
+  /* 1170 */  { MAD_F(0x060513da) /* 0.376239638 */, 15 },
+  /* 1171 */  { MAD_F(0x0606d582) /* 0.376668462 */, 15 },
+  /* 1172 */  { MAD_F(0x0608974a) /* 0.377097408 */, 15 },
+  /* 1173 */  { MAD_F(0x060a5934) /* 0.377526476 */, 15 },
+  /* 1174 */  { MAD_F(0x060c1b3d) /* 0.377955667 */, 15 },
+  /* 1175 */  { MAD_F(0x060ddd68) /* 0.378384979 */, 15 },
+  /* 1176 */  { MAD_F(0x060f9fb3) /* 0.378814413 */, 15 },
+  /* 1177 */  { MAD_F(0x0611621f) /* 0.379243968 */, 15 },
+  /* 1178 */  { MAD_F(0x061324ac) /* 0.379673646 */, 15 },
+  /* 1179 */  { MAD_F(0x0614e759) /* 0.380103444 */, 15 },
+  /* 1180 */  { MAD_F(0x0616aa27) /* 0.380533365 */, 15 },
+  /* 1181 */  { MAD_F(0x06186d16) /* 0.380963407 */, 15 },
+  /* 1182 */  { MAD_F(0x061a3025) /* 0.381393570 */, 15 },
+  /* 1183 */  { MAD_F(0x061bf354) /* 0.381823855 */, 15 },
+
+  /* 1184 */  { MAD_F(0x061db6a5) /* 0.382254261 */, 15 },
+  /* 1185 */  { MAD_F(0x061f7a15) /* 0.382684788 */, 15 },
+  /* 1186 */  { MAD_F(0x06213da7) /* 0.383115436 */, 15 },
+  /* 1187 */  { MAD_F(0x06230158) /* 0.383546205 */, 15 },
+  /* 1188 */  { MAD_F(0x0624c52a) /* 0.383977096 */, 15 },
+  /* 1189 */  { MAD_F(0x0626891d) /* 0.384408107 */, 15 },
+  /* 1190 */  { MAD_F(0x06284d30) /* 0.384839239 */, 15 },
+  /* 1191 */  { MAD_F(0x062a1164) /* 0.385270492 */, 15 },
+  /* 1192 */  { MAD_F(0x062bd5b8) /* 0.385701865 */, 15 },
+  /* 1193 */  { MAD_F(0x062d9a2c) /* 0.386133359 */, 15 },
+  /* 1194 */  { MAD_F(0x062f5ec1) /* 0.386564974 */, 15 },
+  /* 1195 */  { MAD_F(0x06312376) /* 0.386996709 */, 15 },
+  /* 1196 */  { MAD_F(0x0632e84b) /* 0.387428565 */, 15 },
+  /* 1197 */  { MAD_F(0x0634ad41) /* 0.387860541 */, 15 },
+  /* 1198 */  { MAD_F(0x06367257) /* 0.388292637 */, 15 },
+  /* 1199 */  { MAD_F(0x0638378d) /* 0.388724854 */, 15 },
+
+  /* 1200 */  { MAD_F(0x0639fce4) /* 0.389157191 */, 15 },
+  /* 1201 */  { MAD_F(0x063bc25b) /* 0.389589648 */, 15 },
+  /* 1202 */  { MAD_F(0x063d87f2) /* 0.390022225 */, 15 },
+  /* 1203 */  { MAD_F(0x063f4da9) /* 0.390454922 */, 15 },
+  /* 1204 */  { MAD_F(0x06411380) /* 0.390887739 */, 15 },
+  /* 1205 */  { MAD_F(0x0642d978) /* 0.391320675 */, 15 },
+  /* 1206 */  { MAD_F(0x06449f8f) /* 0.391753732 */, 15 },
+  /* 1207 */  { MAD_F(0x064665c7) /* 0.392186908 */, 15 },
+  /* 1208 */  { MAD_F(0x06482c1f) /* 0.392620204 */, 15 },
+  /* 1209 */  { MAD_F(0x0649f297) /* 0.393053619 */, 15 },
+  /* 1210 */  { MAD_F(0x064bb92f) /* 0.393487154 */, 15 },
+  /* 1211 */  { MAD_F(0x064d7fe8) /* 0.393920808 */, 15 },
+  /* 1212 */  { MAD_F(0x064f46c0) /* 0.394354582 */, 15 },
+  /* 1213 */  { MAD_F(0x06510db8) /* 0.394788475 */, 15 },
+  /* 1214 */  { MAD_F(0x0652d4d0) /* 0.395222488 */, 15 },
+  /* 1215 */  { MAD_F(0x06549c09) /* 0.395656619 */, 15 },
+
+  /* 1216 */  { MAD_F(0x06566361) /* 0.396090870 */, 15 },
+  /* 1217 */  { MAD_F(0x06582ad9) /* 0.396525239 */, 15 },
+  /* 1218 */  { MAD_F(0x0659f271) /* 0.396959728 */, 15 },
+  /* 1219 */  { MAD_F(0x065bba29) /* 0.397394336 */, 15 },
+  /* 1220 */  { MAD_F(0x065d8201) /* 0.397829062 */, 15 },
+  /* 1221 */  { MAD_F(0x065f49f9) /* 0.398263907 */, 15 },
+  /* 1222 */  { MAD_F(0x06611211) /* 0.398698871 */, 15 },
+  /* 1223 */  { MAD_F(0x0662da49) /* 0.399133954 */, 15 },
+  /* 1224 */  { MAD_F(0x0664a2a0) /* 0.399569155 */, 15 },
+  /* 1225 */  { MAD_F(0x06666b17) /* 0.400004475 */, 15 },
+  /* 1226 */  { MAD_F(0x066833ae) /* 0.400439913 */, 15 },
+  /* 1227 */  { MAD_F(0x0669fc65) /* 0.400875470 */, 15 },
+  /* 1228 */  { MAD_F(0x066bc53c) /* 0.401311145 */, 15 },
+  /* 1229 */  { MAD_F(0x066d8e32) /* 0.401746938 */, 15 },
+  /* 1230 */  { MAD_F(0x066f5748) /* 0.402182850 */, 15 },
+  /* 1231 */  { MAD_F(0x0671207e) /* 0.402618879 */, 15 },
+
+  /* 1232 */  { MAD_F(0x0672e9d4) /* 0.403055027 */, 15 },
+  /* 1233 */  { MAD_F(0x0674b349) /* 0.403491293 */, 15 },
+  /* 1234 */  { MAD_F(0x06767cde) /* 0.403927676 */, 15 },
+  /* 1235 */  { MAD_F(0x06784692) /* 0.404364178 */, 15 },
+  /* 1236 */  { MAD_F(0x067a1066) /* 0.404800797 */, 15 },
+  /* 1237 */  { MAD_F(0x067bda5a) /* 0.405237535 */, 15 },
+  /* 1238 */  { MAD_F(0x067da46d) /* 0.405674390 */, 15 },
+  /* 1239 */  { MAD_F(0x067f6ea0) /* 0.406111362 */, 15 },
+  /* 1240 */  { MAD_F(0x068138f3) /* 0.406548452 */, 15 },
+  /* 1241 */  { MAD_F(0x06830365) /* 0.406985660 */, 15 },
+  /* 1242 */  { MAD_F(0x0684cdf6) /* 0.407422985 */, 15 },
+  /* 1243 */  { MAD_F(0x068698a8) /* 0.407860427 */, 15 },
+  /* 1244 */  { MAD_F(0x06886378) /* 0.408297987 */, 15 },
+  /* 1245 */  { MAD_F(0x068a2e68) /* 0.408735664 */, 15 },
+  /* 1246 */  { MAD_F(0x068bf978) /* 0.409173458 */, 15 },
+  /* 1247 */  { MAD_F(0x068dc4a7) /* 0.409611370 */, 15 },
+
+  /* 1248 */  { MAD_F(0x068f8ff5) /* 0.410049398 */, 15 },
+  /* 1249 */  { MAD_F(0x06915b63) /* 0.410487544 */, 15 },
+  /* 1250 */  { MAD_F(0x069326f0) /* 0.410925806 */, 15 },
+  /* 1251 */  { MAD_F(0x0694f29c) /* 0.411364185 */, 15 },
+  /* 1252 */  { MAD_F(0x0696be68) /* 0.411802681 */, 15 },
+  /* 1253 */  { MAD_F(0x06988a54) /* 0.412241294 */, 15 },
+  /* 1254 */  { MAD_F(0x069a565e) /* 0.412680024 */, 15 },
+  /* 1255 */  { MAD_F(0x069c2288) /* 0.413118870 */, 15 },
+  /* 1256 */  { MAD_F(0x069deed1) /* 0.413557833 */, 15 },
+  /* 1257 */  { MAD_F(0x069fbb3a) /* 0.413996912 */, 15 },
+  /* 1258 */  { MAD_F(0x06a187c1) /* 0.414436108 */, 15 },
+  /* 1259 */  { MAD_F(0x06a35468) /* 0.414875420 */, 15 },
+  /* 1260 */  { MAD_F(0x06a5212f) /* 0.415314849 */, 15 },
+  /* 1261 */  { MAD_F(0x06a6ee14) /* 0.415754393 */, 15 },
+  /* 1262 */  { MAD_F(0x06a8bb18) /* 0.416194054 */, 15 },
+  /* 1263 */  { MAD_F(0x06aa883c) /* 0.416633831 */, 15 },
+
+  /* 1264 */  { MAD_F(0x06ac557f) /* 0.417073724 */, 15 },
+  /* 1265 */  { MAD_F(0x06ae22e1) /* 0.417513734 */, 15 },
+  /* 1266 */  { MAD_F(0x06aff062) /* 0.417953859 */, 15 },
+  /* 1267 */  { MAD_F(0x06b1be03) /* 0.418394100 */, 15 },
+  /* 1268 */  { MAD_F(0x06b38bc2) /* 0.418834457 */, 15 },
+  /* 1269 */  { MAD_F(0x06b559a1) /* 0.419274929 */, 15 },
+  /* 1270 */  { MAD_F(0x06b7279e) /* 0.419715518 */, 15 },
+  /* 1271 */  { MAD_F(0x06b8f5bb) /* 0.420156222 */, 15 },
+  /* 1272 */  { MAD_F(0x06bac3f6) /* 0.420597041 */, 15 },
+  /* 1273 */  { MAD_F(0x06bc9251) /* 0.421037977 */, 15 },
+  /* 1274 */  { MAD_F(0x06be60cb) /* 0.421479027 */, 15 },
+  /* 1275 */  { MAD_F(0x06c02f63) /* 0.421920193 */, 15 },
+  /* 1276 */  { MAD_F(0x06c1fe1b) /* 0.422361475 */, 15 },
+  /* 1277 */  { MAD_F(0x06c3ccf1) /* 0.422802871 */, 15 },
+  /* 1278 */  { MAD_F(0x06c59be7) /* 0.423244383 */, 15 },
+  /* 1279 */  { MAD_F(0x06c76afb) /* 0.423686010 */, 15 },
+
+  /* 1280 */  { MAD_F(0x06c93a2e) /* 0.424127753 */, 15 },
+  /* 1281 */  { MAD_F(0x06cb0981) /* 0.424569610 */, 15 },
+  /* 1282 */  { MAD_F(0x06ccd8f2) /* 0.425011582 */, 15 },
+  /* 1283 */  { MAD_F(0x06cea881) /* 0.425453669 */, 15 },
+  /* 1284 */  { MAD_F(0x06d07830) /* 0.425895871 */, 15 },
+  /* 1285 */  { MAD_F(0x06d247fe) /* 0.426338188 */, 15 },
+  /* 1286 */  { MAD_F(0x06d417ea) /* 0.426780620 */, 15 },
+  /* 1287 */  { MAD_F(0x06d5e7f5) /* 0.427223166 */, 15 },
+  /* 1288 */  { MAD_F(0x06d7b81f) /* 0.427665827 */, 15 },
+  /* 1289 */  { MAD_F(0x06d98868) /* 0.428108603 */, 15 },
+  /* 1290 */  { MAD_F(0x06db58cf) /* 0.428551493 */, 15 },
+  /* 1291 */  { MAD_F(0x06dd2955) /* 0.428994497 */, 15 },
+  /* 1292 */  { MAD_F(0x06def9fa) /* 0.429437616 */, 15 },
+  /* 1293 */  { MAD_F(0x06e0cabe) /* 0.429880849 */, 15 },
+  /* 1294 */  { MAD_F(0x06e29ba0) /* 0.430324197 */, 15 },
+  /* 1295 */  { MAD_F(0x06e46ca1) /* 0.430767659 */, 15 },
+
+  /* 1296 */  { MAD_F(0x06e63dc0) /* 0.431211234 */, 15 },
+  /* 1297 */  { MAD_F(0x06e80efe) /* 0.431654924 */, 15 },
+  /* 1298 */  { MAD_F(0x06e9e05b) /* 0.432098728 */, 15 },
+  /* 1299 */  { MAD_F(0x06ebb1d6) /* 0.432542647 */, 15 },
+  /* 1300 */  { MAD_F(0x06ed8370) /* 0.432986678 */, 15 },
+  /* 1301 */  { MAD_F(0x06ef5529) /* 0.433430824 */, 15 },
+  /* 1302 */  { MAD_F(0x06f12700) /* 0.433875084 */, 15 },
+  /* 1303 */  { MAD_F(0x06f2f8f5) /* 0.434319457 */, 15 },
+  /* 1304 */  { MAD_F(0x06f4cb09) /* 0.434763944 */, 15 },
+  /* 1305 */  { MAD_F(0x06f69d3c) /* 0.435208545 */, 15 },
+  /* 1306 */  { MAD_F(0x06f86f8d) /* 0.435653259 */, 15 },
+  /* 1307 */  { MAD_F(0x06fa41fd) /* 0.436098087 */, 15 },
+  /* 1308 */  { MAD_F(0x06fc148b) /* 0.436543029 */, 15 },
+  /* 1309 */  { MAD_F(0x06fde737) /* 0.436988083 */, 15 },
+  /* 1310 */  { MAD_F(0x06ffba02) /* 0.437433251 */, 15 },
+  /* 1311 */  { MAD_F(0x07018ceb) /* 0.437878533 */, 15 },
+
+  /* 1312 */  { MAD_F(0x07035ff3) /* 0.438323927 */, 15 },
+  /* 1313 */  { MAD_F(0x07053319) /* 0.438769435 */, 15 },
+  /* 1314 */  { MAD_F(0x0707065d) /* 0.439215056 */, 15 },
+  /* 1315 */  { MAD_F(0x0708d9c0) /* 0.439660790 */, 15 },
+  /* 1316 */  { MAD_F(0x070aad41) /* 0.440106636 */, 15 },
+  /* 1317 */  { MAD_F(0x070c80e1) /* 0.440552596 */, 15 },
+  /* 1318 */  { MAD_F(0x070e549f) /* 0.440998669 */, 15 },
+  /* 1319 */  { MAD_F(0x0710287b) /* 0.441444855 */, 15 },
+  /* 1320 */  { MAD_F(0x0711fc75) /* 0.441891153 */, 15 },
+  /* 1321 */  { MAD_F(0x0713d08d) /* 0.442337564 */, 15 },
+  /* 1322 */  { MAD_F(0x0715a4c4) /* 0.442784088 */, 15 },
+  /* 1323 */  { MAD_F(0x07177919) /* 0.443230724 */, 15 },
+  /* 1324 */  { MAD_F(0x07194d8c) /* 0.443677473 */, 15 },
+  /* 1325 */  { MAD_F(0x071b221e) /* 0.444124334 */, 15 },
+  /* 1326 */  { MAD_F(0x071cf6ce) /* 0.444571308 */, 15 },
+  /* 1327 */  { MAD_F(0x071ecb9b) /* 0.445018394 */, 15 },
+
+  /* 1328 */  { MAD_F(0x0720a087) /* 0.445465593 */, 15 },
+  /* 1329 */  { MAD_F(0x07227591) /* 0.445912903 */, 15 },
+  /* 1330 */  { MAD_F(0x07244ab9) /* 0.446360326 */, 15 },
+  /* 1331 */  { MAD_F(0x07262000) /* 0.446807861 */, 15 },
+  /* 1332 */  { MAD_F(0x0727f564) /* 0.447255509 */, 15 },
+  /* 1333 */  { MAD_F(0x0729cae7) /* 0.447703268 */, 15 },
+  /* 1334 */  { MAD_F(0x072ba087) /* 0.448151139 */, 15 },
+  /* 1335 */  { MAD_F(0x072d7646) /* 0.448599122 */, 15 },
+  /* 1336 */  { MAD_F(0x072f4c22) /* 0.449047217 */, 15 },
+  /* 1337 */  { MAD_F(0x0731221d) /* 0.449495424 */, 15 },
+  /* 1338 */  { MAD_F(0x0732f835) /* 0.449943742 */, 15 },
+  /* 1339 */  { MAD_F(0x0734ce6c) /* 0.450392173 */, 15 },
+  /* 1340 */  { MAD_F(0x0736a4c1) /* 0.450840715 */, 15 },
+  /* 1341 */  { MAD_F(0x07387b33) /* 0.451289368 */, 15 },
+  /* 1342 */  { MAD_F(0x073a51c4) /* 0.451738133 */, 15 },
+  /* 1343 */  { MAD_F(0x073c2872) /* 0.452187010 */, 15 },
+
+  /* 1344 */  { MAD_F(0x073dff3e) /* 0.452635998 */, 15 },
+  /* 1345 */  { MAD_F(0x073fd628) /* 0.453085097 */, 15 },
+  /* 1346 */  { MAD_F(0x0741ad30) /* 0.453534308 */, 15 },
+  /* 1347 */  { MAD_F(0x07438456) /* 0.453983630 */, 15 },
+  /* 1348 */  { MAD_F(0x07455b9a) /* 0.454433063 */, 15 },
+  /* 1349 */  { MAD_F(0x074732fc) /* 0.454882607 */, 15 },
+  /* 1350 */  { MAD_F(0x07490a7b) /* 0.455332262 */, 15 },
+  /* 1351 */  { MAD_F(0x074ae218) /* 0.455782029 */, 15 },
+  /* 1352 */  { MAD_F(0x074cb9d3) /* 0.456231906 */, 15 },
+  /* 1353 */  { MAD_F(0x074e91ac) /* 0.456681894 */, 15 },
+  /* 1354 */  { MAD_F(0x075069a3) /* 0.457131993 */, 15 },
+  /* 1355 */  { MAD_F(0x075241b7) /* 0.457582203 */, 15 },
+  /* 1356 */  { MAD_F(0x075419e9) /* 0.458032524 */, 15 },
+  /* 1357 */  { MAD_F(0x0755f239) /* 0.458482956 */, 15 },
+  /* 1358 */  { MAD_F(0x0757caa7) /* 0.458933498 */, 15 },
+  /* 1359 */  { MAD_F(0x0759a332) /* 0.459384151 */, 15 },
+
+  /* 1360 */  { MAD_F(0x075b7bdb) /* 0.459834914 */, 15 },
+  /* 1361 */  { MAD_F(0x075d54a1) /* 0.460285788 */, 15 },
+  /* 1362 */  { MAD_F(0x075f2d85) /* 0.460736772 */, 15 },
+  /* 1363 */  { MAD_F(0x07610687) /* 0.461187867 */, 15 },
+  /* 1364 */  { MAD_F(0x0762dfa6) /* 0.461639071 */, 15 },
+  /* 1365 */  { MAD_F(0x0764b8e3) /* 0.462090387 */, 15 },
+  /* 1366 */  { MAD_F(0x0766923e) /* 0.462541812 */, 15 },
+  /* 1367 */  { MAD_F(0x07686bb6) /* 0.462993348 */, 15 },
+  /* 1368 */  { MAD_F(0x076a454c) /* 0.463444993 */, 15 },
+  /* 1369 */  { MAD_F(0x076c1eff) /* 0.463896749 */, 15 },
+  /* 1370 */  { MAD_F(0x076df8d0) /* 0.464348615 */, 15 },
+  /* 1371 */  { MAD_F(0x076fd2be) /* 0.464800591 */, 15 },
+  /* 1372 */  { MAD_F(0x0771acca) /* 0.465252676 */, 15 },
+  /* 1373 */  { MAD_F(0x077386f3) /* 0.465704872 */, 15 },
+  /* 1374 */  { MAD_F(0x0775613a) /* 0.466157177 */, 15 },
+  /* 1375 */  { MAD_F(0x07773b9e) /* 0.466609592 */, 15 },
+
+  /* 1376 */  { MAD_F(0x07791620) /* 0.467062117 */, 15 },
+  /* 1377 */  { MAD_F(0x077af0bf) /* 0.467514751 */, 15 },
+  /* 1378 */  { MAD_F(0x077ccb7c) /* 0.467967495 */, 15 },
+  /* 1379 */  { MAD_F(0x077ea656) /* 0.468420349 */, 15 },
+  /* 1380 */  { MAD_F(0x0780814d) /* 0.468873312 */, 15 },
+  /* 1381 */  { MAD_F(0x07825c62) /* 0.469326384 */, 15 },
+  /* 1382 */  { MAD_F(0x07843794) /* 0.469779566 */, 15 },
+  /* 1383 */  { MAD_F(0x078612e3) /* 0.470232857 */, 15 },
+  /* 1384 */  { MAD_F(0x0787ee50) /* 0.470686258 */, 15 },
+  /* 1385 */  { MAD_F(0x0789c9da) /* 0.471139767 */, 15 },
+  /* 1386 */  { MAD_F(0x078ba581) /* 0.471593386 */, 15 },
+  /* 1387 */  { MAD_F(0x078d8146) /* 0.472047114 */, 15 },
+  /* 1388 */  { MAD_F(0x078f5d28) /* 0.472500951 */, 15 },
+  /* 1389 */  { MAD_F(0x07913927) /* 0.472954896 */, 15 },
+  /* 1390 */  { MAD_F(0x07931543) /* 0.473408951 */, 15 },
+  /* 1391 */  { MAD_F(0x0794f17d) /* 0.473863115 */, 15 },
+
+  /* 1392 */  { MAD_F(0x0796cdd4) /* 0.474317388 */, 15 },
+  /* 1393 */  { MAD_F(0x0798aa48) /* 0.474771769 */, 15 },
+  /* 1394 */  { MAD_F(0x079a86d9) /* 0.475226259 */, 15 },
+  /* 1395 */  { MAD_F(0x079c6388) /* 0.475680858 */, 15 },
+  /* 1396 */  { MAD_F(0x079e4053) /* 0.476135565 */, 15 },
+  /* 1397 */  { MAD_F(0x07a01d3c) /* 0.476590381 */, 15 },
+  /* 1398 */  { MAD_F(0x07a1fa42) /* 0.477045306 */, 15 },
+  /* 1399 */  { MAD_F(0x07a3d765) /* 0.477500339 */, 15 },
+  /* 1400 */  { MAD_F(0x07a5b4a5) /* 0.477955481 */, 15 },
+  /* 1401 */  { MAD_F(0x07a79202) /* 0.478410731 */, 15 },
+  /* 1402 */  { MAD_F(0x07a96f7d) /* 0.478866089 */, 15 },
+  /* 1403 */  { MAD_F(0x07ab4d14) /* 0.479321555 */, 15 },
+  /* 1404 */  { MAD_F(0x07ad2ac8) /* 0.479777130 */, 15 },
+  /* 1405 */  { MAD_F(0x07af089a) /* 0.480232813 */, 15 },
+  /* 1406 */  { MAD_F(0x07b0e688) /* 0.480688604 */, 15 },
+  /* 1407 */  { MAD_F(0x07b2c494) /* 0.481144503 */, 15 },
+
+  /* 1408 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */, 15 },
+  /* 1409 */  { MAD_F(0x07b68102) /* 0.482056625 */, 15 },
+  /* 1410 */  { MAD_F(0x07b85f64) /* 0.482512848 */, 15 },
+  /* 1411 */  { MAD_F(0x07ba3de4) /* 0.482969179 */, 15 },
+  /* 1412 */  { MAD_F(0x07bc1c80) /* 0.483425618 */, 15 },
+  /* 1413 */  { MAD_F(0x07bdfb39) /* 0.483882164 */, 15 },
+  /* 1414 */  { MAD_F(0x07bfda0f) /* 0.484338818 */, 15 },
+  /* 1415 */  { MAD_F(0x07c1b902) /* 0.484795580 */, 15 },
+  /* 1416 */  { MAD_F(0x07c39812) /* 0.485252449 */, 15 },
+  /* 1417 */  { MAD_F(0x07c5773f) /* 0.485709426 */, 15 },
+  /* 1418 */  { MAD_F(0x07c75689) /* 0.486166511 */, 15 },
+  /* 1419 */  { MAD_F(0x07c935ef) /* 0.486623703 */, 15 },
+  /* 1420 */  { MAD_F(0x07cb1573) /* 0.487081002 */, 15 },
+  /* 1421 */  { MAD_F(0x07ccf513) /* 0.487538409 */, 15 },
+  /* 1422 */  { MAD_F(0x07ced4d0) /* 0.487995923 */, 15 },
+  /* 1423 */  { MAD_F(0x07d0b4aa) /* 0.488453544 */, 15 },
+
+  /* 1424 */  { MAD_F(0x07d294a0) /* 0.488911273 */, 15 },
+  /* 1425 */  { MAD_F(0x07d474b3) /* 0.489369108 */, 15 },
+  /* 1426 */  { MAD_F(0x07d654e4) /* 0.489827051 */, 15 },
+  /* 1427 */  { MAD_F(0x07d83530) /* 0.490285101 */, 15 },
+  /* 1428 */  { MAD_F(0x07da159a) /* 0.490743258 */, 15 },
+  /* 1429 */  { MAD_F(0x07dbf620) /* 0.491201522 */, 15 },
+  /* 1430 */  { MAD_F(0x07ddd6c3) /* 0.491659892 */, 15 },
+  /* 1431 */  { MAD_F(0x07dfb783) /* 0.492118370 */, 15 },
+  /* 1432 */  { MAD_F(0x07e1985f) /* 0.492576954 */, 15 },
+  /* 1433 */  { MAD_F(0x07e37958) /* 0.493035645 */, 15 },
+  /* 1434 */  { MAD_F(0x07e55a6e) /* 0.493494443 */, 15 },
+  /* 1435 */  { MAD_F(0x07e73ba0) /* 0.493953348 */, 15 },
+  /* 1436 */  { MAD_F(0x07e91cef) /* 0.494412359 */, 15 },
+  /* 1437 */  { MAD_F(0x07eafe5a) /* 0.494871476 */, 15 },
+  /* 1438 */  { MAD_F(0x07ecdfe2) /* 0.495330701 */, 15 },
+  /* 1439 */  { MAD_F(0x07eec187) /* 0.495790031 */, 15 },
+
+  /* 1440 */  { MAD_F(0x07f0a348) /* 0.496249468 */, 15 },
+  /* 1441 */  { MAD_F(0x07f28526) /* 0.496709012 */, 15 },
+  /* 1442 */  { MAD_F(0x07f46720) /* 0.497168662 */, 15 },
+  /* 1443 */  { MAD_F(0x07f64937) /* 0.497628418 */, 15 },
+  /* 1444 */  { MAD_F(0x07f82b6a) /* 0.498088280 */, 15 },
+  /* 1445 */  { MAD_F(0x07fa0dba) /* 0.498548248 */, 15 },
+  /* 1446 */  { MAD_F(0x07fbf026) /* 0.499008323 */, 15 },
+  /* 1447 */  { MAD_F(0x07fdd2af) /* 0.499468503 */, 15 },
+  /* 1448 */  { MAD_F(0x07ffb554) /* 0.499928790 */, 15 },
+  /* 1449 */  { MAD_F(0x0400cc0b) /* 0.250194591 */, 16 },
+  /* 1450 */  { MAD_F(0x0401bd7a) /* 0.250424840 */, 16 },
+  /* 1451 */  { MAD_F(0x0402aef7) /* 0.250655143 */, 16 },
+  /* 1452 */  { MAD_F(0x0403a083) /* 0.250885498 */, 16 },
+  /* 1453 */  { MAD_F(0x0404921c) /* 0.251115906 */, 16 },
+  /* 1454 */  { MAD_F(0x040583c4) /* 0.251346367 */, 16 },
+  /* 1455 */  { MAD_F(0x0406757a) /* 0.251576880 */, 16 },
+
+  /* 1456 */  { MAD_F(0x0407673f) /* 0.251807447 */, 16 },
+  /* 1457 */  { MAD_F(0x04085911) /* 0.252038066 */, 16 },
+  /* 1458 */  { MAD_F(0x04094af1) /* 0.252268738 */, 16 },
+  /* 1459 */  { MAD_F(0x040a3ce0) /* 0.252499463 */, 16 },
+  /* 1460 */  { MAD_F(0x040b2edd) /* 0.252730240 */, 16 },
+  /* 1461 */  { MAD_F(0x040c20e8) /* 0.252961071 */, 16 },
+  /* 1462 */  { MAD_F(0x040d1301) /* 0.253191953 */, 16 },
+  /* 1463 */  { MAD_F(0x040e0529) /* 0.253422889 */, 16 },
+  /* 1464 */  { MAD_F(0x040ef75e) /* 0.253653877 */, 16 },
+  /* 1465 */  { MAD_F(0x040fe9a1) /* 0.253884918 */, 16 },
+  /* 1466 */  { MAD_F(0x0410dbf3) /* 0.254116011 */, 16 },
+  /* 1467 */  { MAD_F(0x0411ce53) /* 0.254347157 */, 16 },
+  /* 1468 */  { MAD_F(0x0412c0c1) /* 0.254578356 */, 16 },
+  /* 1469 */  { MAD_F(0x0413b33d) /* 0.254809606 */, 16 },
+  /* 1470 */  { MAD_F(0x0414a5c7) /* 0.255040910 */, 16 },
+  /* 1471 */  { MAD_F(0x0415985f) /* 0.255272266 */, 16 },
+
+  /* 1472 */  { MAD_F(0x04168b05) /* 0.255503674 */, 16 },
+  /* 1473 */  { MAD_F(0x04177db9) /* 0.255735135 */, 16 },
+  /* 1474 */  { MAD_F(0x0418707c) /* 0.255966648 */, 16 },
+  /* 1475 */  { MAD_F(0x0419634c) /* 0.256198213 */, 16 },
+  /* 1476 */  { MAD_F(0x041a562a) /* 0.256429831 */, 16 },
+  /* 1477 */  { MAD_F(0x041b4917) /* 0.256661501 */, 16 },
+  /* 1478 */  { MAD_F(0x041c3c11) /* 0.256893223 */, 16 },
+  /* 1479 */  { MAD_F(0x041d2f1a) /* 0.257124998 */, 16 },
+  /* 1480 */  { MAD_F(0x041e2230) /* 0.257356825 */, 16 },
+  /* 1481 */  { MAD_F(0x041f1555) /* 0.257588704 */, 16 },
+  /* 1482 */  { MAD_F(0x04200888) /* 0.257820635 */, 16 },
+  /* 1483 */  { MAD_F(0x0420fbc8) /* 0.258052619 */, 16 },
+  /* 1484 */  { MAD_F(0x0421ef17) /* 0.258284654 */, 16 },
+  /* 1485 */  { MAD_F(0x0422e273) /* 0.258516742 */, 16 },
+  /* 1486 */  { MAD_F(0x0423d5de) /* 0.258748882 */, 16 },
+  /* 1487 */  { MAD_F(0x0424c956) /* 0.258981074 */, 16 },
+
+  /* 1488 */  { MAD_F(0x0425bcdd) /* 0.259213318 */, 16 },
+  /* 1489 */  { MAD_F(0x0426b071) /* 0.259445614 */, 16 },
+  /* 1490 */  { MAD_F(0x0427a414) /* 0.259677962 */, 16 },
+  /* 1491 */  { MAD_F(0x042897c4) /* 0.259910362 */, 16 },
+  /* 1492 */  { MAD_F(0x04298b83) /* 0.260142814 */, 16 },
+  /* 1493 */  { MAD_F(0x042a7f4f) /* 0.260375318 */, 16 },
+  /* 1494 */  { MAD_F(0x042b7329) /* 0.260607874 */, 16 },
+  /* 1495 */  { MAD_F(0x042c6711) /* 0.260840481 */, 16 },
+  /* 1496 */  { MAD_F(0x042d5b07) /* 0.261073141 */, 16 },
+  /* 1497 */  { MAD_F(0x042e4f0b) /* 0.261305852 */, 16 },
+  /* 1498 */  { MAD_F(0x042f431d) /* 0.261538616 */, 16 },
+  /* 1499 */  { MAD_F(0x0430373d) /* 0.261771431 */, 16 },
+  /* 1500 */  { MAD_F(0x04312b6b) /* 0.262004297 */, 16 },
+  /* 1501 */  { MAD_F(0x04321fa6) /* 0.262237216 */, 16 },
+  /* 1502 */  { MAD_F(0x043313f0) /* 0.262470186 */, 16 },
+  /* 1503 */  { MAD_F(0x04340847) /* 0.262703208 */, 16 },
+
+  /* 1504 */  { MAD_F(0x0434fcad) /* 0.262936282 */, 16 },
+  /* 1505 */  { MAD_F(0x0435f120) /* 0.263169407 */, 16 },
+  /* 1506 */  { MAD_F(0x0436e5a1) /* 0.263402584 */, 16 },
+  /* 1507 */  { MAD_F(0x0437da2f) /* 0.263635813 */, 16 },
+  /* 1508 */  { MAD_F(0x0438cecc) /* 0.263869093 */, 16 },
+  /* 1509 */  { MAD_F(0x0439c377) /* 0.264102425 */, 16 },
+  /* 1510 */  { MAD_F(0x043ab82f) /* 0.264335808 */, 16 },
+  /* 1511 */  { MAD_F(0x043bacf5) /* 0.264569243 */, 16 },
+  /* 1512 */  { MAD_F(0x043ca1c9) /* 0.264802730 */, 16 },
+  /* 1513 */  { MAD_F(0x043d96ab) /* 0.265036267 */, 16 },
+  /* 1514 */  { MAD_F(0x043e8b9b) /* 0.265269857 */, 16 },
+  /* 1515 */  { MAD_F(0x043f8098) /* 0.265503498 */, 16 },
+  /* 1516 */  { MAD_F(0x044075a3) /* 0.265737190 */, 16 },
+  /* 1517 */  { MAD_F(0x04416abc) /* 0.265970933 */, 16 },
+  /* 1518 */  { MAD_F(0x04425fe3) /* 0.266204728 */, 16 },
+  /* 1519 */  { MAD_F(0x04435518) /* 0.266438574 */, 16 },
+
+  /* 1520 */  { MAD_F(0x04444a5a) /* 0.266672472 */, 16 },
+  /* 1521 */  { MAD_F(0x04453fab) /* 0.266906421 */, 16 },
+  /* 1522 */  { MAD_F(0x04463508) /* 0.267140421 */, 16 },
+  /* 1523 */  { MAD_F(0x04472a74) /* 0.267374472 */, 16 },
+  /* 1524 */  { MAD_F(0x04481fee) /* 0.267608575 */, 16 },
+  /* 1525 */  { MAD_F(0x04491575) /* 0.267842729 */, 16 },
+  /* 1526 */  { MAD_F(0x044a0b0a) /* 0.268076934 */, 16 },
+  /* 1527 */  { MAD_F(0x044b00ac) /* 0.268311190 */, 16 },
+  /* 1528 */  { MAD_F(0x044bf65d) /* 0.268545497 */, 16 },
+  /* 1529 */  { MAD_F(0x044cec1b) /* 0.268779856 */, 16 },
+  /* 1530 */  { MAD_F(0x044de1e7) /* 0.269014265 */, 16 },
+  /* 1531 */  { MAD_F(0x044ed7c0) /* 0.269248726 */, 16 },
+  /* 1532 */  { MAD_F(0x044fcda8) /* 0.269483238 */, 16 },
+  /* 1533 */  { MAD_F(0x0450c39c) /* 0.269717800 */, 16 },
+  /* 1534 */  { MAD_F(0x0451b99f) /* 0.269952414 */, 16 },
+  /* 1535 */  { MAD_F(0x0452afaf) /* 0.270187079 */, 16 },
+
+  /* 1536 */  { MAD_F(0x0453a5cd) /* 0.270421794 */, 16 },
+  /* 1537 */  { MAD_F(0x04549bf9) /* 0.270656561 */, 16 },
+  /* 1538 */  { MAD_F(0x04559232) /* 0.270891379 */, 16 },
+  /* 1539 */  { MAD_F(0x04568879) /* 0.271126247 */, 16 },
+  /* 1540 */  { MAD_F(0x04577ece) /* 0.271361166 */, 16 },
+  /* 1541 */  { MAD_F(0x04587530) /* 0.271596136 */, 16 },
+  /* 1542 */  { MAD_F(0x04596ba0) /* 0.271831157 */, 16 },
+  /* 1543 */  { MAD_F(0x045a621e) /* 0.272066229 */, 16 },
+  /* 1544 */  { MAD_F(0x045b58a9) /* 0.272301352 */, 16 },
+  /* 1545 */  { MAD_F(0x045c4f42) /* 0.272536525 */, 16 },
+  /* 1546 */  { MAD_F(0x045d45e9) /* 0.272771749 */, 16 },
+  /* 1547 */  { MAD_F(0x045e3c9d) /* 0.273007024 */, 16 },
+  /* 1548 */  { MAD_F(0x045f335e) /* 0.273242350 */, 16 },
+  /* 1549 */  { MAD_F(0x04602a2e) /* 0.273477726 */, 16 },
+  /* 1550 */  { MAD_F(0x0461210b) /* 0.273713153 */, 16 },
+  /* 1551 */  { MAD_F(0x046217f5) /* 0.273948630 */, 16 },
+
+  /* 1552 */  { MAD_F(0x04630eed) /* 0.274184158 */, 16 },
+  /* 1553 */  { MAD_F(0x046405f3) /* 0.274419737 */, 16 },
+  /* 1554 */  { MAD_F(0x0464fd06) /* 0.274655366 */, 16 },
+  /* 1555 */  { MAD_F(0x0465f427) /* 0.274891046 */, 16 },
+  /* 1556 */  { MAD_F(0x0466eb55) /* 0.275126776 */, 16 },
+  /* 1557 */  { MAD_F(0x0467e291) /* 0.275362557 */, 16 },
+  /* 1558 */  { MAD_F(0x0468d9db) /* 0.275598389 */, 16 },
+  /* 1559 */  { MAD_F(0x0469d132) /* 0.275834270 */, 16 },
+  /* 1560 */  { MAD_F(0x046ac896) /* 0.276070203 */, 16 },
+  /* 1561 */  { MAD_F(0x046bc009) /* 0.276306185 */, 16 },
+  /* 1562 */  { MAD_F(0x046cb788) /* 0.276542218 */, 16 },
+  /* 1563 */  { MAD_F(0x046daf15) /* 0.276778302 */, 16 },
+  /* 1564 */  { MAD_F(0x046ea6b0) /* 0.277014435 */, 16 },
+  /* 1565 */  { MAD_F(0x046f9e58) /* 0.277250619 */, 16 },
+  /* 1566 */  { MAD_F(0x0470960e) /* 0.277486854 */, 16 },
+  /* 1567 */  { MAD_F(0x04718dd1) /* 0.277723139 */, 16 },
+
+  /* 1568 */  { MAD_F(0x047285a2) /* 0.277959474 */, 16 },
+  /* 1569 */  { MAD_F(0x04737d80) /* 0.278195859 */, 16 },
+  /* 1570 */  { MAD_F(0x0474756c) /* 0.278432294 */, 16 },
+  /* 1571 */  { MAD_F(0x04756d65) /* 0.278668780 */, 16 },
+  /* 1572 */  { MAD_F(0x0476656b) /* 0.278905316 */, 16 },
+  /* 1573 */  { MAD_F(0x04775d7f) /* 0.279141902 */, 16 },
+  /* 1574 */  { MAD_F(0x047855a1) /* 0.279378538 */, 16 },
+  /* 1575 */  { MAD_F(0x04794dd0) /* 0.279615224 */, 16 },
+  /* 1576 */  { MAD_F(0x047a460c) /* 0.279851960 */, 16 },
+  /* 1577 */  { MAD_F(0x047b3e56) /* 0.280088747 */, 16 },
+  /* 1578 */  { MAD_F(0x047c36ae) /* 0.280325583 */, 16 },
+  /* 1579 */  { MAD_F(0x047d2f12) /* 0.280562470 */, 16 },
+  /* 1580 */  { MAD_F(0x047e2784) /* 0.280799406 */, 16 },
+  /* 1581 */  { MAD_F(0x047f2004) /* 0.281036393 */, 16 },
+  /* 1582 */  { MAD_F(0x04801891) /* 0.281273429 */, 16 },
+  /* 1583 */  { MAD_F(0x0481112b) /* 0.281510516 */, 16 },
+
+  /* 1584 */  { MAD_F(0x048209d3) /* 0.281747652 */, 16 },
+  /* 1585 */  { MAD_F(0x04830288) /* 0.281984838 */, 16 },
+  /* 1586 */  { MAD_F(0x0483fb4b) /* 0.282222075 */, 16 },
+  /* 1587 */  { MAD_F(0x0484f41b) /* 0.282459361 */, 16 },
+  /* 1588 */  { MAD_F(0x0485ecf8) /* 0.282696697 */, 16 },
+  /* 1589 */  { MAD_F(0x0486e5e3) /* 0.282934082 */, 16 },
+  /* 1590 */  { MAD_F(0x0487dedb) /* 0.283171518 */, 16 },
+  /* 1591 */  { MAD_F(0x0488d7e1) /* 0.283409003 */, 16 },
+  /* 1592 */  { MAD_F(0x0489d0f4) /* 0.283646538 */, 16 },
+  /* 1593 */  { MAD_F(0x048aca14) /* 0.283884123 */, 16 },
+  /* 1594 */  { MAD_F(0x048bc341) /* 0.284121757 */, 16 },
+  /* 1595 */  { MAD_F(0x048cbc7c) /* 0.284359441 */, 16 },
+  /* 1596 */  { MAD_F(0x048db5c4) /* 0.284597175 */, 16 },
+  /* 1597 */  { MAD_F(0x048eaf1a) /* 0.284834959 */, 16 },
+  /* 1598 */  { MAD_F(0x048fa87d) /* 0.285072792 */, 16 },
+  /* 1599 */  { MAD_F(0x0490a1ed) /* 0.285310675 */, 16 },
+
+  /* 1600 */  { MAD_F(0x04919b6a) /* 0.285548607 */, 16 },
+  /* 1601 */  { MAD_F(0x049294f5) /* 0.285786589 */, 16 },
+  /* 1602 */  { MAD_F(0x04938e8d) /* 0.286024621 */, 16 },
+  /* 1603 */  { MAD_F(0x04948833) /* 0.286262702 */, 16 },
+  /* 1604 */  { MAD_F(0x049581e5) /* 0.286500832 */, 16 },
+  /* 1605 */  { MAD_F(0x04967ba5) /* 0.286739012 */, 16 },
+  /* 1606 */  { MAD_F(0x04977573) /* 0.286977242 */, 16 },
+  /* 1607 */  { MAD_F(0x04986f4d) /* 0.287215521 */, 16 },
+  /* 1608 */  { MAD_F(0x04996935) /* 0.287453849 */, 16 },
+  /* 1609 */  { MAD_F(0x049a632a) /* 0.287692227 */, 16 },
+  /* 1610 */  { MAD_F(0x049b5d2c) /* 0.287930654 */, 16 },
+  /* 1611 */  { MAD_F(0x049c573c) /* 0.288169131 */, 16 },
+  /* 1612 */  { MAD_F(0x049d5159) /* 0.288407657 */, 16 },
+  /* 1613 */  { MAD_F(0x049e4b83) /* 0.288646232 */, 16 },
+  /* 1614 */  { MAD_F(0x049f45ba) /* 0.288884857 */, 16 },
+  /* 1615 */  { MAD_F(0x04a03ffe) /* 0.289123530 */, 16 },
+
+  /* 1616 */  { MAD_F(0x04a13a50) /* 0.289362253 */, 16 },
+  /* 1617 */  { MAD_F(0x04a234af) /* 0.289601026 */, 16 },
+  /* 1618 */  { MAD_F(0x04a32f1b) /* 0.289839847 */, 16 },
+  /* 1619 */  { MAD_F(0x04a42995) /* 0.290078718 */, 16 },
+  /* 1620 */  { MAD_F(0x04a5241b) /* 0.290317638 */, 16 },
+  /* 1621 */  { MAD_F(0x04a61eaf) /* 0.290556607 */, 16 },
+  /* 1622 */  { MAD_F(0x04a71950) /* 0.290795626 */, 16 },
+  /* 1623 */  { MAD_F(0x04a813fe) /* 0.291034693 */, 16 },
+  /* 1624 */  { MAD_F(0x04a90eba) /* 0.291273810 */, 16 },
+  /* 1625 */  { MAD_F(0x04aa0982) /* 0.291512975 */, 16 },
+  /* 1626 */  { MAD_F(0x04ab0458) /* 0.291752190 */, 16 },
+  /* 1627 */  { MAD_F(0x04abff3b) /* 0.291991453 */, 16 },
+  /* 1628 */  { MAD_F(0x04acfa2b) /* 0.292230766 */, 16 },
+  /* 1629 */  { MAD_F(0x04adf528) /* 0.292470128 */, 16 },
+  /* 1630 */  { MAD_F(0x04aef032) /* 0.292709539 */, 16 },
+  /* 1631 */  { MAD_F(0x04afeb4a) /* 0.292948998 */, 16 },
+
+  /* 1632 */  { MAD_F(0x04b0e66e) /* 0.293188507 */, 16 },
+  /* 1633 */  { MAD_F(0x04b1e1a0) /* 0.293428065 */, 16 },
+  /* 1634 */  { MAD_F(0x04b2dcdf) /* 0.293667671 */, 16 },
+  /* 1635 */  { MAD_F(0x04b3d82b) /* 0.293907326 */, 16 },
+  /* 1636 */  { MAD_F(0x04b4d384) /* 0.294147031 */, 16 },
+  /* 1637 */  { MAD_F(0x04b5ceea) /* 0.294386784 */, 16 },
+  /* 1638 */  { MAD_F(0x04b6ca5e) /* 0.294626585 */, 16 },
+  /* 1639 */  { MAD_F(0x04b7c5de) /* 0.294866436 */, 16 },
+  /* 1640 */  { MAD_F(0x04b8c16c) /* 0.295106336 */, 16 },
+  /* 1641 */  { MAD_F(0x04b9bd06) /* 0.295346284 */, 16 },
+  /* 1642 */  { MAD_F(0x04bab8ae) /* 0.295586281 */, 16 },
+  /* 1643 */  { MAD_F(0x04bbb463) /* 0.295826327 */, 16 },
+  /* 1644 */  { MAD_F(0x04bcb024) /* 0.296066421 */, 16 },
+  /* 1645 */  { MAD_F(0x04bdabf3) /* 0.296306564 */, 16 },
+  /* 1646 */  { MAD_F(0x04bea7cf) /* 0.296546756 */, 16 },
+  /* 1647 */  { MAD_F(0x04bfa3b8) /* 0.296786996 */, 16 },
+
+  /* 1648 */  { MAD_F(0x04c09faf) /* 0.297027285 */, 16 },
+  /* 1649 */  { MAD_F(0x04c19bb2) /* 0.297267623 */, 16 },
+  /* 1650 */  { MAD_F(0x04c297c2) /* 0.297508009 */, 16 },
+  /* 1651 */  { MAD_F(0x04c393df) /* 0.297748444 */, 16 },
+  /* 1652 */  { MAD_F(0x04c49009) /* 0.297988927 */, 16 },
+  /* 1653 */  { MAD_F(0x04c58c41) /* 0.298229459 */, 16 },
+  /* 1654 */  { MAD_F(0x04c68885) /* 0.298470039 */, 16 },
+  /* 1655 */  { MAD_F(0x04c784d6) /* 0.298710668 */, 16 },
+  /* 1656 */  { MAD_F(0x04c88135) /* 0.298951346 */, 16 },
+  /* 1657 */  { MAD_F(0x04c97da0) /* 0.299192071 */, 16 },
+  /* 1658 */  { MAD_F(0x04ca7a18) /* 0.299432846 */, 16 },
+  /* 1659 */  { MAD_F(0x04cb769e) /* 0.299673668 */, 16 },
+  /* 1660 */  { MAD_F(0x04cc7330) /* 0.299914539 */, 16 },
+  /* 1661 */  { MAD_F(0x04cd6fcf) /* 0.300155459 */, 16 },
+  /* 1662 */  { MAD_F(0x04ce6c7b) /* 0.300396426 */, 16 },
+  /* 1663 */  { MAD_F(0x04cf6935) /* 0.300637443 */, 16 },
+
+  /* 1664 */  { MAD_F(0x04d065fb) /* 0.300878507 */, 16 },
+  /* 1665 */  { MAD_F(0x04d162ce) /* 0.301119620 */, 16 },
+  /* 1666 */  { MAD_F(0x04d25fae) /* 0.301360781 */, 16 },
+  /* 1667 */  { MAD_F(0x04d35c9b) /* 0.301601990 */, 16 },
+  /* 1668 */  { MAD_F(0x04d45995) /* 0.301843247 */, 16 },
+  /* 1669 */  { MAD_F(0x04d5569c) /* 0.302084553 */, 16 },
+  /* 1670 */  { MAD_F(0x04d653b0) /* 0.302325907 */, 16 },
+  /* 1671 */  { MAD_F(0x04d750d1) /* 0.302567309 */, 16 },
+  /* 1672 */  { MAD_F(0x04d84dff) /* 0.302808759 */, 16 },
+  /* 1673 */  { MAD_F(0x04d94b3a) /* 0.303050257 */, 16 },
+  /* 1674 */  { MAD_F(0x04da4881) /* 0.303291804 */, 16 },
+  /* 1675 */  { MAD_F(0x04db45d6) /* 0.303533399 */, 16 },
+  /* 1676 */  { MAD_F(0x04dc4337) /* 0.303775041 */, 16 },
+  /* 1677 */  { MAD_F(0x04dd40a6) /* 0.304016732 */, 16 },
+  /* 1678 */  { MAD_F(0x04de3e21) /* 0.304258471 */, 16 },
+  /* 1679 */  { MAD_F(0x04df3ba9) /* 0.304500257 */, 16 },
+
+  /* 1680 */  { MAD_F(0x04e0393e) /* 0.304742092 */, 16 },
+  /* 1681 */  { MAD_F(0x04e136e0) /* 0.304983975 */, 16 },
+  /* 1682 */  { MAD_F(0x04e2348f) /* 0.305225906 */, 16 },
+  /* 1683 */  { MAD_F(0x04e3324b) /* 0.305467885 */, 16 },
+  /* 1684 */  { MAD_F(0x04e43013) /* 0.305709911 */, 16 },
+  /* 1685 */  { MAD_F(0x04e52de9) /* 0.305951986 */, 16 },
+  /* 1686 */  { MAD_F(0x04e62bcb) /* 0.306194108 */, 16 },
+  /* 1687 */  { MAD_F(0x04e729ba) /* 0.306436279 */, 16 },
+  /* 1688 */  { MAD_F(0x04e827b6) /* 0.306678497 */, 16 },
+  /* 1689 */  { MAD_F(0x04e925bf) /* 0.306920763 */, 16 },
+  /* 1690 */  { MAD_F(0x04ea23d4) /* 0.307163077 */, 16 },
+  /* 1691 */  { MAD_F(0x04eb21f7) /* 0.307405438 */, 16 },
+  /* 1692 */  { MAD_F(0x04ec2026) /* 0.307647848 */, 16 },
+  /* 1693 */  { MAD_F(0x04ed1e62) /* 0.307890305 */, 16 },
+  /* 1694 */  { MAD_F(0x04ee1cab) /* 0.308132810 */, 16 },
+  /* 1695 */  { MAD_F(0x04ef1b01) /* 0.308375362 */, 16 },
+
+  /* 1696 */  { MAD_F(0x04f01963) /* 0.308617963 */, 16 },
+  /* 1697 */  { MAD_F(0x04f117d3) /* 0.308860611 */, 16 },
+  /* 1698 */  { MAD_F(0x04f2164f) /* 0.309103306 */, 16 },
+  /* 1699 */  { MAD_F(0x04f314d8) /* 0.309346050 */, 16 },
+  /* 1700 */  { MAD_F(0x04f4136d) /* 0.309588841 */, 16 },
+  /* 1701 */  { MAD_F(0x04f51210) /* 0.309831679 */, 16 },
+  /* 1702 */  { MAD_F(0x04f610bf) /* 0.310074565 */, 16 },
+  /* 1703 */  { MAD_F(0x04f70f7b) /* 0.310317499 */, 16 },
+  /* 1704 */  { MAD_F(0x04f80e44) /* 0.310560480 */, 16 },
+  /* 1705 */  { MAD_F(0x04f90d19) /* 0.310803509 */, 16 },
+  /* 1706 */  { MAD_F(0x04fa0bfc) /* 0.311046586 */, 16 },
+  /* 1707 */  { MAD_F(0x04fb0aeb) /* 0.311289710 */, 16 },
+  /* 1708 */  { MAD_F(0x04fc09e7) /* 0.311532881 */, 16 },
+  /* 1709 */  { MAD_F(0x04fd08ef) /* 0.311776100 */, 16 },
+  /* 1710 */  { MAD_F(0x04fe0805) /* 0.312019366 */, 16 },
+  /* 1711 */  { MAD_F(0x04ff0727) /* 0.312262680 */, 16 },
+
+  /* 1712 */  { MAD_F(0x05000655) /* 0.312506041 */, 16 },
+  /* 1713 */  { MAD_F(0x05010591) /* 0.312749449 */, 16 },
+  /* 1714 */  { MAD_F(0x050204d9) /* 0.312992905 */, 16 },
+  /* 1715 */  { MAD_F(0x0503042e) /* 0.313236408 */, 16 },
+  /* 1716 */  { MAD_F(0x0504038f) /* 0.313479959 */, 16 },
+  /* 1717 */  { MAD_F(0x050502fe) /* 0.313723556 */, 16 },
+  /* 1718 */  { MAD_F(0x05060279) /* 0.313967202 */, 16 },
+  /* 1719 */  { MAD_F(0x05070200) /* 0.314210894 */, 16 },
+  /* 1720 */  { MAD_F(0x05080195) /* 0.314454634 */, 16 },
+  /* 1721 */  { MAD_F(0x05090136) /* 0.314698420 */, 16 },
+  /* 1722 */  { MAD_F(0x050a00e3) /* 0.314942255 */, 16 },
+  /* 1723 */  { MAD_F(0x050b009e) /* 0.315186136 */, 16 },
+  /* 1724 */  { MAD_F(0x050c0065) /* 0.315430064 */, 16 },
+  /* 1725 */  { MAD_F(0x050d0039) /* 0.315674040 */, 16 },
+  /* 1726 */  { MAD_F(0x050e0019) /* 0.315918063 */, 16 },
+  /* 1727 */  { MAD_F(0x050f0006) /* 0.316162133 */, 16 },
+
+  /* 1728 */  { MAD_F(0x05100000) /* 0.316406250 */, 16 },
+  /* 1729 */  { MAD_F(0x05110006) /* 0.316650414 */, 16 },
+  /* 1730 */  { MAD_F(0x05120019) /* 0.316894625 */, 16 },
+  /* 1731 */  { MAD_F(0x05130039) /* 0.317138884 */, 16 },
+  /* 1732 */  { MAD_F(0x05140065) /* 0.317383189 */, 16 },
+  /* 1733 */  { MAD_F(0x0515009e) /* 0.317627541 */, 16 },
+  /* 1734 */  { MAD_F(0x051600e3) /* 0.317871941 */, 16 },
+  /* 1735 */  { MAD_F(0x05170135) /* 0.318116387 */, 16 },
+  /* 1736 */  { MAD_F(0x05180194) /* 0.318360880 */, 16 },
+  /* 1737 */  { MAD_F(0x051901ff) /* 0.318605421 */, 16 },
+  /* 1738 */  { MAD_F(0x051a0277) /* 0.318850008 */, 16 },
+  /* 1739 */  { MAD_F(0x051b02fc) /* 0.319094642 */, 16 },
+  /* 1740 */  { MAD_F(0x051c038d) /* 0.319339323 */, 16 },
+  /* 1741 */  { MAD_F(0x051d042a) /* 0.319584051 */, 16 },
+  /* 1742 */  { MAD_F(0x051e04d4) /* 0.319828826 */, 16 },
+  /* 1743 */  { MAD_F(0x051f058b) /* 0.320073647 */, 16 },
+
+  /* 1744 */  { MAD_F(0x0520064f) /* 0.320318516 */, 16 },
+  /* 1745 */  { MAD_F(0x0521071f) /* 0.320563431 */, 16 },
+  /* 1746 */  { MAD_F(0x052207fb) /* 0.320808393 */, 16 },
+  /* 1747 */  { MAD_F(0x052308e4) /* 0.321053402 */, 16 },
+  /* 1748 */  { MAD_F(0x052409da) /* 0.321298457 */, 16 },
+  /* 1749 */  { MAD_F(0x05250adc) /* 0.321543560 */, 16 },
+  /* 1750 */  { MAD_F(0x05260bea) /* 0.321788709 */, 16 },
+  /* 1751 */  { MAD_F(0x05270d06) /* 0.322033904 */, 16 },
+  /* 1752 */  { MAD_F(0x05280e2d) /* 0.322279147 */, 16 },
+  /* 1753 */  { MAD_F(0x05290f62) /* 0.322524436 */, 16 },
+  /* 1754 */  { MAD_F(0x052a10a3) /* 0.322769771 */, 16 },
+  /* 1755 */  { MAD_F(0x052b11f0) /* 0.323015154 */, 16 },
+  /* 1756 */  { MAD_F(0x052c134a) /* 0.323260583 */, 16 },
+  /* 1757 */  { MAD_F(0x052d14b0) /* 0.323506058 */, 16 },
+  /* 1758 */  { MAD_F(0x052e1623) /* 0.323751580 */, 16 },
+  /* 1759 */  { MAD_F(0x052f17a2) /* 0.323997149 */, 16 },
+
+  /* 1760 */  { MAD_F(0x0530192e) /* 0.324242764 */, 16 },
+  /* 1761 */  { MAD_F(0x05311ac6) /* 0.324488426 */, 16 },
+  /* 1762 */  { MAD_F(0x05321c6b) /* 0.324734134 */, 16 },
+  /* 1763 */  { MAD_F(0x05331e1c) /* 0.324979889 */, 16 },
+  /* 1764 */  { MAD_F(0x05341fda) /* 0.325225690 */, 16 },
+  /* 1765 */  { MAD_F(0x053521a4) /* 0.325471538 */, 16 },
+  /* 1766 */  { MAD_F(0x0536237b) /* 0.325717432 */, 16 },
+  /* 1767 */  { MAD_F(0x0537255e) /* 0.325963372 */, 16 },
+  /* 1768 */  { MAD_F(0x0538274e) /* 0.326209359 */, 16 },
+  /* 1769 */  { MAD_F(0x0539294a) /* 0.326455392 */, 16 },
+  /* 1770 */  { MAD_F(0x053a2b52) /* 0.326701472 */, 16 },
+  /* 1771 */  { MAD_F(0x053b2d67) /* 0.326947598 */, 16 },
+  /* 1772 */  { MAD_F(0x053c2f89) /* 0.327193770 */, 16 },
+  /* 1773 */  { MAD_F(0x053d31b6) /* 0.327439989 */, 16 },
+  /* 1774 */  { MAD_F(0x053e33f1) /* 0.327686254 */, 16 },
+  /* 1775 */  { MAD_F(0x053f3637) /* 0.327932565 */, 16 },
+
+  /* 1776 */  { MAD_F(0x0540388a) /* 0.328178922 */, 16 },
+  /* 1777 */  { MAD_F(0x05413aea) /* 0.328425326 */, 16 },
+  /* 1778 */  { MAD_F(0x05423d56) /* 0.328671776 */, 16 },
+  /* 1779 */  { MAD_F(0x05433fce) /* 0.328918272 */, 16 },
+  /* 1780 */  { MAD_F(0x05444253) /* 0.329164814 */, 16 },
+  /* 1781 */  { MAD_F(0x054544e4) /* 0.329411403 */, 16 },
+  /* 1782 */  { MAD_F(0x05464781) /* 0.329658038 */, 16 },
+  /* 1783 */  { MAD_F(0x05474a2b) /* 0.329904718 */, 16 },
+  /* 1784 */  { MAD_F(0x05484ce2) /* 0.330151445 */, 16 },
+  /* 1785 */  { MAD_F(0x05494fa4) /* 0.330398218 */, 16 },
+  /* 1786 */  { MAD_F(0x054a5273) /* 0.330645037 */, 16 },
+  /* 1787 */  { MAD_F(0x054b554e) /* 0.330891903 */, 16 },
+  /* 1788 */  { MAD_F(0x054c5836) /* 0.331138814 */, 16 },
+  /* 1789 */  { MAD_F(0x054d5b2a) /* 0.331385771 */, 16 },
+  /* 1790 */  { MAD_F(0x054e5e2b) /* 0.331632774 */, 16 },
+  /* 1791 */  { MAD_F(0x054f6138) /* 0.331879824 */, 16 },
+
+  /* 1792 */  { MAD_F(0x05506451) /* 0.332126919 */, 16 },
+  /* 1793 */  { MAD_F(0x05516776) /* 0.332374060 */, 16 },
+  /* 1794 */  { MAD_F(0x05526aa8) /* 0.332621247 */, 16 },
+  /* 1795 */  { MAD_F(0x05536de6) /* 0.332868480 */, 16 },
+  /* 1796 */  { MAD_F(0x05547131) /* 0.333115759 */, 16 },
+  /* 1797 */  { MAD_F(0x05557487) /* 0.333363084 */, 16 },
+  /* 1798 */  { MAD_F(0x055677ea) /* 0.333610455 */, 16 },
+  /* 1799 */  { MAD_F(0x05577b5a) /* 0.333857872 */, 16 },
+  /* 1800 */  { MAD_F(0x05587ed5) /* 0.334105334 */, 16 },
+  /* 1801 */  { MAD_F(0x0559825e) /* 0.334352843 */, 16 },
+  /* 1802 */  { MAD_F(0x055a85f2) /* 0.334600397 */, 16 },
+  /* 1803 */  { MAD_F(0x055b8992) /* 0.334847997 */, 16 },
+  /* 1804 */  { MAD_F(0x055c8d3f) /* 0.335095642 */, 16 },
+  /* 1805 */  { MAD_F(0x055d90f9) /* 0.335343334 */, 16 },
+  /* 1806 */  { MAD_F(0x055e94be) /* 0.335591071 */, 16 },
+  /* 1807 */  { MAD_F(0x055f9890) /* 0.335838854 */, 16 },
+
+  /* 1808 */  { MAD_F(0x05609c6e) /* 0.336086683 */, 16 },
+  /* 1809 */  { MAD_F(0x0561a058) /* 0.336334557 */, 16 },
+  /* 1810 */  { MAD_F(0x0562a44f) /* 0.336582477 */, 16 },
+  /* 1811 */  { MAD_F(0x0563a851) /* 0.336830443 */, 16 },
+  /* 1812 */  { MAD_F(0x0564ac60) /* 0.337078454 */, 16 },
+  /* 1813 */  { MAD_F(0x0565b07c) /* 0.337326511 */, 16 },
+  /* 1814 */  { MAD_F(0x0566b4a3) /* 0.337574614 */, 16 },
+  /* 1815 */  { MAD_F(0x0567b8d7) /* 0.337822762 */, 16 },
+  /* 1816 */  { MAD_F(0x0568bd17) /* 0.338070956 */, 16 },
+  /* 1817 */  { MAD_F(0x0569c163) /* 0.338319195 */, 16 },
+  /* 1818 */  { MAD_F(0x056ac5bc) /* 0.338567480 */, 16 },
+  /* 1819 */  { MAD_F(0x056bca20) /* 0.338815811 */, 16 },
+  /* 1820 */  { MAD_F(0x056cce91) /* 0.339064186 */, 16 },
+  /* 1821 */  { MAD_F(0x056dd30e) /* 0.339312608 */, 16 },
+  /* 1822 */  { MAD_F(0x056ed798) /* 0.339561075 */, 16 },
+  /* 1823 */  { MAD_F(0x056fdc2d) /* 0.339809587 */, 16 },
+
+  /* 1824 */  { MAD_F(0x0570e0cf) /* 0.340058145 */, 16 },
+  /* 1825 */  { MAD_F(0x0571e57d) /* 0.340306748 */, 16 },
+  /* 1826 */  { MAD_F(0x0572ea37) /* 0.340555397 */, 16 },
+  /* 1827 */  { MAD_F(0x0573eefd) /* 0.340804091 */, 16 },
+  /* 1828 */  { MAD_F(0x0574f3d0) /* 0.341052830 */, 16 },
+  /* 1829 */  { MAD_F(0x0575f8ae) /* 0.341301615 */, 16 },
+  /* 1830 */  { MAD_F(0x0576fd99) /* 0.341550445 */, 16 },
+  /* 1831 */  { MAD_F(0x05780290) /* 0.341799321 */, 16 },
+  /* 1832 */  { MAD_F(0x05790793) /* 0.342048241 */, 16 },
+  /* 1833 */  { MAD_F(0x057a0ca3) /* 0.342297207 */, 16 },
+  /* 1834 */  { MAD_F(0x057b11be) /* 0.342546219 */, 16 },
+  /* 1835 */  { MAD_F(0x057c16e6) /* 0.342795275 */, 16 },
+  /* 1836 */  { MAD_F(0x057d1c1a) /* 0.343044377 */, 16 },
+  /* 1837 */  { MAD_F(0x057e2159) /* 0.343293524 */, 16 },
+  /* 1838 */  { MAD_F(0x057f26a6) /* 0.343542717 */, 16 },
+  /* 1839 */  { MAD_F(0x05802bfe) /* 0.343791954 */, 16 },
+
+  /* 1840 */  { MAD_F(0x05813162) /* 0.344041237 */, 16 },
+  /* 1841 */  { MAD_F(0x058236d2) /* 0.344290564 */, 16 },
+  /* 1842 */  { MAD_F(0x05833c4f) /* 0.344539937 */, 16 },
+  /* 1843 */  { MAD_F(0x058441d8) /* 0.344789356 */, 16 },
+  /* 1844 */  { MAD_F(0x0585476c) /* 0.345038819 */, 16 },
+  /* 1845 */  { MAD_F(0x05864d0d) /* 0.345288327 */, 16 },
+  /* 1846 */  { MAD_F(0x058752ba) /* 0.345537880 */, 16 },
+  /* 1847 */  { MAD_F(0x05885873) /* 0.345787479 */, 16 },
+  /* 1848 */  { MAD_F(0x05895e39) /* 0.346037122 */, 16 },
+  /* 1849 */  { MAD_F(0x058a640a) /* 0.346286811 */, 16 },
+  /* 1850 */  { MAD_F(0x058b69e7) /* 0.346536545 */, 16 },
+  /* 1851 */  { MAD_F(0x058c6fd1) /* 0.346786323 */, 16 },
+  /* 1852 */  { MAD_F(0x058d75c6) /* 0.347036147 */, 16 },
+  /* 1853 */  { MAD_F(0x058e7bc8) /* 0.347286015 */, 16 },
+  /* 1854 */  { MAD_F(0x058f81d5) /* 0.347535929 */, 16 },
+  /* 1855 */  { MAD_F(0x059087ef) /* 0.347785887 */, 16 },
+
+  /* 1856 */  { MAD_F(0x05918e15) /* 0.348035890 */, 16 },
+  /* 1857 */  { MAD_F(0x05929447) /* 0.348285939 */, 16 },
+  /* 1858 */  { MAD_F(0x05939a84) /* 0.348536032 */, 16 },
+  /* 1859 */  { MAD_F(0x0594a0ce) /* 0.348786170 */, 16 },
+  /* 1860 */  { MAD_F(0x0595a724) /* 0.349036353 */, 16 },
+  /* 1861 */  { MAD_F(0x0596ad86) /* 0.349286580 */, 16 },
+  /* 1862 */  { MAD_F(0x0597b3f4) /* 0.349536853 */, 16 },
+  /* 1863 */  { MAD_F(0x0598ba6e) /* 0.349787170 */, 16 },
+  /* 1864 */  { MAD_F(0x0599c0f4) /* 0.350037532 */, 16 },
+  /* 1865 */  { MAD_F(0x059ac786) /* 0.350287939 */, 16 },
+  /* 1866 */  { MAD_F(0x059bce25) /* 0.350538391 */, 16 },
+  /* 1867 */  { MAD_F(0x059cd4cf) /* 0.350788887 */, 16 },
+  /* 1868 */  { MAD_F(0x059ddb85) /* 0.351039428 */, 16 },
+  /* 1869 */  { MAD_F(0x059ee247) /* 0.351290014 */, 16 },
+  /* 1870 */  { MAD_F(0x059fe915) /* 0.351540645 */, 16 },
+  /* 1871 */  { MAD_F(0x05a0efef) /* 0.351791320 */, 16 },
+
+  /* 1872 */  { MAD_F(0x05a1f6d5) /* 0.352042040 */, 16 },
+  /* 1873 */  { MAD_F(0x05a2fdc7) /* 0.352292804 */, 16 },
+  /* 1874 */  { MAD_F(0x05a404c5) /* 0.352543613 */, 16 },
+  /* 1875 */  { MAD_F(0x05a50bcf) /* 0.352794467 */, 16 },
+  /* 1876 */  { MAD_F(0x05a612e5) /* 0.353045365 */, 16 },
+  /* 1877 */  { MAD_F(0x05a71a07) /* 0.353296308 */, 16 },
+  /* 1878 */  { MAD_F(0x05a82135) /* 0.353547296 */, 16 },
+  /* 1879 */  { MAD_F(0x05a9286f) /* 0.353798328 */, 16 },
+  /* 1880 */  { MAD_F(0x05aa2fb5) /* 0.354049405 */, 16 },
+  /* 1881 */  { MAD_F(0x05ab3707) /* 0.354300526 */, 16 },
+  /* 1882 */  { MAD_F(0x05ac3e65) /* 0.354551691 */, 16 },
+  /* 1883 */  { MAD_F(0x05ad45ce) /* 0.354802901 */, 16 },
+  /* 1884 */  { MAD_F(0x05ae4d44) /* 0.355054156 */, 16 },
+  /* 1885 */  { MAD_F(0x05af54c6) /* 0.355305455 */, 16 },
+  /* 1886 */  { MAD_F(0x05b05c53) /* 0.355556799 */, 16 },
+  /* 1887 */  { MAD_F(0x05b163ed) /* 0.355808187 */, 16 },
+
+  /* 1888 */  { MAD_F(0x05b26b92) /* 0.356059619 */, 16 },
+  /* 1889 */  { MAD_F(0x05b37343) /* 0.356311096 */, 16 },
+  /* 1890 */  { MAD_F(0x05b47b00) /* 0.356562617 */, 16 },
+  /* 1891 */  { MAD_F(0x05b582c9) /* 0.356814182 */, 16 },
+  /* 1892 */  { MAD_F(0x05b68a9e) /* 0.357065792 */, 16 },
+  /* 1893 */  { MAD_F(0x05b7927f) /* 0.357317446 */, 16 },
+  /* 1894 */  { MAD_F(0x05b89a6c) /* 0.357569145 */, 16 },
+  /* 1895 */  { MAD_F(0x05b9a265) /* 0.357820887 */, 16 },
+  /* 1896 */  { MAD_F(0x05baaa69) /* 0.358072674 */, 16 },
+  /* 1897 */  { MAD_F(0x05bbb27a) /* 0.358324506 */, 16 },
+  /* 1898 */  { MAD_F(0x05bcba96) /* 0.358576381 */, 16 },
+  /* 1899 */  { MAD_F(0x05bdc2be) /* 0.358828301 */, 16 },
+  /* 1900 */  { MAD_F(0x05becaf2) /* 0.359080265 */, 16 },
+  /* 1901 */  { MAD_F(0x05bfd332) /* 0.359332273 */, 16 },
+  /* 1902 */  { MAD_F(0x05c0db7e) /* 0.359584326 */, 16 },
+  /* 1903 */  { MAD_F(0x05c1e3d6) /* 0.359836423 */, 16 },
+
+  /* 1904 */  { MAD_F(0x05c2ec39) /* 0.360088563 */, 16 },
+  /* 1905 */  { MAD_F(0x05c3f4a9) /* 0.360340748 */, 16 },
+  /* 1906 */  { MAD_F(0x05c4fd24) /* 0.360592977 */, 16 },
+  /* 1907 */  { MAD_F(0x05c605ab) /* 0.360845251 */, 16 },
+  /* 1908 */  { MAD_F(0x05c70e3e) /* 0.361097568 */, 16 },
+  /* 1909 */  { MAD_F(0x05c816dd) /* 0.361349929 */, 16 },
+  /* 1910 */  { MAD_F(0x05c91f87) /* 0.361602335 */, 16 },
+  /* 1911 */  { MAD_F(0x05ca283e) /* 0.361854784 */, 16 },
+  /* 1912 */  { MAD_F(0x05cb3100) /* 0.362107278 */, 16 },
+  /* 1913 */  { MAD_F(0x05cc39ce) /* 0.362359815 */, 16 },
+  /* 1914 */  { MAD_F(0x05cd42a8) /* 0.362612397 */, 16 },
+  /* 1915 */  { MAD_F(0x05ce4b8d) /* 0.362865022 */, 16 },
+  /* 1916 */  { MAD_F(0x05cf547f) /* 0.363117692 */, 16 },
+  /* 1917 */  { MAD_F(0x05d05d7c) /* 0.363370405 */, 16 },
+  /* 1918 */  { MAD_F(0x05d16685) /* 0.363623163 */, 16 },
+  /* 1919 */  { MAD_F(0x05d26f9a) /* 0.363875964 */, 16 },
+
+  /* 1920 */  { MAD_F(0x05d378bb) /* 0.364128809 */, 16 },
+  /* 1921 */  { MAD_F(0x05d481e7) /* 0.364381698 */, 16 },
+  /* 1922 */  { MAD_F(0x05d58b1f) /* 0.364634632 */, 16 },
+  /* 1923 */  { MAD_F(0x05d69463) /* 0.364887608 */, 16 },
+  /* 1924 */  { MAD_F(0x05d79db3) /* 0.365140629 */, 16 },
+  /* 1925 */  { MAD_F(0x05d8a70f) /* 0.365393694 */, 16 },
+  /* 1926 */  { MAD_F(0x05d9b076) /* 0.365646802 */, 16 },
+  /* 1927 */  { MAD_F(0x05dab9e9) /* 0.365899955 */, 16 },
+  /* 1928 */  { MAD_F(0x05dbc368) /* 0.366153151 */, 16 },
+  /* 1929 */  { MAD_F(0x05dcccf2) /* 0.366406390 */, 16 },
+  /* 1930 */  { MAD_F(0x05ddd689) /* 0.366659674 */, 16 },
+  /* 1931 */  { MAD_F(0x05dee02b) /* 0.366913001 */, 16 },
+  /* 1932 */  { MAD_F(0x05dfe9d8) /* 0.367166372 */, 16 },
+  /* 1933 */  { MAD_F(0x05e0f392) /* 0.367419787 */, 16 },
+  /* 1934 */  { MAD_F(0x05e1fd57) /* 0.367673246 */, 16 },
+  /* 1935 */  { MAD_F(0x05e30728) /* 0.367926748 */, 16 },
+
+  /* 1936 */  { MAD_F(0x05e41105) /* 0.368180294 */, 16 },
+  /* 1937 */  { MAD_F(0x05e51aed) /* 0.368433883 */, 16 },
+  /* 1938 */  { MAD_F(0x05e624e1) /* 0.368687517 */, 16 },
+  /* 1939 */  { MAD_F(0x05e72ee1) /* 0.368941193 */, 16 },
+  /* 1940 */  { MAD_F(0x05e838ed) /* 0.369194914 */, 16 },
+  /* 1941 */  { MAD_F(0x05e94304) /* 0.369448678 */, 16 },
+  /* 1942 */  { MAD_F(0x05ea4d27) /* 0.369702485 */, 16 },
+  /* 1943 */  { MAD_F(0x05eb5756) /* 0.369956336 */, 16 },
+  /* 1944 */  { MAD_F(0x05ec6190) /* 0.370210231 */, 16 },
+  /* 1945 */  { MAD_F(0x05ed6bd6) /* 0.370464169 */, 16 },
+  /* 1946 */  { MAD_F(0x05ee7628) /* 0.370718151 */, 16 },
+  /* 1947 */  { MAD_F(0x05ef8085) /* 0.370972177 */, 16 },
+  /* 1948 */  { MAD_F(0x05f08aee) /* 0.371226245 */, 16 },
+  /* 1949 */  { MAD_F(0x05f19563) /* 0.371480358 */, 16 },
+  /* 1950 */  { MAD_F(0x05f29fe3) /* 0.371734513 */, 16 },
+  /* 1951 */  { MAD_F(0x05f3aa6f) /* 0.371988712 */, 16 },
+
+  /* 1952 */  { MAD_F(0x05f4b507) /* 0.372242955 */, 16 },
+  /* 1953 */  { MAD_F(0x05f5bfab) /* 0.372497241 */, 16 },
+  /* 1954 */  { MAD_F(0x05f6ca5a) /* 0.372751570 */, 16 },
+  /* 1955 */  { MAD_F(0x05f7d514) /* 0.373005943 */, 16 },
+  /* 1956 */  { MAD_F(0x05f8dfdb) /* 0.373260359 */, 16 },
+  /* 1957 */  { MAD_F(0x05f9eaad) /* 0.373514819 */, 16 },
+  /* 1958 */  { MAD_F(0x05faf58a) /* 0.373769322 */, 16 },
+  /* 1959 */  { MAD_F(0x05fc0073) /* 0.374023868 */, 16 },
+  /* 1960 */  { MAD_F(0x05fd0b68) /* 0.374278458 */, 16 },
+  /* 1961 */  { MAD_F(0x05fe1669) /* 0.374533091 */, 16 },
+  /* 1962 */  { MAD_F(0x05ff2175) /* 0.374787767 */, 16 },
+  /* 1963 */  { MAD_F(0x06002c8d) /* 0.375042486 */, 16 },
+  /* 1964 */  { MAD_F(0x060137b0) /* 0.375297249 */, 16 },
+  /* 1965 */  { MAD_F(0x060242df) /* 0.375552055 */, 16 },
+  /* 1966 */  { MAD_F(0x06034e19) /* 0.375806904 */, 16 },
+  /* 1967 */  { MAD_F(0x0604595f) /* 0.376061796 */, 16 },
+
+  /* 1968 */  { MAD_F(0x060564b1) /* 0.376316732 */, 16 },
+  /* 1969 */  { MAD_F(0x0606700f) /* 0.376571710 */, 16 },
+  /* 1970 */  { MAD_F(0x06077b77) /* 0.376826732 */, 16 },
+  /* 1971 */  { MAD_F(0x060886ec) /* 0.377081797 */, 16 },
+  /* 1972 */  { MAD_F(0x0609926c) /* 0.377336905 */, 16 },
+  /* 1973 */  { MAD_F(0x060a9df8) /* 0.377592057 */, 16 },
+  /* 1974 */  { MAD_F(0x060ba98f) /* 0.377847251 */, 16 },
+  /* 1975 */  { MAD_F(0x060cb532) /* 0.378102489 */, 16 },
+  /* 1976 */  { MAD_F(0x060dc0e0) /* 0.378357769 */, 16 },
+  /* 1977 */  { MAD_F(0x060ecc9a) /* 0.378613093 */, 16 },
+  /* 1978 */  { MAD_F(0x060fd860) /* 0.378868460 */, 16 },
+  /* 1979 */  { MAD_F(0x0610e431) /* 0.379123870 */, 16 },
+  /* 1980 */  { MAD_F(0x0611f00d) /* 0.379379322 */, 16 },
+  /* 1981 */  { MAD_F(0x0612fbf5) /* 0.379634818 */, 16 },
+  /* 1982 */  { MAD_F(0x061407e9) /* 0.379890357 */, 16 },
+  /* 1983 */  { MAD_F(0x061513e8) /* 0.380145939 */, 16 },
+
+  /* 1984 */  { MAD_F(0x06161ff3) /* 0.380401563 */, 16 },
+  /* 1985 */  { MAD_F(0x06172c09) /* 0.380657231 */, 16 },
+  /* 1986 */  { MAD_F(0x0618382b) /* 0.380912942 */, 16 },
+  /* 1987 */  { MAD_F(0x06194458) /* 0.381168695 */, 16 },
+  /* 1988 */  { MAD_F(0x061a5091) /* 0.381424492 */, 16 },
+  /* 1989 */  { MAD_F(0x061b5cd5) /* 0.381680331 */, 16 },
+  /* 1990 */  { MAD_F(0x061c6925) /* 0.381936213 */, 16 },
+  /* 1991 */  { MAD_F(0x061d7581) /* 0.382192138 */, 16 },
+  /* 1992 */  { MAD_F(0x061e81e8) /* 0.382448106 */, 16 },
+  /* 1993 */  { MAD_F(0x061f8e5a) /* 0.382704117 */, 16 },
+  /* 1994 */  { MAD_F(0x06209ad8) /* 0.382960171 */, 16 },
+  /* 1995 */  { MAD_F(0x0621a761) /* 0.383216267 */, 16 },
+  /* 1996 */  { MAD_F(0x0622b3f6) /* 0.383472406 */, 16 },
+  /* 1997 */  { MAD_F(0x0623c096) /* 0.383728588 */, 16 },
+  /* 1998 */  { MAD_F(0x0624cd42) /* 0.383984813 */, 16 },
+  /* 1999 */  { MAD_F(0x0625d9f9) /* 0.384241080 */, 16 },
+
+  /* 2000 */  { MAD_F(0x0626e6bc) /* 0.384497391 */, 16 },
+  /* 2001 */  { MAD_F(0x0627f38a) /* 0.384753744 */, 16 },
+  /* 2002 */  { MAD_F(0x06290064) /* 0.385010139 */, 16 },
+  /* 2003 */  { MAD_F(0x062a0d49) /* 0.385266578 */, 16 },
+  /* 2004 */  { MAD_F(0x062b1a3a) /* 0.385523059 */, 16 },
+  /* 2005 */  { MAD_F(0x062c2736) /* 0.385779582 */, 16 },
+  /* 2006 */  { MAD_F(0x062d343d) /* 0.386036149 */, 16 },
+  /* 2007 */  { MAD_F(0x062e4150) /* 0.386292758 */, 16 },
+  /* 2008 */  { MAD_F(0x062f4e6f) /* 0.386549409 */, 16 },
+  /* 2009 */  { MAD_F(0x06305b99) /* 0.386806104 */, 16 },
+  /* 2010 */  { MAD_F(0x063168ce) /* 0.387062840 */, 16 },
+  /* 2011 */  { MAD_F(0x0632760f) /* 0.387319620 */, 16 },
+  /* 2012 */  { MAD_F(0x0633835b) /* 0.387576442 */, 16 },
+  /* 2013 */  { MAD_F(0x063490b2) /* 0.387833306 */, 16 },
+  /* 2014 */  { MAD_F(0x06359e15) /* 0.388090213 */, 16 },
+  /* 2015 */  { MAD_F(0x0636ab83) /* 0.388347163 */, 16 },
+
+  /* 2016 */  { MAD_F(0x0637b8fd) /* 0.388604155 */, 16 },
+  /* 2017 */  { MAD_F(0x0638c682) /* 0.388861190 */, 16 },
+  /* 2018 */  { MAD_F(0x0639d413) /* 0.389118267 */, 16 },
+  /* 2019 */  { MAD_F(0x063ae1af) /* 0.389375386 */, 16 },
+  /* 2020 */  { MAD_F(0x063bef56) /* 0.389632548 */, 16 },
+  /* 2021 */  { MAD_F(0x063cfd09) /* 0.389889752 */, 16 },
+  /* 2022 */  { MAD_F(0x063e0ac7) /* 0.390146999 */, 16 },
+  /* 2023 */  { MAD_F(0x063f1891) /* 0.390404289 */, 16 },
+  /* 2024 */  { MAD_F(0x06402666) /* 0.390661620 */, 16 },
+  /* 2025 */  { MAD_F(0x06413446) /* 0.390918994 */, 16 },
+  /* 2026 */  { MAD_F(0x06424232) /* 0.391176411 */, 16 },
+  /* 2027 */  { MAD_F(0x06435029) /* 0.391433869 */, 16 },
+  /* 2028 */  { MAD_F(0x06445e2b) /* 0.391691371 */, 16 },
+  /* 2029 */  { MAD_F(0x06456c39) /* 0.391948914 */, 16 },
+  /* 2030 */  { MAD_F(0x06467a52) /* 0.392206500 */, 16 },
+  /* 2031 */  { MAD_F(0x06478877) /* 0.392464128 */, 16 },
+
+  /* 2032 */  { MAD_F(0x064896a7) /* 0.392721798 */, 16 },
+  /* 2033 */  { MAD_F(0x0649a4e2) /* 0.392979511 */, 16 },
+  /* 2034 */  { MAD_F(0x064ab328) /* 0.393237266 */, 16 },
+  /* 2035 */  { MAD_F(0x064bc17a) /* 0.393495063 */, 16 },
+  /* 2036 */  { MAD_F(0x064ccfd8) /* 0.393752902 */, 16 },
+  /* 2037 */  { MAD_F(0x064dde40) /* 0.394010784 */, 16 },
+  /* 2038 */  { MAD_F(0x064eecb4) /* 0.394268707 */, 16 },
+  /* 2039 */  { MAD_F(0x064ffb33) /* 0.394526673 */, 16 },
+  /* 2040 */  { MAD_F(0x065109be) /* 0.394784681 */, 16 },
+  /* 2041 */  { MAD_F(0x06521854) /* 0.395042732 */, 16 },
+  /* 2042 */  { MAD_F(0x065326f5) /* 0.395300824 */, 16 },
+  /* 2043 */  { MAD_F(0x065435a1) /* 0.395558959 */, 16 },
+  /* 2044 */  { MAD_F(0x06554459) /* 0.395817135 */, 16 },
+  /* 2045 */  { MAD_F(0x0656531c) /* 0.396075354 */, 16 },
+  /* 2046 */  { MAD_F(0x065761ea) /* 0.396333615 */, 16 },
+  /* 2047 */  { MAD_F(0x065870c4) /* 0.396591918 */, 16 },
+
+  /* 2048 */  { MAD_F(0x06597fa9) /* 0.396850263 */, 16 },
+  /* 2049 */  { MAD_F(0x065a8e99) /* 0.397108650 */, 16 },
+  /* 2050 */  { MAD_F(0x065b9d95) /* 0.397367079 */, 16 },
+  /* 2051 */  { MAD_F(0x065cac9c) /* 0.397625550 */, 16 },
+  /* 2052 */  { MAD_F(0x065dbbae) /* 0.397884063 */, 16 },
+  /* 2053 */  { MAD_F(0x065ecacb) /* 0.398142619 */, 16 },
+  /* 2054 */  { MAD_F(0x065fd9f4) /* 0.398401216 */, 16 },
+  /* 2055 */  { MAD_F(0x0660e928) /* 0.398659855 */, 16 },
+  /* 2056 */  { MAD_F(0x0661f867) /* 0.398918536 */, 16 },
+  /* 2057 */  { MAD_F(0x066307b1) /* 0.399177259 */, 16 },
+  /* 2058 */  { MAD_F(0x06641707) /* 0.399436024 */, 16 },
+  /* 2059 */  { MAD_F(0x06652668) /* 0.399694831 */, 16 },
+  /* 2060 */  { MAD_F(0x066635d4) /* 0.399953679 */, 16 },
+  /* 2061 */  { MAD_F(0x0667454c) /* 0.400212570 */, 16 },
+  /* 2062 */  { MAD_F(0x066854ce) /* 0.400471503 */, 16 },
+  /* 2063 */  { MAD_F(0x0669645c) /* 0.400730477 */, 16 },
+
+  /* 2064 */  { MAD_F(0x066a73f5) /* 0.400989493 */, 16 },
+  /* 2065 */  { MAD_F(0x066b839a) /* 0.401248551 */, 16 },
+  /* 2066 */  { MAD_F(0x066c9349) /* 0.401507651 */, 16 },
+  /* 2067 */  { MAD_F(0x066da304) /* 0.401766793 */, 16 },
+  /* 2068 */  { MAD_F(0x066eb2ca) /* 0.402025976 */, 16 },
+  /* 2069 */  { MAD_F(0x066fc29b) /* 0.402285202 */, 16 },
+  /* 2070 */  { MAD_F(0x0670d278) /* 0.402544469 */, 16 },
+  /* 2071 */  { MAD_F(0x0671e25f) /* 0.402803777 */, 16 },
+  /* 2072 */  { MAD_F(0x0672f252) /* 0.403063128 */, 16 },
+  /* 2073 */  { MAD_F(0x06740250) /* 0.403322520 */, 16 },
+  /* 2074 */  { MAD_F(0x0675125a) /* 0.403581954 */, 16 },
+  /* 2075 */  { MAD_F(0x0676226e) /* 0.403841430 */, 16 },
+  /* 2076 */  { MAD_F(0x0677328e) /* 0.404100947 */, 16 },
+  /* 2077 */  { MAD_F(0x067842b9) /* 0.404360506 */, 16 },
+  /* 2078 */  { MAD_F(0x067952ef) /* 0.404620107 */, 16 },
+  /* 2079 */  { MAD_F(0x067a6330) /* 0.404879749 */, 16 },
+
+  /* 2080 */  { MAD_F(0x067b737c) /* 0.405139433 */, 16 },
+  /* 2081 */  { MAD_F(0x067c83d4) /* 0.405399159 */, 16 },
+  /* 2082 */  { MAD_F(0x067d9436) /* 0.405658926 */, 16 },
+  /* 2083 */  { MAD_F(0x067ea4a4) /* 0.405918735 */, 16 },
+  /* 2084 */  { MAD_F(0x067fb51d) /* 0.406178585 */, 16 },
+  /* 2085 */  { MAD_F(0x0680c5a2) /* 0.406438477 */, 16 },
+  /* 2086 */  { MAD_F(0x0681d631) /* 0.406698410 */, 16 },
+  /* 2087 */  { MAD_F(0x0682e6cb) /* 0.406958385 */, 16 },
+  /* 2088 */  { MAD_F(0x0683f771) /* 0.407218402 */, 16 },
+  /* 2089 */  { MAD_F(0x06850822) /* 0.407478460 */, 16 },
+  /* 2090 */  { MAD_F(0x068618de) /* 0.407738559 */, 16 },
+  /* 2091 */  { MAD_F(0x068729a5) /* 0.407998700 */, 16 },
+  /* 2092 */  { MAD_F(0x06883a77) /* 0.408258883 */, 16 },
+  /* 2093 */  { MAD_F(0x06894b55) /* 0.408519107 */, 16 },
+  /* 2094 */  { MAD_F(0x068a5c3d) /* 0.408779372 */, 16 },
+  /* 2095 */  { MAD_F(0x068b6d31) /* 0.409039679 */, 16 },
+
+  /* 2096 */  { MAD_F(0x068c7e2f) /* 0.409300027 */, 16 },
+  /* 2097 */  { MAD_F(0x068d8f39) /* 0.409560417 */, 16 },
+  /* 2098 */  { MAD_F(0x068ea04e) /* 0.409820848 */, 16 },
+  /* 2099 */  { MAD_F(0x068fb16e) /* 0.410081321 */, 16 },
+  /* 2100 */  { MAD_F(0x0690c299) /* 0.410341834 */, 16 },
+  /* 2101 */  { MAD_F(0x0691d3cf) /* 0.410602390 */, 16 },
+  /* 2102 */  { MAD_F(0x0692e511) /* 0.410862986 */, 16 },
+  /* 2103 */  { MAD_F(0x0693f65d) /* 0.411123624 */, 16 },
+  /* 2104 */  { MAD_F(0x069507b5) /* 0.411384303 */, 16 },
+  /* 2105 */  { MAD_F(0x06961917) /* 0.411645024 */, 16 },
+  /* 2106 */  { MAD_F(0x06972a85) /* 0.411905785 */, 16 },
+  /* 2107 */  { MAD_F(0x06983bfe) /* 0.412166588 */, 16 },
+  /* 2108 */  { MAD_F(0x06994d82) /* 0.412427433 */, 16 },
+  /* 2109 */  { MAD_F(0x069a5f11) /* 0.412688318 */, 16 },
+  /* 2110 */  { MAD_F(0x069b70ab) /* 0.412949245 */, 16 },
+  /* 2111 */  { MAD_F(0x069c8250) /* 0.413210213 */, 16 },
+
+  /* 2112 */  { MAD_F(0x069d9400) /* 0.413471222 */, 16 },
+  /* 2113 */  { MAD_F(0x069ea5bb) /* 0.413732273 */, 16 },
+  /* 2114 */  { MAD_F(0x069fb781) /* 0.413993364 */, 16 },
+  /* 2115 */  { MAD_F(0x06a0c953) /* 0.414254497 */, 16 },
+  /* 2116 */  { MAD_F(0x06a1db2f) /* 0.414515671 */, 16 },
+  /* 2117 */  { MAD_F(0x06a2ed16) /* 0.414776886 */, 16 },
+  /* 2118 */  { MAD_F(0x06a3ff09) /* 0.415038142 */, 16 },
+  /* 2119 */  { MAD_F(0x06a51106) /* 0.415299440 */, 16 },
+  /* 2120 */  { MAD_F(0x06a6230f) /* 0.415560778 */, 16 },
+  /* 2121 */  { MAD_F(0x06a73522) /* 0.415822157 */, 16 },
+  /* 2122 */  { MAD_F(0x06a84741) /* 0.416083578 */, 16 },
+  /* 2123 */  { MAD_F(0x06a9596a) /* 0.416345040 */, 16 },
+  /* 2124 */  { MAD_F(0x06aa6b9f) /* 0.416606542 */, 16 },
+  /* 2125 */  { MAD_F(0x06ab7ddf) /* 0.416868086 */, 16 },
+  /* 2126 */  { MAD_F(0x06ac9029) /* 0.417129671 */, 16 },
+  /* 2127 */  { MAD_F(0x06ada27f) /* 0.417391297 */, 16 },
+
+  /* 2128 */  { MAD_F(0x06aeb4e0) /* 0.417652964 */, 16 },
+  /* 2129 */  { MAD_F(0x06afc74b) /* 0.417914672 */, 16 },
+  /* 2130 */  { MAD_F(0x06b0d9c2) /* 0.418176420 */, 16 },
+  /* 2131 */  { MAD_F(0x06b1ec43) /* 0.418438210 */, 16 },
+  /* 2132 */  { MAD_F(0x06b2fed0) /* 0.418700041 */, 16 },
+  /* 2133 */  { MAD_F(0x06b41168) /* 0.418961912 */, 16 },
+  /* 2134 */  { MAD_F(0x06b5240a) /* 0.419223825 */, 16 },
+  /* 2135 */  { MAD_F(0x06b636b8) /* 0.419485778 */, 16 },
+  /* 2136 */  { MAD_F(0x06b74971) /* 0.419747773 */, 16 },
+  /* 2137 */  { MAD_F(0x06b85c34) /* 0.420009808 */, 16 },
+  /* 2138 */  { MAD_F(0x06b96f03) /* 0.420271884 */, 16 },
+  /* 2139 */  { MAD_F(0x06ba81dc) /* 0.420534001 */, 16 },
+  /* 2140 */  { MAD_F(0x06bb94c1) /* 0.420796159 */, 16 },
+  /* 2141 */  { MAD_F(0x06bca7b0) /* 0.421058358 */, 16 },
+  /* 2142 */  { MAD_F(0x06bdbaaa) /* 0.421320597 */, 16 },
+  /* 2143 */  { MAD_F(0x06becdb0) /* 0.421582878 */, 16 },
+
+  /* 2144 */  { MAD_F(0x06bfe0c0) /* 0.421845199 */, 16 },
+  /* 2145 */  { MAD_F(0x06c0f3db) /* 0.422107561 */, 16 },
+  /* 2146 */  { MAD_F(0x06c20702) /* 0.422369964 */, 16 },
+  /* 2147 */  { MAD_F(0x06c31a33) /* 0.422632407 */, 16 },
+  /* 2148 */  { MAD_F(0x06c42d6f) /* 0.422894891 */, 16 },
+  /* 2149 */  { MAD_F(0x06c540b6) /* 0.423157416 */, 16 },
+  /* 2150 */  { MAD_F(0x06c65408) /* 0.423419982 */, 16 },
+  /* 2151 */  { MAD_F(0x06c76765) /* 0.423682588 */, 16 },
+  /* 2152 */  { MAD_F(0x06c87acc) /* 0.423945235 */, 16 },
+  /* 2153 */  { MAD_F(0x06c98e3f) /* 0.424207923 */, 16 },
+  /* 2154 */  { MAD_F(0x06caa1bd) /* 0.424470652 */, 16 },
+  /* 2155 */  { MAD_F(0x06cbb545) /* 0.424733421 */, 16 },
+  /* 2156 */  { MAD_F(0x06ccc8d9) /* 0.424996230 */, 16 },
+  /* 2157 */  { MAD_F(0x06cddc77) /* 0.425259081 */, 16 },
+  /* 2158 */  { MAD_F(0x06cef020) /* 0.425521972 */, 16 },
+  /* 2159 */  { MAD_F(0x06d003d4) /* 0.425784903 */, 16 },
+
+  /* 2160 */  { MAD_F(0x06d11794) /* 0.426047876 */, 16 },
+  /* 2161 */  { MAD_F(0x06d22b5e) /* 0.426310889 */, 16 },
+  /* 2162 */  { MAD_F(0x06d33f32) /* 0.426573942 */, 16 },
+  /* 2163 */  { MAD_F(0x06d45312) /* 0.426837036 */, 16 },
+  /* 2164 */  { MAD_F(0x06d566fd) /* 0.427100170 */, 16 },
+  /* 2165 */  { MAD_F(0x06d67af2) /* 0.427363345 */, 16 },
+  /* 2166 */  { MAD_F(0x06d78ef3) /* 0.427626561 */, 16 },
+  /* 2167 */  { MAD_F(0x06d8a2fe) /* 0.427889817 */, 16 },
+  /* 2168 */  { MAD_F(0x06d9b714) /* 0.428153114 */, 16 },
+  /* 2169 */  { MAD_F(0x06dacb35) /* 0.428416451 */, 16 },
+  /* 2170 */  { MAD_F(0x06dbdf61) /* 0.428679828 */, 16 },
+  /* 2171 */  { MAD_F(0x06dcf398) /* 0.428943246 */, 16 },
+  /* 2172 */  { MAD_F(0x06de07d9) /* 0.429206704 */, 16 },
+  /* 2173 */  { MAD_F(0x06df1c26) /* 0.429470203 */, 16 },
+  /* 2174 */  { MAD_F(0x06e0307d) /* 0.429733743 */, 16 },
+  /* 2175 */  { MAD_F(0x06e144df) /* 0.429997322 */, 16 },
+
+  /* 2176 */  { MAD_F(0x06e2594c) /* 0.430260942 */, 16 },
+  /* 2177 */  { MAD_F(0x06e36dc4) /* 0.430524603 */, 16 },
+  /* 2178 */  { MAD_F(0x06e48246) /* 0.430788304 */, 16 },
+  /* 2179 */  { MAD_F(0x06e596d4) /* 0.431052045 */, 16 },
+  /* 2180 */  { MAD_F(0x06e6ab6c) /* 0.431315826 */, 16 },
+  /* 2181 */  { MAD_F(0x06e7c00f) /* 0.431579648 */, 16 },
+  /* 2182 */  { MAD_F(0x06e8d4bd) /* 0.431843511 */, 16 },
+  /* 2183 */  { MAD_F(0x06e9e976) /* 0.432107413 */, 16 },
+  /* 2184 */  { MAD_F(0x06eafe3a) /* 0.432371356 */, 16 },
+  /* 2185 */  { MAD_F(0x06ec1308) /* 0.432635339 */, 16 },
+  /* 2186 */  { MAD_F(0x06ed27e2) /* 0.432899362 */, 16 },
+  /* 2187 */  { MAD_F(0x06ee3cc6) /* 0.433163426 */, 16 },
+  /* 2188 */  { MAD_F(0x06ef51b4) /* 0.433427530 */, 16 },
+  /* 2189 */  { MAD_F(0x06f066ae) /* 0.433691674 */, 16 },
+  /* 2190 */  { MAD_F(0x06f17bb3) /* 0.433955859 */, 16 },
+  /* 2191 */  { MAD_F(0x06f290c2) /* 0.434220083 */, 16 },
+
+  /* 2192 */  { MAD_F(0x06f3a5dc) /* 0.434484348 */, 16 },
+  /* 2193 */  { MAD_F(0x06f4bb01) /* 0.434748653 */, 16 },
+  /* 2194 */  { MAD_F(0x06f5d030) /* 0.435012998 */, 16 },
+  /* 2195 */  { MAD_F(0x06f6e56b) /* 0.435277383 */, 16 },
+  /* 2196 */  { MAD_F(0x06f7fab0) /* 0.435541809 */, 16 },
+  /* 2197 */  { MAD_F(0x06f91000) /* 0.435806274 */, 16 },
+  /* 2198 */  { MAD_F(0x06fa255a) /* 0.436070780 */, 16 },
+  /* 2199 */  { MAD_F(0x06fb3ac0) /* 0.436335326 */, 16 },
+  /* 2200 */  { MAD_F(0x06fc5030) /* 0.436599912 */, 16 },
+  /* 2201 */  { MAD_F(0x06fd65ab) /* 0.436864538 */, 16 },
+  /* 2202 */  { MAD_F(0x06fe7b31) /* 0.437129204 */, 16 },
+  /* 2203 */  { MAD_F(0x06ff90c2) /* 0.437393910 */, 16 },
+  /* 2204 */  { MAD_F(0x0700a65d) /* 0.437658657 */, 16 },
+  /* 2205 */  { MAD_F(0x0701bc03) /* 0.437923443 */, 16 },
+  /* 2206 */  { MAD_F(0x0702d1b4) /* 0.438188269 */, 16 },
+  /* 2207 */  { MAD_F(0x0703e76f) /* 0.438453136 */, 16 },
+
+  /* 2208 */  { MAD_F(0x0704fd35) /* 0.438718042 */, 16 },
+  /* 2209 */  { MAD_F(0x07061306) /* 0.438982988 */, 16 },
+  /* 2210 */  { MAD_F(0x070728e2) /* 0.439247975 */, 16 },
+  /* 2211 */  { MAD_F(0x07083ec9) /* 0.439513001 */, 16 },
+  /* 2212 */  { MAD_F(0x070954ba) /* 0.439778067 */, 16 },
+  /* 2213 */  { MAD_F(0x070a6ab6) /* 0.440043173 */, 16 },
+  /* 2214 */  { MAD_F(0x070b80bc) /* 0.440308320 */, 16 },
+  /* 2215 */  { MAD_F(0x070c96ce) /* 0.440573506 */, 16 },
+  /* 2216 */  { MAD_F(0x070dacea) /* 0.440838732 */, 16 },
+  /* 2217 */  { MAD_F(0x070ec310) /* 0.441103997 */, 16 },
+  /* 2218 */  { MAD_F(0x070fd942) /* 0.441369303 */, 16 },
+  /* 2219 */  { MAD_F(0x0710ef7e) /* 0.441634649 */, 16 },
+  /* 2220 */  { MAD_F(0x071205c5) /* 0.441900034 */, 16 },
+  /* 2221 */  { MAD_F(0x07131c17) /* 0.442165460 */, 16 },
+  /* 2222 */  { MAD_F(0x07143273) /* 0.442430925 */, 16 },
+  /* 2223 */  { MAD_F(0x071548da) /* 0.442696430 */, 16 },
+
+  /* 2224 */  { MAD_F(0x07165f4b) /* 0.442961975 */, 16 },
+  /* 2225 */  { MAD_F(0x071775c8) /* 0.443227559 */, 16 },
+  /* 2226 */  { MAD_F(0x07188c4f) /* 0.443493184 */, 16 },
+  /* 2227 */  { MAD_F(0x0719a2e0) /* 0.443758848 */, 16 },
+  /* 2228 */  { MAD_F(0x071ab97d) /* 0.444024552 */, 16 },
+  /* 2229 */  { MAD_F(0x071bd024) /* 0.444290296 */, 16 },
+  /* 2230 */  { MAD_F(0x071ce6d6) /* 0.444556079 */, 16 },
+  /* 2231 */  { MAD_F(0x071dfd92) /* 0.444821902 */, 16 },
+  /* 2232 */  { MAD_F(0x071f1459) /* 0.445087765 */, 16 },
+  /* 2233 */  { MAD_F(0x07202b2b) /* 0.445353668 */, 16 },
+  /* 2234 */  { MAD_F(0x07214207) /* 0.445619610 */, 16 },
+  /* 2235 */  { MAD_F(0x072258ee) /* 0.445885592 */, 16 },
+  /* 2236 */  { MAD_F(0x07236fe0) /* 0.446151614 */, 16 },
+  /* 2237 */  { MAD_F(0x072486dc) /* 0.446417675 */, 16 },
+  /* 2238 */  { MAD_F(0x07259de3) /* 0.446683776 */, 16 },
+  /* 2239 */  { MAD_F(0x0726b4f4) /* 0.446949917 */, 16 },
+
+  /* 2240 */  { MAD_F(0x0727cc11) /* 0.447216097 */, 16 },
+  /* 2241 */  { MAD_F(0x0728e338) /* 0.447482317 */, 16 },
+  /* 2242 */  { MAD_F(0x0729fa69) /* 0.447748576 */, 16 },
+  /* 2243 */  { MAD_F(0x072b11a5) /* 0.448014875 */, 16 },
+  /* 2244 */  { MAD_F(0x072c28ec) /* 0.448281214 */, 16 },
+  /* 2245 */  { MAD_F(0x072d403d) /* 0.448547592 */, 16 },
+  /* 2246 */  { MAD_F(0x072e5799) /* 0.448814010 */, 16 },
+  /* 2247 */  { MAD_F(0x072f6f00) /* 0.449080467 */, 16 },
+  /* 2248 */  { MAD_F(0x07308671) /* 0.449346964 */, 16 },
+  /* 2249 */  { MAD_F(0x07319ded) /* 0.449613501 */, 16 },
+  /* 2250 */  { MAD_F(0x0732b573) /* 0.449880076 */, 16 },
+  /* 2251 */  { MAD_F(0x0733cd04) /* 0.450146692 */, 16 },
+  /* 2252 */  { MAD_F(0x0734e4a0) /* 0.450413347 */, 16 },
+  /* 2253 */  { MAD_F(0x0735fc46) /* 0.450680041 */, 16 },
+  /* 2254 */  { MAD_F(0x073713f7) /* 0.450946775 */, 16 },
+  /* 2255 */  { MAD_F(0x07382bb2) /* 0.451213548 */, 16 },
+
+  /* 2256 */  { MAD_F(0x07394378) /* 0.451480360 */, 16 },
+  /* 2257 */  { MAD_F(0x073a5b49) /* 0.451747213 */, 16 },
+  /* 2258 */  { MAD_F(0x073b7324) /* 0.452014104 */, 16 },
+  /* 2259 */  { MAD_F(0x073c8b0a) /* 0.452281035 */, 16 },
+  /* 2260 */  { MAD_F(0x073da2fa) /* 0.452548005 */, 16 },
+  /* 2261 */  { MAD_F(0x073ebaf5) /* 0.452815015 */, 16 },
+  /* 2262 */  { MAD_F(0x073fd2fa) /* 0.453082064 */, 16 },
+  /* 2263 */  { MAD_F(0x0740eb0a) /* 0.453349152 */, 16 },
+  /* 2264 */  { MAD_F(0x07420325) /* 0.453616280 */, 16 },
+  /* 2265 */  { MAD_F(0x07431b4a) /* 0.453883447 */, 16 },
+  /* 2266 */  { MAD_F(0x0744337a) /* 0.454150653 */, 16 },
+  /* 2267 */  { MAD_F(0x07454bb4) /* 0.454417899 */, 16 },
+  /* 2268 */  { MAD_F(0x074663f8) /* 0.454685184 */, 16 },
+  /* 2269 */  { MAD_F(0x07477c48) /* 0.454952508 */, 16 },
+  /* 2270 */  { MAD_F(0x074894a2) /* 0.455219872 */, 16 },
+  /* 2271 */  { MAD_F(0x0749ad06) /* 0.455487275 */, 16 },
+
+  /* 2272 */  { MAD_F(0x074ac575) /* 0.455754717 */, 16 },
+  /* 2273 */  { MAD_F(0x074bddee) /* 0.456022198 */, 16 },
+  /* 2274 */  { MAD_F(0x074cf672) /* 0.456289719 */, 16 },
+  /* 2275 */  { MAD_F(0x074e0f01) /* 0.456557278 */, 16 },
+  /* 2276 */  { MAD_F(0x074f279a) /* 0.456824877 */, 16 },
+  /* 2277 */  { MAD_F(0x0750403e) /* 0.457092516 */, 16 },
+  /* 2278 */  { MAD_F(0x075158ec) /* 0.457360193 */, 16 },
+  /* 2279 */  { MAD_F(0x075271a4) /* 0.457627909 */, 16 },
+  /* 2280 */  { MAD_F(0x07538a67) /* 0.457895665 */, 16 },
+  /* 2281 */  { MAD_F(0x0754a335) /* 0.458163460 */, 16 },
+  /* 2282 */  { MAD_F(0x0755bc0d) /* 0.458431294 */, 16 },
+  /* 2283 */  { MAD_F(0x0756d4f0) /* 0.458699167 */, 16 },
+  /* 2284 */  { MAD_F(0x0757eddd) /* 0.458967079 */, 16 },
+  /* 2285 */  { MAD_F(0x075906d5) /* 0.459235030 */, 16 },
+  /* 2286 */  { MAD_F(0x075a1fd7) /* 0.459503021 */, 16 },
+  /* 2287 */  { MAD_F(0x075b38e3) /* 0.459771050 */, 16 },
+
+  /* 2288 */  { MAD_F(0x075c51fa) /* 0.460039119 */, 16 },
+  /* 2289 */  { MAD_F(0x075d6b1c) /* 0.460307226 */, 16 },
+  /* 2290 */  { MAD_F(0x075e8448) /* 0.460575373 */, 16 },
+  /* 2291 */  { MAD_F(0x075f9d7f) /* 0.460843559 */, 16 },
+  /* 2292 */  { MAD_F(0x0760b6c0) /* 0.461111783 */, 16 },
+  /* 2293 */  { MAD_F(0x0761d00b) /* 0.461380047 */, 16 },
+  /* 2294 */  { MAD_F(0x0762e961) /* 0.461648350 */, 16 },
+  /* 2295 */  { MAD_F(0x076402c1) /* 0.461916691 */, 16 },
+  /* 2296 */  { MAD_F(0x07651c2c) /* 0.462185072 */, 16 },
+  /* 2297 */  { MAD_F(0x076635a2) /* 0.462453492 */, 16 },
+  /* 2298 */  { MAD_F(0x07674f22) /* 0.462721950 */, 16 },
+  /* 2299 */  { MAD_F(0x076868ac) /* 0.462990448 */, 16 },
+  /* 2300 */  { MAD_F(0x07698240) /* 0.463258984 */, 16 },
+  /* 2301 */  { MAD_F(0x076a9be0) /* 0.463527560 */, 16 },
+  /* 2302 */  { MAD_F(0x076bb589) /* 0.463796174 */, 16 },
+  /* 2303 */  { MAD_F(0x076ccf3d) /* 0.464064827 */, 16 },
+
+  /* 2304 */  { MAD_F(0x076de8fc) /* 0.464333519 */, 16 },
+  /* 2305 */  { MAD_F(0x076f02c5) /* 0.464602250 */, 16 },
+  /* 2306 */  { MAD_F(0x07701c98) /* 0.464871020 */, 16 },
+  /* 2307 */  { MAD_F(0x07713676) /* 0.465139829 */, 16 },
+  /* 2308 */  { MAD_F(0x0772505e) /* 0.465408676 */, 16 },
+  /* 2309 */  { MAD_F(0x07736a51) /* 0.465677563 */, 16 },
+  /* 2310 */  { MAD_F(0x0774844e) /* 0.465946488 */, 16 },
+  /* 2311 */  { MAD_F(0x07759e55) /* 0.466215452 */, 16 },
+  /* 2312 */  { MAD_F(0x0776b867) /* 0.466484455 */, 16 },
+  /* 2313 */  { MAD_F(0x0777d283) /* 0.466753496 */, 16 },
+  /* 2314 */  { MAD_F(0x0778ecaa) /* 0.467022577 */, 16 },
+  /* 2315 */  { MAD_F(0x077a06db) /* 0.467291696 */, 16 },
+  /* 2316 */  { MAD_F(0x077b2117) /* 0.467560854 */, 16 },
+  /* 2317 */  { MAD_F(0x077c3b5d) /* 0.467830050 */, 16 },
+  /* 2318 */  { MAD_F(0x077d55ad) /* 0.468099285 */, 16 },
+  /* 2319 */  { MAD_F(0x077e7008) /* 0.468368560 */, 16 },
+
+  /* 2320 */  { MAD_F(0x077f8a6d) /* 0.468637872 */, 16 },
+  /* 2321 */  { MAD_F(0x0780a4dc) /* 0.468907224 */, 16 },
+  /* 2322 */  { MAD_F(0x0781bf56) /* 0.469176614 */, 16 },
+  /* 2323 */  { MAD_F(0x0782d9da) /* 0.469446043 */, 16 },
+  /* 2324 */  { MAD_F(0x0783f469) /* 0.469715510 */, 16 },
+  /* 2325 */  { MAD_F(0x07850f02) /* 0.469985016 */, 16 },
+  /* 2326 */  { MAD_F(0x078629a5) /* 0.470254561 */, 16 },
+  /* 2327 */  { MAD_F(0x07874453) /* 0.470524145 */, 16 },
+  /* 2328 */  { MAD_F(0x07885f0b) /* 0.470793767 */, 16 },
+  /* 2329 */  { MAD_F(0x078979ce) /* 0.471063427 */, 16 },
+  /* 2330 */  { MAD_F(0x078a949a) /* 0.471333126 */, 16 },
+  /* 2331 */  { MAD_F(0x078baf72) /* 0.471602864 */, 16 },
+  /* 2332 */  { MAD_F(0x078cca53) /* 0.471872641 */, 16 },
+  /* 2333 */  { MAD_F(0x078de53f) /* 0.472142456 */, 16 },
+  /* 2334 */  { MAD_F(0x078f0035) /* 0.472412309 */, 16 },
+  /* 2335 */  { MAD_F(0x07901b36) /* 0.472682201 */, 16 },
+
+  /* 2336 */  { MAD_F(0x07913641) /* 0.472952132 */, 16 },
+  /* 2337 */  { MAD_F(0x07925156) /* 0.473222101 */, 16 },
+  /* 2338 */  { MAD_F(0x07936c76) /* 0.473492108 */, 16 },
+  /* 2339 */  { MAD_F(0x079487a0) /* 0.473762155 */, 16 },
+  /* 2340 */  { MAD_F(0x0795a2d4) /* 0.474032239 */, 16 },
+  /* 2341 */  { MAD_F(0x0796be13) /* 0.474302362 */, 16 },
+  /* 2342 */  { MAD_F(0x0797d95c) /* 0.474572524 */, 16 },
+  /* 2343 */  { MAD_F(0x0798f4af) /* 0.474842724 */, 16 },
+  /* 2344 */  { MAD_F(0x079a100c) /* 0.475112962 */, 16 },
+  /* 2345 */  { MAD_F(0x079b2b74) /* 0.475383239 */, 16 },
+  /* 2346 */  { MAD_F(0x079c46e7) /* 0.475653554 */, 16 },
+  /* 2347 */  { MAD_F(0x079d6263) /* 0.475923908 */, 16 },
+  /* 2348 */  { MAD_F(0x079e7dea) /* 0.476194300 */, 16 },
+  /* 2349 */  { MAD_F(0x079f997b) /* 0.476464731 */, 16 },
+  /* 2350 */  { MAD_F(0x07a0b516) /* 0.476735200 */, 16 },
+  /* 2351 */  { MAD_F(0x07a1d0bc) /* 0.477005707 */, 16 },
+
+  /* 2352 */  { MAD_F(0x07a2ec6c) /* 0.477276252 */, 16 },
+  /* 2353 */  { MAD_F(0x07a40827) /* 0.477546836 */, 16 },
+  /* 2354 */  { MAD_F(0x07a523eb) /* 0.477817459 */, 16 },
+  /* 2355 */  { MAD_F(0x07a63fba) /* 0.478088119 */, 16 },
+  /* 2356 */  { MAD_F(0x07a75b93) /* 0.478358818 */, 16 },
+  /* 2357 */  { MAD_F(0x07a87777) /* 0.478629555 */, 16 },
+  /* 2358 */  { MAD_F(0x07a99364) /* 0.478900331 */, 16 },
+  /* 2359 */  { MAD_F(0x07aaaf5c) /* 0.479171145 */, 16 },
+  /* 2360 */  { MAD_F(0x07abcb5f) /* 0.479441997 */, 16 },
+  /* 2361 */  { MAD_F(0x07ace76b) /* 0.479712887 */, 16 },
+  /* 2362 */  { MAD_F(0x07ae0382) /* 0.479983816 */, 16 },
+  /* 2363 */  { MAD_F(0x07af1fa3) /* 0.480254782 */, 16 },
+  /* 2364 */  { MAD_F(0x07b03bcf) /* 0.480525787 */, 16 },
+  /* 2365 */  { MAD_F(0x07b15804) /* 0.480796831 */, 16 },
+  /* 2366 */  { MAD_F(0x07b27444) /* 0.481067912 */, 16 },
+  /* 2367 */  { MAD_F(0x07b3908e) /* 0.481339032 */, 16 },
+
+  /* 2368 */  { MAD_F(0x07b4ace3) /* 0.481610189 */, 16 },
+  /* 2369 */  { MAD_F(0x07b5c941) /* 0.481881385 */, 16 },
+  /* 2370 */  { MAD_F(0x07b6e5aa) /* 0.482152620 */, 16 },
+  /* 2371 */  { MAD_F(0x07b8021d) /* 0.482423892 */, 16 },
+  /* 2372 */  { MAD_F(0x07b91e9b) /* 0.482695202 */, 16 },
+  /* 2373 */  { MAD_F(0x07ba3b22) /* 0.482966551 */, 16 },
+  /* 2374 */  { MAD_F(0x07bb57b4) /* 0.483237938 */, 16 },
+  /* 2375 */  { MAD_F(0x07bc7450) /* 0.483509362 */, 16 },
+  /* 2376 */  { MAD_F(0x07bd90f6) /* 0.483780825 */, 16 },
+  /* 2377 */  { MAD_F(0x07beada7) /* 0.484052326 */, 16 },
+  /* 2378 */  { MAD_F(0x07bfca61) /* 0.484323865 */, 16 },
+  /* 2379 */  { MAD_F(0x07c0e726) /* 0.484595443 */, 16 },
+  /* 2380 */  { MAD_F(0x07c203f5) /* 0.484867058 */, 16 },
+  /* 2381 */  { MAD_F(0x07c320cf) /* 0.485138711 */, 16 },
+  /* 2382 */  { MAD_F(0x07c43db2) /* 0.485410402 */, 16 },
+  /* 2383 */  { MAD_F(0x07c55aa0) /* 0.485682131 */, 16 },
+
+  /* 2384 */  { MAD_F(0x07c67798) /* 0.485953899 */, 16 },
+  /* 2385 */  { MAD_F(0x07c7949a) /* 0.486225704 */, 16 },
+  /* 2386 */  { MAD_F(0x07c8b1a7) /* 0.486497547 */, 16 },
+  /* 2387 */  { MAD_F(0x07c9cebd) /* 0.486769429 */, 16 },
+  /* 2388 */  { MAD_F(0x07caebde) /* 0.487041348 */, 16 },
+  /* 2389 */  { MAD_F(0x07cc0909) /* 0.487313305 */, 16 },
+  /* 2390 */  { MAD_F(0x07cd263e) /* 0.487585300 */, 16 },
+  /* 2391 */  { MAD_F(0x07ce437d) /* 0.487857333 */, 16 },
+  /* 2392 */  { MAD_F(0x07cf60c7) /* 0.488129404 */, 16 },
+  /* 2393 */  { MAD_F(0x07d07e1b) /* 0.488401513 */, 16 },
+  /* 2394 */  { MAD_F(0x07d19b79) /* 0.488673660 */, 16 },
+  /* 2395 */  { MAD_F(0x07d2b8e1) /* 0.488945845 */, 16 },
+  /* 2396 */  { MAD_F(0x07d3d653) /* 0.489218067 */, 16 },
+  /* 2397 */  { MAD_F(0x07d4f3cf) /* 0.489490328 */, 16 },
+  /* 2398 */  { MAD_F(0x07d61156) /* 0.489762626 */, 16 },
+  /* 2399 */  { MAD_F(0x07d72ee6) /* 0.490034962 */, 16 },
+
+  /* 2400 */  { MAD_F(0x07d84c81) /* 0.490307336 */, 16 },
+  /* 2401 */  { MAD_F(0x07d96a26) /* 0.490579748 */, 16 },
+  /* 2402 */  { MAD_F(0x07da87d5) /* 0.490852198 */, 16 },
+  /* 2403 */  { MAD_F(0x07dba58f) /* 0.491124686 */, 16 },
+  /* 2404 */  { MAD_F(0x07dcc352) /* 0.491397211 */, 16 },
+  /* 2405 */  { MAD_F(0x07dde120) /* 0.491669774 */, 16 },
+  /* 2406 */  { MAD_F(0x07defef7) /* 0.491942375 */, 16 },
+  /* 2407 */  { MAD_F(0x07e01cd9) /* 0.492215014 */, 16 },
+  /* 2408 */  { MAD_F(0x07e13ac5) /* 0.492487690 */, 16 },
+  /* 2409 */  { MAD_F(0x07e258bc) /* 0.492760404 */, 16 },
+  /* 2410 */  { MAD_F(0x07e376bc) /* 0.493033156 */, 16 },
+  /* 2411 */  { MAD_F(0x07e494c6) /* 0.493305946 */, 16 },
+  /* 2412 */  { MAD_F(0x07e5b2db) /* 0.493578773 */, 16 },
+  /* 2413 */  { MAD_F(0x07e6d0f9) /* 0.493851638 */, 16 },
+  /* 2414 */  { MAD_F(0x07e7ef22) /* 0.494124541 */, 16 },
+  /* 2415 */  { MAD_F(0x07e90d55) /* 0.494397481 */, 16 },
+
+  /* 2416 */  { MAD_F(0x07ea2b92) /* 0.494670459 */, 16 },
+  /* 2417 */  { MAD_F(0x07eb49d9) /* 0.494943475 */, 16 },
+  /* 2418 */  { MAD_F(0x07ec682a) /* 0.495216529 */, 16 },
+  /* 2419 */  { MAD_F(0x07ed8686) /* 0.495489620 */, 16 },
+  /* 2420 */  { MAD_F(0x07eea4eb) /* 0.495762748 */, 16 },
+  /* 2421 */  { MAD_F(0x07efc35b) /* 0.496035915 */, 16 },
+  /* 2422 */  { MAD_F(0x07f0e1d4) /* 0.496309119 */, 16 },
+  /* 2423 */  { MAD_F(0x07f20058) /* 0.496582360 */, 16 },
+  /* 2424 */  { MAD_F(0x07f31ee6) /* 0.496855639 */, 16 },
+  /* 2425 */  { MAD_F(0x07f43d7e) /* 0.497128956 */, 16 },
+  /* 2426 */  { MAD_F(0x07f55c20) /* 0.497402310 */, 16 },
+  /* 2427 */  { MAD_F(0x07f67acc) /* 0.497675702 */, 16 },
+  /* 2428 */  { MAD_F(0x07f79982) /* 0.497949132 */, 16 },
+  /* 2429 */  { MAD_F(0x07f8b842) /* 0.498222598 */, 16 },
+  /* 2430 */  { MAD_F(0x07f9d70c) /* 0.498496103 */, 16 },
+  /* 2431 */  { MAD_F(0x07faf5e1) /* 0.498769645 */, 16 },
+
+  /* 2432 */  { MAD_F(0x07fc14bf) /* 0.499043224 */, 16 },
+  /* 2433 */  { MAD_F(0x07fd33a8) /* 0.499316841 */, 16 },
+  /* 2434 */  { MAD_F(0x07fe529a) /* 0.499590496 */, 16 },
+  /* 2435 */  { MAD_F(0x07ff7197) /* 0.499864188 */, 16 },
+  /* 2436 */  { MAD_F(0x0400484f) /* 0.250068959 */, 17 },
+  /* 2437 */  { MAD_F(0x0400d7d7) /* 0.250205842 */, 17 },
+  /* 2438 */  { MAD_F(0x04016764) /* 0.250342744 */, 17 },
+  /* 2439 */  { MAD_F(0x0401f6f7) /* 0.250479665 */, 17 },
+  /* 2440 */  { MAD_F(0x0402868e) /* 0.250616605 */, 17 },
+  /* 2441 */  { MAD_F(0x0403162b) /* 0.250753563 */, 17 },
+  /* 2442 */  { MAD_F(0x0403a5cc) /* 0.250890540 */, 17 },
+  /* 2443 */  { MAD_F(0x04043573) /* 0.251027536 */, 17 },
+  /* 2444 */  { MAD_F(0x0404c51e) /* 0.251164550 */, 17 },
+  /* 2445 */  { MAD_F(0x040554cf) /* 0.251301583 */, 17 },
+  /* 2446 */  { MAD_F(0x0405e484) /* 0.251438635 */, 17 },
+  /* 2447 */  { MAD_F(0x0406743f) /* 0.251575706 */, 17 },
+
+  /* 2448 */  { MAD_F(0x040703ff) /* 0.251712795 */, 17 },
+  /* 2449 */  { MAD_F(0x040793c3) /* 0.251849903 */, 17 },
+  /* 2450 */  { MAD_F(0x0408238d) /* 0.251987029 */, 17 },
+  /* 2451 */  { MAD_F(0x0408b35b) /* 0.252124174 */, 17 },
+  /* 2452 */  { MAD_F(0x0409432f) /* 0.252261338 */, 17 },
+  /* 2453 */  { MAD_F(0x0409d308) /* 0.252398520 */, 17 },
+  /* 2454 */  { MAD_F(0x040a62e5) /* 0.252535721 */, 17 },
+  /* 2455 */  { MAD_F(0x040af2c8) /* 0.252672941 */, 17 },
+  /* 2456 */  { MAD_F(0x040b82b0) /* 0.252810180 */, 17 },
+  /* 2457 */  { MAD_F(0x040c129c) /* 0.252947436 */, 17 },
+  /* 2458 */  { MAD_F(0x040ca28e) /* 0.253084712 */, 17 },
+  /* 2459 */  { MAD_F(0x040d3284) /* 0.253222006 */, 17 },
+  /* 2460 */  { MAD_F(0x040dc280) /* 0.253359319 */, 17 },
+  /* 2461 */  { MAD_F(0x040e5281) /* 0.253496651 */, 17 },
+  /* 2462 */  { MAD_F(0x040ee286) /* 0.253634001 */, 17 },
+  /* 2463 */  { MAD_F(0x040f7291) /* 0.253771369 */, 17 },
+
+  /* 2464 */  { MAD_F(0x041002a1) /* 0.253908756 */, 17 },
+  /* 2465 */  { MAD_F(0x041092b5) /* 0.254046162 */, 17 },
+  /* 2466 */  { MAD_F(0x041122cf) /* 0.254183587 */, 17 },
+  /* 2467 */  { MAD_F(0x0411b2ed) /* 0.254321030 */, 17 },
+  /* 2468 */  { MAD_F(0x04124311) /* 0.254458491 */, 17 },
+  /* 2469 */  { MAD_F(0x0412d339) /* 0.254595971 */, 17 },
+  /* 2470 */  { MAD_F(0x04136367) /* 0.254733470 */, 17 },
+  /* 2471 */  { MAD_F(0x0413f399) /* 0.254870987 */, 17 },
+  /* 2472 */  { MAD_F(0x041483d1) /* 0.255008523 */, 17 },
+  /* 2473 */  { MAD_F(0x0415140d) /* 0.255146077 */, 17 },
+  /* 2474 */  { MAD_F(0x0415a44f) /* 0.255283650 */, 17 },
+  /* 2475 */  { MAD_F(0x04163495) /* 0.255421241 */, 17 },
+  /* 2476 */  { MAD_F(0x0416c4e1) /* 0.255558851 */, 17 },
+  /* 2477 */  { MAD_F(0x04175531) /* 0.255696480 */, 17 },
+  /* 2478 */  { MAD_F(0x0417e586) /* 0.255834127 */, 17 },
+  /* 2479 */  { MAD_F(0x041875e1) /* 0.255971792 */, 17 },
+
+  /* 2480 */  { MAD_F(0x04190640) /* 0.256109476 */, 17 },
+  /* 2481 */  { MAD_F(0x041996a4) /* 0.256247179 */, 17 },
+  /* 2482 */  { MAD_F(0x041a270d) /* 0.256384900 */, 17 },
+  /* 2483 */  { MAD_F(0x041ab77b) /* 0.256522639 */, 17 },
+  /* 2484 */  { MAD_F(0x041b47ef) /* 0.256660397 */, 17 },
+  /* 2485 */  { MAD_F(0x041bd867) /* 0.256798174 */, 17 },
+  /* 2486 */  { MAD_F(0x041c68e4) /* 0.256935969 */, 17 },
+  /* 2487 */  { MAD_F(0x041cf966) /* 0.257073782 */, 17 },
+  /* 2488 */  { MAD_F(0x041d89ed) /* 0.257211614 */, 17 },
+  /* 2489 */  { MAD_F(0x041e1a79) /* 0.257349465 */, 17 },
+  /* 2490 */  { MAD_F(0x041eab0a) /* 0.257487334 */, 17 },
+  /* 2491 */  { MAD_F(0x041f3b9f) /* 0.257625221 */, 17 },
+  /* 2492 */  { MAD_F(0x041fcc3a) /* 0.257763127 */, 17 },
+  /* 2493 */  { MAD_F(0x04205cda) /* 0.257901051 */, 17 },
+  /* 2494 */  { MAD_F(0x0420ed7f) /* 0.258038994 */, 17 },
+  /* 2495 */  { MAD_F(0x04217e28) /* 0.258176955 */, 17 },
+
+  /* 2496 */  { MAD_F(0x04220ed7) /* 0.258314934 */, 17 },
+  /* 2497 */  { MAD_F(0x04229f8a) /* 0.258452932 */, 17 },
+  /* 2498 */  { MAD_F(0x04233043) /* 0.258590948 */, 17 },
+  /* 2499 */  { MAD_F(0x0423c100) /* 0.258728983 */, 17 },
+  /* 2500 */  { MAD_F(0x042451c3) /* 0.258867036 */, 17 },
+  /* 2501 */  { MAD_F(0x0424e28a) /* 0.259005108 */, 17 },
+  /* 2502 */  { MAD_F(0x04257356) /* 0.259143198 */, 17 },
+  /* 2503 */  { MAD_F(0x04260428) /* 0.259281307 */, 17 },
+  /* 2504 */  { MAD_F(0x042694fe) /* 0.259419433 */, 17 },
+  /* 2505 */  { MAD_F(0x042725d9) /* 0.259557579 */, 17 },
+  /* 2506 */  { MAD_F(0x0427b6b9) /* 0.259695742 */, 17 },
+  /* 2507 */  { MAD_F(0x0428479e) /* 0.259833924 */, 17 },
+  /* 2508 */  { MAD_F(0x0428d888) /* 0.259972124 */, 17 },
+  /* 2509 */  { MAD_F(0x04296976) /* 0.260110343 */, 17 },
+  /* 2510 */  { MAD_F(0x0429fa6a) /* 0.260248580 */, 17 },
+  /* 2511 */  { MAD_F(0x042a8b63) /* 0.260386836 */, 17 },
+
+  /* 2512 */  { MAD_F(0x042b1c60) /* 0.260525110 */, 17 },
+  /* 2513 */  { MAD_F(0x042bad63) /* 0.260663402 */, 17 },
+  /* 2514 */  { MAD_F(0x042c3e6a) /* 0.260801712 */, 17 },
+  /* 2515 */  { MAD_F(0x042ccf77) /* 0.260940041 */, 17 },
+  /* 2516 */  { MAD_F(0x042d6088) /* 0.261078388 */, 17 },
+  /* 2517 */  { MAD_F(0x042df19e) /* 0.261216754 */, 17 },
+  /* 2518 */  { MAD_F(0x042e82b9) /* 0.261355137 */, 17 },
+  /* 2519 */  { MAD_F(0x042f13d9) /* 0.261493540 */, 17 },
+  /* 2520 */  { MAD_F(0x042fa4fe) /* 0.261631960 */, 17 },
+  /* 2521 */  { MAD_F(0x04303628) /* 0.261770399 */, 17 },
+  /* 2522 */  { MAD_F(0x0430c757) /* 0.261908856 */, 17 },
+  /* 2523 */  { MAD_F(0x0431588b) /* 0.262047331 */, 17 },
+  /* 2524 */  { MAD_F(0x0431e9c3) /* 0.262185825 */, 17 },
+  /* 2525 */  { MAD_F(0x04327b01) /* 0.262324337 */, 17 },
+  /* 2526 */  { MAD_F(0x04330c43) /* 0.262462867 */, 17 },
+  /* 2527 */  { MAD_F(0x04339d8a) /* 0.262601416 */, 17 },
+
+  /* 2528 */  { MAD_F(0x04342ed7) /* 0.262739982 */, 17 },
+  /* 2529 */  { MAD_F(0x0434c028) /* 0.262878568 */, 17 },
+  /* 2530 */  { MAD_F(0x0435517e) /* 0.263017171 */, 17 },
+  /* 2531 */  { MAD_F(0x0435e2d9) /* 0.263155792 */, 17 },
+  /* 2532 */  { MAD_F(0x04367439) /* 0.263294432 */, 17 },
+  /* 2533 */  { MAD_F(0x0437059e) /* 0.263433090 */, 17 },
+  /* 2534 */  { MAD_F(0x04379707) /* 0.263571767 */, 17 },
+  /* 2535 */  { MAD_F(0x04382876) /* 0.263710461 */, 17 },
+  /* 2536 */  { MAD_F(0x0438b9e9) /* 0.263849174 */, 17 },
+  /* 2537 */  { MAD_F(0x04394b61) /* 0.263987905 */, 17 },
+  /* 2538 */  { MAD_F(0x0439dcdf) /* 0.264126655 */, 17 },
+  /* 2539 */  { MAD_F(0x043a6e61) /* 0.264265422 */, 17 },
+  /* 2540 */  { MAD_F(0x043affe8) /* 0.264404208 */, 17 },
+  /* 2541 */  { MAD_F(0x043b9174) /* 0.264543012 */, 17 },
+  /* 2542 */  { MAD_F(0x043c2305) /* 0.264681834 */, 17 },
+  /* 2543 */  { MAD_F(0x043cb49a) /* 0.264820674 */, 17 },
+
+  /* 2544 */  { MAD_F(0x043d4635) /* 0.264959533 */, 17 },
+  /* 2545 */  { MAD_F(0x043dd7d4) /* 0.265098410 */, 17 },
+  /* 2546 */  { MAD_F(0x043e6979) /* 0.265237305 */, 17 },
+  /* 2547 */  { MAD_F(0x043efb22) /* 0.265376218 */, 17 },
+  /* 2548 */  { MAD_F(0x043f8cd0) /* 0.265515149 */, 17 },
+  /* 2549 */  { MAD_F(0x04401e83) /* 0.265654099 */, 17 },
+  /* 2550 */  { MAD_F(0x0440b03b) /* 0.265793066 */, 17 },
+  /* 2551 */  { MAD_F(0x044141f7) /* 0.265932052 */, 17 },
+  /* 2552 */  { MAD_F(0x0441d3b9) /* 0.266071056 */, 17 },
+  /* 2553 */  { MAD_F(0x04426580) /* 0.266210078 */, 17 },
+  /* 2554 */  { MAD_F(0x0442f74b) /* 0.266349119 */, 17 },
+  /* 2555 */  { MAD_F(0x0443891b) /* 0.266488177 */, 17 },
+  /* 2556 */  { MAD_F(0x04441af0) /* 0.266627254 */, 17 },
+  /* 2557 */  { MAD_F(0x0444acca) /* 0.266766349 */, 17 },
+  /* 2558 */  { MAD_F(0x04453ea9) /* 0.266905462 */, 17 },
+  /* 2559 */  { MAD_F(0x0445d08d) /* 0.267044593 */, 17 },
+
+  /* 2560 */  { MAD_F(0x04466275) /* 0.267183742 */, 17 },
+  /* 2561 */  { MAD_F(0x0446f463) /* 0.267322909 */, 17 },
+  /* 2562 */  { MAD_F(0x04478655) /* 0.267462094 */, 17 },
+  /* 2563 */  { MAD_F(0x0448184c) /* 0.267601298 */, 17 },
+  /* 2564 */  { MAD_F(0x0448aa48) /* 0.267740519 */, 17 },
+  /* 2565 */  { MAD_F(0x04493c49) /* 0.267879759 */, 17 },
+  /* 2566 */  { MAD_F(0x0449ce4f) /* 0.268019017 */, 17 },
+  /* 2567 */  { MAD_F(0x044a6059) /* 0.268158293 */, 17 },
+  /* 2568 */  { MAD_F(0x044af269) /* 0.268297587 */, 17 },
+  /* 2569 */  { MAD_F(0x044b847d) /* 0.268436899 */, 17 },
+  /* 2570 */  { MAD_F(0x044c1696) /* 0.268576229 */, 17 },
+  /* 2571 */  { MAD_F(0x044ca8b4) /* 0.268715577 */, 17 },
+  /* 2572 */  { MAD_F(0x044d3ad7) /* 0.268854943 */, 17 },
+  /* 2573 */  { MAD_F(0x044dccff) /* 0.268994328 */, 17 },
+  /* 2574 */  { MAD_F(0x044e5f2b) /* 0.269133730 */, 17 },
+  /* 2575 */  { MAD_F(0x044ef15d) /* 0.269273150 */, 17 },
+
+  /* 2576 */  { MAD_F(0x044f8393) /* 0.269412589 */, 17 },
+  /* 2577 */  { MAD_F(0x045015ce) /* 0.269552045 */, 17 },
+  /* 2578 */  { MAD_F(0x0450a80e) /* 0.269691520 */, 17 },
+  /* 2579 */  { MAD_F(0x04513a53) /* 0.269831013 */, 17 },
+  /* 2580 */  { MAD_F(0x0451cc9c) /* 0.269970523 */, 17 },
+  /* 2581 */  { MAD_F(0x04525eeb) /* 0.270110052 */, 17 },
+  /* 2582 */  { MAD_F(0x0452f13e) /* 0.270249599 */, 17 },
+  /* 2583 */  { MAD_F(0x04538396) /* 0.270389163 */, 17 },
+  /* 2584 */  { MAD_F(0x045415f3) /* 0.270528746 */, 17 },
+  /* 2585 */  { MAD_F(0x0454a855) /* 0.270668347 */, 17 },
+  /* 2586 */  { MAD_F(0x04553abb) /* 0.270807965 */, 17 },
+  /* 2587 */  { MAD_F(0x0455cd27) /* 0.270947602 */, 17 },
+  /* 2588 */  { MAD_F(0x04565f97) /* 0.271087257 */, 17 },
+  /* 2589 */  { MAD_F(0x0456f20c) /* 0.271226930 */, 17 },
+  /* 2590 */  { MAD_F(0x04578486) /* 0.271366620 */, 17 },
+  /* 2591 */  { MAD_F(0x04581705) /* 0.271506329 */, 17 },
+
+  /* 2592 */  { MAD_F(0x0458a989) /* 0.271646056 */, 17 },
+  /* 2593 */  { MAD_F(0x04593c11) /* 0.271785800 */, 17 },
+  /* 2594 */  { MAD_F(0x0459ce9e) /* 0.271925563 */, 17 },
+  /* 2595 */  { MAD_F(0x045a6130) /* 0.272065343 */, 17 },
+  /* 2596 */  { MAD_F(0x045af3c7) /* 0.272205142 */, 17 },
+  /* 2597 */  { MAD_F(0x045b8663) /* 0.272344958 */, 17 },
+  /* 2598 */  { MAD_F(0x045c1903) /* 0.272484793 */, 17 },
+  /* 2599 */  { MAD_F(0x045caba9) /* 0.272624645 */, 17 },
+  /* 2600 */  { MAD_F(0x045d3e53) /* 0.272764515 */, 17 },
+  /* 2601 */  { MAD_F(0x045dd102) /* 0.272904403 */, 17 },
+  /* 2602 */  { MAD_F(0x045e63b6) /* 0.273044310 */, 17 },
+  /* 2603 */  { MAD_F(0x045ef66e) /* 0.273184234 */, 17 },
+  /* 2604 */  { MAD_F(0x045f892b) /* 0.273324176 */, 17 },
+  /* 2605 */  { MAD_F(0x04601bee) /* 0.273464136 */, 17 },
+  /* 2606 */  { MAD_F(0x0460aeb5) /* 0.273604113 */, 17 },
+  /* 2607 */  { MAD_F(0x04614180) /* 0.273744109 */, 17 },
+
+  /* 2608 */  { MAD_F(0x0461d451) /* 0.273884123 */, 17 },
+  /* 2609 */  { MAD_F(0x04626727) /* 0.274024154 */, 17 },
+  /* 2610 */  { MAD_F(0x0462fa01) /* 0.274164204 */, 17 },
+  /* 2611 */  { MAD_F(0x04638ce0) /* 0.274304271 */, 17 },
+  /* 2612 */  { MAD_F(0x04641fc4) /* 0.274444356 */, 17 },
+  /* 2613 */  { MAD_F(0x0464b2ac) /* 0.274584459 */, 17 },
+  /* 2614 */  { MAD_F(0x0465459a) /* 0.274724580 */, 17 },
+  /* 2615 */  { MAD_F(0x0465d88c) /* 0.274864719 */, 17 },
+  /* 2616 */  { MAD_F(0x04666b83) /* 0.275004875 */, 17 },
+  /* 2617 */  { MAD_F(0x0466fe7f) /* 0.275145050 */, 17 },
+  /* 2618 */  { MAD_F(0x0467917f) /* 0.275285242 */, 17 },
+  /* 2619 */  { MAD_F(0x04682485) /* 0.275425452 */, 17 },
+  /* 2620 */  { MAD_F(0x0468b78f) /* 0.275565681 */, 17 },
+  /* 2621 */  { MAD_F(0x04694a9e) /* 0.275705926 */, 17 },
+  /* 2622 */  { MAD_F(0x0469ddb2) /* 0.275846190 */, 17 },
+  /* 2623 */  { MAD_F(0x046a70ca) /* 0.275986472 */, 17 },
+
+  /* 2624 */  { MAD_F(0x046b03e7) /* 0.276126771 */, 17 },
+  /* 2625 */  { MAD_F(0x046b970a) /* 0.276267088 */, 17 },
+  /* 2626 */  { MAD_F(0x046c2a31) /* 0.276407423 */, 17 },
+  /* 2627 */  { MAD_F(0x046cbd5c) /* 0.276547776 */, 17 },
+  /* 2628 */  { MAD_F(0x046d508d) /* 0.276688147 */, 17 },
+  /* 2629 */  { MAD_F(0x046de3c2) /* 0.276828535 */, 17 },
+  /* 2630 */  { MAD_F(0x046e76fc) /* 0.276968942 */, 17 },
+  /* 2631 */  { MAD_F(0x046f0a3b) /* 0.277109366 */, 17 },
+  /* 2632 */  { MAD_F(0x046f9d7e) /* 0.277249808 */, 17 },
+  /* 2633 */  { MAD_F(0x047030c7) /* 0.277390267 */, 17 },
+  /* 2634 */  { MAD_F(0x0470c414) /* 0.277530745 */, 17 },
+  /* 2635 */  { MAD_F(0x04715766) /* 0.277671240 */, 17 },
+  /* 2636 */  { MAD_F(0x0471eabc) /* 0.277811753 */, 17 },
+  /* 2637 */  { MAD_F(0x04727e18) /* 0.277952284 */, 17 },
+  /* 2638 */  { MAD_F(0x04731178) /* 0.278092832 */, 17 },
+  /* 2639 */  { MAD_F(0x0473a4dd) /* 0.278233399 */, 17 },
+
+  /* 2640 */  { MAD_F(0x04743847) /* 0.278373983 */, 17 },
+  /* 2641 */  { MAD_F(0x0474cbb5) /* 0.278514584 */, 17 },
+  /* 2642 */  { MAD_F(0x04755f29) /* 0.278655204 */, 17 },
+  /* 2643 */  { MAD_F(0x0475f2a1) /* 0.278795841 */, 17 },
+  /* 2644 */  { MAD_F(0x0476861d) /* 0.278936496 */, 17 },
+  /* 2645 */  { MAD_F(0x0477199f) /* 0.279077169 */, 17 },
+  /* 2646 */  { MAD_F(0x0477ad25) /* 0.279217860 */, 17 },
+  /* 2647 */  { MAD_F(0x047840b0) /* 0.279358568 */, 17 },
+  /* 2648 */  { MAD_F(0x0478d440) /* 0.279499294 */, 17 },
+  /* 2649 */  { MAD_F(0x047967d5) /* 0.279640037 */, 17 },
+  /* 2650 */  { MAD_F(0x0479fb6e) /* 0.279780799 */, 17 },
+  /* 2651 */  { MAD_F(0x047a8f0c) /* 0.279921578 */, 17 },
+  /* 2652 */  { MAD_F(0x047b22af) /* 0.280062375 */, 17 },
+  /* 2653 */  { MAD_F(0x047bb657) /* 0.280203189 */, 17 },
+  /* 2654 */  { MAD_F(0x047c4a03) /* 0.280344021 */, 17 },
+  /* 2655 */  { MAD_F(0x047cddb4) /* 0.280484871 */, 17 },
+
+  /* 2656 */  { MAD_F(0x047d716a) /* 0.280625739 */, 17 },
+  /* 2657 */  { MAD_F(0x047e0524) /* 0.280766624 */, 17 },
+  /* 2658 */  { MAD_F(0x047e98e4) /* 0.280907527 */, 17 },
+  /* 2659 */  { MAD_F(0x047f2ca8) /* 0.281048447 */, 17 },
+  /* 2660 */  { MAD_F(0x047fc071) /* 0.281189385 */, 17 },
+  /* 2661 */  { MAD_F(0x0480543e) /* 0.281330341 */, 17 },
+  /* 2662 */  { MAD_F(0x0480e811) /* 0.281471315 */, 17 },
+  /* 2663 */  { MAD_F(0x04817be8) /* 0.281612306 */, 17 },
+  /* 2664 */  { MAD_F(0x04820fc3) /* 0.281753315 */, 17 },
+  /* 2665 */  { MAD_F(0x0482a3a4) /* 0.281894341 */, 17 },
+  /* 2666 */  { MAD_F(0x04833789) /* 0.282035386 */, 17 },
+  /* 2667 */  { MAD_F(0x0483cb73) /* 0.282176447 */, 17 },
+  /* 2668 */  { MAD_F(0x04845f62) /* 0.282317527 */, 17 },
+  /* 2669 */  { MAD_F(0x0484f355) /* 0.282458624 */, 17 },
+  /* 2670 */  { MAD_F(0x0485874d) /* 0.282599738 */, 17 },
+  /* 2671 */  { MAD_F(0x04861b4a) /* 0.282740871 */, 17 },
+
+  /* 2672 */  { MAD_F(0x0486af4c) /* 0.282882021 */, 17 },
+  /* 2673 */  { MAD_F(0x04874352) /* 0.283023188 */, 17 },
+  /* 2674 */  { MAD_F(0x0487d75d) /* 0.283164373 */, 17 },
+  /* 2675 */  { MAD_F(0x04886b6d) /* 0.283305576 */, 17 },
+  /* 2676 */  { MAD_F(0x0488ff82) /* 0.283446796 */, 17 },
+  /* 2677 */  { MAD_F(0x0489939b) /* 0.283588034 */, 17 },
+  /* 2678 */  { MAD_F(0x048a27b9) /* 0.283729290 */, 17 },
+  /* 2679 */  { MAD_F(0x048abbdc) /* 0.283870563 */, 17 },
+  /* 2680 */  { MAD_F(0x048b5003) /* 0.284011853 */, 17 },
+  /* 2681 */  { MAD_F(0x048be42f) /* 0.284153161 */, 17 },
+  /* 2682 */  { MAD_F(0x048c7860) /* 0.284294487 */, 17 },
+  /* 2683 */  { MAD_F(0x048d0c96) /* 0.284435831 */, 17 },
+  /* 2684 */  { MAD_F(0x048da0d0) /* 0.284577192 */, 17 },
+  /* 2685 */  { MAD_F(0x048e350f) /* 0.284718570 */, 17 },
+  /* 2686 */  { MAD_F(0x048ec953) /* 0.284859966 */, 17 },
+  /* 2687 */  { MAD_F(0x048f5d9b) /* 0.285001380 */, 17 },
+
+  /* 2688 */  { MAD_F(0x048ff1e8) /* 0.285142811 */, 17 },
+  /* 2689 */  { MAD_F(0x0490863a) /* 0.285284259 */, 17 },
+  /* 2690 */  { MAD_F(0x04911a91) /* 0.285425726 */, 17 },
+  /* 2691 */  { MAD_F(0x0491aeec) /* 0.285567209 */, 17 },
+  /* 2692 */  { MAD_F(0x0492434c) /* 0.285708711 */, 17 },
+  /* 2693 */  { MAD_F(0x0492d7b0) /* 0.285850229 */, 17 },
+  /* 2694 */  { MAD_F(0x04936c1a) /* 0.285991766 */, 17 },
+  /* 2695 */  { MAD_F(0x04940088) /* 0.286133319 */, 17 },
+  /* 2696 */  { MAD_F(0x049494fb) /* 0.286274891 */, 17 },
+  /* 2697 */  { MAD_F(0x04952972) /* 0.286416480 */, 17 },
+  /* 2698 */  { MAD_F(0x0495bdee) /* 0.286558086 */, 17 },
+  /* 2699 */  { MAD_F(0x0496526f) /* 0.286699710 */, 17 },
+  /* 2700 */  { MAD_F(0x0496e6f5) /* 0.286841351 */, 17 },
+  /* 2701 */  { MAD_F(0x04977b7f) /* 0.286983010 */, 17 },
+  /* 2702 */  { MAD_F(0x0498100e) /* 0.287124686 */, 17 },
+  /* 2703 */  { MAD_F(0x0498a4a1) /* 0.287266380 */, 17 },
+
+  /* 2704 */  { MAD_F(0x0499393a) /* 0.287408091 */, 17 },
+  /* 2705 */  { MAD_F(0x0499cdd7) /* 0.287549820 */, 17 },
+  /* 2706 */  { MAD_F(0x049a6278) /* 0.287691566 */, 17 },
+  /* 2707 */  { MAD_F(0x049af71f) /* 0.287833330 */, 17 },
+  /* 2708 */  { MAD_F(0x049b8bca) /* 0.287975111 */, 17 },
+  /* 2709 */  { MAD_F(0x049c207a) /* 0.288116909 */, 17 },
+  /* 2710 */  { MAD_F(0x049cb52e) /* 0.288258725 */, 17 },
+  /* 2711 */  { MAD_F(0x049d49e7) /* 0.288400559 */, 17 },
+  /* 2712 */  { MAD_F(0x049ddea5) /* 0.288542409 */, 17 },
+  /* 2713 */  { MAD_F(0x049e7367) /* 0.288684278 */, 17 },
+  /* 2714 */  { MAD_F(0x049f082f) /* 0.288826163 */, 17 },
+  /* 2715 */  { MAD_F(0x049f9cfa) /* 0.288968067 */, 17 },
+  /* 2716 */  { MAD_F(0x04a031cb) /* 0.289109987 */, 17 },
+  /* 2717 */  { MAD_F(0x04a0c6a0) /* 0.289251925 */, 17 },
+  /* 2718 */  { MAD_F(0x04a15b7a) /* 0.289393881 */, 17 },
+  /* 2719 */  { MAD_F(0x04a1f059) /* 0.289535854 */, 17 },
+
+  /* 2720 */  { MAD_F(0x04a2853c) /* 0.289677844 */, 17 },
+  /* 2721 */  { MAD_F(0x04a31a24) /* 0.289819851 */, 17 },
+  /* 2722 */  { MAD_F(0x04a3af10) /* 0.289961876 */, 17 },
+  /* 2723 */  { MAD_F(0x04a44401) /* 0.290103919 */, 17 },
+  /* 2724 */  { MAD_F(0x04a4d8f7) /* 0.290245979 */, 17 },
+  /* 2725 */  { MAD_F(0x04a56df2) /* 0.290388056 */, 17 },
+  /* 2726 */  { MAD_F(0x04a602f1) /* 0.290530150 */, 17 },
+  /* 2727 */  { MAD_F(0x04a697f5) /* 0.290672262 */, 17 },
+  /* 2728 */  { MAD_F(0x04a72cfe) /* 0.290814392 */, 17 },
+  /* 2729 */  { MAD_F(0x04a7c20b) /* 0.290956538 */, 17 },
+  /* 2730 */  { MAD_F(0x04a8571d) /* 0.291098703 */, 17 },
+  /* 2731 */  { MAD_F(0x04a8ec33) /* 0.291240884 */, 17 },
+  /* 2732 */  { MAD_F(0x04a9814e) /* 0.291383083 */, 17 },
+  /* 2733 */  { MAD_F(0x04aa166e) /* 0.291525299 */, 17 },
+  /* 2734 */  { MAD_F(0x04aaab93) /* 0.291667532 */, 17 },
+  /* 2735 */  { MAD_F(0x04ab40bc) /* 0.291809783 */, 17 },
+
+  /* 2736 */  { MAD_F(0x04abd5ea) /* 0.291952051 */, 17 },
+  /* 2737 */  { MAD_F(0x04ac6b1c) /* 0.292094337 */, 17 },
+  /* 2738 */  { MAD_F(0x04ad0053) /* 0.292236640 */, 17 },
+  /* 2739 */  { MAD_F(0x04ad958f) /* 0.292378960 */, 17 },
+  /* 2740 */  { MAD_F(0x04ae2ad0) /* 0.292521297 */, 17 },
+  /* 2741 */  { MAD_F(0x04aec015) /* 0.292663652 */, 17 },
+  /* 2742 */  { MAD_F(0x04af555e) /* 0.292806024 */, 17 },
+  /* 2743 */  { MAD_F(0x04afeaad) /* 0.292948414 */, 17 },
+  /* 2744 */  { MAD_F(0x04b08000) /* 0.293090820 */, 17 },
+  /* 2745 */  { MAD_F(0x04b11557) /* 0.293233244 */, 17 },
+  /* 2746 */  { MAD_F(0x04b1aab4) /* 0.293375686 */, 17 },
+  /* 2747 */  { MAD_F(0x04b24015) /* 0.293518144 */, 17 },
+  /* 2748 */  { MAD_F(0x04b2d57a) /* 0.293660620 */, 17 },
+  /* 2749 */  { MAD_F(0x04b36ae4) /* 0.293803113 */, 17 },
+  /* 2750 */  { MAD_F(0x04b40053) /* 0.293945624 */, 17 },
+  /* 2751 */  { MAD_F(0x04b495c7) /* 0.294088151 */, 17 },
+
+  /* 2752 */  { MAD_F(0x04b52b3f) /* 0.294230696 */, 17 },
+  /* 2753 */  { MAD_F(0x04b5c0bc) /* 0.294373259 */, 17 },
+  /* 2754 */  { MAD_F(0x04b6563d) /* 0.294515838 */, 17 },
+  /* 2755 */  { MAD_F(0x04b6ebc3) /* 0.294658435 */, 17 },
+  /* 2756 */  { MAD_F(0x04b7814e) /* 0.294801049 */, 17 },
+  /* 2757 */  { MAD_F(0x04b816dd) /* 0.294943680 */, 17 },
+  /* 2758 */  { MAD_F(0x04b8ac71) /* 0.295086329 */, 17 },
+  /* 2759 */  { MAD_F(0x04b9420a) /* 0.295228995 */, 17 },
+  /* 2760 */  { MAD_F(0x04b9d7a7) /* 0.295371678 */, 17 },
+  /* 2761 */  { MAD_F(0x04ba6d49) /* 0.295514378 */, 17 },
+  /* 2762 */  { MAD_F(0x04bb02ef) /* 0.295657095 */, 17 },
+  /* 2763 */  { MAD_F(0x04bb989a) /* 0.295799830 */, 17 },
+  /* 2764 */  { MAD_F(0x04bc2e4a) /* 0.295942582 */, 17 },
+  /* 2765 */  { MAD_F(0x04bcc3fe) /* 0.296085351 */, 17 },
+  /* 2766 */  { MAD_F(0x04bd59b7) /* 0.296228138 */, 17 },
+  /* 2767 */  { MAD_F(0x04bdef74) /* 0.296370941 */, 17 },
+
+  /* 2768 */  { MAD_F(0x04be8537) /* 0.296513762 */, 17 },
+  /* 2769 */  { MAD_F(0x04bf1afd) /* 0.296656600 */, 17 },
+  /* 2770 */  { MAD_F(0x04bfb0c9) /* 0.296799455 */, 17 },
+  /* 2771 */  { MAD_F(0x04c04699) /* 0.296942327 */, 17 },
+  /* 2772 */  { MAD_F(0x04c0dc6d) /* 0.297085217 */, 17 },
+  /* 2773 */  { MAD_F(0x04c17247) /* 0.297228124 */, 17 },
+  /* 2774 */  { MAD_F(0x04c20824) /* 0.297371048 */, 17 },
+  /* 2775 */  { MAD_F(0x04c29e07) /* 0.297513989 */, 17 },
+  /* 2776 */  { MAD_F(0x04c333ee) /* 0.297656947 */, 17 },
+  /* 2777 */  { MAD_F(0x04c3c9da) /* 0.297799922 */, 17 },
+  /* 2778 */  { MAD_F(0x04c45fca) /* 0.297942915 */, 17 },
+  /* 2779 */  { MAD_F(0x04c4f5bf) /* 0.298085925 */, 17 },
+  /* 2780 */  { MAD_F(0x04c58bb8) /* 0.298228951 */, 17 },
+  /* 2781 */  { MAD_F(0x04c621b6) /* 0.298371996 */, 17 },
+  /* 2782 */  { MAD_F(0x04c6b7b9) /* 0.298515057 */, 17 },
+  /* 2783 */  { MAD_F(0x04c74dc0) /* 0.298658135 */, 17 },
+
+  /* 2784 */  { MAD_F(0x04c7e3cc) /* 0.298801231 */, 17 },
+  /* 2785 */  { MAD_F(0x04c879dd) /* 0.298944343 */, 17 },
+  /* 2786 */  { MAD_F(0x04c90ff2) /* 0.299087473 */, 17 },
+  /* 2787 */  { MAD_F(0x04c9a60c) /* 0.299230620 */, 17 },
+  /* 2788 */  { MAD_F(0x04ca3c2a) /* 0.299373784 */, 17 },
+  /* 2789 */  { MAD_F(0x04cad24d) /* 0.299516965 */, 17 },
+  /* 2790 */  { MAD_F(0x04cb6874) /* 0.299660163 */, 17 },
+  /* 2791 */  { MAD_F(0x04cbfea0) /* 0.299803378 */, 17 },
+  /* 2792 */  { MAD_F(0x04cc94d1) /* 0.299946611 */, 17 },
+  /* 2793 */  { MAD_F(0x04cd2b06) /* 0.300089860 */, 17 },
+  /* 2794 */  { MAD_F(0x04cdc140) /* 0.300233127 */, 17 },
+  /* 2795 */  { MAD_F(0x04ce577f) /* 0.300376411 */, 17 },
+  /* 2796 */  { MAD_F(0x04ceedc2) /* 0.300519711 */, 17 },
+  /* 2797 */  { MAD_F(0x04cf8409) /* 0.300663029 */, 17 },
+  /* 2798 */  { MAD_F(0x04d01a55) /* 0.300806364 */, 17 },
+  /* 2799 */  { MAD_F(0x04d0b0a6) /* 0.300949716 */, 17 },
+
+  /* 2800 */  { MAD_F(0x04d146fb) /* 0.301093085 */, 17 },
+  /* 2801 */  { MAD_F(0x04d1dd55) /* 0.301236472 */, 17 },
+  /* 2802 */  { MAD_F(0x04d273b4) /* 0.301379875 */, 17 },
+  /* 2803 */  { MAD_F(0x04d30a17) /* 0.301523295 */, 17 },
+  /* 2804 */  { MAD_F(0x04d3a07f) /* 0.301666733 */, 17 },
+  /* 2805 */  { MAD_F(0x04d436eb) /* 0.301810187 */, 17 },
+  /* 2806 */  { MAD_F(0x04d4cd5c) /* 0.301953659 */, 17 },
+  /* 2807 */  { MAD_F(0x04d563d1) /* 0.302097147 */, 17 },
+  /* 2808 */  { MAD_F(0x04d5fa4b) /* 0.302240653 */, 17 },
+  /* 2809 */  { MAD_F(0x04d690ca) /* 0.302384175 */, 17 },
+  /* 2810 */  { MAD_F(0x04d7274d) /* 0.302527715 */, 17 },
+  /* 2811 */  { MAD_F(0x04d7bdd5) /* 0.302671271 */, 17 },
+  /* 2812 */  { MAD_F(0x04d85461) /* 0.302814845 */, 17 },
+  /* 2813 */  { MAD_F(0x04d8eaf2) /* 0.302958436 */, 17 },
+  /* 2814 */  { MAD_F(0x04d98187) /* 0.303102044 */, 17 },
+  /* 2815 */  { MAD_F(0x04da1821) /* 0.303245668 */, 17 },
+
+  /* 2816 */  { MAD_F(0x04daaec0) /* 0.303389310 */, 17 },
+  /* 2817 */  { MAD_F(0x04db4563) /* 0.303532969 */, 17 },
+  /* 2818 */  { MAD_F(0x04dbdc0a) /* 0.303676645 */, 17 },
+  /* 2819 */  { MAD_F(0x04dc72b7) /* 0.303820337 */, 17 },
+  /* 2820 */  { MAD_F(0x04dd0967) /* 0.303964047 */, 17 },
+  /* 2821 */  { MAD_F(0x04dda01d) /* 0.304107774 */, 17 },
+  /* 2822 */  { MAD_F(0x04de36d7) /* 0.304251517 */, 17 },
+  /* 2823 */  { MAD_F(0x04decd95) /* 0.304395278 */, 17 },
+  /* 2824 */  { MAD_F(0x04df6458) /* 0.304539056 */, 17 },
+  /* 2825 */  { MAD_F(0x04dffb20) /* 0.304682850 */, 17 },
+  /* 2826 */  { MAD_F(0x04e091ec) /* 0.304826662 */, 17 },
+  /* 2827 */  { MAD_F(0x04e128bc) /* 0.304970491 */, 17 },
+  /* 2828 */  { MAD_F(0x04e1bf92) /* 0.305114336 */, 17 },
+  /* 2829 */  { MAD_F(0x04e2566b) /* 0.305258199 */, 17 },
+  /* 2830 */  { MAD_F(0x04e2ed4a) /* 0.305402078 */, 17 },
+  /* 2831 */  { MAD_F(0x04e3842d) /* 0.305545974 */, 17 },
+
+  /* 2832 */  { MAD_F(0x04e41b14) /* 0.305689888 */, 17 },
+  /* 2833 */  { MAD_F(0x04e4b200) /* 0.305833818 */, 17 },
+  /* 2834 */  { MAD_F(0x04e548f1) /* 0.305977765 */, 17 },
+  /* 2835 */  { MAD_F(0x04e5dfe6) /* 0.306121729 */, 17 },
+  /* 2836 */  { MAD_F(0x04e676df) /* 0.306265710 */, 17 },
+  /* 2837 */  { MAD_F(0x04e70dde) /* 0.306409708 */, 17 },
+  /* 2838 */  { MAD_F(0x04e7a4e0) /* 0.306553723 */, 17 },
+  /* 2839 */  { MAD_F(0x04e83be7) /* 0.306697755 */, 17 },
+  /* 2840 */  { MAD_F(0x04e8d2f3) /* 0.306841804 */, 17 },
+  /* 2841 */  { MAD_F(0x04e96a04) /* 0.306985869 */, 17 },
+  /* 2842 */  { MAD_F(0x04ea0118) /* 0.307129952 */, 17 },
+  /* 2843 */  { MAD_F(0x04ea9832) /* 0.307274051 */, 17 },
+  /* 2844 */  { MAD_F(0x04eb2f50) /* 0.307418168 */, 17 },
+  /* 2845 */  { MAD_F(0x04ebc672) /* 0.307562301 */, 17 },
+  /* 2846 */  { MAD_F(0x04ec5d99) /* 0.307706451 */, 17 },
+  /* 2847 */  { MAD_F(0x04ecf4c5) /* 0.307850618 */, 17 },
+
+  /* 2848 */  { MAD_F(0x04ed8bf5) /* 0.307994802 */, 17 },
+  /* 2849 */  { MAD_F(0x04ee2329) /* 0.308139003 */, 17 },
+  /* 2850 */  { MAD_F(0x04eeba63) /* 0.308283220 */, 17 },
+  /* 2851 */  { MAD_F(0x04ef51a0) /* 0.308427455 */, 17 },
+  /* 2852 */  { MAD_F(0x04efe8e2) /* 0.308571706 */, 17 },
+  /* 2853 */  { MAD_F(0x04f08029) /* 0.308715974 */, 17 },
+  /* 2854 */  { MAD_F(0x04f11774) /* 0.308860260 */, 17 },
+  /* 2855 */  { MAD_F(0x04f1aec4) /* 0.309004561 */, 17 },
+  /* 2856 */  { MAD_F(0x04f24618) /* 0.309148880 */, 17 },
+  /* 2857 */  { MAD_F(0x04f2dd71) /* 0.309293216 */, 17 },
+  /* 2858 */  { MAD_F(0x04f374cf) /* 0.309437568 */, 17 },
+  /* 2859 */  { MAD_F(0x04f40c30) /* 0.309581938 */, 17 },
+  /* 2860 */  { MAD_F(0x04f4a397) /* 0.309726324 */, 17 },
+  /* 2861 */  { MAD_F(0x04f53b02) /* 0.309870727 */, 17 },
+  /* 2862 */  { MAD_F(0x04f5d271) /* 0.310015147 */, 17 },
+  /* 2863 */  { MAD_F(0x04f669e5) /* 0.310159583 */, 17 },
+
+  /* 2864 */  { MAD_F(0x04f7015d) /* 0.310304037 */, 17 },
+  /* 2865 */  { MAD_F(0x04f798da) /* 0.310448507 */, 17 },
+  /* 2866 */  { MAD_F(0x04f8305c) /* 0.310592994 */, 17 },
+  /* 2867 */  { MAD_F(0x04f8c7e2) /* 0.310737498 */, 17 },
+  /* 2868 */  { MAD_F(0x04f95f6c) /* 0.310882018 */, 17 },
+  /* 2869 */  { MAD_F(0x04f9f6fb) /* 0.311026556 */, 17 },
+  /* 2870 */  { MAD_F(0x04fa8e8f) /* 0.311171110 */, 17 },
+  /* 2871 */  { MAD_F(0x04fb2627) /* 0.311315681 */, 17 },
+  /* 2872 */  { MAD_F(0x04fbbdc3) /* 0.311460269 */, 17 },
+  /* 2873 */  { MAD_F(0x04fc5564) /* 0.311604874 */, 17 },
+  /* 2874 */  { MAD_F(0x04fced0a) /* 0.311749495 */, 17 },
+  /* 2875 */  { MAD_F(0x04fd84b4) /* 0.311894133 */, 17 },
+  /* 2876 */  { MAD_F(0x04fe1c62) /* 0.312038788 */, 17 },
+  /* 2877 */  { MAD_F(0x04feb415) /* 0.312183460 */, 17 },
+  /* 2878 */  { MAD_F(0x04ff4bcd) /* 0.312328148 */, 17 },
+  /* 2879 */  { MAD_F(0x04ffe389) /* 0.312472854 */, 17 },
+
+  /* 2880 */  { MAD_F(0x05007b49) /* 0.312617576 */, 17 },
+  /* 2881 */  { MAD_F(0x0501130e) /* 0.312762314 */, 17 },
+  /* 2882 */  { MAD_F(0x0501aad8) /* 0.312907070 */, 17 },
+  /* 2883 */  { MAD_F(0x050242a6) /* 0.313051842 */, 17 },
+  /* 2884 */  { MAD_F(0x0502da78) /* 0.313196631 */, 17 },
+  /* 2885 */  { MAD_F(0x0503724f) /* 0.313341437 */, 17 },
+  /* 2886 */  { MAD_F(0x05040a2b) /* 0.313486259 */, 17 },
+  /* 2887 */  { MAD_F(0x0504a20b) /* 0.313631098 */, 17 },
+  /* 2888 */  { MAD_F(0x050539ef) /* 0.313775954 */, 17 },
+  /* 2889 */  { MAD_F(0x0505d1d8) /* 0.313920827 */, 17 },
+  /* 2890 */  { MAD_F(0x050669c5) /* 0.314065716 */, 17 },
+  /* 2891 */  { MAD_F(0x050701b7) /* 0.314210622 */, 17 },
+  /* 2892 */  { MAD_F(0x050799ae) /* 0.314355545 */, 17 },
+  /* 2893 */  { MAD_F(0x050831a9) /* 0.314500484 */, 17 },
+  /* 2894 */  { MAD_F(0x0508c9a8) /* 0.314645440 */, 17 },
+  /* 2895 */  { MAD_F(0x050961ac) /* 0.314790413 */, 17 },
+
+  /* 2896 */  { MAD_F(0x0509f9b4) /* 0.314935403 */, 17 },
+  /* 2897 */  { MAD_F(0x050a91c1) /* 0.315080409 */, 17 },
+  /* 2898 */  { MAD_F(0x050b29d2) /* 0.315225432 */, 17 },
+  /* 2899 */  { MAD_F(0x050bc1e8) /* 0.315370472 */, 17 },
+  /* 2900 */  { MAD_F(0x050c5a02) /* 0.315515528 */, 17 },
+  /* 2901 */  { MAD_F(0x050cf221) /* 0.315660601 */, 17 },
+  /* 2902 */  { MAD_F(0x050d8a44) /* 0.315805690 */, 17 },
+  /* 2903 */  { MAD_F(0x050e226c) /* 0.315950797 */, 17 },
+  /* 2904 */  { MAD_F(0x050eba98) /* 0.316095920 */, 17 },
+  /* 2905 */  { MAD_F(0x050f52c9) /* 0.316241059 */, 17 },
+  /* 2906 */  { MAD_F(0x050feafe) /* 0.316386216 */, 17 },
+  /* 2907 */  { MAD_F(0x05108337) /* 0.316531388 */, 17 },
+  /* 2908 */  { MAD_F(0x05111b75) /* 0.316676578 */, 17 },
+  /* 2909 */  { MAD_F(0x0511b3b8) /* 0.316821784 */, 17 },
+  /* 2910 */  { MAD_F(0x05124bff) /* 0.316967007 */, 17 },
+  /* 2911 */  { MAD_F(0x0512e44a) /* 0.317112247 */, 17 },
+
+  /* 2912 */  { MAD_F(0x05137c9a) /* 0.317257503 */, 17 },
+  /* 2913 */  { MAD_F(0x051414ee) /* 0.317402775 */, 17 },
+  /* 2914 */  { MAD_F(0x0514ad47) /* 0.317548065 */, 17 },
+  /* 2915 */  { MAD_F(0x051545a5) /* 0.317693371 */, 17 },
+  /* 2916 */  { MAD_F(0x0515de06) /* 0.317838693 */, 17 },
+  /* 2917 */  { MAD_F(0x0516766d) /* 0.317984033 */, 17 },
+  /* 2918 */  { MAD_F(0x05170ed7) /* 0.318129388 */, 17 },
+  /* 2919 */  { MAD_F(0x0517a746) /* 0.318274761 */, 17 },
+  /* 2920 */  { MAD_F(0x05183fba) /* 0.318420150 */, 17 },
+  /* 2921 */  { MAD_F(0x0518d832) /* 0.318565555 */, 17 },
+  /* 2922 */  { MAD_F(0x051970ae) /* 0.318710978 */, 17 },
+  /* 2923 */  { MAD_F(0x051a092f) /* 0.318856416 */, 17 },
+  /* 2924 */  { MAD_F(0x051aa1b5) /* 0.319001872 */, 17 },
+  /* 2925 */  { MAD_F(0x051b3a3f) /* 0.319147344 */, 17 },
+  /* 2926 */  { MAD_F(0x051bd2cd) /* 0.319292832 */, 17 },
+  /* 2927 */  { MAD_F(0x051c6b60) /* 0.319438338 */, 17 },
+
+  /* 2928 */  { MAD_F(0x051d03f7) /* 0.319583859 */, 17 },
+  /* 2929 */  { MAD_F(0x051d9c92) /* 0.319729398 */, 17 },
+  /* 2930 */  { MAD_F(0x051e3532) /* 0.319874952 */, 17 },
+  /* 2931 */  { MAD_F(0x051ecdd7) /* 0.320020524 */, 17 },
+  /* 2932 */  { MAD_F(0x051f6680) /* 0.320166112 */, 17 },
+  /* 2933 */  { MAD_F(0x051fff2d) /* 0.320311716 */, 17 },
+  /* 2934 */  { MAD_F(0x052097df) /* 0.320457337 */, 17 },
+  /* 2935 */  { MAD_F(0x05213095) /* 0.320602975 */, 17 },
+  /* 2936 */  { MAD_F(0x0521c950) /* 0.320748629 */, 17 },
+  /* 2937 */  { MAD_F(0x0522620f) /* 0.320894300 */, 17 },
+  /* 2938 */  { MAD_F(0x0522fad3) /* 0.321039987 */, 17 },
+  /* 2939 */  { MAD_F(0x0523939b) /* 0.321185691 */, 17 },
+  /* 2940 */  { MAD_F(0x05242c68) /* 0.321331411 */, 17 },
+  /* 2941 */  { MAD_F(0x0524c538) /* 0.321477148 */, 17 },
+  /* 2942 */  { MAD_F(0x05255e0e) /* 0.321622901 */, 17 },
+  /* 2943 */  { MAD_F(0x0525f6e8) /* 0.321768671 */, 17 },
+
+  /* 2944 */  { MAD_F(0x05268fc6) /* 0.321914457 */, 17 },
+  /* 2945 */  { MAD_F(0x052728a9) /* 0.322060260 */, 17 },
+  /* 2946 */  { MAD_F(0x0527c190) /* 0.322206079 */, 17 },
+  /* 2947 */  { MAD_F(0x05285a7b) /* 0.322351915 */, 17 },
+  /* 2948 */  { MAD_F(0x0528f36b) /* 0.322497768 */, 17 },
+  /* 2949 */  { MAD_F(0x05298c5f) /* 0.322643636 */, 17 },
+  /* 2950 */  { MAD_F(0x052a2558) /* 0.322789522 */, 17 },
+  /* 2951 */  { MAD_F(0x052abe55) /* 0.322935424 */, 17 },
+  /* 2952 */  { MAD_F(0x052b5757) /* 0.323081342 */, 17 },
+  /* 2953 */  { MAD_F(0x052bf05d) /* 0.323227277 */, 17 },
+  /* 2954 */  { MAD_F(0x052c8968) /* 0.323373228 */, 17 },
+  /* 2955 */  { MAD_F(0x052d2277) /* 0.323519196 */, 17 },
+  /* 2956 */  { MAD_F(0x052dbb8a) /* 0.323665180 */, 17 },
+  /* 2957 */  { MAD_F(0x052e54a2) /* 0.323811180 */, 17 },
+  /* 2958 */  { MAD_F(0x052eedbe) /* 0.323957197 */, 17 },
+  /* 2959 */  { MAD_F(0x052f86de) /* 0.324103231 */, 17 },
+
+  /* 2960 */  { MAD_F(0x05302003) /* 0.324249281 */, 17 },
+  /* 2961 */  { MAD_F(0x0530b92d) /* 0.324395347 */, 17 },
+  /* 2962 */  { MAD_F(0x0531525b) /* 0.324541430 */, 17 },
+  /* 2963 */  { MAD_F(0x0531eb8d) /* 0.324687530 */, 17 },
+  /* 2964 */  { MAD_F(0x053284c4) /* 0.324833646 */, 17 },
+  /* 2965 */  { MAD_F(0x05331dff) /* 0.324979778 */, 17 },
+  /* 2966 */  { MAD_F(0x0533b73e) /* 0.325125926 */, 17 },
+  /* 2967 */  { MAD_F(0x05345082) /* 0.325272091 */, 17 },
+  /* 2968 */  { MAD_F(0x0534e9ca) /* 0.325418273 */, 17 },
+  /* 2969 */  { MAD_F(0x05358317) /* 0.325564471 */, 17 },
+  /* 2970 */  { MAD_F(0x05361c68) /* 0.325710685 */, 17 },
+  /* 2971 */  { MAD_F(0x0536b5be) /* 0.325856916 */, 17 },
+  /* 2972 */  { MAD_F(0x05374f17) /* 0.326003163 */, 17 },
+  /* 2973 */  { MAD_F(0x0537e876) /* 0.326149427 */, 17 },
+  /* 2974 */  { MAD_F(0x053881d9) /* 0.326295707 */, 17 },
+  /* 2975 */  { MAD_F(0x05391b40) /* 0.326442003 */, 17 },
+
+  /* 2976 */  { MAD_F(0x0539b4ab) /* 0.326588316 */, 17 },
+  /* 2977 */  { MAD_F(0x053a4e1b) /* 0.326734645 */, 17 },
+  /* 2978 */  { MAD_F(0x053ae78f) /* 0.326880990 */, 17 },
+  /* 2979 */  { MAD_F(0x053b8108) /* 0.327027352 */, 17 },
+  /* 2980 */  { MAD_F(0x053c1a85) /* 0.327173730 */, 17 },
+  /* 2981 */  { MAD_F(0x053cb407) /* 0.327320125 */, 17 },
+  /* 2982 */  { MAD_F(0x053d4d8d) /* 0.327466536 */, 17 },
+  /* 2983 */  { MAD_F(0x053de717) /* 0.327612963 */, 17 },
+  /* 2984 */  { MAD_F(0x053e80a6) /* 0.327759407 */, 17 },
+  /* 2985 */  { MAD_F(0x053f1a39) /* 0.327905867 */, 17 },
+  /* 2986 */  { MAD_F(0x053fb3d0) /* 0.328052344 */, 17 },
+  /* 2987 */  { MAD_F(0x05404d6c) /* 0.328198837 */, 17 },
+  /* 2988 */  { MAD_F(0x0540e70c) /* 0.328345346 */, 17 },
+  /* 2989 */  { MAD_F(0x054180b1) /* 0.328491871 */, 17 },
+  /* 2990 */  { MAD_F(0x05421a5a) /* 0.328638413 */, 17 },
+  /* 2991 */  { MAD_F(0x0542b407) /* 0.328784971 */, 17 },
+
+  /* 2992 */  { MAD_F(0x05434db9) /* 0.328931546 */, 17 },
+  /* 2993 */  { MAD_F(0x0543e76f) /* 0.329078137 */, 17 },
+  /* 2994 */  { MAD_F(0x0544812a) /* 0.329224744 */, 17 },
+  /* 2995 */  { MAD_F(0x05451ae9) /* 0.329371367 */, 17 },
+  /* 2996 */  { MAD_F(0x0545b4ac) /* 0.329518007 */, 17 },
+  /* 2997 */  { MAD_F(0x05464e74) /* 0.329664663 */, 17 },
+  /* 2998 */  { MAD_F(0x0546e840) /* 0.329811336 */, 17 },
+  /* 2999 */  { MAD_F(0x05478211) /* 0.329958024 */, 17 },
+  /* 3000 */  { MAD_F(0x05481be5) /* 0.330104730 */, 17 },
+  /* 3001 */  { MAD_F(0x0548b5bf) /* 0.330251451 */, 17 },
+  /* 3002 */  { MAD_F(0x05494f9c) /* 0.330398189 */, 17 },
+  /* 3003 */  { MAD_F(0x0549e97e) /* 0.330544943 */, 17 },
+  /* 3004 */  { MAD_F(0x054a8364) /* 0.330691713 */, 17 },
+  /* 3005 */  { MAD_F(0x054b1d4f) /* 0.330838499 */, 17 },
+  /* 3006 */  { MAD_F(0x054bb73e) /* 0.330985302 */, 17 },
+  /* 3007 */  { MAD_F(0x054c5132) /* 0.331132121 */, 17 },
+
+  /* 3008 */  { MAD_F(0x054ceb2a) /* 0.331278957 */, 17 },
+  /* 3009 */  { MAD_F(0x054d8526) /* 0.331425808 */, 17 },
+  /* 3010 */  { MAD_F(0x054e1f26) /* 0.331572676 */, 17 },
+  /* 3011 */  { MAD_F(0x054eb92b) /* 0.331719560 */, 17 },
+  /* 3012 */  { MAD_F(0x054f5334) /* 0.331866461 */, 17 },
+  /* 3013 */  { MAD_F(0x054fed42) /* 0.332013377 */, 17 },
+  /* 3014 */  { MAD_F(0x05508754) /* 0.332160310 */, 17 },
+  /* 3015 */  { MAD_F(0x0551216b) /* 0.332307260 */, 17 },
+  /* 3016 */  { MAD_F(0x0551bb85) /* 0.332454225 */, 17 },
+  /* 3017 */  { MAD_F(0x055255a4) /* 0.332601207 */, 17 },
+  /* 3018 */  { MAD_F(0x0552efc8) /* 0.332748205 */, 17 },
+  /* 3019 */  { MAD_F(0x055389f0) /* 0.332895219 */, 17 },
+  /* 3020 */  { MAD_F(0x0554241c) /* 0.333042249 */, 17 },
+  /* 3021 */  { MAD_F(0x0554be4c) /* 0.333189296 */, 17 },
+  /* 3022 */  { MAD_F(0x05555881) /* 0.333336359 */, 17 },
+  /* 3023 */  { MAD_F(0x0555f2ba) /* 0.333483438 */, 17 },
+
+  /* 3024 */  { MAD_F(0x05568cf8) /* 0.333630533 */, 17 },
+  /* 3025 */  { MAD_F(0x0557273a) /* 0.333777645 */, 17 },
+  /* 3026 */  { MAD_F(0x0557c180) /* 0.333924772 */, 17 },
+  /* 3027 */  { MAD_F(0x05585bcb) /* 0.334071916 */, 17 },
+  /* 3028 */  { MAD_F(0x0558f61a) /* 0.334219076 */, 17 },
+  /* 3029 */  { MAD_F(0x0559906d) /* 0.334366253 */, 17 },
+  /* 3030 */  { MAD_F(0x055a2ac5) /* 0.334513445 */, 17 },
+  /* 3031 */  { MAD_F(0x055ac521) /* 0.334660654 */, 17 },
+  /* 3032 */  { MAD_F(0x055b5f81) /* 0.334807879 */, 17 },
+  /* 3033 */  { MAD_F(0x055bf9e6) /* 0.334955120 */, 17 },
+  /* 3034 */  { MAD_F(0x055c944f) /* 0.335102377 */, 17 },
+  /* 3035 */  { MAD_F(0x055d2ebd) /* 0.335249651 */, 17 },
+  /* 3036 */  { MAD_F(0x055dc92e) /* 0.335396941 */, 17 },
+  /* 3037 */  { MAD_F(0x055e63a5) /* 0.335544246 */, 17 },
+  /* 3038 */  { MAD_F(0x055efe1f) /* 0.335691568 */, 17 },
+  /* 3039 */  { MAD_F(0x055f989e) /* 0.335838906 */, 17 },
+
+  /* 3040 */  { MAD_F(0x05603321) /* 0.335986261 */, 17 },
+  /* 3041 */  { MAD_F(0x0560cda8) /* 0.336133631 */, 17 },
+  /* 3042 */  { MAD_F(0x05616834) /* 0.336281018 */, 17 },
+  /* 3043 */  { MAD_F(0x056202c4) /* 0.336428421 */, 17 },
+  /* 3044 */  { MAD_F(0x05629d59) /* 0.336575840 */, 17 },
+  /* 3045 */  { MAD_F(0x056337f2) /* 0.336723275 */, 17 },
+  /* 3046 */  { MAD_F(0x0563d28f) /* 0.336870726 */, 17 },
+  /* 3047 */  { MAD_F(0x05646d30) /* 0.337018193 */, 17 },
+  /* 3048 */  { MAD_F(0x056507d6) /* 0.337165677 */, 17 },
+  /* 3049 */  { MAD_F(0x0565a280) /* 0.337313176 */, 17 },
+  /* 3050 */  { MAD_F(0x05663d2f) /* 0.337460692 */, 17 },
+  /* 3051 */  { MAD_F(0x0566d7e1) /* 0.337608224 */, 17 },
+  /* 3052 */  { MAD_F(0x05677298) /* 0.337755772 */, 17 },
+  /* 3053 */  { MAD_F(0x05680d54) /* 0.337903336 */, 17 },
+  /* 3054 */  { MAD_F(0x0568a814) /* 0.338050916 */, 17 },
+  /* 3055 */  { MAD_F(0x056942d8) /* 0.338198513 */, 17 },
+
+  /* 3056 */  { MAD_F(0x0569dda0) /* 0.338346125 */, 17 },
+  /* 3057 */  { MAD_F(0x056a786d) /* 0.338493753 */, 17 },
+  /* 3058 */  { MAD_F(0x056b133e) /* 0.338641398 */, 17 },
+  /* 3059 */  { MAD_F(0x056bae13) /* 0.338789059 */, 17 },
+  /* 3060 */  { MAD_F(0x056c48ed) /* 0.338936736 */, 17 },
+  /* 3061 */  { MAD_F(0x056ce3cb) /* 0.339084429 */, 17 },
+  /* 3062 */  { MAD_F(0x056d7ead) /* 0.339232138 */, 17 },
+  /* 3063 */  { MAD_F(0x056e1994) /* 0.339379863 */, 17 },
+  /* 3064 */  { MAD_F(0x056eb47f) /* 0.339527604 */, 17 },
+  /* 3065 */  { MAD_F(0x056f4f6e) /* 0.339675361 */, 17 },
+  /* 3066 */  { MAD_F(0x056fea62) /* 0.339823134 */, 17 },
+  /* 3067 */  { MAD_F(0x0570855a) /* 0.339970924 */, 17 },
+  /* 3068 */  { MAD_F(0x05712056) /* 0.340118729 */, 17 },
+  /* 3069 */  { MAD_F(0x0571bb56) /* 0.340266550 */, 17 },
+  /* 3070 */  { MAD_F(0x0572565b) /* 0.340414388 */, 17 },
+  /* 3071 */  { MAD_F(0x0572f164) /* 0.340562242 */, 17 },
+
+  /* 3072 */  { MAD_F(0x05738c72) /* 0.340710111 */, 17 },
+  /* 3073 */  { MAD_F(0x05742784) /* 0.340857997 */, 17 },
+  /* 3074 */  { MAD_F(0x0574c29a) /* 0.341005899 */, 17 },
+  /* 3075 */  { MAD_F(0x05755db4) /* 0.341153816 */, 17 },
+  /* 3076 */  { MAD_F(0x0575f8d3) /* 0.341301750 */, 17 },
+  /* 3077 */  { MAD_F(0x057693f6) /* 0.341449700 */, 17 },
+  /* 3078 */  { MAD_F(0x05772f1d) /* 0.341597666 */, 17 },
+  /* 3079 */  { MAD_F(0x0577ca49) /* 0.341745648 */, 17 },
+  /* 3080 */  { MAD_F(0x05786578) /* 0.341893646 */, 17 },
+  /* 3081 */  { MAD_F(0x057900ad) /* 0.342041659 */, 17 },
+  /* 3082 */  { MAD_F(0x05799be5) /* 0.342189689 */, 17 },
+  /* 3083 */  { MAD_F(0x057a3722) /* 0.342337735 */, 17 },
+  /* 3084 */  { MAD_F(0x057ad263) /* 0.342485797 */, 17 },
+  /* 3085 */  { MAD_F(0x057b6da8) /* 0.342633875 */, 17 },
+  /* 3086 */  { MAD_F(0x057c08f2) /* 0.342781969 */, 17 },
+  /* 3087 */  { MAD_F(0x057ca440) /* 0.342930079 */, 17 },
+
+  /* 3088 */  { MAD_F(0x057d3f92) /* 0.343078205 */, 17 },
+  /* 3089 */  { MAD_F(0x057ddae9) /* 0.343226347 */, 17 },
+  /* 3090 */  { MAD_F(0x057e7644) /* 0.343374505 */, 17 },
+  /* 3091 */  { MAD_F(0x057f11a3) /* 0.343522679 */, 17 },
+  /* 3092 */  { MAD_F(0x057fad06) /* 0.343670869 */, 17 },
+  /* 3093 */  { MAD_F(0x0580486e) /* 0.343819075 */, 17 },
+  /* 3094 */  { MAD_F(0x0580e3da) /* 0.343967296 */, 17 },
+  /* 3095 */  { MAD_F(0x05817f4a) /* 0.344115534 */, 17 },
+  /* 3096 */  { MAD_F(0x05821abf) /* 0.344263788 */, 17 },
+  /* 3097 */  { MAD_F(0x0582b638) /* 0.344412058 */, 17 },
+  /* 3098 */  { MAD_F(0x058351b5) /* 0.344560343 */, 17 },
+  /* 3099 */  { MAD_F(0x0583ed36) /* 0.344708645 */, 17 },
+  /* 3100 */  { MAD_F(0x058488bc) /* 0.344856963 */, 17 },
+  /* 3101 */  { MAD_F(0x05852446) /* 0.345005296 */, 17 },
+  /* 3102 */  { MAD_F(0x0585bfd4) /* 0.345153646 */, 17 },
+  /* 3103 */  { MAD_F(0x05865b67) /* 0.345302011 */, 17 },
+
+  /* 3104 */  { MAD_F(0x0586f6fd) /* 0.345450393 */, 17 },
+  /* 3105 */  { MAD_F(0x05879298) /* 0.345598790 */, 17 },
+  /* 3106 */  { MAD_F(0x05882e38) /* 0.345747203 */, 17 },
+  /* 3107 */  { MAD_F(0x0588c9dc) /* 0.345895632 */, 17 },
+  /* 3108 */  { MAD_F(0x05896583) /* 0.346044077 */, 17 },
+  /* 3109 */  { MAD_F(0x058a0130) /* 0.346192538 */, 17 },
+  /* 3110 */  { MAD_F(0x058a9ce0) /* 0.346341015 */, 17 },
+  /* 3111 */  { MAD_F(0x058b3895) /* 0.346489508 */, 17 },
+  /* 3112 */  { MAD_F(0x058bd44e) /* 0.346638017 */, 17 },
+  /* 3113 */  { MAD_F(0x058c700b) /* 0.346786542 */, 17 },
+  /* 3114 */  { MAD_F(0x058d0bcd) /* 0.346935082 */, 17 },
+  /* 3115 */  { MAD_F(0x058da793) /* 0.347083639 */, 17 },
+  /* 3116 */  { MAD_F(0x058e435d) /* 0.347232211 */, 17 },
+  /* 3117 */  { MAD_F(0x058edf2b) /* 0.347380799 */, 17 },
+  /* 3118 */  { MAD_F(0x058f7afe) /* 0.347529403 */, 17 },
+  /* 3119 */  { MAD_F(0x059016d5) /* 0.347678023 */, 17 },
+
+  /* 3120 */  { MAD_F(0x0590b2b0) /* 0.347826659 */, 17 },
+  /* 3121 */  { MAD_F(0x05914e8f) /* 0.347975311 */, 17 },
+  /* 3122 */  { MAD_F(0x0591ea73) /* 0.348123979 */, 17 },
+  /* 3123 */  { MAD_F(0x0592865b) /* 0.348272662 */, 17 },
+  /* 3124 */  { MAD_F(0x05932247) /* 0.348421362 */, 17 },
+  /* 3125 */  { MAD_F(0x0593be37) /* 0.348570077 */, 17 },
+  /* 3126 */  { MAD_F(0x05945a2c) /* 0.348718808 */, 17 },
+  /* 3127 */  { MAD_F(0x0594f625) /* 0.348867555 */, 17 },
+  /* 3128 */  { MAD_F(0x05959222) /* 0.349016318 */, 17 },
+  /* 3129 */  { MAD_F(0x05962e24) /* 0.349165097 */, 17 },
+  /* 3130 */  { MAD_F(0x0596ca2a) /* 0.349313892 */, 17 },
+  /* 3131 */  { MAD_F(0x05976634) /* 0.349462702 */, 17 },
+  /* 3132 */  { MAD_F(0x05980242) /* 0.349611528 */, 17 },
+  /* 3133 */  { MAD_F(0x05989e54) /* 0.349760370 */, 17 },
+  /* 3134 */  { MAD_F(0x05993a6b) /* 0.349909228 */, 17 },
+  /* 3135 */  { MAD_F(0x0599d686) /* 0.350058102 */, 17 },
+
+  /* 3136 */  { MAD_F(0x059a72a5) /* 0.350206992 */, 17 },
+  /* 3137 */  { MAD_F(0x059b0ec9) /* 0.350355897 */, 17 },
+  /* 3138 */  { MAD_F(0x059baaf1) /* 0.350504818 */, 17 },
+  /* 3139 */  { MAD_F(0x059c471d) /* 0.350653756 */, 17 },
+  /* 3140 */  { MAD_F(0x059ce34d) /* 0.350802708 */, 17 },
+  /* 3141 */  { MAD_F(0x059d7f81) /* 0.350951677 */, 17 },
+  /* 3142 */  { MAD_F(0x059e1bba) /* 0.351100662 */, 17 },
+  /* 3143 */  { MAD_F(0x059eb7f7) /* 0.351249662 */, 17 },
+  /* 3144 */  { MAD_F(0x059f5438) /* 0.351398678 */, 17 },
+  /* 3145 */  { MAD_F(0x059ff07e) /* 0.351547710 */, 17 },
+  /* 3146 */  { MAD_F(0x05a08cc7) /* 0.351696758 */, 17 },
+  /* 3147 */  { MAD_F(0x05a12915) /* 0.351845821 */, 17 },
+  /* 3148 */  { MAD_F(0x05a1c567) /* 0.351994901 */, 17 },
+  /* 3149 */  { MAD_F(0x05a261be) /* 0.352143996 */, 17 },
+  /* 3150 */  { MAD_F(0x05a2fe18) /* 0.352293107 */, 17 },
+  /* 3151 */  { MAD_F(0x05a39a77) /* 0.352442233 */, 17 },
+
+  /* 3152 */  { MAD_F(0x05a436da) /* 0.352591376 */, 17 },
+  /* 3153 */  { MAD_F(0x05a4d342) /* 0.352740534 */, 17 },
+  /* 3154 */  { MAD_F(0x05a56fad) /* 0.352889708 */, 17 },
+  /* 3155 */  { MAD_F(0x05a60c1d) /* 0.353038898 */, 17 },
+  /* 3156 */  { MAD_F(0x05a6a891) /* 0.353188103 */, 17 },
+  /* 3157 */  { MAD_F(0x05a7450a) /* 0.353337325 */, 17 },
+  /* 3158 */  { MAD_F(0x05a7e186) /* 0.353486562 */, 17 },
+  /* 3159 */  { MAD_F(0x05a87e07) /* 0.353635814 */, 17 },
+  /* 3160 */  { MAD_F(0x05a91a8c) /* 0.353785083 */, 17 },
+  /* 3161 */  { MAD_F(0x05a9b715) /* 0.353934367 */, 17 },
+  /* 3162 */  { MAD_F(0x05aa53a2) /* 0.354083667 */, 17 },
+  /* 3163 */  { MAD_F(0x05aaf034) /* 0.354232983 */, 17 },
+  /* 3164 */  { MAD_F(0x05ab8cca) /* 0.354382314 */, 17 },
+  /* 3165 */  { MAD_F(0x05ac2964) /* 0.354531662 */, 17 },
+  /* 3166 */  { MAD_F(0x05acc602) /* 0.354681025 */, 17 },
+  /* 3167 */  { MAD_F(0x05ad62a5) /* 0.354830403 */, 17 },
+
+  /* 3168 */  { MAD_F(0x05adff4c) /* 0.354979798 */, 17 },
+  /* 3169 */  { MAD_F(0x05ae9bf7) /* 0.355129208 */, 17 },
+  /* 3170 */  { MAD_F(0x05af38a6) /* 0.355278634 */, 17 },
+  /* 3171 */  { MAD_F(0x05afd559) /* 0.355428075 */, 17 },
+  /* 3172 */  { MAD_F(0x05b07211) /* 0.355577533 */, 17 },
+  /* 3173 */  { MAD_F(0x05b10ecd) /* 0.355727006 */, 17 },
+  /* 3174 */  { MAD_F(0x05b1ab8d) /* 0.355876494 */, 17 },
+  /* 3175 */  { MAD_F(0x05b24851) /* 0.356025999 */, 17 },
+  /* 3176 */  { MAD_F(0x05b2e51a) /* 0.356175519 */, 17 },
+  /* 3177 */  { MAD_F(0x05b381e6) /* 0.356325054 */, 17 },
+  /* 3178 */  { MAD_F(0x05b41eb7) /* 0.356474606 */, 17 },
+  /* 3179 */  { MAD_F(0x05b4bb8c) /* 0.356624173 */, 17 },
+  /* 3180 */  { MAD_F(0x05b55866) /* 0.356773756 */, 17 },
+  /* 3181 */  { MAD_F(0x05b5f543) /* 0.356923354 */, 17 },
+  /* 3182 */  { MAD_F(0x05b69225) /* 0.357072969 */, 17 },
+  /* 3183 */  { MAD_F(0x05b72f0b) /* 0.357222598 */, 17 },
+
+  /* 3184 */  { MAD_F(0x05b7cbf5) /* 0.357372244 */, 17 },
+  /* 3185 */  { MAD_F(0x05b868e3) /* 0.357521905 */, 17 },
+  /* 3186 */  { MAD_F(0x05b905d6) /* 0.357671582 */, 17 },
+  /* 3187 */  { MAD_F(0x05b9a2cd) /* 0.357821275 */, 17 },
+  /* 3188 */  { MAD_F(0x05ba3fc8) /* 0.357970983 */, 17 },
+  /* 3189 */  { MAD_F(0x05badcc7) /* 0.358120707 */, 17 },
+  /* 3190 */  { MAD_F(0x05bb79ca) /* 0.358270446 */, 17 },
+  /* 3191 */  { MAD_F(0x05bc16d2) /* 0.358420201 */, 17 },
+  /* 3192 */  { MAD_F(0x05bcb3de) /* 0.358569972 */, 17 },
+  /* 3193 */  { MAD_F(0x05bd50ee) /* 0.358719758 */, 17 },
+  /* 3194 */  { MAD_F(0x05bdee02) /* 0.358869560 */, 17 },
+  /* 3195 */  { MAD_F(0x05be8b1a) /* 0.359019378 */, 17 },
+  /* 3196 */  { MAD_F(0x05bf2837) /* 0.359169211 */, 17 },
+  /* 3197 */  { MAD_F(0x05bfc558) /* 0.359319060 */, 17 },
+  /* 3198 */  { MAD_F(0x05c0627d) /* 0.359468925 */, 17 },
+  /* 3199 */  { MAD_F(0x05c0ffa6) /* 0.359618805 */, 17 },
+
+  /* 3200 */  { MAD_F(0x05c19cd3) /* 0.359768701 */, 17 },
+  /* 3201 */  { MAD_F(0x05c23a05) /* 0.359918612 */, 17 },
+  /* 3202 */  { MAD_F(0x05c2d73a) /* 0.360068540 */, 17 },
+  /* 3203 */  { MAD_F(0x05c37474) /* 0.360218482 */, 17 },
+  /* 3204 */  { MAD_F(0x05c411b2) /* 0.360368440 */, 17 },
+  /* 3205 */  { MAD_F(0x05c4aef5) /* 0.360518414 */, 17 },
+  /* 3206 */  { MAD_F(0x05c54c3b) /* 0.360668404 */, 17 },
+  /* 3207 */  { MAD_F(0x05c5e986) /* 0.360818409 */, 17 },
+  /* 3208 */  { MAD_F(0x05c686d5) /* 0.360968429 */, 17 },
+  /* 3209 */  { MAD_F(0x05c72428) /* 0.361118466 */, 17 },
+  /* 3210 */  { MAD_F(0x05c7c17f) /* 0.361268517 */, 17 },
+  /* 3211 */  { MAD_F(0x05c85eda) /* 0.361418585 */, 17 },
+  /* 3212 */  { MAD_F(0x05c8fc3a) /* 0.361568668 */, 17 },
+  /* 3213 */  { MAD_F(0x05c9999e) /* 0.361718766 */, 17 },
+  /* 3214 */  { MAD_F(0x05ca3706) /* 0.361868881 */, 17 },
+  /* 3215 */  { MAD_F(0x05cad472) /* 0.362019010 */, 17 },
+
+  /* 3216 */  { MAD_F(0x05cb71e2) /* 0.362169156 */, 17 },
+  /* 3217 */  { MAD_F(0x05cc0f57) /* 0.362319316 */, 17 },
+  /* 3218 */  { MAD_F(0x05ccaccf) /* 0.362469493 */, 17 },
+  /* 3219 */  { MAD_F(0x05cd4a4c) /* 0.362619685 */, 17 },
+  /* 3220 */  { MAD_F(0x05cde7cd) /* 0.362769892 */, 17 },
+  /* 3221 */  { MAD_F(0x05ce8552) /* 0.362920115 */, 17 },
+  /* 3222 */  { MAD_F(0x05cf22dc) /* 0.363070354 */, 17 },
+  /* 3223 */  { MAD_F(0x05cfc069) /* 0.363220608 */, 17 },
+  /* 3224 */  { MAD_F(0x05d05dfb) /* 0.363370878 */, 17 },
+  /* 3225 */  { MAD_F(0x05d0fb91) /* 0.363521163 */, 17 },
+  /* 3226 */  { MAD_F(0x05d1992b) /* 0.363671464 */, 17 },
+  /* 3227 */  { MAD_F(0x05d236c9) /* 0.363821780 */, 17 },
+  /* 3228 */  { MAD_F(0x05d2d46c) /* 0.363972112 */, 17 },
+  /* 3229 */  { MAD_F(0x05d37212) /* 0.364122459 */, 17 },
+  /* 3230 */  { MAD_F(0x05d40fbd) /* 0.364272822 */, 17 },
+  /* 3231 */  { MAD_F(0x05d4ad6c) /* 0.364423200 */, 17 },
+
+  /* 3232 */  { MAD_F(0x05d54b1f) /* 0.364573594 */, 17 },
+  /* 3233 */  { MAD_F(0x05d5e8d6) /* 0.364724004 */, 17 },
+  /* 3234 */  { MAD_F(0x05d68691) /* 0.364874429 */, 17 },
+  /* 3235 */  { MAD_F(0x05d72451) /* 0.365024869 */, 17 },
+  /* 3236 */  { MAD_F(0x05d7c215) /* 0.365175325 */, 17 },
+  /* 3237 */  { MAD_F(0x05d85fdc) /* 0.365325796 */, 17 },
+  /* 3238 */  { MAD_F(0x05d8fda8) /* 0.365476283 */, 17 },
+  /* 3239 */  { MAD_F(0x05d99b79) /* 0.365626786 */, 17 },
+  /* 3240 */  { MAD_F(0x05da394d) /* 0.365777304 */, 17 },
+  /* 3241 */  { MAD_F(0x05dad726) /* 0.365927837 */, 17 },
+  /* 3242 */  { MAD_F(0x05db7502) /* 0.366078386 */, 17 },
+  /* 3243 */  { MAD_F(0x05dc12e3) /* 0.366228950 */, 17 },
+  /* 3244 */  { MAD_F(0x05dcb0c8) /* 0.366379530 */, 17 },
+  /* 3245 */  { MAD_F(0x05dd4eb1) /* 0.366530125 */, 17 },
+  /* 3246 */  { MAD_F(0x05ddec9e) /* 0.366680736 */, 17 },
+  /* 3247 */  { MAD_F(0x05de8a90) /* 0.366831362 */, 17 },
+
+  /* 3248 */  { MAD_F(0x05df2885) /* 0.366982004 */, 17 },
+  /* 3249 */  { MAD_F(0x05dfc67f) /* 0.367132661 */, 17 },
+  /* 3250 */  { MAD_F(0x05e0647d) /* 0.367283334 */, 17 },
+  /* 3251 */  { MAD_F(0x05e1027f) /* 0.367434022 */, 17 },
+  /* 3252 */  { MAD_F(0x05e1a085) /* 0.367584725 */, 17 },
+  /* 3253 */  { MAD_F(0x05e23e8f) /* 0.367735444 */, 17 },
+  /* 3254 */  { MAD_F(0x05e2dc9e) /* 0.367886179 */, 17 },
+  /* 3255 */  { MAD_F(0x05e37ab0) /* 0.368036929 */, 17 },
+  /* 3256 */  { MAD_F(0x05e418c7) /* 0.368187694 */, 17 },
+  /* 3257 */  { MAD_F(0x05e4b6e2) /* 0.368338475 */, 17 },
+  /* 3258 */  { MAD_F(0x05e55501) /* 0.368489271 */, 17 },
+  /* 3259 */  { MAD_F(0x05e5f324) /* 0.368640082 */, 17 },
+  /* 3260 */  { MAD_F(0x05e6914c) /* 0.368790909 */, 17 },
+  /* 3261 */  { MAD_F(0x05e72f77) /* 0.368941752 */, 17 },
+  /* 3262 */  { MAD_F(0x05e7cda7) /* 0.369092610 */, 17 },
+  /* 3263 */  { MAD_F(0x05e86bda) /* 0.369243483 */, 17 },
+
+  /* 3264 */  { MAD_F(0x05e90a12) /* 0.369394372 */, 17 },
+  /* 3265 */  { MAD_F(0x05e9a84e) /* 0.369545276 */, 17 },
+  /* 3266 */  { MAD_F(0x05ea468e) /* 0.369696195 */, 17 },
+  /* 3267 */  { MAD_F(0x05eae4d3) /* 0.369847130 */, 17 },
+  /* 3268 */  { MAD_F(0x05eb831b) /* 0.369998080 */, 17 },
+  /* 3269 */  { MAD_F(0x05ec2168) /* 0.370149046 */, 17 },
+  /* 3270 */  { MAD_F(0x05ecbfb8) /* 0.370300027 */, 17 },
+  /* 3271 */  { MAD_F(0x05ed5e0d) /* 0.370451024 */, 17 },
+  /* 3272 */  { MAD_F(0x05edfc66) /* 0.370602036 */, 17 },
+  /* 3273 */  { MAD_F(0x05ee9ac3) /* 0.370753063 */, 17 },
+  /* 3274 */  { MAD_F(0x05ef3924) /* 0.370904105 */, 17 },
+  /* 3275 */  { MAD_F(0x05efd78a) /* 0.371055163 */, 17 },
+  /* 3276 */  { MAD_F(0x05f075f3) /* 0.371206237 */, 17 },
+  /* 3277 */  { MAD_F(0x05f11461) /* 0.371357326 */, 17 },
+  /* 3278 */  { MAD_F(0x05f1b2d3) /* 0.371508430 */, 17 },
+  /* 3279 */  { MAD_F(0x05f25148) /* 0.371659549 */, 17 },
+
+  /* 3280 */  { MAD_F(0x05f2efc2) /* 0.371810684 */, 17 },
+  /* 3281 */  { MAD_F(0x05f38e40) /* 0.371961834 */, 17 },
+  /* 3282 */  { MAD_F(0x05f42cc3) /* 0.372113000 */, 17 },
+  /* 3283 */  { MAD_F(0x05f4cb49) /* 0.372264181 */, 17 },
+  /* 3284 */  { MAD_F(0x05f569d3) /* 0.372415377 */, 17 },
+  /* 3285 */  { MAD_F(0x05f60862) /* 0.372566589 */, 17 },
+  /* 3286 */  { MAD_F(0x05f6a6f5) /* 0.372717816 */, 17 },
+  /* 3287 */  { MAD_F(0x05f7458b) /* 0.372869058 */, 17 },
+  /* 3288 */  { MAD_F(0x05f7e426) /* 0.373020316 */, 17 },
+  /* 3289 */  { MAD_F(0x05f882c5) /* 0.373171589 */, 17 },
+  /* 3290 */  { MAD_F(0x05f92169) /* 0.373322877 */, 17 },
+  /* 3291 */  { MAD_F(0x05f9c010) /* 0.373474181 */, 17 },
+  /* 3292 */  { MAD_F(0x05fa5ebb) /* 0.373625500 */, 17 },
+  /* 3293 */  { MAD_F(0x05fafd6b) /* 0.373776834 */, 17 },
+  /* 3294 */  { MAD_F(0x05fb9c1e) /* 0.373928184 */, 17 },
+  /* 3295 */  { MAD_F(0x05fc3ad6) /* 0.374079549 */, 17 },
+
+  /* 3296 */  { MAD_F(0x05fcd992) /* 0.374230929 */, 17 },
+  /* 3297 */  { MAD_F(0x05fd7852) /* 0.374382325 */, 17 },
+  /* 3298 */  { MAD_F(0x05fe1716) /* 0.374533735 */, 17 },
+  /* 3299 */  { MAD_F(0x05feb5de) /* 0.374685162 */, 17 },
+  /* 3300 */  { MAD_F(0x05ff54aa) /* 0.374836603 */, 17 },
+  /* 3301 */  { MAD_F(0x05fff37b) /* 0.374988060 */, 17 },
+  /* 3302 */  { MAD_F(0x0600924f) /* 0.375139532 */, 17 },
+  /* 3303 */  { MAD_F(0x06013128) /* 0.375291019 */, 17 },
+  /* 3304 */  { MAD_F(0x0601d004) /* 0.375442522 */, 17 },
+  /* 3305 */  { MAD_F(0x06026ee5) /* 0.375594040 */, 17 },
+  /* 3306 */  { MAD_F(0x06030dca) /* 0.375745573 */, 17 },
+  /* 3307 */  { MAD_F(0x0603acb3) /* 0.375897122 */, 17 },
+  /* 3308 */  { MAD_F(0x06044ba0) /* 0.376048685 */, 17 },
+  /* 3309 */  { MAD_F(0x0604ea91) /* 0.376200265 */, 17 },
+  /* 3310 */  { MAD_F(0x06058987) /* 0.376351859 */, 17 },
+  /* 3311 */  { MAD_F(0x06062880) /* 0.376503468 */, 17 },
+
+  /* 3312 */  { MAD_F(0x0606c77d) /* 0.376655093 */, 17 },
+  /* 3313 */  { MAD_F(0x0607667f) /* 0.376806733 */, 17 },
+  /* 3314 */  { MAD_F(0x06080585) /* 0.376958389 */, 17 },
+  /* 3315 */  { MAD_F(0x0608a48f) /* 0.377110059 */, 17 },
+  /* 3316 */  { MAD_F(0x0609439c) /* 0.377261745 */, 17 },
+  /* 3317 */  { MAD_F(0x0609e2ae) /* 0.377413446 */, 17 },
+  /* 3318 */  { MAD_F(0x060a81c4) /* 0.377565163 */, 17 },
+  /* 3319 */  { MAD_F(0x060b20df) /* 0.377716894 */, 17 },
+  /* 3320 */  { MAD_F(0x060bbffd) /* 0.377868641 */, 17 },
+  /* 3321 */  { MAD_F(0x060c5f1f) /* 0.378020403 */, 17 },
+  /* 3322 */  { MAD_F(0x060cfe46) /* 0.378172181 */, 17 },
+  /* 3323 */  { MAD_F(0x060d9d70) /* 0.378323973 */, 17 },
+  /* 3324 */  { MAD_F(0x060e3c9f) /* 0.378475781 */, 17 },
+  /* 3325 */  { MAD_F(0x060edbd1) /* 0.378627604 */, 17 },
+  /* 3326 */  { MAD_F(0x060f7b08) /* 0.378779442 */, 17 },
+  /* 3327 */  { MAD_F(0x06101a43) /* 0.378931296 */, 17 },
+
+  /* 3328 */  { MAD_F(0x0610b982) /* 0.379083164 */, 17 },
+  /* 3329 */  { MAD_F(0x061158c5) /* 0.379235048 */, 17 },
+  /* 3330 */  { MAD_F(0x0611f80c) /* 0.379386947 */, 17 },
+  /* 3331 */  { MAD_F(0x06129757) /* 0.379538862 */, 17 },
+  /* 3332 */  { MAD_F(0x061336a6) /* 0.379690791 */, 17 },
+  /* 3333 */  { MAD_F(0x0613d5fa) /* 0.379842736 */, 17 },
+  /* 3334 */  { MAD_F(0x06147551) /* 0.379994696 */, 17 },
+  /* 3335 */  { MAD_F(0x061514ad) /* 0.380146671 */, 17 },
+  /* 3336 */  { MAD_F(0x0615b40c) /* 0.380298661 */, 17 },
+  /* 3337 */  { MAD_F(0x06165370) /* 0.380450666 */, 17 },
+  /* 3338 */  { MAD_F(0x0616f2d8) /* 0.380602687 */, 17 },
+  /* 3339 */  { MAD_F(0x06179243) /* 0.380754723 */, 17 },
+  /* 3340 */  { MAD_F(0x061831b3) /* 0.380906774 */, 17 },
+  /* 3341 */  { MAD_F(0x0618d127) /* 0.381058840 */, 17 },
+  /* 3342 */  { MAD_F(0x0619709f) /* 0.381210921 */, 17 },
+  /* 3343 */  { MAD_F(0x061a101b) /* 0.381363018 */, 17 },
+
+  /* 3344 */  { MAD_F(0x061aaf9c) /* 0.381515130 */, 17 },
+  /* 3345 */  { MAD_F(0x061b4f20) /* 0.381667257 */, 17 },
+  /* 3346 */  { MAD_F(0x061beea8) /* 0.381819399 */, 17 },
+  /* 3347 */  { MAD_F(0x061c8e34) /* 0.381971556 */, 17 },
+  /* 3348 */  { MAD_F(0x061d2dc5) /* 0.382123728 */, 17 },
+  /* 3349 */  { MAD_F(0x061dcd59) /* 0.382275916 */, 17 },
+  /* 3350 */  { MAD_F(0x061e6cf2) /* 0.382428118 */, 17 },
+  /* 3351 */  { MAD_F(0x061f0c8f) /* 0.382580336 */, 17 },
+  /* 3352 */  { MAD_F(0x061fac2f) /* 0.382732569 */, 17 },
+  /* 3353 */  { MAD_F(0x06204bd4) /* 0.382884817 */, 17 },
+  /* 3354 */  { MAD_F(0x0620eb7d) /* 0.383037080 */, 17 },
+  /* 3355 */  { MAD_F(0x06218b2a) /* 0.383189358 */, 17 },
+  /* 3356 */  { MAD_F(0x06222adb) /* 0.383341652 */, 17 },
+  /* 3357 */  { MAD_F(0x0622ca90) /* 0.383493960 */, 17 },
+  /* 3358 */  { MAD_F(0x06236a49) /* 0.383646284 */, 17 },
+  /* 3359 */  { MAD_F(0x06240a06) /* 0.383798623 */, 17 },
+
+  /* 3360 */  { MAD_F(0x0624a9c7) /* 0.383950977 */, 17 },
+  /* 3361 */  { MAD_F(0x0625498d) /* 0.384103346 */, 17 },
+  /* 3362 */  { MAD_F(0x0625e956) /* 0.384255730 */, 17 },
+  /* 3363 */  { MAD_F(0x06268923) /* 0.384408129 */, 17 },
+  /* 3364 */  { MAD_F(0x062728f5) /* 0.384560544 */, 17 },
+  /* 3365 */  { MAD_F(0x0627c8ca) /* 0.384712973 */, 17 },
+  /* 3366 */  { MAD_F(0x062868a4) /* 0.384865418 */, 17 },
+  /* 3367 */  { MAD_F(0x06290881) /* 0.385017878 */, 17 },
+  /* 3368 */  { MAD_F(0x0629a863) /* 0.385170352 */, 17 },
+  /* 3369 */  { MAD_F(0x062a4849) /* 0.385322842 */, 17 },
+  /* 3370 */  { MAD_F(0x062ae832) /* 0.385475347 */, 17 },
+  /* 3371 */  { MAD_F(0x062b8820) /* 0.385627867 */, 17 },
+  /* 3372 */  { MAD_F(0x062c2812) /* 0.385780402 */, 17 },
+  /* 3373 */  { MAD_F(0x062cc808) /* 0.385932953 */, 17 },
+  /* 3374 */  { MAD_F(0x062d6802) /* 0.386085518 */, 17 },
+  /* 3375 */  { MAD_F(0x062e0800) /* 0.386238098 */, 17 },
+
+  /* 3376 */  { MAD_F(0x062ea802) /* 0.386390694 */, 17 },
+  /* 3377 */  { MAD_F(0x062f4808) /* 0.386543304 */, 17 },
+  /* 3378 */  { MAD_F(0x062fe812) /* 0.386695930 */, 17 },
+  /* 3379 */  { MAD_F(0x06308820) /* 0.386848570 */, 17 },
+  /* 3380 */  { MAD_F(0x06312832) /* 0.387001226 */, 17 },
+  /* 3381 */  { MAD_F(0x0631c849) /* 0.387153897 */, 17 },
+  /* 3382 */  { MAD_F(0x06326863) /* 0.387306582 */, 17 },
+  /* 3383 */  { MAD_F(0x06330881) /* 0.387459283 */, 17 },
+  /* 3384 */  { MAD_F(0x0633a8a3) /* 0.387611999 */, 17 },
+  /* 3385 */  { MAD_F(0x063448ca) /* 0.387764730 */, 17 },
+  /* 3386 */  { MAD_F(0x0634e8f4) /* 0.387917476 */, 17 },
+  /* 3387 */  { MAD_F(0x06358923) /* 0.388070237 */, 17 },
+  /* 3388 */  { MAD_F(0x06362955) /* 0.388223013 */, 17 },
+  /* 3389 */  { MAD_F(0x0636c98c) /* 0.388375804 */, 17 },
+  /* 3390 */  { MAD_F(0x063769c6) /* 0.388528610 */, 17 },
+  /* 3391 */  { MAD_F(0x06380a05) /* 0.388681431 */, 17 },
+
+  /* 3392 */  { MAD_F(0x0638aa48) /* 0.388834268 */, 17 },
+  /* 3393 */  { MAD_F(0x06394a8e) /* 0.388987119 */, 17 },
+  /* 3394 */  { MAD_F(0x0639ead9) /* 0.389139985 */, 17 },
+  /* 3395 */  { MAD_F(0x063a8b28) /* 0.389292866 */, 17 },
+  /* 3396 */  { MAD_F(0x063b2b7b) /* 0.389445762 */, 17 },
+  /* 3397 */  { MAD_F(0x063bcbd1) /* 0.389598674 */, 17 },
+  /* 3398 */  { MAD_F(0x063c6c2c) /* 0.389751600 */, 17 },
+  /* 3399 */  { MAD_F(0x063d0c8b) /* 0.389904541 */, 17 },
+  /* 3400 */  { MAD_F(0x063dacee) /* 0.390057497 */, 17 },
+  /* 3401 */  { MAD_F(0x063e4d55) /* 0.390210468 */, 17 },
+  /* 3402 */  { MAD_F(0x063eedc0) /* 0.390363455 */, 17 },
+  /* 3403 */  { MAD_F(0x063f8e2f) /* 0.390516456 */, 17 },
+  /* 3404 */  { MAD_F(0x06402ea2) /* 0.390669472 */, 17 },
+  /* 3405 */  { MAD_F(0x0640cf19) /* 0.390822503 */, 17 },
+  /* 3406 */  { MAD_F(0x06416f94) /* 0.390975549 */, 17 },
+  /* 3407 */  { MAD_F(0x06421013) /* 0.391128611 */, 17 },
+
+  /* 3408 */  { MAD_F(0x0642b096) /* 0.391281687 */, 17 },
+  /* 3409 */  { MAD_F(0x0643511d) /* 0.391434778 */, 17 },
+  /* 3410 */  { MAD_F(0x0643f1a8) /* 0.391587884 */, 17 },
+  /* 3411 */  { MAD_F(0x06449237) /* 0.391741005 */, 17 },
+  /* 3412 */  { MAD_F(0x064532ca) /* 0.391894141 */, 17 },
+  /* 3413 */  { MAD_F(0x0645d361) /* 0.392047292 */, 17 },
+  /* 3414 */  { MAD_F(0x064673fc) /* 0.392200458 */, 17 },
+  /* 3415 */  { MAD_F(0x0647149c) /* 0.392353638 */, 17 },
+  /* 3416 */  { MAD_F(0x0647b53f) /* 0.392506834 */, 17 },
+  /* 3417 */  { MAD_F(0x064855e6) /* 0.392660045 */, 17 },
+  /* 3418 */  { MAD_F(0x0648f691) /* 0.392813271 */, 17 },
+  /* 3419 */  { MAD_F(0x06499740) /* 0.392966511 */, 17 },
+  /* 3420 */  { MAD_F(0x064a37f4) /* 0.393119767 */, 17 },
+  /* 3421 */  { MAD_F(0x064ad8ab) /* 0.393273038 */, 17 },
+  /* 3422 */  { MAD_F(0x064b7966) /* 0.393426323 */, 17 },
+  /* 3423 */  { MAD_F(0x064c1a25) /* 0.393579623 */, 17 },
+
+  /* 3424 */  { MAD_F(0x064cbae9) /* 0.393732939 */, 17 },
+  /* 3425 */  { MAD_F(0x064d5bb0) /* 0.393886269 */, 17 },
+  /* 3426 */  { MAD_F(0x064dfc7b) /* 0.394039614 */, 17 },
+  /* 3427 */  { MAD_F(0x064e9d4b) /* 0.394192974 */, 17 },
+  /* 3428 */  { MAD_F(0x064f3e1e) /* 0.394346349 */, 17 },
+  /* 3429 */  { MAD_F(0x064fdef5) /* 0.394499739 */, 17 },
+  /* 3430 */  { MAD_F(0x06507fd0) /* 0.394653144 */, 17 },
+  /* 3431 */  { MAD_F(0x065120b0) /* 0.394806564 */, 17 },
+  /* 3432 */  { MAD_F(0x0651c193) /* 0.394959999 */, 17 },
+  /* 3433 */  { MAD_F(0x0652627a) /* 0.395113448 */, 17 },
+  /* 3434 */  { MAD_F(0x06530366) /* 0.395266913 */, 17 },
+  /* 3435 */  { MAD_F(0x0653a455) /* 0.395420392 */, 17 },
+  /* 3436 */  { MAD_F(0x06544548) /* 0.395573886 */, 17 },
+  /* 3437 */  { MAD_F(0x0654e640) /* 0.395727395 */, 17 },
+  /* 3438 */  { MAD_F(0x0655873b) /* 0.395880919 */, 17 },
+  /* 3439 */  { MAD_F(0x0656283a) /* 0.396034458 */, 17 },
+
+  /* 3440 */  { MAD_F(0x0656c93d) /* 0.396188012 */, 17 },
+  /* 3441 */  { MAD_F(0x06576a45) /* 0.396341581 */, 17 },
+  /* 3442 */  { MAD_F(0x06580b50) /* 0.396495164 */, 17 },
+  /* 3443 */  { MAD_F(0x0658ac5f) /* 0.396648763 */, 17 },
+  /* 3444 */  { MAD_F(0x06594d73) /* 0.396802376 */, 17 },
+  /* 3445 */  { MAD_F(0x0659ee8a) /* 0.396956004 */, 17 },
+  /* 3446 */  { MAD_F(0x065a8fa5) /* 0.397109647 */, 17 },
+  /* 3447 */  { MAD_F(0x065b30c4) /* 0.397263305 */, 17 },
+  /* 3448 */  { MAD_F(0x065bd1e7) /* 0.397416978 */, 17 },
+  /* 3449 */  { MAD_F(0x065c730f) /* 0.397570666 */, 17 },
+  /* 3450 */  { MAD_F(0x065d143a) /* 0.397724368 */, 17 },
+  /* 3451 */  { MAD_F(0x065db569) /* 0.397878085 */, 17 },
+  /* 3452 */  { MAD_F(0x065e569c) /* 0.398031818 */, 17 },
+  /* 3453 */  { MAD_F(0x065ef7d3) /* 0.398185565 */, 17 },
+  /* 3454 */  { MAD_F(0x065f990e) /* 0.398339326 */, 17 },
+  /* 3455 */  { MAD_F(0x06603a4e) /* 0.398493103 */, 17 },
+
+  /* 3456 */  { MAD_F(0x0660db91) /* 0.398646895 */, 17 },
+  /* 3457 */  { MAD_F(0x06617cd8) /* 0.398800701 */, 17 },
+  /* 3458 */  { MAD_F(0x06621e23) /* 0.398954522 */, 17 },
+  /* 3459 */  { MAD_F(0x0662bf72) /* 0.399108358 */, 17 },
+  /* 3460 */  { MAD_F(0x066360c5) /* 0.399262209 */, 17 },
+  /* 3461 */  { MAD_F(0x0664021c) /* 0.399416075 */, 17 },
+  /* 3462 */  { MAD_F(0x0664a377) /* 0.399569955 */, 17 },
+  /* 3463 */  { MAD_F(0x066544d6) /* 0.399723851 */, 17 },
+  /* 3464 */  { MAD_F(0x0665e639) /* 0.399877761 */, 17 },
+  /* 3465 */  { MAD_F(0x066687a0) /* 0.400031686 */, 17 },
+  /* 3466 */  { MAD_F(0x0667290b) /* 0.400185625 */, 17 },
+  /* 3467 */  { MAD_F(0x0667ca79) /* 0.400339580 */, 17 },
+  /* 3468 */  { MAD_F(0x06686bec) /* 0.400493549 */, 17 },
+  /* 3469 */  { MAD_F(0x06690d63) /* 0.400647534 */, 17 },
+  /* 3470 */  { MAD_F(0x0669aede) /* 0.400801533 */, 17 },
+  /* 3471 */  { MAD_F(0x066a505d) /* 0.400955546 */, 17 },
+
+  /* 3472 */  { MAD_F(0x066af1df) /* 0.401109575 */, 17 },
+  /* 3473 */  { MAD_F(0x066b9366) /* 0.401263618 */, 17 },
+  /* 3474 */  { MAD_F(0x066c34f1) /* 0.401417676 */, 17 },
+  /* 3475 */  { MAD_F(0x066cd67f) /* 0.401571749 */, 17 },
+  /* 3476 */  { MAD_F(0x066d7812) /* 0.401725837 */, 17 },
+  /* 3477 */  { MAD_F(0x066e19a9) /* 0.401879939 */, 17 },
+  /* 3478 */  { MAD_F(0x066ebb43) /* 0.402034056 */, 17 },
+  /* 3479 */  { MAD_F(0x066f5ce2) /* 0.402188188 */, 17 },
+  /* 3480 */  { MAD_F(0x066ffe84) /* 0.402342335 */, 17 },
+  /* 3481 */  { MAD_F(0x0670a02a) /* 0.402496497 */, 17 },
+  /* 3482 */  { MAD_F(0x067141d5) /* 0.402650673 */, 17 },
+  /* 3483 */  { MAD_F(0x0671e383) /* 0.402804864 */, 17 },
+  /* 3484 */  { MAD_F(0x06728535) /* 0.402959070 */, 17 },
+  /* 3485 */  { MAD_F(0x067326ec) /* 0.403113291 */, 17 },
+  /* 3486 */  { MAD_F(0x0673c8a6) /* 0.403267526 */, 17 },
+  /* 3487 */  { MAD_F(0x06746a64) /* 0.403421776 */, 17 },
+
+  /* 3488 */  { MAD_F(0x06750c26) /* 0.403576041 */, 17 },
+  /* 3489 */  { MAD_F(0x0675adec) /* 0.403730320 */, 17 },
+  /* 3490 */  { MAD_F(0x06764fb6) /* 0.403884615 */, 17 },
+  /* 3491 */  { MAD_F(0x0676f184) /* 0.404038924 */, 17 },
+  /* 3492 */  { MAD_F(0x06779356) /* 0.404193247 */, 17 },
+  /* 3493 */  { MAD_F(0x0678352c) /* 0.404347586 */, 17 },
+  /* 3494 */  { MAD_F(0x0678d706) /* 0.404501939 */, 17 },
+  /* 3495 */  { MAD_F(0x067978e4) /* 0.404656307 */, 17 },
+  /* 3496 */  { MAD_F(0x067a1ac6) /* 0.404810690 */, 17 },
+  /* 3497 */  { MAD_F(0x067abcac) /* 0.404965087 */, 17 },
+  /* 3498 */  { MAD_F(0x067b5e95) /* 0.405119499 */, 17 },
+  /* 3499 */  { MAD_F(0x067c0083) /* 0.405273926 */, 17 },
+  /* 3500 */  { MAD_F(0x067ca275) /* 0.405428368 */, 17 },
+  /* 3501 */  { MAD_F(0x067d446a) /* 0.405582824 */, 17 },
+  /* 3502 */  { MAD_F(0x067de664) /* 0.405737295 */, 17 },
+  /* 3503 */  { MAD_F(0x067e8861) /* 0.405891781 */, 17 },
+
+  /* 3504 */  { MAD_F(0x067f2a62) /* 0.406046281 */, 17 },
+  /* 3505 */  { MAD_F(0x067fcc68) /* 0.406200796 */, 17 },
+  /* 3506 */  { MAD_F(0x06806e71) /* 0.406355326 */, 17 },
+  /* 3507 */  { MAD_F(0x0681107e) /* 0.406509870 */, 17 },
+  /* 3508 */  { MAD_F(0x0681b28f) /* 0.406664429 */, 17 },
+  /* 3509 */  { MAD_F(0x068254a4) /* 0.406819003 */, 17 },
+  /* 3510 */  { MAD_F(0x0682f6bd) /* 0.406973592 */, 17 },
+  /* 3511 */  { MAD_F(0x068398da) /* 0.407128195 */, 17 },
+  /* 3512 */  { MAD_F(0x06843afb) /* 0.407282813 */, 17 },
+  /* 3513 */  { MAD_F(0x0684dd20) /* 0.407437445 */, 17 },
+  /* 3514 */  { MAD_F(0x06857f49) /* 0.407592093 */, 17 },
+  /* 3515 */  { MAD_F(0x06862176) /* 0.407746754 */, 17 },
+  /* 3516 */  { MAD_F(0x0686c3a6) /* 0.407901431 */, 17 },
+  /* 3517 */  { MAD_F(0x068765db) /* 0.408056122 */, 17 },
+  /* 3518 */  { MAD_F(0x06880814) /* 0.408210828 */, 17 },
+  /* 3519 */  { MAD_F(0x0688aa50) /* 0.408365549 */, 17 },
+
+  /* 3520 */  { MAD_F(0x06894c90) /* 0.408520284 */, 17 },
+  /* 3521 */  { MAD_F(0x0689eed5) /* 0.408675034 */, 17 },
+  /* 3522 */  { MAD_F(0x068a911d) /* 0.408829798 */, 17 },
+  /* 3523 */  { MAD_F(0x068b3369) /* 0.408984577 */, 17 },
+  /* 3524 */  { MAD_F(0x068bd5b9) /* 0.409139371 */, 17 },
+  /* 3525 */  { MAD_F(0x068c780e) /* 0.409294180 */, 17 },
+  /* 3526 */  { MAD_F(0x068d1a66) /* 0.409449003 */, 17 },
+  /* 3527 */  { MAD_F(0x068dbcc1) /* 0.409603840 */, 17 },
+  /* 3528 */  { MAD_F(0x068e5f21) /* 0.409758693 */, 17 },
+  /* 3529 */  { MAD_F(0x068f0185) /* 0.409913560 */, 17 },
+  /* 3530 */  { MAD_F(0x068fa3ed) /* 0.410068441 */, 17 },
+  /* 3531 */  { MAD_F(0x06904658) /* 0.410223338 */, 17 },
+  /* 3532 */  { MAD_F(0x0690e8c8) /* 0.410378249 */, 17 },
+  /* 3533 */  { MAD_F(0x06918b3c) /* 0.410533174 */, 17 },
+  /* 3534 */  { MAD_F(0x06922db3) /* 0.410688114 */, 17 },
+  /* 3535 */  { MAD_F(0x0692d02e) /* 0.410843069 */, 17 },
+
+  /* 3536 */  { MAD_F(0x069372ae) /* 0.410998038 */, 17 },
+  /* 3537 */  { MAD_F(0x06941531) /* 0.411153022 */, 17 },
+  /* 3538 */  { MAD_F(0x0694b7b8) /* 0.411308021 */, 17 },
+  /* 3539 */  { MAD_F(0x06955a43) /* 0.411463034 */, 17 },
+  /* 3540 */  { MAD_F(0x0695fcd2) /* 0.411618062 */, 17 },
+  /* 3541 */  { MAD_F(0x06969f65) /* 0.411773104 */, 17 },
+  /* 3542 */  { MAD_F(0x069741fb) /* 0.411928161 */, 17 },
+  /* 3543 */  { MAD_F(0x0697e496) /* 0.412083232 */, 17 },
+  /* 3544 */  { MAD_F(0x06988735) /* 0.412238319 */, 17 },
+  /* 3545 */  { MAD_F(0x069929d7) /* 0.412393419 */, 17 },
+  /* 3546 */  { MAD_F(0x0699cc7e) /* 0.412548535 */, 17 },
+  /* 3547 */  { MAD_F(0x069a6f28) /* 0.412703664 */, 17 },
+  /* 3548 */  { MAD_F(0x069b11d6) /* 0.412858809 */, 17 },
+  /* 3549 */  { MAD_F(0x069bb489) /* 0.413013968 */, 17 },
+  /* 3550 */  { MAD_F(0x069c573f) /* 0.413169142 */, 17 },
+  /* 3551 */  { MAD_F(0x069cf9f9) /* 0.413324330 */, 17 },
+
+  /* 3552 */  { MAD_F(0x069d9cb7) /* 0.413479532 */, 17 },
+  /* 3553 */  { MAD_F(0x069e3f78) /* 0.413634750 */, 17 },
+  /* 3554 */  { MAD_F(0x069ee23e) /* 0.413789982 */, 17 },
+  /* 3555 */  { MAD_F(0x069f8508) /* 0.413945228 */, 17 },
+  /* 3556 */  { MAD_F(0x06a027d5) /* 0.414100489 */, 17 },
+  /* 3557 */  { MAD_F(0x06a0caa7) /* 0.414255765 */, 17 },
+  /* 3558 */  { MAD_F(0x06a16d7c) /* 0.414411055 */, 17 },
+  /* 3559 */  { MAD_F(0x06a21055) /* 0.414566359 */, 17 },
+  /* 3560 */  { MAD_F(0x06a2b333) /* 0.414721679 */, 17 },
+  /* 3561 */  { MAD_F(0x06a35614) /* 0.414877012 */, 17 },
+  /* 3562 */  { MAD_F(0x06a3f8f9) /* 0.415032361 */, 17 },
+  /* 3563 */  { MAD_F(0x06a49be2) /* 0.415187723 */, 17 },
+  /* 3564 */  { MAD_F(0x06a53ece) /* 0.415343101 */, 17 },
+  /* 3565 */  { MAD_F(0x06a5e1bf) /* 0.415498493 */, 17 },
+  /* 3566 */  { MAD_F(0x06a684b4) /* 0.415653899 */, 17 },
+  /* 3567 */  { MAD_F(0x06a727ac) /* 0.415809320 */, 17 },
+
+  /* 3568 */  { MAD_F(0x06a7caa9) /* 0.415964756 */, 17 },
+  /* 3569 */  { MAD_F(0x06a86da9) /* 0.416120206 */, 17 },
+  /* 3570 */  { MAD_F(0x06a910ad) /* 0.416275670 */, 17 },
+  /* 3571 */  { MAD_F(0x06a9b3b5) /* 0.416431149 */, 17 },
+  /* 3572 */  { MAD_F(0x06aa56c1) /* 0.416586643 */, 17 },
+  /* 3573 */  { MAD_F(0x06aaf9d1) /* 0.416742151 */, 17 },
+  /* 3574 */  { MAD_F(0x06ab9ce5) /* 0.416897673 */, 17 },
+  /* 3575 */  { MAD_F(0x06ac3ffc) /* 0.417053210 */, 17 },
+  /* 3576 */  { MAD_F(0x06ace318) /* 0.417208762 */, 17 },
+  /* 3577 */  { MAD_F(0x06ad8637) /* 0.417364328 */, 17 },
+  /* 3578 */  { MAD_F(0x06ae295b) /* 0.417519909 */, 17 },
+  /* 3579 */  { MAD_F(0x06aecc82) /* 0.417675504 */, 17 },
+  /* 3580 */  { MAD_F(0x06af6fad) /* 0.417831113 */, 17 },
+  /* 3581 */  { MAD_F(0x06b012dc) /* 0.417986737 */, 17 },
+  /* 3582 */  { MAD_F(0x06b0b60f) /* 0.418142376 */, 17 },
+  /* 3583 */  { MAD_F(0x06b15946) /* 0.418298029 */, 17 },
+
+  /* 3584 */  { MAD_F(0x06b1fc81) /* 0.418453696 */, 17 },
+  /* 3585 */  { MAD_F(0x06b29fbf) /* 0.418609378 */, 17 },
+  /* 3586 */  { MAD_F(0x06b34302) /* 0.418765075 */, 17 },
+  /* 3587 */  { MAD_F(0x06b3e648) /* 0.418920786 */, 17 },
+  /* 3588 */  { MAD_F(0x06b48992) /* 0.419076511 */, 17 },
+  /* 3589 */  { MAD_F(0x06b52ce0) /* 0.419232251 */, 17 },
+  /* 3590 */  { MAD_F(0x06b5d032) /* 0.419388005 */, 17 },
+  /* 3591 */  { MAD_F(0x06b67388) /* 0.419543774 */, 17 },
+  /* 3592 */  { MAD_F(0x06b716e2) /* 0.419699557 */, 17 },
+  /* 3593 */  { MAD_F(0x06b7ba3f) /* 0.419855355 */, 17 },
+  /* 3594 */  { MAD_F(0x06b85da1) /* 0.420011167 */, 17 },
+  /* 3595 */  { MAD_F(0x06b90106) /* 0.420166994 */, 17 },
+  /* 3596 */  { MAD_F(0x06b9a470) /* 0.420322835 */, 17 },
+  /* 3597 */  { MAD_F(0x06ba47dd) /* 0.420478690 */, 17 },
+  /* 3598 */  { MAD_F(0x06baeb4e) /* 0.420634560 */, 17 },
+  /* 3599 */  { MAD_F(0x06bb8ec3) /* 0.420790445 */, 17 },
+
+  /* 3600 */  { MAD_F(0x06bc323b) /* 0.420946343 */, 17 },
+  /* 3601 */  { MAD_F(0x06bcd5b8) /* 0.421102257 */, 17 },
+  /* 3602 */  { MAD_F(0x06bd7939) /* 0.421258184 */, 17 },
+  /* 3603 */  { MAD_F(0x06be1cbd) /* 0.421414127 */, 17 },
+  /* 3604 */  { MAD_F(0x06bec045) /* 0.421570083 */, 17 },
+  /* 3605 */  { MAD_F(0x06bf63d1) /* 0.421726054 */, 17 },
+  /* 3606 */  { MAD_F(0x06c00761) /* 0.421882040 */, 17 },
+  /* 3607 */  { MAD_F(0x06c0aaf5) /* 0.422038039 */, 17 },
+  /* 3608 */  { MAD_F(0x06c14e8d) /* 0.422194054 */, 17 },
+  /* 3609 */  { MAD_F(0x06c1f229) /* 0.422350082 */, 17 },
+  /* 3610 */  { MAD_F(0x06c295c8) /* 0.422506125 */, 17 },
+  /* 3611 */  { MAD_F(0x06c3396c) /* 0.422662183 */, 17 },
+  /* 3612 */  { MAD_F(0x06c3dd13) /* 0.422818255 */, 17 },
+  /* 3613 */  { MAD_F(0x06c480be) /* 0.422974341 */, 17 },
+  /* 3614 */  { MAD_F(0x06c5246d) /* 0.423130442 */, 17 },
+  /* 3615 */  { MAD_F(0x06c5c820) /* 0.423286557 */, 17 },
+
+  /* 3616 */  { MAD_F(0x06c66bd6) /* 0.423442686 */, 17 },
+  /* 3617 */  { MAD_F(0x06c70f91) /* 0.423598830 */, 17 },
+  /* 3618 */  { MAD_F(0x06c7b34f) /* 0.423754988 */, 17 },
+  /* 3619 */  { MAD_F(0x06c85712) /* 0.423911161 */, 17 },
+  /* 3620 */  { MAD_F(0x06c8fad8) /* 0.424067348 */, 17 },
+  /* 3621 */  { MAD_F(0x06c99ea2) /* 0.424223550 */, 17 },
+  /* 3622 */  { MAD_F(0x06ca4270) /* 0.424379765 */, 17 },
+  /* 3623 */  { MAD_F(0x06cae641) /* 0.424535996 */, 17 },
+  /* 3624 */  { MAD_F(0x06cb8a17) /* 0.424692240 */, 17 },
+  /* 3625 */  { MAD_F(0x06cc2df0) /* 0.424848499 */, 17 },
+  /* 3626 */  { MAD_F(0x06ccd1ce) /* 0.425004772 */, 17 },
+  /* 3627 */  { MAD_F(0x06cd75af) /* 0.425161060 */, 17 },
+  /* 3628 */  { MAD_F(0x06ce1994) /* 0.425317362 */, 17 },
+  /* 3629 */  { MAD_F(0x06cebd7d) /* 0.425473678 */, 17 },
+  /* 3630 */  { MAD_F(0x06cf6169) /* 0.425630009 */, 17 },
+  /* 3631 */  { MAD_F(0x06d0055a) /* 0.425786354 */, 17 },
+
+  /* 3632 */  { MAD_F(0x06d0a94e) /* 0.425942714 */, 17 },
+  /* 3633 */  { MAD_F(0x06d14d47) /* 0.426099088 */, 17 },
+  /* 3634 */  { MAD_F(0x06d1f143) /* 0.426255476 */, 17 },
+  /* 3635 */  { MAD_F(0x06d29543) /* 0.426411878 */, 17 },
+  /* 3636 */  { MAD_F(0x06d33947) /* 0.426568295 */, 17 },
+  /* 3637 */  { MAD_F(0x06d3dd4e) /* 0.426724726 */, 17 },
+  /* 3638 */  { MAD_F(0x06d4815a) /* 0.426881172 */, 17 },
+  /* 3639 */  { MAD_F(0x06d52569) /* 0.427037632 */, 17 },
+  /* 3640 */  { MAD_F(0x06d5c97c) /* 0.427194106 */, 17 },
+  /* 3641 */  { MAD_F(0x06d66d93) /* 0.427350594 */, 17 },
+  /* 3642 */  { MAD_F(0x06d711ae) /* 0.427507097 */, 17 },
+  /* 3643 */  { MAD_F(0x06d7b5cd) /* 0.427663614 */, 17 },
+  /* 3644 */  { MAD_F(0x06d859f0) /* 0.427820146 */, 17 },
+  /* 3645 */  { MAD_F(0x06d8fe16) /* 0.427976692 */, 17 },
+  /* 3646 */  { MAD_F(0x06d9a240) /* 0.428133252 */, 17 },
+  /* 3647 */  { MAD_F(0x06da466f) /* 0.428289826 */, 17 },
+
+  /* 3648 */  { MAD_F(0x06daeaa1) /* 0.428446415 */, 17 },
+  /* 3649 */  { MAD_F(0x06db8ed6) /* 0.428603018 */, 17 },
+  /* 3650 */  { MAD_F(0x06dc3310) /* 0.428759635 */, 17 },
+  /* 3651 */  { MAD_F(0x06dcd74d) /* 0.428916267 */, 17 },
+  /* 3652 */  { MAD_F(0x06dd7b8f) /* 0.429072913 */, 17 },
+  /* 3653 */  { MAD_F(0x06de1fd4) /* 0.429229573 */, 17 },
+  /* 3654 */  { MAD_F(0x06dec41d) /* 0.429386248 */, 17 },
+  /* 3655 */  { MAD_F(0x06df686a) /* 0.429542937 */, 17 },
+  /* 3656 */  { MAD_F(0x06e00cbb) /* 0.429699640 */, 17 },
+  /* 3657 */  { MAD_F(0x06e0b10f) /* 0.429856357 */, 17 },
+  /* 3658 */  { MAD_F(0x06e15567) /* 0.430013089 */, 17 },
+  /* 3659 */  { MAD_F(0x06e1f9c4) /* 0.430169835 */, 17 },
+  /* 3660 */  { MAD_F(0x06e29e24) /* 0.430326595 */, 17 },
+  /* 3661 */  { MAD_F(0x06e34287) /* 0.430483370 */, 17 },
+  /* 3662 */  { MAD_F(0x06e3e6ef) /* 0.430640159 */, 17 },
+  /* 3663 */  { MAD_F(0x06e48b5b) /* 0.430796962 */, 17 },
+
+  /* 3664 */  { MAD_F(0x06e52fca) /* 0.430953779 */, 17 },
+  /* 3665 */  { MAD_F(0x06e5d43d) /* 0.431110611 */, 17 },
+  /* 3666 */  { MAD_F(0x06e678b4) /* 0.431267457 */, 17 },
+  /* 3667 */  { MAD_F(0x06e71d2f) /* 0.431424317 */, 17 },
+  /* 3668 */  { MAD_F(0x06e7c1ae) /* 0.431581192 */, 17 },
+  /* 3669 */  { MAD_F(0x06e86630) /* 0.431738080 */, 17 },
+  /* 3670 */  { MAD_F(0x06e90ab7) /* 0.431894983 */, 17 },
+  /* 3671 */  { MAD_F(0x06e9af41) /* 0.432051900 */, 17 },
+  /* 3672 */  { MAD_F(0x06ea53cf) /* 0.432208832 */, 17 },
+  /* 3673 */  { MAD_F(0x06eaf860) /* 0.432365778 */, 17 },
+  /* 3674 */  { MAD_F(0x06eb9cf6) /* 0.432522737 */, 17 },
+  /* 3675 */  { MAD_F(0x06ec418f) /* 0.432679712 */, 17 },
+  /* 3676 */  { MAD_F(0x06ece62d) /* 0.432836700 */, 17 },
+  /* 3677 */  { MAD_F(0x06ed8ace) /* 0.432993703 */, 17 },
+  /* 3678 */  { MAD_F(0x06ee2f73) /* 0.433150720 */, 17 },
+  /* 3679 */  { MAD_F(0x06eed41b) /* 0.433307751 */, 17 },
+
+  /* 3680 */  { MAD_F(0x06ef78c8) /* 0.433464796 */, 17 },
+  /* 3681 */  { MAD_F(0x06f01d78) /* 0.433621856 */, 17 },
+  /* 3682 */  { MAD_F(0x06f0c22c) /* 0.433778929 */, 17 },
+  /* 3683 */  { MAD_F(0x06f166e4) /* 0.433936017 */, 17 },
+  /* 3684 */  { MAD_F(0x06f20ba0) /* 0.434093120 */, 17 },
+  /* 3685 */  { MAD_F(0x06f2b060) /* 0.434250236 */, 17 },
+  /* 3686 */  { MAD_F(0x06f35523) /* 0.434407367 */, 17 },
+  /* 3687 */  { MAD_F(0x06f3f9eb) /* 0.434564512 */, 17 },
+  /* 3688 */  { MAD_F(0x06f49eb6) /* 0.434721671 */, 17 },
+  /* 3689 */  { MAD_F(0x06f54385) /* 0.434878844 */, 17 },
+  /* 3690 */  { MAD_F(0x06f5e857) /* 0.435036032 */, 17 },
+  /* 3691 */  { MAD_F(0x06f68d2e) /* 0.435193233 */, 17 },
+  /* 3692 */  { MAD_F(0x06f73208) /* 0.435350449 */, 17 },
+  /* 3693 */  { MAD_F(0x06f7d6e6) /* 0.435507679 */, 17 },
+  /* 3694 */  { MAD_F(0x06f87bc8) /* 0.435664924 */, 17 },
+  /* 3695 */  { MAD_F(0x06f920ae) /* 0.435822182 */, 17 },
+
+  /* 3696 */  { MAD_F(0x06f9c597) /* 0.435979455 */, 17 },
+  /* 3697 */  { MAD_F(0x06fa6a85) /* 0.436136741 */, 17 },
+  /* 3698 */  { MAD_F(0x06fb0f76) /* 0.436294042 */, 17 },
+  /* 3699 */  { MAD_F(0x06fbb46b) /* 0.436451358 */, 17 },
+  /* 3700 */  { MAD_F(0x06fc5964) /* 0.436608687 */, 17 },
+  /* 3701 */  { MAD_F(0x06fcfe60) /* 0.436766031 */, 17 },
+  /* 3702 */  { MAD_F(0x06fda361) /* 0.436923388 */, 17 },
+  /* 3703 */  { MAD_F(0x06fe4865) /* 0.437080760 */, 17 },
+  /* 3704 */  { MAD_F(0x06feed6d) /* 0.437238146 */, 17 },
+  /* 3705 */  { MAD_F(0x06ff9279) /* 0.437395547 */, 17 },
+  /* 3706 */  { MAD_F(0x07003788) /* 0.437552961 */, 17 },
+  /* 3707 */  { MAD_F(0x0700dc9c) /* 0.437710389 */, 17 },
+  /* 3708 */  { MAD_F(0x070181b3) /* 0.437867832 */, 17 },
+  /* 3709 */  { MAD_F(0x070226ce) /* 0.438025289 */, 17 },
+  /* 3710 */  { MAD_F(0x0702cbed) /* 0.438182760 */, 17 },
+  /* 3711 */  { MAD_F(0x0703710f) /* 0.438340245 */, 17 },
+
+  /* 3712 */  { MAD_F(0x07041636) /* 0.438497744 */, 17 },
+  /* 3713 */  { MAD_F(0x0704bb60) /* 0.438655258 */, 17 },
+  /* 3714 */  { MAD_F(0x0705608e) /* 0.438812785 */, 17 },
+  /* 3715 */  { MAD_F(0x070605c0) /* 0.438970327 */, 17 },
+  /* 3716 */  { MAD_F(0x0706aaf5) /* 0.439127883 */, 17 },
+  /* 3717 */  { MAD_F(0x0707502f) /* 0.439285453 */, 17 },
+  /* 3718 */  { MAD_F(0x0707f56c) /* 0.439443037 */, 17 },
+  /* 3719 */  { MAD_F(0x07089aad) /* 0.439600635 */, 17 },
+  /* 3720 */  { MAD_F(0x07093ff2) /* 0.439758248 */, 17 },
+  /* 3721 */  { MAD_F(0x0709e53a) /* 0.439915874 */, 17 },
+  /* 3722 */  { MAD_F(0x070a8a86) /* 0.440073515 */, 17 },
+  /* 3723 */  { MAD_F(0x070b2fd7) /* 0.440231170 */, 17 },
+  /* 3724 */  { MAD_F(0x070bd52a) /* 0.440388839 */, 17 },
+  /* 3725 */  { MAD_F(0x070c7a82) /* 0.440546522 */, 17 },
+  /* 3726 */  { MAD_F(0x070d1fde) /* 0.440704219 */, 17 },
+  /* 3727 */  { MAD_F(0x070dc53d) /* 0.440861930 */, 17 },
+
+  /* 3728 */  { MAD_F(0x070e6aa0) /* 0.441019655 */, 17 },
+  /* 3729 */  { MAD_F(0x070f1007) /* 0.441177395 */, 17 },
+  /* 3730 */  { MAD_F(0x070fb571) /* 0.441335148 */, 17 },
+  /* 3731 */  { MAD_F(0x07105ae0) /* 0.441492916 */, 17 },
+  /* 3732 */  { MAD_F(0x07110052) /* 0.441650697 */, 17 },
+  /* 3733 */  { MAD_F(0x0711a5c8) /* 0.441808493 */, 17 },
+  /* 3734 */  { MAD_F(0x07124b42) /* 0.441966303 */, 17 },
+  /* 3735 */  { MAD_F(0x0712f0bf) /* 0.442124127 */, 17 },
+  /* 3736 */  { MAD_F(0x07139641) /* 0.442281965 */, 17 },
+  /* 3737 */  { MAD_F(0x07143bc6) /* 0.442439817 */, 17 },
+  /* 3738 */  { MAD_F(0x0714e14f) /* 0.442597683 */, 17 },
+  /* 3739 */  { MAD_F(0x071586db) /* 0.442755564 */, 17 },
+  /* 3740 */  { MAD_F(0x07162c6c) /* 0.442913458 */, 17 },
+  /* 3741 */  { MAD_F(0x0716d200) /* 0.443071366 */, 17 },
+  /* 3742 */  { MAD_F(0x07177798) /* 0.443229289 */, 17 },
+  /* 3743 */  { MAD_F(0x07181d34) /* 0.443387226 */, 17 },
+
+  /* 3744 */  { MAD_F(0x0718c2d3) /* 0.443545176 */, 17 },
+  /* 3745 */  { MAD_F(0x07196877) /* 0.443703141 */, 17 },
+  /* 3746 */  { MAD_F(0x071a0e1e) /* 0.443861120 */, 17 },
+  /* 3747 */  { MAD_F(0x071ab3c9) /* 0.444019113 */, 17 },
+  /* 3748 */  { MAD_F(0x071b5977) /* 0.444177119 */, 17 },
+  /* 3749 */  { MAD_F(0x071bff2a) /* 0.444335140 */, 17 },
+  /* 3750 */  { MAD_F(0x071ca4e0) /* 0.444493175 */, 17 },
+  /* 3751 */  { MAD_F(0x071d4a9a) /* 0.444651224 */, 17 },
+  /* 3752 */  { MAD_F(0x071df058) /* 0.444809288 */, 17 },
+  /* 3753 */  { MAD_F(0x071e9619) /* 0.444967365 */, 17 },
+  /* 3754 */  { MAD_F(0x071f3bde) /* 0.445125456 */, 17 },
+  /* 3755 */  { MAD_F(0x071fe1a8) /* 0.445283561 */, 17 },
+  /* 3756 */  { MAD_F(0x07208774) /* 0.445441680 */, 17 },
+  /* 3757 */  { MAD_F(0x07212d45) /* 0.445599814 */, 17 },
+  /* 3758 */  { MAD_F(0x0721d319) /* 0.445757961 */, 17 },
+  /* 3759 */  { MAD_F(0x072278f1) /* 0.445916122 */, 17 },
+
+  /* 3760 */  { MAD_F(0x07231ecd) /* 0.446074298 */, 17 },
+  /* 3761 */  { MAD_F(0x0723c4ad) /* 0.446232487 */, 17 },
+  /* 3762 */  { MAD_F(0x07246a90) /* 0.446390690 */, 17 },
+  /* 3763 */  { MAD_F(0x07251077) /* 0.446548908 */, 17 },
+  /* 3764 */  { MAD_F(0x0725b662) /* 0.446707139 */, 17 },
+  /* 3765 */  { MAD_F(0x07265c51) /* 0.446865385 */, 17 },
+  /* 3766 */  { MAD_F(0x07270244) /* 0.447023644 */, 17 },
+  /* 3767 */  { MAD_F(0x0727a83a) /* 0.447181918 */, 17 },
+  /* 3768 */  { MAD_F(0x07284e34) /* 0.447340205 */, 17 },
+  /* 3769 */  { MAD_F(0x0728f431) /* 0.447498507 */, 17 },
+  /* 3770 */  { MAD_F(0x07299a33) /* 0.447656822 */, 17 },
+  /* 3771 */  { MAD_F(0x072a4038) /* 0.447815152 */, 17 },
+  /* 3772 */  { MAD_F(0x072ae641) /* 0.447973495 */, 17 },
+  /* 3773 */  { MAD_F(0x072b8c4e) /* 0.448131853 */, 17 },
+  /* 3774 */  { MAD_F(0x072c325e) /* 0.448290224 */, 17 },
+  /* 3775 */  { MAD_F(0x072cd873) /* 0.448448609 */, 17 },
+
+  /* 3776 */  { MAD_F(0x072d7e8b) /* 0.448607009 */, 17 },
+  /* 3777 */  { MAD_F(0x072e24a7) /* 0.448765422 */, 17 },
+  /* 3778 */  { MAD_F(0x072ecac6) /* 0.448923850 */, 17 },
+  /* 3779 */  { MAD_F(0x072f70e9) /* 0.449082291 */, 17 },
+  /* 3780 */  { MAD_F(0x07301710) /* 0.449240746 */, 17 },
+  /* 3781 */  { MAD_F(0x0730bd3b) /* 0.449399216 */, 17 },
+  /* 3782 */  { MAD_F(0x0731636a) /* 0.449557699 */, 17 },
+  /* 3783 */  { MAD_F(0x0732099c) /* 0.449716196 */, 17 },
+  /* 3784 */  { MAD_F(0x0732afd2) /* 0.449874708 */, 17 },
+  /* 3785 */  { MAD_F(0x0733560c) /* 0.450033233 */, 17 },
+  /* 3786 */  { MAD_F(0x0733fc49) /* 0.450191772 */, 17 },
+  /* 3787 */  { MAD_F(0x0734a28b) /* 0.450350325 */, 17 },
+  /* 3788 */  { MAD_F(0x073548d0) /* 0.450508892 */, 17 },
+  /* 3789 */  { MAD_F(0x0735ef18) /* 0.450667473 */, 17 },
+  /* 3790 */  { MAD_F(0x07369565) /* 0.450826068 */, 17 },
+  /* 3791 */  { MAD_F(0x07373bb5) /* 0.450984677 */, 17 },
+
+  /* 3792 */  { MAD_F(0x0737e209) /* 0.451143300 */, 17 },
+  /* 3793 */  { MAD_F(0x07388861) /* 0.451301937 */, 17 },
+  /* 3794 */  { MAD_F(0x07392ebc) /* 0.451460588 */, 17 },
+  /* 3795 */  { MAD_F(0x0739d51c) /* 0.451619252 */, 17 },
+  /* 3796 */  { MAD_F(0x073a7b7f) /* 0.451777931 */, 17 },
+  /* 3797 */  { MAD_F(0x073b21e5) /* 0.451936623 */, 17 },
+  /* 3798 */  { MAD_F(0x073bc850) /* 0.452095330 */, 17 },
+  /* 3799 */  { MAD_F(0x073c6ebe) /* 0.452254050 */, 17 },
+  /* 3800 */  { MAD_F(0x073d1530) /* 0.452412785 */, 17 },
+  /* 3801 */  { MAD_F(0x073dbba6) /* 0.452571533 */, 17 },
+  /* 3802 */  { MAD_F(0x073e621f) /* 0.452730295 */, 17 },
+  /* 3803 */  { MAD_F(0x073f089c) /* 0.452889071 */, 17 },
+  /* 3804 */  { MAD_F(0x073faf1d) /* 0.453047861 */, 17 },
+  /* 3805 */  { MAD_F(0x074055a2) /* 0.453206665 */, 17 },
+  /* 3806 */  { MAD_F(0x0740fc2a) /* 0.453365483 */, 17 },
+  /* 3807 */  { MAD_F(0x0741a2b6) /* 0.453524315 */, 17 },
+
+  /* 3808 */  { MAD_F(0x07424946) /* 0.453683161 */, 17 },
+  /* 3809 */  { MAD_F(0x0742efd9) /* 0.453842020 */, 17 },
+  /* 3810 */  { MAD_F(0x07439671) /* 0.454000894 */, 17 },
+  /* 3811 */  { MAD_F(0x07443d0c) /* 0.454159781 */, 17 },
+  /* 3812 */  { MAD_F(0x0744e3aa) /* 0.454318683 */, 17 },
+  /* 3813 */  { MAD_F(0x07458a4d) /* 0.454477598 */, 17 },
+  /* 3814 */  { MAD_F(0x074630f3) /* 0.454636527 */, 17 },
+  /* 3815 */  { MAD_F(0x0746d79d) /* 0.454795470 */, 17 },
+  /* 3816 */  { MAD_F(0x07477e4b) /* 0.454954427 */, 17 },
+  /* 3817 */  { MAD_F(0x074824fc) /* 0.455113397 */, 17 },
+  /* 3818 */  { MAD_F(0x0748cbb1) /* 0.455272382 */, 17 },
+  /* 3819 */  { MAD_F(0x0749726a) /* 0.455431381 */, 17 },
+  /* 3820 */  { MAD_F(0x074a1927) /* 0.455590393 */, 17 },
+  /* 3821 */  { MAD_F(0x074abfe7) /* 0.455749419 */, 17 },
+  /* 3822 */  { MAD_F(0x074b66ab) /* 0.455908459 */, 17 },
+  /* 3823 */  { MAD_F(0x074c0d73) /* 0.456067513 */, 17 },
+
+  /* 3824 */  { MAD_F(0x074cb43e) /* 0.456226581 */, 17 },
+  /* 3825 */  { MAD_F(0x074d5b0d) /* 0.456385663 */, 17 },
+  /* 3826 */  { MAD_F(0x074e01e0) /* 0.456544759 */, 17 },
+  /* 3827 */  { MAD_F(0x074ea8b7) /* 0.456703868 */, 17 },
+  /* 3828 */  { MAD_F(0x074f4f91) /* 0.456862992 */, 17 },
+  /* 3829 */  { MAD_F(0x074ff66f) /* 0.457022129 */, 17 },
+  /* 3830 */  { MAD_F(0x07509d51) /* 0.457181280 */, 17 },
+  /* 3831 */  { MAD_F(0x07514437) /* 0.457340445 */, 17 },
+  /* 3832 */  { MAD_F(0x0751eb20) /* 0.457499623 */, 17 },
+  /* 3833 */  { MAD_F(0x0752920d) /* 0.457658816 */, 17 },
+  /* 3834 */  { MAD_F(0x075338fd) /* 0.457818022 */, 17 },
+  /* 3835 */  { MAD_F(0x0753dff2) /* 0.457977243 */, 17 },
+  /* 3836 */  { MAD_F(0x075486ea) /* 0.458136477 */, 17 },
+  /* 3837 */  { MAD_F(0x07552de6) /* 0.458295725 */, 17 },
+  /* 3838 */  { MAD_F(0x0755d4e5) /* 0.458454987 */, 17 },
+  /* 3839 */  { MAD_F(0x07567be8) /* 0.458614262 */, 17 },
+
+  /* 3840 */  { MAD_F(0x075722ef) /* 0.458773552 */, 17 },
+  /* 3841 */  { MAD_F(0x0757c9fa) /* 0.458932855 */, 17 },
+  /* 3842 */  { MAD_F(0x07587108) /* 0.459092172 */, 17 },
+  /* 3843 */  { MAD_F(0x0759181a) /* 0.459251503 */, 17 },
+  /* 3844 */  { MAD_F(0x0759bf30) /* 0.459410848 */, 17 },
+  /* 3845 */  { MAD_F(0x075a664a) /* 0.459570206 */, 17 },
+  /* 3846 */  { MAD_F(0x075b0d67) /* 0.459729579 */, 17 },
+  /* 3847 */  { MAD_F(0x075bb488) /* 0.459888965 */, 17 },
+  /* 3848 */  { MAD_F(0x075c5bac) /* 0.460048365 */, 17 },
+  /* 3849 */  { MAD_F(0x075d02d5) /* 0.460207779 */, 17 },
+  /* 3850 */  { MAD_F(0x075daa01) /* 0.460367206 */, 17 },
+  /* 3851 */  { MAD_F(0x075e5130) /* 0.460526648 */, 17 },
+  /* 3852 */  { MAD_F(0x075ef864) /* 0.460686103 */, 17 },
+  /* 3853 */  { MAD_F(0x075f9f9b) /* 0.460845572 */, 17 },
+  /* 3854 */  { MAD_F(0x076046d6) /* 0.461005055 */, 17 },
+  /* 3855 */  { MAD_F(0x0760ee14) /* 0.461164552 */, 17 },
+
+  /* 3856 */  { MAD_F(0x07619557) /* 0.461324062 */, 17 },
+  /* 3857 */  { MAD_F(0x07623c9d) /* 0.461483586 */, 17 },
+  /* 3858 */  { MAD_F(0x0762e3e6) /* 0.461643124 */, 17 },
+  /* 3859 */  { MAD_F(0x07638b34) /* 0.461802676 */, 17 },
+  /* 3860 */  { MAD_F(0x07643285) /* 0.461962242 */, 17 },
+  /* 3861 */  { MAD_F(0x0764d9d9) /* 0.462121821 */, 17 },
+  /* 3862 */  { MAD_F(0x07658132) /* 0.462281414 */, 17 },
+  /* 3863 */  { MAD_F(0x0766288e) /* 0.462441021 */, 17 },
+  /* 3864 */  { MAD_F(0x0766cfee) /* 0.462600642 */, 17 },
+  /* 3865 */  { MAD_F(0x07677751) /* 0.462760276 */, 17 },
+  /* 3866 */  { MAD_F(0x07681eb9) /* 0.462919924 */, 17 },
+  /* 3867 */  { MAD_F(0x0768c624) /* 0.463079586 */, 17 },
+  /* 3868 */  { MAD_F(0x07696d92) /* 0.463239262 */, 17 },
+  /* 3869 */  { MAD_F(0x076a1505) /* 0.463398951 */, 17 },
+  /* 3870 */  { MAD_F(0x076abc7b) /* 0.463558655 */, 17 },
+  /* 3871 */  { MAD_F(0x076b63f4) /* 0.463718372 */, 17 },
+
+  /* 3872 */  { MAD_F(0x076c0b72) /* 0.463878102 */, 17 },
+  /* 3873 */  { MAD_F(0x076cb2f3) /* 0.464037847 */, 17 },
+  /* 3874 */  { MAD_F(0x076d5a78) /* 0.464197605 */, 17 },
+  /* 3875 */  { MAD_F(0x076e0200) /* 0.464357377 */, 17 },
+  /* 3876 */  { MAD_F(0x076ea98c) /* 0.464517163 */, 17 },
+  /* 3877 */  { MAD_F(0x076f511c) /* 0.464676962 */, 17 },
+  /* 3878 */  { MAD_F(0x076ff8b0) /* 0.464836776 */, 17 },
+  /* 3879 */  { MAD_F(0x0770a047) /* 0.464996603 */, 17 },
+  /* 3880 */  { MAD_F(0x077147e2) /* 0.465156443 */, 17 },
+  /* 3881 */  { MAD_F(0x0771ef80) /* 0.465316298 */, 17 },
+  /* 3882 */  { MAD_F(0x07729723) /* 0.465476166 */, 17 },
+  /* 3883 */  { MAD_F(0x07733ec9) /* 0.465636048 */, 17 },
+  /* 3884 */  { MAD_F(0x0773e672) /* 0.465795943 */, 17 },
+  /* 3885 */  { MAD_F(0x07748e20) /* 0.465955853 */, 17 },
+  /* 3886 */  { MAD_F(0x077535d1) /* 0.466115776 */, 17 },
+  /* 3887 */  { MAD_F(0x0775dd85) /* 0.466275713 */, 17 },
+
+  /* 3888 */  { MAD_F(0x0776853e) /* 0.466435663 */, 17 },
+  /* 3889 */  { MAD_F(0x07772cfa) /* 0.466595627 */, 17 },
+  /* 3890 */  { MAD_F(0x0777d4ba) /* 0.466755605 */, 17 },
+  /* 3891 */  { MAD_F(0x07787c7d) /* 0.466915597 */, 17 },
+  /* 3892 */  { MAD_F(0x07792444) /* 0.467075602 */, 17 },
+  /* 3893 */  { MAD_F(0x0779cc0f) /* 0.467235621 */, 17 },
+  /* 3894 */  { MAD_F(0x077a73dd) /* 0.467395654 */, 17 },
+  /* 3895 */  { MAD_F(0x077b1baf) /* 0.467555701 */, 17 },
+  /* 3896 */  { MAD_F(0x077bc385) /* 0.467715761 */, 17 },
+  /* 3897 */  { MAD_F(0x077c6b5f) /* 0.467875835 */, 17 },
+  /* 3898 */  { MAD_F(0x077d133c) /* 0.468035922 */, 17 },
+  /* 3899 */  { MAD_F(0x077dbb1d) /* 0.468196023 */, 17 },
+  /* 3900 */  { MAD_F(0x077e6301) /* 0.468356138 */, 17 },
+  /* 3901 */  { MAD_F(0x077f0ae9) /* 0.468516267 */, 17 },
+  /* 3902 */  { MAD_F(0x077fb2d5) /* 0.468676409 */, 17 },
+  /* 3903 */  { MAD_F(0x07805ac5) /* 0.468836565 */, 17 },
+
+  /* 3904 */  { MAD_F(0x078102b8) /* 0.468996735 */, 17 },
+  /* 3905 */  { MAD_F(0x0781aaaf) /* 0.469156918 */, 17 },
+  /* 3906 */  { MAD_F(0x078252aa) /* 0.469317115 */, 17 },
+  /* 3907 */  { MAD_F(0x0782faa8) /* 0.469477326 */, 17 },
+  /* 3908 */  { MAD_F(0x0783a2aa) /* 0.469637550 */, 17 },
+  /* 3909 */  { MAD_F(0x07844aaf) /* 0.469797788 */, 17 },
+  /* 3910 */  { MAD_F(0x0784f2b8) /* 0.469958040 */, 17 },
+  /* 3911 */  { MAD_F(0x07859ac5) /* 0.470118305 */, 17 },
+  /* 3912 */  { MAD_F(0x078642d6) /* 0.470278584 */, 17 },
+  /* 3913 */  { MAD_F(0x0786eaea) /* 0.470438877 */, 17 },
+  /* 3914 */  { MAD_F(0x07879302) /* 0.470599183 */, 17 },
+  /* 3915 */  { MAD_F(0x07883b1e) /* 0.470759503 */, 17 },
+  /* 3916 */  { MAD_F(0x0788e33d) /* 0.470919836 */, 17 },
+  /* 3917 */  { MAD_F(0x07898b60) /* 0.471080184 */, 17 },
+  /* 3918 */  { MAD_F(0x078a3386) /* 0.471240545 */, 17 },
+  /* 3919 */  { MAD_F(0x078adbb0) /* 0.471400919 */, 17 },
+
+  /* 3920 */  { MAD_F(0x078b83de) /* 0.471561307 */, 17 },
+  /* 3921 */  { MAD_F(0x078c2c10) /* 0.471721709 */, 17 },
+  /* 3922 */  { MAD_F(0x078cd445) /* 0.471882125 */, 17 },
+  /* 3923 */  { MAD_F(0x078d7c7e) /* 0.472042554 */, 17 },
+  /* 3924 */  { MAD_F(0x078e24ba) /* 0.472202996 */, 17 },
+  /* 3925 */  { MAD_F(0x078eccfb) /* 0.472363453 */, 17 },
+  /* 3926 */  { MAD_F(0x078f753e) /* 0.472523923 */, 17 },
+  /* 3927 */  { MAD_F(0x07901d86) /* 0.472684406 */, 17 },
+  /* 3928 */  { MAD_F(0x0790c5d1) /* 0.472844904 */, 17 },
+  /* 3929 */  { MAD_F(0x07916e20) /* 0.473005414 */, 17 },
+  /* 3930 */  { MAD_F(0x07921672) /* 0.473165939 */, 17 },
+  /* 3931 */  { MAD_F(0x0792bec8) /* 0.473326477 */, 17 },
+  /* 3932 */  { MAD_F(0x07936722) /* 0.473487029 */, 17 },
+  /* 3933 */  { MAD_F(0x07940f80) /* 0.473647594 */, 17 },
+  /* 3934 */  { MAD_F(0x0794b7e1) /* 0.473808173 */, 17 },
+  /* 3935 */  { MAD_F(0x07956045) /* 0.473968765 */, 17 },
+
+  /* 3936 */  { MAD_F(0x079608ae) /* 0.474129372 */, 17 },
+  /* 3937 */  { MAD_F(0x0796b11a) /* 0.474289991 */, 17 },
+  /* 3938 */  { MAD_F(0x0797598a) /* 0.474450625 */, 17 },
+  /* 3939 */  { MAD_F(0x079801fd) /* 0.474611272 */, 17 },
+  /* 3940 */  { MAD_F(0x0798aa74) /* 0.474771932 */, 17 },
+  /* 3941 */  { MAD_F(0x079952ee) /* 0.474932606 */, 17 },
+  /* 3942 */  { MAD_F(0x0799fb6d) /* 0.475093294 */, 17 },
+  /* 3943 */  { MAD_F(0x079aa3ef) /* 0.475253995 */, 17 },
+  /* 3944 */  { MAD_F(0x079b4c74) /* 0.475414710 */, 17 },
+  /* 3945 */  { MAD_F(0x079bf4fd) /* 0.475575439 */, 17 },
+  /* 3946 */  { MAD_F(0x079c9d8a) /* 0.475736181 */, 17 },
+  /* 3947 */  { MAD_F(0x079d461b) /* 0.475896936 */, 17 },
+  /* 3948 */  { MAD_F(0x079deeaf) /* 0.476057705 */, 17 },
+  /* 3949 */  { MAD_F(0x079e9747) /* 0.476218488 */, 17 },
+  /* 3950 */  { MAD_F(0x079f3fe2) /* 0.476379285 */, 17 },
+  /* 3951 */  { MAD_F(0x079fe881) /* 0.476540095 */, 17 },
+
+  /* 3952 */  { MAD_F(0x07a09124) /* 0.476700918 */, 17 },
+  /* 3953 */  { MAD_F(0x07a139ca) /* 0.476861755 */, 17 },
+  /* 3954 */  { MAD_F(0x07a1e274) /* 0.477022606 */, 17 },
+  /* 3955 */  { MAD_F(0x07a28b22) /* 0.477183470 */, 17 },
+  /* 3956 */  { MAD_F(0x07a333d3) /* 0.477344348 */, 17 },
+  /* 3957 */  { MAD_F(0x07a3dc88) /* 0.477505239 */, 17 },
+  /* 3958 */  { MAD_F(0x07a48541) /* 0.477666144 */, 17 },
+  /* 3959 */  { MAD_F(0x07a52dfd) /* 0.477827062 */, 17 },
+  /* 3960 */  { MAD_F(0x07a5d6bd) /* 0.477987994 */, 17 },
+  /* 3961 */  { MAD_F(0x07a67f80) /* 0.478148940 */, 17 },
+  /* 3962 */  { MAD_F(0x07a72847) /* 0.478309899 */, 17 },
+  /* 3963 */  { MAD_F(0x07a7d112) /* 0.478470871 */, 17 },
+  /* 3964 */  { MAD_F(0x07a879e1) /* 0.478631857 */, 17 },
+  /* 3965 */  { MAD_F(0x07a922b3) /* 0.478792857 */, 17 },
+  /* 3966 */  { MAD_F(0x07a9cb88) /* 0.478953870 */, 17 },
+  /* 3967 */  { MAD_F(0x07aa7462) /* 0.479114897 */, 17 },
+
+  /* 3968 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */, 17 },
+  /* 3969 */  { MAD_F(0x07abc61f) /* 0.479436991 */, 17 },
+  /* 3970 */  { MAD_F(0x07ac6f03) /* 0.479598058 */, 17 },
+  /* 3971 */  { MAD_F(0x07ad17eb) /* 0.479759139 */, 17 },
+  /* 3972 */  { MAD_F(0x07adc0d6) /* 0.479920233 */, 17 },
+  /* 3973 */  { MAD_F(0x07ae69c6) /* 0.480081341 */, 17 },
+  /* 3974 */  { MAD_F(0x07af12b8) /* 0.480242463 */, 17 },
+  /* 3975 */  { MAD_F(0x07afbbaf) /* 0.480403598 */, 17 },
+  /* 3976 */  { MAD_F(0x07b064a8) /* 0.480564746 */, 17 },
+  /* 3977 */  { MAD_F(0x07b10da6) /* 0.480725908 */, 17 },
+  /* 3978 */  { MAD_F(0x07b1b6a7) /* 0.480887083 */, 17 },
+  /* 3979 */  { MAD_F(0x07b25fac) /* 0.481048272 */, 17 },
+  /* 3980 */  { MAD_F(0x07b308b5) /* 0.481209475 */, 17 },
+  /* 3981 */  { MAD_F(0x07b3b1c1) /* 0.481370691 */, 17 },
+  /* 3982 */  { MAD_F(0x07b45ad0) /* 0.481531920 */, 17 },
+  /* 3983 */  { MAD_F(0x07b503e4) /* 0.481693163 */, 17 },
+
+  /* 3984 */  { MAD_F(0x07b5acfb) /* 0.481854420 */, 17 },
+  /* 3985 */  { MAD_F(0x07b65615) /* 0.482015690 */, 17 },
+  /* 3986 */  { MAD_F(0x07b6ff33) /* 0.482176973 */, 17 },
+  /* 3987 */  { MAD_F(0x07b7a855) /* 0.482338270 */, 17 },
+  /* 3988 */  { MAD_F(0x07b8517b) /* 0.482499580 */, 17 },
+  /* 3989 */  { MAD_F(0x07b8faa4) /* 0.482660904 */, 17 },
+  /* 3990 */  { MAD_F(0x07b9a3d0) /* 0.482822242 */, 17 },
+  /* 3991 */  { MAD_F(0x07ba4d01) /* 0.482983592 */, 17 },
+  /* 3992 */  { MAD_F(0x07baf635) /* 0.483144957 */, 17 },
+  /* 3993 */  { MAD_F(0x07bb9f6c) /* 0.483306335 */, 17 },
+  /* 3994 */  { MAD_F(0x07bc48a7) /* 0.483467726 */, 17 },
+  /* 3995 */  { MAD_F(0x07bcf1e6) /* 0.483629131 */, 17 },
+  /* 3996 */  { MAD_F(0x07bd9b28) /* 0.483790549 */, 17 },
+  /* 3997 */  { MAD_F(0x07be446e) /* 0.483951980 */, 17 },
+  /* 3998 */  { MAD_F(0x07beedb8) /* 0.484113426 */, 17 },
+  /* 3999 */  { MAD_F(0x07bf9705) /* 0.484274884 */, 17 },
+
+  /* 4000 */  { MAD_F(0x07c04056) /* 0.484436356 */, 17 },
+  /* 4001 */  { MAD_F(0x07c0e9aa) /* 0.484597842 */, 17 },
+  /* 4002 */  { MAD_F(0x07c19302) /* 0.484759341 */, 17 },
+  /* 4003 */  { MAD_F(0x07c23c5e) /* 0.484920853 */, 17 },
+  /* 4004 */  { MAD_F(0x07c2e5bd) /* 0.485082379 */, 17 },
+  /* 4005 */  { MAD_F(0x07c38f20) /* 0.485243918 */, 17 },
+  /* 4006 */  { MAD_F(0x07c43887) /* 0.485405471 */, 17 },
+  /* 4007 */  { MAD_F(0x07c4e1f1) /* 0.485567037 */, 17 },
+  /* 4008 */  { MAD_F(0x07c58b5f) /* 0.485728617 */, 17 },
+  /* 4009 */  { MAD_F(0x07c634d0) /* 0.485890210 */, 17 },
+  /* 4010 */  { MAD_F(0x07c6de45) /* 0.486051817 */, 17 },
+  /* 4011 */  { MAD_F(0x07c787bd) /* 0.486213436 */, 17 },
+  /* 4012 */  { MAD_F(0x07c83139) /* 0.486375070 */, 17 },
+  /* 4013 */  { MAD_F(0x07c8dab9) /* 0.486536717 */, 17 },
+  /* 4014 */  { MAD_F(0x07c9843c) /* 0.486698377 */, 17 },
+  /* 4015 */  { MAD_F(0x07ca2dc3) /* 0.486860051 */, 17 },
+
+  /* 4016 */  { MAD_F(0x07cad74e) /* 0.487021738 */, 17 },
+  /* 4017 */  { MAD_F(0x07cb80dc) /* 0.487183438 */, 17 },
+  /* 4018 */  { MAD_F(0x07cc2a6e) /* 0.487345152 */, 17 },
+  /* 4019 */  { MAD_F(0x07ccd403) /* 0.487506879 */, 17 },
+  /* 4020 */  { MAD_F(0x07cd7d9c) /* 0.487668620 */, 17 },
+  /* 4021 */  { MAD_F(0x07ce2739) /* 0.487830374 */, 17 },
+  /* 4022 */  { MAD_F(0x07ced0d9) /* 0.487992142 */, 17 },
+  /* 4023 */  { MAD_F(0x07cf7a7d) /* 0.488153923 */, 17 },
+  /* 4024 */  { MAD_F(0x07d02424) /* 0.488315717 */, 17 },
+  /* 4025 */  { MAD_F(0x07d0cdcf) /* 0.488477525 */, 17 },
+  /* 4026 */  { MAD_F(0x07d1777e) /* 0.488639346 */, 17 },
+  /* 4027 */  { MAD_F(0x07d22130) /* 0.488801181 */, 17 },
+  /* 4028 */  { MAD_F(0x07d2cae5) /* 0.488963029 */, 17 },
+  /* 4029 */  { MAD_F(0x07d3749f) /* 0.489124890 */, 17 },
+  /* 4030 */  { MAD_F(0x07d41e5c) /* 0.489286765 */, 17 },
+  /* 4031 */  { MAD_F(0x07d4c81c) /* 0.489448653 */, 17 },
+
+  /* 4032 */  { MAD_F(0x07d571e0) /* 0.489610555 */, 17 },
+  /* 4033 */  { MAD_F(0x07d61ba8) /* 0.489772470 */, 17 },
+  /* 4034 */  { MAD_F(0x07d6c573) /* 0.489934398 */, 17 },
+  /* 4035 */  { MAD_F(0x07d76f42) /* 0.490096340 */, 17 },
+  /* 4036 */  { MAD_F(0x07d81915) /* 0.490258295 */, 17 },
+  /* 4037 */  { MAD_F(0x07d8c2eb) /* 0.490420263 */, 17 },
+  /* 4038 */  { MAD_F(0x07d96cc4) /* 0.490582245 */, 17 },
+  /* 4039 */  { MAD_F(0x07da16a2) /* 0.490744240 */, 17 },
+  /* 4040 */  { MAD_F(0x07dac083) /* 0.490906249 */, 17 },
+  /* 4041 */  { MAD_F(0x07db6a67) /* 0.491068271 */, 17 },
+  /* 4042 */  { MAD_F(0x07dc144f) /* 0.491230306 */, 17 },
+  /* 4043 */  { MAD_F(0x07dcbe3b) /* 0.491392355 */, 17 },
+  /* 4044 */  { MAD_F(0x07dd682a) /* 0.491554417 */, 17 },
+  /* 4045 */  { MAD_F(0x07de121d) /* 0.491716492 */, 17 },
+  /* 4046 */  { MAD_F(0x07debc13) /* 0.491878581 */, 17 },
+  /* 4047 */  { MAD_F(0x07df660d) /* 0.492040683 */, 17 },
+
+  /* 4048 */  { MAD_F(0x07e0100a) /* 0.492202799 */, 17 },
+  /* 4049 */  { MAD_F(0x07e0ba0c) /* 0.492364928 */, 17 },
+  /* 4050 */  { MAD_F(0x07e16410) /* 0.492527070 */, 17 },
+  /* 4051 */  { MAD_F(0x07e20e19) /* 0.492689225 */, 17 },
+  /* 4052 */  { MAD_F(0x07e2b824) /* 0.492851394 */, 17 },
+  /* 4053 */  { MAD_F(0x07e36234) /* 0.493013576 */, 17 },
+  /* 4054 */  { MAD_F(0x07e40c47) /* 0.493175772 */, 17 },
+  /* 4055 */  { MAD_F(0x07e4b65e) /* 0.493337981 */, 17 },
+  /* 4056 */  { MAD_F(0x07e56078) /* 0.493500203 */, 17 },
+  /* 4057 */  { MAD_F(0x07e60a95) /* 0.493662438 */, 17 },
+  /* 4058 */  { MAD_F(0x07e6b4b7) /* 0.493824687 */, 17 },
+  /* 4059 */  { MAD_F(0x07e75edc) /* 0.493986949 */, 17 },
+  /* 4060 */  { MAD_F(0x07e80904) /* 0.494149225 */, 17 },
+  /* 4061 */  { MAD_F(0x07e8b330) /* 0.494311514 */, 17 },
+  /* 4062 */  { MAD_F(0x07e95d60) /* 0.494473816 */, 17 },
+  /* 4063 */  { MAD_F(0x07ea0793) /* 0.494636131 */, 17 },
+
+  /* 4064 */  { MAD_F(0x07eab1ca) /* 0.494798460 */, 17 },
+  /* 4065 */  { MAD_F(0x07eb5c04) /* 0.494960802 */, 17 },
+  /* 4066 */  { MAD_F(0x07ec0642) /* 0.495123158 */, 17 },
+  /* 4067 */  { MAD_F(0x07ecb084) /* 0.495285526 */, 17 },
+  /* 4068 */  { MAD_F(0x07ed5ac9) /* 0.495447908 */, 17 },
+  /* 4069 */  { MAD_F(0x07ee0512) /* 0.495610304 */, 17 },
+  /* 4070 */  { MAD_F(0x07eeaf5e) /* 0.495772712 */, 17 },
+  /* 4071 */  { MAD_F(0x07ef59ae) /* 0.495935134 */, 17 },
+  /* 4072 */  { MAD_F(0x07f00401) /* 0.496097570 */, 17 },
+  /* 4073 */  { MAD_F(0x07f0ae58) /* 0.496260018 */, 17 },
+  /* 4074 */  { MAD_F(0x07f158b3) /* 0.496422480 */, 17 },
+  /* 4075 */  { MAD_F(0x07f20311) /* 0.496584955 */, 17 },
+  /* 4076 */  { MAD_F(0x07f2ad72) /* 0.496747444 */, 17 },
+  /* 4077 */  { MAD_F(0x07f357d8) /* 0.496909945 */, 17 },
+  /* 4078 */  { MAD_F(0x07f40240) /* 0.497072460 */, 17 },
+  /* 4079 */  { MAD_F(0x07f4acad) /* 0.497234989 */, 17 },
+
+  /* 4080 */  { MAD_F(0x07f5571d) /* 0.497397530 */, 17 },
+  /* 4081 */  { MAD_F(0x07f60190) /* 0.497560085 */, 17 },
+  /* 4082 */  { MAD_F(0x07f6ac07) /* 0.497722653 */, 17 },
+  /* 4083 */  { MAD_F(0x07f75682) /* 0.497885235 */, 17 },
+  /* 4084 */  { MAD_F(0x07f80100) /* 0.498047829 */, 17 },
+  /* 4085 */  { MAD_F(0x07f8ab82) /* 0.498210437 */, 17 },
+  /* 4086 */  { MAD_F(0x07f95607) /* 0.498373058 */, 17 },
+  /* 4087 */  { MAD_F(0x07fa0090) /* 0.498535693 */, 17 },
+  /* 4088 */  { MAD_F(0x07faab1c) /* 0.498698341 */, 17 },
+  /* 4089 */  { MAD_F(0x07fb55ac) /* 0.498861002 */, 17 },
+  /* 4090 */  { MAD_F(0x07fc0040) /* 0.499023676 */, 17 },
+  /* 4091 */  { MAD_F(0x07fcaad7) /* 0.499186364 */, 17 },
+  /* 4092 */  { MAD_F(0x07fd5572) /* 0.499349064 */, 17 },
+  /* 4093 */  { MAD_F(0x07fe0010) /* 0.499511778 */, 17 },
+  /* 4094 */  { MAD_F(0x07feaab2) /* 0.499674506 */, 17 },
+  /* 4095 */  { MAD_F(0x07ff5557) /* 0.499837246 */, 17 },
+
+  /* 4096 */  { MAD_F(0x04000000) /* 0.250000000 */, 18 },
+  /* 4097 */  { MAD_F(0x04005556) /* 0.250081384 */, 18 },
+  /* 4098 */  { MAD_F(0x0400aaae) /* 0.250162774 */, 18 },
+  /* 4099 */  { MAD_F(0x04010008) /* 0.250244170 */, 18 },
+  /* 4100 */  { MAD_F(0x04015563) /* 0.250325574 */, 18 },
+  /* 4101 */  { MAD_F(0x0401aac1) /* 0.250406984 */, 18 },
+  /* 4102 */  { MAD_F(0x04020020) /* 0.250488400 */, 18 },
+  /* 4103 */  { MAD_F(0x04025581) /* 0.250569824 */, 18 },
+  /* 4104 */  { MAD_F(0x0402aae3) /* 0.250651254 */, 18 },
+  /* 4105 */  { MAD_F(0x04030048) /* 0.250732690 */, 18 },
+  /* 4106 */  { MAD_F(0x040355ae) /* 0.250814133 */, 18 },
+  /* 4107 */  { MAD_F(0x0403ab16) /* 0.250895583 */, 18 },
+  /* 4108 */  { MAD_F(0x04040080) /* 0.250977039 */, 18 },
+  /* 4109 */  { MAD_F(0x040455eb) /* 0.251058502 */, 18 },
+  /* 4110 */  { MAD_F(0x0404ab59) /* 0.251139971 */, 18 },
+  /* 4111 */  { MAD_F(0x040500c8) /* 0.251221448 */, 18 },
+
+  /* 4112 */  { MAD_F(0x04055638) /* 0.251302930 */, 18 },
+  /* 4113 */  { MAD_F(0x0405abab) /* 0.251384420 */, 18 },
+  /* 4114 */  { MAD_F(0x0406011f) /* 0.251465916 */, 18 },
+  /* 4115 */  { MAD_F(0x04065696) /* 0.251547418 */, 18 },
+  /* 4116 */  { MAD_F(0x0406ac0e) /* 0.251628927 */, 18 },
+  /* 4117 */  { MAD_F(0x04070187) /* 0.251710443 */, 18 },
+  /* 4118 */  { MAD_F(0x04075703) /* 0.251791965 */, 18 },
+  /* 4119 */  { MAD_F(0x0407ac80) /* 0.251873494 */, 18 },
+  /* 4120 */  { MAD_F(0x040801ff) /* 0.251955030 */, 18 },
+  /* 4121 */  { MAD_F(0x04085780) /* 0.252036572 */, 18 },
+  /* 4122 */  { MAD_F(0x0408ad02) /* 0.252118121 */, 18 },
+  /* 4123 */  { MAD_F(0x04090287) /* 0.252199676 */, 18 },
+  /* 4124 */  { MAD_F(0x0409580d) /* 0.252281238 */, 18 },
+  /* 4125 */  { MAD_F(0x0409ad95) /* 0.252362807 */, 18 },
+  /* 4126 */  { MAD_F(0x040a031e) /* 0.252444382 */, 18 },
+  /* 4127 */  { MAD_F(0x040a58aa) /* 0.252525963 */, 18 },
+
+  /* 4128 */  { MAD_F(0x040aae37) /* 0.252607552 */, 18 },
+  /* 4129 */  { MAD_F(0x040b03c6) /* 0.252689147 */, 18 },
+  /* 4130 */  { MAD_F(0x040b5957) /* 0.252770748 */, 18 },
+  /* 4131 */  { MAD_F(0x040baee9) /* 0.252852356 */, 18 },
+  /* 4132 */  { MAD_F(0x040c047e) /* 0.252933971 */, 18 },
+  /* 4133 */  { MAD_F(0x040c5a14) /* 0.253015592 */, 18 },
+  /* 4134 */  { MAD_F(0x040cafab) /* 0.253097220 */, 18 },
+  /* 4135 */  { MAD_F(0x040d0545) /* 0.253178854 */, 18 },
+  /* 4136 */  { MAD_F(0x040d5ae0) /* 0.253260495 */, 18 },
+  /* 4137 */  { MAD_F(0x040db07d) /* 0.253342143 */, 18 },
+  /* 4138 */  { MAD_F(0x040e061c) /* 0.253423797 */, 18 },
+  /* 4139 */  { MAD_F(0x040e5bbd) /* 0.253505457 */, 18 },
+  /* 4140 */  { MAD_F(0x040eb15f) /* 0.253587125 */, 18 },
+  /* 4141 */  { MAD_F(0x040f0703) /* 0.253668799 */, 18 },
+  /* 4142 */  { MAD_F(0x040f5ca9) /* 0.253750479 */, 18 },
+  /* 4143 */  { MAD_F(0x040fb251) /* 0.253832166 */, 18 },
+
+  /* 4144 */  { MAD_F(0x041007fa) /* 0.253913860 */, 18 },
+  /* 4145 */  { MAD_F(0x04105da6) /* 0.253995560 */, 18 },
+  /* 4146 */  { MAD_F(0x0410b353) /* 0.254077266 */, 18 },
+  /* 4147 */  { MAD_F(0x04110901) /* 0.254158980 */, 18 },
+  /* 4148 */  { MAD_F(0x04115eb2) /* 0.254240700 */, 18 },
+  /* 4149 */  { MAD_F(0x0411b464) /* 0.254322426 */, 18 },
+  /* 4150 */  { MAD_F(0x04120a18) /* 0.254404159 */, 18 },
+  /* 4151 */  { MAD_F(0x04125fce) /* 0.254485899 */, 18 },
+  /* 4152 */  { MAD_F(0x0412b586) /* 0.254567645 */, 18 },
+  /* 4153 */  { MAD_F(0x04130b3f) /* 0.254649397 */, 18 },
+  /* 4154 */  { MAD_F(0x041360fa) /* 0.254731157 */, 18 },
+  /* 4155 */  { MAD_F(0x0413b6b7) /* 0.254812922 */, 18 },
+  /* 4156 */  { MAD_F(0x04140c75) /* 0.254894695 */, 18 },
+  /* 4157 */  { MAD_F(0x04146236) /* 0.254976474 */, 18 },
+  /* 4158 */  { MAD_F(0x0414b7f8) /* 0.255058259 */, 18 },
+  /* 4159 */  { MAD_F(0x04150dbc) /* 0.255140051 */, 18 },
+
+  /* 4160 */  { MAD_F(0x04156381) /* 0.255221850 */, 18 },
+  /* 4161 */  { MAD_F(0x0415b949) /* 0.255303655 */, 18 },
+  /* 4162 */  { MAD_F(0x04160f12) /* 0.255385467 */, 18 },
+  /* 4163 */  { MAD_F(0x041664dd) /* 0.255467285 */, 18 },
+  /* 4164 */  { MAD_F(0x0416baaa) /* 0.255549110 */, 18 },
+  /* 4165 */  { MAD_F(0x04171078) /* 0.255630941 */, 18 },
+  /* 4166 */  { MAD_F(0x04176648) /* 0.255712779 */, 18 },
+  /* 4167 */  { MAD_F(0x0417bc1a) /* 0.255794624 */, 18 },
+  /* 4168 */  { MAD_F(0x041811ee) /* 0.255876475 */, 18 },
+  /* 4169 */  { MAD_F(0x041867c3) /* 0.255958332 */, 18 },
+  /* 4170 */  { MAD_F(0x0418bd9b) /* 0.256040196 */, 18 },
+  /* 4171 */  { MAD_F(0x04191374) /* 0.256122067 */, 18 },
+  /* 4172 */  { MAD_F(0x0419694e) /* 0.256203944 */, 18 },
+  /* 4173 */  { MAD_F(0x0419bf2b) /* 0.256285828 */, 18 },
+  /* 4174 */  { MAD_F(0x041a1509) /* 0.256367718 */, 18 },
+  /* 4175 */  { MAD_F(0x041a6ae9) /* 0.256449615 */, 18 },
+
+  /* 4176 */  { MAD_F(0x041ac0cb) /* 0.256531518 */, 18 },
+  /* 4177 */  { MAD_F(0x041b16ae) /* 0.256613428 */, 18 },
+  /* 4178 */  { MAD_F(0x041b6c94) /* 0.256695344 */, 18 },
+  /* 4179 */  { MAD_F(0x041bc27b) /* 0.256777267 */, 18 },
+  /* 4180 */  { MAD_F(0x041c1863) /* 0.256859197 */, 18 },
+  /* 4181 */  { MAD_F(0x041c6e4e) /* 0.256941133 */, 18 },
+  /* 4182 */  { MAD_F(0x041cc43a) /* 0.257023076 */, 18 },
+  /* 4183 */  { MAD_F(0x041d1a28) /* 0.257105025 */, 18 },
+  /* 4184 */  { MAD_F(0x041d7018) /* 0.257186980 */, 18 },
+  /* 4185 */  { MAD_F(0x041dc60a) /* 0.257268942 */, 18 },
+  /* 4186 */  { MAD_F(0x041e1bfd) /* 0.257350911 */, 18 },
+  /* 4187 */  { MAD_F(0x041e71f2) /* 0.257432886 */, 18 },
+  /* 4188 */  { MAD_F(0x041ec7e9) /* 0.257514868 */, 18 },
+  /* 4189 */  { MAD_F(0x041f1de1) /* 0.257596856 */, 18 },
+  /* 4190 */  { MAD_F(0x041f73dc) /* 0.257678851 */, 18 },
+  /* 4191 */  { MAD_F(0x041fc9d8) /* 0.257760852 */, 18 },
+
+  /* 4192 */  { MAD_F(0x04201fd5) /* 0.257842860 */, 18 },
+  /* 4193 */  { MAD_F(0x042075d5) /* 0.257924875 */, 18 },
+  /* 4194 */  { MAD_F(0x0420cbd6) /* 0.258006895 */, 18 },
+  /* 4195 */  { MAD_F(0x042121d9) /* 0.258088923 */, 18 },
+  /* 4196 */  { MAD_F(0x042177de) /* 0.258170957 */, 18 },
+  /* 4197 */  { MAD_F(0x0421cde5) /* 0.258252997 */, 18 },
+  /* 4198 */  { MAD_F(0x042223ed) /* 0.258335044 */, 18 },
+  /* 4199 */  { MAD_F(0x042279f7) /* 0.258417097 */, 18 },
+  /* 4200 */  { MAD_F(0x0422d003) /* 0.258499157 */, 18 },
+  /* 4201 */  { MAD_F(0x04232611) /* 0.258581224 */, 18 },
+  /* 4202 */  { MAD_F(0x04237c20) /* 0.258663297 */, 18 },
+  /* 4203 */  { MAD_F(0x0423d231) /* 0.258745376 */, 18 },
+  /* 4204 */  { MAD_F(0x04242844) /* 0.258827462 */, 18 },
+  /* 4205 */  { MAD_F(0x04247e58) /* 0.258909555 */, 18 },
+  /* 4206 */  { MAD_F(0x0424d46e) /* 0.258991654 */, 18 },
+  /* 4207 */  { MAD_F(0x04252a87) /* 0.259073760 */, 18 },
+
+  /* 4208 */  { MAD_F(0x042580a0) /* 0.259155872 */, 18 },
+  /* 4209 */  { MAD_F(0x0425d6bc) /* 0.259237990 */, 18 },
+  /* 4210 */  { MAD_F(0x04262cd9) /* 0.259320115 */, 18 },
+  /* 4211 */  { MAD_F(0x042682f8) /* 0.259402247 */, 18 },
+  /* 4212 */  { MAD_F(0x0426d919) /* 0.259484385 */, 18 },
+  /* 4213 */  { MAD_F(0x04272f3b) /* 0.259566529 */, 18 },
+  /* 4214 */  { MAD_F(0x04278560) /* 0.259648680 */, 18 },
+  /* 4215 */  { MAD_F(0x0427db86) /* 0.259730838 */, 18 },
+  /* 4216 */  { MAD_F(0x042831ad) /* 0.259813002 */, 18 },
+  /* 4217 */  { MAD_F(0x042887d7) /* 0.259895173 */, 18 },
+  /* 4218 */  { MAD_F(0x0428de02) /* 0.259977350 */, 18 },
+  /* 4219 */  { MAD_F(0x0429342f) /* 0.260059533 */, 18 },
+  /* 4220 */  { MAD_F(0x04298a5e) /* 0.260141723 */, 18 },
+  /* 4221 */  { MAD_F(0x0429e08e) /* 0.260223920 */, 18 },
+  /* 4222 */  { MAD_F(0x042a36c0) /* 0.260306123 */, 18 },
+  /* 4223 */  { MAD_F(0x042a8cf4) /* 0.260388332 */, 18 },
+
+  /* 4224 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 18 },
+  /* 4225 */  { MAD_F(0x042b3962) /* 0.260552771 */, 18 },
+  /* 4226 */  { MAD_F(0x042b8f9b) /* 0.260635000 */, 18 },
+  /* 4227 */  { MAD_F(0x042be5d6) /* 0.260717235 */, 18 },
+  /* 4228 */  { MAD_F(0x042c3c12) /* 0.260799477 */, 18 },
+  /* 4229 */  { MAD_F(0x042c9251) /* 0.260881725 */, 18 },
+  /* 4230 */  { MAD_F(0x042ce891) /* 0.260963980 */, 18 },
+  /* 4231 */  { MAD_F(0x042d3ed3) /* 0.261046242 */, 18 },
+  /* 4232 */  { MAD_F(0x042d9516) /* 0.261128510 */, 18 },
+  /* 4233 */  { MAD_F(0x042deb5c) /* 0.261210784 */, 18 },
+  /* 4234 */  { MAD_F(0x042e41a3) /* 0.261293065 */, 18 },
+  /* 4235 */  { MAD_F(0x042e97ec) /* 0.261375352 */, 18 },
+  /* 4236 */  { MAD_F(0x042eee36) /* 0.261457646 */, 18 },
+  /* 4237 */  { MAD_F(0x042f4482) /* 0.261539946 */, 18 },
+  /* 4238 */  { MAD_F(0x042f9ad1) /* 0.261622253 */, 18 },
+  /* 4239 */  { MAD_F(0x042ff120) /* 0.261704566 */, 18 },
+
+  /* 4240 */  { MAD_F(0x04304772) /* 0.261786886 */, 18 },
+  /* 4241 */  { MAD_F(0x04309dc5) /* 0.261869212 */, 18 },
+  /* 4242 */  { MAD_F(0x0430f41a) /* 0.261951545 */, 18 },
+  /* 4243 */  { MAD_F(0x04314a71) /* 0.262033884 */, 18 },
+  /* 4244 */  { MAD_F(0x0431a0c9) /* 0.262116229 */, 18 },
+  /* 4245 */  { MAD_F(0x0431f723) /* 0.262198581 */, 18 },
+  /* 4246 */  { MAD_F(0x04324d7f) /* 0.262280940 */, 18 },
+  /* 4247 */  { MAD_F(0x0432a3dd) /* 0.262363305 */, 18 },
+  /* 4248 */  { MAD_F(0x0432fa3d) /* 0.262445676 */, 18 },
+  /* 4249 */  { MAD_F(0x0433509e) /* 0.262528054 */, 18 },
+  /* 4250 */  { MAD_F(0x0433a701) /* 0.262610438 */, 18 },
+  /* 4251 */  { MAD_F(0x0433fd65) /* 0.262692829 */, 18 },
+  /* 4252 */  { MAD_F(0x043453cc) /* 0.262775227 */, 18 },
+  /* 4253 */  { MAD_F(0x0434aa34) /* 0.262857630 */, 18 },
+  /* 4254 */  { MAD_F(0x0435009d) /* 0.262940040 */, 18 },
+  /* 4255 */  { MAD_F(0x04355709) /* 0.263022457 */, 18 },
+
+  /* 4256 */  { MAD_F(0x0435ad76) /* 0.263104880 */, 18 },
+  /* 4257 */  { MAD_F(0x043603e5) /* 0.263187310 */, 18 },
+  /* 4258 */  { MAD_F(0x04365a56) /* 0.263269746 */, 18 },
+  /* 4259 */  { MAD_F(0x0436b0c9) /* 0.263352188 */, 18 },
+  /* 4260 */  { MAD_F(0x0437073d) /* 0.263434637 */, 18 },
+  /* 4261 */  { MAD_F(0x04375db3) /* 0.263517093 */, 18 },
+  /* 4262 */  { MAD_F(0x0437b42a) /* 0.263599554 */, 18 },
+  /* 4263 */  { MAD_F(0x04380aa4) /* 0.263682023 */, 18 },
+  /* 4264 */  { MAD_F(0x0438611f) /* 0.263764497 */, 18 },
+  /* 4265 */  { MAD_F(0x0438b79c) /* 0.263846979 */, 18 },
+  /* 4266 */  { MAD_F(0x04390e1a) /* 0.263929466 */, 18 },
+  /* 4267 */  { MAD_F(0x0439649b) /* 0.264011960 */, 18 },
+  /* 4268 */  { MAD_F(0x0439bb1d) /* 0.264094461 */, 18 },
+  /* 4269 */  { MAD_F(0x043a11a1) /* 0.264176968 */, 18 },
+  /* 4270 */  { MAD_F(0x043a6826) /* 0.264259481 */, 18 },
+  /* 4271 */  { MAD_F(0x043abead) /* 0.264342001 */, 18 },
+
+  /* 4272 */  { MAD_F(0x043b1536) /* 0.264424527 */, 18 },
+  /* 4273 */  { MAD_F(0x043b6bc1) /* 0.264507060 */, 18 },
+  /* 4274 */  { MAD_F(0x043bc24d) /* 0.264589599 */, 18 },
+  /* 4275 */  { MAD_F(0x043c18dc) /* 0.264672145 */, 18 },
+  /* 4276 */  { MAD_F(0x043c6f6c) /* 0.264754697 */, 18 },
+  /* 4277 */  { MAD_F(0x043cc5fd) /* 0.264837255 */, 18 },
+  /* 4278 */  { MAD_F(0x043d1c91) /* 0.264919820 */, 18 },
+  /* 4279 */  { MAD_F(0x043d7326) /* 0.265002392 */, 18 },
+  /* 4280 */  { MAD_F(0x043dc9bc) /* 0.265084969 */, 18 },
+  /* 4281 */  { MAD_F(0x043e2055) /* 0.265167554 */, 18 },
+  /* 4282 */  { MAD_F(0x043e76ef) /* 0.265250144 */, 18 },
+  /* 4283 */  { MAD_F(0x043ecd8b) /* 0.265332741 */, 18 },
+  /* 4284 */  { MAD_F(0x043f2429) /* 0.265415345 */, 18 },
+  /* 4285 */  { MAD_F(0x043f7ac8) /* 0.265497955 */, 18 },
+  /* 4286 */  { MAD_F(0x043fd169) /* 0.265580571 */, 18 },
+  /* 4287 */  { MAD_F(0x0440280c) /* 0.265663194 */, 18 },
+
+  /* 4288 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 18 },
+  /* 4289 */  { MAD_F(0x0440d557) /* 0.265828459 */, 18 },
+  /* 4290 */  { MAD_F(0x04412bff) /* 0.265911101 */, 18 },
+  /* 4291 */  { MAD_F(0x044182a9) /* 0.265993749 */, 18 },
+  /* 4292 */  { MAD_F(0x0441d955) /* 0.266076404 */, 18 },
+  /* 4293 */  { MAD_F(0x04423002) /* 0.266159065 */, 18 },
+  /* 4294 */  { MAD_F(0x044286b1) /* 0.266241733 */, 18 },
+  /* 4295 */  { MAD_F(0x0442dd61) /* 0.266324407 */, 18 },
+  /* 4296 */  { MAD_F(0x04433414) /* 0.266407088 */, 18 },
+  /* 4297 */  { MAD_F(0x04438ac8) /* 0.266489775 */, 18 },
+  /* 4298 */  { MAD_F(0x0443e17e) /* 0.266572468 */, 18 },
+  /* 4299 */  { MAD_F(0x04443835) /* 0.266655168 */, 18 },
+  /* 4300 */  { MAD_F(0x04448eef) /* 0.266737874 */, 18 },
+  /* 4301 */  { MAD_F(0x0444e5aa) /* 0.266820587 */, 18 },
+  /* 4302 */  { MAD_F(0x04453c66) /* 0.266903306 */, 18 },
+  /* 4303 */  { MAD_F(0x04459325) /* 0.266986031 */, 18 },
+
+  /* 4304 */  { MAD_F(0x0445e9e5) /* 0.267068763 */, 18 },
+  /* 4305 */  { MAD_F(0x044640a7) /* 0.267151501 */, 18 },
+  /* 4306 */  { MAD_F(0x0446976a) /* 0.267234246 */, 18 },
+  /* 4307 */  { MAD_F(0x0446ee30) /* 0.267316997 */, 18 },
+  /* 4308 */  { MAD_F(0x044744f7) /* 0.267399755 */, 18 },
+  /* 4309 */  { MAD_F(0x04479bc0) /* 0.267482518 */, 18 },
+  /* 4310 */  { MAD_F(0x0447f28a) /* 0.267565289 */, 18 },
+  /* 4311 */  { MAD_F(0x04484956) /* 0.267648065 */, 18 },
+  /* 4312 */  { MAD_F(0x0448a024) /* 0.267730848 */, 18 },
+  /* 4313 */  { MAD_F(0x0448f6f4) /* 0.267813638 */, 18 },
+  /* 4314 */  { MAD_F(0x04494dc5) /* 0.267896434 */, 18 },
+  /* 4315 */  { MAD_F(0x0449a498) /* 0.267979236 */, 18 },
+  /* 4316 */  { MAD_F(0x0449fb6d) /* 0.268062045 */, 18 },
+  /* 4317 */  { MAD_F(0x044a5243) /* 0.268144860 */, 18 },
+  /* 4318 */  { MAD_F(0x044aa91c) /* 0.268227681 */, 18 },
+  /* 4319 */  { MAD_F(0x044afff6) /* 0.268310509 */, 18 },
+
+  /* 4320 */  { MAD_F(0x044b56d1) /* 0.268393343 */, 18 },
+  /* 4321 */  { MAD_F(0x044badaf) /* 0.268476184 */, 18 },
+  /* 4322 */  { MAD_F(0x044c048e) /* 0.268559031 */, 18 },
+  /* 4323 */  { MAD_F(0x044c5b6f) /* 0.268641885 */, 18 },
+  /* 4324 */  { MAD_F(0x044cb251) /* 0.268724744 */, 18 },
+  /* 4325 */  { MAD_F(0x044d0935) /* 0.268807611 */, 18 },
+  /* 4326 */  { MAD_F(0x044d601b) /* 0.268890483 */, 18 },
+  /* 4327 */  { MAD_F(0x044db703) /* 0.268973362 */, 18 },
+  /* 4328 */  { MAD_F(0x044e0dec) /* 0.269056248 */, 18 },
+  /* 4329 */  { MAD_F(0x044e64d7) /* 0.269139139 */, 18 },
+  /* 4330 */  { MAD_F(0x044ebbc4) /* 0.269222037 */, 18 },
+  /* 4331 */  { MAD_F(0x044f12b3) /* 0.269304942 */, 18 },
+  /* 4332 */  { MAD_F(0x044f69a3) /* 0.269387853 */, 18 },
+  /* 4333 */  { MAD_F(0x044fc095) /* 0.269470770 */, 18 },
+  /* 4334 */  { MAD_F(0x04501788) /* 0.269553694 */, 18 },
+  /* 4335 */  { MAD_F(0x04506e7e) /* 0.269636624 */, 18 },
+
+  /* 4336 */  { MAD_F(0x0450c575) /* 0.269719560 */, 18 },
+  /* 4337 */  { MAD_F(0x04511c6e) /* 0.269802503 */, 18 },
+  /* 4338 */  { MAD_F(0x04517368) /* 0.269885452 */, 18 },
+  /* 4339 */  { MAD_F(0x0451ca64) /* 0.269968408 */, 18 },
+  /* 4340 */  { MAD_F(0x04522162) /* 0.270051370 */, 18 },
+  /* 4341 */  { MAD_F(0x04527862) /* 0.270134338 */, 18 },
+  /* 4342 */  { MAD_F(0x0452cf63) /* 0.270217312 */, 18 },
+  /* 4343 */  { MAD_F(0x04532666) /* 0.270300293 */, 18 },
+  /* 4344 */  { MAD_F(0x04537d6b) /* 0.270383281 */, 18 },
+  /* 4345 */  { MAD_F(0x0453d472) /* 0.270466275 */, 18 },
+  /* 4346 */  { MAD_F(0x04542b7a) /* 0.270549275 */, 18 },
+  /* 4347 */  { MAD_F(0x04548284) /* 0.270632281 */, 18 },
+  /* 4348 */  { MAD_F(0x0454d98f) /* 0.270715294 */, 18 },
+  /* 4349 */  { MAD_F(0x0455309c) /* 0.270798313 */, 18 },
+  /* 4350 */  { MAD_F(0x045587ab) /* 0.270881339 */, 18 },
+  /* 4351 */  { MAD_F(0x0455debc) /* 0.270964371 */, 18 },
+
+  /* 4352 */  { MAD_F(0x045635cf) /* 0.271047409 */, 18 },
+  /* 4353 */  { MAD_F(0x04568ce3) /* 0.271130454 */, 18 },
+  /* 4354 */  { MAD_F(0x0456e3f9) /* 0.271213505 */, 18 },
+  /* 4355 */  { MAD_F(0x04573b10) /* 0.271296562 */, 18 },
+  /* 4356 */  { MAD_F(0x04579229) /* 0.271379626 */, 18 },
+  /* 4357 */  { MAD_F(0x0457e944) /* 0.271462696 */, 18 },
+  /* 4358 */  { MAD_F(0x04584061) /* 0.271545772 */, 18 },
+  /* 4359 */  { MAD_F(0x0458977f) /* 0.271628855 */, 18 },
+  /* 4360 */  { MAD_F(0x0458ee9f) /* 0.271711944 */, 18 },
+  /* 4361 */  { MAD_F(0x045945c1) /* 0.271795040 */, 18 },
+  /* 4362 */  { MAD_F(0x04599ce5) /* 0.271878142 */, 18 },
+  /* 4363 */  { MAD_F(0x0459f40a) /* 0.271961250 */, 18 },
+  /* 4364 */  { MAD_F(0x045a4b31) /* 0.272044365 */, 18 },
+  /* 4365 */  { MAD_F(0x045aa259) /* 0.272127486 */, 18 },
+  /* 4366 */  { MAD_F(0x045af984) /* 0.272210613 */, 18 },
+  /* 4367 */  { MAD_F(0x045b50b0) /* 0.272293746 */, 18 },
+
+  /* 4368 */  { MAD_F(0x045ba7dd) /* 0.272376886 */, 18 },
+  /* 4369 */  { MAD_F(0x045bff0d) /* 0.272460033 */, 18 },
+  /* 4370 */  { MAD_F(0x045c563e) /* 0.272543185 */, 18 },
+  /* 4371 */  { MAD_F(0x045cad71) /* 0.272626344 */, 18 },
+  /* 4372 */  { MAD_F(0x045d04a5) /* 0.272709510 */, 18 },
+  /* 4373 */  { MAD_F(0x045d5bdc) /* 0.272792681 */, 18 },
+  /* 4374 */  { MAD_F(0x045db313) /* 0.272875859 */, 18 },
+  /* 4375 */  { MAD_F(0x045e0a4d) /* 0.272959044 */, 18 },
+  /* 4376 */  { MAD_F(0x045e6188) /* 0.273042234 */, 18 },
+  /* 4377 */  { MAD_F(0x045eb8c5) /* 0.273125431 */, 18 },
+  /* 4378 */  { MAD_F(0x045f1004) /* 0.273208635 */, 18 },
+  /* 4379 */  { MAD_F(0x045f6745) /* 0.273291844 */, 18 },
+  /* 4380 */  { MAD_F(0x045fbe87) /* 0.273375060 */, 18 },
+  /* 4381 */  { MAD_F(0x046015cb) /* 0.273458283 */, 18 },
+  /* 4382 */  { MAD_F(0x04606d10) /* 0.273541511 */, 18 },
+  /* 4383 */  { MAD_F(0x0460c457) /* 0.273624747 */, 18 },
+
+  /* 4384 */  { MAD_F(0x04611ba0) /* 0.273707988 */, 18 },
+  /* 4385 */  { MAD_F(0x046172eb) /* 0.273791236 */, 18 },
+  /* 4386 */  { MAD_F(0x0461ca37) /* 0.273874490 */, 18 },
+  /* 4387 */  { MAD_F(0x04622185) /* 0.273957750 */, 18 },
+  /* 4388 */  { MAD_F(0x046278d5) /* 0.274041017 */, 18 },
+  /* 4389 */  { MAD_F(0x0462d026) /* 0.274124290 */, 18 },
+  /* 4390 */  { MAD_F(0x0463277a) /* 0.274207569 */, 18 },
+  /* 4391 */  { MAD_F(0x04637ece) /* 0.274290855 */, 18 },
+  /* 4392 */  { MAD_F(0x0463d625) /* 0.274374147 */, 18 },
+  /* 4393 */  { MAD_F(0x04642d7d) /* 0.274457445 */, 18 },
+  /* 4394 */  { MAD_F(0x046484d7) /* 0.274540749 */, 18 },
+  /* 4395 */  { MAD_F(0x0464dc33) /* 0.274624060 */, 18 },
+  /* 4396 */  { MAD_F(0x04653390) /* 0.274707378 */, 18 },
+  /* 4397 */  { MAD_F(0x04658aef) /* 0.274790701 */, 18 },
+  /* 4398 */  { MAD_F(0x0465e250) /* 0.274874031 */, 18 },
+  /* 4399 */  { MAD_F(0x046639b2) /* 0.274957367 */, 18 },
+
+  /* 4400 */  { MAD_F(0x04669116) /* 0.275040710 */, 18 },
+  /* 4401 */  { MAD_F(0x0466e87c) /* 0.275124059 */, 18 },
+  /* 4402 */  { MAD_F(0x04673fe3) /* 0.275207414 */, 18 },
+  /* 4403 */  { MAD_F(0x0467974d) /* 0.275290775 */, 18 },
+  /* 4404 */  { MAD_F(0x0467eeb7) /* 0.275374143 */, 18 },
+  /* 4405 */  { MAD_F(0x04684624) /* 0.275457517 */, 18 },
+  /* 4406 */  { MAD_F(0x04689d92) /* 0.275540897 */, 18 },
+  /* 4407 */  { MAD_F(0x0468f502) /* 0.275624284 */, 18 },
+  /* 4408 */  { MAD_F(0x04694c74) /* 0.275707677 */, 18 },
+  /* 4409 */  { MAD_F(0x0469a3e7) /* 0.275791076 */, 18 },
+  /* 4410 */  { MAD_F(0x0469fb5c) /* 0.275874482 */, 18 },
+  /* 4411 */  { MAD_F(0x046a52d3) /* 0.275957894 */, 18 },
+  /* 4412 */  { MAD_F(0x046aaa4b) /* 0.276041312 */, 18 },
+  /* 4413 */  { MAD_F(0x046b01c5) /* 0.276124737 */, 18 },
+  /* 4414 */  { MAD_F(0x046b5941) /* 0.276208167 */, 18 },
+  /* 4415 */  { MAD_F(0x046bb0bf) /* 0.276291605 */, 18 },
+
+  /* 4416 */  { MAD_F(0x046c083e) /* 0.276375048 */, 18 },
+  /* 4417 */  { MAD_F(0x046c5fbf) /* 0.276458498 */, 18 },
+  /* 4418 */  { MAD_F(0x046cb741) /* 0.276541954 */, 18 },
+  /* 4419 */  { MAD_F(0x046d0ec5) /* 0.276625416 */, 18 },
+  /* 4420 */  { MAD_F(0x046d664b) /* 0.276708885 */, 18 },
+  /* 4421 */  { MAD_F(0x046dbdd3) /* 0.276792360 */, 18 },
+  /* 4422 */  { MAD_F(0x046e155c) /* 0.276875841 */, 18 },
+  /* 4423 */  { MAD_F(0x046e6ce7) /* 0.276959328 */, 18 },
+  /* 4424 */  { MAD_F(0x046ec474) /* 0.277042822 */, 18 },
+  /* 4425 */  { MAD_F(0x046f1c02) /* 0.277126322 */, 18 },
+  /* 4426 */  { MAD_F(0x046f7392) /* 0.277209829 */, 18 },
+  /* 4427 */  { MAD_F(0x046fcb24) /* 0.277293341 */, 18 },
+  /* 4428 */  { MAD_F(0x047022b8) /* 0.277376860 */, 18 },
+  /* 4429 */  { MAD_F(0x04707a4d) /* 0.277460385 */, 18 },
+  /* 4430 */  { MAD_F(0x0470d1e4) /* 0.277543917 */, 18 },
+  /* 4431 */  { MAD_F(0x0471297c) /* 0.277627455 */, 18 },
+
+  /* 4432 */  { MAD_F(0x04718116) /* 0.277710999 */, 18 },
+  /* 4433 */  { MAD_F(0x0471d8b2) /* 0.277794549 */, 18 },
+  /* 4434 */  { MAD_F(0x04723050) /* 0.277878106 */, 18 },
+  /* 4435 */  { MAD_F(0x047287ef) /* 0.277961669 */, 18 },
+  /* 4436 */  { MAD_F(0x0472df90) /* 0.278045238 */, 18 },
+  /* 4437 */  { MAD_F(0x04733733) /* 0.278128813 */, 18 },
+  /* 4438 */  { MAD_F(0x04738ed7) /* 0.278212395 */, 18 },
+  /* 4439 */  { MAD_F(0x0473e67d) /* 0.278295983 */, 18 },
+  /* 4440 */  { MAD_F(0x04743e25) /* 0.278379578 */, 18 },
+  /* 4441 */  { MAD_F(0x047495ce) /* 0.278463178 */, 18 },
+  /* 4442 */  { MAD_F(0x0474ed79) /* 0.278546785 */, 18 },
+  /* 4443 */  { MAD_F(0x04754526) /* 0.278630398 */, 18 },
+  /* 4444 */  { MAD_F(0x04759cd4) /* 0.278714018 */, 18 },
+  /* 4445 */  { MAD_F(0x0475f484) /* 0.278797643 */, 18 },
+  /* 4446 */  { MAD_F(0x04764c36) /* 0.278881275 */, 18 },
+  /* 4447 */  { MAD_F(0x0476a3ea) /* 0.278964914 */, 18 },
+
+  /* 4448 */  { MAD_F(0x0476fb9f) /* 0.279048558 */, 18 },
+  /* 4449 */  { MAD_F(0x04775356) /* 0.279132209 */, 18 },
+  /* 4450 */  { MAD_F(0x0477ab0e) /* 0.279215866 */, 18 },
+  /* 4451 */  { MAD_F(0x047802c8) /* 0.279299529 */, 18 },
+  /* 4452 */  { MAD_F(0x04785a84) /* 0.279383199 */, 18 },
+  /* 4453 */  { MAD_F(0x0478b242) /* 0.279466875 */, 18 },
+  /* 4454 */  { MAD_F(0x04790a01) /* 0.279550557 */, 18 },
+  /* 4455 */  { MAD_F(0x047961c2) /* 0.279634245 */, 18 },
+  /* 4456 */  { MAD_F(0x0479b984) /* 0.279717940 */, 18 },
+  /* 4457 */  { MAD_F(0x047a1149) /* 0.279801641 */, 18 },
+  /* 4458 */  { MAD_F(0x047a690f) /* 0.279885348 */, 18 },
+  /* 4459 */  { MAD_F(0x047ac0d6) /* 0.279969061 */, 18 },
+  /* 4460 */  { MAD_F(0x047b18a0) /* 0.280052781 */, 18 },
+  /* 4461 */  { MAD_F(0x047b706b) /* 0.280136507 */, 18 },
+  /* 4462 */  { MAD_F(0x047bc837) /* 0.280220239 */, 18 },
+  /* 4463 */  { MAD_F(0x047c2006) /* 0.280303978 */, 18 },
+
+  /* 4464 */  { MAD_F(0x047c77d6) /* 0.280387722 */, 18 },
+  /* 4465 */  { MAD_F(0x047ccfa8) /* 0.280471473 */, 18 },
+  /* 4466 */  { MAD_F(0x047d277b) /* 0.280555230 */, 18 },
+  /* 4467 */  { MAD_F(0x047d7f50) /* 0.280638994 */, 18 },
+  /* 4468 */  { MAD_F(0x047dd727) /* 0.280722764 */, 18 },
+  /* 4469 */  { MAD_F(0x047e2eff) /* 0.280806540 */, 18 },
+  /* 4470 */  { MAD_F(0x047e86d9) /* 0.280890322 */, 18 },
+  /* 4471 */  { MAD_F(0x047edeb5) /* 0.280974110 */, 18 },
+  /* 4472 */  { MAD_F(0x047f3693) /* 0.281057905 */, 18 },
+  /* 4473 */  { MAD_F(0x047f8e72) /* 0.281141706 */, 18 },
+  /* 4474 */  { MAD_F(0x047fe653) /* 0.281225513 */, 18 },
+  /* 4475 */  { MAD_F(0x04803e35) /* 0.281309326 */, 18 },
+  /* 4476 */  { MAD_F(0x04809619) /* 0.281393146 */, 18 },
+  /* 4477 */  { MAD_F(0x0480edff) /* 0.281476972 */, 18 },
+  /* 4478 */  { MAD_F(0x048145e7) /* 0.281560804 */, 18 },
+  /* 4479 */  { MAD_F(0x04819dd0) /* 0.281644643 */, 18 },
+
+  /* 4480 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 18 },
+  /* 4481 */  { MAD_F(0x04824da7) /* 0.281812338 */, 18 },
+  /* 4482 */  { MAD_F(0x0482a595) /* 0.281896195 */, 18 },
+  /* 4483 */  { MAD_F(0x0482fd85) /* 0.281980059 */, 18 },
+  /* 4484 */  { MAD_F(0x04835577) /* 0.282063928 */, 18 },
+  /* 4485 */  { MAD_F(0x0483ad6a) /* 0.282147804 */, 18 },
+  /* 4486 */  { MAD_F(0x0484055f) /* 0.282231686 */, 18 },
+  /* 4487 */  { MAD_F(0x04845d56) /* 0.282315574 */, 18 },
+  /* 4488 */  { MAD_F(0x0484b54e) /* 0.282399469 */, 18 },
+  /* 4489 */  { MAD_F(0x04850d48) /* 0.282483370 */, 18 },
+  /* 4490 */  { MAD_F(0x04856544) /* 0.282567277 */, 18 },
+  /* 4491 */  { MAD_F(0x0485bd41) /* 0.282651190 */, 18 },
+  /* 4492 */  { MAD_F(0x04861540) /* 0.282735109 */, 18 },
+  /* 4493 */  { MAD_F(0x04866d40) /* 0.282819035 */, 18 },
+  /* 4494 */  { MAD_F(0x0486c543) /* 0.282902967 */, 18 },
+  /* 4495 */  { MAD_F(0x04871d47) /* 0.282986905 */, 18 },
+
+  /* 4496 */  { MAD_F(0x0487754c) /* 0.283070849 */, 18 },
+  /* 4497 */  { MAD_F(0x0487cd54) /* 0.283154800 */, 18 },
+  /* 4498 */  { MAD_F(0x0488255d) /* 0.283238757 */, 18 },
+  /* 4499 */  { MAD_F(0x04887d67) /* 0.283322720 */, 18 },
+  /* 4500 */  { MAD_F(0x0488d574) /* 0.283406689 */, 18 },
+  /* 4501 */  { MAD_F(0x04892d82) /* 0.283490665 */, 18 },
+  /* 4502 */  { MAD_F(0x04898591) /* 0.283574646 */, 18 },
+  /* 4503 */  { MAD_F(0x0489dda3) /* 0.283658634 */, 18 },
+  /* 4504 */  { MAD_F(0x048a35b6) /* 0.283742628 */, 18 },
+  /* 4505 */  { MAD_F(0x048a8dca) /* 0.283826629 */, 18 },
+  /* 4506 */  { MAD_F(0x048ae5e1) /* 0.283910635 */, 18 },
+  /* 4507 */  { MAD_F(0x048b3df9) /* 0.283994648 */, 18 },
+  /* 4508 */  { MAD_F(0x048b9612) /* 0.284078667 */, 18 },
+  /* 4509 */  { MAD_F(0x048bee2e) /* 0.284162692 */, 18 },
+  /* 4510 */  { MAD_F(0x048c464b) /* 0.284246723 */, 18 },
+  /* 4511 */  { MAD_F(0x048c9e69) /* 0.284330761 */, 18 },
+
+  /* 4512 */  { MAD_F(0x048cf68a) /* 0.284414805 */, 18 },
+  /* 4513 */  { MAD_F(0x048d4eac) /* 0.284498855 */, 18 },
+  /* 4514 */  { MAD_F(0x048da6cf) /* 0.284582911 */, 18 },
+  /* 4515 */  { MAD_F(0x048dfef5) /* 0.284666974 */, 18 },
+  /* 4516 */  { MAD_F(0x048e571c) /* 0.284751042 */, 18 },
+  /* 4517 */  { MAD_F(0x048eaf44) /* 0.284835117 */, 18 },
+  /* 4518 */  { MAD_F(0x048f076f) /* 0.284919198 */, 18 },
+  /* 4519 */  { MAD_F(0x048f5f9b) /* 0.285003285 */, 18 },
+  /* 4520 */  { MAD_F(0x048fb7c8) /* 0.285087379 */, 18 },
+  /* 4521 */  { MAD_F(0x04900ff8) /* 0.285171479 */, 18 },
+  /* 4522 */  { MAD_F(0x04906829) /* 0.285255584 */, 18 },
+  /* 4523 */  { MAD_F(0x0490c05b) /* 0.285339697 */, 18 },
+  /* 4524 */  { MAD_F(0x04911890) /* 0.285423815 */, 18 },
+  /* 4525 */  { MAD_F(0x049170c6) /* 0.285507939 */, 18 },
+  /* 4526 */  { MAD_F(0x0491c8fd) /* 0.285592070 */, 18 },
+  /* 4527 */  { MAD_F(0x04922137) /* 0.285676207 */, 18 },
+
+  /* 4528 */  { MAD_F(0x04927972) /* 0.285760350 */, 18 },
+  /* 4529 */  { MAD_F(0x0492d1ae) /* 0.285844499 */, 18 },
+  /* 4530 */  { MAD_F(0x049329ed) /* 0.285928655 */, 18 },
+  /* 4531 */  { MAD_F(0x0493822c) /* 0.286012816 */, 18 },
+  /* 4532 */  { MAD_F(0x0493da6e) /* 0.286096984 */, 18 },
+  /* 4533 */  { MAD_F(0x049432b1) /* 0.286181158 */, 18 },
+  /* 4534 */  { MAD_F(0x04948af6) /* 0.286265338 */, 18 },
+  /* 4535 */  { MAD_F(0x0494e33d) /* 0.286349525 */, 18 },
+  /* 4536 */  { MAD_F(0x04953b85) /* 0.286433717 */, 18 },
+  /* 4537 */  { MAD_F(0x049593cf) /* 0.286517916 */, 18 },
+  /* 4538 */  { MAD_F(0x0495ec1b) /* 0.286602121 */, 18 },
+  /* 4539 */  { MAD_F(0x04964468) /* 0.286686332 */, 18 },
+  /* 4540 */  { MAD_F(0x04969cb7) /* 0.286770550 */, 18 },
+  /* 4541 */  { MAD_F(0x0496f508) /* 0.286854773 */, 18 },
+  /* 4542 */  { MAD_F(0x04974d5a) /* 0.286939003 */, 18 },
+  /* 4543 */  { MAD_F(0x0497a5ae) /* 0.287023239 */, 18 },
+
+  /* 4544 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 18 },
+  /* 4545 */  { MAD_F(0x0498565a) /* 0.287191729 */, 18 },
+  /* 4546 */  { MAD_F(0x0498aeb3) /* 0.287275983 */, 18 },
+  /* 4547 */  { MAD_F(0x0499070e) /* 0.287360244 */, 18 },
+  /* 4548 */  { MAD_F(0x04995f6a) /* 0.287444511 */, 18 },
+  /* 4549 */  { MAD_F(0x0499b7c8) /* 0.287528784 */, 18 },
+  /* 4550 */  { MAD_F(0x049a1027) /* 0.287613063 */, 18 },
+  /* 4551 */  { MAD_F(0x049a6889) /* 0.287697348 */, 18 },
+  /* 4552 */  { MAD_F(0x049ac0eb) /* 0.287781640 */, 18 },
+  /* 4553 */  { MAD_F(0x049b1950) /* 0.287865937 */, 18 },
+  /* 4554 */  { MAD_F(0x049b71b6) /* 0.287950241 */, 18 },
+  /* 4555 */  { MAD_F(0x049bca1e) /* 0.288034551 */, 18 },
+  /* 4556 */  { MAD_F(0x049c2287) /* 0.288118867 */, 18 },
+  /* 4557 */  { MAD_F(0x049c7af2) /* 0.288203190 */, 18 },
+  /* 4558 */  { MAD_F(0x049cd35f) /* 0.288287518 */, 18 },
+  /* 4559 */  { MAD_F(0x049d2bce) /* 0.288371853 */, 18 },
+
+  /* 4560 */  { MAD_F(0x049d843e) /* 0.288456194 */, 18 },
+  /* 4561 */  { MAD_F(0x049ddcaf) /* 0.288540541 */, 18 },
+  /* 4562 */  { MAD_F(0x049e3523) /* 0.288624894 */, 18 },
+  /* 4563 */  { MAD_F(0x049e8d98) /* 0.288709253 */, 18 },
+  /* 4564 */  { MAD_F(0x049ee60e) /* 0.288793619 */, 18 },
+  /* 4565 */  { MAD_F(0x049f3e87) /* 0.288877990 */, 18 },
+  /* 4566 */  { MAD_F(0x049f9701) /* 0.288962368 */, 18 },
+  /* 4567 */  { MAD_F(0x049fef7c) /* 0.289046752 */, 18 },
+  /* 4568 */  { MAD_F(0x04a047fa) /* 0.289131142 */, 18 },
+  /* 4569 */  { MAD_F(0x04a0a079) /* 0.289215538 */, 18 },
+  /* 4570 */  { MAD_F(0x04a0f8f9) /* 0.289299941 */, 18 },
+  /* 4571 */  { MAD_F(0x04a1517c) /* 0.289384349 */, 18 },
+  /* 4572 */  { MAD_F(0x04a1a9ff) /* 0.289468764 */, 18 },
+  /* 4573 */  { MAD_F(0x04a20285) /* 0.289553185 */, 18 },
+  /* 4574 */  { MAD_F(0x04a25b0c) /* 0.289637612 */, 18 },
+  /* 4575 */  { MAD_F(0x04a2b395) /* 0.289722045 */, 18 },
+
+  /* 4576 */  { MAD_F(0x04a30c20) /* 0.289806485 */, 18 },
+  /* 4577 */  { MAD_F(0x04a364ac) /* 0.289890930 */, 18 },
+  /* 4578 */  { MAD_F(0x04a3bd3a) /* 0.289975382 */, 18 },
+  /* 4579 */  { MAD_F(0x04a415c9) /* 0.290059840 */, 18 },
+  /* 4580 */  { MAD_F(0x04a46e5a) /* 0.290144304 */, 18 },
+  /* 4581 */  { MAD_F(0x04a4c6ed) /* 0.290228774 */, 18 },
+  /* 4582 */  { MAD_F(0x04a51f81) /* 0.290313250 */, 18 },
+  /* 4583 */  { MAD_F(0x04a57818) /* 0.290397733 */, 18 },
+  /* 4584 */  { MAD_F(0x04a5d0af) /* 0.290482221 */, 18 },
+  /* 4585 */  { MAD_F(0x04a62949) /* 0.290566716 */, 18 },
+  /* 4586 */  { MAD_F(0x04a681e4) /* 0.290651217 */, 18 },
+  /* 4587 */  { MAD_F(0x04a6da80) /* 0.290735724 */, 18 },
+  /* 4588 */  { MAD_F(0x04a7331f) /* 0.290820237 */, 18 },
+  /* 4589 */  { MAD_F(0x04a78bbf) /* 0.290904756 */, 18 },
+  /* 4590 */  { MAD_F(0x04a7e460) /* 0.290989281 */, 18 },
+  /* 4591 */  { MAD_F(0x04a83d03) /* 0.291073813 */, 18 },
+
+  /* 4592 */  { MAD_F(0x04a895a8) /* 0.291158351 */, 18 },
+  /* 4593 */  { MAD_F(0x04a8ee4f) /* 0.291242894 */, 18 },
+  /* 4594 */  { MAD_F(0x04a946f7) /* 0.291327444 */, 18 },
+  /* 4595 */  { MAD_F(0x04a99fa1) /* 0.291412001 */, 18 },
+  /* 4596 */  { MAD_F(0x04a9f84c) /* 0.291496563 */, 18 },
+  /* 4597 */  { MAD_F(0x04aa50fa) /* 0.291581131 */, 18 },
+  /* 4598 */  { MAD_F(0x04aaa9a8) /* 0.291665706 */, 18 },
+  /* 4599 */  { MAD_F(0x04ab0259) /* 0.291750286 */, 18 },
+  /* 4600 */  { MAD_F(0x04ab5b0b) /* 0.291834873 */, 18 },
+  /* 4601 */  { MAD_F(0x04abb3bf) /* 0.291919466 */, 18 },
+  /* 4602 */  { MAD_F(0x04ac0c74) /* 0.292004065 */, 18 },
+  /* 4603 */  { MAD_F(0x04ac652b) /* 0.292088670 */, 18 },
+  /* 4604 */  { MAD_F(0x04acbde4) /* 0.292173281 */, 18 },
+  /* 4605 */  { MAD_F(0x04ad169e) /* 0.292257899 */, 18 },
+  /* 4606 */  { MAD_F(0x04ad6f5a) /* 0.292342522 */, 18 },
+  /* 4607 */  { MAD_F(0x04adc818) /* 0.292427152 */, 18 },
+
+  /* 4608 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 18 },
+  /* 4609 */  { MAD_F(0x04ae7998) /* 0.292596430 */, 18 },
+  /* 4610 */  { MAD_F(0x04aed25a) /* 0.292681078 */, 18 },
+  /* 4611 */  { MAD_F(0x04af2b1e) /* 0.292765732 */, 18 },
+  /* 4612 */  { MAD_F(0x04af83e4) /* 0.292850392 */, 18 },
+  /* 4613 */  { MAD_F(0x04afdcac) /* 0.292935058 */, 18 },
+  /* 4614 */  { MAD_F(0x04b03575) /* 0.293019731 */, 18 },
+  /* 4615 */  { MAD_F(0x04b08e40) /* 0.293104409 */, 18 },
+  /* 4616 */  { MAD_F(0x04b0e70c) /* 0.293189094 */, 18 },
+  /* 4617 */  { MAD_F(0x04b13fda) /* 0.293273785 */, 18 },
+  /* 4618 */  { MAD_F(0x04b198aa) /* 0.293358482 */, 18 },
+  /* 4619 */  { MAD_F(0x04b1f17b) /* 0.293443185 */, 18 },
+  /* 4620 */  { MAD_F(0x04b24a4e) /* 0.293527894 */, 18 },
+  /* 4621 */  { MAD_F(0x04b2a322) /* 0.293612609 */, 18 },
+  /* 4622 */  { MAD_F(0x04b2fbf9) /* 0.293697331 */, 18 },
+  /* 4623 */  { MAD_F(0x04b354d1) /* 0.293782058 */, 18 },
+
+  /* 4624 */  { MAD_F(0x04b3adaa) /* 0.293866792 */, 18 },
+  /* 4625 */  { MAD_F(0x04b40685) /* 0.293951532 */, 18 },
+  /* 4626 */  { MAD_F(0x04b45f62) /* 0.294036278 */, 18 },
+  /* 4627 */  { MAD_F(0x04b4b840) /* 0.294121029 */, 18 },
+  /* 4628 */  { MAD_F(0x04b51120) /* 0.294205788 */, 18 },
+  /* 4629 */  { MAD_F(0x04b56a02) /* 0.294290552 */, 18 },
+  /* 4630 */  { MAD_F(0x04b5c2e6) /* 0.294375322 */, 18 },
+  /* 4631 */  { MAD_F(0x04b61bcb) /* 0.294460098 */, 18 },
+  /* 4632 */  { MAD_F(0x04b674b1) /* 0.294544881 */, 18 },
+  /* 4633 */  { MAD_F(0x04b6cd99) /* 0.294629669 */, 18 },
+  /* 4634 */  { MAD_F(0x04b72683) /* 0.294714464 */, 18 },
+  /* 4635 */  { MAD_F(0x04b77f6f) /* 0.294799265 */, 18 },
+  /* 4636 */  { MAD_F(0x04b7d85c) /* 0.294884072 */, 18 },
+  /* 4637 */  { MAD_F(0x04b8314b) /* 0.294968885 */, 18 },
+  /* 4638 */  { MAD_F(0x04b88a3b) /* 0.295053704 */, 18 },
+  /* 4639 */  { MAD_F(0x04b8e32d) /* 0.295138529 */, 18 },
+
+  /* 4640 */  { MAD_F(0x04b93c21) /* 0.295223360 */, 18 },
+  /* 4641 */  { MAD_F(0x04b99516) /* 0.295308197 */, 18 },
+  /* 4642 */  { MAD_F(0x04b9ee0d) /* 0.295393041 */, 18 },
+  /* 4643 */  { MAD_F(0x04ba4706) /* 0.295477890 */, 18 },
+  /* 4644 */  { MAD_F(0x04baa000) /* 0.295562746 */, 18 },
+  /* 4645 */  { MAD_F(0x04baf8fc) /* 0.295647608 */, 18 },
+  /* 4646 */  { MAD_F(0x04bb51fa) /* 0.295732476 */, 18 },
+  /* 4647 */  { MAD_F(0x04bbaaf9) /* 0.295817349 */, 18 },
+  /* 4648 */  { MAD_F(0x04bc03fa) /* 0.295902229 */, 18 },
+  /* 4649 */  { MAD_F(0x04bc5cfc) /* 0.295987115 */, 18 },
+  /* 4650 */  { MAD_F(0x04bcb600) /* 0.296072008 */, 18 },
+  /* 4651 */  { MAD_F(0x04bd0f06) /* 0.296156906 */, 18 },
+  /* 4652 */  { MAD_F(0x04bd680d) /* 0.296241810 */, 18 },
+  /* 4653 */  { MAD_F(0x04bdc116) /* 0.296326721 */, 18 },
+  /* 4654 */  { MAD_F(0x04be1a21) /* 0.296411637 */, 18 },
+  /* 4655 */  { MAD_F(0x04be732d) /* 0.296496560 */, 18 },
+
+  /* 4656 */  { MAD_F(0x04becc3b) /* 0.296581488 */, 18 },
+  /* 4657 */  { MAD_F(0x04bf254a) /* 0.296666423 */, 18 },
+  /* 4658 */  { MAD_F(0x04bf7e5b) /* 0.296751364 */, 18 },
+  /* 4659 */  { MAD_F(0x04bfd76e) /* 0.296836311 */, 18 },
+  /* 4660 */  { MAD_F(0x04c03083) /* 0.296921264 */, 18 },
+  /* 4661 */  { MAD_F(0x04c08999) /* 0.297006223 */, 18 },
+  /* 4662 */  { MAD_F(0x04c0e2b0) /* 0.297091188 */, 18 },
+  /* 4663 */  { MAD_F(0x04c13bca) /* 0.297176159 */, 18 },
+  /* 4664 */  { MAD_F(0x04c194e4) /* 0.297261136 */, 18 },
+  /* 4665 */  { MAD_F(0x04c1ee01) /* 0.297346120 */, 18 },
+  /* 4666 */  { MAD_F(0x04c2471f) /* 0.297431109 */, 18 },
+  /* 4667 */  { MAD_F(0x04c2a03f) /* 0.297516105 */, 18 },
+  /* 4668 */  { MAD_F(0x04c2f960) /* 0.297601106 */, 18 },
+  /* 4669 */  { MAD_F(0x04c35283) /* 0.297686114 */, 18 },
+  /* 4670 */  { MAD_F(0x04c3aba8) /* 0.297771128 */, 18 },
+  /* 4671 */  { MAD_F(0x04c404ce) /* 0.297856147 */, 18 },
+
+  /* 4672 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 18 },
+  /* 4673 */  { MAD_F(0x04c4b720) /* 0.298026205 */, 18 },
+  /* 4674 */  { MAD_F(0x04c5104b) /* 0.298111243 */, 18 },
+  /* 4675 */  { MAD_F(0x04c56978) /* 0.298196287 */, 18 },
+  /* 4676 */  { MAD_F(0x04c5c2a7) /* 0.298281337 */, 18 },
+  /* 4677 */  { MAD_F(0x04c61bd7) /* 0.298366393 */, 18 },
+  /* 4678 */  { MAD_F(0x04c67508) /* 0.298451456 */, 18 },
+  /* 4679 */  { MAD_F(0x04c6ce3c) /* 0.298536524 */, 18 },
+  /* 4680 */  { MAD_F(0x04c72771) /* 0.298621598 */, 18 },
+  /* 4681 */  { MAD_F(0x04c780a7) /* 0.298706679 */, 18 },
+  /* 4682 */  { MAD_F(0x04c7d9df) /* 0.298791765 */, 18 },
+  /* 4683 */  { MAD_F(0x04c83319) /* 0.298876858 */, 18 },
+  /* 4684 */  { MAD_F(0x04c88c55) /* 0.298961956 */, 18 },
+  /* 4685 */  { MAD_F(0x04c8e592) /* 0.299047061 */, 18 },
+  /* 4686 */  { MAD_F(0x04c93ed1) /* 0.299132172 */, 18 },
+  /* 4687 */  { MAD_F(0x04c99811) /* 0.299217288 */, 18 },
+
+  /* 4688 */  { MAD_F(0x04c9f153) /* 0.299302411 */, 18 },
+  /* 4689 */  { MAD_F(0x04ca4a97) /* 0.299387540 */, 18 },
+  /* 4690 */  { MAD_F(0x04caa3dc) /* 0.299472675 */, 18 },
+  /* 4691 */  { MAD_F(0x04cafd23) /* 0.299557816 */, 18 },
+  /* 4692 */  { MAD_F(0x04cb566b) /* 0.299642963 */, 18 },
+  /* 4693 */  { MAD_F(0x04cbafb5) /* 0.299728116 */, 18 },
+  /* 4694 */  { MAD_F(0x04cc0901) /* 0.299813275 */, 18 },
+  /* 4695 */  { MAD_F(0x04cc624e) /* 0.299898440 */, 18 },
+  /* 4696 */  { MAD_F(0x04ccbb9d) /* 0.299983611 */, 18 },
+  /* 4697 */  { MAD_F(0x04cd14ee) /* 0.300068789 */, 18 },
+  /* 4698 */  { MAD_F(0x04cd6e40) /* 0.300153972 */, 18 },
+  /* 4699 */  { MAD_F(0x04cdc794) /* 0.300239161 */, 18 },
+  /* 4700 */  { MAD_F(0x04ce20e9) /* 0.300324357 */, 18 },
+  /* 4701 */  { MAD_F(0x04ce7a40) /* 0.300409558 */, 18 },
+  /* 4702 */  { MAD_F(0x04ced399) /* 0.300494765 */, 18 },
+  /* 4703 */  { MAD_F(0x04cf2cf3) /* 0.300579979 */, 18 },
+
+  /* 4704 */  { MAD_F(0x04cf864f) /* 0.300665198 */, 18 },
+  /* 4705 */  { MAD_F(0x04cfdfad) /* 0.300750424 */, 18 },
+  /* 4706 */  { MAD_F(0x04d0390c) /* 0.300835656 */, 18 },
+  /* 4707 */  { MAD_F(0x04d0926d) /* 0.300920893 */, 18 },
+  /* 4708 */  { MAD_F(0x04d0ebcf) /* 0.301006137 */, 18 },
+  /* 4709 */  { MAD_F(0x04d14533) /* 0.301091387 */, 18 },
+  /* 4710 */  { MAD_F(0x04d19e99) /* 0.301176643 */, 18 },
+  /* 4711 */  { MAD_F(0x04d1f800) /* 0.301261904 */, 18 },
+  /* 4712 */  { MAD_F(0x04d25169) /* 0.301347172 */, 18 },
+  /* 4713 */  { MAD_F(0x04d2aad4) /* 0.301432446 */, 18 },
+  /* 4714 */  { MAD_F(0x04d30440) /* 0.301517726 */, 18 },
+  /* 4715 */  { MAD_F(0x04d35dae) /* 0.301603012 */, 18 },
+  /* 4716 */  { MAD_F(0x04d3b71d) /* 0.301688304 */, 18 },
+  /* 4717 */  { MAD_F(0x04d4108e) /* 0.301773602 */, 18 },
+  /* 4718 */  { MAD_F(0x04d46a01) /* 0.301858906 */, 18 },
+  /* 4719 */  { MAD_F(0x04d4c375) /* 0.301944216 */, 18 },
+
+  /* 4720 */  { MAD_F(0x04d51ceb) /* 0.302029532 */, 18 },
+  /* 4721 */  { MAD_F(0x04d57662) /* 0.302114854 */, 18 },
+  /* 4722 */  { MAD_F(0x04d5cfdb) /* 0.302200182 */, 18 },
+  /* 4723 */  { MAD_F(0x04d62956) /* 0.302285516 */, 18 },
+  /* 4724 */  { MAD_F(0x04d682d2) /* 0.302370856 */, 18 },
+  /* 4725 */  { MAD_F(0x04d6dc50) /* 0.302456203 */, 18 },
+  /* 4726 */  { MAD_F(0x04d735d0) /* 0.302541555 */, 18 },
+  /* 4727 */  { MAD_F(0x04d78f51) /* 0.302626913 */, 18 },
+  /* 4728 */  { MAD_F(0x04d7e8d4) /* 0.302712277 */, 18 },
+  /* 4729 */  { MAD_F(0x04d84258) /* 0.302797648 */, 18 },
+  /* 4730 */  { MAD_F(0x04d89bde) /* 0.302883024 */, 18 },
+  /* 4731 */  { MAD_F(0x04d8f566) /* 0.302968406 */, 18 },
+  /* 4732 */  { MAD_F(0x04d94eef) /* 0.303053794 */, 18 },
+  /* 4733 */  { MAD_F(0x04d9a87a) /* 0.303139189 */, 18 },
+  /* 4734 */  { MAD_F(0x04da0207) /* 0.303224589 */, 18 },
+  /* 4735 */  { MAD_F(0x04da5b95) /* 0.303309995 */, 18 },
+
+  /* 4736 */  { MAD_F(0x04dab524) /* 0.303395408 */, 18 },
+  /* 4737 */  { MAD_F(0x04db0eb6) /* 0.303480826 */, 18 },
+  /* 4738 */  { MAD_F(0x04db6849) /* 0.303566251 */, 18 },
+  /* 4739 */  { MAD_F(0x04dbc1dd) /* 0.303651681 */, 18 },
+  /* 4740 */  { MAD_F(0x04dc1b73) /* 0.303737117 */, 18 },
+  /* 4741 */  { MAD_F(0x04dc750b) /* 0.303822560 */, 18 },
+  /* 4742 */  { MAD_F(0x04dccea5) /* 0.303908008 */, 18 },
+  /* 4743 */  { MAD_F(0x04dd2840) /* 0.303993463 */, 18 },
+  /* 4744 */  { MAD_F(0x04dd81dc) /* 0.304078923 */, 18 },
+  /* 4745 */  { MAD_F(0x04dddb7a) /* 0.304164390 */, 18 },
+  /* 4746 */  { MAD_F(0x04de351a) /* 0.304249862 */, 18 },
+  /* 4747 */  { MAD_F(0x04de8ebc) /* 0.304335340 */, 18 },
+  /* 4748 */  { MAD_F(0x04dee85f) /* 0.304420825 */, 18 },
+  /* 4749 */  { MAD_F(0x04df4203) /* 0.304506315 */, 18 },
+  /* 4750 */  { MAD_F(0x04df9baa) /* 0.304591812 */, 18 },
+  /* 4751 */  { MAD_F(0x04dff552) /* 0.304677314 */, 18 },
+
+  /* 4752 */  { MAD_F(0x04e04efb) /* 0.304762823 */, 18 },
+  /* 4753 */  { MAD_F(0x04e0a8a6) /* 0.304848337 */, 18 },
+  /* 4754 */  { MAD_F(0x04e10253) /* 0.304933858 */, 18 },
+  /* 4755 */  { MAD_F(0x04e15c01) /* 0.305019384 */, 18 },
+  /* 4756 */  { MAD_F(0x04e1b5b1) /* 0.305104917 */, 18 },
+  /* 4757 */  { MAD_F(0x04e20f63) /* 0.305190455 */, 18 },
+  /* 4758 */  { MAD_F(0x04e26916) /* 0.305275999 */, 18 },
+  /* 4759 */  { MAD_F(0x04e2c2cb) /* 0.305361550 */, 18 },
+  /* 4760 */  { MAD_F(0x04e31c81) /* 0.305447106 */, 18 },
+  /* 4761 */  { MAD_F(0x04e37639) /* 0.305532669 */, 18 },
+  /* 4762 */  { MAD_F(0x04e3cff3) /* 0.305618237 */, 18 },
+  /* 4763 */  { MAD_F(0x04e429ae) /* 0.305703811 */, 18 },
+  /* 4764 */  { MAD_F(0x04e4836b) /* 0.305789392 */, 18 },
+  /* 4765 */  { MAD_F(0x04e4dd29) /* 0.305874978 */, 18 },
+  /* 4766 */  { MAD_F(0x04e536e9) /* 0.305960571 */, 18 },
+  /* 4767 */  { MAD_F(0x04e590ab) /* 0.306046169 */, 18 },
+
+  /* 4768 */  { MAD_F(0x04e5ea6e) /* 0.306131773 */, 18 },
+  /* 4769 */  { MAD_F(0x04e64433) /* 0.306217383 */, 18 },
+  /* 4770 */  { MAD_F(0x04e69df9) /* 0.306303000 */, 18 },
+  /* 4771 */  { MAD_F(0x04e6f7c1) /* 0.306388622 */, 18 },
+  /* 4772 */  { MAD_F(0x04e7518b) /* 0.306474250 */, 18 },
+  /* 4773 */  { MAD_F(0x04e7ab56) /* 0.306559885 */, 18 },
+  /* 4774 */  { MAD_F(0x04e80523) /* 0.306645525 */, 18 },
+  /* 4775 */  { MAD_F(0x04e85ef2) /* 0.306731171 */, 18 },
+  /* 4776 */  { MAD_F(0x04e8b8c2) /* 0.306816823 */, 18 },
+  /* 4777 */  { MAD_F(0x04e91293) /* 0.306902481 */, 18 },
+  /* 4778 */  { MAD_F(0x04e96c67) /* 0.306988145 */, 18 },
+  /* 4779 */  { MAD_F(0x04e9c63b) /* 0.307073816 */, 18 },
+  /* 4780 */  { MAD_F(0x04ea2012) /* 0.307159492 */, 18 },
+  /* 4781 */  { MAD_F(0x04ea79ea) /* 0.307245174 */, 18 },
+  /* 4782 */  { MAD_F(0x04ead3c4) /* 0.307330862 */, 18 },
+  /* 4783 */  { MAD_F(0x04eb2d9f) /* 0.307416556 */, 18 },
+
+  /* 4784 */  { MAD_F(0x04eb877c) /* 0.307502256 */, 18 },
+  /* 4785 */  { MAD_F(0x04ebe15b) /* 0.307587962 */, 18 },
+  /* 4786 */  { MAD_F(0x04ec3b3b) /* 0.307673674 */, 18 },
+  /* 4787 */  { MAD_F(0x04ec951c) /* 0.307759392 */, 18 },
+  /* 4788 */  { MAD_F(0x04ecef00) /* 0.307845115 */, 18 },
+  /* 4789 */  { MAD_F(0x04ed48e5) /* 0.307930845 */, 18 },
+  /* 4790 */  { MAD_F(0x04eda2cb) /* 0.308016581 */, 18 },
+  /* 4791 */  { MAD_F(0x04edfcb3) /* 0.308102323 */, 18 },
+  /* 4792 */  { MAD_F(0x04ee569d) /* 0.308188071 */, 18 },
+  /* 4793 */  { MAD_F(0x04eeb088) /* 0.308273824 */, 18 },
+  /* 4794 */  { MAD_F(0x04ef0a75) /* 0.308359584 */, 18 },
+  /* 4795 */  { MAD_F(0x04ef6464) /* 0.308445350 */, 18 },
+  /* 4796 */  { MAD_F(0x04efbe54) /* 0.308531121 */, 18 },
+  /* 4797 */  { MAD_F(0x04f01846) /* 0.308616899 */, 18 },
+  /* 4798 */  { MAD_F(0x04f07239) /* 0.308702682 */, 18 },
+  /* 4799 */  { MAD_F(0x04f0cc2e) /* 0.308788472 */, 18 },
+
+  /* 4800 */  { MAD_F(0x04f12624) /* 0.308874267 */, 18 },
+  /* 4801 */  { MAD_F(0x04f1801d) /* 0.308960068 */, 18 },
+  /* 4802 */  { MAD_F(0x04f1da16) /* 0.309045876 */, 18 },
+  /* 4803 */  { MAD_F(0x04f23412) /* 0.309131689 */, 18 },
+  /* 4804 */  { MAD_F(0x04f28e0f) /* 0.309217508 */, 18 },
+  /* 4805 */  { MAD_F(0x04f2e80d) /* 0.309303334 */, 18 },
+  /* 4806 */  { MAD_F(0x04f3420d) /* 0.309389165 */, 18 },
+  /* 4807 */  { MAD_F(0x04f39c0f) /* 0.309475002 */, 18 },
+  /* 4808 */  { MAD_F(0x04f3f612) /* 0.309560845 */, 18 },
+  /* 4809 */  { MAD_F(0x04f45017) /* 0.309646694 */, 18 },
+  /* 4810 */  { MAD_F(0x04f4aa1e) /* 0.309732549 */, 18 },
+  /* 4811 */  { MAD_F(0x04f50426) /* 0.309818410 */, 18 },
+  /* 4812 */  { MAD_F(0x04f55e30) /* 0.309904277 */, 18 },
+  /* 4813 */  { MAD_F(0x04f5b83b) /* 0.309990150 */, 18 },
+  /* 4814 */  { MAD_F(0x04f61248) /* 0.310076028 */, 18 },
+  /* 4815 */  { MAD_F(0x04f66c56) /* 0.310161913 */, 18 },
+
+  /* 4816 */  { MAD_F(0x04f6c666) /* 0.310247804 */, 18 },
+  /* 4817 */  { MAD_F(0x04f72078) /* 0.310333700 */, 18 },
+  /* 4818 */  { MAD_F(0x04f77a8b) /* 0.310419603 */, 18 },
+  /* 4819 */  { MAD_F(0x04f7d4a0) /* 0.310505511 */, 18 },
+  /* 4820 */  { MAD_F(0x04f82eb7) /* 0.310591426 */, 18 },
+  /* 4821 */  { MAD_F(0x04f888cf) /* 0.310677346 */, 18 },
+  /* 4822 */  { MAD_F(0x04f8e2e9) /* 0.310763272 */, 18 },
+  /* 4823 */  { MAD_F(0x04f93d04) /* 0.310849205 */, 18 },
+  /* 4824 */  { MAD_F(0x04f99721) /* 0.310935143 */, 18 },
+  /* 4825 */  { MAD_F(0x04f9f13f) /* 0.311021087 */, 18 },
+  /* 4826 */  { MAD_F(0x04fa4b5f) /* 0.311107037 */, 18 },
+  /* 4827 */  { MAD_F(0x04faa581) /* 0.311192993 */, 18 },
+  /* 4828 */  { MAD_F(0x04faffa4) /* 0.311278955 */, 18 },
+  /* 4829 */  { MAD_F(0x04fb59c9) /* 0.311364923 */, 18 },
+  /* 4830 */  { MAD_F(0x04fbb3ef) /* 0.311450897 */, 18 },
+  /* 4831 */  { MAD_F(0x04fc0e17) /* 0.311536877 */, 18 },
+
+  /* 4832 */  { MAD_F(0x04fc6841) /* 0.311622862 */, 18 },
+  /* 4833 */  { MAD_F(0x04fcc26c) /* 0.311708854 */, 18 },
+  /* 4834 */  { MAD_F(0x04fd1c99) /* 0.311794851 */, 18 },
+  /* 4835 */  { MAD_F(0x04fd76c7) /* 0.311880855 */, 18 },
+  /* 4836 */  { MAD_F(0x04fdd0f7) /* 0.311966864 */, 18 },
+  /* 4837 */  { MAD_F(0x04fe2b29) /* 0.312052880 */, 18 },
+  /* 4838 */  { MAD_F(0x04fe855c) /* 0.312138901 */, 18 },
+  /* 4839 */  { MAD_F(0x04fedf91) /* 0.312224928 */, 18 },
+  /* 4840 */  { MAD_F(0x04ff39c7) /* 0.312310961 */, 18 },
+  /* 4841 */  { MAD_F(0x04ff93ff) /* 0.312397000 */, 18 },
+  /* 4842 */  { MAD_F(0x04ffee38) /* 0.312483045 */, 18 },
+  /* 4843 */  { MAD_F(0x05004874) /* 0.312569096 */, 18 },
+  /* 4844 */  { MAD_F(0x0500a2b0) /* 0.312655153 */, 18 },
+  /* 4845 */  { MAD_F(0x0500fcef) /* 0.312741216 */, 18 },
+  /* 4846 */  { MAD_F(0x0501572e) /* 0.312827284 */, 18 },
+  /* 4847 */  { MAD_F(0x0501b170) /* 0.312913359 */, 18 },
+
+  /* 4848 */  { MAD_F(0x05020bb3) /* 0.312999439 */, 18 },
+  /* 4849 */  { MAD_F(0x050265f8) /* 0.313085526 */, 18 },
+  /* 4850 */  { MAD_F(0x0502c03e) /* 0.313171618 */, 18 },
+  /* 4851 */  { MAD_F(0x05031a86) /* 0.313257716 */, 18 },
+  /* 4852 */  { MAD_F(0x050374cf) /* 0.313343820 */, 18 },
+  /* 4853 */  { MAD_F(0x0503cf1a) /* 0.313429931 */, 18 },
+  /* 4854 */  { MAD_F(0x05042967) /* 0.313516047 */, 18 },
+  /* 4855 */  { MAD_F(0x050483b5) /* 0.313602168 */, 18 },
+  /* 4856 */  { MAD_F(0x0504de05) /* 0.313688296 */, 18 },
+  /* 4857 */  { MAD_F(0x05053856) /* 0.313774430 */, 18 },
+  /* 4858 */  { MAD_F(0x050592a9) /* 0.313860570 */, 18 },
+  /* 4859 */  { MAD_F(0x0505ecfd) /* 0.313946715 */, 18 },
+  /* 4860 */  { MAD_F(0x05064754) /* 0.314032867 */, 18 },
+  /* 4861 */  { MAD_F(0x0506a1ab) /* 0.314119024 */, 18 },
+  /* 4862 */  { MAD_F(0x0506fc04) /* 0.314205187 */, 18 },
+  /* 4863 */  { MAD_F(0x0507565f) /* 0.314291357 */, 18 },
+
+  /* 4864 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 18 },
+  /* 4865 */  { MAD_F(0x05080b1a) /* 0.314463713 */, 18 },
+  /* 4866 */  { MAD_F(0x05086579) /* 0.314549900 */, 18 },
+  /* 4867 */  { MAD_F(0x0508bfdb) /* 0.314636092 */, 18 },
+  /* 4868 */  { MAD_F(0x05091a3d) /* 0.314722291 */, 18 },
+  /* 4869 */  { MAD_F(0x050974a2) /* 0.314808496 */, 18 },
+  /* 4870 */  { MAD_F(0x0509cf08) /* 0.314894706 */, 18 },
+  /* 4871 */  { MAD_F(0x050a296f) /* 0.314980923 */, 18 },
+  /* 4872 */  { MAD_F(0x050a83d8) /* 0.315067145 */, 18 },
+  /* 4873 */  { MAD_F(0x050ade43) /* 0.315153373 */, 18 },
+  /* 4874 */  { MAD_F(0x050b38af) /* 0.315239607 */, 18 },
+  /* 4875 */  { MAD_F(0x050b931d) /* 0.315325847 */, 18 },
+  /* 4876 */  { MAD_F(0x050bed8d) /* 0.315412093 */, 18 },
+  /* 4877 */  { MAD_F(0x050c47fe) /* 0.315498345 */, 18 },
+  /* 4878 */  { MAD_F(0x050ca271) /* 0.315584603 */, 18 },
+  /* 4879 */  { MAD_F(0x050cfce5) /* 0.315670866 */, 18 },
+
+  /* 4880 */  { MAD_F(0x050d575b) /* 0.315757136 */, 18 },
+  /* 4881 */  { MAD_F(0x050db1d2) /* 0.315843411 */, 18 },
+  /* 4882 */  { MAD_F(0x050e0c4b) /* 0.315929693 */, 18 },
+  /* 4883 */  { MAD_F(0x050e66c5) /* 0.316015980 */, 18 },
+  /* 4884 */  { MAD_F(0x050ec141) /* 0.316102273 */, 18 },
+  /* 4885 */  { MAD_F(0x050f1bbf) /* 0.316188572 */, 18 },
+  /* 4886 */  { MAD_F(0x050f763e) /* 0.316274877 */, 18 },
+  /* 4887 */  { MAD_F(0x050fd0bf) /* 0.316361187 */, 18 },
+  /* 4888 */  { MAD_F(0x05102b42) /* 0.316447504 */, 18 },
+  /* 4889 */  { MAD_F(0x051085c6) /* 0.316533826 */, 18 },
+  /* 4890 */  { MAD_F(0x0510e04b) /* 0.316620155 */, 18 },
+  /* 4891 */  { MAD_F(0x05113ad3) /* 0.316706489 */, 18 },
+  /* 4892 */  { MAD_F(0x0511955b) /* 0.316792829 */, 18 },
+  /* 4893 */  { MAD_F(0x0511efe6) /* 0.316879175 */, 18 },
+  /* 4894 */  { MAD_F(0x05124a72) /* 0.316965527 */, 18 },
+  /* 4895 */  { MAD_F(0x0512a4ff) /* 0.317051885 */, 18 },
+
+  /* 4896 */  { MAD_F(0x0512ff8e) /* 0.317138249 */, 18 },
+  /* 4897 */  { MAD_F(0x05135a1f) /* 0.317224618 */, 18 },
+  /* 4898 */  { MAD_F(0x0513b4b1) /* 0.317310994 */, 18 },
+  /* 4899 */  { MAD_F(0x05140f45) /* 0.317397375 */, 18 },
+  /* 4900 */  { MAD_F(0x051469da) /* 0.317483762 */, 18 },
+  /* 4901 */  { MAD_F(0x0514c471) /* 0.317570155 */, 18 },
+  /* 4902 */  { MAD_F(0x05151f0a) /* 0.317656554 */, 18 },
+  /* 4903 */  { MAD_F(0x051579a4) /* 0.317742959 */, 18 },
+  /* 4904 */  { MAD_F(0x0515d440) /* 0.317829370 */, 18 },
+  /* 4905 */  { MAD_F(0x05162edd) /* 0.317915786 */, 18 },
+  /* 4906 */  { MAD_F(0x0516897c) /* 0.318002209 */, 18 },
+  /* 4907 */  { MAD_F(0x0516e41c) /* 0.318088637 */, 18 },
+  /* 4908 */  { MAD_F(0x05173ebe) /* 0.318175071 */, 18 },
+  /* 4909 */  { MAD_F(0x05179962) /* 0.318261511 */, 18 },
+  /* 4910 */  { MAD_F(0x0517f407) /* 0.318347957 */, 18 },
+  /* 4911 */  { MAD_F(0x05184eae) /* 0.318434409 */, 18 },
+
+  /* 4912 */  { MAD_F(0x0518a956) /* 0.318520867 */, 18 },
+  /* 4913 */  { MAD_F(0x05190400) /* 0.318607330 */, 18 },
+  /* 4914 */  { MAD_F(0x05195eab) /* 0.318693800 */, 18 },
+  /* 4915 */  { MAD_F(0x0519b958) /* 0.318780275 */, 18 },
+  /* 4916 */  { MAD_F(0x051a1407) /* 0.318866756 */, 18 },
+  /* 4917 */  { MAD_F(0x051a6eb7) /* 0.318953243 */, 18 },
+  /* 4918 */  { MAD_F(0x051ac969) /* 0.319039736 */, 18 },
+  /* 4919 */  { MAD_F(0x051b241c) /* 0.319126235 */, 18 },
+  /* 4920 */  { MAD_F(0x051b7ed1) /* 0.319212739 */, 18 },
+  /* 4921 */  { MAD_F(0x051bd987) /* 0.319299250 */, 18 },
+  /* 4922 */  { MAD_F(0x051c3440) /* 0.319385766 */, 18 },
+  /* 4923 */  { MAD_F(0x051c8ef9) /* 0.319472288 */, 18 },
+  /* 4924 */  { MAD_F(0x051ce9b4) /* 0.319558816 */, 18 },
+  /* 4925 */  { MAD_F(0x051d4471) /* 0.319645350 */, 18 },
+  /* 4926 */  { MAD_F(0x051d9f2f) /* 0.319731890 */, 18 },
+  /* 4927 */  { MAD_F(0x051df9ef) /* 0.319818435 */, 18 },
+
+  /* 4928 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 18 },
+  /* 4929 */  { MAD_F(0x051eaf74) /* 0.319991544 */, 18 },
+  /* 4930 */  { MAD_F(0x051f0a38) /* 0.320078107 */, 18 },
+  /* 4931 */  { MAD_F(0x051f64ff) /* 0.320164676 */, 18 },
+  /* 4932 */  { MAD_F(0x051fbfc6) /* 0.320251251 */, 18 },
+  /* 4933 */  { MAD_F(0x05201a90) /* 0.320337832 */, 18 },
+  /* 4934 */  { MAD_F(0x0520755b) /* 0.320424419 */, 18 },
+  /* 4935 */  { MAD_F(0x0520d027) /* 0.320511011 */, 18 },
+  /* 4936 */  { MAD_F(0x05212af5) /* 0.320597609 */, 18 },
+  /* 4937 */  { MAD_F(0x052185c5) /* 0.320684213 */, 18 },
+  /* 4938 */  { MAD_F(0x0521e096) /* 0.320770823 */, 18 },
+  /* 4939 */  { MAD_F(0x05223b69) /* 0.320857439 */, 18 },
+  /* 4940 */  { MAD_F(0x0522963d) /* 0.320944061 */, 18 },
+  /* 4941 */  { MAD_F(0x0522f113) /* 0.321030688 */, 18 },
+  /* 4942 */  { MAD_F(0x05234bea) /* 0.321117322 */, 18 },
+  /* 4943 */  { MAD_F(0x0523a6c3) /* 0.321203961 */, 18 },
+
+  /* 4944 */  { MAD_F(0x0524019e) /* 0.321290606 */, 18 },
+  /* 4945 */  { MAD_F(0x05245c7a) /* 0.321377257 */, 18 },
+  /* 4946 */  { MAD_F(0x0524b758) /* 0.321463913 */, 18 },
+  /* 4947 */  { MAD_F(0x05251237) /* 0.321550576 */, 18 },
+  /* 4948 */  { MAD_F(0x05256d18) /* 0.321637244 */, 18 },
+  /* 4949 */  { MAD_F(0x0525c7fb) /* 0.321723919 */, 18 },
+  /* 4950 */  { MAD_F(0x052622df) /* 0.321810599 */, 18 },
+  /* 4951 */  { MAD_F(0x05267dc4) /* 0.321897285 */, 18 },
+  /* 4952 */  { MAD_F(0x0526d8ab) /* 0.321983976 */, 18 },
+  /* 4953 */  { MAD_F(0x05273394) /* 0.322070674 */, 18 },
+  /* 4954 */  { MAD_F(0x05278e7e) /* 0.322157377 */, 18 },
+  /* 4955 */  { MAD_F(0x0527e96a) /* 0.322244087 */, 18 },
+  /* 4956 */  { MAD_F(0x05284457) /* 0.322330802 */, 18 },
+  /* 4957 */  { MAD_F(0x05289f46) /* 0.322417523 */, 18 },
+  /* 4958 */  { MAD_F(0x0528fa37) /* 0.322504249 */, 18 },
+  /* 4959 */  { MAD_F(0x05295529) /* 0.322590982 */, 18 },
+
+  /* 4960 */  { MAD_F(0x0529b01d) /* 0.322677720 */, 18 },
+  /* 4961 */  { MAD_F(0x052a0b12) /* 0.322764465 */, 18 },
+  /* 4962 */  { MAD_F(0x052a6609) /* 0.322851215 */, 18 },
+  /* 4963 */  { MAD_F(0x052ac101) /* 0.322937971 */, 18 },
+  /* 4964 */  { MAD_F(0x052b1bfb) /* 0.323024732 */, 18 },
+  /* 4965 */  { MAD_F(0x052b76f7) /* 0.323111500 */, 18 },
+  /* 4966 */  { MAD_F(0x052bd1f4) /* 0.323198273 */, 18 },
+  /* 4967 */  { MAD_F(0x052c2cf2) /* 0.323285052 */, 18 },
+  /* 4968 */  { MAD_F(0x052c87f2) /* 0.323371837 */, 18 },
+  /* 4969 */  { MAD_F(0x052ce2f4) /* 0.323458628 */, 18 },
+  /* 4970 */  { MAD_F(0x052d3df7) /* 0.323545425 */, 18 },
+  /* 4971 */  { MAD_F(0x052d98fc) /* 0.323632227 */, 18 },
+  /* 4972 */  { MAD_F(0x052df403) /* 0.323719036 */, 18 },
+  /* 4973 */  { MAD_F(0x052e4f0b) /* 0.323805850 */, 18 },
+  /* 4974 */  { MAD_F(0x052eaa14) /* 0.323892670 */, 18 },
+  /* 4975 */  { MAD_F(0x052f051f) /* 0.323979496 */, 18 },
+
+  /* 4976 */  { MAD_F(0x052f602c) /* 0.324066327 */, 18 },
+  /* 4977 */  { MAD_F(0x052fbb3a) /* 0.324153165 */, 18 },
+  /* 4978 */  { MAD_F(0x0530164a) /* 0.324240008 */, 18 },
+  /* 4979 */  { MAD_F(0x0530715b) /* 0.324326857 */, 18 },
+  /* 4980 */  { MAD_F(0x0530cc6e) /* 0.324413712 */, 18 },
+  /* 4981 */  { MAD_F(0x05312783) /* 0.324500572 */, 18 },
+  /* 4982 */  { MAD_F(0x05318299) /* 0.324587439 */, 18 },
+  /* 4983 */  { MAD_F(0x0531ddb0) /* 0.324674311 */, 18 },
+  /* 4984 */  { MAD_F(0x053238ca) /* 0.324761189 */, 18 },
+  /* 4985 */  { MAD_F(0x053293e4) /* 0.324848073 */, 18 },
+  /* 4986 */  { MAD_F(0x0532ef01) /* 0.324934963 */, 18 },
+  /* 4987 */  { MAD_F(0x05334a1e) /* 0.325021858 */, 18 },
+  /* 4988 */  { MAD_F(0x0533a53e) /* 0.325108760 */, 18 },
+  /* 4989 */  { MAD_F(0x0534005f) /* 0.325195667 */, 18 },
+  /* 4990 */  { MAD_F(0x05345b81) /* 0.325282580 */, 18 },
+  /* 4991 */  { MAD_F(0x0534b6a5) /* 0.325369498 */, 18 },
+
+  /* 4992 */  { MAD_F(0x053511cb) /* 0.325456423 */, 18 },
+  /* 4993 */  { MAD_F(0x05356cf2) /* 0.325543353 */, 18 },
+  /* 4994 */  { MAD_F(0x0535c81b) /* 0.325630290 */, 18 },
+  /* 4995 */  { MAD_F(0x05362345) /* 0.325717232 */, 18 },
+  /* 4996 */  { MAD_F(0x05367e71) /* 0.325804179 */, 18 },
+  /* 4997 */  { MAD_F(0x0536d99f) /* 0.325891133 */, 18 },
+  /* 4998 */  { MAD_F(0x053734ce) /* 0.325978092 */, 18 },
+  /* 4999 */  { MAD_F(0x05378ffe) /* 0.326065057 */, 18 },
+  /* 5000 */  { MAD_F(0x0537eb30) /* 0.326152028 */, 18 },
+  /* 5001 */  { MAD_F(0x05384664) /* 0.326239005 */, 18 },
+  /* 5002 */  { MAD_F(0x0538a199) /* 0.326325988 */, 18 },
+  /* 5003 */  { MAD_F(0x0538fcd0) /* 0.326412976 */, 18 },
+  /* 5004 */  { MAD_F(0x05395808) /* 0.326499970 */, 18 },
+  /* 5005 */  { MAD_F(0x0539b342) /* 0.326586970 */, 18 },
+  /* 5006 */  { MAD_F(0x053a0e7d) /* 0.326673976 */, 18 },
+  /* 5007 */  { MAD_F(0x053a69ba) /* 0.326760988 */, 18 },
+
+  /* 5008 */  { MAD_F(0x053ac4f9) /* 0.326848005 */, 18 },
+  /* 5009 */  { MAD_F(0x053b2039) /* 0.326935028 */, 18 },
+  /* 5010 */  { MAD_F(0x053b7b7b) /* 0.327022057 */, 18 },
+  /* 5011 */  { MAD_F(0x053bd6be) /* 0.327109092 */, 18 },
+  /* 5012 */  { MAD_F(0x053c3203) /* 0.327196132 */, 18 },
+  /* 5013 */  { MAD_F(0x053c8d49) /* 0.327283178 */, 18 },
+  /* 5014 */  { MAD_F(0x053ce891) /* 0.327370231 */, 18 },
+  /* 5015 */  { MAD_F(0x053d43da) /* 0.327457288 */, 18 },
+  /* 5016 */  { MAD_F(0x053d9f25) /* 0.327544352 */, 18 },
+  /* 5017 */  { MAD_F(0x053dfa72) /* 0.327631421 */, 18 },
+  /* 5018 */  { MAD_F(0x053e55c0) /* 0.327718497 */, 18 },
+  /* 5019 */  { MAD_F(0x053eb10f) /* 0.327805578 */, 18 },
+  /* 5020 */  { MAD_F(0x053f0c61) /* 0.327892665 */, 18 },
+  /* 5021 */  { MAD_F(0x053f67b3) /* 0.327979757 */, 18 },
+  /* 5022 */  { MAD_F(0x053fc308) /* 0.328066855 */, 18 },
+  /* 5023 */  { MAD_F(0x05401e5e) /* 0.328153960 */, 18 },
+
+  /* 5024 */  { MAD_F(0x054079b5) /* 0.328241070 */, 18 },
+  /* 5025 */  { MAD_F(0x0540d50e) /* 0.328328185 */, 18 },
+  /* 5026 */  { MAD_F(0x05413068) /* 0.328415307 */, 18 },
+  /* 5027 */  { MAD_F(0x05418bc4) /* 0.328502434 */, 18 },
+  /* 5028 */  { MAD_F(0x0541e722) /* 0.328589567 */, 18 },
+  /* 5029 */  { MAD_F(0x05424281) /* 0.328676706 */, 18 },
+  /* 5030 */  { MAD_F(0x05429de2) /* 0.328763850 */, 18 },
+  /* 5031 */  { MAD_F(0x0542f944) /* 0.328851001 */, 18 },
+  /* 5032 */  { MAD_F(0x054354a8) /* 0.328938157 */, 18 },
+  /* 5033 */  { MAD_F(0x0543b00d) /* 0.329025319 */, 18 },
+  /* 5034 */  { MAD_F(0x05440b74) /* 0.329112486 */, 18 },
+  /* 5035 */  { MAD_F(0x054466dd) /* 0.329199660 */, 18 },
+  /* 5036 */  { MAD_F(0x0544c247) /* 0.329286839 */, 18 },
+  /* 5037 */  { MAD_F(0x05451db2) /* 0.329374024 */, 18 },
+  /* 5038 */  { MAD_F(0x0545791f) /* 0.329461215 */, 18 },
+  /* 5039 */  { MAD_F(0x0545d48e) /* 0.329548411 */, 18 },
+
+  /* 5040 */  { MAD_F(0x05462ffe) /* 0.329635614 */, 18 },
+  /* 5041 */  { MAD_F(0x05468b70) /* 0.329722822 */, 18 },
+  /* 5042 */  { MAD_F(0x0546e6e3) /* 0.329810036 */, 18 },
+  /* 5043 */  { MAD_F(0x05474258) /* 0.329897255 */, 18 },
+  /* 5044 */  { MAD_F(0x05479dce) /* 0.329984481 */, 18 },
+  /* 5045 */  { MAD_F(0x0547f946) /* 0.330071712 */, 18 },
+  /* 5046 */  { MAD_F(0x054854c0) /* 0.330158949 */, 18 },
+  /* 5047 */  { MAD_F(0x0548b03b) /* 0.330246191 */, 18 },
+  /* 5048 */  { MAD_F(0x05490bb7) /* 0.330333440 */, 18 },
+  /* 5049 */  { MAD_F(0x05496735) /* 0.330420694 */, 18 },
+  /* 5050 */  { MAD_F(0x0549c2b5) /* 0.330507954 */, 18 },
+  /* 5051 */  { MAD_F(0x054a1e36) /* 0.330595220 */, 18 },
+  /* 5052 */  { MAD_F(0x054a79b9) /* 0.330682491 */, 18 },
+  /* 5053 */  { MAD_F(0x054ad53d) /* 0.330769768 */, 18 },
+  /* 5054 */  { MAD_F(0x054b30c3) /* 0.330857051 */, 18 },
+  /* 5055 */  { MAD_F(0x054b8c4b) /* 0.330944340 */, 18 },
+
+  /* 5056 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 18 },
+  /* 5057 */  { MAD_F(0x054c435e) /* 0.331118935 */, 18 },
+  /* 5058 */  { MAD_F(0x054c9eea) /* 0.331206241 */, 18 },
+  /* 5059 */  { MAD_F(0x054cfa78) /* 0.331293553 */, 18 },
+  /* 5060 */  { MAD_F(0x054d5607) /* 0.331380870 */, 18 },
+  /* 5061 */  { MAD_F(0x054db197) /* 0.331468193 */, 18 },
+  /* 5062 */  { MAD_F(0x054e0d2a) /* 0.331555522 */, 18 },
+  /* 5063 */  { MAD_F(0x054e68bd) /* 0.331642857 */, 18 },
+  /* 5064 */  { MAD_F(0x054ec453) /* 0.331730198 */, 18 },
+  /* 5065 */  { MAD_F(0x054f1fe9) /* 0.331817544 */, 18 },
+  /* 5066 */  { MAD_F(0x054f7b82) /* 0.331904896 */, 18 },
+  /* 5067 */  { MAD_F(0x054fd71c) /* 0.331992254 */, 18 },
+  /* 5068 */  { MAD_F(0x055032b7) /* 0.332079617 */, 18 },
+  /* 5069 */  { MAD_F(0x05508e54) /* 0.332166986 */, 18 },
+  /* 5070 */  { MAD_F(0x0550e9f3) /* 0.332254361 */, 18 },
+  /* 5071 */  { MAD_F(0x05514593) /* 0.332341742 */, 18 },
+
+  /* 5072 */  { MAD_F(0x0551a134) /* 0.332429129 */, 18 },
+  /* 5073 */  { MAD_F(0x0551fcd8) /* 0.332516521 */, 18 },
+  /* 5074 */  { MAD_F(0x0552587c) /* 0.332603919 */, 18 },
+  /* 5075 */  { MAD_F(0x0552b423) /* 0.332691323 */, 18 },
+  /* 5076 */  { MAD_F(0x05530fca) /* 0.332778732 */, 18 },
+  /* 5077 */  { MAD_F(0x05536b74) /* 0.332866147 */, 18 },
+  /* 5078 */  { MAD_F(0x0553c71f) /* 0.332953568 */, 18 },
+  /* 5079 */  { MAD_F(0x055422cb) /* 0.333040995 */, 18 },
+  /* 5080 */  { MAD_F(0x05547e79) /* 0.333128427 */, 18 },
+  /* 5081 */  { MAD_F(0x0554da29) /* 0.333215865 */, 18 },
+  /* 5082 */  { MAD_F(0x055535da) /* 0.333303309 */, 18 },
+  /* 5083 */  { MAD_F(0x0555918c) /* 0.333390759 */, 18 },
+  /* 5084 */  { MAD_F(0x0555ed40) /* 0.333478214 */, 18 },
+  /* 5085 */  { MAD_F(0x055648f6) /* 0.333565675 */, 18 },
+  /* 5086 */  { MAD_F(0x0556a4ad) /* 0.333653142 */, 18 },
+  /* 5087 */  { MAD_F(0x05570066) /* 0.333740615 */, 18 },
+
+  /* 5088 */  { MAD_F(0x05575c20) /* 0.333828093 */, 18 },
+  /* 5089 */  { MAD_F(0x0557b7dc) /* 0.333915577 */, 18 },
+  /* 5090 */  { MAD_F(0x05581399) /* 0.334003067 */, 18 },
+  /* 5091 */  { MAD_F(0x05586f58) /* 0.334090562 */, 18 },
+  /* 5092 */  { MAD_F(0x0558cb19) /* 0.334178063 */, 18 },
+  /* 5093 */  { MAD_F(0x055926db) /* 0.334265570 */, 18 },
+  /* 5094 */  { MAD_F(0x0559829e) /* 0.334353083 */, 18 },
+  /* 5095 */  { MAD_F(0x0559de63) /* 0.334440601 */, 18 },
+  /* 5096 */  { MAD_F(0x055a3a2a) /* 0.334528126 */, 18 },
+  /* 5097 */  { MAD_F(0x055a95f2) /* 0.334615655 */, 18 },
+  /* 5098 */  { MAD_F(0x055af1bb) /* 0.334703191 */, 18 },
+  /* 5099 */  { MAD_F(0x055b4d87) /* 0.334790732 */, 18 },
+  /* 5100 */  { MAD_F(0x055ba953) /* 0.334878279 */, 18 },
+  /* 5101 */  { MAD_F(0x055c0522) /* 0.334965832 */, 18 },
+  /* 5102 */  { MAD_F(0x055c60f1) /* 0.335053391 */, 18 },
+  /* 5103 */  { MAD_F(0x055cbcc3) /* 0.335140955 */, 18 },
+
+  /* 5104 */  { MAD_F(0x055d1896) /* 0.335228525 */, 18 },
+  /* 5105 */  { MAD_F(0x055d746a) /* 0.335316100 */, 18 },
+  /* 5106 */  { MAD_F(0x055dd040) /* 0.335403682 */, 18 },
+  /* 5107 */  { MAD_F(0x055e2c17) /* 0.335491269 */, 18 },
+  /* 5108 */  { MAD_F(0x055e87f0) /* 0.335578861 */, 18 },
+  /* 5109 */  { MAD_F(0x055ee3cb) /* 0.335666460 */, 18 },
+  /* 5110 */  { MAD_F(0x055f3fa7) /* 0.335754064 */, 18 },
+  /* 5111 */  { MAD_F(0x055f9b85) /* 0.335841674 */, 18 },
+  /* 5112 */  { MAD_F(0x055ff764) /* 0.335929290 */, 18 },
+  /* 5113 */  { MAD_F(0x05605344) /* 0.336016911 */, 18 },
+  /* 5114 */  { MAD_F(0x0560af27) /* 0.336104538 */, 18 },
+  /* 5115 */  { MAD_F(0x05610b0a) /* 0.336192171 */, 18 },
+  /* 5116 */  { MAD_F(0x056166f0) /* 0.336279809 */, 18 },
+  /* 5117 */  { MAD_F(0x0561c2d7) /* 0.336367453 */, 18 },
+  /* 5118 */  { MAD_F(0x05621ebf) /* 0.336455103 */, 18 },
+  /* 5119 */  { MAD_F(0x05627aa9) /* 0.336542759 */, 18 },
+
+  /* 5120 */  { MAD_F(0x0562d694) /* 0.336630420 */, 18 },
+  /* 5121 */  { MAD_F(0x05633281) /* 0.336718087 */, 18 },
+  /* 5122 */  { MAD_F(0x05638e70) /* 0.336805760 */, 18 },
+  /* 5123 */  { MAD_F(0x0563ea60) /* 0.336893439 */, 18 },
+  /* 5124 */  { MAD_F(0x05644651) /* 0.336981123 */, 18 },
+  /* 5125 */  { MAD_F(0x0564a244) /* 0.337068813 */, 18 },
+  /* 5126 */  { MAD_F(0x0564fe39) /* 0.337156508 */, 18 },
+  /* 5127 */  { MAD_F(0x05655a2f) /* 0.337244209 */, 18 },
+  /* 5128 */  { MAD_F(0x0565b627) /* 0.337331916 */, 18 },
+  /* 5129 */  { MAD_F(0x05661220) /* 0.337419629 */, 18 },
+  /* 5130 */  { MAD_F(0x05666e1a) /* 0.337507347 */, 18 },
+  /* 5131 */  { MAD_F(0x0566ca17) /* 0.337595071 */, 18 },
+  /* 5132 */  { MAD_F(0x05672614) /* 0.337682801 */, 18 },
+  /* 5133 */  { MAD_F(0x05678214) /* 0.337770537 */, 18 },
+  /* 5134 */  { MAD_F(0x0567de15) /* 0.337858278 */, 18 },
+  /* 5135 */  { MAD_F(0x05683a17) /* 0.337946025 */, 18 },
+
+  /* 5136 */  { MAD_F(0x0568961b) /* 0.338033777 */, 18 },
+  /* 5137 */  { MAD_F(0x0568f220) /* 0.338121535 */, 18 },
+  /* 5138 */  { MAD_F(0x05694e27) /* 0.338209299 */, 18 },
+  /* 5139 */  { MAD_F(0x0569aa30) /* 0.338297069 */, 18 },
+  /* 5140 */  { MAD_F(0x056a063a) /* 0.338384844 */, 18 },
+  /* 5141 */  { MAD_F(0x056a6245) /* 0.338472625 */, 18 },
+  /* 5142 */  { MAD_F(0x056abe52) /* 0.338560412 */, 18 },
+  /* 5143 */  { MAD_F(0x056b1a61) /* 0.338648204 */, 18 },
+  /* 5144 */  { MAD_F(0x056b7671) /* 0.338736002 */, 18 },
+  /* 5145 */  { MAD_F(0x056bd283) /* 0.338823806 */, 18 },
+  /* 5146 */  { MAD_F(0x056c2e96) /* 0.338911616 */, 18 },
+  /* 5147 */  { MAD_F(0x056c8aab) /* 0.338999431 */, 18 },
+  /* 5148 */  { MAD_F(0x056ce6c1) /* 0.339087252 */, 18 },
+  /* 5149 */  { MAD_F(0x056d42d9) /* 0.339175078 */, 18 },
+  /* 5150 */  { MAD_F(0x056d9ef2) /* 0.339262910 */, 18 },
+  /* 5151 */  { MAD_F(0x056dfb0d) /* 0.339350748 */, 18 },
+
+  /* 5152 */  { MAD_F(0x056e5729) /* 0.339438592 */, 18 },
+  /* 5153 */  { MAD_F(0x056eb347) /* 0.339526441 */, 18 },
+  /* 5154 */  { MAD_F(0x056f0f66) /* 0.339614296 */, 18 },
+  /* 5155 */  { MAD_F(0x056f6b87) /* 0.339702157 */, 18 },
+  /* 5156 */  { MAD_F(0x056fc7aa) /* 0.339790023 */, 18 },
+  /* 5157 */  { MAD_F(0x057023cd) /* 0.339877895 */, 18 },
+  /* 5158 */  { MAD_F(0x05707ff3) /* 0.339965773 */, 18 },
+  /* 5159 */  { MAD_F(0x0570dc1a) /* 0.340053656 */, 18 },
+  /* 5160 */  { MAD_F(0x05713843) /* 0.340141545 */, 18 },
+  /* 5161 */  { MAD_F(0x0571946d) /* 0.340229440 */, 18 },
+  /* 5162 */  { MAD_F(0x0571f098) /* 0.340317340 */, 18 },
+  /* 5163 */  { MAD_F(0x05724cc5) /* 0.340405246 */, 18 },
+  /* 5164 */  { MAD_F(0x0572a8f4) /* 0.340493158 */, 18 },
+  /* 5165 */  { MAD_F(0x05730524) /* 0.340581075 */, 18 },
+  /* 5166 */  { MAD_F(0x05736156) /* 0.340668999 */, 18 },
+  /* 5167 */  { MAD_F(0x0573bd89) /* 0.340756927 */, 18 },
+
+  /* 5168 */  { MAD_F(0x057419be) /* 0.340844862 */, 18 },
+  /* 5169 */  { MAD_F(0x057475f4) /* 0.340932802 */, 18 },
+  /* 5170 */  { MAD_F(0x0574d22c) /* 0.341020748 */, 18 },
+  /* 5171 */  { MAD_F(0x05752e65) /* 0.341108699 */, 18 },
+  /* 5172 */  { MAD_F(0x05758aa0) /* 0.341196656 */, 18 },
+  /* 5173 */  { MAD_F(0x0575e6dc) /* 0.341284619 */, 18 },
+  /* 5174 */  { MAD_F(0x0576431a) /* 0.341372587 */, 18 },
+  /* 5175 */  { MAD_F(0x05769f59) /* 0.341460562 */, 18 },
+  /* 5176 */  { MAD_F(0x0576fb9a) /* 0.341548541 */, 18 },
+  /* 5177 */  { MAD_F(0x057757dd) /* 0.341636527 */, 18 },
+  /* 5178 */  { MAD_F(0x0577b421) /* 0.341724518 */, 18 },
+  /* 5179 */  { MAD_F(0x05781066) /* 0.341812515 */, 18 },
+  /* 5180 */  { MAD_F(0x05786cad) /* 0.341900517 */, 18 },
+  /* 5181 */  { MAD_F(0x0578c8f5) /* 0.341988525 */, 18 },
+  /* 5182 */  { MAD_F(0x0579253f) /* 0.342076539 */, 18 },
+  /* 5183 */  { MAD_F(0x0579818b) /* 0.342164558 */, 18 },
+
+  /* 5184 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 18 },
+  /* 5185 */  { MAD_F(0x057a3a27) /* 0.342340614 */, 18 },
+  /* 5186 */  { MAD_F(0x057a9677) /* 0.342428651 */, 18 },
+  /* 5187 */  { MAD_F(0x057af2c8) /* 0.342516693 */, 18 },
+  /* 5188 */  { MAD_F(0x057b4f1c) /* 0.342604741 */, 18 },
+  /* 5189 */  { MAD_F(0x057bab70) /* 0.342692794 */, 18 },
+  /* 5190 */  { MAD_F(0x057c07c6) /* 0.342780853 */, 18 },
+  /* 5191 */  { MAD_F(0x057c641e) /* 0.342868918 */, 18 },
+  /* 5192 */  { MAD_F(0x057cc077) /* 0.342956988 */, 18 },
+  /* 5193 */  { MAD_F(0x057d1cd2) /* 0.343045064 */, 18 },
+  /* 5194 */  { MAD_F(0x057d792e) /* 0.343133146 */, 18 },
+  /* 5195 */  { MAD_F(0x057dd58c) /* 0.343221233 */, 18 },
+  /* 5196 */  { MAD_F(0x057e31eb) /* 0.343309326 */, 18 },
+  /* 5197 */  { MAD_F(0x057e8e4c) /* 0.343397425 */, 18 },
+  /* 5198 */  { MAD_F(0x057eeaae) /* 0.343485529 */, 18 },
+  /* 5199 */  { MAD_F(0x057f4712) /* 0.343573639 */, 18 },
+
+  /* 5200 */  { MAD_F(0x057fa378) /* 0.343661754 */, 18 },
+  /* 5201 */  { MAD_F(0x057fffde) /* 0.343749876 */, 18 },
+  /* 5202 */  { MAD_F(0x05805c47) /* 0.343838003 */, 18 },
+  /* 5203 */  { MAD_F(0x0580b8b1) /* 0.343926135 */, 18 },
+  /* 5204 */  { MAD_F(0x0581151c) /* 0.344014273 */, 18 },
+  /* 5205 */  { MAD_F(0x05817189) /* 0.344102417 */, 18 },
+  /* 5206 */  { MAD_F(0x0581cdf7) /* 0.344190566 */, 18 },
+  /* 5207 */  { MAD_F(0x05822a67) /* 0.344278722 */, 18 },
+  /* 5208 */  { MAD_F(0x058286d9) /* 0.344366882 */, 18 },
+  /* 5209 */  { MAD_F(0x0582e34c) /* 0.344455049 */, 18 },
+  /* 5210 */  { MAD_F(0x05833fc0) /* 0.344543221 */, 18 },
+  /* 5211 */  { MAD_F(0x05839c36) /* 0.344631398 */, 18 },
+  /* 5212 */  { MAD_F(0x0583f8ae) /* 0.344719582 */, 18 },
+  /* 5213 */  { MAD_F(0x05845527) /* 0.344807771 */, 18 },
+  /* 5214 */  { MAD_F(0x0584b1a1) /* 0.344895965 */, 18 },
+  /* 5215 */  { MAD_F(0x05850e1e) /* 0.344984165 */, 18 },
+
+  /* 5216 */  { MAD_F(0x05856a9b) /* 0.345072371 */, 18 },
+  /* 5217 */  { MAD_F(0x0585c71a) /* 0.345160583 */, 18 },
+  /* 5218 */  { MAD_F(0x0586239b) /* 0.345248800 */, 18 },
+  /* 5219 */  { MAD_F(0x0586801d) /* 0.345337023 */, 18 },
+  /* 5220 */  { MAD_F(0x0586dca1) /* 0.345425251 */, 18 },
+  /* 5221 */  { MAD_F(0x05873926) /* 0.345513485 */, 18 },
+  /* 5222 */  { MAD_F(0x058795ac) /* 0.345601725 */, 18 },
+  /* 5223 */  { MAD_F(0x0587f235) /* 0.345689970 */, 18 },
+  /* 5224 */  { MAD_F(0x05884ebe) /* 0.345778221 */, 18 },
+  /* 5225 */  { MAD_F(0x0588ab49) /* 0.345866478 */, 18 },
+  /* 5226 */  { MAD_F(0x058907d6) /* 0.345954740 */, 18 },
+  /* 5227 */  { MAD_F(0x05896464) /* 0.346043008 */, 18 },
+  /* 5228 */  { MAD_F(0x0589c0f4) /* 0.346131281 */, 18 },
+  /* 5229 */  { MAD_F(0x058a1d85) /* 0.346219560 */, 18 },
+  /* 5230 */  { MAD_F(0x058a7a18) /* 0.346307845 */, 18 },
+  /* 5231 */  { MAD_F(0x058ad6ac) /* 0.346396135 */, 18 },
+
+  /* 5232 */  { MAD_F(0x058b3342) /* 0.346484431 */, 18 },
+  /* 5233 */  { MAD_F(0x058b8fd9) /* 0.346572733 */, 18 },
+  /* 5234 */  { MAD_F(0x058bec72) /* 0.346661040 */, 18 },
+  /* 5235 */  { MAD_F(0x058c490c) /* 0.346749353 */, 18 },
+  /* 5236 */  { MAD_F(0x058ca5a8) /* 0.346837671 */, 18 },
+  /* 5237 */  { MAD_F(0x058d0246) /* 0.346925996 */, 18 },
+  /* 5238 */  { MAD_F(0x058d5ee4) /* 0.347014325 */, 18 },
+  /* 5239 */  { MAD_F(0x058dbb85) /* 0.347102661 */, 18 },
+  /* 5240 */  { MAD_F(0x058e1827) /* 0.347191002 */, 18 },
+  /* 5241 */  { MAD_F(0x058e74ca) /* 0.347279348 */, 18 },
+  /* 5242 */  { MAD_F(0x058ed16f) /* 0.347367700 */, 18 },
+  /* 5243 */  { MAD_F(0x058f2e15) /* 0.347456058 */, 18 },
+  /* 5244 */  { MAD_F(0x058f8abd) /* 0.347544422 */, 18 },
+  /* 5245 */  { MAD_F(0x058fe766) /* 0.347632791 */, 18 },
+  /* 5246 */  { MAD_F(0x05904411) /* 0.347721165 */, 18 },
+  /* 5247 */  { MAD_F(0x0590a0be) /* 0.347809546 */, 18 },
+
+  /* 5248 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 18 },
+  /* 5249 */  { MAD_F(0x05915a1b) /* 0.347986323 */, 18 },
+  /* 5250 */  { MAD_F(0x0591b6cc) /* 0.348074720 */, 18 },
+  /* 5251 */  { MAD_F(0x0592137e) /* 0.348163123 */, 18 },
+  /* 5252 */  { MAD_F(0x05927032) /* 0.348251531 */, 18 },
+  /* 5253 */  { MAD_F(0x0592cce8) /* 0.348339945 */, 18 },
+  /* 5254 */  { MAD_F(0x0593299f) /* 0.348428365 */, 18 },
+  /* 5255 */  { MAD_F(0x05938657) /* 0.348516790 */, 18 },
+  /* 5256 */  { MAD_F(0x0593e311) /* 0.348605221 */, 18 },
+  /* 5257 */  { MAD_F(0x05943fcd) /* 0.348693657 */, 18 },
+  /* 5258 */  { MAD_F(0x05949c8a) /* 0.348782099 */, 18 },
+  /* 5259 */  { MAD_F(0x0594f948) /* 0.348870547 */, 18 },
+  /* 5260 */  { MAD_F(0x05955608) /* 0.348959000 */, 18 },
+  /* 5261 */  { MAD_F(0x0595b2ca) /* 0.349047459 */, 18 },
+  /* 5262 */  { MAD_F(0x05960f8c) /* 0.349135923 */, 18 },
+  /* 5263 */  { MAD_F(0x05966c51) /* 0.349224393 */, 18 },
+
+  /* 5264 */  { MAD_F(0x0596c917) /* 0.349312869 */, 18 },
+  /* 5265 */  { MAD_F(0x059725de) /* 0.349401350 */, 18 },
+  /* 5266 */  { MAD_F(0x059782a7) /* 0.349489837 */, 18 },
+  /* 5267 */  { MAD_F(0x0597df72) /* 0.349578329 */, 18 },
+  /* 5268 */  { MAD_F(0x05983c3e) /* 0.349666827 */, 18 },
+  /* 5269 */  { MAD_F(0x0598990c) /* 0.349755331 */, 18 },
+  /* 5270 */  { MAD_F(0x0598f5db) /* 0.349843840 */, 18 },
+  /* 5271 */  { MAD_F(0x059952ab) /* 0.349932355 */, 18 },
+  /* 5272 */  { MAD_F(0x0599af7d) /* 0.350020876 */, 18 },
+  /* 5273 */  { MAD_F(0x059a0c51) /* 0.350109402 */, 18 },
+  /* 5274 */  { MAD_F(0x059a6926) /* 0.350197933 */, 18 },
+  /* 5275 */  { MAD_F(0x059ac5fc) /* 0.350286470 */, 18 },
+  /* 5276 */  { MAD_F(0x059b22d4) /* 0.350375013 */, 18 },
+  /* 5277 */  { MAD_F(0x059b7fae) /* 0.350463562 */, 18 },
+  /* 5278 */  { MAD_F(0x059bdc89) /* 0.350552116 */, 18 },
+  /* 5279 */  { MAD_F(0x059c3965) /* 0.350640675 */, 18 },
+
+  /* 5280 */  { MAD_F(0x059c9643) /* 0.350729240 */, 18 },
+  /* 5281 */  { MAD_F(0x059cf323) /* 0.350817811 */, 18 },
+  /* 5282 */  { MAD_F(0x059d5004) /* 0.350906388 */, 18 },
+  /* 5283 */  { MAD_F(0x059dace6) /* 0.350994970 */, 18 },
+  /* 5284 */  { MAD_F(0x059e09cb) /* 0.351083557 */, 18 },
+  /* 5285 */  { MAD_F(0x059e66b0) /* 0.351172150 */, 18 },
+  /* 5286 */  { MAD_F(0x059ec397) /* 0.351260749 */, 18 },
+  /* 5287 */  { MAD_F(0x059f2080) /* 0.351349353 */, 18 },
+  /* 5288 */  { MAD_F(0x059f7d6a) /* 0.351437963 */, 18 },
+  /* 5289 */  { MAD_F(0x059fda55) /* 0.351526579 */, 18 },
+  /* 5290 */  { MAD_F(0x05a03742) /* 0.351615200 */, 18 },
+  /* 5291 */  { MAD_F(0x05a09431) /* 0.351703827 */, 18 },
+  /* 5292 */  { MAD_F(0x05a0f121) /* 0.351792459 */, 18 },
+  /* 5293 */  { MAD_F(0x05a14e12) /* 0.351881097 */, 18 },
+  /* 5294 */  { MAD_F(0x05a1ab05) /* 0.351969740 */, 18 },
+  /* 5295 */  { MAD_F(0x05a207fa) /* 0.352058389 */, 18 },
+
+  /* 5296 */  { MAD_F(0x05a264f0) /* 0.352147044 */, 18 },
+  /* 5297 */  { MAD_F(0x05a2c1e7) /* 0.352235704 */, 18 },
+  /* 5298 */  { MAD_F(0x05a31ee1) /* 0.352324369 */, 18 },
+  /* 5299 */  { MAD_F(0x05a37bdb) /* 0.352413041 */, 18 },
+  /* 5300 */  { MAD_F(0x05a3d8d7) /* 0.352501718 */, 18 },
+  /* 5301 */  { MAD_F(0x05a435d5) /* 0.352590400 */, 18 },
+  /* 5302 */  { MAD_F(0x05a492d4) /* 0.352679088 */, 18 },
+  /* 5303 */  { MAD_F(0x05a4efd4) /* 0.352767782 */, 18 },
+  /* 5304 */  { MAD_F(0x05a54cd6) /* 0.352856481 */, 18 },
+  /* 5305 */  { MAD_F(0x05a5a9da) /* 0.352945186 */, 18 },
+  /* 5306 */  { MAD_F(0x05a606df) /* 0.353033896 */, 18 },
+  /* 5307 */  { MAD_F(0x05a663e5) /* 0.353122612 */, 18 },
+  /* 5308 */  { MAD_F(0x05a6c0ed) /* 0.353211333 */, 18 },
+  /* 5309 */  { MAD_F(0x05a71df7) /* 0.353300061 */, 18 },
+  /* 5310 */  { MAD_F(0x05a77b02) /* 0.353388793 */, 18 },
+  /* 5311 */  { MAD_F(0x05a7d80e) /* 0.353477531 */, 18 },
+
+  /* 5312 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 18 },
+  /* 5313 */  { MAD_F(0x05a8922c) /* 0.353655024 */, 18 },
+  /* 5314 */  { MAD_F(0x05a8ef3c) /* 0.353743779 */, 18 },
+  /* 5315 */  { MAD_F(0x05a94c4f) /* 0.353832540 */, 18 },
+  /* 5316 */  { MAD_F(0x05a9a963) /* 0.353921306 */, 18 },
+  /* 5317 */  { MAD_F(0x05aa0678) /* 0.354010077 */, 18 },
+  /* 5318 */  { MAD_F(0x05aa638f) /* 0.354098855 */, 18 },
+  /* 5319 */  { MAD_F(0x05aac0a8) /* 0.354187637 */, 18 },
+  /* 5320 */  { MAD_F(0x05ab1dc2) /* 0.354276426 */, 18 },
+  /* 5321 */  { MAD_F(0x05ab7add) /* 0.354365220 */, 18 },
+  /* 5322 */  { MAD_F(0x05abd7fa) /* 0.354454019 */, 18 },
+  /* 5323 */  { MAD_F(0x05ac3518) /* 0.354542824 */, 18 },
+  /* 5324 */  { MAD_F(0x05ac9238) /* 0.354631635 */, 18 },
+  /* 5325 */  { MAD_F(0x05acef5a) /* 0.354720451 */, 18 },
+  /* 5326 */  { MAD_F(0x05ad4c7d) /* 0.354809272 */, 18 },
+  /* 5327 */  { MAD_F(0x05ada9a1) /* 0.354898100 */, 18 },
+
+  /* 5328 */  { MAD_F(0x05ae06c7) /* 0.354986932 */, 18 },
+  /* 5329 */  { MAD_F(0x05ae63ee) /* 0.355075771 */, 18 },
+  /* 5330 */  { MAD_F(0x05aec117) /* 0.355164615 */, 18 },
+  /* 5331 */  { MAD_F(0x05af1e41) /* 0.355253464 */, 18 },
+  /* 5332 */  { MAD_F(0x05af7b6d) /* 0.355342319 */, 18 },
+  /* 5333 */  { MAD_F(0x05afd89b) /* 0.355431180 */, 18 },
+  /* 5334 */  { MAD_F(0x05b035c9) /* 0.355520046 */, 18 },
+  /* 5335 */  { MAD_F(0x05b092fa) /* 0.355608917 */, 18 },
+  /* 5336 */  { MAD_F(0x05b0f02b) /* 0.355697795 */, 18 },
+  /* 5337 */  { MAD_F(0x05b14d5f) /* 0.355786677 */, 18 },
+  /* 5338 */  { MAD_F(0x05b1aa94) /* 0.355875566 */, 18 },
+  /* 5339 */  { MAD_F(0x05b207ca) /* 0.355964460 */, 18 },
+  /* 5340 */  { MAD_F(0x05b26502) /* 0.356053359 */, 18 },
+  /* 5341 */  { MAD_F(0x05b2c23b) /* 0.356142264 */, 18 },
+  /* 5342 */  { MAD_F(0x05b31f76) /* 0.356231175 */, 18 },
+  /* 5343 */  { MAD_F(0x05b37cb2) /* 0.356320091 */, 18 },
+
+  /* 5344 */  { MAD_F(0x05b3d9f0) /* 0.356409012 */, 18 },
+  /* 5345 */  { MAD_F(0x05b4372f) /* 0.356497940 */, 18 },
+  /* 5346 */  { MAD_F(0x05b4946f) /* 0.356586872 */, 18 },
+  /* 5347 */  { MAD_F(0x05b4f1b2) /* 0.356675811 */, 18 },
+  /* 5348 */  { MAD_F(0x05b54ef5) /* 0.356764754 */, 18 },
+  /* 5349 */  { MAD_F(0x05b5ac3a) /* 0.356853704 */, 18 },
+  /* 5350 */  { MAD_F(0x05b60981) /* 0.356942659 */, 18 },
+  /* 5351 */  { MAD_F(0x05b666c9) /* 0.357031619 */, 18 },
+  /* 5352 */  { MAD_F(0x05b6c413) /* 0.357120585 */, 18 },
+  /* 5353 */  { MAD_F(0x05b7215e) /* 0.357209557 */, 18 },
+  /* 5354 */  { MAD_F(0x05b77eab) /* 0.357298534 */, 18 },
+  /* 5355 */  { MAD_F(0x05b7dbf9) /* 0.357387516 */, 18 },
+  /* 5356 */  { MAD_F(0x05b83948) /* 0.357476504 */, 18 },
+  /* 5357 */  { MAD_F(0x05b89699) /* 0.357565498 */, 18 },
+  /* 5358 */  { MAD_F(0x05b8f3ec) /* 0.357654497 */, 18 },
+  /* 5359 */  { MAD_F(0x05b95140) /* 0.357743502 */, 18 },
+
+  /* 5360 */  { MAD_F(0x05b9ae95) /* 0.357832512 */, 18 },
+  /* 5361 */  { MAD_F(0x05ba0bec) /* 0.357921528 */, 18 },
+  /* 5362 */  { MAD_F(0x05ba6945) /* 0.358010550 */, 18 },
+  /* 5363 */  { MAD_F(0x05bac69f) /* 0.358099576 */, 18 },
+  /* 5364 */  { MAD_F(0x05bb23fa) /* 0.358188609 */, 18 },
+  /* 5365 */  { MAD_F(0x05bb8157) /* 0.358277647 */, 18 },
+  /* 5366 */  { MAD_F(0x05bbdeb6) /* 0.358366690 */, 18 },
+  /* 5367 */  { MAD_F(0x05bc3c16) /* 0.358455739 */, 18 },
+  /* 5368 */  { MAD_F(0x05bc9977) /* 0.358544794 */, 18 },
+  /* 5369 */  { MAD_F(0x05bcf6da) /* 0.358633854 */, 18 },
+  /* 5370 */  { MAD_F(0x05bd543e) /* 0.358722920 */, 18 },
+  /* 5371 */  { MAD_F(0x05bdb1a4) /* 0.358811991 */, 18 },
+  /* 5372 */  { MAD_F(0x05be0f0b) /* 0.358901067 */, 18 },
+  /* 5373 */  { MAD_F(0x05be6c74) /* 0.358990150 */, 18 },
+  /* 5374 */  { MAD_F(0x05bec9df) /* 0.359079237 */, 18 },
+  /* 5375 */  { MAD_F(0x05bf274a) /* 0.359168331 */, 18 },
+
+  /* 5376 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 18 },
+  /* 5377 */  { MAD_F(0x05bfe226) /* 0.359346534 */, 18 },
+  /* 5378 */  { MAD_F(0x05c03f97) /* 0.359435644 */, 18 },
+  /* 5379 */  { MAD_F(0x05c09d08) /* 0.359524759 */, 18 },
+  /* 5380 */  { MAD_F(0x05c0fa7c) /* 0.359613880 */, 18 },
+  /* 5381 */  { MAD_F(0x05c157f0) /* 0.359703006 */, 18 },
+  /* 5382 */  { MAD_F(0x05c1b566) /* 0.359792138 */, 18 },
+  /* 5383 */  { MAD_F(0x05c212de) /* 0.359881276 */, 18 },
+  /* 5384 */  { MAD_F(0x05c27057) /* 0.359970419 */, 18 },
+  /* 5385 */  { MAD_F(0x05c2cdd2) /* 0.360059567 */, 18 },
+  /* 5386 */  { MAD_F(0x05c32b4e) /* 0.360148721 */, 18 },
+  /* 5387 */  { MAD_F(0x05c388cb) /* 0.360237881 */, 18 },
+  /* 5388 */  { MAD_F(0x05c3e64b) /* 0.360327046 */, 18 },
+  /* 5389 */  { MAD_F(0x05c443cb) /* 0.360416216 */, 18 },
+  /* 5390 */  { MAD_F(0x05c4a14d) /* 0.360505392 */, 18 },
+  /* 5391 */  { MAD_F(0x05c4fed1) /* 0.360594574 */, 18 },
+
+  /* 5392 */  { MAD_F(0x05c55c56) /* 0.360683761 */, 18 },
+  /* 5393 */  { MAD_F(0x05c5b9dc) /* 0.360772953 */, 18 },
+  /* 5394 */  { MAD_F(0x05c61764) /* 0.360862152 */, 18 },
+  /* 5395 */  { MAD_F(0x05c674ed) /* 0.360951355 */, 18 },
+  /* 5396 */  { MAD_F(0x05c6d278) /* 0.361040564 */, 18 },
+  /* 5397 */  { MAD_F(0x05c73005) /* 0.361129779 */, 18 },
+  /* 5398 */  { MAD_F(0x05c78d93) /* 0.361218999 */, 18 },
+  /* 5399 */  { MAD_F(0x05c7eb22) /* 0.361308225 */, 18 },
+  /* 5400 */  { MAD_F(0x05c848b3) /* 0.361397456 */, 18 },
+  /* 5401 */  { MAD_F(0x05c8a645) /* 0.361486693 */, 18 },
+  /* 5402 */  { MAD_F(0x05c903d9) /* 0.361575935 */, 18 },
+  /* 5403 */  { MAD_F(0x05c9616e) /* 0.361665183 */, 18 },
+  /* 5404 */  { MAD_F(0x05c9bf05) /* 0.361754436 */, 18 },
+  /* 5405 */  { MAD_F(0x05ca1c9d) /* 0.361843695 */, 18 },
+  /* 5406 */  { MAD_F(0x05ca7a37) /* 0.361932959 */, 18 },
+  /* 5407 */  { MAD_F(0x05cad7d2) /* 0.362022229 */, 18 },
+
+  /* 5408 */  { MAD_F(0x05cb356e) /* 0.362111504 */, 18 },
+  /* 5409 */  { MAD_F(0x05cb930d) /* 0.362200785 */, 18 },
+  /* 5410 */  { MAD_F(0x05cbf0ac) /* 0.362290071 */, 18 },
+  /* 5411 */  { MAD_F(0x05cc4e4d) /* 0.362379362 */, 18 },
+  /* 5412 */  { MAD_F(0x05ccabf0) /* 0.362468660 */, 18 },
+  /* 5413 */  { MAD_F(0x05cd0994) /* 0.362557962 */, 18 },
+  /* 5414 */  { MAD_F(0x05cd6739) /* 0.362647271 */, 18 },
+  /* 5415 */  { MAD_F(0x05cdc4e0) /* 0.362736584 */, 18 },
+  /* 5416 */  { MAD_F(0x05ce2289) /* 0.362825904 */, 18 },
+  /* 5417 */  { MAD_F(0x05ce8033) /* 0.362915228 */, 18 },
+  /* 5418 */  { MAD_F(0x05ceddde) /* 0.363004559 */, 18 },
+  /* 5419 */  { MAD_F(0x05cf3b8b) /* 0.363093894 */, 18 },
+  /* 5420 */  { MAD_F(0x05cf9939) /* 0.363183236 */, 18 },
+  /* 5421 */  { MAD_F(0x05cff6e9) /* 0.363272582 */, 18 },
+  /* 5422 */  { MAD_F(0x05d0549a) /* 0.363361935 */, 18 },
+  /* 5423 */  { MAD_F(0x05d0b24d) /* 0.363451292 */, 18 },
+
+  /* 5424 */  { MAD_F(0x05d11001) /* 0.363540655 */, 18 },
+  /* 5425 */  { MAD_F(0x05d16db7) /* 0.363630024 */, 18 },
+  /* 5426 */  { MAD_F(0x05d1cb6e) /* 0.363719398 */, 18 },
+  /* 5427 */  { MAD_F(0x05d22927) /* 0.363808778 */, 18 },
+  /* 5428 */  { MAD_F(0x05d286e1) /* 0.363898163 */, 18 },
+  /* 5429 */  { MAD_F(0x05d2e49d) /* 0.363987554 */, 18 },
+  /* 5430 */  { MAD_F(0x05d3425a) /* 0.364076950 */, 18 },
+  /* 5431 */  { MAD_F(0x05d3a018) /* 0.364166352 */, 18 },
+  /* 5432 */  { MAD_F(0x05d3fdd8) /* 0.364255759 */, 18 },
+  /* 5433 */  { MAD_F(0x05d45b9a) /* 0.364345171 */, 18 },
+  /* 5434 */  { MAD_F(0x05d4b95d) /* 0.364434589 */, 18 },
+  /* 5435 */  { MAD_F(0x05d51721) /* 0.364524013 */, 18 },
+  /* 5436 */  { MAD_F(0x05d574e7) /* 0.364613442 */, 18 },
+  /* 5437 */  { MAD_F(0x05d5d2af) /* 0.364702877 */, 18 },
+  /* 5438 */  { MAD_F(0x05d63078) /* 0.364792317 */, 18 },
+  /* 5439 */  { MAD_F(0x05d68e42) /* 0.364881762 */, 18 },
+
+  /* 5440 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 18 },
+  /* 5441 */  { MAD_F(0x05d749db) /* 0.365060669 */, 18 },
+  /* 5442 */  { MAD_F(0x05d7a7aa) /* 0.365150131 */, 18 },
+  /* 5443 */  { MAD_F(0x05d8057a) /* 0.365239599 */, 18 },
+  /* 5444 */  { MAD_F(0x05d8634c) /* 0.365329072 */, 18 },
+  /* 5445 */  { MAD_F(0x05d8c11f) /* 0.365418550 */, 18 },
+  /* 5446 */  { MAD_F(0x05d91ef4) /* 0.365508034 */, 18 },
+  /* 5447 */  { MAD_F(0x05d97cca) /* 0.365597523 */, 18 },
+  /* 5448 */  { MAD_F(0x05d9daa1) /* 0.365687018 */, 18 },
+  /* 5449 */  { MAD_F(0x05da387a) /* 0.365776518 */, 18 },
+  /* 5450 */  { MAD_F(0x05da9655) /* 0.365866024 */, 18 },
+  /* 5451 */  { MAD_F(0x05daf431) /* 0.365955536 */, 18 },
+  /* 5452 */  { MAD_F(0x05db520e) /* 0.366045052 */, 18 },
+  /* 5453 */  { MAD_F(0x05dbafed) /* 0.366134574 */, 18 },
+  /* 5454 */  { MAD_F(0x05dc0dce) /* 0.366224102 */, 18 },
+  /* 5455 */  { MAD_F(0x05dc6baf) /* 0.366313635 */, 18 },
+
+  /* 5456 */  { MAD_F(0x05dcc993) /* 0.366403174 */, 18 },
+  /* 5457 */  { MAD_F(0x05dd2778) /* 0.366492718 */, 18 },
+  /* 5458 */  { MAD_F(0x05dd855e) /* 0.366582267 */, 18 },
+  /* 5459 */  { MAD_F(0x05dde346) /* 0.366671822 */, 18 },
+  /* 5460 */  { MAD_F(0x05de412f) /* 0.366761383 */, 18 },
+  /* 5461 */  { MAD_F(0x05de9f1a) /* 0.366850949 */, 18 },
+  /* 5462 */  { MAD_F(0x05defd06) /* 0.366940520 */, 18 },
+  /* 5463 */  { MAD_F(0x05df5af3) /* 0.367030097 */, 18 },
+  /* 5464 */  { MAD_F(0x05dfb8e2) /* 0.367119680 */, 18 },
+  /* 5465 */  { MAD_F(0x05e016d3) /* 0.367209267 */, 18 },
+  /* 5466 */  { MAD_F(0x05e074c5) /* 0.367298861 */, 18 },
+  /* 5467 */  { MAD_F(0x05e0d2b8) /* 0.367388459 */, 18 },
+  /* 5468 */  { MAD_F(0x05e130ad) /* 0.367478064 */, 18 },
+  /* 5469 */  { MAD_F(0x05e18ea4) /* 0.367567673 */, 18 },
+  /* 5470 */  { MAD_F(0x05e1ec9c) /* 0.367657288 */, 18 },
+  /* 5471 */  { MAD_F(0x05e24a95) /* 0.367746909 */, 18 },
+
+  /* 5472 */  { MAD_F(0x05e2a890) /* 0.367836535 */, 18 },
+  /* 5473 */  { MAD_F(0x05e3068c) /* 0.367926167 */, 18 },
+  /* 5474 */  { MAD_F(0x05e3648a) /* 0.368015804 */, 18 },
+  /* 5475 */  { MAD_F(0x05e3c289) /* 0.368105446 */, 18 },
+  /* 5476 */  { MAD_F(0x05e4208a) /* 0.368195094 */, 18 },
+  /* 5477 */  { MAD_F(0x05e47e8c) /* 0.368284747 */, 18 },
+  /* 5478 */  { MAD_F(0x05e4dc8f) /* 0.368374406 */, 18 },
+  /* 5479 */  { MAD_F(0x05e53a94) /* 0.368464070 */, 18 },
+  /* 5480 */  { MAD_F(0x05e5989b) /* 0.368553740 */, 18 },
+  /* 5481 */  { MAD_F(0x05e5f6a3) /* 0.368643415 */, 18 },
+  /* 5482 */  { MAD_F(0x05e654ac) /* 0.368733096 */, 18 },
+  /* 5483 */  { MAD_F(0x05e6b2b7) /* 0.368822782 */, 18 },
+  /* 5484 */  { MAD_F(0x05e710c4) /* 0.368912473 */, 18 },
+  /* 5485 */  { MAD_F(0x05e76ed2) /* 0.369002170 */, 18 },
+  /* 5486 */  { MAD_F(0x05e7cce1) /* 0.369091873 */, 18 },
+  /* 5487 */  { MAD_F(0x05e82af2) /* 0.369181581 */, 18 },
+
+  /* 5488 */  { MAD_F(0x05e88904) /* 0.369271294 */, 18 },
+  /* 5489 */  { MAD_F(0x05e8e718) /* 0.369361013 */, 18 },
+  /* 5490 */  { MAD_F(0x05e9452d) /* 0.369450737 */, 18 },
+  /* 5491 */  { MAD_F(0x05e9a343) /* 0.369540467 */, 18 },
+  /* 5492 */  { MAD_F(0x05ea015c) /* 0.369630202 */, 18 },
+  /* 5493 */  { MAD_F(0x05ea5f75) /* 0.369719942 */, 18 },
+  /* 5494 */  { MAD_F(0x05eabd90) /* 0.369809688 */, 18 },
+  /* 5495 */  { MAD_F(0x05eb1bad) /* 0.369899440 */, 18 },
+  /* 5496 */  { MAD_F(0x05eb79cb) /* 0.369989197 */, 18 },
+  /* 5497 */  { MAD_F(0x05ebd7ea) /* 0.370078959 */, 18 },
+  /* 5498 */  { MAD_F(0x05ec360b) /* 0.370168727 */, 18 },
+  /* 5499 */  { MAD_F(0x05ec942d) /* 0.370258500 */, 18 },
+  /* 5500 */  { MAD_F(0x05ecf251) /* 0.370348279 */, 18 },
+  /* 5501 */  { MAD_F(0x05ed5076) /* 0.370438063 */, 18 },
+  /* 5502 */  { MAD_F(0x05edae9d) /* 0.370527853 */, 18 },
+  /* 5503 */  { MAD_F(0x05ee0cc5) /* 0.370617648 */, 18 },
+
+  /* 5504 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 18 },
+  /* 5505 */  { MAD_F(0x05eec91a) /* 0.370797254 */, 18 },
+  /* 5506 */  { MAD_F(0x05ef2746) /* 0.370887065 */, 18 },
+  /* 5507 */  { MAD_F(0x05ef8574) /* 0.370976882 */, 18 },
+  /* 5508 */  { MAD_F(0x05efe3a4) /* 0.371066704 */, 18 },
+  /* 5509 */  { MAD_F(0x05f041d5) /* 0.371156532 */, 18 },
+  /* 5510 */  { MAD_F(0x05f0a007) /* 0.371246365 */, 18 },
+  /* 5511 */  { MAD_F(0x05f0fe3b) /* 0.371336203 */, 18 },
+  /* 5512 */  { MAD_F(0x05f15c70) /* 0.371426047 */, 18 },
+  /* 5513 */  { MAD_F(0x05f1baa7) /* 0.371515897 */, 18 },
+  /* 5514 */  { MAD_F(0x05f218df) /* 0.371605751 */, 18 },
+  /* 5515 */  { MAD_F(0x05f27719) /* 0.371695612 */, 18 },
+  /* 5516 */  { MAD_F(0x05f2d554) /* 0.371785477 */, 18 },
+  /* 5517 */  { MAD_F(0x05f33390) /* 0.371875348 */, 18 },
+  /* 5518 */  { MAD_F(0x05f391cf) /* 0.371965225 */, 18 },
+  /* 5519 */  { MAD_F(0x05f3f00e) /* 0.372055107 */, 18 },
+
+  /* 5520 */  { MAD_F(0x05f44e4f) /* 0.372144994 */, 18 },
+  /* 5521 */  { MAD_F(0x05f4ac91) /* 0.372234887 */, 18 },
+  /* 5522 */  { MAD_F(0x05f50ad5) /* 0.372324785 */, 18 },
+  /* 5523 */  { MAD_F(0x05f5691b) /* 0.372414689 */, 18 },
+  /* 5524 */  { MAD_F(0x05f5c761) /* 0.372504598 */, 18 },
+  /* 5525 */  { MAD_F(0x05f625aa) /* 0.372594513 */, 18 },
+  /* 5526 */  { MAD_F(0x05f683f3) /* 0.372684433 */, 18 },
+  /* 5527 */  { MAD_F(0x05f6e23f) /* 0.372774358 */, 18 },
+  /* 5528 */  { MAD_F(0x05f7408b) /* 0.372864289 */, 18 },
+  /* 5529 */  { MAD_F(0x05f79ed9) /* 0.372954225 */, 18 },
+  /* 5530 */  { MAD_F(0x05f7fd29) /* 0.373044167 */, 18 },
+  /* 5531 */  { MAD_F(0x05f85b7a) /* 0.373134114 */, 18 },
+  /* 5532 */  { MAD_F(0x05f8b9cc) /* 0.373224066 */, 18 },
+  /* 5533 */  { MAD_F(0x05f91820) /* 0.373314024 */, 18 },
+  /* 5534 */  { MAD_F(0x05f97675) /* 0.373403987 */, 18 },
+  /* 5535 */  { MAD_F(0x05f9d4cc) /* 0.373493956 */, 18 },
+
+  /* 5536 */  { MAD_F(0x05fa3324) /* 0.373583930 */, 18 },
+  /* 5537 */  { MAD_F(0x05fa917e) /* 0.373673910 */, 18 },
+  /* 5538 */  { MAD_F(0x05faefd9) /* 0.373763895 */, 18 },
+  /* 5539 */  { MAD_F(0x05fb4e36) /* 0.373853885 */, 18 },
+  /* 5540 */  { MAD_F(0x05fbac94) /* 0.373943881 */, 18 },
+  /* 5541 */  { MAD_F(0x05fc0af3) /* 0.374033882 */, 18 },
+  /* 5542 */  { MAD_F(0x05fc6954) /* 0.374123889 */, 18 },
+  /* 5543 */  { MAD_F(0x05fcc7b7) /* 0.374213901 */, 18 },
+  /* 5544 */  { MAD_F(0x05fd261b) /* 0.374303918 */, 18 },
+  /* 5545 */  { MAD_F(0x05fd8480) /* 0.374393941 */, 18 },
+  /* 5546 */  { MAD_F(0x05fde2e7) /* 0.374483970 */, 18 },
+  /* 5547 */  { MAD_F(0x05fe414f) /* 0.374574003 */, 18 },
+  /* 5548 */  { MAD_F(0x05fe9fb9) /* 0.374664042 */, 18 },
+  /* 5549 */  { MAD_F(0x05fefe24) /* 0.374754087 */, 18 },
+  /* 5550 */  { MAD_F(0x05ff5c91) /* 0.374844137 */, 18 },
+  /* 5551 */  { MAD_F(0x05ffbaff) /* 0.374934192 */, 18 },
+
+  /* 5552 */  { MAD_F(0x0600196e) /* 0.375024253 */, 18 },
+  /* 5553 */  { MAD_F(0x060077df) /* 0.375114319 */, 18 },
+  /* 5554 */  { MAD_F(0x0600d651) /* 0.375204391 */, 18 },
+  /* 5555 */  { MAD_F(0x060134c5) /* 0.375294468 */, 18 },
+  /* 5556 */  { MAD_F(0x0601933b) /* 0.375384550 */, 18 },
+  /* 5557 */  { MAD_F(0x0601f1b1) /* 0.375474638 */, 18 },
+  /* 5558 */  { MAD_F(0x0602502a) /* 0.375564731 */, 18 },
+  /* 5559 */  { MAD_F(0x0602aea3) /* 0.375654830 */, 18 },
+  /* 5560 */  { MAD_F(0x06030d1e) /* 0.375744934 */, 18 },
+  /* 5561 */  { MAD_F(0x06036b9b) /* 0.375835043 */, 18 },
+  /* 5562 */  { MAD_F(0x0603ca19) /* 0.375925158 */, 18 },
+  /* 5563 */  { MAD_F(0x06042898) /* 0.376015278 */, 18 },
+  /* 5564 */  { MAD_F(0x06048719) /* 0.376105404 */, 18 },
+  /* 5565 */  { MAD_F(0x0604e59c) /* 0.376195535 */, 18 },
+  /* 5566 */  { MAD_F(0x0605441f) /* 0.376285671 */, 18 },
+  /* 5567 */  { MAD_F(0x0605a2a5) /* 0.376375813 */, 18 },
+
+  /* 5568 */  { MAD_F(0x0606012b) /* 0.376465960 */, 18 },
+  /* 5569 */  { MAD_F(0x06065fb4) /* 0.376556113 */, 18 },
+  /* 5570 */  { MAD_F(0x0606be3d) /* 0.376646271 */, 18 },
+  /* 5571 */  { MAD_F(0x06071cc8) /* 0.376736434 */, 18 },
+  /* 5572 */  { MAD_F(0x06077b55) /* 0.376826603 */, 18 },
+  /* 5573 */  { MAD_F(0x0607d9e3) /* 0.376916777 */, 18 },
+  /* 5574 */  { MAD_F(0x06083872) /* 0.377006957 */, 18 },
+  /* 5575 */  { MAD_F(0x06089703) /* 0.377097141 */, 18 },
+  /* 5576 */  { MAD_F(0x0608f595) /* 0.377187332 */, 18 },
+  /* 5577 */  { MAD_F(0x06095429) /* 0.377277528 */, 18 },
+  /* 5578 */  { MAD_F(0x0609b2be) /* 0.377367729 */, 18 },
+  /* 5579 */  { MAD_F(0x060a1155) /* 0.377457935 */, 18 },
+  /* 5580 */  { MAD_F(0x060a6fed) /* 0.377548147 */, 18 },
+  /* 5581 */  { MAD_F(0x060ace86) /* 0.377638364 */, 18 },
+  /* 5582 */  { MAD_F(0x060b2d21) /* 0.377728587 */, 18 },
+  /* 5583 */  { MAD_F(0x060b8bbe) /* 0.377818815 */, 18 },
+
+  /* 5584 */  { MAD_F(0x060bea5c) /* 0.377909049 */, 18 },
+  /* 5585 */  { MAD_F(0x060c48fb) /* 0.377999288 */, 18 },
+  /* 5586 */  { MAD_F(0x060ca79c) /* 0.378089532 */, 18 },
+  /* 5587 */  { MAD_F(0x060d063e) /* 0.378179781 */, 18 },
+  /* 5588 */  { MAD_F(0x060d64e1) /* 0.378270036 */, 18 },
+  /* 5589 */  { MAD_F(0x060dc387) /* 0.378360297 */, 18 },
+  /* 5590 */  { MAD_F(0x060e222d) /* 0.378450563 */, 18 },
+  /* 5591 */  { MAD_F(0x060e80d5) /* 0.378540834 */, 18 },
+  /* 5592 */  { MAD_F(0x060edf7f) /* 0.378631110 */, 18 },
+  /* 5593 */  { MAD_F(0x060f3e29) /* 0.378721392 */, 18 },
+  /* 5594 */  { MAD_F(0x060f9cd6) /* 0.378811680 */, 18 },
+  /* 5595 */  { MAD_F(0x060ffb83) /* 0.378901972 */, 18 },
+  /* 5596 */  { MAD_F(0x06105a33) /* 0.378992270 */, 18 },
+  /* 5597 */  { MAD_F(0x0610b8e3) /* 0.379082574 */, 18 },
+  /* 5598 */  { MAD_F(0x06111795) /* 0.379172883 */, 18 },
+  /* 5599 */  { MAD_F(0x06117649) /* 0.379263197 */, 18 },
+
+  /* 5600 */  { MAD_F(0x0611d4fe) /* 0.379353516 */, 18 },
+  /* 5601 */  { MAD_F(0x061233b4) /* 0.379443841 */, 18 },
+  /* 5602 */  { MAD_F(0x0612926c) /* 0.379534172 */, 18 },
+  /* 5603 */  { MAD_F(0x0612f125) /* 0.379624507 */, 18 },
+  /* 5604 */  { MAD_F(0x06134fe0) /* 0.379714848 */, 18 },
+  /* 5605 */  { MAD_F(0x0613ae9c) /* 0.379805195 */, 18 },
+  /* 5606 */  { MAD_F(0x06140d5a) /* 0.379895547 */, 18 },
+  /* 5607 */  { MAD_F(0x06146c19) /* 0.379985904 */, 18 },
+  /* 5608 */  { MAD_F(0x0614cada) /* 0.380076266 */, 18 },
+  /* 5609 */  { MAD_F(0x0615299c) /* 0.380166634 */, 18 },
+  /* 5610 */  { MAD_F(0x0615885f) /* 0.380257008 */, 18 },
+  /* 5611 */  { MAD_F(0x0615e724) /* 0.380347386 */, 18 },
+  /* 5612 */  { MAD_F(0x061645ea) /* 0.380437770 */, 18 },
+  /* 5613 */  { MAD_F(0x0616a4b2) /* 0.380528160 */, 18 },
+  /* 5614 */  { MAD_F(0x0617037b) /* 0.380618555 */, 18 },
+  /* 5615 */  { MAD_F(0x06176246) /* 0.380708955 */, 18 },
+
+  /* 5616 */  { MAD_F(0x0617c112) /* 0.380799360 */, 18 },
+  /* 5617 */  { MAD_F(0x06181fdf) /* 0.380889771 */, 18 },
+  /* 5618 */  { MAD_F(0x06187eae) /* 0.380980187 */, 18 },
+  /* 5619 */  { MAD_F(0x0618dd7e) /* 0.381070609 */, 18 },
+  /* 5620 */  { MAD_F(0x06193c50) /* 0.381161036 */, 18 },
+  /* 5621 */  { MAD_F(0x06199b24) /* 0.381251468 */, 18 },
+  /* 5622 */  { MAD_F(0x0619f9f8) /* 0.381341906 */, 18 },
+  /* 5623 */  { MAD_F(0x061a58ce) /* 0.381432349 */, 18 },
+  /* 5624 */  { MAD_F(0x061ab7a6) /* 0.381522798 */, 18 },
+  /* 5625 */  { MAD_F(0x061b167f) /* 0.381613251 */, 18 },
+  /* 5626 */  { MAD_F(0x061b7559) /* 0.381703711 */, 18 },
+  /* 5627 */  { MAD_F(0x061bd435) /* 0.381794175 */, 18 },
+  /* 5628 */  { MAD_F(0x061c3313) /* 0.381884645 */, 18 },
+  /* 5629 */  { MAD_F(0x061c91f1) /* 0.381975120 */, 18 },
+  /* 5630 */  { MAD_F(0x061cf0d2) /* 0.382065601 */, 18 },
+  /* 5631 */  { MAD_F(0x061d4fb3) /* 0.382156087 */, 18 },
+
+  /* 5632 */  { MAD_F(0x061dae96) /* 0.382246578 */, 18 },
+  /* 5633 */  { MAD_F(0x061e0d7b) /* 0.382337075 */, 18 },
+  /* 5634 */  { MAD_F(0x061e6c61) /* 0.382427577 */, 18 },
+  /* 5635 */  { MAD_F(0x061ecb48) /* 0.382518084 */, 18 },
+  /* 5636 */  { MAD_F(0x061f2a31) /* 0.382608597 */, 18 },
+  /* 5637 */  { MAD_F(0x061f891b) /* 0.382699115 */, 18 },
+  /* 5638 */  { MAD_F(0x061fe807) /* 0.382789638 */, 18 },
+  /* 5639 */  { MAD_F(0x062046f4) /* 0.382880167 */, 18 },
+  /* 5640 */  { MAD_F(0x0620a5e3) /* 0.382970701 */, 18 },
+  /* 5641 */  { MAD_F(0x062104d3) /* 0.383061241 */, 18 },
+  /* 5642 */  { MAD_F(0x062163c4) /* 0.383151786 */, 18 },
+  /* 5643 */  { MAD_F(0x0621c2b7) /* 0.383242336 */, 18 },
+  /* 5644 */  { MAD_F(0x062221ab) /* 0.383332891 */, 18 },
+  /* 5645 */  { MAD_F(0x062280a1) /* 0.383423452 */, 18 },
+  /* 5646 */  { MAD_F(0x0622df98) /* 0.383514018 */, 18 },
+  /* 5647 */  { MAD_F(0x06233e91) /* 0.383604590 */, 18 },
+
+  /* 5648 */  { MAD_F(0x06239d8b) /* 0.383695167 */, 18 },
+  /* 5649 */  { MAD_F(0x0623fc86) /* 0.383785749 */, 18 },
+  /* 5650 */  { MAD_F(0x06245b83) /* 0.383876337 */, 18 },
+  /* 5651 */  { MAD_F(0x0624ba82) /* 0.383966930 */, 18 },
+  /* 5652 */  { MAD_F(0x06251981) /* 0.384057528 */, 18 },
+  /* 5653 */  { MAD_F(0x06257883) /* 0.384148132 */, 18 },
+  /* 5654 */  { MAD_F(0x0625d785) /* 0.384238741 */, 18 },
+  /* 5655 */  { MAD_F(0x06263689) /* 0.384329355 */, 18 },
+  /* 5656 */  { MAD_F(0x0626958f) /* 0.384419975 */, 18 },
+  /* 5657 */  { MAD_F(0x0626f496) /* 0.384510600 */, 18 },
+  /* 5658 */  { MAD_F(0x0627539e) /* 0.384601230 */, 18 },
+  /* 5659 */  { MAD_F(0x0627b2a8) /* 0.384691866 */, 18 },
+  /* 5660 */  { MAD_F(0x062811b3) /* 0.384782507 */, 18 },
+  /* 5661 */  { MAD_F(0x062870c0) /* 0.384873153 */, 18 },
+  /* 5662 */  { MAD_F(0x0628cfce) /* 0.384963805 */, 18 },
+  /* 5663 */  { MAD_F(0x06292ede) /* 0.385054462 */, 18 },
+
+  /* 5664 */  { MAD_F(0x06298def) /* 0.385145124 */, 18 },
+  /* 5665 */  { MAD_F(0x0629ed01) /* 0.385235792 */, 18 },
+  /* 5666 */  { MAD_F(0x062a4c15) /* 0.385326465 */, 18 },
+  /* 5667 */  { MAD_F(0x062aab2a) /* 0.385417143 */, 18 },
+  /* 5668 */  { MAD_F(0x062b0a41) /* 0.385507827 */, 18 },
+  /* 5669 */  { MAD_F(0x062b6959) /* 0.385598516 */, 18 },
+  /* 5670 */  { MAD_F(0x062bc873) /* 0.385689211 */, 18 },
+  /* 5671 */  { MAD_F(0x062c278e) /* 0.385779910 */, 18 },
+  /* 5672 */  { MAD_F(0x062c86aa) /* 0.385870615 */, 18 },
+  /* 5673 */  { MAD_F(0x062ce5c8) /* 0.385961326 */, 18 },
+  /* 5674 */  { MAD_F(0x062d44e8) /* 0.386052041 */, 18 },
+  /* 5675 */  { MAD_F(0x062da408) /* 0.386142762 */, 18 },
+  /* 5676 */  { MAD_F(0x062e032a) /* 0.386233489 */, 18 },
+  /* 5677 */  { MAD_F(0x062e624e) /* 0.386324221 */, 18 },
+  /* 5678 */  { MAD_F(0x062ec173) /* 0.386414958 */, 18 },
+  /* 5679 */  { MAD_F(0x062f209a) /* 0.386505700 */, 18 },
+
+  /* 5680 */  { MAD_F(0x062f7fc1) /* 0.386596448 */, 18 },
+  /* 5681 */  { MAD_F(0x062fdeeb) /* 0.386687201 */, 18 },
+  /* 5682 */  { MAD_F(0x06303e16) /* 0.386777959 */, 18 },
+  /* 5683 */  { MAD_F(0x06309d42) /* 0.386868723 */, 18 },
+  /* 5684 */  { MAD_F(0x0630fc6f) /* 0.386959492 */, 18 },
+  /* 5685 */  { MAD_F(0x06315b9e) /* 0.387050266 */, 18 },
+  /* 5686 */  { MAD_F(0x0631bacf) /* 0.387141045 */, 18 },
+  /* 5687 */  { MAD_F(0x06321a01) /* 0.387231830 */, 18 },
+  /* 5688 */  { MAD_F(0x06327934) /* 0.387322621 */, 18 },
+  /* 5689 */  { MAD_F(0x0632d869) /* 0.387413416 */, 18 },
+  /* 5690 */  { MAD_F(0x0633379f) /* 0.387504217 */, 18 },
+  /* 5691 */  { MAD_F(0x063396d7) /* 0.387595023 */, 18 },
+  /* 5692 */  { MAD_F(0x0633f610) /* 0.387685835 */, 18 },
+  /* 5693 */  { MAD_F(0x0634554a) /* 0.387776652 */, 18 },
+  /* 5694 */  { MAD_F(0x0634b486) /* 0.387867474 */, 18 },
+  /* 5695 */  { MAD_F(0x063513c3) /* 0.387958301 */, 18 },
+
+  /* 5696 */  { MAD_F(0x06357302) /* 0.388049134 */, 18 },
+  /* 5697 */  { MAD_F(0x0635d242) /* 0.388139972 */, 18 },
+  /* 5698 */  { MAD_F(0x06363184) /* 0.388230816 */, 18 },
+  /* 5699 */  { MAD_F(0x063690c7) /* 0.388321665 */, 18 },
+  /* 5700 */  { MAD_F(0x0636f00b) /* 0.388412519 */, 18 },
+  /* 5701 */  { MAD_F(0x06374f51) /* 0.388503378 */, 18 },
+  /* 5702 */  { MAD_F(0x0637ae99) /* 0.388594243 */, 18 },
+  /* 5703 */  { MAD_F(0x06380de1) /* 0.388685113 */, 18 },
+  /* 5704 */  { MAD_F(0x06386d2b) /* 0.388775988 */, 18 },
+  /* 5705 */  { MAD_F(0x0638cc77) /* 0.388866869 */, 18 },
+  /* 5706 */  { MAD_F(0x06392bc4) /* 0.388957755 */, 18 },
+  /* 5707 */  { MAD_F(0x06398b12) /* 0.389048646 */, 18 },
+  /* 5708 */  { MAD_F(0x0639ea62) /* 0.389139542 */, 18 },
+  /* 5709 */  { MAD_F(0x063a49b4) /* 0.389230444 */, 18 },
+  /* 5710 */  { MAD_F(0x063aa906) /* 0.389321352 */, 18 },
+  /* 5711 */  { MAD_F(0x063b085a) /* 0.389412264 */, 18 },
+
+  /* 5712 */  { MAD_F(0x063b67b0) /* 0.389503182 */, 18 },
+  /* 5713 */  { MAD_F(0x063bc707) /* 0.389594105 */, 18 },
+  /* 5714 */  { MAD_F(0x063c265f) /* 0.389685033 */, 18 },
+  /* 5715 */  { MAD_F(0x063c85b9) /* 0.389775967 */, 18 },
+  /* 5716 */  { MAD_F(0x063ce514) /* 0.389866906 */, 18 },
+  /* 5717 */  { MAD_F(0x063d4471) /* 0.389957850 */, 18 },
+  /* 5718 */  { MAD_F(0x063da3cf) /* 0.390048800 */, 18 },
+  /* 5719 */  { MAD_F(0x063e032f) /* 0.390139755 */, 18 },
+  /* 5720 */  { MAD_F(0x063e6290) /* 0.390230715 */, 18 },
+  /* 5721 */  { MAD_F(0x063ec1f2) /* 0.390321681 */, 18 },
+  /* 5722 */  { MAD_F(0x063f2156) /* 0.390412651 */, 18 },
+  /* 5723 */  { MAD_F(0x063f80bb) /* 0.390503628 */, 18 },
+  /* 5724 */  { MAD_F(0x063fe022) /* 0.390594609 */, 18 },
+  /* 5725 */  { MAD_F(0x06403f8a) /* 0.390685596 */, 18 },
+  /* 5726 */  { MAD_F(0x06409ef3) /* 0.390776588 */, 18 },
+  /* 5727 */  { MAD_F(0x0640fe5e) /* 0.390867585 */, 18 },
+
+  /* 5728 */  { MAD_F(0x06415dcb) /* 0.390958588 */, 18 },
+  /* 5729 */  { MAD_F(0x0641bd38) /* 0.391049596 */, 18 },
+  /* 5730 */  { MAD_F(0x06421ca7) /* 0.391140609 */, 18 },
+  /* 5731 */  { MAD_F(0x06427c18) /* 0.391231627 */, 18 },
+  /* 5732 */  { MAD_F(0x0642db8a) /* 0.391322651 */, 18 },
+  /* 5733 */  { MAD_F(0x06433afd) /* 0.391413680 */, 18 },
+  /* 5734 */  { MAD_F(0x06439a72) /* 0.391504714 */, 18 },
+  /* 5735 */  { MAD_F(0x0643f9e9) /* 0.391595754 */, 18 },
+  /* 5736 */  { MAD_F(0x06445960) /* 0.391686799 */, 18 },
+  /* 5737 */  { MAD_F(0x0644b8d9) /* 0.391777849 */, 18 },
+  /* 5738 */  { MAD_F(0x06451854) /* 0.391868905 */, 18 },
+  /* 5739 */  { MAD_F(0x064577d0) /* 0.391959966 */, 18 },
+  /* 5740 */  { MAD_F(0x0645d74d) /* 0.392051032 */, 18 },
+  /* 5741 */  { MAD_F(0x064636cc) /* 0.392142103 */, 18 },
+  /* 5742 */  { MAD_F(0x0646964c) /* 0.392233180 */, 18 },
+  /* 5743 */  { MAD_F(0x0646f5ce) /* 0.392324262 */, 18 },
+
+  /* 5744 */  { MAD_F(0x06475551) /* 0.392415349 */, 18 },
+  /* 5745 */  { MAD_F(0x0647b4d5) /* 0.392506442 */, 18 },
+  /* 5746 */  { MAD_F(0x0648145b) /* 0.392597540 */, 18 },
+  /* 5747 */  { MAD_F(0x064873e3) /* 0.392688643 */, 18 },
+  /* 5748 */  { MAD_F(0x0648d36b) /* 0.392779751 */, 18 },
+  /* 5749 */  { MAD_F(0x064932f6) /* 0.392870865 */, 18 },
+  /* 5750 */  { MAD_F(0x06499281) /* 0.392961984 */, 18 },
+  /* 5751 */  { MAD_F(0x0649f20e) /* 0.393053108 */, 18 },
+  /* 5752 */  { MAD_F(0x064a519c) /* 0.393144238 */, 18 },
+  /* 5753 */  { MAD_F(0x064ab12c) /* 0.393235372 */, 18 },
+  /* 5754 */  { MAD_F(0x064b10be) /* 0.393326513 */, 18 },
+  /* 5755 */  { MAD_F(0x064b7050) /* 0.393417658 */, 18 },
+  /* 5756 */  { MAD_F(0x064bcfe4) /* 0.393508809 */, 18 },
+  /* 5757 */  { MAD_F(0x064c2f7a) /* 0.393599965 */, 18 },
+  /* 5758 */  { MAD_F(0x064c8f11) /* 0.393691126 */, 18 },
+  /* 5759 */  { MAD_F(0x064ceea9) /* 0.393782292 */, 18 },
+
+  /* 5760 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 18 },
+  /* 5761 */  { MAD_F(0x064dadde) /* 0.393964641 */, 18 },
+  /* 5762 */  { MAD_F(0x064e0d7a) /* 0.394055823 */, 18 },
+  /* 5763 */  { MAD_F(0x064e6d18) /* 0.394147011 */, 18 },
+  /* 5764 */  { MAD_F(0x064eccb8) /* 0.394238204 */, 18 },
+  /* 5765 */  { MAD_F(0x064f2c59) /* 0.394329402 */, 18 },
+  /* 5766 */  { MAD_F(0x064f8bfb) /* 0.394420605 */, 18 },
+  /* 5767 */  { MAD_F(0x064feb9e) /* 0.394511814 */, 18 },
+  /* 5768 */  { MAD_F(0x06504b44) /* 0.394603028 */, 18 },
+  /* 5769 */  { MAD_F(0x0650aaea) /* 0.394694247 */, 18 },
+  /* 5770 */  { MAD_F(0x06510a92) /* 0.394785472 */, 18 },
+  /* 5771 */  { MAD_F(0x06516a3b) /* 0.394876702 */, 18 },
+  /* 5772 */  { MAD_F(0x0651c9e6) /* 0.394967937 */, 18 },
+  /* 5773 */  { MAD_F(0x06522992) /* 0.395059177 */, 18 },
+  /* 5774 */  { MAD_F(0x06528940) /* 0.395150423 */, 18 },
+  /* 5775 */  { MAD_F(0x0652e8ef) /* 0.395241673 */, 18 },
+
+  /* 5776 */  { MAD_F(0x0653489f) /* 0.395332930 */, 18 },
+  /* 5777 */  { MAD_F(0x0653a851) /* 0.395424191 */, 18 },
+  /* 5778 */  { MAD_F(0x06540804) /* 0.395515458 */, 18 },
+  /* 5779 */  { MAD_F(0x065467b9) /* 0.395606730 */, 18 },
+  /* 5780 */  { MAD_F(0x0654c76f) /* 0.395698007 */, 18 },
+  /* 5781 */  { MAD_F(0x06552726) /* 0.395789289 */, 18 },
+  /* 5782 */  { MAD_F(0x065586df) /* 0.395880577 */, 18 },
+  /* 5783 */  { MAD_F(0x0655e699) /* 0.395971870 */, 18 },
+  /* 5784 */  { MAD_F(0x06564655) /* 0.396063168 */, 18 },
+  /* 5785 */  { MAD_F(0x0656a612) /* 0.396154472 */, 18 },
+  /* 5786 */  { MAD_F(0x065705d0) /* 0.396245780 */, 18 },
+  /* 5787 */  { MAD_F(0x06576590) /* 0.396337094 */, 18 },
+  /* 5788 */  { MAD_F(0x0657c552) /* 0.396428414 */, 18 },
+  /* 5789 */  { MAD_F(0x06582514) /* 0.396519738 */, 18 },
+  /* 5790 */  { MAD_F(0x065884d9) /* 0.396611068 */, 18 },
+  /* 5791 */  { MAD_F(0x0658e49e) /* 0.396702403 */, 18 },
+
+  /* 5792 */  { MAD_F(0x06594465) /* 0.396793743 */, 18 },
+  /* 5793 */  { MAD_F(0x0659a42e) /* 0.396885089 */, 18 },
+  /* 5794 */  { MAD_F(0x065a03f7) /* 0.396976440 */, 18 },
+  /* 5795 */  { MAD_F(0x065a63c3) /* 0.397067796 */, 18 },
+  /* 5796 */  { MAD_F(0x065ac38f) /* 0.397159157 */, 18 },
+  /* 5797 */  { MAD_F(0x065b235d) /* 0.397250524 */, 18 },
+  /* 5798 */  { MAD_F(0x065b832d) /* 0.397341896 */, 18 },
+  /* 5799 */  { MAD_F(0x065be2fe) /* 0.397433273 */, 18 },
+  /* 5800 */  { MAD_F(0x065c42d0) /* 0.397524655 */, 18 },
+  /* 5801 */  { MAD_F(0x065ca2a3) /* 0.397616043 */, 18 },
+  /* 5802 */  { MAD_F(0x065d0279) /* 0.397707436 */, 18 },
+  /* 5803 */  { MAD_F(0x065d624f) /* 0.397798834 */, 18 },
+  /* 5804 */  { MAD_F(0x065dc227) /* 0.397890237 */, 18 },
+  /* 5805 */  { MAD_F(0x065e2200) /* 0.397981646 */, 18 },
+  /* 5806 */  { MAD_F(0x065e81db) /* 0.398073059 */, 18 },
+  /* 5807 */  { MAD_F(0x065ee1b7) /* 0.398164479 */, 18 },
+
+  /* 5808 */  { MAD_F(0x065f4195) /* 0.398255903 */, 18 },
+  /* 5809 */  { MAD_F(0x065fa174) /* 0.398347333 */, 18 },
+  /* 5810 */  { MAD_F(0x06600154) /* 0.398438767 */, 18 },
+  /* 5811 */  { MAD_F(0x06606136) /* 0.398530207 */, 18 },
+  /* 5812 */  { MAD_F(0x0660c119) /* 0.398621653 */, 18 },
+  /* 5813 */  { MAD_F(0x066120fd) /* 0.398713103 */, 18 },
+  /* 5814 */  { MAD_F(0x066180e3) /* 0.398804559 */, 18 },
+  /* 5815 */  { MAD_F(0x0661e0cb) /* 0.398896020 */, 18 },
+  /* 5816 */  { MAD_F(0x066240b4) /* 0.398987487 */, 18 },
+  /* 5817 */  { MAD_F(0x0662a09e) /* 0.399078958 */, 18 },
+  /* 5818 */  { MAD_F(0x06630089) /* 0.399170435 */, 18 },
+  /* 5819 */  { MAD_F(0x06636077) /* 0.399261917 */, 18 },
+  /* 5820 */  { MAD_F(0x0663c065) /* 0.399353404 */, 18 },
+  /* 5821 */  { MAD_F(0x06642055) /* 0.399444897 */, 18 },
+  /* 5822 */  { MAD_F(0x06648046) /* 0.399536395 */, 18 },
+  /* 5823 */  { MAD_F(0x0664e039) /* 0.399627898 */, 18 },
+
+  /* 5824 */  { MAD_F(0x0665402d) /* 0.399719406 */, 18 },
+  /* 5825 */  { MAD_F(0x0665a022) /* 0.399810919 */, 18 },
+  /* 5826 */  { MAD_F(0x06660019) /* 0.399902438 */, 18 },
+  /* 5827 */  { MAD_F(0x06666011) /* 0.399993962 */, 18 },
+  /* 5828 */  { MAD_F(0x0666c00b) /* 0.400085491 */, 18 },
+  /* 5829 */  { MAD_F(0x06672006) /* 0.400177026 */, 18 },
+  /* 5830 */  { MAD_F(0x06678003) /* 0.400268565 */, 18 },
+  /* 5831 */  { MAD_F(0x0667e000) /* 0.400360110 */, 18 },
+  /* 5832 */  { MAD_F(0x06684000) /* 0.400451660 */, 18 },
+  /* 5833 */  { MAD_F(0x0668a000) /* 0.400543216 */, 18 },
+  /* 5834 */  { MAD_F(0x06690003) /* 0.400634776 */, 18 },
+  /* 5835 */  { MAD_F(0x06696006) /* 0.400726342 */, 18 },
+  /* 5836 */  { MAD_F(0x0669c00b) /* 0.400817913 */, 18 },
+  /* 5837 */  { MAD_F(0x066a2011) /* 0.400909489 */, 18 },
+  /* 5838 */  { MAD_F(0x066a8019) /* 0.401001071 */, 18 },
+  /* 5839 */  { MAD_F(0x066ae022) /* 0.401092657 */, 18 },
+
+  /* 5840 */  { MAD_F(0x066b402d) /* 0.401184249 */, 18 },
+  /* 5841 */  { MAD_F(0x066ba039) /* 0.401275847 */, 18 },
+  /* 5842 */  { MAD_F(0x066c0046) /* 0.401367449 */, 18 },
+  /* 5843 */  { MAD_F(0x066c6055) /* 0.401459057 */, 18 },
+  /* 5844 */  { MAD_F(0x066cc065) /* 0.401550670 */, 18 },
+  /* 5845 */  { MAD_F(0x066d2076) /* 0.401642288 */, 18 },
+  /* 5846 */  { MAD_F(0x066d8089) /* 0.401733911 */, 18 },
+  /* 5847 */  { MAD_F(0x066de09e) /* 0.401825540 */, 18 },
+  /* 5848 */  { MAD_F(0x066e40b3) /* 0.401917173 */, 18 },
+  /* 5849 */  { MAD_F(0x066ea0cb) /* 0.402008812 */, 18 },
+  /* 5850 */  { MAD_F(0x066f00e3) /* 0.402100457 */, 18 },
+  /* 5851 */  { MAD_F(0x066f60fd) /* 0.402192106 */, 18 },
+  /* 5852 */  { MAD_F(0x066fc118) /* 0.402283761 */, 18 },
+  /* 5853 */  { MAD_F(0x06702135) /* 0.402375420 */, 18 },
+  /* 5854 */  { MAD_F(0x06708153) /* 0.402467086 */, 18 },
+  /* 5855 */  { MAD_F(0x0670e173) /* 0.402558756 */, 18 },
+
+  /* 5856 */  { MAD_F(0x06714194) /* 0.402650431 */, 18 },
+  /* 5857 */  { MAD_F(0x0671a1b6) /* 0.402742112 */, 18 },
+  /* 5858 */  { MAD_F(0x067201da) /* 0.402833798 */, 18 },
+  /* 5859 */  { MAD_F(0x067261ff) /* 0.402925489 */, 18 },
+  /* 5860 */  { MAD_F(0x0672c226) /* 0.403017186 */, 18 },
+  /* 5861 */  { MAD_F(0x0673224e) /* 0.403108887 */, 18 },
+  /* 5862 */  { MAD_F(0x06738277) /* 0.403200594 */, 18 },
+  /* 5863 */  { MAD_F(0x0673e2a2) /* 0.403292306 */, 18 },
+  /* 5864 */  { MAD_F(0x067442ce) /* 0.403384024 */, 18 },
+  /* 5865 */  { MAD_F(0x0674a2fc) /* 0.403475746 */, 18 },
+  /* 5866 */  { MAD_F(0x0675032b) /* 0.403567474 */, 18 },
+  /* 5867 */  { MAD_F(0x0675635b) /* 0.403659207 */, 18 },
+  /* 5868 */  { MAD_F(0x0675c38d) /* 0.403750945 */, 18 },
+  /* 5869 */  { MAD_F(0x067623c0) /* 0.403842688 */, 18 },
+  /* 5870 */  { MAD_F(0x067683f4) /* 0.403934437 */, 18 },
+  /* 5871 */  { MAD_F(0x0676e42a) /* 0.404026190 */, 18 },
+
+  /* 5872 */  { MAD_F(0x06774462) /* 0.404117949 */, 18 },
+  /* 5873 */  { MAD_F(0x0677a49b) /* 0.404209714 */, 18 },
+  /* 5874 */  { MAD_F(0x067804d5) /* 0.404301483 */, 18 },
+  /* 5875 */  { MAD_F(0x06786510) /* 0.404393258 */, 18 },
+  /* 5876 */  { MAD_F(0x0678c54d) /* 0.404485037 */, 18 },
+  /* 5877 */  { MAD_F(0x0679258c) /* 0.404576822 */, 18 },
+  /* 5878 */  { MAD_F(0x067985cb) /* 0.404668613 */, 18 },
+  /* 5879 */  { MAD_F(0x0679e60c) /* 0.404760408 */, 18 },
+  /* 5880 */  { MAD_F(0x067a464f) /* 0.404852209 */, 18 },
+  /* 5881 */  { MAD_F(0x067aa693) /* 0.404944014 */, 18 },
+  /* 5882 */  { MAD_F(0x067b06d8) /* 0.405035825 */, 18 },
+  /* 5883 */  { MAD_F(0x067b671f) /* 0.405127642 */, 18 },
+  /* 5884 */  { MAD_F(0x067bc767) /* 0.405219463 */, 18 },
+  /* 5885 */  { MAD_F(0x067c27b1) /* 0.405311290 */, 18 },
+  /* 5886 */  { MAD_F(0x067c87fc) /* 0.405403122 */, 18 },
+  /* 5887 */  { MAD_F(0x067ce848) /* 0.405494959 */, 18 },
+
+  /* 5888 */  { MAD_F(0x067d4896) /* 0.405586801 */, 18 },
+  /* 5889 */  { MAD_F(0x067da8e5) /* 0.405678648 */, 18 },
+  /* 5890 */  { MAD_F(0x067e0935) /* 0.405770501 */, 18 },
+  /* 5891 */  { MAD_F(0x067e6987) /* 0.405862359 */, 18 },
+  /* 5892 */  { MAD_F(0x067ec9da) /* 0.405954222 */, 18 },
+  /* 5893 */  { MAD_F(0x067f2a2f) /* 0.406046090 */, 18 },
+  /* 5894 */  { MAD_F(0x067f8a85) /* 0.406137963 */, 18 },
+  /* 5895 */  { MAD_F(0x067feadd) /* 0.406229842 */, 18 },
+  /* 5896 */  { MAD_F(0x06804b36) /* 0.406321726 */, 18 },
+  /* 5897 */  { MAD_F(0x0680ab90) /* 0.406413615 */, 18 },
+  /* 5898 */  { MAD_F(0x06810beb) /* 0.406505509 */, 18 },
+  /* 5899 */  { MAD_F(0x06816c49) /* 0.406597408 */, 18 },
+  /* 5900 */  { MAD_F(0x0681cca7) /* 0.406689313 */, 18 },
+  /* 5901 */  { MAD_F(0x06822d07) /* 0.406781223 */, 18 },
+  /* 5902 */  { MAD_F(0x06828d68) /* 0.406873138 */, 18 },
+  /* 5903 */  { MAD_F(0x0682edcb) /* 0.406965058 */, 18 },
+
+  /* 5904 */  { MAD_F(0x06834e2f) /* 0.407056983 */, 18 },
+  /* 5905 */  { MAD_F(0x0683ae94) /* 0.407148914 */, 18 },
+  /* 5906 */  { MAD_F(0x06840efb) /* 0.407240850 */, 18 },
+  /* 5907 */  { MAD_F(0x06846f63) /* 0.407332791 */, 18 },
+  /* 5908 */  { MAD_F(0x0684cfcd) /* 0.407424737 */, 18 },
+  /* 5909 */  { MAD_F(0x06853038) /* 0.407516688 */, 18 },
+  /* 5910 */  { MAD_F(0x068590a4) /* 0.407608645 */, 18 },
+  /* 5911 */  { MAD_F(0x0685f112) /* 0.407700606 */, 18 },
+  /* 5912 */  { MAD_F(0x06865181) /* 0.407792573 */, 18 },
+  /* 5913 */  { MAD_F(0x0686b1f2) /* 0.407884545 */, 18 },
+  /* 5914 */  { MAD_F(0x06871264) /* 0.407976522 */, 18 },
+  /* 5915 */  { MAD_F(0x068772d7) /* 0.408068505 */, 18 },
+  /* 5916 */  { MAD_F(0x0687d34c) /* 0.408160492 */, 18 },
+  /* 5917 */  { MAD_F(0x068833c2) /* 0.408252485 */, 18 },
+  /* 5918 */  { MAD_F(0x06889439) /* 0.408344483 */, 18 },
+  /* 5919 */  { MAD_F(0x0688f4b2) /* 0.408436486 */, 18 },
+
+  /* 5920 */  { MAD_F(0x0689552c) /* 0.408528495 */, 18 },
+  /* 5921 */  { MAD_F(0x0689b5a8) /* 0.408620508 */, 18 },
+  /* 5922 */  { MAD_F(0x068a1625) /* 0.408712527 */, 18 },
+  /* 5923 */  { MAD_F(0x068a76a4) /* 0.408804551 */, 18 },
+  /* 5924 */  { MAD_F(0x068ad724) /* 0.408896580 */, 18 },
+  /* 5925 */  { MAD_F(0x068b37a5) /* 0.408988614 */, 18 },
+  /* 5926 */  { MAD_F(0x068b9827) /* 0.409080653 */, 18 },
+  /* 5927 */  { MAD_F(0x068bf8ac) /* 0.409172698 */, 18 },
+  /* 5928 */  { MAD_F(0x068c5931) /* 0.409264748 */, 18 },
+  /* 5929 */  { MAD_F(0x068cb9b8) /* 0.409356803 */, 18 },
+  /* 5930 */  { MAD_F(0x068d1a40) /* 0.409448863 */, 18 },
+  /* 5931 */  { MAD_F(0x068d7aca) /* 0.409540928 */, 18 },
+  /* 5932 */  { MAD_F(0x068ddb54) /* 0.409632999 */, 18 },
+  /* 5933 */  { MAD_F(0x068e3be1) /* 0.409725074 */, 18 },
+  /* 5934 */  { MAD_F(0x068e9c6f) /* 0.409817155 */, 18 },
+  /* 5935 */  { MAD_F(0x068efcfe) /* 0.409909241 */, 18 },
+
+  /* 5936 */  { MAD_F(0x068f5d8e) /* 0.410001332 */, 18 },
+  /* 5937 */  { MAD_F(0x068fbe20) /* 0.410093428 */, 18 },
+  /* 5938 */  { MAD_F(0x06901eb4) /* 0.410185530 */, 18 },
+  /* 5939 */  { MAD_F(0x06907f48) /* 0.410277637 */, 18 },
+  /* 5940 */  { MAD_F(0x0690dfde) /* 0.410369748 */, 18 },
+  /* 5941 */  { MAD_F(0x06914076) /* 0.410461865 */, 18 },
+  /* 5942 */  { MAD_F(0x0691a10f) /* 0.410553988 */, 18 },
+  /* 5943 */  { MAD_F(0x069201a9) /* 0.410646115 */, 18 },
+  /* 5944 */  { MAD_F(0x06926245) /* 0.410738247 */, 18 },
+  /* 5945 */  { MAD_F(0x0692c2e2) /* 0.410830385 */, 18 },
+  /* 5946 */  { MAD_F(0x06932380) /* 0.410922528 */, 18 },
+  /* 5947 */  { MAD_F(0x06938420) /* 0.411014676 */, 18 },
+  /* 5948 */  { MAD_F(0x0693e4c1) /* 0.411106829 */, 18 },
+  /* 5949 */  { MAD_F(0x06944563) /* 0.411198987 */, 18 },
+  /* 5950 */  { MAD_F(0x0694a607) /* 0.411291151 */, 18 },
+  /* 5951 */  { MAD_F(0x069506ad) /* 0.411383320 */, 18 },
+
+  /* 5952 */  { MAD_F(0x06956753) /* 0.411475493 */, 18 },
+  /* 5953 */  { MAD_F(0x0695c7fc) /* 0.411567672 */, 18 },
+  /* 5954 */  { MAD_F(0x069628a5) /* 0.411659857 */, 18 },
+  /* 5955 */  { MAD_F(0x06968950) /* 0.411752046 */, 18 },
+  /* 5956 */  { MAD_F(0x0696e9fc) /* 0.411844240 */, 18 },
+  /* 5957 */  { MAD_F(0x06974aaa) /* 0.411936440 */, 18 },
+  /* 5958 */  { MAD_F(0x0697ab59) /* 0.412028645 */, 18 },
+  /* 5959 */  { MAD_F(0x06980c09) /* 0.412120855 */, 18 },
+  /* 5960 */  { MAD_F(0x06986cbb) /* 0.412213070 */, 18 },
+  /* 5961 */  { MAD_F(0x0698cd6e) /* 0.412305290 */, 18 },
+  /* 5962 */  { MAD_F(0x06992e23) /* 0.412397516 */, 18 },
+  /* 5963 */  { MAD_F(0x06998ed9) /* 0.412489746 */, 18 },
+  /* 5964 */  { MAD_F(0x0699ef90) /* 0.412581982 */, 18 },
+  /* 5965 */  { MAD_F(0x069a5049) /* 0.412674223 */, 18 },
+  /* 5966 */  { MAD_F(0x069ab103) /* 0.412766469 */, 18 },
+  /* 5967 */  { MAD_F(0x069b11bf) /* 0.412858720 */, 18 },
+
+  /* 5968 */  { MAD_F(0x069b727b) /* 0.412950976 */, 18 },
+  /* 5969 */  { MAD_F(0x069bd33a) /* 0.413043238 */, 18 },
+  /* 5970 */  { MAD_F(0x069c33f9) /* 0.413135505 */, 18 },
+  /* 5971 */  { MAD_F(0x069c94ba) /* 0.413227776 */, 18 },
+  /* 5972 */  { MAD_F(0x069cf57d) /* 0.413320053 */, 18 },
+  /* 5973 */  { MAD_F(0x069d5641) /* 0.413412335 */, 18 },
+  /* 5974 */  { MAD_F(0x069db706) /* 0.413504623 */, 18 },
+  /* 5975 */  { MAD_F(0x069e17cc) /* 0.413596915 */, 18 },
+  /* 5976 */  { MAD_F(0x069e7894) /* 0.413689213 */, 18 },
+  /* 5977 */  { MAD_F(0x069ed95e) /* 0.413781515 */, 18 },
+  /* 5978 */  { MAD_F(0x069f3a28) /* 0.413873823 */, 18 },
+  /* 5979 */  { MAD_F(0x069f9af4) /* 0.413966136 */, 18 },
+  /* 5980 */  { MAD_F(0x069ffbc2) /* 0.414058454 */, 18 },
+  /* 5981 */  { MAD_F(0x06a05c91) /* 0.414150778 */, 18 },
+  /* 5982 */  { MAD_F(0x06a0bd61) /* 0.414243106 */, 18 },
+  /* 5983 */  { MAD_F(0x06a11e32) /* 0.414335440 */, 18 },
+
+  /* 5984 */  { MAD_F(0x06a17f05) /* 0.414427779 */, 18 },
+  /* 5985 */  { MAD_F(0x06a1dfda) /* 0.414520122 */, 18 },
+  /* 5986 */  { MAD_F(0x06a240b0) /* 0.414612471 */, 18 },
+  /* 5987 */  { MAD_F(0x06a2a187) /* 0.414704826 */, 18 },
+  /* 5988 */  { MAD_F(0x06a3025f) /* 0.414797185 */, 18 },
+  /* 5989 */  { MAD_F(0x06a36339) /* 0.414889549 */, 18 },
+  /* 5990 */  { MAD_F(0x06a3c414) /* 0.414981919 */, 18 },
+  /* 5991 */  { MAD_F(0x06a424f1) /* 0.415074294 */, 18 },
+  /* 5992 */  { MAD_F(0x06a485cf) /* 0.415166674 */, 18 },
+  /* 5993 */  { MAD_F(0x06a4e6ae) /* 0.415259059 */, 18 },
+  /* 5994 */  { MAD_F(0x06a5478f) /* 0.415351449 */, 18 },
+  /* 5995 */  { MAD_F(0x06a5a871) /* 0.415443844 */, 18 },
+  /* 5996 */  { MAD_F(0x06a60955) /* 0.415536244 */, 18 },
+  /* 5997 */  { MAD_F(0x06a66a3a) /* 0.415628650 */, 18 },
+  /* 5998 */  { MAD_F(0x06a6cb20) /* 0.415721061 */, 18 },
+  /* 5999 */  { MAD_F(0x06a72c08) /* 0.415813476 */, 18 },
+
+  /* 6000 */  { MAD_F(0x06a78cf1) /* 0.415905897 */, 18 },
+  /* 6001 */  { MAD_F(0x06a7eddb) /* 0.415998324 */, 18 },
+  /* 6002 */  { MAD_F(0x06a84ec7) /* 0.416090755 */, 18 },
+  /* 6003 */  { MAD_F(0x06a8afb4) /* 0.416183191 */, 18 },
+  /* 6004 */  { MAD_F(0x06a910a3) /* 0.416275633 */, 18 },
+  /* 6005 */  { MAD_F(0x06a97193) /* 0.416368079 */, 18 },
+  /* 6006 */  { MAD_F(0x06a9d284) /* 0.416460531 */, 18 },
+  /* 6007 */  { MAD_F(0x06aa3377) /* 0.416552988 */, 18 },
+  /* 6008 */  { MAD_F(0x06aa946b) /* 0.416645450 */, 18 },
+  /* 6009 */  { MAD_F(0x06aaf561) /* 0.416737917 */, 18 },
+  /* 6010 */  { MAD_F(0x06ab5657) /* 0.416830389 */, 18 },
+  /* 6011 */  { MAD_F(0x06abb750) /* 0.416922867 */, 18 },
+  /* 6012 */  { MAD_F(0x06ac1849) /* 0.417015349 */, 18 },
+  /* 6013 */  { MAD_F(0x06ac7944) /* 0.417107837 */, 18 },
+  /* 6014 */  { MAD_F(0x06acda41) /* 0.417200330 */, 18 },
+  /* 6015 */  { MAD_F(0x06ad3b3e) /* 0.417292828 */, 18 },
+
+  /* 6016 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 18 },
+  /* 6017 */  { MAD_F(0x06adfd3e) /* 0.417477839 */, 18 },
+  /* 6018 */  { MAD_F(0x06ae5e40) /* 0.417570352 */, 18 },
+  /* 6019 */  { MAD_F(0x06aebf43) /* 0.417662871 */, 18 },
+  /* 6020 */  { MAD_F(0x06af2047) /* 0.417755394 */, 18 },
+  /* 6021 */  { MAD_F(0x06af814d) /* 0.417847923 */, 18 },
+  /* 6022 */  { MAD_F(0x06afe255) /* 0.417940457 */, 18 },
+  /* 6023 */  { MAD_F(0x06b0435e) /* 0.418032996 */, 18 },
+  /* 6024 */  { MAD_F(0x06b0a468) /* 0.418125540 */, 18 },
+  /* 6025 */  { MAD_F(0x06b10573) /* 0.418218089 */, 18 },
+  /* 6026 */  { MAD_F(0x06b16680) /* 0.418310643 */, 18 },
+  /* 6027 */  { MAD_F(0x06b1c78e) /* 0.418403203 */, 18 },
+  /* 6028 */  { MAD_F(0x06b2289e) /* 0.418495767 */, 18 },
+  /* 6029 */  { MAD_F(0x06b289af) /* 0.418588337 */, 18 },
+  /* 6030 */  { MAD_F(0x06b2eac1) /* 0.418680911 */, 18 },
+  /* 6031 */  { MAD_F(0x06b34bd5) /* 0.418773491 */, 18 },
+
+  /* 6032 */  { MAD_F(0x06b3acea) /* 0.418866076 */, 18 },
+  /* 6033 */  { MAD_F(0x06b40e00) /* 0.418958666 */, 18 },
+  /* 6034 */  { MAD_F(0x06b46f18) /* 0.419051262 */, 18 },
+  /* 6035 */  { MAD_F(0x06b4d031) /* 0.419143862 */, 18 },
+  /* 6036 */  { MAD_F(0x06b5314c) /* 0.419236467 */, 18 },
+  /* 6037 */  { MAD_F(0x06b59268) /* 0.419329078 */, 18 },
+  /* 6038 */  { MAD_F(0x06b5f385) /* 0.419421694 */, 18 },
+  /* 6039 */  { MAD_F(0x06b654a4) /* 0.419514314 */, 18 },
+  /* 6040 */  { MAD_F(0x06b6b5c4) /* 0.419606940 */, 18 },
+  /* 6041 */  { MAD_F(0x06b716e6) /* 0.419699571 */, 18 },
+  /* 6042 */  { MAD_F(0x06b77808) /* 0.419792208 */, 18 },
+  /* 6043 */  { MAD_F(0x06b7d92d) /* 0.419884849 */, 18 },
+  /* 6044 */  { MAD_F(0x06b83a52) /* 0.419977495 */, 18 },
+  /* 6045 */  { MAD_F(0x06b89b79) /* 0.420070147 */, 18 },
+  /* 6046 */  { MAD_F(0x06b8fca1) /* 0.420162803 */, 18 },
+  /* 6047 */  { MAD_F(0x06b95dcb) /* 0.420255465 */, 18 },
+
+  /* 6048 */  { MAD_F(0x06b9bef6) /* 0.420348132 */, 18 },
+  /* 6049 */  { MAD_F(0x06ba2023) /* 0.420440803 */, 18 },
+  /* 6050 */  { MAD_F(0x06ba8150) /* 0.420533481 */, 18 },
+  /* 6051 */  { MAD_F(0x06bae280) /* 0.420626163 */, 18 },
+  /* 6052 */  { MAD_F(0x06bb43b0) /* 0.420718850 */, 18 },
+  /* 6053 */  { MAD_F(0x06bba4e2) /* 0.420811542 */, 18 },
+  /* 6054 */  { MAD_F(0x06bc0615) /* 0.420904240 */, 18 },
+  /* 6055 */  { MAD_F(0x06bc674a) /* 0.420996942 */, 18 },
+  /* 6056 */  { MAD_F(0x06bcc880) /* 0.421089650 */, 18 },
+  /* 6057 */  { MAD_F(0x06bd29b7) /* 0.421182362 */, 18 },
+  /* 6058 */  { MAD_F(0x06bd8af0) /* 0.421275080 */, 18 },
+  /* 6059 */  { MAD_F(0x06bdec2a) /* 0.421367803 */, 18 },
+  /* 6060 */  { MAD_F(0x06be4d66) /* 0.421460531 */, 18 },
+  /* 6061 */  { MAD_F(0x06beaea3) /* 0.421553264 */, 18 },
+  /* 6062 */  { MAD_F(0x06bf0fe1) /* 0.421646003 */, 18 },
+  /* 6063 */  { MAD_F(0x06bf7120) /* 0.421738746 */, 18 },
+
+  /* 6064 */  { MAD_F(0x06bfd261) /* 0.421831494 */, 18 },
+  /* 6065 */  { MAD_F(0x06c033a4) /* 0.421924248 */, 18 },
+  /* 6066 */  { MAD_F(0x06c094e7) /* 0.422017007 */, 18 },
+  /* 6067 */  { MAD_F(0x06c0f62c) /* 0.422109770 */, 18 },
+  /* 6068 */  { MAD_F(0x06c15773) /* 0.422202539 */, 18 },
+  /* 6069 */  { MAD_F(0x06c1b8bb) /* 0.422295313 */, 18 },
+  /* 6070 */  { MAD_F(0x06c21a04) /* 0.422388092 */, 18 },
+  /* 6071 */  { MAD_F(0x06c27b4e) /* 0.422480876 */, 18 },
+  /* 6072 */  { MAD_F(0x06c2dc9a) /* 0.422573665 */, 18 },
+  /* 6073 */  { MAD_F(0x06c33de8) /* 0.422666460 */, 18 },
+  /* 6074 */  { MAD_F(0x06c39f36) /* 0.422759259 */, 18 },
+  /* 6075 */  { MAD_F(0x06c40086) /* 0.422852064 */, 18 },
+  /* 6076 */  { MAD_F(0x06c461d8) /* 0.422944873 */, 18 },
+  /* 6077 */  { MAD_F(0x06c4c32a) /* 0.423037688 */, 18 },
+  /* 6078 */  { MAD_F(0x06c5247f) /* 0.423130508 */, 18 },
+  /* 6079 */  { MAD_F(0x06c585d4) /* 0.423223333 */, 18 },
+
+  /* 6080 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 18 },
+  /* 6081 */  { MAD_F(0x06c64883) /* 0.423408997 */, 18 },
+  /* 6082 */  { MAD_F(0x06c6a9dd) /* 0.423501838 */, 18 },
+  /* 6083 */  { MAD_F(0x06c70b38) /* 0.423594683 */, 18 },
+  /* 6084 */  { MAD_F(0x06c76c94) /* 0.423687533 */, 18 },
+  /* 6085 */  { MAD_F(0x06c7cdf2) /* 0.423780389 */, 18 },
+  /* 6086 */  { MAD_F(0x06c82f51) /* 0.423873249 */, 18 },
+  /* 6087 */  { MAD_F(0x06c890b1) /* 0.423966115 */, 18 },
+  /* 6088 */  { MAD_F(0x06c8f213) /* 0.424058985 */, 18 },
+  /* 6089 */  { MAD_F(0x06c95376) /* 0.424151861 */, 18 },
+  /* 6090 */  { MAD_F(0x06c9b4da) /* 0.424244742 */, 18 },
+  /* 6091 */  { MAD_F(0x06ca1640) /* 0.424337628 */, 18 },
+  /* 6092 */  { MAD_F(0x06ca77a8) /* 0.424430519 */, 18 },
+  /* 6093 */  { MAD_F(0x06cad910) /* 0.424523415 */, 18 },
+  /* 6094 */  { MAD_F(0x06cb3a7a) /* 0.424616316 */, 18 },
+  /* 6095 */  { MAD_F(0x06cb9be5) /* 0.424709222 */, 18 },
+
+  /* 6096 */  { MAD_F(0x06cbfd52) /* 0.424802133 */, 18 },
+  /* 6097 */  { MAD_F(0x06cc5ec0) /* 0.424895050 */, 18 },
+  /* 6098 */  { MAD_F(0x06ccc030) /* 0.424987971 */, 18 },
+  /* 6099 */  { MAD_F(0x06cd21a0) /* 0.425080898 */, 18 },
+  /* 6100 */  { MAD_F(0x06cd8313) /* 0.425173829 */, 18 },
+  /* 6101 */  { MAD_F(0x06cde486) /* 0.425266766 */, 18 },
+  /* 6102 */  { MAD_F(0x06ce45fb) /* 0.425359708 */, 18 },
+  /* 6103 */  { MAD_F(0x06cea771) /* 0.425452655 */, 18 },
+  /* 6104 */  { MAD_F(0x06cf08e9) /* 0.425545607 */, 18 },
+  /* 6105 */  { MAD_F(0x06cf6a62) /* 0.425638564 */, 18 },
+  /* 6106 */  { MAD_F(0x06cfcbdc) /* 0.425731526 */, 18 },
+  /* 6107 */  { MAD_F(0x06d02d58) /* 0.425824493 */, 18 },
+  /* 6108 */  { MAD_F(0x06d08ed5) /* 0.425917465 */, 18 },
+  /* 6109 */  { MAD_F(0x06d0f053) /* 0.426010443 */, 18 },
+  /* 6110 */  { MAD_F(0x06d151d3) /* 0.426103425 */, 18 },
+  /* 6111 */  { MAD_F(0x06d1b354) /* 0.426196412 */, 18 },
+
+  /* 6112 */  { MAD_F(0x06d214d7) /* 0.426289405 */, 18 },
+  /* 6113 */  { MAD_F(0x06d2765a) /* 0.426382403 */, 18 },
+  /* 6114 */  { MAD_F(0x06d2d7e0) /* 0.426475405 */, 18 },
+  /* 6115 */  { MAD_F(0x06d33966) /* 0.426568413 */, 18 },
+  /* 6116 */  { MAD_F(0x06d39aee) /* 0.426661426 */, 18 },
+  /* 6117 */  { MAD_F(0x06d3fc77) /* 0.426754444 */, 18 },
+  /* 6118 */  { MAD_F(0x06d45e02) /* 0.426847467 */, 18 },
+  /* 6119 */  { MAD_F(0x06d4bf8e) /* 0.426940495 */, 18 },
+  /* 6120 */  { MAD_F(0x06d5211c) /* 0.427033528 */, 18 },
+  /* 6121 */  { MAD_F(0x06d582aa) /* 0.427126566 */, 18 },
+  /* 6122 */  { MAD_F(0x06d5e43a) /* 0.427219609 */, 18 },
+  /* 6123 */  { MAD_F(0x06d645cc) /* 0.427312657 */, 18 },
+  /* 6124 */  { MAD_F(0x06d6a75f) /* 0.427405711 */, 18 },
+  /* 6125 */  { MAD_F(0x06d708f3) /* 0.427498769 */, 18 },
+  /* 6126 */  { MAD_F(0x06d76a88) /* 0.427591833 */, 18 },
+  /* 6127 */  { MAD_F(0x06d7cc1f) /* 0.427684901 */, 18 },
+
+  /* 6128 */  { MAD_F(0x06d82db8) /* 0.427777975 */, 18 },
+  /* 6129 */  { MAD_F(0x06d88f51) /* 0.427871054 */, 18 },
+  /* 6130 */  { MAD_F(0x06d8f0ec) /* 0.427964137 */, 18 },
+  /* 6131 */  { MAD_F(0x06d95288) /* 0.428057226 */, 18 },
+  /* 6132 */  { MAD_F(0x06d9b426) /* 0.428150320 */, 18 },
+  /* 6133 */  { MAD_F(0x06da15c5) /* 0.428243419 */, 18 },
+  /* 6134 */  { MAD_F(0x06da7766) /* 0.428336523 */, 18 },
+  /* 6135 */  { MAD_F(0x06dad907) /* 0.428429632 */, 18 },
+  /* 6136 */  { MAD_F(0x06db3aaa) /* 0.428522746 */, 18 },
+  /* 6137 */  { MAD_F(0x06db9c4f) /* 0.428615865 */, 18 },
+  /* 6138 */  { MAD_F(0x06dbfdf5) /* 0.428708989 */, 18 },
+  /* 6139 */  { MAD_F(0x06dc5f9c) /* 0.428802119 */, 18 },
+  /* 6140 */  { MAD_F(0x06dcc145) /* 0.428895253 */, 18 },
+  /* 6141 */  { MAD_F(0x06dd22ee) /* 0.428988392 */, 18 },
+  /* 6142 */  { MAD_F(0x06dd849a) /* 0.429081537 */, 18 },
+  /* 6143 */  { MAD_F(0x06dde646) /* 0.429174686 */, 18 },
+
+  /* 6144 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 18 },
+  /* 6145 */  { MAD_F(0x06dea9a4) /* 0.429361001 */, 18 },
+  /* 6146 */  { MAD_F(0x06df0b54) /* 0.429454165 */, 18 },
+  /* 6147 */  { MAD_F(0x06df6d06) /* 0.429547335 */, 18 },
+  /* 6148 */  { MAD_F(0x06dfceba) /* 0.429640510 */, 18 },
+  /* 6149 */  { MAD_F(0x06e0306f) /* 0.429733690 */, 18 },
+  /* 6150 */  { MAD_F(0x06e09225) /* 0.429826874 */, 18 },
+  /* 6151 */  { MAD_F(0x06e0f3dc) /* 0.429920064 */, 18 },
+  /* 6152 */  { MAD_F(0x06e15595) /* 0.430013259 */, 18 },
+  /* 6153 */  { MAD_F(0x06e1b74f) /* 0.430106459 */, 18 },
+  /* 6154 */  { MAD_F(0x06e2190b) /* 0.430199664 */, 18 },
+  /* 6155 */  { MAD_F(0x06e27ac8) /* 0.430292875 */, 18 },
+  /* 6156 */  { MAD_F(0x06e2dc86) /* 0.430386090 */, 18 },
+  /* 6157 */  { MAD_F(0x06e33e46) /* 0.430479310 */, 18 },
+  /* 6158 */  { MAD_F(0x06e3a007) /* 0.430572535 */, 18 },
+  /* 6159 */  { MAD_F(0x06e401c9) /* 0.430665765 */, 18 },
+
+  /* 6160 */  { MAD_F(0x06e4638d) /* 0.430759001 */, 18 },
+  /* 6161 */  { MAD_F(0x06e4c552) /* 0.430852241 */, 18 },
+  /* 6162 */  { MAD_F(0x06e52718) /* 0.430945487 */, 18 },
+  /* 6163 */  { MAD_F(0x06e588e0) /* 0.431038737 */, 18 },
+  /* 6164 */  { MAD_F(0x06e5eaa9) /* 0.431131993 */, 18 },
+  /* 6165 */  { MAD_F(0x06e64c73) /* 0.431225253 */, 18 },
+  /* 6166 */  { MAD_F(0x06e6ae3f) /* 0.431318519 */, 18 },
+  /* 6167 */  { MAD_F(0x06e7100c) /* 0.431411790 */, 18 },
+  /* 6168 */  { MAD_F(0x06e771db) /* 0.431505065 */, 18 },
+  /* 6169 */  { MAD_F(0x06e7d3ab) /* 0.431598346 */, 18 },
+  /* 6170 */  { MAD_F(0x06e8357c) /* 0.431691632 */, 18 },
+  /* 6171 */  { MAD_F(0x06e8974e) /* 0.431784923 */, 18 },
+  /* 6172 */  { MAD_F(0x06e8f922) /* 0.431878218 */, 18 },
+  /* 6173 */  { MAD_F(0x06e95af8) /* 0.431971519 */, 18 },
+  /* 6174 */  { MAD_F(0x06e9bcce) /* 0.432064825 */, 18 },
+  /* 6175 */  { MAD_F(0x06ea1ea6) /* 0.432158136 */, 18 },
+
+  /* 6176 */  { MAD_F(0x06ea807f) /* 0.432251452 */, 18 },
+  /* 6177 */  { MAD_F(0x06eae25a) /* 0.432344773 */, 18 },
+  /* 6178 */  { MAD_F(0x06eb4436) /* 0.432438099 */, 18 },
+  /* 6179 */  { MAD_F(0x06eba614) /* 0.432531431 */, 18 },
+  /* 6180 */  { MAD_F(0x06ec07f2) /* 0.432624767 */, 18 },
+  /* 6181 */  { MAD_F(0x06ec69d2) /* 0.432718108 */, 18 },
+  /* 6182 */  { MAD_F(0x06eccbb4) /* 0.432811454 */, 18 },
+  /* 6183 */  { MAD_F(0x06ed2d97) /* 0.432904805 */, 18 },
+  /* 6184 */  { MAD_F(0x06ed8f7b) /* 0.432998162 */, 18 },
+  /* 6185 */  { MAD_F(0x06edf160) /* 0.433091523 */, 18 },
+  /* 6186 */  { MAD_F(0x06ee5347) /* 0.433184889 */, 18 },
+  /* 6187 */  { MAD_F(0x06eeb52f) /* 0.433278261 */, 18 },
+  /* 6188 */  { MAD_F(0x06ef1719) /* 0.433371637 */, 18 },
+  /* 6189 */  { MAD_F(0x06ef7904) /* 0.433465019 */, 18 },
+  /* 6190 */  { MAD_F(0x06efdaf0) /* 0.433558405 */, 18 },
+  /* 6191 */  { MAD_F(0x06f03cde) /* 0.433651797 */, 18 },
+
+  /* 6192 */  { MAD_F(0x06f09ecc) /* 0.433745193 */, 18 },
+  /* 6193 */  { MAD_F(0x06f100bd) /* 0.433838595 */, 18 },
+  /* 6194 */  { MAD_F(0x06f162ae) /* 0.433932001 */, 18 },
+  /* 6195 */  { MAD_F(0x06f1c4a1) /* 0.434025413 */, 18 },
+  /* 6196 */  { MAD_F(0x06f22696) /* 0.434118830 */, 18 },
+  /* 6197 */  { MAD_F(0x06f2888b) /* 0.434212251 */, 18 },
+  /* 6198 */  { MAD_F(0x06f2ea82) /* 0.434305678 */, 18 },
+  /* 6199 */  { MAD_F(0x06f34c7b) /* 0.434399110 */, 18 },
+  /* 6200 */  { MAD_F(0x06f3ae75) /* 0.434492546 */, 18 },
+  /* 6201 */  { MAD_F(0x06f41070) /* 0.434585988 */, 18 },
+  /* 6202 */  { MAD_F(0x06f4726c) /* 0.434679435 */, 18 },
+  /* 6203 */  { MAD_F(0x06f4d46a) /* 0.434772887 */, 18 },
+  /* 6204 */  { MAD_F(0x06f53669) /* 0.434866344 */, 18 },
+  /* 6205 */  { MAD_F(0x06f59869) /* 0.434959806 */, 18 },
+  /* 6206 */  { MAD_F(0x06f5fa6b) /* 0.435053272 */, 18 },
+  /* 6207 */  { MAD_F(0x06f65c6e) /* 0.435146744 */, 18 },
+
+  /* 6208 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 18 },
+  /* 6209 */  { MAD_F(0x06f72079) /* 0.435333703 */, 18 },
+  /* 6210 */  { MAD_F(0x06f78280) /* 0.435427190 */, 18 },
+  /* 6211 */  { MAD_F(0x06f7e489) /* 0.435520682 */, 18 },
+  /* 6212 */  { MAD_F(0x06f84693) /* 0.435614179 */, 18 },
+  /* 6213 */  { MAD_F(0x06f8a89e) /* 0.435707681 */, 18 },
+  /* 6214 */  { MAD_F(0x06f90aaa) /* 0.435801188 */, 18 },
+  /* 6215 */  { MAD_F(0x06f96cb8) /* 0.435894700 */, 18 },
+  /* 6216 */  { MAD_F(0x06f9cec8) /* 0.435988217 */, 18 },
+  /* 6217 */  { MAD_F(0x06fa30d8) /* 0.436081739 */, 18 },
+  /* 6218 */  { MAD_F(0x06fa92ea) /* 0.436175266 */, 18 },
+  /* 6219 */  { MAD_F(0x06faf4fe) /* 0.436268799 */, 18 },
+  /* 6220 */  { MAD_F(0x06fb5712) /* 0.436362336 */, 18 },
+  /* 6221 */  { MAD_F(0x06fbb928) /* 0.436455878 */, 18 },
+  /* 6222 */  { MAD_F(0x06fc1b40) /* 0.436549425 */, 18 },
+  /* 6223 */  { MAD_F(0x06fc7d58) /* 0.436642977 */, 18 },
+
+  /* 6224 */  { MAD_F(0x06fcdf72) /* 0.436736534 */, 18 },
+  /* 6225 */  { MAD_F(0x06fd418e) /* 0.436830096 */, 18 },
+  /* 6226 */  { MAD_F(0x06fda3ab) /* 0.436923664 */, 18 },
+  /* 6227 */  { MAD_F(0x06fe05c9) /* 0.437017236 */, 18 },
+  /* 6228 */  { MAD_F(0x06fe67e8) /* 0.437110813 */, 18 },
+  /* 6229 */  { MAD_F(0x06feca09) /* 0.437204395 */, 18 },
+  /* 6230 */  { MAD_F(0x06ff2c2b) /* 0.437297982 */, 18 },
+  /* 6231 */  { MAD_F(0x06ff8e4f) /* 0.437391575 */, 18 },
+  /* 6232 */  { MAD_F(0x06fff073) /* 0.437485172 */, 18 },
+  /* 6233 */  { MAD_F(0x0700529a) /* 0.437578774 */, 18 },
+  /* 6234 */  { MAD_F(0x0700b4c1) /* 0.437672381 */, 18 },
+  /* 6235 */  { MAD_F(0x070116ea) /* 0.437765994 */, 18 },
+  /* 6236 */  { MAD_F(0x07017914) /* 0.437859611 */, 18 },
+  /* 6237 */  { MAD_F(0x0701db40) /* 0.437953233 */, 18 },
+  /* 6238 */  { MAD_F(0x07023d6c) /* 0.438046860 */, 18 },
+  /* 6239 */  { MAD_F(0x07029f9b) /* 0.438140493 */, 18 },
+
+  /* 6240 */  { MAD_F(0x070301ca) /* 0.438234130 */, 18 },
+  /* 6241 */  { MAD_F(0x070363fb) /* 0.438327772 */, 18 },
+  /* 6242 */  { MAD_F(0x0703c62d) /* 0.438421419 */, 18 },
+  /* 6243 */  { MAD_F(0x07042861) /* 0.438515072 */, 18 },
+  /* 6244 */  { MAD_F(0x07048a96) /* 0.438608729 */, 18 },
+  /* 6245 */  { MAD_F(0x0704eccc) /* 0.438702391 */, 18 },
+  /* 6246 */  { MAD_F(0x07054f04) /* 0.438796059 */, 18 },
+  /* 6247 */  { MAD_F(0x0705b13d) /* 0.438889731 */, 18 },
+  /* 6248 */  { MAD_F(0x07061377) /* 0.438983408 */, 18 },
+  /* 6249 */  { MAD_F(0x070675b3) /* 0.439077090 */, 18 },
+  /* 6250 */  { MAD_F(0x0706d7f0) /* 0.439170778 */, 18 },
+  /* 6251 */  { MAD_F(0x07073a2e) /* 0.439264470 */, 18 },
+  /* 6252 */  { MAD_F(0x07079c6e) /* 0.439358167 */, 18 },
+  /* 6253 */  { MAD_F(0x0707feaf) /* 0.439451869 */, 18 },
+  /* 6254 */  { MAD_F(0x070860f1) /* 0.439545577 */, 18 },
+  /* 6255 */  { MAD_F(0x0708c335) /* 0.439639289 */, 18 },
+
+  /* 6256 */  { MAD_F(0x0709257a) /* 0.439733006 */, 18 },
+  /* 6257 */  { MAD_F(0x070987c0) /* 0.439826728 */, 18 },
+  /* 6258 */  { MAD_F(0x0709ea08) /* 0.439920456 */, 18 },
+  /* 6259 */  { MAD_F(0x070a4c51) /* 0.440014188 */, 18 },
+  /* 6260 */  { MAD_F(0x070aae9b) /* 0.440107925 */, 18 },
+  /* 6261 */  { MAD_F(0x070b10e7) /* 0.440201667 */, 18 },
+  /* 6262 */  { MAD_F(0x070b7334) /* 0.440295414 */, 18 },
+  /* 6263 */  { MAD_F(0x070bd583) /* 0.440389167 */, 18 },
+  /* 6264 */  { MAD_F(0x070c37d2) /* 0.440482924 */, 18 },
+  /* 6265 */  { MAD_F(0x070c9a23) /* 0.440576686 */, 18 },
+  /* 6266 */  { MAD_F(0x070cfc76) /* 0.440670453 */, 18 },
+  /* 6267 */  { MAD_F(0x070d5eca) /* 0.440764225 */, 18 },
+  /* 6268 */  { MAD_F(0x070dc11f) /* 0.440858002 */, 18 },
+  /* 6269 */  { MAD_F(0x070e2375) /* 0.440951784 */, 18 },
+  /* 6270 */  { MAD_F(0x070e85cd) /* 0.441045572 */, 18 },
+  /* 6271 */  { MAD_F(0x070ee826) /* 0.441139364 */, 18 },
+
+  /* 6272 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 18 },
+  /* 6273 */  { MAD_F(0x070facdc) /* 0.441326963 */, 18 },
+  /* 6274 */  { MAD_F(0x07100f39) /* 0.441420770 */, 18 },
+  /* 6275 */  { MAD_F(0x07107198) /* 0.441514582 */, 18 },
+  /* 6276 */  { MAD_F(0x0710d3f8) /* 0.441608399 */, 18 },
+  /* 6277 */  { MAD_F(0x07113659) /* 0.441702221 */, 18 },
+  /* 6278 */  { MAD_F(0x071198bb) /* 0.441796048 */, 18 },
+  /* 6279 */  { MAD_F(0x0711fb1f) /* 0.441889880 */, 18 },
+  /* 6280 */  { MAD_F(0x07125d84) /* 0.441983717 */, 18 },
+  /* 6281 */  { MAD_F(0x0712bfeb) /* 0.442077559 */, 18 },
+  /* 6282 */  { MAD_F(0x07132253) /* 0.442171406 */, 18 },
+  /* 6283 */  { MAD_F(0x071384bc) /* 0.442265257 */, 18 },
+  /* 6284 */  { MAD_F(0x0713e726) /* 0.442359114 */, 18 },
+  /* 6285 */  { MAD_F(0x07144992) /* 0.442452976 */, 18 },
+  /* 6286 */  { MAD_F(0x0714abff) /* 0.442546843 */, 18 },
+  /* 6287 */  { MAD_F(0x07150e6e) /* 0.442640715 */, 18 },
+
+  /* 6288 */  { MAD_F(0x071570de) /* 0.442734592 */, 18 },
+  /* 6289 */  { MAD_F(0x0715d34f) /* 0.442828473 */, 18 },
+  /* 6290 */  { MAD_F(0x071635c1) /* 0.442922360 */, 18 },
+  /* 6291 */  { MAD_F(0x07169835) /* 0.443016252 */, 18 },
+  /* 6292 */  { MAD_F(0x0716faaa) /* 0.443110148 */, 18 },
+  /* 6293 */  { MAD_F(0x07175d21) /* 0.443204050 */, 18 },
+  /* 6294 */  { MAD_F(0x0717bf99) /* 0.443297957 */, 18 },
+  /* 6295 */  { MAD_F(0x07182212) /* 0.443391868 */, 18 },
+  /* 6296 */  { MAD_F(0x0718848d) /* 0.443485785 */, 18 },
+  /* 6297 */  { MAD_F(0x0718e709) /* 0.443579706 */, 18 },
+  /* 6298 */  { MAD_F(0x07194986) /* 0.443673633 */, 18 },
+  /* 6299 */  { MAD_F(0x0719ac04) /* 0.443767564 */, 18 },
+  /* 6300 */  { MAD_F(0x071a0e84) /* 0.443861501 */, 18 },
+  /* 6301 */  { MAD_F(0x071a7105) /* 0.443955442 */, 18 },
+  /* 6302 */  { MAD_F(0x071ad388) /* 0.444049389 */, 18 },
+  /* 6303 */  { MAD_F(0x071b360c) /* 0.444143340 */, 18 },
+
+  /* 6304 */  { MAD_F(0x071b9891) /* 0.444237296 */, 18 },
+  /* 6305 */  { MAD_F(0x071bfb18) /* 0.444331258 */, 18 },
+  /* 6306 */  { MAD_F(0x071c5d9f) /* 0.444425224 */, 18 },
+  /* 6307 */  { MAD_F(0x071cc029) /* 0.444519195 */, 18 },
+  /* 6308 */  { MAD_F(0x071d22b3) /* 0.444613171 */, 18 },
+  /* 6309 */  { MAD_F(0x071d853f) /* 0.444707153 */, 18 },
+  /* 6310 */  { MAD_F(0x071de7cc) /* 0.444801139 */, 18 },
+  /* 6311 */  { MAD_F(0x071e4a5b) /* 0.444895130 */, 18 },
+  /* 6312 */  { MAD_F(0x071eaceb) /* 0.444989126 */, 18 },
+  /* 6313 */  { MAD_F(0x071f0f7c) /* 0.445083127 */, 18 },
+  /* 6314 */  { MAD_F(0x071f720e) /* 0.445177133 */, 18 },
+  /* 6315 */  { MAD_F(0x071fd4a2) /* 0.445271144 */, 18 },
+  /* 6316 */  { MAD_F(0x07203737) /* 0.445365160 */, 18 },
+  /* 6317 */  { MAD_F(0x072099ce) /* 0.445459181 */, 18 },
+  /* 6318 */  { MAD_F(0x0720fc66) /* 0.445553206 */, 18 },
+  /* 6319 */  { MAD_F(0x07215eff) /* 0.445647237 */, 18 },
+
+  /* 6320 */  { MAD_F(0x0721c19a) /* 0.445741273 */, 18 },
+  /* 6321 */  { MAD_F(0x07222436) /* 0.445835314 */, 18 },
+  /* 6322 */  { MAD_F(0x072286d3) /* 0.445929359 */, 18 },
+  /* 6323 */  { MAD_F(0x0722e971) /* 0.446023410 */, 18 },
+  /* 6324 */  { MAD_F(0x07234c11) /* 0.446117466 */, 18 },
+  /* 6325 */  { MAD_F(0x0723aeb2) /* 0.446211526 */, 18 },
+  /* 6326 */  { MAD_F(0x07241155) /* 0.446305592 */, 18 },
+  /* 6327 */  { MAD_F(0x072473f9) /* 0.446399662 */, 18 },
+  /* 6328 */  { MAD_F(0x0724d69e) /* 0.446493738 */, 18 },
+  /* 6329 */  { MAD_F(0x07253944) /* 0.446587818 */, 18 },
+  /* 6330 */  { MAD_F(0x07259bec) /* 0.446681903 */, 18 },
+  /* 6331 */  { MAD_F(0x0725fe95) /* 0.446775994 */, 18 },
+  /* 6332 */  { MAD_F(0x07266140) /* 0.446870089 */, 18 },
+  /* 6333 */  { MAD_F(0x0726c3ec) /* 0.446964189 */, 18 },
+  /* 6334 */  { MAD_F(0x07272699) /* 0.447058294 */, 18 },
+  /* 6335 */  { MAD_F(0x07278947) /* 0.447152404 */, 18 },
+
+  /* 6336 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 18 },
+  /* 6337 */  { MAD_F(0x07284ea8) /* 0.447340639 */, 18 },
+  /* 6338 */  { MAD_F(0x0728b15b) /* 0.447434764 */, 18 },
+  /* 6339 */  { MAD_F(0x0729140f) /* 0.447528894 */, 18 },
+  /* 6340 */  { MAD_F(0x072976c4) /* 0.447623029 */, 18 },
+  /* 6341 */  { MAD_F(0x0729d97a) /* 0.447717169 */, 18 },
+  /* 6342 */  { MAD_F(0x072a3c32) /* 0.447811314 */, 18 },
+  /* 6343 */  { MAD_F(0x072a9eeb) /* 0.447905463 */, 18 },
+  /* 6344 */  { MAD_F(0x072b01a6) /* 0.447999618 */, 18 },
+  /* 6345 */  { MAD_F(0x072b6461) /* 0.448093778 */, 18 },
+  /* 6346 */  { MAD_F(0x072bc71e) /* 0.448187942 */, 18 },
+  /* 6347 */  { MAD_F(0x072c29dd) /* 0.448282112 */, 18 },
+  /* 6348 */  { MAD_F(0x072c8c9d) /* 0.448376286 */, 18 },
+  /* 6349 */  { MAD_F(0x072cef5e) /* 0.448470466 */, 18 },
+  /* 6350 */  { MAD_F(0x072d5220) /* 0.448564650 */, 18 },
+  /* 6351 */  { MAD_F(0x072db4e4) /* 0.448658839 */, 18 },
+
+  /* 6352 */  { MAD_F(0x072e17a9) /* 0.448753033 */, 18 },
+  /* 6353 */  { MAD_F(0x072e7a6f) /* 0.448847233 */, 18 },
+  /* 6354 */  { MAD_F(0x072edd37) /* 0.448941437 */, 18 },
+  /* 6355 */  { MAD_F(0x072f4000) /* 0.449035646 */, 18 },
+  /* 6356 */  { MAD_F(0x072fa2ca) /* 0.449129860 */, 18 },
+  /* 6357 */  { MAD_F(0x07300596) /* 0.449224079 */, 18 },
+  /* 6358 */  { MAD_F(0x07306863) /* 0.449318303 */, 18 },
+  /* 6359 */  { MAD_F(0x0730cb32) /* 0.449412531 */, 18 },
+  /* 6360 */  { MAD_F(0x07312e01) /* 0.449506765 */, 18 },
+  /* 6361 */  { MAD_F(0x073190d2) /* 0.449601004 */, 18 },
+  /* 6362 */  { MAD_F(0x0731f3a5) /* 0.449695247 */, 18 },
+  /* 6363 */  { MAD_F(0x07325678) /* 0.449789496 */, 18 },
+  /* 6364 */  { MAD_F(0x0732b94d) /* 0.449883749 */, 18 },
+  /* 6365 */  { MAD_F(0x07331c23) /* 0.449978008 */, 18 },
+  /* 6366 */  { MAD_F(0x07337efb) /* 0.450072271 */, 18 },
+  /* 6367 */  { MAD_F(0x0733e1d4) /* 0.450166540 */, 18 },
+
+  /* 6368 */  { MAD_F(0x073444ae) /* 0.450260813 */, 18 },
+  /* 6369 */  { MAD_F(0x0734a78a) /* 0.450355091 */, 18 },
+  /* 6370 */  { MAD_F(0x07350a67) /* 0.450449374 */, 18 },
+  /* 6371 */  { MAD_F(0x07356d45) /* 0.450543662 */, 18 },
+  /* 6372 */  { MAD_F(0x0735d025) /* 0.450637955 */, 18 },
+  /* 6373 */  { MAD_F(0x07363306) /* 0.450732253 */, 18 },
+  /* 6374 */  { MAD_F(0x073695e8) /* 0.450826556 */, 18 },
+  /* 6375 */  { MAD_F(0x0736f8cb) /* 0.450920864 */, 18 },
+  /* 6376 */  { MAD_F(0x07375bb0) /* 0.451015176 */, 18 },
+  /* 6377 */  { MAD_F(0x0737be96) /* 0.451109494 */, 18 },
+  /* 6378 */  { MAD_F(0x0738217e) /* 0.451203817 */, 18 },
+  /* 6379 */  { MAD_F(0x07388467) /* 0.451298144 */, 18 },
+  /* 6380 */  { MAD_F(0x0738e751) /* 0.451392477 */, 18 },
+  /* 6381 */  { MAD_F(0x07394a3d) /* 0.451486814 */, 18 },
+  /* 6382 */  { MAD_F(0x0739ad29) /* 0.451581156 */, 18 },
+  /* 6383 */  { MAD_F(0x073a1017) /* 0.451675503 */, 18 },
+
+  /* 6384 */  { MAD_F(0x073a7307) /* 0.451769856 */, 18 },
+  /* 6385 */  { MAD_F(0x073ad5f8) /* 0.451864213 */, 18 },
+  /* 6386 */  { MAD_F(0x073b38ea) /* 0.451958575 */, 18 },
+  /* 6387 */  { MAD_F(0x073b9bdd) /* 0.452052942 */, 18 },
+  /* 6388 */  { MAD_F(0x073bfed2) /* 0.452147313 */, 18 },
+  /* 6389 */  { MAD_F(0x073c61c8) /* 0.452241690 */, 18 },
+  /* 6390 */  { MAD_F(0x073cc4bf) /* 0.452336072 */, 18 },
+  /* 6391 */  { MAD_F(0x073d27b8) /* 0.452430458 */, 18 },
+  /* 6392 */  { MAD_F(0x073d8ab2) /* 0.452524850 */, 18 },
+  /* 6393 */  { MAD_F(0x073dedae) /* 0.452619246 */, 18 },
+  /* 6394 */  { MAD_F(0x073e50aa) /* 0.452713648 */, 18 },
+  /* 6395 */  { MAD_F(0x073eb3a8) /* 0.452808054 */, 18 },
+  /* 6396 */  { MAD_F(0x073f16a8) /* 0.452902465 */, 18 },
+  /* 6397 */  { MAD_F(0x073f79a8) /* 0.452996882 */, 18 },
+  /* 6398 */  { MAD_F(0x073fdcaa) /* 0.453091303 */, 18 },
+  /* 6399 */  { MAD_F(0x07403fad) /* 0.453185729 */, 18 },
+
+  /* 6400 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 18 },
+  /* 6401 */  { MAD_F(0x074105b8) /* 0.453374595 */, 18 },
+  /* 6402 */  { MAD_F(0x074168bf) /* 0.453469036 */, 18 },
+  /* 6403 */  { MAD_F(0x0741cbc8) /* 0.453563482 */, 18 },
+  /* 6404 */  { MAD_F(0x07422ed2) /* 0.453657932 */, 18 },
+  /* 6405 */  { MAD_F(0x074291dd) /* 0.453752388 */, 18 },
+  /* 6406 */  { MAD_F(0x0742f4e9) /* 0.453846848 */, 18 },
+  /* 6407 */  { MAD_F(0x074357f7) /* 0.453941314 */, 18 },
+  /* 6408 */  { MAD_F(0x0743bb06) /* 0.454035784 */, 18 },
+  /* 6409 */  { MAD_F(0x07441e17) /* 0.454130259 */, 18 },
+  /* 6410 */  { MAD_F(0x07448129) /* 0.454224739 */, 18 },
+  /* 6411 */  { MAD_F(0x0744e43c) /* 0.454319224 */, 18 },
+  /* 6412 */  { MAD_F(0x07454750) /* 0.454413714 */, 18 },
+  /* 6413 */  { MAD_F(0x0745aa66) /* 0.454508209 */, 18 },
+  /* 6414 */  { MAD_F(0x07460d7d) /* 0.454602708 */, 18 },
+  /* 6415 */  { MAD_F(0x07467095) /* 0.454697213 */, 18 },
+
+  /* 6416 */  { MAD_F(0x0746d3af) /* 0.454791723 */, 18 },
+  /* 6417 */  { MAD_F(0x074736ca) /* 0.454886237 */, 18 },
+  /* 6418 */  { MAD_F(0x074799e7) /* 0.454980756 */, 18 },
+  /* 6419 */  { MAD_F(0x0747fd04) /* 0.455075281 */, 18 },
+  /* 6420 */  { MAD_F(0x07486023) /* 0.455169810 */, 18 },
+  /* 6421 */  { MAD_F(0x0748c344) /* 0.455264344 */, 18 },
+  /* 6422 */  { MAD_F(0x07492665) /* 0.455358883 */, 18 },
+  /* 6423 */  { MAD_F(0x07498988) /* 0.455453427 */, 18 },
+  /* 6424 */  { MAD_F(0x0749ecac) /* 0.455547976 */, 18 },
+  /* 6425 */  { MAD_F(0x074a4fd2) /* 0.455642529 */, 18 },
+  /* 6426 */  { MAD_F(0x074ab2f9) /* 0.455737088 */, 18 },
+  /* 6427 */  { MAD_F(0x074b1621) /* 0.455831652 */, 18 },
+  /* 6428 */  { MAD_F(0x074b794b) /* 0.455926220 */, 18 },
+  /* 6429 */  { MAD_F(0x074bdc75) /* 0.456020793 */, 18 },
+  /* 6430 */  { MAD_F(0x074c3fa1) /* 0.456115372 */, 18 },
+  /* 6431 */  { MAD_F(0x074ca2cf) /* 0.456209955 */, 18 },
+
+  /* 6432 */  { MAD_F(0x074d05fe) /* 0.456304543 */, 18 },
+  /* 6433 */  { MAD_F(0x074d692e) /* 0.456399136 */, 18 },
+  /* 6434 */  { MAD_F(0x074dcc5f) /* 0.456493733 */, 18 },
+  /* 6435 */  { MAD_F(0x074e2f92) /* 0.456588336 */, 18 },
+  /* 6436 */  { MAD_F(0x074e92c6) /* 0.456682944 */, 18 },
+  /* 6437 */  { MAD_F(0x074ef5fb) /* 0.456777556 */, 18 },
+  /* 6438 */  { MAD_F(0x074f5932) /* 0.456872174 */, 18 },
+  /* 6439 */  { MAD_F(0x074fbc6a) /* 0.456966796 */, 18 },
+  /* 6440 */  { MAD_F(0x07501fa3) /* 0.457061423 */, 18 },
+  /* 6441 */  { MAD_F(0x075082de) /* 0.457156056 */, 18 },
+  /* 6442 */  { MAD_F(0x0750e61a) /* 0.457250693 */, 18 },
+  /* 6443 */  { MAD_F(0x07514957) /* 0.457345335 */, 18 },
+  /* 6444 */  { MAD_F(0x0751ac96) /* 0.457439981 */, 18 },
+  /* 6445 */  { MAD_F(0x07520fd6) /* 0.457534633 */, 18 },
+  /* 6446 */  { MAD_F(0x07527317) /* 0.457629290 */, 18 },
+  /* 6447 */  { MAD_F(0x0752d659) /* 0.457723951 */, 18 },
+
+  /* 6448 */  { MAD_F(0x0753399d) /* 0.457818618 */, 18 },
+  /* 6449 */  { MAD_F(0x07539ce2) /* 0.457913289 */, 18 },
+  /* 6450 */  { MAD_F(0x07540029) /* 0.458007965 */, 18 },
+  /* 6451 */  { MAD_F(0x07546371) /* 0.458102646 */, 18 },
+  /* 6452 */  { MAD_F(0x0754c6ba) /* 0.458197332 */, 18 },
+  /* 6453 */  { MAD_F(0x07552a04) /* 0.458292023 */, 18 },
+  /* 6454 */  { MAD_F(0x07558d50) /* 0.458386719 */, 18 },
+  /* 6455 */  { MAD_F(0x0755f09d) /* 0.458481420 */, 18 },
+  /* 6456 */  { MAD_F(0x075653eb) /* 0.458576125 */, 18 },
+  /* 6457 */  { MAD_F(0x0756b73b) /* 0.458670836 */, 18 },
+  /* 6458 */  { MAD_F(0x07571a8c) /* 0.458765551 */, 18 },
+  /* 6459 */  { MAD_F(0x07577dde) /* 0.458860271 */, 18 },
+  /* 6460 */  { MAD_F(0x0757e131) /* 0.458954996 */, 18 },
+  /* 6461 */  { MAD_F(0x07584486) /* 0.459049726 */, 18 },
+  /* 6462 */  { MAD_F(0x0758a7dd) /* 0.459144461 */, 18 },
+  /* 6463 */  { MAD_F(0x07590b34) /* 0.459239201 */, 18 },
+
+  /* 6464 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 18 },
+  /* 6465 */  { MAD_F(0x0759d1e7) /* 0.459428695 */, 18 },
+  /* 6466 */  { MAD_F(0x075a3542) /* 0.459523450 */, 18 },
+  /* 6467 */  { MAD_F(0x075a989f) /* 0.459618209 */, 18 },
+  /* 6468 */  { MAD_F(0x075afbfd) /* 0.459712973 */, 18 },
+  /* 6469 */  { MAD_F(0x075b5f5d) /* 0.459807742 */, 18 },
+  /* 6470 */  { MAD_F(0x075bc2bd) /* 0.459902516 */, 18 },
+  /* 6471 */  { MAD_F(0x075c261f) /* 0.459997295 */, 18 },
+  /* 6472 */  { MAD_F(0x075c8983) /* 0.460092079 */, 18 },
+  /* 6473 */  { MAD_F(0x075cece7) /* 0.460186867 */, 18 },
+  /* 6474 */  { MAD_F(0x075d504d) /* 0.460281661 */, 18 },
+  /* 6475 */  { MAD_F(0x075db3b5) /* 0.460376459 */, 18 },
+  /* 6476 */  { MAD_F(0x075e171d) /* 0.460471262 */, 18 },
+  /* 6477 */  { MAD_F(0x075e7a87) /* 0.460566071 */, 18 },
+  /* 6478 */  { MAD_F(0x075eddf2) /* 0.460660884 */, 18 },
+  /* 6479 */  { MAD_F(0x075f415f) /* 0.460755701 */, 18 },
+
+  /* 6480 */  { MAD_F(0x075fa4cc) /* 0.460850524 */, 18 },
+  /* 6481 */  { MAD_F(0x0760083b) /* 0.460945352 */, 18 },
+  /* 6482 */  { MAD_F(0x07606bac) /* 0.461040184 */, 18 },
+  /* 6483 */  { MAD_F(0x0760cf1e) /* 0.461135022 */, 18 },
+  /* 6484 */  { MAD_F(0x07613291) /* 0.461229864 */, 18 },
+  /* 6485 */  { MAD_F(0x07619605) /* 0.461324711 */, 18 },
+  /* 6486 */  { MAD_F(0x0761f97b) /* 0.461419563 */, 18 },
+  /* 6487 */  { MAD_F(0x07625cf2) /* 0.461514420 */, 18 },
+  /* 6488 */  { MAD_F(0x0762c06a) /* 0.461609282 */, 18 },
+  /* 6489 */  { MAD_F(0x076323e3) /* 0.461704149 */, 18 },
+  /* 6490 */  { MAD_F(0x0763875e) /* 0.461799020 */, 18 },
+  /* 6491 */  { MAD_F(0x0763eadb) /* 0.461893897 */, 18 },
+  /* 6492 */  { MAD_F(0x07644e58) /* 0.461988778 */, 18 },
+  /* 6493 */  { MAD_F(0x0764b1d7) /* 0.462083664 */, 18 },
+  /* 6494 */  { MAD_F(0x07651557) /* 0.462178555 */, 18 },
+  /* 6495 */  { MAD_F(0x076578d8) /* 0.462273451 */, 18 },
+
+  /* 6496 */  { MAD_F(0x0765dc5b) /* 0.462368352 */, 18 },
+  /* 6497 */  { MAD_F(0x07663fdf) /* 0.462463257 */, 18 },
+  /* 6498 */  { MAD_F(0x0766a364) /* 0.462558168 */, 18 },
+  /* 6499 */  { MAD_F(0x076706eb) /* 0.462653083 */, 18 },
+  /* 6500 */  { MAD_F(0x07676a73) /* 0.462748003 */, 18 },
+  /* 6501 */  { MAD_F(0x0767cdfc) /* 0.462842928 */, 18 },
+  /* 6502 */  { MAD_F(0x07683187) /* 0.462937858 */, 18 },
+  /* 6503 */  { MAD_F(0x07689513) /* 0.463032793 */, 18 },
+  /* 6504 */  { MAD_F(0x0768f8a0) /* 0.463127733 */, 18 },
+  /* 6505 */  { MAD_F(0x07695c2e) /* 0.463222678 */, 18 },
+  /* 6506 */  { MAD_F(0x0769bfbe) /* 0.463317627 */, 18 },
+  /* 6507 */  { MAD_F(0x076a234f) /* 0.463412581 */, 18 },
+  /* 6508 */  { MAD_F(0x076a86e2) /* 0.463507540 */, 18 },
+  /* 6509 */  { MAD_F(0x076aea75) /* 0.463602504 */, 18 },
+  /* 6510 */  { MAD_F(0x076b4e0a) /* 0.463697473 */, 18 },
+  /* 6511 */  { MAD_F(0x076bb1a1) /* 0.463792447 */, 18 },
+
+  /* 6512 */  { MAD_F(0x076c1538) /* 0.463887426 */, 18 },
+  /* 6513 */  { MAD_F(0x076c78d1) /* 0.463982409 */, 18 },
+  /* 6514 */  { MAD_F(0x076cdc6c) /* 0.464077398 */, 18 },
+  /* 6515 */  { MAD_F(0x076d4007) /* 0.464172391 */, 18 },
+  /* 6516 */  { MAD_F(0x076da3a4) /* 0.464267389 */, 18 },
+  /* 6517 */  { MAD_F(0x076e0742) /* 0.464362392 */, 18 },
+  /* 6518 */  { MAD_F(0x076e6ae2) /* 0.464457399 */, 18 },
+  /* 6519 */  { MAD_F(0x076ece82) /* 0.464552412 */, 18 },
+  /* 6520 */  { MAD_F(0x076f3224) /* 0.464647430 */, 18 },
+  /* 6521 */  { MAD_F(0x076f95c8) /* 0.464742452 */, 18 },
+  /* 6522 */  { MAD_F(0x076ff96c) /* 0.464837479 */, 18 },
+  /* 6523 */  { MAD_F(0x07705d12) /* 0.464932511 */, 18 },
+  /* 6524 */  { MAD_F(0x0770c0ba) /* 0.465027548 */, 18 },
+  /* 6525 */  { MAD_F(0x07712462) /* 0.465122590 */, 18 },
+  /* 6526 */  { MAD_F(0x0771880c) /* 0.465217637 */, 18 },
+  /* 6527 */  { MAD_F(0x0771ebb7) /* 0.465312688 */, 18 },
+
+  /* 6528 */  { MAD_F(0x07724f64) /* 0.465407744 */, 18 },
+  /* 6529 */  { MAD_F(0x0772b312) /* 0.465502806 */, 18 },
+  /* 6530 */  { MAD_F(0x077316c1) /* 0.465597872 */, 18 },
+  /* 6531 */  { MAD_F(0x07737a71) /* 0.465692943 */, 18 },
+  /* 6532 */  { MAD_F(0x0773de23) /* 0.465788018 */, 18 },
+  /* 6533 */  { MAD_F(0x077441d6) /* 0.465883099 */, 18 },
+  /* 6534 */  { MAD_F(0x0774a58a) /* 0.465978184 */, 18 },
+  /* 6535 */  { MAD_F(0x07750940) /* 0.466073275 */, 18 },
+  /* 6536 */  { MAD_F(0x07756cf7) /* 0.466168370 */, 18 },
+  /* 6537 */  { MAD_F(0x0775d0af) /* 0.466263470 */, 18 },
+  /* 6538 */  { MAD_F(0x07763468) /* 0.466358575 */, 18 },
+  /* 6539 */  { MAD_F(0x07769823) /* 0.466453684 */, 18 },
+  /* 6540 */  { MAD_F(0x0776fbdf) /* 0.466548799 */, 18 },
+  /* 6541 */  { MAD_F(0x07775f9d) /* 0.466643918 */, 18 },
+  /* 6542 */  { MAD_F(0x0777c35c) /* 0.466739043 */, 18 },
+  /* 6543 */  { MAD_F(0x0778271c) /* 0.466834172 */, 18 },
+
+  /* 6544 */  { MAD_F(0x07788add) /* 0.466929306 */, 18 },
+  /* 6545 */  { MAD_F(0x0778ee9f) /* 0.467024445 */, 18 },
+  /* 6546 */  { MAD_F(0x07795263) /* 0.467119588 */, 18 },
+  /* 6547 */  { MAD_F(0x0779b629) /* 0.467214737 */, 18 },
+  /* 6548 */  { MAD_F(0x077a19ef) /* 0.467309890 */, 18 },
+  /* 6549 */  { MAD_F(0x077a7db7) /* 0.467405048 */, 18 },
+  /* 6550 */  { MAD_F(0x077ae180) /* 0.467500211 */, 18 },
+  /* 6551 */  { MAD_F(0x077b454b) /* 0.467595379 */, 18 },
+  /* 6552 */  { MAD_F(0x077ba916) /* 0.467690552 */, 18 },
+  /* 6553 */  { MAD_F(0x077c0ce3) /* 0.467785729 */, 18 },
+  /* 6554 */  { MAD_F(0x077c70b2) /* 0.467880912 */, 18 },
+  /* 6555 */  { MAD_F(0x077cd481) /* 0.467976099 */, 18 },
+  /* 6556 */  { MAD_F(0x077d3852) /* 0.468071291 */, 18 },
+  /* 6557 */  { MAD_F(0x077d9c24) /* 0.468166488 */, 18 },
+  /* 6558 */  { MAD_F(0x077dfff8) /* 0.468261690 */, 18 },
+  /* 6559 */  { MAD_F(0x077e63cd) /* 0.468356896 */, 18 },
+
+  /* 6560 */  { MAD_F(0x077ec7a3) /* 0.468452108 */, 18 },
+  /* 6561 */  { MAD_F(0x077f2b7a) /* 0.468547324 */, 18 },
+  /* 6562 */  { MAD_F(0x077f8f53) /* 0.468642545 */, 18 },
+  /* 6563 */  { MAD_F(0x077ff32d) /* 0.468737771 */, 18 },
+  /* 6564 */  { MAD_F(0x07805708) /* 0.468833002 */, 18 },
+  /* 6565 */  { MAD_F(0x0780bae5) /* 0.468928237 */, 18 },
+  /* 6566 */  { MAD_F(0x07811ec3) /* 0.469023478 */, 18 },
+  /* 6567 */  { MAD_F(0x078182a2) /* 0.469118723 */, 18 },
+  /* 6568 */  { MAD_F(0x0781e683) /* 0.469213973 */, 18 },
+  /* 6569 */  { MAD_F(0x07824a64) /* 0.469309228 */, 18 },
+  /* 6570 */  { MAD_F(0x0782ae47) /* 0.469404488 */, 18 },
+  /* 6571 */  { MAD_F(0x0783122c) /* 0.469499752 */, 18 },
+  /* 6572 */  { MAD_F(0x07837612) /* 0.469595022 */, 18 },
+  /* 6573 */  { MAD_F(0x0783d9f9) /* 0.469690296 */, 18 },
+  /* 6574 */  { MAD_F(0x07843de1) /* 0.469785575 */, 18 },
+  /* 6575 */  { MAD_F(0x0784a1ca) /* 0.469880859 */, 18 },
+
+  /* 6576 */  { MAD_F(0x078505b5) /* 0.469976148 */, 18 },
+  /* 6577 */  { MAD_F(0x078569a2) /* 0.470071442 */, 18 },
+  /* 6578 */  { MAD_F(0x0785cd8f) /* 0.470166740 */, 18 },
+  /* 6579 */  { MAD_F(0x0786317e) /* 0.470262043 */, 18 },
+  /* 6580 */  { MAD_F(0x0786956e) /* 0.470357351 */, 18 },
+  /* 6581 */  { MAD_F(0x0786f95f) /* 0.470452664 */, 18 },
+  /* 6582 */  { MAD_F(0x07875d52) /* 0.470547982 */, 18 },
+  /* 6583 */  { MAD_F(0x0787c146) /* 0.470643305 */, 18 },
+  /* 6584 */  { MAD_F(0x0788253b) /* 0.470738632 */, 18 },
+  /* 6585 */  { MAD_F(0x07888932) /* 0.470833964 */, 18 },
+  /* 6586 */  { MAD_F(0x0788ed2a) /* 0.470929301 */, 18 },
+  /* 6587 */  { MAD_F(0x07895123) /* 0.471024643 */, 18 },
+  /* 6588 */  { MAD_F(0x0789b51d) /* 0.471119990 */, 18 },
+  /* 6589 */  { MAD_F(0x078a1919) /* 0.471215341 */, 18 },
+  /* 6590 */  { MAD_F(0x078a7d16) /* 0.471310698 */, 18 },
+  /* 6591 */  { MAD_F(0x078ae114) /* 0.471406059 */, 18 },
+
+  /* 6592 */  { MAD_F(0x078b4514) /* 0.471501425 */, 18 },
+  /* 6593 */  { MAD_F(0x078ba915) /* 0.471596796 */, 18 },
+  /* 6594 */  { MAD_F(0x078c0d17) /* 0.471692171 */, 18 },
+  /* 6595 */  { MAD_F(0x078c711a) /* 0.471787552 */, 18 },
+  /* 6596 */  { MAD_F(0x078cd51f) /* 0.471882937 */, 18 },
+  /* 6597 */  { MAD_F(0x078d3925) /* 0.471978327 */, 18 },
+  /* 6598 */  { MAD_F(0x078d9d2d) /* 0.472073722 */, 18 },
+  /* 6599 */  { MAD_F(0x078e0135) /* 0.472169122 */, 18 },
+  /* 6600 */  { MAD_F(0x078e653f) /* 0.472264527 */, 18 },
+  /* 6601 */  { MAD_F(0x078ec94b) /* 0.472359936 */, 18 },
+  /* 6602 */  { MAD_F(0x078f2d57) /* 0.472455350 */, 18 },
+  /* 6603 */  { MAD_F(0x078f9165) /* 0.472550769 */, 18 },
+  /* 6604 */  { MAD_F(0x078ff574) /* 0.472646193 */, 18 },
+  /* 6605 */  { MAD_F(0x07905985) /* 0.472741622 */, 18 },
+  /* 6606 */  { MAD_F(0x0790bd96) /* 0.472837055 */, 18 },
+  /* 6607 */  { MAD_F(0x079121a9) /* 0.472932493 */, 18 },
+
+  /* 6608 */  { MAD_F(0x079185be) /* 0.473027937 */, 18 },
+  /* 6609 */  { MAD_F(0x0791e9d3) /* 0.473123384 */, 18 },
+  /* 6610 */  { MAD_F(0x07924dea) /* 0.473218837 */, 18 },
+  /* 6611 */  { MAD_F(0x0792b202) /* 0.473314295 */, 18 },
+  /* 6612 */  { MAD_F(0x0793161c) /* 0.473409757 */, 18 },
+  /* 6613 */  { MAD_F(0x07937a37) /* 0.473505224 */, 18 },
+  /* 6614 */  { MAD_F(0x0793de53) /* 0.473600696 */, 18 },
+  /* 6615 */  { MAD_F(0x07944270) /* 0.473696173 */, 18 },
+  /* 6616 */  { MAD_F(0x0794a68f) /* 0.473791655 */, 18 },
+  /* 6617 */  { MAD_F(0x07950aaf) /* 0.473887141 */, 18 },
+  /* 6618 */  { MAD_F(0x07956ed0) /* 0.473982632 */, 18 },
+  /* 6619 */  { MAD_F(0x0795d2f2) /* 0.474078128 */, 18 },
+  /* 6620 */  { MAD_F(0x07963716) /* 0.474173629 */, 18 },
+  /* 6621 */  { MAD_F(0x07969b3b) /* 0.474269135 */, 18 },
+  /* 6622 */  { MAD_F(0x0796ff62) /* 0.474364645 */, 18 },
+  /* 6623 */  { MAD_F(0x07976389) /* 0.474460161 */, 18 },
+
+  /* 6624 */  { MAD_F(0x0797c7b2) /* 0.474555681 */, 18 },
+  /* 6625 */  { MAD_F(0x07982bdd) /* 0.474651205 */, 18 },
+  /* 6626 */  { MAD_F(0x07989008) /* 0.474746735 */, 18 },
+  /* 6627 */  { MAD_F(0x0798f435) /* 0.474842270 */, 18 },
+  /* 6628 */  { MAD_F(0x07995863) /* 0.474937809 */, 18 },
+  /* 6629 */  { MAD_F(0x0799bc92) /* 0.475033353 */, 18 },
+  /* 6630 */  { MAD_F(0x079a20c3) /* 0.475128902 */, 18 },
+  /* 6631 */  { MAD_F(0x079a84f5) /* 0.475224456 */, 18 },
+  /* 6632 */  { MAD_F(0x079ae929) /* 0.475320014 */, 18 },
+  /* 6633 */  { MAD_F(0x079b4d5d) /* 0.475415578 */, 18 },
+  /* 6634 */  { MAD_F(0x079bb193) /* 0.475511146 */, 18 },
+  /* 6635 */  { MAD_F(0x079c15ca) /* 0.475606719 */, 18 },
+  /* 6636 */  { MAD_F(0x079c7a03) /* 0.475702296 */, 18 },
+  /* 6637 */  { MAD_F(0x079cde3c) /* 0.475797879 */, 18 },
+  /* 6638 */  { MAD_F(0x079d4277) /* 0.475893466 */, 18 },
+  /* 6639 */  { MAD_F(0x079da6b4) /* 0.475989058 */, 18 },
+
+  /* 6640 */  { MAD_F(0x079e0af1) /* 0.476084655 */, 18 },
+  /* 6641 */  { MAD_F(0x079e6f30) /* 0.476180257 */, 18 },
+  /* 6642 */  { MAD_F(0x079ed370) /* 0.476275863 */, 18 },
+  /* 6643 */  { MAD_F(0x079f37b2) /* 0.476371475 */, 18 },
+  /* 6644 */  { MAD_F(0x079f9bf5) /* 0.476467091 */, 18 },
+  /* 6645 */  { MAD_F(0x07a00039) /* 0.476562712 */, 18 },
+  /* 6646 */  { MAD_F(0x07a0647e) /* 0.476658338 */, 18 },
+  /* 6647 */  { MAD_F(0x07a0c8c5) /* 0.476753968 */, 18 },
+  /* 6648 */  { MAD_F(0x07a12d0c) /* 0.476849603 */, 18 },
+  /* 6649 */  { MAD_F(0x07a19156) /* 0.476945243 */, 18 },
+  /* 6650 */  { MAD_F(0x07a1f5a0) /* 0.477040888 */, 18 },
+  /* 6651 */  { MAD_F(0x07a259ec) /* 0.477136538 */, 18 },
+  /* 6652 */  { MAD_F(0x07a2be39) /* 0.477232193 */, 18 },
+  /* 6653 */  { MAD_F(0x07a32287) /* 0.477327852 */, 18 },
+  /* 6654 */  { MAD_F(0x07a386d7) /* 0.477423516 */, 18 },
+  /* 6655 */  { MAD_F(0x07a3eb28) /* 0.477519185 */, 18 },
+
+  /* 6656 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 18 },
+  /* 6657 */  { MAD_F(0x07a4b3ce) /* 0.477710537 */, 18 },
+  /* 6658 */  { MAD_F(0x07a51822) /* 0.477806220 */, 18 },
+  /* 6659 */  { MAD_F(0x07a57c78) /* 0.477901908 */, 18 },
+  /* 6660 */  { MAD_F(0x07a5e0d0) /* 0.477997601 */, 18 },
+  /* 6661 */  { MAD_F(0x07a64528) /* 0.478093299 */, 18 },
+  /* 6662 */  { MAD_F(0x07a6a982) /* 0.478189001 */, 18 },
+  /* 6663 */  { MAD_F(0x07a70ddd) /* 0.478284708 */, 18 },
+  /* 6664 */  { MAD_F(0x07a7723a) /* 0.478380420 */, 18 },
+  /* 6665 */  { MAD_F(0x07a7d698) /* 0.478476137 */, 18 },
+  /* 6666 */  { MAD_F(0x07a83af7) /* 0.478571858 */, 18 },
+  /* 6667 */  { MAD_F(0x07a89f57) /* 0.478667585 */, 18 },
+  /* 6668 */  { MAD_F(0x07a903b9) /* 0.478763316 */, 18 },
+  /* 6669 */  { MAD_F(0x07a9681c) /* 0.478859052 */, 18 },
+  /* 6670 */  { MAD_F(0x07a9cc80) /* 0.478954793 */, 18 },
+  /* 6671 */  { MAD_F(0x07aa30e5) /* 0.479050538 */, 18 },
+
+  /* 6672 */  { MAD_F(0x07aa954c) /* 0.479146288 */, 18 },
+  /* 6673 */  { MAD_F(0x07aaf9b4) /* 0.479242043 */, 18 },
+  /* 6674 */  { MAD_F(0x07ab5e1e) /* 0.479337803 */, 18 },
+  /* 6675 */  { MAD_F(0x07abc288) /* 0.479433568 */, 18 },
+  /* 6676 */  { MAD_F(0x07ac26f4) /* 0.479529337 */, 18 },
+  /* 6677 */  { MAD_F(0x07ac8b61) /* 0.479625111 */, 18 },
+  /* 6678 */  { MAD_F(0x07acefd0) /* 0.479720890 */, 18 },
+  /* 6679 */  { MAD_F(0x07ad543f) /* 0.479816674 */, 18 },
+  /* 6680 */  { MAD_F(0x07adb8b0) /* 0.479912463 */, 18 },
+  /* 6681 */  { MAD_F(0x07ae1d23) /* 0.480008256 */, 18 },
+  /* 6682 */  { MAD_F(0x07ae8196) /* 0.480104054 */, 18 },
+  /* 6683 */  { MAD_F(0x07aee60b) /* 0.480199857 */, 18 },
+  /* 6684 */  { MAD_F(0x07af4a81) /* 0.480295664 */, 18 },
+  /* 6685 */  { MAD_F(0x07afaef9) /* 0.480391477 */, 18 },
+  /* 6686 */  { MAD_F(0x07b01372) /* 0.480487294 */, 18 },
+  /* 6687 */  { MAD_F(0x07b077ec) /* 0.480583116 */, 18 },
+
+  /* 6688 */  { MAD_F(0x07b0dc67) /* 0.480678943 */, 18 },
+  /* 6689 */  { MAD_F(0x07b140e4) /* 0.480774774 */, 18 },
+  /* 6690 */  { MAD_F(0x07b1a561) /* 0.480870611 */, 18 },
+  /* 6691 */  { MAD_F(0x07b209e1) /* 0.480966452 */, 18 },
+  /* 6692 */  { MAD_F(0x07b26e61) /* 0.481062298 */, 18 },
+  /* 6693 */  { MAD_F(0x07b2d2e3) /* 0.481158148 */, 18 },
+  /* 6694 */  { MAD_F(0x07b33766) /* 0.481254004 */, 18 },
+  /* 6695 */  { MAD_F(0x07b39bea) /* 0.481349864 */, 18 },
+  /* 6696 */  { MAD_F(0x07b4006f) /* 0.481445729 */, 18 },
+  /* 6697 */  { MAD_F(0x07b464f6) /* 0.481541598 */, 18 },
+  /* 6698 */  { MAD_F(0x07b4c97e) /* 0.481637473 */, 18 },
+  /* 6699 */  { MAD_F(0x07b52e08) /* 0.481733352 */, 18 },
+  /* 6700 */  { MAD_F(0x07b59292) /* 0.481829236 */, 18 },
+  /* 6701 */  { MAD_F(0x07b5f71e) /* 0.481925125 */, 18 },
+  /* 6702 */  { MAD_F(0x07b65bac) /* 0.482021019 */, 18 },
+  /* 6703 */  { MAD_F(0x07b6c03a) /* 0.482116917 */, 18 },
+
+  /* 6704 */  { MAD_F(0x07b724ca) /* 0.482212820 */, 18 },
+  /* 6705 */  { MAD_F(0x07b7895b) /* 0.482308728 */, 18 },
+  /* 6706 */  { MAD_F(0x07b7eded) /* 0.482404640 */, 18 },
+  /* 6707 */  { MAD_F(0x07b85281) /* 0.482500558 */, 18 },
+  /* 6708 */  { MAD_F(0x07b8b716) /* 0.482596480 */, 18 },
+  /* 6709 */  { MAD_F(0x07b91bac) /* 0.482692407 */, 18 },
+  /* 6710 */  { MAD_F(0x07b98044) /* 0.482788339 */, 18 },
+  /* 6711 */  { MAD_F(0x07b9e4dc) /* 0.482884275 */, 18 },
+  /* 6712 */  { MAD_F(0x07ba4976) /* 0.482980216 */, 18 },
+  /* 6713 */  { MAD_F(0x07baae12) /* 0.483076162 */, 18 },
+  /* 6714 */  { MAD_F(0x07bb12ae) /* 0.483172113 */, 18 },
+  /* 6715 */  { MAD_F(0x07bb774c) /* 0.483268069 */, 18 },
+  /* 6716 */  { MAD_F(0x07bbdbeb) /* 0.483364029 */, 18 },
+  /* 6717 */  { MAD_F(0x07bc408c) /* 0.483459994 */, 18 },
+  /* 6718 */  { MAD_F(0x07bca52d) /* 0.483555964 */, 18 },
+  /* 6719 */  { MAD_F(0x07bd09d0) /* 0.483651939 */, 18 },
+
+  /* 6720 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 18 },
+  /* 6721 */  { MAD_F(0x07bdd31a) /* 0.483843902 */, 18 },
+  /* 6722 */  { MAD_F(0x07be37c1) /* 0.483939891 */, 18 },
+  /* 6723 */  { MAD_F(0x07be9c69) /* 0.484035885 */, 18 },
+  /* 6724 */  { MAD_F(0x07bf0113) /* 0.484131883 */, 18 },
+  /* 6725 */  { MAD_F(0x07bf65bd) /* 0.484227886 */, 18 },
+  /* 6726 */  { MAD_F(0x07bfca69) /* 0.484323894 */, 18 },
+  /* 6727 */  { MAD_F(0x07c02f16) /* 0.484419907 */, 18 },
+  /* 6728 */  { MAD_F(0x07c093c5) /* 0.484515924 */, 18 },
+  /* 6729 */  { MAD_F(0x07c0f875) /* 0.484611946 */, 18 },
+  /* 6730 */  { MAD_F(0x07c15d26) /* 0.484707973 */, 18 },
+  /* 6731 */  { MAD_F(0x07c1c1d8) /* 0.484804005 */, 18 },
+  /* 6732 */  { MAD_F(0x07c2268b) /* 0.484900041 */, 18 },
+  /* 6733 */  { MAD_F(0x07c28b40) /* 0.484996083 */, 18 },
+  /* 6734 */  { MAD_F(0x07c2eff6) /* 0.485092128 */, 18 },
+  /* 6735 */  { MAD_F(0x07c354ae) /* 0.485188179 */, 18 },
+
+  /* 6736 */  { MAD_F(0x07c3b967) /* 0.485284235 */, 18 },
+  /* 6737 */  { MAD_F(0x07c41e21) /* 0.485380295 */, 18 },
+  /* 6738 */  { MAD_F(0x07c482dc) /* 0.485476360 */, 18 },
+  /* 6739 */  { MAD_F(0x07c4e798) /* 0.485572430 */, 18 },
+  /* 6740 */  { MAD_F(0x07c54c56) /* 0.485668504 */, 18 },
+  /* 6741 */  { MAD_F(0x07c5b115) /* 0.485764583 */, 18 },
+  /* 6742 */  { MAD_F(0x07c615d6) /* 0.485860667 */, 18 },
+  /* 6743 */  { MAD_F(0x07c67a97) /* 0.485956756 */, 18 },
+  /* 6744 */  { MAD_F(0x07c6df5a) /* 0.486052849 */, 18 },
+  /* 6745 */  { MAD_F(0x07c7441e) /* 0.486148948 */, 18 },
+  /* 6746 */  { MAD_F(0x07c7a8e4) /* 0.486245051 */, 18 },
+  /* 6747 */  { MAD_F(0x07c80daa) /* 0.486341158 */, 18 },
+  /* 6748 */  { MAD_F(0x07c87272) /* 0.486437271 */, 18 },
+  /* 6749 */  { MAD_F(0x07c8d73c) /* 0.486533388 */, 18 },
+  /* 6750 */  { MAD_F(0x07c93c06) /* 0.486629510 */, 18 },
+  /* 6751 */  { MAD_F(0x07c9a0d2) /* 0.486725637 */, 18 },
+
+  /* 6752 */  { MAD_F(0x07ca059f) /* 0.486821768 */, 18 },
+  /* 6753 */  { MAD_F(0x07ca6a6d) /* 0.486917905 */, 18 },
+  /* 6754 */  { MAD_F(0x07cacf3d) /* 0.487014045 */, 18 },
+  /* 6755 */  { MAD_F(0x07cb340e) /* 0.487110191 */, 18 },
+  /* 6756 */  { MAD_F(0x07cb98e0) /* 0.487206342 */, 18 },
+  /* 6757 */  { MAD_F(0x07cbfdb4) /* 0.487302497 */, 18 },
+  /* 6758 */  { MAD_F(0x07cc6288) /* 0.487398657 */, 18 },
+  /* 6759 */  { MAD_F(0x07ccc75e) /* 0.487494821 */, 18 },
+  /* 6760 */  { MAD_F(0x07cd2c36) /* 0.487590991 */, 18 },
+  /* 6761 */  { MAD_F(0x07cd910e) /* 0.487687165 */, 18 },
+  /* 6762 */  { MAD_F(0x07cdf5e8) /* 0.487783344 */, 18 },
+  /* 6763 */  { MAD_F(0x07ce5ac3) /* 0.487879528 */, 18 },
+  /* 6764 */  { MAD_F(0x07cebfa0) /* 0.487975716 */, 18 },
+  /* 6765 */  { MAD_F(0x07cf247d) /* 0.488071909 */, 18 },
+  /* 6766 */  { MAD_F(0x07cf895c) /* 0.488168107 */, 18 },
+  /* 6767 */  { MAD_F(0x07cfee3c) /* 0.488264310 */, 18 },
+
+  /* 6768 */  { MAD_F(0x07d0531e) /* 0.488360517 */, 18 },
+  /* 6769 */  { MAD_F(0x07d0b801) /* 0.488456729 */, 18 },
+  /* 6770 */  { MAD_F(0x07d11ce5) /* 0.488552946 */, 18 },
+  /* 6771 */  { MAD_F(0x07d181ca) /* 0.488649167 */, 18 },
+  /* 6772 */  { MAD_F(0x07d1e6b0) /* 0.488745394 */, 18 },
+  /* 6773 */  { MAD_F(0x07d24b98) /* 0.488841625 */, 18 },
+  /* 6774 */  { MAD_F(0x07d2b081) /* 0.488937860 */, 18 },
+  /* 6775 */  { MAD_F(0x07d3156c) /* 0.489034101 */, 18 },
+  /* 6776 */  { MAD_F(0x07d37a57) /* 0.489130346 */, 18 },
+  /* 6777 */  { MAD_F(0x07d3df44) /* 0.489226596 */, 18 },
+  /* 6778 */  { MAD_F(0x07d44432) /* 0.489322851 */, 18 },
+  /* 6779 */  { MAD_F(0x07d4a922) /* 0.489419110 */, 18 },
+  /* 6780 */  { MAD_F(0x07d50e13) /* 0.489515375 */, 18 },
+  /* 6781 */  { MAD_F(0x07d57305) /* 0.489611643 */, 18 },
+  /* 6782 */  { MAD_F(0x07d5d7f8) /* 0.489707917 */, 18 },
+  /* 6783 */  { MAD_F(0x07d63cec) /* 0.489804195 */, 18 },
+
+  /* 6784 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 18 },
+  /* 6785 */  { MAD_F(0x07d706d9) /* 0.489996766 */, 18 },
+  /* 6786 */  { MAD_F(0x07d76bd2) /* 0.490093059 */, 18 },
+  /* 6787 */  { MAD_F(0x07d7d0cb) /* 0.490189356 */, 18 },
+  /* 6788 */  { MAD_F(0x07d835c6) /* 0.490285658 */, 18 },
+  /* 6789 */  { MAD_F(0x07d89ac2) /* 0.490381965 */, 18 },
+  /* 6790 */  { MAD_F(0x07d8ffc0) /* 0.490478277 */, 18 },
+  /* 6791 */  { MAD_F(0x07d964be) /* 0.490574593 */, 18 },
+  /* 6792 */  { MAD_F(0x07d9c9be) /* 0.490670914 */, 18 },
+  /* 6793 */  { MAD_F(0x07da2ebf) /* 0.490767239 */, 18 },
+  /* 6794 */  { MAD_F(0x07da93c2) /* 0.490863570 */, 18 },
+  /* 6795 */  { MAD_F(0x07daf8c6) /* 0.490959905 */, 18 },
+  /* 6796 */  { MAD_F(0x07db5dcb) /* 0.491056245 */, 18 },
+  /* 6797 */  { MAD_F(0x07dbc2d1) /* 0.491152589 */, 18 },
+  /* 6798 */  { MAD_F(0x07dc27d9) /* 0.491248939 */, 18 },
+  /* 6799 */  { MAD_F(0x07dc8ce1) /* 0.491345293 */, 18 },
+
+  /* 6800 */  { MAD_F(0x07dcf1ec) /* 0.491441651 */, 18 },
+  /* 6801 */  { MAD_F(0x07dd56f7) /* 0.491538015 */, 18 },
+  /* 6802 */  { MAD_F(0x07ddbc04) /* 0.491634383 */, 18 },
+  /* 6803 */  { MAD_F(0x07de2111) /* 0.491730756 */, 18 },
+  /* 6804 */  { MAD_F(0x07de8621) /* 0.491827134 */, 18 },
+  /* 6805 */  { MAD_F(0x07deeb31) /* 0.491923516 */, 18 },
+  /* 6806 */  { MAD_F(0x07df5043) /* 0.492019903 */, 18 },
+  /* 6807 */  { MAD_F(0x07dfb556) /* 0.492116295 */, 18 },
+  /* 6808 */  { MAD_F(0x07e01a6a) /* 0.492212691 */, 18 },
+  /* 6809 */  { MAD_F(0x07e07f80) /* 0.492309093 */, 18 },
+  /* 6810 */  { MAD_F(0x07e0e496) /* 0.492405499 */, 18 },
+  /* 6811 */  { MAD_F(0x07e149ae) /* 0.492501909 */, 18 },
+  /* 6812 */  { MAD_F(0x07e1aec8) /* 0.492598325 */, 18 },
+  /* 6813 */  { MAD_F(0x07e213e2) /* 0.492694745 */, 18 },
+  /* 6814 */  { MAD_F(0x07e278fe) /* 0.492791170 */, 18 },
+  /* 6815 */  { MAD_F(0x07e2de1b) /* 0.492887599 */, 18 },
+
+  /* 6816 */  { MAD_F(0x07e3433a) /* 0.492984033 */, 18 },
+  /* 6817 */  { MAD_F(0x07e3a859) /* 0.493080472 */, 18 },
+  /* 6818 */  { MAD_F(0x07e40d7a) /* 0.493176916 */, 18 },
+  /* 6819 */  { MAD_F(0x07e4729c) /* 0.493273365 */, 18 },
+  /* 6820 */  { MAD_F(0x07e4d7c0) /* 0.493369818 */, 18 },
+  /* 6821 */  { MAD_F(0x07e53ce4) /* 0.493466275 */, 18 },
+  /* 6822 */  { MAD_F(0x07e5a20a) /* 0.493562738 */, 18 },
+  /* 6823 */  { MAD_F(0x07e60732) /* 0.493659205 */, 18 },
+  /* 6824 */  { MAD_F(0x07e66c5a) /* 0.493755677 */, 18 },
+  /* 6825 */  { MAD_F(0x07e6d184) /* 0.493852154 */, 18 },
+  /* 6826 */  { MAD_F(0x07e736af) /* 0.493948635 */, 18 },
+  /* 6827 */  { MAD_F(0x07e79bdb) /* 0.494045122 */, 18 },
+  /* 6828 */  { MAD_F(0x07e80109) /* 0.494141612 */, 18 },
+  /* 6829 */  { MAD_F(0x07e86638) /* 0.494238108 */, 18 },
+  /* 6830 */  { MAD_F(0x07e8cb68) /* 0.494334608 */, 18 },
+  /* 6831 */  { MAD_F(0x07e93099) /* 0.494431113 */, 18 },
+
+  /* 6832 */  { MAD_F(0x07e995cc) /* 0.494527623 */, 18 },
+  /* 6833 */  { MAD_F(0x07e9fb00) /* 0.494624137 */, 18 },
+  /* 6834 */  { MAD_F(0x07ea6035) /* 0.494720656 */, 18 },
+  /* 6835 */  { MAD_F(0x07eac56b) /* 0.494817180 */, 18 },
+  /* 6836 */  { MAD_F(0x07eb2aa3) /* 0.494913709 */, 18 },
+  /* 6837 */  { MAD_F(0x07eb8fdc) /* 0.495010242 */, 18 },
+  /* 6838 */  { MAD_F(0x07ebf516) /* 0.495106780 */, 18 },
+  /* 6839 */  { MAD_F(0x07ec5a51) /* 0.495203322 */, 18 },
+  /* 6840 */  { MAD_F(0x07ecbf8e) /* 0.495299870 */, 18 },
+  /* 6841 */  { MAD_F(0x07ed24cc) /* 0.495396422 */, 18 },
+  /* 6842 */  { MAD_F(0x07ed8a0b) /* 0.495492978 */, 18 },
+  /* 6843 */  { MAD_F(0x07edef4c) /* 0.495589540 */, 18 },
+  /* 6844 */  { MAD_F(0x07ee548e) /* 0.495686106 */, 18 },
+  /* 6845 */  { MAD_F(0x07eeb9d1) /* 0.495782677 */, 18 },
+  /* 6846 */  { MAD_F(0x07ef1f15) /* 0.495879252 */, 18 },
+  /* 6847 */  { MAD_F(0x07ef845b) /* 0.495975833 */, 18 },
+
+  /* 6848 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 18 },
+  /* 6849 */  { MAD_F(0x07f04ee9) /* 0.496169007 */, 18 },
+  /* 6850 */  { MAD_F(0x07f0b433) /* 0.496265602 */, 18 },
+  /* 6851 */  { MAD_F(0x07f1197d) /* 0.496362201 */, 18 },
+  /* 6852 */  { MAD_F(0x07f17ec9) /* 0.496458804 */, 18 },
+  /* 6853 */  { MAD_F(0x07f1e416) /* 0.496555413 */, 18 },
+  /* 6854 */  { MAD_F(0x07f24965) /* 0.496652026 */, 18 },
+  /* 6855 */  { MAD_F(0x07f2aeb5) /* 0.496748644 */, 18 },
+  /* 6856 */  { MAD_F(0x07f31405) /* 0.496845266 */, 18 },
+  /* 6857 */  { MAD_F(0x07f37958) /* 0.496941894 */, 18 },
+  /* 6858 */  { MAD_F(0x07f3deab) /* 0.497038526 */, 18 },
+  /* 6859 */  { MAD_F(0x07f44400) /* 0.497135162 */, 18 },
+  /* 6860 */  { MAD_F(0x07f4a956) /* 0.497231804 */, 18 },
+  /* 6861 */  { MAD_F(0x07f50ead) /* 0.497328450 */, 18 },
+  /* 6862 */  { MAD_F(0x07f57405) /* 0.497425100 */, 18 },
+  /* 6863 */  { MAD_F(0x07f5d95f) /* 0.497521756 */, 18 },
+
+  /* 6864 */  { MAD_F(0x07f63eba) /* 0.497618416 */, 18 },
+  /* 6865 */  { MAD_F(0x07f6a416) /* 0.497715081 */, 18 },
+  /* 6866 */  { MAD_F(0x07f70974) /* 0.497811750 */, 18 },
+  /* 6867 */  { MAD_F(0x07f76ed3) /* 0.497908425 */, 18 },
+  /* 6868 */  { MAD_F(0x07f7d433) /* 0.498005103 */, 18 },
+  /* 6869 */  { MAD_F(0x07f83994) /* 0.498101787 */, 18 },
+  /* 6870 */  { MAD_F(0x07f89ef7) /* 0.498198475 */, 18 },
+  /* 6871 */  { MAD_F(0x07f9045a) /* 0.498295168 */, 18 },
+  /* 6872 */  { MAD_F(0x07f969c0) /* 0.498391866 */, 18 },
+  /* 6873 */  { MAD_F(0x07f9cf26) /* 0.498488568 */, 18 },
+  /* 6874 */  { MAD_F(0x07fa348e) /* 0.498585275 */, 18 },
+  /* 6875 */  { MAD_F(0x07fa99f6) /* 0.498681987 */, 18 },
+  /* 6876 */  { MAD_F(0x07faff60) /* 0.498778704 */, 18 },
+  /* 6877 */  { MAD_F(0x07fb64cc) /* 0.498875425 */, 18 },
+  /* 6878 */  { MAD_F(0x07fbca38) /* 0.498972150 */, 18 },
+  /* 6879 */  { MAD_F(0x07fc2fa6) /* 0.499068881 */, 18 },
+
+  /* 6880 */  { MAD_F(0x07fc9516) /* 0.499165616 */, 18 },
+  /* 6881 */  { MAD_F(0x07fcfa86) /* 0.499262356 */, 18 },
+  /* 6882 */  { MAD_F(0x07fd5ff8) /* 0.499359101 */, 18 },
+  /* 6883 */  { MAD_F(0x07fdc56b) /* 0.499455850 */, 18 },
+  /* 6884 */  { MAD_F(0x07fe2adf) /* 0.499552604 */, 18 },
+  /* 6885 */  { MAD_F(0x07fe9054) /* 0.499649362 */, 18 },
+  /* 6886 */  { MAD_F(0x07fef5cb) /* 0.499746126 */, 18 },
+  /* 6887 */  { MAD_F(0x07ff5b43) /* 0.499842894 */, 18 },
+  /* 6888 */  { MAD_F(0x07ffc0bc) /* 0.499939666 */, 18 },
+  /* 6889 */  { MAD_F(0x0400131b) /* 0.250018222 */, 19 },
+  /* 6890 */  { MAD_F(0x040045d9) /* 0.250066613 */, 19 },
+  /* 6891 */  { MAD_F(0x04007897) /* 0.250115006 */, 19 },
+  /* 6892 */  { MAD_F(0x0400ab57) /* 0.250163402 */, 19 },
+  /* 6893 */  { MAD_F(0x0400de16) /* 0.250211800 */, 19 },
+  /* 6894 */  { MAD_F(0x040110d7) /* 0.250260200 */, 19 },
+  /* 6895 */  { MAD_F(0x04014398) /* 0.250308603 */, 19 },
+
+  /* 6896 */  { MAD_F(0x04017659) /* 0.250357008 */, 19 },
+  /* 6897 */  { MAD_F(0x0401a91c) /* 0.250405415 */, 19 },
+  /* 6898 */  { MAD_F(0x0401dbdf) /* 0.250453825 */, 19 },
+  /* 6899 */  { MAD_F(0x04020ea2) /* 0.250502237 */, 19 },
+  /* 6900 */  { MAD_F(0x04024166) /* 0.250550652 */, 19 },
+  /* 6901 */  { MAD_F(0x0402742b) /* 0.250599068 */, 19 },
+  /* 6902 */  { MAD_F(0x0402a6f0) /* 0.250647488 */, 19 },
+  /* 6903 */  { MAD_F(0x0402d9b6) /* 0.250695909 */, 19 },
+  /* 6904 */  { MAD_F(0x04030c7d) /* 0.250744333 */, 19 },
+  /* 6905 */  { MAD_F(0x04033f44) /* 0.250792759 */, 19 },
+  /* 6906 */  { MAD_F(0x0403720c) /* 0.250841187 */, 19 },
+  /* 6907 */  { MAD_F(0x0403a4d5) /* 0.250889618 */, 19 },
+  /* 6908 */  { MAD_F(0x0403d79e) /* 0.250938051 */, 19 },
+  /* 6909 */  { MAD_F(0x04040a68) /* 0.250986487 */, 19 },
+  /* 6910 */  { MAD_F(0x04043d32) /* 0.251034924 */, 19 },
+  /* 6911 */  { MAD_F(0x04046ffd) /* 0.251083365 */, 19 },
+
+  /* 6912 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 19 },
+  /* 6913 */  { MAD_F(0x0404d595) /* 0.251180252 */, 19 },
+  /* 6914 */  { MAD_F(0x04050862) /* 0.251228699 */, 19 },
+  /* 6915 */  { MAD_F(0x04053b30) /* 0.251277148 */, 19 },
+  /* 6916 */  { MAD_F(0x04056dfe) /* 0.251325600 */, 19 },
+  /* 6917 */  { MAD_F(0x0405a0cd) /* 0.251374054 */, 19 },
+  /* 6918 */  { MAD_F(0x0405d39c) /* 0.251422511 */, 19 },
+  /* 6919 */  { MAD_F(0x0406066c) /* 0.251470970 */, 19 },
+  /* 6920 */  { MAD_F(0x0406393d) /* 0.251519431 */, 19 },
+  /* 6921 */  { MAD_F(0x04066c0e) /* 0.251567894 */, 19 },
+  /* 6922 */  { MAD_F(0x04069ee0) /* 0.251616360 */, 19 },
+  /* 6923 */  { MAD_F(0x0406d1b3) /* 0.251664828 */, 19 },
+  /* 6924 */  { MAD_F(0x04070486) /* 0.251713299 */, 19 },
+  /* 6925 */  { MAD_F(0x0407375a) /* 0.251761772 */, 19 },
+  /* 6926 */  { MAD_F(0x04076a2e) /* 0.251810247 */, 19 },
+  /* 6927 */  { MAD_F(0x04079d03) /* 0.251858724 */, 19 },
+
+  /* 6928 */  { MAD_F(0x0407cfd9) /* 0.251907204 */, 19 },
+  /* 6929 */  { MAD_F(0x040802af) /* 0.251955686 */, 19 },
+  /* 6930 */  { MAD_F(0x04083586) /* 0.252004171 */, 19 },
+  /* 6931 */  { MAD_F(0x0408685e) /* 0.252052658 */, 19 },
+  /* 6932 */  { MAD_F(0x04089b36) /* 0.252101147 */, 19 },
+  /* 6933 */  { MAD_F(0x0408ce0f) /* 0.252149638 */, 19 },
+  /* 6934 */  { MAD_F(0x040900e8) /* 0.252198132 */, 19 },
+  /* 6935 */  { MAD_F(0x040933c2) /* 0.252246628 */, 19 },
+  /* 6936 */  { MAD_F(0x0409669d) /* 0.252295127 */, 19 },
+  /* 6937 */  { MAD_F(0x04099978) /* 0.252343627 */, 19 },
+  /* 6938 */  { MAD_F(0x0409cc54) /* 0.252392131 */, 19 },
+  /* 6939 */  { MAD_F(0x0409ff31) /* 0.252440636 */, 19 },
+  /* 6940 */  { MAD_F(0x040a320e) /* 0.252489144 */, 19 },
+  /* 6941 */  { MAD_F(0x040a64ec) /* 0.252537654 */, 19 },
+  /* 6942 */  { MAD_F(0x040a97cb) /* 0.252586166 */, 19 },
+  /* 6943 */  { MAD_F(0x040acaaa) /* 0.252634681 */, 19 },
+
+  /* 6944 */  { MAD_F(0x040afd89) /* 0.252683198 */, 19 },
+  /* 6945 */  { MAD_F(0x040b306a) /* 0.252731718 */, 19 },
+  /* 6946 */  { MAD_F(0x040b634b) /* 0.252780240 */, 19 },
+  /* 6947 */  { MAD_F(0x040b962c) /* 0.252828764 */, 19 },
+  /* 6948 */  { MAD_F(0x040bc90e) /* 0.252877290 */, 19 },
+  /* 6949 */  { MAD_F(0x040bfbf1) /* 0.252925819 */, 19 },
+  /* 6950 */  { MAD_F(0x040c2ed5) /* 0.252974350 */, 19 },
+  /* 6951 */  { MAD_F(0x040c61b9) /* 0.253022883 */, 19 },
+  /* 6952 */  { MAD_F(0x040c949e) /* 0.253071419 */, 19 },
+  /* 6953 */  { MAD_F(0x040cc783) /* 0.253119957 */, 19 },
+  /* 6954 */  { MAD_F(0x040cfa69) /* 0.253168498 */, 19 },
+  /* 6955 */  { MAD_F(0x040d2d4f) /* 0.253217040 */, 19 },
+  /* 6956 */  { MAD_F(0x040d6037) /* 0.253265585 */, 19 },
+  /* 6957 */  { MAD_F(0x040d931e) /* 0.253314133 */, 19 },
+  /* 6958 */  { MAD_F(0x040dc607) /* 0.253362682 */, 19 },
+  /* 6959 */  { MAD_F(0x040df8f0) /* 0.253411234 */, 19 },
+
+  /* 6960 */  { MAD_F(0x040e2bda) /* 0.253459789 */, 19 },
+  /* 6961 */  { MAD_F(0x040e5ec4) /* 0.253508345 */, 19 },
+  /* 6962 */  { MAD_F(0x040e91af) /* 0.253556904 */, 19 },
+  /* 6963 */  { MAD_F(0x040ec49b) /* 0.253605466 */, 19 },
+  /* 6964 */  { MAD_F(0x040ef787) /* 0.253654029 */, 19 },
+  /* 6965 */  { MAD_F(0x040f2a74) /* 0.253702595 */, 19 },
+  /* 6966 */  { MAD_F(0x040f5d61) /* 0.253751164 */, 19 },
+  /* 6967 */  { MAD_F(0x040f904f) /* 0.253799734 */, 19 },
+  /* 6968 */  { MAD_F(0x040fc33e) /* 0.253848307 */, 19 },
+  /* 6969 */  { MAD_F(0x040ff62d) /* 0.253896883 */, 19 },
+  /* 6970 */  { MAD_F(0x0410291d) /* 0.253945460 */, 19 },
+  /* 6971 */  { MAD_F(0x04105c0e) /* 0.253994040 */, 19 },
+  /* 6972 */  { MAD_F(0x04108eff) /* 0.254042622 */, 19 },
+  /* 6973 */  { MAD_F(0x0410c1f1) /* 0.254091207 */, 19 },
+  /* 6974 */  { MAD_F(0x0410f4e3) /* 0.254139794 */, 19 },
+  /* 6975 */  { MAD_F(0x041127d6) /* 0.254188383 */, 19 },
+
+  /* 6976 */  { MAD_F(0x04115aca) /* 0.254236974 */, 19 },
+  /* 6977 */  { MAD_F(0x04118dbe) /* 0.254285568 */, 19 },
+  /* 6978 */  { MAD_F(0x0411c0b3) /* 0.254334165 */, 19 },
+  /* 6979 */  { MAD_F(0x0411f3a9) /* 0.254382763 */, 19 },
+  /* 6980 */  { MAD_F(0x0412269f) /* 0.254431364 */, 19 },
+  /* 6981 */  { MAD_F(0x04125996) /* 0.254479967 */, 19 },
+  /* 6982 */  { MAD_F(0x04128c8d) /* 0.254528572 */, 19 },
+  /* 6983 */  { MAD_F(0x0412bf85) /* 0.254577180 */, 19 },
+  /* 6984 */  { MAD_F(0x0412f27e) /* 0.254625790 */, 19 },
+  /* 6985 */  { MAD_F(0x04132577) /* 0.254674403 */, 19 },
+  /* 6986 */  { MAD_F(0x04135871) /* 0.254723017 */, 19 },
+  /* 6987 */  { MAD_F(0x04138b6c) /* 0.254771635 */, 19 },
+  /* 6988 */  { MAD_F(0x0413be67) /* 0.254820254 */, 19 },
+  /* 6989 */  { MAD_F(0x0413f163) /* 0.254868876 */, 19 },
+  /* 6990 */  { MAD_F(0x0414245f) /* 0.254917500 */, 19 },
+  /* 6991 */  { MAD_F(0x0414575c) /* 0.254966126 */, 19 },
+
+  /* 6992 */  { MAD_F(0x04148a5a) /* 0.255014755 */, 19 },
+  /* 6993 */  { MAD_F(0x0414bd58) /* 0.255063386 */, 19 },
+  /* 6994 */  { MAD_F(0x0414f057) /* 0.255112019 */, 19 },
+  /* 6995 */  { MAD_F(0x04152356) /* 0.255160655 */, 19 },
+  /* 6996 */  { MAD_F(0x04155657) /* 0.255209292 */, 19 },
+  /* 6997 */  { MAD_F(0x04158957) /* 0.255257933 */, 19 },
+  /* 6998 */  { MAD_F(0x0415bc59) /* 0.255306575 */, 19 },
+  /* 6999 */  { MAD_F(0x0415ef5b) /* 0.255355220 */, 19 },
+  /* 7000 */  { MAD_F(0x0416225d) /* 0.255403867 */, 19 },
+  /* 7001 */  { MAD_F(0x04165561) /* 0.255452517 */, 19 },
+  /* 7002 */  { MAD_F(0x04168864) /* 0.255501169 */, 19 },
+  /* 7003 */  { MAD_F(0x0416bb69) /* 0.255549823 */, 19 },
+  /* 7004 */  { MAD_F(0x0416ee6e) /* 0.255598479 */, 19 },
+  /* 7005 */  { MAD_F(0x04172174) /* 0.255647138 */, 19 },
+  /* 7006 */  { MAD_F(0x0417547a) /* 0.255695799 */, 19 },
+  /* 7007 */  { MAD_F(0x04178781) /* 0.255744463 */, 19 },
+
+  /* 7008 */  { MAD_F(0x0417ba89) /* 0.255793128 */, 19 },
+  /* 7009 */  { MAD_F(0x0417ed91) /* 0.255841796 */, 19 },
+  /* 7010 */  { MAD_F(0x0418209a) /* 0.255890467 */, 19 },
+  /* 7011 */  { MAD_F(0x041853a3) /* 0.255939139 */, 19 },
+  /* 7012 */  { MAD_F(0x041886ad) /* 0.255987814 */, 19 },
+  /* 7013 */  { MAD_F(0x0418b9b8) /* 0.256036492 */, 19 },
+  /* 7014 */  { MAD_F(0x0418ecc3) /* 0.256085171 */, 19 },
+  /* 7015 */  { MAD_F(0x04191fcf) /* 0.256133853 */, 19 },
+  /* 7016 */  { MAD_F(0x041952dc) /* 0.256182537 */, 19 },
+  /* 7017 */  { MAD_F(0x041985e9) /* 0.256231224 */, 19 },
+  /* 7018 */  { MAD_F(0x0419b8f7) /* 0.256279913 */, 19 },
+  /* 7019 */  { MAD_F(0x0419ec05) /* 0.256328604 */, 19 },
+  /* 7020 */  { MAD_F(0x041a1f15) /* 0.256377297 */, 19 },
+  /* 7021 */  { MAD_F(0x041a5224) /* 0.256425993 */, 19 },
+  /* 7022 */  { MAD_F(0x041a8534) /* 0.256474691 */, 19 },
+  /* 7023 */  { MAD_F(0x041ab845) /* 0.256523392 */, 19 },
+
+  /* 7024 */  { MAD_F(0x041aeb57) /* 0.256572095 */, 19 },
+  /* 7025 */  { MAD_F(0x041b1e69) /* 0.256620800 */, 19 },
+  /* 7026 */  { MAD_F(0x041b517c) /* 0.256669507 */, 19 },
+  /* 7027 */  { MAD_F(0x041b848f) /* 0.256718217 */, 19 },
+  /* 7028 */  { MAD_F(0x041bb7a3) /* 0.256766929 */, 19 },
+  /* 7029 */  { MAD_F(0x041beab8) /* 0.256815643 */, 19 },
+  /* 7030 */  { MAD_F(0x041c1dcd) /* 0.256864359 */, 19 },
+  /* 7031 */  { MAD_F(0x041c50e3) /* 0.256913078 */, 19 },
+  /* 7032 */  { MAD_F(0x041c83fa) /* 0.256961800 */, 19 },
+  /* 7033 */  { MAD_F(0x041cb711) /* 0.257010523 */, 19 },
+  /* 7034 */  { MAD_F(0x041cea28) /* 0.257059249 */, 19 },
+  /* 7035 */  { MAD_F(0x041d1d41) /* 0.257107977 */, 19 },
+  /* 7036 */  { MAD_F(0x041d505a) /* 0.257156708 */, 19 },
+  /* 7037 */  { MAD_F(0x041d8373) /* 0.257205440 */, 19 },
+  /* 7038 */  { MAD_F(0x041db68e) /* 0.257254175 */, 19 },
+  /* 7039 */  { MAD_F(0x041de9a8) /* 0.257302913 */, 19 },
+
+  /* 7040 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 19 },
+  /* 7041 */  { MAD_F(0x041e4fe0) /* 0.257400394 */, 19 },
+  /* 7042 */  { MAD_F(0x041e82fd) /* 0.257449139 */, 19 },
+  /* 7043 */  { MAD_F(0x041eb61a) /* 0.257497885 */, 19 },
+  /* 7044 */  { MAD_F(0x041ee938) /* 0.257546634 */, 19 },
+  /* 7045 */  { MAD_F(0x041f1c57) /* 0.257595386 */, 19 },
+  /* 7046 */  { MAD_F(0x041f4f76) /* 0.257644139 */, 19 },
+  /* 7047 */  { MAD_F(0x041f8296) /* 0.257692895 */, 19 },
+  /* 7048 */  { MAD_F(0x041fb5b6) /* 0.257741653 */, 19 },
+  /* 7049 */  { MAD_F(0x041fe8d7) /* 0.257790414 */, 19 },
+  /* 7050 */  { MAD_F(0x04201bf9) /* 0.257839176 */, 19 },
+  /* 7051 */  { MAD_F(0x04204f1b) /* 0.257887941 */, 19 },
+  /* 7052 */  { MAD_F(0x0420823e) /* 0.257936709 */, 19 },
+  /* 7053 */  { MAD_F(0x0420b561) /* 0.257985478 */, 19 },
+  /* 7054 */  { MAD_F(0x0420e885) /* 0.258034250 */, 19 },
+  /* 7055 */  { MAD_F(0x04211baa) /* 0.258083025 */, 19 },
+
+  /* 7056 */  { MAD_F(0x04214ed0) /* 0.258131801 */, 19 },
+  /* 7057 */  { MAD_F(0x042181f6) /* 0.258180580 */, 19 },
+  /* 7058 */  { MAD_F(0x0421b51c) /* 0.258229361 */, 19 },
+  /* 7059 */  { MAD_F(0x0421e843) /* 0.258278145 */, 19 },
+  /* 7060 */  { MAD_F(0x04221b6b) /* 0.258326931 */, 19 },
+  /* 7061 */  { MAD_F(0x04224e94) /* 0.258375719 */, 19 },
+  /* 7062 */  { MAD_F(0x042281bd) /* 0.258424509 */, 19 },
+  /* 7063 */  { MAD_F(0x0422b4e6) /* 0.258473302 */, 19 },
+  /* 7064 */  { MAD_F(0x0422e811) /* 0.258522097 */, 19 },
+  /* 7065 */  { MAD_F(0x04231b3c) /* 0.258570894 */, 19 },
+  /* 7066 */  { MAD_F(0x04234e67) /* 0.258619694 */, 19 },
+  /* 7067 */  { MAD_F(0x04238193) /* 0.258668496 */, 19 },
+  /* 7068 */  { MAD_F(0x0423b4c0) /* 0.258717300 */, 19 },
+  /* 7069 */  { MAD_F(0x0423e7ee) /* 0.258766106 */, 19 },
+  /* 7070 */  { MAD_F(0x04241b1c) /* 0.258814915 */, 19 },
+  /* 7071 */  { MAD_F(0x04244e4a) /* 0.258863726 */, 19 },
+
+  /* 7072 */  { MAD_F(0x04248179) /* 0.258912540 */, 19 },
+  /* 7073 */  { MAD_F(0x0424b4a9) /* 0.258961356 */, 19 },
+  /* 7074 */  { MAD_F(0x0424e7da) /* 0.259010174 */, 19 },
+  /* 7075 */  { MAD_F(0x04251b0b) /* 0.259058994 */, 19 },
+  /* 7076 */  { MAD_F(0x04254e3d) /* 0.259107817 */, 19 },
+  /* 7077 */  { MAD_F(0x0425816f) /* 0.259156642 */, 19 },
+  /* 7078 */  { MAD_F(0x0425b4a2) /* 0.259205469 */, 19 },
+  /* 7079 */  { MAD_F(0x0425e7d6) /* 0.259254298 */, 19 },
+  /* 7080 */  { MAD_F(0x04261b0a) /* 0.259303130 */, 19 },
+  /* 7081 */  { MAD_F(0x04264e3f) /* 0.259351964 */, 19 },
+  /* 7082 */  { MAD_F(0x04268174) /* 0.259400801 */, 19 },
+  /* 7083 */  { MAD_F(0x0426b4aa) /* 0.259449639 */, 19 },
+  /* 7084 */  { MAD_F(0x0426e7e1) /* 0.259498480 */, 19 },
+  /* 7085 */  { MAD_F(0x04271b18) /* 0.259547324 */, 19 },
+  /* 7086 */  { MAD_F(0x04274e50) /* 0.259596169 */, 19 },
+  /* 7087 */  { MAD_F(0x04278188) /* 0.259645017 */, 19 },
+
+  /* 7088 */  { MAD_F(0x0427b4c2) /* 0.259693868 */, 19 },
+  /* 7089 */  { MAD_F(0x0427e7fb) /* 0.259742720 */, 19 },
+  /* 7090 */  { MAD_F(0x04281b36) /* 0.259791575 */, 19 },
+  /* 7091 */  { MAD_F(0x04284e71) /* 0.259840432 */, 19 },
+  /* 7092 */  { MAD_F(0x042881ac) /* 0.259889291 */, 19 },
+  /* 7093 */  { MAD_F(0x0428b4e8) /* 0.259938153 */, 19 },
+  /* 7094 */  { MAD_F(0x0428e825) /* 0.259987017 */, 19 },
+  /* 7095 */  { MAD_F(0x04291b63) /* 0.260035883 */, 19 },
+  /* 7096 */  { MAD_F(0x04294ea1) /* 0.260084752 */, 19 },
+  /* 7097 */  { MAD_F(0x042981df) /* 0.260133623 */, 19 },
+  /* 7098 */  { MAD_F(0x0429b51f) /* 0.260182496 */, 19 },
+  /* 7099 */  { MAD_F(0x0429e85f) /* 0.260231372 */, 19 },
+  /* 7100 */  { MAD_F(0x042a1b9f) /* 0.260280249 */, 19 },
+  /* 7101 */  { MAD_F(0x042a4ee0) /* 0.260329129 */, 19 },
+  /* 7102 */  { MAD_F(0x042a8222) /* 0.260378012 */, 19 },
+  /* 7103 */  { MAD_F(0x042ab564) /* 0.260426896 */, 19 },
+
+  /* 7104 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 19 },
+  /* 7105 */  { MAD_F(0x042b1beb) /* 0.260524673 */, 19 },
+  /* 7106 */  { MAD_F(0x042b4f2f) /* 0.260573564 */, 19 },
+  /* 7107 */  { MAD_F(0x042b8274) /* 0.260622458 */, 19 },
+  /* 7108 */  { MAD_F(0x042bb5ba) /* 0.260671354 */, 19 },
+  /* 7109 */  { MAD_F(0x042be900) /* 0.260720252 */, 19 },
+  /* 7110 */  { MAD_F(0x042c1c46) /* 0.260769153 */, 19 },
+  /* 7111 */  { MAD_F(0x042c4f8e) /* 0.260818056 */, 19 },
+  /* 7112 */  { MAD_F(0x042c82d6) /* 0.260866961 */, 19 },
+  /* 7113 */  { MAD_F(0x042cb61e) /* 0.260915869 */, 19 },
+  /* 7114 */  { MAD_F(0x042ce967) /* 0.260964779 */, 19 },
+  /* 7115 */  { MAD_F(0x042d1cb1) /* 0.261013691 */, 19 },
+  /* 7116 */  { MAD_F(0x042d4ffb) /* 0.261062606 */, 19 },
+  /* 7117 */  { MAD_F(0x042d8346) /* 0.261111522 */, 19 },
+  /* 7118 */  { MAD_F(0x042db692) /* 0.261160441 */, 19 },
+  /* 7119 */  { MAD_F(0x042de9de) /* 0.261209363 */, 19 },
+
+  /* 7120 */  { MAD_F(0x042e1d2b) /* 0.261258286 */, 19 },
+  /* 7121 */  { MAD_F(0x042e5078) /* 0.261307212 */, 19 },
+  /* 7122 */  { MAD_F(0x042e83c6) /* 0.261356140 */, 19 },
+  /* 7123 */  { MAD_F(0x042eb715) /* 0.261405071 */, 19 },
+  /* 7124 */  { MAD_F(0x042eea64) /* 0.261454004 */, 19 },
+  /* 7125 */  { MAD_F(0x042f1db4) /* 0.261502939 */, 19 },
+  /* 7126 */  { MAD_F(0x042f5105) /* 0.261551876 */, 19 },
+  /* 7127 */  { MAD_F(0x042f8456) /* 0.261600816 */, 19 },
+  /* 7128 */  { MAD_F(0x042fb7a8) /* 0.261649758 */, 19 },
+  /* 7129 */  { MAD_F(0x042feafa) /* 0.261698702 */, 19 },
+  /* 7130 */  { MAD_F(0x04301e4d) /* 0.261747649 */, 19 },
+  /* 7131 */  { MAD_F(0x043051a1) /* 0.261796597 */, 19 },
+  /* 7132 */  { MAD_F(0x043084f5) /* 0.261845548 */, 19 },
+  /* 7133 */  { MAD_F(0x0430b84a) /* 0.261894502 */, 19 },
+  /* 7134 */  { MAD_F(0x0430eb9f) /* 0.261943458 */, 19 },
+  /* 7135 */  { MAD_F(0x04311ef5) /* 0.261992416 */, 19 },
+
+  /* 7136 */  { MAD_F(0x0431524c) /* 0.262041376 */, 19 },
+  /* 7137 */  { MAD_F(0x043185a3) /* 0.262090338 */, 19 },
+  /* 7138 */  { MAD_F(0x0431b8fb) /* 0.262139303 */, 19 },
+  /* 7139 */  { MAD_F(0x0431ec54) /* 0.262188270 */, 19 },
+  /* 7140 */  { MAD_F(0x04321fad) /* 0.262237240 */, 19 },
+  /* 7141 */  { MAD_F(0x04325306) /* 0.262286211 */, 19 },
+  /* 7142 */  { MAD_F(0x04328661) /* 0.262335185 */, 19 },
+  /* 7143 */  { MAD_F(0x0432b9bc) /* 0.262384162 */, 19 },
+  /* 7144 */  { MAD_F(0x0432ed17) /* 0.262433140 */, 19 },
+  /* 7145 */  { MAD_F(0x04332074) /* 0.262482121 */, 19 },
+  /* 7146 */  { MAD_F(0x043353d0) /* 0.262531104 */, 19 },
+  /* 7147 */  { MAD_F(0x0433872e) /* 0.262580089 */, 19 },
+  /* 7148 */  { MAD_F(0x0433ba8c) /* 0.262629077 */, 19 },
+  /* 7149 */  { MAD_F(0x0433edea) /* 0.262678067 */, 19 },
+  /* 7150 */  { MAD_F(0x0434214a) /* 0.262727059 */, 19 },
+  /* 7151 */  { MAD_F(0x043454aa) /* 0.262776054 */, 19 },
+
+  /* 7152 */  { MAD_F(0x0434880a) /* 0.262825051 */, 19 },
+  /* 7153 */  { MAD_F(0x0434bb6b) /* 0.262874050 */, 19 },
+  /* 7154 */  { MAD_F(0x0434eecd) /* 0.262923051 */, 19 },
+  /* 7155 */  { MAD_F(0x0435222f) /* 0.262972055 */, 19 },
+  /* 7156 */  { MAD_F(0x04355592) /* 0.263021061 */, 19 },
+  /* 7157 */  { MAD_F(0x043588f6) /* 0.263070069 */, 19 },
+  /* 7158 */  { MAD_F(0x0435bc5a) /* 0.263119079 */, 19 },
+  /* 7159 */  { MAD_F(0x0435efbf) /* 0.263168092 */, 19 },
+  /* 7160 */  { MAD_F(0x04362324) /* 0.263217107 */, 19 },
+  /* 7161 */  { MAD_F(0x0436568a) /* 0.263266125 */, 19 },
+  /* 7162 */  { MAD_F(0x043689f1) /* 0.263315144 */, 19 },
+  /* 7163 */  { MAD_F(0x0436bd58) /* 0.263364166 */, 19 },
+  /* 7164 */  { MAD_F(0x0436f0c0) /* 0.263413191 */, 19 },
+  /* 7165 */  { MAD_F(0x04372428) /* 0.263462217 */, 19 },
+  /* 7166 */  { MAD_F(0x04375791) /* 0.263511246 */, 19 },
+  /* 7167 */  { MAD_F(0x04378afb) /* 0.263560277 */, 19 },
+
+  /* 7168 */  { MAD_F(0x0437be65) /* 0.263609310 */, 19 },
+  /* 7169 */  { MAD_F(0x0437f1d0) /* 0.263658346 */, 19 },
+  /* 7170 */  { MAD_F(0x0438253c) /* 0.263707384 */, 19 },
+  /* 7171 */  { MAD_F(0x043858a8) /* 0.263756424 */, 19 },
+  /* 7172 */  { MAD_F(0x04388c14) /* 0.263805466 */, 19 },
+  /* 7173 */  { MAD_F(0x0438bf82) /* 0.263854511 */, 19 },
+  /* 7174 */  { MAD_F(0x0438f2f0) /* 0.263903558 */, 19 },
+  /* 7175 */  { MAD_F(0x0439265e) /* 0.263952607 */, 19 },
+  /* 7176 */  { MAD_F(0x043959cd) /* 0.264001659 */, 19 },
+  /* 7177 */  { MAD_F(0x04398d3d) /* 0.264050713 */, 19 },
+  /* 7178 */  { MAD_F(0x0439c0ae) /* 0.264099769 */, 19 },
+  /* 7179 */  { MAD_F(0x0439f41f) /* 0.264148827 */, 19 },
+  /* 7180 */  { MAD_F(0x043a2790) /* 0.264197888 */, 19 },
+  /* 7181 */  { MAD_F(0x043a5b02) /* 0.264246951 */, 19 },
+  /* 7182 */  { MAD_F(0x043a8e75) /* 0.264296016 */, 19 },
+  /* 7183 */  { MAD_F(0x043ac1e9) /* 0.264345084 */, 19 },
+
+  /* 7184 */  { MAD_F(0x043af55d) /* 0.264394153 */, 19 },
+  /* 7185 */  { MAD_F(0x043b28d2) /* 0.264443225 */, 19 },
+  /* 7186 */  { MAD_F(0x043b5c47) /* 0.264492300 */, 19 },
+  /* 7187 */  { MAD_F(0x043b8fbd) /* 0.264541376 */, 19 },
+  /* 7188 */  { MAD_F(0x043bc333) /* 0.264590455 */, 19 },
+  /* 7189 */  { MAD_F(0x043bf6aa) /* 0.264639536 */, 19 },
+  /* 7190 */  { MAD_F(0x043c2a22) /* 0.264688620 */, 19 },
+  /* 7191 */  { MAD_F(0x043c5d9a) /* 0.264737706 */, 19 },
+  /* 7192 */  { MAD_F(0x043c9113) /* 0.264786794 */, 19 },
+  /* 7193 */  { MAD_F(0x043cc48d) /* 0.264835884 */, 19 },
+  /* 7194 */  { MAD_F(0x043cf807) /* 0.264884976 */, 19 },
+  /* 7195 */  { MAD_F(0x043d2b82) /* 0.264934071 */, 19 },
+  /* 7196 */  { MAD_F(0x043d5efd) /* 0.264983168 */, 19 },
+  /* 7197 */  { MAD_F(0x043d9279) /* 0.265032268 */, 19 },
+  /* 7198 */  { MAD_F(0x043dc5f6) /* 0.265081369 */, 19 },
+  /* 7199 */  { MAD_F(0x043df973) /* 0.265130473 */, 19 },
+
+  /* 7200 */  { MAD_F(0x043e2cf1) /* 0.265179580 */, 19 },
+  /* 7201 */  { MAD_F(0x043e6070) /* 0.265228688 */, 19 },
+  /* 7202 */  { MAD_F(0x043e93ef) /* 0.265277799 */, 19 },
+  /* 7203 */  { MAD_F(0x043ec76e) /* 0.265326912 */, 19 },
+  /* 7204 */  { MAD_F(0x043efaef) /* 0.265376027 */, 19 },
+  /* 7205 */  { MAD_F(0x043f2e6f) /* 0.265425145 */, 19 },
+  /* 7206 */  { MAD_F(0x043f61f1) /* 0.265474264 */, 19 },
+  /* 7207 */  { MAD_F(0x043f9573) /* 0.265523387 */, 19 },
+  /* 7208 */  { MAD_F(0x043fc8f6) /* 0.265572511 */, 19 },
+  /* 7209 */  { MAD_F(0x043ffc79) /* 0.265621638 */, 19 },
+  /* 7210 */  { MAD_F(0x04402ffd) /* 0.265670766 */, 19 },
+  /* 7211 */  { MAD_F(0x04406382) /* 0.265719898 */, 19 },
+  /* 7212 */  { MAD_F(0x04409707) /* 0.265769031 */, 19 },
+  /* 7213 */  { MAD_F(0x0440ca8d) /* 0.265818167 */, 19 },
+  /* 7214 */  { MAD_F(0x0440fe13) /* 0.265867305 */, 19 },
+  /* 7215 */  { MAD_F(0x0441319a) /* 0.265916445 */, 19 },
+
+  /* 7216 */  { MAD_F(0x04416522) /* 0.265965588 */, 19 },
+  /* 7217 */  { MAD_F(0x044198aa) /* 0.266014732 */, 19 },
+  /* 7218 */  { MAD_F(0x0441cc33) /* 0.266063880 */, 19 },
+  /* 7219 */  { MAD_F(0x0441ffbc) /* 0.266113029 */, 19 },
+  /* 7220 */  { MAD_F(0x04423346) /* 0.266162181 */, 19 },
+  /* 7221 */  { MAD_F(0x044266d1) /* 0.266211334 */, 19 },
+  /* 7222 */  { MAD_F(0x04429a5c) /* 0.266260491 */, 19 },
+  /* 7223 */  { MAD_F(0x0442cde8) /* 0.266309649 */, 19 },
+  /* 7224 */  { MAD_F(0x04430174) /* 0.266358810 */, 19 },
+  /* 7225 */  { MAD_F(0x04433501) /* 0.266407973 */, 19 },
+  /* 7226 */  { MAD_F(0x0443688f) /* 0.266457138 */, 19 },
+  /* 7227 */  { MAD_F(0x04439c1d) /* 0.266506305 */, 19 },
+  /* 7228 */  { MAD_F(0x0443cfac) /* 0.266555475 */, 19 },
+  /* 7229 */  { MAD_F(0x0444033c) /* 0.266604647 */, 19 },
+  /* 7230 */  { MAD_F(0x044436cc) /* 0.266653822 */, 19 },
+  /* 7231 */  { MAD_F(0x04446a5d) /* 0.266702998 */, 19 },
+
+  /* 7232 */  { MAD_F(0x04449dee) /* 0.266752177 */, 19 },
+  /* 7233 */  { MAD_F(0x0444d180) /* 0.266801358 */, 19 },
+  /* 7234 */  { MAD_F(0x04450513) /* 0.266850541 */, 19 },
+  /* 7235 */  { MAD_F(0x044538a6) /* 0.266899727 */, 19 },
+  /* 7236 */  { MAD_F(0x04456c39) /* 0.266948915 */, 19 },
+  /* 7237 */  { MAD_F(0x04459fce) /* 0.266998105 */, 19 },
+  /* 7238 */  { MAD_F(0x0445d363) /* 0.267047298 */, 19 },
+  /* 7239 */  { MAD_F(0x044606f8) /* 0.267096492 */, 19 },
+  /* 7240 */  { MAD_F(0x04463a8f) /* 0.267145689 */, 19 },
+  /* 7241 */  { MAD_F(0x04466e25) /* 0.267194888 */, 19 },
+  /* 7242 */  { MAD_F(0x0446a1bd) /* 0.267244090 */, 19 },
+  /* 7243 */  { MAD_F(0x0446d555) /* 0.267293294 */, 19 },
+  /* 7244 */  { MAD_F(0x044708ee) /* 0.267342500 */, 19 },
+  /* 7245 */  { MAD_F(0x04473c87) /* 0.267391708 */, 19 },
+  /* 7246 */  { MAD_F(0x04477021) /* 0.267440919 */, 19 },
+  /* 7247 */  { MAD_F(0x0447a3bb) /* 0.267490131 */, 19 },
+
+  /* 7248 */  { MAD_F(0x0447d756) /* 0.267539347 */, 19 },
+  /* 7249 */  { MAD_F(0x04480af2) /* 0.267588564 */, 19 },
+  /* 7250 */  { MAD_F(0x04483e8e) /* 0.267637783 */, 19 },
+  /* 7251 */  { MAD_F(0x0448722b) /* 0.267687005 */, 19 },
+  /* 7252 */  { MAD_F(0x0448a5c9) /* 0.267736229 */, 19 },
+  /* 7253 */  { MAD_F(0x0448d967) /* 0.267785456 */, 19 },
+  /* 7254 */  { MAD_F(0x04490d05) /* 0.267834685 */, 19 },
+  /* 7255 */  { MAD_F(0x044940a5) /* 0.267883915 */, 19 },
+  /* 7256 */  { MAD_F(0x04497445) /* 0.267933149 */, 19 },
+  /* 7257 */  { MAD_F(0x0449a7e5) /* 0.267982384 */, 19 },
+  /* 7258 */  { MAD_F(0x0449db86) /* 0.268031622 */, 19 },
+  /* 7259 */  { MAD_F(0x044a0f28) /* 0.268080862 */, 19 },
+  /* 7260 */  { MAD_F(0x044a42ca) /* 0.268130104 */, 19 },
+  /* 7261 */  { MAD_F(0x044a766d) /* 0.268179349 */, 19 },
+  /* 7262 */  { MAD_F(0x044aaa11) /* 0.268228595 */, 19 },
+  /* 7263 */  { MAD_F(0x044addb5) /* 0.268277844 */, 19 },
+
+  /* 7264 */  { MAD_F(0x044b115a) /* 0.268327096 */, 19 },
+  /* 7265 */  { MAD_F(0x044b44ff) /* 0.268376349 */, 19 },
+  /* 7266 */  { MAD_F(0x044b78a5) /* 0.268425605 */, 19 },
+  /* 7267 */  { MAD_F(0x044bac4c) /* 0.268474863 */, 19 },
+  /* 7268 */  { MAD_F(0x044bdff3) /* 0.268524123 */, 19 },
+  /* 7269 */  { MAD_F(0x044c139b) /* 0.268573386 */, 19 },
+  /* 7270 */  { MAD_F(0x044c4743) /* 0.268622651 */, 19 },
+  /* 7271 */  { MAD_F(0x044c7aec) /* 0.268671918 */, 19 },
+  /* 7272 */  { MAD_F(0x044cae96) /* 0.268721187 */, 19 },
+  /* 7273 */  { MAD_F(0x044ce240) /* 0.268770459 */, 19 },
+  /* 7274 */  { MAD_F(0x044d15eb) /* 0.268819733 */, 19 },
+  /* 7275 */  { MAD_F(0x044d4997) /* 0.268869009 */, 19 },
+  /* 7276 */  { MAD_F(0x044d7d43) /* 0.268918287 */, 19 },
+  /* 7277 */  { MAD_F(0x044db0ef) /* 0.268967568 */, 19 },
+  /* 7278 */  { MAD_F(0x044de49d) /* 0.269016851 */, 19 },
+  /* 7279 */  { MAD_F(0x044e184b) /* 0.269066136 */, 19 },
+
+  /* 7280 */  { MAD_F(0x044e4bf9) /* 0.269115423 */, 19 },
+  /* 7281 */  { MAD_F(0x044e7fa8) /* 0.269164713 */, 19 },
+  /* 7282 */  { MAD_F(0x044eb358) /* 0.269214005 */, 19 },
+  /* 7283 */  { MAD_F(0x044ee708) /* 0.269263299 */, 19 },
+  /* 7284 */  { MAD_F(0x044f1ab9) /* 0.269312595 */, 19 },
+  /* 7285 */  { MAD_F(0x044f4e6b) /* 0.269361894 */, 19 },
+  /* 7286 */  { MAD_F(0x044f821d) /* 0.269411195 */, 19 },
+  /* 7287 */  { MAD_F(0x044fb5cf) /* 0.269460498 */, 19 },
+  /* 7288 */  { MAD_F(0x044fe983) /* 0.269509804 */, 19 },
+  /* 7289 */  { MAD_F(0x04501d37) /* 0.269559111 */, 19 },
+  /* 7290 */  { MAD_F(0x045050eb) /* 0.269608421 */, 19 },
+  /* 7291 */  { MAD_F(0x045084a0) /* 0.269657734 */, 19 },
+  /* 7292 */  { MAD_F(0x0450b856) /* 0.269707048 */, 19 },
+  /* 7293 */  { MAD_F(0x0450ec0d) /* 0.269756365 */, 19 },
+  /* 7294 */  { MAD_F(0x04511fc4) /* 0.269805684 */, 19 },
+  /* 7295 */  { MAD_F(0x0451537b) /* 0.269855005 */, 19 },
+
+  /* 7296 */  { MAD_F(0x04518733) /* 0.269904329 */, 19 },
+  /* 7297 */  { MAD_F(0x0451baec) /* 0.269953654 */, 19 },
+  /* 7298 */  { MAD_F(0x0451eea5) /* 0.270002982 */, 19 },
+  /* 7299 */  { MAD_F(0x0452225f) /* 0.270052313 */, 19 },
+  /* 7300 */  { MAD_F(0x0452561a) /* 0.270101645 */, 19 },
+  /* 7301 */  { MAD_F(0x045289d5) /* 0.270150980 */, 19 },
+  /* 7302 */  { MAD_F(0x0452bd91) /* 0.270200317 */, 19 },
+  /* 7303 */  { MAD_F(0x0452f14d) /* 0.270249656 */, 19 },
+  /* 7304 */  { MAD_F(0x0453250a) /* 0.270298998 */, 19 },
+  /* 7305 */  { MAD_F(0x045358c8) /* 0.270348341 */, 19 },
+  /* 7306 */  { MAD_F(0x04538c86) /* 0.270397687 */, 19 },
+  /* 7307 */  { MAD_F(0x0453c045) /* 0.270447036 */, 19 },
+  /* 7308 */  { MAD_F(0x0453f405) /* 0.270496386 */, 19 },
+  /* 7309 */  { MAD_F(0x045427c5) /* 0.270545739 */, 19 },
+  /* 7310 */  { MAD_F(0x04545b85) /* 0.270595094 */, 19 },
+  /* 7311 */  { MAD_F(0x04548f46) /* 0.270644451 */, 19 },
+
+  /* 7312 */  { MAD_F(0x0454c308) /* 0.270693811 */, 19 },
+  /* 7313 */  { MAD_F(0x0454f6cb) /* 0.270743173 */, 19 },
+  /* 7314 */  { MAD_F(0x04552a8e) /* 0.270792537 */, 19 },
+  /* 7315 */  { MAD_F(0x04555e51) /* 0.270841903 */, 19 },
+  /* 7316 */  { MAD_F(0x04559216) /* 0.270891271 */, 19 },
+  /* 7317 */  { MAD_F(0x0455c5db) /* 0.270940642 */, 19 },
+  /* 7318 */  { MAD_F(0x0455f9a0) /* 0.270990015 */, 19 },
+  /* 7319 */  { MAD_F(0x04562d66) /* 0.271039390 */, 19 },
+  /* 7320 */  { MAD_F(0x0456612d) /* 0.271088768 */, 19 },
+  /* 7321 */  { MAD_F(0x045694f4) /* 0.271138148 */, 19 },
+  /* 7322 */  { MAD_F(0x0456c8bc) /* 0.271187530 */, 19 },
+  /* 7323 */  { MAD_F(0x0456fc84) /* 0.271236914 */, 19 },
+  /* 7324 */  { MAD_F(0x0457304e) /* 0.271286301 */, 19 },
+  /* 7325 */  { MAD_F(0x04576417) /* 0.271335689 */, 19 },
+  /* 7326 */  { MAD_F(0x045797e2) /* 0.271385080 */, 19 },
+  /* 7327 */  { MAD_F(0x0457cbac) /* 0.271434474 */, 19 },
+
+  /* 7328 */  { MAD_F(0x0457ff78) /* 0.271483869 */, 19 },
+  /* 7329 */  { MAD_F(0x04583344) /* 0.271533267 */, 19 },
+  /* 7330 */  { MAD_F(0x04586711) /* 0.271582667 */, 19 },
+  /* 7331 */  { MAD_F(0x04589ade) /* 0.271632069 */, 19 },
+  /* 7332 */  { MAD_F(0x0458ceac) /* 0.271681474 */, 19 },
+  /* 7333 */  { MAD_F(0x0459027b) /* 0.271730880 */, 19 },
+  /* 7334 */  { MAD_F(0x0459364a) /* 0.271780289 */, 19 },
+  /* 7335 */  { MAD_F(0x04596a19) /* 0.271829701 */, 19 },
+  /* 7336 */  { MAD_F(0x04599dea) /* 0.271879114 */, 19 },
+  /* 7337 */  { MAD_F(0x0459d1bb) /* 0.271928530 */, 19 },
+  /* 7338 */  { MAD_F(0x045a058c) /* 0.271977948 */, 19 },
+  /* 7339 */  { MAD_F(0x045a395e) /* 0.272027368 */, 19 },
+  /* 7340 */  { MAD_F(0x045a6d31) /* 0.272076790 */, 19 },
+  /* 7341 */  { MAD_F(0x045aa104) /* 0.272126215 */, 19 },
+  /* 7342 */  { MAD_F(0x045ad4d8) /* 0.272175642 */, 19 },
+  /* 7343 */  { MAD_F(0x045b08ad) /* 0.272225071 */, 19 },
+
+  /* 7344 */  { MAD_F(0x045b3c82) /* 0.272274503 */, 19 },
+  /* 7345 */  { MAD_F(0x045b7058) /* 0.272323936 */, 19 },
+  /* 7346 */  { MAD_F(0x045ba42e) /* 0.272373372 */, 19 },
+  /* 7347 */  { MAD_F(0x045bd805) /* 0.272422810 */, 19 },
+  /* 7348 */  { MAD_F(0x045c0bdd) /* 0.272472251 */, 19 },
+  /* 7349 */  { MAD_F(0x045c3fb5) /* 0.272521693 */, 19 },
+  /* 7350 */  { MAD_F(0x045c738e) /* 0.272571138 */, 19 },
+  /* 7351 */  { MAD_F(0x045ca767) /* 0.272620585 */, 19 },
+  /* 7352 */  { MAD_F(0x045cdb41) /* 0.272670035 */, 19 },
+  /* 7353 */  { MAD_F(0x045d0f1b) /* 0.272719486 */, 19 },
+  /* 7354 */  { MAD_F(0x045d42f7) /* 0.272768940 */, 19 },
+  /* 7355 */  { MAD_F(0x045d76d2) /* 0.272818396 */, 19 },
+  /* 7356 */  { MAD_F(0x045daaaf) /* 0.272867855 */, 19 },
+  /* 7357 */  { MAD_F(0x045dde8c) /* 0.272917315 */, 19 },
+  /* 7358 */  { MAD_F(0x045e1269) /* 0.272966778 */, 19 },
+  /* 7359 */  { MAD_F(0x045e4647) /* 0.273016243 */, 19 },
+
+  /* 7360 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 19 },
+  /* 7361 */  { MAD_F(0x045eae06) /* 0.273115180 */, 19 },
+  /* 7362 */  { MAD_F(0x045ee1e6) /* 0.273164652 */, 19 },
+  /* 7363 */  { MAD_F(0x045f15c6) /* 0.273214126 */, 19 },
+  /* 7364 */  { MAD_F(0x045f49a7) /* 0.273263602 */, 19 },
+  /* 7365 */  { MAD_F(0x045f7d89) /* 0.273313081 */, 19 },
+  /* 7366 */  { MAD_F(0x045fb16c) /* 0.273362561 */, 19 },
+  /* 7367 */  { MAD_F(0x045fe54f) /* 0.273412044 */, 19 },
+  /* 7368 */  { MAD_F(0x04601932) /* 0.273461530 */, 19 },
+  /* 7369 */  { MAD_F(0x04604d16) /* 0.273511017 */, 19 },
+  /* 7370 */  { MAD_F(0x046080fb) /* 0.273560507 */, 19 },
+  /* 7371 */  { MAD_F(0x0460b4e1) /* 0.273609999 */, 19 },
+  /* 7372 */  { MAD_F(0x0460e8c7) /* 0.273659493 */, 19 },
+  /* 7373 */  { MAD_F(0x04611cad) /* 0.273708989 */, 19 },
+  /* 7374 */  { MAD_F(0x04615094) /* 0.273758488 */, 19 },
+  /* 7375 */  { MAD_F(0x0461847c) /* 0.273807989 */, 19 },
+
+  /* 7376 */  { MAD_F(0x0461b864) /* 0.273857492 */, 19 },
+  /* 7377 */  { MAD_F(0x0461ec4d) /* 0.273906997 */, 19 },
+  /* 7378 */  { MAD_F(0x04622037) /* 0.273956505 */, 19 },
+  /* 7379 */  { MAD_F(0x04625421) /* 0.274006015 */, 19 },
+  /* 7380 */  { MAD_F(0x0462880c) /* 0.274055527 */, 19 },
+  /* 7381 */  { MAD_F(0x0462bbf7) /* 0.274105041 */, 19 },
+  /* 7382 */  { MAD_F(0x0462efe3) /* 0.274154558 */, 19 },
+  /* 7383 */  { MAD_F(0x046323d0) /* 0.274204076 */, 19 },
+  /* 7384 */  { MAD_F(0x046357bd) /* 0.274253597 */, 19 },
+  /* 7385 */  { MAD_F(0x04638bab) /* 0.274303121 */, 19 },
+  /* 7386 */  { MAD_F(0x0463bf99) /* 0.274352646 */, 19 },
+  /* 7387 */  { MAD_F(0x0463f388) /* 0.274402174 */, 19 },
+  /* 7388 */  { MAD_F(0x04642778) /* 0.274451704 */, 19 },
+  /* 7389 */  { MAD_F(0x04645b68) /* 0.274501236 */, 19 },
+  /* 7390 */  { MAD_F(0x04648f59) /* 0.274550771 */, 19 },
+  /* 7391 */  { MAD_F(0x0464c34a) /* 0.274600307 */, 19 },
+
+  /* 7392 */  { MAD_F(0x0464f73c) /* 0.274649846 */, 19 },
+  /* 7393 */  { MAD_F(0x04652b2f) /* 0.274699387 */, 19 },
+  /* 7394 */  { MAD_F(0x04655f22) /* 0.274748931 */, 19 },
+  /* 7395 */  { MAD_F(0x04659316) /* 0.274798476 */, 19 },
+  /* 7396 */  { MAD_F(0x0465c70a) /* 0.274848024 */, 19 },
+  /* 7397 */  { MAD_F(0x0465faff) /* 0.274897574 */, 19 },
+  /* 7398 */  { MAD_F(0x04662ef5) /* 0.274947126 */, 19 },
+  /* 7399 */  { MAD_F(0x046662eb) /* 0.274996681 */, 19 },
+  /* 7400 */  { MAD_F(0x046696e2) /* 0.275046238 */, 19 },
+  /* 7401 */  { MAD_F(0x0466cad9) /* 0.275095797 */, 19 },
+  /* 7402 */  { MAD_F(0x0466fed1) /* 0.275145358 */, 19 },
+  /* 7403 */  { MAD_F(0x046732ca) /* 0.275194921 */, 19 },
+  /* 7404 */  { MAD_F(0x046766c3) /* 0.275244487 */, 19 },
+  /* 7405 */  { MAD_F(0x04679abd) /* 0.275294055 */, 19 },
+  /* 7406 */  { MAD_F(0x0467ceb7) /* 0.275343625 */, 19 },
+  /* 7407 */  { MAD_F(0x046802b2) /* 0.275393198 */, 19 },
+
+  /* 7408 */  { MAD_F(0x046836ae) /* 0.275442772 */, 19 },
+  /* 7409 */  { MAD_F(0x04686aaa) /* 0.275492349 */, 19 },
+  /* 7410 */  { MAD_F(0x04689ea7) /* 0.275541928 */, 19 },
+  /* 7411 */  { MAD_F(0x0468d2a4) /* 0.275591509 */, 19 },
+  /* 7412 */  { MAD_F(0x046906a2) /* 0.275641093 */, 19 },
+  /* 7413 */  { MAD_F(0x04693aa1) /* 0.275690679 */, 19 },
+  /* 7414 */  { MAD_F(0x04696ea0) /* 0.275740267 */, 19 },
+  /* 7415 */  { MAD_F(0x0469a2a0) /* 0.275789857 */, 19 },
+  /* 7416 */  { MAD_F(0x0469d6a0) /* 0.275839449 */, 19 },
+  /* 7417 */  { MAD_F(0x046a0aa1) /* 0.275889044 */, 19 },
+  /* 7418 */  { MAD_F(0x046a3ea3) /* 0.275938641 */, 19 },
+  /* 7419 */  { MAD_F(0x046a72a5) /* 0.275988240 */, 19 },
+  /* 7420 */  { MAD_F(0x046aa6a8) /* 0.276037842 */, 19 },
+  /* 7421 */  { MAD_F(0x046adaab) /* 0.276087445 */, 19 },
+  /* 7422 */  { MAD_F(0x046b0eaf) /* 0.276137051 */, 19 },
+  /* 7423 */  { MAD_F(0x046b42b3) /* 0.276186659 */, 19 },
+
+  /* 7424 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 19 },
+  /* 7425 */  { MAD_F(0x046baabe) /* 0.276285882 */, 19 },
+  /* 7426 */  { MAD_F(0x046bdec5) /* 0.276335497 */, 19 },
+  /* 7427 */  { MAD_F(0x046c12cc) /* 0.276385113 */, 19 },
+  /* 7428 */  { MAD_F(0x046c46d3) /* 0.276434733 */, 19 },
+  /* 7429 */  { MAD_F(0x046c7adb) /* 0.276484354 */, 19 },
+  /* 7430 */  { MAD_F(0x046caee4) /* 0.276533978 */, 19 },
+  /* 7431 */  { MAD_F(0x046ce2ee) /* 0.276583604 */, 19 },
+  /* 7432 */  { MAD_F(0x046d16f7) /* 0.276633232 */, 19 },
+  /* 7433 */  { MAD_F(0x046d4b02) /* 0.276682862 */, 19 },
+  /* 7434 */  { MAD_F(0x046d7f0d) /* 0.276732495 */, 19 },
+  /* 7435 */  { MAD_F(0x046db319) /* 0.276782129 */, 19 },
+  /* 7436 */  { MAD_F(0x046de725) /* 0.276831766 */, 19 },
+  /* 7437 */  { MAD_F(0x046e1b32) /* 0.276881406 */, 19 },
+  /* 7438 */  { MAD_F(0x046e4f40) /* 0.276931047 */, 19 },
+  /* 7439 */  { MAD_F(0x046e834e) /* 0.276980691 */, 19 },
+
+  /* 7440 */  { MAD_F(0x046eb75c) /* 0.277030337 */, 19 },
+  /* 7441 */  { MAD_F(0x046eeb6c) /* 0.277079985 */, 19 },
+  /* 7442 */  { MAD_F(0x046f1f7c) /* 0.277129635 */, 19 },
+  /* 7443 */  { MAD_F(0x046f538c) /* 0.277179288 */, 19 },
+  /* 7444 */  { MAD_F(0x046f879d) /* 0.277228942 */, 19 },
+  /* 7445 */  { MAD_F(0x046fbbaf) /* 0.277278600 */, 19 },
+  /* 7446 */  { MAD_F(0x046fefc1) /* 0.277328259 */, 19 },
+  /* 7447 */  { MAD_F(0x047023d4) /* 0.277377920 */, 19 },
+  /* 7448 */  { MAD_F(0x047057e8) /* 0.277427584 */, 19 },
+  /* 7449 */  { MAD_F(0x04708bfc) /* 0.277477250 */, 19 },
+  /* 7450 */  { MAD_F(0x0470c011) /* 0.277526918 */, 19 },
+  /* 7451 */  { MAD_F(0x0470f426) /* 0.277576588 */, 19 },
+  /* 7452 */  { MAD_F(0x0471283c) /* 0.277626261 */, 19 },
+  /* 7453 */  { MAD_F(0x04715c52) /* 0.277675936 */, 19 },
+  /* 7454 */  { MAD_F(0x04719069) /* 0.277725613 */, 19 },
+  /* 7455 */  { MAD_F(0x0471c481) /* 0.277775292 */, 19 },
+
+  /* 7456 */  { MAD_F(0x0471f899) /* 0.277824973 */, 19 },
+  /* 7457 */  { MAD_F(0x04722cb2) /* 0.277874657 */, 19 },
+  /* 7458 */  { MAD_F(0x047260cc) /* 0.277924343 */, 19 },
+  /* 7459 */  { MAD_F(0x047294e6) /* 0.277974031 */, 19 },
+  /* 7460 */  { MAD_F(0x0472c900) /* 0.278023722 */, 19 },
+  /* 7461 */  { MAD_F(0x0472fd1b) /* 0.278073414 */, 19 },
+  /* 7462 */  { MAD_F(0x04733137) /* 0.278123109 */, 19 },
+  /* 7463 */  { MAD_F(0x04736554) /* 0.278172806 */, 19 },
+  /* 7464 */  { MAD_F(0x04739971) /* 0.278222505 */, 19 },
+  /* 7465 */  { MAD_F(0x0473cd8e) /* 0.278272207 */, 19 },
+  /* 7466 */  { MAD_F(0x047401ad) /* 0.278321910 */, 19 },
+  /* 7467 */  { MAD_F(0x047435cb) /* 0.278371616 */, 19 },
+  /* 7468 */  { MAD_F(0x047469eb) /* 0.278421324 */, 19 },
+  /* 7469 */  { MAD_F(0x04749e0b) /* 0.278471035 */, 19 },
+  /* 7470 */  { MAD_F(0x0474d22c) /* 0.278520747 */, 19 },
+  /* 7471 */  { MAD_F(0x0475064d) /* 0.278570462 */, 19 },
+
+  /* 7472 */  { MAD_F(0x04753a6f) /* 0.278620179 */, 19 },
+  /* 7473 */  { MAD_F(0x04756e91) /* 0.278669898 */, 19 },
+  /* 7474 */  { MAD_F(0x0475a2b4) /* 0.278719619 */, 19 },
+  /* 7475 */  { MAD_F(0x0475d6d7) /* 0.278769343 */, 19 },
+  /* 7476 */  { MAD_F(0x04760afc) /* 0.278819069 */, 19 },
+  /* 7477 */  { MAD_F(0x04763f20) /* 0.278868797 */, 19 },
+  /* 7478 */  { MAD_F(0x04767346) /* 0.278918527 */, 19 },
+  /* 7479 */  { MAD_F(0x0476a76c) /* 0.278968260 */, 19 },
+  /* 7480 */  { MAD_F(0x0476db92) /* 0.279017995 */, 19 },
+  /* 7481 */  { MAD_F(0x04770fba) /* 0.279067731 */, 19 },
+  /* 7482 */  { MAD_F(0x047743e1) /* 0.279117471 */, 19 },
+  /* 7483 */  { MAD_F(0x0477780a) /* 0.279167212 */, 19 },
+  /* 7484 */  { MAD_F(0x0477ac33) /* 0.279216956 */, 19 },
+  /* 7485 */  { MAD_F(0x0477e05c) /* 0.279266701 */, 19 },
+  /* 7486 */  { MAD_F(0x04781486) /* 0.279316449 */, 19 },
+  /* 7487 */  { MAD_F(0x047848b1) /* 0.279366200 */, 19 },
+
+  /* 7488 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 19 },
+  /* 7489 */  { MAD_F(0x0478b108) /* 0.279465707 */, 19 },
+  /* 7490 */  { MAD_F(0x0478e535) /* 0.279515464 */, 19 },
+  /* 7491 */  { MAD_F(0x04791962) /* 0.279565223 */, 19 },
+  /* 7492 */  { MAD_F(0x04794d8f) /* 0.279614984 */, 19 },
+  /* 7493 */  { MAD_F(0x047981be) /* 0.279664748 */, 19 },
+  /* 7494 */  { MAD_F(0x0479b5ed) /* 0.279714513 */, 19 },
+  /* 7495 */  { MAD_F(0x0479ea1c) /* 0.279764281 */, 19 },
+  /* 7496 */  { MAD_F(0x047a1e4c) /* 0.279814051 */, 19 },
+  /* 7497 */  { MAD_F(0x047a527d) /* 0.279863824 */, 19 },
+  /* 7498 */  { MAD_F(0x047a86ae) /* 0.279913598 */, 19 },
+  /* 7499 */  { MAD_F(0x047abae0) /* 0.279963375 */, 19 },
+  /* 7500 */  { MAD_F(0x047aef12) /* 0.280013154 */, 19 },
+  /* 7501 */  { MAD_F(0x047b2346) /* 0.280062935 */, 19 },
+  /* 7502 */  { MAD_F(0x047b5779) /* 0.280112719 */, 19 },
+  /* 7503 */  { MAD_F(0x047b8bad) /* 0.280162504 */, 19 },
+
+  /* 7504 */  { MAD_F(0x047bbfe2) /* 0.280212292 */, 19 },
+  /* 7505 */  { MAD_F(0x047bf418) /* 0.280262082 */, 19 },
+  /* 7506 */  { MAD_F(0x047c284e) /* 0.280311875 */, 19 },
+  /* 7507 */  { MAD_F(0x047c5c84) /* 0.280361669 */, 19 },
+  /* 7508 */  { MAD_F(0x047c90bb) /* 0.280411466 */, 19 },
+  /* 7509 */  { MAD_F(0x047cc4f3) /* 0.280461265 */, 19 },
+  /* 7510 */  { MAD_F(0x047cf92c) /* 0.280511066 */, 19 },
+  /* 7511 */  { MAD_F(0x047d2d65) /* 0.280560869 */, 19 },
+  /* 7512 */  { MAD_F(0x047d619e) /* 0.280610675 */, 19 },
+  /* 7513 */  { MAD_F(0x047d95d8) /* 0.280660483 */, 19 },
+  /* 7514 */  { MAD_F(0x047dca13) /* 0.280710292 */, 19 },
+  /* 7515 */  { MAD_F(0x047dfe4e) /* 0.280760105 */, 19 },
+  /* 7516 */  { MAD_F(0x047e328a) /* 0.280809919 */, 19 },
+  /* 7517 */  { MAD_F(0x047e66c7) /* 0.280859736 */, 19 },
+  /* 7518 */  { MAD_F(0x047e9b04) /* 0.280909554 */, 19 },
+  /* 7519 */  { MAD_F(0x047ecf42) /* 0.280959375 */, 19 },
+
+  /* 7520 */  { MAD_F(0x047f0380) /* 0.281009199 */, 19 },
+  /* 7521 */  { MAD_F(0x047f37bf) /* 0.281059024 */, 19 },
+  /* 7522 */  { MAD_F(0x047f6bff) /* 0.281108852 */, 19 },
+  /* 7523 */  { MAD_F(0x047fa03f) /* 0.281158682 */, 19 },
+  /* 7524 */  { MAD_F(0x047fd47f) /* 0.281208514 */, 19 },
+  /* 7525 */  { MAD_F(0x048008c1) /* 0.281258348 */, 19 },
+  /* 7526 */  { MAD_F(0x04803d02) /* 0.281308184 */, 19 },
+  /* 7527 */  { MAD_F(0x04807145) /* 0.281358023 */, 19 },
+  /* 7528 */  { MAD_F(0x0480a588) /* 0.281407864 */, 19 },
+  /* 7529 */  { MAD_F(0x0480d9cc) /* 0.281457707 */, 19 },
+  /* 7530 */  { MAD_F(0x04810e10) /* 0.281507552 */, 19 },
+  /* 7531 */  { MAD_F(0x04814255) /* 0.281557400 */, 19 },
+  /* 7532 */  { MAD_F(0x0481769a) /* 0.281607250 */, 19 },
+  /* 7533 */  { MAD_F(0x0481aae0) /* 0.281657101 */, 19 },
+  /* 7534 */  { MAD_F(0x0481df27) /* 0.281706956 */, 19 },
+  /* 7535 */  { MAD_F(0x0482136e) /* 0.281756812 */, 19 },
+
+  /* 7536 */  { MAD_F(0x048247b6) /* 0.281806670 */, 19 },
+  /* 7537 */  { MAD_F(0x04827bfe) /* 0.281856531 */, 19 },
+  /* 7538 */  { MAD_F(0x0482b047) /* 0.281906394 */, 19 },
+  /* 7539 */  { MAD_F(0x0482e491) /* 0.281956259 */, 19 },
+  /* 7540 */  { MAD_F(0x048318db) /* 0.282006127 */, 19 },
+  /* 7541 */  { MAD_F(0x04834d26) /* 0.282055996 */, 19 },
+  /* 7542 */  { MAD_F(0x04838171) /* 0.282105868 */, 19 },
+  /* 7543 */  { MAD_F(0x0483b5bd) /* 0.282155742 */, 19 },
+  /* 7544 */  { MAD_F(0x0483ea0a) /* 0.282205618 */, 19 },
+  /* 7545 */  { MAD_F(0x04841e57) /* 0.282255496 */, 19 },
+  /* 7546 */  { MAD_F(0x048452a4) /* 0.282305377 */, 19 },
+  /* 7547 */  { MAD_F(0x048486f3) /* 0.282355260 */, 19 },
+  /* 7548 */  { MAD_F(0x0484bb42) /* 0.282405145 */, 19 },
+  /* 7549 */  { MAD_F(0x0484ef91) /* 0.282455032 */, 19 },
+  /* 7550 */  { MAD_F(0x048523e1) /* 0.282504921 */, 19 },
+  /* 7551 */  { MAD_F(0x04855832) /* 0.282554813 */, 19 },
+
+  /* 7552 */  { MAD_F(0x04858c83) /* 0.282604707 */, 19 },
+  /* 7553 */  { MAD_F(0x0485c0d5) /* 0.282654603 */, 19 },
+  /* 7554 */  { MAD_F(0x0485f527) /* 0.282704501 */, 19 },
+  /* 7555 */  { MAD_F(0x0486297a) /* 0.282754401 */, 19 },
+  /* 7556 */  { MAD_F(0x04865dce) /* 0.282804304 */, 19 },
+  /* 7557 */  { MAD_F(0x04869222) /* 0.282854209 */, 19 },
+  /* 7558 */  { MAD_F(0x0486c677) /* 0.282904116 */, 19 },
+  /* 7559 */  { MAD_F(0x0486facc) /* 0.282954025 */, 19 },
+  /* 7560 */  { MAD_F(0x04872f22) /* 0.283003936 */, 19 },
+  /* 7561 */  { MAD_F(0x04876379) /* 0.283053850 */, 19 },
+  /* 7562 */  { MAD_F(0x048797d0) /* 0.283103766 */, 19 },
+  /* 7563 */  { MAD_F(0x0487cc28) /* 0.283153684 */, 19 },
+  /* 7564 */  { MAD_F(0x04880080) /* 0.283203604 */, 19 },
+  /* 7565 */  { MAD_F(0x048834d9) /* 0.283253527 */, 19 },
+  /* 7566 */  { MAD_F(0x04886933) /* 0.283303451 */, 19 },
+  /* 7567 */  { MAD_F(0x04889d8d) /* 0.283353378 */, 19 },
+
+  /* 7568 */  { MAD_F(0x0488d1e8) /* 0.283403307 */, 19 },
+  /* 7569 */  { MAD_F(0x04890643) /* 0.283453238 */, 19 },
+  /* 7570 */  { MAD_F(0x04893a9f) /* 0.283503172 */, 19 },
+  /* 7571 */  { MAD_F(0x04896efb) /* 0.283553107 */, 19 },
+  /* 7572 */  { MAD_F(0x0489a358) /* 0.283603045 */, 19 },
+  /* 7573 */  { MAD_F(0x0489d7b6) /* 0.283652985 */, 19 },
+  /* 7574 */  { MAD_F(0x048a0c14) /* 0.283702927 */, 19 },
+  /* 7575 */  { MAD_F(0x048a4073) /* 0.283752872 */, 19 },
+  /* 7576 */  { MAD_F(0x048a74d3) /* 0.283802818 */, 19 },
+  /* 7577 */  { MAD_F(0x048aa933) /* 0.283852767 */, 19 },
+  /* 7578 */  { MAD_F(0x048add93) /* 0.283902718 */, 19 },
+  /* 7579 */  { MAD_F(0x048b11f5) /* 0.283952671 */, 19 },
+  /* 7580 */  { MAD_F(0x048b4656) /* 0.284002627 */, 19 },
+  /* 7581 */  { MAD_F(0x048b7ab9) /* 0.284052584 */, 19 },
+  /* 7582 */  { MAD_F(0x048baf1c) /* 0.284102544 */, 19 },
+  /* 7583 */  { MAD_F(0x048be37f) /* 0.284152506 */, 19 },
+
+  /* 7584 */  { MAD_F(0x048c17e3) /* 0.284202470 */, 19 },
+  /* 7585 */  { MAD_F(0x048c4c48) /* 0.284252436 */, 19 },
+  /* 7586 */  { MAD_F(0x048c80ad) /* 0.284302405 */, 19 },
+  /* 7587 */  { MAD_F(0x048cb513) /* 0.284352376 */, 19 },
+  /* 7588 */  { MAD_F(0x048ce97a) /* 0.284402349 */, 19 },
+  /* 7589 */  { MAD_F(0x048d1de1) /* 0.284452324 */, 19 },
+  /* 7590 */  { MAD_F(0x048d5249) /* 0.284502301 */, 19 },
+  /* 7591 */  { MAD_F(0x048d86b1) /* 0.284552281 */, 19 },
+  /* 7592 */  { MAD_F(0x048dbb1a) /* 0.284602263 */, 19 },
+  /* 7593 */  { MAD_F(0x048def83) /* 0.284652246 */, 19 },
+  /* 7594 */  { MAD_F(0x048e23ed) /* 0.284702233 */, 19 },
+  /* 7595 */  { MAD_F(0x048e5858) /* 0.284752221 */, 19 },
+  /* 7596 */  { MAD_F(0x048e8cc3) /* 0.284802211 */, 19 },
+  /* 7597 */  { MAD_F(0x048ec12f) /* 0.284852204 */, 19 },
+  /* 7598 */  { MAD_F(0x048ef59b) /* 0.284902199 */, 19 },
+  /* 7599 */  { MAD_F(0x048f2a08) /* 0.284952196 */, 19 },
+
+  /* 7600 */  { MAD_F(0x048f5e76) /* 0.285002195 */, 19 },
+  /* 7601 */  { MAD_F(0x048f92e4) /* 0.285052197 */, 19 },
+  /* 7602 */  { MAD_F(0x048fc753) /* 0.285102201 */, 19 },
+  /* 7603 */  { MAD_F(0x048ffbc2) /* 0.285152206 */, 19 },
+  /* 7604 */  { MAD_F(0x04903032) /* 0.285202214 */, 19 },
+  /* 7605 */  { MAD_F(0x049064a3) /* 0.285252225 */, 19 },
+  /* 7606 */  { MAD_F(0x04909914) /* 0.285302237 */, 19 },
+  /* 7607 */  { MAD_F(0x0490cd86) /* 0.285352252 */, 19 },
+  /* 7608 */  { MAD_F(0x049101f8) /* 0.285402269 */, 19 },
+  /* 7609 */  { MAD_F(0x0491366b) /* 0.285452288 */, 19 },
+  /* 7610 */  { MAD_F(0x04916ade) /* 0.285502309 */, 19 },
+  /* 7611 */  { MAD_F(0x04919f52) /* 0.285552332 */, 19 },
+  /* 7612 */  { MAD_F(0x0491d3c7) /* 0.285602358 */, 19 },
+  /* 7613 */  { MAD_F(0x0492083c) /* 0.285652386 */, 19 },
+  /* 7614 */  { MAD_F(0x04923cb2) /* 0.285702416 */, 19 },
+  /* 7615 */  { MAD_F(0x04927128) /* 0.285752448 */, 19 },
+
+  /* 7616 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 19 },
+  /* 7617 */  { MAD_F(0x0492da17) /* 0.285852519 */, 19 },
+  /* 7618 */  { MAD_F(0x04930e8f) /* 0.285902557 */, 19 },
+  /* 7619 */  { MAD_F(0x04934308) /* 0.285952598 */, 19 },
+  /* 7620 */  { MAD_F(0x04937781) /* 0.286002641 */, 19 },
+  /* 7621 */  { MAD_F(0x0493abfb) /* 0.286052687 */, 19 },
+  /* 7622 */  { MAD_F(0x0493e076) /* 0.286102734 */, 19 },
+  /* 7623 */  { MAD_F(0x049414f1) /* 0.286152784 */, 19 },
+  /* 7624 */  { MAD_F(0x0494496c) /* 0.286202836 */, 19 },
+  /* 7625 */  { MAD_F(0x04947de9) /* 0.286252890 */, 19 },
+  /* 7626 */  { MAD_F(0x0494b266) /* 0.286302946 */, 19 },
+  /* 7627 */  { MAD_F(0x0494e6e3) /* 0.286353005 */, 19 },
+  /* 7628 */  { MAD_F(0x04951b61) /* 0.286403065 */, 19 },
+  /* 7629 */  { MAD_F(0x04954fe0) /* 0.286453128 */, 19 },
+  /* 7630 */  { MAD_F(0x0495845f) /* 0.286503193 */, 19 },
+  /* 7631 */  { MAD_F(0x0495b8df) /* 0.286553260 */, 19 },
+
+  /* 7632 */  { MAD_F(0x0495ed5f) /* 0.286603329 */, 19 },
+  /* 7633 */  { MAD_F(0x049621e0) /* 0.286653401 */, 19 },
+  /* 7634 */  { MAD_F(0x04965662) /* 0.286703475 */, 19 },
+  /* 7635 */  { MAD_F(0x04968ae4) /* 0.286753551 */, 19 },
+  /* 7636 */  { MAD_F(0x0496bf67) /* 0.286803629 */, 19 },
+  /* 7637 */  { MAD_F(0x0496f3ea) /* 0.286853709 */, 19 },
+  /* 7638 */  { MAD_F(0x0497286e) /* 0.286903792 */, 19 },
+  /* 7639 */  { MAD_F(0x04975cf2) /* 0.286953876 */, 19 },
+  /* 7640 */  { MAD_F(0x04979177) /* 0.287003963 */, 19 },
+  /* 7641 */  { MAD_F(0x0497c5fd) /* 0.287054052 */, 19 },
+  /* 7642 */  { MAD_F(0x0497fa83) /* 0.287104143 */, 19 },
+  /* 7643 */  { MAD_F(0x04982f0a) /* 0.287154237 */, 19 },
+  /* 7644 */  { MAD_F(0x04986392) /* 0.287204332 */, 19 },
+  /* 7645 */  { MAD_F(0x0498981a) /* 0.287254430 */, 19 },
+  /* 7646 */  { MAD_F(0x0498cca2) /* 0.287304530 */, 19 },
+  /* 7647 */  { MAD_F(0x0499012c) /* 0.287354632 */, 19 },
+
+  /* 7648 */  { MAD_F(0x049935b5) /* 0.287404737 */, 19 },
+  /* 7649 */  { MAD_F(0x04996a40) /* 0.287454843 */, 19 },
+  /* 7650 */  { MAD_F(0x04999ecb) /* 0.287504952 */, 19 },
+  /* 7651 */  { MAD_F(0x0499d356) /* 0.287555063 */, 19 },
+  /* 7652 */  { MAD_F(0x049a07e2) /* 0.287605176 */, 19 },
+  /* 7653 */  { MAD_F(0x049a3c6f) /* 0.287655291 */, 19 },
+  /* 7654 */  { MAD_F(0x049a70fc) /* 0.287705409 */, 19 },
+  /* 7655 */  { MAD_F(0x049aa58a) /* 0.287755528 */, 19 },
+  /* 7656 */  { MAD_F(0x049ada19) /* 0.287805650 */, 19 },
+  /* 7657 */  { MAD_F(0x049b0ea8) /* 0.287855774 */, 19 },
+  /* 7658 */  { MAD_F(0x049b4337) /* 0.287905900 */, 19 },
+  /* 7659 */  { MAD_F(0x049b77c8) /* 0.287956028 */, 19 },
+  /* 7660 */  { MAD_F(0x049bac58) /* 0.288006159 */, 19 },
+  /* 7661 */  { MAD_F(0x049be0ea) /* 0.288056292 */, 19 },
+  /* 7662 */  { MAD_F(0x049c157c) /* 0.288106427 */, 19 },
+  /* 7663 */  { MAD_F(0x049c4a0e) /* 0.288156564 */, 19 },
+
+  /* 7664 */  { MAD_F(0x049c7ea1) /* 0.288206703 */, 19 },
+  /* 7665 */  { MAD_F(0x049cb335) /* 0.288256844 */, 19 },
+  /* 7666 */  { MAD_F(0x049ce7ca) /* 0.288306988 */, 19 },
+  /* 7667 */  { MAD_F(0x049d1c5e) /* 0.288357134 */, 19 },
+  /* 7668 */  { MAD_F(0x049d50f4) /* 0.288407282 */, 19 },
+  /* 7669 */  { MAD_F(0x049d858a) /* 0.288457432 */, 19 },
+  /* 7670 */  { MAD_F(0x049dba21) /* 0.288507584 */, 19 },
+  /* 7671 */  { MAD_F(0x049deeb8) /* 0.288557739 */, 19 },
+  /* 7672 */  { MAD_F(0x049e2350) /* 0.288607895 */, 19 },
+  /* 7673 */  { MAD_F(0x049e57e8) /* 0.288658054 */, 19 },
+  /* 7674 */  { MAD_F(0x049e8c81) /* 0.288708215 */, 19 },
+  /* 7675 */  { MAD_F(0x049ec11b) /* 0.288758379 */, 19 },
+  /* 7676 */  { MAD_F(0x049ef5b5) /* 0.288808544 */, 19 },
+  /* 7677 */  { MAD_F(0x049f2a50) /* 0.288858712 */, 19 },
+  /* 7678 */  { MAD_F(0x049f5eeb) /* 0.288908881 */, 19 },
+  /* 7679 */  { MAD_F(0x049f9387) /* 0.288959053 */, 19 },
+
+  /* 7680 */  { MAD_F(0x049fc824) /* 0.289009227 */, 19 },
+  /* 7681 */  { MAD_F(0x049ffcc1) /* 0.289059404 */, 19 },
+  /* 7682 */  { MAD_F(0x04a0315e) /* 0.289109582 */, 19 },
+  /* 7683 */  { MAD_F(0x04a065fd) /* 0.289159763 */, 19 },
+  /* 7684 */  { MAD_F(0x04a09a9b) /* 0.289209946 */, 19 },
+  /* 7685 */  { MAD_F(0x04a0cf3b) /* 0.289260131 */, 19 },
+  /* 7686 */  { MAD_F(0x04a103db) /* 0.289310318 */, 19 },
+  /* 7687 */  { MAD_F(0x04a1387b) /* 0.289360507 */, 19 },
+  /* 7688 */  { MAD_F(0x04a16d1d) /* 0.289410699 */, 19 },
+  /* 7689 */  { MAD_F(0x04a1a1be) /* 0.289460893 */, 19 },
+  /* 7690 */  { MAD_F(0x04a1d661) /* 0.289511088 */, 19 },
+  /* 7691 */  { MAD_F(0x04a20b04) /* 0.289561287 */, 19 },
+  /* 7692 */  { MAD_F(0x04a23fa7) /* 0.289611487 */, 19 },
+  /* 7693 */  { MAD_F(0x04a2744b) /* 0.289661689 */, 19 },
+  /* 7694 */  { MAD_F(0x04a2a8f0) /* 0.289711894 */, 19 },
+  /* 7695 */  { MAD_F(0x04a2dd95) /* 0.289762101 */, 19 },
+
+  /* 7696 */  { MAD_F(0x04a3123b) /* 0.289812309 */, 19 },
+  /* 7697 */  { MAD_F(0x04a346e2) /* 0.289862521 */, 19 },
+  /* 7698 */  { MAD_F(0x04a37b89) /* 0.289912734 */, 19 },
+  /* 7699 */  { MAD_F(0x04a3b030) /* 0.289962949 */, 19 },
+  /* 7700 */  { MAD_F(0x04a3e4d8) /* 0.290013167 */, 19 },
+  /* 7701 */  { MAD_F(0x04a41981) /* 0.290063387 */, 19 },
+  /* 7702 */  { MAD_F(0x04a44e2b) /* 0.290113609 */, 19 },
+  /* 7703 */  { MAD_F(0x04a482d5) /* 0.290163833 */, 19 },
+  /* 7704 */  { MAD_F(0x04a4b77f) /* 0.290214059 */, 19 },
+  /* 7705 */  { MAD_F(0x04a4ec2a) /* 0.290264288 */, 19 },
+  /* 7706 */  { MAD_F(0x04a520d6) /* 0.290314519 */, 19 },
+  /* 7707 */  { MAD_F(0x04a55582) /* 0.290364751 */, 19 },
+  /* 7708 */  { MAD_F(0x04a58a2f) /* 0.290414986 */, 19 },
+  /* 7709 */  { MAD_F(0x04a5bedd) /* 0.290465224 */, 19 },
+  /* 7710 */  { MAD_F(0x04a5f38b) /* 0.290515463 */, 19 },
+  /* 7711 */  { MAD_F(0x04a62839) /* 0.290565705 */, 19 },
+
+  /* 7712 */  { MAD_F(0x04a65ce8) /* 0.290615948 */, 19 },
+  /* 7713 */  { MAD_F(0x04a69198) /* 0.290666194 */, 19 },
+  /* 7714 */  { MAD_F(0x04a6c648) /* 0.290716442 */, 19 },
+  /* 7715 */  { MAD_F(0x04a6faf9) /* 0.290766692 */, 19 },
+  /* 7716 */  { MAD_F(0x04a72fab) /* 0.290816945 */, 19 },
+  /* 7717 */  { MAD_F(0x04a7645d) /* 0.290867199 */, 19 },
+  /* 7718 */  { MAD_F(0x04a79910) /* 0.290917456 */, 19 },
+  /* 7719 */  { MAD_F(0x04a7cdc3) /* 0.290967715 */, 19 },
+  /* 7720 */  { MAD_F(0x04a80277) /* 0.291017976 */, 19 },
+  /* 7721 */  { MAD_F(0x04a8372b) /* 0.291068239 */, 19 },
+  /* 7722 */  { MAD_F(0x04a86be0) /* 0.291118505 */, 19 },
+  /* 7723 */  { MAD_F(0x04a8a096) /* 0.291168772 */, 19 },
+  /* 7724 */  { MAD_F(0x04a8d54c) /* 0.291219042 */, 19 },
+  /* 7725 */  { MAD_F(0x04a90a03) /* 0.291269314 */, 19 },
+  /* 7726 */  { MAD_F(0x04a93eba) /* 0.291319588 */, 19 },
+  /* 7727 */  { MAD_F(0x04a97372) /* 0.291369865 */, 19 },
+
+  /* 7728 */  { MAD_F(0x04a9a82b) /* 0.291420143 */, 19 },
+  /* 7729 */  { MAD_F(0x04a9dce4) /* 0.291470424 */, 19 },
+  /* 7730 */  { MAD_F(0x04aa119d) /* 0.291520706 */, 19 },
+  /* 7731 */  { MAD_F(0x04aa4658) /* 0.291570991 */, 19 },
+  /* 7732 */  { MAD_F(0x04aa7b13) /* 0.291621278 */, 19 },
+  /* 7733 */  { MAD_F(0x04aaafce) /* 0.291671568 */, 19 },
+  /* 7734 */  { MAD_F(0x04aae48a) /* 0.291721859 */, 19 },
+  /* 7735 */  { MAD_F(0x04ab1947) /* 0.291772153 */, 19 },
+  /* 7736 */  { MAD_F(0x04ab4e04) /* 0.291822449 */, 19 },
+  /* 7737 */  { MAD_F(0x04ab82c2) /* 0.291872747 */, 19 },
+  /* 7738 */  { MAD_F(0x04abb780) /* 0.291923047 */, 19 },
+  /* 7739 */  { MAD_F(0x04abec3f) /* 0.291973349 */, 19 },
+  /* 7740 */  { MAD_F(0x04ac20fe) /* 0.292023653 */, 19 },
+  /* 7741 */  { MAD_F(0x04ac55be) /* 0.292073960 */, 19 },
+  /* 7742 */  { MAD_F(0x04ac8a7f) /* 0.292124269 */, 19 },
+  /* 7743 */  { MAD_F(0x04acbf40) /* 0.292174580 */, 19 },
+
+  /* 7744 */  { MAD_F(0x04acf402) /* 0.292224893 */, 19 },
+  /* 7745 */  { MAD_F(0x04ad28c5) /* 0.292275208 */, 19 },
+  /* 7746 */  { MAD_F(0x04ad5d88) /* 0.292325526 */, 19 },
+  /* 7747 */  { MAD_F(0x04ad924b) /* 0.292375845 */, 19 },
+  /* 7748 */  { MAD_F(0x04adc70f) /* 0.292426167 */, 19 },
+  /* 7749 */  { MAD_F(0x04adfbd4) /* 0.292476491 */, 19 },
+  /* 7750 */  { MAD_F(0x04ae3099) /* 0.292526817 */, 19 },
+  /* 7751 */  { MAD_F(0x04ae655f) /* 0.292577145 */, 19 },
+  /* 7752 */  { MAD_F(0x04ae9a26) /* 0.292627476 */, 19 },
+  /* 7753 */  { MAD_F(0x04aeceed) /* 0.292677808 */, 19 },
+  /* 7754 */  { MAD_F(0x04af03b4) /* 0.292728143 */, 19 },
+  /* 7755 */  { MAD_F(0x04af387d) /* 0.292778480 */, 19 },
+  /* 7756 */  { MAD_F(0x04af6d45) /* 0.292828819 */, 19 },
+  /* 7757 */  { MAD_F(0x04afa20f) /* 0.292879160 */, 19 },
+  /* 7758 */  { MAD_F(0x04afd6d9) /* 0.292929504 */, 19 },
+  /* 7759 */  { MAD_F(0x04b00ba3) /* 0.292979849 */, 19 },
+
+  /* 7760 */  { MAD_F(0x04b0406e) /* 0.293030197 */, 19 },
+  /* 7761 */  { MAD_F(0x04b0753a) /* 0.293080547 */, 19 },
+  /* 7762 */  { MAD_F(0x04b0aa06) /* 0.293130899 */, 19 },
+  /* 7763 */  { MAD_F(0x04b0ded3) /* 0.293181253 */, 19 },
+  /* 7764 */  { MAD_F(0x04b113a1) /* 0.293231610 */, 19 },
+  /* 7765 */  { MAD_F(0x04b1486f) /* 0.293281968 */, 19 },
+  /* 7766 */  { MAD_F(0x04b17d3d) /* 0.293332329 */, 19 },
+  /* 7767 */  { MAD_F(0x04b1b20c) /* 0.293382692 */, 19 },
+  /* 7768 */  { MAD_F(0x04b1e6dc) /* 0.293433057 */, 19 },
+  /* 7769 */  { MAD_F(0x04b21bad) /* 0.293483424 */, 19 },
+  /* 7770 */  { MAD_F(0x04b2507d) /* 0.293533794 */, 19 },
+  /* 7771 */  { MAD_F(0x04b2854f) /* 0.293584165 */, 19 },
+  /* 7772 */  { MAD_F(0x04b2ba21) /* 0.293634539 */, 19 },
+  /* 7773 */  { MAD_F(0x04b2eef4) /* 0.293684915 */, 19 },
+  /* 7774 */  { MAD_F(0x04b323c7) /* 0.293735293 */, 19 },
+  /* 7775 */  { MAD_F(0x04b3589b) /* 0.293785673 */, 19 },
+
+  /* 7776 */  { MAD_F(0x04b38d6f) /* 0.293836055 */, 19 },
+  /* 7777 */  { MAD_F(0x04b3c244) /* 0.293886440 */, 19 },
+  /* 7778 */  { MAD_F(0x04b3f71a) /* 0.293936826 */, 19 },
+  /* 7779 */  { MAD_F(0x04b42bf0) /* 0.293987215 */, 19 },
+  /* 7780 */  { MAD_F(0x04b460c7) /* 0.294037606 */, 19 },
+  /* 7781 */  { MAD_F(0x04b4959e) /* 0.294087999 */, 19 },
+  /* 7782 */  { MAD_F(0x04b4ca76) /* 0.294138395 */, 19 },
+  /* 7783 */  { MAD_F(0x04b4ff4e) /* 0.294188792 */, 19 },
+  /* 7784 */  { MAD_F(0x04b53427) /* 0.294239192 */, 19 },
+  /* 7785 */  { MAD_F(0x04b56901) /* 0.294289593 */, 19 },
+  /* 7786 */  { MAD_F(0x04b59ddb) /* 0.294339997 */, 19 },
+  /* 7787 */  { MAD_F(0x04b5d2b6) /* 0.294390403 */, 19 },
+  /* 7788 */  { MAD_F(0x04b60791) /* 0.294440812 */, 19 },
+  /* 7789 */  { MAD_F(0x04b63c6d) /* 0.294491222 */, 19 },
+  /* 7790 */  { MAD_F(0x04b6714a) /* 0.294541635 */, 19 },
+  /* 7791 */  { MAD_F(0x04b6a627) /* 0.294592049 */, 19 },
+
+  /* 7792 */  { MAD_F(0x04b6db05) /* 0.294642466 */, 19 },
+  /* 7793 */  { MAD_F(0x04b70fe3) /* 0.294692885 */, 19 },
+  /* 7794 */  { MAD_F(0x04b744c2) /* 0.294743306 */, 19 },
+  /* 7795 */  { MAD_F(0x04b779a1) /* 0.294793730 */, 19 },
+  /* 7796 */  { MAD_F(0x04b7ae81) /* 0.294844155 */, 19 },
+  /* 7797 */  { MAD_F(0x04b7e362) /* 0.294894583 */, 19 },
+  /* 7798 */  { MAD_F(0x04b81843) /* 0.294945013 */, 19 },
+  /* 7799 */  { MAD_F(0x04b84d24) /* 0.294995445 */, 19 },
+  /* 7800 */  { MAD_F(0x04b88207) /* 0.295045879 */, 19 },
+  /* 7801 */  { MAD_F(0x04b8b6ea) /* 0.295096315 */, 19 },
+  /* 7802 */  { MAD_F(0x04b8ebcd) /* 0.295146753 */, 19 },
+  /* 7803 */  { MAD_F(0x04b920b1) /* 0.295197194 */, 19 },
+  /* 7804 */  { MAD_F(0x04b95596) /* 0.295247637 */, 19 },
+  /* 7805 */  { MAD_F(0x04b98a7b) /* 0.295298082 */, 19 },
+  /* 7806 */  { MAD_F(0x04b9bf61) /* 0.295348529 */, 19 },
+  /* 7807 */  { MAD_F(0x04b9f447) /* 0.295398978 */, 19 },
+
+  /* 7808 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 19 },
+  /* 7809 */  { MAD_F(0x04ba5e16) /* 0.295499883 */, 19 },
+  /* 7810 */  { MAD_F(0x04ba92fe) /* 0.295550338 */, 19 },
+  /* 7811 */  { MAD_F(0x04bac7e6) /* 0.295600796 */, 19 },
+  /* 7812 */  { MAD_F(0x04bafcd0) /* 0.295651256 */, 19 },
+  /* 7813 */  { MAD_F(0x04bb31b9) /* 0.295701718 */, 19 },
+  /* 7814 */  { MAD_F(0x04bb66a4) /* 0.295752183 */, 19 },
+  /* 7815 */  { MAD_F(0x04bb9b8f) /* 0.295802649 */, 19 },
+  /* 7816 */  { MAD_F(0x04bbd07a) /* 0.295853118 */, 19 },
+  /* 7817 */  { MAD_F(0x04bc0566) /* 0.295903588 */, 19 },
+  /* 7818 */  { MAD_F(0x04bc3a53) /* 0.295954061 */, 19 },
+  /* 7819 */  { MAD_F(0x04bc6f40) /* 0.296004536 */, 19 },
+  /* 7820 */  { MAD_F(0x04bca42e) /* 0.296055013 */, 19 },
+  /* 7821 */  { MAD_F(0x04bcd91d) /* 0.296105493 */, 19 },
+  /* 7822 */  { MAD_F(0x04bd0e0c) /* 0.296155974 */, 19 },
+  /* 7823 */  { MAD_F(0x04bd42fb) /* 0.296206458 */, 19 },
+
+  /* 7824 */  { MAD_F(0x04bd77ec) /* 0.296256944 */, 19 },
+  /* 7825 */  { MAD_F(0x04bdacdc) /* 0.296307432 */, 19 },
+  /* 7826 */  { MAD_F(0x04bde1ce) /* 0.296357922 */, 19 },
+  /* 7827 */  { MAD_F(0x04be16c0) /* 0.296408414 */, 19 },
+  /* 7828 */  { MAD_F(0x04be4bb2) /* 0.296458908 */, 19 },
+  /* 7829 */  { MAD_F(0x04be80a5) /* 0.296509405 */, 19 },
+  /* 7830 */  { MAD_F(0x04beb599) /* 0.296559904 */, 19 },
+  /* 7831 */  { MAD_F(0x04beea8d) /* 0.296610404 */, 19 },
+  /* 7832 */  { MAD_F(0x04bf1f82) /* 0.296660907 */, 19 },
+  /* 7833 */  { MAD_F(0x04bf5477) /* 0.296711413 */, 19 },
+  /* 7834 */  { MAD_F(0x04bf896d) /* 0.296761920 */, 19 },
+  /* 7835 */  { MAD_F(0x04bfbe64) /* 0.296812429 */, 19 },
+  /* 7836 */  { MAD_F(0x04bff35b) /* 0.296862941 */, 19 },
+  /* 7837 */  { MAD_F(0x04c02852) /* 0.296913455 */, 19 },
+  /* 7838 */  { MAD_F(0x04c05d4b) /* 0.296963971 */, 19 },
+  /* 7839 */  { MAD_F(0x04c09243) /* 0.297014489 */, 19 },
+
+  /* 7840 */  { MAD_F(0x04c0c73d) /* 0.297065009 */, 19 },
+  /* 7841 */  { MAD_F(0x04c0fc37) /* 0.297115531 */, 19 },
+  /* 7842 */  { MAD_F(0x04c13131) /* 0.297166056 */, 19 },
+  /* 7843 */  { MAD_F(0x04c1662d) /* 0.297216582 */, 19 },
+  /* 7844 */  { MAD_F(0x04c19b28) /* 0.297267111 */, 19 },
+  /* 7845 */  { MAD_F(0x04c1d025) /* 0.297317642 */, 19 },
+  /* 7846 */  { MAD_F(0x04c20521) /* 0.297368175 */, 19 },
+  /* 7847 */  { MAD_F(0x04c23a1f) /* 0.297418710 */, 19 },
+  /* 7848 */  { MAD_F(0x04c26f1d) /* 0.297469248 */, 19 },
+  /* 7849 */  { MAD_F(0x04c2a41b) /* 0.297519787 */, 19 },
+  /* 7850 */  { MAD_F(0x04c2d91b) /* 0.297570329 */, 19 },
+  /* 7851 */  { MAD_F(0x04c30e1a) /* 0.297620873 */, 19 },
+  /* 7852 */  { MAD_F(0x04c3431b) /* 0.297671418 */, 19 },
+  /* 7853 */  { MAD_F(0x04c3781c) /* 0.297721967 */, 19 },
+  /* 7854 */  { MAD_F(0x04c3ad1d) /* 0.297772517 */, 19 },
+  /* 7855 */  { MAD_F(0x04c3e21f) /* 0.297823069 */, 19 },
+
+  /* 7856 */  { MAD_F(0x04c41722) /* 0.297873624 */, 19 },
+  /* 7857 */  { MAD_F(0x04c44c25) /* 0.297924180 */, 19 },
+  /* 7858 */  { MAD_F(0x04c48129) /* 0.297974739 */, 19 },
+  /* 7859 */  { MAD_F(0x04c4b62d) /* 0.298025300 */, 19 },
+  /* 7860 */  { MAD_F(0x04c4eb32) /* 0.298075863 */, 19 },
+  /* 7861 */  { MAD_F(0x04c52038) /* 0.298126429 */, 19 },
+  /* 7862 */  { MAD_F(0x04c5553e) /* 0.298176996 */, 19 },
+  /* 7863 */  { MAD_F(0x04c58a44) /* 0.298227565 */, 19 },
+  /* 7864 */  { MAD_F(0x04c5bf4c) /* 0.298278137 */, 19 },
+  /* 7865 */  { MAD_F(0x04c5f453) /* 0.298328711 */, 19 },
+  /* 7866 */  { MAD_F(0x04c6295c) /* 0.298379287 */, 19 },
+  /* 7867 */  { MAD_F(0x04c65e65) /* 0.298429865 */, 19 },
+  /* 7868 */  { MAD_F(0x04c6936e) /* 0.298480445 */, 19 },
+  /* 7869 */  { MAD_F(0x04c6c878) /* 0.298531028 */, 19 },
+  /* 7870 */  { MAD_F(0x04c6fd83) /* 0.298581612 */, 19 },
+  /* 7871 */  { MAD_F(0x04c7328e) /* 0.298632199 */, 19 },
+
+  /* 7872 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 19 },
+  /* 7873 */  { MAD_F(0x04c79ca7) /* 0.298733379 */, 19 },
+  /* 7874 */  { MAD_F(0x04c7d1b4) /* 0.298783972 */, 19 },
+  /* 7875 */  { MAD_F(0x04c806c1) /* 0.298834567 */, 19 },
+  /* 7876 */  { MAD_F(0x04c83bcf) /* 0.298885165 */, 19 },
+  /* 7877 */  { MAD_F(0x04c870de) /* 0.298935764 */, 19 },
+  /* 7878 */  { MAD_F(0x04c8a5ed) /* 0.298986366 */, 19 },
+  /* 7879 */  { MAD_F(0x04c8dafd) /* 0.299036970 */, 19 },
+  /* 7880 */  { MAD_F(0x04c9100d) /* 0.299087576 */, 19 },
+  /* 7881 */  { MAD_F(0x04c9451e) /* 0.299138184 */, 19 },
+  /* 7882 */  { MAD_F(0x04c97a30) /* 0.299188794 */, 19 },
+  /* 7883 */  { MAD_F(0x04c9af42) /* 0.299239406 */, 19 },
+  /* 7884 */  { MAD_F(0x04c9e455) /* 0.299290021 */, 19 },
+  /* 7885 */  { MAD_F(0x04ca1968) /* 0.299340638 */, 19 },
+  /* 7886 */  { MAD_F(0x04ca4e7c) /* 0.299391256 */, 19 },
+  /* 7887 */  { MAD_F(0x04ca8391) /* 0.299441877 */, 19 },
+
+  /* 7888 */  { MAD_F(0x04cab8a6) /* 0.299492500 */, 19 },
+  /* 7889 */  { MAD_F(0x04caedbb) /* 0.299543126 */, 19 },
+  /* 7890 */  { MAD_F(0x04cb22d1) /* 0.299593753 */, 19 },
+  /* 7891 */  { MAD_F(0x04cb57e8) /* 0.299644382 */, 19 },
+  /* 7892 */  { MAD_F(0x04cb8d00) /* 0.299695014 */, 19 },
+  /* 7893 */  { MAD_F(0x04cbc217) /* 0.299745648 */, 19 },
+  /* 7894 */  { MAD_F(0x04cbf730) /* 0.299796284 */, 19 },
+  /* 7895 */  { MAD_F(0x04cc2c49) /* 0.299846922 */, 19 },
+  /* 7896 */  { MAD_F(0x04cc6163) /* 0.299897562 */, 19 },
+  /* 7897 */  { MAD_F(0x04cc967d) /* 0.299948204 */, 19 },
+  /* 7898 */  { MAD_F(0x04cccb98) /* 0.299998849 */, 19 },
+  /* 7899 */  { MAD_F(0x04cd00b3) /* 0.300049495 */, 19 },
+  /* 7900 */  { MAD_F(0x04cd35cf) /* 0.300100144 */, 19 },
+  /* 7901 */  { MAD_F(0x04cd6aeb) /* 0.300150795 */, 19 },
+  /* 7902 */  { MAD_F(0x04cda008) /* 0.300201448 */, 19 },
+  /* 7903 */  { MAD_F(0x04cdd526) /* 0.300252103 */, 19 },
+
+  /* 7904 */  { MAD_F(0x04ce0a44) /* 0.300302761 */, 19 },
+  /* 7905 */  { MAD_F(0x04ce3f63) /* 0.300353420 */, 19 },
+  /* 7906 */  { MAD_F(0x04ce7482) /* 0.300404082 */, 19 },
+  /* 7907 */  { MAD_F(0x04cea9a2) /* 0.300454745 */, 19 },
+  /* 7908 */  { MAD_F(0x04cedec3) /* 0.300505411 */, 19 },
+  /* 7909 */  { MAD_F(0x04cf13e4) /* 0.300556079 */, 19 },
+  /* 7910 */  { MAD_F(0x04cf4906) /* 0.300606749 */, 19 },
+  /* 7911 */  { MAD_F(0x04cf7e28) /* 0.300657421 */, 19 },
+  /* 7912 */  { MAD_F(0x04cfb34b) /* 0.300708096 */, 19 },
+  /* 7913 */  { MAD_F(0x04cfe86e) /* 0.300758772 */, 19 },
+  /* 7914 */  { MAD_F(0x04d01d92) /* 0.300809451 */, 19 },
+  /* 7915 */  { MAD_F(0x04d052b6) /* 0.300860132 */, 19 },
+  /* 7916 */  { MAD_F(0x04d087db) /* 0.300910815 */, 19 },
+  /* 7917 */  { MAD_F(0x04d0bd01) /* 0.300961500 */, 19 },
+  /* 7918 */  { MAD_F(0x04d0f227) /* 0.301012187 */, 19 },
+  /* 7919 */  { MAD_F(0x04d1274e) /* 0.301062876 */, 19 },
+
+  /* 7920 */  { MAD_F(0x04d15c76) /* 0.301113568 */, 19 },
+  /* 7921 */  { MAD_F(0x04d1919e) /* 0.301164261 */, 19 },
+  /* 7922 */  { MAD_F(0x04d1c6c6) /* 0.301214957 */, 19 },
+  /* 7923 */  { MAD_F(0x04d1fbef) /* 0.301265655 */, 19 },
+  /* 7924 */  { MAD_F(0x04d23119) /* 0.301316355 */, 19 },
+  /* 7925 */  { MAD_F(0x04d26643) /* 0.301367057 */, 19 },
+  /* 7926 */  { MAD_F(0x04d29b6e) /* 0.301417761 */, 19 },
+  /* 7927 */  { MAD_F(0x04d2d099) /* 0.301468468 */, 19 },
+  /* 7928 */  { MAD_F(0x04d305c5) /* 0.301519176 */, 19 },
+  /* 7929 */  { MAD_F(0x04d33af2) /* 0.301569887 */, 19 },
+  /* 7930 */  { MAD_F(0x04d3701f) /* 0.301620599 */, 19 },
+  /* 7931 */  { MAD_F(0x04d3a54d) /* 0.301671314 */, 19 },
+  /* 7932 */  { MAD_F(0x04d3da7b) /* 0.301722031 */, 19 },
+  /* 7933 */  { MAD_F(0x04d40faa) /* 0.301772751 */, 19 },
+  /* 7934 */  { MAD_F(0x04d444d9) /* 0.301823472 */, 19 },
+  /* 7935 */  { MAD_F(0x04d47a09) /* 0.301874195 */, 19 },
+
+  /* 7936 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 19 },
+  /* 7937 */  { MAD_F(0x04d4e46b) /* 0.301975649 */, 19 },
+  /* 7938 */  { MAD_F(0x04d5199c) /* 0.302026378 */, 19 },
+  /* 7939 */  { MAD_F(0x04d54ecf) /* 0.302077110 */, 19 },
+  /* 7940 */  { MAD_F(0x04d58401) /* 0.302127845 */, 19 },
+  /* 7941 */  { MAD_F(0x04d5b935) /* 0.302178581 */, 19 },
+  /* 7942 */  { MAD_F(0x04d5ee69) /* 0.302229319 */, 19 },
+  /* 7943 */  { MAD_F(0x04d6239d) /* 0.302280060 */, 19 },
+  /* 7944 */  { MAD_F(0x04d658d2) /* 0.302330802 */, 19 },
+  /* 7945 */  { MAD_F(0x04d68e08) /* 0.302381547 */, 19 },
+  /* 7946 */  { MAD_F(0x04d6c33e) /* 0.302432294 */, 19 },
+  /* 7947 */  { MAD_F(0x04d6f875) /* 0.302483043 */, 19 },
+  /* 7948 */  { MAD_F(0x04d72dad) /* 0.302533794 */, 19 },
+  /* 7949 */  { MAD_F(0x04d762e5) /* 0.302584547 */, 19 },
+  /* 7950 */  { MAD_F(0x04d7981d) /* 0.302635303 */, 19 },
+  /* 7951 */  { MAD_F(0x04d7cd56) /* 0.302686060 */, 19 },
+
+  /* 7952 */  { MAD_F(0x04d80290) /* 0.302736820 */, 19 },
+  /* 7953 */  { MAD_F(0x04d837ca) /* 0.302787581 */, 19 },
+  /* 7954 */  { MAD_F(0x04d86d05) /* 0.302838345 */, 19 },
+  /* 7955 */  { MAD_F(0x04d8a240) /* 0.302889111 */, 19 },
+  /* 7956 */  { MAD_F(0x04d8d77c) /* 0.302939879 */, 19 },
+  /* 7957 */  { MAD_F(0x04d90cb9) /* 0.302990650 */, 19 },
+  /* 7958 */  { MAD_F(0x04d941f6) /* 0.303041422 */, 19 },
+  /* 7959 */  { MAD_F(0x04d97734) /* 0.303092197 */, 19 },
+  /* 7960 */  { MAD_F(0x04d9ac72) /* 0.303142973 */, 19 },
+  /* 7961 */  { MAD_F(0x04d9e1b1) /* 0.303193752 */, 19 },
+  /* 7962 */  { MAD_F(0x04da16f0) /* 0.303244533 */, 19 },
+  /* 7963 */  { MAD_F(0x04da4c30) /* 0.303295316 */, 19 },
+  /* 7964 */  { MAD_F(0x04da8171) /* 0.303346101 */, 19 },
+  /* 7965 */  { MAD_F(0x04dab6b2) /* 0.303396889 */, 19 },
+  /* 7966 */  { MAD_F(0x04daebf4) /* 0.303447678 */, 19 },
+  /* 7967 */  { MAD_F(0x04db2136) /* 0.303498469 */, 19 },
+
+  /* 7968 */  { MAD_F(0x04db5679) /* 0.303549263 */, 19 },
+  /* 7969 */  { MAD_F(0x04db8bbc) /* 0.303600059 */, 19 },
+  /* 7970 */  { MAD_F(0x04dbc100) /* 0.303650857 */, 19 },
+  /* 7971 */  { MAD_F(0x04dbf644) /* 0.303701657 */, 19 },
+  /* 7972 */  { MAD_F(0x04dc2b8a) /* 0.303752459 */, 19 },
+  /* 7973 */  { MAD_F(0x04dc60cf) /* 0.303803263 */, 19 },
+  /* 7974 */  { MAD_F(0x04dc9616) /* 0.303854070 */, 19 },
+  /* 7975 */  { MAD_F(0x04dccb5c) /* 0.303904878 */, 19 },
+  /* 7976 */  { MAD_F(0x04dd00a4) /* 0.303955689 */, 19 },
+  /* 7977 */  { MAD_F(0x04dd35ec) /* 0.304006502 */, 19 },
+  /* 7978 */  { MAD_F(0x04dd6b34) /* 0.304057317 */, 19 },
+  /* 7979 */  { MAD_F(0x04dda07d) /* 0.304108134 */, 19 },
+  /* 7980 */  { MAD_F(0x04ddd5c7) /* 0.304158953 */, 19 },
+  /* 7981 */  { MAD_F(0x04de0b11) /* 0.304209774 */, 19 },
+  /* 7982 */  { MAD_F(0x04de405c) /* 0.304260597 */, 19 },
+  /* 7983 */  { MAD_F(0x04de75a7) /* 0.304311423 */, 19 },
+
+  /* 7984 */  { MAD_F(0x04deaaf3) /* 0.304362251 */, 19 },
+  /* 7985 */  { MAD_F(0x04dee040) /* 0.304413080 */, 19 },
+  /* 7986 */  { MAD_F(0x04df158d) /* 0.304463912 */, 19 },
+  /* 7987 */  { MAD_F(0x04df4adb) /* 0.304514746 */, 19 },
+  /* 7988 */  { MAD_F(0x04df8029) /* 0.304565582 */, 19 },
+  /* 7989 */  { MAD_F(0x04dfb578) /* 0.304616421 */, 19 },
+  /* 7990 */  { MAD_F(0x04dfeac7) /* 0.304667261 */, 19 },
+  /* 7991 */  { MAD_F(0x04e02017) /* 0.304718103 */, 19 },
+  /* 7992 */  { MAD_F(0x04e05567) /* 0.304768948 */, 19 },
+  /* 7993 */  { MAD_F(0x04e08ab8) /* 0.304819795 */, 19 },
+  /* 7994 */  { MAD_F(0x04e0c00a) /* 0.304870644 */, 19 },
+  /* 7995 */  { MAD_F(0x04e0f55c) /* 0.304921495 */, 19 },
+  /* 7996 */  { MAD_F(0x04e12aaf) /* 0.304972348 */, 19 },
+  /* 7997 */  { MAD_F(0x04e16002) /* 0.305023203 */, 19 },
+  /* 7998 */  { MAD_F(0x04e19556) /* 0.305074060 */, 19 },
+  /* 7999 */  { MAD_F(0x04e1caab) /* 0.305124920 */, 19 },
+
+  /* 8000 */  { MAD_F(0x04e20000) /* 0.305175781 */, 19 },
+  /* 8001 */  { MAD_F(0x04e23555) /* 0.305226645 */, 19 },
+  /* 8002 */  { MAD_F(0x04e26aac) /* 0.305277511 */, 19 },
+  /* 8003 */  { MAD_F(0x04e2a002) /* 0.305328379 */, 19 },
+  /* 8004 */  { MAD_F(0x04e2d55a) /* 0.305379249 */, 19 },
+  /* 8005 */  { MAD_F(0x04e30ab2) /* 0.305430121 */, 19 },
+  /* 8006 */  { MAD_F(0x04e3400a) /* 0.305480995 */, 19 },
+  /* 8007 */  { MAD_F(0x04e37563) /* 0.305531872 */, 19 },
+  /* 8008 */  { MAD_F(0x04e3aabd) /* 0.305582750 */, 19 },
+  /* 8009 */  { MAD_F(0x04e3e017) /* 0.305633631 */, 19 },
+  /* 8010 */  { MAD_F(0x04e41572) /* 0.305684513 */, 19 },
+  /* 8011 */  { MAD_F(0x04e44acd) /* 0.305735398 */, 19 },
+  /* 8012 */  { MAD_F(0x04e48029) /* 0.305786285 */, 19 },
+  /* 8013 */  { MAD_F(0x04e4b585) /* 0.305837174 */, 19 },
+  /* 8014 */  { MAD_F(0x04e4eae2) /* 0.305888066 */, 19 },
+  /* 8015 */  { MAD_F(0x04e52040) /* 0.305938959 */, 19 },
+
+  /* 8016 */  { MAD_F(0x04e5559e) /* 0.305989854 */, 19 },
+  /* 8017 */  { MAD_F(0x04e58afd) /* 0.306040752 */, 19 },
+  /* 8018 */  { MAD_F(0x04e5c05c) /* 0.306091652 */, 19 },
+  /* 8019 */  { MAD_F(0x04e5f5bc) /* 0.306142554 */, 19 },
+  /* 8020 */  { MAD_F(0x04e62b1c) /* 0.306193457 */, 19 },
+  /* 8021 */  { MAD_F(0x04e6607d) /* 0.306244364 */, 19 },
+  /* 8022 */  { MAD_F(0x04e695df) /* 0.306295272 */, 19 },
+  /* 8023 */  { MAD_F(0x04e6cb41) /* 0.306346182 */, 19 },
+  /* 8024 */  { MAD_F(0x04e700a3) /* 0.306397094 */, 19 },
+  /* 8025 */  { MAD_F(0x04e73607) /* 0.306448009 */, 19 },
+  /* 8026 */  { MAD_F(0x04e76b6b) /* 0.306498925 */, 19 },
+  /* 8027 */  { MAD_F(0x04e7a0cf) /* 0.306549844 */, 19 },
+  /* 8028 */  { MAD_F(0x04e7d634) /* 0.306600765 */, 19 },
+  /* 8029 */  { MAD_F(0x04e80b99) /* 0.306651688 */, 19 },
+  /* 8030 */  { MAD_F(0x04e84100) /* 0.306702613 */, 19 },
+  /* 8031 */  { MAD_F(0x04e87666) /* 0.306753540 */, 19 },
+
+  /* 8032 */  { MAD_F(0x04e8abcd) /* 0.306804470 */, 19 },
+  /* 8033 */  { MAD_F(0x04e8e135) /* 0.306855401 */, 19 },
+  /* 8034 */  { MAD_F(0x04e9169e) /* 0.306906334 */, 19 },
+  /* 8035 */  { MAD_F(0x04e94c07) /* 0.306957270 */, 19 },
+  /* 8036 */  { MAD_F(0x04e98170) /* 0.307008208 */, 19 },
+  /* 8037 */  { MAD_F(0x04e9b6da) /* 0.307059148 */, 19 },
+  /* 8038 */  { MAD_F(0x04e9ec45) /* 0.307110090 */, 19 },
+  /* 8039 */  { MAD_F(0x04ea21b0) /* 0.307161034 */, 19 },
+  /* 8040 */  { MAD_F(0x04ea571c) /* 0.307211980 */, 19 },
+  /* 8041 */  { MAD_F(0x04ea8c88) /* 0.307262928 */, 19 },
+  /* 8042 */  { MAD_F(0x04eac1f5) /* 0.307313879 */, 19 },
+  /* 8043 */  { MAD_F(0x04eaf762) /* 0.307364831 */, 19 },
+  /* 8044 */  { MAD_F(0x04eb2cd0) /* 0.307415786 */, 19 },
+  /* 8045 */  { MAD_F(0x04eb623f) /* 0.307466743 */, 19 },
+  /* 8046 */  { MAD_F(0x04eb97ae) /* 0.307517702 */, 19 },
+  /* 8047 */  { MAD_F(0x04ebcd1e) /* 0.307568663 */, 19 },
+
+  /* 8048 */  { MAD_F(0x04ec028e) /* 0.307619626 */, 19 },
+  /* 8049 */  { MAD_F(0x04ec37ff) /* 0.307670591 */, 19 },
+  /* 8050 */  { MAD_F(0x04ec6d71) /* 0.307721558 */, 19 },
+  /* 8051 */  { MAD_F(0x04eca2e3) /* 0.307772528 */, 19 },
+  /* 8052 */  { MAD_F(0x04ecd855) /* 0.307823499 */, 19 },
+  /* 8053 */  { MAD_F(0x04ed0dc8) /* 0.307874473 */, 19 },
+  /* 8054 */  { MAD_F(0x04ed433c) /* 0.307925449 */, 19 },
+  /* 8055 */  { MAD_F(0x04ed78b0) /* 0.307976426 */, 19 },
+  /* 8056 */  { MAD_F(0x04edae25) /* 0.308027406 */, 19 },
+  /* 8057 */  { MAD_F(0x04ede39a) /* 0.308078389 */, 19 },
+  /* 8058 */  { MAD_F(0x04ee1910) /* 0.308129373 */, 19 },
+  /* 8059 */  { MAD_F(0x04ee4e87) /* 0.308180359 */, 19 },
+  /* 8060 */  { MAD_F(0x04ee83fe) /* 0.308231347 */, 19 },
+  /* 8061 */  { MAD_F(0x04eeb976) /* 0.308282338 */, 19 },
+  /* 8062 */  { MAD_F(0x04eeeeee) /* 0.308333331 */, 19 },
+  /* 8063 */  { MAD_F(0x04ef2467) /* 0.308384325 */, 19 },
+
+  /* 8064 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 19 },
+  /* 8065 */  { MAD_F(0x04ef8f5a) /* 0.308486321 */, 19 },
+  /* 8066 */  { MAD_F(0x04efc4d5) /* 0.308537322 */, 19 },
+  /* 8067 */  { MAD_F(0x04effa50) /* 0.308588325 */, 19 },
+  /* 8068 */  { MAD_F(0x04f02fcb) /* 0.308639331 */, 19 },
+  /* 8069 */  { MAD_F(0x04f06547) /* 0.308690338 */, 19 },
+  /* 8070 */  { MAD_F(0x04f09ac4) /* 0.308741348 */, 19 },
+  /* 8071 */  { MAD_F(0x04f0d041) /* 0.308792359 */, 19 },
+  /* 8072 */  { MAD_F(0x04f105bf) /* 0.308843373 */, 19 },
+  /* 8073 */  { MAD_F(0x04f13b3e) /* 0.308894389 */, 19 },
+  /* 8074 */  { MAD_F(0x04f170bd) /* 0.308945407 */, 19 },
+  /* 8075 */  { MAD_F(0x04f1a63c) /* 0.308996427 */, 19 },
+  /* 8076 */  { MAD_F(0x04f1dbbd) /* 0.309047449 */, 19 },
+  /* 8077 */  { MAD_F(0x04f2113d) /* 0.309098473 */, 19 },
+  /* 8078 */  { MAD_F(0x04f246bf) /* 0.309149499 */, 19 },
+  /* 8079 */  { MAD_F(0x04f27c40) /* 0.309200528 */, 19 },
+
+  /* 8080 */  { MAD_F(0x04f2b1c3) /* 0.309251558 */, 19 },
+  /* 8081 */  { MAD_F(0x04f2e746) /* 0.309302591 */, 19 },
+  /* 8082 */  { MAD_F(0x04f31cc9) /* 0.309353626 */, 19 },
+  /* 8083 */  { MAD_F(0x04f3524d) /* 0.309404663 */, 19 },
+  /* 8084 */  { MAD_F(0x04f387d2) /* 0.309455702 */, 19 },
+  /* 8085 */  { MAD_F(0x04f3bd57) /* 0.309506743 */, 19 },
+  /* 8086 */  { MAD_F(0x04f3f2dd) /* 0.309557786 */, 19 },
+  /* 8087 */  { MAD_F(0x04f42864) /* 0.309608831 */, 19 },
+  /* 8088 */  { MAD_F(0x04f45dea) /* 0.309659879 */, 19 },
+  /* 8089 */  { MAD_F(0x04f49372) /* 0.309710928 */, 19 },
+  /* 8090 */  { MAD_F(0x04f4c8fa) /* 0.309761980 */, 19 },
+  /* 8091 */  { MAD_F(0x04f4fe83) /* 0.309813033 */, 19 },
+  /* 8092 */  { MAD_F(0x04f5340c) /* 0.309864089 */, 19 },
+  /* 8093 */  { MAD_F(0x04f56996) /* 0.309915147 */, 19 },
+  /* 8094 */  { MAD_F(0x04f59f20) /* 0.309966207 */, 19 },
+  /* 8095 */  { MAD_F(0x04f5d4ab) /* 0.310017269 */, 19 },
+
+  /* 8096 */  { MAD_F(0x04f60a36) /* 0.310068333 */, 19 },
+  /* 8097 */  { MAD_F(0x04f63fc2) /* 0.310119400 */, 19 },
+  /* 8098 */  { MAD_F(0x04f6754f) /* 0.310170468 */, 19 },
+  /* 8099 */  { MAD_F(0x04f6aadc) /* 0.310221539 */, 19 },
+  /* 8100 */  { MAD_F(0x04f6e06a) /* 0.310272611 */, 19 },
+  /* 8101 */  { MAD_F(0x04f715f8) /* 0.310323686 */, 19 },
+  /* 8102 */  { MAD_F(0x04f74b87) /* 0.310374763 */, 19 },
+  /* 8103 */  { MAD_F(0x04f78116) /* 0.310425842 */, 19 },
+  /* 8104 */  { MAD_F(0x04f7b6a6) /* 0.310476923 */, 19 },
+  /* 8105 */  { MAD_F(0x04f7ec37) /* 0.310528006 */, 19 },
+  /* 8106 */  { MAD_F(0x04f821c8) /* 0.310579091 */, 19 },
+  /* 8107 */  { MAD_F(0x04f85759) /* 0.310630179 */, 19 },
+  /* 8108 */  { MAD_F(0x04f88cec) /* 0.310681268 */, 19 },
+  /* 8109 */  { MAD_F(0x04f8c27e) /* 0.310732360 */, 19 },
+  /* 8110 */  { MAD_F(0x04f8f812) /* 0.310783453 */, 19 },
+  /* 8111 */  { MAD_F(0x04f92da6) /* 0.310834549 */, 19 },
+
+  /* 8112 */  { MAD_F(0x04f9633a) /* 0.310885647 */, 19 },
+  /* 8113 */  { MAD_F(0x04f998cf) /* 0.310936747 */, 19 },
+  /* 8114 */  { MAD_F(0x04f9ce65) /* 0.310987849 */, 19 },
+  /* 8115 */  { MAD_F(0x04fa03fb) /* 0.311038953 */, 19 },
+  /* 8116 */  { MAD_F(0x04fa3992) /* 0.311090059 */, 19 },
+  /* 8117 */  { MAD_F(0x04fa6f29) /* 0.311141168 */, 19 },
+  /* 8118 */  { MAD_F(0x04faa4c1) /* 0.311192278 */, 19 },
+  /* 8119 */  { MAD_F(0x04fada59) /* 0.311243390 */, 19 },
+  /* 8120 */  { MAD_F(0x04fb0ff2) /* 0.311294505 */, 19 },
+  /* 8121 */  { MAD_F(0x04fb458c) /* 0.311345622 */, 19 },
+  /* 8122 */  { MAD_F(0x04fb7b26) /* 0.311396741 */, 19 },
+  /* 8123 */  { MAD_F(0x04fbb0c1) /* 0.311447862 */, 19 },
+  /* 8124 */  { MAD_F(0x04fbe65c) /* 0.311498985 */, 19 },
+  /* 8125 */  { MAD_F(0x04fc1bf8) /* 0.311550110 */, 19 },
+  /* 8126 */  { MAD_F(0x04fc5194) /* 0.311601237 */, 19 },
+  /* 8127 */  { MAD_F(0x04fc8731) /* 0.311652366 */, 19 },
+
+  /* 8128 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 19 },
+  /* 8129 */  { MAD_F(0x04fcf26c) /* 0.311754631 */, 19 },
+  /* 8130 */  { MAD_F(0x04fd280b) /* 0.311805767 */, 19 },
+  /* 8131 */  { MAD_F(0x04fd5daa) /* 0.311856905 */, 19 },
+  /* 8132 */  { MAD_F(0x04fd934a) /* 0.311908044 */, 19 },
+  /* 8133 */  { MAD_F(0x04fdc8ea) /* 0.311959186 */, 19 },
+  /* 8134 */  { MAD_F(0x04fdfe8b) /* 0.312010330 */, 19 },
+  /* 8135 */  { MAD_F(0x04fe342c) /* 0.312061476 */, 19 },
+  /* 8136 */  { MAD_F(0x04fe69ce) /* 0.312112625 */, 19 },
+  /* 8137 */  { MAD_F(0x04fe9f71) /* 0.312163775 */, 19 },
+  /* 8138 */  { MAD_F(0x04fed514) /* 0.312214927 */, 19 },
+  /* 8139 */  { MAD_F(0x04ff0ab8) /* 0.312266082 */, 19 },
+  /* 8140 */  { MAD_F(0x04ff405c) /* 0.312317238 */, 19 },
+  /* 8141 */  { MAD_F(0x04ff7601) /* 0.312368397 */, 19 },
+  /* 8142 */  { MAD_F(0x04ffaba6) /* 0.312419558 */, 19 },
+  /* 8143 */  { MAD_F(0x04ffe14c) /* 0.312470720 */, 19 },
+
+  /* 8144 */  { MAD_F(0x050016f3) /* 0.312521885 */, 19 },
+  /* 8145 */  { MAD_F(0x05004c9a) /* 0.312573052 */, 19 },
+  /* 8146 */  { MAD_F(0x05008241) /* 0.312624222 */, 19 },
+  /* 8147 */  { MAD_F(0x0500b7e9) /* 0.312675393 */, 19 },
+  /* 8148 */  { MAD_F(0x0500ed92) /* 0.312726566 */, 19 },
+  /* 8149 */  { MAD_F(0x0501233b) /* 0.312777742 */, 19 },
+  /* 8150 */  { MAD_F(0x050158e5) /* 0.312828919 */, 19 },
+  /* 8151 */  { MAD_F(0x05018e90) /* 0.312880099 */, 19 },
+  /* 8152 */  { MAD_F(0x0501c43b) /* 0.312931280 */, 19 },
+  /* 8153 */  { MAD_F(0x0501f9e6) /* 0.312982464 */, 19 },
+  /* 8154 */  { MAD_F(0x05022f92) /* 0.313033650 */, 19 },
+  /* 8155 */  { MAD_F(0x0502653f) /* 0.313084838 */, 19 },
+  /* 8156 */  { MAD_F(0x05029aec) /* 0.313136028 */, 19 },
+  /* 8157 */  { MAD_F(0x0502d09a) /* 0.313187220 */, 19 },
+  /* 8158 */  { MAD_F(0x05030648) /* 0.313238414 */, 19 },
+  /* 8159 */  { MAD_F(0x05033bf7) /* 0.313289611 */, 19 },
+
+  /* 8160 */  { MAD_F(0x050371a7) /* 0.313340809 */, 19 },
+  /* 8161 */  { MAD_F(0x0503a757) /* 0.313392010 */, 19 },
+  /* 8162 */  { MAD_F(0x0503dd07) /* 0.313443212 */, 19 },
+  /* 8163 */  { MAD_F(0x050412b9) /* 0.313494417 */, 19 },
+  /* 8164 */  { MAD_F(0x0504486a) /* 0.313545624 */, 19 },
+  /* 8165 */  { MAD_F(0x05047e1d) /* 0.313596833 */, 19 },
+  /* 8166 */  { MAD_F(0x0504b3cf) /* 0.313648044 */, 19 },
+  /* 8167 */  { MAD_F(0x0504e983) /* 0.313699257 */, 19 },
+  /* 8168 */  { MAD_F(0x05051f37) /* 0.313750472 */, 19 },
+  /* 8169 */  { MAD_F(0x050554eb) /* 0.313801689 */, 19 },
+  /* 8170 */  { MAD_F(0x05058aa0) /* 0.313852909 */, 19 },
+  /* 8171 */  { MAD_F(0x0505c056) /* 0.313904130 */, 19 },
+  /* 8172 */  { MAD_F(0x0505f60c) /* 0.313955354 */, 19 },
+  /* 8173 */  { MAD_F(0x05062bc3) /* 0.314006579 */, 19 },
+  /* 8174 */  { MAD_F(0x0506617a) /* 0.314057807 */, 19 },
+  /* 8175 */  { MAD_F(0x05069732) /* 0.314109037 */, 19 },
+
+  /* 8176 */  { MAD_F(0x0506cceb) /* 0.314160269 */, 19 },
+  /* 8177 */  { MAD_F(0x050702a4) /* 0.314211502 */, 19 },
+  /* 8178 */  { MAD_F(0x0507385d) /* 0.314262739 */, 19 },
+  /* 8179 */  { MAD_F(0x05076e17) /* 0.314313977 */, 19 },
+  /* 8180 */  { MAD_F(0x0507a3d2) /* 0.314365217 */, 19 },
+  /* 8181 */  { MAD_F(0x0507d98d) /* 0.314416459 */, 19 },
+  /* 8182 */  { MAD_F(0x05080f49) /* 0.314467704 */, 19 },
+  /* 8183 */  { MAD_F(0x05084506) /* 0.314518950 */, 19 },
+  /* 8184 */  { MAD_F(0x05087ac2) /* 0.314570199 */, 19 },
+  /* 8185 */  { MAD_F(0x0508b080) /* 0.314621449 */, 19 },
+  /* 8186 */  { MAD_F(0x0508e63e) /* 0.314672702 */, 19 },
+  /* 8187 */  { MAD_F(0x05091bfd) /* 0.314723957 */, 19 },
+  /* 8188 */  { MAD_F(0x050951bc) /* 0.314775214 */, 19 },
+  /* 8189 */  { MAD_F(0x0509877c) /* 0.314826473 */, 19 },
+  /* 8190 */  { MAD_F(0x0509bd3c) /* 0.314877734 */, 19 },
+  /* 8191 */  { MAD_F(0x0509f2fd) /* 0.314928997 */, 19 },
+
+  /* 8192 */  { MAD_F(0x050a28be) /* 0.314980262 */, 19 },
+  /* 8193 */  { MAD_F(0x050a5e80) /* 0.315031530 */, 19 },
+  /* 8194 */  { MAD_F(0x050a9443) /* 0.315082799 */, 19 },
+  /* 8195 */  { MAD_F(0x050aca06) /* 0.315134071 */, 19 },
+  /* 8196 */  { MAD_F(0x050affc9) /* 0.315185344 */, 19 },
+  /* 8197 */  { MAD_F(0x050b358e) /* 0.315236620 */, 19 },
+  /* 8198 */  { MAD_F(0x050b6b52) /* 0.315287898 */, 19 },
+  /* 8199 */  { MAD_F(0x050ba118) /* 0.315339178 */, 19 },
+  /* 8200 */  { MAD_F(0x050bd6de) /* 0.315390460 */, 19 },
+  /* 8201 */  { MAD_F(0x050c0ca4) /* 0.315441744 */, 19 },
+  /* 8202 */  { MAD_F(0x050c426b) /* 0.315493030 */, 19 },
+  /* 8203 */  { MAD_F(0x050c7833) /* 0.315544318 */, 19 },
+  /* 8204 */  { MAD_F(0x050cadfb) /* 0.315595608 */, 19 },
+  /* 8205 */  { MAD_F(0x050ce3c4) /* 0.315646901 */, 19 },
+  /* 8206 */  { MAD_F(0x050d198d) /* 0.315698195 */, 19 }
diff --git a/code/libmad/sf_table.dat b/code/libmad/sf_table.dat
new file mode 100644
index 00000000..db1484a0
--- /dev/null
+++ b/code/libmad/sf_table.dat
@@ -0,0 +1,106 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: sf_table.dat,v 1.7 2004/01/23 09:41:33 rob Exp $
+ */
+
+/*
+ * These are the scalefactor values for Layer I and Layer II.
+ * The values are from Table B.1 of ISO/IEC 11172-3.
+ *
+ * There is some error introduced by the 32-bit fixed-point representation;
+ * the amount of error is shown. For 16-bit PCM output, this shouldn't be
+ * too much of a problem.
+ *
+ * Strictly speaking, Table B.1 has only 63 entries (0-62), thus a strict
+ * interpretation of ISO/IEC 11172-3 would suggest that a scalefactor index of
+ * 63 is invalid. However, for better compatibility with current practices, we
+ * add a 64th entry.
+ */
+
+  MAD_F(0x20000000),  /* 2.000000000000 => 2.000000000000, e  0.000000000000 */
+  MAD_F(0x1965fea5),  /* 1.587401051968 => 1.587401051074, e  0.000000000894 */
+  MAD_F(0x1428a2fa),  /* 1.259921049895 => 1.259921051562, e -0.000000001667 */
+  MAD_F(0x10000000),  /* 1.000000000000 => 1.000000000000, e  0.000000000000 */
+  MAD_F(0x0cb2ff53),  /* 0.793700525984 => 0.793700527400, e -0.000000001416 */
+  MAD_F(0x0a14517d),  /* 0.629960524947 => 0.629960525781, e -0.000000000833 */
+  MAD_F(0x08000000),  /* 0.500000000000 => 0.500000000000, e  0.000000000000 */
+  MAD_F(0x06597fa9),  /* 0.396850262992 => 0.396850261837, e  0.000000001155 */
+
+  MAD_F(0x050a28be),  /* 0.314980262474 => 0.314980261028, e  0.000000001446 */
+  MAD_F(0x04000000),  /* 0.250000000000 => 0.250000000000, e  0.000000000000 */
+  MAD_F(0x032cbfd5),  /* 0.198425131496 => 0.198425132781, e -0.000000001285 */
+  MAD_F(0x0285145f),  /* 0.157490131237 => 0.157490130514, e  0.000000000723 */
+  MAD_F(0x02000000),  /* 0.125000000000 => 0.125000000000, e  0.000000000000 */
+  MAD_F(0x01965fea),  /* 0.099212565748 => 0.099212564528, e  0.000000001220 */
+  MAD_F(0x01428a30),  /* 0.078745065618 => 0.078745067120, e -0.000000001501 */
+  MAD_F(0x01000000),  /* 0.062500000000 => 0.062500000000, e  0.000000000000 */
+
+  MAD_F(0x00cb2ff5),  /* 0.049606282874 => 0.049606282264, e  0.000000000610 */
+  MAD_F(0x00a14518),  /* 0.039372532809 => 0.039372533560, e -0.000000000751 */
+  MAD_F(0x00800000),  /* 0.031250000000 => 0.031250000000, e  0.000000000000 */
+  MAD_F(0x006597fb),  /* 0.024803141437 => 0.024803142995, e -0.000000001558 */
+  MAD_F(0x0050a28c),  /* 0.019686266405 => 0.019686266780, e -0.000000000375 */
+  MAD_F(0x00400000),  /* 0.015625000000 => 0.015625000000, e  0.000000000000 */
+  MAD_F(0x0032cbfd),  /* 0.012401570719 => 0.012401569635, e  0.000000001084 */
+  MAD_F(0x00285146),  /* 0.009843133202 => 0.009843133390, e -0.000000000188 */
+
+  MAD_F(0x00200000),  /* 0.007812500000 => 0.007812500000, e  0.000000000000 */
+  MAD_F(0x001965ff),  /* 0.006200785359 => 0.006200786680, e -0.000000001321 */
+  MAD_F(0x001428a3),  /* 0.004921566601 => 0.004921566695, e -0.000000000094 */
+  MAD_F(0x00100000),  /* 0.003906250000 => 0.003906250000, e  0.000000000000 */
+  MAD_F(0x000cb2ff),  /* 0.003100392680 => 0.003100391477, e  0.000000001202 */
+  MAD_F(0x000a1451),  /* 0.002460783301 => 0.002460781485, e  0.000000001816 */
+  MAD_F(0x00080000),  /* 0.001953125000 => 0.001953125000, e  0.000000000000 */
+  MAD_F(0x00065980),  /* 0.001550196340 => 0.001550197601, e -0.000000001262 */
+
+  MAD_F(0x00050a29),  /* 0.001230391650 => 0.001230392605, e -0.000000000955 */
+  MAD_F(0x00040000),  /* 0.000976562500 => 0.000976562500, e  0.000000000000 */
+  MAD_F(0x00032cc0),  /* 0.000775098170 => 0.000775098801, e -0.000000000631 */
+  MAD_F(0x00028514),  /* 0.000615195825 => 0.000615194440, e  0.000000001385 */
+  MAD_F(0x00020000),  /* 0.000488281250 => 0.000488281250, e  0.000000000000 */
+  MAD_F(0x00019660),  /* 0.000387549085 => 0.000387549400, e -0.000000000315 */
+  MAD_F(0x0001428a),  /* 0.000307597913 => 0.000307597220, e  0.000000000693 */
+  MAD_F(0x00010000),  /* 0.000244140625 => 0.000244140625, e  0.000000000000 */
+
+  MAD_F(0x0000cb30),  /* 0.000193774542 => 0.000193774700, e -0.000000000158 */
+  MAD_F(0x0000a145),  /* 0.000153798956 => 0.000153798610, e  0.000000000346 */
+  MAD_F(0x00008000),  /* 0.000122070313 => 0.000122070313, e  0.000000000000 */
+  MAD_F(0x00006598),  /* 0.000096887271 => 0.000096887350, e -0.000000000079 */
+  MAD_F(0x000050a3),  /* 0.000076899478 => 0.000076901168, e -0.000000001689 */
+  MAD_F(0x00004000),  /* 0.000061035156 => 0.000061035156, e  0.000000000000 */
+  MAD_F(0x000032cc),  /* 0.000048443636 => 0.000048443675, e -0.000000000039 */
+  MAD_F(0x00002851),  /* 0.000038449739 => 0.000038448721, e  0.000000001018 */
+
+  MAD_F(0x00002000),  /* 0.000030517578 => 0.000030517578, e  0.000000000000 */
+  MAD_F(0x00001966),  /* 0.000024221818 => 0.000024221838, e -0.000000000020 */
+  MAD_F(0x00001429),  /* 0.000019224870 => 0.000019226223, e -0.000000001354 */
+  MAD_F(0x00001000),  /* 0.000015258789 => 0.000015258789, e -0.000000000000 */
+  MAD_F(0x00000cb3),  /* 0.000012110909 => 0.000012110919, e -0.000000000010 */
+  MAD_F(0x00000a14),  /* 0.000009612435 => 0.000009611249, e  0.000000001186 */
+  MAD_F(0x00000800),  /* 0.000007629395 => 0.000007629395, e -0.000000000000 */
+  MAD_F(0x00000659),  /* 0.000006055454 => 0.000006053597, e  0.000000001858 */
+
+  MAD_F(0x0000050a),  /* 0.000004806217 => 0.000004805624, e  0.000000000593 */
+  MAD_F(0x00000400),  /* 0.000003814697 => 0.000003814697, e  0.000000000000 */
+  MAD_F(0x0000032d),  /* 0.000003027727 => 0.000003028661, e -0.000000000934 */
+  MAD_F(0x00000285),  /* 0.000002403109 => 0.000002402812, e  0.000000000296 */
+  MAD_F(0x00000200),  /* 0.000001907349 => 0.000001907349, e -0.000000000000 */
+  MAD_F(0x00000196),  /* 0.000001513864 => 0.000001512468, e  0.000000001396 */
+  MAD_F(0x00000143),  /* 0.000001201554 => 0.000001203269, e -0.000000001714 */
+  MAD_F(0x00000000)   /* this compatibility entry is not part of Table B.1 */
diff --git a/code/libmad/stream.c b/code/libmad/stream.c
new file mode 100644
index 00000000..18ce95ae
--- /dev/null
+++ b/code/libmad/stream.c
@@ -0,0 +1,156 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: stream.c,v 1.12 2004/02/05 09:02:39 rob Exp $
+ */
+
+# include "global.h"
+
+# include <stdlib.h>
+
+# include "mad.h"
+
+/*
+ * NAME:	stream->init()
+ * DESCRIPTION:	initialize stream struct
+ */
+void mad_stream_init(struct mad_stream *stream)
+{
+  stream->buffer     = 0;
+  stream->bufend     = 0;
+  stream->skiplen    = 0;
+
+  stream->sync       = 0;
+  stream->freerate   = 0;
+
+  stream->this_frame = 0;
+  stream->next_frame = 0;
+  mad_bit_init(&stream->ptr, 0);
+
+  mad_bit_init(&stream->anc_ptr, 0);
+  stream->anc_bitlen = 0;
+
+  stream->main_data  = 0;
+  stream->md_len     = 0;
+
+  stream->options    = 0;
+  stream->error      = MAD_ERROR_NONE;
+}
+
+/*
+ * NAME:	stream->finish()
+ * DESCRIPTION:	deallocate any dynamic memory associated with stream
+ */
+void mad_stream_finish(struct mad_stream *stream)
+{
+  if (stream->main_data) {
+    free(stream->main_data);
+    stream->main_data = 0;
+  }
+
+  mad_bit_finish(&stream->anc_ptr);
+  mad_bit_finish(&stream->ptr);
+}
+
+/*
+ * NAME:	stream->buffer()
+ * DESCRIPTION:	set stream buffer pointers
+ */
+void mad_stream_buffer(struct mad_stream *stream,
+		       unsigned char const *buffer, unsigned long length)
+{
+  stream->buffer = buffer;
+  stream->bufend = buffer + length;
+
+  stream->this_frame = buffer;
+  stream->next_frame = buffer;
+
+  stream->sync = 1;
+
+  mad_bit_init(&stream->ptr, buffer);
+}
+
+/*
+ * NAME:	stream->skip()
+ * DESCRIPTION:	arrange to skip bytes before the next frame
+ */
+void mad_stream_skip(struct mad_stream *stream, unsigned long length)
+{
+  stream->skiplen += length;
+}
+
+/*
+ * NAME:	stream->sync()
+ * DESCRIPTION:	locate the next stream sync word
+ */
+int mad_stream_sync(struct mad_stream *stream)
+{
+  register unsigned char const *ptr, *end;
+
+  ptr = mad_bit_nextbyte(&stream->ptr);
+  end = stream->bufend;
+
+  while (ptr < end - 1 &&
+	 !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0))
+    ++ptr;
+
+  if (end - ptr < MAD_BUFFER_GUARD)
+    return -1;
+
+  mad_bit_init(&stream->ptr, ptr);
+
+  return 0;
+}
+
+/*
+ * NAME:	stream->errorstr()
+ * DESCRIPTION:	return a string description of the current error condition
+ */
+char const *mad_stream_errorstr(struct mad_stream const *stream)
+{
+  switch (stream->error) {
+  case MAD_ERROR_NONE:		 return "no error";
+
+  case MAD_ERROR_BUFLEN:	 return "input buffer too small (or EOF)";
+  case MAD_ERROR_BUFPTR:	 return "invalid (null) buffer pointer";
+
+  case MAD_ERROR_NOMEM:		 return "not enough memory";
+
+  case MAD_ERROR_LOSTSYNC:	 return "lost synchronization";
+  case MAD_ERROR_BADLAYER:	 return "reserved header layer value";
+  case MAD_ERROR_BADBITRATE:	 return "forbidden bitrate value";
+  case MAD_ERROR_BADSAMPLERATE:	 return "reserved sample frequency value";
+  case MAD_ERROR_BADEMPHASIS:	 return "reserved emphasis value";
+
+  case MAD_ERROR_BADCRC:	 return "CRC check failed";
+  case MAD_ERROR_BADBITALLOC:	 return "forbidden bit allocation value";
+  case MAD_ERROR_BADSCALEFACTOR: return "bad scalefactor index";
+  case MAD_ERROR_BADMODE:	 return "bad bitrate/mode combination";
+  case MAD_ERROR_BADFRAMELEN:	 return "bad frame length";
+  case MAD_ERROR_BADBIGVALUES:	 return "bad big_values count";
+  case MAD_ERROR_BADBLOCKTYPE:	 return "reserved block_type";
+  case MAD_ERROR_BADSCFSI:	 return "bad scalefactor selection info";
+  case MAD_ERROR_BADDATAPTR:	 return "bad main_data_begin pointer";
+  case MAD_ERROR_BADPART3LEN:	 return "bad audio data length";
+  case MAD_ERROR_BADHUFFTABLE:	 return "bad Huffman table select";
+  case MAD_ERROR_BADHUFFDATA:	 return "Huffman data overrun";
+  case MAD_ERROR_BADSTEREO:	 return "incompatible block_type for JS";
+  }
+
+  return 0;
+}
diff --git a/code/libmad/synth.c b/code/libmad/synth.c
new file mode 100644
index 00000000..110c9b28
--- /dev/null
+++ b/code/libmad/synth.c
@@ -0,0 +1,851 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: synth.c,v 1.25 2004/01/23 09:41:33 rob Exp $
+ */
+
+# include "global.h"
+
+# include "mad.h"
+
+/*
+ * NAME:	synth->init()
+ * DESCRIPTION:	initialize synth struct
+ */
+void mad_synth_init(struct mad_synth *synth)
+{
+  mad_synth_mute(synth);
+
+  synth->phase = 0;
+
+  synth->pcm.samplerate = 0;
+  synth->pcm.channels   = 0;
+  synth->pcm.length     = 0;
+}
+
+/*
+ * NAME:	synth->mute()
+ * DESCRIPTION:	zero all polyphase filterbank values, resetting synthesis
+ */
+void mad_synth_mute(struct mad_synth *synth)
+{
+  unsigned int ch, s, v;
+
+  for (ch = 0; ch < 2; ++ch) {
+    for (s = 0; s < 16; ++s) {
+      for (v = 0; v < 8; ++v) {
+	synth->filter[ch][0][0][s][v] = synth->filter[ch][0][1][s][v] =
+	synth->filter[ch][1][0][s][v] = synth->filter[ch][1][1][s][v] = 0;
+      }
+    }
+  }
+}
+
+/*
+ * An optional optimization called here the Subband Synthesis Optimization
+ * (SSO) improves the performance of subband synthesis at the expense of
+ * accuracy.
+ *
+ * The idea is to simplify 32x32->64-bit multiplication to 32x32->32 such
+ * that extra scaling and rounding are not necessary. This often allows the
+ * compiler to use faster 32-bit multiply-accumulate instructions instead of
+ * explicit 64-bit multiply, shift, and add instructions.
+ *
+ * SSO works like this: a full 32x32->64-bit multiply of two mad_fixed_t
+ * values requires the result to be right-shifted 28 bits to be properly
+ * scaled to the same fixed-point format. Right shifts can be applied at any
+ * time to either operand or to the result, so the optimization involves
+ * careful placement of these shifts to minimize the loss of accuracy.
+ *
+ * First, a 14-bit shift is applied with rounding at compile-time to the D[]
+ * table of coefficients for the subband synthesis window. This only loses 2
+ * bits of accuracy because the lower 12 bits are always zero. A second
+ * 12-bit shift occurs after the DCT calculation. This loses 12 bits of
+ * accuracy. Finally, a third 2-bit shift occurs just before the sample is
+ * saved in the PCM buffer. 14 + 12 + 2 == 28 bits.
+ */
+
+/* FPM_DEFAULT without OPT_SSO will actually lose accuracy and performance */
+
+# if defined(FPM_DEFAULT) && !defined(OPT_SSO)
+#  define OPT_SSO
+# endif
+
+/* second SSO shift, with rounding */
+
+# if defined(OPT_SSO)
+#  define SHIFT(x)  (((x) + (1L << 11)) >> 12)
+# else
+#  define SHIFT(x)  (x)
+# endif
+
+/* possible DCT speed optimization */
+
+# if defined(OPT_SPEED) && defined(MAD_F_MLX)
+#  define OPT_DCTO
+#  define MUL(x, y)  \
+    ({ mad_fixed64hi_t hi;  \
+       mad_fixed64lo_t lo;  \
+       MAD_F_MLX(hi, lo, (x), (y));  \
+       hi << (32 - MAD_F_SCALEBITS - 3);  \
+    })
+# else
+#  undef OPT_DCTO
+#  define MUL(x, y)  mad_f_mul((x), (y))
+# endif
+
+/*
+ * NAME:	dct32()
+ * DESCRIPTION:	perform fast in[32]->out[32] DCT
+ */
+static
+void dct32(mad_fixed_t const in[32], unsigned int slot,
+	   mad_fixed_t lo[16][8], mad_fixed_t hi[16][8])
+{
+  mad_fixed_t t0,   t1,   t2,   t3,   t4,   t5,   t6,   t7;
+  mad_fixed_t t8,   t9,   t10,  t11,  t12,  t13,  t14,  t15;
+  mad_fixed_t t16,  t17,  t18,  t19,  t20,  t21,  t22,  t23;
+  mad_fixed_t t24,  t25,  t26,  t27,  t28,  t29,  t30,  t31;
+  mad_fixed_t t32,  t33,  t34,  t35,  t36,  t37,  t38,  t39;
+  mad_fixed_t t40,  t41,  t42,  t43,  t44,  t45,  t46,  t47;
+  mad_fixed_t t48,  t49,  t50,  t51,  t52,  t53,  t54,  t55;
+  mad_fixed_t t56,  t57,  t58,  t59,  t60,  t61,  t62,  t63;
+  mad_fixed_t t64,  t65,  t66,  t67,  t68,  t69,  t70,  t71;
+  mad_fixed_t t72,  t73,  t74,  t75,  t76,  t77,  t78,  t79;
+  mad_fixed_t t80,  t81,  t82,  t83,  t84,  t85,  t86,  t87;
+  mad_fixed_t t88,  t89,  t90,  t91,  t92,  t93,  t94,  t95;
+  mad_fixed_t t96,  t97,  t98,  t99,  t100, t101, t102, t103;
+  mad_fixed_t t104, t105, t106, t107, t108, t109, t110, t111;
+  mad_fixed_t t112, t113, t114, t115, t116, t117, t118, t119;
+  mad_fixed_t t120, t121, t122, t123, t124, t125, t126, t127;
+  mad_fixed_t t128, t129, t130, t131, t132, t133, t134, t135;
+  mad_fixed_t t136, t137, t138, t139, t140, t141, t142, t143;
+  mad_fixed_t t144, t145, t146, t147, t148, t149, t150, t151;
+  mad_fixed_t t152, t153, t154, t155, t156, t157, t158, t159;
+  mad_fixed_t t160, t161, t162, t163, t164, t165, t166, t167;
+  mad_fixed_t t168, t169, t170, t171, t172, t173, t174, t175;
+  mad_fixed_t t176;
+
+  /* costab[i] = cos(PI / (2 * 32) * i) */
+
+# if defined(OPT_DCTO)
+#  define costab1	MAD_F(0x7fd8878e)
+#  define costab2	MAD_F(0x7f62368f)
+#  define costab3	MAD_F(0x7e9d55fc)
+#  define costab4	MAD_F(0x7d8a5f40)
+#  define costab5	MAD_F(0x7c29fbee)
+#  define costab6	MAD_F(0x7a7d055b)
+#  define costab7	MAD_F(0x78848414)
+#  define costab8	MAD_F(0x7641af3d)
+#  define costab9	MAD_F(0x73b5ebd1)
+#  define costab10	MAD_F(0x70e2cbc6)
+#  define costab11	MAD_F(0x6dca0d14)
+#  define costab12	MAD_F(0x6a6d98a4)
+#  define costab13	MAD_F(0x66cf8120)
+#  define costab14	MAD_F(0x62f201ac)
+#  define costab15	MAD_F(0x5ed77c8a)
+#  define costab16	MAD_F(0x5a82799a)
+#  define costab17	MAD_F(0x55f5a4d2)
+#  define costab18	MAD_F(0x5133cc94)
+#  define costab19	MAD_F(0x4c3fdff4)
+#  define costab20	MAD_F(0x471cece7)
+#  define costab21	MAD_F(0x41ce1e65)
+#  define costab22	MAD_F(0x3c56ba70)
+#  define costab23	MAD_F(0x36ba2014)
+#  define costab24	MAD_F(0x30fbc54d)
+#  define costab25	MAD_F(0x2b1f34eb)
+#  define costab26	MAD_F(0x25280c5e)
+#  define costab27	MAD_F(0x1f19f97b)
+#  define costab28	MAD_F(0x18f8b83c)
+#  define costab29	MAD_F(0x12c8106f)
+#  define costab30	MAD_F(0x0c8bd35e)
+#  define costab31	MAD_F(0x0647d97c)
+# else
+#  define costab1	MAD_F(0x0ffb10f2)  /* 0.998795456 */
+#  define costab2	MAD_F(0x0fec46d2)  /* 0.995184727 */
+#  define costab3	MAD_F(0x0fd3aac0)  /* 0.989176510 */
+#  define costab4	MAD_F(0x0fb14be8)  /* 0.980785280 */
+#  define costab5	MAD_F(0x0f853f7e)  /* 0.970031253 */
+#  define costab6	MAD_F(0x0f4fa0ab)  /* 0.956940336 */
+#  define costab7	MAD_F(0x0f109082)  /* 0.941544065 */
+#  define costab8	MAD_F(0x0ec835e8)  /* 0.923879533 */
+#  define costab9	MAD_F(0x0e76bd7a)  /* 0.903989293 */
+#  define costab10	MAD_F(0x0e1c5979)  /* 0.881921264 */
+#  define costab11	MAD_F(0x0db941a3)  /* 0.857728610 */
+#  define costab12	MAD_F(0x0d4db315)  /* 0.831469612 */
+#  define costab13	MAD_F(0x0cd9f024)  /* 0.803207531 */
+#  define costab14	MAD_F(0x0c5e4036)  /* 0.773010453 */
+#  define costab15	MAD_F(0x0bdaef91)  /* 0.740951125 */
+#  define costab16	MAD_F(0x0b504f33)  /* 0.707106781 */
+#  define costab17	MAD_F(0x0abeb49a)  /* 0.671558955 */
+#  define costab18	MAD_F(0x0a267993)  /* 0.634393284 */
+#  define costab19	MAD_F(0x0987fbfe)  /* 0.595699304 */
+#  define costab20	MAD_F(0x08e39d9d)  /* 0.555570233 */
+#  define costab21	MAD_F(0x0839c3cd)  /* 0.514102744 */
+#  define costab22	MAD_F(0x078ad74e)  /* 0.471396737 */
+#  define costab23	MAD_F(0x06d74402)  /* 0.427555093 */
+#  define costab24	MAD_F(0x061f78aa)  /* 0.382683432 */
+#  define costab25	MAD_F(0x0563e69d)  /* 0.336889853 */
+#  define costab26	MAD_F(0x04a5018c)  /* 0.290284677 */
+#  define costab27	MAD_F(0x03e33f2f)  /* 0.242980180 */
+#  define costab28	MAD_F(0x031f1708)  /* 0.195090322 */
+#  define costab29	MAD_F(0x0259020e)  /* 0.146730474 */
+#  define costab30	MAD_F(0x01917a6c)  /* 0.098017140 */
+#  define costab31	MAD_F(0x00c8fb30)  /* 0.049067674 */
+# endif
+
+  t0   = in[0]  + in[31];  t16  = MUL(in[0]  - in[31], costab1);
+  t1   = in[15] + in[16];  t17  = MUL(in[15] - in[16], costab31);
+
+  t41  = t16 + t17;
+  t59  = MUL(t16 - t17, costab2);
+  t33  = t0  + t1;
+  t50  = MUL(t0  - t1,  costab2);
+
+  t2   = in[7]  + in[24];  t18  = MUL(in[7]  - in[24], costab15);
+  t3   = in[8]  + in[23];  t19  = MUL(in[8]  - in[23], costab17);
+
+  t42  = t18 + t19;
+  t60  = MUL(t18 - t19, costab30);
+  t34  = t2  + t3;
+  t51  = MUL(t2  - t3,  costab30);
+
+  t4   = in[3]  + in[28];  t20  = MUL(in[3]  - in[28], costab7);
+  t5   = in[12] + in[19];  t21  = MUL(in[12] - in[19], costab25);
+
+  t43  = t20 + t21;
+  t61  = MUL(t20 - t21, costab14);
+  t35  = t4  + t5;
+  t52  = MUL(t4  - t5,  costab14);
+
+  t6   = in[4]  + in[27];  t22  = MUL(in[4]  - in[27], costab9);
+  t7   = in[11] + in[20];  t23  = MUL(in[11] - in[20], costab23);
+
+  t44  = t22 + t23;
+  t62  = MUL(t22 - t23, costab18);
+  t36  = t6  + t7;
+  t53  = MUL(t6  - t7,  costab18);
+
+  t8   = in[1]  + in[30];  t24  = MUL(in[1]  - in[30], costab3);
+  t9   = in[14] + in[17];  t25  = MUL(in[14] - in[17], costab29);
+
+  t45  = t24 + t25;
+  t63  = MUL(t24 - t25, costab6);
+  t37  = t8  + t9;
+  t54  = MUL(t8  - t9,  costab6);
+
+  t10  = in[6]  + in[25];  t26  = MUL(in[6]  - in[25], costab13);
+  t11  = in[9]  + in[22];  t27  = MUL(in[9]  - in[22], costab19);
+
+  t46  = t26 + t27;
+  t64  = MUL(t26 - t27, costab26);
+  t38  = t10 + t11;
+  t55  = MUL(t10 - t11, costab26);
+
+  t12  = in[2]  + in[29];  t28  = MUL(in[2]  - in[29], costab5);
+  t13  = in[13] + in[18];  t29  = MUL(in[13] - in[18], costab27);
+
+  t47  = t28 + t29;
+  t65  = MUL(t28 - t29, costab10);
+  t39  = t12 + t13;
+  t56  = MUL(t12 - t13, costab10);
+
+  t14  = in[5]  + in[26];  t30  = MUL(in[5]  - in[26], costab11);
+  t15  = in[10] + in[21];  t31  = MUL(in[10] - in[21], costab21);
+
+  t48  = t30 + t31;
+  t66  = MUL(t30 - t31, costab22);
+  t40  = t14 + t15;
+  t57  = MUL(t14 - t15, costab22);
+
+  t69  = t33 + t34;  t89  = MUL(t33 - t34, costab4);
+  t70  = t35 + t36;  t90  = MUL(t35 - t36, costab28);
+  t71  = t37 + t38;  t91  = MUL(t37 - t38, costab12);
+  t72  = t39 + t40;  t92  = MUL(t39 - t40, costab20);
+  t73  = t41 + t42;  t94  = MUL(t41 - t42, costab4);
+  t74  = t43 + t44;  t95  = MUL(t43 - t44, costab28);
+  t75  = t45 + t46;  t96  = MUL(t45 - t46, costab12);
+  t76  = t47 + t48;  t97  = MUL(t47 - t48, costab20);
+
+  t78  = t50 + t51;  t100 = MUL(t50 - t51, costab4);
+  t79  = t52 + t53;  t101 = MUL(t52 - t53, costab28);
+  t80  = t54 + t55;  t102 = MUL(t54 - t55, costab12);
+  t81  = t56 + t57;  t103 = MUL(t56 - t57, costab20);
+
+  t83  = t59 + t60;  t106 = MUL(t59 - t60, costab4);
+  t84  = t61 + t62;  t107 = MUL(t61 - t62, costab28);
+  t85  = t63 + t64;  t108 = MUL(t63 - t64, costab12);
+  t86  = t65 + t66;  t109 = MUL(t65 - t66, costab20);
+
+  t113 = t69  + t70;
+  t114 = t71  + t72;
+
+  /*  0 */ hi[15][slot] = SHIFT(t113 + t114);
+  /* 16 */ lo[ 0][slot] = SHIFT(MUL(t113 - t114, costab16));
+
+  t115 = t73  + t74;
+  t116 = t75  + t76;
+
+  t32  = t115 + t116;
+
+  /*  1 */ hi[14][slot] = SHIFT(t32);
+
+  t118 = t78  + t79;
+  t119 = t80  + t81;
+
+  t58  = t118 + t119;
+
+  /*  2 */ hi[13][slot] = SHIFT(t58);
+
+  t121 = t83  + t84;
+  t122 = t85  + t86;
+
+  t67  = t121 + t122;
+
+  t49  = (t67 * 2) - t32;
+
+  /*  3 */ hi[12][slot] = SHIFT(t49);
+
+  t125 = t89  + t90;
+  t126 = t91  + t92;
+
+  t93  = t125 + t126;
+
+  /*  4 */ hi[11][slot] = SHIFT(t93);
+
+  t128 = t94  + t95;
+  t129 = t96  + t97;
+
+  t98  = t128 + t129;
+
+  t68  = (t98 * 2) - t49;
+
+  /*  5 */ hi[10][slot] = SHIFT(t68);
+
+  t132 = t100 + t101;
+  t133 = t102 + t103;
+
+  t104 = t132 + t133;
+
+  t82  = (t104 * 2) - t58;
+
+  /*  6 */ hi[ 9][slot] = SHIFT(t82);
+
+  t136 = t106 + t107;
+  t137 = t108 + t109;
+
+  t110 = t136 + t137;
+
+  t87  = (t110 * 2) - t67;
+
+  t77  = (t87 * 2) - t68;
+
+  /*  7 */ hi[ 8][slot] = SHIFT(t77);
+
+  t141 = MUL(t69 - t70, costab8);
+  t142 = MUL(t71 - t72, costab24);
+  t143 = t141 + t142;
+
+  /*  8 */ hi[ 7][slot] = SHIFT(t143);
+  /* 24 */ lo[ 8][slot] =
+	     SHIFT((MUL(t141 - t142, costab16) * 2) - t143);
+
+  t144 = MUL(t73 - t74, costab8);
+  t145 = MUL(t75 - t76, costab24);
+  t146 = t144 + t145;
+
+  t88  = (t146 * 2) - t77;
+
+  /*  9 */ hi[ 6][slot] = SHIFT(t88);
+
+  t148 = MUL(t78 - t79, costab8);
+  t149 = MUL(t80 - t81, costab24);
+  t150 = t148 + t149;
+
+  t105 = (t150 * 2) - t82;
+
+  /* 10 */ hi[ 5][slot] = SHIFT(t105);
+
+  t152 = MUL(t83 - t84, costab8);
+  t153 = MUL(t85 - t86, costab24);
+  t154 = t152 + t153;
+
+  t111 = (t154 * 2) - t87;
+
+  t99  = (t111 * 2) - t88;
+
+  /* 11 */ hi[ 4][slot] = SHIFT(t99);
+
+  t157 = MUL(t89 - t90, costab8);
+  t158 = MUL(t91 - t92, costab24);
+  t159 = t157 + t158;
+
+  t127 = (t159 * 2) - t93;
+
+  /* 12 */ hi[ 3][slot] = SHIFT(t127);
+
+  t160 = (MUL(t125 - t126, costab16) * 2) - t127;
+
+  /* 20 */ lo[ 4][slot] = SHIFT(t160);
+  /* 28 */ lo[12][slot] =
+	     SHIFT((((MUL(t157 - t158, costab16) * 2) - t159) * 2) - t160);
+
+  t161 = MUL(t94 - t95, costab8);
+  t162 = MUL(t96 - t97, costab24);
+  t163 = t161 + t162;
+
+  t130 = (t163 * 2) - t98;
+
+  t112 = (t130 * 2) - t99;
+
+  /* 13 */ hi[ 2][slot] = SHIFT(t112);
+
+  t164 = (MUL(t128 - t129, costab16) * 2) - t130;
+
+  t166 = MUL(t100 - t101, costab8);
+  t167 = MUL(t102 - t103, costab24);
+  t168 = t166 + t167;
+
+  t134 = (t168 * 2) - t104;
+
+  t120 = (t134 * 2) - t105;
+
+  /* 14 */ hi[ 1][slot] = SHIFT(t120);
+
+  t135 = (MUL(t118 - t119, costab16) * 2) - t120;
+
+  /* 18 */ lo[ 2][slot] = SHIFT(t135);
+
+  t169 = (MUL(t132 - t133, costab16) * 2) - t134;
+
+  t151 = (t169 * 2) - t135;
+
+  /* 22 */ lo[ 6][slot] = SHIFT(t151);
+
+  t170 = (((MUL(t148 - t149, costab16) * 2) - t150) * 2) - t151;
+
+  /* 26 */ lo[10][slot] = SHIFT(t170);
+  /* 30 */ lo[14][slot] =
+	     SHIFT((((((MUL(t166 - t167, costab16) * 2) -
+		       t168) * 2) - t169) * 2) - t170);
+
+  t171 = MUL(t106 - t107, costab8);
+  t172 = MUL(t108 - t109, costab24);
+  t173 = t171 + t172;
+
+  t138 = (t173 * 2) - t110;
+
+  t123 = (t138 * 2) - t111;
+
+  t139 = (MUL(t121 - t122, costab16) * 2) - t123;
+
+  t117 = (t123 * 2) - t112;
+
+  /* 15 */ hi[ 0][slot] = SHIFT(t117);
+
+  t124 = (MUL(t115 - t116, costab16) * 2) - t117;
+
+  /* 17 */ lo[ 1][slot] = SHIFT(t124);
+
+  t131 = (t139 * 2) - t124;
+
+  /* 19 */ lo[ 3][slot] = SHIFT(t131);
+
+  t140 = (t164 * 2) - t131;
+
+  /* 21 */ lo[ 5][slot] = SHIFT(t140);
+
+  t174 = (MUL(t136 - t137, costab16) * 2) - t138;
+
+  t155 = (t174 * 2) - t139;
+
+  t147 = (t155 * 2) - t140;
+
+  /* 23 */ lo[ 7][slot] = SHIFT(t147);
+
+  t156 = (((MUL(t144 - t145, costab16) * 2) - t146) * 2) - t147;
+
+  /* 25 */ lo[ 9][slot] = SHIFT(t156);
+
+  t175 = (((MUL(t152 - t153, costab16) * 2) - t154) * 2) - t155;
+
+  t165 = (t175 * 2) - t156;
+
+  /* 27 */ lo[11][slot] = SHIFT(t165);
+
+  t176 = (((((MUL(t161 - t162, costab16) * 2) -
+	     t163) * 2) - t164) * 2) - t165;
+
+  /* 29 */ lo[13][slot] = SHIFT(t176);
+  /* 31 */ lo[15][slot] =
+	     SHIFT((((((((MUL(t171 - t172, costab16) * 2) -
+			 t173) * 2) - t174) * 2) - t175) * 2) - t176);
+
+  /*
+   * Totals:
+   *  80 multiplies
+   *  80 additions
+   * 119 subtractions
+   *  49 shifts (not counting SSO)
+   */
+}
+
+# undef MUL
+# undef SHIFT
+
+/* third SSO shift and/or D[] optimization preshift */
+
+# if defined(OPT_SSO)
+#  if MAD_F_FRACBITS != 28
+#   error "MAD_F_FRACBITS must be 28 to use OPT_SSO"
+#  endif
+#  define ML0(hi, lo, x, y)	((lo)  = (x) * (y))
+#  define MLA(hi, lo, x, y)	((lo) += (x) * (y))
+#  define MLN(hi, lo)		((lo)  = -(lo))
+#  define MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
+#  define SHIFT(x)		((x) >> 2)
+#  define PRESHIFT(x)		((MAD_F(x) + (1L << 13)) >> 14)
+# else
+#  define ML0(hi, lo, x, y)	MAD_F_ML0((hi), (lo), (x), (y))
+#  define MLA(hi, lo, x, y)	MAD_F_MLA((hi), (lo), (x), (y))
+#  define MLN(hi, lo)		MAD_F_MLN((hi), (lo))
+#  define MLZ(hi, lo)		MAD_F_MLZ((hi), (lo))
+#  define SHIFT(x)		(x)
+#  if defined(MAD_F_SCALEBITS)
+#   undef  MAD_F_SCALEBITS
+#   define MAD_F_SCALEBITS	(MAD_F_FRACBITS - 12)
+#   define PRESHIFT(x)		(MAD_F(x) >> 12)
+#  else
+#   define PRESHIFT(x)		MAD_F(x)
+#  endif
+# endif
+
+static
+mad_fixed_t const D[17][32] = {
+# include "D.dat"
+};
+
+# if defined(ASO_SYNTH)
+void synth_full(struct mad_synth *, struct mad_frame const *,
+		unsigned int, unsigned int);
+# else
+/*
+ * NAME:	synth->full()
+ * DESCRIPTION:	perform full frequency PCM synthesis
+ */
+static
+void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
+		unsigned int nch, unsigned int ns)
+{
+  unsigned int phase, ch, s, sb, pe, po;
+  mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
+  mad_fixed_t const (*sbsample)[36][32];
+  register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
+  register mad_fixed_t const (*Dptr)[32], *ptr;
+  register mad_fixed64hi_t hi;
+  register mad_fixed64lo_t lo;
+
+  for (ch = 0; ch < nch; ++ch) {
+    sbsample = &frame->sbsample[ch];
+    filter   = &synth->filter[ch];
+    phase    = synth->phase;
+    pcm1     = synth->pcm.samples[ch];
+
+    for (s = 0; s < ns; ++s) {
+      dct32((*sbsample)[s], phase >> 1,
+	    (*filter)[0][phase & 1], (*filter)[1][phase & 1]);
+
+      pe = phase & ~1;
+      po = ((phase - 1) & 0xf) | 1;
+
+      /* calculate 32 samples */
+
+      fe = &(*filter)[0][ phase & 1][0];
+      fx = &(*filter)[0][~phase & 1][0];
+      fo = &(*filter)[1][~phase & 1][0];
+
+      Dptr = &D[0];
+
+      ptr = *Dptr + po;
+      ML0(hi, lo, (*fx)[0], ptr[ 0]);
+      MLA(hi, lo, (*fx)[1], ptr[14]);
+      MLA(hi, lo, (*fx)[2], ptr[12]);
+      MLA(hi, lo, (*fx)[3], ptr[10]);
+      MLA(hi, lo, (*fx)[4], ptr[ 8]);
+      MLA(hi, lo, (*fx)[5], ptr[ 6]);
+      MLA(hi, lo, (*fx)[6], ptr[ 4]);
+      MLA(hi, lo, (*fx)[7], ptr[ 2]);
+      MLN(hi, lo);
+
+      ptr = *Dptr + pe;
+      MLA(hi, lo, (*fe)[0], ptr[ 0]);
+      MLA(hi, lo, (*fe)[1], ptr[14]);
+      MLA(hi, lo, (*fe)[2], ptr[12]);
+      MLA(hi, lo, (*fe)[3], ptr[10]);
+      MLA(hi, lo, (*fe)[4], ptr[ 8]);
+      MLA(hi, lo, (*fe)[5], ptr[ 6]);
+      MLA(hi, lo, (*fe)[6], ptr[ 4]);
+      MLA(hi, lo, (*fe)[7], ptr[ 2]);
+
+      *pcm1++ = SHIFT(MLZ(hi, lo));
+
+      pcm2 = pcm1 + 30;
+
+      for (sb = 1; sb < 16; ++sb) {
+	++fe;
+	++Dptr;
+
+	/* D[32 - sb][i] == -D[sb][31 - i] */
+
+	ptr = *Dptr + po;
+	ML0(hi, lo, (*fo)[0], ptr[ 0]);
+	MLA(hi, lo, (*fo)[1], ptr[14]);
+	MLA(hi, lo, (*fo)[2], ptr[12]);
+	MLA(hi, lo, (*fo)[3], ptr[10]);
+	MLA(hi, lo, (*fo)[4], ptr[ 8]);
+	MLA(hi, lo, (*fo)[5], ptr[ 6]);
+	MLA(hi, lo, (*fo)[6], ptr[ 4]);
+	MLA(hi, lo, (*fo)[7], ptr[ 2]);
+	MLN(hi, lo);
+
+	ptr = *Dptr + pe;
+	MLA(hi, lo, (*fe)[7], ptr[ 2]);
+	MLA(hi, lo, (*fe)[6], ptr[ 4]);
+	MLA(hi, lo, (*fe)[5], ptr[ 6]);
+	MLA(hi, lo, (*fe)[4], ptr[ 8]);
+	MLA(hi, lo, (*fe)[3], ptr[10]);
+	MLA(hi, lo, (*fe)[2], ptr[12]);
+	MLA(hi, lo, (*fe)[1], ptr[14]);
+	MLA(hi, lo, (*fe)[0], ptr[ 0]);
+
+	*pcm1++ = SHIFT(MLZ(hi, lo));
+
+	ptr = *Dptr - pe;
+	ML0(hi, lo, (*fe)[0], ptr[31 - 16]);
+	MLA(hi, lo, (*fe)[1], ptr[31 - 14]);
+	MLA(hi, lo, (*fe)[2], ptr[31 - 12]);
+	MLA(hi, lo, (*fe)[3], ptr[31 - 10]);
+	MLA(hi, lo, (*fe)[4], ptr[31 -  8]);
+	MLA(hi, lo, (*fe)[5], ptr[31 -  6]);
+	MLA(hi, lo, (*fe)[6], ptr[31 -  4]);
+	MLA(hi, lo, (*fe)[7], ptr[31 -  2]);
+
+	ptr = *Dptr - po;
+	MLA(hi, lo, (*fo)[7], ptr[31 -  2]);
+	MLA(hi, lo, (*fo)[6], ptr[31 -  4]);
+	MLA(hi, lo, (*fo)[5], ptr[31 -  6]);
+	MLA(hi, lo, (*fo)[4], ptr[31 -  8]);
+	MLA(hi, lo, (*fo)[3], ptr[31 - 10]);
+	MLA(hi, lo, (*fo)[2], ptr[31 - 12]);
+	MLA(hi, lo, (*fo)[1], ptr[31 - 14]);
+	MLA(hi, lo, (*fo)[0], ptr[31 - 16]);
+
+	*pcm2-- = SHIFT(MLZ(hi, lo));
+
+	++fo;
+      }
+
+      ++Dptr;
+
+      ptr = *Dptr + po;
+      ML0(hi, lo, (*fo)[0], ptr[ 0]);
+      MLA(hi, lo, (*fo)[1], ptr[14]);
+      MLA(hi, lo, (*fo)[2], ptr[12]);
+      MLA(hi, lo, (*fo)[3], ptr[10]);
+      MLA(hi, lo, (*fo)[4], ptr[ 8]);
+      MLA(hi, lo, (*fo)[5], ptr[ 6]);
+      MLA(hi, lo, (*fo)[6], ptr[ 4]);
+      MLA(hi, lo, (*fo)[7], ptr[ 2]);
+
+      *pcm1 = SHIFT(-MLZ(hi, lo));
+      pcm1 += 16;
+
+      phase = (phase + 1) % 16;
+    }
+  }
+}
+# endif
+
+/*
+ * NAME:	synth->half()
+ * DESCRIPTION:	perform half frequency PCM synthesis
+ */
+static
+void synth_half(struct mad_synth *synth, struct mad_frame const *frame,
+		unsigned int nch, unsigned int ns)
+{
+  unsigned int phase, ch, s, sb, pe, po;
+  mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
+  mad_fixed_t const (*sbsample)[36][32];
+  register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
+  register mad_fixed_t const (*Dptr)[32], *ptr;
+  register mad_fixed64hi_t hi;
+  register mad_fixed64lo_t lo;
+
+  for (ch = 0; ch < nch; ++ch) {
+    sbsample = &frame->sbsample[ch];
+    filter   = &synth->filter[ch];
+    phase    = synth->phase;
+    pcm1     = synth->pcm.samples[ch];
+
+    for (s = 0; s < ns; ++s) {
+      dct32((*sbsample)[s], phase >> 1,
+	    (*filter)[0][phase & 1], (*filter)[1][phase & 1]);
+
+      pe = phase & ~1;
+      po = ((phase - 1) & 0xf) | 1;
+
+      /* calculate 16 samples */
+
+      fe = &(*filter)[0][ phase & 1][0];
+      fx = &(*filter)[0][~phase & 1][0];
+      fo = &(*filter)[1][~phase & 1][0];
+
+      Dptr = &D[0];
+
+      ptr = *Dptr + po;
+      ML0(hi, lo, (*fx)[0], ptr[ 0]);
+      MLA(hi, lo, (*fx)[1], ptr[14]);
+      MLA(hi, lo, (*fx)[2], ptr[12]);
+      MLA(hi, lo, (*fx)[3], ptr[10]);
+      MLA(hi, lo, (*fx)[4], ptr[ 8]);
+      MLA(hi, lo, (*fx)[5], ptr[ 6]);
+      MLA(hi, lo, (*fx)[6], ptr[ 4]);
+      MLA(hi, lo, (*fx)[7], ptr[ 2]);
+      MLN(hi, lo);
+
+      ptr = *Dptr + pe;
+      MLA(hi, lo, (*fe)[0], ptr[ 0]);
+      MLA(hi, lo, (*fe)[1], ptr[14]);
+      MLA(hi, lo, (*fe)[2], ptr[12]);
+      MLA(hi, lo, (*fe)[3], ptr[10]);
+      MLA(hi, lo, (*fe)[4], ptr[ 8]);
+      MLA(hi, lo, (*fe)[5], ptr[ 6]);
+      MLA(hi, lo, (*fe)[6], ptr[ 4]);
+      MLA(hi, lo, (*fe)[7], ptr[ 2]);
+
+      *pcm1++ = SHIFT(MLZ(hi, lo));
+
+      pcm2 = pcm1 + 14;
+
+      for (sb = 1; sb < 16; ++sb) {
+	++fe;
+	++Dptr;
+
+	/* D[32 - sb][i] == -D[sb][31 - i] */
+
+	if (!(sb & 1)) {
+	  ptr = *Dptr + po;
+	  ML0(hi, lo, (*fo)[0], ptr[ 0]);
+	  MLA(hi, lo, (*fo)[1], ptr[14]);
+	  MLA(hi, lo, (*fo)[2], ptr[12]);
+	  MLA(hi, lo, (*fo)[3], ptr[10]);
+	  MLA(hi, lo, (*fo)[4], ptr[ 8]);
+	  MLA(hi, lo, (*fo)[5], ptr[ 6]);
+	  MLA(hi, lo, (*fo)[6], ptr[ 4]);
+	  MLA(hi, lo, (*fo)[7], ptr[ 2]);
+	  MLN(hi, lo);
+
+	  ptr = *Dptr + pe;
+	  MLA(hi, lo, (*fe)[7], ptr[ 2]);
+	  MLA(hi, lo, (*fe)[6], ptr[ 4]);
+	  MLA(hi, lo, (*fe)[5], ptr[ 6]);
+	  MLA(hi, lo, (*fe)[4], ptr[ 8]);
+	  MLA(hi, lo, (*fe)[3], ptr[10]);
+	  MLA(hi, lo, (*fe)[2], ptr[12]);
+	  MLA(hi, lo, (*fe)[1], ptr[14]);
+	  MLA(hi, lo, (*fe)[0], ptr[ 0]);
+
+	  *pcm1++ = SHIFT(MLZ(hi, lo));
+
+	  ptr = *Dptr - po;
+	  ML0(hi, lo, (*fo)[7], ptr[31 -  2]);
+	  MLA(hi, lo, (*fo)[6], ptr[31 -  4]);
+	  MLA(hi, lo, (*fo)[5], ptr[31 -  6]);
+	  MLA(hi, lo, (*fo)[4], ptr[31 -  8]);
+	  MLA(hi, lo, (*fo)[3], ptr[31 - 10]);
+	  MLA(hi, lo, (*fo)[2], ptr[31 - 12]);
+	  MLA(hi, lo, (*fo)[1], ptr[31 - 14]);
+	  MLA(hi, lo, (*fo)[0], ptr[31 - 16]);
+
+	  ptr = *Dptr - pe;
+	  MLA(hi, lo, (*fe)[0], ptr[31 - 16]);
+	  MLA(hi, lo, (*fe)[1], ptr[31 - 14]);
+	  MLA(hi, lo, (*fe)[2], ptr[31 - 12]);
+	  MLA(hi, lo, (*fe)[3], ptr[31 - 10]);
+	  MLA(hi, lo, (*fe)[4], ptr[31 -  8]);
+	  MLA(hi, lo, (*fe)[5], ptr[31 -  6]);
+	  MLA(hi, lo, (*fe)[6], ptr[31 -  4]);
+	  MLA(hi, lo, (*fe)[7], ptr[31 -  2]);
+
+	  *pcm2-- = SHIFT(MLZ(hi, lo));
+	}
+
+	++fo;
+      }
+
+      ++Dptr;
+
+      ptr = *Dptr + po;
+      ML0(hi, lo, (*fo)[0], ptr[ 0]);
+      MLA(hi, lo, (*fo)[1], ptr[14]);
+      MLA(hi, lo, (*fo)[2], ptr[12]);
+      MLA(hi, lo, (*fo)[3], ptr[10]);
+      MLA(hi, lo, (*fo)[4], ptr[ 8]);
+      MLA(hi, lo, (*fo)[5], ptr[ 6]);
+      MLA(hi, lo, (*fo)[6], ptr[ 4]);
+      MLA(hi, lo, (*fo)[7], ptr[ 2]);
+
+      *pcm1 = SHIFT(-MLZ(hi, lo));
+      pcm1 += 8;
+
+      phase = (phase + 1) % 16;
+    }
+  }
+}
+
+/*
+ * NAME:	synth->frame()
+ * DESCRIPTION:	perform PCM synthesis of frame subband samples
+ */
+void mad_synth_frame(struct mad_synth *synth, struct mad_frame const *frame)
+{
+  unsigned int nch, ns;
+  void (*synth_frame)(struct mad_synth *, struct mad_frame const *,
+		      unsigned int, unsigned int);
+
+  nch = MAD_NCHANNELS(&frame->header);
+  ns  = MAD_NSBSAMPLES(&frame->header);
+
+  synth->pcm.samplerate = frame->header.samplerate;
+  synth->pcm.channels   = nch;
+  synth->pcm.length     = 32 * ns;
+
+  synth_frame = synth_full;
+
+  if (frame->options & MAD_OPTION_HALFSAMPLERATE) {
+    synth->pcm.samplerate /= 2;
+    synth->pcm.length     /= 2;
+
+    synth_frame = synth_half;
+  }
+
+  synth_frame(synth, frame, nch, ns);
+
+  synth->phase = (synth->phase + ns) % 16;
+}
diff --git a/code/libmad/timer.c b/code/libmad/timer.c
new file mode 100644
index 00000000..df11316c
--- /dev/null
+++ b/code/libmad/timer.c
@@ -0,0 +1,481 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: timer.c,v 1.18 2004/01/23 09:41:33 rob Exp $
+ */
+
+# include "global.h"
+
+# include <stdio.h>
+
+# ifdef HAVE_ASSERT_H
+#  include <assert.h>
+# endif
+
+# include "mad.h"
+
+mad_timer_t const mad_timer_zero = { 0, 0 };
+
+/*
+ * NAME:	timer->compare()
+ * DESCRIPTION:	indicate relative order of two timers
+ */
+int mad_timer_compare(mad_timer_t timer1, mad_timer_t timer2)
+{
+  signed long diff;
+
+  diff = timer1.seconds - timer2.seconds;
+  if (diff < 0)
+    return -1;
+  else if (diff > 0)
+    return +1;
+
+  diff = timer1.fraction - timer2.fraction;
+  if (diff < 0)
+    return -1;
+  else if (diff > 0)
+    return +1;
+
+  return 0;
+}
+
+/*
+ * NAME:	timer->negate()
+ * DESCRIPTION:	invert the sign of a timer
+ */
+void mad_timer_negate(mad_timer_t *timer)
+{
+  timer->seconds = -timer->seconds;
+
+  if (timer->fraction) {
+    timer->seconds -= 1;
+    timer->fraction = MAD_TIMER_RESOLUTION - timer->fraction;
+  }
+}
+
+/*
+ * NAME:	timer->abs()
+ * DESCRIPTION:	return the absolute value of a timer
+ */
+mad_timer_t mad_timer_abs(mad_timer_t timer)
+{
+  if (timer.seconds < 0)
+    mad_timer_negate(&timer);
+
+  return timer;
+}
+
+/*
+ * NAME:	reduce_timer()
+ * DESCRIPTION:	carry timer fraction into seconds
+ */
+static
+void reduce_timer(mad_timer_t *timer)
+{
+  timer->seconds  += timer->fraction / MAD_TIMER_RESOLUTION;
+  timer->fraction %= MAD_TIMER_RESOLUTION;
+}
+
+/*
+ * NAME:	gcd()
+ * DESCRIPTION:	compute greatest common denominator
+ */
+static
+unsigned long gcd(unsigned long num1, unsigned long num2)
+{
+  unsigned long tmp;
+
+  while (num2) {
+    tmp  = num2;
+    num2 = num1 % num2;
+    num1 = tmp;
+  }
+
+  return num1;
+}
+
+/*
+ * NAME:	reduce_rational()
+ * DESCRIPTION:	convert rational expression to lowest terms
+ */
+static
+void reduce_rational(unsigned long *numer, unsigned long *denom)
+{
+  unsigned long factor;
+
+  factor = gcd(*numer, *denom);
+
+  assert(factor != 0);
+
+  *numer /= factor;
+  *denom /= factor;
+}
+
+/*
+ * NAME:	scale_rational()
+ * DESCRIPTION:	solve numer/denom == ?/scale avoiding overflowing
+ */
+static
+unsigned long scale_rational(unsigned long numer, unsigned long denom,
+			     unsigned long scale)
+{
+  reduce_rational(&numer, &denom);
+  reduce_rational(&scale, &denom);
+
+  assert(denom != 0);
+
+  if (denom < scale)
+    return numer * (scale / denom) + numer * (scale % denom) / denom;
+  if (denom < numer)
+    return scale * (numer / denom) + scale * (numer % denom) / denom;
+
+  return numer * scale / denom;
+}
+
+/*
+ * NAME:	timer->set()
+ * DESCRIPTION:	set timer to specific (positive) value
+ */
+void mad_timer_set(mad_timer_t *timer, unsigned long seconds,
+		   unsigned long numer, unsigned long denom)
+{
+  timer->seconds = seconds;
+  if (numer >= denom && denom > 0) {
+    timer->seconds += numer / denom;
+    numer %= denom;
+  }
+
+  switch (denom) {
+  case 0:
+  case 1:
+    timer->fraction = 0;
+    break;
+
+  case MAD_TIMER_RESOLUTION:
+    timer->fraction = numer;
+    break;
+
+  case 1000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION /  1000);
+    break;
+
+  case 8000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION /  8000);
+    break;
+
+  case 11025:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 11025);
+    break;
+
+  case 12000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 12000);
+    break;
+
+  case 16000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 16000);
+    break;
+
+  case 22050:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 22050);
+    break;
+
+  case 24000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 24000);
+    break;
+
+  case 32000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 32000);
+    break;
+
+  case 44100:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 44100);
+    break;
+
+  case 48000:
+    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 48000);
+    break;
+
+  default:
+    timer->fraction = scale_rational(numer, denom, MAD_TIMER_RESOLUTION);
+    break;
+  }
+
+  if (timer->fraction >= MAD_TIMER_RESOLUTION)
+    reduce_timer(timer);
+}
+
+/*
+ * NAME:	timer->add()
+ * DESCRIPTION:	add one timer to another
+ */
+void mad_timer_add(mad_timer_t *timer, mad_timer_t incr)
+{
+  timer->seconds  += incr.seconds;
+  timer->fraction += incr.fraction;
+
+  if (timer->fraction >= MAD_TIMER_RESOLUTION)
+    reduce_timer(timer);
+}
+
+/*
+ * NAME:	timer->multiply()
+ * DESCRIPTION:	multiply a timer by a scalar value
+ */
+void mad_timer_multiply(mad_timer_t *timer, signed long scalar)
+{
+  mad_timer_t addend;
+  unsigned long factor;
+
+  factor = scalar;
+  if (scalar < 0) {
+    factor = -scalar;
+    mad_timer_negate(timer);
+  }
+
+  addend = *timer;
+  *timer = mad_timer_zero;
+
+  while (factor) {
+    if (factor & 1)
+      mad_timer_add(timer, addend);
+
+    mad_timer_add(&addend, addend);
+    factor >>= 1;
+  }
+}
+
+/*
+ * NAME:	timer->count()
+ * DESCRIPTION:	return timer value in selected units
+ */
+signed long mad_timer_count(mad_timer_t timer, enum mad_units units)
+{
+  switch (units) {
+  case MAD_UNITS_HOURS:
+    return timer.seconds / 60 / 60;
+
+  case MAD_UNITS_MINUTES:
+    return timer.seconds / 60;
+
+  case MAD_UNITS_SECONDS:
+    return timer.seconds;
+
+  case MAD_UNITS_DECISECONDS:
+  case MAD_UNITS_CENTISECONDS:
+  case MAD_UNITS_MILLISECONDS:
+
+  case MAD_UNITS_8000_HZ:
+  case MAD_UNITS_11025_HZ:
+  case MAD_UNITS_12000_HZ:
+  case MAD_UNITS_16000_HZ:
+  case MAD_UNITS_22050_HZ:
+  case MAD_UNITS_24000_HZ:
+  case MAD_UNITS_32000_HZ:
+  case MAD_UNITS_44100_HZ:
+  case MAD_UNITS_48000_HZ:
+
+  case MAD_UNITS_24_FPS:
+  case MAD_UNITS_25_FPS:
+  case MAD_UNITS_30_FPS:
+  case MAD_UNITS_48_FPS:
+  case MAD_UNITS_50_FPS:
+  case MAD_UNITS_60_FPS:
+  case MAD_UNITS_75_FPS:
+    return timer.seconds * (signed long) units +
+      (signed long) scale_rational(timer.fraction, MAD_TIMER_RESOLUTION,
+				   units);
+
+  case MAD_UNITS_23_976_FPS:
+  case MAD_UNITS_24_975_FPS:
+  case MAD_UNITS_29_97_FPS:
+  case MAD_UNITS_47_952_FPS:
+  case MAD_UNITS_49_95_FPS:
+  case MAD_UNITS_59_94_FPS:
+    return (mad_timer_count(timer, -units) + 1) * 1000 / 1001;
+  }
+
+  /* unsupported units */
+  return 0;
+}
+
+/*
+ * NAME:	timer->fraction()
+ * DESCRIPTION:	return fractional part of timer in arbitrary terms
+ */
+unsigned long mad_timer_fraction(mad_timer_t timer, unsigned long denom)
+{
+  timer = mad_timer_abs(timer);
+
+  switch (denom) {
+  case 0:
+    return timer.fraction ?
+      MAD_TIMER_RESOLUTION / timer.fraction : MAD_TIMER_RESOLUTION + 1;
+
+  case MAD_TIMER_RESOLUTION:
+    return timer.fraction;
+
+  default:
+    return scale_rational(timer.fraction, MAD_TIMER_RESOLUTION, denom);
+  }
+}
+
+/*
+ * NAME:	timer->string()
+ * DESCRIPTION:	write a string representation of a timer using a template
+ */
+void mad_timer_string(mad_timer_t timer,
+		      char *dest, char const *format, enum mad_units units,
+		      enum mad_units fracunits, unsigned long subparts)
+{
+  unsigned long hours, minutes, seconds, sub;
+  unsigned int frac;
+
+  timer = mad_timer_abs(timer);
+
+  seconds = timer.seconds;
+  frac = sub = 0;
+
+  switch (fracunits) {
+  case MAD_UNITS_HOURS:
+  case MAD_UNITS_MINUTES:
+  case MAD_UNITS_SECONDS:
+    break;
+
+  case MAD_UNITS_DECISECONDS:
+  case MAD_UNITS_CENTISECONDS:
+  case MAD_UNITS_MILLISECONDS:
+
+  case MAD_UNITS_8000_HZ:
+  case MAD_UNITS_11025_HZ:
+  case MAD_UNITS_12000_HZ:
+  case MAD_UNITS_16000_HZ:
+  case MAD_UNITS_22050_HZ:
+  case MAD_UNITS_24000_HZ:
+  case MAD_UNITS_32000_HZ:
+  case MAD_UNITS_44100_HZ:
+  case MAD_UNITS_48000_HZ:
+
+  case MAD_UNITS_24_FPS:
+  case MAD_UNITS_25_FPS:
+  case MAD_UNITS_30_FPS:
+  case MAD_UNITS_48_FPS:
+  case MAD_UNITS_50_FPS:
+  case MAD_UNITS_60_FPS:
+  case MAD_UNITS_75_FPS:
+    {
+      unsigned long denom;
+
+      denom = MAD_TIMER_RESOLUTION / fracunits;
+
+      frac = timer.fraction / denom;
+      sub  = scale_rational(timer.fraction % denom, denom, subparts);
+    }
+    break;
+
+  case MAD_UNITS_23_976_FPS:
+  case MAD_UNITS_24_975_FPS:
+  case MAD_UNITS_29_97_FPS:
+  case MAD_UNITS_47_952_FPS:
+  case MAD_UNITS_49_95_FPS:
+  case MAD_UNITS_59_94_FPS:
+    /* drop-frame encoding */
+    /* N.B. this is only well-defined for MAD_UNITS_29_97_FPS */
+    {
+      unsigned long frame, cycle, d, m;
+
+      frame = mad_timer_count(timer, fracunits);
+
+      cycle = -fracunits * 60 * 10 - (10 - 1) * 2;
+
+      d = frame / cycle;
+      m = frame % cycle;
+      frame += (10 - 1) * 2 * d;
+      if (m > 2)
+	frame += 2 * ((m - 2) / (cycle / 10));
+
+      frac    = frame % -fracunits;
+      seconds = frame / -fracunits;
+    }
+    break;
+  }
+
+  switch (units) {
+  case MAD_UNITS_HOURS:
+    minutes = seconds / 60;
+    hours   = minutes / 60;
+
+    sprintf(dest, format,
+	    hours,
+	    (unsigned int) (minutes % 60),
+	    (unsigned int) (seconds % 60),
+	    frac, sub);
+    break;
+
+  case MAD_UNITS_MINUTES:
+    minutes = seconds / 60;
+
+    sprintf(dest, format,
+	    minutes,
+	    (unsigned int) (seconds % 60),
+	    frac, sub);
+    break;
+
+  case MAD_UNITS_SECONDS:
+    sprintf(dest, format,
+	    seconds,
+	    frac, sub);
+    break;
+
+  case MAD_UNITS_23_976_FPS:
+  case MAD_UNITS_24_975_FPS:
+  case MAD_UNITS_29_97_FPS:
+  case MAD_UNITS_47_952_FPS:
+  case MAD_UNITS_49_95_FPS:
+  case MAD_UNITS_59_94_FPS:
+    if (fracunits < 0) {
+      /* not yet implemented */
+      sub = 0;
+    }
+
+    /* fall through */
+
+  case MAD_UNITS_DECISECONDS:
+  case MAD_UNITS_CENTISECONDS:
+  case MAD_UNITS_MILLISECONDS:
+
+  case MAD_UNITS_8000_HZ:
+  case MAD_UNITS_11025_HZ:
+  case MAD_UNITS_12000_HZ:
+  case MAD_UNITS_16000_HZ:
+  case MAD_UNITS_22050_HZ:
+  case MAD_UNITS_24000_HZ:
+  case MAD_UNITS_32000_HZ:
+  case MAD_UNITS_44100_HZ:
+  case MAD_UNITS_48000_HZ:
+
+  case MAD_UNITS_24_FPS:
+  case MAD_UNITS_25_FPS:
+  case MAD_UNITS_30_FPS:
+  case MAD_UNITS_48_FPS:
+  case MAD_UNITS_50_FPS:
+  case MAD_UNITS_60_FPS:
+  case MAD_UNITS_75_FPS:
+    sprintf(dest, format, mad_timer_count(timer, units), sub);
+    break;
+  }
+}
diff --git a/code/libmad/version.c b/code/libmad/version.c
new file mode 100644
index 00000000..f3747567
--- /dev/null
+++ b/code/libmad/version.c
@@ -0,0 +1,87 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: version.c,v 1.15 2004/01/23 09:41:33 rob Exp $
+ */
+
+# include "global.h"
+
+# include "mad.h"
+
+char const mad_version[]   = "MPEG Audio Decoder " MAD_VERSION;
+char const mad_copyright[] = "Copyright (C) " MAD_PUBLISHYEAR " " MAD_AUTHOR;
+char const mad_author[]    = MAD_AUTHOR " <" MAD_EMAIL ">";
+
+char const mad_build[] = ""
+# if defined(DEBUG)
+  "DEBUG "
+# elif defined(NDEBUG)
+  "NDEBUG "
+# endif
+
+# if defined(EXPERIMENTAL)
+  "EXPERIMENTAL "
+# endif
+
+# if defined(FPM_64BIT)
+  "FPM_64BIT "
+# elif defined(FPM_INTEL)
+  "FPM_INTEL "
+# elif defined(FPM_ARM)
+  "FPM_ARM "
+# elif defined(FPM_MIPS)
+  "FPM_MIPS "
+# elif defined(FPM_SPARC)
+  "FPM_SPARC "
+# elif defined(FPM_PPC)
+  "FPM_PPC "
+# elif defined(FPM_DEFAULT)
+  "FPM_DEFAULT "
+# endif
+
+# if defined(ASO_IMDCT)
+  "ASO_IMDCT "
+# endif
+# if defined(ASO_INTERLEAVE1)
+  "ASO_INTERLEAVE1 "
+# endif
+# if defined(ASO_INTERLEAVE2)
+  "ASO_INTERLEAVE2 "
+# endif
+# if defined(ASO_ZEROCHECK)
+  "ASO_ZEROCHECK "
+# endif
+
+# if defined(OPT_SPEED)
+  "OPT_SPEED "
+# elif defined(OPT_ACCURACY)
+  "OPT_ACCURACY "
+# endif
+
+# if defined(OPT_SSO)
+  "OPT_SSO "
+# endif
+
+# if defined(OPT_DCTO)  /* never defined here */
+  "OPT_DCTO "
+# endif
+
+# if defined(OPT_STRICT)
+  "OPT_STRICT "
+# endif
+;

From 81b86d61da22da1e4dcb7b694a70f3e657f3bcf0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 15 Jul 2024 20:34:39 +0200
Subject: [PATCH 0541/2040] Fix read-only cvar being improperly archived

This caused cvars like `paused` being wrongly restored. If the `paused` value is 1 or above, like when saving from the menu, the game would get stuck loading the level because it's paused, no frame could be executed.
It also fixes cvars like `sv_fps`, `g_playermodel` not being archived when they should.
Fixes #326
---
 code/fgame/g_main.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 6e971646..b472b990 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1264,14 +1264,14 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
 
             num = 0;
             for (cvar = gi.NextCvar(NULL); cvar != NULL; cvar = gi.NextCvar(cvar)) {
-                if (cvar->flags & CVAR_ROM) {
+                if (cvar->flags & CVAR_SAVEGAME) {
                     num++;
                 }
             }
 
             arc.ArchiveInteger(&num);
             for (cvar = gi.NextCvar(NULL); cvar != NULL; cvar = gi.NextCvar(cvar)) {
-                if (cvar->flags & CVAR_ROM) {
+                if (cvar->flags & CVAR_SAVEGAME) {
                     s = cvar->name;
                     arc.ArchiveString(&s);
 
@@ -1390,15 +1390,6 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
 
         PathSearch::ArchiveDynamic(arc);
 
-        if (arc.Loading()) {
-            arc.Close();
-            LoadingSavegame = false;
-            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Loaded"));
-        } else {
-            arc.Close();
-            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Saved"));
-        }
-
         if (arc.Loading()) {
             // Make sure all code that needs to setup the player after they have been loaded is run
 
@@ -1412,6 +1403,15 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             }
         }
 
+        if (arc.Loading()) {
+            arc.Close();
+            LoadingSavegame = false;
+            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Loaded"));
+        } else {
+            arc.Close();
+            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Saved"));
+        }
+
         return qtrue;
     }
 

From 93cd47065976a50063d2a2bf897e2c7a30cdc610 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 15 Jul 2024 23:43:37 +0200
Subject: [PATCH 0542/2040] Fix broken cgame state saving

---
 code/cgame/cg_archive.cpp  |  4 ++--
 code/cgame/memarchiver.cpp | 18 +++++++++---------
 code/client/cl_cgame.cpp   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/cgame/cg_archive.cpp b/code/cgame/cg_archive.cpp
index 29fa32c7..3d944fb9 100644
--- a/code/cgame/cg_archive.cpp
+++ b/code/cgame/cg_archive.cpp
@@ -163,7 +163,7 @@ void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref)
     archiver.ArchiveVec3(ref->axis[2]);
     archiver.ArchiveBoolean(&ref->nonNormalizedAxes);
     archiver.ArchiveVec3(ref->origin);
-    archiver.ArchiveRaw(ref->frameInfo, 192);
+    archiver.ArchiveRaw(ref->frameInfo, sizeof(ref->frameInfo));
     archiver.ArchiveFloat(&ref->actionWeight);
     archiver.ArchiveShort(&ref->wasframe);
     archiver.ArchiveFloat(&ref->scale);
@@ -171,7 +171,7 @@ void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref)
     archiver.ArchiveInteger(&ref->skinNum);
 
     CG_ArchiveShaderHandle(archiver, &ref->customShader);
-    archiver.ArchiveRaw(ref->shaderRGBA, 4);
+    archiver.ArchiveRaw(ref->shaderRGBA, sizeof(ref->shaderRGBA));
     archiver.ArchiveFloat(ref->shaderTexCoord);
     archiver.ArchiveFloat(&ref->shaderTexCoord[1]);
     archiver.ArchiveFloat(&ref->shaderTime);
diff --git a/code/cgame/memarchiver.cpp b/code/cgame/memarchiver.cpp
index f934fe65..a07c4211 100644
--- a/code/cgame/memarchiver.cpp
+++ b/code/cgame/memarchiver.cpp
@@ -42,23 +42,23 @@ MemArchiver::~MemArchiver()
 
 void MemArchiver::SetupForWriting(size_t initialSize)
 {
-    state = MEMARC_WRITING;
-    buffer = (byte*)cgi.Malloc(initialSize);
-    allocatedSize = initialSize;
-    bufferSize = 0;
+    this->state = MEMARC_WRITING;
+    this->buffer = (byte*)cgi.Malloc(initialSize);
+    this->allocatedSize = initialSize;
+    this->bufferSize = 0;
 }
 
 void MemArchiver::SetupForReading(byte* buffer, size_t size)
 {
-    state = MEMARC_READING;
-    buffer = buffer;
-    allocatedSize = size;
-    bufferSize = 0;
+    this->state = MEMARC_READING;
+    this->buffer = buffer;
+    this->allocatedSize = size;
+    this->bufferSize = 0;
 }
 
 void MemArchiver::SetBaseTime(unsigned int time)
 {
-    svsTime = time;
+    this->svsTime = time;
 }
 
 size_t MemArchiver::BufferSize() const
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index da55bb05..13ee3756 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -582,7 +582,7 @@ CL_RestoreSavedCgameState
 */
 void CL_RestoreSavedCgameState() {
 	if (cls.savedCgameState) {
-		cge->CG_LoadStateToBuffer(&cls.savedCgameState, cls.savedCgameStateSize, cl.snap.serverTime);
+		cge->CG_LoadStateToBuffer(cls.savedCgameState, cls.savedCgameStateSize, cl.snap.serverTime);
 	}
 }
 

From 422bf647a713ab11a40daf024947d876cd96443f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 15 Jul 2024 23:45:32 +0200
Subject: [PATCH 0543/2040] Save the client-game state into the archive file
 (feature from moh spearhead 2.0)

This saves cgame data such as emitters and vss sources
---
 code/fgame/g_main.cpp  | 20 +++++++++++++++-----
 code/fgame/g_public.h  |  4 ++--
 code/server/sv_ccmds.c | 15 ++++++++++++---
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index b472b990..46c1119b 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1215,7 +1215,7 @@ G_ArchiveLevel
 
 =================
 */
-qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loading)
+qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, int *savedCgameStateSize, qboolean autosave, qboolean loading)
 {
     try {
         int         i;
@@ -1259,6 +1259,16 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             L_ArchiveEvents(arc);
         }
 
+        arc.ArchiveInteger(savedCgameStateSize);
+        if (!arc.Saving()) {
+            if (*savedCgameStateSize) {
+                *savedCgameState = (byte*)gi.Malloc(*savedCgameStateSize);
+            } else {
+                *savedCgameState = NULL;
+            }
+        }
+        arc.ArchiveRaw(*savedCgameState, *savedCgameStateSize);
+
         if (arc.Saving()) {
             str s;
 
@@ -1427,10 +1437,10 @@ G_WriteLevel
 
 =================
 */
-void G_WriteLevel(const char *filename, qboolean autosave)
+void G_WriteLevel(const char *filename, qboolean autosave, byte** savedCgameState, int* savedCgameStateSize)
 {
     game.autosaved = autosave;
-    G_ArchiveLevel(filename, autosave, qfalse);
+    G_ArchiveLevel(filename, savedCgameState, savedCgameStateSize, autosave, qfalse);
     game.autosaved = false;
 }
 
@@ -1449,11 +1459,11 @@ calling ReadLevel.
 No clients are connected yet.
 =================
 */
-qboolean G_ReadLevel(const char *filename)
+qboolean G_ReadLevel(const char *filename, byte** savedCgameState, int* savedCgameStateSize)
 {
     qboolean status;
 
-    status = G_ArchiveLevel(filename, qfalse, qtrue);
+    status = G_ArchiveLevel(filename, savedCgameState, savedCgameStateSize, qfalse, qtrue);
     // if the level load failed make sure that these variables are not set
     if (!status) {
         LoadingSavegame = false;
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index bf8dc73b..b790b4bf 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -520,8 +520,8 @@ typedef struct gameExport_s {
     // ReadLevel is called after the default map information has been
     // loaded with SpawnEntities, so any stored client spawn spots will
     // be used when the clients reconnect.
-    void (*WriteLevel)(const char *filename, qboolean autosave);
-    qboolean (*ReadLevel)(const char *filename);
+    void (*WriteLevel)(const char *filename, qboolean autosave, byte** savedCgameState, int* savedCgameStateSize);
+    qboolean (*ReadLevel)(const char *filename, byte** savedCgameState, int* savedCgameStateSize);
     qboolean (*LevelArchiveValid)(const char *filename);
 
     void (*ArchiveInteger)(int *i);
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 1e601533..2bd89bac 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1878,7 +1878,7 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
     name = Com_GetArchiveFileName(svs.gameName, "sav");
     if (loading)
     {
-		if (!ge->ReadLevel(name)) {
+		if (!ge->ReadLevel(name, &cls.savedCgameState, &cls.savedCgameStateSize)) {
 			return qfalse;
         }
 
@@ -1901,7 +1901,7 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
     else
     {
 		cls.savedCgameStateSize = cge->CG_SaveStateToBuffer(&cls.savedCgameState, svs.time);
-        ge->WriteLevel(name, autosave);
+        ge->WriteLevel(name, autosave, &cls.savedCgameState, &cls.savedCgameStateSize);
 		Z_Free(cls.savedCgameState);
 		cls.savedCgameState = NULL;
     }
@@ -2271,9 +2271,18 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 	}
 
 	strcpy( svs.gameName, name );
-	SV_ArchiveLevelFile( qfalse, autosave );
+
+	if (!SV_ArchiveLevelFile(qfalse, autosave)) {
+		if (cls.savedCgameState) {
+			Z_Free(cls.savedCgameState);
+			cls.savedCgameState = 0;
+		}
+	}
+
 	SV_ArchiveServerFile( qfalse, autosave );
+
 	Com_Printf( "Done.\n" );
+
 	strcpy( svs.gameName, "current" );
 #endif
 }

From 535da856a4a963c5d94c37e66956fa512817210b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 17 Jul 2024 23:42:48 +0200
Subject: [PATCH 0544/2040] When returning a cvar value, use the latched string
 if present

---
 code/uilib/ui_init.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/uilib/ui_init.cpp b/code/uilib/ui_init.cpp
index 3bf89cd5..02f4d1f9 100644
--- a/code/uilib/ui_init.cpp
+++ b/code/uilib/ui_init.cpp
@@ -61,11 +61,14 @@ int UI_GetCvarInt( const char *name, int def )
 {
 	cvar_t *cvar = uii.Cvar_Find( name );
 
-	if( !cvar )
-	{
+	if( !cvar ) {
 		return def;
 	}
 
+	if (cvar->latchedString) {
+		return atoi(cvar->latchedString);
+	}
+
 	return cvar->integer;
 }
 
@@ -73,11 +76,14 @@ float UI_GetCvarFloat( const char *name, float def )
 {
 	cvar_t *cvar = uii.Cvar_Find( name );
 
-	if( !cvar )
-	{
+	if( !cvar ) {
 		return def;
 	}
 
+	if (cvar->latchedString) {
+		return atof(cvar->latchedString);
+	}
+
 	return cvar->value;
 }
 

From eee0eaac4a674ff9932a8ddda4f5af917a6b5351 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 17 Jul 2024 23:55:11 +0200
Subject: [PATCH 0545/2040] Process the "!" (not) syntax for `enabledcvar`

This fixes #265 where the mine detector icon wouldn't appear because it wants SP mode
---
 code/uilib/uiwidget.cpp | 142 ++++++++++++++++++++++------------------
 1 file changed, 77 insertions(+), 65 deletions(-)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 3f0dca85..49da7e95 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -1966,11 +1966,23 @@ bool UIWidget::isEnabled
 	)
 
 {
-	if( !strcmp( m_enabledCvar, "" ) || UI_GetCvarInt( m_enabledCvar, 0 ) )
-	{
+	if (!strcmp(m_enabledCvar.c_str(), "")) {
 		return m_enabled;
 	}
 
+	if (m_enabledCvar[0] == '!') {
+		//
+		// Added in 2.30
+		//  True if the cvar is 0
+		if (m_enabled) {
+			return !UI_GetCvarInt(m_enabledCvar.c_str() + 1, 0);
+		}
+	} else {
+		if (m_enabled) {
+			return UI_GetCvarInt(m_enabledCvar.c_str(), 0) != 0;
+		}
+	}
+
 	return false;
 }
 
@@ -2414,84 +2426,84 @@ void UIWidget::Display
 {
 	int i;
 	int n;
-	vec4_t col;
+	vec4_t col = { 1, 1, 1, 1 };
 
-	VectorSet( col, 1, 1, 1 );
+	if ( !isEnabled() ) {
+		return;
+	}
 
-	if( !m_enabledCvar.length() || UI_GetCvarInt( m_enabledCvar, 0 ) )
+	if( !m_enabledCvar.length() && !IsVisible() ) {
+		return;
+	}
+
+	if (m_direction || m_fadetime || m_fadeSequenceState != fadesequence_t::SEQUENCE_NONE) {
+		Motion();
+	}
+
+	m_local_alpha = m_alpha * parent_alpha;
+	set2D();
+
+	col[ 3 ] = m_local_alpha;
+	uii.Rend_SetColor( col );
+
+	if( m_background_color.a != 0.0 )
 	{
-		if( !m_enabledCvar.length() && !IsVisible() )
-			return;
+		DrawBox( 0, 0, m_frame.size.width, m_frame.size.height, m_background_color, m_background_color.a * m_local_alpha );
+	}
 
-		if (m_direction || m_fadetime || m_fadeSequenceState != fadesequence_t::SEQUENCE_NONE) {
-			Motion();
-		}
+	if( m_borderStyle == border_outline )
+	{
+		DrawBoxWithSolidBorder( UIRect2D( 0, 0, m_frame.size.width, m_frame.size.height ), UWhite, m_border_color.original, 2, 2, m_local_alpha );
+	}
+	else if( m_borderStyle )
+	{
+		Draw3DBox( 0, 0, m_frame.size.width, m_frame.size.height, m_borderStyle == border_indent, m_border_color, m_local_alpha );
+	}
 
-		m_local_alpha = m_alpha * parent_alpha;
-		set2D();
-
-		col[ 3 ] = m_local_alpha;
+	if( m_material )
+	{
+		col[0] = m_foreground_color.r;
+		col[1] = m_foreground_color.g;
+		col[2] = m_foreground_color.b;
+		col[3] = m_foreground_color.a * m_local_alpha;
 		uii.Rend_SetColor( col );
 
-		if( m_background_color.a != 0.0 )
-		{
-			DrawBox( 0, 0, m_frame.size.width, m_frame.size.height, m_background_color, m_background_color.a * m_local_alpha );
-		}
+		m_material->ReregisterMaterial();
 
-		if( m_borderStyle == border_outline )
+		if( m_flags & WF_TILESHADER )
 		{
-			DrawBoxWithSolidBorder( UIRect2D( 0, 0, m_frame.size.width, m_frame.size.height ), UWhite, m_border_color.original, 2, 2, m_local_alpha );
-		}
-		else if( m_borderStyle )
-		{
-			Draw3DBox( 0, 0, m_frame.size.width, m_frame.size.height, m_borderStyle == border_indent, m_border_color, m_local_alpha );
-		}
-
-		if( m_material )
-		{
-			col[0] = m_foreground_color.r;
-			col[1] = m_foreground_color.g;
-			col[2] = m_foreground_color.b;
-			col[3] = m_foreground_color.a * m_local_alpha;
-			uii.Rend_SetColor( col );
-
-			m_material->ReregisterMaterial();
-
-			if( m_flags & WF_TILESHADER )
-			{
-                if (m_bVirtual) {
-					float fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_material->GetMaterial());
-					float fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_material->GetMaterial());
-                    
-					uii.Rend_DrawPicStretched(0, 0, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_material->GetMaterial());
-				} else {
-					uii.Rend_DrawPicTiled(0, 0, m_frame.size.width, m_frame.size.height, m_material->GetMaterial());
-				}
-			}
-			else
-			{
-				uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_material->GetMaterial() );
+               if (m_bVirtual) {
+				float fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_material->GetMaterial());
+				float fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_material->GetMaterial());
+                   
+				uii.Rend_DrawPicStretched(0, 0, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_material->GetMaterial());
+			} else {
+				uii.Rend_DrawPicTiled(0, 0, m_frame.size.width, m_frame.size.height, m_material->GetMaterial());
 			}
 		}
-
-		if( m_pressedmaterial_active && m_pressedmaterial != NULL )
+		else
 		{
-			m_pressedmaterial->ReregisterMaterial();
-			uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_pressedmaterial->GetMaterial() );
-		}
-		else if( m_hovermaterial_active && m_hovermaterial != NULL )
-		{
-			m_hovermaterial->ReregisterMaterial();
-			uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_hovermaterial->GetMaterial() );
+			uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_material->GetMaterial() );
 		}
+	}
 
-		Draw();
+	if( m_pressedmaterial_active && m_pressedmaterial != NULL )
+	{
+		m_pressedmaterial->ReregisterMaterial();
+		uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_pressedmaterial->GetMaterial() );
+	}
+	else if( m_hovermaterial_active && m_hovermaterial != NULL )
+	{
+		m_hovermaterial->ReregisterMaterial();
+		uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_hovermaterial->GetMaterial() );
+	}
 
-		n = m_children.NumObjects();
-		for( i = 1; i <= m_children.NumObjects(); i++ )
-		{
-			m_children.ObjectAt( i )->Display( m_frame, m_local_alpha );
-		}
+	Draw();
+
+	n = m_children.NumObjects();
+	for( i = 1; i <= m_children.NumObjects(); i++ )
+	{
+		m_children.ObjectAt( i )->Display( m_frame, m_local_alpha );
 	}
 }
 

From fc0a995c66cdb0d49a7157bd16246efc4196b71a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 20 Jul 2024 16:04:04 +0200
Subject: [PATCH 0546/2040] Added code to save image with custom resolution to
 a file

---
 code/renderer/tr_init.c | 98 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 88 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 3ab56925..c90ed92d 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -630,6 +630,66 @@ void R_ScreenshotFilenameJPEG( int lastNumber, char *fileName ) {
 		, a, b, c, d );
 }
 
+/*
+====================
+R_ResampledScreenShot
+====================
+*/
+void R_ResampledScreenShot(const char* filename, int destwidth, int destheight) {
+	char		checkname[MAX_OSPATH];
+	byte		*buffer;
+	byte		*source;
+	byte		*src, *dst;
+	int			x, y;
+	int			r, g, b;
+	float		xScale, yScale;
+	int			xx, yy;
+
+	source = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight * 3 );
+
+	buffer = ri.Hunk_AllocateTempMemory(destheight * destwidth * 3 + 18);
+	Com_Memset (buffer, 0, 18);
+	buffer[2]  = 2;		// uncompressed type
+	buffer[12] = destwidth & 255;
+	buffer[13] = destwidth >> 8;
+	buffer[14] = destheight & 255;
+	buffer[15] = destheight >> 8;
+	buffer[16] = 24;	// pixel size
+
+	qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_RGB, GL_UNSIGNED_BYTE, source ); 
+
+	// resample from source
+	xScale = glConfig.vidWidth / (float)(destwidth * 4);
+	yScale = glConfig.vidHeight / (float)(destheight * 3);
+	for ( y = 0 ; y < destheight ; y++ ) {
+		for ( x = 0 ; x < destwidth ; x++ ) {
+			r = g = b = 0;
+			for ( yy = 0 ; yy < 3 ; yy++ ) {
+				for ( xx = 0 ; xx < 4 ; xx++ ) {
+					src = source + 3 * ( glConfig.vidWidth * (int)( (y*3+yy)*yScale ) + (int)( (x*4+xx)*xScale ) );
+					r += src[0];
+					g += src[1];
+					b += src[2];
+				}
+			}
+			dst = buffer + 18 + 3 * ( y * destwidth + x );
+			dst[0] = b / 12;
+			dst[1] = g / 12;
+			dst[2] = r / 12;
+		}
+	}
+
+	// gamma correct
+	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
+		R_GammaCorrect( buffer + 18, destheight * destwidth * 3 );
+	}
+
+	ri.FS_WriteFile( filename, buffer, destheight * destwidth * 3 + 18 );
+
+	ri.Hunk_FreeTempMemory( buffer );
+	ri.Hunk_FreeTempMemory( source );
+}
+
 /*
 ====================
 R_LevelShot
@@ -709,7 +769,8 @@ Doesn't print the pacifier message if there is a second arg
 */  
 void R_ScreenShot_f(void) {
     char	checkname[MAX_OSPATH];
-    static	int	lastNumber = -1;
+    static int	lastNumber = -1;
+	int		width, height;
     qboolean	silent;
 
     if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
@@ -723,10 +784,23 @@ void R_ScreenShot_f(void) {
         silent = qfalse;
     }
 
-    if (ri.Cmd_Argc() == 2 && !silent) {
+	width = 0;
+	height = 0;
+
+    if (ri.Cmd_Argc() >= 2 && !silent) {
         // explicit filename
-        Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
-    } else {
+		const char* name = ri.Cmd_Argv(1);
+		if (strchr(name, '/')) {
+			Q_strncpyz(checkname, name, sizeof(checkname));
+		} else {
+			Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
+		}
+
+		if (ri.Cmd_Argc(2) > 2) {
+			width = atoi(ri.Cmd_Argv(2));
+			height = atoi(ri.Cmd_Argv(3));
+		}
+	} else {
         // scan for a free filename
 
         // if we have saved a previous screenshot, don't scan
@@ -753,14 +827,18 @@ void R_ScreenShot_f(void) {
         lastNumber++;
     }
 
-    R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
+	if (!width || !height) {
+		R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
 
-    if (!silent) {
-        char message[64];
+		if (!silent) {
+			char message[64];
 
-        Com_sprintf(message, sizeof(message), "centerprint \"%s %s\"\n", ri.LV_ConvertString("Wrote"), checkname);
-        ri.Cmd_ExecuteText(EXEC_NOW, message);
-    }
+			Com_sprintf(message, sizeof(message), "centerprint \"%s %s\"\n", ri.LV_ConvertString("Wrote"), checkname);
+			ri.Cmd_ExecuteText(EXEC_NOW, message);
+		}
+	} else {
+		R_ResampledScreenShot(checkname, width, height);
+	}
 }
 
 void R_ScreenShotJPEG_f (void) {

From d1e94f39342dced73020decf01dd58ac3b416449 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 20 Jul 2024 16:07:02 +0200
Subject: [PATCH 0547/2040] Fix saveshot not executed when saving

This fixes #273 where the loadsave menu wouldn't show the screenshot
---
 code/server/sv_ccmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 2bd89bac..c760c1cd 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -2002,7 +2002,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 
 		name = Com_GetArchiveFileName( svs.gameName, "tga" );
 		Com_sprintf( cmdString, sizeof( cmdString ), "saveshot %s 256 256\n", name );
-		Cbuf_ExecuteText( svs.autosave != qfalse, name );
+		Cbuf_ExecuteText( svs.autosave ? EXEC_INSERT : EXEC_NOW, cmdString );
 	}
 	else
 	{

From 89eae683182e1ab1aa3bf7eadc0cf8e5be497002 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 20 Jul 2024 22:09:03 +0200
Subject: [PATCH 0548/2040] Fixed parameter mistake

(Why didn't you tell anything about that, MSVC?)
---
 code/renderer/tr_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index c90ed92d..ef34b507 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -796,7 +796,7 @@ void R_ScreenShot_f(void) {
 			Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
 		}
 
-		if (ri.Cmd_Argc(2) > 2) {
+		if (ri.Cmd_Argc() > 2) {
 			width = atoi(ri.Cmd_Argv(2));
 			height = atoi(ri.Cmd_Argv(3));
 		}

From 8bd377ce8547d58967a90252f8f479095c415b9f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jul 2024 19:00:25 +0200
Subject: [PATCH 0549/2040] Fix the save system taking a screenshot of the
 whole UI menu instead of just the 3D view

This fixes #328 where the save would have a screenshot of the save menu
---
 code/client/cl_ui.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index e5c6f22d..9e7b103c 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1777,6 +1777,8 @@ void UI_Update(void)
                 hud_compass->GetContainerWidget()->Display(frame, 1.0);
             }
         }
+
+        return;
     }
 
     if (fakk_console) {

From 2198bdec210016699bca5aa8645b391014f79da0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jul 2024 19:15:52 +0200
Subject: [PATCH 0550/2040] Added stub variables and functions for loading

---
 code/client/new/snd_local_new.h  |  3 +++
 code/client/new/snd_main_new.cpp | 40 ++++++++++++++++++++++++++++++++
 code/client/new/snd_public_new.h |  1 +
 3 files changed, 44 insertions(+)

diff --git a/code/client/new/snd_local_new.h b/code/client/new/snd_local_new.h
index 1f336208..69ae7dcf 100644
--- a/code/client/new/snd_local_new.h
+++ b/code/client/new/snd_local_new.h
@@ -59,6 +59,9 @@ typedef struct {
 void S_ChannelFree_Callback(channel_t* v);
 void S_LoadData(soundsystemsavegame_t* pSave);
 void S_SaveData(soundsystemsavegame_t* pSave);
+void S_ReLoad(soundsystemsavegame_t* pSave);
+
+extern qboolean s_bSoundPaused;
 
 #ifdef __cplusplus
 }
diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 0007453a..e2417250 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
 
+qboolean s_bSoundPaused = qfalse;
+
 void S_Init2()
 {
     S_Init();
@@ -492,24 +494,62 @@ void S_TriggeredMusic_PlayIntroMusic() {
     S_StartBackgroundTrack("sound/music/mus_MainTheme.mp3", "");
 }
 
+/*
+==============
+S_TriggeredMusic_SetupHandle
+==============
+*/
+void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart) {
+    // FIXME: unimplemented
+}
+
+/*
+==============
+callbackServer
+==============
+*/
 void callbackServer(int entnum, int channel_number, const char* name) {
     if (com_sv_running->integer) {
         SV_SoundCallback(entnum, channel_number, name);
     }
 }
 
+/*
+==============
+S_ChannelFree_Callback
+==============
+*/
 void S_ChannelFree_Callback(channel_t* v) {
     if (v->entnum & S_FLAG_DO_CALLBACK) {
         callbackServer(v->entnum & ~S_FLAG_DO_CALLBACK, v - s_channels, v->thesfx->soundName);
     }
 }
 
+/*
+==============
+S_LoadData
+==============
+*/
 void S_LoadData(soundsystemsavegame_t* pSave) {
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_SaveData
+==============
+*/
 void S_SaveData(soundsystemsavegame_t* pSave) {
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_ReLoad
+==============
+*/
+void S_ReLoad(soundsystemsavegame_t* pSave) {
+    // FIXME: unimplemented
+}
+
 #endif
diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h
index 1e7d32a2..30fe316f 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -78,6 +78,7 @@ qboolean S_IsSoundPlaying(int channelNumber, const char* name);
 void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t velocity, qboolean use_listener);
 void S_FadeSound(float fTime);
 void S_TriggeredMusic_PlayIntroMusic();
+void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart);
 
 #ifdef __cplusplus
 }

From 757b4849f86d0302fd615f55cc5dcfe8f83e90e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:07:32 +0200
Subject: [PATCH 0551/2040] Add a fix to load the music from save

This commit implements code to get/set sample offset in an OpenAL channel and saves the music filename/offset into the file. This only works by using the experimental sound system, so it partially fixes #327
---
 code/client/cl_ui.cpp            | 14 +++----
 code/client/new/snd_main_new.cpp | 30 ++++++++++++++
 code/client/new/snd_public_new.h |  4 ++
 code/client/snd_dma_new.cpp      | 30 ++++++++++++++
 code/client/snd_local_new.h      |  3 ++
 code/client/snd_openal_new.cpp   | 67 +++++++++++++++++++++++++++-----
 code/client/snd_openal_new.h     |  4 ++
 code/client/snd_public.h         |  4 ++
 code/server/sv_ccmds.c           | 12 ++++++
 9 files changed, 151 insertions(+), 17 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 9e7b103c..cc84f72c 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3976,13 +3976,13 @@ void S_ServerLoaded(void)
     Com_DPrintf("Loading Previous Sound State.\n");
     S_StopAllSounds2(qfalse);
 
-    //S_TriggeredMusic_Stop();
-    //s_bSoundPaused = qtrue;
-    //S_ReLoad( &svs.soundSystem );
-    //
-    //if( svs.tm_filename[ 0 ] ) {
-    //	S_TriggeredMusic_SetupHandle( svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0 );
-    //}
+    S_TriggeredMusic_Stop();
+    s_bSoundPaused = qtrue;
+    S_ReLoad( &svs.soundSystem );
+
+    if( svs.tm_filename[ 0 ] ) {
+    	S_TriggeredMusic_SetupHandle( svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0 );
+    }
 }
 
 /*
diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index e2417250..9e3fbbbc 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -503,6 +503,36 @@ void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffs
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_GetMusicFilename
+==============
+*/
+const char* S_GetMusicFilename() {
+    // FIXME: unimplemented
+    return "";
+}
+
+/*
+==============
+S_GetMusicLoopCount
+==============
+*/
+int S_GetMusicLoopCount() {
+    // FIXME: unimplemented
+    return 0;
+}
+
+/*
+==============
+S_GetMusicOffset
+==============
+*/
+unsigned int S_GetMusicOffset() {
+    // FIXME: unimplemented
+    return 0;
+}
+
 /*
 ==============
 callbackServer
diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h
index 30fe316f..c945052a 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -80,6 +80,10 @@ void S_FadeSound(float fTime);
 void S_TriggeredMusic_PlayIntroMusic();
 void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart);
 
+const char* S_GetMusicFilename();
+int S_GetMusicLoopCount();
+unsigned int S_GetMusicOffset();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index fbe46aed..efa4735d 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -787,4 +787,34 @@ void S_ClearSoundBuffer()
     // TODO: Remove once AL is fully implemented
 }
 
+/*
+==============
+S_GetMusicFilename
+==============
+*/
+const char* S_GetMusicFilename()
+{
+    return S_Driver_GetMusicFilename();
+}
+
+/*
+==============
+S_GetMusicLoopCount
+==============
+*/
+int S_GetMusicLoopCount()
+{
+    return S_Driver_GetMusicLoopCount();
+}
+
+/*
+==============
+S_GetMusicOffset
+==============
+*/
+unsigned int S_GetMusicOffset()
+{
+    return S_Driver_GetMusicOffset();
+}
+
 #endif
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 20358ddb..d6771244 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -215,6 +215,9 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
 #define S_Driver_Respatialize           S_Call_SndDriverX(SOUND_DRIVER, Respatialize)
 #define S_Driver_SetReverb              S_Call_SndDriverX(SOUND_DRIVER, SetReverb)
 #define S_Driver_Update                 S_Call_SndDriverX(SOUND_DRIVER, Update)
+#define S_Driver_GetMusicFilename       S_Call_SndDriverX(SOUND_DRIVER, GetMusicFilename)
+#define S_Driver_GetMusicLoopCount      S_Call_SndDriverX(SOUND_DRIVER, GetMusicLoopCount)
+#define S_Driver_GetMusicOffset         S_Call_SndDriverX(SOUND_DRIVER, GetMusicOffset)
 
 void S_PrintInfo();
 void S_DumpInfo();
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index a8c65c5a..21dd868c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -958,8 +958,6 @@ void S_UnpauseSound()
         return;
     }
 
-    s_bSoundPaused = true;
-
     for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (!pChannel) {
@@ -2477,6 +2475,36 @@ void S_OPENAL_Update()
     }
 }
 
+/*
+==============
+S_OPENAL_GetMusicFilename
+==============
+*/
+const char* S_OPENAL_GetMusicFilename()
+{
+    return openal.tm_filename;
+}
+
+/*
+==============
+S_OPENAL_GetMusicLoopCount
+==============
+*/
+int S_OPENAL_GetMusicLoopCount()
+{
+    return openal.tm_loopcount;
+}
+
+/*
+==============
+S_OPENAL_GetMusicOffset
+==============
+*/
+unsigned int S_OPENAL_GetMusicOffset()
+{
+    return openal.chan_trig_music.sample_offset();
+}
+
 /*
 ==============
 S_IsSoundPlaying
@@ -3077,8 +3105,12 @@ openal_channel::sample_offset
 */
 U32 openal_channel::sample_offset()
 {
-    STUB_DESC("sample_offset");
-    return 127;
+    ALint offset = 0;
+
+    qalGetSourcei(source, AL_SAMPLE_OFFSET, &offset);
+    alDieIfError();
+
+    return offset;
 }
 
 /*
@@ -3088,8 +3120,12 @@ openal_channel::sample_ms_offset
 */
 U32 openal_channel::sample_ms_offset()
 {
-    STUB_DESC("sample_ms_offset");
-    return 127;
+    float offset = 0;
+
+    qalGetSourcef(source, AL_SAMPLE_OFFSET, &offset);
+    alDieIfError();
+
+    return offset * 1000.f;
 }
 
 /*
@@ -3122,7 +3158,8 @@ openal_channel::set_sample_offset
 */
 void openal_channel::set_sample_offset(U32 offset)
 {
-    STUB_DESC("sample_offset");
+    qalSourcei(source, AL_SAMPLE_OFFSET, offset);
+    alDieIfError();
 }
 
 /*
@@ -3132,7 +3169,8 @@ openal_channel::set_sample_ms_offset
 */
 void openal_channel::set_sample_ms_offset(U32 offset)
 {
-    STUB_DESC("sample_ms_offset");
+    qalSourcef(source, AL_SEC_OFFSET, offset / 1000.f);
+    alDieIfError();
 }
 
 /*
@@ -3932,9 +3970,18 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
     openal.chan_trig_music.set_sample_loop_count(iLoopCount);
     openal.chan_trig_music.set_sample_offset(iOffset);
 
-    if (autostart) {
-        openal.chan_trig_music.play();
+    // Fixed in OPM
+    //  Play the sound then pause it immediately
+    //  So it can be unpaused upon loading from save
+    openal.chan_trig_music.play();
+
+    if (!autostart) {
+        openal.chan_trig_music.pause();
     }
+
+    //if (autostart) {
+    //    openal.chan_trig_music.play();
+    //}
 }
 
 /*
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index 1fbec8ba..f786c465 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -197,6 +197,10 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
 void S_OPENAL_SetReverb(int iType, float fLevel);
 void S_OPENAL_Update();
 
+const char* S_OPENAL_GetMusicFilename();
+int S_OPENAL_GetMusicLoopCount();
+unsigned int S_OPENAL_GetMusicOffset();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/client/snd_public.h b/code/client/snd_public.h
index ce3069bf..f348cdc9 100644
--- a/code/client/snd_public.h
+++ b/code/client/snd_public.h
@@ -157,6 +157,10 @@ void S_StopMovieAudio();
 void S_SetupMovieAudio(const char* pszMovieName);
 int S_CurrentMoviePosition();
 
+const char* S_GetMusicFilename();
+int S_GetMusicLoopCount();
+unsigned int S_GetMusicOffset();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index c760c1cd..88dba1c2 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1955,6 +1955,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 	time_t aclock;
 
 	Com_DPrintf( "SV_ArchiveServerFile(%s)\n", autosave ? "true" : "false" );
+	memset(&save, 0, sizeof(save));
 	name = Com_GetArchiveFileName( svs.gameName, "ssv" );
 
 	if( !loading )
@@ -1995,6 +1996,17 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 		strncpy( save.saveName, svs.gameName, sizeof( save.saveName ) );
 		save.mapTime = svs.time - svs.startTime;
 
+		name = S_GetMusicFilename();
+		if (name) {
+			Q_strncpyz(save.tm_filename, name, sizeof(save.tm_filename));
+			save.tm_offset = S_GetMusicOffset();
+			save.tm_loopcount = S_GetMusicLoopCount();
+		} else {
+			save.tm_filename[0] = 0;
+			save.tm_offset = 0;
+			save.tm_loopcount = 0;
+		}
+
 		FS_Write( &save, sizeof( savegamestruct_t ), f );
 		S_Save( f );
 		CM_WritePortalState( f );

From c5ef60040a5f6199c65c44cf98d66a50b0db5964 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:44:00 +0200
Subject: [PATCH 0552/2040] Fix sounds not being resumed properly after loading
 from save

---
 code/client/snd_openal_new.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 21dd868c..7214807d 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -964,11 +964,9 @@ void S_UnpauseSound()
             continue;
         }
 
-        if (!pChannel->is_paused()) {
-            continue;
+        if (pChannel->is_paused() || (pChannel->iFlags & CHANNEL_FLAG_PLAYABLE)) {
+            pChannel->play();
         }
-
-        pChannel->play();
     }
 
     if (openal.chan_mp3.is_paused()) {
@@ -2591,9 +2589,6 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
     }
 
     pChannel->iBaseRate = pChannel->sample_playback_rate();
-    pChannel->set_gain(pChannel->fVolume);
-    pChannel->set_sample_offset(pBase->iOffset);
-    pChannel->set_sample_playback_rate(pChannel->iBaseRate * pBase->fNewPitchMult);
 
     if (sfx_infos[pSfx->sfx_info_index].loop_start != -1) {
         pChannel->set_sample_loop_block(
@@ -2612,6 +2607,10 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
         pChannel->set_sample_loop_count(1);
     }
 
+    pChannel->set_gain(pChannel->fVolume);
+    pChannel->set_sample_offset(pBase->iOffset);
+    pChannel->set_sample_playback_rate(pChannel->iBaseRate * pBase->fNewPitchMult);
+
     if (bStartUnpaused) {
         pChannel->resume_sample();
     } else {
@@ -2917,6 +2916,7 @@ openal_channel::force_free
 void openal_channel::force_free()
 {
     stop();
+    iFlags = 0;
 }
 
 /*

From e5fb85ad089f722b8fcc6d798e9b69288798422a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 23 Jul 2024 19:06:48 +0200
Subject: [PATCH 0553/2040] Fix material not refreshing when it already has a
 shader.

This fixes #329 where the material (matching quick.tga) would be loaded only once without being able to change
---
 code/uilib/uiwidget.cpp | 2 +-
 code/uilib/uiwinman.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 49da7e95..4297705b 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -653,7 +653,7 @@ void UIReggedMaterial::RefreshMaterial
 {
 	if( isGot )
 	{
-		this->hMat = uii.Rend_RegisterMaterial( name.c_str() );
+		this->hMat = uii.Rend_RefreshMaterial( name.c_str() );
 	}
 }
 
diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index 9e986d97..116e1f4e 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -635,7 +635,7 @@ UIReggedMaterial *UIWindowManager::RefreshShader(const str& name)
     for (i = 1; i <= m_materiallist.NumObjects(); i++) {
         regged = m_materiallist.ObjectAt(i);
         if (regged->GetName() == name) {
-            regged->ReregisterMaterial();
+            regged->RefreshMaterial();
             return regged;
         }
     }

From 81df55310bdf5877dba7ef068d3cd10273257a16 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 23 Jul 2024 19:53:40 +0200
Subject: [PATCH 0554/2040] Fix medals always being awarded

This fixes #316
---
 code/fgame/player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 86b41dd3..98b681f4 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4499,9 +4499,9 @@ void Player::ClientThink(void)
                 || g_medalbt3->modificationCount > 1 || g_medalbt4->modificationCount > 1
                 || g_medalbt5->modificationCount > 1 || g_eogmedal0->modificationCount > 1
                 || g_eogmedal1->modificationCount > 1 || g_eogmedal2->modificationCount > 1) {
-                gi.cvar_set("g_gotmedal", "0");
-            } else {
                 gi.cvar_set("g_gotmedal", "1");
+            } else {
+                gi.cvar_set("g_gotmedal", "0");
             }
 
             client->ps.pm_flags |= PMF_FROZEN;

From 11ec6270da4d9541417a58cff8c84b9859c28190 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 24 Jul 2024 19:57:22 +0200
Subject: [PATCH 0555/2040] Made OpenAL package required

---
 code/client/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index 77a5f515..efb871d9 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -20,7 +20,7 @@ target_compile_definitions(omohclient INTERFACE USE_CODEC_MP3)
 
 if (USE_SOUND_NEW)
 	# Try to use OpenAL
-	find_package(OpenAL)
+	find_package(OpenAL REQUIRED)
 	if (OPENAL_FOUND)
 		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1 USE_SOUND_NEW=1)
 		if (MSVC)

From c093122764f99f1a45cc10005b4864e224418d66 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:07:22 +0200
Subject: [PATCH 0556/2040] Made code C++ compatible so UI_LoadResource() can
 be used

---
 code/client/{snd_mem_new.c => snd_mem_new.cpp} | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename code/client/{snd_mem_new.c => snd_mem_new.cpp} (98%)

diff --git a/code/client/snd_mem_new.c b/code/client/snd_mem_new.cpp
similarity index 98%
rename from code/client/snd_mem_new.c
rename to code/client/snd_mem_new.cpp
index 2cd06435..c3f18744 100644
--- a/code/client/snd_mem_new.c
+++ b/code/client/snd_mem_new.cpp
@@ -22,7 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if USE_SOUND_NEW
 
-#    include "snd_local.h"
+#include "snd_local.h"
+#include "cl_ui.h"
 
 byte *data_p;
 byte *iff_end;
@@ -355,7 +356,7 @@ qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, by
     info->rate = (float)newkhz;
     newdatasize += info->dataofs;
 
-    *newdata = Z_TagMalloc(newdatasize, TAG_SOUND);
+    *newdata = (byte*)Z_TagMalloc(newdatasize, TAG_SOUND);
     memcpy(*newdata, wav, info->dataofs);
 
     iff_data = *newdata;
@@ -450,7 +451,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         return qfalse;
     }
 
-    sfx->data = Z_TagMalloc(size, TAG_SOUND);
+    sfx->data = (byte*)Z_TagMalloc(size, TAG_SOUND);
 
     FS_Read(sfx->data, size, file_handle);
     FS_FCloseFile(file_handle);
@@ -528,7 +529,7 @@ qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
     }
 
     memset(&sfx->info, 0, sizeof(sfx->info));
-    sfx->data = Z_TagMalloc(length, TAG_SOUND);
+    sfx->data = (byte*)Z_TagMalloc(length, TAG_SOUND);
     sfx->length = length;
     sfx->width = 1;
     FS_Read(sfx->data, length, file_handle);

From 016e062fefc5c60d9278874a3efd3e340b3783c5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:10:46 +0200
Subject: [PATCH 0557/2040] Fix UIReggedMaterial::ReregisterMaterial and
 UIReggedMaterial::GetMaterial

ReregisterMaterial() must register the material if it was registered before, and GetMaterial() must register the material if it hasn't been registered and return it
---
 code/client/cl_ui.cpp         |  2 +-
 code/client/cl_uistd.cpp      | 32 --------------------------------
 code/uilib/uibind.cpp         |  3 ---
 code/uilib/uibindlist.cpp     |  3 ---
 code/uilib/uicheckbox.cpp     |  1 -
 code/uilib/uilabel.cpp        |  1 -
 code/uilib/uilangamelist.cpp  |  2 --
 code/uilib/uilist.cpp         |  4 ----
 code/uilib/uipulldownmenu.cpp |  6 ------
 code/uilib/uislider.cpp       | 10 ----------
 code/uilib/uiwidget.cpp       | 14 ++++++--------
 code/uilib/uiwinman.cpp       |  4 +---
 12 files changed, 8 insertions(+), 74 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index cc84f72c..fff374af 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1891,7 +1891,7 @@ void UI_Update(void)
                     UI_CloseConsole();
                 }
             } else if (ui_static_materials.loading) {
-                ui_static_materials.loading->ReregisterMaterial();
+                ui_static_materials.loading->GetMaterial();
             }
         }
     }
diff --git a/code/client/cl_uistd.cpp b/code/client/cl_uistd.cpp
index d3780aa8..fd7fe2c1 100644
--- a/code/client/cl_uistd.cpp
+++ b/code/client/cl_uistd.cpp
@@ -490,12 +490,10 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     float width = frac * m_frame.size.width;
 
-                    m_statbar_material->ReregisterMaterial();
                     re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material->GetMaterial());
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        m_statbar_material_flash->ReregisterMaterial();
                         re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
                     }
                     break;
@@ -507,12 +505,10 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     float y = m_frame.size.height * (1.0 - frac);
 
-                    m_statbar_material->ReregisterMaterial();
                     re.DrawTilePic(0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material->GetMaterial());
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        m_statbar_material_flash->ReregisterMaterial();
                         re.DrawTilePic(
                             0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial()
                         );
@@ -528,14 +524,12 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     float width = frac * m_frame.size.width;
 
-                    m_statbar_material->ReregisterMaterial();
                     re.DrawStretchPic(
                         0.0, 0.0, width, m_frame.size.height, 0.0, 0.0, 1.0, 1.0, m_statbar_material->GetMaterial()
                     );
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        m_statbar_material_flash->ReregisterMaterial();
                         re.DrawStretchPic(
                             0.0,
                             0.0,
@@ -557,14 +551,12 @@ void UIFakkLabel::DrawStatbar(float frac)
                     float y      = m_frame.size.height * (1.0 - frac);
                     float height = m_frame.size.height * frac;
 
-                    m_statbar_material->ReregisterMaterial();
                     re.DrawStretchPic(
                         0.0, y, m_frame.size.width, height, 0.0, 1.0 - frac, 1.0, 1.0, m_statbar_material->GetMaterial()
                     );
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        m_statbar_material_flash->ReregisterMaterial();
                         re.DrawStretchPic(
                             0.0,
                             y,
@@ -583,14 +575,12 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     float height = m_frame.size.height * frac;
 
-                    m_statbar_material->ReregisterMaterial();
                     re.DrawStretchPic(
                         0.0, 0.0, m_frame.size.width, height, 0.0, 0.0, 1.0, frac, m_statbar_material->GetMaterial()
                     );
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        m_statbar_material_flash->ReregisterMaterial();
                         re.DrawStretchPic(
                             0.0,
                             0.0,
@@ -686,12 +676,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                 re.SetColor(m_foreground_color);
             }
 
-            m_statbar_material->ReregisterMaterial();
             re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
             if (alpha && m_statbar_material_flash) {
                 re.SetColor(col);
-                m_statbar_material_flash->ReregisterMaterial();
                 re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
             }
         } else {
@@ -709,12 +697,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                     re.SetColor(m_foreground_color);
                 }
 
-                m_statbar_material->ReregisterMaterial();
                 re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
                 if (alpha && m_statbar_material_flash) {
                     re.SetColor(col);
-                    m_statbar_material_flash->ReregisterMaterial();
                     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
                 }
 
@@ -739,12 +725,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                 re.SetColor(m_foreground_color);
             }
 
-            m_statbar_material->ReregisterMaterial();
             re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
             if (alpha && m_statbar_material_flash) {
                 re.SetColor(col);
-                m_statbar_material_flash->ReregisterMaterial();
                 re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
             }
         } else {
@@ -766,12 +750,10 @@ void UIFakkLabel::DrawStatCircle(float frac)
                     re.SetColor(m_foreground_color);
                 }
 
-                m_statbar_material->ReregisterMaterial();
                 re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
                 if (alpha && m_statbar_material_flash) {
                     re.SetColor(col);
-                    m_statbar_material_flash->ReregisterMaterial();
                     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
                 }
 
@@ -846,12 +828,10 @@ void UIFakkLabel::DrawStatNeedle(float frac)
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
         re.SetColor(col);
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 
@@ -867,11 +847,9 @@ void UIFakkLabel::DrawStatNeedle(float frac)
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 }
@@ -937,11 +915,9 @@ void UIFakkLabel::DrawStatRotator(float frac)
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 
@@ -959,11 +935,9 @@ void UIFakkLabel::DrawStatRotator(float frac)
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 }
@@ -1137,7 +1111,6 @@ void UIFakkLabel::DrawStatCompass(float frac)
     vVerts[1][1] = vCenter[1] + vCompassDir[1] * vCenter[1] + fSinVal * vCenter[0];
     vVerts[2][1] = vCenter[1] - vCompassDir[1] * vCenter[1] - fSinVal * vCenter[0];
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     vVerts[0][0]     = vVerts[2][0];
@@ -1150,7 +1123,6 @@ void UIFakkLabel::DrawStatCompass(float frac)
     vVerts[2][0] = vCenter[0] + fCosVal * vCenter[1] - vCompassDir[0] * vCenter[0];
     vVerts[2][1] = vCenter[1] * fSinVal + vCenter[0] - vCompassDir[1] * vCenter[1];
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 }
 
@@ -1227,11 +1199,9 @@ void UIFakkLabel::DrawStatSpinner(float frac)
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 
@@ -1249,11 +1219,9 @@ void UIFakkLabel::DrawStatSpinner(float frac)
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 }
diff --git a/code/uilib/uibind.cpp b/code/uilib/uibind.cpp
index cc6d43c9..c617cc4e 100644
--- a/code/uilib/uibind.cpp
+++ b/code/uilib/uibind.cpp
@@ -172,7 +172,6 @@ void UIBindButton::DrawUnpressed(void)
     if (str::cmp(s, m_last_keyname)) {
         m_mat = uWinMan.RegisterShader("textures/bind/" + s);
         if (m_mat) {
-            m_mat->ReregisterMaterial();
             if (m_mat->GetMaterial()) {
                 m_material = m_mat;
             } else {
@@ -186,8 +185,6 @@ void UIBindButton::DrawUnpressed(void)
     }
 
     if (m_mat) {
-        m_mat->ReregisterMaterial();
-
         if (m_mat->GetMaterial()) {
             return;
         }
diff --git a/code/uilib/uibindlist.cpp b/code/uilib/uibindlist.cpp
index c2d3d1b4..f094a799 100644
--- a/code/uilib/uibindlist.cpp
+++ b/code/uilib/uibindlist.cpp
@@ -592,10 +592,7 @@ void UIFakkBindList::DrawPressKey(UIRect2D frame)
         return;
     }
 
-    m_presskey_mat->ReregisterMaterial();
     w = uii.Rend_GetShaderWidth(m_presskey_mat->GetMaterial()) * m_vVirtualScale[0];
-
-    m_presskey_mat->ReregisterMaterial();
     h = uii.Rend_GetShaderHeight(m_presskey_mat->GetMaterial()) * m_vVirtualScale[1];
 
     UIRect2D newFrame    = uWinMan.getFrame();
diff --git a/code/uilib/uicheckbox.cpp b/code/uilib/uicheckbox.cpp
index 9b536b62..77e1c76d 100644
--- a/code/uilib/uicheckbox.cpp
+++ b/code/uilib/uicheckbox.cpp
@@ -102,7 +102,6 @@ void UICheckBox::Draw()
 	float y = (m_frame.size.height - height) * 0.5f;
 	if (material)
 	{
-		material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(x, y, width, height, 0.0f, 0.0f, 1.0f, 1.0f, material->GetMaterial());
 	}
 	else
diff --git a/code/uilib/uilabel.cpp b/code/uilib/uilabel.cpp
index 5a6524fe..30085e49 100644
--- a/code/uilib/uilabel.cpp
+++ b/code/uilib/uilabel.cpp
@@ -270,7 +270,6 @@ void UILabel::Draw(void)
                 m_sCurrentShaderName = string;
 
                 setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
-                m_material->ReregisterMaterial();
 
                 if (!m_material->GetMaterial()) {
                     setMaterial(NULL);
diff --git a/code/uilib/uilangamelist.cpp b/code/uilib/uilangamelist.cpp
index deb0ed93..0dd99184 100644
--- a/code/uilib/uilangamelist.cpp
+++ b/code/uilib/uilangamelist.cpp
@@ -287,9 +287,7 @@ void UILanGameList::DrawNoServers(UIRect2D frame)
         AddNoServer();
     }
 
-    m_noservers_mat->ReregisterMaterial();
     w = uii.Rend_GetShaderWidth(m_noservers_mat->GetMaterial() * m_vVirtualScale[0]);
-    m_noservers_mat->ReregisterMaterial();
     h = uii.Rend_GetShaderHeight(m_noservers_mat->GetMaterial() * m_vVirtualScale[1]);
 
     UIRect2D newFrame    = uWinMan.getFrame();
diff --git a/code/uilib/uilist.cpp b/code/uilib/uilist.cpp
index 0b22cdba..fdc6f782 100644
--- a/code/uilib/uilist.cpp
+++ b/code/uilib/uilist.cpp
@@ -108,8 +108,6 @@ void UIList::Draw
 		m_border_color,
 		m_local_alpha);
 
-	m_prev_arrow->ReregisterMaterial();
-
 	float height = m_frame.size.height - 4.0;
 	float width = m_arrow_width - 4.0;
 	uii.Rend_DrawPicStretched(
@@ -135,8 +133,6 @@ void UIList::Draw
 		m_border_color,
 		m_local_alpha);
 
-	m_next_arrow->ReregisterMaterial();
-
 	uii.Rend_DrawPicStretched(
 		x + 2.0f,
 		y + 2.0f,
diff --git a/code/uilib/uipulldownmenu.cpp b/code/uilib/uipulldownmenu.cpp
index 9236472e..780ad481 100644
--- a/code/uilib/uipulldownmenu.cpp
+++ b/code/uilib/uipulldownmenu.cpp
@@ -121,8 +121,6 @@ UIRect2D UIPulldownMenu::getAlignmentRect
 		uipull_describe *uipd = m_desc.ObjectAt(i);
 		if (uipd && uipd->material)
 		{
-			uipd->material->ReregisterMaterial();
-
 			int h = uii.Rend_GetShaderHeight(uipd->material->GetMaterial());
 			if (h > maxheight)
 			{
@@ -148,7 +146,6 @@ float UIPulldownMenu::getDescWidth
 	UIReggedMaterial* mat = desc->material;
 	if (mat)
 	{
-		mat->ReregisterMaterial();
 		return uii.Rend_GetShaderWidth(mat->GetMaterial());
 	}
 
@@ -164,7 +161,6 @@ float UIPulldownMenu::getDescHeight
 	UIReggedMaterial* mat = desc->material;
 	if (mat)
 	{
-		mat->ReregisterMaterial();
 		return uii.Rend_GetShaderHeight(mat->GetMaterial());
 	}
 
@@ -549,7 +545,6 @@ void UIPulldownMenu::Draw
 			m_font->setColor(m_highlightFGColor);
 			if (desc->selected_material)
 			{
-				desc->selected_material->ReregisterMaterial();
 				uii.Rend_DrawPicStretched(
 					atx,
 					0.0f,
@@ -577,7 +572,6 @@ void UIPulldownMenu::Draw
 		{
 			if (m_submenu != i)
 			{
-				desc->material->ReregisterMaterial();
 				uii.Rend_DrawPicStretched(
 					atx,
 					0.0f,
diff --git a/code/uilib/uislider.cpp b/code/uilib/uislider.cpp
index cc7b7c13..b2403e78 100644
--- a/code/uilib/uislider.cpp
+++ b/code/uilib/uislider.cpp
@@ -454,7 +454,6 @@ void UISlider::LayoutSliderThumbShader
 		m_thumbmaterial_pressed = uWinMan.RegisterShader(pressedShader);
 	}
 
-	m_thumbmaterial->ReregisterMaterial();
 	m_sliderwidth = uii.Rend_GetShaderWidth(m_thumbmaterial->GetMaterial());
 	m_initialized = qfalse;
 }
@@ -478,7 +477,6 @@ void UISlider::LayoutSliderLeftShader
 		m_prev_arrow_material_pressed = uWinMan.RegisterShader(pressedShader);
 	}
 
-	m_prev_arrow_material->ReregisterMaterial();
 	m_arrow_width = uii.Rend_GetShaderWidth(m_prev_arrow_material->GetMaterial());
 	m_initialized = qfalse;
 }
@@ -502,7 +500,6 @@ void UISlider::LayoutSliderRightShader
 		m_next_arrow_material_pressed = uWinMan.RegisterShader(pressedShader);
 	}
 
-	m_next_arrow_material->ReregisterMaterial();
 	m_arrow_width = uii.Rend_GetShaderWidth(m_next_arrow_material->GetMaterial());
 	m_initialized = qfalse;
 }
@@ -569,7 +566,6 @@ void UISlider::Draw
 	if (m_thumbmaterial)
 	{
 		UIReggedMaterial* material = m_thumb_depressed ? m_thumbmaterial_pressed : m_thumbmaterial;
-		material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(x, 0.0f, scaledThumbWidth, m_frame.size.height, 0.0f, 0.0f, 1.0f, 1.0f, material->GetMaterial());
 	}
 	else
@@ -581,7 +577,6 @@ void UISlider::Draw
 	{
 		Draw3DBox(0.0f, 0.0f, scaledArrowWidth, m_frame.size.height, m_prev_arrow_depressed, m_border_color, m_local_alpha);
 
-		m_prev_arrow_material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(
 			2.0f,
 			2.0f,
@@ -599,12 +594,10 @@ void UISlider::Draw
 		uihandle_t material;
 		if (m_prev_arrow_depressed)
 		{
-			m_prev_arrow_material_pressed->ReregisterMaterial();
 			material = m_prev_arrow_material_pressed->GetMaterial();
 		}
 		else
 		{
-			m_prev_arrow_material->ReregisterMaterial();
 			material = m_prev_arrow_material->GetMaterial();
 		}
 
@@ -615,7 +608,6 @@ void UISlider::Draw
 	{
 		Draw3DBox(m_frame.size.width - scaledArrowWidth, 0.0f, scaledArrowWidth, m_frame.size.height, m_next_arrow_depressed, m_border_color, m_local_alpha);
 
-		m_next_arrow_material->ReregisterMaterial();
 		uii.Rend_DrawPicStretched(
 			m_frame.size.width - scaledArrowWidth + 2.0f,
 			2.0f,
@@ -633,12 +625,10 @@ void UISlider::Draw
 		uihandle_t material;
 		if (m_next_arrow_depressed)
 		{
-			m_next_arrow_material_pressed->ReregisterMaterial();
 			material = m_next_arrow_material_pressed->GetMaterial();
 		}
 		else
 		{
-			m_next_arrow_material->ReregisterMaterial();
 			material = m_next_arrow_material->GetMaterial();
 		}
 
diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 4297705b..4682c062 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -610,7 +610,11 @@ UIReggedMaterial::UIReggedMaterial()
 
 uihandle_t UIReggedMaterial::GetMaterial()
 {
-	ReregisterMaterial();
+	if ( !isGot )
+	{
+		isGot = true;
+		this->hMat = uii.Rend_RegisterMaterial(name.c_str());
+	}
 	return hMat;
 }
 
@@ -620,9 +624,7 @@ void UIReggedMaterial::ReregisterMaterial
 	)
 
 {
-	if( !isGot )
-	{
-		isGot = true;
+	if( isGot ) {
 		this->hMat = uii.Rend_RegisterMaterial( name.c_str() );
 	}
 }
@@ -2468,8 +2470,6 @@ void UIWidget::Display
 		col[3] = m_foreground_color.a * m_local_alpha;
 		uii.Rend_SetColor( col );
 
-		m_material->ReregisterMaterial();
-
 		if( m_flags & WF_TILESHADER )
 		{
                if (m_bVirtual) {
@@ -2489,12 +2489,10 @@ void UIWidget::Display
 
 	if( m_pressedmaterial_active && m_pressedmaterial != NULL )
 	{
-		m_pressedmaterial->ReregisterMaterial();
 		uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_pressedmaterial->GetMaterial() );
 	}
 	else if( m_hovermaterial_active && m_hovermaterial != NULL )
 	{
-		m_hovermaterial->ReregisterMaterial();
 		uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_hovermaterial->GetMaterial() );
 	}
 
diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index 116e1f4e..6adf321c 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -256,8 +256,6 @@ void UIWindowManager::UpdateViews(void)
         set2D();
         uii.Rend_SetColor(col);
 
-        m_cursor->ReregisterMaterial();
-
         uii.Rend_DrawPicStretched(uid.mouseX, uid.mouseY, 0, 0, 0, 0, 1, 1, m_cursor->GetMaterial());
 
         m_font->setColor(UWhite);
@@ -667,7 +665,7 @@ void UIWindowManager::RefreshShadersFromList(void)
     num = m_materiallist.NumObjects();
     for (i = 1; i <= num; i++) {
         UIReggedMaterial *regged = m_materiallist.ObjectAt(i);
-        regged->RefreshMaterial();
+        regged->ReregisterMaterial();
     }
 }
 

From 5af8e127f82c1571fe057d22c98b6efb89382172 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:04:08 +0200
Subject: [PATCH 0558/2040] Added NULL sound flag

---
 code/client/snd_local_new.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index d6771244..19ebcc60 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -150,6 +150,7 @@ enum sfx_flags_t {
     SFX_FLAG_MP3           = 2,
     SFX_FLAG_STREAMED      = 4,
     SFX_FLAG_NO_OFFSET     = 8,
+    SFX_FLAG_NULL          = 16,
 };
 
 enum loopsound_flags_t {

From bf4780bbdbd5578fd831e5fc9dcde75a69ee76ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:49:11 +0200
Subject: [PATCH 0559/2040] From now, load streamed sound into memory as
 deferred loading is currently unsupported

---
 code/client/snd_mem_new.cpp | 51 +++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index c3f18744..e6aea697 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -416,8 +416,11 @@ DownSampleWav_MILES
 */
 int DownSampleWav_MILES(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
 {
-    STUB_DESC("sound stuff");
-    return 0;
+    //STUB_DESC("sound stuff");
+    //return 0;
+    // FIXME: unimplemented
+    //  Fallback to software downsampling
+    return DownSampleWav(info, wav, wavlength, newkhz, newdata);
 }
 
 /*
@@ -438,6 +441,25 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         return qfalse;
     }
 
+    // Removed because of OpenAL
+    /*
+    if (streamed) {
+        //
+        // Added in 2.0
+        //  Will be loaded next time
+        sfx->length = 5000;
+        sfx->width = 1;
+        sfx->iFlags |= SFX_FLAG_STREAMED;
+        sfx->time_length = 5000.0;
+        sfx->data = 0;
+        return qtrue;
+    }
+    */
+
+    if (clc.state != CA_LOADING && !force_load) {
+        Com_Printf("**************S_LoadSound: %s\n", fileName);
+    }
+
     if (strstr(fileName, ".mp3")) {
         return S_LoadMP3(fileName, sfx);
     }
@@ -457,7 +479,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
     FS_FCloseFile(file_handle);
     sfx->info = GetWavinfo(fileName, sfx->data, size);
 
-    if (sfx->info.channels != 1)
+    if (sfx->info.channels != 1 && !streamed)
     {
         Com_Printf("%s is a stereo wav file\n", fileName);
         Z_Free(sfx->data);
@@ -469,14 +491,17 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         sfx->iFlags |= SFX_FLAG_NO_OFFSET;
     }
 
-    realKhz = 11025;
-
-    if (s_khz->integer != 11)
-    {
+    switch (s_khz->integer) {
+    case 11:
+        realKhz = 11025;
+        break;
+    case 22:
+    default:
         realKhz = 22050;
-        if (s_khz->integer == 44) {
-            realKhz = 44100;
-        }
+        break;
+    case 44:
+        realKhz = 44100;
+        break;
     }
 
     if (!(sfx->iFlags & SFX_FLAG_STREAMED) && realKhz < sfx->info.rate) {
@@ -507,6 +532,12 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
 
     sprintf(tempName, "k%s", fileName);
     UI_LoadResource(tempName);
+
+    if (strstr(fileName, "sound/null.wav")) {
+        sfx->iFlags |= SFX_FLAG_NULL;
+        return qtrue;
+    }
+
     return qtrue;
 }
 

From 31d254cb9f6d93e35dd2ee26237723caa7fa1bd3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jul 2024 21:43:19 +0200
Subject: [PATCH 0560/2040] Use ceil() and set the delta appropriately if time1
 is after team2

---
 code/skeletor/skeletor.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 0987e17a..11bbc144 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -102,8 +102,8 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
 
     deltaWeight1 = time1 / frameTime;
     deltaWeight2 = time2 / frameTime;
-    frameNum1    = (int)(deltaWeight1 + 1.0);
-    frameNum2    = (int)(deltaWeight2 + 1.0);
+    frameNum1    = ceil(deltaWeight1);
+    frameNum2    = ceil(deltaWeight2);
 
     d = frameNum1 - deltaWeight1;
     s = 1.0 - (frameNum2 - deltaWeight2);
@@ -115,14 +115,15 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
         for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
             delta += m_frame[currFrame % numFrames].delta;
         }
+
+        delta.x += m_frame[frameNum2 % numFrames].delta.x * s;
+        delta.y += m_frame[frameNum2 % numFrames].delta.y * s;
+        delta.z += m_frame[frameNum2 % numFrames].delta.z * s;
     } else {
         s = s - (1.0 - d);
+        delta = m_frame[frameNum2 % numFrames].delta;
     }
 
-    delta.x += m_frame[frameNum2 % numFrames].delta.x * s;
-    delta.y += m_frame[frameNum2 % numFrames].delta.y * s;
-    delta.z += m_frame[frameNum2 % numFrames].delta.z * s;
-
     if (delta.x > -0.001f && delta.x < 0.001f) {
         delta.x = 0;
     }
@@ -148,25 +149,26 @@ float skelAnimDataGameHeader_s::GetAngularDeltaOverTime(float time1, float time2
 
     deltaWeight1 = time1 / frameTime;
     deltaWeight2 = time2 / frameTime;
-    frameNum1    = (int)(deltaWeight1 + 1.0);
-    frameNum2    = (int)(deltaWeight2 + 1.0);
+    frameNum1    = ceil(deltaWeight1);
+    frameNum2    = ceil(deltaWeight2);
 
     d     = frameNum1 - deltaWeight1;
     s     = 1.0 - (frameNum2 - deltaWeight2);
     delta = 0;
 
-    if (frameNum2 > frameNum1) {
+    if (frameNum1 < frameNum2) {
         delta = m_frame[frameNum1 % numFrames].angleDelta;
 
         for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
             delta += m_frame[currFrame % numFrames].angleDelta;
         }
+
+        delta += m_frame[frameNum2 % numFrames].angleDelta * s;
     } else {
         s = s - (1.0 - d);
+        delta = m_frame[frameNum2 % numFrames].angleDelta;
     }
 
-    delta += m_frame[frameNum2 % numFrames].angleDelta * s;
-
     if (delta > -0.001f && delta < 0.001f) {
         delta = 0;
     }

From 1b35d3ce056a2679757d237fbddbd88538658b21 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 25 Jul 2024 21:43:46 +0200
Subject: [PATCH 0561/2040] Fix angular delta being wrong

This fixes animated characters being sometimes badly positioned, like actors in the plane in t1l1
---
 code/skeletor/skeletor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 11bbc144..62aca4fe 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -157,7 +157,7 @@ float skelAnimDataGameHeader_s::GetAngularDeltaOverTime(float time1, float time2
     delta = 0;
 
     if (frameNum1 < frameNum2) {
-        delta = m_frame[frameNum1 % numFrames].angleDelta;
+        delta = m_frame[frameNum1 % numFrames].angleDelta * d;
 
         for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
             delta += m_frame[currFrame % numFrames].angleDelta;

From dcb0369e10553cca5bf71778d52e1649b66a4bb5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 26 Jul 2024 21:55:17 +0200
Subject: [PATCH 0562/2040] Fix actions deprecation warnings

---
 .github/workflows/build-cmake.yml     | 10 +++++-----
 .github/workflows/publish-release.yml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 2628b791..782bcb6c 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -59,7 +59,7 @@ jobs:
           -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }}
           -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }}"
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: 'source'
 
@@ -99,7 +99,7 @@ jobs:
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         cp '${{steps.sdl.outputs.prefix}}/lib/libSDL2.so' '${{github.workspace}}/install'
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: out-linux-${{matrix.architecture.name}}
         if-no-files-found: error
@@ -142,7 +142,7 @@ jobs:
         cmake --build winflexbison-build --config Release --parallel
         cmake --install winflexbison-build
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: 'source'
 
@@ -181,7 +181,7 @@ jobs:
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/install'
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: out-windows-${{matrix.architecture.name}}
         if-no-files-found: error
@@ -189,7 +189,7 @@ jobs:
           ${{github.workspace}}/install
           !${{github.workspace}}/install/**/*.pdb
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: out-windows-${{matrix.architecture.name}}-pdb
         if-no-files-found: error
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 81b35639..af685159 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -46,7 +46,7 @@ jobs:
       RELEASE_NAME: ${{ github.event.repository.name }}-${{github.ref_name}}-${{matrix.target_os}}
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: 'out-${{matrix.target_os}}'
         path: ${{github.workspace}}/${{matrix.target_os}}
@@ -56,7 +56,7 @@ jobs:
       run: zip -r ../${{ env.RELEASE_NAME }}.zip ./
 
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         name: '${{github.ref_name}}-${{env.RELEASE_TYPE}}'
         prerelease: ${{env.RELEASE_IS_PRERELEASE}}

From 769d06b0f0b683bdf6461af0deece8c8a622c62f Mon Sep 17 00:00:00 2001
From: Alan Zhao <azhao101@gmail.com>
Date: Wed, 15 May 2024 15:14:52 -0700
Subject: [PATCH 0563/2040] Use nanosleep(2) instead of usleep(3)

usleep(3) was declared obsolete in POSIX.1-2001 and removed in
POSIX.1-2008 and nanosleep(2) was recommended to be used instead.
---
 code/autoupdater/autoupdater.c | 5 ++++-
 code/sys/sys_unix.c            | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/autoupdater/autoupdater.c b/code/autoupdater/autoupdater.c
index 4a052027..e013a1f4 100644
--- a/code/autoupdater/autoupdater.c
+++ b/code/autoupdater/autoupdater.c
@@ -933,10 +933,13 @@ static void waitToApplyUpdates(void)
                OS forcibly closes the pipe), we will unblock. Then we can loop on
                kill() until the process is truly gone. */
             int x = 0;
+            struct timespec req;
+            req.tv_sec = 0;
+            req.tv_nsec = 100000000;
             read(3, &x, sizeof (x));
             info("Pipe has closed, waiting for process to fully go away now.");
             while (kill(options.waitforprocess, 0) == 0) {
-                usleep(100000);
+                nanosleep(&req, NULL);
             }
             #endif
         }
diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index 42b5f1b5..cbbc0f6d 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <fcntl.h>
 #include <fenv.h>
 #include <sys/wait.h>
+#include <time.h>
 
 qboolean stdinIsATTY;
 
@@ -550,11 +551,15 @@ void Sys_Sleep( int msec )
 	}
 	else
 	{
+		struct timespec req;
+
 		// With nothing to select() on, we can't wait indefinitely
 		if( msec < 0 )
 			msec = 10;
 
-		usleep( msec * 1000 );
+		req.tv_sec = msec/1000;
+		req.tv_nsec = (msec%1000)*1000000;
+		nanosleep(&req, NULL);
 	}
 }
 

From 2d15696a5eab8d3cb263659eb61173dd6e91c9d9 Mon Sep 17 00:00:00 2001
From: James Darpinian <jdarpinian@gmail.com>
Date: Fri, 7 Jun 2024 08:27:37 -0700
Subject: [PATCH 0564/2040] Add .vscode and baseq3 to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f5adba0c..642e22a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ Makefile.local
 *.swp
 *tags
 *~
+/.vscode/
+/baseq3
 
 # OS X
 ####################

From ee514710c5446154c0440a2b8a2bce7a4c7798d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:57:35 +0200
Subject: [PATCH 0565/2040] Add Emscripten implementation from ioquake3
 upstream

---
 code/qcommon/q_platform.h   |  16 ++++
 code/sdl/sdl_glimp.c        | 141 ++++++++++++++++++++++++++----------
 code/web/client-config.json |  47 ++++++++++++
 code/web/client.html        | 116 +++++++++++++++++++++++++++++
 4 files changed, 280 insertions(+), 40 deletions(-)
 create mode 100644 code/web/client-config.json
 create mode 100644 code/web/client.html

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index bc4960c5..a47f6739 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -355,6 +355,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #endif
 
+//================================================================== EMSCRIPTEN ===
+
+#ifdef __EMSCRIPTEN__
+
+#define OS_STRING "emscripten"
+#define ID_INLINE inline
+#define PATH_SEP '/'
+
+#define ARCH_STRING "wasm32"
+
+#define Q3_LITTLE_ENDIAN
+
+#define DLL_EXT ".wasm"
+
+#endif
+
 //================================================================== Q3VM ===
 
 #ifdef Q3_VM
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 528f3a06..af653d70 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -52,6 +52,7 @@ cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obta
 cvar_t *r_allowResize; // make window resizable
 cvar_t *r_centerWindow;
 cvar_t *r_sdlDriver;
+cvar_t *r_useOpenGLES;
 
 int qglMajorVersion, qglMinorVersion;
 int qglesMajorVersion, qglesMinorVersion;
@@ -230,6 +231,27 @@ static void GLimp_DetectAvailableModes(void)
 	SDL_free( modes );
 }
 
+/*
+===============
+OpenGL ES compatibility
+===============
+*/
+static void APIENTRY GLimp_GLES_ClearDepth( GLclampd depth ) {
+	qglClearDepthf( depth );
+}
+
+static void APIENTRY GLimp_GLES_DepthRange( GLclampd near_val, GLclampd far_val ) {
+	qglDepthRangef( near_val, far_val );
+}
+
+static void APIENTRY GLimp_GLES_DrawBuffer( GLenum mode ) {
+	// unsupported
+}
+
+static void APIENTRY GLimp_GLES_PolygonMode( GLenum face, GLenum mode ) {
+	// unsupported
+}
+
 /*
 ===============
 GLimp_GetProcAddresses
@@ -293,6 +315,7 @@ static qboolean GLimp_GetProcAddresses( qboolean fixedFunction ) {
 		} else {
 			Com_Error( ERR_FATAL, "Unsupported OpenGL Version (%s), OpenGL 1.1 is required", version );
 		}
+		// Add compression-related GL functions for the renderer
 		if ( QGL_VERSION_ATLEAST( 1, 3 ) ) {
 			QGL_1_3_PROCS;
 		}
@@ -309,8 +332,11 @@ static qboolean GLimp_GetProcAddresses( qboolean fixedFunction ) {
 			QGL_1_3_PROCS;
 			QGL_1_5_PROCS;
 			QGL_2_0_PROCS;
-			// error so this doesn't segfault due to NULL desktop GL functions being used
-			Com_Error( ERR_FATAL, "Unsupported OpenGL Version: %s", version );
+
+			qglClearDepth = GLimp_GLES_ClearDepth;
+			qglDepthRange = GLimp_GLES_DepthRange;
+			qglDrawBuffer = GLimp_GLES_DrawBuffer;
+			qglPolygonMode = GLimp_GLES_PolygonMode;
 		} else {
 			Com_Error( ERR_FATAL, "Unsupported OpenGL Version (%s), OpenGL 2.0 is required", version );
 		}
@@ -636,57 +662,91 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 
 		if (!fixedFunction)
 		{
-			int profileMask, majorVersion, minorVersion;
-			SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profileMask);
-			SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &majorVersion);
-			SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minorVersion);
+			int profileMask;
 
-			ri.Printf(PRINT_ALL, "Trying to get an OpenGL 3.2 core context\n");
-			SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
-			SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
-			SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
-			if ((SDL_glContext = SDL_GL_CreateContext(SDL_window)) == NULL)
+			SDL_GL_GetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, &profileMask );
+
+			if ( r_useOpenGLES->integer == 1 || ( r_useOpenGLES->integer == -1 && profileMask == SDL_GL_CONTEXT_PROFILE_ES ) )
 			{
-				ri.Printf(PRINT_ALL, "SDL_GL_CreateContext failed: %s\n", SDL_GetError());
-				ri.Printf(PRINT_ALL, "Reverting to default context\n");
+				ri.Printf( PRINT_ALL, "Trying to get an OpenGL ES 2.0 context\n" );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 2 );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 0 );
 
-				SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
-				SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
-				SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
-			}
-			else
-			{
-				const char *renderer;
-
-				ri.Printf(PRINT_ALL, "SDL_GL_CreateContext succeeded.\n");
-
-				if ( GLimp_GetProcAddresses( fixedFunction ) )
+				SDL_glContext = SDL_GL_CreateContext( SDL_window );
+				if ( !SDL_glContext )
 				{
-					renderer = (const char *)qglGetString(GL_RENDERER);
+					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext failed: %s\n", SDL_GetError() );
 				}
 				else
 				{
-					ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed for OpenGL 3.2 core context\n" );
-					renderer = NULL;
-				}
+					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext succeeded.\n" );
 
-				if (!renderer || (strstr(renderer, "Software Renderer") || strstr(renderer, "Software Rasterizer")))
+					if ( !GLimp_GetProcAddresses( fixedFunction ) )
+					{
+						ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed for OpenGL ES 2.0 context\n" );
+						GLimp_ClearProcAddresses();
+						SDL_GL_DeleteContext( SDL_glContext );
+						SDL_glContext = NULL;
+					}
+				}
+			}
+
+			if ( !SDL_glContext )
+			{
+				ri.Printf( PRINT_ALL, "Trying to get an OpenGL 3.2 core context\n" );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 3 );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 2 );
+
+				SDL_glContext = SDL_GL_CreateContext( SDL_window );
+				if ( !SDL_glContext )
 				{
-					if ( renderer )
-						ri.Printf(PRINT_ALL, "GL_RENDERER is %s, rejecting context\n", renderer);
-
-					GLimp_ClearProcAddresses();
-					SDL_GL_DeleteContext(SDL_glContext);
-					SDL_glContext = NULL;
-
-					SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
-					SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
-					SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
+					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext failed: %s\n", SDL_GetError() );
 				}
+				else
+				{
+					const char *renderer;
+
+					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext succeeded.\n" );
+
+					if ( GLimp_GetProcAddresses( fixedFunction ) )
+					{
+						renderer = (const char *)qglGetString( GL_RENDERER );
+					}
+					else
+					{
+						ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed for OpenGL 3.2 core context\n" );
+						renderer = NULL;
+					}
+
+					if ( !renderer || strstr( renderer, "Software Renderer" ) || strstr( renderer, "Software Rasterizer" ) )
+					{
+						if ( renderer )
+							ri.Printf(PRINT_ALL, "GL_RENDERER is %s, rejecting context\n", renderer);
+
+						GLimp_ClearProcAddresses();
+						SDL_GL_DeleteContext( SDL_glContext );
+						SDL_glContext = NULL;
+					}
+				}
+			}
+
+			if ( !SDL_glContext )
+			{
+				ri.Printf( PRINT_ALL, "Trying to get an OpenGL 2.0 context\n" );
+
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, 0 );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 2 );
+				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 0 );
 			}
 		}
 		else
 		{
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, 0 );
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 1 );
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 1 );
+
 			SDL_glContext = NULL;
 		}
 
@@ -818,7 +878,7 @@ static void GLimp_InitExtensions( qboolean fixedFunction )
 	glConfig.textureCompression = TC_NONE;
 
 	// GL_EXT_texture_compression_s3tc
-	if ( SDL_GL_ExtensionSupported( "GL_ARB_texture_compression" ) &&
+	if ( ( QGLES_VERSION_ATLEAST( 2, 0 ) || SDL_GL_ExtensionSupported( "GL_ARB_texture_compression" ) ) &&
 	     SDL_GL_ExtensionSupported( "GL_EXT_texture_compression_s3tc" ) )
 	{
 		if ( r_ext_compressed_textures->value )
@@ -999,6 +1059,7 @@ void GLimp_Init( qboolean fixedFunction )
 	r_sdlDriver = ri.Cvar_Get( "r_sdlDriver", "", CVAR_ROM );
 	r_allowResize = ri.Cvar_Get( "r_allowResize", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_centerWindow = ri.Cvar_Get( "r_centerWindow", "0", CVAR_ARCHIVE | CVAR_LATCH );
+	r_useOpenGLES = ri.Cvar_Get( "r_useOpenGLES", "-1", CVAR_ARCHIVE | CVAR_LATCH );
 
 	if( ri.Cvar_VariableIntegerValue( "com_abnormalExit" ) )
 	{
diff --git a/code/web/client-config.json b/code/web/client-config.json
new file mode 100644
index 00000000..eddf35db
--- /dev/null
+++ b/code/web/client-config.json
@@ -0,0 +1,47 @@
+{
+    "baseq3": {
+        "files": [
+            {"src": "baseq3/pak0.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak1.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak2.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak3.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak4.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak5.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak6.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak7.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak8.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/vm/cgame.qvm", "dst": "/baseq3/vm"},
+            {"src": "baseq3/vm/qagame.qvm", "dst": "/baseq3/vm"},
+            {"src": "baseq3/vm/ui.qvm", "dst": "/baseq3/vm"}
+        ]
+    },
+    "missionpack": {
+        "files": [
+            {"src": "missionpack/pak0.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak1.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak2.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak3.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/vm/cgame.qvm", "dst": "/missionpack/vm"},
+            {"src": "missionpack/vm/qagame.qvm", "dst": "/missionpack/vm"},
+            {"src": "missionpack/vm/ui.qvm", "dst": "/missionpack/vm"}
+        ]
+    },
+    "demoq3": {
+        "_comment": "Copy baseq3/vm/*.qvm to demoq3/vm/ as the Quake 3 demo QVMs are not compatible. However the botfiles are not fully compatible with newer QVMs.",
+        "files": [
+            {"src": "demoq3/pak0.pk3", "dst": "/demoq3"},
+            {"src": "demoq3/vm/cgame.qvm", "dst": "/demoq3/vm"},
+            {"src": "demoq3/vm/qagame.qvm", "dst": "/demoq3/vm"},
+            {"src": "demoq3/vm/ui.qvm", "dst": "/demoq3/vm"}
+        ]
+    },
+    "tademo": {
+        "_comment": "Copy missionpack/vm/*.qvm to tademo/vm/ as the Team Arena demo QVMs are not compatible.",
+        "files": [
+            {"src": "tademo/pak0.pk3", "dst": "/tademo"},
+            {"src": "tademo/vm/cgame.qvm", "dst": "/tademo/vm"},
+            {"src": "tademo/vm/qagame.qvm", "dst": "/tademo/vm"},
+            {"src": "tademo/vm/ui.qvm", "dst": "/tademo/vm"}
+        ]
+    }
+}
diff --git a/code/web/client.html b/code/web/client.html
new file mode 100644
index 00000000..3a23ab92
--- /dev/null
+++ b/code/web/client.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<title>__CLIENTBIN__ Emscripten demo</title>
+<style>
+html, body { margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden; background: rgb(0, 0, 0); display:flex; align-items: center; justify-content: center; }
+canvas { max-width: 100%; max-height: 100%; min-width: 100%; min-height: 100%; object-fit: contain; }
+</style>
+
+<canvas id=canvas></canvas>
+
+<script type=module>
+// These strings are set in the generated HTML file in the build directory.
+let CLIENTBIN = '__CLIENTBIN__';
+let BASEGAME = '__BASEGAME__';
+let EMSCRIPTEN_PRELOAD_FILE = Number('__EMSCRIPTEN_PRELOAD_FILE__');
+// Detect if it's not the generated HTML file.
+let clientHtmlFallback = (CLIENTBIN === '\_\_CLIENTBIN\_\_');
+
+// Path or URL containing the client engine .js, .wasm, and possibly .data.
+let enginePath = './';
+// Path or URL containing fs_game directories.
+let dataPath = './';
+// Path or URL for config file that specifies the files to load for each fs_game.
+let configFilename = `./${CLIENTBIN}-config.json`;
+
+// If displaying the unmodified HTML file, fallback to defaults.
+if (clientHtmlFallback) {
+    CLIENTBIN='ioquake3';
+    BASEGAME='baseq3';
+    EMSCRIPTEN_PRELOAD_FILE=0;
+    configFilename='./client-config.json';
+}
+
+if (window.location.protocol === 'file:') throw new Error(`Unfortunately browser security restrictions prevent loading wasm from a file: URL. This file must be loaded from a web server. The easiest way to do this is probably to use Python\'s built-in web server by running \`python3 -m http.server\` in the top level source directory and then navigate to http://localhost:8000/build/debug-emscripten-wasm32/${CLIENTBIN}.html`);
+
+// First set up the command line arguments and the Emscripten filesystem.
+const urlParams = new URLSearchParams(window.location.search);
+const com_basegame = urlParams.get('com_basegame') || BASEGAME;
+const fs_basegame = urlParams.get('fs_basegame') || '';
+const fs_game = urlParams.get('fs_game') || '';
+let generatedArguments = `
+    +set sv_pure 0
+    +set net_enabled 0
+    +set r_mode -2
+    +set com_basegame "${com_basegame}"
+    +set fs_basegame "${fs_basegame}"
+    +set fs_game "${fs_game}"
+`;
+// Note that unfortunately "+" needs to be encoded as "%2b" in URL query strings or it will be stripped by the browser.
+const queryArgs = urlParams.get('args');
+if (queryArgs) generatedArguments += ` ${queryArgs} `;
+
+// If displaying the unmodified HTML file, the engine and data are probably located in a different directory.
+if (clientHtmlFallback) {
+    // If buildPath is not specified, try to find a build in one of a few default paths.
+    let buildPath = urlParams.get('buildPath');
+    if (buildPath && !buildPath.endsWith('/')) buildPath += '/';
+    const buildPaths = buildPath ? [buildPath] : ['../../build/debug-emscripten-wasm32/', '../../build/release-emscripten-wasm32/', './'];
+    const scriptPaths = buildPaths.map(buildPath => buildPath + `${CLIENTBIN}_opengl2.wasm32.js`);
+    const scriptResponses = await Promise.all(scriptPaths.map(p => fetch(p, {method: 'HEAD'})));
+    const validBuilds = scriptResponses.filter(r => r.ok).length;
+    const goodURL = (newPath) => {
+        const url = new URL(window.location);
+        url.searchParams.set('buildPath', newPath);
+        return url.toString().replace(/%2f/gi, '/');
+    };
+    if (validBuilds === 0) throw new Error(`Didn't find any wasm builds. Run \`emmake make debug\` to build one, or use the buildPath query parameter to specify a directory containing ${CLIENTBIN}_opengl2.wasm32.[js,wasm,data], e.g. ${goodURL('../../build/debug-emscripten-wasm32/')}`);
+    if (validBuilds > 1) throw new Error(`Found multiple valid builds at the following paths: [${buildPaths.filter((path, i)=>scriptResponses[i].ok)}]. Please specify which one to run by adding a buildPath query parameter to the URL, e.g. ${goodURL(buildPaths.filter((path, i)=>scriptResponses[i].ok)[0])}`);
+    const buildIndex = scriptResponses.findIndex(r => r.ok);
+
+    enginePath = buildPaths[buildIndex];
+    dataPath = buildPaths[buildIndex];
+}
+
+const dataURL = new URL(dataPath, location.origin + location.pathname);
+
+const configPromise = ( EMSCRIPTEN_PRELOAD_FILE === 1 ) ? Promise.resolve({[BASEGAME]: {files: []}})
+  : fetch(configFilename).then(r => r.ok ? r.json() : { /* empty config */ });
+
+const ioquake3 = (await import(enginePath + `${CLIENTBIN}_opengl2.wasm32.js`)).default;
+ioquake3({
+    canvas: canvas,
+    arguments: generatedArguments.trim().split(/\s+/),
+    locateFile: (file) => enginePath + file,
+    preRun: [async (module) => {
+        module.addRunDependency('setup-ioq3-filesystem');
+        try {
+            const config = await configPromise;
+            const gamedirs = [com_basegame,fs_basegame,fs_game];
+            for (let g = 0; g < gamedirs.length; g++) {
+                const gamedir = gamedirs[g];
+                if (gamedir === '') {
+                    continue;
+                }
+                if (config[gamedir] === null
+                 || config[gamedir].files === null) {
+                    console.warn(`Game directory '${gamedir}' cannot be used. It must have files listed in ${configFilename}.`);
+                    continue;
+                }
+                const files = config[gamedir].files;
+                const fetches = files.map(file => fetch(new URL(file.src, dataURL)));
+                for (let i = 0; i < files.length; i++) {
+                    const response = await fetches[i];
+                    if (!response.ok) continue;
+                    const data = await response.arrayBuffer();
+                    let name = files[i].src.match(/[^/]+$/)[0];
+                    let dir = files[i].dst;
+                    module.FS.mkdirTree(dir);
+                    module.FS.writeFile(`${dir}/${name}`, new Uint8Array(data));
+                }
+            }
+        } finally {
+            module.removeRunDependency('setup-ioq3-filesystem');
+        }
+    }],
+});
+</script>

From 682dc8906770d632378793c5095e05101f04c0ce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:54:48 +0200
Subject: [PATCH 0566/2040] Add ignorevelocity argument for `followpath`

---
 code/fgame/scriptslave.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 71b0f33b..924910eb 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1392,16 +1392,19 @@ void ScriptSlave::FollowPath(Event *ev)
     qboolean    clamp;
     float       starttime;
 
-    ent          = ev->GetEntity(1);
-    argnum       = 2;
-    starttime    = -2;
-    clamp        = true;
-    ignoreangles = false;
-    splineangles = true;
+    ent             = ev->GetEntity(1);
+    argnum          = 2;
+    starttime       = -2;
+    clamp           = true;
+    ignoreangles    = false;
+    ignorevelocity  = false;
+    splineangles    = true;
     for (i = argnum; i <= ev->NumArgs(); i++) {
         token = ev->GetString(i);
         if (!Q_stricmp(token, "ignoreangles")) {
             ignoreangles = true;
+        } else if (!Q_stricmp(token, "ignorevelocity")) {
+            ignorevelocity = true;
         } else if (!Q_stricmp(token, "normalangles")) {
             splineangles = false;
         } else if (!Q_stricmp(token, "loop")) {
@@ -1425,7 +1428,9 @@ void ScriptSlave::FollowPath(Event *ev)
         if (!ignoreangles) {
             avelocity = vec_zero;
         }
-        velocity = vec_zero;
+        if (!ignorevelocity) {
+            velocity = vec_zero;
+        }
     }
 }
 

From 73c8ff11b3eb5ef22a94704be0bc732864ca7aa9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:03:41 +0200
Subject: [PATCH 0567/2040] Call CurrentScriptThread() to get the current
 script, so it can throw an exception if the current thread is NULL

---
 code/fgame/scriptslave.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 924910eb..6409b1a5 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -819,7 +819,7 @@ void ScriptSlave::DoMove(Event *ev)
 void ScriptSlave::WaitMove(Event *ev)
 {
     NewMove();
-    Register(0, Director.CurrentThread());
+    Register(0, Director.CurrentScriptThread());
 }
 
 void ScriptSlave::MoveEnd(Event *ev)

From 7b238e9d344d6b097d8f454878f21ac2fa983dc4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:13:31 +0200
Subject: [PATCH 0568/2040] Set new orders appropriately

---
 code/fgame/scriptslave.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 6409b1a5..8cd45d16 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -772,10 +772,7 @@ void ScriptSlave::NewMove(void)
         BroadcastEvent(0, ev);
     }
 
-    if (m_pCurPath) {
-        PostEvent(EV_ScriptSlave_FollowingPath, 0);
-    } else if (splinePath) {
-        moving = true;
+    if (m_pCurPath || splinePath) {
         PostEvent(EV_ScriptSlave_FollowingPath, 0);
     } else {
         float t = traveltime;
@@ -783,7 +780,6 @@ void ScriptSlave::NewMove(void)
             dist = Vector(NewPos - localorigin).length();
             t    = dist / speed;
         }
-        moving = true;
         LinearInterpolate(NewPos, NewAngles, t, EV_ScriptSlave_MoveDone);
     }
 }
@@ -829,7 +825,7 @@ void ScriptSlave::MoveEnd(Event *ev)
 
 void ScriptSlave::SetAnglesEvent(Event *ev)
 {
-    commandswaiting = true;
+    CheckNewOrders();
     SetAngles(ev);
     NewAngles = localangles;
 }
@@ -904,7 +900,7 @@ void ScriptSlave::TriggerEvent(Event *ev)
 
 void ScriptSlave::GotoNextWaypoint(Event *ev)
 {
-    commandswaiting = true;
+    CheckNewOrders();
 
     if (!waypoint) {
         ScriptError("%s is currently not at a waypoint", TargetName().c_str());
@@ -961,7 +957,7 @@ void ScriptSlave::JumpTo(Event *ev)
 
 void ScriptSlave::MoveToEvent(Event *ev)
 {
-    commandswaiting = true;
+    CheckNewOrders();
 
     //
     // see if it is a vector
@@ -1416,8 +1412,7 @@ void ScriptSlave::FollowPath(Event *ev)
         }
     }
     if (ent && ent->IsSubclassOfSplinePath()) {
-        commandswaiting = true;
-        path            = (SplinePath *)ent;
+        path = (SplinePath *)ent;
         if (clamp) {
             CreatePath(path, SPLINE_CLAMP);
         } else {

From fecb601fc4bb10485b66ad0ff261d28c1451622c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:17:10 +0200
Subject: [PATCH 0569/2040] Clear velocity only if it's not ignored

---
 code/fgame/scriptslave.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 8cd45d16..50f1297e 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1442,7 +1442,9 @@ void ScriptSlave::EndPath(Event *ev)
 
     delete splinePath;
     splinePath = NULL;
-    velocity   = vec_zero;
+    if (!ignorevelocity) {
+        velocity = vec_zero;
+    }
     if (!ignoreangles) {
         avelocity = vec_zero;
     }
@@ -1639,7 +1641,9 @@ void ScriptSlave::FollowingPath(Event *ev)
         if ((splinePath->GetType() == SPLINE_CLAMP) && (splineTime > (splinePath->EndPoint() - 2))) {
             delete splinePath;
             splinePath = NULL;
-            velocity   = vec_zero;
+            if (!ignorevelocity) {
+                velocity = vec_zero;
+            }
             if (!ignoreangles) {
                 avelocity = vec_zero;
             }

From 572e6652ccc8a8bfbbef7a1d07200c77b09cdb53 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 19:05:05 +0200
Subject: [PATCH 0570/2040] Fix `followpath` not working under special
 circumstances

This fixes an issue where some planes (like the final bomber plane in t3l2) would not fly and look stuck
---
 code/fgame/scriptslave.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 50f1297e..847017e8 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -463,7 +463,7 @@ Event EV_ScriptSlave_FollowPath
     "eSSSSSS",
     "path arg1 arg2 arg3 arg4 arg5 arg6",
     "Makes the script slave follow the specified path.  The allowable arguments are ignoreangles,\n"
-    "normalangles, loop, and a number specifying the start time.",
+    "ignorevelocity, normalangles, loop, and a number specifying the start time.",
     EV_NORMAL
 );
 Event EV_ScriptSlave_FollowPath_RelativeYaw
@@ -1407,6 +1407,17 @@ void ScriptSlave::FollowPath(Event *ev)
             clamp = false;
         } else if (IsNumeric(token)) {
             starttime = atof(token);
+            // Fixed in OPM
+            // HACKHACK
+            //
+            // There is a bug in mohaa where the token's raw pointer is directly used
+            // but then the token can be freed before comparison, which cause
+            // starttime to be always 0.
+            // OPM is correct here but for compatibility purpose the bug have to be reproduced.
+            // Otherwise, for example the final bomber plane in t3l2 will not fly.
+            if (!ev->IsStringAt(i)) {
+                starttime = 0;
+            }
         } else {
             ScriptError("Unknown followpath command %s.", token.c_str());
         }

From 0f48c39bc1620b04c836fe31091e1086cd81ac1f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 19:05:45 +0200
Subject: [PATCH 0571/2040] Add more resilience against null entity in
 `G_FixEntityPosition`

---
 code/fgame/g_phys.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 7e4314fb..80c4fe96 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -97,9 +97,14 @@ Entity *G_FixEntityPosition
 
 	if( trace.startsolid )
 	{
-		//return g_entities->entity;
-		assert( trace.ent );
-		assert( trace.ent->entity );
+		if (!trace.ent) {
+			// Fixed in OPM
+			//  I don't understand why they just prefer the game crashing
+			//  rather than ignoring the entity
+			return NULL;
+		}
+		//assert( trace.ent );
+		//assert( trace.ent->entity );
 		return trace.ent->entity;
 	}
 

From 44c17409a7b552bf197b6044de9c745b86cd5107 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 19:33:39 +0200
Subject: [PATCH 0572/2040] Allow pain if the player dies

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 98b681f4..b6806302 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3357,7 +3357,7 @@ void Player::Pain(Event *ev)
     pain_location = iLocation;
 
     // Only set the regular pain level if enough time since last pain has passed
-    if ((level.time > nextpaintime) && take_pain) {
+    if (((level.time > nextpaintime) && take_pain) || IsDead()) {
         pain = damage;
     }
 

From af432e6d3f51300534a37e785b7bd963fcac7988 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 19:37:05 +0200
Subject: [PATCH 0573/2040] Allow pain if the current time is above the allowed
 next pain time

---
 code/fgame/player_conditionals.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index 4c2d5d93..3c61fc69 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -95,7 +95,7 @@ qboolean Player::CondBlocked(Conditional& condition)
 
 qboolean Player::CondPain(Conditional& condition)
 {
-    return (pain != 0 || knockdown != 0);
+    return pain != 0 && level.time > nextpaintime;
 }
 
 qboolean Player::CondOnGround(Conditional& condition)

From 6b89ec615a2fdf3331d491dc793a3bd69a8fdb10 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 19:45:11 +0200
Subject: [PATCH 0574/2040] Set damage angles only for mohaa 1.0-1.11

---
 code/fgame/player.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index b6806302..c0c689b0 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -6322,11 +6322,18 @@ void Player::DamageFeedback(void)
     //
     damage_blood = 0;
 
-    if (IsSubclassOfPlayer()) {
-        damage_count  = 0;
-        damage_blood  = 0;
-        damage_alpha  = 0;
-        damage_angles = vec_zero;
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        //
+        // Added in 2.0
+        //  No more damage angles since MOHTA
+        //
+
+        if (IsSubclassOfPlayer()) {
+            damage_count = 0;
+            damage_blood = 0;
+            damage_alpha = 0;
+            damage_angles = vec_zero;
+        }
     }
 }
 

From ebfb6d1846ccc9c41a4a609540d97942d418126e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 23:20:30 +0200
Subject: [PATCH 0575/2040] Fix inwardsphere not being used

This fixes emitters looking incorrect, like `animate/adamspark.tik`, for the explosion of electric panels
---
 code/cgame/cg_tempmodels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index fae4fd55..d02722b4 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -1146,7 +1146,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
                 newForward = p->cgd.origin - m_spawnthing->cgd.origin;
                 newForward.normalize();
             }
-        } else if (m_spawnthing->cgd.flags & T_SPHERE) {
+        } else if (m_spawnthing->cgd.flags & T_INWARDSPHERE) {
             // Project the origin along a random ray, and set the forward
             // vector pointing back to the origin
             Vector dir, end;

From 864ea083939b055bd3db35cea02277ada0d4f012 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 23:41:12 +0200
Subject: [PATCH 0576/2040] Fix special characters not being handled properly

This fixes characters (signed character below 0) being replaced by '?' in UI text elements, like in the console
---
 code/uilib/uifont.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 89192f2b..9f2fc2ad 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -182,7 +182,7 @@ int UIFont::DBCSGetWordBlockCount(const char *text, int maxlen)
         return 0;
     }
 
-    uch = text[0];
+    uch = (unsigned char)text[0];
     p   = (unsigned char *)(text + 1);
 
     if (!text[0]) {
@@ -201,6 +201,7 @@ int UIFont::DBCSGetWordBlockCount(const char *text, int maxlen)
     isATokin  = DBCSIsAtokin(uch);
     hasDBCS   = DBCSLen > 1;
     isControl = uch < ' ';
+    uch2 = (unsigned char)*p;
 
     for (;;) {
         unsigned int subDBCSLen;
@@ -671,7 +672,7 @@ int UI_FontStringMaxWidth(fontheader_t *pFont, const char *pszString, int iMaxLe
     }
 
     for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
-        unsigned short uch = pszString[i];
+        unsigned short uch = (unsigned char)pszString[i];
 
         if (UI_FontDBCSIsLeadByte(pFont, uch)) {
             uch = (uch << 8) | pszString[i];
@@ -706,7 +707,7 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
     }
 
     for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
-        unsigned short uch = pszString[i];
+        unsigned short uch = (unsigned char)pszString[i];
 
         if (UI_FontDBCSIsLeadByte(pFont, uch)) {
             uch = (uch << 8) | pszString[i];

From c7a4e705cb4b164451568c4e480081e75c3c9c3b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jul 2024 16:36:31 +0200
Subject: [PATCH 0577/2040] Fix libmad still producing shared libraries

---
 code/client/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index efb871d9..cfc2c676 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -36,10 +36,10 @@ if (USE_SOUND_NEW)
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 
 	set(OLD_VALUE ${BUILD_SHARED_LIBS})
-	set(BUILD_SHARED_LIBS OFF)
-	add_subdirectory("../libmad" "./libmad")
-	set(BUILD_SHARED_LIBS ${OLD_VALUE})
+	set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+	add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
 	target_link_libraries(omohclient INTERFACE mad)
+	set(BUILD_SHARED_LIBS ${OLD_VALUE} CACHE BOOL "" FORCE)
 else()
 	add_subdirectory("../libmad-0.15.1b" "./libmad")
 	target_link_libraries(omohclient INTERFACE libmad)

From 5159a534bbec04cc7060f156058fe5fac5335ab9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:01:34 +0200
Subject: [PATCH 0578/2040] Fix animated images playing at the same time for
 all entities

---
 code/renderer/tr_backend.c | 11 +----------
 code/renderer/tr_shade.c   | 18 +++++++++++-------
 code/renderer/tr_shader.c  |  2 ++
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 373ed828..e94f3bee 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -791,10 +791,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 				backEnd.currentStaticModel = NULL;
 				if (entityNum != ENTITYNUM_WORLD) {
 					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
-					backEnd.refdef.floatTime = originalTime - backEnd.currentEntity->e.shaderTime;
-					// we have to reset the shaderTime as well otherwise image animations start
-					// from the wrong frame
-					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
+					backEnd.shaderStartTime = backEnd.currentEntity->e.shaderTime;
 
 					// set up the transformation matrix
 					R_RotateForEntity(backEnd.currentEntity, &backEnd.viewParms, &backEnd.ori);
@@ -811,12 +808,8 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 				}
 				else {
 					backEnd.currentEntity = &tr.worldEntity;
-					backEnd.refdef.floatTime = originalTime;
 					backEnd.ori = backEnd.viewParms.world;
 					backEnd.shaderStartTime = 0.0;
-					// we have to reset the shaderTime as well otherwise image animations on
-					// the world (like water) continue with the wrong frame
-					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
 					R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
 				}
 			}
@@ -903,8 +896,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 	}
 
-	backEnd.refdef.floatTime = originalTime;
-
 	// draw the contents of the last shader batch
 	if (oldShader != NULL) {
 		RB_EndSurface();
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index 2a4f7c60..dd201143 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -215,24 +215,28 @@ R_BindAnimatedImage
 =================
 */
 static void R_BindAnimatedImage( textureBundle_t *bundle ) {
-	int		index;
+	int index;
 
-	if ( bundle->numImageAnimations <= 1 ) {
-		GL_Bind( bundle->image[0] );
+	if (bundle->numImageAnimations <= 1) {
+		GL_Bind(bundle->image[0]);
 		return;
 	}
 
 	// it is necessary to do this messy calc to make sure animations line up
 	// exactly with waveforms of the same frequency
-	index = myftol( tess.shaderTime * bundle->imageAnimationSpeed * FUNCTABLE_SIZE );
+	index = myftol((tess.shaderTime + bundle->imageAnimationPhase) * bundle->imageAnimationSpeed * FUNCTABLE_SIZE);
 	index >>= FUNCTABLE_SIZE2;
 
-	if ( index < 0 ) {
+	if (index < 0) {
 		index = 0;	// may happen with shader time offsets
 	}
-	index %= bundle->numImageAnimations;
+	if (!(bundle->flags & BUNDLE_ANIMATE_ONCE)) {
+		index %= bundle->numImageAnimations;
+	} else if (index >= bundle->numImageAnimations) {
+		index = bundle->numImageAnimations - 1;
+	}
 
-	GL_Bind( bundle->image[ index ] );
+	GL_Bind(bundle->image[index]);
 }
 
 /*
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index e301f4fa..442a7f89 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -957,6 +957,8 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 		{
 			qboolean phased;
 
+			shader.flags |= 3;
+
 			if (!Q_stricmp(token, "animMapOnce")) {
 				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
 			}

From f213943b2d42a325c4ea000915334120b457cb63 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:02:06 +0200
Subject: [PATCH 0579/2040] Fix RB_SetGL2D

---
 code/renderer/tr_backend.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index e94f3bee..3ba08d20 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -1014,27 +1014,7 @@ RB_SetGL2D
 ================
 */
 void	RB_SetGL2D (void) {
-	backEnd.in2D = qtrue;
-
-	// set 2D virtual screen size
-	qglViewport( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglScissor( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglMatrixMode(GL_PROJECTION);
-    qglLoadIdentity ();
-	qglOrtho (0, glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1);
-	qglMatrixMode(GL_MODELVIEW);
-    qglLoadIdentity ();
-
-	GL_State( GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA );
-
-	qglDisable( GL_CULL_FACE );
-	qglDisable( GL_CLIP_PLANE0 );
-
-	// set time for 2D shaders
-	backEnd.refdef.time = ri.Milliseconds();
-	backEnd.refdef.floatTime = backEnd.refdef.time * 0.001f;
+	Set2DWindow(0, 0, glConfig.vidWidth, glConfig.vidHeight, 0.0, glConfig.vidWidth, glConfig.vidHeight, 0.0, 0.0, 1.0);
 }
 
 

From c13f9dc9a8ef786dc935df6ff7c2525ea66c8b37 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:12:08 +0200
Subject: [PATCH 0580/2040] Increase MAX_IMAGE_ANIMATIONS

This fixes emitters not playing correctly
---
 code/renderer/tr_local.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 02d29a24..96affbf3 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -446,7 +446,7 @@ typedef struct {
 } texModInfo_t;
 
 
-#define	MAX_IMAGE_ANIMATIONS	8
+#define	MAX_IMAGE_ANIMATIONS	64
 #define BUNDLE_ANIMATE_ONCE		1
 
 typedef struct {

From 60e4fa7005e40dfc34fc5d9091ce4c54b797a06c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:12:20 +0200
Subject: [PATCH 0581/2040] Handle shader picmip and fix shaders not rendered
 properly with force32bit (alpha channel was ignored)

---
 code/renderer/tr_image.c  |  2 +-
 code/renderer/tr_shader.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 50013d6c..aa7389c6 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -608,7 +608,7 @@ static void Upload32(
 			}
 			else
 			{
-				internalFormat = GL_RGB8;
+				internalFormat = GL_RGBA8;
 			}
 		}
 	} else {
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 442a7f89..50797274 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -790,7 +790,7 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 ParseStage
 ===================
 */
-static qboolean ParseStage(shaderStage_t* stage, char** text)
+static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 {
 	char* token;
 	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0, colorBits = 0;
@@ -884,7 +884,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 			}
 			else
 			{
-				stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, qfalse, GL_REPEAT, GL_REPEAT);
+				stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
 				if (!stage->bundle[cntBundle].image[0])
 				{
 					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -943,7 +943,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 				return qfalse;
 			}
 
-			stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, qfalse, clampx, clampy);
+			stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, clampx, clampy);
 			if (!stage->bundle[cntBundle].image[0])
 			{
 				ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -995,7 +995,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
 				}
 				num = stage->bundle[cntBundle].numImageAnimations;
 				if ( num < MAX_IMAGE_ANIMATIONS ) {
-                    stage->bundle[cntBundle].image[num] = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, qfalse, GL_REPEAT, GL_REPEAT );
+                    stage->bundle[cntBundle].image[num] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT );
 					if ( !stage->bundle[cntBundle].image[num] )
 					{
 						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
@@ -1018,7 +1018,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
                 return qfalse;
             }
 
-			stage->normalMap = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, stage->force32bit, GL_REPEAT, GL_REPEAT);
+			stage->normalMap = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
 			if (!stage->normalMap)
             {
                 ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -2143,7 +2143,7 @@ shader.  Parse it into the global shader variable.  Later functions
 will optimize it.
 =================
 */
-static qboolean ParseShader( char **text )
+static qboolean ParseShader( char **text, qboolean picmip )
 {
 	char *token;
 	int s;
@@ -2174,7 +2174,7 @@ static qboolean ParseShader( char **text )
 		// stage definition
 		else if ( token[0] == '{' )
 		{
-			if ( !ParseStage( &unfoggedStages[s], text ) )
+			if ( !ParseStage( &unfoggedStages[s], text, picmip ) )
 			{
 				return qfalse;
 			}
@@ -2262,7 +2262,7 @@ static qboolean ParseShader( char **text )
 			shader_noPicMip = qtrue;
 			continue;
 		}
-		// no picmip adjustment
+		// force 32 bit images
 		else if (!Q_stricmp(token, "force32bit"))
 		{
 			shader_force32bit = qtrue;
@@ -3225,7 +3225,7 @@ shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage
 			ri.Printf( PRINT_ALL, "*SHADER* %s\n", name );
 		}
 
-		if ( !ParseShader( &shaderText ) ) {
+		if ( !ParseShader( &shaderText, picmip ) ) {
 			// had errors, so use default shader
 			shader.defaultShader = qtrue;
 		}

From f804476fbccea4c7e84cfb1a1130b92f7c7c5427 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 28 Jul 2024 19:55:08 +0200
Subject: [PATCH 0582/2040] Add soft-oal to the build

---
 .github/workflows/build-cmake.yml | 56 ++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 782bcb6c..417d4e8f 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -41,7 +41,7 @@ jobs:
 
     - name: Install required packages
       run: |
-        sudo apt update && sudo apt install -y flex bison
+        sudo apt update && sudo apt install -y flex bison libopenal-dev
   
     - name: Install required cross-platform packages (${{ matrix.architecture.triple }})
       if: matrix.architecture.name != 'amd64'
@@ -59,6 +59,26 @@ jobs:
           -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }}
           -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }}"
 
+    # soft-oal setup
+    # Use GCC instead of Clang because of missing SSE intrinsics
+    # It also doesn't enable altivec support on PowerPC by default
+    - name: Checkout soft-oal
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '1.23.1'
+
+    - name: Configure and install soft-oal
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DCMAKE_C_COMPILER=${{ matrix.architecture.triple }}-gcc-12 \
+        -DCMAKE_CXX_COMPILER=${{ matrix.architecture.triple }}-g++-12
+        cmake --build ./build --config ${{env.BUILD_TYPE}}
+        cmake --install ./build --config ${{env.BUILD_TYPE}}
+
     - uses: actions/checkout@v4
       with:
         path: 'source'
@@ -72,12 +92,14 @@ jobs:
         -DCMAKE_CXX_COMPILER=clang++ \
         -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }} \
         -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }} \
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}
       run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+        cmake -B ./build ${{ env.CMAKE_PARAM }} -DUSE_SOUND_NEW=1 ./source
 
     - name: Build
       working-directory: ${{github.workspace}}
@@ -97,7 +119,9 @@ jobs:
       # Install to the directory defined in CMAKE_INSTALL_PREFIX
       run: |
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        cp '${{steps.sdl.outputs.prefix}}/lib/libSDL2.so' '${{github.workspace}}/install'
+        # Create hard-link and copy symbolic links
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/install/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/install/'
 
     - uses: actions/upload-artifact@v4
       with:
@@ -124,7 +148,7 @@ jobs:
       run: |
         echo "CMAKE_BUILD_PARALLEL_LEVEL=$((Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors * 16)" >> $GITHUB_ENV
 
-        # Setup SDL
+    # Setup SDL
     - name: Set up SDL
       id: sdl
       uses: libsdl-org/setup-sdl@main
@@ -142,6 +166,25 @@ jobs:
         cmake --build winflexbison-build --config Release --parallel
         cmake --install winflexbison-build
 
+    # soft-oal setup
+    - name: Checkout soft-oal
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '1.23.1'
+
+    - name: Configure and install soft-oal
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build -A ${{ matrix.architecture.config }} `
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
+        cmake --build ./build --config ${{env.BUILD_TYPE}}
+        cmake --install ./build --config ${{env.BUILD_TYPE}}
+        # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
+        if ([Environment]::Is64BitOperatingSystem) { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
+
     - uses: actions/checkout@v4
       with:
         path: 'source'
@@ -154,12 +197,14 @@ jobs:
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' `
         -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}
       run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+        cmake -B ./build ${{ env.CMAKE_PARAM }} -DUSE_SOUND_NEW=1 ./source
 
     - name: Build
       working-directory: ${{github.workspace}}
@@ -180,6 +225,7 @@ jobs:
       run: |
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/install'
+        Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/install'
 
     - uses: actions/upload-artifact@v4
       with:

From 391450f090ee9f5ada437b7c76f6ee3d57548b01 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jul 2024 19:03:26 +0200
Subject: [PATCH 0583/2040] Swap bsp header on big-endian architectures

See #332 where the lump's offset and length are incorrect on big-endian architectures
---
 code/renderer/tr_bsp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 3d42dd44..9fdf726a 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2247,11 +2247,14 @@ void RE_LoadWorldMap( const char *name ) {
     }
 
     ri.FS_Read(&header, sizeof(dheader_t), h);
+
+	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
+		((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
+	}
+
     map_length = length;
     map_version = header.version;
 
-    header.ident = LittleLong(header.ident);
-
 	// clear tr.world so if the level fails to load, the next
 	// try will not look at the partially loaded version
 	tr.world = NULL;

From eb9a3b1bbf3c716cfab297503a9d64169020a2ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jul 2024 19:04:29 +0200
Subject: [PATCH 0584/2040] R_UnpackTerraPatch: no need to get little-endian
 values as values are already swapped by R_SwapTerraPatch

See #332
---
 code/renderer/tr_bsp.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 9fdf726a..09345bd4 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -493,31 +493,31 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
 
 	for (i = 0; i < 2; i++) {
 		for (j = 0; j < 2; j++) {
-			pUnpacked->texCoord[i][j][0] = LittleFloat(pPacked->texCoord[i][j][0]);
-			pUnpacked->texCoord[i][j][1] = LittleFloat(pPacked->texCoord[i][j][1]);
+			pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
+			pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
 		}
 	}
 
 	pUnpacked->x0 = ((int)pPacked->x << 6);
 	pUnpacked->y0 = ((int)pPacked->y << 6);
-    pUnpacked->z0 = LittleShort(pPacked->iBaseHeight);
-    pUnpacked->shader = ShaderForShaderNum(LittleShort(pPacked->iShader), LittleShort(pPacked->iLightMap));
-    pUnpacked->iNorth = LittleShort(pPacked->iNorth);
-    pUnpacked->iEast = LittleShort(pPacked->iEast);
-    pUnpacked->iSouth = LittleShort(pPacked->iSouth);
-    pUnpacked->iWest = LittleShort(pPacked->iWest);
+    pUnpacked->z0 = pPacked->iBaseHeight;
+    pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
+    pUnpacked->iNorth = pPacked->iNorth;
+    pUnpacked->iEast = pPacked->iEast;
+    pUnpacked->iSouth = pPacked->iSouth;
+    pUnpacked->iWest = pPacked->iWest;
 
     for (i = 0; i < 63; i++)
 	{
 		flags.v = pPacked->varTree[0][i].flags;
 		flags.b[1] &= 7;
-		pUnpacked->varTree[0][i].fVariance = LittleShort(flags.v);
-		pUnpacked->varTree[0][i].s.flags = LittleShort(pPacked->varTree[0][i].flags) >> 12;
+		pUnpacked->varTree[0][i].fVariance = flags.v;
+		pUnpacked->varTree[0][i].s.flags = pPacked->varTree[0][i].flags >> 12;
 
 		flags.v = pPacked->varTree[1][i].flags;
 		flags.b[1] &= 7;
-		pUnpacked->varTree[1][i].fVariance = LittleShort(flags.v);
-		pUnpacked->varTree[1][i].s.flags = LittleShort(pPacked->varTree[1][i].flags) >> 12;
+		pUnpacked->varTree[1][i].fVariance = flags.v;
+		pUnpacked->varTree[1][i].s.flags = pPacked->varTree[1][i].flags >> 12;
     }
 
 	for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++) {

From 6e3f9596846cffead668afdaaa32dd92e9b61890 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jul 2024 20:32:21 +0200
Subject: [PATCH 0585/2040] Fix header version incorrectly parsed

---
 code/renderer/tr_bsp.c | 2252 ++++++++++++++++++++--------------------
 1 file changed, 1126 insertions(+), 1126 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 09345bd4..189fee7e 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -74,52 +74,52 @@ static int g_nTerraPatches;
 
 static void HSVtoRGB( float h, float s, float v, float rgb[3] )
 {
-	int i;
-	float f;
-	float p, q, t;
+    int i;
+    float f;
+    float p, q, t;
 
-	h *= 5;
+    h *= 5;
 
-	i = floor( h );
-	f = h - i;
+    i = floor( h );
+    f = h - i;
 
-	p = v * ( 1 - s );
-	q = v * ( 1 - s * f );
-	t = v * ( 1 - s * ( 1 - f ) );
+    p = v * ( 1 - s );
+    q = v * ( 1 - s * f );
+    t = v * ( 1 - s * ( 1 - f ) );
 
-	switch ( i )
-	{
-	case 0:
-		rgb[0] = v;
-		rgb[1] = t;
-		rgb[2] = p;
-		break;
-	case 1:
-		rgb[0] = q;
-		rgb[1] = v;
-		rgb[2] = p;
-		break;
-	case 2:
-		rgb[0] = p;
-		rgb[1] = v;
-		rgb[2] = t;
-		break;
-	case 3:
-		rgb[0] = p;
-		rgb[1] = q;
-		rgb[2] = v;
-		break;
-	case 4:
-		rgb[0] = t;
-		rgb[1] = p;
-		rgb[2] = v;
-		break;
-	case 5:
-		rgb[0] = v;
-		rgb[1] = p;
-		rgb[2] = q;
-		break;
-	}
+    switch ( i )
+    {
+    case 0:
+        rgb[0] = v;
+        rgb[1] = t;
+        rgb[2] = p;
+        break;
+    case 1:
+        rgb[0] = q;
+        rgb[1] = v;
+        rgb[2] = p;
+        break;
+    case 2:
+        rgb[0] = p;
+        rgb[1] = v;
+        rgb[2] = t;
+        break;
+    case 3:
+        rgb[0] = p;
+        rgb[1] = q;
+        rgb[2] = v;
+        break;
+    case 4:
+        rgb[0] = t;
+        rgb[1] = p;
+        rgb[2] = v;
+        break;
+    case 5:
+        rgb[0] = v;
+        rgb[1] = p;
+        rgb[2] = q;
+        break;
+    }
 }
 
 /*
@@ -129,27 +129,27 @@ R_ColorShiftLightingBytes
 ===============
 */
 static	void R_ColorShiftLightingBytes( byte in[3], byte out[3] ) {
-	int		r, g, b;
+    int		r, g, b;
 
-	// shift the data based on overbright range
-	r = in[0] << tr.overbrightShift;
-	g = in[1] << tr.overbrightShift;
-	b = in[2] << tr.overbrightShift;
-	
-	// normalize by color instead of saturating to white
-	if ( ( r | g | b ) > 255 ) {
-		int		max;
+    // shift the data based on overbright range
+    r = in[0] << tr.overbrightShift;
+    g = in[1] << tr.overbrightShift;
+    b = in[2] << tr.overbrightShift;
+    
+    // normalize by color instead of saturating to white
+    if ( ( r | g | b ) > 255 ) {
+        int		max;
 
-		max = r > g ? r : g;
-		max = max > b ? max : b;
-		r = r * 255 / max;
-		g = g * 255 / max;
-		b = b * 255 / max;
-	}
+        max = r > g ? r : g;
+        max = max > b ? max : b;
+        r = r * 255 / max;
+        g = g * 255 / max;
+        b = b * 255 / max;
+    }
 
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
 }
 
 /*
@@ -159,28 +159,28 @@ R_ColorShiftLightingBytesAlpha
 ===============
 */
 static	void R_ColorShiftLightingBytesAlpha( byte in[4], byte out[4] ) {
-	int		r, g, b;
+    int		r, g, b;
 
-	// shift the data based on overbright range
-	r = in[0] << tr.overbrightShift;
-	g = in[1] << tr.overbrightShift;
-	b = in[2] << tr.overbrightShift;
-	
-	// normalize by color instead of saturating to white
-	if ( ( r | g | b ) > 255 ) {
-		int		max;
-		
-		max = r > g ? r : g;
-		max = max > b ? max : b;
-		r = r * 255 / max;
-		g = g * 255 / max;
-		b = b * 255 / max;
-	}
+    // shift the data based on overbright range
+    r = in[0] << tr.overbrightShift;
+    g = in[1] << tr.overbrightShift;
+    b = in[2] << tr.overbrightShift;
+    
+    // normalize by color instead of saturating to white
+    if ( ( r | g | b ) > 255 ) {
+        int		max;
+        
+        max = r > g ? r : g;
+        max = max > b ? max : b;
+        r = r * 255 / max;
+        g = g * 255 / max;
+        b = b * 255 / max;
+    }
 
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
-	out[3] = in[3];
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = in[3];
 }
 
 /*
@@ -191,12 +191,12 @@ R_LoadLightmaps
 */
 #define	LIGHTMAP_SIZE	128
 static	void R_LoadLightmaps(gamelump_t* l) {
-	byte		*buf, *buf_p;
-	int			len;
-	MAC_STATIC byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
-	int			i, j;
-	float maxIntensity = 0;
-	double sumIntensity = 0;
+    byte		*buf, *buf_p;
+    int			len;
+    MAC_STATIC byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
+    int			i, j;
+    float maxIntensity = 0;
+    double sumIntensity = 0;
 
     len = l->length;
     if (!len) {
@@ -204,71 +204,71 @@ static	void R_LoadLightmaps(gamelump_t* l) {
     }
     buf = l->buffer;
 
-	// we are about to upload textures
-	R_SyncRenderThread();
+    // we are about to upload textures
+    R_SyncRenderThread();
 
-	// create all the lightmaps
-	tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
+    // create all the lightmaps
+    tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
 
-	// if we are in r_vertexLight mode, we don't need the lightmaps at all
-	if ( r_vertexLight->integer ) {
-		return;
-	}
+    // if we are in r_vertexLight mode, we don't need the lightmaps at all
+    if ( r_vertexLight->integer ) {
+        return;
+    }
 
-	for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
-		// expand the 24 bit on-disk to 32 bit
-		buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
+    for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
+        // expand the 24 bit on-disk to 32 bit
+        buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
 
-		if ( r_lightmap->integer == 2 )
-		{	// color code by intensity as development tool	(FIXME: check range)
-			for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
-			{
-				float r = buf_p[j*3+0];
-				float g = buf_p[j*3+1];
-				float b = buf_p[j*3+2];
-				float intensity;
-				float out[3];
+        if ( r_lightmap->integer == 2 )
+        {	// color code by intensity as development tool	(FIXME: check range)
+            for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
+            {
+                float r = buf_p[j*3+0];
+                float g = buf_p[j*3+1];
+                float b = buf_p[j*3+2];
+                float intensity;
+                float out[3];
 
-				intensity = 0.33f * r + 0.685f * g + 0.063f * b;
+                intensity = 0.33f * r + 0.685f * g + 0.063f * b;
 
-				if ( intensity > 255 )
-					intensity = 1.0f;
-				else
-					intensity /= 255.0f;
+                if ( intensity > 255 )
+                    intensity = 1.0f;
+                else
+                    intensity /= 255.0f;
 
-				if ( intensity > maxIntensity )
-					maxIntensity = intensity;
+                if ( intensity > maxIntensity )
+                    maxIntensity = intensity;
 
-				HSVtoRGB( intensity, 1.00, 0.50, out );
+                HSVtoRGB( intensity, 1.00, 0.50, out );
 
-				image[j*4+0] = out[0] * 255;
-				image[j*4+1] = out[1] * 255;
-				image[j*4+2] = out[2] * 255;
-				image[j*4+3] = 255;
+                image[j*4+0] = out[0] * 255;
+                image[j*4+1] = out[1] * 255;
+                image[j*4+2] = out[2] * 255;
+                image[j*4+3] = 255;
 
-				sumIntensity += intensity;
-			}
-		} else {
-			for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
-				R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
-				image[j*4+3] = 255;
-			}
-		}
-		tr.lightmaps[i] = R_CreateImage(va("*lightmap%d", i), image,
-			LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-	}
+                sumIntensity += intensity;
+            }
+        } else {
+            for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
+                R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
+                image[j*4+3] = 255;
+            }
+        }
+        tr.lightmaps[i] = R_CreateImage(va("*lightmap%d", i), image,
+            LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+    }
 
-	if ( r_lightmap->integer == 2 )	{
-		ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
-	}
+    if ( r_lightmap->integer == 2 )	{
+        ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
+    }
 
-	if (r_fastdlights->integer) {
-		s_worldData.lighting = NULL;
-	}
-	else {
-		s_worldData.lighting = ri.Hunk_Alloc(l->length, h_dontcare);
-		Com_Memcpy(s_worldData.lighting, l->buffer, l->length);
-	}
+    if (r_fastdlights->integer) {
+        s_worldData.lighting = NULL;
+    }
+    else {
+        s_worldData.lighting = ri.Hunk_Alloc(l->length, h_dontcare);
+        Com_Memcpy(s_worldData.lighting, l->buffer, l->length);
+    }
 }
 
 
@@ -281,7 +281,7 @@ space in big maps...
 =================
 */
 void		RE_SetWorldVisData( const byte *vis ) {
-	tr.externalVisData = vis;
+    tr.externalVisData = vis;
 }
 
 
@@ -291,12 +291,12 @@ R_LoadVisibility
 =================
 */
 static	void R_LoadVisibility(gamelump_t* l) {
-	int		len;
-	byte	*buf;
+    int		len;
+    byte	*buf;
 
-	len = ( s_worldData.numClusters + 63 ) & ~63;
-	s_worldData.novis = ri.Hunk_Alloc( len, h_dontcare );
-	Com_Memset( s_worldData.novis, 0xff, len );
+    len = ( s_worldData.numClusters + 63 ) & ~63;
+    s_worldData.novis = ri.Hunk_Alloc( len, h_dontcare );
+    Com_Memset( s_worldData.novis, 0xff, len );
 
     len = l->length;
     if (!len) {
@@ -304,20 +304,20 @@ static	void R_LoadVisibility(gamelump_t* l) {
     }
     buf = l->buffer;
 
-	s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
-	s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
+    s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
+    s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
 
-	// CM_Load should have given us the vis data to share, so
-	// we don't need to allocate another copy
-	if ( tr.externalVisData ) {
-		s_worldData.vis = tr.externalVisData;
-	} else {
-		byte	*dest;
+    // CM_Load should have given us the vis data to share, so
+    // we don't need to allocate another copy
+    if ( tr.externalVisData ) {
+        s_worldData.vis = tr.externalVisData;
+    } else {
+        byte	*dest;
 
-		dest = ri.Hunk_Alloc( len - 8, h_dontcare );
-		Com_Memcpy( dest, buf + 8, len - 8 );
-		s_worldData.vis = dest;
-	}
+        dest = ri.Hunk_Alloc( len - 8, h_dontcare );
+        Com_Memcpy( dest, buf + 8, len - 8 );
+        s_worldData.vis = dest;
+    }
 }
 
 /*
@@ -432,31 +432,31 @@ ShaderForShaderNum
 ===============
 */
 static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
-	shader_t	*shader;
-	dshader_t	*dsh;
+    shader_t	*shader;
+    dshader_t	*dsh;
 
-	shaderNum = LittleLong( shaderNum );
-	if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
-		ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
-	}
-	dsh = &s_worldData.shaders[ shaderNum ];
+    shaderNum = LittleLong( shaderNum );
+    if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
+        ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
+    }
+    dsh = &s_worldData.shaders[ shaderNum ];
 
-	if ( r_vertexLight->integer ) {
-		lightmapNum = LIGHTMAP_BY_VERTEX;
-	}
+    if ( r_vertexLight->integer ) {
+        lightmapNum = LIGHTMAP_BY_VERTEX;
+    }
 
-	if ( r_fullbright->integer || !tr.numLightmaps ) {
-		lightmapNum = LIGHTMAP_WHITEIMAGE;
-	}
+    if ( r_fullbright->integer || !tr.numLightmaps ) {
+        lightmapNum = LIGHTMAP_WHITEIMAGE;
+    }
 
-	shader = R_FindShader( dsh->shader, lightmapNum, qtrue, qtrue, qtrue, qtrue);
+    shader = R_FindShader( dsh->shader, lightmapNum, qtrue, qtrue, qtrue, qtrue);
 
-	// if the shader had errors, just use default shader
-	if ( shader->defaultShader ) {
-		return tr.defaultShader;
-	}
+    // if the shader had errors, just use default shader
+    if ( shader->defaultShader ) {
+        return tr.defaultShader;
+    }
 
-	return shader;
+    return shader;
 }
 
 /*
@@ -465,11 +465,11 @@ R_UnpackTerraPatch
 ================
 */
 void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
-	int i, j;
-	union {
-		int16_t v;
-		uint8_t b[2];
-	} flags;
+    int i, j;
+    union {
+        int16_t v;
+        uint8_t b[2];
+    } flags;
 
     pUnpacked->byDirty = qfalse;
     pUnpacked->visCountCheck = 0;
@@ -486,20 +486,20 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
     pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
 
     if( s_worldData.lighting ) {
-    	pUnpacked->drawinfo.lmData = &s_worldData.lighting[pPacked->iLightMap * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * pPacked->s + 3 * LIGHTMAP_SIZE * pPacked->t];
+        pUnpacked->drawinfo.lmData = &s_worldData.lighting[pPacked->iLightMap * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * pPacked->s + 3 * LIGHTMAP_SIZE * pPacked->t];
     } else {
-    	pUnpacked->drawinfo.lmData = NULL;
+        pUnpacked->drawinfo.lmData = NULL;
     }
 
-	for (i = 0; i < 2; i++) {
-		for (j = 0; j < 2; j++) {
-			pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
-			pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
-		}
-	}
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 2; j++) {
+            pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
+            pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
+        }
+    }
 
-	pUnpacked->x0 = ((int)pPacked->x << 6);
-	pUnpacked->y0 = ((int)pPacked->y << 6);
+    pUnpacked->x0 = ((int)pPacked->x << 6);
+    pUnpacked->y0 = ((int)pPacked->y << 6);
     pUnpacked->z0 = pPacked->iBaseHeight;
     pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
     pUnpacked->iNorth = pPacked->iNorth;
@@ -508,21 +508,21 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
     pUnpacked->iWest = pPacked->iWest;
 
     for (i = 0; i < 63; i++)
-	{
-		flags.v = pPacked->varTree[0][i].flags;
-		flags.b[1] &= 7;
-		pUnpacked->varTree[0][i].fVariance = flags.v;
-		pUnpacked->varTree[0][i].s.flags = pPacked->varTree[0][i].flags >> 12;
+    {
+        flags.v = pPacked->varTree[0][i].flags;
+        flags.b[1] &= 7;
+        pUnpacked->varTree[0][i].fVariance = flags.v;
+        pUnpacked->varTree[0][i].s.flags = pPacked->varTree[0][i].flags >> 12;
 
-		flags.v = pPacked->varTree[1][i].flags;
-		flags.b[1] &= 7;
-		pUnpacked->varTree[1][i].fVariance = flags.v;
-		pUnpacked->varTree[1][i].s.flags = pPacked->varTree[1][i].flags >> 12;
+        flags.v = pPacked->varTree[1][i].flags;
+        flags.b[1] &= 7;
+        pUnpacked->varTree[1][i].fVariance = flags.v;
+        pUnpacked->varTree[1][i].s.flags = pPacked->varTree[1][i].flags >> 12;
     }
 
-	for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++) {
-		pUnpacked->heightmap[i] = pPacked->heightmap[i];
-	}
+    for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++) {
+        pUnpacked->heightmap[i] = pPacked->heightmap[i];
+    }
 
     pUnpacked->zmax = 0;
     pUnpacked->flags = pPacked->flags;
@@ -566,7 +566,7 @@ void R_LoadTerrain(gamelump_t* lump) {
     out = s_worldData.terraPatches;
 
     for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
-		R_SwapTerraPatch(in);
+        R_SwapTerraPatch(in);
         R_UnpackTerraPatch(in, out);
     }
 }
@@ -608,109 +608,109 @@ ParseFace
 ===============
 */
 static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes  ) {
-	int			i, j;
-	srfSurfaceFace_t	*cv;
-	int			numPoints, numIndexes;
-	int			lightmapNum;
+    int			i, j;
+    srfSurfaceFace_t	*cv;
+    int			numPoints, numIndexes;
+    int			lightmapNum;
     int			sfaceSize, ofsIndexes;
     static surfaceType_t skipData = SF_SKIP;
 
-	lightmapNum = LittleLong( ds->lightmapNum );
+    lightmapNum = LittleLong( ds->lightmapNum );
 
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader value
+    surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	if (surf->shader->surfaceFlags & SURF_NODRAW) {
-		// Nodraw surface doesn't need any processing
-		surf->data = &skipData;
-		return;
-	}
+    if (surf->shader->surfaceFlags & SURF_NODRAW) {
+        // Nodraw surface doesn't need any processing
+        surf->data = &skipData;
+        return;
+    }
 
-	numPoints = LittleLong( ds->numVerts );
-	if (numPoints > MAX_FACE_POINTS) {
-		ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
+    numPoints = LittleLong( ds->numVerts );
+    if (numPoints > MAX_FACE_POINTS) {
+        ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
     numPoints = MAX_FACE_POINTS;
     surf->shader = tr.defaultShader;
-	}
+    }
 
-	numIndexes = LittleLong( ds->numIndexes );
+    numIndexes = LittleLong( ds->numIndexes );
 
-	// create the srfSurfaceFace_t
-	sfaceSize = ( int ) &((srfSurfaceFace_t *)0)->points[numPoints];
-	ofsIndexes = sfaceSize;
-	sfaceSize += sizeof( int ) * numIndexes;
+    // create the srfSurfaceFace_t
+    sfaceSize = ( int ) &((srfSurfaceFace_t *)0)->points[numPoints];
+    ofsIndexes = sfaceSize;
+    sfaceSize += sizeof( int ) * numIndexes;
 
-	cv = ri.Hunk_Alloc( sfaceSize, h_dontcare );
-	cv->surfaceType = SF_FACE;
-	cv->numPoints = numPoints;
-	cv->numIndices = numIndexes;
-	cv->ofsIndices = ofsIndexes;
+    cv = ri.Hunk_Alloc( sfaceSize, h_dontcare );
+    cv->surfaceType = SF_FACE;
+    cv->numPoints = numPoints;
+    cv->numIndices = numIndexes;
+    cv->ofsIndices = ofsIndexes;
 
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
-			cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytesAlpha( verts[i].color, (byte *)&cv->points[i][7] );
-	}
+    verts += LittleLong( ds->firstVert );
+    for ( i = 0 ; i < numPoints ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
+        }
+        for ( j = 0 ; j < 2 ; j++ ) {
+            cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
+            cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
+        }
+        R_ColorShiftLightingBytesAlpha( verts[i].color, (byte *)&cv->points[i][7] );
+    }
 
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
-	}
+    indexes += LittleLong( ds->firstIndex );
+    for ( i = 0 ; i < numIndexes ; i++ ) {
+        ((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
+    }
 
-	// take the plane information from the lightmap vector
-	for ( i = 0 ; i < 3 ; i++ ) {
-		cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
-	cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
-	SetPlaneSignbits( &cv->plane );
-	cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
+    // take the plane information from the lightmap vector
+    for ( i = 0 ; i < 3 ; i++ ) {
+        cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
+    }
+    cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
+    SetPlaneSignbits( &cv->plane );
+    cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
 
-	if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
-	{
-		float inv;
+    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
+    {
+        float inv;
 
-		cv->lmX = LittleLong(ds->lightmapX);
-		cv->lmY = LittleLong(ds->lightmapY);
-		cv->lmWidth = LittleLong(ds->lightmapWidth);
-		cv->lmHeight = LittleLong(ds->lightmapHeight);
+        cv->lmX = LittleLong(ds->lightmapX);
+        cv->lmY = LittleLong(ds->lightmapY);
+        cv->lmWidth = LittleLong(ds->lightmapWidth);
+        cv->lmHeight = LittleLong(ds->lightmapHeight);
 
-		if (s_worldData.lighting) {
-			cv->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * cv->lmX + 3 * LIGHTMAP_SIZE * cv->lmY];
-		} else {
-			cv->lmData = NULL;
-		}
+        if (s_worldData.lighting) {
+            cv->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * cv->lmX + 3 * LIGHTMAP_SIZE * cv->lmY];
+        } else {
+            cv->lmData = NULL;
+        }
 
-		for (i = 0; i < 3; i++)
-		{
-			cv->lmOrigin[i] = LittleFloat(ds->lightmapOrigin[i]);
+        for (i = 0; i < 3; i++)
+        {
+            cv->lmOrigin[i] = LittleFloat(ds->lightmapOrigin[i]);
             cv->lmVecs[0][i] = LittleFloat(ds->lightmapVecs[0][i]);
             cv->lmVecs[1][i] = LittleFloat(ds->lightmapVecs[1][i]);
-		}
+        }
 
-		inv = VectorNormalize2(cv->lmVecs[0], cv->lmInverseVecs[0]);
-		cv->lmInverseVecs[0][0] *= 1.0 / inv;
-		cv->lmInverseVecs[0][1] *= 1.0 / inv;
-		cv->lmInverseVecs[0][2] *= 1.0 / inv;
+        inv = VectorNormalize2(cv->lmVecs[0], cv->lmInverseVecs[0]);
+        cv->lmInverseVecs[0][0] *= 1.0 / inv;
+        cv->lmInverseVecs[0][1] *= 1.0 / inv;
+        cv->lmInverseVecs[0][2] *= 1.0 / inv;
 
-		inv = VectorNormalize2(cv->lmVecs[1], cv->lmInverseVecs[1]);
-		cv->lmInverseVecs[1][0] *= 1.0 / inv;
-		cv->lmInverseVecs[1][1] *= 1.0 / inv;
-		cv->lmInverseVecs[1][2] *= 1.0 / inv;
-	}
-	else
-	{
-		cv->lmData = NULL;
-	}
-	surf->data = (surfaceType_t *)cv;
+        inv = VectorNormalize2(cv->lmVecs[1], cv->lmInverseVecs[1]);
+        cv->lmInverseVecs[1][0] *= 1.0 / inv;
+        cv->lmInverseVecs[1][1] *= 1.0 / inv;
+        cv->lmInverseVecs[1][2] *= 1.0 / inv;
+    }
+    else
+    {
+        cv->lmData = NULL;
+    }
+    surf->data = (surfaceType_t *)cv;
 }
 
 
@@ -720,84 +720,84 @@ ParseMesh
 ===============
 */
 static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
-	srfGridMesh_t	*grid;
-	int				i, j;
-	int				width, height, numPoints;
-	MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
-	int				lightmapNum;
-	vec3_t			bounds[2];
-	vec3_t			tmpVec;
-	static surfaceType_t	skipData = SF_SKIP;
+    srfGridMesh_t	*grid;
+    int				i, j;
+    int				width, height, numPoints;
+    MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
+    int				lightmapNum;
+    vec3_t			bounds[2];
+    vec3_t			tmpVec;
+    static surfaceType_t	skipData = SF_SKIP;
 
-	lightmapNum = LittleLong( ds->lightmapNum );
+    lightmapNum = LittleLong( ds->lightmapNum );
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader value
+    surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	// we may have a nodraw surface, because they might still need to
-	// be around for movement clipping
-	if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
-		surf->data = &skipData;
-		return;
-	}
+    // we may have a nodraw surface, because they might still need to
+    // be around for movement clipping
+    if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
+        surf->data = &skipData;
+        return;
+    }
 
-	width = LittleLong( ds->patchWidth );
-	height = LittleLong( ds->patchHeight );
+    width = LittleLong( ds->patchWidth );
+    height = LittleLong( ds->patchHeight );
 
-	verts += LittleLong( ds->firstVert );
-	numPoints = width * height;
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			points[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			points[i].st[j] = LittleFloat( verts[i].st[j] );
-			points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
-	}
+    verts += LittleLong( ds->firstVert );
+    numPoints = width * height;
+    for ( i = 0 ; i < numPoints ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
+            points[i].normal[j] = LittleFloat( verts[i].normal[j] );
+        }
+        for ( j = 0 ; j < 2 ; j++ ) {
+            points[i].st[j] = LittleFloat( verts[i].st[j] );
+            points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
+        }
+        R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
+    }
 
     // pre-tesseleate
-	if (ds->subdivisions) {
-		grid = R_SubdividePatchToGrid(width, height, ds->subdivisions * (r_subdivisions->value / 10.0), points);
+    if (ds->subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, ds->subdivisions * (r_subdivisions->value / 10.0), points);
     } else if (surf->shader->subdivisions) {
         grid = R_SubdividePatchToGrid(width, height, surf->shader->subdivisions * (r_subdivisions->value / 10.0), points);
     } else {
         grid = R_SubdividePatchToGrid(width, height, r_subdivisions->value, points);
     }
-	surf->data = (surfaceType_t *)grid;
+    surf->data = (surfaceType_t *)grid;
 
-	if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
-	{
-		grid->lmX = LittleLong(ds->lightmapX);
-		grid->lmY = LittleLong(ds->lightmapY);
-		grid->lmWidth = LittleLong(ds->lightmapWidth);
-		grid->lmHeight = LittleLong(ds->lightmapHeight);
-		if (s_worldData.lighting) {
-			grid->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * grid->lmX + 3 * LIGHTMAP_SIZE * grid->lmY];
-		} else {
-			grid->lmData = NULL;
-		}
-	}
+    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
+    {
+        grid->lmX = LittleLong(ds->lightmapX);
+        grid->lmY = LittleLong(ds->lightmapY);
+        grid->lmWidth = LittleLong(ds->lightmapWidth);
+        grid->lmHeight = LittleLong(ds->lightmapHeight);
+        if (s_worldData.lighting) {
+            grid->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * grid->lmX + 3 * LIGHTMAP_SIZE * grid->lmY];
+        } else {
+            grid->lmData = NULL;
+        }
+    }
 
-	// copy the level of detail origin, which is the center
-	// of the group of all curves that must subdivide the same
-	// to avoid cracking
-	for ( i = 0 ; i < 3 ; i++ ) {
-		bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
-		bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
-	}
-	VectorAdd( bounds[0], bounds[1], bounds[1] );
-	VectorScale( bounds[1], 0.5f, grid->lodOrigin );
-	VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
-	grid->lodRadius = VectorLength( tmpVec );
+    // copy the level of detail origin, which is the center
+    // of the group of all curves that must subdivide the same
+    // to avoid cracking
+    for ( i = 0 ; i < 3 ; i++ ) {
+        bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
+        bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
+    }
+    VectorAdd( bounds[0], bounds[1], bounds[1] );
+    VectorScale( bounds[1], 0.5f, grid->lodOrigin );
+    VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
+    grid->lodRadius = VectorLength( tmpVec );
 }
 
 /*
@@ -806,57 +806,57 @@ ParseTriSurf
 ===============
 */
 static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfTriangles_t	*tri;
-	int				i, j;
-	int				numVerts, numIndexes;
+    srfTriangles_t	*tri;
+    int				i, j;
+    int				numVerts, numIndexes;
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader
+    surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	numVerts = LittleLong( ds->numVerts );
-	numIndexes = LittleLong( ds->numIndexes );
+    numVerts = LittleLong( ds->numVerts );
+    numIndexes = LittleLong( ds->numIndexes );
 
-	tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
-		+ numIndexes * sizeof( tri->indexes[0] ), h_dontcare );
-	tri->surfaceType = SF_TRIANGLES;
-	tri->numVerts = numVerts;
-	tri->numIndexes = numIndexes;
-	tri->verts = (drawVert_t *)(tri + 1);
-	tri->indexes = (int *)(tri->verts + tri->numVerts );
+    tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
+        + numIndexes * sizeof( tri->indexes[0] ), h_dontcare );
+    tri->surfaceType = SF_TRIANGLES;
+    tri->numVerts = numVerts;
+    tri->numIndexes = numIndexes;
+    tri->verts = (drawVert_t *)(tri + 1);
+    tri->indexes = (int *)(tri->verts + tri->numVerts );
 
-	surf->data = (surfaceType_t *)tri;
+    surf->data = (surfaceType_t *)tri;
 
-	// copy vertexes
-	ClearBounds( tri->bounds[0], tri->bounds[1] );
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numVerts ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
-		for ( j = 0 ; j < 2 ; j++ ) {
-			tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
-			tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
+    // copy vertexes
+    ClearBounds( tri->bounds[0], tri->bounds[1] );
+    verts += LittleLong( ds->firstVert );
+    for ( i = 0 ; i < numVerts ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
+            tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
+        }
+        AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
+        for ( j = 0 ; j < 2 ; j++ ) {
+            tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
+            tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
+        }
 
-		R_ColorShiftLightingBytesAlpha( verts[i].color, tri->verts[i].color );
-	}
+        R_ColorShiftLightingBytesAlpha( verts[i].color, tri->verts[i].color );
+    }
 
-	// copy indexes
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		tri->indexes[i] = LittleLong( indexes[i] );
-		if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
-			ri.Error( ERR_DROP, "Bad index in triangle surface" );
-		}
-	}
+    // copy indexes
+    indexes += LittleLong( ds->firstIndex );
+    for ( i = 0 ; i < numIndexes ; i++ ) {
+        tri->indexes[i] = LittleLong( indexes[i] );
+        if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
+            ri.Error( ERR_DROP, "Bad index in triangle surface" );
+        }
+    }
 }
 
 /*
@@ -865,28 +865,28 @@ ParseFlare
 ===============
 */
 static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfFlare_t		*flare;
-	int				i;
+    srfFlare_t		*flare;
+    int				i;
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader
+    surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	flare = ri.Hunk_Alloc( sizeof( *flare ), h_dontcare );
-	flare->surfaceType = SF_FLARE;
+    flare = ri.Hunk_Alloc( sizeof( *flare ), h_dontcare );
+    flare->surfaceType = SF_FLARE;
 
-	surf->data = (surfaceType_t *)flare;
+    surf->data = (surfaceType_t *)flare;
 
-	for ( i = 0 ; i < 3 ; i++ ) {
-		flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
-		flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
-		flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
+    for ( i = 0 ; i < 3 ; i++ ) {
+        flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
+        flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
+        flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
+    }
 }
 
 
@@ -898,17 +898,17 @@ returns true if there are grid points merged on a width edge
 =================
 */
 int R_MergedWidthPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
+    int i, j;
 
-	for (i = 1; i < grid->width-1; i++) {
-		for (j = i + 1; j < grid->width-1; j++) {
-			if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
+    for (i = 1; i < grid->width-1; i++) {
+        for (j = i + 1; j < grid->width-1; j++) {
+            if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
+            if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
+            if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
+            return qtrue;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -919,17 +919,17 @@ returns true if there are grid points merged on a height edge
 =================
 */
 int R_MergedHeightPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
+    int i, j;
 
-	for (i = 1; i < grid->height-1; i++) {
-		for (j = i + 1; j < grid->height-1; j++) {
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
+    for (i = 1; i < grid->height-1; i++) {
+        for (j = i + 1; j < grid->height-1; j++) {
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
+            return qtrue;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -942,107 +942,107 @@ FIXME: write generalized version that also avoids cracks between a patch and one
 =================
 */
 void R_FixSharedVertexLodError_r( int start, srfGridMesh_t *grid1 ) {
-	int j, k, l, m, n, offset1, offset2, touch;
-	srfGridMesh_t *grid2;
+    int j, k, l, m, n, offset1, offset2, touch;
+    srfGridMesh_t *grid2;
 
-	for ( j = start; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// if the LOD errors are already fixed for this patch
-		if ( grid2->lodFixed == 2 ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		touch = qfalse;
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = (grid1->height-1) * grid1->width;
-			else offset1 = 0;
-			if (R_MergedWidthPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->width-1; k++) {
-				for (m = 0; m < 2; m++) {
+    for ( j = start; j < s_worldData.numsurfaces; j++ ) {
+        //
+        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
+        // if this surface is not a grid
+        if ( grid2->surfaceType != SF_GRID ) continue;
+        // if the LOD errors are already fixed for this patch
+        if ( grid2->lodFixed == 2 ) continue;
+        // grids in the same LOD group should have the exact same lod radius
+        if ( grid1->lodRadius != grid2->lodRadius ) continue;
+        // grids in the same LOD group should have the exact same lod origin
+        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
+        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
+        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
+        //
+        touch = qfalse;
+        for (n = 0; n < 2; n++) {
+            //
+            if (n) offset1 = (grid1->height-1) * grid1->width;
+            else offset1 = 0;
+            if (R_MergedWidthPoints(grid1, offset1)) continue;
+            for (k = 1; k < grid1->width-1; k++) {
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = (grid2->height-1) * grid2->width;
+                    else offset2 = 0;
+                    if (R_MergedWidthPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->width-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->widthLodError[l] = grid1->widthLodError[k];
+                        touch = qtrue;
+                    }
+                }
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = grid1->width-1;
-			else offset1 = 0;
-			if (R_MergedHeightPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->height-1; k++) {
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = grid2->width-1;
+                    else offset2 = 0;
+                    if (R_MergedHeightPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->height-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->heightLodError[l] = grid1->widthLodError[k];
+                        touch = qtrue;
+                    }
+                }
+            }
+        }
+        for (n = 0; n < 2; n++) {
+            //
+            if (n) offset1 = grid1->width-1;
+            else offset1 = 0;
+            if (R_MergedHeightPoints(grid1, offset1)) continue;
+            for (k = 1; k < grid1->height-1; k++) {
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = (grid2->height-1) * grid2->width;
+                    else offset2 = 0;
+                    if (R_MergedWidthPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->width-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->widthLodError[l] = grid1->heightLodError[k];
+                        touch = qtrue;
+                    }
+                }
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		if (touch) {
-			grid2->lodFixed = 2;
-			R_FixSharedVertexLodError_r ( start, grid2 );
-			//NOTE: this would be correct but makes things really slow
-			//grid2->lodFixed = 1;
-		}
-	}
+                    if (m) offset2 = grid2->width-1;
+                    else offset2 = 0;
+                    if (R_MergedHeightPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->height-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->heightLodError[l] = grid1->heightLodError[k];
+                        touch = qtrue;
+                    }
+                }
+            }
+        }
+        if (touch) {
+            grid2->lodFixed = 2;
+            R_FixSharedVertexLodError_r ( start, grid2 );
+            //NOTE: this would be correct but makes things really slow
+            //grid2->lodFixed = 1;
+        }
+    }
 }
 
 /*
@@ -1054,23 +1054,23 @@ If this is not the case this function will still do its job but won't fix the hi
 =================
 */
 void R_FixSharedVertexLodError( void ) {
-	int i;
-	srfGridMesh_t *grid1;
+    int i;
+    srfGridMesh_t *grid1;
 
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid1->surfaceType != SF_GRID )
-			continue;
-		//
-		if ( grid1->lodFixed )
-			continue;
-		//
-		grid1->lodFixed = 2;
-		// recursively fix other patches in the same LOD group
-		R_FixSharedVertexLodError_r( i + 1, grid1);
-	}
+    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+        //
+        grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+        // if this surface is not a grid
+        if ( grid1->surfaceType != SF_GRID )
+            continue;
+        //
+        if ( grid1->lodFixed )
+            continue;
+        //
+        grid1->lodFixed = 2;
+        // recursively fix other patches in the same LOD group
+        R_FixSharedVertexLodError_r( i + 1, grid1);
+    }
 }
 
 
@@ -1080,405 +1080,405 @@ R_StitchPatches
 ===============
 */
 int R_StitchPatches( int grid1num, int grid2num ) {
-	float *v1, *v2;
-	srfGridMesh_t *grid1, *grid2;
-	int k, l, m, n, offset1, offset2, row, column;
+    float *v1, *v2;
+    srfGridMesh_t *grid1, *grid2;
+    int k, l, m, n, offset1, offset2, row, column;
 
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->width-2; k += 2) {
+    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = (grid1->height-1) * grid1->width;
+        else offset1 = 0;
+        if (R_MergedWidthPoints(grid1, offset1))
+            continue;
+        for (k = 0; k < grid1->width-2; k += 2) {
 
-			for (m = 0; m < 2; m++) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k + 2 + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                    grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-					//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                    //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->height-2; k += 2) {
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k + 2 + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = grid1->width-1;
+        else offset1 = 0;
+        if (R_MergedHeightPoints(grid1, offset1))
+            continue;
+        for (k = 0; k < grid1->height-2; k += 2) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = grid1->width-1; k > 1; k -= 2) {
+                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = (grid1->height-1) * grid1->width;
+        else offset1 = 0;
+        if (R_MergedWidthPoints(grid1, offset1))
+            continue;
+        for (k = grid1->width-1; k > 1; k -= 2) {
 
-			for (m = 0; m < 2; m++) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k - 2 + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					if (!grid2)
-						break;
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = grid1->height-1; k > 1; k -= 2) {
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k - 2 + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    if (!grid2)
+                        break;
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = grid1->width-1;
+        else offset1 = 0;
+        if (R_MergedHeightPoints(grid1, offset1))
+            continue;
+        for (k = grid1->height-1; k > 1; k -= 2) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	return qfalse;
+                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -1495,29 +1495,29 @@ might still appear at that side.
 ===============
 */
 int R_TryStitchingPatch( int grid1num ) {
-	int j, numstitches;
-	srfGridMesh_t *grid1, *grid2;
+    int j, numstitches;
+    srfGridMesh_t *grid1, *grid2;
 
-	numstitches = 0;
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		while (R_StitchPatches(grid1num, j))
-		{
-			numstitches++;
-		}
-	}
-	return numstitches;
+    numstitches = 0;
+    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
+        //
+        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
+        // if this surface is not a grid
+        if ( grid2->surfaceType != SF_GRID ) continue;
+        // grids in the same LOD group should have the exact same lod radius
+        if ( grid1->lodRadius != grid2->lodRadius ) continue;
+        // grids in the same LOD group should have the exact same lod origin
+        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
+        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
+        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
+        //
+        while (R_StitchPatches(grid1num, j))
+        {
+            numstitches++;
+        }
+    }
+    return numstitches;
 }
 
 /*
@@ -1526,31 +1526,31 @@ R_StitchAllPatches
 ===============
 */
 void R_StitchAllPatches( void ) {
-	int i, stitched, numstitches;
-	srfGridMesh_t *grid1;
+    int i, stitched, numstitches;
+    srfGridMesh_t *grid1;
 
-	numstitches = 0;
-	do
-	{
-		stitched = qfalse;
-		for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-			//
-			grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-			// if this surface is not a grid
-			if ( grid1->surfaceType != SF_GRID )
-				continue;
-			//
-			if ( grid1->lodStitched )
-				continue;
-			//
-			grid1->lodStitched = qtrue;
-			stitched = qtrue;
-			//
-			numstitches += R_TryStitchingPatch( i );
-		}
-	}
-	while (stitched);
-	ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
+    numstitches = 0;
+    do
+    {
+        stitched = qfalse;
+        for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+            //
+            grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+            // if this surface is not a grid
+            if ( grid1->surfaceType != SF_GRID )
+                continue;
+            //
+            if ( grid1->lodStitched )
+                continue;
+            //
+            grid1->lodStitched = qtrue;
+            stitched = qtrue;
+            //
+            numstitches += R_TryStitchingPatch( i );
+        }
+    }
+    while (stitched);
+    ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
 }
 
 /*
@@ -1559,30 +1559,30 @@ R_MovePatchSurfacesToHunk
 ===============
 */
 void R_MovePatchSurfacesToHunk(void) {
-	int i, size;
-	srfGridMesh_t *grid, *hunkgrid;
+    int i, size;
+    srfGridMesh_t *grid, *hunkgrid;
 
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid->surfaceType != SF_GRID )
-			continue;
-		//
-		size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-		hunkgrid = ri.Hunk_Alloc( size, h_dontcare );
-		Com_Memcpy(hunkgrid, grid, size);
+    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+        //
+        grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+        // if this surface is not a grid
+        if ( grid->surfaceType != SF_GRID )
+            continue;
+        //
+        size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
+        hunkgrid = ri.Hunk_Alloc( size, h_dontcare );
+        Com_Memcpy(hunkgrid, grid, size);
 
-		hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_dontcare );
-		Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
+        hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_dontcare );
+        Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
 
-		hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_dontcare );
-		Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 );
+        hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_dontcare );
+        Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 );
 
-		R_FreeSurfaceGridMesh( grid );
+        R_FreeSurfaceGridMesh( grid );
 
-		s_worldData.surfaces[i].data = (void *) hunkgrid;
-	}
+        s_worldData.surfaces[i].data = (void *) hunkgrid;
+    }
 }
 
 /*
@@ -1591,18 +1591,18 @@ R_LoadSurfaces
 ===============
 */
 static	void R_LoadSurfaces(gamelump_t* surfs, gamelump_t* verts, gamelump_t* indexLump) {
-	dsurface_t	*in;
-	msurface_t	*out;
-	drawVert_t	*dv;
-	int			*indexes;
-	int			count;
-	int			numFaces, numMeshes, numTriSurfs, numFlares;
-	int			i;
+    dsurface_t	*in;
+    msurface_t	*out;
+    drawVert_t	*dv;
+    int			*indexes;
+    int			count;
+    int			numFaces, numMeshes, numTriSurfs, numFlares;
+    int			i;
 
-	numFaces = 0;
-	numMeshes = 0;
-	numTriSurfs = 0;
-	numFlares = 0;
+    numFaces = 0;
+    numMeshes = 0;
+    numTriSurfs = 0;
+    numFlares = 0;
 
     if (surfs->length % sizeof(*in))
         ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
@@ -1617,46 +1617,46 @@ static	void R_LoadSurfaces(gamelump_t* surfs, gamelump_t* verts, gamelump_t* ind
         ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
 
     in = (void*)surfs->buffer;
-	out = ri.Hunk_Alloc ( count * sizeof(*out), h_dontcare );	
+    out = ri.Hunk_Alloc ( count * sizeof(*out), h_dontcare );	
 
-	s_worldData.surfaces = out;
-	s_worldData.numsurfaces = count;
+    s_worldData.surfaces = out;
+    s_worldData.numsurfaces = count;
 
-	for ( i = 0 ; i < count ; i++, in++, out++ ) {
-		switch ( LittleLong( in->surfaceType ) ) {
-		case MST_PATCH:
-			ParseMesh ( in, dv, out );
-			numMeshes++;
-			break;
-		case MST_TRIANGLE_SOUP:
-			ParseTriSurf( in, dv, out, indexes );
-			numTriSurfs++;
-			break;
-		case MST_PLANAR:
-			ParseFace( in, dv, out, indexes );
-			numFaces++;
-			break;
-		case MST_FLARE:
-			ParseFlare( in, dv, out, indexes );
-			numFlares++;
-			break;
-		default:
-			ri.Error( ERR_DROP, "Bad surfaceType" );
-		}
-	}
+    for ( i = 0 ; i < count ; i++, in++, out++ ) {
+        switch ( LittleLong( in->surfaceType ) ) {
+        case MST_PATCH:
+            ParseMesh ( in, dv, out );
+            numMeshes++;
+            break;
+        case MST_TRIANGLE_SOUP:
+            ParseTriSurf( in, dv, out, indexes );
+            numTriSurfs++;
+            break;
+        case MST_PLANAR:
+            ParseFace( in, dv, out, indexes );
+            numFaces++;
+            break;
+        case MST_FLARE:
+            ParseFlare( in, dv, out, indexes );
+            numFlares++;
+            break;
+        default:
+            ri.Error( ERR_DROP, "Bad surfaceType" );
+        }
+    }
 
 #ifdef PATCH_STITCHING
-	R_StitchAllPatches();
+    R_StitchAllPatches();
 #endif
 
-	R_FixSharedVertexLodError();
+    R_FixSharedVertexLodError();
 
 #ifdef PATCH_STITCHING
-	R_MovePatchSurfacesToHunk();
+    R_MovePatchSurfacesToHunk();
 #endif
 
-	ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
-		numFaces, numMeshes, numTriSurfs, numFlares );
+    ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
+        numFaces, numMeshes, numTriSurfs, numFlares );
 }
 
 
@@ -1667,36 +1667,36 @@ R_LoadSubmodels
 =================
 */
 static	void R_LoadSubmodels(gamelump_t* l) {
-	dmodel_t	*in;
-	bmodel_t	*out;
-	int			i, j, count;
+    dmodel_t	*in;
+    bmodel_t	*out;
+    int			i, j, count;
 
     in = (void*)l->buffer;
     if (l->length % sizeof(*in))
         ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
     count = l->length / sizeof(*in);
 
-	s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
+    s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
 
-	for ( i=0 ; i<count ; i++, in++, out++ ) {
-		model_t *model;
+    for ( i=0 ; i<count ; i++, in++, out++ ) {
+        model_t *model;
 
-		model = R_AllocModel();
+        model = R_AllocModel();
 
-		assert( model != NULL );			// this should never happen
+        assert( model != NULL );			// this should never happen
 
-		model->type = MOD_BRUSH;
-		model->d.bmodel = out;
-		Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
+        model->type = MOD_BRUSH;
+        model->d.bmodel = out;
+        Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
 
-		for (j=0 ; j<3 ; j++) {
-			out->bounds[0][j] = LittleFloat (in->mins[j]);
-			out->bounds[1][j] = LittleFloat (in->maxs[j]);
-		}
+        for (j=0 ; j<3 ; j++) {
+            out->bounds[0][j] = LittleFloat (in->mins[j]);
+            out->bounds[1][j] = LittleFloat (in->maxs[j]);
+        }
 
-		out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
-		out->numSurfaces = LittleLong( in->numSurfaces );
-	}
+        out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
+        out->numSurfaces = LittleLong( in->numSurfaces );
+    }
 }
 
 
@@ -1710,11 +1710,11 @@ R_SetParent
 */
 static	void R_SetParent (mnode_t *node, mnode_t *parent)
 {
-	node->parent = parent;
-	if (node->contents != -1)
-		return;
-	R_SetParent (node->children[0], node);
-	R_SetParent (node->children[1], node);
+    node->parent = parent;
+    if (node->contents != -1)
+        return;
+    R_SetParent (node->children[0], node);
+    R_SetParent (node->children[1], node);
 }
 
 /*
@@ -1978,72 +1978,72 @@ R_LoadLightGrid
 ================
 */
 void R_LoadLightGrid(gamelump_t* plPal, gamelump_t* plOffsets, gamelump_t* plData) {
-	int		i;
-	vec3_t	maxs;
-	int		numGridPoints;
-	world_t	*w;
-	float	*wMins, *wMaxs;
+    int		i;
+    vec3_t	maxs;
+    int		numGridPoints;
+    world_t	*w;
+    float	*wMins, *wMaxs;
 
-	w = &s_worldData;
+    w = &s_worldData;
 
-	if (!plPal->buffer || !plOffsets->buffer || !plData->buffer) {
-		ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
-		w->lightGridOffsets = 0;
-		w->lightGridData = 0;
-		return;
-	}
+    if (!plPal->buffer || !plOffsets->buffer || !plData->buffer) {
+        ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
+        w->lightGridOffsets = 0;
+        w->lightGridData = 0;
+        return;
+    }
 
-	switch (map_version)
-	{
+    switch (map_version)
+    {
     case 21:
         w->lightGridSize[0] = 80.0;
         w->lightGridSize[1] = 80.0;
         w->lightGridSize[2] = 80.0;
-		break;
+        break;
     case 20:
         w->lightGridSize[0] = 48.0;
         w->lightGridSize[1] = 48.0;
         w->lightGridSize[2] = 64.0;
-		break;
+        break;
     default:
         w->lightGridSize[0] = 32.0;
         w->lightGridSize[1] = 32.0;
         w->lightGridSize[2] = 32.0;
-		break;
-	}
+        break;
+    }
 
-	w->lightGridOOSize[0] = 1.0f / w->lightGridSize[0];
-	w->lightGridOOSize[1] = 1.0f / w->lightGridSize[1];
-	w->lightGridOOSize[2] = 1.0f / w->lightGridSize[2];
+    w->lightGridOOSize[0] = 1.0f / w->lightGridSize[0];
+    w->lightGridOOSize[1] = 1.0f / w->lightGridSize[1];
+    w->lightGridOOSize[2] = 1.0f / w->lightGridSize[2];
 
-	wMins = w->bmodels[0].bounds[0];
-	wMaxs = w->bmodels[0].bounds[1];
+    wMins = w->bmodels[0].bounds[0];
+    wMaxs = w->bmodels[0].bounds[1];
 
-	for ( i = 0 ; i < 3 ; i++ ) {
-		w->lightGridMins[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
-		maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
-		w->lightGridBounds[i] = (maxs[i] - w->lightGridMins[i])/w->lightGridSize[i] + 1;
-	}
+    for ( i = 0 ; i < 3 ; i++ ) {
+        w->lightGridMins[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
+        maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
+        w->lightGridBounds[i] = (maxs[i] - w->lightGridMins[i])/w->lightGridSize[i] + 1;
+    }
 
-	numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
+    numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
 
     if (plOffsets->length != numGridPoints * 2) {
-		ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
-		w->lightGridOffsets = NULL;
+        ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
+        w->lightGridOffsets = NULL;
         w->lightGridData = NULL;
         return;
     }
 
-	if (plPal->length != 768) {
-		ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
-		w->lightGridOffsets = NULL;
-		w->lightGridData = NULL;
-		return;
-	}
+    if (plPal->length != 768) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
 
-	w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
-	Com_Memcpy(w->lightGridOffsets, plOffsets->buffer, plOffsets->length);
-	Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
+    w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
+    Com_Memcpy(w->lightGridOffsets, plOffsets->buffer, plOffsets->length);
+    Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
 
     w->lightGridData = ri.Hunk_Alloc(plData->length, h_dontcare);
     Com_Memcpy(w->lightGridData, plData->buffer, plData->length);
@@ -2078,10 +2078,10 @@ void R_LoadStaticModelData(gamelump_t* lump) {
 
     for (i = 0; i < lump->length; i += sizeof(byte) * 3)
     { 
-		// Colors are stored as integers
-		pDstColors[0] = pSrcColors[0];
-		pDstColors[1] = pSrcColors[1];
-		pDstColors[2] = pSrcColors[2];
+        // Colors are stored as integers
+        pDstColors[0] = pSrcColors[0];
+        pDstColors[1] = pSrcColors[1];
+        pDstColors[2] = pSrcColors[2];
         pDstColors[3] = 0xFF;
 
         pSrcColors += sizeof(byte) * 3;
@@ -2096,12 +2096,12 @@ R_CopyStaticModel
 */
 void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
     pUnpackedSM->visCount = 0;
-	pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
-	pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
-	pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
-	pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
-	pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
-	pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
+    pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
+    pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
+    pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
+    pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
+    pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
+    pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
     pUnpackedSM->scale = LittleFloat(pSM->scale);
     pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
     pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
@@ -2220,25 +2220,25 @@ Called directly from cgame
 =================
 */
 void RE_LoadWorldMap( const char *name ) {
-	int			i;
+    int			i;
     dheader_t	header;
     fileHandle_t	h;
     int				length;
-	vec3_t			vDefSundir;
+    vec3_t			vDefSundir;
     gamelump_t		lump, lump2, lump3;
 
     vDefSundir[0] = 0.45f;
     vDefSundir[1] = 0.3f;
     vDefSundir[2] = 0.9f;
 
-	_R(52);
+    _R(52);
 
-	// set default sun direction to be used if it isn't
-	// overridden by a shader
-	VectorCopy(vDefSundir, tr.sunDirection);
-	VectorNormalize( tr.sunDirection );
+    // set default sun direction to be used if it isn't
+    // overridden by a shader
+    VectorCopy(vDefSundir, tr.sunDirection);
+    VectorNormalize( tr.sunDirection );
 
-	tr.worldMapLoaded = qtrue;
+    tr.worldMapLoaded = qtrue;
 
     // load it
     length = ri.FS_OpenFile(name, &h, qtrue, qtrue);
@@ -2248,32 +2248,32 @@ void RE_LoadWorldMap( const char *name ) {
 
     ri.FS_Read(&header, sizeof(dheader_t), h);
 
-	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
-		((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
-	}
+    for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
+        ((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
+    }
 
     map_length = length;
     map_version = header.version;
 
-	// clear tr.world so if the level fails to load, the next
-	// try will not look at the partially loaded version
-	tr.world = NULL;
+    // clear tr.world so if the level fails to load, the next
+    // try will not look at the partially loaded version
+    tr.world = NULL;
 
-	Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
-	Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
+    Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
+    Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
 
-	Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
-	COM_StripExtension( s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
+    Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
+    COM_StripExtension( s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
 
-	c_gridVerts = 0;
+    c_gridVerts = 0;
 
-    i = LittleLong(header.version);
+    i = header.version;
     if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
         ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
             name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
     }
 
-	// load into heap
+    // load into heap
     // load into heap
     _R(53);
     numShaders = R_LoadLump(h, &header.lumps[LUMP_SHADERS], &lump, sizeof(dshader_t));
@@ -2291,9 +2291,9 @@ void RE_LoadWorldMap( const char *name ) {
     _R(59);
     R_LoadLightmaps(&lump);
     _R(60);
-	R_FreeLump(&lump);
-	_R(61);
-	numDrawSurfaces = R_LoadLump(h, &header.lumps[LUMP_SURFACES], &lump, sizeof(dsurface_t));
+    R_FreeLump(&lump);
+    _R(61);
+    numDrawSurfaces = R_LoadLump(h, &header.lumps[LUMP_SURFACES], &lump, sizeof(dsurface_t));
     _R(62);
     numDrawVerts = R_LoadLump(h, &header.lumps[LUMP_DRAWVERTS], &lump2, sizeof(drawVert_t));
     _R(63);
@@ -2328,7 +2328,7 @@ void RE_LoadWorldMap( const char *name ) {
     _R(75);
     R_FreeLump(&lump2);
     _R(76);
-	numFogs = 0;
+    numFogs = 0;
     nummodels = R_LoadLump(h, &header.lumps[LUMP_MODELS], &lump, sizeof(bmodel_t));
     _R(77);
     R_LoadSubmodels(&lump);
@@ -2407,8 +2407,8 @@ void RE_LoadWorldMap( const char *name ) {
         g_nStaticModelIndices = 0;
     }
 
-	// only set tr.world now that we know the entire level has loaded properly
-	tr.world = &s_worldData;
+    // only set tr.world now that we know the entire level has loaded properly
+    tr.world = &s_worldData;
 
     ri.FS_CloseFile(h);
 

From c7900b6048b7772cb1eafcf1e1c25791dc8a0f60 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:12:17 +0200
Subject: [PATCH 0586/2040] Fix static model index endianness

---
 code/renderer/tr_bsp.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 189fee7e..2e56eac7 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2145,8 +2145,8 @@ R_LoadStaticModelIndexes
 ================
 */
 void R_LoadStaticModelIndexes(gamelump_t* lump) {
-    int		i;
-    short* in;
+    int i;
+    unsigned short* in;
     cStaticModelUnpacked_t** out;
 
     if (lump->length % sizeof(short)) {
@@ -2160,7 +2160,13 @@ void R_LoadStaticModelIndexes(gamelump_t* lump) {
     out = s_worldData.visStaticModels;
 
     for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
-        *out = &s_worldData.staticModels[*in];
+        unsigned short index = LittleUnsignedShort(*in);
+        if (index >= s_worldData.numStaticModels) {
+            // Added in OPM
+            Com_Error(ERR_DROP, "R_LoadStaticModelIndexes: bad static model index %d", index);
+        }
+
+        *out = &s_worldData.staticModels[index];
     }
 }
 

From 1d4fe357c8c83039ee89628a95ad852040fd7121 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:39:24 +0200
Subject: [PATCH 0587/2040] Fix `ShaderForShaderNum` incorrectly swapping the
 shader num

---
 code/renderer/tr_bsp.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 2e56eac7..39d3338e 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -435,7 +435,6 @@ static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
     shader_t	*shader;
     dshader_t	*dsh;
 
-    shaderNum = LittleLong( shaderNum );
     if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
         ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
     }
@@ -618,7 +617,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int
     lightmapNum = LittleLong( ds->lightmapNum );
 
     // get shader value
-    surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
     if ( r_singleShader->integer && !surf->shader->isSky ) {
         surf->shader = tr.defaultShader;
     }
@@ -735,7 +734,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
     surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
     // get shader value
-    surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
     if ( r_singleShader->integer && !surf->shader->isSky ) {
         surf->shader = tr.defaultShader;
     }
@@ -814,7 +813,7 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, i
     surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
     // get shader
-    surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
     if ( r_singleShader->integer && !surf->shader->isSky ) {
         surf->shader = tr.defaultShader;
     }
@@ -872,7 +871,7 @@ static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int
     surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
     // get shader
-    surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
     if ( r_singleShader->integer && !surf->shader->isSky ) {
         surf->shader = tr.defaultShader;
     }

From f8b97405ffe608b02bca83ec54d90bb5a7223ee1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:59:27 +0200
Subject: [PATCH 0588/2040] Fix infinite loop in DownSampleWav when `s_khz` is
 less than 44 kHz

This fixes #330 where `s_khz` below 44 (the usual sample rate of mohaa wav files) would cause an infinite loop due to improper usage of the `ii` variable in the loop where another variable would be accidentally incremented instead
---
 code/client/snd_mem_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index e6aea697..ee9844db 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -396,7 +396,7 @@ qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, by
         error += newkhz;
         while (error > oldrate) {
             error -= oldrate;
-            for (ii = 0; ii < width; i++) {
+            for (ii = 0; ii < width; ii++) {
                 data_p[ii] = datap[ii];
             }
 

From 39b3ed3d4420089a4a8782640a6ef98331a002e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 3 Aug 2024 18:37:02 +0200
Subject: [PATCH 0589/2040] Fix part blend mult being incorrectly archived

This may have been the cause of animations not properly playing and the player being unable to climb on ladders
---
 code/fgame/player.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.h b/code/fgame/player.h
index a67ece67..e93056a9 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -979,7 +979,7 @@ inline void Player::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_fPartBlends[0]);
     arc.ArchiveFloat(&m_fPartBlends[1]);
     arc.ArchiveFloat(&partBlendMult[0]);
-    arc.ArchiveFloat(&partBlendMult[0]);
+    arc.ArchiveFloat(&partBlendMult[1]);
 
     arc.ArchiveString(&last_torso_anim_name);
     arc.ArchiveString(&last_leg_anim_name);

From d5da32b8a901e403d0430a0eff3b9582547db70d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 18:43:40 +0200
Subject: [PATCH 0590/2040] Fix AI damage

---
 code/fgame/sentient.cpp | 116 +++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 61 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 900e6da7..ddffc88a 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1354,24 +1354,22 @@ void Sentient::ArmorDamage(Event *ev)
 {
     Entity   *inflictor;
     Sentient *attacker;
-    float     damage;
-    Vector    momentum;
-    Vector    position;
-    Vector    normal;
-    Vector    direction;
+    float    damage;
+    Vector   momentum;
+    Vector   position;
+    Vector   normal;
+    Vector   direction;
     Event    *event;
-    int       dflags;
-    int       meansofdeath;
-    int       knockback;
-    int       location;
+    int      dflags;
+    int      meansofdeath;
+    int      knockback;
+    int      location;
 
-    /*
-    qboolean	blocked;
+    //qboolean	blocked;
     float		damage_red;
     float		damage_green;
     float		damage_time;
-    qboolean	set_means_of_death;
-*/
+    //qboolean	set_means_of_death;
 
     static bool    tmp          = false;
     static cvar_t *AIDamageMult = NULL;
@@ -1396,7 +1394,7 @@ void Sentient::ArmorDamage(Event *ev)
     meansofdeath = ev->GetInteger(9);
     location     = CheckHitLocation(ev->GetInteger(10));
 
-    if (location == -2) {
+    if (location == HITLOC_MISS) {
         return;
     }
 
@@ -1404,12 +1402,10 @@ void Sentient::ArmorDamage(Event *ev)
         return;
     }
 
-    if ((client && !g_gametype->integer) || (location < 0 || location > 18)) {
-        if (attacker && attacker->IsSubclassOfActor()) {
-            damage *= AIDamageMult->value;
-        }
-    } else {
+    if ((!isClient() || g_gametype->integer != GT_SINGLE_PLAYER) && (location > HITLOC_GENERAL && location < NUMBODYLOCATIONS)) {
         damage *= m_fDamageMultipliers[location];
+    } else if (isClient() && attacker && attacker->IsSubclassOfActor() && g_gametype->integer == GT_SINGLE_PLAYER) {
+        damage *= AIDamageMult->value;
     }
 
     // See if sentient is immune to this type of damage
@@ -1471,34 +1467,6 @@ void Sentient::ArmorDamage(Event *ev)
     }
 */
 
-    /*
-if( meansofdeath == MOD_SLIME )
-{
-    damage_green = damage / 50;
-    if( damage_green > 1.0f )
-        damage_green = 1.0f;
-    if( ( damage_green < 0.2 ) && ( damage_green > 0 ) )
-        damage_green = 0.2f;
-    damage_red = 0;
-}
-else
-{
-    damage_red = damage / 50;
-    if( damage_red > 1.0f )
-        damage_red = 1.0f;
-    if( ( damage_red < 0.2 ) && ( damage_red > 0 ) )
-        damage_red = 0.2f;
-    damage_green = 0;
-}
-
-damage_time = damage / 50;
-
-if( damage_time > 2 )
-    damage_time = 2;
-
-SetOffsetColor( damage_red, damage_green, 0, damage_time );
-*/
-
     // Do the kick
     if (!(dflags & DAMAGE_NO_KNOCKBACK)) {
         if ((knockback) && (movetype != MOVETYPE_NONE) && (movetype != MOVETYPE_STATIONARY)
@@ -1506,14 +1474,14 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
             float  m;
             Event *immunity_event;
 
-            if (mass < 50) {
-                m = 50;
+            if (mass < 20) {
+                m = 20;
             } else {
                 m = mass;
             }
 
             direction.normalize();
-            if (isClient() && (attacker == this) && g_gametype->integer) {
+            if (isClient() && (attacker == this) && deathmatch->integer) {
                 momentum = direction * (1700.0f * (float)knockback / m); // the rocket jump hack...
             } else {
                 momentum = direction * (500.0f * (float)knockback / m);
@@ -1542,8 +1510,8 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
     }
 
     if (!(flags & FL_GODMODE)
-        && ((g_gametype->integer) || !(attacker) || (attacker) == this || !(attacker->IsSubclassOfPlayer())
-            || !(attacker->IsTeamMate(this)))) {
+        && ((g_gametype->integer != GT_SINGLE_PLAYER) || !(attacker) || (attacker) == this || !(attacker->IsSubclassOfSentient())
+            || (attacker->m_Team != m_Team))) {
         health -= damage;
     }
 
@@ -1573,9 +1541,38 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
         }
     }
 
-    if (health > 0) {
-        // Send pain event
-        event = new Event(EV_Pain, 10);
+    if (meansofdeath == MOD_SLIME)
+    {
+        damage_green = damage / 50;
+        if (damage_green > 1.0f)
+            damage_green = 1.0f;
+        if ((damage_green < 0.2) && (damage_green > 0))
+            damage_green = 0.2f;
+        damage_red = 0;
+    }
+    else
+    {
+        damage_red = damage / 50;
+        if (damage_red > 1.0f)
+            damage_red = 1.0f;
+        if ((damage_red < 0.2) && (damage_red > 0))
+            damage_red = 0.2f;
+        damage_green = 0;
+    }
+
+    damage_time = damage / 50;
+
+    if (damage_time > 2)
+        damage_time = 2;
+
+    //SetOffsetColor(damage_red, damage_green, 0, damage_time);
+
+    if (health < 0.1) {
+        // Make sure health is now 0
+
+        health = 0;
+
+        event = new Event(EV_Killed, 10);
         event->AddEntity(attacker);
         event->AddFloat(damage);
         event->AddEntity(inflictor);
@@ -1590,12 +1587,9 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
         ProcessEvent(event);
     }
 
-    if (health < 0.1) {
-        // Make sure health is now 0
-
-        health = 0;
-
-        event = new Event(EV_Killed, 10);
+    if (health > 0) {
+        // Send pain event
+        event = new Event(EV_Pain, 10);
         event->AddEntity(attacker);
         event->AddFloat(damage);
         event->AddEntity(inflictor);

From 6b3402c631134eb6670df9248e9727d85609910e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 18:43:56 +0200
Subject: [PATCH 0591/2040] Fix actor accuracy being crazy, killing the player
 easily

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index a1e213c0..65054c3f 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -10135,7 +10135,7 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     float           fAccuracy, fCoverFactor;
     Vector          aimDir;
 
-    fCoverFactor = mAccuracy * (1.0 - m_fVisibilityAlpha) * aiMinAccuracy->value + m_fVisibilityAlpha;
+    fCoverFactor = mAccuracy * ((1.0 - m_fVisibilityAlpha) * aiMinAccuracy->value + m_fVisibilityAlpha);
 
     if (doInit) {
         aiRanges[0] = gi.Cvar_Get("g_aishortrange", "500", 0);

From a6d508d791e33ddac5665fe8483963748a896fbf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 18:49:16 +0200
Subject: [PATCH 0592/2040] Fix sounds replaying when unpausing

This caused some sounds to play again when saving
---
 code/client/snd_openal_new.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 7214807d..753a5cd2 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -965,6 +965,7 @@ void S_UnpauseSound()
         }
 
         if (pChannel->is_paused() || (pChannel->iFlags & CHANNEL_FLAG_PLAYABLE)) {
+            pChannel->iFlags &= ~CHANNEL_FLAG_PLAYABLE;
             pChannel->play();
         }
     }

From 9c5297882cb64bd53c648927e53737710ef66d86 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 18:49:41 +0200
Subject: [PATCH 0593/2040] Renamed CHANNEL_FLAG_PLAYABLE to
 CHANNEL_FLAG_PLAY_DEFERRED

---
 code/client/snd_local_new.h    |  2 +-
 code/client/snd_openal_new.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 19ebcc60..ffeeb94b 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -138,7 +138,7 @@ typedef struct {
 } soundsystemsavegame_t;
 
 enum channel_flags_t {
-    CHANNEL_FLAG_PLAYABLE       = 1,
+    CHANNEL_FLAG_PLAY_DEFERRED  = 1,
     CHANNEL_FLAG_LOCAL_LISTENER = 16,
     CHANNEL_FLAG_NO_ENTITY      = 32,
     CHANNEL_FLAG_PAUSED         = 64,
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 753a5cd2..cc3faede 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -964,8 +964,8 @@ void S_UnpauseSound()
             continue;
         }
 
-        if (pChannel->is_paused() || (pChannel->iFlags & CHANNEL_FLAG_PLAYABLE)) {
-            pChannel->iFlags &= ~CHANNEL_FLAG_PLAYABLE;
+        if (pChannel->is_paused() || (pChannel->iFlags & CHANNEL_FLAG_PLAY_DEFERRED)) {
+            pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
             pChannel->play();
         }
     }
@@ -1746,7 +1746,7 @@ static int S_OPENAL_Start2DLoopSound(
 
     if (!pChannel->set_sfx(pLoopSound->pSfx)) {
         Com_DPrintf("Set sample error\n");
-        pChannel->iFlags &= ~CHANNEL_FLAG_PLAYABLE;
+        pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
         return -1;
     }
 
@@ -2585,7 +2585,7 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
 {
     if (!pChannel->set_sfx(pSfx)) {
         Com_DPrintf("Set sample error - %s\n", pSfx->name);
-        pChannel->iFlags &= ~CHANNEL_FLAG_PLAYABLE;
+        pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
         return;
     }
 
@@ -2615,7 +2615,7 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
     if (bStartUnpaused) {
         pChannel->resume_sample();
     } else {
-        pChannel->iFlags |= CHANNEL_FLAG_PLAYABLE;
+        pChannel->iFlags |= CHANNEL_FLAG_PLAY_DEFERRED;
     }
 }
 

From 279b1413ec3285cdf126f29b0d5ee99607331cc0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:09:29 +0200
Subject: [PATCH 0594/2040] Clear the active music when stopping the triggered
 music

---
 code/client/snd_openal_new.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index cc3faede..deb5e4de 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4027,6 +4027,10 @@ void S_TriggeredMusic_Stop()
     }
 
     openal.chan_trig_music.stop();
+    // Fixed in OPM
+    //  Make sure to clear the triggered music in case snd_restart is called
+    openal.tm_filename[0] = 0;
+    openal.tm_loopcount = 0;
 }
 
 /*

From 192f9ac5146cc12eae9575a80a4ef1b90a7f94b1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:14:30 +0200
Subject: [PATCH 0595/2040] Added S_CurrentSoundtrack()

---
 code/client/new/snd_main_new.cpp | 10 ++++++++++
 code/client/new/snd_public_new.h |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 9e3fbbbc..66fa6f1f 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -381,6 +381,16 @@ void MUSIC_CheckForStoppedSongs(void)
     STUB();
 }
 
+/*
+==============
+S_CurrentSoundtrack
+==============
+*/
+const char* S_CurrentSoundtrack()
+{
+    return "";
+}
+
 /*
 =================
 S_IsSoundRegistered
diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h
index c945052a..30defc6a 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -68,6 +68,8 @@ void S_TriggeredMusic_Start();
 void S_TriggeredMusic_StartLoop();
 void S_TriggeredMusic_Stop();
 
+const char* S_CurrentSoundtrack();
+
 void S_StopSound(int entnum, int channel);
 void S_StopAllSounds2(qboolean stop_music);
 float S_GetSoundTime(sfxHandle_t handle);

From 64f4f591651d31f7aa44838c56af3cfbd756e943 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:20:07 +0200
Subject: [PATCH 0596/2040] Fix `vid_restart` and `snd_restart` resetting the
 sound system (experimental sound system only)

This fixes #335 where one of those commands would clear all active sounds as well as the triggered music, and the soundtrack
---
 code/client/cl_main.cpp | 55 +++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index f668bc43..825ea52c 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1515,6 +1515,12 @@ because the renderer doesn't know what graphics to reload
 =================
 */
 void CL_Vid_Restart_f( void ) {
+    soundsystemsavegame_t save;
+    char tm_filename[MAX_RES_NAME];
+    int tm_loopcount;
+    int tm_offset;
+    char current_soundtrack[128];
+
 	if (!CL_Allowed_Vid_Restart()) {
 		return;
 	}
@@ -1522,11 +1528,18 @@ void CL_Vid_Restart_f( void ) {
 	Com_Printf("-------- CL_Vid_Restart_f --------\n");
 	cls.vid_restart = qtrue;
 
-	// don't let them loop during the restart
-	S_StopAllSounds2(qtrue);
+    //
+    // Save the current music
+    //
+    Q_strncpyz(tm_filename, S_GetMusicFilename(), sizeof(tm_filename));
+    tm_loopcount = S_GetMusicLoopCount();
+    tm_offset = S_GetMusicOffset();
 
 	SV_ClearSvsTimeFixups();
 
+    S_SaveData(&save);
+    Q_strncpyz(current_soundtrack, S_CurrentSoundtrack(), sizeof(current_soundtrack));
+
 	S_BeginRegistration();
 
 	// shutdown the renderer and clear the renderer interface
@@ -1547,13 +1560,22 @@ void CL_Vid_Restart_f( void ) {
 
 	CL_StartHunkUsers(qfalse);
 
+#if defined(USE_SOUND_NEW) && USE_SOUND_NEW
+    s_bSoundPaused = true;
+    S_LoadData(&save);
+#else
+    S_Init();
+#endif
+
 	SV_FinishSvsTimeFixups();
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
-	S_Init();
-#else
-	S_Init(qtrue);
-#endif
+    S_ReLoad(&save);
+
+    if (tm_filename[0]) {
+        S_TriggeredMusic_SetupHandle(tm_filename, tm_loopcount, tm_offset, 0);
+    }
+
+    MUSIC_NewSoundtrack(current_soundtrack);
 
 	if (clc.state > CA_CONNECTED && clc.state != CA_CINEMATIC)
 	{
@@ -1578,26 +1600,28 @@ void CL_Snd_Restart_f( void ) {
 #if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
 	S_Shutdown();
 	S_Init();
+    CL_Vid_Restart_f();
 #else
 	qboolean full;
 	soundsystemsavegame_t save;
-	char tm_filename[MAX_RES_NAME];
+    char tm_filename[MAX_RES_NAME];
 	int tm_loopcount;
 	int tm_offset;
 	char current_soundtrack[128];
 
 	full = S_NeedFullRestart();
 
-	//
-	// FIXME: there is a stub function
-	tm_loopcount = 0;
-	tm_offset = 0;
-	//
+    //
+    // Save the current music
+    //
+    Q_strncpyz(tm_filename, S_GetMusicFilename(), sizeof(tm_filename));
+    tm_loopcount = S_GetMusicLoopCount();
+    tm_offset = S_GetMusicOffset();
 
 	SV_ClearSvsTimeFixups();
 
 	S_SaveData(&save);
-	strcpy(current_soundtrack, S_CurrentSoundtrack());
+	Q_strncpyz(current_soundtrack, S_CurrentSoundtrack(), sizeof(current_soundtrack));
 
 	S_Shutdown(qfalse);
 	S_Init(qfalse);
@@ -1614,12 +1638,11 @@ void CL_Snd_Restart_f( void ) {
 	}
 
 	MUSIC_NewSoundtrack(current_soundtrack);
+
 	if (full) {
 		CL_Vid_Restart_f();
 	}
 #endif
-
-	CL_Vid_Restart_f();
 }
 
 

From 1d60405eaa423fc5d54499c88f1e375b4d3fed6d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:46:49 +0200
Subject: [PATCH 0597/2040] Fix heap corruption when taking screenshots with
 non-standard resolutions like 1366x768

---
 code/renderer/tr_init.c | 153 ++++++++++++++++++++++++++++------------
 1 file changed, 108 insertions(+), 45 deletions(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index ef34b507..ca35ea32 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -473,17 +473,63 @@ FIXME: the statics don't get a reinit between fs_game changes
 ============================================================================== 
 */ 
 
+/* 
+================== 
+RB_ReadPixels
+
+Reads an image but takes care of alignment issues for reading RGB images.
+
+Reads a minimum offset for where the RGB data starts in the image from
+integer stored at pointer offset. When the function has returned the actual
+offset was written back to address offset. This address will always have an
+alignment of packAlign to ensure efficient copying.
+
+Stores the length of padding after a line of pixels to address padlen
+
+Return value must be freed with ri.Hunk_FreeTempMemory()
+================== 
+*/  
+
+byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *padlen)
+{
+	byte *buffer, *bufstart;
+	int padwidth, linelen;
+	GLint packAlign;
+	
+	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
+	
+	linelen = width * 3;
+	padwidth = PAD(linelen, packAlign);
+	
+	// Allocate a few more bytes so that we can choose an alignment we like
+	buffer = ri.Hunk_AllocateTempMemory(padwidth * height + *offset + packAlign - 1);
+	
+	bufstart = PADP((intptr_t) buffer + *offset, packAlign);
+	qglReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart);
+	
+	*offset = bufstart - buffer;
+	*padlen = padwidth - linelen;
+	
+	return buffer;
+}
+
 /* 
 ================== 
 RB_TakeScreenshot
 ================== 
 */  
 void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
-	byte		*buffer;
-	int			i, c, temp;
+	byte *allbuf, *buffer;
+	byte *srcptr, *destptr;
+	byte *endline, *endmem;
+	byte temp;
+	
+	int linelen, padlen;
+	size_t offset = 18, memcount;
 		
-	buffer = ri.Hunk_AllocateTempMemory(glConfig.vidWidth*glConfig.vidHeight*3+18);
-
+	allbuf = RB_ReadPixels(x, y, width, height, &offset, &padlen);
+	buffer = allbuf + offset - 18;
+	
 	Com_Memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
 	buffer[12] = width & 255;
@@ -492,24 +538,39 @@ void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
 	buffer[15] = height >> 8;
 	buffer[16] = 24;	// pixel size
 
-	qglReadPixels( x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer+18 ); 
+	// swap rgb to bgr and remove padding from line endings
+	linelen = width * 3;
+	
+	srcptr = destptr = allbuf + offset;
+	endmem = srcptr + (linelen + padlen) * height;
+	
+	while(srcptr < endmem)
+	{
+		endline = srcptr + linelen;
 
-	// swap rgb to bgr
-	c = 18 + width * height * 3;
-	for (i=18 ; i<c ; i+=3) {
-		temp = buffer[i];
-		buffer[i] = buffer[i+2];
-		buffer[i+2] = temp;
+		while(srcptr < endline)
+		{
+			temp = srcptr[0];
+			*destptr++ = srcptr[2];
+			*destptr++ = srcptr[1];
+			*destptr++ = temp;
+			
+			srcptr += 3;
+		}
+		
+		// Skip the pad
+		srcptr += padlen;
 	}
 
+	memcount = linelen * height;
+
 	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, glConfig.vidWidth * glConfig.vidHeight * 3 );
-	}
+	if(glConfig.deviceSupportsGamma)
+		R_GammaCorrect(allbuf + offset, memcount);
 
-	ri.FS_WriteFile( fileName, buffer, c );
+	ri.FS_WriteFile(fileName, buffer, memcount + 18);
 
-	ri.Hunk_FreeTempMemory( buffer );
+	ri.Hunk_FreeTempMemory(allbuf);
 }
 
 /* 
@@ -520,21 +581,19 @@ RB_TakeScreenshotJPEG
 void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName ) {
 	// FIXME: unimplemented
 #if 0
-	byte		*buffer;
+	byte *buffer;
+	size_t offset = 0, memcount;
+	int padlen;
 
-	buffer = ri.Hunk_AllocateTempMemory(glConfig.vidWidth*glConfig.vidHeight*4);
-
-	qglReadPixels( x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer ); 
+	buffer = RB_ReadPixels(x, y, width, height, &offset, &padlen);
+	memcount = (width * 3 + padlen) * height;
 
 	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer, glConfig.vidWidth * glConfig.vidHeight * 4 );
-	}
+	if(glConfig.deviceSupportsGamma)
+		R_GammaCorrect(buffer + offset, memcount);
 
-	ri.FS_WriteFile( fileName, buffer, 1 );		// create path
-	SaveJPG( fileName, 95, glConfig.vidWidth, glConfig.vidHeight, buffer);
-
-	ri.Hunk_FreeTempMemory( buffer );
+	RE_SaveJPG(fileName, r_screenshotJpegQuality->integer, width, height, buffer + offset, padlen);
+	ri.Hunk_FreeTempMemory(buffer);
 #endif
 }
 
@@ -638,14 +697,17 @@ R_ResampledScreenShot
 void R_ResampledScreenShot(const char* filename, int destwidth, int destheight) {
 	char		checkname[MAX_OSPATH];
 	byte		*buffer;
-	byte		*source;
+	byte		*source, *allsource;
 	byte		*src, *dst;
+	size_t			offset = 0;
+	int			padlen;
 	int			x, y;
 	int			r, g, b;
 	float		xScale, yScale;
 	int			xx, yy;
 
-	source = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight * 3 );
+	allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
+	source = allsource + offset;
 
 	buffer = ri.Hunk_AllocateTempMemory(destheight * destwidth * 3 + 18);
 	Com_Memset (buffer, 0, 18);
@@ -656,8 +718,6 @@ void R_ResampledScreenShot(const char* filename, int destwidth, int destheight)
 	buffer[15] = destheight >> 8;
 	buffer[16] = 24;	// pixel size
 
-	qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_RGB, GL_UNSIGNED_BYTE, source ); 
-
 	// resample from source
 	xScale = glConfig.vidWidth / (float)(destwidth * 4);
 	yScale = glConfig.vidHeight / (float)(destheight * 3);
@@ -666,7 +726,8 @@ void R_ResampledScreenShot(const char* filename, int destwidth, int destheight)
 			r = g = b = 0;
 			for ( yy = 0 ; yy < 3 ; yy++ ) {
 				for ( xx = 0 ; xx < 4 ; xx++ ) {
-					src = source + 3 * ( glConfig.vidWidth * (int)( (y*3+yy)*yScale ) + (int)( (x*4+xx)*xScale ) );
+					src = source + (3 * glConfig.vidWidth + padlen) * (int)((y*3 + yy) * yScale) +
+						3 * (int) ((x*4 + xx) * xScale);
 					r += src[0];
 					g += src[1];
 					b += src[2];
@@ -680,14 +741,14 @@ void R_ResampledScreenShot(const char* filename, int destwidth, int destheight)
 	}
 
 	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, destheight * destwidth * 3 );
+	if ( glConfig.deviceSupportsGamma ) {
+		R_GammaCorrect( buffer + 18, 128 * 128 * 3 );
 	}
 
 	ri.FS_WriteFile( filename, buffer, destheight * destwidth * 3 + 18 );
 
 	ri.Hunk_FreeTempMemory( buffer );
-	ri.Hunk_FreeTempMemory( source );
+	ri.Hunk_FreeTempMemory( allsource );
 }
 
 /*
@@ -701,26 +762,27 @@ the menu system, sampled down from full screen distorted images
 void R_LevelShot( void ) {
 	char		checkname[MAX_OSPATH];
 	byte		*buffer;
-	byte		*source;
+	byte		*source, *allsource;
 	byte		*src, *dst;
+	size_t			offset = 0;
+	int			padlen;
 	int			x, y;
 	int			r, g, b;
 	float		xScale, yScale;
 	int			xx, yy;
 
-	sprintf( checkname, "levelshots/%s.tga", tr.world->baseName );
+	Com_sprintf(checkname, sizeof(checkname), "levelshots/%s.tga", tr.world->baseName);
 
-	source = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight * 3 );
+	allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
+	source = allsource + offset;
 
-	buffer = ri.Hunk_AllocateTempMemory( 128 * 128*3 + 18);
+	buffer = ri.Hunk_AllocateTempMemory(128 * 128*3 + 18);
 	Com_Memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
 	buffer[12] = 128;
 	buffer[14] = 128;
 	buffer[16] = 24;	// pixel size
 
-	qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_RGB, GL_UNSIGNED_BYTE, source ); 
-
 	// resample from source
 	xScale = glConfig.vidWidth / 512.0f;
 	yScale = glConfig.vidHeight / 384.0f;
@@ -729,7 +791,8 @@ void R_LevelShot( void ) {
 			r = g = b = 0;
 			for ( yy = 0 ; yy < 3 ; yy++ ) {
 				for ( xx = 0 ; xx < 4 ; xx++ ) {
-					src = source + 3 * ( glConfig.vidWidth * (int)( (y*3+yy)*yScale ) + (int)( (x*4+xx)*xScale ) );
+					src = source + (3 * glConfig.vidWidth + padlen) * (int)((y*3 + yy) * yScale) +
+						3 * (int) ((x*4 + xx) * xScale);
 					r += src[0];
 					g += src[1];
 					b += src[2];
@@ -743,14 +806,14 @@ void R_LevelShot( void ) {
 	}
 
 	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
+	if ( glConfig.deviceSupportsGamma ) {
 		R_GammaCorrect( buffer + 18, 128 * 128 * 3 );
 	}
 
 	ri.FS_WriteFile( checkname, buffer, 128 * 128*3 + 18 );
 
-	ri.Hunk_FreeTempMemory( buffer );
-	ri.Hunk_FreeTempMemory( source );
+	ri.Hunk_FreeTempMemory(buffer);
+	ri.Hunk_FreeTempMemory(allsource);
 
 	ri.Printf( PRINT_ALL, "Wrote %s\n", checkname );
 }

From 5b80ea20c7ced11ab02ef596a4491d10dcf952cb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 21:11:26 +0200
Subject: [PATCH 0598/2040] Fix filename case sensitivity on Linux

This fixes #334 where some sounds wouldn't play because some scripts reference sounds without respecting the case
---
 code/qcommon/files.cpp | 57 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 595c6a1a..1563c2b8 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -33,6 +33,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "unzip.h"
 
+#ifndef _WIN32
+#   include <sys/types.h>
+#   include <dirent.h>
+#endif
+
 /*
 =============================================================================
 
@@ -522,17 +527,51 @@ check_filecase
 ====================
 */
 static int check_filecase( char *Path ) {
-	/*
-	int retval;
+    int retval;
+
+#ifdef _WIN32
+    retval = 0;
+#else
 	char *ptr;
 	char *filename;
 	char *basedir;
+    DIR* dir;
 
-	// of course there is no portable way to open a dir in Linux or Windows
-	// DAMNIT
-	// FIXME: stub
-	*/
-	return 0;
+    retval = 0;
+    ptr = strrchr(Path, '/');
+    filename = Path;
+
+    if (ptr) {
+        filename = ptr + 1;
+    }
+
+    basedir = ".";
+    if (ptr)
+    {
+        basedir = Path;
+        *ptr = 0;
+    }
+
+    dir = opendir(basedir);
+    if (dir)
+    {
+        dirent* ent;
+
+        for (ent = readdir(dir); ent && !retval; ent = readdir(dir)) {
+            if (!Q_stricmp(ent->d_name, filename)) {
+                strcpy(filename, ent->d_name);
+                retval = 1;
+            }
+        }
+
+        closedir(dir);
+    }
+
+    if (ptr) {
+        *ptr = '/';
+    }
+#endif
+    return retval;
 }
 
 /*
@@ -564,9 +603,7 @@ void FS_CorrectCase( char *path ) {
 			*ptr = 0;
 		}
 
-		getOut = access( path, 0 );
-
-		if( getOut ) {
+		if( access(path, 0) ) {
 			getOut = !check_filecase( path );
 		}
 

From 434aaf3eafee3917f11e51c4389a74b60d345877 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 5 Aug 2024 23:41:17 +0200
Subject: [PATCH 0599/2040] Initialize last animation time

---
 code/cgame/cg_modelanim.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index 5386db19..960aadf8 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -1323,7 +1323,12 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
         if (model.frameInfo[i].weight) {
             if (!((cent->animLastWeight >> i) & 1) || model.frameInfo[i].index != cent->animLast[i]) {
                 CG_ProcessEntityCommands(TIKI_FRAME_ENTRY, model.frameInfo[i].index, s1->number, &model, cent);
-                cent->animLastTimes[i] = 0.0;
+                if (cent->animLastTimes[i] == -1) {
+                    cent->animLast[i] = model.frameInfo[i].index;
+                    cent->animLastTimes[i] = model.frameInfo[i].time;
+                } else {
+                    cent->animLastTimes[i] = 0;
+                }
             }
 
             CG_ClientCommands(&model, cent, i);

From cd6ec5e3a7def94bac2e5915a6c57247eae00c61 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Aug 2024 18:43:15 +0200
Subject: [PATCH 0600/2040] Fix streamed sound, use 2D instead with properly
 implemented panning

---
 code/client/snd_openal_new.cpp | 47 +++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index deb5e4de..2884c784 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -481,7 +481,7 @@ qboolean S_OPENAL_Init()
         }
     }
 
-    al_current_volume = s_volume->value * s_volume->value;
+    al_current_volume = Square(s_volume->value);
     qalListenerf(AL_GAIN, al_current_volume);
     alDieIfError();
 
@@ -1358,9 +1358,8 @@ void S_OPENAL_StartSound(
         return;
     }
 
-    // Fixed in OPM
-    //  3D streamed or MP3 sound should be supported
-    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET)) //|| pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+    //if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET)) //|| pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3))
         || iEntChannel == CHAN_MENU || iEntChannel == CHAN_LOCAL) {
         S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
         return;
@@ -1370,12 +1369,10 @@ void S_OPENAL_StartSound(
     iEntNum &= ~S_FLAG_DO_CALLBACK;
 
     pSfxInfo = &sfx_infos[pSfx->sfx_info_index];
-    // Fixed in OPM
-    //  3D streamed sound should be supported
-    //if (pSfx->iFlags & SFX_FLAG_STREAMED) {
-    //    Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
-    //    return;
-    //}
+    if (pSfx->iFlags & SFX_FLAG_STREAMED) {
+        Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
+        return;
+    }
 
     iChannel = S_OPENAL_PickChannel3D(iEntNum, iEntChannel);
     if (iChannel < 0) {
@@ -1792,11 +1789,9 @@ static int S_OPENAL_Start3DLoopSound(
     int             iSoundOffset;
     openal_channel *pChan3D;
 
-    // Fixed in OPM
-    //  3D streamed sound should be supported
-    //if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
-    //    return -1;
-    //}
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
+        return -1;
+    }
 
     iChannel = S_OPENAL_PickChannel3D(0, 0);
     if (iChannel < 0) {
@@ -1874,7 +1869,8 @@ static bool S_OPENAL_UpdateLoopSound(
 
     pChannel->iStartTime = cl.serverTime;
 
-    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) // || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+    //if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) // || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
         || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
         vec3_t vOrigin;
         int    iPan;
@@ -2093,7 +2089,8 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
         }
 
-        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) //|| pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+        //if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) //|| pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
             || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
             iChannel = S_OPENAL_Start2DLoopSound(
                 pLoopSound, fVolume, S_GetBaseVolume() * s_fVolumeGain * fTotalVolume, fMinDistance, vLoopOrigin
@@ -2199,7 +2196,7 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //vTempAxis[0] = -vAxis[0][1];
     //vTempAxis[1] = vAxis[2][1];
     //vTempAxis[2] = -vAxis[1][1];
-    VectorCopy(vAxis[0], vTempAxis);
+    VectorCopy(vAxis[1], vTempAxis);
 
     fVolume = 1;
     iPan    = 64;
@@ -2351,7 +2348,7 @@ static int S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const ve
         pan = 0;
     }
 
-    return pan * 128.f;
+    return ceilf(pan * 127);
 }
 
 /*
@@ -2417,7 +2414,7 @@ void S_OPENAL_Update()
 
         music_volume_changed = true;
         s_volume->modified   = 0;
-        al_current_volume    = Square(s_volume->value * s_volume->value);
+        al_current_volume    = Square(s_volume->value);
         qalListenerf(AL_GAIN, al_current_volume);
         alDieIfError();
     }
@@ -3046,7 +3043,15 @@ void openal_channel::end_sample()
 openal_channel::set_sample_pan
 ==============
 */
-void openal_channel::set_sample_pan(S32 pan) {}
+void openal_channel::set_sample_pan(S32 pan)
+{
+    const float panning = (pan - 64) / 127.f;
+    const ALfloat sourcePosition[3] = {panning, 0, sqrtf(1.f - Square(panning))};
+
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 0);
+    qalSourcei(source, AL_SOURCE_RELATIVE, AL_TRUE);
+    qalSourcefv(source, AL_POSITION, sourcePosition);
+}
 
 /*
 ==============

From 236afa7c3fbb278c5c9122b0403f99f98159d293 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:21:00 +0200
Subject: [PATCH 0601/2040] Implement obfuscation mapping setup

The implementation reads all obfuscation csv and return a list of visual obfuscations
---
 code/qcommon/cm_trace_obfuscation.cpp | 207 +++++++++++++++++++++++++-
 1 file changed, 202 insertions(+), 5 deletions(-)

diff --git a/code/qcommon/cm_trace_obfuscation.cpp b/code/qcommon/cm_trace_obfuscation.cpp
index 171e5a49..caa0be5f 100644
--- a/code/qcommon/cm_trace_obfuscation.cpp
+++ b/code/qcommon/cm_trace_obfuscation.cpp
@@ -22,14 +22,92 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cm_local.h"
 
+static char com_token[MAX_TOKEN_CHARS];
+
+/*
+================
+CM_NextCsvToken
+================
+*/
 char* CM_NextCsvToken(char** text, qboolean crossline) {
-	// FIXME: unimplemented
-	return NULL;
+    char* p;
+    char* out;
+    char c;
+    int i;
+    qboolean newline;
+    qboolean comma;
+
+    com_token[0] = 0;
+    p = *text;
+    if (!p) {
+        return com_token;
+    }
+
+    for (c = *p; isspace(c); p++, c = *p)
+    {
+        if (c == '\n' && !crossline) {
+            break;
+        }
+    }
+
+    out = com_token;
+
+    for (i = 0; ; i++, p++) {
+        c = *p;
+
+        newline = qfalse;
+        comma = qfalse;
+
+        if (*p && c != ',') {
+            comma = qtrue;
+        }
+
+        if (comma && c != '\n') {
+            newline = qtrue;
+        }
+
+        if (!newline) {
+            break;
+        }
+
+        *out = c;
+        out++;
+    }
+
+    if (c == ',') {
+        p++;
+    }
+
+    while (i > 0) {
+        if (!isspace(com_token[i - 1])) {
+            break;
+        }
+
+        i--;
+    }
+
+    com_token[i] = 0;
+    *text = p;
+
+    if (!p[0]) {
+        *text = NULL;
+    }
+
+    return com_token;
 }
 
+/*
+================
+CM_SetupObfuscationMapping
+================
+*/
 obfuscation_t* CM_SetupObfuscationMapping() {
 	obfuscation_t* list;
-	int i;
+    obfuscation_t* obfuscation;
+    char** files;
+    int numFiles;
+    int numObfuscations;
+	int i, j;
 	
 	list = (obfuscation_t*)Hunk_AllocateTempMemory(sizeof(obfuscation_t) * MAX_OBFUSCATIONS);
 	for (i = 0; i < MAX_OBFUSCATIONS; i++) {
@@ -37,14 +115,122 @@ obfuscation_t* CM_SetupObfuscationMapping() {
 		list[i].heightDensity = 0;
 		list[i].widthDensity = 0;
 	}
-	// FIXME: unimplemented
+
+    files = FS_ListFiles("scripts/", ".csv", qfalse, &numFiles);
+    numObfuscations = 0;
+
+    for (i = 0; i < numFiles; ++i) {
+        const char* filename = va("scripts/%s", files[i]);
+        void* buffer;
+        char* text;
+        char* token;
+
+        if (FS_ReadFile(filename, &buffer) < 0) {
+            continue;
+        }
+
+        text = (char*)buffer;
+        while (text) {
+            token = CM_NextCsvToken(&text, qtrue);
+            if (!token[0]) {
+                break;
+            }
+
+            for (j = 0; j < numObfuscations; ++j)
+            {
+                if (!Q_stricmp(token, list[j].name))
+                {
+                    Com_Printf("WARNING: using redefinition of obfuscation for '%s' in '%s'\n", token, files[i]);
+                    break;
+                }
+            }
+
+            obfuscation = &list[j];
+            strcpy(obfuscation->name, token);
+
+            token = CM_NextCsvToken(&text, qfalse);
+            if (!text) {
+                Com_Printf(
+                    "WARNING: unexpected EOF in definition of obfuscation for '%s' in '%s'; skipping\n",
+                    obfuscation->name,
+                    files[i]
+                );
+                break;
+            }
+
+            if (token[0]) {
+                float maxNumVolumes = atof(token);
+
+                if (maxNumVolumes > 0) {
+                    obfuscation->widthDensity = 0.5f / maxNumVolumes;
+                } else {
+                    obfuscation->widthDensity = 0;
+                }
+
+                token = CM_NextCsvToken(&text, 0);
+                if (!text) {
+                    Com_Printf(
+                        "WARNING: unexpected EOF in definition of obfuscation for '%s' in '%s'; skipping\n",
+                        obfuscation->name,
+                        files[i]
+                    );
+                    break;
+                }
+
+                if (token[0]) {
+                    float maxDist = atof(token);
+
+                    if (maxDist > 0) {
+                        obfuscation->heightDensity = 1.f / maxDist;
+                    } else {
+                        obfuscation->heightDensity = 0;
+                    }
+
+                    if (numObfuscations == MAX_OBFUSCATIONS) {
+                        Com_Printf("WARNING: exceeded MAX_OBFUSCATIONS (%i)", numObfuscations);
+                    } else {
+                        numObfuscations++;
+                    }
+                } else {
+                    Com_Printf(
+                        "WARNING: missing max distance thorugh obscuring volumes for '%s' in '%s'; skipping\n",
+                        obfuscation->name,
+                        files[i]
+                    );
+                    SkipRestOfLine(&text);
+                }
+            } else {
+                Com_Printf(
+                    "WARNING: missing max number of obscuring volumes for '%s' in '%s'; skipping\n",
+                    obfuscation->name,
+                    files[i]
+                );
+                SkipRestOfLine(&text);
+            }
+        }
+
+        FS_FreeFile(buffer);
+    }
+
+    list[numObfuscations].name[0] = 0;
+
 	return list;
 }
 
+/*
+================
+CM_ReleaseObfuscationMapping
+================
+*/
 void CM_ReleaseObfuscationMapping(obfuscation_t* obfuscation) {
 	Hunk_FreeTempMemory(obfuscation);
 }
 
+/*
+================
+CM_ObfuscationForShader
+================
+*/
 void CM_ObfuscationForShader(obfuscation_t* list, const char* shaderName, float* widthDensity, float* heightDensity) {
 	obfuscation_t* current;
 
@@ -276,11 +462,22 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	return CM_ObfuscationTraceThroughTree( tw, node->children[side^1], midf, p2f, mid, p2 );
 }
 
+/*
+================
+CM_ObfuscationTrace
+================
+*/
 float CM_ObfuscationTrace(const vec3_t start, const vec3_t end, clipHandle_t model) {
 	// FIXME: unimplemented
 	return 0.f;
 }
 
-float CM_VisualObfuscation(const vec3_t start, const vec3_t end) {	// FIXME: unimplemented
+/*
+================
+CM_VisualObfuscation
+================
+*/
+float CM_VisualObfuscation(const vec3_t start, const vec3_t end) {
+    // FIXME: unimplemented
 	return 0.f;
 }

From 88174672164af94c2eccaef7c7a63c512f11c795 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:58:16 +0200
Subject: [PATCH 0602/2040] Implement trace obfuscation

---
 code/qcommon/cm_trace_obfuscation.cpp | 134 ++++++++++++--------------
 1 file changed, 64 insertions(+), 70 deletions(-)

diff --git a/code/qcommon/cm_trace_obfuscation.cpp b/code/qcommon/cm_trace_obfuscation.cpp
index caa0be5f..803f145d 100644
--- a/code/qcommon/cm_trace_obfuscation.cpp
+++ b/code/qcommon/cm_trace_obfuscation.cpp
@@ -252,31 +252,21 @@ CM_ObfuscationTraceThroughBrush
 ================
 */
 float CM_ObfuscationTraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
-	int			i;
-	cplane_t	*plane, *clipplane, *clipplane2;
-	float		dist;
-	float		enterFrac, leaveFrac, leaveFrac2;
-	float		d1, d2;
-	qboolean	getout, startout;
-	float		f;
-	cbrushside_t	*side, *leadside, *leadside2;
-	float		t;
-	float		alpha;
+    int i;
+    cplane_t* plane;
+    float dist;
+    float enterFrac, leaveFrac;
+    float enterDensity, leaveDensity;
+    float delta;
+    float d1, d2;
+    float f;
+    cbrushside_t* side;
 
-	if( !brush->numsides ) {
-		return tw->radius * cm.shaders[brush->shaderNum].obfuscationHeightDensity;
-	}
-
-	enterFrac = -1.0;
+	enterFrac = 0;
+    enterDensity = 0;
 	leaveFrac = 1.0;
-	clipplane = NULL;
+    leaveDensity = 0;
 
-	c_brush_traces++;
-
-	getout = qfalse;
-	startout = qfalse;
-
-	leadside = NULL;
 	//
 	// compare the trace against all planes of the brush
 	// find the latest time the trace crosses a plane towards the interior
@@ -287,41 +277,38 @@ float CM_ObfuscationTraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
 		plane = side->plane;
 
 		// adjust the plane distance apropriately for mins/maxs
-		dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal );
+		//dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal );
+        dist = plane->dist;
 
 		d1 = DotProduct( tw->start, plane->normal ) - dist;
 		d2 = DotProduct( tw->end, plane->normal ) - dist;
 
 		// if it doesn't cross the plane, the plane isn't relevent
 		if( d1 >= 0 && d2 >= 0 ) {
-			continue;
+            return 0;
 		}
 
-		// crosses face
-		if( d1 > d2 ) { // enter
-			f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
-			if( f < 0 ) {
-				f = 0;
-			}
-			if( f > enterFrac ) {
-				enterFrac = f;
-				clipplane = plane;
-				leadside = side;
-			}
-		} else { // leave
-			f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
-			if( f > 1 ) {
-				f = 1;
-			}
-			if( f < leaveFrac ) {
-				leaveFrac = f;
-			}
-		}
+        if (d1 < 0 && d2 > 0) {
+            f = d1 / (d1 - d2);
+            if (leaveFrac > f) {
+                leaveFrac = f;
+            }
+            leaveDensity = cm.shaders[brush->shaderNum].obfuscationWidthDensity;
+        } else if (d1 > 0 && d2 < 0) {
+            f = d1 / (d1 - d2);
+            if (enterFrac < f) {
+                enterFrac = f;
+            }
+            enterDensity = cm.shaders[brush->shaderNum].obfuscationWidthDensity;
+        }
 	}
 
-	alpha = 1.f;
-	// FIXME: unimplemented
-	return alpha;
+    delta = leaveFrac - enterFrac;
+    if (delta <= 0) {
+        return 0;
+    }
+
+    return enterDensity + cm.shaders[brush->shaderNum].obfuscationHeightDensity * tw->radius * delta + leaveDensity;
 }
 
 /*
@@ -366,7 +353,7 @@ a smaller intercept fraction.
 float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t p1, vec3_t p2) {
 	cNode_t		*node;
 	cplane_t	*plane;
-	float		t1, t2, offset;
+	float		t1, t2;
 	float		frac, frac2;
 	float		idist;
 	vec3_t		mid;
@@ -391,23 +378,16 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	if ( plane->type < 3 ) {
 		t1 = p1[plane->type] - plane->dist;
 		t2 = p2[plane->type] - plane->dist;
-		offset = tw->extents[plane->type];
 	} else {
 		t1 = DotProduct (plane->normal, p1) - plane->dist;
 		t2 = DotProduct (plane->normal, p2) - plane->dist;
-		if ( tw->isPoint ) {
-			offset = 0;
-		} else {
-			// this is silly
-			offset = 2048;
-		}
 	}
 
 	// see which sides we need to consider
-	if ( t1 >= offset + 1 && t2 >= offset + 1 ) {
+	if ( t1 >= SURFACE_CLIP_EPSILON && t2 >= SURFACE_CLIP_EPSILON) {
 		return CM_ObfuscationTraceThroughTree( tw, node->children[0], p1f, p2f, p1, p2 );
 	}
-	if ( t1 < -offset - 1 && t2 < -offset - 1 ) {
+	if ( t1 < -SURFACE_CLIP_EPSILON && t2 < -SURFACE_CLIP_EPSILON) {
 		return CM_ObfuscationTraceThroughTree( tw, node->children[1], p1f, p2f, p1, p2 );
 	}
 
@@ -415,13 +395,13 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	if ( t1 < t2 ) {
 		idist = 1.0/(t1-t2);
 		side = 1;
-		frac2 = (t1 + offset + SURFACE_CLIP_EPSILON)*idist;
-		frac = (t1 - offset + SURFACE_CLIP_EPSILON)*idist;
+		frac2 = (t1 + SURFACE_CLIP_EPSILON)*idist;
+		frac = (t1 + SURFACE_CLIP_EPSILON)*idist;
 	} else if (t1 > t2) {
 		idist = 1.0/(t1-t2);
 		side = 0;
-		frac2 = (t1 - offset - SURFACE_CLIP_EPSILON)*idist;
-		frac = (t1 + offset + SURFACE_CLIP_EPSILON)*idist;
+		frac2 = (t1 - SURFACE_CLIP_EPSILON)*idist;
+		frac = (t1 + SURFACE_CLIP_EPSILON)*idist;
 	} else {
 		side = 0;
 		frac = 1;
@@ -431,8 +411,7 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	// move up to the node
 	if ( frac < 0 ) {
 		frac = 0;
-	}
-	if ( frac > 1 ) {
+	} else if ( frac > 1 ) {
 		frac = 1;
 	}
 
@@ -448,8 +427,7 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	// go past the node
 	if ( frac2 < 0 ) {
 		frac2 = 0;
-	}
-	if ( frac2 > 1 ) {
+	} else if ( frac2 > 1 ) {
 		frac2 = 1;
 	}
 
@@ -467,9 +445,26 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 CM_ObfuscationTrace
 ================
 */
-float CM_ObfuscationTrace(const vec3_t start, const vec3_t end, clipHandle_t model) {
-	// FIXME: unimplemented
-	return 0.f;
+float CM_ObfuscationTrace(const vec3_t start, const vec3_t end, clipHandle_t handle) {
+    cmodel_t* model;
+    vec3_t delta;
+    traceWork_t tw;
+
+    model = CM_ClipHandleToModel(handle);
+
+    c_traces++;
+    cm.checkcount++;
+
+    VectorCopy(start, tw.start);
+    VectorCopy(end, tw.end);
+    VectorSubtract(tw.end, tw.start, delta);
+    tw.radius = VectorLength(delta);
+
+    if (handle) {
+        return CM_ObfuscationTraceToLeaf(&tw, &model->leaf);
+    } else {
+        return CM_ObfuscationTraceThroughTree(&tw, 0, 0.0, 1.0, tw.start, tw.end);
+    }
 }
 
 /*
@@ -478,6 +473,5 @@ CM_VisualObfuscation
 ================
 */
 float CM_VisualObfuscation(const vec3_t start, const vec3_t end) {
-    // FIXME: unimplemented
-	return 0.f;
+    return CM_ObfuscationTrace(start, end, 0);
 }

From d22dea5e8ea2f55e22ec0101f880e1d2402c61da Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:55:37 +0200
Subject: [PATCH 0603/2040] Count renderer memory

---
 code/null/null_client.c  |  3 ++
 code/qcommon/memory.c    |  6 ++--
 code/qcommon/qcommon.h   |  1 +
 code/renderer/tr_image.c | 62 +++++++++++++++++++++++++++++++++++++++-
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/code/null/null_client.c b/code/null/null_client.c
index 4027e404..ab6c7c15 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -125,3 +125,6 @@ void SCR_DebugGraph( float value ) {
 qboolean CL_FinishedIntro( void ) {
 	return qtrue;
 }
+
+int R_CountTextureMemory() {
+}
diff --git a/code/qcommon/memory.c b/code/qcommon/memory.c
index e28c3480..23055ffe 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -325,9 +325,9 @@ void Z_Meminfo_f( void )
 	Com_Printf( "\n%.2f Kbytes in %zu blocks in all memory pools\n", ( float )totalBytes / 1024.0f, totalBlocks );
 
 	// FIXME: Count texture memory
-	//Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
-	//Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )R_CountTextureMemory() / 1024.0f );
-	//Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )R_CountTextureMemory() + totalBytes - 1 / 1024.0f );
+	Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
+	Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )R_CountTextureMemory() / 1024.0f );
+	Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )R_CountTextureMemory() + totalBytes - 1 / 1024.0f );
 }
 
 /*
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 8ddcf7d4..3dcd5a44 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1211,6 +1211,7 @@ void Com_FakeUnpause();
 void Com_Pause_f();
 void SV_SoundCallback( int entnum, int channel_number, const char *name );
 
+int R_CountTextureMemory();
 /*
 ==============================================================
 
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index aa7389c6..945ea70c 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -2928,7 +2928,7 @@ void R_DeleteTextures( void ) {
 	int		i;
 
 	for ( i=0; i<tr.numImages ; i++ ) {
-		qglDeleteTextures( 1, &tr.images[i].texnum );
+        R_FreeImage(&tr.images[i]);
 	}
 	Com_Memset( tr.images, 0, sizeof( tr.images ) );
 
@@ -2947,6 +2947,66 @@ void R_DeleteTextures( void ) {
 	}
 }
 
+/*
+===============
+R_DumpTextureMemory
+===============
+*/
+void R_DumpTextureMemory() {
+    int i;
+    char str_buffer[32];
+    char* Label1, * Label2;
+    fileHandle_t stat_file;
+
+    stat_file = FS_SV_FOpenFileWrite("textureuse.csv");
+
+    Label1 = "Texture Name,";
+    FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Size (kb),";
+    FS_Write(Label2, strlen(Label2), stat_file);
+    Label1 = "Num Uses,";
+    FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Miplevels\n";
+    FS_Write(Label2, strlen(Label2), stat_file);
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = &tr.images[i];
+
+        FS_Write(image->imgName, strlen(image->imgName), stat_file);
+        FS_Write(", ", 2, stat_file);
+
+        // Write the number of bytes (in KiB)
+        itoa(image->bytesUsed >> 10, str_buffer, 10);
+        FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        FS_Write(", ", 2, stat_file);
+
+        // Write the sequence
+        itoa(image->r_sequence, str_buffer, 10);
+        FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        FS_Write(", ", 2, stat_file);
+    }
+}
+
+/*
+===============
+R_CountTextureMemory
+===============
+*/
+int R_CountTextureMemory() {
+    int total_bytes;
+    int i;
+
+    R_DumpTextureMemory();
+
+    total_bytes = 0;
+
+    for (i = 0; i < tr.numImages; i++) {
+        total_bytes = tr.images[i].bytesUsed;
+    }
+
+    return total_bytes;
+}
+
 /*
 ============================================================================
 

From 7b59f07181b79d535e41a06bf818df1415559dfc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:01:38 +0200
Subject: [PATCH 0604/2040] Allow precaching image manually with
 `r_precacheimages`

---
 code/renderer/tr_backend.c |  8 +++++---
 code/renderer/tr_init.c    | 12 ++++++++++--
 code/renderer/tr_local.h   |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 3ba08d20..6fb946fb 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -1294,7 +1294,7 @@ was there.  This is used to test for texture thrashing.
 Also called by RE_EndRegistration
 ===============
 */
-void RB_ShowImages( void ) {
+void RB_ShowImages( qboolean quiet ) {
 	int		i;
 	image_t	*image;
 	float	x, y, w, h;
@@ -1340,8 +1340,10 @@ void RB_ShowImages( void ) {
 	qglFinish();
 
 	end = ri.Milliseconds();
-	ri.Printf( PRINT_ALL, "%i msec to draw all images\n", end - start );
 
+    if (!quiet) {
+        ri.Printf(PRINT_ALL, "%i msec to draw all images\n", end - start);
+    }
 }
 
 
@@ -1361,7 +1363,7 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	// texture swapping test
 	if ( r_showImages->integer ) {
-		RB_ShowImages();
+		RB_ShowImages(qfalse);
 	}
 
 	cmd = (const swapBuffersCommand_t *)data;
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index ca35ea32..35838184 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1602,8 +1602,16 @@ Touch all images to make sure they are resident
 */
 void RE_EndRegistration( void ) {
 	R_SyncRenderThread();
-	if (!Sys_LowPhysicalMemory()) {
-		RB_ShowImages();
+	if (r_precacheimages->integer) {
+        int start, end;
+
+        start = Sys_Milliseconds();
+
+        RB_ShowImages(qtrue);
+
+        end = Sys_Milliseconds();
+
+        Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
 }
 
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 96affbf3..03f4c40b 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1902,7 +1902,7 @@ void RB_StageIteratorLightmappedMultitextureUnfogged( void );
 void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color );
 void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 );
 
-void RB_ShowImages( void );
+void RB_ShowImages( qboolean quiet );
 
 
 /*

From 53d812666cd358acb833b87c5ab6a51137f3fe2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:02:48 +0200
Subject: [PATCH 0605/2040] Remove FIXME section

---
 code/qcommon/memory.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/qcommon/memory.c b/code/qcommon/memory.c
index 23055ffe..7845eae1 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -323,8 +323,6 @@ void Z_Meminfo_f( void )
 	}
 
 	Com_Printf( "\n%.2f Kbytes in %zu blocks in all memory pools\n", ( float )totalBytes / 1024.0f, totalBlocks );
-
-	// FIXME: Count texture memory
 	Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
 	Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )R_CountTextureMemory() / 1024.0f );
 	Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )R_CountTextureMemory() + totalBytes - 1 / 1024.0f );

From 7f8a0c99313f0e5f90c33daab96cb2e0508106de Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:10:04 +0200
Subject: [PATCH 0606/2040] Fix the image texture number not properly matching
 the image

It caused issues with textures being messed up sometimes, after multiple maps were loaded
---
 code/renderer/tr_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 945ea70c..55195111 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -918,7 +918,7 @@ image_t* R_CreateImage(
 	}
 
 	image = &tr.images[i];
-	image->texnum = 1024 + tr.numImages;
+	image->texnum = 1024 + i;
 
 	image->numMipmaps = numMipmaps;
 	image->allowPicmip = allowPicmip;

From b463c905cf7845cae0793367a58da70b8f9e9076 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:11:11 +0200
Subject: [PATCH 0607/2040] Free up unused images

This fixes #93 where the game would hit `MAX_DRAWIMAGES` after loading a few maps
---
 code/renderer/tr_image.c | 17 +++++++++++++++++
 code/renderer/tr_init.c  |  7 +++++++
 code/renderer/tr_local.h |  1 +
 3 files changed, 25 insertions(+)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 55195111..ae7f56c8 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -3007,6 +3007,23 @@ int R_CountTextureMemory() {
     return total_bytes;
 }
 
+/*
+===============
+R_FreeUnusedImages
+===============
+*/
+void R_FreeUnusedImages() {
+    int i;
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = &tr.images[i];
+
+        if (image->imgName[0] && image->r_sequence != r_sequencenumber && image->r_sequence != -1) {
+            R_FreeImage(image);
+        }
+    }
+}
+
 /*
 ============================================================================
 
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 35838184..d9f5d235 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1613,8 +1613,15 @@ void RE_EndRegistration( void ) {
 
         Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
+
+    R_FreeUnusedImages();
 }
 
+/*
+=============
+RE_SetRenderTime
+=============
+*/
 void RE_SetRenderTime(int t) {
 	// FIXME: unimplemented
 }
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 03f4c40b..809aafa2 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1794,6 +1794,7 @@ void	R_ScreenShot_f( void );
 void	R_InitImages( void );
 void	R_FreeImage(image_t* image);
 void	R_DeleteTextures( void );
+void    R_FreeUnusedImages( void );
 int		R_SumOfUsedImages( void );
 skin_t	*R_GetSkinByHandle( qhandle_t hSkin );
 

From 7b92d99afac816ee9dd725584bb3812691e24228 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 22:24:52 +0200
Subject: [PATCH 0608/2040] Fix compile error

---
 code/null/null_client.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/null/null_client.c b/code/null/null_client.c
index ab6c7c15..b4d3394b 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -127,4 +127,5 @@ qboolean CL_FinishedIntro( void ) {
 }
 
 int R_CountTextureMemory() {
+    return 0;
 }

From d809975882f73b2c14c8f81d5ddb6ca4d8175be5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 22:27:02 +0200
Subject: [PATCH 0609/2040] Use Q_snprintf because itoa is non-standard

---
 code/renderer/tr_image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index ae7f56c8..2698fb1a 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -2976,12 +2976,12 @@ void R_DumpTextureMemory() {
         FS_Write(", ", 2, stat_file);
 
         // Write the number of bytes (in KiB)
-        itoa(image->bytesUsed >> 10, str_buffer, 10);
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
         FS_Write(str_buffer, strlen(str_buffer), stat_file);
         FS_Write(", ", 2, stat_file);
 
         // Write the sequence
-        itoa(image->r_sequence, str_buffer, 10);
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
         FS_Write(str_buffer, strlen(str_buffer), stat_file);
         FS_Write(", ", 2, stat_file);
     }

From e19b72647ed2284c41d46f645bcac9b516d8287b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:07:09 +0200
Subject: [PATCH 0610/2040] Use qglGenTextures to guarantee the uniqueness of
 the texture number

---
 code/renderer/tr_image.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 2698fb1a..9caeffba 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -918,7 +918,11 @@ image_t* R_CreateImage(
 	}
 
 	image = &tr.images[i];
-	image->texnum = 1024 + i;
+	//image->texnum = 1024 + i;
+    // Fixed in OPM / ioquake3
+    //  Original mohaa uses a fixed texnum instead of generating one regardless of the platform.
+    //  Here, by using glGenTextures, it will guarantee the uniqueness of the texture
+    qglGenTextures(1, &image->texnum);
 
 	image->numMipmaps = numMipmaps;
 	image->allowPicmip = allowPicmip;

From 9150d1cc44568d9e2a78682cbb5ee9c167f0dafc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:31:19 +0200
Subject: [PATCH 0611/2040] Fix lighting grid being incorrect

It fixes #321 where impacts like bullets would have an incorrect color (like red, green...)
---
 code/renderer/tr_light.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 2a8dd722..c16519cf 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -725,6 +725,7 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 	float fOMFrac[3];
 	float fWeight, fWeight2;
 	float fTotalFactor;
+    int iCurData;
 	vec3_t vLightOrigin;
 	byte* pCurData;
 
@@ -737,7 +738,7 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 
 	for (i = 0; i < 3; i++) {
 		fV = vLightOrigin[i] * tr.world->lightGridOOSize[i];
-		iGridPos[i] = myftol(fV);
+		iGridPos[i] = floor(fV);
 		fFrac[i] = fV - iGridPos[i];
 		fOMFrac[i] = 1.0 - fFrac[i];
 
@@ -758,23 +759,23 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 		{
         case 0:
 			fWeight = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
-			fWeight2 = fWeight;
+			fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
 			iOffset = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
             break;
         case 1:
-            fWeight = fFrac[0] * fFrac[1] * fOMFrac[2];
-            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
-			iOffset = tr.world->lightGridOffsets[iArrayXStep + 1 + iBaseOffset];
+            fWeight = fOMFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
+            iOffset = tr.world->lightGridOffsets[iBaseOffset + 1] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
             break;
         case 2:
             fWeight = fFrac[0] * fOMFrac[1] * fOMFrac[2];
             fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iArrayXStep + iBaseOffset];
+            iOffset = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep] + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
             break;
 		case 3:
             fWeight = fFrac[0] * fFrac[1] * fOMFrac[2];
             fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iArrayXStep + 1 + iBaseOffset];
+            iOffset = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1] + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
 			break;
 		}
 
@@ -786,11 +787,13 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 		{
 			while (1)
 			{
-				if (pCurData[iData] >= 0ul) {
+                iCurData = pCurData[iData];
+                iData++;
+				if (iCurData >= 0ul) {
 					break;
 				}
 
-				iLen = -pCurData[iData];
+				iLen = -iCurData;
 				if (iLen > iRowPos) {
 					iData += iRowPos;
 					if (pCurData[iData]) {
@@ -816,7 +819,7 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
                 iData += iLen + 1;
 			}
 
-			iLen = pCurData[iData] + 2;
+			iLen = iCurData + 2;
 			if (iLen - 1 >= iRowPos) {
 				break;
 			}

From 513fe7773f0629b70c78bb64024091be7b671ebb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:44:00 +0200
Subject: [PATCH 0612/2040] Don't append a '\' at the beginning during
 autocompletion

---
 code/qcommon/common.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 75c4971d..5edc49db 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -2596,6 +2596,7 @@ void Field_CompleteCommand(char* cmd,
     else
         completionString = Cmd_Argv(completionArgument - 1);
 
+#if 0
 #ifndef DEDICATED
     // add a '\' to the start of the buffer if it might be sent as chat otherwise
     if (con_autochat->integer && completionField->buffer[0] &&
@@ -2616,6 +2617,7 @@ void Field_CompleteCommand(char* cmd,
 
         completionField->buffer[0] = '\\';
     }
+#endif
 #endif
 
     if (completionArgument > 1)

From 3af24ee0eaa7c7f270d33d024f9e0665e3bc5c5f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 9 Aug 2024 20:30:35 +0200
Subject: [PATCH 0613/2040] Exclude new sound CPP files directly when not using
 the new sound system instead of using #ifdef

---
 code/client/CMakeLists.txt     |  8 ++++++--
 code/client/snd_dma_new.cpp    | 12 ++++--------
 code/client/snd_mem_new.cpp    |  4 ----
 code/client/snd_openal_new.cpp | 14 +++++---------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index cfc2c676..a768d968 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -3,7 +3,7 @@ project(omohclient)
 
 add_subdirectory("../cgame" "./cgame")
 
-file(GLOB_RECURSE SOURCES_CLIENT "./*.c*")
+file(GLOB SOURCES_CLIENT "./*.c*")
 file(GLOB_RECURSE SOURCES_UILIB "../uilib/*.c*")
 
 # Made as an interface and not static, as static only links used methods
@@ -32,7 +32,7 @@ if (USE_SOUND_NEW)
 	endif()
 
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")
-	file(GLOB_RECURSE SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
+	file(GLOB SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 
 	set(OLD_VALUE ${BUILD_SHARED_LIBS})
@@ -43,6 +43,10 @@ if (USE_SOUND_NEW)
 else()
 	add_subdirectory("../libmad-0.15.1b" "./libmad")
 	target_link_libraries(omohclient INTERFACE libmad)
+    
+	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.cpp$")
+	file(GLOB_RECURSE SOURCES_CLIENT_SND "./new/*.c*")
+	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 endif()
 
 if (USE_OPENAL)
diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index efa4735d..c2227e4e 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -20,12 +20,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if USE_SOUND_NEW
-
-#    include "snd_local.h"
-#    include "snd_openal_new.h"
-#    include "client.h"
-#    include "cl_ui.h"
+#include "snd_local.h"
+#include "snd_openal_new.h"
+#include "client.h"
+#include "cl_ui.h"
 
 typedef struct {
     vec3_t origin;
@@ -816,5 +814,3 @@ unsigned int S_GetMusicOffset()
 {
     return S_Driver_GetMusicOffset();
 }
-
-#endif
diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index ee9844db..d1ee0948 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if USE_SOUND_NEW
-
 #include "snd_local.h"
 #include "cl_ui.h"
 
@@ -570,5 +568,3 @@ qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
 
     return qtrue;
 }
-
-#endif
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 2884c784..d8d0b9ee 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -20,13 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if USE_SOUND_NEW
-
-#    include "snd_local.h"
-#    include "snd_openal_new.h"
-#    include "client.h"
-#    include "../server/server.h"
-#    include "snd_codec.h"
+#include "snd_local.h"
+#include "snd_openal_new.h"
+#include "client.h"
+#include "../server/server.h"
+#include "snd_codec.h"
 
 typedef struct {
     char  *funcname;
@@ -4180,5 +4178,3 @@ static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx)
 
     return true;
 }
-
-#endif

From eb04e2682317ef8693ccebb53002afe890405a2f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 9 Aug 2024 20:33:59 +0200
Subject: [PATCH 0614/2040] Use the new libmad version as it seems stable
 enough

---
 code/client/CMakeLists.txt  | 15 ++++++---------
 code/client/snd_codec_mp3.c |  6 +-----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index a768d968..e974e7af 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -34,21 +34,18 @@ if (USE_SOUND_NEW)
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")
 	file(GLOB SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
-
-	set(OLD_VALUE ${BUILD_SHARED_LIBS})
-	set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-	add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
-	target_link_libraries(omohclient INTERFACE mad)
-	set(BUILD_SHARED_LIBS ${OLD_VALUE} CACHE BOOL "" FORCE)
 else()
-	add_subdirectory("../libmad-0.15.1b" "./libmad")
-	target_link_libraries(omohclient INTERFACE libmad)
-    
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.cpp$")
 	file(GLOB_RECURSE SOURCES_CLIENT_SND "./new/*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 endif()
 
+set(OLD_VALUE ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
+target_link_libraries(omohclient INTERFACE mad)
+set(BUILD_SHARED_LIBS ${OLD_VALUE} CACHE BOOL "" FORCE)
+
 if (USE_OPENAL)
 	# Try to use OpenAL
 	find_package(OpenAL)
diff --git a/code/client/snd_codec_mp3.c b/code/client/snd_codec_mp3.c
index 06d1f1c7..47c1ac86 100644
--- a/code/client/snd_codec_mp3.c
+++ b/code/client/snd_codec_mp3.c
@@ -31,11 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "snd_codec.h"
 
 // includes for the MP3 codec
-#if USE_SOUND_NEW
-#   include "mad.h"
-#else
-#   include "../libmad-0.15.1b/synth.h"
-#endif
+#include "mad.h"
 
 #define MP3_SAMPLE_WIDTH		2
 #define MP3_PCMSAMPLES_PERSLICE		32

From bbb7aa3771a06482e0d31280870e3cc0be5f9a2c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:23:03 +0200
Subject: [PATCH 0615/2040] Updated CodeQL actions to use newer version of
 steps

---
 .github/workflows/codeql.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index fc4f71a7..b2ebb262 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Setup SDL
     - name: Set up SDL
@@ -52,7 +52,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ� Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -79,6 +79,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

From deb18c53b7cda8176796dc30fd412d2fda75fe06 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 12 Aug 2024 20:25:04 +0200
Subject: [PATCH 0616/2040] Implement streaming support for OpenAL

See #333, and #324
---
 code/client/snd_openal_new.cpp | 303 +++++++++++++++++++++++++++++++--
 code/client/snd_openal_new.h   |  45 ++++-
 2 files changed, 327 insertions(+), 21 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index d8d0b9ee..d2037518 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2467,6 +2467,10 @@ void S_OPENAL_Update()
             S_OPENAL_StopLoopingSound(&openal.loop_sounds[i]);
         }
     }
+
+    for (i = 0; i < MAX_OPENAL_CHANNELS; i++) {
+        openal.channel[i]->update();
+    }
 }
 
 /*
@@ -2930,7 +2934,6 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
-            //if (!_alutLoadMP3_LOKI(pSfx->buffer, pSfx->data, pSfx->length)) {
             if (!S_OPENAL_LoadMP3_Codec(pSfx->name, pSfx)) {
                 qalDeleteBuffers(1, &pSfx->buffer);
                 alDieIfError();
@@ -3742,14 +3745,14 @@ MUSIC_PlaySong
 */
 qboolean MUSIC_PlaySong(const char *alias)
 {
-    int             channel_number;
-    song_t         *song;
-    int             songnum;
-    int             channel_to_play_on;
-    int             fading_song;
-    openal_channel *song_channel;
-    unsigned int    loop_start;
-    int             rate;
+    int                          channel_number;
+    song_t                      *song;
+    int                          songnum;
+    int                          channel_to_play_on;
+    int                          fading_song;
+    openal_channel_two_d_stream *song_channel;
+    unsigned int                 loop_start;
+    int                          rate;
 
     fading_song = 0;
     songnum     = MUSIC_FindSong(alias);
@@ -3785,8 +3788,7 @@ qboolean MUSIC_PlaySong(const char *alias)
         MUSIC_StopChannel(channel_to_play_on);
     }
 
-    //if (!S_OPENAL_LoadMP3(FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), song->path), song_channel)) {
-    if (!S_OPENAL_LoadMP3(song->path, song_channel)) {
+    if (!song_channel->queue_stream(song->path)) {
         Com_DPrintf("Could not start music file '%s'!", song->path);
         return false;
     }
@@ -3934,6 +3936,7 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
     const char      *pszRealName;
     float            fVolume     = 1.0;
     AliasListNode_t *pSoundAlias = NULL;
+    void            *stream = NULL;
 
     if (!s_bSoundStarted) {
         return;
@@ -3962,8 +3965,7 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
 
     pszFilename = FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), pszRealName);
 
-    //if (!S_OPENAL_LoadMP3(pszFilename, &openal.chan_trig_music)) {
-    if (!S_OPENAL_LoadMP3(pszRealName, &openal.chan_trig_music)) {
+    if (!openal.chan_trig_music.queue_stream(pszRealName)) {
         S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music);
         Com_DPrintf("Could not start triggered music '%s'\n", pszName);
         return;
@@ -4178,3 +4180,278 @@ static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx)
 
     return true;
 }
+
+void openal_channel::update()
+{
+
+}
+
+void openal_channel_two_d_stream::stop()
+{
+    openal_channel::stop();
+
+    clear_stream();
+}
+
+bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
+    ALint freq = 0;
+    snd_stream_t* stream;
+    int bytesToRead = 0;
+    int bytesRead;
+    char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    assert(!pSfx->buffer);
+
+    stop();
+
+    sampleLoopCount = 1;
+
+    this->pSfx = pSfx;
+    Q_strncpyz(this->fileName, pSfx->name, sizeof(this->fileName));
+
+    streamHandle = S_CodecLoad(pSfx->name, NULL);
+    if (!streamHandle) {
+        qalDeleteBuffers(1, &pSfx->buffer);
+        alDieIfError();
+
+        Com_Printf("OpenAL: Failed to load MP3.\n");
+        return false;
+    }
+
+    stream = (snd_stream_t*)streamHandle;
+    pSfx->info.channels = stream->info.channels;
+    pSfx->info.dataofs = stream->info.dataofs;
+    pSfx->info.datasize = stream->info.size;
+    pSfx->info.rate = stream->info.rate;
+    pSfx->info.samples = stream->info.samples;
+    pSfx->info.width = stream->info.width;
+
+    pSfx->info.format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+    if (!pSfx->info.format) {
+        Com_Printf(
+            "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
+            pSfx->info.channels,
+            (int)(pSfx->info.width * 8.f),
+            pSfx->name
+        );
+
+        S_CodecCloseStream(stream);
+        return false;
+    }
+
+    qalGenBuffers(MAX_STREAM_BUFFERS, buffers);
+    alDieIfError();
+
+    // Read a smaller sample
+    bytesToRead = Q_min(stream->info.width * stream->info.channels * (MAX_BUFFER_SAMPLES / 2), sizeof(rawData));
+    bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    if (!bytesRead) {
+        // Valid stream but no data?
+        S_CodecCloseStream(stream);
+        return true;
+    }
+
+    qalBufferData(buffers[currentBuf], pSfx->info.format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+
+    qalSourceStop(source);
+    alDieIfError();
+
+    iBaseRate = stream->info.rate;
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+    streaming = true;
+
+    return true;
+}
+
+void openal_channel_two_d_stream::set_sample_loop_count(S32 count)
+{
+    sampleLoopCount = count;
+    sampleLooped = 0;
+}
+
+openal_channel_two_d_stream::openal_channel_two_d_stream() {
+    int i;
+
+    streamHandle = NULL;
+    for (i = 0; i < MAX_STREAM_BUFFERS; i++) {
+        buffers[i] = 0;
+    }
+    currentBuf = 0;
+    sampleLoopCount = 0;
+    sampleLooped = 0;
+    streaming = false;
+}
+
+void openal_channel_two_d_stream::update()
+{
+    snd_stream_t* stream = (snd_stream_t*)streamHandle;
+    int bytesToRead, bytesRead;
+    ALuint format;
+    ALint numProcessedBuffers = 0;
+    ALint numQueuedBuffers = 0;
+    ALint state = get_state();
+    // 2 channels with a width of 2
+    char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    if (!streaming) {
+        return;
+    }
+
+    qalGetSourcei(source, AL_BUFFERS_PROCESSED, &numProcessedBuffers);
+    alDieIfError();
+
+    qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
+    alDieIfError();
+
+    // Unqueue processed buffers
+    while (numProcessedBuffers-- > 0) {
+        ALuint tmpBuffer;
+        qalSourceUnqueueBuffers(source, 1, &tmpBuffer);
+    }
+
+    if (numQueuedBuffers >= MAX_STREAM_BUFFERS) {
+        return;
+    }
+
+    if (sampleLoopCount && sampleLooped >= sampleLoopCount) {
+        if (!is_playing()) {
+            // Can clear the stream
+            clear_stream();
+        }
+        return;
+    }
+
+    bytesToRead = Q_min(stream->info.width * stream->info.channels * MAX_BUFFER_SAMPLES, sizeof(rawData));
+
+    format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+
+    bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    if (!bytesRead) {
+        S_CodecCloseStream(stream);
+
+        sampleLooped++;
+        if (sampleLoopCount && sampleLooped >= sampleLoopCount) {
+            // Finished the last loop
+            streamHandle = NULL;
+            return;
+        }
+
+        streamHandle = S_CodecLoad(this->fileName, NULL);
+        if (!streamHandle) {
+            clear_stream();
+            return;
+        }
+
+        stream = (snd_stream_t*)streamHandle;
+        //
+        // Re-read the format, we never know...
+        //
+        format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+        bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+        if (!bytesRead) {
+            S_CodecCloseStream(stream);
+            streamHandle = NULL;
+            return;
+        }
+    }
+
+    qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+}
+
+bool openal_channel_two_d_stream::queue_stream(const char* fileName) {
+    
+    ALint freq = 0;
+    ALuint format = 0;
+    snd_stream_t* stream;
+    int bytesToRead = 0;
+    int bytesRead;
+    ALuint old = 0;
+    int i;
+    char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    // Store the filename so it can be looped later
+    Q_strncpyz(this->fileName, fileName, sizeof(this->fileName));
+    clear_stream();
+
+    sampleLoopCount = 1;
+
+    //
+    // Load the file
+    //
+    streamHandle = S_CodecLoad(this->fileName, NULL);
+    if (!streamHandle) {
+        return false;
+    }
+    stream = (snd_stream_t*)streamHandle;
+
+    iStartTime = cl.serverTime;
+    iEndTime = (int)(cl.serverTime + (stream->info.samples / stream->info.rate * 1000.f));
+
+    format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+    if (!format) {
+        Com_Printf(
+            "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
+            pSfx->info.channels,
+            (int)(pSfx->info.width * 8.f),
+            pSfx->name
+        );
+
+        S_CodecCloseStream(stream);
+        return false;
+    }
+
+    qalGenBuffers(MAX_STREAM_BUFFERS, buffers);
+    alDieIfError();
+
+    // Read a smaller sample
+    bytesToRead = Q_min(stream->info.width * stream->info.channels * (MAX_BUFFER_SAMPLES / 2), sizeof(rawData));
+    bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    if (!bytesRead) {
+        // Valid stream but no data?
+        return true;
+    }
+
+    qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+
+    streaming = true;
+
+    return true;
+}
+
+void openal_channel_two_d_stream::clear_stream() {
+    if (!streaming) {
+        return;
+    }
+
+    qalSourceStop(source);
+    qalSourcei(source, AL_BUFFER, 0);
+    qalSourceUnqueueBuffers(source, MAX_STREAM_BUFFERS, buffers);
+    qalDeleteBuffers(1, buffers);
+
+    if (streamHandle) {
+        S_CodecCloseStream((snd_stream_t*)streamHandle);
+    }
+
+    fileName[0] = 0;
+    streamHandle = NULL;
+
+    currentBuf = 0;
+    streaming = false;
+    sampleLooped = 0;
+}
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index f786c465..26f63a32 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -45,6 +45,9 @@ typedef unsigned int U32;
 #define OPENAL_CHANNEL_TRIGGER_MUSIC_ID (OPENAL_CHANNEL_MP3_ID + 1)
 #define OPENAL_CHANNEL_MOVIE_ID         (OPENAL_CHANNEL_TRIGGER_MUSIC_ID + 1)
 
+#define MAX_STREAM_BUFFERS 16
+#define MAX_BUFFER_SAMPLES 16384
+
 typedef enum {
     FADE_NONE,
     FADE_IN,
@@ -103,7 +106,7 @@ struct openal_channel {
 
 public:
     void play();
-    void stop();
+    virtual void stop();
     void pause();
 
     void  set_no_3d();
@@ -119,7 +122,7 @@ public:
     bool is_playing();
 
     void force_free();
-    bool set_sfx(sfx_t *pSfx);
+    virtual bool set_sfx(sfx_t *pSfx);
 
     void start_sample();
     void stop_sample();
@@ -136,20 +139,46 @@ public:
     U32  sample_loop_count();
     void set_sample_offset(U32 offset);
     void set_sample_ms_offset(U32 offset);
-    void set_sample_loop_count(S32 count);
+    virtual void set_sample_loop_count(S32 count);
     void set_sample_loop_block(S32 start_offset, S32 end_offset);
 
     U32 sample_status();
+
+public:
+    virtual void update();
+};
+
+struct openal_channel_two_d_stream : public openal_channel {
+private:
+    char fileName[64];
+    void *streamHandle;
+    unsigned int buffers[MAX_STREAM_BUFFERS];
+    unsigned int currentBuf;
+    int sampleLoopCount;
+    int sampleLooped;
+    bool streaming;
+
+public:
+    openal_channel_two_d_stream();
+
+    void stop() override;
+    bool set_sfx(sfx_t* pSfx) override;
+    void set_sample_loop_count(S32 count) override;
+    void update() override;
+    bool queue_stream(const char* fileName);
+
+private:
+    void clear_stream();
 };
 
 struct openal_internal_t {
     openal_channel chan_3D[MAX_OPENAL_CHANNELS_3D];
     openal_channel chan_2D[MAX_OPENAL_CHANNELS_2D];
-    openal_channel chan_2D_stream[MAX_OPENAL_CHANNELS_2D_STREAM];
-    openal_channel chan_song[MAX_OPENAL_SONGS];
-    openal_channel chan_mp3;
-    openal_channel chan_trig_music;
-    openal_channel chan_movie;
+    openal_channel_two_d_stream chan_2D_stream[MAX_OPENAL_CHANNELS_2D_STREAM];
+    openal_channel_two_d_stream chan_song[MAX_OPENAL_SONGS];
+    openal_channel_two_d_stream chan_mp3;
+    openal_channel_two_d_stream chan_trig_music;
+    openal_channel_two_d_stream chan_movie;
 
     // Pointers to channels
     openal_channel *channel[MAX_OPENAL_CHANNELS];

From 679bfb90eae3791fd08873d7a67e528a48742882 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Aug 2024 20:38:39 +0200
Subject: [PATCH 0617/2040] Fix accessing 8th leaves element before finishing
 the loop

This caused the 8th element to be taken into account when enabling optimizations with GCC (invalid pointer to the leaf)
---
 code/renderer/tr_sphere_shade.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 0a039ef2..99ea54e2 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -1049,8 +1049,12 @@ static void RB_Sphere_BuildStaticLights()
     if (tr.world->vis) {
         int cntarea;
 
-        for (curleaf = 0, leaf = backEnd.currentSphere->leaves[curleaf]; curleaf < 8 && leaf;
-             curleaf++, leaf   = backEnd.currentSphere->leaves[curleaf]) {
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
             cntarea = leaf->numlights;
 
             if (cntarea) {

From 81b8fe3f61ac0a2390b2f91513ffb10afa38ee6d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 13 Aug 2024 20:42:45 +0200
Subject: [PATCH 0618/2040] Use a pointer to an array instead of accessing the
 tiki mesh field directly to avoid loop badly optimized due to the compiler
 thinking there can be only 1 element

This fixes #337
---
 code/tiki/tiki_files.cpp | 54 ++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 8ebe3ca0..fa23b8b2 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -302,8 +302,9 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
 
     struct {
         dtiki_t   tiki;
-        short int buffer[1000];
+        short int buffer[32];
     } temp;
+    dtiki_t* temp_tiki;
 
     //int skel;
     dloadsurface_t     loadsurfaces[24];
@@ -317,8 +318,12 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     qboolean           found;
     byte              *start_ptr, *max_ptr, *ptr;
 
+    // Use a pointer directly to avoid compiler wrongly optimizing out loops
+    // as the mesh field of the tiki is an array of 1 element
+    temp_tiki = &temp.tiki;
+
     TIKI_LoadSetup(
-        &temp.tiki,
+        temp_tiki,
         tikianim->name,
         loadsurfaces,
         &numSurfacesSetUp,
@@ -326,33 +331,33 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
         tikianim->modelDataSize,
         keyValues
     );
-    if (!temp.tiki.numMeshes) {
+    if (!temp_tiki->numMeshes) {
         Com_Printf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
         return NULL;
     }
 
     defsize = sizeof(dtiki_t) - sizeof(tiki->mesh);
-    defsize += temp.tiki.numMeshes * sizeof(short);
+    defsize += temp_tiki->numMeshes * sizeof(short);
     defsize += strlen(name) + 1;
     defsize = PAD(defsize, sizeof(void *));
-    defsize += temp.tiki.num_surfaces * sizeof(dtikisurface_t);
+    defsize += temp_tiki->num_surfaces * sizeof(dtikisurface_t);
 
     tiki = (dtiki_t *)TIKI_Alloc(defsize);
     memset(tiki, 0, defsize);
 
     start_ptr = (byte *)tiki;
     max_ptr   = start_ptr + defsize;
-    ptr       = start_ptr + sizeof(dtiki_t) - sizeof(tiki->mesh) + temp.tiki.numMeshes * sizeof(tiki->mesh[0]);
+    ptr       = start_ptr + sizeof(dtiki_t) - sizeof(tiki->mesh) + temp_tiki->numMeshes * sizeof(tiki->mesh[0]);
 
     tiki->a = tikianim;
     tiki->m_boneList.InitChannels();
     tiki->skeletor     = NULL;
-    tiki->load_scale   = temp.tiki.load_scale;
-    tiki->lod_scale    = temp.tiki.lod_scale;
-    tiki->lod_bias     = temp.tiki.lod_bias;
-    tiki->num_surfaces = temp.tiki.num_surfaces;
-    tiki->numMeshes    = temp.tiki.numMeshes;
-    tiki->radius       = temp.tiki.radius;
+    tiki->load_scale   = temp_tiki->load_scale;
+    tiki->lod_scale    = temp_tiki->lod_scale;
+    tiki->lod_bias     = temp_tiki->lod_bias;
+    tiki->num_surfaces = temp_tiki->num_surfaces;
+    tiki->numMeshes    = temp_tiki->numMeshes;
+    tiki->radius       = temp_tiki->radius;
     tiki->name         = (char *)ptr;
     strcpy(tiki->name, name);
     ptr += strlen(tiki->name) + 1;
@@ -360,12 +365,13 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     tikiSurf = (dtikisurface_t *)ptr;
     tiki->m_boneList.ZeroChannels();
 
-    assert((byte *)(tikiSurf + temp.tiki.num_surfaces) <= max_ptr);
+    assert((byte *)(tikiSurf + temp_tiki->num_surfaces) <= max_ptr);
 
-    for (i = 0; i < temp.tiki.numMeshes; i++) {
-        mesh          = temp.tiki.mesh[i];
+    for (i = 0; i < temp_tiki->numMeshes; i++) {
+        mesh          = temp_tiki->mesh[i];
         tiki->mesh[i] = mesh;
-        skelmodel     = skelcache[mesh].skel;
+
+        skelmodel = skelcache[mesh].skel;
         skelcache[mesh].numuses++;
 
         for (j = 0; j < skelmodel->numBones; j++) {
@@ -374,8 +380,8 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     }
 
     tiki->m_boneList.PackChannels();
-    VectorCopy(temp.tiki.light_offset, tiki->light_offset);
-    VectorCopy(temp.tiki.load_origin, tiki->load_origin);
+    VectorCopy(temp_tiki->light_offset, tiki->light_offset);
+    VectorCopy(temp_tiki->load_origin, tiki->load_origin);
     tiki->surfaces = tikiSurf;
 
     for (i = 0; i < numSurfacesSetUp; i++) {
@@ -386,8 +392,8 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
         surfOffset = 0;
 
         if (strptr || !Q_stricmp(loadsurf->name, "all")) {
-            for (j = 0; j < temp.tiki.numMeshes; j++) {
-                mesh      = temp.tiki.mesh[j];
+            for (j = 0; j < temp_tiki->numMeshes; j++) {
+                mesh      = temp_tiki->mesh[j];
                 skelmodel = TIKI_GetSkel(mesh);
                 surf      = skelmodel->pSurfaces;
 
@@ -407,8 +413,8 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
                 surfOffset += skelmodel->numSurfaces;
             }
         } else {
-            for (j = 0; j < temp.tiki.numMeshes; j++) {
-                mesh      = temp.tiki.mesh[j];
+            for (j = 0; j < temp_tiki->numMeshes; j++) {
+                mesh      = temp_tiki->mesh[j];
                 skelmodel = TIKI_GetSkel(mesh);
                 surf      = skelmodel->pSurfaces;
 
@@ -450,8 +456,8 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
     //  For surfaces without shader
     //  assign them the shader with the same name
     surfOffset = 0;
-    for (i = 0; i < temp.tiki.numMeshes; i++, surfOffset += skelmodel->numSurfaces) {
-        skelmodel = TIKI_GetSkel(temp.tiki.mesh[i]);
+    for (i = 0; i < temp_tiki->numMeshes; i++, surfOffset += skelmodel->numSurfaces) {
+        skelmodel = TIKI_GetSkel(temp_tiki->mesh[i]);
 
         surf = skelmodel->pSurfaces;
 

From f776d842d1d93bc506b157f544b96d8d8282501c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:08:20 +0200
Subject: [PATCH 0619/2040] Don't load sound immediately if they must be
 streamed

This removes more hiccups
---
 code/client/snd_mem_new.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index d1ee0948..374a97f1 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -439,8 +439,6 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         return qfalse;
     }
 
-    // Removed because of OpenAL
-    /*
     if (streamed) {
         //
         // Added in 2.0
@@ -449,10 +447,9 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         sfx->width = 1;
         sfx->iFlags |= SFX_FLAG_STREAMED;
         sfx->time_length = 5000.0;
-        sfx->data = 0;
+        sfx->data = NULL;
         return qtrue;
     }
-    */
 
     if (clc.state != CA_LOADING && !force_load) {
         Com_Printf("**************S_LoadSound: %s\n", fileName);

From 1254146223c7ceaf87323fc9ac4d3fbab7513e01 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 17 Aug 2024 11:09:35 +0200
Subject: [PATCH 0620/2040] Fix streamed sound stopping before end

---
 code/client/snd_openal_new.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index d2037518..bba79e4d 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4365,6 +4365,13 @@ void openal_channel_two_d_stream::update()
     qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
     alDieIfError();
 
+    if (!is_playing()) {
+        // The sample has stopped during stream
+        // Could be because the storage is slow enough for the buffer
+        // or because the storage was powering on after standby
+        play();
+    }
+
     currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
 }
 

From 783c24d6f7198ac91219a47abde551b19f8e33c9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 17 Aug 2024 17:24:17 +0200
Subject: [PATCH 0621/2040] Fix sound never playing from entities that are not
 sent to clients

---
 code/client/snd_openal_new.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index bba79e4d..209cbe13 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1469,6 +1469,13 @@ void S_OPENAL_StartSound(
             if (bSupportWaitTillSoundDone) {
                 pChannel->iTime = 0;
             }
+
+            if (s_entity[iEntNum].time < pChannel->iTime) {
+                // Fixed in OPM
+                //  Not sure if it's the real solution, but script_origin entities are usually
+                //  never sent to client so the sound will immediately get stopped
+                pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
+            }
         } else {
             VectorClear(pChannel->vOrigin);
             pChannel->iTime = 0;

From a399fdf6cf881e954af36e31bad75393dfd5c754 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 17 Aug 2024 21:07:25 +0200
Subject: [PATCH 0622/2040] Removed useless comments

---
 code/client/snd_openal_new.cpp | 65 ----------------------------------
 1 file changed, 65 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 209cbe13..7b86034c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1028,7 +1028,6 @@ static qboolean S_OPENAL_ShouldStart(const vec3_t vOrigin, float fMinDist, float
 
     qalGetListenerfv(AL_POSITION, alvec);
 
-    //VectorScale(alvec, 52.49f, vListenerOrigin);
     VectorCopy(alvec, vListenerOrigin);
     VectorSubtract(vOrigin, vListenerOrigin, vDir);
 
@@ -1259,18 +1258,12 @@ static void S_OPENAL_Start2DSound(
         pChannel->iEntNum = 0;
 
         if (vOrigin) {
-            //pChannel->vOrigin[0] = -vOrigin[0];
-            //pChannel->vOrigin[1] = vOrigin[2];
-            //pChannel->vOrigin[2] = -vOrigin[1];
             VectorCopy(vOrigin, pChannel->vOrigin);
         }
     } else {
         pChannel->iFlags &= ~CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = iRealEntNum;
         if (vOrigin) {
-            //pChannel->vOrigin[0] = -vOrigin[0];
-            //pChannel->vOrigin[1] = vOrigin[2];
-            //pChannel->vOrigin[2] = -vOrigin[1];
             VectorCopy(vOrigin, pChannel->vOrigin);
 
             bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
@@ -1356,7 +1349,6 @@ void S_OPENAL_StartSound(
         return;
     }
 
-    //if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET)) //|| pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
     if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3))
         || iEntChannel == CHAN_MENU || iEntChannel == CHAN_LOCAL) {
         S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
@@ -1437,9 +1429,6 @@ void S_OPENAL_StartSound(
     pChannel->set_velocity(0, 0, 0);
     if (iEntNum == ENTITYNUM_NONE) {
         if (vOrigin) {
-            //pChannel->vOrigin[0] = -vOrigin[0];
-            //pChannel->vOrigin[1] = vOrigin[2];
-            //pChannel->vOrigin[2] = -vOrigin[1];
             VectorCopy(vOrigin, pChannel->vOrigin);
         } else {
             //VectorClear(vOrigin);
@@ -1448,20 +1437,12 @@ void S_OPENAL_StartSound(
             VectorClear(pChannel->vOrigin);
         }
 
-        /*
-        pChannel->set_position(
-            pChannel->vOrigin[0] / 52.49f, pChannel->vOrigin[1] / 52.49f, pChannel->vOrigin[2] / 52.49f
-        );
-        */
         pChannel->set_position(pChannel->vOrigin[0], pChannel->vOrigin[1], pChannel->vOrigin[2]);
         pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = 0;
     } else {
         pChannel->iEntNum = iEntNum;
         if (vOrigin) {
-            //pChannel->vOrigin[0] = -vOrigin[0];
-            //pChannel->vOrigin[1] = vOrigin[2];
-            //pChannel->vOrigin[2] = -vOrigin[1];
             VectorCopy(vOrigin, pChannel->vOrigin);
 
             bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
@@ -1558,12 +1539,6 @@ void S_OPENAL_AddLoopingSound(
     }
 
     pLoopSound             = &openal.loop_sounds[iFreeLoopSound];
-    //pLoopSound->vOrigin[0] = -vOrigin[0];
-    //pLoopSound->vOrigin[1] = vOrigin[2];
-    //pLoopSound->vOrigin[2] = -vOrigin[1];
-    //pLoopSound->vVelocity[0] = -vVelocity[0] / 52.49f / 500.f;
-    //pLoopSound->vVelocity[1] = vVelocity[2] / 52.49f / 500.f;
-    //pLoopSound->vVelocity[2] = -vVelocity[1] / 52.49f / 500.f;
     VectorCopy(vOrigin, pLoopSound->vOrigin);
     VectorCopy(vVelocity, pLoopSound->vVelocity);
     pLoopSound->pSfx        = pSfx;
@@ -1815,12 +1790,6 @@ static int S_OPENAL_Start3DLoopSound(
         return -1;
     }
 
-    /*
-    pChan3D->set_position(vLoopOrigin[0] / 52.49f, pLoopSound->vVelocity[1] / 52.49f, vLoopOrigin[2] / 52.49f);
-    pChan3D->set_velocity(
-        pLoopSound->vVelocity[0] / 52.49f, vLoopOrigin[1] / 52.49f, pLoopSound->vVelocity[2] / 52.49f
-    );
-    */
     pChan3D->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
     pChan3D->set_velocity(pLoopSound->vVelocity[0], pLoopSound->vVelocity[1], pLoopSound->vVelocity[2]);
     pChan3D->pSfx = pLoopSound->pSfx;
@@ -1874,7 +1843,6 @@ static bool S_OPENAL_UpdateLoopSound(
 
     pChannel->iStartTime = cl.serverTime;
 
-    //if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) // || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
     if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
         || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
         vec3_t vOrigin;
@@ -1904,7 +1872,6 @@ static bool S_OPENAL_UpdateLoopSound(
         pChannel->set_gain(fVolume);
         pChannel->set_sample_pan(iPan);
     } else {
-        //pChannel->set_position(vLoopOrigin[0] / 52.49f, vLoopOrigin[1] / 52.49f, vLoopOrigin[2] / 52.49f);
         pChannel->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
         pChannel->fVolume = fVolumeToPlay;
         pChannel->set_gain(fVolumeToPlay);
@@ -1944,7 +1911,6 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
 
     qalGetListenerfv(AL_POSITION, alvec);
     VectorCopy(alvec, vListenerOrigin);
-    //VectorScale(alvec, 52.49f, vListenerOrigin);
 
     for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
         vec3_t vDir;
@@ -2094,7 +2060,6 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
         }
 
-        //if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) //|| pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
         if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
             || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
             iChannel = S_OPENAL_Start2DLoopSound(
@@ -2170,9 +2135,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Position
     //
-    //alvec[0] = -vHeadPos[0] / 52.49f;
-    //alvec[1] = vHeadPos[2] / 52.49f;
-    //alvec[2] = -vHeadPos[1] / 52.49f;
     VectorCopy(vHeadPos, alvec);
     VectorCopy(alvec, vListenerOrigin);
     qalListenerfv(AL_POSITION, alvec);
@@ -2181,14 +2143,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Orientation
     //
-    /*
-    alorientation[0][0] = -vAxis[0][0];
-    alorientation[0][1] = vAxis[2][0];
-    alorientation[0][2] = -vAxis[1][0];
-    alorientation[1][0] = -vAxis[0][2];
-    alorientation[1][1] = vAxis[2][2];
-    alorientation[1][2] = -vAxis[1][2];
-    */
     alorientation[0][0] = vAxis[0][0];
     alorientation[0][1] = vAxis[0][1];
     alorientation[0][2] = vAxis[0][2];
@@ -2198,9 +2152,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     qalListenerfv(AL_ORIENTATION, (const ALfloat *)alorientation);
     alDieIfError();
 
-    //vTempAxis[0] = -vAxis[0][1];
-    //vTempAxis[1] = vAxis[2][1];
-    //vTempAxis[2] = -vAxis[1][1];
     VectorCopy(vAxis[1], vTempAxis);
 
     fVolume = 1;
@@ -2231,7 +2182,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                     fVolume = fMaxVolume;
                     iPan    = 64;
                 } else {
-                    //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
                     pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 }
             } else {
@@ -2249,7 +2199,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                                 * fMaxVolume;
                     }
                 } else {
-                    //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
                     pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 }
             }
@@ -2259,7 +2208,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                 fVolume = fMaxVolume;
                 iPan    = 64;
             } else {
-                //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
                 pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
             }
         } else {
@@ -2271,9 +2219,6 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                 }
             } else {
                 VectorCopy(s_entity[pChannel->iEntNum].position, vEntOrigin);
-                //vOrigin[1] = vEntOrigin[2] / 52.49f;
-                //vOrigin[0] = -vEntOrigin[0] / 52.49f;
-                //vOrigin[2] = -vEntOrigin[1] / 52.49f;
                 VectorCopy(vEntOrigin, vOrigin);
                 VectorCopy(vOrigin, pChannel->vOrigin);
                 pChannel->iTime = s_entity[pChannel->iEntNum].time;
@@ -2306,15 +2251,9 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                         (1.0 - (fDist - pChannel->fMinDist) / (pChannel->fMaxDist - pChannel->fMinDist)) * fMaxVolume;
                 }
             } else {
-                //pChannel->set_position(vOrigin[0] / 52.49f, vOrigin[1] / 52.49f, vOrigin[2] / 52.49f);
                 pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 VectorCopy(s_entity[pChannel->iEntNum].velocity, vEntVelocity);
-
-                //vVelocity[0] = -vEntVelocity[0] / 52.49f / 500.f;
-                //vVelocity[1] = vEntVelocity[2] / 52.49f / 500.f;
-                //vVelocity[2] = -vEntVelocity[1] / 52.49f / 500.f;
                 VectorCopy(vEntVelocity, vVelocity);
-                //pChannel->set_velocity(vVelocity[0] / 52.49f, vVelocity[1] / 52.49f, vVelocity[2] / 52.49f);
                 pChannel->set_velocity(vVelocity[0], vVelocity[1], vVelocity[2]);
             }
         }
@@ -3991,10 +3930,6 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
     if (!autostart) {
         openal.chan_trig_music.pause();
     }
-
-    //if (autostart) {
-    //    openal.chan_trig_music.play();
-    //}
 }
 
 /*

From 377b0896c255a09f73a44f2e73b97fdf93d16686 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 18 Aug 2024 12:03:01 +0200
Subject: [PATCH 0623/2040] Fix drivable vehicle not having the `death`
 waittill after loading from save

This caused some vehicles to be destroyed immediately after being handled from script (like the halftrack in t2l1)
---
 code/fgame/vehicle.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 158ee1dd..d8a7efb6 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6857,11 +6857,6 @@ DrivableVehicle::DrivableVehicle
 */
 DrivableVehicle::DrivableVehicle()
 {
-    if (LoadingSavegame) {
-        // Archive function will setup all necessary data
-        return;
-    }
-
     AddWaitTill(STRING_DEATH);
 
     drivable = true;

From 8c59d6020e138924518f370eab24effbf2ffdd50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 18 Aug 2024 13:20:26 +0200
Subject: [PATCH 0624/2040] Backported ioquake3 fixes for
 https://www.cvedetails.com/cve/CVE-2017-11721/ (Buffer overflow)

---
 code/qcommon/huffman.c   | 454 ---------------------------------------
 code/qcommon/huffman.cpp |  52 +++--
 code/qcommon/msg.cpp     |  43 ++--
 code/qcommon/qcommon.h   |   6 +-
 4 files changed, 65 insertions(+), 490 deletions(-)
 delete mode 100644 code/qcommon/huffman.c

diff --git a/code/qcommon/huffman.c b/code/qcommon/huffman.c
deleted file mode 100644
index 0283fb70..00000000
--- a/code/qcommon/huffman.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-/* This is based on the Adaptive Huffman algorithm described in Sayood's Data
- * Compression book.  The ranks are not actually stored, but implicitly defined
- * by the location of a node within a doubly-linked list */
-
-#include "q_shared.h"
-#include "qcommon.h"
-
-static int			bloc = 0;
-
-void	Huff_putBit( int bit, byte *fout, int *offset) {
-	bloc = *offset;
-	if ((bloc&7) == 0) {
-		fout[(bloc>>3)] = 0;
-	}
-	fout[(bloc>>3)] |= bit << (bloc&7);
-	bloc++;
-	*offset = bloc;
-}
-
-int		Huff_getBloc(void)
-{
-	return bloc;
-}
-
-void	Huff_setBloc(int _bloc)
-{
-	bloc = _bloc;
-}
-
-int		Huff_getBit( byte *fin, int *offset) {
-	int t;
-	bloc = *offset;
-	t = (fin[(bloc>>3)] >> (bloc&7)) & 0x1;
-	bloc++;
-	*offset = bloc;
-	return t;
-}
-
-/* Add a bit to the output file (buffered) */
-static void add_bit (char bit, byte *fout) {
-	if ((bloc&7) == 0) {
-		fout[(bloc>>3)] = 0;
-	}
-	fout[(bloc>>3)] |= bit << (bloc&7);
-	bloc++;
-}
-
-/* Receive one bit from the input file (buffered) */
-static int get_bit (byte *fin) {
-	int t;
-	t = (fin[(bloc>>3)] >> (bloc&7)) & 0x1;
-	bloc++;
-	return t;
-}
-
-static node_t **get_ppnode(huff_t* huff) {
-	node_t **tppnode;
-	if (!huff->freelist) {
-		return &(huff->nodePtrs[huff->blocPtrs++]);
-	} else {
-		tppnode = huff->freelist;
-		huff->freelist = (node_t **)*tppnode;
-		return tppnode;
-	}
-}
-
-static void free_ppnode(huff_t* huff, node_t **ppnode) {
-	*ppnode = (node_t *)huff->freelist;
-	huff->freelist = ppnode;
-}
-
-/* Swap the location of these two nodes in the tree */
-static void swap (huff_t* huff, node_t *node1, node_t *node2) { 
-	node_t *par1, *par2;
-
-	par1 = node1->parent;
-	par2 = node2->parent;
-
-	if (par1) {
-		if (par1->left == node1) {
-			par1->left = node2;
-		} else {
-	      par1->right = node2;
-		}
-	} else {
-		huff->tree = node2;
-	}
-
-	if (par2) {
-		if (par2->left == node2) {
-			par2->left = node1;
-		} else {
-			par2->right = node1;
-		}
-	} else {
-		huff->tree = node1;
-	}
-  
-	node1->parent = par2;
-	node2->parent = par1;
-}
-
-/* Swap these two nodes in the linked list (update ranks) */
-static void swaplist(node_t *node1, node_t *node2) {
-	node_t *par1;
-
-	par1 = node1->next;
-	node1->next = node2->next;
-	node2->next = par1;
-
-	par1 = node1->prev;
-	node1->prev = node2->prev;
-	node2->prev = par1;
-
-	if (node1->next == node1) {
-		node1->next = node2;
-	}
-	if (node2->next == node2) {
-		node2->next = node1;
-	}
-	if (node1->next) {
-		node1->next->prev = node1;
-	}
-	if (node2->next) {
-		node2->next->prev = node2;
-	}
-	if (node1->prev) {
-		node1->prev->next = node1;
-	}
-	if (node2->prev) {
-		node2->prev->next = node2;
-	}
-}
-
-/* Do the increments */
-static void increment(huff_t* huff, node_t *node) {
-	node_t *lnode;
-
-	if (!node) {
-		return;
-	}
-
-	if (node->next != NULL && node->next->weight == node->weight) {
-	    lnode = *node->head;
-		if (lnode != node->parent) {
-			swap(huff, lnode, node);
-		}
-		swaplist(lnode, node);
-	}
-	if (node->prev && node->prev->weight == node->weight) {
-		*node->head = node->prev;
-	} else {
-	    *node->head = NULL;
-		free_ppnode(huff, node->head);
-	}
-	node->weight++;
-	if (node->next && node->next->weight == node->weight) {
-		node->head = node->next->head;
-	} else { 
-		node->head = get_ppnode(huff);
-		*node->head = node;
-	}
-	if (node->parent) {
-		increment(huff, node->parent);
-		if (node->prev == node->parent) {
-			swaplist(node, node->parent);
-			if (*node->head == node) {
-				*node->head = node->parent;
-			}
-		}
-	}
-}
-
-void Huff_addRef(huff_t* huff, byte ch) {
-	node_t *tnode, *tnode2;
-	if (huff->loc[ch] == NULL) { /* if this is the first transmission of this node */
-		tnode = &(huff->nodeList[huff->blocNode++]);
-		tnode2 = &(huff->nodeList[huff->blocNode++]);
-
-		tnode2->symbol = INTERNAL_NODE;
-		tnode2->weight = 1;
-		tnode2->next = huff->lhead->next;
-		if (huff->lhead->next) {
-			huff->lhead->next->prev = tnode2;
-			if (huff->lhead->next->weight == 1) {
-				tnode2->head = huff->lhead->next->head;
-			} else {
-				tnode2->head = get_ppnode(huff);
-				*tnode2->head = tnode2;
-			}
-		} else {
-			tnode2->head = get_ppnode(huff);
-			*tnode2->head = tnode2;
-		}
-		huff->lhead->next = tnode2;
-		tnode2->prev = huff->lhead;
- 
-		tnode->symbol = ch;
-		tnode->weight = 1;
-		tnode->next = huff->lhead->next;
-		if (huff->lhead->next) {
-			huff->lhead->next->prev = tnode;
-			if (huff->lhead->next->weight == 1) {
-				tnode->head = huff->lhead->next->head;
-			} else {
-				/* this should never happen */
-				tnode->head = get_ppnode(huff);
-				*tnode->head = tnode2;
-		    }
-		} else {
-			/* this should never happen */
-			tnode->head = get_ppnode(huff);
-			*tnode->head = tnode;
-		}
-		huff->lhead->next = tnode;
-		tnode->prev = huff->lhead;
-		tnode->left = tnode->right = NULL;
- 
-		if (huff->lhead->parent) {
-			if (huff->lhead->parent->left == huff->lhead) { /* lhead is guaranteed to by the NYT */
-				huff->lhead->parent->left = tnode2;
-			} else {
-				huff->lhead->parent->right = tnode2;
-			}
-		} else {
-			huff->tree = tnode2; 
-		}
- 
-		tnode2->right = tnode;
-		tnode2->left = huff->lhead;
- 
-		tnode2->parent = huff->lhead->parent;
-		huff->lhead->parent = tnode->parent = tnode2;
-     
-		huff->loc[ch] = tnode;
- 
-		increment(huff, tnode2->parent);
-	} else {
-		increment(huff, huff->loc[ch]);
-	}
-}
-
-/* Get a symbol */
-int Huff_Receive (node_t *node, int *ch, byte *fin) {
-	while (node && node->symbol == INTERNAL_NODE) {
-		if (get_bit(fin)) {
-			node = node->right;
-		} else {
-			node = node->left;
-		}
-	}
-	if (!node) {
-		return 0;
-//		Com_Error(ERR_DROP, "Illegal tree!");
-	}
-	return (*ch = node->symbol);
-}
-
-/* Get a symbol */
-void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int maxoffset) {
-	bloc = *offset;
-	while (node && node->symbol == INTERNAL_NODE) {
-		if (bloc >= maxoffset) {
-			*ch = 0;
-			*offset = maxoffset + 1;
-			return;
-		}
-		if (get_bit(fin)) {
-			node = node->right;
-		} else {
-			node = node->left;
-		}
-	}
-	if (!node) {
-		*ch = 0;
-		return;
-//		Com_Error(ERR_DROP, "Illegal tree!");
-	}
-	*ch = node->symbol;
-	*offset = bloc;
-}
-
-/* Send the prefix code for this node */
-static void send(node_t *node, node_t *child, byte *fout, int maxoffset) {
-	if (node->parent) {
-		send(node->parent, node, fout, maxoffset);
-	}
-	if (child) {
-		if (bloc >= maxoffset) {
-			bloc = maxoffset + 1;
-			return;
-		}
-		if (node->right == child) {
-			add_bit(1, fout);
-		} else {
-			add_bit(0, fout);
-		}
-	}
-}
-
-/* Send a symbol */
-void Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset) {
-	int i;
-	if (huff->loc[ch] == NULL) { 
-		/* node_t hasn't been transmitted, send a NYT, then the symbol */
-		Huff_transmit(huff, NYT, fout, maxoffset);
-		for (i = 7; i >= 0; i--) {
-			add_bit((char)((ch >> i) & 0x1), fout);
-		}
-	} else {
-		send(huff->loc[ch], NULL, fout, maxoffset);
-	}
-}
-
-void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int maxoffset) {
-	bloc = *offset;
-	send(huff->loc[ch], NULL, fout, maxoffset);
-	*offset = bloc;
-}
-
-void Huff_Decompress(msg_t *mbuf, int offset) {
-	int			ch, cch, i, j, size;
-	byte		seq[65536];
-	byte*		buffer;
-	huff_t		huff;
-
-	size = mbuf->cursize - offset;
-	buffer = mbuf->data + offset;
-
-	if ( size <= 0 ) {
-		return;
-	}
-
-	Com_Memset(&huff, 0, sizeof(huff_t));
-	// Initialize the tree & list with the NYT node 
-	huff.tree = huff.lhead = huff.ltail = huff.loc[NYT] = &(huff.nodeList[huff.blocNode++]);
-	huff.tree->symbol = NYT;
-	huff.tree->weight = 0;
-	huff.lhead->next = huff.lhead->prev = NULL;
-	huff.tree->parent = huff.tree->left = huff.tree->right = NULL;
-
-	cch = buffer[0]*256 + buffer[1];
-	// don't overflow with bad messages
-	if ( cch > mbuf->maxsize - offset ) {
-		cch = mbuf->maxsize - offset;
-	}
-	bloc = 16;
-
-	for ( j = 0; j < cch; j++ ) {
-		ch = 0;
-		// don't overflow reading from the messages
-		// FIXME: would it be better to have an overflow check in get_bit ?
-		if ( (bloc >> 3) > size ) {
-			seq[j] = 0;
-			break;
-		}
-		Huff_Receive(huff.tree, &ch, buffer);				/* Get a character */
-		if ( ch == NYT ) {								/* We got a NYT, get the symbol associated with it */
-			ch = 0;
-			for ( i = 0; i < 8; i++ ) {
-				ch = (ch<<1) + get_bit(buffer);
-			}
-		}
-    
-		seq[j] = ch;									/* Write symbol */
-
-		Huff_addRef(&huff, (byte)ch);								/* Increment node */
-	}
-	mbuf->cursize = cch + offset;
-	Com_Memcpy(mbuf->data + offset, seq, cch);
-}
-
-extern 	int oldsize;
-
-void Huff_Compress(msg_t *mbuf, int offset) {
-	int			i, ch, size;
-	byte		seq[65536];
-	byte*		buffer;
-	huff_t		huff;
-
-	size = mbuf->cursize - offset;
-	buffer = mbuf->data + offset;
-
-	if (size<=0) {
-		return;
-	}
-
-	Com_Memset(&huff, 0, sizeof(huff_t));
-	// Add the NYT (not yet transmitted) node into the tree/list */
-	huff.tree = huff.lhead = huff.loc[NYT] =  &(huff.nodeList[huff.blocNode++]);
-	huff.tree->symbol = NYT;
-	huff.tree->weight = 0;
-	huff.lhead->next = huff.lhead->prev = NULL;
-	huff.tree->parent = huff.tree->left = huff.tree->right = NULL;
-
-	seq[0] = (size>>8);
-	seq[1] = size&0xff;
-
-	bloc = 16;
-
-	for (i=0; i<size; i++ ) {
-		ch = buffer[i];
-		Huff_transmit(&huff, ch, seq, size<<3);						/* Transmit symbol */
-		Huff_addRef(&huff, (byte)ch);								/* Do update */
-	}
-
-	bloc += 8;												// next byte
-
-	mbuf->cursize = (bloc>>3) + offset;
-	Com_Memcpy(mbuf->data+offset, seq, (bloc>>3));
-}
-
-void Huff_Init(huffman_t *huff) {
-
-	Com_Memset(&huff->compressor, 0, sizeof(huff_t));
-	Com_Memset(&huff->decompressor, 0, sizeof(huff_t));
-
-	// Initialize the tree & list with the NYT node 
-	huff->decompressor.tree = huff->decompressor.lhead = huff->decompressor.ltail = huff->decompressor.loc[NYT] = &(huff->decompressor.nodeList[huff->decompressor.blocNode++]);
-	huff->decompressor.tree->symbol = NYT;
-	huff->decompressor.tree->weight = 0;
-	huff->decompressor.lhead->next = huff->decompressor.lhead->prev = NULL;
-	huff->decompressor.tree->parent = huff->decompressor.tree->left = huff->decompressor.tree->right = NULL;
-
-	// Add the NYT (not yet transmitted) node into the tree/list */
-	huff->compressor.tree = huff->compressor.lhead = huff->compressor.loc[NYT] =  &(huff->compressor.nodeList[huff->compressor.blocNode++]);
-	huff->compressor.tree->symbol = NYT;
-	huff->compressor.tree->weight = 0;
-	huff->compressor.lhead->next = huff->compressor.lhead->prev = NULL;
-	huff->compressor.tree->parent = huff->compressor.tree->left = huff->compressor.tree->right = NULL;
-}
-
diff --git a/code/qcommon/huffman.cpp b/code/qcommon/huffman.cpp
index b552390b..761717a8 100644
--- a/code/qcommon/huffman.cpp
+++ b/code/qcommon/huffman.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
-int bloc = 0;
+static int			bloc = 0;
 
 void	Huff_putBit( int bit, byte *fout, int *offset) {
 	bloc = *offset;
@@ -39,6 +39,16 @@ void	Huff_putBit( int bit, byte *fout, int *offset) {
 	*offset = bloc;
 }
 
+int		Huff_getBloc(void)
+{
+	return bloc;
+}
+
+void	Huff_setBloc(int _bloc)
+{
+	bloc = _bloc;
+}
+
 int		Huff_getBit( byte *fin, int *offset) {
 	int t;
 	bloc = *offset;
@@ -263,15 +273,20 @@ int Huff_Receive (node_t *node, int *ch, byte *fin) {
 	}
 	if (!node) {
 		return 0;
-//		Com_Error(ERR_DROP, "Illegal tree!\n");
+//		Com_Error(ERR_DROP, "Illegal tree!");
 	}
 	return (*ch = node->symbol);
 }
 
 /* Get a symbol */
-void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset) {
+void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int maxoffset) {
 	bloc = *offset;
 	while (node && node->symbol == INTERNAL_NODE) {
+		if (bloc >= maxoffset) {
+			*ch = 0;
+			*offset = maxoffset + 1;
+			return;
+		}
 		if (get_bit(fin)) {
 			node = node->right;
 		} else {
@@ -281,18 +296,22 @@ void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset) {
 	if (!node) {
 		*ch = 0;
 		return;
-//		Com_Error(ERR_DROP, "Illegal tree!\n");
+//		Com_Error(ERR_DROP, "Illegal tree!");
 	}
 	*ch = node->symbol;
 	*offset = bloc;
 }
 
 /* Send the prefix code for this node */
-static void send(node_t *node, node_t *child, byte *fout) {
+static void send(node_t *node, node_t *child, byte *fout, int maxoffset) {
 	if (node->parent) {
-		send(node->parent, node, fout);
+		send(node->parent, node, fout, maxoffset);
 	}
 	if (child) {
+		if (bloc >= maxoffset) {
+			bloc = maxoffset + 1;
+			return;
+		}
 		if (node->right == child) {
 			add_bit(1, fout);
 		} else {
@@ -302,22 +321,22 @@ static void send(node_t *node, node_t *child, byte *fout) {
 }
 
 /* Send a symbol */
-void Huff_transmit (huff_t *huff, int ch, byte *fout) {
+void Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset) {
 	int i;
 	if (huff->loc[ch] == NULL) { 
 		/* node_t hasn't been transmitted, send a NYT, then the symbol */
-		Huff_transmit(huff, NYT, fout);
+		Huff_transmit(huff, NYT, fout, maxoffset);
 		for (i = 7; i >= 0; i--) {
 			add_bit((char)((ch >> i) & 0x1), fout);
 		}
 	} else {
-		send(huff->loc[ch], NULL, fout);
+		send(huff->loc[ch], NULL, fout, maxoffset);
 	}
 }
 
-void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset) {
+void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int maxoffset) {
 	bloc = *offset;
-	send(huff->loc[ch], NULL, fout);
+	send(huff->loc[ch], NULL, fout, maxoffset);
 	*offset = bloc;
 }
 
@@ -354,7 +373,7 @@ void Huff_Decompress(msg_t *mbuf, int offset) {
 	for ( j = 0; j < cch; j++ ) {
 		ch = 0;
 		// don't overflow reading from the messages
-		// FIXME: would it be better to have a overflow check in get_bit ?
+		// FIXME: would it be better to have an overflow check in get_bit ?
 		if ( (bloc >> 3) > size ) {
 			seq[j] = 0;
 			break;
@@ -385,7 +404,7 @@ void Huff_Compress(msg_t *mbuf, int offset) {
 	huff_t		huff;
 
 	size = mbuf->cursize - offset;
-	buffer = mbuf->data+ + offset;
+	buffer = mbuf->data + offset;
 
 	if (size<=0) {
 		return;
@@ -398,16 +417,15 @@ void Huff_Compress(msg_t *mbuf, int offset) {
 	huff.tree->weight = 0;
 	huff.lhead->next = huff.lhead->prev = NULL;
 	huff.tree->parent = huff.tree->left = huff.tree->right = NULL;
-	huff.loc[NYT] = huff.tree;
 
-	seq[0] = ( byte )(size>>8);
-	seq[1] = ( byte )size&0xff;
+	seq[0] = (byte)(size>>8);
+	seq[1] = (byte)(size&0xff);
 
 	bloc = 16;
 
 	for (i=0; i<size; i++ ) {
 		ch = buffer[i];
-		Huff_transmit(&huff, ch, seq);						/* Transmit symbol */
+		Huff_transmit(&huff, ch, seq, size<<3);						/* Transmit symbol */
 		Huff_addRef(&huff, (byte)ch);								/* Do update */
 	}
 
diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index b1bd6ee6..a5f46991 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -232,9 +232,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 
 	oldsize += bits;
 
-	// this isn't an exact overflow check, but close enough
-	if ( msg->maxsize - msg->cursize < 4 ) {
-		msg->overflowed = qtrue;
+	if ( msg->overflowed ) {
 		return;
 	}
 
@@ -294,6 +292,10 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		if (bits&7) {
 			int nbits;
 			nbits = bits&7;
+			if ( msg->bit + nbits > msg->maxsize << 3 ) {
+				msg->overflowed = qtrue;
+				return;
+			}
 			for(i=0;i<nbits;i++) {
 				Huff_putBit((value&1), msg->data, &msg->bit);
 				value = (value>>1);
@@ -302,8 +304,13 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		}
 		if (bits) {
 			for(i=0;i<bits;i+=8) {
-				Huff_offsetTransmit (&msgHuff.compressor, (value&0xff), msg->data, &msg->bit);
+				Huff_offsetTransmit( &msgHuff.compressor, (value & 0xff), msg->data, &msg->bit, msg->maxsize << 3 );
 				value = (value>>8);
+
+				if ( msg->bit > msg->maxsize << 3 ) {
+					msg->overflowed = qtrue;
+					return;
+				}
 			}
 		}
 		msg->cursize = (msg->bit>>3)+1;
@@ -316,6 +323,10 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
 	qboolean	sgn;
 	int			i, nbits;
 
+	if ( msg->readcount > msg->cursize ) {
+		return 0;
+	}
+
 	value = 0;
 
 	if ( bits < 0 ) {
@@ -358,6 +369,10 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
 		nbits = 0;
 		if (bits&7) {
 			nbits = bits&7;
+			if (msg->bit + nbits > msg->cursize << 3) {
+				msg->readcount = msg->cursize + 1;
+				return 0;
+			}
 			for(i=0;i<nbits;i++) {
 				value |= (Huff_getBit(msg->data, &msg->bit)<<i);
 			}
@@ -365,8 +380,13 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
 		}
 		if (bits) {
 			for(i=0;i<bits;i+=8) {
-				Huff_offsetReceive (msgHuff.decompressor.tree, &get, msg->data, &msg->bit);
+				Huff_offsetReceive (msgHuff.decompressor.tree, &get, msg->data, &msg->bit, msg->cursize<<3);
 				value |= (get<<(i+nbits));
+
+				if (msg->bit > msg->cursize<<3) {
+					msg->readcount = msg->cursize + 1;
+					return 0;
+				}
 			}
 		}
 		msg->readcount = (msg->bit>>3)+1;
@@ -758,7 +778,7 @@ char *MSG_ReadString( msg_t *msg ) {
 	l = 0;
 	do {
 		c = MSG_ReadByte(msg);		// use ReadByte so -1 is out of bounds
-		if (!c || c == -1) {
+		if ( c == -1 || c == 0 ) {
 			break;
 		}
 		// translate all fmt spec to avoid crash bugs
@@ -790,10 +810,6 @@ char *MSG_ReadBigString( msg_t *msg ) {
 		if ( c == '%' ) {
 			c = '.';
 		}
-		// don't allow higher ascii values
-		if ( c > 127 ) {
-			c = '.';
-		}
 
 		string[l] = (char)c;
 		l++;
@@ -811,18 +827,13 @@ char *MSG_ReadStringLine( msg_t *msg ) {
 	l = 0;
 	do {
 		c = MSG_ReadByte(msg);		// use ReadByte so -1 is out of bounds
-		if (c <= 0 || c == '\n') {
-		//if (c == -1 || c == 0 || c == '\n') { //Q3
+		if (c == -1 || c == 0 || c == '\n') {
 			break;
 		}
 		// translate all fmt spec to avoid crash bugs
 		if ( c == '%' ) {
 			c = '.';
 		}
-		// don't allow higher ascii values
-		if ( c > 127 ) {
-			c = '.';
-		}
 
 		string[l] = c;
 		l++;
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 3dcd5a44..c990ad7b 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1426,9 +1426,9 @@ void	Huff_Decompress(msg_t *buf, int offset);
 void	Huff_Init(huffman_t *huff);
 void	Huff_addRef(huff_t* huff, byte ch);
 int		Huff_Receive (node_t *node, int *ch, byte *fin);
-void	Huff_transmit (huff_t *huff, int ch, byte *fout);
-void	Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset);
-void	Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset);
+void	Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset);
+void	Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int maxoffset);
+void	Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int maxoffset);
 void	Huff_putBit( int bit, byte *fout, int *offset);
 int		Huff_getBit( byte *fout, int *offset);
 

From 1f4b7718e8e9a7f5d2e100de41da9ec333b301ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trung=20L=C3=AA?= <8@tle.id.au>
Date: Tue, 20 Aug 2024 22:30:18 +1000
Subject: [PATCH 0625/2040] Refactoring gameExport_s::ReadLevel() and
 gameExport_s::WriteLevel()

---
 code/fgame/g_main.cpp  | 12 ++++++------
 code/fgame/g_public.h  |  4 ++--
 code/server/sv_ccmds.c |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 46c1119b..6eed1b71 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1215,7 +1215,7 @@ G_ArchiveLevel
 
 =================
 */
-qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, int *savedCgameStateSize, qboolean autosave, qboolean loading)
+qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, size_t *savedCgameStateSize, qboolean autosave, qboolean loading)
 {
     try {
         int         i;
@@ -1258,8 +1258,8 @@ qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, int *saved
             // later objects need to post events when reading the archive.
             L_ArchiveEvents(arc);
         }
-
-        arc.ArchiveInteger(savedCgameStateSize);
+        num = (int)*savedCgameStateSize;
+        arc.ArchiveInteger(&num);
         if (!arc.Saving()) {
             if (*savedCgameStateSize) {
                 *savedCgameState = (byte*)gi.Malloc(*savedCgameStateSize);
@@ -1267,7 +1267,7 @@ qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, int *saved
                 *savedCgameState = NULL;
             }
         }
-        arc.ArchiveRaw(*savedCgameState, *savedCgameStateSize);
+        arc.ArchiveRaw((byte*)savedCgameState, *savedCgameStateSize);
 
         if (arc.Saving()) {
             str s;
@@ -1437,7 +1437,7 @@ G_WriteLevel
 
 =================
 */
-void G_WriteLevel(const char *filename, qboolean autosave, byte** savedCgameState, int* savedCgameStateSize)
+void G_WriteLevel(const char *filename, qboolean autosave, byte** savedCgameState, size_t* savedCgameStateSize)
 {
     game.autosaved = autosave;
     G_ArchiveLevel(filename, savedCgameState, savedCgameStateSize, autosave, qfalse);
@@ -1459,7 +1459,7 @@ calling ReadLevel.
 No clients are connected yet.
 =================
 */
-qboolean G_ReadLevel(const char *filename, byte** savedCgameState, int* savedCgameStateSize)
+qboolean G_ReadLevel(const char *filename, byte** savedCgameState, size_t* savedCgameStateSize)
 {
     qboolean status;
 
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index b790b4bf..e460f195 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -520,8 +520,8 @@ typedef struct gameExport_s {
     // ReadLevel is called after the default map information has been
     // loaded with SpawnEntities, so any stored client spawn spots will
     // be used when the clients reconnect.
-    void (*WriteLevel)(const char *filename, qboolean autosave, byte** savedCgameState, int* savedCgameStateSize);
-    qboolean (*ReadLevel)(const char *filename, byte** savedCgameState, int* savedCgameStateSize);
+    void (*WriteLevel)(const char *filename, qboolean autosave, byte** savedCgameState, size_t* savedCgameStateSize);
+    qboolean (*ReadLevel)(const char *filename, byte** savedCgameState, size_t* savedCgameStateSize);
     qboolean (*LevelArchiveValid)(const char *filename);
 
     void (*ArchiveInteger)(int *i);
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 88dba1c2..4188b521 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1878,7 +1878,7 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
     name = Com_GetArchiveFileName(svs.gameName, "sav");
     if (loading)
     {
-		if (!ge->ReadLevel(name, &cls.savedCgameState, &cls.savedCgameStateSize)) {
+		if (!ge->ReadLevel(name, (byte**)&cls.savedCgameState, &cls.savedCgameStateSize)) {
 			return qfalse;
         }
 
@@ -1901,7 +1901,7 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
     else
     {
 		cls.savedCgameStateSize = cge->CG_SaveStateToBuffer(&cls.savedCgameState, svs.time);
-        ge->WriteLevel(name, autosave, &cls.savedCgameState, &cls.savedCgameStateSize);
+        ge->WriteLevel(name, autosave, (byte**)&cls.savedCgameState, &cls.savedCgameStateSize);
 		Z_Free(cls.savedCgameState);
 		cls.savedCgameState = NULL;
     }

From 16e0dc17a88d8871c72cd78131de3e3078745ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trung=20L=C3=AA?= <8@tle.id.au>
Date: Wed, 21 Aug 2024 00:13:04 +1000
Subject: [PATCH 0626/2040] Add implicit conversion from const-qualified
 pointer types to non-const-qualified var

---
 code/qcommon/cvar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index 0e79aef2..d0846a3f 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -1606,7 +1606,7 @@ void Cvar_CompleteCvarName( const char *args, int argNum )
 	if( argNum == 2 )
 	{
 		// Skip "<cmd> "
-		char *p = Com_SkipTokens( args, 1, " " );
+		char *p = Com_SkipTokens((char *)args, 1, " " );
 
 		if( p > args )
 			Field_CompleteCommand( p, qfalse, qtrue );

From 3b2e4ff9c13e64dd4994acc6d76b7ff0d2682790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trung=20L=C3=AA?= <8@tle.id.au>
Date: Wed, 21 Aug 2024 00:17:05 +1000
Subject: [PATCH 0627/2040] Revert to original code

---
 code/fgame/g_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 6eed1b71..0fe66af0 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1267,7 +1267,7 @@ qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, size_t *sa
                 *savedCgameState = NULL;
             }
         }
-        arc.ArchiveRaw((byte*)savedCgameState, *savedCgameStateSize);
+        arc.ArchiveRaw(*savedCgameState, *savedCgameStateSize);
 
         if (arc.Saving()) {
             str s;

From 13911b051a58ba9d84ef5c2081a9a223ffc1ca96 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:35:06 +0200
Subject: [PATCH 0628/2040] Use OpenAL by default

---
 CMakeLists.txt                   |  4 ++--
 code/client/CMakeLists.txt       | 16 +++++++++++++---
 code/client/cl_main.cpp          | 10 +++++-----
 code/client/new/snd_main_new.cpp |  2 +-
 code/client/snd_info.cpp         |  8 ++------
 code/client/snd_local.h          |  2 +-
 code/client/snd_public.h         |  2 +-
 code/sdl/CMakeLists.txt          | 13 ++++++++++++-
 docs/compiling.md                | 11 +++++++----
 9 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac6ed6c8..5cdf0e0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,10 +105,10 @@ INSTALL(TARGETS omohaaded DESTINATION "./")
 
 if (NOT BUILD_NO_CLIENT)
 	## Client app
-
+	
+	add_subdirectory("code/client")
 	add_subdirectory("code/renderer")
 	add_subdirectory("code/sdl")
-	add_subdirectory("code/client")
 
 	#include("code/renderergl2/glsl/shaders.cmake")
 	#file(GLOB_RECURSE SOURCES_RENDERER "code/sdl/*.c" "code/renderercommon/*.c" "code/renderergl2/*.c" "code/renderergl2/*.cpp")
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index e974e7af..ff7660c8 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(omohclient)
 
+option(NO_OPENAL "Use older sound-system" FALSE)
+
 add_subdirectory("../cgame" "./cgame")
 
 file(GLOB SOURCES_CLIENT "./*.c*")
@@ -18,11 +20,12 @@ target_link_libraries(omohclient INTERFACE gcd)
 # Sound stuff
 target_compile_definitions(omohclient INTERFACE USE_CODEC_MP3)
 
-if (USE_SOUND_NEW)
-	# Try to use OpenAL
+if (NOT NO_OPENAL)
+	# Use OpenAL
 	find_package(OpenAL REQUIRED)
+
 	if (OPENAL_FOUND)
-		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1 USE_SOUND_NEW=1)
+		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1 NO_MODERN_DMA=0)
 		if (MSVC)
 			target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR}/AL)
 		else()
@@ -35,6 +38,13 @@ if (USE_SOUND_NEW)
 	file(GLOB SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
 else()
+	#
+	# Fallback to old DMA sound system
+	#
+	message(NOTICE "OpenAL was explicitly disabled - fallback to old SDL sound system")
+	target_compile_definitions(omohclient INTERFACE NO_MODERN_DMA=1)
+	set(NO_MODERN_DMA TRUE)
+
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.cpp$")
 	file(GLOB_RECURSE SOURCES_CLIENT_SND "./new/*.c*")
 	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 825ea52c..a2e61c3a 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -769,7 +769,7 @@ void CL_ShutdownAll(qboolean shutdownRef) {
 	CL_cURL_Shutdown();
 #endif
 	// clear sounds
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_DisableSounds();
 #endif
 	// shutdown CGame
@@ -1560,7 +1560,7 @@ void CL_Vid_Restart_f( void ) {
 
 	CL_StartHunkUsers(qfalse);
 
-#if defined(USE_SOUND_NEW) && USE_SOUND_NEW
+#if !defined(NO_MODERN_DMA) || !NO_MODERN_DMA
     s_bSoundPaused = true;
     S_LoadData(&save);
 #else
@@ -1597,7 +1597,7 @@ handles will be invalid
 =================
 */
 void CL_Snd_Restart_f( void ) {
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Shutdown();
 	S_Init();
     CL_Vid_Restart_f();
@@ -3492,7 +3492,7 @@ void CL_Init( void ) {
 
 	Cvar_Set( "cl_running", "1" );
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Init2();
 #else
 	S_Init(qtrue);
@@ -3537,7 +3537,7 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
 	if(disconnect)
 		CL_Disconnect();
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Shutdown();
 #else
 	S_Shutdown(qtrue);
diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 66fa6f1f..58deebe1 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../snd_local.h"
 #include "../client.h"
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 
 qboolean s_bSoundPaused = qfalse;
 
diff --git a/code/client/snd_info.cpp b/code/client/snd_info.cpp
index 6cbdc02b..6fa56996 100644
--- a/code/client/snd_info.cpp
+++ b/code/client/snd_info.cpp
@@ -20,10 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if USE_SOUND_NEW
-
-#    include "snd_local.h"
-#    include "../qcommon/tiki.h"
+#include "snd_local.h"
+#include "../qcommon/tiki.h"
 
 void load_sfx_info()
 {
@@ -95,5 +93,3 @@ void load_sfx_info()
 
     sfx_infos[0].name[0] = 0;
 }
-
-#endif
diff --git a/code/client/snd_local.h b/code/client/snd_local.h
index e0ec8609..04c6ba9f 100644
--- a/code/client/snd_local.h
+++ b/code/client/snd_local.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/qcommon.h"
 #include "snd_public.h"
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 
 #define	PAINTBUFFER_SIZE		4096					// this is in samples
 
diff --git a/code/client/snd_public.h b/code/client/snd_public.h
index f348cdc9..596e066f 100644
--- a/code/client/snd_public.h
+++ b/code/client/snd_public.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/code/sdl/CMakeLists.txt b/code/sdl/CMakeLists.txt
index 27c9e804..db79ee2f 100644
--- a/code/sdl/CMakeLists.txt
+++ b/code/sdl/CMakeLists.txt
@@ -1,12 +1,23 @@
 cmake_minimum_required(VERSION 3.5)
 project(omohsdl)
 
-file(GLOB_RECURSE SOURCES_SDL "./*.c")
+file(GLOB SOURCES_SDL
+"./sdl_gamma.c"
+"./sdl_glimp.c"
+"./sdl_input.c"
+)
+
+if (NO_MODERN_DMA)
+	list(APPEND SOURCES_SDL "./sdl_snd.c")
+endif()
 
 add_library(omohsdl STATIC ${SOURCES_SDL})
 target_compile_features(omohsdl PUBLIC c_variadic_macros)
 target_link_libraries(omohsdl PRIVATE qcommon qcommon_standalone)
 
+if (NO_MODERN_DMA)
+	target_compile_definitions(omohsdl PRIVATE NO_MODERN_DMA=1)
+endif()
 
 if(${CMAKE_VERSION} VERSION_GREATER "3.11")
 	cmake_policy(SET CMP0074 NEW)
diff --git a/docs/compiling.md b/docs/compiling.md
index dd9c6f4f..393329bc 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -5,19 +5,21 @@ OpenMoHAA supports any architecture, thanks to the CMake build system and cross-
 The following tools are required for all platforms:
 - CMake >= 3.5
 - Flex (>= 2.6.4) and Bison (>= 3.5.1)
-- A C++11 compiler is also required.
+- A C++11 compiler
+- OpenAL SDK (can be found [here](https://github.com/kcat/openal-soft))
 
 The installation directory can be set to the MOHAA directory.
 
 By default, the build will produce both the client and dedicated server versions. The client can be omitted from the build by appending `-DBUILD_NO_CLIENT=1` to the CMake command-line arguments. Using this parameter will result in only the server portion being built.
 
-The experimental OpenAL-based sound system can be used by appending `-DUSE_SOUND_NEW=1` to the CMake command-line arguments.
+OpenAL can be disabled by appending `-DNO_OPENAL=1` to the CMake command-line arguments. The old SDL-based sound system will be used instead, it lacks some features such as ambient sounds.
 
 ## Compiling for Linux
 
 These are the tools required on Linux :
 - Clang >= 3.3 or GCC >= 4.8.5
 - libsdl2-dev
+- libopenal-dev
 
 **clang-3.5** and **gcc-4.8.5** should work (tested on Ubuntu 16.04), but the latest version should be used.
 
@@ -25,7 +27,7 @@ Ubuntu 20.04 is the minimum version required to fully compile the project succes
 
 1 line install command with clang:
 ```sh
-sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev
+sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libopenal-dev
 ```
 
 Example with **CMake** and **ninja-build** installed:
@@ -41,5 +43,6 @@ Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compi
 Visual Studio (2019 or 2022) is generally preferred.
 
 Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
+OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.23.1
 
-Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe` to the CMake command-line to use the package from the link above.
+Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.

From f2b49f7ccb831ffafbf24d2e21de05dc6657e60f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:42:54 +0200
Subject: [PATCH 0629/2040] Fix wrong parameters

---
 code/null/null_snddma.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/code/null/null_snddma.c b/code/null/null_snddma.c
index 28cfb1ec..8bd0c65b 100644
--- a/code/null/null_snddma.c
+++ b/code/null/null_snddma.c
@@ -50,17 +50,23 @@ void SNDDMA_Submit(void)
 void SNDDMA_Activate(void) {
 }
 
-sfxHandle_t S_RegisterSound( const char *sample, qboolean compressed )
-{
-	return 0;
-}
-
-void S_StartLocalSound( sfxHandle_t sfx, int channelNum ) {
-}
-
 void S_ClearSoundBuffer( void ) {
 }
 
 int S_IsSoundPlaying( int channel_number, const char *sfxName ){
 	return 0;
 }
+
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
+void S_StartLocalSound(sfxHandle_t sfx, int channelNum) {
+}
+sfxHandle_t S_RegisterSound(const char* sample, qboolean compressed) {
+	return 0;
+}
+#else
+void S_StartLocalSound(const char* sound_name, qboolean force_load) {
+}
+sfxHandle_t S_RegisterSound(const char* name, int streamed, qboolean force_load) {
+	return 0;
+}
+#endif

From faa50352e0a83ab69f3110092e90f601d55abf02 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:53:57 +0200
Subject: [PATCH 0630/2040] Remove explicit USE_SOUND_NEW as OpenAL is the
 default

---
 .github/workflows/build-cmake.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 417d4e8f..02e29a05 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -99,7 +99,7 @@ jobs:
     - name: Configure CMake
       working-directory: ${{github.workspace}}
       run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} -DUSE_SOUND_NEW=1 ./source
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
 
     - name: Build
       working-directory: ${{github.workspace}}
@@ -204,7 +204,7 @@ jobs:
     - name: Configure CMake
       working-directory: ${{github.workspace}}
       run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} -DUSE_SOUND_NEW=1 ./source
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
 
     - name: Build
       working-directory: ${{github.workspace}}

From d78de51bc23669a34b668c18b9b4ffa5d6ab5397 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 21 Aug 2024 19:02:23 +0200
Subject: [PATCH 0631/2040] Bump version number

---
 code/qcommon/q_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 743ea48c..13d220c3 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			62
+#define PRODUCT_VERSION_MINOR			70
 #define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			"alpha"
 

From 219dbbb5b731034a791cd717de54fcd430523331 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:39:14 +0200
Subject: [PATCH 0632/2040] Open the default device by passing in the default
 device name instead of NULL

---
 code/client/snd_openal_new.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 7b86034c..81157efc 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -268,7 +268,11 @@ static bool S_OPENAL_InitContext()
         dev = NULL;
     }
 
-    Com_Printf("OpenAL: Opening device %s...\n", dev ? dev : "{default}");
+    if (!dev) {
+        dev = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+    }
+
+    Com_Printf("OpenAL: Opening device \"%s\"...\n", dev ? dev : "{default}");
 
     al_device = qalcOpenDevice(dev);
     if (!al_device) {

From 4839a2026b805c5f11b0253026168ed99133393b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:42:34 +0200
Subject: [PATCH 0633/2040] Fix string casting

---
 code/client/snd_openal_new.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 81157efc..9f0e862c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "snd_codec.h"
 
 typedef struct {
-    char  *funcname;
-    void **funcptr;
-    bool   required;
+    const char  *funcname;
+    void       **funcptr;
+    bool         required;
 } extensions_table_t;
 
 #    define MAX_MUSIC_SONGS 16
@@ -282,11 +282,17 @@ static bool S_OPENAL_InitContext()
     }
 
     Com_Printf("OpenAL: Device opened successfully.\n");
-    al_frequency = 22050;
-    if (s_khz->integer == 11) {
+    switch (s_khz->integer) {
+    case 11:
         al_frequency = 11025;
-    } else if (s_khz->integer == 44) {
+        break;
+    default:
+    case 22:
+        al_frequency = 22050;
+        break;
+    case 44:
         al_frequency = 44100;
+        break;
     }
 
     attrlist[0] = 256;
@@ -362,7 +368,7 @@ static bool S_OPENAL_InitExtensions()
 
         *i->funcptr = qalGetProcAddress(i->funcname);
         if (!*i->funcptr) {
-            Com_Printf("...not found! [%s]\n", qalGetError());
+            Com_Printf("...not found! %d [%s]\n", qalGetError(), qalGetString(qalGetError()));
             if (i->required) {
                 S_OPENAL_NukeContext();
                 return false;

From f67a7c66218eaab6089898254f55d3cc276de389 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:30:04 +0200
Subject: [PATCH 0634/2040] List available devices and use Generic Software if
 Generic Hardware is the default

---
 code/client/snd_openal_new.cpp | 69 ++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 9f0e862c..3367d75c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -54,6 +54,7 @@ cvar_t *s_obstruction_cal_time;
 cvar_t *s_lastSoundTime;
 // Added in OPM
 cvar_t *s_openaldriver;
+cvar_t *s_alAvailableDevices;
 
 static float reverb_table[] = {
     0.5f,   0.25f,        0.417f, 0.653f,      0.208f,      0.5f,   0.403f, 0.5f,   0.5f,
@@ -89,6 +90,9 @@ int             music_loaded            = 0;
 int             music_numsongs          = 0;
 int             music_currentsong       = 0;
 
+static qboolean enumeration_ext = qfalse;
+static qboolean enumeration_all_ext = qfalse;
+
 song_t            music_songs[MAX_MUSIC_SONGS];
 openal_internal_t openal;
 static float      s_fFadeStartTime;
@@ -268,13 +272,72 @@ static bool S_OPENAL_InitContext()
         dev = NULL;
     }
 
-    if (!dev) {
-        dev = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
-    }
+
+	// Device enumeration support
+	enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
+	enumeration_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
+
+	if(enumeration_ext || enumeration_all_ext)
+	{
+		char devicenames[16384] = "";
+		const char *devicelist;
+#ifdef _WIN32
+		const char *defaultdevice;
+#endif
+		int curlen;
+
+		// get all available devices + the default device name.
+		if(enumeration_all_ext)
+		{
+			devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+#ifdef _WIN32
+			defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
+#endif
+		}
+		else
+		{
+			// We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
+			devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
+#ifdef _WIN32
+			defaultdevice = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+#endif
+			enumeration_ext = qtrue;
+		}
+
+#ifdef _WIN32
+		// check whether the default device is generic hardware. If it is, change to
+		// Generic Software as that one works more reliably with various sound systems.
+		// If it's not, use OpenAL's default selection as we don't want to ignore
+		// native hardware acceleration.
+		if(!dev && defaultdevice && !strcmp(defaultdevice, "Generic Hardware"))
+			dev = "Generic Software";
+#endif
+
+		// dump a list of available devices to a cvar for the user to see.
+
+		if(devicelist)
+		{
+			while((curlen = strlen(devicelist)))
+			{
+				Q_strcat(devicenames, sizeof(devicenames), devicelist);
+				Q_strcat(devicenames, sizeof(devicenames), "\n");
+
+				devicelist += curlen + 1;
+			}
+		}
+
+		s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
+        Com_Printf("OpenAL: List of available devices:\n%s\n", devicenames);
+	}
 
     Com_Printf("OpenAL: Opening device \"%s\"...\n", dev ? dev : "{default}");
 
     al_device = qalcOpenDevice(dev);
+    if (!al_device && dev) {
+        Com_Printf("Failed to open OpenAL device '%s', trying default.\n", dev);
+        al_device = qalcOpenDevice(NULL);
+    }
+
     if (!al_device) {
         Com_Printf("OpenAL: Could not open device\n");
         S_OPENAL_NukeContext();

From 037cb0f5cbdec50720c63fd51306fe51b61f466a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:18:20 +0200
Subject: [PATCH 0635/2040] Fix OpenAL64.dll name on Win32 and Win64

---
 .github/workflows/build-cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 02e29a05..8c535def 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -183,7 +183,7 @@ jobs:
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
-        if ([Environment]::Is64BitOperatingSystem) { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
+        if ("${{ matrix.architecture.config }}" -eq "x64") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
 
     - uses: actions/checkout@v4
       with:

From e46625a52cfa9e54be9182b814112b9a2870d36b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:38:45 +0200
Subject: [PATCH 0636/2040] Added more verbosity

---
 code/client/snd_openal_new.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 3367d75c..6c334afa 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -272,6 +272,7 @@ static bool S_OPENAL_InitContext()
         dev = NULL;
     }
 
+    Com_DPrintf("OpenAL: Context initialization\n");
 
 	// Device enumeration support
 	enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
@@ -289,6 +290,7 @@ static bool S_OPENAL_InitContext()
 		// get all available devices + the default device name.
 		if(enumeration_all_ext)
 		{
+            Com_DPrintf("OpenAL: Fetching all devices\n");
 			devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
 #ifdef _WIN32
 			defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
@@ -296,6 +298,7 @@ static bool S_OPENAL_InitContext()
 		}
 		else
 		{
+            Com_DPrintf("OpenAL: Fetching current device\n");
 			// We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
 			devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
 #ifdef _WIN32
@@ -304,6 +307,8 @@ static bool S_OPENAL_InitContext()
 			enumeration_ext = qtrue;
 		}
 
+        Com_DPrintf("OpenAL: Default playback device: \"%s\"\n", defaultdevice);
+
 #ifdef _WIN32
 		// check whether the default device is generic hardware. If it is, change to
 		// Generic Software as that one works more reliably with various sound systems.
@@ -326,8 +331,9 @@ static bool S_OPENAL_InitContext()
 			}
 		}
 
-		s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
         Com_Printf("OpenAL: List of available devices:\n%s\n", devicenames);
+
+		s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
 	}
 
     Com_Printf("OpenAL: Opening device \"%s\"...\n", dev ? dev : "{default}");

From 5e60b89a0dddc292be3b0722bdbca5cee01c5f47 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 16:13:03 +0200
Subject: [PATCH 0637/2040] Fix linux compile error

---
 code/client/snd_openal_new.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 6c334afa..53c3bd24 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -307,7 +307,9 @@ static bool S_OPENAL_InitContext()
 			enumeration_ext = qtrue;
 		}
 
+#ifdef _WIN32
         Com_DPrintf("OpenAL: Default playback device: \"%s\"\n", defaultdevice);
+#endif
 
 #ifdef _WIN32
 		// check whether the default device is generic hardware. If it is, change to

From 9526a92fc1a188e9543ee562fcd47cfa15fb0039 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 22 Aug 2024 16:35:44 +0200
Subject: [PATCH 0638/2040] Use same parameters as oal to build OpenAL

---
 .github/workflows/build-cmake.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 8c535def..620130f6 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -41,7 +41,8 @@ jobs:
 
     - name: Install required packages
       run: |
-        sudo apt update && sudo apt install -y flex bison libopenal-dev
+        sudo apt update && sudo apt install -y flex bison \
+            libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
   
     - name: Install required cross-platform packages (${{ matrix.architecture.triple }})
       if: matrix.architecture.name != 'amd64'
@@ -179,7 +180,11 @@ jobs:
       run: |
         cmake -B ./build -A ${{ matrix.architecture.config }} `
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
+        -DALSOFT_BUILD_ROUTER=OFF `
+        -DALSOFT_REQUIRE_WINMM=ON `
+        -DALSOFT_REQUIRE_DSOUND=ON `
+        -DALSOFT_REQUIRE_WASAPI=ON
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit

From f84ed6b794c2d892a29395204ef94b8c9178acd2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:48:50 +0200
Subject: [PATCH 0639/2040] Fix crash when loading from save, caused by
 incorrect client-game state size

Closes #343
---
 code/fgame/g_main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 0fe66af0..79e7119d 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1258,14 +1258,19 @@ qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, size_t *sa
             // later objects need to post events when reading the archive.
             L_ArchiveEvents(arc);
         }
-        num = (int)*savedCgameStateSize;
-        arc.ArchiveInteger(&num);
+
         if (!arc.Saving()) {
+            arc.ArchiveInteger(&num);
+            *savedCgameStateSize = num;
+
             if (*savedCgameStateSize) {
                 *savedCgameState = (byte*)gi.Malloc(*savedCgameStateSize);
             } else {
                 *savedCgameState = NULL;
             }
+        } else {
+            num = (int)*savedCgameStateSize;
+            arc.ArchiveInteger(&num);
         }
         arc.ArchiveRaw(*savedCgameState, *savedCgameStateSize);
 

From a529b37f25bc6257d77b51c047baa8259e927a2f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:07:28 +0200
Subject: [PATCH 0640/2040] Show some AL errors on developer mode only

---
 code/client/snd_openal_new.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 53c3bd24..e092a493 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2965,7 +2965,7 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
                 qalDeleteBuffers(1, &pSfx->buffer);
                 alDieIfError();
 
-                Com_Printf("OpenAL: Failed to load MP3.\n");
+                Com_DPrintf("OpenAL: Failed to load MP3.\n");
                 return false;
             }
 
@@ -4237,7 +4237,7 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
         qalDeleteBuffers(1, &pSfx->buffer);
         alDieIfError();
 
-        Com_Printf("OpenAL: Failed to load MP3.\n");
+        Com_DPrintf("OpenAL: Failed to load MP3.\n");
         return false;
     }
 
@@ -4251,7 +4251,7 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
 
     pSfx->info.format = S_OPENAL_Format(stream->info.width, stream->info.channels);
     if (!pSfx->info.format) {
-        Com_Printf(
+        Com_DPrintf(
             "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
             pSfx->info.channels,
             (int)(pSfx->info.width * 8.f),

From 8c41576daa877096926771cf3c5eda8cb336e050 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:13:17 +0200
Subject: [PATCH 0641/2040] Remove assertion as sounds can be streamed at any
 time

---
 code/client/snd_openal_new.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index e092a493..899918a7 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4223,8 +4223,6 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
     int bytesRead;
     char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
 
-    assert(!pSfx->buffer);
-
     stop();
 
     sampleLoopCount = 1;

From 7bebb2adab4899d0cf380a207f822910f4f899f1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:51:47 +0200
Subject: [PATCH 0642/2040] Statically link the CRT runtime in soft-oal

---
 .github/workflows/build-cmake.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 620130f6..fabd2315 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -175,6 +175,8 @@ jobs:
         path: 'thirdparties/soft-oal'
         ref: '1.23.1'
 
+    # soft-oal build
+    # Statically link the CRT runtime into OAL as a workaround to prevent crashes
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
@@ -184,7 +186,13 @@ jobs:
         -DALSOFT_BUILD_ROUTER=OFF `
         -DALSOFT_REQUIRE_WINMM=ON `
         -DALSOFT_REQUIRE_DSOUND=ON `
-        -DALSOFT_REQUIRE_WASAPI=ON
+        -DALSOFT_REQUIRE_WASAPI=ON `
+        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_C_FLAGS_MINSIZEREL="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DNDEBUG" `
+        -DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG"
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit

From 01a0173a2f70cd8c728d18b4e9b6c4d08eaad996 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:52:30 +0200
Subject: [PATCH 0643/2040] Take all branches into account for GitHub actions

---
 .github/workflows/build-cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index fabd2315..2279210c 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -3,7 +3,7 @@ name: Build
 on:
   push:
     branches:
-      - '*'
+      - '**'
   pull_request:
   workflow_call:
 

From b5ffe756d680db0767aa2e030580cdb4a8d46d4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 20:38:41 +0200
Subject: [PATCH 0644/2040] Fix buffers unnecessarily being unqueued after
 source has stopped

---
 code/client/snd_openal_new.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 899918a7..7ee25fd7 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4469,7 +4469,6 @@ void openal_channel_two_d_stream::clear_stream() {
 
     qalSourceStop(source);
     qalSourcei(source, AL_BUFFER, 0);
-    qalSourceUnqueueBuffers(source, MAX_STREAM_BUFFERS, buffers);
     qalDeleteBuffers(1, buffers);
 
     if (streamHandle) {

From 8832fbe55de683431ceb426ac692b586cbdc48e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 21:02:10 +0200
Subject: [PATCH 0645/2040] Fix entities loopsound incorrectly having the
 streamed value at the end of the name, causing some sounds unable to load

---
 code/fgame/g_utils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 8fca9c03..a603c31c 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1197,6 +1197,7 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
         arc.ArchiveString(&tempStr);
 
         if (tempStr.length()) {
+            tempStr[tempStr.length() - 1] = 0;
             edict->s.loopSound = gi.soundindex(tempStr.c_str(), true);
         } else {
             edict->s.loopSound = 0;

From b2ef0fd6e364e053c82c882724707db06ebfe2ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 21:09:12 +0200
Subject: [PATCH 0646/2040] Swap the save game struct on big endian
 architectures

---
 code/client/cl_uiloadsave.cpp | 1 +
 code/qcommon/q_shared.c       | 9 +++++++++
 code/qcommon/q_shared.h       | 4 +++-
 code/server/sv_ccmds.c        | 3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_uiloadsave.cpp b/code/client/cl_uiloadsave.cpp
index a0b8e566..25785048 100644
--- a/code/client/cl_uiloadsave.cpp
+++ b/code/client/cl_uiloadsave.cpp
@@ -155,6 +155,7 @@ void UIFAKKLoadGameClass::SetupFiles(void)
 
         FS_Read(&save, sizeof(savegamestruct_t), f);
         FS_FCloseFile(f);
+        Com_SwapSaveStruct(&save);
 
         if (save.version != SAVEGAME_STRUCT_VERSION) {
             // wrong save game version
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index b9d679a0..61b88ea1 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -2190,3 +2190,12 @@ int Com_IndexForGrowListElement(const growList_t * list, const void *element)
 	}
 	return -1;
 }
+
+void Com_SwapSaveStruct(savegamestruct_t* save) {
+	save->version = LittleLong(save->version);
+	save->time = LittleLong(save->time);
+	save->mapTime = LittleLong(save->mapTime);
+
+	save->tm_loopcount = LittleLong(save->tm_loopcount);
+	save->tm_offset = LittleLong(save->tm_offset);
+}
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index accd20d1..946867b8 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1107,6 +1107,8 @@ int             Com_AddToGrowList(growList_t * list, void *data);
 void           *Com_GrowListElement(const growList_t * list, int index);
 int             Com_IndexForGrowListElement(const growList_t * list, const void *element);
 
+void			Com_SwapSaveStruct(struct savegamestruct_s* save);
+
 
 //=============================================
 
@@ -1458,7 +1460,7 @@ typedef struct {
 
 #define SAVEGAME_STRUCT_VERSION 4
 
-typedef struct {
+typedef struct savegamestruct_s {
 	int version;
 	int time;
 	int mapTime;
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 4188b521..970b9635 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1887,6 +1887,7 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
         if (f)
         {
             FS_Read(&save, sizeof(savegamestruct_t), f);
+			Com_SwapSaveStruct(&save);
             if (save.version != SAVEGAME_STRUCT_VERSION)
             {
                 FS_FCloseFile(f);
@@ -2007,6 +2008,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 			save.tm_loopcount = 0;
 		}
 
+		Com_SwapSaveStruct(&save);
 		FS_Write( &save, sizeof( savegamestruct_t ), f );
 		S_Save( f );
 		CM_WritePortalState( f );
@@ -2026,6 +2028,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 		}
 
         FS_Read(&save, sizeof(savegamestruct_t), f);
+		Com_SwapSaveStruct(&save);
         if (save.version != SAVEGAME_STRUCT_VERSION)
 		{
 			Com_Printf("Invalid or Old Server SaveGame Version\n");

From 53d5dd1e4033a7529bde07711b8af092b2bb6a4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 22:25:16 +0200
Subject: [PATCH 0647/2040] Differentiate saves from mohaa, mohta and mohtt

Fixes #339 where Spearhead and Breakthrough would also display saves from mohaa
---
 code/client/cl_uiloadsave.cpp |  4 ++++
 code/qcommon/q_shared.c       |  2 +-
 code/qcommon/q_shared.h       | 10 +++++++++-
 code/server/sv_ccmds.c        |  3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uiloadsave.cpp b/code/client/cl_uiloadsave.cpp
index 25785048..a48e0f72 100644
--- a/code/client/cl_uiloadsave.cpp
+++ b/code/client/cl_uiloadsave.cpp
@@ -162,6 +162,10 @@ void UIFAKKLoadGameClass::SetupFiles(void)
             continue;
         }
 
+        if (save.type != com_target_game->integer) {
+            continue;
+        }
+
         gametime = (save.mapTime / 1000);
         date     = save.time;
 
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 61b88ea1..90a8b290 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -2192,7 +2192,7 @@ int Com_IndexForGrowListElement(const growList_t * list, const void *element)
 }
 
 void Com_SwapSaveStruct(savegamestruct_t* save) {
-	save->version = LittleLong(save->version);
+	save->version = LittleShort(save->version);
 	save->time = LittleLong(save->time);
 	save->mapTime = LittleLong(save->mapTime);
 
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 946867b8..d286a7f0 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1461,7 +1461,15 @@ typedef struct {
 #define SAVEGAME_STRUCT_VERSION 4
 
 typedef struct savegamestruct_s {
-	int version;
+	//int version
+	// Modified in OPM
+	//===
+	short version;
+	// The type matches com_target_game
+	byte type;
+	// Currently unused
+	byte flags;
+	//===
 	int time;
 	int mapTime;
 	char comment[ 64 ];
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 970b9635..cb710e43 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1992,6 +1992,9 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 		SV_SetConfigstring( CS_SAVENAME, "" );
 
 		save.version = SAVEGAME_STRUCT_VERSION;
+		save.type = com_target_game->integer;
+		save.flags = 0;
+
 		save.time = aclock;
 		strncpy( save.mapName, svs.mapName, sizeof( save.mapName ) );
 		strncpy( save.saveName, svs.gameName, sizeof( save.saveName ) );

From e3936f52a23e85ad4d61d94ec1abd6abf8e68ef9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 22:35:13 +0200
Subject: [PATCH 0648/2040] Move Com_SwapSaveStruct to a better place

---
 code/qcommon/common.cpp | 9 +++++++++
 code/qcommon/q_shared.c | 9 ---------
 code/qcommon/q_shared.h | 2 --
 code/qcommon/qcommon.h  | 1 +
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 5edc49db..464dbb3b 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -2403,6 +2403,15 @@ qboolean COM_IsMapValid(const char* name) {
 	*/
 }
 
+void Com_SwapSaveStruct(savegamestruct_t* save) {
+	save->version = LittleShort(save->version);
+	save->time = LittleLong(save->time);
+	save->mapTime = LittleLong(save->mapTime);
+
+	save->tm_loopcount = LittleLong(save->tm_loopcount);
+	save->tm_offset = LittleLong(save->tm_offset);
+}
+
 //------------------------------------------------------------------------
 
 
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 90a8b290..b9d679a0 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -2190,12 +2190,3 @@ int Com_IndexForGrowListElement(const growList_t * list, const void *element)
 	}
 	return -1;
 }
-
-void Com_SwapSaveStruct(savegamestruct_t* save) {
-	save->version = LittleShort(save->version);
-	save->time = LittleLong(save->time);
-	save->mapTime = LittleLong(save->mapTime);
-
-	save->tm_loopcount = LittleLong(save->tm_loopcount);
-	save->tm_offset = LittleLong(save->tm_offset);
-}
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index d286a7f0..63f6dd31 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1107,8 +1107,6 @@ int             Com_AddToGrowList(growList_t * list, void *data);
 void           *Com_GrowListElement(const growList_t * list, int index);
 int             Com_IndexForGrowListElement(const growList_t * list, const void *element);
 
-void			Com_SwapSaveStruct(struct savegamestruct_s* save);
-
 
 //=============================================
 
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index c990ad7b..6baab452 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1096,6 +1096,7 @@ const char *Com_GetArchiveFolder();
 void Com_WipeSavegame( const char *savename );
 qboolean Com_ShiftedStrStr(const char* shifted, const char* name, int offset);
 qboolean COM_IsMapValid(const char* name);
+void Com_SwapSaveStruct(savegamestruct_t* save);
 
 
 /*

From d6d40975e5f2ac4512cb8cdab818d0070f2f460b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 23:30:33 +0200
Subject: [PATCH 0649/2040] Add more file debug print

---
 code/fgame/g_utils.cpp | 60 +++++++++---------------------------------
 1 file changed, 12 insertions(+), 48 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index a603c31c..57eaf3c9 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -96,7 +96,6 @@ G_TouchTriggers
 ============
 */
 void G_TouchTriggers(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -142,7 +141,6 @@ to force all entities it covers to immediately touch it
 ============
 */
 void G_TouchSolids(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -171,7 +169,6 @@ void G_TouchSolids(Entity *ent)
 }
 
 void G_ShowTrace(trace_t *trace, const gentity_t *passent, const char *reason)
-
 {
     str text;
     str pass;
@@ -237,7 +234,6 @@ void G_ShowSightTrace(gentity_t *passent1, gentity_t *passent2, const char *reas
 }
 
 void G_CalcBoundsOfMove(Vector& start, Vector& end, Vector& mins, Vector& maxs, Vector *minbounds, Vector *maxbounds)
-
 {
     Vector bmin;
     Vector bmax;
@@ -378,7 +374,6 @@ trace_t G_Trace(
     const char      *reason,
     qboolean         tracedeep
 )
-
 {
     int     entnum;
     trace_t trace;
@@ -420,7 +415,6 @@ trace_t G_Trace(
     const char   *reason,
     qboolean      tracedeep
 )
-
 {
     gentity_t *ent;
     int        entnum;
@@ -466,7 +460,6 @@ void G_TraceEntities(
     int                  contentmask,
     qboolean             bIncludeTriggers
 )
-
 {
     trace_t    trace;
     vec3_t     boxmins;
@@ -544,7 +537,6 @@ Returns the distance to the nearest player from the given spot
 ================
 */
 float PlayersRangeFromSpot(Entity *spot)
-
 {
     Entity *player;
     float   bestplayerdistance;
@@ -583,7 +575,6 @@ to other players
 ================
 */
 Entity *SelectRandomDeathmatchSpawnPoint(void)
-
 {
     Entity *spot, *spot1, *spot2;
     int     count = 0;
@@ -642,7 +633,6 @@ SelectFarthestDeathmatchSpawnPoint
 ================
 */
 Entity *SelectFarthestDeathmatchSpawnPoint(void)
-
 {
     Entity *bestspot;
     float   bestdistance;
@@ -672,7 +662,6 @@ Entity *SelectFarthestDeathmatchSpawnPoint(void)
 }
 
 Entity *SelectDeathmatchSpawnPoint(void)
-
 {
     if (DM_FLAG(DF_SPAWN_FARTHEST)) {
         return SelectFarthestDeathmatchSpawnPoint();
@@ -693,7 +682,6 @@ is not a staircase.
 int c_yes, c_no;
 
 qboolean M_CheckBottom(Entity *ent)
-
 {
     Vector  mins, maxs, start, stop;
     trace_t trace;
@@ -766,7 +754,6 @@ realcheck:
 }
 
 Entity *G_FindClass(Entity *ent, const char *classname)
-
 {
     int        entnum;
     gentity_t *from;
@@ -790,7 +777,6 @@ Entity *G_FindClass(Entity *ent, const char *classname)
 }
 
 Entity *G_FindTarget(Entity *ent, const char *name)
-
 {
     SimpleEntity *next;
 
@@ -845,7 +831,6 @@ Entity *G_FindRandomTarget(const char *name)
 }
 
 Entity *G_NextEntity(Entity *ent)
-
 {
     gentity_t *from;
 
@@ -879,7 +864,6 @@ Entity *G_NextEntity(Entity *ent)
 // just constant angles.
 //
 Vector G_GetMovedir(float angle)
-
 {
     if (angle == -1) {
         return Vector(0, 0, 1);
@@ -927,7 +911,6 @@ of ent.  Ent should be unlinked before calling this!
 =================
 */
 qboolean KillBox(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -979,9 +962,8 @@ qboolean KillBox(Entity *ent)
 }
 
 qboolean IsNumeric(const char *str)
-
 {
-    int      len;
+    size_t   len;
     int      i;
     qboolean dot;
 
@@ -1014,7 +996,6 @@ findradius (org, radius)
 =================
 */
 Entity *findradius(Entity *startent, Vector org, float rad)
-
 {
     Vector     eorg;
     gentity_t *from;
@@ -1069,7 +1050,6 @@ findclientinradius (org, radius)
 =================
 */
 Entity *findclientsinradius(Entity *startent, Vector org, float rad)
-
 {
     Vector     eorg;
     gentity_t *ed;
@@ -1104,7 +1084,6 @@ Entity *findclientsinradius(Entity *startent, Vector org, float rad)
 }
 
 Vector G_CalculateImpulse(Vector start, Vector end, float speed, float gravity)
-
 {
     float  traveltime, vertical_speed;
     Vector dir, xydir, velocity;
@@ -1122,7 +1101,6 @@ Vector G_CalculateImpulse(Vector start, Vector end, float speed, float gravity)
 }
 
 Vector G_PredictPosition(Vector start, Vector target, Vector targetvelocity, float speed)
-
 {
     Vector projected;
     float  traveltime;
@@ -1143,7 +1121,6 @@ G_ArchiveEdict
 ==============
 */
 void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
-
 {
     int i;
     str tempStr;
@@ -1332,7 +1309,6 @@ Sets the pos trajectory for a fixed position
 ===============
 */
 void G_SetTrajectory(gentity_t *ent, vec3_t org)
-
 {
     ent->s.pos.trTime = 0;
     VectorClear(ent->s.pos.trDelta);
@@ -1348,7 +1324,6 @@ Sets the encoded constant light parameter for entities
 ===============
 */
 void G_SetConstantLight(int *constantlight, float *red, float *green, float *blue, float *radius, int *lightStyle)
-
 {
     int ir, ig, ib, iradius;
 
@@ -1444,46 +1419,45 @@ void G_ProcessCacheInitCommands(dtiki_t *tiki)
 }
 
 void CacheResource(const char *stuff)
-
 {
     AliasListNode_t *ret;
     qboolean         streamed = qfalse;
     char             filename[MAX_STRING_TOKENS];
 
+    assert(stuff);
     if (!stuff) {
         return;
     }
 
+    if (gi.fsDebug->integer == 2) {
+        Com_Printf("server cache: %s\n", stuff);
+    }
+
     if (!strchr(stuff, '.')) {
         // must be a global alias
         stuff = gi.GlobalAlias_FindRandom(stuff, &ret);
         if (!stuff) {
-            if (gi.fsDebug->integer) {
+            if (gi.fsDebug->integer == 2) {
                 Com_Printf("alias not found\n");
             }
 
             return;
         }
         streamed = ret->streamed;
+        if (gi.fsDebug->integer == 2) {
+            Com_Printf("=> %s\n", stuff);
+        }
     }
 
     strcpy(filename, stuff);
     gi.FS_CanonicalFilename(filename);
 
-    if (strstr(filename, ".wav")) {
-        gi.soundindex(filename, streamed);
-    } else if (strstr(filename, ".mp3")) {
+    if (strstr(filename, ".wav") || strstr(filename, ".mp3")) {
         gi.soundindex(filename, streamed);
     } else if (strstr(filename, ".tik")) {
         dtiki_t *tiki;
 
-        if (*stuff && strncmp("models/", stuff, 7)) {
-            sprintf(filename, "models/%s", stuff);
-        } else {
-            strcpy(filename, stuff);
-        }
-
-        gi.FS_CanonicalFilename(filename);
+        Q_strncpyz(filename, CanonicalTikiName(stuff), sizeof(filename));
 
         tiki = gi.TIKI_RegisterModel(filename);
 
@@ -1791,7 +1765,6 @@ void CloneEntity(Entity *dest, Entity *src)
 }
 
 weaponhand_t WeaponHandNameToNum(str side)
-
 {
     if (!side.length()) {
         gi.DPrintf("WeaponHandNameToNum : Weapon hand not specified\n");
@@ -1808,7 +1781,6 @@ weaponhand_t WeaponHandNameToNum(str side)
 }
 
 const char *WeaponHandNumToName(weaponhand_t hand)
-
 {
     switch (hand) {
     case WEAPON_MAIN:
@@ -1821,7 +1793,6 @@ const char *WeaponHandNumToName(weaponhand_t hand)
 }
 
 firemode_t WeaponModeNameToNum(str mode)
-
 {
     if (!mode.length()) {
         gi.DPrintf("WeaponModeNameToNum : Weapon mode not specified\n");
@@ -1913,7 +1884,6 @@ str G_WeaponClassNumToName(int num)
 }
 
 void G_DebugTargets(Entity *e, str from)
-
 {
     gi.DPrintf("DEBUGTARGETS:%s ", from.c_str());
 
@@ -1931,7 +1901,6 @@ void G_DebugTargets(Entity *e, str from)
 }
 
 void G_DebugDamage(float damage, Entity *victim, Entity *attacker, Entity *inflictor)
-
 {
     gi.DPrintf(
         "Victim:%s Attacker:%s Inflictor:%s Damage:%f\n",
@@ -1954,7 +1923,6 @@ void G_FadeOut(float delaytime)
 }
 
 void G_AutoFadeIn(void)
-
 {
     level.m_fade_time_start = 1;
     level.m_fade_time       = 1;
@@ -1967,7 +1935,6 @@ void G_AutoFadeIn(void)
 }
 
 void G_ClearFade(void)
-
 {
     level.m_fade_time = -1;
     level.m_fade_type = fadein;
@@ -2030,7 +1997,6 @@ void G_PlayerDied(float delaytime)
 }
 
 void G_MissionFailed(void)
-
 {
     // Make the music system play the failure music for this level
     ChangeMusic("failure", "normal", true);
@@ -2044,14 +2010,12 @@ void G_MissionFailed(void)
 }
 
 void G_StartCinematic(void)
-
 {
     level.cinematic = true;
     gi.cvar_set("sv_cinematic", "1");
 }
 
 void G_StopCinematic(void)
-
 {
     // clear out the skip thread
     level.cinematic = false;

From 56775399d31c2bc3e1e1531fce57870967b55f6d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 23 Aug 2024 23:38:42 +0200
Subject: [PATCH 0650/2040] Fix 3D sounds not being attached to an entity when
 specified

---
 code/client/snd_openal_new.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 7ee25fd7..559a939b 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1522,6 +1522,7 @@ void S_OPENAL_StartSound(
         pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = 0;
     } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_NO_ENTITY;
         pChannel->iEntNum = iEntNum;
         if (vOrigin) {
             VectorCopy(vOrigin, pChannel->vOrigin);

From 6506577787baac22a2269580c025d17a044b38f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 00:16:46 +0200
Subject: [PATCH 0651/2040] Add shader flags with tcMod rotate

This fixes vehicle wheels rotating forever. Wheels now rotate consistently depending on the vehicle speed
---
 code/renderer/tr_shader.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 50797274..8c0d8edb 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -685,6 +685,7 @@ static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 		}
 
 		tmi->type = TMOD_ROTATE;
+		shader.flags |= 2;
 	}
     else if (!Q_stricmp(token, "offset")) {
         token = COM_ParseExt(text, qfalse);

From 32b0b2dfac35b8fce92cbfa0d5b383fe51ea7ba1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 00:38:06 +0200
Subject: [PATCH 0652/2040] Fix camera angles changing too much when switching
 between linked turrets

---
 code/fgame/vehicleturret.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index a100b02b..c2c2071a 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -2041,7 +2041,7 @@ void VehicleTurretGunTandem::RemoteControl(usercmd_t *ucmd, Sentient *owner)
 
     vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
 
-    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[2]) {
+    if (m_vUserLastCmdAng[0] || m_vUserLastCmdAng[1] || m_vUserLastCmdAng[2]) {
         m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
         m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
         m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);
@@ -2062,7 +2062,7 @@ void VehicleTurretGunTandem::RemoteControlSecondary(usercmd_t *ucmd, Sentient *o
 
     vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
 
-    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[2]) {
+    if (m_vUserLastCmdAng[0] || m_vUserLastCmdAng[1] || m_vUserLastCmdAng[2]) {
         m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
         m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
         m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);

From 1c8b4a1922a17bd2eaa9b59806d0dcaee5c9988c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 01:03:36 +0200
Subject: [PATCH 0653/2040] Update the documentation to reflect the current
 state of the project

---
 README.md                       | 10 +++++-----
 docs/features.md                |  2 +-
 docs/features_implementation.md | 22 ++++++++++++----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 10317740..cf18a7e5 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,10 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 
 ## Current state
 
+### Single-player
+
+The entire single-player campaign can be played from start to end. There may be occasional bugs though; if you encounter any, please create a GitHub issue describing them.
+
 ### Multiplayer
 
 The Multiplayer part is almost fully stable.
@@ -34,13 +38,9 @@ Server admins can use OpenMoHAA to [host](docs/getting_started_installation.md#s
 
 All game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liberation` from Medal of Honor: Breakthrough are implemented and are working as intended. Mods like `Freeze-Tag` are working as well.
 
-### Single-player
-
-The `training` map can be played from start to end. The single-player campaign is not fully functional, but at least AI can breathe, talk, run, and shoot.
-
 ## Features
 
-- [What's working and what's not](docs/features_implementation.md)
+- [What's working](docs/features_implementation.md)
 - [New features](docs/features.md)
 - [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html)
 
diff --git a/docs/features.md b/docs/features.md
index 707af024..8c1f3a49 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -8,7 +8,7 @@ A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, gre
 
 - Features from ioquake3
 - IPv6 support (from ioquake3)
-- Features from SH 2.15 and BT 2.40
+- Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
 
 ### Server-side
 
diff --git a/docs/features_implementation.md b/docs/features_implementation.md
index f013c171..3895a2c1 100644
--- a/docs/features_implementation.md
+++ b/docs/features_implementation.md
@@ -2,24 +2,26 @@
 
 ## Server
 
-The server version can be built successfully, but some features are not functional. For example, the Actor system is almost fully implemented, but it is not yet stable. This means that Actor may not work as expected and could cause crashes.
-
-Overall, the server and the fgame components are almost fully implemented, but they may not be completely stable. There could be some minor bugs (and rare crashes), but the game should be playable.
+The server version can be built successfully. The server and the fgame components are fully implemented, the single-player campaign can be played from start to end in MOH:AA, MOH:SH and MOH:BT. However there could be some minor bugs (and rare crashes), but overall, the game should be playable.
 
 ## Client
 
-The client version of OpenMoHAA has undergone partial implementation, with the cgame module being nearly completed. Credits to the SDK of **Heavy Metal: F.A.K.K. 2** both the cgame and fgame modules.
+The client version of OpenMoHAA is also fully implemented with a few bugs remaining, and with the cgame module being nearly completed. Credits to the SDK of **Heavy Metal: F.A.K.K. 2** both the cgame and fgame modules.
+
+OpenMoHAA is using OpenAL for the audio.
 
 The current operational status for each component is as follow:
 
 | Component               | Full | Almost | Half | Early | Bad | Not working | Comment                                                           |
 |-------------------------|------|--------|------|-------|-----|-------------|-------------------------------------------------------------------|
-| Audio                   |      |        |      |       | x   |             | Very basic implementation from Quake III                          |
-| CG Module               |      | x      |      |       |     |             | Missing FX, Marks and decals                                      |
+| Audio                   | x    |        |      |       |     |             | Full implementation using OpenAL, there may still be some bugs    |
+| CG Module               |      | x      |      |       |     |             | Need more fixes for FX, marks and decals                          |
 | Client                  | x    |        |      |       |     |             |                                                                   |
 | Collision               | x    |        |      |       |     |             |                                                                   |
 | Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                   |
-| Renderer                |      | x      |      |       |     |             | Missing ghost, marks, sphere lights, sky portal, sun flare, swipe |
-| Server                  |      | x      |      |       |     |             | Probably a few bugs remaining                                     |
-| Server module (fgame)   |      | x      |      |       |     |             | Actor, and few gameplay bugs                                      |
-| UI                      |      | x      |      |       |     |             | A few bugs to fix                                                 |
+| Renderer                | x    | x      |      |       |     |             | Missing ghost, sun flare, swipe, some lighting bugs               |
+| Server                  | x    |        |      |       |     |             |                                                                   |
+| Server module (fgame)   | x    |        |      |       |     |             | There might still be some AI/gameplay bugs                        |
+| UI                      | x    |        |      |       |     |             |                                                                   |
+
+Full = code is fully working, however it doesn't mean it's bug-free.

From 3b94904ea83486c23d49fe723daf1168d01d2829 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:01:37 +0200
Subject: [PATCH 0654/2040] Update getting started

---
 docs/getting_started_running.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 33c1a070..1edcb433 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -2,13 +2,15 @@
 
 ## Game selection
 
+**Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
+
 **Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable. To play an expansion, append the following command-line arguments to the executable:
 
-- `+set com_target_game 1` for Spearhead (mohaas/mohta)
-- `+set com_target_game 2` for Breakthrough (mohaab/mohtt)
+- `+set com_target_game 1` for Spearhead (mohaas/mohta, mainta)
+- `+set com_target_game 2` for Breakthrough (mohaab/mohtt, maintt)
 
 On Windows, you can create a shortcut to OpenMoHAA with these command-line arguments.
-The default value of `com_target_game` is 0 for the base game (main).
+The default value of `com_target_game` is 0 for the base game (mohaa, main).
 
 With `com_target_game`, OpenMoHAA will support the network protocol accordingly.
 

From 54ceff51077c28d75f69162c77563e1c7e06a71d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:25:25 +0200
Subject: [PATCH 0655/2040] Process the value of `s_speaker_type`

---
 code/client/snd_openal_new.cpp | 46 ++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 559a939b..15cec24b 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -26,6 +26,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../server/server.h"
 #include "snd_codec.h"
 
+#if defined(_MSC_VER) || defined(__APPLE__)
+#  include <alext.h>
+#else
+#  include <AL/alext.h>
+#endif
+
 typedef struct {
     const char  *funcname;
     void       **funcptr;
@@ -261,7 +267,7 @@ S_OPENAL_InitContext
 static bool S_OPENAL_InitContext()
 {
     const char *dev;
-    int         attrlist[6];
+    int         attrlist[8];
 
     dev = NULL;
     if (s_openaldevice) {
@@ -366,12 +372,35 @@ static bool S_OPENAL_InitContext()
         break;
     }
 
-    attrlist[0] = 256;
+    attrlist[0] = ALC_FREQUENCY;
     attrlist[1] = al_frequency;
-    attrlist[2] = 258;
-    attrlist[3] = 0;
-    attrlist[4] = 0;
-    attrlist[5] = 0;
+    attrlist[2] = ALC_SYNC;
+    attrlist[3] = qfalse;
+
+    attrlist[4] = ALC_OUTPUT_MODE_SOFT;
+
+    switch (s_speaker_type->integer) {
+    // Two speakers
+    default:
+    case 0:
+        attrlist[5] = ALC_STEREO_SOFT;
+        break;
+    // Headphones
+    case 1:
+        attrlist[5] = ALC_STEREO_HRTF_SOFT;
+        break;
+    // Surround
+    case 2:
+        attrlist[5] = ALC_SURROUND_5_1_SOFT;
+        break;
+    // Quad speakers
+    case 3:
+        attrlist[5] = ALC_QUAD_SOFT;
+        break;
+    }
+
+    attrlist[6] = 0;
+    attrlist[7] = 0;
 
     Com_Printf("OpenAL: Creating AL context...\n");
     al_context_id = qalcCreateContext(al_device, attrlist);
@@ -2465,8 +2494,9 @@ void S_OPENAL_Update()
 
     if (s_speaker_type->modified) {
         if (s_speaker_type->integer) {
-            Com_Printf("FIXME: Allow different speaker types in OpenAL code.\n");
-            Cvar_Set("s_speaker_type", "0");
+            //Com_Printf("FIXME: Allow different speaker types in OpenAL code.\n");
+            //Cvar_Set("s_speaker_type", "0");
+            Cbuf_AddText("snd_restart\n");
         }
         s_speaker_type->modified = false;
     }

From c70c5781946dd216bc3a2b12fa1399822458e384 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:51:21 +0200
Subject: [PATCH 0656/2040] Ignore ALC_OUTPUT_MODE_SOFT if unavailable

---
 code/client/snd_openal_new.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 15cec24b..fa7014b6 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -269,6 +269,8 @@ static bool S_OPENAL_InitContext()
     const char *dev;
     int         attrlist[8];
 
+    Com_DPrintf("OpenAL: Context initialization\n");
+
     dev = NULL;
     if (s_openaldevice) {
         dev = s_openaldevice->string;
@@ -278,8 +280,6 @@ static bool S_OPENAL_InitContext()
         dev = NULL;
     }
 
-    Com_DPrintf("OpenAL: Context initialization\n");
-
 	// Device enumeration support
 	enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
 	enumeration_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
@@ -296,7 +296,6 @@ static bool S_OPENAL_InitContext()
 		// get all available devices + the default device name.
 		if(enumeration_all_ext)
 		{
-            Com_DPrintf("OpenAL: Fetching all devices\n");
 			devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
 #ifdef _WIN32
 			defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
@@ -304,7 +303,6 @@ static bool S_OPENAL_InitContext()
 		}
 		else
 		{
-            Com_DPrintf("OpenAL: Fetching current device\n");
 			// We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
 			devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
 #ifdef _WIN32
@@ -377,6 +375,7 @@ static bool S_OPENAL_InitContext()
     attrlist[2] = ALC_SYNC;
     attrlist[3] = qfalse;
 
+#ifdef ALC_SOFT_output_mode
     attrlist[4] = ALC_OUTPUT_MODE_SOFT;
 
     switch (s_speaker_type->integer) {
@@ -398,6 +397,13 @@ static bool S_OPENAL_InitContext()
         attrlist[5] = ALC_QUAD_SOFT;
         break;
     }
+#else
+#  pragma message("OpenAL: ALC_OUTPUT_MODE_SOFT unavailable") 
+
+    Com_Printf("OpenAL: ALC_OUTPUT_MODE_SOFT is unavailable. The speaker type will be ignored, fallback to normal stereo.\n");
+    attrlist[4] = 0;
+    attrlist[5] = 0;
+#endif
 
     attrlist[6] = 0;
     attrlist[7] = 0;

From d64e88451fe563dc2e26c7a0432ea1e23693898c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 15:08:42 +0200
Subject: [PATCH 0657/2040] Fix compiler warnings

Note that in Dismiss(), checking for `this` is not necessary (original code was generated by the compiler)
---
 code/uilib/uinotepad.cpp   | 2 +-
 code/uilib/uipopupmenu.cpp | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index 556b6b6f..c3c821d2 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -143,7 +143,7 @@ static ctrlevent_s controlEvents[CTRL_EVENT_COUNT] = {
     {'c',  &EV_Notepad_Copy                 },
     {'x',  &EV_Notepad_Cut                  },
     {'v',  &EV_Notepad_Paste                },
-    {NULL, NULL                             },
+    {0,    NULL                             },
 };
 
 bool UI_LoadNotepadFile(const char *filename)
diff --git a/code/uilib/uipopupmenu.cpp b/code/uilib/uipopupmenu.cpp
index 59e378f4..afcefc63 100644
--- a/code/uilib/uipopupmenu.cpp
+++ b/code/uilib/uipopupmenu.cpp
@@ -468,13 +468,9 @@ void UIPopupMenu::Dismiss
 
 {
 	// navigate to the topmost menu
-	if (m_parentMenu)
-	{
+	if (m_parentMenu) {
 		m_parentMenu->Dismiss();
-	}
-	else if (this)
-	{
-		// this is the topmost menu, self-destruct
+	} else {
 		delete this;
 	}
 }

From 8188d46ee7f98df5c1787f178802242911ba6034 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 15:10:12 +0200
Subject: [PATCH 0658/2040] Fix SetLittleLong() writing past end of `bytes`
 buffer

(even though the union was still 4-bytes because of the integer)
---
 code/client/snd_mem_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index 374a97f1..8d98346b 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -117,7 +117,7 @@ void SetLittleLong(int i)
 {
     union {
         int  value;
-        byte bytes[2];
+        byte bytes[4];
     } val;
 
     val.value = i;

From b457a84ed9b3d05afd8ff5239425351d786bcae6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 16:39:29 +0200
Subject: [PATCH 0659/2040] Fix `AL_DISTANCE_MODEL` value type, it must be an
 integer

---
 code/client/snd_openal_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index fa7014b6..68cc9b2a 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2873,7 +2873,7 @@ void openal_channel::set_3d()
     alDieIfError();
     qalSourcef(source, AL_GAIN, S_GetBaseVolume());
     alDieIfError();
-    qalSourcef(source, AL_DISTANCE_MODEL, AL_LINEAR_DISTANCE);
+    qalSourcei(source, AL_DISTANCE_MODEL, AL_LINEAR_DISTANCE);
     alDieIfError();
     //
     // Added in OPM

From 5134aed352c6da8b8dcc216ce8ba5bcfdf0b00f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:35:02 +0200
Subject: [PATCH 0660/2040] Mark the functions as inline to optimize function
 calls

---
 code/renderer/tr_model.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index c8cd21e9..48d8778f 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -946,7 +946,7 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
 SkelVertGetNormal
 =============
 */
-static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out ) {
+inline static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out ) {
 	out[ 0 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 0 ] +
 			vert->normal[ 1 ] * bone->matrix[ 1 ][ 0 ] +
 			vert->normal[ 2 ] * bone->matrix[ 2 ][ 0 ];
@@ -965,7 +965,7 @@ static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, ve
 SkelMorphGetXyz
 =============
 */
-static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
+inline static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
 	VectorMA(out, *morphcache, morph->offset, out);
 }
 
@@ -974,7 +974,7 @@ static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out
 SkelWeightGetXyz
 =============
 */
-static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out ) {
+inline static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out ) {
 	out[ 0 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 0 ] +
 				weight->offset[ 1 ] * bone->matrix[ 1 ][ 0 ] +
 				weight->offset[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
@@ -996,7 +996,7 @@ static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_
 SkelWeightMorphGetXyz
 =============
 */
-static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out ) {
+inline static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out ) {
 	vec3_t point;
 
 	VectorAdd( totalmorph, weight->offset, point );

From 00f27ac02d72e1d8be71bb3968993f9a2a198943 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:35:35 +0200
Subject: [PATCH 0661/2040] Fix improper sound distance values

---
 code/client/snd_openal_new.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 68cc9b2a..78e91522 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1501,9 +1501,6 @@ void S_OPENAL_StartSound(
     pChannel->iEntChannel   = iEntChannel;
     pChannel->iFlags &= ~(CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
     state = pChannel->get_state();
-    // Fixed in OPM
-    //  Setup the channel for 3D
-    pChannel->set_3d();
 
     if (pChannel->iEntNum == iEntNum && (state == AL_PLAYING || state == AL_PAUSED) && pChannel->pSfx == pSfx) {
         bOnlyUpdate = true;
@@ -1530,6 +1527,10 @@ void S_OPENAL_StartSound(
     pChannel->fVolume = S_GetBaseVolume() * fVolume;
     pChannel->set_gain(pChannel->fVolume);
 
+    // Fixed in OPM
+    //  Setup the channel for 3D
+    pChannel->set_3d();
+
     if (s_show_sounds->integer > 0) {
         Com_DPrintf(
             "%d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
@@ -2869,11 +2870,11 @@ void openal_channel::set_3d()
     alDieIfError();
     qalSourcei(source, AL_LOOPING, false);
     alDieIfError();
-    qalSourcef(source, AL_ROLLOFF_FACTOR, 0.5f);
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 1.0f);
     alDieIfError();
     qalSourcef(source, AL_GAIN, S_GetBaseVolume());
     alDieIfError();
-    qalSourcei(source, AL_DISTANCE_MODEL, AL_LINEAR_DISTANCE);
+    qalSourcei(source, AL_DISTANCE_MODEL, AL_LINEAR_DISTANCE_CLAMPED);
     alDieIfError();
     //
     // Added in OPM

From bf2626f80413b29e819f350217a4150afce07b52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:53:13 +0200
Subject: [PATCH 0662/2040] Set the pitch before playing the sound

---
 code/client/snd_openal_new.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 78e91522..881bfb96 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1595,9 +1595,14 @@ void S_OPENAL_StartSound(
     }
 
     if (!bOnlyUpdate && S_OPENAL_ShouldStart(pChannel->vOrigin, pChannel->fMinDist, pChannel->fMaxDist)) {
+        // Fixed in OPM
+        //  Make sure to set the pitch before playing the sound
+        pChannel->iBaseRate = pSfx->info.rate;
+        pChannel->set_sample_playback_rate(pChannel->iBaseRate * pChannel->fNewPitchMult);
+        pChannel->fNewPitchMult = 0;
+
         pChannel->play();
         pChannel->iEndTime   = cl.serverTime + (int)pChannel->pSfx->time_length + 250;
-        pChannel->iBaseRate  = pChannel->sample_playback_rate();
         pChannel->iStartTime = cl.serverTime;
     }
 }

From d399ffd609105c08e667956db6d752012b74abc1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 18:06:14 +0200
Subject: [PATCH 0663/2040] Set the correct sound velocity

---
 code/client/snd_openal_new.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 881bfb96..9d006b05 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -38,7 +38,7 @@ typedef struct {
     bool         required;
 } extensions_table_t;
 
-#    define MAX_MUSIC_SONGS 16
+#define MAX_MUSIC_SONGS 16
 
 static int   s_iNextLoopingWarning = 0;
 static int   s_iReverbType         = 0;
@@ -46,6 +46,7 @@ static float s_fReverbLevel        = 0;
 static bool  s_bReverbChanged      = false;
 static bool  s_bFading             = false;
 static float s_fFadeVolume         = 1.f;
+static float s_fVelocityScale      = 0.005f;
 
 static constexpr float s_fVolumeGain = 1.f; // = 84.f;
 
@@ -1914,6 +1915,7 @@ static int S_OPENAL_Start3DLoopSound(
     }
 
     pChan3D->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
+    VectorScale(pLoopSound->vVelocity, s_fVelocityScale, pLoopSound->vVelocity);
     pChan3D->set_velocity(pLoopSound->vVelocity[0], pLoopSound->vVelocity[1], pLoopSound->vVelocity[2]);
     pChan3D->pSfx = pLoopSound->pSfx;
     pChan3D->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
@@ -2252,6 +2254,8 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Velocity
     //
+    VectorCopy(s_entity[iEntNum].velocity, alvec);
+    VectorScale(alvec, s_fVelocityScale, alvec);
     qalListenerfv(AL_VELOCITY, alvec);
     alDieIfError();
 
@@ -2377,6 +2381,7 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                 pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 VectorCopy(s_entity[pChannel->iEntNum].velocity, vEntVelocity);
                 VectorCopy(vEntVelocity, vVelocity);
+                VectorScale(vVelocity, s_fVelocityScale, vVelocity);
                 pChannel->set_velocity(vVelocity[0], vVelocity[1], vVelocity[2]);
             }
         }

From 322ca2b42e4f7505567a3cc18ea50d0026fc7723 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 18:49:36 +0200
Subject: [PATCH 0664/2040] Fix the loop protection not working when multiple
 scripts are executed

This fix will apply the protection globally
---
 code/script/scriptvm.cpp | 76 +++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 6b614acd..981d5dd3 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -420,7 +420,7 @@ void ScriptVM::error(const char *format, ...)
     vsprintf(buffer, format, va);
     va_end(va);
 
-    glbs.Printf("----------------------------------------------------------\n%s\n", buffer);
+    gi.Printf("----------------------------------------------------------\n%s\n", buffer);
     m_ReturnValue.setStringValue("$.INTERRUPTED");
 }
 
@@ -1040,9 +1040,6 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
     state = STATE_RUNNING;
 
-    Director.cmdTime  = glbs.Milliseconds();
-    Director.cmdCount = 0;
-
     while (state == STATE_RUNNING) {
         if (g_scripttrace->integer && CanScriptTracePrint()) {
             switch (g_scripttrace->integer) {
@@ -1059,33 +1056,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
         m_PrevCodePos = m_CodePos;
 
-        Director.cmdCount++;
-
         try {
-            if (Director.cmdCount > 9999 && glbs.Milliseconds() - Director.cmdTime > Director.maxTime) {
-                if (level.m_LoopProtection) {
-                    Director.cmdTime = glbs.Milliseconds();
-
-                    GetScript()->PrintSourcePos(m_CodePos, true);
-                    gi.DPrintf2("\n");
-
-                    state = STATE_EXECUTION;
-
-                    if (level.m_LoopDrop) {
-                        ScriptException::next_abort = -1;
-                    }
-
-                    ScriptError("Command overflow. Possible infinite loop in thread.\n");
-                }
-
-                VM_DPrintf("Update of script position - This is not an error.\n");
-                VM_DPrintf("=================================================\n");
-                m_ScriptClass->GetScript()->PrintSourcePos(opcode, true);
-                VM_DPrintf("=================================================\n");
-
-                Director.cmdCount = 0;
-            }
-
             if (!m_VMStack.m_bMarkStack) {
                 /*
 				assert(pTop >= localStack && pTop < localStack + localStackSize);
@@ -1832,12 +1803,51 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
             default:
                 assert(!"Invalid opcode");
                 if (*opcode < OP_MAX) {
-                    glbs.DPrintf("unknown opcode %d ('%s')\n", *opcode, OpcodeName(*opcode));
+                    gi.DPrintf("unknown opcode %d ('%s')\n", *opcode, OpcodeName(*opcode));
                 } else {
-                    glbs.DPrintf("unknown opcode %d\n", *opcode);
+                    gi.DPrintf("unknown opcode %d\n", *opcode);
                 }
                 break;
             }
+
+            Director.cmdCount++;
+
+            if (Director.cmdCount >= 15000) {
+                if (!Director.cmdTime) {
+                    Director.cmdTime = gi.Milliseconds();
+                    Director.cmdCount = 0;
+                    continue;
+                }
+
+                if (gi.Milliseconds() - Director.cmdTime < Director.maxTime) {
+                    Director.cmdCount = 0;
+                    continue;
+                }
+
+                // The maximum execution time was reached
+                if (level.m_LoopProtection) {
+                    Director.cmdTime = gi.Milliseconds();
+
+                    GetScript()->PrintSourcePos(m_CodePos, true);
+                    gi.DPrintf2("\n");
+
+                    state = STATE_EXECUTION;
+
+                    if (level.m_LoopDrop) {
+                        ScriptException::next_abort = -1;
+                    }
+
+                    ScriptError("Command overflow. Possible infinite loop in thread.\n");
+                    break;
+                }
+
+                VM_DPrintf("Update of script position - This is not an error.\n");
+                VM_DPrintf("=================================================\n");
+                m_ScriptClass->GetScript()->PrintSourcePos(opcode, true);
+                VM_DPrintf("=================================================\n");
+
+                Director.cmdCount = 0;
+            }
         } catch (ScriptException& exc) {
             HandleScriptException(exc);
         }
@@ -1877,7 +1887,7 @@ void ScriptVM::HandleScriptException(ScriptException& exc)
     if (m_ScriptClass) {
         m_ScriptClass->GetScript()->PrintSourcePos(m_PrevCodePos, true);
     } else {
-        glbs.DPrintf("unknown source pos");
+        gi.DPrintf("unknown source pos");
     }
 
     if (exc.bAbort) {

From 91b80a8e2186c67292f79153fcbac6124af2ff40 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:19:38 +0200
Subject: [PATCH 0665/2040] Fix the sound system not restarting when modifying
 the speaker type to 0

---
 code/client/snd_openal_new.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 9d006b05..baeaa744 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2510,11 +2510,7 @@ void S_OPENAL_Update()
     }
 
     if (s_speaker_type->modified) {
-        if (s_speaker_type->integer) {
-            //Com_Printf("FIXME: Allow different speaker types in OpenAL code.\n");
-            //Cvar_Set("s_speaker_type", "0");
-            Cbuf_AddText("snd_restart\n");
-        }
+        Cbuf_AddText("snd_restart\n");
         s_speaker_type->modified = false;
     }
 

From e021289d363d48b1c584b6404efd564fad1550b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 24 Aug 2024 19:22:57 +0200
Subject: [PATCH 0666/2040] Fix the turret setting incorrect angles

---
 code/fgame/weapturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 96685089..a5900401 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1306,7 +1306,7 @@ void TurretGun::P_UserAim(usercmd_t *ucmd)
 
     vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
 
-    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[2]) {
+    if (m_vUserLastCmdAng[0] || m_vUserLastCmdAng[1] || m_vUserLastCmdAng[2]) {
         m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
         m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
         m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);

From 022181fcfdcf95b5c35e525d67a61bc08a9dc9d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 16:49:24 +0200
Subject: [PATCH 0667/2040] Remove processed buffers after half of the queued
 buffers has been processed

---
 code/client/snd_openal_new.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index baeaa744..508b62f1 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4372,10 +4372,12 @@ void openal_channel_two_d_stream::update()
     qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
     alDieIfError();
 
-    // Unqueue processed buffers
-    while (numProcessedBuffers-- > 0) {
-        ALuint tmpBuffer;
-        qalSourceUnqueueBuffers(source, 1, &tmpBuffer);
+    // Remove processed buffers after half of the queued buffers has been processed
+    if (numProcessedBuffers >= numQueuedBuffers / 2) {
+        while (numProcessedBuffers-- > 0) {
+            ALuint tmpBuffer;
+            qalSourceUnqueueBuffers(source, 1, &tmpBuffer);
+        }
     }
 
     if (numQueuedBuffers >= MAX_STREAM_BUFFERS) {

From e70cdfb8989755de9c6d6dcaf11b31584951c5db Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:00:55 +0200
Subject: [PATCH 0668/2040] Improve code readability

---
 code/server/sv_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 0faebf3a..145e3548 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -943,9 +943,9 @@ void SV_ServerLoaded( void ) {
 	sv.state = SS_GAME;
 	sv.timeResidual = 0;
 	svs.startTime = svs.time - svs.mapTime;
-	if( svs.time - svs.mapTime < 0 )
+	if( svs.startTime < 0 )
 	{
-		svs.time -= svs.time - svs.mapTime;
+		svs.time -= svs.startTime;
 		svs.startTime = 0;
 	}
 

From ac22b1cfbf3d6072f974c180a5d63dc09c433507 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:04:29 +0200
Subject: [PATCH 0669/2040] Use an higher fragment size when sending a message
 to the loopback

---
 code/qcommon/net_chan.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c
index 7376a01e..63a9ccf8 100644
--- a/code/qcommon/net_chan.c
+++ b/code/qcommon/net_chan.c
@@ -46,10 +46,10 @@ to the new value before sending out any replies.
 
 */
 
+#define	MAX_PACKETLEN					10000		// max size of a network packet
+#define	MAX_REMOTE_PACKETLEN			1400		// max size of a network packet
 
-#define	MAX_PACKETLEN			1400		// max size of a network packet
-
-#define	FRAGMENT_SIZE			(MAX_PACKETLEN - 100)
+#define FRAGMENT_SIZE			(((chan->remoteAddress.type == NA_LOOPBACK) ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN) - 100)
 #define	PACKET_HEADER			10			// two ints and a short
 
 #define	FRAGMENT_BIT	(1<<31)
@@ -198,7 +198,7 @@ void Netchan_TransmitNextFragment( netchan_t *chan ) {
 	size_t		fragmentLength;
 
 	// write the packet header
-	MSG_InitOOB (&send, send_buf, sizeof(send_buf));				// <-- only do the oob here
+	MSG_InitOOB (&send, send_buf, chan->remoteAddress.type == NA_LOOPBACK ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN); // <-- only do the oob here
 
 	MSG_WriteLong( &send, chan->outgoingSequence | FRAGMENT_BIT );
 
@@ -250,8 +250,8 @@ A 0 length will still generate a packet.
 ================
 */
 void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
-	msg_t		send;
-	byte		send_buf[MAX_PACKETLEN];
+	msg_t			send;
+	byte			send_buf[MAX_PACKETLEN];
 
 	if ( length > MAX_MSGLEN ) {
 		Com_Error( ERR_DROP, "Netchan_Transmit: length = %zu", length );
@@ -271,7 +271,7 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
 	}
 
 	// write the packet header
-	MSG_InitOOB (&send, send_buf, sizeof(send_buf));
+	MSG_InitOOB (&send, send_buf, chan->remoteAddress.type == NA_LOOPBACK ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN);
 
 	MSG_WriteLong( &send, chan->outgoingSequence );
 	chan->outgoingSequence++;

From 07f13d1ae97e081f91782b9dd9614ff49b0fe54a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 25 Aug 2024 23:45:18 +0200
Subject: [PATCH 0670/2040] Force the soundtrack to be sent again

---
 code/fgame/g_utils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 57eaf3c9..1a3ae238 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1528,7 +1528,12 @@ void ChangeSoundtrack(const char *soundtrack)
     level.saved_soundtrack   = level.current_soundtrack;
     level.current_soundtrack = soundtrack;
 
+    // Force the soundtrack to be sent again by setting it to empty first
+    // so it gets sent to clients again especially when loading
+    // from a saved game
+    gi.setConfigstring(CS_MUSIC, "");
     gi.setConfigstring(CS_MUSIC, soundtrack);
+
     gi.DPrintf("soundtrack switched to %s.\n", soundtrack);
 }
 

From 702318489272d12fcc8b1bcb9f6c5dee4ca46746 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:11:51 +0200
Subject: [PATCH 0671/2040] Fix subdivisions endianness

See #332
---
 code/renderer/tr_bsp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 39d3338e..f469330e 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -726,6 +726,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
     int				lightmapNum;
     vec3_t			bounds[2];
     vec3_t			tmpVec;
+    float           subdivisions;
     static surfaceType_t	skipData = SF_SKIP;
 
     lightmapNum = LittleLong( ds->lightmapNum );
@@ -764,8 +765,9 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
     }
 
     // pre-tesseleate
-    if (ds->subdivisions) {
-        grid = R_SubdividePatchToGrid(width, height, ds->subdivisions * (r_subdivisions->value / 10.0), points);
+    subdivisions = LittleFloat(ds->subdivisions);
+    if (subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, subdivisions * (r_subdivisions->value / 10.0), points);
     } else if (surf->shader->subdivisions) {
         grid = R_SubdividePatchToGrid(width, height, surf->shader->subdivisions * (r_subdivisions->value / 10.0), points);
     } else {

From 6ab654264b6aafe3b9f588afa30e30ea97f657eb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 00:45:25 +0200
Subject: [PATCH 0672/2040] Cleaned up Entity::ProcessSoundEvent()

---
 code/fgame/entity.cpp | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 57af734b..703daf22 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3310,7 +3310,7 @@ void Entity::ProcessSoundEvent(Event *ev, qboolean checkSubtitle)
 {
     str   sound_name;
     str   wait;
-    int   waitTillDone = 0;
+    bool  waitTillDone = false;
     float volume;
     int   channel = 0;
 
@@ -3330,30 +3330,24 @@ void Entity::ProcessSoundEvent(Event *ev, qboolean checkSubtitle)
         wait = ev->GetString(2);
     }
 
-    if (Q_stricmp(wait.c_str(), "wait")) {
-        if (!Q_stricmp(wait.c_str(), "volume")) {
-            if (ev->NumArgs() != 3) {
-                ScriptError("Entity::Sound: volume not followed by a float");
-            }
-
-            volume = ev->GetFloat(3);
-        }
-    } else {
-        waitTillDone = 1;
+    if (!Q_stricmp(wait.c_str(), "wait")) {
+        waitTillDone = true;
 
         if (ev->NumArgs() == 3) {
             volume = ev->GetFloat(3);
         }
+    } else if (!Q_stricmp(wait.c_str(), "volume")) {
+        if (ev->NumArgs() != 3) {
+            ScriptError("Entity::Sound: volume not followed by a float");
+        }
+
+        volume = ev->GetFloat(3);
     }
 
     if (volume == DEFAULT_VOL) {
-        if (wait.length()) {
-            channel = atoi(wait.c_str());
-        }
-
-        Sound(sound_name, channel, volume, 0, NULL, 0, 0, waitTillDone, checkSubtitle, -1.0f);
+        Sound(sound_name, CHAN_AUTO, volume, 0, NULL, 0, 0, waitTillDone, checkSubtitle, -1.0f);
     } else {
-        Sound(sound_name, -1.0f, volume, -1.0f, NULL, -1.0f, 1, waitTillDone, checkSubtitle, -1.0f);
+        Sound(sound_name, -1, volume, -1.0f, NULL, -1.0f, 1, waitTillDone, checkSubtitle, -1.0f);
     }
 }
 

From 93e7561cb302df8dfa4baadf406099ccec2adbc8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 01:05:58 +0200
Subject: [PATCH 0673/2040] Fix Actor::EventSoundDone() using the wrong
 parameter for the sfxName, causing the SoundDone event to be sent immediately

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 65054c3f..14f0707c 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -10589,7 +10589,7 @@ void Actor::EventSoundDone(Event *ev)
     str sfxName;
 
     channelNum = ev->GetInteger(1);
-    sfxName    = ev->GetString(1);
+    sfxName    = ev->GetString(2);
 
     if (gi.S_IsSoundPlaying(channelNum, sfxName)) {
         Event event(EV_SoundDone);

From 0b1a20dcff035eac9f1903a1e3b1c04868e5b0c8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 01:06:02 +0200
Subject: [PATCH 0674/2040] Properly save and restore sound position, also fix
 loopsounds not playing properly

---
 code/client/snd_openal_new.cpp | 681 +++++++++++++++++++++++----------
 code/client/snd_openal_new.h   | 109 +++---
 2 files changed, 540 insertions(+), 250 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 508b62f1..684314f7 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -27,15 +27,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "snd_codec.h"
 
 #if defined(_MSC_VER) || defined(__APPLE__)
-#  include <alext.h>
+#    include <alext.h>
 #else
-#  include <AL/alext.h>
+#    include <AL/alext.h>
 #endif
 
 typedef struct {
-    const char  *funcname;
-    void       **funcptr;
-    bool         required;
+    const char *funcname;
+    void      **funcptr;
+    bool        required;
 } extensions_table_t;
 
 #define MAX_MUSIC_SONGS 16
@@ -97,7 +97,7 @@ int             music_loaded            = 0;
 int             music_numsongs          = 0;
 int             music_currentsong       = 0;
 
-static qboolean enumeration_ext = qfalse;
+static qboolean enumeration_ext     = qfalse;
 static qboolean enumeration_all_ext = qfalse;
 
 song_t            music_songs[MAX_MUSIC_SONGS];
@@ -111,23 +111,23 @@ static void S_OPENAL_StopMP3();
 static void S_OPENAL_Pitch();
 static int
 S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
-static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
-static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx);
+static void   S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
+static bool   S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t *pSfx);
 static ALuint S_OPENAL_Format(int width, int channels);
 
-#    define alDieIfError() __alDieIfError(__FILE__, __LINE__)
+#define alDieIfError() __alDieIfError(__FILE__, __LINE__)
 
-#    if defined(_WIN64)
-#        define ALDRIVER_DEFAULT "OpenAL64.dll"
-#    elif defined(_WIN32)
-#        define ALDRIVER_DEFAULT "OpenAL32.dll"
-#    elif defined(__APPLE__)
-#        define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
-#    elif defined(__OpenBSD__)
-#        define ALDRIVER_DEFAULT "libopenal.so"
-#    else
-#        define ALDRIVER_DEFAULT "libopenal.so.1"
-#    endif
+#if defined(_WIN64)
+#    define ALDRIVER_DEFAULT "OpenAL64.dll"
+#elif defined(_WIN32)
+#    define ALDRIVER_DEFAULT "OpenAL32.dll"
+#elif defined(__APPLE__)
+#    define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+#elif defined(__OpenBSD__)
+#    define ALDRIVER_DEFAULT "libopenal.so"
+#else
+#    define ALDRIVER_DEFAULT "libopenal.so.1"
+#endif
 
 /*
 ==============
@@ -281,67 +281,62 @@ static bool S_OPENAL_InitContext()
         dev = NULL;
     }
 
-	// Device enumeration support
-	enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
-	enumeration_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
+    // Device enumeration support
+    enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
+    enumeration_ext     = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
 
-	if(enumeration_ext || enumeration_all_ext)
-	{
-		char devicenames[16384] = "";
-		const char *devicelist;
+    if (enumeration_ext || enumeration_all_ext) {
+        char        devicenames[16384] = "";
+        const char *devicelist;
 #ifdef _WIN32
-		const char *defaultdevice;
+        const char *defaultdevice;
 #endif
-		int curlen;
+        int curlen;
 
-		// get all available devices + the default device name.
-		if(enumeration_all_ext)
-		{
-			devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+        // get all available devices + the default device name.
+        if (enumeration_all_ext) {
+            devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
 #ifdef _WIN32
-			defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
+            defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
 #endif
-		}
-		else
-		{
-			// We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
-			devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
+        } else {
+            // We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
+            devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
 #ifdef _WIN32
-			defaultdevice = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+            defaultdevice = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
 #endif
-			enumeration_ext = qtrue;
-		}
+            enumeration_ext = qtrue;
+        }
 
 #ifdef _WIN32
         Com_DPrintf("OpenAL: Default playback device: \"%s\"\n", defaultdevice);
 #endif
 
 #ifdef _WIN32
-		// check whether the default device is generic hardware. If it is, change to
-		// Generic Software as that one works more reliably with various sound systems.
-		// If it's not, use OpenAL's default selection as we don't want to ignore
-		// native hardware acceleration.
-		if(!dev && defaultdevice && !strcmp(defaultdevice, "Generic Hardware"))
-			dev = "Generic Software";
+        // check whether the default device is generic hardware. If it is, change to
+        // Generic Software as that one works more reliably with various sound systems.
+        // If it's not, use OpenAL's default selection as we don't want to ignore
+        // native hardware acceleration.
+        if (!dev && defaultdevice && !strcmp(defaultdevice, "Generic Hardware")) {
+            dev = "Generic Software";
+        }
 #endif
 
-		// dump a list of available devices to a cvar for the user to see.
+        // dump a list of available devices to a cvar for the user to see.
 
-		if(devicelist)
-		{
-			while((curlen = strlen(devicelist)))
-			{
-				Q_strcat(devicenames, sizeof(devicenames), devicelist);
-				Q_strcat(devicenames, sizeof(devicenames), "\n");
+        if (devicelist) {
+            while ((curlen = strlen(devicelist))) {
+                Q_strcat(devicenames, sizeof(devicenames), devicelist);
+                Q_strcat(devicenames, sizeof(devicenames), "\n");
 
-				devicelist += curlen + 1;
-			}
-		}
+                devicelist += curlen + 1;
+            }
+        }
 
         Com_Printf("OpenAL: List of available devices:\n%s\n", devicenames);
 
-		s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
-	}
+        s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
+    }
 
     Com_Printf("OpenAL: Opening device \"%s\"...\n", dev ? dev : "{default}");
 
@@ -376,6 +371,8 @@ static bool S_OPENAL_InitContext()
     attrlist[2] = ALC_SYNC;
     attrlist[3] = qfalse;
 
+    s_speaker_type->modified = false;
+
 #ifdef ALC_SOFT_output_mode
     attrlist[4] = ALC_OUTPUT_MODE_SOFT;
 
@@ -399,9 +396,11 @@ static bool S_OPENAL_InitContext()
         break;
     }
 #else
-#  pragma message("OpenAL: ALC_OUTPUT_MODE_SOFT unavailable") 
+#    pragma message("OpenAL: ALC_OUTPUT_MODE_SOFT unavailable")
 
-    Com_Printf("OpenAL: ALC_OUTPUT_MODE_SOFT is unavailable. The speaker type will be ignored, fallback to normal stereo.\n");
+    Com_Printf(
+        "OpenAL: ALC_OUTPUT_MODE_SOFT is unavailable. The speaker type will be ignored, fallback to normal stereo.\n"
+    );
     attrlist[4] = 0;
     attrlist[5] = 0;
 #endif
@@ -497,7 +496,7 @@ S_OPENAL_InitChannel
 */
 static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
 {
-    openal.channel[idx]   = chan;
+    openal.channel[idx] = chan;
     VectorClear(chan->vOrigin);
     chan->fVolume         = 1.0;
     chan->fNewPitchMult   = 0.0;
@@ -842,9 +841,9 @@ S_OPENAL_LoadMP3
 */
 static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
 {
-    char path[MAX_QPATH];
+    char       path[MAX_QPATH];
     snd_info_t info;
-    ALuint format;
+    ALuint     format;
 
     chan->stop();
 
@@ -857,7 +856,7 @@ static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
     FS_CorrectCase(path);
 
     // Try to load
-    chan->bufferdata = (ALubyte*)S_CodecLoad(path, &info);
+    chan->bufferdata = (ALubyte *)S_CodecLoad(path, &info);
     if (!chan->bufferdata) {
         return false;
     }
@@ -1199,7 +1198,7 @@ static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChan
             }
 
             if (!bStoppedChannel) {
-                for(i = iLastChannel + 1; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+                for (i = iLastChannel + 1; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
                     pChannel = openal.channel[i];
                     if (!pChannel || pChannel->is_free()) {
                         continue;
@@ -1501,7 +1500,7 @@ void S_OPENAL_StartSound(
     pChannel->fNewPitchMult = fPitch;
     pChannel->iEntChannel   = iEntChannel;
     pChannel->iFlags &= ~(CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
-    state = pChannel->get_state();
+    state = pChannel->sample_status();
 
     if (pChannel->iEntNum == iEntNum && (state == AL_PLAYING || state == AL_PAUSED) && pChannel->pSfx == pSfx) {
         bOnlyUpdate = true;
@@ -1631,7 +1630,7 @@ void S_OPENAL_AddLoopingSound(
 
     iFreeLoopSound = -1;
     pSfx           = &s_knownSfx[sfxHandle];
-    if (!pSfx) {
+    if (!pSfx || !pSfx->length) {
         return;
     }
 
@@ -1662,7 +1661,7 @@ void S_OPENAL_AddLoopingSound(
         return;
     }
 
-    pLoopSound             = &openal.loop_sounds[iFreeLoopSound];
+    pLoopSound = &openal.loop_sounds[iFreeLoopSound];
     VectorCopy(vOrigin, pLoopSound->vOrigin);
     VectorCopy(vVelocity, pLoopSound->vVelocity);
     pLoopSound->pSfx        = pSfx;
@@ -1820,7 +1819,7 @@ static int S_OPENAL_Start2DLoopSound(
 )
 {
     int             iChannel;
-    int             iSoundOFfset;
+    int             iSoundOffset;
     openal_channel *pChannel;
 
     if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
@@ -1857,12 +1856,10 @@ static int S_OPENAL_Start2DLoopSound(
     pChannel->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
     pChannel->iBaseRate = pChannel->sample_playback_rate();
     VectorCopy(vLoopOrigin, pChannel->vOrigin);
-    pChannel->set_sample_offset(
-        (int)(pLoopSound->pSfx->info.width * pLoopSound->pSfx->info.rate
-              * (float)(cls.realtime - pLoopSound->iStartTime) / 1000.0)
-        % pLoopSound->pSfx->length
-    );
 
+    iSoundOffset = (int)(pLoopSound->pSfx->info.width * pLoopSound->pSfx->info.rate
+                         * (float)(cls.realtime - pLoopSound->iStartTime) / 1000.0);
+    pChannel->set_sample_offset(iSoundOffset % pLoopSound->pSfx->length);
     pChannel->set_sample_loop_count(0);
     pChannel->fVolume = fVolumeToPlay;
     pChannel->set_gain(fVolumeToPlay);
@@ -1907,6 +1904,8 @@ static int S_OPENAL_Start3DLoopSound(
     pChan3D->force_free();
     pChan3D->iEntNum     = 0;
     pChan3D->iEntChannel = 0;
+    pChan3D->fMinDist    = fMinDistance;
+    pChan3D->fMaxDist    = fMaxDistance;
     pChan3D->set_3d();
 
     if (!pChan3D->set_sfx(pLoopSound->pSfx)) {
@@ -2185,7 +2184,8 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
         }
 
-        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET)
+            || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
             || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
             iChannel = S_OPENAL_Start2DLoopSound(
                 pLoopSound, fVolume, S_GetBaseVolume() * s_fVolumeGain * fTotalVolume, fMinDistance, vLoopOrigin
@@ -2549,7 +2549,7 @@ void S_OPENAL_Update()
 S_OPENAL_GetMusicFilename
 ==============
 */
-const char* S_OPENAL_GetMusicFilename()
+const char *S_OPENAL_GetMusicFilename()
 {
     return openal.tm_filename;
 }
@@ -2594,11 +2594,15 @@ qboolean S_IsSoundPlaying(int channel_number, const char *sfxName)
         return false;
     }
 
-    if (!pChannel->pSfx || pChannel->pSfx == (sfx_t *)-16) {
+    if (!pChannel->pSfx) {
         return false;
     }
 
-    return !strcmp(sfxName, pChannel->pSfx->name);
+    if (strcmp(sfxName, pChannel->pSfx->name)) {
+        return false;
+    }
+
+    return true;
 }
 
 /*
@@ -2710,7 +2714,7 @@ static void S_LoadBase(channelbasesavegame_t *pBase, openal_channel *pChannel, b
         return;
     }
 
-    handle = S_RegisterSound(pBase->sfx.szName, (pBase->sfx.iFlags & SFX_FLAG_DEFAULT_SOUND), false);
+    handle = S_RegisterSound(pBase->sfx.szName, (pBase->sfx.iFlags & SFX_FLAG_STREAMED), false);
 
     pChannel->iBaseRate     = pBase->iBaseRate;
     pChannel->iStartTime    = pBase->iStartTime;
@@ -2928,21 +2932,6 @@ void openal_channel::stop()
     alDieIfError();
 }
 
-/*
-==============
-openal_channel::get_state
-==============
-*/
-ALint openal_channel::get_state()
-{
-    ALint retval;
-
-    qalGetSourcei(source, AL_SOURCE_STATE, &retval);
-    alDieIfError();
-
-    return retval;
-}
-
 /*
 ==============
 openal_channel::is_free
@@ -2950,7 +2939,7 @@ openal_channel::is_free
 */
 bool openal_channel::is_free()
 {
-    ALint state = get_state();
+    ALint state = sample_status();
 
     return state == AL_INITIAL || state == AL_STOPPED;
 }
@@ -2962,7 +2951,7 @@ openal_channel::is_paused
 */
 bool openal_channel::is_paused()
 {
-    ALint state = get_state();
+    ALint state = sample_status();
 
     return state == AL_PAUSED;
 }
@@ -2974,7 +2963,7 @@ openal_channel::is_playing
 */
 bool openal_channel::is_playing()
 {
-    ALint state = get_state();
+    ALint state = sample_status();
 
     return state == AL_PLAYING;
 }
@@ -2999,6 +2988,8 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
 {
     ALint freq = 0;
 
+    assert(pSfx->length);
+
     this->pSfx = pSfx;
     if (!pSfx->buffer || !qalIsBuffer(pSfx->buffer)) {
         if (pSfx->iFlags & SFX_FLAG_MP3) {
@@ -3015,27 +3006,13 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
 
             alDieIfError();
         } else {
-            ALenum fmt = 0;
-
-            if (pSfx->info.channels == 1) {
-                if (pSfx->info.width == 1) {
-                    fmt = AL_FORMAT_MONO8;
-                } else if (pSfx->info.width == 2) {
-                    fmt = AL_FORMAT_MONO16;
-                }
-            } else if (pSfx->info.channels == 2) {
-                if (pSfx->info.width == 1) {
-                    fmt = AL_FORMAT_STEREO8;
-                } else if (pSfx->info.width == 2) {
-                    fmt = AL_FORMAT_STEREO16;
-                }
-            }
+            ALenum fmt = S_OPENAL_Format(pSfx->info.width, pSfx->info.channels);
 
             if (!fmt) {
                 Com_Printf(
                     "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
                     pSfx->info.channels,
-                    (int)(pSfx->info.width * 8.f),
+                    (int)(pSfx->info.width * 8),
                     pSfx->name
                 );
                 return false;
@@ -3044,13 +3021,7 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
-            qalBufferData(
-                pSfx->buffer,
-                fmt,
-                &pSfx->data[pSfx->info.dataofs],
-                pSfx->info.samples * pSfx->info.width,
-                pSfx->info.rate
-            );
+            qalBufferData(pSfx->buffer, fmt, &pSfx->data[pSfx->info.dataofs], pSfx->info.datasize, pSfx->info.rate);
             alDieIfError();
         }
     }
@@ -3117,7 +3088,7 @@ openal_channel::set_sample_pan
 */
 void openal_channel::set_sample_pan(S32 pan)
 {
-    const float panning = (pan - 64) / 127.f;
+    const float   panning           = (pan - 64) / 127.f;
     const ALfloat sourcePosition[3] = {panning, 0, sqrtf(1.f - Square(panning))};
 
     qalSourcef(source, AL_ROLLOFF_FACTOR, 0);
@@ -3130,7 +3101,8 @@ void openal_channel::set_sample_pan(S32 pan)
 openal_channel::set_sample_playback_rate
 ==============
 */
-void openal_channel::set_sample_playback_rate(S32 rate) {
+void openal_channel::set_sample_playback_rate(S32 rate)
+{
     // Fixed in OPM
     //  Set the pitch in OpenAL
     qalSourcef(source, AL_PITCH, rate / (float)iBaseRate);
@@ -3145,13 +3117,25 @@ openal_channel::sample_playback_rate
 S32 openal_channel::sample_playback_rate()
 {
     float pitch = 1;
-    ALint freq = 0;
+    ALint freq  = 0;
 
     // Fixed in OPM
     //  The sample rate varies according to the pitch
     qalGetSourcef(source, AL_PITCH, &pitch);
     alDieIfError();
 
+    return buffer_frequency() * pitch;
+}
+
+/*
+==============
+openal_channel::buffer_frequency
+==============
+*/
+U32 openal_channel::buffer_frequency() const
+{
+    ALint freq = 0;
+
     if (buffer) {
         qalGetBufferi(buffer, AL_FREQUENCY, &freq);
         alDieIfError();
@@ -3162,7 +3146,7 @@ S32 openal_channel::sample_playback_rate()
         freq = 22050;
     }
 
-    return freq * pitch;
+    return freq;
 }
 
 /*
@@ -3172,6 +3156,8 @@ openal_channel::sample_volume
 */
 S32 openal_channel::sample_volume()
 {
+    // FIXME: unimplemented
+    // Default volume is 100, range 0..=127
     STUB_DESC("sample_volume");
     return 127;
 }
@@ -3198,12 +3184,11 @@ openal_channel::sample_ms_offset
 */
 U32 openal_channel::sample_ms_offset()
 {
-    float offset = 0;
+    if (!is_playing()) {
+        return 0;
+    }
 
-    qalGetSourcef(source, AL_SAMPLE_OFFSET, &offset);
-    alDieIfError();
-
-    return offset * 1000.f;
+    return sample_offset() * 1000 / sample_playback_rate();
 }
 
 /*
@@ -3247,8 +3232,7 @@ openal_channel::set_sample_ms_offset
 */
 void openal_channel::set_sample_ms_offset(U32 offset)
 {
-    qalSourcef(source, AL_SEC_OFFSET, offset / 1000.f);
-    alDieIfError();
+    set_sample_offset(offset * sample_playback_rate() / 1000);
 }
 
 /*
@@ -3292,6 +3276,7 @@ openal_channel::set_sample_loop_block
 */
 void openal_channel::set_sample_loop_block(S32 start_offset, S32 end_offset)
 {
+    // FIXME: unimplemented
     STUB_DESC("sample_loop_block");
 }
 
@@ -3302,8 +3287,12 @@ openal_channel::sample_status
 */
 U32 openal_channel::sample_status()
 {
-    STUB_DESC("sample_status");
-    return 127;
+    ALint retval;
+
+    qalGetSourcei(source, AL_SOURCE_STATE, &retval);
+    alDieIfError();
+
+    return retval;
 }
 
 /*
@@ -4007,7 +3996,7 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
     const char      *pszRealName;
     float            fVolume     = 1.0;
     AliasListNode_t *pSoundAlias = NULL;
-    void            *stream = NULL;
+    void            *stream      = NULL;
 
     if (!s_bSoundStarted) {
         return;
@@ -4102,7 +4091,7 @@ void S_TriggeredMusic_Stop()
     // Fixed in OPM
     //  Make sure to clear the triggered music in case snd_restart is called
     openal.tm_filename[0] = 0;
-    openal.tm_loopcount = 0;
+    openal.tm_loopcount   = 0;
 }
 
 /*
@@ -4136,7 +4125,9 @@ void S_TriggeredMusic_Unpause()
         openal.chan_trig_music.play();
     }
 
-    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * s_fVolumeGain);
+    openal.chan_trig_music.set_gain(
+        S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * s_fVolumeGain
+    );
 }
 
 /*
@@ -4156,6 +4147,7 @@ S_StopMovieAudio
 */
 void S_StopMovieAudio()
 {
+    // FIXME: unimplemented
     STUB_DESC("sound stuff.");
 }
 
@@ -4166,6 +4158,7 @@ S_SetupMovieAudio
 */
 void S_SetupMovieAudio(const char *pszMovieName)
 {
+    // FIXME: unimplemented
     STUB_DESC("sound stuff");
 }
 
@@ -4176,6 +4169,7 @@ S_CurrentMoviePosition
 */
 int S_CurrentMoviePosition()
 {
+    // FIXME: unimplemented
     STUB_DESC("sound stuff");
     return 0;
 }
@@ -4212,7 +4206,7 @@ static ALuint S_OPENAL_Format(int width, int channels)
 S_OPENAL_LoadMP3_Codec
 ==============
 */
-static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx)
+static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t *pSfx)
 {
     void      *data;
     snd_info_t info;
@@ -4248,11 +4242,18 @@ static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t* pSfx)
     return true;
 }
 
-void openal_channel::update()
-{
-
-}
+/*
+==============
+openal_channel::update
+==============
+*/
+void openal_channel::update() {}
 
+/*
+==============
+openal_channel_two_d_stream::stop
+==============
+*/
 void openal_channel_two_d_stream::stop()
 {
     openal_channel::stop();
@@ -4260,12 +4261,17 @@ void openal_channel_two_d_stream::stop()
     clear_stream();
 }
 
-bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
-    ALint freq = 0;
-    snd_stream_t* stream;
-    int bytesToRead = 0;
-    int bytesRead;
-    char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+/*
+==============
+openal_channel_two_d_stream::set_sfx
+==============
+*/
+bool openal_channel_two_d_stream::set_sfx(sfx_t *pSfx)
+{
+    snd_stream_t *stream;
+    unsigned int  bytesToRead, bytesRead;
+    ALint         freq = 0;
+    char          rawData[MAX_BUFFER_SAMPLES * 2 * 2];
 
     stop();
 
@@ -4276,20 +4282,17 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
 
     streamHandle = S_CodecLoad(pSfx->name, NULL);
     if (!streamHandle) {
-        qalDeleteBuffers(1, &pSfx->buffer);
-        alDieIfError();
-
         Com_DPrintf("OpenAL: Failed to load MP3.\n");
         return false;
     }
 
-    stream = (snd_stream_t*)streamHandle;
+    stream              = (snd_stream_t *)streamHandle;
     pSfx->info.channels = stream->info.channels;
-    pSfx->info.dataofs = stream->info.dataofs;
+    pSfx->info.dataofs  = stream->info.dataofs;
     pSfx->info.datasize = stream->info.size;
-    pSfx->info.rate = stream->info.rate;
-    pSfx->info.samples = stream->info.samples;
-    pSfx->info.width = stream->info.width;
+    pSfx->info.rate     = stream->info.rate;
+    pSfx->info.samples  = stream->info.samples;
+    pSfx->info.width    = stream->info.width;
 
     pSfx->info.format = S_OPENAL_Format(stream->info.width, stream->info.channels);
     if (!pSfx->info.format) {
@@ -4304,12 +4307,16 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
         return false;
     }
 
+    qalSourceStop(source);
+    alDieIfError();
+
     qalGenBuffers(MAX_STREAM_BUFFERS, buffers);
     alDieIfError();
 
     // Read a smaller sample
-    bytesToRead = Q_min(stream->info.width * stream->info.channels * (MAX_BUFFER_SAMPLES / 2), sizeof(rawData));
-    bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    bytesToRead      = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+    bytesRead        = S_CodecReadStream(stream, bytesToRead, rawData);
+    streamNextOffset = bytesRead;
     if (!bytesRead) {
         // Valid stream but no data?
         S_CodecCloseStream(stream);
@@ -4322,47 +4329,70 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t* pSfx) {
     qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
     alDieIfError();
 
-    qalSourceStop(source);
-    alDieIfError();
-
-    iBaseRate = stream->info.rate;
+    iBaseRate  = stream->info.rate;
     currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
-    streaming = true;
+    streaming  = true;
 
     return true;
 }
 
+/*
+==============
+openal_channel_two_d_stream::set_sample_loop_count
+==============
+*/
 void openal_channel_two_d_stream::set_sample_loop_count(S32 count)
 {
     sampleLoopCount = count;
-    sampleLooped = 0;
+    sampleLooped    = 0;
 }
 
-openal_channel_two_d_stream::openal_channel_two_d_stream() {
+/*
+==============
+openal_channel_two_d_stream::openal_channel_two_d_stream
+==============
+*/
+openal_channel_two_d_stream::openal_channel_two_d_stream()
+{
     int i;
 
     streamHandle = NULL;
     for (i = 0; i < MAX_STREAM_BUFFERS; i++) {
         buffers[i] = 0;
     }
-    currentBuf = 0;
-    sampleLoopCount = 0;
-    sampleLooped = 0;
-    streaming = false;
+    currentBuf       = 0;
+    sampleLoopCount  = 0;
+    sampleLooped     = 0;
+    streamNextOffset = 0;
+    streaming        = false;
 }
 
+/*
+==============
+openal_channel_two_d_stream::openal_channel_two_d_stream
+==============
+*/
+openal_channel_two_d_stream::~openal_channel_two_d_stream()
+{
+    clear_stream();
+}
+
+/*
+==============
+openal_channel_two_d_stream::update
+==============
+*/
 void openal_channel_two_d_stream::update()
 {
-    snd_stream_t* stream = (snd_stream_t*)streamHandle;
-    int bytesToRead, bytesRead;
-    ALuint format;
-    ALint numProcessedBuffers = 0;
-    ALint numQueuedBuffers = 0;
-    ALint state = get_state();
+    snd_stream_t *stream = (snd_stream_t *)streamHandle;
+    unsigned int  bytesToRead, bytesRead;
+    ALuint        format;
+    ALint         numProcessedBuffers = 0, numQueuedBuffers = 0;
+    ALint         state = sample_status();
     // 2 channels with a width of 2
     char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
 
-    if (!streaming) {
+    if (!streaming || is_paused()) {
         return;
     }
 
@@ -4373,7 +4403,7 @@ void openal_channel_two_d_stream::update()
     alDieIfError();
 
     // Remove processed buffers after half of the queued buffers has been processed
-    if (numProcessedBuffers >= numQueuedBuffers / 2) {
+    if (numProcessedBuffers >= Q_max(numQueuedBuffers / 2, 1)) {
         while (numProcessedBuffers-- > 0) {
             ALuint tmpBuffer;
             qalSourceUnqueueBuffers(source, 1, &tmpBuffer);
@@ -4392,11 +4422,12 @@ void openal_channel_two_d_stream::update()
         return;
     }
 
-    bytesToRead = Q_min(stream->info.width * stream->info.channels * MAX_BUFFER_SAMPLES, sizeof(rawData));
+    bytesToRead = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
 
     format = S_OPENAL_Format(stream->info.width, stream->info.channels);
 
     bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    streamNextOffset += bytesRead;
     if (!bytesRead) {
         S_CodecCloseStream(stream);
 
@@ -4407,18 +4438,23 @@ void openal_channel_two_d_stream::update()
             return;
         }
 
+        //
+        // Looped, start again from the beginning
+        //
         streamHandle = S_CodecLoad(this->fileName, NULL);
         if (!streamHandle) {
             clear_stream();
             return;
         }
 
-        stream = (snd_stream_t*)streamHandle;
+        stream = (snd_stream_t *)streamHandle;
         //
         // Re-read the format, we never know...
         //
         format = S_OPENAL_Format(stream->info.width, stream->info.channels);
-        bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+
+        bytesRead        = S_CodecReadStream(stream, bytesToRead, rawData);
+        streamNextOffset = bytesRead;
         if (!bytesRead) {
             S_CodecCloseStream(stream);
             streamHandle = NULL;
@@ -4442,16 +4478,185 @@ void openal_channel_two_d_stream::update()
     currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
 }
 
-bool openal_channel_two_d_stream::queue_stream(const char* fileName) {
-    
-    ALint freq = 0;
-    ALuint format = 0;
-    snd_stream_t* stream;
-    int bytesToRead = 0;
-    int bytesRead;
-    ALuint old = 0;
-    int i;
-    char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+/*
+==============
+openal_channel_two_d_stream::sample_offset
+==============
+*/
+U32 openal_channel_two_d_stream::sample_offset()
+{
+    snd_stream_t *stream              = (snd_stream_t *)streamHandle;
+    ALint         playerByteOffset    = 0;
+    ALint         numProcessedBuffers = 0;
+    ALint         numQueuedBuffers    = 0;
+    unsigned int  totalQueueLength    = 0;
+    unsigned int  bytesPerSample      = 0;
+    ALint         bits = 0, channels = 0;
+
+    if (!streaming) {
+        // no stream
+        return 0;
+    }
+
+    // Get the byte offset in the queue
+    qalGetSourcei(source, AL_BYTE_OFFSET, &playerByteOffset);
+    alDieIfError();
+
+    totalQueueLength = getQueueLength();
+
+    assert(playerByteOffset < totalQueueLength);
+    assert(streamNextOffset >= totalQueueLength);
+
+    bytesPerSample = getBytesPerSample();
+
+    return (streamNextOffset - totalQueueLength + playerByteOffset) / bytesPerSample;
+}
+
+/*
+==============
+openal_channel_two_d_stream::buffer_frequency
+==============
+*/
+U32 openal_channel_two_d_stream::buffer_frequency() const
+{
+    unsigned int bufferId;
+    ALint        freq = 0;
+
+    bufferId = (currentBuf - 1) % MAX_STREAM_BUFFERS;
+    qalGetBufferi(buffers[bufferId], AL_FREQUENCY, &freq);
+    alDieIfError();
+
+    return freq;
+}
+
+/*
+==============
+openal_channel_two_d_stream::set_sample_offset
+==============
+*/
+void openal_channel_two_d_stream::set_sample_offset(U32 offset)
+{
+    snd_stream_t *stream;
+    unsigned int  bytesToRead, bytesRead;
+    unsigned int  byteOffset;
+    unsigned int  bytesPerSample;
+    unsigned int  streamPosition;
+    ALuint        format;
+    ALint         numQueuedBuffers;
+    bool          bWasPlaying;
+    char          rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    if (!streaming) {
+        return;
+    }
+
+    stream         = (snd_stream_t *)streamHandle;
+    streamPosition = getCurrentStreamPosition();
+    bytesPerSample = getBytesPerSample();
+    byteOffset     = offset * bytesPerSample;
+
+    if (byteOffset >= streamPosition && byteOffset < streamNextOffset) {
+        //
+        // Sample is in the currently streamed data
+        //
+        qalSourcei(source, AL_BYTE_OFFSET, byteOffset - streamPosition);
+        alDieIfError();
+
+        return;
+    }
+
+    bWasPlaying = is_playing();
+
+    if (byteOffset < streamPosition) {
+        //
+        // New offset is before the current offset,
+        // reload the stream from the beginning
+        //
+        if (stream) {
+            S_CodecCloseStream(stream);
+            streamHandle = NULL;
+        }
+    }
+
+    if (!streamHandle) {
+        streamHandle = S_CodecLoad(this->fileName, NULL);
+        if (!streamHandle) {
+            clear_stream();
+            return;
+        }
+
+        stream           = (snd_stream_t *)streamHandle;
+        streamNextOffset = 0;
+    }
+
+    while (streamNextOffset <= byteOffset) {
+        streamPosition = streamNextOffset;
+
+        bytesToRead = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+        bytesRead   = S_CodecReadStream(stream, bytesToRead, rawData);
+        if (!bytesRead) {
+            clear_stream();
+            return;
+        }
+
+        streamNextOffset += bytesRead;
+    }
+
+    //
+    // Stop the sound and remove all buffers from the queue
+    //
+    qalSourceStop(source);
+    alDieIfError();
+
+    //
+    // Remove all buffers from the queue
+    //
+    numQueuedBuffers = 0;
+    qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
+    alDieIfError();
+
+    while (numQueuedBuffers--) {
+        ALuint b;
+        qalSourceUnqueueBuffers(source, 1, &b);
+        alDieIfError();
+    }
+
+    format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+
+    qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+
+    //
+    // Now set the source offset
+    //
+    qalSourcei(source, AL_BYTE_OFFSET, byteOffset - streamPosition);
+    alDieIfError();
+
+    if (bWasPlaying) {
+        //
+        // The sound was stopped when re-streaming
+        //
+        play();
+    }
+}
+
+/*
+==============
+openal_channel_two_d_stream::queue_stream
+==============
+*/
+bool openal_channel_two_d_stream::queue_stream(const char *fileName)
+{
+    snd_stream_t *stream;
+    unsigned int  bytesToRead, bytesRead;
+    ALint         freq   = 0;
+    ALuint        format = 0;
+    ALuint        old    = 0;
+    char          rawData[MAX_BUFFER_SAMPLES * 2 * 2];
 
     // Store the filename so it can be looped later
     Q_strncpyz(this->fileName, fileName, sizeof(this->fileName));
@@ -4466,10 +4671,10 @@ bool openal_channel_two_d_stream::queue_stream(const char* fileName) {
     if (!streamHandle) {
         return false;
     }
-    stream = (snd_stream_t*)streamHandle;
+    stream = (snd_stream_t *)streamHandle;
 
     iStartTime = cl.serverTime;
-    iEndTime = (int)(cl.serverTime + (stream->info.samples / stream->info.rate * 1000.f));
+    iEndTime   = (int)(cl.serverTime + (stream->info.samples / stream->info.rate * 1000.f));
 
     format = S_OPENAL_Format(stream->info.width, stream->info.channels);
     if (!format) {
@@ -4488,13 +4693,15 @@ bool openal_channel_two_d_stream::queue_stream(const char* fileName) {
     alDieIfError();
 
     // Read a smaller sample
-    bytesToRead = Q_min(stream->info.width * stream->info.channels * (MAX_BUFFER_SAMPLES / 2), sizeof(rawData));
-    bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    bytesToRead = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+    bytesRead   = S_CodecReadStream(stream, bytesToRead, rawData);
     if (!bytesRead) {
         // Valid stream but no data?
         return true;
     }
 
+    streamNextOffset = bytesRead;
+
     qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
     alDieIfError();
 
@@ -4508,23 +4715,93 @@ bool openal_channel_two_d_stream::queue_stream(const char* fileName) {
     return true;
 }
 
-void openal_channel_two_d_stream::clear_stream() {
+/*
+==============
+openal_channel_two_d_stream::clear_stream
+==============
+*/
+void openal_channel_two_d_stream::clear_stream()
+{
     if (!streaming) {
         return;
     }
 
     qalSourceStop(source);
     qalSourcei(source, AL_BUFFER, 0);
-    qalDeleteBuffers(1, buffers);
+    qalDeleteBuffers(MAX_STREAM_BUFFERS, buffers);
 
     if (streamHandle) {
-        S_CodecCloseStream((snd_stream_t*)streamHandle);
+        S_CodecCloseStream((snd_stream_t *)streamHandle);
     }
 
-    fileName[0] = 0;
+    fileName[0]  = 0;
     streamHandle = NULL;
 
-    currentBuf = 0;
-    streaming = false;
-    sampleLooped = 0;
+    currentBuf       = 0;
+    streamNextOffset = 0;
+    streaming        = false;
+    sampleLooped     = 0;
+}
+
+/*
+==============
+openal_channel_two_d_stream::getQueueLength
+
+Return the total length of all buffers being streamed.
+==============
+*/
+unsigned int openal_channel_two_d_stream::getQueueLength() const
+{
+    ALint        numQueuedBuffers = 0;
+    unsigned int totalQueueLength = 0;
+    unsigned int bufferId;
+    unsigned int i;
+
+    qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
+    alDieIfError();
+
+    for (i = 0; i < numQueuedBuffers; i++) {
+        ALint bufferSize = 0;
+
+        bufferId = (currentBuf - i - 1) % MAX_STREAM_BUFFERS;
+        qalGetBufferi(buffers[bufferId], AL_SIZE, &bufferSize);
+
+        totalQueueLength += bufferSize;
+    }
+
+    return totalQueueLength;
+}
+
+/*
+==============
+openal_channel_two_d_stream::getCurrentStreamPosition
+
+Return the current position in the sound being streamed.
+==============
+*/
+unsigned int openal_channel_two_d_stream::getCurrentStreamPosition() const
+{
+    return streamNextOffset - getQueueLength();
+}
+
+/*
+==============
+openal_channel_two_d_stream::getBytesPerSample
+
+Return the number of bytes per sample.
+It assumes that all pending buffers have the same channels and bits.
+==============
+*/
+unsigned int openal_channel_two_d_stream::getBytesPerSample() const
+{
+    unsigned int bufferId;
+    ALint        bits = 0, channels = 0;
+
+    bufferId = (currentBuf - 1) % MAX_STREAM_BUFFERS;
+    qalGetBufferi(buffers[bufferId], AL_BITS, &bits);
+    alDieIfError();
+    qalGetBufferi(buffers[bufferId], AL_CHANNELS, &channels);
+    alDieIfError();
+
+    return bits * channels / 8;
 }
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index 26f63a32..db1af9d3 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -45,8 +45,8 @@ typedef unsigned int U32;
 #define OPENAL_CHANNEL_TRIGGER_MUSIC_ID (OPENAL_CHANNEL_MP3_ID + 1)
 #define OPENAL_CHANNEL_MOVIE_ID         (OPENAL_CHANNEL_TRIGGER_MUSIC_ID + 1)
 
-#define MAX_STREAM_BUFFERS 16
-#define MAX_BUFFER_SAMPLES 16384
+#define MAX_STREAM_BUFFERS              16
+#define MAX_BUFFER_SAMPLES              16384
 
 typedef enum {
     FADE_NONE,
@@ -105,13 +105,12 @@ struct openal_channel {
     ALubyte *bufferdata;
 
 public:
-    void play();
+    void         play();
     virtual void stop();
-    void pause();
+    void         pause();
 
     void  set_no_3d();
     void  set_3d();
-    ALint get_state();
 
     void set_gain(float gain);
     void set_velocity(float v0, float v1, float v2);
@@ -121,7 +120,7 @@ public:
     bool is_paused();
     bool is_playing();
 
-    void force_free();
+    void         force_free();
     virtual bool set_sfx(sfx_t *pSfx);
 
     void start_sample();
@@ -133,47 +132,61 @@ public:
     void set_sample_playback_rate(S32 pan);
     S32  sample_playback_rate();
 
-    S32  sample_volume();
-    U32  sample_offset();
-    U32  sample_ms_offset();
-    U32  sample_loop_count();
-    void set_sample_offset(U32 offset);
-    void set_sample_ms_offset(U32 offset);
+    S32          sample_volume();
+    virtual U32  sample_offset();
+    U32          sample_ms_offset();
+    U32          sample_loop_count();
+    virtual void set_sample_offset(U32 offset);
+    void         set_sample_ms_offset(U32 offset);
     virtual void set_sample_loop_count(S32 count);
-    void set_sample_loop_block(S32 start_offset, S32 end_offset);
+    void         set_sample_loop_block(S32 start_offset, S32 end_offset);
 
     U32 sample_status();
 
 public:
     virtual void update();
+
+    virtual U32 buffer_frequency() const;
 };
 
 struct openal_channel_two_d_stream : public openal_channel {
 private:
-    char fileName[64];
-    void *streamHandle;
+    char         fileName[64];
+    void        *streamHandle;
     unsigned int buffers[MAX_STREAM_BUFFERS];
     unsigned int currentBuf;
-    int sampleLoopCount;
-    int sampleLooped;
-    bool streaming;
+    unsigned int sampleLoopCount;
+    unsigned int sampleLooped;
+    unsigned int streamNextOffset;
+    bool         streaming;
 
 public:
     openal_channel_two_d_stream();
+    ~openal_channel_two_d_stream();
 
     void stop() override;
-    bool set_sfx(sfx_t* pSfx) override;
+    bool set_sfx(sfx_t *pSfx) override;
     void set_sample_loop_count(S32 count) override;
     void update() override;
-    bool queue_stream(const char* fileName);
+    U32  sample_offset() override;
+    void set_sample_offset(U32 offset) override;
+
+    bool queue_stream(const char *fileName);
+
+protected:
+    U32 buffer_frequency() const override;
 
 private:
     void clear_stream();
+
+    unsigned int getQueueLength() const;
+    unsigned int getCurrentStreamPosition() const;
+    unsigned int getBytesPerSample() const;
 };
 
 struct openal_internal_t {
-    openal_channel chan_3D[MAX_OPENAL_CHANNELS_3D];
-    openal_channel chan_2D[MAX_OPENAL_CHANNELS_2D];
+    openal_channel              chan_3D[MAX_OPENAL_CHANNELS_3D];
+    openal_channel              chan_2D[MAX_OPENAL_CHANNELS_2D];
     openal_channel_two_d_stream chan_2D_stream[MAX_OPENAL_CHANNELS_2D_STREAM];
     openal_channel_two_d_stream chan_song[MAX_OPENAL_SONGS];
     openal_channel_two_d_stream chan_mp3;
@@ -196,39 +209,39 @@ struct openal_internal_t {
 extern "C" {
 #endif
 
-qboolean S_OPENAL_Init();
-void     S_OPENAL_Shutdown();
-void     S_OPENAL_StartSound(
+    qboolean S_OPENAL_Init();
+    void     S_OPENAL_Shutdown();
+    void     S_OPENAL_StartSound(
+            const vec3_t vOrigin,
+            int          iEntNum,
+            int          iEntChannel,
+            sfxHandle_t  sfxHandle,
+            float        fVolume,
+            float        fMinDist,
+            float        fPitch,
+            float        fMaxDist,
+            qboolean     bStreamed
+        );
+    void S_OPENAL_AddLoopingSound(
         const vec3_t vOrigin,
-        int          iEntNum,
-        int          iEntChannel,
+        const vec3_t vVelocity,
         sfxHandle_t  sfxHandle,
         float        fVolume,
         float        fMinDist,
-        float        fPitch,
         float        fMaxDist,
-        qboolean     bStreamed
+        float        fPitch,
+        int          iFlags
     );
-void S_OPENAL_AddLoopingSound(
-    const vec3_t vOrigin,
-    const vec3_t vVelocity,
-    sfxHandle_t  sfxHandle,
-    float        fVolume,
-    float        fMinDist,
-    float        fMaxDist,
-    float        fPitch,
-    int          iFlags
-);
-void S_OPENAL_ClearLoopingSounds();
-void S_OPENAL_StopSound(int iEntNum, int iEntChannel);
-void S_OPENAL_StopAllSounds(qboolean bStopMusic);
-void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxis[3]);
-void S_OPENAL_SetReverb(int iType, float fLevel);
-void S_OPENAL_Update();
+    void S_OPENAL_ClearLoopingSounds();
+    void S_OPENAL_StopSound(int iEntNum, int iEntChannel);
+    void S_OPENAL_StopAllSounds(qboolean bStopMusic);
+    void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxis[3]);
+    void S_OPENAL_SetReverb(int iType, float fLevel);
+    void S_OPENAL_Update();
 
-const char* S_OPENAL_GetMusicFilename();
-int S_OPENAL_GetMusicLoopCount();
-unsigned int S_OPENAL_GetMusicOffset();
+    const char  *S_OPENAL_GetMusicFilename();
+    int          S_OPENAL_GetMusicLoopCount();
+    unsigned int S_OPENAL_GetMusicOffset();
 
 #ifdef __cplusplus
 }

From 194e898d907c8453324c6fed37fd92243b96b313 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:22:40 +0200
Subject: [PATCH 0675/2040] Ignore bad SFX for 3D loop sounds

---
 code/client/snd_openal_new.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 684314f7..8558682d 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1894,6 +1894,10 @@ static int S_OPENAL_Start3DLoopSound(
         return -1;
     }
 
+    if (!pLoopSound->pSfx->data || !pLoopSound->pSfx->length) {
+        return -1;
+    }
+
     iChannel = S_OPENAL_PickChannel3D(0, 0);
     if (iChannel < 0) {
         Com_DPrintf("Could not find a free channel\n");

From a150c1b18bbcfb31ec6df477ceb0f42b8afe7376 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:18:20 +0200
Subject: [PATCH 0676/2040] Fix animation delta repeating when getting delta of
 the same frame

This fixes actors moving too much and strangely
---
 code/skeletor/skeletor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 62aca4fe..c155285a 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -121,7 +121,9 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
         delta.z += m_frame[frameNum2 % numFrames].delta.z * s;
     } else {
         s = s - (1.0 - d);
-        delta = m_frame[frameNum2 % numFrames].delta;
+        delta.x = m_frame[frameNum2 % numFrames].delta.x * s;
+        delta.y = m_frame[frameNum2 % numFrames].delta.y * s;
+        delta.z = m_frame[frameNum2 % numFrames].delta.z * s;
     }
 
     if (delta.x > -0.001f && delta.x < 0.001f) {

From 444ce284ae015493c59f73c4cb144bdace5c880a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 18:55:10 +0200
Subject: [PATCH 0677/2040] Spawn a trigger field even if the TOGGLE flag is
 set

This fixes Actors not being able to open doors
---
 code/fgame/doors.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 144c7d29..92a2a090 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -1095,10 +1095,7 @@ void Door::LinkDoors(Event *ev)
         return;
     }
 
-    // Don't spawn trigger field when set to toggle
-    if (!(spawnflags & DOOR_TOGGLE)) {
-        SpawnTriggerField(cmins, cmaxs);
-    }
+    SpawnTriggerField(cmins, cmaxs);
 }
 
 void Door::SetTime(Event *ev)

From 06d2eaf4098cf826b1b8793186b40d4c63e552bb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:04:49 +0200
Subject: [PATCH 0678/2040] Fix doors opening and closing indefinitely by
 actors

---
 code/fgame/doors.cpp | 68 ++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 92a2a090..ddb4bb61 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -843,6 +843,8 @@ void Door::DoorBlocked(Event *ev)
 void Door::FieldTouched(Event *ev)
 {
     Entity *other;
+    Actor* otherActor;
+    float dist;
 
     other = ev->GetEntity(1);
 
@@ -850,41 +852,45 @@ void Door::FieldTouched(Event *ev)
         return;
     }
 
-    if (other->IsSubclassOfActor()) {
-        Actor* otherActor = static_cast<Actor*>(other);
-        float dist;
-
-        otherActor->m_Path.ForceShortLookahead();
-
-        if (state == STATE_OPENING) {
-            otherActor->m_maxspeed = speed * 64;
-        }
-
-        if ((state != STATE_OPEN) && !(spawnflags & DOOR_AUTO_OPEN) && !other->isSubclassOf(Actor)) {
+    if (!other->IsSubclassOfActor()) {
+        if ((spawnflags & DOOR_TOGGLE) || (state != STATE_OPEN && !(spawnflags & DOOR_AUTO_OPEN))) {
             return;
         }
 
-        dist = VectorLength2D(other->velocity) * 0.25f;
-        if (other->absmin[0] > absmax[0] + dist) {
-            return;
-        }
-        if (other->absmin[1] > absmax[1] + dist) {
-            return;
-        }
-        if (other->absmin[2] > absmax[2]) {
-            return;
-        }
+        TryOpen(ev);
+        return;
+    }
 
-        if (other->absmax[0] < absmin[0] - dist) {
-            return;
-        }
-        if (other->absmax[1] < absmin[1] - dist) {
-            return;
-        }
-        if (other->absmax[2] < absmin[2]) {
-            return;
-        }
-    } else if ((state != STATE_OPEN) && !(spawnflags & DOOR_AUTO_OPEN) && !other->isSubclassOf(Actor)) {
+    otherActor = static_cast<Actor*>(other);
+
+    otherActor->m_Path.ForceShortLookahead();
+
+    if (state == STATE_OPENING) {
+        otherActor->m_maxspeed = speed * 64;
+    }
+
+    if (((spawnflags & DOOR_TOGGLE) || (state != STATE_OPEN && !(spawnflags & DOOR_AUTO_OPEN))) && (state == STATE_OPEN || state == STATE_OPENING)) {
+        return;
+    }
+
+    dist = VectorLength2D(other->velocity) * 0.25f;
+    if (other->absmin[0] > absmax[0] + dist) {
+        return;
+    }
+    if (other->absmin[1] > absmax[1] + dist) {
+        return;
+    }
+    if (other->absmin[2] > absmax[2]) {
+        return;
+    }
+
+    if (other->absmax[0] < absmin[0] - dist) {
+        return;
+    }
+    if (other->absmax[1] < absmin[1] - dist) {
+        return;
+    }
+    if (other->absmax[2] < absmin[2]) {
         return;
     }
 

From 9413eb0d5881d38e44215349f424a82a3a9b2402 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 21:58:10 +0200
Subject: [PATCH 0679/2040] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..28615490
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**qconsole.log**
+If applicable, add the `qconsole.log` file. On Windows, it can be found in **%APPDATA%\...\qconsole.log** and on Linux, it can be found on the home directory **~/.openmohaa/.../qconsole.log**
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Debian]
+ - OS Version [e.g 12]
+ - OpenMoHAA Version: [e.g `0.70.0-alpha+0.0b1a20dcf win_msvc64-x86_64-debug`]
+
+**Additional context**
+Add any other context about the problem here.

From 37db2e8accb1db020993db613bfd886c6556ee80 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:04:30 +0200
Subject: [PATCH 0680/2040] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 28615490..c7193bb6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -20,16 +20,20 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+**Screenshots (OPTIONAL)**
 If applicable, add screenshots to help explain your problem.
 
-**qconsole.log**
-If applicable, add the `qconsole.log` file. On Windows, it can be found in **%APPDATA%\...\qconsole.log** and on Linux, it can be found on the home directory **~/.openmohaa/.../qconsole.log**
+**Logs**
+- If applicable, add the `qconsole.log` file. On Windows, it can be found in **%APPDATA%\...\qconsole.log** and on Linux, it can be found on the home directory **~/.openmohaa/.../qconsole.log**.
+- If there is no `qconsole.log`, paste the output of the console window.
 
-**Desktop (please complete the following information):**
+**Version information (please complete the following information):**
  - OS: [e.g. Debian]
  - OS Version [e.g 12]
  - OpenMoHAA Version: [e.g `0.70.0-alpha+0.0b1a20dcf win_msvc64-x86_64-debug`]
 
-**Additional context**
+**Dump (OPTIONAL)**
+You can include a core dump generated by the OS (`.dmp` file). If you compiled OpenMoHAA yourself, also add all output openmohaa binaries (except libopenal and libSDL).
+
+**Additional context (OPTIONAL)**
 Add any other context about the problem here.

From fde4d8d54fa5a521f4e38a1927bbe2efb20035b3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:11:14 +0200
Subject: [PATCH 0681/2040] Update README and bug report

---
 .github/ISSUE_TEMPLATE/bug_report.md | 10 +++++-----
 README.md                            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c7193bb6..1027042a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,13 +24,13 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Logs**
-- If applicable, add the `qconsole.log` file. On Windows, it can be found in **%APPDATA%\...\qconsole.log** and on Linux, it can be found on the home directory **~/.openmohaa/.../qconsole.log**.
-- If there is no `qconsole.log`, paste the output of the console window.
+- Paste the output of the console window in a text file, and attach the text file.
+- If applicable (`logfile` set to 2), attach the `qconsole.log` file. On Windows, it can be found in **%APPDATA%\...\qconsole.log** and on Linux, it can be found on the home directory **~/.openmohaa/.../qconsole.log**.
 
 **Version information (please complete the following information):**
- - OS: [e.g. Debian]
- - OS Version [e.g 12]
- - OpenMoHAA Version: [e.g `0.70.0-alpha+0.0b1a20dcf win_msvc64-x86_64-debug`]
+ - OS: [e.g. `Debian`]
+ - OS Version [e.g `12`]
+ - OpenMoHAA Version: [e.g `0.70.0-alpha+0.0b1a20dcf win_msvc64-x86_64-debug`, can be found below **Common Initialization** in the console, or by typing `version`]
 
 **Dump (OPTIONAL)**
 You can include a core dump generated by the OS (`.dmp` file). If you compiled OpenMoHAA yourself, also add all output openmohaa binaries (except libopenal and libSDL).
diff --git a/README.md b/README.md
index cf18a7e5..ba789e5b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 
 ### Single-player
 
-The entire single-player campaign can be played from start to end. There may be occasional bugs though; if you encounter any, please create a GitHub issue describing them.
+The entire single-player campaign can be played from start to end. There may be occasional bugs though; if you encounter any, please create a new [GitHub issue](https://github.com/openmoh/openmohaa/issues) describing them.
 
 ### Multiplayer
 

From ccb1465e170966107e8d8f0715a515e9c7c4d2fb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 23:05:43 +0200
Subject: [PATCH 0682/2040] Use a raw pointer instead of the str object

Original game checks for the NUL character using the line buffer (`c_str()`) directly instead of the str object's operator[], as this would cause an assertion failure because the str's length ignore the NUL character
---
 code/uilib/uimledit.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 668286ef..825dfcfb 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -359,13 +359,13 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
         return;
     }
 
-    str& line = LineFromLineNumber(clickedLine, true);
-    for (i = 0; line[i] && totalWidth < p.x; i++) {
+    const char *line = LineFromLineNumber(clickedLine, true).c_str();
+    for (i = 0; i < line[i] && totalWidth < p.x; i++) {
         lastWidth = m_font->getCharWidth(line[i]);
         totalWidth += lastWidth;
     }
 
-    if (line[i] && i) {
+    if (i < line[i] && i) {
         lastWidth *= 0.5f;
         if (totalWidth - lastWidth >= p.x) {
             i--;

From ad88215b85d20f808cf8b89c50c51694ed0a754f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 23:42:31 +0200
Subject: [PATCH 0683/2040] Cleaned up actor_runandshoot.cpp

---
 code/fgame/actor_runandshoot.cpp | 65 +++++++++-----------------------
 1 file changed, 18 insertions(+), 47 deletions(-)

diff --git a/code/fgame/actor_runandshoot.cpp b/code/fgame/actor_runandshoot.cpp
index 13088e82..1939dbb2 100644
--- a/code/fgame/actor_runandshoot.cpp
+++ b/code/fgame/actor_runandshoot.cpp
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // actor_runandshoot.cpp
+//
+// Added in 2.30
+//
 
 #include "actor.h"
 
@@ -37,9 +40,10 @@ void Actor::InitRunAndShoot(GlobalFuncs_t *func)
 
 void Actor::Begin_RunAndShoot(void)
 {
-    m_State = ACTOR_STATE_RUN_AND_SHOOT_RUN;
     if (m_patrolCurrentNode) {
         m_State = ACTOR_STATE_RUN_AND_SHOOT_RUNNING;
+    } else {
+        m_State = ACTOR_STATE_RUN_AND_SHOOT_RUN;
     }
 }
 
@@ -143,62 +147,29 @@ bool Actor::RunAndShoot_MoveToPatrolCurrentNode(void)
 
     if (MoveOnPathWithSquad()) {
         if (m_Enemy) {
-            m_eNextAnimMode    = ANIM_MODE_PATH;
-            m_csNextAnimString = STRING_ANIM_RUNTO_INOPEN_SCR;
-            m_bNextForceStart  = false;
-
-            Vector delta;
-            Vector lookDir;
-
-            delta   = mTargetPos - EyePosition();
-            lookDir = delta;
-            lookDir[2] += 16;
-            SetDesiredLookDir(lookDir);
-
-            m_DesiredGunDir[0] = 360 - delta.toPitch();
-            m_DesiredGunDir[1] = delta.toYaw();
-            m_DesiredGunDir[2] = 0;
-            SetDesiredYaw(m_DesiredGunDir[1]);
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_RUNTO_INOPEN_SCR);
+            AimAtTargetPos();
         } else {
-            m_eNextAnimMode    = ANIM_MODE_PATH;
-            m_csNextAnimString = STRING_ANIM_CROUCH_RUN_SCR;
-            m_bNextForceStart  = false;
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_CROUCH_RUN_SCR);
             FaceMotion();
         }
     } else if (m_Enemy) {
-        Vector delta;
-        Vector lookDir;
-
-        delta   = mTargetPos - EyePosition();
-        lookDir = delta;
-        lookDir[2] += 16;
-        SetDesiredLookDir(lookDir);
-
-        m_DesiredGunDir[0] = 360 - delta.toPitch();
-        m_DesiredGunDir[1] = delta.toYaw();
-        m_DesiredGunDir[2] = 0;
-        SetDesiredYaw(m_DesiredGunDir[1]);
+        AimAtTargetPos();
         Anim_Attack();
     } else {
         Anim_Stand();
         IdleLook();
     }
 
-    if (!m_fMoveDoneRadiusSquared) {
-        return false;
+    if (m_fMoveDoneRadiusSquared) {
+        if (PathComplete()) {
+            return true;
+        }
+
+        if (m_Path.HasCompleteLookahead() && !m_patrolCurrentNode->Next()) {
+            return VectorLength2DSquared(PathDelta()) <= m_fMoveDoneRadiusSquared;
+        }
     }
 
-    if (PathComplete()) {
-        return true;
-    }
-
-    if (!m_Path.HasCompleteLookahead() || m_patrolCurrentNode->Next()) {
-        return false;
-    }
-
-    if (VectorLength2DSquared(PathDelta()) > m_fMoveDoneRadiusSquared) {
-        return false;
-    }
-
-    return true;
+    return false;
 }

From 0b3aad5ad201a9d74c7596d312e65fe5ac8afe87 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 26 Aug 2024 23:55:45 +0200
Subject: [PATCH 0684/2040] Fix entnum comparison (must be greater than or
 equal to the squadmate's entnum)

---
 code/fgame/actor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 14f0707c..b9235942 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -3630,7 +3630,8 @@ void Actor::SafeSetOrigin(vec3_t newOrigin)
     if (!m_bNoPlayerCollision) {
         Player *p = (Player *)G_GetEntity(0);
 
-        // Solidity check added in 2.30
+        // Added in 2.30
+        //  Solidity check.
         //  If the Actor is already nonsolid the player won't get stuck
         if (p && IsTouching(p) && getSolidType() != SOLID_NOT) {
             Com_Printf("(entnum %d, radnum %d) is going not solid to not get stuck in the player\n", entnum, radnum);
@@ -3895,7 +3896,8 @@ bool Actor::CanShoot(Entity *ent)
     Vector vGunPos;
 
     if (FriendlyInLineOfFire(ent)) {
-        // This check was added in 2.0
+		// Added in 2.0
+        //  Check if a friend is in sight
         bCanShoot = false;
     } else if (ent->IsSubclassOfSentient()) {
         Sentient *sen = static_cast<Sentient *>(ent);
@@ -4975,7 +4977,7 @@ void Actor::HandlePain(Event *ev)
         //FIXME: macro
         SetCuriousAnimHint(7);
 
-        // m_bIsCurious check: Added in 2.30
+		// Added in 2.30 the m_bIsCurous check
         if (m_bEnableEnemy && m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_IDLE && m_bIsCurious) {
             SetEnemyPos(attacker->origin);
             m_pszDebugState = "from_pain";
@@ -5967,7 +5969,7 @@ bool Actor::MoveOnPathWithSquad(void)
         }
 
         if (DotProduct2D(pvMyDir, pvHisDir) >= 0
-            && (entnum == pActorSquadMate->entnum || DotProduct2D(pvHisDir, vDelta) >= 0)) {
+            && (entnum >= pActorSquadMate->entnum || DotProduct2D(pvHisDir, vDelta) >= 0)) {
             m_iSquadStandTime = level.inttime;
             return false;
         }
@@ -6325,7 +6327,9 @@ void Actor::Init(void)
     InitWeaponless(&GlobalFuncs[THINK_WEAPONLESS]);
     InitNoClip(&GlobalFuncs[THINK_NOCLIP]);
     InitDead(&GlobalFuncs[THINK_DEAD]);
+    // Added in 2.0
     InitBadPlace(&GlobalFuncs[THINK_BADPLACE]);
+    // Added in 2.30
     InitRunAndShoot(&GlobalFuncs[THINK_RUN_AND_SHOOT]);
 
     AddWaitTill(STRING_VISIBLE);

From 7f7d797fce9303a7a6b7e868c4b52d23f212a1f6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 27 Aug 2024 00:34:31 +0200
Subject: [PATCH 0685/2040] Fix vehicles getting blocked by sentients dying

---
 code/fgame/vehicle.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index d8a7efb6..6c583114 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4396,7 +4396,15 @@ void Vehicle::MoveVehicle(void)
                         );
                     }
 
-                    break;
+                    // Added in OPM
+                    //  Skip the entity if the sentient is dead.
+                    //  This is a workaround against sentients getting in path of vehicles
+                    //  and thus blocking them temporarily while dying.
+                    //  For example in e1l1, the first tank would get stuck, because sometimes
+                    //  there are too many actors moving in the path of the vehicle
+                    if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                        break;
+                    }
                 }
 
                 pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;

From 8b5074b6acf3a95aaa5d7dc6ba5fde10d1d6c00d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 27 Aug 2024 01:01:34 +0200
Subject: [PATCH 0686/2040] Fix Dot/Texcoords calc

This caused some shaders such as headlights beam on the opeltruck being weirdly rendered
---
 code/renderer/tr_shade_calc.c | 78 ++++++++++++-----------------------
 1 file changed, 26 insertions(+), 52 deletions(-)

diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index 792e38db..21e5c306 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -946,21 +946,16 @@ void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
 	vec3_t viewInModel;
 
 	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		union {
-			float f;
-			int i;
-		} u;
+		float f;
 
 		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
 		VectorNormalizeFast(viewInModel);
 
-        u.f = DotProduct(tess.normal[i], viewInModel);
-        u.f *= u.f;
-        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
-        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+        f = Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
 
-		u.i &= ~(u.i >> 31);
-		colors[0] = colors[1] = colors[2] = u.i;
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
 	}
 }
 
@@ -971,26 +966,18 @@ void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alph
 {
 	int i;
 	vec3_t viewInModel;
-	float dot;
 
 	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		union {
-			float f;
-			int i;
-		} u;
+		float f;
 
 		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
 		VectorNormalizeFast(viewInModel);
 
-        dot = DotProduct(tess.normal[i], viewInModel);
-		dot *= dot;
+        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
 
-        u.f = 1.0 - dot;
-        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
-        u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
-
-		u.i &= ~(u.i >> 31);
-		colors[0] = colors[1] = colors[2] = u.i;
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
 	}
 }
 
@@ -1015,21 +1002,16 @@ void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
 	vec3_t viewInModel;
 
 	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		union {
-			float f;
-			int i;
-		} u;
+		float f;
 
 		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
 		VectorNormalizeFast(viewInModel);
 
-        u.f = DotProduct(tess.normal[i], viewInModel);
-        u.f *= u.f;
-        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
-        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+        f = Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
 
-		u.i &= ~(u.i >> 31);
-		colors[0] = colors[1] = colors[2] = u.i;
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
 	}
 }
 
@@ -1058,26 +1040,18 @@ void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float al
 {
 	int i;
 	vec3_t viewInModel;
-	float dot;
 
 	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		union {
-			float f;
-			int i;
-		} u;
+		float f;
 
 		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
 		VectorNormalizeFast(viewInModel);
 
-        dot = DotProduct(tess.normal[i], viewInModel);
-		dot *= dot;
+        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
 
-        u.f = 1.0 - dot;
-        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
-        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
-
-		u.i &= ~(u.i >> 31);
-		colors[0] = colors[1] = colors[2] = u.i;
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
 	}
 }
 
@@ -1093,10 +1067,10 @@ void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alph
 
         f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
         f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-        f = f - (float)(~((int)(f - (float)(byte)alphaCap) >> 31) & (int)(f - (float)(byte)alphaCap));
-        f = (float)((~((int)(f - (float)(byte)alphaMinCap) >> 31) & (int)(f - (float)(byte)alphaMinCap)) + (byte)alphaMinCap);
+		f = f - Q_max((int)(f - alphaCap), 0);
+		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
 	
-		colors[3] = f;
+		colors[3] = (unsigned char)f;
 	}
 }
 
@@ -1112,10 +1086,10 @@ void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaM
 
         f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
         f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-        f = f - (float)(~((int)(f - (float)(byte)alphaCap) >> 31) & (int)(f - (float)(byte)alphaCap));
-        f = (float)((~((int)(f - (float)(byte)alphaMinCap) >> 31) & (int)(f - (float)(byte)alphaMinCap)) + (byte)alphaMinCap);
+		f = f - Q_max((int)(f - alphaCap), 0);
+		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
 
-		colors[0] = colors[1] = colors[2] = f;
+		colors[0] = colors[1] = colors[2] = (unsigned char)f;
 	}
 }
 

From 6b21f7e92e8574079f1270fb304ac6a049ddbb93 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 27 Aug 2024 01:29:01 +0200
Subject: [PATCH 0687/2040] Fix the turret firedelay behavior on mohaa base

---
 code/fgame/weapturret.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index a5900401..9eeb52d8 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1246,6 +1246,18 @@ void TurretGun::AI_DoFiring()
     float minBurstTime, maxBurstTime;
     float minBurstDelay, maxBurstDelay;
 
+    if (g_target_game == target_game_e::TG_MOH) {
+        //
+        // Removed in 2.0
+        //  The fire delay is always constant on 1.11 and below
+        //
+        if (ReadyToFire(FIRE_PRIMARY)) {
+            Fire(FIRE_PRIMARY);
+        }
+
+        return;
+    }
+
     minBurstTime = m_fMinBurstTime;
     maxBurstTime = m_fMaxBurstTime;
     minBurstDelay = m_fMinBurstDelay;
@@ -1936,6 +1948,17 @@ void TurretGun::StopWeaponAnim(void)
 
 float TurretGun::FireDelay(firemode_t mode)
 {
+    if (g_target_game == target_game_e::TG_MOH) {
+        //
+        // Removed in 2.0
+        //
+        //  On 1.11 and below, the firedelay for players is always 0.06.
+        //  Some maps like m1l1 sets the turret firedelay higher for AI
+        if (owner && owner->IsSubclassOfPlayer()) {
+            return 0.06f;
+        }
+    }
+
     return fire_delay[FIRE_PRIMARY];
 }
 

From 1f71bb714d88cf326c45ac46400436bd806b9519 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:45:50 +0200
Subject: [PATCH 0688/2040] Fix sounds unexpectedly getting marked as streamed
 when they are not

This fixes #345 where a crash occurred because of a NULL buffer, as streamed sounds don't have a memory buffer
---
 code/fgame/g_utils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 1a3ae238..bb4e30bc 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1174,8 +1174,9 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
         arc.ArchiveString(&tempStr);
 
         if (tempStr.length()) {
+            qboolean streamed = tempStr[tempStr.length() - 1] != '0';
             tempStr[tempStr.length() - 1] = 0;
-            edict->s.loopSound = gi.soundindex(tempStr.c_str(), true);
+            edict->s.loopSound = gi.soundindex(tempStr.c_str(), streamed);
         } else {
             edict->s.loopSound = 0;
         }

From 2b9d31fe7f52018cc4374a5c551bd4ffe76628e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 27 Aug 2024 15:24:31 +0200
Subject: [PATCH 0689/2040] Normalize angles to fix interpolation issues on
 client

See #342
---
 code/fgame/player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index c0c689b0..9ac3b032 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7734,6 +7734,10 @@ void Player::SetViewAngles(Vector newViewangles)
     client->ps.delta_angles[2] = ANGLE2SHORT(newViewangles.z - client->cmd_angles[2]);
 
     v_angle = newViewangles;
+    // Fixed in OPM
+    //  Normalize angles to the range (-180, +180)
+    //  so interpolation is done properly client-side
+    v_angle.EulerNormalize();
 
     // get the pitch and roll from our leg angles
     newViewangles.x = angles.x;

From c7d1f42edbbf719166eb0eb362af3b0362c0d07d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Aug 2024 00:40:57 +0200
Subject: [PATCH 0690/2040] Use centroid when broadcasting new AI event

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 703daf22..daa608f8 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -4135,7 +4135,7 @@ void Entity::BroadcastAIEvent(int iType, float rad)
         return;
     }
 
-    G_BroadcastAIEvent(this, origin, iType, rad);
+    G_BroadcastAIEvent(this, centroid, iType, rad);
 }
 
 void Entity::BroadcastAIEvent(Event *ev)

From 7a0a671f183463b95549949fd06a36b81b57be50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 28 Aug 2024 00:41:53 +0200
Subject: [PATCH 0691/2040] Use the correct value when comparing the sound
 awareness multiplied by the range factor

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index b9235942..8a96b3ac 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8861,7 +8861,7 @@ void Actor::CuriousSound(int iType, vec3_t sound_origin, float fDistSquared, flo
         }
     }
 
-    if ((fRangeFactor * m_fSoundAwareness) < (rand() / 327.67f)) {
+    if ((fRangeFactor * m_fSoundAwareness) < (rand() / (0x7fffffff / 100.0))) {
         return;
     }
 

From 89133bf05d87df75d264d24ccf83e806cd321f39 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 29 Aug 2024 19:29:11 +0200
Subject: [PATCH 0692/2040] Fix looping sounds not stopped when stopping all
 sounds

This fixes an issue where some random looping sound (like footsteps) would be heard after restarting or when loading a saved game
---
 code/client/snd_openal_new.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 8558682d..900bb402 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1796,6 +1796,8 @@ void S_OPENAL_StopAllSounds(qboolean bStopMusic)
         return;
     }
 
+    S_OPENAL_StopLoopingSounds();
+
     for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (pChannel) {

From 014767741241f25e84d9a73f2912b67288c06b03 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 29 Aug 2024 21:37:05 +0200
Subject: [PATCH 0693/2040] Calculate sr/cr only if right or up is specified

---
 code/qcommon/q_math.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index f81c121c..d5c102af 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -2069,9 +2069,6 @@ void AngleVectors( const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
 	sp = sin( angle );
 	cp = cos( angle );
-	angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-	sr = sin( angle );
-	cr = cos( angle );
 
 	if( forward )
 	{
@@ -2079,18 +2076,25 @@ void AngleVectors( const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up
 		forward[ 1 ] = cp*sy;
 		forward[ 2 ] = -sp;
 	}
-	if( right )
-	{
-		right[ 0 ] = ( -1 * sr*sp*cy + -1 * cr*-sy );
-		right[ 1 ] = ( -1 * sr*sp*sy + -1 * cr*cy );
-		right[ 2 ] = -1 * sr*cp;
-	}
-	if( up )
-	{
-		up[ 0 ] = ( cr*sp*cy + -sr*-sy );
-		up[ 1 ] = ( cr*sp*sy + -sr*cy );
-		up[ 2 ] = cr*cp;
-	}
+    if ( right || up )
+    {
+        angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
+        sr = sin( angle );
+        cr = cos( angle );
+
+        if ( right )
+        {
+            right[ 0 ] = ( -1 * sr * sp * cy + -1 * cr * -sy );
+            right[ 1 ] = ( -1 * sr * sp * sy + -1 * cr * cy );
+            right[ 2 ] = -1 * sr * cp;
+        }
+        if ( up )
+        {
+            up[ 0 ] = ( cr * sp * cy + -sr * -sy );
+            up[ 1 ] = ( cr * sp * sy + -sr * cy );
+            up[ 2 ] = cr * cp;
+        }
+    }
 }
 
 void AngleVectorsLeft( const vec3_t angles, vec3_t forward, vec3_t left, vec3_t up )

From 68f2635c0688be3abbe26874bc80ae9103326dfd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 29 Aug 2024 23:31:46 +0200
Subject: [PATCH 0694/2040] Should be DotProduct2D

---
 code/fgame/actor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 8a96b3ac..250f5679 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2955,6 +2955,7 @@ Actor::Actor()
 
     //
     // Added in OPM
+    //  The variable isn't set in original
     //
     m_bSilent = false;
 }
@@ -3225,7 +3226,7 @@ void Actor::GetMoveInfo(mmove_t *mm)
 
                 DoFailSafeMove(node->point);
             }
-        } else if (DotProduct(mm->velocity, velocity) < -0.7f && level.inttime >= m_Path.Time() + 1000) {
+        } else if (DotProduct2D(mm->velocity, velocity) < -0.7f && level.inttime >= m_Path.Time() + 1000) {
             m_Path.ReFindPath(origin, this);
         }
         break;

From 2fe4e85543d8f5a3f202583157b889a19d8467f0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 30 Aug 2024 00:39:45 +0200
Subject: [PATCH 0695/2040] Fix path goal end anim script never reaching

The end anim script should be executed below a certain speed (1/4 below normal speed).
This fixes a bug in e3l4 where the game would never continue past the first bunker. The actor would get stuck after collecting supplies for the first bunker at the beginning because it stopped too far away from the target origin
---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 250f5679..3d240375 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -5482,7 +5482,7 @@ void Actor::MovePathGoal(float fMoveSpeed)
                 m_eAnimMode = ANIM_MODE_NORMAL;
             }
         }
-    } else if (fDeltaSquareLen < fMoveSpeed * Square(0.5f)) {
+    } else if (fDeltaSquareLen < Square(fMoveSpeed * 0.5 * 0.5)) {
         fTimeToGo       = 0.5f;
         m_fPathGoalTime = level.time + fTimeToGo;
         if (m_csPathGoalEndAnimScript == STRING_EMPTY) {

From 99fcec9f26b4adf816af790f0fd13f8ef4b93abe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:56:01 +0200
Subject: [PATCH 0696/2040] Initialize bStartedGame

---
 code/server/sv_ccmds.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index cb710e43..f7d7e582 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -2122,6 +2122,8 @@ void SV_Loadgame_f( void )
 		return;
 	}
 
+    bStartedGame = qfalse;
+
 	if( !ge )
 	{
 		SV_InitGameProgs();

From 2239efa43987ebc9d5f77065b9a9c57ae92a3cc3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 30 Aug 2024 19:13:04 +0200
Subject: [PATCH 0697/2040] Fix sample_offset() returning a wrong value with
 looping sounds

The returned offset will now be the correct when the stream has been re-read from the beginning due to the sound looping
---
 code/client/snd_openal_new.cpp | 59 +++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 900bb402..abb47697 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4497,6 +4497,7 @@ U32 openal_channel_two_d_stream::sample_offset()
     ALint         numQueuedBuffers    = 0;
     unsigned int  totalQueueLength    = 0;
     unsigned int  bytesPerSample      = 0;
+    unsigned int  offset              = 0;
     ALint         bits = 0, channels = 0;
 
     if (!streaming) {
@@ -4509,13 +4510,30 @@ U32 openal_channel_two_d_stream::sample_offset()
     alDieIfError();
 
     totalQueueLength = getQueueLength();
-
-    assert(playerByteOffset < totalQueueLength);
-    assert(streamNextOffset >= totalQueueLength);
-
     bytesPerSample = getBytesPerSample();
 
-    return (streamNextOffset - totalQueueLength + playerByteOffset) / bytesPerSample;
+    assert(playerByteOffset < totalQueueLength);
+    assert(streamNextOffset >= totalQueueLength || stream);
+
+    if (streamNextOffset >= totalQueueLength) {
+        offset = streamNextOffset - totalQueueLength + playerByteOffset;
+    } else if (stream) {
+        // it probably means the sound is looped and will restart from the beginning
+        if (streamNextOffset + playerByteOffset <= totalQueueLength) {
+            // near the end of the stream
+            offset = stream->info.size + streamNextOffset - totalQueueLength + playerByteOffset;
+        } else {
+            // it is past end of stream
+            // so, start from the beginning of the stream
+            offset = streamNextOffset + playerByteOffset - totalQueueLength;
+        }
+
+        assert(offset < stream->info.size);
+    } else {
+        offset = totalQueueLength - streamNextOffset + playerByteOffset;
+    }
+
+    return offset / bytesPerSample;
 }
 
 /*
@@ -4573,12 +4591,20 @@ void openal_channel_two_d_stream::set_sample_offset(U32 offset)
 
     bWasPlaying = is_playing();
 
-    if (byteOffset < streamPosition) {
-        //
-        // New offset is before the current offset,
-        // reload the stream from the beginning
-        //
-        if (stream) {
+    if (stream) {
+        if (byteOffset < streamPosition) {
+            //
+            // New offset is before the current offset,
+            // reload the stream from the beginning
+            //
+            S_CodecCloseStream(stream);
+            streamHandle = NULL;
+        } else if (byteOffset >= stream->info.size) {
+            //
+            // This shouldn't happen unless the file is different
+            // from the one used while saving
+            //
+            byteOffset %= stream->info.size;
             S_CodecCloseStream(stream);
             streamHandle = NULL;
         }
@@ -4787,7 +4813,16 @@ Return the current position in the sound being streamed.
 */
 unsigned int openal_channel_two_d_stream::getCurrentStreamPosition() const
 {
-    return streamNextOffset - getQueueLength();
+    unsigned int queueLength = getQueueLength();
+
+    if (streamNextOffset >= queueLength) {
+        return streamNextOffset - queueLength;
+    } else if (streamHandle) {
+        snd_stream_t* stream = (snd_stream_t*)streamHandle;
+        return (stream->info.size + streamNextOffset - queueLength) % stream->info.size;
+    } else {
+        return queueLength - streamNextOffset;
+    }
 }
 
 /*

From e59a24ded3fd49730bbea854bcc2a1b0c1af7eb9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:17:37 +0200
Subject: [PATCH 0698/2040] Fix actors enemy not being able to be set if enemy
 switch is disabled

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 3d240375..0bb67474 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -6418,7 +6418,7 @@ void Actor::UpdateEnemyInternal(void)
 
     m_PotentialEnemies.CheckEnemies(this);
 
-    if (m_Enemy != m_PotentialEnemies.GetCurrentEnemy() && (m_bEnemySwitch || m_Enemy)) {
+    if (m_Enemy != m_PotentialEnemies.GetCurrentEnemy() && (m_bEnemySwitch || !m_Enemy)) {
         SetEnemy(m_PotentialEnemies.GetCurrentEnemy(), false);
     }
 

From 6071b5303c550c65f699bf068f5e45e963fa7f76 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:18:28 +0200
Subject: [PATCH 0699/2040] Remove useless NET_Sleep and make sure frameMsec
 doesn't go below 1

---
 code/server/sv_main.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 95c73afc..82dd29b3 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -69,10 +69,6 @@ cvar_t	*sv_gamename;
 cvar_t	*sv_location;
 cvar_t	*sv_debug_gamespy;
 cvar_t	*sv_gamespy;
-
-// FIXME: use another global network ?
-//cvar_t	*sv_debug_gamepsy;
-//cvar_t	*sv_gamespy;
 cvar_t	*sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates to 99999 (bug #491)
 #ifndef STANDALONE
 cvar_t	*sv_strictAuth;
@@ -815,17 +811,17 @@ void SV_Frame( int msec ) {
 	if ( sv_fps->integer < 1 ) {
 		Cvar_Set( "sv_fps", "20" );
 	}
-
-	frameMsec = 1000 / sv_fps->integer;
-	sv.timeResidual += msec;
-
-	if ( com_dedicated->integer && sv.timeResidual < frameMsec ) {
-		// NET_Sleep will give the OS time slices until either get a packet
-		// or time enough for a server frame has gone by
-		NET_Sleep( frameMsec - sv.timeResidual );
-		return;
+    
+	frameMsec = 1000 / sv_fps->integer * com_timescale->value;
+	// don't let it scale below 1ms
+	if(frameMsec < 1)
+	{
+		Cvar_Set("timescale", va("%f", sv_fps->integer / 1000.0f));
+		frameMsec = 1;
 	}
 
+	sv.timeResidual += msec;
+
 	// if time is about to hit the 32nd bit, kick all clients
 	// and clear sv.time, rather
 	// than checking for negative time wraparound everywhere.

From 915269e017566be60de6711608cd02496be9a8ee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:24:59 +0200
Subject: [PATCH 0700/2040] Fix the actor stuck targeting an enemy with really
 low threat (behind walls, not visible)

This fixes the actor being stuck aiming even if the player is near them
---
 code/fgame/actorenemy.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index f99020b4..34c828c2 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -421,14 +421,13 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
     fRangeSquared    = 1e37f;
 
     if (m_fCurrentVisibility >= 0.999f) {
-        iThreat = 0;
-
         for (i = 1; i <= m_Enemies.NumObjects(); i++) {
             pActorEnemy = &m_Enemies.ObjectAt(i);
             pActorEnemy->UpdateThreat(pSelf);
+            iThreat = pActorEnemy->GetThreat();
 
-            if (m_iCurrentThreat >= pActorEnemy->GetThreat()) {
-                if (m_iCheckCount != pActorEnemy->GetThreat()) {
+            if (m_iCurrentThreat >= iThreat) {
+                if (m_iCheckCount != iThreat) {
                     continue;
                 }
 
@@ -437,12 +436,10 @@ void ActorEnemySet::CheckEnemies(Actor *pSelf)
                 }
             }
 
-            iThreat         = pActorEnemy->GetThreat();
-            m_pCurrentEnemy = pActorEnemy->GetEnemy();
-            fRangeSquared   = pActorEnemy->m_fCurrentRangeSquared;
+            m_iCurrentThreat = pActorEnemy->GetThreat();
+            m_pCurrentEnemy  = pActorEnemy->GetEnemy();
+            fRangeSquared    = pActorEnemy->m_fCurrentRangeSquared;
         }
-
-        m_iCurrentThreat = iThreat;
     }
 
     if ((!m_pCurrentEnemy || !m_pCurrentEnemy->m_bIsDisguised) && m_iCurrentThreat <= 0) {

From be655e2b9c4d5722c8f0c945dff696bcb18bf111 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:38:50 +0200
Subject: [PATCH 0701/2040] Fix the height of huddraw elements not being
 archived properly

A wrong variable was specified
---
 code/server/sv_ccmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index f7d7e582..fc4c9fd4 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1653,7 +1653,7 @@ void SV_ArchiveHudDrawElements( qboolean loading )
 		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iX );
 		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iY );
 		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iWidth );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iVerticalAlign );
+		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iHeight );
 		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 0 ] );
 		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 1 ] );
 		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 2 ] );

From b7288ba3f43efc184c351926f88a2f29c27883c7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:50:10 +0200
Subject: [PATCH 0702/2040] Don't affect the frameMsec with timescale as it
 causes issues with physics (like vehicles)

---
 code/server/sv_main.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 82dd29b3..a97f9f9b 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -812,13 +812,7 @@ void SV_Frame( int msec ) {
 		Cvar_Set( "sv_fps", "20" );
 	}
     
-	frameMsec = 1000 / sv_fps->integer * com_timescale->value;
-	// don't let it scale below 1ms
-	if(frameMsec < 1)
-	{
-		Cvar_Set("timescale", va("%f", sv_fps->integer / 1000.0f));
-		frameMsec = 1;
-	}
+	frameMsec = 1000 / sv_fps->integer;
 
 	sv.timeResidual += msec;
 

From 1911f04079a90b074faf277890c825ea9b46333b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 17:22:28 +0200
Subject: [PATCH 0703/2040] Fix strange AI turret target angles

The turret sometimes turned extremely fast or ignored the max yaw offset
---
 code/fgame/weapturret.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 9eeb52d8..378731aa 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -648,14 +648,12 @@ void TurretGun::AI_SetTargetAngles(vec3_t vTargAngles, float speed)
         vTargAngles[1] = m_fStartYaw + m_fMaxYawOffset;
     } else if (fDiff < -m_fMaxYawOffset) {
         vTargAngles[1] = m_fStartYaw - m_fMaxYawOffset;
-    } else {
-        vTargAngles[1] = m_fStartYaw + fDiff;
     }
 
     fYawDiff   = AngleSubtract(vTargAngles[1], angles[1]);
     fPitchDiff = AngleSubtract(vTargAngles[0], angles[0]);
 
-    if (fabs(fPitchDiff) == 0) {
+    if (speed == 0) {
         fTurnYawSpeed   = m_fTurnSpeed * level.frametime;
         fTurnPitchSpeed = m_fAIPitchSpeed * level.frametime;
     } else {
@@ -686,10 +684,10 @@ void TurretGun::AI_SetTargetAngles(vec3_t vTargAngles, float speed)
 
     if (fabs(fYawDiff) < fTurnYawSpeed) {
         angles[1] = vTargAngles[1];
-    } else if (fPitchDiff > 0) {
-        angles[1] += fYawDiff;
+    } else if (fYawDiff > 0) {
+        angles[1] += fTurnYawSpeed;
     } else {
-        angles[1] -= fYawDiff;
+        angles[1] -= fTurnYawSpeed;
     }
 
     setAngles(angles);

From 70fcc70348e9965f63aed2a765714771e0d00589 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 17:34:10 +0200
Subject: [PATCH 0704/2040] Fix AI turret placement

The AI was too much off from the turret
---
 code/fgame/actor_machinegunner.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor_machinegunner.cpp b/code/fgame/actor_machinegunner.cpp
index 30e075a1..5f42bcb6 100644
--- a/code/fgame/actor_machinegunner.cpp
+++ b/code/fgame/actor_machinegunner.cpp
@@ -157,7 +157,7 @@ void Actor::ThinkHoldGun_TurretGun(void)
             }
         }
 
-        VectorScale2D(orientation[0], m_fCrouchWeight * -9.3f + 23.4f, offset);
+        VectorScale2D(orientation[0], -(m_fCrouchWeight * -9.3f + 23.4f), offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
         VectorScale2D(orientation[1], m_fCrouchWeight * 2.6f + 10.3f, offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
@@ -167,7 +167,7 @@ void Actor::ThinkHoldGun_TurretGun(void)
             m_fCrouchWeight = 1.0;
         }
 
-        VectorScale2D(orientation[0], m_fCrouchWeight * -3.f + 23.4f, offset);
+        VectorScale2D(orientation[0], -(m_fCrouchWeight * -3.f + 23.4f), offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
         VectorScale2D(orientation[1], m_fCrouchWeight * -1.6f + 10.3f, offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
@@ -182,6 +182,8 @@ void Actor::ThinkHoldGun_TurretGun(void)
     UpdateAimMotion();
     UpdateAnim();
 
+    newOrigin[2] += 18;
+
     end[0] = newOrigin[0];
     end[1] = newOrigin[1];
     end[2] = newOrigin[2] - 94;

From 81866d96e09405e13b16a6b2911013ecd775b1ca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 17:57:28 +0200
Subject: [PATCH 0705/2040] Make flesh impacts properly work

---
 code/cgame/cg_parsemsg.cpp | 30 ++++++++++++++++++++++++++++--
 code/fgame/weaputils.cpp   |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 9d7ebfe6..2455c73c 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -987,14 +987,16 @@ void CG_AddBulletImpacts()
     if (flesh_impact_count) {
         if (flesh_impact_count > 1) {
             fImpSndDistRA  = 9999.0;
+            fImpSndDistRB  = 9999.0;
             iImpSndIndexRA = 0;
+            iImpSndIndexRB = 0;
 
             for (i = 0; i < flesh_impact_count; i++) {
-                VectorSubtract(wall_impact_pos[i], cg.SoundOrg, vTmp);
+                VectorSubtract(flesh_impact_pos[i], cg.SoundOrg, vTmp);
                 iHeadDist = VectorLength(vTmp);
 
                 if (DotProduct(vTmp, cg.SoundAxis[1]) > 0.f) {
-                    if (iHeadDist < fImpSndDistRA) {
+                    if (iHeadDist < fImpSndDistRB) {
                         fImpSndDistRA  = iHeadDist;
                         iImpSndIndexRA = i;
                     }
@@ -1003,6 +1005,30 @@ void CG_AddBulletImpacts()
                     iImpSndIndexRA = i;
                 }
             }
+
+            if (fImpSndDistRA < 9999) {
+                sfxManager.MakeEffect_Normal(
+                    flesh_impact_large[iImpSndIndexRA] ? SFX_BHIT_HUMAN_UNIFORM_HARD : SFX_BHIT_HUMAN_UNIFORM_LITE,
+                    flesh_impact_pos[iImpSndIndexRA],
+                    flesh_impact_norm[iImpSndIndexRA]
+                );
+            }
+
+            if (fImpSndDistRB < 9999) {
+                sfxManager.MakeEffect_Normal(
+                    flesh_impact_large[iImpSndIndexRB] ? SFX_BHIT_HUMAN_UNIFORM_HARD : SFX_BHIT_HUMAN_UNIFORM_LITE,
+                    flesh_impact_pos[iImpSndIndexRB],
+                    flesh_impact_norm[iImpSndIndexRB]
+                );
+            }
+        } else {
+            for (i = 0; i < flesh_impact_count; i++) {
+                sfxManager.MakeEffect_Normal(
+                    flesh_impact_large[i] ? SFX_BHIT_HUMAN_UNIFORM_HARD : SFX_BHIT_HUMAN_UNIFORM_LITE,
+                    flesh_impact_pos[i],
+                    flesh_impact_norm[i]
+                );
+            }
         }
 
         flesh_impact_count = 0;
diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 640104e5..51d52891 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2321,7 +2321,7 @@ float BulletAttack(
                             gi.MSG_WriteDir(trace.plane.normal);
                             gi.MSG_WriteBits(bulletlarge, bulletbits);
                             gi.MSG_EndCGM();
-                        } else if (trace.location >= 0 && ent->IsSubclassOfPlayer()) {
+                        } else if (trace.location >= 0 && ent->IsSubclassOfSentient()) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
                             gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_8));
                             gi.MSG_WriteCoord(vTmpEnd[0]);

From 9de71e35295e9baa2a132c1c55e9912f2653c127 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 18:05:44 +0200
Subject: [PATCH 0706/2040] Correctly check if the AI either can see or can
 shoot to find the enemy

The AI would get stuck trying to cover otherwise
---
 code/fgame/actor_cover.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor_cover.cpp b/code/fgame/actor_cover.cpp
index 456f2efc..8350849b 100644
--- a/code/fgame/actor_cover.cpp
+++ b/code/fgame/actor_cover.cpp
@@ -380,7 +380,7 @@ void Actor::State_Cover_Hide(void)
         return;
     }
 
-    if (bCanShoot || bCanShoot) {
+    if (bCanSee || bCanShoot) {
         m_pCoverNode->Relinquish();
         m_pCoverNode->MarkTemporarilyBad();
         m_pCoverNode = NULL;

From 11f5870a8b519305aa660da1f453478f9899ebd0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:45:05 +0200
Subject: [PATCH 0707/2040] Add ioq3 server fixes and improvement

- Add a rate limit to protect against DoS attacks
- Better IPv6 support
---
 code/qcommon/msg.cpp      |  12 +
 code/qcommon/q_shared.h   |   2 +
 code/qcommon/qcommon.h    |   9 +-
 code/server/server.h      | 223 ++++++++-------
 code/server/sv_client.c   | 566 ++++++++++++++++++++++++++------------
 code/server/sv_init.c     |  55 ++--
 code/server/sv_main.c     | 424 +++++++++++++++++++++-------
 code/server/sv_net_chan.c |  16 +-
 code/server/sv_snapshot.c |  74 ++++-
 code/server/sv_world.c    |  12 +-
 10 files changed, 966 insertions(+), 427 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index a5f46991..bb04cba3 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -875,6 +875,18 @@ void MSG_ReadData( msg_t *msg, void *data, int len ) {
 	}
 }
 
+// a string hasher which gives the same hash value even if the
+// string is later modified via the legacy MSG read/write code
+int MSG_HashKey(const char *string, int maxlen) {
+	int register hash, i;
+
+	hash = 0;
+	for (i = 0; i < maxlen && string[i] != '\0'; i++) {
+		hash += string[i] * (119 + i);
+	}
+	hash = (hash ^ (hash >> 10) ^ (hash >> 20));
+	return hash;
+}
 
 /*
 =============================================================================
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 63f6dd31..cb601125 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -79,6 +79,8 @@ extern "C" {
 
 #define CLIENT_WINDOW_TITLE		PRODUCT_NAME
 #define CLIENT_WINDOW_MIN_TITLE PRODUCT_NAME
+    
+#define MAX_MASTER_SERVERS      5	// number of supported master servers
 
 #define DEMOEXT	"dm_"			// standard demo extension
 
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 6baab452..fb7db583 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -87,6 +87,7 @@ void MSG_WriteBigString (msg_t *sb, const char *s);
 void MSG_WriteScrambledString(msg_t* sb, const char* s);
 void MSG_WriteScrambledBigString(msg_t* sb, const char* s);
 void MSG_WriteAngle16 (msg_t *sb, float f);
+int MSG_HashKey(const char *string, int maxlen);
 void MSG_WriteEntityNum(msg_t* sb, short number);
 
 void	MSG_BeginReading (msg_t *sb);
@@ -202,8 +203,8 @@ NET
 #define	MAX_RELIABLE_COMMANDS	512			// max string commands buffered for restransmit
 
 typedef enum {
-	NA_BOT,
 	NA_BAD,					// an address lookup failed
+    NA_BOT,
 	NA_LOOPBACK,
 	NA_BROADCAST,
 	NA_IP,
@@ -373,7 +374,11 @@ enum clc_ops_e {
 	clc_move,				// [[usercmd_t]
 	clc_moveNoDelta,		// [[usercmd_t]
 	clc_clientCommand,		// [string] message
-	clc_EOF
+	clc_EOF,
+
+// new commands, supported only by ioquake3 protocol but not legacy
+	clc_voipSpeex,   // not wrapped in USE_VOIP, so this value is reserved.
+	clc_voipOpus,    //
 };
 
 /*
diff --git a/code/server/server.h b/code/server/server.h
index 464ecb04..498c15b8 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // server.h
 
-#ifndef __SERVER_H__
-#define __SERVER_H__
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -43,6 +42,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
+#ifdef USE_VOIP
+#define VOIP_QUEUE_LENGTH 64
+
+typedef struct voipServerPacket_s
+{
+	int generation;
+	int sequence;
+	int frames;
+	int len;
+	int sender;
+	int flags;
+	byte data[4000];
+} voipServerPacket_t;
+#endif
+
 typedef struct svEntity_s {
 	struct worldSector_s *worldSector;
 	struct svEntity_s *nextEntityInWorldSector;
@@ -93,6 +107,10 @@ typedef struct {
 	int				gameClientSize;		// will be > sizeof(playerState_t) due to game private data
 } server_t;
 
+
+
+
+
 typedef struct {
 	int				areabytes;
 	byte			areabits[MAX_MAP_AREA_BYTES];		// portalarea visibility bits
@@ -103,7 +121,7 @@ typedef struct {
 										// order, otherwise the delta compression will fail
 	int				messageSent;		// time the message was transmitted
 	int				messageAcked;		// time the message was acked
-	size_t			messageSize;		// used to rate drop packets
+	int				messageSize;		// used to rate drop packets
 } clientSnapshot_t;
 
 typedef enum {
@@ -129,13 +147,13 @@ typedef struct client_s {
 	char			userinfo[MAX_INFO_STRING];		// name, etc
 
 	char			reliableCommands[MAX_RELIABLE_COMMANDS][MAX_STRING_CHARS];
-	int				reliableSequence;		// last added reliable message, not necesarily sent or acknowledged yet
+	int				reliableSequence;		// last added reliable message, not necessarily sent or acknowledged yet
 	int				reliableAcknowledge;	// last acknowledged reliable message
-	int				reliableSent;			// last sent reliable message, not necesarily acknowledged yet
+	int				reliableSent;			// last sent reliable message, not necessarily acknowledged yet
 	int				messageAcknowledge;
 
 	int				gamestateMessageNum;	// netchan->outgoingSequence of gamestate
-    int				challenge;
+	int				challenge;
     int				serverIdAcknowledge;
 
 	usercmd_t		lastUsercmd;
@@ -151,21 +169,21 @@ typedef struct client_s {
 	// downloading
 	char			downloadName[MAX_QPATH]; // if not empty string, we are downloading
 	fileHandle_t	download;			// file being downloaded
-	size_t			downloadSize;		// total bytes (can't use EOF because of paks)
-	size_t			downloadCount;		// bytes sent
+ 	int				downloadSize;		// total bytes (can't use EOF because of paks)
+ 	int				downloadCount;		// bytes sent
 	int				downloadClientBlock;	// last block we sent to the client, awaiting ack
 	int				downloadCurrentBlock;	// current block number
 	int				downloadXmitBlock;	// last block we xmited
 	unsigned char	*downloadBlocks[MAX_DOWNLOAD_WINDOW];	// the buffers for the download blocks
-	size_t			downloadBlockSize[MAX_DOWNLOAD_WINDOW];
+	int				downloadBlockSize[MAX_DOWNLOAD_WINDOW];
 	qboolean		downloadEOF;		// We have sent the EOF block
 	int				downloadSendTime;	// time we last got an ack from the client
 
 	int				deltaMessage;		// frame last client usercmd message
 	int				nextReliableTime;	// svs.time when another reliable command will be allowed
 	int				lastPacketTime;		// svs.time when packet was last received
-    int				lastConnectTime;	// svs.time when connection started
-    int				lastSnapshotTime;	// svs.time of last sent snapshot
+	int				lastConnectTime;	// svs.time when connection started
+	int				lastSnapshotTime;	// svs.time of last sent snapshot
 	qboolean		rateDelayed;		// true if nextSnapshotTime was set based on rate instead of snapshotMsec
 	int				timeoutCount;		// must timeout a few frames in a row so debugging doesn't break
 	clientSnapshot_t	frames[PACKET_BACKUP];	// updates can be delta'd from here
@@ -182,8 +200,17 @@ typedef struct client_s {
 	netchan_buffer_t *netchan_start_queue;
 	netchan_buffer_t **netchan_end_queue;
 
+#ifdef USE_VOIP
+	qboolean hasVoip;
+	qboolean muteAllVoip;
+	qboolean ignoreVoipFromClient[MAX_CLIENTS];
+	voipServerPacket_t *voipPacket[VOIP_QUEUE_LENGTH];
+	int queuedVoipPackets;
+	int queuedVoipIndex;
+#endif
+
 	int				oldServerTime;
-	qboolean			csUpdated[MAX_CONFIGSTRINGS+1];	
+	qboolean		csUpdated[MAX_CONFIGSTRINGS];
 
 	server_sound_t server_sounds[ MAX_SERVER_SOUNDS ];
 	int number_of_server_sounds;
@@ -198,7 +225,7 @@ typedef struct client_s {
     int lastVisCheckTime[MAX_CLIENTS];
 
 #ifdef LEGACY_PROTOCOL
-    qboolean		compat;
+	qboolean		compat;
 #endif
 } client_t;
 
@@ -208,7 +235,11 @@ typedef struct client_s {
 // MAX_CHALLENGES is made large to prevent a denial
 // of service attack that could cycle all of them
 // out before legitimate users connected
-#define	MAX_CHALLENGES	1024
+#define	MAX_CHALLENGES	2048
+// Allow a certain amount of challenges to have the same IP address
+// to make it a bit harder to DOS one single IP address from connecting
+// while not allowing a single ip to grab all challenge resources
+#define MAX_CHALLENGES_MULTI (MAX_CHALLENGES / 2)
 
 #define	AUTHORIZE_TIMEOUT	5000
 
@@ -227,47 +258,52 @@ typedef enum {
 
 typedef struct {
 	netadr_t	adr;
-    int				challenge;
-    int				clientChallenge;		// challenge number coming from the client
-    int				time;				// time the last packet was sent to the autherize server
-    int				pingTime;			// time the challenge response was sent to client
-    int				firstTime;			// time the adr was first used, for authorize timeout checks
-    qboolean		wasrefused;
-    qboolean		connected;
+	int			challenge;
+	int			clientChallenge;		// challenge number coming from the client
+	int			time;				// time the last packet was sent to the autherize server
+	int			pingTime;			// time the challenge response was sent to client
+	int			firstTime;			// time the adr was first used, for authorize timeout checks
+	qboolean	wasrefused;
+	qboolean	connected;
+
+    //
+    // gamespy stuff
+    //
 	unsigned int	gamespyId;
 	char			gsChallenge[12];
 	cdKeyState_e	cdkeyState;
 } challenge_t;
 
-
-#define	MAX_MASTERS	8				// max recipients for heartbeat packets
-
 // this structure will be cleared only when the game dll changes
 typedef struct {
-	qboolean		initialized;				// sv_init has completed
+	qboolean	initialized;				// sv_init has completed
 
-	int				snapFlagServerBit;			// ^= SNAPFLAG_SERVERCOUNT every SV_SpawnServer()
+	int			time;						// will be strictly increasing across level changes
 
-	int				time;						// will be strictly increasing across level changes
-	int				startTime;
-	int				lastTime;
-	int				serverLagTime;
-	qboolean		autosave;
-	int				mapTime;
+	int			snapFlagServerBit;			// ^= SNAPFLAG_SERVERCOUNT every SV_SpawnServer()
 
-	client_t		*clients;					// [sv_maxclients->integer];
-	int				iNumClients;
-	int				numSnapshotEntities;		// sv_maxclients->integer*PACKET_BACKUP*MAX_PACKET_ENTITIES
-	int				nextSnapshotEntities;		// next snapshotEntities to use
+	int			startTime;
+	int			lastTime;
+	int			serverLagTime;
+	qboolean	autosave;
+	int			mapTime;
+
+	client_t	*clients;					// [sv_maxclients->integer];
+	int			iNumClients;
+	int			numSnapshotEntities;		// sv_maxclients->integer*PACKET_BACKUP*MAX_SNAPSHOT_ENTITIES
+	int			nextSnapshotEntities;		// next snapshotEntities to use
 	entityState_t	*snapshotEntities;		// [numSnapshotEntities]
-	int				nextHeartbeatTime;
-	challenge_t		challenges[MAX_CHALLENGES];	// to prevent invalid IPs from connecting
-	netadr_t		redirectAddress;			// for rcon return messages
-	netadr_t		authorizeAddress;			// for rcon return messages
+	int			nextHeartbeatTime;
+	challenge_t	challenges[MAX_CHALLENGES];	// to prevent invalid IPs from connecting
+	netadr_t	redirectAddress;			// for rcon return messages
+#ifndef STANDALONE
+	netadr_t	authorizeAddress;			// authorize server address
+#endif
 	char			gameName[ MAX_QPATH ];
 	char			mapName[ MAX_QPATH ];
 	char			rawServerName[ MAX_QPATH ];
 	int				areabits_warning_time;
+
 	qboolean		soundsNeedLoad;
 	char			tm_filename[ MAX_QPATH ];
 	int				tm_loopcount;
@@ -291,53 +327,51 @@ typedef struct
 
 //=============================================================================
 
-extern cvar_t	*sv_mapname;
-extern serverStatic_t	svs;			// persistant server info across maps
-extern server_t		sv;					// cleared each map
-extern game_export_t	*ge;				// game exports
+extern	serverStatic_t	svs;				// persistant server info across maps
+extern	server_t		sv;					// cleared each map
+extern	game_export_t	*ge;				// game exports
 
-#define	MAX_MASTER_SERVERS	5
+extern	cvar_t	*sv_fps;
+extern	cvar_t	*sv_timeout;
+extern	cvar_t	*sv_zombietime;
+extern	cvar_t	*sv_rconPassword;
+extern	cvar_t	*sv_privatePassword;
+extern	cvar_t	*sv_allowDownload;
+extern	cvar_t	*sv_maxclients;
 
-extern cvar_t	*sv_fps;
-extern cvar_t	*sv_timeout;
-extern cvar_t	*sv_zombietime;
-extern cvar_t	*sv_rconPassword;
-extern cvar_t	*sv_privatePassword;
-extern cvar_t	*sv_allowDownload;
-extern cvar_t	*sv_maxclients;
-
-extern cvar_t	*sv_privateClients;
-extern cvar_t	*sv_hostname;
-extern cvar_t	*sv_master[ MAX_MASTER_SERVERS ];
-extern cvar_t	*sv_reconnectlimit;
-extern cvar_t	*sv_showloss;
-extern cvar_t	*sv_padPackets;
-extern cvar_t	*sv_killserver;
-extern cvar_t	*sv_mapChecksum;
-extern cvar_t	*sv_serverid;
-extern cvar_t	*sv_minRate;
-extern cvar_t	*sv_maxRate;
-extern cvar_t	*sv_dlRate;
-extern cvar_t	*sv_minPing;
-extern cvar_t	*sv_maxPing;
-extern cvar_t	*sv_pure;
-extern cvar_t	*sv_floodProtect;
-extern cvar_t	*sv_maplist;
-extern cvar_t	*sv_drawentities;
-extern cvar_t	*sv_deeptracedebug;
-extern cvar_t	*sv_netprofile;
-extern cvar_t	*sv_netprofileoverlay;
-extern cvar_t	*sv_netoptimize;
-extern cvar_t	*sv_netoptimize_vistime;
-extern cvar_t	*g_netoptimize;
-extern cvar_t	*g_gametype;
-extern cvar_t	*g_gametypestring;
-extern cvar_t	*sv_chatter;
-extern cvar_t	*sv_gamename;
-extern cvar_t	*sv_location;
-extern cvar_t	*sv_debug_gamespy;
-extern cvar_t	*sv_gamespy;
-extern cvar_t	*sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates to 99999 (bug #491)
+extern	cvar_t	*sv_privateClients;
+extern	cvar_t	*sv_hostname;
+extern	cvar_t	*sv_master[MAX_MASTER_SERVERS];
+extern	cvar_t	*sv_reconnectlimit;
+extern	cvar_t	*sv_showloss;
+extern	cvar_t	*sv_padPackets;
+extern	cvar_t	*sv_killserver;
+extern	cvar_t	*sv_mapname;
+extern	cvar_t	*sv_mapChecksum;
+extern	cvar_t	*sv_serverid;
+extern	cvar_t	*sv_minRate;
+extern	cvar_t	*sv_maxRate;
+extern	cvar_t	*sv_dlRate;
+extern	cvar_t	*sv_minPing;
+extern	cvar_t	*sv_maxPing;
+extern	cvar_t	*g_gametype;
+extern	cvar_t	*g_gametypestring;
+extern	cvar_t	*sv_pure;
+extern	cvar_t	*sv_floodProtect;
+extern	cvar_t	*sv_lanForceRate;
+extern	cvar_t	*sv_maplist;
+extern	cvar_t	*sv_drawentities;
+extern	cvar_t	*sv_deeptracedebug;
+extern	cvar_t	*sv_netprofile;
+extern	cvar_t	*sv_netprofileoverlay;
+extern	cvar_t	*sv_netoptimize;
+extern	cvar_t	*sv_netoptimize_vistime;
+extern	cvar_t	*g_netoptimize;
+extern	cvar_t	*sv_chatter;
+extern	cvar_t	*sv_gamename;
+extern	cvar_t	*sv_location;
+extern	cvar_t	*sv_debug_gamespy;
+extern	cvar_t	*sv_gamespy;
 #ifndef STANDALONE
 extern	cvar_t	*sv_strictAuth;
 #endif
@@ -351,6 +385,7 @@ extern	cvar_t	*sv_voip;
 extern	cvar_t	*sv_voipProtocol;
 #endif
 
+
 //===========================================================
 
 //
@@ -378,8 +413,8 @@ extern leakyBucket_t outboundLeakyBucket;
 qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period );
 qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period );
 
-void SV_FinalMessage( const char *message );
-void QDECL SV_SendServerCommand( client_t *cl, const char *fmt, ...);
+void SV_FinalMessage (const char *message);
+void QDECL SV_SendServerCommand( client_t *cl, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 
 
 void SV_AddOperatorCommands (void);
@@ -444,8 +479,8 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 //
 // sv_client.c
 //
-challenge_t* FindChallenge(netadr_t from, qboolean connecting);
-void SV_GetChallenge( netadr_t from );
+challenge_t* FindChallenge(netadr_t from, qboolean connecting); 
+void SV_GetChallenge(netadr_t from);
 
 void SV_DirectConnect( netadr_t from );
 
@@ -455,15 +490,17 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg );
 void SV_UserinfoChanged( client_t *cl );
 
 void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd );
+void SV_FreeClient(client_t *client);
 void SV_DropClient( client_t *drop, const char *reason );
 
 void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK );
-void SV_ClientThink( client_t *cl, usercmd_t *cmd );
+void SV_ClientThink (client_t *cl, usercmd_t *cmd);
 
-int SV_WriteDownloadToClient( client_t *cl , msg_t *msg );
+int SV_WriteDownloadToClient(client_t *cl , msg_t *msg);
 int SV_SendDownloadMessages(void);
 int SV_SendQueuedMessages(void);
 
+
 //
 // sv_ccmds.c
 //
@@ -524,7 +561,7 @@ void SV_UnlinkEntity( gentity_t *ent );
 void SV_LinkEntity( gentity_t *ent );
 // Needs to be called any time an entity changes origin, mins, maxs,
 // or solid.  Automatically unlinks if needed.
-// sets ent->v.absmin and ent->v.absmax
+// sets ent->r.absmin and ent->r.absmax
 // sets ent->leafnums[] for pvs determination even if the entity
 // is not solid
 
@@ -585,5 +622,3 @@ void SV_ShutdownGamespy();
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __SERVER_H__
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index a2868930..1e4b4646 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -46,10 +46,19 @@ to be sent to the authorize server.
 
 When an authorizeip is returned, a challenge response will be
 sent to that ip.
+
+ioquake3: we added a possibility for clients to add a challenge
+to their packets, to make it more difficult for malicious servers
+to hi-jack client connections.
+Also, the auth stuff is completely disabled for com_standalone games
+as well as IPv6 connections, since there is no way to use the
+v4-only auth server for these new types of connections.
 =================
 */
-void SV_GetChallenge( netadr_t from ) {
+void SV_GetChallenge(netadr_t from)
+{
 	challenge_t	*challenge;
+	qboolean wasfound = qfalse;
 
 	// ignore if we are in single player
 	// Removed in OPM
@@ -58,9 +67,23 @@ void SV_GetChallenge( netadr_t from ) {
 	//	return;
 	//}
 
-	challenge = FindChallenge(from, qtrue);
+	// Prevent using getchallenge as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SV_GetChallenge: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
+		return;
+	}
 
-	// if they are on a lan address, send the challengeResponse immediately
+	// Allow getchallenge to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SV_GetChallenge: rate limit exceeded, dropping request\n" );
+		return;
+	}
+
+    challenge = FindChallenge(from, qtrue);
+
+    // if they are on a lan address, send the challengeResponse immediately
 
 	// we send the challengeResponse immediately as there is no AUTH server for us
 	// it's also way more cool this way :)
@@ -89,8 +112,10 @@ void SV_GetChallenge( netadr_t from ) {
 
 	// check client's cd key
 	NET_OutOfBandPrint(NS_SERVER, from, "getKey %s", challenge->gsChallenge);
+	challenge->pingTime = svs.time;
 }
 
+#ifndef STANDALONE
 /*
 ====================
 SV_AuthorizeIpPacket
@@ -98,8 +123,6 @@ SV_AuthorizeIpPacket
 A packet has been returned from the authorize server.
 If we have a challenge adr for that ip, send the
 challengeResponse to it
-
-NOTE: This function is deprecated, SV_GamespyAuthorize must be used instead.
 ====================
 */
 void SV_AuthorizeIpPacket( netadr_t from ) {
@@ -107,6 +130,7 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 	int		i;
 	char	*s;
 	char	*r;
+	challenge_t *challengeptr;
 
 	if ( !NET_CompareBaseAdr( from, svs.authorizeAddress ) ) {
 		Com_Printf( "SV_AuthorizeIpPacket: not from authorize server\n" );
@@ -124,45 +148,48 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 		Com_Printf( "SV_AuthorizeIpPacket: challenge not found\n" );
 		return;
 	}
+	
+	challengeptr = &svs.challenges[i];
 
 	// send a packet back to the original client
-	svs.challenges[i].pingTime = svs.time;
+	challengeptr->pingTime = svs.time;
 	s = Cmd_Argv( 2 );
 	r = Cmd_Argv( 3 );			// reason
 
 	if ( !Q_stricmp( s, "demo" ) ) {
 		// they are a demo client trying to connect to a real server
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nServer is not a demo server\n" );
+		NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\nServer is not a demo server\n" );
 		// clear the challenge record so it won't timeout and let them through
-		Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
+		Com_Memset( challengeptr, 0, sizeof( *challengeptr ) );
 		return;
 	}
 	if ( !Q_stricmp( s, "accept" ) ) {
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, 
-			"challengeResponse %i", svs.challenges[i].challenge );
+		NET_OutOfBandPrint(NS_SERVER, challengeptr->adr,
+			"challengeResponse %d %d %d", challengeptr->challenge, challengeptr->clientChallenge, com_protocol->integer);
 		return;
 	}
 	if ( !Q_stricmp( s, "unknown" ) ) {
 		if (!r) {
-			NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nAwaiting CD key authorization\n" );
+			NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\nAwaiting CD key authorization\n" );
 		} else {
-			NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\n%s\n", r);
+			NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\n%s\n", r);
 		}
 		// clear the challenge record so it won't timeout and let them through
-		Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
+		Com_Memset( challengeptr, 0, sizeof( *challengeptr ) );
 		return;
 	}
 
 	// authorization failed
 	if (!r) {
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nSomeone is using this CD Key\n" );
+		NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\nSomeone is using this CD Key\n" );
 	} else {
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\n%s\n", r );
+		NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\n%s\n", r );
 	}
 
 	// clear the challenge record so it won't timeout and let them through
-	Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
+	Com_Memset( challengeptr, 0, sizeof(*challengeptr) );
 }
+#endif
 
 /*
 ==================
@@ -265,16 +292,11 @@ A "connect" OOB command has been received
 ==================
 */
 
-#define PB_MESSAGE "PunkBuster Anti-Cheat software must be installed " \
-				"and Enabled in order to join this server. An updated game patch can be downloaded from " \
-				"www.idsoftware.com"
-
 void SV_DirectConnect( netadr_t from ) {
 	char		userinfo[MAX_INFO_STRING];
 	int			i;
 	client_t	*cl, *newcl;
-	// Make this a temp variable to avoid stack overflow issues
-	static client_t temp;
+	static client_t	temp; // static variable, otherwise it causes a stack overflow
 	gentity_t	*ent;
 	int			clientNum;
 	int			version;
@@ -290,7 +312,7 @@ void SV_DirectConnect( netadr_t from ) {
 #endif
 	challenge_t* ch;
 
-	Com_DPrintf( "SVC_DirectConnect ()\n" );
+	Com_DPrintf ("SVC_DirectConnect ()\n");
 	
 	// Check whether this client is banned.
 	if(SV_IsBanned(&from, qfalse))
@@ -299,9 +321,10 @@ void SV_DirectConnect( netadr_t from ) {
 		return;
 	}
 
-	Q_strncpyz( userinfo, Cmd_Argv( 1 ), sizeof( userinfo ) );
+	Q_strncpyz( userinfo, Cmd_Argv(1), sizeof(userinfo) );
 
-	version = atoi( Info_ValueForKey( userinfo, "protocol" ) );
+	version = atoi(Info_ValueForKey(userinfo, "protocol"));
+	
 #ifdef LEGACY_PROTOCOL
 	if(version > 0 && com_legacyprotocol->integer == version)
 		compat = qtrue;
@@ -351,42 +374,54 @@ void SV_DirectConnect( netadr_t from ) {
 	Info_SetValueForKey( userinfo, "ip", ip );
 
 	// see if the challenge is valid (LAN clients don't need to challenge)
-	if ( !NET_IsLocalAddress (from) ) {
-		int		ping;
+	if (!NET_IsLocalAddress(from))
+	{
+		int ping;
+		challenge_t *challengeptr;
 
-		for (i=0 ; i<MAX_CHALLENGES ; i++) {
-			if (NET_CompareAdr(from, svs.challenges[i].adr)) {
-				if ( challenge == svs.challenges[i].challenge ) {
-					break;		// good
-				}
+		for (i=0; i<MAX_CHALLENGES; i++)
+		{
+			if (NET_CompareAdr(from, svs.challenges[i].adr))
+			{
+				if(challenge == svs.challenges[i].challenge)
+					break;
 			}
 		}
-		if (i == MAX_CHALLENGES) {
-			NET_OutOfBandPrint( NS_SERVER, from, "droperror\nNo or bad challenge for address.\n" );
+
+		if (i == MAX_CHALLENGES)
+		{
+			NET_OutOfBandPrint( NS_SERVER, from, "print\nNo or bad challenge for your address.\n" );
+			return;
+		}
+	
+		challengeptr = &svs.challenges[i];
+		
+		if(challengeptr->wasrefused)
+		{
+			// Return silently, so that error messages written by the server keep being displayed.
 			return;
 		}
 
-		ping = svs.time - svs.challenges[i].pingTime;
-		Com_Printf( "Client %i connecting with %i challenge ping\n", i, ping );
-		svs.challenges[i].connected = qtrue;
+		ping = svs.time - challengeptr->pingTime;
 
 		// never reject a LAN client based on ping
 		if ( !Sys_IsLANAddress( from ) ) {
 			if ( sv_minPing->value && ping < sv_minPing->value ) {
-				// don't let them keep trying until they get a big delay
-				NET_OutOfBandPrint( NS_SERVER, from, "droperror\nServer is for high pings only\n" );
+				NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for high pings only\n" );
 				Com_DPrintf ("Client %i rejected on a too low ping\n", i);
-				// reset the address otherwise their ping will keep increasing
-				// with each connect message and they'd eventually be able to connect
-				svs.challenges[i].adr.port = 0;
+				challengeptr->wasrefused = qtrue;
 				return;
 			}
 			if ( sv_maxPing->value && ping > sv_maxPing->value ) {
-				NET_OutOfBandPrint( NS_SERVER, from, "droperror\nServer is for low pings only\n" );
+				NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for low pings only\n" );
 				Com_DPrintf ("Client %i rejected on a too high ping\n", i);
+				challengeptr->wasrefused = qtrue;
 				return;
 			}
 		}
+
+		Com_Printf("Client %i connecting with %i challenge ping\n", i, ping);
+		challengeptr->connected = qtrue;
 	}
 
 	newcl = &temp;
@@ -425,7 +460,7 @@ void SV_DirectConnect( netadr_t from ) {
 
 	// check for privateClient password
 	password = Info_ValueForKey( userinfo, "password" );
-	if ( !strcmp( password, sv_privatePassword->string ) ) {
+	if ( *password && !strcmp( password, sv_privatePassword->string ) ) {
 		startIndex = 0;
 	} else {
 		// skip past the reserved slots
@@ -499,10 +534,9 @@ gotnewcl:
 
 	// get the game a chance to reject this connection or modify the userinfo
 	denied = ge->ClientConnect( clientNum, qtrue, qfalse );
-
 	if ( denied ) {
 		NET_OutOfBandPrint( NS_SERVER, from, "droperror\n%s\n", denied );
-		Com_DPrintf( "Game rejected a connection: %s.\n", denied );
+		Com_DPrintf ( "Game rejected a connection: %s.\n", denied );
 		return;
 	}
 
@@ -514,7 +548,7 @@ gotnewcl:
 	SV_UserinfoChanged( newcl );
 
 	// send the connect packet to the client
-	NET_OutOfBandPrint( NS_SERVER, from, "connectResponse" );
+	NET_OutOfBandPrint(NS_SERVER, from, "connectResponse %d", challenge);
 
 	Com_DPrintf( "Going from CS_FREE to CS_CONNECTED for %s\n", newcl->name );
 
@@ -554,23 +588,23 @@ SV_FreeClient
 Destructor for data allocated in a client structure
 =====================
 */
-void SV_FreeClient(client_t* client)
+void SV_FreeClient(client_t *client)
 {
 #ifdef USE_VOIP
-    int index;
-
-    for (index = client->queuedVoipIndex; index < client->queuedVoipPackets; index++)
-    {
-        index %= ARRAY_LEN(client->voipPacket);
-
-        Z_Free(client->voipPacket[index]);
-    }
-
-    client->queuedVoipPackets = 0;
+	int index;
+	
+	for(index = client->queuedVoipIndex; index < client->queuedVoipPackets; index++)
+	{
+		index %= ARRAY_LEN(client->voipPacket);
+		
+		Z_Free(client->voipPacket[index]);
+	}
+	
+	client->queuedVoipPackets = 0;
 #endif
 
-    SV_Netchan_FreeQueue(client);
-    SV_CloseDownload(client);
+	SV_Netchan_FreeQueue(client);
+	SV_CloseDownload(client);
 }
 
 /*
@@ -585,35 +619,32 @@ or crashing -- SV_FinalMessage() will handle that
 void SV_DropClient( client_t *drop, const char *reason ) {
 	int		i;
 	challenge_t	*challenge;
+	const qboolean isBot = drop->netchan.remoteAddress.type == NA_BOT;
 
 	if ( drop->state == CS_ZOMBIE ) {
 		return;		// already dropped
 	}
 
-	if (drop->netchan.remoteAddress.type != NA_BOT) {
+	if ( !isBot ) {
 		// see if we already have a challenge for this ip
 		challenge = &svs.challenges[0];
 
-		for (i = 0 ; i < MAX_CHALLENGES ; i++, challenge++) {
-			if ( NET_CompareAdr( drop->netchan.remoteAddress, challenge->adr ) ) {
-				challenge->connected = qfalse;
+		for (i = 0 ; i < MAX_CHALLENGES ; i++, challenge++)
+		{
+			if(NET_CompareAdr(drop->netchan.remoteAddress, challenge->adr))
+			{
+				Com_Memset(challenge, 0, sizeof(*challenge));
 				break;
 			}
 		}
-    }
+	}
 
-    // Free all allocated data on the client structure
-    SV_FreeClient(drop);
+	// Free all allocated data on the client structure
+	SV_FreeClient(drop);
 
 	// tell everyone why they got dropped
 	SV_SendServerCommand( NULL, "print \"%s %s\n\"", drop->name, reason );
 
-
-	if (drop->download)	{
-		FS_FCloseFile( drop->download );
-		drop->download = 0;
-	}
-
 	// call the prog function for removing a client
 	// this will remove the body, among other things
 	ge->ClientDisconnect( ( gentity_t * )SV_GentityNum( drop - svs.clients ) );
@@ -621,11 +652,18 @@ void SV_DropClient( client_t *drop, const char *reason ) {
 	// add the disconnect command
 	SV_SendServerCommand( drop, "disconnect \"%s\"", reason);
 
+	if ( isBot ) {
+		//SV_BotFreeClient( drop - svs.clients );
+
+		// bots shouldn't go zombie, as there's no real net connection.
+		drop->state = CS_FREE;
+	} else {
+		Com_DPrintf( "Going to CS_ZOMBIE for %s\n", drop->name );
+		drop->state = CS_ZOMBIE;		// become free in a few seconds
+	}
+
 	// nuke user info
 	SV_SetUserinfo( drop - svs.clients, "" );
-	
-	Com_DPrintf( "Going to CS_ZOMBIE for %s\n", drop->name );
-	drop->state = CS_ZOMBIE;		// become free in a few seconds
 
 	// if this was the last client on the server, send a heartbeat
 	// to the master so it is known the server is empty
@@ -652,7 +690,7 @@ It will be resent if the client acknowledges a later message but has
 the wrong gamestate.
 ================
 */
-void SV_SendClientGameState( client_t *client ) {
+static void SV_SendClientGameState( client_t *client ) {
 	int			start;
 	entityState_t	*base, nullstate;
 	msg_t		msg;
@@ -690,7 +728,7 @@ void SV_SendClientGameState( client_t *client ) {
 	SV_UpdateServerCommandsToClient( client, &msg );
 
 	// send the gamestate
-	MSG_WriteSVC( &msg, svc_gamestate );
+    MSG_WriteSVC( &msg, svc_gamestate );
 	MSG_WriteLong( &msg, client->reliableSequence );
 
 	// write the configstrings
@@ -719,7 +757,7 @@ void SV_SendClientGameState( client_t *client ) {
 	MSG_WriteLong( &msg, client - svs.clients);
 
 	// write the checksum feed
-	MSG_WriteLong( &msg, 0);
+	MSG_WriteLong( &msg, sv.checksumFeed);
 
 	// write the server frametime to the client (only on TA/TT)
 	MSG_WriteServerFrameTime(&msg, sv.frameTime);
@@ -754,7 +792,7 @@ void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd ) {
 	client->deltaMessage = -1;
 	client->lastSnapshotTime = 0;	// generate a snapshot immediately
 
-	if (cmd)
+	if(cmd)
 		memcpy(&client->lastUsercmd, cmd, sizeof(client->lastUsercmd));
 	else
 		memset(&client->lastUsercmd, '\0', sizeof(client->lastUsercmd));
@@ -798,7 +836,7 @@ static void SV_CloseDownload( client_t *cl ) {
 	// Free the temporary buffer space
 	for (i = 0; i < MAX_DOWNLOAD_WINDOW; i++) {
 		if (cl->downloadBlocks[i]) {
-			Z_Free( cl->downloadBlocks[i] );
+			Z_Free(cl->downloadBlocks[i]);
 			cl->downloadBlocks[i] = NULL;
 		}
 	}
@@ -812,7 +850,7 @@ SV_StopDownload_f
 Abort a download if in progress
 ==================
 */
-void SV_StopDownload_f( client_t *cl ) {
+static void SV_StopDownload_f( client_t *cl ) {
 	if (*cl->downloadName)
 		Com_DPrintf( "clientDownload: %d : file \"%s\" aborted\n", (int) (cl - svs.clients), cl->downloadName );
 
@@ -826,7 +864,10 @@ SV_DoneDownload_f
 Downloads are finished
 ==================
 */
-void SV_DoneDownload_f( client_t *cl ) {
+static void SV_DoneDownload_f( client_t *cl ) {
+	if ( cl->state == CS_ACTIVE )
+		return;
+
 	Com_DPrintf( "clientDownload: %s Done\n", cl->name);
 	// resend the game state to update any clients that entered during the download
 	SV_SendClientGameState(cl);
@@ -840,7 +881,7 @@ The argument will be the last acknowledged block from the client, it should be
 the same as cl->downloadClientBlock
 ==================
 */
-void SV_NextDownload_f( client_t *cl )
+static void SV_NextDownload_f( client_t *cl )
 {
 	int block = atoi( Cmd_Argv(1) );
 
@@ -869,7 +910,7 @@ void SV_NextDownload_f( client_t *cl )
 SV_BeginDownload_f
 ==================
 */
-void SV_BeginDownload_f( client_t *cl ) {
+static void SV_BeginDownload_f( client_t *cl ) {
 
 	// Kill any existing download
 	SV_CloseDownload( cl );
@@ -884,15 +925,13 @@ void SV_BeginDownload_f( client_t *cl ) {
 SV_WriteDownloadToClient
 
 Check to see if the client wants a file, open it if needed and start pumping the client
-Fill up msg with data 
+Fill up msg with data, return number of download blocks added
 ==================
 */
-int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
+int SV_WriteDownloadToClient(client_t *cl, msg_t *msg)
 {
 	int curindex;
-	int rate;
-	int blockspersnap;
-	int idPack = 0, missionPack = 0, unreferenced = 1;
+	int unreferenced = 1;
 	char errorMessage[1024];
 	char pakbuf[MAX_QPATH], *pakptr;
 	int numRefPaks;
@@ -900,10 +939,16 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 	if (!*cl->downloadName)
 		return 0;	// Nothing being downloaded
 
-	if (!cl->download) {
+	if(!cl->download)
+	{
+		qboolean idPack = qfalse;
+		#ifndef STANDALONE
+		qboolean missionPack = qfalse;
+		#endif
+	
  		// Chop off filename extension.
 		Com_sprintf(pakbuf, sizeof(pakbuf), "%s", cl->downloadName);
-		pakptr = Q_strrchr(pakbuf, '.');
+		pakptr = strrchr(pakbuf, '.');
 		
 		if(pakptr)
 		{
@@ -927,8 +972,11 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 
 						// now that we know the file is referenced,
 						// check whether it's legal to download it.
-						missionPack = FS_idPak(pakbuf, "missionpack");
-						idPack = missionPack || FS_idPak(pakbuf, BASEGAME);
+#ifndef STANDALONE
+						//missionPack = FS_idPak(pakbuf, BASETA, NUM_TA_PAKS);
+						//idPack = missionPack;
+#endif
+						//idPack = idPack || FS_idPak(pakbuf, BASEGAME, NUM_ID_PAKS);
 
 						break;
 					}
@@ -936,11 +984,13 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 			}
 		}
 
+		cl->download = 0;
+
 		// We open the file here
 		if ( !(sv_allowDownload->integer & DLF_ENABLE) ||
 			(sv_allowDownload->integer & DLF_NO_UDP) ||
 			idPack || unreferenced ||
-			( cl->downloadSize = FS_SV_FOpenFileRead( cl->downloadName, &cl->download ) ) <= 0 ) {
+			( cl->downloadSize = FS_SV_FOpenFileRead( cl->downloadName, &cl->download ) ) < 0 ) {
 			// cannot auto-download file
 			if(unreferenced)
 			{
@@ -949,18 +999,22 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 			}
 			else if (idPack) {
 				Com_Printf("clientDownload: %d : \"%s\" cannot download id pk3 files\n", (int) (cl - svs.clients), cl->downloadName);
-				if (missionPack) {
+#ifndef STANDALONE
+				if(missionPack)
+				{
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload Team Arena file \"%s\"\n"
 									"The Team Arena mission pack can be found in your local game store.", cl->downloadName);
 				}
-				else {
+				else
+#endif
+				{
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload id pk3 file \"%s\"", cl->downloadName);
 				}
 			}
 			else if ( !(sv_allowDownload->integer & DLF_ENABLE) ||
 				(sv_allowDownload->integer & DLF_NO_UDP) ) {
 
-				Com_Printf("clientDownload: %d : \"%s\" download disabled", (int) (cl - svs.clients), cl->downloadName);
+				Com_Printf("clientDownload: %d : \"%s\" download disabled\n", (int) (cl - svs.clients), cl->downloadName);
 				if (sv_pure->integer) {
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Could not download \"%s\" because autodownloading is disabled on the server.\n\n"
 										"You will need to get this file elsewhere before you "
@@ -983,6 +1037,10 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 			MSG_WriteString( msg, errorMessage );
 
 			*cl->downloadName = 0;
+			
+			if(cl->download)
+				FS_FCloseFile(cl->download);
+			
 			return 1;
 		}
  
@@ -1001,7 +1059,7 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 		curindex = (cl->downloadCurrentBlock % MAX_DOWNLOAD_WINDOW);
 
 		if (!cl->downloadBlocks[curindex])
-			cl->downloadBlocks[curindex] = Z_Malloc( MAX_DOWNLOAD_BLKSIZE );
+			cl->downloadBlocks[curindex] = Z_Malloc(MAX_DOWNLOAD_BLKSIZE);
 
 		cl->downloadBlockSize[curindex] = FS_Read( cl->downloadBlocks[curindex], MAX_DOWNLOAD_BLKSIZE, cl->download );
 
@@ -1028,75 +1086,42 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 		cl->downloadEOF = qtrue;  // We have added the EOF block
 	}
 
-	// Loop up to window size times based on how many blocks we can fit in the
-	// client snapMsec and rate
+	if (cl->downloadClientBlock == cl->downloadCurrentBlock)
+		return 0; // Nothing to transmit
 
-	// based on the rate, how many bytes can we fit in the snapMsec time of the client
-	// normal rate / snapshotMsec calculation
-	rate = cl->rate;
-	if ( sv_maxRate->integer ) {
-		if ( sv_maxRate->integer < 1000 ) {
-			Cvar_Set( "sv_MaxRate", "1000" );
-		}
-		if ( sv_maxRate->integer < rate ) {
-			rate = sv_maxRate->integer;
-		}
+	// Write out the next section of the file, if we have already reached our window,
+	// automatically start retransmitting
+	if (cl->downloadXmitBlock == cl->downloadCurrentBlock)
+	{
+		// We have transmitted the complete window, should we start resending?
+		if (svs.time - cl->downloadSendTime > 1000)
+			cl->downloadXmitBlock = cl->downloadClientBlock;
+		else
+			return 0;
 	}
 
-	if (!rate) {
-		blockspersnap = 1;
-	} else {
-		blockspersnap = ( (rate * cl->snapshotMsec) / 1000 + MAX_DOWNLOAD_BLKSIZE ) /
-			MAX_DOWNLOAD_BLKSIZE;
-	}
+	// Send current block
+	curindex = (cl->downloadXmitBlock % MAX_DOWNLOAD_WINDOW);
 
-	if (blockspersnap < 0)
-		blockspersnap = 1;
+	MSG_WriteByte( msg, svc_download );
+	MSG_WriteShort( msg, cl->downloadXmitBlock );
 
-	while (blockspersnap--) {
+	// block zero is special, contains file size
+	if ( cl->downloadXmitBlock == 0 )
+		MSG_WriteLong( msg, cl->downloadSize );
 
-		// Write out the next section of the file, if we have already reached our window,
-		// automatically start retransmitting
+	MSG_WriteShort( msg, cl->downloadBlockSize[curindex] );
 
-		if (cl->downloadClientBlock == cl->downloadCurrentBlock)
-			return 0; // Nothing to transmit
+	// Write the block
+	if(cl->downloadBlockSize[curindex])
+		MSG_WriteData(msg, cl->downloadBlocks[curindex], cl->downloadBlockSize[curindex]);
 
-		if (cl->downloadXmitBlock == cl->downloadCurrentBlock) {
-			// We have transmitted the complete window, should we start resending?
+	Com_DPrintf( "clientDownload: %d : writing block %d\n", (int) (cl - svs.clients), cl->downloadXmitBlock );
 
-			//FIXME:  This uses a hardcoded one second timeout for lost blocks
-			//the timeout should be based on client rate somehow
-			if (svs.time - cl->downloadSendTime > 1000)
-				cl->downloadXmitBlock = cl->downloadClientBlock;
-			else
-				return 0;
-		}
-
-		// Send current block
-		curindex = (cl->downloadXmitBlock % MAX_DOWNLOAD_WINDOW);
-
-		MSG_WriteByte( msg, svc_download );
-		MSG_WriteShort( msg, cl->downloadXmitBlock );
-
-		// block zero is special, contains file size
-		if ( cl->downloadXmitBlock == 0 )
-			MSG_WriteLong( msg, (int)cl->downloadSize );
- 
-		MSG_WriteShort( msg, ( short )cl->downloadBlockSize[curindex] );
-
-		// Write the block
-		if ( cl->downloadBlockSize[curindex] ) {
-			MSG_WriteData( msg, cl->downloadBlocks[curindex], cl->downloadBlockSize[curindex] );
-		}
-
-		Com_DPrintf( "clientDownload: %d : writing block %d\n", (int) (cl - svs.clients), cl->downloadXmitBlock );
-
-		// Move on to the next block
-		// It will get sent with next snap shot.  The rate will keep us in line.
-		cl->downloadXmitBlock++;
-
-		cl->downloadSendTime = svs.time;
-	}
+	// Move on to the next block
+	// It will get sent with next snap shot.  The rate will keep us in line.
+	cl->downloadXmitBlock++;
+	cl->downloadSendTime = svs.time;
 
 	return 1;
 }
@@ -1375,7 +1400,7 @@ void SV_UserinfoChanged( client_t *cl ) {
 	char	*val;
 	char	*ip;
 	int		i;
-	size_t len;
+	int	len;
 
 	// name for C code
 	Q_strncpyz( cl->name, Info_ValueForKey (cl->userinfo, "name"), sizeof(cl->name) );
@@ -1472,17 +1497,49 @@ SV_UpdateUserinfo_f
 ==================
 */
 static void SV_UpdateUserinfo_f( client_t *cl ) {
-	Q_strncpyz( cl->userinfo, Cmd_Argv( 1 ), sizeof( cl->userinfo ) );
+	Q_strncpyz( cl->userinfo, Cmd_Argv(1), sizeof(cl->userinfo) );
 
 	SV_UserinfoChanged( cl );
-
 	// call prog code to allow overrides
 	ge->ClientUserinfoChanged( ( gentity_t * )SV_GentityNum( cl - svs.clients ), cl->userinfo );
 }
 
+
+#ifdef USE_VOIP
+static
+void SV_UpdateVoipIgnore(client_t *cl, const char *idstr, qboolean ignore)
+{
+	if ((*idstr >= '0') && (*idstr <= '9')) {
+		const int id = atoi(idstr);
+		if ((id >= 0) && (id < MAX_CLIENTS)) {
+			cl->ignoreVoipFromClient[id] = ignore;
+		}
+	}
+}
+
+/*
+==================
+SV_Voip_f
+==================
+*/
+static void SV_Voip_f( client_t *cl ) {
+	const char *cmd = Cmd_Argv(1);
+	if (strcmp(cmd, "ignore") == 0) {
+		SV_UpdateVoipIgnore(cl, Cmd_Argv(2), qtrue);
+	} else if (strcmp(cmd, "unignore") == 0) {
+		SV_UpdateVoipIgnore(cl, Cmd_Argv(2), qfalse);
+	} else if (strcmp(cmd, "muteall") == 0) {
+		cl->muteAllVoip = qtrue;
+	} else if (strcmp(cmd, "unmuteall") == 0) {
+		cl->muteAllVoip = qfalse;
+	}
+}
+#endif
+
+
 typedef struct {
 	char	*name;
-	void	( *func )( client_t *cl );
+	void	(*func)( client_t *cl );
 } ucmd_t;
 
 static ucmd_t ucmds[] = {
@@ -1495,6 +1552,10 @@ static ucmd_t ucmds[] = {
 	{"stopdl", SV_StopDownload_f},
 	{"donedl", SV_DoneDownload_f},
 
+#ifdef USE_VOIP
+	{"voip", SV_Voip_f},
+#endif
+
 	{NULL, NULL}
 };
 
@@ -1533,7 +1594,8 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 
 	if (clientOK) {
 		// pass unknown strings to the game
-		if (!u->name && sv.state == SS_GAME) {
+		if (!u->name && sv.state == SS_GAME && (cl->state == CS_ACTIVE || cl->state == CS_PRIMED)) {
+			Cmd_Args_Sanitize();
 			ge->ClientCommand( ( gentity_t * )SV_GentityNum( cl - svs.clients ) );
 
 			if (ge->errorMessage)
@@ -1566,6 +1628,7 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) {
 	}
 
 	if( developer->integer == 2 ) {
+        // don't spam the console with client commands in production
 		Com_DPrintf( "clientCommand: %s : %i : %s\n", cl->name, seq, s );
 	}
 
@@ -1582,9 +1645,10 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) {
 	// the command, we will stop processing the rest of the packet,
 	// including the usercmd.  This causes flooders to lag themselves
 	// but not other people
-	// We don't do this when the client hasn't been active yet since its
+	// We don't do this when the client hasn't been active yet since it's
 	// normal to spam a lot of commands when downloading
-	if ( cl->state >= CS_ACTIVE &&
+	if ( !com_cl_running->integer && 
+		cl->state >= CS_ACTIVE &&
 		sv_floodProtect->integer && 
 		svs.time < cl->nextReliableTime ) {
 		// ignore any other text messages from this client but let them keep playing
@@ -1609,8 +1673,7 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) {
 	// Actual execution of the command
 	SV_ExecuteClientCommand( cl, s, clientOk );
 
-	// continue procesing
-	return qtrue;
+	return qtrue;		// continue procesing
 }
 
 
@@ -1624,8 +1687,7 @@ SV_ClientThink
 Also called by bot code
 ==================
 */
-void SV_ClientThink( client_t *cl, usercmd_t *cmd )
-{
+void SV_ClientThink (client_t *cl, usercmd_t *cmd) {
 	const char *err;
 
 	cl->lastUsercmd = *cmd;
@@ -1686,7 +1748,7 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 	// also use the message acknowledge
 	key ^= cl->messageAcknowledge;
 	// also use the last acknowledged server command in the key
-	key ^= Com_HashKey(cl->reliableCommands[ cl->reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ], 32);
+	key ^= MSG_HashKey(cl->reliableCommands[ cl->reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ], 32);
 
 	MSG_ReadDeltaEyeInfo( msg, &cl->lastEyeinfo, &cl->lastEyeinfo );
 
@@ -1713,7 +1775,7 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 			SV_SendClientGameState( cl );
 		}
 		return;
-	}	
+	}			
 	
 	// if this is the first usercmd we have received
 	// this gamestate, put the client into the world
@@ -1721,9 +1783,9 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 		SV_ClientEnterWorld( cl, &cmds[0] );
 		// the moves can be processed normaly
 	}
-
-		// a bad cp command was sent, drop the client
-	if (g_gametype->integer != GT_SINGLE_PLAYER && sv_pure->integer != 0 && !com_sv_running->integer && cl->pureAuthentic == 0) {
+	
+	// a bad cp command was sent, drop the client
+	if (sv_pure->integer != 0 && cl->pureAuthentic == 0) {		
 		SV_DropClient( cl, "Cannot validate pure client!");
 		return;
 	}
@@ -1750,12 +1812,122 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 		if ( cmds[i].serverTime <= cl->lastUsercmd.serverTime ) {
 			continue;
 		}
-
-		SV_ClientThink( cl, &cmds[ i ] );
+		SV_ClientThink (cl, &cmds[ i ]);
 	}
 }
 
 
+#ifdef USE_VOIP
+/*
+==================
+SV_ShouldIgnoreVoipSender
+
+Blocking of voip packets based on source client
+==================
+*/
+
+static qboolean SV_ShouldIgnoreVoipSender(const client_t *cl)
+{
+	if (!sv_voip->integer)
+		return qtrue;  // VoIP disabled on this server.
+	else if (!cl->hasVoip)  // client doesn't have VoIP support?!
+		return qtrue;
+    
+	// !!! FIXME: implement player blacklist.
+
+	return qfalse;  // don't ignore.
+}
+
+static
+void SV_UserVoip(client_t *cl, msg_t *msg, qboolean ignoreData)
+{
+	int sender, generation, sequence, frames, packetsize;
+	uint8_t recips[(MAX_CLIENTS + 7) / 8];
+	int flags;
+	byte encoded[sizeof(cl->voipPacket[0]->data)];
+	client_t *client = NULL;
+	voipServerPacket_t *packet = NULL;
+	int i;
+
+	sender = cl - svs.clients;
+	generation = MSG_ReadByte(msg);
+	sequence = MSG_ReadLong(msg);
+	frames = MSG_ReadByte(msg);
+	MSG_ReadData(msg, recips, sizeof(recips));
+	flags = MSG_ReadByte(msg);
+	packetsize = MSG_ReadShort(msg);
+
+	if (msg->readcount > msg->cursize)
+		return;   // short/invalid packet, bail.
+
+	if (packetsize > sizeof (encoded)) {  // overlarge packet?
+		int bytesleft = packetsize;
+		while (bytesleft) {
+			int br = bytesleft;
+			if (br > sizeof (encoded))
+				br = sizeof (encoded);
+			MSG_ReadData(msg, encoded, br);
+			bytesleft -= br;
+		}
+		return;   // overlarge packet, bail.
+	}
+
+	MSG_ReadData(msg, encoded, packetsize);
+
+	if (ignoreData || SV_ShouldIgnoreVoipSender(cl))
+		return;   // Blacklisted, disabled, etc.
+
+	// !!! FIXME: see if we read past end of msg...
+
+	// !!! FIXME: reject if not opus data.
+	// !!! FIXME: decide if this is bogus data?
+
+	// decide who needs this VoIP packet sent to them...
+	for (i = 0, client = svs.clients; i < sv_maxclients->integer ; i++, client++) {
+		if (client->state != CS_ACTIVE)
+			continue;  // not in the game yet, don't send to this guy.
+		else if (i == sender)
+			continue;  // don't send voice packet back to original author.
+		else if (!client->hasVoip)
+			continue;  // no VoIP support, or unsupported protocol
+		else if (client->muteAllVoip)
+			continue;  // client is ignoring everyone.
+		else if (client->ignoreVoipFromClient[sender])
+			continue;  // client is ignoring this talker.
+		else if (*cl->downloadName)   // !!! FIXME: possible to DoS?
+			continue;  // no VoIP allowed if downloading, to save bandwidth.
+
+		if(Com_IsVoipTarget(recips, sizeof(recips), i))
+			flags |= VOIP_DIRECT;
+		else
+			flags &= ~VOIP_DIRECT;
+
+		if (!(flags & (VOIP_SPATIAL | VOIP_DIRECT)))
+			continue;  // not addressed to this player.
+
+		// Transmit this packet to the client.
+		if (client->queuedVoipPackets >= ARRAY_LEN(client->voipPacket)) {
+			Com_Printf("Too many VoIP packets queued for client #%d\n", i);
+			continue;  // no room for another packet right now.
+		}
+
+		packet = Z_Malloc(sizeof(*packet));
+		packet->sender = sender;
+		packet->frames = frames;
+		packet->len = packetsize;
+		packet->generation = generation;
+		packet->sequence = sequence;
+		packet->flags = flags;
+		memcpy(packet->data, encoded, packetsize);
+
+		client->voipPacket[(client->queuedVoipIndex + client->queuedVoipPackets) % ARRAY_LEN(client->voipPacket)] = packet;
+		client->queuedVoipPackets++;
+	}
+}
+#endif
+
+
+
 /*
 ===========================================================================
 
@@ -1777,7 +1949,7 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 
 	MSG_Bitstream(msg);
 
-	serverId = MSG_ReadLong(msg);
+	serverId = MSG_ReadLong( msg );
 	cl->serverIdAcknowledge = serverId;
 	cl->messageAcknowledge = MSG_ReadLong( msg );
 
@@ -1795,7 +1967,7 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 	// NOTE: when the client message is fux0red the acknowledgement numbers
 	// can be out of range, this could cause the server to send thousands of server
 	// commands which the server thinks are not yet acknowledged in SV_UpdateServerCommandsToClient
-	if (cl->reliableAcknowledge < cl->reliableSequence - MAX_RELIABLE_COMMANDS) {
+	if ((cl->reliableSequence - cl->reliableAcknowledge >= MAX_RELIABLE_COMMANDS) || (cl->reliableSequence - cl->reliableAcknowledge < 0)) {
 		// usually only hackers create messages like this
 		// it is more annoying for them to let them hanging
 #ifndef NDEBUG
@@ -1816,24 +1988,36 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 	// don't drop as long as previous command was a nextdl, after a dl is done, downloadName is set back to ""
 	// but we still need to read the next message to move to next download or send gamestate
 	// I don't like this hack though, it must have been working fine at some point, suspecting the fix is somewhere else
-	if ( serverId != sv.serverId && !*cl->downloadName ) {
+	if ( serverId != sv.serverId && !*cl->downloadName && !strstr(cl->lastClientCommandString, "nextdl") ) {
+		if ( serverId >= sv.restartedServerId && serverId < sv.serverId ) { // TTimo - use a comparison here to catch multiple map_restart
+			// they just haven't caught the map_restart yet
+			//Com_DPrintf("%s : ignoring pre map_restart / outdated client message\n", cl->name);
+			return;
+		}
 		// if we can tell that the client has dropped the last
 		// gamestate we sent them, resend it
-		// also, don't resend the gamestate if the server just restarted
-		if ( serverId != sv.restartedServerId && cl->messageAcknowledge > cl->gamestateMessageNum ) {
+		if ( cl->state != CS_ACTIVE && cl->messageAcknowledge > cl->gamestateMessageNum ) {
 			Com_DPrintf( "%s : dropped gamestate, resending\n", cl->name );
 			SV_SendClientGameState( cl );
 		}
 		return;
 	}
 
+	// this client has acknowledged the new gamestate so it's
+	// safe to start sending it the real time again
+	if( cl->oldServerTime && serverId == sv.serverId ){
+		Com_DPrintf( "%s acknowledged gamestate\n", cl->name );
+		cl->oldServerTime = 0;
+	}
+
 	// read optional clientCommand strings
 	do {
 		c = MSG_ReadByte( msg );
-		//Com_DPrintf( "SV_ExecuteClientMessage: %i\n", c );
+
 		if ( c == clc_EOF ) {
 			break;
 		}
+
 		if ( c != clc_clientCommand ) {
 			break;
 		}
@@ -1845,6 +2029,22 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 		}
 	} while ( 1 );
 
+	// skip legacy speex voip data
+	if ( c == clc_voipSpeex ) {
+#ifdef USE_VOIP
+		SV_UserVoip( cl, msg, qtrue );
+		c = MSG_ReadByte( msg );
+#endif
+	}
+
+	// read optional voip data
+	if ( c == clc_voipOpus ) {
+#ifdef USE_VOIP
+		SV_UserVoip( cl, msg, qfalse );
+		c = MSG_ReadByte( msg );
+#endif
+	}
+
 	// read the usercmd_t
 	if ( c == clc_move ) {
 		SV_UserMove( cl, msg, qtrue );
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 145e3548..62c58f58 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -73,12 +73,11 @@ SV_SetConfigstring
 ===============
 */
 void SV_SetConfigstring (int index, const char *val) {
-	int i;
-	size_t len;
+	int		i;
 	client_t	*client;
 
 	if ( index < 0 || index >= MAX_CONFIGSTRINGS ) {
-		Com_Error( ERR_DROP, "SV_SetConfigstring: bad index %i\n", index );
+		Com_Error (ERR_DROP, "SV_SetConfigstring: bad index %i\n", index);
 	}
 
 	if ( !val ) {
@@ -98,7 +97,7 @@ void SV_SetConfigstring (int index, const char *val) {
 	// spawning a new server
 	if (sv.state == SS_LOADING2 || sv.state == SS_GAME || sv.restarting ) {
 
-		// send the data to all relevent clients
+		// send the data to all relevant clients
 		for (i = 0, client = svs.clients; i < svs.iNumClients ; i++, client++) {
 			if ( client->state < CS_ACTIVE ) {
 				if ( client->state == CS_PRIMED )
@@ -111,7 +110,6 @@ void SV_SetConfigstring (int index, const char *val) {
 			}
 		
 
-			len = strlen( val );
 			SV_SendConfigstring(client, index);
 		}
 	}
@@ -316,7 +314,7 @@ void SV_UpdateConfigstrings(client_t *client)
 {
 	int index;
 
-	for( index = 0; index <= MAX_CONFIGSTRINGS; index++ ) {
+	for( index = 0; index < MAX_CONFIGSTRINGS; index++ ) {
 		// if the CS hasn't changed since we went to CS_PRIMED, ignore
 		if(!client->csUpdated[index])
 			continue;
@@ -452,6 +450,9 @@ void SV_Startup( void ) {
 
 	SV_InitGamespy();
 	Cvar_Set( "sv_running", "1" );
+	
+	// Join the ipv6 multicast group now that a map is running so clients can scan for us on the local network.
+	NET_JoinMulticast6();
 }
 
 /*
@@ -478,10 +479,10 @@ SV_ChangeMaxClients
 ==================
 */
 void SV_ChangeMaxClients( void ) {
-	int			oldMaxClients;
-	int			i;
+	int		oldMaxClients;
+	int		i;
 	client_t	*oldClients;
-	int			count;
+	int		count;
 
 	// get the highest client number in use
 	count = 0;
@@ -538,6 +539,20 @@ void SV_ClearServer(void) {
 	sv.frameTime = 1.0 / sv_fps->value;
 }
 
+/*
+================
+SV_TouchFile
+================
+*/
+static void SV_TouchFile( const char *filename ) {
+	fileHandle_t	f;
+
+	FS_FOpenFileRead( filename, &f, qfalse, qtrue );
+	if ( f ) {
+		FS_FCloseFile( f );
+	}
+}
+
 /*
 ================
 SV_SpawnServer
@@ -980,15 +995,16 @@ SV_Init
 Only called at main exe startup, not for each game
 ===============
 */
-void SV_Init( void ) {
+void SV_Init (void)
+{
 	int index;
 
 	SV_AddOperatorCommands();
 
 	// serverinfo vars
-	Cvar_Get( "dmflags", "0", CVAR_SERVERINFO );
-	Cvar_Get( "fraglimit", "20", CVAR_SERVERINFO );
-	Cvar_Get( "timelimit", "0", CVAR_SERVERINFO );
+	Cvar_Get ("dmflags", "0", CVAR_SERVERINFO);
+	Cvar_Get ("fraglimit", "20", CVAR_SERVERINFO);
+	Cvar_Get ("timelimit", "0", CVAR_SERVERINFO);
 	g_gametype = Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH );
 	g_gametypestring = Cvar_Get( "g_gametypestring", "0", CVAR_SERVERINFO | CVAR_LATCH );
 	Cvar_Get( "sv_keywords", "", CVAR_SERVERINFO );
@@ -1013,12 +1029,11 @@ void SV_Init( void ) {
     // sv_pure is disabled by default in mohaa
 	// the problem is because of difference in pak files between languages
 	sv_pure = Cvar_Get ("sv_pure", "0", CVAR_SYSTEMINFO );
-	#ifdef USE_VOIP
+#ifdef USE_VOIP
 	sv_voip = Cvar_Get("sv_voip", "1", CVAR_LATCH);
 	Cvar_CheckRange(sv_voip, 0, 1, qtrue);
 	sv_voipProtocol = Cvar_Get("sv_voipProtocol", sv_voip->integer ? "opus" : "", CVAR_SYSTEMINFO | CVAR_ROM );
 #endif
-
 	Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM );
 	Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );
 	Cvar_Get ("sv_referencedPaks", "", CVAR_SYSTEMINFO | CVAR_ROM );
@@ -1129,8 +1144,14 @@ void SV_Shutdown( const char *finalmsg ) {
 	SV_ClearServer();
 
 	// free server static data
-	if ( svs.clients ) {
-		Z_Free( svs.clients );
+	if(svs.clients)
+	{
+		int index;
+		
+		for(index = 0; index < sv_maxclients->integer; index++)
+			SV_FreeClient(&svs.clients[index]);
+		
+		Z_Free(svs.clients);
 	}
 	Com_Memset( &svs, 0, sizeof( svs ) );
 
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index a97f9f9b..19944dd9 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -223,7 +223,7 @@ void QDECL SV_SendServerCommand(client_t *cl, const char *fmt, ...) {
 		Com_Printf ("broadcast: %s\n", SV_ExpandNewlines((char *)message) );
 	}
 
-	// send the data to all relevent clients
+	// send the data to all relevant clients
 	for (j = 0, client = svs.clients; j < sv_maxclients->integer ; j++, client++) {
 		SV_AddServerCommand( client, (char *)message );
 	}
@@ -290,6 +290,167 @@ CONNECTIONLESS COMMANDS
 ==============================================================================
 */
 
+// This is deliberately quite large to make it more of an effort to DoS
+#define MAX_BUCKETS			16384
+#define MAX_HASHES			1024
+
+static leakyBucket_t buckets[ MAX_BUCKETS ];
+static leakyBucket_t *bucketHashes[ MAX_HASHES ];
+leakyBucket_t outboundLeakyBucket;
+
+/*
+================
+SVC_HashForAddress
+================
+*/
+static long SVC_HashForAddress( netadr_t address ) {
+	byte 		*ip = NULL;
+	size_t	size = 0;
+	int			i;
+	long		hash = 0;
+
+	switch ( address.type ) {
+		case NA_IP:  ip = address.ip;  size = 4; break;
+		case NA_IP6: ip = address.ip6; size = 16; break;
+		default: break;
+	}
+
+	for ( i = 0; i < size; i++ ) {
+		hash += (long)( ip[ i ] ) * ( i + 119 );
+	}
+
+	hash = ( hash ^ ( hash >> 10 ) ^ ( hash >> 20 ) );
+	hash &= ( MAX_HASHES - 1 );
+
+	return hash;
+}
+
+/*
+================
+SVC_BucketForAddress
+
+Find or allocate a bucket for an address
+================
+*/
+static leakyBucket_t *SVC_BucketForAddress( netadr_t address, int burst, int period ) {
+	leakyBucket_t	*bucket = NULL;
+	int						i;
+	long					hash = SVC_HashForAddress( address );
+	int						now = Sys_Milliseconds();
+
+	for ( bucket = bucketHashes[ hash ]; bucket; bucket = bucket->next ) {
+		switch ( bucket->type ) {
+			case NA_IP:
+				if ( memcmp( bucket->ipv._4, address.ip, 4 ) == 0 ) {
+					return bucket;
+				}
+				break;
+
+			case NA_IP6:
+				if ( memcmp( bucket->ipv._6, address.ip6, 16 ) == 0 ) {
+					return bucket;
+				}
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	for ( i = 0; i < MAX_BUCKETS; i++ ) {
+		int interval;
+
+		bucket = &buckets[ i ];
+		interval = now - bucket->lastTime;
+
+		// Reclaim expired buckets
+		if ( bucket->lastTime > 0 && ( interval > ( burst * period ) ||
+					interval < 0 ) ) {
+			if ( bucket->prev != NULL ) {
+				bucket->prev->next = bucket->next;
+			} else {
+				bucketHashes[ bucket->hash ] = bucket->next;
+			}
+			
+			if ( bucket->next != NULL ) {
+				bucket->next->prev = bucket->prev;
+			}
+
+			Com_Memset( bucket, 0, sizeof( leakyBucket_t ) );
+		}
+
+		if ( bucket->type == NA_BAD ) {
+			bucket->type = address.type;
+			switch ( address.type ) {
+				case NA_IP:  Com_Memcpy( bucket->ipv._4, address.ip, 4 );   break;
+				case NA_IP6: Com_Memcpy( bucket->ipv._6, address.ip6, 16 ); break;
+				default: break;
+			}
+
+			bucket->lastTime = now;
+			bucket->burst = 0;
+			bucket->hash = hash;
+
+			// Add to the head of the relevant hash chain
+			bucket->next = bucketHashes[ hash ];
+			if ( bucketHashes[ hash ] != NULL ) {
+				bucketHashes[ hash ]->prev = bucket;
+			}
+
+			bucket->prev = NULL;
+			bucketHashes[ hash ] = bucket;
+
+			return bucket;
+		}
+	}
+
+	// Couldn't allocate a bucket for this address
+	return NULL;
+}
+
+/*
+================
+SVC_RateLimit
+================
+*/
+qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period ) {
+	if ( bucket != NULL ) {
+		int now = Sys_Milliseconds();
+		int interval = now - bucket->lastTime;
+		int expired = interval / period;
+		int expiredRemainder = interval % period;
+
+		if ( expired > bucket->burst || interval < 0 ) {
+			bucket->burst = 0;
+			bucket->lastTime = now;
+		} else {
+			bucket->burst -= expired;
+			bucket->lastTime = now - expiredRemainder;
+		}
+
+		if ( bucket->burst < burst ) {
+			bucket->burst++;
+
+			return qfalse;
+		}
+	}
+
+	return qtrue;
+}
+
+/*
+================
+SVC_RateLimitAddress
+
+Rate limit for a particular address
+================
+*/
+qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period ) {
+	leakyBucket_t *bucket = SVC_BucketForAddress( from, burst, period );
+
+	return SVC_RateLimit( bucket, burst, period );
+}
+
 /*
 ================
 SVC_Status
@@ -314,6 +475,24 @@ void SVC_Status( netadr_t from ) {
 		return;
 	}
 
+	// Prevent using getstatus as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SVC_Status: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
+		return;
+	}
+
+	// Allow getstatus to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SVC_Status: rate limit exceeded, dropping request\n" );
+		return;
+	}
+
+	// A maximum challenge length of 128 should be more than plenty.
+	if(strlen(Cmd_Argv(1)) > 128)
+		return;
+
 	strcpy( infostring, Cvar_InfoString( CVAR_SERVERINFO ) );
 
 	// echo back the parameter to status. so master servers can use it as a challenge
@@ -361,6 +540,20 @@ void SVC_Info( netadr_t from ) {
 		return;
 	}
 
+	// Prevent using getinfo as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SVC_Info: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
+		return;
+	}
+
+	// Allow getinfo to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SVC_Info: rate limit exceeded, dropping request\n" );
+		return;
+	}
+
 	/*
 	 * Check whether Cmd_Argv(1) has a sane length. This was not done in the original Quake3 version which led
 	 * to the Infostring bug discovered by Luigi Auriemma. See http://aluigi.altervista.org/ for the advisory.
@@ -394,6 +587,12 @@ void SVC_Info( netadr_t from ) {
 	Info_SetValueForKey( infostring, "gametypestring", g_gametypestring->string );
 	Info_SetValueForKey( infostring, "pure", va("%i", sv_pure->integer ) );
 
+#ifdef USE_VOIP
+	if (sv_voipProtocol->string && *sv_voipProtocol->string) {
+		Info_SetValueForKey( infostring, "voip", sv_voipProtocol->string );
+	}
+#endif
+
 	if( sv_minPing->integer ) {
 		Info_SetValueForKey( infostring, "minPing", va("%i", sv_minPing->integer) );
 	}
@@ -417,7 +616,7 @@ SVC_FlushRedirect
 
 ================
 */
-void SV_FlushRedirect( char *outputbuf ) {
+static void SV_FlushRedirect( char *outputbuf ) {
 	NET_OutOfBandPrint( NS_SERVER, svs.redirectAddress, "print\n%s", outputbuf );
 }
 
@@ -430,26 +629,32 @@ Shift down the remaining args
 Redirect all printfs
 ===============
 */
-void SVC_RemoteCommand( netadr_t from, msg_t *msg ) {
+static void SVC_RemoteCommand( netadr_t from, msg_t *msg ) {
 	qboolean	valid;
-	unsigned int time;
 	char		remaining[1024];
 	// TTimo - scaled down to accumulate, but not overflow anything network wise, print wise etc.
 	// (OOB messages are the bottleneck here)
 #define SV_OUTPUTBUF_LENGTH (1024 - 16)
 	char		sv_outputbuf[SV_OUTPUTBUF_LENGTH];
-	static unsigned int lasttime = 0;
 	char *cmd_aux;
 
-	// TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=534
-	time = Com_Milliseconds();
-	if ( (unsigned)( time - lasttime ) < 500u ) {
+	// Prevent using rcon as an amplifier and make dictionary attacks impractical
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SVC_RemoteCommand: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
 		return;
 	}
-	lasttime = time;
 
 	if ( !strlen( sv_rconPassword->string ) ||
 		strcmp (Cmd_Argv(1), sv_rconPassword->string) ) {
+		static leakyBucket_t bucket;
+
+		// Make DoS via rcon impractical
+		if ( SVC_RateLimit( &bucket, 10, 1000 ) ) {
+			Com_DPrintf( "SVC_RemoteCommand: rate limit exceeded, dropping request\n" );
+			return;
+		}
+
 		valid = qfalse;
 		Com_Printf ("Bad rcon from %s:\n%s\n", NET_AdrToString (from), Cmd_Argv(2) );
 	} else {
@@ -520,11 +725,11 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	Com_DPrintf ("SV packet %s : %s\n", NET_AdrToString(from), c);
 
 	if (!Q_stricmp(c, "getstatus")) {
-		SVC_Status( from  );
-	} else if (!Q_stricmp(c, "getinfo")) {
+		SVC_Status( from );
+  } else if (!Q_stricmp(c, "getinfo")) {
 		SVC_Info( from );
 	} else if (!Q_stricmp(c, "getchallenge")) {
-		SV_GetChallenge( from );
+		SV_GetChallenge(from);
 	} else if (!Q_stricmp(c, "connect")) {
 		SV_DirectConnect( from );
 	} else if (!Q_stricmp(c, "authorizeThis")) {
@@ -536,8 +741,8 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 		// server disconnect messages when their new server sees our final
 		// sequenced messages to the old client
 	} else {
-		Com_DPrintf ("bad connectionless packet from %s:\n%s\n"
-		, NET_AdrToString (from), s);
+		Com_DPrintf ("bad connectionless packet from %s:\n%s\n",
+			NET_AdrToString (from), s);
 	}
 }
 
@@ -562,7 +767,7 @@ void SV_PacketEvent( netadr_t from, msg_t *msg ) {
 	// read the qport out of the message so we can fix up
 	// stupid address translating routers
 	MSG_BeginReadingOOB( msg );
-	i=MSG_ReadLong( msg );				// sequence number
+	MSG_ReadLong( msg );				// sequence number
 	qport = MSG_ReadShort( msg ) & 0xffff;
 
 	// find which client the message is from
@@ -593,7 +798,7 @@ void SV_PacketEvent( netadr_t from, msg_t *msg ) {
 			// to make sure they don't need to retransmit the final
 			// reliable message, but they don't do any other processing
 			if (cl->state != CS_ZOMBIE) {
-				cl->lastPacketTime = svs.lastTime;	// don't timeout
+				cl->lastPacketTime = svs.time;	// don't timeout
 				SV_ExecuteClientMessage( cl, msg );
 			}
 		}
@@ -613,7 +818,7 @@ SV_CalcPings
 Updates the cl->ping variables
 ===================
 */
-void SV_CalcPings( void ) {
+static void SV_CalcPings( void ) {
 	int			i, j;
 	client_t	*cl;
 	int			total, count;
@@ -673,7 +878,7 @@ for a few seconds to make sure any final reliable message gets resent
 if necessary
 ==================
 */
-void SV_CheckTimeouts( void ) {
+static void SV_CheckTimeouts( void ) {
 	int		i;
 	client_t	*cl;
 	int			droppoint;
@@ -799,6 +1004,11 @@ void SV_Frame( int msec ) {
 	if( !com_sv_running->integer )
 	{
 		// Running as a server, but no map loaded
+#ifdef DEDICATED
+		// Block until something interesting happens
+		Sys_Sleep(-1);
+#endif
+
 		return;
 	}
 
@@ -1010,42 +1220,42 @@ a client based on its rate settings
 #define UDPIP_HEADER_SIZE 28
 #define UDPIP6_HEADER_SIZE 48
 
-int SV_RateMsec(client_t* client)
+int SV_RateMsec(client_t *client)
 {
-    int rate, rateMsec;
-    int messageSize;
+	int rate, rateMsec;
+	int messageSize;
+	
+	messageSize = client->netchan.lastSentSize;
+	rate = client->rate;
 
-    messageSize = client->netchan.lastSentSize;
-    rate = client->rate;
+	if(sv_maxRate->integer)
+	{
+		if(sv_maxRate->integer < 1000)
+			Cvar_Set( "sv_MaxRate", "1000" );
+		if(sv_maxRate->integer < rate)
+			rate = sv_maxRate->integer;
+	}
 
-    if (sv_maxRate->integer)
-    {
-        if (sv_maxRate->integer < 1000)
-            Cvar_Set("sv_MaxRate", "1000");
-        if (sv_maxRate->integer < rate)
-            rate = sv_maxRate->integer;
-    }
+	if(sv_minRate->integer)
+	{
+		if(sv_minRate->integer < 1000)
+			Cvar_Set("sv_minRate", "1000");
+		if(sv_minRate->integer > rate)
+			rate = sv_minRate->integer;
+	}
 
-    if (sv_minRate->integer)
-    {
-        if (sv_minRate->integer < 1000)
-            Cvar_Set("sv_minRate", "1000");
-        if (sv_minRate->integer > rate)
-            rate = sv_minRate->integer;
-    }
-
-    if (client->netchan.remoteAddress.type == NA_IP6)
-        messageSize += UDPIP6_HEADER_SIZE;
-    else
-        messageSize += UDPIP_HEADER_SIZE;
-
-    rateMsec = messageSize * 1000 / ((int)(rate * com_timescale->value));
-    rate = Sys_Milliseconds() - client->netchan.lastSentTime;
-
-    if (rate > rateMsec)
-        return 0;
-    else
-        return rateMsec - rate;
+	if(client->netchan.remoteAddress.type == NA_IP6)
+		messageSize += UDPIP6_HEADER_SIZE;
+	else
+		messageSize += UDPIP_HEADER_SIZE;
+		
+	rateMsec = messageSize * 1000 / ((int) (rate * com_timescale->value));
+	rate = Sys_Milliseconds() - client->netchan.lastSentTime;
+	
+	if(rate > rateMsec)
+		return 0;
+	else
+		return rateMsec - rate;
 }
 
 /*
@@ -1060,70 +1270,70 @@ Return the time in msec until we expect to be called next
 
 int SV_SendQueuedPackets()
 {
-    int numBlocks;
-    int dlStart, deltaT, delayT;
-    static int dlNextRound = 0;
-    int timeVal = INT_MAX;
+	int numBlocks;
+	int dlStart, deltaT, delayT;
+	static int dlNextRound = 0;
+	int timeVal = INT_MAX;
 
-    // Send out fragmented packets now that we're idle
-    delayT = SV_SendQueuedMessages();
-    if (delayT >= 0)
-        timeVal = delayT;
+	// Send out fragmented packets now that we're idle
+	delayT = SV_SendQueuedMessages();
+	if(delayT >= 0)
+		timeVal = delayT;
 
-    if (sv_dlRate->integer)
-    {
-        // Rate limiting. This is very imprecise for high
-        // download rates due to millisecond timedelta resolution
-        dlStart = Sys_Milliseconds();
-        deltaT = dlNextRound - dlStart;
+	if(sv_dlRate->integer)
+	{
+		// Rate limiting. This is very imprecise for high
+		// download rates due to millisecond timedelta resolution
+		dlStart = Sys_Milliseconds();
+		deltaT = dlNextRound - dlStart;
 
-        if (deltaT > 0)
-        {
-            if (deltaT < timeVal)
-                timeVal = deltaT + 1;
-        }
-        else
-        {
-            numBlocks = SV_SendDownloadMessages();
+		if(deltaT > 0)
+		{
+			if(deltaT < timeVal)
+				timeVal = deltaT + 1;
+		}
+		else
+		{
+			numBlocks = SV_SendDownloadMessages();
 
-            if (numBlocks)
-            {
-                // There are active downloads
-                deltaT = Sys_Milliseconds() - dlStart;
+			if(numBlocks)
+			{
+				// There are active downloads
+				deltaT = Sys_Milliseconds() - dlStart;
 
-                delayT = 1000 * numBlocks * MAX_DOWNLOAD_BLKSIZE;
-                delayT /= sv_dlRate->integer * 1024;
+				delayT = 1000 * numBlocks * MAX_DOWNLOAD_BLKSIZE;
+				delayT /= sv_dlRate->integer * 1024;
 
-                if (delayT <= deltaT + 1)
-                {
-                    // Sending the last round of download messages
-                    // took too long for given rate, don't wait for
-                    // next round, but always enforce a 1ms delay
-                    // between DL message rounds so we don't hog
-                    // all of the bandwidth. This will result in an
-                    // effective maximum rate of 1MB/s per user, but the
-                    // low download window size limits this anyways.
-                    if (timeVal > 2)
-                        timeVal = 2;
+				if(delayT <= deltaT + 1)
+				{
+					// Sending the last round of download messages
+					// took too long for given rate, don't wait for
+					// next round, but always enforce a 1ms delay
+					// between DL message rounds so we don't hog
+					// all of the bandwidth. This will result in an
+					// effective maximum rate of 1MB/s per user, but the
+					// low download window size limits this anyways.
+					if(timeVal > 2)
+						timeVal = 2;
 
-                    dlNextRound = dlStart + deltaT + 1;
-                }
-                else
-                {
-                    dlNextRound = dlStart + delayT;
-                    delayT -= deltaT;
+					dlNextRound = dlStart + deltaT + 1;
+				}
+				else
+				{
+					dlNextRound = dlStart + delayT;
+					delayT -= deltaT;
 
-                    if (delayT < timeVal)
-                        timeVal = delayT;
-                }
-            }
-        }
-    }
-    else
-    {
-        if (SV_SendDownloadMessages())
-            timeVal = 0;
-    }
+					if(delayT < timeVal)
+						timeVal = delayT;
+				}
+			}
+		}
+	}
+	else
+	{
+		if(SV_SendDownloadMessages())
+			timeVal = 0;
+	}
 
-    return timeVal;
+	return timeVal;
 }
diff --git a/code/server/sv_net_chan.c b/code/server/sv_net_chan.c
index 1aa5a266..66832630 100644
--- a/code/server/sv_net_chan.c
+++ b/code/server/sv_net_chan.c
@@ -259,17 +259,17 @@ void SV_Netchan_Transmit( client_t *client, msg_t *msg)
 Netchan_SV_Process
 =================
 */
-qboolean SV_Netchan_Process(client_t* client, msg_t* msg) {
-    int ret;
-    ret = Netchan_Process(&client->netchan, msg);
-    if (!ret)
-        return qfalse;
+qboolean SV_Netchan_Process( client_t *client, msg_t *msg ) {
+	int ret;
+	ret = Netchan_Process( &client->netchan, msg );
+	if (!ret)
+		return qfalse;
 
 #ifdef LEGACY_PROTOCOL
-    if (client->compat)
-        SV_Netchan_Decode(client, msg);
+	if(client->compat)
+		SV_Netchan_Decode(client, msg);
 #endif
 
-    return qtrue;
+	return qtrue;
 }
 
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index 7ac89133..2009947f 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -91,7 +91,7 @@ static void SV_EmitPacketEntities( clientSnapshot_t *from, clientSnapshot_t *to,
 		if ( newnum == oldnum ) {
 			// delta update from old position
 			// because the force parm is qfalse, this will not result
-			// in any bytes being emited if the entity has not changed at all
+			// in any bytes being emitted if the entity has not changed at all
 			MSG_WriteDeltaEntity (msg, oldent, newent, qfalse, sv.frameTime);
 			oldindex++;
 			newindex++;
@@ -1049,6 +1049,53 @@ static void SV_BuildClientSnapshot( client_t *client ) {
     frame->ps.radarInfo = client->radarInfo;
 }
 
+#ifdef USE_VOIP
+/*
+==================
+SV_WriteVoipToClient
+
+Check to see if there is any VoIP queued for a client, and send if there is.
+==================
+*/
+static void SV_WriteVoipToClient(client_t *cl, msg_t *msg)
+{
+	int totalbytes = 0;
+	int i;
+	voipServerPacket_t *packet;
+
+	if(cl->queuedVoipPackets)
+	{
+		// Write as many VoIP packets as we reasonably can...
+		for(i = 0; i < cl->queuedVoipPackets; i++)
+		{
+			packet = cl->voipPacket[(i + cl->queuedVoipIndex) % ARRAY_LEN(cl->voipPacket)];
+
+			if(!*cl->downloadName)
+			{
+        			totalbytes += packet->len;
+	        		if (totalbytes > (msg->maxsize - msg->cursize) / 2)
+		        		break;
+
+        			MSG_WriteByte(msg, svc_voipOpus);
+        			MSG_WriteShort(msg, packet->sender);
+	        		MSG_WriteByte(msg, (byte) packet->generation);
+		        	MSG_WriteLong(msg, packet->sequence);
+		        	MSG_WriteByte(msg, packet->frames);
+        			MSG_WriteShort(msg, packet->len);
+        			MSG_WriteBits(msg, packet->flags, VOIP_FLAGCNT);
+	        		MSG_WriteData(msg, packet->data, packet->len);
+                        }
+
+			Z_Free(packet);
+		}
+
+		cl->queuedVoipPackets -= i;
+		cl->queuedVoipIndex += i;
+		cl->queuedVoipIndex %= ARRAY_LEN(cl->voipPacket);
+	}
+}
+#endif
+
 /*
 =======================
 SV_SendMessageToClient
@@ -1056,7 +1103,8 @@ SV_SendMessageToClient
 Called by SV_SendClientSnapshot and SV_SendClientGameState
 =======================
 */
-void SV_SendMessageToClient( msg_t *msg, client_t *client ) {
+void SV_SendMessageToClient(msg_t *msg, client_t *client)
+{
 	// record information about the message
 	client->frames[client->netchan.outgoingSequence & PACKET_MASK].messageSize = msg->cursize;
 	client->frames[client->netchan.outgoingSequence & PACKET_MASK].messageSent = svs.time;
@@ -1088,7 +1136,6 @@ void SV_SendClientSnapshot( client_t *client ) {
 		return;
 	}
 
-	memset(msg_buf, 0, sizeof(msg_buf));
 	MSG_Init (&msg, msg_buf, sizeof(msg_buf));
 	msg.allowoverflow = qtrue;
 
@@ -1115,6 +1162,10 @@ void SV_SendClientSnapshot( client_t *client ) {
 	// Add any download data if the client is downloading
 	SV_WriteDownloadToClient( client, &msg );
 
+#ifdef USE_VOIP
+	SV_WriteVoipToClient( client, &msg );
+#endif
+
 	// check for overflow
 	if ( msg.overflowed ) {
 		Com_Printf ("WARNING: msg overflowed for %s\n", client->name);
@@ -1130,16 +1181,19 @@ void SV_SendClientSnapshot( client_t *client ) {
 SV_SendClientMessages
 =======================
 */
-void SV_SendClientMessages( void ) {
-	int			i;
+void SV_SendClientMessages(void)
+{
+	int		i;
 	int			rate;
 	client_t	*c;
 
 	// send a message to each connected client
-	for (i=0, c = svs.clients ; i < sv_maxclients->integer ; i++, c++) {
-		if (!c->state) {
+	for(i=0; i < sv_maxclients->integer; i++)
+	{
+		c = &svs.clients[i];
+		
+		if(!c->state)
 			continue;		// not connected
-		}
 
 		if(svs.time - c->lastSnapshotTime < c->snapshotMsec * com_timescale->value)
 			continue;		// It's not time yet
@@ -1171,8 +1225,8 @@ void SV_SendClientMessages( void ) {
 		}
 
 		// generate and send a new message
-        SV_SendClientSnapshot(c);
-        c->lastSnapshotTime = svs.time;
+		SV_SendClientSnapshot(c);
+		c->lastSnapshotTime = svs.time;
 		c->rateDelayed = qfalse;
     }
 
diff --git a/code/server/sv_world.c b/code/server/sv_world.c
index 7f19d1c1..879d9d3d 100644
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -100,7 +100,7 @@ SV_CreateworldSector
 Builds a uniformly subdivided tree for the given world size
 ===============
 */
-worldSector_t *SV_CreateworldSector( int depth, vec3_t mins, vec3_t maxs ) {
+static worldSector_t *SV_CreateworldSector( int depth, vec3_t mins, vec3_t maxs ) {
 	worldSector_t	*anode;
 	vec3_t		size;
 	vec3_t		mins1, maxs1, mins2, maxs2;
@@ -388,8 +388,8 @@ SV_AreaEntities_r
 
 ====================
 */
-void SV_AreaEntities_r( worldSector_t *node, areaParms_t *ap ) {
-	svEntity_t		*check, *next;
+static void SV_AreaEntities_r( worldSector_t *node, areaParms_t *ap ) {
+	svEntity_t	*check, *next;
 	gentity_t		*gcheck;
 	worldSector_t	*nodestack[ 8 ];
 	int				iStackPos;
@@ -499,7 +499,7 @@ void SV_ClipToEntity( trace_t *trace, const vec3_t start, const vec3_t mins, con
 
 	touch = SV_GentityNum( entityNum );
 
-	Com_Memset( trace, 0, sizeof( trace_t ) );
+	Com_Memset(trace, 0, sizeof(trace_t));
 
 	// if it doesn't have any brushes of a type we
 	// are looking for, ignore it
@@ -527,7 +527,7 @@ SV_ClipMoveToEntities
 
 ====================
 */
-void SV_ClipMoveToEntities( moveclip_t *clip ) {
+static void SV_ClipMoveToEntities( moveclip_t *clip ) {
 	int			i, num;
 	int			touchlist[MAX_GENTITIES];
 	gentity_t	*touch;
@@ -797,7 +797,7 @@ void SV_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const ve
 	moveclip_t	clip;
 	int			i;
 
-	Com_Memset( &clip, 0, sizeof( moveclip_t ) );
+	Com_Memset ( &clip, 0, sizeof ( moveclip_t ) );
 
 	// clip to world
 	CM_BoxTrace( &clip.trace, start, end, mins, maxs, 0, contentmask, cylinder );

From c4683e24178288ac7d48f1aff59e91264def16c1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:18:35 +0200
Subject: [PATCH 0708/2040] Don't execute entity events from the console if the
 client isn't running

This prevent the server from executing console commands for the first player
---
 code/fgame/gamecmds.cpp  | 6 +++++-
 code/fgame/gamecvars.cpp | 4 ++++
 code/fgame/gamecvars.h   | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index 1f931aa8..260449d9 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -127,7 +127,11 @@ qboolean G_ConsoleCommand(void)
             }
         }
 
-        result = G_ProcessClientCommand(ent);
+        if (cl_running->integer) {
+            // Don't execute the command in multiplayer
+            // otherwise, the command will be executed "by" the first client
+            result = G_ProcessClientCommand(ent);
+        }
     } catch (const char *error) {
         G_ExitWithError(error);
     }
diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index e93ce97b..90eb8c5d 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -268,6 +268,8 @@ cvar_t *sv_minPlayers;
 cvar_t *g_rankedserver;
 cvar_t *g_spectatefollow_firstperson;
 
+cvar_t *cl_running;
+
 void CVAR_Init(void)
 {
     developer      = gi.Cvar_Get("developer", "0", 0);
@@ -623,4 +625,6 @@ void CVAR_Init(void)
         gi.Printf("numbots overflow, setting to %d\n", sv_maxbots->integer);
         gi.cvar_set("sv_numbots", sv_maxbots->string);
     }
+
+    cl_running = gi.Cvar_Get("cl_running", "", 0);
 }
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index 8103ae5e..8ec3c098 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -273,6 +273,8 @@ extern cvar_t *sv_minPlayers;
 extern cvar_t *g_rankedserver;
 extern cvar_t *g_spectatefollow_firstperson;
 
+extern cvar_t *cl_running;
+
 void CVAR_Init(void);
 
 #ifdef __cplusplus

From dc24a4a067475b8a7ea3a6e99e865332798cdea6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:32:42 +0200
Subject: [PATCH 0709/2040] Stop spawning if there is no entity 0 (could only
 happen in multiplayer)

---
 code/fgame/lodthing.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/lodthing.cpp b/code/fgame/lodthing.cpp
index 74be7738..b9a68ff8 100644
--- a/code/fgame/lodthing.cpp
+++ b/code/fgame/lodthing.cpp
@@ -129,6 +129,9 @@ void LODMaster::Spawn
 	gi.cvar_set( "lod_tool", "1" );
 
 	ent = g_entities->entity;
+    if (!ent) {
+        return;
+    }
 
 	if( ent->IsSubclassOfPlayer() )
 	{

From 29c3bece4ec92f3d865ef393dd42813500ac36d7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:32:55 +0200
Subject: [PATCH 0710/2040] Prevent players to use developer commands like
 `lod` or `view`

---
 code/fgame/gamecmds.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index 260449d9..d3223621 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -159,14 +159,18 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
     consolecmd_t *cmds;
     int           i;
     int           n;
-    ConsoleEvent *ev;
     Player       *player;
+    qboolean      allowDev;
 
     if (!ent || !ent->client || !ent->entity) {
         // not fully in game yet
         return qfalse;
     }
 
+    // Added in 2.1
+    //  Prevent players from messing with the server with developer commands
+    allowDev = g_gametype->integer == GT_SINGLE_PLAYER;
+
     cmd = gi.Argv(0);
 
     player                = (Player *)ent->entity;
@@ -184,20 +188,28 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
     }
 
     if (Event::Exists(cmd)) {
-        ev = new ConsoleEvent(cmd);
-        ev->SetConsoleEdict(ent);
+        ConsoleEvent ev(cmd);
+        ev.SetConsoleEdict(ent);
 
         n = gi.Argc();
 
         for (i = 1; i < n; i++) {
-            ev->AddToken(gi.Argv(i));
+            ev.AddToken(gi.Argv(i));
         }
 
         if (!Q_stricmpn(cmd, "lod_", 4)) {
+            if (!allowDev) {
+                return false;
+            }
             return LODModel.ProcessEvent(ev);
         } else if (!Q_stricmpn(cmd, "view", 4)) {
+            if (!allowDev) {
+                return false;
+            }
             return Viewmodel.ProcessEvent(ev);
-        } else if (ent->entity->CheckEventFlags(ev)) {
+        }
+
+        if (ent->entity->CheckEventFlags(&ev)) {
             return ent->entity->ProcessEvent(ev);
         }
     }
@@ -493,12 +505,11 @@ qboolean G_ScriptCmd(gentity_t *ent)
     ConsoleEvent *event;
     int           numArgs;
     int           i;
-    bool          recompile;
 
     numArgs = gi.Argc();
 
     if (numArgs <= 1) {
-        gi.Printf("Usage: script [filename] ([recompile])\n");
+        gi.Printf("Usage: script [filename]\n");
         return qtrue;
     }
 

From 56cbab8661d76935ff8725a7c494aefd69478075 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 21:42:07 +0200
Subject: [PATCH 0711/2040] Fix NumEventCommands() returning an incorrect
 result

---
 code/qcommon/listener.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index fb30bc4b..921647e6 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -1130,7 +1130,7 @@ Number of total events
 */
 int Event::NumEventCommands()
 {
-    return totalevents;
+    return commandList.size();
 }
 
 /*

From bdec6aab07983796aa124e0eb86e6cc7b4824910 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:09:36 +0200
Subject: [PATCH 0712/2040] Fix calls to class dumping functions

---
 code/fgame/gamecmds.cpp | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index d3223621..e7daa02e 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -60,13 +60,17 @@ consolecmd_t G_ConsoleCmds[] = {
     {"levelvars",       G_LevelVarsCmd,       qfalse},
     {"gamevars",        G_GameVarsCmd,        qfalse},
     {"script",          G_ScriptCmd,          qfalse},
+    // Added in 2.0
     {"reloadmap",       G_ReloadMap,          qfalse},
+    // Added in OPM
+    //====
     {"compilescript",   G_CompileScript,      qfalse},
     {"addbot",          G_AddBotCommand,      qfalse},
     {"removebot",       G_RemoveBotCommand,   qfalse},
 #ifdef _DEBUG
     {"bot",             G_BotCommand,         qfalse},
 #endif
+    //====
     {NULL,              NULL,                 qfalse}
 };
 
@@ -223,7 +227,6 @@ Cmd_Say_f
 ==================
 */
 void G_Say(gentity_t *ent, qboolean team, qboolean arg0)
-
 {
     int         j;
     gentity_t  *other;
@@ -287,7 +290,6 @@ void G_Say(gentity_t *ent, qboolean team, qboolean arg0)
 }
 
 qboolean G_CameraCmd(gentity_t *ent)
-
 {
     Event      *ev;
     const char *cmd;
@@ -346,7 +348,6 @@ qboolean G_SoundCmd(gentity_t *ent)
 }
 
 qboolean G_SayCmd(gentity_t *ent)
-
 {
     G_Say(ent, false, false);
 
@@ -354,7 +355,6 @@ qboolean G_SayCmd(gentity_t *ent)
 }
 
 qboolean G_EventListCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -363,13 +363,12 @@ qboolean G_EventListCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::ListCommands( mask );
+    Event::ListCommands( mask );
 
     return qtrue;
 }
 
 qboolean G_PendingEventsCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -378,13 +377,12 @@ qboolean G_PendingEventsCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::PendingEvents( mask );
+    Event::PendingEvents( mask );
 
     return qtrue;
 }
 
 qboolean G_EventHelpCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -393,13 +391,12 @@ qboolean G_EventHelpCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::ListDocumentation( mask, false );
+    Event::ListDocumentation( mask, false );
 
     return qtrue;
 }
 
 qboolean G_DumpEventsCmd(gentity_t *ent)
-
 {
     const char *mask;
 
@@ -408,13 +405,12 @@ qboolean G_DumpEventsCmd(gentity_t *ent)
         mask = gi.Argv(1);
     }
 
-    //Event::ListDocumentation( mask, true );
+    Event::ListDocumentation( mask, true );
 
     return qtrue;
 }
 
 qboolean G_ClassEventsCmd(gentity_t *ent)
-
 {
     const char *className;
 
@@ -424,13 +420,12 @@ qboolean G_ClassEventsCmd(gentity_t *ent)
         className = gi.Argv(1);
     } else {
         className = gi.Argv(1);
-        //ClassEvents( className );
+        ClassEvents( className, qfalse );
     }
     return qtrue;
 }
 
 qboolean G_DumpClassEventsCmd(gentity_t *ent)
-
 {
     const char *className;
 
@@ -440,31 +435,28 @@ qboolean G_DumpClassEventsCmd(gentity_t *ent)
         className = gi.Argv(1);
     } else {
         className = gi.Argv(1);
-        //ClassEvents( className, qtrue );
+        ClassEvents( className, qtrue );
     }
     return qtrue;
 }
 
 qboolean G_DumpAllClassesCmd(gentity_t *ent)
-
 {
     DumpAllClasses();
     return qtrue;
 }
 
 qboolean G_ClassListCmd(gentity_t *ent)
-
 {
-    //listAllClasses();
+    listAllClasses();
 
     return qtrue;
 }
 
 qboolean G_ClassTreeCmd(gentity_t *ent)
-
 {
     if (gi.Argc() > 1) {
-        //listInheritanceOrder( gi.Argv( 1 ) );
+        listInheritanceOrder( gi.Argv( 1 ) );
     } else {
         gi.SendServerCommand(ent - g_entities, "print \"Syntax: classtree [classname].\n\"");
     }
@@ -480,7 +472,6 @@ qboolean G_ShowVarCmd(gentity_t *ent)
 void PrintVariableList(ScriptVariableList *list) {}
 
 qboolean G_LevelVarsCmd(gentity_t *ent)
-
 {
     gi.Printf("Level Variables\n");
     PrintVariableList(level.vars);
@@ -489,7 +480,6 @@ qboolean G_LevelVarsCmd(gentity_t *ent)
 }
 
 qboolean G_GameVarsCmd(gentity_t *ent)
-
 {
     gi.Printf("Game Variables\n");
     PrintVariableList(game.vars);
@@ -546,7 +536,8 @@ qboolean G_ScriptCmd(gentity_t *ent)
     return scriptEnt->ProcessEvent(event);
 }
 
-qboolean G_ReloadMap(gentity_t* ent) {
+qboolean G_ReloadMap(gentity_t* ent)
+{
     char name[256];
 
     Com_sprintf(name, sizeof(name), "gamemap \"%s\"\n", level.mapname.c_str());

From 5cc168111c1a0ff2ac270354128e425a931febba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:10:44 +0200
Subject: [PATCH 0713/2040] Fix class not dumping properly

---
 code/qcommon/class.cpp    | 61 ++++++++++++++++++++++++---------------
 code/qcommon/class.h      |  1 +
 code/qcommon/listener.cpp |  5 +---
 code/qcommon/listener.h   |  1 -
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp
index ea0f9dbf..6e3e8984 100644
--- a/code/qcommon/class.cpp
+++ b/code/qcommon/class.cpp
@@ -466,6 +466,11 @@ EventDef *ClassDef::GetDef(int eventnum)
     }
 }
 
+EventDef *ClassDef::GetDef(Event *ev)
+{
+    return GetDef(ev->eventnum);
+}
+
 int ClassDef::GetFlags(Event *event)
 {
     EventDef *def = GetDef(event->eventnum);
@@ -490,10 +495,9 @@ void ClassDef::BuildResponseList(void)
         delete[] responseLookup;
         responseLookup = NULL;
     }
-
-    num = Event::NumEventCommands(
-    ); //size will be total event count, because it WAS faster to look for an event via eventnum
-        //nowadays there's not much overhead in performance, TODO: change size to appropriate.
+    //size will be total event count, because it WAS faster to look for an event via eventnum
+    //nowadays there's not much overhead in performance, TODO: change size to appropriate.
+    num = Event::NumEventCommands();
     responseLookup = (ResponseDef<Class> **)new char[sizeof(ResponseDef<Class> *) * num];
     memset(responseLookup, 0, sizeof(ResponseDef<Class> *) * num);
 
@@ -564,8 +568,9 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
     Event             **events;
     byte               *order;
     FILE               *class_file;
-    str                 classNames[MAX_INHERITANCE];
+    ClassDef           *classes[MAX_INHERITANCE];
     str                 class_filename;
+    EventDef           *def;
 
     c = getClass(classname);
     if (!c) {
@@ -597,12 +602,13 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
     orderNum = 0;
     for (; c != NULL; c = c->super) {
         if (orderNum < MAX_INHERITANCE) {
-            classNames[orderNum] = c->classname;
+            classes[orderNum] = c;
         }
         r = c->responses;
         if (r) {
             for (i = 0; r[i].event != NULL; i++) {
                 ev = (int)r[i].event->eventnum;
+                assert(ev < num);
                 if (!set[ev]) {
                     set[ev] = true;
 
@@ -622,20 +628,25 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
     CLASS_Print(class_file, "********************************************************\n");
     CLASS_Print(class_file, "********************************************************\n\n");
 
+    Event::SortEventList(&ClassDef::sortedList);
+
     for (j = orderNum - 1; j >= 0; j--) {
         CLASS_Print(class_file, "\n********************************************************\n");
-        CLASS_Print(class_file, "* Class: %s\n", classNames[j].c_str());
+        CLASS_Print(class_file, "* Class: %s\n", classes[j]->classname);
         CLASS_Print(class_file, "********************************************************\n\n");
         for (i = 1; i < num; i++) {
             int index;
 
             index = ClassDef::sortedList.ObjectAt(i);
             if (events[index] && (order[index] == j)) {
-                Event::eventDefList[events[index]].PrintEventDocumentation(class_file, qfalse);
+                def = classes[j]->GetDef(events[index]);
+                def->PrintEventDocumentation(class_file, qfalse);
             }
         }
     }
 
+    ClassDef::sortedList.FreeObjectList();
+
     if (class_file != NULL) {
         CLASS_DPrintf("Printed class info to file %s\n", class_filename.c_str());
         fclose(class_file);
@@ -648,44 +659,46 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
 
 void DumpClass(FILE *class_file, const char *className)
 {
+    ClassDef           *classDef;
     ClassDef           *c;
     ResponseDef<Class> *r;
     int                 ev;
     int                 i;
-    int                 num, num2;
+    int                 num;
     Event             **events;
+    EventDef           *def;
 
-    c = getClass(className);
-    if (!c) {
+    classDef = getClass(className);
+    if (!classDef) {
         return;
     }
 
-    num  = Event::commandList.size();
-    num2 = Event::NumEventCommands();
+    num = Event::NumEventCommands();
 
-    events = new Event *[num2];
-    memset(events, 0, sizeof(Event *) * num2);
+    events = new Event *[num];
+    memset(events, 0, sizeof(Event *) * num);
 
     // gather event responses for this class
-    r = c->responses;
+    r = classDef->responses;
     if (r) {
         for (i = 0; r[i].event != NULL; i++) {
             ev = (int)r[i].event->eventnum;
             if (r[i].response) {
+                assert(ev < num);
                 events[ev] = r[i].event;
             }
         }
     }
 
     CLASS_Print(class_file, "\n");
-    if (c->classID[0]) {
-        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s (<i>%s</i>)</a>", c->classname, c->classname, c->classID);
+    if (classDef->classID[0]) {
+        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s (<i>%s</i>)</a>", classDef->classname, classDef->classname, classDef->classID);
     } else {
-        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s</a>", c->classname, c->classname);
+        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s</a>", classDef->classname, classDef->classname);
     }
 
     // print out lineage
-    for (c = c->super; c != NULL; c = c->super) {
+    for (c = classDef->super; c != NULL; c = c->super) {
         CLASS_Print(class_file, " -> <a href=\"#%s\">%s</a>", c->classname, c->classname);
     }
     CLASS_Print(class_file, "</h2>\n");
@@ -698,7 +711,8 @@ void DumpClass(FILE *class_file, const char *className)
 
         index = ClassDef::sortedList.ObjectAt(i);
         if (events[index]) {
-            Event::eventDefList[events[index]].PrintEventDocumentation(class_file, qtrue);
+            def = classDef->GetDef(events[index]);
+            def->PrintEventDocumentation(class_file, qtrue);
             ClassDef::dump_numevents++;
         }
     }
@@ -762,9 +776,6 @@ void DumpAllClasses(void)
     ClassDef::dump_numclasses = 0;
     ClassDef::dump_numevents  = 0;
 
-    ClassDef::sortedList.ClearObjectList();
-    ClassDef::sortedClassList.ClearObjectList();
-
     Event::SortEventList(&ClassDef::sortedList);
     ClassDef::SortClassList(&ClassDef::sortedClassList);
 
@@ -776,6 +787,8 @@ void DumpAllClasses(void)
         DumpClass(class_file, c->classname);
     }
 
+    ClassDef::sortedList.FreeObjectList();
+
     if (class_file != NULL) {
         CLASS_Print(class_file, "<H2>\n");
         CLASS_Print(
diff --git a/code/qcommon/class.h b/code/qcommon/class.h
index d6fc751e..7dd14ccf 100644
--- a/code/qcommon/class.h
+++ b/code/qcommon/class.h
@@ -241,6 +241,7 @@ public:
     );
 
     EventDef *GetDef(int eventnum);
+    EventDef *GetDef(Event *ev);
     int       GetFlags(Event *event);
 
     void Destroy();
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 921647e6..ffb45cd0 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -75,8 +75,6 @@ int DisableListenerNotify = 0;
 
 bool Listener::EventSystemStarted = 0;
 
-int Event::totalevents = 1;
-
 Event EV_Listener_CancelFor
 (
     "cancelFor",
@@ -1130,7 +1128,7 @@ Number of total events
 */
 int Event::NumEventCommands()
 {
-    return commandList.size();
+    return commandList.size() + 1;
 }
 
 /*
@@ -1629,7 +1627,6 @@ void Event::LoadEvents()
 #endif
 
         delete DataNodeList;
-        totalevents++;
     }
 }
 
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 70acb320..8bf343d5 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -274,7 +274,6 @@ public:
 
     static EventQueueNode EventQueue;
 
-    static int totalevents;
     static int NumEventCommands();
 
     static void ListCommands(const char *mask = NULL);

From bed9bbbd05fbba2c2f6cabc04f63d524d7ece9e3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:13:21 +0200
Subject: [PATCH 0714/2040] Update classes documentation

---
 docs/features_g_allclasses.html | 715 +++++++++++++++++---------------
 1 file changed, 384 insertions(+), 331 deletions(-)

diff --git a/docs/features_g_allclasses.html b/docs/features_g_allclasses.html
index 5b4b8471..0c82ecfa 100644
--- a/docs/features_g_allclasses.html
+++ b/docs/features_g_allclasses.html
@@ -28,14 +28,17 @@
 <P><tt><B>ai_on</B></tt><BR>
 <ul>Turns the AI on for this actor.</ul>
 
+<P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
 <P><tt><B>alarmnode</B></tt><BR>
 <ul>Gets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
 
 <P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
 
-<P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+<P><tt><B>alarmthread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
 
 <P><tt><B>alarmthread</B></tt><BR>
 <ul>Gets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
@@ -43,8 +46,8 @@
 <P><tt><B>alarmthread</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
 
-<P><tt><B>alarmthread</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
+<P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
+<ul>Gives the AI some grenades</ul>
 
 <P><tt><B>ammo_grenade</B></tt><BR>
 <ul>Returns how many grenades an AI has</ul>
@@ -52,9 +55,6 @@
 <P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
 <ul>Gives the AI some grenades</ul>
 
-<P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
-<ul>Gives the AI some grenades</ul>
-
 <P><tt><B>anim</B>( <i>String name </i>)</tt><BR>
 <ul>Play animation.</ul>
 
@@ -65,10 +65,10 @@
 <ul>Loop animation.</ul>
 
 <P><tt><B>animname</B></tt><BR>
-<ul>Gets the animname.</ul>
+<ul>Sets the animname.</ul>
 
 <P><tt><B>animname</B></tt><BR>
-<ul>Sets the animname.</ul>
+<ul>Gets the animname.</ul>
 
 <P><tt><B>animscript</B>( <i>String name </i>)</tt><BR>
 <ul>Play the animation script</ul>
@@ -95,43 +95,43 @@
 <ul>Used only by grenade return animations to tell the code when to attach the grenade to the actor</ul>
 
 <P><tt><B>attackhandler</B></tt><BR>
-<ul>Sets the current script that will handle attack events</ul>
+<ul>Gets the current script that will handle attack events</ul>
 
 <P><tt><B>attackhandler</B></tt><BR>
-<ul>Gets the current script that will handle attack events</ul>
+<ul>Sets the current script that will handle attack events</ul>
 
 <P><tt><B>attackplayer</B></tt><BR>
 <ul>Force Actor to attack the player</ul>
 
+<P><tt><B>avoidplayer</B>( <i>Integer allowavoid </i>)</tt><BR>
+<ul>set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.<BR>
+</ul>
+
+<P><tt><B>avoidplayer</B>( <i>Integer allowavoid </i>)</tt><BR>
+<ul>set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.<BR>
+</ul>
+
 <P><tt><B>avoidplayer</B></tt><BR>
 <ul>is 0 if this AI won't automatically get out of the way, non-zero if he will<BR>
 </ul>
 
-<P><tt><B>avoidplayer</B>( <i>Integer allowavoid </i>)</tt><BR>
-<ul>set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.<BR>
-</ul>
-
-<P><tt><B>avoidplayer</B>( <i>Integer allowavoid </i>)</tt><BR>
-<ul>set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.<BR>
-</ul>
-
-<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
-<ul>minimum height a balcony guy must fall to do special balcony death</ul>
-
 <P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
 <ul>minimum height a balcony guy must fall to do special balcony death</ul>
 
 <P><tt><B>balconyheight</B></tt><BR>
 <ul>minimum height a balcony guy must fall to do special balcony death</ul>
 
+<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
+
 <P><tt><B>bedead</B></tt><BR>
 <ul>Forces the actor to be instantly and totally dead; no death animation is played</ul>
 
 <P><tt><B>blendtime</B></tt><BR>
-<ul>Get the crossblend time</ul>
+<ul>Set the crossblend time to something other than the default, in seconds</ul>
 
 <P><tt><B>blendtime</B></tt><BR>
-<ul>Set the crossblend time to something other than the default, in seconds</ul>
+<ul>Get the crossblend time</ul>
 
 <P><tt><B>breakspecial</B></tt><BR>
 <ul>tell ai to break special attack</ul>
@@ -175,10 +175,10 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <ul>preps the dead actor for turning nonsolid gradually over time</ul>
 
 <P><tt><B>deathhandler</B></tt><BR>
-<ul>Gets the current script that will handle death events</ul>
+<ul>Sets the current script that will handle death events</ul>
 
 <P><tt><B>deathhandler</B></tt><BR>
-<ul>Sets the current script that will handle death events</ul>
+<ul>Gets the current script that will handle death events</ul>
 
 <P><tt><B>deathsinkstart</B></tt><BR>
 <ul>Makes the entity sink into the ground and then get removed (this starts it).</ul>
@@ -192,21 +192,21 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>detachgrenade</B></tt><BR>
 <ul>Used only by grenade return animations to tell the code when to throw the grenade</ul>
 
-<P><tt><B>disguise_accept_thread</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the name of the thread for the actor to start when accepting papers</ul>
-
-<P><tt><B>disguise_accept_thread</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the name of the thread for the actor to start when accepting papers</ul>
-
 <P><tt><B>disguise_accept_thread</B></tt><BR>
 <ul>Gets the name of the thread for the actor to start when accepting papers</ul>
 
-<P><tt><B>disguise_level</B></tt><BR>
-<ul>Gets the disguise level of the actor. May be 1 or 2</ul>
+<P><tt><B>disguise_accept_thread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the thread for the actor to start when accepting papers</ul>
+
+<P><tt><B>disguise_accept_thread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the thread for the actor to start when accepting papers</ul>
 
 <P><tt><B>disguise_level</B>( <i>Integer value </i>)</tt><BR>
 <ul>Sets the disguise level of the actor. May be 1 or 2</ul>
 
+<P><tt><B>disguise_level</B></tt><BR>
+<ul>Gets the disguise level of the actor. May be 1 or 2</ul>
+
 <P><tt><B>disguise_level</B>( <i>Integer value </i>)</tt><BR>
 <ul>Sets the disguise level of the actor. May be 1 or 2</ul>
 
@@ -219,12 +219,12 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>disguise_period</B></tt><BR>
 <ul>Gets the time between the end of one disguise behavior and start of the next</ul>
 
-<P><tt><B>disguise_range</B></tt><BR>
-<ul>Gets the maximum distance for disguise behavior to get triggered</ul>
-
 <P><tt><B>disguise_range</B>( <i>Float range_in_units </i>)</tt><BR>
 <ul>Sets the maximum distance for disguise behavior to get triggered</ul>
 
+<P><tt><B>disguise_range</B></tt><BR>
+<ul>Gets the maximum distance for disguise behavior to get triggered</ul>
+
 <P><tt><B>disguise_range</B>( <i>Float range_in_units </i>)</tt><BR>
 <ul>Sets the maximum distance for disguise behavior to get triggered</ul>
 
@@ -276,10 +276,10 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>eyeslookat</B>( <i>Entity entity </i>)</tt><BR>
 <ul>The actor will look at this entity.</ul>
 
-<P><tt><B>fallheight</B></tt><BR>
+<P><tt><B>fallheight</B>( <i>Float height </i>)</tt><BR>
 <ul>Set the fallheight</ul>
 
-<P><tt><B>fallheight</B>( <i>Float height </i>)</tt><BR>
+<P><tt><B>fallheight</B></tt><BR>
 <ul>Set the fallheight</ul>
 
 <P><tt><B>favoriteenemy</B>( <i>Entity ai_or_player </i>)</tt><BR>
@@ -300,35 +300,38 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>fixedleash</B>( <i>Float multiplier </i>)</tt><BR>
 <ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
 
-<P><tt><B>fixedleash</B></tt><BR>
-<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
-
 <P><tt><B>fixedleash</B>( <i>Float multiplier </i>)</tt><BR>
 <ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
 
-<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
-<ul>The fov angle of the actor</ul>
-
-<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
-<ul>The fov angle of the actor</ul>
+<P><tt><B>fixedleash</B></tt><BR>
+<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
 
 <P><tt><B>fov</B></tt><BR>
 <ul>The fov angle of the actor</ul>
 
+<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
+<ul>The fov angle of the actor</ul>
+
+<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
+<ul>The fov angle of the actor</ul>
+
 <P><tt><B>GetRunAnim</B></tt><BR>
 <ul>Internal usage</ul>
 
 <P><tt><B>GetWalkAnim</B></tt><BR>
 <ul>Internal usage</ul>
 
+<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
+<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
 <P><tt><B>gren_awareness</B></tt><BR>
 <ul>gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
 
-<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
-<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
-
-<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
-<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+<P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
+<ul>specifies the gun to use</ul>
 
 <P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
 <ul>specifies the gun to use</ul>
@@ -336,9 +339,6 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>gun</B></tt><BR>
 <ul>gets the gun to being used</ul>
 
-<P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
-<ul>specifies the gun to use</ul>
-
 <P><tt><B>hascompletelookahead</B></tt><BR>
 <ul>returns true if there are no corners to turn on the rest of the AI's current path</ul>
 
@@ -348,12 +348,12 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>headmodel</B>( <i>String headmodel </i>)</tt><BR>
 <ul>sets the head model</ul>
 
-<P><tt><B>headskin</B>( <i>String headskin </i>)</tt><BR>
-<ul>sets the head skin</ul>
-
 <P><tt><B>headskin</B></tt><BR>
 <ul>gets the head skin</ul>
 
+<P><tt><B>headskin</B>( <i>String headskin </i>)</tt><BR>
+<ul>sets the head skin</ul>
+
 <P><tt><B>hearing</B>( <i>Float radius </i>)</tt><BR>
 <ul>The hearing radius of the actor</ul>
 
@@ -381,24 +381,24 @@ Should be called infrequently, and never during the middle of a grenade toss.<BR
 <P><tt><B>immediateremove</B></tt><BR>
 <ul>Removes this listener immediately.</ul>
 
-<P><tt><B>inreload</B>( <i>Integer reloading </i>)</tt><BR>
-<ul>set to non-zero to indicate the AI is in a reload</ul>
-
 <P><tt><B>inreload</B></tt><BR>
 <ul>returns non-zero if the AI is in a reload</ul>
 
+<P><tt><B>inreload</B>( <i>Integer reloading </i>)</tt><BR>
+<ul>set to non-zero to indicate the AI is in a reload</ul>
+
 <P><tt><B>interrupt_point</B></tt><BR>
 <ul>hint from animation scripts to AI code that now is a good time to switch animations</ul>
 
 <P><tt><B>interval</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the distance AI tries to keep between squadmates while moving.</ul>
 
-<P><tt><B>interval</B></tt><BR>
-<ul>Gets the distance AI tries to keep between squadmates while moving.</ul>
-
 <P><tt><B>interval</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the distance AI tries to keep between squadmates while moving.</ul>
 
+<P><tt><B>interval</B></tt><BR>
+<ul>Gets the distance AI tries to keep between squadmates while moving.</ul>
+
 <P><tt><B>intervaldir</B></tt><BR>
 <ul>the direction the AI would like to move to maintain its interval</ul>
 
@@ -439,32 +439,35 @@ Location values:<BR>
 <P><tt><B>leash</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the maximum distance the AI will wander from its leash home</ul>
 
-<P><tt><B>leash</B></tt><BR>
-<ul>Gets the maximum distance the AI will wander from its leash home</ul>
-
 <P><tt><B>leash</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the maximum distance the AI will wander from its leash home</ul>
 
-<P><tt><B>lookaroundangle</B></tt><BR>
-<ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
+<P><tt><B>leash</B></tt><BR>
+<ul>Gets the maximum distance the AI will wander from its leash home</ul>
 
 <P><tt><B>lookaroundangle</B>( <i>Float angle </i>)</tt><BR>
 <ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
 
+<P><tt><B>lookaroundangle</B></tt><BR>
+<ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
+
 <P><tt><B>lookaroundangle</B>( <i>Float angle </i>)</tt><BR>
 <ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
 
 <P><tt><B>lookat</B>( <i>Entity entity </i>)</tt><BR>
 <ul>The actor will look at this entity.</ul>
 
+<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
+
+<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
+
 <P><tt><B>maxdist</B></tt><BR>
 <ul>Gets the maximum distance the AI tries to keep between itself and the player</ul>
 
-<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
-<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
-
-<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
-<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
+<P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
 
 <P><tt><B>mindist</B></tt><BR>
 <ul>Gets the minimum distance the AI tries to keep between itself and the player</ul>
@@ -472,15 +475,12 @@ Location values:<BR>
 <P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
 
-<P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
-<ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
+<P><tt><B>mood</B></tt><BR>
+<ul>gets the AI mood: 'bored', 'nervous', 'curious', or 'alert'.</ul>
 
 <P><tt><B>mood</B>( <i>String new_mood </i>)</tt><BR>
 <ul>sets the AI mood... must be 'bored', 'nervous', 'curious', or 'alert'.</ul>
 
-<P><tt><B>mood</B></tt><BR>
-<ul>gets the AI mood: 'bored', 'nervous', 'curious', or 'alert'.</ul>
-
 <P><tt><B>movedir</B></tt><BR>
 <ul>Returns a unit vector pointing in the current direction of motion, or zero if not moving.This still has meaning if velocity is zero but the AI is starting to move on a path.</ul>
 
@@ -493,15 +493,15 @@ Location values:<BR>
 <P><tt><B>moveto</B>( <i>String anim, String dest </i>)</tt><BR>
 <ul>Specify the location to move to, with animation anim.</ul>
 
+<P><tt><B>mumble</B>( <i>Integer can_mumble </i>)</tt><BR>
+<ul>Set to 1 if this guy is allowed to mumble, or 0 if he is not</ul>
+
+<P><tt><B>mumble</B>( <i>Integer can_mumble </i>)</tt><BR>
+<ul>Set to 1 if this guy is allowed to mumble, or 0 if he is not</ul>
+
 <P><tt><B>mumble</B></tt><BR>
 <ul>Returns 1 if this guy is allowed to mumble, or 0 if he is not</ul>
 
-<P><tt><B>mumble</B>( <i>Integer can_mumble </i>)</tt><BR>
-<ul>Set to 1 if this guy is allowed to mumble, or 0 if he is not</ul>
-
-<P><tt><B>mumble</B>( <i>Integer can_mumble </i>)</tt><BR>
-<ul>Set to 1 if this guy is allowed to mumble, or 0 if he is not</ul>
-
 <P><tt><B>nationality</B></tt><BR>
 <ul>Get the nationality of an actor. Return values are ger, it, usa, uk, ussr and unset.</ul>
 
@@ -511,15 +511,15 @@ Location values:<BR>
 <P><tt><B>nationality</B>( <i>String nationality </i>)</tt><BR>
 <ul>Set the nationality of an actor. Valid entries are default, ger, it, usa, uk, and ussr.</ul>
 
+<P><tt><B>nolongpain</B>( <i>Integer allow </i>)</tt><BR>
+<ul>Set to 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
+
+<P><tt><B>nolongpain</B>( <i>Integer allow </i>)</tt><BR>
+<ul>Set to 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
+
 <P><tt><B>nolongpain</B></tt><BR>
 <ul>Returns 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
 
-<P><tt><B>nolongpain</B>( <i>Integer allow </i>)</tt><BR>
-<ul>Set to 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
-
-<P><tt><B>nolongpain</B>( <i>Integer allow </i>)</tt><BR>
-<ul>Set to 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
-
 <P><tt><B>nonvislevel</B></tt><BR>
 <ul>visibility level in range 0-1 below which an enemy is treated as non-visible</ul>
 
@@ -529,6 +529,10 @@ Location values:<BR>
 <P><tt><B>nonvislevel</B></tt><BR>
 <ul>visibility level in range 0-1 below which an enemy is treated as non-visible</ul>
 
+<P><tt><B>nosurprise</B>( <i>Integer nosurprise </i>)</tt><BR>
+<ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
+</ul>
+
 <P><tt><B>nosurprise</B></tt><BR>
 <ul>gets whether or not this guy is allowed to play a surprised animation when first encountering an enemy.<BR>
 </ul>
@@ -537,46 +541,42 @@ Location values:<BR>
 <ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
 </ul>
 
-<P><tt><B>nosurprise</B>( <i>Integer nosurprise </i>)</tt><BR>
-<ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
-</ul>
-
-<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
-<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
-
 <P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
 <ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
 
 <P><tt><B>noticescale</B></tt><BR>
 <ul>Get the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
 
-<P><tt><B>no_idle</B></tt><BR>
-<ul>Specifies if the actor will not go into idle after playing an animation</ul>
+<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
 
 <P><tt><B>no_idle</B></tt><BR>
 <ul>Gets if the actor will not go into idle after playing an animation</ul>
 
+<P><tt><B>no_idle</B></tt><BR>
+<ul>Specifies if the actor will not go into idle after playing an animation</ul>
+
 <P><tt><B>pain</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
 <ul>used to inflict pain to an entity</ul>
 
 <P><tt><B>painhandler</B></tt><BR>
-<ul>Sets the current script that will handle pain events</ul>
+<ul>Gets the current script that will handle pain events</ul>
 
 <P><tt><B>painhandler</B></tt><BR>
-<ul>Gets the current script that will handle pain events</ul>
+<ul>Sets the current script that will handle pain events</ul>
 
 <P><tt><B>pathdist</B></tt><BR>
 <ul>returns total distance along current path to the path goal</ul>
 
+<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
+<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
 <P><tt><B>patrolpath</B></tt><BR>
 <ul>Gets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
 
-<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
-
-<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
-
 <P><tt><B>physics_off</B></tt><BR>
 <ul>turn physics off.</ul>
 
@@ -614,15 +614,15 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>resetleash</B></tt><BR>
 <ul>resets the AI's leash to their current position</ul>
 
-<P><tt><B>runanimrate</B>( <i>Float multiplier </i>)</tt><BR>
-<ul>Set the rate at which the run animation plays back</ul>
-
-<P><tt><B>runanimrate</B>( <i>Float multiplier </i>)</tt><BR>
-<ul>Set the rate at which the run animation plays back</ul>
-
 <P><tt><B>runanimrate</B></tt><BR>
 <ul>Get the rate at which the run animation plays back</ul>
 
+<P><tt><B>runanimrate</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the rate at which the run animation plays back</ul>
+
+<P><tt><B>runanimrate</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the rate at which the run animation plays back</ul>
+
 <P><tt><B>runto</B>( <i>String dest </i>)</tt><BR>
 <ul>Specify the location to run to.</ul>
 
@@ -665,15 +665,19 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>share_grenade</B></tt><BR>
 <ul>internal code use only - shares an AI's grenade with his squad mates.</ul>
 
-<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
-<ul>Sets the vision distance of the actor.</ul>
-
 <P><tt><B>sight</B></tt><BR>
 <ul>Gets the vision distance of the actor.</ul>
 
 <P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
 <ul>Sets the vision distance of the actor.</ul>
 
+<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
+<ul>Sets the vision distance of the actor.</ul>
+
+<P><tt><B>silent</B>( <i>Integer silent </i>)</tt><BR>
+<ul>set to 0 to prevent this guy from saying stuff besides pain and death sounds.<BR>
+</ul>
+
 <P><tt><B>silent</B></tt><BR>
 <ul>gets whether or not this guy is allowed to say stuff besides pain and death sounds</ul>
 
@@ -681,9 +685,8 @@ default channel, CHAN_BODY.</ul>
 <ul>set to 0 to prevent this guy from saying stuff besides pain and death sounds.<BR>
 </ul>
 
-<P><tt><B>silent</B>( <i>Integer silent </i>)</tt><BR>
-<ul>set to 0 to prevent this guy from saying stuff besides pain and death sounds.<BR>
-</ul>
+<P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
 
 <P><tt><B>sound_awareness</B></tt><BR>
 <ul>gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
@@ -691,9 +694,6 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
 <ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
 
-<P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
-<ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
-
 <P><tt><B>stopped</B></tt><BR>
 <ul>sent when entity has stopped bouncing for MOVETYPE_TOSS.</ul>
 
@@ -736,23 +736,20 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>turret</B>( <i>String turret </i>)</tt><BR>
 <ul>Sets the turret of the actor.</ul>
 
-<P><tt><B>turret</B></tt><BR>
-<ul>Gets the turret of the actor.</ul>
-
 <P><tt><B>turret</B>( <i>String turret </i>)</tt><BR>
 <ul>Sets the turret of the actor.</ul>
 
-<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the attack type of the actor.</ul>
-
-<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the attack type of the actor.</ul>
+<P><tt><B>turret</B></tt><BR>
+<ul>Gets the turret of the actor.</ul>
 
 <P><tt><B>type_attack</B></tt><BR>
 <ul>Gets the attack type of the actor.</ul>
 
-<P><tt><B>type_disguise</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the disguise type of the actor.</ul>
+<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the attack type of the actor.</ul>
+
+<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the attack type of the actor.</ul>
 
 <P><tt><B>type_disguise</B></tt><BR>
 <ul>Gets the disguise type of the actor.</ul>
@@ -760,6 +757,9 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>type_disguise</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the disguise type of the actor.</ul>
 
+<P><tt><B>type_disguise</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the disguise type of the actor.</ul>
+
 <P><tt><B>type_grenade</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the grenade type of the actor.</ul>
 
@@ -769,15 +769,15 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>type_grenade</B></tt><BR>
 <ul>Gets the grenade type of the actor.</ul>
 
-<P><tt><B>type_idle</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the idle type of the actor.</ul>
-
 <P><tt><B>type_idle</B></tt><BR>
 <ul>Gets the idle type of the actor.</ul>
 
 <P><tt><B>type_idle</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the idle type of the actor.</ul>
 
+<P><tt><B>type_idle</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the idle type of the actor.</ul>
+
 <P><tt><B>unholster</B>( <i>Integer holster </i>)</tt><BR>
 <ul>If non-zero, affects offhand. Unholster weapon</ul>
 
@@ -787,19 +787,19 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>use</B>( <i>String name, Integer weapon_hand </i>)</tt><BR>
 <ul>Use the specified weapon or item in the hand choosen (optional).</ul>
 
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Set voicetype to magic letter postfix</ul>
+
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Set voicetype to magic letter postfix</ul>
+
 <P><tt><B>voicetype</B></tt><BR>
 <ul>Gets the voice type</ul>
 
-<P><tt><B>voicetype</B></tt><BR>
-<ul>Set voicetype to magic letter postfix</ul>
-
-<P><tt><B>voicetype</B></tt><BR>
-<ul>Set voicetype to magic letter postfix</ul>
-
-<P><tt><B>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
+<P><tt><B>waittrigger</B></tt><BR>
 <ul>If true, patrol guys and running men wait until triggered to move</ul>
 
-<P><tt><B>waittrigger</B></tt><BR>
+<P><tt><B>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
 <ul>If true, patrol guys and running men wait until triggered to move</ul>
 
 <P><tt><B>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
@@ -839,30 +839,30 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>accuracy</B></tt><BR>
 <ul>Set percent to hit</ul>
 
-<P><tt><B>alarmnode</B></tt><BR>
-<ul>Gets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
-
 <P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
 
+<P><tt><B>alarmnode</B></tt><BR>
+<ul>Gets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
 <P><tt><B>ammo_grenade</B></tt><BR>
 <ul>Returns how many grenades an AI has</ul>
 
 <P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
 <ul>Gives the AI some grenades</ul>
 
-<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
-<ul>minimum height a balcony guy must fall to do special balcony death</ul>
-
 <P><tt><B>balconyheight</B></tt><BR>
 <ul>minimum height a balcony guy must fall to do special balcony death</ul>
 
-<P><tt><B>disguise_level</B></tt><BR>
-<ul>Gets the disguise level of the actor. May be 1 or 2</ul>
+<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
 
 <P><tt><B>disguise_level</B>( <i>Integer value </i>)</tt><BR>
 <ul>Sets the disguise level of the actor. May be 1 or 2</ul>
 
+<P><tt><B>disguise_level</B></tt><BR>
+<ul>Gets the disguise level of the actor. May be 1 or 2</ul>
+
 <P><tt><B>disguise_period</B>( <i>Float period_in_seconds </i>)</tt><BR>
 <ul>Sets the time between the end of one disguise behavior and start of the next</ul>
 
@@ -918,29 +918,29 @@ default channel, CHAN_BODY.</ul>
 <ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
 
 <P><tt><B>forcedropweapon</B></tt><BR>
-<ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
+<ul>Force the sentient to drop weapons no matter what level.nodropweapon is.</ul>
 
 <P><tt><B>forcedropweapon</B></tt><BR>
-<ul>Force the sentient to drop health no matter what level.nodrophealth is.</ul>
-
-<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
-<ul>The fov angle of the actor</ul>
+<ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
 
 <P><tt><B>fov</B></tt><BR>
 <ul>The fov angle of the actor</ul>
 
-<P><tt><B>gren_awareness</B></tt><BR>
-<ul>gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
+<ul>The fov angle of the actor</ul>
 
 <P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
 <ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
 
-<P><tt><B>gun</B></tt><BR>
-<ul>gets the gun to being used</ul>
+<P><tt><B>gren_awareness</B></tt><BR>
+<ul>gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
 
 <P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
 <ul>specifies the gun to use</ul>
 
+<P><tt><B>gun</B></tt><BR>
+<ul>gets the gun to being used</ul>
+
 <P><tt><B>health</B>( <i>Integer newHealth </i>)</tt><BR>
 <ul>set the health of the entity to newHealth</ul>
 
@@ -965,24 +965,24 @@ default channel, CHAN_BODY.</ul>
 <P><tt><B>leash</B></tt><BR>
 <ul>Gets the maximum distance the AI will wander from its leash home</ul>
 
-<P><tt><B>maxdist</B></tt><BR>
-<ul>Gets the maximum distance the AI tries to keep between itself and the player</ul>
-
 <P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
 
-<P><tt><B>mindist</B></tt><BR>
-<ul>Gets the minimum distance the AI tries to keep between itself and the player</ul>
+<P><tt><B>maxdist</B></tt><BR>
+<ul>Gets the maximum distance the AI tries to keep between itself and the player</ul>
 
 <P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
 <ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
 
-<P><tt><B>model</B></tt><BR>
-<ul>get the modelName.</ul>
+<P><tt><B>mindist</B></tt><BR>
+<ul>Gets the minimum distance the AI tries to keep between itself and the player</ul>
 
 <P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
 <ul>set the model to modelName.</ul>
 
+<P><tt><B>model</B></tt><BR>
+<ul>get the modelName.</ul>
+
 <P><tt><B>nosurprise</B></tt><BR>
 <ul>gets whether or not this guy is allowed to play a surprised animation when first encountering an enemy.<BR>
 </ul>
@@ -991,48 +991,48 @@ default channel, CHAN_BODY.</ul>
 <ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
 </ul>
 
-<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
-<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
-
 <P><tt><B>noticescale</B></tt><BR>
 <ul>Get the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
 
-<P><tt><B>patrolpath</B></tt><BR>
-<ul>Gets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
 
 <P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
 
-<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
-<ul>Sets the vision distance of the actor.</ul>
+<P><tt><B>patrolpath</B></tt><BR>
+<ul>Gets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
 
 <P><tt><B>sight</B></tt><BR>
 <ul>Gets the vision distance of the actor.</ul>
 
-<P><tt><B>sound_awareness</B></tt><BR>
-<ul>gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
+<ul>Sets the vision distance of the actor.</ul>
 
 <P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
 <ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
 
+<P><tt><B>sound_awareness</B></tt><BR>
+<ul>gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+
 <P><tt><B>target</B></tt><BR>
 <ul>entity's target</ul>
 
 <P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
 <ul>target another entity with targetname_to_target.</ul>
 
-<P><tt><B>turret</B></tt><BR>
-<ul>Gets the turret of the actor.</ul>
-
 <P><tt><B>turret</B>( <i>String turret </i>)</tt><BR>
 <ul>Sets the turret of the actor.</ul>
 
-<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the attack type of the actor.</ul>
+<P><tt><B>turret</B></tt><BR>
+<ul>Gets the turret of the actor.</ul>
 
 <P><tt><B>type_attack</B></tt><BR>
 <ul>Gets the attack type of the actor.</ul>
 
+<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the attack type of the actor.</ul>
+
 <P><tt><B>type_disguise</B></tt><BR>
 <ul>Gets the disguise type of the actor.</ul>
 
@@ -1052,10 +1052,10 @@ default channel, CHAN_BODY.</ul>
 <ul>Sets the idle type of the actor.</ul>
 
 <P><tt><B>voicetype</B></tt><BR>
-<ul>Gets the voice type</ul>
+<ul>Set voicetype to magic letter postfix</ul>
 
 <P><tt><B>voicetype</B></tt><BR>
-<ul>Set voicetype to magic letter postfix</ul>
+<ul>Gets the voice type</ul>
 
 <P><tt><B>waittrigger</B></tt><BR>
 <ul>If true, patrol guys and running men wait until triggered to move</ul>
@@ -1076,6 +1076,9 @@ default channel, CHAN_BODY.</ul>
 
 <h2> <a name="AmmoEntity">AmmoEntity</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
+
+<P><tt><B>ammoentity_postspawn</B></tt><BR>
+<ul>Ammo Entity Post Spawn</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="Animate">Animate (<i>animate</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -1134,18 +1137,18 @@ speed - how fast the effect should travel, in other words, how long before the e
 <P><tt><B>max_dist</B>( <i>Float max_dist </i>)</tt><BR>
 <ul>Set the max distance for this node to be attracted, -1 for unlimited distance.</ul>
 
-<P><tt><B>priority</B></tt><BR>
-<ul>Get the node priority</ul>
-
 <P><tt><B>priority</B>( <i>Integer priority </i>)</tt><BR>
 <ul>Set the node priority</ul>
 
-<P><tt><B>respawn_time</B></tt><BR>
-<ul>Get the how much time will this node re-attract already attracted AIs</ul>
+<P><tt><B>priority</B></tt><BR>
+<ul>Get the node priority</ul>
 
 <P><tt><B>respawn_time</B>( <i>Float respawn_time </i>)</tt><BR>
 <ul>Set the how much time will this node re-attract already attracted AIs. The minimum required value is 1, otherwise AI will get stuck.</ul>
 
+<P><tt><B>respawn_time</B></tt><BR>
+<ul>Get the how much time will this node re-attract already attracted AIs</ul>
+
 <P><tt><B>setuse</B>( <i>Boolean use </i>)</tt><BR>
 <ul>Set if AI should use or not</ul>
 
@@ -1155,11 +1158,11 @@ speed - how fast the effect should travel, in other words, how long before the e
 <P><tt><B>stay_time</B>( <i>Float stay_time </i>)</tt><BR>
 <ul>Set the maximum stay time AI will stay on this node</ul>
 
-<P><tt><B>team</B></tt><BR>
-<ul>Get the attractive node team. 'none' for no team.</ul>
-
 <P><tt><B>team</B>( <i>String team </i>)</tt><BR>
 <ul>Set the attractive node team. 'none' for no team.</ul>
+
+<P><tt><B>team</B></tt><BR>
+<ul>Get the attractive node team. 'none' for no team.</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="BarrelObject">BarrelObject (<i>func_barrel</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -1864,14 +1867,14 @@ offset		     - vector offset for the model from the specified tag</ul>
 <ul>used to ban certain contact when in parentmode<BR>
 </ul>
 
-<P><tt><B>classname</B></tt><BR>
-<ul>The entity's classname</ul>
-
 <P><tt><B>classname</B>( <i>String nameOfClass </i>)</tt><BR>
 <ul>Determines what class to use for this entity,<BR>
 this is pre-processed from the BSP at the start<BR>
 of the level.</ul>
 
+<P><tt><B>classname</B></tt><BR>
+<ul>The entity's classname</ul>
+
 <P><tt><B>claypidgeon</B></tt><BR>
 <ul>turn the entity into a non-solid shootable thing</ul>
 
@@ -1998,9 +2001,6 @@ god - makes the entity invincible<BR>
 <P><tt><B>gettagposition</B>( <i>String tag_name </i>)</tt><BR>
 <ul>Gets the world position of the tag</ul>
 
-<P><tt><B>getzone</B></tt><BR>
-<ul>Gets the current entity zone. NIL if the entity is not in a zone.</ul>
-
 <P><tt><B>ghost</B></tt><BR>
 <ul>make non-solid but still send to client regardless of hide status.</ul>
 
@@ -2048,9 +2048,6 @@ entity's current health, it will be killed or destroyed.</ul>
 <P><tt><B>isinside</B>( <i>Entity ent </i>)</tt><BR>
 <ul>returns 1 if the entity is inside,0 if not</ul>
 
-<P><tt><B>isinzone</B>( <i>Entity zone </i>)</tt><BR>
-<ul>Returns 1 if the entity is in the specified zone. 0 otherwise</ul>
-
 <P><tt><B>istouching</B>( <i>Entity ent </i>)</tt><BR>
 <ul>returns 1 if the entities are touching,0 if not</ul>
 
@@ -2125,21 +2122,21 @@ which is attached to the current entity.</ul>
 <P><tt><B>max_health</B>( <i>Integer newHealth </i>)</tt><BR>
 <ul>sets max_health without changing health</ul>
 
-<P><tt><B>max_health</B>( <i>Integer newHealth </i>)</tt><BR>
-<ul>sets max_health without changing health</ul>
-
 <P><tt><B>max_health</B></tt><BR>
 <ul>gets the entity's max health</ul>
 
+<P><tt><B>max_health</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>sets max_health without changing health</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
 <P><tt><B>model</B></tt><BR>
 <ul>get the modelName.</ul>
 
-<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
-<ul>set the model to modelName.</ul>
-
-<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
-<ul>set the model to modelName.</ul>
-
 <P><tt><B>movementstealth</B>( <i>Float scale </i>)</tt><BR>
 <ul>Sets the current movement stealth scalar for the sentient</ul>
 
@@ -2211,12 +2208,12 @@ lightstyledynamiclight - the dynamic light uses a light style, use the<BR>
 <P><tt><B>revive</B>( <i>Float health </i>)</tt><BR>
 <ul>sets the health,even if dead</ul>
 
-<P><tt><B>rotatedbbox</B>( <i>Integer on_off </i>)</tt><BR>
-<ul>Sets the entity's bbox to rotate with it.</ul>
-
 <P><tt><B>rotatedbbox</B></tt><BR>
 <ul>Gets te entity's bbox to rotate with it.</ul>
 
+<P><tt><B>rotatedbbox</B>( <i>Integer on_off </i>)</tt><BR>
+<ul>Sets the entity's bbox to rotate with it.</ul>
+
 <P><tt><B>safesolid</B></tt><BR>
 <ul>make solid but first make sure no one is in my bounds that is thinking.</ul>
 
@@ -2351,20 +2348,17 @@ broadcast - always send this entity to the client</ul>
 <P><tt><B>usebbox</B></tt><BR>
 <ul>do not perform perfect collision,use bounding box instead.</ul>
 
-<P><tt><B>velocity</B></tt><BR>
-<ul>gets the velocity for this entity.</ul>
-
 <P><tt><B>velocity</B>( <i>Vector velocity </i>)</tt><BR>
 <ul>sets the velocity for this entity.</ul>
 
+<P><tt><B>velocity</B></tt><BR>
+<ul>gets the velocity for this entity.</ul>
+
 <P><tt><B>volumedamage</B>( <i>Float damage </i>)</tt><BR>
 <ul>does damage to any entity within this's volume</ul>
 
 <P><tt><B>yaw</B></tt><BR>
 <ul>entity's yaw</ul>
-
-<P><tt><B>zone</B></tt><BR>
-<ul>Get the current entity zone. NIL if the entity is not in a zone.</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="Event">Event</a> -> <a href="#Class">Class</a></h2>
@@ -2517,6 +2511,31 @@ Location values:<BR>
 
 <h2> <a name="FencePost">FencePost (<i>func_fencepost</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="FixedTurret">FixedTurret</a> -> <a href="#VehicleTank">VehicleTank</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -2676,6 +2695,12 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 
 <h2> <a name="Game">Game</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
+
+<P><tt><B>detail</B></tt><BR>
+<ul>game.detail</ul>
+
+<P><tt><B>skill</B></tt><BR>
+<ul>game.skill</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="Gib">Gib (<i>gib</i>)</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -2776,24 +2801,24 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <h2> <a name="Hud">Hud</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
-<P><tt><B>alignx</B>( <i>String align </i>)</tt><BR>
-<ul>Sets the horizontal alignment for the HUD. Specified by 'left', 'center', or 'right'</ul>
-
 <P><tt><B>alignx</B></tt><BR>
 <ul>Gets the horizontal alignment for the HUD. Specified by 'left', 'center', or 'right'</ul>
 
+<P><tt><B>alignx</B>( <i>String align </i>)</tt><BR>
+<ul>Sets the horizontal alignment for the HUD. Specified by 'left', 'center', or 'right'</ul>
+
 <P><tt><B>aligny</B>( <i>String align </i>)</tt><BR>
 <ul>Sets the vertical alignment for the HUD. Specified by 'top', 'center', or 'bottom'</ul>
 
 <P><tt><B>aligny</B></tt><BR>
 <ul>Gets the vertical alignment for the HUD</ul>
 
-<P><tt><B>alpha</B>( <i>Float alpha </i>)</tt><BR>
-<ul>Sets the HUD alpha</ul>
-
 <P><tt><B>alpha</B></tt><BR>
 <ul>Gets the HUD alpha</ul>
 
+<P><tt><B>alpha</B>( <i>Float alpha </i>)</tt><BR>
+<ul>Sets the HUD alpha</ul>
+
 <P><tt><B>color</B></tt><BR>
 <ul>Gets the HUD colors</ul>
 
@@ -2855,17 +2880,17 @@ Note : you will need to call in HUD functions again as it won't refresh to the p
 <P><tt><B>setvirtualsize</B>( <i>Boolean virtual </i>)</tt><BR>
 <ul>Sets if the HUD should use virtual screen resolution for positioning and size</ul>
 
-<P><tt><B>x</B>( <i>Integer x </i>)</tt><BR>
-<ul>Sets the HUD horizontal position</ul>
-
 <P><tt><B>x</B></tt><BR>
 <ul>Gets the HUD horizontal position</ul>
 
-<P><tt><B>y</B></tt><BR>
-<ul>Gets the HUD vertical position</ul>
+<P><tt><B>x</B>( <i>Integer x </i>)</tt><BR>
+<ul>Sets the HUD horizontal position</ul>
 
 <P><tt><B>y</B>( <i>Integer y </i>)</tt><BR>
 <ul>Sets the HUD vertical position</ul>
+
+<P><tt><B>y</B></tt><BR>
+<ul>Gets the HUD vertical position</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="InfoLandmark">InfoLandmark (<i>info_landmark</i>)</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -2882,7 +2907,7 @@ Note : you will need to call in HUD functions again as it won't refresh to the p
 <BLOCKQUOTE>
 </BLOCKQUOTE>
 
-<h2> <a name="InfoNull">InfoNull (<i>info_null</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<h2> <a name="InfoNull">InfoNull (<i>info_null</i>)</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 </BLOCKQUOTE>
 
@@ -3028,51 +3053,60 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <h2> <a name="Level">Level</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
-<P><tt><B>alarm</B>( <i>Integer alarm_status </i>)</tt><BR>
+<P><tt><B>alarm</B></tt><BR>
 <ul>zero = global level alarm off,non-zero = alarm on</ul>
 
-<P><tt><B>alarm</B></tt><BR>
+<P><tt><B>alarm</B>( <i>Integer alarm_status </i>)</tt><BR>
 <ul>zero = global level alarm off,non-zero = alarm on</ul>
 
 <P><tt><B>badplace</B>( <i>String name, Vector origin, Float radius, [ String [team] ], [ Float [duration] ] </i>)</tt><BR>
 <ul>Enables a 'bad place' for AI of team 'american', 'german', or (default) 'both' to avoid, and optionally gives it a duration</ul>
 
 <P><tt><B>bombs_planted</B>( <i>Integer num </i>)</tt><BR>
-<ul>the number of bombs that are set</ul>
+<ul>Sets the number of bombs that are set</ul>
 
 <P><tt><B>bombs_planted</B>( <i>Integer num </i>)</tt><BR>
-<ul>Sets the number of bombs that are set</ul>
+<ul>the number of bombs that are set</ul>
 
 <P><tt><B>bombs_planted</B></tt><BR>
 <ul>Gets the number of bombs that are set</ul>
 
-<P><tt><B>clockside</B></tt><BR>
-<ul>Gets which side the clock is on... 'axis' or 'allies' win when time is up</ul>
+<P><tt><B>clockside</B>( <i>String axis_allies_draw_kills </i>)</tt><BR>
+<ul>Sets which side the clock is on... 'axis' or 'allies' win when time is up, 'kills' gives the win to the team with more live members,'draw' no one wins</ul>
 
 <P><tt><B>clockside</B>( <i>String axis_or_allies </i>)</tt><BR>
 <ul>Sets which side the clock is on... 'axis' or 'allies' win when time is up</ul>
 
-<P><tt><B>clockside</B>( <i>String axis_allies_draw_kills </i>)</tt><BR>
-<ul>Sets which side the clock is on... 'axis' or 'allies' win when time is up, 'kills' gives the win to the team with more live members,'draw' no one wins</ul>
-
-<P><tt><B>dmrespawning</B>( <i>Integer allow_respawn </i>)</tt><BR>
-<ul>set to 1 to turn on wave-based DM, to 0 to disable respawns within a round</ul>
+<P><tt><B>clockside</B></tt><BR>
+<ul>Gets which side the clock is on... 'axis' or 'allies' win when time is up</ul>
 
 <P><tt><B>dmrespawning</B></tt><BR>
 <ul>returns 1 if wave-based DM, 0 if respawns are disabled within a round</ul>
 
 <P><tt><B>dmrespawning</B>( <i>Integer allow_respawn </i>)</tt><BR>
-<ul>set to 1 to turn on wave-based DM,to 0 to disable respawns within a round</ul>
+<ul>set to 1 to turn on wave-based DM, to 0 to disable respawns within a round</ul>
 
-<P><tt><B>dmroundlimit</B>( <i>Integer roundlimit </i>)</tt><BR>
-<ul>sets the default roundlimit,in minutes; can be overridden by 'roundlimit' cvar</ul>
+<P><tt><B>dmrespawning</B>( <i>Integer allow_respawn </i>)</tt><BR>
+<ul>set to 1 to turn on wave-based DM,to 0 to disable respawns within a round</ul>
 
 <P><tt><B>dmroundlimit</B>( <i>Integer roundlimit </i>)</tt><BR>
 <ul>sets the default roundlimit, in minutes; can be overridden by 'roundlimit' cvar</ul>
 
+<P><tt><B>dmroundlimit</B>( <i>Integer roundlimit </i>)</tt><BR>
+<ul>sets the default roundlimit,in minutes; can be overridden by 'roundlimit' cvar</ul>
+
 <P><tt><B>dmroundlimit</B></tt><BR>
 <ul>gets the actual roundlimit, in minutes; may be 'roundlimit' cvar or the default round limit</ul>
 
+<P><tt><B>force_team_objective</B></tt><BR>
+<ul>Return 1 if each team has a separate objective location</ul>
+
+<P><tt><B>force_team_objective</B>( <i>Integer force </i>)</tt><BR>
+<ul>Whether or not to force using a separate objective location for each team.<BR>
+1 (forced on TOW/Liberation match): different location for each team<BR>
+0 (default): teams use same location on non-TOW/non-Liberation match<BR>
+</ul>
+
 <P><tt><B>found_secrets</B></tt><BR>
 <ul>count of found secrets</ul>
 
@@ -3103,12 +3137,12 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <P><tt><B>planting_team</B>( <i>String axis_allies_draw_kills </i>)</tt><BR>
 <ul>which is planting the bomb,'axis' or 'allies'</ul>
 
-<P><tt><B>planting_team</B></tt><BR>
-<ul>Gets which is planting the bomb,'axis' or 'allies'</ul>
-
 <P><tt><B>planting_team</B>( <i>String axis_or_allies </i>)</tt><BR>
 <ul>Sets which is planting the bomb,'axis' or 'allies'</ul>
 
+<P><tt><B>planting_team</B></tt><BR>
+<ul>Gets which is planting the bomb,'axis' or 'allies'</ul>
+
 <P><tt><B>rain_density</B></tt><BR>
 <ul>Sets the rain density</ul>
 
@@ -3172,21 +3206,21 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <P><tt><B>roundstarted</B></tt><BR>
 <ul>non-zero if round has started</ul>
 
+<P><tt><B>targets_destroyed</B>( <i>Integer num </i>)</tt><BR>
+<ul>Sets the number of bomb targets that have been destroyed</ul>
+
 <P><tt><B>targets_destroyed</B></tt><BR>
 <ul>Gets the number of bomb targets that have been destroyed</ul>
 
-<P><tt><B>targets_destroyed</B>( <i>Integer num </i>)</tt><BR>
-<ul>Sets the number of bomb targets that have been destroyed</ul>
-
 <P><tt><B>targets_destroyed</B>( <i>Integer num </i>)</tt><BR>
 <ul>the number of bomb targets that have been destroyed</ul>
 
-<P><tt><B>targets_to_destroy</B></tt><BR>
-<ul>Gets the number of bomb targets that must be destroyed</ul>
-
 <P><tt><B>targets_to_destroy</B>( <i>Integer num </i>)</tt><BR>
 <ul>Sets the number of bomb targets that must be destroyed</ul>
 
+<P><tt><B>targets_to_destroy</B></tt><BR>
+<ul>Gets the number of bomb targets that must be destroyed</ul>
+
 <P><tt><B>targets_to_destroy</B>( <i>Integer num </i>)</tt><BR>
 <ul>the number of bomb targets that must be destroyed</ul>
 
@@ -3390,6 +3424,15 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <h2> <a name="Parm">Parm</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
+<P><tt><B>motionfail</B></tt><BR>
+<ul>motionfail</ul>
+
+<P><tt><B>movedone</B></tt><BR>
+<ul>movedone</ul>
+
+<P><tt><B>movefail</B></tt><BR>
+<ul>movefail</ul>
+
 <P><tt><B>other</B></tt><BR>
 <ul>other</ul>
 
@@ -3398,6 +3441,12 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 
 <P><tt><B>previousthread</B></tt><BR>
 <ul>previousthread</ul>
+
+<P><tt><B>sayfail</B></tt><BR>
+<ul>sayfail</ul>
+
+<P><tt><B>upperfail</B></tt><BR>
+<ul>upperfail</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="PathNode">PathNode (<i>info_pathnode</i>)</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -3502,11 +3551,11 @@ Location values:<BR>
 17 LFoot<BR>
 </ul>
 
-<P><tt><B>damage_multiplier</B></tt><BR>
-
 <P><tt><B>damage_multiplier</B>( <i>Float damage_multiplier </i>)</tt><BR>
 <ul>Sets the current damage multiplier</ul>
 
+<P><tt><B>damage_multiplier</B></tt><BR>
+
 <P><tt><B>dead</B></tt><BR>
 <ul>Called when the player is dead.</ul>
 
@@ -3604,7 +3653,7 @@ Location values:<BR>
 <ul>Gives the player the specified thing (weapon, ammo, item, etc.) and optionally the amount.</ul>
 
 <P><tt><B>giveweapon</B>( <i>String weapon_name </i>)</tt><BR>
-<ul>Gives player all weapons.</ul>
+<ul>Gives the player the specified weapon.</ul>
 
 <P><tt><B>gotkill</B>( <i>Entity victim, Integer damage, Entity inflictor, Integer meansofdeath, Boolean gib </i>)</tt><BR>
 <ul>event sent to attacker when an entity dies</ul>
@@ -3612,10 +3661,10 @@ Location values:<BR>
 <P><tt><B>gvo</B></tt><BR>
 <ul>Retrieves the server's vote options file</ul>
 
-<P><tt><B>has_disguise</B></tt><BR>
+<P><tt><B>has_disguise</B>( <i>Integer is_disguised </i>)</tt><BR>
 <ul>zero = does not have a disguise,non - zero = has a disguise</ul>
 
-<P><tt><B>has_disguise</B>( <i>Integer is_disguised </i>)</tt><BR>
+<P><tt><B>has_disguise</B></tt><BR>
 <ul>zero = does not have a disguise,non - zero = has a disguise</ul>
 
 <P><tt><B>hideent</B>( <i>Entity entity </i>)</tt><BR>
@@ -3798,10 +3847,10 @@ can specify 'stand', 'duck' or 'prone'.</ul>
 <ul>returns 1 if this player is holding the primary fire, or 0 if not</ul>
 
 <P><tt><B>ready</B></tt><BR>
-<ul>returns 1 if this player is ready,0 otherwise</ul>
+<ul>makes this player ready for the round to start</ul>
 
 <P><tt><B>ready</B></tt><BR>
-<ul>makes this player ready for the round to start</ul>
+<ul>returns 1 if this player is ready,0 otherwise</ul>
 
 <P><tt><B>reload</B></tt><BR>
 <ul>Reloads the player's weapon</ul>
@@ -4544,6 +4593,9 @@ Default=0:</ul>
 <h2> <a name="ScriptAimedStrafingGunfire">ScriptAimedStrafingGunfire (<i>script_aimedstrafinggunfire</i>)</a> -> <a href="#ScriptSimpleStrafingGunfire">ScriptSimpleStrafingGunfire</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
+<P><tt><B>aimtarget</B></tt><BR>
+<ul>Set the aim target.</ul>
+
 <P><tt><B>fire</B></tt><BR>
 <ul>Fire.</ul>
 </BLOCKQUOTE>
@@ -4748,6 +4800,18 @@ Location values:<BR>
 <P><tt><B>dmg</B>( <i>Integer damage </i>)</tt><BR>
 <ul>Set the damage.</ul>
 
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>doBlocked</B>( <i>Entity obstacle </i>)</tt><BR>
+<ul>sent to entity when blocked.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
 <P><tt><B>endpath</B></tt><BR>
 <ul>Stop following the path</ul>
 
@@ -4759,7 +4823,7 @@ Location values:<BR>
 
 <P><tt><B>followpath</B>( <i>Entity path, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
 <ul>Makes the script slave follow the specified path.  The allowable arguments are ignoreangles,<BR>
-normalangles, loop, and a number specifying the start time.</ul>
+ignorevelocity, normalangles, loop, and a number specifying the start time.</ul>
 
 <P><tt><B>jumpto</B>( <i>String vector_or_entity </i>)</tt><BR>
 <ul>Jump to specified vector or entity.</ul>
@@ -5683,15 +5747,15 @@ Location values:<BR>
 <P><tt><B>forcedrophealth</B></tt><BR>
 <ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
 
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Force the sentient to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Force the sentient to drop health no matter what level.nodrophealth is.</ul>
+
 <P><tt><B>forcedropweapon</B></tt><BR>
 <ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
 
-<P><tt><B>forcedropweapon</B></tt><BR>
-<ul>Force the sentient to drop weapons no matter what level.nodropweapon is.</ul>
-
-<P><tt><B>forcedropweapon</B></tt><BR>
-<ul>Force the sentient to drop weapons no matter what level.nodropweapon is.</ul>
-
 <P><tt><B>forcelandminemeasure</B></tt><BR>
 <ul>Force a remeasurement to all landmines</ul>
 
@@ -5829,18 +5893,15 @@ Location values:<BR>
 Sets the yaw of the entity or an up and down<BR>
 direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 
-<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
-<ul>set the angles of the entity using just one value.<BR>
-Sets the yaw of the entity or an up and down<BR>
-direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
-
 <P><tt><B>angle</B></tt><BR>
 <ul>get the angles of the entity using just one value.<BR>
 Gets the yaw of the entity or an up and down<BR>
 direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 
-<P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
-<ul>set the angles of the entity to newAngles.</ul>
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 
 <P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
 <ul>set the angles of the entity to newAngles.</ul>
@@ -5848,6 +5909,9 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <P><tt><B>angles</B></tt><BR>
 <ul>get the angles of the entity.</ul>
 
+<P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
+<ul>set the angles of the entity to newAngles.</ul>
+
 <P><tt><B>centroid</B></tt><BR>
 <ul>entity's centroid</ul>
 
@@ -5869,24 +5933,24 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <P><tt><B>rightvector</B></tt><BR>
 <ul>get the right vector of angles</ul>
 
+<P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
+<ul>target another entity with targetname_to_target.</ul>
+
 <P><tt><B>target</B></tt><BR>
 <ul>entity's target</ul>
 
 <P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
 <ul>target another entity with targetname_to_target.</ul>
 
-<P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
-<ul>target another entity with targetname_to_target.</ul>
-
-<P><tt><B>targetname</B>( <i>String targetName </i>)</tt><BR>
-<ul>set the targetname of the entity to targetName.</ul>
-
 <P><tt><B>targetname</B>( <i>String targetName </i>)</tt><BR>
 <ul>set the targetname of the entity to targetName.</ul>
 
 <P><tt><B>targetname</B></tt><BR>
 <ul>entity's targetname</ul>
 
+<P><tt><B>targetname</B>( <i>String targetName </i>)</tt><BR>
+<ul>set the targetname of the entity to targetName.</ul>
+
 <P><tt><B>upvector</B></tt><BR>
 <ul>get the up vector of angles</ul>
 </BLOCKQUOTE>
@@ -6120,6 +6184,10 @@ direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
 <ul>Sets the entity to watch at this node.</ul>
 </BLOCKQUOTE>
 
+<h2> <a name="TargetList">TargetList</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
 <h2> <a name="Teleporter">Teleporter (<i>trigger_teleport</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
@@ -6234,7 +6302,7 @@ Location values:<BR>
 <P><tt><B>stickybombwet</B></tt><BR>
 </BLOCKQUOTE>
 
-<h2> <a name="ThrowObject">ThrowObject (<i>func_throwobject</i>)</a> -> <a href="#Object">Object</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<h2> <a name="ThrowObject">ThrowObject (<i>func_throwobject</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 
 <P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
@@ -6289,12 +6357,12 @@ Location values:<BR>
 <P><tt><B>AxisObjNum</B>( <i>Integer AxisObjNum </i>)</tt><BR>
 <ul>Sets the objective number for the axis team</ul>
 
-<P><tt><B>ControlledBy</B>( <i>Integer ControlledBy </i>)</tt><BR>
-<ul>Sets the team controlling the objective</ul>
-
 <P><tt><B>ControlledBy</B></tt><BR>
 <ul>Objective controller</ul>
 
+<P><tt><B>ControlledBy</B>( <i>Integer ControlledBy </i>)</tt><BR>
+<ul>Sets the team controlling the objective</ul>
+
 <P><tt><B>initialize</B></tt><BR>
 <ul>Initialize object</ul>
 
@@ -6454,30 +6522,8 @@ If facet is 2 than trigger is East/West oriented. If facet is 3 than trigger is
 <P><tt><B>activatetrigger</B>( <i>Entity triggering_entity </i>)</tt><BR>
 <ul>Activates all of the targets for this trigger.</ul>
 
-<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
-<ul>general damage event used by all entities<BR>
-<BR>
-Location values:<BR>
--1 General<BR>
-0 Pelvis<BR>
-1 Lower Torso<BR>
-2 Mid Torso<BR>
-3 Upper Torso<BR>
-4 Neck<BR>
-5 Head<BR>
-6 RUpperArm<BR>
-7 RForearm<BR>
-8 RHand<BR>
-9 LUpperArm<BR>
-10 LForearm<BR>
-11 LHand<BR>
-12 RThigh<BR>
-13 RCalf<BR>
-14 RFoot<BR>
-15 LThigh<BR>
-16 LCalf<BR>
-17 LFoot<BR>
-</ul>
+<P><tt><B>damage</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Sets the amount of damage to do.</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="TriggerEntity">TriggerEntity (<i>trigger_entity</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -6661,6 +6707,10 @@ as a multi-faceted edge trigger.</ul>
 <ul>Send event to owner of trigger.</ul>
 </BLOCKQUOTE>
 
+<h2> <a name="TriggerSidedUse">TriggerSidedUse (<i>trigger_sideduse</i>)</a> -> <a href="#TriggerUse">TriggerUse</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
 <h2> <a name="TriggerSpeaker">TriggerSpeaker (<i>sound_speaker</i>)</a> -> <a href="#TriggerPlaySound">TriggerPlaySound</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
 <BLOCKQUOTE>
 </BLOCKQUOTE>
@@ -6767,14 +6817,14 @@ as a multi-faceted edge trigger.</ul>
 <P><tt><B>suppressWidth</B>( <i>Float radius </i>)</tt><BR>
 <ul>Sets the horizontal radius of suppression fire</ul>
 
-<P><tt><B>targettype</B>( <i>String value </i>)</tt><BR>
-<ul>Sets the target type to be none any, or player</ul>
+<P><tt><B>targettype</B></tt><BR>
+<ul>Gets the target type</ul>
 
 <P><tt><B>targettype</B>( <i>String value </i>)</tt><BR>
 <ul>Sets the target type to be none, any, or player</ul>
 
-<P><tt><B>targettype</B></tt><BR>
-<ul>Gets the target type</ul>
+<P><tt><B>targettype</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the target type to be none any, or player</ul>
 
 <P><tt><B>turnSpeed</B>( <i>Float speed </i>)</tt><BR>
 <ul>Sets the turret's turn speed</ul>
@@ -6947,10 +6997,10 @@ Location values:<BR>
 <P><tt><B>canuse</B>( <i>Entity entity </i>)</tt><BR>
 <ul>Returns 1 if passed entity can 'use' this vehicle.</ul>
 
-<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
+<P><tt><B>collisionent</B></tt><BR>
 <ul>Gets the Collision Entity</ul>
 
-<P><tt><B>collisionent</B></tt><BR>
+<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
 <ul>Gets the Collision Entity</ul>
 
 <P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
@@ -7233,6 +7283,9 @@ Location values:<BR>
 16 LCalf<BR>
 17 LFoot<BR>
 </ul>
+
+<P><tt><B>owner</B></tt><BR>
+<ul>owner</ul>
 </BLOCKQUOTE>
 
 <h2> <a name="VehicleHalfTrack">VehicleHalfTrack (<i>VehicleHalfTrack</i>)</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
@@ -7348,12 +7401,12 @@ Location values:<BR>
 <P><tt><B>aimtolerance</B>( <i>Vector caps </i>)</tt><BR>
 <ul>Sets a tolerance for the angles.</ul>
 
-<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
-<ul>Sets the Collision Entity</ul>
-
 <P><tt><B>collisionent</B></tt><BR>
 <ul>Gets the Collision Entity</ul>
 
+<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Sets the Collision Entity</ul>
+
 <P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
 <ul>general damage event used by all entities<BR>
 <BR>
@@ -8114,12 +8167,12 @@ Location values:<BR>
 <P><tt><B>farclipoverride</B>( <i>Float farclipoverride </i>)</tt><BR>
 <ul>Override the min config default for the far clip distance</ul>
 
-<P><tt><B>farplane</B></tt><BR>
-<ul>Get the distance of the far clipping plane</ul>
-
 <P><tt><B>farplane</B>( <i>Float farplaneDistance </i>)</tt><BR>
 <ul>Set the distance of the far clipping plane</ul>
 
+<P><tt><B>farplane</B></tt><BR>
+<ul>Get the distance of the far clipping plane</ul>
+
 <P><tt><B>farplane</B>( <i>Float farplaneDistance </i>)</tt><BR>
 <ul>Set the distance of the far clipping plane</ul>
 
@@ -8129,21 +8182,21 @@ Location values:<BR>
 <P><tt><B>farplane_bias</B>( <i>Float farplaneDistanceBias </i>)</tt><BR>
 <ul>Set the distance bias of the far clipping plane</ul>
 
-<P><tt><B>farplane_bias</B></tt><BR>
-<ul>Get the distance bias of the far clipping plane</ul>
-
 <P><tt><B>farplane_bias</B>( <i>Float farplaneDistanceBias </i>)</tt><BR>
 <ul>Set the distance bias of the far clipping plane</ul>
 
+<P><tt><B>farplane_bias</B></tt><BR>
+<ul>Get the distance bias of the far clipping plane</ul>
+
+<P><tt><B>farplane_color</B>( <i>Vector farplaneColor </i>)</tt><BR>
+<ul>Set the color of the far clipping plane fog</ul>
+
+<P><tt><B>farplane_color</B>( <i>Vector farplaneColor </i>)</tt><BR>
+<ul>Set the color of the far clipping plane fog</ul>
+
 <P><tt><B>farplane_color</B></tt><BR>
 <ul>Get the color of the far clipping plane fog</ul>
 
-<P><tt><B>farplane_color</B>( <i>Vector farplaneColor </i>)</tt><BR>
-<ul>Set the color of the far clipping plane fog</ul>
-
-<P><tt><B>farplane_color</B>( <i>Vector farplaneColor </i>)</tt><BR>
-<ul>Set the color of the far clipping plane fog</ul>
-
 <P><tt><B>farplane_cull</B>( <i>Integer farplaneCull </i>)</tt><BR>
 <ul>Whether or not the far clipping plane should cull things out of the world<BR>
 0 - no cull<BR>
@@ -8208,7 +8261,7 @@ Location values:<BR>
 <ul>Set the watercolor screen blend</ul>
 </BLOCKQUOTE>
 <H2>
-189 Game Module Classes.<BR>2154 Game Module Events.
+191 Game Module Classes.<BR>2169 Game Module Events.
 </H2>
 </BODY>
 </HTML>

From 010a5ffc7484c8cc8774db72b58125c51697cd14 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 16:21:56 +0200
Subject: [PATCH 0715/2040] Mark entities as missing until they are received

This fixes a bug where the plane sound in t1l1 would stop immediately because the entity isn't received at this point
---
 code/client/snd_local_new.h    |  2 ++
 code/client/snd_openal_new.cpp | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index ffeeb94b..4636ccbb 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -143,6 +143,8 @@ enum channel_flags_t {
     CHANNEL_FLAG_NO_ENTITY      = 32,
     CHANNEL_FLAG_PAUSED         = 64,
     CHANNEL_FLAG_LOOPING        = 128,
+    // Added in OPM
+    CHANNEL_FLAG_MISSING_ENT    = 256,
 };
 
 enum sfx_flags_t {
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index abb47697..cbb279da 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -1387,6 +1387,13 @@ static void S_OPENAL_Start2DSound(
             if (bSupportWaitTillSoundDone) {
                 pChannel->iTime = 0;
             }
+
+            if (s_entity[iEntNum].time < pChannel->iTime) {
+                // Fixed in OPM
+                //  Not sure if it's the real solution, but script_origin entities are usually
+                //  never sent to client so the sound will immediately get stopped
+                pChannel->iFlags |= CHANNEL_FLAG_MISSING_ENT;
+            }
         } else {
             VectorClear(pChannel->vOrigin);
             pChannel->iTime = 0;
@@ -1573,7 +1580,7 @@ void S_OPENAL_StartSound(
                 // Fixed in OPM
                 //  Not sure if it's the real solution, but script_origin entities are usually
                 //  never sent to client so the sound will immediately get stopped
-                pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
+                pChannel->iFlags |= CHANNEL_FLAG_MISSING_ENT;
             }
         } else {
             VectorClear(pChannel->vOrigin);
@@ -2346,11 +2353,13 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
         } else {
             if (s_entity[pChannel->iEntNum].time < pChannel->iTime) {
                 VectorCopy(pChannel->vOrigin, vOrigin);
-                if (!(pChannel->iFlags & CHANNEL_FLAG_LOOPING)) {
+                if (!(pChannel->iFlags & CHANNEL_FLAG_LOOPING) && !(pChannel->iFlags & (CHANNEL_FLAG_MISSING_ENT))) {
                     pChannel->end_sample();
                     continue;
                 }
             } else {
+                pChannel->iFlags &= ~CHANNEL_FLAG_MISSING_ENT;
+
                 VectorCopy(s_entity[pChannel->iEntNum].position, vEntOrigin);
                 VectorCopy(vEntOrigin, vOrigin);
                 VectorCopy(vOrigin, pChannel->vOrigin);

From 96d16bcbc1d9f0dfae31d6535ecaf1ff19c9f31c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 16:46:24 +0200
Subject: [PATCH 0716/2040] Correctly check the max yaw offset in
 AI_CanTarget()

This caused AI to exit turrets immediately
---
 code/fgame/weapturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 378731aa..142d87c1 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -778,7 +778,7 @@ bool TurretGun::AI_CanTarget(const vec3_t pos)
     yawCap = AngleSubtract(vAngles[1], m_fStartYaw);
     if (yawCap > m_fMaxYawOffset) {
         return false;
-    } else if (yawCap < m_fMaxYawOffset) {
+    } else if (yawCap < -m_fMaxYawOffset) {
         return false;
     }
 

From e5aee8d206fe82a801a15db5908bf1e264b86d7c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 16:51:41 +0200
Subject: [PATCH 0717/2040] Fix the MG42 fire delay being too slow by default
 for AIs

---
 code/fgame/weapturret.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 142d87c1..9dafcdbe 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1265,14 +1265,14 @@ void TurretGun::AI_DoFiring()
         // Added in OPM
         //  default values if not set
         maxBurstTime = minBurstTime = 0.001f;
-        maxBurstDelay = minBurstDelay = fire_delay[FIRE_PRIMARY];
+        maxBurstDelay = minBurstDelay = fire_delay[FIRE_PRIMARY] / 10.f;
     }
 
     if (m_iFiring == 1) {
-        if (maxBurstTime > 0) {
+        if (m_fMaxBurstTime > 0) {
             if (m_fFireToggleTime < level.time) {
                 m_iFiring         = 4;
-                m_fFireToggleTime = level.time + minBurstTime + (maxBurstTime - minBurstTime) * random();
+                m_fFireToggleTime = level.time + m_fMinBurstTime + (m_fMaxBurstTime - m_fMinBurstTime) * random();
             }
         } else {
             m_iFiring = 4;
@@ -1280,10 +1280,10 @@ void TurretGun::AI_DoFiring()
     } else if (m_iFiring == 4) {
         Fire(FIRE_PRIMARY);
 
-        if (maxBurstTime > 0) {
+        if (m_fMaxBurstTime > 0) {
             if (m_fFireToggleTime < level.time) {
                 m_iFiring         = 1;
-                m_fFireToggleTime = level.time + minBurstDelay + (maxBurstDelay - minBurstDelay) * random();
+                m_fFireToggleTime = level.time + m_fMinBurstDelay + (m_fMaxBurstDelay - m_fMinBurstDelay) * random();
             }
         }
     }
@@ -1643,7 +1643,7 @@ void TurretGun::P_EventDoJitter(Event *ev)
 
 void TurretGun::AI_EventBurstFireSettings(Event *ev)
 {
-    if (ev->NumArgs() <= 3) {
+    if (ev->NumArgs() < 4) {
         return;
     }
 

From f3222fc36a8e5e3afde2ab1b9afed1df5ebacda2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 17:16:09 +0200
Subject: [PATCH 0718/2040] Set AI angles only if they don't have an enemy,
 otherwise let the AI set their angles

This prevented actors from attacking correctly because the AI cover target state expects the AI to 100% stare at the enemy and the vehicle would keep changing the AI angles
---
 code/fgame/vehicle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 6c583114..7e819af9 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6008,7 +6008,7 @@ void Vehicle::UpdatePassengerSlot(int iSlot)
         Passengers[iSlot].ent->avelocity = avelocity;
         Passengers[iSlot].ent->velocity  = velocity;
 
-        if (!Passengers[iSlot].ent->IsSubclassOfActor() || ((Actor *)Passengers[iSlot].ent.Pointer())->m_Enemy) {
+        if (!Passengers[iSlot].ent->IsSubclassOfActor() || !((Actor *)Passengers[iSlot].ent.Pointer())->m_Enemy) {
             Vector newAngles;
 
             MatrixToEulerAngles(orient.axis, newAngles);

From a9b8cdce64e5d2c561f177dbc2a9a79ae899fe38 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:10:16 +0200
Subject: [PATCH 0719/2040] Only print the long word error in debug mode

---
 code/client/cl_uiview3d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 51efab8f..07daee37 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -314,7 +314,7 @@ void View3D::DrawSubtitleOverlay(void)
                 if (total > maxY) {
                     total = 0;
                     if (end < start) {
-                        Com_Printf("ERROR - word longer than possible line\n");
+                        Com_DPrintf("ERROR - word longer than possible line\n");
                         break;
                     }
 

From 981d72ac5a843438e09ec2a4dd9df3c21475dc6b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:26:42 +0200
Subject: [PATCH 0720/2040] Add assertions to check for invalid path distance

---
 code/fgame/actorpath.cpp |  2 ++
 code/fgame/navigate.cpp  | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/fgame/actorpath.cpp b/code/fgame/actorpath.cpp
index 1be838e8..0c90e846 100644
--- a/code/fgame/actorpath.cpp
+++ b/code/fgame/actorpath.cpp
@@ -399,6 +399,7 @@ void ActorPath::UpdatePos(float *origin, float fNodeRadius)
         m_pathpos->point[2] = m_pathpos->point[2] * s + current_path->point[2] * t;
 
         current_path->dist *= s;
+        assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
 
         m_Side = true;
     } else {
@@ -457,6 +458,7 @@ void ActorPath::Shorten(float fDistRemove)
     //  This is a bug in mohaa as it can write past the end of the class instance
     //m_path->point[2] += m_path->dir[2] * -fDistRemove;
     m_path->dist -= fDistRemove;
+    assert(m_path->dist > -1e+07 && m_path->dist < 1e+07);
 }
 
 PathInfo *ActorPath::StartNode(void) const
diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 887bc04e..be8d3fde 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -148,6 +148,7 @@ PathInfo *PathSearch::GeneratePath(PathInfo *path)
             VectorCopy2D(pathway->dir, current_path->dir);
             current_path->dist      = pathway->dist;
             current_path->bAccurate = true;
+            assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
             current_path++;
         }
 
@@ -158,6 +159,7 @@ PathInfo *PathSearch::GeneratePath(PathInfo *path)
                 VectorCopy(pathway->pos2, current_path->point);
                 VectorCopy2D(pathway->dir, current_path->dir);
                 current_path->dist      = pathway->dist;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
                 current_path->bAccurate = true;
                 current_path++;
             }
@@ -166,6 +168,7 @@ PathInfo *PathSearch::GeneratePath(PathInfo *path)
         VectorCopy(pathway->pos1, current_path->point);
         VectorCopy2D(path_startdir, current_path->dir);
         current_path->dist = Node->g;
+        assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
     } else {
         VectorCopy2D(path_totaldir, current_path->dir);
         path->dist = Node->h;
@@ -214,6 +217,7 @@ PathInfo *PathSearch::GeneratePathNear(PathInfo *path)
                 VectorCopy2D(pathway->dir, current_path->dir);
                 current_path->dist      = pathway->dist;
                 current_path->bAccurate = true;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
                 current_path++;
             }
         }
@@ -252,11 +256,12 @@ PathInfo *PathSearch::GeneratePathAway(PathInfo *path)
         pathway = &ParentNode->Child[Node->pathway];
 
         if (pathway->dist) {
-            VectorCopy(pathway->pos2, path->point);
-            VectorCopy2D(pathway->dir, path->dir);
-            path->dist = pathway->dist;
+            VectorCopy(pathway->pos2, current_path->point);
+            VectorCopy2D(pathway->dir, current_path->dir);
+            current_path->dist = pathway->dist;
 
             current_path->bAccurate = true;
+            assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
             current_path++;
         }
 
@@ -268,6 +273,7 @@ PathInfo *PathSearch::GeneratePathAway(PathInfo *path)
                 VectorCopy2D(pathway->dir, current_path->dir);
                 current_path->dist      = pathway->dist;
                 current_path->bAccurate = true;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
                 current_path++;
             }
         }

From 5baf5bccf2f86c7634de1ef90d0da911b971deb5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:43:38 +0200
Subject: [PATCH 0721/2040] Notify scripts when door has closed/opened

---
 code/fgame/doors.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index ddb4bb61..2d746eef 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -578,6 +578,10 @@ void Door::OpenEnd(Event *ev)
     } else {
         StopSound(CHAN_VOICE);
     }
+    
+    // Added in 2.30
+    //  Notify scripts that the door has finished opening
+    Unregister(STRING_DONE);
 
     previous_state = state;
     SetState(STATE_OPEN);
@@ -609,6 +613,10 @@ void Door::CloseEnd(Event *ev)
 
     previous_state = state;
     SetState(STATE_CLOSED);
+
+    // Added in 2.30
+    //  Notify scripts that the door has finished closing
+    Unregister(STRING_DONE);
 }
 
 void Door::Close(Event *ev)

From a9a7c7fdb84ed31b1b39ab74ca70837afd0cbf83 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:43:56 +0200
Subject: [PATCH 0722/2040] Adjust area portal when closing before broadcasting
 ai events

---
 code/fgame/doors.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 2d746eef..c8898238 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -597,6 +597,12 @@ void Door::OpenEnd(Event *ev)
 
 void Door::CloseEnd(Event *ev)
 {
+    // Fixed in 2.0
+    //  Since this version, the area portal state is changed before sound
+    if (master == this) {
+        gi.AdjustAreaPortalState(this->edict, false);
+    }
+
     if (sound_close_end.length() > 1) {
         BroadcastAIEvent();
         Sound(sound_close_end, CHAN_VOICE);
@@ -604,10 +610,6 @@ void Door::CloseEnd(Event *ev)
         StopSound(CHAN_VOICE);
     }
 
-    if (master == this) {
-        gi.AdjustAreaPortalState(this->edict, false);
-    }
-
     setContents(CONTENTS_SOLID);
     setSolidType(SOLID_BSP);
 

From 3e980ed3713ef985b2465a593457a93d947a3f6f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 19:38:05 +0200
Subject: [PATCH 0723/2040] Unset the script goal once the AI reached the point

---
 code/fgame/actor_patrol.cpp | 5 +++++
 code/fgame/actor_runner.cpp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/code/fgame/actor_patrol.cpp b/code/fgame/actor_patrol.cpp
index 233a6d56..bcf9f4ac 100644
--- a/code/fgame/actor_patrol.cpp
+++ b/code/fgame/actor_patrol.cpp
@@ -81,6 +81,11 @@ void Actor::Think_Patrol(void)
     } else if (bMoveInRadius) {
         ClearPatrolCurrentNode();
         SetThinkIdle(THINK_IDLE);
+        // Added in OPM
+        //  Not sure why it was not cleared originally.
+        //  Once you reach your goal, there is no point
+        //  in leaving it set to true
+        m_bScriptGoalValid = false;
 
         parm.movedone = true;
         Unregister(STRING_MOVEDONE);
diff --git a/code/fgame/actor_runner.cpp b/code/fgame/actor_runner.cpp
index 9b98b1c2..d0c906b9 100644
--- a/code/fgame/actor_runner.cpp
+++ b/code/fgame/actor_runner.cpp
@@ -76,6 +76,11 @@ void Actor::Think_Runner(void)
     } else if (bMoveInRadius) {
         ClearPatrolCurrentNode();
         SetThinkIdle(THINK_IDLE);
+        // Added in OPM
+        //  Not sure why it was not cleared originally.
+        //  Once you reach your goal, there is no point
+        //  in leaving it set to true
+        m_bScriptGoalValid = false;
 
         parm.movedone = true;
         Unregister(STRING_MOVEDONE);

From c19bc7e7a208d2873792bddd5eecd92ce5c6b383 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 20:04:02 +0200
Subject: [PATCH 0724/2040] Add comments about new additions from 2.0 and above

---
 code/fgame/actor.cpp | 43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 0bb67474..bfb58f88 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -261,6 +261,8 @@ Event EV_Actor_AnimScript_Noclip
     "Play the noclip animation script",
     EV_NORMAL
 );
+// Added in 2.0
+//====
 Event EV_Actor_AnimScript_Attached
 (
     "animscript_attached",
@@ -270,6 +272,7 @@ Event EV_Actor_AnimScript_Attached
     "Play a noclip animation even when attached",
     EV_NORMAL
 );
+//====
 Event EV_Actor_Reload_mg42
 (
     "reload_mg42",
@@ -918,6 +921,8 @@ Event EV_Actor_GetAlarmNode
     "Gets the name of the alarm node for the actor (must have type set to alarm for effect)",
     EV_GETTER
 );
+// Added in 2.30
+//====
 Event EV_Actor_SetPreAlarmThread
 (
     "prealarmthread",
@@ -936,6 +941,7 @@ Event EV_Actor_SetPreAlarmThread2
     "Sets the name of the pre alarm thread for the actor (must have type set to alarm for effect)",
     EV_SETTER
 );
+//====
 Event EV_Actor_SetAlarmThread
 (
     "alarmthread",
@@ -2181,6 +2187,9 @@ Event EV_Actor_GetBalconyHeight
     "minimum height a balcony guy must fall to do special balcony death",
     EV_GETTER
 );
+//
+// Added in 2.0
+//====
 Event EV_Actor_SetVisibilityThreshold
 (
     "nonvislevel",
@@ -2325,6 +2334,10 @@ Event EV_Actor_GetRunAnimRate
     "Get the rate at which the run animation plays back",
     EV_GETTER
 );
+//====
+//
+// Added in 2.30
+//====
 Event EV_Actor_SetNationality
 (
     "nationality",
@@ -2379,6 +2392,7 @@ Event EV_Actor_CuriousOn
     "Turn on an actor's curious state",
     EV_NORMAL
 );
+//====
 
 CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Entity_Start,                        &Actor::EventStart                        },
@@ -2399,7 +2413,10 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_AnimScript,                    &Actor::EventAnimScript                   },
     {&EV_Actor_AnimScript_Scripted,           &Actor::EventAnimScript_Scripted          },
     {&EV_Actor_AnimScript_Noclip,             &Actor::EventAnimScript_Noclip            },
+    // Added in 2.0
+    //====
     {&EV_Actor_AnimScript_Attached,           &Actor::EventAnimScript_Attached          },
+    //====
     {&EV_Actor_Reload_mg42,                   &Actor::EventReload_mg42                  },
     {&EV_Actor_Dumb,                          &Actor::Dumb                              },
     {&EV_Actor_Physics_On,                    &Actor::PhysicsOn                         },
@@ -2510,8 +2527,11 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_SetAlarmNode,                  &Actor::EventSetAlarmNode                 },
     {&EV_Actor_SetAlarmNode2,                 &Actor::EventSetAlarmNode                 },
     {&EV_Actor_GetAlarmNode,                  &Actor::EventGetAlarmNode                 },
+    // Added in 2.30
+    //====
     {&EV_Actor_SetPreAlarmThread,             &Actor::EventSetPreAlarmThread            },
     {&EV_Actor_SetPreAlarmThread2,            &Actor::EventSetPreAlarmThread            },
+    //====
     {&EV_Actor_SetAlarmThread,                &Actor::EventSetAlarmThread               },
     {&EV_Actor_SetAlarmThread2,               &Actor::EventSetAlarmThread               },
     {&EV_Actor_GetAlarmThread,                &Actor::EventGetAlarmThread               },
@@ -2538,6 +2558,8 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_ShareEnemy,                    &Actor::EventShareEnemy                   },
     {&EV_Actor_ShareGrenade,                  &Actor::EventShareGrenade                 },
     {&EV_Actor_InterruptPoint,                &Actor::EventInterruptPoint               },
+    // Added in 2.0
+    //====
     {&EV_Actor_GetVisibilityThreshold,        &Actor::EventGetVisibilityThreshold       },
     {&EV_Actor_SetVisibilityThreshold,        &Actor::EventSetVisibilityThreshold       },
     {&EV_Actor_SetVisibilityThreshold2,       &Actor::EventSetVisibilityThreshold       },
@@ -2545,6 +2567,7 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_GetSuppressChance,             &Actor::EventGetSuppressChance            },
     {&EV_Actor_SetSuppressChance,             &Actor::EventSetSuppressChance            },
     {&EV_Actor_SetSuppressChance2,            &Actor::EventSetSuppressChance            },
+    //====
     {&EV_Actor_GetPainHandler,                &Actor::EventGetPainHandler               },
     {&EV_Actor_SetPainHandler,                &Actor::EventSetPainHandler               },
     {&EV_Actor_GetDeathHandler,               &Actor::EventGetDeathHandler              },
@@ -2598,10 +2621,12 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_GetMumble,                     &Actor::EventGetMumble                    },
     {&EV_Actor_SetMumble,                     &Actor::EventSetMumble                    },
     {&EV_Actor_SetMumble2,                    &Actor::EventSetMumble                    },
- // FIXME: removed since 2.0?
-  //{&EV_Actor_GetBreathSteam,                &Actor::EventGetBreathSteam                     },
-  //{&EV_Actor_SetBreathSteam,                &Actor::EventSetBreathSteam                     },
-  //{&EV_Actor_SetBreathSteam2,               &Actor::EventSetBreathSteam                     },
+    // Removed in 2.0
+    //====
+    //{&EV_Actor_GetBreathSteam,                &Actor::EventGetBreathSteam                     },
+    //{&EV_Actor_SetBreathSteam,                &Actor::EventSetBreathSteam                     },
+    //{&EV_Actor_SetBreathSteam2,               &Actor::EventSetBreathSteam                     },
+    //====
     {&EV_Actor_CalcGrenadeToss,               &Actor::EventCalcGrenadeToss              },
     {&EV_Actor_CalcGrenadeToss2,              &Actor::EventCalcGrenadeToss              },
     {&EV_Actor_GetNoSurprise,                 &Actor::EventGetNoSurprise                },
@@ -2630,6 +2655,12 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_SetBalconyHeight,              &Actor::EventSetBalconyHeight             },
     {&EV_Actor_SetBalconyHeight2,             &Actor::EventSetBalconyHeight             },
     {&EV_Actor_GetBalconyHeight,              &Actor::EventGetBalconyHeight             },
+    // Removed in 2.0
+    //====
+    //{&EV_CanSee,                              &Actor::CanSee                            },
+    //====
+    // Added in 2.0
+    //====
     {&EV_Actor_SetIgnoreBadPlace,             &Actor::EventSetIgnoreBadPlace            },
     {&EV_Actor_SetIgnoreBadPlace2,            &Actor::EventSetIgnoreBadPlace            },
     {&EV_Actor_GetIgnoreBadPlace,             &Actor::EventGetIgnoreBadPlace            },
@@ -2639,6 +2670,9 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_SetRunAnimRate,                &Actor::EventSetRunAnimRate               },
     {&EV_Actor_SetRunAnimRate2,               &Actor::EventSetRunAnimRate               },
     {&EV_Actor_GetRunAnimRate,                &Actor::EventGetRunAnimRate               },
+    //====
+    // Added in 2.30
+    //====
     {&EV_Stop,                                &Actor::Landed                            },
     {&EV_Actor_SetNationality,                &Actor::SetNationality                    },
     {&EV_Actor_SetNationality2,               &Actor::SetNationality                    },
@@ -2646,6 +2680,7 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     {&EV_Actor_WriteStats,                    &Actor::EventWriteStats                   },
     {&EV_Actor_CuriousOff,                    &Actor::EventCuriousOff                   },
     {&EV_Actor_CuriousOn,                     &Actor::EventCuriousOn                    },
+    //====
     {NULL,                                    NULL                                      }
 };
 

From a9792bd4c353ef39e90132285e5d938c33cbe528 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 20:21:37 +0200
Subject: [PATCH 0725/2040] Add comments above all `actor.cpp` methods

---
 code/fgame/actor.cpp | 856 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 855 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index bfb58f88..121915db 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -3017,7 +3017,6 @@ Actor::~Actor()
 /*
 ===============
 Actor::setContentsSolid
-
 ===============
 */
 void Actor::setContentsSolid(void)
@@ -3025,6 +3024,11 @@ void Actor::setContentsSolid(void)
     setContents(CONTENTS_NOBOTCLIP);
 }
 
+/*
+===============
+Actor::EndStates
+===============
+*/
 void Actor::EndStates(void)
 {
     for (int i = 0; i < NUM_THINKLEVELS; i++) {
@@ -3032,6 +3036,11 @@ void Actor::EndStates(void)
     }
 }
 
+/*
+===============
+Actor::ClearStates
+===============
+*/
 void Actor::ClearStates(void)
 {
     for (int i = 0; i < NUM_THINKSTATES; i++) {
@@ -3039,6 +3048,11 @@ void Actor::ClearStates(void)
     }
 }
 
+/*
+===============
+Actor::ResolveVoiceType
+===============
+*/
 void Actor::ResolveVoiceType(void)
 {
     char validVoice[128];
@@ -3111,6 +3125,11 @@ void Actor::EventStart(Event *ev)
     }
 }
 
+/*
+===============
+Actor::ClearEnemies
+===============
+*/
 void Actor::ClearEnemies(void)
 {
     m_PotentialEnemies.RemoveAll();
@@ -3609,6 +3628,11 @@ void Actor::UpdateBoneControllers(void)
     SetControllerAngles(ARMS_TAG, new_angles);
 }
 
+/*
+===============
+Actor::setOriginEvent
+===============
+*/
 void Actor::setOriginEvent(Vector org)
 {
     float dist;
@@ -4058,6 +4082,11 @@ bool Actor::CanShootEnemy(int iMaxDirtyTime)
     return m_bCanShootEnemy;
 }
 
+/*
+===============
+Actor::FriendlyInLineOfFire
+===============
+*/
 bool Actor::FriendlyInLineOfFire(Entity *other)
 {
     Vector delta;
@@ -4089,6 +4118,11 @@ bool Actor::FriendlyInLineOfFire(Entity *other)
     return false;
 }
 
+/*
+===============
+Actor::VirtualEyePosition
+===============
+*/
 Vector Actor::VirtualEyePosition()
 {
     if (m_pTurret && CurrentThink() == THINK_MACHINEGUNNER) {
@@ -4277,11 +4311,21 @@ void Actor::ShowInfo(float fDot, float fDist)
     }
 }
 
+/*
+===============
+Actor::ThinkName
+===============
+*/
 str Actor::ThinkName(void) const
 {
     return Director.GetString(m_csThinkNames[CurrentThink()]);
 }
 
+/*
+===============
+Actor::ThinkStateName
+===============
+*/
 str Actor::ThinkStateName(void) const
 {
     return Director.GetString(m_csThinkStateNames[m_ThinkState]);
@@ -6224,6 +6268,11 @@ void Actor::EventGetAccuracy(Event *ev)
     ev->AddFloat(mAccuracy * 100.f);
 }
 
+/*
+===============
+Actor::EventSetMinDistance
+===============
+*/
 void Actor::EventSetMinDistance(Event *ev)
 {
     m_fMinDistance = ev->GetFloat(1);
@@ -6241,11 +6290,21 @@ void Actor::EventSetMinDistance(Event *ev)
     m_fMinDistanceSquared = Square(m_fMinDistance);
 }
 
+/*
+===============
+Actor::EventGetMinDistance
+===============
+*/
 void Actor::EventGetMinDistance(Event *ev)
 {
     ev->AddFloat(m_fMinDistance);
 }
 
+/*
+===============
+Actor::EventSetMaxDistance
+===============
+*/
 void Actor::EventSetMaxDistance(Event *ev)
 {
     m_fMaxDistance = ev->GetFloat(1);
@@ -6264,32 +6323,62 @@ void Actor::EventSetMaxDistance(Event *ev)
     m_fMaxDistanceSquared = Square(m_fMaxDistance);
 }
 
+/*
+===============
+Actor::EventGetMaxDistance
+===============
+*/
 void Actor::EventGetMaxDistance(Event *ev)
 {
     ev->AddFloat(m_fMaxDistance);
 }
 
+/*
+===============
+Actor::EventGetLeash
+===============
+*/
 void Actor::EventGetLeash(Event *ev)
 {
     ev->AddFloat(m_fLeash);
 }
 
+/*
+===============
+Actor::EventSetLeash
+===============
+*/
 void Actor::EventSetLeash(Event *ev)
 {
     m_fLeash        = ev->GetFloat(1);
     m_fLeashSquared = Square(m_fLeash);
 }
 
+/*
+===============
+Actor::EventGetInterval
+===============
+*/
 void Actor::EventGetInterval(Event *ev)
 {
     ev->AddFloat(m_fInterval);
 }
 
+/*
+===============
+Actor::EventSetInterval
+===============
+*/
 void Actor::EventSetInterval(Event *ev)
 {
     m_fInterval = ev->GetFloat(1);
 }
 
+/*
+===============
+Actor::EventDistToEnemy
+===============
+*/
 void Actor::EventDistToEnemy(Event *ev)
 {
     if (!m_Enemy) {
@@ -7407,6 +7496,16 @@ void Actor::Think(void)
     Director.Unpause();
 }
 
+/*
+===============
+Actor::CheckUnregister
+
+Notify scripts when the actor has:
+- Finished moving
+- Has a new enemy
+- And/or if the enemy is visible
+===============
+*/
 void Actor::CheckUnregister(void)
 {
     m_bBecomeRunner = false;
@@ -7649,6 +7748,11 @@ void Actor::ClearThinkStates(void)
     }
 }
 
+/*
+===============
+Actor::EventSetAlarmNode
+===============
+*/
 void Actor::EventSetAlarmNode(Event *ev)
 {
     Listener *l = ev->GetListener(1);
@@ -7659,11 +7763,21 @@ void Actor::EventSetAlarmNode(Event *ev)
     m_AlarmNode = static_cast<SimpleEntity *>(l);
 }
 
+/*
+===============
+Actor::EventGetAlarmNode
+===============
+*/
 void Actor::EventGetAlarmNode(Event *ev)
 {
     ev->AddListener(m_AlarmNode);
 }
 
+/*
+===============
+Actor::EventSetPreAlarmThread
+===============
+*/
 void Actor::EventSetPreAlarmThread(Event *ev)
 {
     if (ev->IsFromScript()) {
@@ -7673,6 +7787,11 @@ void Actor::EventSetPreAlarmThread(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventSetAlarmThread
+===============
+*/
 void Actor::EventSetAlarmThread(Event *ev)
 {
     if (ev->IsFromScript()) {
@@ -7682,31 +7801,61 @@ void Actor::EventSetAlarmThread(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetAlarmThread
+===============
+*/
 void Actor::EventGetAlarmThread(Event *ev)
 {
     m_AlarmThread.GetScriptValue(&ev->GetValue());
 }
 
+/*
+===============
+Actor::EventSetSoundAwareness
+===============
+*/
 void Actor::EventSetSoundAwareness(Event *ev)
 {
     m_fSoundAwareness = ev->GetFloat(1);
 }
 
+/*
+===============
+Actor::EventGetSoundAwareness
+===============
+*/
 void Actor::EventGetSoundAwareness(Event *ev)
 {
     ev->AddFloat(m_fSoundAwareness);
 }
 
+/*
+===============
+Actor::EventSetGrenadeAwareness
+===============
+*/
 void Actor::EventSetGrenadeAwareness(Event *ev)
 {
     m_fGrenadeAwareness = ev->GetFloat(1);
 }
 
+/*
+===============
+Actor::EventGetGrenadeAwareness
+===============
+*/
 void Actor::EventGetGrenadeAwareness(Event *ev)
 {
     ev->AddFloat(m_fGrenadeAwareness);
 }
 
+/*
+===============
+Actor::EventSetTypeIdle
+===============
+*/
 void Actor::EventSetTypeIdle(Event *ev)
 {
     bool (*AllowedState)(int state);
@@ -7723,11 +7872,21 @@ void Actor::EventSetTypeIdle(Event *ev)
     SetThinkIdle(think);
 }
 
+/*
+===============
+Actor::EventGetTypeIdle
+===============
+*/
 void Actor::EventGetTypeIdle(Event *ev)
 {
     ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_IDLE]]);
 }
 
+/*
+===============
+Actor::EventSetTypeAttack
+===============
+*/
 void Actor::EventSetTypeAttack(Event *ev)
 {
     bool (*AllowedState)(int state);
@@ -7744,11 +7903,21 @@ void Actor::EventSetTypeAttack(Event *ev)
     SetThink(THINKSTATE_ATTACK, think);
 }
 
+/*
+===============
+Actor::EventGetTypeAttack
+===============
+*/
 void Actor::EventGetTypeAttack(Event *ev)
 {
     ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_ATTACK]]);
 }
 
+/*
+===============
+Actor::EventSetTypeDisguise
+===============
+*/
 void Actor::EventSetTypeDisguise(Event *ev)
 {
     bool (*AllowedState)(int state);
@@ -7765,6 +7934,11 @@ void Actor::EventSetTypeDisguise(Event *ev)
     SetThink(THINKSTATE_DISGUISE, think);
 }
 
+/*
+===============
+Actor::EventSetDisguiseAcceptThread
+===============
+*/
 void Actor::EventSetDisguiseAcceptThread(Event *ev)
 {
     if (ev->IsFromScript()) {
@@ -7774,16 +7948,31 @@ void Actor::EventSetDisguiseAcceptThread(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetDisguiseAcceptThread
+===============
+*/
 void Actor::EventGetDisguiseAcceptThread(Event *ev)
 {
     m_DisguiseAcceptThread.GetScriptValue(&ev->GetValue());
 }
 
+/*
+===============
+Actor::EventGetTypeDisguise
+===============
+*/
 void Actor::EventGetTypeDisguise(Event *ev)
 {
     ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_DISGUISE]]);
 }
 
+/*
+===============
+Actor::EventSetDisguiseLevel
+===============
+*/
 void Actor::EventSetDisguiseLevel(Event *ev)
 {
     m_iDisguiseLevel = ev->GetInteger(1);
@@ -7794,11 +7983,21 @@ void Actor::EventSetDisguiseLevel(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetDisguiseLevel
+===============
+*/
 void Actor::EventGetDisguiseLevel(Event *ev)
 {
     ev->AddInteger(m_iDisguiseLevel);
 }
 
+/*
+===============
+Actor::EventSetTypeGrenade
+===============
+*/
 void Actor::EventSetTypeGrenade(Event *ev)
 {
     bool (*AllowedState)(int state);
@@ -7815,6 +8014,11 @@ void Actor::EventSetTypeGrenade(Event *ev)
     SetThink(THINKSTATE_GRENADE, think);
 }
 
+/*
+===============
+Actor::EventGetTypeGrenade
+===============
+*/
 void Actor::EventGetTypeGrenade(Event *ev)
 {
     ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_GRENADE]]);
@@ -8450,11 +8654,21 @@ bool Actor::PassesTransitionConditions_Idle(void)
     return false;
 }
 
+/*
+===============
+Actor::EventGetRunAnim
+===============
+*/
 void Actor::EventGetRunAnim(Event *ev)
 {
     ev->AddConstString(GetRunAnim());
 }
 
+/*
+===============
+Actor::EventGetWalkAnim
+===============
+*/
 void Actor::EventGetWalkAnim(Event *ev)
 {
     ev->AddConstString(GetWalkAnim());
@@ -8563,32 +8777,62 @@ void Actor::FaceDirectionDuringMotion(vec3_t vLook)
     SetDesiredYaw(yaw);
 }
 
+/*
+===============
+Actor::EventGetAnimName
+===============
+*/
 void Actor::EventGetAnimName(Event *ev)
 {
     ev->AddConstString(m_csAnimName);
 }
 
+/*
+===============
+Actor::EventSetAnimName
+===============
+*/
 void Actor::EventSetAnimName(Event *ev)
 {
     m_csAnimName = ev->GetConstString(1);
 }
 
+/*
+===============
+Actor::EventSetDisguiseRange
+===============
+*/
 void Actor::EventSetDisguiseRange(Event *ev)
 {
     m_fMaxDisguiseDistSquared = ev->GetFloat(1);
     m_fMaxDisguiseDistSquared = Square(m_fMaxDisguiseDistSquared);
 }
 
+/*
+===============
+Actor::EventGetDisguiseRange
+===============
+*/
 void Actor::EventGetDisguiseRange(Event *ev)
 {
     ev->AddFloat(sqrt(m_fMaxDisguiseDistSquared));
 }
 
+/*
+===============
+Actor::EventSetDisguisePeriod
+===============
+*/
 void Actor::EventSetDisguisePeriod(Event *ev)
 {
     m_iDisguisePeriod = ev->GetFloat(1) * 1000 + 0.5;
 }
 
+/*
+===============
+Actor::EventGetDisguisePeriod
+===============
+*/
 void Actor::EventGetDisguisePeriod(Event *ev)
 {
     ev->AddFloat(m_iDisguisePeriod / 1000.0);
@@ -8630,12 +8874,22 @@ void Actor::FaceMotion(void)
     }
 }
 
+/*
+===============
+Actor::ForceAttackPlayer
+===============
+*/
 void Actor::ForceAttackPlayer(void)
 {
     m_PotentialEnemies.ConfirmEnemy(this, static_cast<Sentient *>(G_GetEntity(0)));
     m_bForceAttackPlayer = true;
 }
 
+/*
+===============
+Actor::EventAttackPlayer
+===============
+*/
 void Actor::EventAttackPlayer(Event *ev)
 {
     if (!G_GetEntity(0)) {
@@ -9966,6 +10220,11 @@ void Actor::Grenade_EventFire(Event *ev)
     UseAmmo("grenade", 1);
 }
 
+/*
+===============
+Actor::EventSetTurret
+===============
+*/
 void Actor::EventSetTurret(Event *ev)
 {
     Listener *l = ev->GetListener(1);
@@ -9974,26 +10233,51 @@ void Actor::EventSetTurret(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetTurret
+===============
+*/
 void Actor::EventGetTurret(Event *ev)
 {
     ev->AddListener(m_pTurret);
 }
 
+/*
+===============
+Actor::EventGetAmmoGrenade
+===============
+*/
 void Actor::EventGetAmmoGrenade(Event *ev)
 {
     ev->AddInteger(AmmoCount("grenade"));
 }
 
+/*
+===============
+Actor::EventSetAmmoGrenade
+===============
+*/
 void Actor::EventSetAmmoGrenade(Event *ev)
 {
     GiveAmmo("grenade", ev->GetInteger(1));
 }
 
+/*
+===============
+Actor::EventEnableEnemy
+===============
+*/
 void Actor::EventEnableEnemy(Event *ev)
 {
     m_bDesiredEnableEnemy = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventEnablePain
+===============
+*/
 void Actor::EventEnablePain(Event *ev)
 {
     m_bEnablePain = ev->GetBoolean(1);
@@ -10002,12 +10286,22 @@ void Actor::EventEnablePain(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventActivate
+===============
+*/
 void Actor::EventActivate(Event *ev)
 {
     m_bPatrolWaitTrigger = false;
     Unregister(STRING_TRIGGER);
 }
 
+/*
+===============
+Actor::EventInterruptPoint
+===============
+*/
 void Actor::EventInterruptPoint(Event *ev)
 {
     GlobalFuncs_t *interrupt = &GlobalFuncs[m_Think[m_ThinkLevel]];
@@ -10017,11 +10311,21 @@ void Actor::EventInterruptPoint(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetVisibilityThreshold
+===============
+*/
 void Actor::EventGetVisibilityThreshold(Event *ev)
 {
     ev->AddFloat(m_fVisibilityThreshold);
 }
 
+/*
+===============
+Actor::EventSetVisibilityThreshold
+===============
+*/
 void Actor::EventSetVisibilityThreshold(Event *ev)
 {
     float threshold;
@@ -10036,6 +10340,11 @@ void Actor::EventSetVisibilityThreshold(Event *ev)
     m_fVisibilityThreshold    = threshold;
 }
 
+/*
+===============
+Actor::EventSetDefaultVisibilityThreshold
+===============
+*/
 void Actor::EventSetDefaultVisibilityThreshold(Event *ev)
 {
     float threshold;
@@ -10051,11 +10360,21 @@ void Actor::EventSetDefaultVisibilityThreshold(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetSuppressChance
+===============
+*/
 void Actor::EventGetSuppressChance(Event *ev)
 {
     ev->AddInteger(m_iSuppressChance);
 }
 
+/*
+===============
+Actor::EventSetSuppressChance
+===============
+*/
 void Actor::EventSetSuppressChance(Event *ev)
 {
     m_iSuppressChance = ev->GetInteger(1);
@@ -10084,6 +10403,11 @@ void Actor::EventSetSuppressChance(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventAnimScript
+===============
+*/
 void Actor::EventAnimScript(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10093,6 +10417,11 @@ void Actor::EventAnimScript(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventAnimScript_Scripted
+===============
+*/
 void Actor::EventAnimScript_Scripted(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10102,6 +10431,11 @@ void Actor::EventAnimScript_Scripted(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventAnimScript_Noclip
+===============
+*/
 void Actor::EventAnimScript_Noclip(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10111,6 +10445,11 @@ void Actor::EventAnimScript_Noclip(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventAnimScript_Attached
+===============
+*/
 void Actor::EventAnimScript_Attached(Event *ev)
 {
     m_csAnimScript   = ev->GetConstString(1);
@@ -10120,6 +10459,11 @@ void Actor::EventAnimScript_Attached(Event *ev)
     SetThinkIdle(THINK_ANIM);
 }
 
+/*
+===============
+Actor::EventReload_mg42
+===============
+*/
 void Actor::EventReload_mg42(Event *ev)
 {
     if (m_State != ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
@@ -10132,6 +10476,11 @@ void Actor::EventReload_mg42(Event *ev)
     }
 }
 
+/*
+===============
+Actor::CanMovePathWithLeash
+===============
+*/
 bool Actor::CanMovePathWithLeash(void) const
 {
     vec2_t delta;
@@ -10149,6 +10498,11 @@ bool Actor::CanMovePathWithLeash(void) const
     return true;
 }
 
+/*
+===============
+Actor::MovePathWithLeash
+===============
+*/
 bool Actor::MovePathWithLeash(void)
 {
     if (!CanMovePathWithLeash()) {
@@ -10162,6 +10516,11 @@ bool Actor::MovePathWithLeash(void)
     return true;
 }
 
+/*
+===============
+Actor::GunTarget
+===============
+*/
 Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t forward)
 {
     static cvar_t  *aifSupressScatter = gi.Cvar_Get("g_aiSupressScatter", "2.0", 0);
@@ -10293,6 +10652,11 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     return vPos + error;
 }
 
+/*
+===============
+Actor::setModel
+===============
+*/
 qboolean Actor::setModel(void)
 {
     str      name;
@@ -10328,28 +10692,53 @@ qboolean Actor::setModel(void)
     return success;
 }
 
+/*
+===============
+Actor::EventSetHeadModel
+===============
+*/
 void Actor::EventSetHeadModel(Event *ev)
 {
     m_csHeadModel = ev->GetConstString(1);
     setModel();
 }
 
+/*
+===============
+Actor::EventGetHeadModel
+===============
+*/
 void Actor::EventGetHeadModel(Event *ev)
 {
     ev->AddConstString(m_csHeadModel);
 }
 
+/*
+===============
+Actor::EventSetHeadSkin
+===============
+*/
 void Actor::EventSetHeadSkin(Event *ev)
 {
     m_csHeadSkin = ev->GetConstString(1);
     setModel();
 }
 
+/*
+===============
+Actor::EventGetHeadSkin
+===============
+*/
 void Actor::EventGetHeadSkin(Event *ev)
 {
     ev->AddConstString(m_csHeadSkin);
 }
 
+/*
+===============
+Actor::SetPathWithLeash
+===============
+*/
 void Actor::SetPathWithLeash(Vector vDestPos, const char *description, int iMaxDirtyTime)
 {
     vec2_t vDelta;
@@ -10371,6 +10760,11 @@ void Actor::SetPathWithLeash(Vector vDestPos, const char *description, int iMaxD
     SetPath(vDestPos, description, iMaxDirtyTime, m_vHome, m_fLeashSquared);
 }
 
+/*
+===============
+Actor::SetPathWithLeash
+===============
+*/
 void Actor::SetPathWithLeash(SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime)
 {
     if (!pDestNode) {
@@ -10392,12 +10786,22 @@ void Actor::SetPathWithLeash(SimpleEntity *pDestNode, const char *description, i
     SetPathWithLeash(pDestNode->origin, description, iMaxDirtyTime);
 }
 
+/*
+===============
+Actor::FindPathAwayWithLeash
+===============
+*/
 void Actor::FindPathAwayWithLeash(vec3_t vAwayFrom, vec3_t vDirPreferred, float fMinSafeDist)
 {
     m_Path.FindPathAway(origin, vAwayFrom, vDirPreferred, this, fMinSafeDist, m_vHome, m_fLeashSquared);
     ShortenPathToAvoidSquadMates();
 }
 
+/*
+===============
+Actor::FindPathNearWithLeash
+===============
+*/
 void Actor::FindPathNearWithLeash(vec3_t vNearbyTo, float fCloseDistSquared)
 {
     vec2_t vDelta;
@@ -10463,6 +10867,11 @@ Vector Actor::GetAntiBunchPoint(void)
     }
 }
 
+/*
+===============
+Actor::AutoArchiveModel
+===============
+*/
 bool Actor::AutoArchiveModel(void)
 {
     return false;
@@ -10507,21 +10916,41 @@ void Actor::ResetBodyQueue(void)
     mCurBody = 0;
 }
 
+/*
+===============
+Actor::EventSetNoIdle
+===============
+*/
 void Actor::EventSetNoIdle(Event *ev)
 {
     m_bNoIdleAfterAnim = ev->GetInteger(1);
 }
 
+/*
+===============
+Actor::EventGetNoIdle
+===============
+*/
 void Actor::EventGetNoIdle(Event *ev)
 {
     ev->AddInteger(m_bNoIdleAfterAnim);
 }
 
+/*
+===============
+Actor::EventGetEnemy
+===============
+*/
 void Actor::EventGetEnemy(Event *ev)
 {
     ev->AddListener(m_Enemy);
 }
 
+/*
+===============
+Actor::EventSetMaxNoticeTimeScale
+===============
+*/
 void Actor::EventSetMaxNoticeTimeScale(Event *ev)
 {
     float fScale;
@@ -10535,21 +10964,41 @@ void Actor::EventSetMaxNoticeTimeScale(Event *ev)
     m_fMaxNoticeTimeScale = fScale * 0.01f;
 }
 
+/*
+===============
+Actor::EventGetMaxNoticeTimeScale
+===============
+*/
 void Actor::EventGetMaxNoticeTimeScale(Event *ev)
 {
     ev->AddFloat(m_fMaxNoticeTimeScale * 100);
 }
 
+/*
+===============
+Actor::EventSetFixedLeash
+===============
+*/
 void Actor::EventSetFixedLeash(Event *ev)
 {
     m_bFixedLeash = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventGetFixedLeash
+===============
+*/
 void Actor::EventGetFixedLeash(Event *ev)
 {
     ev->AddInteger(m_bFixedLeash);
 }
 
+/*
+===============
+Actor::Holster
+===============
+*/
 void Actor::Holster(void)
 {
     if (activeWeaponList[WEAPON_MAIN]) {
@@ -10557,6 +11006,11 @@ void Actor::Holster(void)
     }
 }
 
+/*
+===============
+Actor::HolsterOffHand
+===============
+*/
 void Actor::HolsterOffHand(void)
 {
     if (activeWeaponList[WEAPON_OFFHAND]) {
@@ -10564,6 +11018,11 @@ void Actor::HolsterOffHand(void)
     }
 }
 
+/*
+===============
+Actor::Unholster
+===============
+*/
 void Actor::Unholster(void)
 {
     Weapon *weap;
@@ -10577,6 +11036,11 @@ void Actor::Unholster(void)
     }
 }
 
+/*
+===============
+Actor::UnholsterOffHand
+===============
+*/
 void Actor::UnholsterOffHand(void)
 {
     Weapon *weap;
@@ -10590,6 +11054,11 @@ void Actor::UnholsterOffHand(void)
     }
 }
 
+/*
+===============
+Actor::EventHolster
+===============
+*/
 void Actor::EventHolster(Event *ev)
 {
     if (ev->NumArgs() > 0 && ev->GetInteger(1) > 0) {
@@ -10599,6 +11068,11 @@ void Actor::EventHolster(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventUnholster
+===============
+*/
 void Actor::EventUnholster(Event *ev)
 {
     if (ev->NumArgs() > 0 && ev->GetInteger(1) > 0) {
@@ -10608,21 +11082,41 @@ void Actor::EventUnholster(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventIsEnemyVisible
+===============
+*/
 void Actor::EventIsEnemyVisible(Event *ev)
 {
     ev->AddInteger(m_bEnemyVisible);
 }
 
+/*
+===============
+Actor::EventGetEnemyVisibleChangeTime
+===============
+*/
 void Actor::EventGetEnemyVisibleChangeTime(Event *ev)
 {
     ev->AddFloat(m_iEnemyVisibleChangeTime / 100.f);
 }
 
+/*
+===============
+Actor::EventGetLastEnemyVisibleTime
+===============
+*/
 void Actor::EventGetLastEnemyVisibleTime(Event *ev)
 {
     ev->AddFloat(m_iLastEnemyVisibleTime / 100.f);
 }
 
+/*
+===============
+Actor::EventSoundDone
+===============
+*/
 void Actor::EventSoundDone(Event *ev)
 {
     int channelNum;
@@ -10646,6 +11140,11 @@ void Actor::EventSoundDone(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventSound
+===============
+*/
 void Actor::EventSound(Event *ev)
 {
     if (g_gametype->integer == GT_SINGLE_PLAYER || m_Team == TEAM_AMERICAN) {
@@ -10655,6 +11154,11 @@ void Actor::EventSound(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventSetFallHeight
+===============
+*/
 void Actor::EventSetFallHeight(Event *ev)
 {
     float fHeight = ev->GetFloat(1);
@@ -10669,11 +11173,21 @@ void Actor::EventSetFallHeight(Event *ev)
     m_Path.SetFallHeight(fHeight);
 }
 
+/*
+===============
+Actor::EventGetFallHeight
+===============
+*/
 void Actor::EventGetFallHeight(Event *ev)
 {
     ev->AddFloat(m_Path.GetFallHeight());
 }
 
+/*
+===============
+Actor::EventCanMoveTo
+===============
+*/
 void Actor::EventCanMoveTo(Event *ev)
 {
     Vector    vDest;
@@ -10746,6 +11260,11 @@ void Actor::EventCanMoveTo(Event *ev)
     ev->AddInteger(true);
 }
 
+/*
+===============
+Actor::EventMoveDir
+===============
+*/
 void Actor::EventMoveDir(Event *ev)
 {
     vec3_t vDir;
@@ -10769,6 +11288,11 @@ void Actor::EventMoveDir(Event *ev)
     ev->AddVector(vDir);
 }
 
+/*
+===============
+Actor::EventIntervalDir
+===============
+*/
 void Actor::EventIntervalDir(Event *ev)
 {
     if (level.inttime >= m_iIntervalDirTime + 250) {
@@ -10786,17 +11310,32 @@ void Actor::EventIntervalDir(Event *ev)
     ev->AddVector(m_vIntervalDir);
 }
 
+/*
+===============
+Actor::EventResetLeash
+===============
+*/
 void Actor::EventResetLeash(Event *ev)
 {
     m_vHome      = origin;
     m_pTetherEnt = NULL;
 }
 
+/*
+===============
+Actor::EventTether
+===============
+*/
 void Actor::EventTether(Event *ev)
 {
     m_pTetherEnt = ev->GetSimpleEntity(1);
 }
 
+/*
+===============
+Actor::ShortenPathToAttack
+===============
+*/
 bool Actor::ShortenPathToAttack(float fMinDist)
 {
     float     fMinDistSquared;
@@ -10826,6 +11365,11 @@ bool Actor::ShortenPathToAttack(float fMinDist)
     return false;
 }
 
+/*
+===============
+Actor::StrafeToAttack
+===============
+*/
 void Actor::StrafeToAttack(float fDist, vec3_t vDir)
 {
     static const vec3_t mins = {-16, -16, 16};
@@ -10869,28 +11413,53 @@ void Actor::StrafeToAttack(float fDist, vec3_t vDir)
     SetPathWithLeash(vSpot, NULL, 0);
 }
 
+/*
+===============
+Actor::EventGetThinkState
+===============
+*/
 void Actor::EventGetThinkState(Event *ev)
 {
     ev->AddConstString(m_csThinkStateNames[m_ThinkState]);
 }
 
+/*
+===============
+Actor::EventGetEnemyShareRange
+===============
+*/
 void Actor::EventGetEnemyShareRange(Event *ev)
 {
     ev->AddFloat(sqrt(m_fMaxShareDistSquared));
 }
 
+/*
+===============
+Actor::EventSetEnemyShareRange
+===============
+*/
 void Actor::EventSetEnemyShareRange(Event *ev)
 {
     float fLength          = ev->GetFloat(1);
     m_fMaxShareDistSquared = Square(fLength);
 }
 
+/*
+===============
+Actor::GetVoiceType
+===============
+*/
 void Actor::GetVoiceType(Event *ev)
 {
     //voice type in actor is a char.
     ev->AddString(va("%c", mVoiceType));
 }
 
+/*
+===============
+Actor::SetVoiceType
+===============
+*/
 void Actor::SetVoiceType(Event *ev)
 {
     //voice type in actor is a char.
@@ -10903,6 +11472,11 @@ void Actor::SetVoiceType(Event *ev)
     }
 }
 
+/*
+===============
+Actor::FindSniperNodeAndSetPath
+===============
+*/
 PathNode *Actor::FindSniperNodeAndSetPath(bool *pbTryAgain)
 {
     PathNode *pSniperNode;
@@ -10932,6 +11506,11 @@ PathNode *Actor::FindSniperNodeAndSetPath(bool *pbTryAgain)
     return pSniperNode;
 }
 
+/*
+===============
+Actor::Remove
+===============
+*/
 void Actor::Remove(Event *ev)
 {
     EndStates();
@@ -10945,21 +11524,41 @@ void Actor::Remove(Event *ev)
     Delete();
 }
 
+/*
+===============
+Actor::EventGetKickDir
+===============
+*/
 void Actor::EventGetKickDir(Event *ev)
 {
     ev->AddVector(m_vKickDir);
 }
 
+/*
+===============
+Actor::EventGetNoLongPain
+===============
+*/
 void Actor::EventGetNoLongPain(Event *ev)
 {
     ev->AddInteger(m_bNoLongPain || m_Team == TEAM_AMERICAN);
 }
 
+/*
+===============
+Actor::EventSetNoLongPain
+===============
+*/
 void Actor::EventSetNoLongPain(Event *ev)
 {
     m_bNoLongPain = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::DontFaceWall
+===============
+*/
 void Actor::DontFaceWall(void)
 {
     trace_t   trace;
@@ -11060,51 +11659,101 @@ void Actor::DontFaceWall(void)
     m_fDfwDerivedYaw = m_DesiredYaw;
 }
 
+/*
+===============
+Actor::IsVoidState
+===============
+*/
 bool Actor::IsVoidState(int state)
 {
     return true;
 }
 
+/*
+===============
+Actor::IsIdleState
+===============
+*/
 bool Actor::IsIdleState(int state)
 {
     return state == THINKSTATE_IDLE;
 }
 
+/*
+===============
+Actor::IsCuriousState
+===============
+*/
 bool Actor::IsCuriousState(int state)
 {
     return state == THINKSTATE_CURIOUS;
 }
 
+/*
+===============
+Actor::IsDisguiseState
+===============
+*/
 bool Actor::IsDisguiseState(int state)
 {
     return state == THINKSTATE_DISGUISE;
 }
 
+/*
+===============
+Actor::IsAttackState
+===============
+*/
 bool Actor::IsAttackState(int state)
 {
     return state == THINKSTATE_ATTACK;
 }
 
+/*
+===============
+Actor::IsGrenadeState
+===============
+*/
 bool Actor::IsGrenadeState(int state)
 {
     return state == THINKSTATE_GRENADE;
 }
 
+/*
+===============
+Actor::IsBadPlaceState
+===============
+*/
 bool Actor::IsBadPlaceState(int state)
 {
     return state == THINKSTATE_BADPLACE;
 }
 
+/*
+===============
+Actor::IsPainState
+===============
+*/
 bool Actor::IsPainState(int state)
 {
     return state == THINKSTATE_PAIN;
 }
 
+/*
+===============
+Actor::IsKilledState
+===============
+*/
 bool Actor::IsKilledState(int state)
 {
     return state == THINKSTATE_KILLED;
 }
 
+/*
+===============
+Actor::IsNoClipState
+===============
+*/
 bool Actor::IsNoClipState(int state)
 {
     return state == THINKSTATE_NOCLIP;
@@ -11122,6 +11771,11 @@ void Actor::InitVoid(GlobalFuncs_t *func)
     func->IsState = &Actor::IsVoidState;
 }
 
+/*
+===============
+Actor::BecomeCorpse
+===============
+*/
 void Actor::BecomeCorpse(void)
 {
     AddToBodyQue();
@@ -11144,16 +11798,31 @@ void Actor::BecomeCorpse(void)
     PostEvent(EV_DeathSinkStart, 10);
 }
 
+/*
+===============
+Actor::EventGetFavoriteEnemy
+===============
+*/
 void Actor::EventGetFavoriteEnemy(Event *ev)
 {
     ev->AddEntity(m_FavoriteEnemy);
 }
 
+/*
+===============
+Actor::EventSetFavoriteEnemy
+===============
+*/
 void Actor::EventSetFavoriteEnemy(Event *ev)
 {
     m_FavoriteEnemy = static_cast<Sentient *>(ev->GetEntity(1));
 }
 
+/*
+===============
+Actor::EventFindEnemy
+===============
+*/
 void Actor::EventFindEnemy(Event *ev)
 {
     if (level.inttime > m_iEnemyCheckTime + 200) {
@@ -11163,26 +11832,51 @@ void Actor::EventFindEnemy(Event *ev)
     ev->AddEntity(m_Enemy);
 }
 
+/*
+===============
+Actor::EventGetMumble
+===============
+*/
 void Actor::EventGetMumble(Event *ev)
 {
     ev->AddInteger(m_bMumble);
 }
 
+/*
+===============
+Actor::EventSetMumble
+===============
+*/
 void Actor::EventSetMumble(Event *ev)
 {
     m_bMumble = ev->GetInteger(1) != false;
 }
 
+/*
+===============
+Actor::EventGetBreathSteam
+===============
+*/
 void Actor::EventGetBreathSteam(Event *ev)
 {
     ev->AddInteger(m_bBreathSteam);
 }
 
+/*
+===============
+Actor::EventSetBreathSteam
+===============
+*/
 void Actor::EventSetBreathSteam(Event *ev)
 {
     m_bBreathSteam = ev->GetInteger(1) != false;
 }
 
+/*
+===============
+Actor::EventSetNextBreathTime
+===============
+*/
 void Actor::EventSetNextBreathTime(Event *ev)
 {
     ScriptVariable var;
@@ -11195,6 +11889,11 @@ void Actor::EventSetNextBreathTime(Event *ev)
     thread->Execute(&var, 1);
 }
 
+/*
+===============
+Actor::EventCalcGrenadeToss2
+===============
+*/
 void Actor::EventCalcGrenadeToss2(Event *ev)
 {
     Vector vTargetPos;
@@ -11253,6 +11952,11 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     SetDesiredYawDir(m_vGrenadeVel);
 }
 
+/*
+===============
+Actor::EventCalcGrenadeToss
+===============
+*/
 void Actor::EventCalcGrenadeToss(Event *ev)
 {
     bool bSuccess;
@@ -11287,36 +11991,71 @@ void Actor::EventCalcGrenadeToss(Event *ev)
     SetDesiredYawDir(m_vGrenadeVel);
 }
 
+/*
+===============
+Actor::EventGetNoSurprise
+===============
+*/
 void Actor::EventGetNoSurprise(Event *ev)
 {
     ev->AddInteger(m_bNoSurprise);
 }
 
+/*
+===============
+Actor::EventSetNoSurprise
+===============
+*/
 void Actor::EventSetNoSurprise(Event *ev)
 {
     m_bNoSurprise = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventGetSilent
+===============
+*/
 void Actor::EventGetSilent(Event *ev)
 {
     ev->AddInteger(m_bSilent);
 }
 
+/*
+===============
+Actor::EventSetSilent
+===============
+*/
 void Actor::EventSetSilent(Event *ev)
 {
     m_bSilent = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventGetAvoidPlayer
+===============
+*/
 void Actor::EventGetAvoidPlayer(Event *ev)
 {
     ev->AddInteger(m_bAutoAvoidPlayer);
 }
 
+/*
+===============
+Actor::EventSetAvoidPlayer
+===============
+*/
 void Actor::EventSetAvoidPlayer(Event *ev)
 {
     m_bAutoAvoidPlayer = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::PathnodeClaimRevoked
+===============
+*/
 void Actor::PathnodeClaimRevoked(PathNode *node)
 {
     int iThinkLevel;
@@ -11333,6 +12072,11 @@ void Actor::PathnodeClaimRevoked(PathNode *node)
     m_pCoverNode = NULL;
 }
 
+/*
+===============
+Actor::SetPathToNotBlockSentient
+===============
+*/
 void Actor::SetPathToNotBlockSentient(Sentient *pOther)
 {
     Vector vAway;
@@ -11446,6 +12190,11 @@ void Actor::LookAround(float fFovAdd)
     }
 }
 
+/*
+===============
+Actor::EventGetLookAroundAngle
+===============
+*/
 void Actor::EventGetLookAroundAngle(Event *ev)
 {
     // Fixed in OPM
@@ -11455,6 +12204,11 @@ void Actor::EventGetLookAroundAngle(Event *ev)
     ev->AddFloat(m_fLookAroundFov);
 }
 
+/*
+===============
+Actor::EventSetLookAroundAngle
+===============
+*/
 void Actor::EventSetLookAroundAngle(Event *ev)
 {
     float fLookAroundFov;
@@ -11467,6 +12221,11 @@ void Actor::EventSetLookAroundAngle(Event *ev)
     m_fLookAroundFov = fLookAroundFov;
 }
 
+/*
+===============
+Actor::DumpAnimInfo
+===============
+*/
 void Actor::DumpAnimInfo(void)
 {
     vec3_t LocalLookAngles;
@@ -11602,12 +12361,22 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
     );
 }
 
+/*
+===============
+Actor::EventSetMoveDoneRadius
+===============
+*/
 void Actor::EventSetMoveDoneRadius(Event *ev)
 {
     float radius             = ev->GetFloat(1);
     m_fMoveDoneRadiusSquared = Square(radius);
 }
 
+/*
+===============
+Actor::EventGetMoveDoneRadius
+===============
+*/
 void Actor::EventGetMoveDoneRadius(Event *ev)
 {
     ev->AddFloat(sqrtf(m_fMoveDoneRadiusSquared));
@@ -11633,11 +12402,21 @@ void Actor::StoppedWaitFor(const_str name, bool bDeleting)
     g_iInThinks--;
 }
 
+/*
+===============
+Actor::EventHasCompleteLookahead
+===============
+*/
 void Actor::EventHasCompleteLookahead(Event *ev)
 {
     ev->AddInteger(PathExists() && PathHasCompleteLookahead());
 }
 
+/*
+===============
+Actor::EventPathDist
+===============
+*/
 void Actor::EventPathDist(Event *ev)
 {
     if (!PathExists() || PathComplete()) {
@@ -11648,6 +12427,11 @@ void Actor::EventPathDist(Event *ev)
     ev->AddFloat(PathDist());
 }
 
+/*
+===============
+Actor::EventCanShootEnemyFrom
+===============
+*/
 void Actor::EventCanShootEnemyFrom(Event *ev)
 {
     if (!m_Enemy) {
@@ -11658,26 +12442,51 @@ void Actor::EventCanShootEnemyFrom(Event *ev)
     ev->AddInteger(CanSeeFrom(ev->GetVector(1), m_Enemy));
 }
 
+/*
+===============
+Actor::EventSetInReload
+===============
+*/
 void Actor::EventSetInReload(Event *ev)
 {
     m_bInReload = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventGetInReload
+===============
+*/
 void Actor::EventGetInReload(Event *ev)
 {
     ev->AddInteger(m_bInReload);
 }
 
+/*
+===============
+Actor::EventSetReloadCover
+===============
+*/
 void Actor::EventSetReloadCover(Event *ev)
 {
     m_bNeedReload = ev->GetBoolean(1);
 }
 
+/*
+===============
+Actor::EventBreakSpecial
+===============
+*/
 void Actor::EventBreakSpecial(Event *ev)
 {
     mbBreakSpecialAttack = true;
 }
 
+/*
+===============
+Actor::EventCanShoot
+===============
+*/
 void Actor::EventCanShoot(Event *ev)
 {
     Entity *ent;
@@ -11691,11 +12500,21 @@ void Actor::EventCanShoot(Event *ev)
     ev->AddInteger(CanShoot(ent));
 }
 
+/*
+===============
+Actor::EventSetBalconyHeight
+===============
+*/
 void Actor::EventSetBalconyHeight(Event *ev)
 {
     m_fBalconyHeight = ev->GetFloat(1);
 }
 
+/*
+===============
+Actor::EventSetIgnoreBadPlace
+===============
+*/
 void Actor::EventSetIgnoreBadPlace(Event *ev)
 {
     if (m_bIgnoreBadPlace == ev->GetBoolean(1)) {
@@ -11709,16 +12528,31 @@ void Actor::EventSetIgnoreBadPlace(Event *ev)
     }
 }
 
+/*
+===============
+Actor::EventGetIgnoreBadPlace
+===============
+*/
 void Actor::EventGetIgnoreBadPlace(Event *ev)
 {
     ev->AddInteger(m_bIgnoreBadPlace);
 }
 
+/*
+===============
+Actor::EventGetBalconyHeight
+===============
+*/
 void Actor::EventGetBalconyHeight(Event *ev)
 {
     ev->AddFloat(m_fBalconyHeight);
 }
 
+/*
+===============
+Actor::BecomeTurretGuy
+===============
+*/
 void Actor::BecomeTurretGuy(void)
 {
     SetThinkIdle(THINK_IDLE);
@@ -11800,6 +12634,11 @@ void Actor::Landed(Event *ev)
     setMoveType(MOVETYPE_NONE);
 }
 
+/*
+===============
+Actor::IsOnFloor
+===============
+*/
 bool Actor::IsOnFloor(void)
 {
     str name = AnimName(0);
@@ -11920,10 +12759,25 @@ void Actor::EventCuriousOn(Event *ev)
     m_bIsCurious = true;
 }
 
+/*
+===============
+Actor::EventSetDestIdle
+===============
+*/
 void Actor::EventSetDestIdle(Event *ev) {}
 
+/*
+===============
+Actor::EventSetDestIdle2
+===============
+*/
 void Actor::EventSetDestIdle2(Event *ev) {}
 
+/*
+===============
+Actor::IsDisabled
+===============
+*/
 bool Actor::IsDisabled() const
 {
     return !m_bDoAI;

From 595e6fcb8bfb7e03acaab5c7e32ee9dda38e7acc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 20:27:15 +0200
Subject: [PATCH 0726/2040] Fix AI firing forever in mohaa

---
 code/fgame/weapturret.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 9dafcdbe..35cbc655 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1249,7 +1249,11 @@ void TurretGun::AI_DoFiring()
         // Removed in 2.0
         //  The fire delay is always constant on 1.11 and below
         //
-        if (ReadyToFire(FIRE_PRIMARY)) {
+        if (m_iFiring == 1) {
+            m_iFiring = 4;
+        }
+
+        if (IsFiring() && ReadyToFire(FIRE_PRIMARY)) {
             Fire(FIRE_PRIMARY);
         }
 

From 7852929da3fe6a5f2a70c4392b0b6e24f4149aa8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 20:38:11 +0200
Subject: [PATCH 0727/2040] Fix the music replaying when loading from save
 after it ended

---
 code/client/snd_openal_new.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index cbb279da..5c6b4ec6 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2566,6 +2566,9 @@ S_OPENAL_GetMusicFilename
 */
 const char *S_OPENAL_GetMusicFilename()
 {
+    if (!openal.chan_trig_music.is_playing()) {
+        return "";
+    }
     return openal.tm_filename;
 }
 

From 89d805ab9223bfdb94ecc1fb7168044473a9546f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 20:42:19 +0200
Subject: [PATCH 0728/2040] Fix the FireDelay always returning for FIRE_PRIMARY

---
 code/fgame/weapturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 35cbc655..00fc3fae 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1961,7 +1961,7 @@ float TurretGun::FireDelay(firemode_t mode)
         }
     }
 
-    return fire_delay[FIRE_PRIMARY];
+    return fire_delay[mode];
 }
 
 void TurretGun::SetFireDelay(Event *ev)

From fb875501f0e64e29b10065449615e89e437c6061 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Sep 2024 23:34:57 +0200
Subject: [PATCH 0729/2040] Fix UI library forcing latched variables

This caused issues when setting render variables
---
 code/client/cl_ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index fff374af..5463e8bc 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3679,7 +3679,7 @@ void CL_FillUIImports(void)
     uii.Cvar_GetString              = CvarGetForUI;
     uii.Cvar_Reset                  = Cvar_Reset;
     uii.Cvar_Find                   = Cvar_FindVar;
-    uii.Cvar_Set                    = Cvar_Set;
+    uii.Cvar_Set                    = UI_Cvar_Set;
     uii.File_PickFile               = PickFile;
     uii.File_FreeFile               = FS_FreeFile;
     uii.File_ListFiles              = ListFilesForUI;

From a539da320087380499cc588f31353d487902e2a1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 00:06:12 +0200
Subject: [PATCH 0730/2040] Clear velocity and avelocity in MoveDone

This fixes objects rotating forever like the radio tower in m1l3a
---
 code/fgame/mover.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/fgame/mover.cpp b/code/fgame/mover.cpp
index 47e31d40..e897deb1 100644
--- a/code/fgame/mover.cpp
+++ b/code/fgame/mover.cpp
@@ -61,9 +61,9 @@ void Mover::MoveDone
 	Vector amove;
 
 	// zero out the movement
+    avelocity = vec_zero;
 	if( moveflags & MOVE_ANGLES )
 	{
-		avelocity = vec_zero;
 		amove = angledest - localangles;
 	}
 	else
@@ -71,9 +71,9 @@ void Mover::MoveDone
 		amove = vec_zero;
 	}
 
+    velocity = vec_zero;
 	if( moveflags & MOVE_ORIGIN )
 	{
-		velocity = vec_zero;
 		move = finaldest - localorigin;
 	}
 	else
@@ -81,6 +81,9 @@ void Mover::MoveDone
 		move = vec_zero;
 	}
 
+    accel = vec_zero;
+    aaccel = vec_zero;
+
 	if( !G_PushMove( this, move, amove ) )
 	{
 		// Delay finish till we can move into the final position

From 5052449e384f0ac3e5511866188db96b6833ae77 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 00:18:49 +0200
Subject: [PATCH 0731/2040] Fix invisible bullet tracers

---
 code/cgame/cg_parsemsg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 2455c73c..084831cc 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1726,7 +1726,7 @@ void CG_ParseCGMessage_ver_6()
             iLarge          = cgi.MSG_ReadBits(1);
 
             if (iType == CGM6_BULLET_1) {
-                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
+                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue);
             } else if (iType == CGM6_BULLET_2) {
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
             } else {

From 76f0e17987145dba2cef486634ac603d0f49e352 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 00:42:29 +0200
Subject: [PATCH 0732/2040] Fix bullet trace end being out of bounds, causing
 clients to have a strange bullet trace

---
 code/fgame/weaputils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 51d52891..e138412d 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2127,7 +2127,7 @@ float BulletAttack(
     qboolean bBulletDone;
     qboolean bThroughThing;
     int      iContinueCount;
-    float    vEndArray[64][3];
+    vec3_t   vEndArray[64];
     int      iTracerCount = 0;
     int      iNumHit;
     int      lastSurfaceFlags;
@@ -2186,6 +2186,7 @@ float BulletAttack(
                 );
 
                 vTmpEnd = trace.endpos;
+                vTraceEnd = vTmpEnd;
 
                 if (bThroughThing) {
                     bThroughThing = qfalse;

From 53565663d92b94ce303b4591c515eb469de14540 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 01:01:55 +0200
Subject: [PATCH 0733/2040] Add old welcome code (commented out) for when a
 player becomes spectator

---
 code/fgame/player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 9ac3b032..3b138458 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4676,6 +4676,11 @@ void Player::Think(void)
                     gi.SendServerCommand(edict - g_entities, "stufftext \"pushmenu_teamselect\"");
                 }
             }
+            // Removed in 2.0
+            //else if (level.time > m_fWeapSelectTime + 10.0) {
+            //    m_fWeapSelectTime = level.time;
+            //    gi.centerprintf(edict, "\n\n\n%s", gi.LV_ConvertString("Press fire to join the battle!"));
+            //}
         } else if (!client->pers.dm_primary[0]) {
             Spectator();
             if (m_fWeapSelectTime < level.time) {

From 25c2904d66c03d8369d8049c9020474bc17471b6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 18:16:59 +0200
Subject: [PATCH 0734/2040] Implement RE_MapVersion and RE_PrintBSPFileSizes

---
 code/renderer/tr_bsp.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index f469330e..7d01b47a 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2434,11 +2434,35 @@ void RE_LoadWorldMap( const char *name ) {
 
 int RE_MapVersion(void)
 {
-    // FIXME: unimplemented
-    return 0;
+	return map_version;
 }
 
 void RE_PrintBSPFileSizes(void)
 {
-    // FIXME: unimplemented
+  ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
+  ri.Printf(PRINT_ALL, "%6i   models                %7i\n", nummodels, 40 * nummodels);
+  ri.Printf(PRINT_ALL, "%6i   shaders               %7i\n", numShaders, 140 * numShaders);
+  ri.Printf(PRINT_ALL, "%6i   brushes               %7i\n", numbrushes, 12 * numbrushes);
+  ri.Printf(PRINT_ALL, "%6i   brushsides            %7i\n", numbrushsides, 12 * numbrushsides);
+  ri.Printf(PRINT_ALL, "%6i   fogs                  %7i\n", numFogs, 72 * numFogs);
+  ri.Printf(PRINT_ALL, "%6i   planes                %7i\n", numplanes, 16 * numplanes);
+  ri.Printf(PRINT_ALL, "%6i   nodes                 %7i\n", numnodes, 36 * numnodes);
+  ri.Printf(PRINT_ALL, "%6i   leafs                 %7i\n", numleafs, numleafs << 6);
+  ri.Printf(PRINT_ALL, "%6i   leafsurfaces          %7i\n", numleafsurfaces, 4 * numleafsurfaces);
+  ri.Printf(PRINT_ALL, "%6i   drawverts             %7i\n", numDrawVerts, 44 * numDrawVerts);
+  ri.Printf(PRINT_ALL, "%6i   drawindexes           %7i\n", numDrawIndexes, 4 * numDrawIndexes);
+  ri.Printf(PRINT_ALL, "%6i   drawsurfaces          %7i\n", numDrawSurfaces, 108 * numDrawSurfaces);
+  ri.Printf(PRINT_ALL, "%6i   lightdefs             %7i\n", numLightDefs, 52 * numLightDefs);
+  ri.Printf(PRINT_ALL, "%6i   lightmaps             %7i\n", numLightBytes / 49152, numLightBytes);
+  ri.Printf(PRINT_ALL, "         visibility            %7i\n", numVisBytes);
+  ri.Printf(PRINT_ALL, "%6i   entitylights          %7i\n", numSLights, 56 * numSLights);
+  ri.Printf(PRINT_ALL, "         entitylightvis        %7i\n", entLightVisSize);
+  ri.Printf(PRINT_ALL, "         light grid palette    %7i\n", g_iGridPaletteBytes);
+  ri.Printf(PRINT_ALL, "%6i   light grid offsets    %7i\n", g_iGridOffsets, 2 * g_iGridOffsets);
+  ri.Printf(PRINT_ALL, "         light grid data       %7i\n", g_iGridDataSize);
+  ri.Printf(PRINT_ALL, "%6i   terrain               %7i\n", g_nTerraPatches, 388 * g_nTerraPatches);
+  ri.Printf(PRINT_ALL, "%6i   terrain indexes       %7i\n", g_nTerPatchIndices, 2 * g_nTerPatchIndices);
+  ri.Printf(PRINT_ALL, "         static model data     %7i\n", g_nStaticModelData);
+  ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
+  ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
 }

From 4d1380b5c4c4c3a86b31fd0baf405564bc5470bb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 18:28:45 +0200
Subject: [PATCH 0735/2040] Implement G_ClientDoBlends and
 FindIntermissionPoint

---
 code/fgame/g_local.h  |   2 +
 code/fgame/g_main.cpp | 138 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 126 insertions(+), 14 deletions(-)

diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index 90b2c965..3f0c085e 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -436,6 +436,8 @@ void        G_ClientCommand(gentity_t *ent);
 void G_ClientThink(gentity_t *ent, usercmd_t *cmd, usereyes_t *eyeinfo);
 void ClientEndFrame(gentity_t *ent);
 void G_ClientEndServerFrames(void);
+void G_ClientDoBlends(void);
+void FindIntermissionPoint(void);
 void G_RunClient(gentity_t *ent);
 
 //
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 79e7119d..3a6f4497 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -83,6 +83,11 @@ void (*SV_Free)(void *ptr);
 qboolean LevelArchiveValid(Archiver& arc);
 void     ClosePlayerLogFile(void);
 
+/*
+===============
+G_Printf
+===============
+*/
 void QDECL G_Printf(const char *fmt, ...)
 {
     va_list argptr;
@@ -95,6 +100,11 @@ void QDECL G_Printf(const char *fmt, ...)
     gi.Printf(text);
 }
 
+/*
+===============
+G_Error
+===============
+*/
 void QDECL G_Error(const char *fmt, ...)
 {
     va_list argptr;
@@ -107,6 +117,11 @@ void QDECL G_Error(const char *fmt, ...)
     gi.Error(ERR_DROP, text);
 }
 
+/*
+===============
+G_Error
+===============
+*/
 void QDECL G_Error(int type, const char *fmt, ...)
 {
     va_list argptr;
@@ -430,7 +445,6 @@ void G_RunFrame(int levelTime, int frameTime)
     qboolean           showentnums;
     unsigned long long start;
     unsigned long long end;
-    int                i;
     static int         processed[MAX_GENTITIES] = {0};
     static int         processedFrameID         = 0;
 
@@ -460,16 +474,9 @@ void G_RunFrame(int levelTime, int frameTime)
 
         if (level.intermissiontime || level.died_already) {
             L_ProcessPendingEvents();
+            G_ClientDoBlends();
 
-            for (i = 0, edict = g_entities; i < game.maxclients; i++, edict++) {
-                if (!edict->inuse || !edict->client || !edict->entity) {
-                    continue;
-                }
-
-                edict->entity->CalcBlend();
-            }
-
-            if (g_gametype->integer && g_maxintermission->value != 0.0f) {
+            if (g_gametype->integer != GT_SINGLE_PLAYER && g_maxintermission->value != 0.0f) {
                 if (level.time - level.intermissiontime > g_maxintermission->value) {
                     level.exitintermission = true;
                 }
@@ -1575,32 +1582,95 @@ void G_ClientEndServerFrames(void)
     }
 }
 
-void G_ClientDoBlends()
+/*
+===============
+G_ClientDoBlends
+===============
+*/
+void G_ClientDoBlends(void)
 {
-    // FIXME: unimplemented
+    gentity_t* edict;
+    int i;
+
+    for (i = 0, edict = g_entities; i < game.maxclients; i++, edict++) {
+        if (!edict->inuse || !edict->client || !edict->entity) {
+            continue;
+        }
+
+        edict->entity->CalcBlend();
+    }
 }
 
-void FindIntermissionPoint()
+/*
+===============
+FindIntermissionPoint
+===============
+*/
+void FindIntermissionPoint(void)
 {
-    // FIXME: unimplemented
+    SimpleEntity* sent;
+    SimpleEntity* starget;
+    vec3_t dir;
+
+    sent = static_cast<SimpleEntity*>(G_FindClass(NULL, "info_player_intermission"));
+    if (!sent) {
+        level.m_intermission_origin = vec_zero;
+        level.m_intermission_angle = vec_zero;
+        return;
+    }
+
+    level.m_intermission_origin = sent->origin;
+    level.m_intermission_angle = sent->angles;
+
+    if (!sent->target.length()) {
+        return;
+    }
+
+    starget = static_cast<SimpleEntity*>(G_FindTarget(NULL, sent->Target()));
+    if (!starget) {
+        return;
+    }
+
+    VectorSubtract(starget->origin, level.m_intermission_origin, dir);
+    vectoangles(dir, level.m_intermission_angle);
 }
 
+/*
+===============
+G_MoveClientToIntermission
+===============
+*/
 void G_MoveClientToIntermission(Entity *ent)
 {
     G_DisplayScores(ent);
     ent->flags |= FL_IMMOBILE;
 }
 
+/*
+===============
+G_DisplayScores
+===============
+*/
 void G_DisplayScores(Entity *ent)
 {
     ent->client->ps.pm_flags |= PMF_INTERMISSION;
 }
 
+/*
+===============
+G_HideScores
+===============
+*/
 void G_HideScores(Entity *ent)
 {
     ent->client->ps.pm_flags &= ~PMF_INTERMISSION;
 }
 
+/*
+===============
+G_BeginIntermission2
+===============
+*/
 void G_BeginIntermission2(void)
 {
     gentity_t *client;
@@ -1636,6 +1706,11 @@ void G_BeginIntermission2(void)
     }
 }
 
+/*
+===============
+G_BeginIntermission
+===============
+*/
 void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade)
 {
     Entity    *camera;
@@ -1683,6 +1758,11 @@ void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade
     }
 }
 
+/*
+===============
+G_ExitLevel
+===============
+*/
 void G_ExitLevel(void)
 {
     static const char *seps = " ,\n\r";
@@ -1784,6 +1864,11 @@ void G_ExitLevel(void)
     G_ClientEndServerFrames();
 }
 
+/*
+===============
+G_CheckIntermissionExit
+===============
+*/
 void G_CheckIntermissionExit(void)
 {
     if (!level.exitintermission && g_maxintermission->value > level.time - level.intermissiontime) {
@@ -1801,11 +1886,21 @@ void G_CheckIntermissionExit(void)
     }
 }
 
+/*
+===============
+G_ExitIntermission
+===============
+*/
 void G_ExitIntermission(void)
 {
     level.exitintermission = qtrue;
 }
 
+/*
+===============
+G_CheckStartRules
+===============
+*/
 void G_CheckStartRules(void)
 {
     if ((!dmManager.IsGameActive()) && (!dmManager.WaitingForPlayers())) {
@@ -1813,6 +1908,11 @@ void G_CheckStartRules(void)
     }
 }
 
+/*
+===============
+G_CheckExitRules
+===============
+*/
 void G_CheckExitRules(void)
 {
     if (g_gametype->integer) {
@@ -1824,6 +1924,11 @@ void G_CheckExitRules(void)
     }
 }
 
+/*
+===============
+G_DisplayScoresToAllClients
+===============
+*/
 void G_DisplayScoresToAllClients(void)
 {
     gentity_t *ent;
@@ -1838,6 +1943,11 @@ void G_DisplayScoresToAllClients(void)
     }
 }
 
+/*
+===============
+G_HideScoresToAllClients
+===============
+*/
 void G_HideScoresToAllClients(void)
 {
     gentity_t *ent;

From 19da3770644e8e702fb286aac7f1ed2b0feba3e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 18:55:20 +0200
Subject: [PATCH 0736/2040] Implement G_ObfuscationForSmokeSprites

This is used so the player can throw a smoke grenade and hide behind it for AI
---
 code/fgame/smokesprite.cpp | 52 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/code/fgame/smokesprite.cpp b/code/fgame/smokesprite.cpp
index 1fe6c5d0..f848a8cb 100644
--- a/code/fgame/smokesprite.cpp
+++ b/code/fgame/smokesprite.cpp
@@ -113,8 +113,56 @@ void G_AddSmokeSprite(const SmokeSprite* sprite)
 }
 
 float G_ObfuscationForSmokeSprites(float visibilityAlpha, const Vector& start, const Vector& end) {
-    // FIXME: unimplemented
-    return 0;
+    Vector vDelta = end - start;
+    float fLength = vDelta.length();
+    Vector vDir = vDelta * (1.0 / fLength);
+    float fObfuscation = visibilityAlpha;
+    int i;
+
+    for (i = 1; i <= g_Sprites.NumObjects(); i++) {
+        const SmokeSprite& sprite = g_Sprites.ObjectAt(i);
+        Vector vSpriteDelta = sprite.origin - start;
+        float fDot = vSpriteDelta * vDir;
+        float fTimeAlive;
+
+        if (fDot < -sprite.scale || fDot > fLength + sprite.scale) {
+            continue;
+        }
+
+        if (fDot <= 0) {
+            if (Square(sprite.scale) <= vSpriteDelta.lengthSquared()) {
+                continue;
+            }
+        } else if (fDot >= fLength) {
+            Vector vSpriteEndDelta = sprite.origin - end;
+
+            if (Square(sprite.scale) <= vSpriteEndDelta.lengthSquared()) {
+                continue;
+            }
+        } else {
+            Vector vSpriteEndDelta = vSpriteDelta - (vDir * fDot);
+
+            if (Square(sprite.scale) <= vSpriteEndDelta.lengthSquared()) {
+                continue;
+            }
+        }
+
+        fTimeAlive = level.time - sprite.spawnTime;
+        if (fTimeAlive < sprite.fadeIn) {
+            fObfuscation += sprite.maxAlpha * fTimeAlive / sprite.fadeIn;
+        } else if (sprite.spawnTime + sprite.fadeDelay >= level.svsTime) {
+            fObfuscation += sprite.maxAlpha;
+        } else if (sprite.spawnLife - fTimeAlive > 0) {
+            fObfuscation = (sprite.spawnLife - fTimeAlive) * sprite.maxAlpha / (sprite.spawnLife - sprite.fadeDelay);
+        }
+
+        if(fObfuscation >= 1.0) {
+            // Completely obfuscated
+            return 1.0;
+        }
+    }
+   
+    return fObfuscation;
 }
 
 SmokeSprite* G_GetRandomSmokeSprite() {

From 3b8bffe39cc33025a3ca510570e5788b2db1fad8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 18:56:21 +0200
Subject: [PATCH 0737/2040] Fix variable misspelling

---
 code/fgame/gamecvars.cpp | 4 ++--
 code/fgame/gamecvars.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index 90eb8c5d..807b8bee 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -59,7 +59,7 @@ cvar_t *sv_rollspeed;
 cvar_t *sv_rollangle;
 cvar_t *sv_cheats;
 cvar_t *sv_showbboxes;
-cvar_t *sv_showbtags;
+cvar_t *sv_showtags;
 
 cvar_t *sv_testloc_num;
 cvar_t *sv_testloc_secondary;
@@ -312,7 +312,7 @@ void CVAR_Init(void)
     sv_traceinfo  = gi.Cvar_Get("sv_traceinfo", "0", 0);
     sv_drawtrace  = gi.Cvar_Get("sv_drawtrace", "0", 0);
     sv_showbboxes = gi.Cvar_Get("sv_showbboxes", "0", 0);
-    sv_showbtags  = gi.Cvar_Get("sv_showtags", "0", 0);
+    sv_showtags   = gi.Cvar_Get("sv_showtags", "0", 0);
 
     sv_testloc_num       = gi.Cvar_Get("sv_testloc_num", "0", 0);
     sv_testloc_secondary = gi.Cvar_Get("sv_testloc_secondary", "0", 0);
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index 8ec3c098..407aa6c9 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -64,7 +64,7 @@ extern cvar_t *sv_rollspeed;
 extern cvar_t *sv_rollangle;
 extern cvar_t *sv_cheats;
 extern cvar_t *sv_showbboxes;
-extern cvar_t *sv_showbtags;
+extern cvar_t *sv_showtags;
 
 extern cvar_t *sv_testloc_num;
 extern cvar_t *sv_testloc_secondary;

From e927da56cf70c9ce8b9c363270a83cfa295bd760 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 19:03:15 +0200
Subject: [PATCH 0738/2040] Fix GetTagPositionAndOrientation() returning wrong
 tag axis and position

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index daa608f8..d0dfe46b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5362,7 +5362,7 @@ void Entity::GetTagPositionAndOrientation(int tagnum, orientation_t *new_or)
     VectorCopy(origin, new_or->origin);
 
     for (i = 0; i < 3; i++) {
-        VectorMA(new_or->origin, tag_or.origin[i], tag_or.axis[i], new_or->origin);
+        VectorMA(new_or->origin, tag_or.origin[i], axis[i], new_or->origin);
     }
 
     MatrixMultiply(tag_or.axis, axis, new_or->axis);

From cde7cbc3a30936945515e58eb34e7c37a49366ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 19:16:55 +0200
Subject: [PATCH 0739/2040] Implement G_ClientDrawTags

---
 code/fgame/g_main.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 3a6f4497..1d947b9c 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -744,11 +744,71 @@ void G_ClientDrawBoundingBoxes(void)
 /*
 =================
 G_ClientDrawTags
+
+Added in 2.0.
+
+This draws tag position and orientation
+for entities in a radius of 1000 units.
 =================
 */
 void G_ClientDrawTags(void)
 {
-    // FIXME: unimplemented
+    Entity* player;
+    Entity* ent;
+    const char* tagName;
+    Vector origin;
+    orientation_t ori;
+    int numTags;
+    int i;
+
+    if (!sv_showtags->string || !sv_showtags->string[0]) {
+        return;
+    }
+
+    if (sv_showtags->string[0] != '*' && !sv_showtags->string[1] && sv_showtags->integer == 0) {
+        // The variable is defined but set to 0
+        return;
+    }
+
+    if (g_gametype->integer != GT_SINGLE_PLAYER && !sv_cheats->integer) {
+        return;
+    }
+
+    player = G_GetEntity(0);
+    origin = player->origin;
+
+    for (ent = findradius(NULL, origin, 1000); ent; ent = findradius(ent, origin, 1000)) {
+        if (!ent->edict->tiki) {
+            continue;
+        }
+
+        if (ent == player) {
+            continue;
+        }
+
+        numTags = gi.TIKI_NumTags(ent->edict->tiki);
+        for (i = 0; i < numTags; i++) {
+            tagName = gi.Tag_NameForNum(ent->edict->tiki, i);
+
+            if (Q_stricmp(sv_showtags->string, "*")) {
+                //
+                // If it's not a wildcard, check to see if
+                // the tag name partially matches
+                //
+                if (Q_stricmpn(tagName, sv_showtags->string, strlen(sv_showtags->string))) {
+                    continue;
+                }
+            }
+
+            ent->GetTagPositionAndOrientation(i, &ori);
+
+            G_DebugString(ori.origin + Vector(0, 0, 8), 1, 1, 1, 0, "%s", tagName);
+            G_DebugCircle(ori.origin, 10, 1, 1, 1, 1, true);
+            G_DebugLine(ori.origin, ori.origin + Vector(ori.axis[0]) * 32, 1, 0, 0, 1);
+            G_DebugLine(ori.origin, ori.origin + Vector(ori.axis[1]) * 32, 0, 1, 0, 1);
+            G_DebugLine(ori.origin, ori.origin + Vector(ori.axis[2]) * 32, 0, 0, 1, 1);
+        }
+    }
 }
 
 // Used to tell the server about the edict pose, such as the player pose

From 373376169662940dca9882553c7d5f8b88cd3fcf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 19:30:39 +0200
Subject: [PATCH 0740/2040] Fix the reloading sound in 2.0, the behavior is
 different in 2.0 and 2.30

---
 code/fgame/vehicleturret.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index c2c2071a..4deaf09b 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -1031,6 +1031,18 @@ void VehicleTurretGun::AdjustReloadStatus()
         m_iAmmo                = m_iReloadShots;
         m_fReloadTimeRemaining = m_fReloadDelay;
 
+        if (g_target_game <= target_game_e::TG_MOHTA) {
+            //
+            // Below 2.30 (Spearhead), the sound is played immediately.
+            // 2.30 has it wrong with the Nebelwerfer.
+            //
+            ProcessEvent(EV_VehicleTurretGun_PlayReloadSound);
+            return;
+        }
+
+        //
+        // Changed in 2.30
+        //  Play the reload sound once finished reloading
         PostEvent(EV_VehicleTurretGun_PlayReloadSound, m_fReloadDelay * 0.5);
     }
 }

From 0a9075748e5c1d39f99e91a33139cf3259cd2d56 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Sep 2024 20:38:38 +0200
Subject: [PATCH 0741/2040] Fix OpenAL binary name on ARM64

---
 .github/workflows/build-cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 2279210c..ae71b900 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -196,7 +196,7 @@ jobs:
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
-        if ("${{ matrix.architecture.config }}" -eq "x64") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
+        if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
 
     - uses: actions/checkout@v4
       with:

From c6464efa07f1a9b350be131902b933b5807f4c36 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 3 Sep 2024 23:41:58 +0200
Subject: [PATCH 0742/2040] Implement level mark loading and updating

---
 code/renderer/tr_marks_permanent.c | 1730 ++++++++++++++++++++++++----
 1 file changed, 1512 insertions(+), 218 deletions(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 43b7778b..830f3586 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,325 +24,1619 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
+#define MAX_MARK_FRAGMENTS   128
+#define MAX_MARK_POLYVERTS   384
+
+#define DCL_FILE_SIGNATURE   *(int *)"DCL "
+#define DCL_FILE_OLD_VERSION 1
+#define DCL_FILE_VERSION     2
+
 typedef struct lmEditPoly_s {
-	srfMarkFragment_t surf;
-	shader_t* shader;
-	int viewCount;
-	polyVert_t verts[8];
-	mnode_t* pLeafs[8];
-	int iNumLeafs;
+    srfMarkFragment_t    surf;
+    shader_t            *shader;
+    int                  viewCount;
+    polyVert_t           verts[8];
+    struct lmEditPoly_s *pNextPoly;
+    mnode_t             *pLeafs[8];
+    int                  iNumLeafs;
 } lmEditPoly_t;
 
 typedef struct lmEditMarkDef_s {
-	struct lmEditMarkDef_s* pNextMark;
-	struct lmEditMarkDef_s* pPrevMark;
-	shader_t* markShader;
-	vec3_t vPos;
-	vec3_t vProjection;
-	float fRadius;
-	float fHeightScale;
-	float fWidthScale;
-	float fRotation;
-	float color[4];
-	qboolean bDoLighting;
-	lmEditPoly_t* pMarkEditPolys;
-	int iNumEditPolys;
-	vec3_t vPathCorners[4];
+    struct lmEditMarkDef_s *pNextMark;
+    struct lmEditMarkDef_s *pPrevMark;
+    shader_t               *markShader;
+    vec3_t                  vPos;
+    vec3_t                  vProjection;
+    float                   fRadius;
+    float                   fHeightScale;
+    float                   fWidthScale;
+    float                   fRotation;
+    vec4_t                  color;
+    qboolean                bDoLighting;
+    lmEditPoly_t           *pMarkEditPolys;
+    int                     iNumEditPolys;
+    vec3_t                  vPathCorners[4];
 } lmEditMarkDef_t;
 
 typedef struct lmPoly_s {
-	srfMarkFragment_t surf;
-	shader_t* shader;
-	int viewCount;
+    srfMarkFragment_t surf;
+    shader_t         *shader;
+    int               viewCount;
 } lmPoly_t;
 
 typedef struct {
-	qboolean bLevelMarksLoaded;
-	char szDCLFilename[MAX_QPATH];
-	lmPoly_t* pMarkFragments;
-	qboolean bAutoApplySettings;
-	lmEditPoly_t* pFreeEditPolys;
-	lmEditMarkDef_t activeMarkDefs;
-	lmEditMarkDef_t* pFreeMarkDefs;
-	lmEditMarkDef_t* pCurrentMark;
-	qboolean bPathLayingMode;
-	treadMark_t treadMark;
-	lmEditMarkDef_t* pTreadMarkStartDecal;
-	lmEditMarkDef_t* pTreadMarkEndDecal;
+    qboolean         bLevelMarksLoaded;
+    char             szDCLFilename[MAX_QPATH];
+    lmPoly_t        *pMarkFragments;
+    qboolean         bAutoApplySettings;
+    lmEditPoly_t    *pFreeEditPolys;
+    lmEditMarkDef_t  activeMarkDefs;
+    lmEditMarkDef_t *pFreeMarkDefs;
+    lmEditMarkDef_t *pCurrentMark;
+    qboolean         bPathLayingMode;
+    treadMark_t      treadMark;
+    lmEditMarkDef_t *pTreadMarkStartDecal;
+    lmEditMarkDef_t *pTreadMarkEndDecal;
 } lmGlobals_t;
 
 typedef struct {
-  int ident;
-  int version;
-  int checksum;
-  int iNumDecals;
-  int iNumFragments;
+    int ident;
+    int version;
+    int checksum;
+    int iNumDecals;
+    int iNumFragments;
 } dclHeader_t;
 
 typedef struct {
-  char shader[MAX_RES_NAME];
-  vec3_t vPos;
-  vec3_t vProjection;
-  float fRadius;
-  float fHeightScale;
-  float fWidthScale;
-  float fRotation;
-  float color[4];
-  qboolean bDoLighting;
+    char     shader[MAX_RES_NAME];
+    vec3_t   vPos;
+    vec3_t   vProjection;
+    float    fRadius;
+    float    fHeightScale;
+    float    fWidthScale;
+    float    fRotation;
+    vec4_t   color;
+    qboolean bDoLighting;
 } dclSavedMarkDef_t;
 
 typedef struct {
-  char shader[MAX_RES_NAME];
-  int fogIndex;
-  int iIndex;
-  int iNumVerts;
+    char shader[MAX_RES_NAME];
+    int  fogIndex;
+    int  iIndex;
+    int  iNumVerts;
 } dclSavedMarkPoly_t;
 
-cvar_t* dcl_editmode;
-cvar_t* dcl_showcurrent;
-cvar_t* dcl_autogetinfo;
-cvar_t* dcl_shiftstep;
-cvar_t* dcl_shader;
-cvar_t* dcl_radius;
-cvar_t* dcl_heightscale;
-cvar_t* dcl_widthscale;
-cvar_t* dcl_rotation;
-cvar_t* dcl_r;
-cvar_t* dcl_g;
-cvar_t* dcl_b;
-cvar_t* dcl_alpha;
-cvar_t* dcl_dolighting;
-cvar_t* dcl_doworld;
-cvar_t* dcl_doterrain;
-cvar_t* dcl_dobmodels;
-cvar_t* dcl_dostring;
-cvar_t* dcl_pathmode;
-cvar_t* dcl_maxsegment;
-cvar_t* dcl_minsegment;
-cvar_t* dcl_maxoffset;
-cvar_t* dcl_texturescale;
-lmGlobals_t lm;
+cvar_t *dcl_editmode;
+cvar_t *dcl_showcurrent;
+cvar_t *dcl_autogetinfo;
+cvar_t *dcl_shiftstep;
+cvar_t *dcl_shader;
+cvar_t *dcl_radius;
+cvar_t *dcl_heightscale;
+cvar_t *dcl_widthscale;
+cvar_t *dcl_rotation;
+cvar_t *dcl_r;
+cvar_t *dcl_g;
+cvar_t *dcl_b;
+cvar_t *dcl_alpha;
+cvar_t *dcl_dolighting;
+cvar_t *dcl_doworld;
+cvar_t *dcl_doterrain;
+cvar_t *dcl_dobmodels;
+cvar_t *dcl_dostring;
+cvar_t *dcl_pathmode;
+cvar_t *dcl_maxsegment;
+cvar_t *dcl_minsegment;
+cvar_t *dcl_maxoffset;
+cvar_t *dcl_texturescale;
+
+static lmGlobals_t lm;
+
 vec3_t vec_upwards;
 
+lmEditMarkDef_t *R_AllocateMarkDef(void);
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+);
+void DCLC_Delete(void);
+void DCLC_GetInfo(void);
+
+/*
+=============
+DCLC_Save
+
+Save level marks into a DCL file
+=============
+*/
 void DCLC_Save(void)
 {
-	// FIXME: unimplemented
+    fileHandle_t       hFile;
+    dclHeader_t        header;
+    int                i, j;
+    int                iNumDecals, iNumFragments;
+    lmEditPoly_t      *pPoly;
+    lmEditMarkDef_t   *pMark;
+    bmodel_t          *pBmodel;
+    mnode_t           *pLeaf;
+    dclSavedMarkDef_t  saveMark;
+    dclSavedMarkPoly_t savePoly;
+    char               map_time[32];
+    int                littleValue;
+
+    hFile = FS_FOpenFileWrite(lm.szDCLFilename);
+    if (!hFile) {
+        ri.Printf(PRINT_ALL, "R_SaveDCLFile: couldn't write to %s\n", lm.szDCLFilename);
+    }
+
+    pMark         = lm.activeMarkDefs.pNextMark;
+    iNumDecals    = 0;
+    iNumFragments = 0;
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark, iNumDecals++) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; iNumFragments++) {
+            pPoly->viewCount = iNumFragments;
+            pPoly            = pPoly->pNextPoly;
+        }
+    }
+
+    header.ident         = LittleLong(DCL_FILE_SIGNATURE);
+    header.version       = LittleLong(DCL_FILE_VERSION);
+    header.checksum      = 0;
+    header.iNumDecals    = LittleLong(iNumDecals);
+    header.iNumFragments = LittleLong(iNumFragments);
+
+    FS_Write(&header, sizeof(header), hFile);
+
+    //
+    // Write the map time
+    //
+    memset(map_time, 0, sizeof(map_time));
+    Q_strncpyz(map_time, ri.CM_MapTime(), sizeof(map_time));
+    FS_Write(map_time, sizeof(map_time), hFile);
+
+    if (!iNumDecals) {
+        //
+        // Nothing to write
+        //
+        FS_FCloseFile(hFile);
+        return;
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        Q_strncpyz(saveMark.shader, pMark->markShader->name, sizeof(saveMark.shader));
+
+        saveMark.vPos[0]        = LittleFloat(pMark->vPos[0]);
+        saveMark.vPos[1]        = LittleFloat(pMark->vPos[1]);
+        saveMark.vPos[2]        = LittleFloat(pMark->vPos[2]);
+        saveMark.vProjection[0] = LittleFloat(pMark->vProjection[0]);
+        saveMark.vProjection[1] = LittleFloat(pMark->vProjection[1]);
+        saveMark.vProjection[2] = LittleFloat(pMark->vProjection[2]);
+
+        saveMark.fRadius      = LittleFloat(pMark->fRadius);
+        saveMark.fHeightScale = LittleFloat(pMark->fHeightScale);
+        saveMark.fWidthScale  = LittleFloat(pMark->fWidthScale);
+        saveMark.fRotation    = LittleFloat(pMark->fRotation);
+
+        saveMark.color[0] = LittleFloat(pMark->color[0]);
+        saveMark.color[1] = LittleFloat(pMark->color[1]);
+        saveMark.color[2] = LittleFloat(pMark->color[2]);
+        saveMark.color[3] = LittleFloat(pMark->color[3]);
+
+        saveMark.bDoLighting = LittleLong(pMark->bDoLighting);
+
+        FS_Write(&saveMark, sizeof(saveMark), hFile);
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            Q_strncpyz(savePoly.shader, pMark->markShader->name, sizeof(savePoly.shader));
+
+            savePoly.fogIndex  = 0;
+            savePoly.iIndex    = LittleLong(pPoly->surf.iIndex);
+            savePoly.iNumVerts = LittleLong(pPoly->surf.numVerts);
+
+            FS_Write(&savePoly, sizeof(savePoly), hFile);
+            FS_Write(pPoly->verts, sizeof(pPoly->verts[0]) * savePoly.iNumVerts, hFile);
+        }
+    }
+
+    for (i = 0; i < tr.world->numBmodels; i++) {
+        pBmodel = &tr.world->bmodels[i];
+
+        if (!pBmodel->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pBmodel->iNumMarkFragment);
+        FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pBmodel->iNumMarkFragment; i++) {
+            littleValue = ((lmPoly_t *)pBmodel->pFirstMarkFragment[j])->viewCount;
+            FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+        pLeaf = &tr.world->nodes[i];
+
+        if (!pLeaf->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pLeaf->iNumMarkFragment);
+        FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+            littleValue = ((lmPoly_t *)pLeaf->pFirstMarkFragment[j])->viewCount;
+            FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    FS_FCloseFile(hFile);
 }
 
-void R_LevelMarksLoad(const char* szBSPName)
+/*
+=============
+R_LevelMarksLoad
+
+Load level marks from a DCL file
+=============
+*/
+void R_LevelMarksLoad(const char *szBSPName)
 {
+    int          i;
+    int          iLength;
+    fileHandle_t hFile;
+    dclHeader_t  dclHeader;
+    const char  *real_map_time;
+    char         map_time[33];
+
+    if (lm.bLevelMarksLoaded) {
+        //
+        // Destroy and reallocate level marks
+        //
+
+        R_LevelMarksFree();
+        R_LevelMarksInit();
+    }
+
+    COM_StripExtension(szBSPName, lm.szDCLFilename, sizeof(lm.szDCLFilename));
+    Q_strcat(lm.szDCLFilename, sizeof(lm.szDCLFilename), ".dcl");
+
+    if (ri.FS_OpenFile(lm.szDCLFilename, &hFile, qtrue, qtrue) <= 0) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s not found\n", lm.szDCLFilename);
+        return;
+    }
+
+    lm.bLevelMarksLoaded = qtrue;
+
+    //
+    // Read the DCL file header
+    //
+
+    ri.FS_Read(&dclHeader, sizeof(dclHeader), hFile);
+
+    for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
+        ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);
+    }
+
+    //
+    // Signature and version checks
+    //
+
+    if (dclHeader.ident != DCL_FILE_SIGNATURE) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s Seems to be an invalid DCL file\n", lm.szDCLFilename);
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    if (dclHeader.version != DCL_FILE_OLD_VERSION && dclHeader.version != DCL_FILE_VERSION) {
+        ri.Printf(
+            PRINT_ALL,
+            "R_LevelMarksLoad: %s is wrong version (%i should be %i)\n",
+            lm.szDCLFilename,
+            dclHeader.version,
+            DCL_FILE_VERSION
+        );
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    if (dclHeader.version == DCL_FILE_OLD_VERSION) {
+        //
+        // The old version has no map time
+        //
+        map_time[0] = 0;
+    } else {
+        map_time[32] = 0;
+        ri.FS_Read(map_time, sizeof(map_time) - 1, hFile);
+    }
+
+    ri.Printf(PRINT_ALL, "----------- Loading DCL file %s ---------\n", lm.szDCLFilename);
+
+    if (dcl_editmode->integer) {
+        dclSavedMarkDef_t saveMark;
+        lmEditMarkDef_t  *pMark;
+        qhandle_t         hShader;
+
+        //
+        // Load all editor-mode decals
+        //
+
+        for (i = 0; i < dclHeader.iNumDecals; i++) {
+            ri.FS_Read(&saveMark, sizeof(saveMark), hFile);
+
+            saveMark.vPos[0]        = LittleFloat(saveMark.vPos[0]);
+            saveMark.vPos[1]        = LittleFloat(saveMark.vPos[1]);
+            saveMark.vPos[2]        = LittleFloat(saveMark.vPos[2]);
+            saveMark.vProjection[0] = LittleFloat(saveMark.vProjection[0]);
+            saveMark.vProjection[1] = LittleFloat(saveMark.vProjection[1]);
+            saveMark.vProjection[2] = LittleFloat(saveMark.vProjection[2]);
+
+            saveMark.fRadius      = LittleFloat(saveMark.fRadius);
+            saveMark.fHeightScale = LittleFloat(saveMark.fHeightScale);
+            saveMark.fWidthScale  = LittleFloat(saveMark.fWidthScale);
+            saveMark.fRotation    = LittleFloat(saveMark.fRotation);
+
+            saveMark.color[0] = LittleFloat(saveMark.color[0]);
+            saveMark.color[1] = LittleFloat(saveMark.color[1]);
+            saveMark.color[2] = LittleFloat(saveMark.color[2]);
+            saveMark.color[3] = LittleFloat(saveMark.color[3]);
+
+            saveMark.bDoLighting = LittleLong(saveMark.bDoLighting);
+
+            pMark = R_AllocateMarkDef();
+            if (!pMark) {
+                break;
+            }
+
+            hShader = RE_RegisterShader(saveMark.shader);
+            if (hShader) {
+                pMark->markShader = R_GetShaderByHandle(hShader);
+            } else {
+                ri.Printf(PRINT_ALL, "Bad decal shader %s\n", saveMark.shader);
+                pMark->markShader = tr.defaultShader;
+            }
+
+            //
+            // Copy settings from the saved mark
+            // to the newly allocated mark def
+            //
+
+            VectorCopy(saveMark.vPos, pMark->vPos);
+            VectorCopy(saveMark.vProjection, pMark->vProjection);
+
+            pMark->fRadius      = saveMark.fRadius;
+            pMark->fWidthScale  = saveMark.fWidthScale;
+            pMark->fHeightScale = saveMark.fHeightScale;
+            pMark->fRotation    = saveMark.fRotation;
+
+            Vector4Copy(saveMark.color, pMark->color);
+            pMark->bDoLighting = saveMark.bDoLighting;
+
+            lm.pCurrentMark = pMark;
+
+            //
+            // Now add the loaded mark
+            //
+
+            if (!R_ApplyLevelDecal(pMark->vPos, pMark->vProjection, qtrue, qtrue, 0)) {
+                DCLC_Delete();
+            }
+        }
+    } else {
+        int                j;
+        int                iIndex;
+        dclSavedMarkPoly_t savePoly;
+        lmPoly_t          *pPoly;
+        shader_t          *shader;
+        qhandle_t          hShader;
+        char               szLastShaderName[MAX_RES_NAME];
+        bmodel_t          *pBmodel;
+        mnode_t           *pLeaf;
+
+        szLastShaderName[0] = 0;
+        real_map_time       = ri.CM_MapTime();
+
+        if (!*real_map_time || strcmp(real_map_time, map_time)) {
+            ri.Printf(PRINT_ALL, "!!! BSP file is newer than DCL file.\n");
+            ri.Printf(PRINT_ALL, "!!! The DCL file needs to be updated.\n");
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        if (!dclHeader.iNumDecals) {
+            //
+            // Nothing to load
+            //
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+        }
+
+        //
+        // Skip editor stuff
+        //
+        ri.FS_Seek(hFile, sizeof(dclSavedMarkDef_t) * dclHeader.iNumDecals, FS_SEEK_CUR);
+
+        //
+        // Load all saved polys
+        //
+
+        lm.pMarkFragments = (lmPoly_t *)ri.Hunk_Alloc(sizeof(lmPoly_t) * dclHeader.iNumFragments, h_low);
+
+        for (i = 0; i < dclHeader.iNumFragments; i++) {
+            polyVert_t *pv;
+
+            ri.FS_Read(&savePoly, sizeof(savePoly), hFile);
+
+            savePoly.fogIndex  = LittleLong(savePoly.fogIndex);
+            savePoly.iIndex    = LittleLong(savePoly.iIndex);
+            savePoly.iNumVerts = LittleLong(savePoly.iNumVerts);
+
+            pPoly = &lm.pMarkFragments[i];
+
+            //
+            // Make sure to register the shader once
+            //
+            if (Q_stricmp(savePoly.shader, szLastShaderName)) {
+                hShader = RE_RegisterShader(savePoly.shader);
+                if (!hShader) {
+                    pPoly->shader           = tr.defaultShader;
+                    pPoly->surf.iIndex      = 0;
+                    pPoly->surf.surfaceType = SF_SKIP;
+                    pPoly->surf.numVerts    = 0;
+                    continue;
+                }
+
+                shader = R_GetShaderByHandle(hShader);
+                Q_strncpyz(szLastShaderName, savePoly.shader, sizeof(szLastShaderName));
+            }
+
+            pPoly->shader           = shader;
+            pPoly->surf.iIndex      = savePoly.iIndex;
+            pPoly->surf.surfaceType = SF_MARK_FRAG;
+
+            //
+            // Load vertices
+            //
+
+            pPoly->surf.numVerts = savePoly.iNumVerts;
+            pPoly->surf.verts    = (polyVert_t *)ri.Hunk_Alloc(sizeof(polyVert_t) * savePoly.iNumVerts, h_low);
+            ri.FS_Read(pPoly->surf.verts, sizeof(polyVert_t) * savePoly.iNumVerts, hFile);
+
+            for (j = 0; j < savePoly.iNumVerts; j++) {
+                pv = &pPoly->surf.verts[j];
+
+                pv->xyz[0] = LittleFloat(pv->xyz[0]);
+                pv->xyz[1] = LittleFloat(pv->xyz[1]);
+                pv->xyz[2] = LittleFloat(pv->xyz[2]);
+                pv->st[0]  = LittleFloat(pv->st[0]);
+                pv->st[1]  = LittleFloat(pv->st[1]);
+            }
+        }
+
+        //
+        // Load all brush models
+        //
+        for (i = 0; i < tr.world->numBmodels; i++) {
+            pBmodel = &tr.world->bmodels[i];
+
+            ri.FS_Read(&pBmodel->iNumMarkFragment, sizeof(int), hFile);
+            pBmodel->iNumMarkFragment = LittleLong(pBmodel->iNumMarkFragment);
+
+            //
+            // Load brush model fragments
+            //
+            if (pBmodel->iNumMarkFragment) {
+                pBmodel->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pBmodel->iNumMarkFragment, h_low);
+
+                for (j = 0; j < pBmodel->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pBmodel->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+
+        //
+        // Load all leafs
+        //
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            pLeaf = &tr.world->nodes[i];
+
+            ri.FS_Read(&pLeaf->iNumMarkFragment, sizeof(int), h_low);
+            pLeaf->iNumMarkFragment = LittleLong(pLeaf->iNumMarkFragment);
+
+            if (pLeaf->iNumMarkFragment) {
+                pLeaf->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pLeaf->iNumMarkFragment, h_low);
+
+                //
+                // Load leaf fragments
+                //
+                for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pLeaf->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+    ri.Printf(0, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+}
+
+/*
+=============
+R_RemoveEditPolyFromPointerList
+
+=============
+*/
+void R_RemoveEditPolyFromPointerList(lmEditPoly_t *pPoly, void **pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    for (i = 0; i < *piNumFragments; i++, pFragmentList++) {
+        if (*pFragmentList == pPoly) {
+            *pFragmentList = NULL;
+        }
+
+        if (!*pFragmentList && i < *piNumFragments - 1) {
+            *pFragmentList   = pFragmentList[1];
+            pFragmentList[1] = NULL;
+        }
+    }
+
+    (*piNumFragments)--;
+}
+
+/*
+=============
+R_FreeMarkFragments
+
+Free up all allocated marks
+=============
+*/
+void R_FreeMarkFragments(lmEditMarkDef_t *pMark)
+{
+    lmEditPoly_t *pPoly;
+    int           i;
+
+    while ((pPoly = pMark->pMarkEditPolys)) {
+        pMark->pMarkEditPolys = pPoly->pNextPoly;
+
+        if (pPoly->surf.iIndex < 0) {
+            //
+            // It's a brush model
+            //
+            bmodel_t *pBmodel;
+
+            pBmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+
+            R_RemoveEditPolyFromPointerList(pPoly, pBmodel->pFirstMarkFragment, &pBmodel->iNumMarkFragment);
+            continue;
+        } else {
+            //
+            // It's a leaf
+            //
+            mnode_t *pLeaf;
+
+            for (i = 0; i < pPoly->iNumLeafs; i++) {
+                pLeaf = pPoly->pLeafs[i];
+
+                R_RemoveEditPolyFromPointerList(pPoly, pLeaf->pFirstMarkFragment, &pLeaf->iNumMarkFragment);
+            }
+        }
+
+        pPoly->pNextPoly  = lm.pFreeEditPolys;
+        lm.pFreeEditPolys = pPoly;
+    }
+
+    pMark->iNumEditPolys = 0;
+}
+
+/*
+=============
+R_InitMarkDef
+
+Applies default values to the specified mark definition
+=============
+*/
+void R_InitMarkDef(lmEditMarkDef_t *pMark)
+{
+    VectorClear(pMark->vPos);
+    VectorSet(pMark->vProjection, 0, 0, -1);
+    pMark->fRadius        = 8.0;
+    pMark->fHeightScale   = 1.0;
+    pMark->fWidthScale    = 1.0;
+    pMark->fRotation      = 0.0;
+    pMark->markShader     = tr.defaultShader;
+    pMark->color[0]       = NAN;
+    pMark->bDoLighting    = 1;
+    pMark->pMarkEditPolys = 0;
+    pMark->iNumEditPolys  = 0;
+}
+
+/*
+=============
+R_AllocateMarkDef
+
+Allocates a new mark definition for editing
+=============
+*/
+lmEditMarkDef_t *R_AllocateMarkDef(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    int              i;
+
+    if (!lm.pFreeMarkDefs) {
+        lm.pFreeMarkDefs = (lmEditMarkDef_t *)ri.Hunk_Alloc(sizeof(lmEditMarkDef_t) * MAX_MARK_FRAGMENTS, h_low);
+        if (!lm.pFreeMarkDefs) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_FRAGMENTS - 1; i++) {
+            lm.pFreeMarkDefs[i].pNextMark = &lm.pFreeMarkDefs[i + 1];
+        }
+        lm.pFreeMarkDefs[MAX_MARK_FRAGMENTS - 1].pNextMark = NULL;
+    }
+
+    pNewMark         = lm.pFreeMarkDefs;
+    lm.pFreeMarkDefs = lm.pFreeMarkDefs->pNextMark;
+
+    pNewMark->pNextMark = lm.activeMarkDefs.pNextMark;
+    pNewMark->pPrevMark = &lm.activeMarkDefs;
+
+    lm.activeMarkDefs.pNextMark->pPrevMark = pNewMark;
+    lm.activeMarkDefs.pNextMark            = pNewMark;
+
+    R_InitMarkDef(pNewMark);
+    return pNewMark;
+}
+
+/*
+=============
+R_AllocateEditPoly
+
+Allocates a new mark poly for editing
+=============
+*/
+lmEditPoly_t *R_AllocateEditPoly(void)
+{
+    lmEditPoly_t *pNewPoly;
+    int           i;
+
+    if (!lm.pFreeEditPolys) {
+        lm.pFreeEditPolys = (lmEditPoly_t *)ri.Hunk_Alloc(sizeof(lmEditPoly_t) * MAX_MARK_POLYVERTS, h_low);
+        if (!lm.pFreeEditPolys) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_POLYVERTS - 1; i++) {
+            lm.pFreeEditPolys[i].pNextPoly = &lm.pFreeEditPolys[i + 1];
+        }
+        lm.pFreeEditPolys[MAX_MARK_POLYVERTS - 1].pNextPoly = NULL;
+    }
+
+    pNewPoly                   = lm.pFreeEditPolys;
+    lm.pFreeEditPolys          = lm.pFreeEditPolys->pNextPoly;
+    pNewPoly->surf.surfaceType = SF_MARK_FRAG;
+    pNewPoly->surf.verts       = pNewPoly->verts;
+
+    return pNewPoly;
+}
+
+/*
+=============
+R_AddEditPolyToPointerList
+
+=============
+*/
+qboolean R_AddEditPolyToPointerList(lmEditPoly_t *pPoly, void ***pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    if (!*pFragmentList || (*pFragmentList)[*piNumFragments] == (void *)-1) {
+        void **pNewList = (void **)ri.Malloc((*piNumFragments + MAX_MARK_FRAGMENTS) * sizeof(void *));
+        if (!pNewList) {
+            return 0;
+        }
+
+        for (i = 0; i < *piNumFragments + MAX_MARK_FRAGMENTS; i++) {
+            pNewList[i] = NULL;
+        }
+        pNewList[*piNumFragments + MAX_MARK_FRAGMENTS - 1] = (void *)-1;
+
+        if (*pFragmentList) {
+            Com_Memcpy(pNewList, *pFragmentList, *piNumFragments * sizeof(void *));
+            ri.Free(*pFragmentList);
+        }
+
+        *pFragmentList = pNewList;
+    }
+
+    (*pFragmentList)[*piNumFragments] = pPoly;
+    (*piNumFragments)++;
+
+    return qtrue;
+}
+
+/*
+=============
+R_ApplyLevelDecal
+
+=============
+*/
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+)
+{
+    qboolean         bDoLighting;
+    qboolean         bDoMerge;
+    int              i, j, k, l;
+    int              iNumFragments;
+    float            fRadius;
+    float            fSScale, fTScale;
+    float            fR, fG, fB, fA;
+    float            fRoll;
+    shader_t        *shader;
+    qhandle_t        hShader;
+    lmEditMarkDef_t *pMark;
+    lmEditPoly_t    *pPoly;
+    vec3_t           vOrigin;
+    vec3_t           vProjection;
+    vec3_t           vTmp, vTmp2;
+    vec3_t           vNorm, vNorm2l;
+    vec3_t           bounds[2];
+    markFragment_t   markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t  *mf, *mf2;
+    polyVert_t       verts[MAX_MARK_POLYVERTS];
+    bmodel_t        *pBModel;
+    mnode_t         *pNode;
+    int              iNumNewVerts, iNumMergeVerts;
+    int              iFirstEdgeVert, iFirstEdgeVert2;
+    polyVert_t      *pNewVerts[8];
+    polyVert_t      *pFragVerts;
+    polyVert_t      *pMergeVerts[16];
+    float            fDist, fDist2;
+
     // FIXME: unimplemented
+    return NULL;
 }
 
-void R_RemoveEditPolyFromPointerList(lmEditPoly_t* pPoly, void** pFragmentList, int* piNumFragments)
-{
-	// FIXME: unimplemented
-}
-
-void R_FreeMarkFragments(lmEditMarkDef_t* pMark)
-{
-	// FIXME: unimplemented
-}
-
-void R_InitMarkDef(lmEditMarkDef_t* pMark)
-{
-	// FIXME: unimplemented
-}
-
-lmEditMarkDef_t* R_AllocateMarkDef(void)
-{
-	// FIXME: unimplemented
-	return NULL;
-}
-
-lmEditPoly_t* R_AllocateEditPoly(void)
-{
-	// FIXME: unimplemented
-	return NULL;
-}
-
-qboolean R_AddEditPolyToPointerList(lmEditPoly_t* pPoly, void*** pFragmentList, int* piNumFragments)
-{
-	// FIXME: unimplemented
-	return qfalse;
-}
-
-lmEditMarkDef_t* R_ApplyLevelDecal(const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex)
-{
-	// FIXME: unimplemented
-	return NULL;
-}
+/*
+=============
+DCLC_Make
 
+=============
+*/
 void DCLC_Make(void)
 {
-	// FIXME: unimplemented
+    lmEditMarkDef_t *pNewMark;
+    vec3_t           vProjection;
+
+    VectorNegate(tr.refdef.viewaxis[0], vProjection);
+
+    pNewMark = R_ApplyLevelDecal(tr.refdef.vieworg, vProjection, qfalse, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
 }
 
+/*
+=============
+DCLC_Reapply
+
+=============
+*/
 void DCLC_Reapply(void)
 {
-	// FIXME: unimplemented
+    lmEditMarkDef_t *pNewMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    pNewMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
 }
 
+/*
+=============
+DCLC_Delete
+
+=============
+*/
 void DCLC_Delete(void)
 {
-	// FIXME: unimplemented
+    lmEditMarkDef_t *pMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    R_FreeMarkFragments(lm.pCurrentMark);
+    lm.pCurrentMark = pMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = pMark->pPrevMark;
+        if (lm.pCurrentMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = NULL;
+        }
+    }
+
+    pMark->pPrevMark->pNextMark = pMark->pNextMark;
+    pMark->pNextMark->pPrevMark = pMark->pPrevMark;
+    pMark->pNextMark            = lm.pFreeMarkDefs;
+    pMark->pPrevMark            = 0;
+    lm.pFreeMarkDefs            = pMark;
+
+    if (dcl_autogetinfo->integer) {
+        lm.bAutoApplySettings = qtrue;
+        DCLC_GetInfo();
+    } else {
+        lm.bAutoApplySettings = qfalse;
+    }
 }
 
+/*
+=============
+DCLC_SelectNext
+
+=============
+*/
 void DCLC_SelectNext(void)
 {
-	// FIXME: unimplemented
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pPrevMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pPrevMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        if (lm.activeMarkDefs.pPrevMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
 }
 
+/*
+=============
+DCLC_SelectPrev
+
+=============
+*/
 void DCLC_SelectPrev(void)
 {
-	// FIXME: unimplemented
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pNextMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        if (lm.activeMarkDefs.pNextMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
 }
 
+/*
+=============
+DCLC_SelectCh
+
+=============
+*/
 void DCLC_SelectCh(void)
 {
-	// FIXME: unimplemented
+    // Nothing to do
 }
 
+/*
+=============
+DCLC_SelectChNxt
+
+=============
+*/
 void DCLC_SelectChNxt(void)
 {
-	// FIXME: unimplemented
+    // Nothing to do
 }
 
+/*
+=============
+DCLC_GetInfo
+
+=============
+*/
 void DCLC_GetInfo(void)
 {
-	// FIXME: unimplemented
+    if (!lm.pCurrentMark) {
+        return;
+    }
+
+    if (lm.pCurrentMark->fRotation == -1) {
+        Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+    } else {
+        Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+        Cvar_SetValue("dcl_rotation", lm.pCurrentMark->fRotation);
+        Cvar_SetValue("dcl_r", lm.pCurrentMark->color[0]);
+        Cvar_SetValue("dcl_g", lm.pCurrentMark->color[1]);
+        Cvar_SetValue("dcl_b", lm.pCurrentMark->color[2]);
+    }
+
+    Cvar_SetValue("dcl_alpha", lm.pCurrentMark->color[3]);
+    Cvar_SetValue("dcl_dolighting", lm.pCurrentMark->bDoLighting);
+
+    lm.bAutoApplySettings = qtrue;
 }
 
+/*
+=============
+DCLC_ShiftUp
+
+=============
+*/
 void DCLC_ShiftUp(void)
 {
-	// FIXME: unimplemented
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
 }
 
+/*
+=============
+DCLC_ShiftDown
+
+=============
+*/
 void DCLC_ShiftDown(void)
 {
-	// FIXME: unimplemented
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
 }
 
+/*
+=============
+DCLC_ShiftLeft
+
+=============
+*/
 void DCLC_ShiftLeft(void)
 {
-	// FIXME: unimplemented
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
 }
 
+/*
+=============
+DCLC_ShiftRight
+
+=============
+*/
 void DCLC_ShiftRight(void)
 {
-	// FIXME: unimplemented
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
 }
 
+/*
+=============
+DCLC_RandomRoll
+
+=============
+*/
 void DCLC_RandomRoll(void)
 {
-	// FIXME: unimplemented
+    Cvar_SetValue("dcl_rotation", random() * 360.0);
 }
 
+/*
+=============
+R_LevelMarksInit
+
+Initialize the level mark system with variables and commands
+=============
+*/
 void R_LevelMarksInit()
 {
-	memset(&lm, 0, sizeof(lm));
+    memset(&lm, 0, sizeof(lm));
 
-	dcl_editmode = ri.Cvar_Get("dcl_editmode", "0", CVAR_LATCH);
-	dcl_showcurrent = ri.Cvar_Get("dcl_showcurrent", "1", 0);
-	dcl_autogetinfo = ri.Cvar_Get("dcl_autogetinfo", "1", 0);
-	dcl_shiftstep = ri.Cvar_Get("dcl_shiftstep", "4", 0);
-	dcl_shader = ri.Cvar_Get("dcl_shader", "blastmark", 0);
-	dcl_radius = ri.Cvar_Get("dcl_radius", "16", 0);
-	dcl_heightscale = ri.Cvar_Get("dcl_heightscale", "1", 0);
-	dcl_widthscale = ri.Cvar_Get("dcl_widthscale", "1", 0);
-	dcl_rotation = ri.Cvar_Get("dcl_rotation", "0", 0);
-	dcl_r = ri.Cvar_Get("dcl_r", "1", 0);
-	dcl_g = ri.Cvar_Get("dcl_g", "1", 0);
-	dcl_b = ri.Cvar_Get("dcl_b", "1", 0);
-	dcl_alpha = ri.Cvar_Get("dcl_alpha", "1", 0);
-	dcl_dolighting = ri.Cvar_Get("dcl_dolighting", "1", 0);
-	dcl_doworld = ri.Cvar_Get("dcl_doworld", "1", 0);
-	dcl_doterrain = ri.Cvar_Get("dcl_doterrain", "1", 0);
-	dcl_dobmodels = ri.Cvar_Get("dcl_dobmodels", "1", 0);
-	dcl_dostring = ri.Cvar_Get("dcl_dostring", "apply to all", 0);
-	dcl_pathmode = ri.Cvar_Get("dcl_pathmode", "0", 0);
-	dcl_maxsegment = ri.Cvar_Get("dcl_maxsegment", "512", 0);
-	dcl_minsegment = ri.Cvar_Get("dcl_minsegment", "24", 0);
-	dcl_maxoffset = ri.Cvar_Get("dcl_maxoffset", "10", 0);
-	dcl_texturescale = ri.Cvar_Get("dcl_texturescale", "32", 0);
+    dcl_editmode     = ri.Cvar_Get("dcl_editmode", "0", CVAR_LATCH);
+    dcl_showcurrent  = ri.Cvar_Get("dcl_showcurrent", "1", 0);
+    dcl_autogetinfo  = ri.Cvar_Get("dcl_autogetinfo", "1", 0);
+    dcl_shiftstep    = ri.Cvar_Get("dcl_shiftstep", "4", 0);
+    dcl_shader       = ri.Cvar_Get("dcl_shader", "blastmark", 0);
+    dcl_radius       = ri.Cvar_Get("dcl_radius", "16", 0);
+    dcl_heightscale  = ri.Cvar_Get("dcl_heightscale", "1", 0);
+    dcl_widthscale   = ri.Cvar_Get("dcl_widthscale", "1", 0);
+    dcl_rotation     = ri.Cvar_Get("dcl_rotation", "0", 0);
+    dcl_r            = ri.Cvar_Get("dcl_r", "1", 0);
+    dcl_g            = ri.Cvar_Get("dcl_g", "1", 0);
+    dcl_b            = ri.Cvar_Get("dcl_b", "1", 0);
+    dcl_alpha        = ri.Cvar_Get("dcl_alpha", "1", 0);
+    dcl_dolighting   = ri.Cvar_Get("dcl_dolighting", "1", 0);
+    dcl_doworld      = ri.Cvar_Get("dcl_doworld", "1", 0);
+    dcl_doterrain    = ri.Cvar_Get("dcl_doterrain", "1", 0);
+    dcl_dobmodels    = ri.Cvar_Get("dcl_dobmodels", "1", 0);
+    dcl_dostring     = ri.Cvar_Get("dcl_dostring", "apply to all", 0);
+    dcl_pathmode     = ri.Cvar_Get("dcl_pathmode", "0", 0);
+    dcl_maxsegment   = ri.Cvar_Get("dcl_maxsegment", "512", 0);
+    dcl_minsegment   = ri.Cvar_Get("dcl_minsegment", "24", 0);
+    dcl_maxoffset    = ri.Cvar_Get("dcl_maxoffset", "10", 0);
+    dcl_texturescale = ri.Cvar_Get("dcl_texturescale", "32", 0);
 
-	if (dcl_editmode->integer)
-	{
-		ri.Cmd_AddCommand("dclc_make", DCLC_Make);
-		ri.Cmd_AddCommand("dclc_reapply", DCLC_Reapply);
-		ri.Cmd_AddCommand("dclc_delete", DCLC_Delete);
-		ri.Cmd_AddCommand("dclc_selectnext", DCLC_SelectNext);
-		ri.Cmd_AddCommand("dclc_selectprev", DCLC_SelectPrev);
-		ri.Cmd_AddCommand("dclc_selectch", DCLC_SelectCh);
-		ri.Cmd_AddCommand("dclc_selectchnxt", DCLC_SelectChNxt);
-		ri.Cmd_AddCommand("dclc_getinfo", DCLC_GetInfo);
-		ri.Cmd_AddCommand("dclc_shiftup", DCLC_ShiftUp);
-		ri.Cmd_AddCommand("dclc_shiftdown", DCLC_ShiftDown);
-		ri.Cmd_AddCommand("dclc_shiftleft", DCLC_ShiftLeft);
-		ri.Cmd_AddCommand("dclc_shiftright", DCLC_ShiftRight);
-		ri.Cmd_AddCommand("dclc_randomroll", DCLC_RandomRoll);
-		ri.Cmd_AddCommand("dclc_save", DCLC_Save);
+    if (dcl_editmode->integer) {
+        ri.Cmd_AddCommand("dclc_make", DCLC_Make);
+        ri.Cmd_AddCommand("dclc_reapply", DCLC_Reapply);
+        ri.Cmd_AddCommand("dclc_delete", DCLC_Delete);
+        ri.Cmd_AddCommand("dclc_selectnext", DCLC_SelectNext);
+        ri.Cmd_AddCommand("dclc_selectprev", DCLC_SelectPrev);
+        ri.Cmd_AddCommand("dclc_selectch", DCLC_SelectCh);
+        ri.Cmd_AddCommand("dclc_selectchnxt", DCLC_SelectChNxt);
+        ri.Cmd_AddCommand("dclc_getinfo", DCLC_GetInfo);
+        ri.Cmd_AddCommand("dclc_shiftup", DCLC_ShiftUp);
+        ri.Cmd_AddCommand("dclc_shiftdown", DCLC_ShiftDown);
+        ri.Cmd_AddCommand("dclc_shiftleft", DCLC_ShiftLeft);
+        ri.Cmd_AddCommand("dclc_shiftright", DCLC_ShiftRight);
+        ri.Cmd_AddCommand("dclc_randomroll", DCLC_RandomRoll);
+        ri.Cmd_AddCommand("dclc_save", DCLC_Save);
 
-		lm.activeMarkDefs.pNextMark = &lm.activeMarkDefs;
-		lm.activeMarkDefs.pPrevMark = &lm.activeMarkDefs;
-	}
+        lm.activeMarkDefs.pNextMark = &lm.activeMarkDefs;
+        lm.activeMarkDefs.pPrevMark = &lm.activeMarkDefs;
+    }
 }
 
+/*
+=============
+R_LevelMarksFree
+
+Remove level marks commands and deallocate all memory
+=============
+*/
 void R_LevelMarksFree()
 {
-	int i;
+    int i;
 
-	if (!dcl_editmode->integer) {
-		return;
-	}
+    if (!dcl_editmode->integer) {
+        return;
+    }
 
-	ri.Cmd_RemoveCommand("dclc_make");
-	ri.Cmd_RemoveCommand("dclc_reapply");
-	ri.Cmd_RemoveCommand("dclc_delete");
-	ri.Cmd_RemoveCommand("dclc_selectnext");
-	ri.Cmd_RemoveCommand("dclc_selectprev");
-	ri.Cmd_RemoveCommand("dclc_selectch");
-	ri.Cmd_RemoveCommand("dclc_selectchnxt");
-	ri.Cmd_RemoveCommand("dclc_getinfo");
-	ri.Cmd_RemoveCommand("dclc_shiftup");
-	ri.Cmd_RemoveCommand("dclc_shiftdown");
-	ri.Cmd_RemoveCommand("dclc_shiftleft");
-	ri.Cmd_RemoveCommand("dclc_shiftright");
-	ri.Cmd_RemoveCommand("dclc_randomroll");
-	ri.Cmd_RemoveCommand("dclc_save");
+    ri.Cmd_RemoveCommand("dclc_make");
+    ri.Cmd_RemoveCommand("dclc_reapply");
+    ri.Cmd_RemoveCommand("dclc_delete");
+    ri.Cmd_RemoveCommand("dclc_selectnext");
+    ri.Cmd_RemoveCommand("dclc_selectprev");
+    ri.Cmd_RemoveCommand("dclc_selectch");
+    ri.Cmd_RemoveCommand("dclc_selectchnxt");
+    ri.Cmd_RemoveCommand("dclc_getinfo");
+    ri.Cmd_RemoveCommand("dclc_shiftup");
+    ri.Cmd_RemoveCommand("dclc_shiftdown");
+    ri.Cmd_RemoveCommand("dclc_shiftleft");
+    ri.Cmd_RemoveCommand("dclc_shiftright");
+    ri.Cmd_RemoveCommand("dclc_randomroll");
+    ri.Cmd_RemoveCommand("dclc_save");
 
-	for (i = 0; i < tr.world->numBmodels; i++)
-	{
-		bmodel_t* pBmodel = &tr.world->bmodels[i];
-		if (pBmodel->iNumMarkFragment && pBmodel->pFirstMarkFragment)
-		{
-			ri.Free(pBmodel->pFirstMarkFragment);
-			pBmodel->pFirstMarkFragment = NULL;
-			pBmodel->iNumMarkFragment = 0;
-		}
-	}
+    if (tr.world) {
+        for (i = 0; i < tr.world->numBmodels; i++) {
+            bmodel_t *pBmodel = &tr.world->bmodels[i];
 
-	for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++)
-	{
-		mnode_t* pLeaf = &tr.world->nodes[i];
+            if (pBmodel->iNumMarkFragment && pBmodel->pFirstMarkFragment) {
+                ri.Free(pBmodel->pFirstMarkFragment);
+                pBmodel->pFirstMarkFragment = NULL;
+                pBmodel->iNumMarkFragment   = 0;
+            }
+        }
 
-		if (pLeaf->iNumMarkFragment)
-		{
-			if (pLeaf->pFirstMarkFragment)
-			{
-				ri.Free(pLeaf->pFirstMarkFragment);
-				pLeaf->pFirstMarkFragment = NULL;
-				pLeaf->iNumMarkFragment = 0;
-			}
-		}
-	}
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            mnode_t *pLeaf = &tr.world->nodes[i];
+
+            if (pLeaf->iNumMarkFragment) {
+                if (pLeaf->pFirstMarkFragment) {
+                    ri.Free(pLeaf->pFirstMarkFragment);
+                    pLeaf->pFirstMarkFragment = NULL;
+                    pLeaf->iNumMarkFragment   = 0;
+                }
+            }
+        }
+    }
 }
 
+/*
+=============
+R_InitTreadMark
+
+=============
+*/
+static void R_InitTreadMark(treadMark_t *treadMark)
+{
+    treadMark->iReferenceNumber = 0;
+    treadMark->iLastTime        = 0;
+    treadMark->hTreadShader     = 0;
+    treadMark->iState           = 0;
+    treadMark->fWidth           = 0;
+
+    VectorClear(treadMark->vStartDir);
+    VectorClear(treadMark->vStartVerts[0]);
+    VectorClear(treadMark->vStartVerts[1]);
+    treadMark->fStartTexCoord = 0;
+    treadMark->fStartAlpha    = 0;
+
+    VectorClear(treadMark->vMidPos);
+    VectorClear(treadMark->vMidVerts[0]);
+    VectorClear(treadMark->vMidVerts[1]);
+    treadMark->fMidTexCoord = 0;
+    treadMark->fMidAlpha    = 0;
+
+    VectorClear(treadMark->vEndPos);
+    VectorClear(treadMark->vEndVerts[0]);
+    VectorClear(treadMark->vEndVerts[1]);
+    treadMark->fEndTexCoord = 0;
+    treadMark->fEndAlpha    = 0;
+}
+
+/*
+=============
+R_UpdateLevelMarksSystem
+
+Draw lines for editing
+=============
+*/
 void R_UpdateLevelMarksSystem()
 {
-    // FIXME: unimplemented
+    int   iReturn;
+    float fAlpha;
+    float fTexScale;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    if (dcl_pathmode->integer) {
+        if (!lm.bPathLayingMode) {
+            R_InitTreadMark(&lm.treadMark);
+            lm.treadMark.iLastTime  = -1000;
+            lm.pTreadMarkStartDecal = NULL;
+            lm.pTreadMarkEndDecal   = NULL;
+            lm.bPathLayingMode      = qtrue;
+        }
+
+        lm.treadMark.hTreadShader = RE_RegisterShader(dcl_shader->string);
+        lm.treadMark.fWidth       = Q_clamp_float(dcl_radius->value * dcl_widthscale->value, 2, 1024);
+
+        fAlpha    = Q_clamp_float(dcl_alpha->value, 0, 1);
+        fTexScale = 1.0 / dcl_texturescale->value;
+        iReturn   = ri.CG_PermanentUpdateTreadMark(
+            &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+        );
+
+        if (iReturn == 1) {
+            lm.pTreadMarkStartDecal = lm.pTreadMarkEndDecal;
+            lm.pTreadMarkEndDecal   = NULL;
+
+            ri.CG_PermanentUpdateTreadMark(
+                &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+            );
+        }
+
+        if (iReturn != -1) {
+            if (!lm.pTreadMarkEndDecal) {
+                lm.pTreadMarkEndDecal = R_AllocateMarkDef();
+            }
+
+            if (lm.pTreadMarkEndDecal) {
+                lm.pCurrentMark = lm.pTreadMarkEndDecal;
+                lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 2);
+                if (!lm.pCurrentMark) {
+                    R_FreeMarkFragments(lm.pTreadMarkEndDecal);
+                }
+            }
+
+            if (lm.treadMark.iState == 3) {
+                if (!lm.pTreadMarkStartDecal) {
+                    lm.pTreadMarkStartDecal = R_AllocateMarkDef();
+                }
+
+                if (lm.pTreadMarkStartDecal) {
+                    lm.pCurrentMark = lm.pTreadMarkStartDecal;
+                    lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 1);
+                    if (!lm.pCurrentMark) {
+                        R_FreeMarkFragments(lm.pTreadMarkStartDecal);
+                    }
+                }
+            }
+        }
+
+        if (lm.pTreadMarkEndDecal) {
+            lm.pCurrentMark = lm.pTreadMarkEndDecal;
+        } else if (lm.pTreadMarkStartDecal) {
+            lm.pCurrentMark = lm.pTreadMarkStartDecal;
+        }
+
+    } else if (lm.bPathLayingMode) {
+        lm.bPathLayingMode = qfalse;
+    }
+
+    if (lm.bAutoApplySettings && lm.pCurrentMark && lm.pCurrentMark->fRotation == -1) {
+        qboolean bDoUpdate = qfalse;
+        float    f;
+
+        if (dcl_shader->modified) {
+            shader_t *shader;
+            qhandle_t hShader;
+
+            hShader = RE_RegisterShader(dcl_shader->string);
+            if (hShader) {
+                shader = R_GetShaderByHandle(hShader);
+                if (shader != tr.defaultShader && lm.pCurrentMark->markShader != shader) {
+                    lm.pCurrentMark->markShader = shader;
+                    // Set the decal radius
+                    Cvar_SetValue("dcl_radius", 16.0);
+                    dcl_radius->modified = qfalse;
+
+                    // Set the decal scale
+                    Cvar_SetValue(
+                        "dcl_heightscale", shader->unfoggedStages[0]->bundle[0].image[0]->height / 16.0 * 0.5
+                    );
+                    Cvar_SetValue("dcl_widthscale", shader->unfoggedStages[0]->bundle[0].image[0]->width / 16.0 * 0.5);
+
+                    bDoUpdate = qtrue;
+                }
+            }
+            dcl_shader->modified = 0;
+        }
+
+        if (dcl_radius->modified) {
+            f = dcl_radius->value;
+            if (lm.pCurrentMark->fRadius != f) {
+                lm.pCurrentMark->fRadius = f;
+                bDoUpdate                = qtrue;
+            }
+
+            dcl_radius->modified = qfalse;
+        }
+
+        if (dcl_heightscale->modified) {
+            f = dcl_heightscale->value;
+            if (lm.pCurrentMark->fHeightScale != f) {
+                lm.pCurrentMark->fHeightScale = f;
+                bDoUpdate                     = qtrue;
+            }
+
+            dcl_heightscale->modified = qfalse;
+        }
+        if (dcl_widthscale->modified) {
+            f = dcl_widthscale->value;
+            if (lm.pCurrentMark->fWidthScale != f) {
+                lm.pCurrentMark->fWidthScale = f;
+                bDoUpdate                    = qtrue;
+            }
+
+            dcl_widthscale->modified = qfalse;
+        }
+
+        if (dcl_rotation->modified) {
+            f = anglemod(dcl_rotation->value);
+            if (lm.pCurrentMark->fRotation != f) {
+                lm.pCurrentMark->fRotation = f;
+                bDoUpdate                  = qtrue;
+            }
+
+            dcl_rotation->modified = qfalse;
+        }
+
+        if (dcl_r->modified) {
+            f = Q_clamp_float(dcl_r->value, 0, 1);
+            if (lm.pCurrentMark->color[0] != f) {
+                lm.pCurrentMark->color[0] = f;
+                bDoUpdate                 = qtrue;
+            }
+
+            dcl_r->modified = qfalse;
+        }
+        if (dcl_g->modified) {
+            f = Q_clamp_float(dcl_g->value, 0, 1);
+            if (lm.pCurrentMark->color[1] != f) {
+                lm.pCurrentMark->color[1] = f;
+                bDoUpdate                 = qtrue;
+            }
+
+            dcl_g->modified = qfalse;
+        }
+        if (dcl_b->modified) {
+            f = Q_clamp_float(dcl_b->value, 0, 1);
+            if (lm.pCurrentMark->color[2] != f) {
+                lm.pCurrentMark->color[2] = f;
+                bDoUpdate                 = qtrue;
+            }
+
+            dcl_b->modified = qfalse;
+        }
+        if (dcl_alpha->modified) {
+            f = Q_clamp_float(dcl_alpha->value, 0, 1);
+            if (lm.pCurrentMark->color[0] != f) {
+                lm.pCurrentMark->color[0] = f;
+                bDoUpdate                 = qtrue;
+            }
+
+            dcl_alpha->modified = qfalse;
+        }
+
+        if (dcl_dolighting->modified) {
+            qboolean bDoLighting = dcl_dolighting->integer != 0;
+            if (lm.pCurrentMark->bDoLighting != bDoLighting) {
+                lm.pCurrentMark->bDoLighting = bDoLighting;
+                bDoUpdate                    = 1;
+            }
+            dcl_dolighting->modified = 0;
+        }
+
+        if (bDoUpdate) {
+            lm.pCurrentMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qtrue, 0);
+        }
+    }
+
+    if (dcl_showcurrent->integer && lm.pCurrentMark && lm.pCurrentMark->iNumEditPolys) {
+        float          fColor;
+        float          fLength;
+        int            j;
+        int            iEntNum;
+        lmEditPoly_t  *pPoly;
+        polyVert_t    *pVert, *pVert2;
+        polyVert_t     verts[8];
+        trRefEntity_t *ent;
+        bmodel_t      *bmodel, *lastbmodel;
+        model_t       *pModel;
+        vec3_t         vOrigin;
+        vec3_t         axis[3];
+        vec3_t         vPos, vPos2;
+        vec3_t         polyaxis[3];
+
+        iEntNum    = 0;
+        ent        = NULL;
+        lastbmodel = NULL;
+        vectoangles(lm.pCurrentMark->vProjection, vPos);
+
+        vPos[2] = anglemod(vPos[2] + lm.pCurrentMark->fRotation);
+        AngleVectorsLeft(vPos, polyaxis[0], polyaxis[1], polyaxis[2]);
+        VectorNormalize2(lm.pCurrentMark->vProjection, polyaxis[0]);
+        PerpendicularVector(polyaxis[1], polyaxis[0]);
+        RotatePointAroundVector(polyaxis[2], polyaxis[0], polyaxis[1], anglemod(lm.pCurrentMark->fRotation + 90.0));
+        CrossProduct(polyaxis[0], polyaxis[2], polyaxis[1]);
+
+        fColor = sin(tr.refdef.time / 500.0) / 4.0 + 0.6;
+
+        for (pPoly = lm.pCurrentMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            if (pPoly->surf.iIndex > 0) {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, 1.0 - fColor, 0.1, 1.0);
+                }
+            } else if (pPoly->surf.iIndex < 0) {
+                bmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+                if (bmodel != lastbmodel) {
+                    //
+                    // Find the matching entity
+                    //
+
+                    ent = &tr.refdef.entities[0];
+                    for (iEntNum = 0; iEntNum < tr.refdef.num_entities; iEntNum++) {
+                        ent = &tr.refdef.entities[iEntNum];
+
+                        pModel = R_GetModelByHandle(ent->e.hModel);
+                        if (pModel->type == MOD_BRUSH && pModel->d.bmodel == bmodel) {
+                            break;
+                        }
+                    }
+
+                    VectorCopy(ent->e.origin, vOrigin);
+                    AxisCopy(ent->e.axis, axis);
+                }
+
+                if (iEntNum != tr.refdef.num_entities) {
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        MatrixTransformVector(pPoly->verts[j].xyz, axis, pPoly->verts[j].xyz);
+                        VectorAdd(pPoly->verts[j].xyz, vOrigin, pPoly->verts[j].xyz);
+                    }
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                        VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                        VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                    }
+                }
+            } else {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                }
+            }
+        }
+
+        //
+        // Draw the front
+        //
+
+        fLength = (lm.pCurrentMark->fWidthScale + lm.pCurrentMark->fHeightScale) * lm.pCurrentMark->fRadius * 0.75;
+        if (fLength < 4) {
+            fLength = 4;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[0], vPos);
+
+        R_DebugLine(lm.pCurrentMark->vPos, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the right
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fWidthScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[1], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[1], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the up
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fHeightScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[2], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[2], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+    }
 }
 
-void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment) {
-	// FIXME: unimplemented
+/*
+=============
+R_AddPermanentMarkFragmentSurfaces
+
+=============
+*/
+void R_AddPermanentMarkFragmentSurfaces(void **pFirstMarkFragment, int iNumMarkFragment)
+{
+    int       i;
+    lmPoly_t *pPoly;
+
+    for (i = 0; i < iNumMarkFragment; i++) {
+        pPoly = (lmPoly_t *)pFirstMarkFragment[i];
+
+        if (pPoly->viewCount == tr.viewCount) {
+            continue;
+        }
+        pPoly->viewCount = tr.viewCount;
+
+        R_AddDrawSurf(&pPoly->surf.surfaceType, pPoly->shader, 0);
+    }
 }
\ No newline at end of file

From 4123bef60db99a9c49ad17bcbfd05e04ffef11b6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:05:48 +0200
Subject: [PATCH 0743/2040] Implement R_ApplyLevelDecal

---
 code/renderer/tr_marks_permanent.c | 352 ++++++++++++++++++++++++++++-
 1 file changed, 349 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 830f3586..03ba5e0f 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -799,7 +799,7 @@ lmEditMarkDef_t *R_ApplyLevelDecal(
     vec3_t           vOrigin;
     vec3_t           vProjection;
     vec3_t           vTmp, vTmp2;
-    vec3_t           vNorm, vNorm2l;
+    vec3_t           vNorm, vNorm2;
     vec3_t           bounds[2];
     markFragment_t   markFragments[MAX_MARK_FRAGMENTS];
     markFragment_t  *mf, *mf2;
@@ -813,8 +813,354 @@ lmEditMarkDef_t *R_ApplyLevelDecal(
     polyVert_t      *pMergeVerts[16];
     float            fDist, fDist2;
 
-    // FIXME: unimplemented
-    return NULL;
+    iFirstEdgeVert = iFirstEdgeVert2 = 0;
+
+    if (bUseCurrent && !lm.pCurrentMark) {
+        return NULL;
+    }
+
+    if (iPathIndex) {
+        shader = R_GetShaderByHandle(lm.treadMark.hTreadShader);
+
+        fRadius = lm.treadMark.fWidth;
+        fTScale = 1.0;
+        fSScale = 1.0;
+
+        fG = 1.0;
+        fR = 1.0;
+        fA = 1.0;
+        fB = 1.0;
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = -1.0;
+    } else if (bUseCurrent && bUseCurrentSettings) {
+        shader = lm.pCurrentMark->markShader;
+
+        fRadius = lm.pCurrentMark->fRadius;
+        fSScale = lm.pCurrentMark->fWidthScale;
+        fTScale = lm.pCurrentMark->fHeightScale;
+
+        fR = lm.pCurrentMark->color[0];
+        fG = lm.pCurrentMark->color[1];
+        fB = lm.pCurrentMark->color[2];
+        fA = lm.pCurrentMark->color[3];
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = lm.pCurrentMark->fRotation;
+    } else {
+        hShader = RE_RegisterShader(dcl_shader->string);
+        if (hShader) {
+            shader = R_GetShaderByHandle(hShader);
+        } else {
+            ri.Printf(PRINT_ALL, "Bad decal shader %s\n", dcl_shader->string);
+            shader = tr.defaultShader;
+        }
+
+        fRadius = dcl_radius->value;
+        fSScale = dcl_widthscale->value;
+        fTScale = dcl_heightscale->value;
+
+        fR = Q_clamp_float(dcl_r->value, 0.0, 1.0);
+        fG = Q_clamp_float(dcl_g->value, 0.0, 1.0);
+        fB = Q_clamp_float(dcl_b->value, 0.0, 1.0);
+        fA = Q_clamp_float(dcl_alpha->value, 0.0, 1.0);
+
+        bDoLighting = dcl_dolighting->integer != 0;
+        fRoll       = anglemod(dcl_rotation->value);
+    }
+
+    if (fRadius < 0.0) {
+        fRadius = 0.001;
+    }
+    if (fSScale < 0.0) {
+        fSScale = 0.001;
+    }
+    if (fTScale < 0.0) {
+        fTScale = 0.001;
+    }
+
+    VectorCopy(vPos, vOrigin);
+    VectorNormalize2(vDir, vProjection);
+
+    if (iPathIndex) {
+        iNumFragments =
+            ri.CG_PermanentTreadMarkDecal(&lm.treadMark, iPathIndex == 1, bDoLighting, markFragments, verts);
+    } else {
+        iNumFragments = ri.CG_PermanentMark(
+            vOrigin,
+            vProjection,
+            anglemod(fRoll + 90),
+            fSScale * fRadius,
+            fTScale * fRadius,
+            fR,
+            fG,
+            fB,
+            fA,
+            bDoLighting,
+            0.5,
+            0.5,
+            markFragments,
+            verts
+        );
+    }
+
+    if (!iNumFragments) {
+        return NULL;
+    }
+
+    if (bUseCurrent) {
+        pMark = lm.pCurrentMark;
+        R_FreeMarkFragments(lm.pCurrentMark);
+    } else {
+        pMark = R_AllocateMarkDef();
+        if (!pMark) {
+            return NULL;
+        }
+    }
+
+    VectorCopy(vOrigin, pMark->vPos);
+    VectorCopy(vProjection, pMark->vProjection);
+
+    pMark->markShader   = shader;
+    pMark->fRadius      = fRadius;
+    pMark->fWidthScale  = fSScale;
+    pMark->fHeightScale = fTScale;
+    VectorSet4(pMark->color, fR, fG, fB, fA);
+
+    pMark->bDoLighting = bDoLighting;
+    pMark->fRotation   = fRoll;
+
+    if (iPathIndex) {
+        if (iPathIndex == 1) {
+            VectorCopy(lm.treadMark.vStartVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vStartVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[3]);
+        } else {
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vEndVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vEndVerts[1], pMark->vPathCorners[3]);
+        }
+
+        VectorClear(vOrigin);
+
+        for (i = 0; i < 4; i++) {
+            VectorAdd(vOrigin, pMark->vPathCorners[i], vOrigin);
+        }
+
+        vOrigin[0] /= 4.0;
+        vOrigin[1] /= 4.0;
+        vOrigin[2] = vOrigin[2] / 4.0 + 16.0;
+        VectorCopy(vOrigin, pMark->vPos);
+    }
+
+    for (i = 0; i < iNumFragments; i++) {
+        mf = &markFragments[i];
+
+        if (!mf->numPoints) {
+            continue;
+        }
+
+        assert(mf->numPoints >= 3);
+
+        iNumNewVerts = mf->numPoints;
+        for (j = 0; j < mf->numPoints; ++j) {
+            pNewVerts[j] = &verts[mf->firstPoint + j];
+        }
+
+        VectorSubtract(pNewVerts[0]->xyz, pNewVerts[1]->xyz, vTmp);
+        VectorSubtract(pNewVerts[2]->xyz, pNewVerts[1]->xyz, vTmp2);
+        CrossProduct(vTmp, vTmp2, vNorm);
+        VectorNormalize(vNorm);
+
+        fDist = DotProduct(vNorm, pNewVerts[0]->xyz);
+
+        if (mf->iIndex <= 0) {
+            for (j = i + 1; j < iNumFragments; j++) {
+                mf2 = &markFragments[j];
+
+                if (!mf2->numPoints) {
+                    continue;
+                }
+                if (mf2->iIndex > 0 || mf->iIndex == mf2->iIndex) {
+                    continue;
+                }
+
+                pFragVerts = &verts[mf2->firstPoint];
+
+                if (fabs(DotProduct(vNorm, pFragVerts->xyz) - fDist) > 0.01) {
+                    continue;
+                }
+
+                VectorSubtract(pFragVerts[0].xyz, pFragVerts[1].xyz, vTmp);
+                VectorSubtract(pFragVerts[2].xyz, pFragVerts[1].xyz, vTmp2);
+                CrossProduct(vTmp, vTmp2, vNorm2);
+                VectorNormalize(vNorm2);
+
+                if (!VectorCompare(vNorm, vNorm2)) {
+                    continue;
+                }
+
+                bDoMerge = qfalse;
+                for (k = 0; k < iNumNewVerts; k++) {
+                    for (l = 0; l < mf2->numPoints; l++) {
+                        if (VectorCompare(pNewVerts[k]->xyz, pFragVerts[(l + 1) % mf2->numPoints].xyz)
+                            && VectorCompare(pNewVerts[(k + 1) % iNumNewVerts]->xyz, pFragVerts[l].xyz)) {
+                            bDoMerge        = 1;
+                            iFirstEdgeVert  = k;
+                            iFirstEdgeVert2 = l;
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        break;
+                    }
+                }
+
+                if (bDoMerge) {
+                    iNumMergeVerts = 0;
+                    for (k = 1; k < iNumNewVerts; ++k) {
+                        pMergeVerts[iNumMergeVerts++] = pNewVerts[(k + iFirstEdgeVert) % iNumNewVerts];
+                    }
+
+                    for (k = 1; k < mf2->numPoints; k++) {
+                        pMergeVerts[iNumMergeVerts++] = &pFragVerts[(k + iFirstEdgeVert2) % mf2->numPoints];
+                    }
+
+                    bDoMerge = qtrue;
+
+                    for (k = 0; k < iNumMergeVerts; k++) {
+                        VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                        CrossProduct(vNorm, vTmp, vNorm2);
+                        VectorNormalize(vNorm2);
+
+                        for (l = 0; l < iNumMergeVerts; l++) {
+                            if (l == k) {
+                                break;
+                            }
+
+                            if (DotProduct(pMergeVerts[l]->xyz, vNorm)
+                                > DotProduct(pMergeVerts[k]->xyz, vNorm2) + 0.01) {
+                                bDoMerge = qfalse;
+                                break;
+                            }
+                        }
+
+                        if (!bDoMerge) {
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        for (k = 0; k < iNumMergeVerts; k++) {
+                            VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                            VectorNormalize(vTmp);
+                            VectorSubtract(
+                                pMergeVerts[k]->xyz, pMergeVerts[(iNumMergeVerts + k - 1) % iNumMergeVerts]->xyz, vTmp
+                            );
+                            VectorNormalize(vTmp2);
+
+                            if (DotProduct(vTmp, vTmp2) > 0.999) {
+                                for (l = k + 1; l < iNumMergeVerts; l++) {
+                                    pMergeVerts[l - 1] = pMergeVerts[l];
+                                }
+                            }
+                        }
+
+                        if (iNumMergeVerts <= 8) {
+                            iNumNewVerts = iNumMergeVerts;
+                            for (k = 0; k < iNumMergeVerts; k++) {
+                                pNewVerts[k] = pMergeVerts[k];
+                            }
+
+                            mf2->numPoints = 0;
+                        }
+                    }
+                }
+            }
+        }
+
+        pPoly = R_AllocateEditPoly();
+        if (!pPoly) {
+            return pMark;
+        }
+
+        pPoly->shader        = shader;
+        pPoly->surf.numVerts = iNumNewVerts;
+
+        for (j = 0; j < iNumNewVerts; j++) {
+            memcpy(&pPoly->verts[j], pNewVerts[j], sizeof(polyVert_t));
+        }
+
+        pPoly->surf.iIndex = mf->iIndex;
+        pPoly->iNumLeafs   = 0;
+
+        if (mf->iIndex <= 0 || dcl_doworld->integer && dcl_doterrain->integer) {
+            if (mf->iIndex >= 0) {
+                if (dcl_doworld->integer) {
+                    ClearBounds(bounds[0], bounds[1]);
+                    VectorClear(vOrigin);
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorAdd(pPoly->verts[j].xyz, vNorm, vTmp);
+
+                        pNode = R_PointInLeaf(vTmp);
+                        if (pNode && pNode->contents != -1 && !(pNode->contents & CONTENTS_SOLID)) {
+                            for (k = 0; k < pPoly->iNumLeafs; k++) {
+                                if (pPoly->pLeafs[k] == pNode) {
+                                    break;
+                                }
+                            }
+
+                            if (k == pPoly->iNumLeafs) {
+                                R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                                pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                                pPoly->iNumLeafs++;
+                            }
+                        }
+
+                        AddPointToBounds(vTmp, bounds[0], bounds[1]);
+                        VectorAdd(vOrigin, vTmp, vOrigin);
+                    }
+
+                    VectorScale(vOrigin, 1.0 / pPoly->surf.numVerts, vOrigin);
+
+                    pNode = R_PointInLeaf(vOrigin);
+                    for (k = 0; k < pPoly->iNumLeafs; k++) {
+                        if (pPoly->pLeafs[k] == pNode) {
+                            break;
+                        }
+                    }
+
+                    if (k == pPoly->iNumLeafs) {
+                        R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                        pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                        pPoly->iNumLeafs++;
+                    }
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            } else {
+                if (dcl_dobmodels->integer) {
+                    R_AddEditPolyToPointerList(
+                        pPoly,
+                        &tr.world->bmodels[-mf->iIndex].pFirstMarkFragment,
+                        &tr.world->bmodels[-mf->iIndex].iNumMarkFragment
+                    );
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            }
+        }
+    }
+
+    return pMark;
 }
 
 /*

From 7f08a7bca81bf21db2bd9ab3c59785f49c700771 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:10:21 +0200
Subject: [PATCH 0744/2040] Remove register keyword as it's deprecated since
 C++17

---
 code/qcommon/msg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index bb04cba3..6e3200d6 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -878,7 +878,7 @@ void MSG_ReadData( msg_t *msg, void *data, int len ) {
 // a string hasher which gives the same hash value even if the
 // string is later modified via the legacy MSG read/write code
 int MSG_HashKey(const char *string, int maxlen) {
-	int register hash, i;
+	int hash, i;
 
 	hash = 0;
 	for (i = 0; i < maxlen && string[i] != '\0'; i++) {

From 1022ce531abe16a26238f6cc8714ac862d67efc6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:10:56 +0200
Subject: [PATCH 0745/2040] Fix AL buffers having sound data past end of the
 sound buffer

---
 code/client/snd_openal_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 5c6b4ec6..3dc2e315 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3039,7 +3039,7 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
-            qalBufferData(pSfx->buffer, fmt, &pSfx->data[pSfx->info.dataofs], pSfx->info.datasize, pSfx->info.rate);
+            qalBufferData(pSfx->buffer, fmt, &pSfx->data[pSfx->info.dataofs], pSfx->info.datasize - pSfx->info.dataofs, pSfx->info.rate);
             alDieIfError();
         }
     }

From 78f0072c592d3b9d1905e6b88fdcf47fb7547873 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:12:46 +0200
Subject: [PATCH 0746/2040] Update the SFX datasize when downsampling

This fixes #349 where the size of the AL buffer didn't match the real downsampled size, which would cause AL to read way past of end of the data buffer
---
 code/client/snd_mem_new.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index 8d98346b..bc6c6c32 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -404,6 +404,8 @@ qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, by
         datap += width;
     }
 
+    assert(iff_end - data_p == 0);
+
     return newdatasize;
 }
 
@@ -440,9 +442,6 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
     }
 
     if (streamed) {
-        //
-        // Added in 2.0
-        //  Will be loaded next time
         sfx->length = 5000;
         sfx->width = 1;
         sfx->iFlags |= SFX_FLAG_STREAMED;
@@ -513,6 +512,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         if (newdatasize) {
             Z_Free(sfx->data);
             sfx->data = newdata;
+            sfx->info.datasize = newdatasize;
         }
     }
 

From e806c1ddf102cca671758add48c7f4cea549a870 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:23:13 +0200
Subject: [PATCH 0747/2040] Move MAX_MARK values to `tr_types_new.h`

---
 code/renderer/tr_marks_permanent.c     | 3 ---
 code/renderercommon/new/tr_types_new.h | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 03ba5e0f..5194bb06 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -24,9 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-#define MAX_MARK_FRAGMENTS   128
-#define MAX_MARK_POLYVERTS   384
-
 #define DCL_FILE_SIGNATURE   *(int *)"DCL "
 #define DCL_FILE_OLD_VERSION 1
 #define DCL_FILE_VERSION     2
diff --git a/code/renderercommon/new/tr_types_new.h b/code/renderercommon/new/tr_types_new.h
index 0726cc4f..5b634d16 100644
--- a/code/renderercommon/new/tr_types_new.h
+++ b/code/renderercommon/new/tr_types_new.h
@@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MAX_POINTS     32
 #define MAX_SPRITES    2048
 
+#define MAX_MARK_FRAGMENTS   128
+#define MAX_MARK_POLYVERTS   384
+
 #define RDF_FULLBRIGHT		2		// fullbright intensity
 
 typedef struct

From 1e0195f6e3078293848457b1995fd29bcc9a9ad3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:29:29 +0200
Subject: [PATCH 0748/2040] Add variables that will be used in unimplemented
 functions

---
 code/cgame/cg_marks.c | 97 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 33934aa6..3ffd7221 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1068,6 +1068,16 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
 
 qboolean CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
 {
+    int j;
+    float fDist;
+    float fSideDist;
+    float fSideAlpha;
+    float fCenterAlpha;
+    float fFrac;
+    polyVert_t* v;
+    cg_treadmarkinfo_t* pInfo;
+
+
     // FIXME: unimplemented
     return qfalse;
 }
@@ -1079,11 +1089,40 @@ int CG_MakeTreadMarkDecal_GetLeafCallback(markFragment_t *mf, void *pCustom)
 
 void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean bTemporary)
 {
+    int i;
+    int numFragments;
+    vec3_t originalPoints[4];
+    vec3_t markPoints[MAX_MARK_POLYVERTS];
+    vec3_t projection;
+    markFragment_t markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t* mf;
+    cg_treadmarkinfo_t info;
+    float fEndAlpha, fEndTex;
+    float fDist;
+    vec3_t vStartCenter;
+    vec3_t vEndCenter;
+    vec3_t vDelta;
+    vec3_t origin;
+    float fRadiusSquared;
+
+
     // FIXME: unimplemented
 }
 
 int CG_UpdateTreadMark(int iReference, vec_t *vNewPos, float fAlpha)
 {
+    int i;
+    int iTreadNum;
+    float fDist;
+    float fSplitLength;
+    float fNewLength;
+    float fTmp;
+    qboolean bDoSegmentation;
+    vec3_t vDelta, vDeltaNorml;
+    vec3_t vDir, vMidDir;
+    vec3_t vRight;
+    treadMark_t* pTread;
+
     // FIXME: unimplemented
     return 0;
 }
@@ -1160,6 +1199,25 @@ int CG_PermanentMark(
     void           *pVoidPolyVerts
 )
 {
+    byte colors[4];
+    int i, j;
+    int numFragments;
+    float fSScale2, fTScale2;
+    float texCoordScaleS, texCoordScaleT;
+    vec3_t originalPoints[4];
+    vec3_t markPoints[MAX_MARK_POLYVERTS];
+    vec3_t projection;
+    vec3_t vLight;
+    vec3_t vTmp;
+    vec3_t axis[3];
+    markFragment_t* mf;
+    polyVert_t* pPolyVerts;
+    polyVert_t* v;
+    clipHandle_t cmodel;
+    trace_t trace;
+    float fRadiusSquared;
+
+
     // FIXME: unimplemented
     return 0;
 }
@@ -1172,6 +1230,32 @@ int CG_PermanentTreadMarkDecal(
     void           *pVoidPolyVerts
 )
 {
+    byte colors[4];
+    int i, j;
+    int numFragments;
+    vec3_t originalPoints[4];
+    vec3_t markPoints[MAX_MARK_POLYVERTS];
+    vec3_t projection;
+    vec3_t vLight;
+    markFragment_t* mf;
+    polyVert_t* pPolyVerts;
+    polyVert_t* v;
+    clipHandle_t cmodel;
+    float fStartAlpha, fEndAlpha;
+    float fStartTex, fEndTex;
+    float fRightCenterDist;
+    float fOOWidth, fOODoubleWidth;
+    float fDist, fSideDist;
+    float fFrac;
+    float fStartDist, fRightStart, fLeftStartDist;
+    float fCenterTexScale, fRightTexScale, fLeftTexScale;
+    float fSideAlpha, fCenterAlpha;
+    vec3_t vStartCenter, vEndCenter;
+    vec3_t vDirection;
+    vec3_t vRight;
+    vec3_t vDelta;
+    float fRadiusSquared;
+
     // FIXME: unimplemented
     return 0;
 }
@@ -1180,6 +1264,19 @@ int CG_PermanentUpdateTreadMark(
     treadMark_t *pTread, float fAlpha, float fMinSegment, float fMaxSegment, float fMaxOffset, float fTexScale
 )
 {
+    trace_t trace;
+    float fDist;
+    float fSplitLength;
+    float fNewLength;
+    float fTmp;
+    qboolean bDoSegmentation;
+    vec3_t vPos;
+    vec3_t vEnd;
+    vec3_t vNewPos;
+    vec3_t vDelta, vDeltaNorm;
+    vec3_t vDir, vMidDir;
+    vec3_t vRight;
+
     // FIXME: unimplemented
     return 0;
 }

From c0d37c504a374dc31a94bd624b96fd7f9e12014c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:46:10 +0200
Subject: [PATCH 0749/2040] Fix infinite loop in `R_TerrainHeightForPoly`

---
 code/renderer/tr_terrain.c | 109 ++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 62 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 97bba6c3..71bcecdd 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1229,6 +1229,7 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
 
     float x = pVerts->xyz[0];
     float y = pVerts->xyz[1];
+    terraInt iTri;
 
     // Calculate the average of the x and y coordinates of all vertices
     if (nVerts > 1) {
@@ -1243,24 +1244,10 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
     }
 
     // Get the first valid triangle in the patch
-    terraInt iTri = pPatch->drawinfo.iTriHead;
-    if (!iTri) {
-        assert(
-            !pPatch->drawinfo.iTriHead
-            && va(
-                "R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-                x,
-                y,
-                pPatch->x0,
-                pPatch->y0,
-                pPatch->z0
-            )
-        );
-        return qfalse;
-    }
+    iTri = pPatch->drawinfo.iTriHead;
 
     // Find a triangle that contains the point (x, y)
-    while (qtrue) {
+    for(iTri = pPatch->drawinfo.iTriHead; iTri; iTri = g_pTris[iTri].iNext) {
         if (g_pTris[iTri].byConstChecks & 4) {
             // Get all three x-y coordinates of the current triangle's vertices
             x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
@@ -1291,58 +1278,56 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
 
             fAreaTotal = fArea[0] + fArea[1] + fArea[2];
             if (fAreaTotal > 0.0) {
+                //
                 // Found it - the point is inside the triangle
-                break;
+                // Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
+                //
+
+                float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
+                float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
+                float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
+
+                fKy[0] = z0 * (x2 - x1);
+                fKy[1] = z1 * (x0 - x2);
+                fKy[2] = z2 * (x1 - x0);
+
+                fKx[0] = z0 * (y2 - y1);
+                fKx[1] = z1 * (y0 - y2);
+                fKx[2] = z2 * (y1 - y0);
+
+                // Note: this could be done with the CrossProduct macro if everything were in a vector
+                fKz[0] = fKx[0] * x1 - y1 * fKy[0];
+                fKz[1] = fKx[1] * x2 - y2 * fKy[1];
+                fKz[2] = fKx[2] * x0 - y0 * fKy[2];
+
+                // Calculate the height for each vertex
+                for (int i = 0; i < nVerts; i++) {
+                    float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
+                    float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
+                    float fConstZ = fKz[0] + fKz[1] + fKz[2];
+
+                    // Write back the calculated height into the vertex
+                    pVerts[i].xyz[2] = fScaleY - fScaleX - fConstZ;
+                }
+
+                return qtrue;
             }
         }
 
-        iTri = g_pTris[iTri].iNext;
-        if (!iTri) {
-            // There's no triangle that contains point (x, y) - bail out
-            assert(
-                !g_pTris[iTri].iNext
-                && va(
-                    "R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-                    x,
-                    y,
-                    pPatch->x0,
-                    pPatch->y0,
-                    pPatch->z0
-                )
-            );
-            return qfalse;
-        }
     }
 
-    // Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
-    float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
-    float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
-    float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
-
-    fKy[0] = z0 * (x2 - x1);
-    fKy[1] = z1 * (x0 - x2);
-    fKy[2] = z2 * (x1 - x0);
-
-    fKx[0] = z0 * (y2 - y1);
-    fKx[1] = z1 * (y0 - y2);
-    fKx[2] = z2 * (y1 - y0);
-
-    // Note: this could be done with the CrossProduct macro if everything were in a vector
-    fKz[0] = fKx[0] * x1 - y1 * fKy[0];
-    fKz[1] = fKx[1] * x2 - y2 * fKy[1];
-    fKz[2] = fKx[2] * x0 - y0 * fKy[2];
-
-    // Calculate the height for each vertex
-    for (int i = 0; i < nVerts; i++) {
-        float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
-        float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
-        float fConstZ = fKz[0] + fKz[1] + fKz[2];
-
-        // Write back the calculated height into the vertex
-        pVerts[i].xyz[2] = fScaleY - fScaleX - fConstZ;
-    }
-
-    return qtrue;
+    assert(
+        !pPatch->drawinfo.iTriHead
+        && va(
+            "R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
+            x,
+            y,
+            pPatch->x0,
+            pPatch->y0,
+            pPatch->z0
+        )
+    );
+    return qfalse;
 }
 
 void R_TerrainRestart_f(void)

From 47ba241e7dfe6717887f7c13b29fb7fff016e1a7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:50:22 +0200
Subject: [PATCH 0750/2040] Fix file being closed but still used afterwards

---
 code/renderer/tr_marks_permanent.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 5194bb06..723becb5 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -459,6 +459,7 @@ void R_LevelMarksLoad(const char *szBSPName)
             //
             ri.FS_CloseFile(hFile);
             ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
         }
 
         //

From 2fc091fdf723cd8456ea8b3e60f5a9bde37ef3a5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:56:41 +0200
Subject: [PATCH 0751/2040] Skip loading if the file length is less than the
 dcl header length

---
 code/renderer/tr_marks_permanent.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 723becb5..851a1db6 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -321,7 +321,12 @@ void R_LevelMarksLoad(const char *szBSPName)
     // Read the DCL file header
     //
 
-    ri.FS_Read(&dclHeader, sizeof(dclHeader), hFile);
+    iLength = ri.FS_Read(&dclHeader, sizeof(dclHeader), hFile);
+    if (iLength < sizeof(dclHeader)) {
+        ri.FS_CloseFile(hFile);
+        ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+        return;
+    }
 
     for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
         ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);

From b1e640ad1d9f10c4bb4871786dfd99b56ed61c5f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 21:41:16 +0200
Subject: [PATCH 0752/2040] Implement CG_PermanentMark

---
 code/cgame/cg_local.h  |   4 +-
 code/cgame/cg_marks.c  | 770 +++++++++++++++++++++++------------------
 code/fgame/bg_public.h |   1 +
 3 files changed, 427 insertions(+), 348 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index b75a2131..9722cf62 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -729,8 +729,8 @@ extern "C" {
     void CG_InitTestTreadMark();
     void CG_AddTreadMarks();
     int  CG_PermanentMark(
-         const vec3_t    origin,
-         const vec3_t    dir,
+         vec3_t          origin,
+         vec3_t          dir,
          float           orientation,
          float           fSScale,
          float           fTScale,
diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 3ffd7221..201535f5 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -36,93 +36,94 @@ MARK POLYS
 #define MAX_MARK_FRAGMENTS 128
 #define MAX_MARK_POINTS    384
 
-static vec3_t cg_vEntAngles;
-static vec3_t cg_vEntOrigin;
-static vec3_t cg_fEntAxis[3];
+static vec3_t   cg_vEntAngles;
+static vec3_t   cg_vEntOrigin;
+static vec3_t   cg_fEntAxis[3];
 static qboolean cg_bEntAnglesSet;
 
-static int cg_iLastEntIndex;
-static int cg_iLastEntTime;
+static int      cg_iLastEntIndex;
+static int      cg_iLastEntTime;
 static qboolean cg_bLastEntValid;
 
-markPoly_t* cg_freeMarkPolys;   // single linked list
-markObj_t cg_activeMarkObjs;
-markObj_t* cg_freeMarkObjs;
+markPoly_t *cg_freeMarkPolys; // single linked list
+markObj_t   cg_activeMarkObjs;
+markObj_t  *cg_freeMarkObjs;
 treadMark_t cg_treadMarks[MAX_TREAD_MARKS];
 
-markPoly_t* cg_markPolys;
-int cg_iNumMarkPolys;
-markObj_t* cg_markObjs;
-int cg_iNumFreeMarkObjs;
-int cg_iMinFreeMarkObjs;
-qboolean cg_bMarksInitialized;
-cvar_t* cg_treadmark_test;
+markPoly_t *cg_markPolys;
+int         cg_iNumMarkPolys;
+markObj_t  *cg_markObjs;
+int         cg_iNumFreeMarkObjs;
+int         cg_iMinFreeMarkObjs;
+qboolean    cg_bMarksInitialized;
+cvar_t     *cg_treadmark_test;
 
 vec3_t vec_upwards;
 
 typedef struct cg_impactmarkinfo_s {
     vec3_t axis[3];
     vec3_t origin;
-    float fSCenter;
-    float fTCenter;
-    float texCoordScaleS;
-    float texCoordScaleT;
-    byte colors[4];
-    int leafnum;
+    float  fSCenter;
+    float  fTCenter;
+    float  texCoordScaleS;
+    float  texCoordScaleT;
+    byte   colors[4];
+    int    leafnum;
 } cg_impactmarkinfo_t;
 
 typedef struct cg_treadmarkinfo_s {
-    treadMark_t* pTread;
-    vec3_t vDirection;
-    vec3_t vRight;
-    float fStartDist;
-    float fStartTex;
-    float fStartAlpha;
-    float fLeftStartDist;
-    float fRightStartDist;
-    float fRightCenterDist;
-    float fLeftTexScale;
-    float fRightTexScale;
-    float fCenterTexScale;
-    float fLeftAlphaScale;
-    float fRightAlphaScale;
-    float fCenterAlphaScale;
-    float fOOWidth;
-    float fOODoubleWidth;
-    byte colors[4];
-    int leafnum;
+    treadMark_t *pTread;
+    vec3_t       vDirection;
+    vec3_t       vRight;
+    float        fStartDist;
+    float        fStartTex;
+    float        fStartAlpha;
+    float        fLeftStartDist;
+    float        fRightStartDist;
+    float        fRightCenterDist;
+    float        fLeftTexScale;
+    float        fRightTexScale;
+    float        fCenterTexScale;
+    float        fLeftAlphaScale;
+    float        fRightAlphaScale;
+    float        fCenterAlphaScale;
+    float        fOOWidth;
+    float        fOODoubleWidth;
+    byte         colors[4];
+    int          leafnum;
 } cg_treadmarkinfo_t;
 
 int CG_GetMarkFragments(
-    int numVerts,
-    const vec3_t* pVerts,
-    const vec3_t vProjection,
-    const vec3_t* pPointBuffer,
-    markFragment_t* pFragmentBuffer,
-    float fRadiusSquared
-) {
-    int i, j;
-    int iNumEnts;
-    int iCurrPoints, iCurrFragments;
-    int iCurrMaxPoints, iCurrMaxFragments;
-    int iNewPoints, iNewFragments;
-    clipHandle_t cmodel;
-    vec3_t vProjectionDir;
-    vec3_t vMins, vMaxs;
-    vec3_t vTemp;
-    vec3_t vAngles, vOrigin;
-    const vec3_t* pCurrPoint;
-    centity_t* pEntList[64];
-    entityState_t* pEnt;
-    markFragment_t* pCurrFragment;
-    markFragment_t* pFragment;
+    int             numVerts,
+    const vec3_t   *pVerts,
+    const vec3_t    vProjection,
+    const vec3_t   *pPointBuffer,
+    markFragment_t *pFragmentBuffer,
+    float           fRadiusSquared
+)
+{
+    int             i, j;
+    int             iNumEnts;
+    int             iCurrPoints, iCurrFragments;
+    int             iCurrMaxPoints, iCurrMaxFragments;
+    int             iNewPoints, iNewFragments;
+    clipHandle_t    cmodel;
+    vec3_t          vProjectionDir;
+    vec3_t          vMins, vMaxs;
+    vec3_t          vTemp;
+    vec3_t          vAngles, vOrigin;
+    const vec3_t   *pCurrPoint;
+    centity_t      *pEntList[64];
+    entityState_t  *pEnt;
+    markFragment_t *pCurrFragment;
+    markFragment_t *pFragment;
 
     iNewFragments = cgi.R_MarkFragments(
         numVerts,
         pVerts,
         vProjection,
         MAX_MARK_POINTS,
-        (float*)pPointBuffer,
+        (float *)pPointBuffer,
         MAX_MARK_FRAGMENTS,
         pFragmentBuffer,
         fRadiusSquared
@@ -141,12 +142,12 @@ int CG_GetMarkFragments(
         return iNewFragments;
     }
 
-    iCurrPoints = iNewPoints;
-    iCurrFragments = iNewFragments;
-    iCurrMaxPoints = MAX_MARK_POINTS - iNewPoints;
+    iCurrPoints       = iNewPoints;
+    iCurrFragments    = iNewFragments;
+    iCurrMaxPoints    = MAX_MARK_POINTS - iNewPoints;
     iCurrMaxFragments = MAX_MARK_FRAGMENTS - iNewFragments;
-    pCurrPoint = &pPointBuffer[iNewPoints];
-    pCurrFragment = &pFragmentBuffer[iNewFragments];
+    pCurrPoint        = &pPointBuffer[iNewPoints];
+    pCurrFragment     = &pFragmentBuffer[iNewFragments];
 
     VectorNormalize2(vProjection, vProjectionDir);
     ClearBounds(vMins, vMaxs);
@@ -170,7 +171,7 @@ int CG_GetMarkFragments(
         VectorCopy(pEntList[i]->lerpOrigin, vOrigin);
 
         cmodel = cgi.CM_InlineModel(pEnt->modelindex);
-        
+
         iNewFragments = cgi.R_MarkFragmentsForInlineModel(
             cmodel,
             vAngles,
@@ -179,7 +180,7 @@ int CG_GetMarkFragments(
             pVerts,
             vProjection,
             iCurrMaxPoints,
-            (float*)pCurrPoint,
+            (float *)pCurrPoint,
             iCurrMaxFragments,
             pCurrFragment,
             fRadiusSquared
@@ -211,16 +212,16 @@ int CG_GetMarkFragments(
     return iCurrFragments;
 }
 
-static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
-    centity_t* pCEnt;
+static qboolean CG_GetMarkInlineModelOrientation(int iIndex)
+{
+    centity_t *pCEnt;
 
     if (iIndex == cg_iLastEntIndex && cg_iLastEntTime == cg.time) {
         return cg_bLastEntValid;
     }
 
     pCEnt = &cg_entities[-iIndex];
-    if (pCEnt->currentValid && pCEnt->currentState.modelindex < cgs.numInlineModels)
-    {
+    if (pCEnt->currentValid && pCEnt->currentState.modelindex < cgs.numInlineModels) {
         VectorCopy(pCEnt->lerpAngles, cg_vEntAngles);
         VectorCopy(pCEnt->lerpOrigin, cg_vEntOrigin);
         cg_bLastEntValid = qtrue;
@@ -234,7 +235,7 @@ static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
         }
 
         cg_iLastEntIndex = iIndex;
-        cg_iLastEntTime = cg.time;
+        cg_iLastEntTime  = cg.time;
         return cg_bLastEntValid;
     }
 
@@ -250,25 +251,24 @@ static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
     return qfalse;
 }
 
-static void CG_FragmentPosToWorldPos(const vec3_t vFrom, vec3_t vTo) {
-    if (cg_bEntAnglesSet)
-    {
+static void CG_FragmentPosToWorldPos(const vec3_t vFrom, vec3_t vTo)
+{
+    if (cg_bEntAnglesSet) {
         VectorMA(cg_vEntOrigin, vFrom[0], cg_fEntAxis[0], vTo);
         VectorMA(vTo, vFrom[1], cg_fEntAxis[1], vTo);
         VectorMA(vTo, vFrom[2], cg_fEntAxis[2], vTo);
-    }
-    else
-    {
+    } else {
         vTo[0] = cg_vEntOrigin[0] + *vFrom;
         vTo[1] = cg_vEntOrigin[1] + vFrom[1];
         vTo[2] = cg_vEntOrigin[2] + vFrom[2];
     }
 }
 
-qboolean CG_UpdateMarkPosition(markObj_t* pMark) {
+qboolean CG_UpdateMarkPosition(markObj_t *pMark)
+{
     vec3_t v;
     vec3_t pt;
-    int iIndex;
+    int    iIndex;
 
     iIndex = pMark->markPolys->iIndex;
     if (!CG_GetMarkInlineModelOrientation(iIndex)) {
@@ -277,8 +277,7 @@ qboolean CG_UpdateMarkPosition(markObj_t* pMark) {
 
     VectorCopy(pMark->markPolys->verts[0].xyz, v);
 
-    if (cg_bEntAnglesSet)
-    {
+    if (cg_bEntAnglesSet) {
         VectorScale(cg_fEntAxis[0], v[0], pt);
         VectorMA(pt, v[1], cg_fEntAxis[1], pt);
         VectorMA(pt, v[2], cg_fEntAxis[2], pt);
@@ -292,12 +291,8 @@ qboolean CG_UpdateMarkPosition(markObj_t* pMark) {
     return qtrue;
 }
 
-void CG_AddFragmentToScene(
-    int iIndex,
-    qhandle_t hShader,
-    int iNumVerts,
-    polyVert_t* pVerts
-) {
+void CG_AddFragmentToScene(int iIndex, qhandle_t hShader, int iNumVerts, polyVert_t *pVerts)
+{
     if (!iIndex) {
         cgi.R_AddPolyToScene(hShader, iNumVerts, pVerts, 0);
         return;
@@ -309,9 +304,9 @@ void CG_AddFragmentToScene(
     }
 
     if (cg_bEntAnglesSet) {
-        int i;
-        vec3_t vTmp;
-        polyVert_t* pCurrVert;
+        int         i;
+        vec3_t      vTmp;
+        polyVert_t *pCurrVert;
 
         for (i = 0; i < iNumVerts; i++) {
             pCurrVert = &pVerts[i];
@@ -324,8 +319,8 @@ void CG_AddFragmentToScene(
             VectorAdd(vTmp, cg_vEntOrigin, pCurrVert->xyz);
         }
     } else {
-        int i;
-        polyVert_t* pCurrVert;
+        int         i;
+        polyVert_t *pCurrVert;
 
         for (i = 0; i < iNumVerts; i++) {
             pCurrVert = &pVerts[i];
@@ -367,7 +362,7 @@ void CG_InitMarks(void)
         cgi.Free(cg_markPolys);
     }
 
-    cg_markPolys = (markPoly_t*)cgi.Malloc(sizeof(markPoly_t) * cg_iNumMarkPolys);
+    cg_markPolys = (markPoly_t *)cgi.Malloc(sizeof(markPoly_t) * cg_iNumMarkPolys);
 
     if (!cg_markPolys) {
         cgi.Error(ERR_DROP, "CG_InitMarks: Could not allocate array for mark polys");
@@ -377,7 +372,7 @@ void CG_InitMarks(void)
         cgi.Free(cg_markObjs);
     }
 
-    cg_markObjs = (markObj_t*)cgi.Malloc(sizeof(markObj_t) * iMaxMarks);
+    cg_markObjs = (markObj_t *)cgi.Malloc(sizeof(markObj_t) * iMaxMarks);
 
     if (!cg_markObjs) {
         cgi.Error(ERR_DROP, "CG_InitMarks: Could not allocate array for mark objects");
@@ -401,7 +396,7 @@ void CG_InitMarks(void)
     }
     cg_markObjs[i].nextMark = NULL;
 
-    cg_iNumFreeMarkObjs = iMaxMarks;
+    cg_iNumFreeMarkObjs  = iMaxMarks;
     cg_bMarksInitialized = qtrue;
 }
 
@@ -416,7 +411,7 @@ void CG_FreeMarkPoly(markPoly_t *le)
         return;
     }
 
-    le->nextPoly = cg_freeMarkPolys;
+    le->nextPoly     = cg_freeMarkPolys;
     cg_freeMarkPolys = le;
 }
 
@@ -425,9 +420,10 @@ void CG_FreeMarkPoly(markPoly_t *le)
 CG_FreeMarkObj
 ==================
 */
-void CG_FreeMarkObj(markObj_t* pMark) {
-    markPoly_t* pPoly;
-    markPoly_t* pNextPoly;
+void CG_FreeMarkObj(markObj_t *pMark)
+{
+    markPoly_t *pPoly;
+    markPoly_t *pNextPoly;
 
     pPoly = pMark->markPolys;
     for (pPoly = pMark->markPolys; pPoly; pPoly = pNextPoly) {
@@ -437,8 +433,8 @@ void CG_FreeMarkObj(markObj_t* pMark) {
 
     pMark->prevMark->nextMark = pMark->nextMark;
     pMark->nextMark->prevMark = pMark->prevMark;
-    pMark->nextMark = cg_freeMarkObjs;
-    cg_freeMarkObjs = pMark;
+    pMark->nextMark           = cg_freeMarkObjs;
+    cg_freeMarkObjs           = pMark;
     cg_iNumFreeMarkObjs++;
 }
 
@@ -447,13 +443,12 @@ void CG_FreeMarkObj(markObj_t* pMark) {
 CG_FreeBestMarkObj
 ==================
 */
-void CG_FreeBestMarkObj(qboolean bAllowFade) {
-    markObj_t* pMark;
+void CG_FreeBestMarkObj(qboolean bAllowFade)
+{
+    markObj_t *pMark;
 
-    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark)
-    {
-        if (pMark->lastVisTime < cg.time - 250)
-        {
+    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark) {
+        if (pMark->lastVisTime < cg.time - 250) {
             CG_FreeMarkObj(pMark);
             return;
         }
@@ -464,10 +459,9 @@ void CG_FreeBestMarkObj(qboolean bAllowFade) {
         return;
     }
 
-    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark)
-    {
+    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark) {
         if (!pMark->alphaFade || pMark->time > cg.time - 9000) {
-            pMark->time = cg.time - 9000;
+            pMark->time      = cg.time - 9000;
             pMark->alphaFade = 1;
         }
     }
@@ -480,11 +474,11 @@ CG_AllocMark
 Will allways succeed, even if it requires freeing an old active mark
 ===================
 */
-markObj_t* CG_AllocMark(int iNumPolys)
+markObj_t *CG_AllocMark(int iNumPolys)
 {
-    int iPolyCount;
-    markPoly_t* pPoly;
-    markObj_t* pMark;
+    int         iPolyCount;
+    markPoly_t *pPoly;
+    markObj_t  *pMark;
 
     if (!cg_bMarksInitialized) {
         return NULL;
@@ -498,75 +492,66 @@ markObj_t* CG_AllocMark(int iNumPolys)
         CG_FreeBestMarkObj(1);
     }
 
-    pMark = cg_freeMarkObjs;
+    pMark           = cg_freeMarkObjs;
     cg_freeMarkObjs = cg_freeMarkObjs->nextMark;
 
     memset(pMark, 0, sizeof(markObj_t));
     pMark->lastVisTime = cg.time;
 
-    for (iPolyCount = 0; iPolyCount < iNumPolys; iPolyCount++)
-    {
+    for (iPolyCount = 0; iPolyCount < iNumPolys; iPolyCount++) {
         while (!cg_freeMarkPolys) {
             CG_FreeBestMarkObj(qfalse);
         }
 
-        pPoly = cg_freeMarkPolys;
+        pPoly            = cg_freeMarkPolys;
         cg_freeMarkPolys = pPoly->nextPoly;
 
         memset(pPoly, 0, sizeof(*pPoly));
-        pPoly->nextPoly = pMark->markPolys;
+        pPoly->nextPoly  = pMark->markPolys;
         pMark->markPolys = pPoly;
     }
 
-
     // link into the active list
-    pMark->nextMark = cg_activeMarkObjs.nextMark;
-    pMark->prevMark = &cg_activeMarkObjs;
+    pMark->nextMark                      = cg_activeMarkObjs.nextMark;
+    pMark->prevMark                      = &cg_activeMarkObjs;
     cg_activeMarkObjs.nextMark->prevMark = pMark;
-    cg_activeMarkObjs.nextMark = pMark;
+    cg_activeMarkObjs.nextMark           = pMark;
     cg_iNumFreeMarkObjs--;
     return pMark;
 }
 
-int CG_ImpactMark_GetLeafCallback(markFragment_t* mf, void* pCustom) {
-    return ((cg_impactmarkinfo_t*)pCustom)->leafnum;
+int CG_ImpactMark_GetLeafCallback(markFragment_t *mf, void *pCustom)
+{
+    return ((cg_impactmarkinfo_t *)pCustom)->leafnum;
 }
 
-qboolean CG_ImpactMark_PerPolyCallback(
-    const vec3_t* markPoints,
-    markFragment_t* mf,
-    polyVert_t* verts,
-    void* pCustom
-) {
-    int j;
-    polyVert_t* v;
-    cg_impactmarkinfo_t* pInfo;
+qboolean CG_ImpactMark_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
+{
+    int                  j;
+    polyVert_t          *v;
+    cg_impactmarkinfo_t *pInfo;
 
-    pInfo = (cg_impactmarkinfo_t*)pCustom;
+    pInfo = (cg_impactmarkinfo_t *)pCustom;
 
-    if (mf->iIndex >= 0)
-    {
+    if (mf->iIndex >= 0) {
         for (j = 0; j < mf->numPoints; j++) {
             vec3_t delta;
 
             v = &verts[j];
             VectorCopy(markPoints[j + mf->firstPoint], v->xyz);
             VectorSubtract(v->xyz, pInfo->origin, delta);
-            v->st[0] = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
-            v->st[1] = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
+            v->st[0]       = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
+            v->st[1]       = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
             v->modulate[0] = pInfo->colors[0];
             v->modulate[1] = pInfo->colors[1];
             v->modulate[2] = pInfo->colors[2];
             v->modulate[3] = pInfo->colors[3];
         }
-    }
-    else
-    {
+    } else {
         if (!CG_GetMarkInlineModelOrientation(mf->iIndex)) {
             return qfalse;
         }
 
-
         for (j = 0; j < mf->numPoints; j++) {
             vec3_t vWorldPos;
             vec3_t delta;
@@ -576,8 +561,8 @@ qboolean CG_ImpactMark_PerPolyCallback(
 
             CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
             VectorSubtract(vWorldPos, pInfo->origin, delta);
-            v->st[0] = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
-            v->st[1] = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
+            v->st[0]       = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
+            v->st[1]       = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
             v->modulate[0] = pInfo->colors[0];
             v->modulate[1] = pInfo->colors[1];
             v->modulate[2] = pInfo->colors[2];
@@ -619,24 +604,23 @@ void CG_ImpactMark(
     float        fTCenter
 )
 {
-    int i;
-    int numFragments;
-    float fSScale2, fTScale2;
-    float fSScale3, fTScale3;
-    vec3_t originalPoints[4];
-    vec3_t markPoints[MAX_MARK_POINTS];
-    vec3_t projection;
-    markFragment_t markFragments[MAX_MARK_FRAGMENTS], *mf;
-    vec3_t v;
-    float fRadiusSquared;
+    int                 i;
+    int                 numFragments;
+    float               fSScale2, fTScale2;
+    float               fSScale3, fTScale3;
+    vec3_t              originalPoints[4];
+    vec3_t              markPoints[MAX_MARK_POINTS];
+    vec3_t              projection;
+    markFragment_t      markFragments[MAX_MARK_FRAGMENTS], *mf;
+    vec3_t              v;
+    float               fRadiusSquared;
     cg_impactmarkinfo_t info;
 
     if (!cg_bMarksInitialized) {
         return;
     }
 
-    if (!cg_addMarks->integer
-        && markShader != cgs.media.shadowMarkShader
+    if (!cg_addMarks->integer && markShader != cgs.media.shadowMarkShader
         && markShader != cgs.media.footShadowMarkShader) {
         return;
     }
@@ -648,7 +632,7 @@ void CG_ImpactMark(
         fTScale = 1.0;
     }
 
-    fRadiusSquared = fSScale * fSScale + fTScale * fTScale;
+    fRadiusSquared      = fSScale * fSScale + fTScale * fTScale;
     info.texCoordScaleS = 0.5 / fSScale;
     info.texCoordScaleT = 0.5 / fTScale;
 
@@ -694,26 +678,16 @@ void CG_ImpactMark(
     // get the fragments
     VectorScale(dir, -32, projection);
 
-    numFragments = CG_GetMarkFragments(
-        4,
-        originalPoints,
-        projection,
-        markPoints,
-        markFragments,
-        fRadiusSquared
-    );
+    numFragments = CG_GetMarkFragments(4, originalPoints, projection, markPoints, markFragments, fRadiusSquared);
 
-    if (dolighting)
-    {
+    if (dolighting) {
         vec3_t vLight;
         cgi.R_GetLightingForDecal(vLight, dir, origin);
 
         info.colors[0] = (int)(red * vLight[0]);
         info.colors[1] = (int)(green * vLight[1]);
         info.colors[2] = (int)(blue * vLight[2]);
-    }
-    else
-    {
+    } else {
         info.colors[0] = (int)(red * 255.0f);
         info.colors[1] = (int)(green * 255.0f);
         info.colors[2] = (int)(blue * 255.0f);
@@ -731,8 +705,7 @@ void CG_ImpactMark(
     VectorAdd(origin, dir, v);
     info.leafnum = cgi.CM_PointLeafnum(v);
 
-    if (temporary)
-    {
+    if (temporary) {
         polyVert_t verts[8];
 
         for (i = 0, mf = markFragments; i < numFragments; i++, mf++) {
@@ -740,20 +713,18 @@ void CG_ImpactMark(
                 mf->numPoints = 8;
             }
 
-            if (CG_ImpactMark_PerPolyCallback(markPoints, mf, verts, (void*)&info)) {
+            if (CG_ImpactMark_PerPolyCallback(markPoints, mf, verts, (void *)&info)) {
                 CG_AddFragmentToScene(mf->iIndex, markShader, mf->numPoints, verts);
             }
         }
-    }
-    else
-    {
+    } else {
         CG_AssembleFinalMarks(
             markPoints,
             markFragments,
             numFragments,
             &CG_ImpactMark_PerPolyCallback,
             &CG_ImpactMark_GetLeafCallback,
-            (void*)&info,
+            (void *)&info,
             info.origin,
             sqrt(fRadiusSquared),
             markShader,
@@ -764,32 +735,31 @@ void CG_ImpactMark(
 }
 
 void CG_AssembleFinalMarks(
-    vec3_t           *markPoints,
-    markFragment_t   *markFragments,
-    int              numFragments,
-    qboolean         (*PerPolyCallback)(const vec3_t* markPoints, markFragment_t* mf, polyVert_t* verts, void* pCustom),
-    int              (*GetLeafCallback)(markFragment_t* mf, void* pCustom),
-    void             *pCustom,
-    vec3_t           pos,
-    float            radius,
-    qhandle_t        markShader,
-    qboolean         fadein,
-    qboolean         alphaFade
+    vec3_t         *markPoints,
+    markFragment_t *markFragments,
+    int             numFragments,
+    qboolean (*PerPolyCallback)(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom),
+    int (*GetLeafCallback)(markFragment_t *mf, void *pCustom),
+    void     *pCustom,
+    vec3_t    pos,
+    float     radius,
+    qhandle_t markShader,
+    qboolean  fadein,
+    qboolean  alphaFade
 )
 {
-    markObj_t* pMark;
-    markPoly_t* pPoly;
-    int iGroup, iFirstNewGroup;
-    int numFragsForMark;
-    int i;
-    markFragment_t* mf;
+    markObj_t      *pMark;
+    markPoly_t     *pPoly;
+    int             iGroup, iFirstNewGroup;
+    int             numFragsForMark;
+    int             i;
+    markFragment_t *mf;
 
     iFirstNewGroup = 0;
-    do
-    {
-        i = iFirstNewGroup;
-        mf = &markFragments[iFirstNewGroup];
-        iGroup = mf->iIndex;
+    do {
+        i               = iFirstNewGroup;
+        mf              = &markFragments[iFirstNewGroup];
+        iGroup          = mf->iIndex;
         numFragsForMark = 0;
 
         for (; i < numFragments; i++, mf++) {
@@ -805,15 +775,15 @@ void CG_AssembleFinalMarks(
             break;
         }
 
-        pMark->time = cg.time;
-        pMark->alphaFade = alphaFade;
+        pMark->time       = cg.time;
+        pMark->alphaFade  = alphaFade;
         pMark->markShader = markShader;
-        pMark->fadein = fadein;
+        pMark->fadein     = fadein;
         VectorCopy(pos, pMark->pos);
         pMark->radius = radius;
 
-        i = iFirstNewGroup;
-        mf = &markFragments[iFirstNewGroup];
+        i              = iFirstNewGroup;
+        mf             = &markFragments[iFirstNewGroup];
         iFirstNewGroup = 0;
 
         if (mf->iIndex < 0) {
@@ -837,8 +807,8 @@ void CG_AssembleFinalMarks(
 
                 if (PerPolyCallback(markPoints, mf, pPoly->verts, pCustom)) {
                     pPoly->numVerts = mf->numPoints;
-                    pPoly->iIndex = mf->iIndex;
-                    pPoly = pPoly->nextPoly;
+                    pPoly->iIndex   = mf->iIndex;
+                    pPoly           = pPoly->nextPoly;
                 }
             }
         }
@@ -895,15 +865,15 @@ CG_AddMarks
 
 void CG_AddMarks(void)
 {
-    int j;
-    int t;
-    int fade;
-    markObj_t* pMark;
-    markObj_t* pNext;
-    markPoly_t* pPoly;
-    polyVert_t* pVert;
-    polyVert_t tmpVerts[8];
-    int viewleafnum;
+    int         j;
+    int         t;
+    int         fade;
+    markObj_t  *pMark;
+    markObj_t  *pNext;
+    markPoly_t *pPoly;
+    polyVert_t *pVert;
+    polyVert_t  tmpVerts[8];
+    int         viewleafnum;
 
     if (!cg_bMarksInitialized) {
         return;
@@ -920,8 +890,7 @@ void CG_AddMarks(void)
         pNext = pMark->nextMark;
 
         // see if it is time to completely remove it
-        if (pMark->alphaFade && cg.time > pMark->time + MARK_TOTAL_TIME)
-        {
+        if (pMark->alphaFade && cg.time > pMark->time + MARK_TOTAL_TIME) {
             CG_FreeMarkObj(pMark);
             continue;
         }
@@ -953,11 +922,10 @@ void CG_AddMarks(void)
         if (pMark->fadein) {
             fade = 255 * (cg.time - pMark->time) / MARK_FADE_TIME;
             if (fade > 255) {
-                fade = 255;
+                fade          = 255;
                 pMark->fadein = 0;
             }
 
-
             for (pPoly = pMark->markPolys; pPoly; pPoly = pPoly->nextPoly) {
                 for (j = 0; j < pPoly->numVerts; j++) {
                     pPoly->verts[j].modulate[3] = fade;
@@ -977,10 +945,8 @@ void CG_AddMarks(void)
             }
         }
 
-        for (pPoly = pMark->markPolys; pPoly; pPoly = pPoly->nextPoly)
-        {
-            if (pPoly->iIndex < 0)
-            {
+        for (pPoly = pMark->markPolys; pPoly; pPoly = pPoly->nextPoly) {
+            if (pPoly->iIndex < 0) {
                 memcpy(tmpVerts, pPoly->verts, 24 * pPoly->numVerts);
                 pVert = tmpVerts;
             } else {
@@ -1008,7 +974,8 @@ qboolean CG_CheckMakeMarkOnEntity(int iEntIndex)
         return qfalse;
     }
 
-    if (cg_entities[iEntIndex].currentState.modelindex < 0 || cg_entities[iEntIndex].currentState.modelindex > cgi.CM_NumInlineModels()) {
+    if (cg_entities[iEntIndex].currentState.modelindex < 0
+        || cg_entities[iEntIndex].currentState.modelindex > cgi.CM_NumInlineModels()) {
         return qfalse;
     }
 
@@ -1022,9 +989,9 @@ void CG_InitTestTreadMark()
 
 int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStartPos, float fWidth, float fAlpha)
 {
-    int i;
-    int iTreadNum;
-    treadMark_t* pTread;
+    int          i;
+    int          iTreadNum;
+    treadMark_t *pTread;
 
     if (!cg_bMarksInitialized) {
         return -1;
@@ -1038,7 +1005,7 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
     for (i = 0; i < MAX_TREAD_MARKS; i++) {
         if (!cg_treadMarks[i].iState) {
             iTreadNum = i;
-            pTread = &cg_treadMarks[i];
+            pTread    = &cg_treadMarks[i];
             break;
         }
     }
@@ -1048,11 +1015,11 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
     }
 
     memset(pTread, 0, sizeof(*pTread));
-    pTread->iState = 1;
+    pTread->iState           = 1;
     pTread->iReferenceNumber = iReference;
-    pTread->iLastTime = cg.time;
-    pTread->hTreadShader = treadShader;
-    pTread->fWidth = fWidth * 0.5;
+    pTread->iLastTime        = cg.time;
+    pTread->hTreadShader     = treadShader;
+    pTread->fWidth           = fWidth * 0.5;
     VectorCopy(vStartPos, pTread->vMidPos);
     VectorCopy(vStartPos, pTread->vEndPos);
 
@@ -1066,17 +1033,17 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
     return iTreadNum;
 }
 
-qboolean CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
+qboolean
+CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
 {
-    int j;
-    float fDist;
-    float fSideDist;
-    float fSideAlpha;
-    float fCenterAlpha;
-    float fFrac;
-    polyVert_t* v;
-    cg_treadmarkinfo_t* pInfo;
-
+    int                 j;
+    float               fDist;
+    float               fSideDist;
+    float               fSideAlpha;
+    float               fCenterAlpha;
+    float               fFrac;
+    polyVert_t         *v;
+    cg_treadmarkinfo_t *pInfo;
 
     // FIXME: unimplemented
     return qfalse;
@@ -1084,44 +1051,43 @@ qboolean CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFra
 
 int CG_MakeTreadMarkDecal_GetLeafCallback(markFragment_t *mf, void *pCustom)
 {
-    return ((cg_treadmarkinfo_t*)pCustom)->leafnum;
+    return ((cg_treadmarkinfo_t *)pCustom)->leafnum;
 }
 
 void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean bTemporary)
 {
-    int i;
-    int numFragments;
-    vec3_t originalPoints[4];
-    vec3_t markPoints[MAX_MARK_POLYVERTS];
-    vec3_t projection;
-    markFragment_t markFragments[MAX_MARK_FRAGMENTS];
-    markFragment_t* mf;
+    int                i;
+    int                numFragments;
+    vec3_t             originalPoints[4];
+    vec3_t             markPoints[MAX_MARK_POLYVERTS];
+    vec3_t             projection;
+    markFragment_t     markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t    *mf;
     cg_treadmarkinfo_t info;
-    float fEndAlpha, fEndTex;
-    float fDist;
-    vec3_t vStartCenter;
-    vec3_t vEndCenter;
-    vec3_t vDelta;
-    vec3_t origin;
-    float fRadiusSquared;
-
+    float              fEndAlpha, fEndTex;
+    float              fDist;
+    vec3_t             vStartCenter;
+    vec3_t             vEndCenter;
+    vec3_t             vDelta;
+    vec3_t             origin;
+    float              fRadiusSquared;
 
     // FIXME: unimplemented
 }
 
 int CG_UpdateTreadMark(int iReference, vec_t *vNewPos, float fAlpha)
 {
-    int i;
-    int iTreadNum;
-    float fDist;
-    float fSplitLength;
-    float fNewLength;
-    float fTmp;
-    qboolean bDoSegmentation;
-    vec3_t vDelta, vDeltaNorml;
-    vec3_t vDir, vMidDir;
-    vec3_t vRight;
-    treadMark_t* pTread;
+    int          i;
+    int          iTreadNum;
+    float        fDist;
+    float        fSplitLength;
+    float        fNewLength;
+    float        fTmp;
+    qboolean     bDoSegmentation;
+    vec3_t       vDelta, vDeltaNorml;
+    vec3_t       vDir, vMidDir;
+    vec3_t       vRight;
+    treadMark_t *pTread;
 
     // FIXME: unimplemented
     return 0;
@@ -1130,8 +1096,8 @@ int CG_UpdateTreadMark(int iReference, vec_t *vNewPos, float fAlpha)
 void CG_AddTreadMarks()
 {
     trace_t trace;
-    vec3_t vPos, vEnd;
-    int i;
+    vec3_t  vPos, vEnd;
+    int     i;
 
     if (cg_treadmark_test->integer) {
         VectorCopy(cg.predicted_player_state.origin, vPos);
@@ -1165,26 +1131,17 @@ void CG_AddTreadMarks()
         }
 
         if (cg.time - cg_treadMarks[i].iLastTime > 500) {
-            CG_MakeTreadMarkDecal(
-                &cg_treadMarks[i],
-                cg_treadMarks[i].iState == 3 ? qtrue : qfalse,
-                qfalse
-            );
+            CG_MakeTreadMarkDecal(&cg_treadMarks[i], cg_treadMarks[i].iState == 3 ? qtrue : qfalse, qfalse);
             cg_treadMarks[i].iState = 0;
-        }
-        else {
-            CG_MakeTreadMarkDecal(
-                &cg_treadMarks[i],
-                cg_treadMarks[i].iState == 3 ? qtrue : qfalse,
-                qtrue
-            );
+        } else {
+            CG_MakeTreadMarkDecal(&cg_treadMarks[i], cg_treadMarks[i].iState == 3 ? qtrue : qfalse, qtrue);
         }
     }
 }
 
 int CG_PermanentMark(
-    const vec3_t    origin,
-    const vec3_t    dir,
+    vec3_t          origin,
+    vec3_t          dir,
     float           orientation,
     float           fSScale,
     float           fTScale,
@@ -1199,27 +1156,148 @@ int CG_PermanentMark(
     void           *pVoidPolyVerts
 )
 {
-    byte colors[4];
-    int i, j;
-    int numFragments;
-    float fSScale2, fTScale2;
-    float texCoordScaleS, texCoordScaleT;
-    vec3_t originalPoints[4];
-    vec3_t markPoints[MAX_MARK_POLYVERTS];
-    vec3_t projection;
-    vec3_t vLight;
-    vec3_t vTmp;
-    vec3_t axis[3];
-    markFragment_t* mf;
-    polyVert_t* pPolyVerts;
-    polyVert_t* v;
-    clipHandle_t cmodel;
-    trace_t trace;
-    float fRadiusSquared;
+    byte            colors[4];
+    int             i, j;
+    int             numFragments;
+    float           fSScale2, fTScale2;
+    float           fSScale3, fTScale3;
+    float           texCoordScaleS, texCoordScaleT;
+    vec3_t          originalPoints[4];
+    vec3_t          markPoints[MAX_MARK_POLYVERTS];
+    vec3_t          projection;
+    vec3_t          vLight;
+    vec3_t          vTmp;
+    vec3_t          axis[3];
+    markFragment_t *mf;
+    polyVert_t     *pPolyVerts;
+    polyVert_t     *v;
+    clipHandle_t    cmodel;
+    trace_t         trace;
+    float           fRadiusSquared;
 
+    pPolyVerts = (polyVert_t *)pVoidPolyVerts;
 
-    // FIXME: unimplemented
-    return 0;
+    VectorMA(origin, -2048, dir, vTmp);
+    VectorAdd(origin, dir, origin);
+    CG_Trace(
+        &trace, origin, vec3_origin, vec3_origin, vTmp, ENTITYNUM_NONE, MASK_MARK, qfalse, qtrue, "CG_PermanentMark"
+    );
+
+    if (trace.fraction == 1) {
+        return 0;
+    }
+
+    VectorCopy(trace.endpos, origin);
+    VectorCopy(trace.plane.normal, dir);
+
+    if (!fSScale) {
+        fSScale = 1.0;
+    }
+    if (!fTScale) {
+        fTScale = 1.0;
+    }
+    texCoordScaleT = 0.5 / fTScale;
+    texCoordScaleS = 0.5 / fSScale;
+    if (fSCenter < 0.0 || fSCenter > 1.0) {
+        fSCenter = 0.5;
+    }
+    if (fTCenter < 0.0 || fTCenter > 1.0) {
+        fTCenter = 0.5;
+    }
+    fRadiusSquared = fSScale * fSScale;
+    fRadiusSquared = fTScale * fTScale + fRadiusSquared;
+    fSScale2       = (fSScale * (1.0 - fSCenter)) * 2;
+    fTScale2       = (fTScale * (1.0 - fTCenter)) * 2;
+    fSScale3       = fSCenter * 2 * fSScale;
+    fTScale3       = fTCenter * 2 * fTScale;
+
+    VectorNormalize2(dir, axis[0]);
+    PerpendicularVector(axis[1], axis[0]);
+    RotatePointAroundVector(axis[2], axis[0], axis[1], orientation);
+    CrossProduct(axis[0], axis[2], axis[1]);
+
+    // create the full polygon
+    for (i = 0; i < 3; i++) {
+        originalPoints[0][i] = origin[i] - fSScale3 * axis[1][i] - fTScale3 * axis[2][i];
+        originalPoints[1][i] = origin[i] + fSScale2 * axis[1][i] - fTScale3 * axis[2][i];
+        originalPoints[2][i] = origin[i] + fSScale2 * axis[1][i] + fTScale2 * axis[2][i];
+        originalPoints[3][i] = origin[i] - fSScale3 * axis[1][i] + fTScale2 * axis[2][i];
+    }
+
+    VectorScale(dir, -32, projection);
+    numFragments = CG_GetMarkFragments(
+        ARRAY_LEN(originalPoints), originalPoints, projection, markPoints, pMarkFragments, fRadiusSquared
+    );
+
+    if (!dolighting) {
+        colors[0] = (int)(red * 255.0f);
+        colors[1] = (int)(green * 255.0f);
+        colors[2] = (int)(blue * 255.0f);
+    }
+
+    colors[3] = (int)(alpha * 255.0f);
+
+    for (i = 0, mf = pMarkFragments; i < numFragments; i++, mf++) {
+        vec3_t vWorldPos;
+        vec3_t delta;
+
+        if (mf->numPoints > 8) {
+            mf->numPoints = 8;
+        }
+
+        if (mf->iIndex >= 0) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint] + i;
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    cgi.R_GetLightingForDecal(vLight, dir, (float *)v);
+
+                    colors[0] = (int)(red * vLight[0]);
+                    colors[1] = (int)(green * vLight[1]);
+                    colors[2] = (int)(blue * vLight[2]);
+                }
+
+                v->modulate[0] = colors[0];
+                v->modulate[1] = colors[1];
+                v->modulate[2] = colors[2];
+                v->modulate[3] = colors[3];
+
+                VectorSubtract(v->xyz, origin, delta);
+                v->st[0] = fSCenter + DotProduct(delta, axis[1]) * texCoordScaleS;
+                v->st[1] = fTCenter + DotProduct(delta, axis[2]) * texCoordScaleT;
+            }
+        } else if (CG_GetMarkInlineModelOrientation(mf->iIndex)) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint] + i;
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
+                    cgi.R_GetLightingForDecal(vLight, dir, (float *)v);
+
+                    colors[0] = (int)(red * vLight[0]);
+                    colors[1] = (int)(green * vLight[1]);
+                    colors[2] = (int)(blue * vLight[2]);
+                }
+
+                v->modulate[0] = colors[0];
+                v->modulate[1] = colors[1];
+                v->modulate[2] = colors[2];
+                v->modulate[3] = colors[3];
+
+                VectorSubtract(v->xyz, origin, delta);
+                v->st[0] = fSCenter + DotProduct(delta, axis[1]) * texCoordScaleS;
+                v->st[1] = fTCenter + DotProduct(delta, axis[2]) * texCoordScaleT;
+            }
+
+            pMarkFragments[i].iIndex = -cgi.CM_InlineModel(cg_entities[-mf->iIndex].currentState.modelindex);
+        } else {
+            mf->numPoints = 0;
+        }
+    }
+
+    return numFragments;
 }
 
 int CG_PermanentTreadMarkDecal(
@@ -1230,31 +1308,31 @@ int CG_PermanentTreadMarkDecal(
     void           *pVoidPolyVerts
 )
 {
-    byte colors[4];
-    int i, j;
-    int numFragments;
-    vec3_t originalPoints[4];
-    vec3_t markPoints[MAX_MARK_POLYVERTS];
-    vec3_t projection;
-    vec3_t vLight;
-    markFragment_t* mf;
-    polyVert_t* pPolyVerts;
-    polyVert_t* v;
-    clipHandle_t cmodel;
-    float fStartAlpha, fEndAlpha;
-    float fStartTex, fEndTex;
-    float fRightCenterDist;
-    float fOOWidth, fOODoubleWidth;
-    float fDist, fSideDist;
-    float fFrac;
-    float fStartDist, fRightStart, fLeftStartDist;
-    float fCenterTexScale, fRightTexScale, fLeftTexScale;
-    float fSideAlpha, fCenterAlpha;
-    vec3_t vStartCenter, vEndCenter;
-    vec3_t vDirection;
-    vec3_t vRight;
-    vec3_t vDelta;
-    float fRadiusSquared;
+    byte            colors[4];
+    int             i, j;
+    int             numFragments;
+    vec3_t          originalPoints[4];
+    vec3_t          markPoints[MAX_MARK_POLYVERTS];
+    vec3_t          projection;
+    vec3_t          vLight;
+    markFragment_t *mf;
+    polyVert_t     *pPolyVerts;
+    polyVert_t     *v;
+    clipHandle_t    cmodel;
+    float           fStartAlpha, fEndAlpha;
+    float           fStartTex, fEndTex;
+    float           fRightCenterDist;
+    float           fOOWidth, fOODoubleWidth;
+    float           fDist, fSideDist;
+    float           fFrac;
+    float           fStartDist, fRightStart, fLeftStartDist;
+    float           fCenterTexScale, fRightTexScale, fLeftTexScale;
+    float           fSideAlpha, fCenterAlpha;
+    vec3_t          vStartCenter, vEndCenter;
+    vec3_t          vDirection;
+    vec3_t          vRight;
+    vec3_t          vDelta;
+    float           fRadiusSquared;
 
     // FIXME: unimplemented
     return 0;
@@ -1264,18 +1342,18 @@ int CG_PermanentUpdateTreadMark(
     treadMark_t *pTread, float fAlpha, float fMinSegment, float fMaxSegment, float fMaxOffset, float fTexScale
 )
 {
-    trace_t trace;
-    float fDist;
-    float fSplitLength;
-    float fNewLength;
-    float fTmp;
+    trace_t  trace;
+    float    fDist;
+    float    fSplitLength;
+    float    fNewLength;
+    float    fTmp;
     qboolean bDoSegmentation;
-    vec3_t vPos;
-    vec3_t vEnd;
-    vec3_t vNewPos;
-    vec3_t vDelta, vDeltaNorm;
-    vec3_t vDir, vMidDir;
-    vec3_t vRight;
+    vec3_t   vPos;
+    vec3_t   vEnd;
+    vec3_t   vNewPos;
+    vec3_t   vDelta, vDeltaNorm;
+    vec3_t   vDir, vMidDir;
+    vec3_t   vRight;
 
     // FIXME: unimplemented
     return 0;
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 6bf408ae..048bcd6c 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -704,6 +704,7 @@ movement on the server game.
 #define MASK_CORNER_NODE \
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_IGNORE_ENTS (CONTENTS_CORPSE | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_CLAYPIDGEON | CONTENTS_LADDER)
+#define MASK_MARK (CONTENTS_TRIGGER | CONTENTS_SOLID)
 
     void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result);
 

From e42b6fe0a9ab59743e0015692963cb41cf1c9d02 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 21:51:16 +0200
Subject: [PATCH 0753/2040] Fix current mark not updating if it has a rotation

---
 code/renderer/tr_marks_permanent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 851a1db6..379ac9a7 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -1719,7 +1719,7 @@ void R_UpdateLevelMarksSystem()
         lm.bPathLayingMode = qfalse;
     }
 
-    if (lm.bAutoApplySettings && lm.pCurrentMark && lm.pCurrentMark->fRotation == -1) {
+    if (lm.bAutoApplySettings && lm.pCurrentMark && lm.pCurrentMark->fRotation != -1) {
         qboolean bDoUpdate = qfalse;
         float    f;
 

From 9eed0eab5f9e717df74282ee40b6aa02071bd8ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 21:51:42 +0200
Subject: [PATCH 0754/2040] Implement CG_PermanentMark

---
 code/cgame/cg_marks.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 201535f5..657c87a7 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1247,11 +1247,11 @@ int CG_PermanentMark(
 
         if (mf->iIndex >= 0) {
             for (j = 0; j < mf->numPoints; j++) {
-                v = &pPolyVerts[mf->firstPoint] + i;
+                v = &pPolyVerts[mf->firstPoint + j];
                 VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
 
                 if (dolighting) {
-                    cgi.R_GetLightingForDecal(vLight, dir, (float *)v);
+                    cgi.R_GetLightingForDecal(vLight, dir, v->xyz);
 
                     colors[0] = (int)(red * vLight[0]);
                     colors[1] = (int)(green * vLight[1]);
@@ -1269,12 +1269,12 @@ int CG_PermanentMark(
             }
         } else if (CG_GetMarkInlineModelOrientation(mf->iIndex)) {
             for (j = 0; j < mf->numPoints; j++) {
-                v = &pPolyVerts[mf->firstPoint] + i;
+                v = &pPolyVerts[mf->firstPoint + j];
                 VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
 
                 if (dolighting) {
                     CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
-                    cgi.R_GetLightingForDecal(vLight, dir, (float *)v);
+                    cgi.R_GetLightingForDecal(vLight, dir, v->xyz);
 
                     colors[0] = (int)(red * vLight[0]);
                     colors[1] = (int)(green * vLight[1]);

From 71a1df661ae9fdeb9954a2cea795c7153f27bfc9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Sep 2024 21:54:49 +0200
Subject: [PATCH 0755/2040] Fix current mark's alpha component not updating
 properly

---
 code/renderer/tr_marks_permanent.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 379ac9a7..67c6a557 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -1752,7 +1752,8 @@ void R_UpdateLevelMarksSystem()
             f = dcl_radius->value;
             if (lm.pCurrentMark->fRadius != f) {
                 lm.pCurrentMark->fRadius = f;
-                bDoUpdate                = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_radius->modified = qfalse;
@@ -1762,7 +1763,8 @@ void R_UpdateLevelMarksSystem()
             f = dcl_heightscale->value;
             if (lm.pCurrentMark->fHeightScale != f) {
                 lm.pCurrentMark->fHeightScale = f;
-                bDoUpdate                     = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_heightscale->modified = qfalse;
@@ -1771,7 +1773,8 @@ void R_UpdateLevelMarksSystem()
             f = dcl_widthscale->value;
             if (lm.pCurrentMark->fWidthScale != f) {
                 lm.pCurrentMark->fWidthScale = f;
-                bDoUpdate                    = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_widthscale->modified = qfalse;
@@ -1781,7 +1784,8 @@ void R_UpdateLevelMarksSystem()
             f = anglemod(dcl_rotation->value);
             if (lm.pCurrentMark->fRotation != f) {
                 lm.pCurrentMark->fRotation = f;
-                bDoUpdate                  = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_rotation->modified = qfalse;
@@ -1791,7 +1795,8 @@ void R_UpdateLevelMarksSystem()
             f = Q_clamp_float(dcl_r->value, 0, 1);
             if (lm.pCurrentMark->color[0] != f) {
                 lm.pCurrentMark->color[0] = f;
-                bDoUpdate                 = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_r->modified = qfalse;
@@ -1800,7 +1805,8 @@ void R_UpdateLevelMarksSystem()
             f = Q_clamp_float(dcl_g->value, 0, 1);
             if (lm.pCurrentMark->color[1] != f) {
                 lm.pCurrentMark->color[1] = f;
-                bDoUpdate                 = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_g->modified = qfalse;
@@ -1809,16 +1815,18 @@ void R_UpdateLevelMarksSystem()
             f = Q_clamp_float(dcl_b->value, 0, 1);
             if (lm.pCurrentMark->color[2] != f) {
                 lm.pCurrentMark->color[2] = f;
-                bDoUpdate                 = qtrue;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_b->modified = qfalse;
         }
         if (dcl_alpha->modified) {
             f = Q_clamp_float(dcl_alpha->value, 0, 1);
-            if (lm.pCurrentMark->color[0] != f) {
-                lm.pCurrentMark->color[0] = f;
-                bDoUpdate                 = qtrue;
+            if (lm.pCurrentMark->color[3] != f) {
+                lm.pCurrentMark->color[3] = f;
+
+                bDoUpdate = qtrue;
             }
 
             dcl_alpha->modified = qfalse;

From 61725c95dfad7673f6d2db30525a51ba2e19704f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:43:36 +0200
Subject: [PATCH 0756/2040] Add MASK_TREADMARKS

---
 code/fgame/bg_public.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 048bcd6c..d46ea7e0 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -604,7 +604,10 @@ movement on the server game.
 
 #define DM_FLAG(flag)             (g_gametype->integer != GT_SINGLE_PLAYER && ((int)dmflags->integer & (flag)))
 
-// content masks
+//
+// Content masks
+//
+
 #define MASK_ALL (-1)
 #define MASK_SOLID \
     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_FENCE)
@@ -704,7 +707,12 @@ movement on the server game.
 #define MASK_CORNER_NODE \
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_IGNORE_ENTS (CONTENTS_CORPSE | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_CLAYPIDGEON | CONTENTS_LADDER)
+
+//
+// Marks
+//
 #define MASK_MARK (CONTENTS_TRIGGER | CONTENTS_SOLID)
+#define MASK_TREADMARKS (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
 
     void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result);
 

From 58e39add5ba0de12c147ee3fa4ab5b4fdeff05d5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:54:39 +0200
Subject: [PATCH 0757/2040] Implemented treadmarks update functions

---
 code/cgame/cg_marks.c  | 373 ++++++++++++++++++++++++++++++++++++++++-
 code/fgame/bg_public.h |   2 +-
 2 files changed, 367 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 657c87a7..38699e07 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -58,7 +58,7 @@ int         cg_iMinFreeMarkObjs;
 qboolean    cg_bMarksInitialized;
 cvar_t     *cg_treadmark_test;
 
-vec3_t vec_upwards;
+vec3_t vec_upwards = {0, 0, 1};
 
 typedef struct cg_impactmarkinfo_s {
     vec3_t axis[3];
@@ -1075,7 +1075,7 @@ void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean
     // FIXME: unimplemented
 }
 
-int CG_UpdateTreadMark(int iReference, vec_t *vNewPos, float fAlpha)
+int CG_UpdateTreadMark(int iReference, const vec3_t vNewPos, float fAlpha)
 {
     int          i;
     int          iTreadNum;
@@ -1291,7 +1291,7 @@ int CG_PermanentMark(
                 v->st[1] = fTCenter + DotProduct(delta, axis[2]) * texCoordScaleT;
             }
 
-            pMarkFragments[i].iIndex = -cgi.CM_InlineModel(cg_entities[-mf->iIndex].currentState.modelindex);
+            mf->iIndex = -cgi.CM_InlineModel(cg_entities[-mf->iIndex].currentState.modelindex);
         } else {
             mf->numPoints = 0;
         }
@@ -1325,8 +1325,9 @@ int CG_PermanentTreadMarkDecal(
     float           fOOWidth, fOODoubleWidth;
     float           fDist, fSideDist;
     float           fFrac;
-    float           fStartDist, fRightStart, fLeftStartDist;
+    float           fStartDist, fRightStartDist, fLeftStartDist;
     float           fCenterTexScale, fRightTexScale, fLeftTexScale;
+    float           fCenterAlphaScale, fRightAlphaScale, fLeftAlphaScale;
     float           fSideAlpha, fCenterAlpha;
     vec3_t          vStartCenter, vEndCenter;
     vec3_t          vDirection;
@@ -1334,8 +1335,164 @@ int CG_PermanentTreadMarkDecal(
     vec3_t          vDelta;
     float           fRadiusSquared;
 
-    // FIXME: unimplemented
-    return 0;
+    pPolyVerts = (polyVert_t *)pVoidPolyVerts;
+
+    if (bStartSegment) {
+        VectorCopy(pTread->vStartVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vStartVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vMidVerts[1], originalPoints[3]);
+
+        fStartAlpha = pTread->fStartAlpha;
+        fEndAlpha   = pTread->fMidAlpha;
+        fStartTex   = pTread->fStartTexCoord;
+        fEndTex     = pTread->fMidTexCoord;
+
+        // Calculate the start center
+        vStartCenter[0] = (originalPoints[1][0] + originalPoints[0][0]) * 0.5;
+        vStartCenter[1] = (originalPoints[1][1] + originalPoints[0][1]) * 0.5;
+        vStartCenter[2] = (originalPoints[1][2] + originalPoints[0][2]) * 0.5;
+        VectorCopy(pTread->vMidPos, vEndCenter);
+        VectorCopy(pTread->vStartDir, vDirection);
+    } else {
+        VectorCopy(pTread->vMidVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vEndVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vEndVerts[1], originalPoints[3]);
+
+        fStartAlpha = pTread->fMidAlpha;
+        fEndAlpha   = pTread->fEndAlpha;
+        fStartTex   = pTread->fMidTexCoord;
+        fEndTex     = pTread->fEndTexCoord;
+
+        VectorCopy(pTread->vMidPos, vStartCenter);
+        VectorCopy(pTread->vEndPos, vEndCenter);
+
+        // Calculate the direction
+        VectorSubtract(vEndCenter, vStartCenter, vDirection);
+        VectorNormalizeFast(vDirection);
+    }
+
+    CrossProduct(vec_upwards, vDirection, vRight);
+    fRightCenterDist = DotProduct(vEndCenter, vRight);
+    fOOWidth         = 1.0 / pTread->fWidth;
+    fOODoubleWidth   = 1.0 / (pTread->fWidth * 2);
+    fStartDist       = DotProduct(vDirection, vStartCenter);
+    fRightStartDist  = DotProduct(vDirection, originalPoints[1]);
+    fLeftStartDist   = DotProduct(vDirection, originalPoints[1]);
+
+    //
+    // Calculate center
+    //
+    VectorSubtract(vEndCenter, vStartCenter, vDelta);
+    fDist             = VectorLength(vDelta);
+    fCenterTexScale   = (fEndTex - fStartTex) / fDist;
+    fCenterAlphaScale = (fEndAlpha - fStartAlpha) / fDist;
+    fSideDist         = fDist;
+
+    //
+    // Calculate right
+    //
+    VectorSubtract(originalPoints[2], originalPoints[1], vDelta);
+    fDist            = VectorLength(vDelta);
+    fRightTexScale   = (fEndTex - fStartTex) / fDist;
+    fRightAlphaScale = (fEndAlpha - fStartAlpha) / fDist;
+
+    //
+    // Calculate left
+    //
+    VectorSubtract(originalPoints[3], originalPoints[0], vDelta);
+    fDist           = VectorLength(vDelta);
+    fLeftTexScale   = (fEndTex - fStartTex) / fDist;
+    fLeftAlphaScale = (fEndAlpha - fStartAlpha) / fDist;
+
+    VectorSet(projection, 0, 0, -32);
+    colors[0] = colors[1] = colors[2] = colors[3] = 0xff;
+
+    numFragments = CG_GetMarkFragments(
+        4, originalPoints, projection, markPoints, pMarkFragments, (Square(pTread->fWidth) + Square(fSideDist)) * 0.25
+    );
+
+    for (i = 0; i < numFragments; i++) {
+        vec3_t vWorldPos;
+
+        mf = &pMarkFragments[i];
+
+        if (mf->numPoints > 8) {
+            mf->numPoints = 8;
+        }
+
+        if (mf->iIndex >= 0) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint + j];
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    cgi.R_GetLightingForDecal(vLight, projection, v->xyz);
+
+                    colors[0] = vLight[0];
+                    colors[1] = vLight[1];
+                    colors[2] = vLight[2];
+                }
+
+                fSideDist  = DotProduct(v->xyz, vRight) - fRightCenterDist;
+                fSideAlpha = fSideDist * fOOWidth;
+                v->st[0]   = (fSideDist + pTread->fWidth) * fOODoubleWidth;
+
+                if (fSideAlpha < 0) {
+                    fSideAlpha = -fSideAlpha;
+                    v->st[1] =
+                        fStartTex + ((DotProduct(v->xyz, vDirection) - fLeftStartDist) * fLeftTexScale * fSideAlpha);
+                } else {
+                    v->st[1] =
+                        fStartTex + ((DotProduct(v->xyz, vDirection) - fRightStartDist) * fRightTexScale * fSideAlpha);
+                }
+
+                v->st[1] += (DotProduct(v->xyz, vDirection) - fStartDist) * fCenterTexScale * (1.0 - fSideAlpha);
+            }
+        } else if (CG_GetMarkInlineModelOrientation(mf->iIndex)) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint + j];
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    cgi.R_GetLightingForDecal(vLight, projection, v->xyz);
+
+                    colors[0] = vLight[0];
+                    colors[1] = vLight[1];
+                    colors[2] = vLight[2];
+                }
+
+                v->modulate[0] = colors[0];
+                v->modulate[1] = colors[1];
+                v->modulate[2] = colors[2];
+                v->modulate[3] = colors[3];
+
+                CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
+
+                fSideDist  = DotProduct(vWorldPos, vRight) - fRightCenterDist;
+                fSideAlpha = fSideDist * fOOWidth;
+                v->st[0]   = (fSideDist + pTread->fWidth) * fOODoubleWidth;
+
+                if (fSideAlpha < 0) {
+                    fSideAlpha = -fSideAlpha;
+                    v->st[1] =
+                        fStartTex + ((DotProduct(vWorldPos, vDirection) - fLeftStartDist) * fLeftTexScale * fSideAlpha);
+                } else {
+                    v->st[1] = fStartTex
+                             + ((DotProduct(vWorldPos, vDirection) - fRightStartDist) * fRightTexScale * fSideAlpha);
+                }
+
+                v->st[1] += (DotProduct(vWorldPos, vDirection) - fStartDist) * fCenterTexScale * (1.0 - fSideAlpha);
+            }
+
+            mf->iIndex = -cgi.CM_InlineModel(cg_entities[-mf->iIndex].currentState.modelindex);
+        } else {
+            mf->numPoints = 0;
+        }
+    }
+
+    return numFragments;
 }
 
 int CG_PermanentUpdateTreadMark(
@@ -1355,6 +1512,208 @@ int CG_PermanentUpdateTreadMark(
     vec3_t   vDir, vMidDir;
     vec3_t   vRight;
 
-    // FIXME: unimplemented
+    VectorCopy(cg.predicted_player_state.origin, vPos);
+    VectorCopy(cg.predicted_player_state.origin, vEnd);
+
+    vPos[2] += 32;
+    vEnd[2] -= 256;
+
+    CG_Trace(
+        &trace,
+        vPos,
+        vec3_origin,
+        vec3_origin,
+        vEnd,
+        cg.snap->ps.clientNum,
+        MASK_TREADMARK,
+        qfalse,
+        qtrue,
+        "CG_PermanentUpdateTreadMark"
+    );
+
+    VectorCopy(trace.endpos, vNewPos);
+
+    if (cg.time - pTread->iLastTime > 500) {
+        VectorClear(pTread->vStartDir);
+        VectorClear(pTread->vStartVerts[0]);
+        VectorClear(pTread->vStartVerts[1]);
+        pTread->fStartTexCoord = 0;
+        pTread->fStartAlpha    = 0;
+
+        VectorClear(pTread->vMidPos);
+        VectorClear(pTread->vMidVerts[0]);
+        VectorClear(pTread->vMidVerts[1]);
+        pTread->fMidTexCoord = 0;
+        pTread->fMidAlpha    = 0;
+
+        VectorClear(pTread->vEndPos);
+        VectorClear(pTread->vEndVerts[0]);
+        VectorClear(pTread->vEndVerts[1]);
+        pTread->fEndTexCoord = 0;
+        pTread->fEndAlpha    = 0;
+
+        pTread->iState           = 1;
+        pTread->iReferenceNumber = 0;
+        pTread->iLastTime        = cg.time;
+        VectorCopy(vNewPos, pTread->vMidPos);
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha < 0) {
+            pTread->fMidAlpha = 255.0;
+        } else {
+            pTread->fMidAlpha = fAlpha * 255.0;
+        }
+        pTread->fEndAlpha = pTread->fMidAlpha;
+
+        return 0;
+    }
+
+    if (VectorCompare(pTread->vEndPos, vNewPos)) {
+        if (fAlpha < 0) {
+            return -1;
+        }
+
+        fTmp              = pTread->fEndAlpha;
+        pTread->fEndAlpha = fAlpha * 255;
+
+        //if (fabs(fTmp - pTread->fEndAlpha > 0.05)) {
+        // Fixed in OPM
+        //  Looks like this was accidental
+        if (fabs(fTmp - pTread->fEndAlpha) > 0.05) {
+            return -1;
+        }
+
+        return 0;
+    }
+
+    VectorSubtract(vNewPos, pTread->vMidPos, vDelta);
+    fDist = VectorNormalize2(vDelta, vDeltaNorm);
+
+    if (pTread->iState == 1) {
+        fSplitLength    = 0.0;
+        bDoSegmentation = qfalse;
+    } else {
+        VectorAdd(vDeltaNorm, pTread->vStartDir, vMidDir);
+        VectorScale(vMidDir, 0.5, vMidDir);
+        VectorNormalizeFast(vMidDir);
+
+        fTmp         = DotProduct(vMidDir, vDeltaNorm);
+        fSplitLength = pTread->fWidth / fTmp;
+
+        if (fTmp < -0.5) {
+            fNewLength =
+                fTmp
+                * (fTmp
+                       * (fTmp
+                              * (fTmp * (fTmp * (fTmp * -337.31875783205 + -1237.54375255107) + -1802.11467325687)
+                                 + -1303.19904613494)
+                          + -471.347871690988)
+                   + -70.0883838161826);
+        } else if (fTmp > 0.5) {
+            fNewLength =
+                fTmp
+                    * (fTmp
+                           * (fTmp
+                                  * (fTmp * (fTmp * (fTmp * -1507.55394345521 + 6580.58002318442) + -11860.0735285953)
+                                     + 11290.7510782536)
+                              + -5986.89654545347)
+                       + 1675.66417006387)
+                + -192.426950291139;
+        } else {
+            fNewLength = fTmp * (fTmp * -0.531387674508458 + -2.11e-14) + 1.00086138065435;
+        }
+
+        fNewLength *= fSplitLength;
+        if (fNewLength + fMinSegment > fDist) {
+            bDoSegmentation = qfalse;
+        } else if (fSplitLength < -1) {
+            fSplitLength    = -fSplitLength;
+            bDoSegmentation = qtrue;
+        } else if (fDist > fMaxSegment) {
+            bDoSegmentation = qtrue;
+        } else {
+            CrossProduct(vec_upwards, pTread->vStartDir, vRight);
+            VectorNormalizeFast(vRight);
+
+            if (fabs(DotProduct(vRight, vDelta)) > fMaxOffset) {
+                bDoSegmentation = qtrue;
+            } else {
+                bDoSegmentation = qfalse;
+            }
+        }
+    }
+
+    if (pTread->iState == 2 && bDoSegmentation) {
+        VectorCopy(pTread->vStartVerts[0], pTread->vMidVerts[0]);
+        VectorCopy(pTread->vStartVerts[1], pTread->vMidVerts[1]);
+        pTread->fMidTexCoord = pTread->fEndTexCoord;
+        pTread->fMidAlpha    = pTread->fEndAlpha;
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        pTread->iState = 3;
+
+        return 0;
+    } else if (pTread->iState == 1 || pTread->iState == 2) {
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0.0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        CrossProduct(vec_upwards, vDeltaNorm, vDir);
+        VectorMA(pTread->vMidPos, pTread->fWidth, vDir, pTread->vMidVerts[0]);
+        VectorMA(pTread->vMidPos, -pTread->fWidth, vDir, pTread->vMidVerts[1]);
+        VectorMA(pTread->vEndPos, pTread->fWidth, vDir, pTread->vEndVerts[0]);
+        VectorMA(pTread->vEndPos, -pTread->fWidth, vDir, pTread->vEndVerts[1]);
+
+        pTread->fEndTexCoord = fDist * fTexScale;
+
+        if (pTread->iState == 1 && fDist > 8.0) {
+            VectorCopy(vDelta, pTread->vStartDir);
+            pTread->iState = 2;
+        }
+
+        return 0;
+    } else if (bDoSegmentation) {
+        if (!pTread->iReferenceNumber) {
+            pTread->iReferenceNumber = 1;
+            return 1;
+        }
+
+        pTread->iReferenceNumber = 0;
+        VectorCopy(pTread->vStartVerts[0], pTread->vMidVerts[0]);
+        VectorCopy(pTread->vStartVerts[1], pTread->vMidVerts[1]);
+        VectorSubtract(pTread->vEndPos, pTread->vMidPos, pTread->vStartDir);
+        VectorNormalizeFast(pTread->vStartDir);
+
+        VectorCopy(pTread->vEndPos, pTread->vMidPos);
+        pTread->fMidTexCoord = pTread->fEndTexCoord;
+        pTread->fMidAlpha    = pTread->fEndAlpha;
+
+        if (pTread->fStartTexCoord >= 1.0) {
+            pTread->fStartTexCoord = pTread->fStartTexCoord - floor(pTread->fStartTexCoord);
+            pTread->fMidTexCoord   = pTread->fMidTexCoord - floor(pTread->fStartTexCoord);
+        }
+
+        VectorCopy(vNewPos, pTread->vEndPos);
+        pTread->fEndTexCoord = fDist * fTexScale + pTread->fMidTexCoord;
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+    }
+
+    CrossProduct(vec_upwards, vMidDir, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vMidPos, fSplitLength, vRight, pTread->vMidVerts[0]);
+    VectorMA(pTread->vMidPos, -fSplitLength, vRight, pTread->vMidVerts[1]);
+    CrossProduct(vec_upwards, vDeltaNorm, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vEndPos, pTread->fWidth, vRight, pTread->vEndVerts[0]);
+    VectorMA(pTread->vEndPos, -pTread->fWidth, vRight, pTread->vEndVerts[1]);
+
     return 0;
 }
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index d46ea7e0..39c80ab5 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -712,7 +712,7 @@ movement on the server game.
 // Marks
 //
 #define MASK_MARK (CONTENTS_TRIGGER | CONTENTS_SOLID)
-#define MASK_TREADMARKS (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
+#define MASK_TREADMARK (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
 
     void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result);
 

From b7f0f3287818cede5778044af77c241e9866076b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 01:14:42 +0200
Subject: [PATCH 0758/2040] Fix DCL signature on big-endian architectures

---
 code/renderer/tr_marks_permanent.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 67c6a557..256ba4c2 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -176,7 +176,7 @@ void DCLC_Save(void)
         }
     }
 
-    header.ident         = LittleLong(DCL_FILE_SIGNATURE);
+    header.ident         = DCL_FILE_SIGNATURE;
     header.version       = LittleLong(DCL_FILE_VERSION);
     header.checksum      = 0;
     header.iNumDecals    = LittleLong(iNumDecals);
@@ -328,10 +328,6 @@ void R_LevelMarksLoad(const char *szBSPName)
         return;
     }
 
-    for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
-        ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);
-    }
-
     //
     // Signature and version checks
     //
@@ -342,6 +338,10 @@ void R_LevelMarksLoad(const char *szBSPName)
         return;
     }
 
+    for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
+        ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);
+    }
+
     if (dclHeader.version != DCL_FILE_OLD_VERSION && dclHeader.version != DCL_FILE_VERSION) {
         ri.Printf(
             PRINT_ALL,

From a2ebeb11e3315e0b640cee227cd424cd178a04c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:10:28 +0200
Subject: [PATCH 0759/2040] Update features.md

---
 docs/features.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/features.md b/docs/features.md
index 8c1f3a49..22c85e16 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -29,21 +29,22 @@ Enable this feature with `set sv_netoptimize 2`.
 
 ### Client-side and server-side
 
-- Fixes from SH 2.15 and BT 2.40
+- Fixes from SH 2.15, BT 2.40 and ioquake3
 - Buffer overflow fixes
 - Directory traversal fix
+- Packet flood protection
 
 ### Server-side
 
 - DM message comment fix
 - Callvote fix
-- Getting weapons from opposite team
-- Grenade crash bug
-- Grenade spectator charge bug
-- `leave_team` bug fix
-- Primary DM weapon spectator fix
-- Projectile spectator glitch fix (for when firing a projectile then going into spectator to kill anyone)
-- `sv_fps` (tickrate) fix, higher values won't cause animation issues anymore
+- Fix to prevent getting weapons from opposite team
+- Fixed grenade crash bug
+- Fixed grenade spectator charge bug
+- Fixed `leave_team` bug
+- Fix to prevent being able to spectate while still in the team
+- Fix to prevent throwing a projectile and going into spectator to kill anyone
+- Fix for `sv_fps` (tickrate), higher values won't cause animation issues anymore
 
 ## Planned features
 

From a1601be7a6547ecd5ec9e958665817326e50e6f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:54:01 +0200
Subject: [PATCH 0760/2040] Implement code to make tread mark decals

---
 code/cgame/cg_marks.c | 190 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 187 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 38699e07..dd523cc6 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1045,8 +1045,80 @@ CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *
     polyVert_t         *v;
     cg_treadmarkinfo_t *pInfo;
 
-    // FIXME: unimplemented
-    return qfalse;
+    pInfo = (cg_treadmarkinfo_t *)pCustom;
+
+    if (mf->iIndex < 0) {
+        vec3_t vWorldPos;
+
+        if (!CG_GetMarkInlineModelOrientation(mf->iIndex)) {
+            return qfalse;
+        }
+
+        for (j = 0; j < mf->numPoints; j++) {
+            v = &verts[j];
+            VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+            v->modulate[0] = pInfo->colors[0];
+            v->modulate[1] = pInfo->colors[1];
+            v->modulate[2] = pInfo->colors[2];
+            v->modulate[3] = pInfo->colors[3];
+
+            CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
+            fSideDist    = DotProduct(pInfo->vRight, vWorldPos);
+            verts->st[0] = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
+
+            fSideAlpha = fSideDist * pInfo->fOOWidth;
+            fDist      = DotProduct(vWorldPos, pInfo->vDirection);
+            if (fSideAlpha < 0) {
+                fSideAlpha = -fSideAlpha;
+                v->st[1]   = pInfo->fStartTex + ((fDist - pInfo->fLeftStartDist) * pInfo->fLeftTexScale * fSideAlpha)
+                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
+                v->modulate[3] = pInfo->fStartAlpha
+                               + (1.0 - fSideAlpha)
+                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
+                               + (fDist - pInfo->fLeftStartDist) * pInfo->fLeftAlphaScale * fSideAlpha;
+            } else {
+                v->st[1] = pInfo->fStartTex + ((fDist - pInfo->fRightStartDist) * pInfo->fRightTexScale * fSideAlpha)
+                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
+                v->modulate[3] = pInfo->fStartAlpha
+                               + (1.0 - fSideAlpha)
+                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
+                               + (fDist - pInfo->fRightStartDist) * pInfo->fRightAlphaScale * fSideAlpha;
+            }
+        }
+    } else {
+        for (j = 0; j < mf->numPoints; j++) {
+            v = &verts[j];
+            VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+            v->modulate[0] = pInfo->colors[0];
+            v->modulate[1] = pInfo->colors[1];
+            v->modulate[2] = pInfo->colors[2];
+            v->modulate[3] = pInfo->colors[3];
+
+            fSideDist    = DotProduct(pInfo->vRight, v->xyz);
+            verts->st[0] = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
+
+            fSideAlpha = fSideDist * pInfo->fOOWidth;
+            fDist      = DotProduct(v->xyz, pInfo->vDirection);
+            if (fSideAlpha < 0) {
+                fSideAlpha = -fSideAlpha;
+                v->st[1]   = pInfo->fStartTex + ((fDist - pInfo->fLeftStartDist) * pInfo->fLeftTexScale * fSideAlpha)
+                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
+                v->modulate[3] = pInfo->fStartAlpha
+                               + (1.0 - fSideAlpha)
+                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
+                               + (fDist - pInfo->fLeftStartDist) * pInfo->fLeftAlphaScale * fSideAlpha;
+            } else {
+                v->st[1] = pInfo->fStartTex + ((fDist - pInfo->fRightStartDist) * pInfo->fRightTexScale * fSideAlpha)
+                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
+                v->modulate[3] = pInfo->fStartAlpha
+                               + (1.0 - fSideAlpha)
+                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
+                               + (fDist - pInfo->fRightStartDist) * pInfo->fRightAlphaScale * fSideAlpha;
+            }
+        }
+    }
+
+    return qtrue;
 }
 
 int CG_MakeTreadMarkDecal_GetLeafCallback(markFragment_t *mf, void *pCustom)
@@ -1072,7 +1144,119 @@ void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean
     vec3_t             origin;
     float              fRadiusSquared;
 
-    // FIXME: unimplemented
+    if (bStartSegment) {
+        VectorCopy(pTread->vStartVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vStartVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vMidVerts[1], originalPoints[3]);
+
+        info.fStartAlpha = pTread->fStartAlpha;
+        fEndAlpha        = pTread->fMidAlpha;
+        info.fStartTex   = pTread->fStartTexCoord;
+        fEndTex          = pTread->fMidTexCoord;
+
+        // Calculate the start center
+        vStartCenter[0] = (originalPoints[1][0] + originalPoints[0][0]) * 0.5;
+        vStartCenter[1] = (originalPoints[1][1] + originalPoints[0][1]) * 0.5;
+        vStartCenter[2] = (originalPoints[1][2] + originalPoints[0][2]) * 0.5;
+        VectorCopy(pTread->vMidPos, vEndCenter);
+        VectorCopy(pTread->vStartDir, info.vDirection);
+    } else {
+        VectorCopy(pTread->vMidVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vEndVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vEndVerts[1], originalPoints[3]);
+
+        info.fStartAlpha = pTread->fMidAlpha;
+        fEndAlpha        = pTread->fEndAlpha;
+        info.fStartTex   = pTread->fMidTexCoord;
+        fEndTex          = pTread->fEndTexCoord;
+
+        VectorCopy(pTread->vMidPos, vStartCenter);
+        VectorCopy(pTread->vEndPos, vEndCenter);
+
+        // Calculate the direction
+        VectorSubtract(vEndCenter, vStartCenter, info.vDirection);
+        VectorNormalizeFast(info.vDirection);
+    }
+
+    CrossProduct(vec_upwards, info.vDirection, info.vRight);
+    info.fRightCenterDist = DotProduct(vEndCenter, info.vRight);
+    info.fOODoubleWidth   = 0.5 / pTread->fWidth;
+    info.fOOWidth         = info.fOODoubleWidth * 2;
+    info.fStartDist       = DotProduct(info.vDirection, vStartCenter);
+    info.fRightStartDist  = DotProduct(info.vDirection, originalPoints[1]);
+    info.fLeftStartDist   = DotProduct(info.vDirection, originalPoints[0]);
+
+    //
+    // Center
+    //
+
+    VectorSubtract(vEndCenter, vStartCenter, vDelta);
+    fDist = VectorLength(vDelta);
+
+    fRadiusSquared = (fDist + pTread->fWidth * pTread->fWidth) * 0.25;
+
+    info.fCenterTexScale   = (fEndTex - info.fStartTex) / fDist;
+    info.fCenterAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
+
+    //
+    // Right
+    //
+
+    VectorSubtract(originalPoints[2], originalPoints[1], vDelta);
+    fDist = VectorLength(vDelta);
+
+    info.fRightTexScale   = (fEndTex - info.fStartTex) / fDist;
+    info.fRightAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
+
+    //
+    // Left
+    //
+
+    VectorSubtract(originalPoints[3], originalPoints[1], vDelta);
+    fDist = VectorLength(vDelta);
+
+    info.fLeftTexScale   = (fEndTex - info.fStartTex) / fDist;
+    info.fLeftAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
+
+    VectorSet(projection, 0, 0, 32);
+    info.colors[0] = info.colors[1] = info.colors[2] = info.colors[3] = -1;
+
+    numFragments = CG_GetMarkFragments(4, originalPoints, projection, markPoints, markFragments, fRadiusSquared);
+    origin[0]    = (vStartCenter[0] + vEndCenter[0]) * 0.5;
+    origin[1]    = (vStartCenter[1] + vEndCenter[1]) * 0.5;
+    origin[2]    = (vStartCenter[2] + vEndCenter[2]) * 0.5;
+    info.leafnum = cgi.CM_PointLeafnum(origin);
+    info.pTread  = pTread;
+
+    if (bTemporary) {
+        for (i = 0; i < numFragments; i++) {
+            polyVert_t verts[8];
+
+            mf = &markFragments[i];
+            if (mf->numPoints > 8) {
+                mf->numPoints = 8;
+            }
+            if (CG_MakeTreadMarkDecal_PerPolyCallback(markPoints, mf, verts, &info)) {
+                CG_AddFragmentToScene(mf->iIndex, pTread->hTreadShader, mf->numPoints, &verts);
+            }
+        }
+    } else {
+        CG_AssembleFinalMarks(
+            markPoints,
+            markFragments,
+            numFragments,
+            &CG_MakeTreadMarkDecal_PerPolyCallback,
+            &CG_MakeTreadMarkDecal_GetLeafCallback,
+            &info,
+            origin,
+            sqrt(fRadiusSquared),
+            pTread->hTreadShader,
+            qfalse,
+            qfalse
+        );
+    }
 }
 
 int CG_UpdateTreadMark(int iReference, const vec3_t vNewPos, float fAlpha)

From 14d1fae54acb3261105305f72cc2d7c8b0c56169 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:57:53 +0200
Subject: [PATCH 0761/2040] Implement all treadmark functions

---
 code/cgame/cg_marks.c | 215 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 179 insertions(+), 36 deletions(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index dd523cc6..b463eb08 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1042,6 +1042,7 @@ CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *
     float               fSideAlpha;
     float               fCenterAlpha;
     float               fFrac;
+    float               fTex, fAlpha;
     polyVert_t         *v;
     cg_treadmarkinfo_t *pInfo;
 
@@ -1063,8 +1064,8 @@ CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *
             v->modulate[3] = pInfo->colors[3];
 
             CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
-            fSideDist    = DotProduct(pInfo->vRight, vWorldPos);
-            verts->st[0] = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
+            fSideDist = DotProduct(pInfo->vRight, vWorldPos) - pInfo->fRightCenterDist;
+            v->st[0]  = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
 
             fSideAlpha = fSideDist * pInfo->fOOWidth;
             fDist      = DotProduct(vWorldPos, pInfo->vDirection);
@@ -1094,27 +1095,25 @@ CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *
             v->modulate[2] = pInfo->colors[2];
             v->modulate[3] = pInfo->colors[3];
 
-            fSideDist    = DotProduct(pInfo->vRight, v->xyz);
-            verts->st[0] = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
+            fSideDist = DotProduct(pInfo->vRight, v->xyz) - pInfo->fRightCenterDist;
+            v->st[0]  = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
 
             fSideAlpha = fSideDist * pInfo->fOOWidth;
             fDist      = DotProduct(v->xyz, pInfo->vDirection);
             if (fSideAlpha < 0) {
                 fSideAlpha = -fSideAlpha;
-                v->st[1]   = pInfo->fStartTex + ((fDist - pInfo->fLeftStartDist) * pInfo->fLeftTexScale * fSideAlpha)
-                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
-                v->modulate[3] = pInfo->fStartAlpha
-                               + (1.0 - fSideAlpha)
-                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
-                               + (fDist - pInfo->fLeftStartDist) * pInfo->fLeftAlphaScale * fSideAlpha;
+                fTex       = (fDist - pInfo->fLeftStartDist) * pInfo->fLeftTexScale;
+                fAlpha     = (fDist - pInfo->fLeftStartDist) * pInfo->fLeftAlphaScale;
             } else {
-                v->st[1] = pInfo->fStartTex + ((fDist - pInfo->fRightStartDist) * pInfo->fRightTexScale * fSideAlpha)
-                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
-                v->modulate[3] = pInfo->fStartAlpha
-                               + (1.0 - fSideAlpha)
-                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
-                               + (fDist - pInfo->fRightStartDist) * pInfo->fRightAlphaScale * fSideAlpha;
+                fTex   = (fDist - pInfo->fRightStartDist) * pInfo->fRightTexScale;
+                fAlpha = (fDist - pInfo->fRightStartDist) * pInfo->fRightAlphaScale;
             }
+
+            v->st[1] = pInfo->fStartTex + (fTex * fSideAlpha)
+                     + (fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha);
+            v->modulate[3] = pInfo->fStartAlpha
+                           + ((1.0 - fSideAlpha) * ((fDist - pInfo->fStartDist) * pInfo->fCenterAlphaScale))
+                           + (fAlpha * fSideAlpha);
         }
     }
 
@@ -1156,9 +1155,8 @@ void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean
         fEndTex          = pTread->fMidTexCoord;
 
         // Calculate the start center
-        vStartCenter[0] = (originalPoints[1][0] + originalPoints[0][0]) * 0.5;
-        vStartCenter[1] = (originalPoints[1][1] + originalPoints[0][1]) * 0.5;
-        vStartCenter[2] = (originalPoints[1][2] + originalPoints[0][2]) * 0.5;
+        VectorAdd(originalPoints[1], originalPoints[0], vStartCenter);
+        VectorScale(vStartCenter, 0.5, vStartCenter);
         VectorCopy(pTread->vMidPos, vEndCenter);
         VectorCopy(pTread->vStartDir, info.vDirection);
     } else {
@@ -1195,7 +1193,7 @@ void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean
     VectorSubtract(vEndCenter, vStartCenter, vDelta);
     fDist = VectorLength(vDelta);
 
-    fRadiusSquared = (fDist + pTread->fWidth * pTread->fWidth) * 0.25;
+    fRadiusSquared = (Square(fDist) + Square(pTread->fWidth)) * 0.25;
 
     info.fCenterTexScale   = (fEndTex - info.fStartTex) / fDist;
     info.fCenterAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
@@ -1220,13 +1218,12 @@ void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean
     info.fLeftTexScale   = (fEndTex - info.fStartTex) / fDist;
     info.fLeftAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
 
-    VectorSet(projection, 0, 0, 32);
+    VectorSet(projection, 0, 0, -32);
     info.colors[0] = info.colors[1] = info.colors[2] = info.colors[3] = -1;
 
     numFragments = CG_GetMarkFragments(4, originalPoints, projection, markPoints, markFragments, fRadiusSquared);
-    origin[0]    = (vStartCenter[0] + vEndCenter[0]) * 0.5;
-    origin[1]    = (vStartCenter[1] + vEndCenter[1]) * 0.5;
-    origin[2]    = (vStartCenter[2] + vEndCenter[2]) * 0.5;
+    VectorAdd(vStartCenter, vEndCenter, origin);
+    VectorScale(origin, 0.5, origin);
     info.leafnum = cgi.CM_PointLeafnum(origin);
     info.pTread  = pTread;
 
@@ -1268,20 +1265,158 @@ int CG_UpdateTreadMark(int iReference, const vec3_t vNewPos, float fAlpha)
     float        fNewLength;
     float        fTmp;
     qboolean     bDoSegmentation;
-    vec3_t       vDelta, vDeltaNorml;
+    vec3_t       vDelta, vDeltaNorm;
     vec3_t       vDir, vMidDir;
     vec3_t       vRight;
     treadMark_t *pTread;
 
-    // FIXME: unimplemented
+    iTreadNum = -1;
+
+    for (i = 0; i < MAX_TREAD_MARKS; i++) {
+        if (cg_treadMarks[i].iReferenceNumber == iReference) {
+            iTreadNum = i;
+            pTread    = &cg_treadMarks[i];
+        }
+    }
+
+    if (iTreadNum == -1 || !pTread->iState) {
+        return -1;
+    }
+
+    pTread->iLastTime = cg.time;
+
+    if (VectorCompare(pTread->vEndPos, vNewPos)) {
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+        return 0;
+    }
+
+    VectorSubtract(vNewPos, pTread->vMidPos, vDelta);
+    fDist = VectorNormalize2(vDelta, vDeltaNorm);
+    if (pTread->iState == 1) {
+        fSplitLength    = 0;
+        bDoSegmentation = qfalse;
+    } else {
+        VectorAdd(vDeltaNorm, pTread->vStartDir, vMidDir);
+        VectorScale(vMidDir, 0.5, vMidDir);
+        VectorNormalizeFast(vMidDir);
+
+        fTmp         = DotProduct(vMidDir, vDeltaNorm);
+        fSplitLength = pTread->fWidth / fTmp;
+
+        if (fTmp < -0.5) {
+            fTmp = fTmp
+                 * (fTmp
+                        * (fTmp
+                               * (fTmp * (fTmp * (fTmp * -337.31875783205 + -1237.54375255107) + -1802.11467325687)
+                                  + -1303.19904613494)
+                           + -471.347871690988)
+                    + -70.0883838161826);
+        } else if (fTmp > 0.5) {
+            fTmp = fTmp
+                     * (fTmp
+                            * (fTmp
+                                   * (fTmp * (fTmp * (fTmp * -1507.55394345521 + 6580.58002318442) + -11860.0735285953)
+                                      + 11290.7510782536)
+                               + -5986.89654545347)
+                        + 1675.66417006387)
+                 + -192.426950291139;
+        } else {
+            fTmp = fTmp * (fTmp * -0.531387674508458 + -2.11e-14) + 1.00086138065435;
+        }
+
+        fNewLength = fSplitLength * fTmp;
+        if (fNewLength + 24 > fDist) {
+            bDoSegmentation = qfalse;
+        } else if (fSplitLength < -1) {
+            fSplitLength    = -fSplitLength;
+            bDoSegmentation = qtrue;
+        } else if (fDist > 256) {
+            bDoSegmentation = qtrue;
+        } else {
+            CrossProduct(vec_upwards, pTread->vStartDir, vRight);
+            VectorNormalizeFast(vRight);
+            bDoSegmentation = fabs(DotProduct(vRight, vDelta)) > 16;
+        }
+    }
+
+    if (pTread->iState == 2 && bDoSegmentation) {
+        VectorCopy(pTread->vMidVerts[0], pTread->vStartVerts[0]);
+        VectorCopy(pTread->vMidVerts[1], pTread->vStartVerts[1]);
+        pTread->fMidTexCoord = pTread->fEndTexCoord;
+        pTread->fMidAlpha    = pTread->fEndAlpha;
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        pTread->iState = 3;
+    } else if (pTread->iState == 0 || pTread->iState == 1) {
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        CrossProduct(vec_upwards, vDeltaNorm, vDir);
+        VectorMA(pTread->vMidPos, pTread->fWidth, vDir, pTread->vMidVerts[0]);
+        VectorMA(pTread->vMidPos, 0.0 - pTread->fWidth, vDir, pTread->vMidVerts[1]);
+        VectorMA(pTread->vEndPos, pTread->fWidth, vDir, pTread->vEndVerts[0]);
+        VectorMA(pTread->vEndPos, 0.0 - pTread->fWidth, vDir, pTread->vEndVerts[1]);
+
+        pTread->fEndTexCoord = fDist / 32.0;
+
+        if (pTread->iState == 1 && fDist > 8) {
+            VectorCopy(vDelta, pTread->vStartDir);
+            pTread->iState = 2;
+        }
+        return 0;
+    } else {
+        if (bDoSegmentation) {
+            CG_MakeTreadMarkDecal(pTread, qtrue, qfalse);
+
+            VectorCopy(pTread->vMidVerts[0], pTread->vStartVerts[0]);
+            VectorCopy(pTread->vMidVerts[1], pTread->vStartVerts[1]);
+            VectorSubtract(pTread->vEndPos, pTread->vMidPos, pTread->vStartDir);
+            VectorNormalizeFast(pTread->vStartDir);
+            VectorCopy(pTread->vEndPos, pTread->vMidPos);
+            pTread->fMidTexCoord = pTread->fEndTexCoord;
+            pTread->fMidAlpha    = pTread->fEndAlpha;
+
+            if (pTread->fStartTexCoord >= 1.0) {
+                pTread->fMidTexCoord -= (int)pTread->fStartTexCoord;
+                pTread->fStartTexCoord -= (int)pTread->fStartTexCoord;
+            }
+        }
+
+        VectorCopy(vNewPos, pTread->vEndPos);
+        pTread->fEndTexCoord = pTread->fMidTexCoord + fDist / 32.0;
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+    }
+
+    CrossProduct(vec_upwards, vMidDir, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vMidPos, fSplitLength, vRight, pTread->vMidVerts[0]);
+    VectorMA(pTread->vMidPos, 0.0 - fSplitLength, vRight, pTread->vMidVerts[1]);
+    CrossProduct(vec_upwards, vDeltaNorm, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vEndPos, pTread->fWidth, vRight, pTread->vEndVerts[0]);
+    VectorMA(pTread->vEndPos, 0.0 - pTread->fWidth, vRight, pTread->vEndVerts[1]);
+
     return 0;
 }
 
 void CG_AddTreadMarks()
 {
-    trace_t trace;
-    vec3_t  vPos, vEnd;
-    int     i;
+    treadMark_t *pTread;
+    trace_t      trace;
+    vec3_t       vPos, vEnd;
+    int          i;
 
     if (cg_treadmark_test->integer) {
         VectorCopy(cg.predicted_player_state.origin, vPos);
@@ -1302,23 +1437,31 @@ void CG_AddTreadMarks()
             "CG_AddTreadMarks test"
         );
 
-        if (trace.fraction < 1.0 && CG_UpdateTreadMark(1, trace.endpos, 0.f) == -1) {
+        if (trace.fraction < 1.0 && CG_UpdateTreadMark(1, trace.endpos, 1.0) == -1) {
             qhandle_t shader = cgi.R_RegisterShader("testtread");
 
-            CG_StartTreadMark(1, shader, trace.endpos, cg_treadmark_test->integer, 1.0f);
+            CG_StartTreadMark(1, shader, trace.endpos, cg_treadmark_test->integer, 1.0);
         }
     }
 
     for (i = 0; i < MAX_TREAD_MARKS; i++) {
-        if (!cg_treadMarks[i].iState) {
+        pTread = &cg_treadMarks[i];
+
+        if (!pTread->iState) {
             continue;
         }
 
-        if (cg.time - cg_treadMarks[i].iLastTime > 500) {
-            CG_MakeTreadMarkDecal(&cg_treadMarks[i], cg_treadMarks[i].iState == 3 ? qtrue : qfalse, qfalse);
-            cg_treadMarks[i].iState = 0;
+        if (cg.time - pTread->iLastTime > 500) {
+            if (pTread->iState == 3) {
+                CG_MakeTreadMarkDecal(pTread, qtrue, qfalse);
+            }
+            CG_MakeTreadMarkDecal(pTread, qfalse, qfalse);
+            pTread->iState = 0;
         } else {
-            CG_MakeTreadMarkDecal(&cg_treadMarks[i], cg_treadMarks[i].iState == 3 ? qtrue : qfalse, qtrue);
+            if (pTread->iState == 3) {
+                CG_MakeTreadMarkDecal(pTread, qtrue, qtrue);
+            }
+            CG_MakeTreadMarkDecal(pTread, qfalse, qtrue);
         }
     }
 }

From cefe331e0c4cbce1203816bfeee76412f04f501c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 7 Sep 2024 00:16:18 +0200
Subject: [PATCH 0762/2040] Remove useless surface flags

---
 code/qcommon/surfaceflags.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/qcommon/surfaceflags.h b/code/qcommon/surfaceflags.h
index 575e494c..30f1a5ca 100644
--- a/code/qcommon/surfaceflags.h
+++ b/code/qcommon/surfaceflags.h
@@ -77,10 +77,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define	CONTENTS_TRIGGER		0x40000000
 #define	CONTENTS_NODROP			0x80000000	// don't leave bodies or items (death fog, lava)
 
-#define MASK_FOOTSTEP			0x42022901
-#define MASK_TREADMARK			0x42012B01
-#define MASK_WOMBAT				(MASK_WOMBAT2|MASK_WOMBAT1|MASK_CLIP|MASK_WOMBAT5)
-
 #define	SURF_NODAMAGE			0x1		// never give falling damage
 #define	SURF_SLICK				0x2		// effects game physics
 #define	SURF_SKY				0x4		// lighting from environment map

From cd9b1a741fc33a34957fa22112c1280896cf9b14 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 7 Sep 2024 23:53:47 +0200
Subject: [PATCH 0763/2040] Match CG_PermanentMark parameters

This fixes #355
---
 code/cgame/cg_main.c            | 2 +-
 code/cgame/cg_public.h          | 4 ++--
 code/client/cl_main.cpp         | 2 +-
 code/renderercommon/tr_public.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 57e855dc..646fcbf5 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -338,7 +338,7 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             if (cg.rain.numshaders) {
                 // Fixed in OPM
                 //  not sure why some maps set a digit at the end...
-                int len = strlen(cg.rain.currentShader);
+                size_t len = strlen(cg.rain.currentShader);
                 if (isdigit(cg.rain.currentShader[len - 1])) {
                     cg.rain.currentShader[len - 1] = 0;
                 }
diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index 58d515d4..5257a165 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -465,8 +465,8 @@ functions exported to the main executable
         int (*CG_GetParent)(int entNum);
         float (*CG_GetObjectiveAlpha)();
         int (*CG_PermanentMark)(
-            const vec3_t    origin,
-            const vec3_t    dir,
+            vec3_t          origin,
+            vec3_t          dir,
             float           orientation,
             float           sScale,
             float           tScale,
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index a2e61c3a..7d14d5e8 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2859,7 +2859,7 @@ void CL_RefStaticClear( void ) {
 CL_CG_PermanentMark
 ============
 */
-int CL_CG_PermanentMark(const vec3_t origin, const vec3_t dir, float orientation,
+int CL_CG_PermanentMark(vec3_t origin, vec3_t dir, float orientation,
 	float fSScale, float fTScale, float red, float green, float blue, float alpha,
 	qboolean dolighting, float fSCenter, float fTCenter,
 	markFragment_t *pMarkFragments, void *pPolyVerts )
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index 275fd68b..0699c969 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -272,7 +272,7 @@ typedef struct {
     int         (*CM_TerrainSquareType)(int terrainPatch, int i, int j);
     char*       (*CM_EntityString)();
 	const char* (*CM_MapTime)();
-    int         (*CG_PermanentMark)(const vec3_t origin, const vec3_t dir, float orientation, float sScale, float tScale, float red, float green, float blue, float alpha, qboolean doLighting, float sCenter, float tCenter, markFragment_t* markFragments, void* polyVerts);
+    int         (*CG_PermanentMark)(vec3_t origin, vec3_t dir, float orientation, float sScale, float tScale, float red, float green, float blue, float alpha, qboolean doLighting, float sCenter, float tCenter, markFragment_t* markFragments, void* polyVerts);
     int         (*CG_PermanentTreadMarkDecal)(treadMark_t* treadMark, qboolean startSegment, qboolean doLighting, markFragment_t* markFragments, void* polyVerts);
     int         (*CG_PermanentUpdateTreadMark)(treadMark_t* treadMark, float alpha, float minSegment, float maxSegment, float maxOffset, float texScale);
     void        (*CG_ProcessInitCommands)(dtiki_t* tiki, refEntity_t* ent);

From 8e1a52bbb70778628d82ea3ab160bd82bd62bcea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 7 Sep 2024 23:57:25 +0200
Subject: [PATCH 0764/2040] Implement VIS debugging

---
 code/renderer/tr_vis.cpp | 337 ++++++++++++++++++++++++++++++++++++++-
 code/renderer/tr_vis.h   |   2 +-
 2 files changed, 333 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_vis.cpp b/code/renderer/tr_vis.cpp
index 0236e4e9..fe303a41 100644
--- a/code/renderer/tr_vis.cpp
+++ b/code/renderer/tr_vis.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,10 +25,337 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tr_local.h"
 #include "tr_vis.h"
 
-void R_VisDebug() {
-    // FIXME: unimplemented
+#define MAX_POINTS_ON_WINDING 128
+#define MAX_MAP_VISIBILITY    0x200000
+#define MAX_VPORTALS          1024
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[24];
+} viswinding_t;
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[4];
+} winding_t;
+
+typedef struct {
+    vec3_t normal;
+    float  dist;
+} plane_t;
+
+typedef struct {
+    int           num;
+    qboolean      hint;
+    plane_t       plane;
+    int           leaf;
+    vec3_t        origin;
+    float         radius;
+    viswinding_t *winding;
+} vportal_t;
+
+typedef struct leaf_s {
+    int        numportals;
+    vportal_t *portals[MAX_VPORTALS];
+} leaf_t;
+
+int             portalclusters;
+int             numportals;
+int             numfaces;
+int             leafbytes;
+int             leaflongs;
+int             portalbytes;
+int             portallongs;
+vportal_t      *portals;
+leaf_t         *leafs;
+int             numVisBytes;
+static char     mapname[256];
+static qboolean prev_showportal = qfalse;
+
+winding_t *AllocWinding(int points)
+{
+    winding_t *w;
+    int        s;
+
+    if (points > MAX_POINTS_ON_WINDING) {
+        ri.Error(ERR_DROP, "Exceeded MAX_POINTS_ON_WINDING");
+        return NULL;
+    }
+    s = sizeof(vec_t) * 4 * points + sizeof(int) * 4;
+
+    w = (winding_t *)malloc(s);
+    if (!w) {
+        ri.Error(ERR_DROP, "Couldn't allocate winding");
+        return NULL;
+    }
+
+    if (s < 0) {
+        s = sizeof(vec_t) * 4 * points + sizeof(int) * 4 + 3;
+    }
+
+    memset(w, 0, s);
+
+    return w;
 }
 
-void R_VisDebugLoad(const char* szBSPName) {
-    // FIXME: unimplemented
+viswinding_t *AllocVisWinding(int points)
+{
+    return (viswinding_t *)AllocWinding(points);
+}
+
+void PlaneFromWinding(viswinding_t *w, plane_t *plane)
+{
+    vec3_t v1, v2;
+
+    VectorSubtract(w->p[2], w->p[1], v1);
+    VectorSubtract(w->p[2], w->p[1], v1);
+    CrossProduct(v2, v1, plane->normal);
+    VectorNormalize(plane->normal);
+
+    plane->dist = DotProduct(w->p[0], plane->normal);
+}
+
+void SetPortalSphere(vportal_t *p)
+{
+    int           i;
+    vec3_t        total;
+    vec3_t        dist;
+    viswinding_t *w;
+    float         r;
+    float         bestr;
+
+    w = p->winding;
+    VectorCopy(vec3_origin, total);
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorAdd(total, w->p[i], total);
+    }
+
+    for (i = 0; i < 3; i++) {
+        total[i] /= w->numpoints;
+    }
+
+    bestr = 0;
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorSubtract(w->p[i], total, dist);
+        r = VectorLength(dist);
+        if (bestr < r) {
+            bestr = r;
+        }
+    }
+
+    VectorCopy(total, p->origin);
+    p->radius = bestr;
+}
+
+void LoadPortals(const char *name)
+{
+    int         i, j;
+    vportal_t  *p;
+    leaf_t     *l;
+    const char *magic;
+    int         leafnums[2];
+    plane_t     plane;
+    char       *data;
+    char       *f;
+    int         numpoints;
+    qboolean    bHint;
+
+    if (ri.FS_ReadFile(name, (void **)&f) == -1) {
+        ri.Error(ERR_DROP, "LoadPortals: couldn't read %s\n", name);
+        return;
+    }
+
+    data  = f;
+    magic = COM_Parse(&data);
+
+    if (strcmp(magic, "PRT1")) {
+        ri.Error(1, "LoadPortals: not a portal file");
+    }
+
+    portalclusters = atoi(COM_Parse(&data));
+    numportals     = atoi(COM_Parse(&data));
+    numfaces       = atoi(COM_Parse(&data));
+
+    ri.Printf(PRINT_DEVELOPER, "%6i portalclusters\n", portalclusters);
+    ri.Printf(PRINT_DEVELOPER, "%6i numportals\n", numportals);
+    ri.Printf(PRINT_DEVELOPER, "%6i numfaces\n", numfaces);
+
+    leafbytes   = ((portalclusters + 63) & 0xC0) >> 3;
+    leaflongs   = leafbytes >> 2;
+    portalbytes = ((numportals * 2 + 63) & 0xC0) >> 3;
+    portallongs = portalbytes >> 2;
+
+    //
+    // Initialize portals
+    //
+    portals = (vportal_t *)malloc(numportals * sizeof(vportal_t));
+    if (!portals) {
+        ri.Error(ERR_DROP, "LoadPortals: portals allocation failed\n");
+        return;
+    }
+    memset(portals, 0, numportals * sizeof(vportal_t));
+
+    //
+    // Initialize leafs
+    //
+    leafs = (leaf_t *)malloc(portalclusters * sizeof(leaf_t));
+    if (!leafs) {
+        ri.Error(ERR_DROP, "LoadPortals: leafs allocation failed\n");
+        return;
+    }
+    memset(leafs, 0, portalclusters * sizeof(leaf_t));
+
+    assert(leafbytes * portalclusters + sizeof(leafnums) <= MAX_MAP_VISIBILITY);
+    if (numVisBytes > MAX_MAP_VISIBILITY) {
+        ri.Error(ERR_DROP, "LoadPortals: NumVisBytes %d exceeds %d\n", numVisBytes, 0x200000);
+    }
+
+    for (i = 0; i < numportals; i++) {
+        viswinding_t *w;
+
+        p = &portals[i];
+
+        numpoints   = atoi(COM_Parse(&data));
+        leafnums[0] = atoi(COM_Parse(&data));
+        leafnums[1] = atoi(COM_Parse(&data));
+
+        if (numpoints > MAX_POINTS_ON_WINDING) {
+            ri.Error(ERR_DROP, "LoadPortals: portal %i has too many points", i);
+            return;
+        }
+
+        if (leafnums[0] > portalclusters || leafnums[1] > portalclusters) {
+            ri.Error(ERR_DROP, "LoadPortals: reading portal %i", i);
+            return;
+        }
+
+        bHint        = atoi(COM_Parse(&data));
+        w            = AllocVisWinding(numpoints);
+        w->numpoints = numpoints;
+        p->winding   = w;
+
+        for (j = 0; j < numpoints; j++) {
+            magic = COM_Parse(&data);
+            if (magic[0] != '(') {
+                ri.Error(ERR_DROP, "LoadPortals: expecting '(' not '%s'", magic);
+                return;
+            }
+
+            if (magic[1]) {
+                w->p[j][0] = atof(magic + 1);
+            } else {
+                w->p[j][0] = atof(COM_Parse(&data));
+            }
+
+            w->p[j][1] = atof(COM_Parse(&data));
+            w->p[j][2] = atof(COM_Parse(&data));
+
+            magic = COM_Parse(&data);
+            if (strcmp(")", magic)) {
+                ri.Error(ERR_DROP, "LoadPortals: expecting ')' not '%s'", magic);
+            }
+        }
+
+        PlaneFromWinding(w, &plane);
+
+        //
+        // Leafs
+        //
+
+        // First leaf
+
+        l = &leafs[leafnums[0]];
+
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = w;
+        VectorSubtract(vec3_origin, plane.normal, p->plane.normal);
+        p->plane.dist = -plane.dist;
+        p->leaf = leafnums[1];
+        SetPortalSphere(p);
+
+        // Second leaf
+
+        p++;
+
+        l = &leafs[leafnums[1]];
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = (viswinding_t *)AllocVisWinding(w->numpoints);
+        p->winding->numpoints       = w->numpoints;
+
+        for (j = 0; j < w->numpoints; j++) {
+            VectorCopy(w->p[numpoints - (j + 1)], p->winding->p[j]);
+        }
+
+        p->plane = plane;
+        p->leaf  = leafnums[0];
+        SetPortalSphere(p);
+    }
+
+    ri.FS_FreeFile(f);
+}
+
+void R_VisDebug()
+{
+    int           leafnum;
+    int           cluster;
+    int           numportals;
+    leaf_t       *leaf;
+    vportal_t    *p;
+    int           pnum;
+    viswinding_t *w;
+    int           numpoints;
+    int           i;
+
+    if (!r_showportal->integer) {
+        return;
+    }
+
+    if (!prev_showportal) {
+        char buffer[256];
+
+        prev_showportal = qtrue;
+        COM_StripExtension(mapname, buffer, sizeof(buffer));
+        Q_strcat(buffer, sizeof(buffer), ".prt");
+        LoadPortals(buffer);
+    }
+
+    leafnum = CM_PointLeafnum(tr.refdef.vieworg);
+    cluster = CM_LeafCluster(leafnum);
+    if (cluster < 0) {
+        return;
+    }
+
+    leaf       = &leafs[cluster];
+    numportals = leaf->numportals;
+    for (pnum = 0; pnum < numportals; pnum++) {
+        p = leaf->portals[pnum];
+        w = p->winding;
+
+        numpoints = w->numpoints;
+        for (i = 0; i < numpoints; i++) {
+            R_DebugLine(w->p[i], w->p[(i + 1) % numpoints], 0.0, 1.0, 0.0, 1.0);
+        }
+    }
+}
+
+void R_VisDebugLoad(const char *szBSPName)
+{
+    prev_showportal = qfalse;
+    return Q_strncpyz(mapname, szBSPName, sizeof(mapname));
 }
diff --git a/code/renderer/tr_vis.h b/code/renderer/tr_vis.h
index 3524c6e5..e31cb444 100644
--- a/code/renderer/tr_vis.h
+++ b/code/renderer/tr_vis.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 

From 7d9372338251d06b483627f5d289d8f66f7fc8a2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 7 Sep 2024 23:58:56 +0200
Subject: [PATCH 0765/2040] Update getting started doc

---
 docs/getting_started_running.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 1edcb433..98170136 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -16,12 +16,12 @@ With `com_target_game`, OpenMoHAA will support the network protocol accordingly.
 
 You can now start a local OpenMOHAA server or play on a server.
 
-## Config file
+## User data location
 
-The config file can be found in different locations depending on the platform:
+The location of user data, like console logs, saves and config files can be found in different locations depending on the platform:
 
-- `%APPDATA%\openmohaa\<game_name>\configs\omconfig.cfg` on Windows
-- `~/.openmohaa/<game_name>/configs/omconfig.cfg` on Linux
+- `%APPDATA%\openmohaa\<game_name>` on Windows
+- `~/.openmohaa/<game_name>` on Linux
 
 This has two advantages:
 - On a multi-user system, each user will have their own configuration file

From 4d12bcb184c81ca2e889c680f1adcc4ae2822054 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 00:52:03 +0200
Subject: [PATCH 0766/2040] Export s_sun

---
 code/renderer/tr_local.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 809aafa2..210f5f51 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2298,6 +2298,8 @@ typedef struct suninfo_s {
 	qboolean exists;
 } suninfo_t;
 
+extern suninfo_t s_sun;
+
 typedef struct {
 	byte	cmds[MAX_RENDER_COMMANDS];
 	int		used;

From 86ddec3f76a6f19b45f61b6b48859bca7effcf49 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 00:56:03 +0200
Subject: [PATCH 0767/2040] Clear the world to prevent crashes

---
 code/renderer/tr_bsp.c             | 24 ++++++++++++++++++++++++
 code/renderer/tr_init.c            |  7 +++++++
 code/renderer/tr_local.h           |  1 +
 code/renderer/tr_marks_permanent.c | 10 ++++------
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 7d01b47a..7362269d 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2432,11 +2432,23 @@ void RE_LoadWorldMap( const char *name ) {
     UI_LoadResource("*116");
 }
 
+/*
+=================
+RE_MapVersion
+
+=================
+*/
 int RE_MapVersion(void)
 {
 	return map_version;
 }
 
+/*
+=================
+RE_PrintBSPFileSizes
+
+=================
+*/
 void RE_PrintBSPFileSizes(void)
 {
   ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
@@ -2466,3 +2478,15 @@ void RE_PrintBSPFileSizes(void)
   ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
   ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
 }
+
+/*
+=================
+R_ClearWorld
+
+Set the world to NULL to prevent anyone from accessing
+freed world data
+=================
+*/
+void R_ClearWorld(void) {
+    tr.world = NULL;
+}
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index d9f5d235..4b5d7b0a 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1583,6 +1583,13 @@ void RE_BeginRegistration(glconfig_t* glconfigOut) {
     tr.viewCluster = -1;		// force markleafs to regenerate
     R_ClearFlares();
     RE_ClearScene();
+
+    // Added in OPM
+    //  Clear the world because some components
+    //  like the mark system access the world object
+    //  to free allocated marks
+    R_ClearWorld();
+
     R_SetupShaders();
     R_InitLensFlare();
     R_LevelMarksInit();
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 210f5f51..2654a61d 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1757,6 +1757,7 @@ void		RE_SetWorldVisData( const byte *vis );
 qhandle_t	RE_RegisterModel( const char *name );
 qhandle_t	RE_RegisterSkin( const char *name );
 void		RE_Shutdown( qboolean destroyWindow );
+void        R_ClearWorld(void);
 
 qboolean	R_GetEntityToken( char *buffer, int size );
 
diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index 256ba4c2..d2f1ad2d 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -1593,12 +1593,10 @@ void R_LevelMarksFree()
         for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
             mnode_t *pLeaf = &tr.world->nodes[i];
 
-            if (pLeaf->iNumMarkFragment) {
-                if (pLeaf->pFirstMarkFragment) {
-                    ri.Free(pLeaf->pFirstMarkFragment);
-                    pLeaf->pFirstMarkFragment = NULL;
-                    pLeaf->iNumMarkFragment   = 0;
-                }
+            if (pLeaf->iNumMarkFragment && pLeaf->pFirstMarkFragment) {
+                ri.Free(pLeaf->pFirstMarkFragment);
+                pLeaf->pFirstMarkFragment = NULL;
+                pLeaf->iNumMarkFragment   = 0;
             }
         }
     }

From 3834f51d740780a3a89fe7a740d8aeab42876430 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 15:06:43 +0200
Subject: [PATCH 0768/2040] Fix GetNamedWidget() always returning the last
 valid widget

This is problematic when doing different logic when a widget doesn't exist, for example when loading a map, if the continue button doesn't exist then the game should continue automatically
---
 code/uilib/uimenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uimenu.cpp b/code/uilib/uimenu.cpp
index 063b368b..a1da2b47 100644
--- a/code/uilib/uimenu.cpp
+++ b/code/uilib/uimenu.cpp
@@ -291,7 +291,7 @@ UIWidget *Menu::GetNamedWidget
 		}
 	}
 
-	return pWidget;
+	return NULL;
 }
 
 void Menu::Update

From 77ecc736319b22fdff910be4587f4d30d09388a2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 15:31:18 +0200
Subject: [PATCH 0769/2040] Implement lens flare / sun flares

Some maps like mohdm1 have a sun flares, now when you look up the sky towards the sun direction, you will see the flare of the sun
---
 code/renderer/tr_sun_flare.cpp | 702 ++++++++++++++++++++++++++++++++-
 1 file changed, 698 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_sun_flare.cpp b/code/renderer/tr_sun_flare.cpp
index 1854a9ed..547333e1 100644
--- a/code/renderer/tr_sun_flare.cpp
+++ b/code/renderer/tr_sun_flare.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,12 +24,706 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-void R_InitLensFlare()
+#define MAX_FLARES 20
+
+class flare_s
 {
-    // FIXME: unimplemented
+public:
+    float     size;
+    float     where;
+    shader_t *shader;
+    float     alphascale;
+};
+
+class lens_flare
+{
+public:
+    static int max_flares;
+
+    float dot_min;
+    float fullscale;
+
+    // List of flares
+    int     num_flares;
+    flare_s flares[MAX_FLARES];
+
+    shader_t *fullscreen;
+    int       fullfade;
+    qboolean  blend_active;
+
+    // Flare location
+    vec3_t trace_v;
+    vec3_t v;
+
+    // Color and alpha
+    vec3_t color;
+    float  alpha;
+
+    // Screen projection
+    vec2_t screen;
+    float  dot;
+
+    int   lasttime;
+    float lastbright;
+
+    // Whether or not it's inside a portal sky
+    bool inportalsky;
+
+    qboolean initted;
+
+public:
+    lens_flare()
+    {
+        color[0] = 1.0;
+        color[1] = 1.0;
+        color[2] = 1.0;
+        alpha    = 1.0;
+        initted  = false;
+    }
+
+    bool         CheckRange();
+    bool         CheckRay();
+    bool         ScreenCalc();
+    virtual void Try();
+    virtual void Init(const char *which);
+    void         ScreenBlend();
+    void         InPortalSky();
+    void         NotInPortalSky();
+    void         SetVect(const float *vect);
+
+    void SetColor(const float *c) { VectorCopy(c, color); }
+
+    void SetAlpha(float a) { alpha = a; }
+};
+
+class dlight_lens_flare : public lens_flare
+{
+public:
+    shader_t *corona_shader;
+
+public:
+    dlight_lens_flare() { corona_shader = NULL; }
+
+    void Try() override;
+
+    void Init(const char *which) override
+    {
+        lens_flare::Init(which);
+        corona_shader = R_FindShader("textures/sprites/corona", -1, qfalse, qfalse, qfalse, qfalse);
+    }
+};
+
+class sun_flare_class : public lens_flare
+{
+public:
+    bool SunCheckRay();
+    void SunScreenCalc();
+    void SunTry();
+};
+
+lens_flare        torches;
+dlight_lens_flare dlights;
+sun_flare_class   sunFlare;
+int               lens_flare::max_flares;
+
+void lens_flare::SetVect(const float *vect)
+{
+    if (inportalsky) {
+        vec3_t offset;
+        vec3_t rot_offset;
+
+        VectorSubtract(vect, tr.refdef.sky_origin, offset);
+        VectorRotate(offset, tr.refdef.sky_axis, rot_offset);
+        VectorAdd(tr.refdef.vieworg, rot_offset, v);
+
+        VectorNormalize(offset);
+        VectorMA(tr.refdef.vieworg, 16384, offset, trace_v);
+    } else {
+        VectorCopy(vect, v);
+        VectorCopy(vect, trace_v);
+    }
+}
+
+void lens_flare::InPortalSky()
+{
+    inportalsky = true;
+}
+
+void lens_flare::NotInPortalSky()
+{
+    inportalsky = false;
+}
+
+bool lens_flare::CheckRange()
+{
+    vec3_t diff;
+
+    VectorSubtract(v, backEnd.viewParms.ori.origin, diff);
+    VectorNormalizeFast(diff);
+    dot = DotProduct(backEnd.viewParms.ori.axis[0], diff);
+
+    return dot > dot_min;
+}
+
+bool lens_flare::CheckRay()
+{
+    trace_t trace;
+
+    ri.CM_BoxTrace(&trace, backEnd.viewParms.ori.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse);
+    if (inportalsky) {
+        return (trace.surfaceFlags & 4) != 0;
+    }
+
+    return trace.fraction == 1.0;
+}
+
+bool lens_flare::ScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    bool   retval;
+    int    i, j;
+
+    retval = true;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.ori.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 3; i++) {
+        if (clip[i] >= clip[3] || clip[i] <= -clip[3]) {
+            retval = false;
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+
+    return retval;
+}
+
+void lens_flare::Try()
+{
+    vec2_t diff;
+    vec2_t point;
+    float  alpha;
+    int    i;
+
+    if (!ScreenCalc()) {
+        return;
+    }
+    if (!CheckRange()) {
+        return;
+    }
+    if (!CheckRay()) {
+        return;
+    }
+
+    VectorScale2D(screen, -2.0, diff);
+    alpha = (dot - dot_min) / (1.0 - dot_min);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    lasttime     = backEnd.refdef.time;
+    blend_active = true;
+    lastbright   = Square(alpha) * Square(alpha) * this->fullscale;
+}
+
+void dlight_lens_flare::Try()
+{
+    float size;
+
+    size = r_lightcoronasize->value;
+    lens_flare::Try();
+    lens_flare::CheckRange();
+
+    if (dot <= 0) {
+        return;
+    }
+
+    if (!CheckRay()) {
+        return;
+    }
+
+    RB_Color4f(color[0], color[1], color[2], alpha);
+    RB_StreamBegin(corona_shader);
+    RB_Texcoord2f(0.0, 0.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] + size);
+    RB_Texcoord2f(1.0, 0.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] + size);
+    RB_Texcoord2f(0.0, 1.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] - size);
+    RB_Texcoord2f(1.0, 1.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] - size);
+    RB_StreamEnd();
+}
+
+void lens_flare::ScreenBlend()
+{
+    float alpha;
+    int   timediff;
+
+    if (!fullscreen || !blend_active) {
+        return;
+    }
+
+    timediff = backEnd.refdef.time - lasttime;
+    if (timediff > fullfade) {
+        blend_active = false;
+        return;
+    }
+
+    alpha = (float)(fullfade - timediff) / fullfade * lastbright;
+    if (alpha <= 0.0001) {
+        blend_active = false;
+        return;
+    }
+
+    RB_Color4f(1.0, 1.0, 1.0, alpha);
+
+    RB_StreamBegin(fullscreen);
+    RB_Vertex2f(-1.0, -1.0);
+    RB_Vertex2f(1.0, -1.0);
+    RB_Vertex2f(-1.0, 1.0);
+    RB_Vertex2f(1.0, 1.0);
+
+    RB_StreamEnd();
+}
+
+class tmpRiFile
+{
+private:
+    bool  file_exists;
+    void *buf;
+
+public:
+    tmpRiFile()
+    {
+        file_exists = false;
+        buf         = NULL;
+    }
+
+    ~tmpRiFile() { close(); }
+
+    int open(const char *which, void **buffer)
+    {
+        close();
+
+        if (ri.FS_ReadFile(which, buffer) != -1) {
+            file_exists = true;
+            buf         = *buffer;
+        }
+
+        return file_exists;
+    }
+
+    bool exists() const { return file_exists; }
+
+    void close()
+    {
+        if (file_exists) {
+            ri.FS_FreeFile(buf);
+            file_exists = false;
+        }
+    }
+};
+
+void lens_flare::Init(const char *which)
+{
+    char       *file;
+    const char *token;
+    tmpRiFile   theFile;
+
+    initted = false;
+    theFile.open("global/lensflaredefs.txt", (void **)&file);
+
+    if (!theFile.exists()) {
+        ri.Printf(PRINT_WARNING, "WARNING: Could not open lens flare info file!\n");
+        return;
+    }
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find begin for section '%s' in lensflares\n", which);
+            return;
+        }
+
+        if (!Q_stricmp(token, "begin")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!Q_stricmp(token, which)) {
+                break;
+            }
+        }
+    }
+
+    dot_min      = 0.8f;
+    fullscale    = 0.7f;
+    num_flares   = 0;
+    fullscreen   = NULL;
+    initted      = true;
+    fullfade     = 0;
+    blend_active = false;
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find end for section '%s' in lensflares\n", which);
+            break;
+        }
+
+        if (!Q_stricmp(token, "dot_min")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: invalid dot_min in lensflares\n");
+                continue;
+            }
+            dot_min = atof(token);
+        } else if (!Q_stricmp(token, "flare")) {
+            assert(num_flares < MAX_FLARES);
+
+            flares[num_flares].alphascale = 1.0;
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 1 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].size = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 2 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].where = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 3 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].shader = R_FindShader(token, -1, qfalse, qfalse, qfalse, qfalse);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (token[0]) {
+                flares[num_flares].alphascale = atof(token);
+            }
+
+            num_flares++;
+        } else if (!Q_stricmp(token, "fullscale")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullscale, assuming default (in lensflares)\n");
+                continue;
+            }
+            fullscale = atof(token);
+        } else if (!Q_stricmp(token, "fullscreen")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullsreen in lensflares\n");
+                continue;
+            }
+            fullscreen = R_FindShader(token, -1, qfalse, qfalse, qfalse, qfalse);
+        } else if (!Q_stricmp(token, "fullfade")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullfade in lensflares\n");
+                continue;
+            }
+            fullfade = atof(token);
+        } else if (!Q_stricmp(token, "end")) {
+            break;
+        }
+    }
+
+    if (!num_flares) {
+        ri.Printf(PRINT_WARNING, "WARNING: no lensflares defined!\n");
+    }
+    lasttime = backEnd.refdef.time - fullfade;
+}
+
+static void R_DrawSunFlare()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        if (!s_sun.szFlareName[0]) {
+            return;
+        }
+        if (Q_stricmp(s_sun.szFlareName, "none")) {
+            sunFlare.Init(s_sun.szFlareName);
+        }
+    }
+
+    if (!sunFlare.initted) {
+        s_sun.szFlareName[0] = 0;
+        return;
+    }
+
+    if (!sunFlare.num_flares) {
+        return;
+    }
+
+    VectorMA(backEnd.viewParms.ori.origin, 16384, s_sun.flaredirection, sunFlare.trace_v);
+    VectorMA(backEnd.viewParms.ori.origin, 128, s_sun.flaredirection, sunFlare.v);
+
+    sunFlare.SunTry();
+}
+
+static void R_DrawSunFlareBlend()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        return;
+    }
+
+    sunFlare.ScreenBlend();
 }
 
 void R_DrawLensFlares()
 {
-	// FIXME: unimplemented
+    int i;
+
+    R_RotateForViewer();
+
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglMatrixMode(GL_PROJECTION);
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglOrtho(-1.0, 1.0, -1.0, 1.0, -99999.0, 99999.0);
+
+    tess.no_global_fog = true;
+    R_DrawSunFlare();
+
+    for (i = 0; i < backEnd.refdef.num_entities; i++) {
+        if ((backEnd.viewParms.isPortalSky && !(backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))
+            || (!backEnd.viewParms.isPortalSky && (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))) {
+            continue;
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_LENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                dlights.InPortalSky();
+            } else {
+                dlights.NotInPortalSky();
+            }
+
+            dlights.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            //
+            // Set the dlight color from entity
+            //
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            dlights.SetColor(rgb);
+
+            dlights.Try();
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_VIEWLENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                torches.InPortalSky();
+            } else {
+                torches.NotInPortalSky();
+            }
+
+            torches.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            torches.SetColor(rgb);
+
+            torches.Try();
+        }
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        if ((backEnd.refdef.dlights[i].type & dlighttype_t::lensflare)
+            || (backEnd.refdef.dlights[i].type & dlighttype_t::additive)) {
+            dlights.NotInPortalSky();
+            dlights.SetVect(backEnd.refdef.dlights[i].origin);
+            dlights.SetColor(backEnd.refdef.dlights[i].color);
+
+            dlights.Try();
+        }
+    }
+
+    R_DrawSunFlareBlend();
+    tess.no_global_fog = qfalse;
+
+    qglPopMatrix();
+    qglMatrixMode(GL_MODELVIEW);
+    qglPopMatrix();
+}
+
+void R_InitLensFlare()
+{
+    torches.Init("entity");
+    dlights.Init("dlight");
+    sunFlare.initted = false;
+}
+
+bool sun_flare_class::SunCheckRay()
+{
+    mnode_t *pViewLeaf;
+    trace_t  trace;
+
+    pViewLeaf = R_PointInLeaf(tr.refdef.vieworg);
+
+    if (pViewLeaf->area == -1 || !tr.world->vis || tr.sSunLight.leaf != (mnode_s *)-1
+        || pViewLeaf->numlights && pViewLeaf->lights[0] == &tr.sSunLight) {
+        ri.CM_BoxTrace(
+            &trace, backEnd.viewParms.ori.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse
+        );
+
+        if (trace.surfaceFlags & SURF_SKY) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void sun_flare_class::SunScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    int    i, j;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.ori.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+}
+
+void sun_flare_class::SunTry()
+{
+    vec2_t   diff;
+    vec2_t   point;
+    float    alpha;
+    int      i;
+    qboolean bDrawingFade = qfalse;
+
+    if (!CheckRange()) {
+        return;
+    }
+
+    if (SunCheckRay()) {
+        alpha = (dot - dot_min) / (1.0 - dot_min);
+    } else {
+        int timediff;
+
+        if (!fullscreen) {
+            return;
+        }
+        if (!blend_active) {
+            return;
+        }
+
+        timediff = backEnd.refdef.time - lasttime;
+        alpha    = (float)(fullfade - timediff) / fullfade * lastbright;
+
+        if (alpha <= 0.0001) {
+            return;
+        }
+
+        bDrawingFade = qtrue;
+    }
+
+    SunScreenCalc();
+    VectorScale2D(screen, -2.0, diff);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    if (!bDrawingFade) {
+        lasttime     = backEnd.refdef.time;
+        blend_active = true;
+        lastbright   = Square(alpha) * Square(alpha) * fullscale;
+    }
 }

From c18cdc78ea259cd00baf0db2c65699187ae9075f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 15:48:46 +0200
Subject: [PATCH 0770/2040] Fix Cgame key catching

---
 code/client/cl_keys.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_keys.cpp b/code/client/cl_keys.cpp
index 660ab4e2..6584c458 100644
--- a/code/client/cl_keys.cpp
+++ b/code/client/cl_keys.cpp
@@ -1089,7 +1089,7 @@ void CL_KeyEvent(int key, qboolean down, unsigned time)
 
     if (clc.state > CA_DISCONNECTED && cge && !Key_GetCatcher() && cge->CG_CheckCaptureKey(key, down, time)
         && key != K_ESCAPE) {
-        if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE)) {
+        if (key != K_CONSOLE && (!keys[K_SHIFT].down || key != K_ESCAPE)) {
             return;
         }
     }

From ffc3580d43d4b0c9c059a38784211c83780ca8b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 16:31:19 +0200
Subject: [PATCH 0771/2040] Implement CG_CheckCaptureKey

---
 code/cgame/cg_local.h |  3 ++-
 code/cgame/cg_ui.cpp  | 29 ++++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 9722cf62..660f34f8 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -923,7 +923,8 @@ qboolean CG_LightStyleColor(int style, int realtime, vec4_t color, qboolean clam
     void CG_InstaMessageGroupD_f(void);
     void CG_InstaMessageGroupE_f(void);
     void CG_HudPrint_f(void);
-    int  CG_CheckCaptureKey(int key, qboolean down, unsigned int time);
+
+    qboolean CG_CheckCaptureKey(int key, qboolean down, unsigned int time);
 
     //
     // cg_vehicle.cpp
diff --git a/code/cgame/cg_ui.cpp b/code/cgame/cg_ui.cpp
index 5c011963..5644ed4d 100644
--- a/code/cgame/cg_ui.cpp
+++ b/code/cgame/cg_ui.cpp
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 #include "str.h"
+#include "../client/keycodes.h"
 
 void CG_MessageMode_f(void)
 {
@@ -192,8 +193,30 @@ void CG_HudPrint_f(void)
     cgi.Printf("\x1%s", cgi.Argv(1));
 }
 
-int CG_CheckCaptureKey(int key, qboolean down, unsigned int time)
+qboolean CG_CheckCaptureKey(int key, qboolean down, unsigned int time)
 {
-    // FIXME: unimplemented
-    return 0;
+    if (!cg.iInstaMessageMenu || !down) {
+        return qfalse;
+    }
+
+    if (key < '1' || key > '8') {
+        if (key == K_ESCAPE || key == '0') {
+            cg.iInstaMessageMenu = 0;
+            return qtrue;
+        }
+        return qfalse;
+    }
+
+    if (cg.iInstaMessageMenu == -1) {
+        if (key > '6') {
+            cg.iInstaMessageMenu = 0;
+        } else {
+            cg.iInstaMessageMenu = key - '0';
+        }
+    } else if (cg.iInstaMessageMenu > 0) {
+        cgi.SendClientCommand(va("dmmessage 0 *%i%i\n", cg.iInstaMessageMenu, key - '0'));
+        cg.iInstaMessageMenu = 0;
+    }
+
+    return qtrue;
 }

From bca6d656b64a73ea0a3cae6bd6cf851ba144bb54 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 17:53:35 +0200
Subject: [PATCH 0772/2040] Fix bad verts value passed to
 `CG_AddFragmentToScene`

---
 code/cgame/cg_marks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index b463eb08..678da02d 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1236,7 +1236,7 @@ void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean
                 mf->numPoints = 8;
             }
             if (CG_MakeTreadMarkDecal_PerPolyCallback(markPoints, mf, verts, &info)) {
-                CG_AddFragmentToScene(mf->iIndex, pTread->hTreadShader, mf->numPoints, &verts);
+                CG_AddFragmentToScene(mf->iIndex, pTread->hTreadShader, mf->numPoints, verts);
             }
         }
     } else {

From 98991a4a7adfc9d60e7173a4a0873152344ac0b9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 17:59:30 +0200
Subject: [PATCH 0773/2040] Fix file ordering with uppercase/lowercase file
 names

---
 code/qcommon/files.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 1563c2b8..436fc999 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -2919,11 +2919,11 @@ int FS_PathCmp( const char *s1, const char *s2 ) {
 		c1 = *s1++;
 		c2 = *s2++;
 
-		if (c1 >= 'a' && c1 <= 'z') {
-			c1 -= ('a' - 'A');
+		if (c1 >= 'A' && c1 <= 'Z') {
+			c1 += ('a' - 'A');
 		}
-		if (c2 >= 'a' && c2 <= 'z') {
-			c2 -= ('a' - 'A');
+		if (c2 >= 'A' && c2 <= 'Z') {
+			c2 += ('a' - 'A');
 		}
 
 		if ( c1 == '\\' || c1 == ':' ) {
@@ -3129,9 +3129,6 @@ static int QDECL paksort(const void *a, const void *b) {
 	aa = *(char **)a;
 	bb = *(char **)b;
 
-	const char* f1 = COM_SkipPath(aa);
-	const char* f2 = COM_SkipPath(bb);
-
 	return FS_PathCmp( aa, bb );
 }
 

From 4e3ec52673fa4dd303e4be040c4f1223d19b1cb0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:02:57 +0200
Subject: [PATCH 0774/2040] Fix a crash due to NULL string being appended

---
 code/qcommon/str.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/code/qcommon/str.h b/code/qcommon/str.h
index 58ecb7f4..1b9ee285 100644
--- a/code/qcommon/str.h
+++ b/code/qcommon/str.h
@@ -377,14 +377,7 @@ inline void str::append(const char *text)
 
 inline void str::append(const str& text)
 {
-    size_t len;
-
-    len = length();
-    len += text.length();
-    EnsureAlloced(len + 1);
-
-    strcat(m_data->data, text.c_str());
-    m_data->len = len;
+    append(text.c_str());
 }
 
 inline char& str::operator[](intptr_t index)

From 4249cacf2f11633d07aa50e390313905571b3237 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:03:43 +0200
Subject: [PATCH 0775/2040] Support token dollar in variable name

This fixes mods like trapshooting not working because of a '$' in a variable name
---
 code/parser/lex_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 0cca5359..5596593a 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -191,7 +191,7 @@ static bool UseField( void )
 string		([^\\\"\r\n]|\\.)*
 identifier	[^\{\}\(\)\[\]\r\n\,:; \t]
 alphanum	[a-zA-Z0-9_]+
-varname		[a-zA-Z0-9_\"]+
+varname		[a-zA-Z0-9_\"\$]+
 
 %%
 

From e2e1ab0275898fe6f13a5fa1e1f30e45563ec099 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:09:33 +0200
Subject: [PATCH 0776/2040] Fix `status` command column length breaking some
 programs

---
 code/server/sv_ccmds.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index fc4c9fd4..48ee2a65 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1086,12 +1086,12 @@ static int SV_Strlen( const char *str ) {
 	int count = 0;
 
 	while ( *s ) {
-		if ( Q_IsColorString( s ) ) {
-			s += 2;
-		} else {
+		//if ( Q_IsColorString( s ) ) {
+		//	s += 2;
+		//} else {
 			count++;
 			s++;
-		}
+		//}
 	}
 
 	return count;
@@ -1118,9 +1118,14 @@ static void SV_Status_f(void) {
 
     Com_Printf("map: %s\n", sv_mapname->string);
 
-    Com_Printf("num score ping name            lastmsg address                                  qport rate \n");
-    Com_Printf("--- ----- ---- --------------- ------- ---------------------------------------  ----- -----\n");
-    for (i = 0, cl = svs.clients; i < sv_maxclients->integer; i++, cl++)
+    //Com_Printf("num score ping name            lastmsg address                                  qport rate \n");
+    //Com_Printf("--- ----- ---- --------------- ------- ---------------------------------------  ----- -----\n");
+    //
+    // Some programs use fixed-size columns
+    //
+    Com_Printf("num score ping name            lastmsg address               qport rate\n");
+    Com_Printf("--- ----- ---- --------------- ------- --------------------- ----- -----\n");
+    for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
     {
         if (!cl->state)
             continue;
@@ -1141,9 +1146,6 @@ static void SV_Status_f(void) {
         }
 
         Com_Printf("%s", cl->name);
-        // TTimo adding a ^7 to reset the color
-        // NOTE: colored names in status breaks the padding (WONTFIX)
-        Com_Printf("^7");
         l = SV_Strlen(cl->name);
 		if (l <= 16) {
 			l = 16 - l;
@@ -1155,7 +1157,8 @@ static void SV_Status_f(void) {
 
         s = NET_AdrToString(cl->netchan.remoteAddress);
         Com_Printf("%s", s);
-        l = 39 - strlen(s);
+        //l = 39 - strlen(s);
+        l = 22 - strlen(s);
         for (j = 0; j < l; j++)
             Com_Printf(" ");
 

From 0dfb1a3a2a1803551e23cbc7ab8281c63adba098 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:22:12 +0200
Subject: [PATCH 0777/2040] Use Com_DPrintf for TIKI/alias warnings/errors

This prevent the console from getting spammed with developer errors in production
---
 code/qcommon/alias.c     |  2 +-
 code/tiki/tiki_cache.cpp |  4 ++--
 code/tiki/tiki_files.cpp | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index ebb7a421..96a6548b 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -383,7 +383,7 @@ qboolean Alias_ListAdd(AliasList_t* list, const char* alias, const char* name, c
 		{
 			if (!strcmp(node->alias_name, alias))
 			{
-				Com_Printf("DUPLICATE ALIASES: %s and %s\n", node->alias_name, alias);
+				Com_DPrintf("DUPLICATE ALIASES: %s and %s\n", node->alias_name, alias);
 				return qtrue;
 			}
 		}
diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index 05d29b51..e58b614d 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -119,8 +119,8 @@ dtikianim_t *TIKI_RegisterTikiAnimFlags(const char *path, qboolean use)
     tiki = TIKI_LoadTikiAnim(filename);
     if (tiki) {
         if (use) {
-            Com_Printf("^~^~^ Add the following line to the *_precache.scr map script:\n");
-            Com_Printf("cache %s\n", filename);
+            Com_DPrintf("^~^~^ Add the following line to the *_precache.scr map script:\n");
+            Com_DPrintf("cache %s\n", filename);
         }
 
         (*tikianimcache)[tiki->name] = tiki;
diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index fa23b8b2..e94aeba6 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -332,7 +332,7 @@ dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str
         keyValues
     );
     if (!temp_tiki->numMeshes) {
-        Com_Printf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
+        Com_DPrintf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
         return NULL;
     }
 
@@ -536,7 +536,7 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
     Skel_ExtractFileExtension(path, extension);
 
     if (strcmp(extension, "skc")) {
-        Com_Printf("Skeletor CacheAnimSkel: %s: File extension unknown.  Attempting to open as skc file\n", path);
+        Com_DPrintf("Skeletor CacheAnimSkel: %s: File extension unknown.  Attempting to open as skc file\n", path);
     }
 
     strcpy(npath, "newanim/");
@@ -549,7 +549,7 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
     } else {
         iBuffLength = TIKI_ReadFileEx(path, (void **)&pHeader, qtrue);
         if (iBuffLength <= 0) {
-            Com_Printf("Skeletor CacheAnimSkel: Could not open binary file %s\n", path);
+            Com_DPrintf("Skeletor CacheAnimSkel: Could not open binary file %s\n", path);
             return NULL;
         }
 
@@ -557,7 +557,7 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
         int version = LittleLong(pHeader->version);
         if (LittleLong(ident) != TIKI_SKC_HEADER_IDENT
             || (version != TIKI_SKC_HEADER_OLD_VERSION && version != TIKI_SKC_HEADER_VERSION)) {
-            Com_Printf(
+            Com_DPrintf(
                 "Skeletor CacheAnimSkel: anim %s has wrong header ([ident,version] = [%i,%i] should be [%i,%i])\n",
                 path,
                 ident,
@@ -570,7 +570,7 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
         }
 
         if (version == TIKI_SKC_HEADER_OLD_VERSION) {
-            Com_Printf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
+            Com_DPrintf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
 
             //
             // Handle the endianness

From 47830bb330f88ca697a834067c6396a52af8c8a9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:24:59 +0200
Subject: [PATCH 0778/2040] Update version number

---
 code/qcommon/q_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 13d220c3..165f1261 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			70
+#define PRODUCT_VERSION_MINOR			71
 #define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			"alpha"
 

From 7a7849ae8392f6c7468322e6562ea392015eefd6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:25:10 +0200
Subject: [PATCH 0779/2040] Remove comment

---
 code/qcommon/cm_trace_obfuscation.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/qcommon/cm_trace_obfuscation.cpp b/code/qcommon/cm_trace_obfuscation.cpp
index 803f145d..141c207f 100644
--- a/code/qcommon/cm_trace_obfuscation.cpp
+++ b/code/qcommon/cm_trace_obfuscation.cpp
@@ -360,8 +360,6 @@ float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float
 	int			side;
 	float		midf;
 
-	// FIXME: unimplemented
-
 	// if < 0, we are in a leaf node
 	if (num < 0) {
 		return CM_ObfuscationTraceToLeaf( tw, &cm.leafs[-1-num] );

From 99fbe092bc24db68fc886da32e067b4d9c99a268 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:33:54 +0200
Subject: [PATCH 0780/2040] Use correct names for surface flags

---
 code/qcommon/surfaceflags.h | 154 ++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 76 deletions(-)

diff --git a/code/qcommon/surfaceflags.h b/code/qcommon/surfaceflags.h
index 30f1a5ca..07cb1f3b 100644
--- a/code/qcommon/surfaceflags.h
+++ b/code/qcommon/surfaceflags.h
@@ -28,92 +28,94 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // these definitions also need to be in q_shared.h!
 // IneQuation was here
 
-#define	CONTENTS_SOLID			1		// an eye is never valid in a solid
-#define CONTENTS_LADDER			2
-#define	CONTENTS_LAVA			0x0008
-#define	CONTENTS_SLIME			0x0010
-#define	CONTENTS_WATER			0x0020
-#define CONTENTS_FLUID          (CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA)
-#define	CONTENTS_FOG			0x0040
-#define	CONTENTS_CLAYPIDGEON	0x0080
+#define CONTENTS_SOLID       1 // an eye is never valid in a solid
+#define CONTENTS_LADDER      2
+#define CONTENTS_LAVA        0x0008
+#define CONTENTS_SLIME       0x0010
+#define CONTENTS_WATER       0x0020
+#define CONTENTS_FLUID       (CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA)
+#define CONTENTS_FOG         0x0040
+#define CONTENTS_CLAYPIDGEON 0x0080
 
-#define CONTENTS_NOTTEAM1		0x0080
-#define CONTENTS_NOTTEAM2		0x0100
-#define CONTENTS_BBOX			0x0100
-#define CONTENTS_NOBOTCLIP		0x0200
-#define CONTENTS_UNKNOWN1		0x0400
-#define CONTENTS_UNKNOWN2		0x0800
+#define CONTENTS_NOTTEAM1    0x0080
+#define CONTENTS_NOTTEAM2    0x0100
+#define CONTENTS_BBOX        0x0100
+#define CONTENTS_NOBOTCLIP   0x0200
+#define CONTENTS_UNKNOWN1    0x0400
+#define CONTENTS_UNKNOWN2    0x0800
 
-#define CONTENTS_UNKNOWN3		0x1000
-#define CONTENTS_FENCE			0x2000
-#define CONTENTS_UNKNOWN4		0x4000
-#define	CONTENTS_AREAPORTAL		0x8000
+#define CONTENTS_UNKNOWN3    0x1000
+#define CONTENTS_FENCE       0x2000
+#define CONTENTS_UNKNOWN4    0x4000
+#define CONTENTS_AREAPORTAL  0x8000
 // su44: this is only for bspc .aas file compiler (bot navigation info)
 // I dont think its correct....
 #define CONTENTS_CLUSTERPORTAL CONTENTS_AREAPORTAL
 
-#define MASK_WOMBAT5				// su44: wtf is that?
+#define MASK_WOMBAT5           // su44: wtf is that?
 
-#define	CONTENTS_PLAYERCLIP		0x10000
-#define	CONTENTS_MONSTERCLIP	0x20000
-#define	CONTENTS_WEAPONCLIP		0x40000
-#define	CONTENTS_VEHICLECLIP	0x80000
-#define MASK_CLIP				(CONTENTS_PLAYERCLIP|CONTENTS_MONSTERCLIP|CONTENTS_WEAPONCLIP|CONTENTS_VEHICLECLIP)
+#define CONTENTS_PLAYERCLIP    0x10000
+#define CONTENTS_MONSTERCLIP   0x20000
+#define CONTENTS_WEAPONCLIP    0x40000
+#define CONTENTS_VEHICLECLIP   0x80000
+#define MASK_CLIP              (CONTENTS_PLAYERCLIP | CONTENTS_MONSTERCLIP | CONTENTS_WEAPONCLIP | CONTENTS_VEHICLECLIP)
 
-#define CONTENTS_SHOOTONLY		0x100000
-#define CONTENTS_DONOTENTER		0x200000
-#define CONTENTS_BOTCLIP		0x400000
-#define CONTENTS_MOVER			0x800000
-#define MASK_WOMBAT1			(CONTENTS_SHOOTONLY|CONTENTS_DONOTENTER|CONTENTS_BOTCLIP|CONTENTS_MOVER)
+#define CONTENTS_SHOOTONLY     0x100000
+#define CONTENTS_DONOTENTER    0x200000
+#define CONTENTS_BOTCLIP       0x400000
+#define CONTENTS_MOVER         0x800000
+#define MASK_WOMBAT1           (CONTENTS_SHOOTONLY | CONTENTS_DONOTENTER | CONTENTS_BOTCLIP | CONTENTS_MOVER)
 
-#define	CONTENTS_ORIGIN			0x1000000	// removed before bsping an entity
-#define	CONTENTS_BODY			0x2000000	// should never be on a brush, only in game
-#define	CONTENTS_CORPSE			0x4000000
-#define	CONTENTS_DETAIL			0x8000000	// brushes not used for the bsp
-#define MASK_WOMBAT2			(CONTENTS_ORIGIN|CONTENTS_BODY|CONTENTS_CORPSE|CONTENTS_DETAIL)
+#define CONTENTS_ORIGIN        0x1000000 // removed before bsping an entity
+#define CONTENTS_BODY          0x2000000 // should never be on a brush, only in game
+#define CONTENTS_CORPSE        0x4000000
+#define CONTENTS_DETAIL        0x8000000 // brushes not used for the bsp
+#define MASK_WOMBAT2           (CONTENTS_ORIGIN | CONTENTS_BODY | CONTENTS_CORPSE | CONTENTS_DETAIL)
 
-#define	CONTENTS_STRUCTURAL		0x10000000	// brushes used for the bsp
-#define	CONTENTS_TRANSLUCENT	0x20000000	// don't consume surface fragments inside
-#define	CONTENTS_TRIGGER		0x40000000
-#define	CONTENTS_NODROP			0x80000000	// don't leave bodies or items (death fog, lava)
+#define CONTENTS_STRUCTURAL    0x10000000 // brushes used for the bsp
+#define CONTENTS_TRANSLUCENT   0x20000000 // don't consume surface fragments inside
+#define CONTENTS_TRIGGER       0x40000000
+#define CONTENTS_NODROP        0x80000000 // don't leave bodies or items (death fog, lava)
 
-#define	SURF_NODAMAGE			0x1		// never give falling damage
-#define	SURF_SLICK				0x2		// effects game physics
-#define	SURF_SKY				0x4		// lighting from environment map
-#define	SURF_LADDER				0x8
-#define	SURF_NOIMPACT			0x10	// don't make missile explosions
-#define	SURF_NOMARKS			0x20	// don't leave missile marks
-#define	SURF_CASTSHADOW			0x40
-#define	SURF_NODRAW				0x80	// don't generate a drawsurface at all
-#define SURF_NOLIGHTMAP			0x100	// surface doesn't need a lightmap
-#define	SURF_ALPHASHADOW		0x200	// do per-pixel light shadow casting in q3map
-#define	SURF_NOSTEPS			0x400	// no footstep sounds
-#define	SURF_NONSOLID			0x800	// don't collide against curves with this set
-#define	SURF_UNKNOWN1			0x1000	// IneQuation: WTF?
-#define	SURF_PAPER				0x2000	// paper effects
-#define	SURF_WOOD				0x4000	// wood effects
-#define	SURF_METAL				0x8000	// metal effects
-#define	SURF_ROCK				0x10000	// rock effects
-#define	SURF_DIRT				0x20000	// dirt effects
-#define SURF_GRILL				0x40000 // metal grill (grate)
-#define SURF_GRASS				0x80000	// grass effects
-#define SURF_MUD				0x100000	// mud effects
-#define SURF_PUDDLE				0x200000	// puddle effects
-#define SURF_GLASS				0x400000	// glass effects
-#define SURF_GRAVEL				0x800000	// gravel effects
-#define SURF_SAND				0x1000000	// sand effects
-#define SURF_FOLIAGE			0x2000000	// foliage effects
-#define SURF_SNOW				0x4000000	// snow effects
-#define SURF_CARPET				0x8000000	// carpet effects
-#define SURF_BACKSIDE			0x10000000	// su44: backside
-#define SURF_NODLIGHT			0x20000000	// don't dlight even if solid (solid lava, skies)
-#define	SURF_HINT				0x40000000	// make a primary bsp splitter
-#define SURF_UNKNOWN3			0x80000000	// IneQuation: WTF?
+#define SURF_NODAMAGE          0x1 // never give falling damage
+#define SURF_SLICK             0x2 // effects game physics
+#define SURF_SKY               0x4 // lighting from environment map
+#define SURF_LADDER            0x8
+#define SURF_NOIMPACT          0x10 // don't make missile explosions
+#define SURF_NOMARKS           0x20 // don't leave missile marks
+#define SURF_CASTSHADOW        0x40
+#define SURF_NODRAW            0x80  // don't generate a drawsurface at all
+#define SURF_NOLIGHTMAP        0x100 // surface doesn't need a lightmap
+#define SURF_ALPHASHADOW       0x200 // do per-pixel light shadow casting in q3map
+#define SURF_NOSTEPS           0x400 // no footstep sounds
+#define SURF_NONSOLID          0x800 // don't collide against curves with this set
+#define SURF_OVERBRIGHT        0x1000
+#define SURF_PAPER             0x2000     // paper effects
+#define SURF_WOOD              0x4000     // wood effects
+#define SURF_METAL             0x8000     // metal effects
+#define SURF_ROCK              0x10000    // rock effects
+#define SURF_DIRT              0x20000    // dirt effects
+#define SURF_GRILL             0x40000    // metal grill (grate)
+#define SURF_GRASS             0x80000    // grass effects
+#define SURF_MUD               0x100000   // mud effects
+#define SURF_PUDDLE            0x200000   // puddle effects
+#define SURF_GLASS             0x400000   // glass effects
+#define SURF_GRAVEL            0x800000   // gravel effects
+#define SURF_SAND              0x1000000  // sand effects
+#define SURF_FOLIAGE           0x2000000  // foliage effects
+#define SURF_SNOW              0x4000000  // snow effects
+#define SURF_CARPET            0x8000000  // carpet effects
+#define SURF_BACKSIDE          0x10000000 // su44: backside
+#define SURF_NODLIGHT          0x20000000 // don't dlight even if solid (solid lava, skies)
+#define SURF_HINT              0x40000000 // make a primary bsp splitter
+#define SURF_PATCH             0x80000000
 
-#define	SURF_FLESH				0x40	// make flesh sounds and effects
-#define	SURF_POINTLIGHT			0x800	// generate lighting info at vertexes
-#define	SURF_METALSTEPS			0x1000	// clanking footsteps
-#define	SURF_LIGHTFILTER		0x8000	// act as a light filter during q3map -light
-#define SURF_DUST				0x40000 // leave a dust trail when walking on this surface
+#define SURF_FLESH             0x40    // make flesh sounds and effects
+#define SURF_POINTLIGHT        0x800   // generate lighting info at vertexes
+#define SURF_METALSTEPS        0x1000  // clanking footsteps
+#define SURF_LIGHTFILTER       0x8000  // act as a light filter during q3map -light
+#define SURF_DUST              0x40000 // leave a dust trail when walking on this surface
 
-#define MASK_SURF_TYPE        (SURF_PAPER|SURF_WOOD|SURF_METAL|SURF_ROCK|SURF_DIRT|SURF_GRILL|SURF_GRASS|SURF_MUD|SURF_PUDDLE|SURF_GLASS|SURF_GRAVEL|SURF_SAND|SURF_FOLIAGE|SURF_SNOW|SURF_CARPET)
+#define MASK_SURF_TYPE                                                                                              \
+    (SURF_PAPER | SURF_WOOD | SURF_METAL | SURF_ROCK | SURF_DIRT | SURF_GRILL | SURF_GRASS | SURF_MUD | SURF_PUDDLE \
+     | SURF_GLASS | SURF_GRAVEL | SURF_SAND | SURF_FOLIAGE | SURF_SNOW | SURF_CARPET)

From 0b9687fea49decd3343090203564134901560e13 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:39:24 +0200
Subject: [PATCH 0781/2040] Implement functions for printing content types,
 surface properties and surface types

---
 code/cgame/cg_consolecmds.c | 264 +++++++++++++++++++++++++++---------
 1 file changed, 202 insertions(+), 62 deletions(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index ef409d57..b81bcde3 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2008-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -160,17 +160,157 @@ baseshader_t *CG_GetShaderUnderCrosshair(qboolean bVerbose, trace_t *pRetTrace)
 
 static void CG_PrintContentTypes(int iContentFlags)
 {
-    // FIXME: unimplemented
+    if (iContentFlags & CONTENTS_SOLID) {
+        cgi.Printf(" solid");
+    }
+    if (iContentFlags & CONTENTS_LAVA) {
+        cgi.Printf(" lava");
+    }
+    if (iContentFlags & CONTENTS_SLIME) {
+        cgi.Printf(" slime");
+    }
+    if (iContentFlags & CONTENTS_WATER) {
+        cgi.Printf(" water");
+    }
+    if (iContentFlags & CONTENTS_FOG) {
+        cgi.Printf(" fog");
+    }
+    if (iContentFlags & CONTENTS_FENCE) {
+        cgi.Printf(" fence");
+    }
+    if (iContentFlags & CONTENTS_AREAPORTAL) {
+        cgi.Printf(" areaportal");
+    }
+    if (iContentFlags & CONTENTS_PLAYERCLIP) {
+        cgi.Printf(" playerclip");
+    }
+    if (iContentFlags & CONTENTS_VEHICLECLIP) {
+        cgi.Printf(" vehicleclip");
+    }
+    if (iContentFlags & CONTENTS_MONSTERCLIP) {
+        cgi.Printf(" monsterclip");
+    }
+    if (iContentFlags & CONTENTS_WEAPONCLIP) {
+        cgi.Printf(" weaponclip");
+    }
+    if (iContentFlags & CONTENTS_SHOOTONLY) {
+        cgi.Printf(" shootableonly");
+    }
+    if (iContentFlags & CONTENTS_ORIGIN) {
+        cgi.Printf(" origin");
+    }
+    if (iContentFlags & CONTENTS_TRANSLUCENT) {
+        cgi.Printf(" trans");
+    }
 }
 
 static void CG_PrintSurfaceProperties(int iSurfaceFlags)
 {
-    // FIXME: unimplemented
+    if (iSurfaceFlags & SURF_NODAMAGE) {
+        cgi.Printf(" nodamage");
+    }
+    if (iSurfaceFlags & SURF_SLICK) {
+        cgi.Printf(" slick");
+    }
+    if (iSurfaceFlags & SURF_SKY) {
+        cgi.Printf(" sky");
+    }
+    if (iSurfaceFlags & SURF_LADDER) {
+        cgi.Printf(" ladder");
+    }
+    if (iSurfaceFlags & SURF_NOIMPACT) {
+        cgi.Printf(" noimpact");
+    }
+    if (iSurfaceFlags & SURF_NOMARKS) {
+        cgi.Printf(" nomarks");
+    }
+    if (iSurfaceFlags & SURF_CASTSHADOW) {
+        cgi.Printf(" castshadow");
+    }
+    if (iSurfaceFlags & SURF_NODRAW) {
+        cgi.Printf(" nodraw");
+    }
+    if (iSurfaceFlags & SURF_NOLIGHTMAP) {
+        cgi.Printf(" nolightmap");
+    }
+    if (iSurfaceFlags & SURF_ALPHASHADOW) {
+        cgi.Printf(" alphashadow");
+    }
+    if (iSurfaceFlags & SURF_NOSTEPS) {
+        cgi.Printf(" nofootsteps");
+    }
+    if (iSurfaceFlags & SURF_NONSOLID) {
+        cgi.Printf(" nonsolid");
+    }
+    if (iSurfaceFlags & SURF_OVERBRIGHT) {
+        cgi.Printf(" overbright");
+    }
+    if (iSurfaceFlags & SURF_BACKSIDE) {
+        cgi.Printf(" backside");
+    }
+    if (iSurfaceFlags & SURF_NODLIGHT) {
+        cgi.Printf(" nodlight");
+    }
+    if (iSurfaceFlags & SURF_HINT) {
+        cgi.Printf(" hint");
+    }
+    if (iSurfaceFlags & SURF_PATCH) {
+        cgi.Printf(" patch");
+    }
 }
 
 static void CG_PrintSurfaceType(int iSurfType)
 {
-    // FIXME: unimplemented
+    switch (iSurfType & MASK_SURF_TYPE) {
+    case SURF_FOLIAGE:
+        cgi.Printf("foliage");
+        break;
+    case SURF_SNOW:
+        cgi.Printf("snow");
+        break;
+    case SURF_CARPET:
+        cgi.Printf("carpet");
+        break;
+    case SURF_SAND:
+        cgi.Printf("sand");
+        break;
+    case SURF_PUDDLE:
+        cgi.Printf("puddle");
+        break;
+    case SURF_GLASS:
+        cgi.Printf("glass");
+        break;
+    case SURF_GRAVEL:
+        cgi.Printf("gravel");
+        break;
+    case SURF_MUD:
+        cgi.Printf("mud");
+        break;
+    case SURF_DIRT:
+        cgi.Printf("dirt");
+        break;
+    case SURF_GRILL:
+        cgi.Printf("metal grill");
+        break;
+    case SURF_GRASS:
+        cgi.Printf("grass");
+        break;
+    case SURF_ROCK:
+        cgi.Printf("rock");
+        break;
+    case SURF_PAPER:
+        cgi.Printf("paper");
+        break;
+    case SURF_WOOD:
+        cgi.Printf("wood");
+        break;
+    case SURF_METAL:
+        cgi.Printf("metal");
+        break;
+    default:
+        cgi.Printf("!!*none specified*!!");
+        break;
+    }
 }
 
 void CG_GetCHShader(void)
@@ -340,65 +480,65 @@ typedef struct {
 } consoleCommand_t;
 
 static consoleCommand_t commands[] = {
-    {"useweaponclass",        &CG_UseWeaponClass_f         },
-    {"weapnext",              &CG_NextWeapon_f             },
-    {"weapprev",              &CG_PrevWeapon_f             },
-    {"uselast",               &CG_UseLastWeapon_f          },
-    {"holster",               &CG_HolsterWeapon_f          },
-    {"weapdrop",              &CG_DropWeapon_f             },
-    {"toggleitem",            &CG_ToggleItem_f             },
-    {"+scores",               &CG_ScoresDown_f             },
-    {"-scores",               &CG_ScoresUp_f               },
-    {"viewpos",               &CG_Viewpos_f                },
-    {"sizeup",                &CG_SizeUp_f                 },
-    {"sizedown",              &CG_SizeDown_f               },
-    {"cg_eventlist",          &CG_EventList_f              },
-    {"cg_eventhelp",          &CG_EventHelp_f              },
-    {"cg_dumpevents",         &CG_DumpEventHelp_f          },
-    {"cg_pendingevents",      &CG_PendingEvents_f          },
-    {"cg_classlist",          &CG_ClassList_f              },
-    {"cg_classtree",          &CG_ClassTree_f              },
-    {"cg_classevents",        &CG_ClassEvents_f            },
-    {"cg_dumpclassevents",    &CG_DumpClassEvents_f        },
-    {"cg_dumpallclasses",     &CG_DumpAllClasses_f         },
-    {"testemitter",           &CG_TestEmitter_f            },
-    {"triggertestemitter",    &CG_TriggerTestEmitter_f     },
-    {"prevemittercommand",    &CG_PrevEmitterCommand_f     },
-    {"nextemittercommand",    &CG_NextEmitterCommand_f     },
-    {"newemittercommand",     &CG_NewEmitterCommand_f      },
-    {"deleteemittercommand",  &CG_DeleteEmitterCommand_f   },
-    {"dumpemitter",           &CG_DumpEmitter_f            },
-    {"loademitter",           &CG_LoadEmitter_f            },
-    {"resetvss",              &CG_ResetVSSSources          },
-    {"getchshader",           &CG_GetCHShader              },
-    {"editchshader",          &CG_EditCHShader             },
-    {"messagemode",           &CG_MessageMode_f            },
-    {"messagemode_all",       &CG_MessageMode_All_f        },
-    {"messagemode_team",      &CG_MessageMode_Team_f       },
-    {"messagemode_private",   &CG_MessageMode_Private_f    },
-    {"say",                   &CG_MessageSingleAll_f       },
-    {"sayteam",               &CG_MessageSingleTeam_f      },
-    {"teamsay",               &CG_MessageSingleTeam_f      },
-    {"sayprivate",            &CG_MessageSingleClient_f    },
-    {"sayone",                &CG_MessageSingleClient_f    },
-    {"wisper",                &CG_MessageSingleClient_f    },
-    {"instamsg_main",         &CG_InstaMessageMain_f       },
-    {"instamsg_group_a",      &CG_InstaMessageGroupA_f     },
-    {"instamsg_group_b",      &CG_InstaMessageGroupB_f     },
-    {"instamsg_group_c",      &CG_InstaMessageGroupC_f     },
-    {"instamsg_group_d",      &CG_InstaMessageGroupD_f     },
-    {"instamsg_group_e",      &CG_InstaMessageGroupE_f     },
-    {"pushmenu_teamselect",   &CG_PushMenuTeamSelect_f     },
-    {"pushmenu_weaponselect", &CG_PushMenuWeaponSelect_f   },
+    {"useweaponclass",         &CG_UseWeaponClass_f        },
+    {"weapnext",               &CG_NextWeapon_f            },
+    {"weapprev",               &CG_PrevWeapon_f            },
+    {"uselast",                &CG_UseLastWeapon_f         },
+    {"holster",                &CG_HolsterWeapon_f         },
+    {"weapdrop",               &CG_DropWeapon_f            },
+    {"toggleitem",             &CG_ToggleItem_f            },
+    {"+scores",                &CG_ScoresDown_f            },
+    {"-scores",                &CG_ScoresUp_f              },
+    {"viewpos",                &CG_Viewpos_f               },
+    {"sizeup",                 &CG_SizeUp_f                },
+    {"sizedown",               &CG_SizeDown_f              },
+    {"cg_eventlist",           &CG_EventList_f             },
+    {"cg_eventhelp",           &CG_EventHelp_f             },
+    {"cg_dumpevents",          &CG_DumpEventHelp_f         },
+    {"cg_pendingevents",       &CG_PendingEvents_f         },
+    {"cg_classlist",           &CG_ClassList_f             },
+    {"cg_classtree",           &CG_ClassTree_f             },
+    {"cg_classevents",         &CG_ClassEvents_f           },
+    {"cg_dumpclassevents",     &CG_DumpClassEvents_f       },
+    {"cg_dumpallclasses",      &CG_DumpAllClasses_f        },
+    {"testemitter",            &CG_TestEmitter_f           },
+    {"triggertestemitter",     &CG_TriggerTestEmitter_f    },
+    {"prevemittercommand",     &CG_PrevEmitterCommand_f    },
+    {"nextemittercommand",     &CG_NextEmitterCommand_f    },
+    {"newemittercommand",      &CG_NewEmitterCommand_f     },
+    {"deleteemittercommand",   &CG_DeleteEmitterCommand_f  },
+    {"dumpemitter",            &CG_DumpEmitter_f           },
+    {"loademitter",            &CG_LoadEmitter_f           },
+    {"resetvss",               &CG_ResetVSSSources         },
+    {"getchshader",            &CG_GetCHShader             },
+    {"editchshader",           &CG_EditCHShader            },
+    {"messagemode",            &CG_MessageMode_f           },
+    {"messagemode_all",        &CG_MessageMode_All_f       },
+    {"messagemode_team",       &CG_MessageMode_Team_f      },
+    {"messagemode_private",    &CG_MessageMode_Private_f   },
+    {"say",                    &CG_MessageSingleAll_f      },
+    {"sayteam",                &CG_MessageSingleTeam_f     },
+    {"teamsay",                &CG_MessageSingleTeam_f     },
+    {"sayprivate",             &CG_MessageSingleClient_f   },
+    {"sayone",                 &CG_MessageSingleClient_f   },
+    {"wisper",                 &CG_MessageSingleClient_f   },
+    {"instamsg_main",          &CG_InstaMessageMain_f      },
+    {"instamsg_group_a",       &CG_InstaMessageGroupA_f    },
+    {"instamsg_group_b",       &CG_InstaMessageGroupB_f    },
+    {"instamsg_group_c",       &CG_InstaMessageGroupC_f    },
+    {"instamsg_group_d",       &CG_InstaMessageGroupD_f    },
+    {"instamsg_group_e",       &CG_InstaMessageGroupE_f    },
+    {"pushmenu_teamselect",    &CG_PushMenuTeamSelect_f    },
+    {"pushmenu_weaponselect",  &CG_PushMenuWeaponSelect_f  },
     // Added in 2.0
-    {"pushcallvote",          &CG_PushCallVote_f           },
-    {"pushcallvotesublist",   &CG_PushCallVoteSubList_f    },
-    {"pushcallvotesubtext",   &CG_PushCallVoteSubText_f    },
-    {"pushcallvotesubinteger",&CG_PushCallVoteSubInteger_f },
-    {"pushcallvotesubfloat",  &CG_PushCallVoteSubFloat_f   },
-    {"pushcallvotesubclient", &CG_PushCallVoteSubClient_f  },
-    {"pushvote",              &CG_PushVote_f               },
-    {"callentryvote",         &CG_CallEntryVote_f          },
+    {"pushcallvote",           &CG_PushCallVote_f          },
+    {"pushcallvotesublist",    &CG_PushCallVoteSubList_f   },
+    {"pushcallvotesubtext",    &CG_PushCallVoteSubText_f   },
+    {"pushcallvotesubinteger", &CG_PushCallVoteSubInteger_f},
+    {"pushcallvotesubfloat",   &CG_PushCallVoteSubFloat_f  },
+    {"pushcallvotesubclient",  &CG_PushCallVoteSubClient_f },
+    {"pushvote",               &CG_PushVote_f              },
+    {"callentryvote",          &CG_CallEntryVote_f         },
 };
 
 /*

From df0cb87b352fdf46523f01e2f70ee5558a31067c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:48:15 +0200
Subject: [PATCH 0782/2040] Implement CG_AddLightShow (cg_acidtrip)

---
 code/cgame/cg_view.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index cc2721e3..d10efdba 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -712,7 +712,37 @@ float CG_SensitivityScale()
 
 void CG_AddLightShow()
 {
-    // FIXME: unimplemented
+    int i;
+    float fSlopeY, fSlopeZ;
+    float x, y, z;
+    vec3_t vOrg;
+    float r, g, b;
+    float fMax;
+
+    fSlopeY = tan(cg.refdef.fov_x * 0.5);
+    fSlopeZ = tan(cg.refdef.fov_y * 0.5);
+
+    for (i = 0; i < cg_acidtrip->integer; i++) {
+        x = pow(random(), 1.0 / 3.0) * 2048.0;
+        y = crandom() * x * fSlopeY;
+        z = crandom() * x * fSlopeZ;
+
+        VectorCopy(cg.refdef.vieworg, vOrg);
+        VectorMA(vOrg, x, cg.refdef.viewaxis[0], vOrg);
+        VectorMA(vOrg, y, cg.refdef.viewaxis[1], vOrg);
+        VectorMA(vOrg, z, cg.refdef.viewaxis[2], vOrg);
+
+        r = random();
+        g = random();
+        b = random();
+
+        fMax = Q_max(r, Q_max(g, b));
+        r /= fMax;
+        g /= fMax;
+        b /= fMax;
+
+        cgi.R_AddLightToScene(vOrg, (rand() & 0x1FF) + 0x80, r, g, b, 0);
+    }
 }
 
 qboolean CG_FrustumCullSphere(const vec3_t vPos, float fRadius) {

From 6b902e7f5dced5dc0cfc07dc30a8736e94224441 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:49:45 +0200
Subject: [PATCH 0783/2040] Remove "unimplemented" comment

---
 code/cgame/cg_nature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_nature.cpp b/code/cgame/cg_nature.cpp
index c532144e..44f5e500 100644
--- a/code/cgame/cg_nature.cpp
+++ b/code/cgame/cg_nature.cpp
@@ -51,7 +51,7 @@ void RainTouch(ctempmodel_t *ct, trace_t *trace)
 
 void ClientGameCommandManager::RainTouch(Event *ev)
 {
-    // FIXME: unimplemented
+    // Nothing to do
 }
 
 void ClientGameCommandManager::InitializeRainCvars()

From 065c791a1056a9a8b8274a57836c6134700a38bf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 19:29:40 +0200
Subject: [PATCH 0784/2040] Implement CG_ResetEffectCommandCvars

---
 code/cgame/cg_testemitter.cpp | 102 +++++++++++++++++++++++++++++++---
 1 file changed, 94 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index 3fc360fe..8b2288eb 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -101,6 +101,7 @@ cvar_t *cg_te_radial_scale;
 cvar_t *cg_te_radial_min;
 cvar_t *cg_te_radial_max;
 cvar_t *cg_te_friction;
+cvar_t *cg_te_spin;
 cvar_t *cg_te_varycolor;
 cvar_t *cg_te_spritegridlighting;
 cvar_t *cg_te_cone_height;
@@ -202,6 +203,7 @@ str cg_te_radial_scaleG[MAX_TESTEMITTERS_SAVE];
 str cg_te_radial_minG[MAX_TESTEMITTERS_SAVE];
 str cg_te_radial_maxG[MAX_TESTEMITTERS_SAVE];
 str cg_te_frictionG[MAX_TESTEMITTERS_SAVE];
+str cg_te_spinG[MAX_TESTEMITTERS_SAVE]; // Added in 2.0
 str cg_te_varycolorG[MAX_TESTEMITTERS_SAVE];
 str cg_te_spritegridlightingG[MAX_TESTEMITTERS_SAVE];
 str cg_te_spawnrange_aG[MAX_TESTEMITTERS_SAVE];
@@ -291,6 +293,7 @@ void CG_SaveEffectCommandCvars(int iCommand)
     cg_te_radial_minG[iCommand]         = cg_te_radial_min->string;
     cg_te_radial_maxG[iCommand]         = cg_te_radial_max->string;
     cg_te_frictionG[iCommand]           = cg_te_friction->string;
+    cg_te_spinG[iCommand]               = cg_te_spin->string; // Added in 2.0
     cg_te_varycolorG[iCommand]          = cg_te_varycolor->string;
     cg_te_spritegridlightingG[iCommand] = cg_te_spritegridlighting->string;
     cg_te_spawnrange_aG[iCommand]       = cg_te_spawnrange_a->string;
@@ -304,7 +307,91 @@ void CG_SaveEffectCommandCvars(int iCommand)
 
 void CG_ResetEffectCommandCvars()
 {
-    // FIXME: unimplemented
+    cgi.Cvar_Set("cg_te_alpha", "1");
+    cgi.Cvar_Set("cg_te_dietouch", "0");
+    cgi.Cvar_Set("cg_te_bouncefactor", "0.3");
+    cgi.Cvar_Set("cg_te_scale", "1");
+    cgi.Cvar_Set("cg_te_scalemin", "0");
+    cgi.Cvar_Set("cg_te_scalemax", "0");
+    cgi.Cvar_Set("cg_te_model", "none");
+    cgi.Cvar_Set("cg_te_life", "1");
+    cgi.Cvar_Set("cg_te_color_r", "1");
+    cgi.Cvar_Set("cg_te_color_g", "1");
+    cgi.Cvar_Set("cg_te_color_b", "1");
+    cgi.Cvar_Set("cg_te_accel_x", "0");
+    cgi.Cvar_Set("cg_te_accel_y", "0");
+    cgi.Cvar_Set("cg_te_accel_z", "0");
+    cgi.Cvar_Set("cg_te_count", "1");
+    cgi.Cvar_Set("cg_te_fade", "0");
+    cgi.Cvar_Set("cg_te_fadedelay", "0");
+    cgi.Cvar_Set("cg_te_fadein", "0");
+    cgi.Cvar_Set("cg_te_spawnrate", "1");
+    cgi.Cvar_Set("cg_te_offsbase_x", "0");
+    cgi.Cvar_Set("cg_te_offsbase_y", "0");
+    cgi.Cvar_Set("cg_te_offsbase_z", "0");
+    cgi.Cvar_Set("cg_te_offsamp_x", "0");
+    cgi.Cvar_Set("cg_te_offsamp_y", "0");
+    cgi.Cvar_Set("cg_te_offsamp_z", "0");
+    cgi.Cvar_Set("cg_te_scalerate", "0");
+    cgi.Cvar_Set("cg_te_circle", "0");
+    cgi.Cvar_Set("cg_te_sphere", "0");
+    cgi.Cvar_Set("cg_te_insphere", "0");
+    cgi.Cvar_Set("cg_te_radius", "0");
+    cgi.Cvar_Set("cg_te_align", "0");
+    cgi.Cvar_Set("cg_te_flickeralpha", "0");
+    cgi.Cvar_Set("cg_te_collision", "0");
+    cgi.Cvar_Set("cg_te_randomroll", "0");
+    cgi.Cvar_Set("cg_te_anglesbase_p", "0");
+    cgi.Cvar_Set("cg_te_anglesbase_y", "0");
+    cgi.Cvar_Set("cg_te_anglesbase_r", "0");
+    cgi.Cvar_Set("cg_te_anglesamp_p", "0");
+    cgi.Cvar_Set("cg_te_anglesamp_y", "0");
+    cgi.Cvar_Set("cg_te_anglesamp_r", "0");
+    cgi.Cvar_Set("cg_te_forwardvel", "0");
+    cgi.Cvar_Set("cg_te_randvelbase_x", "0");
+    cgi.Cvar_Set("cg_te_randvelbase_y", "0");
+    cgi.Cvar_Set("cg_te_randvelbase_z", "0");
+    cgi.Cvar_Set("cg_te_randvelamp_x", "0");
+    cgi.Cvar_Set("cg_te_randvelamp_y", "0");
+    cgi.Cvar_Set("cg_te_randvelamp_z", "0");
+    cgi.Cvar_Set("cg_te_clampvelmin_x", "-9999");
+    cgi.Cvar_Set("cg_te_clampvelmax_x", "9999");
+    cgi.Cvar_Set("cg_te_clampvelmin_y", "-9999");
+    cgi.Cvar_Set("cg_te_clampvelmax_y", "9999");
+    cgi.Cvar_Set("cg_te_clampvelmin_z", "-9999");
+    cgi.Cvar_Set("cg_te_clampvelmax_z", "9999");
+    cgi.Cvar_Set("cg_te_clampvelaxis", "0");
+    cgi.Cvar_Set("cg_te_volumetric", "0");
+    cgi.Cvar_Set("cg_te_randaxis", "0");
+    cgi.Cvar_Set("cg_te_axisoffsbase_x", "0");
+    cgi.Cvar_Set("cg_te_axisoffsbase_y", "0");
+    cgi.Cvar_Set("cg_te_axisoffsbase_z", "0");
+    cgi.Cvar_Set("cg_te_axisoffsamp_x", "0");
+    cgi.Cvar_Set("cg_te_axisoffsamp_y", "0");
+    cgi.Cvar_Set("cg_te_axisoffsamp_z", "0");
+    cgi.Cvar_Set("cg_te_swarm_freq", "0");
+    cgi.Cvar_Set("cg_te_swarm_maxspeed", "0");
+    cgi.Cvar_Set("cg_te_swarm_delta", "0");
+    cgi.Cvar_Set("cg_te_avelbase_p", "0");
+    cgi.Cvar_Set("cg_te_avelbase_y", "0");
+    cgi.Cvar_Set("cg_te_avelbase_r", "0");
+    cgi.Cvar_Set("cg_te_avelamp_p", "0");
+    cgi.Cvar_Set("cg_te_avelamp_y", "0");
+    cgi.Cvar_Set("cg_te_avelamp_r", "0");
+    cgi.Cvar_Set("cg_te_radial_scale", "0");
+    cgi.Cvar_Set("cg_te_radial_min", "0");
+    cgi.Cvar_Set("cg_te_radial_max", "0");
+    cgi.Cvar_Set("cg_te_friction", "0");
+    cgi.Cvar_Set("cg_te_spin", "0"); // Added in 2.0
+    cgi.Cvar_Set("cg_te_varycolor", "0");
+    cgi.Cvar_Set("cg_te_spritegridlighting", "0");
+    cgi.Cvar_Set("cg_te_spawnrange_a", "0");
+    cgi.Cvar_Set("cg_te_spawnrange_b", "0");
+    cgi.Cvar_Set("cg_te_cone_height", "0");
+    cgi.Cvar_Set("cg_te_alignstretch_scale", "0");
+    cgi.Cvar_Set("cg_te_command_time", "0");
+    cgi.Cvar_Set("cg_te_singlelinecommand", "");
+    cgi.Cvar_Set("cg_te_tag", "");
 }
 
 void CG_SetTestEmitterValues()
@@ -452,6 +539,7 @@ void CG_InitTestEmitter(void)
     cg_te_radial_min         = cgi.Cvar_Get("cg_te_radial_min", "0", 0);
     cg_te_radial_max         = cgi.Cvar_Get("cg_te_radial_max", "0", 0);
     cg_te_friction           = cgi.Cvar_Get("cg_te_friction", "0", 0);
+    cg_te_spin               = cgi.Cvar_Get("cg_te_spin", "0", 0);
     cg_te_varycolor          = cgi.Cvar_Get("cg_te_varycolor", "0", 0);
     cg_te_spritegridlighting = cgi.Cvar_Get("cg_te_spritegridlighting", "0", 0);
     cg_te_spawnrange_a       = cgi.Cvar_Get("cg_te_spawnrange_a", "0", 0);
@@ -473,14 +561,12 @@ void CG_InitTestEmitter(void)
     cg_te_mode         = cgi.Cvar_Get("cg_te_mode", "0", 0);
     cg_te_mode_name    = cgi.Cvar_Get("cg_te_mode_name", "Emitter Mode", 0);
     cg_te_currCommand  = cgi.Cvar_Get("cg_te_currCommand", "0", 0);
+    cg_te_numCommands  = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
 
-    te_vEmitterOrigin[2] = 0.0;
-    te_vEmitterOrigin[1] = 0.0;
-    te_vEmitterOrigin[0] = 0.0;
-    te_refEnt.scale      = 0.0;
-    cg_te_numCommands    = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
-    te_iNumCommands      = 0;
-    te_iCurrCommand      = 0;
+    VectorClear(te_vEmitterOrigin);
+    te_refEnt.scale = 0.0;
+    te_iNumCommands = 0;
+    te_iCurrCommand = 0;
 
     pTesteffect = sfxManager.GetTestEffectPointer();
 }

From abc97dcab3348d3020c6a268461bb0a5b12ba4bb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 19:40:00 +0200
Subject: [PATCH 0785/2040] Implement R_AddTerrainMarkSurfaces and
 RE_AddTerrainMarkToScene

---
 code/renderer/tr_local.h |  1 +
 code/renderer/tr_main.c  |  1 -
 code/renderer/tr_scene.c | 34 ++++++++++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 2654a61d..62a061b7 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2399,6 +2399,7 @@ typedef struct {
 
 extern	int		max_polys;
 extern	int		max_polyverts;
+extern	int		max_termarks;
 
 extern	backEndData_t	*backEndData[SMP_FRAMES];	// the second one may not be allocated
 
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 968228b7..fde5f341 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -187,7 +187,6 @@ int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
 	}
 
 	return CULL_CLIP;
-	// FIXME: unimplemented
 }
 
 /*
diff --git a/code/renderer/tr_scene.c b/code/renderer/tr_scene.c
index 65134dcc..796d53cc 100644
--- a/code/renderer/tr_scene.c
+++ b/code/renderer/tr_scene.c
@@ -165,7 +165,18 @@ R_AddTerrainMarkSurfaces
 =====================
 */
 void R_AddTerrainMarkSurfaces(void) {
-    // FIXME: unimplemented
+    srfMarkFragment_t* terMark;
+    int j;
+    shader_t* shader;
+
+    for (j = 0; j < tr.refdef.numTerMarks; j++)
+    {
+        terMark = &tr.refdef.terMarks[j];
+
+        shader = R_GetShaderByHandle(terMark->surfaceType);
+        terMark->surfaceType = SF_MARK_FRAG;
+        R_AddDrawSurf(&terMark->surfaceType, shader, 0);
+    }
 }
 
 /*
@@ -174,7 +185,26 @@ RE_AddTerrainMarkToScene
 =====================
 */
 void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-    // FIXME: unimplemented
+    srfMarkFragment_t* terMark;
+
+    if (!tr.registered) {
+        return;
+    }
+
+    if (numVerts + r_numpolyverts > max_polyverts || r_numtermarks >= max_termarks) {
+        ri.Printf(PRINT_WARNING, "Exceeded MAX TERRAIN MARKS\n");
+        return;
+    }
+
+    terMark = &backEndData[tr.smpFrame]->terMarks[r_numtermarks];
+    terMark->surfaceType = hShader;
+    terMark->iIndex = iTerrainIndex;
+    terMark->numVerts = numVerts;
+    terMark->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
+    memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
+
+    r_numtermarks++;
+    r_numpolyverts += numVerts;
 }
 
 //=================================================================================

From eea19d733dc7450060ae967e024940c28e19d4c9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 19:43:29 +0200
Subject: [PATCH 0786/2040] Add R_UpdateGhostTextures (unimplemented)

---
 code/renderer/tr_ghost.cpp |  7 +++++++
 code/renderer/tr_local.h   | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/code/renderer/tr_ghost.cpp b/code/renderer/tr_ghost.cpp
index 2b619982..bea96d93 100644
--- a/code/renderer/tr_ghost.cpp
+++ b/code/renderer/tr_ghost.cpp
@@ -24,3 +24,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 #include "tr_ghost.h"
+
+void R_UpdateGhostTextures() {
+    int i;
+    int numTextures;
+
+    // FIXME: unimplemented
+}
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 62a061b7..86551126 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2220,6 +2220,16 @@ int RE_GetShaderHeight(qhandle_t hShader);
 const char* RE_GetShaderName(qhandle_t hShader);
 const char* RE_GetModelName(qhandle_t hModel);
 
+/*
+=============================================================
+
+GHOST
+
+=============================================================
+*/
+
+void R_UpdateGhostTextures();
+
 /*
 =============================================================
 =============================================================

From 4460466cb34f8b5a9fb16845749891a51e45dae6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 19:43:37 +0200
Subject: [PATCH 0787/2040] Implement RE_SetRenderTime

---
 code/renderer/tr_init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 4b5d7b0a..66efa501 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1630,7 +1630,8 @@ RE_SetRenderTime
 =============
 */
 void RE_SetRenderTime(int t) {
-	// FIXME: unimplemented
+    backEnd.refdef.floatTime = (long double)t / 1000.0;
+    R_UpdateGhostTextures();
 }
 
 /*

From 7c57c4b131f6ad41c3f5fbb8971edb9bae818362 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 20:20:58 +0200
Subject: [PATCH 0788/2040] Fix wrong secondary ammo type being picked up

---
 code/fgame/weapon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index c03c777c..7a579100 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -3011,7 +3011,7 @@ void Weapon::PickupWeapon(Event *ev)
     if (ammo_type[FIRE_SECONDARY] != ammo_type[FIRE_PRIMARY] && str::icmp(ammo_type[FIRE_SECONDARY], "none")) {
         if (startammo[FIRE_SECONDARY] && ammo_type[FIRE_SECONDARY].length() && other->isClient()) {
             str        sMessage;
-            const str& sAmmoType = ammo_type[FIRE_PRIMARY];
+            const str& sAmmoType = ammo_type[FIRE_SECONDARY];
 
             iGiveAmmo = startammo[FIRE_SECONDARY];
 

From eb7af2bce919ca2f3939b64ab13915f7143ab4bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:33:55 +0200
Subject: [PATCH 0789/2040] Implement basic test emitter functions

---
 code/cgame/cg_testemitter.cpp | 266 +++++++++++++++++++++++++++++++---
 1 file changed, 242 insertions(+), 24 deletions(-)

diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index 8b2288eb..d8983c07 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -101,7 +101,7 @@ cvar_t *cg_te_radial_scale;
 cvar_t *cg_te_radial_min;
 cvar_t *cg_te_radial_max;
 cvar_t *cg_te_friction;
-cvar_t *cg_te_spin;
+cvar_t *cg_te_spin; // Added in 2.0
 cvar_t *cg_te_varycolor;
 cvar_t *cg_te_spritegridlighting;
 cvar_t *cg_te_cone_height;
@@ -114,18 +114,22 @@ cvar_t *cg_te_tag;
 cvar_t *cg_te_xangles;
 cvar_t *cg_te_yangles;
 cvar_t *cg_te_zangles;
-class specialeffect_t;
-refEntity_t      te_refEnt;
-cvar_t          *cg_te_emittermodel;
-cvar_t          *cg_te_mode;
-cvar_t          *cg_te_mode_name;
-cvar_t          *cg_te_currCommand;
-cvar_t          *cg_te_numCommands;
-float            te_vEmitterOrigin[3];
-int              te_iNumCommands;
-int              te_iCurrCommand;
+cvar_t *cg_te_emittermodel;
+cvar_t *cg_te_mode;
+cvar_t *cg_te_mode_name;
+cvar_t *cg_te_currCommand;
+cvar_t *cg_te_numCommands;
+
+refEntity_t te_refEnt;
+float       te_vEmitterOrigin[3];
+int         te_iNumCommands;
+int         te_iCurrCommand;
+
 specialeffect_t *pTesteffect;
 
+specialeffectcommand_t *pCurrCommand;
+spawnthing_t           *pCurrSpawnthing;
+
 #define MAX_TESTEMITTERS_SAVE 32
 
 str cg_te_alphaG[MAX_TESTEMITTERS_SAVE];
@@ -305,6 +309,95 @@ void CG_SaveEffectCommandCvars(int iCommand)
     cg_te_tagG[iCommand]                = cg_te_tag->string;
 }
 
+void CG_GetEffectCommandCvars(int iCommand)
+{
+    cgi.Cvar_Set("cg_te_alpha", cg_te_alphaG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_dietouch", cg_te_dietouchG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_bouncefactor", cg_te_bouncefactorG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scale", cg_te_scaleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scalemin", cg_te_scaleminG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scalemax", cg_te_scalemaxG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_model", cg_te_modelG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_life", cg_te_lifeG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_color_r", cg_te_color_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_color_g", cg_te_color_gG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_color_b", cg_te_color_bG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_accel_x", cg_te_accel_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_accel_y", cg_te_accel_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_accel_z", cg_te_accel_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_count", cg_te_countG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_fade", cg_te_fadeG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_fadedelay", cg_te_fadedelayG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_fadein", cg_te_fadeinG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spawnrate", cg_te_spawnrateG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsbase_x", cg_te_offsbase_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsbase_y", cg_te_offsbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsbase_z", cg_te_offsbase_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsamp_x", cg_te_offsamp_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsamp_y", cg_te_offsamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsamp_z", cg_te_offsamp_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scalerate", cg_te_scalerateG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_circle", cg_te_circleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_sphere", cg_te_sphereG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_insphere", cg_te_insphereG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radius", cg_te_radiusG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_align", cg_te_alignG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_flickeralpha", cg_te_flickeralphaG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_collision", cg_te_collisionG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randomroll", cg_te_randomrollG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesbase_p", cg_te_anglesbase_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesbase_y", cg_te_anglesbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesbase_r", cg_te_anglesbase_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesamp_p", cg_te_anglesamp_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesamp_y", cg_te_anglesamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesamp_r", cg_te_anglesamp_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_forwardvel", cg_te_forwardvelG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelbase_x", cg_te_randvelbase_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelbase_y", cg_te_randvelbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelbase_z", cg_te_randvelbase_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelamp_x", cg_te_randvelamp_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelamp_y", cg_te_randvelamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelamp_z", cg_te_randvelamp_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmin_x", cg_te_clampvelmin_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmax_x", cg_te_clampvelmax_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmin_y", cg_te_clampvelmin_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmax_y", cg_te_clampvelmax_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmin_z", cg_te_clampvelmin_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmax_z", cg_te_clampvelmax_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelaxis", cg_te_clampvelaxisG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_volumetric", cg_te_volumetricG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randaxis", cg_te_randaxisG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsbase_x", cg_te_axisoffsbase_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsbase_y", cg_te_axisoffsbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsbase_z", cg_te_axisoffsbase_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsamp_x", cg_te_axisoffsamp_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsamp_y", cg_te_axisoffsamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsamp_z", cg_te_axisoffsamp_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_swarm_freq", cg_te_swarm_freqG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_swarm_maxspeed", cg_te_swarm_maxspeedG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_swarm_delta", cg_te_swarm_deltaG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelbase_p", cg_te_avelbase_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelbase_y", cg_te_avelbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelbase_r", cg_te_avelbase_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelamp_p", cg_te_avelamp_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelamp_y", cg_te_avelamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelamp_r", cg_te_avelamp_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radial_scale", cg_te_radial_scaleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radial_min", cg_te_radial_minG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radial_max", cg_te_radial_maxG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_friction", cg_te_frictionG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spin", cg_te_spinG[iCommand].c_str()); // Added in 2.0
+    cgi.Cvar_Set("cg_te_varycolor", cg_te_varycolorG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spritegridlighting", cg_te_spritegridlightingG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spawnrange_a", cg_te_spawnrange_aG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spawnrnage_b", cg_te_spawnrange_bG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_cone_height", cg_te_cone_heightG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_alignstretch_scale", cg_te_alignstretch_scaleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_command_time", cg_te_command_timeG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_singlelinecommand", cg_te_singlelinecommandG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_tag", cg_te_tagG[iCommand].c_str());
+}
+
 void CG_ResetEffectCommandCvars()
 {
     cgi.Cvar_Set("cg_te_alpha", "1");
@@ -406,17 +499,88 @@ void CG_UpdateTestEmitter(void)
 
 void CG_SortEffectCommands()
 {
-    // FIXME: unimplemented
+    int j, k;
+
+    for (j = 1; j < pTesteffect->m_iCommandCount; j++) {
+        for (k = 0; k < j; k++) {
+            if (pTesteffect->m_commands[k] > pTesteffect->m_commands[k + 1]) {
+                specialeffectcommand_t *command = pTesteffect->m_commands[k];
+
+                pTesteffect->m_commands[k]     = pTesteffect->m_commands[k + 1];
+                pTesteffect->m_commands[k + 1] = command;
+            }
+        }
+    }
 }
 
 void CG_TriggerTestEmitter_f(void)
 {
-    // FIXME: unimplemented
+    int    i;
+    vec3_t axis[3];
+
+    if (!cg_te_mode->integer) {
+        return;
+    }
+
+    if (!te_iNumCommands) {
+        return;
+    }
+
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    for (i = 0; i < te_iNumCommands; ++i) {
+        pCurrCommand = pTesteffect->m_commands[i];
+        if (!pCurrCommand) {
+            return;
+        }
+
+        pCurrSpawnthing = pCurrCommand->emitter;
+        if (!pCurrSpawnthing) {
+            return;
+        }
+
+        CG_GetEffectCommandCvars(i);
+        CG_SetTestEmitterValues();
+    }
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
+    CG_SortEffectCommands();
+
+    pCurrCommand    = pTesteffect->m_commands[0];
+    pCurrSpawnthing = pCurrCommand->emitter;
+    AxisCopy(pCurrSpawnthing->axis, axis);
+
+    // Spawn the effect
+    sfxManager.MakeEffect_Axis(SFX_TEST_EFFECT, pCurrSpawnthing->cgd.origin, axis);
+
+    pCurrCommand    = NULL;
+    pCurrSpawnthing = NULL;
 }
 
 void CG_DumpBaseAndAmplitude(str *buff, char *prefix, Vector *base, Vector *amplitude)
 {
-    // FIXME: unimplemented
+    int i;
+
+    if (amplitude[0] || amplitude[1] || amplitude[2]) {
+        *buff += prefix;
+
+        for (i = 0; i < 3; i++) {
+            if (!amplitude[i]) {
+                *buff += va(" %g", base[i]);
+            } else if (!base[i]) {
+                *buff += va(" random %g", amplitude[i]);
+            } else if (-base[i] == base[i] + amplitude[i]) {
+                *buff += va(" crandom %g", amplitude[i] * 0.5);
+            } else {
+                *buff += va(" range %g %g", base[i], amplitude[i]);
+            }
+        }
+
+        *buff += "\n";
+    } else if (base[0] || base[1] || base[2]) {
+        *buff += prefix;
+        *buff += va(" %g %g %g\n", base[0], base[1], base[2]);
+    }
 }
 
 void CG_DumpEmitter_f(void)
@@ -438,28 +602,82 @@ void CG_LoadEmitter_f(void)
 
 void CG_TestEmitter_f(void)
 {
-    // FIXME: unimplemented
+    vec3_t angles;
+
+    if (!pTesteffect->m_iCommandCount) {
+        pCurrCommand = pTesteffect->AddNewCommand();
+        if (!pCurrCommand) {
+            return;
+        }
+
+        pCurrSpawnthing       = new spawnthing_t();
+        pCurrCommand->emitter = pCurrSpawnthing;
+        commandManager.InitializeSpawnthing(pCurrSpawnthing);
+
+        te_iNumCommands++;
+    }
+
+    VectorMA(cg.refdef.vieworg, 100.0, cg.refdef.viewaxis[0], te_vEmitterOrigin);
+    VectorSet(angles, 0, cg.refdefViewAngles[1], 0);
+    AnglesToAxis(angles, pCurrSpawnthing->axis);
+
+    pCurrSpawnthing->cgd.tiki = NULL;
+    CG_SetTestEmitterValues();
+
+    pCurrCommand    = NULL;
+    pCurrSpawnthing = NULL;
 }
 
 void CG_PrevEmitterCommand_f(void)
 {
-    // FIXME: unimplemented
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    te_iCurrCommand--;
+    if (te_iCurrCommand < 0) {
+        te_iCurrCommand = te_iNumCommands - 1;
+    }
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
 }
 
 void CG_NextEmitterCommand_f(void)
 {
-    // FIXME: unimplemented
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    te_iCurrCommand++;
+    if (te_iCurrCommand >= te_iNumCommands) {
+        te_iCurrCommand = 0;
+    }
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
 }
 
 void CG_NewEmitterCommand_f(void)
 {
-    // FIXME: unimplemented
+    if (te_iNumCommands >= MAX_TESTEMITTERS_SAVE) {
+        Com_Printf("Test effect can not have more than %i effect commands\n", MAX_TESTEMITTERS_SAVE);
+        return;
+    }
+
+    pCurrCommand = pTesteffect->AddNewCommand();
+    if (!pCurrCommand) {
+        return;
+    }
+
+    pCurrSpawnthing       = new spawnthing_t();
+    pCurrCommand->emitter = pCurrSpawnthing;
+    commandManager.InitializeSpawnthing(pCurrSpawnthing);
+
+    te_iNumCommands++;
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    te_iCurrCommand = te_iNumCommands - 1;
+    CG_GetEffectCommandCvars(te_iCurrCommand);
+
+    Com_Printf("Test effect now has %i effect commands\n", te_iNumCommands);
 }
 
-void CG_DeleteEmitterCommand_f(void)
-{
-    // FIXME: unimplemented
-}
+void CG_DeleteEmitterCommand_f(void) {}
 
 void CG_InitTestEmitter(void)
 {
@@ -539,7 +757,7 @@ void CG_InitTestEmitter(void)
     cg_te_radial_min         = cgi.Cvar_Get("cg_te_radial_min", "0", 0);
     cg_te_radial_max         = cgi.Cvar_Get("cg_te_radial_max", "0", 0);
     cg_te_friction           = cgi.Cvar_Get("cg_te_friction", "0", 0);
-    cg_te_spin               = cgi.Cvar_Get("cg_te_spin", "0", 0);
+    cg_te_spin               = cgi.Cvar_Get("cg_te_spin", "0", 0); // Added in 2.0
     cg_te_varycolor          = cgi.Cvar_Get("cg_te_varycolor", "0", 0);
     cg_te_spritegridlighting = cgi.Cvar_Get("cg_te_spritegridlighting", "0", 0);
     cg_te_spawnrange_a       = cgi.Cvar_Get("cg_te_spawnrange_a", "0", 0);

From b84fbf452e5f184641454d2fc5bcfaeb0553c118 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:49:48 +0200
Subject: [PATCH 0790/2040] Pass a vec4_t to GL_SetFogColor() rather than a
 vec3_t

---
 code/renderer/tr_backend.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 6fb946fb..5ef8c9b2 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -1196,7 +1196,7 @@ void RB_SetupFog() {
 	} else if (r_farplane_nofog->integer) {
 		glState.externalSetState &= ~GLS_FOG;
 	} else {
-		vec3_t vFogColor;
+		vec4_t vFogColor;
 
 		qglFogf(GL_FOG_START, backEnd.viewParms.farplane_bias);
 		qglFogf(GL_FOG_END, backEnd.viewParms.farplane_distance);
@@ -1204,7 +1204,8 @@ void RB_SetupFog() {
         vFogColor[0] = backEnd.viewParms.farplane_color[0] * tr.identityLight;
         vFogColor[1] = backEnd.viewParms.farplane_color[1] * tr.identityLight;
         vFogColor[2] = backEnd.viewParms.farplane_color[2] * tr.identityLight;
-		GL_SetFogColor(vFogColor);
+        vFogColor[3] = 1.0;
+        GL_SetFogColor(vFogColor);
 
 		glState.externalSetState |= GLS_FOG;
 	}

From 725561b6559736e1e70d527a9a4423805aa5b83d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:54:47 +0200
Subject: [PATCH 0791/2040] Fix the usage of memory, strings, constant and
 parameters

---
 code/cgame/cg_testemitter.cpp | 20 ++++++++++----------
 code/client/snd_mem_new.cpp   |  2 +-
 code/fgame/actor.cpp          |  2 +-
 code/fgame/g_session.cpp      |  4 +++-
 code/fgame/player.cpp         |  2 +-
 code/qcommon/files.cpp        |  2 +-
 code/server/sv_world.c        |  2 +-
 code/uilib/uinotepad.cpp      |  4 ++--
 8 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index d8983c07..90b3c902 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -561,25 +561,25 @@ void CG_DumpBaseAndAmplitude(str *buff, char *prefix, Vector *base, Vector *ampl
 {
     int i;
 
-    if (amplitude[0] || amplitude[1] || amplitude[2]) {
+    if ((*amplitude)[0] || (*amplitude)[1] || (*amplitude)[2]) {
         *buff += prefix;
 
         for (i = 0; i < 3; i++) {
-            if (!amplitude[i]) {
-                *buff += va(" %g", base[i]);
-            } else if (!base[i]) {
-                *buff += va(" random %g", amplitude[i]);
-            } else if (-base[i] == base[i] + amplitude[i]) {
-                *buff += va(" crandom %g", amplitude[i] * 0.5);
+            if (!(*amplitude)[i]) {
+                *buff += va(" %g", (*base)[i]);
+            } else if (!(*base)[i]) {
+                *buff += va(" random %g", (*amplitude)[i]);
+            } else if (-(*base)[i] == (*base)[i] + (*amplitude)[i]) {
+                *buff += va(" crandom %g", (*amplitude)[i] * 0.5);
             } else {
-                *buff += va(" range %g %g", base[i], amplitude[i]);
+                *buff += va(" range %g %g", (*base)[i], (*amplitude)[i]);
             }
         }
 
         *buff += "\n";
-    } else if (base[0] || base[1] || base[2]) {
+    } else if ((*base)[0] || (*base)[1] || (*base)[2]) {
         *buff += prefix;
-        *buff += va(" %g %g %g\n", base[0], base[1], base[2]);
+        *buff += va(" %g %g %g\n", (*base)[0], (*base)[1], (*base)[2]);
     }
 }
 
diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index bc6c6c32..0ebe13d0 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -203,7 +203,7 @@ void DumpChunks()
 
         iff_chunk_len = GetLittleLong();
 
-        Com_Printf("0x%x : %s (%d)\n", data_p - 4, str, iff_chunk_len);
+        Com_Printf("0x%p : %s (%d)\n", data_p - 4, str, iff_chunk_len);
 
         data_p += (iff_chunk_len + 1) & ~1;
     } while (data_p < (byte *)iff_end);
diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 121915db..0c476ebb 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -7007,7 +7007,7 @@ bool Actor::SoundSayAnim(const_str name, byte bLevelSayAnim)
         edict->tiki->a->name
     );
 
-    Sound(Director.GetString(name), CHAN_AUTO, 0, 0, 0, NULL, 0, 1, 1, -1);
+    Sound(Director.GetString(name), CHAN_AUTO, 0, 0, NULL, 0, 0, 1, 1, -1);
 
     return true;
 }
diff --git a/code/fgame/g_session.cpp b/code/fgame/g_session.cpp
index bbd3a076..e78bfae1 100644
--- a/code/fgame/g_session.cpp
+++ b/code/fgame/g_session.cpp
@@ -61,6 +61,7 @@ Called on a reconnect
 void G_ReadClientSessionData( gclient_t *client )
 {
 	cvar_t *session;
+    int teamnum;
 
 	if( g_bNewSession ) {
 		return;
@@ -68,11 +69,12 @@ void G_ReadClientSessionData( gclient_t *client )
 
 	session = gi.Cvar_Get(va("session%zi", client - game.clients), "", 0);
 	
-	sscanf( session->string, "%s %i %i", client->pers.dm_primary, &client->pers.teamnum, &client->pers.round_kills);
+	sscanf( session->string, "%s %i %i", client->pers.dm_primary, &teamnum, &client->pers.round_kills);
 	if( client->pers.dm_primary[ 0 ] == '-' )
 	{
 		client->pers.dm_primary[ 0 ] = 0;
 	}
+    client->pers.teamnum = (teamtype_t)teamnum;
 }
 
 
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 3b138458..8c0fd1de 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10930,7 +10930,7 @@ str Player::TranslateBattleLanguageTokens(const char *string)
     }
 
     if (!string) {
-        return NULL;
+        return str();
     }
 
     if (string[0] != '$') {
diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 436fc999..e8f9336b 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -534,7 +534,7 @@ static int check_filecase( char *Path ) {
 #else
 	char *ptr;
 	char *filename;
-	char *basedir;
+	const char *basedir;
     DIR* dir;
 
     retval = 0;
diff --git a/code/server/sv_world.c b/code/server/sv_world.c
index 879d9d3d..42b039b1 100644
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -146,7 +146,7 @@ void SV_ClearWorld( void ) {
 	vec3_t			mins, maxs;
 	int				i;
 	int				num;
-	char			name[ 10 ];
+	char			name[ 16 ];
 
 	Com_Memset( sv_worldSectors, 0, sizeof(sv_worldSectors) );
 	sv_numworldSectors = 0;
diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index c3c821d2..badf3ee6 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -370,7 +370,7 @@ bool UINotepad::Create(UIWidget *parent, UIRect2D& rect, const char *filename)
     uipd = new uipopup_describe("Save As...(Ctrl-A)", UIP_EVENT, &EV_Notepad_SaveAs, NULL);
     pops->AddObject(uipd);
 
-    uipd = new uipopup_describe(NULL, UIP_SEPARATOR, NULL, NULL);
+    uipd = new uipopup_describe(str(), UIP_SEPARATOR, NULL, NULL);
     pops->AddObject(uipd);
 
     uipd = new uipopup_describe("Close (Ctrl-W)", UIP_EVENT, &UIFloatingWindow::W_ClosePressed, NULL);
@@ -389,7 +389,7 @@ bool UINotepad::Create(UIWidget *parent, UIRect2D& rect, const char *filename)
     uipd = new uipopup_describe("Paste (Ctrl-V)", UIP_EVENT, &EV_Notepad_Paste, NULL);
     pops->AddObject(uipd);
 
-    uipd = new uipopup_describe(NULL, UIP_SEPARATOR, NULL, NULL);
+    uipd = new uipopup_describe(str(), UIP_SEPARATOR, NULL, NULL);
     pops->AddObject(uipd);
 
     uipd = new uipopup_describe("Find (Ctrl-F)", UIP_EVENT, &EV_Notepad_Find, NULL);

From 6adad053d9738972f41be9a8022c4ea2c6c8239b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 00:15:39 +0200
Subject: [PATCH 0792/2040] Explicitly disable looping when setting the sample
 loop count to a value other than 0

This fixes a rare occurrence where some sounds would loop forever
---
 code/client/snd_openal_new.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 3dc2e315..de741fd0 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3284,6 +3284,9 @@ void openal_channel::set_sample_loop_count(S32 count)
     if (count == 0) {
         qalSourcei(source, AL_LOOPING, true);
         alDieIfError();
+    } else {
+        qalSourcei(source, AL_LOOPING, false);
+        alDieIfError();
     }
 }
 

From 47131dec445dd149e903cd085f104c5f54c7db07 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 21:36:23 +0200
Subject: [PATCH 0793/2040] Fix wrong special effects count

---
 code/cgame/cg_specialfx.cpp | 4 ++--
 code/cgame/cg_specialfx.h   | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/cgame/cg_specialfx.cpp b/code/cgame/cg_specialfx.cpp
index 76e9843c..48a0f6e6 100644
--- a/code/cgame/cg_specialfx.cpp
+++ b/code/cgame/cg_specialfx.cpp
@@ -95,7 +95,7 @@ void ClientSpecialEffectsManager::LoadEffects()
     cgi.DPrintf("Loading Special Effects...\n");
     AxisClear(axis);
 
-    for (i = 0; i < MAX_SPECIAL_EFFECTS; i++) {
+    for (i = 0; i < SFX_COUNT; i++) {
         switch (i) {
         case SFX_BHIT_PAPER_LITE:
             szEffectModel = "models/fx/bh_paper_lite.tik";
@@ -1194,5 +1194,5 @@ qboolean ClientSpecialEffectsManager::EffectsPending()
 
 specialeffect_t *ClientSpecialEffectsManager::GetTestEffectPointer()
 {
-    return &m_effects[SPECIAL_EFFECT_TEST];
+    return &m_effects[SFX_TEST_EFFECT];
 }
diff --git a/code/cgame/cg_specialfx.h b/code/cgame/cg_specialfx.h
index 4a84e52c..9df6c06d 100644
--- a/code/cgame/cg_specialfx.h
+++ b/code/cgame/cg_specialfx.h
@@ -170,12 +170,9 @@ public:
     specialeffectcommand_t *AddNewCommand();
 };
 
-#define MAX_SPECIAL_EFFECTS 99
-#define SPECIAL_EFFECT_TEST MAX_SPECIAL_EFFECTS - 1
-
 class ClientSpecialEffectsManager : public Listener
 {
-    specialeffect_t m_effects[99];
+    specialeffect_t m_effects[SFX_COUNT];
     qboolean        m_bEffectsLoaded;
     int             m_iNumPendingEvents;
 

From 999e0fd721a454af6dc9c9a990fee7736d1da7e5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 21:48:40 +0200
Subject: [PATCH 0794/2040] Implement test emitter

---
 code/cgame/cg_testemitter.cpp | 1310 ++++++++++++++++++++++++++++++++-
 1 file changed, 1304 insertions(+), 6 deletions(-)

diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index 90b3c902..30bac2e1 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -26,6 +26,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_commands.h"
 #include "cg_specialfx.h"
 
+typedef enum te_mode_e {
+    TE_MODE_EMITTER,
+    TE_MODE_MODEL_ANIM,
+    TE_MODE_MODEL_INIT,
+    TE_MODE_SFX,
+} te_mode_t;
+
 cvar_t *cg_te_alpha;
 cvar_t *cg_te_dietouch;
 cvar_t *cg_te_bouncefactor;
@@ -489,12 +496,491 @@ void CG_ResetEffectCommandCvars()
 
 void CG_SetTestEmitterValues()
 {
-    // FIXME: unimplemented
+    int    i;
+    int    iTagNum;
+    vec3_t vAngles;
+    vec3_t vOrigin;
+    vec3_t axis[3];
+
+    pCurrSpawnthing->cgd.flags2 |= T2_ACCEL | T2_AMOVE | T2_MOVE;
+
+    if (te_refEnt.scale > 0 && Q_stricmp(cg_te_tag->string, "") && cg_te_mode->integer != TE_MODE_SFX) {
+        iTagNum = cgi.Tag_NumForName(te_refEnt.tiki, cg_te_tag->string);
+    } else {
+        iTagNum = -1;
+    }
+
+    VectorCopy(te_vEmitterOrigin, vOrigin);
+
+    if (iTagNum != -1) {
+        orientation_t oTag;
+
+        oTag = cgi.TIKI_Orientation(&te_refEnt, iTagNum);
+        for (i = 0; i < 3; ++i) {
+            VectorMA(vOrigin, oTag.origin[i], te_refEnt.axis[i], vOrigin);
+        }
+
+        R_ConcatRotations(oTag.axis, te_refEnt.axis, axis);
+    } else {
+        vAngles[0] = cg_te_xangles->value;
+        vAngles[1] = cg_te_yangles->value;
+        vAngles[2] = cg_te_zangles->value;
+        AnglesToAxis(vAngles, axis);
+    }
+
+    VectorCopy(vOrigin, pCurrSpawnthing->cgd.origin);
+    pCurrSpawnthing->SetModel(cg_te_model->string);
+
+    AxisCopy(axis, pCurrSpawnthing->axis);
+
+    pCurrSpawnthing->cgd.alpha        = cg_te_alpha->value;
+    pCurrSpawnthing->cgd.color[3]     = cg_te_alpha->value;
+    pCurrSpawnthing->cgd.bouncefactor = cg_te_bouncefactor->value;
+    pCurrSpawnthing->cgd.scale        = cg_te_scale->value;
+    pCurrSpawnthing->cgd.life         = cg_te_life->value * 1000.0;
+    pCurrSpawnthing->cgd.color[0]     = cg_te_color_r->value;
+    pCurrSpawnthing->cgd.color[1]     = cg_te_color_g->value;
+    pCurrSpawnthing->cgd.color[2]     = cg_te_color_b->value;
+
+    if (cg_te_varycolor->integer) {
+        pCurrSpawnthing->cgd.flags2 |= T2_VARYCOLOR;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_VARYCOLOR;
+    }
+
+    if (cg_te_spritegridlighting->integer) {
+        pCurrSpawnthing->cgd.flags2 |= T2_SPRITEGRIDLIGHTING;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_SPRITEGRIDLIGHTING;
+    }
+
+    pCurrSpawnthing->cgd.accel[0] = cg_te_accel_x->value;
+    pCurrSpawnthing->cgd.accel[1] = cg_te_accel_y->value;
+    pCurrSpawnthing->cgd.accel[2] = cg_te_accel_z->value;
+
+    pCurrSpawnthing->count     = cg_te_count->value;
+    pCurrSpawnthing->spawnRate = 1.0 / cg_te_spawnrate->value * 1000.0;
+
+    if (cg_te_spawnrange_a->value || cg_te_spawnrange_b->value) {
+        vAngles[0] = Square(cg_te_spawnrange_a->value);
+        vAngles[1] = Square(cg_te_spawnrange_b->value);
+
+        if (vAngles[0] > vAngles[1]) {
+            pCurrSpawnthing->fMaxRangeSquared = vAngles[0];
+            pCurrSpawnthing->fMinRangeSquared = vAngles[1];
+        } else {
+            pCurrSpawnthing->fMinRangeSquared = vAngles[0];
+            pCurrSpawnthing->fMaxRangeSquared = vAngles[2];
+        }
+    } else {
+        pCurrSpawnthing->fMinRangeSquared = 0.0;
+        pCurrSpawnthing->fMaxRangeSquared = 9.9999997e37f;
+    }
+
+    pCurrSpawnthing->cgd.scaleRate = cg_te_scalerate->value;
+    pCurrSpawnthing->sphereRadius  = cg_te_radius->value;
+
+    if (cg_te_cone_height->value) {
+        pCurrSpawnthing->cgd.flags2 |= T2_CONE;
+        pCurrSpawnthing->coneHeight = cg_te_cone_height->value;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_CONE;
+    }
+
+    pCurrSpawnthing->forwardVelocity = cg_te_forwardvel->value;
+    if (cg_te_friction->value) {
+        pCurrSpawnthing->cgd.flags2 |= T2_FRICTION;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_FRICTION;
+    }
+
+    //
+    // Added in 2.0
+    //
+    if (cg_te_spin->value) {
+        pCurrSpawnthing->cgd.flags2 |= T2_SPIN;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_SPIN;
+    }
+
+    pCurrSpawnthing->origin_offset_base[0]      = cg_te_offsbase_x->value;
+    pCurrSpawnthing->origin_offset_base[1]      = cg_te_offsbase_y->value;
+    pCurrSpawnthing->origin_offset_base[2]      = cg_te_offsbase_z->value;
+    pCurrSpawnthing->origin_offset_amplitude[0] = cg_te_offsamp_x->value;
+    pCurrSpawnthing->origin_offset_amplitude[1] = cg_te_offsamp_y->value;
+    pCurrSpawnthing->origin_offset_amplitude[2] = cg_te_offsamp_z->value;
+
+    pCurrSpawnthing->axis_offset_base[0]      = cg_te_axisoffsbase_x->value;
+    pCurrSpawnthing->axis_offset_base[1]      = cg_te_axisoffsbase_y->value;
+    pCurrSpawnthing->axis_offset_base[2]      = cg_te_axisoffsbase_z->value;
+    pCurrSpawnthing->axis_offset_amplitude[0] = cg_te_axisoffsamp_x->value;
+    pCurrSpawnthing->axis_offset_amplitude[1] = cg_te_axisoffsamp_y->value;
+    pCurrSpawnthing->axis_offset_amplitude[2] = cg_te_axisoffsamp_z->value;
+
+    pCurrSpawnthing->cgd.angles[0]       = cg_te_anglesbase_p->value;
+    pCurrSpawnthing->cgd.angles[1]       = cg_te_anglesbase_y->value;
+    pCurrSpawnthing->cgd.angles[2]       = cg_te_anglesbase_r->value;
+    pCurrSpawnthing->angles_amplitude[0] = cg_te_anglesamp_p->value;
+    pCurrSpawnthing->angles_amplitude[1] = cg_te_anglesamp_y->value;
+    pCurrSpawnthing->angles_amplitude[2] = cg_te_anglesamp_r->value;
+
+    if (!VectorCompare(pCurrSpawnthing->cgd.angles, vec_zero)
+        || !VectorCompare(pCurrSpawnthing->angles_amplitude, vec_zero)) {
+        pCurrSpawnthing->cgd.flags |= T_ANGLES;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_ANGLES;
+    }
+
+    pCurrSpawnthing->avelocity_base[0]      = cg_te_avelbase_p->value;
+    pCurrSpawnthing->avelocity_base[1]      = cg_te_avelbase_y->value;
+    pCurrSpawnthing->avelocity_base[2]      = cg_te_avelbase_r->value;
+    pCurrSpawnthing->avelocity_amplitude[0] = cg_te_avelamp_p->value;
+    pCurrSpawnthing->avelocity_amplitude[1] = cg_te_avelamp_y->value;
+    pCurrSpawnthing->avelocity_amplitude[2] = cg_te_avelamp_r->value;
+
+    pCurrSpawnthing->randvel_base[0]      = cg_te_randvelbase_x->value;
+    pCurrSpawnthing->randvel_base[1]      = cg_te_randvelbase_y->value;
+    pCurrSpawnthing->randvel_base[2]      = cg_te_randvelbase_z->value;
+    pCurrSpawnthing->randvel_amplitude[0] = cg_te_randvelamp_x->value;
+    pCurrSpawnthing->randvel_amplitude[1] = cg_te_randvelamp_y->value;
+    pCurrSpawnthing->randvel_amplitude[2] = cg_te_randvelamp_z->value;
+
+    if (cg_te_randaxis->integer) {
+        pCurrSpawnthing->cgd.flags |= T_RANDVELAXIS;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_RANDVELAXIS;
+    }
+
+    if (cg_te_radial_scale->value || cg_te_radial_min->value || cg_te_radial_max->value) {
+        pCurrSpawnthing->cgd.velocity[0] = cg_te_radial_scale->value;
+        pCurrSpawnthing->cgd.velocity[1] = cg_te_radial_min->value;
+        pCurrSpawnthing->cgd.velocity[2] = cg_te_radial_max->value;
+        pCurrSpawnthing->cgd.velocity[2] -= pCurrSpawnthing->cgd.velocity[1];
+
+        pCurrSpawnthing->cgd.flags2 |= T2_RADIALVELOCITY;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_RADIALVELOCITY;
+    }
+
+    pCurrSpawnthing->cgd.minVel[0] = cg_te_clampvelmin_x->value;
+    pCurrSpawnthing->cgd.maxVel[0] = cg_te_clampvelmax_x->value;
+    pCurrSpawnthing->cgd.minVel[1] = cg_te_clampvelmin_y->value;
+    pCurrSpawnthing->cgd.maxVel[1] = cg_te_clampvelmax_y->value;
+    pCurrSpawnthing->cgd.minVel[2] = cg_te_clampvelmin_z->value;
+    pCurrSpawnthing->cgd.maxVel[2] = cg_te_clampvelmax_z->value;
+    pCurrSpawnthing->cgd.flags &= ~(T_GLOBALFADEIN | T_GLOBALFADEOUT);
+
+    if (pCurrSpawnthing->cgd.minVel[0] > -9999 || pCurrSpawnthing->cgd.minVel[1] > -9999
+        || pCurrSpawnthing->cgd.minVel[2] > -9999 || pCurrSpawnthing->cgd.maxVel[0] < 9999
+        || pCurrSpawnthing->cgd.maxVel[1] < 9999 || pCurrSpawnthing->cgd.maxVel[2] < 9999) {
+        if (cg_te_clampvelaxis->value) {
+            pCurrSpawnthing->cgd.flags |= T_GLOBALFADEOUT;
+        } else {
+            pCurrSpawnthing->cgd.flags |= T_GLOBALFADEIN;
+        }
+    }
+
+    pCurrSpawnthing->cgd.scalemin = cg_te_scalemin->value;
+    pCurrSpawnthing->cgd.scalemax = cg_te_scalemax->value;
+    if (pCurrSpawnthing->cgd.scalemin || pCurrSpawnthing->cgd.scalemax) {
+        pCurrSpawnthing->cgd.flags |= T_RANDSCALE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_RANDSCALE;
+    }
+
+    if (cg_te_dietouch->integer) {
+        pCurrSpawnthing->cgd.flags |= T_DIETOUCH;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_DIETOUCH;
+    }
+
+    if (cg_te_fade->integer) {
+        pCurrSpawnthing->cgd.flags |= T_FADE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_FADE;
+    }
+
+    if (cg_te_fadedelay->integer > 0) {
+        pCurrSpawnthing->cgd.flags |= T_FADE;
+        pCurrSpawnthing->cgd.fadedelay = cg_te_fadedelay->value * 1000.0;
+    }
+
+    if (cg_te_fadein->integer > 0) {
+        pCurrSpawnthing->cgd.flags |= T_FADEIN;
+        pCurrSpawnthing->cgd.fadeintime = cg_te_fadein->value * 1000.0;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_FADEIN;
+    }
+
+    if (cg_te_circle->integer) {
+        pCurrSpawnthing->cgd.flags |= T_CIRCLE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_CIRCLE;
+    }
+
+    if (cg_te_sphere->integer) {
+        pCurrSpawnthing->cgd.flags |= T_SPHERE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_SPHERE;
+    }
+
+    if (cg_te_insphere->integer) {
+        pCurrSpawnthing->cgd.flags |= T_INWARDSPHERE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_INWARDSPHERE;
+    }
+
+    if (cg_te_align->integer) {
+        pCurrSpawnthing->cgd.flags |= T_ALIGN;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_ALIGN;
+    }
+
+    if (cg_te_alignstretch_scale->integer) {
+        pCurrSpawnthing->cgd.flags |= T_ALIGN;
+        pCurrSpawnthing->cgd.flags2 |= T2_ALIGNSTRETCH;
+        pCurrSpawnthing->cgd.scale2 = cg_te_alignstretch_scale->value;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_ALIGNSTRETCH;
+    }
+
+    if (cg_te_flickeralpha->integer) {
+        pCurrSpawnthing->cgd.flags |= T_FLICKERALPHA;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_FLICKERALPHA;
+    }
+
+    if (cg_te_randomroll->integer) {
+        pCurrSpawnthing->cgd.flags |= T_RANDOMROLL;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_RANDOMROLL;
+    }
+
+    if (cg_te_volumetric->integer) {
+        pCurrSpawnthing->cgd.flags2 |= T2_VOLUMETRIC;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_VOLUMETRIC;
+    }
+
+    if (cg_te_collision->integer == 2) {
+        pCurrSpawnthing->cgd.flags |= T_COLLISION;
+        pCurrSpawnthing->cgd.collisionmask = CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_WATER | CONTENTS_SOLID;
+    } else if (cg_te_collision->integer == 1 || (pCurrSpawnthing->cgd.flags & T_DIETOUCH)) {
+        pCurrSpawnthing->cgd.flags &= ~T_COLLISION;
+        pCurrSpawnthing->cgd.collisionmask = CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_SOLID;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_COLLISION;
+        pCurrSpawnthing->cgd.collisionmask = 0;
+    }
+
+    if (cg_te_swarm_freq->integer > 0 && cg_te_swarm_maxspeed->value > 0 && cg_te_swarm_delta->value > 0) {
+        pCurrSpawnthing->cgd.swarmfreq     = cg_te_swarm_freq->integer;
+        pCurrSpawnthing->cgd.swarmmaxspeed = cg_te_swarm_maxspeed->value;
+        pCurrSpawnthing->cgd.swarmdelta    = cg_te_swarm_delta->value;
+        pCurrSpawnthing->cgd.flags |= T_SWARM;
+        pCurrSpawnthing->cgd.flags &= ~T_SPHERE;
+    }
+
+    if (pCurrCommand) {
+        Event *pEvent;
+        int    argcount;
+
+        pCurrCommand->fCommandTime = cg_te_command_time->value;
+        pCurrCommand->endfcn       = &ClientGameCommandManager::TestEffectEndFunc;
+
+        if (pCurrCommand->pEvent) {
+            delete pCurrCommand->pEvent;
+            pCurrCommand->pEvent = NULL;
+        }
+
+        if (Q_stricmp(cg_te_singlelinecommand->string, "")) {
+            cgi.Cmd_TokenizeString(cg_te_singlelinecommand->string);
+
+            pEvent = new Event(cgi.Argv(0));
+
+            argcount = cgi.Argc();
+            for (i = 1; i < argcount; i++) {
+                pEvent->AddToken(cgi.Argv(i));
+            }
+
+            pCurrCommand->pEvent = pEvent;
+        }
+    }
 }
 
 void CG_UpdateTestEmitter(void)
 {
-    // FIXME: unimplemented
+    int            count;
+    Vector         vAng;
+    Vector         delta;
+    Vector         end, end2;
+    Vector         axis[3];
+    emittertime_t *et = NULL;
+
+    if (VectorCompare(te_vEmitterOrigin, vec_zero) || te_iNumCommands < 1) {
+        cgi.Cvar_Set("cg_te_mode_name", "Temp Emitter Off");
+        return;
+    }
+
+    cgi.Cvar_Set("cg_te_currCommand", va("%i", te_iCurrCommand + 1));
+    cgi.Cvar_Set("cg_te_numCommands", va("%i", te_iNumCommands));
+
+    switch (cg_te_mode->integer) {
+    case TE_MODE_MODEL_ANIM:
+        cgi.Cvar_Set("cg_te_mode_name", "Model Anim Mode");
+        break;
+    case TE_MODE_MODEL_INIT:
+        cgi.Cvar_Set("cg_te_mode_name", "Model Init Mode");
+        break;
+    case TE_MODE_SFX:
+        cgi.Cvar_Set("cg_te_mode_name", "SFX Mode");
+        break;
+    default:
+        cgi.Cvar_Set("cg_te_mode_name", "Emitter Mode");
+        break;
+    }
+
+    vAng[0] = cg_te_xangles->value;
+    vAng[1] = cg_te_yangles->value;
+    vAng[2] = cg_te_zangles->value;
+    AnglesToAxis(vAng, (vec3_t *)axis);
+
+    end = te_vEmitterOrigin + axis[0] * 50;
+    cgi.R_DebugLine(te_vEmitterOrigin, end, 1.0, 0.0, 0.0, 1.0);
+
+    end2 = end + axis[1] * 16 + axis[0] * -16;
+    cgi.R_DebugLine(end, end2, 1.0, 0.0, 0.0, 1.0);
+
+    end2 = end + axis[1] * -16 + axis[0] * -16;
+    cgi.R_DebugLine(end, end2, 1.0, 0.0, 0.0, 1.0);
+
+    if (cg_te_emittermodel->string[0]) {
+        //
+        // Initialize the entity
+        //
+
+        memset(&te_refEnt, 0, sizeof(te_refEnt));
+        te_refEnt.parentEntity  = ENTITYNUM_NONE;
+        te_refEnt.scale         = 1.0;
+        te_refEnt.shaderRGBA[0] = -1;
+        te_refEnt.shaderRGBA[1] = -1;
+        te_refEnt.shaderRGBA[2] = -1;
+        te_refEnt.shaderRGBA[3] = -1;
+
+        //
+        // Setup transforms
+        //
+
+        AxisCopy((const vec3_t *)axis, te_refEnt.axis);
+        VectorCopy(te_vEmitterOrigin, te_refEnt.origin);
+        VectorCopy(te_vEmitterOrigin, te_refEnt.lightingOrigin);
+
+        //
+        // Setup the model
+        //
+
+        te_refEnt.radius = 4.0;
+        te_refEnt.hModel = cgi.R_RegisterModel(cg_te_emittermodel->string);
+        te_refEnt.tiki   = cgi.R_Model_GetHandle(te_refEnt.hModel);
+
+        //
+        // Setup the shader
+        //
+
+        if (!Q_stricmp(cg_te_emittermodel->string, "*beam")) {
+            te_refEnt.reType       = RT_BEAM;
+            te_refEnt.customShader = cgi.R_RegisterShader("beamshader");
+        } else if (strstr(cg_te_emittermodel->string, ".spr")) {
+            te_refEnt.reType = RT_SPRITE;
+        } else {
+            te_refEnt.reType = RT_MODEL;
+        }
+
+        //
+        // Setup the animation
+        //
+
+        te_refEnt.frameInfo[0].index = cgi.Anim_NumForName(te_refEnt.tiki, "idle");
+        ;
+        if (te_refEnt.frameInfo[0].index < 0) {
+            te_refEnt.frameInfo[0].index = 0;
+        }
+        te_refEnt.frameInfo[0].weight = 1.0;
+        te_refEnt.frameInfo[0].time   = 0.0;
+        te_refEnt.actionWeight        = 1.0;
+        te_refEnt.entityNumber        = ENTITYNUM_NONE;
+
+        if (te_refEnt.reType == RT_SPRITE) {
+            cgi.R_AddRefSpriteToScene(&te_refEnt);
+        } else {
+            cgi.R_AddRefEntityToScene(&te_refEnt, ENTITYNUM_NONE);
+        }
+    } else {
+        te_refEnt.scale = 0.0;
+    }
+
+    cg_te_currCommand = cgi.Cvar_Get("cg_te_currCommand", "0", 0);
+    cg_te_numCommands = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
+
+    if (cg_te_mode->integer != TE_MODE_EMITTER) {
+        return;
+    }
+
+    pCurrCommand = pTesteffect->m_commands[te_iCurrCommand];
+    if (!pCurrCommand) {
+        return;
+    }
+
+    pCurrSpawnthing = pCurrCommand->emitter;
+    if (!pCurrSpawnthing) {
+        return;
+    }
+
+    CG_SetTestEmitterValues();
+
+    et = pCurrSpawnthing->GetEmitTime(1);
+    if (!et->active) {
+        return;
+    }
+
+    pCurrSpawnthing->cgd.createTime = cg.time;
+
+    if (et->last_emit_time > 0 && pCurrSpawnthing->spawnRate != 0) {
+        float dtime;
+        float lerp;
+        float lerpfrac;
+
+        dtime = cg.time - et->last_emit_time;
+        count = dtime / pCurrSpawnthing->spawnRate;
+        if (!count) {
+            return;
+        }
+
+        if (count == 1) {
+            commandManager.SpawnEffect(1, pCurrSpawnthing);
+            et->last_emit_time = cg.time;
+        } else {
+            lerpfrac = 1.0 / count;
+            for (lerp = 0.0;; lerp = lerp + lerpfrac) {
+                if (dtime <= pCurrSpawnthing->spawnRate) {
+                    break;
+                }
+
+                et->last_emit_time = cg.time;
+                dtime              = dtime - pCurrSpawnthing->spawnRate;
+                if (et->lerp_emitter) {
+                    pCurrSpawnthing->cgd.origin = et->oldorigin + delta * lerp;
+                }
+
+                commandManager.SpawnEffect(1, pCurrSpawnthing);
+            }
+        }
+    } else {
+        et->last_emit_time = cg.time;
+    }
+
+    pCurrCommand    = NULL;
+    pCurrSpawnthing = NULL;
 }
 
 void CG_SortEffectCommands()
@@ -557,7 +1043,7 @@ void CG_TriggerTestEmitter_f(void)
     pCurrSpawnthing = NULL;
 }
 
-void CG_DumpBaseAndAmplitude(str *buff, char *prefix, Vector *base, Vector *amplitude)
+void CG_DumpBaseAndAmplitude(str *buff, const char *prefix, Vector *base, Vector *amplitude)
 {
     int i;
 
@@ -585,19 +1071,829 @@ void CG_DumpBaseAndAmplitude(str *buff, char *prefix, Vector *base, Vector *ampl
 
 void CG_DumpEmitter_f(void)
 {
-    // FIXME: unimplemented
+    cvar_t *filename;
+    str     buff;
+    str     sTabbing;
+    str     old_buff;
+    int     iCurrCommand;
+    int     iTagNum;
+
+    if (te_iNumCommands < 1) {
+        return;
+    }
+
+    filename = cgi.Cvar_Get("cg_te_filename", "dump/emitter.txt", 0);
+    switch (cg_te_mode->integer) {
+    case TE_MODE_MODEL_ANIM:
+        sTabbing = "\t\t\t";
+        break;
+    case TE_MODE_MODEL_INIT:
+        sTabbing = "\t\t";
+        break;
+    case TE_MODE_SFX:
+        sTabbing = "\t\t";
+        break;
+    default:
+        sTabbing = "\t\t";
+        break;
+    }
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    if (cg_te_mode->integer == TE_MODE_EMITTER) {
+        iCurrCommand = te_iCurrCommand;
+    } else {
+        iCurrCommand = 0;
+    }
+
+    do {
+        pCurrCommand = pTesteffect->m_commands[iCurrCommand];
+        if (!pCurrCommand) {
+            return;
+        }
+
+        pCurrSpawnthing = pCurrCommand->emitter;
+        if (!pCurrSpawnthing) {
+            return;
+        }
+
+        CG_GetEffectCommandCvars(iCurrCommand);
+        CG_SetTestEmitterValues();
+
+        if (te_refEnt.scale > 0 && Q_stricmp(cg_te_tag->string, "") && cg_te_mode->integer != TE_MODE_SFX) {
+            iTagNum = cgi.Tag_NumForName(te_refEnt.tiki, cg_te_tag->string);
+        } else {
+            iTagNum = -1;
+        }
+
+        switch (cg_te_mode->integer) {
+        case TE_MODE_MODEL_ANIM:
+            buff += va("%s0", sTabbing.c_str());
+
+            if (pCurrCommand->fCommandTime > 0) {
+                buff += va("commanddelay %g ", pCurrCommand->fCommandTime);
+            }
+
+            if (iTagNum != -1) {
+                buff += va("tagspawn %s\n", cg_te_tag->string);
+            } else {
+                buff += "originspawn\n";
+            }
+            break;
+        case TE_MODE_MODEL_INIT:
+            buff += sTabbing;
+
+            if (pCurrCommand->fCommandTime > 0) {
+                buff += va("commanddelay %g ", pCurrCommand->fCommandTime);
+            }
+
+            if (iTagNum != -1) {
+                buff += va("tagspawn %s\n", cg_te_tag->string);
+            } else {
+                buff += "originspawn\n";
+            }
+            break;
+        case TE_MODE_SFX:
+            buff += sTabbing;
+
+            if (pCurrCommand->fCommandTime > 0) {
+                buff += va("delayedsfx %.3g originspawn\n", pCurrCommand->fCommandTime);
+            } else {
+                buff += "sfx originspawn\n";
+            }
+            break;
+        default:
+            if (iTagNum != -1) {
+                buff += va("%stagemitter %s name%i\n", sTabbing.c_str(), cg_te_tag->string, iCurrCommand + 1);
+            } else {
+                buff += va("%soriginemitter name%i\n", sTabbing.c_str(), iCurrCommand + 1);
+            }
+            break;
+        }
+
+        buff += sTabbing + "(\n";
+
+        if (pCurrSpawnthing->fMinRangeSquared > 0) {
+            buff +=
+                va("%s\tspawnrange %i %i\n",
+                   sTabbing.c_str(),
+                   sqrt(pCurrSpawnthing->fMinRangeSquared),
+                   sqrt(pCurrSpawnthing->fMaxRangeSquared));
+        } else if (pCurrSpawnthing->fMaxRangeSquared > 0) {
+            buff += va("%s\tspawnrange %i\n", sTabbing.c_str(), sqrt(pCurrSpawnthing->fMaxRangeSquared));
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) {
+            buff += sTabbing + "\tvolumetric\n";
+        }
+
+        buff += va("%s\tspawnrate %g\n", sTabbing.c_str(), cg_te_spawnrate->value);
+        buff += va("%s\tmodel %s\n", sTabbing.c_str(), pCurrSpawnthing->m_modellist.ObjectAt(1).c_str());
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && pCurrSpawnthing->count > 1) {
+            buff += va("%s\tcount %i\n", sTabbing.c_str(), pCurrSpawnthing->count);
+        }
+
+        if (pCurrSpawnthing->cgd.alpha != 1.0) {
+            buff += va("%s\talpha %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.alpha);
+        }
+
+        buff +=
+            va("%s\tcolor %g %g %g\n",
+               sTabbing.c_str(),
+               pCurrSpawnthing->cgd.color[0],
+               pCurrSpawnthing->cgd.color[1],
+               pCurrSpawnthing->cgd.color[2]);
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC)) {
+            if (pCurrSpawnthing->cgd.flags2 & T2_VARYCOLOR) {
+                buff += sTabbing + "\tvarycolor\n";
+            }
+            if (pCurrSpawnthing->cgd.flags2 & T2_SPRITEGRIDLIGHTING) {
+                buff += sTabbing + "\tspritegridlighting\n";
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_COLLISION) {
+            if (pCurrSpawnthing->cgd.collisionmask & CONTENTS_WATER) {
+                buff += sTabbing + "\tcollision water\n";
+            } else {
+                buff += sTabbing + "\tcollision\n";
+            }
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && (pCurrSpawnthing->cgd.flags & T_COLLISION)) {
+            buff += va("%s\tbouncefactor %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.bouncefactor);
+        }
+
+        if (pCurrSpawnthing->cgd.scale != 1.0) {
+            buff += va("%s\tscale %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scale);
+        }
+
+        buff += va("%s\tlife %g\n", sTabbing.c_str(), cg_te_life->value);
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && pCurrSpawnthing->cgd.scaleRate) {
+            buff + va("%s\tscalerate %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scaleRate);
+        }
+
+        if (pCurrSpawnthing->sphereRadius) {
+            if (cg_te_cone_height->value) {
+                buff +=
+                    va("%s\tcone %g %g\n", sTabbing.c_str(), pCurrSpawnthing->coneHeight, pCurrSpawnthing->sphereRadius
+                    );
+            } else {
+                buff += va("%s\tradius %g\n", sTabbing.c_str(), pCurrSpawnthing->sphereRadius);
+            }
+        }
+
+        if (pCurrSpawnthing->forwardVelocity) {
+            buff += va("%s\tvelocity %g\n", sTabbing.c_str(), pCurrSpawnthing->forwardVelocity);
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_RADIALVELOCITY) {
+            buff +=
+                va("%s\tradialvelocity %g %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.velocity[0],
+                   pCurrSpawnthing->cgd.velocity[1],
+                   pCurrSpawnthing->cgd.velocity[2]);
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_RANDVELAXIS) {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\trandvelaxis", sTabbing.c_str()),
+                &pCurrSpawnthing->randvel_base,
+                &pCurrSpawnthing->randvel_amplitude
+            );
+        } else {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\trandvel", sTabbing.c_str()),
+                &pCurrSpawnthing->randvel_base,
+                &pCurrSpawnthing->randvel_amplitude
+            );
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_CLAMP_VEL) {
+            buff +=
+                va("%s\tclampvel %g %g %g %g %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.minVel[0],
+                   pCurrSpawnthing->cgd.maxVel[0],
+                   pCurrSpawnthing->cgd.minVel[1],
+                   pCurrSpawnthing->cgd.maxVel[1],
+                   pCurrSpawnthing->cgd.minVel[2],
+                   pCurrSpawnthing->cgd.maxVel[2]);
+        } else if (pCurrSpawnthing->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
+            buff +=
+                va("%s\tclampvelaxis %g %g %g %g %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.minVel[0],
+                   pCurrSpawnthing->cgd.maxVel[0],
+                   pCurrSpawnthing->cgd.minVel[1],
+                   pCurrSpawnthing->cgd.maxVel[1],
+                   pCurrSpawnthing->cgd.minVel[2],
+                   pCurrSpawnthing->cgd.maxVel[2]);
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) {
+            if (pCurrSpawnthing->cgd.accel[0] || pCurrSpawnthing->cgd.accel[1] || pCurrSpawnthing->cgd.accel[2]) {
+                buff +=
+                    va("%s\tsmokeparms %g %g %g\n",
+                       sTabbing.c_str(),
+                       pCurrSpawnthing->cgd.accel[0],
+                       pCurrSpawnthing->cgd.accel[1],
+                       pCurrSpawnthing->cgd.accel[2]);
+            }
+        } else {
+            if (pCurrSpawnthing->cgd.accel[0] || pCurrSpawnthing->cgd.accel[1] || pCurrSpawnthing->cgd.accel[2]) {
+                buff +=
+                    va("%s\taccel %g %g %g\n",
+                       sTabbing.c_str(),
+                       pCurrSpawnthing->cgd.accel[0],
+                       pCurrSpawnthing->cgd.accel[1],
+                       pCurrSpawnthing->cgd.accel[2]);
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_FRICTION) {
+            buff += va("%s\tfriction %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.friction);
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_SPIN) {
+            buff += va("%s\tfriction %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.spin_rotation);
+        }
+
+        CG_DumpBaseAndAmplitude(
+            &buff,
+            va("%s\toffset", sTabbing.c_str()),
+            &pCurrSpawnthing->origin_offset_base,
+            &pCurrSpawnthing->origin_offset_amplitude
+        );
+        CG_DumpBaseAndAmplitude(
+            &buff,
+            va("%s\toffsetalongaxis", sTabbing.c_str()),
+            &pCurrSpawnthing->axis_offset_base,
+            &pCurrSpawnthing->axis_offset_amplitude
+        );
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && (pCurrSpawnthing->cgd.flags & T_ANGLES)) {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\tangles", sTabbing.c_str()),
+                &pCurrSpawnthing->cgd.angles,
+                &pCurrSpawnthing->angles_amplitude
+            );
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_AMOVE) {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\tavelocity", sTabbing.c_str()),
+                &pCurrSpawnthing->avelocity_base,
+                &pCurrSpawnthing->avelocity_amplitude
+            );
+        }
+
+        if (pCurrSpawnthing->cgd.scalemin) {
+            buff += va("%s\tscalemin %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scalemin);
+        }
+        if (pCurrSpawnthing->cgd.scalemax) {
+            buff += va("%s\tscalemax %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scalemax);
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_DIETOUCH) {
+            buff += sTabbing + "\tdietouch\n";
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC)) {
+            if (pCurrSpawnthing->cgd.fadedelay > 0) {
+                buff += va("%s\tfadedelay %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.fadedelay / 1000.0);
+            } else if (pCurrSpawnthing->cgd.flags & T_FADE) {
+                buff += sTabbing + "\tfade\n";
+            }
+
+            if (pCurrSpawnthing->cgd.flags & T_FADEIN) {
+                buff += va("%s\tfadein %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.fadeintime / 1000.0);
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_CIRCLE) {
+            buff += sTabbing + "\tcircle\n";
+        }
+        if (pCurrSpawnthing->cgd.flags & T_SPHERE) {
+            buff += sTabbing + "\tsphere\n";
+        }
+        if (pCurrSpawnthing->cgd.flags & T_INWARDSPHERE) {
+            buff += sTabbing + "\tinwardsphere\n";
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC)) {
+            if (pCurrSpawnthing->cgd.flags2 & T2_ALIGNSTRETCH) {
+                buff += va("%s\talignstretch %g", sTabbing.c_str(), pCurrSpawnthing->cgd.scale2);
+            } else if (pCurrSpawnthing->cgd.flags & T_ALIGN) {
+                buff += sTabbing + "\talign\n";
+            }
+
+            if (pCurrSpawnthing->cgd.flags & T_FLICKERALPHA) {
+                buff += sTabbing + "\tflickeralpha\n";
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_RANDOMROLL) {
+            buff += sTabbing + "\trandomroll\n";
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && (pCurrSpawnthing->cgd.flags & T_SWARM)) {
+            buff +=
+                va("%s\tswarm %i %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.swarmfreq,
+                   pCurrSpawnthing->cgd.swarmmaxspeed,
+                   pCurrSpawnthing->cgd.swarmdelta);
+        }
+
+        buff += sTabbing + ")\n\n";
+
+        iCurrCommand++;
+    } while (iCurrCommand < te_iNumCommands && cg_te_mode->integer != TE_MODE_EMITTER);
+
+    char *buffer;
+    str   szTmp;
+    int   iLen;
+
+    iLen = cgi.FS_ReadFile(filename->string, (void **)&buffer, qfalse);
+    if (iLen != -1) {
+        char FBuf[512];
+
+        COM_StripExtension(filename->string, FBuf, sizeof(FBuf));
+        szTmp = FBuf;
+        szTmp += ".old";
+
+        cgi.FS_WriteFile(szTmp.c_str(), buffer, iLen);
+    }
+
+    cgi.FS_WriteTextFile(filename->string, buff.c_str(), buff.length());
+
+    pCurrSpawnthing = NULL;
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
 }
 
 void CG_LoadBaseAndAmplitude(
     char **pBufer, char *szCvarX, char *szCvarY, char *szCvarZ, char *szCvarXAmp, char *szCvarYAmp, char *szCvarZAmp
 )
 {
-    // FIXME: unimplemented
+    char com_token[MAX_TOKEN_CHARS];
+
+    const char *szCvarList[]    = {szCvarX, szCvarY, szCvarZ};
+    const char *szCvarAmpList[] = {szCvarXAmp, szCvarYAmp, szCvarZAmp};
+    int         i;
+
+    // Fixed in OPM
+    //  Use a loop rather than a copy-paste
+
+    for (i = 0; i < 3; i++) {
+        Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+        if (!com_token[0]) {
+            return;
+        }
+
+        if (!Q_stricmp(com_token, "random")) {
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+
+            cgi.Cvar_Set(szCvarAmpList[i], com_token);
+        } else if (!Q_stricmp(com_token, "crandom")) {
+            float fTmp;
+
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+
+            fTmp = atof(com_token);
+            cgi.Cvar_Set(szCvarList[i], va("%g", -fTmp));
+            cgi.Cvar_Set(szCvarAmpList[i], va("%g", fTmp * 2.0));
+        } else if (!Q_stricmp(com_token, "range")) {
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+            cgi.Cvar_Set(szCvarList[i], com_token);
+
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+            cgi.Cvar_Set(szCvarAmpList[i], com_token);
+        }
+    }
 }
 
 void CG_LoadEmitter_f(void)
 {
-    // FIXME: unimplemented
+    int     iCommandCount;
+    char   *buffer;
+    char   *bufstart;
+    char    com_token[MAX_TOKEN_CHARS];
+    cvar_t *filename;
+
+    if (te_iNumCommands <= 0) {
+        CG_TestEmitter_f();
+    } else {
+        CG_SaveEffectCommandCvars(te_iCurrCommand);
+    }
+    filename = cgi.Cvar_Get("cg_te_filename", "dump/emitter.txt", 0);
+
+    if (cgi.FS_ReadFile(filename->string, (void **)&buffer, qfalse) == -1) {
+        return;
+    }
+
+    Com_Printf("Loading emitter dump '%s'\n", filename->string);
+    bufstart      = buffer;
+    iCommandCount = 0;
+
+    while ((Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token))), com_token[0]) {
+        iCommandCount++;
+        if (te_iNumCommands < iCommandCount) {
+            CG_NewEmitterCommand_f();
+        }
+
+        te_iCurrCommand = iCommandCount - 1;
+        pCurrCommand    = pTesteffect->m_commands[iCommandCount - 1];
+        if (!pCurrCommand) {
+            Com_Printf("Error loading effect dump\n");
+            break;
+        }
+
+        pCurrSpawnthing = pCurrCommand->emitter;
+        commandManager.InitializeSpawnthing(pCurrSpawnthing);
+        pCurrCommand->fCommandTime = 0.0;
+        CG_ResetEffectCommandCvars();
+
+        if (com_token[0] == '0') {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 1));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+        } else if (!Q_stricmp(com_token, "delayedsfx") || !Q_stricmp(com_token, "sfx")) {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 3));
+            if (!Q_stricmp(com_token, "delayedsfx")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (!com_token[0]) {
+                    Com_Printf("Error loading effect dump\n");
+                    break;
+                }
+                cgi.Cvar_Set("cg_te_command_time", com_token);
+
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+                if (!com_token[0]) {
+                    Com_Printf("Error loading effect dump\n");
+                    break;
+                }
+            }
+        } else if (!Q_stricmp(com_token, "tagemitter") || !Q_stricmp(com_token, "originemitter")) {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 0));
+        } else {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 2));
+        }
+
+        if (!Q_stricmp(com_token, "commanddelay")) {
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+            cgi.Cvar_Set("cg_te_command_time", com_token);
+
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+        }
+
+        if (!Q_stricmpn(com_token, "tag", 3)) {
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+            cgi.Cvar_Set("cg_te_tag", com_token);
+        }
+
+        while (COM_ParseExt(&buffer, qfalse)) {}
+
+        Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+        if (Q_stricmp(com_token, "(")) {
+            Com_Printf("Error loading effect dump\n");
+            break;
+        }
+
+        Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+        if (!com_token[0]) {
+            Com_Printf("Error loading effect dump\n");
+            break;
+        }
+
+        while (Q_stricmp(com_token, ")")) {
+            if (!Q_stricmp(com_token, "spawnrange")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_spawnrange_a", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_spawnrange_b", com_token);
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "volumetric")) {
+                cgi.Cvar_Set("cg_te_volumetric", "1");
+            } else if (!Q_stricmp(com_token, "spawnrate")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_spawnrate", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "model")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_model", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "count")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_count", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "alpha")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alpha", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "color")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_color_r", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_color_g", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_color_b", com_token);
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "varycolor")) {
+                cgi.Cvar_Set("cg_te_varycolor", "1");
+            } else if (!Q_stricmp(com_token, "spritegridlighting")) {
+                cgi.Cvar_Set("cg_te_spritegridlighting", "1");
+            } else if (!Q_stricmp(com_token, "collision")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_collision", "1");
+                } else {
+                    cgi.Cvar_Set("cg_te_collision", "1");
+                }
+            } else if (!Q_stricmp(com_token, "bouncefactor")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alpha", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "scale")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alpha", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "life")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_life", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "scalerate")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_scalerate", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "radius")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_radius", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "cone")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_cone_height", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_radius", com_token);
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "velocity")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_forwardvel", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "radialvelocity")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_radial_scale", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_radial_min", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_radial_max", com_token);
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "randvelaxis") || !Q_stricmp(com_token, "randvel")) {
+                if (!Q_stricmp(com_token, "randvelaxis")) {
+                    cgi.Cvar_Set("cg_te_randaxis", "1");
+
+                    CG_LoadBaseAndAmplitude(
+                        &buffer,
+                        "cg_te_randvelbase_x",
+                        "cg_te_randvelbase_y",
+                        "cg_te_randvelbase_z",
+                        "cg_te_randvelamp_x",
+                        "cg_te_randvelamp_y",
+                        "cg_te_randvelamp_z"
+                    );
+                }
+            } else if (!Q_stricmp(com_token, "clampvel") || !Q_stricmp(com_token, "clampvelaxis")) {
+                if (!Q_stricmp(com_token, "clampvelaxis")) {
+                    cgi.Cvar_Set("cg_te_clampvelaxis", "1");
+                }
+
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_clampvelmin_x", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_clampvelmax_x", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_clampvelmin_y", com_token);
+
+                            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                            if (com_token[0]) {
+                                cgi.Cvar_Set("cg_te_clampvelmax_y", com_token);
+
+                                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                                if (com_token[0]) {
+                                    cgi.Cvar_Set("cg_te_clampvelmin_z", com_token);
+
+                                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                                    if (com_token[0]) {
+                                        cgi.Cvar_Set("cg_te_clampvelmax_z", com_token);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "accel") || !Q_stricmp(com_token, "smokeparms")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_accel_x", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_accel_y", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_accel_z", com_token);
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "friction")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_friction", com_token);
+                }
+                // Added in 2.0
+                //  spin
+            } else if (!Q_stricmp(com_token, "spin")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_spin", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "offset")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_offsbase_x",
+                    "cg_te_offsbase_y",
+                    "cg_te_offsbase_z",
+                    "cg_te_offsamp_x",
+                    "cg_te_offsamp_y",
+                    "cg_te_offsamp_z"
+                );
+            } else if (!Q_stricmp(com_token, "offsetalongaxis")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_axisoffsbase_x",
+                    "cg_te_axisoffsbase_y",
+                    "cg_te_axisoffsbase_z",
+                    "cg_te_axisoffsamp_x",
+                    "cg_te_axisoffsamp_y",
+                    "cg_te_axisoffsamp_z"
+                );
+            } else if (!Q_stricmp(com_token, "angles")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_anglesbase_p",
+                    "cg_te_anglesbase_y",
+                    "cg_te_anglesbase_r",
+                    "cg_te_anglesamp_p",
+                    "cg_te_anglesamp_y",
+                    "cg_te_anglesamp_r"
+                );
+            } else if (!Q_stricmp(com_token, "avelocity")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_avelbase_p",
+                    "cg_te_avelbase_y",
+                    "cg_te_avelbase_r",
+                    "cg_te_avelamp_p",
+                    "cg_te_avelamp_y",
+                    "cg_te_avelamp_r"
+                );
+            } else if (!Q_stricmp(com_token, "scalemin")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_scalemin", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "scalemax")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_scalemax", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "dietouch")) {
+                cgi.Cvar_Set("cg_te_dietouch", "1");
+            } else if (!Q_stricmp(com_token, "fade")) {
+                cgi.Cvar_Set("cg_te_fade", "1");
+            } else if (!Q_stricmp(com_token, "fadedelay")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_fadedelay", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "fadein")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_fadein", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "circle")) {
+                cgi.Cvar_Set("cg_te_circle", "1");
+            } else if (!Q_stricmp(com_token, "sphere")) {
+                cgi.Cvar_Set("cg_te_sphere", "1");
+            } else if (!Q_stricmp(com_token, "inwardsphere")) {
+                cgi.Cvar_Set("cg_te_insphere", "1");
+            } else if (!Q_stricmp(com_token, "align")) {
+                cgi.Cvar_Set("cg_te_align", "1");
+            } else if (!Q_stricmp(com_token, "alignstretch")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alignstretch_scale", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "flickeralpha")) {
+                cgi.Cvar_Set("cg_te_flickeralpha", "1");
+            } else if (!Q_stricmp(com_token, "randomroll")) {
+                cgi.Cvar_Set("cg_te_randomroll", "1");
+            } else if (!Q_stricmp(com_token, "swarm")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_swarm_freq", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_swarm_maxspeed", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_swarm_delta", com_token);
+                        }
+                    }
+                }
+            }
+        }
+
+        CG_SaveEffectCommandCvars(te_iCurrCommand);
+    }
+
+    cgi.FS_FreeFile(bufstart);
+    return;
 }
 
 void CG_TestEmitter_f(void)
@@ -617,6 +1913,8 @@ void CG_TestEmitter_f(void)
         te_iNumCommands++;
     }
 
+    assert(pCurrSpawnthing);
+
     VectorMA(cg.refdef.vieworg, 100.0, cg.refdef.viewaxis[0], te_vEmitterOrigin);
     VectorSet(angles, 0, cg.refdefViewAngles[1], 0);
     AnglesToAxis(angles, pCurrSpawnthing->axis);

From 603444a69f0a3cf943c8cceb8e8fdc7145e20129 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:19:36 +0200
Subject: [PATCH 0795/2040] Fix an issue where the remaining time would reach
 0:00 and the match would never end

See #287, this occurred when the fraglimit was defined.
---
 code/fgame/dm_manager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 1915b26e..6bb78e26 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1219,7 +1219,9 @@ bool DM_Manager::CheckEndMatch()
                 G_BeginIntermission2();
                 return true;
             }
-        } else if (timelimit->integer && level.inttime >= 60000 * timelimit->integer) {
+        }
+
+        if (timelimit->integer && level.inttime >= timelimit->integer * 60000) {
             G_BeginIntermission2();
             return true;
         } else {

From e151c6eb15e6e01b0a4ef79ca1417af35a4297cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 23:32:08 +0200
Subject: [PATCH 0796/2040] Update documentation

---
 docs/getting_started_running.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 98170136..f1e32f7c 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -18,15 +18,17 @@ You can now start a local OpenMOHAA server or play on a server.
 
 ## User data location
 
-The location of user data, like console logs, saves and config files can be found in different locations depending on the platform:
+The location of user-writable data, like the console logfile, saves and configuration files can be found in different locations depending on the platform:
 
 - `%APPDATA%\openmohaa\<game_name>` on Windows
 - `~/.openmohaa/<game_name>` on Linux
 
-This has two advantages:
+This is by design since ioquake3 and has two advantages:
 - On a multi-user system, each user will have their own configuration file
 - It doesn't overwrite the existing MOHAA configuration in the MOHAA installation directory.
 
+The location of user-writable data can be changed manually by setting the `fs_homepath` variable in the command-line argument. The value can be a relative path (relative to the current working directory) or an absolute path.
+
 Note that the configuration file isn't created nor written automatically on a dedicated server (**omohaaded**).
 
 ## Playing with bots

From e9727479694db6bf35fa80fd17080524cfe6bb0b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 23:43:29 +0200
Subject: [PATCH 0797/2040] Update documentation

This adds an example for using fs_homepath
---
 docs/getting_started_running.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index f1e32f7c..0ff0e46c 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -27,7 +27,12 @@ This is by design since ioquake3 and has two advantages:
 - On a multi-user system, each user will have their own configuration file
 - It doesn't overwrite the existing MOHAA configuration in the MOHAA installation directory.
 
-The location of user-writable data can be changed manually by setting the `fs_homepath` variable in the command-line argument. The value can be a relative path (relative to the current working directory) or an absolute path.
+The location of user-writable data can be changed manually by setting the `fs_homepath` variable in the command-line argument. This is useful when running a dedicated server that can only use the game directory to store/read data. The value can be a relative path (relative to the current working directory) or an absolute path. Example:
+- `+set fs_homepath Z:\openmohaa_data` data will be written inside the fully qualified path `Z:\openmohaa_data`
+- `+set fs_homepath homedata` will use the subfolder `homedata` in the process current working directory to write data (will be created automatically)
+- `+set fs_homepath .` not recommended, will write data inside the process current working directory
+
+The game directory is intended to be read-only, which is the reason why the home path exists. This prevents existing files in the game directory from being accidentally overwritten.
 
 Note that the configuration file isn't created nor written automatically on a dedicated server (**omohaaded**).
 

From 0840cdd83ab0534abbae1198d33f7e379e307f5e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 18:43:40 +0200
Subject: [PATCH 0798/2040] Restore the old behavior where the bullet would hit
 all entities in sight. Only works when targeting mohaa version 1.x

Fixes #348. Since 2.0, bullet trace stops after the first hit entity even if it's a trigger, which can be an issue on some SP maps.
---
 code/fgame/weaputils.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index e138412d..d1ed8bee 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2186,7 +2186,6 @@ float BulletAttack(
                 );
 
                 vTmpEnd = trace.endpos;
-                vTraceEnd = vTmpEnd;
 
                 if (bThroughThing) {
                     bThroughThing = qfalse;
@@ -2356,6 +2355,7 @@ float BulletAttack(
                 if (trace.fraction < 1.0f) {
                     if (trace.surfaceFlags & (SURF_FOLIAGE | SURF_GLASS | SURF_PUDDLE | SURF_PAPER)
                         || trace.contents & (CONTENTS_CLAYPIDGEON | CONTENTS_WATER)
+                        || (g_protocol < protocol_e::PROTOCOL_MOHTA && trace.startsolid)
                         || (bulletlarge && trace.ent && trace.ent->r.contents & CONTENTS_BBOX && !trace.ent->r.bmodel
                             && trace.ent->entity->takedamage)
                         || ((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
@@ -2420,12 +2420,12 @@ float BulletAttack(
                         trace.fraction = 1.f;
                         bBulletDone    = qtrue;
                     }
+                }
 
-                    if (oldfrac != trace.fraction) {
-                        oldfrac = trace.fraction;
-                    } else {
-                        trace.fraction = 1.f;
-                    }
+                if (oldfrac != trace.fraction) {
+                    oldfrac = trace.fraction;
+                } else {
+                    trace.fraction = 1.f;
                 }
             }
         }
@@ -2442,7 +2442,7 @@ float BulletAttack(
             );
         }
 
-        VectorCopy(vTraceEnd, vEndArray[i]);
+        VectorCopy(vTmpEnd, vEndArray[i]);
 
         if (iTracerFrequency && piTracerCount) {
             (*piTracerCount)++;
@@ -2471,7 +2471,7 @@ float BulletAttack(
         }
     }
 
-    gi.SetBroadcastVisible(start, trace.endpos);
+    gi.SetBroadcastVisible(start, vEndArray[0]);
 
     if (count == 1) {
         if (iTracerCount) {
@@ -2487,9 +2487,9 @@ float BulletAttack(
         gi.MSG_WriteCoord(start[0]);
         gi.MSG_WriteCoord(start[1]);
         gi.MSG_WriteCoord(start[2]);
-        gi.MSG_WriteCoord(trace.endpos[0]);
-        gi.MSG_WriteCoord(trace.endpos[1]);
-        gi.MSG_WriteCoord(trace.endpos[2]);
+        gi.MSG_WriteCoord(vEndArray[0][0]);
+        gi.MSG_WriteCoord(vEndArray[0][1]);
+        gi.MSG_WriteCoord(vEndArray[0][2]);
         gi.MSG_WriteBits(bulletlarge, bulletbits);
 
         if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {

From 9c018a2330f44474c2c20004df973d491fb3799e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:40:53 +0200
Subject: [PATCH 0799/2040] Implement CGM_FENCEPOST

---
 code/cgame/cg_parsemsg.cpp | 62 +++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 084831cc..c24c7427 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -866,7 +866,8 @@ void CG_AddBulletImpacts()
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_LITE || wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_HARD) {
+                    if (wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_LITE
+                        || wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
                     } else {
                         sSoundName = "snd_bh_wood";
@@ -897,7 +898,8 @@ void CG_AddBulletImpacts()
                             fVolume = 0.75f;
                         }
 
-                        if (wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_LITE || wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_HARD) {
+                        if (wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_LITE
+                            || wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_HARD) {
                             sSoundName = "snd_bh_metal";
                         } else {
                             sSoundName = "snd_bh_wood";
@@ -952,7 +954,8 @@ void CG_AddBulletImpacts()
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_LITE || wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_HARD) {
+                    if (wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_LITE
+                        || wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
                     } else {
                         sSoundName = "snd_bh_wood";
@@ -1664,18 +1667,49 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
         case CGM_FENCEPOST:
-            vStart[0] = cgi.MSG_ReadCoord();
-            vStart[1] = cgi.MSG_ReadCoord();
-            vStart[2] = cgi.MSG_ReadCoord();
-            vEnd[0]   = cgi.MSG_ReadCoord();
-            vEnd[1]   = cgi.MSG_ReadCoord();
-            vEnd[2]   = cgi.MSG_ReadCoord();
-            cgi.MSG_ReadByte();
-            cgi.MSG_ReadByte();
-            VectorSubtract(vEnd, vStart, vTmp);
+            {
+                int    iHalf;
+                vec3_t vForward, vRight, vUp;
+                float  fLength;
 
-            // FIXME: unimplemented
-            // ?? can't figure out what is this
+                vStart[0] = cgi.MSG_ReadCoord();
+                vStart[1] = cgi.MSG_ReadCoord();
+                vStart[2] = cgi.MSG_ReadCoord();
+                vEnd[0]   = cgi.MSG_ReadCoord();
+                vEnd[1]   = cgi.MSG_ReadCoord();
+                vEnd[2]   = cgi.MSG_ReadCoord();
+                iHalf     = cgi.MSG_ReadByte();
+                cgi.MSG_ReadByte();
+
+                VectorSubtract(vEnd, vStart, vForward);
+                fLength = VectorNormalize(vForward);
+                iCount  = fLength / 2.0;
+
+                MakeNormalVectors(vForward, vRight, vUp);
+
+                for (i = 0; i < iCount; i++) {
+                    vec3_t vOrg;
+                    vec3_t vNormal;
+
+                    VectorCopy(vStart, vOrg);
+
+                    VectorMA(vOrg, random(), vForward, vOrg);
+                    VectorMA(vOrg, crandom() * iHalf, vRight, vOrg);
+                    VectorMA(vOrg, crandom() * iHalf, vUp, vOrg);
+
+                    //
+                    // Spawn the fence wood effect
+                    //
+
+                    VectorSubtract(vStart, vOrg, vNormal);
+                    VectorNormalize(vNormal);
+
+                    sfxManager.MakeEffect_Normal(SFX_FENCE_WOOD, vOrg, vNormal);
+                }
+
+                // FIXME: unimplemented
+                // ?? can't figure out what is this
+            }
             break;
         default:
             cgi.Error(ERR_DROP, "CG_ParseCGMessage: Unknown CGM message type");

From 3a5da64c6f7aba79079b3939d1843cf1dfc63e65 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:45:56 +0200
Subject: [PATCH 0800/2040] Make radar clients speak on mohaas/mohaab

---
 code/cgame/cg_parsemsg.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index c24c7427..25351b41 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "cg_parsemsg.h"
 #include "cg_specialfx.h"
+#include "cg_radar.h"
 
 #include "str.h"
 
@@ -1626,15 +1627,17 @@ void CG_ParseCGMessage_ver_15()
         case CGM_NOTIFY_KILL:
         case CGM_NOTIFY_HIT:
             {
+                const char* soundName;
                 int iOldEnt;
 
                 iOldEnt               = current_entity_number;
                 current_entity_number = cg.snap->ps.clientNum;
                 if (iType == CGM_NOTIFY_HIT) {
-                    commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
+                    soundName = "dm_kill_notify";
                 } else {
-                    commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
+                    soundName = "dm_hit_notify";
                 }
+                commandManager.PlaySound(soundName, NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
 
                 current_entity_number = iOldEnt;
             }
@@ -1656,13 +1659,14 @@ void CG_ParseCGMessage_ver_15()
                 if (iLarge) {
                     current_entity_number = iInfo;
 
-                    commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 0);
-                } else {
+                    commandManager.PlaySound(szTmp, vStart, CHAN_AUTO, -1, -1, -1, 0);
+                } else if (cg.snap) {
                     current_entity_number = cg.snap->ps.clientNum;
 
-                    commandManager.PlaySound(szTmp, vStart, CHAN_AUTO, -1, -1, -1, 1);
+                    commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 1);
                 }
 
+                CG_RadarClientSpeaks(iInfo);
                 current_entity_number = iOldEnt;
             }
             break;
@@ -1706,9 +1710,6 @@ void CG_ParseCGMessage_ver_15()
 
                     sfxManager.MakeEffect_Normal(SFX_FENCE_WOOD, vOrg, vNormal);
                 }
-
-                // FIXME: unimplemented
-                // ?? can't figure out what is this
             }
             break;
         default:

From 8a2e4ca470fe1caf2170a4b9678a3060ff9f1b14 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:54:25 +0200
Subject: [PATCH 0801/2040] Add Com_RandomBytes and Com_IsVoipTarget

---
 code/qcommon/common.cpp | 50 +++++++++++++++++++++++++++++++++++++++++
 code/qcommon/q_shared.h |  2 ++
 code/qcommon/qcommon.h  |  2 ++
 3 files changed, 54 insertions(+)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 464dbb3b..74e780ab 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -2688,6 +2688,56 @@ void Field_AutoComplete(field_t* field)
     Field_CompleteCommand(completionField->buffer, qtrue, qtrue);
 }
 
+/*
+==================
+Com_RandomBytes
+
+fills string array with len random bytes, preferably from the OS randomizer
+==================
+*/
+void Com_RandomBytes( byte *string, int len )
+{
+	int i;
+
+	if( Sys_RandomBytes( string, len ) )
+		return;
+
+	Com_Printf( "Com_RandomBytes: using weak randomization\n" );
+	for( i = 0; i < len; i++ )
+		string[i] = (unsigned char)( rand() % 256 );
+}
+
+
+/*
+==================
+Com_IsVoipTarget
+
+Returns non-zero if given clientNum is enabled in voipTargets, zero otherwise.
+If clientNum is negative return if any bit is set.
+==================
+*/
+qboolean Com_IsVoipTarget(uint8_t *voipTargets, int voipTargetsSize, int clientNum)
+{
+	int index;
+	if(clientNum < 0)
+	{
+		for(index = 0; index < voipTargetsSize; index++)
+		{
+			if(voipTargets[index])
+				return qtrue;
+		}
+		
+		return qfalse;
+	}
+
+	index = clientNum >> 3;
+	
+	if(index < voipTargetsSize)
+		return (voipTargets[index] & (1 << (clientNum & 0x07)));
+
+	return qfalse;
+}
+
 /*
 ===============
 Field_CompletePlayerName
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index cb601125..90db5cbb 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1172,6 +1172,8 @@ size_t	QDECL Com_sprintf (char *dest, size_t size, const char *fmt, ...) __attri
 
 char *Com_SkipTokens( char *s, int numTokens, const char *sep );
 char *Com_SkipCharset( char *s, const char *sep );
+
+void Com_RandomBytes(byte* string, int len);
 void Com_BackslashToSlash( char *str );
 
 // mode parm for FS_FOpenFile
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index fb7db583..05dd19ac 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -944,6 +944,8 @@ int			Com_RealTime(qtime_t *qtime);
 qboolean	Com_SafeMode( void );
 void		Com_RunAndTimeServerPacket(netadr_t *evFrom, msg_t *buf);
 
+qboolean	Com_IsVoipTarget(uint8_t *voipTargets, int voipTargetsSize, int clientNum);
+
 void		Com_StartupVariable( const char *match );
 // checks for and removes command line "+set var arg" constructs
 // if match is NULL, all set commands will be executed, otherwise

From 37820c1673f874399cd2ad3068456ee47bb10e98 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:57:25 +0200
Subject: [PATCH 0802/2040] Generate QKey

---
 code/client/cl_main.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 7d14d5e8..ee3c90b4 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3237,8 +3237,6 @@ it by filling it with 2048 bytes of random data.
 */
 static void CL_GenerateQKey(void)
 {
-	// FIXME: unimplemented
-	/*
 	int len = 0;
 	unsigned char buff[ QKEY_SIZE ];
 	fileHandle_t f;
@@ -3268,7 +3266,6 @@ static void CL_GenerateQKey(void)
 		FS_FCloseFile( f );
 		Com_Printf( "QKEY generated\n" );
 	}
-	*/
 }
 
 /*
@@ -3498,7 +3495,6 @@ void CL_Init( void ) {
 	S_Init(qtrue);
 #endif
 
-	// fixme: should we leave it?
 	CL_GenerateQKey();
 	Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM );
 	CL_UpdateGUID( NULL, 0 );

From a586f13af87c65850d0200cb4192ded9f20a1503 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:58:28 +0200
Subject: [PATCH 0803/2040] Remove CL_GamespyServers_f as there is an existing
 implementation

---
 code/client/cl_main.cpp | 123 ----------------------------------------
 1 file changed, 123 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index ee3c90b4..8860f721 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -167,8 +167,6 @@ void CL_ShowIP_f(void);
 void CL_ServerStatus_f(void);
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg );
 
-void CL_GamespyServers_f( void );
-
 static qboolean cl_bCLSystemStarted = qfalse;
 
 /*
@@ -3460,7 +3458,6 @@ void CL_Init( void ) {
 	Cmd_AddCommand ("reconnect", CL_Reconnect_f);
 	Cmd_AddCommand ("localservers", CL_LocalServers_f);
 	Cmd_AddCommand ("globalservers", CL_GlobalServers_f);
-	Cmd_AddCommand ("refreshserverlist", CL_GamespyServers_f); // wombat: gamespy query
 	Cmd_AddCommand ("rcon", CL_Rcon_f);
 	Cmd_AddCommand ("setenv", CL_Setenv_f );
 	Cmd_AddCommand ("ping", CL_Ping_f );
@@ -3969,126 +3966,6 @@ void CL_LocalServers_f( void ) {
 	}
 }
 
-/*
-==================
-CL_GamespyServers_f
-==================
-*/
-// currently about 1000 mohaa servers at a time. when set higher, buffer must be increased!
-#define MAX_GAMESPYSERVERS	16
-
-void CL_GamespyServers_f( void ) {
-	// FIXME: unimplemented
-#if 0
-	char buffer[10240];
-	int bytesRead;
-
-	int				i, count, max, total;
-	serverAddress_t addresses[MAX_GAMESPYSERVERS];
-	int				numservers;
-	byte*			buffptr;
-	byte*			buffend;
-
-//	if ( Cmd_Argc() < 1) {
-//		Com_Printf( "usage: gamespyservers [keywords]\n");
-//		return;
-//	}
-
-	Com_Printf( "Requesting servers from the GameSpy master...\n" );
-	Cvar_Set( "dm_serverstatus", "Getting List.");
-
-
-	if (!NETGS_CreateMasterSocket()) {
-		Com_Printf( "CL_GamespyServers_f: could not create socket.\n" );
-		return;
-	}
-	if (!NETGS_SendMasterRequest()) {
-		Com_Printf( "CL_GamespyServers_f: could not send master request.\n" );
-		return;
-	}
-	bytesRead = NETGS_ReceiveMasterResponse( buffer, sizeof(buffer) );
-	if (!bytesRead) {
-		Com_Printf( "CL_GamespyServers_f: Error in Response.\n" );
-		return;
-	}
-
-	// parse through server response string
-	numservers = 0;
-	buffptr    = ( byte * )buffer;
-	buffend    = buffptr + bytesRead;
-
-	while (buffptr+1 < buffend) {
-		if ( buffptr >= buffend - 6 ) {
-			break;
-		}
-
-		// parse out ip
-		addresses[numservers].ip[0] = *buffptr++;
-		addresses[numservers].ip[1] = *buffptr++;
-		addresses[numservers].ip[2] = *buffptr++;
-		addresses[numservers].ip[3] = *buffptr++;
-
-		// parse out port
-		addresses[numservers].port = *buffptr++;
-		addresses[numservers].port += (*buffptr++) << 8;
-
-		Com_DPrintf( "server: %d ip: %d.%d.%d.%d:%d\n",numservers,
-				addresses[numservers].ip[0],
-				addresses[numservers].ip[1],
-				addresses[numservers].ip[2],
-				addresses[numservers].ip[3],
-				BigShort(addresses[numservers].port) );
-
-		numservers++;
-		if (numservers >= MAX_GAMESPYSERVERS) {
-			break;
-		}
-
-		// parse out "\\final\\"
-		if (buffptr[0] == '\\' && buffptr[1] == 'f' && buffptr[2] == 'i' && buffptr[3] == 'n' && buffptr[4] == 'a' && buffptr[6] == 'l' && buffptr[6] == '\\') {
-			break;
-		}
-	}
-
-	cls.numglobalservers = 0;
-	cls.numGlobalServerAddresses = 0;
-
-	count = cls.numglobalservers;
-	max = MAX_GLOBAL_SERVERS;
-	for (i = 0; i < numservers && count < max; i++) {
-		// build net address
-		serverInfo_t *server = &cls.globalServers[count];
-
-		CL_InitServerInfo( server, &addresses[i] );
-		// advance to next slot
-		count++;
-	}
-
-
-	if ( cls.numGlobalServerAddresses < MAX_GLOBAL_SERVERS ) {
-		// if we couldn't store the servers in the main list anymore
-		for (; i < numservers && count >= max; i++) {
-			serverAddress_t *addr;
-			// just store the addresses in an additional list
-			addr = &cls.globalServerAddresses[cls.numGlobalServerAddresses++];
-			addr->ip[0] = addresses[i].ip[0];
-			addr->ip[1] = addresses[i].ip[1];
-			addr->ip[2] = addresses[i].ip[2];
-			addr->ip[3] = addresses[i].ip[3];
-			addr->port  = addresses[i].port;
-		}
-	}
-
-	cls.numglobalservers = count;
-	total = count + cls.numGlobalServerAddresses;
-
-	Com_Printf("%d servers parsed (total %d)\n", numservers, total);
-	Cvar_Set( "dm_serverstatus", "Server List Received.");
-	Cvar_SetValue( "dm_servercount", total );
-#endif
-}
-
-
 /*
 ==================
 CL_GlobalServers_f

From d9e3cc2188901f71715339a5c4db91d06bde1b6c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:16:56 +0200
Subject: [PATCH 0804/2040] Add a way to draw the skeleton for debugging
 purposes

---
 code/renderer/tr_init.c    |  6 ++++++
 code/renderer/tr_local.h   |  1 +
 code/renderer/tr_main.c    |  2 +-
 code/renderer/tr_model.cpp | 12 +++++-------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 66efa501..50e9b685 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1380,6 +1380,12 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
 	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
 	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
+
+    //
+    // Added in OPM
+    //
+
+    r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
 }
 
 void R_InitExtensions() {
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 86551126..a41e7bc9 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2187,6 +2187,7 @@ float R_CalcLod(const vec3_t origin, float radius);
 int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
 int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
 void R_PrintInfoWorldtris(void);
+void R_DebugSkeleton(void);
 
 extern int g_nStaticSurfaces;
 extern qboolean g_bInfostaticmodels;
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index fde5f341..44f48321 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1556,7 +1556,6 @@ void R_AddEntitySurfaces (void) {
 			ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad reType" );
 		}
 	}
-
 }
 
 void R_AddSpriteSurfaces()
@@ -1944,6 +1943,7 @@ void R_RenderView (viewParms_t *parms) {
 	);
 
 	R_DrawDebugLines();
+    R_DebugSkeleton();
 
 	// draw main system development information (surface outlines, etc)
 	R_DebugGraphics();
diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index 48d8778f..cf5d0d53 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -596,8 +596,6 @@ RB_DrawSkeletor
 ==============
 */
 void RB_DrawSkeletor(trRefEntity_t* ent) {
-	// FIXME: unimplemented
-#if 0
 	int i;
 	dtiki_t		*tiki;
 	skeletor_c	*skeletor;
@@ -702,7 +700,6 @@ void RB_DrawSkeletor(trRefEntity_t* ent) {
 		qglEnd();
 		qglLineWidth( 1 );
 	}
-#endif
 }
 
 surfaceType_t	skelSurface = SF_TIKI_SKEL;
@@ -1561,16 +1558,18 @@ R_DebugSkeleton
 =============
 */
 void R_DebugSkeleton(void) {
-    // FIXME: unimplemented
-#if 0
 	int i;
 	trRefEntity_t *ent;
 	model_t *model;
 
+    if (!r_showSkeleton->integer) {
+        return;
+    }
+
 	R_SyncRenderThread();
 
 	GL_Bind( tr.whiteImage );
-	GL_State( 0x200 );
+	GL_State( GLS_POLYMODE_LINE );
 
 	qglDisableClientState( GL_COLOR_ARRAY );
 	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
@@ -1587,7 +1586,6 @@ void R_DebugSkeleton(void) {
 			}
 		}
 	}
-#endif
 }
 static float ProjectRadius(float r, const vec3_t location)
 {

From 662d048bf484a38e1e266a070b4e80eb4bc9af5a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:42:05 +0200
Subject: [PATCH 0805/2040] Implement R_AddLightGridSurfacesToScene

---
 code/renderer/tr_scene.c | 83 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_scene.c b/code/renderer/tr_scene.c
index 796d53cc..1a43b095 100644
--- a/code/renderer/tr_scene.c
+++ b/code/renderer/tr_scene.c
@@ -341,8 +341,89 @@ void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, fl
 	RE_AddDynamicLightToScene( org, intensity, r, g, b, type );
 }
 
+/*
+=====================
+R_AddLightGridSurfacesToScene
+
+Draw small dots to make a grid.
+A dot matches the calculated color of the light at its location
+=====================
+*/
 void R_AddLightGridSurfacesToScene() {
-	// FIXME: unimplemented
+    vec3_t vMin, vMax;
+    vec3_t vPos;
+    vec3_t vLight;
+    int i;
+    qhandle_t hShader;
+    polyVert_t verts[4];
+
+    if (!tr.world) {
+        return;
+    }
+    if (!tr.world->lightGridData) {
+        return;
+    }
+    if (!tr.world->lightGridOffsets) {
+        return;
+    }
+
+    hShader = RE_RegisterShader("showgrid");
+    R_GetShaderByHandle(hShader);
+
+    for (i = 0; i < 3; i++) {
+        vMin[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] - 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
+        vMax[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] + 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
+    }
+
+    for (vPos[2] = vMin[2]; vPos[2] < vMax[2]; vPos[2] += tr.world->lightGridSize[2]) {
+        for (vPos[1] = vMin[1]; vPos[1] < vMax[1]; vPos[1] += tr.world->lightGridSize[1]) {
+            for (vPos[0] = vMin[0]; vPos[0] < vMax[0]; vPos[0] += tr.world->lightGridSize[0]) {
+                R_GetLightingGridValueFast(vPos, vLight);
+
+                verts[0].xyz[0] = vPos[0] - 2.0;
+                verts[0].xyz[1] = vPos[1] - 2.0;
+                verts[0].xyz[2] = vPos[2];
+                verts[0].st[0] = 0.0;
+                verts[0].st[1] = 0.0;
+                verts[0].modulate[0] = vLight[0];
+                verts[0].modulate[1] = vLight[1];
+                verts[0].modulate[2] = vLight[2];
+                verts[0].modulate[3] = 0xff;
+
+                verts[1].xyz[0] = vPos[0] + 2.0;
+                verts[1].xyz[1] = vPos[1] - 2.0;
+                verts[1].xyz[2] = vPos[2];
+                verts[1].st[0] = 0.0;
+                verts[1].st[1] = 1.0;
+                verts[1].modulate[0] = vLight[0];
+                verts[1].modulate[1] = vLight[1];
+                verts[1].modulate[2] = vLight[2];
+                verts[1].modulate[3] = 0xff;
+
+                verts[2].xyz[0] = vPos[0] + 2.0;
+                verts[2].xyz[1] = vPos[1] + 2.0;
+                verts[2].xyz[2] = vPos[2];
+                verts[2].st[0] = 1.0;
+                verts[2].st[1] = 1.0;
+                verts[2].modulate[0] = vLight[0];
+                verts[2].modulate[1] = vLight[1];
+                verts[2].modulate[2] = vLight[2];
+                verts[2].modulate[3] = 0xff;
+
+                verts[3].xyz[0] = vPos[0] - 2.0;
+                verts[3].xyz[1] = vPos[1] + 2.0;
+                verts[3].xyz[2] = vPos[2];
+                verts[3].st[0] = 1.0;
+                verts[3].st[1] = 0.0;
+                verts[3].modulate[0] = vLight[0];
+                verts[3].modulate[1] = vLight[1];
+                verts[3].modulate[2] = vLight[2];
+                verts[3].modulate[3] = 0xff;
+
+                RE_AddPolyToScene(hShader, 4, verts, 0);
+            }
+        }
+    }
 }
 
 /*

From e386eb00ef47aaad8a0054095fb843073e34ce19 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 23:57:57 +0200
Subject: [PATCH 0806/2040] Implement all lighting functions

---
 code/renderer/tr_light.c | 1859 ++++++++++++++++++++++----------------
 1 file changed, 1056 insertions(+), 803 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index c16519cf..8ea43b11 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -23,47 +23,53 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-#define	DLIGHT_AT_RADIUS		16
+#define DLIGHT_AT_RADIUS 16
 // at the edge of a dlight's influence, this amount of light will be added
 
-#define	DLIGHT_MINIMUM_RADIUS	16		
+#define DLIGHT_MINIMUM_RADIUS 16
+
 // never calculate a range less than this to prevent huge light numbers
 
 typedef struct {
-  dlight_t *dl;
-  float power;
-  vec3_t origin;
+    dlight_t *dl;
+    float     power;
+    vec3_t    origin;
 } incidentLight_t;
 
 typedef struct {
-  int dlightMap;
-  int allocated[LIGHTMAP_SIZE];
-  byte lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
-  byte* srcBase;
-  byte* dstBase;
-  incidentLight_t lights[32];
-  int numLights;
+    int             dlightMap;
+    int             allocated[LIGHTMAP_SIZE];
+    byte            lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
+    byte           *srcBase;
+    byte           *dstBase;
+    incidentLight_t lights[32];
+    int             numLights;
 } dlightInfo_t;
 
 typedef struct {
-  vec3_t point;
-  int s;
-  int t;
+    vec3_t point;
+    int    s;
+    int    t;
 } patchLightBlock_t;
 
 dlightInfo_t dli;
 
-void R_SetupEntityLightingGrid(trRefEntity_t* ent);
-qboolean R_DlightSample(byte* src, const vec3_t vec, byte* dst);
-qboolean R_AllocLMBlock(int w, int h, int* x, int* y);
+void     R_SetupEntityLightingGrid(trRefEntity_t *ent);
+qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst);
+qboolean R_AllocLMBlock(int w, int h, int *x, int *y);
 
-static int R_RecursiveDlightPatch(patchLightBlock_t* plb) {
+/*
+===============
+R_RecursiveDlightPatch
+===============
+*/
+static int R_RecursiveDlightPatch(patchLightBlock_t *plb)
+{
     patchLightBlock_t cut[4];
-    qboolean added;
-    int index;
+    qboolean          added;
+    int               index;
 
-    if (plb[0].s < plb[1].s - 1)
-	{
+    if (plb[0].s < plb[1].s - 1) {
         cut[0] = plb[0];
         cut[2] = plb[2];
 
@@ -83,9 +89,7 @@ static int R_RecursiveDlightPatch(patchLightBlock_t* plb) {
         cut[2] = cut[3];
 
         index = 1;
-	}
-	else if (plb[0].t < plb[2].t - 1)
-    {
+    } else if (plb[0].t < plb[2].t - 1) {
         cut[0] = plb[0];
         cut[1] = plb[1];
 
@@ -99,77 +103,77 @@ static int R_RecursiveDlightPatch(patchLightBlock_t* plb) {
         cut[2].s = plb[0].s;
         cut[3].s = plb[1].s;
 
-        added = R_RecursiveDlightPatch(cut);
+        added  = R_RecursiveDlightPatch(cut);
         cut[0] = cut[2];
         cut[1] = cut[3];
 
         index = 2;
-	}
-	else
-	{
-		return R_DlightSample(
-			&dli.srcBase[(LIGHTMAP_SIZE * 3) + plb[0].s * 3],
-			plb[0].point,
+    } else {
+        return R_DlightSample(
+            &dli.srcBase[(LIGHTMAP_SIZE * 3) + plb[0].s * 3],
+            plb[0].point,
             &dli.dstBase[(LIGHTMAP_SIZE * 4) + plb[0].s * 4]
         );
-	}
+    }
 
-	cut[index] = plb[index];
-	cut[3] = plb[3];
+    cut[index] = plb[index];
+    cut[3]     = plb[3];
 
-	return R_RecursiveDlightPatch(cut) + added;
+    return R_RecursiveDlightPatch(cut) + added;
 }
 
-int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBits) {
-    int x, y;
-    int i, j;
-    int i2, j2;
-    int steps[2][2];
-    dlight_t* dl;
-    qboolean added;
-    float* origin;
-    drawVert_t* dv;
+/*
+===============
+R_RealDlightPatch
+===============
+*/
+int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
+{
+    int         x, y;
+    int         i, j;
+    int         i2, j2;
+    int         steps[2][2];
+    dlight_t   *dl;
+    qboolean    added;
+    float      *origin;
+    drawVert_t *dv;
 
-    if (!srf->lmHeight || !srf->lmWidth)
-    {
+    if (!srf->lmHeight || !srf->lmWidth) {
         srf->dlightMap[tr.smpFrame] = 0;
         return 0;
     }
 
-	dli.numLights = 0;
+    dli.numLights = 0;
 
-	for (i = 0; i < tr.refdef.num_dlights; i++) {
-		if (!(dlightBits & (1 << i))) {
-			continue;
-		}
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        if (!(dlightBits & (1 << i))) {
+            continue;
+        }
 
-		dl = &tr.refdef.dlights[i];
-		if (dl->origin[0] + dl->radius < srf->meshBounds[0][0]
-			|| dl->origin[0] - dl->radius > srf->meshBounds[1][0]
-			|| dl->origin[1] + dl->radius < srf->meshBounds[0][1]
-			|| dl->origin[1] - dl->radius > srf->meshBounds[1][1]
-			|| dl->origin[2] + dl->radius < srf->meshBounds[0][2]
-			|| dl->origin[2] - dl->radius > srf->meshBounds[1][2])
-		{
-			dlightBits &= ~(1 << i);
-			continue;
-		}
+        dl = &tr.refdef.dlights[i];
+        if (dl->origin[0] + dl->radius < srf->meshBounds[0][0] || dl->origin[0] - dl->radius > srf->meshBounds[1][0]
+            || dl->origin[1] + dl->radius < srf->meshBounds[0][1] || dl->origin[1] - dl->radius > srf->meshBounds[1][1]
+            || dl->origin[2] + dl->radius < srf->meshBounds[0][2]
+            || dl->origin[2] - dl->radius > srf->meshBounds[1][2]) {
+            dlightBits &= ~(1 << i);
+            continue;
+        }
 
-		VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
-		dli.lights[dli.numLights].dl = dl;
-		dli.lights[dli.numLights].power = 1.f / dl->radius;
-		dli.numLights++;
-	}
+        VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
+        dli.lights[dli.numLights].dl    = dl;
+        dli.lights[dli.numLights].power = 1.f / dl->radius;
+        dli.numLights++;
+    }
 
-	if (!dli.numLights) {
-		srf->dlightMap[tr.smpFrame] = 0;
-		return 0;
-	}
-
-	if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+    if (!dli.numLights) {
         srf->dlightMap[tr.smpFrame] = 0;
         return 0;
-	}
+    }
+
+    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
 
     dli.srcBase = srf->lmData;
     dli.dstBase = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
@@ -180,32 +184,32 @@ int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBits) {
     tr.pc.c_dlightSurfaces++;
     tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
 
-	added = 0;
-	
-	if (srf->verts[srf->width].lightmap[0] != srf->verts[0].lightmap[0]) {
-		if (srf->verts[srf->width].lightmap[0] < srf->verts[0].lightmap[0]) {
-			steps[0][0] = 0;
-			steps[0][1] = -1;
-		} else {
-			steps[0][0] = 0;
-			steps[0][1] = 1;
-		}
+    added = 0;
 
-		if (srf->verts[srf->width * (srf->height - 1)].lightmap[1] < srf->verts[0].lightmap[1]) {
+    if (srf->verts[srf->width].lightmap[0] != srf->verts[0].lightmap[0]) {
+        if (srf->verts[srf->width].lightmap[0] < srf->verts[0].lightmap[0]) {
+            steps[0][0] = 0;
+            steps[0][1] = -1;
+        } else {
+            steps[0][0] = 0;
+            steps[0][1] = 1;
+        }
+
+        if (srf->verts[srf->width * (srf->height - 1)].lightmap[1] < srf->verts[0].lightmap[1]) {
             steps[1][0] = -1;
             steps[1][1] = 0;
-		} else {
+        } else {
             steps[1][0] = 1;
             steps[1][1] = 0;
-		}
-	} else {
-		if (srf->verts[srf->width * (srf->height - 1)].lightmap[0] < srf->verts[0].lightmap[0]) {
+        }
+    } else {
+        if (srf->verts[srf->width * (srf->height - 1)].lightmap[0] < srf->verts[0].lightmap[0]) {
             steps[0][0] = -1;
             steps[0][1] = 0;
-		} else {
+        } else {
             steps[0][0] = 1;
             steps[0][1] = 0;
-		}
+        }
 
         if (srf->verts[srf->width].lightmap[1] < srf->verts[0].lightmap[1]) {
             steps[1][0] = 0;
@@ -214,22 +218,22 @@ int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBits) {
             steps[1][0] = 0;
             steps[1][1] = -1;
         }
-	}
+    }
 
-	for (i = 0; i < srf->height; i++) {
-		for (j = 0; j < srf->width; j++) {
-			patchLightBlock_t plb[4];
+    for (i = 0; i < srf->height; i++) {
+        for (j = 0; j < srf->width; j++) {
+            patchLightBlock_t plb[4];
 
-			//
-			// Vert 1
-			//
-			dv = &srf->verts[i * srf->width + j];
+            //
+            // Vert 1
+            //
+            dv = &srf->verts[i * srf->width + j];
 
-			VectorCopy(dv->xyz, plb[0].point);
-			plb[0].s = dv->lightmap[0] * 128.0 - srf->lmX;
-			plb[0].t = dv->lightmap[1] * 128.0 - srf->lmY;
+            VectorCopy(dv->xyz, plb[0].point);
+            plb[0].s = dv->lightmap[0] * 128.0 - srf->lmX;
+            plb[0].t = dv->lightmap[1] * 128.0 - srf->lmY;
 
-			i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
+            i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
             j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
 
             //
@@ -265,106 +269,15 @@ int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBits) {
             plb[3].s = dv->lightmap[0] * 128.0 - srf->lmX;
             plb[3].t = dv->lightmap[1] * 128.0 - srf->lmY;
 
-			added |= R_RecursiveDlightPatch(plb);
-		}
-	}
+            added |= R_RecursiveDlightPatch(plb);
+        }
+    }
 
     if (!added) {
         srf->dlightMap[tr.smpFrame] = 0;
         return 0;
-	}
-
-	for (i = 0; i < srf->lmWidth; i++) {
-		dli.allocated[x + i] = srf->lmHeight + y;
-	}
-
-    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->dlightMap[tr.smpFrame];
-}
-
-int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits) {
-    int x, y;
-    byte* src, * dst;
-    int i, j;
-    vec3_t vec;
-    vec3_t vecStepS, vecStepT;
-    dlight_t* dl;
-    float d;
-    qboolean added;
-    float* origin;
-
-	if (!srf->lmHeight || !srf->lmWidth) {
-		srf->dlightMap[tr.smpFrame] = 0;
-		return 0;
-	}
-
-	dli.numLights = 0;
-
-	for (i = 0; i < tr.refdef.num_dlights; i++) {
-        if (!(dlightBits & (1 << i))) {
-            continue;
-        }
-
-        dl = &tr.refdef.dlights[i];
-
-        d = DotProduct(dl->transformed, srf->plane.normal) - srf->plane.dist;
-
-        if ((d < 0.f && !r_dlightBacks->integer)
-            || (d > dl->radius || d < -dl->radius)) {
-            // dlight doesn't reach the plane
-            dlightBits &= ~(1 << i);
-        }
-        else {
-            VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
-            dli.lights[dli.numLights].dl = dl;
-            dli.lights[dli.numLights].power = 1.0 / dl->radius;
-			dli.numLights++;
-        }
     }
 
-    if (!dli.numLights) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-	if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
-		srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
-    src = srf->lmData;
-    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-	srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
-	srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
-
-	tr.pc.c_dlightSurfaces++;
-	tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
-
-	VectorCopy(srf->lmVecs[0], vecStepS);
-	VectorMA(srf->lmVecs[1], -srf->lmWidth, srf->lmVecs[0], vecStepT);
-
-	added = qfalse;
-	VectorCopy(srf->lmOrigin, vec);
-
-	for (i = 0; i < srf->lmHeight; i++) {
-		for (j = 0; j < srf->lmWidth; j++) {
-			added |= R_DlightSample(src, vec, dst);
-			VectorAdd(vec, vecStepS, vec);
-			src += 3;
-			dst += 4;
-		}
-
-		VectorAdd(vec, vecStepT, vec);
-		src += 3 * (LIGHTMAP_SIZE - j);
-		dst += 4 * (LIGHTMAP_SIZE - j);
-	}
-
-	if (!added) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
     for (i = 0; i < srf->lmWidth; i++) {
         dli.allocated[x + i] = srf->lmHeight + y;
     }
@@ -373,42 +286,142 @@ int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits) {
     return srf->dlightMap[tr.smpFrame];
 }
 
-int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
-    dlight_t* dl;
-    int x, y;
-    byte* dst, * src;
-    vec3_t vec;
-    float delta, dist;
-    float* origin;
-    int i, j, k;
-    int di, dj;
-    qboolean added;
-    float lmScale;
-    int lumelsPerHeight;
-    float heightPerLumelSquared;
-    float z00, z01;
-    float z10, z11;
+/*
+===============
+R_RealDlightFace
+===============
+*/
+int R_RealDlightFace(srfSurfaceFace_t *srf, int dlightBits)
+{
+    int       x, y;
+    byte     *src, *dst;
+    int       i, j;
+    vec3_t    vec;
+    vec3_t    vecStepS, vecStepT;
+    dlight_t *dl;
+    float     d;
+    qboolean  added;
+    float    *origin;
 
-	for (i = 0; i < tr.refdef.num_dlights; i++) {
-		dl = &tr.refdef.dlights[i];
+    if (!srf->lmHeight || !srf->lmWidth) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
 
-		if (dl->radius < srf->x0 - dl->transformed[0]
-			|| -512.f - dl->radius > srf->x0 - dl->transformed[0]
-			|| -512.f - dl->radius > srf->y0 - dl->transformed[1]
-			|| dl->radius < srf->y0 - dl->transformed[1])
-		{
-			continue;
-		}
+    dli.numLights = 0;
 
-		if (dl->radius > 128.f) {
-			dist = 0.f;
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        if (!(dlightBits & (1 << i))) {
+            continue;
+        }
 
-			delta = dl->transformed[0] - srf->x0;
-			if (delta <= 0.f) {
-				dist += delta * delta;
-			} else {
-				delta -= 512.f;
-				if (delta > 0.f) dist += delta * delta;
+        dl = &tr.refdef.dlights[i];
+
+        d = DotProduct(dl->transformed, srf->plane.normal) - srf->plane.dist;
+
+        if ((d < 0.f && !r_dlightBacks->integer) || (d > dl->radius || d < -dl->radius)) {
+            // dlight doesn't reach the plane
+            dlightBits &= ~(1 << i);
+        } else {
+            VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
+            dli.lights[dli.numLights].dl    = dl;
+            dli.lights[dli.numLights].power = 1.0 / dl->radius;
+            dli.numLights++;
+        }
+    }
+
+    if (!dli.numLights) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    src = srf->lmData;
+    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
+    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
+
+    VectorCopy(srf->lmVecs[0], vecStepS);
+    VectorMA(srf->lmVecs[1], -srf->lmWidth, srf->lmVecs[0], vecStepT);
+
+    added = qfalse;
+    VectorCopy(srf->lmOrigin, vec);
+
+    for (i = 0; i < srf->lmHeight; i++) {
+        for (j = 0; j < srf->lmWidth; j++) {
+            added |= R_DlightSample(src, vec, dst);
+            VectorAdd(vec, vecStepS, vec);
+            src += 3;
+            dst += 4;
+        }
+
+        VectorAdd(vec, vecStepT, vec);
+        src += 3 * (LIGHTMAP_SIZE - j);
+        dst += 4 * (LIGHTMAP_SIZE - j);
+    }
+
+    if (!added) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->lmWidth; i++) {
+        dli.allocated[x + i] = srf->lmHeight + y;
+    }
+
+    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->dlightMap[tr.smpFrame];
+}
+
+/*
+===============
+R_RealDlightTerrain
+===============
+*/
+int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
+{
+    dlight_t *dl;
+    int       x, y;
+    byte     *dst, *src;
+    vec3_t    vec;
+    float     delta, dist;
+    float    *origin;
+    int       i, j, k;
+    int       di, dj;
+    qboolean  added;
+    float     lmScale;
+    int       lumelsPerHeight;
+    float     heightPerLumelSquared;
+    float     z00, z01;
+    float     z10, z11;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+
+        if (dl->radius < srf->x0 - dl->transformed[0] || -512.f - dl->radius > srf->x0 - dl->transformed[0]
+            || -512.f - dl->radius > srf->y0 - dl->transformed[1] || dl->radius < srf->y0 - dl->transformed[1]) {
+            continue;
+        }
+
+        if (dl->radius > 128.f) {
+            dist = 0.f;
+
+            delta = dl->transformed[0] - srf->x0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= 512.f;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
             }
 
             delta = dl->transformed[1] - srf->y0;
@@ -416,166 +429,166 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
                 dist += delta * delta;
             } else {
                 delta -= 512.f;
-                if (delta > 0.f) dist += delta * delta;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
             }
 
-			delta = dl->transformed[0] - srf->z0;
-			if (delta <= 0.f) {
-				dist += delta * delta;
-			} else {
-				delta -= srf->zmax;
-				if (delta > 0.f) dist += delta * delta;
-			}
+            delta = dl->transformed[0] - srf->z0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= srf->zmax;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
 
-			if (dl->radius * dl->radius < dist) {
-				continue;
-			}
-		}
+            if (dl->radius * dl->radius < dist) {
+                continue;
+            }
+        }
 
-		VectorCopy(dl->origin, dli.lights[dli.numLights].origin);
-		dli.lights[dli.numLights].dl = dl;
-		dli.lights[dli.numLights].power = 1.f / dl->radius;
-		dli.numLights++;
-	}
+        VectorCopy(dl->origin, dli.lights[dli.numLights].origin);
+        dli.lights[dli.numLights].dl    = dl;
+        dli.lights[dli.numLights].power = 1.f / dl->radius;
+        dli.numLights++;
+    }
 
-    if (!dli.numLights)
-    {
+    if (!dli.numLights) {
         srf->drawinfo.dlightMap[tr.smpFrame] = 0;
         return 0;
     }
 
-    if (!R_AllocLMBlock(srf->drawinfo.lmapSize, srf->drawinfo.lmapSize, &x, &y))
-    {
+    if (!R_AllocLMBlock(srf->drawinfo.lmapSize, srf->drawinfo.lmapSize, &x, &y)) {
         srf->drawinfo.dlightMap[tr.smpFrame] = 0;
         return 0;
     }
 
-	src = srf->drawinfo.lmData;
-	dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+    src = srf->drawinfo.lmData;
+    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
 
-	srf->drawinfo.lmapX = x / 128.f;
-	srf->drawinfo.lmapY = y / 128.f;
+    srf->drawinfo.lmapX = x / 128.f;
+    srf->drawinfo.lmapY = y / 128.f;
 
     tr.pc.c_dlightSurfaces++;
     tr.pc.c_dlightTexels += srf->drawinfo.lmapSize * srf->drawinfo.lmapSize;
 
-	added = qfalse;
+    added = qfalse;
 
-	lumelsPerHeight = 64.f / srf->drawinfo.lmapStep;
-	if (lumelsPerHeight == 1) {
-		vec[1] = srf->y0;
+    lumelsPerHeight = 64.f / srf->drawinfo.lmapStep;
+    if (lumelsPerHeight == 1) {
+        vec[1] = srf->y0;
 
-		for (i = 0; i < 9; i++) {
-			vec[0] = srf->x0;
+        for (i = 0; i < 9; i++) {
+            vec[0] = srf->x0;
 
-			for (j = 0; j < 9; j++) {
-				vec[2] = srf->z0 + (srf->heightmap[0] << 1);
-				added |= R_DlightSample(src, vec, dst);
+            for (j = 0; j < 9; j++) {
+                vec[2] = srf->z0 + (int)(srf->heightmap[0] << 1);
+                added |= R_DlightSample(src, vec, dst);
 
-				src += 3;
-				dst += 4;
-				vec[0] += srf->drawinfo.lmapStep;
-			}
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
 
-			src += (LIGHTMAP_SIZE - 9) * 3;
-			dst += (LIGHTMAP_SIZE - 9) * 4;
-			vec[1] += srf->drawinfo.lmapStep;
-		}
-	} else if (lumelsPerHeight == 2) {
-		vec[1] = srf->y0;
+            src += (LIGHTMAP_SIZE - 9) * 3;
+            dst += (LIGHTMAP_SIZE - 9) * 4;
+            vec[1] += srf->drawinfo.lmapStep;
+        }
+    } else if (lumelsPerHeight == 2) {
+        vec[1] = srf->y0;
 
-		k = 0;
+        k = 0;
 
-		for (j = 0; j < 8; j++) {
-			vec[0] = srf->x0;
+        for (j = 0; j < 8; j++) {
+            vec[0] = srf->x0;
 
-			for (i = 0; i < 8; i++) {
-				z00 = srf->heightmap[k];
-				vec[2] = srf->z0 + z00 + z00;
-				added |= R_DlightSample(src, vec, dst);
-				// increase lightmap step
-				vec[0] += srf->drawinfo.lmapStep;
+            for (i = 0; i < 8; i++) {
+                z00    = (int)srf->heightmap[k];
+                vec[2] = srf->z0 + z00 + z00;
+                added |= R_DlightSample(src, vec, dst);
+                // increase lightmap step
+                vec[0] += srf->drawinfo.lmapStep;
 
-				z01 = srf->heightmap[k];
+                z01    = (int)srf->heightmap[k];
                 vec[2] = srf->z0 + z00 + z01;
                 added |= R_DlightSample(src, vec, dst);
 
                 vec[0] += srf->drawinfo.lmapStep;
-			}
+            }
 
             vec[2] = srf->z0 + z01 + z01;
             added |= R_DlightSample(src, vec, dst);
-			src += (LIGHTMAP_SIZE - 16) * 3;
-			dst += (LIGHTMAP_SIZE - 16) * 4;
-			k -= 8;
+            src += (LIGHTMAP_SIZE - 16) * 3;
+            dst += (LIGHTMAP_SIZE - 16) * 4;
+            k -= 8;
 
-			vec[0] = srf->x0;
-			vec[1] += srf->drawinfo.lmapStep;
+            vec[0] = srf->x0;
+            vec[1] += srf->drawinfo.lmapStep;
 
-			for (i = 0; i < 8; i++) {
-				z00 = srf->heightmap[k] + srf->heightmap[k + 9];
-				vec[2] = srf->z0 + z00;
+            for (i = 0; i < 8; i++) {
+                z00    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
+                vec[2] = srf->z0 + z00;
 
-				added |= R_DlightSample(src, vec, dst);
-				k++;
+                added |= R_DlightSample(src, vec, dst);
+                k++;
 
-				vec[0] += srf->drawinfo.lmapStep;
+                vec[0] += srf->drawinfo.lmapStep;
 
-				z01 = srf->heightmap[k] + srf->heightmap[k + 9];
+                z01    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
                 vec[2] = srf->z0 + (z00 + z01) * 0.5f;
 
                 added |= R_DlightSample(src, vec, dst);
 
-				src += 3;
-				dst += 4;
-				vec[0] += srf->drawinfo.lmapStep;
-			}
-		}
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+        }
 
-		vec[0] = srf->x0;
+        vec[0] = srf->x0;
 
-		for (i = 0; i < 7; i++) {
-			z00 = srf->heightmap[k];
-			vec[2] = srf->z0 + z00 + z00;
+        for (i = 0; i < 7; i++) {
+            z00    = (int)srf->heightmap[k];
+            vec[2] = srf->z0 + z00 + z00;
 
-			k++;
-			added |= R_DlightSample(src, vec, dst);
-			vec[0] += srf->drawinfo.lmapStep;
+            k++;
+            added |= R_DlightSample(src, vec, dst);
+            vec[0] += srf->drawinfo.lmapStep;
 
-			z01 = srf->heightmap[k];
+            z01    = (int)srf->heightmap[k];
             vec[2] = srf->z0 + z00 + z01;
             added |= R_DlightSample(src, vec, dst);
 
-			src += 3;
+            src += 3;
             dst += 4;
             vec[0] += srf->drawinfo.lmapStep;
-		}
+        }
 
         vec[2] = srf->z0 + z01 + z01;
         added |= R_DlightSample(src, vec, dst);
         vec[0] += srf->drawinfo.lmapStep;
-		vec[1] += srf->drawinfo.lmapStep;
-	}
-	else
-	{
-		vec[1] = srf->y0;
+        vec[1] += srf->drawinfo.lmapStep;
+    } else {
+        vec[1] = srf->y0;
 
-		for (j = 0; j < 8; j++) {
-			dj = 0;
+        for (j = 0; j < 8; j++) {
+            dj = 0;
 
-			for (;;) {
-				if (j == 7) {
-					if (dj >= lumelsPerHeight + 1) {
-						break;
-					}
-				} else if (dj >= lumelsPerHeight) {
-					break;
-				}
+            for (;;) {
+                if (j == 7) {
+                    if (dj >= lumelsPerHeight + 1) {
+                        break;
+                    }
+                } else if (dj >= lumelsPerHeight) {
+                    break;
+                }
 
-				vec[0] = srf->x0;
+                vec[0] = srf->x0;
 
-				for (i = 0; i < 8; i++) {
-					for (;;) {
+                for (i = 0; i < 8; i++) {
+                    for (;;) {
                         if (i == 7) {
                             if (di >= lumelsPerHeight + 1) {
                                 break;
@@ -583,50 +596,50 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
                         } else if (dj >= lumelsPerHeight) {
                             break;
                         }
-						
-						di = 0;
-						z00 = srf->heightmap[9 * j + i];
-                        z01 = srf->heightmap[9 * (j + 1) + i];
-                        z10 = srf->heightmap[9 * j + (i + 1)];
-                        z11 = srf->heightmap[9 * (j + 1) + (i + 1)];
 
-						heightPerLumelSquared = 2.f / (lumelsPerHeight * lumelsPerHeight);
-					
-						vec[2] = srf->z0 + (dj * (di * z11)
-							+ (lumelsPerHeight - dj) * (z10 * di)
-							+ z01 * (lumelsPerHeight - di) * dj
-							+ z00 * (lumelsPerHeight - di) * (lumelsPerHeight - dj))
-							* heightPerLumelSquared;
+                        di  = 0;
+                        z00 = (int)srf->heightmap[9 * j + i];
+                        z01 = (int)srf->heightmap[9 * (j + 1) + i];
+                        z10 = (int)srf->heightmap[9 * j + (i + 1)];
+                        z11 = (int)srf->heightmap[9 * (j + 1) + (i + 1)];
+
+                        heightPerLumelSquared = 2.f / (lumelsPerHeight * lumelsPerHeight);
+
+                        vec[2] =
+                            srf->z0
+                            + (dj * (di * z11) + (lumelsPerHeight - dj) * (z10 * di) + z01 * (lumelsPerHeight - di) * dj
+                               + z00 * (lumelsPerHeight - di) * (lumelsPerHeight - dj))
+                                  * heightPerLumelSquared;
 
                         added |= R_DlightSample(src, vec, dst);
                         src += 3;
                         dst += 4;
 
-						vec[0] += srf->drawinfo.lmapStep;
-					}
-				}
+                        vec[0] += srf->drawinfo.lmapStep;
+                    }
+                }
 
                 src += 3 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
-				dst += 4 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
-				vec[1] += srf->drawinfo.lmapStep;
-			}
-		}
-	}
+                dst += 4 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
+                vec[1] += srf->drawinfo.lmapStep;
+            }
+        }
+    }
 
     if (!added) {
         srf->drawinfo.dlightMap[tr.smpFrame] = 0;
         return 0;
-	}
+    }
 
-	for (i = 0; i < srf->drawinfo.lmapSize; i++) {
-		dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
-	}
+    for (i = 0; i < srf->drawinfo.lmapSize; i++) {
+        dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
+    }
 
-	lmScale = (1.f / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
-	srf->drawinfo.lmapX -= (srf->x0 * lmScale - (LIGHTMAP_SIZE * 2.f));
-	srf->drawinfo.lmapY -= (srf->y0 * lmScale - (LIGHTMAP_SIZE * 2.f));
+    lmScale = (1.f / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
+    srf->drawinfo.lmapX -= (srf->x0 * lmScale - (LIGHTMAP_SIZE * 2.f));
+    srf->drawinfo.lmapY -= (srf->y0 * lmScale - (LIGHTMAP_SIZE * 2.f));
 
-	srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
     return srf->drawinfo.dlightMap[tr.smpFrame];
 }
 
@@ -639,16 +652,17 @@ Used by both the front end (for DlightBmodel) and
 the back end (before doing the lighting calculation)
 ===============
 */
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *ori) {
-	int		i;
-	vec3_t	temp;
+void R_TransformDlights(int count, dlight_t *dl, orientationr_t *ori)
+{
+    int    i;
+    vec3_t temp;
 
-	for ( i = 0 ; i < count ; i++, dl++ ) {
-		VectorSubtract( dl->origin, ori->origin, temp );
-		dl->transformed[0] = DotProduct( temp, ori->axis[0] );
-		dl->transformed[1] = DotProduct( temp, ori->axis[1] );
-		dl->transformed[2] = DotProduct( temp, ori->axis[2] );
-	}
+    for (i = 0; i < count; i++, dl++) {
+        VectorSubtract(dl->origin, ori->origin, temp);
+        dl->transformed[0] = DotProduct(temp, ori->axis[0]);
+        dl->transformed[1] = DotProduct(temp, ori->axis[1]);
+        dl->transformed[2] = DotProduct(temp, ori->axis[2]);
+    }
 }
 
 /*
@@ -658,209 +672,218 @@ R_DlightBmodel
 Determine which dynamic lights may effect this bmodel
 =============
 */
-void R_DlightBmodel( bmodel_t *bmodel ) {
-	int			i, j;
-	dlight_t	*dl;
-	int			mask;
-	msurface_t	*surf;
-
-	// transform all the lights
-	R_TransformDlights( tr.refdef.num_dlights, tr.refdef.dlights, &tr.ori );
-
-	mask = 0;
-	for ( i=0 ; i<tr.refdef.num_dlights ; i++ ) {
-		dl = &tr.refdef.dlights[i];
-
-		// see if the point is close enough to the bounds to matter
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( dl->transformed[j] - bmodel->bounds[1][j] > dl->radius ) {
-				break;
-			}
-			if ( bmodel->bounds[0][j] - dl->transformed[j] > dl->radius ) {
-				break;
-			}
-		}
-		if ( j < 3 ) {
-			continue;
-		}
-
-		// we need to check this light
-		mask |= 1 << i;
-	}
-
-	tr.currentEntity->needDlights = (mask != 0);
-
-	// set the dlight bits in all the surfaces
-	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
-		surf = bmodel->firstSurface + i;
-
-		if ( *surf->data == SF_FACE ) {
-			((srfSurfaceFace_t *)surf->data)->dlightBits[ tr.smpFrame ] = mask;
-		} else if ( *surf->data == SF_GRID ) {
-			((srfGridMesh_t *)surf->data)->dlightBits[ tr.smpFrame ] = mask;
-		} else if ( *surf->data == SF_TRIANGLES ) {
-			((srfTriangles_t *)surf->data)->dlightBits[ tr.smpFrame ] = mask;
-		}
-	}
-}
-
-static byte* R_GetLightGridPalettedColor(int iColor)
+void R_DlightBmodel(bmodel_t *bmodel)
 {
-	return &tr.world->lightGridPalette[iColor * 3];
+    int         i, j;
+    dlight_t   *dl;
+    int         mask;
+    msurface_t *surf;
+
+    // transform all the lights
+    R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.ori);
+
+    mask = 0;
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+
+        // see if the point is close enough to the bounds to matter
+        for (j = 0; j < 3; j++) {
+            if (dl->transformed[j] - bmodel->bounds[1][j] > dl->radius) {
+                break;
+            }
+            if (bmodel->bounds[0][j] - dl->transformed[j] > dl->radius) {
+                break;
+            }
+        }
+        if (j < 3) {
+            continue;
+        }
+
+        // we need to check this light
+        mask |= 1 << i;
+    }
+
+    tr.currentEntity->needDlights = (mask != 0);
+
+    // set the dlight bits in all the surfaces
+    for (i = 0; i < bmodel->numSurfaces; i++) {
+        surf = bmodel->firstSurface + i;
+
+        if (*surf->data == SF_FACE) {
+            ((srfSurfaceFace_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        } else if (*surf->data == SF_GRID) {
+            ((srfGridMesh_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        } else if (*surf->data == SF_TRIANGLES) {
+            ((srfTriangles_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        }
+    }
 }
 
+/*
+===============
+R_GetLightGridPalettedColor
+===============
+*/
+static byte *R_GetLightGridPalettedColor(int iColor)
+{
+    return &tr.world->lightGridPalette[iColor * 3];
+}
+
+/*
+===============
+R_GetLightingGridValue
+===============
+*/
 void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 {
-	byte* pColor;
-	int iBaseOffset;
-	int i;
-	int iOffset;
-	int iRowPos;
-	int iData;
-	int iLen;
-	int iGridPos[3];
-	int iArrayXStep;
-	float fV;
-	float fFrac[3];
-	float fOMFrac[3];
-	float fWeight, fWeight2;
-	float fTotalFactor;
-    int iCurData;
-	vec3_t vLightOrigin;
-	byte* pCurData;
+    byte  *pColor;
+    int    iBaseOffset;
+    int    i;
+    int    iOffset;
+    int    iRowPos;
+    int    iData;
+    int    iLen;
+    int    iGridPos[3];
+    int    iArrayXStep;
+    float  fV;
+    float  fFrac[3];
+    float  fOMFrac[3];
+    float  fWeight, fWeight2;
+    float  fTotalFactor;
+    int    iCurData;
+    vec3_t vLightOrigin;
+    byte  *pCurData;
 
-	if (!tr.world || !tr.world->lightGridData || !tr.world->lightGridOffsets) {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-		return;
-	}
+    if (!tr.world || !tr.world->lightGridData || !tr.world->lightGridOffsets) {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+        return;
+    }
 
-	VectorSubtract(vPos, tr.world->lightGridMins, vLightOrigin);
+    VectorSubtract(vPos, tr.world->lightGridMins, vLightOrigin);
 
-	for (i = 0; i < 3; i++) {
-		fV = vLightOrigin[i] * tr.world->lightGridOOSize[i];
-		iGridPos[i] = floor(fV);
-		fFrac[i] = fV - iGridPos[i];
-		fOMFrac[i] = 1.0 - fFrac[i];
+    for (i = 0; i < 3; i++) {
+        fV          = vLightOrigin[i] * tr.world->lightGridOOSize[i];
+        iGridPos[i] = floor(fV);
+        fFrac[i]    = fV - iGridPos[i];
+        fOMFrac[i]  = 1.0 - fFrac[i];
 
-		if (iGridPos[i] < 0) {
-			iGridPos[i] = 0;
-		} else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
-			iGridPos[i] = tr.world->lightGridBounds[i] - 2;
-		}
-	}
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
+            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
+        }
+    }
 
-	fTotalFactor = 0;
-	iArrayXStep = tr.world->lightGridBounds[1];
-	iBaseOffset = tr.world->lightGridBounds[0] + iGridPos[0] * iArrayXStep + iGridPos[1];
-	vLight[0] = vLight[1] = vLight[2] = 0;
+    fTotalFactor = 0;
+    iArrayXStep  = tr.world->lightGridBounds[1];
+    iBaseOffset  = tr.world->lightGridBounds[0] + iGridPos[0] * iArrayXStep + iGridPos[1];
+    vLight[0] = vLight[1] = vLight[2] = 0;
 
-	for (i = 0; i < 4; i++) {
-		switch (i)
-		{
+    for (i = 0; i < 4; i++) {
+        switch (i) {
         case 0:
-			fWeight = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
-			fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
-			iOffset = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
+            fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
             break;
         case 1:
-            fWeight = fOMFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight  = fOMFrac[0] * fFrac[1] * fOMFrac[2];
             fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iBaseOffset + 1] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + 1] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
             break;
         case 2:
-            fWeight = fFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight  = fFrac[0] * fOMFrac[1] * fOMFrac[2];
             fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep] + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]
+                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
             break;
-		case 3:
-            fWeight = fFrac[0] * fFrac[1] * fOMFrac[2];
+        case 3:
+            fWeight  = fFrac[0] * fFrac[1] * fOMFrac[2];
             fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1] + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
-			break;
-		}
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]
+                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        }
 
-		iRowPos = iGridPos[2];
-		pCurData = &tr.world->lightGridData[iOffset];
-		iData = 0;
+        iRowPos  = iGridPos[2];
+        pCurData = &tr.world->lightGridData[iOffset];
+        iData    = 0;
 
-		while (1)
-		{
-			while (1)
-			{
+        while (1) {
+            while (1) {
                 iCurData = pCurData[iData];
                 iData++;
-				if (iCurData >= 0ul) {
-					break;
-				}
+                if (iCurData >= 0ul) {
+                    break;
+                }
 
-				iLen = -iCurData;
-				if (iLen > iRowPos) {
-					iData += iRowPos;
-					if (pCurData[iData]) {
-						pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-						VectorMA(vLight, fWeight, pColor, vLight);
-						fTotalFactor += fWeight;
-					}
+                iLen = -iCurData;
+                if (iLen > iRowPos) {
+                    iData += iRowPos;
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                        VectorMA(vLight, fWeight, pColor, vLight);
+                        fTotalFactor += fWeight;
+                    }
 
-					iData++;
-					if (iLen - 1 == iRowPos) {
-						iData++;
-					}
+                    iData++;
+                    if (iLen - 1 == iRowPos) {
+                        iData++;
+                    }
 
-					if (pCurData[iData]) {
-						pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-						VectorMA(vLight, fWeight2, pColor, vLight);
-					}
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                        VectorMA(vLight, fWeight2, pColor, vLight);
+                    }
 
-					goto cont;
-				}
+                    goto cont;
+                }
 
                 iRowPos -= iLen;
                 iData += iLen + 1;
-			}
+            }
 
-			iLen = iCurData + 2;
-			if (iLen - 1 >= iRowPos) {
-				break;
-			}
+            iLen = iCurData + 2;
+            if (iLen - 1 >= iRowPos) {
+                break;
+            }
 
-			iRowPos -= iLen;
-			iData++;
-		}
+            iRowPos -= iLen;
+            iData++;
+        }
 
-		if (iLen - 1 > iRowPos) {
-			if (!pCurData[iData]) {
-				continue;
-			}
+        if (iLen - 1 > iRowPos) {
+            if (!pCurData[iData]) {
+                continue;
+            }
 
-			pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-			VectorMA(vLight, fWeight + fWeight2, pColor, vLight);
-			fTotalFactor += fWeight + fWeight2;
-		} else {
+            pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+            VectorMA(vLight, fWeight + fWeight2, pColor, vLight);
+            fTotalFactor += fWeight + fWeight2;
+        } else {
             if (pCurData[iData]) {
                 pColor = R_GetLightGridPalettedColor(pCurData[iData]);
                 VectorMA(vLight, fWeight, pColor, vLight);
                 fTotalFactor += fWeight;
             }
 
-			iData += 2;
+            iData += 2;
             if (pCurData[iData]) {
-				pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
                 VectorMA(vLight, fWeight2, pColor, vLight);
                 fTotalFactor += fWeight2;
             }
-		}
+        }
 
-	cont:
-		;
-	}
+    cont:;
+    }
 
-	if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
-		VectorScale(vLight, 1.0 / fTotalFactor, vLight);
-	}
+    if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
+        VectorScale(vLight, 1.0 / fTotalFactor, vLight);
+    }
 
-	if (fTotalFactor) {
-		if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+    if (fTotalFactor) {
+        if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
             float t;
             // normalize color values
             t = 255.0 / (float)Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
@@ -868,23 +891,182 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
             vLight[0] = (float)vLight[0] * t;
             vLight[1] = (float)vLight[1] * t;
             vLight[2] = (float)vLight[2] * t;
-		}
-	} else {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-	}
+        }
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+    }
 }
 
+/*
+===============
+R_GetLightingGridValueFast
+===============
+*/
 void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
 {
+    byte      *pColor;
+    int        i;
+    int        iRowPos;
+    int        iGridPos[3];
+    int        iArrayXStep;
+    float      fV[3];
+    vec3_t     vLightOrigin;
+    int        iData;
+    int        iLen;
+    int        iBaseOffset;
+    byte      *pCurData;
+    int        iOrder;
+    int        iToggle;
+    int        iSample[8];
+    float      fDist[3];
+    int        j, k;
+    static int iSearch[8][8] = {
+        {0, 4, 2, 6, 1, 5, 3, 7},
+        {0, 2, 4, 6, 1, 3, 5, 7},
+        {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 2, 1, 3, 4, 6, 5, 7},
+        {0, 4, 1, 5, 2, 6, 3, 7},
+        {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 4, 5, 2, 3, 6, 7},
+        {0, 1, 2, 3, 4, 5, 6, 7}
+    };
+
     if (!tr.world->lightGridData || !tr.world->lightGridOffsets) {
         vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
         return;
     }
 
-    // FIXME: unimplemented
+    iOrder  = 0;
+    iToggle = 0;
+
+    for (i = 0; i < 3; i++) {
+        fV[i] =
+            (tr.world->lightGridSize[i] * 0.5 + vPos[i] - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i];
+        iGridPos[i] = floor(fV[i]);
+        fV[i] -= iGridPos[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+            fV[i]       = 0.0;
+        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
+            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
+            fV[i]       = 1.0;
+        }
+
+        fDist[i] = 0.5 - fV[i];
+        if (fDist[i] < 0) {
+            fDist[i] = -fDist[i];
+            iToggle |= 1 << i;
+        }
+    }
+
+    if (fDist[1] >= fDist[0]) {
+        iOrder = 1;
+    }
+    if (fDist[2] >= fDist[0]) {
+        iOrder |= 2;
+    }
+    if (fDist[2] >= fDist[1]) {
+        iOrder |= 4;
+    }
+
+    for (i = 0; i < 8; i++) {
+        iSample[i] = -1;
+    }
+    iBaseOffset = iGridPos[1] + tr.world->lightGridBounds[0] + iGridPos[0] * tr.world->lightGridBounds[1];
+
+    for (i = 0; i < 8; i++) {
+        j = iSearch[iOrder][i] ^ iToggle;
+
+        if (iSample[j] < 0) {
+            switch (j & 3) {
+            case 0:
+                pCurData =
+                    &tr.world->lightGridData
+                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset]];
+                break;
+            case 1:
+                pCurData =
+                    &tr.world->lightGridData
+                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset + 1]];
+                break;
+            case 2:
+                pCurData = &tr.world->lightGridData
+                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
+                                 + tr.world->lightGridOffsets[iBaseOffset + tr.world->lightGridBounds[1]]];
+                break;
+            case 3:
+            default:
+                pCurData = &tr.world->lightGridData
+                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
+                                 + tr.world->lightGridOffsets[iBaseOffset + tr.world->lightGridBounds[1] + 1]];
+                break;
+            }
+
+            k = j & ~1;
+
+            iRowPos = iGridPos[2];
+            iData   = 0;
+
+            while (1) {
+                qboolean bShouldBreak = qfalse;
+
+                for (; (char)pCurData[iData] >= 0; iData += 2, iRowPos -= iLen) {
+                    iLen = (char)pCurData[iData] + 2;
+
+                    if (iLen - 1 < iRowPos) {
+                        continue;
+                    }
+
+                    if (iLen - 1 > iRowPos) {
+                        iSample[k + 1] = pCurData[iData + 1];
+                        iSample[k]     = pCurData[iData + 1];
+                    } else {
+                        iSample[k]     = pCurData[iData + 1];
+                        iSample[k + 1] = pCurData[iData + 3];
+                    }
+
+                    bShouldBreak = qtrue;
+                    break;
+                }
+
+                if (bShouldBreak) {
+                    break;
+                }
+
+                if (-(char)pCurData[iData] > iRowPos) {
+                    iSample[k] = pCurData[iRowPos + iData + 1];
+
+                    if ((-(char)pCurData[iData] - 1) == iRowPos) {
+                        iSample[k + 1] = pCurData[iRowPos + iData + 3];
+                    } else {
+                        iSample[k + 1] = pCurData[iRowPos + iData + 2];
+                    }
+                    break;
+                }
+
+                iRowPos -= -(char)pCurData[iData];
+                iData += -(char)pCurData[iData] + 1;
+            }
+        }
+
+        if (iSample[j] > 0) {
+            pColor    = R_GetLightGridPalettedColor(iSample[j]);
+            vLight[0] = pColor[0];
+            vLight[1] = pColor[1];
+            vLight[2] = pColor[2];
+            return;
+        }
+    }
+
     vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
 }
 
+/*
+===============
+R_GetLightingForDecal
+===============
+*/
 void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
 {
     float fMax;
@@ -898,74 +1080,120 @@ void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOr
     VectorScale(vLight, tr.overbrightMult, vLight);
 
     if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-        float scale = 255.0 / fmax(vLight[0], fmax(vLight[1], vLight[2]));
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
         VectorScale(vLight, scale, vLight);
     }
 }
 
+/*
+===============
+R_GetLightingForSmoke
+===============
+*/
 void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
 {
-    // FIXME: unimplemented
-	VectorSet(vLight, 1.f, 1.f, 1.f);
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    dir;
+    float     d;
+
+    if (r_smoothsmokelight->integer) {
+        R_GetLightingGridValue(vOrigin, vLight);
+    } else {
+        R_GetLightingGridValueFast(vOrigin, vLight);
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        dl = &backEnd.refdef.dlights[i];
+        VectorSubtract(dl->origin, vOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    vLight[0] /= 255.0;
+    vLight[1] /= 255.0;
+    vLight[2] /= 255.0;
 }
 
+/*
+===============
+RB_GetEntityGridLighting
+===============
+*/
 static int RB_GetEntityGridLighting()
 {
-	int iColor;
-	int i;
-	dlight_t* dl;
-	float power;
-	vec3_t vLight;
-	vec3_t dir;
-	float d;
-	float* lightOrigin;
+    int       iColor;
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    vLight;
+    vec3_t    dir;
+    float     d;
+    float    *lightOrigin;
 
-	lightOrigin = backEnd.currentSphere->traceOrigin;
-	if (!(backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-		R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
-	} else {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
-	}
+    lightOrigin = backEnd.currentSphere->traceOrigin;
+    if (!(backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
+        R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
+    }
 
-	for (i = 0; i < backEnd.refdef.num_dlights; i++) {
-		dl = &backEnd.refdef.dlights[i];
-		VectorSubtract(dl->origin, lightOrigin, dir);
-		d = VectorLengthSquared(dir);
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        dl = &backEnd.refdef.dlights[i];
+        VectorSubtract(dl->origin, lightOrigin, dir);
+        d = VectorLengthSquared(dir);
 
-		power = dl->radius * dl->radius;
-		if (power >= d) {
-			d = dl->radius * 7500.0 / d;
-			VectorMA(vLight, d, dl->color, vLight);
-		}
-	}
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
 
-	if (tr.overbrightShift)
-	{
-		vLight[0] = tr.overbrightMult * vLight[0];
-		vLight[1] = tr.overbrightMult * vLight[1];
-		vLight[2] = tr.overbrightMult * vLight[2];
-	}
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
 
-	// normalize
-	if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-		float scale = 255.0 / fmax(vLight[0], fmax(vLight[1], vLight[2]));
-		VectorScale(vLight, scale, vLight);
-	}
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
 
-	// clamp ambient
-	for (i = 0; i < 3; i++) {
-		if (vLight[i] > tr.identityLightByte) {
-			vLight[i] = tr.identityLightByte;
-		}
-	}
+    // clamp ambient
+    for (i = 0; i < 3; i++) {
+        if (vLight[i] > tr.identityLightByte) {
+            vLight[i] = tr.identityLightByte;
+        }
+    }
 
-	// save out the byte packet version
-	((byte*)&iColor)[0] = myftol(vLight[0]);
-	((byte*)&iColor)[1] = myftol(vLight[1]);
-	((byte*)&iColor)[2] = myftol(vLight[2]);
-	((byte*)&iColor)[3] = 0xff;
+    // save out the byte packet version
+    ((byte *)&iColor)[0] = myftol(vLight[0]);
+    ((byte *)&iColor)[1] = myftol(vLight[1]);
+    ((byte *)&iColor)[2] = myftol(vLight[2]);
+    ((byte *)&iColor)[3] = 0xff;
 
-	return iColor;
+    return iColor;
 
 #if 0
 	int				i;
@@ -1055,114 +1283,120 @@ static int RB_GetEntityGridLighting()
 
 	return ambientlightInt;
 #endif
-	// FIXME: unimplemented
 }
 
+/*
+===============
+RB_SetupEntityGridLighting
+===============
+*/
 void RB_SetupEntityGridLighting()
 {
-	trRefEntity_t* ent;
-	int iColor;
+    trRefEntity_t *ent;
+    int            iColor;
 
-	if (backEnd.currentEntity->bLightGridCalculated) {
-		return;
-	}
+    if (backEnd.currentEntity->bLightGridCalculated) {
+        return;
+    }
 
-	for (ent = backEnd.currentEntity; ent->e.parentEntity != ENTITYNUM_NONE; ent = &backEnd.refdef.entities[ent->e.parentEntity])
-	{
-		trRefEntity_t* newref = &backEnd.refdef.entities[ent->e.parentEntity];
-		if (newref == ent) {
-			assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
-			iColor = newref->iGridLighting;
-			break;
-		}
+    for (ent = backEnd.currentEntity; ent->e.parentEntity != ENTITYNUM_NONE;
+         ent = &backEnd.refdef.entities[ent->e.parentEntity]) {
+        trRefEntity_t *newref = &backEnd.refdef.entities[ent->e.parentEntity];
+        if (newref == ent) {
+            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
+            iColor = newref->iGridLighting;
+            break;
+        }
 
-		if (newref->bLightGridCalculated) {
-			iColor = newref->iGridLighting;
-			break;
-		}
-	}
+        if (newref->bLightGridCalculated) {
+            iColor = newref->iGridLighting;
+            break;
+        }
+    }
 
-	if (ent->e.parentEntity == ENTITYNUM_NONE) {
-		iColor = RB_GetEntityGridLighting();
-	}
+    if (ent->e.parentEntity == ENTITYNUM_NONE) {
+        iColor = RB_GetEntityGridLighting();
+    }
 
-	ent = backEnd.currentEntity;
-	for (;;)
-	{
-		ent->bLightGridCalculated = 1;
-		ent->iGridLighting = iColor;
-		if (ent->e.parentEntity == ENTITYNUM_NONE) {
-			break;
-		}
+    ent = backEnd.currentEntity;
+    for (;;) {
+        ent->bLightGridCalculated = 1;
+        ent->iGridLighting        = iColor;
+        if (ent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
 
-		if (ent == &backEnd.refdef.entities[ent->e.parentEntity]) {
-			assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
-			break;
-		}
+        if (ent == &backEnd.refdef.entities[ent->e.parentEntity]) {
+            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
+            break;
+        }
 
-		ent = &backEnd.refdef.entities[ent->e.parentEntity];
-	}
+        ent = &backEnd.refdef.entities[ent->e.parentEntity];
+    }
 }
 
-void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin)
+/*
+===============
+RB_SetupStaticModelGridLighting
+===============
+*/
+void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t *ent, const vec3_t lightOrigin)
 {
-	int iColor;
-	int i;
-	dlight_t* dl;
-	float power;
-	vec3_t vLight;
-	vec3_t dir;
-	float d;
+    int       iColor;
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    vLight;
+    vec3_t    dir;
+    float     d;
 
-	if (ent->bLightGridCalculated) {
-		return;
-	}
-	ent->bLightGridCalculated = qtrue;
+    if (ent->bLightGridCalculated) {
+        return;
+    }
+    ent->bLightGridCalculated = qtrue;
 
-	if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-		R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
-	}
-	else {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
-	}
+    if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
+        R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
+    }
 
-	for (i = 0; i < refdef->num_dlights; i++) {
-		dl = &refdef->dlights[i];
-		VectorSubtract(dl->origin, lightOrigin, dir);
-		d = VectorLengthSquared(dir);
+    for (i = 0; i < refdef->num_dlights; i++) {
+        dl = &refdef->dlights[i];
+        VectorSubtract(dl->origin, lightOrigin, dir);
+        d = VectorLengthSquared(dir);
 
-		power = dl->radius * dl->radius;
-		if (power >= d) {
-			d = dl->radius * 7500.0 / d;
-			VectorMA(vLight, d, dl->color, vLight);
-		}
-	}
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
 
-	if (tr.overbrightShift)
-	{
-		vLight[0] = tr.overbrightMult * vLight[0];
-		vLight[1] = tr.overbrightMult * vLight[1];
-		vLight[2] = tr.overbrightMult * vLight[2];
-	}
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
 
-	// normalize
-	if (vLight[0] < 255.0 || vLight[1] < 255.0 || vLight[2] < 255.0) {
-		float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
-		VectorScale(vLight, scale, vLight);
-	}
+    // normalize
+    if (vLight[0] < 255.0 || vLight[1] < 255.0 || vLight[2] < 255.0) {
+        float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
 
-	// clamp ambient
-	for (i = 0; i < 3; i++) {
-		if (vLight[i] > tr.identityLightByte) {
-			vLight[i] = tr.identityLightByte;
-		}
-	}
+    // clamp ambient
+    for (i = 0; i < 3; i++) {
+        if (vLight[i] > tr.identityLightByte) {
+            vLight[i] = tr.identityLightByte;
+        }
+    }
 
-	// save out the byte packet version
-	((byte*)&ent->iGridLighting)[0] = myftol(vLight[0]);
-	((byte*)&ent->iGridLighting)[1] = myftol(vLight[1]);
-	((byte*)&ent->iGridLighting)[2] = myftol(vLight[2]);
-	((byte*)&ent->iGridLighting)[3] = 0xff;
+    // save out the byte packet version
+    ((byte *)&ent->iGridLighting)[0] = myftol(vLight[0]);
+    ((byte *)&ent->iGridLighting)[1] = myftol(vLight[1]);
+    ((byte *)&ent->iGridLighting)[2] = myftol(vLight[2]);
+    ((byte *)&ent->iGridLighting)[3] = 0xff;
 }
 
 /*
@@ -1173,150 +1407,169 @@ LIGHT SAMPLING
 =============================================================================
 */
 
-extern	cvar_t	*r_ambientScale;
-extern	cvar_t	*r_directedScale;
+extern cvar_t *r_ambientScale;
+extern cvar_t *r_directedScale;
 
 /*
 ===============
 LogLight
 ===============
 */
-static void LogLight( trRefEntity_t *ent ) {
-	int	max1, max2;
+static void LogLight(trRefEntity_t *ent)
+{
+    int max1, max2;
 
-	if ( !(ent->e.renderfx & RF_FIRST_PERSON ) ) {
-		return;
-	}
-
-	max1 = ent->ambientLight[0];
-	if ( ent->ambientLight[1] > max1 ) {
-		max1 = ent->ambientLight[1];
-	} else if ( ent->ambientLight[2] > max1 ) {
-		max1 = ent->ambientLight[2];
-	}
-
-	max2 = ent->directedLight[0];
-	if ( ent->directedLight[1] > max2 ) {
-		max2 = ent->directedLight[1];
-	} else if ( ent->directedLight[2] > max2 ) {
-		max2 = ent->directedLight[2];
-	}
-
-	ri.Printf( PRINT_ALL, "amb:%i  dir:%i\n", max1, max2 );
-}
-
-void R_ClearRealDlights() {
-	memset(dli.allocated, 0, sizeof(dli.allocated));
-	dli.dlightMap = 0;
-}
-
-void R_UploadDlights() {
-	int i, h;
-
-	if (!tr.pc.c_dlightSurfaces) {
-		return;
-	}
-
-	h = 0;
-	for (i = 0; i < LIGHTMAP_SIZE; i++)
-	{
-		if (h < dli.allocated[i]) {
-			h = dli.allocated[i];
-		}
-	}
-
-	if (h)
-	{
-		if (h > LIGHTMAP_SIZE) {
-			ri.Error(ERR_DROP, "R_UploadDlights: bad allocated height");
-		}
-
-		GL_Bind(tr.dlightImages[dli.dlightMap]);
-		qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LIGHTMAP_SIZE, h, GL_RGBA, GL_UNSIGNED_BYTE, dli.lightmap_buffer);
-
-		tr.pc.c_dlightMaps++;
-		memset(dli.allocated, 0, sizeof(dli.allocated));
-	}
-}
-
-qboolean R_AllocLMBlock(int w, int h, int* x, int* y) {
-	int i, j;
-	int best, best2;
-
-	for (;;)
-	{
-		best = LIGHTMAP_SIZE;
-		for (i = 0; i < LIGHTMAP_SIZE - w; i++)
-		{
-			best2 = 0;
-
-			for (j = 0; j < w && dli.allocated[i] < best; j++)
-			{
-				if (best2 < dli.allocated[i]) {
-					best2 = dli.allocated[i];
-				}
-			}
-
-			if (j == w)
-			{
-				*x = i;
-				*y = best2;
-				best = best2;
-			}
-		}
-
-		if (h + best <= LIGHTMAP_SIZE) {
-			break;
-		}
-
-		if (dli.dlightMap == 14) {
-			return qfalse;
-		}
-
-		R_UploadDlights();
-		dli.dlightMap++;
-	}
-
-	return qtrue;
-}
-
-qboolean R_DlightSample(byte* src, const vec3_t vec, byte* dst) {
-	int r, g, b;
-	int k;
-	qboolean added;
-	vec3_t dir;
-	float add;
-
-	added = qfalse;
-	r = src[0];
-	g = src[1];
-	b = src[2];
-
-	for (k = 0; k < dli.numLights; k++) {
-		incidentLight_t* light = &dli.lights[k];
-
-		VectorSubtract(vec, light->origin, dir);
-		add = VectorLength(dir) * light->power;
-		if (add <= 1.f) {
-			float t = (1.0 - add) * (1.0 - add) * 375.0;
-
-			r = (int)(t * light->dl->color[0] + (float)r);
-			g = (int)(t * light->dl->color[1] + (float)g);
-			b = (int)(t * light->dl->color[2] + (float)b);
-			// light was added
-			added = qtrue;
-		}
+    if (!(ent->e.renderfx & RF_FIRST_PERSON)) {
+        return;
     }
 
-	if (tr.overbrightShift) {
-		r <<= tr.overbrightShift & 0xFF;
-		g <<= tr.overbrightShift & 0xFF;
-		b <<= tr.overbrightShift & 0xFF;
-	}
+    max1 = ent->ambientLight[0];
+    if (ent->ambientLight[1] > max1) {
+        max1 = ent->ambientLight[1];
+    } else if (ent->ambientLight[2] > max1) {
+        max1 = ent->ambientLight[2];
+    }
 
-	if (r > 0xFF || g > 0xFF || b > 0xFF) {
+    max2 = ent->directedLight[0];
+    if (ent->directedLight[1] > max2) {
+        max2 = ent->directedLight[1];
+    } else if (ent->directedLight[2] > max2) {
+        max2 = ent->directedLight[2];
+    }
+
+    ri.Printf(PRINT_ALL, "amb:%i  dir:%i\n", max1, max2);
+}
+
+/*
+===============
+R_ClearRealDlights
+===============
+*/
+void R_ClearRealDlights()
+{
+    memset(dli.allocated, 0, sizeof(dli.allocated));
+    dli.dlightMap = 0;
+}
+
+/*
+===============
+R_UploadDlights
+===============
+*/
+void R_UploadDlights()
+{
+    int i, h;
+
+    if (!tr.pc.c_dlightSurfaces) {
+        return;
+    }
+
+    h = 0;
+    for (i = 0; i < LIGHTMAP_SIZE; i++) {
+        if (h < dli.allocated[i]) {
+            h = dli.allocated[i];
+        }
+    }
+
+    if (h) {
+        if (h > LIGHTMAP_SIZE) {
+            ri.Error(ERR_DROP, "R_UploadDlights: bad allocated height");
+        }
+
+        GL_Bind(tr.dlightImages[dli.dlightMap]);
+        qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LIGHTMAP_SIZE, h, GL_RGBA, GL_UNSIGNED_BYTE, dli.lightmap_buffer);
+
+        tr.pc.c_dlightMaps++;
+        memset(dli.allocated, 0, sizeof(dli.allocated));
+    }
+}
+
+/*
+===============
+R_AllocLMBlock
+===============
+*/
+qboolean R_AllocLMBlock(int w, int h, int *x, int *y)
+{
+    int i, j;
+    int best, best2;
+
+    for (;;) {
+        best = LIGHTMAP_SIZE;
+        for (i = 0; i < LIGHTMAP_SIZE - w; i++) {
+            best2 = 0;
+
+            for (j = 0; j < w && dli.allocated[i] < best; j++) {
+                if (best2 < dli.allocated[i]) {
+                    best2 = dli.allocated[i];
+                }
+            }
+
+            if (j == w) {
+                *x   = i;
+                *y   = best2;
+                best = best2;
+            }
+        }
+
+        if (h + best <= LIGHTMAP_SIZE) {
+            break;
+        }
+
+        if (dli.dlightMap == 14) {
+            return qfalse;
+        }
+
+        R_UploadDlights();
+        dli.dlightMap++;
+    }
+
+    return qtrue;
+}
+
+/*
+===============
+R_DlightSample
+===============
+*/
+qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst)
+{
+    int      r, g, b;
+    int      k;
+    qboolean added;
+    vec3_t   dir;
+    float    add;
+
+    added = qfalse;
+    r     = src[0];
+    g     = src[1];
+    b     = src[2];
+
+    for (k = 0; k < dli.numLights; k++) {
+        incidentLight_t *light = &dli.lights[k];
+
+        VectorSubtract(vec, light->origin, dir);
+        add = VectorLength(dir) * light->power;
+        if (add <= 1.f) {
+            float t = (1.0 - add) * (1.0 - add) * 375.0;
+
+            r = (int)(t * light->dl->color[0] + (float)r);
+            g = (int)(t * light->dl->color[1] + (float)g);
+            b = (int)(t * light->dl->color[2] + (float)b);
+            // light was added
+            added = qtrue;
+        }
+    }
+
+    if (tr.overbrightShift) {
+        r <<= tr.overbrightShift & 0xFF;
+        g <<= tr.overbrightShift & 0xFF;
+        b <<= tr.overbrightShift & 0xFF;
+    }
+
+    if (r > 0xFF || g > 0xFF || b > 0xFF) {
         float t;
-		// normalize color values
+        // normalize color values
         t = 255.0 / (float)Q_max(r, Q_max(g, b));
 
         r = (int)((float)r * t);
@@ -1324,10 +1577,10 @@ qboolean R_DlightSample(byte* src, const vec3_t vec, byte* dst) {
         b = (int)((float)b * t);
     }
 
-	dst[0] = (byte)r;
-	dst[1] = (byte)g;
-	dst[2] = (byte)b;
-	dst[3] = -1;
+    dst[0] = (byte)r;
+    dst[1] = (byte)g;
+    dst[2] = (byte)b;
+    dst[3] = -1;
 
-	return added;
+    return added;
 }

From c68f23cdafe28134e36992e16f804f073d1e8216 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 00:21:31 +0200
Subject: [PATCH 0807/2040] Fix compilation warnings

---
 code/cgame/cg_testemitter.cpp | 14 ++++++++++----
 code/client/cl_main.cpp       |  8 ++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index 30bac2e1..c24f45bf 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -1176,10 +1176,10 @@ void CG_DumpEmitter_f(void)
             buff +=
                 va("%s\tspawnrange %i %i\n",
                    sTabbing.c_str(),
-                   sqrt(pCurrSpawnthing->fMinRangeSquared),
-                   sqrt(pCurrSpawnthing->fMaxRangeSquared));
+                   (int)sqrt(pCurrSpawnthing->fMinRangeSquared),
+                   (int)sqrt(pCurrSpawnthing->fMaxRangeSquared));
         } else if (pCurrSpawnthing->fMaxRangeSquared > 0) {
-            buff += va("%s\tspawnrange %i\n", sTabbing.c_str(), sqrt(pCurrSpawnthing->fMaxRangeSquared));
+            buff += va("%s\tspawnrange %i\n", sTabbing.c_str(), (int)sqrt(pCurrSpawnthing->fMaxRangeSquared));
         }
 
         if (pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) {
@@ -1441,7 +1441,13 @@ void CG_DumpEmitter_f(void)
 }
 
 void CG_LoadBaseAndAmplitude(
-    char **pBufer, char *szCvarX, char *szCvarY, char *szCvarZ, char *szCvarXAmp, char *szCvarYAmp, char *szCvarZAmp
+    char      **pBufer,
+    const char *szCvarX,
+    const char *szCvarY,
+    const char *szCvarZ,
+    const char *szCvarXAmp,
+    const char *szCvarYAmp,
+    const char *szCvarZAmp
 )
 {
     char com_token[MAX_TOKEN_CHARS];
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 8860f721..4160ecd0 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3832,10 +3832,10 @@ CL_ServerStatusResponse
 ===================
 */
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
-	char	*s;
-	char	info[MAX_INFO_STRING];
-	int		i, l, score, ping;
-	int		len;
+	const char	*s;
+	char		info[MAX_INFO_STRING];
+	int			i, l, score, ping;
+	int			len;
 	serverStatus_t *serverStatus;
 
 	serverStatus = NULL;

From 4a565f09851777030995c40eae4e8f4b0be764f4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 00:23:43 +0200
Subject: [PATCH 0808/2040] Declare R_GetLightingGridValueFast

---
 code/renderer/tr_local.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index a41e7bc9..67e659e7 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1952,6 +1952,7 @@ LIGHTS
 
 void R_DlightBmodel( bmodel_t *bmodel );
 void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
+void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight);
 void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
 void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
 void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent );

From fd1ee31e1e53163e9b4a557ac2dd28d006742d6a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 17:56:26 +0200
Subject: [PATCH 0809/2040] Remove useless comment

---
 code/renderer/tr_font.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/renderer/tr_font.cpp b/code/renderer/tr_font.cpp
index 720799c7..3f6e8d26 100644
--- a/code/renderer/tr_font.cpp
+++ b/code/renderer/tr_font.cpp
@@ -852,7 +852,6 @@ void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const ve
 }
 
 void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
-    // FIXME: unimplemented
     return R_DrawFloatingString_sgl(font->sgl[0], text, org, color, scale, maxlen);
 }
 

From 3478bbddf24cad4cd5557193c133fc02a3659f03 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:02:39 +0200
Subject: [PATCH 0810/2040] Implement RB_ComputeShadowVolume

---
 code/renderer/tr_shadows.c | 96 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_shadows.c b/code/renderer/tr_shadows.c
index d0ab3e24..5db94a28 100644
--- a/code/renderer/tr_shadows.c
+++ b/code/renderer/tr_shadows.c
@@ -248,8 +248,102 @@ void RB_ShadowTessEnd( void ) {
 	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 }
 
+/*
+=================
+RB_ComputeShadowVolume
+
+=================
+*/
 void RB_ComputeShadowVolume() {
-	// FIXME: unimplemented
+    int i;
+    int numTris;
+    vec3_t lightDir;
+
+    if (r_shadows->integer != 3 || glConfig.stencilBits < 8) {
+        return;
+    }
+
+    VectorSet(lightDir, -2.0, 1.5, 1.0);
+
+    // project vertexes away from light direction
+    for (i = 0; i < tess.numVertexes; i++) {
+        VectorMA(tess.xyz[i], -512, lightDir, tess.xyz[i + tess.numVertexes]);
+    }
+
+    // decide which triangles face the light
+    Com_Memset(numEdgeDefs, 0, 4 * tess.numVertexes);
+
+    numTris = tess.numIndexes / 3;
+    for (i = 0; i < numTris; i++) {
+        int		i1, i2, i3;
+        vec3_t	d1, d2, normal;
+        float* v1, * v2, * v3;
+        float	d;
+
+        i1 = tess.indexes[i * 3 + 0];
+        i2 = tess.indexes[i * 3 + 1];
+        i3 = tess.indexes[i * 3 + 2];
+
+        v1 = tess.xyz[i1];
+        v2 = tess.xyz[i2];
+        v3 = tess.xyz[i3];
+
+        VectorSubtract(v2, v1, d1);
+        VectorSubtract(v3, v1, d2);
+        CrossProduct(d1, d2, normal);
+
+        d = DotProduct(normal, lightDir);
+        if (d > 0) {
+            facing[i] = 1;
+        } else {
+            facing[i] = 0;
+        }
+
+        // create the edges
+        R_AddEdgeDef(i1, i2, facing[i]);
+        R_AddEdgeDef(i2, i3, facing[i]);
+        R_AddEdgeDef(i3, i1, facing[i]);
+    }
+
+	// draw the silhouette edges
+
+	GL_Bind( tr.whiteImage );
+	qglEnable( GL_CULL_FACE );
+	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
+	qglColor3f( 0.2f, 0.2f, 0.2f );
+
+	// don't write to the color buffer
+	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
+
+	qglEnable( GL_STENCIL_TEST );
+	qglStencilFunc( GL_ALWAYS, 1, 255 );
+
+	// mirrors have the culling order reversed
+	if ( backEnd.viewParms.isMirror ) {
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	} else {
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	}
+
+
+	// reenable writing to the color buffer
+	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 }
 
 /*

From 02faf6f8c10d777532a0031422b3e0ef99eaa0bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:27:19 +0200
Subject: [PATCH 0811/2040] Implement R_Sky_ChangeFrustum

---
 code/renderer/tr_sky_portal.cpp | 93 ++++++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_sky_portal.cpp b/code/renderer/tr_sky_portal.cpp
index d79747c6..7f02a4c6 100644
--- a/code/renderer/tr_sky_portal.cpp
+++ b/code/renderer/tr_sky_portal.cpp
@@ -24,12 +24,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
+/*
+=================
+R_Sky_Init
+
+=================
+*/
 void R_Sky_Init()
 {
 	tr.viewParms.isPortalSky = qfalse;
 	tr.portalsky.numSurfs = 0;
 }
 
+/*
+=================
+R_Sky_Reset
+
+=================
+*/
 void R_Sky_Reset()
 {
     if (tr.viewParms.isPortalSky) {
@@ -46,6 +58,12 @@ void R_Sky_Reset()
 	tr.portalsky.numSurfs = 0;
 }
 
+/*
+=================
+R_Sky_AddSurf
+
+=================
+*/
 void R_Sky_AddSurf(msurface_t* surf)
 {
 	if (tr.viewParms.isPortalSky)
@@ -81,6 +99,12 @@ void R_Sky_AddSurf(msurface_t* surf)
 	}
 }
 
+/*
+=================
+R_Sky_Render
+
+=================
+*/
 void R_Sky_Render() {
     int i;
     viewParms_t newParms, oldParms;
@@ -150,10 +174,75 @@ void R_Sky_Render() {
 
 	tr.portalsky.numSurfs = 0;
 	tr.skyRendered = qtrue;
+
 	R_RotateForViewer();
 	R_SetupFrustum();
 }
 
+/*
+=================
+R_Sky_ChangeFrustum
+
+=================
+*/
 void R_Sky_ChangeFrustum() {
-	// FIXME: unimplemented
-}
\ No newline at end of file
+    cplane_t* frust;
+    int i;
+    vec3_t bounds[2];
+    vec3_t origin;
+    cplane_t abouts[4];
+
+    VectorCopy(tr.portalsky.mins, bounds[0]);
+    VectorCopy(tr.portalsky.maxs, bounds[1]);
+    VectorCopy(tr.viewParms.ori.origin, origin);
+
+    VectorCopy(tr.viewParms.ori.axis[2], abouts[0].normal);
+    VectorNegate(tr.viewParms.ori.axis[2], abouts[1].normal);
+    VectorCopy(tr.viewParms.ori.axis[1], abouts[2].normal);
+    VectorNegate(tr.viewParms.ori.axis[1], abouts[3].normal);
+
+    for (i = 0; i < 4; i++) {
+        cplane_t out;
+        int i1;
+        float leastfov = 99999;
+
+        frust = &tr.viewParms.frustum[i];
+
+        abouts[i].dist = DotProduct(tr.viewParms.ori.origin, abouts[i].normal);
+        CrossProduct(frust->normal, abouts[i].normal, out.normal);
+
+        for (i1 = 0; i1 < 8; i1++) {
+            vec3_t point;
+            vec_t distFromFrustum;
+            float angle;
+            int i2;
+
+            for (i2 = 0; i2 < 3; i2++) {
+                point[i2] = bounds[i1 % 3][i2];
+            }
+
+            VectorSubtract(point, origin, point);
+            distFromFrustum = DotProduct(point, frust->normal);
+            if (distFromFrustum <= 0) {
+                break;
+            }
+
+            angle = atan2(DotProduct(point, out.normal), distFromFrustum);
+            if (angle >= 0) {
+                angle = RAD2DEG(angle);
+                if (leastfov > angle) {
+                    leastfov = angle;
+                }
+            }
+        }
+
+        if (leastfov > 0 && leastfov < 180) {
+            RotatePointAroundVector(frust->normal, abouts[i].normal, frust->normal, leastfov);
+            VectorNormalize(frust->normal);
+
+            frust->type = PLANE_NON_AXIAL;
+            frust->dist = DotProduct(origin, frust->normal);
+            SetPlaneSignbits(frust);
+        }
+    }
+}

From d898c0f995f64122c437bd940848a9e08af7be3c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:45:17 +0200
Subject: [PATCH 0812/2040] Implement R_PrintInfoStaticModels

---
 code/renderer/tr_staticmodels.cpp | 543 +++++++++++++++++-------------
 1 file changed, 308 insertions(+), 235 deletions(-)

diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index b1f2d57f..90123ec8 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,39 +25,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tr_local.h"
 #include "tiki.h"
 
-#define MAX_STATIC_MODELS_SURFS		8192
+#define MAX_STATIC_MODELS_SURFS    8192
+#define MAX_DISTINCT_STATIC_MODELS 1000
 
-int g_nStaticSurfaces;
+int             g_nStaticSurfaces;
 staticSurface_t g_staticSurfaces[MAX_STATIC_MODELS_SURFS];
-qboolean g_bInfostaticmodels = qfalse;
+qboolean        g_bInfostaticmodels = qfalse;
 
 /*
 ==============
 R_InitStaticModels
 ==============
 */
-void R_InitStaticModels(void) {
-    cStaticModelUnpacked_t* pSM;
-    char	szTemp[1024];
-    bool	exists;
-    skelBoneCache_t		bones[128];
-    float	radius;
-    int		i, j, k, l;
+void R_InitStaticModels(void)
+{
+    cStaticModelUnpacked_t *pSM;
+    char                    szTemp[1024];
+    bool                    exists;
+    skelBoneCache_t         bones[128];
+    float                   radius;
+    int                     i, j, k, l;
 
     g_bInfostaticmodels = qfalse;
 
-    if (tr.overbrightShift)
-    {
-        for (i = 0; i < tr.world->numStaticModelData; i++)
-        {
-            int		r, g, b;
+    if (tr.overbrightShift) {
+        for (i = 0; i < tr.world->numStaticModelData; i++) {
+            int r, g, b;
 
             r = (int)((float)tr.world->staticModelData[i * 4] * tr.overbrightMult);
             g = (int)((float)tr.world->staticModelData[i * 4 + 1] * tr.overbrightMult);
             b = (int)((float)tr.world->staticModelData[i * 4 + 2] * tr.overbrightMult);
 
-            if (r > 0xFF || g > 0xFF || b > 0xFF)
-            {
+            if (r > 0xFF || g > 0xFF || b > 0xFF) {
                 float t;
 
                 t = 255.0 / (float)Q_max(r, Q_max(g, b));
@@ -67,14 +66,13 @@ void R_InitStaticModels(void) {
                 b = (int)((float)b * t);
             }
 
-            tr.world->staticModelData[i * 4] = r;
+            tr.world->staticModelData[i * 4]     = r;
             tr.world->staticModelData[i * 4 + 1] = g;
             tr.world->staticModelData[i * 4 + 2] = b;
         }
     }
 
-    for (i = 0; i < tr.world->numStaticModels; i++)
-    {
+    for (i = 0; i < tr.world->numStaticModels; i++) {
         vec3_t mins, maxs;
 
         pSM = &tr.world->staticModels[i];
@@ -84,13 +82,12 @@ void R_InitStaticModels(void) {
 
         if (!strnicmp(pSM->model, "models", 6)) {
             strcpy(szTemp, pSM->model);
-        }
-        else {
+        } else {
             sprintf(szTemp, "models/%s", pSM->model);
         }
 
         FS_CanonicalFilename(szTemp);
-        exists = TIKI_FindTiki(szTemp) != NULL;
+        exists    = TIKI_FindTiki(szTemp) != NULL;
         pSM->tiki = TIKI_RegisterTiki(szTemp);
 
         if (!pSM->tiki) {
@@ -103,17 +100,21 @@ void R_InitStaticModels(void) {
         //
         // register shaders
         //
-        for (j = 0; j < pSM->tiki->num_surfaces; j++)
-        {
-            dtikisurface_t* surf = &pSM->tiki->surfaces[j];
+        for (j = 0; j < pSM->tiki->num_surfaces; j++) {
+            dtikisurface_t *surf = &pSM->tiki->surfaces[j];
 
-            for (k = 0; k < surf->numskins; k++)
-            {
+            for (k = 0; k < surf->numskins; k++) {
                 if (surf->shader[k][0]) {
-                    shader_t* sh = R_FindShader(surf->shader[k], -1, !(surf->flags & TIKI_SURF_NOMIPMAPS), !(surf->flags & TIKI_SURF_NOPICMIP), qtrue, qtrue);
+                    shader_t *sh = R_FindShader(
+                        surf->shader[k],
+                        -1,
+                        !(surf->flags & TIKI_SURF_NOMIPMAPS),
+                        !(surf->flags & TIKI_SURF_NOPICMIP),
+                        qtrue,
+                        qtrue
+                    );
                     surf->hShader[k] = sh->index;
-                }
-                else {
+                } else {
                     surf->hShader[k] = 0;
                 }
             }
@@ -126,12 +127,10 @@ void R_InitStaticModels(void) {
         // Suggestion:
         // It would be cool to have animated static model in the future
 
-        if (!exists)
-        {
-            for (j = 0; j < pSM->tiki->numMeshes; j++)
-            {
-                skelHeaderGame_t* skelmodel = TIKI_GetSkel(pSM->tiki->mesh[j]);
-                skelSurfaceGame_t* surf;
+        if (!exists) {
+            for (j = 0; j < pSM->tiki->numMeshes; j++) {
+                skelHeaderGame_t  *skelmodel = TIKI_GetSkel(pSM->tiki->mesh[j]);
+                skelSurfaceGame_t *surf;
 
                 if (!skelmodel) {
                     ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
@@ -140,66 +139,69 @@ void R_InitStaticModels(void) {
 
                 surf = skelmodel->pSurfaces;
 
-                for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext)
-                {
-                    byte* buf;
-                    byte* p;
-                    skelWeight_t* weight;
-                    skeletorVertex_t* vert;
+                for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext) {
+                    byte             *buf;
+                    byte             *p;
+                    skelWeight_t     *weight;
+                    skeletorVertex_t *vert;
 
                     if (surf->pStaticXyz) {
                         continue;
                     }
 
                     // allocate static vectors
-                    p = buf = (byte*)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
-                    surf->pStaticXyz = (vec4_t*)p;
+                    p = buf =
+                        (byte *)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
+                    surf->pStaticXyz = (vec4_t *)p;
                     p += sizeof(vec4_t) * surf->numVerts;
-                    surf->pStaticNormal = (vec4_t*)p;
+                    surf->pStaticNormal = (vec4_t *)p;
                     p += sizeof(vec4_t) * surf->numVerts;
                     surf->pStaticTexCoords = (vec2_t(*)[2])p;
 
                     vert = surf->pVerts;
 
-                    for (l = 0; l < surf->numVerts; l++)
-                    {
-                        int channel;
-                        skelBoneCache_t* bone;
+                    for (l = 0; l < surf->numVerts; l++) {
+                        int              channel;
+                        skelBoneCache_t *bone;
 
-                        weight = (skelWeight_t*)((byte*)vert + sizeof(skeletorVertex_t) + vert->numMorphs * sizeof(skeletorMorph_t));
+                        weight = (skelWeight_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                                  + vert->numMorphs * sizeof(skeletorMorph_t));
 
                         if (j > 0) {
-                            channel = pSM->tiki->m_boneList.GetLocalFromGlobal(skelmodel->pBones[weight->boneIndex].channel);
-                        }
-                        else {
+                            channel =
+                                pSM->tiki->m_boneList.GetLocalFromGlobal(skelmodel->pBones[weight->boneIndex].channel);
+                        } else {
                             channel = weight->boneIndex;
                         }
 
                         bone = &bones[channel];
 
-                        surf->pStaticXyz[l][0] = ((weight->offset[0] * bone->matrix[0][0]
-                            + weight->offset[1] * bone->matrix[1][0]
-                            + weight->offset[2] * bone->matrix[2][0])
-                            + bone->offset[0]) * weight->boneWeight;
-                        surf->pStaticXyz[l][1] = ((weight->offset[0] * bone->matrix[0][1]
-                            + weight->offset[1] * bone->matrix[1][1]
-                            + weight->offset[2] * bone->matrix[2][1])
-                            + bone->offset[1]) * weight->boneWeight;
-                        surf->pStaticXyz[l][2] = ((weight->offset[0] * bone->matrix[0][2]
-                            + weight->offset[1] * bone->matrix[1][2]
-                            + weight->offset[2] * bone->matrix[2][2])
-                            + bone->offset[2]) * weight->boneWeight;
+                        surf->pStaticXyz[l][0] =
+                            ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                              + weight->offset[2] * bone->matrix[2][0])
+                             + bone->offset[0])
+                            * weight->boneWeight;
+                        surf->pStaticXyz[l][1] =
+                            ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                              + weight->offset[2] * bone->matrix[2][1])
+                             + bone->offset[1])
+                            * weight->boneWeight;
+                        surf->pStaticXyz[l][2] =
+                            ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                              + weight->offset[2] * bone->matrix[2][2])
+                             + bone->offset[2])
+                            * weight->boneWeight;
                         surf->pStaticXyz[l][3] = 0.f;
 
                         surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
-                            + vert->normal[1] * bone->matrix[1][0]
-                            + vert->normal[2] * bone->matrix[2][0];
+                                                  + vert->normal[1] * bone->matrix[1][0]
+                                                  + vert->normal[2] * bone->matrix[2][0];
                         surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
-                            + vert->normal[1] * bone->matrix[1][1]
-                            + vert->normal[2] * bone->matrix[2][1];
+                                                  + vert->normal[1] * bone->matrix[1][1]
+                                                  + vert->normal[2] * bone->matrix[2][1];
                         surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
-                            + vert->normal[1] * bone->matrix[1][2]
-                            + vert->normal[2] * bone->matrix[2][2];
+                                                  + vert->normal[1] * bone->matrix[1][2]
+                                                  + vert->normal[2] * bone->matrix[2][2];
                         surf->pStaticNormal[l][3] = 0.f;
 
                         surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
@@ -207,17 +209,19 @@ void R_InitStaticModels(void) {
                         surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
                         surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
 
-                        vert = (skeletorVertex_t*)((byte*)vert + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * vert->numMorphs + sizeof(skelWeight_t) * vert->numWeights);
+                        vert = (skeletorVertex_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                                    + sizeof(skeletorMorph_t) * vert->numMorphs
+                                                    + sizeof(skelWeight_t) * vert->numWeights);
                     }
                 }
             }
         }
     }
 
-    tr.refdef.numStaticModels = tr.world->numStaticModels;
-    tr.refdef.staticModels = tr.world->staticModels;
+    tr.refdef.numStaticModels    = tr.world->numStaticModels;
+    tr.refdef.staticModels       = tr.world->staticModels;
     tr.refdef.numStaticModelData = tr.world->numStaticModelData;
-    tr.refdef.staticModelData = tr.world->staticModelData;
+    tr.refdef.staticModelData    = tr.world->staticModelData;
 }
 
 /*
@@ -225,13 +229,13 @@ void R_InitStaticModels(void) {
 R_CullStaticModel
 ==============
 */
-static int R_CullStaticModel(dtiki_t* tiki, float fScale, const vec3_t vLocalOrg) {
-    vec3_t	bounds[2];
-    int		i;
-    int		cull;
+static int R_CullStaticModel(dtiki_t *tiki, float fScale, const vec3_t vLocalOrg)
+{
+    vec3_t bounds[2];
+    int    i;
+    int    cull;
 
-    for (i = 0; i < 3; i++)
-    {
+    for (i = 0; i < 3; i++) {
         bounds[0][i] = vLocalOrg[i] + tiki->a->mins[i] * fScale;
         bounds[1][i] = vLocalOrg[i] + tiki->a->maxs[i] * fScale;
     }
@@ -239,11 +243,10 @@ static int R_CullStaticModel(dtiki_t* tiki, float fScale, const vec3_t vLocalOrg
     cull = R_CullLocalBox(bounds);
 
     if (r_showcull->integer & 4) {
-        float fR, fG, fB;
+        float  fR, fG, fB;
         vec3_t vAngles;
 
-        switch (cull)
-        {
+        switch (cull) {
         case CULL_CLIP:
             fR = 1.0f;
             fG = 1.0f;
@@ -271,8 +274,7 @@ static int R_CullStaticModel(dtiki_t* tiki, float fScale, const vec3_t vLocalOrg
         R_DebugRotatedBBox(tr.ori.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
     }
 
-    switch (cull)
-    {
+    switch (cull) {
     case CULL_CLIP:
         tr.pc.c_box_cull_md3_clip++;
         break;
@@ -292,15 +294,16 @@ static int R_CullStaticModel(dtiki_t* tiki, float fScale, const vec3_t vLocalOrg
 R_AddStaticModelSurfaces
 ==============
 */
-void R_AddStaticModelSurfaces(void) {
-    cStaticModelUnpacked_t* SM;
-    int i, j, k;
-    int ofsStaticData;
-    int iRadiusCull;
-    dtiki_t* tiki;
-    float tiki_scale;
-    vec3_t tiki_localorigin;
-    vec3_t tiki_worldorigin;
+void R_AddStaticModelSurfaces(void)
+{
+    cStaticModelUnpacked_t *SM;
+    int                     i, j, k;
+    int                     ofsStaticData;
+    int                     iRadiusCull;
+    dtiki_t                *tiki;
+    float                   tiki_scale;
+    vec3_t                  tiki_localorigin;
+    vec3_t                  tiki_worldorigin;
 
     if (!tr.world->numStaticModels) {
         return;
@@ -308,8 +311,7 @@ void R_AddStaticModelSurfaces(void) {
 
     tr.shiftedIsStatic = (1 << QSORT_STATICMODEL_SHIFT);
 
-    for (i = 0; i < tr.world->numStaticModels; i++)
-    {
+    for (i = 0; i < tr.world->numStaticModels; i++) {
         SM = &tr.world->staticModels[i];
 
         //if( SM->visCount != tr.visCounts[ tr.visIndex ] ) {
@@ -325,7 +327,7 @@ void R_AddStaticModelSurfaces(void) {
         tr.currentEntityNum = i;
         tr.shiftedEntityNum = i << QSORT_ENTITYNUM_SHIFT;
 
-        R_RotateForStaticModel(SM, &tr.viewParms, &tr.ori );
+        R_RotateForStaticModel(SM, &tr.viewParms, &tr.ori);
 
         ofsStaticData = 0;
 
@@ -338,28 +340,27 @@ void R_AddStaticModelSurfaces(void) {
 
         // FIXME: r_showcull
 
-        if (iRadiusCull != CULL_OUT && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT))
-        {
-            dtikisurface_t* dsurf;
+        if (iRadiusCull != CULL_OUT
+            && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT)) {
+            dtikisurface_t *dsurf;
 
-			if (tr.viewParms.isPortal) {
-				SM->lodpercentage[1] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
-			} else {
-				SM->lodpercentage[0] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
-			}
+            if (tr.viewParms.isPortal) {
+                SM->lodpercentage[1] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            } else {
+                SM->lodpercentage[0] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            }
 
             //
             // draw all meshes
             //
             dsurf = tiki->surfaces;
-            for (int mesh = 0; mesh < tiki->numMeshes; mesh++)
-            {
-                skelHeaderGame_t* skelmodel = TIKI_GetSkel(tiki->mesh[mesh]);
-                skelSurfaceGame_t* surface;
-                staticSurface_t* s_surface;
-                shader_t* shader;
-                float fDist;
-                vec3_t vDelta;
+            for (int mesh = 0; mesh < tiki->numMeshes; mesh++) {
+                skelHeaderGame_t  *skelmodel = TIKI_GetSkel(tiki->mesh[mesh]);
+                skelSurfaceGame_t *surface;
+                staticSurface_t   *s_surface;
+                shader_t          *shader;
+                float              fDist;
+                vec3_t             vDelta;
 
                 if (!skelmodel) {
                     continue;
@@ -369,32 +370,38 @@ void R_AddStaticModelSurfaces(void) {
                 // draw all surfaces
                 //
                 surface = skelmodel->pSurfaces;
-                for (j = 0; j < skelmodel->numSurfaces; j++, ofsStaticData += surface->numVerts, surface = surface->pNext, dsurf++)
-                {
-                    if (g_nStaticSurfaces >= MAX_STATIC_MODELS_SURFS)
-                    {
-                        ri.Printf(PRINT_DEVELOPER, "^~^~^ ERROR: MAX_STATIC_MODELS_SURFS exceeded - surface of '%s' skipped\n", tiki->a->name);
+                for (j = 0; j < skelmodel->numSurfaces;
+                     j++, ofsStaticData += surface->numVerts, surface = surface->pNext, dsurf++) {
+                    if (g_nStaticSurfaces >= MAX_STATIC_MODELS_SURFS) {
+                        ri.Printf(
+                            PRINT_DEVELOPER,
+                            "^~^~^ ERROR: MAX_STATIC_MODELS_SURFS exceeded - surface of '%s' skipped\n",
+                            tiki->a->name
+                        );
                         continue;
                     }
 
-                    s_surface = &g_staticSurfaces[g_nStaticSurfaces++];
-					s_surface->ident = SF_TIKI_STATIC;
-					s_surface->ofsStaticData = ofsStaticData;
-					s_surface->surface = surface;
-					s_surface->meshNum = mesh;
+                    s_surface                = &g_staticSurfaces[g_nStaticSurfaces++];
+                    s_surface->ident         = SF_TIKI_STATIC;
+                    s_surface->ofsStaticData = ofsStaticData;
+                    s_surface->surface       = surface;
+                    s_surface->meshNum       = mesh;
 
                     shader = tr.shaders[dsurf->hShader[0]];
 
-                    if (shader->numUnfoggedPasses == 1 && !r_nocull->integer)
-                    {
+                    if (shader->numUnfoggedPasses == 1 && !r_nocull->integer) {
                         switch (shader->unfoggedStages[0]->alphaGen) {
                         case AGEN_DIST_FADE:
-                            if (R_DistanceCullPointAndRadius(shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius) == CULL_OUT) {
+                            if (R_DistanceCullPointAndRadius(
+                                    shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius
+                                )
+                                == CULL_OUT) {
                                 continue;
                             }
                             break;
                         case AGEN_ONE_MINUS_DIST_FADE:
-                            if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius) == CULL_IN) {
+                            if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius)
+                                == CULL_IN) {
                                 continue;
                             }
                             break;
@@ -416,11 +423,11 @@ void R_AddStaticModelSurfaces(void) {
                     }
 
                     SM->bRendered = qtrue;
-                    R_AddDrawSurf((surfaceType_t*)s_surface, shader, 0);
+                    R_AddDrawSurf((surfaceType_t *)s_surface, shader, 0);
 
                     if (r_showstaticlod->integer) {
                         vec3_t org;
-                        int render_count, total_tris;
+                        int    render_count, total_tris;
 
                         VectorCopy(SM->origin, org);
                         org[2] += 100.0;
@@ -434,8 +441,7 @@ void R_AddStaticModelSurfaces(void) {
                     if (r_showstaticbboxes->integer) {
                         vec3_t vMins, vMaxs;
 
-                        for (k = 0; k < 3; k++)
-                        {
+                        for (k = 0; k < 3; k++) {
                             vMins[k] = tiki->a->mins[k] * tiki->load_scale * SM->scale;
                             vMaxs[k] = tiki->a->maxs[k] * tiki->load_scale * SM->scale;
                         }
@@ -450,12 +456,17 @@ void R_AddStaticModelSurfaces(void) {
     tr.shiftedIsStatic = 0;
 }
 
+/*
+==============
+RB_Static_BuildDLights
+==============
+*/
 void RB_Static_BuildDLights()
 {
     int i;
 
-	backEnd.currentStaticModel->useSpecialLighting = backEnd.refdef.num_dlights > 0;
-	backEnd.currentStaticModel->numdlights = 0;
+    backEnd.currentStaticModel->useSpecialLighting = backEnd.refdef.num_dlights > 0;
+    backEnd.currentStaticModel->numdlights         = 0;
 
     if (!backEnd.currentStaticModel->useSpecialLighting) {
         return;
@@ -482,9 +493,14 @@ void RB_Static_BuildDLights()
     }
 }
 
+/*
+==============
+R_InfoStaticModels_f
+==============
+*/
 void R_InfoStaticModels_f()
 {
-    // FIXME: unimplemented
+    g_bInfostaticmodels = qtrue;
 }
 
 /*
@@ -492,18 +508,19 @@ void R_InfoStaticModels_f()
 RB_StaticMesh
 =============
 */
-void RB_StaticMesh(staticSurface_t* staticSurf) {
-    int					i, j;
-    dtiki_t* tiki;
-    skelSurfaceGame_t* surf;
-    int					meshNum;
-    skelHeaderGame_t* skelmodel;
-    int					render_count;
-    skelIndex_t* collapse_map;
-    skelIndex_t* triangles;
-    int					indexes;
-    int					baseIndex, baseVertex;
-    short				collapse[1000];
+void RB_StaticMesh(staticSurface_t *staticSurf)
+{
+    int                i, j;
+    dtiki_t           *tiki;
+    skelSurfaceGame_t *surf;
+    int                meshNum;
+    skelHeaderGame_t  *skelmodel;
+    int                render_count;
+    skelIndex_t       *collapse_map;
+    skelIndex_t       *triangles;
+    int                indexes;
+    int                baseIndex, baseVertex;
+    short              collapse[1000];
 
     if (!r_drawstaticmodelpoly->integer) {
         return;
@@ -515,90 +532,79 @@ void RB_StaticMesh(staticSurface_t* staticSurf) {
 
     assert(surf->pStaticXyz);
 
-    meshNum = staticSurf->meshNum;
+    meshNum   = staticSurf->meshNum;
     skelmodel = TIKI_GetSkel(tiki->mesh[meshNum]);
 
-
-	//
-	// Process LOD
-	//
-	if( skelmodel->pLOD && r_staticlod->integer )
-	{
-		float lod_val;
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD && r_staticlod->integer) {
+        float lod_val;
 
         lod_val = backEnd.currentStaticModel->lodpercentage[0];
 
-		if (surf->numVerts > 3) {
-			skelIndex_t* collapseIndex;
-			int mid, low, high;
-			int lod_cutoff;
+        if (surf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
 
-			if (lod_tool->integer
-				&& !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
-				&& meshNum == lod_mesh->integer)
-			{
-				lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
-			}
-			else
-			{
-				lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
-			}
-
-			collapseIndex = surf->pCollapseIndex;
-			if (collapseIndex[2] < lod_cutoff) {
-				return;
-			}
-
-			low = mid = 3;
-			high = surf->numVerts;
-			while (high >= low) {
-				mid = (low + high) >> 1;
-				if (collapseIndex[mid] < lod_cutoff) {
-					high = mid - 1;
-					if (collapseIndex[mid - 1] >= lod_cutoff) {
-						break;
-					}
-				}
-				else
-				{
-					mid++;
-					low = mid;
-					if (high == mid || collapseIndex[mid] < lod_cutoff) {
-						break;
-					}
-				}
+            if (lod_tool->integer && !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
+                && meshNum == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
             }
 
-			render_count = mid;
-		} else {
-			render_count = surf->numVerts;
-		}
+            collapseIndex = surf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
 
-		if (!render_count) {
-			return;
-		}
-	} else {
-		render_count = surf->numVerts;
+            low = mid = 3;
+            high      = surf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = surf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = surf->numVerts;
     }
 
     indexes = surf->numTriangles * 3;
     RB_CHECKOVERFLOW(render_count, surf->numTriangles);
 
     collapse_map = surf->pCollapse;
-    triangles = surf->pTriangles;
-    baseIndex = tess.numIndexes;
-    baseVertex = tess.numVertexes;
+    triangles    = surf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
     tess.numVertexes += render_count;
 
-    if (render_count == surf->numVerts)
-    {
+    if (render_count == surf->numVerts) {
         for (j = 0; j < indexes; j++) {
             tess.indexes[baseIndex + j] = baseVertex + triangles[j];
         }
         tess.numIndexes += indexes;
-    }
-    else
-    {
+    } else {
         for (i = 0; i < render_count; i++) {
             collapse[i] = i;
         }
@@ -606,16 +612,14 @@ void RB_StaticMesh(staticSurface_t* staticSurf) {
             collapse[i] = collapse[collapse_map[i]];
         }
 
-        for (j = 0; j < indexes; j += 3)
-        {
-            if (collapse[triangles[j]] == collapse[triangles[j + 1]] ||
-                collapse[triangles[j + 1]] == collapse[triangles[j + 2]] ||
-                collapse[triangles[j + 2]] == collapse[triangles[j]])
-            {
+        for (j = 0; j < indexes; j += 3) {
+            if (collapse[triangles[j]] == collapse[triangles[j + 1]]
+                || collapse[triangles[j + 1]] == collapse[triangles[j + 2]]
+                || collapse[triangles[j + 2]] == collapse[triangles[j]]) {
                 break;
             }
 
-            tess.indexes[baseIndex + j] = baseVertex + collapse[triangles[j]];
+            tess.indexes[baseIndex + j]     = baseVertex + collapse[triangles[j]];
             tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
             tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
         }
@@ -626,27 +630,26 @@ void RB_StaticMesh(staticSurface_t* staticSurf) {
         Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
         Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
         tess.texCoords[baseVertex + j][0][0] = surf->pStaticTexCoords[j][0][0];
-		tess.texCoords[baseVertex + j][0][1] = surf->pStaticTexCoords[j][0][1];
-		tess.texCoords[baseVertex + j][1][0] = surf->pStaticTexCoords[j][1][0];
-		tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
+        tess.texCoords[baseVertex + j][0][1] = surf->pStaticTexCoords[j][0][1];
+        tess.texCoords[baseVertex + j][1][0] = surf->pStaticTexCoords[j][1][0];
+        tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
     }
 
     if (backEndData[backEnd.smpFrame]->staticModelData) {
-        const size_t offset = backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
-		assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
-		assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
+        const size_t offset =
+            backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
+        assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
+        assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
 
-        const color4ub_t* in = (const color4ub_t*)&backEndData[backEnd.smpFrame]->staticModelData[offset];
+        const color4ub_t *in = (const color4ub_t *)&backEndData[backEnd.smpFrame]->staticModelData[offset];
 
-        for (i = 0; i < render_count; i++)
-        {
-			tess.vertexColors[baseVertex + i][0] = in[i][0];
-			tess.vertexColors[baseVertex + i][1] = in[i][1];
-			tess.vertexColors[baseVertex + i][2] = in[i][2];
-			tess.vertexColors[baseVertex + i][3] = in[i][3];
+        for (i = 0; i < render_count; i++) {
+            tess.vertexColors[baseVertex + i][0] = in[i][0];
+            tess.vertexColors[baseVertex + i][1] = in[i][1];
+            tess.vertexColors[baseVertex + i][2] = in[i][2];
+            tess.vertexColors[baseVertex + i][3] = in[i][3];
         }
-    }
-    else {
+    } else {
         for (i = 0; i < render_count; i++) {
             tess.vertexColors[baseVertex + i][0] = 0xFF;
             tess.vertexColors[baseVertex + i][1] = 0xFF;
@@ -658,7 +661,77 @@ void RB_StaticMesh(staticSurface_t* staticSurf) {
     tess.vertexColorValid = qtrue;
 }
 
+/*
+==============
+R_PrintInfoStaticModels
+==============
+*/
 void R_PrintInfoStaticModels()
 {
-    // FIXME: unimplemented
+    int                     iRenderCount;
+    int                     i, j;
+    cStaticModelUnpacked_t *SM;
+    dtiki_t                *tikis[MAX_DISTINCT_STATIC_MODELS];
+    int                     tiki_count[MAX_DISTINCT_STATIC_MODELS];
+    cStaticModelUnpacked_t *pSM[MAX_DISTINCT_STATIC_MODELS];
+    int                     count;
+
+    Com_Printf("Static model info:\n");
+    Com_Printf("------------------\n");
+
+    count        = 0;
+    iRenderCount = 0;
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+        if (!SM->bRendered) {
+            break;
+        }
+
+        SM->bRendered = qfalse;
+        iRenderCount++;
+
+        if (!SM->tiki) {
+            Com_Printf("ERROR: static model with no tiki\n");
+            continue;
+        }
+
+        for (j = 0; j < count; j++) {
+            if (SM->tiki == tikis[j]) {
+                tiki_count[j]++;
+                break;
+            }
+        }
+
+        if (count >= MAX_DISTINCT_STATIC_MODELS) {
+            Com_Printf("R_PrintInfoStaticModels: MAX_DISTINCT_STATIC_MODELS exceeded - increase and recompile\n");
+            break;
+        }
+
+        if (j == count) {
+            tikis[count]      = SM->tiki;
+            pSM[count]        = SM;
+            tiki_count[count] = 1;
+        }
+    }
+
+    Com_Printf("Total static models rendered: %d\n", iRenderCount);
+
+    for (i = 0; i < count; i++) {
+        skelHeaderGame_t *skelmodel = TIKI_GetSkel(tikis[i]->mesh[0]);
+
+        Com_Printf(
+            "model: %s, version: %d, count: %d,\n culling min %.1f %.1f %.1f, max %.1f %.1f %.1f, radius %.1f\n",
+            tikis[i]->a->name,
+            skelmodel ? skelmodel->version : -1,
+            tiki_count[i],
+            tikis[i]->a->mins[0],
+            tikis[i]->a->mins[1],
+            tikis[i]->a->mins[2],
+            tikis[i]->a->maxs[0],
+            tikis[i]->a->maxs[1],
+            tikis[i]->a->maxs[2],
+            pSM[i]->cull_radius
+        );
+    }
 }

From 83d486ceebdfb056c472e8f68ed35ec81aa8c7ed Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:48:47 +0200
Subject: [PATCH 0813/2040] Add missing declarations

---
 code/renderer/tr_init.c    | 18 ++++++++++++++++++
 code/renderer/tr_local.h   |  2 ++
 code/renderer/tr_model.cpp | 11 ++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 50e9b685..8e1e87ad 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1113,6 +1113,21 @@ void GfxInfo_f( void )
 	}
 }
 
+void FarPlaneInfo_f(void) {
+    Com_Printf("Current fog settings:\n");
+    Com_Printf("Distance: %i\n", (int)tr.viewParms.farplane_distance);
+    Com_Printf(
+        "Color: %f  %f  %f\n",
+        tr.viewParms.farplane_color[0],
+        tr.viewParms.farplane_color[1],
+        tr.viewParms.farplane_color[2]);
+    if (tr.viewParms.farplane_cull) {
+        Com_Printf("Cull: on\n");
+    } else {
+        Com_Printf("Cull: off\n");
+    }
+}
+
 qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
 	// FIXME: unimplemented
 	return qfalse;
@@ -1380,6 +1395,9 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
 	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
 	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
+    ri.Cmd_AddCommand( "farplane_info", FarPlaneInfo_f );
+    ri.Cmd_AddCommand( "r_infostaticmodels", R_InfoStaticModels_f );
+    ri.Cmd_AddCommand( "r_infoworldtris", R_InfoWorldTris_f );
 
     //
     // Added in OPM
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 67e659e7..39d2c3f0 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2180,6 +2180,7 @@ void R_UpdatePoseInternal(refEntity_t* model);
 void RB_SkelMesh(skelSurfaceGame_t* sf);
 void RB_StaticMesh(staticSurface_t* staticSurf);
 void RB_Static_BuildDLights();
+void R_InfoStaticModels_f();
 void R_PrintInfoStaticModels();
 void R_AddSkelSurfaces(trRefEntity_t* ent);
 void R_AddStaticModelSurfaces(void);
@@ -2187,6 +2188,7 @@ void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, in
 float R_CalcLod(const vec3_t origin, float radius);
 int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
 int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
+void R_InfoWorldTris_f(void);
 void R_PrintInfoWorldtris(void);
 void R_DebugSkeleton(void);
 
diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index cf5d0d53..e07a0e33 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -1465,13 +1465,22 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 	//tess.numVertexes += sf->numVerts;
 }
 
+/*
+=============
+R_InfoWorldTris_f
+=============
+*/
+void R_InfoWorldTris_f( void ) {
+    // FIXME: unimplemented
+}
+
 /*
 =============
 R_PrintInfoWorldtris
 =============
 */
 void R_PrintInfoWorldtris( void ) {
-	// FIXME: stub
+	// FIXME: unimplemented
 }
 
 /*

From 18a12eeba37c7d540670a55f335c791912f07dc3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:50:25 +0200
Subject: [PATCH 0814/2040] Fix loop breaking instead of continuing

---
 code/renderer/tr_staticmodels.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 90123ec8..50a79c12 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -685,7 +685,7 @@ void R_PrintInfoStaticModels()
     for (i = 0; i < tr.world->numStaticModels; i++) {
         SM = &tr.world->staticModels[i];
         if (!SM->bRendered) {
-            break;
+            continue;
         }
 
         SM->bRendered = qfalse;
@@ -712,6 +712,8 @@ void R_PrintInfoStaticModels()
             tikis[count]      = SM->tiki;
             pSM[count]        = SM;
             tiki_count[count] = 1;
+
+            count++;
         }
     }
 

From 548a3efe5ae11691e3b8f1c08c931c6da5b40275 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:57:50 +0200
Subject: [PATCH 0815/2040] Implement R_InfoWorldTris_f and
 R_PrintInfoWorldtris

---
 code/renderer/tr_model.cpp | 67 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index e07a0e33..ab5f7cce 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -28,7 +28,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define	LL(x) x=LittleLong(x)
 
-qboolean g_bInfoworldtris;
+qboolean g_bInfoworldtris = qfalse;
+static int entityNumIndexes[MAX_ENTITIES];
+static int staticModelNumIndexes[4095];
+
 static int R_CullSkelModel(dtiki_t* tiki, refEntity_t* e, skelAnimFrame_t* newFrame, float fScale, float* vLocalOrg);
 
 /*
@@ -1471,7 +1474,16 @@ R_InfoWorldTris_f
 =============
 */
 void R_InfoWorldTris_f( void ) {
-    // FIXME: unimplemented
+    int i;
+
+    g_bInfoworldtris = qtrue;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        entityNumIndexes[i] = 0;
+    }
+    for (i = 0; i < ARRAY_LEN(staticModelNumIndexes); i++) {
+        staticModelNumIndexes[i] = 0;
+    }
 }
 
 /*
@@ -1480,7 +1492,44 @@ R_PrintInfoWorldtris
 =============
 */
 void R_PrintInfoWorldtris( void ) {
-	// FIXME: unimplemented
+    int i;
+    int numTris;
+    int totalNumTris;
+    dtiki_t* tiki;
+    skelHeaderGame_t* skelmodel;
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = entityNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki = backEnd.refdef.entities[i].e.tiki;
+        skelmodel = TIKI_GetSkel(tiki->mesh[0]);
+        Com_Printf("ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    Com_Printf("total entity tris: %i\n\n", totalNumTris);
+
+    totalNumTris = 0;
+
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = staticModelNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki = backEnd.refdef.staticModels[i].tiki;
+        skelmodel = TIKI_GetSkel(tiki->mesh[0]);
+        Com_Printf("sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    Com_Printf("total static model tris: %i\n\n", totalNumTris);
 }
 
 /*
@@ -1596,6 +1645,12 @@ void R_DebugSkeleton(void) {
 		}
 	}
 }
+
+/*
+=============
+ProjectRadius
+=============
+*/
 static float ProjectRadius(float r, const vec3_t location)
 {
 	Vector separation;
@@ -1607,10 +1662,16 @@ static float ProjectRadius(float r, const vec3_t location)
 	return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
 }
 
+/*
+=============
+R_CalcLod
+=============
+*/
 float R_CalcLod(const vec3_t origin, float radius)
 {
 	return ProjectRadius(radius, origin);
 }
+
 /*
 =============
 R_CullTIKI

From 78fa90c59b5412a9b6ed3409b5793fb821c14c1c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:03:41 +0200
Subject: [PATCH 0816/2040] Move RB_StaticMesh to tr_model.cpp for info world
 tris

---
 code/renderer/tr_local.h          |   2 +
 code/renderer/tr_model.cpp        | 165 ++++++++++++++++++++++++++++++
 code/renderer/tr_staticmodels.cpp | 158 ----------------------------
 3 files changed, 167 insertions(+), 158 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 39d2c3f0..7303f299 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2195,6 +2195,8 @@ void R_DebugSkeleton(void);
 extern int g_nStaticSurfaces;
 extern qboolean g_bInfostaticmodels;
 extern qboolean g_bInfoworldtris;
+extern int entityNumIndexes[];
+extern int staticModelNumIndexes[];
 
 /*
 =============================================================
diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index ab5f7cce..43ee610d 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -1168,6 +1168,7 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 			tess.indexes[baseIndex + i] = baseVertex + triangles[i];
 		}
 
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
 		tess.numIndexes += indexes;
 	}
 	else
@@ -1199,6 +1200,8 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
             tess.indexes[baseIndex + i + 1] = baseVertex + collapse[triangles[i + 1]];
             tess.indexes[baseIndex + i + 2] = baseVertex + collapse[triangles[i + 2]];
         }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
         tess.numIndexes += i;
     }
 
@@ -1468,6 +1471,168 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 	//tess.numVertexes += sf->numVerts;
 }
 
+/*
+=============
+RB_StaticMesh
+=============
+*/
+void RB_StaticMesh(staticSurface_t *staticSurf)
+{
+    int                i, j;
+    dtiki_t           *tiki;
+    skelSurfaceGame_t *surf;
+    int                meshNum;
+    skelHeaderGame_t  *skelmodel;
+    int                render_count;
+    skelIndex_t       *collapse_map;
+    skelIndex_t       *triangles;
+    int                indexes;
+    int                baseIndex, baseVertex;
+    short              collapse[1000];
+
+    if (!r_drawstaticmodelpoly->integer) {
+        return;
+    }
+
+    assert(backEnd.currentStaticModel);
+    tiki = backEnd.currentStaticModel->tiki;
+    surf = staticSurf->surface;
+
+    assert(surf->pStaticXyz);
+
+    meshNum   = staticSurf->meshNum;
+    skelmodel = TIKI_GetSkel(tiki->mesh[meshNum]);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD && r_staticlod->integer) {
+        float lod_val;
+
+        lod_val = backEnd.currentStaticModel->lodpercentage[0];
+
+        if (surf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
+                && meshNum == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
+            }
+
+            collapseIndex = surf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = surf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = surf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = surf->numVerts;
+    }
+
+    indexes = surf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, surf->numTriangles);
+
+    collapse_map = surf->pCollapse;
+    triangles    = surf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    if (render_count == surf->numVerts) {
+        for (j = 0; j < indexes; j++) {
+            tess.indexes[baseIndex + j] = baseVertex + triangles[j];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+        for (i = render_count; i < surf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (j = 0; j < indexes; j += 3) {
+            if (collapse[triangles[j]] == collapse[triangles[j + 1]]
+                || collapse[triangles[j + 1]] == collapse[triangles[j + 2]]
+                || collapse[triangles[j + 2]] == collapse[triangles[j]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + j]     = baseVertex + collapse[triangles[j]];
+            tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
+            tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += j;
+        tess.numIndexes += j;
+    }
+
+    for (j = 0; j < render_count; j++) {
+        Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
+        Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
+        tess.texCoords[baseVertex + j][0][0] = surf->pStaticTexCoords[j][0][0];
+        tess.texCoords[baseVertex + j][0][1] = surf->pStaticTexCoords[j][0][1];
+        tess.texCoords[baseVertex + j][1][0] = surf->pStaticTexCoords[j][1][0];
+        tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
+    }
+
+    if (backEndData[backEnd.smpFrame]->staticModelData) {
+        const size_t offset =
+            backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
+        assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
+        assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
+
+        const color4ub_t *in = (const color4ub_t *)&backEndData[backEnd.smpFrame]->staticModelData[offset];
+
+        for (i = 0; i < render_count; i++) {
+            tess.vertexColors[baseVertex + i][0] = in[i][0];
+            tess.vertexColors[baseVertex + i][1] = in[i][1];
+            tess.vertexColors[baseVertex + i][2] = in[i][2];
+            tess.vertexColors[baseVertex + i][3] = in[i][3];
+        }
+    } else {
+        for (i = 0; i < render_count; i++) {
+            tess.vertexColors[baseVertex + i][0] = 0xFF;
+            tess.vertexColors[baseVertex + i][1] = 0xFF;
+            tess.vertexColors[baseVertex + i][2] = 0xFF;
+            tess.vertexColors[baseVertex + i][3] = 0xFF;
+        }
+    }
+
+    tess.vertexColorValid = qtrue;
+}
+
 /*
 =============
 R_InfoWorldTris_f
diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 50a79c12..25ce7525 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -503,164 +503,6 @@ void R_InfoStaticModels_f()
     g_bInfostaticmodels = qtrue;
 }
 
-/*
-=============
-RB_StaticMesh
-=============
-*/
-void RB_StaticMesh(staticSurface_t *staticSurf)
-{
-    int                i, j;
-    dtiki_t           *tiki;
-    skelSurfaceGame_t *surf;
-    int                meshNum;
-    skelHeaderGame_t  *skelmodel;
-    int                render_count;
-    skelIndex_t       *collapse_map;
-    skelIndex_t       *triangles;
-    int                indexes;
-    int                baseIndex, baseVertex;
-    short              collapse[1000];
-
-    if (!r_drawstaticmodelpoly->integer) {
-        return;
-    }
-
-    assert(backEnd.currentStaticModel);
-    tiki = backEnd.currentStaticModel->tiki;
-    surf = staticSurf->surface;
-
-    assert(surf->pStaticXyz);
-
-    meshNum   = staticSurf->meshNum;
-    skelmodel = TIKI_GetSkel(tiki->mesh[meshNum]);
-
-    //
-    // Process LOD
-    //
-    if (skelmodel->pLOD && r_staticlod->integer) {
-        float lod_val;
-
-        lod_val = backEnd.currentStaticModel->lodpercentage[0];
-
-        if (surf->numVerts > 3) {
-            skelIndex_t *collapseIndex;
-            int          mid, low, high;
-            int          lod_cutoff;
-
-            if (lod_tool->integer && !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
-                && meshNum == lod_mesh->integer) {
-                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
-            } else {
-                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
-            }
-
-            collapseIndex = surf->pCollapseIndex;
-            if (collapseIndex[2] < lod_cutoff) {
-                return;
-            }
-
-            low = mid = 3;
-            high      = surf->numVerts;
-            while (high >= low) {
-                mid = (low + high) >> 1;
-                if (collapseIndex[mid] < lod_cutoff) {
-                    high = mid - 1;
-                    if (collapseIndex[mid - 1] >= lod_cutoff) {
-                        break;
-                    }
-                } else {
-                    mid++;
-                    low = mid;
-                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
-                        break;
-                    }
-                }
-            }
-
-            render_count = mid;
-        } else {
-            render_count = surf->numVerts;
-        }
-
-        if (!render_count) {
-            return;
-        }
-    } else {
-        render_count = surf->numVerts;
-    }
-
-    indexes = surf->numTriangles * 3;
-    RB_CHECKOVERFLOW(render_count, surf->numTriangles);
-
-    collapse_map = surf->pCollapse;
-    triangles    = surf->pTriangles;
-    baseIndex    = tess.numIndexes;
-    baseVertex   = tess.numVertexes;
-    tess.numVertexes += render_count;
-
-    if (render_count == surf->numVerts) {
-        for (j = 0; j < indexes; j++) {
-            tess.indexes[baseIndex + j] = baseVertex + triangles[j];
-        }
-        tess.numIndexes += indexes;
-    } else {
-        for (i = 0; i < render_count; i++) {
-            collapse[i] = i;
-        }
-        for (i = render_count; i < surf->numVerts; i++) {
-            collapse[i] = collapse[collapse_map[i]];
-        }
-
-        for (j = 0; j < indexes; j += 3) {
-            if (collapse[triangles[j]] == collapse[triangles[j + 1]]
-                || collapse[triangles[j + 1]] == collapse[triangles[j + 2]]
-                || collapse[triangles[j + 2]] == collapse[triangles[j]]) {
-                break;
-            }
-
-            tess.indexes[baseIndex + j]     = baseVertex + collapse[triangles[j]];
-            tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
-            tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
-        }
-        tess.numIndexes += j;
-    }
-
-    for (j = 0; j < render_count; j++) {
-        Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
-        Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
-        tess.texCoords[baseVertex + j][0][0] = surf->pStaticTexCoords[j][0][0];
-        tess.texCoords[baseVertex + j][0][1] = surf->pStaticTexCoords[j][0][1];
-        tess.texCoords[baseVertex + j][1][0] = surf->pStaticTexCoords[j][1][0];
-        tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
-    }
-
-    if (backEndData[backEnd.smpFrame]->staticModelData) {
-        const size_t offset =
-            backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
-        assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
-        assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
-
-        const color4ub_t *in = (const color4ub_t *)&backEndData[backEnd.smpFrame]->staticModelData[offset];
-
-        for (i = 0; i < render_count; i++) {
-            tess.vertexColors[baseVertex + i][0] = in[i][0];
-            tess.vertexColors[baseVertex + i][1] = in[i][1];
-            tess.vertexColors[baseVertex + i][2] = in[i][2];
-            tess.vertexColors[baseVertex + i][3] = in[i][3];
-        }
-    } else {
-        for (i = 0; i < render_count; i++) {
-            tess.vertexColors[baseVertex + i][0] = 0xFF;
-            tess.vertexColors[baseVertex + i][1] = 0xFF;
-            tess.vertexColors[baseVertex + i][2] = 0xFF;
-            tess.vertexColors[baseVertex + i][3] = 0xFF;
-        }
-    }
-
-    tess.vertexColorValid = qtrue;
-}
-
 /*
 ==============
 R_PrintInfoStaticModels

From ed52d1c6486fa521b0db8ae2e5aca1fedd0ea9f0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:19:31 +0200
Subject: [PATCH 0817/2040] Implement R_FastDlightTerrain

---
 code/renderer/tr_world.c | 78 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
index 36c4f5d8..81a766d4 100644
--- a/code/renderer/tr_world.c
+++ b/code/renderer/tr_world.c
@@ -163,7 +163,11 @@ static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
 	return qfalse;
 }
 
-
+/*
+======================
+R_FastDlightFace
+======================
+*/
 static int R_FastDlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 	float		d;
 	int			i;
@@ -189,6 +193,11 @@ static int R_FastDlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 	return dlightBits;
 }
 
+/*
+======================
+R_FastDlightGrid
+======================
+*/
 static int R_FastDlightGrid( srfGridMesh_t *grid, int dlightBits ) {
 	int			i;
 	dlight_t	*dl;
@@ -217,11 +226,45 @@ static int R_FastDlightGrid( srfGridMesh_t *grid, int dlightBits ) {
 	return dlightBits;
 }
 
+/*
+======================
+R_FastDlightTerrain
+======================
+*/
 static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
-	// FIXME: unimplemented
-	return 0;
+    dlight_t* dl;
+    float* origin;
+    int i;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+        origin = dl->transformed;
+
+        if (srf->x0 - origin[0] > dl->radius
+            || srf->x0 - origin[0] < -512.0 - dl->radius
+            || srf->y0 - origin[1] > dl->radius
+            || srf->y0 - origin[1] < -512.0 - dl->radius
+            || srf->z0 - origin[2] > dl->radius
+            || srf->z0 - origin[2] < -srf->zmax - dl->radius
+            ) {
+            // dlight doesn't reach the bounds
+            dlightBits &= ~(1 << i);
+        }
+    }
+
+    if (!dlightBits) {
+        tr.pc.c_dlightSurfacesCulled++;
+    }
+
+    srf->drawinfo.dlightBits[tr.smpFrame] = dlightBits;
+    return dlightBits;
 }
 
+/*
+======================
+R_DlightTrisurf
+======================
+*/
 static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
 	// FIXME: more dlight culling to trisurfs...
 	surf->dlightBits[ tr.smpFrame ] = dlightBits;
@@ -305,6 +348,11 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
 	return dlightMap;
 }
 
+/*
+======================
+R_DlightTerrain
+======================
+*/
 int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
 {
 	int dlightMap;
@@ -326,6 +374,11 @@ int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
     return dlightMap;
 }
 
+/*
+======================
+R_CheckDlightSurface
+======================
+*/
 static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
 {
     if (dlightBits && surf->frameCount != tr.frameCount)
@@ -348,13 +401,26 @@ static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
     return 0;
 }
 
+/*
+======================
+R_CheckDlightTerrain
+======================
+*/
 int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
 {
-	// FIXME: unimplemented
-	return 0;
+    if (dlightBits && surf->frameCount != tr.frameCount)
+    {
+        surf->frameCount = tr.frameCount;
+        return R_DlightTerrain(surf, dlightBits);
+    }
+    else
+    {
+        surf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        surf->drawinfo.dlightBits[tr.smpFrame] = 0;
+        return 0;
+    }
 }
 
-
 /*
 ======================
 R_AddWorldSurface

From 735ffaf80b45a9b1e754a7b36d85f9c5edc57044 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:54:09 +0200
Subject: [PATCH 0818/2040] Implement swipe

---
 code/renderer/tr_swipe.cpp | 156 ++++++++++++++++++++++++++++++++++---
 1 file changed, 145 insertions(+), 11 deletions(-)

diff --git a/code/renderer/tr_swipe.cpp b/code/renderer/tr_swipe.cpp
index 08cdbc32..0e87ed63 100644
--- a/code/renderer/tr_swipe.cpp
+++ b/code/renderer/tr_swipe.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,26 +24,160 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-void RB_DrawSwipeSurface(surfaceType_t* pswipe) {
-    // FIXME: unimplemented
-}
+#define MAX_SWIPE_POINTS 1024
+#define MAX_SWIPES       32
 
+typedef struct {
+    vec3_t points[2];
+    float  time;
+} rswipepoint_t;
+
+typedef struct {
+    surfaceType_t surftype;
+    float         life;
+    float         time;
+    int           lastrendtime;
+    qhandle_t     shader;
+    int           numswipes;
+    rswipepoint_t swipes[MAX_SWIPE_POINTS];
+} rendswipe_t;
+
+static int         lastswipeframe;
+static int         numswipes;
+static rendswipe_t swipes[MAX_SWIPES];
+
+/*
+======================
+RE_SwipeBegin
+======================
+*/
 void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
 {
-    // FIXME: unimplemented
+    rendswipe_t *swipe;
+
+    if (tr.frameCount != lastswipeframe) {
+        swipe     = &swipes[0];
+        numswipes = 0;
+    }
+
+    if (numswipes >= MAX_SWIPES) {
+        return;
+    }
+
+    swipe = &swipes[numswipes++];
+
+    swipe->life         = life;
+    swipe->time         = thistime;
+    swipe->surftype     = SF_SWIPE;
+    swipe->numswipes    = 0;
+    swipe->lastrendtime = 0;
+    swipe->shader       = shader;
+
+    if (shader < 0 && life) {
+        ri.Printf(PRINT_DEVELOPER, "RE_SwipeBegin: Invalid shader handle\n");
+    }
+
+    lastswipeframe = tr.frameCount;
 }
 
+/*
+======================
+RE_SwipePoint
+======================
+*/
 void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
 {
-    // FIXME: unimplemented
+    rendswipe_t *swipe = &swipes[numswipes - 1];
+
+    if (swipe->numswipes >= MAX_SWIPE_POINTS) {
+        return;
+    }
+
+    VectorCopy(point1, swipe->swipes[swipe->numswipes - 1].points[0]);
+    VectorCopy(point2, swipe->swipes[swipe->numswipes - 1].points[1]);
 }
 
-void RE_SwipeEnd()
-{
-    // FIXME: unimplemented
-}
+/*
+======================
+RE_SwipeEnd
+======================
+*/
+void RE_SwipeEnd() {}
 
+/*
+======================
+R_AddSwipeSurfaces
+======================
+*/
 void R_AddSwipeSurfaces()
 {
-    // FIXME: unimplemented
+    shader_t *shader;
+    int       at;
+
+    if (!numswipes) {
+        return;
+    }
+
+    tr.currentEntityNum = ENTITYNUM_WORLD;
+    tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
+
+    for (at = 0; at < numswipes; at++) {
+        rendswipe_t *swipe     = &swipes[at];
+        int          timedelta = 0;
+
+        if (!swipe->numswipes) {
+            continue;
+        }
+
+        if (swipe->lastrendtime) {
+            timedelta = tr.refdef.time - swipe->lastrendtime;
+        }
+        swipe->lastrendtime = tr.refdef.time;
+
+        if (timedelta) {
+            swipe->time += timedelta;
+        }
+
+        shader = R_GetShaderByHandle(swipe->shader);
+        R_AddDrawSurf(&swipe->surftype, shader, 0);
+    }
+}
+
+/*
+======================
+RB_DrawSwipeSurface
+======================
+*/
+void RB_DrawSwipeSurface(surfaceType_t *pswipe)
+{
+    int          i;
+    float        oolife;
+    rendswipe_t *swipe = (rendswipe_t *)pswipe;
+
+    oolife = 1.0 / swipe->life;
+
+    RB_CHECKOVERFLOW(swipe->numswipes * 2, swipe->numswipes * 6);
+
+    RB_StreamBeginDrawSurf();
+
+    for (i = 0; i < swipe->numswipes; i++) {
+        rswipepoint_t *swipepoint = &swipe->swipes[i];
+        float          alpha;
+        float          f;
+
+        f = 1.0 - (swipe->time - swipepoint->time) * oolife;
+        if (f > 0 && swipe->time >= swipepoint->time) {
+            alpha = f - Q_max(f - 1.0, 0);
+
+            RB_Color4f(alpha, alpha, alpha, alpha);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[0]);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[1]);
+        } else if (i == swipe->numswipes - 1) {
+            swipe->numswipes = 0;
+        }
+    }
+
+    RB_StreamEndDrawSurf();
 }

From e56ae3d266045a52757de9807bf120de3b3eeea9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 21:07:55 +0200
Subject: [PATCH 0819/2040] Update features.md

---
 docs/features.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/features.md b/docs/features.md
index 22c85e16..a8f4ea08 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -9,14 +9,15 @@ A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, gre
 - Features from ioquake3
 - IPv6 support (from ioquake3)
 - Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
+- Demo recording
 
 ### Server-side
 
 - Bots
-- Demo recording
 - IP ban (from ioquake3)
 - More script commands for mods
 - Non-PVS optimization
+- Packet flood protection
 - Spectate players in first-person
 
 #### Non-PVS optimization
@@ -32,7 +33,6 @@ Enable this feature with `set sv_netoptimize 2`.
 - Fixes from SH 2.15, BT 2.40 and ioquake3
 - Buffer overflow fixes
 - Directory traversal fix
-- Packet flood protection
 
 ### Server-side
 

From 41ca1797f927b284e4f610cf60cb814d83bfea37 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 21:43:50 +0200
Subject: [PATCH 0820/2040] Implement basic GHOST methods and functions

---
 code/renderer/tr_ghost.cpp | 727 ++++++++++++++++++++++++++++++++++++-
 code/renderer/tr_ghost.h   | 279 +++++++++++++-
 2 files changed, 1001 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_ghost.cpp b/code/renderer/tr_ghost.cpp
index bea96d93..73f84281 100644
--- a/code/renderer/tr_ghost.cpp
+++ b/code/renderer/tr_ghost.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,9 +25,728 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tr_local.h"
 #include "tr_ghost.h"
 
-void R_UpdateGhostTextures() {
-    int i;
-    int numTextures;
+GhostManager ghostManager;
+
+int frameTime;
+int lastTime;
+
+float RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+Particle::Particle(
+    Vector   pos,
+    Vector   vel,
+    Vector   acc,
+    int      srcColor,
+    int      dstColor,
+    float    colorRate,
+    qboolean wavy,
+    float    wavyDist,
+    float    currentTime,
+    float    dieTime,
+    float    maxspeed,
+    Vector   parentOrg,
+    qboolean swarm,
+    int      freq,
+    int      delta
+)
+{
+    m_position     = pos;
+    m_realposition = pos;
+    m_velocity     = vel;
+    m_acceleration = acc;
+
+    m_srcColor  = srcColor;
+    m_dstColor  = dstColor;
+    m_color     = srcColor;
+    m_colorRate = colorRate;
+
+    m_wavy       = wavy;
+    m_wavyDist   = wavyDist;
+    m_wavyOffset = RandomizeRange(-wavyDist, wavyDist);
+
+    m_swarm          = swarm;
+    m_swarmfrequency = freq;
+    m_swarmdelta     = delta;
+
+    m_startTime = currentTime;
+    m_dieTime   = dieTime;
+    m_life      = dieTime - currentTime;
+
+    m_maxspeed     = maxspeed;
+    m_parentOrigin = parentOrg;
+
+    Vector tempvec = m_velocity;
+    VectorNormalize(tempvec);
+
+    m_perp.x = tempvec.x * cos(M_PI / 2) - tempvec.y * sin(M_PI / 2);
+    m_perp.y = tempvec.x * sin(M_PI / 2) + tempvec.y * cos(M_PI / 2);
+
+    m_srcR = (m_srcColor & 0xff);
+    m_srcG = (m_srcColor & 0xff00) >> 8;
+    m_srcB = (m_srcColor & 0xff0000) >> 16;
+
+    m_dstR = (m_dstColor & 0xff);
+    m_dstG = (m_dstColor & 0xff00) >> 8;
+    m_dstB = (m_dstColor & 0xff0000) >> 16;
+
+    m_deltaR = m_dstR - m_srcR;
+    m_deltaG = m_dstG - m_srcG;
+    m_deltaB = m_dstB - m_srcB;
+}
+
+void Particle::Update(float currentTime)
+{
+    int    r, g, b;
+    float  ftime;
+    float  time2;
+    float  factor;
+    Vector offset;
 
     // FIXME: unimplemented
 }
+
+float Particle::GetDieTime()
+{
+    return m_dieTime;
+}
+
+ParticleEmitter::ParticleEmitter(
+    Vector   position,
+    float    minSpeed,
+    float    maxSpeed,
+    float    angle,
+    float    angleVar,
+    float    minAccSpeed,
+    float    maxAccSpeed,
+    float    accAngle,
+    float    accAngleVar,
+    float    minRate,
+    float    maxRate,
+    int      srcColor,
+    int      dstColor,
+    float    minColorRate,
+    float    maxColorRate,
+    qboolean wavy,
+    float    minWavyDist,
+    float    maxWavyDist,
+    float    minLife,
+    float    maxLife,
+    qboolean particles,
+    qboolean gravityWell,
+    float    gravityWellStrength,
+    qboolean ballLightning,
+    int      minBallLightningRadius,
+    int      maxBallLightningRadius,
+    float    lightningVar,
+    int      lightningSubdivisions,
+    qboolean swarm,
+    int      swarmfreq,
+    int      swarmdelta
+)
+{
+    m_position = position;
+
+    m_minSpeed = minSpeed;
+    m_maxSpeed = maxSpeed;
+
+    m_angle       = angle;
+    m_angleVar    = angleVar;
+    m_minAccSpeed = minAccSpeed;
+    m_maxAccSpeed = maxAccSpeed;
+    m_accAngle    = accAngle;
+    m_accAngleVar = accAngleVar;
+
+    m_maxRate = 1.0 / maxRate;
+    m_minRate = 1.0 / minRate;
+
+    m_srcColor     = srcColor;
+    m_dstColor     = dstColor;
+    m_minColorRate = minColorRate;
+    m_maxColorRate = maxColorRate;
+
+    m_minWavyDist = minWavyDist;
+    m_maxWavyDist = maxWavyDist;
+    m_minLife     = minLife;
+    m_maxLife     = maxLife;
+
+    m_wavy = wavy;
+
+    m_particles = particles;
+
+    m_gravityWellStrength = gravityWellStrength;
+    m_gravityWell         = gravityWell;
+
+    m_ballLightning          = ballLightning;
+    m_minBallLightningRadius = minBallLightningRadius;
+    m_lightningVar           = lightningVar;
+    m_maxBallLightningRadius = maxBallLightningRadius;
+    m_lightningSubdivisions  = lightningSubdivisions;
+
+    m_swarm          = swarm;
+    m_swarmfrequency = swarmfreq;
+    m_swarmdelta     = swarmdelta;
+
+    m_time     = tr.refdef.time;
+    m_lasttime = m_time;
+
+    m_gravityEffectVector = vec_zero;
+}
+
+ParticleEmitter::ParticleEmitter()
+{
+    m_lasttime = tr.refdef.time / 1000.0;
+}
+
+ParticleEmitter::~ParticleEmitter() {}
+
+void ParticleEmitter::Emit(float currentTime)
+{
+    Particle *p;
+    float     rate;
+    float     delta;
+
+    // FIXME: unimplemented
+}
+
+void ParticleEmitter::UpdateValues()
+{
+    // FIXME: unimplemented
+}
+
+Vector ParticleEmitter::GetPosition()
+{
+    return m_position;
+}
+
+Vector ParticleEmitter::GetVelocity()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetVelocityDirection()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetVelocityDirectionMin()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetVelocityDirectionMax()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetAcceleration()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetAccelerationDirection()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetAccelerationDirectionMin()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+Vector ParticleEmitter::GetAccelerationDirectionMax()
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+int ParticleEmitter::GetSrcColor()
+{
+    return m_srcColor;
+}
+
+int ParticleEmitter::GetDstColor()
+{
+    return m_dstColor;
+}
+
+float ParticleEmitter::GetGravityWellStrength()
+{
+    return m_gravityWellStrength;
+}
+
+float ParticleEmitter::GetRate()
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+float ParticleEmitter::GetColorRate()
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+float ParticleEmitter::GetWavyDistance()
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+float ParticleEmitter::GetDieTime(float currentTime)
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+int ParticleEmitter::GetBallLightningRadius()
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+float ParticleEmitter::GetLightningVar()
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+int ParticleEmitter::GetLightningSubdivisions()
+{
+    // FIXME: unimplemented
+    return 0;
+}
+
+qboolean ParticleEmitter::IsWavy()
+{
+    return m_wavy;
+}
+
+qboolean ParticleEmitter::IsGravityWell()
+{
+    return m_gravityWell;
+}
+
+qboolean ParticleEmitter::IsParticles()
+{
+    return m_particles;
+}
+
+qboolean ParticleEmitter::IsBallLightning()
+{
+    return m_ballLightning;
+}
+
+qboolean ParticleEmitter::IsSwarm()
+{
+    return m_swarm;
+}
+
+void ParticleEmitter::SetMinSpeed(float value)
+{
+    m_minSpeed = value;
+}
+
+void ParticleEmitter::SetMaxSpeed(float value)
+{
+    m_maxSpeed = value;
+}
+
+void ParticleEmitter::SetAngle(float value)
+{
+    m_angle = value;
+}
+
+void ParticleEmitter::SetAngleVar(float value)
+{
+    m_angleVar = value;
+}
+
+void ParticleEmitter::SetMinAccSpeed(float value)
+{
+    m_minAccSpeed = value;
+}
+
+void ParticleEmitter::SetMaxAccSpeed(float value)
+{
+    m_maxAccSpeed = value;
+}
+
+void ParticleEmitter::SetAccAngle(float value)
+{
+    m_accAngle = value;
+}
+
+void ParticleEmitter::SetAccAngleVar(float value)
+{
+    m_accAngleVar = value;
+}
+
+void ParticleEmitter::SetMinRate(float value)
+{
+    m_minRate = value;
+}
+
+void ParticleEmitter::SetMaxRate(float value)
+{
+    m_maxRate = value;
+}
+
+void ParticleEmitter::SetSrcColor(int value)
+{
+    m_srcColor = value;
+}
+
+void ParticleEmitter::SetDstColor(int value)
+{
+    m_dstColor = value;
+}
+
+void ParticleEmitter::SetMinColorRate(float value)
+{
+    m_minColorRate = value;
+}
+
+void ParticleEmitter::SetMaxColorRate(float value)
+{
+    m_maxColorRate = value;
+}
+
+void ParticleEmitter::SetWavy(int value)
+{
+    m_wavy = value;
+}
+
+void ParticleEmitter::SetParticles(int value)
+{
+    m_particles = value;
+}
+
+void ParticleEmitter::SetGravityWell(int value)
+{
+    m_gravityWell = value;
+}
+
+void ParticleEmitter::SetMinWavyDist(float value)
+{
+    m_minWavyDist = value;
+}
+
+void ParticleEmitter::SetMaxWavyDist(float value)
+{
+    m_maxWavyDist = value;
+}
+
+void ParticleEmitter::SetMinLife(float value)
+{
+    m_minLife = value;
+}
+
+void ParticleEmitter::SetMaxLife(float value)
+{
+    m_maxLife = value;
+}
+
+void ParticleEmitter::SetGravityWellStrength(float value)
+{
+    m_gravityWellStrength = value;
+}
+
+void ParticleEmitter::SetGravityEffectVector(Vector value)
+{
+    m_gravityEffectVector = value;
+}
+
+void ParticleEmitter::SetBallLightning(int value)
+{
+    m_ballLightning = value;
+}
+
+void ParticleEmitter::SetMinBallLightningRadius(int value)
+{
+    m_minBallLightningRadius = value;
+}
+
+void ParticleEmitter::SetMaxBallLightningRadius(int value)
+{
+    m_maxBallLightningRadius = value;
+}
+
+void ParticleEmitter::SetLightningVar(float value)
+{
+    m_lightningVar = value;
+}
+
+void ParticleEmitter::SetLightningSubdivisions(int value)
+{
+    m_lightningSubdivisions = value;
+}
+
+float ParticleEmitter::RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+float ParticleEmitter::RandomizeAngle(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+Vector ParticleEmitter::CalculateDirection(float value)
+{
+    // FIXME: unimplemented
+    return Vector();
+}
+
+void ParticleEmitter::Load(char **buf_p)
+{
+    m_position[0] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[1] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[2] = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_srcColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_dstColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_minLife = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxLife = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_angle       = atoi(COM_ParseExt(buf_p, qtrue));
+    m_angleVar    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngle    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngleVar = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_minAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_minWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_wavy        = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_particles = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_gravityWell         = atoi(COM_ParseExt(buf_p, qtrue));
+    m_gravityWellStrength = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_ballLightning          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningVar           = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningSubdivisions  = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_swarm          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmfrequency = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmdelta     = atoi(COM_ParseExt(buf_p, qtrue));
+}
+
+GhostTexture::GhostTexture()
+{
+    m_image   = NULL;
+    m_texture = NULL;
+}
+
+void GhostTexture::SetTexel(int x, int y, unsigned int color)
+{
+    m_texture[x + m_width * y] = color;
+}
+
+void GhostTexture::Burn()
+{
+    int     x, y;
+    int     r, g, b;
+    GLint   pixel;
+    GLuint *line;
+
+    // FIXME: unimplemented
+}
+
+outcode GhostTexture::ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax)
+{
+    outcode code = 0;
+
+    if (y > ymax) {
+        code = 1;
+    } else if (y < ymin) {
+        code = 2;
+    }
+
+    if (x > xmax) {
+        code |= 4;
+    } else if (x < xmin) {
+        code |= 8;
+    }
+
+    return code;
+}
+
+void GhostTexture::ClipAndDrawLine(Vector p0, Vector p1, int color)
+{
+    int     x0, x1;
+    int     y0, y1;
+    int     d;
+    int     x, y;
+    int     ax, ay;
+    int     sx, sy;
+    int     dx, dy;
+    int     xmax, ymax;
+    bool    accept;
+    outcode outcode0;
+    outcode outcode1;
+
+    x0     = p0.x;
+    y0     = p0.y;
+    x1     = p1.x;
+    y1     = p1.y;
+    accept = false;
+    xmax   = this->m_width - 1;
+    ymax   = this->m_height - 1;
+
+    outcode0 = ComputeOutCode(x0, y0, 0, xmax, 0, ymax);
+    outcode0 = ComputeOutCode(x1, y1, 0, xmax, 0, ymax);
+
+    // FIXME: unimplemented
+}
+
+Vector GhostTexture::RotateVector(Vector v, float angle)
+{
+    Vector vec;
+    float  rad;
+
+    rad   = DEG2RAD(angle);
+    vec.x = cos(rad) * v.x - sin(rad) * v.y;
+    vec.y = cos(rad) * v.y + sin(rad) * v.x;
+    vec.z = 0;
+
+    return vec;
+}
+
+void GhostTexture::GenerateLightning(
+    Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions
+)
+{
+    Vector mid;
+    Vector delta;
+    float  length;
+
+    if (numSubdivisions == maxSubdivisions) {
+        p1[0] += 0.5;
+        p1[1] += 0.5;
+        p2[0] += 0.5;
+        p2[1] += 0.5;
+        ClipAndDrawLine(p1, p2, color);
+
+        return;
+    }
+
+    delta  = p2 - p1;
+    length = delta.length() * 0.5;
+    delta.normalize();
+
+    mid = RotateVector(delta, RandomizeRange(-angleVar, angleVar));
+    mid = p1 + mid * length;
+
+    GenerateLightning(p1, mid, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+    GenerateLightning(mid, p2, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+}
+
+void GhostTexture::Update()
+{
+    Vector pos;
+    int    i, j;
+    int    numEmitters;
+    float  currentTime;
+
+    // FIXME: unimplemented
+}
+
+void R_UpdateGhostTextures()
+{
+    int i;
+    int numTextures;
+
+    frameTime = tr.refdef.time - lastTime;
+    lastTime  = tr.refdef.time;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        gt->Update();
+        gt->Burn();
+
+        GL_Bind(gt->m_image);
+        qglTexImage2D(GL_TEXTURE_2D, 0, 3, gt->m_width, gt->m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, gt->m_texture);
+    }
+}
+
+void R_SetGhostImage(const char *name, image_t *image)
+{
+    int i;
+    int numTextures;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        if (gt->m_name == name) {
+            gt->m_image = image;
+        }
+    }
+}
+
+void LoadGHOST(const char *name, byte **pic, int *width, int *height)
+{
+    char         *buf_p;
+    char         *buffer;
+    int           numPixels;
+    int           numParticles;
+    int           i;
+    GhostTexture *gt;
+
+    if (ri.FS_ReadFile(name, (void **)&buffer) == -1) {
+        return;
+    }
+
+    buf_p = buffer;
+    COM_ParseExt(&buf_p, qtrue);
+
+    *width  = atoi(COM_ParseExt(&buf_p, qtrue));
+    *height = atoi(COM_ParseExt(&buf_p, qtrue));
+
+    numParticles = atoi(COM_ParseExt(&buf_p, qtrue));
+    numPixels    = *height * *width;
+    *pic         = new byte[numPixels * 4];
+
+    gt            = new GhostTexture();
+    gt->m_width   = *width;
+    gt->m_height  = *height;
+    gt->m_texture = new unsigned int[numPixels];
+
+    gt->m_isburn   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_burnrate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    gt->m_isfade   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_faderate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    ghostManager.m_textureList.AddObject(gt);
+
+    for (i = 0; i < numParticles; i++) {
+        ParticleEmitter *pe = new ParticleEmitter();
+        gt->m_emitterList.AddObject(pe);
+        pe->Load(&buf_p);
+    }
+}
diff --git a/code/renderer/tr_ghost.h b/code/renderer/tr_ghost.h
index 64b139d4..6c151ea6 100644
--- a/code/renderer/tr_ghost.h
+++ b/code/renderer/tr_ghost.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,3 +21,280 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #pragma once
+
+#include "tr_local.h"
+#include "../qcommon/vector.h"
+#include "../qcommon/container.h"
+#include "../qcommon/str.h"
+
+using outcode = unsigned int;
+
+class Particle
+{
+private:
+    float m_startTime;
+    float m_dieTime;
+
+    Vector m_velocity;
+    Vector m_acceleration;
+    Vector m_perp;
+
+    qboolean m_wavy;
+    float    m_wavyDist;
+    float    m_wavyOffset;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    int   m_deltaR;
+    int   m_deltaG;
+    int   m_deltaB;
+    int   m_srcR;
+    int   m_srcG;
+    int   m_srcB;
+    int   m_dstR;
+    int   m_dstG;
+    int   m_dstB;
+    float m_colorRate;
+
+    Vector m_realposition;
+
+    float m_life;
+    float m_maxspeed;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    Vector m_parentOrigin;
+
+public:
+    Vector m_position;
+    int    m_color;
+
+public:
+    Particle(
+        Vector   pos,
+        Vector   vel,
+        Vector   acc,
+        int      srcColor,
+        int      dstColor,
+        float    colorRate,
+        qboolean wavy,
+        float    wavyDist,
+        float    currentTime,
+        float    dieTime,
+        float    maxspeed,
+        Vector   parentOrg,
+        qboolean swarm,
+        int      freq,
+        int      delta
+    );
+
+    void  Update(float currentTime);
+    float GetDieTime();
+};
+
+class ParticleEmitter
+{
+private:
+    float m_time;
+    float m_lasttime;
+
+    Vector m_position;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    float m_minColorRate;
+    float m_maxColorRate;
+
+    float m_minRate;
+    float m_maxRate;
+
+    float m_minLife;
+    float m_maxLife;
+
+    float m_angle;
+    float m_angleVar;
+
+    float m_minSpeed;
+    float m_maxSpeed;
+    float m_accAngle;
+    float m_accAngleVar;
+    float m_minAccSpeed;
+    float m_maxAccSpeed;
+
+    float    m_minWavyDist;
+    float    m_maxWavyDist;
+    qboolean m_wavy;
+
+    qboolean m_gravityWell;
+    float    m_gravityWellStrength;
+
+    qboolean m_particles;
+    Vector   m_gravityEffectVector;
+
+    qboolean m_ballLightning;
+    int      m_minBallLightningRadius;
+    int      m_maxBallLightningRadius;
+    float    m_lightningVar;
+    int      m_lightningSubdivisions;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    int m_maxspeed;
+
+public:
+    Container<Particle *> particleList;
+
+public:
+    ParticleEmitter(
+        Vector   position,
+        float    minSpeed,
+        float    maxSpeed,
+        float    angle,
+        float    angleVar,
+        float    minAccSpeed,
+        float    maxAccSpeed,
+        float    accAngle,
+        float    accAngleVar,
+        float    minRate,
+        float    maxRate,
+        int      srcColor,
+        int      dstColor,
+        float    minColorRate,
+        float    maxColorRate,
+        qboolean wavy,
+        float    minWavyDist,
+        float    maxWavyDist,
+        float    minLife,
+        float    maxLife,
+        qboolean particles,
+        qboolean gravityWell,
+        float    gravityWellStrength,
+        qboolean ballLightning,
+        int      minBallLightningRadius,
+        int      maxBallLightningRadius,
+        float    lightningVar,
+        int      lightningSubdivisions,
+        qboolean swarm,
+        int      swarmfreq,
+        int      swarmdelta
+    );
+    ParticleEmitter();
+    ~ParticleEmitter();
+
+    void Emit(float currentTime);
+    void UpdateValues();
+
+    Vector GetPosition();
+    Vector GetVelocity();
+    Vector GetVelocityDirection();
+    Vector GetVelocityDirectionMin();
+    Vector GetVelocityDirectionMax();
+    Vector GetAcceleration();
+    Vector GetAccelerationDirection();
+    Vector GetAccelerationDirectionMin();
+    Vector GetAccelerationDirectionMax();
+
+    int GetSrcColor();
+    int GetDstColor();
+
+    float GetGravityWellStrength();
+    float GetRate();
+    float GetColorRate();
+
+    float GetWavyDistance();
+    float GetDieTime(float currentTime);
+    int   GetBallLightningRadius();
+    float GetLightningVar();
+    int   GetLightningSubdivisions();
+
+    qboolean IsWavy();
+    qboolean IsGravityWell();
+    qboolean IsParticles();
+    qboolean IsBallLightning();
+    qboolean IsSwarm();
+
+    void SetMinSpeed(float value);
+    void SetMaxSpeed(float value);
+
+    void SetAngle(float value);
+    void SetAngleVar(float value);
+
+    void SetMinAccSpeed(float value);
+    void SetMaxAccSpeed(float value);
+    void SetAccAngle(float value);
+    void SetAccAngleVar(float value);
+
+    void SetMinRate(float value);
+    void SetMaxRate(float value);
+
+    void SetSrcColor(int value);
+    void SetDstColor(int value);
+    void SetMinColorRate(float value);
+    void SetMaxColorRate(float value);
+
+    void SetWavy(int value);
+
+    void SetParticles(int value);
+    void SetGravityWell(int value);
+
+    void SetMinWavyDist(float value);
+    void SetMaxWavyDist(float value);
+
+    void SetMinLife(float value);
+    void SetMaxLife(float value);
+
+    void SetGravityWellStrength(float value);
+    void SetGravityEffectVector(Vector value);
+
+    void SetBallLightning(int value);
+    void SetMinBallLightningRadius(int value);
+    void SetMaxBallLightningRadius(int value);
+    void SetLightningVar(float value);
+    void SetLightningSubdivisions(int value);
+
+    float RandomizeRange(float minRange, float maxRange);
+    float RandomizeAngle(float minAngle, float maxAngle);
+
+    Vector CalculateDirection(float value);
+
+    void Load(char **buf_p);
+};
+
+class GhostTexture
+{
+public:
+    Container<ParticleEmitter *> m_emitterList;
+
+    int m_width;
+    int m_height;
+
+    image_t      *m_image;
+    unsigned int *m_texture;
+    str           m_name;
+
+    qboolean m_isburn;
+    qboolean m_isfade;
+    int      m_faderate;
+    int      m_burnrate;
+
+public:
+    GhostTexture();
+
+    void   Update();
+    void   SetTexel(int x, int y, unsigned int color);
+    void   Burn();
+    void   GenerateLightning(Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions);
+    Vector RotateVector(Vector v, float angle);
+    void   ClipAndDrawLine(Vector p0, Vector p1, int color);
+    outcode ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax);
+};
+
+class GhostManager
+{
+public:
+    Container<GhostTexture *> m_textureList;
+};

From 9475be8f6f1dc6d8be2f4c0261b9a0e30849b850 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Sep 2024 23:41:47 +0200
Subject: [PATCH 0821/2040] Remove entityNumIndexes/staticModelNumIndexes from
 declaration as it causes compilation issue on some compilers

---
 code/renderer/tr_local.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 7303f299..39d2c3f0 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2195,8 +2195,6 @@ void R_DebugSkeleton(void);
 extern int g_nStaticSurfaces;
 extern qboolean g_bInfostaticmodels;
 extern qboolean g_bInfoworldtris;
-extern int entityNumIndexes[];
-extern int staticModelNumIndexes[];
 
 /*
 =============================================================

From 117b9a55799f5a58d9eebefc88ce3f364613af87 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:42:41 +0200
Subject: [PATCH 0822/2040] Add declarations for GHOST functions

---
 code/renderer/tr_local.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 39d2c3f0..e8ae60ee 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2233,6 +2233,8 @@ GHOST
 */
 
 void R_UpdateGhostTextures();
+void R_SetGhostImage(const char* name, image_t* image);
+void LoadGHOST(const char* name, byte** pic, int* width, int* height);
 
 /*
 =============================================================

From 6cdf5b7b7e17d1dee86bb771ff266af1ea2f775b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:44:36 +0200
Subject: [PATCH 0823/2040] Process .gst files

---
 code/renderer/tr_image.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 9caeffba..8c319346 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -2482,7 +2482,11 @@ static void R_LoadImage(const char* name, byte** pic, int* width, int* height, q
 		else if (!Q_stricmp(name + len - 4, ".jpg")) {
 			LoadJPG(name, pic, width, height);
 			*piMipmapsAvailable = 1;
-		}
+        }
+        else if (!Q_stricmp(name + len - 4, ".gst")) {
+            LoadGHOST(name, pic, width, height);
+            *piMipmapsAvailable = 0;
+        }
 	}
 
 	if (scr_initialized)
@@ -2566,6 +2570,11 @@ image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip
 		glWrapClampModeX,
 		glWrapClampModeY);
 
+    len = strlen(name);
+    if (len > 4 && !strcmp(&name[len - 4], ".gst")) {
+        R_SetGhostImage(name, image);
+    }
+
 	ri.Free(pic);
 	return image;
 }

From 06f4980ee13c60f363012e43e948ae74e7fbfe1b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:09:05 +0200
Subject: [PATCH 0824/2040] Implement ghost textures with particles

---
 code/renderer/tr_ghost.cpp | 1002 ++++++++++++++++++++++++++++++++++--
 1 file changed, 956 insertions(+), 46 deletions(-)

diff --git a/code/renderer/tr_ghost.cpp b/code/renderer/tr_ghost.cpp
index 73f84281..c68aa344 100644
--- a/code/renderer/tr_ghost.cpp
+++ b/code/renderer/tr_ghost.cpp
@@ -30,11 +30,24 @@ GhostManager ghostManager;
 int frameTime;
 int lastTime;
 
+/*
+====================
+RandomizeRange
+
+====================
+*/
 float RandomizeRange(float min, float max)
 {
     return min + (max - min) * (rand() / (float)RAND_MAX);
 }
 
+/*
+====================
+Particle::Particle
+
+Initializes the particle with the specified parameters
+====================
+*/
 Particle::Particle(
     Vector   pos,
     Vector   vel,
@@ -97,6 +110,13 @@ Particle::Particle(
     m_deltaB = m_dstB - m_srcB;
 }
 
+/*
+====================
+Particle::Update
+
+Updates the particle based on the current time
+====================
+*/
 void Particle::Update(float currentTime)
 {
     int    r, g, b;
@@ -105,14 +125,71 @@ void Particle::Update(float currentTime)
     float  factor;
     Vector offset;
 
-    // FIXME: unimplemented
+    ftime = frameTime / 1000.0;
+    time2 = Square(ftime) * 0.5;
+
+    if (m_swarm) {
+        if (!(rand() % m_swarmfrequency)) {
+            m_velocity[0] = crandom() * m_maxspeed;
+            m_velocity[1] = crandom() * m_maxspeed;
+            m_velocity[2] = crandom() * m_maxspeed;
+        }
+
+        if (m_parentOrigin[0] > m_position[0]) {
+            m_velocity[0] += m_swarmdelta;
+        } else {
+            m_velocity[0] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[1] > m_position[1]) {
+            m_velocity[1] += m_swarmdelta;
+        } else {
+            m_velocity[1] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[2] > m_position[2]) {
+            m_velocity[2] += m_swarmdelta;
+        } else {
+            m_velocity[2] -= m_swarmdelta;
+        }
+    }
+
+    m_position = m_realposition;
+
+    m_position += m_velocity * ftime + m_acceleration * time2;
+    m_velocity += m_acceleration * ftime;
+    m_realposition = m_position;
+
+    if (m_wavy) {
+        offset = m_perp * sin(currentTime + m_wavyOffset) * (m_wavyOffset + m_wavyDist);
+        m_position += offset;
+    }
+
+    factor = 1.0 - (m_dieTime - currentTime) / m_life;
+    r      = m_deltaR * factor;
+    g      = m_deltaG * factor;
+    b      = m_deltaB * factor;
+
+    m_color = (r) | (g << 8) | (b << 8);
 }
 
+/*
+====================
+Particle::GetDieTime
+
+Returns the time at which the particle stops
+====================
+*/
 float Particle::GetDieTime()
 {
     return m_dieTime;
 }
 
+/*
+====================
+ParticleEmitter::ParticleEmitter
+
+Initializes the particle emitter with specified parameters
+====================
+*/
 ParticleEmitter::ParticleEmitter(
     Vector   position,
     float    minSpeed,
@@ -195,318 +272,882 @@ ParticleEmitter::ParticleEmitter(
     m_gravityEffectVector = vec_zero;
 }
 
+/*
+====================
+ParticleEmitter::ParticleEmitter
+====================
+*/
 ParticleEmitter::ParticleEmitter()
 {
     m_lasttime = tr.refdef.time / 1000.0;
 }
 
+/*
+====================
+ParticleEmitter::~ParticleEmitter
+====================
+*/
 ParticleEmitter::~ParticleEmitter() {}
 
+/*
+====================
+ParticleEmitter::Emit
+
+Creates new particles based on the current time
+====================
+*/
 void ParticleEmitter::Emit(float currentTime)
 {
     Particle *p;
     float     rate;
     float     delta;
 
-    // FIXME: unimplemented
+    rate  = GetRate();
+    delta = currentTime = m_lasttime;
+
+    if (!rate) {
+        m_lasttime = currentTime;
+        return;
+    }
+
+    for (; delta > rate; delta -= rate) {
+        p = new Particle(
+            m_position,
+            GetVelocity(),
+            GetAcceleration(),
+            GetSrcColor(),
+            GetDstColor(),
+            GetColorRate(),
+            IsWavy(),
+            GetWavyDistance(),
+            currentTime,
+            GetDieTime(currentTime),
+            m_maxSpeed,
+            GetPosition(),
+            IsSwarm(),
+            m_swarmfrequency,
+            m_swarmdelta
+        );
+
+        particleList.AddObject(p);
+
+        m_lasttime = currentTime;
+    }
 }
 
+/*
+====================
+ParticleEmitter::UpdateValues
+
+Updates all particles with the last renderer time
+====================
+*/
 void ParticleEmitter::UpdateValues()
 {
-    // FIXME: unimplemented
+    int i;
+    int numParticles;
+
+    numParticles = particleList.NumObjects();
+    for (i = 1; i <= numParticles; i++) {
+        Particle *p = particleList.ObjectAt(i);
+
+        p->Update(m_lasttime);
+    }
 }
 
+/*
+====================
+ParticleEmitter::GetPosition
+
+Returns the current particle position
+====================
+*/
 Vector ParticleEmitter::GetPosition()
 {
     return m_position;
 }
 
+/*
+====================
+ParticleEmitter::GetVelocity
+
+Returns the random velocity based on random angle, and random speed
+====================
+*/
 Vector ParticleEmitter::GetVelocity()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetVelocityDirection
+
+Returns the direction of the random velocity
+====================
+*/
 Vector ParticleEmitter::GetVelocityDirection()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    v.normalize();
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMin
+
+Returns the random velocity direction based on random angle, and minimum speed
+====================
+*/
 Vector ParticleEmitter::GetVelocityDirectionMin()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_minSpeed;
+
+    v.normalize();
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMax
+
+Returns the random velocity direction based on random angle, and maximum speed
+====================
+*/
 Vector ParticleEmitter::GetVelocityDirectionMax()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_maxSpeed;
+
+    v.normalize();
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetAcceleration
+
+Returns the random acceleration based on random angle, and random speed
+====================
+*/
 Vector ParticleEmitter::GetAcceleration()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetAccelerationDirection
+
+Returns the direction of the random acceleration
+====================
+*/
 Vector ParticleEmitter::GetAccelerationDirection()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    v.normalize();
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMin
+
+Returns the random acceleration direction based on random angle, and minimum speed
+====================
+*/
 Vector ParticleEmitter::GetAccelerationDirectionMin()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMax
+
+Returns the random acceleration direction based on random angle, and maximum speed
+====================
+*/
 Vector ParticleEmitter::GetAccelerationDirectionMax()
 {
-    // FIXME: unimplemented
-    return Vector();
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the maximum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
 }
 
+/*
+====================
+ParticleEmitter::GetSrcColor
+
+Returns the source color
+====================
+*/
 int ParticleEmitter::GetSrcColor()
 {
     return m_srcColor;
 }
 
+/*
+====================
+ParticleEmitter::GetDstColor
+
+Returns the destination color
+====================
+*/
 int ParticleEmitter::GetDstColor()
 {
     return m_dstColor;
 }
 
+/*
+====================
+ParticleEmitter::GetGravityWellStrength
+
+Returns the strength of the gravity
+====================
+*/
 float ParticleEmitter::GetGravityWellStrength()
 {
     return m_gravityWellStrength;
 }
 
+/*
+====================
+ParticleEmitter::GetRate
+
+Returns a random rate between minimum and maximum
+====================
+*/
 float ParticleEmitter::GetRate()
 {
-    // FIXME: unimplemented
-    return 0;
+    return RandomizeRange(m_minRate, m_maxRate);
 }
 
+/*
+====================
+ParticleEmitter::GetColorRate
+
+Returns a random color between minimum and maximum
+====================
+*/
 float ParticleEmitter::GetColorRate()
 {
-    // FIXME: unimplemented
-    return 0;
+    return RandomizeRange(m_minColorRate, m_maxColorRate);
 }
 
+/*
+====================
+ParticleEmitter::GetWavyDistance
+
+Returns a random wavy distance between minimum and maximum
+====================
+*/
 float ParticleEmitter::GetWavyDistance()
 {
-    // FIXME: unimplemented
-    return 0;
+    return RandomizeRange(m_minWavyDist, m_maxWavyDist);
 }
 
+/*
+====================
+ParticleEmitter::GetDieTime
+
+Returns a random time at which the particle will stop, between minimum and maximum
+====================
+*/
 float ParticleEmitter::GetDieTime(float currentTime)
 {
-    // FIXME: unimplemented
-    return 0;
+    return currentTime + RandomizeRange(m_minLife, m_maxLife);
 }
 
+/*
+====================
+ParticleEmitter::GetBallLightningRadius
+
+Returns a random lightning radius between minimum and maximum
+====================
+*/
 int ParticleEmitter::GetBallLightningRadius()
 {
-    // FIXME: unimplemented
-    return 0;
+    return RandomizeRange(m_minBallLightningRadius, m_maxBallLightningRadius);
 }
 
+/*
+====================
+ParticleEmitter::GetLightningVar
+
+Returns the maximum lightning value
+====================
+*/
 float ParticleEmitter::GetLightningVar()
 {
-    // FIXME: unimplemented
-    return 0;
+    return m_lightningVar;
 }
 
+/*
+====================
+ParticleEmitter::GetLightningSubdivisions
+
+Returns the number of lightning subdivisions
+====================
+*/
 int ParticleEmitter::GetLightningSubdivisions()
 {
-    // FIXME: unimplemented
-    return 0;
+    return m_lightningSubdivisions;
 }
 
+/*
+====================
+ParticleEmitter::IsWavy
+
+Returns whether or not this is a wavy particle
+====================
+*/
 qboolean ParticleEmitter::IsWavy()
 {
     return m_wavy;
 }
 
+/*
+====================
+ParticleEmitter::IsGravityWell
+
+Returns whether or not this particle has gravity
+====================
+*/
 qboolean ParticleEmitter::IsGravityWell()
 {
     return m_gravityWell;
 }
 
+/*
+====================
+ParticleEmitter::IsParticles
+
+Returns whether or not this contains particles
+====================
+*/
 qboolean ParticleEmitter::IsParticles()
 {
     return m_particles;
 }
 
+/*
+====================
+ParticleEmitter::IsBallLightning
+
+Returns whether or not ball lightning can be applied
+====================
+*/
 qboolean ParticleEmitter::IsBallLightning()
 {
     return m_ballLightning;
 }
 
+/*
+====================
+ParticleEmitter::IsSwarm
+
+Returns whether or not this is a swarm of particles
+====================
+*/
 qboolean ParticleEmitter::IsSwarm()
 {
     return m_swarm;
 }
 
+/*
+====================
+ParticleEmitter::SetMinSpeed
+
+Sets the minimum speed
+====================
+*/
 void ParticleEmitter::SetMinSpeed(float value)
 {
     m_minSpeed = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxSpeed
+
+Sets the maximum speed
+====================
+*/
 void ParticleEmitter::SetMaxSpeed(float value)
 {
     m_maxSpeed = value;
 }
 
+/*
+====================
+ParticleEmitter::SetAngle
+
+Sets the angle/minimum angle
+====================
+*/
 void ParticleEmitter::SetAngle(float value)
 {
     m_angle = value;
 }
 
+/*
+====================
+ParticleEmitter::SetAngleVar
+
+Sets the maximum speed
+====================
+*/
 void ParticleEmitter::SetAngleVar(float value)
 {
     m_angleVar = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMinAccSpeed
+
+Sets the minimum acceleration speed
+====================
+*/
 void ParticleEmitter::SetMinAccSpeed(float value)
 {
     m_minAccSpeed = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxAccSpeed
+
+Sets the maximum acceleration speed
+====================
+*/
 void ParticleEmitter::SetMaxAccSpeed(float value)
 {
     m_maxAccSpeed = value;
 }
 
+/*
+====================
+ParticleEmitter::SetAccAngle
+
+Sets the acceleration angle / minimum acceleration angle
+====================
+*/
 void ParticleEmitter::SetAccAngle(float value)
 {
     m_accAngle = value;
 }
 
+/*
+====================
+ParticleEmitter::SetAccAngleVar
+
+Sets the maximum acceleration speed
+====================
+*/
 void ParticleEmitter::SetAccAngleVar(float value)
 {
     m_accAngleVar = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMinRate
+
+Sets the minimum rate
+====================
+*/
 void ParticleEmitter::SetMinRate(float value)
 {
     m_minRate = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxRate
+
+Sets the maximum rate
+====================
+*/
 void ParticleEmitter::SetMaxRate(float value)
 {
     m_maxRate = value;
 }
 
+/*
+====================
+ParticleEmitter::SetSrcColor
+
+Sets the source color
+====================
+*/
 void ParticleEmitter::SetSrcColor(int value)
 {
     m_srcColor = value;
 }
 
+/*
+====================
+ParticleEmitter::SetDstColor
+
+Sets the destination color
+====================
+*/
 void ParticleEmitter::SetDstColor(int value)
 {
     m_dstColor = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMinColorRate
+
+Sets the minimum color rate
+====================
+*/
 void ParticleEmitter::SetMinColorRate(float value)
 {
     m_minColorRate = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxColorRate
+
+Sets the maximum color rate
+====================
+*/
 void ParticleEmitter::SetMaxColorRate(float value)
 {
     m_maxColorRate = value;
 }
 
+/*
+====================
+ParticleEmitter::SetWavy
+
+Sets whether or not this is a wavy particle
+====================
+*/
 void ParticleEmitter::SetWavy(int value)
 {
     m_wavy = value;
 }
 
+/*
+====================
+ParticleEmitter::SetParticles
+
+Sets whether or not this contains particles
+====================
+*/
 void ParticleEmitter::SetParticles(int value)
 {
     m_particles = value;
 }
 
+/*
+====================
+ParticleEmitter::SetGravityWell
+
+Sets whether or not this has gravity
+====================
+*/
 void ParticleEmitter::SetGravityWell(int value)
 {
     m_gravityWell = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMinWavyDist
+
+Sets the minimum wavy distance
+====================
+*/
 void ParticleEmitter::SetMinWavyDist(float value)
 {
     m_minWavyDist = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxWavyDist
+
+Sets the maximum wavy distance
+====================
+*/
 void ParticleEmitter::SetMaxWavyDist(float value)
 {
     m_maxWavyDist = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMinLife
+
+Sets the minimum life
+====================
+*/
 void ParticleEmitter::SetMinLife(float value)
 {
     m_minLife = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxLife
+
+Sets the maximum life
+====================
+*/
 void ParticleEmitter::SetMaxLife(float value)
 {
     m_maxLife = value;
 }
 
+/*
+====================
+ParticleEmitter::SetGravityWellStrength
+
+Sets the strength of the gravity
+====================
+*/
 void ParticleEmitter::SetGravityWellStrength(float value)
 {
     m_gravityWellStrength = value;
 }
 
+/*
+====================
+ParticleEmitter::SetGravityEffectVector
+
+Sets the direction at which gravity is applied
+====================
+*/
 void ParticleEmitter::SetGravityEffectVector(Vector value)
 {
     m_gravityEffectVector = value;
 }
 
+/*
+====================
+ParticleEmitter::SetBallLightning
+
+Sets whether or not it has ball lightning
+====================
+*/
 void ParticleEmitter::SetBallLightning(int value)
 {
     m_ballLightning = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMinBallLightningRadius
+
+Sets the minimum ball lightning radius
+====================
+*/
 void ParticleEmitter::SetMinBallLightningRadius(int value)
 {
     m_minBallLightningRadius = value;
 }
 
+/*
+====================
+ParticleEmitter::SetMaxBallLightningRadius
+
+Sets the maximum ball lightning radius
+====================
+*/
 void ParticleEmitter::SetMaxBallLightningRadius(int value)
 {
     m_maxBallLightningRadius = value;
 }
 
+/*
+====================
+ParticleEmitter::SetLightningVar
+
+Sets the maximum lightning value
+====================
+*/
 void ParticleEmitter::SetLightningVar(float value)
 {
     m_lightningVar = value;
 }
 
+/*
+====================
+ParticleEmitter::SetLightningSubdivisions
+
+Sets the number of subdivisions for the lightning
+====================
+*/
 void ParticleEmitter::SetLightningSubdivisions(int value)
 {
     m_lightningSubdivisions = value;
 }
 
+/*
+====================
+ParticleEmitter::RandomizeRange
+
+Returns a random value between the range [min, max]
+====================
+*/
 float ParticleEmitter::RandomizeRange(float min, float max)
 {
     return min + (max - min) * (rand() / (float)RAND_MAX);
 }
 
+/*
+====================
+ParticleEmitter::RandomizeAngle
+
+Returns a random angle between the range [min, max]
+====================
+*/
 float ParticleEmitter::RandomizeAngle(float min, float max)
 {
-    return min + (max - min) * (rand() / (float)RAND_MAX);
+    return min + ((rand() - (RAND_MAX / 2)) / (float)RAND_MAX) * max;
 }
 
+/*
+====================
+ParticleEmitter::CalculateDirection
+
+Returns a random Vector direction based on the angle value
+====================
+*/
 Vector ParticleEmitter::CalculateDirection(float value)
 {
-    // FIXME: unimplemented
-    return Vector();
+    float deg = DEG2RAD(value);
+
+    return Vector(cos(deg), -sin(deg), 0);
 }
 
+/*
+====================
+ParticleEmitter::Load
+
+Loads the specified particle emitter from the string buffer
+====================
+*/
 void ParticleEmitter::Load(char **buf_p)
 {
     m_position[0] = atoi(COM_ParseExt(buf_p, qtrue));
@@ -553,17 +1194,36 @@ void ParticleEmitter::Load(char **buf_p)
     m_swarmdelta     = atoi(COM_ParseExt(buf_p, qtrue));
 }
 
+/*
+====================
+GhostTexture::GhostTexture
+====================
+*/
 GhostTexture::GhostTexture()
 {
     m_image   = NULL;
     m_texture = NULL;
 }
 
+/*
+====================
+GhostTexture::SetTexel
+
+Sets color at the specified xy texel location
+====================
+*/
 void GhostTexture::SetTexel(int x, int y, unsigned int color)
 {
     m_texture[x + m_width * y] = color;
 }
 
+/*
+====================
+GhostTexture::Burn
+
+Applies fade/burn effect to the ghost texture
+====================
+*/
 void GhostTexture::Burn()
 {
     int     x, y;
@@ -571,9 +1231,87 @@ void GhostTexture::Burn()
     GLint   pixel;
     GLuint *line;
 
-    // FIXME: unimplemented
+    if (m_isfade) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (line[x] & 0xff) - m_faderate;
+                g = ((line[x] & 0xff00) >> 8) - m_faderate;
+                b = ((line[x] & 0xff0000) >> 16) - m_faderate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                line[x] = (r) | (g << 8) | (b << 16);
+            }
+        }
+    } else if (m_isburn) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (((line[m_width + x] & 0xff) + (line[x + 1] & 0xff) + (line[x - 1] & 0xff) + (line[x] & 0xff)) >> 2)
+                  - m_burnrate;
+                g = ((((line[m_width + x] & 0xFF00) >> 8) + ((line[x + 1] & 0xFF00) >> 8)
+                      + ((line[x - 1] & 0xFF00) >> 8) + ((line[x] & 0xFF00) >> 8))
+                     >> 2)
+                  - m_burnrate;
+                b = ((((line[m_width + x] & 0xFF0000) >> 16) + ((line[x + 1] & 0xFF0000) >> 16)
+                      + ((line[x - 1] & 0xFF0000) >> 16) + ((line[x] & 0xFF0000) >> 16))
+                     >> 2)
+                  - m_burnrate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                pixel = (r) | (g << 8) | (b << 16);
+                if (pixel > 0) {
+                    line[x] = pixel;
+                }
+            }
+        }
+    }
+
+    line = m_texture;
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+
+    for (y = 0; y < m_height; ++y) {
+        line[m_width * y]               = 0;
+        line[m_width - 1 + m_width * y] = 0;
+    }
+
+    line = &m_texture[m_width * (m_height - 1)];
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
 }
 
+/*
+====================
+GhostTexture::ComputeOutCode
+
+Returns a flag value indicating if x/y variable reached xmin/xmax
+====================
+*/
 outcode GhostTexture::ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax)
 {
     outcode code = 0;
@@ -593,6 +1331,13 @@ outcode GhostTexture::ComputeOutCode(int x, int y, int xmin, int xmax, int ymin,
     return code;
 }
 
+/*
+====================
+GhostTexture::ClipAndDrawLine
+
+Draws a line from p0 to p1 with clipping
+====================
+*/
 void GhostTexture::ClipAndDrawLine(Vector p0, Vector p1, int color)
 {
     int     x0, x1;
@@ -607,20 +1352,109 @@ void GhostTexture::ClipAndDrawLine(Vector p0, Vector p1, int color)
     outcode outcode0;
     outcode outcode1;
 
-    x0     = p0.x;
-    y0     = p0.y;
-    x1     = p1.x;
-    y1     = p1.y;
+    x0   = p0.x;
+    y0   = p0.y;
+    x1   = p1.x;
+    y1   = p1.y;
+    xmax = m_width - 1;
+    ymax = m_height - 1;
+
     accept = false;
-    xmax   = this->m_width - 1;
-    ymax   = this->m_height - 1;
 
     outcode0 = ComputeOutCode(x0, y0, 0, xmax, 0, ymax);
-    outcode0 = ComputeOutCode(x1, y1, 0, xmax, 0, ymax);
+    outcode1 = ComputeOutCode(x1, y1, 0, xmax, 0, ymax);
 
-    // FIXME: unimplemented
+    while (outcode1 | outcode0) {
+        outcode outCodeOut;
+        if (outcode0 & outcode1) {
+            break;
+        }
+
+        outCodeOut = outcode0 ? outcode0 : outcode1;
+
+        if (outCodeOut & 1) {
+            x = x0 + (x1 - x0) * (ymax - y0) / (y1 - y0);
+            y = ymax;
+        } else if (outCodeOut & 2) {
+            x = x0 - y0 * (x1 - x0) / (y1 - y0);
+            y = 0;
+        } else if (outCodeOut & 4) {
+            x = xmax;
+            y = y0 + (y1 - y0) * (xmax - x0) / (x1 - x0);
+        } else if (outCodeOut * 8) {
+            x = 0;
+            y = y0 - x0 * (y1 - y0) / (x1 - x0);
+        } else {
+            x = x0;
+            y = y0;
+        }
+        if (outCodeOut == outcode0) {
+            y0       = y;
+            x0       = x;
+            outcode0 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        } else {
+            x1       = x;
+            y1       = y;
+            outcode1 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        }
+    }
+
+    accept = true;
+    if (!accept) {
+        return;
+    }
+
+    dx = x1 - x0;
+    if (dx < 0) {
+        dx = x0 - x1;
+    }
+    ax = dx * 2;
+    sx = dx >= 0 ? 1 : -1;
+
+    dy = y1 - y0;
+    if (dy < 0) {
+        dy = y0 - y1;
+    }
+    ay = dy * 2;
+    sy = dy >= 0 ? 1 : -1;
+
+    x = x0;
+    y = y0;
+
+    if (ax > ay) {
+        for (d = ay - (ax >> 1);; d += ay, x += sx) {
+            SetTexel(x, y, color);
+            if (x == x1) {
+                break;
+            }
+
+            if (d >= 0) {
+                y += sy;
+                d -= ax;
+            }
+        }
+    } else {
+        for (d = ax - (ay >> 1);; d += ax, y += sy) {
+            SetTexel(x, y, color);
+            if (y == y1) {
+                break;
+            }
+
+            if (d >= 0) {
+                x += sx;
+                d -= ay;
+            }
+        }
+    }
 }
 
+/*
+====================
+GhostTexture::RotateVector
+
+Rotates the vector from angle
+====================
+*/
 Vector GhostTexture::RotateVector(Vector v, float angle)
 {
     Vector vec;
@@ -634,6 +1468,13 @@ Vector GhostTexture::RotateVector(Vector v, float angle)
     return vec;
 }
 
+/*
+====================
+GhostTexture::GenerateLightning
+
+Generates a lightning effect
+====================
+*/
 void GhostTexture::GenerateLightning(
     Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions
 )
@@ -663,6 +1504,13 @@ void GhostTexture::GenerateLightning(
     GenerateLightning(mid, p2, color, angleVar, numSubdivisions + 1, maxSubdivisions);
 }
 
+/*
+====================
+GhostTexture::Update
+
+Updates the ghost texture
+====================
+*/
 void GhostTexture::Update()
 {
     Vector pos;
@@ -670,9 +1518,57 @@ void GhostTexture::Update()
     int    numEmitters;
     float  currentTime;
 
-    // FIXME: unimplemented
+    currentTime = tr.refdef.time / 1000.0;
+
+    numEmitters = m_emitterList.NumObjects();
+
+    for (i = 1; i <= numEmitters; i++) {
+        ParticleEmitter *pe = m_emitterList.ObjectAt(i);
+
+        if (pe->IsGravityWell()) {
+            break;
+        }
+
+        if (pe->IsBallLightning()) {
+            Vector p1, p2;
+
+            if (pe->GetBallLightningRadius()) {
+                p1 = pe->GetPosition();
+                p2 = pe->GetVelocityDirection();
+
+                p2 = p1 + p2 * pe->GetBallLightningRadius();
+                GenerateLightning(p1, p2, pe->GetSrcColor(), pe->GetLightningVar(), 0, pe->GetLightningSubdivisions());
+            }
+        } else if (pe->IsParticles()) {
+            pe->Emit(currentTime);
+        } else {
+            Vector p = pe->GetPosition();
+
+            SetTexel(p.x, p.y, pe->GetSrcColor());
+        }
+
+        for (j = pe->particleList.NumObjects(); j > 0; j--) {
+            Particle *p = pe->particleList.ObjectAt(j);
+
+            p->Update(currentTime);
+            if (p->m_position.x < m_width && p->m_position.x >= 0 && p->m_position.y < m_height && p->m_position.y >= 0
+                && currentTime <= p->GetDieTime()) {
+                SetTexel(p->m_position.x, p->m_position.y, p->m_color);
+            } else {
+                delete p;
+                pe->particleList.RemoveObjectAt(j);
+            }
+        }
+    }
 }
 
+/*
+====================
+R_UpdateGhostTextures
+
+Updates all ghost textures
+====================
+*/
 void R_UpdateGhostTextures()
 {
     int i;
@@ -693,6 +1589,13 @@ void R_UpdateGhostTextures()
     }
 }
 
+/*
+====================
+R_SetGhostImage
+
+Applies an image to the specified named ghost texture
+====================
+*/
 void R_SetGhostImage(const char *name, image_t *image)
 {
     int i;
@@ -708,6 +1611,13 @@ void R_SetGhostImage(const char *name, image_t *image)
     }
 }
 
+/*
+====================
+LoadGHOST
+
+Loads a GHOST image file
+====================
+*/
 void LoadGHOST(const char *name, byte **pic, int *width, int *height)
 {
     char         *buf_p;

From 2b43ebfca495a1915ef689a4bf14416baff93de0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:41:14 +0200
Subject: [PATCH 0825/2040] Add ter_crater command

---
 code/renderer/tr_init.c  | 2 ++
 code/renderer/tr_local.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 8e1e87ad..5685b0a6 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1404,6 +1404,8 @@ void R_Register( void )
     //
 
     r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+
+    ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
 }
 
 void R_InitExtensions() {
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index e8ae60ee..f925a5d9 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2151,6 +2151,8 @@ void R_TerrainPrepareFrame();
 qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
 void R_SwapTerraPatch(cTerraPatch_t* pPatch);
 
+void R_TerrainCrater_f(void);
+
 /*
 =============================================================
 

From a136cccbe106d394c9c0ba11e0e2a229272e464b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:49:20 +0200
Subject: [PATCH 0826/2040] Implement R_CraterTerrain

---
 code/renderer/tr_terrain.c | 311 +++++++++++++++++++++++++++++++++----
 1 file changed, 278 insertions(+), 33 deletions(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 71bcecdd..76b2e8a8 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -73,6 +73,11 @@ terrainVert_t *g_pVert;
 poolInfo_t g_tri;
 poolInfo_t g_vert;
 
+/*
+================
+R_ValidateHeightmapForVertex
+================
+*/
 static void R_ValidateHeightmapForVertex(terraTri_t *pTri)
 {
     for (terraInt i = 0; i < 3; i++) {
@@ -83,6 +88,11 @@ static void R_ValidateHeightmapForVertex(terraTri_t *pTri)
     }
 }
 
+/*
+================
+R_AllocateVert
+================
+*/
 static terraInt R_AllocateVert(cTerraPatchUnpacked_t *patch)
 {
     terraInt iVert = g_vert.iFreeHead;
@@ -106,6 +116,11 @@ static terraInt R_AllocateVert(cTerraPatchUnpacked_t *patch)
     return iVert;
 }
 
+/*
+================
+R_InterpolateVert
+================
+*/
 static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
 {
     const terrainVert_t         *pVert0 = &g_pVert[pTri->iPt[0]];
@@ -127,6 +142,11 @@ static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
     pVert->xyz[2] = pVert->fHgtAvg;
 }
 
+/*
+================
+R_ReleaseVert
+================
+*/
 static void R_ReleaseVert(cTerraPatchUnpacked_t *patch, int iVert)
 {
     terrainVert_t *pVert = &g_pVert[iVert];
@@ -150,6 +170,11 @@ static void R_ReleaseVert(cTerraPatchUnpacked_t *patch, int iVert)
     g_vert.nFree++;
 }
 
+/*
+================
+R_AllocateTri
+================
+*/
 terraInt R_AllocateTri(cTerraPatchUnpacked_t *patch, qboolean check)
 {
     terraInt iTri = g_tri.iFreeHead;
@@ -177,6 +202,11 @@ terraInt R_AllocateTri(cTerraPatchUnpacked_t *patch, qboolean check)
     return iTri;
 }
 
+/*
+================
+R_ReleaseTri
+================
+*/
 static void R_ReleaseTri(cTerraPatchUnpacked_t *patch, terraInt iTri)
 {
     terraTri_t *pTri = &g_pTris[iTri];
@@ -219,6 +249,11 @@ static void R_ReleaseTri(cTerraPatchUnpacked_t *patch, terraInt iTri)
     }
 }
 
+/*
+================
+R_ConstChecksForTri
+================
+*/
 static int R_ConstChecksForTri(terraTri_t *pTri)
 {
     varnodeUnpacked_t vn;
@@ -241,6 +276,11 @@ static int R_ConstChecksForTri(terraTri_t *pTri)
     return 2;
 }
 
+/*
+================
+R_DemoteInAncestry
+================
+*/
 static void R_DemoteInAncestry(cTerraPatchUnpacked_t *patch, terraInt iTri)
 {
     terraInt iPrev = g_pTris[iTri].iPrev;
@@ -270,6 +310,11 @@ static void R_DemoteInAncestry(cTerraPatchUnpacked_t *patch, terraInt iTri)
     patch->drawinfo.iMergeHead                = iTri;
 }
 
+/*
+================
+R_TerrainHeapInit
+================
+*/
 static void R_TerrainHeapInit()
 {
     g_tri.iFreeHead  = 1;
@@ -294,6 +339,11 @@ static void R_TerrainHeapInit()
     g_pVert[g_nVerts - 1].iNext = 0;
 }
 
+/*
+================
+R_TerrainPatchesInit
+================
+*/
 static void R_TerrainPatchesInit()
 {
     int i;
@@ -309,6 +359,12 @@ static void R_TerrainPatchesInit()
     }
 }
 
+/*
+================
+R_SplitTri
+================
+*/
+
 void R_SplitTri(
     terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight
 )
@@ -394,6 +450,11 @@ void R_SplitTri(
     }
 }
 
+/*
+================
+R_ForceSplit
+================
+*/
 static void R_ForceSplit(terraInt iTri)
 {
     terraTri_t *pTri = &g_pTris[iTri];
@@ -475,6 +536,11 @@ static void R_ForceSplit(terraInt iTri)
     R_DemoteInAncestry(pTri->patch, iTri);
 }
 
+/*
+================
+R_ForceMerge
+================
+*/
 static void R_ForceMerge(terraInt iTri)
 {
     terraTri_t            *pTri  = &g_pTris[iTri];
@@ -543,6 +609,11 @@ static void R_ForceMerge(terraInt iTri)
     }
 }
 
+/*
+================
+R_TerraTriNeighbor
+================
+*/
 static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, int dir)
 {
     int iNeighbor;
@@ -577,6 +648,11 @@ static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, i
     return 0;
 }
 
+/*
+================
+R_PreTessellateTerrain
+================
+*/
 static void R_PreTessellateTerrain()
 {
     size_t numTerrainPatches = tr.world->numTerraPatches;
@@ -810,6 +886,11 @@ static void R_PreTessellateTerrain()
     }
 }
 
+/*
+================
+R_NeedSplitTri
+================
+*/
 static qboolean R_NeedSplitTri(terraTri_t *pTri)
 {
     uint8_t byConstChecks = pTri->byConstChecks;
@@ -834,6 +915,11 @@ static qboolean R_NeedSplitTri(terraTri_t *pTri)
     return qtrue;
 }
 
+/*
+================
+R_CalcVertMorphHeight
+================
+*/
 static void R_CalcVertMorphHeight(terrainVert_t *pVert)
 {
     float dot;
@@ -857,6 +943,11 @@ static void R_CalcVertMorphHeight(terrainVert_t *pVert)
     }
 }
 
+/*
+================
+R_UpdateVertMorphHeight
+================
+*/
 static void R_UpdateVertMorphHeight(terrainVert_t *pVert)
 {
     if (pVert->uiDistRecalc <= g_uiTerDist) {
@@ -864,6 +955,11 @@ static void R_UpdateVertMorphHeight(terrainVert_t *pVert)
     }
 }
 
+/*
+================
+R_DoTriSplitting
+================
+*/
 static void R_DoTriSplitting()
 {
     cTerraPatchUnpacked_t *patch;
@@ -906,6 +1002,11 @@ static void R_DoTriSplitting()
     }
 }
 
+/*
+================
+R_DoGeomorphs
+================
+*/
 static void R_DoGeomorphs()
 {
     for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
@@ -942,6 +1043,11 @@ static void R_DoGeomorphs()
     }
 }
 
+/*
+================
+R_MergeInternalAggressive
+================
+*/
 static qboolean R_MergeInternalAggressive()
 {
     terraTri_t *pTri = &g_pTris[g_tri.iCur];
@@ -968,6 +1074,11 @@ static qboolean R_MergeInternalAggressive()
     return qtrue;
 }
 
+/*
+================
+R_MergeInternalCautious
+================
+*/
 static qboolean R_MergeInternalCautious()
 {
     terraTri_t *pTri;
@@ -1000,6 +1111,11 @@ static qboolean R_MergeInternalCautious()
     return qtrue;
 }
 
+/*
+================
+R_DoTriMerging
+================
+*/
 static void R_DoTriMerging()
 {
     int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
@@ -1024,6 +1140,11 @@ static void R_DoTriMerging()
     }
 }
 
+/*
+================
+R_TessellateTerrain
+================
+*/
 void R_TessellateTerrain()
 {
     if (glConfig.smpActive) {
@@ -1037,6 +1158,11 @@ void R_TessellateTerrain()
     R_DoTriMerging();
 }
 
+/*
+================
+R_TerrainPrepareFrame
+================
+*/
 void R_TerrainPrepareFrame()
 {
     float distance;
@@ -1127,6 +1253,11 @@ void R_TerrainPrepareFrame()
     }
 }
 
+/*
+================
+R_MarkTerrainPatch
+================
+*/
 void R_MarkTerrainPatch(cTerraPatchUnpacked_t *pPatch)
 {
     if (pPatch->visCountCheck == g_terVisCount) {
@@ -1157,6 +1288,11 @@ void R_MarkTerrainPatch(cTerraPatchUnpacked_t *pPatch)
     tr.world->activeTerraPatches = pPatch;
 }
 
+/*
+================
+R_AddTerrainSurfaces
+================
+*/
 void R_AddTerrainSurfaces()
 {
     int                    i;
@@ -1207,15 +1343,19 @@ void R_AddTerrainSurfaces()
     }
 }
 
-/**
- * Calculates the height of a terrain polygon by interpolating the heights of its vertices.
- * The function finds the triangle containing the given point (x, y) within the terrain patch,
- * and then computes the height at each vertex of the polygon using barycentric interpolation.
- * Finally, it updates the z-coordinate of each vertex to store the calculated height.
- * Returns qtrue if the triangle was found and the height could be calculated and saved into its vertices.
- *
- * ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
- */
+/*
+================
+R_TerrainHeightForPoly
+
+Calculates the height of a terrain polygon by interpolating the heights of its vertices.
+The function finds the triangle containing the given point (x, y) within the terrain patch,
+and then computes the height at each vertex of the polygon using barycentric interpolation.
+Finally, it updates the z-coordinate of each vertex to store the calculated height.
+Returns qtrue if the triangle was found and the height could be calculated and saved into its vertices.
+
+ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
+================
+*/
 qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVerts, int nVerts)
 {
     float x0     = 0;
@@ -1227,8 +1367,8 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
     float fKx[3] = {0}, fKy[3] = {0}, fKz[3] = {0}, fArea[3] = {0};
     float fAreaTotal = 0;
 
-    float x = pVerts->xyz[0];
-    float y = pVerts->xyz[1];
+    float    x = pVerts->xyz[0];
+    float    y = pVerts->xyz[1];
     terraInt iTri;
 
     // Calculate the average of the x and y coordinates of all vertices
@@ -1247,7 +1387,7 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
     iTri = pPatch->drawinfo.iTriHead;
 
     // Find a triangle that contains the point (x, y)
-    for(iTri = pPatch->drawinfo.iTriHead; iTri; iTri = g_pTris[iTri].iNext) {
+    for (iTri = pPatch->drawinfo.iTriHead; iTri; iTri = g_pTris[iTri].iNext) {
         if (g_pTris[iTri].byConstChecks & 4) {
             // Get all three x-y coordinates of the current triangle's vertices
             x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
@@ -1313,23 +1453,20 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
                 return qtrue;
             }
         }
-
     }
 
     assert(
         !pPatch->drawinfo.iTriHead
-        && va(
-            "R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-            x,
-            y,
-            pPatch->x0,
-            pPatch->y0,
-            pPatch->z0
-        )
+        && va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n", x, y, pPatch->x0, pPatch->y0, pPatch->z0)
     );
     return qfalse;
 }
 
+/*
+================
+R_TerrainRestart_f
+================
+*/
 void R_TerrainRestart_f(void)
 {
     if (tr.world->numTerraPatches < 0) {
@@ -1348,20 +1485,127 @@ void R_TerrainRestart_f(void)
     R_PreTessellateTerrain();
 }
 
-void R_CraterTerrain(vec_t *pos /* 0x8 */, vec_t *dir, float fDepth, float fRadius)
+/*
+================
+R_CraterTerrain
+================
+*/
+void R_CraterTerrain(const vec3_t pos, const vec3_t dir, float fDepth, float fRadius)
 {
-    // FIXME: unimplemented
+    int                    i, j, k;
+    int                    index;
+    qboolean               bMorphed;
+    cTerraPatchUnpacked_t *pPatch;
+    float                  x, y, z;
+    float                  dzSquared;
+    float                  heightmap[81];
+    float                  fMinHeight, fMaxHeight;
+    float                  fMaxOrig;
+    vec3_t                 vArcCenter;
+    float                  fArcRadius;
+    float                  fArcSquared;
+
+    fArcRadius  = (fRadius * fRadius / fDepth + fDepth) * 0.5;
+    fArcSquared = Square(fArcRadius);
+    VectorMA(pos, fDepth - fArcRadius, dir, vArcCenter);
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        pPatch = &tr.world->terraPatches[i];
+
+        bMorphed = qfalse;
+
+        fMaxOrig   = pPatch->z0;
+        fMaxHeight = pPatch->z0;
+        fMinHeight = pPatch->z0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                x = pPatch->x0 + (k << 6);
+                y = pPatch->y0 + (j << 6);
+                z = pPatch->z0 + (pPatch->heightmap[index] * 2);
+
+                heightmap[index] = z;
+
+                if (fMaxHeight < z) {
+                    fMaxHeight = z;
+                }
+                if (fMaxOrig < z) {
+                    fMaxOrig = z;
+                }
+
+                dzSquared = fArcSquared - (Square(x - vArcCenter[0]) + Square(y - vArcCenter[1]));
+
+                if (Square(z - vArcCenter[2]) > dzSquared) {
+                    continue;
+                }
+
+                if (pPatch->flags & 0x40) {
+                    heightmap[index] = vArcCenter[2] + sqrt(dzSquared);
+                    if (fMaxHeight < heightmap[index]) {
+                        fMaxHeight = heightmap[index];
+                    }
+                } else {
+                    heightmap[index] = vArcCenter[2] - sqrt(dzSquared);
+                    if (fMinHeight > heightmap[index]) {
+                        fMinHeight = heightmap[index];
+                    }
+                }
+
+                bMorphed = qtrue;
+            }
+        }
+
+        if (!bMorphed) {
+            continue;
+        }
+
+        if (fMinHeight < fMaxOrig - 510.0) {
+            fMinHeight = fMaxOrig - 510.0;
+        }
+
+        pPatch->z0 = floor((fMinHeight + 1.0) * 0.5) * 2.0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                pPatch->heightmap[index] = Q_clamp_float(floor((heightmap[index] - pPatch->z0 + 1.0) * 0.5), 0, 255);
+            }
+        }
+    }
 }
 
-void R_TerrainCrater_f()
+/*
+================
+R_TerrainCrater_f
+================
+*/
+void R_TerrainCrater_f(void)
 {
     vec3_t dir;
+
+    if (!Cvar_VariableIntegerValue("cheats")) {
+        //
+        // Added in OPM
+        //  This command may be used for debugging purposes.
+        //  It also prevents executing this command accidentally
+        //
+        return;
+    }
+
     VectorNegate(tr.refdef.viewaxis[2], dir);
 
     R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
     R_TerrainRestart_f();
 }
 
+/*
+================
+R_InitTerrain
+================
+*/
 void R_InitTerrain()
 {
     int i;
@@ -1392,7 +1636,8 @@ R_SwapTerraPatch
 Swaps the patch on big-endian
 ====================
 */
-void R_SwapTerraPatch(cTerraPatch_t* pPatch) {
+void R_SwapTerraPatch(cTerraPatch_t *pPatch)
+{
 #ifdef Q3_BIG_ENDIAN
     int i;
 
@@ -1404,13 +1649,13 @@ void R_SwapTerraPatch(cTerraPatch_t* pPatch) {
     pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
     pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
     pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
-    pPatch->iBaseHeight = LittleShort(pPatch->iBaseHeight);
-    pPatch->iShader = LittleUnsignedShort(pPatch->iShader);
-    pPatch->iLightMap = LittleUnsignedShort(pPatch->iLightMap);
-    pPatch->iNorth = LittleShort(pPatch->iNorth);
-    pPatch->iEast = LittleShort(pPatch->iEast);
-    pPatch->iSouth = LittleShort(pPatch->iSouth);
-    pPatch->iWest = LittleShort(pPatch->iWest);
+    pPatch->iBaseHeight       = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader           = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap         = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth            = LittleShort(pPatch->iNorth);
+    pPatch->iEast             = LittleShort(pPatch->iEast);
+    pPatch->iSouth            = LittleShort(pPatch->iSouth);
+    pPatch->iWest             = LittleShort(pPatch->iWest);
 
     for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
         pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);

From 6d993af41904984f3a44754f6944af5af5ec7ddd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:09:07 +0200
Subject: [PATCH 0827/2040] Fix compiler warning

---
 code/renderer/tr_local.h          | 2 +-
 code/renderer/tr_staticmodels.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index f925a5d9..09ca1be1 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2182,7 +2182,7 @@ void R_UpdatePoseInternal(refEntity_t* model);
 void RB_SkelMesh(skelSurfaceGame_t* sf);
 void RB_StaticMesh(staticSurface_t* staticSurf);
 void RB_Static_BuildDLights();
-void R_InfoStaticModels_f();
+void R_InfoStaticModels_f(void);
 void R_PrintInfoStaticModels();
 void R_AddSkelSurfaces(trRefEntity_t* ent);
 void R_AddStaticModelSurfaces(void);
diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 25ce7525..5f449cfe 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -498,7 +498,7 @@ void RB_Static_BuildDLights()
 R_InfoStaticModels_f
 ==============
 */
-void R_InfoStaticModels_f()
+void R_InfoStaticModels_f(void)
 {
     g_bInfostaticmodels = qtrue;
 }

From eb899be95eaaef654376cdbf71bf083a45396714 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:35:32 +0200
Subject: [PATCH 0828/2040] Implement RE_GetGraphicsInfo

---
 code/renderer/tr_init.c | 870 ++++++++++++++++++++++------------------
 1 file changed, 483 insertions(+), 387 deletions(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 5685b0a6..74575f72 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -24,10 +24,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tr_local.h"
 
 glconfig_t	glConfig;
-qboolean    textureFilterAnisotropic = qfalse;
-int         maxAnisotropy = 0;
-float       displayAspect = 0;
-qboolean    haveClampToEdge;
+qboolean	textureFilterAnisotropic = qfalse;
+int		 maxAnisotropy = 0;
+float	   displayAspect = 0;
+qboolean	haveClampToEdge;
 glstate_t	glState;
 int r_sequencenumber;
 
@@ -263,6 +263,8 @@ cvar_t* r_noborder;
 cvar_t* r_ext_texture_filter_anisotropic;
 cvar_t* r_stereoEnabled;
 
+static char infostring[8192];
+
 static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
 {
 	if ( shouldBeIntegral )
@@ -347,41 +349,41 @@ GL_CheckErrors
 ==================
 */
 void GL_CheckErrors( void ) {
-    int		err;
-    char	s[64];
+	int		err;
+	char	s[64];
 
-    err = qglGetError();
-    if ( err == GL_NO_ERROR ) {
-        return;
-    }
-    if ( r_ignoreGLErrors->integer ) {
-        return;
-    }
-    switch( err ) {
-        case GL_INVALID_ENUM:
-            strcpy( s, "GL_INVALID_ENUM" );
-            break;
-        case GL_INVALID_VALUE:
-            strcpy( s, "GL_INVALID_VALUE" );
-            break;
-        case GL_INVALID_OPERATION:
-            strcpy( s, "GL_INVALID_OPERATION" );
-            break;
-        case GL_STACK_OVERFLOW:
-            strcpy( s, "GL_STACK_OVERFLOW" );
-            break;
-        case GL_STACK_UNDERFLOW:
-            strcpy( s, "GL_STACK_UNDERFLOW" );
-            break;
-        case GL_OUT_OF_MEMORY:
-            strcpy( s, "GL_OUT_OF_MEMORY" );
-            break;
-        default:
-            Com_sprintf( s, sizeof(s), "%i", err);
-            break;
-    }
+	err = qglGetError();
+	if ( err == GL_NO_ERROR ) {
+		return;
+	}
+	if ( r_ignoreGLErrors->integer ) {
+		return;
+	}
+	switch( err ) {
+		case GL_INVALID_ENUM:
+			strcpy( s, "GL_INVALID_ENUM" );
+			break;
+		case GL_INVALID_VALUE:
+			strcpy( s, "GL_INVALID_VALUE" );
+			break;
+		case GL_INVALID_OPERATION:
+			strcpy( s, "GL_INVALID_OPERATION" );
+			break;
+		case GL_STACK_OVERFLOW:
+			strcpy( s, "GL_STACK_OVERFLOW" );
+			break;
+		case GL_STACK_UNDERFLOW:
+			strcpy( s, "GL_STACK_UNDERFLOW" );
+			break;
+		case GL_OUT_OF_MEMORY:
+			strcpy( s, "GL_OUT_OF_MEMORY" );
+			break;
+		default:
+			Com_sprintf( s, sizeof(s), "%i", err);
+			break;
+	}
 
-    ri.Error( ERR_FATAL, "GL_CheckErrors: %s", s );
+	ri.Error( ERR_FATAL, "GL_CheckErrors: %s", s );
 }
 
 
@@ -390,33 +392,33 @@ void GL_CheckErrors( void ) {
 */
 typedef struct vidmode_s
 {
-    const char *description;
-    int         width, height;
+	const char *description;
+	int		 width, height;
 	float		pixelAspect;		// pixel width / height
 } vidmode_t;
 
 vidmode_t r_vidModes[] =
 {
-    { "Mode  0: 320x240",		320,	240,	1 },
-    { "Mode  1: 400x300",		400,	300,	1 },
-    { "Mode  2: 512x384",		512,	384,	1 },
-    { "Mode  3: 640x480",		640,	480,	1 },
-    { "Mode  4: 800x600",		800,	600,	1 },
-    { "Mode  5: 960x720",		960,	720,	1 },
-    { "Mode  6: 1024x768",		1024,	768,	1 },
-    { "Mode  7: 1152x864",		1152,	864,	1 },
-    { "Mode  8: 1280x1024",		1280,	1024,	1 },
-    { "Mode  9: 1600x1200",		1600,	1200,	1 },
-    { "Mode 10: 2048x1536",		2048,	1536,	1 },
-    { "Mode 11: 856x480 (wide)",856,	480,	1 }
+	{ "Mode  0: 320x240",		320,	240,	1 },
+	{ "Mode  1: 400x300",		400,	300,	1 },
+	{ "Mode  2: 512x384",		512,	384,	1 },
+	{ "Mode  3: 640x480",		640,	480,	1 },
+	{ "Mode  4: 800x600",		800,	600,	1 },
+	{ "Mode  5: 960x720",		960,	720,	1 },
+	{ "Mode  6: 1024x768",		1024,	768,	1 },
+	{ "Mode  7: 1152x864",		1152,	864,	1 },
+	{ "Mode  8: 1280x1024",		1280,	1024,	1 },
+	{ "Mode  9: 1600x1200",		1600,	1200,	1 },
+	{ "Mode 10: 2048x1536",		2048,	1536,	1 },
+	{ "Mode 11: 856x480 (wide)",856,	480,	1 }
 };
 static int	s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
 
 qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) {
 	vidmode_t	*vm;
 
-    if ( mode < -1 ) {
-        return qfalse;
+	if ( mode < -1 ) {
+		return qfalse;
 	}
 	if ( mode >= s_numVidModes ) {
 		return qfalse;
@@ -431,11 +433,11 @@ qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode )
 
 	vm = &r_vidModes[mode];
 
-    *width  = vm->width;
-    *height = vm->height;
-    *windowAspect = (float)vm->width / ( vm->height * vm->pixelAspect );
+	*width  = vm->width;
+	*height = vm->height;
+	*windowAspect = (float)vm->width / ( vm->height * vm->pixelAspect );
 
-    return qtrue;
+	return qtrue;
 }
 
 /*
@@ -513,11 +515,11 @@ byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *pa
 	return buffer;
 }
 
-/* 
-================== 
+/*
+==================
 RB_TakeScreenshot
-================== 
-*/  
+==================
+*/
 void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
 	byte *allbuf, *buffer;
 	byte *srcptr, *destptr;
@@ -831,27 +833,27 @@ Doesn't print the pacifier message if there is a second arg
 ================== 
 */  
 void R_ScreenShot_f(void) {
-    char	checkname[MAX_OSPATH];
-    static int	lastNumber = -1;
+	char	checkname[MAX_OSPATH];
+	static int	lastNumber = -1;
 	int		width, height;
-    qboolean	silent;
+	qboolean	silent;
 
-    if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
-        R_LevelShot();
-        return;
-    }
+	if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
+		R_LevelShot();
+		return;
+	}
 
-    if (!strcmp(ri.Cmd_Argv(1), "silent")) {
-        silent = qtrue;
-    } else {
-        silent = qfalse;
-    }
+	if (!strcmp(ri.Cmd_Argv(1), "silent")) {
+		silent = qtrue;
+	} else {
+		silent = qfalse;
+	}
 
 	width = 0;
 	height = 0;
 
-    if (ri.Cmd_Argc() >= 2 && !silent) {
-        // explicit filename
+	if (ri.Cmd_Argc() >= 2 && !silent) {
+		// explicit filename
 		const char* name = ri.Cmd_Argv(1);
 		if (strchr(name, '/')) {
 			Q_strncpyz(checkname, name, sizeof(checkname));
@@ -864,31 +866,31 @@ void R_ScreenShot_f(void) {
 			height = atoi(ri.Cmd_Argv(3));
 		}
 	} else {
-        // scan for a free filename
+		// scan for a free filename
 
-        // if we have saved a previous screenshot, don't scan
-        // again, because recording demo avis can involve
-        // thousands of shots
-        if (lastNumber == -1) {
-            lastNumber = 0;
-        }
-        // scan for a free number
-        for (; lastNumber <= 9999; lastNumber++) {
-            R_ScreenshotFilename(lastNumber, checkname);
+		// if we have saved a previous screenshot, don't scan
+		// again, because recording demo avis can involve
+		// thousands of shots
+		if (lastNumber == -1) {
+			lastNumber = 0;
+		}
+		// scan for a free number
+		for (; lastNumber <= 9999; lastNumber++) {
+			R_ScreenshotFilename(lastNumber, checkname);
 
-            if (!ri.FS_FileExists(checkname))
-            {
-                break; // file doesn't exist
-            }
-        }
+			if (!ri.FS_FileExists(checkname))
+			{
+				break; // file doesn't exist
+			}
+		}
 
-        if (lastNumber >= 9999) {
-            ri.Printf(PRINT_ALL, "ScreenShot: Couldn't create a file\n");
-            return;
-        }
+		if (lastNumber >= 9999) {
+			ri.Printf(PRINT_ALL, "ScreenShot: Couldn't create a file\n");
+			return;
+		}
 
-        lastNumber++;
-    }
+		lastNumber++;
+	}
 
 	if (!width || !height) {
 		R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
@@ -904,6 +906,11 @@ void R_ScreenShot_f(void) {
 	}
 }
 
+/*
+==================
+RB_TakeScreenshot
+==================
+*/
 void R_ScreenShotJPEG_f (void) {
 	char		checkname[MAX_OSPATH];
 	static	int	lastNumber = -1;
@@ -936,10 +943,10 @@ void R_ScreenShotJPEG_f (void) {
 		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
 			R_ScreenshotFilenameJPEG( lastNumber, checkname );
 
-      if (!ri.FS_FileExists( checkname ))
-      {
-        break; // file doesn't exist
-      }
+	  if (!ri.FS_FileExists( checkname ))
+	  {
+		break; // file doesn't exist
+	  }
 		}
 
 		if ( lastNumber == 10000 ) {
@@ -1011,18 +1018,62 @@ void GL_SetDefaultState( void )
 	glState.fFogColor[3] = 1.0;
 }
 
+/*
+==================
+PrintAndAppendString
+==================
+*/
+void PrintAndAppendString(char* string, size_t maxlen, char* fmt, ...) {
+	char msg[1024];
+	size_t len;
+	va_list va;
+
+	va_start(va, fmt);
+	Q_vsnprintf(msg, sizeof(msg), fmt, va);
+	va_end(va);
+
+	ri.Printf(PRINT_ALL, "%s", msg);
+
+	Q_strcat(string, maxlen, msg);
+}
+
+/*
+==================
+RE_GetGraphicsInfo
+==================
+*/
 const char* RE_GetGraphicsInfo() {
-	// FIXME: unimplemented
-	return NULL;
+	return infostring;
 }
 
 /*
 ================
-GfxInfo_f
+R_PrintLongString
+
+Workaround for ri.Printf's 1024 characters buffer limit.
 ================
 */
-void GfxInfo_f( void ) 
-{
+void R_PrintLongString(char* dest, size_t destsize, const char *string) {
+	char buffer[1024];
+	const char *p;
+	int size = strlen(string);
+
+	p = string;
+	while(size > 0)
+	{
+		Q_strncpyz(buffer, p, sizeof (buffer) );
+		PrintAndAppendString( dest, destsize, "%s", buffer );
+		p += 1023;
+		size -= 1023;
+	}
+}
+
+/*
+==================
+BuildGfxInfo
+==================
+*/
+void BuildGfxInfo(char* dest, size_t destsize) {
 	cvar_t *sys_cpustring = ri.Cvar_Get( "sys_cpustring", "", 0 );
 	const char *enablestrings[] =
 	{
@@ -1035,38 +1086,55 @@ void GfxInfo_f( void )
 		"fullscreen"
 	};
 
-	ri.Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
-	ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
-	ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
-	ri.Printf( PRINT_ALL, "GL_EXTENSIONS: %s\n", glConfig.extensions_string );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
-	//ri.Printf( PRINT_ALL, "GL_MAX_ACTIVE_TEXTURES_ARB: %d\n", glConfig.maxActiveTextures );
-	ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
-	ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
-	if ( glConfig.displayFrequency )
+	PrintAndAppendString( dest, destsize, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
+	PrintAndAppendString( dest, destsize, "GL_RENDERER: %s\n", glConfig.renderer_string );
+	PrintAndAppendString( dest, destsize, "GL_VERSION: %s\n", glConfig.version_string );
+	PrintAndAppendString( dest, destsize, "GL_EXTENSIONS: " );
+	// glConfig.extensions_string is a limited length so get the full list directly
+	if ( qglGetStringi )
 	{
-		ri.Printf( PRINT_ALL, "%d\n", glConfig.displayFrequency );
+		GLint numExtensions;
+		int i;
+
+		qglGetIntegerv( GL_NUM_EXTENSIONS, &numExtensions );
+		for ( i = 0; i < numExtensions; i++ )
+		{
+			PrintAndAppendString( dest, destsize, "%s ", qglGetStringi( GL_EXTENSIONS, i ) );
+		}
 	}
 	else
 	{
-		ri.Printf( PRINT_ALL, "N/A\n" );
+		R_PrintLongString( dest, destsize, (char *) qglGetString( GL_EXTENSIONS ) );
+	}
+	PrintAndAppendString( dest, destsize, "\n" );
+	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
+	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
+	PrintAndAppendString( dest, destsize, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
+	PrintAndAppendString( dest, destsize, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
+	if ( glConfig.displayFrequency )
+	{
+		PrintAndAppendString( dest, destsize, "%d\n", glConfig.displayFrequency );
+	}
+	else
+	{
+		PrintAndAppendString( dest, destsize, "N/A\n" );
 	}
 	if ( glConfig.deviceSupportsGamma )
 	{
-		ri.Printf( PRINT_ALL, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
+		PrintAndAppendString( dest, destsize, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
 	}
 	else
 	{
-		ri.Printf( PRINT_ALL, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
+		PrintAndAppendString( dest, destsize, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
 	}
-	ri.Printf( PRINT_ALL, "CPU: %s\n", sys_cpustring->string );
+	PrintAndAppendString( dest, destsize, "CPU: %s\n", sys_cpustring->string );
 
 	// rendering primitives
 	{
 		int		primitives;
 
 		// default is to use triangles if compiled vertex arrays are present
-		ri.Printf( PRINT_ALL, "rendering primitives: " );
+		PrintAndAppendString( dest, destsize, "rendering primitives: " );
 		primitives = r_primitives->integer;
 		if ( primitives == 0 ) {
 			if ( qglLockArraysEXT ) {
@@ -1076,65 +1144,93 @@ void GfxInfo_f( void )
 			}
 		}
 		if ( primitives == -1 ) {
-			ri.Printf( PRINT_ALL, "none\n" );
+			PrintAndAppendString( dest, destsize, "none\n" );
 		} else if ( primitives == 2 ) {
-			ri.Printf( PRINT_ALL, "single glDrawElements\n" );
+			PrintAndAppendString( dest, destsize, "single glDrawElements\n" );
 		} else if ( primitives == 1 ) {
-			ri.Printf( PRINT_ALL, "multiple glArrayElement\n" );
+			PrintAndAppendString( dest, destsize, "multiple glArrayElement\n" );
 		} else if ( primitives == 3 ) {
-			ri.Printf( PRINT_ALL, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
+			PrintAndAppendString( dest, destsize, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
 		}
 	}
 
-	ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
-	ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
-	ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
-	ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
-	ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
-	ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
-	ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
+	PrintAndAppendString( dest, destsize, "texturemode: %s\n", r_textureMode->string );
+	PrintAndAppendString( dest, destsize, "picmip: %d\n", r_picmip->integer );
+	PrintAndAppendString( dest, destsize, "texture bits: %d\n", r_texturebits->integer );
+	PrintAndAppendString( dest, destsize, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
+	PrintAndAppendString( dest, destsize, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
+	PrintAndAppendString( dest, destsize, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
+	PrintAndAppendString( dest, destsize, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
 	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 )
 	{
-		ri.Printf( PRINT_ALL, "HACK: using vertex lightmap approximation\n" );
+		PrintAndAppendString( dest, destsize, "HACK: using vertex lightmap approximation\n" );
 	}
 	if ( glConfig.hardwareType == GLHW_RAGEPRO )
 	{
-		ri.Printf( PRINT_ALL, "HACK: ragePro approximations\n" );
+		PrintAndAppendString( dest, destsize, "HACK: ragePro approximations\n" );
 	}
 	if ( glConfig.hardwareType == GLHW_RIVA128 )
 	{
-		ri.Printf( PRINT_ALL, "HACK: riva128 approximations\n" );
+		PrintAndAppendString( dest, destsize, "HACK: riva128 approximations\n" );
 	}
 	if ( glConfig.smpActive ) {
-		ri.Printf( PRINT_ALL, "Using dual processor acceleration\n" );
+		PrintAndAppendString( dest, destsize, "Using dual processor acceleration\n" );
 	}
 	if ( r_finish->integer ) {
-		ri.Printf( PRINT_ALL, "Forcing glFinish\n" );
+		PrintAndAppendString( dest, destsize, "Forcing glFinish\n" );
 	}
 }
 
-void FarPlaneInfo_f(void) {
-    Com_Printf("Current fog settings:\n");
-    Com_Printf("Distance: %i\n", (int)tr.viewParms.farplane_distance);
-    Com_Printf(
-        "Color: %f  %f  %f\n",
-        tr.viewParms.farplane_color[0],
-        tr.viewParms.farplane_color[1],
-        tr.viewParms.farplane_color[2]);
-    if (tr.viewParms.farplane_cull) {
-        Com_Printf("Cull: on\n");
-    } else {
-        Com_Printf("Cull: off\n");
-    }
+/*
+================
+GfxInfo_f
+================
+*/
+void GfxInfo_f( void ) 
+{
+	BuildGfxInfo(infostring, sizeof(infostring));
+	ri.Cvar_Set("r_gfxinfo", infostring);
 }
 
+/*
+==================
+FarPlaneInfo_f
+==================
+*/
+void FarPlaneInfo_f(void) {
+	Com_Printf("Current fog settings:\n");
+	Com_Printf("Distance: %i\n", (int)tr.viewParms.farplane_distance);
+	Com_Printf(
+		"Color: %f  %f  %f\n",
+		tr.viewParms.farplane_color[0],
+		tr.viewParms.farplane_color[1],
+		tr.viewParms.farplane_color[2]);
+	if (tr.viewParms.farplane_cull) {
+		Com_Printf("Cull: on\n");
+	} else {
+		Com_Printf("Cull: off\n");
+	}
+}
+
+/*
+==================
+R_SetMode
+==================
+*/
 qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
-	// FIXME: unimplemented
+    // FIXME: unimplemented
+	ri.Printf(PRINT_WARNING, "R_SetMode is unimplemented. To change the video mode, set the \"r_mode\" variable and execute the \"vid_restart\" command.\n");
 	return qfalse;
 }
 
+/*
+==================
+R_SetFullscreen
+==================
+*/
 void R_SetFullscreen(qboolean fullscreen) {
-	// FIXME: unimplemented
+    // FIXME: unimplemented
+    ri.Printf(PRINT_WARNING, "R_SetFullscreen is unimplemented. To change the fullscreen mode, set the \"r_fullscreen\" variable and execute the \"vid_restart\" command.\n");
 }
 
 /*
@@ -1159,11 +1255,11 @@ void R_Register( void )
 	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE | CVAR_LATCH);
 #endif
 	r_ext_texture_env_combine = ri.Cvar_Get("r_ext_texture_env_combine", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_ext_max_anisotropy = ri.Cvar_Get("r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH);
-    r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
-    r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
+	r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
+	r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
 
 	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
@@ -1178,23 +1274,23 @@ void R_Register( void )
 #else
 	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH );
 #endif
-    r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
-    r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
 	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
 	r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
-    r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
 #if (defined(MACOS_X) || defined(__linux__)) && defined(SMP)
   // Default to using SMP on Mac OS X or Linux if we have multiple processors
 	r_smp = ri.Cvar_Get( "r_smp", Sys_ProcessorCount() > 1 ? "1" : "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else        
+#else		
 	r_smp = ri.Cvar_Get( "r_smp", "0", CVAR_ARCHIVE | CVAR_LATCH);
 #endif
-    r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
 
 	//
 	// temporary latched variables that can only change over a restart
@@ -1239,38 +1335,38 @@ void R_Register( void )
 	// temporary variables that can change at any time
 	//
 	r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_TEMP );
-    r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
-    r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
-    r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
-    lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
-    lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
-    lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
-    lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
-    lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
-    lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
-    lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
-    lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
-    lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
-    lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
-    lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
-    lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
-    lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
-    lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
-    lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
-    lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
-    lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
-    lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
-    lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
-    lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
-    lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
-    lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
-    lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
-    lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
-    lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
-    lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
-    lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
-    lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
-    lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
+	r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
+	r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
+	r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
+	lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
+	lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
+	lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
+	lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
+	lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
+	lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
+	lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
+	lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
+	lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
+	lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
+	lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
+	lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
+	lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
+	lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
+	lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
+	lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
+	lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
+	lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
+	lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
+	lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
+	lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
+	lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
+	lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
+	lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
+	lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
+	lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
+	lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
+	lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
+	lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
 
 	r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT );
 	r_printShaders = ri.Cvar_Get( "r_printShaders", "0", 0 );
@@ -1287,21 +1383,21 @@ void R_Register( void )
 	r_skipBackEnd = ri.Cvar_Get ("r_skipBackEnd", "0", CVAR_CHEAT);
 
 	r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT );
-    r_norefresh = ri.Cvar_Get("r_norefresh", "0", CVAR_CHEAT);
-    r_drawentities = ri.Cvar_Get("r_drawentities", "1", CVAR_CHEAT);
-    r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
-    r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
-    r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
-    r_drawbrushes = ri.Cvar_Get("r_drawbrushes", "1", CVAR_CHEAT);
-    r_drawbrushmodels = ri.Cvar_Get("r_drawbrushmodels", "1", CVAR_CHEAT);
-    r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
-    r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
-    r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
-    r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
-    r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
-    r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
-    r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
-    r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
+	r_norefresh = ri.Cvar_Get("r_norefresh", "0", CVAR_CHEAT);
+	r_drawentities = ri.Cvar_Get("r_drawentities", "1", CVAR_CHEAT);
+	r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
+	r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
+	r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
+	r_drawbrushes = ri.Cvar_Get("r_drawbrushes", "1", CVAR_CHEAT);
+	r_drawbrushmodels = ri.Cvar_Get("r_drawbrushmodels", "1", CVAR_CHEAT);
+	r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
+	r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
+	r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
+	r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
+	r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
+	r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
+	r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
+	r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
 	r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT );
 	r_nocull = ri.Cvar_Get ("r_nocull", "0", CVAR_CHEAT);
 	r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
@@ -1315,75 +1411,75 @@ void R_Register( void )
 	r_showtris = ri.Cvar_Get ("r_showtris", "0", CVAR_CHEAT);
 	r_showsky = ri.Cvar_Get ("r_showsky", "0", CVAR_CHEAT);
 	r_shownormals = ri.Cvar_Get ("r_shownormals", "0", CVAR_CHEAT);
-    r_showhbox = ri.Cvar_Get("r_showhbox", "0", CVAR_CHEAT);
-    r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
+	r_showhbox = ri.Cvar_Get("r_showhbox", "0", CVAR_CHEAT);
+	r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
 	r_clear = ri.Cvar_Get ("r_clear", "0", CVAR_CHEAT);
 	r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT );
 	r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT );
 	r_drawBuffer = ri.Cvar_Get( "r_drawBuffer", "GL_BACK", CVAR_CHEAT );
 	r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", CVAR_CHEAT);
 	r_noportals = ri.Cvar_Get ("r_noportals", "0", CVAR_CHEAT);
-    r_entlightmap = ri.Cvar_Get("r_entlightmap", "0", CVAR_CHEAT);
-    r_fastentlight = ri.Cvar_Get("r_fastentlight", "1", CVAR_ARCHIVE);
-    r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
-    r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
-    r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
-    r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
-    r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
+	r_entlightmap = ri.Cvar_Get("r_entlightmap", "0", CVAR_CHEAT);
+	r_fastentlight = ri.Cvar_Get("r_fastentlight", "1", CVAR_ARCHIVE);
+	r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
+	r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
+	r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
+	r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
+	r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
 	r_shadows = ri.Cvar_Get( "cg_shadows", "1", 0 );
 
 	r_maxpolys = ri.Cvar_Get( "r_maxpolys", va("%d", MAX_POLYS), 0);
 	r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", va("%d", MAX_POLYVERTS), 0);
 	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
 
-    r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
-    r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
-    r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
-    r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
-    r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_ARCHIVE);
-    r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
-    r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
-    r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
-    r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
-    r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
-    r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
-    r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
-    r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
-    r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
-    r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
-    r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
-    r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
-    r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
-    r_useglfog = ri.Cvar_Get("r_useglfog", "1", 64);
-    r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
-    r_smoothsmokelight = ri.Cvar_Get("vss_smoothsmokelight", "1", CVAR_ARCHIVE);
-    r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
-    sys_cpuid = ri.Cvar_Get("sys_cpuid", "0", 0);
-    r_sse = ri.Cvar_Get("r_sse", "0", CVAR_ARCHIVE);
-    r_static_shaderdata0 = ri.Cvar_Get("r_static_shaderdata0", "0", CVAR_SYSTEMINFO);
-    r_static_shaderdata1 = ri.Cvar_Get("r_static_shaderdata1", "0", CVAR_SYSTEMINFO);
-    r_static_shaderdata2 = ri.Cvar_Get("r_static_shaderdata2", "0", CVAR_SYSTEMINFO);
-    r_static_shaderdata3 = ri.Cvar_Get("r_static_shaderdata3", "0", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier0 = ri.Cvar_Get("r_static_shadermultiplier0", "1", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
-    r_precacheimages = (cvar_t*)Cvar_Get("r_precacheimages", "0", 0);
-    ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
-    ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
-    r_alpha_foliage1 = ri.Cvar_Get("r_alpha_foliage1", "0.75", CVAR_CHEAT);
-    r_alpha_foliage2 = ri.Cvar_Get("r_alpha_foliage2", "0.75", CVAR_CHEAT);
-    r_blendtrees = ri.Cvar_Get("r_blendtrees", "0", CVAR_LATCH);
-    r_blendbushes = ri.Cvar_Get("r_blendbushes", "0", CVAR_LATCH);
-    fps = ri.Cvar_Get("fps", "0", 0);
-    r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
-    r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
+	r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
+	r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
+	r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
+	r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
+	r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_ARCHIVE);
+	r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
+	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
+	r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
+	r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
+	r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
+	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
+	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
+	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
+	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
+	r_useglfog = ri.Cvar_Get("r_useglfog", "1", 64);
+	r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
+	r_smoothsmokelight = ri.Cvar_Get("vss_smoothsmokelight", "1", CVAR_ARCHIVE);
+	r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
+	sys_cpuid = ri.Cvar_Get("sys_cpuid", "0", 0);
+	r_sse = ri.Cvar_Get("r_sse", "0", CVAR_ARCHIVE);
+	r_static_shaderdata0 = ri.Cvar_Get("r_static_shaderdata0", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata1 = ri.Cvar_Get("r_static_shaderdata1", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata2 = ri.Cvar_Get("r_static_shaderdata2", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata3 = ri.Cvar_Get("r_static_shaderdata3", "0", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier0 = ri.Cvar_Get("r_static_shadermultiplier0", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
+	r_precacheimages = (cvar_t*)Cvar_Get("r_precacheimages", "0", 0);
+	ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
+	ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
+	r_alpha_foliage1 = ri.Cvar_Get("r_alpha_foliage1", "0.75", CVAR_CHEAT);
+	r_alpha_foliage2 = ri.Cvar_Get("r_alpha_foliage2", "0.75", CVAR_CHEAT);
+	r_blendtrees = ri.Cvar_Get("r_blendtrees", "0", CVAR_LATCH);
+	r_blendbushes = ri.Cvar_Get("r_blendbushes", "0", CVAR_LATCH);
+	fps = ri.Cvar_Get("fps", "0", 0);
+	r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
+	r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
 
-    r_ext_multisample = ri.Cvar_Get("r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_ext_texture_filter_anisotropic = ri.Cvar_Get("r_ext_texture_filter_anisotropic",
-        "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_stereoEnabled = ri.Cvar_Get("r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_multisample = ri.Cvar_Get("r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_texture_filter_anisotropic = ri.Cvar_Get("r_ext_texture_filter_anisotropic",
+		"0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_stereoEnabled = ri.Cvar_Get("r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
 
 	// make sure all the commands added here are also
 	// removed in R_Shutdown
@@ -1395,17 +1491,17 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
 	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
 	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
-    ri.Cmd_AddCommand( "farplane_info", FarPlaneInfo_f );
-    ri.Cmd_AddCommand( "r_infostaticmodels", R_InfoStaticModels_f );
-    ri.Cmd_AddCommand( "r_infoworldtris", R_InfoWorldTris_f );
+	ri.Cmd_AddCommand( "farplane_info", FarPlaneInfo_f );
+	ri.Cmd_AddCommand( "r_infostaticmodels", R_InfoStaticModels_f );
+	ri.Cmd_AddCommand( "r_infoworldtris", R_InfoWorldTris_f );
 
-    //
-    // Added in OPM
-    //
+	//
+	// Added in OPM
+	//
 
-    r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+	r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
 
-    ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
+	ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
 }
 
 void R_InitExtensions() {
@@ -1497,31 +1593,31 @@ void R_Init( void ) {
 
 	max_polyverts = r_maxpolyverts->integer;
 	if (max_polyverts < MAX_POLYVERTS)
-        max_polyverts = MAX_POLYVERTS;
+		max_polyverts = MAX_POLYVERTS;
 
 	max_termarks = r_maxtermarks->integer;
-    if (max_termarks < MAX_TERMARKS)
+	if (max_termarks < MAX_TERMARKS)
 		max_termarks = MAX_TERMARKS;
 
-    ptr = ri.Malloc(sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
-    backEndData[0] = (backEndData_t*)ptr;
-    backEndData[0]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[0]));
-    backEndData[0]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys);
-    backEndData[0]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-    backEndData[0]->staticModels = NULL;
-    backEndData[0]->staticModelData = NULL;
-    if (r_smp->integer) {
-        ptr = ri.Malloc(sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-        backEndData[1] = (backEndData_t*)ptr;
-        backEndData[1]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[1]));
-        backEndData[1]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys);
-        backEndData[1]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-        backEndData[1]->staticModels = NULL;
+	ptr = ri.Malloc(sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
+	backEndData[0] = (backEndData_t*)ptr;
+	backEndData[0]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[0]));
+	backEndData[0]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys);
+	backEndData[0]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+	backEndData[0]->staticModels = NULL;
+	backEndData[0]->staticModelData = NULL;
+	if (r_smp->integer) {
+		ptr = ri.Malloc(sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+		backEndData[1] = (backEndData_t*)ptr;
+		backEndData[1]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[1]));
+		backEndData[1]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys);
+		backEndData[1]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+		backEndData[1]->staticModels = NULL;
 		backEndData[1]->staticModelData = NULL;
-    }
-    else {
-        backEndData[1] = NULL;
-    }
+	}
+	else {
+		backEndData[1] = NULL;
+	}
 	R_ToggleSmpFrame();
 
 	InitOpenGL();
@@ -1595,35 +1691,35 @@ extern qboolean scr_initialized;
 */
 void RE_BeginRegistration(glconfig_t* glconfigOut) {
 
-    UI_LoadResource("*123");
-    scr_initialized = 0;
+	UI_LoadResource("*123");
+	scr_initialized = 0;
 
-    R_SyncRenderThread();
+	R_SyncRenderThread();
 
-    R_LevelMarksFree();
-    ri.Hunk_Clear();
+	R_LevelMarksFree();
+	ri.Hunk_Clear();
 
-    *glconfigOut = glConfig;
+	*glconfigOut = glConfig;
 
-    r_sequencenumber++;
-    tr.viewCluster = -1;		// force markleafs to regenerate
-    R_ClearFlares();
-    RE_ClearScene();
+	r_sequencenumber++;
+	tr.viewCluster = -1;		// force markleafs to regenerate
+	R_ClearFlares();
+	RE_ClearScene();
 
-    // Added in OPM
-    //  Clear the world because some components
-    //  like the mark system access the world object
-    //  to free allocated marks
-    R_ClearWorld();
+	// Added in OPM
+	//  Clear the world because some components
+	//  like the mark system access the world object
+	//  to free allocated marks
+	R_ClearWorld();
 
-    R_SetupShaders();
-    R_InitLensFlare();
-    R_LevelMarksInit();
+	R_SetupShaders();
+	R_InitLensFlare();
+	R_LevelMarksInit();
 
-    tr.registered = qtrue;
+	tr.registered = qtrue;
 
-    scr_initialized = 1;
-    UI_LoadResource("*124");
+	scr_initialized = 1;
+	UI_LoadResource("*124");
 }
 
 /*
@@ -1636,18 +1732,18 @@ Touch all images to make sure they are resident
 void RE_EndRegistration( void ) {
 	R_SyncRenderThread();
 	if (r_precacheimages->integer) {
-        int start, end;
+		int start, end;
 
-        start = Sys_Milliseconds();
+		start = Sys_Milliseconds();
 
-        RB_ShowImages(qtrue);
+		RB_ShowImages(qtrue);
 
-        end = Sys_Milliseconds();
+		end = Sys_Milliseconds();
 
-        Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
+		Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
 
-    R_FreeUnusedImages();
+	R_FreeUnusedImages();
 }
 
 /*
@@ -1656,8 +1752,8 @@ RE_SetRenderTime
 =============
 */
 void RE_SetRenderTime(int t) {
-    backEnd.refdef.floatTime = (long double)t / 1000.0;
-    R_UpdateGhostTextures();
+	backEnd.refdef.floatTime = (long double)t / 1000.0;
+	R_UpdateGhostTextures();
 }
 
 /*
@@ -1683,81 +1779,81 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 
 	// the RE_ functions are Renderer Entry points
 
-    re.Shutdown = RE_Shutdown;
+	re.Shutdown = RE_Shutdown;
 
-    re.FreeModels = RE_FreeModels;
-    re.BeginRegistration = RE_BeginRegistration;
-    re.EndRegistration = RE_EndRegistration;
-    re.RegisterModel = RE_RegisterModel;
-    re.SpawnEffectModel = RE_SpawnEffectModel;
-    re.RegisterServerModel = RE_RegisterServerModel;
-    re.UnregisterServerModel = RE_UnregisterServerModel;
-    re.RegisterShader = RE_RegisterShader;
-    re.RegisterShaderNoMip = RE_RegisterShaderNoMip;
+	re.FreeModels = RE_FreeModels;
+	re.BeginRegistration = RE_BeginRegistration;
+	re.EndRegistration = RE_EndRegistration;
+	re.RegisterModel = RE_RegisterModel;
+	re.SpawnEffectModel = RE_SpawnEffectModel;
+	re.RegisterServerModel = RE_RegisterServerModel;
+	re.UnregisterServerModel = RE_UnregisterServerModel;
+	re.RegisterShader = RE_RegisterShader;
+	re.RegisterShaderNoMip = RE_RegisterShaderNoMip;
 	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
-    re.LoadWorld = RE_LoadWorldMap;
-    re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
-    re.MapVersion = RE_MapVersion;
-    re.LoadFont = R_LoadFont;
-    re.SetWorldVisData = RE_SetWorldVisData;
+	re.LoadWorld = RE_LoadWorldMap;
+	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
+	re.MapVersion = RE_MapVersion;
+	re.LoadFont = R_LoadFont;
+	re.SetWorldVisData = RE_SetWorldVisData;
 
-    re.BeginFrame = RE_BeginFrame;
-    re.EndFrame = RE_EndFrame;
+	re.BeginFrame = RE_BeginFrame;
+	re.EndFrame = RE_EndFrame;
 
-    re.MarkFragments = R_MarkFragments;
-    re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
-    re.GetInlineModelBounds = R_GetInlineModelBounds;
-    re.GetLightingForDecal = R_GetLightingForDecal;
-    re.GetLightingForSmoke = R_GetLightingForSmoke;
-    re.R_GatherLightSources = R_GatherLightSources;
-    re.ModelBounds = R_ModelBounds;
-    re.ModelRadius = R_ModelRadius;
+	re.MarkFragments = R_MarkFragments;
+	re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
+	re.GetInlineModelBounds = R_GetInlineModelBounds;
+	re.GetLightingForDecal = R_GetLightingForDecal;
+	re.GetLightingForSmoke = R_GetLightingForSmoke;
+	re.R_GatherLightSources = R_GatherLightSources;
+	re.ModelBounds = R_ModelBounds;
+	re.ModelRadius = R_ModelRadius;
 
-    re.ClearScene = RE_ClearScene;
-    re.AddRefEntityToScene = RE_AddRefEntityToScene;
-    re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
-    re.AddPolyToScene = RE_AddPolyToScene;
-    re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
-    re.AddLightToScene = RE_AddLightToScene;
-    re.RenderScene = RE_RenderScene;
-    re.GetRenderEntity = RE_GetRenderEntity;
+	re.ClearScene = RE_ClearScene;
+	re.AddRefEntityToScene = RE_AddRefEntityToScene;
+	re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
+	re.AddPolyToScene = RE_AddPolyToScene;
+	re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
+	re.AddLightToScene = RE_AddLightToScene;
+	re.RenderScene = RE_RenderScene;
+	re.GetRenderEntity = RE_GetRenderEntity;
 
-    re.SavePerformanceCounters = R_SavePerformanceCounters;
+	re.SavePerformanceCounters = R_SavePerformanceCounters;
 
-    re.R_Model_GetHandle = R_Model_GetHandle;
-    re.SetColor = Draw_SetColor;
-    re.DrawStretchPic = Draw_StretchPic;
-    re.DrawStretchPic2 = Draw_StretchPic2;
-    re.DrawStretchRaw = RE_StretchRaw;
-    re.DebugLine = R_DebugLine;
-    re.DrawTilePic = Draw_TilePic;
-    re.DrawTilePicOffset = Draw_TilePicOffset;
-    re.DrawTrianglePic = Draw_TrianglePic;
-    re.DrawBox = DrawBox;
-    re.AddBox = AddBox;
-    re.Set2DWindow = Set2DWindow;
-    re.Scissor = RE_Scissor;
-    re.DrawLineLoop = DrawLineLoop;
-    re.DrawString = R_DrawString;
-    re.GetFontHeight = R_GetFontHeight;
-    re.GetFontStringWidth = R_GetFontStringWidth;
-    re.SwipeBegin = RE_SwipeBegin;
-    re.SwipeEnd = RE_SwipeEnd;
-    re.SetRenderTime = RE_SetRenderTime;
-    re.Noise = R_NoiseGet4f;
+	re.R_Model_GetHandle = R_Model_GetHandle;
+	re.SetColor = Draw_SetColor;
+	re.DrawStretchPic = Draw_StretchPic;
+	re.DrawStretchPic2 = Draw_StretchPic2;
+	re.DrawStretchRaw = RE_StretchRaw;
+	re.DebugLine = R_DebugLine;
+	re.DrawTilePic = Draw_TilePic;
+	re.DrawTilePicOffset = Draw_TilePicOffset;
+	re.DrawTrianglePic = Draw_TrianglePic;
+	re.DrawBox = DrawBox;
+	re.AddBox = AddBox;
+	re.Set2DWindow = Set2DWindow;
+	re.Scissor = RE_Scissor;
+	re.DrawLineLoop = DrawLineLoop;
+	re.DrawString = R_DrawString;
+	re.GetFontHeight = R_GetFontHeight;
+	re.GetFontStringWidth = R_GetFontStringWidth;
+	re.SwipeBegin = RE_SwipeBegin;
+	re.SwipeEnd = RE_SwipeEnd;
+	re.SetRenderTime = RE_SetRenderTime;
+	re.Noise = R_NoiseGet4f;
 
-    re.SetMode = R_SetMode;
-    re.SetFullscreen = R_SetFullscreen;
+	re.SetMode = R_SetMode;
+	re.SetFullscreen = R_SetFullscreen;
 
-    re.GetShaderHeight = RE_GetShaderHeight;
-    re.GetShaderWidth = RE_GetShaderWidth;
-    re.GetShaderName = RE_GetShaderName;
-    re.GetModelName = RE_GetModelName;
-    re.GetGraphicsInfo = RE_GetGraphicsInfo;
-    re.ForceUpdatePose = RE_ForceUpdatePose;
-    re.TIKI_Orientation = RE_TIKI_Orientation;
-    re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
-    re.SetFrameNumber = RE_SetFrameNumber;
+	re.GetShaderHeight = RE_GetShaderHeight;
+	re.GetShaderWidth = RE_GetShaderWidth;
+	re.GetShaderName = RE_GetShaderName;
+	re.GetModelName = RE_GetModelName;
+	re.GetGraphicsInfo = RE_GetGraphicsInfo;
+	re.ForceUpdatePose = RE_ForceUpdatePose;
+	re.TIKI_Orientation = RE_TIKI_Orientation;
+	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
+	re.SetFrameNumber = RE_SetFrameNumber;
 
 	return &re;
 }

From 1ba4c6b7ad9f3f49b99d88b4dc9cee076f8876ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:18:09 +0200
Subject: [PATCH 0829/2040] Remove useless comment

---
 code/client/snd_mem_new.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index 0ebe13d0..43df9076 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -416,10 +416,7 @@ DownSampleWav_MILES
 */
 int DownSampleWav_MILES(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
 {
-    //STUB_DESC("sound stuff");
-    //return 0;
-    // FIXME: unimplemented
-    //  Fallback to software downsampling
+    // Fallback to software downsampling
     return DownSampleWav(info, wav, wavlength, newkhz, newdata);
 }
 

From 10b30d74e79fb29988d8d3fc2a62051df663987d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:23:27 +0200
Subject: [PATCH 0830/2040] Implement sample_volume()

---
 code/client/snd_openal_new.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index de741fd0..c35c4af2 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3174,10 +3174,12 @@ openal_channel::sample_volume
 */
 S32 openal_channel::sample_volume()
 {
-    // FIXME: unimplemented
-    // Default volume is 100, range 0..=127
-    STUB_DESC("sample_volume");
-    return 127;
+    ALfloat gain = 0;
+
+    qalGetSourcef(source, AL_GAIN, &gain);
+    alDieIfError();
+
+    return (gain / S_GetBaseVolume()) * 100;
 }
 
 /*

From 47e575ed9a92ff5a1f830ae20b8e1d10078a3670 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:33:21 +0200
Subject: [PATCH 0831/2040] define USE_INTERNAL_JPEG for compatible JPEG struct
 size

---
 code/renderer/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
index b1161e69..53e4a19a 100644
--- a/code/renderer/CMakeLists.txt
+++ b/code/renderer/CMakeLists.txt
@@ -2,15 +2,17 @@ cmake_minimum_required(VERSION 3.5)
 project(omohrenderer)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
+SET(SOURCES_RENDERER ${SOURCES_RENDERER} "../renderercommon/tr_image_jpg.c")
 
 file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
 add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
 target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
 
 add_library(omohrenderer STATIC ${SOURCES_RENDERER})
-target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon")
+target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon" "../jpeg-8c")
 target_compile_features(omohrenderer PUBLIC cxx_nullptr)
 target_compile_features(omohrenderer PUBLIC c_variadic_macros)
+target_compile_definitions(omohrenderer PRIVATE USE_INTERNAL_JPEG=1)
 target_link_libraries(omohrenderer PRIVATE qcommon)
 target_link_libraries(omohrenderer PRIVATE omohsdl)
 target_link_libraries(omohrenderer PRIVATE jpeg8)

From 500e3a3b2ce6d1ee0cd45c03fa19aef2c9fb7b2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:33:39 +0200
Subject: [PATCH 0832/2040] Add support for JPEG screenshots

---
 code/renderer/tr_init.c  | 8 ++++----
 code/renderer/tr_local.h | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 74575f72..538cc315 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -263,6 +263,8 @@ cvar_t* r_noborder;
 cvar_t* r_ext_texture_filter_anisotropic;
 cvar_t* r_stereoEnabled;
 
+cvar_t* r_screenshotJpegQuality;
+
 static char infostring[8192];
 
 static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
@@ -581,8 +583,6 @@ RB_TakeScreenshotJPEG
 ================== 
 */  
 void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName ) {
-	// FIXME: unimplemented
-#if 0
 	byte *buffer;
 	size_t offset = 0, memcount;
 	int padlen;
@@ -596,7 +596,6 @@ void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName
 
 	RE_SaveJPG(fileName, r_screenshotJpegQuality->integer, width, height, buffer + offset, padlen);
 	ri.Hunk_FreeTempMemory(buffer);
-#endif
 }
 
 /*
@@ -1499,7 +1498,8 @@ void R_Register( void )
 	// Added in OPM
 	//
 
-	r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+    r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+    r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
 
 	ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
 }
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 09ca1be1..23a42eee 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2444,6 +2444,11 @@ void RE_StretchPic ( float x, float y, float w, float h,
 					  float s1, float t1, float s2, float t2, qhandle_t hShader );
 void RE_BeginFrame( stereoFrame_t stereoFrame );
 void RE_EndFrame( int *frontEndMsec, int *backEndMsec );
+void RE_SaveJPG(char* filename, int quality, int image_width, int image_height,
+    unsigned char* image_buffer, int padding);
+size_t RE_SaveJPGToBuffer(byte* buffer, size_t bufSize, int quality,
+    int image_width, int image_height, byte* image_buffer, int padding);
+
 void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer);
 
 void UI_LoadResource(const char* name);

From 89b8d5a67b9982a0470aab4c7140a1a78ae1efbd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:46:13 +0200
Subject: [PATCH 0833/2040] Use source files in renderercommon

---
 code/renderer/CMakeLists.txt |  4 +-
 code/renderer/tr_noise.c     | 93 ------------------------------------
 2 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 code/renderer/tr_noise.c

diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
index 53e4a19a..5722ec75 100644
--- a/code/renderer/CMakeLists.txt
+++ b/code/renderer/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(omohrenderer)
 
-file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
-SET(SOURCES_RENDERER ${SOURCES_RENDERER} "../renderercommon/tr_image_jpg.c")
+file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
+#SET(SOURCES_RENDERER ${SOURCES_RENDERER} "../renderercommon/tr_image_jpg.c")
 
 file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
 add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
diff --git a/code/renderer/tr_noise.c b/code/renderer/tr_noise.c
deleted file mode 100644
index 9789433c..00000000
--- a/code/renderer/tr_noise.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_noise.c
-#include "tr_local.h"
-
-#define NOISE_SIZE 256
-#define NOISE_MASK ( NOISE_SIZE - 1 )
-
-#define VAL( a ) s_noise_perm[ ( a ) & ( NOISE_MASK )]
-#define INDEX( x, y, z, t ) VAL( x + VAL( y + VAL( z + VAL( t ) ) ) )
-
-static float s_noise_table[NOISE_SIZE];
-static int s_noise_perm[NOISE_SIZE];
-
-static float GetNoiseValue( int x, int y, int z, int t )
-{
-	int index = INDEX( ( int ) x, ( int ) y, ( int ) z, ( int ) t );
-
-	return s_noise_table[index];
-}
-
-void R_NoiseInit( void )
-{
-	int i;
-
-	srand( 1001 );
-
-	for ( i = 0; i < NOISE_SIZE; i++ )
-	{
-		s_noise_table[i] = ( float ) ( ( ( rand() / ( float ) RAND_MAX ) * 2.0 - 1.0 ) );
-		s_noise_perm[i] = ( unsigned char ) ( rand() / ( float ) RAND_MAX * 255 );
-	}
-}
-
-float R_NoiseGet4f( float x, float y, float z, float t )
-{
-	int i;
-	int ix, iy, iz, it;
-	float fx, fy, fz, ft;
-	float front[4];
-	float back[4];
-	float fvalue, bvalue, value[2], finalvalue;
-
-	ix = ( int ) floor( x );
-	fx = x - ix;
-	iy = ( int ) floor( y );
-	fy = y - iy;
-	iz = ( int ) floor( z );
-	fz = z - iz;
-	it = ( int ) floor( t );
-	ft = t - it;
-
-	for ( i = 0; i < 2; i++ )
-	{
-		front[0] = GetNoiseValue( ix, iy, iz, it + i );
-		front[1] = GetNoiseValue( ix+1, iy, iz, it + i );
-		front[2] = GetNoiseValue( ix, iy+1, iz, it + i );
-		front[3] = GetNoiseValue( ix+1, iy+1, iz, it + i );
-
-		back[0] = GetNoiseValue( ix, iy, iz + 1, it + i );
-		back[1] = GetNoiseValue( ix+1, iy, iz + 1, it + i );
-		back[2] = GetNoiseValue( ix, iy+1, iz + 1, it + i );
-		back[3] = GetNoiseValue( ix+1, iy+1, iz + 1, it + i );
-
-		fvalue = LERP( LERP( front[0], front[1], fx ), LERP( front[2], front[3], fx ), fy );
-		bvalue = LERP( LERP( back[0], back[1], fx ), LERP( back[2], back[3], fx ), fy );
-
-		value[i] = LERP( fvalue, bvalue, fz );
-	}
-
-	finalvalue = LERP( value[0], value[1], ft );
-
-	return finalvalue;
-}

From b510452260150613a42a9b49898877c4c02c5d6d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:48:46 +0200
Subject: [PATCH 0834/2040] Remove useless comment

---
 code/renderer/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
index 5722ec75..0f947f4e 100644
--- a/code/renderer/CMakeLists.txt
+++ b/code/renderer/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5)
 project(omohrenderer)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
-#SET(SOURCES_RENDERER ${SOURCES_RENDERER} "../renderercommon/tr_image_jpg.c")
 
 file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
 add_library(jpeg8 STATIC ${SOURCES_JPEG_8})

From 34aeab5f779296322ad936bbbc94fa751b70e7e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:34:43 +0200
Subject: [PATCH 0835/2040] Fix the game type string being empty

(see #353 for the game type)
---
 code/client/cl_main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 4160ecd0..5015c9f0 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3581,6 +3581,7 @@ static void CL_SetServerInfo(serverInfo_t *server, const char *info, int ping) {
 			server->maxClients = atoi(Info_ValueForKey(info, "sv_maxclients"));
 			Q_strncpyz(server->game,Info_ValueForKey(info, "game"), MAX_NAME_LENGTH);
 			server->gameType = atoi(Info_ValueForKey(info, "gametype"));
+			Q_strncpyz(server->gameTypeString, Info_ValueForKey(info, "gametypestring"), sizeof(server->gameTypeString));
 			server->netType = atoi(Info_ValueForKey(info, "nettype"));
 			server->minPing = atoi(Info_ValueForKey(info, "minping"));
 			server->maxPing = atoi(Info_ValueForKey(info, "maxping"));

From 9fc4c67187dffb88013fc579a27e23ca70045ed8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 19:05:30 +0200
Subject: [PATCH 0836/2040] Fix a crash when insep is 0

---
 code/uilib/uilistctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uilistctrl.cpp b/code/uilib/uilistctrl.cpp
index c791ac43..8d56a818 100644
--- a/code/uilib/uilistctrl.cpp
+++ b/code/uilib/uilistctrl.cpp
@@ -208,7 +208,7 @@ void UIListCtrl::MousePressed
 			m_sizestate.column = closesep;
 			m_sizestate.min = closeatleft - m_columnlist.ObjectAt(closesep).width;
 			uWinMan.setFirstResponder(this);
-		} else {
+		} else if (insep) {
 			SortByColumn(m_columnlist.ObjectAt(insep).name);
 		}
 	}

From 45fe0bc8b708305816e6971c800445b0bcf1fa88 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 19:06:38 +0200
Subject: [PATCH 0837/2040] Add an IP column

See #353 where servers would appear twice
---
 code/client/cl_uilangame.cpp | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/code/client/cl_uilangame.cpp b/code/client/cl_uilangame.cpp
index 5b301b68..c9dee990 100644
--- a/code/client/cl_uilangame.cpp
+++ b/code/client/cl_uilangame.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,12 +25,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class LANGameItem : public UIListCtrlItem
 {
-    str strings[5];
+    str strings[6];
 
 public:
     LANGameItem();
     LANGameItem(
-        const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping
+        const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping, const str& ipAddress
     );
 
     int            getListItemValue(int which) const override;
@@ -65,6 +65,11 @@ UILANGameClass::UILANGameClass()
 
     m_iLastUpdateTime = 0;
     m_noservers_mat   = uWinMan.RegisterShader("textures/menu/noservers");
+
+    //
+    // Added in OPM
+    //
+    m_bVirtual = false;
 }
 
 void UILANGameClass::Draw(void)
@@ -102,11 +107,12 @@ void UILANGameClass::UpdateUIElement(void)
 
     width = getClientFrame().size.width - 16.f;
 
-    AddColumn(Sys_LV_CL_ConvertString("Server Name"), 0, width * 0.4f, false, false);
-    AddColumn(Sys_LV_CL_ConvertString("Map"), 1, width * 0.15f, false, false);
-    AddColumn(Sys_LV_CL_ConvertString("Players"), 2, width * 0.165f, true, true);
-    AddColumn(Sys_LV_CL_ConvertString("GameType"), 3, width * 0.22f, false, false);
-    AddColumn(Sys_LV_CL_ConvertString("Ping"), 4, width * 0.065f, true, false);
+    AddColumn(Sys_LV_CL_ConvertString("Server Name"), 0, width * 0.27f, false, false); // was 0.4
+    AddColumn(Sys_LV_CL_ConvertString("Map"), 1, width * 0.12f, false, false); // was 0.15
+    AddColumn(Sys_LV_CL_ConvertString("Players"), 2, width * 0.08f, true, true); // was 0.165
+    AddColumn(Sys_LV_CL_ConvertString("GameType"), 3, width * 0.118f, false, false); // was 0.22
+    AddColumn(Sys_LV_CL_ConvertString("Ping"), 4, width * 0.052f, true, false); // was 0.065
+    AddColumn(Sys_LV_CL_ConvertString("IP"), 5, width * 0.36f, false, false); // Added in OPM
 
     uWinMan.ActivateControl(this);
 
@@ -134,7 +140,9 @@ void UILANGameClass::SetupServers(void)
             pServerInfo->mapName,
             va("%02i/%02i", pServerInfo->clients, pServerInfo->maxClients),
             pServerInfo->gameTypeString,
-            str(pServerInfo->ping)
+            str(pServerInfo->ping),
+            // Added in OPM
+            NET_AdrToStringwPort(pServerInfo->adr)
         );
     }
 
@@ -197,7 +205,7 @@ qboolean UILANGameClass::KeyEvent(int key, unsigned int time)
 LANGameItem::LANGameItem() {}
 
 LANGameItem::LANGameItem(
-    const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping
+    const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping, const str& ipAddress
 )
 {
     strings[0] = hostName;
@@ -205,6 +213,12 @@ LANGameItem::LANGameItem(
     strings[2] = players;
     strings[3] = gameTypeString;
     strings[4] = ping;
+
+    //
+    // Added in OPM
+    //
+
+    strings[5] = ipAddress;
 }
 
 int LANGameItem::getListItemValue(int which) const

From 2d696cf5001084e99f17a5b8a3597206166c5763 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 19:07:06 +0200
Subject: [PATCH 0838/2040] Also use the port when connecting to a server

---
 code/client/cl_uilangame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_uilangame.cpp b/code/client/cl_uilangame.cpp
index c9dee990..e821a464 100644
--- a/code/client/cl_uilangame.cpp
+++ b/code/client/cl_uilangame.cpp
@@ -175,7 +175,7 @@ void UILANGameClass::JoinServer(Event *ev)
     const serverInfo_t& serverInfo = cls.localServers[getCurrentItem() - 1];
 
     UI_SetReturnMenuToCurrent();
-    CL_Connect(NET_AdrToString(serverInfo.adr), netadrtype_t::NA_UNSPEC);
+    CL_Connect(NET_AdrToStringwPort(serverInfo.adr), netadrtype_t::NA_UNSPEC);
 }
 
 qboolean UILANGameClass::KeyEvent(int key, unsigned int time)

From a1a89cba34dbae7bf141d749430fa601aa9fea7c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 19:47:05 +0200
Subject: [PATCH 0839/2040] Allow dynamic adjustment for the size of status
 columns in SVC_Status

---
 code/server/sv_ccmds.c | 132 +++++++++++++++++++++++++++++++++--------
 1 file changed, 108 insertions(+), 24 deletions(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 48ee2a65..cf635bcd 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1108,7 +1108,11 @@ static void SV_Status_f(void) {
     client_t* cl;
     playerState_t* ps;
     const char* s;
+	const char	*colName[8];
+	size_t		colSize[8];
+	size_t		len;
     int			ping;
+    char		padding[64];
 
     // make sure server is running
     if (!com_sv_running->integer) {
@@ -1116,24 +1120,99 @@ static void SV_Status_f(void) {
         return;
     }
 
+	//
+	// Added in OPM
+	//  Dynamic column size.
+	//
+	//  Some programs use fixed-size columns
+	//  and may not parse information correctly
+	//
+
+	colName[0] = "num";
+	colSize[0] = strlen(colName[0]);
+	colName[1] = "score";
+	colSize[1] = strlen(colName[1]);
+	colName[2] = "ping";
+	colSize[2] = strlen(colName[2]);
+    colName[3] = "name";
+	colSize[3] = 15;
+	colName[4] = "lastmsg";
+	colSize[4] = 7;
+	colName[5] = "address";
+	colSize[5] = 21;
+    colName[6] = "qport";
+    colSize[6] = 5;
+    colName[7] = "rate";
+    colSize[7] = 5;
+
+	//
+	// Find IPv6 clients and adjust the IP address column size
+	//
+
+	for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
+    {
+		if (cl->state == CS_FREE) {
+			continue;
+		}
+
+        if (cl->netchan.remoteAddress.type == NA_IP6) {
+            colSize[5] = 38;
+			break;
+		}
+	}
+
     Com_Printf("map: %s\n", sv_mapname->string);
 
-    //Com_Printf("num score ping name            lastmsg address                                  qport rate \n");
-    //Com_Printf("--- ----- ---- --------------- ------- ---------------------------------------  ----- -----\n");
-    //
-    // Some programs use fixed-size columns
-    //
-    Com_Printf("num score ping name            lastmsg address               qport rate\n");
-    Com_Printf("--- ----- ---- --------------- ------- --------------------- ----- -----\n");
+	//
+	// Print column header name
+	//
+
+	for (i = 0; i < 8; i++) {
+		// Column name
+        len = strlen(colName[i]);
+		Com_Printf("%s", colName[i]);
+
+		// Padding
+		for (j = 0; j < (ARRAY_LEN(padding) - 1) && (colSize[i] - j >= len); j++) {
+			padding[j] = ' ';
+		}
+		padding[j] = 0;
+
+		if (j > 0) {
+			Com_Printf("%s", padding);
+		}
+	}
+	Com_Printf("\n");
+
+	//
+	// Print column header padding
+	//
+
+    for (i = 0; i < 8; i++) {
+        for (j = 0; j < (ARRAY_LEN(padding) - 1) && (j < colSize[i]); j++) {
+            padding[j] = '-';
+        }
+		padding[j] = 0;
+
+		Com_Printf("%s ", padding);
+    }
+    Com_Printf("\n");
+
+	//
+	// Print values
+	//
+
     for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
     {
-        if (!cl->state)
-            continue;
-        Com_Printf("%3i ", i);
+		if (cl->state == CS_FREE) {
+			continue;
+		}
+
+        Com_Printf("%*i ", colSize[0], i);
         ps = SV_GameClientNum(i);
         // su44: ps->persistant is not avaible in mohaa
         //Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
-        Com_Printf("%5i ", ps->stats[STAT_KILLS]);
+        Com_Printf("%*i ", colSize[1], ps->stats[STAT_KILLS]);
 
         if (cl->state == CS_CONNECTED)
             Com_Printf("CNCT ");
@@ -1142,29 +1221,34 @@ static void SV_Status_f(void) {
         else
         {
             ping = cl->ping < 9999 ? cl->ping : 9999;
-            Com_Printf("%4i ", ping);
+            Com_Printf("%*i ", colSize[2], ping);
         }
 
-        Com_Printf("%s", cl->name);
+        Com_Printf("%s ", cl->name);
         l = SV_Strlen(cl->name);
-		if (l <= 16) {
-			l = 16 - l;
-			for (j = 0; j < l; j++)
+		if (l < colSize[3]) {
+			l = colSize[3] - l;
+			for (j = 0; j < l; j++) {
 				Com_Printf(" ");
+			}
 		}
 
-        Com_Printf("%7i ", svs.time - cl->lastPacketTime);
+        Com_Printf("%*i ", colSize[4], svs.time - cl->lastPacketTime);
 
         s = NET_AdrToString(cl->netchan.remoteAddress);
-        Com_Printf("%s", s);
-        //l = 39 - strlen(s);
-        l = 22 - strlen(s);
-        for (j = 0; j < l; j++)
-            Com_Printf(" ");
+        Com_Printf("%s ", s);
 
-        Com_Printf("%5i", cl->netchan.qport);
+		len = strlen(s);
+		if (len < colSize[5]) {
+			l = colSize[5] - strlen(s);
+			for (j = 0; j < l; j++) {
+				Com_Printf(" ");
+			}
+		}
 
-        Com_Printf(" %5i", cl->rate);
+        Com_Printf( "%*i", colSize[6], cl->netchan.qport );
+
+        Com_Printf(" %*i", colSize[7], cl->rate);
 
         Com_Printf("\n");
     }

From 39add5cceca5bab1440a9c0b5ba38bacaf093917 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:01:01 +0200
Subject: [PATCH 0840/2040] Fix incorrect parsing of music volumes

---
 code/client/snd_openal_new.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index c35c4af2..a9d2e3be 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3404,9 +3404,9 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
             }
 
             if (!Q_stricmp(args[1], "volume")) {
-                psong->volume = atoi(args[2]);
+                psong->volume = atof(args[2]);
             } else if (!Q_stricmp(args[1], "fadetime")) {
-                psong->fadetime = atoi(args[2]);
+                psong->fadetime = atof(args[2]);
             } else if (!Q_stricmp(args[1], "loop")) {
                 psong->flags |= 1;
             } else if (!Q_stricmp(args[1], "restart")) {

From e128c93ad9883d83985780c006452a1ce0efc33b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:25:26 +0200
Subject: [PATCH 0841/2040] Declare CL_FinishedStartStage

---
 code/qcommon/qcommon.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 05dd19ac..52628b83 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1125,6 +1125,7 @@ void CL_Init( void );
 void CL_Disconnect();
 void CL_Shutdown(const char *finalmsg, qboolean disconnect, qboolean quit);
 qboolean CL_FinishedIntro(void);
+void CL_FinishedStartStage(void);
 void CL_SetFrameNumber(int frameNumber);
 void CL_Frame( int msec );
 qboolean CL_GameCommand( void );

From 690a7a75575e47f4ab32f03dcfb7f81ab2ded10c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:36:23 +0200
Subject: [PATCH 0842/2040] Format cl_ui file

---
 code/client/cl_ui.cpp | 6 +++---
 code/client/cl_ui.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 5463e8bc..90b91292 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3978,10 +3978,10 @@ void S_ServerLoaded(void)
 
     S_TriggeredMusic_Stop();
     s_bSoundPaused = qtrue;
-    S_ReLoad( &svs.soundSystem );
+    S_ReLoad(&svs.soundSystem);
 
-    if( svs.tm_filename[ 0 ] ) {
-    	S_TriggeredMusic_SetupHandle( svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0 );
+    if (svs.tm_filename[0]) {
+        S_TriggeredMusic_SetupHandle(svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0);
     }
 }
 
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 329880f0..db122d60 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 

From 792b676c11e4cc14ea9eee82e8d03d88db516116 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:47:57 +0200
Subject: [PATCH 0843/2040] Set the number of brush models

The level marks system depends on the number of brush models and leafs, having a number that doesn't match what was saved would cause a crash
---
 code/renderer/tr_bsp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 7362269d..1a6bd680 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -1678,6 +1678,7 @@ static	void R_LoadSubmodels(gamelump_t* l) {
     count = l->length / sizeof(*in);
 
     s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
+    s_worldData.numBmodels = count;
 
     for ( i=0 ; i<count ; i++, in++, out++ ) {
         model_t *model;

From d04a32920a942eae2d0cb0ee4d7e26b9710545ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:49:45 +0200
Subject: [PATCH 0844/2040] Fix an incorrect parameter value passed to FS_Read
 when reading the DCL file

---
 code/renderer/tr_marks_permanent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index d2f1ad2d..fff5a90b 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -559,7 +559,7 @@ void R_LevelMarksLoad(const char *szBSPName)
         for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
             pLeaf = &tr.world->nodes[i];
 
-            ri.FS_Read(&pLeaf->iNumMarkFragment, sizeof(int), h_low);
+            ri.FS_Read(&pLeaf->iNumMarkFragment, sizeof(int), hFile);
             pLeaf->iNumMarkFragment = LittleLong(pLeaf->iNumMarkFragment);
 
             if (pLeaf->iNumMarkFragment) {

From a25200741a2a6eb6181d52d6727cfd8066fb16d1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 22:23:53 +0200
Subject: [PATCH 0845/2040] Finis the loading screen if it's the default

---
 code/client/cl_ui.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 90b91292..3b554d6c 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -4027,6 +4027,11 @@ void UI_ServerLoaded(void)
         return;
     }
 
+    if (ui_sCurrentLoadingMenu == "loading_default") {
+        UI_FinishLoadingScreen_f();
+        return;
+    }
+
     server_loading_waiting = qtrue;
 
     event = new Event(EV_Widget_Enable);

From 77d48cb104f392abe5a08049edf10290969988fe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 22:58:37 +0200
Subject: [PATCH 0846/2040] Don't call UI_ClearBackground in cinematic mode

---
 code/client/cl_ui.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 3b554d6c..381914ed 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1664,7 +1664,7 @@ UI_ClearBackground
 void UI_ClearBackground(void)
 {
     re.Set2DWindow(
-        0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, -1, -1
+        0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, -1, 1
     );
     re.Scissor(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
     re.SetColor(g_color_table[0]);
@@ -1857,7 +1857,7 @@ void UI_Update(void)
             if (clc.state <= CA_PRIMED) {
                 view3d->setShow(false);
                 UI_ClearBackground();
-            } else if (clc.state == CA_PRIMED || clc.state == CA_ACTIVE) {
+            } else if (clc.state == CA_ACTIVE || clc.state == CA_CINEMATIC) {
                 Com_FakeUnpause();
                 view3d->setShow(true);
             } else {

From 37d5458c4c10fb1be8756d17ed4fc847e998c8b8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 23:00:31 +0200
Subject: [PATCH 0847/2040] Partially implement cinematic support for reading
 RoQ files (no audio yet)

---
 code/client/cl_cin.cpp | 137 +++++++++++++++++++++++++++++++----------
 1 file changed, 104 insertions(+), 33 deletions(-)

diff --git a/code/client/cl_cin.cpp b/code/client/cl_cin.cpp
index 38d7a0d6..9d7d3636 100644
--- a/code/client/cl_cin.cpp
+++ b/code/client/cl_cin.cpp
@@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../uilib/ui_public.h"
 #include "snd_local.h"
 
+#include "cl_ui.h"
+
 #define MAXSIZE				8
 #define MINSIZE				4
 
@@ -55,6 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 static void RoQ_init( void );
+static void CL_FinishedCinematic();
 
 /******************************************************************************
 *
@@ -133,6 +136,8 @@ static cin_cache		cinTable[MAX_VIDEO_HANDLES];
 static int				currentHandle = -1;
 static int				CL_handle = -1;
 
+static connstate_t		oldClientState;
+
 extern "C" int				s_soundtime;		// sample PAIRS
 
 
@@ -1091,8 +1096,6 @@ static void RoQReset( void ) {
 
 static void RoQInterrupt(void)
 {
-	// Removed in OPM
-#if 0
 	byte				*framedata;
         short		sbuf[32768];
         int		ssize;
@@ -1144,17 +1147,13 @@ redump:
 		case	ZA_SOUND_MONO:
 			if (!cinTable[currentHandle].silent) {
 				ssize = RllDecodeMonoToStereo( framedata, sbuf, cinTable[currentHandle].RoQFrameSize, 0, (unsigned short)cinTable[currentHandle].roq_flags);
-                                S_RawSamples(0, ssize, 22050, 2, 1, (byte *)sbuf, 1.0f, -1);
+                //                S_RawSamples(0, ssize, 22050, 2, 1, (byte *)sbuf, 1.0f, -1);
 			}
 			break;
 		case	ZA_SOUND_STEREO:
 			if (!cinTable[currentHandle].silent) {
-				if (cinTable[currentHandle].numQuads == -1) {
-					S_Update();
-					s_rawend[0] = s_soundtime;
-				}
 				ssize = RllDecodeStereoToStereo( framedata, sbuf, cinTable[currentHandle].RoQFrameSize, 0, (unsigned short)cinTable[currentHandle].roq_flags);
-                                S_RawSamples(0, ssize, 22050, 2, 2, (byte *)sbuf, 1.0f, -1);
+                //                S_RawSamples(0, ssize, 22050, 2, 2, (byte *)sbuf, 1.0f, -1);
 			}
 			break;
 		case	ROQ_QUAD_INFO:
@@ -1216,7 +1215,6 @@ redump:
 //	assert(cinTable[currentHandle].RoQFrameSize <= 65536);
 //	r = FS_Read( cin.file, cinTable[currentHandle].RoQFrameSize+8, cinTable[currentHandle].iFile );
 	cinTable[currentHandle].RoQPlayed	+= cinTable[currentHandle].RoQFrameSize+8;
-#endif
 }
 
 /******************************************************************************
@@ -1276,8 +1274,10 @@ static void RoQShutdown( void ) {
 		cinTable[currentHandle].iFile = 0;
 	}
 
+	S_StopMovieAudio();
+
 	if (cinTable[currentHandle].alterGameState) {
-		clc.state = CA_DISCONNECTED;
+		clc.state = oldClientState;
 		// we can't just do a vstr nextmap, because
 		// if we are aborting the intro cinematic with
 		// a devmap command, nextmap would be valid by
@@ -1289,8 +1289,29 @@ static void RoQShutdown( void ) {
 		}
 		CL_handle = -1;
 	}
+
 	cinTable[currentHandle].fileName[0] = 0;
 	currentHandle = -1;
+
+	CL_FinishedCinematic();
+}
+
+static void CL_FinishedCinematic()
+{
+	const  char* s;
+
+	if (!CL_FinishedIntro())
+	{
+		CL_FinishedStartStage();
+		return;
+	}
+
+    s = Cvar_VariableString("nextmap");
+    if (*s)
+    {
+        Cbuf_ExecuteText(EXEC_APPEND, va("%s\n", s));
+        Cvar_Set("nextmap", "");
+    }
 }
 
 /*
@@ -1400,9 +1421,6 @@ CIN_PlayCinematic
 ==================
 */
 int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBits ) {
-	return 0;
-	// Removed in OPM
-#if 0
 	unsigned short RoQID;
 	char	name[MAX_OSPATH];
 	int		i;
@@ -1474,17 +1492,12 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
 			clc.state = CA_CINEMATIC;
 		}
 
-		if (!cinTable[currentHandle].silent) {
-			s_rawend[0] = s_soundtime;
-		}
-
 		return currentHandle;
 	}
 	Com_DPrintf("trFMV::play(), invalid RoQ ID\n");
 
 	RoQShutdown();
 	return -1;
-#endif
 }
 
 void CIN_SetExtents (int handle, int x, int y, int w, int h) {
@@ -1600,33 +1613,91 @@ void CIN_DrawCinematic (int handle) {
 	cinTable[handle].dirty = qfalse;
 }
 
+static unsigned short CL_PlayRoQ(const char* name, const char* arg, const char* s) {
+	unsigned short RoQID;
+
+	Com_Memset(&cin, 0, sizeof(cinematics_t) );
+	currentHandle = CIN_HandleForVideo();
+
+	cin.currentHandle = currentHandle;
+
+	strcpy(cinTable[currentHandle].fileName, name);
+
+	cinTable[currentHandle].ROQSize = 0;
+	cinTable[currentHandle].ROQSize = FS_FOpenFileRead (cinTable[currentHandle].fileName, &cinTable[currentHandle].iFile, qtrue, qtrue);
+
+	if (cinTable[currentHandle].ROQSize<=0) {
+		Com_DPrintf("Can not find RoQ cinematic '%s'\n", name);
+		CL_FinishedCinematic();
+		return -1;
+	}
+
+	if ((s && s[0] == '1') || Q_stricmp(arg,"demoend.roq")==0 || Q_stricmp(arg,"end.roq")==0) {
+		cinTable[currentHandle].holdAtEnd = qtrue;
+    }
+
+    CIN_SetExtents(currentHandle, 0, 0, 640, 480);
+    cinTable[currentHandle].alterGameState = qtrue;
+
+    initRoQ();
+
+	FS_Read (cin.file, 16, cinTable[currentHandle].iFile);
+
+	RoQID = (unsigned short)(cin.file[0]) + (unsigned short)(cin.file[1])*256;
+	if (RoQID == 0x1084)
+	{
+		RoQ_init();
+//		FS_Read (cin.file, cinTable[currentHandle].RoQFrameSize+8, cinTable[currentHandle].iFile);
+
+		cinTable[currentHandle].status = FMV_PLAY;
+		Com_DPrintf("trFMV::play(), playing %s\n", arg);
+
+		oldClientState = clc.state;
+        clc.state = CA_CINEMATIC;
+
+		if (cls.glconfig.maxTextureSize <= 256 || s && *s == '2') {
+			//cinTable[currentHandle].interlaced = qtrue;
+		}
+
+		CL_handle = currentHandle;
+
+		do {
+			SCR_RunCinematic();
+		} while (!cinTable[currentHandle].buf && cinTable[currentHandle].status == FMV_PLAY);
+
+		UI_CloseConsole();
+
+		return currentHandle;
+	}
+	Com_DPrintf("trFMV::play(), invalid RoQ ID\n");
+
+	RoQShutdown();
+	return -1;
+}
+
 void CL_PlayCinematic_f(void) {
 	char	*arg, *s;
-	int bits = CIN_system;
+	char	name[256];
 
-	Com_DPrintf("CL_PlayCinematic_f\n");
 	if (clc.state == CA_CINEMATIC) {
 		SCR_StopCinematic();
 	}
 
 	arg = Cmd_Argv( 1 );
+	Com_DPrintf("CL_PlayCinematic( %s )\n", arg);
 	s = Cmd_Argv(2);
 
-	if ((s && s[0] == '1') || Q_stricmp(arg,"demoend.roq")==0 || Q_stricmp(arg,"end.roq")==0) {
-		bits |= CIN_hold;
-	}
-	if (s && s[0] == '2') {
-		bits |= CIN_loop;
+	CL_StartHunkUsers(qfalse);
+    S_StopAllSounds2(qtrue);
+
+	Com_sprintf(name, sizeof(name), "video/%s", arg);
+
+	if (Q_stricmp(&name[strlen(name) - 4], ".roq")) {
+		Com_Printf("Bad or missing cinematic extension.\n");
+		return;
 	}
 
-	S_StopAllSounds2( qtrue );
-
-	CL_handle = CIN_PlayCinematic( arg, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, bits );
-	if (CL_handle >= 0) {
-		do {
-			SCR_RunCinematic();
-		} while (cinTable[currentHandle].buf == NULL && cinTable[currentHandle].status == FMV_PLAY);		// wait for first frame (load codebook and sound)
-	}
+    CL_PlayRoQ(name, arg, s);
 }
 
 

From 9b417c9b26cb9945bd810065ccdefdc7cd0713cf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 13:20:55 +0200
Subject: [PATCH 0848/2040] Add EV_Client_ForceFeedback (unused)

---
 code/cgame/cg_commands.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 9ea70dd0..d11534e7 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -1195,6 +1195,14 @@ Event EV_Client_SFXStartDelayed
     "fDelay sCommand arg1 arg2 arg3 arg4 arg5 arg6 arg7 arg8",
     "Used for adding commands to a special effect with a time delay"
 );
+Event EV_Client_PlayForceFeedback
+(
+    "playforcefeedback",
+    EV_DEFAULT,
+    "s",
+    "effectname",
+    "Starts a force feedback effect."
+);
 
 EffectsEventQueueNode EffectsEventQueue;
 

From 0b106cf47ea7d48e5415b43e36de403d759f6720 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 13:21:08 +0200
Subject: [PATCH 0849/2040] Print errors only when developer mode is set

---
 code/qcommon/listener.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index ffb45cd0..bf657fc8 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -2879,9 +2879,9 @@ ScriptVariable& Listener::ProcessEventReturn(Event *ev)
 
     if (!ev->eventnum) {
 #ifdef _DEBUG
-        EVENT_Printf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name, c->classname);
+        EVENT_DPrintf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name, c->classname);
 #else
-        EVENT_Printf("^~^~^ Failed execution of event for class '%s'\n", c->classname);
+        EVENT_DPrintf("^~^~^ Failed execution of event for class '%s'\n", c->classname);
 #endif
 
         delete ev;
@@ -2891,7 +2891,7 @@ ScriptVariable& Listener::ProcessEventReturn(Event *ev)
     responses = c->responseLookup[ev->eventnum];
 
     if (responses == NULL) {
-        EVENT_Printf(
+        EVENT_DPrintf(
             "^~^~^ Failed execution of command '%s' for class '%s'\n", Event::GetEventName(ev->eventnum), c->classname
         );
         delete ev;
@@ -2941,9 +2941,9 @@ bool Listener::ProcessScriptEvent(Event& ev)
 
     if (!ev.eventnum) {
 #ifdef _DEBUG
-        EVENT_Printf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev.name, c->classname);
+        EVENT_DPrintf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev.name, c->classname);
 #else
-        EVENT_Printf("^~^~^ Failed execution of event for class '%s'\n", c->classname);
+        EVENT_DPrintf("^~^~^ Failed execution of event for class '%s'\n", c->classname);
 #endif
 
         return false;

From fe9b29870541d413d0f0a421797917f4bb2d3e9b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 21:53:19 +0200
Subject: [PATCH 0850/2040] Export cl_movieaudio

---
 code/client/cl_ui.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index db122d60..740e855c 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -35,6 +35,7 @@ typedef struct {
 extern cvar_t *ui_health_start;
 extern cvar_t *ui_health_end;
 extern cvar_t *sound_overlay;
+extern cvar_t *cl_movieaudio;
 
 //
 // initialization

From c3ef267d6d40f5d394c8b883e2f8fc22c1c841b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 21:55:15 +0200
Subject: [PATCH 0851/2040] Implement movie audio in OpenAL code

---
 code/client/snd_openal_new.cpp | 30 +++++++++++++++++++++++-------
 code/client/snd_openal_new.h   |  4 ++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index a9d2e3be..4b724ccc 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4170,8 +4170,7 @@ S_StopMovieAudio
 */
 void S_StopMovieAudio()
 {
-    // FIXME: unimplemented
-    STUB_DESC("sound stuff.");
+    openal.chan_movie.stop();
 }
 
 /*
@@ -4181,8 +4180,27 @@ S_SetupMovieAudio
 */
 void S_SetupMovieAudio(const char *pszMovieName)
 {
-    // FIXME: unimplemented
-    STUB_DESC("sound stuff");
+    char filename[MAX_QPATH];
+
+    S_StopMovieAudio();
+
+    COM_StripExtension(pszMovieName, filename, sizeof(filename));
+    Q_strcat(filename, sizeof(filename), ".mp3");
+
+    if (!openal.chan_movie.queue_stream(filename)) {
+        COM_StripExtension(pszMovieName, filename, sizeof(filename));
+        Q_strcat(filename, sizeof(filename), ".wav");
+
+        if (!openal.chan_movie.queue_stream(filename)) {
+            Com_DPrintf("Can't find any matching audio file for movie: %s\n", pszMovieName);
+            return;
+        }
+    }
+
+    openal.chan_movie.set_gain(S_GetBaseVolume() * 1.5f);
+    openal.chan_movie.play();
+
+    Com_DPrintf("Movie Audio setup: %s\n", filename);
 }
 
 /*
@@ -4192,9 +4210,7 @@ S_CurrentMoviePosition
 */
 int S_CurrentMoviePosition()
 {
-    // FIXME: unimplemented
-    STUB_DESC("sound stuff");
-    return 0;
+    return openal.chan_movie.sample_ms_offset();
 }
 
 /*
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index db1af9d3..5a2078a6 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -184,6 +184,10 @@ private:
     unsigned int getBytesPerSample() const;
 };
 
+struct openal_movie_channel : public openal_channel {
+
+};
+
 struct openal_internal_t {
     openal_channel              chan_3D[MAX_OPENAL_CHANNELS_3D];
     openal_channel              chan_2D[MAX_OPENAL_CHANNELS_2D];

From 5b0224ae3c1b375986464390c318fa2cd5040cad Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 22:58:43 +0200
Subject: [PATCH 0852/2040] Implement support for playing movies

Videos like briefings and intro are now played correctly
---
 code/client/cl_cin.cpp | 73 +++++++++++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/code/client/cl_cin.cpp b/code/client/cl_cin.cpp
index 9d7d3636..7dab119d 100644
--- a/code/client/cl_cin.cpp
+++ b/code/client/cl_cin.cpp
@@ -129,6 +129,10 @@ typedef struct {
 	int					playonwalls;
 	byte*				buf;
 	long				drawX, drawY;
+
+	long realTime;
+	long currTime;
+	long soundTime;
 } cin_cache;
 
 static cinematics_t		cin;
@@ -138,6 +142,8 @@ static int				CL_handle = -1;
 
 static connstate_t		oldClientState;
 
+static int				audioStartTime = 0;
+
 extern "C" int				s_soundtime;		// sample PAIRS
 
 
@@ -165,7 +171,7 @@ static int CIN_HandleForVideo(void) {
 }
 
 
-extern "C" int CL_ScaledMilliseconds(void);
+extern "C" int Com_Milliseconds(void);
 
 //-----------------------------------------------------------------------------
 // RllSetupTable
@@ -1160,7 +1166,7 @@ redump:
 			if (cinTable[currentHandle].numQuads == -1) {
 				readQuadInfo( framedata );
 				setupQuad( 0, 0 );
-				cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds();
+				cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = Com_Milliseconds();
 			}
 			if (cinTable[currentHandle].numQuads != 1) cinTable[currentHandle].numQuads = 0;
 			break;
@@ -1227,7 +1233,10 @@ redump:
 
 static void RoQ_init( void )
 {
-	cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds();
+	cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = Com_Milliseconds();
+	cinTable[currentHandle].realTime = Com_Milliseconds();
+	cinTable[currentHandle].currTime = 0;
+	cinTable[currentHandle].soundTime = 0;
 
 	cinTable[currentHandle].RoQPlayed = 24;
 
@@ -1352,8 +1361,11 @@ Fetch and decompress the pending frame
 
 e_status CIN_RunCinematic (int handle)
 {
-	int	start = 0;
-	int     thisTime = 0;
+	int deltaTime;
+	int frameTime;
+	int soundTime;
+	int newTime;
+	long tfps;
 
 	if (handle < 0 || handle>= MAX_VIDEO_HANDLES || cinTable[handle].status == FMV_EOF) return FMV_EOF;
 
@@ -1381,24 +1393,46 @@ e_status CIN_RunCinematic (int handle)
 		return cinTable[currentHandle].status;
 	}
 
-	thisTime = CL_ScaledMilliseconds();
-	if (cinTable[currentHandle].shader && (abs(thisTime - cinTable[currentHandle].lastTime))>100) {
-		cinTable[currentHandle].startTime += thisTime - cinTable[currentHandle].lastTime;
+	frameTime = Com_Milliseconds();
+	deltaTime = frameTime - cinTable[currentHandle].realTime;
+	if (deltaTime > 100) {
+		deltaTime = 100;
 	}
-	cinTable[currentHandle].tfps = (((CL_ScaledMilliseconds() - cinTable[currentHandle].startTime)*3)/100);
 
-	start = cinTable[currentHandle].startTime;
-	while(  (cinTable[currentHandle].tfps != cinTable[currentHandle].numQuads)
+	newTime = cinTable[currentHandle].currTime + deltaTime;
+	if (cl_movieaudio->integer) {
+		soundTime = S_CurrentMoviePosition();
+		if (soundTime > cinTable[currentHandle].currTime || soundTime > cinTable[currentHandle].soundTime) {
+			cinTable[currentHandle].currTime = newTime + (deltaTime * (soundTime - newTime)) / 100;
+		}
+		else {
+			cinTable[currentHandle].currTime = newTime;
+		}
+
+        cinTable[currentHandle].soundTime = soundTime;
+	} else {
+		//
+		// Fixed in OPM
+		//
+		cinTable[currentHandle].currTime = newTime;
+	}
+
+	cinTable[currentHandle].realTime = frameTime;
+
+	tfps = (cinTable[currentHandle].currTime * 3) / 100;
+
+	while(  (tfps != cinTable[currentHandle].numQuads)
 		&& (cinTable[currentHandle].status == FMV_PLAY) ) 
 	{
 		RoQInterrupt();
-		if (start != cinTable[currentHandle].startTime) {
-			cinTable[currentHandle].tfps = (((CL_ScaledMilliseconds() - cinTable[currentHandle].startTime)*3)/100);
-			start = cinTable[currentHandle].startTime;
+
+		cinTable[currentHandle].realTime = Com_Milliseconds();
+		if (cinTable[currentHandle].realTime > frameTime + 66) {
+			break;
 		}
 	}
 
-	cinTable[currentHandle].lastTime = thisTime;
+	cinTable[currentHandle].lastTime = frameTime;
 
 	if (cinTable[currentHandle].status == FMV_LOOPED) {
 		cinTable[currentHandle].status = FMV_PLAY;
@@ -1650,7 +1684,12 @@ static unsigned short CL_PlayRoQ(const char* name, const char* arg, const char*
 //		FS_Read (cin.file, cinTable[currentHandle].RoQFrameSize+8, cinTable[currentHandle].iFile);
 
 		cinTable[currentHandle].status = FMV_PLAY;
-		Com_DPrintf("trFMV::play(), playing %s\n", arg);
+        Com_DPrintf("trFMV::play(), playing %s\n", arg);
+
+        if (cl_movieaudio->integer) {
+			audioStartTime = Com_Milliseconds();
+            S_SetupMovieAudio(name);
+        }
 
 		oldClientState = clc.state;
         clc.state = CA_CINEMATIC;
@@ -1717,7 +1756,5 @@ void SCR_RunCinematic (void)
 void SCR_StopCinematic(void) {
 	if (CL_handle >= 0 && CL_handle < MAX_VIDEO_HANDLES) {
 		CIN_StopCinematic(CL_handle);
-		S_StopAllSounds2( qtrue );
-		CL_handle = -1;
 	}
 }

From 9f48dabaec83bf3e470fc72f23cb6be2b8a21b75 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 22:59:27 +0200
Subject: [PATCH 0853/2040] Play the game's intro when starting

---
 code/client/cl_main.cpp |  17 +++--
 code/client/cl_ui.cpp   | 149 +++++++++++++++++++++++++++++++++-------
 2 files changed, 135 insertions(+), 31 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 5015c9f0..4a535776 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2573,12 +2573,17 @@ void CL_Frame ( int msec ) {
 	}
 #endif
 
-	if ( clc.state == CA_DISCONNECTED && !UI_MenuActive()
-		&& !com_sv_running->integer ) {
-		// if disconnected, bring up the menu
-		S_StopAllSounds2( qtrue );
-		S_TriggeredMusic_PlayIntroMusic();
-		UI_MenuEscape( "main" );
+	if (CL_FinishedIntro()) {
+		if (clc.state == CA_DISCONNECTED) {
+			if (!UI_MenuActive() && !com_sv_running->integer) {
+				// if disconnected, bring up the menu
+				S_StopAllSounds2(qtrue);
+				S_TriggeredMusic_PlayIntroMusic();
+				UI_MenuEscape("main");
+			}
+		} else if (clc.state == CA_CINEMATIC) {
+			UI_ForceMenuOff(qtrue);
+		}
 	}
 
 	// if recording an avi, lock to a fixed fps
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 381914ed..8cb12bc6 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1702,7 +1702,35 @@ void UI_DrawIntro(void)
     view3d->setShow(false);
     UI_ClearBackground();
 
-    // FIXME: draw intro
+    if (cls.startStage < 3 || cls.startStage >= 12) {
+        return;
+    }
+
+    if (intro_stage.material->GetMaterial()) {
+        float swidth;
+        float sheight;
+        vec4_t color;
+
+        VectorSet4(color, 1, 1, 1, 1);
+        if (intro_stage.fadetime) {
+            float frac;
+
+            frac = Q_clamp_float((cls.realtime - intro_stage.starttime) / intro_stage.fadetime, 0, 1);
+            color[0] = color[1] = color[2] = intro_stage.alpha_start + frac * (intro_stage.alpha_end - intro_stage.alpha_start);
+        }
+
+        swidth = view3d->getFrame().getMaxX();
+        sheight = view3d->getFrame().getMaxY();
+
+        re.SetColor(color);
+
+        re.DrawStretchPic(0.0, 0.0, swidth, sheight, 0.0, 0.0, 1.0, 1.0, intro_stage.material->GetMaterial());
+        re.SetColor(NULL);
+    }
+
+    if (cls.realtime >= intro_stage.endtime) {
+        CL_FinishedStartStage();
+    }
 }
 
 /*
@@ -1809,17 +1837,9 @@ void UI_Update(void)
     }
 
     // don't care about the intro
-    /*
-	if( CL_FinishedIntro() )
-	{
-	}
-	else
-	{
-		UI_DrawIntro();
-	}
-	*/
-
-    if (!server_loading && (clc.state == CA_CONNECTING || clc.state == CA_CHALLENGING) && ui_pConnectingMenu) {
+    if (!CL_FinishedIntro()) {
+        UI_DrawIntro();
+    } else if (!server_loading && (clc.state == CA_CONNECTING || clc.state == CA_CHALLENGING) && ui_pConnectingMenu) {
         view3d->setShow(false);
         UI_ClearBackground();
 
@@ -4738,7 +4758,7 @@ CL_FinishedIntro
 */
 qboolean CL_FinishedIntro(void)
 {
-    return !cls.startStage;
+    return cls.startStage == 0;
 }
 
 /*
@@ -4748,7 +4768,87 @@ CL_FinishedStartStage
 */
 void CL_FinishedStartStage(void)
 {
-    // FIXME: stub
+    int wait;
+
+    switch (cls.startStage++) {
+    case 1:
+        Cbuf_ExecuteText(EXEC_NOW, "cinematic EAlogo.RoQ\n");
+        break;
+    case 2:
+        intro_stage.alpha_start = 0.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_titlescreen_fadein->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+
+        intro_stage.material = uWinMan.RegisterShader("mohaa_title");
+        break;
+    case 3:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait = ui_legalscreen_stay->value * 1000.0;
+        intro_stage.fadetime  = 0.0;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 4:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 0.0;
+
+        wait                  = ui_titlescreen_fadeout->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 5:
+        intro_stage.alpha_start = 0.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_legalscreen_fadein->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+
+        intro_stage.material = uWinMan.RegisterShader("legal");
+        break;
+    case 6:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_legalscreen_stay->value * 1000.0;
+        intro_stage.fadetime  = 0.0;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 7:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 0.0;
+
+        wait                  = ui_legalscreen_fadeout->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 8:
+        if (com_target_game->integer >= target_game_e::TG_MOHTA) {
+            cls.startStage = 0;
+            return;
+        }
+
+        Cbuf_ExecuteText(EXEC_NOW, "cinematic 2015intro.RoQ\n");
+        break;
+    case 9:
+        Cbuf_ExecuteText(EXEC_NOW, "cinematic intro.RoQ\n");
+        break;
+    case 10:
+        cls.startStage = 0;
+        break;
+    default:
+        break;
+    }
 }
 
 /*
@@ -4764,9 +4864,6 @@ void UI_StartStageKeyEvent(void)
             SCR_StopCinematic();
         }
         break;
-    case 12:
-        SCR_StopCinematic();
-        break;
     case 3:
     case 4:
     case 5:
@@ -4785,11 +4882,9 @@ void UI_StartStageKeyEvent(void)
         break;
     case 9:
     case 10:
-    case 11:
-        if (ui_skip_legalscreen->integer) {
-            cls.startStage = 11;
-            CL_FinishedStartStage();
-        }
+        SCR_StopCinematic();
+        break;
+    default:
         break;
     }
 }
@@ -4817,8 +4912,8 @@ void CL_TryStartIntro(void)
         UI_ToggleConsole();
     } else {
         // FIXME: no intro from now
-        //Cvar_Set( cl_playintro->name, "0" );
-        //UI_StartIntro_f();
+        Cvar_Set(cl_playintro->name, "0");
+        UI_StartIntro_f();
     }
 }
 
@@ -5174,7 +5269,7 @@ void CL_InitializeUI(void)
     ui_success             = Cvar_Get("ui_success", "0", 0);
     ui_failed              = Cvar_Get("ui_failed", "0", 0);
     ui_returnmenu          = Cvar_Get("ui_returnmenu", "0", 0);
-    ui_skip_eamovie        = Cvar_Get("ui_skip_eamovie", "0", 0);
+    ui_skip_eamovie        = Cvar_Get("ui_skip_eamovie", "1", 0);
     ui_skip_titlescreen    = Cvar_Get("ui_skip_titlescreen", "1", 0);
     ui_skip_legalscreen    = Cvar_Get("ui_skip_legalscreen", "1", 0);
     ui_titlescreen_fadein  = Cvar_Get("ui_titlescreen_fadein", "1", 0);
@@ -5370,6 +5465,10 @@ void CL_InitializeUI(void)
     CL_ClearButtons();
 
     cls.uiStarted = qtrue;
+
+    if (!com_dedicated->integer) {
+        CL_TryStartIntro();
+    }
 }
 
 static char        **loadStrings;

From b509ef5ab4f6d4db15a6e4c27da798836aef5d5b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 23:29:30 +0200
Subject: [PATCH 0854/2040] Deactivate the mouse only when loading

---
 code/sdl/sdl_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 829363de..a7fe9761 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -1212,7 +1212,7 @@ void IN_Frame( void )
 	IN_JoyMove( );
 
 	// If not DISCONNECTED (main menu) or ACTIVE (in game), we're loading
-	loading = (clc.state != CA_DISCONNECTED && clc.state != CA_ACTIVE && clc.state != CA_CONNECTING );
+	loading = (clc.state == CA_LOADING || clc.state == CA_PRIMED);
 
 	// update isFullscreen since it might of changed since the last vid_restart
 	cls.glconfig.isFullscreen = Cvar_VariableIntegerValue( "r_fullscreen" ) != 0;

From 28f8c6577118f7c5957971fad50c7b0599578014 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 23:30:30 +0200
Subject: [PATCH 0855/2040] Key_SetCatcher() must use cls.keyCatchers

---
 code/client/cl_keys.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_keys.cpp b/code/client/cl_keys.cpp
index 6584c458..c55cec43 100644
--- a/code/client/cl_keys.cpp
+++ b/code/client/cl_keys.cpp
@@ -1346,5 +1346,5 @@ Key_SetCatcher
 */
 void Key_SetCatcher(int catcher)
 {
-    keyCatchers = catcher;
+    cls.keyCatchers = catcher;
 }

From 2f884e6d55ade97f33fc7408d2f8648dd7873a21 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 23:32:24 +0200
Subject: [PATCH 0856/2040] Call Key_GetCatcher/Key_SetCatcher instead of
 modifying the variable directly

---
 code/client/cl_ui.cpp       | 2 +-
 code/client/cl_uiview3d.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 8cb12bc6..6685df9e 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3569,7 +3569,7 @@ UI_WantsKeyboard
 */
 void UI_WantsKeyboard()
 {
-    cls.keyCatchers |= KEYCATCH_UI;
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
 }
 
 struct widgettrans_s {
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 07daee37..f7826499 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -120,7 +120,7 @@ void View3D::Pressed(Event *ev)
 
 void View3D::OnDeactivate(Event *ev)
 {
-    cls.keyCatchers |= KEYCATCH_UI;
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
 }
 
 void View3D::OnActivate(Event *ev)
@@ -129,7 +129,7 @@ void View3D::OnActivate(Event *ev)
     UList<UIWidget *> widgets;
 
     UI_CloseInventory();
-    cls.keyCatchers &= ~KEYCATCH_UI;
+    Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_UI);
 
     for (wid = getParent()->getFirstChild(); wid; wid = getParent()->getNextChild(wid)) {
         if (wid->getAlwaysOnBottom() && wid != this) {

From a6377fedabf33c0214fdd3dc89d5c57ac2298a94 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Sep 2024 23:36:19 +0200
Subject: [PATCH 0857/2040] Remove useless code

---
 code/client/cl_ui.cpp | 96 -------------------------------------------
 1 file changed, 96 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 6685df9e..f3a2ac84 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3732,102 +3732,6 @@ void CL_FillUIImports(void)
 
     uii.GetConfigstring   = CL_ConfigString;
     uii.UI_CloseDMConsole = UI_CloseDMConsole;
-
-#if 0
-	uii.TIKI_RegisterModel				= TIKI_RegisterTiki;
-
-	uii.Cvar_Get						= Cvar_Get;
-	uii.Argc							= Cmd_Argc;
-	uii.Argv							= Cmd_Argv;
-	uii.Cmd_ExecuteText					= Cbuf_ExecuteText;
-	uii.FS_FOpenFile					= FS_FOpenFileByMode;
-	uii.FS_Read							= FS_Read;
-	uii.FS_Write						= FS_Write;
-	uii.FS_FCloseFile					= FS_FCloseFile;
-	uii.FS_GetFileList					= FS_GetFileList;
-	uii.FS_Seek							= FS_Seek;
-	uii.R_RegisterModel					= re.RegisterModel;
-	uii.R_RegisterSkin					= re.RegisterShader;
-	uii.R_RegisterShader				= re.RegisterShader;
-	uii.R_RegisterShaderNoMip			= re.RegisterShaderNoMip;
-	uii.R_ClearScene					= re.ClearScene;
-	uii.R_AddRefEntityToScene			= re.AddRefEntityToScene;
-	uii.R_AddPolyToScene				= re.AddPolyToScene;
-	uii.R_AddLightToScene				= re.AddLightToScene;
-	uii.R_RenderScene					= re.RenderScene;
-	uii.R_SetColor						= re.SetColor;
-	uii.R_DrawStretchPic				= re.DrawStretchPic;
-	uii.UpdateScreen					= SCR_UpdateScreen;
-	uii.S_StartLocalSound				= S_StartLocalSound;
-	uii.S_RegisterSound					= S_RegisterSound;
-	uii.Key_KeynumToStringBuf			= Key_KeynumToStringBuf;
-	uii.Key_KeynumToString				= Key_KeynumToString;
-	uii.Key_GetBindingBuf				= Key_GetBindingBuf;
-	uii.Key_IsDown						= Key_IsDown;
-	uii.Key_GetOverstrikeMode			= Key_GetOverstrikeMode;
-	uii.Key_SetOverstrikeMode			= Key_SetOverstrikeMode;
-	uii.Key_ClearStates					= Key_ClearStates;
-	uii.Key_GetCatcher					= Key_GetCatcher;
-	uii.Key_SetCatcher					= Key_SetCatcher;
-	uii.GetClipboardData				= CL_GetClipboardData;
-	uii.GetClientState					= GetClientState;
-	uii.GetGlconfig						= CL_GetGlconfig;
-	uii.GetConfigString					= GetConfigString;
-	uii.LAN_GetServerCount				= LAN_GetServerCount;
-	uii.LAN_GetServerAddressString		= LAN_GetServerAddressString;
-	uii.LAN_GetServerInfo				= LAN_GetServerInfo;
-	uii.LAN_GetPingQueueCount			= LAN_GetPingQueueCount;
-	uii.LAN_ServerStatus				= LAN_GetServerStatus;
-	uii.LAN_ClearPing					= LAN_ClearPing;
-	uii.LAN_GetPing						= LAN_GetPing;
-	uii.LAN_GetPingInfo					= LAN_GetPingInfo;
-	uii.LAN_GetServerPing				= LAN_GetServerPing;
-	uii.LAN_MarkServerVisible			= LAN_MarkServerVisible;
-	uii.LAN_UpdateVisiblePings			= LAN_UpdateVisiblePings;
-	uii.GetCDKey						= CLUI_GetCDKey;
-	uii.SetCDKey						= CLUI_SetCDKey;
-	uii.R_RegisterFont					= re.RegisterFont;
-	uii.R_Text_Width					= re.Text_Width;
-	uii.R_Text_Height					= re.Text_Height;
-	uii.R_Text_Paint					= re.Text_Paint;
-	uii.R_Text_PaintChar				= re.Text_PaintChar;
-	uii.R_GetShaderName					= re.GetShaderName;
-
-	uii.Cmd_Stuff = Cbuf_AddText;
-	uii.Cvar_GetString = CvarGetForUI;
-	uii.Cvar_Reset = Cvar_Reset;
-	uii.Cvar_Find = Cvar_FindVar;
-	uii.Cvar_Set = UI_Cvar_Set;
-	uii.File_PickFile = PickFile;
-	uii.File_FreeFile = FS_FreeFile;
-	uii.File_ListFiles = ListFilesForUI;
-	uii.File_OpenFile = FS_ReadFile;
-	uii.File_WriteFile = FS_WriteTextFile;
-	uii.Rend_SetColor = re.SetColor;
-	uii.Snd_PlaySound = UI_StartLocalSound;
-	uii.Snd_RegisterSound = UI_RegisterSound;
-	uii.Alias_Add = Alias_Add;
-	uii.Alias_FindRandom = Alias_FindRandom;
-	uii.Sys_Error = Com_Error;
-	uii.Sys_IsKeyDown = IsKeyDown;
-	uii.Sys_Milliseconds = Sys_Milliseconds;
-	uii.Sys_Printf = Com_Printf;
-	uii.Sys_DPrintf = Com_DPrintf;
-	uii.Sys_GetClipboard = Sys_GetWholeClipboard;
-	uii.Sys_SetClipboard = Sys_SetClipboard;
-	uii.Cmd_CompleteCommandByNumber = Cmd_CompleteCommandByNumber;
-	uii.Cvar_CompleteCvarByNumber = Cvar_CompleteVariableByNumber;
-	uii.UI_WantsKeyboard = UI_WantsKeyboard;
-	uii.Client_TranslateWidgetName = TranslateWidgetName;
-	uii.Connect = CL_Connect;
-	uii.Key_GetKeynameForCommand = Key_GetKeynameForCommand;
-	uii.Key_GetCommandForKey = Key_GetBinding;
-	uii.Key_SetBinding = Key_SetBinding;
-	uii.Key_GetKeysForCommand = Key_GetKeysForCommand;
-	uii.Key_KeynumToString = Key_KeynumToBindString;
-	uii.GetConfigstring = CL_ConfigString;
-	uii.UI_CloseDMConsole = UI_CloseDMConsole;
-#endif
 }
 
 /*

From 4b0696a1871984cf74258d9cfe4485d1b9ba0716 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 00:42:22 +0200
Subject: [PATCH 0858/2040] Implement remaining methods of
 ClientGameCommandManager

---
 code/cgame/cg_commands.cpp        | 52 ++++++++++++++++++++++++++++---
 code/cgame/cg_volumetricsmoke.cpp |  2 +-
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index d11534e7..05440444 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -2607,7 +2607,9 @@ void ClientGameCommandManager::SetColorRange(Event *ev)
         return;
     }
 
-    // FIXME: unused stub??
+    //
+    // Unused
+    //
 }
 
 //=============
@@ -4090,6 +4092,40 @@ void ClientGameCommandManager::LoopSound(Event *ev)
     current_centity->tikiLoopSoundFlags   = 0;
 }
 
+//===============
+// CacheImageResource
+//===============
+void CacheImageResource(const char* stuff) {
+    str real_stuff;
+    char filename[1024];
+
+    if (cgi.fsDebug->integer == 2) {
+        Com_Printf("client cacheimage: %s\n", stuff);
+    }
+
+    Q_strncpyz(filename, stuff, sizeof(filename));
+    cgi.FS_CanonicalFilename(filename);
+
+    cgi.R_RegisterShaderNoMip(filename);
+}
+
+//===============
+// CacheFontResource
+//===============
+void CacheFontResource(const char* stuff) {
+    str real_stuff;
+    char filename[1024];
+
+    if (cgi.fsDebug->integer == 2) {
+        Com_Printf("client cacheimage: %s\n", stuff);
+    }
+
+    Q_strncpyz(filename, stuff, sizeof(filename));
+    cgi.FS_CanonicalFilename(filename);
+
+    cgi.R_LoadFont(filename);
+}
+
 //===============
 // CacheResource
 //===============
@@ -4129,12 +4165,12 @@ void ClientGameCommandManager::Cache(Event *ev)
 
 void ClientGameCommandManager::CacheImage(Event *ev)
 {
-    // FIXME: stub
+    CacheImageResource(ev->GetString(1).c_str());
 }
 
 void ClientGameCommandManager::CacheFont(Event *ev)
 {
-    // FIXME: stub
+    CacheFontResource(ev->GetString(1).c_str());
 }
 
 //===============
@@ -5006,7 +5042,15 @@ bool ClientGameCommandManager::GetTagPositionAndOrientation(str tagname, orienta
 //===============
 void ClientGameCommandManager::RestartAllEmitters(void)
 {
-    // FIXME: stub??
+    ctempmodel_t *p;
+
+    //
+    // FIXME: not sure if it's the right thing
+    //
+
+    for (p = m_active_tempmodels.prev; p != &m_active_tempmodels; p = p->next) {
+        p->cgd.createTime = cg.time;
+    }
 }
 
 //===============
diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index df318139..b873e0d0 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -209,7 +209,7 @@ void ClientGameCommandManager::ResetVSSSources()
 
 void ClientGameCommandManager::ResetVSSSources(Event *ev)
 {
-    // FIXME: stub??
+    ResetVSSSources();
 }
 
 void CG_ResetVSSSources()

From e5af60787e2d9ab3afa8ebd9f2f3e93b1f57ae66 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 00:42:35 +0200
Subject: [PATCH 0859/2040] Partially implement GetZone/IsInZone

---
 code/fgame/entity.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index d0dfe46b..a3db0fdb 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -6275,7 +6275,9 @@ void Entity::NoTarget(Event *ev)
 
 void Entity::GetZone(Event *ev)
 {
-    // FIXME: stub
+    ev->AddInteger(edict->r.areanum);
+
+    // FIXME: Implement OPM feature
     STUB();
 
 #if 0
@@ -6291,7 +6293,13 @@ void Entity::GetZone(Event *ev)
 
 void Entity::IsInZone(Event *ev)
 {
-    // FIXME: stub
+    if (edict->r.areanum == ev->GetInteger(1)) {
+        ev->AddInteger(1);
+    } else {
+        ev->AddInteger(0);
+    }
+
+    // FIXME: Implement OPM feature
     STUB();
 
 #if 0

From 46e90466297d1d7067b7ebf2e919c62b7c6310cb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 01:03:37 +0200
Subject: [PATCH 0860/2040] Implement VehicleHalfTrack

---
 code/fgame/VehicleHalfTrack.cpp | 218 +++++++++++++++++++++++++++++---
 1 file changed, 199 insertions(+), 19 deletions(-)

diff --git a/code/fgame/VehicleHalfTrack.cpp b/code/fgame/VehicleHalfTrack.cpp
index 72b83768..5e0341ad 100644
--- a/code/fgame/VehicleHalfTrack.cpp
+++ b/code/fgame/VehicleHalfTrack.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2018 the OpenMoHAA team
+Copyright (C) 2018-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,42 +22,222 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "vehicle.h"
 #include "player.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleHalfTrack, "VehicleHalfTrack")
-{
-	{ &EV_Damage, &VehicleHalfTrack::EventDamage },
-	{ &EV_Killed, &VehicleHalfTrack::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleHalfTrack, "VehicleHalfTrack") {
+    {&EV_Damage, &VehicleHalfTrack::EventDamage},
+    {&EV_Killed, &VehicleHalfTrack::Killed     },
+    {NULL,       NULL                          }
 };
 
 VehicleHalfTrack::VehicleHalfTrack()
 {
-
-	;
 }
 
 void VehicleHalfTrack::Think()
 {
-	vmove_t vm;
-	flags |= FL_POSTTHINK;
+    vmove_t vm;
+    flags |= FL_POSTTHINK;
 
-	prev_velocity = velocity;
+    prev_velocity = velocity;
 
-	SetSlotsNonSolid();
+    SetSlotsNonSolid();
 
-	SetMoveInfo(&vm);
-	VmoveSingle(&vm);
-	GetMoveInfo(&vm);
+    SetMoveInfo(&vm);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
 
-	SetSlotsSolid();
+    SetSlotsSolid();
 }
 
 void VehicleHalfTrack::Postthink()
 {
-	// FIXME: STUB
+    float        turn;
+    Vector       i, j, k;
+    int          index;
+    trace_t      trace;
+    Vector       normalsum;
+    int          numnormals;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v;
+    VehicleBase *last;
+    float        drivespeed;
+    Vector       primal_angles;
+    Vector       vTmp;
+    Vector       n_angles;
+
+    primal_angles = angles;
+
+    if (drivable) {
+        if (m_bAutoPilot) {
+            AutoPilot();
+        }
+
+        currentspeed = moveimpulse;
+        turnangle    = turnangle * 0.25 + turnimpulse;
+        turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+
+        temp = angles;
+        temp.AngleVectorsLeft(&i, &j, &k);
+
+        j = vec_zero - j;
+
+        numnormals = 0;
+        for (index = 0; index < MAX_CORNERS; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8), t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+            start     = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2];
+            end       = start + Vector(0, 0, -400);
+
+            trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_VEHICLE_TIRES, false, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1.0 || trace.startsolid) {
+                normalsum += trace.plane.normal;
+            }
+        }
+
+        angles[2] = 0;
+
+        if (m_iNumNormals > 1) {
+            temp = normalsum / numnormals;
+            temp.normalize();
+            i = temp.CrossProduct(temp, j);
+
+            pitch     = i;
+            angles[0] = -pitch.toPitch();
+        }
+
+        turn = turnangle / 200.0;
+        if (groundentity) {
+            Vector newvel;
+            Vector flatvel;
+
+            velocity[0] *= 0.925f;
+            velocity[1] *= 0.925f;
+
+            flatvel = orientation[0];
+            velocity += flatvel * currentspeed;
+            flatvel[2] = 0;
+
+            drivespeed = Q_clamp_float(velocity * flatvel, -speed, speed);
+
+            newvel      = flatvel * drivespeed;
+            velocity[0] = newvel[0];
+            velocity[1] = newvel[1];
+            velocity[2] += drivespeed * jumpimpulse;
+
+            avelocity *= 0.05f;
+
+            if (steerinplace) {
+                if (drivespeed < 350) {
+                    drivespeed = 350;
+                }
+            }
+
+            avelocity.y += turn * drivespeed;
+        } else {
+            avelocity *= 0.1f;
+        }
+
+        angles += avelocity * level.frametime;
+        setAngles(angles);
+    }
+
+    drivespeed = acceleration * orientation[0];
+
+    if (drivable && driver.ent) {
+        str sound_name;
+
+        if (currentspeed > 0) {
+            sound_name = "snd_forward";
+        } else if (currentspeed < 0) {
+            sound_name = "snd_backward";
+        } else {
+            sound_name = "snd_idle";
+        }
+
+        LoopSound(sound_name);
+    }
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    if (driver.ent) {
+        driver.ent->setOrigin(origin + i * driveroffset[0] + j * driveroffset[1] + k * driveroffset[2]);
+
+        if (drivable) {
+            // clear the driver velocity
+            driver.ent->velocity = vec_zero;
+            // set the driver angles to the vehicle's angle
+            driver.ent->setAngles(angles);
+        }
+    }
+
+    n_angles = (angles - primal_angles) * level.frametime;
+    if (n_angles.x > 180 || n_angles.x < -180) {
+        n_angles.x = 0;
+    }
+    if (n_angles.y > 180 || n_angles.y < -180) {
+        n_angles.y = 0;
+    }
+    if (n_angles.z > 180 || n_angles.z < -180) {
+        n_angles.z = 0;
+    }
+
+    if (n_angles.x > -1 || n_angles.x < 1) {
+        n_angles.x = 0;
+    }
+    if (n_angles.y > -1 || n_angles.y < 1) {
+        n_angles.y = 0;
+    }
+    if (n_angles.z > -1 || n_angles.z < 1) {
+        n_angles.z = 0;
+    }
+
+    avelocity = n_angles;
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    last_origin = origin;
+
+    if (!driver.ent && !velocity.length() && groundentity && !(watertype & CONTENTS_LAVA)) {
+        // make the vehicle stationary if it's completely immobile
+        flags &= ~FL_POSTTHINK;
+        if (drivable) {
+            setMoveType(MOVETYPE_STATIONARY);
+        }
+    }
 }
 
-void VehicleHalfTrack::Killed(Event* ev)
+void VehicleHalfTrack::Killed(Event *ev)
 {
-	deadflag = DEAD_DEAD;
+    deadflag = DEAD_DEAD;
 }

From 844a72e0f3aeb28fcf07472f552aa899d60f6be6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 01:11:52 +0200
Subject: [PATCH 0861/2040] Add DrawPixels and PixelZoom

---
 code/renderercommon/qgl.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 45ae2e4c..d857b033 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -62,6 +62,7 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 	GLE(void, Disable, GLenum cap) \
 	GLE(void, DrawArrays, GLenum mode, GLint first, GLsizei count) \
 	GLE(void, DrawElements, GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) \
+	GLE(void, DrawPixels, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels) \
 	GLE(void, Enable, GLenum cap) \
 	GLE(void, Finish, void) \
 	GLE(void, Flush, void) \
@@ -75,6 +76,7 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 	GLE(const GLubyte *, GetString, GLenum name) \
 	GLE(void, LineStipple, GLint factor, GLushort pattern) \
 	GLE(void, LineWidth, GLfloat width) \
+	GLE(void, PixelZoom, GLfloat xfactor, GLfloat yfactor) \
 	GLE(void, PolygonOffset, GLfloat factor, GLfloat units) \
 	GLE(void, ReadPixels, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) \
 	GLE(void, Scissor, GLint x, GLint y, GLsizei width, GLsizei height) \

From 6fb9ab078ef75d9ef4396e8d1be1e2040a2a9290 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 01:12:00 +0200
Subject: [PATCH 0862/2040] Implement RE_DrawBackground_DrawPixels

---
 code/renderer/tr_draw.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_draw.c b/code/renderer/tr_draw.c
index 251dd227..cfac6caf 100644
--- a/code/renderer/tr_draw.c
+++ b/code/renderer/tr_draw.c
@@ -331,7 +331,22 @@ RE_DrawBackground_DrawPixels
 ================
 */
 void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
-	// FIXME: stub
+	R_SyncRenderThread();
+
+	GL_State(0);
+	qglDisable(GL_TEXTURE_2D);
+
+	qglPixelZoom(glConfig.vidWidth / rows, glConfig.vidHeight / cols);
+
+	if (bgr) {
+		qglDrawPixels(cols, rows, GL_BGR, GL_UNSIGNED_BYTE, data);
+	} else {
+		qglDrawPixels(cols, rows, GL_RGB, GL_UNSIGNED_BYTE, data);
+	}
+
+	qglPixelZoom(1.0, 1.0);
+
+	qglEnable(GL_TEXTURE_2D);
 }
 
 /*

From 77292fb9aba299427eb9df37a304ef70c8309930 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 01:14:38 +0200
Subject: [PATCH 0863/2040] First person spectator fix (not working yet)

---
 code/fgame/player.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 8c0fd1de..da9299db 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4927,6 +4927,8 @@ void Player::Think(void)
     }
 
     server_new_buttons = 0;
+
+    edict->r.svFlags &= ~(SVF_SINGLECLIENT | SVF_NOTSINGLECLIENT);
 }
 
 void Player::InitLegsStateTable(void)
@@ -6966,11 +6968,8 @@ void Player::CopyStats(Player *player)
     VectorCopy(player->client->ps.origin, client->ps.origin);
     VectorCopy(player->client->ps.velocity, client->ps.velocity);
 
-    if (client->ps.iViewModelAnim != player->client->ps.iViewModelAnim) {
-        ViewModelAnim(player->m_sVMcurrent, qfalse, 0);
-    } else if (client->ps.iViewModelAnimChanged != player->client->ps.iViewModelAnimChanged) {
-        ViewModelAnim(player->m_sVMcurrent, qtrue, 0);
-    }
+    client->ps.iViewModelAnim = player->client->ps.iViewModelAnim;
+    client->ps.iViewModelAnimChanged = player->client->ps.iViewModelAnimChanged;
 
     client->ps.gravity = player->client->ps.gravity;
     client->ps.speed   = player->client->ps.speed;
@@ -7003,7 +7002,7 @@ void Player::CopyStats(Player *player)
     edict->r.svFlags &= ~SVF_NOCLIENT;
     edict->s.renderfx &= ~RF_DONTDRAW;
 
-    player->edict->r.svFlags |= SVF_PORTAL;
+    player->edict->r.svFlags |= SVF_NOTSINGLECLIENT;
     player->edict->r.singleClient = client->ps.clientNum;
 
     edict->r.svFlags |= SVF_SINGLECLIENT;
@@ -7032,9 +7031,6 @@ void Player::CopyStats(Player *player)
 
         CloneEntity(dest, ent->entity);
 
-        dest->edict->r.svFlags |= SVF_SINGLECLIENT;
-        dest->edict->r.singleClient = client->ps.clientNum;
-
         dest->edict->s.modelindex   = ent->entity->edict->s.modelindex;
         dest->edict->tiki           = ent->entity->edict->tiki;
         dest->edict->s.actionWeight = ent->entity->edict->s.actionWeight;

From ef5759cff577e1ebb0e8df6feedc4ee05af7323a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 01:21:20 +0200
Subject: [PATCH 0864/2040] Don't execute commands during the intro

---
 code/qcommon/common.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 74e780ab..eccc087d 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -2181,7 +2181,9 @@ void Com_Frame( void ) {
 		timeBeforeEvents = Sys_Milliseconds ();
 	}
 	Com_EventLoop();
-	Cbuf_Execute(msec);
+	if (CL_FinishedIntro()) {
+		Cbuf_Execute(msec);
+	}
 
 
 	//

From 9c0224911c2ba4fb959d4346d5711309857b35cb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 12:02:05 +0200
Subject: [PATCH 0865/2040] Reset the number of dynamic lights when calculating
 the real terrain lighting

This fixes a crash that can occur when there is only the terrain that can be lit with dlights
---
 code/renderer/tr_light.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 8ea43b11..f06e9321 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -403,6 +403,8 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
     float     z00, z01;
     float     z10, z11;
 
+    dli.numLights = 0;
+
     for (i = 0; i < tr.refdef.num_dlights; i++) {
         dl = &tr.refdef.dlights[i];
 

From daa4a67b495a6d5e2e7bc5b820d98fadf83f21e1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:34:06 +0200
Subject: [PATCH 0866/2040] Reuse dlightmap in R_CheckDlightSurface and
 R_CheckDlightTerrain

---
 code/renderer/tr_world.c | 66 +++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
index 81a766d4..00b89a88 100644
--- a/code/renderer/tr_world.c
+++ b/code/renderer/tr_world.c
@@ -387,16 +387,33 @@ static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
         return R_DlightSurface(surf, dlightBits);
     }
 
-    if (*surf->data == SF_FACE)
-    {
-        ((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-        ((srfSurfaceFace_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
-    }
-    else if (*surf->data == SF_GRID)
-    {
-        ((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-        ((srfGridMesh_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
-    }
+	if (dlightBits)
+	{
+		//
+		// Added in 2.0
+		//  Return the existing dlight map
+		if (*surf->data == SF_FACE)
+		{
+			return ((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame];
+		}
+		else if (*surf->data == SF_GRID)
+		{
+			return ((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame];
+		}
+	}
+	else
+	{
+		if (*surf->data == SF_FACE)
+		{
+			((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+			((srfSurfaceFace_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
+		}
+		else if (*surf->data == SF_GRID)
+		{
+			((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+			((srfGridMesh_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
+		}
+	}
 
     return 0;
 }
@@ -408,17 +425,18 @@ R_CheckDlightTerrain
 */
 int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
 {
-    if (dlightBits && surf->frameCount != tr.frameCount)
-    {
-        surf->frameCount = tr.frameCount;
-        return R_DlightTerrain(surf, dlightBits);
-    }
-    else
-    {
-        surf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        surf->drawinfo.dlightBits[tr.smpFrame] = 0;
-        return 0;
-    }
+	if (surf->frameCount == tr.frameCount) {
+		return surf->drawinfo.dlightMap[tr.smpFrame];
+	}
+
+	surf->frameCount = tr.frameCount;
+	if (dlightBits) {
+		return R_DlightTerrain(surf, dlightBits);
+	}
+
+	surf->drawinfo.dlightMap[tr.smpFrame] = 0;
+	surf->drawinfo.dlightBits[tr.smpFrame] = 0;
+	return 0;
 }
 
 /*
@@ -427,9 +445,9 @@ R_AddWorldSurface
 ======================
 */
 static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
-	if ( surf->viewCount == tr.viewCount ) {
-		return;		// already in this view
-	}
+	//if ( surf->viewCount == tr.viewCount ) {
+	//	return;		// already in this view
+	//}
 
 	surf->viewCount = tr.viewCount;
 	// FIXME: bmodel fog?

From d05d964432f72098ed6bb4531a5727725d39ca50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:34:25 +0200
Subject: [PATCH 0867/2040] Fix NaN lmapStep for terrain patches

---
 code/renderer/tr_bsp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 1a6bd680..0a22a2cb 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -479,8 +479,8 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
         Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
     }
 
-    pUnpacked->drawinfo.lmapStep = (float)(pPacked->lmapScale / 64);
-    pUnpacked->drawinfo.lmapSize = (float)((pPacked->lmapScale * 8) + 1);
+    pUnpacked->drawinfo.lmapStep = (float)(64 / pPacked->lmapScale);
+    pUnpacked->drawinfo.lmapSize = pPacked->lmapScale * 8 + 1;
     pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
     pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
 

From 4a5b0b31059ff4b2968416276abd089f88be1598 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:39:22 +0200
Subject: [PATCH 0868/2040] Fix y lightmap position when allocating a new
 lightmap block

See the issue with dynamic lights: #356
---
 code/renderer/tr_light.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index f06e9321..a58a226e 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -1501,9 +1501,9 @@ qboolean R_AllocLMBlock(int w, int h, int *x, int *y)
         for (i = 0; i < LIGHTMAP_SIZE - w; i++) {
             best2 = 0;
 
-            for (j = 0; j < w && dli.allocated[i] < best; j++) {
-                if (best2 < dli.allocated[i]) {
-                    best2 = dli.allocated[i];
+            for (j = 0; j < w && dli.allocated[i + j] < best; j++) {
+                if (best2 < dli.allocated[i + j]) {
+                    best2 = dli.allocated[i + j];
                 }
             }
 

From 6ff25d00fcd46f417181db9ffc9a9d968bae3afd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 21:15:01 +0200
Subject: [PATCH 0869/2040] Use lightmap offset for grid surface when a
 dlightmap is specified

---
 code/renderer/tr_surface.c | 76 +++++++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 22 deletions(-)

diff --git a/code/renderer/tr_surface.c b/code/renderer/tr_surface.c
index a61f3dad..85a3b7eb 100644
--- a/code/renderer/tr_surface.c
+++ b/code/renderer/tr_surface.c
@@ -511,6 +511,10 @@ void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	dlightBits = cv->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
+	if (tess.shader->surfaceFlags & (SURF_NODLIGHT | SURF_SKY)) {
+		tess.dlightBits = 0;
+	}
+
 	// determine the allowable discrepance
 	lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );
 
@@ -574,31 +578,59 @@ void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 		texCoords = tess.texCoords[numVertexes][0];
 		color = ( unsigned char * ) &tess.vertexColors[numVertexes];
 		vDlightBits = &tess.vertexDlightBits[numVertexes];
-		needsNormal = tess.shader->needsNormal;
+		needsNormal = tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights;
 
-		for ( i = 0 ; i < rows ; i++ ) {
-			for ( j = 0 ; j < lodWidth ; j++ ) {
-				dv = cv->verts + heightTable[ used + i ] * cv->width
-					+ widthTable[ j ];
+		if ( tess.dlightMap ) {
+			for ( i = 0 ; i < rows ; i++ ) {
+				for ( j = 0 ; j < lodWidth ; j++ ) {
+					dv = cv->verts + heightTable[ used + i ] * cv->width
+						+ widthTable[ j ];
 
-				xyz[0] = dv->xyz[0];
-				xyz[1] = dv->xyz[1];
-				xyz[2] = dv->xyz[2];
-				texCoords[0] = dv->st[0];
-				texCoords[1] = dv->st[1];
-				texCoords[2] = dv->lightmap[0];
-				texCoords[3] = dv->lightmap[1];
-				if ( needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights ) {
-					normal[0] = dv->normal[0];
-					normal[1] = dv->normal[1];
-					normal[2] = dv->normal[2];
+					xyz[0] = dv->xyz[0];
+					xyz[1] = dv->xyz[1];
+					xyz[2] = dv->xyz[2];
+					texCoords[0] = dv->st[0];
+					texCoords[1] = dv->st[1];
+					texCoords[2] = dv->lightmap[0] + cv->lightmapOffset[0];
+					texCoords[3] = dv->lightmap[1] + cv->lightmapOffset[1];
+					if ( needsNormal ) {
+						normal[0] = dv->normal[0];
+						normal[1] = dv->normal[1];
+						normal[2] = dv->normal[2];
+					}
+					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
+					*vDlightBits++ = dlightBits;
+					xyz += 4;
+					normal += 4;
+					texCoords += 4;
+					color += 4;
+				}
+			}
+		} else {
+			for ( i = 0 ; i < rows ; i++ ) {
+				for ( j = 0 ; j < lodWidth ; j++ ) {
+					dv = cv->verts + heightTable[ used + i ] * cv->width
+						+ widthTable[ j ];
+
+					xyz[0] = dv->xyz[0];
+					xyz[1] = dv->xyz[1];
+					xyz[2] = dv->xyz[2];
+					texCoords[0] = dv->st[0];
+					texCoords[1] = dv->st[1];
+					texCoords[2] = dv->lightmap[0];
+					texCoords[3] = dv->lightmap[1];
+					if ( needsNormal ) {
+						normal[0] = dv->normal[0];
+						normal[1] = dv->normal[1];
+						normal[2] = dv->normal[2];
+					}
+					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
+					*vDlightBits++ = dlightBits;
+					xyz += 4;
+					normal += 4;
+					texCoords += 4;
+					color += 4;
 				}
-				* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
-				*vDlightBits++ = dlightBits;
-				xyz += 4;
-				normal += 4;
-				texCoords += 4;
-				color += 4;
 			}
 		}
 

From e5e7421d3c4bc747f1b3f08cc8aa5e268e6db81f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 21:21:38 +0200
Subject: [PATCH 0870/2040] Fix terrain lightmap when there is a dynamic light
 map

This fixes terrain having a completely wrong lightmap texture coordinates for dynamic lighting
---
 code/renderer/tr_surface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_surface.c b/code/renderer/tr_surface.c
index 85a3b7eb..1d5d83da 100644
--- a/code/renderer/tr_surface.c
+++ b/code/renderer/tr_surface.c
@@ -827,8 +827,8 @@ void RB_DrawTerrainTris(srfTerrain_t* p) {
 			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
 			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
 			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
-			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].texCoords[1][0] * lmScale + p->lmapX;
-			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].texCoords[1][1] * lmScale + p->lmapY;
+			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].xyz[0] * lmScale + p->lmapX;
+			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].xyz[1] * lmScale + p->lmapY;
 			tess.normal[tess.numVertexes][0] = 0;
 			tess.normal[tess.numVertexes][1] = 0;
 			tess.normal[tess.numVertexes][2] = 1.0;

From df53d35967b88af86e040ec7b6e68ebb77c9d5c7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 21:23:17 +0200
Subject: [PATCH 0871/2040] Fix real dynamic lighting algorithm for both
 terrain and patch

This fixes #356 where real dynamic lighting would look completely wrong, making it look like there are graphical artifacts on surfaces
---
 code/renderer/tr_light.c | 112 +++++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 51 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index a58a226e..23ce8ea1 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -1,21 +1,21 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2015-2024 the OpenMoHAA team
 
-This file is part of Quake III Arena source code.
+This file is part of OpenMoHAA source code.
 
-Quake III Arena source code is free software; you can redistribute it
+OpenMoHAA source code is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Quake III Arena source code is distributed in the hope that it will be
+OpenMoHAA source code is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
+along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -110,9 +110,9 @@ static int R_RecursiveDlightPatch(patchLightBlock_t *plb)
         index = 2;
     } else {
         return R_DlightSample(
-            &dli.srcBase[(LIGHTMAP_SIZE * 3) + plb[0].s * 3],
+            &dli.srcBase[plb[0].t * (LIGHTMAP_SIZE * 3) + plb[0].s * 3],
             plb[0].point,
-            &dli.dstBase[(LIGHTMAP_SIZE * 4) + plb[0].s * 4]
+            &dli.dstBase[plb[0].t * (LIGHTMAP_SIZE * 4) + plb[0].s * 4]
         );
     }
 
@@ -184,10 +184,10 @@ int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
     tr.pc.c_dlightSurfaces++;
     tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
 
-    added = 0;
+    added = qfalse;
 
-    if (srf->verts[srf->width].lightmap[0] != srf->verts[0].lightmap[0]) {
-        if (srf->verts[srf->width].lightmap[0] < srf->verts[0].lightmap[0]) {
+    if (srf->verts[srf->width - 1].lightmap[0] != srf->verts[0].lightmap[0]) {
+        if (srf->verts[srf->width - 1].lightmap[0] < srf->verts[0].lightmap[0]) {
             steps[0][0] = 0;
             steps[0][1] = -1;
         } else {
@@ -211,12 +211,12 @@ int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
             steps[0][1] = 0;
         }
 
-        if (srf->verts[srf->width].lightmap[1] < srf->verts[0].lightmap[1]) {
+        if (srf->verts[srf->width - 1].lightmap[1] < srf->verts[0].lightmap[1]) {
             steps[1][0] = 0;
             steps[1][1] = -1;
         } else {
             steps[1][0] = 0;
-            steps[1][1] = -1;
+            steps[1][1] = 1;
         }
     }
 
@@ -227,47 +227,48 @@ int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
             //
             // Vert 1
             //
+
             dv = &srf->verts[i * srf->width + j];
 
             VectorCopy(dv->xyz, plb[0].point);
-            plb[0].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[0].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-            i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
+            plb[0].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[0].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
 
             //
             // Vert 2
             //
-            dv = &srf->verts[srf->width * i2 + j2];
+
+            i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
 
             VectorCopy(dv->xyz, plb[1].point);
-            plb[1].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[1].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-            i2 = Q_clamp_int(steps[1][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[1][1] + j, 0, srf->width - 1);
+            plb[1].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[1].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
 
             //
             // Vert 3
             //
-            dv = &srf->verts[srf->width * i2 + j2];
+
+            i2 = Q_clamp_int(steps[1][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[1][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
 
             VectorCopy(dv->xyz, plb[2].point);
-            plb[2].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[2].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-            i2 = Q_clamp_int(steps[1][0] + steps[0][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[1][1] + steps[0][1] + j, 0, srf->width - 1);
+            plb[2].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[2].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
 
             //
             // Vert 4
             //
-            dv = &srf->verts[srf->width * i2 + j2];
+
+            i2 = Q_clamp_int(steps[1][0] + steps[0][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[1][1] + steps[0][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
 
             VectorCopy(dv->xyz, plb[3].point);
-            plb[3].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[3].t = dv->lightmap[1] * 128.0 - srf->lmY;
+            plb[3].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[3].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
 
             added |= R_RecursiveDlightPatch(plb);
         }
@@ -364,8 +365,8 @@ int R_RealDlightFace(srfSurfaceFace_t *srf, int dlightBits)
         }
 
         VectorAdd(vec, vecStepT, vec);
-        src += 3 * (LIGHTMAP_SIZE - j);
-        dst += 4 * (LIGHTMAP_SIZE - j);
+        src += (LIGHTMAP_SIZE - j) * 3;
+        dst += (LIGHTMAP_SIZE - j) * 4;
     }
 
     if (!added) {
@@ -436,7 +437,7 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
                 }
             }
 
-            delta = dl->transformed[0] - srf->z0;
+            delta = dl->transformed[2] - srf->z0;
             if (delta <= 0.f) {
                 dist += delta * delta;
             } else {
@@ -470,8 +471,8 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
     src = srf->drawinfo.lmData;
     dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
 
-    srf->drawinfo.lmapX = x / 128.f;
-    srf->drawinfo.lmapY = y / 128.f;
+    srf->drawinfo.lmapX = x / (float)LIGHTMAP_SIZE;
+    srf->drawinfo.lmapY = y / (float)LIGHTMAP_SIZE;
 
     tr.pc.c_dlightSurfaces++;
     tr.pc.c_dlightTexels += srf->drawinfo.lmapSize * srf->drawinfo.lmapSize;
@@ -488,7 +489,6 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
             for (j = 0; j < 9; j++) {
                 vec[2] = srf->z0 + (int)(srf->heightmap[0] << 1);
                 added |= R_DlightSample(src, vec, dst);
-
                 src += 3;
                 dst += 4;
                 vec[0] += srf->drawinfo.lmapStep;
@@ -510,13 +510,17 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
                 z00    = (int)srf->heightmap[k];
                 vec[2] = srf->z0 + z00 + z00;
                 added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
                 // increase lightmap step
                 vec[0] += srf->drawinfo.lmapStep;
+                k++;
 
                 z01    = (int)srf->heightmap[k];
                 vec[2] = srf->z0 + z00 + z01;
                 added |= R_DlightSample(src, vec, dst);
-
+                src += 3;
+                dst += 4;
                 vec[0] += srf->drawinfo.lmapStep;
             }
 
@@ -532,37 +536,43 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
             for (i = 0; i < 8; i++) {
                 z00    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
                 vec[2] = srf->z0 + z00;
-
                 added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
                 k++;
-
                 vec[0] += srf->drawinfo.lmapStep;
 
                 z01    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
                 vec[2] = srf->z0 + (z00 + z01) * 0.5f;
-
                 added |= R_DlightSample(src, vec, dst);
-
                 src += 3;
                 dst += 4;
                 vec[0] += srf->drawinfo.lmapStep;
             }
+
+            vec[2] = srf->z0 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += (LIGHTMAP_SIZE - 16) * 3;
+            dst += (LIGHTMAP_SIZE - 16) * 4;
+            k++;
+            vec[0] += srf->drawinfo.lmapStep;
+            vec[1] += srf->drawinfo.lmapStep;
         }
 
         vec[0] = srf->x0;
 
-        for (i = 0; i < 7; i++) {
+        for (i = 0; i < 8; i++) {
             z00    = (int)srf->heightmap[k];
             vec[2] = srf->z0 + z00 + z00;
-
             k++;
             added |= R_DlightSample(src, vec, dst);
+            src += 3;
+            dst += 4;
             vec[0] += srf->drawinfo.lmapStep;
 
             z01    = (int)srf->heightmap[k];
             vec[2] = srf->z0 + z00 + z01;
             added |= R_DlightSample(src, vec, dst);
-
             src += 3;
             dst += 4;
             vec[0] += srf->drawinfo.lmapStep;
@@ -621,8 +631,8 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
                     }
                 }
 
-                src += 3 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
-                dst += 4 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
+                src += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 3;
+                dst += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 4;
                 vec[1] += srf->drawinfo.lmapStep;
             }
         }
@@ -637,9 +647,9 @@ int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
         dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
     }
 
-    lmScale = (1.f / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
-    srf->drawinfo.lmapX -= (srf->x0 * lmScale - (LIGHTMAP_SIZE * 2.f));
-    srf->drawinfo.lmapY -= (srf->y0 * lmScale - (LIGHTMAP_SIZE * 2.f));
+    lmScale = (1.0 / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
+    srf->drawinfo.lmapX -= (srf->x0 * lmScale - (0.5 / LIGHTMAP_SIZE));
+    srf->drawinfo.lmapY -= (srf->y0 * lmScale - (0.5 / LIGHTMAP_SIZE));
 
     srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
     return srf->drawinfo.dlightMap[tr.smpFrame];

From a72da9b73e1034e89e140d255bad9a53b0bcf2a3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 23:49:42 +0200
Subject: [PATCH 0872/2040] Fix incorrect terrain height for poly

This caused decals to float in the air when they were placed on the terrain
---
 code/renderer/tr_terrain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 76b2e8a8..07b31b72 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1447,7 +1447,7 @@ qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVert
                     float fConstZ = fKz[0] + fKz[1] + fKz[2];
 
                     // Write back the calculated height into the vertex
-                    pVerts[i].xyz[2] = fScaleY - fScaleX - fConstZ;
+                    pVerts[i].xyz[2] = fScaleX - fScaleY - fConstZ;
                 }
 
                 return qtrue;

From 9acea3484d55cb8269368eba9116e38501dc8bea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 17:39:15 +0200
Subject: [PATCH 0873/2040] Play zing sounds only if the location if the zing
 is valid

This fixes a potential crash where uninitialized position would be passed to the sound system
---
 code/cgame/cg_parsemsg.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 25351b41..6c9ddcb2 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -736,8 +736,14 @@ static void CG_MakeBulletTracerInternal(
         }
 
         commandManager.PlaySound("snd_b_zing", vZingPosA, -1, fVolume, -1.0f, fPitch, 1);
-        commandManager.PlaySound("snd_b_zing", vZingPosB, -1, fVolume, -1.0f, fPitch, 1);
-        commandManager.PlaySound("snd_b_zing", vZingPosC, -1, fVolume, -1.0f, fPitch, 1);
+
+        if (fZingDistB != 9999) {
+            commandManager.PlaySound("snd_b_zing", vZingPosB, -1, fVolume, -1.0f, fPitch, 1);
+
+            if (fZingDistC != 9999) {
+                commandManager.PlaySound("snd_b_zing", vZingPosC, -1, fVolume, -1.0f, fPitch, 1);
+            }
+        }
     }
 }
 

From f35582489da6b395e7713c95443de594a52f4634 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:09:56 +0200
Subject: [PATCH 0874/2040] Fix support for british, russian and italian voices
 in Spearhead and Breakthrough

---
 code/fgame/player.cpp | 62 +++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index da9299db..c8340096 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10210,30 +10210,46 @@ void Player::EventSetVoiceType(Event *ev)
 {
     str sVoiceName = ev->GetString(1);
 
-    if (!sVoiceName.icmp("airborne")) {
-        m_voiceType = PVT_ALLIED_AIRBORNE;
-    } else if (!sVoiceName.icmp("manon")) {
-        m_voiceType = PVT_ALLIED_MANON;
-    } else if (!sVoiceName.icmp("SAS")) {
-        m_voiceType = PVT_ALLIED_SAS;
-    } else if (!sVoiceName.icmp("pilot")) {
-        m_voiceType = PVT_ALLIED_PILOT;
-    } else if (!sVoiceName.icmp("army")) {
-        m_voiceType = PVT_ALLIED_ARMY;
-    } else if (!sVoiceName.icmp("ranger")) {
-        m_voiceType = PVT_ALLIED_RANGER;
-    } else if (!sVoiceName.icmp("axis1")) {
-        m_voiceType = PVT_AXIS_AXIS1;
-    } else if (!sVoiceName.icmp("axis2")) {
-        m_voiceType = PVT_AXIS_AXIS2;
-    } else if (!sVoiceName.icmp("axis3")) {
-        m_voiceType = PVT_AXIS_AXIS3;
-    } else if (!sVoiceName.icmp("axis4")) {
-        m_voiceType = PVT_AXIS_AXIS4;
-    } else if (!sVoiceName.icmp("axis5")) {
-        m_voiceType = PVT_AXIS_AXIS5;
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        if (!sVoiceName.icmp("american")) {
+            m_voiceType = PVT_ALLIED_AMERICAN;
+        } else if (!sVoiceName.icmp("british")) {
+            m_voiceType = PVT_ALLIED_BRITISH;
+        } else if (!sVoiceName.icmp("russian")) {
+            m_voiceType = PVT_ALLIED_RUSSIAN;
+        } else if (!sVoiceName.icmp("german")) {
+            m_voiceType = PVT_AXIS_GERMAN;
+        } else if (!sVoiceName.icmp("italian")) {
+            m_voiceType = PVT_AXIS_ITALIAN;
+        } else {
+            m_voiceType = PVT_NONE_SET;
+        }
     } else {
-        m_voiceType = PVT_NONE_SET;
+        if (!sVoiceName.icmp("airborne")) {
+            m_voiceType = PVT_ALLIED_AIRBORNE;
+        } else if (!sVoiceName.icmp("manon")) {
+            m_voiceType = PVT_ALLIED_MANON;
+        } else if (!sVoiceName.icmp("SAS")) {
+            m_voiceType = PVT_ALLIED_SAS;
+        } else if (!sVoiceName.icmp("pilot")) {
+            m_voiceType = PVT_ALLIED_PILOT;
+        } else if (!sVoiceName.icmp("army")) {
+            m_voiceType = PVT_ALLIED_ARMY;
+        } else if (!sVoiceName.icmp("ranger")) {
+            m_voiceType = PVT_ALLIED_RANGER;
+        } else if (!sVoiceName.icmp("axis1")) {
+            m_voiceType = PVT_AXIS_AXIS1;
+        } else if (!sVoiceName.icmp("axis2")) {
+            m_voiceType = PVT_AXIS_AXIS2;
+        } else if (!sVoiceName.icmp("axis3")) {
+            m_voiceType = PVT_AXIS_AXIS3;
+        } else if (!sVoiceName.icmp("axis4")) {
+            m_voiceType = PVT_AXIS_AXIS4;
+        } else if (!sVoiceName.icmp("axis5")) {
+            m_voiceType = PVT_AXIS_AXIS5;
+        } else {
+            m_voiceType = PVT_NONE_SET;
+        }
     }
 }
 

From c3e3f368e0902f565f6a7d96ae354b3d390d8861 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:59:36 +0200
Subject: [PATCH 0875/2040] use `cheats` rather than `sv_cheats` to check if
 the client is connected to a cheat server

---
 code/client/cl_parse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 76a17cf4..12e8602a 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -434,7 +434,7 @@ void CL_SystemInfoChanged( void ) {
 		return;
 	}
 
-	s = Info_ValueForKey( systemInfo, "sv_cheats" );
+	s = Info_ValueForKey( systemInfo, "cheats" );
 	cl_connectedToCheatServer = atoi( s );
 	if ( !cl_connectedToCheatServer ) {
 		Cvar_SetCheatState();

From 2ab826268df26dbc0f39ecc8d0b0a00852378337 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 20:20:19 +0200
Subject: [PATCH 0876/2040] Clear the legs state during the torso evaluation
 when the movecontrol is not legs

The legs state won't be stuck anymore waiting for an empty animation. This could happen under special circumstances, when the torso evaluation sets the movecontrol to non-legs (clears the legs anim) and then back to legs in subsequent iterations.
Fixes #105, the issue cannot be exploited anymore for land-sharking
---
 code/fgame/player.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index c8340096..5036e94b 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5356,6 +5356,16 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                 } else {
                     SetPartAnim(legsAnim.c_str(), legs);
                 }
+
+                // Fixed in OPM
+                //  Clear the legs state, so the torso state can reset it to STAND
+                //  in subsequent iterations.
+                //  As the legs animation is stopped, there would be no anim to wait on.
+                //
+                //  This prevents the current legs state to be stuck
+                //  when the move control is set to non-legs and then to legs
+                //  in the same iteration before the legs state is being processed.
+                currentState_Legs = NULL;
             }
 
             if (movecontrol != move) {
@@ -10369,10 +10379,11 @@ void Player::PlayInstantMessageSound(const char *name)
 void Player::EventDMMessage(Event *ev)
 {
     int              i;
-    int              iStringLength;
+    //int              iStringLength;
     int              iMode = 0;
     str              sToken;
     char             szPrintString[MAX_SAY_TEXT]; // it's MAX_STRING_CHARS in mohaa
+    size_t           iStringLength;
     const char      *pTmpInstantMsg = "";
     qboolean         bInstaMessage  = qfalse;
     AliasListNode_t *pSoundAlias    = NULL;

From 96d10fb8b00eae3f76e99952ac90ec51deef83a7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 20:49:50 +0200
Subject: [PATCH 0877/2040] Mark r_light_nolight as cheat

---
 code/renderer/tr_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 538cc315..fd6ae508 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1435,7 +1435,7 @@ void R_Register( void )
 	r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
 	r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
 	r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
-	r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_ARCHIVE);
+	r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_CHEAT | CVAR_ARCHIVE);
 	r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
 	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
 	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);

From ecdbe3d959f1949b0c826e997e390c315cbfd2dd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:01:04 +0200
Subject: [PATCH 0878/2040] Don't check lightmap for
 RB_StageIteratorVertexLitTextureUnfogged to be used

---
 code/renderer/tr_shader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 8c0d8edb..9ce9bd73 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -2446,7 +2446,7 @@ static void ComputeStageIteratorFunc( void )
 		{
 			if ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP)
 			{
-				if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && unfoggedStages[0].bundle[1].tcGen == TCGEN_LIGHTMAP)
+				if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && !unfoggedStages[0].bundle[0].numTexMods)
 				{
 					if ( !shader.polygonOffset )
 					{

From c120aed8bb144df689b342770d92542cfc7d7124 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:11:58 +0200
Subject: [PATCH 0879/2040] Fix incorrect static model grid lighting

---
 code/renderer/tr_light.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index 23ce8ea1..e9deef2e 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -1332,7 +1332,7 @@ void RB_SetupEntityGridLighting()
 
     ent = backEnd.currentEntity;
     for (;;) {
-        ent->bLightGridCalculated = 1;
+        ent->bLightGridCalculated = qtrue;
         ent->iGridLighting        = iColor;
         if (ent->e.parentEntity == ENTITYNUM_NONE) {
             break;
@@ -1368,7 +1368,7 @@ void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t
     ent->bLightGridCalculated = qtrue;
 
     if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-        R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
+        R_GetLightingGridValue(lightOrigin, vLight);
     } else {
         vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
     }
@@ -1392,8 +1392,8 @@ void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t
     }
 
     // normalize
-    if (vLight[0] < 255.0 || vLight[1] < 255.0 || vLight[2] < 255.0) {
-        float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
         VectorScale(vLight, scale, vLight);
     }
 

From d9ab65154c1b8a047378a936ff38871ec92d5488 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 00:27:01 +0200
Subject: [PATCH 0880/2040] Fix incorrect lighting grid blend

---
 code/renderer/tr_light.c | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
index e9deef2e..7d076f34 100644
--- a/code/renderer/tr_light.c
+++ b/code/renderer/tr_light.c
@@ -788,10 +788,12 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 
     fTotalFactor = 0;
     iArrayXStep  = tr.world->lightGridBounds[1];
-    iBaseOffset  = tr.world->lightGridBounds[0] + iGridPos[0] * iArrayXStep + iGridPos[1];
-    vLight[0] = vLight[1] = vLight[2] = 0;
+    iBaseOffset  = tr.world->lightGridBounds[0] + iGridPos[1] + iArrayXStep * iGridPos[0];
+    VectorClear(vLight);
 
     for (i = 0; i < 4; i++) {
+        qboolean bContinue = qfalse;
+
         switch (i) {
         case 0:
             fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
@@ -823,15 +825,16 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
 
         while (1) {
             while (1) {
-                iCurData = pCurData[iData];
+                iCurData = (char)pCurData[iData];
                 iData++;
-                if (iCurData >= 0ul) {
+                if (iCurData >= 0) {
                     break;
                 }
 
                 iLen = -iCurData;
                 if (iLen > iRowPos) {
                     iData += iRowPos;
+
                     if (pCurData[iData]) {
                         pColor = R_GetLightGridPalettedColor(pCurData[iData]);
                         VectorMA(vLight, fWeight, pColor, vLight);
@@ -846,13 +849,19 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
                     if (pCurData[iData]) {
                         pColor = R_GetLightGridPalettedColor(pCurData[iData]);
                         VectorMA(vLight, fWeight2, pColor, vLight);
+                        fTotalFactor += fWeight2;
                     }
 
-                    goto cont;
+                    bContinue = qtrue;
+                    break;
                 }
 
                 iRowPos -= iLen;
-                iData += iLen + 1;
+                iData += iLen;
+            }
+
+            if (bContinue) {
+                break;
             }
 
             iLen = iCurData + 2;
@@ -864,6 +873,10 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
             iData++;
         }
 
+        if (bContinue) {
+            continue;
+        }
+
         if (iLen - 1 > iRowPos) {
             if (!pCurData[iData]) {
                 continue;
@@ -886,8 +899,6 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
                 fTotalFactor += fWeight2;
             }
         }
-
-    cont:;
     }
 
     if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
@@ -898,11 +909,8 @@ void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
         if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
             float t;
             // normalize color values
-            t = 255.0 / (float)Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-
-            vLight[0] = (float)vLight[0] * t;
-            vLight[1] = (float)vLight[1] * t;
-            vLight[2] = (float)vLight[2] * t;
+            t = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+            VectorScale(vLight, t, vLight);
         }
     } else {
         vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
@@ -985,6 +993,8 @@ void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
     for (i = 0; i < 8; i++) {
         iSample[i] = -1;
     }
+
+    iArrayXStep = tr.world->lightGridBounds[1];
     iBaseOffset = iGridPos[1] + tr.world->lightGridBounds[0] + iGridPos[0] * tr.world->lightGridBounds[1];
 
     for (i = 0; i < 8; i++) {
@@ -1005,13 +1015,13 @@ void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
             case 2:
                 pCurData = &tr.world->lightGridData
                                 [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
-                                 + tr.world->lightGridOffsets[iBaseOffset + tr.world->lightGridBounds[1]]];
+                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]];
                 break;
             case 3:
             default:
                 pCurData = &tr.world->lightGridData
                                 [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
-                                 + tr.world->lightGridOffsets[iBaseOffset + tr.world->lightGridBounds[1] + 1]];
+                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]];
                 break;
             }
 

From eac69f659fb28ad45c51fbda7bdb2b6aefac3102 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:00:00 +0200
Subject: [PATCH 0881/2040] For dot/oneminusdot, shader needs normal

---
 code/renderer/tr_shader.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 9ce9bd73..bdb7f1d3 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -817,13 +817,6 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 
 		if (token[0] == '}')
 		{
-			// Added in 2.0
-			//  Ignore vars that didn't met with 'ifCvar' / 'ifCvarnot'
-			if (!shouldProcess) {
-				stage->active = qfalse;
-				stage->rgbGen = CGEN_BAD;
-				return qtrue;
-			}
 			break;
 		}
 		// no picmip adjustment
@@ -1247,6 +1240,8 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 			}
 			else if (!Q_stricmp(token, "dot"))
 			{
+				shader.needsNormal = qtrue;
+
 				stage->rgbGen = CGEN_DOT;
 				stage->alphaMin = 0.0;
 				stage->alphaMax = 1.0;
@@ -1262,9 +1257,11 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 					continue;
 				}
 				stage->alphaMax = atof(token);
-				}
+			}
 			else if (!Q_stricmp(token, "oneminusdot"))
 			{
+				shader.needsNormal = qtrue;
+
 				stage->rgbGen = CGEN_ONE_MINUS_DOT;
 				stage->alphaMin = 0.0;
 				stage->alphaMax = 1.0;
@@ -1683,6 +1680,14 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 		}
 	}
 
+	// Added in 2.0
+	//  Ignore vars that didn't met with 'ifCvar' / 'ifCvarnot'
+	if (!shouldProcess) {
+		stage->active = qfalse;
+		stage->rgbGen = CGEN_BAD;
+		return qtrue;
+	}
+
 	//
 	// if cgen isn't explicitly specified, use either identity or identitylighting
 	//
@@ -2970,9 +2975,9 @@ static shader_t *FinishShader( void ) {
 		}
 
 		if (pStage->rgbGen == CGEN_LIGHTING_GRID) {
-			shader.needsLGrid = 1;
+			shader.needsLGrid = qtrue;
 		} else if (pStage->rgbGen == CGEN_LIGHTING_SPHERICAL || pStage->rgbGen == CGEN_STATIC) {
-			shader.needsLSpherical = 1;
+			shader.needsLSpherical = qtrue;
 		}
 
 		//

From b672fc8b2943855be80e6b65cba7a9f7b2b5d297 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:00:24 +0200
Subject: [PATCH 0882/2040] Add #if, #if_not and #else shader statements

---
 code/renderer/tr_shader.c | 105 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index bdb7f1d3..1500d2d4 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -2153,8 +2153,12 @@ static qboolean ParseShader( char **text, qboolean picmip )
 {
 	char *token;
 	int s;
+	int matchingendifs;
+	qboolean bInElseBlock;
 
 	s = 0;
+	matchingendifs = 0;
+	bInElseBlock = qfalse;
 
 	token = COM_ParseExt( text, qtrue );
 	if ( token[0] != '{' )
@@ -2381,6 +2385,107 @@ static qboolean ParseShader( char **text, qboolean picmip )
 			ParseSort( text );
 			continue;
 		}
+		else if (!Q_stricmp(token, "#if") || !Q_stricmp(token, "#if_not") || !Q_stricmp(token, "#else"))
+		{
+			qboolean conditionpassed;
+
+			conditionpassed = qfalse;
+			if (!Q_stricmp(token, "#else"))
+			{
+				if (bInElseBlock) {
+					ri.Printf(
+						PRINT_WARNING,
+						"WARNING: illegal #else after a previous #else in shader '%s'\n",
+						shader.name);
+				}
+
+				matchingendifs--;
+				if (matchingendifs < 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: unmatched #else in shader '%s'\n", shader.name);
+				}
+
+				bInElseBlock = qtrue;
+			}
+			else
+			{
+				qboolean bInvertResult;
+
+				bInvertResult = !Q_stricmp(token, "#if_not");
+
+				token = COM_ParseExt(text, qfalse);
+				if (!Q_stricmp(token, "separate_env")) {
+					conditionpassed = r_textureDetails->integer != 0;
+				} else if (!Q_stricmp(token, "0") || !Q_stricmp(token, "false")) {
+					conditionpassed = qfalse;
+				} else if (!Q_stricmp(token, "1") || !Q_stricmp(token, "true")) {
+					conditionpassed = qtrue;
+				} else {
+					ri.Printf(
+						PRINT_WARNING,
+						"WARNING: invalid #if argument '%s' in shader '%s', not passing.\n",
+						token,
+						shader.name);
+				}
+
+				if (bInvertResult) {
+					conditionpassed = !conditionpassed;
+				}
+			}
+
+			if (!conditionpassed) {
+				int nestedifs = 0;
+
+				SkipRestOfLine(text);
+
+				while (1) {
+					token = COM_ParseExt(text, qtrue);
+					if (!token[0]) {
+						ri.Printf(PRINT_WARNING, "WARNING: no matching #endif in shader '%s'\n", &shader);
+						break;
+					}
+
+					if (!Q_stricmp(token, "#if")) {
+						nestedifs++;
+						SkipRestOfLine(text);
+					} else if (!Q_stricmp(token, "#endif")) {
+						nestedifs--;
+					} else if (!Q_stricmp(token, "#else")) {
+						if (bInElseBlock) {
+							ri.Printf(
+								PRINT_WARNING,
+								"WARNING: illegal #else after a previous #else in shader '%s'\n",
+								&shader);
+							break;
+						}
+
+						if (!nestedifs) {
+							matchingendifs++;
+							break;
+						}
+						nestedifs++;
+					} else {
+						SkipRestOfLine(text);
+					}
+
+					if (nestedifs == -1) {
+						break;
+					}
+				}
+			} else {
+				matchingendifs++;
+			}
+
+			continue;
+		}
+		else if (!Q_stricmp(token, "#endif"))
+		{
+			matchingendifs--;
+			if (matchingendifs < 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: unmatched #endif in shader '%s'\n", shader.name);
+			}
+
+			bInElseBlock = qfalse;
+		}
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );

From b0c8dafb33f308fcd24e382a83389c174b330d4b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:02:37 +0200
Subject: [PATCH 0883/2040] Correctly compute colors for static model in vertex
 lit texture

---
 code/renderer/tr_shade.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index dd201143..d77c9daf 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -1628,13 +1628,25 @@ void RB_StageIteratorVertexLitTextureUnfogged( void )
 
 	shader = input->shader;
 
-	if (backEnd.currentSphere->TessFunction && r_drawspherelights->integer) {
+	if (backEnd.currentSphere->TessFunction && r_drawspherelights->integer)
+	{
+		//
+		// compute colors using the sphere function
+		//
 		backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
 	}
+	else if (backEnd.currentStaticModel)
+	{
+		//
+		// compute colors
+		//
+		ComputeColors(input->xstages[0]);
+	}
 	else
 	{
 		//
-		// compute colors
+		// calculate using previously calculated lighting grid
+		// for the entity
 		//
 		RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
 	}

From a60baa03e0d7f3b82043a3a1080920c0d3ac4828 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:05:51 +0200
Subject: [PATCH 0884/2040] Add MAX_SPHERE_LIGHTS

---
 code/renderer/tr_backend.c        | 2 +-
 code/renderer/tr_local.h          | 4 ++--
 code/renderer/tr_sphere_shade.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 5ef8c9b2..d518a438 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -870,7 +870,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 				}
 				else
 				{
-					if (backEnd.numSpheresUsed == 128)
+					if (backEnd.numSpheresUsed == MAX_SPHERE_LIGHTS)
 					{
 						ri.Printf(PRINT_DEVELOPER, "Spherical lighting: Ran out of space in the sphere array!\n");
 						backEnd.currentSphere = &backEnd.spareSphere;
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 23a42eee..8c99edc1 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1161,7 +1161,7 @@ extern	refimport_t		ri;
 #define	MAX_DRAWIMAGES			2048
 #define	MAX_LIGHTMAPS			256
 #define	MAX_SKINS				1024
-
+#define MAX_SPHERE_LIGHTS		128
 
 #define	MAX_DRAWSURFS			0x10000
 #define	MAX_SPRITESURFS			0x8000
@@ -1259,7 +1259,7 @@ typedef struct {
 	qboolean	isHyperspace;
 	trRefEntity_t	*currentEntity;
     qboolean skyRenderedThisView;	// flag for drawing sun
-    sphereor_t spheres[128];
+    sphereor_t spheres[MAX_SPHERE_LIGHTS];
     unsigned char numSpheresUsed;
     sphereor_t* currentSphere;
     sphereor_t spareSphere;
diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 99ea54e2..5f6d782a 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -1181,7 +1181,7 @@ void R_Sphere_InitLights()
     s_sun.szFlareName[0] = 0;
     s_sun.exists         = qfalse;
 
-    for (int i = 0; i < 128; i++) {
+    for (int i = 0; i < MAX_SPHERE_LIGHTS; i++) {
         backEnd.spheres[i].TessFunction = &RB_Light_Real;
     }
 

From 0cce0c81fb3fed38ae9c9b2d95b7718ec5e3edcb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:29:52 +0200
Subject: [PATCH 0885/2040] Prevent world values from being overridden by
 entities

---
 code/renderer/tr_sphere_shade.cpp | 56 +++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 5f6d782a..ede58102 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -1175,9 +1175,14 @@ void R_Sphere_InitLights()
     const char *ents;
     const char *ret;
     qboolean    bFlareDirSet;
+    qboolean    bIsWorld;
+    qboolean    bWorldProcessed;
+
+    ents            = ri.CM_EntityString();
+    bFlareDirSet    = qfalse;
+    bIsWorld        = qfalse;
+    bWorldProcessed = qfalse;
 
-    ents                 = ri.CM_EntityString();
-    bFlareDirSet         = qfalse;
     s_sun.szFlareName[0] = 0;
     s_sun.exists         = qfalse;
 
@@ -1198,7 +1203,27 @@ void R_Sphere_InitLights()
             continue;
         }
 
+        if (!bWorldProcessed && !strcmp(ret, "classname")) {
+            //
+            // Added in 2.0
+            //  Make sure that the world's properties are not overridden
+            //  by some random entities
+            //
+            if (!strcmp(COM_Parse((char **)&ents), "worldspawn")) {
+                bIsWorld = qtrue;
+            } else {
+                bWorldProcessed = qtrue;
+            }
+
+            continue;
+        }
+
         if (!strcmp(ret, "suncolor") || !strcmp(ret, "sunlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple suncolors defined in map\n");
+                continue;
+            }
+
             sscanf(COM_Parse((char **)&ents), "%f %f %f", &s_sun.color[0], &s_sun.color[1], &s_sun.color[2]);
             s_sun.color[0] *= tr.overbrightMult;
             s_sun.color[1] *= tr.overbrightMult;
@@ -1207,6 +1232,11 @@ void R_Sphere_InitLights()
         } else if (!strcmp(ret, "sundirection")) {
             vec3_t dir;
 
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple sundirections defined in map\n");
+                continue;
+            }
+
             sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
             AngleVectorsLeft(dir, s_sun.direction, 0, 0);
 
@@ -1219,14 +1249,30 @@ void R_Sphere_InitLights()
         } else if (!strcmp(ret, "sunflaredirection")) {
             vec3_t dir;
 
+            if (bWorldProcessed) {
+                continue;
+            }
+
             sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
             AngleVectorsLeft(dir, s_sun.flaredirection, 0, 0);
             bFlareDirSet = qtrue;
         } else if (!strcmp(ret, "sunflarename")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
             strcpy(s_sun.szFlareName, COM_Parse((char **)&ents));
         } else if (!strcmp(ret, "ambientlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple ambientlights defined in map\n");
+                continue;
+            }
             sscanf(COM_Parse((char **)&ents), "%f %f %f", &ambientlight[0], &ambientlight[1], &ambientlight[2]);
         } else if (!strcmp(ret, "overbright")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
             ret = COM_Parse((char **)&ents);
             if (strcmp(ret, "world") || strcmp(ret, "none")) {
                 bEntityOverbright  = qtrue;
@@ -1237,10 +1283,8 @@ void R_Sphere_InitLights()
         }
     }
 
-    if (s_sun.exists) {
-        if (!s_sun.szFlareName[0]) {
-            strcpy(s_sun.szFlareName, "sun");
-        }
+    if (s_sun.exists && !s_sun.szFlareName[0]) {
+        strcpy(s_sun.szFlareName, "sun");
     }
 }
 

From 7188e9832a037f4a55cdb2aa7929edcbca78a0da Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:51:00 +0200
Subject: [PATCH 0886/2040] Fix leaf iteration

---
 code/renderer/tr_sphere_shade.cpp | 45 ++++++++++---------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index ede58102..d6a4fffa 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -584,13 +584,13 @@ static void RB_Sphere_Light_Sun()
         vec3_t transpos;
         vec3_t temppos;
 
-        for (curleaf = 0, leaf = backEnd.currentSphere->leaves[0]; curleaf < 8; curleaf++) {
-            if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
                 break;
             }
 
-            leaf = backEnd.currentSphere->leaves[curleaf];
-            if (!leaf) {
+            if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
                 break;
             }
         }
@@ -632,7 +632,7 @@ static void RB_Sphere_Light_Sun()
     }
 
     VectorMA(backEnd.currentSphere->traceOrigin, 16384.0, s_sun.direction, end);
-    ri.CM_BoxTrace(&trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+    ri.CM_BoxTrace(&trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID | CONTENTS_FENCE, 0);
 
     hitSun = (trace.surfaceFlags >> 2) & 1;
     if (r_light_sun_line->integer) {
@@ -682,10 +682,9 @@ static void RB_Sphere_Light_Sun()
 
         MatrixTransformVectorRight(backEnd.currentEntity->e.axis, s_sun.direction, sunnormal);
 
-        pLight           = &pSphere->light[pSphere->numRealLights];
-        pLight->color[0] = s_sun.color[0] * tr.overbrightMult * r_entlight_scale->value;
-        pLight->color[1] = s_sun.color[1] * tr.overbrightMult * r_entlight_scale->value;
-        pLight->color[2] = s_sun.color[2] * tr.overbrightMult * r_entlight_scale->value;
+        pLight = &pSphere->light[pSphere->numRealLights];
+        VectorScale(s_sun.color, r_entlight_scale->value, pLight->color);
+        //VectorScale(s_sun.color, r_entlight_scale->value * tr.overbrightMult, pLight->color);
 
         VectorCopy(sunnormal, pLight->vDirection);
         pLight->eType      = LIGHT_DIRECTIONAL;
@@ -737,8 +736,9 @@ static bool RB_Sphere_SetupGlobals()
         backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
         return false;
     }
+
     if (backEnd.refdef.rdflags & RDF_HUD) {
-        if (backEnd.refdef.vieworg[0] == 0 && backEnd.refdef.vieworg[1] == 0 && backEnd.refdef.vieworg[2] == 0) {
+        if (!backEnd.refdef.vieworg[0] && !backEnd.refdef.vieworg[1] && !backEnd.refdef.vieworg[2]) {
             backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
             return false;
         }
@@ -787,27 +787,10 @@ static bool RB_Sphere_ResetPointColors()
         }
     }
 
-    amb[0] = light_offset[0] * tr.overbrightMult * r_entlight_scale->value;
-    if (amb[0] > 255.0) {
-        backEnd.currentSphere->ambient.level[0] = 0xff;
-    } else {
-        backEnd.currentSphere->ambient.level[0] = amb[0];
-    }
-
-    amb[1] = light_offset[1] * tr.overbrightMult * r_entlight_scale->value;
-    if (amb[1] > 255.0) {
-        backEnd.currentSphere->ambient.level[1] = 0xff;
-    } else {
-        backEnd.currentSphere->ambient.level[1] = amb[1];
-    }
-
-    amb[2] = light_offset[2] * tr.overbrightMult * r_entlight_scale->value;
-    if (amb[2] > 255.0) {
-        backEnd.currentSphere->ambient.level[2] = 0xff;
-    } else {
-        backEnd.currentSphere->ambient.level[2] = amb[2];
-    }
-
+    VectorScale(light_offset, tr.overbrightMult * r_entlight_scale->value, amb);
+    backEnd.currentSphere->ambient.level[0] = Q_min(amb[0], 0xff);
+    backEnd.currentSphere->ambient.level[1] = Q_min(amb[1], 0xff);
+    backEnd.currentSphere->ambient.level[2] = Q_min(amb[2], 0xff);
     backEnd.currentSphere->ambient.level[3] = 0xff;
 
     return true;

From a6808d1f6a34163cf361ace0feccf8e227579d15 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 21:10:36 +0200
Subject: [PATCH 0887/2040] Fix incorrect light color for point lights and spot
 lights, also handle negative point light intensity

This fixes lighting from sphere being computed incorrectly for entities, making entities often look black or having strange lighting color
---
 code/renderer/tr_sphere_shade.cpp | 69 +++++++++++++++----------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index d6a4fffa..ce710a9f 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -632,7 +632,9 @@ static void RB_Sphere_Light_Sun()
     }
 
     VectorMA(backEnd.currentSphere->traceOrigin, 16384.0, s_sun.direction, end);
-    ri.CM_BoxTrace(&trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID | CONTENTS_FENCE, 0);
+    ri.CM_BoxTrace(
+        &trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID | CONTENTS_FENCE, 0
+    );
 
     hitSun = (trace.surfaceFlags >> 2) & 1;
     if (r_light_sun_line->integer) {
@@ -909,43 +911,39 @@ static void RB_Sphere_AddSpotLight(const spherel_t *thislight)
         float            fRadByDistSquared;
 
         MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, newdir);
-        dot = DotProduct(newlight, newdir);
+        dot = -DotProduct(newlight, newdir);
         if (dot > 0) {
             fMinDist = sqrt(
-                (newlight[0] + newdir[0] * dot) * (newlight[0] + newdir[0] * dot)
-                + (newlight[1] + newdir[1] * dot) * (newlight[1] + newdir[1] * dot)
-                + (newlight[2] + newdir[2] * dot) * (newlight[2] + newdir[2] * dot)
+                Square(newlight[0] + newdir[0] * dot) + Square(newlight[1] + newdir[1] * dot)
+                + Square(newlight[2] + newdir[2] * dot)
             );
 
-            if (fMinDist < radiusByDistance * dot) {
-                if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
-                    pLight        = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
-                    pLight->eType = LIGHT_SPOT;
-                    pLight->color[0] *= thislight->intensity * 7500.0 * tr.overbrightMult;
-                    pLight->color[1] *= thislight->intensity * 7500.0 * tr.overbrightMult;
-                    pLight->color[2] *= thislight->intensity * 7500.0 * tr.overbrightMult;
-                    pLight->fDist = VectorLength(newlight);
-                    pLight->fIntensity =
-                        (pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f)
-                        * (thislight->intensity * 7500.0 * tr.overbrightMult);
+            if (fMinDist < radiusByDistance * dot && backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
 
-                    sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
-                    if (sampleRadius > 0) {
-                        pLight->fIntensity /= (sampleRadius * sampleRadius);
-                    }
+                pLight->eType = LIGHT_SPOT;
+                VectorScale(thislight->color, thislight->intensity * 7500.0 * tr.overbrightMult, pLight->color);
+                pLight->fDist = VectorLength(newlight);
+                pLight->fIntensity =
+                    (thislight->color[0] * 0.299f + thislight->color[1] * 0.587f + thislight->color[2] * 0.114f)
+                    * (thislight->intensity * 7500.0 * tr.overbrightMult);
 
-                    VectorCopy(lightline, pLight->vOrigin);
-                    VectorNegate(newdir, pLight->vDirection);
-                    fRadByDistSquared  = radiusByDistance * radiusByDistance;
-                    pLight->fSpotConst = fRadByDistSquared + 1.0;
-                    pLight->fSpotScale = 1.0 / (fRadByDistSquared * 0.19);
-                    pLight->fSpotSlope = radiusByDistance;
-
-                    backEnd.currentSphere->numRealLights++;
+                sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
+                if (sampleRadius > 0) {
+                    pLight->fIntensity /= (sampleRadius * sampleRadius);
                 }
 
-                RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+                VectorCopy(lightline, pLight->vOrigin);
+                VectorNegate(newdir, pLight->vDirection);
+                fRadByDistSquared  = radiusByDistance * radiusByDistance;
+                pLight->fSpotConst = fRadByDistSquared + 1.0;
+                pLight->fSpotScale = 1.0 / (fRadByDistSquared * 0.19);
+                pLight->fSpotSlope = radiusByDistance;
+
+                backEnd.currentSphere->numRealLights++;
             }
+
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
         }
     }
 }
@@ -993,17 +991,18 @@ static void RB_Sphere_AddLight(const spherel_t *thislight)
         MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
         VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
 
-        intensity = thislight->intensity * 7500.0;
+        intensity = fabs(thislight->intensity) * 7500.0;
         falloff   = 1.f / VectorLengthSquared(newlight) * intensity;
         if (falloff >= 5.0) {
             RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+
             if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
                 pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
 
-                fDist            = VectorLength(newlight);
-                pLight->color[0] = thislight->color[0] * falloff * tr.overbrightMult * r_entlight_scale->value * fDist;
-                pLight->color[1] = thislight->color[1] * falloff * tr.overbrightMult * r_entlight_scale->value * fDist;
-                pLight->color[2] = thislight->color[2] * falloff * tr.overbrightMult * r_entlight_scale->value * fDist;
+                fDist = VectorLength(newlight);
+                VectorScale(
+                    thislight->color, falloff * tr.overbrightMult * r_entlight_scale->value * fDist, pLight->color
+                );
 
                 VectorCopy(lightline, pLight->vOrigin);
                 pLight->fDist      = fDist;
@@ -1041,7 +1040,7 @@ static void RB_Sphere_BuildStaticLights()
             cntarea = leaf->numlights;
 
             if (cntarea) {
-                for (i = (*leaf->lights == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
+                for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
                     spherel_t *pLight = leaf->lights[i];
                     byte       mask   = backEnd.refdef.areamask[pLight->leaf->area >> 3];
 

From 4785913e0277d5cdfe243776b8af434c9e491235 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 21:31:50 +0200
Subject: [PATCH 0888/2040] compare_light_intensities should compare intensity
 as integers directly

---
 code/renderer/tr_sphere_shade.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index ce710a9f..bcb3cfd4 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -72,7 +72,7 @@ static vec3_t offsets[26] = {
 
 int compare_light_intensities(const void *p1, const void *p2)
 {
-    return ((const reallightinfo_t *)p2)->fIntensity - ((const reallightinfo_t *)p1)->fIntensity;
+    return *(int *)&((const reallightinfo_t *)p2)->fIntensity - *(int *)&((const reallightinfo_t *)p1)->fIntensity;
 }
 
 static void RB_OptimizeLights()

From bba7031f3d65799e38d7d49b3ce4a33f41004916 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 22:00:42 +0200
Subject: [PATCH 0889/2040] Add more clarity to code

---
 code/renderer/tr_sphere_shade.cpp | 43 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index bcb3cfd4..7435da46 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -134,7 +134,7 @@ static void RB_OptimizeLights()
                             float fDistSquared;
 
                             VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-                            fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                            fProjSquared = Square(DotProduct(v, pLight->vDirection));
                             fDistSquared  = VectorLengthSquared(v);
                             fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                             if (fMaxIntensity > 0) {
@@ -180,20 +180,9 @@ static void RB_OptimizeLights()
                 }
             }
 
-            cubecolor[i][0] = colorout[0];
-            if (cubecolor[i][0] > 255.f) {
-                cubecolor[i][0] = 255.f;
-            }
-
-            cubecolor[i][1] = colorout[1];
-            if (cubecolor[i][1] > 255.f) {
-                cubecolor[i][1] = 255.f;
-            }
-
-            cubecolor[i][2] = colorout[2];
-            if (cubecolor[i][2] > 255.f) {
-                cubecolor[i][2] = 255.f;
-            }
+            cubecolor[i][0] = Q_min(colorout[0], 255);
+            cubecolor[i][1] = Q_min(colorout[1], 255);
+            cubecolor[i][2] = Q_min(colorout[2], 255);
         }
 
         cube = backEnd.currentSphere->cubemap;
@@ -232,21 +221,20 @@ static void RB_OptimizeLights()
             VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
             fDistSquared   = VectorLengthSquared(v);
             fSlope         = DotProduct(v, pLight->vDirection);
-            fDistPerp      = sqrt(fDistSquared - fSlope * fSlope);
-            fRadiusSquared = backEnd.currentSphere->radius * backEnd.currentSphere->radius;
+            fDistPerp      = sqrt(fDistSquared - Square(fSlope));
+            fRadiusSquared = Square(backEnd.currentSphere->radius);
             fDistParallel  = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
-            if (fDistParallel * fDistParallel
-                >= fRadiusSquared + pLight->fSpotSlope * 0.9f * (pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
+            if (Square(fDistParallel)
+                >= fRadiusSquared + Square(pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
                 pLight->eType = LIGHT_SPOT_FAST;
             }
             break;
         case LIGHT_POINT:
             if ((pLight->fDist - backEnd.currentSphere->radius) * r_entlight_errbound->value * pLight->fDist
                 > backEnd.currentSphere->radius * pLight->fIntensity) {
-                pLight->color[0] *= 1.f / pLight->fDist;
-                pLight->color[1] *= 1.f / pLight->fDist;
-                pLight->color[2] *= 1.f / pLight->fDist;
                 pLight->eType = LIGHT_DIRECTIONAL;
+
+                VectorScale(pLight->color, 1.0f / pLight->fDist, pLight->color);
                 VectorNormalize2(pLight->vOrigin, pLight->vDirection);
             }
             break;
@@ -365,9 +353,10 @@ static void RB_Light_CubeMap(unsigned char *colors)
             }
         }
 
-        color[0] = Q_clamp_int(colorout[0], 0, 255);
-        color[1] = Q_clamp_int(colorout[1], 0, 255);
-        color[2] = Q_clamp_int(colorout[2], 0, 255);
+        color[0] = Q_min(colorout[0], 255);
+        color[1] = Q_min(colorout[1], 255);
+        color[2] = Q_min(colorout[2], 255);
+        color[3] = 0xff;
     }
 }
 
@@ -424,7 +413,7 @@ void RB_Light_Real(unsigned char *colors)
                     if (fDot > 0) {
                         VectorSubtract(pLight->vOrigin, xyz, v);
 
-                        fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                        fProjSquared  = Square(DotProduct(v, pLight->vDirection));
                         fDistSquared  = VectorLengthSquared(v);
                         fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                         if (fMaxIntensity > 0) {
@@ -501,7 +490,7 @@ void RB_Light_Real(unsigned char *colors)
                 if (fDot > 0) {
                     VectorSubtract(pLight->vOrigin, xyz, v);
 
-                    fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                    fProjSquared  = Square(DotProduct(v, pLight->vDirection));
                     fDistSquared  = VectorLengthSquared(v);
                     fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                     if (fMaxIntensity > 0) {

From f4c8b0c21fc26d510e0e50f1386f1ce38eaddb6b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Sep 2024 22:22:42 +0200
Subject: [PATCH 0890/2040] Initialize the cube build info

This should fix lighting being too dark or incorrect in some places
---
 code/renderer/tr_sphere_shade.cpp | 42 ++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 7435da46..a0529f3d 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -77,12 +77,37 @@ int compare_light_intensities(const void *p1, const void *p2)
 
 static void RB_OptimizeLights()
 {
-    static int iCubeBuildInfo[24][9];
-    int        i, j;
-    int        nCubeMapLights;
-    float      fMaxIntensity;
-    vec3_t     cubecolor[256];
-    vec3_t     colorout;
+    static int iCubeBuildInfo[24][9] = {
+        {0, 1, 2, 1,  1,  0, 6,  10, 18},
+        {0, 1, 2, 1,  -1, 0, 6,  11, 19},
+        {0, 1, 2, -1, 1,  0, 7,  10, 20},
+        {0, 1, 2, -1, -1, 0, 7,  11, 21},
+        {0, 1, 2, -1, -1, 1, 8,  12, 22},
+        {0, 1, 2, -1, 1,  1, 8,  13, 23},
+        {0, 1, 2, 1,  -1, 1, 9,  12, 24},
+        {0, 1, 2, 1,  1,  1, 9,  13, 25},
+        {1, 0, 2, 1,  1,  2, 6,  14, 18},
+        {1, 0, 2, 1,  -1, 2, 6,  15, 19},
+        {1, 0, 2, -1, -1, 3, 7,  16, 20},
+        {1, 0, 2, -1, 1,  3, 7,  17, 21},
+        {1, 0, 2, -1, 1,  2, 8,  14, 22},
+        {1, 0, 2, -1, -1, 2, 8,  15, 23},
+        {1, 0, 2, 1,  -1, 3, 9,  16, 24},
+        {1, 0, 2, 1,  1,  3, 9,  17, 25},
+        {2, 1, 0, 1,  1,  4, 14, 10, 18},
+        {2, 1, 0, -1, -1, 5, 15, 11, 19},
+        {2, 1, 0, -1, 1,  4, 16, 10, 20},
+        {2, 1, 0, 1,  -1, 5, 17, 11, 21},
+        {2, 1, 0, 1,  -1, 4, 14, 12, 22},
+        {2, 1, 0, -1, 1,  5, 15, 13, 23},
+        {2, 1, 0, -1, -1, 4, 16, 12, 24},
+        {2, 1, 0, 1,  1,  5, 17, 13, 25}
+    };
+    int    i, j;
+    int    nCubeMapLights;
+    float  fMaxIntensity;
+    vec3_t cubecolor[256];
+    vec3_t colorout;
     float(*cube)[3][4];
     reallightinfo_t *pLight;
 
@@ -134,7 +159,7 @@ static void RB_OptimizeLights()
                             float fDistSquared;
 
                             VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-                            fProjSquared = Square(DotProduct(v, pLight->vDirection));
+                            fProjSquared  = Square(DotProduct(v, pLight->vDirection));
                             fDistSquared  = VectorLengthSquared(v);
                             fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
                             if (fMaxIntensity > 0) {
@@ -224,8 +249,7 @@ static void RB_OptimizeLights()
             fDistPerp      = sqrt(fDistSquared - Square(fSlope));
             fRadiusSquared = Square(backEnd.currentSphere->radius);
             fDistParallel  = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
-            if (Square(fDistParallel)
-                >= fRadiusSquared + Square(pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
+            if (Square(fDistParallel) >= fRadiusSquared + Square(pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
                 pLight->eType = LIGHT_SPOT_FAST;
             }
             break;

From 05971913194541ee834974ef39559a39f59586b9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:18:08 +0200
Subject: [PATCH 0891/2040] Implement SkelVec3::IsUnit

---
 code/skeletor/SkelVec3.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/skeletor/SkelVec3.h b/code/skeletor/SkelVec3.h
index a678a90b..2755de97 100644
--- a/code/skeletor/SkelVec3.h
+++ b/code/skeletor/SkelVec3.h
@@ -117,8 +117,7 @@ inline bool SkelVec3::IsZero() const
 
 inline bool SkelVec3::IsUnit() const
 {
-    // FIXME: stub
-    return false;
+    return VectorLength(*this) == 1;
 }
 
 inline void SkelVec3::set(float x, float y, float z)

From 3f139f463bbe50e655861eecf7b83c00ce74781b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:19:05 +0200
Subject: [PATCH 0892/2040] Remove stub print

---
 code/sys/new/sys_main_new.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index e85f5501..0df7f6e0 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -56,55 +56,65 @@ void Sys_ShowConsole(int visLevel, qboolean quitOnClose)
 /*
 ==============
 SaveRegistryInfo
+
+Used to save product info stuff into the registry.
+Not useful anymore, so no need to implement.
 ==============
 */
 qboolean SaveRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long lSize)
 {
-    STUB_DESC("not implemented");
     return qfalse;
 }
 
 /*
 ==============
 LoadRegistryInfo
+
+Used to load product info stuff from the registry.
+Not useful anymore, so no need to implement.
 ==============
 */
 qboolean LoadRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long* plSize)
 {
-    STUB_DESC("not implemented");
     return qfalse;
 }
 
 /*
 ==============
 IsFirstRun
+
+Returns whether or not this is the first time the game is started.
+Not used anymore.
 ==============
 */
 qboolean IsFirstRun(void)
 {
-    STUB_DESC("wtf");
     return qfalse;
 }
 
 /*
 ==============
 IsNewConfig
+
+Returns whether or not a new hardware change is detected.
+Not used anymore.
 ==============
 */
 qboolean IsNewConfig(void)
 {
-    STUB_DESC("wtf");
     return qfalse;
 }
 
 /*
 ==============
 IsSafeMode
+
+Returns whether or not the game was started in safe mode.
+Not used anymore.
 ==============
 */
 qboolean IsSafeMode(void)
 {
-    STUB_DESC("wtf");
     return qfalse;
 }
 
@@ -139,21 +149,27 @@ void Sys_SetClipboard(const char* contents)
 /*
 ================
 RecoverLostAutodialData
+
+This functions changes the current user setting so the modem
+automatically dials up whenever an attempt to connect is detected.
+
+There is no need to implement this anymore nowadays.
 ================
 */
 void RecoverLostAutodialData(void)
 {
-    // FIXME: stub
 }
 
 /*
 ==============
 Sys_CloseMutex
+
+Closes the global mutex used to check if another instance is already running.
+Not used anymore, as multiple instances could be useful for testing.
 ==============
 */
 void Sys_CloseMutex(void)
 {
-    // FIXME: stub
 }
 
 /*

From 38e62fef18713560f5494dfb1ccf6624ce9202a4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:26:51 +0200
Subject: [PATCH 0893/2040] Update the implementation documentation with the
 current state

---
 docs/features_implementation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/features_implementation.md b/docs/features_implementation.md
index 3895a2c1..4503197d 100644
--- a/docs/features_implementation.md
+++ b/docs/features_implementation.md
@@ -6,7 +6,7 @@ The server version can be built successfully. The server and the fgame component
 
 ## Client
 
-The client version of OpenMoHAA is also fully implemented with a few bugs remaining, and with the cgame module being nearly completed. Credits to the SDK of **Heavy Metal: F.A.K.K. 2** both the cgame and fgame modules.
+The client version of OpenMoHAA is also fully implemented with a few bugs remaining. Credits to the SDK of **Heavy Metal: F.A.K.K. 2** both the cgame and fgame modules.
 
 OpenMoHAA is using OpenAL for the audio.
 
@@ -14,12 +14,12 @@ The current operational status for each component is as follow:
 
 | Component               | Full | Almost | Half | Early | Bad | Not working | Comment                                                           |
 |-------------------------|------|--------|------|-------|-----|-------------|-------------------------------------------------------------------|
-| Audio                   | x    |        |      |       |     |             | Full implementation using OpenAL, there may still be some bugs    |
-| CG Module               |      | x      |      |       |     |             | Need more fixes for FX, marks and decals                          |
+| Audio                   | x    |        |      |       |     |             | Full implementation using OpenAL, some rare bugs can occur        |
+| CG Module               | x    |        |      |       |     |             | Some effects can be inaccurate compared to the original game      |
 | Client                  | x    |        |      |       |     |             |                                                                   |
 | Collision               | x    |        |      |       |     |             |                                                                   |
 | Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                   |
-| Renderer                | x    | x      |      |       |     |             | Missing ghost, sun flare, swipe, some lighting bugs               |
+| Renderer                | x    |        |      |       |     |             |                                                                   |
 | Server                  | x    |        |      |       |     |             |                                                                   |
 | Server module (fgame)   | x    |        |      |       |     |             | There might still be some AI/gameplay bugs                        |
 | UI                      | x    |        |      |       |     |             |                                                                   |

From a28cd64c7aa9378f661e554d7565fc2bcb4cdc81 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:30:38 +0200
Subject: [PATCH 0894/2040] Update implementation documentation again

---
 docs/features_implementation.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/features_implementation.md b/docs/features_implementation.md
index 4503197d..ae1ed270 100644
--- a/docs/features_implementation.md
+++ b/docs/features_implementation.md
@@ -12,16 +12,16 @@ OpenMoHAA is using OpenAL for the audio.
 
 The current operational status for each component is as follow:
 
-| Component               | Full | Almost | Half | Early | Bad | Not working | Comment                                                           |
-|-------------------------|------|--------|------|-------|-----|-------------|-------------------------------------------------------------------|
-| Audio                   | x    |        |      |       |     |             | Full implementation using OpenAL, some rare bugs can occur        |
-| CG Module               | x    |        |      |       |     |             | Some effects can be inaccurate compared to the original game      |
-| Client                  | x    |        |      |       |     |             |                                                                   |
-| Collision               | x    |        |      |       |     |             |                                                                   |
-| Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                   |
-| Renderer                | x    |        |      |       |     |             |                                                                   |
-| Server                  | x    |        |      |       |     |             |                                                                   |
-| Server module (fgame)   | x    |        |      |       |     |             | There might still be some AI/gameplay bugs                        |
-| UI                      | x    |        |      |       |     |             |                                                                   |
+| Component               | Full | Almost | Half | Early | Bad | Not working | Comment                                                             |
+|-------------------------|------|--------|------|-------|-----|-------------|---------------------------------------------------------------------|
+| Audio                   | x    |        |      |       |     |             | Full implementation using OpenAL                                    |
+| CG Module               | x    |        |      |       |     |             | Some effects can be inaccurate compared to the original game        |
+| Client                  | x    |        |      |       |     |             |                                                                     |
+| Collision               | x    |        |      |       |     |             |                                                                     |
+| Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                     |
+| Renderer                | x    |        |      |       |     |             |                                                                     |
+| Server                  | x    |        |      |       |     |             |                                                                     |
+| Server module (fgame)   | x    |        |      |       |     |             | There might still be some AI-related bugs remaining                 |
+| UI                      | x    |        |      |       |     |             |                                                                     |
 
 Full = code is fully working, however it doesn't mean it's bug-free.

From ddcd05adc63e22435a645fcc2cb410a443fd99fa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:10:25 +0200
Subject: [PATCH 0895/2040] Cancel other CodeQL actions on newer pushes

---
 .github/workflows/codeql.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b2ebb262..5068a534 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: '42 8 * * 1'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

From 41298b53d45f78e6b61a37abc74616f3244f0f16 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:35:14 +0200
Subject: [PATCH 0896/2040] Add PRODUCT_VERSION_STAGE variable to define the
 stage of the software through builds

---
 code/qcommon/q_version.cmake          | 5 +++++
 code/qcommon/q_version.generated.h.in | 1 +
 code/qcommon/q_version.h              | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/q_version.cmake b/code/qcommon/q_version.cmake
index 0c39924a..590d74e4 100644
--- a/code/qcommon/q_version.cmake
+++ b/code/qcommon/q_version.cmake
@@ -54,10 +54,15 @@ if(NOT GIT_REVISION_BUILD_NUMBER)
 	set(GIT_REVISION_BUILD_NUMBER 0)
 endif()
 
+if(NOT PRODUCT_VERSION_STAGE)
+	set(PRODUCT_VERSION_STAGE "unstable")
+endif()
+
 message(VERBOSE "Git branch: ${GIT_BRANCH_NAME}")
 message(VERBOSE "Git revision hash: ${GIT_REVISION_HASH}")
 message(VERBOSE "Git revision date: ${GIT_REVISION_DATE}")
 message(VERBOSE "Git revision build: ${GIT_REVISION_BUILD_NUMBER}")
+message(VERBOSE "Stage: ${PRODUCT_VERSION_STAGE}")
 
 configure_file("q_version.generated.h.in" "generated/q_version.generated.h")
 target_include_directories(qcommon_version INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/generated")
diff --git a/code/qcommon/q_version.generated.h.in b/code/qcommon/q_version.generated.h.in
index aceaafd7..7a4d720e 100644
--- a/code/qcommon/q_version.generated.h.in
+++ b/code/qcommon/q_version.generated.h.in
@@ -28,3 +28,4 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define GIT_REVISION_DATE_TIME "${GIT_REVISION_DATE_TIME}"
 #define GIT_REVISION_DATE "${GIT_REVISION_DATE}"
 #define GIT_REVISION_BUILD_NUMBER ${GIT_REVISION_BUILD_NUMBER}
+#define PRODUCT_VERSION_STAGE "${PRODUCT_VERSION_STAGE}"
\ No newline at end of file
diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 165f1261..7110b2d2 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PRODUCT_VERSION_MAJOR			0
 #define PRODUCT_VERSION_MINOR			71
 #define PRODUCT_VERSION_PATCH			0
-#define PRODUCT_VERSION_SUFFIX			"alpha"
+#define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 
 //
 // Generated version info

From c221cfd4931d71e03585ff73c90a43b89b39e81a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:21:25 +0200
Subject: [PATCH 0897/2040] Reorganize workflows and use multiple environments
 for different release stages

---
 .github/workflows/branches-build.yml          | 17 ++++++++++++
 .../workflows/{codeql.yml => main-codeql.yml} |  0
 .../{build-cmake.yml => shared-build.yml}     | 27 ++++++++++---------
 ...h-release.yml => tags-publish-release.yml} | 10 ++++---
 4 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/branches-build.yml
 rename .github/workflows/{codeql.yml => main-codeql.yml} (100%)
 rename .github/workflows/{build-cmake.yml => shared-build.yml} (94%)
 rename .github/workflows/{publish-release.yml => tags-publish-release.yml} (85%)

diff --git a/.github/workflows/branches-build.yml b/.github/workflows/branches-build.yml
new file mode 100644
index 00000000..c3fa846a
--- /dev/null
+++ b/.github/workflows/branches-build.yml
@@ -0,0 +1,17 @@
+name: Build branch
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-all:
+   uses: ./.github/workflows/shared-build.yml
+   with:
+      environment: "testing"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/main-codeql.yml
similarity index 100%
rename from .github/workflows/codeql.yml
rename to .github/workflows/main-codeql.yml
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/shared-build.yml
similarity index 94%
rename from .github/workflows/build-cmake.yml
rename to .github/workflows/shared-build.yml
index ae71b900..13561ffd 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/shared-build.yml
@@ -1,19 +1,16 @@
-name: Build
+name: Shared build workflow
 
 on:
-  push:
-    branches:
-      - '**'
-  pull_request:
   workflow_call:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    inputs:
+      environment:
+        required: true
+        type: string
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
 
 jobs:
   build-platform-linux:
@@ -30,7 +27,8 @@ jobs:
         ]
 
     name: "Building for platform linux-${{matrix.architecture.name}}"
-    runs-on: ubuntu-22.04
+    runs-on: "ubuntu-22.04"
+    environment: ${{ inputs.environment }}
 
     steps:
     - name: Settings
@@ -95,7 +93,8 @@ jobs:
         -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }} \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
-        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}
@@ -141,7 +140,8 @@ jobs:
         ]
 
     name: "Building for platform windows-${{matrix.architecture.name}}"
-    runs-on: windows-2022
+    runs-on: "windows-2022"
+    environment: ${{ inputs.environment }}
 
     steps:
     - name: Settings
@@ -212,7 +212,8 @@ jobs:
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' `
-        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
+        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/tags-publish-release.yml
similarity index 85%
rename from .github/workflows/publish-release.yml
rename to .github/workflows/tags-publish-release.yml
index af685159..54b22beb 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -6,7 +6,7 @@ on:
         - "v*.*.*"
 
 env:
-  RELEASE_TYPE: ${{ vars.RELEASE_TYPE || 'test' }}
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
   RELEASE_IS_PRERELEASE: ${{ vars.RELEASE_IS_PRELEASE }}
 
 permissions:
@@ -14,7 +14,9 @@ permissions:
 
 jobs:
   build-all:
-   uses: ./.github/workflows/build-cmake.yml
+   uses: ./.github/workflows/shared-build.yml
+   with:
+      environment: "release"
 
   deploy_all:
     strategy:
@@ -39,7 +41,7 @@ jobs:
         ]
 
     runs-on: ubuntu-22.04
-    environment: release
+    environment: "release"
     needs: [build-all]
 
     env:
@@ -58,6 +60,6 @@ jobs:
     - name: Release
       uses: softprops/action-gh-release@v2
       with:
-        name: '${{github.ref_name}}-${{env.RELEASE_TYPE}}'
+        name: '${{github.ref_name}}-${{env.RELEASE_STAGE}}'
         prerelease: ${{env.RELEASE_IS_PRERELEASE}}
         files: ${{github.workspace}}/${{ env.RELEASE_NAME }}.zip

From 4259053c7eb30ce316a720353c1863abf71bfadd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:49:38 +0200
Subject: [PATCH 0898/2040] Expose methods for basic DMA (when OpenAL is
 unavailable)

---
 code/client/new/snd_main_new.cpp | 25 +++++++++++++++++++++++++
 code/client/new/snd_public_new.h |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 58deebe1..2bb4aa37 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -592,4 +592,29 @@ void S_ReLoad(soundsystemsavegame_t* pSave) {
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_StopMovieAudio
+==============
+*/
+void S_StopMovieAudio() {
+}
+
+/*
+==============
+S_CurrentMoviePosition
+==============
+*/
+int S_CurrentMoviePosition() {
+    return 0;
+}
+
+/*
+==============
+S_SetupMovieAudio
+==============
+*/
+void S_SetupMovieAudio(const char* pszMovieName) {
+}
+
 #endif
diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h
index 30defc6a..4b98fb86 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -86,6 +86,10 @@ const char* S_GetMusicFilename();
 int S_GetMusicLoopCount();
 unsigned int S_GetMusicOffset();
 
+void S_StopMovieAudio();
+int S_CurrentMoviePosition();
+void S_SetupMovieAudio(const char* pszMovieName);
+
 #ifdef __cplusplus
 }
 #endif

From 08e09c3b4cfa63e13232169fc125cac3b1e2baf5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:55:02 +0200
Subject: [PATCH 0899/2040] Avoid setting variables with the same value

This prevents the console from being spammed with constant variable change when `developer` is set to 2
---
 code/cgame/cg_drawtools.cpp   | 14 +++++++++-----
 code/cgame/cg_local.h         |  1 +
 code/cgame/cg_main.c          |  3 +++
 code/cgame/cg_testemitter.cpp |  4 +++-
 code/client/cl_uiview3d.cpp   |  5 ++++-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index a416eede..21530ade 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -927,6 +927,8 @@ void CG_UpdateAttackerDisplay()
 
 void CG_UpdateCountdown()
 {
+    const char* message = "";
+
     if (!cg.snap) {
         return;
     }
@@ -937,15 +939,17 @@ void CG_UpdateCountdown()
         iSecondsLeft = (cgs.matchEndTime - cg.time) / 1000;
         if (iSecondsLeft >= 0) {
             iMinutesLeft = iSecondsLeft / 60;
-            cgi.Cvar_Set(
-                "ui_timemessage", va("%s %2i:%02i", cgi.LV_ConvertString("Time Left:"), iMinutesLeft, iSecondsLeft % 60)
-            );
+            message = va("%s %2i:%02i", cgi.LV_ConvertString("Time Left:"), iMinutesLeft, iSecondsLeft % 60);
         } else if (!cgs.matchEndTime) {
-            cgi.Cvar_Set("ui_timemessage", "");
+            message = "";
         }
     } else {
         // The match has not started yet
-        cgi.Cvar_Set("ui_timemessage", "Waiting For Players");
+        message = "Waiting For Players";
+    }
+
+    if (strcmp(ui_timemessage->string, message)) {
+        cgi.Cvar_Set("ui_timemessage", message);
     }
 }
 
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 660f34f8..fe9a05c2 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -503,6 +503,7 @@ extern "C" {
     extern cvar_t *voiceChat;
     extern cvar_t *cg_shadowscount;
     extern cvar_t *cg_shadowdebug;
+    extern cvar_t* ui_timemessage;
 
     //
     // cg_main.c
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 646fcbf5..e13d28c2 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -110,6 +110,7 @@ cvar_t *vm_lean_lower;
 cvar_t *voiceChat;
 cvar_t *cg_shadowscount;
 cvar_t *cg_shadowdebug;
+cvar_t *ui_timemessage;
 
 /*
 =================
@@ -197,6 +198,8 @@ void CG_RegisterCvars(void)
     vm_lean_lower                 = cgi.Cvar_Get("vm_lean_lower", "0.1", 0);
     voiceChat                     = cgi.Cvar_Get("cg_voicechat", "1", 0);
 
+    ui_timemessage = cgi.Cvar_Get("ui_timemessage", "", 0);
+
     // see if we are also running the server on this machine
     temp            = cgi.Cvar_Get("sv_running", "0", 0);
     cgs.localServer = temp->integer;
diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index c24f45bf..760cd55f 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -818,7 +818,9 @@ void CG_UpdateTestEmitter(void)
     emittertime_t *et = NULL;
 
     if (VectorCompare(te_vEmitterOrigin, vec_zero) || te_iNumCommands < 1) {
-        cgi.Cvar_Set("cg_te_mode_name", "Temp Emitter Off");
+        if (Q_stricmp(cg_te_mode_name->string, "Temp Emitter Off")) {
+            cgi.Cvar_Set("cg_te_mode_name", "Temp Emitter Off");
+        }
         return;
     }
 
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index f7826499..6a4ae43a 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -279,7 +279,10 @@ void View3D::DrawSubtitleOverlay(void)
             // Clear the subtitle
             fadeTime[i]      = 0;
             oldStrings[i][0] = 0;
-            Cvar_Set(va("subtitle%d", i), "");
+
+            if (subs[i]->string && subs[i]->string[0]) {
+                Cvar_Set(va("subtitle%d", i), "");
+            }
         }
     }
 

From 539688dd3d1a669d8c1a8a9b394a17bec4121c3b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:56:13 +0200
Subject: [PATCH 0900/2040] Reduced the delay to 33 ms (30 fps) to update the
 loading bar

This makes the loading bar smoother
---
 code/client/cl_ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index f3a2ac84..cd001530 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -5544,7 +5544,7 @@ void UI_LoadResource(const char *name)
         Cvar_SetValue("loadingbar", (float)currentLoadTime / (float)totalLoadTime);
     }
 
-    UI_TestUpdateScreen(333u);
+    UI_TestUpdateScreen(33);
 }
 
 /*

From 1b6bdd07e7886a3c0592d1d510c5c3db99cd9463 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 21:51:35 +0200
Subject: [PATCH 0901/2040] Disable function keys for UI

This fixes the issue where menus like the message mode can't be toggled
---
 code/client/cl_keys.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/client/cl_keys.cpp b/code/client/cl_keys.cpp
index c55cec43..f8b9396b 100644
--- a/code/client/cl_keys.cpp
+++ b/code/client/cl_keys.cpp
@@ -984,6 +984,8 @@ CL_InitKeyCommands
 */
 void CL_InitKeyCommands(void)
 {
+    int i;
+
     // register our functions
     Cmd_AddCommand("bind", Key_Bind_f);
     Cmd_AddCommand("unbind", Key_Unbind_f);
@@ -997,6 +999,10 @@ void CL_InitKeyCommands(void)
     Cmd_AddCommand("ctrlbindlist", Key_AltBindlist_f);
 
     memset(menubound, 0, sizeof(menubound));
+
+    for (i = K_F1; i <= K_F15; i++) {
+        menubound[i] = qtrue;
+    }
 }
 
 /*

From 6c2c8ca2b728c13db90faa674ba1ada29dedc039 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:10:33 +0200
Subject: [PATCH 0902/2040] Don't archive s_openaldevice and s_openaldriver

---
 code/client/snd_openal_new.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 4b724ccc..7ea0567b 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -550,7 +550,7 @@ qboolean S_OPENAL_Init()
     }
 
     s_milesdriver            = Cvar_Get("s_milesdriver", "auto", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
-    s_openaldevice           = Cvar_Get("s_openaldevice", "", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
+    s_openaldevice           = Cvar_Get("s_openaldevice", "", CVAR_SOUND_LATCH);
     s_reverb                 = Cvar_Get("s_reverb", "0", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
     s_show_cpu               = Cvar_Get("s_show_cpu", "0", 0);
     s_show_num_active_sounds = Cvar_Get("s_show_num_active_sounds", "0", 0);
@@ -560,7 +560,7 @@ qboolean S_OPENAL_Init()
     //
     // Added in OPM
     //  Initialize the AL driver DLL
-    s_openaldriver = Cvar_Get("s_openaldriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED);
+    s_openaldriver = Cvar_Get("s_openaldriver", ALDRIVER_DEFAULT, CVAR_LATCH | CVAR_PROTECTED);
 
     if (!QAL_Init(s_openaldriver->string)) {
         Com_Printf("Failed to load library: \"%s\".\n", s_openaldriver->string);

From 8fc6b6e3c3d7ce40e9a5abe673e40963addaff89 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:11:20 +0200
Subject: [PATCH 0903/2040] Correctly handle quick message and message mode for
 the chat window

This fixes the chat window not being put in quick message mode at all when intended, now it also correctly handle team/private message modes
---
 code/cgame/cg_ui.cpp     |  4 ++--
 code/client/cl_ui.cpp    | 12 +++++++-----
 code/uilib/uiconsole.cpp | 16 +++++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/code/cgame/cg_ui.cpp b/code/cgame/cg_ui.cpp
index 5644ed4d..9a47196c 100644
--- a/code/cgame/cg_ui.cpp
+++ b/code/cgame/cg_ui.cpp
@@ -62,8 +62,8 @@ void CG_MessageMode_Private_f(void)
         return;
     }
 
-    clientNum = atoi(cgi.Argv(1)) - 1;
-    if (clientNum < 0 || clientNum >= MAX_CLIENTS) {
+    clientNum = atoi(cgi.Argv(1));
+    if (clientNum < 1 || clientNum >= MAX_CLIENTS) {
         cgi.Printf(HUD_MESSAGE_CHAT_WHITE "Message Error: %s is a bad client number\n", cgi.Argv(1));
         return;
     }
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index cd001530..d0f38f16 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1017,7 +1017,7 @@ UI_DMMessageModesMatch
 */
 static qboolean UI_DMMessageModesMatch(int iMode)
 {
-    qboolean bQuickMessage;
+    qboolean bQuickMessage = qfalse;
 
     if (iMode && (iMode != 300 || dm_console->GetQuickMessageMode())) {
         if (iMode < 0) {
@@ -1048,13 +1048,15 @@ static void UI_SetDMConsoleMode(int iMode)
         return;
     }
 
+    bQuickMessage = qfalse;
+
     if (iMode < 0) {
         bQuickMessage = qtrue;
         iMode         = -iMode;
     }
 
     if (iMode == 300) {
-        bQuickMessage = dm_console->GetMessageMode();
+        iMode = dm_console->GetMessageMode();
     }
 
     if (dm_console->GetQuickMessageMode()) {
@@ -1064,8 +1066,8 @@ static void UI_SetDMConsoleMode(int iMode)
         }
     } else {
         if (bQuickMessage) {
-            dm_console->setFrame(getDefaultDMConsoleRectangle());
-            dm_console->SetQuickMessageMode(qfalse);
+            dm_console->setFrame(getQuickMessageDMConsoleRectangle());
+            dm_console->SetQuickMessageMode(bQuickMessage);
         }
     }
 
@@ -1086,7 +1088,7 @@ static void UI_SetDMConsoleMode(int iMode)
             dm_console->setTitle(Sys_LV_CL_ConvertString(
                 "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to All"
             ));
-        } else if (iMode == 100) {
+        } else if (iMode == 200) {
             dm_console->setTitle(Sys_LV_CL_ConvertString(
                 "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to Team"
             ));
diff --git a/code/uilib/uiconsole.cpp b/code/uilib/uiconsole.cpp
index 7529a171..2e1eb795 100644
--- a/code/uilib/uiconsole.cpp
+++ b/code/uilib/uiconsole.cpp
@@ -511,14 +511,11 @@ void UIConsole::Draw
 			return;
 		}
 
-		i = m_items[item].lines;
-		while (i < topitem) {
+		for (i = 0; i < topitem; i += m_items[item].lines) {
 			item = getNextItem(item);
 			if (item == -1) {
-				break;
+				return;
 			}
-
-			i += m_items[item].lines;
 		}
 
 		if (item == -1) {
@@ -1139,7 +1136,12 @@ void UIDMConsole::AddDMMessageText
 
 {
 	AddText(text, NULL);
-	uii.Snd_PlaySound("objective_text");
+
+	if (com_target_game->integer >= TG_MOHTA) {
+		uii.Snd_PlaySound("radio_click");
+	} else {
+		uii.Snd_PlaySound("objective_text");
+	}
 }
 
 void UIDMConsole::Draw
@@ -1422,7 +1424,7 @@ void UIFloatingDMConsole::FrameInitialized
 	UIFloatingWindow::FrameInitialized();
 
 	m_console = new UIDMConsole();
-	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "verdana-12");
+	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "facfont-20");
 
 	m_console->Connect(this, W_Deactivated, W_Deactivated);
 	setConsoleColor(m_consoleColor);

From 7c0f0672bde58865fff5f0f7db1d603fa1686eb9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:59:30 +0200
Subject: [PATCH 0904/2040] Add r_vidmode1024 and r_vidmodemax so the display
 resolution can be changed in Spearhead and Breakthrough

---
 code/renderer/tr_init.c  | 19 ++++++++++++++++++-
 code/renderer/tr_local.h |  3 +++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index fd6ae508..221d2b3d 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -119,6 +119,9 @@ cvar_t	*r_entlight_cubefraction;
 cvar_t	*r_entlight_maxcalc;
 cvar_t	*r_flares;
 cvar_t	*r_mode;
+cvar_t	*r_maxmode;
+cvar_t	*r_vidmode1024;
+cvar_t	*r_vidmodemax;
 cvar_t	*r_nobind;
 cvar_t	*r_singleShader;
 cvar_t	*r_lerpmodels;
@@ -1276,7 +1279,21 @@ void R_Register( void )
 	r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
+	r_maxmode = (int)ri.Cvar_Get("r_maxmode", "6", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmode1024 = (int)ri.Cvar_Get("r_vidmode1024", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmodemax = (int)ri.Cvar_Get("r_vidmodemax", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
+	
+	// Added in 2.0
+	//  But removed because it's kind of annoying
+	//if (r_mode->integer > r_maxmode->integer)
+	//{
+	//	char buf[8];
+	//
+	//	Com_sprintf(buf, sizeof(buf), "%d", r_maxmode->integer);
+	//	ri.Cvar_Set("r_mode", buf);
+	//	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
+	//}
 	r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
 	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 8c99edc1..a30d1c26 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1466,6 +1466,9 @@ extern	cvar_t	*r_nocurves;
 extern	cvar_t	*r_showcluster;
 
 extern cvar_t	*r_mode;				// video mode
+extern cvar_t	*r_maxmode;
+extern cvar_t	*r_vidmode1024;
+extern cvar_t	*r_vidmodemax;
 extern cvar_t	*r_fullscreen;
 extern cvar_t	*r_gamma;
 extern cvar_t	*r_displayRefresh;		// optional display refresh option

From 75a71d35ec4919115f8d0a94b48463a9dd379aac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 23:03:50 +0200
Subject: [PATCH 0905/2040] Avoid calling isspace with a character that has a
 value below 0

---
 code/sys/win_localization.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index fbda671c..915f6cd8 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -548,7 +548,7 @@ const char *cLocalization::ConvertString( const char *var )
 
 	i = 0;
 
-	while( !isspace( var[ i ] ) )
+	while( var[ i ] < 0 || !isspace( var[ i ] ) )
 	{
 		i++;
 		if( !var[ i ] ) {

From 1c7b561aa9e075f4d8318c7b2436ca5d34e7dcc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Sep 2024 23:51:39 +0200
Subject: [PATCH 0906/2040] Filter stufftext commands

This works by allowing the stufftext server command to be executed if the statement only contains whitelisted commands and variables
---
 code/cgame/cg_servercmds.c | 149 +++++++++++++++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 7 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 9f4ea4be..2c69636f 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,11 +26,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "../fgame/bg_voteoptions.h"
 
+static qboolean CG_IsStatementFiltered(char *cmd);
+
+/*
+================
+IsWeaponAllowed
+
+Returns true if the weapon is allowed
+================
+*/
 static const char *IsWeaponAllowed(int dmFlags, int flags)
 {
     return (dmFlags & flags) ? "0" : "1";
 }
 
+/*
+================
+QueryLandminesAllowed2
+
+Returns true if landmines is allowed by the map or by a dm flag
+================
+*/
 static qboolean QueryLandminesAllowed2(const char *mapname, int dmflags)
 {
     if (dmflags & DF_WEAPON_NO_LANDMINE) {
@@ -148,10 +164,10 @@ void CG_ParseServerinfo(void)
     cgi.Cvar_Set("cg_scoreboardpicover", Info_ValueForKey(info, "g_scoreboardpicover"));
     mapChecksumStr = Info_ValueForKey(info, "sv_mapChecksum");
     if (mapChecksumStr && mapChecksumStr[0]) {
-        cgs.mapChecksum = atoi(mapChecksumStr);
+        cgs.mapChecksum    = atoi(mapChecksumStr);
         cgs.useMapChecksum = qtrue;
     } else {
-        cgs.mapChecksum = 0;
+        cgs.mapChecksum    = 0;
         cgs.useMapChecksum = qfalse;
     }
 
@@ -311,12 +327,12 @@ static void CG_ServerCommand(qboolean modelOnly)
         }
         return;
     } else if (!strcmp(cmd, "printdeathmsg")) {
-        const char *s1, *s2, * attackerName, * victimName, *type;
+        const char *s1, *s2, *attackerName, *victimName, *type;
         const char *result1, *result2;
         int         hudColor;
 
-        result1 = NULL;
-        result2 = NULL;
+        result1      = NULL;
+        result2      = NULL;
         s1           = cgi.Argv(1);
         s2           = cgi.Argv(2);
         attackerName = cgi.Argv(3);
@@ -352,7 +368,14 @@ static void CG_ServerCommand(qboolean modelOnly)
     }
 
     if (!strcmp(cmd, "stufftext")) {
-        cgi.Cmd_Stuff(cgi.Argv(1));
+        char *cmd = cgi.Argv(1);
+        if (CG_IsStatementFiltered(cmd)) {
+            // Added in OPM
+            //  Don't execute filtered commands
+            return;
+        }
+
+        cgi.Cmd_Stuff(cmd);
         cgi.Cmd_Stuff("\n");
         return;
     }
@@ -429,3 +452,115 @@ void CG_ExecuteNewServerCommands(int latestSequence, qboolean differentServer)
         }
     }
 }
+
+//
+// List of client variables allowed to be changed by the server
+//
+static const char *whiteListedVariables[] = {
+    "r_fastsky", // some mods set this variable to make the sky uniform
+};
+
+//
+// List of commands allowed to be executed by the server
+//
+static const char *whiteListedCommands[] = {
+    "primarydmweapon",
+    "pushmenu",
+    "pushmenu_teamselect",
+    "pushmenu_weaponselect",
+    "popmenu",
+    "wait",
+    "globalwidgetcommand" // used for mods adding custom HUDs
+};
+
+/*
+====================
+CG_IsVariableFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsVariableFiltered(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_LEN(whiteListedVariables); i++) {
+        if (!Q_stricmp(name, whiteListedVariables[i])) {
+            return qfalse;
+        }
+    }
+
+    return qtrue;
+}
+
+/*
+====================
+CG_IsCommandFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsCommandFiltered(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_LEN(whiteListedCommands); i++) {
+        if (!Q_stricmp(name, whiteListedCommands[i])) {
+            return qfalse;
+        }
+    }
+
+    return qtrue;
+}
+
+/*
+====================
+CG_IsStatementFiltered
+
+Returns whether or not the statement is filtered
+====================
+*/
+static qboolean CG_IsStatementFiltered(char *cmd)
+{
+    const char *token;
+
+    for (token = COM_ParseExt(&cmd, qtrue); token[0]; token = COM_ParseExt(&cmd, qtrue)) {
+        if (token[0] == ';') {
+            continue;
+        }
+
+        if (!Q_stricmp(token, "set") || !Q_stricmp(token, "setu") || !Q_stricmp(token, "seta")
+            || !Q_stricmp(token, "sets")) {
+            //
+            // variable
+            //
+            token = COM_ParseExt(&cmd, qfalse);
+            if (token[0] == ';') {
+                continue;
+            }
+
+            if (CG_IsVariableFiltered(token)) {
+                return qtrue;
+            }
+        } else {
+            //
+            // normal command
+            //
+            if (CG_IsCommandFiltered(token)) {
+                return qtrue;
+            }
+        }
+
+        // Skip up to the next statement
+        while (cmd && cmd[0]) {
+            char c = cmd[0];
+
+            cmd++;
+            if (c == '\n' || c == ';') {
+                break;
+            }
+        }
+    }
+
+    return qfalse;
+}
\ No newline at end of file

From a010e648ee28ccad3930686e63fe910695492806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Noel?= <sebastien@twolife.be>
Date: Thu, 19 Sep 2024 10:52:47 +0200
Subject: [PATCH 0907/2040] Fix a few typos

---
 code/cgame/cg_commands.cpp               |  8 ++++----
 code/client/cl_main.cpp                  |  2 +-
 code/fgame/VehicleTank.cpp               |  2 +-
 code/fgame/actor.cpp                     |  4 ++--
 code/fgame/barrels.cpp                   |  2 +-
 code/fgame/beam.cpp                      |  2 +-
 code/fgame/entity.cpp                    | 12 ++++++------
 code/fgame/g_main.cpp                    |  4 ++--
 code/fgame/level.cpp                     |  4 ++--
 code/fgame/player.cpp                    |  6 +++---
 code/fgame/portableturret.cpp            |  4 ++--
 code/fgame/scriptthread.cpp              | 12 ++++++------
 code/fgame/sentient.cpp                  |  4 ++--
 code/fgame/weapturret.cpp                |  4 ++--
 code/gamespy/gstats/gp_stats/gp_stats.rc |  2 +-
 code/gamespy/sc/sciInterface.c           |  2 +-
 code/gamespy/webservices/AuthService.c   |  2 +-
 code/qcommon/files.cpp                   |  2 +-
 code/sys/sys_unix.c                      |  2 +-
 19 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 05440444..24376895 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -564,7 +564,7 @@ Event EV_Client_LoopSound
     EV_DEFAULT,
     "sFFf",
     "soundName volume min_distance pitch",
-    "Play the specifed sound as a looping sound"
+    "Play the specified sound as a looping sound"
 );
 Event EV_Client_Cache
 (
@@ -985,7 +985,7 @@ Event EV_Client_BounceDecal(
     "maxamount temporary",
     "Put a mark when the tempmodel bounces and hits a surface\n"
     "maxamount = Max amount of decals to make when bouncing\n"
-    "temporary = specify 1 for a temporary mark that only appears for a short time, 0 for a decal that stays aroung "
+    "temporary = specify 1 for a temporary mark that only appears for a short time, 0 for a decal that stays around "
     "longer (default is 0)\n"
 );
 Event EV_Client_SetDecalRadius
@@ -1122,7 +1122,7 @@ Event EV_Client_SetAlignStretch(
     EV_DEFAULT,
     "F",
     "scaleMultiplier",
-    "Aligns the temp model to the direction of travel, and stretches it betwen the last and current positions.\n"
+    "Aligns the temp model to the direction of travel, and stretches it between the last and current positions.\n"
 );
 Event EV_Client_SetClampVelocity
 (
@@ -3883,7 +3883,7 @@ void ClientGameCommandManager::PlaySound(
         } else {
             if (debugSound->integer) {
                 Com_Printf(
-                    "\nWARNING: OVERRIDE OVERRIDE OVERRIDESound %s had all its parm overriden by code.\n\n",
+                    "\nWARNING: OVERRIDE OVERRIDE OVERRIDESound %s had all its parm overridden by code.\n\n",
                     sound_name.c_str()
                 );
             }
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 4a535776..068d68e4 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1906,7 +1906,7 @@ void CL_InitDownloads(void) {
     if (FS_ComparePaks( missingfiles, sizeof( missingfiles ), qfalse ) )
     {
       // NOTE TTimo I would rather have that printed as a modal message box
-      //   but at this point while joining the game we don't know wether we will successfully join or not
+      //   but at this point while joining the game we don't know whether we will successfully join or not
       Com_Printf( "\nWARNING: You are missing some files referenced by the server:\n%s"
                   "You might not be able to join the game\n"
                   "Go to the setting menu to turn on autodownload, or get the file elsewhere\n\n", missingfiles );
diff --git a/code/fgame/VehicleTank.cpp b/code/fgame/VehicleTank.cpp
index a215a628..b336cbfb 100644
--- a/code/fgame/VehicleTank.cpp
+++ b/code/fgame/VehicleTank.cpp
@@ -503,7 +503,7 @@ void VehicleTank::UpdateSound()
 //  This method only work when called from script.
 //  But it is not called automatically when the player actually uses the vehicle
 //  when that vehicle is unlocked.
-//  So the other native method is overriden instead
+//  So the other native method is overridden instead
 /*
 void VehicleTank::AttachDriverSlot(Event *ev)
 {
diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 0c476ebb..78fc9bfd 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -558,7 +558,7 @@ Event EV_Actor_DamagePuff
     EV_DEFAULT,
     "vv",
     "position direction",
-    "Spawns a puff of 'blood' smoke at the speficied location in the specified direction.",
+    "Spawns a puff of 'blood' smoke at the specified location in the specified direction.",
     EV_NORMAL
 );
 Event EV_Actor_SetAngleYawSpeed
@@ -5646,7 +5646,7 @@ void Actor::EventSetMood(Event *ev)
 ===============
 Actor::EventDamagePuff
 
-Spawns a puff of 'blood' smoke at the speficied location in the specified direction.
+Spawns a puff of 'blood' smoke at the specified location in the specified direction.
 ===============
 */
 void Actor::EventDamagePuff(Event *ev)
diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp
index e23a0096..647ecf5d 100644
--- a/code/fgame/barrels.cpp
+++ b/code/fgame/barrels.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /*****************************************************************************
 /*QUAKED func_barrel (0 0.25 0.5) ? INDESTRUCTABLE
 Brush model barrel object
-Bashing only makes thunk or gong sounds (depending on wether it's full or not)
+Bashing only makes thunk or gong sounds (depending on whether it's full or not)
 Bullets and explosions effects are dependant apon the type of barrel.
 "barreltype" sets the type of barrel that it is. Valid settings are:
 - "water" makes the barrel be filled with water.
diff --git a/code/fgame/beam.cpp b/code/fgame/beam.cpp
index 65717b76..6163ce32 100644
--- a/code/fgame/beam.cpp
+++ b/code/fgame/beam.cpp
@@ -104,7 +104,7 @@ Event EV_FuncBeam_Minoffset
    EV_DEFAULT,
    "f",
    "min_offset",
-   "Set the minimun offset the beam can travel above, below, forward or back of it's endpoints",
+   "Set the minimum offset the beam can travel above, below, forward or back of it's endpoints",
 	EV_NORMAL
    );
 Event EV_FuncBeam_Overlap
diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index a3db0fdb..bd7ec1c4 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -768,7 +768,7 @@ Event EV_SetLight
     EV_DEFAULT,
     "ffff",
     "red green blue radius",
-    "Create a dynmaic light on this entity.",
+    "Create a dynamic light on this entity.",
     EV_NORMAL
 );
 
@@ -778,7 +778,7 @@ Event EV_LightOn
     EV_DEFAULT,
     NULL,
     NULL,
-    "Turn the configured dynmaic light on this entity on.",
+    "Turn the configured dynamic light on this entity on.",
     EV_NORMAL
 );
 Event EV_LightOff
@@ -805,7 +805,7 @@ Event EV_LightRed
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 Event EV_LightGreen
@@ -814,7 +814,7 @@ Event EV_LightGreen
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 Event EV_LightBlue
@@ -823,7 +823,7 @@ Event EV_LightBlue
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 Event EV_LightRadius
@@ -832,7 +832,7 @@ Event EV_LightRadius
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 1d947b9c..e69e55fd 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1095,11 +1095,11 @@ void G_ArchivePersistant(const char *name, qboolean loading)
 
         arc.ArchiveInteger(&version);
         if (version < PERSISTANT_VERSION) {
-            gi.Printf("Persistant data from an older version (%d) of MOHAA.\n", version);
+            gi.Printf("Persistent data from an older version (%d) of MOHAA.\n", version);
             arc.Close();
             return;
         } else if (version > PERSISTANT_VERSION) {
-            gi.DPrintf("Persistant data from newer version %d of MOHAA.\n", version);
+            gi.DPrintf("Persistent data from newer version %d of MOHAA.\n", version);
             arc.Close();
             return;
         }
diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index b0bbe7f4..5242d29f 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -391,7 +391,7 @@ Event EV_Level_GetRoundBased
     EV_DEFAULT,
     NULL,
     NULL,
-    "Gets wether or not the game is currently round based or not",
+    "Gets whether or not the game is currently round based or not",
     EV_GETTER
 );
 
@@ -401,7 +401,7 @@ Event EV_Level_GetObjectiveBased
     EV_DEFAULT,
     NULL,
     NULL,
-    "Gets wether or not the game is currently objective based or not",
+    "Gets whether or not the game is currently objective based or not",
     EV_GETTER
 );
 
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 5036e94b..bbcc7800 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -278,7 +278,7 @@ Event EV_Player_CorrectWeaponAttachments
     EV_CONSOLE,
     NULL,
     NULL,
-    "makes sure the weapons is properly attached when interupting a reload",
+    "makes sure the weapons is properly attached when interrupting a reload",
     EV_NORMAL
 );
 Event EV_Player_GiveCheat
@@ -1278,7 +1278,7 @@ Event EV_Player_SetPerferredWeapon
     EV_DEFAULT,
     "s",
     "weapon_name",
-    "Overrides your perferred weapon that is displayed in the stats screen.",
+    "Overrides your preferred weapon that is displayed in the stats screen.",
     EV_NORMAL
 );
 Event EV_Player_SetVoiceType
@@ -10728,7 +10728,7 @@ str Player::GetBattleLanguageCondition() const
     case 0:
         return "almost dead";
     case 1:
-        return "severly wounded";
+        return "severely wounded";
     case 2:
         return "wounded";
     case 3:
diff --git a/code/fgame/portableturret.cpp b/code/fgame/portableturret.cpp
index 2ac3bc4a..718d0bd0 100644
--- a/code/fgame/portableturret.cpp
+++ b/code/fgame/portableturret.cpp
@@ -215,7 +215,7 @@ void CarryableTurret::EventPlaceTurret(Event *ev)
 
         if (trace.startsolid || trace.fraction < 1 || trace.ent) {
             gi.DPrintf(
-                "~*~*~ Not enough room to auto place protable turret at (%i %i %i)\n",
+                "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n",
                 (int)origin[0],
                 (int)origin[1],
                 (int)origin[2]
@@ -243,7 +243,7 @@ void CarryableTurret::EventPlaceTurret(Event *ev)
 
         if (trace.startsolid || trace.fraction < 1) {
             gi.DPrintf(
-                "~*~*~ Not enough room to auto place protable turret at (%i %i %i)\n",
+                "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n",
                 (int)origin[0],
                 (int)origin[1],
                 (int)origin[2]
diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 62e48659..7929cc2a 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -957,7 +957,7 @@ Event EV_ScriptThread_HudDraw_VirtualSize
     EV_DEFAULT,
     "ii",
     "index virtual",
-    "Sets if the huddraw element for given player should use virutal screen resolution for positioning and size",
+    "Sets if the huddraw element for given player should use virtual screen resolution for positioning and size",
     EV_NORMAL
 );
 Event EV_ScriptThread_HudDraw_Color
@@ -1369,7 +1369,7 @@ Event EV_ScriptThread_iHudDrawVirtualSize
     EV_DEFAULT,
     "eii",
     "player index virtual",
-    "Sets if the huddraw element for given player should use virutal screen resolution for positioning and size",
+    "Sets if the huddraw element for given player should use virtual screen resolution for positioning and size",
     EV_NORMAL
 );
 Event EV_ScriptThread_IsArray
@@ -3882,7 +3882,7 @@ void ScriptThread::EventHudDrawAlign(Event *ev)
     } else if (h_align == "right") {
         h_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement h_align string for huddraw_align!\n");
+        throw ScriptException("Wrong alignment h_align string for huddraw_align!\n");
     }
 
     if (v_align == "top") {
@@ -3892,7 +3892,7 @@ void ScriptThread::EventHudDrawAlign(Event *ev)
     } else if (v_align == "bottom") {
         v_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement v_align string for huddraw_align!\n");
+        throw ScriptException("Wrong alignment v_align string for huddraw_align!\n");
     }
 
     HudDrawAlign(index, h_alignement, v_alignement);
@@ -5032,7 +5032,7 @@ void ScriptThread::EventIHudDrawAlign(Event *ev)
     } else if (h_align == "right") {
         h_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement h_align string for ihuddraw_align!\n");
+        throw ScriptException("Wrong alignment h_align string for ihuddraw_align!\n");
     }
 
     if (v_align == "top") {
@@ -5042,7 +5042,7 @@ void ScriptThread::EventIHudDrawAlign(Event *ev)
     } else if (v_align == "bottom") {
         v_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement v_align string for ihuddraw_align!\n");
+        throw ScriptException("Wrong alignment v_align string for ihuddraw_align!\n");
     }
 
     iHudDrawAlign(player->edict - g_entities, index, h_alignement, v_alignement);
diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index ddffc88a..43cabb62 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -193,7 +193,7 @@ Event EV_Sentient_UseItem
     EV_CONSOLE,
     "si",
     "name weapon_hand",
-    "Use the specified weapon or item in the hand choosen (optional).",
+    "Use the specified weapon or item in the hand chosen (optional).",
     EV_NORMAL
 );
 Event EV_Sentient_SetBloodModel
@@ -391,7 +391,7 @@ Event EV_Sentient_UseWeaponClass
     EV_CONSOLE,
     "sI",
     "name weapon_hand",
-    "Use the weapon of the specified class in the hand choosen (optional).",
+    "Use the weapon of the specified class in the hand chosen (optional).",
     EV_NORMAL
 );
 Event EV_Sentient_German
diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 00fc3fae..8ebd0586 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -73,7 +73,7 @@ Event EV_Turret_P_SetPlayerUsable
     EV_DEFAULT,
     "i",
     "state",
-    "Sets wether the turret can be used by players. 0 means no, 1 means yes.",
+    "Sets whether the turret can be used by players. 0 means no, 1 means yes.",
     EV_NORMAL
 );
 Event EV_Turret_AI_SetAimTarget
@@ -309,7 +309,7 @@ Event EV_Turret_SetUsable
     EV_DEFAULT,
     "i",
     "state",
-    "Sets wether the turret can be used as a weapon. 0 means no, 1 means yes.",
+    "Sets whether the turret can be used as a weapon. 0 means no, 1 means yes.",
     EV_NORMAL
 );
 Event EV_Turret_AI_SetBulletSpread
diff --git a/code/gamespy/gstats/gp_stats/gp_stats.rc b/code/gamespy/gstats/gp_stats/gp_stats.rc
index dee94b35..d0b03cff 100644
--- a/code/gamespy/gstats/gp_stats/gp_stats.rc
+++ b/code/gamespy/gstats/gp_stats/gp_stats.rc
@@ -90,7 +90,7 @@ BEGIN
     EDITTEXT        IDC_PASSWORD,65,50,110,12,ES_PASSWORD | ES_AUTOHSCROLL
     EDITTEXT        IDC_PROFILE_ID,65,65,110,12,ES_AUTOHSCROLL | ES_READONLY
     PUSHBUTTON      "Authenticate",IDC_AUTHENTICATE,35,85,50,14
-    GROUPBOX        "Persistant Data",IDC_STATIC,10,115,175,140
+    GROUPBOX        "Persistent Data",IDC_STATIC,10,115,175,140
     CONTROL         "Private Read/Write",IDC_PRIVATE_RW,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP,20,130,77,10
     CONTROL         "Private Read-Only",IDC_PRIVATE_RO,"Button",
diff --git a/code/gamespy/sc/sciInterface.c b/code/gamespy/sc/sciInterface.c
index 1bf05252..f572337c 100644
--- a/code/gamespy/sc/sciInterface.c
+++ b/code/gamespy/sc/sciInterface.c
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-// This is declared as an extern so it can be overriden when testing
+// This is declared as an extern so it can be overridden when testing
 #define SC_SERVICE_URL_FORMAT   "http://%s.comp.pubsvs." GSI_DOMAIN_NAME "/CompetitionService/CompetitionService.asmx"
 char scServiceURL[SC_SERVICE_MAX_URL_LEN] = "";
 
diff --git a/code/gamespy/webservices/AuthService.c b/code/gamespy/webservices/AuthService.c
index 0ad0ac51..11ecd459 100644
--- a/code/gamespy/webservices/AuthService.c
+++ b/code/gamespy/webservices/AuthService.c
@@ -51,7 +51,7 @@ const char WS_AUTHSERVICE_SIGNATURE_KEY[] =
 const char WS_AUTHSERVICE_SIGNATURE_EXP[] =
 	"010001";
 
-// This is declared as an extern so it can be overriden when testing
+// This is declared as an extern so it can be overridden when testing
 #define WS_LOGIN_SERVICE_URL_FORMAT   "https://%s.auth.pubsvs." GSI_DOMAIN_NAME "/AuthService/AuthService.asmx"
 char wsAuthServiceURL[WS_LOGIN_MAX_URL_LEN] = "";
 
diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index e8f9336b..0890fee7 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -293,7 +293,7 @@ typedef struct {
 static fileHandleData_t	fsh[MAX_FILE_HANDLES];
 
 // TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=540
-// wether we did a reorder on the current search path when joining the server
+// whether we did a reorder on the current search path when joining the server
 static qboolean fs_reordered;
 
 // never load anything from pk3 files that are not present at the server when pure
diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index cbbc0f6d..8fc99ee6 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -150,7 +150,7 @@ unsigned long sys_timeBase = 0;
 /* current time in ms, using sys_timeBase as origin
    NOTE: sys_timeBase*1000 + curtime -> ms since the Epoch
      0x7fffffff ms - ~24 days
-   although timeval:tv_usec is an int, I'm not sure wether it is actually used as an unsigned int
+   although timeval:tv_usec is an int, I'm not sure whether it is actually used as an unsigned int
      (which would affect the wrap period) */
 int curtime;
 int Sys_Milliseconds (void)

From 3e70a9fab88c17a2b5221f6a166291186bc98a41 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:19:58 +0200
Subject: [PATCH 0908/2040] Fix mistakes that lead to compilation errors

---
 code/renderer/tr_init.c   | 6 +++---
 code/renderer/tr_shader.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 221d2b3d..1598e419 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1279,9 +1279,9 @@ void R_Register( void )
 	r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_maxmode = (int)ri.Cvar_Get("r_maxmode", "6", CVAR_ARCHIVE | CVAR_LATCH);
-	r_vidmode1024 = (int)ri.Cvar_Get("r_vidmode1024", "1", CVAR_ARCHIVE | CVAR_LATCH);
-	r_vidmodemax = (int)ri.Cvar_Get("r_vidmodemax", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_maxmode = ri.Cvar_Get("r_maxmode", "6", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmode1024 = ri.Cvar_Get("r_vidmode1024", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmodemax = ri.Cvar_Get("r_vidmodemax", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
 	
 	// Added in 2.0
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 1500d2d4..68101a80 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -2440,7 +2440,7 @@ static qboolean ParseShader( char **text, qboolean picmip )
 				while (1) {
 					token = COM_ParseExt(text, qtrue);
 					if (!token[0]) {
-						ri.Printf(PRINT_WARNING, "WARNING: no matching #endif in shader '%s'\n", &shader);
+						ri.Printf(PRINT_WARNING, "WARNING: no matching #endif in shader '%s'\n", shader.name);
 						break;
 					}
 
@@ -2454,7 +2454,7 @@ static qboolean ParseShader( char **text, qboolean picmip )
 							ri.Printf(
 								PRINT_WARNING,
 								"WARNING: illegal #else after a previous #else in shader '%s'\n",
-								&shader);
+								shader.name);
 							break;
 						}
 

From 205709271b59fd2ed15ac18e906d06e0520dc339 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:24:04 +0200
Subject: [PATCH 0909/2040] Add fixes from upstream ioq3

---
 code/sdl/sdl_glimp.c | 215 +++++++++++++++++++++++--------------------
 code/sdl/sdl_input.c |   6 +-
 code/sys/sys_main.c  |  21 +++--
 code/sys/sys_unix.c  |  36 +++++++-
 code/sys/sys_win32.c |   7 ++
 5 files changed, 175 insertions(+), 110 deletions(-)

diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index af653d70..93e0f7cd 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -52,7 +52,7 @@ cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obta
 cvar_t *r_allowResize; // make window resizable
 cvar_t *r_centerWindow;
 cvar_t *r_sdlDriver;
-cvar_t *r_useOpenGLES;
+cvar_t *r_preferOpenGLES;
 
 int qglMajorVersion, qglMinorVersion;
 int qglesMajorVersion, qglesMinorVersion;
@@ -315,7 +315,8 @@ static qboolean GLimp_GetProcAddresses( qboolean fixedFunction ) {
 		} else {
 			Com_Error( ERR_FATAL, "Unsupported OpenGL Version (%s), OpenGL 1.1 is required", version );
 		}
-		// Add compression-related GL functions for the renderer
+		// Added in OPM
+		//  Add compression-related GL functions for the renderer
 		if ( QGL_VERSION_ATLEAST( 1, 3 ) ) {
 			QGL_1_3_PROCS;
 		}
@@ -398,6 +399,12 @@ GLimp_SetMode
 */
 static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qboolean fixedFunction)
 {
+	struct GLimp_ContextType {
+		int profileMask;
+		int majorVersion;
+		int minorVersion;
+	} contexts[4];
+	int numContexts, type;
 	const char *glstring;
 	int perChannelColorBits;
 	int colorBits, depthBits, stencilBits;
@@ -436,10 +443,11 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 		if( display < 0 )
 		{
 			ri.Printf( PRINT_DEVELOPER, "SDL_GetWindowDisplayIndex() failed: %s\n", SDL_GetError() );
+			display = 0;
 		}
 	}
 
-	if( display >= 0 && SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
+	if( SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
 	{
 		displayAspect = (float)desktopMode.w / (float)desktopMode.h;
 
@@ -528,6 +536,63 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 	stencilBits = r_stencilbits->value;
 	samples = r_ext_multisample->value;
 
+	numContexts = 0;
+
+	if ( !fixedFunction ) {
+		int profileMask;
+		qboolean preferOpenGLES;
+
+		SDL_GL_ResetAttributes();
+		SDL_GL_GetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, &profileMask );
+
+		preferOpenGLES = ( r_preferOpenGLES->integer == 1 ||
+		                 ( r_preferOpenGLES->integer == -1 && profileMask == SDL_GL_CONTEXT_PROFILE_ES ) );
+
+		if ( preferOpenGLES ) {
+#ifdef __EMSCRIPTEN__
+			// WebGL 2.0 isn't fully backward compatible so you have to ask for it specifically
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 3;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+#endif
+
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 2;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+		}
+
+		contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_CORE;
+		contexts[numContexts].majorVersion = 3;
+		contexts[numContexts].minorVersion = 2;
+		numContexts++;
+
+		contexts[numContexts].profileMask = 0;
+		contexts[numContexts].majorVersion = 2;
+		contexts[numContexts].minorVersion = 0;
+		numContexts++;
+
+		if ( !preferOpenGLES ) {
+#ifdef __EMSCRIPTEN__
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 3;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+#endif
+
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 2;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+		}
+	} else {
+		contexts[numContexts].profileMask = 0;
+		contexts[numContexts].majorVersion = 1;
+		contexts[numContexts].minorVersion = 1;
+		numContexts++;
+	}
+
 	for (i = 0; i < 16; i++)
 	{
 		int testColorBits, testDepthBits, testStencilBits;
@@ -660,116 +725,68 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 
 		SDL_SetWindowIcon( SDL_window, icon );
 
-		if (!fixedFunction)
-		{
-			int profileMask;
+		for ( type = 0; type < numContexts; type++ ) {
+			char contextName[32];
 
-			SDL_GL_GetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, &profileMask );
-
-			if ( r_useOpenGLES->integer == 1 || ( r_useOpenGLES->integer == -1 && profileMask == SDL_GL_CONTEXT_PROFILE_ES ) )
-			{
-				ri.Printf( PRINT_ALL, "Trying to get an OpenGL ES 2.0 context\n" );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 2 );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 0 );
-
-				SDL_glContext = SDL_GL_CreateContext( SDL_window );
-				if ( !SDL_glContext )
-				{
-					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext failed: %s\n", SDL_GetError() );
-				}
-				else
-				{
-					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext succeeded.\n" );
-
-					if ( !GLimp_GetProcAddresses( fixedFunction ) )
-					{
-						ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed for OpenGL ES 2.0 context\n" );
-						GLimp_ClearProcAddresses();
-						SDL_GL_DeleteContext( SDL_glContext );
-						SDL_glContext = NULL;
-					}
-				}
+			switch ( contexts[type].profileMask ) {
+				default:
+				case 0:
+					Com_sprintf( contextName, sizeof( contextName ), "OpenGL %d.%d",
+					             contexts[type].majorVersion, contexts[type].minorVersion );
+					break;
+				case SDL_GL_CONTEXT_PROFILE_CORE:
+					Com_sprintf( contextName, sizeof( contextName ), "OpenGL %d.%d Core",
+					             contexts[type].majorVersion, contexts[type].minorVersion );
+					break;
+				case SDL_GL_CONTEXT_PROFILE_ES:
+					Com_sprintf( contextName, sizeof( contextName ), "OpenGL ES %d.%d",
+					             contexts[type].majorVersion, contexts[type].minorVersion );
+					break;
 			}
 
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, contexts[type].profileMask );
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, contexts[type].majorVersion );
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, contexts[type].minorVersion );
+
+			SDL_glContext = SDL_GL_CreateContext( SDL_window );
 			if ( !SDL_glContext )
 			{
-				ri.Printf( PRINT_ALL, "Trying to get an OpenGL 3.2 core context\n" );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 3 );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 2 );
-
-				SDL_glContext = SDL_GL_CreateContext( SDL_window );
-				if ( !SDL_glContext )
-				{
-					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext failed: %s\n", SDL_GetError() );
-				}
-				else
-				{
-					const char *renderer;
-
-					ri.Printf( PRINT_ALL, "SDL_GL_CreateContext succeeded.\n" );
-
-					if ( GLimp_GetProcAddresses( fixedFunction ) )
-					{
-						renderer = (const char *)qglGetString( GL_RENDERER );
-					}
-					else
-					{
-						ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed for OpenGL 3.2 core context\n" );
-						renderer = NULL;
-					}
-
-					if ( !renderer || strstr( renderer, "Software Renderer" ) || strstr( renderer, "Software Rasterizer" ) )
-					{
-						if ( renderer )
-							ri.Printf(PRINT_ALL, "GL_RENDERER is %s, rejecting context\n", renderer);
-
-						GLimp_ClearProcAddresses();
-						SDL_GL_DeleteContext( SDL_glContext );
-						SDL_glContext = NULL;
-					}
-				}
-			}
-
-			if ( !SDL_glContext )
-			{
-				ri.Printf( PRINT_ALL, "Trying to get an OpenGL 2.0 context\n" );
-
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, 0 );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 2 );
-				SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 0 );
-			}
-		}
-		else
-		{
-			SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, 0 );
-			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 1 );
-			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 1 );
-
-			SDL_glContext = NULL;
-		}
-
-		if ( !SDL_glContext )
-		{
-			if( ( SDL_glContext = SDL_GL_CreateContext( SDL_window ) ) == NULL )
-			{
-				ri.Printf( PRINT_DEVELOPER, "SDL_GL_CreateContext failed: %s\n", SDL_GetError( ) );
-				SDL_DestroyWindow( SDL_window );
-				SDL_window = NULL;
+				ri.Printf( PRINT_ALL, "SDL_GL_CreateContext() for %s context failed: %s\n", contextName, SDL_GetError() );
 				continue;
 			}
 
 			if ( !GLimp_GetProcAddresses( fixedFunction ) )
 			{
-				ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed\n" );
+				ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() for %s context failed\n", contextName );
 				GLimp_ClearProcAddresses();
 				SDL_GL_DeleteContext( SDL_glContext );
 				SDL_glContext = NULL;
-				SDL_DestroyWindow( SDL_window );
-				SDL_window = NULL;
 				continue;
 			}
+
+			if ( contexts[type].profileMask == SDL_GL_CONTEXT_PROFILE_CORE ) {
+				const char *renderer;
+
+				renderer = (const char *)qglGetString( GL_RENDERER );
+
+				if ( !renderer || strstr( renderer, "Software Renderer" ) || strstr( renderer, "Software Rasterizer" ) )
+				{
+					ri.Printf( PRINT_ALL, "GL_RENDERER is %s, rejecting %s context\n", renderer, contextName );
+
+					GLimp_ClearProcAddresses();
+					SDL_GL_DeleteContext( SDL_glContext );
+					SDL_glContext = NULL;
+					continue;
+				}
+			}
+
+			break;
+		}
+
+		if ( !SDL_glContext ) {
+			SDL_DestroyWindow( SDL_window );
+			SDL_window = NULL;
+			continue;
 		}
 
 		qglClearColor( 0, 0, 0, 1 );
@@ -1059,7 +1076,7 @@ void GLimp_Init( qboolean fixedFunction )
 	r_sdlDriver = ri.Cvar_Get( "r_sdlDriver", "", CVAR_ROM );
 	r_allowResize = ri.Cvar_Get( "r_allowResize", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_centerWindow = ri.Cvar_Get( "r_centerWindow", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_useOpenGLES = ri.Cvar_Get( "r_useOpenGLES", "-1", CVAR_ARCHIVE | CVAR_LATCH );
+	r_preferOpenGLES = ri.Cvar_Get( "r_preferOpenGLES", "-1", CVAR_ARCHIVE | CVAR_LATCH );
 
 	if( ri.Cvar_VariableIntegerValue( "com_abnormalExit" ) )
 	{
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index a7fe9761..7059e6ce 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -59,6 +59,8 @@ static int in_eventTime = 0;
 
 static SDL_Window *SDL_window = NULL;
 
+#define CTRL(a) ((a)-'a'+1)
+
 /*
 ===============
 IN_PrintKey
@@ -213,6 +215,8 @@ static keyNum_t IN_TranslateSDLToQ3Key( SDL_Keysym *keysym, qboolean down )
 	}
 	else if (keysym->scancode == SDL_SCANCODE_GRAVE)
 	{
+		// Added in OPM
+		// so the console can be toggled properly
 		key = '`';
 	}
 	else
@@ -1016,7 +1020,7 @@ static void IN_ProcessEvents( void )
 
 				if( key == K_BACKSPACE )
 					Com_QueueEvent( in_eventTime, SE_CHAR, CTRL('h'), 0, 0, NULL );
-				else if (key == K_ENTER || key == K_TAB || key == K_ESCAPE) // mostly used by UINotepad
+				else if (key == K_ENTER || key == K_TAB || key == K_ESCAPE) // Added in OPM: mostly used by UINotepad
 					Com_QueueEvent( in_eventTime, SE_CHAR, key, 0, 0, NULL);
 				else if( keys[K_CTRL].down && key >= 'a' && key <= 'z' )
 					Com_QueueEvent( in_eventTime, SE_CHAR, CTRL(key), 0, 0, NULL );
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index c92f19a2..6508edce 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -31,6 +31,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <ctype.h>
 #include <errno.h>
 
+#ifdef __EMSCRIPTEN__
+#include <emscripten/emscripten.h>
+#endif
+
 #ifndef DEDICATED
 #ifdef USE_LOCAL_HEADERS
 #	include "SDL.h"
@@ -834,16 +838,13 @@ int main( int argc, char **argv )
 		}
 
 		containsSpaces = strchr(argv[i], ' ') != NULL;
-		//
-		// Seriously ioquake3, why? Why??
-		//
-		//if (containsSpaces)
-		//	Q_strcat( commandLine, sizeof( commandLine ), "\"" );
+		if (containsSpaces)
+			Q_strcat( commandLine, sizeof( commandLine ), "\"" );
 
 		Q_strcat( commandLine, sizeof( commandLine ), argv[ i ] );
 
-		//if (containsSpaces)
-		//	Q_strcat( commandLine, sizeof( commandLine ), "\"" );
+		if (containsSpaces)
+			Q_strcat( commandLine, sizeof( commandLine ), "\"" );
 
 		Q_strcat( commandLine, sizeof( commandLine ), " " );
 	}
@@ -859,7 +860,7 @@ int main( int argc, char **argv )
 
 	CON_Init( );
 	Com_Init( commandLine );
-	Sys_InitEx();
+	Sys_InitEx(); // Added in OPM
 	NET_Init( );
 
 	signal( SIGILL, Sys_SigHandler );
@@ -868,10 +869,14 @@ int main( int argc, char **argv )
 	signal( SIGTERM, Sys_SigHandler );
 	signal( SIGINT, Sys_SigHandler );
 
+#ifdef __EMSCRIPTEN__
+	emscripten_set_main_loop( Com_Frame, 0, 1 );
+#else
 	while( 1 )
 	{
 		Com_Frame( );
 	}
+#endif
 
 	return 0;
 }
diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index 8fc99ee6..7dc2eea1 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -67,10 +67,11 @@ char *Sys_DefaultHomePath(void)
 
 	if( !*homePath && com_homepath != NULL )
 	{
+#ifdef __APPLE__
 		if( ( p = getenv( "HOME" ) ) != NULL )
 		{
 			Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
-#ifdef __APPLE__
+
 			Q_strcat(homePath, sizeof(homePath),
 				"Library/Application Support/");
 
@@ -78,13 +79,44 @@ char *Sys_DefaultHomePath(void)
 				Q_strcat(homePath, sizeof(homePath), com_homepath->string);
 			else
 				Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_MACOSX);
+		}
 #else
+		if( ( p = getenv( "FLATPAK_ID" ) ) != NULL && *p != '\0' )
+		{
+			if( ( p = getenv( "XDG_DATA_HOME" ) ) != NULL && *p != '\0' )
+			{
+				Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
+			}
+			else if( ( p = getenv( "HOME" ) ) != NULL && *p != '\0' )
+			{
+				Com_sprintf(homePath, sizeof(homePath), "%s%c.local%cshare%c", p, PATH_SEP, PATH_SEP, PATH_SEP);
+			}
+
+			if( *homePath )
+			{
+				char *dir;
+
+				if(com_homepath->string[0])
+					dir = com_homepath->string;
+				else
+					dir = HOMEPATH_NAME_UNIX;
+
+				if(dir[0] == '.' && dir[1] != '\0')
+					dir++;
+
+				Q_strcat(homePath, sizeof(homePath), dir);
+			}
+		}
+		else if( ( p = getenv( "HOME" ) ) != NULL )
+		{
+			Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
+
 			if(com_homepath->string[0])
 				Q_strcat(homePath, sizeof(homePath), com_homepath->string);
 			else
 				Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_UNIX);
-#endif
 		}
+#endif
 	}
 
 	return homePath;
diff --git a/code/sys/sys_win32.c b/code/sys/sys_win32.c
index c2832a36..e7027ff5 100644
--- a/code/sys/sys_win32.c
+++ b/code/sys/sys_win32.c
@@ -20,6 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#ifdef _WIN32_WINNT_WINXP
+  // Use EnumProcesses() with Windows XP compatibility
+#  define PSAPI_VERSION 1
+#endif
+
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 #include "sys_local.h"
@@ -724,6 +729,8 @@ Display an error message
 */
 void Sys_ErrorDialog( const char *error )
 {
+	Sys_Print( va( "%s\n", error ) );
+
 	if( Sys_Dialog( DT_YES_NO, va( "%s. Copy console log to clipboard?", error ),
 			"Error" ) == DR_YES )
 	{

From f2e32c737be423cab0bf33275ab43d4dac42462c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:46:07 +0200
Subject: [PATCH 0910/2040] Fix the gap in the console between the bottom line
 and the text

---
 code/uilib/uiconsole.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/uilib/uiconsole.cpp b/code/uilib/uiconsole.cpp
index 2e1eb795..00aaa915 100644
--- a/code/uilib/uiconsole.cpp
+++ b/code/uilib/uiconsole.cpp
@@ -511,7 +511,7 @@ void UIConsole::Draw
 			return;
 		}
 
-		for (i = 0; i < topitem; i += m_items[item].lines) {
+		for (i = m_items[item].lines; i < topitem; i += m_items[item].lines) {
 			item = getNextItem(item);
 			if (item == -1) {
 				return;
@@ -527,21 +527,20 @@ void UIConsole::Draw
 		lines_drawn = 0;
 		while (lines_drawn < m_scroll->getPageHeight() + 1)
 		{
-			if (item != -1 && at_line >= m_items[item].lines)
-			{
+			while (at_line >= m_items[item].lines) {
+				item = getNextItem(item);
 				at_line = 0;
-				do {
-					item = getNextItem(item);
+				if (item == -1) {
+					break;
 				}
-				while (item != -1 && m_items[item].lines <= 0);
+			}
+
+			if (item == -1) {
+				break;
 			}
 
 			if (at_line >= 0)
 			{
-				if (item == -1) {
-					break;
-				}
-
 				if (at_line >= m_items[item].lines) {
 					break;
 				}

From f055162ac018b52add04158db68dc83e012653db Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:46:27 +0200
Subject: [PATCH 0911/2040] Adjust the quick message DM console rectangle to
 avoid seeing characters

---
 code/client/cl_ui.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index d0f38f16..3f5108b3 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1002,9 +1002,13 @@ static UIRect2D getQuickMessageDMConsoleRectangle(void)
         rect.size.height = f[3] + 50.0;
     } else {
         rect.pos.x       = 0;
-        rect.pos.y       = cls.glconfig.vidHeight * 0.65;
+        rect.pos.y       = cls.glconfig.vidHeight * 0.66;
         rect.size.width  = cls.glconfig.vidWidth;
-        rect.size.height = 38.0;
+        // Fixed in 2.0
+        //  Was 38.0 in 1.11 and below
+        //  This prevents characters to be seen from the DM console
+        //  in the quick message console
+        rect.size.height = 36.0;
     }
 
     return rect;

From 35d037daff4ecadd9fb1e3964e78798db3cea876 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:00:43 +0200
Subject: [PATCH 0912/2040] small detail change

---
 code/cgame/cg_local.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index fe9a05c2..05a3ef61 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -503,7 +503,7 @@ extern "C" {
     extern cvar_t *voiceChat;
     extern cvar_t *cg_shadowscount;
     extern cvar_t *cg_shadowdebug;
-    extern cvar_t* ui_timemessage;
+    extern cvar_t *ui_timemessage;
 
     //
     // cg_main.c

From e27c0716c48037ddb2a2d774eba4a4aee666f1c9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:07:44 +0200
Subject: [PATCH 0913/2040] Allow more stufftext commands when the local server
 is running

Those stufftext commands are primarily used by single-player maps and briefings
---
 code/cgame/cg_servercmds.c | 50 +++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 2c69636f..bccac93c 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
-Copyright (C) 2023-2024 the OpenMoHAA team
+Copyright (C) 2008-2024 the OpenMoHAA team
+Copyright (C) 1999-2005 Id Software, Inc.
 
 This file is part of OpenMoHAA source code.
 
@@ -458,8 +459,14 @@ void CG_ExecuteNewServerCommands(int latestSequence, qboolean differentServer)
 //
 static const char *whiteListedVariables[] = {
     "r_fastsky", // some mods set this variable to make the sky uniform
+    "ui_hud",
 };
 
+//
+// List of client variables allowed to be changed by the server
+//
+static const char *whiteListedLocalServerVariables[] = {"ui_hidemouse", "ui_showmouse", "cg_marks_add"};
+
 //
 // List of commands allowed to be executed by the server
 //
@@ -470,7 +477,23 @@ static const char *whiteListedCommands[] = {
     "pushmenu_weaponselect",
     "popmenu",
     "wait",
-    "globalwidgetcommand" // used for mods adding custom HUDs
+    "globalwidgetcommand", // used for mods adding custom HUDs
+    "tmstart",
+    "tmstartloop",
+    "tmstop",
+    "tmvolume"
+};
+
+//
+// List of commands allowed to be executed by the server
+//
+static const char *whiteListedLocalServerCommands[] = {
+    "spmap", // Used by briefings
+    "map",
+    "disconnect",
+    "cinematic",
+    "showmenu",
+    "hidemenu"
 };
 
 /*
@@ -490,6 +513,14 @@ static qboolean CG_IsVariableFiltered(const char *name)
         }
     }
 
+    if (cgs.localServer) {
+        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerVariables); i++) {
+            if (!Q_stricmp(name, whiteListedLocalServerVariables[i])) {
+                return qfalse;
+            }
+        }
+    }
+
     return qtrue;
 }
 
@@ -510,7 +541,20 @@ static qboolean CG_IsCommandFiltered(const char *name)
         }
     }
 
-    return qtrue;
+    if (cgs.localServer) {
+        // Allow more commands when the client is hosting the server
+        // Mostly used on single-player mode, like when briefings switch to the next map
+        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerCommands); i++) {
+            if (!Q_stricmp(name, whiteListedLocalServerCommands[i])) {
+                return qfalse;
+            }
+        }
+    }
+
+    //
+    // Test variables
+    //
+    return CG_IsVariableFiltered(name);
 }
 
 /*

From 78d564cc04884f3881d0d0575e21c9d2ef4e30d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:34:04 +0200
Subject: [PATCH 0914/2040] Fix CrateThink stopping when it shouldn't

---
 code/fgame/crateobject.cpp | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/code/fgame/crateobject.cpp b/code/fgame/crateobject.cpp
index b7393f1a..892ba879 100644
--- a/code/fgame/crateobject.cpp
+++ b/code/fgame/crateobject.cpp
@@ -419,40 +419,42 @@ void CrateObject::CrateThink(Event *ev)
     if (m_vJitterAngles[0] || m_vJitterAngles[2]) {
         setAngles(Vector(m_vStartAngles[0] * 2.0f, m_vStartAngles[1], m_vStartAngles[2] * 2.0f));
 
-        if (m_vJitterAngles[0] > 0.0f) {
-            m_vJitterAngles[0] -= 1 / 3 * m_fJitterScale;
+        if (m_vJitterAngles[0] > 0) {
+            m_vJitterAngles[0] -= 1.0 / 3.0 * m_fJitterScale;
 
-            if (m_vJitterAngles[0] > 0.0f) {
-                m_vJitterAngles[0] = 0.0f;
+            if (m_vJitterAngles[0] < 0) {
+                m_vJitterAngles[0] = 0;
             }
-        } else if (m_vJitterAngles[0] < 0.0f) {
-            m_vJitterAngles[0] += 1 / 3 * m_fJitterScale;
+        } else if (m_vJitterAngles[0] < 0) {
+            m_vJitterAngles[0] += 1.0 / 3.0 * m_fJitterScale;
 
-            if (m_vJitterAngles[0] < 0.0f) {
-                m_vJitterAngles[0] = 0.0f;
+            if (m_vJitterAngles[0] > 0) {
+                m_vJitterAngles[0] = 0;
             }
         }
 
         m_vJitterAngles[0] = -m_vJitterAngles[0];
 
-        if (m_vJitterAngles[2] > 0.0f) {
+        if (m_vJitterAngles[2] > 0) {
             m_vJitterAngles[2] -= 1 / 3 * m_fJitterScale;
 
-            if (m_vJitterAngles[2] > 0.0f) {
-                m_vJitterAngles[2] = 0.0f;
+            if (m_vJitterAngles[2] < 0) {
+                m_vJitterAngles[2] = 0;
             }
-        } else if (m_vJitterAngles[2] < 0.0f) {
-            m_vJitterAngles[2] += 1 / 3 * m_fJitterScale;
+        } else if (m_vJitterAngles[2] < 0) {
+            m_vJitterAngles[2] += 1.0 / 3.0 * m_fJitterScale;
 
-            if (m_vJitterAngles[2] < 0.0f) {
-                m_vJitterAngles[2] = 0.0f;
+            if (m_vJitterAngles[2] > 0) {
+                m_vJitterAngles[2] = 0;
             }
         }
 
         m_vJitterAngles[2] = -m_vJitterAngles[2];
-
-        PostEvent(EV_Crate_Think, 0.05f);
     } else if (!VectorCompare(angles, m_vStartAngles)) {
         setAngles(m_vStartAngles);
     }
+
+    if (m_vJitterAngles[0] || m_vJitterAngles[2]) {
+        PostEvent(EV_Crate_Think, 0.05f);
+    }
 }

From c97bc2e97720f3f7e559910f084ae4faee6d961e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:38:31 +0200
Subject: [PATCH 0915/2040] Add more clarity in crateobject.cpp

---
 code/fgame/crateobject.cpp | 51 ++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/code/fgame/crateobject.cpp b/code/fgame/crateobject.cpp
index 892ba879..ed36e516 100644
--- a/code/fgame/crateobject.cpp
+++ b/code/fgame/crateobject.cpp
@@ -132,13 +132,8 @@ void CrateObject::TellNeighborsToFall(void)
     Vector  vMins;
     Vector  vMaxs;
 
-    vMins[0] = mins[0] + origin[0] + 6.0f;
-    vMins[1] = mins[1] + origin[1] + 6.0f;
-    vMins[2] = mins[2] + origin[2] + 6.0f;
-
-    vMaxs[0] = maxs[0] + origin[0] - 6.0f;
-    vMaxs[1] = maxs[1] + origin[1] - 6.0f;
-    vMaxs[2] = maxs[2] + origin[2] + 12.0f;
+    vMins = origin + mins + Vector(6, 6, 6);
+    vMaxs = origin + maxs + Vector(-6, -6, 12);
 
     for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
         pNext = G_NextEntity(pEnt);
@@ -146,14 +141,20 @@ void CrateObject::TellNeighborsToFall(void)
         for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
             pNext = G_NextEntity(pEnt);
 
-            if (pEnt != this && pEnt->IsSubclassOfCrateObject()) {
-                if (vMins[0] <= absmax[0] && vMins[1] <= absmax[1] && vMins[2] <= absmax[2] && absmin[0] <= vMaxs[0]
-                    && absmin[1] <= vMaxs[1] && absmin[2] <= vMaxs[2]) {
-                    if (!pEnt->EventPending(EV_Crate_Start_Falling)) {
-                        float time = level.frametime + level.frametime;
-                        pEnt->PostEvent(EV_Crate_Start_Falling, time);
-                    }
-                }
+            if (pEnt == this) {
+                continue;
+            }
+            if (!pEnt->IsSubclassOfCrateObject()) {
+                continue;
+            }
+
+            if (vMins[0] > absmax[0] || vMins[1] > absmax[1] || vMins[2] > absmax[2] || absmin[0] > vMaxs[0]
+                || absmin[1] > vMaxs[1] || absmin[2] > vMaxs[2]) {
+                continue;
+            }
+
+            if (!pEnt->EventPending(EV_Crate_Start_Falling)) {
+                pEnt->PostEvent(EV_Crate_Start_Falling, level.frametime * 2);
             }
         }
     }
@@ -166,13 +167,8 @@ void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
     Vector  vMins;
     Vector  vMaxs;
 
-    vMins[0] = mins[0] + origin[0] + 6.0f;
-    vMins[1] = mins[1] + origin[1] + 6.0f;
-    vMins[2] = mins[2] + origin[2] + 6.0f;
-
-    vMaxs[0] = maxs[0] + origin[0] - 6.0f;
-    vMaxs[1] = maxs[1] + origin[1] - 6.0f;
-    vMaxs[2] = maxs[2] + origin[2] + 12.0f;
+    vMins = origin + mins + Vector(6, 6, 6);
+    vMaxs = origin + maxs + Vector(-6, -6, 12);
 
     for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
         CrateObject *crate = (CrateObject *)pEnt;
@@ -182,7 +178,6 @@ void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
         if (pEnt == this) {
             continue;
         }
-
         if (!pEnt->IsSubclassOfCrateObject()) {
             continue;
         }
@@ -192,7 +187,7 @@ void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
             continue;
         }
 
-        crate->m_vJitterAngles[0] = m_vJitterAngles[0] + vJitterAdd[0];
+        crate->m_vJitterAngles[0] += vJitterAdd[0];
 
         if (crate->m_vJitterAngles[0] > m_fJitterScale * 1.25f
             || -(m_fJitterScale * 1.25f) <= crate->m_vJitterAngles[0]) {
@@ -244,12 +239,8 @@ void CrateObject::CrateSetup(Event *ev)
             continue;
         }
 
-        if (vMins[0] <= pEnt->absmax[0]
-            && vMins[1] <= pEnt->absmax[1]
-            && vMins[2] <= pEnt->absmax[2]
-            && vMaxs[0] >= pEnt->absmin[0]
-            && vMaxs[1] >= pEnt->absmin[1]
-            && vMaxs[2] >= pEnt->absmin[2]) {
+        if (vMins[0] <= pEnt->absmax[0] && vMins[1] <= pEnt->absmax[1] && vMins[2] <= pEnt->absmax[2]
+            && vMaxs[0] >= pEnt->absmin[0] && vMaxs[1] >= pEnt->absmin[1] && vMaxs[2] >= pEnt->absmin[2]) {
             Com_Printf(
                 "^~^~^ WARNING: func_crate entities %i and %i have overlapping volumes near (%g %g %g) to (%g %g %g)\n",
                 entnum,

From 52c79f7f77a2de8833d0286abf288c0704cc7426 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:49:33 +0200
Subject: [PATCH 0916/2040] Make crates correctly fall

---
 code/fgame/crateobject.cpp | 46 ++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/code/fgame/crateobject.cpp b/code/fgame/crateobject.cpp
index ed36e516..2b161b2e 100644
--- a/code/fgame/crateobject.cpp
+++ b/code/fgame/crateobject.cpp
@@ -137,25 +137,20 @@ void CrateObject::TellNeighborsToFall(void)
 
     for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
         pNext = G_NextEntity(pEnt);
+        if (pEnt == this) {
+            continue;
+        }
+        if (!pEnt->IsSubclassOfCrateObject()) {
+            continue;
+        }
 
-        for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
-            pNext = G_NextEntity(pEnt);
+        if (vMins[0] > pEnt->absmax[0] || vMins[1] > pEnt->absmax[1] || vMins[2] > pEnt->absmax[2]
+            || pEnt->absmin[0] > vMaxs[0] || pEnt->absmin[1] > vMaxs[1] || pEnt->absmin[2] > vMaxs[2]) {
+            continue;
+        }
 
-            if (pEnt == this) {
-                continue;
-            }
-            if (!pEnt->IsSubclassOfCrateObject()) {
-                continue;
-            }
-
-            if (vMins[0] > absmax[0] || vMins[1] > absmax[1] || vMins[2] > absmax[2] || absmin[0] > vMaxs[0]
-                || absmin[1] > vMaxs[1] || absmin[2] > vMaxs[2]) {
-                continue;
-            }
-
-            if (!pEnt->EventPending(EV_Crate_Start_Falling)) {
-                pEnt->PostEvent(EV_Crate_Start_Falling, level.frametime * 2);
-            }
+        if (!pEnt->EventPending(EV_Crate_Start_Falling)) {
+            pEnt->PostEvent(EV_Crate_Start_Falling, level.frametime * 2);
         }
     }
 }
@@ -182,8 +177,8 @@ void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
             continue;
         }
 
-        if (vMins[0] > absmax[0] || vMins[1] > absmax[1] || vMins[2] > absmax[2] || absmin[0] > vMaxs[0]
-            || absmin[1] > vMaxs[1] || absmin[2] > vMaxs[2]) {
+        if (vMins[0] > pEnt->absmax[0] || vMins[1] > pEnt->absmax[1] || vMins[2] > pEnt->absmax[2]
+            || pEnt->absmin[0] > vMaxs[0] || pEnt->absmin[1] > vMaxs[1] || pEnt->absmin[2] > vMaxs[2]) {
             continue;
         }
 
@@ -267,9 +262,11 @@ void CrateObject::CrateDebrisType(Event *ev)
 
 void CrateObject::StartFalling(Event *ev)
 {
-    setMoveType(MOVETYPE_FLY);
     m_fMoveTime = 0;
 
+    setMoveType(MOVETYPE_TOSS);
+    setSolidType(SOLID_BBOX);
+
     PostEvent(EV_Crate_Think, level.frametime);
 
     if (!(spawnflags & CRATE_NOTSTACKEDON)) {
@@ -283,12 +280,13 @@ void CrateObject::CrateFalling(Event *ev)
         m_fMoveTime = level.time + 2.0f;
     }
 
-    if (level.time <= m_fMoveTime) {
+    if (m_fMoveTime >= level.time) {
         PostEvent(EV_Crate_Think, level.frametime);
-    } else {
-        setMoveType(MOVETYPE_PUSH);
-        setSolidType(SOLID_BSP);
+        return;
     }
+
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_BSP);
 }
 
 void CrateObject::CrateDamaged(Event *ev)

From 047a7bb949fef3a036f854c0df68109038b846ec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:00:22 +0200
Subject: [PATCH 0917/2040] Deprecate r_forceClampToEdge in favor of automatic
 detection

This avoids setting the variable manually to fix sky seams and weird graphical artifacts. Now, it's detected automatically
---
 code/renderer/tr_backend.c |  2 +-
 code/renderer/tr_init.c    |  6 +++++-
 code/renderer/tr_shader.c  | 10 +++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index d518a438..e84b41ec 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -448,7 +448,7 @@ void GL_State( unsigned long stateBits )
 	{
 		float clampValue;
 
-		if (r_forceClampToEdge->value)
+		if (haveClampToEdge)
 		{
 			if (stateBits & GLS_CLAMP_EDGE) {
 				clampValue = GL_CLAMP_TO_EDGE;
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 1598e419..0a90a396 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -336,6 +336,10 @@ static void InitOpenGL( void )
 		{
 			glConfig.maxTextureSize = 0;
 		}
+
+		if (haveClampToEdge) {
+			ri.Cvar_Set("r_forceClampToEdge", "1");
+		}
 	}
 
 	// init command buffers and SMP
@@ -1259,7 +1263,7 @@ void R_Register( void )
 	r_ext_texture_env_combine = ri.Cvar_Get("r_ext_texture_env_combine", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_ext_max_anisotropy = ri.Cvar_Get("r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH);
-	r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ROM);
 	r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
 	r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
 
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 68101a80..623a5c93 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -894,7 +894,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 			int clampx, clampy;
 
 			if (!token[8]) {
-				if (!r_forceClampToEdge->value) {
+				if (!haveClampToEdge) {
 					clampx = GL_CLAMP;
 					clampy = GL_CLAMP;
 				}
@@ -906,7 +906,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 			else {
 				if (token[8] == 'x')
 				{
-					if (!r_forceClampToEdge->value) {
+					if (!haveClampToEdge) {
 						clampx = GL_CLAMP;
 					}
 					else {
@@ -917,7 +917,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 				else if (token[8] == 'y')
 				{
 					clampx = GL_CLAMP;
-					if (!r_forceClampToEdge->value) {
+					if (!haveClampToEdge) {
 						clampy = GL_CLAMP;
 					}
 					else {
@@ -1966,7 +1966,7 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			if (!r_forceClampToEdge->integer) {
+			if (!haveClampToEdge) {
 				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
 			}
 			else {
@@ -3355,7 +3355,7 @@ shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage
 	//
 	Q_strncpyz( fileName, name, sizeof( fileName ) );
 	COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" );
-    if (!r_forceClampToEdge->value) {
+    if (!haveClampToEdge) {
         image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
 	}
     else {

From 20d11f5f972e247821235dbb2a9df22f6aacaa72 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:02:04 +0200
Subject: [PATCH 0918/2040] Add max_amount parameter to the
 EV_Sentient_GiveAmmo documentation

---
 code/fgame/sentient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 43cabb62..d1eec6ca 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -146,8 +146,8 @@ Event EV_Sentient_GiveAmmo
 (
     "ammo",
     EV_DEFAULT,
-    "si",
-    "type amount",
+    "siI",
+    "type amount max_amount",
     "Gives the sentient some ammo.",
     EV_NORMAL
 );

From 0049348de56188a990ba63f26009984219d89b6a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:05:39 +0200
Subject: [PATCH 0919/2040] Update features documentation

---
 docs/features.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/features.md b/docs/features.md
index a8f4ea08..3a77c8c3 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -11,6 +11,11 @@ A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, gre
 - Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
 - Demo recording
 
+### Client-side
+
+- OpenAL and SDL are used
+- Stufftext protection: commands that the server want clients to execute are now filtered
+
 ### Server-side
 
 - Bots

From 17d623bf85d74a81a3fcc2cbb9c9a399140c0a21 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:23:19 +0200
Subject: [PATCH 0920/2040] Add more clarity + check the length of the
 const_str enumeration and the length of the const string array to make sure
 they both match

---
 code/fgame/scriptmaster.cpp | 9 ++++++---
 code/qcommon/const_str.h    | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index b036e08e..815f214f 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -399,12 +399,12 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/no_anim_killed.scr",
     "mg42",
     "mp40",
+    // Added in 2.0
     "auto",
     "both",
+    // Added in 2.30
     "runandshoot",
-    //
     // Added in OPM
-    //
     "respawn",
     "viewmodelanim_done"
 };
@@ -525,8 +525,11 @@ void ScriptMaster::InitConstStrings(void)
     const_str                       name;
     unsigned int                    eventnum;
     con_map_enum<Event *, EventDef> en;
+    int                             i;
 
-    for (int i = 0; i < sizeof(ConstStrings) / sizeof(ConstStrings[0]); i++) {
+    static_assert(ARRAY_LEN(ConstStrings) == (STRING_LENGTH_ - 1), "Constant strings don't match. Make sure the 'const_str' enum match with the 'ConstStrings' string array");
+
+    for (i = 0; i < ARRAY_LEN(ConstStrings); i++) {
         AddString(ConstStrings[i]);
     }
 
diff --git a/code/qcommon/const_str.h b/code/qcommon/const_str.h
index 4f055cd3..43b3070c 100644
--- a/code/qcommon/const_str.h
+++ b/code/qcommon/const_str.h
@@ -306,14 +306,16 @@ enum {
     STRING_ANIM_NO_KILLED_SCR,
     STRING_MG42,
     STRING_MP40,
+    // Added in 2.0
     STRING_AUTO,
     STRING_BOTH,
+    // Added in 2.30
     STRING_RUNANDSHOOT,
-    //
-    // Openmohaa additions
-    //
+    // Added in OPM
     STRING_RESPAWN,
     STRING_VIEWMODELANIM_DONE,
+
+    // The number of strings
     STRING_LENGTH_
 };
 

From 015ebb650e8509453114e30179aec54a5053f1c9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 22:50:33 +0200
Subject: [PATCH 0921/2040] Clean up ClassDef class

---
 code/qcommon/class.h | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/code/qcommon/class.h b/code/qcommon/class.h
index 7dd14ccf..47f8f38b 100644
--- a/code/qcommon/class.h
+++ b/code/qcommon/class.h
@@ -190,15 +190,12 @@ public:
     static ClassDef *classlist;
     static int       numclasses;
 
-    static void BuildEventResponses();
-
-    void BuildResponseList();
-
     static int                   dump_numclasses;
     static int                   dump_numevents;
     static Container<int>        sortedList;
     static Container<ClassDef *> sortedClassList;
 
+public:
     ClassDef();
     ~ClassDef();
 
@@ -223,28 +220,17 @@ public:
         void *(*newInstance)(void),
         int classSize
     );
-    void CreateInternal(
-        const char         *classname,
-        const char         *classID,
-        const char         *superclass,
-        ResponseDef<Class> *responses,
-        void *(*newInstance)(void),
-        int classSize
-    );
-    void CreateInternalWin(
-        const char         *classname,
-        const char         *classID,
-        const char         *superclass,
-        ResponseDef<Class> *responses,
-        void *(*newInstance)(void),
-        int classSize
-    );
 
     EventDef *GetDef(int eventnum);
     EventDef *GetDef(Event *ev);
     int       GetFlags(Event *event);
 
     void Destroy();
+
+public:
+    static void BuildEventResponses();
+
+    void BuildResponseList();
 };
 
 ClassDef *getClassList(void);

From 13710904ba5d661dc8dbcbd3997354e42f8e9bef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:45:15 +0200
Subject: [PATCH 0922/2040] Update getting started installation

---
 docs/getting_started_installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 5f366f2b..8720ec5c 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -4,7 +4,7 @@ Ensure that you download the binaries compatible with your platform in the relea
 
 ## Requirements
 
-- A valid MOH:AA installation
+- A valid MOH:AA installation, a MOH:AA Warchest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest)
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 may be required.
 
 ## System requirements

From 61b4a817f3d43ca3e1e6b2cbc11a28d8b0a00447 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 18:45:24 +0200
Subject: [PATCH 0923/2040] Move alloca include directive to q_platform.h due
 to difference between platforms

---
 code/qcommon/q_platform.h | 7 +++++++
 code/server/sv_game.c     | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index a47f6739..392fb3e4 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -86,6 +86,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define DLL_SUFFIX
 #endif
 
+// alloca
+#ifdef _MSC_VER
+#  include <malloc.h>
+#else
+#  include <alloca.h>
+#endif
+
 #if defined(_WIN64) || defined(__WIN64__)
 
 #undef idx64
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 14df8cc3..449e50dc 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -30,9 +30,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/crc.h"
 #include "../qcommon/alias.h"
 
-// alloca
-#include <malloc.h>
-
 debugline_t *DebugLines;
 int numDebugLines;
 debugstring_t *DebugStrings;

From 08c51864268006380111162475f8592c6d7da5ed Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:55:06 +0200
Subject: [PATCH 0924/2040] Use stdlib.h as malloc.h is deprecated

---
 code/sys/win_bounds.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sys/win_bounds.cpp b/code/sys/win_bounds.cpp
index 7d8029cb..70e1c9a4 100644
--- a/code/sys/win_bounds.cpp
+++ b/code/sys/win_bounds.cpp
@@ -64,7 +64,7 @@ extern "C"
 
 #ifdef DISABLE_BOUNDS
 
-#include <malloc.h>
+#include <stdlib.h>
 
 void* b_malloc(unsigned int size)
 {

From 1156d4f881ed4aae439315d660a1da2a60caf5b3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:28:36 +0200
Subject: [PATCH 0925/2040] Replaced (u)int64_t with long long to avoid
 constructor conflicts with some compilers

---
 code/qcommon/str.h | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/code/qcommon/str.h b/code/qcommon/str.h
index 1b9ee285..86eac5a1 100644
--- a/code/qcommon/str.h
+++ b/code/qcommon/str.h
@@ -90,9 +90,11 @@ public:
     str(const char ch);
     str(const int num);
     str(const float num);
-    str(const unsigned num);
-    str(const int64_t num);
-    str(const uint64_t num);
+    str(const unsigned int num);
+    str(const long num);
+    str(const unsigned long num);
+    str(const long long num);
+    str(const unsigned long long num);
 
     size_t      length(void) const;
     const char *c_str(void) const;
@@ -311,7 +313,7 @@ inline str::str(const int num)
     m_data->len = len;
 }
 
-inline str::str(const unsigned num)
+inline str::str(const unsigned int num)
     : m_data(NULL)
 {
     char   text[32];
@@ -324,26 +326,52 @@ inline str::str(const unsigned num)
     m_data->len = len;
 }
 
-inline str::str(const int64_t num)
+inline str::str(const long num)
     : m_data(NULL)
 {
     char   text[64];
     size_t len;
 
-    sprintf(text, "%" PRId64 "", num);
+    sprintf(text, "%ld", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
     m_data->len = len;
 }
 
-inline str::str(const uint64_t num)
+inline str::str(const unsigned long num)
     : m_data(NULL)
 {
     char   text[64];
     size_t len;
 
-    sprintf(text, "%" PRIu64 "", num);
+    sprintf(text, "%lu", num);
+    len = strlen(text);
+    EnsureAlloced(len + 1);
+    strcpy(m_data->data, text);
+    m_data->len = len;
+}
+
+inline str::str(const long long num)
+    : m_data(NULL)
+{
+    char   text[64];
+    size_t len;
+
+    sprintf(text, "%lld", num);
+    len = strlen(text);
+    EnsureAlloced(len + 1);
+    strcpy(m_data->data, text);
+    m_data->len = len;
+}
+
+inline str::str(const unsigned long long num)
+    : m_data(NULL)
+{
+    char   text[64];
+    size_t len;
+
+    sprintf(text, "%llu", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);

From 8b19d000867ef6cfebbd8cbca1461e17b112730c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:29:15 +0200
Subject: [PATCH 0926/2040] Remove the last OpenAL linking as it's already
 linked before

---
 code/client/CMakeLists.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index ff7660c8..f98186ff 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -56,14 +56,4 @@ add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
 target_link_libraries(omohclient INTERFACE mad)
 set(BUILD_SHARED_LIBS ${OLD_VALUE} CACHE BOOL "" FORCE)
 
-if (USE_OPENAL)
-	# Try to use OpenAL
-	find_package(OpenAL)
-	if (OPENAL_FOUND)
-		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1)
-		target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR}/AL)
-		target_link_libraries(omohclient INTERFACE ${OPENAL_LIBRARY})
-	endif()
-endif()
-
 target_sources(omohclient INTERFACE ${SOURCES_CLIENT} ${SOURCES_UILIB})

From a69d9d4483b9393aa89a7f06422fed6319b2d9ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:31:27 +0200
Subject: [PATCH 0927/2040] Fix compilation errors for MacOS, and add support
 for MacOS

---
 code/client/snd_openal_new.cpp |  2 +-
 code/fgame/CMakeLists.txt      | 20 ++++++++++++++++++--
 code/sys/CMakeLists.txt        | 14 +++++++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 7ea0567b..4aaf04e7 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -122,7 +122,7 @@ static ALuint S_OPENAL_Format(int width, int channels);
 #elif defined(_WIN32)
 #    define ALDRIVER_DEFAULT "OpenAL32.dll"
 #elif defined(__APPLE__)
-#    define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+#    define ALDRIVER_DEFAULT "libopenal.1.dylib"
 #elif defined(__OpenBSD__)
 #    define ALDRIVER_DEFAULT "libopenal.so"
 #else
diff --git a/code/fgame/CMakeLists.txt b/code/fgame/CMakeLists.txt
index c688fa85..5e877d46 100644
--- a/code/fgame/CMakeLists.txt
+++ b/code/fgame/CMakeLists.txt
@@ -27,8 +27,24 @@ file(
 
 add_library(fgame SHARED ${SOURCES_GAME})
 
-find_package(BISON)
-find_package(FLEX)
+#
+# Workaround to get a recent version Flex and Bison executables in MacOS
+# as Bison 2.3 shipped with MacOS doesn't work
+#
+if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
+    execute_process(COMMAND brew --prefix bison RESULT_VARIABLE APP_RESULT OUTPUT_VARIABLE APP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (APP_RESULT EQUAL 0 AND EXISTS "${APP_PREFIX}")
+        set(BISON_EXECUTABLE "${APP_PREFIX}/bin/bison")
+    endif()
+
+    execute_process(COMMAND brew --prefix flex RESULT_VARIABLE APP_RESULT OUTPUT_VARIABLE APP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (APP_RESULT EQUAL 0 AND EXISTS "${APP_PREFIX}")
+        set(FLEX_EXECUTABLE "${APP_PREFIX}/bin/flex")
+    endif()
+endif()
+
+find_package(BISON 3 REQUIRED)
+find_package(FLEX REQUIRED)
 
 if (FLEX_FOUND)
 	flex_target(fgame-lexer ${CMAKE_SOURCE_DIR}/code/parser/lex_source.txt ${CMAKE_SOURCE_DIR}/code/parser/generated/yyLexer.cpp DEFINES_FILE ${CMAKE_SOURCE_DIR}/code/parser/generated/yyLexer.h COMPILE_FLAGS "-Cem --nounistd")
diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 47199537..ed9f31d0 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -31,6 +31,10 @@ else()
 	)
 endif()
 
+if (APPLE)
+	set(SOURCES_PLATFORM_SPECIFIC ${SOURCES_PLATFORM_SPECIFIC} "${CMAKE_SOURCE_DIR}/code/sys/sys_osx.m")
+endif()
+
 add_library(syslib INTERFACE)
 target_sources(syslib INTERFACE ${SOURCES_PLATFORM_SPECIFIC})
 target_compile_features(syslib INTERFACE cxx_nullptr)
@@ -43,6 +47,14 @@ if(WIN32)
 elseif(UNIX)
 	find_package(Threads)
 	target_link_libraries(syslib INTERFACE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-	target_link_libraries(syslib INTERFACE m rt)
+	target_link_libraries(syslib INTERFACE m)
 	target_link_libraries(syslib INTERFACE stdc++)
+endif()
+
+if (APPLE)
+	find_library(COCOA_LIBRARY Cocoa)
+	target_link_libraries(syslib INTERFACE ${COCOA_LIBRARY})
+	target_link_libraries(syslib INTERFACE "-framework Foundation")
+	target_link_libraries(syslib INTERFACE objc)
+	set_target_properties(syslib PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")
 endif()
\ No newline at end of file

From f9d264058bb70104dd3bda0d239a6278daee8dad Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 21:53:48 +0200
Subject: [PATCH 0928/2040] Use safe version of sprintf and strcpy

---
 code/cgame/cg_commands.cpp            | 12 ++--
 code/cgame/cg_consolecmds.c           |  6 +-
 code/cgame/cg_drawtools.cpp           |  2 +-
 code/cgame/cg_main.c                  |  8 +--
 code/cgame/cg_modelanim.c             |  6 +-
 code/cgame/cg_parsemsg.cpp            | 12 ++--
 code/cgame/cg_predict.c               |  3 +-
 code/cgame/cg_scoreboard.cpp          | 84 ++++++++++++++-------------
 code/cgame/cg_servercmds.c            |  2 +-
 code/cgame/cg_viewmodelanim.c         |  6 +-
 code/client/cl_cin.cpp                |  4 +-
 code/client/cl_invrender.cpp          |  4 +-
 code/client/cl_main.cpp               | 38 ++++++------
 code/client/cl_scrn.cpp               |  2 +-
 code/client/cl_ui.cpp                 |  4 +-
 code/client/cl_uimaprotationsetup.cpp | 16 ++---
 code/client/cl_uiserverlist.cpp       |  4 +-
 code/client/cl_uiview3d.cpp           | 22 +++----
 code/client/snd_dma.c                 | 14 ++---
 code/client/snd_mem_new.cpp           |  2 +-
 code/client/snd_openal.c              |  2 +-
 code/client/snd_openal_new.cpp        | 28 ++++-----
 code/fgame/actor.cpp                  |  8 ++-
 code/fgame/actor_disguise_officer.cpp |  2 +-
 code/fgame/actor_disguise_rover.cpp   |  2 +-
 code/fgame/actor_grenade.cpp          |  2 +-
 code/fgame/actor_weaponless.cpp       |  2 +-
 code/fgame/animate.cpp                | 12 ++--
 code/fgame/archive.cpp                |  2 +-
 code/fgame/camera.cpp                 |  4 +-
 code/fgame/characterstate.cpp         |  2 +-
 code/fgame/debuglines.cpp             |  4 +-
 code/fgame/dm_manager.cpp             |  4 +-
 code/fgame/doors.cpp                  |  6 +-
 code/fgame/entity.cpp                 |  6 +-
 code/fgame/explosion.cpp              |  2 +-
 code/fgame/g_bot.cpp                  |  4 +-
 code/fgame/g_main.cpp                 | 12 ++--
 code/fgame/g_spawn.cpp                |  4 +-
 code/fgame/g_utils.cpp                |  8 +--
 code/fgame/gamescript.cpp             |  4 +-
 code/fgame/hud.cpp                    |  2 +-
 code/fgame/ipfilter.cpp               |  2 +-
 code/fgame/item.cpp                   |  2 +-
 code/fgame/level.cpp                  |  4 +-
 code/fgame/player.cpp                 | 84 +++++++++++++--------------
 code/fgame/scriptmaster.cpp           | 14 ++---
 code/fgame/scriptthread.cpp           | 22 +++----
 code/fgame/simpleactor.cpp            |  4 +-
 code/qcommon/alias.c                  |  2 +-
 code/qcommon/class.cpp                |  6 +-
 code/qcommon/cm_fencemask.c           |  8 +--
 code/qcommon/cm_load.c                |  4 +-
 code/qcommon/cm_trace_obfuscation.cpp |  2 +-
 code/qcommon/common.cpp               |  2 +-
 code/qcommon/configurator.cpp         | 24 ++++----
 code/qcommon/listener.cpp             |  6 +-
 code/qcommon/q_shared.c               |  4 +-
 code/qcommon/script.cpp               | 12 ++--
 code/qcommon/str.cpp                  | 14 ++---
 code/qcommon/str.h                    | 14 ++---
 code/qcommon/tiki_main.cpp            |  6 +-
 code/qcommon/tiki_script.cpp          | 18 +++---
 code/renderer/tr_image.c              |  4 +-
 code/renderer/tr_model.cpp            |  8 +--
 code/renderer/tr_sphere_shade.cpp     |  4 +-
 code/renderer/tr_staticmodels.cpp     |  4 +-
 code/renderer/tr_util.cpp             |  2 +-
 code/script/scriptcompiler.cpp        |  2 +-
 code/script/scriptexception.cpp       |  5 +-
 code/script/scriptvm.cpp              |  2 +-
 code/server/sv_ccmds.c                | 46 +++++++--------
 code/server/sv_game.c                 |  4 +-
 code/server/sv_init.c                 | 10 ++--
 code/server/sv_main.c                 |  4 +-
 code/server/sv_world.c                |  2 +-
 code/skeletor/bonetable.cpp           |  2 +-
 code/skeletor/skeletor_imports.cpp    |  2 +-
 code/skeletor/skeletor_utilities.cpp  |  6 +-
 code/sys/sys_autoupdater.c            |  2 +-
 code/sys/win_localization.cpp         |  4 +-
 code/tiki/tiki_cache.cpp              |  6 +-
 code/tiki/tiki_files.cpp              | 18 +++---
 code/tiki/tiki_imports.cpp            |  2 +-
 code/tiki/tiki_parse.cpp              | 23 ++++----
 code/tiki/tiki_skel.cpp               |  4 +-
 code/uilib/ui_init.cpp                |  4 +-
 87 files changed, 402 insertions(+), 395 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 24376895..4ddb3fd8 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -5261,7 +5261,7 @@ void CG_ClientCommandDebugMessage(centity_t *cent, const char *fmt, ...)
         char    msg[1024];
 
         va_start(argptr, fmt);
-        vsprintf(msg, fmt, argptr);
+        Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);
 
         if ((!cg_debugAnimWatch->integer) || ((cg_debugAnimWatch->integer - 1) == cent->currentState.number)) {
@@ -5416,7 +5416,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
     current_tiki = NULL;
 
     // Update the loading screen
-    sprintf(tempName, "m%s", filename);
+    Com_sprintf(tempName, sizeof(tempName), "m%s", filename);
     cgi.LoadResource(tempName);
 
     bufstart = buffer;
@@ -5425,7 +5425,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
         Event *ev;
 
         // grab each line as we go
-        strcpy(com_token, COM_ParseExt(&buffer, qtrue));
+        Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
         if (!com_token[0]) {
             break;
         }
@@ -5433,7 +5433,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
         if (!Q_stricmp(com_token, "end") || !Q_stricmp(com_token, "server")) {
             // skip the line
             while (1) {
-                strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
                 if (!com_token[0]) {
                     break;
                 }
@@ -5446,7 +5446,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
 
         // get the rest of the line
         while (1) {
-            strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
             if (!com_token[0]) {
                 break;
             }
@@ -5458,7 +5458,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
     cgi.FS_FreeFile((void *)bufstart);
 
     // Update the loading screen
-    sprintf(tempName, "o%s", filename);
+    Com_sprintf(tempName, sizeof(tempName), "o%s", filename);
     cgi.LoadResource(tempName);
 
     return qtrue;
diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index b81bcde3..03450e46 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -356,9 +356,9 @@ void CG_EditCHShader(void)
 
     pShader = CG_GetShaderUnderCrosshair(qfalse, NULL);
     if (pShader) {
-        strcpy(name, "editspecificshader ");
-        strcat(name, pShader->shader);
-        strcat(name, "\n");
+        Q_strncpyz(name, "editspecificshader ", sizeof(name));
+        Q_strcat(name, sizeof(name), pShader->shader);
+        Q_strcat(name, sizeof(name), "\n");
         cgi.AddCommand(name);
     } else {
         cgi.Printf("No surface selected\n");
diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index 21530ade..cfcfd6b4 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -1089,7 +1089,7 @@ void CG_DrawSpectatorView_ver_15()
         char      buf[128];
 
         iClientNum = cg.snap->ps.stats[STAT_INFOCLIENT];
-        sprintf(buf, "%s : %i", cg.clientinfo[iClientNum].name, cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]);
+        Com_sprintf(buf, sizeof(buf), "%s : %i", cg.clientinfo[iClientNum].name, cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]);
 
         hShader  = 0;
         color[0] = 0.5;
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index e13d28c2..30fdfd18 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -369,7 +369,7 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
         if (num >= CS_OBJECTIVES && num < CS_OBJECTIVES + MAX_OBJECTIVES) {
             cobjective_t *objective = &cg.Objectives[num - CS_OBJECTIVES];
             objective->flags        = atoi(Info_ValueForKey(str, "flags"));
-            strcpy(objective->text, Info_ValueForKey(str, "text"));
+            Q_strncpyz(objective->text, Info_ValueForKey(str, "text"), sizeof(objective->text));
         }
 
         switch (num) {
@@ -424,7 +424,7 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             if (len) {
                 qboolean streamed;
                 char     buf[1024];
-                strcpy(buf, str);
+                Q_strncpyz(buf, str, sizeof(buf));
         
                 streamed     = buf[len - 1] != '0';
                 buf[len - 1] = 0;
@@ -826,7 +826,7 @@ void Com_Error(int level, const char *error, ...)
     char    text[1024];
 
     va_start(argptr, error);
-    vsprintf(text, error, argptr);
+    Q_vsnprintf(text, sizeof(text), error, argptr);
     va_end(argptr);
 
     cgi.Error(level, "%s", text);
@@ -838,7 +838,7 @@ void Com_Printf(const char *msg, ...)
     char    text[1024];
 
     va_start(argptr, msg);
-    vsprintf(text, msg, argptr);
+    Q_vsnprintf(text, sizeof(text), msg, argptr);
     va_end(argptr);
 
     cgi.Printf("%s", text);
diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index 960aadf8..a654afcb 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -550,7 +550,7 @@ void CG_AnimationDebugMessage(int number, const char *fmt, ...)
         char    msg[1024];
 
         va_start(argptr, fmt);
-        vsprintf(msg, fmt, argptr);
+        Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);
 
         if ((!cg_debugAnimWatch->integer) || ((cg_debugAnimWatch->integer - 1) == number)) {
@@ -654,8 +654,8 @@ void CG_UpdateForceModels()
     pszAlliesPartial = dm_playermodel->string;
     pszAxisPartial = dm_playergermanmodel->string;
 
-    sprintf(szAlliesModel, "models/player/%s.tik", pszAlliesPartial);
-    sprintf(szAxisModel, "models/player/%s.tik", pszAxisPartial);
+    Com_sprintf(szAlliesModel, sizeof(szAlliesModel), "models/player/%s.tik", pszAlliesPartial);
+    Com_sprintf(szAxisModel, sizeof(szAxisModel), "models/player/%s.tik", pszAxisPartial);
     hModel = cgi.R_RegisterModel(szAlliesModel);
     if (!hModel) hModel = cgi.R_RegisterModel("models/player/american_army.tik");
 
diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 6c9ddcb2..5ae902d1 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1576,7 +1576,7 @@ void CG_ParseCGMessage_ver_15()
 
         case CGM_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString());
+            Q_strncpyz(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].shaderName));
             cgi.HudDrawElements[iInfo].string[0]   = 0;
             cgi.HudDrawElements[iInfo].pFont       = NULL;
             cgi.HudDrawElements[iInfo].fontName[0] = 0;
@@ -1618,12 +1618,12 @@ void CG_ParseCGMessage_ver_15()
         case CGM_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
-            strcpy(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString());
+            Q_strncpyz(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string));
             break;
 
         case CGM_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString());
+            Q_strncpyz(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName));
             cgi.HudDrawElements[iInfo].hShader       = 0;
             cgi.HudDrawElements[iInfo].shaderName[0] = 0;
             // load the font
@@ -1958,7 +1958,7 @@ void CG_ParseCGMessage_ver_6()
 
         case CGM6_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString());
+            Q_strncpyz(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].shaderName));
             cgi.HudDrawElements[iInfo].string[0]   = 0;
             cgi.HudDrawElements[iInfo].pFont       = NULL;
             cgi.HudDrawElements[iInfo].fontName[0] = 0;
@@ -2000,12 +2000,12 @@ void CG_ParseCGMessage_ver_6()
         case CGM6_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
-            strcpy(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString());
+            Q_strncpyz(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string));
             break;
 
         case CGM6_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString());
+            Q_strncpyz(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName));
             cgi.HudDrawElements[iInfo].hShader       = 0;
             cgi.HudDrawElements[iInfo].shaderName[0] = 0;
             // load the font
diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index 03f9a3e9..165bffcc 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -190,8 +190,9 @@ void CG_ShowTrace(trace_t *trace, int passent, const char *reason)
     assert(reason);
     assert(trace);
 
-    sprintf(
+    Com_sprintf(
         text,
+        sizeof(text),
         "%0.2f : Pass (%d) Frac %f Hit (%d): '%s'\n",
         (float)cg.time / 1000.0f,
         passent,
diff --git a/code/cgame/cg_scoreboard.cpp b/code/cgame/cg_scoreboard.cpp
index fe3a0846..4f0bbcd1 100644
--- a/code/cgame/cg_scoreboard.cpp
+++ b/code/cgame/cg_scoreboard.cpp
@@ -58,19 +58,19 @@ void CG_PrepScoreBoardInfo()
 {
     switch (cgs.gametype) {
     case GT_TEAM_ROUNDS:
-        strcpy(cg.scoresMenuName, "DM_Round_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "DM_Round_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     case GT_OBJECTIVE:
-        strcpy(cg.scoresMenuName, "Obj_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "Obj_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     case GT_TOW:
-        strcpy(cg.scoresMenuName, "Tow_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "Tow_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     case GT_LIBERATION:
-        strcpy(cg.scoresMenuName, "Lib_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "Lib_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     default:
-        strcpy(cg.scoresMenuName, "DM_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "DM_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     }
 }
@@ -296,14 +296,15 @@ void CG_ParseScores_ver_15()
 
                 switch (iClientTeam) {
                 case 1:
-                    strcpy(szString3, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString3, cgi.LV_ConvertString("Spectators"), sizeof(szString3));
                     break;
                 case 2:
-                    strcpy(szString3, cgi.LV_ConvertString("Free-For-Allers"));
+                    Q_strncpyz(szString3, cgi.LV_ConvertString("Free-For-Allers"), sizeof(szString3));
                     break;
                 case 3:
-                    sprintf(
+                    Com_sprintf(
                         szString3,
+                        sizeof(szString3),
                         "%s - %d %s",
                         cgi.LV_ConvertString("Allies"),
                         atoi(cgi.Argv(2 + iCurrentEntry + iDatumCount * i)),
@@ -312,8 +313,9 @@ void CG_ParseScores_ver_15()
                     iCurrentEntry++;
                     break;
                 case 4:
-                    sprintf(
+                    Com_sprintf(
                         szString3,
+                        sizeof(szString3),
                         "%s - %d %s",
                         cgi.LV_ConvertString("Axis"),
                         atoi(cgi.Argv(2 + iCurrentEntry + iDatumCount * i)),
@@ -322,7 +324,7 @@ void CG_ParseScores_ver_15()
                     iCurrentEntry++;
                     break;
                 default:
-                    strcpy(szString3, cgi.LV_ConvertString("No Team"));
+                    Q_strncpyz(szString3, cgi.LV_ConvertString("No Team"), sizeof(szString3));
                     break;
                 }
             } else if (iClientNum == -2) {
@@ -330,14 +332,14 @@ void CG_ParseScores_ver_15()
                 szString2[0] = 0;
                 szString3[0] = 0;
             } else {
-                strcpy(szString2, va("%i", iClientNum));
-                strcpy(szString3, cg.clientinfo[iClientNum].name);
+                Q_strncpyz(szString2, va("%i", iClientNum), sizeof(szString2));
+                Q_strncpyz(szString3, cg.clientinfo[iClientNum].name, sizeof(szString3));
             }
 
-            strcpy(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString7, cgi.Argv(5 + iCurrentEntry + iDatumCount * i));
+            Q_strncpyz(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+            Q_strncpyz(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+            Q_strncpyz(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
+            Q_strncpyz(szString7, cgi.Argv(5 + iCurrentEntry + iDatumCount * i), sizeof(szString7));
 
             if (cgs.gametype >= GT_TEAM_ROUNDS && iClientNum == -1
                 && (iClientTeam == TEAM_ALLIES || iClientTeam == TEAM_AXIS)) {
@@ -370,19 +372,19 @@ void CG_ParseScores_ver_15()
         } else {
             iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
             if (iClientNum >= 0) {
-                strcpy(szString2, va("%i", iClientNum));
-                strcpy(szString3, cg.clientinfo[iClientNum].name);
-                strcpy(szString4, cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString5, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString6, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString7, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
+                Q_strncpyz(szString2, va("%i", iClientNum), sizeof(szString2));
+                Q_strncpyz(szString3, cg.clientinfo[iClientNum].name, sizeof(szString3));
+                Q_strncpyz(szString4, cgi.Argv(1 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+                Q_strncpyz(szString5, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+                Q_strncpyz(szString6, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
+                Q_strncpyz(szString7, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString7));
             } else {
                 szString2[0] = 0;
                 if (iClientNum == -3) {
-                    strcpy(szString2, cgi.LV_ConvertString("Players"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Players"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else if (iClientNum == -2) {
-                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString3));
                     bIsHeader = qtrue;
                 } else {
                     // unknown
@@ -535,32 +537,32 @@ void CG_ParseScores_ver_6()
 
                 switch (iClientTeam) {
                 case 1:
-                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString2));
                     break;
                 case 2:
-                    strcpy(szString2, cgi.LV_ConvertString("Free-For-Allers"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Free-For-Allers"), sizeof(szString2));
                     break;
                 case 3:
-                    strcpy(szString2, cgi.LV_ConvertString("Allies"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Allies"), sizeof(szString2));
                     break;
                 case 4:
-                    strcpy(szString2, cgi.LV_ConvertString("Axis"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Axis"), sizeof(szString2));
                     break;
                 default:
-                    strcpy(szString2, cgi.LV_ConvertString("No Team"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("No Team"), sizeof(szString2));
                     break;
                 }
             } else if (iClientNum == -2) {
                 // spectating
                 szString2[0] = 0;
             } else {
-                strcpy(szString2, cg.clientinfo[iClientNum].name);
+                Q_strncpyz(szString2, cg.clientinfo[iClientNum].name, sizeof(szString2));
             }
 
-            strcpy(szString3, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString4, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString5, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString6, cgi.Argv(5 + iCurrentEntry + iDatumCount * i));
+            Q_strncpyz(szString3, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString3));
+            Q_strncpyz(szString4, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+            Q_strncpyz(szString5, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+            Q_strncpyz(szString6, cgi.Argv(5 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
 
             if (iClientNum == cg.snap->ps.clientNum) {
                 pItemTextColor = vThisClientTextColor;
@@ -587,17 +589,17 @@ void CG_ParseScores_ver_6()
         } else {
             iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
             if (iClientNum >= 0) {
-                strcpy(szString2, cg.clientinfo[iClientNum].name);
-                strcpy(szString3, cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
+                Q_strncpyz(szString2, cg.clientinfo[iClientNum].name, sizeof(szString2));
+                Q_strncpyz(szString3, cgi.Argv(1 + iCurrentEntry + iDatumCount * i), sizeof(szString3));
+                Q_strncpyz(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+                Q_strncpyz(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+                Q_strncpyz(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
             } else {
                 if (iClientNum == -3) {
-                    strcpy(szString2, cgi.LV_ConvertString("Players"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Players"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else if (iClientNum == -2) {
-                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else {
                     // unknown
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index bccac93c..de9cf84a 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -186,7 +186,7 @@ void CG_ParseServerinfo(void)
     if (spawnpos) {
         Q_strncpyz(map, mapname, spawnpos - mapname + 1);
     } else {
-        strcpy(map, mapname);
+        Q_strncpyz(map, mapname, sizeof(map));
     }
 
     Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s.bsp", map);
diff --git a/code/cgame/cg_viewmodelanim.c b/code/cgame/cg_viewmodelanim.c
index 794fccd1..c3bb9f73 100644
--- a/code/cgame/cg_viewmodelanim.c
+++ b/code/cgame/cg_viewmodelanim.c
@@ -351,7 +351,7 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
     } else {
         iAnimPrefixIndex                    = CG_GetVMAnimPrefixIndex();
         cgi.anim->g_iLastEquippedWeaponStat = cg.snap->ps.stats[STAT_EQUIPPED_WEAPON];
-        strcpy(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]));
+        Q_strncpyz(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]), sizeof(cgi.anim->g_szLastActiveItem));
         cgi.anim->g_iLastAnimPrefixIndex = iAnimPrefixIndex;
 
         bAnimChanged   = qtrue;
@@ -359,7 +359,7 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
     }
 
     if (cgi.anim->g_iLastVMAnim == -1) {
-        sprintf(szAnimName, "%s_idle", AnimPrefixList[iAnimPrefixIndex]);
+        Com_sprintf(szAnimName, sizeof(szAnimName), "%s_idle", AnimPrefixList[iAnimPrefixIndex]);
         cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index = cgi.Anim_NumForName(pTiki, szAnimName);
 
         if (cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index == -1) {
@@ -428,7 +428,7 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
             break;
         }
 
-        sprintf(szAnimName, "%s_%s", AnimPrefixList[iAnimPrefixIndex], pszAnimSuffix);
+        Com_sprintf(szAnimName, sizeof(szAnimName), "%s_%s", AnimPrefixList[iAnimPrefixIndex], pszAnimSuffix);
         if (!bWeaponChanged) {
             fCrossblendTime =
                 cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
diff --git a/code/client/cl_cin.cpp b/code/client/cl_cin.cpp
index 7dab119d..667a7ef2 100644
--- a/code/client/cl_cin.cpp
+++ b/code/client/cl_cin.cpp
@@ -1480,7 +1480,7 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
 
 	cin.currentHandle = currentHandle;
 
-	strcpy(cinTable[currentHandle].fileName, name);
+	Q_strncpyz(cinTable[currentHandle].fileName, name, sizeof(cinTable[currentHandle].fileName));
 
 	cinTable[currentHandle].ROQSize = 0;
 	cinTable[currentHandle].ROQSize = FS_FOpenFileRead (cinTable[currentHandle].fileName, &cinTable[currentHandle].iFile, qtrue, qtrue);
@@ -1655,7 +1655,7 @@ static unsigned short CL_PlayRoQ(const char* name, const char* arg, const char*
 
 	cin.currentHandle = currentHandle;
 
-	strcpy(cinTable[currentHandle].fileName, name);
+	Q_strncpyz(cinTable[currentHandle].fileName, name, sizeof(cinTable[currentHandle].fileName));
 
 	cinTable[currentHandle].ROQSize = 0;
 	cinTable[currentHandle].ROQSize = FS_FOpenFileRead (cinTable[currentHandle].fileName, &cinTable[currentHandle].iFile, qtrue, qtrue);
diff --git a/code/client/cl_invrender.cpp b/code/client/cl_invrender.cpp
index 0b5bd6f9..491b0f3b 100644
--- a/code/client/cl_invrender.cpp
+++ b/code/client/cl_invrender.cpp
@@ -148,7 +148,7 @@ void CL_Draw3DModel(
 
             hModel[iCurrNum] = model;
             iIndex[iCurrNum] = -1;
-            strcpy(szAnimName[iCurrNum], anim);
+            Q_strncpyz(szAnimName[iCurrNum], anim, sizeof(szAnimName[iCurrNum]));
         } else {
             iCurrNum = i;
 
@@ -164,7 +164,7 @@ void CL_Draw3DModel(
                 }
             } else {
                 iIndex[iCurrNum] = -1;
-                strcpy(szAnimName[iCurrNum], anim);
+                Q_strncpyz(szAnimName[iCurrNum], anim, sizeof(szAnimName[iCurrNum]));
             }
         }
 
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 068d68e4..3e550f20 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1172,12 +1172,12 @@ void CL_Setenv_f( void ) {
 		char buffer[1024];
 		int i;
 
-		strcpy( buffer, Cmd_Argv(1) );
-		strcat( buffer, "=" );
+		Q_strncpyz( buffer, Cmd_Argv(1), sizeof( buffer ) );
+		Q_strcat( buffer, sizeof( buffer ), "=" );
 
 		for ( i = 2; i < argc; i++ ) {
-			strcat( buffer, Cmd_Argv( i ) );
-			strcat( buffer, " " );
+			Q_strcat( buffer, sizeof( buffer ), Cmd_Argv( i ) );
+			Q_strcat( buffer, sizeof( buffer ), " " );
 		}
 
 		putenv( buffer );
@@ -2000,7 +2000,7 @@ wombat: sending conect here: an example connect string from MOHAA looks like thi
 			Info_SetValueForKey(info, "clientType", "Breakthrough");
 		}
 
-		strcpy(data, "connect ");
+		Q_strncpyz(data, "connect ", sizeof(data));
     // TTimo adding " " around the userinfo string to avoid truncated userinfo on the server
     //   (Com_TokenizeString tokenizes around spaces)
     data[8] = '"';
@@ -3126,7 +3126,7 @@ void CL_VidMode_f( void ) {
 	mode = atoi( Cmd_Argv( 1 ) );
 
 	if( CL_SetVidMode( mode ) ) {
-		sprintf( text, "%d", mode );
+		Com_sprintf( text, sizeof( text ), "%d", mode );
 		Cvar_Set( "r_mode", text );
 	}
 }
@@ -3145,10 +3145,10 @@ void CL_TikiInfoCommand_f( void ) {
 	name = Cmd_Argv( 1 );
 
 	if( strchr( name, '/' ) ) {
-		strcpy( modelname, name );
+		Q_strncpyz( modelname, name, sizeof( modelname ) );
 	} else {
-		strcpy( modelname, "models/" );
-		strcat( modelname, name );
+		Q_strncpyz( modelname, "models/", sizeof( modelname ) );
+		Q_strcat( modelname, sizeof( modelname ), name );
 	}
 
 	COM_DefaultExtension( modelname, sizeof( modelname ), ".tik" );
@@ -3997,7 +3997,7 @@ void CL_GlobalServers_f( void ) {
 		int numAddress = 0;
 
 		for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) {
-			sprintf(command, "sv_master%d", i);
+			Com_sprintf(command, sizeof(command), "sv_master%d", i);
 			masteraddress = Cvar_VariableString(command);
 
 			if(!*masteraddress)
@@ -4015,7 +4015,7 @@ void CL_GlobalServers_f( void ) {
 		return;
 	}
 
-	sprintf(command, "sv_master%d", masterNum);
+	Com_sprintf(command, sizeof(command), "sv_master%d", masterNum);
 	masteraddress = Cvar_VariableString(command);
 	
 	if(!*masteraddress)
@@ -4344,10 +4344,10 @@ void CL_Dialog_f( void ) {
 		return;
 	}
 
-	strcpy( title, Cmd_Argv( 1 ) );
-	strcpy( cvar, Cmd_Argv( 2 ) );
-	strcpy( command, Cmd_Argv( 3 ) );
-	strcpy( cancelCommand, Cmd_Argv( 4 ) );
+	Q_strncpyz( title, Cmd_Argv( 1 ), sizeof( title ) );
+	Q_strncpyz( cvar, Cmd_Argv( 2 ), sizeof( cvar ) );
+	Q_strncpyz( command, Cmd_Argv( 3 ), sizeof( command ) );
+	Q_strncpyz( cancelCommand, Cmd_Argv( 4 ), sizeof( cancelCommand ) );
 
 	if( Cmd_Argc() > 5 ) {
 		width = atoi( Cmd_Argv( 5 ) );
@@ -4361,17 +4361,17 @@ void CL_Dialog_f( void ) {
 	}
 
 	if( Cmd_Argc() > 7 ) {
-		strcpy( shader, Cmd_Argv( 7 ) );
+		Q_strncpyz( shader, Cmd_Argv( 7 ), sizeof( shader ) );
 	} else {
 		shader[ 0 ] = 0;
 	}
 	if( Cmd_Argc() > 8 ) {
-		strcpy( okshader, Cmd_Argv( 8 ) );
+		Q_strncpyz( okshader, Cmd_Argv( 8 ), sizeof(okshader) );
 	} else {
 		okshader[ 0 ] = 0;
 	}
 	if( Cmd_Argc() > 9 ) {
-		strcpy( cancelshader, Cmd_Argv( 9 ) );
+		Q_strncpyz( cancelshader, Cmd_Argv( 9 ), sizeof(cancelshader) );
 	} else {
 		cancelshader[ 0 ] = 0;
 	}
@@ -4615,7 +4615,7 @@ qboolean CL_CDKeyValidate( const char *key, const char *checksum ) {
 		}
 	}
 
-	sprintf(chs, "%02x", sum);
+	Com_sprintf(chs, sizeof(chs), "%02x", sum);
 
 	if (checksum && !Q_stricmp(chs, checksum)) {
 		return qtrue;
diff --git a/code/client/cl_scrn.cpp b/code/client/cl_scrn.cpp
index 0f97ef05..420de08d 100644
--- a/code/client/cl_scrn.cpp
+++ b/code/client/cl_scrn.cpp
@@ -343,7 +343,7 @@ void SCR_DrawDemoRecording( void ) {
 	}
 
 	pos = FS_FTell( clc.demofile );
-	sprintf( string, "RECORDING %s: %ik", clc.demoName, pos / 1024 );
+	Com_sprintf( string, sizeof( string ), "RECORDING %s: %ik", clc.demoName, pos / 1024 );
 
 	SCR_DrawStringExt( 320 - strlen( string ) * 4, 20, 8, string, g_color_table[7], qtrue, qfalse );
 }
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 3f5108b3..02304e07 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -5826,12 +5826,12 @@ void UI_EndLoad(void)
         }
 
         file = FS_FOpenFileWrite(loadName);
-        sprintf(buf, "%d\n%d %d\n", 3, loadNumber, size);
+        Com_sprintf(buf, sizeof(buf), "%d\n%d %d\n", 3, loadNumber, size);
 
         FS_Write(buf, strlen(buf), file);
 
         for (i = 0; i < loadNumber; i++) {
-            sprintf(buf, "%s\n%d\n", base[i]->name, base[i]->loadCount);
+            Com_sprintf(buf, sizeof(buf), "%s\n%d\n", base[i]->name, base[i]->loadCount);
             FS_Write(buf, strlen(buf), file);
         }
 
diff --git a/code/client/cl_uimaprotationsetup.cpp b/code/client/cl_uimaprotationsetup.cpp
index 98ec6861..ec92da8c 100644
--- a/code/client/cl_uimaprotationsetup.cpp
+++ b/code/client/cl_uimaprotationsetup.cpp
@@ -76,7 +76,7 @@ void UIMapRotationListBox::PopulateRotationList()
         maplistVar = Cvar_Get("ui_maplist_ffa", "", 0);
     }
 
-    strcpy(mapBuffer, maplistVar->string);
+    Q_strncpyz(mapBuffer, maplistVar->string, sizeof(mapBuffer));
 
     for (token = strtok(mapBuffer, " /"); token; token = strtok(NULL, " /")) {
         if (!Q_stricmp(token, "dm")) {
@@ -143,7 +143,7 @@ void UIMapListBox::PopulateMapList()
         bool        bHasTOW = false;
         bool        bHasLib = false;
 
-        strcpy(mapName, filename);
+        Q_strncpyz(mapName, filename, sizeof(mapName));
         mapName[strlen(mapName) - 4] = 0;
 
         if (!COM_IsMapValid(mapName)) {
@@ -151,7 +151,7 @@ void UIMapListBox::PopulateMapList()
         }
 
         if (bTugOfWar || bLiberation) {
-            strcpy(tokenized, mapName);
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
 
             for (token = strtok(tokenized, "_"); token; token = strtok(NULL, "_")) {
                 if (bLiberation) {
@@ -181,7 +181,7 @@ void UIMapListBox::PopulateMapList()
                 }
             }
         } else if (bObjective) {
-            strcpy(tokenized, mapName);
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
 
             for (token = strtok(tokenized, "_"); token; token = strtok(NULL, "_")) {
                 if (!Q_stricmp(token, "obj")) {
@@ -209,9 +209,9 @@ void UIMapListBox::PopulateMapList()
             char        mapName[256];
             char        tokenized[256];
 
-            strcpy(mapName, filename);
+            Q_strncpyz(mapName, filename, sizeof(mapName));
             mapName[strlen(mapName) - 4] = 0;
-            strcpy(tokenized, mapName);
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
 
             token = strtok(tokenized, "_");
             if (!Q_stricmp(token, "obj") || !Q_stricmp(mapName, "mp_ship_lib")) {
@@ -237,7 +237,7 @@ void UIMapListBox::PopulateMapList()
                 const char *filename = filenames[i];
                 char        mapName[256];
 
-                strcpy(mapName, filename);
+                Q_strncpyz(mapName, filename, sizeof(mapName));
                 mapName[strlen(mapName) - 4] = 0;
 
                 if (!COM_IsMapValid(mapName)) {
@@ -356,7 +356,7 @@ void UIRotationApplyButton::Released(Event *ev)
             char        map[256];
             bool        bHasTOW = false, bHasObj = false, bHasLib = false, bHasShip = false;
 
-            strcpy(map, text);
+            Q_strncpyz(map, text, sizeof(map));
             for (token = strtok(map, "_"); token; token = strtok(NULL, "_")) {
                 if (!Q_stricmp(token, "TOW")) {
                     bHasTOW = true;
diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index c6bd8278..097b473f 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -642,9 +642,9 @@ void UIFAKKServerList::RefreshLANServerList( Event *ev )
 
 static void AddFilter(char* filter, const char* value) {
     if (*filter) {
-        strcat(filter, va(" and %s", value));
+        Q_strcat(filter, sizeof(filter), va(" and %s", value));
     } else {
-        strcpy(filter, value);
+        Q_strncpyz(filter, value, sizeof(filter));
     }
 }
 
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 6a4ae43a..31798328 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -86,27 +86,27 @@ void View3D::PrintSound(int channel, const char *name, float vol, int rvol, floa
     xStep  = height;
 
     x = 0;
-    sprintf(buf, "%d", channel);
+    Com_sprintf(buf, sizeof(buf), "%d", channel);
     m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
 
     x += xStep + xStep;
-    sprintf(buf, "%s", name);
+    Com_sprintf(buf, sizeof(buf), "%s", name);
     m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
 
     x += xStep * 30.0;
-    sprintf(buf, "vol:%.2f", vol);
+    Com_sprintf(buf, sizeof(buf), "vol:%.2f", vol);
     m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
 
     x += xStep * 8;
-    sprintf(buf, "rvol:%.2f", (float)(rvol / 128.f));
+    Com_sprintf(buf, sizeof(buf), "rvol:%.2f", (float)(rvol / 128.f));
     m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
 
     x += xStep * 5;
-    sprintf(buf, "pit:%.2f", pitch);
+    Com_sprintf(buf, sizeof(buf), "pit:%.2f", pitch);
     m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
 
     x += xStep * 5;
-    sprintf(buf, "base:%d", (int)base);
+    Com_sprintf(buf, sizeof(buf), "base:%d", (int)base);
     m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
 
     line++;
@@ -228,7 +228,7 @@ void View3D::InitSubtitle(void)
     for (int i = 0; i < 4; i++) {
         subs[i]  = Cvar_Get(va("subtitle%d", i), "", 0);
         teams[i] = Cvar_Get(va("subteam%d", i), "0", 0);
-        strcpy(oldStrings[i], subs[i]->string);
+        Q_strncpyz(oldStrings[i], subs[i]->string, sizeof(oldStrings[i]));
         fadeTime[i] = 4000.0;
         subLife[i]  = 4000.0;
     }
@@ -300,7 +300,7 @@ void View3D::DrawSubtitleOverlay(void)
             int   blockcount;
 
             c = buf;
-            strcpy(buf, subs[i]->string);
+            Q_strncpyz(buf, subs[i]->string, sizeof(buf));
 
             total = 0;
             end   = NULL;
@@ -420,7 +420,7 @@ void View3D::DrawFPS(void)
         );
     }
 
-    sprintf(string, "FPS %4.1f", currentfps);
+    Com_sprintf(string, sizeof(string), "FPS %4.1f", currentfps);
     if (currentfps > 23.94) {
         if (cl_greenfps->integer) {
             m_font->setColor(UGreen);
@@ -449,7 +449,7 @@ void View3D::DrawFPS(void)
         m_font->setColor(UWhite);
     }
 
-    sprintf(string, "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
+    Com_sprintf(string, sizeof(string), "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
 
     m_font->Print(
         m_font->getHeight(qfalse) * 10.0,
@@ -459,7 +459,7 @@ void View3D::DrawFPS(void)
         qfalse
     );
 
-    sprintf(string, "t%5d v%5d Mtex%5.2f", cls.total_tris, cls.total_verts, (float)cls.total_texels * 0.00000095367432);
+    Com_sprintf(string, sizeof(string), "t%5d v%5d Mtex%5.2f", cls.total_tris, cls.total_verts, (float)cls.total_texels * 0.00000095367432);
 
     m_font->Print(
         m_font->getHeight(qfalse) * 10.0,
diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c
index 662b02a8..cfb0ca28 100644
--- a/code/client/snd_dma.c
+++ b/code/client/snd_dma.c
@@ -161,12 +161,12 @@ void S_Base_SoundList( void ) {
 	char	type[4][16];
 	char	mem[2][16];
 
-	strcpy(type[0], "16bit");
-	strcpy(type[1], "adpcm");
-	strcpy(type[2], "daub4");
-	strcpy(type[3], "mulaw");
-	strcpy(mem[0], "paged out");
-	strcpy(mem[1], "resident ");
+	Q_strncpyz(type[0], "16bit", sizeof(type[0]));
+	Q_strncpyz(type[1], "adpcm", sizeof(type[1]));
+	Q_strncpyz(type[2], "daub4", sizeof(type[2]));
+	Q_strncpyz(type[3], "mulaw", sizeof(type[3]));
+	Q_strncpyz(mem[0], "paged out", sizeof(mem[0]));
+	Q_strncpyz(mem[1], "resident ", sizeof(mem[1]));
 	total = 0;
 	for (sfx=s_knownSfx, i=0 ; i<s_numSfx ; i++, sfx++) {
 		size = sfx->soundLength;
@@ -303,7 +303,7 @@ static sfx_t *S_FindName( const char *name ) {
 	
 	sfx = &s_knownSfx[i];
 	Com_Memset (sfx, 0, sizeof(*sfx));
-	strcpy (sfx->soundName, name);
+	Q_strncpyz (sfx->soundName, name, sizeof(sfx->soundName));
 
 	sfx->next = sfxHash[hash];
 	sfxHash[hash] = sfx;
diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index 43df9076..264e6b22 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -522,7 +522,7 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
         sfx->data = NULL;
     }
 
-    sprintf(tempName, "k%s", fileName);
+    Com_sprintf(tempName, sizeof(tempName), "k%s", fileName);
     UI_LoadResource(tempName);
 
     if (strstr(fileName, "sound/null.wav")) {
diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c
index a5f4dadf..236f859a 100644
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@@ -233,7 +233,7 @@ static sfxHandle_t S_AL_BufferFind(const char *filename)
 		ptr = &knownSfx[sfx];
 		memset(ptr, 0, sizeof(*ptr));
 		ptr->masterLoopSrc = -1;
-		strcpy(ptr->filename, filename);
+		Q_strncpyz(ptr->filename, filename, sizeof(ptr->filename));
 	}
 
 	// Return the handle
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 4aaf04e7..92b8e492 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3357,7 +3357,7 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
     load_path[0] = 0;
 
     while (1) {
-        strcpy(com_token, COM_GetToken(&buffer, true));
+        Q_strncpyz(com_token, COM_GetToken(&buffer, true), sizeof(com_token));
         if (!com_token[0]) {
             break;
         }
@@ -3368,10 +3368,10 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
         }
 
         numargs = 1;
-        strcpy(args[0], com_token);
+        Q_strncpyz(args[0], com_token, sizeof(args[0]));
 
         while (1) {
-            strcpy(com_token, COM_GetToken(&buffer, false));
+            Q_strncpyz(com_token, COM_GetToken(&buffer, false), sizeof(com_token));
             if (!com_token[0]) {
                 break;
             }
@@ -3381,14 +3381,14 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
                 com_token[MAX_RES_NAME - 1] = 0;
             }
 
-            strcpy(args[numargs], com_token);
+            Q_strncpyz(args[numargs], com_token, sizeof(args[numargs]));
             numargs++;
         }
 
         if (!Q_stricmp(args[0], "path")) {
-            strcpy(load_path, args[1]);
+            Q_strncpyz(load_path, args[1], sizeof(load_path));
             if (load_path[strlen(load_path) - 1] != '/' && load_path[strlen(load_path) - 1] != '\\') {
-                strcat(load_path, "/");
+                Q_strcat(load_path, sizeof(load_path), "/");
             }
         } else if (args[0][0] == '!') {
             for (i = 0; i < music_numsongs; i++) {
@@ -3421,14 +3421,14 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
             }
         } else {
             if (numargs > 1) {
-                strcpy(alias, args[0]);
-                strcpy(file, load_path);
-                strcat(file, args[1]);
+                Q_strncpyz(alias, args[0], sizeof(alias));
+                Q_strncpyz(file, load_path, sizeof(file));
+                Q_strcat(file, sizeof(file), args[1]);
             } else {
-                strcpy(file, load_path);
-                strcat(file, args[1]);
+                Q_strncpyz(file, load_path, sizeof(file));
+                Q_strcat(file, sizeof(file), args[1]);
 
-                strncpy(alias, args[0], strlen(args[0]) - 4);
+                Q_strncpyz(alias, args[0], strlen(args[0]) - 4);
                 file[strlen(args[0]) + MAX_RES_NAME * 2 - 4] = 0;
             }
 
@@ -3438,8 +3438,8 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
             }
 
             psong = &music_songs[music_numsongs];
-            strcpy(psong->alias, alias);
-            strcpy(psong->path, file);
+            Q_strncpyz(psong->alias, alias, sizeof(psong->alias));
+            Q_strncpyz(psong->path, file, sizeof(psong->path));
             music_songs[music_numsongs].fadetime    = 1.0;
             music_songs[music_numsongs].volume      = 1.0;
             music_songs[music_numsongs].flags       = 0;
diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 78fc9bfd..f053658e 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -12282,8 +12282,9 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
         vPlayer = p->origin;
     }
 
-    i1 = sprintf(
+    i1 = Com_sprintf(
         szTemp,
+        sizeof(szTemp),
         "map = %s\n"
         "time = %i (%i:%02i)\n"
         "entnum = %i, targetname = '%s'\n"
@@ -12318,7 +12319,7 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
     if (pszFmt) {
         va_list args2;
         va_copy(args2, args);
-        i2 = i1 + vsprintf(&szTemp[i1], pszFmt, args);
+        i2 = i1 + Q_vsnprintf(szTemp + i1, sizeof(szTemp) - i1, pszFmt, args);
     }
 
     va_end(args);
@@ -12329,8 +12330,9 @@ const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
 
     t   = time(0);
     ptm = localtime(&t);
-    sprintf(
+    Com_sprintf(
         szFile,
+        sizeof(szFile),
         "main\\ai_trace_%s_%i_%i_%02i%02i.log",
         sv_mapname->string,
         ptm->tm_mon + 1,
diff --git a/code/fgame/actor_disguise_officer.cpp b/code/fgame/actor_disguise_officer.cpp
index cb735391..8293312f 100644
--- a/code/fgame/actor_disguise_officer.cpp
+++ b/code/fgame/actor_disguise_officer.cpp
@@ -120,7 +120,7 @@ void Actor::Think_DisguiseOfficer(void)
         {
             Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
             assert(!assertStr);
         }
diff --git a/code/fgame/actor_disguise_rover.cpp b/code/fgame/actor_disguise_rover.cpp
index 14172252..d8773f24 100644
--- a/code/fgame/actor_disguise_rover.cpp
+++ b/code/fgame/actor_disguise_rover.cpp
@@ -124,7 +124,7 @@ void Actor::Think_DisguiseRover(void)
         {
             Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
             assert(!assertStr);
         }
diff --git a/code/fgame/actor_grenade.cpp b/code/fgame/actor_grenade.cpp
index fe4162b1..6a6d355b 100644
--- a/code/fgame/actor_grenade.cpp
+++ b/code/fgame/actor_grenade.cpp
@@ -474,7 +474,7 @@ void Actor::FinishedAnimation_Grenade(void)
         break;
     default:
         char assertStr[16317] = {0};
-        strcpy(assertStr, "\"invalid grenade state in FinishedAnimation()\"\n\tMessage: ");
+        Q_strncpyz(assertStr, "\"invalid grenade state in FinishedAnimation()\"\n\tMessage: ", sizeof(assertStr));
         Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("state = %i", m_eGrenadeState));
         assert(!assertStr);
         break;
diff --git a/code/fgame/actor_weaponless.cpp b/code/fgame/actor_weaponless.cpp
index 1fc276ee..ebc03f8e 100644
--- a/code/fgame/actor_weaponless.cpp
+++ b/code/fgame/actor_weaponless.cpp
@@ -121,7 +121,7 @@ void Actor::Think_Weaponless(void)
         } else {
             Com_Printf("Think_Weaponless: invalid think state %i\n", m_State);
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
             assert(!assertStr);
         }
diff --git a/code/fgame/animate.cpp b/code/fgame/animate.cpp
index 38483961..c89539cd 100644
--- a/code/fgame/animate.cpp
+++ b/code/fgame/animate.cpp
@@ -315,8 +315,8 @@ void Animate::NewAnim(int animnum, int slot, float weight)
                     const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
                     int                     eventNum;
 
-                    strcpy(cmdName, "_client_");
-                    strcpy(cmdName + 8, single_cmd.args[0]);
+                    Q_strncpyz(cmdName, "_client_", longest + 8 + 1);
+                    Q_strncpyz(cmdName + 8, single_cmd.args[0], longest + 1);
 
                     eventNum = Event::FindEventNum(cmdName);
 
@@ -386,8 +386,8 @@ void Animate::NewAnim(int animnum, int slot, float weight)
                     const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
                     int                     eventNum;
 
-                    strcpy(cmdName, "_client_");
-                    strcpy(cmdName + 8, single_cmd.args[0]);
+                    Q_strncpyz(cmdName, "_client_", longestAllFrames + 8 + 1);
+                    Q_strncpyz(cmdName + 8, single_cmd.args[0], longestAllFrames + 1);
 
                     eventNum = Event::FindEventNum(cmdName);
 
@@ -554,8 +554,8 @@ void Animate::DoExitCommands(int slot)
                 const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
                 int                     eventNum;
 
-                strcpy(cmdName, "_client_");
-                strcpy(cmdName + 8, single_cmd.args[0]);
+                Q_strncpyz(cmdName, "_client_", longest + 8 + 1);
+                Q_strncpyz(cmdName + 8, single_cmd.args[0], longest + 1);
 
                 eventNum = Event::FindEventNum(cmdName);
 
diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index 28b91b36..6325c964 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -310,7 +310,7 @@ void Archiver::FileError(const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     fileerror = true;
diff --git a/code/fgame/camera.cpp b/code/fgame/camera.cpp
index c54b51d8..83ac8b20 100644
--- a/code/fgame/camera.cpp
+++ b/code/fgame/camera.cpp
@@ -1411,11 +1411,11 @@ void Camera::SetAutoStateEvent(Event *ev)
         char  com_token[MAX_QPATH];
         char  com_buffer[MAX_STRING_CHARS];
 
-        strcpy(com_buffer, ev->GetString(i));
+        Q_strncpyz(com_buffer, ev->GetString(i), sizeof(com_buffer));
         buffer = com_buffer;
         // get the rest of the line
         while (1) {
-            strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
             if (!com_token[0]) {
                 break;
             }
diff --git a/code/fgame/characterstate.cpp b/code/fgame/characterstate.cpp
index 50f558d8..c280ad93 100644
--- a/code/fgame/characterstate.cpp
+++ b/code/fgame/characterstate.cpp
@@ -373,7 +373,7 @@ void State::ParseAndProcessCommand(str command, Entity *target)
             script.SkipToEOL();
             break;
         }
-        strcpy(args[argc], script.GetToken(false));
+        Q_strncpyz(args[argc], script.GetToken(false), sizeof(args[argc]));
         argv[argc] = args[argc];
         argc++;
     }
diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp
index b8e41309..5dfe0262 100644
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
@@ -433,7 +433,7 @@ void G_DrawDebugNumber(Vector org, float number, float scale, float r, float g,
     left *= scale;
 
     if (precision > 0) {
-        sprintf(format, "%%.%df", precision);
+        Com_sprintf(format, sizeof(format), "%%.%df", precision);
         text = va(format, number);
     } else {
         text = va("%d", (int)number);
@@ -761,7 +761,7 @@ void G_DebugString(Vector pos, float scale, float r, float g, float b, const cha
         (*gi.numDebugStrings)++;
 
         va_start(va, pszText);
-        vsprintf(szTemp, pszText, va);
+        Q_vsnprintf(szTemp, sizeof(szTemp), pszText, va);
         va_end(va);
 
         VectorCopy(pos, string->pos);
diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 6bb78e26..c6d3ab50 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1798,7 +1798,7 @@ void DM_Manager::InsertEntry(const char *entry)
     size_t len = strlen(entry);
 
     if (scoreLength + len < MAX_STRING_CHARS) {
-        strcpy(scoreString + scoreLength, entry);
+        Q_strncpyz(scoreString + scoreLength, entry, sizeof(scoreString) - scoreLength);
 
         scoreLength += len;
         scoreEntries++;
@@ -1810,7 +1810,7 @@ void DM_Manager::InsertEntryNoCount(const char *entry)
     size_t len = strlen(entry);
 
     if (scoreLength + len < MAX_STRING_CHARS) {
-        strcpy(scoreString + scoreLength, entry);
+        Q_strncpyz(scoreString + scoreLength, entry, sizeof(scoreString) - scoreLength);
 
         scoreLength += len;
     }
diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index c8898238..16f9a0fc 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -1220,13 +1220,13 @@ void Door::ShowInfo(float fDot, float fDist)
         return;
     }
 
-    i = sprintf(szText, "%i:%i", entnum, radnum);
+    i = Com_sprintf(szText, sizeof(szText), "%i:%i", entnum, radnum);
     if (TargetName().c_str() && TargetName()[0]) {
-        i = sprintf(szText + i, ":%s", TargetName().c_str());
+        i = Com_sprintf(szText + i, sizeof(szText) - i, ":%s", TargetName().c_str());
     }
 
     if (health != 0) {
-        i = sprintf(szText + i, ":%.1f", health);
+        i = Com_sprintf(szText + i, sizeof(szText) - i, ":%.1f", health);
     }
 
     G_DebugString(origin + Vector(0, 0, (mins.z + maxs.z) * 0.5f), 1, 1, 1, 1, szText);
diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index bd7ec1c4..8f2442db 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5624,13 +5624,13 @@ void Entity::ShowInfo(float fDot, float fDist)
     int  i;
     char szText[512];
     if (fDot > 0.94999999 && fDist < 1024.0 && fDist > 64.0) {
-        i = sprintf(szText, "%i:%i", entnum, radnum);
+        i = Com_sprintf(szText, sizeof(szText), "%i:%i", entnum, radnum);
         if (targetname.length()) {
-            i = sprintf(&szText[i], ":%s", targetname.c_str());
+            i = Com_sprintf(szText + i, sizeof(szText) - i, ":%s", targetname.c_str());
         }
 
         if (health != 0) {
-            sprintf(&szText[i], ":%.1f", health);
+            Com_sprintf(szText + i, sizeof(szText) - i, ":%.1f", health);
         }
 
         G_DebugString(Vector(origin.x + 0, origin.y + 0, origin.z + maxs.z + 65), 1.0, 1.0, 1.0, 1.0, szText);
diff --git a/code/fgame/explosion.cpp b/code/fgame/explosion.cpp
index 3f42d199..72a7b620 100644
--- a/code/fgame/explosion.cpp
+++ b/code/fgame/explosion.cpp
@@ -487,7 +487,7 @@ void ExplodeObject::SetDebrisModel
    const char *ptr;
 
    // there could be multiple space delimited models, so we need to search for the spaces.
-   strcpy( string,  ev->GetString( 1 ) );
+   Q_strncpyz( string,  ev->GetString( 1 ), sizeof( string ) );
    ptr = strtok( string, " " );
    while ( ptr )
       {
diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index a885390c..bcbc2fbf 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -104,10 +104,10 @@ void G_AddBot(unsigned int num, saved_bot_t* saved)
 		}
 		else
 		{
-			sprintf( botName, "bot%d", clientNum - maxclients->integer + 1 );
+			Com_sprintf( botName, sizeof( botName ), "bot%d", clientNum - maxclients->integer + 1 );
 		}
 
-		sprintf( challenge, "%d", clientNum - maxclients->integer + 1 );
+		Com_sprintf( challenge, sizeof( challenge ), "%d", clientNum - maxclients->integer + 1 );
 
 		e->s.clientNum = clientNum;
 		e->s.number = clientNum;
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index e69e55fd..d3b12dd4 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -94,7 +94,7 @@ void QDECL G_Printf(const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     gi.Printf(text);
@@ -111,7 +111,7 @@ void QDECL G_Error(const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     gi.Error(ERR_DROP, text);
@@ -128,7 +128,7 @@ void QDECL G_Error(int type, const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     // need to manually crash otherwise visual studio fuck up with the stack pointer...
@@ -336,7 +336,7 @@ void QDECL Com_Error(int level, const char *error, ...)
     char    text[1024];
 
     va_start(argptr, error);
-    vsprintf(text, error, argptr);
+    Q_vsnprintf(text, sizeof(text), error, argptr);
     va_end(argptr);
 
     G_Error("%s", text);
@@ -348,7 +348,7 @@ void QDECL Com_Printf(const char *msg, ...)
     char    text[1024];
 
     va_start(argptr, msg);
-    vsprintf(text, msg, argptr);
+    Q_vsnprintf(text, sizeof(text), msg, argptr);
     va_end(argptr);
 
     gi.DPrintf("%s", text);
@@ -1894,7 +1894,7 @@ void G_ExitLevel(void)
             gi.SendConsoleCommand(command);
         } else if (!Q_stricmpn(level.nextmap, "vstr", 4)) {
             // alias on another map
-            strcpy(command, level.nextmap);
+            Q_strncpyz(command, level.nextmap, sizeof(command));
             gi.SendConsoleCommand(command);
         } else // use the level.nextmap variable
         {
diff --git a/code/fgame/g_spawn.cpp b/code/fgame/g_spawn.cpp
index 4ec7a182..55c076f4 100644
--- a/code/fgame/g_spawn.cpp
+++ b/code/fgame/g_spawn.cpp
@@ -853,8 +853,8 @@ const char *G_FixTIKIPath(const char *in) {
 	if(gi.FS_ReadFile( in, &buffer ) > 0) {
 		return in;
 	}
-	strcpy(path,"models/");
-	strcat(path,in);
+	Q_strncpyz(path,"models/", sizeof(path));
+	Q_strcat(path,sizeof(path),in);
 	if( gi.FS_ReadFile( in, &buffer ) > 0 ) {
 		return path;
 	}
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index bb4e30bc..ad5a94c9 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1379,9 +1379,9 @@ char *CanonicalTikiName(const char *szInName)
     static char filename[1024];
 
     if (*szInName && Q_stricmpn("models/", szInName, 7)) {
-        sprintf(filename, "models/%s", szInName);
+        Com_sprintf(filename, sizeof(filename), "models/%s", szInName);
     } else {
-        strcpy(filename, szInName);
+        Q_strncpyz(filename, szInName, sizeof(filename));
     }
 
     gi.FS_CanonicalFilename(filename);
@@ -1450,7 +1450,7 @@ void CacheResource(const char *stuff)
         }
     }
 
-    strcpy(filename, stuff);
+    Q_strncpyz(filename, stuff, sizeof(filename));
     gi.FS_CanonicalFilename(filename);
 
     if (strstr(filename, ".wav") || strstr(filename, ".mp3")) {
@@ -2225,7 +2225,7 @@ void G_WarnPlayer(Player *player, const char *format, ...)
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
     gi.SendServerCommand(player->client->ps.clientNum, "print \"%s\"\n", buffer);
diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index cad742e0..1ae83ab2 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -929,7 +929,7 @@ void ScriptThreadLabel::Set(const char *label)
         return;
     }
 
-    strcpy(buffer, label);
+    Q_strncpyz(buffer, label, sizeof(buffer));
 
     while (true) {
         if (p[0] == ':' && p[1] == ':') {
@@ -1022,7 +1022,7 @@ void ScriptThreadLabel::SetScript(const char *label)
         return;
     }
 
-    strcpy(buffer, label);
+    Q_strncpyz(buffer, label, sizeof(buffer));
 
     script = buffer;
     while (true) {
diff --git a/code/fgame/hud.cpp b/code/fgame/hud.cpp
index 1417d75d..9dd1980e 100644
--- a/code/fgame/hud.cpp
+++ b/code/fgame/hud.cpp
@@ -779,7 +779,7 @@ void Hud::TimerThink()
 #else
 	if( !*shader ) {
 #endif
-		sprintf( buffer, string, minutes, seconds );
+		Com_sprintf( buffer, sizeof( buffer ), string, minutes, seconds );
 
 		SetText( buffer );
 	} else {
diff --git a/code/fgame/ipfilter.cpp b/code/fgame/ipfilter.cpp
index 1e73af6e..c823702e 100644
--- a/code/fgame/ipfilter.cpp
+++ b/code/fgame/ipfilter.cpp
@@ -298,7 +298,7 @@ void SVCmd_WriteIP_f
 	byte	 b[ 4 ];
 	int	 i;
 
-	sprintf( name, "%s/listip.cfg", GAMEVERSION );
+	Com_sprintf( name, sizeof( name ), "%s/listip.cfg", GAMEVERSION );
    gi.SendServerCommand( 0, "print \"Writing %s.\n\"", name );
 
 	f = fopen( name, "wb" );
diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp
index 63d1a350..6a378c5f 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -751,7 +751,7 @@ void Item::setName(const char *i)
 
     item_name  = i;
     item_index = gi.itemindex(i);
-    strcpy(edict->entname, i);
+    Q_strncpyz(edict->entname, i, sizeof(edict->entname));
 
     prefix = GetItemPrefix(item_name);
     if (prefix) {
diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 5242d29f..27174a2e 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -1164,7 +1164,7 @@ void Level::SpawnEntities(char *entities, int svsTime)
                 Q_strncpyz(ent->edict->entname, ent->getClassID(), sizeof(ent->edict->entname));
 
                 ent->PostEvent(EV_Entity_Start, -1.0, 0);
-                sprintf(name, "i%d", radnum);
+                Com_sprintf(name, sizeof(name), "i%d", radnum);
                 gi.LoadResource(name);
             }
         }
@@ -1957,7 +1957,7 @@ void Level::SetupMaplist()
         return;
     }
 
-    strcpy(buffer, m_voteString.c_str());
+    Q_strncpyz(buffer, m_voteString.c_str(), sizeof(buffer));
 
     for (p = strtok(buffer, delim); p; p = strtok(NULL, delim)) {
         if (strstr(p, "g_gametype")) {
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index bbcc7800..7cf33fe0 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2522,12 +2522,12 @@ void Player::InitModelFps(void)
     char  model_name[MAX_STRING_TOKENS];
     char *model_replace;
 
-    strcpy(model_name, model.c_str());
+    Q_strncpyz(model_name, model.c_str(), sizeof(model_name));
     size_t len = strlen(model_name);
 
     model_replace = model_name + len - 4;
 
-    strcpy(model_replace, "_fps.tik");
+    Q_strncpyz(model_replace, "_fps.tik", sizeof(model_name) - (model_replace - model_name));
 
     m_fpsTiki = gi.modeltiki(model_name);
 }
@@ -3272,14 +3272,14 @@ void Player::SetStopwatch(int iDuration, stopWatchType_t type)
             }
         }
 
-        sprintf(szCmd, "stopwatch %i %i %i", iStartTime, iDuration, type);
+        Com_sprintf(szCmd, sizeof(szCmd), "stopwatch %i %i %i", iStartTime, iDuration, type);
     } else {
         iStartTime = 0;
         if (iDuration) {
             iStartTime = (int)level.svsFloatTime;
         }
 
-        sprintf(szCmd, "stopwatch %i %i", iStartTime, iDuration);
+        Com_sprintf(szCmd, sizeof(szCmd), "stopwatch %i %i", iStartTime, iDuration);
     }
 
     gi.SendServerCommand(edict - g_entities, szCmd);
@@ -5670,7 +5670,7 @@ void Player::GiveAllCheat(Event *ev)
     if (gi.FS_ReadFile("global/giveall.scr", (void **)&buf, true) != -1) {
         buffer = buf;
         while (1) {
-            strcpy(com_token, COM_ParseExt(&buffer, qtrue));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
 
             if (!com_token[0]) {
                 break;
@@ -5681,7 +5681,7 @@ void Player::GiveAllCheat(Event *ev)
 
             // get the rest of the line
             while (1) {
-                strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
                 if (!com_token[0]) {
                     break;
                 }
@@ -8631,49 +8631,49 @@ void Player::EnsurePlayerHasAllowedWeapons()
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "rifle");
+            Q_strncpyz(client->pers.dm_primary, "rifle", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "rifle")) {
             if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "smg");
+            Q_strncpyz(client->pers.dm_primary, "smg", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "smg")) {
             if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "mg");
+            Q_strncpyz(client->pers.dm_primary, "mg", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "mg")) {
             if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "shotgun");
+            Q_strncpyz(client->pers.dm_primary, "shotgun", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "shotgun")) {
             if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "heavy");
+            Q_strncpyz(client->pers.dm_primary, "heavy", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "heavy")) {
             if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "landmine");
+            Q_strncpyz(client->pers.dm_primary, "landmine", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "landmine")) {
             if (QueryLandminesAllowed()) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "sniper");
+            Q_strncpyz(client->pers.dm_primary, "sniper", sizeof(client->pers.dm_primary));
         }
     }
 
     gi.cvar_set("dmflags", va("%i", dmflags->integer & ~DF_WEAPON_NO_RIFLE));
     Com_Printf("No valid weapons -- re-allowing the rifle\n");
-    strcpy(client->pers.dm_primary, "rifle");
+    Q_strncpyz(client->pers.dm_primary, "rifle", sizeof(client->pers.dm_primary));
 }
 
 void Player::EquipWeapons()
@@ -10471,12 +10471,12 @@ void Player::EventDMMessage(Event *ev)
         }
     }
 
-    strcpy(szPrintString, "print \"" HUD_MESSAGE_CHAT_WHITE);
+    Q_strncpyz(szPrintString, "print \"" HUD_MESSAGE_CHAT_WHITE, sizeof(szPrintString));
 
     if (m_bSpectator) {
         if (iMode <= 0) {
-            strcat(szPrintString, gi.CL_LV_ConvertString("(spectator)"));
-            strcat(szPrintString, " ");
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(spectator)"));
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
         } else if (iMode <= game.maxclients) {
             ent = &g_entities[iMode - 1];
 
@@ -10496,8 +10496,8 @@ void Player::EventDMMessage(Event *ev)
         }
     } else if (IsDead() || m_bTempSpectator) {
         if (iMode <= 0) {
-            strcat(szPrintString, gi.CL_LV_ConvertString("(dead)"));
-            strcat(szPrintString, " ");
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(dead)"));
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
         } else if (iMode <= game.maxclients) {
             ent = &g_entities[iMode - 1];
 
@@ -10516,22 +10516,22 @@ void Player::EventDMMessage(Event *ev)
             }
         }
     } else if (iMode < 0) {
-        strcat(szPrintString, gi.CL_LV_ConvertString("(team)"));
-        strcat(szPrintString, " ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(team)"));
+        Q_strcat(szPrintString, sizeof(szPrintString), " ");
     } else if (iMode > 0) {
-        strcat(szPrintString, gi.CL_LV_ConvertString("(private)"));
-        strcat(szPrintString, " ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(private)"));
+        Q_strcat(szPrintString, sizeof(szPrintString), " ");
     }
 
-    strcat(szPrintString, client->pers.netname);
+    Q_strcat(szPrintString, sizeof(szPrintString), client->pers.netname);
 
     if (bInstaMessage) {
-        strcat(szPrintString, ": ");
-        strcat(szPrintString, gi.LV_ConvertString(pTmpInstantMsg));
+        Q_strcat(szPrintString, sizeof(szPrintString), ": ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(pTmpInstantMsg));
     } else {
         bool met_comment;
 
-        strcat(szPrintString, ":");
+        Q_strcat(szPrintString, sizeof(szPrintString), ":");
         iStringLength = strlen(szPrintString);
 
         for (i = 2; i <= ev->NumArgs(); i++) {
@@ -10556,12 +10556,12 @@ void Player::EventDMMessage(Event *ev)
                 return;
             }
 
-            strcat(szPrintString, " ");
-            strcat(szPrintString, gi.LV_ConvertString(sToken));
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(sToken));
         }
     }
 
-    strcat(szPrintString, "\n");
+    Q_strcat(szPrintString, sizeof(szPrintString), "\n");
 
     // ignore names containing comments
     if (strstr(client->pers.netname, "//")
@@ -10800,7 +10800,7 @@ str Player::GetBattleLanguageLocalFolks()
                     break;
                 }
 
-                strcpy(p, ", ");
+                Q_strncpyz(p, ", ", sizeof(buf) - (p - buf));
                 p += 2;
                 curP = p;
                 remaining -= 2;
@@ -10811,7 +10811,7 @@ str Player::GetBattleLanguageLocalFolks()
                 break;
             }
 
-            strcpy(p, client->pers.netname);
+            Q_strncpyz(p, client->pers.netname, sizeof(buf) - (p - buf));
             p += length;
             remaining -= length;
             pFolk = pPlayer;
@@ -10819,8 +10819,8 @@ str Player::GetBattleLanguageLocalFolks()
     }
 
     if (curP && remaining >= 2) {
-        strcpy(curP, "and ");
-        strcpy(curP + strlen(curP), pFolk->client->pers.netname);
+        Q_strncpyz(curP, "and ", sizeof(buf) - (curP - buf));
+        Q_strncpyz(curP + strlen(curP), pFolk->client->pers.netname, sizeof(buf) - (curP + strlen(curP) - buf));
     } else if (!pFolk) {
         return "nobody";
     }
@@ -11605,9 +11605,9 @@ void Player::UserSelectWeapon(bool bWait)
     }
 
     if (bWait) {
-        strcpy(buf, "stufftext \"wait 250;pushmenu ");
+        Q_strncpyz(buf, "stufftext \"wait 250;pushmenu ", sizeof(buf));
     } else {
-        strcpy(buf, "stufftext \"pushmenu ");
+        Q_strncpyz(buf, "stufftext \"pushmenu ", sizeof(buf));
     }
 
     if (dmflags->integer & DF_WEAPON_NO_RIFLE && dmflags->integer & DF_WEAPON_NO_SNIPER
@@ -11616,24 +11616,24 @@ void Player::UserSelectWeapon(bool bWait)
         && dmflags->integer & DF_WEAPON_NO_LANDMINE && !QueryLandminesAllowed()) {
         gi.cvar_set("dmflags", va("%i", dmflags->integer & ~DF_WEAPON_NO_RIFLE));
         Com_Printf("No valid weapons -- re-allowing the rifle\n");
-        strcpy(client->pers.dm_primary, "rifle");
+        Q_strncpyz(client->pers.dm_primary, "rifle", sizeof(client->pers.dm_primary));
     }
 
     switch (nationality) {
     case NA_BRITISH:
-        strcat(buf, "SelectPrimaryWeapon_british\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_british\"");
         break;
     case NA_RUSSIAN:
-        strcat(buf, "SelectPrimaryWeapon_russian\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_russian\"");
         break;
     case NA_GERMAN:
-        strcat(buf, "SelectPrimaryWeapon_german\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_german\"");
         break;
     case NA_ITALIAN:
-        strcat(buf, "SelectPrimaryWeapon_italian\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_italian\"");
         break;
     default:
-        strcat(buf, "SelectPrimaryWeapon\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon\"");
         break;
     }
 
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 815f214f..71fbc3c7 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -803,7 +803,7 @@ GameScript *ScriptMaster::GetGameScriptInternal(str& filename)
         gi.Error(ERR_DROP, "Script filename '%s' exceeds maximum length of %d\n", filename.c_str(), MAX_QPATH);
     }
 
-    strcpy(filepath, filename.c_str());
+    Q_strncpyz(filepath, filename.c_str(), sizeof(filepath));
     gi.FS_CanonicalFilename(filepath);
     filename = filepath;
 
@@ -1111,30 +1111,30 @@ void ScriptMaster::PrintStatus(void)
         ScriptVM *vm;
 
         for (vm = scriptClass->m_Threads; vm != NULL; vm = vm->next) {
-            sprintf(szBuffer, "%.7d", iThreadNum);
+            Com_sprintf(szBuffer, sizeof(szBuffer), "%.7d", iThreadNum);
             status += szBuffer + str(" ");
 
             switch (vm->ThreadState()) {
             case THREAD_RUNNING:
-                sprintf(szBuffer, "%8s", "running");
+                Com_sprintf(szBuffer, sizeof(szBuffer), "%8s", "running");
                 iThreadRunning++;
                 break;
             case THREAD_WAITING:
-                sprintf(szBuffer, "%8s", "waiting");
+                Com_sprintf(szBuffer, sizeof(szBuffer), "%8s", "waiting");
                 iThreadWaiting++;
                 break;
             case THREAD_SUSPENDED:
-                sprintf(szBuffer, "%8s", "suspended");
+                Com_sprintf(szBuffer, sizeof(szBuffer), "%8s", "suspended");
                 iThreadSuspended++;
                 break;
             }
 
             status += szBuffer;
 
-            sprintf(szBuffer, "%15s", vm->Label().c_str());
+            Com_sprintf(szBuffer, sizeof(szBuffer), "%15s", vm->Label().c_str());
             status += szBuffer + str(" ");
 
-            sprintf(szBuffer, "%15s", vm->Filename().c_str());
+            Com_sprintf(szBuffer, sizeof(szBuffer), "%15s", vm->Filename().c_str());
             status += szBuffer;
 
             status += "\n";
diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 7929cc2a..1f52e107 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -4726,7 +4726,7 @@ void ScriptThread::GetPlayerIP(Event *ev)
 
     ip = ent->client->pers.ip;
 
-    sprintf(ip_buff, "%s:%i", ip, ent->client->pers.port);
+    Com_sprintf(ip_buff, sizeof(ip_buff), "%s:%i", ip, ent->client->pers.port);
 
     ev->AddString(ip_buff);
 }
@@ -5348,7 +5348,7 @@ void ScriptThread::FileOpen(Event *ev)
         return;
     } else {
         ev->AddInteger((int)(size_t)f);
-        sprintf(buf, "%i", scriptfiles->integer + 1);
+        Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer + 1);
         gi.cvar_set("sv_scriptfiles", buf);
         return;
     }
@@ -5408,7 +5408,7 @@ void ScriptThread::FileClose(Event *ev)
 
     if (ret == 0) {
         ev->AddInteger(0);
-        sprintf(buf, "%i", scriptfiles->integer - 1);
+        Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer - 1);
         gi.cvar_set("sv_scriptfiles", buf);
         return;
     } else {
@@ -6252,7 +6252,7 @@ void ScriptThread::FlagInit(Event *ev)
 
     flag            = new Flag;
     flag->bSignaled = false;
-    strcpy(flag->flagName, name);
+    Q_strncpyz(flag->flagName, name, sizeof(flag->flagName));
 }
 
 void ScriptThread::FlagSet(Event *ev)
@@ -6603,7 +6603,7 @@ void ScriptThread::EventFmod(Event *ev)
     ev->AddFloat((float)res);
 }
 
-int checkMD5(const char *filepath, char *md5Hash)
+int checkMD5(const char *filepath, char *md5Hash, size_t destSize)
 {
     md5_state_t state;
     md5_byte_t  digest[16];
@@ -6652,7 +6652,7 @@ int checkMD5(const char *filepath, char *md5Hash)
     md5_finish(&state, digest);
 
     for (di = 0; di < 16; ++di) {
-        sprintf(md5Hash + di * 2, "%02x", digest[di]);
+        Com_sprintf(md5Hash + di * 2, destSize - di * 2, "%02x", digest[di]);
     }
 
     gi.Free(buff);
@@ -6660,7 +6660,7 @@ int checkMD5(const char *filepath, char *md5Hash)
     return 0;
 }
 
-int checkMD5String(const char *string, char *md5Hash)
+int checkMD5String(const char *string, char *md5Hash, size_t destSize)
 {
     md5_state_t state;
     md5_byte_t  digest[16];
@@ -6685,7 +6685,7 @@ int checkMD5String(const char *string, char *md5Hash)
     md5_finish(&state, digest);
 
     for (di = 0; di < 16; ++di) {
-        sprintf(md5Hash + di * 2, "%02x", digest[di]);
+        Com_sprintf(md5Hash + di * 2, destSize - di * 2, "%02x", digest[di]);
     }
 
     gi.Free(buff);
@@ -6705,7 +6705,7 @@ void ScriptThread::Md5File(Event *ev)
 
     filename = ev->GetString(1);
 
-    ret = checkMD5(filename, hash);
+    ret = checkMD5(filename, hash, sizeof(hash));
     if (ret != 0) {
         ev->AddInteger(-1);
         throw ScriptException("Error while generating MD5 checksum for file - md5file!\n");
@@ -6742,7 +6742,7 @@ void ScriptThread::Md5String(Event *ev)
 
     text = ev->GetString(1);
 
-    ret = checkMD5String(text, hash);
+    ret = checkMD5String(text, hash, sizeof(hash));
     if (ret != 0) {
         ev->AddInteger(-1);
         throw ScriptException("Error while generating MD5 checksum for strin!\n");
@@ -6937,7 +6937,7 @@ void ScriptThread::GetTime(Event *ev)
 
     timediff = timearray[0] - gmttime;
 
-    sprintf(buff, "%02i:%02i:%02i", (int)timearray[0], (int)timearray[1], (int)timearray[2]);
+    Com_sprintf(buff, sizeof(buff), "%02i:%02i:%02i", (int)timearray[0], (int)timearray[1], (int)timearray[2]);
 
     ev->AddString(buff);
 }
diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp
index ad76f12e..1521d740 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -1078,7 +1078,7 @@ int SimpleActor::GetEmotionAnim(void)
         default:
 
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"Unknown value for m_EmotionMode in SimpleActor::GetEmotionAnim\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"Unknown value for m_EmotionMode in SimpleActor::GetEmotionAnim\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
             assert(!assertStr);
             return -1;
@@ -1101,7 +1101,7 @@ int SimpleActor::GetEmotionAnim(void)
         default:
 
             char assertStr[16317] = {0};
-            strcpy(assertStr, "\"Unknown value for m_csMood in SimpleActor::GetEmotionAnim\"\n\tMessage: ");
+            Q_strncpyz(assertStr, "\"Unknown value for m_csMood in SimpleActor::GetEmotionAnim\"\n\tMessage: ", sizeof(assertStr));
             Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
             assert(!assertStr);
             return -1;
diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index 96a6548b..edab5b93 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -271,7 +271,7 @@ void Alias_ListAddParms(AliasListNode_t* node, const char* parameters)
 			}
 
 			node->subtitle = Z_TagMalloc(strlen(token) + 1, TAG_TIKI);
-			strcpy(node->subtitle, token);
+			Q_strncpyz(node->subtitle, token, sizeof(node->subtitle));
 		}
 		else if (!Q_stricmp(token, "pitch"))
 		{
diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp
index 6e3e8984..25aa8e4f 100644
--- a/code/qcommon/class.cpp
+++ b/code/qcommon/class.cpp
@@ -202,7 +202,7 @@ void CLASS_Print(FILE *class_file, const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     if (class_file) {
@@ -238,7 +238,7 @@ void Class::warning(const char *function, const char *format, ...) const
     va_list     va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
 
     classname = classinfo()->classname;
 
@@ -259,7 +259,7 @@ void Class::error(const char *function, const char *fmt, ...) const
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     if (getClassID()) {
diff --git a/code/qcommon/cm_fencemask.c b/code/qcommon/cm_fencemask.c
index 42c53357..ead06286 100644
--- a/code/qcommon/cm_fencemask.c
+++ b/code/qcommon/cm_fencemask.c
@@ -311,14 +311,14 @@ qboolean CM_LoadFCM(const char *szName, cfencemask_t **pMask)
 
     m      = (cfencemask_t *)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
     *pMask = m;
-    strcpy(m->name, szName);
+    Q_strncpyz(m->name, szName, sizeof(m->name));
     m->iWidth  = header.iWidth;
     m->iHeight = header.iHeight;
     m->pData   = (byte *)Hunk_Alloc(iDataSize, h_dontcare);
     FS_Read(m->pData, iDataSize, h);
     FS_FCloseFile(h);
 
-    sprintf(tempName, "f%s", szName);
+    Com_sprintf(tempName, sizeof(tempName), "f%s", szName);
     UI_LoadResource(tempName);
 
     return qtrue;
@@ -483,7 +483,7 @@ qboolean CM_GenerateFenceMask(const char *szName, cfencemask_t **pMask)
     // load the mask if it has transparence and is opaque
     if (bHasOpaque && bHasTrans) {
         *pMask = Hunk_Alloc((iMaskSize >> 3) + sizeof(cfencemask_t), h_dontcare);
-        strcpy((*pMask)->name, szName);
+        Q_strncpyz((*pMask)->name, szName, sizeof((*pMask)->name));
         (*pMask)->iWidth  = iWidth;
         (*pMask)->iHeight = iHeight;
         (*pMask)->pData   = (byte *)((byte *)*pMask + sizeof(**pMask));
@@ -564,7 +564,7 @@ cfencemask_t *CM_GetFenceMask(const char *szMaskName)
     if (save || !CM_LoadFCM(szMaskName, &pMask)) {
         if (!CM_GenerateFenceMask(szMaskName, &pMask)) {
             pMask = (cfencemask_t *)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
-            strcpy(pMask->name, szMaskName);
+            Q_strncpyz(pMask->name, szMaskName, sizeof(pMask->name));
             pMask->pData  = NULL;
             pMask->pNext  = cm.fencemasks;
             cm.fencemasks = pMask;
diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index d3ef6509..37ceae1d 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -121,7 +121,7 @@ void CMod_LoadShaders( gamelump_t *l, int **shaderSubdivisions ) {
 
 	out = cm.shaders;
 	for ( i=0 ; i<count ; i++, in++, out++ ) {
-		strcpy( out->shader, in->shader );
+		Q_strncpyz( out->shader, in->shader, sizeof( out->shader ) );
 		out->contentFlags = LittleLong( in->contentFlags );
 		out->surfaceFlags = LittleLong( in->surfaceFlags );
 		out->mask = CM_GetFenceMask( in->fenceMaskImage );
@@ -678,7 +678,7 @@ void CMod_LoadPatches( gamelump_t *surfs, gamelump_t *verts, int *shaderSubdivis
 		// create the internal facet structure
 		patch->pc = CM_GeneratePatchCollide( width, height, points, patch->subdivisions );
 
-		sprintf(tempName, "s%d", i);
+		Com_sprintf(tempName, sizeof(tempName), "s%d", i);
 		UI_LoadResource(tempName);
 	}
 
diff --git a/code/qcommon/cm_trace_obfuscation.cpp b/code/qcommon/cm_trace_obfuscation.cpp
index 141c207f..b2a954ca 100644
--- a/code/qcommon/cm_trace_obfuscation.cpp
+++ b/code/qcommon/cm_trace_obfuscation.cpp
@@ -146,7 +146,7 @@ obfuscation_t* CM_SetupObfuscationMapping() {
             }
 
             obfuscation = &list[j];
-            strcpy(obfuscation->name, token);
+            Q_strncpyz(obfuscation->name, token, sizeof(obfuscation->name));
 
             token = CM_NextCsvToken(&text, qfalse);
             if (!text) {
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index eccc087d..7007a856 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -407,7 +407,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
 	com_errorEntered = qtrue;
 
 	va_start (argptr,fmt);
-	vsprintf (com_errorMessage,fmt,argptr);
+	Q_vsnprintf (com_errorMessage,sizeof(com_errorMessage),fmt,argptr);
 	va_end (argptr);
 
 	if (code != ERR_DISCONNECT && code != ERR_NEED_CD)
diff --git a/code/qcommon/configurator.cpp b/code/qcommon/configurator.cpp
index c87a602c..c386c9c1 100644
--- a/code/qcommon/configurator.cpp
+++ b/code/qcommon/configurator.cpp
@@ -308,8 +308,8 @@ void Configurator::WriteData( char **data, size_t *size )
 			currentSize += len;
 			currentData = new char[ currentSize + 1 ];
 			strncpy( currentData, oldData, offset );
-			sprintf( currentData + offset, offset ? "\n\n[%s]" : "[%s]", section->name.c_str() );
-			strcpy( currentData + offset + len, oldData + offset );
+			Com_sprintf( currentData + offset, currentSize + 1 - offset, offset ? "\n\n[%s]" : "[%s]", section->name.c_str() );
+			Q_strncpyz( currentData + offset + len, oldData + offset, currentSize + 1 - offset - len );
 
 			if( currentData != oldData ) delete[] oldData;
 		}
@@ -360,8 +360,8 @@ void Configurator::WriteData( char **data, size_t *size )
 						currentSize += len;
 						currentData = new char[ currentSize + 1 ];
 						strncpy( currentData, oldData, offset );
-						sprintf( currentData + offset, "\n%s[%d]=%s", key->name.c_str(), k, value.c_str() );
-						strcpy( currentData + offset + len, oldData + offset2 );
+						Com_sprintf( currentData + offset, currentSize + 1 - offset, "\n%s[%d]=%s", key->name.c_str(), k, value.c_str() );
+						Q_strncpyz( currentData + offset + len, oldData + offset2, currentSize + 1 - offset - len );
 
 						if( currentData != oldData ) delete[] oldData;
 					}
@@ -393,8 +393,8 @@ void Configurator::WriteData( char **data, size_t *size )
 					currentSize += len;
 					currentData = new char[ currentSize + 1 ];
 					strncpy( currentData, oldData, offset );
-					sprintf( currentData + offset, "\n%s=%s", key->name.c_str(), value.c_str() );
-					strcpy( currentData + offset + len, oldData + offset2 );
+					Com_sprintf( currentData + offset, currentSize + 1 - offset "\n%s=%s", key->name.c_str(), value.c_str() );
+					Q_strncpyz( currentData + offset + len, oldData + offset2, currentSize + 1 - offset - len );
 
 					if( currentData != oldData ) delete[] oldData;
 				}
@@ -445,18 +445,18 @@ void Configurator::WriteData2( char **data, size_t *size )
 			currentSize = tlen + 1024;
 			currentData = new char[ currentSize ];
 			p = currentData + ( p - oldData );
-			strcpy( currentData, oldData );
+			Q_strncpyz( currentData, oldData, currentSize );
 
 			delete[] oldData;
 		}
 
 		if( i == 1 )
 		{
-			p += sprintf( p, "[%s]\n", section->name.c_str() );
+			p += Com_sprintf( p, currentSize - ( p - currentData ), "[%s]\n", section->name.c_str() );
 		}
 		else
 		{
-			p += sprintf( p, "\n[%s]\n", section->name.c_str() );
+			p += Com_sprintf( p, currentSize - ( p - currentData ), "\n[%s]\n", section->name.c_str() );
 		}
 
 		for( j = 0; j < section->key.NumObjects(); j++ )
@@ -500,7 +500,7 @@ void Configurator::WriteData2( char **data, size_t *size )
 							delete[] oldData;
 						}
 
-						p += sprintf( p, "%s[%d]=%s\n", key->name.c_str(), k, value.c_str() );
+						p += Com_sprintf( p, currentSize - ( p - currentData ), "%s[%d]=%s\n", key->name.c_str(), k, value.c_str() );
 					}
 				}
 			}
@@ -524,7 +524,7 @@ void Configurator::WriteData2( char **data, size_t *size )
 					delete[] oldData;
 				}
 
-				p += sprintf( p, "%s=%s\n", key->name.c_str(), value.c_str() );
+				p += Com_sprintf( p, currentSize - ( p - currentData ), "%s=%s\n", key->name.c_str(), value.c_str() );
 			}
 		}
 	}
@@ -585,7 +585,7 @@ bool Configurator::FindData( int type, const char *s, const char *k, size_t *off
 			arrayindex = GetKeyArray( key );
 			if( arrayindex >= 0 )
 			{
-				sprintf( key, "%s[%d]", key, arrayindex );
+				Com_sprintf( key, sizeof( key ), "%s[%d]", key, arrayindex );
 			}
 
 			if( type == LINE_VALUE && bFoundSection && !Q_stricmp( k, key ) )
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index bf657fc8..60f9fd96 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -748,7 +748,7 @@ void EV_Print(FILE *stream, const char *format, ...)
 
     va_start(va, format);
 
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
 
     if (stream) {
         fprintf(stream, "%s", buffer);
@@ -863,7 +863,7 @@ void EventDef::Error(const char *format, ...)
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
     EVENT_Printf("^~^~^ Game: '%s' : %s\n", command.c_str(), buffer);
@@ -1018,7 +1018,7 @@ void EventDef::SetupDocumentation(void)
             //
             // store off all the names
             //
-            strcpy(argumentNames, argument_names);
+            Q_strncpyz(argumentNames, argument_names, sizeof(argumentNames));
             namePtr = strtok(argumentNames, " ");
             while (namePtr != NULL) {
                 argNames.AddObject(str(namePtr));
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index b9d679a0..b64c516c 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -345,7 +345,7 @@ void COM_ParseError( char *format, ... )
 	static char string[4096];
 
 	va_start (argptr, format);
-	vsprintf (string, format, argptr);
+	Q_vsnprintf (string, sizeof(string), format, argptr);
 	va_end (argptr);
 
 	Com_Printf("ERROR: %s, line %d: %s\n", com_parsename, com_lines, string);
@@ -357,7 +357,7 @@ void COM_ParseWarning( char *format, ... )
 	static char string[4096];
 
 	va_start (argptr, format);
-	vsprintf (string, format, argptr);
+	Q_vsnprintf (string, sizeof(string), format, argptr);
 	va_end (argptr);
 
 	Com_Printf("WARNING: %s, line %d: %s\n", com_parsename, com_lines, string);
diff --git a/code/qcommon/script.cpp b/code/qcommon/script.cpp
index 20e5f912..e223696d 100644
--- a/code/qcommon/script.cpp
+++ b/code/qcommon/script.cpp
@@ -181,7 +181,7 @@ void Script::MarkPosition(scriptmarker_t *mark)
     mark->tokenready = tokenready;
     mark->offset     = script_p - buffer;
     mark->line       = line;
-    strcpy(mark->token, token);
+    Q_strncpyz(mark->token, token, sizeof(mark->token));
 }
 
 /*
@@ -199,7 +199,7 @@ void Script::RestorePosition(const scriptmarker_t *mark)
     tokenready = mark->tokenready;
     script_p   = buffer + mark->offset;
     line       = mark->line;
-    strcpy(token, mark->token);
+    Q_strncpyz(token, mark->token, sizeof(token));
 
     assert(script_p <= end_p);
     if (script_p > end_p) {
@@ -660,7 +660,7 @@ const char *Script::GetMacroString(const char *theMacroName)
     }
 
     char tmpstr[255], *sptr = tmpstr;
-    strcpy(tmpstr, theMacroName);
+    Q_strncpyz(tmpstr, theMacroName, sizeof(tmpstr));
     tmpstr[strlen(tmpstr) - 1] = 0;
     sptr++;
 
@@ -741,7 +741,7 @@ char *Script::EvaluateMacroString(const char *theMacroString)
         bufferptr++;
     }
 
-    sprintf(evalText, "%f", value);
+    Com_sprintf(evalText, sizeof(evalText), "%f", value);
     return evalText;
 }
 
@@ -1076,7 +1076,7 @@ int Script::LinesInFile(void)
     temp_tokenready = tokenready;
     temp_script_p   = script_p;
     temp_line       = line;
-    strcpy(temp_token, token);
+    Q_strncpyz(temp_token, token, sizeof(temp_token));
 
     numentries = 0;
 
@@ -1089,7 +1089,7 @@ int Script::LinesInFile(void)
     tokenready = temp_tokenready;
     script_p   = temp_script_p;
     line       = temp_line;
-    strcpy(token, temp_token);
+    Q_strncpyz(token, temp_token, sizeof(token));
 
     return numentries;
 }
diff --git a/code/qcommon/str.cpp b/code/qcommon/str.cpp
index 8a1260b3..f978cea9 100644
--- a/code/qcommon/str.cpp
+++ b/code/qcommon/str.cpp
@@ -218,7 +218,7 @@ str operator+(const str& a, const float b)
 
     str result(a);
 
-    sprintf(text, "%f", b);
+    snprintf(text, sizeof(text), "%f", b);
     result.append(text);
 
     return result;
@@ -230,7 +230,7 @@ str operator+(const str& a, const int b)
 
     str result(a);
 
-    sprintf(text, "%d", b);
+    snprintf(text, sizeof(text), "%d", b);
     result.append(text);
 
     return result;
@@ -242,7 +242,7 @@ str operator+(const str& a, const unsigned b)
 
     str result(a);
 
-    sprintf(text, "%u", b);
+    snprintf(text, sizeof(text), "%u", b);
     result.append(text);
 
     return result;
@@ -252,7 +252,7 @@ str& str::operator+=(const float a)
 {
     char text[20];
 
-    sprintf(text, "%f", a);
+    snprintf(text, sizeof(text), "%f", a);
     append(text);
 
     return *this;
@@ -262,7 +262,7 @@ str& str::operator+=(const int a)
 {
     char text[20];
 
-    sprintf(text, "%d", a);
+    snprintf(text, sizeof(text), "%d", a);
     append(text);
 
     return *this;
@@ -272,7 +272,7 @@ str& str::operator+=(const unsigned a)
 {
     char text[20];
 
-    sprintf(text, "%u", a);
+    snprintf(text, sizeof(text), "%u", a);
     append(text);
 
     return *this;
@@ -536,7 +536,7 @@ void str::snprintf(char *dst, int size, const char *fmt, ...)
     va_list argptr;
 
     va_start(argptr, fmt);
-    len = vsprintf(buffer, fmt, argptr);
+    len = vsnprintf(buffer, sizeof(buffer), fmt, argptr);
     va_end(argptr);
 
     assert(len < size);
diff --git a/code/qcommon/str.h b/code/qcommon/str.h
index 86eac5a1..4eb80b15 100644
--- a/code/qcommon/str.h
+++ b/code/qcommon/str.h
@@ -293,7 +293,7 @@ inline str::str(const float num)
     char   text[32];
     size_t len;
 
-    sprintf(text, "%.3f", num);
+    snprintf(text, sizeof(text), "%.3f", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -306,7 +306,7 @@ inline str::str(const int num)
     char   text[32];
     size_t len;
 
-    sprintf(text, "%d", num);
+    snprintf(text, sizeof(text), "%d", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -319,7 +319,7 @@ inline str::str(const unsigned int num)
     char   text[32];
     size_t len;
 
-    sprintf(text, "%u", num);
+    snprintf(text, sizeof(text), "%u", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -332,7 +332,7 @@ inline str::str(const long num)
     char   text[64];
     size_t len;
 
-    sprintf(text, "%ld", num);
+    snprintf(text, sizeof(text), "%ld", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -345,7 +345,7 @@ inline str::str(const unsigned long num)
     char   text[64];
     size_t len;
 
-    sprintf(text, "%lu", num);
+    snprintf(text, sizeof(text), "%lu", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -358,7 +358,7 @@ inline str::str(const long long num)
     char   text[64];
     size_t len;
 
-    sprintf(text, "%lld", num);
+    snprintf(text, sizeof(text), "%lld", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -371,7 +371,7 @@ inline str::str(const unsigned long long num)
     char   text[64];
     size_t len;
 
-    sprintf(text, "%llu", num);
+    snprintf(text, sizeof(text), "%llu", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index 9bf56356..4ad22bd9 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.cpp
@@ -65,7 +65,7 @@ void TIKI_Message(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -81,7 +81,7 @@ void TIKI_Warning(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -97,7 +97,7 @@ void TIKI_Error(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
diff --git a/code/qcommon/tiki_script.cpp b/code/qcommon/tiki_script.cpp
index 501ef5a7..e6954421 100644
--- a/code/qcommon/tiki_script.cpp
+++ b/code/qcommon/tiki_script.cpp
@@ -394,8 +394,8 @@ void TikiScript::AddMacro( const char *name, const char *expansion )
 	}
 	else
 	{
-		strcpy( macros[ nummacros ].name, name );
-		strcpy( macros[ nummacros ].macro, expansion );
+		Q_strncpyz( macros[ nummacros ].name, name, sizeof( macros[ nummacros ].name ) );
+		Q_strncpyz( macros[ nummacros ].macro, expansion, sizeof( macros[ nummacros ].macro ) );
 		nummacros++;
 	}
 
@@ -450,13 +450,13 @@ qboolean TikiScript::ProcessCommand( qboolean crossline )
 	}
 	else if( !stricmp( command, "path" ) )
 	{
-		strcpy( path, argument1 );
+		Q_strncpyz( path, argument1, sizeof( path ) );
 		len = strlen( path );
 
 		if( path[ len - 1 ] != '/' &&
 			path[ len - 1 ] != '\\' )
 		{
-			strcat( path, "/" );
+			Q_strcat( path, sizeof( path ), "/" );
 		}
 
 		SkipToEOL();
@@ -790,7 +790,7 @@ const char *TikiScript::GetToken( qboolean crossline )
 			{
 				strcat( temptoken, macro_end + 1 );
 			}
-			strcpy( i->token, temptoken );
+			Q_strncpyz( i->token, temptoken, sizeof( i->token ) );
 		}
 		else
 		{
@@ -808,7 +808,7 @@ const char *TikiScript::GetToken( qboolean crossline )
 				{
 					strcat( temptoken, macro_end + 1 );
 				}
-				strcpy( i->token, temptoken );
+				Q_strncpyz( i->token, temptoken, sizeof( i->token ) );
 			}
 		}
 	}
@@ -1198,7 +1198,7 @@ int TikiScript::LinesInFile( void )
 	temp_tokenready		= tokenready;
 	temp_script_p		= script_p;
 	temp_line			= line;
-	strcpy( temp_token, token );
+	Q_strncpyz( temp_token, token, sizeof( temp_token ) );
 
 	numentries = 0;
 
@@ -1212,7 +1212,7 @@ int TikiScript::LinesInFile( void )
 	tokenready	= temp_tokenready;
 	script_p	= temp_script_p;
 	line		= temp_line;
-	strcpy( token, temp_token );
+	Q_strncpyz( token, temp_token, sizeof( token ) );
 
 	return numentries;
 }
@@ -1307,7 +1307,7 @@ void TikiScript::MarkPos( void )
 {
 	mark[ mark_pos ].mark_script_p = script_p;
 	mark[ mark_pos ].mark_tokenready = tokenready;
-	strcpy( mark[ mark_pos ].mark_token, token );
+	Q_strncpyz( mark[ mark_pos ].mark_token, token, sizeof(mark[ mark_pos ].mark_token));
 	mark_pos++;
 }
 
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 8c319346..ce4f747a 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -929,7 +929,7 @@ image_t* R_CreateImage(
 	image->dynamicallyUpdated = dynamicallyUpdated;
 	image->force32bit = force32bit;
 
-	strcpy (image->imgName, name);
+	Q_strncpyz (image->imgName, name, sizeof(image->imgName));
 
 	image->width = width;
 	image->height = height;
@@ -2491,7 +2491,7 @@ static void R_LoadImage(const char* name, byte** pic, int* width, int* height, q
 
 	if (scr_initialized)
 	{
-		sprintf(tempName, "n%s", name);
+		Com_sprintf(tempName, sizeof(tempName), "n%s", name);
 		UI_LoadResource(tempName);
 	}
 }
diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
index 43ee610d..014ace64 100644
--- a/code/renderer/tr_model.cpp
+++ b/code/renderer/tr_model.cpp
@@ -219,7 +219,7 @@ static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki,
 		if( !stricmp( ptr, "spr" ) )
 		{
 			mod->d.sprite = SPR_RegisterSprite( name );
-			strcpy( mod->name, name );
+			Q_strncpyz( mod->name, name, sizeof( mod->name ) );
 
 			if( mod->d.sprite )
 			{
@@ -230,7 +230,7 @@ static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki,
 		else if( !stricmp( ptr, "tik" ) )
 		{
 			mod->d.tiki = TIKI_RegisterTikiFlags( name, use );
-			strcpy( mod->name, name );
+			Q_strncpyz( mod->name, name, sizeof( mod->name ) );
 
 			if( mod->d.tiki )
 			{
@@ -315,7 +315,7 @@ void R_ModelInit( void ) {
 	tr.numModels = 0;
 
 	mod = R_AllocModel();
-	strcpy( mod->name, "** BAD MODEL **" );
+	Q_strncpyz( mod->name, "** BAD MODEL **", sizeof( mod->name ) );
 	mod->type = MOD_BAD;
 
 	for (i = 0; i < sizeof(tr.skel_index) / sizeof(tr.skel_index[0]); i++) {
@@ -533,7 +533,7 @@ int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
 	if( lod_save->integer == 1 )
 	{
 		Cvar_Set( "lod_save", "0" );
-		strcpy( lodPath, GetModelPath( skelmodel ) );
+		Q_strncpyz( lodPath, GetModelPath( skelmodel ), sizeof( lodPath ) );
 		ext = strstr( lodPath, "skd" );
 		strcpy( ext, "lod" );
 		SaveLODFile( lodPath, LOD );
diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index a0529f3d..22b7883c 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -1256,7 +1256,7 @@ void R_Sphere_InitLights()
                 continue;
             }
 
-            strcpy(s_sun.szFlareName, COM_Parse((char **)&ents));
+            Q_strncpyz(s_sun.szFlareName, COM_Parse((char **)&ents), sizeof(s_sun.szFlareName));
         } else if (!strcmp(ret, "ambientlight")) {
             if (bWorldProcessed) {
                 ri.Printf(PRINT_WARNING, "Multiple ambientlights defined in map\n");
@@ -1279,7 +1279,7 @@ void R_Sphere_InitLights()
     }
 
     if (s_sun.exists && !s_sun.szFlareName[0]) {
-        strcpy(s_sun.szFlareName, "sun");
+        Q_strncpyz(s_sun.szFlareName, "sun", sizeof(s_sun.szFlareName));
     }
 }
 
diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 5f449cfe..2f8287b9 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -81,9 +81,9 @@ void R_InitStaticModels(void)
         AngleVectorsLeft(pSM->angles, pSM->axis[0], pSM->axis[1], pSM->axis[2]);
 
         if (!strnicmp(pSM->model, "models", 6)) {
-            strcpy(szTemp, pSM->model);
+            Q_strncpyz(szTemp, pSM->model, sizeof(szTemp));
         } else {
-            sprintf(szTemp, "models/%s", pSM->model);
+            Com_sprintf(szTemp, sizeof(szTemp), "models/%s", pSM->model);
         }
 
         FS_CanonicalFilename(szTemp);
diff --git a/code/renderer/tr_util.cpp b/code/renderer/tr_util.cpp
index 1ac9589a..4950e5ac 100644
--- a/code/renderer/tr_util.cpp
+++ b/code/renderer/tr_util.cpp
@@ -262,7 +262,7 @@ void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, fl
 	VectorScale(right, scale, right);
 
     if (precision > 0) {
-		sprintf(format, "%%.%df", precision);
+		Com_sprintf(format, sizeof(format), "%%.%df", precision);
         text = va(format, number);
 	} else {
 		text = va("%d", (int)number);
diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index eef31697..75508375 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -1455,7 +1455,7 @@ void ScriptCompiler::CompileError(unsigned int sourcePos, const char *format, ..
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
     compileSuccess = false;
diff --git a/code/script/scriptexception.cpp b/code/script/scriptexception.cpp
index cdd58e4b..6fb8b5ee 100644
--- a/code/script/scriptexception.cpp
+++ b/code/script/scriptexception.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // scriptexception.cpp : Script Exception
 
 #include "scriptexception.h"
+#include "q_shared.h"
 
 #include <cstdarg>
 
@@ -50,7 +51,7 @@ ScriptException::ScriptException(const char *format, ...)
     char    data[4100];
 
     va_start(va, format);
-    vsprintf(data, format, va);
+    Q_vsnprintf(data, sizeof(data), format, va);
     va_end(va);
 
     CreateException(data);
@@ -67,7 +68,7 @@ void Error(const char *format, ...)
     char    data[4100];
 
     va_start(va, format);
-    vsprintf(data, format, va);
+    Q_vsnprintf(data, sizeof(data), format, va);
     va_end(va);
 
     throw ScriptException((const char *)data);
diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 981d5dd3..c46826fd 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -417,7 +417,7 @@ void ScriptVM::error(const char *format, ...)
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
     gi.Printf("----------------------------------------------------------\n%s\n", buffer);
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index cf635bcd..36478d66 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -186,7 +186,7 @@ static void SV_Map_f( void ) {
 	}
 	else
 	{
-		strcpy( map, mapname );
+		Q_strncpyz( map, mapname, sizeof( map ) );
 	}
 
 	// make sure the level exists before trying to change, so that
@@ -284,7 +284,7 @@ static void SV_GameMap_f( void ) {
 	map = Cmd_Argv( 1 );
 	Com_DPrintf( "SV_GameMap(%s)\n", map );
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz( svs.gameName, "current", sizeof( svs.gameName ) );
 	Cvar_SaveGameRestart_f();
 
 	bTransition = sv.state == SS_GAME;
@@ -1274,7 +1274,7 @@ static void SV_ConSay_f(void) {
 		return;
 	}
 
-	strcpy (text, "console: ");
+	Q_strncpyz (text, "console: ", sizeof(text));
 	p = Cmd_Args();
 
 	if ( *p == '"' ) {
@@ -1314,7 +1314,7 @@ static void SV_ConTell_f(void) {
 		return;
 	}
 
-	strcpy (text, "(private) console: ");
+	Q_strncpyz(text, "(private) console: ", sizeof(text));
 	p = Cmd_ArgsFrom(2);
 
 	if ( *p == '"' ) {
@@ -1380,7 +1380,7 @@ static void SV_ConSayto_f(void) {
 		return;
 	}
 
-	strcpy (text, "(private) console: ");
+	Q_strncpyz(text, "(private) console: ", sizeof(text));
 	p = Cmd_ArgsFrom(2);
 
 	if ( *p == '"' ) {
@@ -1584,8 +1584,8 @@ static void SV_TIKI_f( void ) {
 	if(TIKI_RegisterModel(fname)==0)
 	{
 		char tmp[128];
-		strcpy(tmp,"models/");
-		strcat(tmp,fname);
+		Q_strncpyz(tmp,"models/",sizeof(tmp));
+		Q_strcat(tmp,sizeof(tmp),fname);
 		TIKI_RegisterModel(tmp);
 	}
 }
@@ -1606,8 +1606,8 @@ static void SV_TIKI_DumpBones_f( void ) {
 	if(tiki==0)
 	{
 		char tmp[128];
-		strcpy(tmp,"models/");
-		strcat(tmp,fname);
+		Q_strncpyz(tmp,"models/",sizeof(tmp));
+		Q_strcat(tmp,sizeof(tmp),fname);
 		tiki = TIKI_RegisterModel(tmp);
 		if(!tiki)
 			return;
@@ -1768,7 +1768,7 @@ SV_HudDrawShader
 void SV_HudDrawShader( int iInfo, char *name )
 {
 #ifndef DEDICATED
-	strcpy( cls.HudDrawElements[ iInfo ].shaderName, name );
+	Q_strncpyz( cls.HudDrawElements[ iInfo ].shaderName, name, sizeof(cls.HudDrawElements[ iInfo ].shaderName) );
 	cls.HudDrawElements[ iInfo ].string[ 0 ] = 0;
 	cls.HudDrawElements[ iInfo ].pFont = NULL;
 	cls.HudDrawElements[ iInfo ].fontName[ 0 ] = 0;
@@ -1852,7 +1852,7 @@ void SV_HudDrawString( int iInfo, const char *string )
 {
 #ifndef DEDICATED
 	cls.HudDrawElements[ iInfo ].hShader = 0;
-	strcpy( cls.HudDrawElements[ iInfo ].string, string );
+	Q_strncpyz( cls.HudDrawElements[ iInfo ].string, string, sizeof(cls.HudDrawElements[iInfo].string) );
 #endif
 }
 
@@ -1864,7 +1864,7 @@ SV_HudDrawFont
 void SV_HudDrawFont( int iInfo, const char *name )
 {
 #ifndef DEDICATED
-	strcpy( cls.HudDrawElements[ iInfo ].fontName, name );
+	Q_strncpyz( cls.HudDrawElements[ iInfo ].fontName, name, sizeof(cls.HudDrawElements[iInfo].fontName) );
 	cls.HudDrawElements[ iInfo ].hShader = 0;
 	cls.HudDrawElements[ iInfo ].shaderName[ 0 ] = 0;
 
@@ -2073,7 +2073,7 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 		if( strstr( name, "quick.ssv" ) ) {
 			Com_sprintf( save.comment, sizeof( save.comment ), "QuickSave - %s", comment );
 		} else {
-			strcpy( save.comment, comment );
+			Q_strncpyz( save.comment, comment, sizeof( save.comment ) );
 		}
 
 		SV_SetConfigstring( CS_SAVENAME, "" );
@@ -2083,8 +2083,8 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 		save.flags = 0;
 
 		save.time = aclock;
-		strncpy( save.mapName, svs.mapName, sizeof( save.mapName ) );
-		strncpy( save.saveName, svs.gameName, sizeof( save.saveName ) );
+		Q_strncpyz( save.mapName, svs.mapName, sizeof( save.mapName ) );
+		Q_strncpyz( save.saveName, svs.gameName, sizeof( save.saveName ) );
 		save.mapTime = svs.time - svs.startTime;
 
 		name = S_GetMusicFilename();
@@ -2127,10 +2127,10 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 
 		S_StopAllSounds2( qtrue );
 		S_Load( f );
-		strncpy( svs.mapName, save.mapName, sizeof( svs.mapName ) );
+		Q_strncpyz( svs.mapName, save.mapName, sizeof( svs.mapName ) );
 		svs.mapTime = save.mapTime;
 		svs.areabits_warning_time = 0;
-		strcpy( svs.tm_filename, save.tm_filename );
+		Q_strncpyz( svs.tm_filename, save.tm_filename, sizeof( svs.tm_filename ) );
 		svs.tm_loopcount = save.tm_loopcount;
 		svs.tm_offset = save.tm_offset;
 		FS_FCloseFile( f );
@@ -2198,7 +2198,7 @@ void SV_Loadgame_f( void )
 		Com_Printf( "Bad savedir.\n" );
 	}
 
-	strcpy( svs.gameName, name );
+	Q_strncpyz( svs.gameName, name, sizeof( svs.gameName ) );
 	archive_name = Com_GetArchiveFileName( name, "sav" );
 	Cvar_SaveGameRestart_f();
 
@@ -2352,11 +2352,11 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 
 	if( gamename )
 	{
-		strcpy( name, gamename );
+		Q_strncpyz( name, gamename, sizeof( name ) );
 	}
 	else
 	{
-		strcpy( mname, svs.mapName );
+		Q_strncpyz( mname, svs.mapName, sizeof( mname ) );
 		for( ptr = strchr( mname, '/' ); ptr != NULL; ptr = strchr( mname, '/' ) )
 		{
 			*ptr = '_';
@@ -2377,7 +2377,7 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 		Com_Printf( "...\n" );
 	}
 
-	strcpy( svs.gameName, name );
+	Q_strncpyz( svs.gameName, name, sizeof( svs.gameName ) );
 
 	if (!SV_ArchiveLevelFile(qfalse, autosave)) {
 		if (cls.savedCgameState) {
@@ -2390,7 +2390,7 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 
 	Com_Printf( "Done.\n" );
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz( svs.gameName, "current", sizeof( svs.gameName ) );
 #endif
 }
 
@@ -2418,7 +2418,7 @@ void SV_Savegame_f( void )
 			return;
 		}
 
-		strcpy( savegame_name, s );
+		Q_strncpyz( savegame_name, s, sizeof( savegame_name ) );
 	}
 	else
 	{
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 449e50dc..5b3fee92 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -1410,7 +1410,7 @@ void PF_centerprintf( gentity_t *ent, const char *fmt, ... )
 	}
 
 	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
+	Q_vsnprintf( msg, sizeof( msg ), fmt, va );
 	va_end( va );
 
 	if( strlen( msg ) > 256 ) {
@@ -1436,7 +1436,7 @@ void PF_locationprintf( gentity_t *ent, int x, int y, const char *fmt, ... )
 	}
 
 	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
+	Q_vsnprintf( msg, sizeof( msg ), fmt, va );
 	va_end( va );
 
 	if( strlen( msg ) > 256 ) {
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 62c58f58..50268ff2 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -212,8 +212,8 @@ int SV_SoundIndex( const char *name, qboolean streamed )
 {
 	char buf[ 1024 ];
 
-	strcpy( buf, name );
-	strcat( buf, va( "%d", streamed ) );
+	Q_strncpyz( buf, name, sizeof(buf) );
+	Q_strcat( buf, sizeof(buf), va( "%d", streamed ) );
 
 	return SV_FindIndex( buf, CS_SOUNDS, MAX_SOUNDS, qtrue );
 }
@@ -602,7 +602,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 	}
 	else
 	{
-		strcpy( mapname, server );
+		Q_strncpyz( mapname, server, sizeof(mapname) );
 	}
 
 	strncpy( svs.mapName, mapname, sizeof( svs.mapName ) );
@@ -927,7 +927,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		}
 	}
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz(svs.gameName, "current", sizeof(svs.gameName) );
 
 	iEnd = Sys_Milliseconds();
 	Com_Printf( "------ Server Initialization Complete ------ %5.2f seconds\n", ( float )iEnd / 1000.0f );
@@ -1072,7 +1072,7 @@ void SV_Init (void)
 #endif
 	sv_banFile = Cvar_Get("sv_banFile", "serverbans.dat", CVAR_ARCHIVE);
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz( svs.gameName, "current", sizeof(svs.gameName) );
 
 	// dday vars
 	Cvar_Get( "g_ddayfodderguys", "0", CVAR_ARCHIVE );
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 19944dd9..5e0b1fea 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -493,7 +493,7 @@ void SVC_Status( netadr_t from ) {
 	if(strlen(Cmd_Argv(1)) > 128)
 		return;
 
-	strcpy( infostring, Cvar_InfoString( CVAR_SERVERINFO ) );
+	Q_strncpyz( infostring, Cvar_InfoString( CVAR_SERVERINFO ), sizeof( infostring ) );
 
 	// echo back the parameter to status. so master servers can use it as a challenge
 	// to prevent timed spoofed reply packets that add ghost servers
@@ -514,7 +514,7 @@ void SVC_Status( netadr_t from ) {
 			if (statusLength + playerLength >= sizeof(status) ) {
 				break;		// can't hold any more
 			}
-			strcpy (status + statusLength, player);
+			Q_strncpyz (status + statusLength, player, sizeof(status) - statusLength);
 			statusLength += playerLength;
 		}
 	}
diff --git a/code/server/sv_world.c b/code/server/sv_world.c
index 42b039b1..33b40ca1 100644
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -160,7 +160,7 @@ void SV_ClearWorld( void ) {
 	num = CM_NumInlineModels();
 	for( i = 1; i < num; i++ )
 	{
-		sprintf( name, "*%i", i );
+		Com_sprintf( name, sizeof( name ), "*%i", i );
 		SV_ModelIndex( name );
 	}
 }
diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 53c236b5..0b9b7a50 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -32,7 +32,7 @@ void ChannelNameTable::CopyChannel(ChannelName_t *dest, const ChannelName_t *sou
 
 void ChannelNameTable::SetChannelName(ChannelName_t *channel, const char *newName)
 {
-    strcpy(channel->name, newName);
+    Q_strncpyz(channel->name, newName, sizeof(channel->name));
 }
 
 ChannelNameTable::ChannelNameTable()
diff --git a/code/skeletor/skeletor_imports.cpp b/code/skeletor/skeletor_imports.cpp
index e79d9742..a415b713 100644
--- a/code/skeletor/skeletor_imports.cpp
+++ b/code/skeletor/skeletor_imports.cpp
@@ -32,7 +32,7 @@ void Skel_DPrintf(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
 
     Com_DPrintf("%s", msg);
diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index d369aa51..173694cf 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.cpp
@@ -31,7 +31,7 @@ void SKEL_Message(const char *fmt, ...)
     va_list     va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -42,7 +42,7 @@ void SKEL_Warning(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
@@ -53,7 +53,7 @@ void SKEL_Error(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
     Skel_DPrintf(msg);
 }
diff --git a/code/sys/sys_autoupdater.c b/code/sys/sys_autoupdater.c
index 2f59e071..9a6b6a66 100644
--- a/code/sys/sys_autoupdater.c
+++ b/code/sys/sys_autoupdater.c
@@ -31,7 +31,7 @@ void Sys_LaunchAutoupdater(int argc, char **argv)
 		memset(&procinfo, '\0', sizeof (procinfo));
 		memset(&startinfo, '\0', sizeof (startinfo));
 		startinfo.cb = sizeof (startinfo);
-		sprintf(cmdline, "" AUTOUPDATER_BIN " --waitpid %u", (unsigned int) GetCurrentProcessId());
+		Com_sprintf(cmdline, sizeof(cmdline), "" AUTOUPDATER_BIN " --waitpid %u", (unsigned int) GetCurrentProcessId());
 
 		if (CreateProcessA(AUTOUPDATER_BIN, cmdline, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startinfo, &procinfo))
 		{
diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index 915f6cd8..ab094eaf 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -75,7 +75,7 @@ cLocalization::cLocalization()
 	size_t iBasePos;
 
 	ppszFiles = FS_ListFilteredFiles( "global", "txt", "localization*.txt", qfalse, &iFileCount, qtrue );
-	strcpy( szFilename, "global/" );
+	Q_strncpyz( szFilename, "global/", sizeof( szFilename ) );
 	memset( szFilename + 8, 0, sizeof( szFilename ) - 8 );
 	iBasePos = strlen( szFilename );
 
@@ -83,7 +83,7 @@ cLocalization::cLocalization()
 	qsort( ppszFiles, iFileCount, sizeof( char * ), compare_strings );
 	for( i = 0; i < iFileCount; i++ )
 	{
-		strcpy( szFilename + iBasePos, ppszFiles[ i ] );
+		Q_strncpyz( szFilename + iBasePos, ppszFiles[ i ], sizeof( szFilename ) - iBasePos );
 		Com_Printf( "--- Localization: reading file %s\n", szFilename );
 		LoadFile( szFilename );
 	}
diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index e58b614d..bfdc6492 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -102,7 +102,7 @@ dtikianim_t *TIKI_RegisterTikiAnimFlags(const char *path, qboolean use)
     dtikianim_t *tiki;
     char         filename[1024];
 
-    strcpy(filename, path);
+    Q_strncpyz(filename, path, sizeof(filename));
     FS_CanonicalFilename(filename);
 
     if (tikianimcache) {
@@ -182,9 +182,9 @@ dtiki_t *TIKI_RegisterTikiFlags(const char *path, qboolean use)
         strcat(full_filename, "|");
     }
 
-    strcpy(filename, name);
+    Q_strncpyz(filename, name, sizeof(filename));
     FS_CanonicalFilename(filename);
-    strcat(full_filename, filename);
+    Q_strcat(full_filename, sizeof(full_filename), filename);
 
     if (!tikicache) {
         tikicache = new con_map<pchar, dtiki_t *>;
diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index e94aeba6..fc74a739 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -256,14 +256,14 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
 
     TIKI_AddDefaultIdleAnim(&loaddef);
     if (loaddef.numanims) {
-        sprintf(tempName, "a%s", path);
+        Com_sprintf(tempName, sizeof(tempName), "a%s", path);
         UI_LoadResource(tempName);
 
         tiki = TIKI_FillTIKIStructureSkel(&loaddef);
         if (tiki) {
-            sprintf(tempName, "b%s", path);
+            Com_sprintf(tempName, sizeof(tempName), "b%s", path);
             UI_LoadResource(tempName);
-            sprintf(tempName, "c%s", path);
+            Com_sprintf(tempName, sizeof(tempName), "c%s", path);
             UI_LoadResource(tempName);
 
             VectorSubtract(tiki->maxs, tiki->mins, tempVec);
@@ -273,7 +273,7 @@ dtikianim_t *TIKI_LoadTikiAnim(const char *path)
             }
 
             TIKI_FreeStorage(&loaddef);
-            sprintf(tempName, "d%s", path);
+            Com_sprintf(tempName, sizeof(tempName), "d%s", path);
             UI_LoadResource(tempName);
         } else {
             TIKI_FreeStorage(&loaddef);
@@ -539,8 +539,8 @@ skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
         Com_DPrintf("Skeletor CacheAnimSkel: %s: File extension unknown.  Attempting to open as skc file\n", path);
     }
 
-    strcpy(npath, "newanim/");
-    strcat(npath, path);
+    Q_strncpyz(npath, "newanim/", sizeof(npath));
+    Q_strcat(npath, sizeof(npath), path);
 
     iBuffLength = TIKI_ReadFileEx(npath, (void **)&buffer, qtrue);
     if (iBuffLength > 0) {
@@ -714,7 +714,7 @@ bool SkeletorCacheLoadData(const char *path, bool precache, int newIndex)
     m_cachedDataLookup[newIndex] = lookup;
     m_cachedData[lookup].lookup  = newIndex;
     m_cachedData[lookup].data    = data;
-    strcpy(m_cachedData[lookup].path, path);
+    Q_strncpyz(m_cachedData[lookup].path, path, sizeof(m_cachedData[lookup].path));
     m_cachedData[lookup].numusers = 0;
     m_numInCache++;
 
@@ -985,7 +985,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         ptr += sizeof(dtikianimdef_t);
         panim->animdefs[i]  = panimdef;
         panim->m_aliases[i] = alias_index;
-        strcpy(panimdef->alias, anim->alias);
+        Q_strncpyz(panimdef->alias, anim->alias, sizeof(panimdef->alias));
         panimdef->weight = anim->weight;
         panimdef->flags  = anim->flags;
 
@@ -1093,7 +1093,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         memcpy(panim->headskins, ld->headskins, size);
         ptr += size;
 
-        sprintf(tempName, "h%s", ld->path);
+        Com_sprintf(tempName, sizeof(tempName), "h%s", ld->path);
         UI_LoadResource(tempName);
 
         if (low_anim_memory && (!low_anim_memory->integer || !tiki_loading)) {
diff --git a/code/tiki/tiki_imports.cpp b/code/tiki/tiki_imports.cpp
index 33b1bf44..2a7b975f 100644
--- a/code/tiki/tiki_imports.cpp
+++ b/code/tiki/tiki_imports.cpp
@@ -32,7 +32,7 @@ void TIKI_DPrintf(const char *fmt, ...)
     va_list va;
 
     va_start(va, fmt);
-    vsprintf(msg, fmt, va);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
 
     Com_DPrintf("%s", msg);
diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 87500c9f..ce889210 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -150,7 +150,7 @@ void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxc
 
             cmds->frame_num = framenum;
             if (ld->tikiFile.currentScript) {
-                sprintf(cmds->location, "%s, line: %d", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber());
+                Com_sprintf(cmds->location, sizeof(cmds->location), "%s, line: %d", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber());
             }
 
             while (ld->tikiFile.TokenAvailable(false)) {
@@ -468,13 +468,14 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
                 anim->alias = (char *)TIKI_CopyString(token);
 
                 token = ld->tikiFile.GetToken(false);
-                strcpy(anim->name, TikiScript::currentScript->path);
-                strcat(anim->name, token);
+                Q_strncpyz(anim->name, TikiScript::currentScript->path, sizeof(anim->name));
+                Q_strcat(anim->name, sizeof(anim->name), token);
 
                 anim->location[0] = 0;
                 if (ld->tikiFile.currentScript) {
-                    sprintf(
+                    Com_sprintf(
                         anim->location,
+                        sizeof(anim->location),
                         "%s, line: %d",
                         ld->tikiFile.currentScript->Filename(),
                         ld->tikiFile.currentScript->GetLineNumber()
@@ -890,7 +891,7 @@ qboolean TIKI_LoadSetupCase(
                 loadsurfaces[currentSurface].flags = 0;
                 (*numSurfacesSetUp)++;
             }
-            strcpy(loadsurfaces[currentSurface].name, name);
+            Q_strncpyz(loadsurfaces[currentSurface].name, name, sizeof(loadsurfaces[currentSurface].name));
             break;
         case SETUP_FLAGS:
             flags = MSG_ReadLong(msg);
@@ -1031,17 +1032,17 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
             WriteLodBias(ld, lod_bias);
         } else if (!Q_stricmp(token, "skelmodel")) {
             token = ld->tikiFile.GetToken(false);
-            strcpy(name, ld->tikiFile.currentScript->path);
-            strcat(name, token);
+            Q_strncpyz(name, ld->tikiFile.currentScript->path, sizeof(name));
+            Q_strcat(name, sizeof(name), token);
             WriteSkelmodel(ld, name);
         } else if (!Q_stricmp(token, "path")) {
             token = ld->tikiFile.GetToken(false);
-            strcpy(ld->tikiFile.currentScript->path, token);
+            Q_strncpyz(ld->tikiFile.currentScript->path, token, sizeof(name));
             length = strlen(ld->tikiFile.currentScript->path);
             token  = ld->tikiFile.currentScript->path + length - 1;
 
             if (*token != '/' && *token != '\\') {
-                strcat(ld->tikiFile.currentScript->path, "/");
+                Q_strcat(ld->tikiFile.currentScript->path, sizeof(ld->tikiFile.currentScript->path), "/");
             }
         } else if (!Q_stricmp(token, "orgin")) {
             tmpVec[0] = ld->tikiFile.GetFloat(false);
@@ -1071,8 +1072,8 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
                 } else if (!Q_stricmp(token, "shader")) {
                     token = ld->tikiFile.GetToken(false);
                     if (strstr(token, ".")) {
-                        strcpy(name, ld->tikiFile.currentScript->path);
-                        strcat(name, token);
+                        Q_strncpyz(name, ld->tikiFile.currentScript->path, sizeof(name));
+                        Q_strcat(name, sizeof(name), token);
                         WriteShader(ld, name);
                     } else {
                         WriteShader(ld, token);
diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 0f183dbe..01ef9715 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -739,7 +739,7 @@ void GetLODFile(skelcache_t *cache)
         return;
     }
 
-    strcpy(pathLOD, cache->path);
+    Q_strncpyz(pathLOD, cache->path, sizeof(pathLOD));
     ext = strstr(pathLOD, "skd");
     strcpy(ext, "lod");
 
@@ -1069,7 +1069,7 @@ int TIKI_RegisterSkel(const char *path, dtiki_t *tiki)
         }
     }
 
-    sprintf(tempName, "l%s", path);
+    Com_sprintf(tempName, sizeof(tempName), "l%s", path);
     UI_LoadResource(tempName);
 
     return cache - skelcache;
diff --git a/code/uilib/ui_init.cpp b/code/uilib/ui_init.cpp
index 02f4d1f9..b8f7ea30 100644
--- a/code/uilib/ui_init.cpp
+++ b/code/uilib/ui_init.cpp
@@ -101,7 +101,7 @@ void UI_SetCvarInt( const char *cvar, int value )
 {
 	char s[ 16 ];
 
-	sprintf( s, "%d", value );
+	Com_sprintf( s, sizeof( s ), "%d", value );
 	uii.Cvar_Set( cvar, s );
 }
 
@@ -109,7 +109,7 @@ void UI_SetCvarFloat( const char *cvar, float value )
 {
 	char s[ 16 ];
 
-	sprintf( s, "%f", value );
+	Com_sprintf( s, sizeof( s ), "%f", value );
 	uii.Cvar_Set( cvar, s );
 }
 

From 3973b9574693e5d6e82ee57aa2c39414f3fd3613 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Sep 2024 23:09:07 +0200
Subject: [PATCH 0929/2040] Build MacOS binaries from GitHub Action

---
 .github/workflows/shared-build.yml         | 114 +++++++++++++++++++++
 .github/workflows/tags-publish-release.yml |   4 +-
 2 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 13561ffd..179c8e1f 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -13,6 +13,11 @@ env:
   RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
 
 jobs:
+  ##########################
+  #
+  # Linux
+  #
+  ##########################
   build-platform-linux:
     strategy:
       matrix:
@@ -130,6 +135,11 @@ jobs:
         path:
           ${{github.workspace}}/install
 
+  ##########################
+  #
+  # Microsoft Windows
+  #
+  ##########################
   build-platform-windows:
     strategy:
       matrix:
@@ -255,3 +265,107 @@ jobs:
         if-no-files-found: error
         path: |
           ${{github.workspace}}/install
+
+  ##########################
+  #
+  # Apple macOS
+  #
+  ##########################
+  build-platform-macos:
+    strategy:
+      matrix:
+        architecture: [
+          {name: 'x86_64',   os: 'macos-13'},
+          {name: 'arm64',    os: 'macos-14'}
+        ]
+
+    name: "Building for platform macos-${{matrix.architecture.name}}"
+    runs-on: ${{matrix.architecture.os}}
+    environment: ${{ inputs.environment }}
+
+    # Install required packages
+    # Paths on x86_64 and ARM64 are different for homebrew
+    steps:
+    - name: Install required packages
+      run: |
+        brew update && brew install git flex bison ninja cmake llvm
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: sdl2-latest
+        build-type: Release
+        cmake-arguments: "-DCMAKE_C_COMPILER=clang
+          -DCMAKE_CXX_COMPILER=clang++"
+
+    # soft-oal setup
+    # Use GCC instead of Clang because of missing SSE intrinsics
+    # It also doesn't enable altivec support on PowerPC by default
+    - name: Checkout soft-oal
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '1.23.1'
+
+    - name: Configure and install soft-oal
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_CXX_COMPILER=clang++
+        cmake --build ./build --config ${{env.BUILD_TYPE}}
+        cmake --install ./build --config ${{env.BUILD_TYPE}}
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM=--log-level=VERBOSE \
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
+        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_CXX_COMPILER=clang++ \
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Create hard-link and copy symbolic links
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/install/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/install/'
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-macos-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path:
+          ${{github.workspace}}/install
diff --git a/.github/workflows/tags-publish-release.yml b/.github/workflows/tags-publish-release.yml
index 54b22beb..54671c40 100644
--- a/.github/workflows/tags-publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -37,7 +37,9 @@ jobs:
           'windows-x64-pdb',
           'windows-x86-pdb',
           'windows-arm64',
-          'windows-arm64-pdb'
+          'windows-arm64-pdb',
+          'macos-x86_64',
+          'macos-arm64'
         ]
 
     runs-on: ubuntu-22.04

From 75621651e5a411d302b19cad0452bb6aba12d39a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 17:28:49 +0200
Subject: [PATCH 0930/2040] Add arm64 to valid OSX architectures

---
 TargetArch.cmake | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/TargetArch.cmake b/TargetArch.cmake
index 6d1d8dd8..c2c42fb0 100644
--- a/TargetArch.cmake
+++ b/TargetArch.cmake
@@ -71,12 +71,14 @@ function(target_architecture output_var)
         foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
             if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
                 set(osx_arch_ppc TRUE)
+            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
+                set(osx_arch_ppc64 TRUE)
             elseif("${osx_arch}" STREQUAL "i386")
                 set(osx_arch_i386 TRUE)
             elseif("${osx_arch}" STREQUAL "x86_64")
                 set(osx_arch_x86_64 TRUE)
-            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
-                set(osx_arch_ppc64 TRUE)
+            elseif("${osx_arch}" STREQUAL "arm64")
+                set(osx_arch_arm64 TRUE)
             else()
                 message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
             endif()
@@ -87,6 +89,10 @@ function(target_architecture output_var)
             list(APPEND ARCH ppc)
         endif()
 
+        if(osx_arch_ppc64)
+            list(APPEND ARCH ppc64)
+        endif()
+
         if(osx_arch_i386)
             list(APPEND ARCH i386)
         endif()
@@ -95,8 +101,8 @@ function(target_architecture output_var)
             list(APPEND ARCH x86_64)
         endif()
 
-        if(osx_arch_ppc64)
-            list(APPEND ARCH ppc64)
+        if(osx_arch_arm64)
+            list(APPEND ARCH arm64)
         endif()
     else()
     	# figure out extension for the source file

From 61e24499bf86a6a304d28ce17e5aeba8b07ef94c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 18:30:39 +0200
Subject: [PATCH 0931/2040] Cross-compile macOS binaries with single hosted
 runner image

---
 .github/workflows/shared-build.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 179c8e1f..c5d32540 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -40,7 +40,6 @@ jobs:
       working-directory: ${{github.workspace}}
       run: |
         echo "CMAKE_BUILD_PARALLEL_LEVEL=$(($(nproc) * 16))" >> $GITHUB_ENV
-#       echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
 
     - name: Install required packages
       run: |
@@ -275,13 +274,13 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'x86_64',   os: 'macos-13'},
-          {name: 'arm64',    os: 'macos-14'}
+          {name: 'x86_64',   triple: 'x86_64-apple-macos13'},
+          {name: 'arm64',    triple: 'arm64-apple-macos14'}
         ]
 
     name: "Building for platform macos-${{matrix.architecture.name}}"
-    runs-on: ${{matrix.architecture.os}}
-    environment: ${{ inputs.environment }}
+    runs-on: "macos-14"
+    environment: ${{inputs.environment}}
 
     # Install required packages
     # Paths on x86_64 and ARM64 are different for homebrew
@@ -298,7 +297,9 @@ jobs:
         version: sdl2-latest
         build-type: Release
         cmake-arguments: "-DCMAKE_C_COMPILER=clang
-          -DCMAKE_CXX_COMPILER=clang++"
+          -DCMAKE_CXX_COMPILER=clang++
+          -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }}
+          -DCMAKE_VERBOSE_MAKEFILE=on"
 
     # soft-oal setup
     # Use GCC instead of Clang because of missing SSE intrinsics
@@ -316,7 +317,9 @@ jobs:
         cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DCMAKE_C_COMPILER=clang \
-        -DCMAKE_CXX_COMPILER=clang++
+        -DCMAKE_CXX_COMPILER=clang++ \
+        -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
+        -DCMAKE_VERBOSE_MAKEFILE=on
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
 
@@ -329,8 +332,10 @@ jobs:
         echo "CMAKE_PARAM=--log-level=VERBOSE \
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
+        -DCMAKE_VERBOSE_MAKEFILE=on \
         -DCMAKE_C_COMPILER=clang \
         -DCMAKE_CXX_COMPILER=clang++ \
+        -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \

From 91e760bf5fbd16d9a452abb61f7031cc7683de0d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 18:45:41 +0200
Subject: [PATCH 0932/2040] Use a more recent version of ubuntu image for linux

---
 .github/workflows/shared-build.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index c5d32540..38d2f527 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -32,7 +32,7 @@ jobs:
         ]
 
     name: "Building for platform linux-${{matrix.architecture.name}}"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     environment: ${{ inputs.environment }}
 
     steps:
@@ -45,7 +45,7 @@ jobs:
       run: |
         sudo apt update && sudo apt install -y flex bison \
             libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
-  
+
     - name: Install required cross-platform packages (${{ matrix.architecture.triple }})
       if: matrix.architecture.name != 'amd64'
       run: sudo apt install -y gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
@@ -59,8 +59,8 @@ jobs:
         build-type: Release
         cmake-arguments: "-DCMAKE_C_COMPILER=clang
           -DCMAKE_CXX_COMPILER=clang++
-          -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }}
-          -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }}"
+          -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}'
+          -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}'"
 
     # soft-oal setup
     # Use GCC instead of Clang because of missing SSE intrinsics
@@ -77,8 +77,10 @@ jobs:
       run: |
         cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
-        -DCMAKE_C_COMPILER=${{ matrix.architecture.triple }}-gcc-12 \
-        -DCMAKE_CXX_COMPILER=${{ matrix.architecture.triple }}-g++-12
+        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_CXX_COMPILER=clang++ \
+        -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}' \
+        -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}'
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
 
@@ -93,8 +95,8 @@ jobs:
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DCMAKE_C_COMPILER=clang \
         -DCMAKE_CXX_COMPILER=clang++ \
-        -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }} \
-        -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }} \
+        -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}' \
+        -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \

From 529dc29d08136a8b270980cbc7e325edf10088ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:15:26 +0200
Subject: [PATCH 0933/2040] Remove CMake parallel build setting

---
 .github/workflows/shared-build.yml | 66 ++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 38d2f527..2e7b544b 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -36,10 +36,10 @@ jobs:
     environment: ${{ inputs.environment }}
 
     steps:
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_BUILD_PARALLEL_LEVEL=$(($(nproc) * 16))" >> $GITHUB_ENV
+
+    ###
+    # Packages
+    ###
 
     - name: Install required packages
       run: |
@@ -50,6 +50,10 @@ jobs:
       if: matrix.architecture.name != 'amd64'
       run: sudo apt install -y gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
 
+    ###
+    # SDL
+    ###
+
     # Setup SDL
     - name: Set up SDL
       id: sdl
@@ -62,6 +66,10 @@ jobs:
           -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}'
           -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}'"
 
+    ###
+    # OpenAL
+    ###
+
     # soft-oal setup
     # Use GCC instead of Clang because of missing SSE intrinsics
     # It also doesn't enable altivec support on PowerPC by default
@@ -84,6 +92,10 @@ jobs:
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
 
+    ###
+    # Project
+    ###
+
     - uses: actions/checkout@v4
       with:
         path: 'source'
@@ -129,6 +141,10 @@ jobs:
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/install/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/install/'
 
+    ###
+    # Artifacts
+    ###
+
     - uses: actions/upload-artifact@v4
       with:
         name: out-linux-${{matrix.architecture.name}}
@@ -155,10 +171,10 @@ jobs:
     environment: ${{ inputs.environment }}
 
     steps:
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_BUILD_PARALLEL_LEVEL=$((Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors * 16)" >> $GITHUB_ENV
+
+    ###
+    # SDL
+    ###
 
     # Setup SDL
     - name: Set up SDL
@@ -178,6 +194,10 @@ jobs:
         cmake --build winflexbison-build --config Release --parallel
         cmake --install winflexbison-build
 
+    ###
+    # OpenAL
+    ###
+
     # soft-oal setup
     - name: Checkout soft-oal
       uses: actions/checkout@v4
@@ -209,6 +229,10 @@ jobs:
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
         if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
 
+    ###
+    # Project
+    ###
+
     - uses: actions/checkout@v4
       with:
         path: 'source'
@@ -252,6 +276,10 @@ jobs:
         Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/install'
         Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/install'
 
+    ###
+    # Artifact
+    ###
+
     - uses: actions/upload-artifact@v4
       with:
         name: out-windows-${{matrix.architecture.name}}
@@ -284,13 +312,22 @@ jobs:
     runs-on: "macos-14"
     environment: ${{inputs.environment}}
 
+    steps:
+
+    ###
+    # Packages
+    ###
+
     # Install required packages
     # Paths on x86_64 and ARM64 are different for homebrew
-    steps:
     - name: Install required packages
       run: |
         brew update && brew install git flex bison ninja cmake llvm
 
+    ###
+    # SDL
+    ###
+
     # Setup SDL
     - name: Set up SDL
       id: sdl
@@ -302,6 +339,9 @@ jobs:
           -DCMAKE_CXX_COMPILER=clang++
           -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }}
           -DCMAKE_VERBOSE_MAKEFILE=on"
+    ###
+    # OpenAL
+    ###
 
     # soft-oal setup
     # Use GCC instead of Clang because of missing SSE intrinsics
@@ -325,6 +365,10 @@ jobs:
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
 
+    ###
+    # Project
+    ###
+
     - uses: actions/checkout@v4
       with:
         path: 'source'
@@ -370,6 +414,10 @@ jobs:
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/install/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/install/'
 
+    ###
+    # Artifacts
+    ###
+
     - uses: actions/upload-artifact@v4
       with:
         name: out-macos-${{matrix.architecture.name}}

From c316dc7b00418bcfb00f5637940544dba90042b0 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:17:25 +0200
Subject: [PATCH 0934/2040] Fix incorrect line width calculation when tabs are
 present

---
 code/uilib/uimledit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 825dfcfb..22a949d6 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -360,12 +360,12 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
     }
 
     const char *line = LineFromLineNumber(clickedLine, true).c_str();
-    for (i = 0; i < line[i] && totalWidth < p.x; i++) {
+    for (i = 0; line[i] && totalWidth < p.x; i++) {
         lastWidth = m_font->getCharWidth(line[i]);
         totalWidth += lastWidth;
     }
 
-    if (i < line[i] && i) {
+    if (line[i] && i) {
         lastWidth *= 0.5f;
         if (totalWidth - lastWidth >= p.x) {
             i--;

From 705d30d12515bafff9ec65d658c86fbf08862ae1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:16:30 +0200
Subject: [PATCH 0935/2040] Add ninja/cmake/clang to the list of packages to
 install

---
 .github/workflows/shared-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 2e7b544b..b13e8ed4 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Install required packages
       run: |
-        sudo apt update && sudo apt install -y flex bison \
+        sudo apt update && sudo apt install -y flex bison ninja-build cmake clang \
             libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
 
     - name: Install required cross-platform packages (${{ matrix.architecture.triple }})

From 92190220aab965d1b677b6ea0fcdbb37aebef3dd Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:32:23 +0200
Subject: [PATCH 0936/2040] Implement clipboard functionality

---
 code/sys/new/sys_main_new.c | 42 ++++++++++++++++++++++++++++++++++++-
 code/sys/sys_main.c         | 22 ++-----------------
 code/uilib/ui_public.h      |  1 +
 code/uilib/uimledit.cpp     | 17 ++++++++++-----
 4 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index 0df7f6e0..ddf0388b 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -24,6 +24,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../win_localization.h"
 #include "../sys_loadlib.h"
 
+// a pointer to the last piece of data retrieved from the clipboard is stored here,
+// so that it can be cleaned up when new data is retrieved, preventing memory leaks
+static void* clipboard_text = NULL;
+
 static void* game_library = NULL;
 static void* cgame_library = NULL;
 qboolean	GLimp_SpawnRenderThread(void (*function)(void))
@@ -134,7 +138,36 @@ Sys_GetWholeClipboard
 */
 const char* Sys_GetWholeClipboard(void)
 {
+#ifndef DEDICATED
+    char *data = NULL;
+    char *cliptext;
+
+    if ((cliptext = SDL_GetClipboardText()) != NULL) {
+        if (cliptext[0] != NULL) {
+            // It's necessary to limit buffersize to 4096 as each character
+            // is pasted via CharEvent, which is very-very slow and jams up the EventQueue.
+            // A smaller buffer doesn't jam the EventQueue up as much and avoids dropping
+            // characters that otherwise happens when the EventQueue is overloaded.
+            // FIXME: speed up paste logic so this restriction can be removed
+            size_t bufsize = Q_min(strlen(cliptext) + 1, 4096);
+
+            if (clipboard_text != NULL) {
+                // clean up previously allocated clipboard buffer
+                Z_Free(clipboard_text);
+                clipboard_text = NULL;
+            }
+
+            data = clipboard_text = Z_Malloc(bufsize);
+            // Changed in OPM:
+            // original game skips the Windows-specific '\r' (carriage return) char here!
+            Q_strncpyz(data, cliptext, bufsize);
+        }
+        SDL_free(cliptext);
+    }
+    return data;
+#else
     return NULL;
+#endif
 }
 
 /*
@@ -142,8 +175,15 @@ const char* Sys_GetWholeClipboard(void)
 Sys_SetClipboard
 ==============
 */
-void Sys_SetClipboard(const char* contents)
+void Sys_SetClipboard(const char *contents)
 {
+#ifndef DEDICATED
+    if (contents == NULL || contents[0] == NULL) {
+        return;
+    }
+
+    SDL_SetClipboardText(contents);
+#endif
 }
 
 /*
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 6508edce..db1fd2cc 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -146,26 +146,8 @@ Sys_GetClipboardData
 */
 char *Sys_GetClipboardData(void)
 {
-#ifdef DEDICATED
-	return NULL;
-#else
-	char *data = NULL;
-	char *cliptext;
-
-	if ( ( cliptext = SDL_GetClipboardText() ) != NULL ) {
-		if ( cliptext[0] != '\0' ) {
-			size_t bufsize = strlen( cliptext ) + 1;
-
-			data = Z_Malloc( bufsize );
-			Q_strncpyz( data, cliptext, bufsize );
-
-			// find first listed char and set to '\0'
-			strtok( data, "\n\r\b" );
-		}
-		SDL_free( cliptext );
-	}
-	return data;
-#endif
+    // unused - actual function is implemented in sys_main_new.c
+    return NULL;
 }
 
 #ifdef DEDICATED
diff --git a/code/uilib/ui_public.h b/code/uilib/ui_public.h
index 16f4a3a1..a30b5bcb 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -124,6 +124,7 @@ typedef struct uiimport_s {
 	const char *( *Key_KeynumToString )( int keynum );
 	const char *( *GetConfigstring )( int index );
 	void ( *UI_CloseDMConsole )( void );
+	void ( *GetClipboardData )( char *buf, int buflen );
 } uiimport_t;
 
 #if 1
diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 22a949d6..4cfd9573 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -728,7 +728,6 @@ void UIMultiLineEdit::CopySelection(void)
         clipText += "\n" + line;
     }
 
-    // FIXME: clipboard not implemented yet
     uii.Sys_SetClipboard(clipText);
 }
 
@@ -737,12 +736,11 @@ void UIMultiLineEdit::PasteSelection(void)
     str sel;
     int i;
 
-    // temporary variable added in OPM as str cannot handle NULL assignment
-    // will be removed when Sys_GetClipboard is properly implemented
+    // variable added in OPM as str cannot handle NULL assignment
+    // we can get NULL here if clipboard is empty/couldn't be retrieved
     const char *clipboardData = uii.Sys_GetClipboard();
     if (clipboardData == NULL)
     {
-        // FIXME: clipboard not implemented yet
         return;
     }
 
@@ -753,8 +751,17 @@ void UIMultiLineEdit::PasteSelection(void)
     for (i = 0; i < sel.length(); i++) {
         if (sel[i] == '\n') {
             CharEvent('\r');
+        } else if (sel[i] == '\r') {
+            // Changed in OPM:
+            // NOP, drop CR characters.
+            // On Linux/Mac they aren't present anyway,
+            // on Windows we already have LF chars next to them.
+            // The filtering for CR on the Windows side was originally done
+            // in Sys_GetWholeClipboard with a "manual" selective strcpy,
+            // but here we iterate over all characters of the clipboard anyways,
+            // so this feels like a better place to do the filtering.
         } else {
-            CharEvent(sel[i]);
+            CharEvent(sel[i]); // FIXME: this is VERY slow and jams up the EventQueue!
         }
     }
 }

From 6b91846b0c3735b18b5a44a7c81bdf34a3306b20 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:36:13 +0200
Subject: [PATCH 0937/2040] Reimplement `Sys_ListFiles` and
 `Sys_ListFilteredFiles`

They had several bugs, like showing the current and parent directory entires twice, not seeing files but only directories, etc.
---
 code/sys/sys_unix.c  | 261 ++++++++++++++++++-----------------
 code/sys/sys_win32.c | 319 +++++++++++++++++++++++--------------------
 2 files changed, 312 insertions(+), 268 deletions(-)

diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index 7dc2eea1..f090508a 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -369,60 +369,76 @@ DIRECTORY SCANNING
 Sys_ListFilteredFiles
 ==================
 */
-void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, char **list, int *numfiles )
+void Sys_ListFilteredFiles(
+    const char *basedir, char *subdirs, char *filter, qboolean wantsubs, char **list, int *numfiles
+)
 {
-	char          search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
-	char          filename[MAX_OSPATH];
-	DIR           *fdir;
-	struct dirent *d;
-	struct stat   st;
+    char           search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
+    char           filename[MAX_OSPATH];
+    DIR           *fdir;
+    struct dirent *d;
+    struct stat    st;
 
-	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-		return;
-	}
+    if (*numfiles >= MAX_FOUND_FILES - 1) {
+        return;
+    }
 
-	if ( basedir[0] == '\0' ) {
-		return;
-	}
+    if (basedir[0] == '\0') {
+        return;
+    }
 
-	if (strlen(subdirs)) {
-		Com_sprintf( search, sizeof(search), "%s/%s", basedir, subdirs );
-	}
-	else {
-		Com_sprintf( search, sizeof(search), "%s", basedir );
-	}
+    if (strlen(subdirs)) {
+        Com_sprintf(search, sizeof(search), "%s/%s", basedir, subdirs);
+    } else {
+        Com_sprintf(search, sizeof(search), "%s", basedir);
+    }
 
-	if ((fdir = opendir(search)) == NULL) {
-		return;
-	}
+    if ((fdir = opendir(search)) == NULL) {
+        return;
+    }
 
-	while ((d = readdir(fdir)) != NULL) {
-		Com_sprintf(filename, sizeof(filename), "%s/%s", search, d->d_name);
-		if (stat(filename, &st) == -1)
-			continue;
+    while ((d = readdir(fdir)) != NULL) {
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..")) && Q_stricmp(d->d_name, "cvs")) {
+            continue;
+        }
 
-		if (st.st_mode & S_IFDIR) {
-			if (Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..")) {
-				if (strlen(subdirs)) {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s/%s", subdirs, d->d_name);
-				}
-				else {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s", d->d_name);
-				}
-				Sys_ListFilteredFiles( basedir, newsubdirs, filter, list, numfiles );
-			}
-		}
-		if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-			break;
-		}
-		Com_sprintf( filename, sizeof(filename), "%s/%s", subdirs, d->d_name );
-		if (!Com_FilterPath( filter, filename, qfalse ))
-			continue;
-		list[ *numfiles ] = CopyString( filename );
-		(*numfiles)++;
-	}
+        Com_sprintf(filename, sizeof(filename), "%s/%s", search, d->d_name);
+        if (stat(filename, &st) == -1) {
+            continue;
+        }
 
-	closedir(fdir);
+        if ((st.st_mode & S_IFDIR) != 0 && wantsubs) {
+            if (strlen(subdirs)) {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s/%s", subdirs, d->d_name);
+            } else {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s", d->d_name);
+            }
+
+            // recursively iterate into subdirectory
+            Sys_ListFilteredFiles(basedir, newsubdirs, filter, wantsubs, list, numfiles);
+        }
+
+        if (*numfiles >= MAX_FOUND_FILES - 1) {
+            break;
+        }
+
+        if (strlen(subdirs)) {
+            Com_sprintf(filename, sizeof(filename), "%s/%s", subdirs, d->d_name);
+        } else {
+            Q_strncpyz(filename, d->d_name, sizeof(filename));
+        }
+
+        if (!Com_FilterPath(filter, filename, qfalse)) {
+            continue;
+        }
+
+        list[*numfiles] = CopyString(filename);
+        (*numfiles)++;
+    }
+
+    closedir(fdir);
 }
 
 /*
@@ -430,104 +446,105 @@ void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, ch
 Sys_ListFiles
 ==================
 */
-char **Sys_ListFiles( const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs )
+char **Sys_ListFiles(const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs)
 {
-	struct dirent *d;
-	DIR           *fdir;
-	qboolean      dironly = wantsubs;
-	char          search[MAX_OSPATH];
-	int           nfiles;
-	char          **listCopy;
-	char          *list[MAX_FOUND_FILES];
-	int           i;
-	struct stat   st;
+    struct dirent *d;
+    DIR           *fdir;
+    char           search[MAX_OSPATH];
+    int            nfiles;
+    char         **listCopy;
+    char          *list[MAX_FOUND_FILES];
+    int            i;
+    struct stat    st;
+    char           buffer[64];
 
-	int           extLen;
+    if (directory[0] == '\0') {
+        *numfiles = 0;
+        return NULL;
+    }
 
-	if (filter) {
+    if (!extension) {
+        extension = "";
+    }
 
-		nfiles = 0;
-		Sys_ListFilteredFiles( directory, "", filter, list, &nfiles );
+    // passing a slash as extension will find directories,
+    // anything else looks only for files with that extension
+    if (!filter && (extension[0] != '/' || extension[1])) {
+        Q_snprintf(buffer, sizeof(buffer), "*%s", extension);
+        filter = buffer;
+    }
 
-		list[ nfiles ] = NULL;
-		*numfiles = nfiles;
+    if (filter) {
+        nfiles = 0;
+        Sys_ListFilteredFiles(directory, "", filter, wantsubs, list, &nfiles);
 
-		if (!nfiles)
-			return NULL;
+        list[nfiles] = NULL;
+        *numfiles    = nfiles;
+        if (!nfiles) {
+            return NULL;
+        }
 
-		listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-		for ( i = 0 ; i < nfiles ; i++ ) {
-			listCopy[i] = list[i];
-		}
-		listCopy[i] = NULL;
+        listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+        for (i = 0; i < nfiles; i++) {
+            listCopy[i] = list[i];
+        }
+        listCopy[i] = NULL;
 
-		return listCopy;
-	}
+        return listCopy;
+    }
 
-	if ( directory[0] == '\0' ) {
-		*numfiles = 0;
-		return NULL;
-	}
+    // only enumerate directories from this point onward
 
-	if ( !extension)
-		extension = "";
+    // search
+    nfiles = 0;
 
-	if ( extension[0] == '/' && extension[1] == 0 ) {
-		extension = "";
-		dironly = qtrue;
-	}
+    if ((fdir = opendir(directory)) == NULL) {
+        *numfiles = 0;
+        return NULL;
+    }
 
-	extLen = strlen( extension );
+    while ((d = readdir(fdir)) != NULL) {
+        Com_sprintf(search, sizeof(search), "%s/%s", directory, d->d_name);
+        if (stat(search, &st) == -1) {
+            continue;
+        }
 
-	// search
-	nfiles = 0;
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..") && Q_stricmp(d->d_name, "cvs"))) {
+            continue;
+        }
 
-	if ((fdir = opendir(directory)) == NULL) {
-		*numfiles = 0;
-		return NULL;
-	}
+        if ((st.st_mode & S_IFDIR) == 0) {
+            continue;
+        }
 
-	while ((d = readdir(fdir)) != NULL) {
-		Com_sprintf(search, sizeof(search), "%s/%s", directory, d->d_name);
-		if (stat(search, &st) == -1)
-			continue;
-		if ((dironly && !(st.st_mode & S_IFDIR)) ||
-			(!dironly && (st.st_mode & S_IFDIR)))
-			continue;
+        if (nfiles == MAX_FOUND_FILES - 1) {
+            break;
+        }
 
-		if (*extension) {
-			if ( strlen( d->d_name ) < extLen ||
-				Q_stricmp(
-					d->d_name + strlen( d->d_name ) - extLen,
-					extension ) ) {
-				continue; // didn't match
-			}
-		}
+        list[nfiles] = CopyString(d->d_name);
+        nfiles++;
+    }
 
-		if ( nfiles == MAX_FOUND_FILES - 1 )
-			break;
-		list[ nfiles ] = CopyString( d->d_name );
-		nfiles++;
-	}
+    list[nfiles] = NULL;
 
-	list[ nfiles ] = NULL;
+    closedir(fdir);
 
-	closedir(fdir);
+    // return a copy of the list
+    *numfiles = nfiles;
 
-	// return a copy of the list
-	*numfiles = nfiles;
+    if (!nfiles) {
+        return NULL;
+    }
 
-	if ( !nfiles ) {
-		return NULL;
-	}
+    listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+    for (i = 0; i < nfiles; i++) {
+        listCopy[i] = list[i];
+    }
+    listCopy[i] = NULL;
 
-	listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-	for ( i = 0 ; i < nfiles ; i++ ) {
-		listCopy[i] = list[i];
-	}
-	listCopy[i] = NULL;
-
-	return listCopy;
+    return listCopy;
 }
 
 /*
diff --git a/code/sys/sys_win32.c b/code/sys/sys_win32.c
index e7027ff5..0e060e94 100644
--- a/code/sys/sys_win32.c
+++ b/code/sys/sys_win32.c
@@ -477,56 +477,78 @@ DIRECTORY SCANNING
 Sys_ListFilteredFiles
 ==============
 */
-void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, char **list, int *numfiles )
+void Sys_ListFilteredFiles(
+    const char *basedir, const char *subdirs, char *filter, qboolean wantsubs, char **list, int *numfiles
+)
 {
-	char		search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
-	char		filename[MAX_OSPATH];
-	intptr_t	findhandle;
-	struct _finddata_t findinfo;
+    char               search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
+    char               filename[MAX_OSPATH];
+    intptr_t           findhandle;
+    struct _finddata_t findinfo;
 
-	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-		return;
-	}
+    if (*numfiles >= MAX_FOUND_FILES - 1) {
+        return;
+    }
 
-	if ( basedir[0] == '\0' ) {
-		return;
-	}
+    if (basedir[0] == '\0') {
+        return;
+    }
 
-	if (strlen(subdirs)) {
-		Com_sprintf( search, sizeof(search), "%s\\%s\\*", basedir, subdirs );
-	}
-	else {
-		Com_sprintf( search, sizeof(search), "%s\\*", basedir );
-	}
+    if (strlen(subdirs)) {
+        Com_sprintf(search, sizeof(search), "%s\\%s\\*", basedir, subdirs);
+    } else {
+        Com_sprintf(search, sizeof(search), "%s\\*", basedir);
+    }
 
-	findhandle = _findfirst (search, &findinfo);
-	if (findhandle == -1) {
-		return;
-	}
+    findhandle = _findfirst(search, &findinfo);
+    if (findhandle == -1) {
+        return;
+    }
 
-	do {
-		if (findinfo.attrib & _A_SUBDIR) {
-			if (Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..")) {
-				if (strlen(subdirs)) {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s\\%s", subdirs, findinfo.name);
-				}
-				else {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s", findinfo.name);
-				}
-				Sys_ListFilteredFiles( basedir, newsubdirs, filter, list, numfiles );
-			}
-		}
-		if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-			break;
-		}
-		Com_sprintf( filename, sizeof(filename), "%s\\%s", subdirs, findinfo.name );
-		if (!Com_FilterPath( filter, filename, qfalse ))
-			continue;
-		list[ *numfiles ] = CopyString( filename );
-		(*numfiles)++;
-	} while ( _findnext (findhandle, &findinfo) != -1 );
+    do {
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..") && Q_stricmp(findinfo.name, "cvs"))) {
+            continue;
+        }
 
-	_findclose (findhandle);
+        if ((findinfo.attrib & _A_SUBDIR) != 0 && wantsubs) {
+            if (strlen(subdirs)) {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s\\%s\\*", subdirs, findinfo.name);
+            } else {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s", findinfo.name);
+            }
+
+            // recursively iterate into subdirectory
+            Sys_ListFilteredFiles(basedir, newsubdirs, filter, wantsubs, list, numfiles);
+        }
+
+        if (*numfiles >= MAX_FOUND_FILES - 1) {
+            break;
+        }
+
+        if (strlen(subdirs)) {
+            Com_sprintf(filename, sizeof(filename), "%s\\%s", subdirs, findinfo.name);
+        } else {
+            Q_strncpyz(filename, findinfo.name, sizeof(filename));
+        }
+
+        if (!Com_FilterPath(filter, filename, qfalse)) {
+            continue;
+        }
+
+        list[*numfiles] = CopyString(filename);
+
+        // replace backslashes with forward slashes, if any
+        // FS_ReplaceSeparators would be nice but it does the opposite
+        for (char *c = strchr(list[*numfiles], '\\'); c; c = strchr(list[*numfiles], '\\')) {
+            *c = '/';
+        }
+
+        (*numfiles)++;
+    } while (_findnext(findhandle, &findinfo) != -1);
+
+    _findclose(findhandle);
 }
 
 /*
@@ -536,24 +558,24 @@ strgtr
 */
 static qboolean strgtr(const char *s0, const char *s1)
 {
-	int l0, l1, i;
+    int l0, l1, i;
 
-	l0 = strlen(s0);
-	l1 = strlen(s1);
+    l0 = strlen(s0);
+    l1 = strlen(s1);
 
-	if (l1<l0) {
-		l0 = l1;
-	}
+    if (l1 < l0) {
+        l0 = l1;
+    }
 
-	for(i=0;i<l0;i++) {
-		if (s1[i] > s0[i]) {
-			return qtrue;
-		}
-		if (s1[i] < s0[i]) {
-			return qfalse;
-		}
-	}
-	return qfalse;
+    for (i = 0; i < l0; i++) {
+        if (s1[i] > s0[i]) {
+            return qtrue;
+        }
+        if (s1[i] < s0[i]) {
+            return qfalse;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -561,116 +583,121 @@ static qboolean strgtr(const char *s0, const char *s1)
 Sys_ListFiles
 ==============
 */
-char **Sys_ListFiles( const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs )
+char **Sys_ListFiles(const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs)
 {
-	char		search[MAX_OSPATH];
-	int			nfiles;
-	char		**listCopy;
-	char		*list[MAX_FOUND_FILES];
-	struct _finddata_t findinfo;
-	intptr_t		findhandle;
-	int			flag;
-	int			i;
-	int			extLen;
+    char               search[MAX_OSPATH];
+    int                nfiles;
+    char             **listCopy;
+    char              *list[MAX_FOUND_FILES] = {NULL};
+    struct _finddata_t findinfo;
+    intptr_t           findhandle;
+    qboolean           swapped;
+    int                i;
+    char               buffer[64];
 
-	if (filter) {
+    if (directory[0] == NULL) {
+        *numfiles = 0;
+        return NULL;
+    }
 
-		nfiles = 0;
-		Sys_ListFilteredFiles( directory, "", filter, list, &nfiles );
+    if (!extension) {
+        extension = "";
+    }
 
-		list[ nfiles ] = 0;
-		*numfiles = nfiles;
+    // passing a slash as extension will find directories,
+    // anything else looks only for files with that extension
+    if (!filter && (extension[0] != '/' || extension[1])) {
+        Q_snprintf(buffer, sizeof(buffer), "*%s", extension);
+        filter = buffer;
+    }
 
-		if (!nfiles)
-			return NULL;
+    if (filter) {
+        nfiles = 0;
+        Sys_ListFilteredFiles(directory, "", filter, wantsubs, list, &nfiles);
 
-		listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-		for ( i = 0 ; i < nfiles ; i++ ) {
-			listCopy[i] = list[i];
-		}
-		listCopy[i] = NULL;
+        list[nfiles] = NULL;
+        *numfiles    = nfiles;
+        if (!nfiles) {
+            return NULL;
+        }
 
-		return listCopy;
-	}
+        listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+        for (i = 0; i < nfiles; i++) {
+            listCopy[i] = list[i];
+        }
+        listCopy[i] = NULL;
 
-	if ( directory[0] == '\0' ) {
-		*numfiles = 0;
-		return NULL;
-	}
+        return listCopy;
+    }
 
-	if ( !extension) {
-		extension = "";
-	}
+    // only enumerate directories from this point onward
+    Com_sprintf(search, 256, "%s\\*", directory);
 
-	// passing a slash as extension will find directories
-	if ( extension[0] == '/' && extension[1] == 0 ) {
-		extension = "";
-		flag = 0;
-	} else {
-		flag = _A_SUBDIR;
-	}
+    // search
+    nfiles     = 0;
+    findhandle = _findfirst(search, &findinfo);
+    if (findhandle == -1) {
+        *numfiles = 0;
+        return NULL;
+    }
 
-	extLen = strlen( extension );
+    do {
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..") && Q_stricmp(findinfo.name, "cvs"))) {
+            continue;
+        }
 
-	Com_sprintf( search, sizeof(search), "%s\\*%s", directory, extension );
+        if ((findinfo.attrib & _A_SUBDIR) == 0) {
+            continue;
+        }
 
-	// search
-	nfiles = 0;
+        if (nfiles >= MAX_FOUND_FILES - 1) {
+            break;
+        }
 
-	findhandle = _findfirst (search, &findinfo);
-	if (findhandle == -1) {
-		*numfiles = 0;
-		return NULL;
-	}
+        list[nfiles] = CopyString(findinfo.name);
 
-	do {
-		if ( (!wantsubs && flag ^ ( findinfo.attrib & _A_SUBDIR )) || (wantsubs && findinfo.attrib & _A_SUBDIR) ) {
-			if (*extension) {
-				if ( strlen( findinfo.name ) < extLen ||
-					Q_stricmp(
-						findinfo.name + strlen( findinfo.name ) - extLen,
-						extension ) ) {
-					continue; // didn't match
-				}
-			}
-			if ( nfiles == MAX_FOUND_FILES - 1 ) {
-				break;
-			}
-			list[ nfiles ] = CopyString( findinfo.name );
-			nfiles++;
-		}
-	} while ( _findnext (findhandle, &findinfo) != -1 );
+        // replace backslashes with forward slashes
+        // FS_ReplaceSeparators would be nice but it does the opposite
+        for (char *c = strchr(list[nfiles], '\\'); c; c = strchr(list[nfiles], '\\')) {
+            *c = '/';
+        }
 
-	list[ nfiles ] = 0;
+        ++nfiles;
+    } while (_findnext(findhandle, &findinfo) != -1);
 
-	_findclose (findhandle);
+    list[nfiles] = NULL;
 
-	// return a copy of the list
-	*numfiles = nfiles;
+    _findclose(findhandle);
 
-	if ( !nfiles ) {
-		return NULL;
-	}
+    // return a copy of the list
+    *numfiles = nfiles;
 
-	listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-	for ( i = 0 ; i < nfiles ; i++ ) {
-		listCopy[i] = list[i];
-	}
-	listCopy[i] = NULL;
+    if (!nfiles) {
+        return NULL;
+    }
 
-	do {
-		flag = 0;
-		for(i=1; i<nfiles; i++) {
-			if (strgtr(listCopy[i-1], listCopy[i])) {
-				char *temp = listCopy[i];
-				listCopy[i] = listCopy[i-1];
-				listCopy[i-1] = temp;
-				flag = 1;
-			}
-		}
-	} while(flag);
+    listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+    for (i = 0; i < nfiles; i++) {
+        listCopy[i] = list[i];
+    }
+    listCopy[i] = NULL;
 
-	return listCopy;
+    // bubble-sort name entries alphabetically, in ascending order
+    do {
+        swapped = qfalse;
+        for (i = 1; i < nfiles; i++) {
+            if (strgtr(listCopy[i - 1], listCopy[i])) {
+                char *temp      = listCopy[i];
+                listCopy[i]     = listCopy[i - 1];
+                listCopy[i - 1] = temp;
+                swapped         = qtrue;
+            }
+        }
+    } while (swapped);
+
+    return listCopy;
 }
 
 /*

From c8a2de8235dbdab4441540a2c611ddd11d75ba78 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:37:50 +0200
Subject: [PATCH 0938/2040] Implement `FS_FileTime` for proper retrieval of
 file date/size info in FilePicker

---
 code/qcommon/files.cpp | 52 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 0890fee7..03d590d4 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifndef _WIN32
 #   include <sys/types.h>
+#   include <sys/stat.h>
+#   include <errno.h>
 #   include <dirent.h>
 #endif
 
@@ -4445,13 +4447,51 @@ void FS_CanonicalFilename(char* filename)
 	*dest = 0;
 }
 
-void FS_FileTime(const char* filename, char* date, char* size) {
-	const char* ospath;
+void FS_FileTime(const char *filename, char *date, char *size)
+{
+    const char *ospath;
+    struct stat fileStat;
+    int         result = -1;
 
-	date[0] = 0;
-	size[0] = 0;
+    date[0] = 0;
+    size[0] = 0;
 
-	ospath = FS_BuildOSPath(fs_homepath->string, fs_gamedir, filename);
+    // Fixed in OPM:
+    // don't only check the home directory (fs_homepath) for possible files,
+    // but look through all searchpaths
+    //ospath = FS_BuildOSPath(fs_homepath->string, fs_gamedir, filename);
+    for (auto search = fs_searchpaths; search; search = search->next) {
+        if (search->dir != NULL && search->dir->path != NULL) {
+            ospath = FS_BuildOSPath(search->dir->path, fs_gamedir, filename);
+            result = stat(ospath, &fileStat);
+            if (result != -1) {
+                // found the valid file
+                break;
+            }
+        }
+    }
 
-	// FIXME: unimplemented
+    if (result == -1) {
+        int err = errno;
+        return;
+    }
+
+    time_t modTime  = fileStat.st_mtime;
+    off_t  fileSize = fileStat.st_size;
+
+    // FIXME: provide option not to use idiotic date formats
+    tm tm = *localtime(&modTime);
+    Q_snprintf(
+        date,
+        128,
+        "%2d/%02d/%04d %2d:%02d%c",
+        tm.tm_mon + 1,
+        tm.tm_mday,
+        tm.tm_year + 1900,
+        (tm.tm_hour + 12) % 12,
+        tm.tm_min,
+        tm.tm_hour < 12 ? 'a' : 'p'
+    );
+
+    Q_snprintf(size, 128, "%d", fileSize);
 }

From 72409622ef2854241e3f648189f3cd6e65ff48b1 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:43:18 +0200
Subject: [PATCH 0939/2040] Stop activating controls when their vertical
 scrollbar is hovered over

This fixes the annoyance of open windows (console, notepad) losing focus just by simply moving the mouse around
---
 code/uilib/uivertscroll.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/uilib/uivertscroll.cpp b/code/uilib/uivertscroll.cpp
index d8055775..28cc252d 100644
--- a/code/uilib/uivertscroll.cpp
+++ b/code/uilib/uivertscroll.cpp
@@ -344,7 +344,11 @@ void UIVertScroll::MouseEnter
 	)
 
 {
-	uWinMan.ActivateControl(this);
+	// Fixed in OPM
+	// Why should hovering over the scrollbar activate the control it's on?
+	// This is more disorienting than useful, also no sane window manager
+	// works like this. Simply clicking into it should be sufficient.
+	//uWinMan.ActivateControl(this);
 }
 
 void UIVertScroll::MouseLeave

From a3d2c2c044e2ad49fe9ef68da159007e84d4eb14 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:46:32 +0200
Subject: [PATCH 0940/2040] Properly free `uipopup_describe` instances

---
 code/uilib/uinotepad.cpp |  9 +--------
 code/uilib/uipopupmenu.h | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index badf3ee6..eda10408 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -303,14 +303,7 @@ UINotepad::~UINotepad()
         for (int j = inner->NumObjects(); j > 0; j--) {
             uipopup_describe *uipd = inner->ObjectAt(j);
             inner->RemoveObjectAt(j);
-            // NOTE: `delete uipd` is intentionally missing here!
-            // Since uipds created for this class have data fields
-            // that contain pointers only to static Event objects,
-            // the fields don't need to be cleaned up as they weren't
-            // dynamically allocated in the first place.
-            // See UINotepad::Create for reference.
-            // However, FIXME: the uipds themselves should still
-            // get cleaned up, but that doesn't happen yet.
+            delete uipd;
         }
     }
 }
diff --git a/code/uilib/uipopupmenu.h b/code/uilib/uipopupmenu.h
index 635ff264..34df08df 100644
--- a/code/uilib/uipopupmenu.h
+++ b/code/uilib/uipopupmenu.h
@@ -68,12 +68,19 @@ uipopup_describe::uipopup_describe
 inline
 uipopup_describe::~uipopup_describe()
 {
-	if (this->data)
-	{
-		// clean up strdup'd C-string from memory
-		free(this->data);
-		this->data = NULL;
-	}
+    if (this->data == NULL) {
+        // nothing to clean up
+        return;
+    }
+
+    // only clean up these types of uipds, because:
+    //  - UIP_EVENT types point to static Event instances,
+    //  - UIP_EVENT_STRING types point to already freed Event instances
+    if (this->type == UIP_CMD || this->type == UIP_CVAR) {
+        // clean up strdup'd C-string from memory
+        free(this->data);
+        this->data = NULL;
+    }
 }
 
 class UIPopupMenu : public UIWidget {

From 62c24826e6162c348263daf6ac0ff3cacc516758 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:49:43 +0200
Subject: [PATCH 0941/2040] Silence some localization error console spam
 messages

This helps to reduce the number of `LOCALIZATION ERROR` messages in the console for strings that couldn't be translated anyway
---
 code/uilib/uimledit.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 4cfd9573..3fe73576 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -213,7 +213,11 @@ void UIMultiLineEdit::Draw(void)
                 // print entire line with the selection highlight box around it
                 DrawBox(0.0f, aty, linewidth, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
                 m_font->setColor(selectionColor);
-                m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                // Fixed in OPM:
+                // don't spam LOCALIZATION ERROR messages to console
+                // for clicking lines in the opened text document
+                //m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                m_font->Print(0, aty, cur, -1, m_bVirtual);
             } else if (i != topsel->line) {
                 // part of this line is selected, and selection continues/began above
                 if (i == botsel->line) { // sanity check, should always be true
@@ -261,7 +265,11 @@ void UIMultiLineEdit::Draw(void)
                     // no selection or highlighted text
                     caret = m_font->getWidth(cur, topsel->column);
                     m_font->setColor(m_foreground_color);
-                    m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                    // Fixed in OPM:
+                    // don't spam LOCALIZATION ERROR messages to console
+                    // for clicking lines in the opened text document
+                    //m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                    m_font->Print(0, aty, cur, -1, m_bVirtual);
                 } else {
                     // selection starts and ends on this line
                     int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start

From b3a9f4423be136274dfc621f488453b67604fee4 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:52:20 +0200
Subject: [PATCH 0942/2040] Fix crash when saving a file with no contents or
 with no name

---
 code/uilib/uimledit.cpp  | 8 +++++++-
 code/uilib/uinotepad.cpp | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 3fe73576..3c04912d 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -128,7 +128,13 @@ void UIMultiLineEdit::getData(str& data)
     data = "";
 
     for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid(); i++, m_lines.IterateNext()) {
-        data += m_lines.getCurrent();
+        str text = m_lines.getCurrent();
+        if (i == 0 && !text.length() && m_lines.getCount() <= 1) {
+            // file is empty
+            return;
+        }
+
+        data += text;
 
         if (i != m_lines.getCount() - 1) {
             data += "\n";
diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index eda10408..8450c152 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -424,13 +424,16 @@ void UINotepad::Save(Event *ev)
 {
     if (!m_filename.length()) {
         SaveAs(NULL);
+        // Fixed in OPM:
+        // devs probably forgot to return here - saving was attempted,
+        // even though there was no filename to save the file with
+        return;
     }
 
     str filecontents;
     m_edit->getData(filecontents);
     m_edit->setChanged(false);
 
-    // FIXME: m_filename could be blank
     FS_WriteTextFile(m_filename, filecontents, filecontents.length());
 
     str result = "Saved " + m_filename;

From 2a13fca737f7350e13cf86968b52ab8ee77a8a34 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:01:03 +0200
Subject: [PATCH 0943/2040] Fix an off-by-one bug when selection points are
 determined

---
 code/uilib/uimledit.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 3c04912d..45463ab7 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -327,6 +327,7 @@ void UIMultiLineEdit::Draw(void)
     }
 }
 
+// num is the ZERO-BASED index of the sought line!
 str& UIMultiLineEdit::LineFromLineNumber(int num, bool resetpos)
 {
     static str emptyLine;
@@ -363,9 +364,7 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
     float lastWidth  = 0;
 
     clickedLine = m_vertscroll->getTopItem() + p.y / m_font->getHeight(m_bVirtual);
-    if (clickedLine >= m_lines.getCount()) {
-        clickedLine = m_lines.getCount() - 1;
-    }
+    clickedLine = Q_min(clickedLine, m_lines.getCount() - 1);
 
     if (clickedLine < 0) {
         sel.line   = 0;
@@ -462,7 +461,10 @@ void UIMultiLineEdit::EnsureSelectionPointVisible(selectionpoint_t& point)
 
 void UIMultiLineEdit::BoundSelectionPoint(selectionpoint_t& point)
 {
-    point.line = Q_clamp_int(point.line, 0, m_lines.getCount());
+    // since LineFromLineNumber expects a zero-based line index,
+    // clamp it to one less than the number of lines if the selection point
+    // is right at the end of the text document
+    point.line = Q_clamp_int(point.line, 0, m_lines.getCount() - 1);
 
     str& line    = LineFromLineNumber(point.line, true);
     point.column = Q_clamp_int(point.column, 0, line.length());

From 173ca3e58e226b0e9f115c42371c2cb13415b53c Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:02:58 +0200
Subject: [PATCH 0944/2040] Fix assertion failures on `str` operations

---
 code/client/cl_uimaprunner.cpp |  2 +-
 code/uilib/uimledit.cpp        | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/code/client/cl_uimaprunner.cpp b/code/client/cl_uimaprunner.cpp
index 40b0730d..20f4fbb9 100644
--- a/code/client/cl_uimaprunner.cpp
+++ b/code/client/cl_uimaprunner.cpp
@@ -83,7 +83,7 @@ void PickFile(const char *name, Listener *obj, Event& event)
     if (name && *name && strchr(name, '/')) {
         currentpath = name;
 
-        for (i = currentpath.length(); i > 0; i--) {
+        for (i = currentpath.length() - 1; i > 0; i--) {
             if (currentpath[i] == '/') {
                 break;
             }
diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 45463ab7..688e124f 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -646,12 +646,19 @@ void UIMultiLineEdit::DeleteSelection(void)
 
     for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < topsel->line; i++, m_lines.IterateNext()) {}
 
+    // delete topmost line of the selection, but only up to topsel->column
     str& topline = m_lines.getCurrent();
-    topline.CapLength(topsel->column);
+    if (topline.length() > topsel->column) {
+        topline.CapLength(topsel->column);
+    }
     m_lines.IterateNext();
-    str& line = m_lines.getCurrent();
+    str line = m_lines.getCurrent();
+
+    // merge remainder of topmost line with the remainder after the end of selection
+    if (line.length() > botsel->column) {
+        topline += &line[botsel->column];
+    }
 
-    topline += &line[botsel->column];
     m_lines.RemoveCurrentSetPrev();
     *botsel = *topsel;
     m_vertscroll->setNumItems(m_lines.getCount());
@@ -691,8 +698,11 @@ void UIMultiLineEdit::CharEvent(int ch)
         m_changed = true;
 
         str& line      = LineFromLineNumber(m_selection.begin.line, false);
-        str  otherline = &line[m_selection.begin.column];
-        otherline.CapLength(m_selection.begin.column);
+        str otherline = "";
+        if (line.length() > m_selection.begin.column) {
+            otherline = &line[m_selection.begin.column];
+            line.CapLength(m_selection.begin.column);
+        }
 
         if (m_lines.IsCurrentValid()) {
             m_lines.InsertAfterCurrent(otherline);
@@ -730,7 +740,9 @@ void UIMultiLineEdit::CopySelection(void)
 
     line = LineFromLineNumber(topsel->line, true);
 
-    clipText += &line[topsel->column];
+    if (line.length() > topsel->column) {
+        clipText += &line[topsel->column];
+    }
 
     if (topsel->line == botsel->line) {
         clipText.CapLength(botsel->column - topsel->column);
@@ -740,7 +752,9 @@ void UIMultiLineEdit::CopySelection(void)
         }
 
         line = LineFromLineNumber(botsel->line, true);
-        line.CapLength(botsel->column);
+        if (line.length() > botsel->column) {
+            line.CapLength(botsel->column);
+        }
         clipText += "\n" + line;
     }
 

From 5128d887222ed9298b8fdfc601dfd53fe96dcf50 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:04:57 +0200
Subject: [PATCH 0945/2040] Fix bug when deleting multiple lines doesn't
 actually remove everything selected

---
 code/uilib/uimledit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 688e124f..d2c21a1d 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -634,7 +634,7 @@ void UIMultiLineEdit::DeleteSelection(void)
         EnsureSelectionPointVisible(*topsel);
         return;
     } else if (botsel->line - topsel->line > 1) {
-        for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < topsel->line;
+        for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < botsel->line;
              i++, m_lines.IterateNext()) {
             if (i > topsel->line) {
                 m_lines.RemoveCurrentSetPrev();

From fe0e5c1d9c986297e3285de6dce5249b374e9ff0 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:08:11 +0200
Subject: [PATCH 0946/2040] Fix bug when multiple lines are joined together
 after copy-pasting text

---
 code/uilib/uimledit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index d2c21a1d..cac86015 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -748,7 +748,7 @@ void UIMultiLineEdit::CopySelection(void)
         clipText.CapLength(botsel->column - topsel->column);
     } else {
         for (int i = topsel->line + 1; i < botsel->line; ++i) {
-            clipText += LineFromLineNumber(i, 1);
+            clipText += "\n" + LineFromLineNumber(i, 1);
         }
 
         line = LineFromLineNumber(botsel->line, true);

From 0bd15172b159a7efff5f4cbaea98aaf9c940c94f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:29:31 +0200
Subject: [PATCH 0947/2040] Use Ninja generator for faster builds and set
 compiler/flags in environment variables directly to reduce copy-pasted
 parameters

---
 .github/workflows/shared-build.yml | 88 +++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index b13e8ed4..9ce7a664 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -36,7 +36,6 @@ jobs:
     environment: ${{ inputs.environment }}
 
     steps:
-
     ###
     # Packages
     ###
@@ -50,6 +49,15 @@ jobs:
       if: matrix.architecture.name != 'amd64'
       run: sudo apt install -y gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
 
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
+        echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+        echo "CXXFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+
     ###
     # SDL
     ###
@@ -61,10 +69,7 @@ jobs:
       with:
         version: sdl2-latest
         build-type: Release
-        cmake-arguments: "-DCMAKE_C_COMPILER=clang
-          -DCMAKE_CXX_COMPILER=clang++
-          -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}'
-          -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}'"
+        cmake-arguments: ""
 
     ###
     # OpenAL
@@ -84,11 +89,7 @@ jobs:
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
         cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
-        -DCMAKE_C_COMPILER=clang \
-        -DCMAKE_CXX_COMPILER=clang++ \
-        -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}' \
-        -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}'
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
         cmake --build ./build --config ${{env.BUILD_TYPE}}
         cmake --install ./build --config ${{env.BUILD_TYPE}}
 
@@ -105,10 +106,6 @@ jobs:
         echo "CMAKE_PARAM=--log-level=VERBOSE \
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
-        -DCMAKE_C_COMPILER=clang \
-        -DCMAKE_CXX_COMPILER=clang++ \
-        -DCMAKE_C_FLAGS='--target=${{ matrix.architecture.triple }}' \
-        -DCMAKE_CXX_FLAGS='--target=${{ matrix.architecture.triple }}' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
@@ -137,7 +134,7 @@ jobs:
       # Install to the directory defined in CMAKE_INSTALL_PREFIX
       run: |
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        # Create hard-link and copy symbolic links
+        # Copy libraries
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/install/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/install/'
 
@@ -161,9 +158,9 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'x64',   config: 'x64' },
-          {name: 'x86',   config: 'Win32' },
-          {name: 'arm64', config: 'ARM64' }
+          {name: 'x64',   config: 'x64',    toolset: 'x64' },
+          {name: 'x86',   config: 'Win32',  toolset: 'x64_x86' },
+          {name: 'arm64', config: 'ARM64',  toolset: 'x64_arm64' }
         ]
 
     name: "Building for platform windows-${{matrix.architecture.name}}"
@@ -171,6 +168,38 @@ jobs:
     environment: ${{ inputs.environment }}
 
     steps:
+    ###
+    # Packages
+    ###
+
+    - name: Install required packages
+      run: |
+        choco install -y ninja
+
+    - name: Install Flex/Bison
+      working-directory: ${{github.workspace}}
+      run: |
+        mkdir thirdparties && cd thirdparties
+        git clone --depth 1 --single-branch --branch v2.5.25 https://github.com/lexxmark/winflexbison.git
+        cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
+        cmake --build winflexbison-build --config Release --parallel
+        cmake --install winflexbison-build
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja" >> $env:GITHUB_ENV
+        echo "CC=cl.exe" >> $env:GITHUB_ENV
+        echo "CXX=cl.exe" >> $env:GITHUB_ENV
+        pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
+        cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
+          if ($_ -match "=") {
+            # Split into key=value
+            $var = $_.split("=", 2);
+            echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
+          }
+        }
+        popd
 
     ###
     # SDL
@@ -183,16 +212,7 @@ jobs:
       with:
         version: sdl2-latest
         build-type: Release
-        cmake-arguments: "-A ${{ matrix.architecture.config }}"
-
-    - name: Install Flex/Bison
-      working-directory: ${{github.workspace}}
-      run: |
-        mkdir thirdparties && cd thirdparties
-        git clone --depth 1 --single-branch --branch v2.5.25 https://github.com/lexxmark/winflexbison.git
-        cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
-        cmake --build winflexbison-build --config Release --parallel
-        cmake --install winflexbison-build
+        cmake-arguments: ""
 
     ###
     # OpenAL
@@ -211,7 +231,7 @@ jobs:
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
-        cmake -B ./build -A ${{ matrix.architecture.config }} `
+        cmake -B ./build `
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
         -DALSOFT_BUILD_ROUTER=OFF `
@@ -239,7 +259,7 @@ jobs:
 
     - name: CMake Settings
       run: |
-        echo "CMAKE_PARAM=-A ${{ matrix.architecture.config }} `
+        echo "CMAKE_PARAM= `
         --log-level=VERBOSE `
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
@@ -313,7 +333,6 @@ jobs:
     environment: ${{inputs.environment}}
 
     steps:
-
     ###
     # Packages
     ###
@@ -322,7 +341,12 @@ jobs:
     # Paths on x86_64 and ARM64 are different for homebrew
     - name: Install required packages
       run: |
-        brew update && brew install git flex bison ninja cmake llvm
+        brew update && brew install git flex bison ninja cmake llvm ninja
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
 
     ###
     # SDL

From 9ab37e54b4e2e0dc869df68f7e24fa6fe2e89c85 Mon Sep 17 00:00:00 2001
From: pryon <pryon@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:59:27 +0200
Subject: [PATCH 0948/2040] Fix CodeQL printf argument type warning

---
 code/qcommon/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 03d590d4..e4ef082a 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -4493,5 +4493,5 @@ void FS_FileTime(const char *filename, char *date, char *size)
         tm.tm_hour < 12 ? 'a' : 'p'
     );
 
-    Q_snprintf(size, 128, "%d", fileSize);
+    Q_snprintf(size, 128, "%ld", fileSize);
 }

From 4e5a0a30bfde86a4f990bb6a1eb284af9ce1a3fa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 21:08:43 +0200
Subject: [PATCH 0949/2040] Fix subtitle being incorrect due to the size of the
 pointer (and not the size of the string) being passed to Q_strncpyz

---
 code/qcommon/alias.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index edab5b93..3dc9ce2a 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -257,6 +257,8 @@ void Alias_ListAddParms(AliasListNode_t* node, const char* parameters)
 		}
 		else if (!Q_stricmp(token, "subtitle") || !Q_stricmp(token, "forcesubtitle"))
 		{
+			size_t size;
+
 			if (!Q_stricmp(token, "subtitle")) {
 				node->forcesubtitle = qfalse;
 			} else {
@@ -270,8 +272,9 @@ void Alias_ListAddParms(AliasListNode_t* node, const char* parameters)
 				return;
 			}
 
-			node->subtitle = Z_TagMalloc(strlen(token) + 1, TAG_TIKI);
-			Q_strncpyz(node->subtitle, token, sizeof(node->subtitle));
+			size = strlen(token) + 1;
+			node->subtitle = Z_TagMalloc(size, TAG_TIKI);
+			memcpy(node->subtitle, token, size);
 		}
 		else if (!Q_stricmp(token, "pitch"))
 		{

From e85d3f2a1980850c71c79acca8c6129b43fb4c01 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 22:50:53 +0200
Subject: [PATCH 0950/2040] Pass the correct size to Q_strncpyz

---
 code/cgame/cg_scoreboard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_scoreboard.cpp b/code/cgame/cg_scoreboard.cpp
index 4f0bbcd1..f6cb81c8 100644
--- a/code/cgame/cg_scoreboard.cpp
+++ b/code/cgame/cg_scoreboard.cpp
@@ -384,7 +384,7 @@ void CG_ParseScores_ver_15()
                     Q_strncpyz(szString2, cgi.LV_ConvertString("Players"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else if (iClientNum == -2) {
-                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString3));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else {
                     // unknown

From ce0004a2967b4f4e86197b6ab7579841359c5db7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:08:52 +0200
Subject: [PATCH 0951/2040] Use unsafe version of strcpy as the buffer length
 is unknown

---
 code/client/cl_uiserverlist.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index 097b473f..c6bd8278 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -642,9 +642,9 @@ void UIFAKKServerList::RefreshLANServerList( Event *ev )
 
 static void AddFilter(char* filter, const char* value) {
     if (*filter) {
-        Q_strcat(filter, sizeof(filter), va(" and %s", value));
+        strcat(filter, va(" and %s", value));
     } else {
-        Q_strncpyz(filter, value, sizeof(filter));
+        strcpy(filter, value);
     }
 }
 

From 1848506f0903b4eb3c98b1934d0ee182e47c3575 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:09:16 +0200
Subject: [PATCH 0952/2040] Properly pass the size of the path buffer into
 Q_strncpyz

---
 code/tiki/tiki_parse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index ce889210..ef109c79 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -1037,7 +1037,7 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
             WriteSkelmodel(ld, name);
         } else if (!Q_stricmp(token, "path")) {
             token = ld->tikiFile.GetToken(false);
-            Q_strncpyz(ld->tikiFile.currentScript->path, token, sizeof(name));
+            Q_strncpyz(ld->tikiFile.currentScript->path, token, sizeof(ld->tikiFile.currentScript->path));
             length = strlen(ld->tikiFile.currentScript->path);
             token  = ld->tikiFile.currentScript->path + length - 1;
 

From 78918eb59dfa046772b708ac931880a69265ca75 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 01:23:23 +0200
Subject: [PATCH 0953/2040] Correctly process statements with a semicolon

---
 code/cgame/cg_servercmds.c | 58 ++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index de9cf84a..50032af3 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -557,6 +557,24 @@ static qboolean CG_IsCommandFiltered(const char *name)
     return CG_IsVariableFiltered(name);
 }
 
+/*
+====================
+RemoveEndToken
+====================
+*/
+static qboolean RemoveEndToken(char* com_token) {
+    char* p;
+
+    for (p = com_token; p[0]; p++) {
+        if (*p == ';') {
+            *p = 0;
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
 /*
 ====================
 CG_IsStatementFiltered
@@ -566,42 +584,52 @@ Returns whether or not the statement is filtered
 */
 static qboolean CG_IsStatementFiltered(char *cmd)
 {
-    const char *token;
+    char* parsed;
+    char* p;
+    char com_token[256];
+    qboolean bNextStatement = qfalse;
 
-    for (token = COM_ParseExt(&cmd, qtrue); token[0]; token = COM_ParseExt(&cmd, qtrue)) {
-        if (token[0] == ';') {
+    parsed = cmd;
+
+    for (Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token)); com_token[0]; Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token))) {
+        bNextStatement = RemoveEndToken(com_token);
+
+        if (com_token[0] == ';') {
             continue;
         }
 
-        if (!Q_stricmp(token, "set") || !Q_stricmp(token, "setu") || !Q_stricmp(token, "seta")
-            || !Q_stricmp(token, "sets")) {
+        if (!Q_stricmp(com_token, "set") || !Q_stricmp(com_token, "setu") || !Q_stricmp(com_token, "seta")
+            || !Q_stricmp(com_token, "sets")) {
             //
             // variable
             //
-            token = COM_ParseExt(&cmd, qfalse);
-            if (token[0] == ';') {
+            Q_strncpyz(com_token, COM_ParseExt(&parsed, qfalse), sizeof(com_token));
+            bNextStatement |= RemoveEndToken(com_token);
+            if (com_token[0] == ';') {
                 continue;
             }
 
-            if (CG_IsVariableFiltered(token)) {
+            if (CG_IsVariableFiltered(com_token)) {
                 return qtrue;
             }
         } else {
             //
             // normal command
             //
-            if (CG_IsCommandFiltered(token)) {
+            if (CG_IsCommandFiltered(com_token)) {
                 return qtrue;
             }
         }
 
-        // Skip up to the next statement
-        while (cmd && cmd[0]) {
-            char c = cmd[0];
+        if (!bNextStatement) {
+            // Skip up to the next statement
+            while (parsed && parsed[0]) {
+                char c = parsed[0];
 
-            cmd++;
-            if (c == '\n' || c == ';') {
-                break;
+                parsed++;
+                if (c == '\n' || c == ';') {
+                    break;
+                }
             }
         }
     }

From 5b567f4cba253cd978b68dcfdb89b1d9498c8519 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 01:39:40 +0200
Subject: [PATCH 0954/2040] Fix music volume not restored when the map restarts
 after the intermission

---
 code/client/snd_openal_new.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 92b8e492..82d23fb6 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -704,6 +704,10 @@ void S_FadeSound(float fTime)
     } else {
         s_fFadeVolume = 1;
         s_bFading     = false;
+        // Fixed in OPM
+        //  Make sure to restore the music volume
+        //  in case the map restarts immediately after the intermission
+        music_volume_changed = true;
     }
 }
 

From 7c28efe9cd9e75aa51a5b23b864ec4a20719d965 Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Wed, 9 Mar 2011 22:50:06 +0000
Subject: [PATCH 0955/2040] Fix bug where Com_StartupVariable would set
 CVAR_USER_CREATED on already existing cvars

---
 code/qcommon/common.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 7007a856..16e10bb0 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -568,7 +568,6 @@ be after execing the config and default.
 void Com_StartupVariable( const char *match ) {
 	int		i;
 	char	*s;
-	cvar_t	*cv;
 
 	for (i=0 ; i < com_numConsoleLines ; i++) {
 		Cmd_TokenizeString( com_consoleLines[i] );
@@ -577,11 +576,13 @@ void Com_StartupVariable( const char *match ) {
 		}
 
 		s = Cmd_Argv(1);
-		if ( !match || !strcmp( s, match ) ) {
-			Cvar_Set( s, Cmd_Argv(2) );
-			cv = Cvar_Get( s, "", 0 );
-			cv->flags |= CVAR_USER_CREATED;
-//			com_consoleLines[i] = 0;
+		
+		if(!match || !strcmp(s, match))
+		{
+			if(Cvar_Flags(s) == CVAR_NONEXISTENT)
+				Cvar_Get(s, Cmd_Argv(2), CVAR_USER_CREATED);
+			else
+				Cvar_Set(s, Cmd_Argv(2));
 		}
 	}
 }

From 985731f543ed970580fb538d4a65d93110ac6655 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Wed, 22 Feb 2017 14:40:40 -0600
Subject: [PATCH 0956/2040] Fix command line variables not being set correctly

+seta, +sets, and +setu were ignored because Com_AddStartupCommands
thought Com_StartupVariable handled it.

+set didn't allow value to be multiple tokens which due to Unix shell
unintuitively removing quotes causes the variable to only be set to
the first token. This could be worked around by escaping quotes

    ioq3ded +set g_motd \"hello world\"

but it doesn't match behavior of other start up commands (which now
includes seta, sets, and setu) that use all tokens.
---
 code/qcommon/common.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 16e10bb0..22f4efbf 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -580,9 +580,9 @@ void Com_StartupVariable( const char *match ) {
 		if(!match || !strcmp(s, match))
 		{
 			if(Cvar_Flags(s) == CVAR_NONEXISTENT)
-				Cvar_Get(s, Cmd_Argv(2), CVAR_USER_CREATED);
+				Cvar_Get(s, Cmd_ArgsFrom(2), CVAR_USER_CREATED);
 			else
-				Cvar_Set(s, Cmd_Argv(2));
+				Cvar_Set2(s, Cmd_ArgsFrom(2), qfalse);
 		}
 	}
 }
@@ -610,9 +610,9 @@ qboolean Com_AddStartupCommands( void ) {
 			continue;
 		}
 
-		// set commands won't override menu startup
-		if ( Q_stricmpn( com_consoleLines[i], "set", 3 ) ) {
-			added = qtrue;
+		// set commands already added with Com_StartupVariable
+		if ( !Q_stricmpn( com_consoleLines[i], "set ", 4 ) ) {
+			continue;
 		}
 		Cbuf_AddText( com_consoleLines[i] );
 		Cbuf_AddText( "\n" );

From 3237b3564e53797994254ad8b5c3bae220530cd7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 14:23:51 +0200
Subject: [PATCH 0957/2040] Update getting started running

---
 docs/getting_started_running.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 0ff0e46c..f3b565db 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -6,8 +6,8 @@
 
 **Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable. To play an expansion, append the following command-line arguments to the executable:
 
-- `+set com_target_game 1` for Spearhead (mohaas/mohta, mainta)
-- `+set com_target_game 2` for Breakthrough (mohaab/mohtt, maintt)
+- `+set com_target_game 1` for the Spearhead expansion (mohaas/mohta, mainta, a.k.a Team Assault)
+- `+set com_target_game 2` for the Breakthrough expansion (mohaab/mohtt, maintt, a.k.a Team Tactics)
 
 On Windows, you can create a shortcut to OpenMoHAA with these command-line arguments.
 The default value of `com_target_game` is 0 for the base game (mohaa, main).
@@ -27,7 +27,7 @@ This is by design since ioquake3 and has two advantages:
 - On a multi-user system, each user will have their own configuration file
 - It doesn't overwrite the existing MOHAA configuration in the MOHAA installation directory.
 
-The location of user-writable data can be changed manually by setting the `fs_homepath` variable in the command-line argument. This is useful when running a dedicated server that can only use the game directory to store/read data. The value can be a relative path (relative to the current working directory) or an absolute path. Example:
+If necessary, the location of user-writable data can be changed manually by setting the `fs_homepath` variable in the command-line argument. This is useful when running a dedicated server that can only use the game directory to store/read data. The value can be a relative path (relative to the current working directory) or an absolute path. Example:
 - `+set fs_homepath Z:\openmohaa_data` data will be written inside the fully qualified path `Z:\openmohaa_data`
 - `+set fs_homepath homedata` will use the subfolder `homedata` in the process current working directory to write data (will be created automatically)
 - `+set fs_homepath .` not recommended, will write data inside the process current working directory
@@ -40,4 +40,6 @@ Note that the configuration file isn't created nor written automatically on a de
 
 OpenMoHAA has a basic bot system that emulates real players. The maximum number of bots is defined by the `sv_maxbots` variable, and the number of initial bots is defined by the `sv_numbots` variable. Bots can also be added or removed using the `addbot` and `removebot` commands.
 
-This feature is a great way to test the gameplay and mods.
\ No newline at end of file
+This feature is a great way to test the gameplay and mods.
+
+Note that maps must have path built for bots to move, multiplayer maps don't have path built by default. Mods like [eagleAR bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots) exist that do introduce paths in multiplayer maps.

From 764b95f6173debaf60b68d0f615d8bc8c961721d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 14:56:02 +0200
Subject: [PATCH 0958/2040] Set a better name for binaries to properly
 distinguish the name of the architecture

---
 CMakeLists.txt              | 6 ++++--
 code/cgame/CMakeLists.txt   | 2 +-
 code/fgame/CMakeLists.txt   | 2 +-
 code/sys/new/sys_main_new.c | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cdf0e0e..ff966a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,8 @@ ELSE()
 	set(TARGET_ARCH_SUFFIX ${TARGET_ARCH})
 ENDIF()
 
+set(TARGET_BIN_SUFFIX ".${TARGET_ARCH}")
+
 message(STATUS "Architecture detected: ${TARGET_ARCH}, suffix set to ${TARGET_ARCH_SUFFIX}.")
 
 IF(WIN32)
@@ -93,7 +95,7 @@ target_link_libraries(omohaaded PRIVATE qcommon qcommon_standalone)
 
 # Gamespy dependency
 target_include_directories(omohaaded PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server")
-set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}")
+set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BIN_SUFFIX}")
 set_target_properties(omohaaded PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 if (MSVC)
@@ -124,7 +126,7 @@ if (NOT BUILD_NO_CLIENT)
 
 	### Gamespy dependency
 	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib" "code/jpeg-8c")
-	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}")
+	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BIN_SUFFIX}")
 	set_target_properties(openmohaa PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 	target_link_libraries(openmohaa PRIVATE jpeg8)
diff --git a/code/cgame/CMakeLists.txt b/code/cgame/CMakeLists.txt
index 1ec5a6a2..fd6974b8 100644
--- a/code/cgame/CMakeLists.txt
+++ b/code/cgame/CMakeLists.txt
@@ -28,7 +28,7 @@ target_compile_features(cgame PUBLIC c_variadic_macros)
 target_link_libraries(cgame PUBLIC qcommon)
 
 set_target_properties(cgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
-set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_ARCH_SUFFIX}")
+set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_BIN_SUFFIX}")
 set_target_properties(cgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
 
 INSTALL(
diff --git a/code/fgame/CMakeLists.txt b/code/fgame/CMakeLists.txt
index 5e877d46..35524cd6 100644
--- a/code/fgame/CMakeLists.txt
+++ b/code/fgame/CMakeLists.txt
@@ -67,7 +67,7 @@ target_compile_features(fgame PUBLIC c_variadic_macros)
 target_link_libraries(fgame PUBLIC qcommon)
 
 set_target_properties(fgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
-set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_ARCH_SUFFIX}")
+set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_BIN_SUFFIX}")
 set_target_properties(fgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
 
 INSTALL(
diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index 0df7f6e0..5a69ffd3 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -196,7 +196,7 @@ Sys_GetGameAPI
 void* Sys_GetGameAPI(void* parms)
 {
     void* (*GetGameAPI) (void*);
-    const char* gamename = "game" ARCH_STRING DLL_SUFFIX DLL_EXT;
+    const char* gamename = "game" "." ARCH_STRING DLL_SUFFIX DLL_EXT;
 
     if (game_library)
         Com_Error(ERR_FATAL, "Sys_GetGameAPI without calling Sys_UnloadGame");
@@ -245,7 +245,7 @@ Sys_GetCGameAPI
 void* Sys_GetCGameAPI(void* parms)
 {
     void* (*GetCGameAPI) (void*);
-    const char* gamename = "cgame" ARCH_STRING DLL_SUFFIX DLL_EXT;
+    const char* gamename = "cgame" "." ARCH_STRING DLL_SUFFIX DLL_EXT;
 
     if (cgame_library)
         Com_Error(ERR_FATAL, "Sys_GetCGameAPI without calling Sys_UnloadCGame");

From f53fba082ab063822f68c84f2e32442bbfde0a95 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 15:45:04 +0200
Subject: [PATCH 0959/2040] Improve memory for debugging purposes

---
 code/qcommon/common.cpp |  15 ++----
 code/qcommon/memory.c   | 105 +++++++++++++++++++++++-----------------
 code/qcommon/qcommon.h  |  32 ++++++------
 3 files changed, 81 insertions(+), 71 deletions(-)

diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index 22f4efbf..35493cec 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -56,17 +56,6 @@ int demo_protocols[] =
 
 #define MAX_NUM_ARGVS	50
 
-//wombat: i had to increase these quite a bit
-//to keep up with larger client_t.
-//i reckon this has bad effect on memory usage
-// update: put it back unless we really need it large
-#define MIN_DEDICATED_COMHUNKMEGS 1
-#define MIN_COMHUNKMEGS		56
-#define DEF_COMHUNKMEGS		96
-#define DEF_COMZONEMEGS		128
-#define DEF_COMHUNKMEGS_S	XSTRING(DEF_COMHUNKMEGS)
-#define DEF_COMZONEMEGS_S	XSTRING(DEF_COMZONEMEGS)
-
 int		com_argc;
 char	*com_argv[MAX_NUM_ARGVS+1];
 
@@ -158,6 +147,8 @@ void Com_WriteConfig_f( void );
 void CIN_CloseAllVideos(void);
 
 void Com_InitTargetGame();
+void Com_InitHunkMemory( void );
+void Z_InitMemory( void );
 
 //============================================================================
 
@@ -846,7 +837,7 @@ CopyString
 char *CopyString( const char *in ) {
 	char	*out;
 
-#ifndef _DEBUG_MEM
+#ifndef ZONE_DEBUG
 	if (!in[0]) {
 		return ( char * )Z_EmptyStringPointer();
 	}
diff --git a/code/qcommon/memory.c b/code/qcommon/memory.c
index 7845eae1..4b88cea1 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -30,10 +30,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 void Z_CheckHeap(void);
 
+typedef struct zonedebug_s {
+	const char *label;
+	const char *file;
+	int line;
+	int allocSize;
+} zonedebug_t;
+
 typedef struct memblock_s {
 	size_t	size;			// including the header and possibly tiny fragments
 	struct memblock_s		*next, *prev;
 	int     id;				// should be ZONEID
+#ifdef ZONE_DEBUG
+	zonedebug_t d;
+#endif
 } memblock_t;
 
 typedef struct memconstant_s {
@@ -44,16 +54,16 @@ typedef struct memconstant_s {
 memconstant_t emptystring = { sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, 0, 0 };
 memconstant_t numberstring[] =
 {
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '0', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '1', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '2', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '3', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '4', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '5', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '6', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '7', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '8', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '9', 0 },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'0', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'1', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'2', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'3', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'4', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'5', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'6', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'7', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'8', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'9', 0} },
 };
 
 static memblock_t mem_blocks[ TAG_NUM_TOTAL_TAGS ];
@@ -137,8 +147,12 @@ void Z_FreeTags( int tag )
 Z_TagMalloc
 ========================
 */
-void *Z_TagMalloc( int size, int tag )
-{
+#ifdef ZONE_DEBUG
+void *Z_TagMallocDebug( int size, int tag, const char *label, const char *file, int line ) {
+	int		allocSize;
+#else
+void *Z_TagMalloc( int size, int tag ) {
+#endif
 	memblock_t *block;
 
 	if( size <= 0 )
@@ -152,6 +166,10 @@ void *Z_TagMalloc( int size, int tag )
 		Com_Error( ERR_FATAL, "Z_TagMalloc: tried to use a 0 tag" );
 	}
 
+#ifdef ZONE_DEBUG
+	allocSize = size;
+#endif
+
 	size += sizeof( memblock_t );				// account for size of block header
 #ifndef _DEBUG
 	size += sizeof( int );						// space for memory trash tester
@@ -166,6 +184,13 @@ void *Z_TagMalloc( int size, int tag )
 	block->prev->next = block;
 	mem_blocks[ tag ].prev = block;
 
+#ifdef ZONE_DEBUG
+	block->d.label = label;
+	block->d.file = file;
+	block->d.line = line;
+	block->d.allocSize = allocSize;
+#endif
+
 #ifndef _DEBUG
 	// marker for memory trash testing
 	*( int * )( ( byte * )block + block->size - sizeof( int ) ) = ZONEID;
@@ -362,34 +387,18 @@ void Z_Shutdown( void ) {
 	}
 }
 
+/*
+=================
+Hunk_Alloc
+
+Allocate permanent (until the hunk is cleared) memory
+=================
+*/
 #ifdef HUNK_DEBUG
-
-/*
-=================
-Hunk_Alloc
-
-Allocate permanent (until the hunk is cleared) memory
-=================
-*/
-void* Hunk_AllocDebug(int size, ha_pref preference, const char* label, const char* file, int line) {
-    void* ptr;
-
-    ptr = Z_TagMalloc(size, TAG_STATIC);
-    memset(ptr, 0, size);
-
-    return ptr;
-}
-
+void *Hunk_AllocDebug( int size, ha_pref preference, const char *label, const char *file, int line ) {
 #else
-
-/*
-=================
-Hunk_Alloc
-
-Allocate permanent (until the hunk is cleared) memory
-=================
-*/
-void *Hunk_Alloc( int size, ha_pref preference) {
+void *Hunk_Alloc( int size, ha_pref preference ) {
+#endif
 	void *ptr;
 
 	ptr = Z_TagMalloc( size, TAG_STATIC );
@@ -398,8 +407,6 @@ void *Hunk_Alloc( int size, ha_pref preference) {
 	return ptr;
 }
 
-#endif
-
 /*
 =================
 Hunk_Clear
@@ -481,11 +488,21 @@ void Com_InitHunkMemory( void ) {
 Z_Malloc
 ========================
 */
+#ifdef ZONE_DEBUG
+void *Z_MallocDebug( int size, const char *label, const char *file, int line ) {
+#else
 void *Z_Malloc( int size ) {
-	void *ptr;
+#endif
+	void	*buf;
+	
+  //Z_CheckHeap ();	// DEBUG
 
-	ptr = Z_TagMalloc( size, TAG_GENERAL );
-	memset( ptr, 0, size );
+#ifdef ZONE_DEBUG
+	buf = Z_TagMallocDebug( size, TAG_GENERAL, label, file, line );
+#else
+	buf = Z_TagMalloc( size, TAG_GENERAL );
+#endif
+	Com_Memset( buf, 0, size );
 
-	return ptr;
+	return buf;
 }
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 52628b83..17fa85be 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1062,35 +1062,37 @@ temp file loading
 	#define ZONE_DEBUG
 #endif
 
-const char *Z_EmptyStringPointer( void );
-const char *Z_NumberStringPointer( int iNum );
-
-void *Z_TagMalloc(int size, int tag );
-void *Z_Malloc(int size );
+#ifdef ZONE_DEBUG
+#define Z_TagMalloc(size, tag)			Z_TagMallocDebug(size, tag, #size, __FILE__, __LINE__)
+#define Z_Malloc(size)					Z_MallocDebug(size, #size, __FILE__, __LINE__)
+#define S_Malloc(size)					S_MallocDebug(size, #size, __FILE__, __LINE__)
+void *Z_TagMallocDebug( int size, int tag, const char *label, const char *file, int line );	// NOT 0 filled memory
+void *Z_MallocDebug( int size, const char *label, const char *file, int line );			// returns 0 filled memory
+void *S_MallocDebug( int size, const char *label, const char *file, int line );			// returns 0 filled memory
+#else
+void *Z_TagMalloc( int size, int tag );	// NOT 0 filled memory
+void *Z_Malloc( int size );			// returns 0 filled memory
+void *S_Malloc( int size );			// NOT 0 filled memory only for small allocations
+#endif
 void Z_Free( void *ptr );
-
 void Z_FreeTags( int tag );
-
-void Z_InitMemory( void );
-void Z_Shutdown( void );
 int Z_AvailableMemory( void );
 void Z_LogHeap( void );
-void Z_Meminfo_f( void );
-
-void *Hunk_AllocateTempMemory(int size );
-void Hunk_FreeTempMemory( void *buf );
 
 void Hunk_Clear( void );
 void Hunk_ClearToMark( void );
 void Hunk_SetMark( void );
 qboolean Hunk_CheckMark( void );
 void Hunk_ClearTempMemory( void );
+void *Hunk_AllocateTempMemory( int size );
+void Hunk_FreeTempMemory( void *buf );
 int	Hunk_MemoryRemaining( void );
 void Hunk_Log( void);
-void Hunk_Trash( void );
 
 void Com_TouchMemory( void );
-void Com_InitHunkMemory(void);
+
+const char* Z_EmptyStringPointer(void);
+const char* Z_NumberStringPointer(int iNum);
 
 // commandLine should not include the executable name (argv[0])
 void Com_Init( char *commandLine );

From dacfa6ae557bc587967dee91194bbb912e99c63d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:03:02 +0200
Subject: [PATCH 0960/2040] Made common source file a C file as it should be

---
 code/qcommon/CMakeLists.txt           |  2 +-
 code/qcommon/{common.cpp => common.c} | 72 ++++++++++++++++++---------
 2 files changed, 49 insertions(+), 25 deletions(-)
 rename code/qcommon/{common.cpp => common.c} (98%)

diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index d4c0bb81..fd40183b 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -51,7 +51,7 @@ set(SOURCES_COMMON
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cm_trace_lbd.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cm_trace_obfuscation.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cmd.c"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/common.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/common.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/crc.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cvar.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/files.cpp"
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.c
similarity index 98%
rename from code/qcommon/common.cpp
rename to code/qcommon/common.c
index 35493cec..c3f62e2e 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.c
@@ -33,7 +33,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 // FPS
-#include <chrono>
+#ifdef __cplusplus
+#  include <chrono>
+#endif
 
 #include "tiki.h"
 
@@ -158,9 +160,15 @@ static void	(*rd_flush)( char *buffer );
 
 #define MAX_FPS_TIMES 16
 
+#ifdef __cplusplus
 using fps_clock_t = std::chrono::high_resolution_clock;
 using fps_time_t = fps_clock_t::time_point;
 using fps_delta_t = fps_clock_t::duration;
+#else
+typedef unsigned long long fps_clock_t;
+typedef unsigned long long fps_time_t;
+typedef unsigned long long fps_delta_t;
+#endif
 
 static int fpsindex;
 static fps_delta_t fpstimes[MAX_FPS_TIMES];
@@ -2219,19 +2227,35 @@ void Com_Frame( void ) {
 	}
 
 	if (fps->integer) {
-		fps_time_t fpstime = fps_clock_t::now();
-		fps_delta_t delta = fpstime - fpslasttime;
+		fps_time_t fpstime;
+		fps_delta_t delta;
+
+#ifdef __cplusplus
+		fpstime = fps_clock_t::now();
+#else
+		fpstime = Sys_Milliseconds();
+#endif
+
+		delta = fpstime - fpslasttime;
 
 		fpstotal = (fpstime - fpslasttime) + (fpstotal - fpstimes[fpsindex]);
 		fpstimes[fpsindex] = fpstime - fpslasttime;
 		fpsindex = (fpsindex + 1) % MAX_FPS_TIMES;
 		fpslasttime = fpstime;
 
+#ifdef __cplusplus
 		if (fpstotal.count()) {
-			currentfps = 16.0 / std::chrono::duration<long double>(fpstotal).count();
+			currentfps = MAX_FPS_TIMES / std::chrono::duration<long double>(fpstotal).count();
 		} else {
 			currentfps = 0.0;
 		}
+#else
+		if (fpstotal) {
+			currentfps = MAX_FPS_TIMES / (fpstotal / 1000.0);
+		} else {
+			currentfps = 0.0;
+		}
+#endif
 	}
 
 	//
@@ -2278,12 +2302,12 @@ void Com_Shutdown (void) {
 qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
 {
 	int i;
-	qboolean bBadName = false;
+	qboolean bBadName = qfalse;
 	const char *p = pszOldName;
 
 	if( *pszOldName && *pszOldName <= ' ' )
 	{
-		bBadName = true;
+		bBadName = qtrue;
 
 		while( *p && *p <= ' ' )
 		{
@@ -2297,22 +2321,22 @@ qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
 		if( *p == '~' || *p == '`' )
 		{
 			pszNewName[ i ] = '*';
-			bBadName = true;
+			bBadName = qtrue;
 		}
 		else if( *p == '\"' )
 		{
 			pszNewName[ i ] = '\'';
-			bBadName = true;
+			bBadName = qtrue;
 		}
 		else if( *p == '\\' )
 		{
 			pszNewName[ i ] = '/';
-			bBadName = true;
+			bBadName = qtrue;
 		}
 		else if( *p == ';' )
 		{
 			pszNewName[ i ] = ':';
-			bBadName = true;
+			bBadName = qtrue;
 		}
 		else
 		{
@@ -2322,7 +2346,7 @@ qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
 
 	if( i > 0 && pszNewName[ i - 1 ] <= ' ' )
 	{
-		bBadName = true;
+		bBadName = qtrue;
 		do
 		{
 			p++;
@@ -2333,11 +2357,11 @@ qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
 	if( !i )
 	{
 		memcpy( pszNewName, "*** Blank Name ***", sizeof( "*** Blank Name ***" ) );
-		bBadName = true;
+		bBadName = qtrue;
 	}
 
 	if( *p )
-		bBadName = true;
+		bBadName = qtrue;
 
 	return bBadName;
 }
@@ -2629,7 +2653,7 @@ void Field_CompleteCommand(char* cmd,
         char* p;
 
 #ifndef DEDICATED
-        // This should always be true
+        // This should always be qtrue
         if (baseCmd[0] == '\\' || baseCmd[0] == '/')
             baseCmd++;
 #endif
@@ -2912,9 +2936,9 @@ void Com_InitTargetGameWithType(target_game_e target_game)
 
     switch (target_game)
     {
-    case target_game_e::TG_MOH:
-        Cvar_Set("com_protocol", va("%i", protocol_e::PROTOCOL_MOH));
-        Cvar_Set("com_legacyprotocol", va("%i", protocol_e::PROTOCOL_MOH));
+    case TG_MOH:
+        Cvar_Set("com_protocol", va("%i", PROTOCOL_MOH));
+        Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH));
 		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOH);
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOH);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOH);
@@ -2922,19 +2946,19 @@ void Com_InitTargetGameWithType(target_game_e target_game)
 		Cvar_Set("fs_basegame", "");
         break;
 
-    case target_game_e::TG_MOHTA:
-        Cvar_Set("com_protocol", va("%i", protocol_e::PROTOCOL_MOHTA));
-        Cvar_Set("com_legacyprotocol", va("%i", protocol_e::PROTOCOL_MOHTA));
+    case TG_MOHTA:
+        Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
+        Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
 		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTA);
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTA);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTA);
         Cvar_Set("fs_basegame", "mainta");
         break;
 
-    case target_game_e::TG_MOHTT:
+    case TG_MOHTT:
 		// mohta and mohtt use the same protocol version number
-        Cvar_Set("com_protocol", va("%i", protocol_e::PROTOCOL_MOHTA));
-        Cvar_Set("com_legacyprotocol", va("%i", protocol_e::PROTOCOL_MOHTA));
+        Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
+        Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
 		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT);
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTT);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTT);
@@ -2955,7 +2979,7 @@ Com_InitTargetGame
 ===============
 */
 void Com_InitTargetGame() {
-	Com_InitTargetGameWithType(static_cast<target_game_e>(com_target_game->integer));
+	Com_InitTargetGameWithType((target_game_e)com_target_game->integer);
 }
 
 #ifdef __cplusplus

From aba9f2574485a61c8fe62d061ca0152e06d07149 Mon Sep 17 00:00:00 2001
From: SmileTheory <SmileTheory@gmail.com>
Date: Fri, 29 Jan 2016 20:14:35 -0800
Subject: [PATCH 0961/2040] Fix frame_msec possibly being zero in cl_input.c.

This fixes a mouse freezing bug.
---
 code/client/cl_input.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index f3152d0d..f6b2fd01 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -726,6 +726,12 @@ void CL_CreateNewCommands( void ) {
 
 	frame_msec = com_frameTime - old_com_frameTime;
 
+	// if running over 1000fps, act as if each frame is 1ms
+	// prevents divisions by zero
+	if ( frame_msec < 1 ) {
+		frame_msec = 1;
+	}
+
 	// if running less than 5fps, truncate the extra time to prevent
 	// unexpected moves after a hitch
 	if ( frame_msec > 200 ) {

From 36c00f146d0c90f66d0503f46eea16150606041e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:18:04 +0200
Subject: [PATCH 0962/2040] Improve gamepad support

---
 code/client/cl_input.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index f6b2fd01..4600b846 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -461,6 +461,16 @@ CL_JoystickMove
 void CL_JoystickMove( usercmd_t *cmd ) {
 	float	anglespeed;
 
+	float yaw     = j_yaw->value     * cl.joystickAxis[j_yaw_axis->integer];
+	float right   = j_side->value    * cl.joystickAxis[j_side_axis->integer];
+	float forward = j_forward->value * cl.joystickAxis[j_forward_axis->integer];
+	float pitch   = j_pitch->value   * cl.joystickAxis[j_pitch_axis->integer];
+	float up      = j_up->value      * cl.joystickAxis[j_up_axis->integer];
+
+	if ( in_speed.active ^ cl_run->integer ) {
+		cmd->buttons |= BUTTON_RUN;
+	}
+
 	if ( in_speed.active ) {
 		anglespeed = 0.001 * cls.frametime * cl_anglespeedkey->value;
 	} else {
@@ -468,18 +478,22 @@ void CL_JoystickMove( usercmd_t *cmd ) {
 	}
 
 	if ( !in_strafe.active ) {
-		cl.viewangles[YAW] += anglespeed * cl_yawspeed->value * cl.joystickAxis[AXIS_SIDE];
+		cl.viewangles[YAW] += anglespeed * yaw;
+		cmd->rightmove = ClampChar( cmd->rightmove + (int)right );
 	} else {
-		cmd->rightmove = ClampChar( cmd->rightmove + cl.joystickAxis[AXIS_SIDE] );
+		cl.viewangles[YAW] += anglespeed * right;
+		cmd->rightmove = ClampChar( cmd->rightmove + (int)yaw );
 	}
 
 	if ( in_mlooking ) {
-		cl.viewangles[PITCH] += anglespeed * cl_pitchspeed->value * cl.joystickAxis[AXIS_FORWARD];
+		cl.viewangles[PITCH] += anglespeed * forward;
+		cmd->forwardmove = ClampChar( cmd->forwardmove + (int)pitch );
 	} else {
-		cmd->forwardmove = ClampChar( cmd->forwardmove + cl.joystickAxis[AXIS_FORWARD] );
+		cl.viewangles[PITCH] += anglespeed * pitch;
+		cmd->forwardmove = ClampChar( cmd->forwardmove + (int)forward );
 	}
 
-	cmd->upmove = ClampChar( cmd->upmove + cl.joystickAxis[AXIS_UP] );
+	cmd->upmove = ClampChar( cmd->upmove + (int)up );
 }
 
 /*
@@ -617,8 +631,8 @@ void CL_CmdButtons( usercmd_t *cmd ) {
 	if (UI_MenuActive() || UI_ConsoleIsOpen()) {
 		cmd->buttons |= BUTTON_TALK;
 	}
-
-	if (in_speed.active == !cl_run->integer) {
+	
+	if ( in_speed.active ^ cl_run->integer ) {
 		cmd->buttons |= BUTTON_RUN;
 	}
 

From 8dd74b778967b6cec3bbe94ad071dd85947b9058 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:35:12 +0200
Subject: [PATCH 0963/2040] Get rid of the code that sends next fragments from
 clients

---
 code/client/cl_input.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index 4600b846..5b4bffff 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -993,16 +993,6 @@ void CL_WritePacket( void ) {
 	}
 
 	CL_Netchan_Transmit (&clc.netchan, &buf);
-
-	// clients never really should have messages large enough
-	// to fragment, but in case they do, fire them all off
-	// at once
-	// TTimo: this causes a packet burst, which is bad karma for winsock
-	// added a WARNING message, we'll see if there are legit situations where this happens
-	while ( clc.netchan.unsentFragments ) {
-		Com_DPrintf( "WARNING: #462 unsent fragments (not supposed to happen!)\n" );
-		CL_Netchan_TransmitNextFragment( &clc.netchan );
-	}
 }
 
 /*

From d57ea3695b4bbabd348bad0091f1e684f7bac507 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:38:00 +0200
Subject: [PATCH 0964/2040] Add VOIP code for cl_input

---
 code/client/cl_input.cpp | 149 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index 5b4bffff..8259067e 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -56,6 +56,10 @@ qboolean	in_guimouse;
 
 kbutton_t	in_up, in_down;
 
+#ifdef USE_VOIP
+kbutton_t	in_voiprecord;
+#endif
+
 kbutton_t	in_buttons[16];
 
 qboolean	in_mlooking;
@@ -258,6 +262,20 @@ void IN_SpeedUp(void) {IN_KeyUp(&in_speed);}
 void IN_StrafeDown(void) {IN_KeyDown(&in_strafe);}
 void IN_StrafeUp(void) {IN_KeyUp(&in_strafe);}
 
+#ifdef USE_VOIP
+void IN_VoipRecordDown(void)
+{
+	IN_KeyDown(&in_voiprecord);
+	Cvar_Set("cl_voipSend", "1");
+}
+
+void IN_VoipRecordUp(void)
+{
+	IN_KeyUp(&in_voiprecord);
+	Cvar_Set("cl_voipSend", "0");
+}
+#endif
+
 void IN_Button0Down(void) {IN_KeyDown(&in_buttons[0]);}
 void IN_Button0Up(void) {IN_KeyUp(&in_buttons[0]);}
 void IN_Button1Down(void) {IN_KeyDown(&in_buttons[1]);}
@@ -937,6 +955,58 @@ void CL_WritePacket( void ) {
 		count = MAX_PACKET_USERCMDS;
 		Com_Printf("MAX_PACKET_USERCMDS\n");
 	}
+
+#ifdef USE_VOIP
+	if (clc.voipOutgoingDataSize > 0)
+	{
+		if((clc.voipFlags & VOIP_SPATIAL) || Com_IsVoipTarget(clc.voipTargets, sizeof(clc.voipTargets), -1))
+		{
+			MSG_WriteByte (&buf, clc_voipOpus);
+			MSG_WriteByte (&buf, clc.voipOutgoingGeneration);
+			MSG_WriteLong (&buf, clc.voipOutgoingSequence);
+			MSG_WriteByte (&buf, clc.voipOutgoingDataFrames);
+			MSG_WriteData (&buf, clc.voipTargets, sizeof(clc.voipTargets));
+			MSG_WriteByte(&buf, clc.voipFlags);
+			MSG_WriteShort (&buf, clc.voipOutgoingDataSize);
+			MSG_WriteData (&buf, clc.voipOutgoingData, clc.voipOutgoingDataSize);
+
+			// If we're recording a demo, we have to fake a server packet with
+			//  this VoIP data so it gets to disk; the server doesn't send it
+			//  back to us, and we might as well eliminate concerns about dropped
+			//  and misordered packets here.
+			if(clc.demorecording && !clc.demowaiting)
+			{
+				const int voipSize = clc.voipOutgoingDataSize;
+				msg_t fakemsg;
+				byte fakedata[MAX_MSGLEN];
+				MSG_Init (&fakemsg, fakedata, sizeof (fakedata));
+				MSG_Bitstream (&fakemsg);
+				MSG_WriteLong (&fakemsg, clc.reliableAcknowledge);
+				MSG_WriteByte (&fakemsg, svc_voipOpus);
+				MSG_WriteShort (&fakemsg, clc.clientNum);
+				MSG_WriteByte (&fakemsg, clc.voipOutgoingGeneration);
+				MSG_WriteLong (&fakemsg, clc.voipOutgoingSequence);
+				MSG_WriteByte (&fakemsg, clc.voipOutgoingDataFrames);
+				MSG_WriteShort (&fakemsg, clc.voipOutgoingDataSize );
+				MSG_WriteBits (&fakemsg, clc.voipFlags, VOIP_FLAGCNT);
+				MSG_WriteData (&fakemsg, clc.voipOutgoingData, voipSize);
+				MSG_WriteByte (&fakemsg, svc_EOF);
+				CL_WriteDemoMessage (&fakemsg, 0);
+			}
+
+			clc.voipOutgoingSequence += clc.voipOutgoingDataFrames;
+			clc.voipOutgoingDataSize = 0;
+			clc.voipOutgoingDataFrames = 0;
+		}
+		else
+		{
+			// We have data, but no targets. Silently discard all data
+			clc.voipOutgoingDataSize = 0;
+			clc.voipOutgoingDataFrames = 0;
+		}
+	}
+#endif
+
 	if ( count >= 1 ) {
 		if ( cl_showSend->integer ) {
 			Com_Printf( "(%i)", count );
@@ -1104,6 +1174,85 @@ void CL_InitInput( void ) {
 	Cmd_AddCommand("+mlook", IN_MLookDown);
 	Cmd_AddCommand("-mlook", IN_MLookUp);
 
+#ifdef USE_VOIP
+	Cmd_AddCommand ("+voiprecord", IN_VoipRecordDown);
+	Cmd_AddCommand ("-voiprecord", IN_VoipRecordUp);
+#endif
+
 	cl_nodelta = Cvar_Get ("cl_nodelta", "0", 0);
 	cl_debugMove = Cvar_Get ("cl_debugMove", "0", 0);
 }
+
+/*
+============
+CL_ShutdownInput
+============
+*/
+void CL_ShutdownInput(void)
+{
+	Cmd_RemoveCommand("centerview");
+
+	Cmd_RemoveCommand("+moveup");
+	Cmd_RemoveCommand("-moveup");
+	Cmd_RemoveCommand("+movedown");
+	Cmd_RemoveCommand("-movedown");
+	Cmd_RemoveCommand("+left");
+	Cmd_RemoveCommand("-left");
+	Cmd_RemoveCommand("+right");
+	Cmd_RemoveCommand("-right");
+	Cmd_RemoveCommand("+forward");
+	Cmd_RemoveCommand("-forward");
+	Cmd_RemoveCommand("+back");
+	Cmd_RemoveCommand("-back");
+	Cmd_RemoveCommand("+lookup");
+	Cmd_RemoveCommand("-lookup");
+	Cmd_RemoveCommand("+lookdown");
+	Cmd_RemoveCommand("-lookdown");
+	Cmd_RemoveCommand("+strafe");
+	Cmd_RemoveCommand("-strafe");
+	Cmd_RemoveCommand("+moveleft");
+	Cmd_RemoveCommand("-moveleft");
+	Cmd_RemoveCommand("+moveright");
+	Cmd_RemoveCommand("-moveright");
+	Cmd_RemoveCommand("+speed");
+	Cmd_RemoveCommand("-speed");
+	Cmd_RemoveCommand("+attack");
+	Cmd_RemoveCommand("-attack");
+	Cmd_RemoveCommand("+button0");
+	Cmd_RemoveCommand("-button0");
+	Cmd_RemoveCommand("+button1");
+	Cmd_RemoveCommand("-button1");
+	Cmd_RemoveCommand("+button2");
+	Cmd_RemoveCommand("-button2");
+	Cmd_RemoveCommand("+button3");
+	Cmd_RemoveCommand("-button3");
+	Cmd_RemoveCommand("+button4");
+	Cmd_RemoveCommand("-button4");
+	Cmd_RemoveCommand("+button5");
+	Cmd_RemoveCommand("-button5");
+	Cmd_RemoveCommand("+button6");
+	Cmd_RemoveCommand("-button6");
+	Cmd_RemoveCommand("+button7");
+	Cmd_RemoveCommand("-button7");
+	Cmd_RemoveCommand("+button8");
+	Cmd_RemoveCommand("-button8");
+	Cmd_RemoveCommand("+button9");
+	Cmd_RemoveCommand("-button9");
+	Cmd_RemoveCommand("+button10");
+	Cmd_RemoveCommand("-button10");
+	Cmd_RemoveCommand("+button11");
+	Cmd_RemoveCommand("-button11");
+	Cmd_RemoveCommand("+button12");
+	Cmd_RemoveCommand("-button12");
+	Cmd_RemoveCommand("+button13");
+	Cmd_RemoveCommand("-button13");
+	Cmd_RemoveCommand("+button14");
+	Cmd_RemoveCommand("-button14");
+	Cmd_RemoveCommand("+mlook");
+	Cmd_RemoveCommand("-mlook");
+
+#ifdef USE_VOIP
+	Cmd_RemoveCommand("+voiprecord");
+	Cmd_RemoveCommand("-voiprecord");
+#endif
+}

From dbd10a281b54be64eedaceb5cb7d70c64df46355 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:39:30 +0200
Subject: [PATCH 0965/2040] call CL_ShutdownInput()

---
 code/client/cl_main.cpp | 2 ++
 code/client/client.h    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 3e550f20..9b05deaa 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3567,6 +3567,8 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
 	Cmd_RemoveCommand ("video");
 	Cmd_RemoveCommand ("stopvideo");
 
+	CL_ShutdownInput();
+
 	Cvar_Set( "cl_running", "0" );
 
 	recursive = qfalse;
diff --git a/code/client/client.h b/code/client/client.h
index 6fe6eed4..c739d4fb 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -520,6 +520,7 @@ void IN_MouseOn( void );
 void IN_MouseOff( void );
 
 void CL_InitInput (void);
+void CL_ShutdownInput(void);
 void CL_SendCmd (void);
 void CL_ClearState (void);
 void CL_ReadPackets (void);
@@ -583,6 +584,7 @@ void Con_DrawCharacter (int cx, int line, int num);
 
 void Con_CheckResize (void);
 void Con_Init (void);
+void Con_Shutdown (void);
 void Con_Clear_f (void);
 void Con_ToggleConsole_f (void);
 void Con_DrawNotify (void);

From 8f355fe1888cd1f54f4135e31f6ef9b73e3b9e05 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:50:27 +0200
Subject: [PATCH 0966/2040] Add Voip code from ioq3

---
 code/client/cl_cgame.cpp |  36 +++++++
 code/client/cl_main.cpp  |  22 ++---
 code/client/cl_parse.cpp | 196 ++++++++++++++++++++++++++++++++++++++-
 code/client/cl_ui.cpp    |   2 +-
 code/client/client.h     |  70 +++++++++++++-
 code/client/snd_public.h |  17 ++++
 code/null/null_snddma.c  |  23 +++++
 code/qcommon/qcommon.h   |   6 +-
 code/server/sv_main.c    |   7 +-
 9 files changed, 358 insertions(+), 21 deletions(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 13ee3756..ee6ce6cd 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -1111,6 +1111,42 @@ void CL_FirstSnapshot( void ) {
 		Cbuf_AddText( cl_activeAction->string );
 		Cvar_Set( "activeAction", "" );
 	}
+
+#ifdef USE_MUMBLE
+	if ((cl_useMumble->integer) && !mumble_islinked()) {
+		int ret = mumble_link(CLIENT_WINDOW_TITLE);
+		Com_Printf("Mumble: Linking to Mumble application %s\n", ret==0?"ok":"failed");
+	}
+#endif
+
+#ifdef USE_VOIP
+	if (!clc.voipCodecInitialized) {
+		int i;
+		int error;
+
+		clc.opusEncoder = opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, &error);
+
+		if ( error ) {
+			Com_DPrintf("VoIP: Error opus_encoder_create %d\n", error);
+			return;
+		}
+
+		for (i = 0; i < MAX_CLIENTS; i++) {
+			clc.opusDecoder[i] = opus_decoder_create(48000, 1, &error);
+			if ( error ) {
+				Com_DPrintf("VoIP: Error opus_decoder_create(%d) %d\n", i, error);
+				return;
+			}
+			clc.voipIgnore[i] = qfalse;
+			clc.voipGain[i] = 1.0f;
+		}
+		clc.voipCodecInitialized = qtrue;
+		clc.voipMuteAll = qfalse;
+		Cmd_AddCommand ("voip", CL_Voip_f);
+		Cvar_Set("cl_voipSendTarget", "spatial");
+		Com_Memset(clc.voipTargets, ~0, sizeof(clc.voipTargets));
+	}
+#endif
 }
 
 static int lastSnapFlags;
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 9b05deaa..482a0885 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -704,7 +704,7 @@ void CL_PlayDemo_f( void ) {
 
 	clc.state = CA_CONNECTED;
 	clc.demoplaying = qtrue;
-	Q_strncpyz( cls.servername, Cmd_Argv(1), sizeof( cls.servername ) );
+	Q_strncpyz( clc.servername, Cmd_Argv(1), sizeof( clc.servername ) );
 
 	// read demo messages until connected
 	while ( clc.state >= CA_CONNECTED && clc.state < CA_PRIMED ) {
@@ -830,7 +830,7 @@ void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 
 	if (pszMapName) {
 		// if we are already connected to the local host, stay connected
-		if (clc.state >= CA_CONNECTED && !Q_stricmp(cls.servername, "localhost")) {
+		if (clc.state >= CA_CONNECTED && !Q_stricmp(clc.servername, "localhost")) {
 			clc.state = CA_CONNECTED;		// so the connect screen is drawn
 			Com_Memset(cls.updateInfoString, 0, sizeof(cls.updateInfoString));
 			Com_Memset(clc.serverMessage, 0, sizeof(clc.serverMessage));
@@ -841,11 +841,11 @@ void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 			// clear nextmap so the cinematic shutdown doesn't execute it
 			Cvar_Set("nextmap", "");
 			CL_Disconnect();
-			Q_strncpyz(cls.servername, "localhost", sizeof(cls.servername));
+			Q_strncpyz(clc.servername, "localhost", sizeof(clc.servername));
 			clc.state = CA_CHALLENGING;		// so the connect screen is drawn
             clc.connectStartTime = cls.realtime;
 			clc.connectTime = -RETRANSMIT_TIMEOUT;
-			NET_StringToAdr(cls.servername, &clc.serverAddress, NA_UNSPEC);
+			NET_StringToAdr(clc.servername, &clc.serverAddress, NA_UNSPEC);
 			// we don't need a challenge on the localhost
 
 			CL_CheckForResend();
@@ -1232,12 +1232,12 @@ CL_Reconnect_f
 ================
 */
 void CL_Reconnect_f( void ) {
-	if ( !strlen( cls.servername ) || !strcmp( cls.servername, "localhost" ) ) {
+	if ( !strlen( clc.servername ) || !strcmp( clc.servername, "localhost" ) ) {
 		Com_Printf( "Can't reconnect to localhost.\n" );
 		return;
 	}
 	Cvar_Set("ui_singlePlayerActive", "0");
-	Cbuf_AddText( va("connect %s\n", cls.servername ) );
+	Cbuf_AddText( va("connect %s\n", clc.servername ) );
 }
 
 /*
@@ -1273,9 +1273,9 @@ void CL_Connect( const char *server, netadrtype_t family ) {
 	CL_FlushMemory( );
 	*/
 
-	Q_strncpyz( cls.servername, server, sizeof( cls.servername ) );
+	Q_strncpyz( clc.servername, server, sizeof( clc.servername ) );
 
-	if( !NET_StringToAdr( cls.servername, &clc.serverAddress, family ) ) {
+	if( !NET_StringToAdr( clc.servername, &clc.serverAddress, family ) ) {
 		Com_Printf( "Bad server address\n" );
 		clc.state = CA_DISCONNECTED;
 		UI_PushMenu("badserveraddy");
@@ -1286,7 +1286,7 @@ void CL_Connect( const char *server, netadrtype_t family ) {
 	}
 	serverString = NET_AdrToStringwPort(clc.serverAddress);
 
-	Com_Printf( "%s resolved to %s\n", cls.servername, serverString );
+	Com_Printf( "%s resolved to %s\n", clc.servername, serverString );
 
 	if (cl_guidServerUniq->integer)
 		CL_UpdateGUID(serverString, strlen(serverString));
@@ -1705,7 +1705,7 @@ CL_Clientinfo_f
 void CL_Clientinfo_f( void ) {
 	Com_Printf( "--------- Client Information ---------\n" );
 	Com_Printf( "state: %i\n", clc.state );
-	Com_Printf( "Server: %s\n", cls.servername );
+	Com_Printf( "Server: %s\n", clc.servername );
 	Com_Printf ("User info settings:\n");
 	Info_Print( Cvar_InfoString( CVAR_USERINFO ) );
 	Com_Printf( "--------------------------------------\n" );
@@ -2618,7 +2618,7 @@ void CL_Frame ( int msec ) {
 					now.tm_min,
 					now.tm_sec );
 
-			Q_strncpyz( serverName, cls.servername, MAX_OSPATH );
+			Q_strncpyz( serverName, clc.servername, MAX_OSPATH );
 			// Replace the ":" in the address as it is not a valid
 			// file name character
 			p = strstr( serverName, ":" );
diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 12e8602a..77037a36 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -429,6 +429,18 @@ void CL_SystemInfoChanged( void ) {
 	// in some cases, outdated cp commands might get sent with this news serverId
 	cl.serverId = atoi( Info_ValueForKey( systemInfo, "sv_serverid" ) );
 
+#ifdef USE_VOIP
+#ifdef LEGACY_PROTOCOL
+	if(clc.compat)
+		clc.voipEnabled = qfalse;
+	else
+#endif
+	{
+		s = Info_ValueForKey( systemInfo, "sv_voipProtocol" );
+		clc.voipEnabled = !Q_stricmp(s, "opus");
+	}
+#endif
+
 	// don't set any vars when playing a demo
 	if ( clc.demoplaying ) {
 		return;
@@ -784,6 +796,178 @@ void CL_ParseDownload ( msg_t *msg ) {
 	}
 }
 
+#ifdef USE_VOIP
+static
+qboolean CL_ShouldIgnoreVoipSender(int sender)
+{
+	if (!cl_voip->integer)
+		return qtrue;  // VoIP is disabled.
+	else if ((sender == clc.clientNum) && (!clc.demoplaying))
+		return qtrue;  // ignore own voice (unless playing back a demo).
+	else if (clc.voipMuteAll)
+		return qtrue;  // all channels are muted with extreme prejudice.
+	else if (clc.voipIgnore[sender])
+		return qtrue;  // just ignoring this guy.
+	else if (clc.voipGain[sender] == 0.0f)
+		return qtrue;  // too quiet to play.
+
+	return qfalse;
+}
+
+/*
+=====================
+CL_PlayVoip
+
+Play raw data
+=====================
+*/
+
+static void CL_PlayVoip(int sender, int samplecnt, const byte *data, int flags)
+{
+	if(flags & VOIP_DIRECT)
+	{
+		S_RawSamples(sender + 1, samplecnt, 48000, 2, 1,
+	             data, clc.voipGain[sender], -1);
+	}
+
+	if(flags & VOIP_SPATIAL)
+	{
+		S_RawSamples(sender + MAX_CLIENTS + 1, samplecnt, 48000, 2, 1,
+	             data, 1.0f, sender);
+	}
+}
+
+/*
+=====================
+CL_ParseVoip
+
+A VoIP message has been received from the server
+=====================
+*/
+static
+void CL_ParseVoip ( msg_t *msg, qboolean ignoreData ) {
+	static short decoded[VOIP_MAX_PACKET_SAMPLES*4]; // !!! FIXME: don't hard code
+
+	const int sender = MSG_ReadShort(msg);
+	const int generation = MSG_ReadByte(msg);
+	const int sequence = MSG_ReadLong(msg);
+	const int frames = MSG_ReadByte(msg);
+	const int packetsize = MSG_ReadShort(msg);
+	const int flags = MSG_ReadBits(msg, VOIP_FLAGCNT);
+	unsigned char encoded[4000];
+	int	numSamples;
+	int seqdiff;
+	int written = 0;
+	int i;
+
+	Com_DPrintf("VoIP: %d-byte packet from client %d\n", packetsize, sender);
+
+	if (sender < 0)
+		return;   // short/invalid packet, bail.
+	else if (generation < 0)
+		return;   // short/invalid packet, bail.
+	else if (sequence < 0)
+		return;   // short/invalid packet, bail.
+	else if (frames < 0)
+		return;   // short/invalid packet, bail.
+	else if (packetsize < 0)
+		return;   // short/invalid packet, bail.
+
+	if (packetsize > sizeof (encoded)) {  // overlarge packet?
+		int bytesleft = packetsize;
+		while (bytesleft) {
+			int br = bytesleft;
+			if (br > sizeof (encoded))
+				br = sizeof (encoded);
+			MSG_ReadData(msg, encoded, br);
+			bytesleft -= br;
+		}
+		return;   // overlarge packet, bail.
+	}
+
+	MSG_ReadData(msg, encoded, packetsize);
+
+	if (ignoreData) {
+		return; // just ignore legacy speex voip data
+	} else if (!clc.voipCodecInitialized) {
+		return;   // can't handle VoIP without libopus!
+	} else if (sender >= MAX_CLIENTS) {
+		return;   // bogus sender.
+	} else if (CL_ShouldIgnoreVoipSender(sender)) {
+		return;   // Channel is muted, bail.
+	}
+
+	// !!! FIXME: make sure data is narrowband? Does decoder handle this?
+
+	Com_DPrintf("VoIP: packet accepted!\n");
+
+	seqdiff = sequence - clc.voipIncomingSequence[sender];
+
+	// This is a new "generation" ... a new recording started, reset the bits.
+	if (generation != clc.voipIncomingGeneration[sender]) {
+		Com_DPrintf("VoIP: new generation %d!\n", generation);
+		opus_decoder_ctl(clc.opusDecoder[sender], OPUS_RESET_STATE);
+		clc.voipIncomingGeneration[sender] = generation;
+		seqdiff = 0;
+	} else if (seqdiff < 0) {   // we're ahead of the sequence?!
+		// This shouldn't happen unless the packet is corrupted or something.
+		Com_DPrintf("VoIP: misordered sequence! %d < %d!\n",
+		            sequence, clc.voipIncomingSequence[sender]);
+		// reset the decoder just in case.
+		opus_decoder_ctl(clc.opusDecoder[sender], OPUS_RESET_STATE);
+		seqdiff = 0;
+	} else if (seqdiff * VOIP_MAX_PACKET_SAMPLES*2 >= sizeof (decoded)) { // dropped more than we can handle?
+		// just start over.
+		Com_DPrintf("VoIP: Dropped way too many (%d) frames from client #%d\n",
+		            seqdiff, sender);
+		opus_decoder_ctl(clc.opusDecoder[sender], OPUS_RESET_STATE);
+		seqdiff = 0;
+	}
+
+	if (seqdiff != 0) {
+		Com_DPrintf("VoIP: Dropped %d frames from client #%d\n",
+		            seqdiff, sender);
+		// tell opus that we're missing frames...
+		for (i = 0; i < seqdiff; i++) {
+			assert((written + VOIP_MAX_PACKET_SAMPLES) * 2 < sizeof (decoded));
+			numSamples = opus_decode(clc.opusDecoder[sender], NULL, 0, decoded + written, VOIP_MAX_PACKET_SAMPLES, 0);
+			if ( numSamples <= 0 ) {
+				Com_DPrintf("VoIP: Error decoding frame %d from client #%d\n", i, sender);
+				continue;
+			}
+			written += numSamples;
+		}
+	}
+
+	numSamples = opus_decode(clc.opusDecoder[sender], encoded, packetsize, decoded + written, ARRAY_LEN(decoded) - written, 0);
+
+	if ( numSamples <= 0 ) {
+		Com_DPrintf("VoIP: Error decoding voip data from client #%d\n", sender);
+		numSamples = 0;
+	}
+
+	#if 0
+	static FILE *encio = NULL;
+	if (encio == NULL) encio = fopen("voip-incoming-encoded.bin", "wb");
+	if (encio != NULL) { fwrite(encoded, packetsize, 1, encio); fflush(encio); }
+	static FILE *decio = NULL;
+	if (decio == NULL) decio = fopen("voip-incoming-decoded.bin", "wb");
+	if (decio != NULL) { fwrite(decoded+written, numSamples*2, 1, decio); fflush(decio); }
+	#endif
+
+	written += numSamples;
+
+	Com_DPrintf("VoIP: playback %d bytes, %d samples, %d frames\n",
+	            written * 2, written, frames);
+
+	if(written > 0)
+		CL_PlayVoip(sender, written, (const byte *) decoded, flags);
+
+	clc.voipIncomingSequence[sender] = sequence + frames;
+}
+#endif
+
+
 /*
 =====================
 CL_ParseCommandString
@@ -932,8 +1116,16 @@ void CL_ParseServerMessage( msg_t *msg ) {
 			}
 			CL_ParseCGMessage( msg );
 			break;
+		case svc_voipSpeex:
+#ifdef USE_VOIP
+			CL_ParseVoip( msg, qtrue );
+#endif
+			break;
+		case svc_voipOpus:
+#ifdef USE_VOIP
+			CL_ParseVoip( msg, !clc.voipEnabled );
+#endif
+			break;
 		}
 	}
 }
-
-
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 02304e07..f74bb5be 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -265,7 +265,7 @@ static void GetClientState(uiClientState_t *state)
 {
     state->connectPacketCount = clc.connectPacketCount;
     state->connState          = clc.state;
-    Q_strncpyz(state->servername, cls.servername, sizeof(state->servername));
+    Q_strncpyz(state->servername, clc.servername, sizeof(state->servername));
     Q_strncpyz(state->updateInfoString, cls.updateInfoString, sizeof(state->updateInfoString));
     Q_strncpyz(state->messageString, clc.serverMessage, sizeof(state->messageString));
     state->clientNum = cl.snap.ps.clientNum;
diff --git a/code/client/client.h b/code/client/client.h
index c739d4fb..b33b123a 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -36,6 +36,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_curl.h"
 #endif /* USE_CURL */
 
+#ifdef USE_VOIP
+#include <opus.h>
+#endif
+
 // file full of random crap that gets used to create cl_guid
 #define QKEY_FILE "qkey"
 #define QKEY_SIZE 2048
@@ -174,6 +178,7 @@ typedef struct {
 	int			lastPacketSentTime;			// for retransmits during connection
 	int			lastPacketTime;				// for timeouts
 
+	char		servername[MAX_OSPATH];		// name of server from original connect (used by reconnect)
 	netadr_t	serverAddress;
 	int			connectTime;				// for connection retransmits
 	int			connectStartTime;
@@ -239,15 +244,42 @@ typedef struct {
 	int			timeDemoMaxDuration;	// maximum frame duration
 	unsigned char	timeDemoDurations[ MAX_TIMEDEMO_DURATIONS ];	// log of frame durations
 
+    float		aviVideoFrameRemainder;
+    float		aviSoundFrameRemainder;
+
+#ifdef USE_VOIP
+	qboolean voipEnabled;
+	qboolean voipCodecInitialized;
+
+	// incoming data...
+	// !!! FIXME: convert from parallel arrays to array of a struct.
+	OpusDecoder *opusDecoder[MAX_CLIENTS];
+	byte voipIncomingGeneration[MAX_CLIENTS];
+	int voipIncomingSequence[MAX_CLIENTS];
+	float voipGain[MAX_CLIENTS];
+	qboolean voipIgnore[MAX_CLIENTS];
+	qboolean voipMuteAll;
+
+	// outgoing data...
+	// if voipTargets[i / 8] & (1 << (i % 8)),
+	// then we are sending to clientnum i.
+	uint8_t voipTargets[(MAX_CLIENTS + 7) / 8];
+	uint8_t voipFlags;
+	OpusEncoder *opusEncoder;
+	int voipOutgoingDataSize;
+	int voipOutgoingDataFrames;
+	int voipOutgoingSequence;
+	byte voipOutgoingGeneration;
+	byte voipOutgoingData[1024];
+	float voipPower;
+#endif
+
 #ifdef LEGACY_PROTOCOL
 	qboolean compat;
 #endif
 
 	// big stuff at end of structure so most offsets are 15 bits or less
 	netchan_t	netchan;
-
-    float		aviVideoFrameRemainder;
-    float		aviSoundFrameRemainder;
 } clientConnection_t;
 
 extern	clientConnection_t clc;
@@ -297,8 +329,6 @@ typedef struct {
 	qboolean	cddialog;			// bring up the cd needed dialog next frame
 	qboolean	no_menus;
 
-	char		servername[MAX_OSPATH];		// name of server from original connect (used by reconnect)
-
 	// when the server clears the hunk, all of these must be restarted
 	qboolean	rendererRegistered;
 	qboolean	cgameStarted;
@@ -445,6 +475,32 @@ extern	cvar_t	*cl_r_fullscreen;
 
 extern	cvar_t	*cl_consoleKeys;
 
+#ifdef USE_MUMBLE
+extern	cvar_t	*cl_useMumble;
+extern	cvar_t	*cl_mumbleScale;
+#endif
+
+#ifdef USE_VOIP
+// cl_voipSendTarget is a string: "all" to broadcast to everyone, "none" to
+//  send to no one, or a comma-separated list of client numbers:
+//  "0,7,2,23" ... an empty string is treated like "all".
+extern	cvar_t	*cl_voipUseVAD;
+extern	cvar_t	*cl_voipVADThreshold;
+extern	cvar_t	*cl_voipSend;
+extern	cvar_t	*cl_voipSendTarget;
+extern	cvar_t	*cl_voipGainDuringCapture;
+extern	cvar_t	*cl_voipCaptureMult;
+extern	cvar_t	*cl_voipShowMeter;
+extern	cvar_t	*cl_voip;
+
+// 20ms at 48k
+#define VOIP_MAX_FRAME_SAMPLES		( 20 * 48 )
+
+// 3 frame is 60ms of audio, the max opus will encode at once
+#define VOIP_MAX_PACKET_FRAMES		3
+#define VOIP_MAX_PACKET_SAMPLES		( VOIP_MAX_FRAME_SAMPLES * VOIP_MAX_PACKET_FRAMES )
+#endif
+
 extern	cvar_t	*cg_gametype;
 
 extern	cvar_t* j_pitch;
@@ -546,6 +602,10 @@ extern int cl_connectedToPureServer;
 extern int cl_connectedToCheatServer;
 extern msg_t *cl_currentMSG;
 
+#ifdef USE_VOIP
+void CL_Voip_f( void );
+#endif
+
 void CL_SystemInfoChanged( void );
 void CL_ParseServerMessage( msg_t *msg );
 
diff --git a/code/client/snd_public.h b/code/client/snd_public.h
index 596e066f..1ad7476d 100644
--- a/code/client/snd_public.h
+++ b/code/client/snd_public.h
@@ -166,3 +166,20 @@ unsigned int S_GetMusicOffset();
 #endif
 
 #endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef USE_VOIP
+void S_StartCapture( void );
+int S_AvailableCaptureSamples( void );
+void S_Capture( int samples, byte *data );
+void S_StopCapture( void );
+void S_MasterGain( float gain );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/null/null_snddma.c b/code/null/null_snddma.c
index 8bd0c65b..9b782fa7 100644
--- a/code/null/null_snddma.c
+++ b/code/null/null_snddma.c
@@ -47,6 +47,29 @@ void SNDDMA_Submit(void)
 {
 }
 
+#ifdef USE_VOIP
+void SNDDMA_StartCapture(void)
+{
+}
+
+int SNDDMA_AvailableCaptureSamples(void)
+{
+	return 0;
+}
+
+void SNDDMA_Capture(int samples, byte *data)
+{
+}
+
+void SNDDMA_StopCapture(void)
+{
+}
+
+void SNDDMA_MasterGain( float val )
+{
+}
+#endif
+
 void SNDDMA_Activate(void) {
 }
 
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 17fa85be..58c7bc4d 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -362,7 +362,11 @@ enum svc_ops_e {
 	svc_centerprint,
 	svc_locprint,
 	svc_cgameMessage,
-	svc_EOF
+	svc_EOF,
+
+// new commands, supported only by ioquake3 protocol but not legacy
+	svc_voipSpeex,     // not wrapped in USE_VOIP, so this value is reserved.
+	svc_voipOpus,      //
 };
 
 //
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 5e0b1fea..1be02ad4 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -24,7 +24,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../gamespy/sv_gamespy.h"
 #include "../gamespy/sv_gqueryreporting.h"
 
-cvar_t			*sv_mapname;
+#ifdef USE_VOIP
+cvar_t *sv_voip;
+cvar_t *sv_voipProtocol;
+#endif
+
 serverStatic_t	svs;				// persistant server info
 server_t		sv;					// local server
 //vm_t			*gvm = NULL;				// game virtual machine
@@ -45,6 +49,7 @@ cvar_t	*sv_reconnectlimit;		// minimum seconds between connect messages
 cvar_t	*sv_showloss;			// report when usercmds are lost
 cvar_t	*sv_padPackets;			// add nop bytes to messages
 cvar_t	*sv_killserver;			// menu system can set to 1 to shut server down
+cvar_t	*sv_mapname;
 cvar_t	*sv_mapChecksum;
 cvar_t	*sv_serverid;
 cvar_t	*sv_minRate;

From c6675f201394b22361845e6a351e15f9caea8d90 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 19:59:10 +0200
Subject: [PATCH 0967/2040] Remove special features code to avoid any confusion

---
 code/fgame/entity.cpp    |  14 +-
 code/fgame/entity.h      |   6 +-
 code/fgame/g_main.cpp    |   1 -
 code/fgame/gamecvars.cpp |   2 -
 code/fgame/gamecvars.h   |   1 -
 code/fgame/hud.cpp       |  14 +-
 code/fgame/huddraw.cpp   |   4 +
 code/fgame/item.cpp      |  13 +-
 code/fgame/item.h        |   2 +
 code/fgame/level.h       |   3 -
 code/fgame/player.cpp    | 738 +++++++++++++++++++--------------------
 code/fgame/player.h      |  20 +-
 12 files changed, 404 insertions(+), 414 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 8f2442db..04e41750 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -1500,6 +1500,7 @@ Event EV_Entity_IsInZone
     EV_RETURN
 );
 */
+#ifdef OPM_FEATURES
 Event EV_Entity_SetHintRequireLookAt
 (
     "setuselookat",
@@ -1528,6 +1529,7 @@ Event EV_Entity_SetShader
     "Sets a shader for the entity. An empty string will revert to the normal entity shader.",
     EV_NORMAL
 );
+#endif
 
 CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_Damage,                       &Entity::DamageEvent              },
@@ -1675,9 +1677,11 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_Entity_IsInZone,              &Entity::IsInZone                 },
     */
     {&EV_Entity_SetDHack,              &Entity::SetDepthHack             },
+#ifdef OPM_FEATURES
     {&EV_Entity_SetHintRequireLookAt,  &Entity::SetHintRequireLookAt     },
     {&EV_Entity_SetHintString,         &Entity::SetHintString            },
     {&EV_Entity_SetShader,             &Entity::SetShader                },
+#endif
     {NULL,                             NULL                              }
 };
 
@@ -1783,7 +1787,9 @@ Entity::Entity()
     m_iNumBlockedPaths   = 0;
     m_BlockedPaths       = NULL;
 
+#ifdef OPM_FEATURES
     m_bHintRequiresLookAt = true;
+#endif
 }
 
 Entity::~Entity()
@@ -6336,6 +6342,7 @@ void Entity::SetDepthHack(Event *ev)
     }
 }
 
+#ifdef OPM_FEATURES
 void Entity::ProcessHint(gentity_t *client, bool bShow)
 {
     Player *player = (Player *)client->entity;
@@ -6374,18 +6381,19 @@ void Entity::SetHintString(Event *ev)
     m_HintString = ev->GetString(1);
 }
 
-void Entity::SetShader(Event *ev)
+void Entity::SetShader(Event* ev)
 {
     str      shadername = ev->GetString(1);
-    qboolean fReset     = false;
+    qboolean fReset = false;
 
     if (!shadername.length()) {
         shadername = "default";
-        fReset     = true;
+        fReset = true;
     }
 
     gi.SendServerCommand(-1, "setshader %d %s %d", entnum, shadername.c_str(), fReset);
 }
+#endif
 
 void Entity::PlayNonPvsSound(const str& soundName, float volume)
 {
diff --git a/code/fgame/entity.h b/code/fgame/entity.h
index 901dc457..fbedaaea 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -286,6 +286,7 @@ public:
     // immune list
     Container<int> immunities;
 
+#ifdef OPM_FEATURES
     //
     // Added in OPM
     //====
@@ -293,6 +294,7 @@ public:
     bool     m_bHintRequiresLookAt;
     str      m_HintString;
     //====
+#endif
 
     Entity();
     virtual ~Entity();
@@ -641,9 +643,11 @@ public:
     void GetZone(Event *ev);
     void IsInZone(Event *ev);
     void SetDepthHack(Event *ev);
+#ifdef OPM_FEATURES
     void SetHintRequireLookAt(Event *ev);
     void SetHintString(Event *ev);
-    void SetShader(Event *ev);
+    void SetShader(Event* ev);
+#endif
     void PlayNonPvsSound(const str& soundName, float volume = 1);
 };
 
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index d3b12dd4..c980ead1 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -266,7 +266,6 @@ void G_InitGame(int levelTime, int randomSeed)
 
     // set some level globals
     level.svsStartTime = levelTime;
-    level.specialgame  = sv_specialgame->integer ? true : false;
 
     G_InitConsoleCommands();
 
diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index 807b8bee..d84961aa 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gamecvars.h"
 
 cvar_t *developer;
-cvar_t *sv_specialgame;
 
 cvar_t *deathmatch;
 cvar_t *dmflags;
@@ -273,7 +272,6 @@ cvar_t *cl_running;
 void CVAR_Init(void)
 {
     developer      = gi.Cvar_Get("developer", "0", 0);
-    sv_specialgame = gi.Cvar_Get("sv_specialgame", "0", CVAR_LATCH | CVAR_SERVERINFO);
 
     precache = gi.Cvar_Get("sv_precache", "1", 0);
 
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index 407aa6c9..44bf853f 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -31,7 +31,6 @@ extern "C" {
 #endif
 
 extern cvar_t *developer;
-extern cvar_t *sv_specialgame;
 
 extern cvar_t *deathmatch;
 extern cvar_t *dmflags;
diff --git a/code/fgame/hud.cpp b/code/fgame/hud.cpp
index 9dd1980e..46a93c37 100644
--- a/code/fgame/hud.cpp
+++ b/code/fgame/hud.cpp
@@ -1001,7 +1001,6 @@ void Hud::MoveOverTime( float time )
 
 void Hud::Refresh( int clientNumber )
 {
-#ifdef GAME_DLL
 	SetBroadcast( clientNumber );
 
 	gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_ALIGN ));
@@ -1093,13 +1092,13 @@ void Hud::Refresh( int clientNumber )
 		gi.MSG_WriteBits( virtualSize, 1 );
 	gi.MSG_EndCGM();
 
+#ifdef OPM_FEATURES
 	if( sv_specialgame->integer )
 	{
 		if( isDimensional )
 		{
 			SetBroadcast();
 
-			/*
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_3D ));
 				WriteNumber();
 				gi.MSG_WriteCoord( org[ 0 ] );
@@ -1111,19 +1110,16 @@ void Hud::Refresh( int clientNumber )
 				gi.MSG_WriteBits( !!always_show, 1 );
 				gi.MSG_WriteBits( !!depth, 1 );
 			gi.MSG_EndCGM();
-			*/
 		}
 
 		if( fade_alpha )
 		{
 			SetBroadcast();
 
-			/*
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_FADE ));
 				WriteNumber();
 				gi.MSG_WriteFloat( fade_alpha_current );
 			gi.MSG_EndCGM();
-			*/
 
 			SetBroadcast();
 
@@ -1137,7 +1133,6 @@ void Hud::Refresh( int clientNumber )
 		{
 			SetBroadcast();
 
-			/*
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_MOVE ));
 				WriteNumber();
 				gi.MSG_WriteFloat( fade_move_current );
@@ -1150,12 +1145,10 @@ void Hud::Refresh( int clientNumber )
 				gi.MSG_WriteShort( ( short )fade_move_x_target );
 				gi.MSG_WriteShort( ( short )fade_move_y_target );
 			gi.MSG_EndCGM();
-			*/
 		}
 
 		if( fade_timer_flags & TIMER_ACTIVE )
 		{
-			/*
 			SetBroadcast();
 
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_TIMER ));
@@ -1170,7 +1163,6 @@ void Hud::Refresh( int clientNumber )
 				}
 
 			gi.MSG_EndCGM();
-			*/
 		}
 	}
 #endif
@@ -1232,11 +1224,15 @@ void Hud::SetBroadcast( int clientNumber )
 
 void Hud::WriteNumber()
 {
+#ifdef OPM_FEATURES
 	if(sv_specialgame->integer ) {
 		gi.MSG_WriteShort( number );
 	} else {
 		gi.MSG_WriteByte( number );
 	}
+#else
+	gi.MSG_WriteByte(number);
+#endif
 }
 
 #endif
diff --git a/code/fgame/huddraw.cpp b/code/fgame/huddraw.cpp
index 89bb209f..2340c8a3 100644
--- a/code/fgame/huddraw.cpp
+++ b/code/fgame/huddraw.cpp
@@ -28,11 +28,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 void HudWriteNumber( int num )
 {
+#ifdef OPM_FEATURES
 	if(sv_specialgame->integer ) {
 		gi.MSG_WriteShort( num );
 	} else {
 		gi.MSG_WriteByte( num );
 	}
+#else
+	gi.MSG_WriteByte(num);
+#endif
 }
 
 void HudDrawShader( int info, const char *name )
diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp
index 6a378c5f..07cd43fa 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -291,6 +291,7 @@ Event EV_Item_SetPickupSound
     EV_NORMAL
 );
 
+#ifdef OPM_FEATURES
 Event EV_Item_ViewModelPrefix
 (
     "viewmodelprefix",
@@ -310,6 +311,7 @@ Event EV_Item_UpdatePrefix
     "internal event - update the custom viewmodel prefix",
     EV_NORMAL
 );
+#endif
 
 CLASS_DECLARATION(Trigger, Item, NULL) {
     {&EV_Trigger_Effect,       &Item::ItemTouch            },
@@ -332,8 +334,10 @@ CLASS_DECLARATION(Trigger, Item, NULL) {
     {&EV_Item_SetDMAmount,     &Item::SetDMAmountEvent     },
     {&EV_Item_SetDMMaxAmount,  &Item::SetDMMaxAmount       },
     {&EV_Item_SetPickupSound,  &Item::SetPickupSound       },
+#ifdef OPM_FEATURES
     {&EV_Item_ViewModelPrefix, &Item::EventViewModelPrefix },
     {&EV_Item_UpdatePrefix,    &Item::updatePrefix         },
+#endif
     {NULL,                     NULL                        }
 };
 
@@ -555,10 +559,12 @@ void Item::SetOwner(Sentient *ent)
     CancelEventsOfType(EV_Item_DropToFloor);
     CancelEventsOfType(EV_Remove);
 
+#ifdef OPM_FEATURES
     Event *ev = new Event(EV_Item_UpdatePrefix);
     ev->AddEntity(ent);
 
     PostEvent(ev, EV_POSTSPAWN);
+#endif
 }
 
 Sentient *Item::GetOwner(void)
@@ -897,6 +903,7 @@ void Item::Landed(Event *ev)
     setMoveType(MOVETYPE_NONE);
 }
 
+#ifdef OPM_FEATURES
 void Item::EventViewModelPrefix(Event *ev)
 {
     int        i;
@@ -922,7 +929,7 @@ void Item::EventViewModelPrefix(Event *ev)
 
 void Item::updatePrefix(Event *ev)
 {
-    if (!level.specialgame) {
+    if (!sv_specialgame->integer) {
         return;
     }
 
@@ -930,8 +937,6 @@ void Item::updatePrefix(Event *ev)
         return;
     }
 
-    // FIXME: delete
-    /*
 	Entity *ent = ev->GetEntity( 1 );
 
 	gi.MSG_SetClient( ent->edict - g_entities );
@@ -940,8 +945,8 @@ void Item::updatePrefix(Event *ev)
 		gi.MSG_WriteString( item_name.c_str() );
 		gi.MSG_WriteString( m_sVMprefix.c_str() );
 	gi.MSG_EndCGM();
-	*/
 }
+#endif
 
 CLASS_DECLARATION(Item, DynItem, NULL) {
     {&EV_Kill,   &DynItem::UnlinkItem},
diff --git a/code/fgame/item.h b/code/fgame/item.h
index 647f69f6..2d0ba760 100644
--- a/code/fgame/item.h
+++ b/code/fgame/item.h
@@ -121,11 +121,13 @@ public:
 
     void Archive(Archiver& arc) override;
 
+#ifdef OPM_FEATURES
     //
     // Custom openmohaa stuff
     //
     void EventViewModelPrefix(Event *ev);
     void updatePrefix(Event *ev);
+#endif
 };
 
 inline void Item::Archive(Archiver& arc)
diff --git a/code/fgame/level.h b/code/fgame/level.h
index 0f53ef03..7355e278 100644
--- a/code/fgame/level.h
+++ b/code/fgame/level.h
@@ -251,9 +251,6 @@ public:
 
     // New Stuff
 
-    // don't put in the game class because it can be changed in another level
-    qboolean specialgame;
-
     bool m_bSpawnBot;
 
     // Script stuff
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 7cf33fe0..4a6f18ba 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -1352,6 +1352,15 @@ Event EV_Player_AdminRights
     "returns client admin rights",
     EV_GETTER
 );
+Event EV_Player_IsAdmin
+(
+    "isadmin",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "checks if player is logged as admin",
+    EV_RETURN
+);
 Event EV_Player_BindWeap
 (
     "bindweap",
@@ -1361,24 +1370,6 @@ Event EV_Player_BindWeap
     "binds weapon to player and sets him as weapon owner",
     EV_NORMAL
 );
-Event EV_Player_CanSwitchTeams
-(
-    "canswitchteams",
-    EV_DEFAULT,
-    "bB",
-    "allow_team_change allow_spectate",
-    "Specify if this player is allowed to switch teams and spectate. Doesn't override global canswitchteams.",
-    EV_NORMAL
-);
-Event EV_Player_ClearCommand
-(
-    "clearcommand",
-    EV_DEFAULT,
-    "S",
-    "command",
-    "Clears any or a specific client command",
-    EV_NORMAL
-);
 Event EV_Player_Dive
 (
     "dive",
@@ -1388,15 +1379,6 @@ Event EV_Player_Dive
     "Makes the player dive into prone position.",
     EV_NORMAL
 );
-Event EV_Player_Earthquake
-(
-    "earthquake2",
-    EV_DEFAULT,
-    "ffbbVF",
-    "duration magnitude no_rampup no_rampdown location radius",
-    "Create a smooth realistic earthquake for a player. Requires sv_reborn to be set.",
-    EV_NORMAL
-);
 Event EV_Player_FreezeControls
 (
     "freezecontrols",
@@ -1478,15 +1460,6 @@ Event EV_Player_GetTorsoState
     "Gets the player's current torso state name",
     EV_RETURN
 );
-Event EV_Player_HideEnt
-(
-    "hideent",
-    EV_DEFAULT,
-    "e",
-    "entity",
-    "Hides the specified entity to the player.",
-    EV_NORMAL
-);
 Event EV_Player_Inventory
 (
     "inventory",
@@ -1505,15 +1478,6 @@ Event EV_Player_InventorySet
     "Set up the player's inventory",
     EV_SETTER
 );
-Event EV_Player_IsAdmin
-(
-    "isadmin",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "checks if player is logged as admin",
-    EV_RETURN
-);
 Event EV_Player_LeanLeftHeld
 (
     "leanleftheld",
@@ -1560,15 +1524,6 @@ Event EV_Player_PlayLocalSound
     "sounds.",
     EV_NORMAL
 );
-Event EV_Player_Replicate
-(
-    "replicate",
-    EV_DEFAULT,
-    "s",
-    "variable",
-    "Replicate a variable to the client (needs patch 1.12).",
-    EV_NORMAL
-);
 Event EV_Player_RunHeld
 (
     "runheld",
@@ -1585,7 +1540,7 @@ Event EV_Player_SecFireHeld
     EV_DEFAULT,
     NULL,
     NULL,
-    "returns EV_RETURN if this player is holding secondary fire, or 0 if he is not",
+    "returns 1 if this player is holding secondary fire, or 0 if he is not",
     EV_GETTER
 );
 Event EV_Player_SetAnimSpeed
@@ -1616,33 +1571,6 @@ Event EV_Player_SetKillHandler
     "killed event handler.",
     EV_SETTER
 );
-Event EV_Player_SetClientFlag
-(
-    "setclientflag",
-    EV_DEFAULT,
-    "s",
-    "name",
-    "Calls a flag to the script client.",
-    EV_NORMAL
-);
-Event EV_Player_SetEntityShader
-(
-    "setentshader",
-    EV_DEFAULT,
-    "es",
-    "entity shadername",
-    "Sets an entity shader for this player. An empty string will revert to the normal entity shader.",
-    EV_NORMAL
-);
-Event EV_Player_SetLocalSoundRate
-(
-    "setlocalsoundrate",
-    EV_DEFAULT,
-    "sfF",
-    "name rate time",
-    "Sets the local sound rate.",
-    EV_NORMAL
-);
 Event EV_Player_SetSpeed
 (
     "setspeed",
@@ -1671,13 +1599,13 @@ Event EV_Player_SetTeam
     "Available team names are 'none', 'spectator', 'freeforall', 'axis' and 'allies'.",
     EV_NORMAL
 );
-Event EV_Player_SetViewModelAnimSpeed
+Event EV_Player_HideEnt
 (
-    "setvmaspeed",
+    "hideent",
     EV_DEFAULT,
-    "sf",
-    "name speed",
-    "Sets the player's animation speed when playing it.",
+    "e",
+    "entity",
+    "Hides the specified entity to the player.",
     EV_NORMAL
 );
 Event EV_Player_ShowEnt
@@ -1734,6 +1662,62 @@ Event EV_Player_ViewModelAnimValid
     "True if the view model animation is valid.",
     EV_RETURN
 );
+
+#ifdef OPM_FEATURES
+Event EV_Player_Earthquake
+(
+    "earthquake2",
+    EV_DEFAULT,
+    "ffbbVF",
+    "duration magnitude no_rampup no_rampdown location radius",
+    "Create a smooth realistic earthquake for a player. Requires sv_reborn to be set.",
+    EV_NORMAL
+);
+Event EV_Player_Replicate
+(
+    "replicate",
+    EV_DEFAULT,
+    "s",
+    "variable",
+    "Replicate a variable to the client (needs patch 1.12).",
+    EV_NORMAL
+);
+Event EV_Player_SetClientFlag
+(
+    "setclientflag",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Calls a flag to the script client.",
+    EV_NORMAL
+);
+Event EV_Player_SetEntityShader
+(
+    "setentshader",
+    EV_DEFAULT,
+    "es",
+    "entity shadername",
+    "Sets an entity shader for this player. An empty string will revert to the normal entity shader.",
+    EV_NORMAL
+);
+Event EV_Player_SetLocalSoundRate
+(
+    "setlocalsoundrate",
+    EV_DEFAULT,
+    "sfF",
+    "name rate time",
+    "Sets the local sound rate.",
+    EV_NORMAL
+);
+Event EV_Player_SetViewModelAnimSpeed
+(
+    "setvmaspeed",
+    EV_DEFAULT,
+    "sf",
+    "name speed",
+    "Sets the player's animation speed when playing it.",
+    EV_NORMAL
+);
 Event EV_Player_VisionSetBlur
 (
     "visionsetblur",
@@ -1762,6 +1746,7 @@ Event EV_Player_VisionSetNaked
     "an empty string, it will revert to the current global vision.",
     EV_NORMAL
 );
+#endif
 
 qboolean TryPush(int entnum, vec3_t move_origin, vec3_t move_end);
 
@@ -1915,11 +1900,8 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_AddDeaths,                &Player::AddDeaths                    },
     {&EV_Player_AdminRights,              &Player::AdminRights                  },
     {&EV_Player_BindWeap,                 &Player::BindWeap                     },
-    {&EV_Player_CanSwitchTeams,           &Player::CanSwitchTeams               },
-    {&EV_Player_ClearCommand,             &Player::ClearCommand                 },
     {&EV_Player_Dive,                     &Player::Dive                         },
     {&EV_Player_DMMessage,                &Player::EventDMMessage               },
-    {&EV_Player_Earthquake,               &Player::EventEarthquake              },
     {&EV_Player_FreezeControls,           &Player::FreezeControls               },
     {&EV_Player_SetTeam,                  &Player::EventSetTeam                 },
     {&EV_Player_GetConnState,             &Player::GetConnState                 },
@@ -1943,13 +1925,9 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_RunHeld,                  &Player::RunHeld                      },
     {&EV_Player_SecFireHeld,              &Player::SecFireHeld                  },
     {&EV_Player_SetAnimSpeed,             &Player::SetAnimSpeed                 },
-    {&EV_Player_SetClientFlag,            &Player::SetClientFlag                },
-    {&EV_Player_SetEntityShader,          &Player::SetEntityShader              },
     {&EV_Player_SetKillHandler,           &Player::SetKillHandler               },
-    {&EV_Player_SetLocalSoundRate,        &Player::SetLocalSoundRate            },
     {&EV_Player_SetSpeed,                 &Player::SetSpeed                     },
     {&EV_Player_SetStateFile,             &Player::SetStateFile                 },
-    {&EV_Player_SetViewModelAnimSpeed,    &Player::SetVMASpeed                  },
     {&EV_Player_ShowEnt,                  &Player::ShowEntity                   },
     {&EV_Player_Spectator,                &Player::Spectator                    },
     {&EV_Player_StopLocalSound,           &Player::StopLocalSound               },
@@ -1957,9 +1935,16 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_ViewModelAnimFinished,    &Player::EventGetViewModelAnimFinished},
     {&EV_Player_ViewModelGetAnim,         &Player::EventGetViewModelAnim        },
     {&EV_Player_ViewModelAnimValid,       &Player::EventGetViewModelAnimValid   },
+#ifdef OPM_FEATURES
+    {&EV_Player_Earthquake,               &Player::EventEarthquake              },
+    {&EV_Player_SetClientFlag,            &Player::SetClientFlag                },
+    {&EV_Player_SetEntityShader,          &Player::SetEntityShader              },
+    {&EV_Player_SetLocalSoundRate,        &Player::SetLocalSoundRate            },
+    {&EV_Player_SetViewModelAnimSpeed,    &Player::SetVMASpeed                  },
     {&EV_Player_VisionGetNaked,           &Player::VisionGetNaked               },
     {&EV_Player_VisionSetBlur,            &Player::VisionSetBlur                },
     {&EV_Player_VisionSetNaked,           &Player::VisionSetNaked               },
+#endif
     {NULL,                                NULL                                  }
 };
 
@@ -2033,9 +2018,9 @@ Player::Player()
     //
     // Added in OPM
     //====
+#ifdef OPM_FEATURES
     m_bShowingHint      = false;
-    disable_spectate    = false;
-    disable_team_change = false;
+#endif
     m_fpsTiki           = NULL;
     m_bConnected        = false;
     //====
@@ -2360,7 +2345,9 @@ void Player::InitClient(void)
 
     SetStopwatch(0);
 
+#ifdef OPM_FEATURES
     m_bShowingHint = false;
+#endif
 }
 
 void Player::InitState(void)
@@ -3915,7 +3902,7 @@ void Player::ClientMove(usercmd_t *ucmd)
     pmove_t pm;
     Vector  move;
 
-#if 0
+#ifdef OPM_FEATURES
     int  touch[MAX_GENTITIES];
     int  num        = getUseableEntities(touch, MAX_GENTITIES, true);
     bool bHintShown = false;
@@ -9270,6 +9257,10 @@ void Player::Join_DM_Team(Event *ev)
     float       startTime;
     Entity     *ent;
 
+    if (ev->isSubclassOf(ConsoleEvent) && disable_team_change) {
+        return;
+    }
+
     teamname = ev->GetString(1);
 
     if (!teamname.icmp("allies")) {
@@ -11733,48 +11724,144 @@ void Player::Spawned(void)
     scriptedEvents[SE_SPAWN].Trigger(ev);
 }
 
-// reborn stuff
+void Player::AddKills(int num)
+{
+    num_kills += num;
+
+    if (g_gametype->integer >= GT_TEAM_ROUNDS) {
+        num_deaths += num;
+    }
+}
+
+void Player::AddDeaths(int num)
+{
+    num_deaths += num;
+}
+
+////////////////////////////
+//
+// Added in OPM
+//
+////////////////////////////
+
+qboolean Player::canUse()
+{
+    int touch[MAX_GENTITIES];
+    int num = getUseableEntities(touch, MAX_GENTITIES);
+
+    return num ? true : false;
+}
+
+qboolean Player::canUse(Entity *entity, bool requiresLookAt)
+{
+    gentity_t *hit;
+    int        touch[MAX_GENTITIES];
+    int        num;
+    int        i;
+
+    num = getUseableEntities(touch, MAX_GENTITIES, requiresLookAt);
+
+    for (i = 0; i < num; i++) {
+        hit = &g_entities[touch[i]];
+
+        if (!hit->inuse || hit->entity == NULL) {
+            continue;
+        }
+
+        if (hit->entity == entity) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+int Player::getUseableEntities(int *touch, int maxcount, bool requiresLookAt)
+{
+    Vector  end;
+    Vector  start;
+    trace_t trace;
+    Vector  offset;
+    Vector  max;
+    Vector  min;
+
+    if ((g_gametype->integer != GT_SINGLE_PLAYER && IsSpectator()) || IsDead()) {
+        return 0;
+    }
+
+    if (m_pTurret) {
+        *touch = m_pTurret->entnum;
+        return 1;
+    }
+
+    if (m_pTurret) {
+        return 0;
+    }
+
+    AngleVectors(client->ps.viewangles, offset, NULL, NULL);
+
+    start = origin;
+    start.z += client->ps.viewheight;
+
+    if (requiresLookAt) {
+        min = Vector(-4.f, -4.f, -4.f);
+        max = Vector(4.f, 4.f, 4.f);
+
+        end[0] = start[0] + (offset[0] * 64.f);
+        end[1] = start[1] + (offset[1] * 64.f);
+
+        if (v_angle[0] <= 0.0f) {
+            end[2] = start[2] + (offset[2] * 40.f);
+        } else {
+            end[2] = start[2] + (offset[2] * 88.f);
+        }
+
+        trace = G_Trace(start, min, max, end, this, MASK_USE, false, "Player::getUseableEntity");
+
+        offset = trace.endpos;
+
+        min = offset - Vector(16.f, 16.f, 16.f);
+        max = offset + Vector(16.f, 16.f, 16.f);
+    } else {
+        min = start - Vector(31.f, 31.f, 31.f);
+        max = start + Vector(31.f, 31.f, 31.f);
+    }
+
+    return gi.AreaEntities(min, max, touch, maxcount);
+}
+
+void Player::Postthink(void)
+{
+    if (bindmaster) {
+        SetViewAngles(GetViewAngles() + Vector(0, bindmaster->avelocity[YAW] * level.frametime, 0));
+    }
+}
+
+void Player::AdminRights(Event* ev)
+{
+    // FIXME: Admin manager ?
+    ev->AddInteger(0);
+    UNIMPLEMENTED();
+}
+
+void Player::IsAdmin(Event* ev)
+{
+    // FIXME: Admin manager ?
+    ev->AddInteger(0);
+    UNIMPLEMENTED();
+}
+
+void Player::BindWeap(Event* ev)
+{
+    // FIXME: TODO
+    UNIMPLEMENTED();
+}
 
 void Player::AddDeaths(Event *ev)
 {
     AddDeaths(ev->GetInteger(1));
 }
 
-void Player::AdminRights(Event *ev)
-{
-    // FIXME: Admin manager ?
-    ev->AddInteger(0);
-}
-
-void Player::BindWeap(Event *ev)
-{
-    // FIXME: TODO
-}
-
-void Player::CanSwitchTeams(Event *ev)
-{
-    qboolean bAllow = ev->GetBoolean(1);
-
-    disable_team_change = !bAllow;
-    if (ev->NumArgs() > 1) {
-        qboolean bAllow2 = ev->GetBoolean(2);
-
-        disable_spectate = !bAllow2;
-    }
-}
-
-void Player::ClearCommand(Event *ev)
-{
-    str command;
-    int clientNum = G_GetClientNumber(this);
-
-    if (ev->NumArgs() > 0) {
-        command = ev->GetString(1);
-    }
-
-    m_lastcommand = "";
-}
-
 void Player::Dive(Event *ev)
 {
     float height, airborne_duration, speed;
@@ -11796,39 +11883,6 @@ void Player::Dive(Event *ev)
     velocity[2] += height * speed / 6.80f;
 }
 
-void Player::EventEarthquake(Event *ev)
-{
-    float    duration    = ev->GetFloat(1);
-    float    magnitude   = ev->GetFloat(2);
-    qboolean no_rampup   = ev->GetBoolean(3);
-    qboolean no_rampdown = ev->GetBoolean(4);
-
-    // full realistic, smooth earthquake
-    if (ev->NumArgs() > 4) {
-        Vector location = ev->GetVector(5);
-        float  radius   = 1.0f;
-
-        if (ev->NumArgs() > 5) {
-            radius = ev->GetFloat(6);
-        }
-
-        gi.SendServerCommand(
-            edict - g_entities,
-            "eq %f %f %d %d %f %f %f %f",
-            duration,
-            magnitude,
-            no_rampup,
-            no_rampdown,
-            location[0],
-            location[1],
-            location[2],
-            radius
-        );
-    } else {
-        gi.SendServerCommand(edict - g_entities, "eq %f %f %d %d", duration, magnitude, no_rampup, no_rampdown);
-    }
-}
-
 void Player::EventSetTeam(Event *ev)
 {
     str        team_name;
@@ -11857,7 +11911,7 @@ void Player::EventSetTeam(Event *ev)
 
     SetTeam(teamType);
 
-    gi.Printf("Player::SetTeam : Player is now on team \"%s\"\n", team_name.c_str());
+    gi.DPrintf("Player::SetTeam : Player is now on team \"%s\"\n", team_name.c_str());
 }
 
 void Player::EventGetViewModelAnim(Event *ev)
@@ -11983,11 +12037,13 @@ void Player::GetTorsoState(Event *ev)
 void Player::HideEntity(Event *ev)
 {
     // FIXME: todo
+    UNIMPLEMENTED();
 }
 
 void Player::ShowEntity(Event *ev)
 {
     // FIXME: REDO
+    UNIMPLEMENTED();
 }
 
 void Player::Inventory(Event *ev)
@@ -12066,12 +12122,6 @@ void Player::InventorySet(Event *ev)
     array.Clear();
 }
 
-void Player::IsAdmin(Event *ev)
-{
-    // FIXME: Admin manager ?
-    ev->AddInteger(0);
-}
-
 void Player::LeanLeftHeld(Event *ev)
 {
     Player *player     = NULL;
@@ -12121,8 +12171,7 @@ void Player::PlayLocalSound(Event *ev)
         return;
     }
 
-    // FIXME...
-    /*
+#ifdef OPM_FEATURES
         gi.MSG_SetClient( client->ps.clientNum );
 
         gi.MSG_StartCGM( CGM_PLAYLOCALSOUND );
@@ -12133,7 +12182,7 @@ void Player::PlayLocalSound(Event *ev)
         gi.MSG_EndCGM();
 
         return;
-    */
+#endif
 
     if (loop) {
         edict->s.loopSound        = gi.soundindex(found, alias->streamed);
@@ -12182,32 +12231,7 @@ void Player::SetAnimSpeed(Event *ev)
         speed = 0.0f;
     }
 
-    //player->baseSentient.baseAnimate.baseEntity.client->customanimspeed = speed;
-}
-
-void Player::SetClientFlag(Event *ev)
-{
-    str name = ev->GetString(1);
-
-    gi.SendServerCommand(client->ps.clientNum, "cf %s", name.c_str());
-}
-
-void Player::SetEntityShader(Event *ev)
-{
-    Entity  *entity     = ev->GetEntity(1);
-    str      shadername = ev->GetString(2);
-    qboolean fReset     = false;
-
-    if (entity == NULL) {
-        ScriptError("Invalid entity !");
-    }
-
-    if (!shadername.length()) {
-        shadername = "default";
-        fReset     = true;
-    }
-
-    gi.SendServerCommand(edict - g_entities, "setshader %d %s %d", entity->entnum, shadername.c_str(), fReset);
+    UNIMPLEMENTED();
 }
 
 void Player::SetKillHandler(Event *ev)
@@ -12219,38 +12243,6 @@ void Player::SetKillHandler(Event *ev)
     }
 }
 
-void Player::SetLocalSoundRate(Event *ev)
-{
-    str   name = ev->GetString(1);
-    float rate = ev->GetFloat(2);
-    float time;
-
-    if (ev->NumArgs() > 2) {
-        time = ev->GetFloat(3);
-    } else {
-        time = 0.0f;
-    }
-
-    AliasListNode_t *alias = NULL;
-    const char      *found = gi.GlobalAlias_FindRandom(name, &alias);
-
-    if (found == NULL) {
-        gi.DPrintf("ERROR: Player::SetLocalSoundRate: %s needs to be aliased - Please fix.\n", name.c_str());
-        return;
-    }
-
-    gi.MSG_SetClient(client->ps.clientNum);
-
-    // FIXME...
-    /*
-    gi.MSG_StartCGM( CGM_SETLOCALSOUNDRATE );
-        gi.MSG_WriteString( found );
-        gi.MSG_WriteFloat( rate );
-        gi.MSG_WriteFloat( time );
-    gi.MSG_EndCGM();
-    */
-}
-
 void Player::SetSpeed(Event *ev)
 {
     float   speed;
@@ -12301,35 +12293,6 @@ void Player::SetStateFile(Event *ev)
     }
 }
 
-void Player::SetVMASpeed(Event *ev)
-{
-    str   name  = ev->GetString(1);
-    float speed = ev->GetFloat(2);
-
-    if (!client || !level.specialgame) {
-        return;
-    }
-
-    vma_t *vma = &vmalist[name];
-
-    if (speed < 0.0f) {
-        speed = 0.0f;
-    }
-
-    vma->name  = name;
-    vma->speed = speed;
-
-    // FIXME...
-    /*
-    gi.MSG_SetClient( edict - g_entities );
-
-    gi.MSG_StartCGM( CGM_SETVMASPEED );
-        gi.MSG_WriteString( name );
-        gi.MSG_WriteFloat( speed );
-    gi.MSG_EndCGM();
-    */
-}
-
 void Player::StopLocalSound(Event *ev)
 {
     str   soundName = ev->GetString(1);
@@ -12363,6 +12326,137 @@ void Player::Userinfo(Event *ev)
     ev->AddString(client->pers.userinfo);
 }
 
+int Player::GetNumKills(void) const
+{
+    return num_kills;
+}
+
+int Player::GetNumDeaths(void) const
+{
+    return num_deaths;
+}
+
+#ifdef OPM_FEATURES
+
+void Player::EventEarthquake(Event *ev)
+{
+    float    duration    = ev->GetFloat(1);
+    float    magnitude   = ev->GetFloat(2);
+    qboolean no_rampup   = ev->GetBoolean(3);
+    qboolean no_rampdown = ev->GetBoolean(4);
+
+    // full realistic, smooth earthquake
+    if (ev->NumArgs() > 4) {
+        Vector location = ev->GetVector(5);
+        float  radius   = 1.0f;
+
+        if (ev->NumArgs() > 5) {
+            radius = ev->GetFloat(6);
+        }
+
+        gi.SendServerCommand(
+            edict - g_entities,
+            "eq %f %f %d %d %f %f %f %f",
+            duration,
+            magnitude,
+            no_rampup,
+            no_rampdown,
+            location[0],
+            location[1],
+            location[2],
+            radius
+        );
+    } else {
+        gi.SendServerCommand(edict - g_entities, "eq %f %f %d %d", duration, magnitude, no_rampup, no_rampdown);
+    }
+}
+
+void Player::SetClientFlag(Event *ev)
+{
+    str name = ev->GetString(1);
+
+    gi.SendServerCommand(client->ps.clientNum, "cf %s", name.c_str());
+}
+
+void Player::SetEntityShader(Event *ev)
+{
+    Entity  *entity     = ev->GetEntity(1);
+    str      shadername = ev->GetString(2);
+    qboolean fReset     = false;
+
+    if (entity == NULL) {
+        ScriptError("Invalid entity !");
+    }
+
+    if (!shadername.length()) {
+        shadername = "default";
+        fReset     = true;
+    }
+
+    gi.SendServerCommand(edict - g_entities, "setshader %d %s %d", entity->entnum, shadername.c_str(), fReset);
+}
+
+void Player::SetLocalSoundRate(Event *ev)
+{
+    str   name = ev->GetString(1);
+    float rate = ev->GetFloat(2);
+    float time;
+
+    if (ev->NumArgs() > 2) {
+        time = ev->GetFloat(3);
+    } else {
+        time = 0.0f;
+    }
+
+    AliasListNode_t *alias = NULL;
+    const char      *found = gi.GlobalAlias_FindRandom(name, &alias);
+
+    if (found == NULL) {
+        gi.DPrintf("ERROR: Player::SetLocalSoundRate: %s needs to be aliased - Please fix.\n", name.c_str());
+        return;
+    }
+
+    gi.MSG_SetClient(client->ps.clientNum);
+
+    // FIXME...
+    /*
+    gi.MSG_StartCGM( CGM_SETLOCALSOUNDRATE );
+        gi.MSG_WriteString( found );
+        gi.MSG_WriteFloat( rate );
+        gi.MSG_WriteFloat( time );
+    gi.MSG_EndCGM();
+    */
+}
+
+void Player::SetVMASpeed(Event *ev)
+{
+    str   name  = ev->GetString(1);
+    float speed = ev->GetFloat(2);
+
+    if (!client || !sv_specialgame->integer) {
+        return;
+    }
+
+    vma_t *vma = &vmalist[name];
+
+    if (speed < 0.0f) {
+        speed = 0.0f;
+    }
+
+    vma->name  = name;
+    vma->speed = speed;
+
+    // FIXME...
+    /*
+    gi.MSG_SetClient( edict - g_entities );
+
+    gi.MSG_StartCGM( CGM_SETVMASPEED );
+        gi.MSG_WriteString( name );
+        gi.MSG_WriteFloat( speed );
+    gi.MSG_EndCGM();
+    */
+}
+
 void Player::VisionGetNaked(Event *ev)
 {
     // return the global vision
@@ -12417,120 +12511,4 @@ void Player::VisionSetNaked(Event *ev)
 
     gi.SendServerCommand(edict - g_entities, "vsn %s %f %f", vision.c_str(), fade_time, phase);
 }
-
-int Player::GetNumKills(void) const
-{
-    return num_kills;
-}
-
-int Player::GetNumDeaths(void) const
-{
-    return num_deaths;
-}
-
-void Player::AddKills(int num)
-{
-    num_kills += num;
-
-    if (g_gametype->integer >= GT_TEAM_ROUNDS) {
-        num_deaths += num;
-    }
-}
-
-void Player::AddDeaths(int num)
-{
-    num_deaths += num;
-}
-
-qboolean Player::canUse()
-{
-    int touch[MAX_GENTITIES];
-    int num = getUseableEntities(touch, MAX_GENTITIES);
-
-    return num ? true : false;
-}
-
-qboolean Player::canUse(Entity *entity, bool requiresLookAt)
-{
-    gentity_t *hit;
-    int        touch[MAX_GENTITIES];
-    int        num;
-    int        i;
-
-    num = getUseableEntities(touch, MAX_GENTITIES, requiresLookAt);
-
-    for (i = 0; i < num; i++) {
-        hit = &g_entities[touch[i]];
-
-        if (!hit->inuse || hit->entity == NULL) {
-            continue;
-        }
-
-        if (hit->entity == entity) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-int Player::getUseableEntities(int *touch, int maxcount, bool requiresLookAt)
-{
-    Vector  end;
-    Vector  start;
-    trace_t trace;
-    Vector  offset;
-    Vector  max;
-    Vector  min;
-
-    if ((g_gametype->integer != GT_SINGLE_PLAYER && IsSpectator()) || IsDead()) {
-        return 0;
-    }
-
-    if (m_pTurret) {
-        *touch = m_pTurret->entnum;
-        return 1;
-    }
-
-    if (m_pTurret) {
-        return 0;
-    }
-
-    AngleVectors(client->ps.viewangles, offset, NULL, NULL);
-
-    start = origin;
-    start.z += client->ps.viewheight;
-
-    if (requiresLookAt) {
-        min = Vector(-4.f, -4.f, -4.f);
-        max = Vector(4.f, 4.f, 4.f);
-
-        end[0] = start[0] + (offset[0] * 64.f);
-        end[1] = start[1] + (offset[1] * 64.f);
-
-        if (v_angle[0] <= 0.0f) {
-            end[2] = start[2] + (offset[2] * 40.f);
-        } else {
-            end[2] = start[2] + (offset[2] * 88.f);
-        }
-
-        trace = G_Trace(start, min, max, end, this, MASK_USE, false, "Player::getUseableEntity");
-
-        offset = trace.endpos;
-
-        min = offset - Vector(16.f, 16.f, 16.f);
-        max = offset + Vector(16.f, 16.f, 16.f);
-    } else {
-        min = start - Vector(31.f, 31.f, 31.f);
-        max = start + Vector(31.f, 31.f, 31.f);
-    }
-
-    return gi.AreaEntities(min, max, touch, maxcount);
-}
-
-void Player::Postthink(void)
-{
-    if (bindmaster) {
-        SetViewAngles(GetViewAngles() + Vector(0, bindmaster->avelocity[YAW] * level.frametime, 0));
-    }
-}
+#endif
diff --git a/code/fgame/player.h b/code/fgame/player.h
index e93056a9..fb3f8115 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -306,7 +306,9 @@ private:
     bool        m_bDeathSpectator;
     jailstate_t m_jailstate;
 
+#ifdef OPM_FEATURES
     bool m_bShowingHint;
+#endif
 
 public:
     int m_iNumObjectives;
@@ -346,8 +348,6 @@ public:
     // new variables
     str                 m_sVision;    // current vision
     str                 m_sStateFile; // custom statefile
-    bool                disable_spectate;
-    bool                disable_team_change;
     bool                m_bFrozen; // if player is frozen
     bool                animDoneVM;
     float               speed_multiplier[MAX_SPEED_MULTIPLIERS];
@@ -916,10 +916,7 @@ public:
     void AddDeaths(Event *ev);
     void AdminRights(Event *ev);
     void BindWeap(Event *ev);
-    void CanSwitchTeams(Event *ev);
-    void ClearCommand(Event *ev);
     void Dive(Event *ev);
-    void EventEarthquake(Event *ev);
     void EventSetTeam(Event *ev);
     void EventGetViewModelAnim(Event *ev);
     void EventGetViewModelAnimFinished(Event *ev);
@@ -934,7 +931,6 @@ public:
     void GetLegsState(Event *ev);
     void GetStateFile(Event *ev);
     void GetTorsoState(Event *ev);
-    void HideEntity(Event *ev);
     void Inventory(Event *ev);
     void InventorySet(Event *ev);
     void IsAdmin(Event *ev);
@@ -946,19 +942,23 @@ public:
     void RunHeld(Event *ev);
     void SecFireHeld(Event *ev);
     void SetAnimSpeed(Event *ev);
-    void SetClientFlag(Event *ev);
-    void SetEntityShader(Event *ev);
     void SetKillHandler(Event *ev);
-    void SetLocalSoundRate(Event *ev);
     void SetSpeed(Event *ev);
     void SetStateFile(Event *ev);
-    void SetVMASpeed(Event *ev);
+    void HideEntity(Event* ev);
     void ShowEntity(Event *ev);
     void StopLocalSound(Event *ev);
     void Userinfo(Event *ev);
+#ifdef OPM_FEATURES
+    void EventEarthquake(Event* ev);
+    void SetClientFlag(Event* ev);
+    void SetEntityShader(Event* ev);
+    void SetLocalSoundRate(Event* ev);
+    void SetVMASpeed(Event* ev);
     void VisionGetNaked(Event *ev);
     void VisionSetBlur(Event *ev);
     void VisionSetNaked(Event *ev);
+#endif
 
     void     Postthink() override;
     void     GibEvent(Event *ev);

From 2510bab41f47fa73a2a94f7ab5589d3b4037ce67 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 20:16:51 +0200
Subject: [PATCH 0968/2040] Change the order of the target os for more clarity

---
 .github/workflows/tags-publish-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tags-publish-release.yml b/.github/workflows/tags-publish-release.yml
index 54671c40..04c2557b 100644
--- a/.github/workflows/tags-publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -33,8 +33,8 @@ jobs:
           'linux-ppc64',
           'linux-ppc64el',
           'windows-x64',
-          'windows-x86',
           'windows-x64-pdb',
+          'windows-x86',
           'windows-x86-pdb',
           'windows-arm64',
           'windows-arm64-pdb',

From 00421fbee6c855bb350c9c2fb92db2740c31ffe8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 20:18:40 +0200
Subject: [PATCH 0969/2040] Fix the link to the branch build workflow

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba789e5b..69c338da 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # OpenMoHAA
 
-![Build](https://github.com/openmoh/openmohaa/actions/workflows/build-cmake.yml/badge.svg?branch=main) [![Release](https://img.shields.io/github/v/release/openmoh/openmohaa)](https://github.com/openmoh/openmohaa/releases) [![Downloads](https://img.shields.io/github/downloads/openmoh/openmohaa/total)](https://github.com/openmoh/openmohaa/releases)
+![Build](https://github.com/openmoh/openmohaa/actions/workflows/branches-build.yml/badge.svg?branch=main) [![Release](https://img.shields.io/github/v/release/openmoh/openmohaa)](https://github.com/openmoh/openmohaa/releases) [![Downloads](https://img.shields.io/github/downloads/openmoh/openmohaa/total)](https://github.com/openmoh/openmohaa/releases)
 
 ![License](https://img.shields.io/github/license/openmoh/openmohaa) ![Commits](https://img.shields.io/github/commit-activity/t/openmoh/openmohaa)
 

From 724d1db9b832609196cfb9eda6407bb7f2d23c3f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Sep 2024 21:38:35 +0200
Subject: [PATCH 0970/2040] Properly clear parents of orphaned entities

---
 code/client/cl_cgame.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index ee6ce6cd..6301864f 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -248,21 +248,23 @@ qboolean	CL_GetSnapshot( int snapshotNumber, snapshot_t *snapshot ) {
 	if (snapshot->numEntities != count) {
 		Com_DPrintf("CL_GetSnapshot: Not all children could find their parents.\n");
 
-		for (i = count; i < snapshot->numEntities; i++)
+		for (i = snapshot->numEntities; i < count; i++)
 		{
-			s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
-			if (parents[s1->number] >= 0) {
-				Com_DPrintf(
-					"CL_GetSnapshot: entity %d with parent %d and model '%s' at %.2f %.2f %.2f, could not find parent.\n",
-					s1->number,
-					s1->parent,
-					CL_ConfigString(CS_MODELS + s1->modelindex),
-					s1->origin[0],
-					s1->origin[1],
-					s1->origin[2]
-				);
+			for (pnum = 0; pnum < count; pnum++) {
+				s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + pnum) & (MAX_PARSE_ENTITIES - 1)];
+				if (parents[s1->number] >= 0) {
+					Com_DPrintf(
+						"CL_GetSnapshot: entity %d with parent %d and model '%s' at %.2f %.2f %.2f, could not find parent.\n",
+						s1->number,
+						s1->parent,
+						CL_ConfigString(CS_MODELS + s1->modelindex),
+						s1->origin[0],
+						s1->origin[1],
+						s1->origin[2]
+					);
 
-				parents[s1->number] = -2;
+					parents[s1->number] = -2;
+				}
 			}
 		}
 	}

From 758017b638e431032bdf94d82dcfde8a9741a991 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Sep 2024 19:16:31 +0200
Subject: [PATCH 0971/2040] If the temp model being removed is the head one,
 use its sibling

---
 code/cgame/cg_tempmodels.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index d02722b4..8d64f7b1 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -79,6 +79,11 @@ void ClientGameCommandManager::FreeTempModel(ctempmodel_t *p)
 
     RemoveClientEntity(p->number, p->cgd.tiki, NULL, p);
 
+    if (m_active_tempmodels.next == p) {
+        // use the next active temp model
+        m_active_tempmodels.next == p->next;
+    }
+
     // remove from the doubly linked active list
     p->prev->next = p->next;
     p->next->prev = p->prev;

From 85f15a1f287681a2597cc122e069960052e5a536 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Sep 2024 19:24:12 +0200
Subject: [PATCH 0972/2040] Delete spawnthings when their last temp model is
 freed

This fixes:
- Losing FPS in a match with a lot of players, due to a massive amount of emitters getting spawned every time a weapon fires
- Memory leaks due to emitters staying in memory forever after being spawned
---
 code/cgame/cg_tempmodels.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index 8d64f7b1..4e54cba2 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -91,6 +91,22 @@ void ClientGameCommandManager::FreeTempModel(ctempmodel_t *p)
     // the free list is only singly linked
     p->next           = m_free_tempmodels;
     m_free_tempmodels = p;
+
+    if (p->m_spawnthing) {
+        p->m_spawnthing->numtempmodels--;
+        // delete unused spawnthings
+        if (!p->m_spawnthing->numtempmodels) {
+            m_emitters.RemoveObject(p->m_spawnthing);
+
+            if (p->m_spawnthing == m_spawnthing) {
+                m_spawnthing = NULL;
+            }
+
+            delete p->m_spawnthing;
+        }
+
+        p->m_spawnthing = NULL;
+    }
 }
 
 //===============

From 3fb699979c208e427469a707b0a66b6edbeb04c5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:44:11 +0200
Subject: [PATCH 0973/2040] Fix small equality mistake (expected assignment)

---
 code/cgame/cg_tempmodels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index 4e54cba2..778a6eba 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -81,7 +81,7 @@ void ClientGameCommandManager::FreeTempModel(ctempmodel_t *p)
 
     if (m_active_tempmodels.next == p) {
         // use the next active temp model
-        m_active_tempmodels.next == p->next;
+        m_active_tempmodels.next = p->next;
     }
 
     // remove from the doubly linked active list

From e5f62a9188d9ec96bfeaee0f16b53dbcd4210f50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:02:41 +0200
Subject: [PATCH 0974/2040] Update features.md

---
 docs/features.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/features.md b/docs/features.md
index 3a77c8c3..d2aa9130 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -2,6 +2,17 @@
 
 A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, grenade crash bug, command overflow...).
 
+## Summary
+
+- SDL2 backend
+- OpenAL sound support (better sound quality)
+- Full 64-bit support
+- Cross-platform support
+- Multiuser support on OS (On Windows, user game data is stored in "%APPDATA%\Quake3")
+- Many bug fixes and additions from ioquake3
+
+Overall, better compatibility on modern systems and bugfixes.
+
 ## Additions
 
 ### Client-side and server-side

From 931876ac77117c60eb81e3047b1e412f367d59fa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:03:19 +0200
Subject: [PATCH 0975/2040] Remove lidbad-0.15.1b

---
 code/libmad-0.15.1b/CHANGES            |   338 -
 code/libmad-0.15.1b/CMakeLists.txt     |    20 -
 code/libmad-0.15.1b/COPYING            |   340 -
 code/libmad-0.15.1b/COPYRIGHT          |    21 -
 code/libmad-0.15.1b/CREDITS            |   116 -
 code/libmad-0.15.1b/D.dat              |   607 -
 code/libmad-0.15.1b/INSTALL            |   183 -
 code/libmad-0.15.1b/Makefile.am        |   140 -
 code/libmad-0.15.1b/Makefile.in        |   821 -
 code/libmad-0.15.1b/README             |   241 -
 code/libmad-0.15.1b/TODO               |    69 -
 code/libmad-0.15.1b/VERSION            |     7 -
 code/libmad-0.15.1b/aclocal.m4         |  6849 -------
 code/libmad-0.15.1b/bit.c              |   237 -
 code/libmad-0.15.1b/bit.h              |    47 -
 code/libmad-0.15.1b/config.guess       |  1432 --
 code/libmad-0.15.1b/config.h.in        |   135 -
 code/libmad-0.15.1b/config.sub         |  1537 --
 code/libmad-0.15.1b/configure          | 23106 -----------------------
 code/libmad-0.15.1b/configure.ac       |   433 -
 code/libmad-0.15.1b/decoder.c          |   582 -
 code/libmad-0.15.1b/decoder.h          |    91 -
 code/libmad-0.15.1b/depcomp            |   464 -
 code/libmad-0.15.1b/fixed.c            |    81 -
 code/libmad-0.15.1b/fixed.h            |   499 -
 code/libmad-0.15.1b/frame.c            |   503 -
 code/libmad-0.15.1b/frame.h            |   118 -
 code/libmad-0.15.1b/global.h           |    58 -
 code/libmad-0.15.1b/huffman.c          |  3109 ---
 code/libmad-0.15.1b/huffman.h          |    66 -
 code/libmad-0.15.1b/imdct_l_arm.S      |  1000 -
 code/libmad-0.15.1b/imdct_s.dat        |    62 -
 code/libmad-0.15.1b/install-sh         |   276 -
 code/libmad-0.15.1b/layer12.c          |   534 -
 code/libmad-0.15.1b/layer12.h          |    31 -
 code/libmad-0.15.1b/layer3.c           |  2698 ---
 code/libmad-0.15.1b/layer3.h           |    30 -
 code/libmad-0.15.1b/libmad.list.in     |    21 -
 code/libmad-0.15.1b/ltmain.sh          |  6399 -------
 code/libmad-0.15.1b/mad.h              |   964 -
 code/libmad-0.15.1b/mad.h.sed          |    36 -
 code/libmad-0.15.1b/minimad.c          |   222 -
 code/libmad-0.15.1b/missing            |   336 -
 code/libmad-0.15.1b/mkinstalldirs      |   111 -
 code/libmad-0.15.1b/msvc++/Makefile.am |    24 -
 code/libmad-0.15.1b/msvc++/Makefile.in |   312 -
 code/libmad-0.15.1b/msvc++/config.h    |   130 -
 code/libmad-0.15.1b/msvc++/libmad.dsp  |   214 -
 code/libmad-0.15.1b/msvc++/mad.h       |   948 -
 code/libmad-0.15.1b/qc_table.dat       |    77 -
 code/libmad-0.15.1b/rq_table.dat       |  8747 ---------
 code/libmad-0.15.1b/sf_table.dat       |   106 -
 code/libmad-0.15.1b/stream.c           |   161 -
 code/libmad-0.15.1b/stream.h           |   108 -
 code/libmad-0.15.1b/synth.c            |   857 -
 code/libmad-0.15.1b/synth.h            |    69 -
 code/libmad-0.15.1b/timer.c            |   485 -
 code/libmad-0.15.1b/timer.h            |   100 -
 code/libmad-0.15.1b/version.c          |    91 -
 code/libmad-0.15.1b/version.h          |    47 -
 60 files changed, 67446 deletions(-)
 delete mode 100644 code/libmad-0.15.1b/CHANGES
 delete mode 100644 code/libmad-0.15.1b/CMakeLists.txt
 delete mode 100644 code/libmad-0.15.1b/COPYING
 delete mode 100644 code/libmad-0.15.1b/COPYRIGHT
 delete mode 100644 code/libmad-0.15.1b/CREDITS
 delete mode 100644 code/libmad-0.15.1b/D.dat
 delete mode 100644 code/libmad-0.15.1b/INSTALL
 delete mode 100644 code/libmad-0.15.1b/Makefile.am
 delete mode 100644 code/libmad-0.15.1b/Makefile.in
 delete mode 100644 code/libmad-0.15.1b/README
 delete mode 100644 code/libmad-0.15.1b/TODO
 delete mode 100644 code/libmad-0.15.1b/VERSION
 delete mode 100644 code/libmad-0.15.1b/aclocal.m4
 delete mode 100644 code/libmad-0.15.1b/bit.c
 delete mode 100644 code/libmad-0.15.1b/bit.h
 delete mode 100644 code/libmad-0.15.1b/config.guess
 delete mode 100644 code/libmad-0.15.1b/config.h.in
 delete mode 100644 code/libmad-0.15.1b/config.sub
 delete mode 100644 code/libmad-0.15.1b/configure
 delete mode 100644 code/libmad-0.15.1b/configure.ac
 delete mode 100644 code/libmad-0.15.1b/decoder.c
 delete mode 100644 code/libmad-0.15.1b/decoder.h
 delete mode 100644 code/libmad-0.15.1b/depcomp
 delete mode 100644 code/libmad-0.15.1b/fixed.c
 delete mode 100644 code/libmad-0.15.1b/fixed.h
 delete mode 100644 code/libmad-0.15.1b/frame.c
 delete mode 100644 code/libmad-0.15.1b/frame.h
 delete mode 100644 code/libmad-0.15.1b/global.h
 delete mode 100644 code/libmad-0.15.1b/huffman.c
 delete mode 100644 code/libmad-0.15.1b/huffman.h
 delete mode 100644 code/libmad-0.15.1b/imdct_l_arm.S
 delete mode 100644 code/libmad-0.15.1b/imdct_s.dat
 delete mode 100644 code/libmad-0.15.1b/install-sh
 delete mode 100644 code/libmad-0.15.1b/layer12.c
 delete mode 100644 code/libmad-0.15.1b/layer12.h
 delete mode 100644 code/libmad-0.15.1b/layer3.c
 delete mode 100644 code/libmad-0.15.1b/layer3.h
 delete mode 100644 code/libmad-0.15.1b/libmad.list.in
 delete mode 100644 code/libmad-0.15.1b/ltmain.sh
 delete mode 100644 code/libmad-0.15.1b/mad.h
 delete mode 100644 code/libmad-0.15.1b/mad.h.sed
 delete mode 100644 code/libmad-0.15.1b/minimad.c
 delete mode 100644 code/libmad-0.15.1b/missing
 delete mode 100644 code/libmad-0.15.1b/mkinstalldirs
 delete mode 100644 code/libmad-0.15.1b/msvc++/Makefile.am
 delete mode 100644 code/libmad-0.15.1b/msvc++/Makefile.in
 delete mode 100644 code/libmad-0.15.1b/msvc++/config.h
 delete mode 100644 code/libmad-0.15.1b/msvc++/libmad.dsp
 delete mode 100644 code/libmad-0.15.1b/msvc++/mad.h
 delete mode 100644 code/libmad-0.15.1b/qc_table.dat
 delete mode 100644 code/libmad-0.15.1b/rq_table.dat
 delete mode 100644 code/libmad-0.15.1b/sf_table.dat
 delete mode 100644 code/libmad-0.15.1b/stream.c
 delete mode 100644 code/libmad-0.15.1b/stream.h
 delete mode 100644 code/libmad-0.15.1b/synth.c
 delete mode 100644 code/libmad-0.15.1b/synth.h
 delete mode 100644 code/libmad-0.15.1b/timer.c
 delete mode 100644 code/libmad-0.15.1b/timer.h
 delete mode 100644 code/libmad-0.15.1b/version.c
 delete mode 100644 code/libmad-0.15.1b/version.h

diff --git a/code/libmad-0.15.1b/CHANGES b/code/libmad-0.15.1b/CHANGES
deleted file mode 100644
index 9291760b..00000000
--- a/code/libmad-0.15.1b/CHANGES
+++ /dev/null
@@ -1,338 +0,0 @@
-
- libmad - MPEG audio decoder library
- Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
- $Id: CHANGES,v 1.14 2004/02/17 02:02:03 rob Exp $
-
-===============================================================================
-
-Version 0.15.1 (beta)
-
-  * Updated to autoconf 2.59, automake 1.8.2, libtool 1.5.2.
-
-  * Replaced Layer III IMDCT routine with one based on a faster algorithm,
-    improving both speed and accuracy.
-
-  * Improved portability of the Huffman table initialization.
-
-  * Fixed a problem that could result in an assertion failure in layer3.c
-    due to an invalid Layer III free format bitrate.
-
-  * Improved the robustness of Layer II bitrate/mode combinations, and added
-    a new MAD_ERROR_BADMODE error enum. The allowability of low-bitrate
-    stereo streams is influenced by the --enable-strict-iso option to
-    `configure'.
-
-Version 0.15.0 (beta)
-
-  * Updated to autoconf 2.57, automake 1.7.5, libtool 1.4.3.
-
-  * Added new mad_f_div() API routine.
-
-  * Added a 64th entry to the Layer I/Layer II scalefactor table, for better
-    compatibility with existing streams. The --enable-strict-iso option to
-    `configure' can be used to disable use of this entry.
-
-  * Modified the header decoding routine to allow the reserved emphasis
-    value, for better compatibility with existing streams. The
-    --enable-strict-iso option to `configure' can be used to restore the
-    previous behavior of reporting this value as an error.
-
-  * Added new MAD_EMPHASIS_RESERVED enumeration constant.
-
-  * Fixed a bug in the ARM version of mad_f_scale64() discovered by Andre
-    McCurdy.
-
-  * Rewrote PowerPC assembly for minor gains.
-
-  * Modified mad_timer_fraction() to avoid the possibility of division by
-    zero when 0 is passed as the second argument.
-
-  * Fixed a non-fatal problem caused by attempting to designate ancillary
-    bits in Layer III after a decoding error.
-
-  * Changed to build a shared library by default.
-
-  * Changed to use native Cygwin build by default; give --host=mingw32 to
-    `configure' to use MinGW (and avoid a dependency on the Cygwin DLL).
-
-Version 0.14.2 (beta)
-
-  * Changed Cygwin builds to use MinGW; resulting Win32 executables no
-    longer have a dependency on Cygwin DLLs.
-
-  * Added a new mad_stream_errorstr() API function to libmad for retrieving
-    a string description of the current error condition.
-
-Version 0.14.1 (beta)
-
-  * Updated config.guess and config.sub to latest upstream versions.
-
-  * Enabled libtool versioning rather than release numbering.
-
-  * Improved the documentation in minimad.c.
-
-  * Several other small fixes.
-
-Version 0.14.0 (beta)
-
-  * Added a 64-bit FPM negation operation to improve performance of subband
-    synthesis on some platforms.
-
-  * Improved MSVC++ portability and added MSVC++ project files.
-
-  * Added rounding to Layer III requantization for slightly better accuracy.
-
-Version 0.13.0 (beta)
-
-  * Ancillary data is now properly extracted from Layer III streams.
-
-  * Rewrote the Layer III joint stereo decoding routine to correct a major
-    MPEG-2 problem and a minor MPEG-1 problem decoding intensity stereo.
-
-  * Eliminated the dependency on sign-extending right shifts for Layer I and
-    Layer II.
-
-  * Renamed `private' field to `private_bits' for better C++ compatibility.
-
-  * Gratuitously renamed `sfreq' field to `samplerate' and
-    MAD_ERROR_BADSAMPLEFREQ constant to MAD_ERROR_BADSAMPLERATE.
-
-  * Added `samplerate' and `channels' fields to synth.pcm struct to allow
-    these to be different from the decoded frame, and for simpler access.
-
-  * Added new mad_stream_options() and mad_decoder_options() API entries for
-    special runtime decoding options.
-
-  * Added new MAD_OPTION_IGNORECRC and MAD_OPTION_HALFSAMPLERATE options.
-
-  * Added new MAD_FLAG_FREEFORMAT indicator flag.
-
-  * Fixed some bugs in the async decoder.
-
-  * Added a new mad_timer_multiply() API routine.
-
-  * Eliminated `+' from asm constraints under Intel for better compatibility
-    with some compilers.
-
-  * Fixed a PIC-related problem in imdct_l_arm.S.
-
-  * Eliminated a static variable to make libmad thread-safe.
-
-Version 0.12.5 (beta)
-
-  * Modified Layer III requantization to occur during Huffman decoding for
-    significant performance gains.
-
-  * Optimized short block IMDCT by eliminating redundant calculations.
-
-  * Made several other Layer III performance improvements; added
-    ASO_INTERLEAVE1, ASO_INTERLEAVE2, and ASO_ZEROCHECK
-    architecture-specific options for best performance on various
-    architectures.
-
-  * Optimized synthesis DCT to store result values as soon as they are
-    calculated.
-
-Version 0.12.4 (beta)
-
-  * New PowerPC fixed-point assembly courtesy of David Blythe.
-
-  * Reorganized fixed-point assembly routines for easier maintenance and
-    better performance.
-
-  * Improved performance of subband synthesis through better indexing and
-    fewer local variables.
-
-  * Added alias reduction for the lower two subbands of mixed short blocks,
-    per a report of ambiguity with ISO/IEC 11172-3 and for uniformity with
-    most other implementations. Also improved alias reduction performance
-    using multiply/accumulate.
-
-  * Added --enable-strict-iso option to `configure' to override best
-    accepted practices such as the alias reduction for mixed short blocks.
-
-  * Improved performance of Layer III IMDCT by using longer
-    multiply/accumulate runs where possible.
-
-Version 0.12.3 (beta)
-
-  * Added MPEG 2.5 support.
-
-  * Added preliminary support for parameterizing the binary point position
-    in the fixed-point representation.
-
-  * Added multiply/accumulate optimization to the Layer III IMDCT for long
-    blocks.
-
-  * Fixed a bug in the handling of Layer III mixed_block_flag.
-
-  * Fixed a configure problem when multiple -O CFLAGS are present.
-
-Version 0.12.2 (beta)
-
-  * Rearranged the synthesis polyphase filterbank memory vector for better
-    locality of reference, and rewrote mad_synth_frame() to accommodate,
-    resulting in improved performance.
-
-  * Discovered a combination of compiler optimization flags that further
-    improve performance.
-
-  * Changed some array references in layer3.c to pointer derefs.
-
-Version 0.12.1 (beta)
-
-  * Resolved the intensity + MS joint stereo issue (a simple bug).
-    OPT_ISKLUGE is no longer considered to be a kluge.
-
-  * Fixed another, hopefully last main_data memory bug.
-
-  * Split part of struct mad_frame into struct mad_header for convenience
-    and size.
-
-Version 0.12.0 (alpha)
-
-  * Changed the build environment to use automake and libtool. A libmad
-    shared library can now be built using the --enable-shared option to
-    `configure'.
-
-  * Added another callback to MAD's high-level decoder API after the frame
-    header has been read but before the frame's audio data is decoded.
-
-  * Streamlined header processing so that mad_frame_decode() can be called
-    with or without having already called mad_frame_header().
-
-  * Fixed some other header reading miscellany, including CRC handling and
-    free bitrate detection, and frame length verification with free
-    bitrates.
-
-  * Fixed a problem with Layer III free bitrates > 320 kbps. The main_data
-    buffer size should now be large enough to handle any size frame, by
-    virtue of the maximum possible part2_3_length.
-
-  * Further developed the async API; arbitrary messages can now be passed to
-    the subsidiary decoding process.
-
-  * Streamlined timer.c and extended its interface. It now has support for
-    video frame/field lengths, including output support for drop-frame
-    encoding.
-
-  * Replaced many constant integer preprocessor defines with enums.
-
-Version 0.11.4 (beta)
-
-  * Fixed free format bitrate discovery.
-
-  * Changed the timer implementation and extended its interface.
-
-  * Integrated Nicolas Pitre's patch for pre-shifting at compile-time and
-    for better multiply/accumulate code output.
-
-  * Applied Simon Burge's patch to imdct_l_arm.S for a.out compatibility.
-
-  * Added -mtune=strongarm for all ARM targets.
-
-Version 0.11.3 (beta)
-
-  * Added new --enable-speed and --enable-accuracy options for `configure'
-    to automatically select appropriate SSO/ASO options, et al.
-
-  * Modified subband synthesis to use multiply/accumulate optimization (if
-    available) for better speed and/or accuracy.
-
-  * Incorporated Andre McCurdy's changes for further rounding optimizations
-    in the rest of his code.
-
-Version 0.11.2 (beta)
-
-  * Incorporated Nicolas Pitre's ARM assembly and parameterized scaling
-    changes.
-
-  * Incorporated Andre McCurdy's ARM assembly optimization (used only if
-    --enable-aso is given to `configure' to enable architecture-specific
-    optimizations.)
-
-  * Reduced FPM_INTEL assembly to two instructions.
-
-  * Fixed accuracy problems with certain FPM modes in synth.c.
-
-  * Improved the accuracy of FPM_APPROX.
-
-  * Improved the accuracy of SSO.
-
-  * Improved sync discovery by checking for a sync word in the following
-    frame.
-
-  * Minor code clean-up.
-
-  * Added experimental rules for generating a libmad.so shared library.
-
-Version 0.11.1 (beta)
-
-  * Moved libmad code into a separate directory.
-
-  * Changed SSO to be disabled by default, as output accuracy is deemed to
-    be more important than speed in the general case.
-
-  * Fixed a bug in Layer III sanity checking that could cause a crash on
-    certain random data input.
-
-  * Extended the Layer III requantization table from 8191 to 8206 as some
-    encoders are known to use these values, even though ISO/IEC 11172-3
-    suggests the maximum should be 8191.
-
-Version 0.11.0 (beta)
-
-  * Implemented MPEG-2 extension to Lower Sampling Frequencies.
-
-  * Improved Layer III performance by avoiding IMDCT calculation when all
-    input samples are zero.
-
-  * Significantly reduced size of Layer II tables.
-
-Version 0.10.3 (beta)
-
-  * Improved SSO output quality.
-
-  * Made portable to cygwin.
-
-  * Localized memory references in III_huffdecode() for better performance.
-
-Version 0.10.2 (beta)
-
-  * Rewrote Layer III long block 36-point IMDCT routine for better
-    performance.
-
-  * Improved subband synthesis fixed-point games somewhat.
-
-Version 0.10.1 (beta)
-
-  * Added a subband synthesis optimization (SSO) which involves modifying
-    the fixed-point multiplication method during windowing. This produces
-    subtle differences in the output but improves performance greatly.
-
-  * Added I_STEREO and MS_STEREO flags to frame struct.
-
-  * Eliminated privately-used CRCFAILED flag.
-
-  * Fixed a bug where Layer III decoding could crash on some badly-formatted
-    (e.g. non-MPEG) bitstreams.
-
-  * Miscellaneous code clean-up.
-
-Version 0.10.0 (beta)
-
-  * Added SPARC fixed-point math support.
-
-  * Revamped libmad API for better high- and low-level support.
-
-  * Documented more of the code.
-
-  * Changed sync semantics such that new stream buffers are assumed to be
-    sync-aligned.
-
-  * Changed Layer III to dynamically allocate static memory so as not to
-    waste it (about 6.4K) when only decoding Layer I or Layer II.
-
-===============================================================================
-
diff --git a/code/libmad-0.15.1b/CMakeLists.txt b/code/libmad-0.15.1b/CMakeLists.txt
deleted file mode 100644
index 01fde5e0..00000000
--- a/code/libmad-0.15.1b/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(libmad)
-
-set(SRCS
-	"./bit.c"
-	"./decoder.c"
-	"./fixed.c"
-	"./frame.c"
-	"./huffman.c"
-	"./layer3.c"
-	"./layer12.c"
-	"./stream.c"
-	"./synth.c"
-	"./timer.c"
-	"./version.c"
-)
-
-add_library(libmad STATIC ${SRCS})
-target_compile_definitions(libmad PUBLIC FPM_64BIT)
-target_compile_definitions(libmad PUBLIC NDEBUG) # otherwise assert() will call abort() and it fails to compile on clang-16 (call to undeclared library function 'abort')
diff --git a/code/libmad-0.15.1b/COPYING b/code/libmad-0.15.1b/COPYING
deleted file mode 100644
index d60c31a9..00000000
--- a/code/libmad-0.15.1b/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/code/libmad-0.15.1b/COPYRIGHT b/code/libmad-0.15.1b/COPYRIGHT
deleted file mode 100644
index ed91d2ba..00000000
--- a/code/libmad-0.15.1b/COPYRIGHT
+++ /dev/null
@@ -1,21 +0,0 @@
-
- libmad - MPEG audio decoder library
- Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- If you would like to negotiate alternate licensing terms, you may do
- so by contacting: Underbit Technologies, Inc. <info@underbit.com>
-
diff --git a/code/libmad-0.15.1b/CREDITS b/code/libmad-0.15.1b/CREDITS
deleted file mode 100644
index 72ec72ed..00000000
--- a/code/libmad-0.15.1b/CREDITS
+++ /dev/null
@@ -1,116 +0,0 @@
-
- libmad - MPEG audio decoder library
- Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
- $Id: CREDITS,v 1.5 2004/02/17 02:02:03 rob Exp $
-
-===============================================================================
-
-AUTHOR
-
-  Except where otherwise noted, all code was authored by:
-
-      Robert Leslie <rob@underbit.com>
-
-CONTRIBUTORS
-
-  Significant contributions have been incorporated with thanks to:
-
-      Anonymous
-        2002/03/15: frame.c
-          - Reported problem with use of reserved emphasis value.
-        2003/08/31: layer12.c
-          - Suggested support for certain disallowed bitrate/mode
-            combinations.
-
-      Niek Albers <info@daansystems.com>
-        2003/04/21: layer3.c
-          - Reported runtime uninitialized use of `ptr' in designating
-            ancillary bits after a decoding error.
-
-      Christian Biere <cbiere@users.sourceforge.net>
-        2003/02/01: frame.c
-          - Reported assertion failure in layer3.c due to an
-            invalid/unsupported Layer III free format bitrate.
-
-      David Blythe <blythe@routefree.com>
-        2001/01/30: fixed.h
-          - Provided initial PowerPC fixed-point assembly.
-
-      Simon Burge <simonb@wasabisystems.com>
-        2000/09/20: imdct_l_arm.S
-          - Suggested patch for a.out compatibility.
-
-      Brian Cameron <Brian.Cameron@sun.com>
-        2003/07/02: huffman.c
-          - Suggested changes for improved portability.
-
-      Joshua Haberman <joshua@haberman.com>
-        2001/08/10: decoder.c, huffman.c
-          - Suggested portability fixes.
-
-      Timothy King <lordzork@lordzork.com>
-        2002/05/04: sf_table.dat, layer12.c
-          - Reported problem with use of (missing) scalefactor index 63.
-
-      Felix von Leitner <felix-mad@fefe.de>
-        2003/01/21: fixed.h
-          - Suggested Intel scaling alternative for possible speedup.
-
-      Andre McCurdy <armccurdy@yahoo.co.uk>
-        2000/08/10: imdct_l_arm.S
-          - ARM optimized assembly replacement for III_imdct_l().
-        2000/09/15: imdct_l_arm.S
-          - Applied Nicolas Pitre's rounding optimisation in all remaining
-            places.
-        2001/02/10: layer3.c
-          - Inspiration for Huffman decoding and requantization rewrite, and
-            other miscellany.
-        2001/03/24: imdct_l_arm.S
-          - Corrected PIC unsafe code.
-        2002/02/16: fixed.h
-          - Discovered bug in ARM version of mad_f_scale64().
-
-      Haruhiko OGASAWARA <theta@m1.interq.or.jp>
-        2001/01/28: layer3.c
-          - Reported discrepancy in alias reduction for mixed short blocks.
-
-      Brett Paterson <brett@fmod.org>
-        2001/10/28: global.h
-          - Reported missing <assert.h> et al. under MS Embedded Visual C.
-
-      Sean 'Shaleh' Perry <shaleh@via.net>
-        2000/04/04: fixed.h
-          - Suggested use of size-dependent typedefs.
-        2001/10/22: config.guess, config.sub
-          - Keep up to date for proper Debian packaging.
-
-      Bertrand Petit <eemad@phoe.frmug.org>
-        2001/11/05: synth.h
-          - Suggested PCM channel enumeration constants.
-        2001/11/05: stream.h
-          - Suggested MAD_ERROR_NONE enumeration constant.
-        2001/11/05: stream.c
-          - Suggested mad_stream_errorstr() function.
-
-      Nicolas Pitre <nico@cam.org>
-        2000/09/09: fixed.h
-          - Parameterized all scaling for correct use of all multiplication
-            methods within mad_synth_frame().
-          - Rewrote the FPM_ARM version of mad_f_mul() so we have 64-bit
-            multiplication result, rounding and scaling with 3 instructions.
-        2000/09/09: imdct_l_arm.S
-          - Optimized rounding + scaling operations.
-        2000/09/17: synth.c
-          - Changed D[] run-time shifts to compile-time.
-          - Modified synthesis for better multiply/accumulate code output.
-        2001/08/11: fixed.h, synth.c
-          - Suggested 64-bit FPM negation and negative term factorization
-            during synthesis.
-        2001/08/11: fixed.h
-          - Suggested unrounded behavior for FPM_DEFAULT when OPT_SPEED.
-        2001/11/19: fixed.c
-          - Suggested computation of any resampling ratio.
-
-===============================================================================
-
diff --git a/code/libmad-0.15.1b/D.dat b/code/libmad-0.15.1b/D.dat
deleted file mode 100644
index 4a7fa4fa..00000000
--- a/code/libmad-0.15.1b/D.dat
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: D.dat,v 1.9 2004/01/23 09:41:32 rob Exp $
- */
-
-/*
- * These are the coefficients for the subband synthesis window. This is a
- * reordered version of Table B.3 from ISO/IEC 11172-3.
- *
- * Every value is parameterized so that shift optimizations can be made at
- * compile-time. For example, every value can be right-shifted 12 bits to
- * minimize multiply instruction times without any loss of accuracy.
- */
-
-  {  PRESHIFT(0x00000000) /*  0.000000000 */,	/*  0 */
-    -PRESHIFT(0x0001d000) /* -0.000442505 */,
-     PRESHIFT(0x000d5000) /*  0.003250122 */,
-    -PRESHIFT(0x001cb000) /* -0.007003784 */,
-     PRESHIFT(0x007f5000) /*  0.031082153 */,
-    -PRESHIFT(0x01421000) /* -0.078628540 */,
-     PRESHIFT(0x019ae000) /*  0.100311279 */,
-    -PRESHIFT(0x09271000) /* -0.572036743 */,
-     PRESHIFT(0x1251e000) /*  1.144989014 */,
-     PRESHIFT(0x09271000) /*  0.572036743 */,
-     PRESHIFT(0x019ae000) /*  0.100311279 */,
-     PRESHIFT(0x01421000) /*  0.078628540 */,
-     PRESHIFT(0x007f5000) /*  0.031082153 */,
-     PRESHIFT(0x001cb000) /*  0.007003784 */,
-     PRESHIFT(0x000d5000) /*  0.003250122 */,
-     PRESHIFT(0x0001d000) /*  0.000442505 */,
-
-     PRESHIFT(0x00000000) /*  0.000000000 */,
-    -PRESHIFT(0x0001d000) /* -0.000442505 */,
-     PRESHIFT(0x000d5000) /*  0.003250122 */,
-    -PRESHIFT(0x001cb000) /* -0.007003784 */,
-     PRESHIFT(0x007f5000) /*  0.031082153 */,
-    -PRESHIFT(0x01421000) /* -0.078628540 */,
-     PRESHIFT(0x019ae000) /*  0.100311279 */,
-    -PRESHIFT(0x09271000) /* -0.572036743 */,
-     PRESHIFT(0x1251e000) /*  1.144989014 */,
-     PRESHIFT(0x09271000) /*  0.572036743 */,
-     PRESHIFT(0x019ae000) /*  0.100311279 */,
-     PRESHIFT(0x01421000) /*  0.078628540 */,
-     PRESHIFT(0x007f5000) /*  0.031082153 */,
-     PRESHIFT(0x001cb000) /*  0.007003784 */,
-     PRESHIFT(0x000d5000) /*  0.003250122 */,
-     PRESHIFT(0x0001d000) /*  0.000442505 */ },
-
-  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  1 */
-    -PRESHIFT(0x0001f000) /* -0.000473022 */,
-     PRESHIFT(0x000da000) /*  0.003326416 */,
-    -PRESHIFT(0x00207000) /* -0.007919312 */,
-     PRESHIFT(0x007d0000) /*  0.030517578 */,
-    -PRESHIFT(0x0158d000) /* -0.084182739 */,
-     PRESHIFT(0x01747000) /*  0.090927124 */,
-    -PRESHIFT(0x099a8000) /* -0.600219727 */,
-     PRESHIFT(0x124f0000) /*  1.144287109 */,
-     PRESHIFT(0x08b38000) /*  0.543823242 */,
-     PRESHIFT(0x01bde000) /*  0.108856201 */,
-     PRESHIFT(0x012b4000) /*  0.073059082 */,
-     PRESHIFT(0x0080f000) /*  0.031478882 */,
-     PRESHIFT(0x00191000) /*  0.006118774 */,
-     PRESHIFT(0x000d0000) /*  0.003173828 */,
-     PRESHIFT(0x0001a000) /*  0.000396729 */,
-
-    -PRESHIFT(0x00001000) /* -0.000015259 */,
-    -PRESHIFT(0x0001f000) /* -0.000473022 */,
-     PRESHIFT(0x000da000) /*  0.003326416 */,
-    -PRESHIFT(0x00207000) /* -0.007919312 */,
-     PRESHIFT(0x007d0000) /*  0.030517578 */,
-    -PRESHIFT(0x0158d000) /* -0.084182739 */,
-     PRESHIFT(0x01747000) /*  0.090927124 */,
-    -PRESHIFT(0x099a8000) /* -0.600219727 */,
-     PRESHIFT(0x124f0000) /*  1.144287109 */,
-     PRESHIFT(0x08b38000) /*  0.543823242 */,
-     PRESHIFT(0x01bde000) /*  0.108856201 */,
-     PRESHIFT(0x012b4000) /*  0.073059082 */,
-     PRESHIFT(0x0080f000) /*  0.031478882 */,
-     PRESHIFT(0x00191000) /*  0.006118774 */,
-     PRESHIFT(0x000d0000) /*  0.003173828 */,
-     PRESHIFT(0x0001a000) /*  0.000396729 */ },
-
-  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  2 */
-    -PRESHIFT(0x00023000) /* -0.000534058 */,
-     PRESHIFT(0x000de000) /*  0.003387451 */,
-    -PRESHIFT(0x00245000) /* -0.008865356 */,
-     PRESHIFT(0x007a0000) /*  0.029785156 */,
-    -PRESHIFT(0x016f7000) /* -0.089706421 */,
-     PRESHIFT(0x014a8000) /*  0.080688477 */,
-    -PRESHIFT(0x0a0d8000) /* -0.628295898 */,
-     PRESHIFT(0x12468000) /*  1.142211914 */,
-     PRESHIFT(0x083ff000) /*  0.515609741 */,
-     PRESHIFT(0x01dd8000) /*  0.116577148 */,
-     PRESHIFT(0x01149000) /*  0.067520142 */,
-     PRESHIFT(0x00820000) /*  0.031738281 */,
-     PRESHIFT(0x0015b000) /*  0.005294800 */,
-     PRESHIFT(0x000ca000) /*  0.003082275 */,
-     PRESHIFT(0x00018000) /*  0.000366211 */,
-
-    -PRESHIFT(0x00001000) /* -0.000015259 */,
-    -PRESHIFT(0x00023000) /* -0.000534058 */,
-     PRESHIFT(0x000de000) /*  0.003387451 */,
-    -PRESHIFT(0x00245000) /* -0.008865356 */,
-     PRESHIFT(0x007a0000) /*  0.029785156 */,
-    -PRESHIFT(0x016f7000) /* -0.089706421 */,
-     PRESHIFT(0x014a8000) /*  0.080688477 */,
-    -PRESHIFT(0x0a0d8000) /* -0.628295898 */,
-     PRESHIFT(0x12468000) /*  1.142211914 */,
-     PRESHIFT(0x083ff000) /*  0.515609741 */,
-     PRESHIFT(0x01dd8000) /*  0.116577148 */,
-     PRESHIFT(0x01149000) /*  0.067520142 */,
-     PRESHIFT(0x00820000) /*  0.031738281 */,
-     PRESHIFT(0x0015b000) /*  0.005294800 */,
-     PRESHIFT(0x000ca000) /*  0.003082275 */,
-     PRESHIFT(0x00018000) /*  0.000366211 */ },
-
-  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  3 */
-    -PRESHIFT(0x00026000) /* -0.000579834 */,
-     PRESHIFT(0x000e1000) /*  0.003433228 */,
-    -PRESHIFT(0x00285000) /* -0.009841919 */,
-     PRESHIFT(0x00765000) /*  0.028884888 */,
-    -PRESHIFT(0x0185d000) /* -0.095169067 */,
-     PRESHIFT(0x011d1000) /*  0.069595337 */,
-    -PRESHIFT(0x0a7fe000) /* -0.656219482 */,
-     PRESHIFT(0x12386000) /*  1.138763428 */,
-     PRESHIFT(0x07ccb000) /*  0.487472534 */,
-     PRESHIFT(0x01f9c000) /*  0.123474121 */,
-     PRESHIFT(0x00fdf000) /*  0.061996460 */,
-     PRESHIFT(0x00827000) /*  0.031845093 */,
-     PRESHIFT(0x00126000) /*  0.004486084 */,
-     PRESHIFT(0x000c4000) /*  0.002990723 */,
-     PRESHIFT(0x00015000) /*  0.000320435 */,
-
-    -PRESHIFT(0x00001000) /* -0.000015259 */,
-    -PRESHIFT(0x00026000) /* -0.000579834 */,
-     PRESHIFT(0x000e1000) /*  0.003433228 */,
-    -PRESHIFT(0x00285000) /* -0.009841919 */,
-     PRESHIFT(0x00765000) /*  0.028884888 */,
-    -PRESHIFT(0x0185d000) /* -0.095169067 */,
-     PRESHIFT(0x011d1000) /*  0.069595337 */,
-    -PRESHIFT(0x0a7fe000) /* -0.656219482 */,
-     PRESHIFT(0x12386000) /*  1.138763428 */,
-     PRESHIFT(0x07ccb000) /*  0.487472534 */,
-     PRESHIFT(0x01f9c000) /*  0.123474121 */,
-     PRESHIFT(0x00fdf000) /*  0.061996460 */,
-     PRESHIFT(0x00827000) /*  0.031845093 */,
-     PRESHIFT(0x00126000) /*  0.004486084 */,
-     PRESHIFT(0x000c4000) /*  0.002990723 */,
-     PRESHIFT(0x00015000) /*  0.000320435 */ },
-
-  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  4 */
-    -PRESHIFT(0x00029000) /* -0.000625610 */,
-     PRESHIFT(0x000e3000) /*  0.003463745 */,
-    -PRESHIFT(0x002c7000) /* -0.010848999 */,
-     PRESHIFT(0x0071e000) /*  0.027801514 */,
-    -PRESHIFT(0x019bd000) /* -0.100540161 */,
-     PRESHIFT(0x00ec0000) /*  0.057617187 */,
-    -PRESHIFT(0x0af15000) /* -0.683914185 */,
-     PRESHIFT(0x12249000) /*  1.133926392 */,
-     PRESHIFT(0x075a0000) /*  0.459472656 */,
-     PRESHIFT(0x0212c000) /*  0.129577637 */,
-     PRESHIFT(0x00e79000) /*  0.056533813 */,
-     PRESHIFT(0x00825000) /*  0.031814575 */,
-     PRESHIFT(0x000f4000) /*  0.003723145 */,
-     PRESHIFT(0x000be000) /*  0.002899170 */,
-     PRESHIFT(0x00013000) /*  0.000289917 */,
-
-    -PRESHIFT(0x00001000) /* -0.000015259 */,
-    -PRESHIFT(0x00029000) /* -0.000625610 */,
-     PRESHIFT(0x000e3000) /*  0.003463745 */,
-    -PRESHIFT(0x002c7000) /* -0.010848999 */,
-     PRESHIFT(0x0071e000) /*  0.027801514 */,
-    -PRESHIFT(0x019bd000) /* -0.100540161 */,
-     PRESHIFT(0x00ec0000) /*  0.057617187 */,
-    -PRESHIFT(0x0af15000) /* -0.683914185 */,
-     PRESHIFT(0x12249000) /*  1.133926392 */,
-     PRESHIFT(0x075a0000) /*  0.459472656 */,
-     PRESHIFT(0x0212c000) /*  0.129577637 */,
-     PRESHIFT(0x00e79000) /*  0.056533813 */,
-     PRESHIFT(0x00825000) /*  0.031814575 */,
-     PRESHIFT(0x000f4000) /*  0.003723145 */,
-     PRESHIFT(0x000be000) /*  0.002899170 */,
-     PRESHIFT(0x00013000) /*  0.000289917 */ },
-
-  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  5 */
-    -PRESHIFT(0x0002d000) /* -0.000686646 */,
-     PRESHIFT(0x000e4000) /*  0.003479004 */,
-    -PRESHIFT(0x0030b000) /* -0.011886597 */,
-     PRESHIFT(0x006cb000) /*  0.026535034 */,
-    -PRESHIFT(0x01b17000) /* -0.105819702 */,
-     PRESHIFT(0x00b77000) /*  0.044784546 */,
-    -PRESHIFT(0x0b619000) /* -0.711318970 */,
-     PRESHIFT(0x120b4000) /*  1.127746582 */,
-     PRESHIFT(0x06e81000) /*  0.431655884 */,
-     PRESHIFT(0x02288000) /*  0.134887695 */,
-     PRESHIFT(0x00d17000) /*  0.051132202 */,
-     PRESHIFT(0x0081b000) /*  0.031661987 */,
-     PRESHIFT(0x000c5000) /*  0.003005981 */,
-     PRESHIFT(0x000b7000) /*  0.002792358 */,
-     PRESHIFT(0x00011000) /*  0.000259399 */,
-
-    -PRESHIFT(0x00001000) /* -0.000015259 */,
-    -PRESHIFT(0x0002d000) /* -0.000686646 */,
-     PRESHIFT(0x000e4000) /*  0.003479004 */,
-    -PRESHIFT(0x0030b000) /* -0.011886597 */,
-     PRESHIFT(0x006cb000) /*  0.026535034 */,
-    -PRESHIFT(0x01b17000) /* -0.105819702 */,
-     PRESHIFT(0x00b77000) /*  0.044784546 */,
-    -PRESHIFT(0x0b619000) /* -0.711318970 */,
-     PRESHIFT(0x120b4000) /*  1.127746582 */,
-     PRESHIFT(0x06e81000) /*  0.431655884 */,
-     PRESHIFT(0x02288000) /*  0.134887695 */,
-     PRESHIFT(0x00d17000) /*  0.051132202 */,
-     PRESHIFT(0x0081b000) /*  0.031661987 */,
-     PRESHIFT(0x000c5000) /*  0.003005981 */,
-     PRESHIFT(0x000b7000) /*  0.002792358 */,
-     PRESHIFT(0x00011000) /*  0.000259399 */ },
-
-  { -PRESHIFT(0x00001000) /* -0.000015259 */,	/*  6 */
-    -PRESHIFT(0x00031000) /* -0.000747681 */,
-     PRESHIFT(0x000e4000) /*  0.003479004 */,
-    -PRESHIFT(0x00350000) /* -0.012939453 */,
-     PRESHIFT(0x0066c000) /*  0.025085449 */,
-    -PRESHIFT(0x01c67000) /* -0.110946655 */,
-     PRESHIFT(0x007f5000) /*  0.031082153 */,
-    -PRESHIFT(0x0bd06000) /* -0.738372803 */,
-     PRESHIFT(0x11ec7000) /*  1.120223999 */,
-     PRESHIFT(0x06772000) /*  0.404083252 */,
-     PRESHIFT(0x023b3000) /*  0.139450073 */,
-     PRESHIFT(0x00bbc000) /*  0.045837402 */,
-     PRESHIFT(0x00809000) /*  0.031387329 */,
-     PRESHIFT(0x00099000) /*  0.002334595 */,
-     PRESHIFT(0x000b0000) /*  0.002685547 */,
-     PRESHIFT(0x00010000) /*  0.000244141 */,
-
-    -PRESHIFT(0x00001000) /* -0.000015259 */,
-    -PRESHIFT(0x00031000) /* -0.000747681 */,
-     PRESHIFT(0x000e4000) /*  0.003479004 */,
-    -PRESHIFT(0x00350000) /* -0.012939453 */,
-     PRESHIFT(0x0066c000) /*  0.025085449 */,
-    -PRESHIFT(0x01c67000) /* -0.110946655 */,
-     PRESHIFT(0x007f5000) /*  0.031082153 */,
-    -PRESHIFT(0x0bd06000) /* -0.738372803 */,
-     PRESHIFT(0x11ec7000) /*  1.120223999 */,
-     PRESHIFT(0x06772000) /*  0.404083252 */,
-     PRESHIFT(0x023b3000) /*  0.139450073 */,
-     PRESHIFT(0x00bbc000) /*  0.045837402 */,
-     PRESHIFT(0x00809000) /*  0.031387329 */,
-     PRESHIFT(0x00099000) /*  0.002334595 */,
-     PRESHIFT(0x000b0000) /*  0.002685547 */,
-     PRESHIFT(0x00010000) /*  0.000244141 */ },
-
-  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/*  7 */
-    -PRESHIFT(0x00035000) /* -0.000808716 */,
-     PRESHIFT(0x000e3000) /*  0.003463745 */,
-    -PRESHIFT(0x00397000) /* -0.014022827 */,
-     PRESHIFT(0x005ff000) /*  0.023422241 */,
-    -PRESHIFT(0x01dad000) /* -0.115921021 */,
-     PRESHIFT(0x0043a000) /*  0.016510010 */,
-    -PRESHIFT(0x0c3d9000) /* -0.765029907 */,
-     PRESHIFT(0x11c83000) /*  1.111373901 */,
-     PRESHIFT(0x06076000) /*  0.376800537 */,
-     PRESHIFT(0x024ad000) /*  0.143264771 */,
-     PRESHIFT(0x00a67000) /*  0.040634155 */,
-     PRESHIFT(0x007f0000) /*  0.031005859 */,
-     PRESHIFT(0x0006f000) /*  0.001693726 */,
-     PRESHIFT(0x000a9000) /*  0.002578735 */,
-     PRESHIFT(0x0000e000) /*  0.000213623 */,
-
-    -PRESHIFT(0x00002000) /* -0.000030518 */,
-    -PRESHIFT(0x00035000) /* -0.000808716 */,
-     PRESHIFT(0x000e3000) /*  0.003463745 */,
-    -PRESHIFT(0x00397000) /* -0.014022827 */,
-     PRESHIFT(0x005ff000) /*  0.023422241 */,
-    -PRESHIFT(0x01dad000) /* -0.115921021 */,
-     PRESHIFT(0x0043a000) /*  0.016510010 */,
-    -PRESHIFT(0x0c3d9000) /* -0.765029907 */,
-     PRESHIFT(0x11c83000) /*  1.111373901 */,
-     PRESHIFT(0x06076000) /*  0.376800537 */,
-     PRESHIFT(0x024ad000) /*  0.143264771 */,
-     PRESHIFT(0x00a67000) /*  0.040634155 */,
-     PRESHIFT(0x007f0000) /*  0.031005859 */,
-     PRESHIFT(0x0006f000) /*  0.001693726 */,
-     PRESHIFT(0x000a9000) /*  0.002578735 */,
-     PRESHIFT(0x0000e000) /*  0.000213623 */ },
-
-  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/*  8 */
-    -PRESHIFT(0x0003a000) /* -0.000885010 */,
-     PRESHIFT(0x000e0000) /*  0.003417969 */,
-    -PRESHIFT(0x003df000) /* -0.015121460 */,
-     PRESHIFT(0x00586000) /*  0.021575928 */,
-    -PRESHIFT(0x01ee6000) /* -0.120697021 */,
-     PRESHIFT(0x00046000) /*  0.001068115 */,
-    -PRESHIFT(0x0ca8d000) /* -0.791213989 */,
-     PRESHIFT(0x119e9000) /*  1.101211548 */,
-     PRESHIFT(0x05991000) /*  0.349868774 */,
-     PRESHIFT(0x02578000) /*  0.146362305 */,
-     PRESHIFT(0x0091a000) /*  0.035552979 */,
-     PRESHIFT(0x007d1000) /*  0.030532837 */,
-     PRESHIFT(0x00048000) /*  0.001098633 */,
-     PRESHIFT(0x000a1000) /*  0.002456665 */,
-     PRESHIFT(0x0000d000) /*  0.000198364 */,
-
-    -PRESHIFT(0x00002000) /* -0.000030518 */,
-    -PRESHIFT(0x0003a000) /* -0.000885010 */,
-     PRESHIFT(0x000e0000) /*  0.003417969 */,
-    -PRESHIFT(0x003df000) /* -0.015121460 */,
-     PRESHIFT(0x00586000) /*  0.021575928 */,
-    -PRESHIFT(0x01ee6000) /* -0.120697021 */,
-     PRESHIFT(0x00046000) /*  0.001068115 */,
-    -PRESHIFT(0x0ca8d000) /* -0.791213989 */,
-     PRESHIFT(0x119e9000) /*  1.101211548 */,
-     PRESHIFT(0x05991000) /*  0.349868774 */,
-     PRESHIFT(0x02578000) /*  0.146362305 */,
-     PRESHIFT(0x0091a000) /*  0.035552979 */,
-     PRESHIFT(0x007d1000) /*  0.030532837 */,
-     PRESHIFT(0x00048000) /*  0.001098633 */,
-     PRESHIFT(0x000a1000) /*  0.002456665 */,
-     PRESHIFT(0x0000d000) /*  0.000198364 */ },
-
-  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/*  9 */
-    -PRESHIFT(0x0003f000) /* -0.000961304 */,
-     PRESHIFT(0x000dd000) /*  0.003372192 */,
-    -PRESHIFT(0x00428000) /* -0.016235352 */,
-     PRESHIFT(0x00500000) /*  0.019531250 */,
-    -PRESHIFT(0x02011000) /* -0.125259399 */,
-    -PRESHIFT(0x003e6000) /* -0.015228271 */,
-    -PRESHIFT(0x0d11e000) /* -0.816864014 */,
-     PRESHIFT(0x116fc000) /*  1.089782715 */,
-     PRESHIFT(0x052c5000) /*  0.323318481 */,
-     PRESHIFT(0x02616000) /*  0.148773193 */,
-     PRESHIFT(0x007d6000) /*  0.030609131 */,
-     PRESHIFT(0x007aa000) /*  0.029937744 */,
-     PRESHIFT(0x00024000) /*  0.000549316 */,
-     PRESHIFT(0x0009a000) /*  0.002349854 */,
-     PRESHIFT(0x0000b000) /*  0.000167847 */,
-
-    -PRESHIFT(0x00002000) /* -0.000030518 */,
-    -PRESHIFT(0x0003f000) /* -0.000961304 */,
-     PRESHIFT(0x000dd000) /*  0.003372192 */,
-    -PRESHIFT(0x00428000) /* -0.016235352 */,
-     PRESHIFT(0x00500000) /*  0.019531250 */,
-    -PRESHIFT(0x02011000) /* -0.125259399 */,
-    -PRESHIFT(0x003e6000) /* -0.015228271 */,
-    -PRESHIFT(0x0d11e000) /* -0.816864014 */,
-     PRESHIFT(0x116fc000) /*  1.089782715 */,
-     PRESHIFT(0x052c5000) /*  0.323318481 */,
-     PRESHIFT(0x02616000) /*  0.148773193 */,
-     PRESHIFT(0x007d6000) /*  0.030609131 */,
-     PRESHIFT(0x007aa000) /*  0.029937744 */,
-     PRESHIFT(0x00024000) /*  0.000549316 */,
-     PRESHIFT(0x0009a000) /*  0.002349854 */,
-     PRESHIFT(0x0000b000) /*  0.000167847 */ },
-
-  { -PRESHIFT(0x00002000) /* -0.000030518 */,	/* 10 */
-    -PRESHIFT(0x00044000) /* -0.001037598 */,
-     PRESHIFT(0x000d7000) /*  0.003280640 */,
-    -PRESHIFT(0x00471000) /* -0.017349243 */,
-     PRESHIFT(0x0046b000) /*  0.017257690 */,
-    -PRESHIFT(0x0212b000) /* -0.129562378 */,
-    -PRESHIFT(0x0084a000) /* -0.032379150 */,
-    -PRESHIFT(0x0d78a000) /* -0.841949463 */,
-     PRESHIFT(0x113be000) /*  1.077117920 */,
-     PRESHIFT(0x04c16000) /*  0.297210693 */,
-     PRESHIFT(0x02687000) /*  0.150497437 */,
-     PRESHIFT(0x0069c000) /*  0.025817871 */,
-     PRESHIFT(0x0077f000) /*  0.029281616 */,
-     PRESHIFT(0x00002000) /*  0.000030518 */,
-     PRESHIFT(0x00093000) /*  0.002243042 */,
-     PRESHIFT(0x0000a000) /*  0.000152588 */,
-
-    -PRESHIFT(0x00002000) /* -0.000030518 */,
-    -PRESHIFT(0x00044000) /* -0.001037598 */,
-     PRESHIFT(0x000d7000) /*  0.003280640 */,
-    -PRESHIFT(0x00471000) /* -0.017349243 */,
-     PRESHIFT(0x0046b000) /*  0.017257690 */,
-    -PRESHIFT(0x0212b000) /* -0.129562378 */,
-    -PRESHIFT(0x0084a000) /* -0.032379150 */,
-    -PRESHIFT(0x0d78a000) /* -0.841949463 */,
-     PRESHIFT(0x113be000) /*  1.077117920 */,
-     PRESHIFT(0x04c16000) /*  0.297210693 */,
-     PRESHIFT(0x02687000) /*  0.150497437 */,
-     PRESHIFT(0x0069c000) /*  0.025817871 */,
-     PRESHIFT(0x0077f000) /*  0.029281616 */,
-     PRESHIFT(0x00002000) /*  0.000030518 */,
-     PRESHIFT(0x00093000) /*  0.002243042 */,
-     PRESHIFT(0x0000a000) /*  0.000152588 */ },
-
-  { -PRESHIFT(0x00003000) /* -0.000045776 */,	/* 11 */
-    -PRESHIFT(0x00049000) /* -0.001113892 */,
-     PRESHIFT(0x000d0000) /*  0.003173828 */,
-    -PRESHIFT(0x004ba000) /* -0.018463135 */,
-     PRESHIFT(0x003ca000) /*  0.014801025 */,
-    -PRESHIFT(0x02233000) /* -0.133590698 */,
-    -PRESHIFT(0x00ce4000) /* -0.050354004 */,
-    -PRESHIFT(0x0ddca000) /* -0.866363525 */,
-     PRESHIFT(0x1102f000) /*  1.063217163 */,
-     PRESHIFT(0x04587000) /*  0.271591187 */,
-     PRESHIFT(0x026cf000) /*  0.151596069 */,
-     PRESHIFT(0x0056c000) /*  0.021179199 */,
-     PRESHIFT(0x0074e000) /*  0.028533936 */,
-    -PRESHIFT(0x0001d000) /* -0.000442505 */,
-     PRESHIFT(0x0008b000) /*  0.002120972 */,
-     PRESHIFT(0x00009000) /*  0.000137329 */,
-
-    -PRESHIFT(0x00003000) /* -0.000045776 */,
-    -PRESHIFT(0x00049000) /* -0.001113892 */,
-     PRESHIFT(0x000d0000) /*  0.003173828 */,
-    -PRESHIFT(0x004ba000) /* -0.018463135 */,
-     PRESHIFT(0x003ca000) /*  0.014801025 */,
-    -PRESHIFT(0x02233000) /* -0.133590698 */,
-    -PRESHIFT(0x00ce4000) /* -0.050354004 */,
-    -PRESHIFT(0x0ddca000) /* -0.866363525 */,
-     PRESHIFT(0x1102f000) /*  1.063217163 */,
-     PRESHIFT(0x04587000) /*  0.271591187 */,
-     PRESHIFT(0x026cf000) /*  0.151596069 */,
-     PRESHIFT(0x0056c000) /*  0.021179199 */,
-     PRESHIFT(0x0074e000) /*  0.028533936 */,
-    -PRESHIFT(0x0001d000) /* -0.000442505 */,
-     PRESHIFT(0x0008b000) /*  0.002120972 */,
-     PRESHIFT(0x00009000) /*  0.000137329 */ },
-
-  { -PRESHIFT(0x00003000) /* -0.000045776 */,	/* 12 */
-    -PRESHIFT(0x0004f000) /* -0.001205444 */,
-     PRESHIFT(0x000c8000) /*  0.003051758 */,
-    -PRESHIFT(0x00503000) /* -0.019577026 */,
-     PRESHIFT(0x0031a000) /*  0.012115479 */,
-    -PRESHIFT(0x02326000) /* -0.137298584 */,
-    -PRESHIFT(0x011b5000) /* -0.069168091 */,
-    -PRESHIFT(0x0e3dd000) /* -0.890090942 */,
-     PRESHIFT(0x10c54000) /*  1.048156738 */,
-     PRESHIFT(0x03f1b000) /*  0.246505737 */,
-     PRESHIFT(0x026ee000) /*  0.152069092 */,
-     PRESHIFT(0x00447000) /*  0.016708374 */,
-     PRESHIFT(0x00719000) /*  0.027725220 */,
-    -PRESHIFT(0x00039000) /* -0.000869751 */,
-     PRESHIFT(0x00084000) /*  0.002014160 */,
-     PRESHIFT(0x00008000) /*  0.000122070 */,
-
-    -PRESHIFT(0x00003000) /* -0.000045776 */,
-    -PRESHIFT(0x0004f000) /* -0.001205444 */,
-     PRESHIFT(0x000c8000) /*  0.003051758 */,
-    -PRESHIFT(0x00503000) /* -0.019577026 */,
-     PRESHIFT(0x0031a000) /*  0.012115479 */,
-    -PRESHIFT(0x02326000) /* -0.137298584 */,
-    -PRESHIFT(0x011b5000) /* -0.069168091 */,
-    -PRESHIFT(0x0e3dd000) /* -0.890090942 */,
-     PRESHIFT(0x10c54000) /*  1.048156738 */,
-     PRESHIFT(0x03f1b000) /*  0.246505737 */,
-     PRESHIFT(0x026ee000) /*  0.152069092 */,
-     PRESHIFT(0x00447000) /*  0.016708374 */,
-     PRESHIFT(0x00719000) /*  0.027725220 */,
-    -PRESHIFT(0x00039000) /* -0.000869751 */,
-     PRESHIFT(0x00084000) /*  0.002014160 */,
-     PRESHIFT(0x00008000) /*  0.000122070 */ },
-
-  { -PRESHIFT(0x00004000) /* -0.000061035 */,	/* 13 */
-    -PRESHIFT(0x00055000) /* -0.001296997 */,
-     PRESHIFT(0x000bd000) /*  0.002883911 */,
-    -PRESHIFT(0x0054c000) /* -0.020690918 */,
-     PRESHIFT(0x0025d000) /*  0.009231567 */,
-    -PRESHIFT(0x02403000) /* -0.140670776 */,
-    -PRESHIFT(0x016ba000) /* -0.088775635 */,
-    -PRESHIFT(0x0e9be000) /* -0.913055420 */,
-     PRESHIFT(0x1082d000) /*  1.031936646 */,
-     PRESHIFT(0x038d4000) /*  0.221984863 */,
-     PRESHIFT(0x026e7000) /*  0.151962280 */,
-     PRESHIFT(0x0032e000) /*  0.012420654 */,
-     PRESHIFT(0x006df000) /*  0.026840210 */,
-    -PRESHIFT(0x00053000) /* -0.001266479 */,
-     PRESHIFT(0x0007d000) /*  0.001907349 */,
-     PRESHIFT(0x00007000) /*  0.000106812 */,
-
-    -PRESHIFT(0x00004000) /* -0.000061035 */,
-    -PRESHIFT(0x00055000) /* -0.001296997 */,
-     PRESHIFT(0x000bd000) /*  0.002883911 */,
-    -PRESHIFT(0x0054c000) /* -0.020690918 */,
-     PRESHIFT(0x0025d000) /*  0.009231567 */,
-    -PRESHIFT(0x02403000) /* -0.140670776 */,
-    -PRESHIFT(0x016ba000) /* -0.088775635 */,
-    -PRESHIFT(0x0e9be000) /* -0.913055420 */,
-     PRESHIFT(0x1082d000) /*  1.031936646 */,
-     PRESHIFT(0x038d4000) /*  0.221984863 */,
-     PRESHIFT(0x026e7000) /*  0.151962280 */,
-     PRESHIFT(0x0032e000) /*  0.012420654 */,
-     PRESHIFT(0x006df000) /*  0.026840210 */,
-    -PRESHIFT(0x00053000) /* -0.001266479 */,
-     PRESHIFT(0x0007d000) /*  0.001907349 */,
-     PRESHIFT(0x00007000) /*  0.000106812 */ },
-
-  { -PRESHIFT(0x00004000) /* -0.000061035 */,	/* 14 */
-    -PRESHIFT(0x0005b000) /* -0.001388550 */,
-     PRESHIFT(0x000b1000) /*  0.002700806 */,
-    -PRESHIFT(0x00594000) /* -0.021789551 */,
-     PRESHIFT(0x00192000) /*  0.006134033 */,
-    -PRESHIFT(0x024c8000) /* -0.143676758 */,
-    -PRESHIFT(0x01bf2000) /* -0.109161377 */,
-    -PRESHIFT(0x0ef69000) /* -0.935195923 */,
-     PRESHIFT(0x103be000) /*  1.014617920 */,
-     PRESHIFT(0x032b4000) /*  0.198059082 */,
-     PRESHIFT(0x026bc000) /*  0.151306152 */,
-     PRESHIFT(0x00221000) /*  0.008316040 */,
-     PRESHIFT(0x006a2000) /*  0.025909424 */,
-    -PRESHIFT(0x0006a000) /* -0.001617432 */,
-     PRESHIFT(0x00075000) /*  0.001785278 */,
-     PRESHIFT(0x00007000) /*  0.000106812 */,
-
-    -PRESHIFT(0x00004000) /* -0.000061035 */,
-    -PRESHIFT(0x0005b000) /* -0.001388550 */,
-     PRESHIFT(0x000b1000) /*  0.002700806 */,
-    -PRESHIFT(0x00594000) /* -0.021789551 */,
-     PRESHIFT(0x00192000) /*  0.006134033 */,
-    -PRESHIFT(0x024c8000) /* -0.143676758 */,
-    -PRESHIFT(0x01bf2000) /* -0.109161377 */,
-    -PRESHIFT(0x0ef69000) /* -0.935195923 */,
-     PRESHIFT(0x103be000) /*  1.014617920 */,
-     PRESHIFT(0x032b4000) /*  0.198059082 */,
-     PRESHIFT(0x026bc000) /*  0.151306152 */,
-     PRESHIFT(0x00221000) /*  0.008316040 */,
-     PRESHIFT(0x006a2000) /*  0.025909424 */,
-    -PRESHIFT(0x0006a000) /* -0.001617432 */,
-     PRESHIFT(0x00075000) /*  0.001785278 */,
-     PRESHIFT(0x00007000) /*  0.000106812 */ },
-
-  { -PRESHIFT(0x00005000) /* -0.000076294 */,	/* 15 */
-    -PRESHIFT(0x00061000) /* -0.001480103 */,
-     PRESHIFT(0x000a3000) /*  0.002487183 */,
-    -PRESHIFT(0x005da000) /* -0.022857666 */,
-     PRESHIFT(0x000b9000) /*  0.002822876 */,
-    -PRESHIFT(0x02571000) /* -0.146255493 */,
-    -PRESHIFT(0x0215c000) /* -0.130310059 */,
-    -PRESHIFT(0x0f4dc000) /* -0.956481934 */,
-     PRESHIFT(0x0ff0a000) /*  0.996246338 */,
-     PRESHIFT(0x02cbf000) /*  0.174789429 */,
-     PRESHIFT(0x0266e000) /*  0.150115967 */,
-     PRESHIFT(0x00120000) /*  0.004394531 */,
-     PRESHIFT(0x00662000) /*  0.024932861 */,
-    -PRESHIFT(0x0007f000) /* -0.001937866 */,
-     PRESHIFT(0x0006f000) /*  0.001693726 */,
-     PRESHIFT(0x00006000) /*  0.000091553 */,
-
-    -PRESHIFT(0x00005000) /* -0.000076294 */,
-    -PRESHIFT(0x00061000) /* -0.001480103 */,
-     PRESHIFT(0x000a3000) /*  0.002487183 */,
-    -PRESHIFT(0x005da000) /* -0.022857666 */,
-     PRESHIFT(0x000b9000) /*  0.002822876 */,
-    -PRESHIFT(0x02571000) /* -0.146255493 */,
-    -PRESHIFT(0x0215c000) /* -0.130310059 */,
-    -PRESHIFT(0x0f4dc000) /* -0.956481934 */,
-     PRESHIFT(0x0ff0a000) /*  0.996246338 */,
-     PRESHIFT(0x02cbf000) /*  0.174789429 */,
-     PRESHIFT(0x0266e000) /*  0.150115967 */,
-     PRESHIFT(0x00120000) /*  0.004394531 */,
-     PRESHIFT(0x00662000) /*  0.024932861 */,
-    -PRESHIFT(0x0007f000) /* -0.001937866 */,
-     PRESHIFT(0x0006f000) /*  0.001693726 */,
-     PRESHIFT(0x00006000) /*  0.000091553 */ },
-
-  { -PRESHIFT(0x00005000) /* -0.000076294 */,	/* 16 */
-    -PRESHIFT(0x00068000) /* -0.001586914 */,
-     PRESHIFT(0x00092000) /*  0.002227783 */,
-    -PRESHIFT(0x0061f000) /* -0.023910522 */,
-    -PRESHIFT(0x0002d000) /* -0.000686646 */,
-    -PRESHIFT(0x025ff000) /* -0.148422241 */,
-    -PRESHIFT(0x026f7000) /* -0.152206421 */,
-    -PRESHIFT(0x0fa13000) /* -0.976852417 */,
-     PRESHIFT(0x0fa13000) /*  0.976852417 */,
-     PRESHIFT(0x026f7000) /*  0.152206421 */,
-     PRESHIFT(0x025ff000) /*  0.148422241 */,
-     PRESHIFT(0x0002d000) /*  0.000686646 */,
-     PRESHIFT(0x0061f000) /*  0.023910522 */,
-    -PRESHIFT(0x00092000) /* -0.002227783 */,
-     PRESHIFT(0x00068000) /*  0.001586914 */,
-     PRESHIFT(0x00005000) /*  0.000076294 */,
-
-    -PRESHIFT(0x00005000) /* -0.000076294 */,
-    -PRESHIFT(0x00068000) /* -0.001586914 */,
-     PRESHIFT(0x00092000) /*  0.002227783 */,
-    -PRESHIFT(0x0061f000) /* -0.023910522 */,
-    -PRESHIFT(0x0002d000) /* -0.000686646 */,
-    -PRESHIFT(0x025ff000) /* -0.148422241 */,
-    -PRESHIFT(0x026f7000) /* -0.152206421 */,
-    -PRESHIFT(0x0fa13000) /* -0.976852417 */,
-     PRESHIFT(0x0fa13000) /*  0.976852417 */,
-     PRESHIFT(0x026f7000) /*  0.152206421 */,
-     PRESHIFT(0x025ff000) /*  0.148422241 */,
-     PRESHIFT(0x0002d000) /*  0.000686646 */,
-     PRESHIFT(0x0061f000) /*  0.023910522 */,
-    -PRESHIFT(0x00092000) /* -0.002227783 */,
-     PRESHIFT(0x00068000) /*  0.001586914 */,
-     PRESHIFT(0x00005000) /*  0.000076294 */ }
diff --git a/code/libmad-0.15.1b/INSTALL b/code/libmad-0.15.1b/INSTALL
deleted file mode 100644
index 50dbe439..00000000
--- a/code/libmad-0.15.1b/INSTALL
+++ /dev/null
@@ -1,183 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
diff --git a/code/libmad-0.15.1b/Makefile.am b/code/libmad-0.15.1b/Makefile.am
deleted file mode 100644
index ad5c596d..00000000
--- a/code/libmad-0.15.1b/Makefile.am
+++ /dev/null
@@ -1,140 +0,0 @@
-##
-## libmad - MPEG audio decoder library
-## Copyright (C) 2000-2004 Underbit Technologies, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
-## $Id: Makefile.am,v 1.23 2004/02/17 02:02:03 rob Exp $
-##
-
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS =		
-DIST_SUBDIRS =		msvc++
-
-lib_LTLIBRARIES =	libmad.la
-include_HEADERS =	mad.h
-
-EXTRA_PROGRAMS =	minimad
-
-minimad_SOURCES =	minimad.c
-minimad_INCLUDES =	
-minimad_LDADD =		libmad.la
-
-EXTRA_DIST =		mad.h.sed  \
-			CHANGES COPYRIGHT CREDITS README TODO VERSION
-
-exported_headers =	version.h fixed.h bit.h timer.h stream.h frame.h  \
-			synth.h decoder.h
-
-headers =		$(exported_headers)  \
-			global.h layer12.h layer3.h huffman.h
-
-data_includes =		D.dat imdct_s.dat qc_table.dat rq_table.dat  \
-			sf_table.dat
-
-libmad_la_SOURCES =	version.c fixed.c bit.c timer.c stream.c frame.c  \
-			synth.c decoder.c layer12.c layer3.c huffman.c  \
-			$(headers) $(data_includes)
-
-EXTRA_libmad_la_SOURCES =	imdct_l_arm.S #synth_mmx.S
-
-libmad_la_DEPENDENCIES =	@ASO_OBJS@
-libmad_la_LIBADD =		@ASO_OBJS@
-
-INCLUDES =		$(FPM) $(ASO)
-
-BUILT_SOURCES =		mad.h
-CLEANFILES =		mad.h
-
-## From the libtool documentation on library versioning:
-##
-## CURRENT
-##      The most recent interface number that this library implements.
-##
-## REVISION
-##      The implementation number of the CURRENT interface.
-##
-## AGE
-##      The difference between the newest and oldest interfaces that this
-##      library implements.  In other words, the library implements all the
-##      interface numbers in the range from number `CURRENT - AGE' to
-##      `CURRENT'.
-##
-##    If two libraries have identical CURRENT and AGE numbers, then the
-## dynamic linker chooses the library with the greater REVISION number.
-##
-##   1. Start with version information of `0:0:0' for each libtool library.
-##
-##   2. Update the version information only immediately before a public
-##      release of your software.  More frequent updates are unnecessary,
-##      and only guarantee that the current interface number gets larger
-##      faster.
-##
-##   3. If the library source code has changed at all since the last
-##      update, then increment REVISION (`C:R:A' becomes `C:r+1:A').
-##
-##   4. If any interfaces have been added, removed, or changed since the
-##      last update, increment CURRENT, and set REVISION to 0.
-##
-##   5. If any interfaces have been added since the last public release,
-##      then increment AGE.
-##
-##   6. If any interfaces have been removed since the last public release,
-##      then set AGE to 0.
-
-version_current =	2
-version_revision =	1
-version_age =		2
-
-version_info =		$(version_current):$(version_revision):$(version_age)
-
-libmad_la_LDFLAGS =	-version-info $(version_info)
-
-mad.h: config.status config.h Makefile.am  \
-		$(srcdir)/COPYRIGHT $(srcdir)/mad.h.sed $(exported_headers)
-	(sed -e '1s|.*|/*|' -e '1b' -e '$$s|.*| */|' -e '$$b'  \
-		-e 's/^.*/ *&/' $(srcdir)/COPYRIGHT; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo 'extern "C" {';  \
-	echo "# endif"; echo;  \
-	if [ ".$(FPM)" != "." ]; then  \
-		echo ".$(FPM)" | sed -e 's|^\.-D|# define |'; echo;  \
-	fi;  \
-	sed -ne 's/^# *define  *\(HAVE_.*_ASM\).*/# define \1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *OPT_\(SPEED\|ACCURACY\).*/# define OPT_\1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *\(SIZEOF_.*\)/# define \1/p'  \
-		config.h; echo;  \
-	for header in $(exported_headers); do  \
-		echo;  \
-		sed -n -f $(srcdir)/mad.h.sed $(srcdir)/$$header;  \
-	done; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo '}';  \
-	echo "# endif") >$@
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-
-.c.s:
-	$(COMPILE) -S $<
-
-again:
-	$(MAKE) clean
-	$(MAKE)
-
-.PHONY: again
diff --git a/code/libmad-0.15.1b/Makefile.in b/code/libmad-0.15.1b/Makefile.in
deleted file mode 100644
index 723070ad..00000000
--- a/code/libmad-0.15.1b/Makefile.in
+++ /dev/null
@@ -1,821 +0,0 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-EXTRA_PROGRAMS = minimad$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/libmad.list.in \
-	$(top_srcdir)/configure COPYING INSTALL TODO config.guess \
-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libmad.list
-am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__objects_1 =
-am__objects_2 = $(am__objects_1)
-am_libmad_la_OBJECTS = version.lo fixed.lo bit.lo timer.lo stream.lo \
-	frame.lo synth.lo decoder.lo layer12.lo layer3.lo huffman.lo \
-	$(am__objects_2) $(am__objects_1)
-libmad_la_OBJECTS = $(am_libmad_la_OBJECTS)
-am_minimad_OBJECTS = minimad.$(OBJEXT)
-minimad_OBJECTS = $(am_minimad_OBJECTS)
-minimad_DEPENDENCIES = libmad.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit.Plo ./$(DEPDIR)/decoder.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/fixed.Plo ./$(DEPDIR)/frame.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/huffman.Plo ./$(DEPDIR)/layer12.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/layer3.Plo ./$(DEPDIR)/minimad.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stream.Plo ./$(DEPDIR)/synth.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/timer.Plo ./$(DEPDIR)/version.Plo
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
-	$(CCASFLAGS)
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) \
-	$(minimad_SOURCES)
-DIST_SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) \
-	$(minimad_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ASO = @ASO@
-ASO_OBJS = @ASO_OBJS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPM = @FPM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-SUBDIRS = 
-DIST_SUBDIRS = msvc++
-lib_LTLIBRARIES = libmad.la
-include_HEADERS = mad.h
-minimad_SOURCES = minimad.c
-minimad_INCLUDES = 
-minimad_LDADD = libmad.la
-EXTRA_DIST = mad.h.sed  \
-			CHANGES COPYRIGHT CREDITS README TODO VERSION
-
-exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h  \
-			synth.h decoder.h
-
-headers = $(exported_headers)  \
-			global.h layer12.h layer3.h huffman.h
-
-data_includes = D.dat imdct_s.dat qc_table.dat rq_table.dat  \
-			sf_table.dat
-
-libmad_la_SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c  \
-			synth.c decoder.c layer12.c layer3.c huffman.c  \
-			$(headers) $(data_includes)
-
-EXTRA_libmad_la_SOURCES = imdct_l_arm.S #synth_mmx.S
-libmad_la_DEPENDENCIES = @ASO_OBJS@
-libmad_la_LIBADD = @ASO_OBJS@
-INCLUDES = $(FPM) $(ASO)
-BUILT_SOURCES = mad.h
-CLEANFILES = mad.h
-version_current = 2
-version_revision = 1
-version_age = 2
-version_info = $(version_current):$(version_revision):$(version_age)
-libmad_la_LDFLAGS = -version-info $(version_info)
-all: $(BUILT_SOURCES) config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkdir_p) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libmad.la: $(libmad_la_OBJECTS) $(libmad_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libmad_la_LDFLAGS) $(libmad_la_OBJECTS) $(libmad_la_LIBADD) $(LIBS)
-minimad$(EXEEXT): $(minimad_OBJECTS) $(minimad_DEPENDENCIES) 
-	@rm -f minimad$(EXEEXT)
-	$(LINK) $(minimad_LDFLAGS) $(minimad_OBJECTS) $(minimad_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer12.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minimad.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
-
-.S.o:
-	$(CCASCOMPILE) -c $<
-
-.S.obj:
-	$(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
-
-.S.lo:
-	$(LTCCASCOMPILE) -c -o $@ $<
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkdir_p) $(DESTDIR)$(includedir)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && $(mkdir_p) "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-recursive
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-recursive ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-	distcheck distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-
-mad.h: config.status config.h Makefile.am  \
-		$(srcdir)/COPYRIGHT $(srcdir)/mad.h.sed $(exported_headers)
-	(sed -e '1s|.*|/*|' -e '1b' -e '$$s|.*| */|' -e '$$b'  \
-		-e 's/^.*/ *&/' $(srcdir)/COPYRIGHT; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo 'extern "C" {';  \
-	echo "# endif"; echo;  \
-	if [ ".$(FPM)" != "." ]; then  \
-		echo ".$(FPM)" | sed -e 's|^\.-D|# define |'; echo;  \
-	fi;  \
-	sed -ne 's/^# *define  *\(HAVE_.*_ASM\).*/# define \1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *OPT_\(SPEED\|ACCURACY\).*/# define OPT_\1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *\(SIZEOF_.*\)/# define \1/p'  \
-		config.h; echo;  \
-	for header in $(exported_headers); do  \
-		echo;  \
-		sed -n -f $(srcdir)/mad.h.sed $(srcdir)/$$header;  \
-	done; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo '}';  \
-	echo "# endif") >$@
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-
-.c.s:
-	$(COMPILE) -S $<
-
-again:
-	$(MAKE) clean
-	$(MAKE)
-
-.PHONY: again
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/code/libmad-0.15.1b/README b/code/libmad-0.15.1b/README
deleted file mode 100644
index b3f15ea4..00000000
--- a/code/libmad-0.15.1b/README
+++ /dev/null
@@ -1,241 +0,0 @@
-
- libmad - MPEG audio decoder library
- Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
- $Id: README,v 1.4 2004/01/23 09:41:32 rob Exp $
-
-===============================================================================
-
-INTRODUCTION
-
-  MAD (libmad) is a high-quality MPEG audio decoder. It currently supports
-  MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as
-  the so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-  and Layer III a.k.a. MP3) are fully implemented.
-
-  MAD does not yet support MPEG-2 multichannel audio (although it should be
-  backward compatible with such streams) nor does it currently support AAC.
-
-  MAD has the following special features:
-
-    - 24-bit PCM output
-    - 100% fixed-point (integer) computation
-    - completely new implementation based on the ISO/IEC standards
-    - distributed under the terms of the GNU General Public License (GPL)
-
-  Because MAD provides full 24-bit PCM output, applications using MAD are
-  able to produce high quality audio. Even when the output device supports
-  only 16-bit PCM, applications can use the extra resolution to increase the
-  audible dynamic range through the use of dithering or noise shaping.
-
-  Because MAD uses integer computation rather than floating point, it is
-  well suited for architectures without a floating point unit. All
-  calculations are performed with a 32-bit fixed-point integer
-  representation.
-
-  Because MAD is a new implementation of the ISO/IEC standards, it is
-  unencumbered by the errors of other implementations. MAD is NOT a
-  derivation of the ISO reference source or any other code. Considerable
-  effort has been expended to ensure a correct implementation, even in cases
-  where the standards are ambiguous or misleading.
-
-  Because MAD is distributed under the terms of the GPL, its redistribution
-  is not generally restricted, so long as the terms of the GPL are followed.
-  This means MAD can be incorporated into other software as long as that
-  software is also distributed under the GPL. (Should this be undesirable,
-  alternate arrangements may be possible by contacting Underbit.)
-
-===============================================================================
-
-ABOUT THE CODE
-
-  The code is optimized and performs very well, although specific
-  improvements can still be made. The output from the decoder library
-  consists of 32-bit signed linear fixed-point values that can be easily
-  scaled for any size PCM output, up to 24 bits per sample.
-
-  The API for libmad can be found in the `mad.h' header file. Note that this
-  file is automatically generated, and will not exist until after you have
-  built the library.
-
-  There are two APIs available, one high-level, and the other low-level.
-  With the low-level API, each step of the decoding process must be handled
-  explicitly, offering the greatest amount of control. With the high-level
-  API, after callbacks are configured, a single routine will decode an
-  entire bitstream.
-
-  The high-level API may either be used synchronously or asynchronously. If
-  used asynchronously, decoding will occur in a separate process.
-  Communication is possible with the decoding process by passing control
-  messages.
-
-  The file `minimad.c' contains an example usage of the libmad API that
-  shows only the bare minimum required to implement a useful decoder. It
-  expects a regular file to be redirected to standard input, and it sends
-  decoded 16-bit signed little-endian PCM samples to standard output. If a
-  decoding error occurs, it is reported to standard error and decoding
-  continues. Note that the scale() routine in this code is only provided as
-  an example; it rounds MAD's high-resolution samples down to 16 bits, but
-  does not perform any dithering or noise shaping. It is therefore not
-  recommended to use this routine as-is in your own code if sound quality is
-  important.
-
-Integer Performance
-
-  To get the best possible performance, it is recommended that an assembly
-  version of the fixed-point multiply and related routines be selected.
-  Several such assembly routines have been written for various CPUs.
-
-  If an assembly version is not available, a fast approximation version will
-  be used. This will result in reduced accuracy of the decoder.
-
-  Alternatively, if 64-bit integers are supported as a datatype by the
-  compiler, another version can be used that is much more accurate.
-  However, using an assembly version is generally much faster and just as
-  accurate.
-
-  More information can be gathered from the `fixed.h' header file.
-
-  MAD's CPU-intensive subband synthesis routine can be further optimized at
-  the expense of a slight loss in output accuracy due to a modified method
-  for fixed-point multiplication with a small windowing constant. While this
-  is helpful for performance and the output accuracy loss is generally
-  undetectable, it is disabled by default and must be explicitly enabled.
-
-  Under some architectures, other special optimizations may also be
-  available.
-
-Audio Quality
-
-  The output from MAD has been found to satisfy the ISO/IEC 11172-4
-  computational accuracy requirements for compliance. In most
-  configurations, MAD is a Full Layer III ISO/IEC 11172-3 audio decoder as
-  defined by the standard.
-
-  When the approximation version of the fixed-point multiply is used, MAD is
-  a limited accuracy ISO/IEC 11172-3 audio decoder as defined by the
-  standard.
-
-  MAD can alternatively be configured to produce output with less or more
-  accuracy than the default, as a tradeoff with performance.
-
-  MAD produces output samples with a precision greater than 24 bits. Because
-  most output formats use fewer bits, typically 16, it is recommended that a
-  dithering algorithm be used (rather than rounding or truncating) to obtain
-  the highest quality audio. However, dithering may unfavorably affect an
-  analytic examination of the output (such as compliance testing); you may
-  therefore wish to use rounding in this case instead.
-
-Portability Issues
-
-  GCC is preferred to compile the code, but other compilers may also work.
-  The assembly code in `fixed.h' depends on the inline assembly features of
-  your compiler. If you're not using GCC or MSVC++, you can either write
-  your own assembly macros or use the default (low quality output) version.
-
-  The union initialization of `huffman.c' may not be portable to all
-  platforms when GCC is not used.
-
-  The code should not be sensitive to word sizes or byte ordering, however
-  it does assume A % B has the same sign as A.
-
-===============================================================================
-
-BUILDING AND INSTALLING
-
-Windows Platforms
-
-  MAD can be built under Windows using either MSVC++ or Cygwin. A MSVC++
-  project file can be found under the `msvc++' subdirectory.
-
-  To build libmad using Cygwin, you will first need to install the Cygwin
-  tools:
-
-      http://www.cygwin.com/
-
-  You may then proceed with the following POSIX instructions within the
-  Cygwin shell.
-
-  Note that by default Cygwin will build a library that depends on the
-  Cygwin DLL. You can use MinGW to build a library that does not depend on
-  the Cygwin DLL. To do so, give the option --host=mingw32 to `configure'.
-
-POSIX Platforms (including Cygwin)
-
-  The code is distributed with a `configure' script that will generate for
-  you a `Makefile' and a `config.h' for your platform. See the file
-  `INSTALL' for generic instructions.
-
-  The specific options you may want to give `configure' are:
-
-      --enable-speed            optimize for speed over accuracy
-
-      --enable-accuracy         optimize for accuracy over speed
-
-      --disable-debugging       do not compile with debugging support, and
-                                use more optimizations
-
-      --disable-shared          do not build a shared library
-
-  Note that you need not specify one of --enable-speed or --enable-accuracy;
-  in its default configuration, MAD is optimized for both. You should only
-  use one of these options if you wish to compromise speed or accuracy for
-  the other.
-
-  By default the package will build a shared library if possible for your
-  platform. If you want only a static library, use --disable-shared.
-
-  It is not normally necessary to use the following options, but you may
-  fine-tune the configuration with them if desired:
-
-      --enable-fpm=ARCH         use the ARCH-specific version of the
-                                fixed-point math assembly routines
-                                (current options are: intel, arm, mips,
-                                sparc, ppc; also allowed are: 64bit, approx)
-
-      --enable-sso              use the subband synthesis optimization,
-                                with reduced accuracy
-
-      --disable-aso             do not use certain architecture-specific
-                                optimizations
-
-  By default an appropriate fixed-point assembly routine will be selected
-  for the configured host type, if it can be determined. Thus if you are
-  cross-compiling for another architecture, you should be sure either to
-  give `configure' a host type argument (--host) or to use an explicit
-  --enable-fpm option.
-
-  If an appropriate assembly routine cannot be determined, the default
-  approximation version will be used. In this case, use of an alternate
-  --enable-fpm is highly recommended.
-
-Experimenting and Developing
-
-  Further options for `configure' that may be useful to developers and
-  experimenters are:
-
-      --enable-debugging        enable diagnostic debugging support and
-                                debugging symbols
-
-      --enable-profiling        generate `gprof' profiling code
-
-      --enable-experimental     enable code using the EXPERIMENTAL
-                                preprocessor define
-
-===============================================================================
-
-COPYRIGHT
-
-  Please read the `COPYRIGHT' file for copyright and warranty information.
-  Also, the file `COPYING' contains the full text of the GNU GPL.
-
-  Send inquiries, comments, bug reports, suggestions, patches, etc. to:
-
-      Underbit Technologies, Inc. <support@underbit.com>
-
-  See also the MAD home page on the Web:
-
-      http://www.underbit.com/products/mad/
-
-===============================================================================
-
diff --git a/code/libmad-0.15.1b/TODO b/code/libmad-0.15.1b/TODO
deleted file mode 100644
index 1ea107c2..00000000
--- a/code/libmad-0.15.1b/TODO
+++ /dev/null
@@ -1,69 +0,0 @@
-
- libmad - MPEG audio decoder library
- Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
- $Id: TODO,v 1.3 2004/02/05 09:02:39 rob Exp $
-
-===============================================================================
-
-libmad:
-  - more API layers (buffering, PCM samples, dithering, etc.)
-  - x86 performance optimization compiler flags
-  - function documentation, general docs
-  - finish async API
-  - parse system streams?
-  - MPEG-2 MC, AAC?
-  - logarithmic multiplication?
-  - multiple frame decoding for better locality of reference?
-  - frame serial numbers, Layer III frame continuity checks
-
-fixed.h:
-  - experiment with FPM_INTEL:
-
-# if 1
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrl %3,%1\n\t"  \
-	    "shll %4,%2\n\t"  \
-	    "orl %2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi),  \
-	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("sall %2,%1"  \
-	    : "=r" (__hi_)  \
-	    : "0" (hi), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       asm ("shrl %2,%1"  \
-	    : "=r" (__lo_)  \
-	    : "0" (lo), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       asm ("orl %1,%2"  \
-	    : "=rm" (__result)  \
-	    : "r" (__hi_), "0" (__lo_)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-libmad Layer I:
-  - check frame length sanity
-
-libmad Layer II:
-  - check frame length sanity
-
-libmad Layer III:
-  - circular buffer
-  - optimize zero_part from Huffman decoding throughout
-  - MPEG 2.5 8000 Hz sf bands? mixed blocks?
-  - stereo->mono conversion optimization?
-  - enable frame-at-a-time decoding
-  - improve portability of huffman.c
-
diff --git a/code/libmad-0.15.1b/VERSION b/code/libmad-0.15.1b/VERSION
deleted file mode 100644
index d4e8f64a..00000000
--- a/code/libmad-0.15.1b/VERSION
+++ /dev/null
@@ -1,7 +0,0 @@
-0.15.1b
-configure.ac:24
-version.h:25-28
-msvc++/config.h:99,105,120
-msvc++/mad.h:41-44
-
-Makefile.am:98-100
diff --git a/code/libmad-0.15.1b/aclocal.m4 b/code/libmad-0.15.1b/aclocal.m4
deleted file mode 100644
index 1d15e0b9..00000000
--- a/code/libmad-0.15.1b/aclocal.m4
+++ /dev/null
@@ -1,6849 +0,0 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 192 $
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  testring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
- *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-#- set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-  else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# --------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-# Report which librarie types wil actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-      esac
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case "$host_cpu" in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc)
-	# Intel C++
-	with_gnu_ld=yes
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      cxx)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd* | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDRT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  cxx)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-      fi
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi4*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-SED=$lt_cv_path_SED
-])
-AC_MSG_RESULT([$SED])
-])
-
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.2])])
-
-# Figure out how to run the assembler.             -*- Autoconf -*-
-
-# serial 3
-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 6
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# serial 6						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 7
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 11
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
diff --git a/code/libmad-0.15.1b/bit.c b/code/libmad-0.15.1b/bit.c
deleted file mode 100644
index c2bfb243..00000000
--- a/code/libmad-0.15.1b/bit.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: bit.c,v 1.12 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# ifdef HAVE_LIMITS_H
-#  include <limits.h>
-# else
-#  define CHAR_BIT  8
-# endif
-
-# include "bit.h"
-
-/*
- * This is the lookup table for computing the CRC-check word.
- * As described in section 2.4.3.1 and depicted in Figure A.9
- * of ISO/IEC 11172-3, the generator polynomial is:
- *
- * G(X) = X^16 + X^15 + X^2 + 1
- */
-static
-unsigned short const crc_table[256] = {
-  0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
-  0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
-  0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
-  0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,
-  0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,
-  0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,
-  0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,
-  0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,
-
-  0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,
-  0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,
-  0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,
-  0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,
-  0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,
-  0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,
-  0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,
-  0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,
-
-  0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,
-  0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,
-  0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,
-  0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,
-  0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,
-  0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,
-  0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,
-  0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,
-
-  0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,
-  0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,
-  0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,
-  0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,
-  0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,
-  0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,
-  0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,
-  0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202
-};
-
-# define CRC_POLY  0x8005
-
-/*
- * NAME:	bit->init()
- * DESCRIPTION:	initialize bit pointer struct
- */
-void mad_bit_init(struct mad_bitptr *bitptr, unsigned char const *byte)
-{
-  bitptr->byte  = byte;
-  bitptr->cache = 0;
-  bitptr->left  = CHAR_BIT;
-}
-
-/*
- * NAME:	bit->length()
- * DESCRIPTION:	return number of bits between start and end points
- */
-unsigned int mad_bit_length(struct mad_bitptr const *begin,
-			    struct mad_bitptr const *end)
-{
-  return begin->left +
-    CHAR_BIT * (end->byte - (begin->byte + 1)) + (CHAR_BIT - end->left);
-}
-
-/*
- * NAME:	bit->nextbyte()
- * DESCRIPTION:	return pointer to next unprocessed byte
- */
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *bitptr)
-{
-  return bitptr->left == CHAR_BIT ? bitptr->byte : bitptr->byte + 1;
-}
-
-/*
- * NAME:	bit->skip()
- * DESCRIPTION:	advance bit pointer
- */
-void mad_bit_skip(struct mad_bitptr *bitptr, unsigned int len)
-{
-  bitptr->byte += len / CHAR_BIT;
-  bitptr->left -= len % CHAR_BIT;
-
-  if (bitptr->left > CHAR_BIT) {
-    bitptr->byte++;
-    bitptr->left += CHAR_BIT;
-  }
-
-  if (bitptr->left < CHAR_BIT)
-    bitptr->cache = *bitptr->byte;
-}
-
-/*
- * NAME:	bit->read()
- * DESCRIPTION:	read an arbitrary number of bits and return their UIMSBF value
- */
-unsigned long mad_bit_read(struct mad_bitptr *bitptr, unsigned int len)
-{
-  register unsigned long value;
-
-  if (bitptr->left == CHAR_BIT)
-    bitptr->cache = *bitptr->byte;
-
-  if (len < bitptr->left) {
-    value = (bitptr->cache & ((1 << bitptr->left) - 1)) >>
-      (bitptr->left - len);
-    bitptr->left -= len;
-
-    return value;
-  }
-
-  /* remaining bits in current byte */
-
-  value = bitptr->cache & ((1 << bitptr->left) - 1);
-  len  -= bitptr->left;
-
-  bitptr->byte++;
-  bitptr->left = CHAR_BIT;
-
-  /* more bytes */
-
-  while (len >= CHAR_BIT) {
-    value = (value << CHAR_BIT) | *bitptr->byte++;
-    len  -= CHAR_BIT;
-  }
-
-  if (len > 0) {
-    bitptr->cache = *bitptr->byte;
-
-    value = (value << len) | (bitptr->cache >> (CHAR_BIT - len));
-    bitptr->left -= len;
-  }
-
-  return value;
-}
-
-# if 0
-/*
- * NAME:	bit->write()
- * DESCRIPTION:	write an arbitrary number of bits
- */
-void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len,
-		   unsigned long value)
-{
-  unsigned char *ptr;
-
-  ptr = (unsigned char *) bitptr->byte;
-
-  /* ... */
-}
-# endif
-
-/*
- * NAME:	bit->crc()
- * DESCRIPTION:	compute CRC-check word
- */
-unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len,
-			   unsigned short init)
-{
-  register unsigned int crc;
-
-  for (crc = init; len >= 32; len -= 32) {
-    register unsigned long data;
-
-    data = mad_bit_read(&bitptr, 32);
-
-    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 24)) & 0xff];
-    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 16)) & 0xff];
-    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  8)) & 0xff];
-    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  0)) & 0xff];
-  }
-
-  switch (len / 8) {
-  case 3: crc = (crc << 8) ^
-	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
-  case 2: crc = (crc << 8) ^
-	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
-  case 1: crc = (crc << 8) ^
-	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
-
-  len %= 8;
-
-  case 0: break;
-  }
-
-  while (len--) {
-    register unsigned int msb;
-
-    msb = mad_bit_read(&bitptr, 1) ^ (crc >> 15);
-
-    crc <<= 1;
-    if (msb & 1)
-      crc ^= CRC_POLY;
-  }
-
-  return crc & 0xffff;
-}
diff --git a/code/libmad-0.15.1b/bit.h b/code/libmad-0.15.1b/bit.h
deleted file mode 100644
index 5a51570b..00000000
--- a/code/libmad-0.15.1b/bit.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
diff --git a/code/libmad-0.15.1b/config.guess b/code/libmad-0.15.1b/config.guess
deleted file mode 100644
index e8c6fc0c..00000000
--- a/code/libmad-0.15.1b/config.guess
+++ /dev/null
@@ -1,1432 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-01-05'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DRAGONFLY:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/code/libmad-0.15.1b/config.h.in b/code/libmad-0.15.1b/config.h.in
deleted file mode 100644
index a29b5820..00000000
--- a/code/libmad-0.15.1b/config.h.in
+++ /dev/null
@@ -1,135 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to enable diagnostic debugging support. */
-#undef DEBUG
-
-/* Define to enable experimental code. */
-#undef EXPERIMENTAL
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the `fcntl' function. */
-#undef HAVE_FCNTL
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */
-#undef HAVE_MADD16_ASM
-
-/* Define if your MIPS CPU supports a 2-operand MADD instruction. */
-#undef HAVE_MADD_ASM
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `pipe' function. */
-#undef HAVE_PIPE
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `waitpid' function. */
-#undef HAVE_WAITPID
-
-/* Define to disable debugging assertions. */
-#undef NDEBUG
-
-/* Define to optimize for accuracy over speed. */
-#undef OPT_ACCURACY
-
-/* Define to optimize for speed over accuracy. */
-#undef OPT_SPEED
-
-/* Define to enable a fast subband synthesis approximation optimization. */
-#undef OPT_SSO
-
-/* Define to influence a strict interpretation of the ISO/IEC standards, even
-   if this is in opposition with best accepted practices. */
-#undef OPT_STRICT
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of a `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
diff --git a/code/libmad-0.15.1b/config.sub b/code/libmad-0.15.1b/config.sub
deleted file mode 100644
index 463186db..00000000
--- a/code/libmad-0.15.1b/config.sub
+++ /dev/null
@@ -1,1537 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-01-05'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/code/libmad-0.15.1b/configure b/code/libmad-0.15.1b/configure
deleted file mode 100644
index ee421cc3..00000000
--- a/code/libmad-0.15.1b/configure
+++ /dev/null
@@ -1,23106 +0,0 @@
-#! /bin/sh
-# From configure.ac Id: configure.ac,v 1.9 2004/01/23 09:41:32 rob Exp .
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for MPEG Audio Decoder 0.15.1b.
-#
-# Report bugs to <support@underbit.com>.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME='MPEG Audio Decoder'
-PACKAGE_TARNAME='libmad'
-PACKAGE_VERSION='0.15.1b'
-PACKAGE_STRING='MPEG Audio Decoder 0.15.1b'
-PACKAGE_BUGREPORT='support@underbit.com'
-
-ac_unique_file="decoder.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS FPM ASO ASO_OBJS LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CCAS_set=${CCAS+set}
-ac_env_CCAS_value=$CCAS
-ac_cv_env_CCAS_set=${CCAS+set}
-ac_cv_env_CCAS_value=$CCAS
-ac_env_CCASFLAGS_set=${CCASFLAGS+set}
-ac_env_CCASFLAGS_value=$CCASFLAGS
-ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
-ac_cv_env_CCASFLAGS_value=$CCASFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures MPEG Audio Decoder 0.15.1b to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of MPEG Audio Decoder 0.15.1b:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-speed          optimize for speed over accuracy
-  --enable-accuracy       optimize for accuracy over speed
-  --enable-fpm=ARCH       use ARCH-specific fixed-point math routines (one of:
-                          intel, arm, mips, sparc, ppc, 64bit, default)
-  --enable-sso            use subband synthesis optimization
-  --disable-aso           disable architecture-specific optimizations
-  --enable-strict-iso     use strict ISO/IEC interpretations
-  --enable-profiling      generate profiling code
-  --enable-debugging      enable diagnostic debugging support
-  --disable-debugging     do not enable debugging and use more optimization
-  --enable-experimental   enable experimental code
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CCAS        assembler compiler command (defaults to CC)
-  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <support@underbit.com>.
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd "$ac_popdir"
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-MPEG Audio Decoder configure 0.15.1b
-generated by GNU Autoconf 2.59
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by MPEG Audio Decoder $as_me 0.15.1b, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-am__api_version="1.8"
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p -- . 2>/dev/null; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libmad'
- VERSION='0.15.1b'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-
-
-
-
-          ac_config_headers="$ac_config_headers config.h"
-
-
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-          ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-# By default we simply use the C compiler to build assembly code.
-
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-
-
-
-
-if test "$GCC" = yes
-then
-    case "$host" in
-	*-*-mingw*)
-	    case "$build" in
-		*-*-cygwin*)
-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
-		    LDFLAGS="$LDFLAGS -mno-cygwin"
-		    ;;
-	    esac
-    esac
-
-fi
-
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi;
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi;
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi;
-
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-SED=$lt_cv_path_SED
-
-fi
-
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
-NM="$lt_cv_path_NM"
-
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-  else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 3683 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  lt_cv_cc_needs_belf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-lt_cv_cc_needs_belf=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to support@underbit.com ##
-## ----------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_F77" && break
-done
-
-  F77=$ac_ct_F77
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:5240:" \
-     "checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_f77_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    i=0
-  testring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
- *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
-fi
-
-
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDRT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-fi
-
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
-objdir=$lt_cv_objdir
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AR=$ac_ct_AR
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-enable_dlopen=no
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi;
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6272: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6276: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6505: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6509: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-
-if test x"$lt_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6565: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:6569: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
-      link_all_deplibs=yes
-    else
-      ld_shlibs=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec=
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8740 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8838 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# Report which librarie types wil actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
-    ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags or --without-tags was given.
-if test "${with_tags+set}" = set; then
-  withval="$with_tags"
-  tagnames="$withval"
-fi;
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-	  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-      esac
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd12*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | kfreebsd*-gnu)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
-        ;;
-      *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case "$host_cpu" in
-    hppa*64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc)
-	# Intel C++
-	with_gnu_ld=yes
-	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      cxx)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd* | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  cxx)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11015: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:11019: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11075: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:11079: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12429 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12527 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13354: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:13358: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13414: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:13418: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_F77="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_F77="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_F77=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_F77='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
-      link_all_deplibs_F77=yes
-    else
-      ld_shlibs_F77=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_F77=
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15446: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15450: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15679: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15683: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15739: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:15743: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_GCJ="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_GCJ=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
-      link_all_deplibs_GCJ=yes
-    else
-      ld_shlibs_GCJ=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_GCJ=
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 17914 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18012 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-arch=""
-debug=""
-optimize=""
-profile=""
-
-set -- $CFLAGS
-CFLAGS=""
-
-if test "$GCC" = yes
-then
-    CFLAGS="-Wall"
-fi
-
-while test $# -gt 0
-do
-    case "$1" in
-	-Wall)
-	    if test "$GCC" = yes
-	    then
-		:
-	    else
-		CFLAGS="$CFLAGS $1"
-	    fi
-	    shift
-	    ;;
-	-g)
-	    debug="-g"
-	    shift
-	    ;;
-	-mno-cygwin)
-	    shift
-	    ;;
-	-m*)
-	    arch="$arch $1"
-	    shift
-	    ;;
-	-O2)
-	    optimize="-O"
-	    shift
-	    ;;
-	-fomit-frame-pointer)
-	    shift
-	    ;;
-	-O*|-f*)
-	    optimize="$optimize $1"
-	    shift
-	    ;;
-	*)
-	    CFLAGS="$CFLAGS $1"
-	    shift
-	    ;;
-    esac
-done
-
-if test "$GCC" = yes
-then
-    if test -z "$arch"
-    then
-	case "$host" in
-	    i386-*)           ;;
-	    i?86-*)           arch="-march=i486" ;;
-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
-	    powerpc-*)        ;;
-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
-	esac
-    fi
-
-    case "$optimize" in
-	-O|"-O "*)
-	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
-	    optimize="$optimize -fforce-addr"
-	    : #x optimize="$optimize -finline-functions"
-	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
-	    : #x optimize="$optimize -frerun-cse-after-loop"
-	    : #x optimize="$optimize -frerun-loop-opt"
-	    : #x optimize="$optimize -fgcse"
-	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
-	    : #* optimize="$optimize -fdelayed-branch"
-	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
-	    : #? optimize="$optimize -ffunction-sections"
-	    : #? optimize="$optimize -fcaller-saves"
-	    : #> optimize="$optimize -funroll-loops"
-	    : #> optimize="$optimize -funroll-all-loops"
-	    : #x optimize="$optimize -fmove-all-movables"
-	    : #x optimize="$optimize -freduce-all-givs"
-	    : #? optimize="$optimize -fstrict-aliasing"
-	    : #* optimize="$optimize -fstructure-noalias"
-
-	    case "$host" in
-		arm*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		mips*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    optimize="$optimize -finline-functions"
-		    ;;
-		i?86-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		powerpc-apple-*)
-		    # this triggers an internal compiler error with gcc2
-		    : #optimize="$optimize -fstrength-reduce"
-
-		    # this is really only beneficial with gcc3
-		    : #optimize="$optimize -finline-functions"
-		    ;;
-		*)
-		    # this sometimes provokes bugs in gcc 2.95.2
-		    : #optimize="$optimize -fstrength-reduce"
-		    ;;
-	    esac
-	    ;;
-    esac
-fi
-
-case "$host" in
-    mips*-agenda-*)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MADD16_ASM 1
-_ACEOF
-
-	;;
-    mips*-luxsonor-*)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MADD_ASM 1
-_ACEOF
-
-	;;
-esac
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-
-int
-main ()
-{
-  int s;
-  wait (&s);
-  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_sys_wait_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_sys_wait_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-if test $ac_cv_header_sys_wait_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-for ac_header in assert.h limits.h unistd.h sys/types.h fcntl.h errno.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to support@underbit.com ##
-## ----------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-int
-main ()
-{
- _ascii (); _ebcdic ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-main ()
-{
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
-  return 0;
-if (sizeof (pid_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long *) 0)
-  return 0;
-if (sizeof (long long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long long)); }
-unsigned long ulongval () { return (long) (sizeof (long long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
-
-
-
-
-
-
-for ac_func in waitpid fcntl pipe fork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-echo "$as_me:$LINENO: checking whether to optimize for speed or for accuracy" >&5
-echo $ECHO_N "checking whether to optimize for speed or for accuracy... $ECHO_C" >&6
-
-# Check whether --enable-speed or --disable-speed was given.
-if test "${enable_speed+set}" = set; then
-  enableval="$enable_speed"
-
-    case "$enableval" in
-	yes)
-	    optimize_for="speed"
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_SPEED 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-
-# Check whether --enable-accuracy or --disable-accuracy was given.
-if test "${enable_accuracy+set}" = set; then
-  enableval="$enable_accuracy"
-
-    case "$enableval" in
-	yes)
-	    if test "$optimize_for" = "speed"
-	    then
-		optimize_for="both"
-	    else
-		optimize_for="accuracy"
-	    fi
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_ACCURACY 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-
-echo "$as_me:$LINENO: result: ${optimize_for-default}" >&5
-echo "${ECHO_T}${optimize_for-default}" >&6
-
-if test "$optimize_for" = "both"
-then
-    { { echo "$as_me:$LINENO: error: cannot optimize for both speed and accuracy" >&5
-echo "$as_me: error: cannot optimize for both speed and accuracy" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-echo "$as_me:$LINENO: checking for architecture-specific fixed-point math routines" >&5
-echo $ECHO_N "checking for architecture-specific fixed-point math routines... $ECHO_C" >&6
-# Check whether --enable-fpm or --disable-fpm was given.
-if test "${enable_fpm+set}" = set; then
-  enableval="$enable_fpm"
-
-    case "$enableval" in
-	yes)                             ;;
-	no|default|approx) FPM="DEFAULT" ;;
-	intel|i?86)        FPM="INTEL"   ;;
-	arm)               FPM="ARM"     ;;
-	mips)              FPM="MIPS"    ;;
-	sparc)             FPM="SPARC"   ;;
-	ppc|powerpc)       FPM="PPC"     ;;
-	64bit)             FPM="64BIT"   ;;
-	float)             FPM="FLOAT"   ;;
-	*)
-	    echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-	    { { echo "$as_me:$LINENO: error: bad --enable-fpm option" >&5
-echo "$as_me: error: bad --enable-fpm option" >&2;}
-   { (exit 1); exit 1; }; }
-	    ;;
-    esac
-
-fi;
-
-if test -z "$FPM" && test "$GCC" = yes
-then
-    case "$host" in
-	i?86-*)     FPM="INTEL"  ;;
-	arm*-*)     FPM="ARM"    ;;
-	mips*-*)    FPM="MIPS"   ;;
-	sparc*-*)   FPM="SPARC"  ;;
-	powerpc*-*) FPM="PPC"    ;;
-	# FIXME: need to test for 64-bit long long...
-    esac
-fi
-
-echo "$as_me:$LINENO: result: ${FPM=DEFAULT}" >&5
-echo "${ECHO_T}${FPM=DEFAULT}" >&6
-
-if test "$FPM" = "DEFAULT"
-then
-    { echo "$as_me:$LINENO: WARNING: default fixed-point math will yield limited accuracy" >&5
-echo "$as_me: WARNING: default fixed-point math will yield limited accuracy" >&2;}
-fi
-
-FPM="-DFPM_$FPM"
-
-# Check whether --enable-sso or --disable-sso was given.
-if test "${enable_sso+set}" = set; then
-  enableval="$enable_sso"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_SSO 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-
-# Check whether --enable-aso or --disable-aso was given.
-if test "${enable_aso+set}" = set; then
-  enableval="$enable_aso"
-
-else
-  enable_aso=yes
-fi;
-
-if test "$enable_aso" = yes
-then
-    case "$host" in
-	i?86-*)
-	    : #ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    : #not yet #ASO="$ASO -DASO_SYNTH"
-	    : #not yet #ASO_OBJS="synth_mmx.lo"
-	    ;;
-	arm*-*)
-	    ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_IMDCT"
-	    ASO_OBJS="imdct_l_arm.lo"
-	    ;;
-	mips*-*)
-	    ASO="$ASO -DASO_INTERLEAVE2"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    ;;
-    esac
-fi
-
-echo "$as_me:$LINENO: checking for ISO/IEC interpretation" >&5
-echo $ECHO_N "checking for ISO/IEC interpretation... $ECHO_C" >&6
-# Check whether --enable-strict-iso or --disable-strict-iso was given.
-if test "${enable_strict_iso+set}" = set; then
-  enableval="$enable_strict_iso"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_STRICT 1
-_ACEOF
-
-	    interpretation="strict"
-	    ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${interpretation-best accepted practices}" >&5
-echo "${ECHO_T}${interpretation-best accepted practices}" >&6
-
-echo "$as_me:$LINENO: checking whether to enable profiling" >&5
-echo $ECHO_N "checking whether to enable profiling... $ECHO_C" >&6
-# Check whether --enable-profiling or --disable-profiling was given.
-if test "${enable_profiling+set}" = set; then
-  enableval="$enable_profiling"
-
-    case "$enableval" in
-	yes) profile="-pg" ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${enable_profiling-no}" >&5
-echo "${ECHO_T}${enable_profiling-no}" >&6
-
-echo "$as_me:$LINENO: checking whether to enable debugging" >&5
-echo $ECHO_N "checking whether to enable debugging... $ECHO_C" >&6
-# Check whether --enable-debugging or --disable-debugging was given.
-if test "${enable_debugging+set}" = set; then
-  enableval="$enable_debugging"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
-
-	    optimize=""
-	    ;;
-	no)
-	    if test -n "$profile"
-	    then
-    { { echo "$as_me:$LINENO: error: --enable-profiling and --disable-debugging are incompatible" >&5
-echo "$as_me: error: --enable-profiling and --disable-debugging are incompatible" >&2;}
-   { (exit 1); exit 1; }; }
-	    fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
-
-	    debug=""
-	    if test "$GCC" = yes
-	    then
-		optimize="$optimize -fomit-frame-pointer"
-	    fi
-	    ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${enable_debugging-default}" >&5
-echo "${ECHO_T}${enable_debugging-default}" >&6
-
-echo "$as_me:$LINENO: checking whether to enable experimental code" >&5
-echo $ECHO_N "checking whether to enable experimental code... $ECHO_C" >&6
-# Check whether --enable-experimental or --disable-experimental was given.
-if test "${enable_experimental+set}" = set; then
-  enableval="$enable_experimental"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define EXPERIMENTAL 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${enable_experimental-no}" >&5
-echo "${ECHO_T}${enable_experimental-no}" >&6
-
-
-test -n "$arch"     && CFLAGS="$CFLAGS $arch"
-test -n "$debug"    && CFLAGS="$CFLAGS $debug"
-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
-test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
-
-
-                              ac_config_files="$ac_config_files Makefile msvc++/Makefile libmad.list"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by MPEG Audio Decoder $as_me 0.15.1b, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-MPEG Audio Decoder config.status 0.15.1b
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "msvc++/Makefile" ) CONFIG_FILES="$CONFIG_FILES msvc++/Makefile" ;;
-  "libmad.list" ) CONFIG_FILES="$CONFIG_FILES libmad.list" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CCAS@,$CCAS,;t t
-s,@CCASFLAGS@,$CCASFLAGS,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-s,@FPM@,$FPM,;t t
-s,@ASO@,$ASO,;t t
-s,@ASO_OBJS@,$ASO_OBJS,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/code/libmad-0.15.1b/configure.ac b/code/libmad-0.15.1b/configure.ac
deleted file mode 100644
index 9b793995..00000000
--- a/code/libmad-0.15.1b/configure.ac
+++ /dev/null
@@ -1,433 +0,0 @@
-dnl -*- m4 -*-
-dnl
-dnl libmad - MPEG audio decoder library
-dnl Copyright (C) 2000-2004 Underbit Technologies, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-dnl
-AC_REVISION([$Id: configure.ac,v 1.9 2004/01/23 09:41:32 rob Exp $])dnl
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([MPEG Audio Decoder], [0.15.1b], [support@underbit.com], [libmad])
-AC_PREREQ(2.53)
-
-AC_CONFIG_SRCDIR([decoder.h])
-
-AM_INIT_AUTOMAKE
-
-AM_CONFIG_HEADER([config.h])
-
-dnl System type.
-
-AC_CANONICAL_HOST
-
-dnl Checks for programs.
-
-AC_PROG_CC
-AM_PROG_AS
-
-if test "$GCC" = yes
-then
-    case "$host" in
-	*-*-mingw*)
-	    case "$build" in
-		*-*-cygwin*)
-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
-		    LDFLAGS="$LDFLAGS -mno-cygwin"
-		    ;;
-	    esac
-    esac
-
-dnl    case "$host" in
-dnl	*-*-cygwin* | *-*-mingw*)
-dnl	    LDFLAGS="$LDFLAGS -no-undefined -mdll"
-dnl	    ;;
-dnl    esac
-fi
-
-dnl Support for libtool.
-
-dnl AC_DISABLE_SHARED
-dnl AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-AC_SUBST(LIBTOOL_DEPS)
-
-dnl Compiler options.
-
-arch=""
-debug=""
-optimize=""
-profile=""
-
-set -- $CFLAGS
-CFLAGS=""
-
-if test "$GCC" = yes
-then
-    CFLAGS="-Wall"
-fi
-
-while test $# -gt 0
-do
-    case "$1" in
-	-Wall)
-	    if test "$GCC" = yes
-	    then
-		:
-	    else
-		CFLAGS="$CFLAGS $1"
-	    fi
-	    shift
-	    ;;
-	-g)
-	    debug="-g"
-	    shift
-	    ;;
-	-mno-cygwin)
-	    shift
-	    ;;
-	-m*)
-	    arch="$arch $1"
-	    shift
-	    ;;
-	-O2)
-	    optimize="-O"
-	    shift
-	    ;;
-	-fomit-frame-pointer)
-	    shift
-	    ;;
-	-O*|-f*)
-	    optimize="$optimize $1"
-	    shift
-	    ;;
-	*)
-	    CFLAGS="$CFLAGS $1"
-	    shift
-	    ;;
-    esac
-done
-
-if test "$GCC" = yes
-then
-    if test -z "$arch"
-    then
-	case "$host" in
-	    i386-*)           ;;
-	    i?86-*)           arch="-march=i486" ;;
-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
-	    powerpc-*)        ;;
-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
-	esac
-    fi
-
-    case "$optimize" in
-	-O|"-O "*)
-	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
-	    optimize="$optimize -fforce-addr"
-	    : #x optimize="$optimize -finline-functions"
-	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
-	    : #x optimize="$optimize -frerun-cse-after-loop"
-	    : #x optimize="$optimize -frerun-loop-opt"
-	    : #x optimize="$optimize -fgcse"
-	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
-	    : #* optimize="$optimize -fdelayed-branch"
-	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
-	    : #? optimize="$optimize -ffunction-sections"
-	    : #? optimize="$optimize -fcaller-saves"
-	    : #> optimize="$optimize -funroll-loops"
-	    : #> optimize="$optimize -funroll-all-loops"
-	    : #x optimize="$optimize -fmove-all-movables"
-	    : #x optimize="$optimize -freduce-all-givs"
-	    : #? optimize="$optimize -fstrict-aliasing"
-	    : #* optimize="$optimize -fstructure-noalias"
-
-	    case "$host" in
-		arm*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		mips*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    optimize="$optimize -finline-functions"
-		    ;;
-		i?86-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		powerpc-apple-*)
-		    # this triggers an internal compiler error with gcc2
-		    : #optimize="$optimize -fstrength-reduce"
-
-		    # this is really only beneficial with gcc3
-		    : #optimize="$optimize -finline-functions"
-		    ;;
-		*)
-		    # this sometimes provokes bugs in gcc 2.95.2
-		    : #optimize="$optimize -fstrength-reduce"
-		    ;;
-	    esac
-	    ;;
-    esac
-fi
-
-case "$host" in
-    mips*-agenda-*)
-	AC_DEFINE(HAVE_MADD16_ASM, 1,
-	    [Define if your MIPS CPU supports a 2-operand MADD16 instruction.])
-	;;
-    mips*-luxsonor-*)
-	AC_DEFINE(HAVE_MADD_ASM, 1,
-	    [Define if your MIPS CPU supports a 2-operand MADD instruction.])
-	;;
-esac
-
-dnl Checks for header files.
-
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(assert.h limits.h unistd.h sys/types.h fcntl.h errno.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-AC_C_CONST
-AC_C_INLINE
-AC_C_BIGENDIAN
-AC_TYPE_PID_T
-
-AC_CHECK_SIZEOF(int, 2)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 8)
-
-dnl Checks for library functions.
-
-AC_CHECK_FUNCS(waitpid fcntl pipe fork)
-
-dnl Other options.
-
-AC_SUBST(FPM)
-AC_SUBST(ASO)
-AC_SUBST(ASO_OBJS)
-
-dnl handle --enable and --disable options
-
-AC_CACHE_SAVE
-
-AC_MSG_CHECKING(whether to optimize for speed or for accuracy)
-
-AC_ARG_ENABLE(speed, AC_HELP_STRING([--enable-speed],
-		     [optimize for speed over accuracy]),
-[
-    case "$enableval" in
-	yes)
-	    optimize_for="speed"
-	    AC_DEFINE(OPT_SPEED, 1,
-		[Define to optimize for speed over accuracy.])
-	    ;;
-    esac
-])
-
-AC_ARG_ENABLE(accuracy, AC_HELP_STRING([--enable-accuracy],
-			[optimize for accuracy over speed]),
-[
-    case "$enableval" in
-	yes)
-	    if test "$optimize_for" = "speed"
-	    then
-		optimize_for="both"
-	    else
-		optimize_for="accuracy"
-	    fi
-	    AC_DEFINE(OPT_ACCURACY, 1,
-		[Define to optimize for accuracy over speed.])
-	    ;;
-    esac
-])
-
-AC_MSG_RESULT(${optimize_for-default})
-
-if test "$optimize_for" = "both"
-then
-    AC_MSG_ERROR(cannot optimize for both speed and accuracy)
-fi
-
-AC_MSG_CHECKING(for architecture-specific fixed-point math routines)
-AC_ARG_ENABLE(fpm, AC_HELP_STRING([--enable-fpm=ARCH],
-		   [use ARCH-specific fixed-point math routines
-		    (one of: intel, arm, mips, sparc, ppc, 64bit, default)]),
-[
-    case "$enableval" in
-	yes)                             ;;
-	no|default|approx) FPM="DEFAULT" ;;
-	intel|i?86)        FPM="INTEL"   ;;
-	arm)               FPM="ARM"     ;;
-	mips)              FPM="MIPS"    ;;
-	sparc)             FPM="SPARC"   ;;
-	ppc|powerpc)       FPM="PPC"     ;;
-	64bit)             FPM="64BIT"   ;;
-	float)             FPM="FLOAT"   ;;
-	*)
-	    AC_MSG_RESULT(failed)
-	    AC_MSG_ERROR([bad --enable-fpm option])
-	    ;;
-    esac
-])
-
-if test -z "$FPM" && test "$GCC" = yes
-then
-    case "$host" in
-	i?86-*)     FPM="INTEL"  ;;
-	arm*-*)     FPM="ARM"    ;;
-	mips*-*)    FPM="MIPS"   ;;
-	sparc*-*)   FPM="SPARC"  ;;
-	powerpc*-*) FPM="PPC"    ;;
-	# FIXME: need to test for 64-bit long long...
-    esac
-fi
-
-AC_MSG_RESULT(${FPM=DEFAULT})
-
-if test "$FPM" = "DEFAULT"
-then
-    AC_MSG_WARN([default fixed-point math will yield limited accuracy])
-fi
-
-FPM="-DFPM_$FPM"
-
-AC_ARG_ENABLE(sso, AC_HELP_STRING([--enable-sso],
-		   [use subband synthesis optimization]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(OPT_SSO, 1,
-    [Define to enable a fast subband synthesis approximation optimization.])
-	    ;;
-    esac
-])
-
-AC_ARG_ENABLE(aso, AC_HELP_STRING([--disable-aso],
-		   [disable architecture-specific optimizations]),
-    [], [enable_aso=yes])
-
-if test "$enable_aso" = yes
-then
-    case "$host" in
-	i?86-*)
-	    : #ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    : #not yet #ASO="$ASO -DASO_SYNTH"
-	    : #not yet #ASO_OBJS="synth_mmx.lo"
-	    ;;
-	arm*-*)
-	    ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_IMDCT"
-	    ASO_OBJS="imdct_l_arm.lo"
-	    ;;
-	mips*-*)
-	    ASO="$ASO -DASO_INTERLEAVE2"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    ;;
-    esac
-fi
-
-AC_MSG_CHECKING(for ISO/IEC interpretation)
-AC_ARG_ENABLE(strict-iso, AC_HELP_STRING([--enable-strict-iso],
-			  [use strict ISO/IEC interpretations]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(OPT_STRICT, 1,
-    [Define to influence a strict interpretation of the ISO/IEC standards,
-     even if this is in opposition with best accepted practices.])
-	    interpretation="strict"
-	    ;;
-    esac
-])
-AC_MSG_RESULT(${interpretation-best accepted practices})
-
-AC_MSG_CHECKING(whether to enable profiling)
-AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],
-			 [generate profiling code]),
-[
-    case "$enableval" in
-	yes) profile="-pg" ;;
-    esac
-])
-AC_MSG_RESULT(${enable_profiling-no})
-
-AC_MSG_CHECKING(whether to enable debugging)
-AC_ARG_ENABLE(debugging, AC_HELP_STRING([--enable-debugging],
-			 [enable diagnostic debugging support])
-AC_HELP_STRING([--disable-debugging],
-	       [do not enable debugging and use more optimization]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(DEBUG, 1,
-		[Define to enable diagnostic debugging support.])
-	    optimize=""
-	    ;;
-	no)
-	    if test -n "$profile"
-	    then
-    AC_MSG_ERROR(--enable-profiling and --disable-debugging are incompatible)
-	    fi
-
-	    AC_DEFINE(NDEBUG, 1,
-		[Define to disable debugging assertions.])
-	    debug=""
-	    if test "$GCC" = yes
-	    then
-		optimize="$optimize -fomit-frame-pointer"
-	    fi
-	    ;;
-    esac
-])
-AC_MSG_RESULT(${enable_debugging-default})
-
-AC_MSG_CHECKING(whether to enable experimental code)
-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
-			    [enable experimental code]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(EXPERIMENTAL, 1,
-		[Define to enable experimental code.])
-	    ;;
-    esac
-])
-AC_MSG_RESULT(${enable_experimental-no})
-
-dnl Create output files.
-
-test -n "$arch"     && CFLAGS="$CFLAGS $arch"
-test -n "$debug"    && CFLAGS="$CFLAGS $debug"
-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
-test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
-
-dnl LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
-dnl AC_SUBST(LTLIBOBJS)
-
-AC_CONFIG_FILES([Makefile msvc++/Makefile  \
-	libmad.list])
-AC_OUTPUT
diff --git a/code/libmad-0.15.1b/decoder.c b/code/libmad-0.15.1b/decoder.c
deleted file mode 100644
index 6d6df0db..00000000
--- a/code/libmad-0.15.1b/decoder.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: decoder.c,v 1.22 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-# endif
-
-# ifdef HAVE_SYS_WAIT_H
-#  include <sys/wait.h>
-# endif
-
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
-# ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-# endif
-
-# include <stdlib.h>
-
-# ifdef HAVE_ERRNO_H
-#  include <errno.h>
-# endif
-
-# include "stream.h"
-# include "frame.h"
-# include "synth.h"
-# include "decoder.h"
-
-/*
- * NAME:	decoder->init()
- * DESCRIPTION:	initialize a decoder object with callback routines
- */
-void mad_decoder_init(struct mad_decoder *decoder, void *data,
-		      enum mad_flow (*input_func)(void *,
-						  struct mad_stream *),
-		      enum mad_flow (*header_func)(void *,
-						   struct mad_header const *),
-		      enum mad_flow (*filter_func)(void *,
-						   struct mad_stream const *,
-						   struct mad_frame *),
-		      enum mad_flow (*output_func)(void *,
-						   struct mad_header const *,
-						   struct mad_pcm *),
-		      enum mad_flow (*error_func)(void *,
-						  struct mad_stream *,
-						  struct mad_frame *),
-		      enum mad_flow (*message_func)(void *,
-						    void *, unsigned int *))
-{
-  decoder->mode         = -1;
-
-  decoder->options      = 0;
-
-  decoder->async.pid    = 0;
-  decoder->async.in     = -1;
-  decoder->async.out    = -1;
-
-  decoder->sync         = 0;
-
-  decoder->cb_data      = data;
-
-  decoder->input_func   = input_func;
-  decoder->header_func  = header_func;
-  decoder->filter_func  = filter_func;
-  decoder->output_func  = output_func;
-  decoder->error_func   = error_func;
-  decoder->message_func = message_func;
-}
-
-int mad_decoder_finish(struct mad_decoder *decoder)
-{
-# if defined(USE_ASYNC)
-  if (decoder->mode == MAD_DECODER_MODE_ASYNC && decoder->async.pid) {
-    pid_t pid;
-    int status;
-
-    close(decoder->async.in);
-
-    do
-      pid = waitpid(decoder->async.pid, &status, 0);
-    while (pid == -1 && errno == EINTR);
-
-    decoder->mode = -1;
-
-    close(decoder->async.out);
-
-    decoder->async.pid = 0;
-    decoder->async.in  = -1;
-    decoder->async.out = -1;
-
-    if (pid == -1)
-      return -1;
-
-    return (!WIFEXITED(status) || WEXITSTATUS(status)) ? -1 : 0;
-  }
-# endif
-
-  return 0;
-}
-
-# if defined(USE_ASYNC)
-static
-enum mad_flow send_io(int fd, void const *data, size_t len)
-{
-  char const *ptr = data;
-  ssize_t count;
-
-  while (len) {
-    do
-      count = write(fd, ptr, len);
-    while (count == -1 && errno == EINTR);
-
-    if (count == -1)
-      return MAD_FLOW_BREAK;
-
-    len -= count;
-    ptr += count;
-  }
-
-  return MAD_FLOW_CONTINUE;
-}
-
-static
-enum mad_flow receive_io(int fd, void *buffer, size_t len)
-{
-  char *ptr = buffer;
-  ssize_t count;
-
-  while (len) {
-    do
-      count = read(fd, ptr, len);
-    while (count == -1 && errno == EINTR);
-
-    if (count == -1)
-      return (errno == EAGAIN) ? MAD_FLOW_IGNORE : MAD_FLOW_BREAK;
-    else if (count == 0)
-      return MAD_FLOW_STOP;
-
-    len -= count;
-    ptr += count;
-  }
-
-  return MAD_FLOW_CONTINUE;
-}
-
-static
-enum mad_flow receive_io_blocking(int fd, void *buffer, size_t len)
-{
-  int flags, blocking;
-  enum mad_flow result;
-
-  flags = fcntl(fd, F_GETFL);
-  if (flags == -1)
-    return MAD_FLOW_BREAK;
-
-  blocking = flags & ~O_NONBLOCK;
-
-  if (blocking != flags &&
-      fcntl(fd, F_SETFL, blocking) == -1)
-    return MAD_FLOW_BREAK;
-
-  result = receive_io(fd, buffer, len);
-
-  if (flags != blocking &&
-      fcntl(fd, F_SETFL, flags) == -1)
-    return MAD_FLOW_BREAK;
-
-  return result;
-}
-
-static
-enum mad_flow send(int fd, void const *message, unsigned int size)
-{
-  enum mad_flow result;
-
-  /* send size */
-
-  result = send_io(fd, &size, sizeof(size));
-
-  /* send message */
-
-  if (result == MAD_FLOW_CONTINUE)
-    result = send_io(fd, message, size);
-
-  return result;
-}
-
-static
-enum mad_flow receive(int fd, void **message, unsigned int *size)
-{
-  enum mad_flow result;
-  unsigned int actual;
-
-  if (*message == 0)
-    *size = 0;
-
-  /* receive size */
-
-  result = receive_io(fd, &actual, sizeof(actual));
-
-  /* receive message */
-
-  if (result == MAD_FLOW_CONTINUE) {
-    if (actual > *size)
-      actual -= *size;
-    else {
-      *size  = actual;
-      actual = 0;
-    }
-
-    if (*size > 0) {
-      if (*message == 0) {
-	*message = malloc(*size);
-	if (*message == 0)
-	  return MAD_FLOW_BREAK;
-      }
-
-      result = receive_io_blocking(fd, *message, *size);
-    }
-
-    /* throw away remainder of message */
-
-    while (actual && result == MAD_FLOW_CONTINUE) {
-      char sink[256];
-      unsigned int len;
-
-      len = actual > sizeof(sink) ? sizeof(sink) : actual;
-
-      result = receive_io_blocking(fd, sink, len);
-
-      actual -= len;
-    }
-  }
-
-  return result;
-}
-
-static
-enum mad_flow check_message(struct mad_decoder *decoder)
-{
-  enum mad_flow result;
-  void *message = 0;
-  unsigned int size;
-
-  result = receive(decoder->async.in, &message, &size);
-
-  if (result == MAD_FLOW_CONTINUE) {
-    if (decoder->message_func == 0)
-      size = 0;
-    else {
-      result = decoder->message_func(decoder->cb_data, message, &size);
-
-      if (result == MAD_FLOW_IGNORE ||
-	  result == MAD_FLOW_BREAK)
-	size = 0;
-    }
-
-    if (send(decoder->async.out, message, size) != MAD_FLOW_CONTINUE)
-      result = MAD_FLOW_BREAK;
-  }
-
-  if (message)
-    free(message);
-
-  return result;
-}
-# endif
-
-static
-enum mad_flow error_default(void *data, struct mad_stream *stream,
-			    struct mad_frame *frame)
-{
-  int *bad_last_frame = data;
-
-  switch (stream->error) {
-  case MAD_ERROR_BADCRC:
-    if (*bad_last_frame)
-      mad_frame_mute(frame);
-    else
-      *bad_last_frame = 1;
-
-    return MAD_FLOW_IGNORE;
-
-  default:
-    return MAD_FLOW_CONTINUE;
-  }
-}
-
-static
-int run_sync(struct mad_decoder *decoder)
-{
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  void *error_data;
-  int bad_last_frame = 0;
-  struct mad_stream *stream;
-  struct mad_frame *frame;
-  struct mad_synth *synth;
-  int result = 0;
-
-  if (decoder->input_func == 0)
-    return 0;
-
-  if (decoder->error_func) {
-    error_func = decoder->error_func;
-    error_data = decoder->cb_data;
-  }
-  else {
-    error_func = error_default;
-    error_data = &bad_last_frame;
-  }
-
-  stream = &decoder->sync->stream;
-  frame  = &decoder->sync->frame;
-  synth  = &decoder->sync->synth;
-
-  mad_stream_init(stream);
-  mad_frame_init(frame);
-  mad_synth_init(synth);
-
-  mad_stream_options(stream, decoder->options);
-
-  do {
-    switch (decoder->input_func(decoder->cb_data, stream)) {
-    case MAD_FLOW_STOP:
-      goto done;
-    case MAD_FLOW_BREAK:
-      goto fail;
-    case MAD_FLOW_IGNORE:
-      continue;
-    case MAD_FLOW_CONTINUE:
-      break;
-    }
-
-    while (1) {
-# if defined(USE_ASYNC)
-      if (decoder->mode == MAD_DECODER_MODE_ASYNC) {
-	switch (check_message(decoder)) {
-	case MAD_FLOW_IGNORE:
-	case MAD_FLOW_CONTINUE:
-	  break;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_STOP:
-	  goto done;
-	}
-      }
-# endif
-
-      if (decoder->header_func) {
-	if (mad_header_decode(&frame->header, stream) == -1) {
-	  if (!MAD_RECOVERABLE(stream->error))
-	    break;
-
-	  switch (error_func(error_data, stream, frame)) {
-	  case MAD_FLOW_STOP:
-	    goto done;
-	  case MAD_FLOW_BREAK:
-	    goto fail;
-	  case MAD_FLOW_IGNORE:
-	  case MAD_FLOW_CONTINUE:
-	  default:
-	    continue;
-	  }
-	}
-
-	switch (decoder->header_func(decoder->cb_data, &frame->header)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	  continue;
-	case MAD_FLOW_CONTINUE:
-	  break;
-	}
-      }
-
-      if (mad_frame_decode(frame, stream) == -1) {
-	if (!MAD_RECOVERABLE(stream->error))
-	  break;
-
-	switch (error_func(error_data, stream, frame)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	  break;
-	case MAD_FLOW_CONTINUE:
-	default:
-	  continue;
-	}
-      }
-      else
-	bad_last_frame = 0;
-
-      if (decoder->filter_func) {
-	switch (decoder->filter_func(decoder->cb_data, stream, frame)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	  continue;
-	case MAD_FLOW_CONTINUE:
-	  break;
-	}
-      }
-
-      mad_synth_frame(synth, frame);
-
-      if (decoder->output_func) {
-	switch (decoder->output_func(decoder->cb_data,
-				     &frame->header, &synth->pcm)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	case MAD_FLOW_CONTINUE:
-	  break;
-	}
-      }
-    }
-  }
-  while (stream->error == MAD_ERROR_BUFLEN);
-
- fail:
-  result = -1;
-
- done:
-  mad_synth_finish(synth);
-  mad_frame_finish(frame);
-  mad_stream_finish(stream);
-
-  return result;
-}
-
-# if defined(USE_ASYNC)
-static
-int run_async(struct mad_decoder *decoder)
-{
-  pid_t pid;
-  int ptoc[2], ctop[2], flags;
-
-  if (pipe(ptoc) == -1)
-    return -1;
-
-  if (pipe(ctop) == -1) {
-    close(ptoc[0]);
-    close(ptoc[1]);
-    return -1;
-  }
-
-  flags = fcntl(ptoc[0], F_GETFL);
-  if (flags == -1 ||
-      fcntl(ptoc[0], F_SETFL, flags | O_NONBLOCK) == -1) {
-    close(ctop[0]);
-    close(ctop[1]);
-    close(ptoc[0]);
-    close(ptoc[1]);
-    return -1;
-  }
-
-  pid = fork();
-  if (pid == -1) {
-    close(ctop[0]);
-    close(ctop[1]);
-    close(ptoc[0]);
-    close(ptoc[1]);
-    return -1;
-  }
-
-  decoder->async.pid = pid;
-
-  if (pid) {
-    /* parent */
-
-    close(ptoc[0]);
-    close(ctop[1]);
-
-    decoder->async.in  = ctop[0];
-    decoder->async.out = ptoc[1];
-
-    return 0;
-  }
-
-  /* child */
-
-  close(ptoc[1]);
-  close(ctop[0]);
-
-  decoder->async.in  = ptoc[0];
-  decoder->async.out = ctop[1];
-
-  _exit(run_sync(decoder));
-
-  /* not reached */
-  return -1;
-}
-# endif
-
-/*
- * NAME:	decoder->run()
- * DESCRIPTION:	run the decoder thread either synchronously or asynchronously
- */
-int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
-{
-  int result;
-  int (*run)(struct mad_decoder *) = 0;
-
-  switch (decoder->mode = mode) {
-  case MAD_DECODER_MODE_SYNC:
-    run = run_sync;
-    break;
-
-  case MAD_DECODER_MODE_ASYNC:
-# if defined(USE_ASYNC)
-    run = run_async;
-# endif
-    break;
-  }
-
-  if (run == 0)
-    return -1;
-
-  decoder->sync = malloc(sizeof(*decoder->sync));
-  if (decoder->sync == 0)
-    return -1;
-
-  result = run(decoder);
-
-  free(decoder->sync);
-  decoder->sync = 0;
-
-  return result;
-}
-
-/*
- * NAME:	decoder->message()
- * DESCRIPTION:	send a message to and receive a reply from the decoder process
- */
-int mad_decoder_message(struct mad_decoder *decoder,
-			void *message, unsigned int *len)
-{
-# if defined(USE_ASYNC)
-  if (decoder->mode != MAD_DECODER_MODE_ASYNC ||
-      send(decoder->async.out, message, *len) != MAD_FLOW_CONTINUE ||
-      receive(decoder->async.in, &message, len) != MAD_FLOW_CONTINUE)
-    return -1;
-
-  return 0;
-# else
-  return -1;
-# endif
-}
diff --git a/code/libmad-0.15.1b/decoder.h b/code/libmad-0.15.1b/decoder.h
deleted file mode 100644
index f0ad758d..00000000
--- a/code/libmad-0.15.1b/decoder.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-# include "stream.h"
-# include "frame.h"
-# include "synth.h"
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
diff --git a/code/libmad-0.15.1b/depcomp b/code/libmad-0.15.1b/depcomp
deleted file mode 100644
index 51606f8c..00000000
--- a/code/libmad-0.15.1b/depcomp
+++ /dev/null
@@ -1,464 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/code/libmad-0.15.1b/fixed.c b/code/libmad-0.15.1b/fixed.c
deleted file mode 100644
index 9785466f..00000000
--- a/code/libmad-0.15.1b/fixed.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: fixed.c,v 1.13 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include "fixed.h"
-
-/*
- * NAME:	fixed->abs()
- * DESCRIPTION:	return absolute value of a fixed-point number
- */
-mad_fixed_t mad_f_abs(mad_fixed_t x)
-{
-  return x < 0 ? -x : x;
-}
-
-/*
- * NAME:	fixed->div()
- * DESCRIPTION:	perform division using fixed-point math
- */
-mad_fixed_t mad_f_div(mad_fixed_t x, mad_fixed_t y)
-{
-  mad_fixed_t q, r;
-  unsigned int bits;
-
-  q = mad_f_abs(x / y);
-
-  if (x < 0) {
-    x = -x;
-    y = -y;
-  }
-
-  r = x % y;
-
-  if (y < 0) {
-    x = -x;
-    y = -y;
-  }
-
-  if (q > mad_f_intpart(MAD_F_MAX) &&
-      !(q == -mad_f_intpart(MAD_F_MIN) && r == 0 && (x < 0) != (y < 0)))
-    return 0;
-
-  for (bits = MAD_F_FRACBITS; bits && r; --bits) {
-    q <<= 1, r <<= 1;
-    if (r >= y)
-      r -= y, ++q;
-  }
-
-  /* round */
-  if (2 * r >= y)
-    ++q;
-
-  /* fix sign */
-  if ((x < 0) != (y < 0))
-    q = -q;
-
-  return q << bits;
-}
diff --git a/code/libmad-0.15.1b/fixed.h b/code/libmad-0.15.1b/fixed.h
deleted file mode 100644
index 4b58abf5..00000000
--- a/code/libmad-0.15.1b/fixed.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp $
- */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   elif defined(OPT_INTEL)
-/*
- * Alternate Intel scaling that may or may not perform better.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrl %3,%1\n\t"  \
-	    "shll %4,%2\n\t"  \
-	    "orl %2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi),  \
-	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
diff --git a/code/libmad-0.15.1b/frame.c b/code/libmad-0.15.1b/frame.c
deleted file mode 100644
index 0cb3d0f3..00000000
--- a/code/libmad-0.15.1b/frame.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: frame.c,v 1.29 2004/02/04 22:59:19 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include <stdlib.h>
-
-# include "bit.h"
-# include "stream.h"
-# include "frame.h"
-# include "timer.h"
-# include "layer12.h"
-# include "layer3.h"
-
-static
-unsigned long const bitrate_table[5][15] = {
-  /* MPEG-1 */
-  { 0,  32000,  64000,  96000, 128000, 160000, 192000, 224000,  /* Layer I   */
-       256000, 288000, 320000, 352000, 384000, 416000, 448000 },
-  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer II  */
-       128000, 160000, 192000, 224000, 256000, 320000, 384000 },
-  { 0,  32000,  40000,  48000,  56000,  64000,  80000,  96000,  /* Layer III */
-       112000, 128000, 160000, 192000, 224000, 256000, 320000 },
-
-  /* MPEG-2 LSF */
-  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer I   */
-       128000, 144000, 160000, 176000, 192000, 224000, 256000 },
-  { 0,   8000,  16000,  24000,  32000,  40000,  48000,  56000,  /* Layers    */
-        64000,  80000,  96000, 112000, 128000, 144000, 160000 } /* II & III  */
-};
-
-static
-unsigned int const samplerate_table[3] = { 44100, 48000, 32000 };
-
-static
-int (*const decoder_table[3])(struct mad_stream *, struct mad_frame *) = {
-  mad_layer_I,
-  mad_layer_II,
-  mad_layer_III
-};
-
-/*
- * NAME:	header->init()
- * DESCRIPTION:	initialize header struct
- */
-void mad_header_init(struct mad_header *header)
-{
-  header->layer          = 0;
-  header->mode           = 0;
-  header->mode_extension = 0;
-  header->emphasis       = 0;
-
-  header->bitrate        = 0;
-  header->samplerate     = 0;
-
-  header->crc_check      = 0;
-  header->crc_target     = 0;
-
-  header->flags          = 0;
-  header->private_bits   = 0;
-
-  header->duration       = mad_timer_zero;
-}
-
-/*
- * NAME:	frame->init()
- * DESCRIPTION:	initialize frame struct
- */
-void mad_frame_init(struct mad_frame *frame)
-{
-  mad_header_init(&frame->header);
-
-  frame->options = 0;
-
-  frame->overlap = 0;
-  mad_frame_mute(frame);
-}
-
-/*
- * NAME:	frame->finish()
- * DESCRIPTION:	deallocate any dynamic memory associated with frame
- */
-void mad_frame_finish(struct mad_frame *frame)
-{
-  mad_header_finish(&frame->header);
-
-  if (frame->overlap) {
-    free(frame->overlap);
-    frame->overlap = 0;
-  }
-}
-
-/*
- * NAME:	decode_header()
- * DESCRIPTION:	read header data and following CRC word
- */
-static
-int decode_header(struct mad_header *header, struct mad_stream *stream)
-{
-  unsigned int index;
-
-  header->flags        = 0;
-  header->private_bits = 0;
-
-  /* header() */
-
-  /* syncword */
-  mad_bit_skip(&stream->ptr, 11);
-
-  /* MPEG 2.5 indicator (really part of syncword) */
-  if (mad_bit_read(&stream->ptr, 1) == 0)
-    header->flags |= MAD_FLAG_MPEG_2_5_EXT;
-
-  /* ID */
-  if (mad_bit_read(&stream->ptr, 1) == 0)
-    header->flags |= MAD_FLAG_LSF_EXT;
-  else if (header->flags & MAD_FLAG_MPEG_2_5_EXT) {
-    stream->error = MAD_ERROR_LOSTSYNC;
-    return -1;
-  }
-
-  /* layer */
-  header->layer = 4 - mad_bit_read(&stream->ptr, 2);
-
-  if (header->layer == 4) {
-    stream->error = MAD_ERROR_BADLAYER;
-    return -1;
-  }
-
-  /* protection_bit */
-  if (mad_bit_read(&stream->ptr, 1) == 0) {
-    header->flags    |= MAD_FLAG_PROTECTION;
-    header->crc_check = mad_bit_crc(stream->ptr, 16, 0xffff);
-  }
-
-  /* bitrate_index */
-  index = mad_bit_read(&stream->ptr, 4);
-
-  if (index == 15) {
-    stream->error = MAD_ERROR_BADBITRATE;
-    return -1;
-  }
-
-  if (header->flags & MAD_FLAG_LSF_EXT)
-    header->bitrate = bitrate_table[3 + (header->layer >> 1)][index];
-  else
-    header->bitrate = bitrate_table[header->layer - 1][index];
-
-  /* sampling_frequency */
-  index = mad_bit_read(&stream->ptr, 2);
-
-  if (index == 3) {
-    stream->error = MAD_ERROR_BADSAMPLERATE;
-    return -1;
-  }
-
-  header->samplerate = samplerate_table[index];
-
-  if (header->flags & MAD_FLAG_LSF_EXT) {
-    header->samplerate /= 2;
-
-    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
-      header->samplerate /= 2;
-  }
-
-  /* padding_bit */
-  if (mad_bit_read(&stream->ptr, 1))
-    header->flags |= MAD_FLAG_PADDING;
-
-  /* private_bit */
-  if (mad_bit_read(&stream->ptr, 1))
-    header->private_bits |= MAD_PRIVATE_HEADER;
-
-  /* mode */
-  header->mode = 3 - mad_bit_read(&stream->ptr, 2);
-
-  /* mode_extension */
-  header->mode_extension = mad_bit_read(&stream->ptr, 2);
-
-  /* copyright */
-  if (mad_bit_read(&stream->ptr, 1))
-    header->flags |= MAD_FLAG_COPYRIGHT;
-
-  /* original/copy */
-  if (mad_bit_read(&stream->ptr, 1))
-    header->flags |= MAD_FLAG_ORIGINAL;
-
-  /* emphasis */
-  header->emphasis = mad_bit_read(&stream->ptr, 2);
-
-# if defined(OPT_STRICT)
-  /*
-   * ISO/IEC 11172-3 says this is a reserved emphasis value, but
-   * streams exist which use it anyway. Since the value is not important
-   * to the decoder proper, we allow it unless OPT_STRICT is defined.
-   */
-  if (header->emphasis == MAD_EMPHASIS_RESERVED) {
-    stream->error = MAD_ERROR_BADEMPHASIS;
-    return -1;
-  }
-# endif
-
-  /* error_check() */
-
-  /* crc_check */
-  if (header->flags & MAD_FLAG_PROTECTION)
-    header->crc_target = mad_bit_read(&stream->ptr, 16);
-
-  return 0;
-}
-
-/*
- * NAME:	free_bitrate()
- * DESCRIPTION:	attempt to discover the bitstream's free bitrate
- */
-static
-int free_bitrate(struct mad_stream *stream, struct mad_header const *header)
-{
-  struct mad_bitptr keep_ptr;
-  unsigned long rate = 0;
-  unsigned int pad_slot, slots_per_frame;
-  unsigned char const *ptr = 0;
-
-  keep_ptr = stream->ptr;
-
-  pad_slot = (header->flags & MAD_FLAG_PADDING) ? 1 : 0;
-  slots_per_frame = (header->layer == MAD_LAYER_III &&
-		     (header->flags & MAD_FLAG_LSF_EXT)) ? 72 : 144;
-
-  while (mad_stream_sync(stream) == 0) {
-    struct mad_stream peek_stream;
-    struct mad_header peek_header;
-
-    peek_stream = *stream;
-    peek_header = *header;
-
-    if (decode_header(&peek_header, &peek_stream) == 0 &&
-	peek_header.layer == header->layer &&
-	peek_header.samplerate == header->samplerate) {
-      unsigned int N;
-
-      ptr = mad_bit_nextbyte(&stream->ptr);
-
-      N = ptr - stream->this_frame;
-
-      if (header->layer == MAD_LAYER_I) {
-	rate = (unsigned long) header->samplerate *
-	  (N - 4 * pad_slot + 4) / 48 / 1000;
-      }
-      else {
-	rate = (unsigned long) header->samplerate *
-	  (N - pad_slot + 1) / slots_per_frame / 1000;
-      }
-
-      if (rate >= 8)
-	break;
-    }
-
-    mad_bit_skip(&stream->ptr, 8);
-  }
-
-  stream->ptr = keep_ptr;
-
-  if (rate < 8 || (header->layer == MAD_LAYER_III && rate > 640)) {
-    stream->error = MAD_ERROR_LOSTSYNC;
-    return -1;
-  }
-
-  stream->freerate = rate * 1000;
-
-  return 0;
-}
-
-/*
- * NAME:	header->decode()
- * DESCRIPTION:	read the next frame header from the stream
- */
-int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
-{
-  register unsigned char const *ptr, *end;
-  unsigned int pad_slot, N;
-
-  ptr = stream->next_frame;
-  end = stream->bufend;
-
-  if (ptr == 0) {
-    stream->error = MAD_ERROR_BUFPTR;
-    goto fail;
-  }
-
-  /* stream skip */
-  if (stream->skiplen) {
-    if (!stream->sync)
-      ptr = stream->this_frame;
-
-    if (end - ptr < stream->skiplen) {
-      stream->skiplen   -= end - ptr;
-      stream->next_frame = end;
-
-      stream->error = MAD_ERROR_BUFLEN;
-      goto fail;
-    }
-
-    ptr += stream->skiplen;
-    stream->skiplen = 0;
-
-    stream->sync = 1;
-  }
-
- sync:
-  /* synchronize */
-  if (stream->sync) {
-    if (end - ptr < MAD_BUFFER_GUARD) {
-      stream->next_frame = ptr;
-
-      stream->error = MAD_ERROR_BUFLEN;
-      goto fail;
-    }
-    else if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
-      /* mark point where frame sync word was expected */
-      stream->this_frame = ptr;
-      stream->next_frame = ptr + 1;
-
-      stream->error = MAD_ERROR_LOSTSYNC;
-      goto fail;
-    }
-  }
-  else {
-    mad_bit_init(&stream->ptr, ptr);
-
-    if (mad_stream_sync(stream) == -1) {
-      if (end - stream->next_frame >= MAD_BUFFER_GUARD)
-	stream->next_frame = end - MAD_BUFFER_GUARD;
-
-      stream->error = MAD_ERROR_BUFLEN;
-      goto fail;
-    }
-
-    ptr = mad_bit_nextbyte(&stream->ptr);
-  }
-
-  /* begin processing */
-  stream->this_frame = ptr;
-  stream->next_frame = ptr + 1;  /* possibly bogus sync word */
-
-  mad_bit_init(&stream->ptr, stream->this_frame);
-
-  if (decode_header(header, stream) == -1)
-    goto fail;
-
-  /* calculate frame duration */
-  mad_timer_set(&header->duration, 0,
-		32 * MAD_NSBSAMPLES(header), header->samplerate);
-
-  /* calculate free bit rate */
-  if (header->bitrate == 0) {
-    if ((stream->freerate == 0 || !stream->sync ||
-	 (header->layer == MAD_LAYER_III && stream->freerate > 640000)) &&
-	free_bitrate(stream, header) == -1)
-      goto fail;
-
-    header->bitrate = stream->freerate;
-    header->flags  |= MAD_FLAG_FREEFORMAT;
-  }
-
-  /* calculate beginning of next frame */
-  pad_slot = (header->flags & MAD_FLAG_PADDING) ? 1 : 0;
-
-  if (header->layer == MAD_LAYER_I)
-    N = ((12 * header->bitrate / header->samplerate) + pad_slot) * 4;
-  else {
-    unsigned int slots_per_frame;
-
-    slots_per_frame = (header->layer == MAD_LAYER_III &&
-		       (header->flags & MAD_FLAG_LSF_EXT)) ? 72 : 144;
-
-    N = (slots_per_frame * header->bitrate / header->samplerate) + pad_slot;
-  }
-
-  /* verify there is enough data left in buffer to decode this frame */
-  if (N + MAD_BUFFER_GUARD > end - stream->this_frame) {
-    stream->next_frame = stream->this_frame;
-
-    stream->error = MAD_ERROR_BUFLEN;
-    goto fail;
-  }
-
-  stream->next_frame = stream->this_frame + N;
-
-  if (!stream->sync) {
-    /* check that a valid frame header follows this frame */
-
-    ptr = stream->next_frame;
-    if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
-      ptr = stream->next_frame = stream->this_frame + 1;
-      goto sync;
-    }
-
-    stream->sync = 1;
-  }
-
-  header->flags |= MAD_FLAG_INCOMPLETE;
-
-  return 0;
-
- fail:
-  stream->sync = 0;
-
-  return -1;
-}
-
-/*
- * NAME:	frame->decode()
- * DESCRIPTION:	decode a single frame from a bitstream
- */
-int mad_frame_decode(struct mad_frame *frame, struct mad_stream *stream)
-{
-  frame->options = stream->options;
-
-  /* header() */
-  /* error_check() */
-
-  if (!(frame->header.flags & MAD_FLAG_INCOMPLETE) &&
-      mad_header_decode(&frame->header, stream) == -1)
-    goto fail;
-
-  /* audio_data() */
-
-  frame->header.flags &= ~MAD_FLAG_INCOMPLETE;
-
-  if (decoder_table[frame->header.layer - 1](stream, frame) == -1) {
-    if (!MAD_RECOVERABLE(stream->error))
-      stream->next_frame = stream->this_frame;
-
-    goto fail;
-  }
-
-  /* ancillary_data() */
-
-  if (frame->header.layer != MAD_LAYER_III) {
-    struct mad_bitptr next_frame;
-
-    mad_bit_init(&next_frame, stream->next_frame);
-
-    stream->anc_ptr    = stream->ptr;
-    stream->anc_bitlen = mad_bit_length(&stream->ptr, &next_frame);
-
-    mad_bit_finish(&next_frame);
-  }
-
-  return 0;
-
- fail:
-  stream->anc_bitlen = 0;
-  return -1;
-}
-
-/*
- * NAME:	frame->mute()
- * DESCRIPTION:	zero all subband values so the frame becomes silent
- */
-void mad_frame_mute(struct mad_frame *frame)
-{
-  unsigned int s, sb;
-
-  for (s = 0; s < 36; ++s) {
-    for (sb = 0; sb < 32; ++sb) {
-      frame->sbsample[0][s][sb] =
-      frame->sbsample[1][s][sb] = 0;
-    }
-  }
-
-  if (frame->overlap) {
-    for (s = 0; s < 18; ++s) {
-      for (sb = 0; sb < 32; ++sb) {
-	(*frame->overlap)[0][sb][s] =
-	(*frame->overlap)[1][sb][s] = 0;
-      }
-    }
-  }
-}
diff --git a/code/libmad-0.15.1b/frame.h b/code/libmad-0.15.1b/frame.h
deleted file mode 100644
index 3f5bf37e..00000000
--- a/code/libmad-0.15.1b/frame.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-# include "fixed.h"
-# include "timer.h"
-# include "stream.h"
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
diff --git a/code/libmad-0.15.1b/global.h b/code/libmad-0.15.1b/global.h
deleted file mode 100644
index a6debfd8..00000000
--- a/code/libmad-0.15.1b/global.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: global.h,v 1.11 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_GLOBAL_H
-# define LIBMAD_GLOBAL_H
-
-/* conditional debugging */
-
-# if defined(DEBUG) && defined(NDEBUG)
-#  error "cannot define both DEBUG and NDEBUG"
-# endif
-
-# if defined(DEBUG)
-#  include <stdio.h>
-# endif
-
-/* conditional features */
-
-# if defined(OPT_SPEED) && defined(OPT_ACCURACY)
-#  error "cannot optimize for both speed and accuracy"
-# endif
-
-# if defined(OPT_SPEED) && !defined(OPT_SSO)
-#  define OPT_SSO
-# endif
-
-# if defined(HAVE_UNISTD_H) && defined(HAVE_WAITPID) &&  \
-    defined(HAVE_FCNTL) && defined(HAVE_PIPE) && defined(HAVE_FORK)
-#  define USE_ASYNC
-# endif
-
-# if !defined(HAVE_ASSERT_H)
-#  if defined(NDEBUG)
-#   define assert(x)	/* nothing */
-#  else
-#   define assert(x)	do { if (!(x)) abort(); } while (0)
-#  endif
-# endif
-
-# endif
diff --git a/code/libmad-0.15.1b/huffman.c b/code/libmad-0.15.1b/huffman.c
deleted file mode 100644
index a230a9c1..00000000
--- a/code/libmad-0.15.1b/huffman.c
+++ /dev/null
@@ -1,3109 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: huffman.c,v 1.10 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include "huffman.h"
-
-/*
- * These are the Huffman code words for Layer III.
- * The data for these tables are derived from Table B.7 of ISO/IEC 11172-3.
- *
- * These tables support decoding up to 4 Huffman code bits at a time.
- */
-
-# if defined(__GNUC__) ||  \
-    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901)
-#  define PTR(offs, bits)	{ .ptr   = { 0, bits, offs       } }
-#  define V(v, w, x, y, hlen)	{ .value = { 1, hlen, v, w, x, y } }
-# else
-#  define PTR(offs, bits)	{ { 0, bits, offs } }
-#  if defined(WORDS_BIGENDIAN)
-#   define V(v, w, x, y, hlen)	{ { 1, hlen, (v << 11) | (w << 10) |  \
-                                             (x <<  9) | (y <<  8) } }
-#  else
-#   define V(v, w, x, y, hlen)	{ { 1, hlen, (v <<  0) | (w <<  1) |  \
-                                             (x <<  2) | (y <<  3) } }
-#  endif
-# endif
-
-static
-union huffquad const hufftabA[] = {
-  /* 0000 */ PTR(16, 2),
-  /* 0001 */ PTR(20, 2),
-  /* 0010 */ PTR(24, 1),
-  /* 0011 */ PTR(26, 1),
-  /* 0100 */ V(0, 0, 1, 0, 4),
-  /* 0101 */ V(0, 0, 0, 1, 4),
-  /* 0110 */ V(0, 1, 0, 0, 4),
-  /* 0111 */ V(1, 0, 0, 0, 4),
-  /* 1000 */ V(0, 0, 0, 0, 1),
-  /* 1001 */ V(0, 0, 0, 0, 1),
-  /* 1010 */ V(0, 0, 0, 0, 1),
-  /* 1011 */ V(0, 0, 0, 0, 1),
-  /* 1100 */ V(0, 0, 0, 0, 1),
-  /* 1101 */ V(0, 0, 0, 0, 1),
-  /* 1110 */ V(0, 0, 0, 0, 1),
-  /* 1111 */ V(0, 0, 0, 0, 1),
-
-  /* 0000 ... */
-  /* 00   */ V(1, 0, 1, 1, 2),	/* 16 */
-  /* 01   */ V(1, 1, 1, 1, 2),
-  /* 10   */ V(1, 1, 0, 1, 2),
-  /* 11   */ V(1, 1, 1, 0, 2),
-
-  /* 0001 ... */
-  /* 00   */ V(0, 1, 1, 1, 2),	/* 20 */
-  /* 01   */ V(0, 1, 0, 1, 2),
-  /* 10   */ V(1, 0, 0, 1, 1),
-  /* 11   */ V(1, 0, 0, 1, 1),
-
-  /* 0010 ... */
-  /* 0    */ V(0, 1, 1, 0, 1),	/* 24 */
-  /* 1    */ V(0, 0, 1, 1, 1),
-
-  /* 0011 ... */
-  /* 0    */ V(1, 0, 1, 0, 1),	/* 26 */
-  /* 1    */ V(1, 1, 0, 0, 1)
-};
-
-static
-union huffquad const hufftabB[] = {
-  /* 0000 */ V(1, 1, 1, 1, 4),
-  /* 0001 */ V(1, 1, 1, 0, 4),
-  /* 0010 */ V(1, 1, 0, 1, 4),
-  /* 0011 */ V(1, 1, 0, 0, 4),
-  /* 0100 */ V(1, 0, 1, 1, 4),
-  /* 0101 */ V(1, 0, 1, 0, 4),
-  /* 0110 */ V(1, 0, 0, 1, 4),
-  /* 0111 */ V(1, 0, 0, 0, 4),
-  /* 1000 */ V(0, 1, 1, 1, 4),
-  /* 1001 */ V(0, 1, 1, 0, 4),
-  /* 1010 */ V(0, 1, 0, 1, 4),
-  /* 1011 */ V(0, 1, 0, 0, 4),
-  /* 1100 */ V(0, 0, 1, 1, 4),
-  /* 1101 */ V(0, 0, 1, 0, 4),
-  /* 1110 */ V(0, 0, 0, 1, 4),
-  /* 1111 */ V(0, 0, 0, 0, 4)
-};
-
-# undef V
-# undef PTR
-
-# if defined(__GNUC__) ||  \
-    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901)
-#  define PTR(offs, bits)	{ .ptr   = { 0, bits, offs } }
-#  define V(x, y, hlen)		{ .value = { 1, hlen, x, y } }
-# else
-#  define PTR(offs, bits)	{ { 0, bits, offs } }
-#  if defined(WORDS_BIGENDIAN)
-#   define V(x, y, hlen)	{ { 1, hlen, (x << 8) | (y << 4) } }
-#  else
-#   define V(x, y, hlen)	{ { 1, hlen, (x << 0) | (y << 4) } }
-#  endif
-# endif
-
-static
-union huffpair const hufftab0[] = {
-  /*      */ V(0, 0, 0)
-};
-
-static
-union huffpair const hufftab1[] = {
-  /* 000  */ V(1, 1, 3),
-  /* 001  */ V(0, 1, 3),
-  /* 010  */ V(1, 0, 2),
-  /* 011  */ V(1, 0, 2),
-  /* 100  */ V(0, 0, 1),
-  /* 101  */ V(0, 0, 1),
-  /* 110  */ V(0, 0, 1),
-  /* 111  */ V(0, 0, 1)
-};
-
-static
-union huffpair const hufftab2[] = {
-  /* 000  */ PTR(8, 3),
-  /* 001  */ V(1, 1, 3),
-  /* 010  */ V(0, 1, 3),
-  /* 011  */ V(1, 0, 3),
-  /* 100  */ V(0, 0, 1),
-  /* 101  */ V(0, 0, 1),
-  /* 110  */ V(0, 0, 1),
-  /* 111  */ V(0, 0, 1),
-
-  /* 000 ... */
-  /* 000  */ V(2, 2, 3),	/* 8 */
-  /* 001  */ V(0, 2, 3),
-  /* 010  */ V(1, 2, 2),
-  /* 011  */ V(1, 2, 2),
-  /* 100  */ V(2, 1, 2),
-  /* 101  */ V(2, 1, 2),
-  /* 110  */ V(2, 0, 2),
-  /* 111  */ V(2, 0, 2)
-};
-
-static
-union huffpair const hufftab3[] = {
-  /* 000  */ PTR(8, 3),
-  /* 001  */ V(1, 0, 3),
-  /* 010  */ V(1, 1, 2),
-  /* 011  */ V(1, 1, 2),
-  /* 100  */ V(0, 1, 2),
-  /* 101  */ V(0, 1, 2),
-  /* 110  */ V(0, 0, 2),
-  /* 111  */ V(0, 0, 2),
-
-  /* 000 ... */
-  /* 000  */ V(2, 2, 3),	/* 8 */
-  /* 001  */ V(0, 2, 3),
-  /* 010  */ V(1, 2, 2),
-  /* 011  */ V(1, 2, 2),
-  /* 100  */ V(2, 1, 2),
-  /* 101  */ V(2, 1, 2),
-  /* 110  */ V(2, 0, 2),
-  /* 111  */ V(2, 0, 2)
-};
-
-static
-union huffpair const hufftab5[] = {
-  /* 000  */ PTR(8, 4),
-  /* 001  */ V(1, 1, 3),
-  /* 010  */ V(0, 1, 3),
-  /* 011  */ V(1, 0, 3),
-  /* 100  */ V(0, 0, 1),
-  /* 101  */ V(0, 0, 1),
-  /* 110  */ V(0, 0, 1),
-  /* 111  */ V(0, 0, 1),
-
-  /* 000 ... */
-  /* 0000 */ PTR(24, 1),	/* 8 */
-  /* 0001 */ V(3, 2, 4),
-  /* 0010 */ V(3, 1, 3),
-  /* 0011 */ V(3, 1, 3),
-  /* 0100 */ V(1, 3, 4),
-  /* 0101 */ V(0, 3, 4),
-  /* 0110 */ V(3, 0, 4),
-  /* 0111 */ V(2, 2, 4),
-  /* 1000 */ V(1, 2, 3),
-  /* 1001 */ V(1, 2, 3),
-  /* 1010 */ V(2, 1, 3),
-  /* 1011 */ V(2, 1, 3),
-  /* 1100 */ V(0, 2, 3),
-  /* 1101 */ V(0, 2, 3),
-  /* 1110 */ V(2, 0, 3),
-  /* 1111 */ V(2, 0, 3),
-
-  /* 000 0000 ... */
-  /* 0    */ V(3, 3, 1),	/* 24 */
-  /* 1    */ V(2, 3, 1)
-};
-
-static
-union huffpair const hufftab6[] = {
-  /* 0000 */ PTR(16, 3),
-  /* 0001 */ PTR(24, 1),
-  /* 0010 */ PTR(26, 1),
-  /* 0011 */ V(1, 2, 4),
-  /* 0100 */ V(2, 1, 4),
-  /* 0101 */ V(2, 0, 4),
-  /* 0110 */ V(0, 1, 3),
-  /* 0111 */ V(0, 1, 3),
-  /* 1000 */ V(1, 1, 2),
-  /* 1001 */ V(1, 1, 2),
-  /* 1010 */ V(1, 1, 2),
-  /* 1011 */ V(1, 1, 2),
-  /* 1100 */ V(1, 0, 3),
-  /* 1101 */ V(1, 0, 3),
-  /* 1110 */ V(0, 0, 3),
-  /* 1111 */ V(0, 0, 3),
-
-  /* 0000 ... */
-  /* 000  */ V(3, 3, 3),	/* 16 */
-  /* 001  */ V(0, 3, 3),
-  /* 010  */ V(2, 3, 2),
-  /* 011  */ V(2, 3, 2),
-  /* 100  */ V(3, 2, 2),
-  /* 101  */ V(3, 2, 2),
-  /* 110  */ V(3, 0, 2),
-  /* 111  */ V(3, 0, 2),
-
-  /* 0001 ... */
-  /* 0    */ V(1, 3, 1),	/* 24 */
-  /* 1    */ V(3, 1, 1),
-
-  /* 0010 ... */
-  /* 0    */ V(2, 2, 1),	/* 26 */
-  /* 1    */ V(0, 2, 1)
-};
-
-static
-union huffpair const hufftab7[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 2),
-  /* 0011 */ V(1, 1, 4),
-  /* 0100 */ V(0, 1, 3),
-  /* 0101 */ V(0, 1, 3),
-  /* 0110 */ V(1, 0, 3),
-  /* 0111 */ V(1, 0, 3),
-  /* 1000 */ V(0, 0, 1),
-  /* 1001 */ V(0, 0, 1),
-  /* 1010 */ V(0, 0, 1),
-  /* 1011 */ V(0, 0, 1),
-  /* 1100 */ V(0, 0, 1),
-  /* 1101 */ V(0, 0, 1),
-  /* 1110 */ V(0, 0, 1),
-  /* 1111 */ V(0, 0, 1),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(52, 2),	/* 16 */
-  /* 0001 */ PTR(56, 1),
-  /* 0010 */ PTR(58, 1),
-  /* 0011 */ V(1, 5, 4),
-  /* 0100 */ V(5, 1, 4),
-  /* 0101 */ PTR(60, 1),
-  /* 0110 */ V(5, 0, 4),
-  /* 0111 */ PTR(62, 1),
-  /* 1000 */ V(2, 4, 4),
-  /* 1001 */ V(4, 2, 4),
-  /* 1010 */ V(1, 4, 3),
-  /* 1011 */ V(1, 4, 3),
-  /* 1100 */ V(4, 1, 3),
-  /* 1101 */ V(4, 1, 3),
-  /* 1110 */ V(4, 0, 3),
-  /* 1111 */ V(4, 0, 3),
-
-  /* 0001 ... */
-  /* 0000 */ V(0, 4, 4),	/* 32 */
-  /* 0001 */ V(2, 3, 4),
-  /* 0010 */ V(3, 2, 4),
-  /* 0011 */ V(0, 3, 4),
-  /* 0100 */ V(1, 3, 3),
-  /* 0101 */ V(1, 3, 3),
-  /* 0110 */ V(3, 1, 3),
-  /* 0111 */ V(3, 1, 3),
-  /* 1000 */ V(3, 0, 3),
-  /* 1001 */ V(3, 0, 3),
-  /* 1010 */ V(2, 2, 3),
-  /* 1011 */ V(2, 2, 3),
-  /* 1100 */ V(1, 2, 2),
-  /* 1101 */ V(1, 2, 2),
-  /* 1110 */ V(1, 2, 2),
-  /* 1111 */ V(1, 2, 2),
-
-  /* 0010 ... */
-  /* 00   */ V(2, 1, 1),	/* 48 */
-  /* 01   */ V(2, 1, 1),
-  /* 10   */ V(0, 2, 2),
-  /* 11   */ V(2, 0, 2),
-
-  /* 0000 0000 ... */
-  /* 00   */ V(5, 5, 2),	/* 52 */
-  /* 01   */ V(4, 5, 2),
-  /* 10   */ V(5, 4, 2),
-  /* 11   */ V(5, 3, 2),
-
-  /* 0000 0001 ... */
-  /* 0    */ V(3, 5, 1),	/* 56 */
-  /* 1    */ V(4, 4, 1),
-
-  /* 0000 0010 ... */
-  /* 0    */ V(2, 5, 1),	/* 58 */
-  /* 1    */ V(5, 2, 1),
-
-  /* 0000 0101 ... */
-  /* 0    */ V(0, 5, 1),	/* 60 */
-  /* 1    */ V(3, 4, 1),
-
-  /* 0000 0111 ... */
-  /* 0    */ V(4, 3, 1),	/* 62 */
-  /* 1    */ V(3, 3, 1)
-};
-
-# if 0
-/* this version saves 8 entries (16 bytes) at the expense of
-   an extra lookup in 4 out of 36 cases */
-static
-union huffpair const hufftab8[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 2),
-  /* 0010 */ V(1, 2, 4),
-  /* 0011 */ V(2, 1, 4),
-  /* 0100 */ V(1, 1, 2),
-  /* 0101 */ V(1, 1, 2),
-  /* 0110 */ V(1, 1, 2),
-  /* 0111 */ V(1, 1, 2),
-  /* 1000 */ V(0, 1, 3),
-  /* 1001 */ V(0, 1, 3),
-  /* 1010 */ V(1, 0, 3),
-  /* 1011 */ V(1, 0, 3),
-  /* 1100 */ V(0, 0, 2),
-  /* 1101 */ V(0, 0, 2),
-  /* 1110 */ V(0, 0, 2),
-  /* 1111 */ V(0, 0, 2),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(36, 3),	/* 16 */
-  /* 0001 */ PTR(44, 2),
-  /* 0010 */ PTR(48, 1),
-  /* 0011 */ V(1, 5, 4),
-  /* 0100 */ V(5, 1, 4),
-  /* 0101 */ PTR(50, 1),
-  /* 0110 */ PTR(52, 1),
-  /* 0111 */ V(2, 4, 4),
-  /* 1000 */ V(4, 2, 4),
-  /* 1001 */ V(1, 4, 4),
-  /* 1010 */ V(4, 1, 3),
-  /* 1011 */ V(4, 1, 3),
-  /* 1100 */ V(0, 4, 4),
-  /* 1101 */ V(4, 0, 4),
-  /* 1110 */ V(2, 3, 4),
-  /* 1111 */ V(3, 2, 4),
-
-  /* 0001 ... */
-  /* 00   */ PTR(54, 2),	/* 32 */
-  /* 01   */ V(2, 2, 2),
-  /* 10   */ V(0, 2, 2),
-  /* 11   */ V(2, 0, 2),
-
-  /* 0000 0000 ... */
-  /* 000  */ V(5, 5, 3),	/* 36 */
-  /* 001  */ V(5, 4, 3),
-  /* 010  */ V(4, 5, 2),
-  /* 011  */ V(4, 5, 2),
-  /* 100  */ V(5, 3, 1),
-  /* 101  */ V(5, 3, 1),
-  /* 110  */ V(5, 3, 1),
-  /* 111  */ V(5, 3, 1),
-
-  /* 0000 0001 ... */
-  /* 00   */ V(3, 5, 2),	/* 44 */
-  /* 01   */ V(4, 4, 2),
-  /* 10   */ V(2, 5, 1),
-  /* 11   */ V(2, 5, 1),
-
-  /* 0000 0010 ... */
-  /* 0    */ V(5, 2, 1),	/* 48 */
-  /* 1    */ V(0, 5, 1),
-
-  /* 0000 0101 ... */
-  /* 0    */ V(3, 4, 1),	/* 50 */
-  /* 1    */ V(4, 3, 1),
-
-  /* 0000 0110 ... */
-  /* 0    */ V(5, 0, 1),	/* 52 */
-  /* 1    */ V(3, 3, 1),
-
-  /* 0001 00 ... */
-  /* 00   */ V(1, 3, 2),	/* 54 */
-  /* 01   */ V(3, 1, 2),
-  /* 10   */ V(0, 3, 2),
-  /* 11   */ V(3, 0, 2),
-};
-# else
-static
-union huffpair const hufftab8[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ V(1, 2, 4),
-  /* 0011 */ V(2, 1, 4),
-  /* 0100 */ V(1, 1, 2),
-  /* 0101 */ V(1, 1, 2),
-  /* 0110 */ V(1, 1, 2),
-  /* 0111 */ V(1, 1, 2),
-  /* 1000 */ V(0, 1, 3),
-  /* 1001 */ V(0, 1, 3),
-  /* 1010 */ V(1, 0, 3),
-  /* 1011 */ V(1, 0, 3),
-  /* 1100 */ V(0, 0, 2),
-  /* 1101 */ V(0, 0, 2),
-  /* 1110 */ V(0, 0, 2),
-  /* 1111 */ V(0, 0, 2),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(48, 3),	/* 16 */
-  /* 0001 */ PTR(56, 2),
-  /* 0010 */ PTR(60, 1),
-  /* 0011 */ V(1, 5, 4),
-  /* 0100 */ V(5, 1, 4),
-  /* 0101 */ PTR(62, 1),
-  /* 0110 */ PTR(64, 1),
-  /* 0111 */ V(2, 4, 4),
-  /* 1000 */ V(4, 2, 4),
-  /* 1001 */ V(1, 4, 4),
-  /* 1010 */ V(4, 1, 3),
-  /* 1011 */ V(4, 1, 3),
-  /* 1100 */ V(0, 4, 4),
-  /* 1101 */ V(4, 0, 4),
-  /* 1110 */ V(2, 3, 4),
-  /* 1111 */ V(3, 2, 4),
-
-  /* 0001 ... */
-  /* 0000 */ V(1, 3, 4),	/* 32 */
-  /* 0001 */ V(3, 1, 4),
-  /* 0010 */ V(0, 3, 4),
-  /* 0011 */ V(3, 0, 4),
-  /* 0100 */ V(2, 2, 2),
-  /* 0101 */ V(2, 2, 2),
-  /* 0110 */ V(2, 2, 2),
-  /* 0111 */ V(2, 2, 2),
-  /* 1000 */ V(0, 2, 2),
-  /* 1001 */ V(0, 2, 2),
-  /* 1010 */ V(0, 2, 2),
-  /* 1011 */ V(0, 2, 2),
-  /* 1100 */ V(2, 0, 2),
-  /* 1101 */ V(2, 0, 2),
-  /* 1110 */ V(2, 0, 2),
-  /* 1111 */ V(2, 0, 2),
-
-  /* 0000 0000 ... */
-  /* 000  */ V(5, 5, 3),	/* 48 */
-  /* 001  */ V(5, 4, 3),
-  /* 010  */ V(4, 5, 2),
-  /* 011  */ V(4, 5, 2),
-  /* 100  */ V(5, 3, 1),
-  /* 101  */ V(5, 3, 1),
-  /* 110  */ V(5, 3, 1),
-  /* 111  */ V(5, 3, 1),
-
-  /* 0000 0001 ... */
-  /* 00   */ V(3, 5, 2),	/* 56 */
-  /* 01   */ V(4, 4, 2),
-  /* 10   */ V(2, 5, 1),
-  /* 11   */ V(2, 5, 1),
-
-  /* 0000 0010 ... */
-  /* 0    */ V(5, 2, 1),	/* 60 */
-  /* 1    */ V(0, 5, 1),
-
-  /* 0000 0101 ... */
-  /* 0    */ V(3, 4, 1),	/* 62 */
-  /* 1    */ V(4, 3, 1),
-
-  /* 0000 0110 ... */
-  /* 0    */ V(5, 0, 1),	/* 64 */
-  /* 1    */ V(3, 3, 1)
-};
-# endif
-
-static
-union huffpair const hufftab9[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 3),
-  /* 0010 */ PTR(40, 2),
-  /* 0011 */ PTR(44, 2),
-  /* 0100 */ PTR(48, 1),
-  /* 0101 */ V(1, 2, 4),
-  /* 0110 */ V(2, 1, 4),
-  /* 0111 */ V(2, 0, 4),
-  /* 1000 */ V(1, 1, 3),
-  /* 1001 */ V(1, 1, 3),
-  /* 1010 */ V(0, 1, 3),
-  /* 1011 */ V(0, 1, 3),
-  /* 1100 */ V(1, 0, 3),
-  /* 1101 */ V(1, 0, 3),
-  /* 1110 */ V(0, 0, 3),
-  /* 1111 */ V(0, 0, 3),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(50, 1),	/* 16 */
-  /* 0001 */ V(3, 5, 4),
-  /* 0010 */ V(5, 3, 4),
-  /* 0011 */ PTR(52, 1),
-  /* 0100 */ V(4, 4, 4),
-  /* 0101 */ V(2, 5, 4),
-  /* 0110 */ V(5, 2, 4),
-  /* 0111 */ V(1, 5, 4),
-  /* 1000 */ V(5, 1, 3),
-  /* 1001 */ V(5, 1, 3),
-  /* 1010 */ V(3, 4, 3),
-  /* 1011 */ V(3, 4, 3),
-  /* 1100 */ V(4, 3, 3),
-  /* 1101 */ V(4, 3, 3),
-  /* 1110 */ V(5, 0, 4),
-  /* 1111 */ V(0, 4, 4),
-
-  /* 0001 ... */
-  /* 000  */ V(2, 4, 3),	/* 32 */
-  /* 001  */ V(4, 2, 3),
-  /* 010  */ V(3, 3, 3),
-  /* 011  */ V(4, 0, 3),
-  /* 100  */ V(1, 4, 2),
-  /* 101  */ V(1, 4, 2),
-  /* 110  */ V(4, 1, 2),
-  /* 111  */ V(4, 1, 2),
-
-  /* 0010 ... */
-  /* 00   */ V(2, 3, 2),	/* 40 */
-  /* 01   */ V(3, 2, 2),
-  /* 10   */ V(1, 3, 1),
-  /* 11   */ V(1, 3, 1),
-
-  /* 0011 ... */
-  /* 00   */ V(3, 1, 1),	/* 44 */
-  /* 01   */ V(3, 1, 1),
-  /* 10   */ V(0, 3, 2),
-  /* 11   */ V(3, 0, 2),
-
-  /* 0100 ... */
-  /* 0    */ V(2, 2, 1),	/* 48 */
-  /* 1    */ V(0, 2, 1),
-
-  /* 0000 0000 ... */
-  /* 0    */ V(5, 5, 1),	/* 50 */
-  /* 1    */ V(4, 5, 1),
-
-  /* 0000 0011 ... */
-  /* 0    */ V(5, 4, 1),	/* 52 */
-  /* 1    */ V(0, 5, 1)
-};
-
-static
-union huffpair const hufftab10[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 2),
-  /* 0011 */ V(1, 1, 4),
-  /* 0100 */ V(0, 1, 3),
-  /* 0101 */ V(0, 1, 3),
-  /* 0110 */ V(1, 0, 3),
-  /* 0111 */ V(1, 0, 3),
-  /* 1000 */ V(0, 0, 1),
-  /* 1001 */ V(0, 0, 1),
-  /* 1010 */ V(0, 0, 1),
-  /* 1011 */ V(0, 0, 1),
-  /* 1100 */ V(0, 0, 1),
-  /* 1101 */ V(0, 0, 1),
-  /* 1110 */ V(0, 0, 1),
-  /* 1111 */ V(0, 0, 1),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(52, 3),	/* 16 */
-  /* 0001 */ PTR(60, 2),
-  /* 0010 */ PTR(64, 3),
-  /* 0011 */ PTR(72, 1),
-  /* 0100 */ PTR(74, 2),
-  /* 0101 */ PTR(78, 2),
-  /* 0110 */ PTR(82, 2),
-  /* 0111 */ V(1, 7, 4),
-  /* 1000 */ V(7, 1, 4),
-  /* 1001 */ PTR(86, 1),
-  /* 1010 */ PTR(88, 2),
-  /* 1011 */ PTR(92, 2),
-  /* 1100 */ V(1, 6, 4),
-  /* 1101 */ V(6, 1, 4),
-  /* 1110 */ V(6, 0, 4),
-  /* 1111 */ PTR(96, 1),
-
-  /* 0001 ... */
-  /* 0000 */ PTR(98, 1),	/* 32 */
-  /* 0001 */ PTR(100, 1),
-  /* 0010 */ V(1, 4, 4),
-  /* 0011 */ V(4, 1, 4),
-  /* 0100 */ V(4, 0, 4),
-  /* 0101 */ V(2, 3, 4),
-  /* 0110 */ V(3, 2, 4),
-  /* 0111 */ V(0, 3, 4),
-  /* 1000 */ V(1, 3, 3),
-  /* 1001 */ V(1, 3, 3),
-  /* 1010 */ V(3, 1, 3),
-  /* 1011 */ V(3, 1, 3),
-  /* 1100 */ V(3, 0, 3),
-  /* 1101 */ V(3, 0, 3),
-  /* 1110 */ V(2, 2, 3),
-  /* 1111 */ V(2, 2, 3),
-
-  /* 0010 ... */
-  /* 00   */ V(1, 2, 2),	/* 48 */
-  /* 01   */ V(2, 1, 2),
-  /* 10   */ V(0, 2, 2),
-  /* 11   */ V(2, 0, 2),
-
-  /* 0000 0000 ... */
-  /* 000  */ V(7, 7, 3),	/* 52 */
-  /* 001  */ V(6, 7, 3),
-  /* 010  */ V(7, 6, 3),
-  /* 011  */ V(5, 7, 3),
-  /* 100  */ V(7, 5, 3),
-  /* 101  */ V(6, 6, 3),
-  /* 110  */ V(4, 7, 2),
-  /* 111  */ V(4, 7, 2),
-
-  /* 0000 0001 ... */
-  /* 00   */ V(7, 4, 2),	/* 60 */
-  /* 01   */ V(5, 6, 2),
-  /* 10   */ V(6, 5, 2),
-  /* 11   */ V(3, 7, 2),
-
-  /* 0000 0010 ... */
-  /* 000  */ V(7, 3, 2),	/* 64 */
-  /* 001  */ V(7, 3, 2),
-  /* 010  */ V(4, 6, 2),
-  /* 011  */ V(4, 6, 2),
-  /* 100  */ V(5, 5, 3),
-  /* 101  */ V(5, 4, 3),
-  /* 110  */ V(6, 3, 2),
-  /* 111  */ V(6, 3, 2),
-
-  /* 0000 0011 ... */
-  /* 0    */ V(2, 7, 1),	/* 72 */
-  /* 1    */ V(7, 2, 1),
-
-  /* 0000 0100 ... */
-  /* 00   */ V(6, 4, 2),	/* 74 */
-  /* 01   */ V(0, 7, 2),
-  /* 10   */ V(7, 0, 1),
-  /* 11   */ V(7, 0, 1),
-
-  /* 0000 0101 ... */
-  /* 00   */ V(6, 2, 1),	/* 78 */
-  /* 01   */ V(6, 2, 1),
-  /* 10   */ V(4, 5, 2),
-  /* 11   */ V(3, 5, 2),
-
-  /* 0000 0110 ... */
-  /* 00   */ V(0, 6, 1),	/* 82 */
-  /* 01   */ V(0, 6, 1),
-  /* 10   */ V(5, 3, 2),
-  /* 11   */ V(4, 4, 2),
-
-  /* 0000 1001 ... */
-  /* 0    */ V(3, 6, 1),	/* 86 */
-  /* 1    */ V(2, 6, 1),
-
-  /* 0000 1010 ... */
-  /* 00   */ V(2, 5, 2),	/* 88 */
-  /* 01   */ V(5, 2, 2),
-  /* 10   */ V(1, 5, 1),
-  /* 11   */ V(1, 5, 1),
-
-  /* 0000 1011 ... */
-  /* 00   */ V(5, 1, 1),	/* 92 */
-  /* 01   */ V(5, 1, 1),
-  /* 10   */ V(3, 4, 2),
-  /* 11   */ V(4, 3, 2),
-
-  /* 0000 1111 ... */
-  /* 0    */ V(0, 5, 1),	/* 96 */
-  /* 1    */ V(5, 0, 1),
-
-  /* 0001 0000 ... */
-  /* 0    */ V(2, 4, 1),	/* 98 */
-  /* 1    */ V(4, 2, 1),
-
-  /* 0001 0001 ... */
-  /* 0    */ V(3, 3, 1),	/* 100 */
-  /* 1    */ V(0, 4, 1)
-};
-
-static
-union huffpair const hufftab11[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 4),
-  /* 0011 */ PTR(64, 3),
-  /* 0100 */ V(1, 2, 4),
-  /* 0101 */ PTR(72, 1),
-  /* 0110 */ V(1, 1, 3),
-  /* 0111 */ V(1, 1, 3),
-  /* 1000 */ V(0, 1, 3),
-  /* 1001 */ V(0, 1, 3),
-  /* 1010 */ V(1, 0, 3),
-  /* 1011 */ V(1, 0, 3),
-  /* 1100 */ V(0, 0, 2),
-  /* 1101 */ V(0, 0, 2),
-  /* 1110 */ V(0, 0, 2),
-  /* 1111 */ V(0, 0, 2),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(74, 2),	/* 16 */
-  /* 0001 */ PTR(78, 3),
-  /* 0010 */ PTR(86, 2),
-  /* 0011 */ PTR(90, 1),
-  /* 0100 */ PTR(92, 2),
-  /* 0101 */ V(2, 7, 4),
-  /* 0110 */ V(7, 2, 4),
-  /* 0111 */ PTR(96, 1),
-  /* 1000 */ V(7, 1, 3),
-  /* 1001 */ V(7, 1, 3),
-  /* 1010 */ V(1, 7, 4),
-  /* 1011 */ V(7, 0, 4),
-  /* 1100 */ V(3, 6, 4),
-  /* 1101 */ V(6, 3, 4),
-  /* 1110 */ V(6, 0, 4),
-  /* 1111 */ PTR(98, 1),
-
-  /* 0001 ... */
-  /* 0000 */ PTR(100, 1),	/* 32 */
-  /* 0001 */ V(1, 5, 4),
-  /* 0010 */ V(6, 2, 3),
-  /* 0011 */ V(6, 2, 3),
-  /* 0100 */ V(2, 6, 4),
-  /* 0101 */ V(0, 6, 4),
-  /* 0110 */ V(1, 6, 3),
-  /* 0111 */ V(1, 6, 3),
-  /* 1000 */ V(6, 1, 3),
-  /* 1001 */ V(6, 1, 3),
-  /* 1010 */ V(5, 1, 4),
-  /* 1011 */ V(3, 4, 4),
-  /* 1100 */ V(5, 0, 4),
-  /* 1101 */ PTR(102, 1),
-  /* 1110 */ V(2, 4, 4),
-  /* 1111 */ V(4, 2, 4),
-
-  /* 0010 ... */
-  /* 0000 */ V(1, 4, 4),	/* 48 */
-  /* 0001 */ V(4, 1, 4),
-  /* 0010 */ V(0, 4, 4),
-  /* 0011 */ V(4, 0, 4),
-  /* 0100 */ V(2, 3, 3),
-  /* 0101 */ V(2, 3, 3),
-  /* 0110 */ V(3, 2, 3),
-  /* 0111 */ V(3, 2, 3),
-  /* 1000 */ V(1, 3, 2),
-  /* 1001 */ V(1, 3, 2),
-  /* 1010 */ V(1, 3, 2),
-  /* 1011 */ V(1, 3, 2),
-  /* 1100 */ V(3, 1, 2),
-  /* 1101 */ V(3, 1, 2),
-  /* 1110 */ V(3, 1, 2),
-  /* 1111 */ V(3, 1, 2),
-
-  /* 0011 ... */
-  /* 000  */ V(0, 3, 3),	/* 64 */
-  /* 001  */ V(3, 0, 3),
-  /* 010  */ V(2, 2, 2),
-  /* 011  */ V(2, 2, 2),
-  /* 100  */ V(2, 1, 1),
-  /* 101  */ V(2, 1, 1),
-  /* 110  */ V(2, 1, 1),
-  /* 111  */ V(2, 1, 1),
-
-  /* 0101 ... */
-  /* 0    */ V(0, 2, 1),	/* 72 */
-  /* 1    */ V(2, 0, 1),
-
-  /* 0000 0000 ... */
-  /* 00   */ V(7, 7, 2),	/* 74 */
-  /* 01   */ V(6, 7, 2),
-  /* 10   */ V(7, 6, 2),
-  /* 11   */ V(7, 5, 2),
-
-  /* 0000 0001 ... */
-  /* 000  */ V(6, 6, 2),	/* 78 */
-  /* 001  */ V(6, 6, 2),
-  /* 010  */ V(4, 7, 2),
-  /* 011  */ V(4, 7, 2),
-  /* 100  */ V(7, 4, 2),
-  /* 101  */ V(7, 4, 2),
-  /* 110  */ V(5, 7, 3),
-  /* 111  */ V(5, 5, 3),
-
-  /* 0000 0010 ... */
-  /* 00   */ V(5, 6, 2),	/* 86 */
-  /* 01   */ V(6, 5, 2),
-  /* 10   */ V(3, 7, 1),
-  /* 11   */ V(3, 7, 1),
-
-  /* 0000 0011 ... */
-  /* 0    */ V(7, 3, 1),	/* 90 */
-  /* 1    */ V(4, 6, 1),
-
-  /* 0000 0100 ... */
-  /* 00   */ V(4, 5, 2),	/* 92 */
-  /* 01   */ V(5, 4, 2),
-  /* 10   */ V(3, 5, 2),
-  /* 11   */ V(5, 3, 2),
-
-  /* 0000 0111 ... */
-  /* 0    */ V(6, 4, 1),	/* 96 */
-  /* 1    */ V(0, 7, 1),
-
-  /* 0000 1111 ... */
-  /* 0    */ V(4, 4, 1),	/* 98 */
-  /* 1    */ V(2, 5, 1),
-
-  /* 0001 0000 ... */
-  /* 0    */ V(5, 2, 1),	/* 100 */
-  /* 1    */ V(0, 5, 1),
-
-  /* 0001 1101 ... */
-  /* 0    */ V(4, 3, 1),	/* 102 */
-  /* 1    */ V(3, 3, 1)
-};
-
-static
-union huffpair const hufftab12[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 4),
-  /* 0011 */ PTR(64, 2),
-  /* 0100 */ PTR(68, 3),
-  /* 0101 */ PTR(76, 1),
-  /* 0110 */ V(1, 2, 4),
-  /* 0111 */ V(2, 1, 4),
-  /* 1000 */ PTR(78, 1),
-  /* 1001 */ V(0, 0, 4),
-  /* 1010 */ V(1, 1, 3),
-  /* 1011 */ V(1, 1, 3),
-  /* 1100 */ V(0, 1, 3),
-  /* 1101 */ V(0, 1, 3),
-  /* 1110 */ V(1, 0, 3),
-  /* 1111 */ V(1, 0, 3),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(80, 2),	/* 16 */
-  /* 0001 */ PTR(84, 1),
-  /* 0010 */ PTR(86, 1),
-  /* 0011 */ PTR(88, 1),
-  /* 0100 */ V(5, 6, 4),
-  /* 0101 */ V(3, 7, 4),
-  /* 0110 */ PTR(90, 1),
-  /* 0111 */ V(2, 7, 4),
-  /* 1000 */ V(7, 2, 4),
-  /* 1001 */ V(4, 6, 4),
-  /* 1010 */ V(6, 4, 4),
-  /* 1011 */ V(1, 7, 4),
-  /* 1100 */ V(7, 1, 4),
-  /* 1101 */ PTR(92, 1),
-  /* 1110 */ V(3, 6, 4),
-  /* 1111 */ V(6, 3, 4),
-
-  /* 0001 ... */
-  /* 0000 */ V(4, 5, 4),	/* 32 */
-  /* 0001 */ V(5, 4, 4),
-  /* 0010 */ V(4, 4, 4),
-  /* 0011 */ PTR(94, 1),
-  /* 0100 */ V(2, 6, 3),
-  /* 0101 */ V(2, 6, 3),
-  /* 0110 */ V(6, 2, 3),
-  /* 0111 */ V(6, 2, 3),
-  /* 1000 */ V(6, 1, 3),
-  /* 1001 */ V(6, 1, 3),
-  /* 1010 */ V(1, 6, 4),
-  /* 1011 */ V(6, 0, 4),
-  /* 1100 */ V(3, 5, 4),
-  /* 1101 */ V(5, 3, 4),
-  /* 1110 */ V(2, 5, 4),
-  /* 1111 */ V(5, 2, 4),
-
-  /* 0010 ... */
-  /* 0000 */ V(1, 5, 3),	/* 48 */
-  /* 0001 */ V(1, 5, 3),
-  /* 0010 */ V(5, 1, 3),
-  /* 0011 */ V(5, 1, 3),
-  /* 0100 */ V(3, 4, 3),
-  /* 0101 */ V(3, 4, 3),
-  /* 0110 */ V(4, 3, 3),
-  /* 0111 */ V(4, 3, 3),
-  /* 1000 */ V(5, 0, 4),
-  /* 1001 */ V(0, 4, 4),
-  /* 1010 */ V(2, 4, 3),
-  /* 1011 */ V(2, 4, 3),
-  /* 1100 */ V(4, 2, 3),
-  /* 1101 */ V(4, 2, 3),
-  /* 1110 */ V(1, 4, 3),
-  /* 1111 */ V(1, 4, 3),
-
-  /* 0011 ... */
-  /* 00   */ V(3, 3, 2),	/* 64 */
-  /* 01   */ V(4, 1, 2),
-  /* 10   */ V(2, 3, 2),
-  /* 11   */ V(3, 2, 2),
-
-  /* 0100 ... */
-  /* 000  */ V(4, 0, 3),	/* 68 */
-  /* 001  */ V(0, 3, 3),
-  /* 010  */ V(3, 0, 2),
-  /* 011  */ V(3, 0, 2),
-  /* 100  */ V(1, 3, 1),
-  /* 101  */ V(1, 3, 1),
-  /* 110  */ V(1, 3, 1),
-  /* 111  */ V(1, 3, 1),
-
-  /* 0101 ... */
-  /* 0    */ V(3, 1, 1),	/* 76 */
-  /* 1    */ V(2, 2, 1),
-
-  /* 1000 ... */
-  /* 0    */ V(0, 2, 1),	/* 78 */
-  /* 1    */ V(2, 0, 1),
-
-  /* 0000 0000 ... */
-  /* 00   */ V(7, 7, 2),	/* 80 */
-  /* 01   */ V(6, 7, 2),
-  /* 10   */ V(7, 6, 1),
-  /* 11   */ V(7, 6, 1),
-
-  /* 0000 0001 ... */
-  /* 0    */ V(5, 7, 1),	/* 84 */
-  /* 1    */ V(7, 5, 1),
-
-  /* 0000 0010 ... */
-  /* 0    */ V(6, 6, 1),	/* 86 */
-  /* 1    */ V(4, 7, 1),
-
-  /* 0000 0011 ... */
-  /* 0    */ V(7, 4, 1),	/* 88 */
-  /* 1    */ V(6, 5, 1),
-
-  /* 0000 0110 ... */
-  /* 0    */ V(7, 3, 1),	/* 90 */
-  /* 1    */ V(5, 5, 1),
-
-  /* 0000 1101 ... */
-  /* 0    */ V(0, 7, 1),	/* 92 */
-  /* 1    */ V(7, 0, 1),
-
-  /* 0001 0011 ... */
-  /* 0    */ V(0, 6, 1),	/* 94 */
-  /* 1    */ V(0, 5, 1)
-};
-
-static
-union huffpair const hufftab13[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 4),
-  /* 0011 */ PTR(64, 2),
-  /* 0100 */ V(1, 1, 4),
-  /* 0101 */ V(0, 1, 4),
-  /* 0110 */ V(1, 0, 3),
-  /* 0111 */ V(1, 0, 3),
-  /* 1000 */ V(0, 0, 1),
-  /* 1001 */ V(0, 0, 1),
-  /* 1010 */ V(0, 0, 1),
-  /* 1011 */ V(0, 0, 1),
-  /* 1100 */ V(0, 0, 1),
-  /* 1101 */ V(0, 0, 1),
-  /* 1110 */ V(0, 0, 1),
-  /* 1111 */ V(0, 0, 1),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(68, 4),	/* 16 */
-  /* 0001 */ PTR(84, 4),
-  /* 0010 */ PTR(100, 4),
-  /* 0011 */ PTR(116, 4),
-  /* 0100 */ PTR(132, 4),
-  /* 0101 */ PTR(148, 4),
-  /* 0110 */ PTR(164, 3),
-  /* 0111 */ PTR(172, 3),
-  /* 1000 */ PTR(180, 3),
-  /* 1001 */ PTR(188, 3),
-  /* 1010 */ PTR(196, 3),
-  /* 1011 */ PTR(204, 3),
-  /* 1100 */ PTR(212, 1),
-  /* 1101 */ PTR(214, 2),
-  /* 1110 */ PTR(218, 3),
-  /* 1111 */ PTR(226, 1),
-
-  /* 0001 ... */
-  /* 0000 */ PTR(228, 2),	/* 32 */
-  /* 0001 */ PTR(232, 2),
-  /* 0010 */ PTR(236, 2),
-  /* 0011 */ PTR(240, 2),
-  /* 0100 */ V(8, 1, 4),
-  /* 0101 */ PTR(244, 1),
-  /* 0110 */ PTR(246, 1),
-  /* 0111 */ PTR(248, 1),
-  /* 1000 */ PTR(250, 2),
-  /* 1001 */ PTR(254, 1),
-  /* 1010 */ V(1, 5, 4),
-  /* 1011 */ V(5, 1, 4),
-  /* 1100 */ PTR(256, 1),
-  /* 1101 */ PTR(258, 1),
-  /* 1110 */ PTR(260, 1),
-  /* 1111 */ V(1, 4, 4),
-
-  /* 0010 ... */
-  /* 0000 */ V(4, 1, 3),	/* 48 */
-  /* 0001 */ V(4, 1, 3),
-  /* 0010 */ V(0, 4, 4),
-  /* 0011 */ V(4, 0, 4),
-  /* 0100 */ V(2, 3, 4),
-  /* 0101 */ V(3, 2, 4),
-  /* 0110 */ V(1, 3, 3),
-  /* 0111 */ V(1, 3, 3),
-  /* 1000 */ V(3, 1, 3),
-  /* 1001 */ V(3, 1, 3),
-  /* 1010 */ V(0, 3, 3),
-  /* 1011 */ V(0, 3, 3),
-  /* 1100 */ V(3, 0, 3),
-  /* 1101 */ V(3, 0, 3),
-  /* 1110 */ V(2, 2, 3),
-  /* 1111 */ V(2, 2, 3),
-
-  /* 0011 ... */
-  /* 00   */ V(1, 2, 2),	/* 64 */
-  /* 01   */ V(2, 1, 2),
-  /* 10   */ V(0, 2, 2),
-  /* 11   */ V(2, 0, 2),
-
-  /* 0000 0000 ... */
-  /* 0000 */ PTR(262, 4),	/* 68 */
-  /* 0001 */ PTR(278, 4),
-  /* 0010 */ PTR(294, 4),
-  /* 0011 */ PTR(310, 3),
-  /* 0100 */ PTR(318, 2),
-  /* 0101 */ PTR(322, 2),
-  /* 0110 */ PTR(326, 3),
-  /* 0111 */ PTR(334, 2),
-  /* 1000 */ PTR(338, 1),
-  /* 1001 */ PTR(340, 2),
-  /* 1010 */ PTR(344, 2),
-  /* 1011 */ PTR(348, 2),
-  /* 1100 */ PTR(352, 2),
-  /* 1101 */ PTR(356, 2),
-  /* 1110 */ V(1, 15, 4),
-  /* 1111 */ V(15, 1, 4),
-
-  /* 0000 0001 ... */
-  /* 0000 */ V(15, 0, 4),	/* 84 */
-  /* 0001 */ PTR(360, 1),
-  /* 0010 */ PTR(362, 1),
-  /* 0011 */ PTR(364, 1),
-  /* 0100 */ V(14, 2, 4),
-  /* 0101 */ PTR(366, 1),
-  /* 0110 */ V(1, 14, 4),
-  /* 0111 */ V(14, 1, 4),
-  /* 1000 */ PTR(368, 1),
-  /* 1001 */ PTR(370, 1),
-  /* 1010 */ PTR(372, 1),
-  /* 1011 */ PTR(374, 1),
-  /* 1100 */ PTR(376, 1),
-  /* 1101 */ PTR(378, 1),
-  /* 1110 */ V(12, 6, 4),
-  /* 1111 */ V(3, 13, 4),
-
-  /* 0000 0010 ... */
-  /* 0000 */ PTR(380, 1),	/* 100 */
-  /* 0001 */ V(2, 13, 4),
-  /* 0010 */ V(13, 2, 4),
-  /* 0011 */ V(1, 13, 4),
-  /* 0100 */ V(11, 7, 4),
-  /* 0101 */ PTR(382, 1),
-  /* 0110 */ PTR(384, 1),
-  /* 0111 */ V(12, 3, 4),
-  /* 1000 */ PTR(386, 1),
-  /* 1001 */ V(4, 11, 4),
-  /* 1010 */ V(13, 1, 3),
-  /* 1011 */ V(13, 1, 3),
-  /* 1100 */ V(0, 13, 4),
-  /* 1101 */ V(13, 0, 4),
-  /* 1110 */ V(8, 10, 4),
-  /* 1111 */ V(10, 8, 4),
-
-  /* 0000 0011 ... */
-  /* 0000 */ V(4, 12, 4),	/* 116 */
-  /* 0001 */ V(12, 4, 4),
-  /* 0010 */ V(6, 11, 4),
-  /* 0011 */ V(11, 6, 4),
-  /* 0100 */ V(3, 12, 3),
-  /* 0101 */ V(3, 12, 3),
-  /* 0110 */ V(2, 12, 3),
-  /* 0111 */ V(2, 12, 3),
-  /* 1000 */ V(12, 2, 3),
-  /* 1001 */ V(12, 2, 3),
-  /* 1010 */ V(5, 11, 3),
-  /* 1011 */ V(5, 11, 3),
-  /* 1100 */ V(11, 5, 4),
-  /* 1101 */ V(8, 9, 4),
-  /* 1110 */ V(1, 12, 3),
-  /* 1111 */ V(1, 12, 3),
-
-  /* 0000 0100 ... */
-  /* 0000 */ V(12, 1, 3),	/* 132 */
-  /* 0001 */ V(12, 1, 3),
-  /* 0010 */ V(9, 8, 4),
-  /* 0011 */ V(0, 12, 4),
-  /* 0100 */ V(12, 0, 3),
-  /* 0101 */ V(12, 0, 3),
-  /* 0110 */ V(11, 4, 4),
-  /* 0111 */ V(6, 10, 4),
-  /* 1000 */ V(10, 6, 4),
-  /* 1001 */ V(7, 9, 4),
-  /* 1010 */ V(3, 11, 3),
-  /* 1011 */ V(3, 11, 3),
-  /* 1100 */ V(11, 3, 3),
-  /* 1101 */ V(11, 3, 3),
-  /* 1110 */ V(8, 8, 4),
-  /* 1111 */ V(5, 10, 4),
-
-  /* 0000 0101 ... */
-  /* 0000 */ V(2, 11, 3),	/* 148 */
-  /* 0001 */ V(2, 11, 3),
-  /* 0010 */ V(10, 5, 4),
-  /* 0011 */ V(6, 9, 4),
-  /* 0100 */ V(10, 4, 3),
-  /* 0101 */ V(10, 4, 3),
-  /* 0110 */ V(7, 8, 4),
-  /* 0111 */ V(8, 7, 4),
-  /* 1000 */ V(9, 4, 3),
-  /* 1001 */ V(9, 4, 3),
-  /* 1010 */ V(7, 7, 4),
-  /* 1011 */ V(7, 6, 4),
-  /* 1100 */ V(11, 2, 2),
-  /* 1101 */ V(11, 2, 2),
-  /* 1110 */ V(11, 2, 2),
-  /* 1111 */ V(11, 2, 2),
-
-  /* 0000 0110 ... */
-  /* 000  */ V(1, 11, 2),	/* 164 */
-  /* 001  */ V(1, 11, 2),
-  /* 010  */ V(11, 1, 2),
-  /* 011  */ V(11, 1, 2),
-  /* 100  */ V(0, 11, 3),
-  /* 101  */ V(11, 0, 3),
-  /* 110  */ V(9, 6, 3),
-  /* 111  */ V(4, 10, 3),
-
-  /* 0000 0111 ... */
-  /* 000  */ V(3, 10, 3),	/* 172 */
-  /* 001  */ V(10, 3, 3),
-  /* 010  */ V(5, 9, 3),
-  /* 011  */ V(9, 5, 3),
-  /* 100  */ V(2, 10, 2),
-  /* 101  */ V(2, 10, 2),
-  /* 110  */ V(10, 2, 2),
-  /* 111  */ V(10, 2, 2),
-
-  /* 0000 1000 ... */
-  /* 000  */ V(1, 10, 2),	/* 180 */
-  /* 001  */ V(1, 10, 2),
-  /* 010  */ V(10, 1, 2),
-  /* 011  */ V(10, 1, 2),
-  /* 100  */ V(0, 10, 3),
-  /* 101  */ V(6, 8, 3),
-  /* 110  */ V(10, 0, 2),
-  /* 111  */ V(10, 0, 2),
-
-  /* 0000 1001 ... */
-  /* 000  */ V(8, 6, 3),	/* 188 */
-  /* 001  */ V(4, 9, 3),
-  /* 010  */ V(9, 3, 2),
-  /* 011  */ V(9, 3, 2),
-  /* 100  */ V(3, 9, 3),
-  /* 101  */ V(5, 8, 3),
-  /* 110  */ V(8, 5, 3),
-  /* 111  */ V(6, 7, 3),
-
-  /* 0000 1010 ... */
-  /* 000  */ V(2, 9, 2),	/* 196 */
-  /* 001  */ V(2, 9, 2),
-  /* 010  */ V(9, 2, 2),
-  /* 011  */ V(9, 2, 2),
-  /* 100  */ V(5, 7, 3),
-  /* 101  */ V(7, 5, 3),
-  /* 110  */ V(3, 8, 2),
-  /* 111  */ V(3, 8, 2),
-
-  /* 0000 1011 ... */
-  /* 000  */ V(8, 3, 2),	/* 204 */
-  /* 001  */ V(8, 3, 2),
-  /* 010  */ V(6, 6, 3),
-  /* 011  */ V(4, 7, 3),
-  /* 100  */ V(7, 4, 3),
-  /* 101  */ V(5, 6, 3),
-  /* 110  */ V(6, 5, 3),
-  /* 111  */ V(7, 3, 3),
-
-  /* 0000 1100 ... */
-  /* 0    */ V(1, 9, 1),	/* 212 */
-  /* 1    */ V(9, 1, 1),
-
-  /* 0000 1101 ... */
-  /* 00   */ V(0, 9, 2),	/* 214 */
-  /* 01   */ V(9, 0, 2),
-  /* 10   */ V(4, 8, 2),
-  /* 11   */ V(8, 4, 2),
-
-  /* 0000 1110 ... */
-  /* 000  */ V(7, 2, 2),	/* 218 */
-  /* 001  */ V(7, 2, 2),
-  /* 010  */ V(4, 6, 3),
-  /* 011  */ V(6, 4, 3),
-  /* 100  */ V(2, 8, 1),
-  /* 101  */ V(2, 8, 1),
-  /* 110  */ V(2, 8, 1),
-  /* 111  */ V(2, 8, 1),
-
-  /* 0000 1111 ... */
-  /* 0    */ V(8, 2, 1),	/* 226 */
-  /* 1    */ V(1, 8, 1),
-
-  /* 0001 0000 ... */
-  /* 00   */ V(3, 7, 2),	/* 228 */
-  /* 01   */ V(2, 7, 2),
-  /* 10   */ V(1, 7, 1),
-  /* 11   */ V(1, 7, 1),
-
-  /* 0001 0001 ... */
-  /* 00   */ V(7, 1, 1),	/* 232 */
-  /* 01   */ V(7, 1, 1),
-  /* 10   */ V(5, 5, 2),
-  /* 11   */ V(0, 7, 2),
-
-  /* 0001 0010 ... */
-  /* 00   */ V(7, 0, 2),	/* 236 */
-  /* 01   */ V(3, 6, 2),
-  /* 10   */ V(6, 3, 2),
-  /* 11   */ V(4, 5, 2),
-
-  /* 0001 0011 ... */
-  /* 00   */ V(5, 4, 2),	/* 240 */
-  /* 01   */ V(2, 6, 2),
-  /* 10   */ V(6, 2, 2),
-  /* 11   */ V(3, 5, 2),
-
-  /* 0001 0101 ... */
-  /* 0    */ V(0, 8, 1),	/* 244 */
-  /* 1    */ V(8, 0, 1),
-
-  /* 0001 0110 ... */
-  /* 0    */ V(1, 6, 1),	/* 246 */
-  /* 1    */ V(6, 1, 1),
-
-  /* 0001 0111 ... */
-  /* 0    */ V(0, 6, 1),	/* 248 */
-  /* 1    */ V(6, 0, 1),
-
-  /* 0001 1000 ... */
-  /* 00   */ V(5, 3, 2),	/* 250 */
-  /* 01   */ V(4, 4, 2),
-  /* 10   */ V(2, 5, 1),
-  /* 11   */ V(2, 5, 1),
-
-  /* 0001 1001 ... */
-  /* 0    */ V(5, 2, 1),	/* 254 */
-  /* 1    */ V(0, 5, 1),
-
-  /* 0001 1100 ... */
-  /* 0    */ V(3, 4, 1),	/* 256 */
-  /* 1    */ V(4, 3, 1),
-
-  /* 0001 1101 ... */
-  /* 0    */ V(5, 0, 1),	/* 258 */
-  /* 1    */ V(2, 4, 1),
-
-  /* 0001 1110 ... */
-  /* 0    */ V(4, 2, 1),	/* 260 */
-  /* 1    */ V(3, 3, 1),
-
-  /* 0000 0000 0000 ... */
-  /* 0000 */ PTR(388, 3),	/* 262 */
-  /* 0001 */ V(15, 15, 4),
-  /* 0010 */ V(14, 15, 4),
-  /* 0011 */ V(13, 15, 4),
-  /* 0100 */ V(14, 14, 4),
-  /* 0101 */ V(12, 15, 4),
-  /* 0110 */ V(13, 14, 4),
-  /* 0111 */ V(11, 15, 4),
-  /* 1000 */ V(15, 11, 4),
-  /* 1001 */ V(12, 14, 4),
-  /* 1010 */ V(13, 12, 4),
-  /* 1011 */ PTR(396, 1),
-  /* 1100 */ V(14, 12, 3),
-  /* 1101 */ V(14, 12, 3),
-  /* 1110 */ V(13, 13, 3),
-  /* 1111 */ V(13, 13, 3),
-
-  /* 0000 0000 0001 ... */
-  /* 0000 */ V(15, 10, 4),	/* 278 */
-  /* 0001 */ V(12, 13, 4),
-  /* 0010 */ V(11, 14, 3),
-  /* 0011 */ V(11, 14, 3),
-  /* 0100 */ V(14, 11, 3),
-  /* 0101 */ V(14, 11, 3),
-  /* 0110 */ V(9, 15, 3),
-  /* 0111 */ V(9, 15, 3),
-  /* 1000 */ V(15, 9, 3),
-  /* 1001 */ V(15, 9, 3),
-  /* 1010 */ V(14, 10, 3),
-  /* 1011 */ V(14, 10, 3),
-  /* 1100 */ V(11, 13, 3),
-  /* 1101 */ V(11, 13, 3),
-  /* 1110 */ V(13, 11, 3),
-  /* 1111 */ V(13, 11, 3),
-
-  /* 0000 0000 0010 ... */
-  /* 0000 */ V(8, 15, 3),	/* 294 */
-  /* 0001 */ V(8, 15, 3),
-  /* 0010 */ V(15, 8, 3),
-  /* 0011 */ V(15, 8, 3),
-  /* 0100 */ V(12, 12, 3),
-  /* 0101 */ V(12, 12, 3),
-  /* 0110 */ V(10, 14, 4),
-  /* 0111 */ V(9, 14, 4),
-  /* 1000 */ V(8, 14, 3),
-  /* 1001 */ V(8, 14, 3),
-  /* 1010 */ V(7, 15, 4),
-  /* 1011 */ V(7, 14, 4),
-  /* 1100 */ V(15, 7, 2),
-  /* 1101 */ V(15, 7, 2),
-  /* 1110 */ V(15, 7, 2),
-  /* 1111 */ V(15, 7, 2),
-
-  /* 0000 0000 0011 ... */
-  /* 000  */ V(13, 10, 2),	/* 310 */
-  /* 001  */ V(13, 10, 2),
-  /* 010  */ V(10, 13, 3),
-  /* 011  */ V(11, 12, 3),
-  /* 100  */ V(12, 11, 3),
-  /* 101  */ V(15, 6, 3),
-  /* 110  */ V(6, 15, 2),
-  /* 111  */ V(6, 15, 2),
-
-  /* 0000 0000 0100 ... */
-  /* 00   */ V(14, 8, 2),	/* 318 */
-  /* 01   */ V(5, 15, 2),
-  /* 10   */ V(9, 13, 2),
-  /* 11   */ V(13, 9, 2),
-
-  /* 0000 0000 0101 ... */
-  /* 00   */ V(15, 5, 2),	/* 322 */
-  /* 01   */ V(14, 7, 2),
-  /* 10   */ V(10, 12, 2),
-  /* 11   */ V(11, 11, 2),
-
-  /* 0000 0000 0110 ... */
-  /* 000  */ V(4, 15, 2),	/* 326 */
-  /* 001  */ V(4, 15, 2),
-  /* 010  */ V(15, 4, 2),
-  /* 011  */ V(15, 4, 2),
-  /* 100  */ V(12, 10, 3),
-  /* 101  */ V(14, 6, 3),
-  /* 110  */ V(15, 3, 2),
-  /* 111  */ V(15, 3, 2),
-
-  /* 0000 0000 0111 ... */
-  /* 00   */ V(3, 15, 1),	/* 334 */
-  /* 01   */ V(3, 15, 1),
-  /* 10   */ V(8, 13, 2),
-  /* 11   */ V(13, 8, 2),
-
-  /* 0000 0000 1000 ... */
-  /* 0    */ V(2, 15, 1),	/* 338 */
-  /* 1    */ V(15, 2, 1),
-
-  /* 0000 0000 1001 ... */
-  /* 00   */ V(6, 14, 2),	/* 340 */
-  /* 01   */ V(9, 12, 2),
-  /* 10   */ V(0, 15, 1),
-  /* 11   */ V(0, 15, 1),
-
-  /* 0000 0000 1010 ... */
-  /* 00   */ V(12, 9, 2),	/* 344 */
-  /* 01   */ V(5, 14, 2),
-  /* 10   */ V(10, 11, 1),
-  /* 11   */ V(10, 11, 1),
-
-  /* 0000 0000 1011 ... */
-  /* 00   */ V(7, 13, 2),	/* 348 */
-  /* 01   */ V(13, 7, 2),
-  /* 10   */ V(4, 14, 1),
-  /* 11   */ V(4, 14, 1),
-
-  /* 0000 0000 1100 ... */
-  /* 00   */ V(12, 8, 2),	/* 352 */
-  /* 01   */ V(13, 6, 2),
-  /* 10   */ V(3, 14, 1),
-  /* 11   */ V(3, 14, 1),
-
-  /* 0000 0000 1101 ... */
-  /* 00   */ V(11, 9, 1),	/* 356 */
-  /* 01   */ V(11, 9, 1),
-  /* 10   */ V(9, 11, 2),
-  /* 11   */ V(10, 10, 2),
-
-  /* 0000 0001 0001 ... */
-  /* 0    */ V(11, 10, 1),	/* 360 */
-  /* 1    */ V(14, 5, 1),
-
-  /* 0000 0001 0010 ... */
-  /* 0    */ V(14, 4, 1),	/* 362 */
-  /* 1    */ V(8, 12, 1),
-
-  /* 0000 0001 0011 ... */
-  /* 0    */ V(6, 13, 1),	/* 364 */
-  /* 1    */ V(14, 3, 1),
-
-  /* 0000 0001 0101 ... */
-  /* 0    */ V(2, 14, 1),	/* 366 */
-  /* 1    */ V(0, 14, 1),
-
-  /* 0000 0001 1000 ... */
-  /* 0    */ V(14, 0, 1),	/* 368 */
-  /* 1    */ V(5, 13, 1),
-
-  /* 0000 0001 1001 ... */
-  /* 0    */ V(13, 5, 1),	/* 370 */
-  /* 1    */ V(7, 12, 1),
-
-  /* 0000 0001 1010 ... */
-  /* 0    */ V(12, 7, 1),	/* 372 */
-  /* 1    */ V(4, 13, 1),
-
-  /* 0000 0001 1011 ... */
-  /* 0    */ V(8, 11, 1),	/* 374 */
-  /* 1    */ V(11, 8, 1),
-
-  /* 0000 0001 1100 ... */
-  /* 0    */ V(13, 4, 1),	/* 376 */
-  /* 1    */ V(9, 10, 1),
-
-  /* 0000 0001 1101 ... */
-  /* 0    */ V(10, 9, 1),	/* 378 */
-  /* 1    */ V(6, 12, 1),
-
-  /* 0000 0010 0000 ... */
-  /* 0    */ V(13, 3, 1),	/* 380 */
-  /* 1    */ V(7, 11, 1),
-
-  /* 0000 0010 0101 ... */
-  /* 0    */ V(5, 12, 1),	/* 382 */
-  /* 1    */ V(12, 5, 1),
-
-  /* 0000 0010 0110 ... */
-  /* 0    */ V(9, 9, 1),	/* 384 */
-  /* 1    */ V(7, 10, 1),
-
-  /* 0000 0010 1000 ... */
-  /* 0    */ V(10, 7, 1),	/* 386 */
-  /* 1    */ V(9, 7, 1),
-
-  /* 0000 0000 0000 0000 ... */
-  /* 000  */ V(15, 14, 3),	/* 388 */
-  /* 001  */ V(15, 12, 3),
-  /* 010  */ V(15, 13, 2),
-  /* 011  */ V(15, 13, 2),
-  /* 100  */ V(14, 13, 1),
-  /* 101  */ V(14, 13, 1),
-  /* 110  */ V(14, 13, 1),
-  /* 111  */ V(14, 13, 1),
-
-  /* 0000 0000 0000 1011 ... */
-  /* 0    */ V(10, 15, 1),	/* 396 */
-  /* 1    */ V(14, 9, 1)
-};
-
-static
-union huffpair const hufftab15[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 4),
-  /* 0011 */ PTR(64, 4),
-  /* 0100 */ PTR(80, 4),
-  /* 0101 */ PTR(96, 3),
-  /* 0110 */ PTR(104, 3),
-  /* 0111 */ PTR(112, 2),
-  /* 1000 */ PTR(116, 1),
-  /* 1001 */ PTR(118, 1),
-  /* 1010 */ V(1, 1, 3),
-  /* 1011 */ V(1, 1, 3),
-  /* 1100 */ V(0, 1, 4),
-  /* 1101 */ V(1, 0, 4),
-  /* 1110 */ V(0, 0, 3),
-  /* 1111 */ V(0, 0, 3),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(120, 4),	/* 16 */
-  /* 0001 */ PTR(136, 4),
-  /* 0010 */ PTR(152, 4),
-  /* 0011 */ PTR(168, 4),
-  /* 0100 */ PTR(184, 4),
-  /* 0101 */ PTR(200, 3),
-  /* 0110 */ PTR(208, 3),
-  /* 0111 */ PTR(216, 4),
-  /* 1000 */ PTR(232, 3),
-  /* 1001 */ PTR(240, 3),
-  /* 1010 */ PTR(248, 3),
-  /* 1011 */ PTR(256, 3),
-  /* 1100 */ PTR(264, 2),
-  /* 1101 */ PTR(268, 3),
-  /* 1110 */ PTR(276, 3),
-  /* 1111 */ PTR(284, 2),
-
-  /* 0001 ... */
-  /* 0000 */ PTR(288, 2),	/* 32 */
-  /* 0001 */ PTR(292, 2),
-  /* 0010 */ PTR(296, 2),
-  /* 0011 */ PTR(300, 2),
-  /* 0100 */ PTR(304, 2),
-  /* 0101 */ PTR(308, 2),
-  /* 0110 */ PTR(312, 2),
-  /* 0111 */ PTR(316, 2),
-  /* 1000 */ PTR(320, 1),
-  /* 1001 */ PTR(322, 1),
-  /* 1010 */ PTR(324, 1),
-  /* 1011 */ PTR(326, 2),
-  /* 1100 */ PTR(330, 1),
-  /* 1101 */ PTR(332, 1),
-  /* 1110 */ PTR(334, 2),
-  /* 1111 */ PTR(338, 1),
-
-  /* 0010 ... */
-  /* 0000 */ PTR(340, 1),	/* 48 */
-  /* 0001 */ PTR(342, 1),
-  /* 0010 */ V(9, 1, 4),
-  /* 0011 */ PTR(344, 1),
-  /* 0100 */ PTR(346, 1),
-  /* 0101 */ PTR(348, 1),
-  /* 0110 */ PTR(350, 1),
-  /* 0111 */ PTR(352, 1),
-  /* 1000 */ V(2, 8, 4),
-  /* 1001 */ V(8, 2, 4),
-  /* 1010 */ V(1, 8, 4),
-  /* 1011 */ V(8, 1, 4),
-  /* 1100 */ PTR(354, 1),
-  /* 1101 */ PTR(356, 1),
-  /* 1110 */ PTR(358, 1),
-  /* 1111 */ PTR(360, 1),
-
-  /* 0011 ... */
-  /* 0000 */ V(2, 7, 4),	/* 64 */
-  /* 0001 */ V(7, 2, 4),
-  /* 0010 */ V(6, 4, 4),
-  /* 0011 */ V(1, 7, 4),
-  /* 0100 */ V(5, 5, 4),
-  /* 0101 */ V(7, 1, 4),
-  /* 0110 */ PTR(362, 1),
-  /* 0111 */ V(3, 6, 4),
-  /* 1000 */ V(6, 3, 4),
-  /* 1001 */ V(4, 5, 4),
-  /* 1010 */ V(5, 4, 4),
-  /* 1011 */ V(2, 6, 4),
-  /* 1100 */ V(6, 2, 4),
-  /* 1101 */ V(1, 6, 4),
-  /* 1110 */ PTR(364, 1),
-  /* 1111 */ V(3, 5, 4),
-
-  /* 0100 ... */
-  /* 0000 */ V(6, 1, 3),	/* 80 */
-  /* 0001 */ V(6, 1, 3),
-  /* 0010 */ V(5, 3, 4),
-  /* 0011 */ V(4, 4, 4),
-  /* 0100 */ V(2, 5, 3),
-  /* 0101 */ V(2, 5, 3),
-  /* 0110 */ V(5, 2, 3),
-  /* 0111 */ V(5, 2, 3),
-  /* 1000 */ V(1, 5, 3),
-  /* 1001 */ V(1, 5, 3),
-  /* 1010 */ V(5, 1, 3),
-  /* 1011 */ V(5, 1, 3),
-  /* 1100 */ V(0, 5, 4),
-  /* 1101 */ V(5, 0, 4),
-  /* 1110 */ V(3, 4, 3),
-  /* 1111 */ V(3, 4, 3),
-
-  /* 0101 ... */
-  /* 000  */ V(4, 3, 3),	/* 96 */
-  /* 001  */ V(2, 4, 3),
-  /* 010  */ V(4, 2, 3),
-  /* 011  */ V(3, 3, 3),
-  /* 100  */ V(4, 1, 2),
-  /* 101  */ V(4, 1, 2),
-  /* 110  */ V(1, 4, 3),
-  /* 111  */ V(0, 4, 3),
-
-  /* 0110 ... */
-  /* 000  */ V(2, 3, 2),	/* 104 */
-  /* 001  */ V(2, 3, 2),
-  /* 010  */ V(3, 2, 2),
-  /* 011  */ V(3, 2, 2),
-  /* 100  */ V(4, 0, 3),
-  /* 101  */ V(0, 3, 3),
-  /* 110  */ V(1, 3, 2),
-  /* 111  */ V(1, 3, 2),
-
-  /* 0111 ... */
-  /* 00   */ V(3, 1, 2),	/* 112 */
-  /* 01   */ V(3, 0, 2),
-  /* 10   */ V(2, 2, 1),
-  /* 11   */ V(2, 2, 1),
-
-  /* 1000 ... */
-  /* 0    */ V(1, 2, 1),	/* 116 */
-  /* 1    */ V(2, 1, 1),
-
-  /* 1001 ... */
-  /* 0    */ V(0, 2, 1),	/* 118 */
-  /* 1    */ V(2, 0, 1),
-
-  /* 0000 0000 ... */
-  /* 0000 */ PTR(366, 1),	/* 120 */
-  /* 0001 */ PTR(368, 1),
-  /* 0010 */ V(14, 14, 4),
-  /* 0011 */ PTR(370, 1),
-  /* 0100 */ PTR(372, 1),
-  /* 0101 */ PTR(374, 1),
-  /* 0110 */ V(15, 11, 4),
-  /* 0111 */ PTR(376, 1),
-  /* 1000 */ V(13, 13, 4),
-  /* 1001 */ V(10, 15, 4),
-  /* 1010 */ V(15, 10, 4),
-  /* 1011 */ V(11, 14, 4),
-  /* 1100 */ V(14, 11, 4),
-  /* 1101 */ V(12, 13, 4),
-  /* 1110 */ V(13, 12, 4),
-  /* 1111 */ V(9, 15, 4),
-
-  /* 0000 0001 ... */
-  /* 0000 */ V(15, 9, 4),	/* 136 */
-  /* 0001 */ V(14, 10, 4),
-  /* 0010 */ V(11, 13, 4),
-  /* 0011 */ V(13, 11, 4),
-  /* 0100 */ V(8, 15, 4),
-  /* 0101 */ V(15, 8, 4),
-  /* 0110 */ V(12, 12, 4),
-  /* 0111 */ V(9, 14, 4),
-  /* 1000 */ V(14, 9, 4),
-  /* 1001 */ V(7, 15, 4),
-  /* 1010 */ V(15, 7, 4),
-  /* 1011 */ V(10, 13, 4),
-  /* 1100 */ V(13, 10, 4),
-  /* 1101 */ V(11, 12, 4),
-  /* 1110 */ V(6, 15, 4),
-  /* 1111 */ PTR(378, 1),
-
-  /* 0000 0010 ... */
-  /* 0000 */ V(12, 11, 3),	/* 152 */
-  /* 0001 */ V(12, 11, 3),
-  /* 0010 */ V(15, 6, 3),
-  /* 0011 */ V(15, 6, 3),
-  /* 0100 */ V(8, 14, 4),
-  /* 0101 */ V(14, 8, 4),
-  /* 0110 */ V(5, 15, 4),
-  /* 0111 */ V(9, 13, 4),
-  /* 1000 */ V(15, 5, 3),
-  /* 1001 */ V(15, 5, 3),
-  /* 1010 */ V(7, 14, 3),
-  /* 1011 */ V(7, 14, 3),
-  /* 1100 */ V(14, 7, 3),
-  /* 1101 */ V(14, 7, 3),
-  /* 1110 */ V(10, 12, 3),
-  /* 1111 */ V(10, 12, 3),
-
-  /* 0000 0011 ... */
-  /* 0000 */ V(12, 10, 3),	/* 168 */
-  /* 0001 */ V(12, 10, 3),
-  /* 0010 */ V(11, 11, 3),
-  /* 0011 */ V(11, 11, 3),
-  /* 0100 */ V(13, 9, 4),
-  /* 0101 */ V(8, 13, 4),
-  /* 0110 */ V(4, 15, 3),
-  /* 0111 */ V(4, 15, 3),
-  /* 1000 */ V(15, 4, 3),
-  /* 1001 */ V(15, 4, 3),
-  /* 1010 */ V(3, 15, 3),
-  /* 1011 */ V(3, 15, 3),
-  /* 1100 */ V(15, 3, 3),
-  /* 1101 */ V(15, 3, 3),
-  /* 1110 */ V(13, 8, 3),
-  /* 1111 */ V(13, 8, 3),
-
-  /* 0000 0100 ... */
-  /* 0000 */ V(14, 6, 3),	/* 184 */
-  /* 0001 */ V(14, 6, 3),
-  /* 0010 */ V(2, 15, 3),
-  /* 0011 */ V(2, 15, 3),
-  /* 0100 */ V(15, 2, 3),
-  /* 0101 */ V(15, 2, 3),
-  /* 0110 */ V(6, 14, 4),
-  /* 0111 */ V(15, 0, 4),
-  /* 1000 */ V(1, 15, 3),
-  /* 1001 */ V(1, 15, 3),
-  /* 1010 */ V(15, 1, 3),
-  /* 1011 */ V(15, 1, 3),
-  /* 1100 */ V(9, 12, 3),
-  /* 1101 */ V(9, 12, 3),
-  /* 1110 */ V(12, 9, 3),
-  /* 1111 */ V(12, 9, 3),
-
-  /* 0000 0101 ... */
-  /* 000  */ V(5, 14, 3),	/* 200 */
-  /* 001  */ V(10, 11, 3),
-  /* 010  */ V(11, 10, 3),
-  /* 011  */ V(14, 5, 3),
-  /* 100  */ V(7, 13, 3),
-  /* 101  */ V(13, 7, 3),
-  /* 110  */ V(4, 14, 3),
-  /* 111  */ V(14, 4, 3),
-
-  /* 0000 0110 ... */
-  /* 000  */ V(8, 12, 3),	/* 208 */
-  /* 001  */ V(12, 8, 3),
-  /* 010  */ V(3, 14, 3),
-  /* 011  */ V(6, 13, 3),
-  /* 100  */ V(13, 6, 3),
-  /* 101  */ V(14, 3, 3),
-  /* 110  */ V(9, 11, 3),
-  /* 111  */ V(11, 9, 3),
-
-  /* 0000 0111 ... */
-  /* 0000 */ V(2, 14, 3),	/* 216 */
-  /* 0001 */ V(2, 14, 3),
-  /* 0010 */ V(10, 10, 3),
-  /* 0011 */ V(10, 10, 3),
-  /* 0100 */ V(14, 2, 3),
-  /* 0101 */ V(14, 2, 3),
-  /* 0110 */ V(1, 14, 3),
-  /* 0111 */ V(1, 14, 3),
-  /* 1000 */ V(14, 1, 3),
-  /* 1001 */ V(14, 1, 3),
-  /* 1010 */ V(0, 14, 4),
-  /* 1011 */ V(14, 0, 4),
-  /* 1100 */ V(5, 13, 3),
-  /* 1101 */ V(5, 13, 3),
-  /* 1110 */ V(13, 5, 3),
-  /* 1111 */ V(13, 5, 3),
-
-  /* 0000 1000 ... */
-  /* 000  */ V(7, 12, 3),	/* 232 */
-  /* 001  */ V(12, 7, 3),
-  /* 010  */ V(4, 13, 3),
-  /* 011  */ V(8, 11, 3),
-  /* 100  */ V(13, 4, 2),
-  /* 101  */ V(13, 4, 2),
-  /* 110  */ V(11, 8, 3),
-  /* 111  */ V(9, 10, 3),
-
-  /* 0000 1001 ... */
-  /* 000  */ V(10, 9, 3),	/* 240 */
-  /* 001  */ V(6, 12, 3),
-  /* 010  */ V(12, 6, 3),
-  /* 011  */ V(3, 13, 3),
-  /* 100  */ V(13, 3, 2),
-  /* 101  */ V(13, 3, 2),
-  /* 110  */ V(13, 2, 2),
-  /* 111  */ V(13, 2, 2),
-
-  /* 0000 1010 ... */
-  /* 000  */ V(2, 13, 3),	/* 248 */
-  /* 001  */ V(0, 13, 3),
-  /* 010  */ V(1, 13, 2),
-  /* 011  */ V(1, 13, 2),
-  /* 100  */ V(7, 11, 2),
-  /* 101  */ V(7, 11, 2),
-  /* 110  */ V(11, 7, 2),
-  /* 111  */ V(11, 7, 2),
-
-  /* 0000 1011 ... */
-  /* 000  */ V(13, 1, 2),	/* 256 */
-  /* 001  */ V(13, 1, 2),
-  /* 010  */ V(5, 12, 3),
-  /* 011  */ V(13, 0, 3),
-  /* 100  */ V(12, 5, 2),
-  /* 101  */ V(12, 5, 2),
-  /* 110  */ V(8, 10, 2),
-  /* 111  */ V(8, 10, 2),
-
-  /* 0000 1100 ... */
-  /* 00   */ V(10, 8, 2),	/* 264 */
-  /* 01   */ V(4, 12, 2),
-  /* 10   */ V(12, 4, 2),
-  /* 11   */ V(6, 11, 2),
-
-  /* 0000 1101 ... */
-  /* 000  */ V(11, 6, 2),	/* 268 */
-  /* 001  */ V(11, 6, 2),
-  /* 010  */ V(9, 9, 3),
-  /* 011  */ V(0, 12, 3),
-  /* 100  */ V(3, 12, 2),
-  /* 101  */ V(3, 12, 2),
-  /* 110  */ V(12, 3, 2),
-  /* 111  */ V(12, 3, 2),
-
-  /* 0000 1110 ... */
-  /* 000  */ V(7, 10, 2),	/* 276 */
-  /* 001  */ V(7, 10, 2),
-  /* 010  */ V(10, 7, 2),
-  /* 011  */ V(10, 7, 2),
-  /* 100  */ V(10, 6, 2),
-  /* 101  */ V(10, 6, 2),
-  /* 110  */ V(12, 0, 3),
-  /* 111  */ V(0, 11, 3),
-
-  /* 0000 1111 ... */
-  /* 00   */ V(12, 2, 1),	/* 284 */
-  /* 01   */ V(12, 2, 1),
-  /* 10   */ V(2, 12, 2),
-  /* 11   */ V(5, 11, 2),
-
-  /* 0001 0000 ... */
-  /* 00   */ V(11, 5, 2),	/* 288 */
-  /* 01   */ V(1, 12, 2),
-  /* 10   */ V(8, 9, 2),
-  /* 11   */ V(9, 8, 2),
-
-  /* 0001 0001 ... */
-  /* 00   */ V(12, 1, 2),	/* 292 */
-  /* 01   */ V(4, 11, 2),
-  /* 10   */ V(11, 4, 2),
-  /* 11   */ V(6, 10, 2),
-
-  /* 0001 0010 ... */
-  /* 00   */ V(3, 11, 2),	/* 296 */
-  /* 01   */ V(7, 9, 2),
-  /* 10   */ V(11, 3, 1),
-  /* 11   */ V(11, 3, 1),
-
-  /* 0001 0011 ... */
-  /* 00   */ V(9, 7, 2),	/* 300 */
-  /* 01   */ V(8, 8, 2),
-  /* 10   */ V(2, 11, 2),
-  /* 11   */ V(5, 10, 2),
-
-  /* 0001 0100 ... */
-  /* 00   */ V(11, 2, 1),	/* 304 */
-  /* 01   */ V(11, 2, 1),
-  /* 10   */ V(10, 5, 2),
-  /* 11   */ V(1, 11, 2),
-
-  /* 0001 0101 ... */
-  /* 00   */ V(11, 1, 1),	/* 308 */
-  /* 01   */ V(11, 1, 1),
-  /* 10   */ V(11, 0, 2),
-  /* 11   */ V(6, 9, 2),
-
-  /* 0001 0110 ... */
-  /* 00   */ V(9, 6, 2),	/* 312 */
-  /* 01   */ V(4, 10, 2),
-  /* 10   */ V(10, 4, 2),
-  /* 11   */ V(7, 8, 2),
-
-  /* 0001 0111 ... */
-  /* 00   */ V(8, 7, 2),	/* 316 */
-  /* 01   */ V(3, 10, 2),
-  /* 10   */ V(10, 3, 1),
-  /* 11   */ V(10, 3, 1),
-
-  /* 0001 1000 ... */
-  /* 0    */ V(5, 9, 1),	/* 320 */
-  /* 1    */ V(9, 5, 1),
-
-  /* 0001 1001 ... */
-  /* 0    */ V(2, 10, 1),	/* 322 */
-  /* 1    */ V(10, 2, 1),
-
-  /* 0001 1010 ... */
-  /* 0    */ V(1, 10, 1),	/* 324 */
-  /* 1    */ V(10, 1, 1),
-
-  /* 0001 1011 ... */
-  /* 00   */ V(0, 10, 2),	/* 326 */
-  /* 01   */ V(10, 0, 2),
-  /* 10   */ V(6, 8, 1),
-  /* 11   */ V(6, 8, 1),
-
-  /* 0001 1100 ... */
-  /* 0    */ V(8, 6, 1),	/* 330 */
-  /* 1    */ V(4, 9, 1),
-
-  /* 0001 1101 ... */
-  /* 0    */ V(9, 4, 1),	/* 332 */
-  /* 1    */ V(3, 9, 1),
-
-  /* 0001 1110 ... */
-  /* 00   */ V(9, 3, 1),	/* 334 */
-  /* 01   */ V(9, 3, 1),
-  /* 10   */ V(7, 7, 2),
-  /* 11   */ V(0, 9, 2),
-
-  /* 0001 1111 ... */
-  /* 0    */ V(5, 8, 1),	/* 338 */
-  /* 1    */ V(8, 5, 1),
-
-  /* 0010 0000 ... */
-  /* 0    */ V(2, 9, 1),	/* 340 */
-  /* 1    */ V(6, 7, 1),
-
-  /* 0010 0001 ... */
-  /* 0    */ V(7, 6, 1),	/* 342 */
-  /* 1    */ V(9, 2, 1),
-
-  /* 0010 0011 ... */
-  /* 0    */ V(1, 9, 1),	/* 344 */
-  /* 1    */ V(9, 0, 1),
-
-  /* 0010 0100 ... */
-  /* 0    */ V(4, 8, 1),	/* 346 */
-  /* 1    */ V(8, 4, 1),
-
-  /* 0010 0101 ... */
-  /* 0    */ V(5, 7, 1),	/* 348 */
-  /* 1    */ V(7, 5, 1),
-
-  /* 0010 0110 ... */
-  /* 0    */ V(3, 8, 1),	/* 350 */
-  /* 1    */ V(8, 3, 1),
-
-  /* 0010 0111 ... */
-  /* 0    */ V(6, 6, 1),	/* 352 */
-  /* 1    */ V(4, 7, 1),
-
-  /* 0010 1100 ... */
-  /* 0    */ V(7, 4, 1),	/* 354 */
-  /* 1    */ V(0, 8, 1),
-
-  /* 0010 1101 ... */
-  /* 0    */ V(8, 0, 1),	/* 356 */
-  /* 1    */ V(5, 6, 1),
-
-  /* 0010 1110 ... */
-  /* 0    */ V(6, 5, 1),	/* 358 */
-  /* 1    */ V(3, 7, 1),
-
-  /* 0010 1111 ... */
-  /* 0    */ V(7, 3, 1),	/* 360 */
-  /* 1    */ V(4, 6, 1),
-
-  /* 0011 0110 ... */
-  /* 0    */ V(0, 7, 1),	/* 362 */
-  /* 1    */ V(7, 0, 1),
-
-  /* 0011 1110 ... */
-  /* 0    */ V(0, 6, 1),	/* 364 */
-  /* 1    */ V(6, 0, 1),
-
-  /* 0000 0000 0000 ... */
-  /* 0    */ V(15, 15, 1),	/* 366 */
-  /* 1    */ V(14, 15, 1),
-
-  /* 0000 0000 0001 ... */
-  /* 0    */ V(15, 14, 1),	/* 368 */
-  /* 1    */ V(13, 15, 1),
-
-  /* 0000 0000 0011 ... */
-  /* 0    */ V(15, 13, 1),	/* 370 */
-  /* 1    */ V(12, 15, 1),
-
-  /* 0000 0000 0100 ... */
-  /* 0    */ V(15, 12, 1),	/* 372 */
-  /* 1    */ V(13, 14, 1),
-
-  /* 0000 0000 0101 ... */
-  /* 0    */ V(14, 13, 1),	/* 374 */
-  /* 1    */ V(11, 15, 1),
-
-  /* 0000 0000 0111 ... */
-  /* 0    */ V(12, 14, 1),	/* 376 */
-  /* 1    */ V(14, 12, 1),
-
-  /* 0000 0001 1111 ... */
-  /* 0    */ V(10, 14, 1),	/* 378 */
-  /* 1    */ V(0, 15, 1)
-};
-
-static
-union huffpair const hufftab16[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 4),
-  /* 0011 */ PTR(64, 2),
-  /* 0100 */ V(1, 1, 4),
-  /* 0101 */ V(0, 1, 4),
-  /* 0110 */ V(1, 0, 3),
-  /* 0111 */ V(1, 0, 3),
-  /* 1000 */ V(0, 0, 1),
-  /* 1001 */ V(0, 0, 1),
-  /* 1010 */ V(0, 0, 1),
-  /* 1011 */ V(0, 0, 1),
-  /* 1100 */ V(0, 0, 1),
-  /* 1101 */ V(0, 0, 1),
-  /* 1110 */ V(0, 0, 1),
-  /* 1111 */ V(0, 0, 1),
-
-  /* 0000 ... */
-  /* 0000 */ PTR(68, 3),	/* 16 */
-  /* 0001 */ PTR(76, 3),
-  /* 0010 */ PTR(84, 2),
-  /* 0011 */ V(15, 15, 4),
-  /* 0100 */ PTR(88, 2),
-  /* 0101 */ PTR(92, 1),
-  /* 0110 */ PTR(94, 4),
-  /* 0111 */ V(15, 2, 4),
-  /* 1000 */ PTR(110, 1),
-  /* 1001 */ V(1, 15, 4),
-  /* 1010 */ V(15, 1, 4),
-  /* 1011 */ PTR(112, 4),
-  /* 1100 */ PTR(128, 4),
-  /* 1101 */ PTR(144, 4),
-  /* 1110 */ PTR(160, 4),
-  /* 1111 */ PTR(176, 4),
-
-  /* 0001 ... */
-  /* 0000 */ PTR(192, 4),	/* 32 */
-  /* 0001 */ PTR(208, 3),
-  /* 0010 */ PTR(216, 3),
-  /* 0011 */ PTR(224, 3),
-  /* 0100 */ PTR(232, 3),
-  /* 0101 */ PTR(240, 3),
-  /* 0110 */ PTR(248, 3),
-  /* 0111 */ PTR(256, 3),
-  /* 1000 */ PTR(264, 2),
-  /* 1001 */ PTR(268, 2),
-  /* 1010 */ PTR(272, 1),
-  /* 1011 */ PTR(274, 2),
-  /* 1100 */ PTR(278, 2),
-  /* 1101 */ PTR(282, 1),
-  /* 1110 */ V(5, 1, 4),
-  /* 1111 */ PTR(284, 1),
-
-  /* 0010 ... */
-  /* 0000 */ PTR(286, 1),	/* 48 */
-  /* 0001 */ PTR(288, 1),
-  /* 0010 */ PTR(290, 1),
-  /* 0011 */ V(1, 4, 4),
-  /* 0100 */ V(4, 1, 4),
-  /* 0101 */ PTR(292, 1),
-  /* 0110 */ V(2, 3, 4),
-  /* 0111 */ V(3, 2, 4),
-  /* 1000 */ V(1, 3, 3),
-  /* 1001 */ V(1, 3, 3),
-  /* 1010 */ V(3, 1, 3),
-  /* 1011 */ V(3, 1, 3),
-  /* 1100 */ V(0, 3, 4),
-  /* 1101 */ V(3, 0, 4),
-  /* 1110 */ V(2, 2, 3),
-  /* 1111 */ V(2, 2, 3),
-
-  /* 0011 ... */
-  /* 00   */ V(1, 2, 2),	/* 64 */
-  /* 01   */ V(2, 1, 2),
-  /* 10   */ V(0, 2, 2),
-  /* 11   */ V(2, 0, 2),
-
-  /* 0000 0000 ... */
-  /* 000  */ V(14, 15, 3),	/* 68 */
-  /* 001  */ V(15, 14, 3),
-  /* 010  */ V(13, 15, 3),
-  /* 011  */ V(15, 13, 3),
-  /* 100  */ V(12, 15, 3),
-  /* 101  */ V(15, 12, 3),
-  /* 110  */ V(11, 15, 3),
-  /* 111  */ V(15, 11, 3),
-
-  /* 0000 0001 ... */
-  /* 000  */ V(10, 15, 2),	/* 76 */
-  /* 001  */ V(10, 15, 2),
-  /* 010  */ V(15, 10, 3),
-  /* 011  */ V(9, 15, 3),
-  /* 100  */ V(15, 9, 3),
-  /* 101  */ V(15, 8, 3),
-  /* 110  */ V(8, 15, 2),
-  /* 111  */ V(8, 15, 2),
-
-  /* 0000 0010 ... */
-  /* 00   */ V(7, 15, 2),	/* 84 */
-  /* 01   */ V(15, 7, 2),
-  /* 10   */ V(6, 15, 2),
-  /* 11   */ V(15, 6, 2),
-
-  /* 0000 0100 ... */
-  /* 00   */ V(5, 15, 2),	/* 88 */
-  /* 01   */ V(15, 5, 2),
-  /* 10   */ V(4, 15, 1),
-  /* 11   */ V(4, 15, 1),
-
-  /* 0000 0101 ... */
-  /* 0    */ V(15, 4, 1),	/* 92 */
-  /* 1    */ V(15, 3, 1),
-
-  /* 0000 0110 ... */
-  /* 0000 */ V(15, 0, 1),	/* 94 */
-  /* 0001 */ V(15, 0, 1),
-  /* 0010 */ V(15, 0, 1),
-  /* 0011 */ V(15, 0, 1),
-  /* 0100 */ V(15, 0, 1),
-  /* 0101 */ V(15, 0, 1),
-  /* 0110 */ V(15, 0, 1),
-  /* 0111 */ V(15, 0, 1),
-  /* 1000 */ V(3, 15, 2),
-  /* 1001 */ V(3, 15, 2),
-  /* 1010 */ V(3, 15, 2),
-  /* 1011 */ V(3, 15, 2),
-  /* 1100 */ PTR(294, 4),
-  /* 1101 */ PTR(310, 3),
-  /* 1110 */ PTR(318, 3),
-  /* 1111 */ PTR(326, 3),
-
-  /* 0000 1000 ... */
-  /* 0    */ V(2, 15, 1),	/* 110 */
-  /* 1    */ V(0, 15, 1),
-
-  /* 0000 1011 ... */
-  /* 0000 */ PTR(334, 2),	/* 112 */
-  /* 0001 */ PTR(338, 2),
-  /* 0010 */ PTR(342, 2),
-  /* 0011 */ PTR(346, 1),
-  /* 0100 */ PTR(348, 2),
-  /* 0101 */ PTR(352, 2),
-  /* 0110 */ PTR(356, 1),
-  /* 0111 */ PTR(358, 2),
-  /* 1000 */ PTR(362, 2),
-  /* 1001 */ PTR(366, 2),
-  /* 1010 */ PTR(370, 2),
-  /* 1011 */ V(14, 3, 4),
-  /* 1100 */ PTR(374, 1),
-  /* 1101 */ PTR(376, 1),
-  /* 1110 */ PTR(378, 1),
-  /* 1111 */ PTR(380, 1),
-
-  /* 0000 1100 ... */
-  /* 0000 */ PTR(382, 1),	/* 128 */
-  /* 0001 */ PTR(384, 1),
-  /* 0010 */ PTR(386, 1),
-  /* 0011 */ V(0, 13, 4),
-  /* 0100 */ PTR(388, 1),
-  /* 0101 */ PTR(390, 1),
-  /* 0110 */ PTR(392, 1),
-  /* 0111 */ V(3, 12, 4),
-  /* 1000 */ PTR(394, 1),
-  /* 1001 */ V(1, 12, 4),
-  /* 1010 */ V(12, 0, 4),
-  /* 1011 */ PTR(396, 1),
-  /* 1100 */ V(14, 2, 3),
-  /* 1101 */ V(14, 2, 3),
-  /* 1110 */ V(2, 14, 4),
-  /* 1111 */ V(1, 14, 4),
-
-  /* 0000 1101 ... */
-  /* 0000 */ V(13, 3, 4),	/* 144 */
-  /* 0001 */ V(2, 13, 4),
-  /* 0010 */ V(13, 2, 4),
-  /* 0011 */ V(13, 1, 4),
-  /* 0100 */ V(3, 11, 4),
-  /* 0101 */ PTR(398, 1),
-  /* 0110 */ V(1, 13, 3),
-  /* 0111 */ V(1, 13, 3),
-  /* 1000 */ V(12, 4, 4),
-  /* 1001 */ V(6, 11, 4),
-  /* 1010 */ V(12, 3, 4),
-  /* 1011 */ V(10, 7, 4),
-  /* 1100 */ V(2, 12, 3),
-  /* 1101 */ V(2, 12, 3),
-  /* 1110 */ V(12, 2, 4),
-  /* 1111 */ V(11, 5, 4),
-
-  /* 0000 1110 ... */
-  /* 0000 */ V(12, 1, 4),	/* 160 */
-  /* 0001 */ V(0, 12, 4),
-  /* 0010 */ V(4, 11, 4),
-  /* 0011 */ V(11, 4, 4),
-  /* 0100 */ V(6, 10, 4),
-  /* 0101 */ V(10, 6, 4),
-  /* 0110 */ V(11, 3, 3),
-  /* 0111 */ V(11, 3, 3),
-  /* 1000 */ V(5, 10, 4),
-  /* 1001 */ V(10, 5, 4),
-  /* 1010 */ V(2, 11, 3),
-  /* 1011 */ V(2, 11, 3),
-  /* 1100 */ V(11, 2, 3),
-  /* 1101 */ V(11, 2, 3),
-  /* 1110 */ V(1, 11, 3),
-  /* 1111 */ V(1, 11, 3),
-
-  /* 0000 1111 ... */
-  /* 0000 */ V(11, 1, 3),	/* 176 */
-  /* 0001 */ V(11, 1, 3),
-  /* 0010 */ V(0, 11, 4),
-  /* 0011 */ V(11, 0, 4),
-  /* 0100 */ V(6, 9, 4),
-  /* 0101 */ V(9, 6, 4),
-  /* 0110 */ V(4, 10, 4),
-  /* 0111 */ V(10, 4, 4),
-  /* 1000 */ V(7, 8, 4),
-  /* 1001 */ V(8, 7, 4),
-  /* 1010 */ V(10, 3, 3),
-  /* 1011 */ V(10, 3, 3),
-  /* 1100 */ V(3, 10, 4),
-  /* 1101 */ V(5, 9, 4),
-  /* 1110 */ V(2, 10, 3),
-  /* 1111 */ V(2, 10, 3),
-
-  /* 0001 0000 ... */
-  /* 0000 */ V(9, 5, 4),	/* 192 */
-  /* 0001 */ V(6, 8, 4),
-  /* 0010 */ V(10, 1, 3),
-  /* 0011 */ V(10, 1, 3),
-  /* 0100 */ V(8, 6, 4),
-  /* 0101 */ V(7, 7, 4),
-  /* 0110 */ V(9, 4, 3),
-  /* 0111 */ V(9, 4, 3),
-  /* 1000 */ V(4, 9, 4),
-  /* 1001 */ V(5, 7, 4),
-  /* 1010 */ V(6, 7, 3),
-  /* 1011 */ V(6, 7, 3),
-  /* 1100 */ V(10, 2, 2),
-  /* 1101 */ V(10, 2, 2),
-  /* 1110 */ V(10, 2, 2),
-  /* 1111 */ V(10, 2, 2),
-
-  /* 0001 0001 ... */
-  /* 000  */ V(1, 10, 2),	/* 208 */
-  /* 001  */ V(1, 10, 2),
-  /* 010  */ V(0, 10, 3),
-  /* 011  */ V(10, 0, 3),
-  /* 100  */ V(3, 9, 3),
-  /* 101  */ V(9, 3, 3),
-  /* 110  */ V(5, 8, 3),
-  /* 111  */ V(8, 5, 3),
-
-  /* 0001 0010 ... */
-  /* 000  */ V(2, 9, 2),	/* 216 */
-  /* 001  */ V(2, 9, 2),
-  /* 010  */ V(9, 2, 2),
-  /* 011  */ V(9, 2, 2),
-  /* 100  */ V(7, 6, 3),
-  /* 101  */ V(0, 9, 3),
-  /* 110  */ V(1, 9, 2),
-  /* 111  */ V(1, 9, 2),
-
-  /* 0001 0011 ... */
-  /* 000  */ V(9, 1, 2),	/* 224 */
-  /* 001  */ V(9, 1, 2),
-  /* 010  */ V(9, 0, 3),
-  /* 011  */ V(4, 8, 3),
-  /* 100  */ V(8, 4, 3),
-  /* 101  */ V(7, 5, 3),
-  /* 110  */ V(3, 8, 3),
-  /* 111  */ V(8, 3, 3),
-
-  /* 0001 0100 ... */
-  /* 000  */ V(6, 6, 3),	/* 232 */
-  /* 001  */ V(2, 8, 3),
-  /* 010  */ V(8, 2, 2),
-  /* 011  */ V(8, 2, 2),
-  /* 100  */ V(4, 7, 3),
-  /* 101  */ V(7, 4, 3),
-  /* 110  */ V(1, 8, 2),
-  /* 111  */ V(1, 8, 2),
-
-  /* 0001 0101 ... */
-  /* 000  */ V(8, 1, 2),	/* 240 */
-  /* 001  */ V(8, 1, 2),
-  /* 010  */ V(8, 0, 2),
-  /* 011  */ V(8, 0, 2),
-  /* 100  */ V(0, 8, 3),
-  /* 101  */ V(5, 6, 3),
-  /* 110  */ V(3, 7, 2),
-  /* 111  */ V(3, 7, 2),
-
-  /* 0001 0110 ... */
-  /* 000  */ V(7, 3, 2),	/* 248 */
-  /* 001  */ V(7, 3, 2),
-  /* 010  */ V(6, 5, 3),
-  /* 011  */ V(4, 6, 3),
-  /* 100  */ V(2, 7, 2),
-  /* 101  */ V(2, 7, 2),
-  /* 110  */ V(7, 2, 2),
-  /* 111  */ V(7, 2, 2),
-
-  /* 0001 0111 ... */
-  /* 000  */ V(6, 4, 3),	/* 256 */
-  /* 001  */ V(5, 5, 3),
-  /* 010  */ V(0, 7, 2),
-  /* 011  */ V(0, 7, 2),
-  /* 100  */ V(1, 7, 1),
-  /* 101  */ V(1, 7, 1),
-  /* 110  */ V(1, 7, 1),
-  /* 111  */ V(1, 7, 1),
-
-  /* 0001 1000 ... */
-  /* 00   */ V(7, 1, 1),	/* 264  */
-  /* 01   */ V(7, 1, 1),
-  /* 10   */ V(7, 0, 2),
-  /* 11   */ V(3, 6, 2),
-
-  /* 0001 1001 ... */
-  /* 00   */ V(6, 3, 2),	/* 268 */
-  /* 01   */ V(4, 5, 2),
-  /* 10   */ V(5, 4, 2),
-  /* 11   */ V(2, 6, 2),
-
-  /* 0001 1010 ... */
-  /* 0    */ V(6, 2, 1),	/* 272 */
-  /* 1    */ V(1, 6, 1),
-
-  /* 0001 1011 ... */
-  /* 00   */ V(6, 1, 1),	/* 274 */
-  /* 01   */ V(6, 1, 1),
-  /* 10   */ V(0, 6, 2),
-  /* 11   */ V(6, 0, 2),
-
-  /* 0001 1100 ... */
-  /* 00   */ V(5, 3, 1),	/* 278 */
-  /* 01   */ V(5, 3, 1),
-  /* 10   */ V(3, 5, 2),
-  /* 11   */ V(4, 4, 2),
-
-  /* 0001 1101 ... */
-  /* 0    */ V(2, 5, 1),	/* 282 */
-  /* 1    */ V(5, 2, 1),
-
-  /* 0001 1111 ... */
-  /* 0    */ V(1, 5, 1),	/* 284 */
-  /* 1    */ V(0, 5, 1),
-
-  /* 0010 0000 ... */
-  /* 0    */ V(3, 4, 1),	/* 286 */
-  /* 1    */ V(4, 3, 1),
-
-  /* 0010 0001 ... */
-  /* 0    */ V(5, 0, 1),	/* 288 */
-  /* 1    */ V(2, 4, 1),
-
-  /* 0010 0010 ... */
-  /* 0    */ V(4, 2, 1),	/* 290 */
-  /* 1    */ V(3, 3, 1),
-
-  /* 0010 0101 ... */
-  /* 0    */ V(0, 4, 1),	/* 292 */
-  /* 1    */ V(4, 0, 1),
-
-  /* 0000 0110 1100 ... */
-  /* 0000 */ V(12, 14, 4),	/* 294 */
-  /* 0001 */ PTR(400, 1),
-  /* 0010 */ V(13, 14, 3),
-  /* 0011 */ V(13, 14, 3),
-  /* 0100 */ V(14, 9, 3),
-  /* 0101 */ V(14, 9, 3),
-  /* 0110 */ V(14, 10, 4),
-  /* 0111 */ V(13, 9, 4),
-  /* 1000 */ V(14, 14, 2),
-  /* 1001 */ V(14, 14, 2),
-  /* 1010 */ V(14, 14, 2),
-  /* 1011 */ V(14, 14, 2),
-  /* 1100 */ V(14, 13, 3),
-  /* 1101 */ V(14, 13, 3),
-  /* 1110 */ V(14, 11, 3),
-  /* 1111 */ V(14, 11, 3),
-
-  /* 0000 0110 1101 ... */
-  /* 000  */ V(11, 14, 2),	/* 310 */
-  /* 001  */ V(11, 14, 2),
-  /* 010  */ V(12, 13, 2),
-  /* 011  */ V(12, 13, 2),
-  /* 100  */ V(13, 12, 3),
-  /* 101  */ V(13, 11, 3),
-  /* 110  */ V(10, 14, 2),
-  /* 111  */ V(10, 14, 2),
-
-  /* 0000 0110 1110 ... */
-  /* 000  */ V(12, 12, 2),	/* 318 */
-  /* 001  */ V(12, 12, 2),
-  /* 010  */ V(10, 13, 3),
-  /* 011  */ V(13, 10, 3),
-  /* 100  */ V(7, 14, 3),
-  /* 101  */ V(10, 12, 3),
-  /* 110  */ V(12, 10, 2),
-  /* 111  */ V(12, 10, 2),
-
-  /* 0000 0110 1111 ... */
-  /* 000  */ V(12, 9, 3),	/* 326 */
-  /* 001  */ V(7, 13, 3),
-  /* 010  */ V(5, 14, 2),
-  /* 011  */ V(5, 14, 2),
-  /* 100  */ V(11, 13, 1),
-  /* 101  */ V(11, 13, 1),
-  /* 110  */ V(11, 13, 1),
-  /* 111  */ V(11, 13, 1),
-
-  /* 0000 1011 0000 ... */
-  /* 00   */ V(9, 14, 1),	/* 334 */
-  /* 01   */ V(9, 14, 1),
-  /* 10   */ V(11, 12, 2),
-  /* 11   */ V(12, 11, 2),
-
-  /* 0000 1011 0001 ... */
-  /* 00   */ V(8, 14, 2),	/* 338 */
-  /* 01   */ V(14, 8, 2),
-  /* 10   */ V(9, 13, 2),
-  /* 11   */ V(14, 7, 2),
-
-  /* 0000 1011 0010 ... */
-  /* 00   */ V(11, 11, 2),	/* 342 */
-  /* 01   */ V(8, 13, 2),
-  /* 10   */ V(13, 8, 2),
-  /* 11   */ V(6, 14, 2),
-
-  /* 0000 1011 0011 ... */
-  /* 0    */ V(14, 6, 1),	/* 346 */
-  /* 1    */ V(9, 12, 1),
-
-  /* 0000 1011 0100 ... */
-  /* 00   */ V(10, 11, 2),	/* 348 */
-  /* 01   */ V(11, 10, 2),
-  /* 10   */ V(14, 5, 2),
-  /* 11   */ V(13, 7, 2),
-
-  /* 0000 1011 0101 ... */
-  /* 00   */ V(4, 14, 1),	/* 352 */
-  /* 01   */ V(4, 14, 1),
-  /* 10   */ V(14, 4, 2),
-  /* 11   */ V(8, 12, 2),
-
-  /* 0000 1011 0110 ... */
-  /* 0    */ V(12, 8, 1),	/* 356 */
-  /* 1    */ V(3, 14, 1),
-
-  /* 0000 1011 0111 ... */
-  /* 00   */ V(6, 13, 1),	/* 358 */
-  /* 01   */ V(6, 13, 1),
-  /* 10   */ V(13, 6, 2),
-  /* 11   */ V(9, 11, 2),
-
-  /* 0000 1011 1000 ... */
-  /* 00   */ V(11, 9, 2),	/* 362 */
-  /* 01   */ V(10, 10, 2),
-  /* 10   */ V(14, 1, 1),
-  /* 11   */ V(14, 1, 1),
-
-  /* 0000 1011 1001 ... */
-  /* 00   */ V(13, 4, 1),	/* 366 */
-  /* 01   */ V(13, 4, 1),
-  /* 10   */ V(11, 8, 2),
-  /* 11   */ V(10, 9, 2),
-
-  /* 0000 1011 1010 ... */
-  /* 00   */ V(7, 11, 1),	/* 370 */
-  /* 01   */ V(7, 11, 1),
-  /* 10   */ V(11, 7, 2),
-  /* 11   */ V(13, 0, 2),
-
-  /* 0000 1011 1100 ... */
-  /* 0    */ V(0, 14, 1),	/* 374 */
-  /* 1    */ V(14, 0, 1),
-
-  /* 0000 1011 1101 ... */
-  /* 0    */ V(5, 13, 1),	/* 376 */
-  /* 1    */ V(13, 5, 1),
-
-  /* 0000 1011 1110 ... */
-  /* 0    */ V(7, 12, 1),	/* 378 */
-  /* 1    */ V(12, 7, 1),
-
-  /* 0000 1011 1111 ... */
-  /* 0    */ V(4, 13, 1),	/* 380 */
-  /* 1    */ V(8, 11, 1),
-
-  /* 0000 1100 0000 ... */
-  /* 0    */ V(9, 10, 1),	/* 382 */
-  /* 1    */ V(6, 12, 1),
-
-  /* 0000 1100 0001 ... */
-  /* 0    */ V(12, 6, 1),	/* 384 */
-  /* 1    */ V(3, 13, 1),
-
-  /* 0000 1100 0010 ... */
-  /* 0    */ V(5, 12, 1),	/* 386 */
-  /* 1    */ V(12, 5, 1),
-
-  /* 0000 1100 0100 ... */
-  /* 0    */ V(8, 10, 1),	/* 388 */
-  /* 1    */ V(10, 8, 1),
-
-  /* 0000 1100 0101 ... */
-  /* 0    */ V(9, 9, 1),	/* 390 */
-  /* 1    */ V(4, 12, 1),
-
-  /* 0000 1100 0110 ... */
-  /* 0    */ V(11, 6, 1),	/* 392 */
-  /* 1    */ V(7, 10, 1),
-
-  /* 0000 1100 1000 ... */
-  /* 0    */ V(5, 11, 1),	/* 394 */
-  /* 1    */ V(8, 9, 1),
-
-  /* 0000 1100 1011 ... */
-  /* 0    */ V(9, 8, 1),	/* 396 */
-  /* 1    */ V(7, 9, 1),
-
-  /* 0000 1101 0101 ... */
-  /* 0    */ V(9, 7, 1),	/* 398 */
-  /* 1    */ V(8, 8, 1),
-
-  /* 0000 0110 1100 0001 ... */
-  /* 0    */ V(14, 12, 1),	/* 400 */
-  /* 1    */ V(13, 13, 1)
-};
-
-static
-union huffpair const hufftab24[] = {
-  /* 0000 */ PTR(16, 4),
-  /* 0001 */ PTR(32, 4),
-  /* 0010 */ PTR(48, 4),
-  /* 0011 */ V(15, 15, 4),
-  /* 0100 */ PTR(64, 4),
-  /* 0101 */ PTR(80, 4),
-  /* 0110 */ PTR(96, 4),
-  /* 0111 */ PTR(112, 4),
-  /* 1000 */ PTR(128, 4),
-  /* 1001 */ PTR(144, 4),
-  /* 1010 */ PTR(160, 3),
-  /* 1011 */ PTR(168, 2),
-  /* 1100 */ V(1, 1, 4),
-  /* 1101 */ V(0, 1, 4),
-  /* 1110 */ V(1, 0, 4),
-  /* 1111 */ V(0, 0, 4),
-
-  /* 0000 ... */
-  /* 0000 */ V(14, 15, 4),	/* 16 */
-  /* 0001 */ V(15, 14, 4),
-  /* 0010 */ V(13, 15, 4),
-  /* 0011 */ V(15, 13, 4),
-  /* 0100 */ V(12, 15, 4),
-  /* 0101 */ V(15, 12, 4),
-  /* 0110 */ V(11, 15, 4),
-  /* 0111 */ V(15, 11, 4),
-  /* 1000 */ V(15, 10, 3),
-  /* 1001 */ V(15, 10, 3),
-  /* 1010 */ V(10, 15, 4),
-  /* 1011 */ V(9, 15, 4),
-  /* 1100 */ V(15, 9, 3),
-  /* 1101 */ V(15, 9, 3),
-  /* 1110 */ V(15, 8, 3),
-  /* 1111 */ V(15, 8, 3),
-
-  /* 0001 ... */
-  /* 0000 */ V(8, 15, 4),	/* 32 */
-  /* 0001 */ V(7, 15, 4),
-  /* 0010 */ V(15, 7, 3),
-  /* 0011 */ V(15, 7, 3),
-  /* 0100 */ V(6, 15, 3),
-  /* 0101 */ V(6, 15, 3),
-  /* 0110 */ V(15, 6, 3),
-  /* 0111 */ V(15, 6, 3),
-  /* 1000 */ V(5, 15, 3),
-  /* 1001 */ V(5, 15, 3),
-  /* 1010 */ V(15, 5, 3),
-  /* 1011 */ V(15, 5, 3),
-  /* 1100 */ V(4, 15, 3),
-  /* 1101 */ V(4, 15, 3),
-  /* 1110 */ V(15, 4, 3),
-  /* 1111 */ V(15, 4, 3),
-
-  /* 0010 ... */
-  /* 0000 */ V(3, 15, 3),	/* 48 */
-  /* 0001 */ V(3, 15, 3),
-  /* 0010 */ V(15, 3, 3),
-  /* 0011 */ V(15, 3, 3),
-  /* 0100 */ V(2, 15, 3),
-  /* 0101 */ V(2, 15, 3),
-  /* 0110 */ V(15, 2, 3),
-  /* 0111 */ V(15, 2, 3),
-  /* 1000 */ V(15, 1, 3),
-  /* 1001 */ V(15, 1, 3),
-  /* 1010 */ V(1, 15, 4),
-  /* 1011 */ V(15, 0, 4),
-  /* 1100 */ PTR(172, 3),
-  /* 1101 */ PTR(180, 3),
-  /* 1110 */ PTR(188, 3),
-  /* 1111 */ PTR(196, 3),
-
-  /* 0100 ... */
-  /* 0000 */ PTR(204, 4),	/* 64 */
-  /* 0001 */ PTR(220, 3),
-  /* 0010 */ PTR(228, 3),
-  /* 0011 */ PTR(236, 3),
-  /* 0100 */ PTR(244, 2),
-  /* 0101 */ PTR(248, 2),
-  /* 0110 */ PTR(252, 2),
-  /* 0111 */ PTR(256, 2),
-  /* 1000 */ PTR(260, 2),
-  /* 1001 */ PTR(264, 2),
-  /* 1010 */ PTR(268, 2),
-  /* 1011 */ PTR(272, 2),
-  /* 1100 */ PTR(276, 2),
-  /* 1101 */ PTR(280, 3),
-  /* 1110 */ PTR(288, 2),
-  /* 1111 */ PTR(292, 2),
-
-  /* 0101 ... */
-  /* 0000 */ PTR(296, 2),	/* 80 */
-  /* 0001 */ PTR(300, 3),
-  /* 0010 */ PTR(308, 2),
-  /* 0011 */ PTR(312, 3),
-  /* 0100 */ PTR(320, 1),
-  /* 0101 */ PTR(322, 2),
-  /* 0110 */ PTR(326, 2),
-  /* 0111 */ PTR(330, 1),
-  /* 1000 */ PTR(332, 2),
-  /* 1001 */ PTR(336, 1),
-  /* 1010 */ PTR(338, 1),
-  /* 1011 */ PTR(340, 1),
-  /* 1100 */ PTR(342, 1),
-  /* 1101 */ PTR(344, 1),
-  /* 1110 */ PTR(346, 1),
-  /* 1111 */ PTR(348, 1),
-
-  /* 0110 ... */
-  /* 0000 */ PTR(350, 1),	/* 96 */
-  /* 0001 */ PTR(352, 1),
-  /* 0010 */ PTR(354, 1),
-  /* 0011 */ PTR(356, 1),
-  /* 0100 */ PTR(358, 1),
-  /* 0101 */ PTR(360, 1),
-  /* 0110 */ PTR(362, 1),
-  /* 0111 */ PTR(364, 1),
-  /* 1000 */ PTR(366, 1),
-  /* 1001 */ PTR(368, 1),
-  /* 1010 */ PTR(370, 2),
-  /* 1011 */ PTR(374, 1),
-  /* 1100 */ PTR(376, 2),
-  /* 1101 */ V(7, 3, 4),
-  /* 1110 */ PTR(380, 1),
-  /* 1111 */ V(7, 2, 4),
-
-  /* 0111 ... */
-  /* 0000 */ V(4, 6, 4),	/* 112 */
-  /* 0001 */ V(6, 4, 4),
-  /* 0010 */ V(5, 5, 4),
-  /* 0011 */ V(7, 1, 4),
-  /* 0100 */ V(3, 6, 4),
-  /* 0101 */ V(6, 3, 4),
-  /* 0110 */ V(4, 5, 4),
-  /* 0111 */ V(5, 4, 4),
-  /* 1000 */ V(2, 6, 4),
-  /* 1001 */ V(6, 2, 4),
-  /* 1010 */ V(1, 6, 4),
-  /* 1011 */ V(6, 1, 4),
-  /* 1100 */ PTR(382, 1),
-  /* 1101 */ V(3, 5, 4),
-  /* 1110 */ V(5, 3, 4),
-  /* 1111 */ V(4, 4, 4),
-
-  /* 1000 ... */
-  /* 0000 */ V(2, 5, 4),	/* 128 */
-  /* 0001 */ V(5, 2, 4),
-  /* 0010 */ V(1, 5, 4),
-  /* 0011 */ PTR(384, 1),
-  /* 0100 */ V(5, 1, 3),
-  /* 0101 */ V(5, 1, 3),
-  /* 0110 */ V(3, 4, 4),
-  /* 0111 */ V(4, 3, 4),
-  /* 1000 */ V(2, 4, 3),
-  /* 1001 */ V(2, 4, 3),
-  /* 1010 */ V(4, 2, 3),
-  /* 1011 */ V(4, 2, 3),
-  /* 1100 */ V(3, 3, 3),
-  /* 1101 */ V(3, 3, 3),
-  /* 1110 */ V(1, 4, 3),
-  /* 1111 */ V(1, 4, 3),
-
-  /* 1001 ... */
-  /* 0000 */ V(4, 1, 3),	/* 144 */
-  /* 0001 */ V(4, 1, 3),
-  /* 0010 */ V(0, 4, 4),
-  /* 0011 */ V(4, 0, 4),
-  /* 0100 */ V(2, 3, 3),
-  /* 0101 */ V(2, 3, 3),
-  /* 0110 */ V(3, 2, 3),
-  /* 0111 */ V(3, 2, 3),
-  /* 1000 */ V(1, 3, 2),
-  /* 1001 */ V(1, 3, 2),
-  /* 1010 */ V(1, 3, 2),
-  /* 1011 */ V(1, 3, 2),
-  /* 1100 */ V(3, 1, 2),
-  /* 1101 */ V(3, 1, 2),
-  /* 1110 */ V(3, 1, 2),
-  /* 1111 */ V(3, 1, 2),
-
-  /* 1010 ... */
-  /* 000  */ V(0, 3, 3),	/* 160 */
-  /* 001  */ V(3, 0, 3),
-  /* 010  */ V(2, 2, 2),
-  /* 011  */ V(2, 2, 2),
-  /* 100  */ V(1, 2, 1),
-  /* 101  */ V(1, 2, 1),
-  /* 110  */ V(1, 2, 1),
-  /* 111  */ V(1, 2, 1),
-
-  /* 1011 ... */
-  /* 00   */ V(2, 1, 1),	/* 168 */
-  /* 01   */ V(2, 1, 1),
-  /* 10   */ V(0, 2, 2),
-  /* 11   */ V(2, 0, 2),
-
-  /* 0010 1100 ... */
-  /* 000  */ V(0, 15, 1),	/* 172 */
-  /* 001  */ V(0, 15, 1),
-  /* 010  */ V(0, 15, 1),
-  /* 011  */ V(0, 15, 1),
-  /* 100  */ V(14, 14, 3),
-  /* 101  */ V(13, 14, 3),
-  /* 110  */ V(14, 13, 3),
-  /* 111  */ V(12, 14, 3),
-
-  /* 0010 1101 ... */
-  /* 000  */ V(14, 12, 3),	/* 180 */
-  /* 001  */ V(13, 13, 3),
-  /* 010  */ V(11, 14, 3),
-  /* 011  */ V(14, 11, 3),
-  /* 100  */ V(12, 13, 3),
-  /* 101  */ V(13, 12, 3),
-  /* 110  */ V(10, 14, 3),
-  /* 111  */ V(14, 10, 3),
-
-  /* 0010 1110 ... */
-  /* 000  */ V(11, 13, 3),	/* 188 */
-  /* 001  */ V(13, 11, 3),
-  /* 010  */ V(12, 12, 3),
-  /* 011  */ V(9, 14, 3),
-  /* 100  */ V(14, 9, 3),
-  /* 101  */ V(10, 13, 3),
-  /* 110  */ V(13, 10, 3),
-  /* 111  */ V(11, 12, 3),
-
-  /* 0010 1111 ... */
-  /* 000  */ V(12, 11, 3),	/* 196 */
-  /* 001  */ V(8, 14, 3),
-  /* 010  */ V(14, 8, 3),
-  /* 011  */ V(9, 13, 3),
-  /* 100  */ V(13, 9, 3),
-  /* 101  */ V(7, 14, 3),
-  /* 110  */ V(14, 7, 3),
-  /* 111  */ V(10, 12, 3),
-
-  /* 0100 0000 ... */
-  /* 0000 */ V(12, 10, 3),	/* 204 */
-  /* 0001 */ V(12, 10, 3),
-  /* 0010 */ V(11, 11, 3),
-  /* 0011 */ V(11, 11, 3),
-  /* 0100 */ V(8, 13, 3),
-  /* 0101 */ V(8, 13, 3),
-  /* 0110 */ V(13, 8, 3),
-  /* 0111 */ V(13, 8, 3),
-  /* 1000 */ V(0, 14, 4),
-  /* 1001 */ V(14, 0, 4),
-  /* 1010 */ V(0, 13, 3),
-  /* 1011 */ V(0, 13, 3),
-  /* 1100 */ V(14, 6, 2),
-  /* 1101 */ V(14, 6, 2),
-  /* 1110 */ V(14, 6, 2),
-  /* 1111 */ V(14, 6, 2),
-
-  /* 0100 0001 ... */
-  /* 000  */ V(6, 14, 3),	/* 220 */
-  /* 001  */ V(9, 12, 3),
-  /* 010  */ V(12, 9, 2),
-  /* 011  */ V(12, 9, 2),
-  /* 100  */ V(5, 14, 2),
-  /* 101  */ V(5, 14, 2),
-  /* 110  */ V(11, 10, 2),
-  /* 111  */ V(11, 10, 2),
-
-  /* 0100 0010 ... */
-  /* 000  */ V(14, 5, 2),	/* 228 */
-  /* 001  */ V(14, 5, 2),
-  /* 010  */ V(10, 11, 3),
-  /* 011  */ V(7, 13, 3),
-  /* 100  */ V(13, 7, 2),
-  /* 101  */ V(13, 7, 2),
-  /* 110  */ V(14, 4, 2),
-  /* 111  */ V(14, 4, 2),
-
-  /* 0100 0011 ... */
-  /* 000  */ V(8, 12, 2),	/* 236 */
-  /* 001  */ V(8, 12, 2),
-  /* 010  */ V(12, 8, 2),
-  /* 011  */ V(12, 8, 2),
-  /* 100  */ V(4, 14, 3),
-  /* 101  */ V(2, 14, 3),
-  /* 110  */ V(3, 14, 2),
-  /* 111  */ V(3, 14, 2),
-
-  /* 0100 0100 ... */
-  /* 00   */ V(6, 13, 2),	/* 244 */
-  /* 01   */ V(13, 6, 2),
-  /* 10   */ V(14, 3, 2),
-  /* 11   */ V(9, 11, 2),
-
-  /* 0100 0101 ... */
-  /* 00   */ V(11, 9, 2),	/* 248 */
-  /* 01   */ V(10, 10, 2),
-  /* 10   */ V(14, 2, 2),
-  /* 11   */ V(1, 14, 2),
-
-  /* 0100 0110 ... */
-  /* 00   */ V(14, 1, 2),	/* 252 */
-  /* 01   */ V(5, 13, 2),
-  /* 10   */ V(13, 5, 2),
-  /* 11   */ V(7, 12, 2),
-
-  /* 0100 0111 ... */
-  /* 00   */ V(12, 7, 2),	/* 256 */
-  /* 01   */ V(4, 13, 2),
-  /* 10   */ V(8, 11, 2),
-  /* 11   */ V(11, 8, 2),
-
-  /* 0100 1000 ... */
-  /* 00   */ V(13, 4, 2),	/* 260 */
-  /* 01   */ V(9, 10, 2),
-  /* 10   */ V(10, 9, 2),
-  /* 11   */ V(6, 12, 2),
-
-  /* 0100 1001 ... */
-  /* 00   */ V(12, 6, 2),	/* 264 */
-  /* 01   */ V(3, 13, 2),
-  /* 10   */ V(13, 3, 2),
-  /* 11   */ V(2, 13, 2),
-
-  /* 0100 1010 ... */
-  /* 00   */ V(13, 2, 2),	/* 268 */
-  /* 01   */ V(1, 13, 2),
-  /* 10   */ V(7, 11, 2),
-  /* 11   */ V(11, 7, 2),
-
-  /* 0100 1011 ... */
-  /* 00   */ V(13, 1, 2),	/* 272 */
-  /* 01   */ V(5, 12, 2),
-  /* 10   */ V(12, 5, 2),
-  /* 11   */ V(8, 10, 2),
-
-  /* 0100 1100 ... */
-  /* 00   */ V(10, 8, 2),	/* 276 */
-  /* 01   */ V(9, 9, 2),
-  /* 10   */ V(4, 12, 2),
-  /* 11   */ V(12, 4, 2),
-
-  /* 0100 1101 ... */
-  /* 000  */ V(6, 11, 2),	/* 280 */
-  /* 001  */ V(6, 11, 2),
-  /* 010  */ V(11, 6, 2),
-  /* 011  */ V(11, 6, 2),
-  /* 100  */ V(13, 0, 3),
-  /* 101  */ V(0, 12, 3),
-  /* 110  */ V(3, 12, 2),
-  /* 111  */ V(3, 12, 2),
-
-  /* 0100 1110 ... */
-  /* 00   */ V(12, 3, 2),	/* 288 */
-  /* 01   */ V(7, 10, 2),
-  /* 10   */ V(10, 7, 2),
-  /* 11   */ V(2, 12, 2),
-
-  /* 0100 1111 ... */
-  /* 00   */ V(12, 2, 2),	/* 292 */
-  /* 01   */ V(5, 11, 2),
-  /* 10   */ V(11, 5, 2),
-  /* 11   */ V(1, 12, 2),
-
-  /* 0101 0000 ... */
-  /* 00   */ V(8, 9, 2),	/* 296 */
-  /* 01   */ V(9, 8, 2),
-  /* 10   */ V(12, 1, 2),
-  /* 11   */ V(4, 11, 2),
-
-  /* 0101 0001 ... */
-  /* 000  */ V(12, 0, 3),	/* 300 */
-  /* 001  */ V(0, 11, 3),
-  /* 010  */ V(3, 11, 2),
-  /* 011  */ V(3, 11, 2),
-  /* 100  */ V(11, 0, 3),
-  /* 101  */ V(0, 10, 3),
-  /* 110  */ V(1, 10, 2),
-  /* 111  */ V(1, 10, 2),
-
-  /* 0101 0010 ... */
-  /* 00   */ V(11, 4, 1),	/* 308 */
-  /* 01   */ V(11, 4, 1),
-  /* 10   */ V(6, 10, 2),
-  /* 11   */ V(10, 6, 2),
-
-  /* 0101 0011 ... */
-  /* 000  */ V(7, 9, 2),	/* 312 */
-  /* 001  */ V(7, 9, 2),
-  /* 010  */ V(9, 7, 2),
-  /* 011  */ V(9, 7, 2),
-  /* 100  */ V(10, 0, 3),
-  /* 101  */ V(0, 9, 3),
-  /* 110  */ V(9, 0, 2),
-  /* 111  */ V(9, 0, 2),
-
-  /* 0101 0100 ... */
-  /* 0    */ V(11, 3, 1),	/* 320 */
-  /* 1    */ V(8, 8, 1),
-
-  /* 0101 0101 ... */
-  /* 00   */ V(2, 11, 2),	/* 322 */
-  /* 01   */ V(5, 10, 2),
-  /* 10   */ V(11, 2, 1),
-  /* 11   */ V(11, 2, 1),
-
-  /* 0101 0110 ... */
-  /* 00   */ V(10, 5, 2),	/* 326 */
-  /* 01   */ V(1, 11, 2),
-  /* 10   */ V(11, 1, 2),
-  /* 11   */ V(6, 9, 2),
-
-  /* 0101 0111 ... */
-  /* 0    */ V(9, 6, 1),	/* 330 */
-  /* 1    */ V(10, 4, 1),
-
-  /* 0101 1000 ... */
-  /* 00   */ V(4, 10, 2),	/* 332 */
-  /* 01   */ V(7, 8, 2),
-  /* 10   */ V(8, 7, 1),
-  /* 11   */ V(8, 7, 1),
-
-  /* 0101 1001 ... */
-  /* 0    */ V(3, 10, 1),	/* 336 */
-  /* 1    */ V(10, 3, 1),
-
-  /* 0101 1010 ... */
-  /* 0    */ V(5, 9, 1),	/* 338 */
-  /* 1    */ V(9, 5, 1),
-
-  /* 0101 1011 ... */
-  /* 0    */ V(2, 10, 1),	/* 340 */
-  /* 1    */ V(10, 2, 1),
-
-  /* 0101 1100 ... */
-  /* 0    */ V(10, 1, 1),	/* 342 */
-  /* 1    */ V(6, 8, 1),
-
-  /* 0101 1101 ... */
-  /* 0    */ V(8, 6, 1),	/* 344 */
-  /* 1    */ V(7, 7, 1),
-
-  /* 0101 1110 ... */
-  /* 0    */ V(4, 9, 1),	/* 346 */
-  /* 1    */ V(9, 4, 1),
-
-  /* 0101 1111 ... */
-  /* 0    */ V(3, 9, 1),	/* 348 */
-  /* 1    */ V(9, 3, 1),
-
-  /* 0110 0000 ... */
-  /* 0    */ V(5, 8, 1),	/* 350 */
-  /* 1    */ V(8, 5, 1),
-
-  /* 0110 0001 ... */
-  /* 0    */ V(2, 9, 1),	/* 352 */
-  /* 1    */ V(6, 7, 1),
-
-  /* 0110 0010 ... */
-  /* 0    */ V(7, 6, 1),	/* 354 */
-  /* 1    */ V(9, 2, 1),
-
-  /* 0110 0011 ... */
-  /* 0    */ V(1, 9, 1),	/* 356 */
-  /* 1    */ V(9, 1, 1),
-
-  /* 0110 0100 ... */
-  /* 0    */ V(4, 8, 1),	/* 358 */
-  /* 1    */ V(8, 4, 1),
-
-  /* 0110 0101 ... */
-  /* 0    */ V(5, 7, 1),	/* 360 */
-  /* 1    */ V(7, 5, 1),
-
-  /* 0110 0110 ... */
-  /* 0    */ V(3, 8, 1),	/* 362 */
-  /* 1    */ V(8, 3, 1),
-
-  /* 0110 0111 ... */
-  /* 0    */ V(6, 6, 1),	/* 364 */
-  /* 1    */ V(2, 8, 1),
-
-  /* 0110 1000 ... */
-  /* 0    */ V(8, 2, 1),	/* 366 */
-  /* 1    */ V(1, 8, 1),
-
-  /* 0110 1001 ... */
-  /* 0    */ V(4, 7, 1),	/* 368 */
-  /* 1    */ V(7, 4, 1),
-
-  /* 0110 1010 ... */
-  /* 00   */ V(8, 1, 1),	/* 370 */
-  /* 01   */ V(8, 1, 1),
-  /* 10   */ V(0, 8, 2),
-  /* 11   */ V(8, 0, 2),
-
-  /* 0110 1011 ... */
-  /* 0    */ V(5, 6, 1),	/* 374 */
-  /* 1    */ V(6, 5, 1),
-
-  /* 0110 1100 ... */
-  /* 00   */ V(1, 7, 1),	/* 376 */
-  /* 01   */ V(1, 7, 1),
-  /* 10   */ V(0, 7, 2),
-  /* 11   */ V(7, 0, 2),
-
-  /* 0110 1110 ... */
-  /* 0    */ V(3, 7, 1),	/* 380  */
-  /* 1    */ V(2, 7, 1),
-
-  /* 0111 1100 ... */
-  /* 0    */ V(0, 6, 1),	/* 382 */
-  /* 1    */ V(6, 0, 1),
-
-  /* 1000 0011 ... */
-  /* 0    */ V(0, 5, 1),	/* 384 */
-  /* 1    */ V(5, 0, 1)
-};
-
-# undef V
-# undef PTR
-
-/* external tables */
-
-union huffquad const *const mad_huff_quad_table[2] = { hufftabA, hufftabB };
-
-struct hufftable const mad_huff_pair_table[32] = {
-  /*  0 */ { hufftab0,   0, 0 },
-  /*  1 */ { hufftab1,   0, 3 },
-  /*  2 */ { hufftab2,   0, 3 },
-  /*  3 */ { hufftab3,   0, 3 },
-  /*  4 */ { 0 /* not used */ },
-  /*  5 */ { hufftab5,   0, 3 },
-  /*  6 */ { hufftab6,   0, 4 },
-  /*  7 */ { hufftab7,   0, 4 },
-  /*  8 */ { hufftab8,   0, 4 },
-  /*  9 */ { hufftab9,   0, 4 },
-  /* 10 */ { hufftab10,  0, 4 },
-  /* 11 */ { hufftab11,  0, 4 },
-  /* 12 */ { hufftab12,  0, 4 },
-  /* 13 */ { hufftab13,  0, 4 },
-  /* 14 */ { 0 /* not used */ },
-  /* 15 */ { hufftab15,  0, 4 },
-  /* 16 */ { hufftab16,  1, 4 },
-  /* 17 */ { hufftab16,  2, 4 },
-  /* 18 */ { hufftab16,  3, 4 },
-  /* 19 */ { hufftab16,  4, 4 },
-  /* 20 */ { hufftab16,  6, 4 },
-  /* 21 */ { hufftab16,  8, 4 },
-  /* 22 */ { hufftab16, 10, 4 },
-  /* 23 */ { hufftab16, 13, 4 },
-  /* 24 */ { hufftab24,  4, 4 },
-  /* 25 */ { hufftab24,  5, 4 },
-  /* 26 */ { hufftab24,  6, 4 },
-  /* 27 */ { hufftab24,  7, 4 },
-  /* 28 */ { hufftab24,  8, 4 },
-  /* 29 */ { hufftab24,  9, 4 },
-  /* 30 */ { hufftab24, 11, 4 },
-  /* 31 */ { hufftab24, 13, 4 }
-};
diff --git a/code/libmad-0.15.1b/huffman.h b/code/libmad-0.15.1b/huffman.h
deleted file mode 100644
index 6325db44..00000000
--- a/code/libmad-0.15.1b/huffman.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: huffman.h,v 1.11 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_HUFFMAN_H
-# define LIBMAD_HUFFMAN_H
-
-union huffquad {
-  struct {
-    unsigned short final  :  1;
-    unsigned short bits   :  3;
-    unsigned short offset : 12;
-  } ptr;
-  struct {
-    unsigned short final  :  1;
-    unsigned short hlen   :  3;
-    unsigned short v      :  1;
-    unsigned short w      :  1;
-    unsigned short x      :  1;
-    unsigned short y      :  1;
-  } value;
-  unsigned short final    :  1;
-};
-
-union huffpair {
-  struct {
-    unsigned short final  :  1;
-    unsigned short bits   :  3;
-    unsigned short offset : 12;
-  } ptr;
-  struct {
-    unsigned short final  :  1;
-    unsigned short hlen   :  3;
-    unsigned short x      :  4;
-    unsigned short y      :  4;
-  } value;
-  unsigned short final    :  1;
-};
-
-struct hufftable {
-  union huffpair const *table;
-  unsigned short linbits;
-  unsigned short startbits;
-};
-
-extern union huffquad const *const mad_huff_quad_table[2];
-extern struct hufftable const mad_huff_pair_table[32];
-
-# endif
diff --git a/code/libmad-0.15.1b/imdct_l_arm.S b/code/libmad-0.15.1b/imdct_l_arm.S
deleted file mode 100644
index badec5bc..00000000
--- a/code/libmad-0.15.1b/imdct_l_arm.S
+++ /dev/null
@@ -1,1000 +0,0 @@
-/*****************************************************************************
-* Copyright (C) 2000-2001 Andre McCurdy  <armccurdy@yahoo.co.uk>
-*
-* This program is free software. you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation@ either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY, without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program@ if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-*****************************************************************************
-*
-* Notes:
-*
-*
-*****************************************************************************
-*
-* $Id: imdct_l_arm.S,v 1.7 2001/03/25 20:03:34 rob Rel $
-*
-* 2001/03/24:  Andre McCurdy <armccurdy@yahoo.co.uk>
-*   - Corrected PIC unsafe loading of address of 'imdct36_long_karray'
-*
-* 2000/09/20:  Robert Leslie <rob@mars.org>
-*   - Added a global symbol with leading underscore per suggestion of
-*     Simon Burge to support linking with the a.out format.
-*
-* 2000/09/15:  Robert Leslie <rob@mars.org>
-*   - Fixed a small bug where flags were changed before a conditional branch.
-*
-* 2000/09/15:  Andre McCurdy <armccurdy@yahoo.co.uk>
-*   - Applied Nicolas Pitre's rounding optimisation in all remaining places.
-*
-* 2000/09/09:  Nicolas Pitre <nico@cam.org>
-*   - Optimized rounding + scaling operations.
-*
-* 2000/08/09:  Andre McCurdy <armccurdy@yahoo.co.uk>
-*   - Original created.
-*
-****************************************************************************/
-
-
-/*
-   On entry:
-
-      r0 = pointer to 18 element input  array
-      r1 = pointer to 36 element output array
-      r2 = windowing block type
-
-
-   Stack frame created during execution of the function:
-
-   Initial   Holds:
-   Stack
-   pointer
-   minus:
-
-       0
-       4     lr
-       8     r11
-      12     r10
-      16     r9
-      20     r8
-      24     r7
-      28     r6
-      32     r5
-      36     r4
-
-      40     r2 : windowing block type
-
-      44     ct00 high
-      48     ct00 low
-      52     ct01 high
-      56     ct01 low
-      60     ct04 high
-      64     ct04 low
-      68     ct06 high
-      72     ct06 low
-      76     ct05 high
-      80     ct05 low
-      84     ct03 high
-      88     ct03 low
-      92    -ct05 high
-      96    -ct05 low
-     100    -ct07 high
-     104    -ct07 low
-     108     ct07 high
-     112     ct07 low
-     116     ct02 high
-     120     ct02 low
-*/
-
-#define BLOCK_MODE_NORMAL   0
-#define BLOCK_MODE_START    1
-#define BLOCK_MODE_STOP     3
-
-
-#define X0   0x00
-#define X1   0x04
-#define X2   0x08
-#define X3   0x0C
-#define X4   0x10
-#define X5   0x14
-#define X6   0x18
-#define X7   0x1c
-#define X8   0x20
-#define X9   0x24
-#define X10  0x28
-#define X11  0x2c
-#define X12  0x30
-#define X13  0x34
-#define X14  0x38
-#define X15  0x3c
-#define X16  0x40
-#define X17  0x44
-
-#define x0   0x00
-#define x1   0x04
-#define x2   0x08
-#define x3   0x0C
-#define x4   0x10
-#define x5   0x14
-#define x6   0x18
-#define x7   0x1c
-#define x8   0x20
-#define x9   0x24
-#define x10  0x28
-#define x11  0x2c
-#define x12  0x30
-#define x13  0x34
-#define x14  0x38
-#define x15  0x3c
-#define x16  0x40
-#define x17  0x44
-#define x18  0x48
-#define x19  0x4c
-#define x20  0x50
-#define x21  0x54
-#define x22  0x58
-#define x23  0x5c
-#define x24  0x60
-#define x25  0x64
-#define x26  0x68
-#define x27  0x6c
-#define x28  0x70
-#define x29  0x74
-#define x30  0x78
-#define x31  0x7c
-#define x32  0x80
-#define x33  0x84
-#define x34  0x88
-#define x35  0x8c
-
-#define K00  0x0ffc19fd
-#define K01  0x00b2aa3e
-#define K02  0x0fdcf549
-#define K03  0x0216a2a2
-#define K04  0x0f9ee890
-#define K05  0x03768962
-#define K06  0x0f426cb5
-#define K07  0x04cfb0e2
-#define K08  0x0ec835e8
-#define K09  0x061f78aa
-#define K10  0x0e313245
-#define K11  0x07635284
-#define K12  0x0d7e8807
-#define K13  0x0898c779
-#define K14  0x0cb19346
-#define K15  0x09bd7ca0
-#define K16  0x0bcbe352
-#define K17  0x0acf37ad
-
-#define minus_K02 0xf0230ab7
-
-#define WL0  0x00b2aa3e
-#define WL1  0x0216a2a2
-#define WL2  0x03768962
-#define WL3  0x04cfb0e2
-#define WL4  0x061f78aa
-#define WL5  0x07635284
-#define WL6  0x0898c779
-#define WL7  0x09bd7ca0
-#define WL8  0x0acf37ad
-#define WL9  0x0bcbe352
-#define WL10 0x0cb19346
-#define WL11 0x0d7e8807
-#define WL12 0x0e313245
-#define WL13 0x0ec835e8
-#define WL14 0x0f426cb5
-#define WL15 0x0f9ee890
-#define WL16 0x0fdcf549
-#define WL17 0x0ffc19fd
-
-
-@*****************************************************************************
-
-
-    .text
-    .align
-
-    .global III_imdct_l
-    .global _III_imdct_l
-
-III_imdct_l:
-_III_imdct_l:
-
-    stmdb   sp!, { r2, r4 - r11, lr }   @ all callee saved regs, plus arg3
-
-    ldr     r4, =K08                    @ r4 =  K08
-    ldr     r5, =K09                    @ r5 =  K09
-    ldr     r8, [r0, #X4]               @ r8 =  X4
-    ldr     r9, [r0, #X13]              @ r9 =  X13
-    rsb     r6, r4, #0                  @ r6 = -K08
-    rsb     r7, r5, #0                  @ r7 = -K09
-
-    smull   r2, r3, r4, r8              @ r2..r3  = (X4 * K08)
-    smlal   r2, r3, r5, r9              @ r2..r3  = (X4 * K08) + (X13 *  K09) = ct01
-
-    smull   r10, lr, r8, r5             @ r10..lr = (X4 * K09)
-    smlal   r10, lr, r9, r6             @ r10..lr = (X4 * K09) + (X13 * -K08) = ct00
-
-    ldr     r8, [r0, #X7]               @ r8 = X7
-    ldr     r9, [r0, #X16]              @ r9 = X16
-
-    stmdb   sp!, { r2, r3, r10, lr }    @ stack ct00_h, ct00_l, ct01_h, ct01_l
-
-    add     r8, r8, r9                  @ r8 = (X7 + X16)
-    ldr     r9, [r0, #X1]               @ r9 = X1
-
-    smlal   r2, r3, r6, r8              @ r2..r3  = ct01 + ((X7 + X16) * -K08)
-    smlal   r2, r3, r7, r9              @ r2..r3 += (X1  * -K09)
-
-    ldr     r7, [r0, #X10]              @ r7 = X10
-
-    rsbs    r10, r10, #0
-    rsc     lr, lr, #0                  @ r10..lr  = -ct00
-
-    smlal   r2, r3, r5, r7              @ r2..r3  += (X10 *  K09) = ct06
-
-    smlal   r10, lr, r9, r6             @ r10..lr  = -ct00 + ( X1        * -K08)
-    smlal   r10, lr, r8, r5             @ r10..lr +=         ((X7 + X16) *  K09)
-    smlal   r10, lr, r7, r4             @ r10..lr +=         ( X10       *  K08) = ct04
-
-    stmdb   sp!, { r2, r3, r10, lr }    @ stack ct04_h, ct04_l, ct06_h, ct06_l
-
-    @----
-
-    ldr     r7, [r0, #X0]
-    ldr     r8, [r0, #X11]
-    ldr     r9, [r0, #X12]
-    sub     r7, r7, r8
-    sub     r7, r7, r9                  @ r7 = (X0 - X11 -X12) = ct14
-
-    ldr     r9,  [r0, #X3]
-    ldr     r8,  [r0, #X8]
-    ldr     r11, [r0, #X15]
-    sub     r8, r8, r9
-    add     r8, r8, r11                 @ r8 = (X8 - X3 + X15) = ct16
-
-    add     r11, r7, r8                 @ r11 = ct14 + ct16 = ct18
-
-    smlal   r2, r3, r6, r11             @ r2..r3 = ct06 + ((X0 - X11 - X3 + X15 + X8 - X12) * -K08)
-
-    ldr     r6,  [r0, #X2]
-    ldr     r9,  [r0, #X9]
-    ldr     r12, [r0, #X14]
-    sub     r6, r6, r9
-    sub     r6, r6, r12                 @ r6 = (X2 - X9 - X14) = ct15
-
-    ldr     r9,  [r0, #X5]
-    ldr     r12, [r0, #X6]
-    sub     r9, r9, r12
-    ldr     r12, [r0, #X17]
-    sub     r9, r9, r12                 @ r9 = (X5 - X6 - X17) = ct17
-
-    add     r12, r9, r6                 @ r12 = ct15 + ct17 = ct19
-
-    smlal   r2, r3, r5, r12             @ r2..r3 += ((X2 - X9 + X5 - X6 - X17 - X14) * K09)
-
-    smlal   r10, lr, r11, r5            @ r10..lr = ct04 + (ct18 * K09)
-    smlal   r10, lr, r12, r4            @ r10..lr = ct04 + (ct18 * K09) + (ct19 * K08)
-
-    movs    r2, r2, lsr #28
-    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
-    str     r2, [r1, #x22]              @ store result x22
-
-    movs    r10, r10, lsr #28
-    adc     r10, r10, lr, lsl #4        @ r10 = bits[59..28] of r10..lr
-    str     r10, [r1, #x4]              @ store result x4
-
-    @----
-
-    ldmia   sp, { r2, r3, r4, r5 }      @ r2..r3 = ct06, r4..r5 = ct04 (dont update sp)
-
-    @ r2..r3 = ct06
-    @ r4..r5 = ct04
-    @ r6     = ct15
-    @ r7     = ct14
-    @ r8     = ct16
-    @ r9     = ct17
-    @ r10    = .
-    @ r11    = .
-    @ r12    = .
-    @ lr     = .
-
-    ldr     r10, =K03                   @ r10 = K03
-    ldr     lr,  =K15                   @ lr  = K15
-
-    smlal   r2, r3, r10, r7             @ r2..r3 = ct06 + (ct14 * K03)
-    smlal   r4, r5,  lr, r7             @ r4..r5 = ct04 + (ct14 * K15)
-
-    ldr     r12, =K14                   @ r12 =  K14
-    rsb     r10, r10, #0                @ r10 = -K03
-
-    smlal   r2, r3,  lr, r6             @ r2..r3 += (ct15 *  K15)
-    smlal   r4, r5, r10, r6             @ r4..r5 += (ct15 * -K03)
-    smlal   r2, r3, r12, r8             @ r2..r3 += (ct16 *  K14)
-
-    ldr     r11, =minus_K02             @ r11 = -K02
-    rsb     r12, r12, #0                @ r12 = -K14
-
-    smlal   r4, r5, r12, r9             @ r4..r5 += (ct17 * -K14)
-    smlal   r2, r3, r11, r9             @ r2..r3 += (ct17 * -K02)
-    smlal   r4, r5, r11, r8             @ r4..r5 += (ct16 * -K02)
-
-    movs    r2, r2, lsr #28
-    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
-    str     r2, [r1, #x7]               @ store result x7
-
-    movs    r4, r4, lsr #28
-    adc     r4, r4, r5, lsl #4          @ r4 = bits[59..28] of r4..r5
-    str     r4, [r1, #x1]               @ store result x1
-
-    @----
-
-    ldmia   sp, { r2, r3, r4, r5 }      @ r2..r3 = ct06, r4..r5 = ct04 (dont update sp)
-
-    @ r2..r3 = ct06
-    @ r4..r5 = ct04
-    @ r6     = ct15
-    @ r7     = ct14
-    @ r8     = ct16
-    @ r9     = ct17
-    @ r10    = -K03
-    @ r11    = -K02
-    @ r12    = -K14
-    @ lr     =  K15
-
-    rsbs    r2, r2, #0
-    rsc     r3, r3, #0                  @ r2..r3 = -ct06
-
-    smlal   r2, r3, r12, r7             @ r2..r3  = -ct06 + (ct14 * -K14)
-    smlal   r2, r3, r10, r8             @ r2..r3 += (ct16 * -K03)
-
-    smlal   r4, r5, r12, r6             @ r4..r5  =  ct04 + (ct15 * -K14)
-    smlal   r4, r5, r10, r9             @ r4..r5 += (ct17 * -K03)
-    smlal   r4, r5,  lr, r8             @ r4..r5 += (ct16 *  K15)
-    smlal   r4, r5, r11, r7             @ r4..r5 += (ct14 * -K02)
-
-    rsb     lr, lr, #0                  @ lr  = -K15
-    rsb     r11, r11, #0                @ r11 =  K02
-
-    smlal   r2, r3,  lr, r9             @ r2..r3 += (ct17 * -K15)
-    smlal   r2, r3, r11, r6             @ r2..r3 += (ct15 *  K02)
-
-    movs    r4, r4, lsr #28
-    adc     r4, r4, r5, lsl #4          @ r4 = bits[59..28] of r4..r5
-    str     r4, [r1, #x25]              @ store result x25
-
-    movs    r2, r2, lsr #28
-    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
-    str     r2, [r1, #x19]              @ store result x19
-
-    @----
-
-    ldr     r2, [sp, #16]               @ r2 = ct01_l
-    ldr     r3, [sp, #20]               @ r3 = ct01_h
-
-    ldr     r6, [r0, #X1]
-    ldr     r8, [r0, #X7]
-    ldr     r9, [r0, #X10]
-    ldr     r7, [r0, #X16]
-
-    rsbs    r2, r2, #0
-    rsc     r3, r3, #0                  @ r2..r3 = -ct01
-
-    mov     r4, r2
-    mov     r5, r3                      @ r4..r5 = -ct01
-
-    @ r2..r3 = -ct01
-    @ r4..r5 = -ct01
-    @ r6     =  X1
-    @ r7     =  X16
-    @ r8     =  X7
-    @ r9     =  X10
-    @ r10    = -K03
-    @ r11    =  K02
-    @ r12    = -K14
-    @ lr     = -K15
-
-    smlal   r4, r5, r12, r7             @ r4..r5 = -ct01 + (X16 * -K14)
-    smlal   r2, r3,  lr, r9             @ r2..r3 = -ct01 + (X10 * -K15)
-
-    smlal   r4, r5, r10, r8             @ r4..r5 += (X7  * -K03)
-    smlal   r2, r3, r10, r7             @ r2..r3 += (X16 * -K03)
-
-    smlal   r4, r5, r11, r9             @ r4..r5 += (X10 *  K02)
-    smlal   r2, r3, r12, r8             @ r2..r3 += (X7  * -K14)
-
-    rsb     lr, lr, #0                  @ lr  =  K15
-    rsb     r11, r11, #0                @ r11 = -K02
-
-    smlal   r4, r5,  lr, r6             @ r4..r5 += (X1  *  K15) = ct05
-    smlal   r2, r3, r11, r6             @ r2..r3 += (X1  * -K02) = ct03
-
-    stmdb   sp!, { r2, r3, r4, r5 }     @ stack ct05_h, ct05_l, ct03_h, ct03_l
-
-    rsbs    r4, r4, #0
-    rsc     r5, r5, #0                  @ r4..r5 = -ct05
-
-    stmdb   sp!, { r4, r5 }             @ stack -ct05_h, -ct05_l
-
-    ldr     r2, [sp, #48]               @ r2 = ct00_l
-    ldr     r3, [sp, #52]               @ r3 = ct00_h
-
-    rsb     r10, r10, #0                @ r10 = K03
-
-    rsbs    r4, r2, #0
-    rsc     r5, r3, #0                  @ r4..r5 = -ct00
-
-    @ r2..r3 =  ct00
-    @ r4..r5 = -ct00
-    @ r6     =  X1
-    @ r7     =  X16
-    @ r8     =  X7
-    @ r9     =  X10
-    @ r10    =  K03
-    @ r11    = -K02
-    @ r12    = -K14
-    @ lr     =  K15
-
-    smlal   r4, r5, r10, r6             @ r4..r5 = -ct00 + (X1  * K03)
-    smlal   r2, r3, r10, r9             @ r2..r3 =  ct00 + (X10 * K03)
-
-    smlal   r4, r5, r12, r9             @ r4..r5 += (X10 * -K14)
-    smlal   r2, r3, r12, r6             @ r2..r3 += (X1  * -K14)
-
-    smlal   r4, r5, r11, r7             @ r4..r5 += (X16 * -K02)
-    smlal   r4, r5,  lr, r8             @ r4..r5 += (X7  *  K15) = ct07
-
-    rsb     lr, lr, #0                  @ lr  = -K15
-    rsb     r11, r11, #0                @ r11 =  K02
-
-    smlal   r2, r3, r11, r8             @ r2..r3 += (X7  *  K02)
-    smlal   r2, r3,  lr, r7             @ r2..r3 += (X16 * -K15) = ct02
-
-    rsbs    r6, r4, #0
-    rsc     r7, r5, #0                  @ r6..r7 = -ct07
-
-    stmdb   sp!, { r2 - r7 }            @ stack -ct07_h, -ct07_l, ct07_h, ct07_l, ct02_h, ct02_l
-
-
-    @----
-
-    add     r2, pc, #(imdct36_long_karray-.-8)  @ r2 = base address of Knn array (PIC safe ?)
-
-
-loop:
-    ldr     r12, [r0, #X0]
-
-    ldmia   r2!, { r5 - r11 }           @ first 7 words from Karray element
-
-    smull   r3, r4, r5, r12             @ sum =  (Kxx * X0)
-    ldr     r12, [r0, #X2]
-    ldr     r5,  [r0, #X3]
-    smlal   r3, r4, r6, r12             @ sum += (Kxx * X2)
-    ldr     r12, [r0, #X5]
-    ldr     r6,  [r0, #X6]
-    smlal   r3, r4, r7, r5              @ sum += (Kxx * X3)
-    smlal   r3, r4, r8, r12             @ sum += (Kxx * X5)
-    ldr     r12, [r0, #X8]
-    ldr     r5,  [r0, #X9]
-    smlal   r3, r4, r9, r6              @ sum += (Kxx * X6)
-    smlal   r3, r4, r10, r12            @ sum += (Kxx * X8)
-    smlal   r3, r4, r11, r5             @ sum += (Kxx * X9)
-
-    ldmia   r2!, { r5 - r10 }           @ final 6 words from Karray element
-
-    ldr     r11, [r0, #X11]
-    ldr     r12, [r0, #X12]
-    smlal   r3, r4, r5, r11             @ sum += (Kxx * X11)
-    ldr     r11, [r0, #X14]
-    ldr     r5,  [r0, #X15]
-    smlal   r3, r4, r6, r12             @ sum += (Kxx * X12)
-    smlal   r3, r4, r7, r11             @ sum += (Kxx * X14)
-    ldr     r11, [r0, #X17]
-    smlal   r3, r4, r8, r5              @ sum += (Kxx * X15)
-    smlal   r3, r4, r9, r11             @ sum += (Kxx * X17)
-
-    add     r5, sp, r10, lsr #16        @ create index back into stack for required ctxx
-
-    ldmia   r5, { r6, r7 }              @ r6..r7 = ctxx
-
-    mov     r8, r10, lsl #16            @ push ctxx index off the top end
-
-    adds    r3, r3, r6                  @ add low words
-    adc     r4, r4, r7                  @ add high words, with carry
-    movs    r3, r3, lsr #28
-    adc     r3, r3, r4, lsl #4          @ r3 = bits[59..28] of r3..r4
-
-    str     r3, [r1, r8, lsr #24]       @ push completion flag off the bottom end
-
-    movs    r8, r8, lsl #8              @ push result location index off the top end
-    beq     loop                        @ loop back if completion flag not set
-    b       imdct_l_windowing           @ branch to windowing stage if looping finished
-
-imdct36_long_karray:
-
-    .word   K17, -K13,  K10, -K06, -K05,  K01, -K00,  K04, -K07,  K11,  K12, -K16, 0x00000000
-    .word   K13,  K07,  K16,  K01,  K10, -K05,  K04, -K11,  K00, -K17,  K06, -K12, 0x00200800
-    .word   K11,  K17,  K05,  K12, -K01,  K06, -K07,  K00, -K13,  K04, -K16,  K10, 0x00200c00
-    .word   K07,  K00, -K12,  K05, -K16, -K10,  K11, -K17,  K04,  K13,  K01,  K06, 0x00001400
-    .word   K05,  K10, -K00, -K17,  K07, -K13,  K12,  K06, -K16,  K01, -K11, -K04, 0x00181800
-    .word   K01,  K05, -K07, -K11,  K13,  K17, -K16, -K12,  K10,  K06, -K04, -K00, 0x00102000
-    .word  -K16,  K12, -K11,  K07,  K04, -K00, -K01,  K05, -K06,  K10,  K13, -K17, 0x00284800
-    .word  -K12,  K06,  K17, -K00, -K11,  K04,  K05, -K10,  K01,  K16, -K07, -K13, 0x00085000
-    .word  -K10,  K16,  K04, -K13, -K00,  K07,  K06, -K01, -K12, -K05,  K17,  K11, 0x00105400
-    .word  -K06, -K01,  K13,  K04,  K17, -K11, -K10, -K16, -K05,  K12,  K00,  K07, 0x00185c00
-    .word  -K04, -K11, -K01,  K16,  K06,  K12,  K13, -K07, -K17, -K00, -K10, -K05, 0x00006000
-    .word  -K00, -K04, -K06, -K10, -K12, -K16, -K17, -K13, -K11, -K07, -K05, -K01, 0x00206801
-
-
-    @----
-    @-------------------------------------------------------------------------
-    @----
-
-imdct_l_windowing:
-
-    ldr     r11, [sp, #80]              @ fetch function parameter 3 from out of the stack
-    ldmia   r1!, { r0, r2 - r9 }        @ load 9 words from x0, update pointer
-
-    @ r0     = x0
-    @ r1     = &x[9]
-    @ r2     = x1
-    @ r3     = x2
-    @ r4     = x3
-    @ r5     = x4
-    @ r6     = x5
-    @ r7     = x6
-    @ r8     = x7
-    @ r9     = x8
-    @ r10    = .
-    @ r11    = window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    = .
-    @ lr     = .
-
-    cmp     r11, #BLOCK_MODE_STOP       @ setup flags
-    rsb     r10, r0, #0                 @ r10 = -x0 (DONT change flags !!)
-    beq     stop_block_x0_to_x17
-
-
-    @ start and normal blocks are treated the same for x[0]..x[17]
-
-normal_block_x0_to_x17:
-
-    ldr     r12, =WL9                   @ r12 = window_l[9]
-
-    rsb     r0,  r9, #0                 @ r0  = -x8
-    rsb     r9,  r2, #0                 @ r9  = -x1
-    rsb     r2,  r8, #0                 @ r2  = -x7
-    rsb     r8,  r3, #0                 @ r8  = -x2
-    rsb     r3,  r7, #0                 @ r3  = -x6
-    rsb     r7,  r4, #0                 @ r7  = -x3
-    rsb     r4,  r6, #0                 @ r4  = -x5
-    rsb     r6,  r5, #0                 @ r6  = -x4
-
-    @ r0     = -x8
-    @ r1     = &x[9]
-    @ r2     = -x7
-    @ r3     = -x6
-    @ r4     = -x5
-    @ r5     = .
-    @ r6     = -x4
-    @ r7     = -x3
-    @ r8     = -x2
-    @ r9     = -x1
-    @ r10    = -x0
-    @ r11    = window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    = window_l[9]
-    @ lr     = .
-
-    smull   r5, lr, r12, r0             @ r5..lr = (window_l[9]  * (x[9]  == -x[8]))
-    ldr     r12, =WL10                  @ r12 = window_l[10]
-    movs    r5, r5, lsr #28
-    adc     r0, r5, lr, lsl #4          @ r0 = bits[59..28] of windowed x9
-
-    smull   r5, lr, r12, r2             @ r5..lr = (window_l[10] * (x[10] == -x[7]))
-    ldr     r12, =WL11                  @ r12 = window_l[11]
-    movs    r5, r5, lsr #28
-    adc     r2, r5, lr, lsl #4          @ r2 = bits[59..28] of windowed x10
-
-    smull   r5, lr, r12, r3             @ r5..lr = (window_l[11] * (x[11] == -x[6]))
-    ldr     r12, =WL12                  @ r12 = window_l[12]
-    movs    r5, r5, lsr #28
-    adc     r3, r5, lr, lsl #4          @ r3 = bits[59..28] of windowed x11
-
-    smull   r5, lr, r12, r4             @ r5..lr = (window_l[12] * (x[12] == -x[5]))
-    ldr     r12, =WL13                  @ r12 = window_l[13]
-    movs    r5, r5, lsr #28
-    adc     r4, r5, lr, lsl #4          @ r4 = bits[59..28] of windowed x12
-
-    smull   r5, lr, r12, r6             @ r5..lr = (window_l[13] * (x[13] == -x[4]))
-    ldr     r12, =WL14                  @ r12 = window_l[14]
-    movs    r5, r5, lsr #28
-    adc     r6, r5, lr, lsl #4          @ r6 = bits[59..28] of windowed x13
-
-    smull   r5, lr, r12, r7             @ r5..lr = (window_l[14] * (x[14] == -x[3]))
-    ldr     r12, =WL15                  @ r12 = window_l[15]
-    movs    r5, r5, lsr #28
-    adc     r7, r5, lr, lsl #4          @ r7 = bits[59..28] of windowed x14
-
-    smull   r5, lr, r12, r8             @ r5..lr = (window_l[15] * (x[15] == -x[2]))
-    ldr     r12, =WL16                  @ r12 = window_l[16]
-    movs    r5, r5, lsr #28
-    adc     r8, r5, lr, lsl #4          @ r8 = bits[59..28] of windowed x15
-
-    smull   r5, lr, r12, r9             @ r5..lr = (window_l[16] * (x[16] == -x[1]))
-    ldr     r12, =WL17                  @ r12 = window_l[17]
-    movs    r5, r5, lsr #28
-    adc     r9, r5, lr, lsl #4          @ r9 = bits[59..28] of windowed x16
-
-    smull   r5, lr, r12, r10            @ r5..lr = (window_l[17] * (x[17] == -x[0]))
-    ldr     r12, =WL0                   @ r12 = window_l[0]
-    movs    r5, r5, lsr #28
-    adc     r10, r5, lr, lsl #4         @ r10 = bits[59..28] of windowed x17
-
-
-    stmia   r1,  { r0, r2 - r4, r6 - r10 } @ store windowed x[9] .. x[17]
-    ldmdb   r1!, { r0, r2 - r9 }           @ load 9 words downto (and including) x0
-
-
-    smull   r10, lr, r12, r0            @ r10..lr = (window_l[0] * x[0])
-    ldr     r12, =WL1                   @ r12 = window_l[1]
-    movs    r10, r10, lsr #28
-    adc     r0, r10, lr, lsl #4         @ r0 = bits[59..28] of windowed x0
-
-    smull   r10, lr, r12, r2            @ r10..lr = (window_l[1] * x[1])
-    ldr     r12, =WL2                   @ r12 = window_l[2]
-    movs    r10, r10, lsr #28
-    adc     r2, r10, lr, lsl #4         @ r2 = bits[59..28] of windowed x1
-
-    smull   r10, lr, r12, r3            @ r10..lr = (window_l[2] * x[2])
-    ldr     r12, =WL3                   @ r12 = window_l[3]
-    movs    r10, r10, lsr #28
-    adc     r3, r10, lr, lsl #4         @ r3 = bits[59..28] of windowed x2
-
-    smull   r10, lr, r12, r4            @ r10..lr = (window_l[3] * x[3])
-    ldr     r12, =WL4                   @ r12 = window_l[4]
-    movs    r10, r10, lsr #28
-    adc     r4, r10, lr, lsl #4         @ r4 = bits[59..28] of windowed x3
-
-    smull   r10, lr, r12, r5            @ r10..lr = (window_l[4] * x[4])
-    ldr     r12, =WL5                   @ r12 = window_l[5]
-    movs    r10, r10, lsr #28
-    adc     r5, r10, lr, lsl #4         @ r5 = bits[59..28] of windowed x4
-
-    smull   r10, lr, r12, r6            @ r10..lr = (window_l[5] * x[5])
-    ldr     r12, =WL6                   @ r12 = window_l[6]
-    movs    r10, r10, lsr #28
-    adc     r6, r10, lr, lsl #4         @ r6 = bits[59..28] of windowed x5
-
-    smull   r10, lr, r12, r7            @ r10..lr = (window_l[6] * x[6])
-    ldr     r12, =WL7                   @ r12 = window_l[7]
-    movs    r10, r10, lsr #28
-    adc     r7, r10, lr, lsl #4         @ r7 = bits[59..28] of windowed x6
-
-    smull   r10, lr, r12, r8            @ r10..lr = (window_l[7] * x[7])
-    ldr     r12, =WL8                   @ r12 = window_l[8]
-    movs    r10, r10, lsr #28
-    adc     r8, r10, lr, lsl #4         @ r8 = bits[59..28] of windowed x7
-
-    smull   r10, lr, r12, r9            @ r10..lr = (window_l[8] * x[8])
-    movs    r10, r10, lsr #28
-    adc     r9, r10, lr, lsl #4         @ r9 = bits[59..28] of windowed x8
-
-    stmia   r1, { r0, r2 - r9 }         @ store windowed x[0] .. x[8]
-
-    cmp     r11, #BLOCK_MODE_START
-    beq     start_block_x18_to_x35
-
-
-    @----
-
-
-normal_block_x18_to_x35:
-
-    ldr     r11, =WL3                   @ r11 = window_l[3]
-    ldr     r12, =WL4                   @ r12 = window_l[4]
-
-    add     r1, r1, #(18*4)             @ r1 = &x[18]
-
-    ldmia   r1!, { r0, r2 - r4, r6 - r10 }  @ load 9 words from x18, update pointer
-
-    @ r0     = x18
-    @ r1     = &x[27]
-    @ r2     = x19
-    @ r3     = x20
-    @ r4     = x21
-    @ r5     = .
-    @ r6     = x22
-    @ r7     = x23
-    @ r8     = x24
-    @ r9     = x25
-    @ r10    = x26
-    @ r11    = window_l[3]
-    @ r12    = window_l[4]
-    @ lr     = .
-
-    smull   r5, lr, r12, r6             @ r5..lr = (window_l[4] * (x[22] == x[31]))
-    movs    r5, r5, lsr #28
-    adc     r5, r5, lr, lsl #4          @ r5 = bits[59..28] of windowed x31
-
-    smull   r6, lr, r11, r4             @ r5..lr = (window_l[3] * (x[21] == x[32]))
-    ldr     r12, =WL5                   @ r12    =  window_l[5]
-    movs    r6, r6, lsr #28
-    adc     r6, r6, lr, lsl #4          @ r6 = bits[59..28] of windowed x32
-
-    smull   r4, lr, r12, r7             @ r4..lr = (window_l[5] * (x[23] == x[30]))
-    ldr     r11, =WL1                   @ r11    =  window_l[1]
-    ldr     r12, =WL2                   @ r12    =  window_l[2]
-    movs    r4, r4, lsr #28
-    adc     r4, r4, lr, lsl #4          @ r4 = bits[59..28] of windowed x30
-
-    smull   r7, lr, r12, r3             @ r7..lr = (window_l[2] * (x[20] == x[33]))
-    ldr     r12, =WL6                   @ r12 = window_l[6]
-    movs    r7, r7, lsr #28
-    adc     r7, r7, lr, lsl #4          @ r7 = bits[59..28] of windowed x33
-
-    smull   r3, lr, r12, r8             @ r3..lr = (window_l[6] * (x[24] == x[29]))
-    movs    r3, r3, lsr #28
-    adc     r3, r3, lr, lsl #4          @ r3 = bits[59..28] of windowed x29
-
-    smull   r8, lr, r11, r2             @ r7..lr = (window_l[1] * (x[19] == x[34]))
-    ldr     r12, =WL7                   @ r12    =  window_l[7]
-    ldr     r11, =WL8                   @ r11    =  window_l[8]
-    movs    r8, r8, lsr #28
-    adc     r8, r8, lr, lsl #4          @ r8 = bits[59..28] of windowed x34
-
-    smull   r2, lr, r12, r9             @ r7..lr = (window_l[7] * (x[25] == x[28]))
-    ldr     r12, =WL0                   @ r12 = window_l[0]
-    movs    r2, r2, lsr #28
-    adc     r2, r2, lr, lsl #4          @ r2 = bits[59..28] of windowed x28
-
-    smull   r9, lr, r12, r0             @ r3..lr = (window_l[0] * (x[18] == x[35]))
-    movs    r9, r9, lsr #28
-    adc     r9, r9, lr, lsl #4          @ r9 = bits[59..28] of windowed x35
-
-    smull   r0, lr, r11, r10            @ r7..lr = (window_l[8] * (x[26] == x[27]))
-    ldr     r11, =WL16                  @ r11    =  window_l[16]
-    ldr     r12, =WL17                  @ r12    =  window_l[17]
-    movs    r0, r0, lsr #28
-    adc     r0, r0, lr, lsl #4          @ r0 = bits[59..28] of windowed x27
-
-
-    stmia   r1,  { r0, r2 - r9 }        @ store windowed x[27] .. x[35]
-    ldmdb   r1!, { r0, r2 - r9 }        @ load 9 words downto (and including) x18
-
-
-    smull   r10, lr, r12, r0            @ r10..lr = (window_l[17] * x[18])
-    movs    r10, r10, lsr #28
-    adc     r0,  r10, lr, lsl #4        @ r0 = bits[59..28] of windowed x0
-
-    smull   r10, lr, r11, r2            @ r10..lr = (window_l[16] * x[19])
-    ldr     r11, =WL14                  @ r11     =  window_l[14]
-    ldr     r12, =WL15                  @ r12     =  window_l[15]
-    movs    r10, r10, lsr #28
-    adc     r2,  r10, lr, lsl #4        @ r2 = bits[59..28] of windowed x1
-
-    smull   r10, lr, r12, r3            @ r10..lr = (window_l[15] * x[20])
-    movs    r10, r10, lsr #28
-    adc     r3,  r10, lr, lsl #4        @ r3 = bits[59..28] of windowed x2
-
-    smull   r10, lr, r11, r4            @ r10..lr = (window_l[14] * x[21])
-    ldr     r11, =WL12                  @ r11     =  window_l[12]
-    ldr     r12, =WL13                  @ r12     =  window_l[13]
-    movs    r10, r10, lsr #28
-    adc     r4,  r10, lr, lsl #4        @ r4 = bits[59..28] of windowed x3
-
-    smull   r10, lr, r12, r5            @ r10..lr = (window_l[13] * x[22])
-    movs    r10, r10, lsr #28
-    adc     r5,  r10, lr, lsl #4        @ r5 = bits[59..28] of windowed x4
-
-    smull   r10, lr, r11, r6            @ r10..lr = (window_l[12] * x[23])
-    ldr     r11, =WL10                  @ r12 = window_l[10]
-    ldr     r12, =WL11                  @ r12 = window_l[11]
-    movs    r10, r10, lsr #28
-    adc     r6,  r10, lr, lsl #4        @ r6 = bits[59..28] of windowed x5
-
-    smull   r10, lr, r12, r7            @ r10..lr = (window_l[11] * x[24])
-    movs    r10, r10, lsr #28
-    adc     r7,  r10, lr, lsl #4        @ r7 = bits[59..28] of windowed x6
-
-    smull   r10, lr, r11, r8            @ r10..lr = (window_l[10] * x[25])
-    ldr     r12, =WL9                   @ r12 = window_l[9]
-    movs    r10, r10, lsr #28
-    adc     r8,  r10, lr, lsl #4        @ r8 = bits[59..28] of windowed x7
-
-    smull   r10, lr, r12, r9            @ r10..lr = (window_l[9] * x[26])
-
-    movs    r10, r10, lsr #28
-    adc     r9,  r10, lr, lsl #4        @ r9 = bits[59..28] of windowed x8
-
-    stmia   r1, { r0, r2 - r9 }         @ store windowed x[18] .. x[26]
-
-    @----
-    @ NB there are 2 possible exits from this function - this is only one of them
-    @----
-
-    add     sp, sp, #(21*4)             @ return stack frame
-    ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
-
-    @----
-
-
-stop_block_x0_to_x17:
-
-    @ r0     =  x0
-    @ r1     = &x[9]
-    @ r2     =  x1
-    @ r3     =  x2
-    @ r4     =  x3
-    @ r5     =  x4
-    @ r6     =  x5
-    @ r7     =  x6
-    @ r8     =  x7
-    @ r9     =  x8
-    @ r10    = -x0
-    @ r11    =  window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    =  .
-    @ lr     =  .
-
-    rsb     r0, r6, #0                  @ r0 = -x5
-    rsb     r6, r2, #0                  @ r6 = -x1
-    rsb     r2, r5, #0                  @ r2 = -x4
-    rsb     r5, r3, #0                  @ r5 = -x2
-    rsb     r3, r4, #0                  @ r3 = -x3
-
-    add     r1, r1, #(3*4)                      @ r1 = &x[12]
-    stmia   r1, { r0, r2, r3, r5, r6, r10 }     @ store unchanged x[12] .. x[17]
-
-    ldr     r0, =WL1                    @ r0 = window_l[1]  == window_s[0]
-
-    rsb     r10, r9, #0                 @ r10 = -x8
-    rsb     r12, r8, #0                 @ r12 = -x7
-    rsb     lr,  r7, #0                 @ lr  = -x6
-
-    @ r0     =  WL1
-    @ r1     = &x[12]
-    @ r2     =  .
-    @ r3     =  .
-    @ r4     =  .
-    @ r5     =  .
-    @ r6     =  .
-    @ r7     =  x6
-    @ r8     =  x7
-    @ r9     =  x8
-    @ r10    = -x8
-    @ r11    =  window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    = -x7
-    @ lr     = -x6
-
-    smull   r5, r6, r0, r7              @ r5..r6 = (window_l[1] * x[6])
-    ldr     r2, =WL4                    @ r2     =  window_l[4] == window_s[1]
-    movs    r5, r5, lsr #28
-    adc     r7, r5, r6, lsl #4          @ r7 = bits[59..28] of windowed x6
-
-    smull   r5, r6, r2, r8              @ r5..r6 = (window_l[4] * x[7])
-    ldr     r3, =WL7                    @ r3     =  window_l[7] == window_s[2]
-    movs    r5, r5, lsr #28
-    adc     r8, r5, r6, lsl #4          @ r8 = bits[59..28] of windowed x7
-
-    smull   r5, r6, r3, r9              @ r5..r6 = (window_l[7] * x[8])
-    ldr     r4, =WL10                   @ r4     =  window_l[10] == window_s[3]
-    movs    r5, r5, lsr #28
-    adc     r9, r5, r6, lsl #4          @ r9 = bits[59..28] of windowed x8
-
-    smull   r5, r6, r4, r10             @ r5..r6 = (window_l[10] * (x[9] == -x[8]))
-    ldr     r0, =WL13                   @ r0     =  window_l[13] == window_s[4]
-    movs    r5, r5, lsr #28
-    adc     r10, r5, r6, lsl #4         @ r10 = bits[59..28] of windowed x9
-
-    smull   r5, r6, r0, r12             @ r5..r6 = (window_l[13] * (x[10] == -x[7]))
-    ldr     r2, =WL16                   @ r2     =  window_l[16] == window_s[5]
-    movs    r5, r5, lsr #28
-    adc     r12, r5, r6, lsl #4         @ r10 = bits[59..28] of windowed x9
-
-    smull   r5, r6, r2, lr              @ r5..r6 = (window_l[16] * (x[11] == -x[6]))
-
-    ldr     r0, =0x00
-
-    movs    r5, r5, lsr #28
-    adc     lr, r5, r6, lsl #4          @ r10 = bits[59..28] of windowed x9
-
-    stmdb   r1!, { r7 - r10, r12, lr }  @ store windowed x[6] .. x[11]
-
-    ldr     r5, =0x00
-    ldr     r6, =0x00
-    ldr     r2, =0x00
-    ldr     r3, =0x00
-    ldr     r4, =0x00
-
-    stmdb   r1!, { r0, r2 - r6 }        @ store windowed x[0] .. x[5]
-
-    b       normal_block_x18_to_x35
-
-
-    @----
-
-
-start_block_x18_to_x35:
-
-    ldr     r4, =WL1                    @ r0 = window_l[1]  == window_s[0]
-
-    add     r1, r1, #(24*4)             @ r1 = &x[24]
-
-    ldmia   r1, { r0, r2, r3 }          @ load 3 words from x24, dont update pointer
-
-    @ r0     = x24
-    @ r1     = &x[24]
-    @ r2     = x25
-    @ r3     = x26
-    @ r4     = WL1
-    @ r5     = WL4
-    @ r6     = WL7
-    @ r7     = WL10
-    @ r8     = WL13
-    @ r9     = WL16
-    @ r10    = .
-    @ r11    = .
-    @ r12    = .
-    @ lr     = .
-
-    ldr     r5, =WL4                    @ r5 = window_l[4] == window_s[1]
-
-    smull   r10, r11, r4, r0            @ r10..r11 = (window_l[1] * (x[24] == x[29]))
-    ldr     r6, =WL7                    @ r6       =  window_l[7]  == window_s[2]
-    movs    r10, r10, lsr #28
-    adc     lr, r10, r11, lsl #4        @ lr = bits[59..28] of windowed x29
-
-    smull   r10, r11, r5, r2            @ r10..r11 = (window_l[4] * (x[25] == x[28]))
-    ldr     r7, =WL10                   @ r7       =  window_l[10] == window_s[3]
-    movs    r10, r10, lsr #28
-    adc     r12, r10, r11, lsl #4       @ r12 = bits[59..28] of windowed x28
-
-    smull   r10, r11, r6, r3            @ r10..r11 = (window_l[7] * (x[26] == x[27]))
-    ldr     r8, =WL13                   @ r8       =  window_l[13] == window_s[4]
-    movs    r10, r10, lsr #28
-    adc     r4, r10, r11, lsl #4        @ r4 = bits[59..28] of windowed x27
-
-    smull   r10, r11, r7, r3            @ r10..r11 = (window_l[10] * x[26])
-    ldr     r9, =WL16                   @ r9       =  window_l[16] == window_s[5]
-    movs    r10, r10, lsr #28
-    adc     r3, r10, r11, lsl #4        @ r3 = bits[59..28] of windowed x26
-
-    smull   r10, r11, r8, r2            @ r10..r11 = (window_l[13] * x[25])
-    ldr     r5, =0x00
-    movs    r10, r10, lsr #28
-    adc     r2, r10, r11, lsl #4        @ r2 = bits[59..28] of windowed x25
-
-    smull   r10, r11, r9, r0            @ r10..r11 = (window_l[16] * x[24])
-    ldr     r6, =0x00
-    movs    r10, r10, lsr #28
-    adc     r0, r10, r11, lsl #4        @ r0 = bits[59..28] of windowed x24
-
-    stmia   r1!, { r0, r2, r3, r4, r12, lr }    @ store windowed x[24] .. x[29]
-
-    ldr     r7, =0x00
-    ldr     r8, =0x00
-    ldr     r9, =0x00
-    ldr     r10, =0x00
-
-    stmia   r1!, { r5 - r10 }           @ store windowed x[30] .. x[35]
-
-    @----
-    @ NB there are 2 possible exits from this function - this is only one of them
-    @----
-
-    add     sp, sp, #(21*4)             @ return stack frame
-    ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
-
-    @----
-    @END
-    @----
-
diff --git a/code/libmad-0.15.1b/imdct_s.dat b/code/libmad-0.15.1b/imdct_s.dat
deleted file mode 100644
index 476710ea..00000000
--- a/code/libmad-0.15.1b/imdct_s.dat
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: imdct_s.dat,v 1.8 2004/01/23 09:41:32 rob Exp $
- */
-
-  /*  0 */  {  MAD_F(0x09bd7ca0) /*  0.608761429 */,
-	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
-	      -MAD_F(0x0216a2a2) /* -0.130526192 */,
-	       MAD_F(0x0fdcf549) /*  0.991444861 */,
-	      -MAD_F(0x061f78aa) /* -0.382683432 */,
-	      -MAD_F(0x0cb19346) /* -0.793353340 */ },
-
-  /*  6 */  { -MAD_F(0x0cb19346) /* -0.793353340 */,
-	       MAD_F(0x061f78aa) /*  0.382683432 */,
-	       MAD_F(0x0fdcf549) /*  0.991444861 */,
-	       MAD_F(0x0216a2a2) /*  0.130526192 */,
-	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
-	      -MAD_F(0x09bd7ca0) /* -0.608761429 */ },
-
-  /*  1 */  {  MAD_F(0x061f78aa) /*  0.382683432 */,
-	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
-	       MAD_F(0x0ec835e8) /*  0.923879533 */,
-	      -MAD_F(0x061f78aa) /* -0.382683432 */,
-	      -MAD_F(0x061f78aa) /* -0.382683432 */,
-	       MAD_F(0x0ec835e8) /*  0.923879533 */ },
-
-  /*  7 */  { -MAD_F(0x0ec835e8) /* -0.923879533 */,
-	      -MAD_F(0x061f78aa) /* -0.382683432 */,
-	       MAD_F(0x061f78aa) /*  0.382683432 */,
-	       MAD_F(0x0ec835e8) /*  0.923879533 */,
-	       MAD_F(0x0ec835e8) /*  0.923879533 */,
-	       MAD_F(0x061f78aa) /*  0.382683432 */ },
-
-  /*  2 */  {  MAD_F(0x0216a2a2) /*  0.130526192 */,
-	      -MAD_F(0x061f78aa) /* -0.382683432 */,
-	       MAD_F(0x09bd7ca0) /*  0.608761429 */,
-	      -MAD_F(0x0cb19346) /* -0.793353340 */,
-	       MAD_F(0x0ec835e8) /*  0.923879533 */,
-	      -MAD_F(0x0fdcf549) /* -0.991444861 */ },
-
-  /*  8 */  { -MAD_F(0x0fdcf549) /* -0.991444861 */,
-	      -MAD_F(0x0ec835e8) /* -0.923879533 */,
-	      -MAD_F(0x0cb19346) /* -0.793353340 */,
-	      -MAD_F(0x09bd7ca0) /* -0.608761429 */,
-	      -MAD_F(0x061f78aa) /* -0.382683432 */,
-	      -MAD_F(0x0216a2a2) /* -0.130526192 */ }
diff --git a/code/libmad-0.15.1b/install-sh b/code/libmad-0.15.1b/install-sh
deleted file mode 100644
index 36f96f3e..00000000
--- a/code/libmad-0.15.1b/install-sh
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
-
-	pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
-
-# Make a couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
-	else
-		:
-	fi
-} &&
-
-# Now rename the file to the real destination.
-
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-	(exit 0); exit
-}
diff --git a/code/libmad-0.15.1b/layer12.c b/code/libmad-0.15.1b/layer12.c
deleted file mode 100644
index 6981f9ce..00000000
--- a/code/libmad-0.15.1b/layer12.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: layer12.c,v 1.17 2004/02/05 09:02:39 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# ifdef HAVE_LIMITS_H
-#  include <limits.h>
-# else
-#  define CHAR_BIT  8
-# endif
-
-# include "fixed.h"
-# include "bit.h"
-# include "stream.h"
-# include "frame.h"
-# include "layer12.h"
-
-/*
- * scalefactor table
- * used in both Layer I and Layer II decoding
- */
-static
-mad_fixed_t const sf_table[64] = {
-# include "sf_table.dat"
-};
-
-/* --- Layer I ------------------------------------------------------------- */
-
-/* linear scaling table */
-static
-mad_fixed_t const linear_table[14] = {
-  MAD_F(0x15555555),  /* 2^2  / (2^2  - 1) == 1.33333333333333 */
-  MAD_F(0x12492492),  /* 2^3  / (2^3  - 1) == 1.14285714285714 */
-  MAD_F(0x11111111),  /* 2^4  / (2^4  - 1) == 1.06666666666667 */
-  MAD_F(0x10842108),  /* 2^5  / (2^5  - 1) == 1.03225806451613 */
-  MAD_F(0x10410410),  /* 2^6  / (2^6  - 1) == 1.01587301587302 */
-  MAD_F(0x10204081),  /* 2^7  / (2^7  - 1) == 1.00787401574803 */
-  MAD_F(0x10101010),  /* 2^8  / (2^8  - 1) == 1.00392156862745 */
-  MAD_F(0x10080402),  /* 2^9  / (2^9  - 1) == 1.00195694716243 */
-  MAD_F(0x10040100),  /* 2^10 / (2^10 - 1) == 1.00097751710655 */
-  MAD_F(0x10020040),  /* 2^11 / (2^11 - 1) == 1.00048851978505 */
-  MAD_F(0x10010010),  /* 2^12 / (2^12 - 1) == 1.00024420024420 */
-  MAD_F(0x10008004),  /* 2^13 / (2^13 - 1) == 1.00012208521548 */
-  MAD_F(0x10004001),  /* 2^14 / (2^14 - 1) == 1.00006103888177 */
-  MAD_F(0x10002000)   /* 2^15 / (2^15 - 1) == 1.00003051850948 */
-};
-
-/*
- * NAME:	I_sample()
- * DESCRIPTION:	decode one requantized Layer I sample from a bitstream
- */
-static
-mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb)
-{
-  mad_fixed_t sample;
-
-  sample = mad_bit_read(ptr, nb);
-
-  /* invert most significant bit, extend sign, then scale to fixed format */
-
-  sample ^= 1 << (nb - 1);
-  sample |= -(sample & (1 << (nb - 1)));
-
-  sample <<= MAD_F_FRACBITS - (nb - 1);
-
-  /* requantize the sample */
-
-  /* s'' = (2^nb / (2^nb - 1)) * (s''' + 2^(-nb + 1)) */
-
-  sample += MAD_F_ONE >> (nb - 1);
-
-  return mad_f_mul(sample, linear_table[nb - 2]);
-
-  /* s' = factor * s'' */
-  /* (to be performed by caller) */
-}
-
-/*
- * NAME:	layer->I()
- * DESCRIPTION:	decode a single Layer I frame
- */
-int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
-{
-  struct mad_header *header = &frame->header;
-  unsigned int nch, bound, ch, s, sb, nb;
-  unsigned char allocation[2][32], scalefactor[2][32];
-
-  nch = MAD_NCHANNELS(header);
-
-  bound = 32;
-  if (header->mode == MAD_MODE_JOINT_STEREO) {
-    header->flags |= MAD_FLAG_I_STEREO;
-    bound = 4 + header->mode_extension * 4;
-  }
-
-  /* check CRC word */
-
-  if (header->flags & MAD_FLAG_PROTECTION) {
-    header->crc_check =
-      mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)),
-		  header->crc_check);
-
-    if (header->crc_check != header->crc_target &&
-	!(frame->options & MAD_OPTION_IGNORECRC)) {
-      stream->error = MAD_ERROR_BADCRC;
-      return -1;
-    }
-  }
-
-  /* decode bit allocations */
-
-  for (sb = 0; sb < bound; ++sb) {
-    for (ch = 0; ch < nch; ++ch) {
-      nb = mad_bit_read(&stream->ptr, 4);
-
-      if (nb == 15) {
-	stream->error = MAD_ERROR_BADBITALLOC;
-	return -1;
-      }
-
-      allocation[ch][sb] = nb ? nb + 1 : 0;
-    }
-  }
-
-  for (sb = bound; sb < 32; ++sb) {
-    nb = mad_bit_read(&stream->ptr, 4);
-
-    if (nb == 15) {
-      stream->error = MAD_ERROR_BADBITALLOC;
-      return -1;
-    }
-
-    allocation[0][sb] =
-    allocation[1][sb] = nb ? nb + 1 : 0;
-  }
-
-  /* decode scalefactors */
-
-  for (sb = 0; sb < 32; ++sb) {
-    for (ch = 0; ch < nch; ++ch) {
-      if (allocation[ch][sb]) {
-	scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
-
-# if defined(OPT_STRICT)
-	/*
-	 * Scalefactor index 63 does not appear in Table B.1 of
-	 * ISO/IEC 11172-3. Nonetheless, other implementations accept it,
-	 * so we only reject it if OPT_STRICT is defined.
-	 */
-	if (scalefactor[ch][sb] == 63) {
-	  stream->error = MAD_ERROR_BADSCALEFACTOR;
-	  return -1;
-	}
-# endif
-      }
-    }
-  }
-
-  /* decode samples */
-
-  for (s = 0; s < 12; ++s) {
-    for (sb = 0; sb < bound; ++sb) {
-      for (ch = 0; ch < nch; ++ch) {
-	nb = allocation[ch][sb];
-	frame->sbsample[ch][s][sb] = nb ?
-	  mad_f_mul(I_sample(&stream->ptr, nb),
-		    sf_table[scalefactor[ch][sb]]) : 0;
-      }
-    }
-
-    for (sb = bound; sb < 32; ++sb) {
-      if ((nb = allocation[0][sb])) {
-	mad_fixed_t sample;
-
-	sample = I_sample(&stream->ptr, nb);
-
-	for (ch = 0; ch < nch; ++ch) {
-	  frame->sbsample[ch][s][sb] =
-	    mad_f_mul(sample, sf_table[scalefactor[ch][sb]]);
-	}
-      }
-      else {
-	for (ch = 0; ch < nch; ++ch)
-	  frame->sbsample[ch][s][sb] = 0;
-      }
-    }
-  }
-
-  return 0;
-}
-
-/* --- Layer II ------------------------------------------------------------ */
-
-/* possible quantization per subband table */
-static
-struct {
-  unsigned int sblimit;
-  unsigned char const offsets[30];
-} const sbquant_table[5] = {
-  /* ISO/IEC 11172-3 Table B.2a */
-  { 27, { 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3,	/* 0 */
-	  3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0 } },
-  /* ISO/IEC 11172-3 Table B.2b */
-  { 30, { 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3,	/* 1 */
-	  3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0 } },
-  /* ISO/IEC 11172-3 Table B.2c */
-  {  8, { 5, 5, 2, 2, 2, 2, 2, 2 } },				/* 2 */
-  /* ISO/IEC 11172-3 Table B.2d */
-  { 12, { 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } },		/* 3 */
-  /* ISO/IEC 13818-3 Table B.1 */
-  { 30, { 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1,	/* 4 */
-	  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } }
-};
-
-/* bit allocation table */
-static
-struct {
-  unsigned short nbal;
-  unsigned short offset;
-} const bitalloc_table[8] = {
-  { 2, 0 },  /* 0 */
-  { 2, 3 },  /* 1 */
-  { 3, 3 },  /* 2 */
-  { 3, 1 },  /* 3 */
-  { 4, 2 },  /* 4 */
-  { 4, 3 },  /* 5 */
-  { 4, 4 },  /* 6 */
-  { 4, 5 }   /* 7 */
-};
-
-/* offsets into quantization class table */
-static
-unsigned char const offset_table[6][15] = {
-  { 0, 1, 16                                             },  /* 0 */
-  { 0, 1,  2, 3, 4, 5, 16                                },  /* 1 */
-  { 0, 1,  2, 3, 4, 5,  6, 7,  8,  9, 10, 11, 12, 13, 14 },  /* 2 */
-  { 0, 1,  3, 4, 5, 6,  7, 8,  9, 10, 11, 12, 13, 14, 15 },  /* 3 */
-  { 0, 1,  2, 3, 4, 5,  6, 7,  8,  9, 10, 11, 12, 13, 16 },  /* 4 */
-  { 0, 2,  4, 5, 6, 7,  8, 9, 10, 11, 12, 13, 14, 15, 16 }   /* 5 */
-};
-
-/* quantization class table */
-static
-struct quantclass {
-  unsigned short nlevels;
-  unsigned char group;
-  unsigned char bits;
-  mad_fixed_t C;
-  mad_fixed_t D;
-} const qc_table[17] = {
-# include "qc_table.dat"
-};
-
-/*
- * NAME:	II_samples()
- * DESCRIPTION:	decode three requantized Layer II samples from a bitstream
- */
-static
-void II_samples(struct mad_bitptr *ptr,
-		struct quantclass const *quantclass,
-		mad_fixed_t output[3])
-{
-  unsigned int nb, s, sample[3];
-
-  if ((nb = quantclass->group)) {
-    unsigned int c, nlevels;
-
-    /* degrouping */
-    c = mad_bit_read(ptr, quantclass->bits);
-    nlevels = quantclass->nlevels;
-
-    for (s = 0; s < 3; ++s) {
-      sample[s] = c % nlevels;
-      c /= nlevels;
-    }
-  }
-  else {
-    nb = quantclass->bits;
-
-    for (s = 0; s < 3; ++s)
-      sample[s] = mad_bit_read(ptr, nb);
-  }
-
-  for (s = 0; s < 3; ++s) {
-    mad_fixed_t requantized;
-
-    /* invert most significant bit, extend sign, then scale to fixed format */
-
-    requantized  = sample[s] ^ (1 << (nb - 1));
-    requantized |= -(requantized & (1 << (nb - 1)));
-
-    requantized <<= MAD_F_FRACBITS - (nb - 1);
-
-    /* requantize the sample */
-
-    /* s'' = C * (s''' + D) */
-
-    output[s] = mad_f_mul(requantized + quantclass->D, quantclass->C);
-
-    /* s' = factor * s'' */
-    /* (to be performed by caller) */
-  }
-}
-
-/*
- * NAME:	layer->II()
- * DESCRIPTION:	decode a single Layer II frame
- */
-int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
-{
-  struct mad_header *header = &frame->header;
-  struct mad_bitptr start;
-  unsigned int index, sblimit, nbal, nch, bound, gr, ch, s, sb;
-  unsigned char const *offsets;
-  unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3];
-  mad_fixed_t samples[3];
-
-  nch = MAD_NCHANNELS(header);
-
-  if (header->flags & MAD_FLAG_LSF_EXT)
-    index = 4;
-  else if (header->flags & MAD_FLAG_FREEFORMAT)
-    goto freeformat;
-  else {
-    unsigned long bitrate_per_channel;
-
-    bitrate_per_channel = header->bitrate;
-    if (nch == 2) {
-      bitrate_per_channel /= 2;
-
-# if defined(OPT_STRICT)
-      /*
-       * ISO/IEC 11172-3 allows only single channel mode for 32, 48, 56, and
-       * 80 kbps bitrates in Layer II, but some encoders ignore this
-       * restriction. We enforce it if OPT_STRICT is defined.
-       */
-      if (bitrate_per_channel <= 28000 || bitrate_per_channel == 40000) {
-	stream->error = MAD_ERROR_BADMODE;
-	return -1;
-      }
-# endif
-    }
-    else {  /* nch == 1 */
-      if (bitrate_per_channel > 192000) {
-	/*
-	 * ISO/IEC 11172-3 does not allow single channel mode for 224, 256,
-	 * 320, or 384 kbps bitrates in Layer II.
-	 */
-	stream->error = MAD_ERROR_BADMODE;
-	return -1;
-      }
-    }
-
-    if (bitrate_per_channel <= 48000)
-      index = (header->samplerate == 32000) ? 3 : 2;
-    else if (bitrate_per_channel <= 80000)
-      index = 0;
-    else {
-    freeformat:
-      index = (header->samplerate == 48000) ? 0 : 1;
-    }
-  }
-
-  sblimit = sbquant_table[index].sblimit;
-  offsets = sbquant_table[index].offsets;
-
-  bound = 32;
-  if (header->mode == MAD_MODE_JOINT_STEREO) {
-    header->flags |= MAD_FLAG_I_STEREO;
-    bound = 4 + header->mode_extension * 4;
-  }
-
-  if (bound > sblimit)
-    bound = sblimit;
-
-  start = stream->ptr;
-
-  /* decode bit allocations */
-
-  for (sb = 0; sb < bound; ++sb) {
-    nbal = bitalloc_table[offsets[sb]].nbal;
-
-    for (ch = 0; ch < nch; ++ch)
-      allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
-  }
-
-  for (sb = bound; sb < sblimit; ++sb) {
-    nbal = bitalloc_table[offsets[sb]].nbal;
-
-    allocation[0][sb] =
-    allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
-  }
-
-  /* decode scalefactor selection info */
-
-  for (sb = 0; sb < sblimit; ++sb) {
-    for (ch = 0; ch < nch; ++ch) {
-      if (allocation[ch][sb])
-	scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
-    }
-  }
-
-  /* check CRC word */
-
-  if (header->flags & MAD_FLAG_PROTECTION) {
-    header->crc_check =
-      mad_bit_crc(start, mad_bit_length(&start, &stream->ptr),
-		  header->crc_check);
-
-    if (header->crc_check != header->crc_target &&
-	!(frame->options & MAD_OPTION_IGNORECRC)) {
-      stream->error = MAD_ERROR_BADCRC;
-      return -1;
-    }
-  }
-
-  /* decode scalefactors */
-
-  for (sb = 0; sb < sblimit; ++sb) {
-    for (ch = 0; ch < nch; ++ch) {
-      if (allocation[ch][sb]) {
-	scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
-
-	switch (scfsi[ch][sb]) {
-	case 2:
-	  scalefactor[ch][sb][2] =
-	  scalefactor[ch][sb][1] =
-	  scalefactor[ch][sb][0];
-	  break;
-
-	case 0:
-	  scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
-	  /* fall through */
-
-	case 1:
-	case 3:
-	  scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
-	}
-
-	if (scfsi[ch][sb] & 1)
-	  scalefactor[ch][sb][1] = scalefactor[ch][sb][scfsi[ch][sb] - 1];
-
-# if defined(OPT_STRICT)
-	/*
-	 * Scalefactor index 63 does not appear in Table B.1 of
-	 * ISO/IEC 11172-3. Nonetheless, other implementations accept it,
-	 * so we only reject it if OPT_STRICT is defined.
-	 */
-	if (scalefactor[ch][sb][0] == 63 ||
-	    scalefactor[ch][sb][1] == 63 ||
-	    scalefactor[ch][sb][2] == 63) {
-	  stream->error = MAD_ERROR_BADSCALEFACTOR;
-	  return -1;
-	}
-# endif
-      }
-    }
-  }
-
-  /* decode samples */
-
-  for (gr = 0; gr < 12; ++gr) {
-    for (sb = 0; sb < bound; ++sb) {
-      for (ch = 0; ch < nch; ++ch) {
-	if ((index = allocation[ch][sb])) {
-	  index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
-
-	  II_samples(&stream->ptr, &qc_table[index], samples);
-
-	  for (s = 0; s < 3; ++s) {
-	    frame->sbsample[ch][3 * gr + s][sb] =
-	      mad_f_mul(samples[s], sf_table[scalefactor[ch][sb][gr / 4]]);
-	  }
-	}
-	else {
-	  for (s = 0; s < 3; ++s)
-	    frame->sbsample[ch][3 * gr + s][sb] = 0;
-	}
-      }
-    }
-
-    for (sb = bound; sb < sblimit; ++sb) {
-      if ((index = allocation[0][sb])) {
-	index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
-
-	II_samples(&stream->ptr, &qc_table[index], samples);
-
-	for (ch = 0; ch < nch; ++ch) {
-	  for (s = 0; s < 3; ++s) {
-	    frame->sbsample[ch][3 * gr + s][sb] =
-	      mad_f_mul(samples[s], sf_table[scalefactor[ch][sb][gr / 4]]);
-	  }
-	}
-      }
-      else {
-	for (ch = 0; ch < nch; ++ch) {
-	  for (s = 0; s < 3; ++s)
-	    frame->sbsample[ch][3 * gr + s][sb] = 0;
-	}
-      }
-    }
-
-    for (ch = 0; ch < nch; ++ch) {
-      for (s = 0; s < 3; ++s) {
-	for (sb = sblimit; sb < 32; ++sb)
-	  frame->sbsample[ch][3 * gr + s][sb] = 0;
-      }
-    }
-  }
-
-  return 0;
-}
diff --git a/code/libmad-0.15.1b/layer12.h b/code/libmad-0.15.1b/layer12.h
deleted file mode 100644
index e1c49969..00000000
--- a/code/libmad-0.15.1b/layer12.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: layer12.h,v 1.10 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_LAYER12_H
-# define LIBMAD_LAYER12_H
-
-# include "stream.h"
-# include "frame.h"
-
-int mad_layer_I(struct mad_stream *, struct mad_frame *);
-int mad_layer_II(struct mad_stream *, struct mad_frame *);
-
-# endif
diff --git a/code/libmad-0.15.1b/layer3.c b/code/libmad-0.15.1b/layer3.c
deleted file mode 100644
index 4e5d3fa0..00000000
--- a/code/libmad-0.15.1b/layer3.c
+++ /dev/null
@@ -1,2698 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: layer3.c,v 1.43 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include <stdlib.h>
-# include <string.h>
-
-# ifdef HAVE_ASSERT_H
-#  include <assert.h>
-# endif
-
-# ifdef HAVE_LIMITS_H
-#  include <limits.h>
-# else
-#  define CHAR_BIT  8
-# endif
-
-# include "fixed.h"
-# include "bit.h"
-# include "stream.h"
-# include "frame.h"
-# include "huffman.h"
-# include "layer3.h"
-
-/* --- Layer III ----------------------------------------------------------- */
-
-enum {
-  count1table_select = 0x01,
-  scalefac_scale     = 0x02,
-  preflag	     = 0x04,
-  mixed_block_flag   = 0x08
-};
-
-enum {
-  I_STEREO  = 0x1,
-  MS_STEREO = 0x2
-};
-
-struct sideinfo {
-  unsigned int main_data_begin;
-  unsigned int private_bits;
-
-  unsigned char scfsi[2];
-
-  struct granule {
-    struct channel {
-      /* from side info */
-      unsigned short part2_3_length;
-      unsigned short big_values;
-      unsigned short global_gain;
-      unsigned short scalefac_compress;
-
-      unsigned char flags;
-      unsigned char block_type;
-      unsigned char table_select[3];
-      unsigned char subblock_gain[3];
-      unsigned char region0_count;
-      unsigned char region1_count;
-
-      /* from main_data */
-      unsigned char scalefac[39];	/* scalefac_l and/or scalefac_s */
-    } ch[2];
-  } gr[2];
-};
-
-/*
- * scalefactor bit lengths
- * derived from section 2.4.2.7 of ISO/IEC 11172-3
- */
-static
-struct {
-  unsigned char slen1;
-  unsigned char slen2;
-} const sflen_table[16] = {
-  { 0, 0 }, { 0, 1 }, { 0, 2 }, { 0, 3 },
-  { 3, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
-  { 2, 1 }, { 2, 2 }, { 2, 3 }, { 3, 1 },
-  { 3, 2 }, { 3, 3 }, { 4, 2 }, { 4, 3 }
-};
-
-/*
- * number of LSF scalefactor band values
- * derived from section 2.4.3.2 of ISO/IEC 13818-3
- */
-static
-unsigned char const nsfb_table[6][3][4] = {
-  { {  6,  5,  5, 5 },
-    {  9,  9,  9, 9 },
-    {  6,  9,  9, 9 } },
-
-  { {  6,  5,  7, 3 },
-    {  9,  9, 12, 6 },
-    {  6,  9, 12, 6 } },
-
-  { { 11, 10,  0, 0 },
-    { 18, 18,  0, 0 },
-    { 15, 18,  0, 0 } },
-
-  { {  7,  7,  7, 0 },
-    { 12, 12, 12, 0 },
-    {  6, 15, 12, 0 } },
-
-  { {  6,  6,  6, 3 },
-    { 12,  9,  9, 6 },
-    {  6, 12,  9, 6 } },
-
-  { {  8,  8,  5, 0 },
-    { 15, 12,  9, 0 },
-    {  6, 18,  9, 0 } }
-};
-
-/*
- * MPEG-1 scalefactor band widths
- * derived from Table B.8 of ISO/IEC 11172-3
- */
-static
-unsigned char const sfb_48000_long[] = {
-   4,  4,  4,  4,  4,  4,  6,  6,  6,   8,  10,
-  12, 16, 18, 22, 28, 34, 40, 46, 54,  54, 192
-};
-
-static
-unsigned char const sfb_44100_long[] = {
-   4,  4,  4,  4,  4,  4,  6,  6,  8,   8,  10,
-  12, 16, 20, 24, 28, 34, 42, 50, 54,  76, 158
-};
-
-static
-unsigned char const sfb_32000_long[] = {
-   4,  4,  4,  4,  4,  4,  6,  6,  8,  10,  12,
-  16, 20, 24, 30, 38, 46, 56, 68, 84, 102,  26
-};
-
-static
-unsigned char const sfb_48000_short[] = {
-   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
-   6,  6,  6,  6,  6, 10, 10, 10, 12, 12, 12, 14, 14,
-  14, 16, 16, 16, 20, 20, 20, 26, 26, 26, 66, 66, 66
-};
-
-static
-unsigned char const sfb_44100_short[] = {
-   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
-   6,  6,  8,  8,  8, 10, 10, 10, 12, 12, 12, 14, 14,
-  14, 18, 18, 18, 22, 22, 22, 30, 30, 30, 56, 56, 56
-};
-
-static
-unsigned char const sfb_32000_short[] = {
-   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
-   6,  6,  8,  8,  8, 12, 12, 12, 16, 16, 16, 20, 20,
-  20, 26, 26, 26, 34, 34, 34, 42, 42, 42, 12, 12, 12
-};
-
-static
-unsigned char const sfb_48000_mixed[] = {
-  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
-  /* short */  4,  4,  4,  6,  6,  6,  6,  6,  6, 10,
-              10, 10, 12, 12, 12, 14, 14, 14, 16, 16,
-              16, 20, 20, 20, 26, 26, 26, 66, 66, 66
-};
-
-static
-unsigned char const sfb_44100_mixed[] = {
-  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
-  /* short */  4,  4,  4,  6,  6,  6,  8,  8,  8, 10,
-              10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
-              18, 22, 22, 22, 30, 30, 30, 56, 56, 56
-};
-
-static
-unsigned char const sfb_32000_mixed[] = {
-  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
-  /* short */  4,  4,  4,  6,  6,  6,  8,  8,  8, 12,
-              12, 12, 16, 16, 16, 20, 20, 20, 26, 26,
-              26, 34, 34, 34, 42, 42, 42, 12, 12, 12
-};
-
-/*
- * MPEG-2 scalefactor band widths
- * derived from Table B.2 of ISO/IEC 13818-3
- */
-static
-unsigned char const sfb_24000_long[] = {
-   6,  6,  6,  6,  6,  6,  8, 10, 12,  14,  16,
-  18, 22, 26, 32, 38, 46, 54, 62, 70,  76,  36
-};
-
-static
-unsigned char const sfb_22050_long[] = {
-   6,  6,  6,  6,  6,  6,  8, 10, 12,  14,  16,
-  20, 24, 28, 32, 38, 46, 52, 60, 68,  58,  54
-};
-
-# define sfb_16000_long  sfb_22050_long
-
-static
-unsigned char const sfb_24000_short[] = {
-   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  8,
-   8,  8, 10, 10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
-  18, 24, 24, 24, 32, 32, 32, 44, 44, 44, 12, 12, 12
-};
-
-static
-unsigned char const sfb_22050_short[] = {
-   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,
-   6,  6,  8,  8,  8, 10, 10, 10, 14, 14, 14, 18, 18,
-  18, 26, 26, 26, 32, 32, 32, 42, 42, 42, 18, 18, 18
-};
-
-static
-unsigned char const sfb_16000_short[] = {
-   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  8,
-   8,  8, 10, 10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
-  18, 24, 24, 24, 30, 30, 30, 40, 40, 40, 18, 18, 18
-};
-
-static
-unsigned char const sfb_24000_mixed[] = {
-  /* long */   6,  6,  6,  6,  6,  6,
-  /* short */  6,  6,  6,  8,  8,  8, 10, 10, 10, 12,
-              12, 12, 14, 14, 14, 18, 18, 18, 24, 24,
-              24, 32, 32, 32, 44, 44, 44, 12, 12, 12
-};
-
-static
-unsigned char const sfb_22050_mixed[] = {
-  /* long */   6,  6,  6,  6,  6,  6,
-  /* short */  6,  6,  6,  6,  6,  6,  8,  8,  8, 10,
-              10, 10, 14, 14, 14, 18, 18, 18, 26, 26,
-              26, 32, 32, 32, 42, 42, 42, 18, 18, 18
-};
-
-static
-unsigned char const sfb_16000_mixed[] = {
-  /* long */   6,  6,  6,  6,  6,  6,
-  /* short */  6,  6,  6,  8,  8,  8, 10, 10, 10, 12,
-              12, 12, 14, 14, 14, 18, 18, 18, 24, 24,
-              24, 30, 30, 30, 40, 40, 40, 18, 18, 18
-};
-
-/*
- * MPEG 2.5 scalefactor band widths
- * derived from public sources
- */
-# define sfb_12000_long  sfb_16000_long
-# define sfb_11025_long  sfb_12000_long
-
-static
-unsigned char const sfb_8000_long[] = {
-  12, 12, 12, 12, 12, 12, 16, 20, 24,  28,  32,
-  40, 48, 56, 64, 76, 90,  2,  2,  2,   2,   2
-};
-
-# define sfb_12000_short  sfb_16000_short
-# define sfb_11025_short  sfb_12000_short
-
-static
-unsigned char const sfb_8000_short[] = {
-   8,  8,  8,  8,  8,  8,  8,  8,  8, 12, 12, 12, 16,
-  16, 16, 20, 20, 20, 24, 24, 24, 28, 28, 28, 36, 36,
-  36,  2,  2,  2,  2,  2,  2,  2,  2,  2, 26, 26, 26
-};
-
-# define sfb_12000_mixed  sfb_16000_mixed
-# define sfb_11025_mixed  sfb_12000_mixed
-
-/* the 8000 Hz short block scalefactor bands do not break after
-   the first 36 frequency lines, so this is probably wrong */
-static
-unsigned char const sfb_8000_mixed[] = {
-  /* long */  12, 12, 12,
-  /* short */  4,  4,  4,  8,  8,  8, 12, 12, 12, 16, 16, 16,
-              20, 20, 20, 24, 24, 24, 28, 28, 28, 36, 36, 36,
-               2,  2,  2,  2,  2,  2,  2,  2,  2, 26, 26, 26
-};
-
-static
-struct {
-  unsigned char const *l;
-  unsigned char const *s;
-  unsigned char const *m;
-} const sfbwidth_table[9] = {
-  { sfb_48000_long, sfb_48000_short, sfb_48000_mixed },
-  { sfb_44100_long, sfb_44100_short, sfb_44100_mixed },
-  { sfb_32000_long, sfb_32000_short, sfb_32000_mixed },
-  { sfb_24000_long, sfb_24000_short, sfb_24000_mixed },
-  { sfb_22050_long, sfb_22050_short, sfb_22050_mixed },
-  { sfb_16000_long, sfb_16000_short, sfb_16000_mixed },
-  { sfb_12000_long, sfb_12000_short, sfb_12000_mixed },
-  { sfb_11025_long, sfb_11025_short, sfb_11025_mixed },
-  {  sfb_8000_long,  sfb_8000_short,  sfb_8000_mixed }
-};
-
-/*
- * scalefactor band preemphasis (used only when preflag is set)
- * derived from Table B.6 of ISO/IEC 11172-3
- */
-static
-unsigned char const pretab[22] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 2, 0
-};
-
-/*
- * table for requantization
- *
- * rq_table[x].mantissa * 2^(rq_table[x].exponent) = x^(4/3)
- */
-static
-struct fixedfloat {
-  unsigned long mantissa  : 27;
-  unsigned short exponent :  5;
-} const rq_table[8207] = {
-# include "rq_table.dat"
-};
-
-/*
- * fractional powers of two
- * used for requantization and joint stereo decoding
- *
- * root_table[3 + x] = 2^(x/4)
- */
-static
-mad_fixed_t const root_table[7] = {
-  MAD_F(0x09837f05) /* 2^(-3/4) == 0.59460355750136 */,
-  MAD_F(0x0b504f33) /* 2^(-2/4) == 0.70710678118655 */,
-  MAD_F(0x0d744fcd) /* 2^(-1/4) == 0.84089641525371 */,
-  MAD_F(0x10000000) /* 2^( 0/4) == 1.00000000000000 */,
-  MAD_F(0x1306fe0a) /* 2^(+1/4) == 1.18920711500272 */,
-  MAD_F(0x16a09e66) /* 2^(+2/4) == 1.41421356237310 */,
-  MAD_F(0x1ae89f99) /* 2^(+3/4) == 1.68179283050743 */
-};
-
-/*
- * coefficients for aliasing reduction
- * derived from Table B.9 of ISO/IEC 11172-3
- *
- *  c[]  = { -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037 }
- * cs[i] =    1 / sqrt(1 + c[i]^2)
- * ca[i] = c[i] / sqrt(1 + c[i]^2)
- */
-static
-mad_fixed_t const cs[8] = {
-  +MAD_F(0x0db84a81) /* +0.857492926 */, +MAD_F(0x0e1b9d7f) /* +0.881741997 */,
-  +MAD_F(0x0f31adcf) /* +0.949628649 */, +MAD_F(0x0fbba815) /* +0.983314592 */,
-  +MAD_F(0x0feda417) /* +0.995517816 */, +MAD_F(0x0ffc8fc8) /* +0.999160558 */,
-  +MAD_F(0x0fff964c) /* +0.999899195 */, +MAD_F(0x0ffff8d3) /* +0.999993155 */
-};
-
-static
-mad_fixed_t const ca[8] = {
-  -MAD_F(0x083b5fe7) /* -0.514495755 */, -MAD_F(0x078c36d2) /* -0.471731969 */,
-  -MAD_F(0x05039814) /* -0.313377454 */, -MAD_F(0x02e91dd1) /* -0.181913200 */,
-  -MAD_F(0x0183603a) /* -0.094574193 */, -MAD_F(0x00a7cb87) /* -0.040965583 */,
-  -MAD_F(0x003a2847) /* -0.014198569 */, -MAD_F(0x000f27b4) /* -0.003699975 */
-};
-
-/*
- * IMDCT coefficients for short blocks
- * derived from section 2.4.3.4.10.2 of ISO/IEC 11172-3
- *
- * imdct_s[i/even][k] = cos((PI / 24) * (2 *       (i / 2) + 7) * (2 * k + 1))
- * imdct_s[i /odd][k] = cos((PI / 24) * (2 * (6 + (i-1)/2) + 7) * (2 * k + 1))
- */
-static
-mad_fixed_t const imdct_s[6][6] = {
-# include "imdct_s.dat"
-};
-
-# if !defined(ASO_IMDCT)
-/*
- * windowing coefficients for long blocks
- * derived from section 2.4.3.4.10.3 of ISO/IEC 11172-3
- *
- * window_l[i] = sin((PI / 36) * (i + 1/2))
- */
-static
-mad_fixed_t const window_l[36] = {
-  MAD_F(0x00b2aa3e) /* 0.043619387 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
-  MAD_F(0x03768962) /* 0.216439614 */, MAD_F(0x04cfb0e2) /* 0.300705800 */,
-  MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x07635284) /* 0.461748613 */,
-  MAD_F(0x0898c779) /* 0.537299608 */, MAD_F(0x09bd7ca0) /* 0.608761429 */,
-  MAD_F(0x0acf37ad) /* 0.675590208 */, MAD_F(0x0bcbe352) /* 0.737277337 */,
-  MAD_F(0x0cb19346) /* 0.793353340 */, MAD_F(0x0d7e8807) /* 0.843391446 */,
-
-  MAD_F(0x0e313245) /* 0.887010833 */, MAD_F(0x0ec835e8) /* 0.923879533 */,
-  MAD_F(0x0f426cb5) /* 0.953716951 */, MAD_F(0x0f9ee890) /* 0.976296007 */,
-  MAD_F(0x0fdcf549) /* 0.991444861 */, MAD_F(0x0ffc19fd) /* 0.999048222 */,
-  MAD_F(0x0ffc19fd) /* 0.999048222 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
-  MAD_F(0x0f9ee890) /* 0.976296007 */, MAD_F(0x0f426cb5) /* 0.953716951 */,
-  MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0e313245) /* 0.887010833 */,
-
-  MAD_F(0x0d7e8807) /* 0.843391446 */, MAD_F(0x0cb19346) /* 0.793353340 */,
-  MAD_F(0x0bcbe352) /* 0.737277337 */, MAD_F(0x0acf37ad) /* 0.675590208 */,
-  MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0898c779) /* 0.537299608 */,
-  MAD_F(0x07635284) /* 0.461748613 */, MAD_F(0x061f78aa) /* 0.382683432 */,
-  MAD_F(0x04cfb0e2) /* 0.300705800 */, MAD_F(0x03768962) /* 0.216439614 */,
-  MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x00b2aa3e) /* 0.043619387 */,
-};
-# endif  /* ASO_IMDCT */
-
-/*
- * windowing coefficients for short blocks
- * derived from section 2.4.3.4.10.3 of ISO/IEC 11172-3
- *
- * window_s[i] = sin((PI / 12) * (i + 1/2))
- */
-static
-mad_fixed_t const window_s[12] = {
-  MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x061f78aa) /* 0.382683432 */,
-  MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0cb19346) /* 0.793353340 */,
-  MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
-  MAD_F(0x0fdcf549) /* 0.991444861 */, MAD_F(0x0ec835e8) /* 0.923879533 */,
-  MAD_F(0x0cb19346) /* 0.793353340 */, MAD_F(0x09bd7ca0) /* 0.608761429 */,
-  MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
-};
-
-/*
- * coefficients for intensity stereo processing
- * derived from section 2.4.3.4.9.3 of ISO/IEC 11172-3
- *
- * is_ratio[i] = tan(i * (PI / 12))
- * is_table[i] = is_ratio[i] / (1 + is_ratio[i])
- */
-static
-mad_fixed_t const is_table[7] = {
-  MAD_F(0x00000000) /* 0.000000000 */,
-  MAD_F(0x0361962f) /* 0.211324865 */,
-  MAD_F(0x05db3d74) /* 0.366025404 */,
-  MAD_F(0x08000000) /* 0.500000000 */,
-  MAD_F(0x0a24c28c) /* 0.633974596 */,
-  MAD_F(0x0c9e69d1) /* 0.788675135 */,
-  MAD_F(0x10000000) /* 1.000000000 */
-};
-
-/*
- * coefficients for LSF intensity stereo processing
- * derived from section 2.4.3.2 of ISO/IEC 13818-3
- *
- * is_lsf_table[0][i] = (1 / sqrt(sqrt(2)))^(i + 1)
- * is_lsf_table[1][i] = (1 /      sqrt(2)) ^(i + 1)
- */
-static
-mad_fixed_t const is_lsf_table[2][15] = {
-  {
-    MAD_F(0x0d744fcd) /* 0.840896415 */,
-    MAD_F(0x0b504f33) /* 0.707106781 */,
-    MAD_F(0x09837f05) /* 0.594603558 */,
-    MAD_F(0x08000000) /* 0.500000000 */,
-    MAD_F(0x06ba27e6) /* 0.420448208 */,
-    MAD_F(0x05a8279a) /* 0.353553391 */,
-    MAD_F(0x04c1bf83) /* 0.297301779 */,
-    MAD_F(0x04000000) /* 0.250000000 */,
-    MAD_F(0x035d13f3) /* 0.210224104 */,
-    MAD_F(0x02d413cd) /* 0.176776695 */,
-    MAD_F(0x0260dfc1) /* 0.148650889 */,
-    MAD_F(0x02000000) /* 0.125000000 */,
-    MAD_F(0x01ae89fa) /* 0.105112052 */,
-    MAD_F(0x016a09e6) /* 0.088388348 */,
-    MAD_F(0x01306fe1) /* 0.074325445 */
-  }, {
-    MAD_F(0x0b504f33) /* 0.707106781 */,
-    MAD_F(0x08000000) /* 0.500000000 */,
-    MAD_F(0x05a8279a) /* 0.353553391 */,
-    MAD_F(0x04000000) /* 0.250000000 */,
-    MAD_F(0x02d413cd) /* 0.176776695 */,
-    MAD_F(0x02000000) /* 0.125000000 */,
-    MAD_F(0x016a09e6) /* 0.088388348 */,
-    MAD_F(0x01000000) /* 0.062500000 */,
-    MAD_F(0x00b504f3) /* 0.044194174 */,
-    MAD_F(0x00800000) /* 0.031250000 */,
-    MAD_F(0x005a827a) /* 0.022097087 */,
-    MAD_F(0x00400000) /* 0.015625000 */,
-    MAD_F(0x002d413d) /* 0.011048543 */,
-    MAD_F(0x00200000) /* 0.007812500 */,
-    MAD_F(0x0016a09e) /* 0.005524272 */
-  }
-};
-
-/*
- * NAME:	III_sideinfo()
- * DESCRIPTION:	decode frame side information from a bitstream
- */
-static
-enum mad_error III_sideinfo(struct mad_bitptr *ptr, unsigned int nch,
-			    int lsf, struct sideinfo *si,
-			    unsigned int *data_bitlen,
-			    unsigned int *priv_bitlen)
-{
-  unsigned int ngr, gr, ch, i;
-  enum mad_error result = MAD_ERROR_NONE;
-
-  *data_bitlen = 0;
-  *priv_bitlen = lsf ? ((nch == 1) ? 1 : 2) : ((nch == 1) ? 5 : 3);
-
-  si->main_data_begin = mad_bit_read(ptr, lsf ? 8 : 9);
-  si->private_bits    = mad_bit_read(ptr, *priv_bitlen);
-
-  ngr = 1;
-  if (!lsf) {
-    ngr = 2;
-
-    for (ch = 0; ch < nch; ++ch)
-      si->scfsi[ch] = mad_bit_read(ptr, 4);
-  }
-
-  for (gr = 0; gr < ngr; ++gr) {
-    struct granule *granule = &si->gr[gr];
-
-    for (ch = 0; ch < nch; ++ch) {
-      struct channel *channel = &granule->ch[ch];
-
-      channel->part2_3_length    = mad_bit_read(ptr, 12);
-      channel->big_values        = mad_bit_read(ptr, 9);
-      channel->global_gain       = mad_bit_read(ptr, 8);
-      channel->scalefac_compress = mad_bit_read(ptr, lsf ? 9 : 4);
-
-      *data_bitlen += channel->part2_3_length;
-
-      if (channel->big_values > 288 && result == 0)
-	result = MAD_ERROR_BADBIGVALUES;
-
-      channel->flags = 0;
-
-      /* window_switching_flag */
-      if (mad_bit_read(ptr, 1)) {
-	channel->block_type = mad_bit_read(ptr, 2);
-
-	if (channel->block_type == 0 && result == 0)
-	  result = MAD_ERROR_BADBLOCKTYPE;
-
-	if (!lsf && channel->block_type == 2 && si->scfsi[ch] && result == 0)
-	  result = MAD_ERROR_BADSCFSI;
-
-	channel->region0_count = 7;
-	channel->region1_count = 36;
-
-	if (mad_bit_read(ptr, 1))
-	  channel->flags |= mixed_block_flag;
-	else if (channel->block_type == 2)
-	  channel->region0_count = 8;
-
-	for (i = 0; i < 2; ++i)
-	  channel->table_select[i] = mad_bit_read(ptr, 5);
-
-# if defined(DEBUG)
-	channel->table_select[2] = 4;  /* not used */
-# endif
-
-	for (i = 0; i < 3; ++i)
-	  channel->subblock_gain[i] = mad_bit_read(ptr, 3);
-      }
-      else {
-	channel->block_type = 0;
-
-	for (i = 0; i < 3; ++i)
-	  channel->table_select[i] = mad_bit_read(ptr, 5);
-
-	channel->region0_count = mad_bit_read(ptr, 4);
-	channel->region1_count = mad_bit_read(ptr, 3);
-      }
-
-      /* [preflag,] scalefac_scale, count1table_select */
-      channel->flags |= mad_bit_read(ptr, lsf ? 2 : 3);
-    }
-  }
-
-  return result;
-}
-
-/*
- * NAME:	III_scalefactors_lsf()
- * DESCRIPTION:	decode channel scalefactors for LSF from a bitstream
- */
-static
-unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
-				  struct channel *channel,
-				  struct channel *gr1ch, int mode_extension)
-{
-  struct mad_bitptr start;
-  unsigned int scalefac_compress, index, slen[4], part, n, i;
-  unsigned char const *nsfb;
-
-  start = *ptr;
-
-  scalefac_compress = channel->scalefac_compress;
-  index = (channel->block_type == 2) ?
-    ((channel->flags & mixed_block_flag) ? 2 : 1) : 0;
-
-  if (!((mode_extension & I_STEREO) && gr1ch)) {
-    if (scalefac_compress < 400) {
-      slen[0] = (scalefac_compress >> 4) / 5;
-      slen[1] = (scalefac_compress >> 4) % 5;
-      slen[2] = (scalefac_compress % 16) >> 2;
-      slen[3] =  scalefac_compress %  4;
-
-      nsfb = nsfb_table[0][index];
-    }
-    else if (scalefac_compress < 500) {
-      scalefac_compress -= 400;
-
-      slen[0] = (scalefac_compress >> 2) / 5;
-      slen[1] = (scalefac_compress >> 2) % 5;
-      slen[2] =  scalefac_compress %  4;
-      slen[3] = 0;
-
-      nsfb = nsfb_table[1][index];
-    }
-    else {
-      scalefac_compress -= 500;
-
-      slen[0] = scalefac_compress / 3;
-      slen[1] = scalefac_compress % 3;
-      slen[2] = 0;
-      slen[3] = 0;
-
-      channel->flags |= preflag;
-
-      nsfb = nsfb_table[2][index];
-    }
-
-    n = 0;
-    for (part = 0; part < 4; ++part) {
-      for (i = 0; i < nsfb[part]; ++i)
-	channel->scalefac[n++] = mad_bit_read(ptr, slen[part]);
-    }
-
-    while (n < 39)
-      channel->scalefac[n++] = 0;
-  }
-  else {  /* (mode_extension & I_STEREO) && gr1ch (i.e. ch == 1) */
-    scalefac_compress >>= 1;
-
-    if (scalefac_compress < 180) {
-      slen[0] =  scalefac_compress / 36;
-      slen[1] = (scalefac_compress % 36) / 6;
-      slen[2] = (scalefac_compress % 36) % 6;
-      slen[3] = 0;
-
-      nsfb = nsfb_table[3][index];
-    }
-    else if (scalefac_compress < 244) {
-      scalefac_compress -= 180;
-
-      slen[0] = (scalefac_compress % 64) >> 4;
-      slen[1] = (scalefac_compress % 16) >> 2;
-      slen[2] =  scalefac_compress %  4;
-      slen[3] = 0;
-
-      nsfb = nsfb_table[4][index];
-    }
-    else {
-      scalefac_compress -= 244;
-
-      slen[0] = scalefac_compress / 3;
-      slen[1] = scalefac_compress % 3;
-      slen[2] = 0;
-      slen[3] = 0;
-
-      nsfb = nsfb_table[5][index];
-    }
-
-    n = 0;
-    for (part = 0; part < 4; ++part) {
-      unsigned int max, is_pos;
-
-      max = (1 << slen[part]) - 1;
-
-      for (i = 0; i < nsfb[part]; ++i) {
-	is_pos = mad_bit_read(ptr, slen[part]);
-
-	channel->scalefac[n] = is_pos;
-	gr1ch->scalefac[n++] = (is_pos == max);
-      }
-    }
-
-    while (n < 39) {
-      channel->scalefac[n] = 0;
-      gr1ch->scalefac[n++] = 0;  /* apparently not illegal */
-    }
-  }
-
-  return mad_bit_length(&start, ptr);
-}
-
-/*
- * NAME:	III_scalefactors()
- * DESCRIPTION:	decode channel scalefactors of one granule from a bitstream
- */
-static
-unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
-			      struct channel const *gr0ch, unsigned int scfsi)
-{
-  struct mad_bitptr start;
-  unsigned int slen1, slen2, sfbi;
-
-  start = *ptr;
-
-  slen1 = sflen_table[channel->scalefac_compress].slen1;
-  slen2 = sflen_table[channel->scalefac_compress].slen2;
-
-  if (channel->block_type == 2) {
-    unsigned int nsfb;
-
-    sfbi = 0;
-
-    nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3;
-    while (nsfb--)
-      channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1);
-
-    nsfb = 6 * 3;
-    while (nsfb--)
-      channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2);
-
-    nsfb = 1 * 3;
-    while (nsfb--)
-      channel->scalefac[sfbi++] = 0;
-  }
-  else {  /* channel->block_type != 2 */
-    if (scfsi & 0x8) {
-      for (sfbi = 0; sfbi < 6; ++sfbi)
-	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
-    }
-    else {
-      for (sfbi = 0; sfbi < 6; ++sfbi)
-	channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
-    }
-
-    if (scfsi & 0x4) {
-      for (sfbi = 6; sfbi < 11; ++sfbi)
-	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
-    }
-    else {
-      for (sfbi = 6; sfbi < 11; ++sfbi)
-	channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
-    }
-
-    if (scfsi & 0x2) {
-      for (sfbi = 11; sfbi < 16; ++sfbi)
-	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
-    }
-    else {
-      for (sfbi = 11; sfbi < 16; ++sfbi)
-	channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
-    }
-
-    if (scfsi & 0x1) {
-      for (sfbi = 16; sfbi < 21; ++sfbi)
-	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
-    }
-    else {
-      for (sfbi = 16; sfbi < 21; ++sfbi)
-	channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
-    }
-
-    channel->scalefac[21] = 0;
-  }
-
-  return mad_bit_length(&start, ptr);
-}
-
-/*
- * The Layer III formula for requantization and scaling is defined by
- * section 2.4.3.4.7.1 of ISO/IEC 11172-3, as follows:
- *
- *   long blocks:
- *   xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
- *           2^((1/4) * (global_gain - 210)) *
- *           2^-(scalefac_multiplier *
- *               (scalefac_l[sfb] + preflag * pretab[sfb]))
- *
- *   short blocks:
- *   xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
- *           2^((1/4) * (global_gain - 210 - 8 * subblock_gain[w])) *
- *           2^-(scalefac_multiplier * scalefac_s[sfb][w])
- *
- *   where:
- *   scalefac_multiplier = (scalefac_scale + 1) / 2
- *
- * The routines III_exponents() and III_requantize() facilitate this
- * calculation.
- */
-
-/*
- * NAME:	III_exponents()
- * DESCRIPTION:	calculate scalefactor exponents
- */
-static
-void III_exponents(struct channel const *channel,
-		   unsigned char const *sfbwidth, signed int exponents[39])
-{
-  signed int gain;
-  unsigned int scalefac_multiplier, sfbi;
-
-  gain = (signed int) channel->global_gain - 210;
-  scalefac_multiplier = (channel->flags & scalefac_scale) ? 2 : 1;
-
-  if (channel->block_type == 2) {
-    unsigned int l;
-    signed int gain0, gain1, gain2;
-
-    sfbi = l = 0;
-
-    if (channel->flags & mixed_block_flag) {
-      unsigned int premask;
-
-      premask = (channel->flags & preflag) ? ~0 : 0;
-
-      /* long block subbands 0-1 */
-
-      while (l < 36) {
-	exponents[sfbi] = gain -
-	  (signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) <<
-			scalefac_multiplier);
-
-	l += sfbwidth[sfbi++];
-      }
-    }
-
-    /* this is probably wrong for 8000 Hz short/mixed blocks */
-
-    gain0 = gain - 8 * (signed int) channel->subblock_gain[0];
-    gain1 = gain - 8 * (signed int) channel->subblock_gain[1];
-    gain2 = gain - 8 * (signed int) channel->subblock_gain[2];
-
-    while (l < 576) {
-      exponents[sfbi + 0] = gain0 -
-	(signed int) (channel->scalefac[sfbi + 0] << scalefac_multiplier);
-      exponents[sfbi + 1] = gain1 -
-	(signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier);
-      exponents[sfbi + 2] = gain2 -
-	(signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier);
-
-      l    += 3 * sfbwidth[sfbi];
-      sfbi += 3;
-    }
-  }
-  else {  /* channel->block_type != 2 */
-    if (channel->flags & preflag) {
-      for (sfbi = 0; sfbi < 22; ++sfbi) {
-	exponents[sfbi] = gain -
-	  (signed int) ((channel->scalefac[sfbi] + pretab[sfbi]) <<
-			scalefac_multiplier);
-      }
-    }
-    else {
-      for (sfbi = 0; sfbi < 22; ++sfbi) {
-	exponents[sfbi] = gain -
-	  (signed int) (channel->scalefac[sfbi] << scalefac_multiplier);
-      }
-    }
-  }
-}
-
-/*
- * NAME:	III_requantize()
- * DESCRIPTION:	requantize one (positive) value
- */
-static
-mad_fixed_t III_requantize(unsigned int value, signed int exp)
-{
-  mad_fixed_t requantized;
-  signed int frac;
-  struct fixedfloat const *power;
-
-  frac = exp % 4;  /* assumes sign(frac) == sign(exp) */
-  exp /= 4;
-
-  power = &rq_table[value];
-  requantized = power->mantissa;
-  exp += power->exponent;
-
-  if (exp < 0) {
-    if (-exp >= sizeof(mad_fixed_t) * CHAR_BIT) {
-      /* underflow */
-      requantized = 0;
-    }
-    else {
-      requantized += 1L << (-exp - 1);
-      requantized >>= -exp;
-    }
-  }
-  else {
-    if (exp >= 5) {
-      /* overflow */
-# if defined(DEBUG)
-      fprintf(stderr, "requantize overflow (%f * 2^%d)\n",
-	      mad_f_todouble(requantized), exp);
-# endif
-      requantized = MAD_F_MAX;
-    }
-    else
-      requantized <<= exp;
-  }
-
-  return frac ? mad_f_mul(requantized, root_table[3 + frac]) : requantized;
-}
-
-/* we must take care that sz >= bits and sz < sizeof(long) lest bits == 0 */
-# define MASK(cache, sz, bits)	\
-    (((cache) >> ((sz) - (bits))) & ((1 << (bits)) - 1))
-# define MASK1BIT(cache, sz)  \
-    ((cache) & (1 << ((sz) - 1)))
-
-/*
- * NAME:	III_huffdecode()
- * DESCRIPTION:	decode Huffman code words of one channel of one granule
- */
-static
-enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
-			      struct channel *channel,
-			      unsigned char const *sfbwidth,
-			      unsigned int part2_length)
-{
-  signed int exponents[39], exp;
-  signed int const *expptr;
-  struct mad_bitptr peek;
-  signed int bits_left, cachesz;
-  register mad_fixed_t *xrptr;
-  mad_fixed_t const *sfbound;
-  register unsigned long bitcache;
-
-  bits_left = (signed) channel->part2_3_length - (signed) part2_length;
-  if (bits_left < 0)
-    return MAD_ERROR_BADPART3LEN;
-
-  III_exponents(channel, sfbwidth, exponents);
-
-  peek = *ptr;
-  mad_bit_skip(ptr, bits_left);
-
-  /* align bit reads to byte boundaries */
-  cachesz  = mad_bit_bitsleft(&peek);
-  cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7;
-
-  bitcache   = mad_bit_read(&peek, cachesz);
-  bits_left -= cachesz;
-
-  xrptr = &xr[0];
-
-  /* big_values */
-  {
-    unsigned int region, rcount;
-    struct hufftable const *entry;
-    union huffpair const *table;
-    unsigned int linbits, startbits, big_values, reqhits;
-    mad_fixed_t reqcache[16];
-
-    sfbound = xrptr + *sfbwidth++;
-    rcount  = channel->region0_count + 1;
-
-    entry     = &mad_huff_pair_table[channel->table_select[region = 0]];
-    table     = entry->table;
-    linbits   = entry->linbits;
-    startbits = entry->startbits;
-
-    if (table == 0)
-      return MAD_ERROR_BADHUFFTABLE;
-
-    expptr  = &exponents[0];
-    exp     = *expptr++;
-    reqhits = 0;
-
-    big_values = channel->big_values;
-
-    while (big_values-- && cachesz + bits_left > 0) {
-      union huffpair const *pair;
-      unsigned int clumpsz, value;
-      register mad_fixed_t requantized;
-
-      if (xrptr == sfbound) {
-	sfbound += *sfbwidth++;
-
-	/* change table if region boundary */
-
-	if (--rcount == 0) {
-	  if (region == 0)
-	    rcount = channel->region1_count + 1;
-	  else
-	    rcount = 0;  /* all remaining */
-
-	  entry     = &mad_huff_pair_table[channel->table_select[++region]];
-	  table     = entry->table;
-	  linbits   = entry->linbits;
-	  startbits = entry->startbits;
-
-	  if (table == 0)
-	    return MAD_ERROR_BADHUFFTABLE;
-	}
-
-	if (exp != *expptr) {
-	  exp = *expptr;
-	  reqhits = 0;
-	}
-
-	++expptr;
-      }
-
-      if (cachesz < 21) {
-	unsigned int bits;
-
-	bits       = ((32 - 1 - 21) + (21 - cachesz)) & ~7;
-	bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
-	cachesz   += bits;
-	bits_left -= bits;
-      }
-
-      /* hcod (0..19) */
-
-      clumpsz = startbits;
-      pair    = &table[MASK(bitcache, cachesz, clumpsz)];
-
-      while (!pair->final) {
-	cachesz -= clumpsz;
-
-	clumpsz = pair->ptr.bits;
-	pair    = &table[pair->ptr.offset + MASK(bitcache, cachesz, clumpsz)];
-      }
-
-      cachesz -= pair->value.hlen;
-
-      if (linbits) {
-	/* x (0..14) */
-
-	value = pair->value.x;
-
-	switch (value) {
-	case 0:
-	  xrptr[0] = 0;
-	  break;
-
-	case 15:
-	  if (cachesz < linbits + 2) {
-	    bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
-	    cachesz   += 16;
-	    bits_left -= 16;
-	  }
-
-	  value += MASK(bitcache, cachesz, linbits);
-	  cachesz -= linbits;
-
-	  requantized = III_requantize(value, exp);
-	  goto x_final;
-
-	default:
-	  if (reqhits & (1 << value))
-	    requantized = reqcache[value];
-	  else {
-	    reqhits |= (1 << value);
-	    requantized = reqcache[value] = III_requantize(value, exp);
-	  }
-
-	x_final:
-	  xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
-	    -requantized : requantized;
-	}
-
-	/* y (0..14) */
-
-	value = pair->value.y;
-
-	switch (value) {
-	case 0:
-	  xrptr[1] = 0;
-	  break;
-
-	case 15:
-	  if (cachesz < linbits + 1) {
-	    bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
-	    cachesz   += 16;
-	    bits_left -= 16;
-	  }
-
-	  value += MASK(bitcache, cachesz, linbits);
-	  cachesz -= linbits;
-
-	  requantized = III_requantize(value, exp);
-	  goto y_final;
-
-	default:
-	  if (reqhits & (1 << value))
-	    requantized = reqcache[value];
-	  else {
-	    reqhits |= (1 << value);
-	    requantized = reqcache[value] = III_requantize(value, exp);
-	  }
-
-	y_final:
-	  xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
-	    -requantized : requantized;
-	}
-      }
-      else {
-	/* x (0..1) */
-
-	value = pair->value.x;
-
-	if (value == 0)
-	  xrptr[0] = 0;
-	else {
-	  if (reqhits & (1 << value))
-	    requantized = reqcache[value];
-	  else {
-	    reqhits |= (1 << value);
-	    requantized = reqcache[value] = III_requantize(value, exp);
-	  }
-
-	  xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
-	    -requantized : requantized;
-	}
-
-	/* y (0..1) */
-
-	value = pair->value.y;
-
-	if (value == 0)
-	  xrptr[1] = 0;
-	else {
-	  if (reqhits & (1 << value))
-	    requantized = reqcache[value];
-	  else {
-	    reqhits |= (1 << value);
-	    requantized = reqcache[value] = III_requantize(value, exp);
-	  }
-
-	  xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
-	    -requantized : requantized;
-	}
-      }
-
-      xrptr += 2;
-    }
-  }
-
-  if (cachesz + bits_left < 0)
-    return MAD_ERROR_BADHUFFDATA;  /* big_values overrun */
-
-  /* count1 */
-  {
-    union huffquad const *table;
-    register mad_fixed_t requantized;
-
-    table = mad_huff_quad_table[channel->flags & count1table_select];
-
-    requantized = III_requantize(1, exp);
-
-    while (cachesz + bits_left > 0 && xrptr <= &xr[572]) {
-      union huffquad const *quad;
-
-      /* hcod (1..6) */
-
-      if (cachesz < 10) {
-	bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
-	cachesz   += 16;
-	bits_left -= 16;
-      }
-
-      quad = &table[MASK(bitcache, cachesz, 4)];
-
-      /* quad tables guaranteed to have at most one extra lookup */
-      if (!quad->final) {
-	cachesz -= 4;
-
-	quad = &table[quad->ptr.offset +
-		      MASK(bitcache, cachesz, quad->ptr.bits)];
-      }
-
-      cachesz -= quad->value.hlen;
-
-      if (xrptr == sfbound) {
-	sfbound += *sfbwidth++;
-
-	if (exp != *expptr) {
-	  exp = *expptr;
-	  requantized = III_requantize(1, exp);
-	}
-
-	++expptr;
-      }
-
-      /* v (0..1) */
-
-      xrptr[0] = quad->value.v ?
-	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
-
-      /* w (0..1) */
-
-      xrptr[1] = quad->value.w ?
-	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
-
-      xrptr += 2;
-
-      if (xrptr == sfbound) {
-	sfbound += *sfbwidth++;
-
-	if (exp != *expptr) {
-	  exp = *expptr;
-	  requantized = III_requantize(1, exp);
-	}
-
-	++expptr;
-      }
-
-      /* x (0..1) */
-
-      xrptr[0] = quad->value.x ?
-	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
-
-      /* y (0..1) */
-
-      xrptr[1] = quad->value.y ?
-	(MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
-
-      xrptr += 2;
-    }
-
-    if (cachesz + bits_left < 0) {
-# if 0 && defined(DEBUG)
-      fprintf(stderr, "huffman count1 overrun (%d bits)\n",
-	      -(cachesz + bits_left));
-# endif
-
-      /* technically the bitstream is misformatted, but apparently
-	 some encoders are just a bit sloppy with stuffing bits */
-
-      xrptr -= 4;
-    }
-  }
-
-  assert(-bits_left <= MAD_BUFFER_GUARD * CHAR_BIT);
-
-# if 0 && defined(DEBUG)
-  if (bits_left < 0)
-    fprintf(stderr, "read %d bits too many\n", -bits_left);
-  else if (cachesz + bits_left > 0)
-    fprintf(stderr, "%d stuffing bits\n", cachesz + bits_left);
-# endif
-
-  /* rzero */
-  while (xrptr < &xr[576]) {
-    xrptr[0] = 0;
-    xrptr[1] = 0;
-
-    xrptr += 2;
-  }
-
-  return MAD_ERROR_NONE;
-}
-
-# undef MASK
-# undef MASK1BIT
-
-/*
- * NAME:	III_reorder()
- * DESCRIPTION:	reorder frequency lines of a short block into subband order
- */
-static
-void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
-		 unsigned char const sfbwidth[39])
-{
-  mad_fixed_t tmp[32][3][6];
-  unsigned int sb, l, f, w, sbw[3], sw[3];
-
-  /* this is probably wrong for 8000 Hz mixed blocks */
-
-  sb = 0;
-  if (channel->flags & mixed_block_flag) {
-    sb = 2;
-
-    l = 0;
-    while (l < 36)
-      l += *sfbwidth++;
-  }
-
-  for (w = 0; w < 3; ++w) {
-    sbw[w] = sb;
-    sw[w]  = 0;
-  }
-
-  f = *sfbwidth++;
-  w = 0;
-
-  for (l = 18 * sb; l < 576; ++l) {
-    if (f-- == 0) {
-      f = *sfbwidth++ - 1;
-      w = (w + 1) % 3;
-    }
-
-    tmp[sbw[w]][w][sw[w]++] = xr[l];
-
-    if (sw[w] == 6) {
-      sw[w] = 0;
-      ++sbw[w];
-    }
-  }
-
-  memcpy(&xr[18 * sb], &tmp[sb], (576 - 18 * sb) * sizeof(mad_fixed_t));
-}
-
-/*
- * NAME:	III_stereo()
- * DESCRIPTION:	perform joint stereo processing on a granule
- */
-static
-enum mad_error III_stereo(mad_fixed_t xr[2][576],
-			  struct granule const *granule,
-			  struct mad_header *header,
-			  unsigned char const *sfbwidth)
-{
-  short modes[39];
-  unsigned int sfbi, l, n, i;
-
-  if (granule->ch[0].block_type !=
-      granule->ch[1].block_type ||
-      (granule->ch[0].flags & mixed_block_flag) !=
-      (granule->ch[1].flags & mixed_block_flag))
-    return MAD_ERROR_BADSTEREO;
-
-  for (i = 0; i < 39; ++i)
-    modes[i] = header->mode_extension;
-
-  /* intensity stereo */
-
-  if (header->mode_extension & I_STEREO) {
-    struct channel const *right_ch = &granule->ch[1];
-    mad_fixed_t const *right_xr = xr[1];
-    unsigned int is_pos;
-
-    header->flags |= MAD_FLAG_I_STEREO;
-
-    /* first determine which scalefactor bands are to be processed */
-
-    if (right_ch->block_type == 2) {
-      unsigned int lower, start, max, bound[3], w;
-
-      lower = start = max = bound[0] = bound[1] = bound[2] = 0;
-
-      sfbi = l = 0;
-
-      if (right_ch->flags & mixed_block_flag) {
-	while (l < 36) {
-	  n = sfbwidth[sfbi++];
-
-	  for (i = 0; i < n; ++i) {
-	    if (right_xr[i]) {
-	      lower = sfbi;
-	      break;
-	    }
-	  }
-
-	  right_xr += n;
-	  l += n;
-	}
-
-	start = sfbi;
-      }
-
-      w = 0;
-      while (l < 576) {
-	n = sfbwidth[sfbi++];
-
-	for (i = 0; i < n; ++i) {
-	  if (right_xr[i]) {
-	    max = bound[w] = sfbi;
-	    break;
-	  }
-	}
-
-	right_xr += n;
-	l += n;
-	w = (w + 1) % 3;
-      }
-
-      if (max)
-	lower = start;
-
-      /* long blocks */
-
-      for (i = 0; i < lower; ++i)
-	modes[i] = header->mode_extension & ~I_STEREO;
-
-      /* short blocks */
-
-      w = 0;
-      for (i = start; i < max; ++i) {
-	if (i < bound[w])
-	  modes[i] = header->mode_extension & ~I_STEREO;
-
-	w = (w + 1) % 3;
-      }
-    }
-    else {  /* right_ch->block_type != 2 */
-      unsigned int bound;
-
-      bound = 0;
-      for (sfbi = l = 0; l < 576; l += n) {
-	n = sfbwidth[sfbi++];
-
-	for (i = 0; i < n; ++i) {
-	  if (right_xr[i]) {
-	    bound = sfbi;
-	    break;
-	  }
-	}
-
-	right_xr += n;
-      }
-
-      for (i = 0; i < bound; ++i)
-	modes[i] = header->mode_extension & ~I_STEREO;
-    }
-
-    /* now do the actual processing */
-
-    if (header->flags & MAD_FLAG_LSF_EXT) {
-      unsigned char const *illegal_pos = granule[1].ch[1].scalefac;
-      mad_fixed_t const *lsf_scale;
-
-      /* intensity_scale */
-      lsf_scale = is_lsf_table[right_ch->scalefac_compress & 0x1];
-
-      for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
-	n = sfbwidth[sfbi];
-
-	if (!(modes[sfbi] & I_STEREO))
-	  continue;
-
-	if (illegal_pos[sfbi]) {
-	  modes[sfbi] &= ~I_STEREO;
-	  continue;
-	}
-
-	is_pos = right_ch->scalefac[sfbi];
-
-	for (i = 0; i < n; ++i) {
-	  register mad_fixed_t left;
-
-	  left = xr[0][l + i];
-
-	  if (is_pos == 0)
-	    xr[1][l + i] = left;
-	  else {
-	    register mad_fixed_t opposite;
-
-	    opposite = mad_f_mul(left, lsf_scale[(is_pos - 1) / 2]);
-
-	    if (is_pos & 1) {
-	      xr[0][l + i] = opposite;
-	      xr[1][l + i] = left;
-	    }
-	    else
-	      xr[1][l + i] = opposite;
-	  }
-	}
-      }
-    }
-    else {  /* !(header->flags & MAD_FLAG_LSF_EXT) */
-      for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
-	n = sfbwidth[sfbi];
-
-	if (!(modes[sfbi] & I_STEREO))
-	  continue;
-
-	is_pos = right_ch->scalefac[sfbi];
-
-	if (is_pos >= 7) {  /* illegal intensity position */
-	  modes[sfbi] &= ~I_STEREO;
-	  continue;
-	}
-
-	for (i = 0; i < n; ++i) {
-	  register mad_fixed_t left;
-
-	  left = xr[0][l + i];
-
-	  xr[0][l + i] = mad_f_mul(left, is_table[    is_pos]);
-	  xr[1][l + i] = mad_f_mul(left, is_table[6 - is_pos]);
-	}
-      }
-    }
-  }
-
-  /* middle/side stereo */
-
-  if (header->mode_extension & MS_STEREO) {
-    register mad_fixed_t invsqrt2;
-
-    header->flags |= MAD_FLAG_MS_STEREO;
-
-    invsqrt2 = root_table[3 + -2];
-
-    for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
-      n = sfbwidth[sfbi];
-
-      if (modes[sfbi] != MS_STEREO)
-	continue;
-
-      for (i = 0; i < n; ++i) {
-	register mad_fixed_t m, s;
-
-	m = xr[0][l + i];
-	s = xr[1][l + i];
-
-	xr[0][l + i] = mad_f_mul(m + s, invsqrt2);  /* l = (m + s) / sqrt(2) */
-	xr[1][l + i] = mad_f_mul(m - s, invsqrt2);  /* r = (m - s) / sqrt(2) */
-      }
-    }
-  }
-
-  return MAD_ERROR_NONE;
-}
-
-/*
- * NAME:	III_aliasreduce()
- * DESCRIPTION:	perform frequency line alias reduction
- */
-static
-void III_aliasreduce(mad_fixed_t xr[576], int lines)
-{
-  mad_fixed_t const *bound;
-  int i;
-
-  bound = &xr[lines];
-  for (xr += 18; xr < bound; xr += 18) {
-    for (i = 0; i < 8; ++i) {
-      register mad_fixed_t a, b;
-      register mad_fixed64hi_t hi;
-      register mad_fixed64lo_t lo;
-
-      a = xr[-1 - i];
-      b = xr[     i];
-
-# if defined(ASO_ZEROCHECK)
-      if (a | b) {
-# endif
-	MAD_F_ML0(hi, lo,  a, cs[i]);
-	MAD_F_MLA(hi, lo, -b, ca[i]);
-
-	xr[-1 - i] = MAD_F_MLZ(hi, lo);
-
-	MAD_F_ML0(hi, lo,  b, cs[i]);
-	MAD_F_MLA(hi, lo,  a, ca[i]);
-
-	xr[     i] = MAD_F_MLZ(hi, lo);
-# if defined(ASO_ZEROCHECK)
-      }
-# endif
-    }
-  }
-}
-
-# if defined(ASO_IMDCT)
-void III_imdct_l(mad_fixed_t const [18], mad_fixed_t [36], unsigned int);
-# else
-#  if 1
-static
-void fastsdct(mad_fixed_t const x[9], mad_fixed_t y[18])
-{
-  mad_fixed_t a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10, a11, a12;
-  mad_fixed_t a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25;
-  mad_fixed_t m0,  m1,  m2,  m3,  m4,  m5,  m6,  m7;
-
-  enum {
-    c0 =  MAD_F(0x1f838b8d),  /* 2 * cos( 1 * PI / 18) */
-    c1 =  MAD_F(0x1bb67ae8),  /* 2 * cos( 3 * PI / 18) */
-    c2 =  MAD_F(0x18836fa3),  /* 2 * cos( 4 * PI / 18) */
-    c3 =  MAD_F(0x1491b752),  /* 2 * cos( 5 * PI / 18) */
-    c4 =  MAD_F(0x0af1d43a),  /* 2 * cos( 7 * PI / 18) */
-    c5 =  MAD_F(0x058e86a0),  /* 2 * cos( 8 * PI / 18) */
-    c6 = -MAD_F(0x1e11f642)   /* 2 * cos(16 * PI / 18) */
-  };
-
-  a0 = x[3] + x[5];
-  a1 = x[3] - x[5];
-  a2 = x[6] + x[2];
-  a3 = x[6] - x[2];
-  a4 = x[1] + x[7];
-  a5 = x[1] - x[7];
-  a6 = x[8] + x[0];
-  a7 = x[8] - x[0];
-
-  a8  = a0  + a2;
-  a9  = a0  - a2;
-  a10 = a0  - a6;
-  a11 = a2  - a6;
-  a12 = a8  + a6;
-  a13 = a1  - a3;
-  a14 = a13 + a7;
-  a15 = a3  + a7;
-  a16 = a1  - a7;
-  a17 = a1  + a3;
-
-  m0 = mad_f_mul(a17, -c3);
-  m1 = mad_f_mul(a16, -c0);
-  m2 = mad_f_mul(a15, -c4);
-  m3 = mad_f_mul(a14, -c1);
-  m4 = mad_f_mul(a5,  -c1);
-  m5 = mad_f_mul(a11, -c6);
-  m6 = mad_f_mul(a10, -c5);
-  m7 = mad_f_mul(a9,  -c2);
-
-  a18 =     x[4] + a4;
-  a19 = 2 * x[4] - a4;
-  a20 = a19 + m5;
-  a21 = a19 - m5;
-  a22 = a19 + m6;
-  a23 = m4  + m2;
-  a24 = m4  - m2;
-  a25 = m4  + m1;
-
-  /* output to every other slot for convenience */
-
-  y[ 0] = a18 + a12;
-  y[ 2] = m0  - a25;
-  y[ 4] = m7  - a20;
-  y[ 6] = m3;
-  y[ 8] = a21 - m6;
-  y[10] = a24 - m1;
-  y[12] = a12 - 2 * a18;
-  y[14] = a23 + m0;
-  y[16] = a22 + m7;
-}
-
-static inline
-void sdctII(mad_fixed_t const x[18], mad_fixed_t X[18])
-{
-  mad_fixed_t tmp[9];
-  int i;
-
-  /* scale[i] = 2 * cos(PI * (2 * i + 1) / (2 * 18)) */
-  static mad_fixed_t const scale[9] = {
-    MAD_F(0x1fe0d3b4), MAD_F(0x1ee8dd47), MAD_F(0x1d007930),
-    MAD_F(0x1a367e59), MAD_F(0x16a09e66), MAD_F(0x125abcf8),
-    MAD_F(0x0d8616bc), MAD_F(0x08483ee1), MAD_F(0x02c9fad7)
-  };
-
-  /* divide the 18-point SDCT-II into two 9-point SDCT-IIs */
-
-  /* even input butterfly */
-
-  for (i = 0; i < 9; i += 3) {
-    tmp[i + 0] = x[i + 0] + x[18 - (i + 0) - 1];
-    tmp[i + 1] = x[i + 1] + x[18 - (i + 1) - 1];
-    tmp[i + 2] = x[i + 2] + x[18 - (i + 2) - 1];
-  }
-
-  fastsdct(tmp, &X[0]);
-
-  /* odd input butterfly and scaling */
-
-  for (i = 0; i < 9; i += 3) {
-    tmp[i + 0] = mad_f_mul(x[i + 0] - x[18 - (i + 0) - 1], scale[i + 0]);
-    tmp[i + 1] = mad_f_mul(x[i + 1] - x[18 - (i + 1) - 1], scale[i + 1]);
-    tmp[i + 2] = mad_f_mul(x[i + 2] - x[18 - (i + 2) - 1], scale[i + 2]);
-  }
-
-  fastsdct(tmp, &X[1]);
-
-  /* output accumulation */
-
-  for (i = 3; i < 18; i += 8) {
-    X[i + 0] -= X[(i + 0) - 2];
-    X[i + 2] -= X[(i + 2) - 2];
-    X[i + 4] -= X[(i + 4) - 2];
-    X[i + 6] -= X[(i + 6) - 2];
-  }
-}
-
-static inline
-void dctIV(mad_fixed_t const y[18], mad_fixed_t X[18])
-{
-  mad_fixed_t tmp[18];
-  int i;
-
-  /* scale[i] = 2 * cos(PI * (2 * i + 1) / (4 * 18)) */
-  static mad_fixed_t const scale[18] = {
-    MAD_F(0x1ff833fa), MAD_F(0x1fb9ea93), MAD_F(0x1f3dd120),
-    MAD_F(0x1e84d969), MAD_F(0x1d906bcf), MAD_F(0x1c62648b),
-    MAD_F(0x1afd100f), MAD_F(0x1963268b), MAD_F(0x1797c6a4),
-    MAD_F(0x159e6f5b), MAD_F(0x137af940), MAD_F(0x11318ef3),
-    MAD_F(0x0ec6a507), MAD_F(0x0c3ef153), MAD_F(0x099f61c5),
-    MAD_F(0x06ed12c5), MAD_F(0x042d4544), MAD_F(0x0165547c)
-  };
-
-  /* scaling */
-
-  for (i = 0; i < 18; i += 3) {
-    tmp[i + 0] = mad_f_mul(y[i + 0], scale[i + 0]);
-    tmp[i + 1] = mad_f_mul(y[i + 1], scale[i + 1]);
-    tmp[i + 2] = mad_f_mul(y[i + 2], scale[i + 2]);
-  }
-
-  /* SDCT-II */
-
-  sdctII(tmp, X);
-
-  /* scale reduction and output accumulation */
-
-  X[0] /= 2;
-  for (i = 1; i < 17; i += 4) {
-    X[i + 0] = X[i + 0] / 2 - X[(i + 0) - 1];
-    X[i + 1] = X[i + 1] / 2 - X[(i + 1) - 1];
-    X[i + 2] = X[i + 2] / 2 - X[(i + 2) - 1];
-    X[i + 3] = X[i + 3] / 2 - X[(i + 3) - 1];
-  }
-  X[17] = X[17] / 2 - X[16];
-}
-
-/*
- * NAME:	imdct36
- * DESCRIPTION:	perform X[18]->x[36] IMDCT using Szu-Wei Lee's fast algorithm
- */
-static inline
-void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36])
-{
-  mad_fixed_t tmp[18];
-  int i;
-
-  /* DCT-IV */
-
-  dctIV(x, tmp);
-
-  /* convert 18-point DCT-IV to 36-point IMDCT */
-
-  for (i =  0; i <  9; i += 3) {
-    y[i + 0] =  tmp[9 + (i + 0)];
-    y[i + 1] =  tmp[9 + (i + 1)];
-    y[i + 2] =  tmp[9 + (i + 2)];
-  }
-  for (i =  9; i < 27; i += 3) {
-    y[i + 0] = -tmp[36 - (9 + (i + 0)) - 1];
-    y[i + 1] = -tmp[36 - (9 + (i + 1)) - 1];
-    y[i + 2] = -tmp[36 - (9 + (i + 2)) - 1];
-  }
-  for (i = 27; i < 36; i += 3) {
-    y[i + 0] = -tmp[(i + 0) - 27];
-    y[i + 1] = -tmp[(i + 1) - 27];
-    y[i + 2] = -tmp[(i + 2) - 27];
-  }
-}
-#  else
-/*
- * NAME:	imdct36
- * DESCRIPTION:	perform X[18]->x[36] IMDCT
- */
-static inline
-void imdct36(mad_fixed_t const X[18], mad_fixed_t x[36])
-{
-  mad_fixed_t t0, t1, t2,  t3,  t4,  t5,  t6,  t7;
-  mad_fixed_t t8, t9, t10, t11, t12, t13, t14, t15;
-  register mad_fixed64hi_t hi;
-  register mad_fixed64lo_t lo;
-
-  MAD_F_ML0(hi, lo, X[4],  MAD_F(0x0ec835e8));
-  MAD_F_MLA(hi, lo, X[13], MAD_F(0x061f78aa));
-
-  t6 = MAD_F_MLZ(hi, lo);
-
-  MAD_F_MLA(hi, lo, (t14 = X[1] - X[10]), -MAD_F(0x061f78aa));
-  MAD_F_MLA(hi, lo, (t15 = X[7] + X[16]), -MAD_F(0x0ec835e8));
-
-  t0 = MAD_F_MLZ(hi, lo);
-
-  MAD_F_MLA(hi, lo, (t8  = X[0] - X[11] - X[12]),  MAD_F(0x0216a2a2));
-  MAD_F_MLA(hi, lo, (t9  = X[2] - X[9]  - X[14]),  MAD_F(0x09bd7ca0));
-  MAD_F_MLA(hi, lo, (t10 = X[3] - X[8]  - X[15]), -MAD_F(0x0cb19346));
-  MAD_F_MLA(hi, lo, (t11 = X[5] - X[6]  - X[17]), -MAD_F(0x0fdcf549));
-
-  x[7]  = MAD_F_MLZ(hi, lo);
-  x[10] = -x[7];
-
-  MAD_F_ML0(hi, lo, t8,  -MAD_F(0x0cb19346));
-  MAD_F_MLA(hi, lo, t9,   MAD_F(0x0fdcf549));
-  MAD_F_MLA(hi, lo, t10,  MAD_F(0x0216a2a2));
-  MAD_F_MLA(hi, lo, t11, -MAD_F(0x09bd7ca0));
-
-  x[19] = x[34] = MAD_F_MLZ(hi, lo) - t0;
-
-  t12 = X[0] - X[3] + X[8] - X[11] - X[12] + X[15];
-  t13 = X[2] + X[5] - X[6] - X[9]  - X[14] - X[17];
-
-  MAD_F_ML0(hi, lo, t12, -MAD_F(0x0ec835e8));
-  MAD_F_MLA(hi, lo, t13,  MAD_F(0x061f78aa));
-
-  x[22] = x[31] = MAD_F_MLZ(hi, lo) + t0;
-
-  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x09bd7ca0));
-  MAD_F_MLA(hi, lo, X[7],   MAD_F(0x0216a2a2));
-  MAD_F_MLA(hi, lo, X[10], -MAD_F(0x0fdcf549));
-  MAD_F_MLA(hi, lo, X[16],  MAD_F(0x0cb19346));
-
-  t1 = MAD_F_MLZ(hi, lo) + t6;
-
-  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0f9ee890));
-
-  x[6]  = MAD_F_MLZ(hi, lo) + t1;
-  x[11] = -x[6];
-
-  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x04cfb0e2));
-
-  x[23] = x[30] = MAD_F_MLZ(hi, lo) + t1;
-
-  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0acf37ad));
-
-  x[18] = x[35] = MAD_F_MLZ(hi, lo) - t1;
-
-  MAD_F_ML0(hi, lo, X[4],   MAD_F(0x061f78aa));
-  MAD_F_MLA(hi, lo, X[13], -MAD_F(0x0ec835e8));
-
-  t7 = MAD_F_MLZ(hi, lo);
-
-  MAD_F_MLA(hi, lo, X[1],  -MAD_F(0x0cb19346));
-  MAD_F_MLA(hi, lo, X[7],   MAD_F(0x0fdcf549));
-  MAD_F_MLA(hi, lo, X[10],  MAD_F(0x0216a2a2));
-  MAD_F_MLA(hi, lo, X[16], -MAD_F(0x09bd7ca0));
-
-  t2 = MAD_F_MLZ(hi, lo);
-
-  MAD_F_MLA(hi, lo, X[0],   MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x0f426cb5));
-
-  x[5]  = MAD_F_MLZ(hi, lo);
-  x[12] = -x[5];
-
-  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0bcbe352));
-
-  x[0]  = MAD_F_MLZ(hi, lo) + t2;
-  x[17] = -x[0];
-
-  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x03768962));
-
-  x[24] = x[29] = MAD_F_MLZ(hi, lo) + t2;
-
-  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x0216a2a2));
-  MAD_F_MLA(hi, lo, X[7],  -MAD_F(0x09bd7ca0));
-  MAD_F_MLA(hi, lo, X[10],  MAD_F(0x0cb19346));
-  MAD_F_MLA(hi, lo, X[16],  MAD_F(0x0fdcf549));
-
-  t3 = MAD_F_MLZ(hi, lo) + t7;
-
-  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0ffc19fd));
-
-  x[8] = MAD_F_MLZ(hi, lo) + t3;
-  x[9] = -x[8];
-
-  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x07635284));
-
-  x[21] = x[32] = MAD_F_MLZ(hi, lo) + t3;
-
-  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0898c779));
-
-  x[20] = x[33] = MAD_F_MLZ(hi, lo) - t3;
-
-  MAD_F_ML0(hi, lo, t14, -MAD_F(0x0ec835e8));
-  MAD_F_MLA(hi, lo, t15,  MAD_F(0x061f78aa));
-
-  t4 = MAD_F_MLZ(hi, lo) - t7;
-
-  MAD_F_ML0(hi, lo, t12, MAD_F(0x061f78aa));
-  MAD_F_MLA(hi, lo, t13, MAD_F(0x0ec835e8));
-
-  x[4]  = MAD_F_MLZ(hi, lo) + t4;
-  x[13] = -x[4];
-
-  MAD_F_ML0(hi, lo, t8,   MAD_F(0x09bd7ca0));
-  MAD_F_MLA(hi, lo, t9,  -MAD_F(0x0216a2a2));
-  MAD_F_MLA(hi, lo, t10,  MAD_F(0x0fdcf549));
-  MAD_F_MLA(hi, lo, t11, -MAD_F(0x0cb19346));
-
-  x[1]  = MAD_F_MLZ(hi, lo) + t4;
-  x[16] = -x[1];
-
-  MAD_F_ML0(hi, lo, t8,  -MAD_F(0x0fdcf549));
-  MAD_F_MLA(hi, lo, t9,  -MAD_F(0x0cb19346));
-  MAD_F_MLA(hi, lo, t10, -MAD_F(0x09bd7ca0));
-  MAD_F_MLA(hi, lo, t11, -MAD_F(0x0216a2a2));
-
-  x[25] = x[28] = MAD_F_MLZ(hi, lo) + t4;
-
-  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x0fdcf549));
-  MAD_F_MLA(hi, lo, X[7],  -MAD_F(0x0cb19346));
-  MAD_F_MLA(hi, lo, X[10], -MAD_F(0x09bd7ca0));
-  MAD_F_MLA(hi, lo, X[16], -MAD_F(0x0216a2a2));
-
-  t5 = MAD_F_MLZ(hi, lo) - t6;
-
-  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0d7e8807));
-
-  x[2]  = MAD_F_MLZ(hi, lo) + t5;
-  x[15] = -x[2];
-
-  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x00b2aa3e));
-  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x0e313245));
-
-  x[3]  = MAD_F_MLZ(hi, lo) + t5;
-  x[14] = -x[3];
-
-  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0ffc19fd));
-  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x0f9ee890));
-  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0f426cb5));
-  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0e313245));
-  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0d7e8807));
-  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0bcbe352));
-  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0acf37ad));
-  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0898c779));
-  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x07635284));
-  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x04cfb0e2));
-  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x03768962));
-  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x00b2aa3e));
-
-  x[26] = x[27] = MAD_F_MLZ(hi, lo) + t5;
-}
-#  endif
-
-/*
- * NAME:	III_imdct_l()
- * DESCRIPTION:	perform IMDCT and windowing for long blocks
- */
-static
-void III_imdct_l(mad_fixed_t const X[18], mad_fixed_t z[36],
-		 unsigned int block_type)
-{
-  unsigned int i;
-
-  /* IMDCT */
-
-  imdct36(X, z);
-
-  /* windowing */
-
-  switch (block_type) {
-  case 0:  /* normal window */
-# if defined(ASO_INTERLEAVE1)
-    {
-      register mad_fixed_t tmp1, tmp2;
-
-      tmp1 = window_l[0];
-      tmp2 = window_l[1];
-
-      for (i = 0; i < 34; i += 2) {
-	z[i + 0] = mad_f_mul(z[i + 0], tmp1);
-	tmp1 = window_l[i + 2];
-	z[i + 1] = mad_f_mul(z[i + 1], tmp2);
-	tmp2 = window_l[i + 3];
-      }
-
-      z[34] = mad_f_mul(z[34], tmp1);
-      z[35] = mad_f_mul(z[35], tmp2);
-    }
-# elif defined(ASO_INTERLEAVE2)
-    {
-      register mad_fixed_t tmp1, tmp2;
-
-      tmp1 = z[0];
-      tmp2 = window_l[0];
-
-      for (i = 0; i < 35; ++i) {
-	z[i] = mad_f_mul(tmp1, tmp2);
-	tmp1 = z[i + 1];
-	tmp2 = window_l[i + 1];
-      }
-
-      z[35] = mad_f_mul(tmp1, tmp2);
-    }
-# elif 1
-    for (i = 0; i < 36; i += 4) {
-      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
-      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
-      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
-      z[i + 3] = mad_f_mul(z[i + 3], window_l[i + 3]);
-    }
-# else
-    for (i =  0; i < 36; ++i) z[i] = mad_f_mul(z[i], window_l[i]);
-# endif
-    break;
-
-  case 1:  /* start block */
-    for (i =  0; i < 18; i += 3) {
-      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
-      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
-      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
-    }
-    /*  (i = 18; i < 24; ++i) z[i] unchanged */
-    for (i = 24; i < 30; ++i) z[i] = mad_f_mul(z[i], window_s[i - 18]);
-    for (i = 30; i < 36; ++i) z[i] = 0;
-    break;
-
-  case 3:  /* stop block */
-    for (i =  0; i <  6; ++i) z[i] = 0;
-    for (i =  6; i < 12; ++i) z[i] = mad_f_mul(z[i], window_s[i - 6]);
-    /*  (i = 12; i < 18; ++i) z[i] unchanged */
-    for (i = 18; i < 36; i += 3) {
-      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
-      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
-      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
-    }
-    break;
-  }
-}
-# endif  /* ASO_IMDCT */
-
-/*
- * NAME:	III_imdct_s()
- * DESCRIPTION:	perform IMDCT and windowing for short blocks
- */
-static
-void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36])
-{
-  mad_fixed_t y[36], *yptr;
-  mad_fixed_t const *wptr;
-  int w, i;
-  register mad_fixed64hi_t hi;
-  register mad_fixed64lo_t lo;
-
-  /* IMDCT */
-
-  yptr = &y[0];
-
-  for (w = 0; w < 3; ++w) {
-    register mad_fixed_t const (*s)[6];
-
-    s = imdct_s;
-
-    for (i = 0; i < 3; ++i) {
-      MAD_F_ML0(hi, lo, X[0], (*s)[0]);
-      MAD_F_MLA(hi, lo, X[1], (*s)[1]);
-      MAD_F_MLA(hi, lo, X[2], (*s)[2]);
-      MAD_F_MLA(hi, lo, X[3], (*s)[3]);
-      MAD_F_MLA(hi, lo, X[4], (*s)[4]);
-      MAD_F_MLA(hi, lo, X[5], (*s)[5]);
-
-      yptr[i + 0] = MAD_F_MLZ(hi, lo);
-      yptr[5 - i] = -yptr[i + 0];
-
-      ++s;
-
-      MAD_F_ML0(hi, lo, X[0], (*s)[0]);
-      MAD_F_MLA(hi, lo, X[1], (*s)[1]);
-      MAD_F_MLA(hi, lo, X[2], (*s)[2]);
-      MAD_F_MLA(hi, lo, X[3], (*s)[3]);
-      MAD_F_MLA(hi, lo, X[4], (*s)[4]);
-      MAD_F_MLA(hi, lo, X[5], (*s)[5]);
-
-      yptr[ i + 6] = MAD_F_MLZ(hi, lo);
-      yptr[11 - i] = yptr[i + 6];
-
-      ++s;
-    }
-
-    yptr += 12;
-    X    += 6;
-  }
-
-  /* windowing, overlapping and concatenation */
-
-  yptr = &y[0];
-  wptr = &window_s[0];
-
-  for (i = 0; i < 6; ++i) {
-    z[i +  0] = 0;
-    z[i +  6] = mad_f_mul(yptr[ 0 + 0], wptr[0]);
-
-    MAD_F_ML0(hi, lo, yptr[ 0 + 6], wptr[6]);
-    MAD_F_MLA(hi, lo, yptr[12 + 0], wptr[0]);
-
-    z[i + 12] = MAD_F_MLZ(hi, lo);
-
-    MAD_F_ML0(hi, lo, yptr[12 + 6], wptr[6]);
-    MAD_F_MLA(hi, lo, yptr[24 + 0], wptr[0]);
-
-    z[i + 18] = MAD_F_MLZ(hi, lo);
-
-    z[i + 24] = mad_f_mul(yptr[24 + 6], wptr[6]);
-    z[i + 30] = 0;
-
-    ++yptr;
-    ++wptr;
-  }
-}
-
-/*
- * NAME:	III_overlap()
- * DESCRIPTION:	perform overlap-add of windowed IMDCT outputs
- */
-static
-void III_overlap(mad_fixed_t const output[36], mad_fixed_t overlap[18],
-		 mad_fixed_t sample[18][32], unsigned int sb)
-{
-  unsigned int i;
-
-# if defined(ASO_INTERLEAVE2)
-  {
-    register mad_fixed_t tmp1, tmp2;
-
-    tmp1 = overlap[0];
-    tmp2 = overlap[1];
-
-    for (i = 0; i < 16; i += 2) {
-      sample[i + 0][sb] = output[i + 0 +  0] + tmp1;
-      overlap[i + 0]    = output[i + 0 + 18];
-      tmp1 = overlap[i + 2];
-
-      sample[i + 1][sb] = output[i + 1 +  0] + tmp2;
-      overlap[i + 1]    = output[i + 1 + 18];
-      tmp2 = overlap[i + 3];
-    }
-
-    sample[16][sb] = output[16 +  0] + tmp1;
-    overlap[16]    = output[16 + 18];
-    sample[17][sb] = output[17 +  0] + tmp2;
-    overlap[17]    = output[17 + 18];
-  }
-# elif 0
-  for (i = 0; i < 18; i += 2) {
-    sample[i + 0][sb] = output[i + 0 +  0] + overlap[i + 0];
-    overlap[i + 0]    = output[i + 0 + 18];
-
-    sample[i + 1][sb] = output[i + 1 +  0] + overlap[i + 1];
-    overlap[i + 1]    = output[i + 1 + 18];
-  }
-# else
-  for (i = 0; i < 18; ++i) {
-    sample[i][sb] = output[i +  0] + overlap[i];
-    overlap[i]    = output[i + 18];
-  }
-# endif
-}
-
-/*
- * NAME:	III_overlap_z()
- * DESCRIPTION:	perform "overlap-add" of zero IMDCT outputs
- */
-static inline
-void III_overlap_z(mad_fixed_t overlap[18],
-		   mad_fixed_t sample[18][32], unsigned int sb)
-{
-  unsigned int i;
-
-# if defined(ASO_INTERLEAVE2)
-  {
-    register mad_fixed_t tmp1, tmp2;
-
-    tmp1 = overlap[0];
-    tmp2 = overlap[1];
-
-    for (i = 0; i < 16; i += 2) {
-      sample[i + 0][sb] = tmp1;
-      overlap[i + 0]    = 0;
-      tmp1 = overlap[i + 2];
-
-      sample[i + 1][sb] = tmp2;
-      overlap[i + 1]    = 0;
-      tmp2 = overlap[i + 3];
-    }
-
-    sample[16][sb] = tmp1;
-    overlap[16]    = 0;
-    sample[17][sb] = tmp2;
-    overlap[17]    = 0;
-  }
-# else
-  for (i = 0; i < 18; ++i) {
-    sample[i][sb] = overlap[i];
-    overlap[i]    = 0;
-  }
-# endif
-}
-
-/*
- * NAME:	III_freqinver()
- * DESCRIPTION:	perform subband frequency inversion for odd sample lines
- */
-static
-void III_freqinver(mad_fixed_t sample[18][32], unsigned int sb)
-{
-  unsigned int i;
-
-# if 1 || defined(ASO_INTERLEAVE1) || defined(ASO_INTERLEAVE2)
-  {
-    register mad_fixed_t tmp1, tmp2;
-
-    tmp1 = sample[1][sb];
-    tmp2 = sample[3][sb];
-
-    for (i = 1; i < 13; i += 4) {
-      sample[i + 0][sb] = -tmp1;
-      tmp1 = sample[i + 4][sb];
-      sample[i + 2][sb] = -tmp2;
-      tmp2 = sample[i + 6][sb];
-    }
-
-    sample[13][sb] = -tmp1;
-    tmp1 = sample[17][sb];
-    sample[15][sb] = -tmp2;
-    sample[17][sb] = -tmp1;
-  }
-# else
-  for (i = 1; i < 18; i += 2)
-    sample[i][sb] = -sample[i][sb];
-# endif
-}
-
-/*
- * NAME:	III_decode()
- * DESCRIPTION:	decode frame main_data
- */
-static
-enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
-			  struct sideinfo *si, unsigned int nch)
-{
-  struct mad_header *header = &frame->header;
-  unsigned int sfreqi, ngr, gr;
-
-  {
-    unsigned int sfreq;
-
-    sfreq = header->samplerate;
-    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
-      sfreq *= 2;
-
-    /* 48000 => 0, 44100 => 1, 32000 => 2,
-       24000 => 3, 22050 => 4, 16000 => 5 */
-    sfreqi = ((sfreq >>  7) & 0x000f) +
-             ((sfreq >> 15) & 0x0001) - 8;
-
-    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
-      sfreqi += 3;
-  }
-
-  /* scalefactors, Huffman decoding, requantization */
-
-  ngr = (header->flags & MAD_FLAG_LSF_EXT) ? 1 : 2;
-
-  for (gr = 0; gr < ngr; ++gr) {
-    struct granule *granule = &si->gr[gr];
-    unsigned char const *sfbwidth[2];
-    mad_fixed_t xr[2][576];
-    unsigned int ch;
-    enum mad_error error;
-
-    for (ch = 0; ch < nch; ++ch) {
-      struct channel *channel = &granule->ch[ch];
-      unsigned int part2_length;
-
-      sfbwidth[ch] = sfbwidth_table[sfreqi].l;
-      if (channel->block_type == 2) {
-	sfbwidth[ch] = (channel->flags & mixed_block_flag) ?
-	  sfbwidth_table[sfreqi].m : sfbwidth_table[sfreqi].s;
-      }
-
-      if (header->flags & MAD_FLAG_LSF_EXT) {
-	part2_length = III_scalefactors_lsf(ptr, channel,
-					    ch == 0 ? 0 : &si->gr[1].ch[1],
-					    header->mode_extension);
-      }
-      else {
-	part2_length = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
-					gr == 0 ? 0 : si->scfsi[ch]);
-      }
-
-      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length);
-      if (error)
-	return error;
-    }
-
-    /* joint stereo processing */
-
-    if (header->mode == MAD_MODE_JOINT_STEREO && header->mode_extension) {
-      error = III_stereo(xr, granule, header, sfbwidth[0]);
-      if (error)
-	return error;
-    }
-
-    /* reordering, alias reduction, IMDCT, overlap-add, frequency inversion */
-
-    for (ch = 0; ch < nch; ++ch) {
-      struct channel const *channel = &granule->ch[ch];
-      mad_fixed_t (*sample)[32] = &frame->sbsample[ch][18 * gr];
-      unsigned int sb, l, i, sblimit;
-      mad_fixed_t output[36];
-
-      if (channel->block_type == 2) {
-	III_reorder(xr[ch], channel, sfbwidth[ch]);
-
-# if !defined(OPT_STRICT)
-	/*
-	 * According to ISO/IEC 11172-3, "Alias reduction is not applied for
-	 * granules with block_type == 2 (short block)." However, other
-	 * sources suggest alias reduction should indeed be performed on the
-	 * lower two subbands of mixed blocks. Most other implementations do
-	 * this, so by default we will too.
-	 */
-	if (channel->flags & mixed_block_flag)
-	  III_aliasreduce(xr[ch], 36);
-# endif
-      }
-      else
-	III_aliasreduce(xr[ch], 576);
-
-      l = 0;
-
-      /* subbands 0-1 */
-
-      if (channel->block_type != 2 || (channel->flags & mixed_block_flag)) {
-	unsigned int block_type;
-
-	block_type = channel->block_type;
-	if (channel->flags & mixed_block_flag)
-	  block_type = 0;
-
-	/* long blocks */
-	for (sb = 0; sb < 2; ++sb, l += 18) {
-	  III_imdct_l(&xr[ch][l], output, block_type);
-	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
-	}
-      }
-      else {
-	/* short blocks */
-	for (sb = 0; sb < 2; ++sb, l += 18) {
-	  III_imdct_s(&xr[ch][l], output);
-	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
-	}
-      }
-
-      III_freqinver(sample, 1);
-
-      /* (nonzero) subbands 2-31 */
-
-      i = 576;
-      while (i > 36 && xr[ch][i - 1] == 0)
-	--i;
-
-      sblimit = 32 - (576 - i) / 18;
-
-      if (channel->block_type != 2) {
-	/* long blocks */
-	for (sb = 2; sb < sblimit; ++sb, l += 18) {
-	  III_imdct_l(&xr[ch][l], output, channel->block_type);
-	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
-
-	  if (sb & 1)
-	    III_freqinver(sample, sb);
-	}
-      }
-      else {
-	/* short blocks */
-	for (sb = 2; sb < sblimit; ++sb, l += 18) {
-	  III_imdct_s(&xr[ch][l], output);
-	  III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
-
-	  if (sb & 1)
-	    III_freqinver(sample, sb);
-	}
-      }
-
-      /* remaining (zero) subbands */
-
-      for (sb = sblimit; sb < 32; ++sb) {
-	III_overlap_z((*frame->overlap)[ch][sb], sample, sb);
-
-	if (sb & 1)
-	  III_freqinver(sample, sb);
-      }
-    }
-  }
-
-  return MAD_ERROR_NONE;
-}
-
-/*
- * NAME:	layer->III()
- * DESCRIPTION:	decode a single Layer III frame
- */
-int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
-{
-  struct mad_header *header = &frame->header;
-  unsigned int nch, priv_bitlen, next_md_begin = 0;
-  unsigned int si_len, data_bitlen, md_len;
-  unsigned int frame_space, frame_used, frame_free;
-  struct mad_bitptr ptr;
-  struct sideinfo si;
-  enum mad_error error;
-  int result = 0;
-
-  /* allocate Layer III dynamic structures */
-
-  if (stream->main_data == 0) {
-    stream->main_data = malloc(MAD_BUFFER_MDLEN);
-    if (stream->main_data == 0) {
-      stream->error = MAD_ERROR_NOMEM;
-      return -1;
-    }
-  }
-
-  if (frame->overlap == 0) {
-    frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t));
-    if (frame->overlap == 0) {
-      stream->error = MAD_ERROR_NOMEM;
-      return -1;
-    }
-  }
-
-  nch = MAD_NCHANNELS(header);
-  si_len = (header->flags & MAD_FLAG_LSF_EXT) ?
-    (nch == 1 ? 9 : 17) : (nch == 1 ? 17 : 32);
-
-  /* check frame sanity */
-
-  if (stream->next_frame - mad_bit_nextbyte(&stream->ptr) <
-      (signed int) si_len) {
-    stream->error = MAD_ERROR_BADFRAMELEN;
-    stream->md_len = 0;
-    return -1;
-  }
-
-  /* check CRC word */
-
-  if (header->flags & MAD_FLAG_PROTECTION) {
-    header->crc_check =
-      mad_bit_crc(stream->ptr, si_len * CHAR_BIT, header->crc_check);
-
-    if (header->crc_check != header->crc_target &&
-	!(frame->options & MAD_OPTION_IGNORECRC)) {
-      stream->error = MAD_ERROR_BADCRC;
-      result = -1;
-    }
-  }
-
-  /* decode frame side information */
-
-  error = III_sideinfo(&stream->ptr, nch, header->flags & MAD_FLAG_LSF_EXT,
-		       &si, &data_bitlen, &priv_bitlen);
-  if (error && result == 0) {
-    stream->error = error;
-    result = -1;
-  }
-
-  header->flags        |= priv_bitlen;
-  header->private_bits |= si.private_bits;
-
-  /* find main_data of next frame */
-
-  {
-    struct mad_bitptr peek;
-    unsigned long header;
-
-    mad_bit_init(&peek, stream->next_frame);
-
-    header = mad_bit_read(&peek, 32);
-    if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
-      if (!(header & 0x00010000L))  /* protection_bit */
-	mad_bit_skip(&peek, 16);  /* crc_check */
-
-      next_md_begin =
-	mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
-    }
-
-    mad_bit_finish(&peek);
-  }
-
-  /* find main_data of this frame */
-
-  frame_space = stream->next_frame - mad_bit_nextbyte(&stream->ptr);
-
-  if (next_md_begin > si.main_data_begin + frame_space)
-    next_md_begin = 0;
-
-  md_len = si.main_data_begin + frame_space - next_md_begin;
-
-  frame_used = 0;
-
-  if (si.main_data_begin == 0) {
-    ptr = stream->ptr;
-    stream->md_len = 0;
-
-    frame_used = md_len;
-  }
-  else {
-    if (si.main_data_begin > stream->md_len) {
-      if (result == 0) {
-	stream->error = MAD_ERROR_BADDATAPTR;
-	result = -1;
-      }
-    }
-    else {
-      mad_bit_init(&ptr,
-		   *stream->main_data + stream->md_len - si.main_data_begin);
-
-      if (md_len > si.main_data_begin) {
-	assert(stream->md_len + md_len -
-	       si.main_data_begin <= MAD_BUFFER_MDLEN);
-
-	memcpy(*stream->main_data + stream->md_len,
-	       mad_bit_nextbyte(&stream->ptr),
-	       frame_used = md_len - si.main_data_begin);
-	stream->md_len += frame_used;
-      }
-    }
-  }
-
-  frame_free = frame_space - frame_used;
-
-  /* decode main_data */
-
-  if (result == 0) {
-    error = III_decode(&ptr, frame, &si, nch);
-    if (error) {
-      stream->error = error;
-      result = -1;
-    }
-
-    /* designate ancillary bits */
-
-    stream->anc_ptr    = ptr;
-    stream->anc_bitlen = md_len * CHAR_BIT - data_bitlen;
-  }
-
-# if 0 && defined(DEBUG)
-  fprintf(stderr,
-	  "main_data_begin:%u, md_len:%u, frame_free:%u, "
-	  "data_bitlen:%u, anc_bitlen: %u\n",
-	  si.main_data_begin, md_len, frame_free,
-	  data_bitlen, stream->anc_bitlen);
-# endif
-
-  /* preload main_data buffer with up to 511 bytes for next frame(s) */
-
-  if (frame_free >= next_md_begin) {
-    memcpy(*stream->main_data,
-	   stream->next_frame - next_md_begin, next_md_begin);
-    stream->md_len = next_md_begin;
-  }
-  else {
-    if (md_len < si.main_data_begin) {
-      unsigned int extra;
-
-      extra = si.main_data_begin - md_len;
-      if (extra + frame_free > next_md_begin)
-	extra = next_md_begin - frame_free;
-
-      if (extra < stream->md_len) {
-	memmove(*stream->main_data,
-		*stream->main_data + stream->md_len - extra, extra);
-	stream->md_len = extra;
-      }
-    }
-    else
-      stream->md_len = 0;
-
-    memcpy(*stream->main_data + stream->md_len,
-	   stream->next_frame - frame_free, frame_free);
-    stream->md_len += frame_free;
-  }
-
-  return result;
-}
diff --git a/code/libmad-0.15.1b/layer3.h b/code/libmad-0.15.1b/layer3.h
deleted file mode 100644
index 2504d461..00000000
--- a/code/libmad-0.15.1b/layer3.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: layer3.h,v 1.10 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_LAYER3_H
-# define LIBMAD_LAYER3_H
-
-# include "stream.h"
-# include "frame.h"
-
-int mad_layer_III(struct mad_stream *, struct mad_frame *);
-
-# endif
diff --git a/code/libmad-0.15.1b/libmad.list.in b/code/libmad-0.15.1b/libmad.list.in
deleted file mode 100644
index 4718fef3..00000000
--- a/code/libmad-0.15.1b/libmad.list.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# @configure_input@
-
-# Directories...
-$prefix=@prefix@
-$exec_prefix=@exec_prefix@
-$srcdir=@srcdir@
-
-# Product information
-%product @PACKAGE@
-%copyright GPL
-%vendor Underbit Technologies, Inc. <info@underbit.com>
-%license @srcdir@/COPYING
-%readme @srcdir@/README
-%description libmad is an MPEG audio decoder library.
-%version @VERSION@
-%packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it>
-
-%system all
-f 0755 root root @libdir@/libmad.la .libs/libmad.lai
-f 0644 root root @libdir@/libmad.a .libs/libmad.a
-f 0644 root root @includedir@/mad.h mad.h
diff --git a/code/libmad-0.15.1b/ltmain.sh b/code/libmad-0.15.1b/ltmain.sh
deleted file mode 100644
index 4b9f9405..00000000
--- a/code/libmad-0.15.1b/ltmain.sh
+++ /dev/null
@@ -1,6399 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.2
-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08) Debian$Rev: 192 $"
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
-  ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-win32_libid () {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*) 
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-# End of Shell function definitions
-#####################################
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
-    done
-    exit 0
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit 0
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit 1
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-      $echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit 0
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit 1
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit 1
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit 1
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit 1
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit 1
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi # $pass = conv
-
-    
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-    
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"    
-      fi	  
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against it, someone
-		    # is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi 
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs, but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		   fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		path="-L$path"
-		;;
-		esac 
-		
-		;;
-		  -l*)
-		case $host in
-		*-*-darwin*)
-		 # Again, we only want to link against shared libraries
-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		 for tmp in $newlib_search_path ; do
-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
-		       break
-		     fi  
-         done
-         path=""
-		  ;;
-		*) continue ;;
-		esac  		  
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-	
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	       then
-		 continue
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*) 
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs" 
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadale object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit 0
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit 0
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit 0
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-   
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-  
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char * 
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char * 
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat) 
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode, 
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit 0
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done  
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi  
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-        relink_command=
-      fi  
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in 
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in 
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit 1
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit 0
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
-	      else
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
-    else
-      exit 0
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe) 
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit 1
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit 0
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit 0
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/code/libmad-0.15.1b/mad.h b/code/libmad-0.15.1b/mad.h
deleted file mode 100644
index 9ef6cc8f..00000000
--- a/code/libmad-0.15.1b/mad.h
+++ /dev/null
@@ -1,964 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# define FPM_INTEL
-
-
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
-
-
-/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2004"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif
-
-/* Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   elif defined(OPT_INTEL)
-/*
- * Alternate Intel scaling that may or may not perform better.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrl %3,%1\n\t"  \
-	    "shll %4,%2\n\t"  \
-	    "orl %2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi),  \
-	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
-
-/* Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
-
-/* Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
-
-/* Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADMODE        = 0x0222,	/* bad bitrate/mode combination */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
-
-/* Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
-
-/* Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
-
-/* Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
-
-# ifdef __cplusplus
-}
-# endif
diff --git a/code/libmad-0.15.1b/mad.h.sed b/code/libmad-0.15.1b/mad.h.sed
deleted file mode 100644
index 70287854..00000000
--- a/code/libmad-0.15.1b/mad.h.sed
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# libmad - MPEG audio decoder library
-# Copyright (C) 2000-2004 Underbit Technologies, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# $Id: mad.h.sed,v 1.9 2004/01/23 09:41:32 rob Exp $
-#
-
-/^\/\*$/{
-N
-s/ \* libmad - /&/
-t copy
-b next
-: copy
-g
-n
-s|^ \* \$\(Id: .*\) \$$|/* \1 */|p
-/^ \*\/$/d
-b copy
-}
-/^# *include "/d
-: next
-p
diff --git a/code/libmad-0.15.1b/minimad.c b/code/libmad-0.15.1b/minimad.c
deleted file mode 100644
index ac412ae4..00000000
--- a/code/libmad-0.15.1b/minimad.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: minimad.c,v 1.4 2004/01/23 09:41:32 rob Exp $
- */
-
-# include <stdio.h>
-# include <unistd.h>
-# include <sys/stat.h>
-# include <sys/mman.h>
-
-# include "mad.h"
-
-/*
- * This is perhaps the simplest example use of the MAD high-level API.
- * Standard input is mapped into memory via mmap(), then the high-level API
- * is invoked with three callbacks: input, output, and error. The output
- * callback converts MAD's high-resolution PCM samples to 16 bits, then
- * writes them to standard output in little-endian, stereo-interleaved
- * format.
- */
-
-static int decode(unsigned char const *, unsigned long);
-
-int main(int argc, char *argv[])
-{
-  struct stat stat;
-  void *fdm;
-
-  if (argc != 1)
-    return 1;
-
-  if (fstat(STDIN_FILENO, &stat) == -1 ||
-      stat.st_size == 0)
-    return 2;
-
-  fdm = mmap(0, stat.st_size, PROT_READ, MAP_SHARED, STDIN_FILENO, 0);
-  if (fdm == MAP_FAILED)
-    return 3;
-
-  decode(fdm, stat.st_size);
-
-  if (munmap(fdm, stat.st_size) == -1)
-    return 4;
-
-  return 0;
-}
-
-/*
- * This is a private message structure. A generic pointer to this structure
- * is passed to each of the callback functions. Put here any data you need
- * to access from within the callbacks.
- */
-
-struct buffer {
-  unsigned char const *start;
-  unsigned long length;
-};
-
-/*
- * This is the input callback. The purpose of this callback is to (re)fill
- * the stream buffer which is to be decoded. In this example, an entire file
- * has been mapped into memory, so we just call mad_stream_buffer() with the
- * address and length of the mapping. When this callback is called a second
- * time, we are finished decoding.
- */
-
-static
-enum mad_flow input(void *data,
-		    struct mad_stream *stream)
-{
-  struct buffer *buffer = data;
-
-  if (!buffer->length)
-    return MAD_FLOW_STOP;
-
-  mad_stream_buffer(stream, buffer->start, buffer->length);
-
-  buffer->length = 0;
-
-  return MAD_FLOW_CONTINUE;
-}
-
-/*
- * The following utility routine performs simple rounding, clipping, and
- * scaling of MAD's high-resolution samples down to 16 bits. It does not
- * perform any dithering or noise shaping, which would be recommended to
- * obtain any exceptional audio quality. It is therefore not recommended to
- * use this routine if high-quality output is desired.
- */
-
-static inline
-signed int scale(mad_fixed_t sample)
-{
-  /* round */
-  sample += (1L << (MAD_F_FRACBITS - 16));
-
-  /* clip */
-  if (sample >= MAD_F_ONE)
-    sample = MAD_F_ONE - 1;
-  else if (sample < -MAD_F_ONE)
-    sample = -MAD_F_ONE;
-
-  /* quantize */
-  return sample >> (MAD_F_FRACBITS + 1 - 16);
-}
-
-/*
- * This is the output callback function. It is called after each frame of
- * MPEG audio data has been completely decoded. The purpose of this callback
- * is to output (or play) the decoded PCM audio.
- */
-
-static
-enum mad_flow output(void *data,
-		     struct mad_header const *header,
-		     struct mad_pcm *pcm)
-{
-  unsigned int nchannels, nsamples;
-  mad_fixed_t const *left_ch, *right_ch;
-
-  /* pcm->samplerate contains the sampling frequency */
-
-  nchannels = pcm->channels;
-  nsamples  = pcm->length;
-  left_ch   = pcm->samples[0];
-  right_ch  = pcm->samples[1];
-
-  while (nsamples--) {
-    signed int sample;
-
-    /* output sample(s) in 16-bit signed little-endian PCM */
-
-    sample = scale(*left_ch++);
-    putchar((sample >> 0) & 0xff);
-    putchar((sample >> 8) & 0xff);
-
-    if (nchannels == 2) {
-      sample = scale(*right_ch++);
-      putchar((sample >> 0) & 0xff);
-      putchar((sample >> 8) & 0xff);
-    }
-  }
-
-  return MAD_FLOW_CONTINUE;
-}
-
-/*
- * This is the error callback function. It is called whenever a decoding
- * error occurs. The error is indicated by stream->error; the list of
- * possible MAD_ERROR_* errors can be found in the mad.h (or stream.h)
- * header file.
- */
-
-static
-enum mad_flow error(void *data,
-		    struct mad_stream *stream,
-		    struct mad_frame *frame)
-{
-  struct buffer *buffer = data;
-
-  fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %u\n",
-	  stream->error, mad_stream_errorstr(stream),
-	  stream->this_frame - buffer->start);
-
-  /* return MAD_FLOW_BREAK here to stop decoding (and propagate an error) */
-
-  return MAD_FLOW_CONTINUE;
-}
-
-/*
- * This is the function called by main() above to perform all the decoding.
- * It instantiates a decoder object and configures it with the input,
- * output, and error callback functions above. A single call to
- * mad_decoder_run() continues until a callback function returns
- * MAD_FLOW_STOP (to stop decoding) or MAD_FLOW_BREAK (to stop decoding and
- * signal an error).
- */
-
-static
-int decode(unsigned char const *start, unsigned long length)
-{
-  struct buffer buffer;
-  struct mad_decoder decoder;
-  int result;
-
-  /* initialize our private message structure */
-
-  buffer.start  = start;
-  buffer.length = length;
-
-  /* configure input, output, and error functions */
-
-  mad_decoder_init(&decoder, &buffer,
-		   input, 0 /* header */, 0 /* filter */, output,
-		   error, 0 /* message */);
-
-  /* start decoding */
-
-  result = mad_decoder_run(&decoder, MAD_DECODER_MODE_SYNC);
-
-  /* release the decoder */
-
-  mad_decoder_finish(&decoder);
-
-  return result;
-}
diff --git a/code/libmad-0.15.1b/missing b/code/libmad-0.15.1b/missing
deleted file mode 100644
index 6a37006e..00000000
--- a/code/libmad-0.15.1b/missing
+++ /dev/null
@@ -1,336 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/code/libmad-0.15.1b/mkinstalldirs b/code/libmad-0.15.1b/mkinstalldirs
deleted file mode 100644
index d2d5f21b..00000000
--- a/code/libmad-0.15.1b/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff --git a/code/libmad-0.15.1b/msvc++/Makefile.am b/code/libmad-0.15.1b/msvc++/Makefile.am
deleted file mode 100644
index 96865c7f..00000000
--- a/code/libmad-0.15.1b/msvc++/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## libmad - MPEG audio decoder library
-## Copyright (C) 2000-2004 Underbit Technologies, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
-## $Id: Makefile.am,v 1.3 2004/01/23 09:41:33 rob Exp $
-##
-
-## Process this file with automake to produce Makefile.in
-
-EXTRA_DIST =		mad.h config.h libmad.dsp
diff --git a/code/libmad-0.15.1b/msvc++/Makefile.in b/code/libmad-0.15.1b/msvc++/Makefile.in
deleted file mode 100644
index eaeb8634..00000000
--- a/code/libmad-0.15.1b/msvc++/Makefile.in
+++ /dev/null
@@ -1,312 +0,0 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-subdir = msvc++
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ASO = @ASO@
-ASO_OBJS = @ASO_OBJS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPM = @FPM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = mad.h config.h libmad.dsp
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  msvc++/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  msvc++/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/code/libmad-0.15.1b/msvc++/config.h b/code/libmad-0.15.1b/msvc++/config.h
deleted file mode 100644
index 02683a5f..00000000
--- a/code/libmad-0.15.1b/msvc++/config.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to enable diagnostic debugging support. */
-/* #undef DEBUG */
-
-/* Define to enable experimental code. */
-/* #undef EXPERIMENTAL */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fork' function. */
-/* #undef HAVE_FORK */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */
-/* #undef HAVE_MADD16_ASM */
-
-/* Define if your MIPS CPU supports a 2-operand MADD instruction. */
-/* #undef HAVE_MADD_ASM */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `pipe' function. */
-/* #undef HAVE_PIPE */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to 1 if you have the `waitpid' function. */
-/* #undef HAVE_WAITPID */
-
-/* Define to disable debugging assertions. */
-/* #undef NDEBUG */
-
-/* Define to optimize for accuracy over speed. */
-/* #undef OPT_ACCURACY */
-
-/* Define to optimize for speed over accuracy. */
-/* #undef OPT_SPEED */
-
-/* Define to enable a fast subband synthesis approximation optimization. */
-/* #undef OPT_SSO */
-
-/* Define to influence a strict interpretation of the ISO/IEC standards, even
-   if this is in opposition with best accepted practices. */
-/* #undef OPT_STRICT */
-
-/* Name of package */
-#define PACKAGE "libmad"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "support@underbit.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "MPEG Audio Decoder"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MPEG Audio Decoder 0.15.1b"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libmad"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.15.1b"
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "0.15.1b"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-#define inline __inline
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
diff --git a/code/libmad-0.15.1b/msvc++/libmad.dsp b/code/libmad-0.15.1b/msvc++/libmad.dsp
deleted file mode 100644
index faf83132..00000000
--- a/code/libmad-0.15.1b/msvc++/libmad.dsp
+++ /dev/null
@@ -1,214 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libmad" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libmad - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libmad.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libmad.mak" CFG="libmad - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libmad - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libmad - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libmad - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /GX /O2 /I "." /D "NDEBUG" /D "FPM_INTEL" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "ASO_ZEROCHECK" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libmad - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /Gm /GX /ZI /Od /I "." /D "FPM_DEFAULT" /D "_LIB" /D "HAVE_CONFIG_H" /D "ASO_ZEROCHECK" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "DEBUG" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libmad - Win32 Release"
-# Name "libmad - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "c"
-# Begin Source File
-
-SOURCE=..\bit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\decoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\fixed.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\frame.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\huffman.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer3.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\synth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\version.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h"
-# Begin Source File
-
-SOURCE=..\bit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\global.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\huffman.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer12.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\synth.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\version.h
-# End Source File
-# End Group
-# Begin Group "Data Files"
-
-# PROP Default_Filter "dat"
-# Begin Source File
-
-SOURCE=..\D.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\imdct_s.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\qc_table.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\rq_table.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\sf_table.dat
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/code/libmad-0.15.1b/msvc++/mad.h b/code/libmad-0.15.1b/msvc++/mad.h
deleted file mode 100644
index d4834785..00000000
--- a/code/libmad-0.15.1b/msvc++/mad.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# define FPM_INTEL
-
-
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
-
-
-/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2003"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif
-
-/* Id: fixed.h,v 1.36 2003/05/28 04:36:00 rob Exp */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#    else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
-
-/* Id: bit.h,v 1.11 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
-
-/* Id: timer.h,v 1.15 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
-
-/* Id: stream.h,v 1.18 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
-
-/* Id: frame.h,v 1.19 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
-
-/* Id: synth.h,v 1.14 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
-
-/* Id: decoder.h,v 1.16 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
-
-# ifdef __cplusplus
-}
-# endif
diff --git a/code/libmad-0.15.1b/qc_table.dat b/code/libmad-0.15.1b/qc_table.dat
deleted file mode 100644
index 35a22234..00000000
--- a/code/libmad-0.15.1b/qc_table.dat
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: qc_table.dat,v 1.7 2004/01/23 09:41:32 rob Exp $
- */
-
-/*
- * These are the Layer II classes of quantization.
- * The table is derived from Table B.4 of ISO/IEC 11172-3.
- */
-
-  {     3, 2,  5,
-    MAD_F(0x15555555) /* 1.33333333333 => 1.33333333209, e  0.00000000124 */,
-    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
-  {     5, 3,  7,
-    MAD_F(0x1999999a) /* 1.60000000000 => 1.60000000149, e -0.00000000149 */,
-    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
-  {     7, 0,  3,
-    MAD_F(0x12492492) /* 1.14285714286 => 1.14285714179, e  0.00000000107 */,
-    MAD_F(0x04000000) /* 0.25000000000 => 0.25000000000, e  0.00000000000 */ },
-  {     9, 4, 10,
-    MAD_F(0x1c71c71c) /* 1.77777777777 => 1.77777777612, e  0.00000000165 */,
-    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
-  {    15, 0,  4,
-    MAD_F(0x11111111) /* 1.06666666666 => 1.06666666642, e  0.00000000024 */,
-    MAD_F(0x02000000) /* 0.12500000000 => 0.12500000000, e  0.00000000000 */ },
-  {    31, 0,  5,
-    MAD_F(0x10842108) /* 1.03225806452 => 1.03225806355, e  0.00000000097 */,
-    MAD_F(0x01000000) /* 0.06250000000 => 0.06250000000, e  0.00000000000 */ },
-  {    63, 0,  6,
-    MAD_F(0x10410410) /* 1.01587301587 => 1.01587301493, e  0.00000000094 */,
-    MAD_F(0x00800000) /* 0.03125000000 => 0.03125000000, e  0.00000000000 */ },
-  {   127, 0,  7,
-    MAD_F(0x10204081) /* 1.00787401575 => 1.00787401572, e  0.00000000003 */,
-    MAD_F(0x00400000) /* 0.01562500000 => 0.01562500000, e  0.00000000000 */ },
-  {   255, 0,  8,
-    MAD_F(0x10101010) /* 1.00392156863 => 1.00392156839, e  0.00000000024 */,
-    MAD_F(0x00200000) /* 0.00781250000 => 0.00781250000, e  0.00000000000 */ },
-  {   511, 0,  9,
-    MAD_F(0x10080402) /* 1.00195694716 => 1.00195694715, e  0.00000000001 */,
-    MAD_F(0x00100000) /* 0.00390625000 => 0.00390625000, e  0.00000000000 */ },
-  {  1023, 0, 10,
-    MAD_F(0x10040100) /* 1.00097751711 => 1.00097751617, e  0.00000000094 */,
-    MAD_F(0x00080000) /* 0.00195312500 => 0.00195312500, e  0.00000000000 */ },
-  {  2047, 0, 11,
-    MAD_F(0x10020040) /* 1.00048851979 => 1.00048851967, e  0.00000000012 */,
-    MAD_F(0x00040000) /* 0.00097656250 => 0.00097656250, e  0.00000000000 */ },
-  {  4095, 0, 12,
-    MAD_F(0x10010010) /* 1.00024420024 => 1.00024420023, e  0.00000000001 */,
-    MAD_F(0x00020000) /* 0.00048828125 => 0.00048828125, e  0.00000000000 */ },
-  {  8191, 0, 13,
-    MAD_F(0x10008004) /* 1.00012208522 => 1.00012208521, e  0.00000000001 */,
-    MAD_F(0x00010000) /* 0.00024414063 => 0.00024414062, e  0.00000000000 */ },
-  { 16383, 0, 14,
-    MAD_F(0x10004001) /* 1.00006103888 => 1.00006103888, e -0.00000000000 */,
-    MAD_F(0x00008000) /* 0.00012207031 => 0.00012207031, e -0.00000000000 */ },
-  { 32767, 0, 15,
-    MAD_F(0x10002000) /* 1.00003051851 => 1.00003051758, e  0.00000000093 */,
-    MAD_F(0x00004000) /* 0.00006103516 => 0.00006103516, e  0.00000000000 */ },
-  { 65535, 0, 16,
-    MAD_F(0x10001000) /* 1.00001525902 => 1.00001525879, e  0.00000000023 */,
-    MAD_F(0x00002000) /* 0.00003051758 => 0.00003051758, e  0.00000000000 */ }
diff --git a/code/libmad-0.15.1b/rq_table.dat b/code/libmad-0.15.1b/rq_table.dat
deleted file mode 100644
index 059c4f31..00000000
--- a/code/libmad-0.15.1b/rq_table.dat
+++ /dev/null
@@ -1,8747 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: rq_table.dat,v 1.7 2004/01/23 09:41:32 rob Exp $
- */
-
-/*
- * This is the lookup table used to compute x^(4/3) for Layer III
- * requantization. To maintain the best possible accuracy, the value is
- * stored as a normalized mantissa with exponent. The requantization
- * algorithm recombines these parts with appropriate scaling.
- */
-
-  /*    0 */  { MAD_F(0x00000000) /* 0.000000000 */,  0 },
-  /*    1 */  { MAD_F(0x04000000) /* 0.250000000 */,  2 },
-  /*    2 */  { MAD_F(0x050a28be) /* 0.314980262 */,  3 },
-  /*    3 */  { MAD_F(0x0453a5cd) /* 0.270421794 */,  4 },
-  /*    4 */  { MAD_F(0x06597fa9) /* 0.396850263 */,  4 },
-  /*    5 */  { MAD_F(0x04466275) /* 0.267183742 */,  5 },
-  /*    6 */  { MAD_F(0x05738c72) /* 0.340710111 */,  5 },
-  /*    7 */  { MAD_F(0x06b1fc81) /* 0.418453696 */,  5 },
-  /*    8 */  { MAD_F(0x04000000) /* 0.250000000 */,  6 },
-  /*    9 */  { MAD_F(0x04ae20d7) /* 0.292511788 */,  6 },
-  /*   10 */  { MAD_F(0x0562d694) /* 0.336630420 */,  6 },
-  /*   11 */  { MAD_F(0x061dae96) /* 0.382246578 */,  6 },
-  /*   12 */  { MAD_F(0x06de47f4) /* 0.429267841 */,  6 },
-  /*   13 */  { MAD_F(0x07a44f7a) /* 0.477614858 */,  6 },
-  /*   14 */  { MAD_F(0x0437be65) /* 0.263609310 */,  7 },
-  /*   15 */  { MAD_F(0x049fc824) /* 0.289009227 */,  7 },
-
-  /*   16 */  { MAD_F(0x050a28be) /* 0.314980262 */,  7 },
-  /*   17 */  { MAD_F(0x0576c6f5) /* 0.341498336 */,  7 },
-  /*   18 */  { MAD_F(0x05e58c0b) /* 0.368541759 */,  7 },
-  /*   19 */  { MAD_F(0x06566361) /* 0.396090870 */,  7 },
-  /*   20 */  { MAD_F(0x06c93a2e) /* 0.424127753 */,  7 },
-  /*   21 */  { MAD_F(0x073dff3e) /* 0.452635998 */,  7 },
-  /*   22 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */,  7 },
-  /*   23 */  { MAD_F(0x04168b05) /* 0.255503674 */,  8 },
-  /*   24 */  { MAD_F(0x0453a5cd) /* 0.270421794 */,  8 },
-  /*   25 */  { MAD_F(0x04919b6a) /* 0.285548607 */,  8 },
-  /*   26 */  { MAD_F(0x04d065fb) /* 0.300878507 */,  8 },
-  /*   27 */  { MAD_F(0x05100000) /* 0.316406250 */,  8 },
-  /*   28 */  { MAD_F(0x05506451) /* 0.332126919 */,  8 },
-  /*   29 */  { MAD_F(0x05918e15) /* 0.348035890 */,  8 },
-  /*   30 */  { MAD_F(0x05d378bb) /* 0.364128809 */,  8 },
-  /*   31 */  { MAD_F(0x06161ff3) /* 0.380401563 */,  8 },
-
-  /*   32 */  { MAD_F(0x06597fa9) /* 0.396850263 */,  8 },
-  /*   33 */  { MAD_F(0x069d9400) /* 0.413471222 */,  8 },
-  /*   34 */  { MAD_F(0x06e2594c) /* 0.430260942 */,  8 },
-  /*   35 */  { MAD_F(0x0727cc11) /* 0.447216097 */,  8 },
-  /*   36 */  { MAD_F(0x076de8fc) /* 0.464333519 */,  8 },
-  /*   37 */  { MAD_F(0x07b4ace3) /* 0.481610189 */,  8 },
-  /*   38 */  { MAD_F(0x07fc14bf) /* 0.499043224 */,  8 },
-  /*   39 */  { MAD_F(0x04220ed7) /* 0.258314934 */,  9 },
-  /*   40 */  { MAD_F(0x04466275) /* 0.267183742 */,  9 },
-  /*   41 */  { MAD_F(0x046b03e7) /* 0.276126771 */,  9 },
-  /*   42 */  { MAD_F(0x048ff1e8) /* 0.285142811 */,  9 },
-  /*   43 */  { MAD_F(0x04b52b3f) /* 0.294230696 */,  9 },
-  /*   44 */  { MAD_F(0x04daaec0) /* 0.303389310 */,  9 },
-  /*   45 */  { MAD_F(0x05007b49) /* 0.312617576 */,  9 },
-  /*   46 */  { MAD_F(0x05268fc6) /* 0.321914457 */,  9 },
-  /*   47 */  { MAD_F(0x054ceb2a) /* 0.331278957 */,  9 },
-
-  /*   48 */  { MAD_F(0x05738c72) /* 0.340710111 */,  9 },
-  /*   49 */  { MAD_F(0x059a72a5) /* 0.350206992 */,  9 },
-  /*   50 */  { MAD_F(0x05c19cd3) /* 0.359768701 */,  9 },
-  /*   51 */  { MAD_F(0x05e90a12) /* 0.369394372 */,  9 },
-  /*   52 */  { MAD_F(0x0610b982) /* 0.379083164 */,  9 },
-  /*   53 */  { MAD_F(0x0638aa48) /* 0.388834268 */,  9 },
-  /*   54 */  { MAD_F(0x0660db91) /* 0.398646895 */,  9 },
-  /*   55 */  { MAD_F(0x06894c90) /* 0.408520284 */,  9 },
-  /*   56 */  { MAD_F(0x06b1fc81) /* 0.418453696 */,  9 },
-  /*   57 */  { MAD_F(0x06daeaa1) /* 0.428446415 */,  9 },
-  /*   58 */  { MAD_F(0x07041636) /* 0.438497744 */,  9 },
-  /*   59 */  { MAD_F(0x072d7e8b) /* 0.448607009 */,  9 },
-  /*   60 */  { MAD_F(0x075722ef) /* 0.458773552 */,  9 },
-  /*   61 */  { MAD_F(0x078102b8) /* 0.468996735 */,  9 },
-  /*   62 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */,  9 },
-  /*   63 */  { MAD_F(0x07d571e0) /* 0.489610555 */,  9 },
-
-  /*   64 */  { MAD_F(0x04000000) /* 0.250000000 */, 10 },
-  /*   65 */  { MAD_F(0x04156381) /* 0.255221850 */, 10 },
-  /*   66 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 10 },
-  /*   67 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 10 },
-  /*   68 */  { MAD_F(0x045635cf) /* 0.271047409 */, 10 },
-  /*   69 */  { MAD_F(0x046c083e) /* 0.276375048 */, 10 },
-  /*   70 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 10 },
-  /*   71 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 10 },
-  /*   72 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 10 },
-  /*   73 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 10 },
-  /*   74 */  { MAD_F(0x04dab524) /* 0.303395408 */, 10 },
-  /*   75 */  { MAD_F(0x04f12624) /* 0.308874267 */, 10 },
-  /*   76 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 10 },
-  /*   77 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 10 },
-  /*   78 */  { MAD_F(0x053511cb) /* 0.325456423 */, 10 },
-  /*   79 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 10 },
-
-  /*   80 */  { MAD_F(0x0562d694) /* 0.336630420 */, 10 },
-  /*   81 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 10 },
-  /*   82 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 10 },
-  /*   83 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 10 },
-  /*   84 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 10 },
-  /*   85 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 10 },
-  /*   86 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 10 },
-  /*   87 */  { MAD_F(0x0606012b) /* 0.376465960 */, 10 },
-  /*   88 */  { MAD_F(0x061dae96) /* 0.382246578 */, 10 },
-  /*   89 */  { MAD_F(0x06357302) /* 0.388049134 */, 10 },
-  /*   90 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 10 },
-  /*   91 */  { MAD_F(0x0665402d) /* 0.399719406 */, 10 },
-  /*   92 */  { MAD_F(0x067d4896) /* 0.405586801 */, 10 },
-  /*   93 */  { MAD_F(0x06956753) /* 0.411475493 */, 10 },
-  /*   94 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 10 },
-  /*   95 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 10 },
-
-  /*   96 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 10 },
-  /*   97 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 10 },
-  /*   98 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 10 },
-  /*   99 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 10 },
-  /*  100 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 10 },
-  /*  101 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 10 },
-  /*  102 */  { MAD_F(0x07724f64) /* 0.465407744 */, 10 },
-  /*  103 */  { MAD_F(0x078b4514) /* 0.471501425 */, 10 },
-  /*  104 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 10 },
-  /*  105 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 10 },
-  /*  106 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 10 },
-  /*  107 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 10 },
-  /*  108 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 11 },
-  /*  109 */  { MAD_F(0x04115aca) /* 0.254236974 */, 11 },
-  /*  110 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 11 },
-  /*  111 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 11 },
-
-  /*  112 */  { MAD_F(0x0437be65) /* 0.263609310 */, 11 },
-  /*  113 */  { MAD_F(0x04449dee) /* 0.266752177 */, 11 },
-  /*  114 */  { MAD_F(0x04518733) /* 0.269904329 */, 11 },
-  /*  115 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 11 },
-  /*  116 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 11 },
-  /*  117 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 11 },
-  /*  118 */  { MAD_F(0x04858c83) /* 0.282604707 */, 11 },
-  /*  119 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 11 },
-  /*  120 */  { MAD_F(0x049fc824) /* 0.289009227 */, 11 },
-  /*  121 */  { MAD_F(0x04acf402) /* 0.292224893 */, 11 },
-  /*  122 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 11 },
-  /*  123 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 11 },
-  /*  124 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 11 },
-  /*  125 */  { MAD_F(0x04e20000) /* 0.305175781 */, 11 },
-  /*  126 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 11 },
-  /*  127 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 11 },
-
-  /*  128 */  { MAD_F(0x050a28be) /* 0.314980262 */, 11 },
-  /*  129 */  { MAD_F(0x05179da4) /* 0.318265572 */, 11 },
-  /*  130 */  { MAD_F(0x05251b73) /* 0.321559381 */, 11 },
-  /*  131 */  { MAD_F(0x0532a220) /* 0.324861647 */, 11 },
-  /*  132 */  { MAD_F(0x054031a0) /* 0.328172327 */, 11 },
-  /*  133 */  { MAD_F(0x054dc9e7) /* 0.331491377 */, 11 },
-  /*  134 */  { MAD_F(0x055b6ae9) /* 0.334818756 */, 11 },
-  /*  135 */  { MAD_F(0x0569149c) /* 0.338154423 */, 11 },
-  /*  136 */  { MAD_F(0x0576c6f5) /* 0.341498336 */, 11 },
-  /*  137 */  { MAD_F(0x058481e9) /* 0.344850455 */, 11 },
-  /*  138 */  { MAD_F(0x0592456d) /* 0.348210741 */, 11 },
-  /*  139 */  { MAD_F(0x05a01176) /* 0.351579152 */, 11 },
-  /*  140 */  { MAD_F(0x05ade5fa) /* 0.354955651 */, 11 },
-  /*  141 */  { MAD_F(0x05bbc2ef) /* 0.358340200 */, 11 },
-  /*  142 */  { MAD_F(0x05c9a84a) /* 0.361732758 */, 11 },
-  /*  143 */  { MAD_F(0x05d79601) /* 0.365133291 */, 11 },
-
-  /*  144 */  { MAD_F(0x05e58c0b) /* 0.368541759 */, 11 },
-  /*  145 */  { MAD_F(0x05f38a5d) /* 0.371958126 */, 11 },
-  /*  146 */  { MAD_F(0x060190ee) /* 0.375382356 */, 11 },
-  /*  147 */  { MAD_F(0x060f9fb3) /* 0.378814413 */, 11 },
-  /*  148 */  { MAD_F(0x061db6a5) /* 0.382254261 */, 11 },
-  /*  149 */  { MAD_F(0x062bd5b8) /* 0.385701865 */, 11 },
-  /*  150 */  { MAD_F(0x0639fce4) /* 0.389157191 */, 11 },
-  /*  151 */  { MAD_F(0x06482c1f) /* 0.392620204 */, 11 },
-  /*  152 */  { MAD_F(0x06566361) /* 0.396090870 */, 11 },
-  /*  153 */  { MAD_F(0x0664a2a0) /* 0.399569155 */, 11 },
-  /*  154 */  { MAD_F(0x0672e9d4) /* 0.403055027 */, 11 },
-  /*  155 */  { MAD_F(0x068138f3) /* 0.406548452 */, 11 },
-  /*  156 */  { MAD_F(0x068f8ff5) /* 0.410049398 */, 11 },
-  /*  157 */  { MAD_F(0x069deed1) /* 0.413557833 */, 11 },
-  /*  158 */  { MAD_F(0x06ac557f) /* 0.417073724 */, 11 },
-  /*  159 */  { MAD_F(0x06bac3f6) /* 0.420597041 */, 11 },
-
-  /*  160 */  { MAD_F(0x06c93a2e) /* 0.424127753 */, 11 },
-  /*  161 */  { MAD_F(0x06d7b81f) /* 0.427665827 */, 11 },
-  /*  162 */  { MAD_F(0x06e63dc0) /* 0.431211234 */, 11 },
-  /*  163 */  { MAD_F(0x06f4cb09) /* 0.434763944 */, 11 },
-  /*  164 */  { MAD_F(0x07035ff3) /* 0.438323927 */, 11 },
-  /*  165 */  { MAD_F(0x0711fc75) /* 0.441891153 */, 11 },
-  /*  166 */  { MAD_F(0x0720a087) /* 0.445465593 */, 11 },
-  /*  167 */  { MAD_F(0x072f4c22) /* 0.449047217 */, 11 },
-  /*  168 */  { MAD_F(0x073dff3e) /* 0.452635998 */, 11 },
-  /*  169 */  { MAD_F(0x074cb9d3) /* 0.456231906 */, 11 },
-  /*  170 */  { MAD_F(0x075b7bdb) /* 0.459834914 */, 11 },
-  /*  171 */  { MAD_F(0x076a454c) /* 0.463444993 */, 11 },
-  /*  172 */  { MAD_F(0x07791620) /* 0.467062117 */, 11 },
-  /*  173 */  { MAD_F(0x0787ee50) /* 0.470686258 */, 11 },
-  /*  174 */  { MAD_F(0x0796cdd4) /* 0.474317388 */, 11 },
-  /*  175 */  { MAD_F(0x07a5b4a5) /* 0.477955481 */, 11 },
-
-  /*  176 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */, 11 },
-  /*  177 */  { MAD_F(0x07c39812) /* 0.485252449 */, 11 },
-  /*  178 */  { MAD_F(0x07d294a0) /* 0.488911273 */, 11 },
-  /*  179 */  { MAD_F(0x07e1985f) /* 0.492576954 */, 11 },
-  /*  180 */  { MAD_F(0x07f0a348) /* 0.496249468 */, 11 },
-  /*  181 */  { MAD_F(0x07ffb554) /* 0.499928790 */, 11 },
-  /*  182 */  { MAD_F(0x0407673f) /* 0.251807447 */, 12 },
-  /*  183 */  { MAD_F(0x040ef75e) /* 0.253653877 */, 12 },
-  /*  184 */  { MAD_F(0x04168b05) /* 0.255503674 */, 12 },
-  /*  185 */  { MAD_F(0x041e2230) /* 0.257356825 */, 12 },
-  /*  186 */  { MAD_F(0x0425bcdd) /* 0.259213318 */, 12 },
-  /*  187 */  { MAD_F(0x042d5b07) /* 0.261073141 */, 12 },
-  /*  188 */  { MAD_F(0x0434fcad) /* 0.262936282 */, 12 },
-  /*  189 */  { MAD_F(0x043ca1c9) /* 0.264802730 */, 12 },
-  /*  190 */  { MAD_F(0x04444a5a) /* 0.266672472 */, 12 },
-  /*  191 */  { MAD_F(0x044bf65d) /* 0.268545497 */, 12 },
-
-  /*  192 */  { MAD_F(0x0453a5cd) /* 0.270421794 */, 12 },
-  /*  193 */  { MAD_F(0x045b58a9) /* 0.272301352 */, 12 },
-  /*  194 */  { MAD_F(0x04630eed) /* 0.274184158 */, 12 },
-  /*  195 */  { MAD_F(0x046ac896) /* 0.276070203 */, 12 },
-  /*  196 */  { MAD_F(0x047285a2) /* 0.277959474 */, 12 },
-  /*  197 */  { MAD_F(0x047a460c) /* 0.279851960 */, 12 },
-  /*  198 */  { MAD_F(0x048209d3) /* 0.281747652 */, 12 },
-  /*  199 */  { MAD_F(0x0489d0f4) /* 0.283646538 */, 12 },
-  /*  200 */  { MAD_F(0x04919b6a) /* 0.285548607 */, 12 },
-  /*  201 */  { MAD_F(0x04996935) /* 0.287453849 */, 12 },
-  /*  202 */  { MAD_F(0x04a13a50) /* 0.289362253 */, 12 },
-  /*  203 */  { MAD_F(0x04a90eba) /* 0.291273810 */, 12 },
-  /*  204 */  { MAD_F(0x04b0e66e) /* 0.293188507 */, 12 },
-  /*  205 */  { MAD_F(0x04b8c16c) /* 0.295106336 */, 12 },
-  /*  206 */  { MAD_F(0x04c09faf) /* 0.297027285 */, 12 },
-  /*  207 */  { MAD_F(0x04c88135) /* 0.298951346 */, 12 },
-
-  /*  208 */  { MAD_F(0x04d065fb) /* 0.300878507 */, 12 },
-  /*  209 */  { MAD_F(0x04d84dff) /* 0.302808759 */, 12 },
-  /*  210 */  { MAD_F(0x04e0393e) /* 0.304742092 */, 12 },
-  /*  211 */  { MAD_F(0x04e827b6) /* 0.306678497 */, 12 },
-  /*  212 */  { MAD_F(0x04f01963) /* 0.308617963 */, 12 },
-  /*  213 */  { MAD_F(0x04f80e44) /* 0.310560480 */, 12 },
-  /*  214 */  { MAD_F(0x05000655) /* 0.312506041 */, 12 },
-  /*  215 */  { MAD_F(0x05080195) /* 0.314454634 */, 12 },
-  /*  216 */  { MAD_F(0x05100000) /* 0.316406250 */, 12 },
-  /*  217 */  { MAD_F(0x05180194) /* 0.318360880 */, 12 },
-  /*  218 */  { MAD_F(0x0520064f) /* 0.320318516 */, 12 },
-  /*  219 */  { MAD_F(0x05280e2d) /* 0.322279147 */, 12 },
-  /*  220 */  { MAD_F(0x0530192e) /* 0.324242764 */, 12 },
-  /*  221 */  { MAD_F(0x0538274e) /* 0.326209359 */, 12 },
-  /*  222 */  { MAD_F(0x0540388a) /* 0.328178922 */, 12 },
-  /*  223 */  { MAD_F(0x05484ce2) /* 0.330151445 */, 12 },
-
-  /*  224 */  { MAD_F(0x05506451) /* 0.332126919 */, 12 },
-  /*  225 */  { MAD_F(0x05587ed5) /* 0.334105334 */, 12 },
-  /*  226 */  { MAD_F(0x05609c6e) /* 0.336086683 */, 12 },
-  /*  227 */  { MAD_F(0x0568bd17) /* 0.338070956 */, 12 },
-  /*  228 */  { MAD_F(0x0570e0cf) /* 0.340058145 */, 12 },
-  /*  229 */  { MAD_F(0x05790793) /* 0.342048241 */, 12 },
-  /*  230 */  { MAD_F(0x05813162) /* 0.344041237 */, 12 },
-  /*  231 */  { MAD_F(0x05895e39) /* 0.346037122 */, 12 },
-  /*  232 */  { MAD_F(0x05918e15) /* 0.348035890 */, 12 },
-  /*  233 */  { MAD_F(0x0599c0f4) /* 0.350037532 */, 12 },
-  /*  234 */  { MAD_F(0x05a1f6d5) /* 0.352042040 */, 12 },
-  /*  235 */  { MAD_F(0x05aa2fb5) /* 0.354049405 */, 12 },
-  /*  236 */  { MAD_F(0x05b26b92) /* 0.356059619 */, 12 },
-  /*  237 */  { MAD_F(0x05baaa69) /* 0.358072674 */, 12 },
-  /*  238 */  { MAD_F(0x05c2ec39) /* 0.360088563 */, 12 },
-  /*  239 */  { MAD_F(0x05cb3100) /* 0.362107278 */, 12 },
-
-  /*  240 */  { MAD_F(0x05d378bb) /* 0.364128809 */, 12 },
-  /*  241 */  { MAD_F(0x05dbc368) /* 0.366153151 */, 12 },
-  /*  242 */  { MAD_F(0x05e41105) /* 0.368180294 */, 12 },
-  /*  243 */  { MAD_F(0x05ec6190) /* 0.370210231 */, 12 },
-  /*  244 */  { MAD_F(0x05f4b507) /* 0.372242955 */, 12 },
-  /*  245 */  { MAD_F(0x05fd0b68) /* 0.374278458 */, 12 },
-  /*  246 */  { MAD_F(0x060564b1) /* 0.376316732 */, 12 },
-  /*  247 */  { MAD_F(0x060dc0e0) /* 0.378357769 */, 12 },
-  /*  248 */  { MAD_F(0x06161ff3) /* 0.380401563 */, 12 },
-  /*  249 */  { MAD_F(0x061e81e8) /* 0.382448106 */, 12 },
-  /*  250 */  { MAD_F(0x0626e6bc) /* 0.384497391 */, 12 },
-  /*  251 */  { MAD_F(0x062f4e6f) /* 0.386549409 */, 12 },
-  /*  252 */  { MAD_F(0x0637b8fd) /* 0.388604155 */, 12 },
-  /*  253 */  { MAD_F(0x06402666) /* 0.390661620 */, 12 },
-  /*  254 */  { MAD_F(0x064896a7) /* 0.392721798 */, 12 },
-  /*  255 */  { MAD_F(0x065109be) /* 0.394784681 */, 12 },
-
-  /*  256 */  { MAD_F(0x06597fa9) /* 0.396850263 */, 12 },
-  /*  257 */  { MAD_F(0x0661f867) /* 0.398918536 */, 12 },
-  /*  258 */  { MAD_F(0x066a73f5) /* 0.400989493 */, 12 },
-  /*  259 */  { MAD_F(0x0672f252) /* 0.403063128 */, 12 },
-  /*  260 */  { MAD_F(0x067b737c) /* 0.405139433 */, 12 },
-  /*  261 */  { MAD_F(0x0683f771) /* 0.407218402 */, 12 },
-  /*  262 */  { MAD_F(0x068c7e2f) /* 0.409300027 */, 12 },
-  /*  263 */  { MAD_F(0x069507b5) /* 0.411384303 */, 12 },
-  /*  264 */  { MAD_F(0x069d9400) /* 0.413471222 */, 12 },
-  /*  265 */  { MAD_F(0x06a6230f) /* 0.415560778 */, 12 },
-  /*  266 */  { MAD_F(0x06aeb4e0) /* 0.417652964 */, 12 },
-  /*  267 */  { MAD_F(0x06b74971) /* 0.419747773 */, 12 },
-  /*  268 */  { MAD_F(0x06bfe0c0) /* 0.421845199 */, 12 },
-  /*  269 */  { MAD_F(0x06c87acc) /* 0.423945235 */, 12 },
-  /*  270 */  { MAD_F(0x06d11794) /* 0.426047876 */, 12 },
-  /*  271 */  { MAD_F(0x06d9b714) /* 0.428153114 */, 12 },
-
-  /*  272 */  { MAD_F(0x06e2594c) /* 0.430260942 */, 12 },
-  /*  273 */  { MAD_F(0x06eafe3a) /* 0.432371356 */, 12 },
-  /*  274 */  { MAD_F(0x06f3a5dc) /* 0.434484348 */, 12 },
-  /*  275 */  { MAD_F(0x06fc5030) /* 0.436599912 */, 12 },
-  /*  276 */  { MAD_F(0x0704fd35) /* 0.438718042 */, 12 },
-  /*  277 */  { MAD_F(0x070dacea) /* 0.440838732 */, 12 },
-  /*  278 */  { MAD_F(0x07165f4b) /* 0.442961975 */, 12 },
-  /*  279 */  { MAD_F(0x071f1459) /* 0.445087765 */, 12 },
-  /*  280 */  { MAD_F(0x0727cc11) /* 0.447216097 */, 12 },
-  /*  281 */  { MAD_F(0x07308671) /* 0.449346964 */, 12 },
-  /*  282 */  { MAD_F(0x07394378) /* 0.451480360 */, 12 },
-  /*  283 */  { MAD_F(0x07420325) /* 0.453616280 */, 12 },
-  /*  284 */  { MAD_F(0x074ac575) /* 0.455754717 */, 12 },
-  /*  285 */  { MAD_F(0x07538a67) /* 0.457895665 */, 12 },
-  /*  286 */  { MAD_F(0x075c51fa) /* 0.460039119 */, 12 },
-  /*  287 */  { MAD_F(0x07651c2c) /* 0.462185072 */, 12 },
-
-  /*  288 */  { MAD_F(0x076de8fc) /* 0.464333519 */, 12 },
-  /*  289 */  { MAD_F(0x0776b867) /* 0.466484455 */, 12 },
-  /*  290 */  { MAD_F(0x077f8a6d) /* 0.468637872 */, 12 },
-  /*  291 */  { MAD_F(0x07885f0b) /* 0.470793767 */, 12 },
-  /*  292 */  { MAD_F(0x07913641) /* 0.472952132 */, 12 },
-  /*  293 */  { MAD_F(0x079a100c) /* 0.475112962 */, 12 },
-  /*  294 */  { MAD_F(0x07a2ec6c) /* 0.477276252 */, 12 },
-  /*  295 */  { MAD_F(0x07abcb5f) /* 0.479441997 */, 12 },
-  /*  296 */  { MAD_F(0x07b4ace3) /* 0.481610189 */, 12 },
-  /*  297 */  { MAD_F(0x07bd90f6) /* 0.483780825 */, 12 },
-  /*  298 */  { MAD_F(0x07c67798) /* 0.485953899 */, 12 },
-  /*  299 */  { MAD_F(0x07cf60c7) /* 0.488129404 */, 12 },
-  /*  300 */  { MAD_F(0x07d84c81) /* 0.490307336 */, 12 },
-  /*  301 */  { MAD_F(0x07e13ac5) /* 0.492487690 */, 12 },
-  /*  302 */  { MAD_F(0x07ea2b92) /* 0.494670459 */, 12 },
-  /*  303 */  { MAD_F(0x07f31ee6) /* 0.496855639 */, 12 },
-
-  /*  304 */  { MAD_F(0x07fc14bf) /* 0.499043224 */, 12 },
-  /*  305 */  { MAD_F(0x0402868e) /* 0.250616605 */, 13 },
-  /*  306 */  { MAD_F(0x040703ff) /* 0.251712795 */, 13 },
-  /*  307 */  { MAD_F(0x040b82b0) /* 0.252810180 */, 13 },
-  /*  308 */  { MAD_F(0x041002a1) /* 0.253908756 */, 13 },
-  /*  309 */  { MAD_F(0x041483d1) /* 0.255008523 */, 13 },
-  /*  310 */  { MAD_F(0x04190640) /* 0.256109476 */, 13 },
-  /*  311 */  { MAD_F(0x041d89ed) /* 0.257211614 */, 13 },
-  /*  312 */  { MAD_F(0x04220ed7) /* 0.258314934 */, 13 },
-  /*  313 */  { MAD_F(0x042694fe) /* 0.259419433 */, 13 },
-  /*  314 */  { MAD_F(0x042b1c60) /* 0.260525110 */, 13 },
-  /*  315 */  { MAD_F(0x042fa4fe) /* 0.261631960 */, 13 },
-  /*  316 */  { MAD_F(0x04342ed7) /* 0.262739982 */, 13 },
-  /*  317 */  { MAD_F(0x0438b9e9) /* 0.263849174 */, 13 },
-  /*  318 */  { MAD_F(0x043d4635) /* 0.264959533 */, 13 },
-  /*  319 */  { MAD_F(0x0441d3b9) /* 0.266071056 */, 13 },
-
-  /*  320 */  { MAD_F(0x04466275) /* 0.267183742 */, 13 },
-  /*  321 */  { MAD_F(0x044af269) /* 0.268297587 */, 13 },
-  /*  322 */  { MAD_F(0x044f8393) /* 0.269412589 */, 13 },
-  /*  323 */  { MAD_F(0x045415f3) /* 0.270528746 */, 13 },
-  /*  324 */  { MAD_F(0x0458a989) /* 0.271646056 */, 13 },
-  /*  325 */  { MAD_F(0x045d3e53) /* 0.272764515 */, 13 },
-  /*  326 */  { MAD_F(0x0461d451) /* 0.273884123 */, 13 },
-  /*  327 */  { MAD_F(0x04666b83) /* 0.275004875 */, 13 },
-  /*  328 */  { MAD_F(0x046b03e7) /* 0.276126771 */, 13 },
-  /*  329 */  { MAD_F(0x046f9d7e) /* 0.277249808 */, 13 },
-  /*  330 */  { MAD_F(0x04743847) /* 0.278373983 */, 13 },
-  /*  331 */  { MAD_F(0x0478d440) /* 0.279499294 */, 13 },
-  /*  332 */  { MAD_F(0x047d716a) /* 0.280625739 */, 13 },
-  /*  333 */  { MAD_F(0x04820fc3) /* 0.281753315 */, 13 },
-  /*  334 */  { MAD_F(0x0486af4c) /* 0.282882021 */, 13 },
-  /*  335 */  { MAD_F(0x048b5003) /* 0.284011853 */, 13 },
-
-  /*  336 */  { MAD_F(0x048ff1e8) /* 0.285142811 */, 13 },
-  /*  337 */  { MAD_F(0x049494fb) /* 0.286274891 */, 13 },
-  /*  338 */  { MAD_F(0x0499393a) /* 0.287408091 */, 13 },
-  /*  339 */  { MAD_F(0x049ddea5) /* 0.288542409 */, 13 },
-  /*  340 */  { MAD_F(0x04a2853c) /* 0.289677844 */, 13 },
-  /*  341 */  { MAD_F(0x04a72cfe) /* 0.290814392 */, 13 },
-  /*  342 */  { MAD_F(0x04abd5ea) /* 0.291952051 */, 13 },
-  /*  343 */  { MAD_F(0x04b08000) /* 0.293090820 */, 13 },
-  /*  344 */  { MAD_F(0x04b52b3f) /* 0.294230696 */, 13 },
-  /*  345 */  { MAD_F(0x04b9d7a7) /* 0.295371678 */, 13 },
-  /*  346 */  { MAD_F(0x04be8537) /* 0.296513762 */, 13 },
-  /*  347 */  { MAD_F(0x04c333ee) /* 0.297656947 */, 13 },
-  /*  348 */  { MAD_F(0x04c7e3cc) /* 0.298801231 */, 13 },
-  /*  349 */  { MAD_F(0x04cc94d1) /* 0.299946611 */, 13 },
-  /*  350 */  { MAD_F(0x04d146fb) /* 0.301093085 */, 13 },
-  /*  351 */  { MAD_F(0x04d5fa4b) /* 0.302240653 */, 13 },
-
-  /*  352 */  { MAD_F(0x04daaec0) /* 0.303389310 */, 13 },
-  /*  353 */  { MAD_F(0x04df6458) /* 0.304539056 */, 13 },
-  /*  354 */  { MAD_F(0x04e41b14) /* 0.305689888 */, 13 },
-  /*  355 */  { MAD_F(0x04e8d2f3) /* 0.306841804 */, 13 },
-  /*  356 */  { MAD_F(0x04ed8bf5) /* 0.307994802 */, 13 },
-  /*  357 */  { MAD_F(0x04f24618) /* 0.309148880 */, 13 },
-  /*  358 */  { MAD_F(0x04f7015d) /* 0.310304037 */, 13 },
-  /*  359 */  { MAD_F(0x04fbbdc3) /* 0.311460269 */, 13 },
-  /*  360 */  { MAD_F(0x05007b49) /* 0.312617576 */, 13 },
-  /*  361 */  { MAD_F(0x050539ef) /* 0.313775954 */, 13 },
-  /*  362 */  { MAD_F(0x0509f9b4) /* 0.314935403 */, 13 },
-  /*  363 */  { MAD_F(0x050eba98) /* 0.316095920 */, 13 },
-  /*  364 */  { MAD_F(0x05137c9a) /* 0.317257503 */, 13 },
-  /*  365 */  { MAD_F(0x05183fba) /* 0.318420150 */, 13 },
-  /*  366 */  { MAD_F(0x051d03f7) /* 0.319583859 */, 13 },
-  /*  367 */  { MAD_F(0x0521c950) /* 0.320748629 */, 13 },
-
-  /*  368 */  { MAD_F(0x05268fc6) /* 0.321914457 */, 13 },
-  /*  369 */  { MAD_F(0x052b5757) /* 0.323081342 */, 13 },
-  /*  370 */  { MAD_F(0x05302003) /* 0.324249281 */, 13 },
-  /*  371 */  { MAD_F(0x0534e9ca) /* 0.325418273 */, 13 },
-  /*  372 */  { MAD_F(0x0539b4ab) /* 0.326588316 */, 13 },
-  /*  373 */  { MAD_F(0x053e80a6) /* 0.327759407 */, 13 },
-  /*  374 */  { MAD_F(0x05434db9) /* 0.328931546 */, 13 },
-  /*  375 */  { MAD_F(0x05481be5) /* 0.330104730 */, 13 },
-  /*  376 */  { MAD_F(0x054ceb2a) /* 0.331278957 */, 13 },
-  /*  377 */  { MAD_F(0x0551bb85) /* 0.332454225 */, 13 },
-  /*  378 */  { MAD_F(0x05568cf8) /* 0.333630533 */, 13 },
-  /*  379 */  { MAD_F(0x055b5f81) /* 0.334807879 */, 13 },
-  /*  380 */  { MAD_F(0x05603321) /* 0.335986261 */, 13 },
-  /*  381 */  { MAD_F(0x056507d6) /* 0.337165677 */, 13 },
-  /*  382 */  { MAD_F(0x0569dda0) /* 0.338346125 */, 13 },
-  /*  383 */  { MAD_F(0x056eb47f) /* 0.339527604 */, 13 },
-
-  /*  384 */  { MAD_F(0x05738c72) /* 0.340710111 */, 13 },
-  /*  385 */  { MAD_F(0x05786578) /* 0.341893646 */, 13 },
-  /*  386 */  { MAD_F(0x057d3f92) /* 0.343078205 */, 13 },
-  /*  387 */  { MAD_F(0x05821abf) /* 0.344263788 */, 13 },
-  /*  388 */  { MAD_F(0x0586f6fd) /* 0.345450393 */, 13 },
-  /*  389 */  { MAD_F(0x058bd44e) /* 0.346638017 */, 13 },
-  /*  390 */  { MAD_F(0x0590b2b0) /* 0.347826659 */, 13 },
-  /*  391 */  { MAD_F(0x05959222) /* 0.349016318 */, 13 },
-  /*  392 */  { MAD_F(0x059a72a5) /* 0.350206992 */, 13 },
-  /*  393 */  { MAD_F(0x059f5438) /* 0.351398678 */, 13 },
-  /*  394 */  { MAD_F(0x05a436da) /* 0.352591376 */, 13 },
-  /*  395 */  { MAD_F(0x05a91a8c) /* 0.353785083 */, 13 },
-  /*  396 */  { MAD_F(0x05adff4c) /* 0.354979798 */, 13 },
-  /*  397 */  { MAD_F(0x05b2e51a) /* 0.356175519 */, 13 },
-  /*  398 */  { MAD_F(0x05b7cbf5) /* 0.357372244 */, 13 },
-  /*  399 */  { MAD_F(0x05bcb3de) /* 0.358569972 */, 13 },
-
-  /*  400 */  { MAD_F(0x05c19cd3) /* 0.359768701 */, 13 },
-  /*  401 */  { MAD_F(0x05c686d5) /* 0.360968429 */, 13 },
-  /*  402 */  { MAD_F(0x05cb71e2) /* 0.362169156 */, 13 },
-  /*  403 */  { MAD_F(0x05d05dfb) /* 0.363370878 */, 13 },
-  /*  404 */  { MAD_F(0x05d54b1f) /* 0.364573594 */, 13 },
-  /*  405 */  { MAD_F(0x05da394d) /* 0.365777304 */, 13 },
-  /*  406 */  { MAD_F(0x05df2885) /* 0.366982004 */, 13 },
-  /*  407 */  { MAD_F(0x05e418c7) /* 0.368187694 */, 13 },
-  /*  408 */  { MAD_F(0x05e90a12) /* 0.369394372 */, 13 },
-  /*  409 */  { MAD_F(0x05edfc66) /* 0.370602036 */, 13 },
-  /*  410 */  { MAD_F(0x05f2efc2) /* 0.371810684 */, 13 },
-  /*  411 */  { MAD_F(0x05f7e426) /* 0.373020316 */, 13 },
-  /*  412 */  { MAD_F(0x05fcd992) /* 0.374230929 */, 13 },
-  /*  413 */  { MAD_F(0x0601d004) /* 0.375442522 */, 13 },
-  /*  414 */  { MAD_F(0x0606c77d) /* 0.376655093 */, 13 },
-  /*  415 */  { MAD_F(0x060bbffd) /* 0.377868641 */, 13 },
-
-  /*  416 */  { MAD_F(0x0610b982) /* 0.379083164 */, 13 },
-  /*  417 */  { MAD_F(0x0615b40c) /* 0.380298661 */, 13 },
-  /*  418 */  { MAD_F(0x061aaf9c) /* 0.381515130 */, 13 },
-  /*  419 */  { MAD_F(0x061fac2f) /* 0.382732569 */, 13 },
-  /*  420 */  { MAD_F(0x0624a9c7) /* 0.383950977 */, 13 },
-  /*  421 */  { MAD_F(0x0629a863) /* 0.385170352 */, 13 },
-  /*  422 */  { MAD_F(0x062ea802) /* 0.386390694 */, 13 },
-  /*  423 */  { MAD_F(0x0633a8a3) /* 0.387611999 */, 13 },
-  /*  424 */  { MAD_F(0x0638aa48) /* 0.388834268 */, 13 },
-  /*  425 */  { MAD_F(0x063dacee) /* 0.390057497 */, 13 },
-  /*  426 */  { MAD_F(0x0642b096) /* 0.391281687 */, 13 },
-  /*  427 */  { MAD_F(0x0647b53f) /* 0.392506834 */, 13 },
-  /*  428 */  { MAD_F(0x064cbae9) /* 0.393732939 */, 13 },
-  /*  429 */  { MAD_F(0x0651c193) /* 0.394959999 */, 13 },
-  /*  430 */  { MAD_F(0x0656c93d) /* 0.396188012 */, 13 },
-  /*  431 */  { MAD_F(0x065bd1e7) /* 0.397416978 */, 13 },
-
-  /*  432 */  { MAD_F(0x0660db91) /* 0.398646895 */, 13 },
-  /*  433 */  { MAD_F(0x0665e639) /* 0.399877761 */, 13 },
-  /*  434 */  { MAD_F(0x066af1df) /* 0.401109575 */, 13 },
-  /*  435 */  { MAD_F(0x066ffe84) /* 0.402342335 */, 13 },
-  /*  436 */  { MAD_F(0x06750c26) /* 0.403576041 */, 13 },
-  /*  437 */  { MAD_F(0x067a1ac6) /* 0.404810690 */, 13 },
-  /*  438 */  { MAD_F(0x067f2a62) /* 0.406046281 */, 13 },
-  /*  439 */  { MAD_F(0x06843afb) /* 0.407282813 */, 13 },
-  /*  440 */  { MAD_F(0x06894c90) /* 0.408520284 */, 13 },
-  /*  441 */  { MAD_F(0x068e5f21) /* 0.409758693 */, 13 },
-  /*  442 */  { MAD_F(0x069372ae) /* 0.410998038 */, 13 },
-  /*  443 */  { MAD_F(0x06988735) /* 0.412238319 */, 13 },
-  /*  444 */  { MAD_F(0x069d9cb7) /* 0.413479532 */, 13 },
-  /*  445 */  { MAD_F(0x06a2b333) /* 0.414721679 */, 13 },
-  /*  446 */  { MAD_F(0x06a7caa9) /* 0.415964756 */, 13 },
-  /*  447 */  { MAD_F(0x06ace318) /* 0.417208762 */, 13 },
-
-  /*  448 */  { MAD_F(0x06b1fc81) /* 0.418453696 */, 13 },
-  /*  449 */  { MAD_F(0x06b716e2) /* 0.419699557 */, 13 },
-  /*  450 */  { MAD_F(0x06bc323b) /* 0.420946343 */, 13 },
-  /*  451 */  { MAD_F(0x06c14e8d) /* 0.422194054 */, 13 },
-  /*  452 */  { MAD_F(0x06c66bd6) /* 0.423442686 */, 13 },
-  /*  453 */  { MAD_F(0x06cb8a17) /* 0.424692240 */, 13 },
-  /*  454 */  { MAD_F(0x06d0a94e) /* 0.425942714 */, 13 },
-  /*  455 */  { MAD_F(0x06d5c97c) /* 0.427194106 */, 13 },
-  /*  456 */  { MAD_F(0x06daeaa1) /* 0.428446415 */, 13 },
-  /*  457 */  { MAD_F(0x06e00cbb) /* 0.429699640 */, 13 },
-  /*  458 */  { MAD_F(0x06e52fca) /* 0.430953779 */, 13 },
-  /*  459 */  { MAD_F(0x06ea53cf) /* 0.432208832 */, 13 },
-  /*  460 */  { MAD_F(0x06ef78c8) /* 0.433464796 */, 13 },
-  /*  461 */  { MAD_F(0x06f49eb6) /* 0.434721671 */, 13 },
-  /*  462 */  { MAD_F(0x06f9c597) /* 0.435979455 */, 13 },
-  /*  463 */  { MAD_F(0x06feed6d) /* 0.437238146 */, 13 },
-
-  /*  464 */  { MAD_F(0x07041636) /* 0.438497744 */, 13 },
-  /*  465 */  { MAD_F(0x07093ff2) /* 0.439758248 */, 13 },
-  /*  466 */  { MAD_F(0x070e6aa0) /* 0.441019655 */, 13 },
-  /*  467 */  { MAD_F(0x07139641) /* 0.442281965 */, 13 },
-  /*  468 */  { MAD_F(0x0718c2d3) /* 0.443545176 */, 13 },
-  /*  469 */  { MAD_F(0x071df058) /* 0.444809288 */, 13 },
-  /*  470 */  { MAD_F(0x07231ecd) /* 0.446074298 */, 13 },
-  /*  471 */  { MAD_F(0x07284e34) /* 0.447340205 */, 13 },
-  /*  472 */  { MAD_F(0x072d7e8b) /* 0.448607009 */, 13 },
-  /*  473 */  { MAD_F(0x0732afd2) /* 0.449874708 */, 13 },
-  /*  474 */  { MAD_F(0x0737e209) /* 0.451143300 */, 13 },
-  /*  475 */  { MAD_F(0x073d1530) /* 0.452412785 */, 13 },
-  /*  476 */  { MAD_F(0x07424946) /* 0.453683161 */, 13 },
-  /*  477 */  { MAD_F(0x07477e4b) /* 0.454954427 */, 13 },
-  /*  478 */  { MAD_F(0x074cb43e) /* 0.456226581 */, 13 },
-  /*  479 */  { MAD_F(0x0751eb20) /* 0.457499623 */, 13 },
-
-  /*  480 */  { MAD_F(0x075722ef) /* 0.458773552 */, 13 },
-  /*  481 */  { MAD_F(0x075c5bac) /* 0.460048365 */, 13 },
-  /*  482 */  { MAD_F(0x07619557) /* 0.461324062 */, 13 },
-  /*  483 */  { MAD_F(0x0766cfee) /* 0.462600642 */, 13 },
-  /*  484 */  { MAD_F(0x076c0b72) /* 0.463878102 */, 13 },
-  /*  485 */  { MAD_F(0x077147e2) /* 0.465156443 */, 13 },
-  /*  486 */  { MAD_F(0x0776853e) /* 0.466435663 */, 13 },
-  /*  487 */  { MAD_F(0x077bc385) /* 0.467715761 */, 13 },
-  /*  488 */  { MAD_F(0x078102b8) /* 0.468996735 */, 13 },
-  /*  489 */  { MAD_F(0x078642d6) /* 0.470278584 */, 13 },
-  /*  490 */  { MAD_F(0x078b83de) /* 0.471561307 */, 13 },
-  /*  491 */  { MAD_F(0x0790c5d1) /* 0.472844904 */, 13 },
-  /*  492 */  { MAD_F(0x079608ae) /* 0.474129372 */, 13 },
-  /*  493 */  { MAD_F(0x079b4c74) /* 0.475414710 */, 13 },
-  /*  494 */  { MAD_F(0x07a09124) /* 0.476700918 */, 13 },
-  /*  495 */  { MAD_F(0x07a5d6bd) /* 0.477987994 */, 13 },
-
-  /*  496 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */, 13 },
-  /*  497 */  { MAD_F(0x07b064a8) /* 0.480564746 */, 13 },
-  /*  498 */  { MAD_F(0x07b5acfb) /* 0.481854420 */, 13 },
-  /*  499 */  { MAD_F(0x07baf635) /* 0.483144957 */, 13 },
-  /*  500 */  { MAD_F(0x07c04056) /* 0.484436356 */, 13 },
-  /*  501 */  { MAD_F(0x07c58b5f) /* 0.485728617 */, 13 },
-  /*  502 */  { MAD_F(0x07cad74e) /* 0.487021738 */, 13 },
-  /*  503 */  { MAD_F(0x07d02424) /* 0.488315717 */, 13 },
-  /*  504 */  { MAD_F(0x07d571e0) /* 0.489610555 */, 13 },
-  /*  505 */  { MAD_F(0x07dac083) /* 0.490906249 */, 13 },
-  /*  506 */  { MAD_F(0x07e0100a) /* 0.492202799 */, 13 },
-  /*  507 */  { MAD_F(0x07e56078) /* 0.493500203 */, 13 },
-  /*  508 */  { MAD_F(0x07eab1ca) /* 0.494798460 */, 13 },
-  /*  509 */  { MAD_F(0x07f00401) /* 0.496097570 */, 13 },
-  /*  510 */  { MAD_F(0x07f5571d) /* 0.497397530 */, 13 },
-  /*  511 */  { MAD_F(0x07faab1c) /* 0.498698341 */, 13 },
-
-  /*  512 */  { MAD_F(0x04000000) /* 0.250000000 */, 14 },
-  /*  513 */  { MAD_F(0x0402aae3) /* 0.250651254 */, 14 },
-  /*  514 */  { MAD_F(0x04055638) /* 0.251302930 */, 14 },
-  /*  515 */  { MAD_F(0x040801ff) /* 0.251955030 */, 14 },
-  /*  516 */  { MAD_F(0x040aae37) /* 0.252607552 */, 14 },
-  /*  517 */  { MAD_F(0x040d5ae0) /* 0.253260495 */, 14 },
-  /*  518 */  { MAD_F(0x041007fa) /* 0.253913860 */, 14 },
-  /*  519 */  { MAD_F(0x0412b586) /* 0.254567645 */, 14 },
-  /*  520 */  { MAD_F(0x04156381) /* 0.255221850 */, 14 },
-  /*  521 */  { MAD_F(0x041811ee) /* 0.255876475 */, 14 },
-  /*  522 */  { MAD_F(0x041ac0cb) /* 0.256531518 */, 14 },
-  /*  523 */  { MAD_F(0x041d7018) /* 0.257186980 */, 14 },
-  /*  524 */  { MAD_F(0x04201fd5) /* 0.257842860 */, 14 },
-  /*  525 */  { MAD_F(0x0422d003) /* 0.258499157 */, 14 },
-  /*  526 */  { MAD_F(0x042580a0) /* 0.259155872 */, 14 },
-  /*  527 */  { MAD_F(0x042831ad) /* 0.259813002 */, 14 },
-
-  /*  528 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 14 },
-  /*  529 */  { MAD_F(0x042d9516) /* 0.261128510 */, 14 },
-  /*  530 */  { MAD_F(0x04304772) /* 0.261786886 */, 14 },
-  /*  531 */  { MAD_F(0x0432fa3d) /* 0.262445676 */, 14 },
-  /*  532 */  { MAD_F(0x0435ad76) /* 0.263104880 */, 14 },
-  /*  533 */  { MAD_F(0x0438611f) /* 0.263764497 */, 14 },
-  /*  534 */  { MAD_F(0x043b1536) /* 0.264424527 */, 14 },
-  /*  535 */  { MAD_F(0x043dc9bc) /* 0.265084969 */, 14 },
-  /*  536 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 14 },
-  /*  537 */  { MAD_F(0x04433414) /* 0.266407088 */, 14 },
-  /*  538 */  { MAD_F(0x0445e9e5) /* 0.267068763 */, 14 },
-  /*  539 */  { MAD_F(0x0448a024) /* 0.267730848 */, 14 },
-  /*  540 */  { MAD_F(0x044b56d1) /* 0.268393343 */, 14 },
-  /*  541 */  { MAD_F(0x044e0dec) /* 0.269056248 */, 14 },
-  /*  542 */  { MAD_F(0x0450c575) /* 0.269719560 */, 14 },
-  /*  543 */  { MAD_F(0x04537d6b) /* 0.270383281 */, 14 },
-
-  /*  544 */  { MAD_F(0x045635cf) /* 0.271047409 */, 14 },
-  /*  545 */  { MAD_F(0x0458ee9f) /* 0.271711944 */, 14 },
-  /*  546 */  { MAD_F(0x045ba7dd) /* 0.272376886 */, 14 },
-  /*  547 */  { MAD_F(0x045e6188) /* 0.273042234 */, 14 },
-  /*  548 */  { MAD_F(0x04611ba0) /* 0.273707988 */, 14 },
-  /*  549 */  { MAD_F(0x0463d625) /* 0.274374147 */, 14 },
-  /*  550 */  { MAD_F(0x04669116) /* 0.275040710 */, 14 },
-  /*  551 */  { MAD_F(0x04694c74) /* 0.275707677 */, 14 },
-  /*  552 */  { MAD_F(0x046c083e) /* 0.276375048 */, 14 },
-  /*  553 */  { MAD_F(0x046ec474) /* 0.277042822 */, 14 },
-  /*  554 */  { MAD_F(0x04718116) /* 0.277710999 */, 14 },
-  /*  555 */  { MAD_F(0x04743e25) /* 0.278379578 */, 14 },
-  /*  556 */  { MAD_F(0x0476fb9f) /* 0.279048558 */, 14 },
-  /*  557 */  { MAD_F(0x0479b984) /* 0.279717940 */, 14 },
-  /*  558 */  { MAD_F(0x047c77d6) /* 0.280387722 */, 14 },
-  /*  559 */  { MAD_F(0x047f3693) /* 0.281057905 */, 14 },
-
-  /*  560 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 14 },
-  /*  561 */  { MAD_F(0x0484b54e) /* 0.282399469 */, 14 },
-  /*  562 */  { MAD_F(0x0487754c) /* 0.283070849 */, 14 },
-  /*  563 */  { MAD_F(0x048a35b6) /* 0.283742628 */, 14 },
-  /*  564 */  { MAD_F(0x048cf68a) /* 0.284414805 */, 14 },
-  /*  565 */  { MAD_F(0x048fb7c8) /* 0.285087379 */, 14 },
-  /*  566 */  { MAD_F(0x04927972) /* 0.285760350 */, 14 },
-  /*  567 */  { MAD_F(0x04953b85) /* 0.286433717 */, 14 },
-  /*  568 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 14 },
-  /*  569 */  { MAD_F(0x049ac0eb) /* 0.287781640 */, 14 },
-  /*  570 */  { MAD_F(0x049d843e) /* 0.288456194 */, 14 },
-  /*  571 */  { MAD_F(0x04a047fa) /* 0.289131142 */, 14 },
-  /*  572 */  { MAD_F(0x04a30c20) /* 0.289806485 */, 14 },
-  /*  573 */  { MAD_F(0x04a5d0af) /* 0.290482221 */, 14 },
-  /*  574 */  { MAD_F(0x04a895a8) /* 0.291158351 */, 14 },
-  /*  575 */  { MAD_F(0x04ab5b0b) /* 0.291834873 */, 14 },
-
-  /*  576 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 14 },
-  /*  577 */  { MAD_F(0x04b0e70c) /* 0.293189094 */, 14 },
-  /*  578 */  { MAD_F(0x04b3adaa) /* 0.293866792 */, 14 },
-  /*  579 */  { MAD_F(0x04b674b1) /* 0.294544881 */, 14 },
-  /*  580 */  { MAD_F(0x04b93c21) /* 0.295223360 */, 14 },
-  /*  581 */  { MAD_F(0x04bc03fa) /* 0.295902229 */, 14 },
-  /*  582 */  { MAD_F(0x04becc3b) /* 0.296581488 */, 14 },
-  /*  583 */  { MAD_F(0x04c194e4) /* 0.297261136 */, 14 },
-  /*  584 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 14 },
-  /*  585 */  { MAD_F(0x04c72771) /* 0.298621598 */, 14 },
-  /*  586 */  { MAD_F(0x04c9f153) /* 0.299302411 */, 14 },
-  /*  587 */  { MAD_F(0x04ccbb9d) /* 0.299983611 */, 14 },
-  /*  588 */  { MAD_F(0x04cf864f) /* 0.300665198 */, 14 },
-  /*  589 */  { MAD_F(0x04d25169) /* 0.301347172 */, 14 },
-  /*  590 */  { MAD_F(0x04d51ceb) /* 0.302029532 */, 14 },
-  /*  591 */  { MAD_F(0x04d7e8d4) /* 0.302712277 */, 14 },
-
-  /*  592 */  { MAD_F(0x04dab524) /* 0.303395408 */, 14 },
-  /*  593 */  { MAD_F(0x04dd81dc) /* 0.304078923 */, 14 },
-  /*  594 */  { MAD_F(0x04e04efb) /* 0.304762823 */, 14 },
-  /*  595 */  { MAD_F(0x04e31c81) /* 0.305447106 */, 14 },
-  /*  596 */  { MAD_F(0x04e5ea6e) /* 0.306131773 */, 14 },
-  /*  597 */  { MAD_F(0x04e8b8c2) /* 0.306816823 */, 14 },
-  /*  598 */  { MAD_F(0x04eb877c) /* 0.307502256 */, 14 },
-  /*  599 */  { MAD_F(0x04ee569d) /* 0.308188071 */, 14 },
-  /*  600 */  { MAD_F(0x04f12624) /* 0.308874267 */, 14 },
-  /*  601 */  { MAD_F(0x04f3f612) /* 0.309560845 */, 14 },
-  /*  602 */  { MAD_F(0x04f6c666) /* 0.310247804 */, 14 },
-  /*  603 */  { MAD_F(0x04f99721) /* 0.310935143 */, 14 },
-  /*  604 */  { MAD_F(0x04fc6841) /* 0.311622862 */, 14 },
-  /*  605 */  { MAD_F(0x04ff39c7) /* 0.312310961 */, 14 },
-  /*  606 */  { MAD_F(0x05020bb3) /* 0.312999439 */, 14 },
-  /*  607 */  { MAD_F(0x0504de05) /* 0.313688296 */, 14 },
-
-  /*  608 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 14 },
-  /*  609 */  { MAD_F(0x050a83d8) /* 0.315067145 */, 14 },
-  /*  610 */  { MAD_F(0x050d575b) /* 0.315757136 */, 14 },
-  /*  611 */  { MAD_F(0x05102b42) /* 0.316447504 */, 14 },
-  /*  612 */  { MAD_F(0x0512ff8e) /* 0.317138249 */, 14 },
-  /*  613 */  { MAD_F(0x0515d440) /* 0.317829370 */, 14 },
-  /*  614 */  { MAD_F(0x0518a956) /* 0.318520867 */, 14 },
-  /*  615 */  { MAD_F(0x051b7ed1) /* 0.319212739 */, 14 },
-  /*  616 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 14 },
-  /*  617 */  { MAD_F(0x05212af5) /* 0.320597609 */, 14 },
-  /*  618 */  { MAD_F(0x0524019e) /* 0.321290606 */, 14 },
-  /*  619 */  { MAD_F(0x0526d8ab) /* 0.321983976 */, 14 },
-  /*  620 */  { MAD_F(0x0529b01d) /* 0.322677720 */, 14 },
-  /*  621 */  { MAD_F(0x052c87f2) /* 0.323371837 */, 14 },
-  /*  622 */  { MAD_F(0x052f602c) /* 0.324066327 */, 14 },
-  /*  623 */  { MAD_F(0x053238ca) /* 0.324761189 */, 14 },
-
-  /*  624 */  { MAD_F(0x053511cb) /* 0.325456423 */, 14 },
-  /*  625 */  { MAD_F(0x0537eb30) /* 0.326152028 */, 14 },
-  /*  626 */  { MAD_F(0x053ac4f9) /* 0.326848005 */, 14 },
-  /*  627 */  { MAD_F(0x053d9f25) /* 0.327544352 */, 14 },
-  /*  628 */  { MAD_F(0x054079b5) /* 0.328241070 */, 14 },
-  /*  629 */  { MAD_F(0x054354a8) /* 0.328938157 */, 14 },
-  /*  630 */  { MAD_F(0x05462ffe) /* 0.329635614 */, 14 },
-  /*  631 */  { MAD_F(0x05490bb7) /* 0.330333440 */, 14 },
-  /*  632 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 14 },
-  /*  633 */  { MAD_F(0x054ec453) /* 0.331730198 */, 14 },
-  /*  634 */  { MAD_F(0x0551a134) /* 0.332429129 */, 14 },
-  /*  635 */  { MAD_F(0x05547e79) /* 0.333128427 */, 14 },
-  /*  636 */  { MAD_F(0x05575c20) /* 0.333828093 */, 14 },
-  /*  637 */  { MAD_F(0x055a3a2a) /* 0.334528126 */, 14 },
-  /*  638 */  { MAD_F(0x055d1896) /* 0.335228525 */, 14 },
-  /*  639 */  { MAD_F(0x055ff764) /* 0.335929290 */, 14 },
-
-  /*  640 */  { MAD_F(0x0562d694) /* 0.336630420 */, 14 },
-  /*  641 */  { MAD_F(0x0565b627) /* 0.337331916 */, 14 },
-  /*  642 */  { MAD_F(0x0568961b) /* 0.338033777 */, 14 },
-  /*  643 */  { MAD_F(0x056b7671) /* 0.338736002 */, 14 },
-  /*  644 */  { MAD_F(0x056e5729) /* 0.339438592 */, 14 },
-  /*  645 */  { MAD_F(0x05713843) /* 0.340141545 */, 14 },
-  /*  646 */  { MAD_F(0x057419be) /* 0.340844862 */, 14 },
-  /*  647 */  { MAD_F(0x0576fb9a) /* 0.341548541 */, 14 },
-  /*  648 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 14 },
-  /*  649 */  { MAD_F(0x057cc077) /* 0.342956988 */, 14 },
-  /*  650 */  { MAD_F(0x057fa378) /* 0.343661754 */, 14 },
-  /*  651 */  { MAD_F(0x058286d9) /* 0.344366882 */, 14 },
-  /*  652 */  { MAD_F(0x05856a9b) /* 0.345072371 */, 14 },
-  /*  653 */  { MAD_F(0x05884ebe) /* 0.345778221 */, 14 },
-  /*  654 */  { MAD_F(0x058b3342) /* 0.346484431 */, 14 },
-  /*  655 */  { MAD_F(0x058e1827) /* 0.347191002 */, 14 },
-
-  /*  656 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 14 },
-  /*  657 */  { MAD_F(0x0593e311) /* 0.348605221 */, 14 },
-  /*  658 */  { MAD_F(0x0596c917) /* 0.349312869 */, 14 },
-  /*  659 */  { MAD_F(0x0599af7d) /* 0.350020876 */, 14 },
-  /*  660 */  { MAD_F(0x059c9643) /* 0.350729240 */, 14 },
-  /*  661 */  { MAD_F(0x059f7d6a) /* 0.351437963 */, 14 },
-  /*  662 */  { MAD_F(0x05a264f0) /* 0.352147044 */, 14 },
-  /*  663 */  { MAD_F(0x05a54cd6) /* 0.352856481 */, 14 },
-  /*  664 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 14 },
-  /*  665 */  { MAD_F(0x05ab1dc2) /* 0.354276426 */, 14 },
-  /*  666 */  { MAD_F(0x05ae06c7) /* 0.354986932 */, 14 },
-  /*  667 */  { MAD_F(0x05b0f02b) /* 0.355697795 */, 14 },
-  /*  668 */  { MAD_F(0x05b3d9f0) /* 0.356409012 */, 14 },
-  /*  669 */  { MAD_F(0x05b6c413) /* 0.357120585 */, 14 },
-  /*  670 */  { MAD_F(0x05b9ae95) /* 0.357832512 */, 14 },
-  /*  671 */  { MAD_F(0x05bc9977) /* 0.358544794 */, 14 },
-
-  /*  672 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 14 },
-  /*  673 */  { MAD_F(0x05c27057) /* 0.359970419 */, 14 },
-  /*  674 */  { MAD_F(0x05c55c56) /* 0.360683761 */, 14 },
-  /*  675 */  { MAD_F(0x05c848b3) /* 0.361397456 */, 14 },
-  /*  676 */  { MAD_F(0x05cb356e) /* 0.362111504 */, 14 },
-  /*  677 */  { MAD_F(0x05ce2289) /* 0.362825904 */, 14 },
-  /*  678 */  { MAD_F(0x05d11001) /* 0.363540655 */, 14 },
-  /*  679 */  { MAD_F(0x05d3fdd8) /* 0.364255759 */, 14 },
-  /*  680 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 14 },
-  /*  681 */  { MAD_F(0x05d9daa1) /* 0.365687018 */, 14 },
-  /*  682 */  { MAD_F(0x05dcc993) /* 0.366403174 */, 14 },
-  /*  683 */  { MAD_F(0x05dfb8e2) /* 0.367119680 */, 14 },
-  /*  684 */  { MAD_F(0x05e2a890) /* 0.367836535 */, 14 },
-  /*  685 */  { MAD_F(0x05e5989b) /* 0.368553740 */, 14 },
-  /*  686 */  { MAD_F(0x05e88904) /* 0.369271294 */, 14 },
-  /*  687 */  { MAD_F(0x05eb79cb) /* 0.369989197 */, 14 },
-
-  /*  688 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 14 },
-  /*  689 */  { MAD_F(0x05f15c70) /* 0.371426047 */, 14 },
-  /*  690 */  { MAD_F(0x05f44e4f) /* 0.372144994 */, 14 },
-  /*  691 */  { MAD_F(0x05f7408b) /* 0.372864289 */, 14 },
-  /*  692 */  { MAD_F(0x05fa3324) /* 0.373583930 */, 14 },
-  /*  693 */  { MAD_F(0x05fd261b) /* 0.374303918 */, 14 },
-  /*  694 */  { MAD_F(0x0600196e) /* 0.375024253 */, 14 },
-  /*  695 */  { MAD_F(0x06030d1e) /* 0.375744934 */, 14 },
-  /*  696 */  { MAD_F(0x0606012b) /* 0.376465960 */, 14 },
-  /*  697 */  { MAD_F(0x0608f595) /* 0.377187332 */, 14 },
-  /*  698 */  { MAD_F(0x060bea5c) /* 0.377909049 */, 14 },
-  /*  699 */  { MAD_F(0x060edf7f) /* 0.378631110 */, 14 },
-  /*  700 */  { MAD_F(0x0611d4fe) /* 0.379353516 */, 14 },
-  /*  701 */  { MAD_F(0x0614cada) /* 0.380076266 */, 14 },
-  /*  702 */  { MAD_F(0x0617c112) /* 0.380799360 */, 14 },
-  /*  703 */  { MAD_F(0x061ab7a6) /* 0.381522798 */, 14 },
-
-  /*  704 */  { MAD_F(0x061dae96) /* 0.382246578 */, 14 },
-  /*  705 */  { MAD_F(0x0620a5e3) /* 0.382970701 */, 14 },
-  /*  706 */  { MAD_F(0x06239d8b) /* 0.383695167 */, 14 },
-  /*  707 */  { MAD_F(0x0626958f) /* 0.384419975 */, 14 },
-  /*  708 */  { MAD_F(0x06298def) /* 0.385145124 */, 14 },
-  /*  709 */  { MAD_F(0x062c86aa) /* 0.385870615 */, 14 },
-  /*  710 */  { MAD_F(0x062f7fc1) /* 0.386596448 */, 14 },
-  /*  711 */  { MAD_F(0x06327934) /* 0.387322621 */, 14 },
-  /*  712 */  { MAD_F(0x06357302) /* 0.388049134 */, 14 },
-  /*  713 */  { MAD_F(0x06386d2b) /* 0.388775988 */, 14 },
-  /*  714 */  { MAD_F(0x063b67b0) /* 0.389503182 */, 14 },
-  /*  715 */  { MAD_F(0x063e6290) /* 0.390230715 */, 14 },
-  /*  716 */  { MAD_F(0x06415dcb) /* 0.390958588 */, 14 },
-  /*  717 */  { MAD_F(0x06445960) /* 0.391686799 */, 14 },
-  /*  718 */  { MAD_F(0x06475551) /* 0.392415349 */, 14 },
-  /*  719 */  { MAD_F(0x064a519c) /* 0.393144238 */, 14 },
-
-  /*  720 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 14 },
-  /*  721 */  { MAD_F(0x06504b44) /* 0.394603028 */, 14 },
-  /*  722 */  { MAD_F(0x0653489f) /* 0.395332930 */, 14 },
-  /*  723 */  { MAD_F(0x06564655) /* 0.396063168 */, 14 },
-  /*  724 */  { MAD_F(0x06594465) /* 0.396793743 */, 14 },
-  /*  725 */  { MAD_F(0x065c42d0) /* 0.397524655 */, 14 },
-  /*  726 */  { MAD_F(0x065f4195) /* 0.398255903 */, 14 },
-  /*  727 */  { MAD_F(0x066240b4) /* 0.398987487 */, 14 },
-  /*  728 */  { MAD_F(0x0665402d) /* 0.399719406 */, 14 },
-  /*  729 */  { MAD_F(0x06684000) /* 0.400451660 */, 14 },
-  /*  730 */  { MAD_F(0x066b402d) /* 0.401184249 */, 14 },
-  /*  731 */  { MAD_F(0x066e40b3) /* 0.401917173 */, 14 },
-  /*  732 */  { MAD_F(0x06714194) /* 0.402650431 */, 14 },
-  /*  733 */  { MAD_F(0x067442ce) /* 0.403384024 */, 14 },
-  /*  734 */  { MAD_F(0x06774462) /* 0.404117949 */, 14 },
-  /*  735 */  { MAD_F(0x067a464f) /* 0.404852209 */, 14 },
-
-  /*  736 */  { MAD_F(0x067d4896) /* 0.405586801 */, 14 },
-  /*  737 */  { MAD_F(0x06804b36) /* 0.406321726 */, 14 },
-  /*  738 */  { MAD_F(0x06834e2f) /* 0.407056983 */, 14 },
-  /*  739 */  { MAD_F(0x06865181) /* 0.407792573 */, 14 },
-  /*  740 */  { MAD_F(0x0689552c) /* 0.408528495 */, 14 },
-  /*  741 */  { MAD_F(0x068c5931) /* 0.409264748 */, 14 },
-  /*  742 */  { MAD_F(0x068f5d8e) /* 0.410001332 */, 14 },
-  /*  743 */  { MAD_F(0x06926245) /* 0.410738247 */, 14 },
-  /*  744 */  { MAD_F(0x06956753) /* 0.411475493 */, 14 },
-  /*  745 */  { MAD_F(0x06986cbb) /* 0.412213070 */, 14 },
-  /*  746 */  { MAD_F(0x069b727b) /* 0.412950976 */, 14 },
-  /*  747 */  { MAD_F(0x069e7894) /* 0.413689213 */, 14 },
-  /*  748 */  { MAD_F(0x06a17f05) /* 0.414427779 */, 14 },
-  /*  749 */  { MAD_F(0x06a485cf) /* 0.415166674 */, 14 },
-  /*  750 */  { MAD_F(0x06a78cf1) /* 0.415905897 */, 14 },
-  /*  751 */  { MAD_F(0x06aa946b) /* 0.416645450 */, 14 },
-
-  /*  752 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 14 },
-  /*  753 */  { MAD_F(0x06b0a468) /* 0.418125540 */, 14 },
-  /*  754 */  { MAD_F(0x06b3acea) /* 0.418866076 */, 14 },
-  /*  755 */  { MAD_F(0x06b6b5c4) /* 0.419606940 */, 14 },
-  /*  756 */  { MAD_F(0x06b9bef6) /* 0.420348132 */, 14 },
-  /*  757 */  { MAD_F(0x06bcc880) /* 0.421089650 */, 14 },
-  /*  758 */  { MAD_F(0x06bfd261) /* 0.421831494 */, 14 },
-  /*  759 */  { MAD_F(0x06c2dc9a) /* 0.422573665 */, 14 },
-  /*  760 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 14 },
-  /*  761 */  { MAD_F(0x06c8f213) /* 0.424058985 */, 14 },
-  /*  762 */  { MAD_F(0x06cbfd52) /* 0.424802133 */, 14 },
-  /*  763 */  { MAD_F(0x06cf08e9) /* 0.425545607 */, 14 },
-  /*  764 */  { MAD_F(0x06d214d7) /* 0.426289405 */, 14 },
-  /*  765 */  { MAD_F(0x06d5211c) /* 0.427033528 */, 14 },
-  /*  766 */  { MAD_F(0x06d82db8) /* 0.427777975 */, 14 },
-  /*  767 */  { MAD_F(0x06db3aaa) /* 0.428522746 */, 14 },
-
-  /*  768 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 14 },
-  /*  769 */  { MAD_F(0x06e15595) /* 0.430013259 */, 14 },
-  /*  770 */  { MAD_F(0x06e4638d) /* 0.430759001 */, 14 },
-  /*  771 */  { MAD_F(0x06e771db) /* 0.431505065 */, 14 },
-  /*  772 */  { MAD_F(0x06ea807f) /* 0.432251452 */, 14 },
-  /*  773 */  { MAD_F(0x06ed8f7b) /* 0.432998162 */, 14 },
-  /*  774 */  { MAD_F(0x06f09ecc) /* 0.433745193 */, 14 },
-  /*  775 */  { MAD_F(0x06f3ae75) /* 0.434492546 */, 14 },
-  /*  776 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 14 },
-  /*  777 */  { MAD_F(0x06f9cec8) /* 0.435988217 */, 14 },
-  /*  778 */  { MAD_F(0x06fcdf72) /* 0.436736534 */, 14 },
-  /*  779 */  { MAD_F(0x06fff073) /* 0.437485172 */, 14 },
-  /*  780 */  { MAD_F(0x070301ca) /* 0.438234130 */, 14 },
-  /*  781 */  { MAD_F(0x07061377) /* 0.438983408 */, 14 },
-  /*  782 */  { MAD_F(0x0709257a) /* 0.439733006 */, 14 },
-  /*  783 */  { MAD_F(0x070c37d2) /* 0.440482924 */, 14 },
-
-  /*  784 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 14 },
-  /*  785 */  { MAD_F(0x07125d84) /* 0.441983717 */, 14 },
-  /*  786 */  { MAD_F(0x071570de) /* 0.442734592 */, 14 },
-  /*  787 */  { MAD_F(0x0718848d) /* 0.443485785 */, 14 },
-  /*  788 */  { MAD_F(0x071b9891) /* 0.444237296 */, 14 },
-  /*  789 */  { MAD_F(0x071eaceb) /* 0.444989126 */, 14 },
-  /*  790 */  { MAD_F(0x0721c19a) /* 0.445741273 */, 14 },
-  /*  791 */  { MAD_F(0x0724d69e) /* 0.446493738 */, 14 },
-  /*  792 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 14 },
-  /*  793 */  { MAD_F(0x072b01a6) /* 0.447999618 */, 14 },
-  /*  794 */  { MAD_F(0x072e17a9) /* 0.448753033 */, 14 },
-  /*  795 */  { MAD_F(0x07312e01) /* 0.449506765 */, 14 },
-  /*  796 */  { MAD_F(0x073444ae) /* 0.450260813 */, 14 },
-  /*  797 */  { MAD_F(0x07375bb0) /* 0.451015176 */, 14 },
-  /*  798 */  { MAD_F(0x073a7307) /* 0.451769856 */, 14 },
-  /*  799 */  { MAD_F(0x073d8ab2) /* 0.452524850 */, 14 },
-
-  /*  800 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 14 },
-  /*  801 */  { MAD_F(0x0743bb06) /* 0.454035784 */, 14 },
-  /*  802 */  { MAD_F(0x0746d3af) /* 0.454791723 */, 14 },
-  /*  803 */  { MAD_F(0x0749ecac) /* 0.455547976 */, 14 },
-  /*  804 */  { MAD_F(0x074d05fe) /* 0.456304543 */, 14 },
-  /*  805 */  { MAD_F(0x07501fa3) /* 0.457061423 */, 14 },
-  /*  806 */  { MAD_F(0x0753399d) /* 0.457818618 */, 14 },
-  /*  807 */  { MAD_F(0x075653eb) /* 0.458576125 */, 14 },
-  /*  808 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 14 },
-  /*  809 */  { MAD_F(0x075c8983) /* 0.460092079 */, 14 },
-  /*  810 */  { MAD_F(0x075fa4cc) /* 0.460850524 */, 14 },
-  /*  811 */  { MAD_F(0x0762c06a) /* 0.461609282 */, 14 },
-  /*  812 */  { MAD_F(0x0765dc5b) /* 0.462368352 */, 14 },
-  /*  813 */  { MAD_F(0x0768f8a0) /* 0.463127733 */, 14 },
-  /*  814 */  { MAD_F(0x076c1538) /* 0.463887426 */, 14 },
-  /*  815 */  { MAD_F(0x076f3224) /* 0.464647430 */, 14 },
-
-  /*  816 */  { MAD_F(0x07724f64) /* 0.465407744 */, 14 },
-  /*  817 */  { MAD_F(0x07756cf7) /* 0.466168370 */, 14 },
-  /*  818 */  { MAD_F(0x07788add) /* 0.466929306 */, 14 },
-  /*  819 */  { MAD_F(0x077ba916) /* 0.467690552 */, 14 },
-  /*  820 */  { MAD_F(0x077ec7a3) /* 0.468452108 */, 14 },
-  /*  821 */  { MAD_F(0x0781e683) /* 0.469213973 */, 14 },
-  /*  822 */  { MAD_F(0x078505b5) /* 0.469976148 */, 14 },
-  /*  823 */  { MAD_F(0x0788253b) /* 0.470738632 */, 14 },
-  /*  824 */  { MAD_F(0x078b4514) /* 0.471501425 */, 14 },
-  /*  825 */  { MAD_F(0x078e653f) /* 0.472264527 */, 14 },
-  /*  826 */  { MAD_F(0x079185be) /* 0.473027937 */, 14 },
-  /*  827 */  { MAD_F(0x0794a68f) /* 0.473791655 */, 14 },
-  /*  828 */  { MAD_F(0x0797c7b2) /* 0.474555681 */, 14 },
-  /*  829 */  { MAD_F(0x079ae929) /* 0.475320014 */, 14 },
-  /*  830 */  { MAD_F(0x079e0af1) /* 0.476084655 */, 14 },
-  /*  831 */  { MAD_F(0x07a12d0c) /* 0.476849603 */, 14 },
-
-  /*  832 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 14 },
-  /*  833 */  { MAD_F(0x07a7723a) /* 0.478380420 */, 14 },
-  /*  834 */  { MAD_F(0x07aa954c) /* 0.479146288 */, 14 },
-  /*  835 */  { MAD_F(0x07adb8b0) /* 0.479912463 */, 14 },
-  /*  836 */  { MAD_F(0x07b0dc67) /* 0.480678943 */, 14 },
-  /*  837 */  { MAD_F(0x07b4006f) /* 0.481445729 */, 14 },
-  /*  838 */  { MAD_F(0x07b724ca) /* 0.482212820 */, 14 },
-  /*  839 */  { MAD_F(0x07ba4976) /* 0.482980216 */, 14 },
-  /*  840 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 14 },
-  /*  841 */  { MAD_F(0x07c093c5) /* 0.484515924 */, 14 },
-  /*  842 */  { MAD_F(0x07c3b967) /* 0.485284235 */, 14 },
-  /*  843 */  { MAD_F(0x07c6df5a) /* 0.486052849 */, 14 },
-  /*  844 */  { MAD_F(0x07ca059f) /* 0.486821768 */, 14 },
-  /*  845 */  { MAD_F(0x07cd2c36) /* 0.487590991 */, 14 },
-  /*  846 */  { MAD_F(0x07d0531e) /* 0.488360517 */, 14 },
-  /*  847 */  { MAD_F(0x07d37a57) /* 0.489130346 */, 14 },
-
-  /*  848 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 14 },
-  /*  849 */  { MAD_F(0x07d9c9be) /* 0.490670914 */, 14 },
-  /*  850 */  { MAD_F(0x07dcf1ec) /* 0.491441651 */, 14 },
-  /*  851 */  { MAD_F(0x07e01a6a) /* 0.492212691 */, 14 },
-  /*  852 */  { MAD_F(0x07e3433a) /* 0.492984033 */, 14 },
-  /*  853 */  { MAD_F(0x07e66c5a) /* 0.493755677 */, 14 },
-  /*  854 */  { MAD_F(0x07e995cc) /* 0.494527623 */, 14 },
-  /*  855 */  { MAD_F(0x07ecbf8e) /* 0.495299870 */, 14 },
-  /*  856 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 14 },
-  /*  857 */  { MAD_F(0x07f31405) /* 0.496845266 */, 14 },
-  /*  858 */  { MAD_F(0x07f63eba) /* 0.497618416 */, 14 },
-  /*  859 */  { MAD_F(0x07f969c0) /* 0.498391866 */, 14 },
-  /*  860 */  { MAD_F(0x07fc9516) /* 0.499165616 */, 14 },
-  /*  861 */  { MAD_F(0x07ffc0bc) /* 0.499939666 */, 14 },
-  /*  862 */  { MAD_F(0x04017659) /* 0.250357008 */, 15 },
-  /*  863 */  { MAD_F(0x04030c7d) /* 0.250744333 */, 15 },
-
-  /*  864 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 15 },
-  /*  865 */  { MAD_F(0x0406393d) /* 0.251519431 */, 15 },
-  /*  866 */  { MAD_F(0x0407cfd9) /* 0.251907204 */, 15 },
-  /*  867 */  { MAD_F(0x0409669d) /* 0.252295127 */, 15 },
-  /*  868 */  { MAD_F(0x040afd89) /* 0.252683198 */, 15 },
-  /*  869 */  { MAD_F(0x040c949e) /* 0.253071419 */, 15 },
-  /*  870 */  { MAD_F(0x040e2bda) /* 0.253459789 */, 15 },
-  /*  871 */  { MAD_F(0x040fc33e) /* 0.253848307 */, 15 },
-  /*  872 */  { MAD_F(0x04115aca) /* 0.254236974 */, 15 },
-  /*  873 */  { MAD_F(0x0412f27e) /* 0.254625790 */, 15 },
-  /*  874 */  { MAD_F(0x04148a5a) /* 0.255014755 */, 15 },
-  /*  875 */  { MAD_F(0x0416225d) /* 0.255403867 */, 15 },
-  /*  876 */  { MAD_F(0x0417ba89) /* 0.255793128 */, 15 },
-  /*  877 */  { MAD_F(0x041952dc) /* 0.256182537 */, 15 },
-  /*  878 */  { MAD_F(0x041aeb57) /* 0.256572095 */, 15 },
-  /*  879 */  { MAD_F(0x041c83fa) /* 0.256961800 */, 15 },
-
-  /*  880 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 15 },
-  /*  881 */  { MAD_F(0x041fb5b6) /* 0.257741653 */, 15 },
-  /*  882 */  { MAD_F(0x04214ed0) /* 0.258131801 */, 15 },
-  /*  883 */  { MAD_F(0x0422e811) /* 0.258522097 */, 15 },
-  /*  884 */  { MAD_F(0x04248179) /* 0.258912540 */, 15 },
-  /*  885 */  { MAD_F(0x04261b0a) /* 0.259303130 */, 15 },
-  /*  886 */  { MAD_F(0x0427b4c2) /* 0.259693868 */, 15 },
-  /*  887 */  { MAD_F(0x04294ea1) /* 0.260084752 */, 15 },
-  /*  888 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 15 },
-  /*  889 */  { MAD_F(0x042c82d6) /* 0.260866961 */, 15 },
-  /*  890 */  { MAD_F(0x042e1d2b) /* 0.261258286 */, 15 },
-  /*  891 */  { MAD_F(0x042fb7a8) /* 0.261649758 */, 15 },
-  /*  892 */  { MAD_F(0x0431524c) /* 0.262041376 */, 15 },
-  /*  893 */  { MAD_F(0x0432ed17) /* 0.262433140 */, 15 },
-  /*  894 */  { MAD_F(0x0434880a) /* 0.262825051 */, 15 },
-  /*  895 */  { MAD_F(0x04362324) /* 0.263217107 */, 15 },
-
-  /*  896 */  { MAD_F(0x0437be65) /* 0.263609310 */, 15 },
-  /*  897 */  { MAD_F(0x043959cd) /* 0.264001659 */, 15 },
-  /*  898 */  { MAD_F(0x043af55d) /* 0.264394153 */, 15 },
-  /*  899 */  { MAD_F(0x043c9113) /* 0.264786794 */, 15 },
-  /*  900 */  { MAD_F(0x043e2cf1) /* 0.265179580 */, 15 },
-  /*  901 */  { MAD_F(0x043fc8f6) /* 0.265572511 */, 15 },
-  /*  902 */  { MAD_F(0x04416522) /* 0.265965588 */, 15 },
-  /*  903 */  { MAD_F(0x04430174) /* 0.266358810 */, 15 },
-  /*  904 */  { MAD_F(0x04449dee) /* 0.266752177 */, 15 },
-  /*  905 */  { MAD_F(0x04463a8f) /* 0.267145689 */, 15 },
-  /*  906 */  { MAD_F(0x0447d756) /* 0.267539347 */, 15 },
-  /*  907 */  { MAD_F(0x04497445) /* 0.267933149 */, 15 },
-  /*  908 */  { MAD_F(0x044b115a) /* 0.268327096 */, 15 },
-  /*  909 */  { MAD_F(0x044cae96) /* 0.268721187 */, 15 },
-  /*  910 */  { MAD_F(0x044e4bf9) /* 0.269115423 */, 15 },
-  /*  911 */  { MAD_F(0x044fe983) /* 0.269509804 */, 15 },
-
-  /*  912 */  { MAD_F(0x04518733) /* 0.269904329 */, 15 },
-  /*  913 */  { MAD_F(0x0453250a) /* 0.270298998 */, 15 },
-  /*  914 */  { MAD_F(0x0454c308) /* 0.270693811 */, 15 },
-  /*  915 */  { MAD_F(0x0456612d) /* 0.271088768 */, 15 },
-  /*  916 */  { MAD_F(0x0457ff78) /* 0.271483869 */, 15 },
-  /*  917 */  { MAD_F(0x04599dea) /* 0.271879114 */, 15 },
-  /*  918 */  { MAD_F(0x045b3c82) /* 0.272274503 */, 15 },
-  /*  919 */  { MAD_F(0x045cdb41) /* 0.272670035 */, 15 },
-  /*  920 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 15 },
-  /*  921 */  { MAD_F(0x04601932) /* 0.273461530 */, 15 },
-  /*  922 */  { MAD_F(0x0461b864) /* 0.273857492 */, 15 },
-  /*  923 */  { MAD_F(0x046357bd) /* 0.274253597 */, 15 },
-  /*  924 */  { MAD_F(0x0464f73c) /* 0.274649846 */, 15 },
-  /*  925 */  { MAD_F(0x046696e2) /* 0.275046238 */, 15 },
-  /*  926 */  { MAD_F(0x046836ae) /* 0.275442772 */, 15 },
-  /*  927 */  { MAD_F(0x0469d6a0) /* 0.275839449 */, 15 },
-
-  /*  928 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 15 },
-  /*  929 */  { MAD_F(0x046d16f7) /* 0.276633232 */, 15 },
-  /*  930 */  { MAD_F(0x046eb75c) /* 0.277030337 */, 15 },
-  /*  931 */  { MAD_F(0x047057e8) /* 0.277427584 */, 15 },
-  /*  932 */  { MAD_F(0x0471f899) /* 0.277824973 */, 15 },
-  /*  933 */  { MAD_F(0x04739971) /* 0.278222505 */, 15 },
-  /*  934 */  { MAD_F(0x04753a6f) /* 0.278620179 */, 15 },
-  /*  935 */  { MAD_F(0x0476db92) /* 0.279017995 */, 15 },
-  /*  936 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 15 },
-  /*  937 */  { MAD_F(0x047a1e4c) /* 0.279814051 */, 15 },
-  /*  938 */  { MAD_F(0x047bbfe2) /* 0.280212292 */, 15 },
-  /*  939 */  { MAD_F(0x047d619e) /* 0.280610675 */, 15 },
-  /*  940 */  { MAD_F(0x047f0380) /* 0.281009199 */, 15 },
-  /*  941 */  { MAD_F(0x0480a588) /* 0.281407864 */, 15 },
-  /*  942 */  { MAD_F(0x048247b6) /* 0.281806670 */, 15 },
-  /*  943 */  { MAD_F(0x0483ea0a) /* 0.282205618 */, 15 },
-
-  /*  944 */  { MAD_F(0x04858c83) /* 0.282604707 */, 15 },
-  /*  945 */  { MAD_F(0x04872f22) /* 0.283003936 */, 15 },
-  /*  946 */  { MAD_F(0x0488d1e8) /* 0.283403307 */, 15 },
-  /*  947 */  { MAD_F(0x048a74d3) /* 0.283802818 */, 15 },
-  /*  948 */  { MAD_F(0x048c17e3) /* 0.284202470 */, 15 },
-  /*  949 */  { MAD_F(0x048dbb1a) /* 0.284602263 */, 15 },
-  /*  950 */  { MAD_F(0x048f5e76) /* 0.285002195 */, 15 },
-  /*  951 */  { MAD_F(0x049101f8) /* 0.285402269 */, 15 },
-  /*  952 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 15 },
-  /*  953 */  { MAD_F(0x0494496c) /* 0.286202836 */, 15 },
-  /*  954 */  { MAD_F(0x0495ed5f) /* 0.286603329 */, 15 },
-  /*  955 */  { MAD_F(0x04979177) /* 0.287003963 */, 15 },
-  /*  956 */  { MAD_F(0x049935b5) /* 0.287404737 */, 15 },
-  /*  957 */  { MAD_F(0x049ada19) /* 0.287805650 */, 15 },
-  /*  958 */  { MAD_F(0x049c7ea1) /* 0.288206703 */, 15 },
-  /*  959 */  { MAD_F(0x049e2350) /* 0.288607895 */, 15 },
-
-  /*  960 */  { MAD_F(0x049fc824) /* 0.289009227 */, 15 },
-  /*  961 */  { MAD_F(0x04a16d1d) /* 0.289410699 */, 15 },
-  /*  962 */  { MAD_F(0x04a3123b) /* 0.289812309 */, 15 },
-  /*  963 */  { MAD_F(0x04a4b77f) /* 0.290214059 */, 15 },
-  /*  964 */  { MAD_F(0x04a65ce8) /* 0.290615948 */, 15 },
-  /*  965 */  { MAD_F(0x04a80277) /* 0.291017976 */, 15 },
-  /*  966 */  { MAD_F(0x04a9a82b) /* 0.291420143 */, 15 },
-  /*  967 */  { MAD_F(0x04ab4e04) /* 0.291822449 */, 15 },
-  /*  968 */  { MAD_F(0x04acf402) /* 0.292224893 */, 15 },
-  /*  969 */  { MAD_F(0x04ae9a26) /* 0.292627476 */, 15 },
-  /*  970 */  { MAD_F(0x04b0406e) /* 0.293030197 */, 15 },
-  /*  971 */  { MAD_F(0x04b1e6dc) /* 0.293433057 */, 15 },
-  /*  972 */  { MAD_F(0x04b38d6f) /* 0.293836055 */, 15 },
-  /*  973 */  { MAD_F(0x04b53427) /* 0.294239192 */, 15 },
-  /*  974 */  { MAD_F(0x04b6db05) /* 0.294642466 */, 15 },
-  /*  975 */  { MAD_F(0x04b88207) /* 0.295045879 */, 15 },
-
-  /*  976 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 15 },
-  /*  977 */  { MAD_F(0x04bbd07a) /* 0.295853118 */, 15 },
-  /*  978 */  { MAD_F(0x04bd77ec) /* 0.296256944 */, 15 },
-  /*  979 */  { MAD_F(0x04bf1f82) /* 0.296660907 */, 15 },
-  /*  980 */  { MAD_F(0x04c0c73d) /* 0.297065009 */, 15 },
-  /*  981 */  { MAD_F(0x04c26f1d) /* 0.297469248 */, 15 },
-  /*  982 */  { MAD_F(0x04c41722) /* 0.297873624 */, 15 },
-  /*  983 */  { MAD_F(0x04c5bf4c) /* 0.298278137 */, 15 },
-  /*  984 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 15 },
-  /*  985 */  { MAD_F(0x04c9100d) /* 0.299087576 */, 15 },
-  /*  986 */  { MAD_F(0x04cab8a6) /* 0.299492500 */, 15 },
-  /*  987 */  { MAD_F(0x04cc6163) /* 0.299897562 */, 15 },
-  /*  988 */  { MAD_F(0x04ce0a44) /* 0.300302761 */, 15 },
-  /*  989 */  { MAD_F(0x04cfb34b) /* 0.300708096 */, 15 },
-  /*  990 */  { MAD_F(0x04d15c76) /* 0.301113568 */, 15 },
-  /*  991 */  { MAD_F(0x04d305c5) /* 0.301519176 */, 15 },
-
-  /*  992 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 15 },
-  /*  993 */  { MAD_F(0x04d658d2) /* 0.302330802 */, 15 },
-  /*  994 */  { MAD_F(0x04d80290) /* 0.302736820 */, 15 },
-  /*  995 */  { MAD_F(0x04d9ac72) /* 0.303142973 */, 15 },
-  /*  996 */  { MAD_F(0x04db5679) /* 0.303549263 */, 15 },
-  /*  997 */  { MAD_F(0x04dd00a4) /* 0.303955689 */, 15 },
-  /*  998 */  { MAD_F(0x04deaaf3) /* 0.304362251 */, 15 },
-  /*  999 */  { MAD_F(0x04e05567) /* 0.304768948 */, 15 },
-  /* 1000 */  { MAD_F(0x04e20000) /* 0.305175781 */, 15 },
-  /* 1001 */  { MAD_F(0x04e3aabd) /* 0.305582750 */, 15 },
-  /* 1002 */  { MAD_F(0x04e5559e) /* 0.305989854 */, 15 },
-  /* 1003 */  { MAD_F(0x04e700a3) /* 0.306397094 */, 15 },
-  /* 1004 */  { MAD_F(0x04e8abcd) /* 0.306804470 */, 15 },
-  /* 1005 */  { MAD_F(0x04ea571c) /* 0.307211980 */, 15 },
-  /* 1006 */  { MAD_F(0x04ec028e) /* 0.307619626 */, 15 },
-  /* 1007 */  { MAD_F(0x04edae25) /* 0.308027406 */, 15 },
-
-  /* 1008 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 15 },
-  /* 1009 */  { MAD_F(0x04f105bf) /* 0.308843373 */, 15 },
-  /* 1010 */  { MAD_F(0x04f2b1c3) /* 0.309251558 */, 15 },
-  /* 1011 */  { MAD_F(0x04f45dea) /* 0.309659879 */, 15 },
-  /* 1012 */  { MAD_F(0x04f60a36) /* 0.310068333 */, 15 },
-  /* 1013 */  { MAD_F(0x04f7b6a6) /* 0.310476923 */, 15 },
-  /* 1014 */  { MAD_F(0x04f9633a) /* 0.310885647 */, 15 },
-  /* 1015 */  { MAD_F(0x04fb0ff2) /* 0.311294505 */, 15 },
-  /* 1016 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 15 },
-  /* 1017 */  { MAD_F(0x04fe69ce) /* 0.312112625 */, 15 },
-  /* 1018 */  { MAD_F(0x050016f3) /* 0.312521885 */, 15 },
-  /* 1019 */  { MAD_F(0x0501c43b) /* 0.312931280 */, 15 },
-  /* 1020 */  { MAD_F(0x050371a7) /* 0.313340809 */, 15 },
-  /* 1021 */  { MAD_F(0x05051f37) /* 0.313750472 */, 15 },
-  /* 1022 */  { MAD_F(0x0506cceb) /* 0.314160269 */, 15 },
-  /* 1023 */  { MAD_F(0x05087ac2) /* 0.314570199 */, 15 },
-
-  /* 1024 */  { MAD_F(0x050a28be) /* 0.314980262 */, 15 },
-  /* 1025 */  { MAD_F(0x050bd6de) /* 0.315390460 */, 15 },
-  /* 1026 */  { MAD_F(0x050d8521) /* 0.315800790 */, 15 },
-  /* 1027 */  { MAD_F(0x050f3388) /* 0.316211255 */, 15 },
-  /* 1028 */  { MAD_F(0x0510e213) /* 0.316621852 */, 15 },
-  /* 1029 */  { MAD_F(0x051290c2) /* 0.317032582 */, 15 },
-  /* 1030 */  { MAD_F(0x05143f94) /* 0.317443446 */, 15 },
-  /* 1031 */  { MAD_F(0x0515ee8a) /* 0.317854442 */, 15 },
-  /* 1032 */  { MAD_F(0x05179da4) /* 0.318265572 */, 15 },
-  /* 1033 */  { MAD_F(0x05194ce1) /* 0.318676834 */, 15 },
-  /* 1034 */  { MAD_F(0x051afc42) /* 0.319088229 */, 15 },
-  /* 1035 */  { MAD_F(0x051cabc7) /* 0.319499756 */, 15 },
-  /* 1036 */  { MAD_F(0x051e5b6f) /* 0.319911417 */, 15 },
-  /* 1037 */  { MAD_F(0x05200b3a) /* 0.320323209 */, 15 },
-  /* 1038 */  { MAD_F(0x0521bb2a) /* 0.320735134 */, 15 },
-  /* 1039 */  { MAD_F(0x05236b3d) /* 0.321147192 */, 15 },
-
-  /* 1040 */  { MAD_F(0x05251b73) /* 0.321559381 */, 15 },
-  /* 1041 */  { MAD_F(0x0526cbcd) /* 0.321971703 */, 15 },
-  /* 1042 */  { MAD_F(0x05287c4a) /* 0.322384156 */, 15 },
-  /* 1043 */  { MAD_F(0x052a2cea) /* 0.322796742 */, 15 },
-  /* 1044 */  { MAD_F(0x052bddae) /* 0.323209460 */, 15 },
-  /* 1045 */  { MAD_F(0x052d8e96) /* 0.323622309 */, 15 },
-  /* 1046 */  { MAD_F(0x052f3fa1) /* 0.324035290 */, 15 },
-  /* 1047 */  { MAD_F(0x0530f0cf) /* 0.324448403 */, 15 },
-  /* 1048 */  { MAD_F(0x0532a220) /* 0.324861647 */, 15 },
-  /* 1049 */  { MAD_F(0x05345395) /* 0.325275023 */, 15 },
-  /* 1050 */  { MAD_F(0x0536052d) /* 0.325688530 */, 15 },
-  /* 1051 */  { MAD_F(0x0537b6e8) /* 0.326102168 */, 15 },
-  /* 1052 */  { MAD_F(0x053968c6) /* 0.326515938 */, 15 },
-  /* 1053 */  { MAD_F(0x053b1ac8) /* 0.326929839 */, 15 },
-  /* 1054 */  { MAD_F(0x053ccced) /* 0.327343870 */, 15 },
-  /* 1055 */  { MAD_F(0x053e7f35) /* 0.327758033 */, 15 },
-
-  /* 1056 */  { MAD_F(0x054031a0) /* 0.328172327 */, 15 },
-  /* 1057 */  { MAD_F(0x0541e42e) /* 0.328586751 */, 15 },
-  /* 1058 */  { MAD_F(0x054396df) /* 0.329001306 */, 15 },
-  /* 1059 */  { MAD_F(0x054549b4) /* 0.329415992 */, 15 },
-  /* 1060 */  { MAD_F(0x0546fcab) /* 0.329830808 */, 15 },
-  /* 1061 */  { MAD_F(0x0548afc6) /* 0.330245755 */, 15 },
-  /* 1062 */  { MAD_F(0x054a6303) /* 0.330660832 */, 15 },
-  /* 1063 */  { MAD_F(0x054c1663) /* 0.331076039 */, 15 },
-  /* 1064 */  { MAD_F(0x054dc9e7) /* 0.331491377 */, 15 },
-  /* 1065 */  { MAD_F(0x054f7d8d) /* 0.331906845 */, 15 },
-  /* 1066 */  { MAD_F(0x05513156) /* 0.332322443 */, 15 },
-  /* 1067 */  { MAD_F(0x0552e542) /* 0.332738170 */, 15 },
-  /* 1068 */  { MAD_F(0x05549951) /* 0.333154028 */, 15 },
-  /* 1069 */  { MAD_F(0x05564d83) /* 0.333570016 */, 15 },
-  /* 1070 */  { MAD_F(0x055801d8) /* 0.333986133 */, 15 },
-  /* 1071 */  { MAD_F(0x0559b64f) /* 0.334402380 */, 15 },
-
-  /* 1072 */  { MAD_F(0x055b6ae9) /* 0.334818756 */, 15 },
-  /* 1073 */  { MAD_F(0x055d1fa6) /* 0.335235262 */, 15 },
-  /* 1074 */  { MAD_F(0x055ed486) /* 0.335651898 */, 15 },
-  /* 1075 */  { MAD_F(0x05608988) /* 0.336068662 */, 15 },
-  /* 1076 */  { MAD_F(0x05623ead) /* 0.336485556 */, 15 },
-  /* 1077 */  { MAD_F(0x0563f3f5) /* 0.336902579 */, 15 },
-  /* 1078 */  { MAD_F(0x0565a960) /* 0.337319732 */, 15 },
-  /* 1079 */  { MAD_F(0x05675eed) /* 0.337737013 */, 15 },
-  /* 1080 */  { MAD_F(0x0569149c) /* 0.338154423 */, 15 },
-  /* 1081 */  { MAD_F(0x056aca6f) /* 0.338571962 */, 15 },
-  /* 1082 */  { MAD_F(0x056c8064) /* 0.338989630 */, 15 },
-  /* 1083 */  { MAD_F(0x056e367b) /* 0.339407426 */, 15 },
-  /* 1084 */  { MAD_F(0x056fecb5) /* 0.339825351 */, 15 },
-  /* 1085 */  { MAD_F(0x0571a311) /* 0.340243405 */, 15 },
-  /* 1086 */  { MAD_F(0x05735990) /* 0.340661587 */, 15 },
-  /* 1087 */  { MAD_F(0x05751032) /* 0.341079898 */, 15 },
-
-  /* 1088 */  { MAD_F(0x0576c6f5) /* 0.341498336 */, 15 },
-  /* 1089 */  { MAD_F(0x05787ddc) /* 0.341916903 */, 15 },
-  /* 1090 */  { MAD_F(0x057a34e4) /* 0.342335598 */, 15 },
-  /* 1091 */  { MAD_F(0x057bec0f) /* 0.342754421 */, 15 },
-  /* 1092 */  { MAD_F(0x057da35d) /* 0.343173373 */, 15 },
-  /* 1093 */  { MAD_F(0x057f5acc) /* 0.343592452 */, 15 },
-  /* 1094 */  { MAD_F(0x0581125e) /* 0.344011659 */, 15 },
-  /* 1095 */  { MAD_F(0x0582ca12) /* 0.344430993 */, 15 },
-  /* 1096 */  { MAD_F(0x058481e9) /* 0.344850455 */, 15 },
-  /* 1097 */  { MAD_F(0x058639e2) /* 0.345270045 */, 15 },
-  /* 1098 */  { MAD_F(0x0587f1fd) /* 0.345689763 */, 15 },
-  /* 1099 */  { MAD_F(0x0589aa3a) /* 0.346109608 */, 15 },
-  /* 1100 */  { MAD_F(0x058b629a) /* 0.346529580 */, 15 },
-  /* 1101 */  { MAD_F(0x058d1b1b) /* 0.346949679 */, 15 },
-  /* 1102 */  { MAD_F(0x058ed3bf) /* 0.347369906 */, 15 },
-  /* 1103 */  { MAD_F(0x05908c85) /* 0.347790260 */, 15 },
-
-  /* 1104 */  { MAD_F(0x0592456d) /* 0.348210741 */, 15 },
-  /* 1105 */  { MAD_F(0x0593fe77) /* 0.348631348 */, 15 },
-  /* 1106 */  { MAD_F(0x0595b7a3) /* 0.349052083 */, 15 },
-  /* 1107 */  { MAD_F(0x059770f1) /* 0.349472945 */, 15 },
-  /* 1108 */  { MAD_F(0x05992a61) /* 0.349893933 */, 15 },
-  /* 1109 */  { MAD_F(0x059ae3f3) /* 0.350315048 */, 15 },
-  /* 1110 */  { MAD_F(0x059c9da8) /* 0.350736290 */, 15 },
-  /* 1111 */  { MAD_F(0x059e577e) /* 0.351157658 */, 15 },
-  /* 1112 */  { MAD_F(0x05a01176) /* 0.351579152 */, 15 },
-  /* 1113 */  { MAD_F(0x05a1cb90) /* 0.352000773 */, 15 },
-  /* 1114 */  { MAD_F(0x05a385cc) /* 0.352422520 */, 15 },
-  /* 1115 */  { MAD_F(0x05a5402a) /* 0.352844394 */, 15 },
-  /* 1116 */  { MAD_F(0x05a6faa9) /* 0.353266393 */, 15 },
-  /* 1117 */  { MAD_F(0x05a8b54b) /* 0.353688519 */, 15 },
-  /* 1118 */  { MAD_F(0x05aa700e) /* 0.354110771 */, 15 },
-  /* 1119 */  { MAD_F(0x05ac2af3) /* 0.354533148 */, 15 },
-
-  /* 1120 */  { MAD_F(0x05ade5fa) /* 0.354955651 */, 15 },
-  /* 1121 */  { MAD_F(0x05afa123) /* 0.355378281 */, 15 },
-  /* 1122 */  { MAD_F(0x05b15c6d) /* 0.355801035 */, 15 },
-  /* 1123 */  { MAD_F(0x05b317d9) /* 0.356223916 */, 15 },
-  /* 1124 */  { MAD_F(0x05b4d367) /* 0.356646922 */, 15 },
-  /* 1125 */  { MAD_F(0x05b68f16) /* 0.357070053 */, 15 },
-  /* 1126 */  { MAD_F(0x05b84ae7) /* 0.357493310 */, 15 },
-  /* 1127 */  { MAD_F(0x05ba06da) /* 0.357916692 */, 15 },
-  /* 1128 */  { MAD_F(0x05bbc2ef) /* 0.358340200 */, 15 },
-  /* 1129 */  { MAD_F(0x05bd7f25) /* 0.358763832 */, 15 },
-  /* 1130 */  { MAD_F(0x05bf3b7c) /* 0.359187590 */, 15 },
-  /* 1131 */  { MAD_F(0x05c0f7f5) /* 0.359611472 */, 15 },
-  /* 1132 */  { MAD_F(0x05c2b490) /* 0.360035480 */, 15 },
-  /* 1133 */  { MAD_F(0x05c4714c) /* 0.360459613 */, 15 },
-  /* 1134 */  { MAD_F(0x05c62e2a) /* 0.360883870 */, 15 },
-  /* 1135 */  { MAD_F(0x05c7eb29) /* 0.361308252 */, 15 },
-
-  /* 1136 */  { MAD_F(0x05c9a84a) /* 0.361732758 */, 15 },
-  /* 1137 */  { MAD_F(0x05cb658c) /* 0.362157390 */, 15 },
-  /* 1138 */  { MAD_F(0x05cd22ef) /* 0.362582145 */, 15 },
-  /* 1139 */  { MAD_F(0x05cee074) /* 0.363007026 */, 15 },
-  /* 1140 */  { MAD_F(0x05d09e1b) /* 0.363432030 */, 15 },
-  /* 1141 */  { MAD_F(0x05d25be2) /* 0.363857159 */, 15 },
-  /* 1142 */  { MAD_F(0x05d419cb) /* 0.364282412 */, 15 },
-  /* 1143 */  { MAD_F(0x05d5d7d5) /* 0.364707789 */, 15 },
-  /* 1144 */  { MAD_F(0x05d79601) /* 0.365133291 */, 15 },
-  /* 1145 */  { MAD_F(0x05d9544e) /* 0.365558916 */, 15 },
-  /* 1146 */  { MAD_F(0x05db12bc) /* 0.365984665 */, 15 },
-  /* 1147 */  { MAD_F(0x05dcd14c) /* 0.366410538 */, 15 },
-  /* 1148 */  { MAD_F(0x05de8ffc) /* 0.366836535 */, 15 },
-  /* 1149 */  { MAD_F(0x05e04ece) /* 0.367262655 */, 15 },
-  /* 1150 */  { MAD_F(0x05e20dc1) /* 0.367688900 */, 15 },
-  /* 1151 */  { MAD_F(0x05e3ccd5) /* 0.368115267 */, 15 },
-
-  /* 1152 */  { MAD_F(0x05e58c0b) /* 0.368541759 */, 15 },
-  /* 1153 */  { MAD_F(0x05e74b61) /* 0.368968373 */, 15 },
-  /* 1154 */  { MAD_F(0x05e90ad9) /* 0.369395111 */, 15 },
-  /* 1155 */  { MAD_F(0x05eaca72) /* 0.369821973 */, 15 },
-  /* 1156 */  { MAD_F(0x05ec8a2b) /* 0.370248957 */, 15 },
-  /* 1157 */  { MAD_F(0x05ee4a06) /* 0.370676065 */, 15 },
-  /* 1158 */  { MAD_F(0x05f00a02) /* 0.371103295 */, 15 },
-  /* 1159 */  { MAD_F(0x05f1ca1f) /* 0.371530649 */, 15 },
-  /* 1160 */  { MAD_F(0x05f38a5d) /* 0.371958126 */, 15 },
-  /* 1161 */  { MAD_F(0x05f54abc) /* 0.372385725 */, 15 },
-  /* 1162 */  { MAD_F(0x05f70b3c) /* 0.372813448 */, 15 },
-  /* 1163 */  { MAD_F(0x05f8cbdc) /* 0.373241292 */, 15 },
-  /* 1164 */  { MAD_F(0x05fa8c9e) /* 0.373669260 */, 15 },
-  /* 1165 */  { MAD_F(0x05fc4d81) /* 0.374097350 */, 15 },
-  /* 1166 */  { MAD_F(0x05fe0e84) /* 0.374525563 */, 15 },
-  /* 1167 */  { MAD_F(0x05ffcfa8) /* 0.374953898 */, 15 },
-
-  /* 1168 */  { MAD_F(0x060190ee) /* 0.375382356 */, 15 },
-  /* 1169 */  { MAD_F(0x06035254) /* 0.375810936 */, 15 },
-  /* 1170 */  { MAD_F(0x060513da) /* 0.376239638 */, 15 },
-  /* 1171 */  { MAD_F(0x0606d582) /* 0.376668462 */, 15 },
-  /* 1172 */  { MAD_F(0x0608974a) /* 0.377097408 */, 15 },
-  /* 1173 */  { MAD_F(0x060a5934) /* 0.377526476 */, 15 },
-  /* 1174 */  { MAD_F(0x060c1b3d) /* 0.377955667 */, 15 },
-  /* 1175 */  { MAD_F(0x060ddd68) /* 0.378384979 */, 15 },
-  /* 1176 */  { MAD_F(0x060f9fb3) /* 0.378814413 */, 15 },
-  /* 1177 */  { MAD_F(0x0611621f) /* 0.379243968 */, 15 },
-  /* 1178 */  { MAD_F(0x061324ac) /* 0.379673646 */, 15 },
-  /* 1179 */  { MAD_F(0x0614e759) /* 0.380103444 */, 15 },
-  /* 1180 */  { MAD_F(0x0616aa27) /* 0.380533365 */, 15 },
-  /* 1181 */  { MAD_F(0x06186d16) /* 0.380963407 */, 15 },
-  /* 1182 */  { MAD_F(0x061a3025) /* 0.381393570 */, 15 },
-  /* 1183 */  { MAD_F(0x061bf354) /* 0.381823855 */, 15 },
-
-  /* 1184 */  { MAD_F(0x061db6a5) /* 0.382254261 */, 15 },
-  /* 1185 */  { MAD_F(0x061f7a15) /* 0.382684788 */, 15 },
-  /* 1186 */  { MAD_F(0x06213da7) /* 0.383115436 */, 15 },
-  /* 1187 */  { MAD_F(0x06230158) /* 0.383546205 */, 15 },
-  /* 1188 */  { MAD_F(0x0624c52a) /* 0.383977096 */, 15 },
-  /* 1189 */  { MAD_F(0x0626891d) /* 0.384408107 */, 15 },
-  /* 1190 */  { MAD_F(0x06284d30) /* 0.384839239 */, 15 },
-  /* 1191 */  { MAD_F(0x062a1164) /* 0.385270492 */, 15 },
-  /* 1192 */  { MAD_F(0x062bd5b8) /* 0.385701865 */, 15 },
-  /* 1193 */  { MAD_F(0x062d9a2c) /* 0.386133359 */, 15 },
-  /* 1194 */  { MAD_F(0x062f5ec1) /* 0.386564974 */, 15 },
-  /* 1195 */  { MAD_F(0x06312376) /* 0.386996709 */, 15 },
-  /* 1196 */  { MAD_F(0x0632e84b) /* 0.387428565 */, 15 },
-  /* 1197 */  { MAD_F(0x0634ad41) /* 0.387860541 */, 15 },
-  /* 1198 */  { MAD_F(0x06367257) /* 0.388292637 */, 15 },
-  /* 1199 */  { MAD_F(0x0638378d) /* 0.388724854 */, 15 },
-
-  /* 1200 */  { MAD_F(0x0639fce4) /* 0.389157191 */, 15 },
-  /* 1201 */  { MAD_F(0x063bc25b) /* 0.389589648 */, 15 },
-  /* 1202 */  { MAD_F(0x063d87f2) /* 0.390022225 */, 15 },
-  /* 1203 */  { MAD_F(0x063f4da9) /* 0.390454922 */, 15 },
-  /* 1204 */  { MAD_F(0x06411380) /* 0.390887739 */, 15 },
-  /* 1205 */  { MAD_F(0x0642d978) /* 0.391320675 */, 15 },
-  /* 1206 */  { MAD_F(0x06449f8f) /* 0.391753732 */, 15 },
-  /* 1207 */  { MAD_F(0x064665c7) /* 0.392186908 */, 15 },
-  /* 1208 */  { MAD_F(0x06482c1f) /* 0.392620204 */, 15 },
-  /* 1209 */  { MAD_F(0x0649f297) /* 0.393053619 */, 15 },
-  /* 1210 */  { MAD_F(0x064bb92f) /* 0.393487154 */, 15 },
-  /* 1211 */  { MAD_F(0x064d7fe8) /* 0.393920808 */, 15 },
-  /* 1212 */  { MAD_F(0x064f46c0) /* 0.394354582 */, 15 },
-  /* 1213 */  { MAD_F(0x06510db8) /* 0.394788475 */, 15 },
-  /* 1214 */  { MAD_F(0x0652d4d0) /* 0.395222488 */, 15 },
-  /* 1215 */  { MAD_F(0x06549c09) /* 0.395656619 */, 15 },
-
-  /* 1216 */  { MAD_F(0x06566361) /* 0.396090870 */, 15 },
-  /* 1217 */  { MAD_F(0x06582ad9) /* 0.396525239 */, 15 },
-  /* 1218 */  { MAD_F(0x0659f271) /* 0.396959728 */, 15 },
-  /* 1219 */  { MAD_F(0x065bba29) /* 0.397394336 */, 15 },
-  /* 1220 */  { MAD_F(0x065d8201) /* 0.397829062 */, 15 },
-  /* 1221 */  { MAD_F(0x065f49f9) /* 0.398263907 */, 15 },
-  /* 1222 */  { MAD_F(0x06611211) /* 0.398698871 */, 15 },
-  /* 1223 */  { MAD_F(0x0662da49) /* 0.399133954 */, 15 },
-  /* 1224 */  { MAD_F(0x0664a2a0) /* 0.399569155 */, 15 },
-  /* 1225 */  { MAD_F(0x06666b17) /* 0.400004475 */, 15 },
-  /* 1226 */  { MAD_F(0x066833ae) /* 0.400439913 */, 15 },
-  /* 1227 */  { MAD_F(0x0669fc65) /* 0.400875470 */, 15 },
-  /* 1228 */  { MAD_F(0x066bc53c) /* 0.401311145 */, 15 },
-  /* 1229 */  { MAD_F(0x066d8e32) /* 0.401746938 */, 15 },
-  /* 1230 */  { MAD_F(0x066f5748) /* 0.402182850 */, 15 },
-  /* 1231 */  { MAD_F(0x0671207e) /* 0.402618879 */, 15 },
-
-  /* 1232 */  { MAD_F(0x0672e9d4) /* 0.403055027 */, 15 },
-  /* 1233 */  { MAD_F(0x0674b349) /* 0.403491293 */, 15 },
-  /* 1234 */  { MAD_F(0x06767cde) /* 0.403927676 */, 15 },
-  /* 1235 */  { MAD_F(0x06784692) /* 0.404364178 */, 15 },
-  /* 1236 */  { MAD_F(0x067a1066) /* 0.404800797 */, 15 },
-  /* 1237 */  { MAD_F(0x067bda5a) /* 0.405237535 */, 15 },
-  /* 1238 */  { MAD_F(0x067da46d) /* 0.405674390 */, 15 },
-  /* 1239 */  { MAD_F(0x067f6ea0) /* 0.406111362 */, 15 },
-  /* 1240 */  { MAD_F(0x068138f3) /* 0.406548452 */, 15 },
-  /* 1241 */  { MAD_F(0x06830365) /* 0.406985660 */, 15 },
-  /* 1242 */  { MAD_F(0x0684cdf6) /* 0.407422985 */, 15 },
-  /* 1243 */  { MAD_F(0x068698a8) /* 0.407860427 */, 15 },
-  /* 1244 */  { MAD_F(0x06886378) /* 0.408297987 */, 15 },
-  /* 1245 */  { MAD_F(0x068a2e68) /* 0.408735664 */, 15 },
-  /* 1246 */  { MAD_F(0x068bf978) /* 0.409173458 */, 15 },
-  /* 1247 */  { MAD_F(0x068dc4a7) /* 0.409611370 */, 15 },
-
-  /* 1248 */  { MAD_F(0x068f8ff5) /* 0.410049398 */, 15 },
-  /* 1249 */  { MAD_F(0x06915b63) /* 0.410487544 */, 15 },
-  /* 1250 */  { MAD_F(0x069326f0) /* 0.410925806 */, 15 },
-  /* 1251 */  { MAD_F(0x0694f29c) /* 0.411364185 */, 15 },
-  /* 1252 */  { MAD_F(0x0696be68) /* 0.411802681 */, 15 },
-  /* 1253 */  { MAD_F(0x06988a54) /* 0.412241294 */, 15 },
-  /* 1254 */  { MAD_F(0x069a565e) /* 0.412680024 */, 15 },
-  /* 1255 */  { MAD_F(0x069c2288) /* 0.413118870 */, 15 },
-  /* 1256 */  { MAD_F(0x069deed1) /* 0.413557833 */, 15 },
-  /* 1257 */  { MAD_F(0x069fbb3a) /* 0.413996912 */, 15 },
-  /* 1258 */  { MAD_F(0x06a187c1) /* 0.414436108 */, 15 },
-  /* 1259 */  { MAD_F(0x06a35468) /* 0.414875420 */, 15 },
-  /* 1260 */  { MAD_F(0x06a5212f) /* 0.415314849 */, 15 },
-  /* 1261 */  { MAD_F(0x06a6ee14) /* 0.415754393 */, 15 },
-  /* 1262 */  { MAD_F(0x06a8bb18) /* 0.416194054 */, 15 },
-  /* 1263 */  { MAD_F(0x06aa883c) /* 0.416633831 */, 15 },
-
-  /* 1264 */  { MAD_F(0x06ac557f) /* 0.417073724 */, 15 },
-  /* 1265 */  { MAD_F(0x06ae22e1) /* 0.417513734 */, 15 },
-  /* 1266 */  { MAD_F(0x06aff062) /* 0.417953859 */, 15 },
-  /* 1267 */  { MAD_F(0x06b1be03) /* 0.418394100 */, 15 },
-  /* 1268 */  { MAD_F(0x06b38bc2) /* 0.418834457 */, 15 },
-  /* 1269 */  { MAD_F(0x06b559a1) /* 0.419274929 */, 15 },
-  /* 1270 */  { MAD_F(0x06b7279e) /* 0.419715518 */, 15 },
-  /* 1271 */  { MAD_F(0x06b8f5bb) /* 0.420156222 */, 15 },
-  /* 1272 */  { MAD_F(0x06bac3f6) /* 0.420597041 */, 15 },
-  /* 1273 */  { MAD_F(0x06bc9251) /* 0.421037977 */, 15 },
-  /* 1274 */  { MAD_F(0x06be60cb) /* 0.421479027 */, 15 },
-  /* 1275 */  { MAD_F(0x06c02f63) /* 0.421920193 */, 15 },
-  /* 1276 */  { MAD_F(0x06c1fe1b) /* 0.422361475 */, 15 },
-  /* 1277 */  { MAD_F(0x06c3ccf1) /* 0.422802871 */, 15 },
-  /* 1278 */  { MAD_F(0x06c59be7) /* 0.423244383 */, 15 },
-  /* 1279 */  { MAD_F(0x06c76afb) /* 0.423686010 */, 15 },
-
-  /* 1280 */  { MAD_F(0x06c93a2e) /* 0.424127753 */, 15 },
-  /* 1281 */  { MAD_F(0x06cb0981) /* 0.424569610 */, 15 },
-  /* 1282 */  { MAD_F(0x06ccd8f2) /* 0.425011582 */, 15 },
-  /* 1283 */  { MAD_F(0x06cea881) /* 0.425453669 */, 15 },
-  /* 1284 */  { MAD_F(0x06d07830) /* 0.425895871 */, 15 },
-  /* 1285 */  { MAD_F(0x06d247fe) /* 0.426338188 */, 15 },
-  /* 1286 */  { MAD_F(0x06d417ea) /* 0.426780620 */, 15 },
-  /* 1287 */  { MAD_F(0x06d5e7f5) /* 0.427223166 */, 15 },
-  /* 1288 */  { MAD_F(0x06d7b81f) /* 0.427665827 */, 15 },
-  /* 1289 */  { MAD_F(0x06d98868) /* 0.428108603 */, 15 },
-  /* 1290 */  { MAD_F(0x06db58cf) /* 0.428551493 */, 15 },
-  /* 1291 */  { MAD_F(0x06dd2955) /* 0.428994497 */, 15 },
-  /* 1292 */  { MAD_F(0x06def9fa) /* 0.429437616 */, 15 },
-  /* 1293 */  { MAD_F(0x06e0cabe) /* 0.429880849 */, 15 },
-  /* 1294 */  { MAD_F(0x06e29ba0) /* 0.430324197 */, 15 },
-  /* 1295 */  { MAD_F(0x06e46ca1) /* 0.430767659 */, 15 },
-
-  /* 1296 */  { MAD_F(0x06e63dc0) /* 0.431211234 */, 15 },
-  /* 1297 */  { MAD_F(0x06e80efe) /* 0.431654924 */, 15 },
-  /* 1298 */  { MAD_F(0x06e9e05b) /* 0.432098728 */, 15 },
-  /* 1299 */  { MAD_F(0x06ebb1d6) /* 0.432542647 */, 15 },
-  /* 1300 */  { MAD_F(0x06ed8370) /* 0.432986678 */, 15 },
-  /* 1301 */  { MAD_F(0x06ef5529) /* 0.433430824 */, 15 },
-  /* 1302 */  { MAD_F(0x06f12700) /* 0.433875084 */, 15 },
-  /* 1303 */  { MAD_F(0x06f2f8f5) /* 0.434319457 */, 15 },
-  /* 1304 */  { MAD_F(0x06f4cb09) /* 0.434763944 */, 15 },
-  /* 1305 */  { MAD_F(0x06f69d3c) /* 0.435208545 */, 15 },
-  /* 1306 */  { MAD_F(0x06f86f8d) /* 0.435653259 */, 15 },
-  /* 1307 */  { MAD_F(0x06fa41fd) /* 0.436098087 */, 15 },
-  /* 1308 */  { MAD_F(0x06fc148b) /* 0.436543029 */, 15 },
-  /* 1309 */  { MAD_F(0x06fde737) /* 0.436988083 */, 15 },
-  /* 1310 */  { MAD_F(0x06ffba02) /* 0.437433251 */, 15 },
-  /* 1311 */  { MAD_F(0x07018ceb) /* 0.437878533 */, 15 },
-
-  /* 1312 */  { MAD_F(0x07035ff3) /* 0.438323927 */, 15 },
-  /* 1313 */  { MAD_F(0x07053319) /* 0.438769435 */, 15 },
-  /* 1314 */  { MAD_F(0x0707065d) /* 0.439215056 */, 15 },
-  /* 1315 */  { MAD_F(0x0708d9c0) /* 0.439660790 */, 15 },
-  /* 1316 */  { MAD_F(0x070aad41) /* 0.440106636 */, 15 },
-  /* 1317 */  { MAD_F(0x070c80e1) /* 0.440552596 */, 15 },
-  /* 1318 */  { MAD_F(0x070e549f) /* 0.440998669 */, 15 },
-  /* 1319 */  { MAD_F(0x0710287b) /* 0.441444855 */, 15 },
-  /* 1320 */  { MAD_F(0x0711fc75) /* 0.441891153 */, 15 },
-  /* 1321 */  { MAD_F(0x0713d08d) /* 0.442337564 */, 15 },
-  /* 1322 */  { MAD_F(0x0715a4c4) /* 0.442784088 */, 15 },
-  /* 1323 */  { MAD_F(0x07177919) /* 0.443230724 */, 15 },
-  /* 1324 */  { MAD_F(0x07194d8c) /* 0.443677473 */, 15 },
-  /* 1325 */  { MAD_F(0x071b221e) /* 0.444124334 */, 15 },
-  /* 1326 */  { MAD_F(0x071cf6ce) /* 0.444571308 */, 15 },
-  /* 1327 */  { MAD_F(0x071ecb9b) /* 0.445018394 */, 15 },
-
-  /* 1328 */  { MAD_F(0x0720a087) /* 0.445465593 */, 15 },
-  /* 1329 */  { MAD_F(0x07227591) /* 0.445912903 */, 15 },
-  /* 1330 */  { MAD_F(0x07244ab9) /* 0.446360326 */, 15 },
-  /* 1331 */  { MAD_F(0x07262000) /* 0.446807861 */, 15 },
-  /* 1332 */  { MAD_F(0x0727f564) /* 0.447255509 */, 15 },
-  /* 1333 */  { MAD_F(0x0729cae7) /* 0.447703268 */, 15 },
-  /* 1334 */  { MAD_F(0x072ba087) /* 0.448151139 */, 15 },
-  /* 1335 */  { MAD_F(0x072d7646) /* 0.448599122 */, 15 },
-  /* 1336 */  { MAD_F(0x072f4c22) /* 0.449047217 */, 15 },
-  /* 1337 */  { MAD_F(0x0731221d) /* 0.449495424 */, 15 },
-  /* 1338 */  { MAD_F(0x0732f835) /* 0.449943742 */, 15 },
-  /* 1339 */  { MAD_F(0x0734ce6c) /* 0.450392173 */, 15 },
-  /* 1340 */  { MAD_F(0x0736a4c1) /* 0.450840715 */, 15 },
-  /* 1341 */  { MAD_F(0x07387b33) /* 0.451289368 */, 15 },
-  /* 1342 */  { MAD_F(0x073a51c4) /* 0.451738133 */, 15 },
-  /* 1343 */  { MAD_F(0x073c2872) /* 0.452187010 */, 15 },
-
-  /* 1344 */  { MAD_F(0x073dff3e) /* 0.452635998 */, 15 },
-  /* 1345 */  { MAD_F(0x073fd628) /* 0.453085097 */, 15 },
-  /* 1346 */  { MAD_F(0x0741ad30) /* 0.453534308 */, 15 },
-  /* 1347 */  { MAD_F(0x07438456) /* 0.453983630 */, 15 },
-  /* 1348 */  { MAD_F(0x07455b9a) /* 0.454433063 */, 15 },
-  /* 1349 */  { MAD_F(0x074732fc) /* 0.454882607 */, 15 },
-  /* 1350 */  { MAD_F(0x07490a7b) /* 0.455332262 */, 15 },
-  /* 1351 */  { MAD_F(0x074ae218) /* 0.455782029 */, 15 },
-  /* 1352 */  { MAD_F(0x074cb9d3) /* 0.456231906 */, 15 },
-  /* 1353 */  { MAD_F(0x074e91ac) /* 0.456681894 */, 15 },
-  /* 1354 */  { MAD_F(0x075069a3) /* 0.457131993 */, 15 },
-  /* 1355 */  { MAD_F(0x075241b7) /* 0.457582203 */, 15 },
-  /* 1356 */  { MAD_F(0x075419e9) /* 0.458032524 */, 15 },
-  /* 1357 */  { MAD_F(0x0755f239) /* 0.458482956 */, 15 },
-  /* 1358 */  { MAD_F(0x0757caa7) /* 0.458933498 */, 15 },
-  /* 1359 */  { MAD_F(0x0759a332) /* 0.459384151 */, 15 },
-
-  /* 1360 */  { MAD_F(0x075b7bdb) /* 0.459834914 */, 15 },
-  /* 1361 */  { MAD_F(0x075d54a1) /* 0.460285788 */, 15 },
-  /* 1362 */  { MAD_F(0x075f2d85) /* 0.460736772 */, 15 },
-  /* 1363 */  { MAD_F(0x07610687) /* 0.461187867 */, 15 },
-  /* 1364 */  { MAD_F(0x0762dfa6) /* 0.461639071 */, 15 },
-  /* 1365 */  { MAD_F(0x0764b8e3) /* 0.462090387 */, 15 },
-  /* 1366 */  { MAD_F(0x0766923e) /* 0.462541812 */, 15 },
-  /* 1367 */  { MAD_F(0x07686bb6) /* 0.462993348 */, 15 },
-  /* 1368 */  { MAD_F(0x076a454c) /* 0.463444993 */, 15 },
-  /* 1369 */  { MAD_F(0x076c1eff) /* 0.463896749 */, 15 },
-  /* 1370 */  { MAD_F(0x076df8d0) /* 0.464348615 */, 15 },
-  /* 1371 */  { MAD_F(0x076fd2be) /* 0.464800591 */, 15 },
-  /* 1372 */  { MAD_F(0x0771acca) /* 0.465252676 */, 15 },
-  /* 1373 */  { MAD_F(0x077386f3) /* 0.465704872 */, 15 },
-  /* 1374 */  { MAD_F(0x0775613a) /* 0.466157177 */, 15 },
-  /* 1375 */  { MAD_F(0x07773b9e) /* 0.466609592 */, 15 },
-
-  /* 1376 */  { MAD_F(0x07791620) /* 0.467062117 */, 15 },
-  /* 1377 */  { MAD_F(0x077af0bf) /* 0.467514751 */, 15 },
-  /* 1378 */  { MAD_F(0x077ccb7c) /* 0.467967495 */, 15 },
-  /* 1379 */  { MAD_F(0x077ea656) /* 0.468420349 */, 15 },
-  /* 1380 */  { MAD_F(0x0780814d) /* 0.468873312 */, 15 },
-  /* 1381 */  { MAD_F(0x07825c62) /* 0.469326384 */, 15 },
-  /* 1382 */  { MAD_F(0x07843794) /* 0.469779566 */, 15 },
-  /* 1383 */  { MAD_F(0x078612e3) /* 0.470232857 */, 15 },
-  /* 1384 */  { MAD_F(0x0787ee50) /* 0.470686258 */, 15 },
-  /* 1385 */  { MAD_F(0x0789c9da) /* 0.471139767 */, 15 },
-  /* 1386 */  { MAD_F(0x078ba581) /* 0.471593386 */, 15 },
-  /* 1387 */  { MAD_F(0x078d8146) /* 0.472047114 */, 15 },
-  /* 1388 */  { MAD_F(0x078f5d28) /* 0.472500951 */, 15 },
-  /* 1389 */  { MAD_F(0x07913927) /* 0.472954896 */, 15 },
-  /* 1390 */  { MAD_F(0x07931543) /* 0.473408951 */, 15 },
-  /* 1391 */  { MAD_F(0x0794f17d) /* 0.473863115 */, 15 },
-
-  /* 1392 */  { MAD_F(0x0796cdd4) /* 0.474317388 */, 15 },
-  /* 1393 */  { MAD_F(0x0798aa48) /* 0.474771769 */, 15 },
-  /* 1394 */  { MAD_F(0x079a86d9) /* 0.475226259 */, 15 },
-  /* 1395 */  { MAD_F(0x079c6388) /* 0.475680858 */, 15 },
-  /* 1396 */  { MAD_F(0x079e4053) /* 0.476135565 */, 15 },
-  /* 1397 */  { MAD_F(0x07a01d3c) /* 0.476590381 */, 15 },
-  /* 1398 */  { MAD_F(0x07a1fa42) /* 0.477045306 */, 15 },
-  /* 1399 */  { MAD_F(0x07a3d765) /* 0.477500339 */, 15 },
-  /* 1400 */  { MAD_F(0x07a5b4a5) /* 0.477955481 */, 15 },
-  /* 1401 */  { MAD_F(0x07a79202) /* 0.478410731 */, 15 },
-  /* 1402 */  { MAD_F(0x07a96f7d) /* 0.478866089 */, 15 },
-  /* 1403 */  { MAD_F(0x07ab4d14) /* 0.479321555 */, 15 },
-  /* 1404 */  { MAD_F(0x07ad2ac8) /* 0.479777130 */, 15 },
-  /* 1405 */  { MAD_F(0x07af089a) /* 0.480232813 */, 15 },
-  /* 1406 */  { MAD_F(0x07b0e688) /* 0.480688604 */, 15 },
-  /* 1407 */  { MAD_F(0x07b2c494) /* 0.481144503 */, 15 },
-
-  /* 1408 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */, 15 },
-  /* 1409 */  { MAD_F(0x07b68102) /* 0.482056625 */, 15 },
-  /* 1410 */  { MAD_F(0x07b85f64) /* 0.482512848 */, 15 },
-  /* 1411 */  { MAD_F(0x07ba3de4) /* 0.482969179 */, 15 },
-  /* 1412 */  { MAD_F(0x07bc1c80) /* 0.483425618 */, 15 },
-  /* 1413 */  { MAD_F(0x07bdfb39) /* 0.483882164 */, 15 },
-  /* 1414 */  { MAD_F(0x07bfda0f) /* 0.484338818 */, 15 },
-  /* 1415 */  { MAD_F(0x07c1b902) /* 0.484795580 */, 15 },
-  /* 1416 */  { MAD_F(0x07c39812) /* 0.485252449 */, 15 },
-  /* 1417 */  { MAD_F(0x07c5773f) /* 0.485709426 */, 15 },
-  /* 1418 */  { MAD_F(0x07c75689) /* 0.486166511 */, 15 },
-  /* 1419 */  { MAD_F(0x07c935ef) /* 0.486623703 */, 15 },
-  /* 1420 */  { MAD_F(0x07cb1573) /* 0.487081002 */, 15 },
-  /* 1421 */  { MAD_F(0x07ccf513) /* 0.487538409 */, 15 },
-  /* 1422 */  { MAD_F(0x07ced4d0) /* 0.487995923 */, 15 },
-  /* 1423 */  { MAD_F(0x07d0b4aa) /* 0.488453544 */, 15 },
-
-  /* 1424 */  { MAD_F(0x07d294a0) /* 0.488911273 */, 15 },
-  /* 1425 */  { MAD_F(0x07d474b3) /* 0.489369108 */, 15 },
-  /* 1426 */  { MAD_F(0x07d654e4) /* 0.489827051 */, 15 },
-  /* 1427 */  { MAD_F(0x07d83530) /* 0.490285101 */, 15 },
-  /* 1428 */  { MAD_F(0x07da159a) /* 0.490743258 */, 15 },
-  /* 1429 */  { MAD_F(0x07dbf620) /* 0.491201522 */, 15 },
-  /* 1430 */  { MAD_F(0x07ddd6c3) /* 0.491659892 */, 15 },
-  /* 1431 */  { MAD_F(0x07dfb783) /* 0.492118370 */, 15 },
-  /* 1432 */  { MAD_F(0x07e1985f) /* 0.492576954 */, 15 },
-  /* 1433 */  { MAD_F(0x07e37958) /* 0.493035645 */, 15 },
-  /* 1434 */  { MAD_F(0x07e55a6e) /* 0.493494443 */, 15 },
-  /* 1435 */  { MAD_F(0x07e73ba0) /* 0.493953348 */, 15 },
-  /* 1436 */  { MAD_F(0x07e91cef) /* 0.494412359 */, 15 },
-  /* 1437 */  { MAD_F(0x07eafe5a) /* 0.494871476 */, 15 },
-  /* 1438 */  { MAD_F(0x07ecdfe2) /* 0.495330701 */, 15 },
-  /* 1439 */  { MAD_F(0x07eec187) /* 0.495790031 */, 15 },
-
-  /* 1440 */  { MAD_F(0x07f0a348) /* 0.496249468 */, 15 },
-  /* 1441 */  { MAD_F(0x07f28526) /* 0.496709012 */, 15 },
-  /* 1442 */  { MAD_F(0x07f46720) /* 0.497168662 */, 15 },
-  /* 1443 */  { MAD_F(0x07f64937) /* 0.497628418 */, 15 },
-  /* 1444 */  { MAD_F(0x07f82b6a) /* 0.498088280 */, 15 },
-  /* 1445 */  { MAD_F(0x07fa0dba) /* 0.498548248 */, 15 },
-  /* 1446 */  { MAD_F(0x07fbf026) /* 0.499008323 */, 15 },
-  /* 1447 */  { MAD_F(0x07fdd2af) /* 0.499468503 */, 15 },
-  /* 1448 */  { MAD_F(0x07ffb554) /* 0.499928790 */, 15 },
-  /* 1449 */  { MAD_F(0x0400cc0b) /* 0.250194591 */, 16 },
-  /* 1450 */  { MAD_F(0x0401bd7a) /* 0.250424840 */, 16 },
-  /* 1451 */  { MAD_F(0x0402aef7) /* 0.250655143 */, 16 },
-  /* 1452 */  { MAD_F(0x0403a083) /* 0.250885498 */, 16 },
-  /* 1453 */  { MAD_F(0x0404921c) /* 0.251115906 */, 16 },
-  /* 1454 */  { MAD_F(0x040583c4) /* 0.251346367 */, 16 },
-  /* 1455 */  { MAD_F(0x0406757a) /* 0.251576880 */, 16 },
-
-  /* 1456 */  { MAD_F(0x0407673f) /* 0.251807447 */, 16 },
-  /* 1457 */  { MAD_F(0x04085911) /* 0.252038066 */, 16 },
-  /* 1458 */  { MAD_F(0x04094af1) /* 0.252268738 */, 16 },
-  /* 1459 */  { MAD_F(0x040a3ce0) /* 0.252499463 */, 16 },
-  /* 1460 */  { MAD_F(0x040b2edd) /* 0.252730240 */, 16 },
-  /* 1461 */  { MAD_F(0x040c20e8) /* 0.252961071 */, 16 },
-  /* 1462 */  { MAD_F(0x040d1301) /* 0.253191953 */, 16 },
-  /* 1463 */  { MAD_F(0x040e0529) /* 0.253422889 */, 16 },
-  /* 1464 */  { MAD_F(0x040ef75e) /* 0.253653877 */, 16 },
-  /* 1465 */  { MAD_F(0x040fe9a1) /* 0.253884918 */, 16 },
-  /* 1466 */  { MAD_F(0x0410dbf3) /* 0.254116011 */, 16 },
-  /* 1467 */  { MAD_F(0x0411ce53) /* 0.254347157 */, 16 },
-  /* 1468 */  { MAD_F(0x0412c0c1) /* 0.254578356 */, 16 },
-  /* 1469 */  { MAD_F(0x0413b33d) /* 0.254809606 */, 16 },
-  /* 1470 */  { MAD_F(0x0414a5c7) /* 0.255040910 */, 16 },
-  /* 1471 */  { MAD_F(0x0415985f) /* 0.255272266 */, 16 },
-
-  /* 1472 */  { MAD_F(0x04168b05) /* 0.255503674 */, 16 },
-  /* 1473 */  { MAD_F(0x04177db9) /* 0.255735135 */, 16 },
-  /* 1474 */  { MAD_F(0x0418707c) /* 0.255966648 */, 16 },
-  /* 1475 */  { MAD_F(0x0419634c) /* 0.256198213 */, 16 },
-  /* 1476 */  { MAD_F(0x041a562a) /* 0.256429831 */, 16 },
-  /* 1477 */  { MAD_F(0x041b4917) /* 0.256661501 */, 16 },
-  /* 1478 */  { MAD_F(0x041c3c11) /* 0.256893223 */, 16 },
-  /* 1479 */  { MAD_F(0x041d2f1a) /* 0.257124998 */, 16 },
-  /* 1480 */  { MAD_F(0x041e2230) /* 0.257356825 */, 16 },
-  /* 1481 */  { MAD_F(0x041f1555) /* 0.257588704 */, 16 },
-  /* 1482 */  { MAD_F(0x04200888) /* 0.257820635 */, 16 },
-  /* 1483 */  { MAD_F(0x0420fbc8) /* 0.258052619 */, 16 },
-  /* 1484 */  { MAD_F(0x0421ef17) /* 0.258284654 */, 16 },
-  /* 1485 */  { MAD_F(0x0422e273) /* 0.258516742 */, 16 },
-  /* 1486 */  { MAD_F(0x0423d5de) /* 0.258748882 */, 16 },
-  /* 1487 */  { MAD_F(0x0424c956) /* 0.258981074 */, 16 },
-
-  /* 1488 */  { MAD_F(0x0425bcdd) /* 0.259213318 */, 16 },
-  /* 1489 */  { MAD_F(0x0426b071) /* 0.259445614 */, 16 },
-  /* 1490 */  { MAD_F(0x0427a414) /* 0.259677962 */, 16 },
-  /* 1491 */  { MAD_F(0x042897c4) /* 0.259910362 */, 16 },
-  /* 1492 */  { MAD_F(0x04298b83) /* 0.260142814 */, 16 },
-  /* 1493 */  { MAD_F(0x042a7f4f) /* 0.260375318 */, 16 },
-  /* 1494 */  { MAD_F(0x042b7329) /* 0.260607874 */, 16 },
-  /* 1495 */  { MAD_F(0x042c6711) /* 0.260840481 */, 16 },
-  /* 1496 */  { MAD_F(0x042d5b07) /* 0.261073141 */, 16 },
-  /* 1497 */  { MAD_F(0x042e4f0b) /* 0.261305852 */, 16 },
-  /* 1498 */  { MAD_F(0x042f431d) /* 0.261538616 */, 16 },
-  /* 1499 */  { MAD_F(0x0430373d) /* 0.261771431 */, 16 },
-  /* 1500 */  { MAD_F(0x04312b6b) /* 0.262004297 */, 16 },
-  /* 1501 */  { MAD_F(0x04321fa6) /* 0.262237216 */, 16 },
-  /* 1502 */  { MAD_F(0x043313f0) /* 0.262470186 */, 16 },
-  /* 1503 */  { MAD_F(0x04340847) /* 0.262703208 */, 16 },
-
-  /* 1504 */  { MAD_F(0x0434fcad) /* 0.262936282 */, 16 },
-  /* 1505 */  { MAD_F(0x0435f120) /* 0.263169407 */, 16 },
-  /* 1506 */  { MAD_F(0x0436e5a1) /* 0.263402584 */, 16 },
-  /* 1507 */  { MAD_F(0x0437da2f) /* 0.263635813 */, 16 },
-  /* 1508 */  { MAD_F(0x0438cecc) /* 0.263869093 */, 16 },
-  /* 1509 */  { MAD_F(0x0439c377) /* 0.264102425 */, 16 },
-  /* 1510 */  { MAD_F(0x043ab82f) /* 0.264335808 */, 16 },
-  /* 1511 */  { MAD_F(0x043bacf5) /* 0.264569243 */, 16 },
-  /* 1512 */  { MAD_F(0x043ca1c9) /* 0.264802730 */, 16 },
-  /* 1513 */  { MAD_F(0x043d96ab) /* 0.265036267 */, 16 },
-  /* 1514 */  { MAD_F(0x043e8b9b) /* 0.265269857 */, 16 },
-  /* 1515 */  { MAD_F(0x043f8098) /* 0.265503498 */, 16 },
-  /* 1516 */  { MAD_F(0x044075a3) /* 0.265737190 */, 16 },
-  /* 1517 */  { MAD_F(0x04416abc) /* 0.265970933 */, 16 },
-  /* 1518 */  { MAD_F(0x04425fe3) /* 0.266204728 */, 16 },
-  /* 1519 */  { MAD_F(0x04435518) /* 0.266438574 */, 16 },
-
-  /* 1520 */  { MAD_F(0x04444a5a) /* 0.266672472 */, 16 },
-  /* 1521 */  { MAD_F(0x04453fab) /* 0.266906421 */, 16 },
-  /* 1522 */  { MAD_F(0x04463508) /* 0.267140421 */, 16 },
-  /* 1523 */  { MAD_F(0x04472a74) /* 0.267374472 */, 16 },
-  /* 1524 */  { MAD_F(0x04481fee) /* 0.267608575 */, 16 },
-  /* 1525 */  { MAD_F(0x04491575) /* 0.267842729 */, 16 },
-  /* 1526 */  { MAD_F(0x044a0b0a) /* 0.268076934 */, 16 },
-  /* 1527 */  { MAD_F(0x044b00ac) /* 0.268311190 */, 16 },
-  /* 1528 */  { MAD_F(0x044bf65d) /* 0.268545497 */, 16 },
-  /* 1529 */  { MAD_F(0x044cec1b) /* 0.268779856 */, 16 },
-  /* 1530 */  { MAD_F(0x044de1e7) /* 0.269014265 */, 16 },
-  /* 1531 */  { MAD_F(0x044ed7c0) /* 0.269248726 */, 16 },
-  /* 1532 */  { MAD_F(0x044fcda8) /* 0.269483238 */, 16 },
-  /* 1533 */  { MAD_F(0x0450c39c) /* 0.269717800 */, 16 },
-  /* 1534 */  { MAD_F(0x0451b99f) /* 0.269952414 */, 16 },
-  /* 1535 */  { MAD_F(0x0452afaf) /* 0.270187079 */, 16 },
-
-  /* 1536 */  { MAD_F(0x0453a5cd) /* 0.270421794 */, 16 },
-  /* 1537 */  { MAD_F(0x04549bf9) /* 0.270656561 */, 16 },
-  /* 1538 */  { MAD_F(0x04559232) /* 0.270891379 */, 16 },
-  /* 1539 */  { MAD_F(0x04568879) /* 0.271126247 */, 16 },
-  /* 1540 */  { MAD_F(0x04577ece) /* 0.271361166 */, 16 },
-  /* 1541 */  { MAD_F(0x04587530) /* 0.271596136 */, 16 },
-  /* 1542 */  { MAD_F(0x04596ba0) /* 0.271831157 */, 16 },
-  /* 1543 */  { MAD_F(0x045a621e) /* 0.272066229 */, 16 },
-  /* 1544 */  { MAD_F(0x045b58a9) /* 0.272301352 */, 16 },
-  /* 1545 */  { MAD_F(0x045c4f42) /* 0.272536525 */, 16 },
-  /* 1546 */  { MAD_F(0x045d45e9) /* 0.272771749 */, 16 },
-  /* 1547 */  { MAD_F(0x045e3c9d) /* 0.273007024 */, 16 },
-  /* 1548 */  { MAD_F(0x045f335e) /* 0.273242350 */, 16 },
-  /* 1549 */  { MAD_F(0x04602a2e) /* 0.273477726 */, 16 },
-  /* 1550 */  { MAD_F(0x0461210b) /* 0.273713153 */, 16 },
-  /* 1551 */  { MAD_F(0x046217f5) /* 0.273948630 */, 16 },
-
-  /* 1552 */  { MAD_F(0x04630eed) /* 0.274184158 */, 16 },
-  /* 1553 */  { MAD_F(0x046405f3) /* 0.274419737 */, 16 },
-  /* 1554 */  { MAD_F(0x0464fd06) /* 0.274655366 */, 16 },
-  /* 1555 */  { MAD_F(0x0465f427) /* 0.274891046 */, 16 },
-  /* 1556 */  { MAD_F(0x0466eb55) /* 0.275126776 */, 16 },
-  /* 1557 */  { MAD_F(0x0467e291) /* 0.275362557 */, 16 },
-  /* 1558 */  { MAD_F(0x0468d9db) /* 0.275598389 */, 16 },
-  /* 1559 */  { MAD_F(0x0469d132) /* 0.275834270 */, 16 },
-  /* 1560 */  { MAD_F(0x046ac896) /* 0.276070203 */, 16 },
-  /* 1561 */  { MAD_F(0x046bc009) /* 0.276306185 */, 16 },
-  /* 1562 */  { MAD_F(0x046cb788) /* 0.276542218 */, 16 },
-  /* 1563 */  { MAD_F(0x046daf15) /* 0.276778302 */, 16 },
-  /* 1564 */  { MAD_F(0x046ea6b0) /* 0.277014435 */, 16 },
-  /* 1565 */  { MAD_F(0x046f9e58) /* 0.277250619 */, 16 },
-  /* 1566 */  { MAD_F(0x0470960e) /* 0.277486854 */, 16 },
-  /* 1567 */  { MAD_F(0x04718dd1) /* 0.277723139 */, 16 },
-
-  /* 1568 */  { MAD_F(0x047285a2) /* 0.277959474 */, 16 },
-  /* 1569 */  { MAD_F(0x04737d80) /* 0.278195859 */, 16 },
-  /* 1570 */  { MAD_F(0x0474756c) /* 0.278432294 */, 16 },
-  /* 1571 */  { MAD_F(0x04756d65) /* 0.278668780 */, 16 },
-  /* 1572 */  { MAD_F(0x0476656b) /* 0.278905316 */, 16 },
-  /* 1573 */  { MAD_F(0x04775d7f) /* 0.279141902 */, 16 },
-  /* 1574 */  { MAD_F(0x047855a1) /* 0.279378538 */, 16 },
-  /* 1575 */  { MAD_F(0x04794dd0) /* 0.279615224 */, 16 },
-  /* 1576 */  { MAD_F(0x047a460c) /* 0.279851960 */, 16 },
-  /* 1577 */  { MAD_F(0x047b3e56) /* 0.280088747 */, 16 },
-  /* 1578 */  { MAD_F(0x047c36ae) /* 0.280325583 */, 16 },
-  /* 1579 */  { MAD_F(0x047d2f12) /* 0.280562470 */, 16 },
-  /* 1580 */  { MAD_F(0x047e2784) /* 0.280799406 */, 16 },
-  /* 1581 */  { MAD_F(0x047f2004) /* 0.281036393 */, 16 },
-  /* 1582 */  { MAD_F(0x04801891) /* 0.281273429 */, 16 },
-  /* 1583 */  { MAD_F(0x0481112b) /* 0.281510516 */, 16 },
-
-  /* 1584 */  { MAD_F(0x048209d3) /* 0.281747652 */, 16 },
-  /* 1585 */  { MAD_F(0x04830288) /* 0.281984838 */, 16 },
-  /* 1586 */  { MAD_F(0x0483fb4b) /* 0.282222075 */, 16 },
-  /* 1587 */  { MAD_F(0x0484f41b) /* 0.282459361 */, 16 },
-  /* 1588 */  { MAD_F(0x0485ecf8) /* 0.282696697 */, 16 },
-  /* 1589 */  { MAD_F(0x0486e5e3) /* 0.282934082 */, 16 },
-  /* 1590 */  { MAD_F(0x0487dedb) /* 0.283171518 */, 16 },
-  /* 1591 */  { MAD_F(0x0488d7e1) /* 0.283409003 */, 16 },
-  /* 1592 */  { MAD_F(0x0489d0f4) /* 0.283646538 */, 16 },
-  /* 1593 */  { MAD_F(0x048aca14) /* 0.283884123 */, 16 },
-  /* 1594 */  { MAD_F(0x048bc341) /* 0.284121757 */, 16 },
-  /* 1595 */  { MAD_F(0x048cbc7c) /* 0.284359441 */, 16 },
-  /* 1596 */  { MAD_F(0x048db5c4) /* 0.284597175 */, 16 },
-  /* 1597 */  { MAD_F(0x048eaf1a) /* 0.284834959 */, 16 },
-  /* 1598 */  { MAD_F(0x048fa87d) /* 0.285072792 */, 16 },
-  /* 1599 */  { MAD_F(0x0490a1ed) /* 0.285310675 */, 16 },
-
-  /* 1600 */  { MAD_F(0x04919b6a) /* 0.285548607 */, 16 },
-  /* 1601 */  { MAD_F(0x049294f5) /* 0.285786589 */, 16 },
-  /* 1602 */  { MAD_F(0x04938e8d) /* 0.286024621 */, 16 },
-  /* 1603 */  { MAD_F(0x04948833) /* 0.286262702 */, 16 },
-  /* 1604 */  { MAD_F(0x049581e5) /* 0.286500832 */, 16 },
-  /* 1605 */  { MAD_F(0x04967ba5) /* 0.286739012 */, 16 },
-  /* 1606 */  { MAD_F(0x04977573) /* 0.286977242 */, 16 },
-  /* 1607 */  { MAD_F(0x04986f4d) /* 0.287215521 */, 16 },
-  /* 1608 */  { MAD_F(0x04996935) /* 0.287453849 */, 16 },
-  /* 1609 */  { MAD_F(0x049a632a) /* 0.287692227 */, 16 },
-  /* 1610 */  { MAD_F(0x049b5d2c) /* 0.287930654 */, 16 },
-  /* 1611 */  { MAD_F(0x049c573c) /* 0.288169131 */, 16 },
-  /* 1612 */  { MAD_F(0x049d5159) /* 0.288407657 */, 16 },
-  /* 1613 */  { MAD_F(0x049e4b83) /* 0.288646232 */, 16 },
-  /* 1614 */  { MAD_F(0x049f45ba) /* 0.288884857 */, 16 },
-  /* 1615 */  { MAD_F(0x04a03ffe) /* 0.289123530 */, 16 },
-
-  /* 1616 */  { MAD_F(0x04a13a50) /* 0.289362253 */, 16 },
-  /* 1617 */  { MAD_F(0x04a234af) /* 0.289601026 */, 16 },
-  /* 1618 */  { MAD_F(0x04a32f1b) /* 0.289839847 */, 16 },
-  /* 1619 */  { MAD_F(0x04a42995) /* 0.290078718 */, 16 },
-  /* 1620 */  { MAD_F(0x04a5241b) /* 0.290317638 */, 16 },
-  /* 1621 */  { MAD_F(0x04a61eaf) /* 0.290556607 */, 16 },
-  /* 1622 */  { MAD_F(0x04a71950) /* 0.290795626 */, 16 },
-  /* 1623 */  { MAD_F(0x04a813fe) /* 0.291034693 */, 16 },
-  /* 1624 */  { MAD_F(0x04a90eba) /* 0.291273810 */, 16 },
-  /* 1625 */  { MAD_F(0x04aa0982) /* 0.291512975 */, 16 },
-  /* 1626 */  { MAD_F(0x04ab0458) /* 0.291752190 */, 16 },
-  /* 1627 */  { MAD_F(0x04abff3b) /* 0.291991453 */, 16 },
-  /* 1628 */  { MAD_F(0x04acfa2b) /* 0.292230766 */, 16 },
-  /* 1629 */  { MAD_F(0x04adf528) /* 0.292470128 */, 16 },
-  /* 1630 */  { MAD_F(0x04aef032) /* 0.292709539 */, 16 },
-  /* 1631 */  { MAD_F(0x04afeb4a) /* 0.292948998 */, 16 },
-
-  /* 1632 */  { MAD_F(0x04b0e66e) /* 0.293188507 */, 16 },
-  /* 1633 */  { MAD_F(0x04b1e1a0) /* 0.293428065 */, 16 },
-  /* 1634 */  { MAD_F(0x04b2dcdf) /* 0.293667671 */, 16 },
-  /* 1635 */  { MAD_F(0x04b3d82b) /* 0.293907326 */, 16 },
-  /* 1636 */  { MAD_F(0x04b4d384) /* 0.294147031 */, 16 },
-  /* 1637 */  { MAD_F(0x04b5ceea) /* 0.294386784 */, 16 },
-  /* 1638 */  { MAD_F(0x04b6ca5e) /* 0.294626585 */, 16 },
-  /* 1639 */  { MAD_F(0x04b7c5de) /* 0.294866436 */, 16 },
-  /* 1640 */  { MAD_F(0x04b8c16c) /* 0.295106336 */, 16 },
-  /* 1641 */  { MAD_F(0x04b9bd06) /* 0.295346284 */, 16 },
-  /* 1642 */  { MAD_F(0x04bab8ae) /* 0.295586281 */, 16 },
-  /* 1643 */  { MAD_F(0x04bbb463) /* 0.295826327 */, 16 },
-  /* 1644 */  { MAD_F(0x04bcb024) /* 0.296066421 */, 16 },
-  /* 1645 */  { MAD_F(0x04bdabf3) /* 0.296306564 */, 16 },
-  /* 1646 */  { MAD_F(0x04bea7cf) /* 0.296546756 */, 16 },
-  /* 1647 */  { MAD_F(0x04bfa3b8) /* 0.296786996 */, 16 },
-
-  /* 1648 */  { MAD_F(0x04c09faf) /* 0.297027285 */, 16 },
-  /* 1649 */  { MAD_F(0x04c19bb2) /* 0.297267623 */, 16 },
-  /* 1650 */  { MAD_F(0x04c297c2) /* 0.297508009 */, 16 },
-  /* 1651 */  { MAD_F(0x04c393df) /* 0.297748444 */, 16 },
-  /* 1652 */  { MAD_F(0x04c49009) /* 0.297988927 */, 16 },
-  /* 1653 */  { MAD_F(0x04c58c41) /* 0.298229459 */, 16 },
-  /* 1654 */  { MAD_F(0x04c68885) /* 0.298470039 */, 16 },
-  /* 1655 */  { MAD_F(0x04c784d6) /* 0.298710668 */, 16 },
-  /* 1656 */  { MAD_F(0x04c88135) /* 0.298951346 */, 16 },
-  /* 1657 */  { MAD_F(0x04c97da0) /* 0.299192071 */, 16 },
-  /* 1658 */  { MAD_F(0x04ca7a18) /* 0.299432846 */, 16 },
-  /* 1659 */  { MAD_F(0x04cb769e) /* 0.299673668 */, 16 },
-  /* 1660 */  { MAD_F(0x04cc7330) /* 0.299914539 */, 16 },
-  /* 1661 */  { MAD_F(0x04cd6fcf) /* 0.300155459 */, 16 },
-  /* 1662 */  { MAD_F(0x04ce6c7b) /* 0.300396426 */, 16 },
-  /* 1663 */  { MAD_F(0x04cf6935) /* 0.300637443 */, 16 },
-
-  /* 1664 */  { MAD_F(0x04d065fb) /* 0.300878507 */, 16 },
-  /* 1665 */  { MAD_F(0x04d162ce) /* 0.301119620 */, 16 },
-  /* 1666 */  { MAD_F(0x04d25fae) /* 0.301360781 */, 16 },
-  /* 1667 */  { MAD_F(0x04d35c9b) /* 0.301601990 */, 16 },
-  /* 1668 */  { MAD_F(0x04d45995) /* 0.301843247 */, 16 },
-  /* 1669 */  { MAD_F(0x04d5569c) /* 0.302084553 */, 16 },
-  /* 1670 */  { MAD_F(0x04d653b0) /* 0.302325907 */, 16 },
-  /* 1671 */  { MAD_F(0x04d750d1) /* 0.302567309 */, 16 },
-  /* 1672 */  { MAD_F(0x04d84dff) /* 0.302808759 */, 16 },
-  /* 1673 */  { MAD_F(0x04d94b3a) /* 0.303050257 */, 16 },
-  /* 1674 */  { MAD_F(0x04da4881) /* 0.303291804 */, 16 },
-  /* 1675 */  { MAD_F(0x04db45d6) /* 0.303533399 */, 16 },
-  /* 1676 */  { MAD_F(0x04dc4337) /* 0.303775041 */, 16 },
-  /* 1677 */  { MAD_F(0x04dd40a6) /* 0.304016732 */, 16 },
-  /* 1678 */  { MAD_F(0x04de3e21) /* 0.304258471 */, 16 },
-  /* 1679 */  { MAD_F(0x04df3ba9) /* 0.304500257 */, 16 },
-
-  /* 1680 */  { MAD_F(0x04e0393e) /* 0.304742092 */, 16 },
-  /* 1681 */  { MAD_F(0x04e136e0) /* 0.304983975 */, 16 },
-  /* 1682 */  { MAD_F(0x04e2348f) /* 0.305225906 */, 16 },
-  /* 1683 */  { MAD_F(0x04e3324b) /* 0.305467885 */, 16 },
-  /* 1684 */  { MAD_F(0x04e43013) /* 0.305709911 */, 16 },
-  /* 1685 */  { MAD_F(0x04e52de9) /* 0.305951986 */, 16 },
-  /* 1686 */  { MAD_F(0x04e62bcb) /* 0.306194108 */, 16 },
-  /* 1687 */  { MAD_F(0x04e729ba) /* 0.306436279 */, 16 },
-  /* 1688 */  { MAD_F(0x04e827b6) /* 0.306678497 */, 16 },
-  /* 1689 */  { MAD_F(0x04e925bf) /* 0.306920763 */, 16 },
-  /* 1690 */  { MAD_F(0x04ea23d4) /* 0.307163077 */, 16 },
-  /* 1691 */  { MAD_F(0x04eb21f7) /* 0.307405438 */, 16 },
-  /* 1692 */  { MAD_F(0x04ec2026) /* 0.307647848 */, 16 },
-  /* 1693 */  { MAD_F(0x04ed1e62) /* 0.307890305 */, 16 },
-  /* 1694 */  { MAD_F(0x04ee1cab) /* 0.308132810 */, 16 },
-  /* 1695 */  { MAD_F(0x04ef1b01) /* 0.308375362 */, 16 },
-
-  /* 1696 */  { MAD_F(0x04f01963) /* 0.308617963 */, 16 },
-  /* 1697 */  { MAD_F(0x04f117d3) /* 0.308860611 */, 16 },
-  /* 1698 */  { MAD_F(0x04f2164f) /* 0.309103306 */, 16 },
-  /* 1699 */  { MAD_F(0x04f314d8) /* 0.309346050 */, 16 },
-  /* 1700 */  { MAD_F(0x04f4136d) /* 0.309588841 */, 16 },
-  /* 1701 */  { MAD_F(0x04f51210) /* 0.309831679 */, 16 },
-  /* 1702 */  { MAD_F(0x04f610bf) /* 0.310074565 */, 16 },
-  /* 1703 */  { MAD_F(0x04f70f7b) /* 0.310317499 */, 16 },
-  /* 1704 */  { MAD_F(0x04f80e44) /* 0.310560480 */, 16 },
-  /* 1705 */  { MAD_F(0x04f90d19) /* 0.310803509 */, 16 },
-  /* 1706 */  { MAD_F(0x04fa0bfc) /* 0.311046586 */, 16 },
-  /* 1707 */  { MAD_F(0x04fb0aeb) /* 0.311289710 */, 16 },
-  /* 1708 */  { MAD_F(0x04fc09e7) /* 0.311532881 */, 16 },
-  /* 1709 */  { MAD_F(0x04fd08ef) /* 0.311776100 */, 16 },
-  /* 1710 */  { MAD_F(0x04fe0805) /* 0.312019366 */, 16 },
-  /* 1711 */  { MAD_F(0x04ff0727) /* 0.312262680 */, 16 },
-
-  /* 1712 */  { MAD_F(0x05000655) /* 0.312506041 */, 16 },
-  /* 1713 */  { MAD_F(0x05010591) /* 0.312749449 */, 16 },
-  /* 1714 */  { MAD_F(0x050204d9) /* 0.312992905 */, 16 },
-  /* 1715 */  { MAD_F(0x0503042e) /* 0.313236408 */, 16 },
-  /* 1716 */  { MAD_F(0x0504038f) /* 0.313479959 */, 16 },
-  /* 1717 */  { MAD_F(0x050502fe) /* 0.313723556 */, 16 },
-  /* 1718 */  { MAD_F(0x05060279) /* 0.313967202 */, 16 },
-  /* 1719 */  { MAD_F(0x05070200) /* 0.314210894 */, 16 },
-  /* 1720 */  { MAD_F(0x05080195) /* 0.314454634 */, 16 },
-  /* 1721 */  { MAD_F(0x05090136) /* 0.314698420 */, 16 },
-  /* 1722 */  { MAD_F(0x050a00e3) /* 0.314942255 */, 16 },
-  /* 1723 */  { MAD_F(0x050b009e) /* 0.315186136 */, 16 },
-  /* 1724 */  { MAD_F(0x050c0065) /* 0.315430064 */, 16 },
-  /* 1725 */  { MAD_F(0x050d0039) /* 0.315674040 */, 16 },
-  /* 1726 */  { MAD_F(0x050e0019) /* 0.315918063 */, 16 },
-  /* 1727 */  { MAD_F(0x050f0006) /* 0.316162133 */, 16 },
-
-  /* 1728 */  { MAD_F(0x05100000) /* 0.316406250 */, 16 },
-  /* 1729 */  { MAD_F(0x05110006) /* 0.316650414 */, 16 },
-  /* 1730 */  { MAD_F(0x05120019) /* 0.316894625 */, 16 },
-  /* 1731 */  { MAD_F(0x05130039) /* 0.317138884 */, 16 },
-  /* 1732 */  { MAD_F(0x05140065) /* 0.317383189 */, 16 },
-  /* 1733 */  { MAD_F(0x0515009e) /* 0.317627541 */, 16 },
-  /* 1734 */  { MAD_F(0x051600e3) /* 0.317871941 */, 16 },
-  /* 1735 */  { MAD_F(0x05170135) /* 0.318116387 */, 16 },
-  /* 1736 */  { MAD_F(0x05180194) /* 0.318360880 */, 16 },
-  /* 1737 */  { MAD_F(0x051901ff) /* 0.318605421 */, 16 },
-  /* 1738 */  { MAD_F(0x051a0277) /* 0.318850008 */, 16 },
-  /* 1739 */  { MAD_F(0x051b02fc) /* 0.319094642 */, 16 },
-  /* 1740 */  { MAD_F(0x051c038d) /* 0.319339323 */, 16 },
-  /* 1741 */  { MAD_F(0x051d042a) /* 0.319584051 */, 16 },
-  /* 1742 */  { MAD_F(0x051e04d4) /* 0.319828826 */, 16 },
-  /* 1743 */  { MAD_F(0x051f058b) /* 0.320073647 */, 16 },
-
-  /* 1744 */  { MAD_F(0x0520064f) /* 0.320318516 */, 16 },
-  /* 1745 */  { MAD_F(0x0521071f) /* 0.320563431 */, 16 },
-  /* 1746 */  { MAD_F(0x052207fb) /* 0.320808393 */, 16 },
-  /* 1747 */  { MAD_F(0x052308e4) /* 0.321053402 */, 16 },
-  /* 1748 */  { MAD_F(0x052409da) /* 0.321298457 */, 16 },
-  /* 1749 */  { MAD_F(0x05250adc) /* 0.321543560 */, 16 },
-  /* 1750 */  { MAD_F(0x05260bea) /* 0.321788709 */, 16 },
-  /* 1751 */  { MAD_F(0x05270d06) /* 0.322033904 */, 16 },
-  /* 1752 */  { MAD_F(0x05280e2d) /* 0.322279147 */, 16 },
-  /* 1753 */  { MAD_F(0x05290f62) /* 0.322524436 */, 16 },
-  /* 1754 */  { MAD_F(0x052a10a3) /* 0.322769771 */, 16 },
-  /* 1755 */  { MAD_F(0x052b11f0) /* 0.323015154 */, 16 },
-  /* 1756 */  { MAD_F(0x052c134a) /* 0.323260583 */, 16 },
-  /* 1757 */  { MAD_F(0x052d14b0) /* 0.323506058 */, 16 },
-  /* 1758 */  { MAD_F(0x052e1623) /* 0.323751580 */, 16 },
-  /* 1759 */  { MAD_F(0x052f17a2) /* 0.323997149 */, 16 },
-
-  /* 1760 */  { MAD_F(0x0530192e) /* 0.324242764 */, 16 },
-  /* 1761 */  { MAD_F(0x05311ac6) /* 0.324488426 */, 16 },
-  /* 1762 */  { MAD_F(0x05321c6b) /* 0.324734134 */, 16 },
-  /* 1763 */  { MAD_F(0x05331e1c) /* 0.324979889 */, 16 },
-  /* 1764 */  { MAD_F(0x05341fda) /* 0.325225690 */, 16 },
-  /* 1765 */  { MAD_F(0x053521a4) /* 0.325471538 */, 16 },
-  /* 1766 */  { MAD_F(0x0536237b) /* 0.325717432 */, 16 },
-  /* 1767 */  { MAD_F(0x0537255e) /* 0.325963372 */, 16 },
-  /* 1768 */  { MAD_F(0x0538274e) /* 0.326209359 */, 16 },
-  /* 1769 */  { MAD_F(0x0539294a) /* 0.326455392 */, 16 },
-  /* 1770 */  { MAD_F(0x053a2b52) /* 0.326701472 */, 16 },
-  /* 1771 */  { MAD_F(0x053b2d67) /* 0.326947598 */, 16 },
-  /* 1772 */  { MAD_F(0x053c2f89) /* 0.327193770 */, 16 },
-  /* 1773 */  { MAD_F(0x053d31b6) /* 0.327439989 */, 16 },
-  /* 1774 */  { MAD_F(0x053e33f1) /* 0.327686254 */, 16 },
-  /* 1775 */  { MAD_F(0x053f3637) /* 0.327932565 */, 16 },
-
-  /* 1776 */  { MAD_F(0x0540388a) /* 0.328178922 */, 16 },
-  /* 1777 */  { MAD_F(0x05413aea) /* 0.328425326 */, 16 },
-  /* 1778 */  { MAD_F(0x05423d56) /* 0.328671776 */, 16 },
-  /* 1779 */  { MAD_F(0x05433fce) /* 0.328918272 */, 16 },
-  /* 1780 */  { MAD_F(0x05444253) /* 0.329164814 */, 16 },
-  /* 1781 */  { MAD_F(0x054544e4) /* 0.329411403 */, 16 },
-  /* 1782 */  { MAD_F(0x05464781) /* 0.329658038 */, 16 },
-  /* 1783 */  { MAD_F(0x05474a2b) /* 0.329904718 */, 16 },
-  /* 1784 */  { MAD_F(0x05484ce2) /* 0.330151445 */, 16 },
-  /* 1785 */  { MAD_F(0x05494fa4) /* 0.330398218 */, 16 },
-  /* 1786 */  { MAD_F(0x054a5273) /* 0.330645037 */, 16 },
-  /* 1787 */  { MAD_F(0x054b554e) /* 0.330891903 */, 16 },
-  /* 1788 */  { MAD_F(0x054c5836) /* 0.331138814 */, 16 },
-  /* 1789 */  { MAD_F(0x054d5b2a) /* 0.331385771 */, 16 },
-  /* 1790 */  { MAD_F(0x054e5e2b) /* 0.331632774 */, 16 },
-  /* 1791 */  { MAD_F(0x054f6138) /* 0.331879824 */, 16 },
-
-  /* 1792 */  { MAD_F(0x05506451) /* 0.332126919 */, 16 },
-  /* 1793 */  { MAD_F(0x05516776) /* 0.332374060 */, 16 },
-  /* 1794 */  { MAD_F(0x05526aa8) /* 0.332621247 */, 16 },
-  /* 1795 */  { MAD_F(0x05536de6) /* 0.332868480 */, 16 },
-  /* 1796 */  { MAD_F(0x05547131) /* 0.333115759 */, 16 },
-  /* 1797 */  { MAD_F(0x05557487) /* 0.333363084 */, 16 },
-  /* 1798 */  { MAD_F(0x055677ea) /* 0.333610455 */, 16 },
-  /* 1799 */  { MAD_F(0x05577b5a) /* 0.333857872 */, 16 },
-  /* 1800 */  { MAD_F(0x05587ed5) /* 0.334105334 */, 16 },
-  /* 1801 */  { MAD_F(0x0559825e) /* 0.334352843 */, 16 },
-  /* 1802 */  { MAD_F(0x055a85f2) /* 0.334600397 */, 16 },
-  /* 1803 */  { MAD_F(0x055b8992) /* 0.334847997 */, 16 },
-  /* 1804 */  { MAD_F(0x055c8d3f) /* 0.335095642 */, 16 },
-  /* 1805 */  { MAD_F(0x055d90f9) /* 0.335343334 */, 16 },
-  /* 1806 */  { MAD_F(0x055e94be) /* 0.335591071 */, 16 },
-  /* 1807 */  { MAD_F(0x055f9890) /* 0.335838854 */, 16 },
-
-  /* 1808 */  { MAD_F(0x05609c6e) /* 0.336086683 */, 16 },
-  /* 1809 */  { MAD_F(0x0561a058) /* 0.336334557 */, 16 },
-  /* 1810 */  { MAD_F(0x0562a44f) /* 0.336582477 */, 16 },
-  /* 1811 */  { MAD_F(0x0563a851) /* 0.336830443 */, 16 },
-  /* 1812 */  { MAD_F(0x0564ac60) /* 0.337078454 */, 16 },
-  /* 1813 */  { MAD_F(0x0565b07c) /* 0.337326511 */, 16 },
-  /* 1814 */  { MAD_F(0x0566b4a3) /* 0.337574614 */, 16 },
-  /* 1815 */  { MAD_F(0x0567b8d7) /* 0.337822762 */, 16 },
-  /* 1816 */  { MAD_F(0x0568bd17) /* 0.338070956 */, 16 },
-  /* 1817 */  { MAD_F(0x0569c163) /* 0.338319195 */, 16 },
-  /* 1818 */  { MAD_F(0x056ac5bc) /* 0.338567480 */, 16 },
-  /* 1819 */  { MAD_F(0x056bca20) /* 0.338815811 */, 16 },
-  /* 1820 */  { MAD_F(0x056cce91) /* 0.339064186 */, 16 },
-  /* 1821 */  { MAD_F(0x056dd30e) /* 0.339312608 */, 16 },
-  /* 1822 */  { MAD_F(0x056ed798) /* 0.339561075 */, 16 },
-  /* 1823 */  { MAD_F(0x056fdc2d) /* 0.339809587 */, 16 },
-
-  /* 1824 */  { MAD_F(0x0570e0cf) /* 0.340058145 */, 16 },
-  /* 1825 */  { MAD_F(0x0571e57d) /* 0.340306748 */, 16 },
-  /* 1826 */  { MAD_F(0x0572ea37) /* 0.340555397 */, 16 },
-  /* 1827 */  { MAD_F(0x0573eefd) /* 0.340804091 */, 16 },
-  /* 1828 */  { MAD_F(0x0574f3d0) /* 0.341052830 */, 16 },
-  /* 1829 */  { MAD_F(0x0575f8ae) /* 0.341301615 */, 16 },
-  /* 1830 */  { MAD_F(0x0576fd99) /* 0.341550445 */, 16 },
-  /* 1831 */  { MAD_F(0x05780290) /* 0.341799321 */, 16 },
-  /* 1832 */  { MAD_F(0x05790793) /* 0.342048241 */, 16 },
-  /* 1833 */  { MAD_F(0x057a0ca3) /* 0.342297207 */, 16 },
-  /* 1834 */  { MAD_F(0x057b11be) /* 0.342546219 */, 16 },
-  /* 1835 */  { MAD_F(0x057c16e6) /* 0.342795275 */, 16 },
-  /* 1836 */  { MAD_F(0x057d1c1a) /* 0.343044377 */, 16 },
-  /* 1837 */  { MAD_F(0x057e2159) /* 0.343293524 */, 16 },
-  /* 1838 */  { MAD_F(0x057f26a6) /* 0.343542717 */, 16 },
-  /* 1839 */  { MAD_F(0x05802bfe) /* 0.343791954 */, 16 },
-
-  /* 1840 */  { MAD_F(0x05813162) /* 0.344041237 */, 16 },
-  /* 1841 */  { MAD_F(0x058236d2) /* 0.344290564 */, 16 },
-  /* 1842 */  { MAD_F(0x05833c4f) /* 0.344539937 */, 16 },
-  /* 1843 */  { MAD_F(0x058441d8) /* 0.344789356 */, 16 },
-  /* 1844 */  { MAD_F(0x0585476c) /* 0.345038819 */, 16 },
-  /* 1845 */  { MAD_F(0x05864d0d) /* 0.345288327 */, 16 },
-  /* 1846 */  { MAD_F(0x058752ba) /* 0.345537880 */, 16 },
-  /* 1847 */  { MAD_F(0x05885873) /* 0.345787479 */, 16 },
-  /* 1848 */  { MAD_F(0x05895e39) /* 0.346037122 */, 16 },
-  /* 1849 */  { MAD_F(0x058a640a) /* 0.346286811 */, 16 },
-  /* 1850 */  { MAD_F(0x058b69e7) /* 0.346536545 */, 16 },
-  /* 1851 */  { MAD_F(0x058c6fd1) /* 0.346786323 */, 16 },
-  /* 1852 */  { MAD_F(0x058d75c6) /* 0.347036147 */, 16 },
-  /* 1853 */  { MAD_F(0x058e7bc8) /* 0.347286015 */, 16 },
-  /* 1854 */  { MAD_F(0x058f81d5) /* 0.347535929 */, 16 },
-  /* 1855 */  { MAD_F(0x059087ef) /* 0.347785887 */, 16 },
-
-  /* 1856 */  { MAD_F(0x05918e15) /* 0.348035890 */, 16 },
-  /* 1857 */  { MAD_F(0x05929447) /* 0.348285939 */, 16 },
-  /* 1858 */  { MAD_F(0x05939a84) /* 0.348536032 */, 16 },
-  /* 1859 */  { MAD_F(0x0594a0ce) /* 0.348786170 */, 16 },
-  /* 1860 */  { MAD_F(0x0595a724) /* 0.349036353 */, 16 },
-  /* 1861 */  { MAD_F(0x0596ad86) /* 0.349286580 */, 16 },
-  /* 1862 */  { MAD_F(0x0597b3f4) /* 0.349536853 */, 16 },
-  /* 1863 */  { MAD_F(0x0598ba6e) /* 0.349787170 */, 16 },
-  /* 1864 */  { MAD_F(0x0599c0f4) /* 0.350037532 */, 16 },
-  /* 1865 */  { MAD_F(0x059ac786) /* 0.350287939 */, 16 },
-  /* 1866 */  { MAD_F(0x059bce25) /* 0.350538391 */, 16 },
-  /* 1867 */  { MAD_F(0x059cd4cf) /* 0.350788887 */, 16 },
-  /* 1868 */  { MAD_F(0x059ddb85) /* 0.351039428 */, 16 },
-  /* 1869 */  { MAD_F(0x059ee247) /* 0.351290014 */, 16 },
-  /* 1870 */  { MAD_F(0x059fe915) /* 0.351540645 */, 16 },
-  /* 1871 */  { MAD_F(0x05a0efef) /* 0.351791320 */, 16 },
-
-  /* 1872 */  { MAD_F(0x05a1f6d5) /* 0.352042040 */, 16 },
-  /* 1873 */  { MAD_F(0x05a2fdc7) /* 0.352292804 */, 16 },
-  /* 1874 */  { MAD_F(0x05a404c5) /* 0.352543613 */, 16 },
-  /* 1875 */  { MAD_F(0x05a50bcf) /* 0.352794467 */, 16 },
-  /* 1876 */  { MAD_F(0x05a612e5) /* 0.353045365 */, 16 },
-  /* 1877 */  { MAD_F(0x05a71a07) /* 0.353296308 */, 16 },
-  /* 1878 */  { MAD_F(0x05a82135) /* 0.353547296 */, 16 },
-  /* 1879 */  { MAD_F(0x05a9286f) /* 0.353798328 */, 16 },
-  /* 1880 */  { MAD_F(0x05aa2fb5) /* 0.354049405 */, 16 },
-  /* 1881 */  { MAD_F(0x05ab3707) /* 0.354300526 */, 16 },
-  /* 1882 */  { MAD_F(0x05ac3e65) /* 0.354551691 */, 16 },
-  /* 1883 */  { MAD_F(0x05ad45ce) /* 0.354802901 */, 16 },
-  /* 1884 */  { MAD_F(0x05ae4d44) /* 0.355054156 */, 16 },
-  /* 1885 */  { MAD_F(0x05af54c6) /* 0.355305455 */, 16 },
-  /* 1886 */  { MAD_F(0x05b05c53) /* 0.355556799 */, 16 },
-  /* 1887 */  { MAD_F(0x05b163ed) /* 0.355808187 */, 16 },
-
-  /* 1888 */  { MAD_F(0x05b26b92) /* 0.356059619 */, 16 },
-  /* 1889 */  { MAD_F(0x05b37343) /* 0.356311096 */, 16 },
-  /* 1890 */  { MAD_F(0x05b47b00) /* 0.356562617 */, 16 },
-  /* 1891 */  { MAD_F(0x05b582c9) /* 0.356814182 */, 16 },
-  /* 1892 */  { MAD_F(0x05b68a9e) /* 0.357065792 */, 16 },
-  /* 1893 */  { MAD_F(0x05b7927f) /* 0.357317446 */, 16 },
-  /* 1894 */  { MAD_F(0x05b89a6c) /* 0.357569145 */, 16 },
-  /* 1895 */  { MAD_F(0x05b9a265) /* 0.357820887 */, 16 },
-  /* 1896 */  { MAD_F(0x05baaa69) /* 0.358072674 */, 16 },
-  /* 1897 */  { MAD_F(0x05bbb27a) /* 0.358324506 */, 16 },
-  /* 1898 */  { MAD_F(0x05bcba96) /* 0.358576381 */, 16 },
-  /* 1899 */  { MAD_F(0x05bdc2be) /* 0.358828301 */, 16 },
-  /* 1900 */  { MAD_F(0x05becaf2) /* 0.359080265 */, 16 },
-  /* 1901 */  { MAD_F(0x05bfd332) /* 0.359332273 */, 16 },
-  /* 1902 */  { MAD_F(0x05c0db7e) /* 0.359584326 */, 16 },
-  /* 1903 */  { MAD_F(0x05c1e3d6) /* 0.359836423 */, 16 },
-
-  /* 1904 */  { MAD_F(0x05c2ec39) /* 0.360088563 */, 16 },
-  /* 1905 */  { MAD_F(0x05c3f4a9) /* 0.360340748 */, 16 },
-  /* 1906 */  { MAD_F(0x05c4fd24) /* 0.360592977 */, 16 },
-  /* 1907 */  { MAD_F(0x05c605ab) /* 0.360845251 */, 16 },
-  /* 1908 */  { MAD_F(0x05c70e3e) /* 0.361097568 */, 16 },
-  /* 1909 */  { MAD_F(0x05c816dd) /* 0.361349929 */, 16 },
-  /* 1910 */  { MAD_F(0x05c91f87) /* 0.361602335 */, 16 },
-  /* 1911 */  { MAD_F(0x05ca283e) /* 0.361854784 */, 16 },
-  /* 1912 */  { MAD_F(0x05cb3100) /* 0.362107278 */, 16 },
-  /* 1913 */  { MAD_F(0x05cc39ce) /* 0.362359815 */, 16 },
-  /* 1914 */  { MAD_F(0x05cd42a8) /* 0.362612397 */, 16 },
-  /* 1915 */  { MAD_F(0x05ce4b8d) /* 0.362865022 */, 16 },
-  /* 1916 */  { MAD_F(0x05cf547f) /* 0.363117692 */, 16 },
-  /* 1917 */  { MAD_F(0x05d05d7c) /* 0.363370405 */, 16 },
-  /* 1918 */  { MAD_F(0x05d16685) /* 0.363623163 */, 16 },
-  /* 1919 */  { MAD_F(0x05d26f9a) /* 0.363875964 */, 16 },
-
-  /* 1920 */  { MAD_F(0x05d378bb) /* 0.364128809 */, 16 },
-  /* 1921 */  { MAD_F(0x05d481e7) /* 0.364381698 */, 16 },
-  /* 1922 */  { MAD_F(0x05d58b1f) /* 0.364634632 */, 16 },
-  /* 1923 */  { MAD_F(0x05d69463) /* 0.364887608 */, 16 },
-  /* 1924 */  { MAD_F(0x05d79db3) /* 0.365140629 */, 16 },
-  /* 1925 */  { MAD_F(0x05d8a70f) /* 0.365393694 */, 16 },
-  /* 1926 */  { MAD_F(0x05d9b076) /* 0.365646802 */, 16 },
-  /* 1927 */  { MAD_F(0x05dab9e9) /* 0.365899955 */, 16 },
-  /* 1928 */  { MAD_F(0x05dbc368) /* 0.366153151 */, 16 },
-  /* 1929 */  { MAD_F(0x05dcccf2) /* 0.366406390 */, 16 },
-  /* 1930 */  { MAD_F(0x05ddd689) /* 0.366659674 */, 16 },
-  /* 1931 */  { MAD_F(0x05dee02b) /* 0.366913001 */, 16 },
-  /* 1932 */  { MAD_F(0x05dfe9d8) /* 0.367166372 */, 16 },
-  /* 1933 */  { MAD_F(0x05e0f392) /* 0.367419787 */, 16 },
-  /* 1934 */  { MAD_F(0x05e1fd57) /* 0.367673246 */, 16 },
-  /* 1935 */  { MAD_F(0x05e30728) /* 0.367926748 */, 16 },
-
-  /* 1936 */  { MAD_F(0x05e41105) /* 0.368180294 */, 16 },
-  /* 1937 */  { MAD_F(0x05e51aed) /* 0.368433883 */, 16 },
-  /* 1938 */  { MAD_F(0x05e624e1) /* 0.368687517 */, 16 },
-  /* 1939 */  { MAD_F(0x05e72ee1) /* 0.368941193 */, 16 },
-  /* 1940 */  { MAD_F(0x05e838ed) /* 0.369194914 */, 16 },
-  /* 1941 */  { MAD_F(0x05e94304) /* 0.369448678 */, 16 },
-  /* 1942 */  { MAD_F(0x05ea4d27) /* 0.369702485 */, 16 },
-  /* 1943 */  { MAD_F(0x05eb5756) /* 0.369956336 */, 16 },
-  /* 1944 */  { MAD_F(0x05ec6190) /* 0.370210231 */, 16 },
-  /* 1945 */  { MAD_F(0x05ed6bd6) /* 0.370464169 */, 16 },
-  /* 1946 */  { MAD_F(0x05ee7628) /* 0.370718151 */, 16 },
-  /* 1947 */  { MAD_F(0x05ef8085) /* 0.370972177 */, 16 },
-  /* 1948 */  { MAD_F(0x05f08aee) /* 0.371226245 */, 16 },
-  /* 1949 */  { MAD_F(0x05f19563) /* 0.371480358 */, 16 },
-  /* 1950 */  { MAD_F(0x05f29fe3) /* 0.371734513 */, 16 },
-  /* 1951 */  { MAD_F(0x05f3aa6f) /* 0.371988712 */, 16 },
-
-  /* 1952 */  { MAD_F(0x05f4b507) /* 0.372242955 */, 16 },
-  /* 1953 */  { MAD_F(0x05f5bfab) /* 0.372497241 */, 16 },
-  /* 1954 */  { MAD_F(0x05f6ca5a) /* 0.372751570 */, 16 },
-  /* 1955 */  { MAD_F(0x05f7d514) /* 0.373005943 */, 16 },
-  /* 1956 */  { MAD_F(0x05f8dfdb) /* 0.373260359 */, 16 },
-  /* 1957 */  { MAD_F(0x05f9eaad) /* 0.373514819 */, 16 },
-  /* 1958 */  { MAD_F(0x05faf58a) /* 0.373769322 */, 16 },
-  /* 1959 */  { MAD_F(0x05fc0073) /* 0.374023868 */, 16 },
-  /* 1960 */  { MAD_F(0x05fd0b68) /* 0.374278458 */, 16 },
-  /* 1961 */  { MAD_F(0x05fe1669) /* 0.374533091 */, 16 },
-  /* 1962 */  { MAD_F(0x05ff2175) /* 0.374787767 */, 16 },
-  /* 1963 */  { MAD_F(0x06002c8d) /* 0.375042486 */, 16 },
-  /* 1964 */  { MAD_F(0x060137b0) /* 0.375297249 */, 16 },
-  /* 1965 */  { MAD_F(0x060242df) /* 0.375552055 */, 16 },
-  /* 1966 */  { MAD_F(0x06034e19) /* 0.375806904 */, 16 },
-  /* 1967 */  { MAD_F(0x0604595f) /* 0.376061796 */, 16 },
-
-  /* 1968 */  { MAD_F(0x060564b1) /* 0.376316732 */, 16 },
-  /* 1969 */  { MAD_F(0x0606700f) /* 0.376571710 */, 16 },
-  /* 1970 */  { MAD_F(0x06077b77) /* 0.376826732 */, 16 },
-  /* 1971 */  { MAD_F(0x060886ec) /* 0.377081797 */, 16 },
-  /* 1972 */  { MAD_F(0x0609926c) /* 0.377336905 */, 16 },
-  /* 1973 */  { MAD_F(0x060a9df8) /* 0.377592057 */, 16 },
-  /* 1974 */  { MAD_F(0x060ba98f) /* 0.377847251 */, 16 },
-  /* 1975 */  { MAD_F(0x060cb532) /* 0.378102489 */, 16 },
-  /* 1976 */  { MAD_F(0x060dc0e0) /* 0.378357769 */, 16 },
-  /* 1977 */  { MAD_F(0x060ecc9a) /* 0.378613093 */, 16 },
-  /* 1978 */  { MAD_F(0x060fd860) /* 0.378868460 */, 16 },
-  /* 1979 */  { MAD_F(0x0610e431) /* 0.379123870 */, 16 },
-  /* 1980 */  { MAD_F(0x0611f00d) /* 0.379379322 */, 16 },
-  /* 1981 */  { MAD_F(0x0612fbf5) /* 0.379634818 */, 16 },
-  /* 1982 */  { MAD_F(0x061407e9) /* 0.379890357 */, 16 },
-  /* 1983 */  { MAD_F(0x061513e8) /* 0.380145939 */, 16 },
-
-  /* 1984 */  { MAD_F(0x06161ff3) /* 0.380401563 */, 16 },
-  /* 1985 */  { MAD_F(0x06172c09) /* 0.380657231 */, 16 },
-  /* 1986 */  { MAD_F(0x0618382b) /* 0.380912942 */, 16 },
-  /* 1987 */  { MAD_F(0x06194458) /* 0.381168695 */, 16 },
-  /* 1988 */  { MAD_F(0x061a5091) /* 0.381424492 */, 16 },
-  /* 1989 */  { MAD_F(0x061b5cd5) /* 0.381680331 */, 16 },
-  /* 1990 */  { MAD_F(0x061c6925) /* 0.381936213 */, 16 },
-  /* 1991 */  { MAD_F(0x061d7581) /* 0.382192138 */, 16 },
-  /* 1992 */  { MAD_F(0x061e81e8) /* 0.382448106 */, 16 },
-  /* 1993 */  { MAD_F(0x061f8e5a) /* 0.382704117 */, 16 },
-  /* 1994 */  { MAD_F(0x06209ad8) /* 0.382960171 */, 16 },
-  /* 1995 */  { MAD_F(0x0621a761) /* 0.383216267 */, 16 },
-  /* 1996 */  { MAD_F(0x0622b3f6) /* 0.383472406 */, 16 },
-  /* 1997 */  { MAD_F(0x0623c096) /* 0.383728588 */, 16 },
-  /* 1998 */  { MAD_F(0x0624cd42) /* 0.383984813 */, 16 },
-  /* 1999 */  { MAD_F(0x0625d9f9) /* 0.384241080 */, 16 },
-
-  /* 2000 */  { MAD_F(0x0626e6bc) /* 0.384497391 */, 16 },
-  /* 2001 */  { MAD_F(0x0627f38a) /* 0.384753744 */, 16 },
-  /* 2002 */  { MAD_F(0x06290064) /* 0.385010139 */, 16 },
-  /* 2003 */  { MAD_F(0x062a0d49) /* 0.385266578 */, 16 },
-  /* 2004 */  { MAD_F(0x062b1a3a) /* 0.385523059 */, 16 },
-  /* 2005 */  { MAD_F(0x062c2736) /* 0.385779582 */, 16 },
-  /* 2006 */  { MAD_F(0x062d343d) /* 0.386036149 */, 16 },
-  /* 2007 */  { MAD_F(0x062e4150) /* 0.386292758 */, 16 },
-  /* 2008 */  { MAD_F(0x062f4e6f) /* 0.386549409 */, 16 },
-  /* 2009 */  { MAD_F(0x06305b99) /* 0.386806104 */, 16 },
-  /* 2010 */  { MAD_F(0x063168ce) /* 0.387062840 */, 16 },
-  /* 2011 */  { MAD_F(0x0632760f) /* 0.387319620 */, 16 },
-  /* 2012 */  { MAD_F(0x0633835b) /* 0.387576442 */, 16 },
-  /* 2013 */  { MAD_F(0x063490b2) /* 0.387833306 */, 16 },
-  /* 2014 */  { MAD_F(0x06359e15) /* 0.388090213 */, 16 },
-  /* 2015 */  { MAD_F(0x0636ab83) /* 0.388347163 */, 16 },
-
-  /* 2016 */  { MAD_F(0x0637b8fd) /* 0.388604155 */, 16 },
-  /* 2017 */  { MAD_F(0x0638c682) /* 0.388861190 */, 16 },
-  /* 2018 */  { MAD_F(0x0639d413) /* 0.389118267 */, 16 },
-  /* 2019 */  { MAD_F(0x063ae1af) /* 0.389375386 */, 16 },
-  /* 2020 */  { MAD_F(0x063bef56) /* 0.389632548 */, 16 },
-  /* 2021 */  { MAD_F(0x063cfd09) /* 0.389889752 */, 16 },
-  /* 2022 */  { MAD_F(0x063e0ac7) /* 0.390146999 */, 16 },
-  /* 2023 */  { MAD_F(0x063f1891) /* 0.390404289 */, 16 },
-  /* 2024 */  { MAD_F(0x06402666) /* 0.390661620 */, 16 },
-  /* 2025 */  { MAD_F(0x06413446) /* 0.390918994 */, 16 },
-  /* 2026 */  { MAD_F(0x06424232) /* 0.391176411 */, 16 },
-  /* 2027 */  { MAD_F(0x06435029) /* 0.391433869 */, 16 },
-  /* 2028 */  { MAD_F(0x06445e2b) /* 0.391691371 */, 16 },
-  /* 2029 */  { MAD_F(0x06456c39) /* 0.391948914 */, 16 },
-  /* 2030 */  { MAD_F(0x06467a52) /* 0.392206500 */, 16 },
-  /* 2031 */  { MAD_F(0x06478877) /* 0.392464128 */, 16 },
-
-  /* 2032 */  { MAD_F(0x064896a7) /* 0.392721798 */, 16 },
-  /* 2033 */  { MAD_F(0x0649a4e2) /* 0.392979511 */, 16 },
-  /* 2034 */  { MAD_F(0x064ab328) /* 0.393237266 */, 16 },
-  /* 2035 */  { MAD_F(0x064bc17a) /* 0.393495063 */, 16 },
-  /* 2036 */  { MAD_F(0x064ccfd8) /* 0.393752902 */, 16 },
-  /* 2037 */  { MAD_F(0x064dde40) /* 0.394010784 */, 16 },
-  /* 2038 */  { MAD_F(0x064eecb4) /* 0.394268707 */, 16 },
-  /* 2039 */  { MAD_F(0x064ffb33) /* 0.394526673 */, 16 },
-  /* 2040 */  { MAD_F(0x065109be) /* 0.394784681 */, 16 },
-  /* 2041 */  { MAD_F(0x06521854) /* 0.395042732 */, 16 },
-  /* 2042 */  { MAD_F(0x065326f5) /* 0.395300824 */, 16 },
-  /* 2043 */  { MAD_F(0x065435a1) /* 0.395558959 */, 16 },
-  /* 2044 */  { MAD_F(0x06554459) /* 0.395817135 */, 16 },
-  /* 2045 */  { MAD_F(0x0656531c) /* 0.396075354 */, 16 },
-  /* 2046 */  { MAD_F(0x065761ea) /* 0.396333615 */, 16 },
-  /* 2047 */  { MAD_F(0x065870c4) /* 0.396591918 */, 16 },
-
-  /* 2048 */  { MAD_F(0x06597fa9) /* 0.396850263 */, 16 },
-  /* 2049 */  { MAD_F(0x065a8e99) /* 0.397108650 */, 16 },
-  /* 2050 */  { MAD_F(0x065b9d95) /* 0.397367079 */, 16 },
-  /* 2051 */  { MAD_F(0x065cac9c) /* 0.397625550 */, 16 },
-  /* 2052 */  { MAD_F(0x065dbbae) /* 0.397884063 */, 16 },
-  /* 2053 */  { MAD_F(0x065ecacb) /* 0.398142619 */, 16 },
-  /* 2054 */  { MAD_F(0x065fd9f4) /* 0.398401216 */, 16 },
-  /* 2055 */  { MAD_F(0x0660e928) /* 0.398659855 */, 16 },
-  /* 2056 */  { MAD_F(0x0661f867) /* 0.398918536 */, 16 },
-  /* 2057 */  { MAD_F(0x066307b1) /* 0.399177259 */, 16 },
-  /* 2058 */  { MAD_F(0x06641707) /* 0.399436024 */, 16 },
-  /* 2059 */  { MAD_F(0x06652668) /* 0.399694831 */, 16 },
-  /* 2060 */  { MAD_F(0x066635d4) /* 0.399953679 */, 16 },
-  /* 2061 */  { MAD_F(0x0667454c) /* 0.400212570 */, 16 },
-  /* 2062 */  { MAD_F(0x066854ce) /* 0.400471503 */, 16 },
-  /* 2063 */  { MAD_F(0x0669645c) /* 0.400730477 */, 16 },
-
-  /* 2064 */  { MAD_F(0x066a73f5) /* 0.400989493 */, 16 },
-  /* 2065 */  { MAD_F(0x066b839a) /* 0.401248551 */, 16 },
-  /* 2066 */  { MAD_F(0x066c9349) /* 0.401507651 */, 16 },
-  /* 2067 */  { MAD_F(0x066da304) /* 0.401766793 */, 16 },
-  /* 2068 */  { MAD_F(0x066eb2ca) /* 0.402025976 */, 16 },
-  /* 2069 */  { MAD_F(0x066fc29b) /* 0.402285202 */, 16 },
-  /* 2070 */  { MAD_F(0x0670d278) /* 0.402544469 */, 16 },
-  /* 2071 */  { MAD_F(0x0671e25f) /* 0.402803777 */, 16 },
-  /* 2072 */  { MAD_F(0x0672f252) /* 0.403063128 */, 16 },
-  /* 2073 */  { MAD_F(0x06740250) /* 0.403322520 */, 16 },
-  /* 2074 */  { MAD_F(0x0675125a) /* 0.403581954 */, 16 },
-  /* 2075 */  { MAD_F(0x0676226e) /* 0.403841430 */, 16 },
-  /* 2076 */  { MAD_F(0x0677328e) /* 0.404100947 */, 16 },
-  /* 2077 */  { MAD_F(0x067842b9) /* 0.404360506 */, 16 },
-  /* 2078 */  { MAD_F(0x067952ef) /* 0.404620107 */, 16 },
-  /* 2079 */  { MAD_F(0x067a6330) /* 0.404879749 */, 16 },
-
-  /* 2080 */  { MAD_F(0x067b737c) /* 0.405139433 */, 16 },
-  /* 2081 */  { MAD_F(0x067c83d4) /* 0.405399159 */, 16 },
-  /* 2082 */  { MAD_F(0x067d9436) /* 0.405658926 */, 16 },
-  /* 2083 */  { MAD_F(0x067ea4a4) /* 0.405918735 */, 16 },
-  /* 2084 */  { MAD_F(0x067fb51d) /* 0.406178585 */, 16 },
-  /* 2085 */  { MAD_F(0x0680c5a2) /* 0.406438477 */, 16 },
-  /* 2086 */  { MAD_F(0x0681d631) /* 0.406698410 */, 16 },
-  /* 2087 */  { MAD_F(0x0682e6cb) /* 0.406958385 */, 16 },
-  /* 2088 */  { MAD_F(0x0683f771) /* 0.407218402 */, 16 },
-  /* 2089 */  { MAD_F(0x06850822) /* 0.407478460 */, 16 },
-  /* 2090 */  { MAD_F(0x068618de) /* 0.407738559 */, 16 },
-  /* 2091 */  { MAD_F(0x068729a5) /* 0.407998700 */, 16 },
-  /* 2092 */  { MAD_F(0x06883a77) /* 0.408258883 */, 16 },
-  /* 2093 */  { MAD_F(0x06894b55) /* 0.408519107 */, 16 },
-  /* 2094 */  { MAD_F(0x068a5c3d) /* 0.408779372 */, 16 },
-  /* 2095 */  { MAD_F(0x068b6d31) /* 0.409039679 */, 16 },
-
-  /* 2096 */  { MAD_F(0x068c7e2f) /* 0.409300027 */, 16 },
-  /* 2097 */  { MAD_F(0x068d8f39) /* 0.409560417 */, 16 },
-  /* 2098 */  { MAD_F(0x068ea04e) /* 0.409820848 */, 16 },
-  /* 2099 */  { MAD_F(0x068fb16e) /* 0.410081321 */, 16 },
-  /* 2100 */  { MAD_F(0x0690c299) /* 0.410341834 */, 16 },
-  /* 2101 */  { MAD_F(0x0691d3cf) /* 0.410602390 */, 16 },
-  /* 2102 */  { MAD_F(0x0692e511) /* 0.410862986 */, 16 },
-  /* 2103 */  { MAD_F(0x0693f65d) /* 0.411123624 */, 16 },
-  /* 2104 */  { MAD_F(0x069507b5) /* 0.411384303 */, 16 },
-  /* 2105 */  { MAD_F(0x06961917) /* 0.411645024 */, 16 },
-  /* 2106 */  { MAD_F(0x06972a85) /* 0.411905785 */, 16 },
-  /* 2107 */  { MAD_F(0x06983bfe) /* 0.412166588 */, 16 },
-  /* 2108 */  { MAD_F(0x06994d82) /* 0.412427433 */, 16 },
-  /* 2109 */  { MAD_F(0x069a5f11) /* 0.412688318 */, 16 },
-  /* 2110 */  { MAD_F(0x069b70ab) /* 0.412949245 */, 16 },
-  /* 2111 */  { MAD_F(0x069c8250) /* 0.413210213 */, 16 },
-
-  /* 2112 */  { MAD_F(0x069d9400) /* 0.413471222 */, 16 },
-  /* 2113 */  { MAD_F(0x069ea5bb) /* 0.413732273 */, 16 },
-  /* 2114 */  { MAD_F(0x069fb781) /* 0.413993364 */, 16 },
-  /* 2115 */  { MAD_F(0x06a0c953) /* 0.414254497 */, 16 },
-  /* 2116 */  { MAD_F(0x06a1db2f) /* 0.414515671 */, 16 },
-  /* 2117 */  { MAD_F(0x06a2ed16) /* 0.414776886 */, 16 },
-  /* 2118 */  { MAD_F(0x06a3ff09) /* 0.415038142 */, 16 },
-  /* 2119 */  { MAD_F(0x06a51106) /* 0.415299440 */, 16 },
-  /* 2120 */  { MAD_F(0x06a6230f) /* 0.415560778 */, 16 },
-  /* 2121 */  { MAD_F(0x06a73522) /* 0.415822157 */, 16 },
-  /* 2122 */  { MAD_F(0x06a84741) /* 0.416083578 */, 16 },
-  /* 2123 */  { MAD_F(0x06a9596a) /* 0.416345040 */, 16 },
-  /* 2124 */  { MAD_F(0x06aa6b9f) /* 0.416606542 */, 16 },
-  /* 2125 */  { MAD_F(0x06ab7ddf) /* 0.416868086 */, 16 },
-  /* 2126 */  { MAD_F(0x06ac9029) /* 0.417129671 */, 16 },
-  /* 2127 */  { MAD_F(0x06ada27f) /* 0.417391297 */, 16 },
-
-  /* 2128 */  { MAD_F(0x06aeb4e0) /* 0.417652964 */, 16 },
-  /* 2129 */  { MAD_F(0x06afc74b) /* 0.417914672 */, 16 },
-  /* 2130 */  { MAD_F(0x06b0d9c2) /* 0.418176420 */, 16 },
-  /* 2131 */  { MAD_F(0x06b1ec43) /* 0.418438210 */, 16 },
-  /* 2132 */  { MAD_F(0x06b2fed0) /* 0.418700041 */, 16 },
-  /* 2133 */  { MAD_F(0x06b41168) /* 0.418961912 */, 16 },
-  /* 2134 */  { MAD_F(0x06b5240a) /* 0.419223825 */, 16 },
-  /* 2135 */  { MAD_F(0x06b636b8) /* 0.419485778 */, 16 },
-  /* 2136 */  { MAD_F(0x06b74971) /* 0.419747773 */, 16 },
-  /* 2137 */  { MAD_F(0x06b85c34) /* 0.420009808 */, 16 },
-  /* 2138 */  { MAD_F(0x06b96f03) /* 0.420271884 */, 16 },
-  /* 2139 */  { MAD_F(0x06ba81dc) /* 0.420534001 */, 16 },
-  /* 2140 */  { MAD_F(0x06bb94c1) /* 0.420796159 */, 16 },
-  /* 2141 */  { MAD_F(0x06bca7b0) /* 0.421058358 */, 16 },
-  /* 2142 */  { MAD_F(0x06bdbaaa) /* 0.421320597 */, 16 },
-  /* 2143 */  { MAD_F(0x06becdb0) /* 0.421582878 */, 16 },
-
-  /* 2144 */  { MAD_F(0x06bfe0c0) /* 0.421845199 */, 16 },
-  /* 2145 */  { MAD_F(0x06c0f3db) /* 0.422107561 */, 16 },
-  /* 2146 */  { MAD_F(0x06c20702) /* 0.422369964 */, 16 },
-  /* 2147 */  { MAD_F(0x06c31a33) /* 0.422632407 */, 16 },
-  /* 2148 */  { MAD_F(0x06c42d6f) /* 0.422894891 */, 16 },
-  /* 2149 */  { MAD_F(0x06c540b6) /* 0.423157416 */, 16 },
-  /* 2150 */  { MAD_F(0x06c65408) /* 0.423419982 */, 16 },
-  /* 2151 */  { MAD_F(0x06c76765) /* 0.423682588 */, 16 },
-  /* 2152 */  { MAD_F(0x06c87acc) /* 0.423945235 */, 16 },
-  /* 2153 */  { MAD_F(0x06c98e3f) /* 0.424207923 */, 16 },
-  /* 2154 */  { MAD_F(0x06caa1bd) /* 0.424470652 */, 16 },
-  /* 2155 */  { MAD_F(0x06cbb545) /* 0.424733421 */, 16 },
-  /* 2156 */  { MAD_F(0x06ccc8d9) /* 0.424996230 */, 16 },
-  /* 2157 */  { MAD_F(0x06cddc77) /* 0.425259081 */, 16 },
-  /* 2158 */  { MAD_F(0x06cef020) /* 0.425521972 */, 16 },
-  /* 2159 */  { MAD_F(0x06d003d4) /* 0.425784903 */, 16 },
-
-  /* 2160 */  { MAD_F(0x06d11794) /* 0.426047876 */, 16 },
-  /* 2161 */  { MAD_F(0x06d22b5e) /* 0.426310889 */, 16 },
-  /* 2162 */  { MAD_F(0x06d33f32) /* 0.426573942 */, 16 },
-  /* 2163 */  { MAD_F(0x06d45312) /* 0.426837036 */, 16 },
-  /* 2164 */  { MAD_F(0x06d566fd) /* 0.427100170 */, 16 },
-  /* 2165 */  { MAD_F(0x06d67af2) /* 0.427363345 */, 16 },
-  /* 2166 */  { MAD_F(0x06d78ef3) /* 0.427626561 */, 16 },
-  /* 2167 */  { MAD_F(0x06d8a2fe) /* 0.427889817 */, 16 },
-  /* 2168 */  { MAD_F(0x06d9b714) /* 0.428153114 */, 16 },
-  /* 2169 */  { MAD_F(0x06dacb35) /* 0.428416451 */, 16 },
-  /* 2170 */  { MAD_F(0x06dbdf61) /* 0.428679828 */, 16 },
-  /* 2171 */  { MAD_F(0x06dcf398) /* 0.428943246 */, 16 },
-  /* 2172 */  { MAD_F(0x06de07d9) /* 0.429206704 */, 16 },
-  /* 2173 */  { MAD_F(0x06df1c26) /* 0.429470203 */, 16 },
-  /* 2174 */  { MAD_F(0x06e0307d) /* 0.429733743 */, 16 },
-  /* 2175 */  { MAD_F(0x06e144df) /* 0.429997322 */, 16 },
-
-  /* 2176 */  { MAD_F(0x06e2594c) /* 0.430260942 */, 16 },
-  /* 2177 */  { MAD_F(0x06e36dc4) /* 0.430524603 */, 16 },
-  /* 2178 */  { MAD_F(0x06e48246) /* 0.430788304 */, 16 },
-  /* 2179 */  { MAD_F(0x06e596d4) /* 0.431052045 */, 16 },
-  /* 2180 */  { MAD_F(0x06e6ab6c) /* 0.431315826 */, 16 },
-  /* 2181 */  { MAD_F(0x06e7c00f) /* 0.431579648 */, 16 },
-  /* 2182 */  { MAD_F(0x06e8d4bd) /* 0.431843511 */, 16 },
-  /* 2183 */  { MAD_F(0x06e9e976) /* 0.432107413 */, 16 },
-  /* 2184 */  { MAD_F(0x06eafe3a) /* 0.432371356 */, 16 },
-  /* 2185 */  { MAD_F(0x06ec1308) /* 0.432635339 */, 16 },
-  /* 2186 */  { MAD_F(0x06ed27e2) /* 0.432899362 */, 16 },
-  /* 2187 */  { MAD_F(0x06ee3cc6) /* 0.433163426 */, 16 },
-  /* 2188 */  { MAD_F(0x06ef51b4) /* 0.433427530 */, 16 },
-  /* 2189 */  { MAD_F(0x06f066ae) /* 0.433691674 */, 16 },
-  /* 2190 */  { MAD_F(0x06f17bb3) /* 0.433955859 */, 16 },
-  /* 2191 */  { MAD_F(0x06f290c2) /* 0.434220083 */, 16 },
-
-  /* 2192 */  { MAD_F(0x06f3a5dc) /* 0.434484348 */, 16 },
-  /* 2193 */  { MAD_F(0x06f4bb01) /* 0.434748653 */, 16 },
-  /* 2194 */  { MAD_F(0x06f5d030) /* 0.435012998 */, 16 },
-  /* 2195 */  { MAD_F(0x06f6e56b) /* 0.435277383 */, 16 },
-  /* 2196 */  { MAD_F(0x06f7fab0) /* 0.435541809 */, 16 },
-  /* 2197 */  { MAD_F(0x06f91000) /* 0.435806274 */, 16 },
-  /* 2198 */  { MAD_F(0x06fa255a) /* 0.436070780 */, 16 },
-  /* 2199 */  { MAD_F(0x06fb3ac0) /* 0.436335326 */, 16 },
-  /* 2200 */  { MAD_F(0x06fc5030) /* 0.436599912 */, 16 },
-  /* 2201 */  { MAD_F(0x06fd65ab) /* 0.436864538 */, 16 },
-  /* 2202 */  { MAD_F(0x06fe7b31) /* 0.437129204 */, 16 },
-  /* 2203 */  { MAD_F(0x06ff90c2) /* 0.437393910 */, 16 },
-  /* 2204 */  { MAD_F(0x0700a65d) /* 0.437658657 */, 16 },
-  /* 2205 */  { MAD_F(0x0701bc03) /* 0.437923443 */, 16 },
-  /* 2206 */  { MAD_F(0x0702d1b4) /* 0.438188269 */, 16 },
-  /* 2207 */  { MAD_F(0x0703e76f) /* 0.438453136 */, 16 },
-
-  /* 2208 */  { MAD_F(0x0704fd35) /* 0.438718042 */, 16 },
-  /* 2209 */  { MAD_F(0x07061306) /* 0.438982988 */, 16 },
-  /* 2210 */  { MAD_F(0x070728e2) /* 0.439247975 */, 16 },
-  /* 2211 */  { MAD_F(0x07083ec9) /* 0.439513001 */, 16 },
-  /* 2212 */  { MAD_F(0x070954ba) /* 0.439778067 */, 16 },
-  /* 2213 */  { MAD_F(0x070a6ab6) /* 0.440043173 */, 16 },
-  /* 2214 */  { MAD_F(0x070b80bc) /* 0.440308320 */, 16 },
-  /* 2215 */  { MAD_F(0x070c96ce) /* 0.440573506 */, 16 },
-  /* 2216 */  { MAD_F(0x070dacea) /* 0.440838732 */, 16 },
-  /* 2217 */  { MAD_F(0x070ec310) /* 0.441103997 */, 16 },
-  /* 2218 */  { MAD_F(0x070fd942) /* 0.441369303 */, 16 },
-  /* 2219 */  { MAD_F(0x0710ef7e) /* 0.441634649 */, 16 },
-  /* 2220 */  { MAD_F(0x071205c5) /* 0.441900034 */, 16 },
-  /* 2221 */  { MAD_F(0x07131c17) /* 0.442165460 */, 16 },
-  /* 2222 */  { MAD_F(0x07143273) /* 0.442430925 */, 16 },
-  /* 2223 */  { MAD_F(0x071548da) /* 0.442696430 */, 16 },
-
-  /* 2224 */  { MAD_F(0x07165f4b) /* 0.442961975 */, 16 },
-  /* 2225 */  { MAD_F(0x071775c8) /* 0.443227559 */, 16 },
-  /* 2226 */  { MAD_F(0x07188c4f) /* 0.443493184 */, 16 },
-  /* 2227 */  { MAD_F(0x0719a2e0) /* 0.443758848 */, 16 },
-  /* 2228 */  { MAD_F(0x071ab97d) /* 0.444024552 */, 16 },
-  /* 2229 */  { MAD_F(0x071bd024) /* 0.444290296 */, 16 },
-  /* 2230 */  { MAD_F(0x071ce6d6) /* 0.444556079 */, 16 },
-  /* 2231 */  { MAD_F(0x071dfd92) /* 0.444821902 */, 16 },
-  /* 2232 */  { MAD_F(0x071f1459) /* 0.445087765 */, 16 },
-  /* 2233 */  { MAD_F(0x07202b2b) /* 0.445353668 */, 16 },
-  /* 2234 */  { MAD_F(0x07214207) /* 0.445619610 */, 16 },
-  /* 2235 */  { MAD_F(0x072258ee) /* 0.445885592 */, 16 },
-  /* 2236 */  { MAD_F(0x07236fe0) /* 0.446151614 */, 16 },
-  /* 2237 */  { MAD_F(0x072486dc) /* 0.446417675 */, 16 },
-  /* 2238 */  { MAD_F(0x07259de3) /* 0.446683776 */, 16 },
-  /* 2239 */  { MAD_F(0x0726b4f4) /* 0.446949917 */, 16 },
-
-  /* 2240 */  { MAD_F(0x0727cc11) /* 0.447216097 */, 16 },
-  /* 2241 */  { MAD_F(0x0728e338) /* 0.447482317 */, 16 },
-  /* 2242 */  { MAD_F(0x0729fa69) /* 0.447748576 */, 16 },
-  /* 2243 */  { MAD_F(0x072b11a5) /* 0.448014875 */, 16 },
-  /* 2244 */  { MAD_F(0x072c28ec) /* 0.448281214 */, 16 },
-  /* 2245 */  { MAD_F(0x072d403d) /* 0.448547592 */, 16 },
-  /* 2246 */  { MAD_F(0x072e5799) /* 0.448814010 */, 16 },
-  /* 2247 */  { MAD_F(0x072f6f00) /* 0.449080467 */, 16 },
-  /* 2248 */  { MAD_F(0x07308671) /* 0.449346964 */, 16 },
-  /* 2249 */  { MAD_F(0x07319ded) /* 0.449613501 */, 16 },
-  /* 2250 */  { MAD_F(0x0732b573) /* 0.449880076 */, 16 },
-  /* 2251 */  { MAD_F(0x0733cd04) /* 0.450146692 */, 16 },
-  /* 2252 */  { MAD_F(0x0734e4a0) /* 0.450413347 */, 16 },
-  /* 2253 */  { MAD_F(0x0735fc46) /* 0.450680041 */, 16 },
-  /* 2254 */  { MAD_F(0x073713f7) /* 0.450946775 */, 16 },
-  /* 2255 */  { MAD_F(0x07382bb2) /* 0.451213548 */, 16 },
-
-  /* 2256 */  { MAD_F(0x07394378) /* 0.451480360 */, 16 },
-  /* 2257 */  { MAD_F(0x073a5b49) /* 0.451747213 */, 16 },
-  /* 2258 */  { MAD_F(0x073b7324) /* 0.452014104 */, 16 },
-  /* 2259 */  { MAD_F(0x073c8b0a) /* 0.452281035 */, 16 },
-  /* 2260 */  { MAD_F(0x073da2fa) /* 0.452548005 */, 16 },
-  /* 2261 */  { MAD_F(0x073ebaf5) /* 0.452815015 */, 16 },
-  /* 2262 */  { MAD_F(0x073fd2fa) /* 0.453082064 */, 16 },
-  /* 2263 */  { MAD_F(0x0740eb0a) /* 0.453349152 */, 16 },
-  /* 2264 */  { MAD_F(0x07420325) /* 0.453616280 */, 16 },
-  /* 2265 */  { MAD_F(0x07431b4a) /* 0.453883447 */, 16 },
-  /* 2266 */  { MAD_F(0x0744337a) /* 0.454150653 */, 16 },
-  /* 2267 */  { MAD_F(0x07454bb4) /* 0.454417899 */, 16 },
-  /* 2268 */  { MAD_F(0x074663f8) /* 0.454685184 */, 16 },
-  /* 2269 */  { MAD_F(0x07477c48) /* 0.454952508 */, 16 },
-  /* 2270 */  { MAD_F(0x074894a2) /* 0.455219872 */, 16 },
-  /* 2271 */  { MAD_F(0x0749ad06) /* 0.455487275 */, 16 },
-
-  /* 2272 */  { MAD_F(0x074ac575) /* 0.455754717 */, 16 },
-  /* 2273 */  { MAD_F(0x074bddee) /* 0.456022198 */, 16 },
-  /* 2274 */  { MAD_F(0x074cf672) /* 0.456289719 */, 16 },
-  /* 2275 */  { MAD_F(0x074e0f01) /* 0.456557278 */, 16 },
-  /* 2276 */  { MAD_F(0x074f279a) /* 0.456824877 */, 16 },
-  /* 2277 */  { MAD_F(0x0750403e) /* 0.457092516 */, 16 },
-  /* 2278 */  { MAD_F(0x075158ec) /* 0.457360193 */, 16 },
-  /* 2279 */  { MAD_F(0x075271a4) /* 0.457627909 */, 16 },
-  /* 2280 */  { MAD_F(0x07538a67) /* 0.457895665 */, 16 },
-  /* 2281 */  { MAD_F(0x0754a335) /* 0.458163460 */, 16 },
-  /* 2282 */  { MAD_F(0x0755bc0d) /* 0.458431294 */, 16 },
-  /* 2283 */  { MAD_F(0x0756d4f0) /* 0.458699167 */, 16 },
-  /* 2284 */  { MAD_F(0x0757eddd) /* 0.458967079 */, 16 },
-  /* 2285 */  { MAD_F(0x075906d5) /* 0.459235030 */, 16 },
-  /* 2286 */  { MAD_F(0x075a1fd7) /* 0.459503021 */, 16 },
-  /* 2287 */  { MAD_F(0x075b38e3) /* 0.459771050 */, 16 },
-
-  /* 2288 */  { MAD_F(0x075c51fa) /* 0.460039119 */, 16 },
-  /* 2289 */  { MAD_F(0x075d6b1c) /* 0.460307226 */, 16 },
-  /* 2290 */  { MAD_F(0x075e8448) /* 0.460575373 */, 16 },
-  /* 2291 */  { MAD_F(0x075f9d7f) /* 0.460843559 */, 16 },
-  /* 2292 */  { MAD_F(0x0760b6c0) /* 0.461111783 */, 16 },
-  /* 2293 */  { MAD_F(0x0761d00b) /* 0.461380047 */, 16 },
-  /* 2294 */  { MAD_F(0x0762e961) /* 0.461648350 */, 16 },
-  /* 2295 */  { MAD_F(0x076402c1) /* 0.461916691 */, 16 },
-  /* 2296 */  { MAD_F(0x07651c2c) /* 0.462185072 */, 16 },
-  /* 2297 */  { MAD_F(0x076635a2) /* 0.462453492 */, 16 },
-  /* 2298 */  { MAD_F(0x07674f22) /* 0.462721950 */, 16 },
-  /* 2299 */  { MAD_F(0x076868ac) /* 0.462990448 */, 16 },
-  /* 2300 */  { MAD_F(0x07698240) /* 0.463258984 */, 16 },
-  /* 2301 */  { MAD_F(0x076a9be0) /* 0.463527560 */, 16 },
-  /* 2302 */  { MAD_F(0x076bb589) /* 0.463796174 */, 16 },
-  /* 2303 */  { MAD_F(0x076ccf3d) /* 0.464064827 */, 16 },
-
-  /* 2304 */  { MAD_F(0x076de8fc) /* 0.464333519 */, 16 },
-  /* 2305 */  { MAD_F(0x076f02c5) /* 0.464602250 */, 16 },
-  /* 2306 */  { MAD_F(0x07701c98) /* 0.464871020 */, 16 },
-  /* 2307 */  { MAD_F(0x07713676) /* 0.465139829 */, 16 },
-  /* 2308 */  { MAD_F(0x0772505e) /* 0.465408676 */, 16 },
-  /* 2309 */  { MAD_F(0x07736a51) /* 0.465677563 */, 16 },
-  /* 2310 */  { MAD_F(0x0774844e) /* 0.465946488 */, 16 },
-  /* 2311 */  { MAD_F(0x07759e55) /* 0.466215452 */, 16 },
-  /* 2312 */  { MAD_F(0x0776b867) /* 0.466484455 */, 16 },
-  /* 2313 */  { MAD_F(0x0777d283) /* 0.466753496 */, 16 },
-  /* 2314 */  { MAD_F(0x0778ecaa) /* 0.467022577 */, 16 },
-  /* 2315 */  { MAD_F(0x077a06db) /* 0.467291696 */, 16 },
-  /* 2316 */  { MAD_F(0x077b2117) /* 0.467560854 */, 16 },
-  /* 2317 */  { MAD_F(0x077c3b5d) /* 0.467830050 */, 16 },
-  /* 2318 */  { MAD_F(0x077d55ad) /* 0.468099285 */, 16 },
-  /* 2319 */  { MAD_F(0x077e7008) /* 0.468368560 */, 16 },
-
-  /* 2320 */  { MAD_F(0x077f8a6d) /* 0.468637872 */, 16 },
-  /* 2321 */  { MAD_F(0x0780a4dc) /* 0.468907224 */, 16 },
-  /* 2322 */  { MAD_F(0x0781bf56) /* 0.469176614 */, 16 },
-  /* 2323 */  { MAD_F(0x0782d9da) /* 0.469446043 */, 16 },
-  /* 2324 */  { MAD_F(0x0783f469) /* 0.469715510 */, 16 },
-  /* 2325 */  { MAD_F(0x07850f02) /* 0.469985016 */, 16 },
-  /* 2326 */  { MAD_F(0x078629a5) /* 0.470254561 */, 16 },
-  /* 2327 */  { MAD_F(0x07874453) /* 0.470524145 */, 16 },
-  /* 2328 */  { MAD_F(0x07885f0b) /* 0.470793767 */, 16 },
-  /* 2329 */  { MAD_F(0x078979ce) /* 0.471063427 */, 16 },
-  /* 2330 */  { MAD_F(0x078a949a) /* 0.471333126 */, 16 },
-  /* 2331 */  { MAD_F(0x078baf72) /* 0.471602864 */, 16 },
-  /* 2332 */  { MAD_F(0x078cca53) /* 0.471872641 */, 16 },
-  /* 2333 */  { MAD_F(0x078de53f) /* 0.472142456 */, 16 },
-  /* 2334 */  { MAD_F(0x078f0035) /* 0.472412309 */, 16 },
-  /* 2335 */  { MAD_F(0x07901b36) /* 0.472682201 */, 16 },
-
-  /* 2336 */  { MAD_F(0x07913641) /* 0.472952132 */, 16 },
-  /* 2337 */  { MAD_F(0x07925156) /* 0.473222101 */, 16 },
-  /* 2338 */  { MAD_F(0x07936c76) /* 0.473492108 */, 16 },
-  /* 2339 */  { MAD_F(0x079487a0) /* 0.473762155 */, 16 },
-  /* 2340 */  { MAD_F(0x0795a2d4) /* 0.474032239 */, 16 },
-  /* 2341 */  { MAD_F(0x0796be13) /* 0.474302362 */, 16 },
-  /* 2342 */  { MAD_F(0x0797d95c) /* 0.474572524 */, 16 },
-  /* 2343 */  { MAD_F(0x0798f4af) /* 0.474842724 */, 16 },
-  /* 2344 */  { MAD_F(0x079a100c) /* 0.475112962 */, 16 },
-  /* 2345 */  { MAD_F(0x079b2b74) /* 0.475383239 */, 16 },
-  /* 2346 */  { MAD_F(0x079c46e7) /* 0.475653554 */, 16 },
-  /* 2347 */  { MAD_F(0x079d6263) /* 0.475923908 */, 16 },
-  /* 2348 */  { MAD_F(0x079e7dea) /* 0.476194300 */, 16 },
-  /* 2349 */  { MAD_F(0x079f997b) /* 0.476464731 */, 16 },
-  /* 2350 */  { MAD_F(0x07a0b516) /* 0.476735200 */, 16 },
-  /* 2351 */  { MAD_F(0x07a1d0bc) /* 0.477005707 */, 16 },
-
-  /* 2352 */  { MAD_F(0x07a2ec6c) /* 0.477276252 */, 16 },
-  /* 2353 */  { MAD_F(0x07a40827) /* 0.477546836 */, 16 },
-  /* 2354 */  { MAD_F(0x07a523eb) /* 0.477817459 */, 16 },
-  /* 2355 */  { MAD_F(0x07a63fba) /* 0.478088119 */, 16 },
-  /* 2356 */  { MAD_F(0x07a75b93) /* 0.478358818 */, 16 },
-  /* 2357 */  { MAD_F(0x07a87777) /* 0.478629555 */, 16 },
-  /* 2358 */  { MAD_F(0x07a99364) /* 0.478900331 */, 16 },
-  /* 2359 */  { MAD_F(0x07aaaf5c) /* 0.479171145 */, 16 },
-  /* 2360 */  { MAD_F(0x07abcb5f) /* 0.479441997 */, 16 },
-  /* 2361 */  { MAD_F(0x07ace76b) /* 0.479712887 */, 16 },
-  /* 2362 */  { MAD_F(0x07ae0382) /* 0.479983816 */, 16 },
-  /* 2363 */  { MAD_F(0x07af1fa3) /* 0.480254782 */, 16 },
-  /* 2364 */  { MAD_F(0x07b03bcf) /* 0.480525787 */, 16 },
-  /* 2365 */  { MAD_F(0x07b15804) /* 0.480796831 */, 16 },
-  /* 2366 */  { MAD_F(0x07b27444) /* 0.481067912 */, 16 },
-  /* 2367 */  { MAD_F(0x07b3908e) /* 0.481339032 */, 16 },
-
-  /* 2368 */  { MAD_F(0x07b4ace3) /* 0.481610189 */, 16 },
-  /* 2369 */  { MAD_F(0x07b5c941) /* 0.481881385 */, 16 },
-  /* 2370 */  { MAD_F(0x07b6e5aa) /* 0.482152620 */, 16 },
-  /* 2371 */  { MAD_F(0x07b8021d) /* 0.482423892 */, 16 },
-  /* 2372 */  { MAD_F(0x07b91e9b) /* 0.482695202 */, 16 },
-  /* 2373 */  { MAD_F(0x07ba3b22) /* 0.482966551 */, 16 },
-  /* 2374 */  { MAD_F(0x07bb57b4) /* 0.483237938 */, 16 },
-  /* 2375 */  { MAD_F(0x07bc7450) /* 0.483509362 */, 16 },
-  /* 2376 */  { MAD_F(0x07bd90f6) /* 0.483780825 */, 16 },
-  /* 2377 */  { MAD_F(0x07beada7) /* 0.484052326 */, 16 },
-  /* 2378 */  { MAD_F(0x07bfca61) /* 0.484323865 */, 16 },
-  /* 2379 */  { MAD_F(0x07c0e726) /* 0.484595443 */, 16 },
-  /* 2380 */  { MAD_F(0x07c203f5) /* 0.484867058 */, 16 },
-  /* 2381 */  { MAD_F(0x07c320cf) /* 0.485138711 */, 16 },
-  /* 2382 */  { MAD_F(0x07c43db2) /* 0.485410402 */, 16 },
-  /* 2383 */  { MAD_F(0x07c55aa0) /* 0.485682131 */, 16 },
-
-  /* 2384 */  { MAD_F(0x07c67798) /* 0.485953899 */, 16 },
-  /* 2385 */  { MAD_F(0x07c7949a) /* 0.486225704 */, 16 },
-  /* 2386 */  { MAD_F(0x07c8b1a7) /* 0.486497547 */, 16 },
-  /* 2387 */  { MAD_F(0x07c9cebd) /* 0.486769429 */, 16 },
-  /* 2388 */  { MAD_F(0x07caebde) /* 0.487041348 */, 16 },
-  /* 2389 */  { MAD_F(0x07cc0909) /* 0.487313305 */, 16 },
-  /* 2390 */  { MAD_F(0x07cd263e) /* 0.487585300 */, 16 },
-  /* 2391 */  { MAD_F(0x07ce437d) /* 0.487857333 */, 16 },
-  /* 2392 */  { MAD_F(0x07cf60c7) /* 0.488129404 */, 16 },
-  /* 2393 */  { MAD_F(0x07d07e1b) /* 0.488401513 */, 16 },
-  /* 2394 */  { MAD_F(0x07d19b79) /* 0.488673660 */, 16 },
-  /* 2395 */  { MAD_F(0x07d2b8e1) /* 0.488945845 */, 16 },
-  /* 2396 */  { MAD_F(0x07d3d653) /* 0.489218067 */, 16 },
-  /* 2397 */  { MAD_F(0x07d4f3cf) /* 0.489490328 */, 16 },
-  /* 2398 */  { MAD_F(0x07d61156) /* 0.489762626 */, 16 },
-  /* 2399 */  { MAD_F(0x07d72ee6) /* 0.490034962 */, 16 },
-
-  /* 2400 */  { MAD_F(0x07d84c81) /* 0.490307336 */, 16 },
-  /* 2401 */  { MAD_F(0x07d96a26) /* 0.490579748 */, 16 },
-  /* 2402 */  { MAD_F(0x07da87d5) /* 0.490852198 */, 16 },
-  /* 2403 */  { MAD_F(0x07dba58f) /* 0.491124686 */, 16 },
-  /* 2404 */  { MAD_F(0x07dcc352) /* 0.491397211 */, 16 },
-  /* 2405 */  { MAD_F(0x07dde120) /* 0.491669774 */, 16 },
-  /* 2406 */  { MAD_F(0x07defef7) /* 0.491942375 */, 16 },
-  /* 2407 */  { MAD_F(0x07e01cd9) /* 0.492215014 */, 16 },
-  /* 2408 */  { MAD_F(0x07e13ac5) /* 0.492487690 */, 16 },
-  /* 2409 */  { MAD_F(0x07e258bc) /* 0.492760404 */, 16 },
-  /* 2410 */  { MAD_F(0x07e376bc) /* 0.493033156 */, 16 },
-  /* 2411 */  { MAD_F(0x07e494c6) /* 0.493305946 */, 16 },
-  /* 2412 */  { MAD_F(0x07e5b2db) /* 0.493578773 */, 16 },
-  /* 2413 */  { MAD_F(0x07e6d0f9) /* 0.493851638 */, 16 },
-  /* 2414 */  { MAD_F(0x07e7ef22) /* 0.494124541 */, 16 },
-  /* 2415 */  { MAD_F(0x07e90d55) /* 0.494397481 */, 16 },
-
-  /* 2416 */  { MAD_F(0x07ea2b92) /* 0.494670459 */, 16 },
-  /* 2417 */  { MAD_F(0x07eb49d9) /* 0.494943475 */, 16 },
-  /* 2418 */  { MAD_F(0x07ec682a) /* 0.495216529 */, 16 },
-  /* 2419 */  { MAD_F(0x07ed8686) /* 0.495489620 */, 16 },
-  /* 2420 */  { MAD_F(0x07eea4eb) /* 0.495762748 */, 16 },
-  /* 2421 */  { MAD_F(0x07efc35b) /* 0.496035915 */, 16 },
-  /* 2422 */  { MAD_F(0x07f0e1d4) /* 0.496309119 */, 16 },
-  /* 2423 */  { MAD_F(0x07f20058) /* 0.496582360 */, 16 },
-  /* 2424 */  { MAD_F(0x07f31ee6) /* 0.496855639 */, 16 },
-  /* 2425 */  { MAD_F(0x07f43d7e) /* 0.497128956 */, 16 },
-  /* 2426 */  { MAD_F(0x07f55c20) /* 0.497402310 */, 16 },
-  /* 2427 */  { MAD_F(0x07f67acc) /* 0.497675702 */, 16 },
-  /* 2428 */  { MAD_F(0x07f79982) /* 0.497949132 */, 16 },
-  /* 2429 */  { MAD_F(0x07f8b842) /* 0.498222598 */, 16 },
-  /* 2430 */  { MAD_F(0x07f9d70c) /* 0.498496103 */, 16 },
-  /* 2431 */  { MAD_F(0x07faf5e1) /* 0.498769645 */, 16 },
-
-  /* 2432 */  { MAD_F(0x07fc14bf) /* 0.499043224 */, 16 },
-  /* 2433 */  { MAD_F(0x07fd33a8) /* 0.499316841 */, 16 },
-  /* 2434 */  { MAD_F(0x07fe529a) /* 0.499590496 */, 16 },
-  /* 2435 */  { MAD_F(0x07ff7197) /* 0.499864188 */, 16 },
-  /* 2436 */  { MAD_F(0x0400484f) /* 0.250068959 */, 17 },
-  /* 2437 */  { MAD_F(0x0400d7d7) /* 0.250205842 */, 17 },
-  /* 2438 */  { MAD_F(0x04016764) /* 0.250342744 */, 17 },
-  /* 2439 */  { MAD_F(0x0401f6f7) /* 0.250479665 */, 17 },
-  /* 2440 */  { MAD_F(0x0402868e) /* 0.250616605 */, 17 },
-  /* 2441 */  { MAD_F(0x0403162b) /* 0.250753563 */, 17 },
-  /* 2442 */  { MAD_F(0x0403a5cc) /* 0.250890540 */, 17 },
-  /* 2443 */  { MAD_F(0x04043573) /* 0.251027536 */, 17 },
-  /* 2444 */  { MAD_F(0x0404c51e) /* 0.251164550 */, 17 },
-  /* 2445 */  { MAD_F(0x040554cf) /* 0.251301583 */, 17 },
-  /* 2446 */  { MAD_F(0x0405e484) /* 0.251438635 */, 17 },
-  /* 2447 */  { MAD_F(0x0406743f) /* 0.251575706 */, 17 },
-
-  /* 2448 */  { MAD_F(0x040703ff) /* 0.251712795 */, 17 },
-  /* 2449 */  { MAD_F(0x040793c3) /* 0.251849903 */, 17 },
-  /* 2450 */  { MAD_F(0x0408238d) /* 0.251987029 */, 17 },
-  /* 2451 */  { MAD_F(0x0408b35b) /* 0.252124174 */, 17 },
-  /* 2452 */  { MAD_F(0x0409432f) /* 0.252261338 */, 17 },
-  /* 2453 */  { MAD_F(0x0409d308) /* 0.252398520 */, 17 },
-  /* 2454 */  { MAD_F(0x040a62e5) /* 0.252535721 */, 17 },
-  /* 2455 */  { MAD_F(0x040af2c8) /* 0.252672941 */, 17 },
-  /* 2456 */  { MAD_F(0x040b82b0) /* 0.252810180 */, 17 },
-  /* 2457 */  { MAD_F(0x040c129c) /* 0.252947436 */, 17 },
-  /* 2458 */  { MAD_F(0x040ca28e) /* 0.253084712 */, 17 },
-  /* 2459 */  { MAD_F(0x040d3284) /* 0.253222006 */, 17 },
-  /* 2460 */  { MAD_F(0x040dc280) /* 0.253359319 */, 17 },
-  /* 2461 */  { MAD_F(0x040e5281) /* 0.253496651 */, 17 },
-  /* 2462 */  { MAD_F(0x040ee286) /* 0.253634001 */, 17 },
-  /* 2463 */  { MAD_F(0x040f7291) /* 0.253771369 */, 17 },
-
-  /* 2464 */  { MAD_F(0x041002a1) /* 0.253908756 */, 17 },
-  /* 2465 */  { MAD_F(0x041092b5) /* 0.254046162 */, 17 },
-  /* 2466 */  { MAD_F(0x041122cf) /* 0.254183587 */, 17 },
-  /* 2467 */  { MAD_F(0x0411b2ed) /* 0.254321030 */, 17 },
-  /* 2468 */  { MAD_F(0x04124311) /* 0.254458491 */, 17 },
-  /* 2469 */  { MAD_F(0x0412d339) /* 0.254595971 */, 17 },
-  /* 2470 */  { MAD_F(0x04136367) /* 0.254733470 */, 17 },
-  /* 2471 */  { MAD_F(0x0413f399) /* 0.254870987 */, 17 },
-  /* 2472 */  { MAD_F(0x041483d1) /* 0.255008523 */, 17 },
-  /* 2473 */  { MAD_F(0x0415140d) /* 0.255146077 */, 17 },
-  /* 2474 */  { MAD_F(0x0415a44f) /* 0.255283650 */, 17 },
-  /* 2475 */  { MAD_F(0x04163495) /* 0.255421241 */, 17 },
-  /* 2476 */  { MAD_F(0x0416c4e1) /* 0.255558851 */, 17 },
-  /* 2477 */  { MAD_F(0x04175531) /* 0.255696480 */, 17 },
-  /* 2478 */  { MAD_F(0x0417e586) /* 0.255834127 */, 17 },
-  /* 2479 */  { MAD_F(0x041875e1) /* 0.255971792 */, 17 },
-
-  /* 2480 */  { MAD_F(0x04190640) /* 0.256109476 */, 17 },
-  /* 2481 */  { MAD_F(0x041996a4) /* 0.256247179 */, 17 },
-  /* 2482 */  { MAD_F(0x041a270d) /* 0.256384900 */, 17 },
-  /* 2483 */  { MAD_F(0x041ab77b) /* 0.256522639 */, 17 },
-  /* 2484 */  { MAD_F(0x041b47ef) /* 0.256660397 */, 17 },
-  /* 2485 */  { MAD_F(0x041bd867) /* 0.256798174 */, 17 },
-  /* 2486 */  { MAD_F(0x041c68e4) /* 0.256935969 */, 17 },
-  /* 2487 */  { MAD_F(0x041cf966) /* 0.257073782 */, 17 },
-  /* 2488 */  { MAD_F(0x041d89ed) /* 0.257211614 */, 17 },
-  /* 2489 */  { MAD_F(0x041e1a79) /* 0.257349465 */, 17 },
-  /* 2490 */  { MAD_F(0x041eab0a) /* 0.257487334 */, 17 },
-  /* 2491 */  { MAD_F(0x041f3b9f) /* 0.257625221 */, 17 },
-  /* 2492 */  { MAD_F(0x041fcc3a) /* 0.257763127 */, 17 },
-  /* 2493 */  { MAD_F(0x04205cda) /* 0.257901051 */, 17 },
-  /* 2494 */  { MAD_F(0x0420ed7f) /* 0.258038994 */, 17 },
-  /* 2495 */  { MAD_F(0x04217e28) /* 0.258176955 */, 17 },
-
-  /* 2496 */  { MAD_F(0x04220ed7) /* 0.258314934 */, 17 },
-  /* 2497 */  { MAD_F(0x04229f8a) /* 0.258452932 */, 17 },
-  /* 2498 */  { MAD_F(0x04233043) /* 0.258590948 */, 17 },
-  /* 2499 */  { MAD_F(0x0423c100) /* 0.258728983 */, 17 },
-  /* 2500 */  { MAD_F(0x042451c3) /* 0.258867036 */, 17 },
-  /* 2501 */  { MAD_F(0x0424e28a) /* 0.259005108 */, 17 },
-  /* 2502 */  { MAD_F(0x04257356) /* 0.259143198 */, 17 },
-  /* 2503 */  { MAD_F(0x04260428) /* 0.259281307 */, 17 },
-  /* 2504 */  { MAD_F(0x042694fe) /* 0.259419433 */, 17 },
-  /* 2505 */  { MAD_F(0x042725d9) /* 0.259557579 */, 17 },
-  /* 2506 */  { MAD_F(0x0427b6b9) /* 0.259695742 */, 17 },
-  /* 2507 */  { MAD_F(0x0428479e) /* 0.259833924 */, 17 },
-  /* 2508 */  { MAD_F(0x0428d888) /* 0.259972124 */, 17 },
-  /* 2509 */  { MAD_F(0x04296976) /* 0.260110343 */, 17 },
-  /* 2510 */  { MAD_F(0x0429fa6a) /* 0.260248580 */, 17 },
-  /* 2511 */  { MAD_F(0x042a8b63) /* 0.260386836 */, 17 },
-
-  /* 2512 */  { MAD_F(0x042b1c60) /* 0.260525110 */, 17 },
-  /* 2513 */  { MAD_F(0x042bad63) /* 0.260663402 */, 17 },
-  /* 2514 */  { MAD_F(0x042c3e6a) /* 0.260801712 */, 17 },
-  /* 2515 */  { MAD_F(0x042ccf77) /* 0.260940041 */, 17 },
-  /* 2516 */  { MAD_F(0x042d6088) /* 0.261078388 */, 17 },
-  /* 2517 */  { MAD_F(0x042df19e) /* 0.261216754 */, 17 },
-  /* 2518 */  { MAD_F(0x042e82b9) /* 0.261355137 */, 17 },
-  /* 2519 */  { MAD_F(0x042f13d9) /* 0.261493540 */, 17 },
-  /* 2520 */  { MAD_F(0x042fa4fe) /* 0.261631960 */, 17 },
-  /* 2521 */  { MAD_F(0x04303628) /* 0.261770399 */, 17 },
-  /* 2522 */  { MAD_F(0x0430c757) /* 0.261908856 */, 17 },
-  /* 2523 */  { MAD_F(0x0431588b) /* 0.262047331 */, 17 },
-  /* 2524 */  { MAD_F(0x0431e9c3) /* 0.262185825 */, 17 },
-  /* 2525 */  { MAD_F(0x04327b01) /* 0.262324337 */, 17 },
-  /* 2526 */  { MAD_F(0x04330c43) /* 0.262462867 */, 17 },
-  /* 2527 */  { MAD_F(0x04339d8a) /* 0.262601416 */, 17 },
-
-  /* 2528 */  { MAD_F(0x04342ed7) /* 0.262739982 */, 17 },
-  /* 2529 */  { MAD_F(0x0434c028) /* 0.262878568 */, 17 },
-  /* 2530 */  { MAD_F(0x0435517e) /* 0.263017171 */, 17 },
-  /* 2531 */  { MAD_F(0x0435e2d9) /* 0.263155792 */, 17 },
-  /* 2532 */  { MAD_F(0x04367439) /* 0.263294432 */, 17 },
-  /* 2533 */  { MAD_F(0x0437059e) /* 0.263433090 */, 17 },
-  /* 2534 */  { MAD_F(0x04379707) /* 0.263571767 */, 17 },
-  /* 2535 */  { MAD_F(0x04382876) /* 0.263710461 */, 17 },
-  /* 2536 */  { MAD_F(0x0438b9e9) /* 0.263849174 */, 17 },
-  /* 2537 */  { MAD_F(0x04394b61) /* 0.263987905 */, 17 },
-  /* 2538 */  { MAD_F(0x0439dcdf) /* 0.264126655 */, 17 },
-  /* 2539 */  { MAD_F(0x043a6e61) /* 0.264265422 */, 17 },
-  /* 2540 */  { MAD_F(0x043affe8) /* 0.264404208 */, 17 },
-  /* 2541 */  { MAD_F(0x043b9174) /* 0.264543012 */, 17 },
-  /* 2542 */  { MAD_F(0x043c2305) /* 0.264681834 */, 17 },
-  /* 2543 */  { MAD_F(0x043cb49a) /* 0.264820674 */, 17 },
-
-  /* 2544 */  { MAD_F(0x043d4635) /* 0.264959533 */, 17 },
-  /* 2545 */  { MAD_F(0x043dd7d4) /* 0.265098410 */, 17 },
-  /* 2546 */  { MAD_F(0x043e6979) /* 0.265237305 */, 17 },
-  /* 2547 */  { MAD_F(0x043efb22) /* 0.265376218 */, 17 },
-  /* 2548 */  { MAD_F(0x043f8cd0) /* 0.265515149 */, 17 },
-  /* 2549 */  { MAD_F(0x04401e83) /* 0.265654099 */, 17 },
-  /* 2550 */  { MAD_F(0x0440b03b) /* 0.265793066 */, 17 },
-  /* 2551 */  { MAD_F(0x044141f7) /* 0.265932052 */, 17 },
-  /* 2552 */  { MAD_F(0x0441d3b9) /* 0.266071056 */, 17 },
-  /* 2553 */  { MAD_F(0x04426580) /* 0.266210078 */, 17 },
-  /* 2554 */  { MAD_F(0x0442f74b) /* 0.266349119 */, 17 },
-  /* 2555 */  { MAD_F(0x0443891b) /* 0.266488177 */, 17 },
-  /* 2556 */  { MAD_F(0x04441af0) /* 0.266627254 */, 17 },
-  /* 2557 */  { MAD_F(0x0444acca) /* 0.266766349 */, 17 },
-  /* 2558 */  { MAD_F(0x04453ea9) /* 0.266905462 */, 17 },
-  /* 2559 */  { MAD_F(0x0445d08d) /* 0.267044593 */, 17 },
-
-  /* 2560 */  { MAD_F(0x04466275) /* 0.267183742 */, 17 },
-  /* 2561 */  { MAD_F(0x0446f463) /* 0.267322909 */, 17 },
-  /* 2562 */  { MAD_F(0x04478655) /* 0.267462094 */, 17 },
-  /* 2563 */  { MAD_F(0x0448184c) /* 0.267601298 */, 17 },
-  /* 2564 */  { MAD_F(0x0448aa48) /* 0.267740519 */, 17 },
-  /* 2565 */  { MAD_F(0x04493c49) /* 0.267879759 */, 17 },
-  /* 2566 */  { MAD_F(0x0449ce4f) /* 0.268019017 */, 17 },
-  /* 2567 */  { MAD_F(0x044a6059) /* 0.268158293 */, 17 },
-  /* 2568 */  { MAD_F(0x044af269) /* 0.268297587 */, 17 },
-  /* 2569 */  { MAD_F(0x044b847d) /* 0.268436899 */, 17 },
-  /* 2570 */  { MAD_F(0x044c1696) /* 0.268576229 */, 17 },
-  /* 2571 */  { MAD_F(0x044ca8b4) /* 0.268715577 */, 17 },
-  /* 2572 */  { MAD_F(0x044d3ad7) /* 0.268854943 */, 17 },
-  /* 2573 */  { MAD_F(0x044dccff) /* 0.268994328 */, 17 },
-  /* 2574 */  { MAD_F(0x044e5f2b) /* 0.269133730 */, 17 },
-  /* 2575 */  { MAD_F(0x044ef15d) /* 0.269273150 */, 17 },
-
-  /* 2576 */  { MAD_F(0x044f8393) /* 0.269412589 */, 17 },
-  /* 2577 */  { MAD_F(0x045015ce) /* 0.269552045 */, 17 },
-  /* 2578 */  { MAD_F(0x0450a80e) /* 0.269691520 */, 17 },
-  /* 2579 */  { MAD_F(0x04513a53) /* 0.269831013 */, 17 },
-  /* 2580 */  { MAD_F(0x0451cc9c) /* 0.269970523 */, 17 },
-  /* 2581 */  { MAD_F(0x04525eeb) /* 0.270110052 */, 17 },
-  /* 2582 */  { MAD_F(0x0452f13e) /* 0.270249599 */, 17 },
-  /* 2583 */  { MAD_F(0x04538396) /* 0.270389163 */, 17 },
-  /* 2584 */  { MAD_F(0x045415f3) /* 0.270528746 */, 17 },
-  /* 2585 */  { MAD_F(0x0454a855) /* 0.270668347 */, 17 },
-  /* 2586 */  { MAD_F(0x04553abb) /* 0.270807965 */, 17 },
-  /* 2587 */  { MAD_F(0x0455cd27) /* 0.270947602 */, 17 },
-  /* 2588 */  { MAD_F(0x04565f97) /* 0.271087257 */, 17 },
-  /* 2589 */  { MAD_F(0x0456f20c) /* 0.271226930 */, 17 },
-  /* 2590 */  { MAD_F(0x04578486) /* 0.271366620 */, 17 },
-  /* 2591 */  { MAD_F(0x04581705) /* 0.271506329 */, 17 },
-
-  /* 2592 */  { MAD_F(0x0458a989) /* 0.271646056 */, 17 },
-  /* 2593 */  { MAD_F(0x04593c11) /* 0.271785800 */, 17 },
-  /* 2594 */  { MAD_F(0x0459ce9e) /* 0.271925563 */, 17 },
-  /* 2595 */  { MAD_F(0x045a6130) /* 0.272065343 */, 17 },
-  /* 2596 */  { MAD_F(0x045af3c7) /* 0.272205142 */, 17 },
-  /* 2597 */  { MAD_F(0x045b8663) /* 0.272344958 */, 17 },
-  /* 2598 */  { MAD_F(0x045c1903) /* 0.272484793 */, 17 },
-  /* 2599 */  { MAD_F(0x045caba9) /* 0.272624645 */, 17 },
-  /* 2600 */  { MAD_F(0x045d3e53) /* 0.272764515 */, 17 },
-  /* 2601 */  { MAD_F(0x045dd102) /* 0.272904403 */, 17 },
-  /* 2602 */  { MAD_F(0x045e63b6) /* 0.273044310 */, 17 },
-  /* 2603 */  { MAD_F(0x045ef66e) /* 0.273184234 */, 17 },
-  /* 2604 */  { MAD_F(0x045f892b) /* 0.273324176 */, 17 },
-  /* 2605 */  { MAD_F(0x04601bee) /* 0.273464136 */, 17 },
-  /* 2606 */  { MAD_F(0x0460aeb5) /* 0.273604113 */, 17 },
-  /* 2607 */  { MAD_F(0x04614180) /* 0.273744109 */, 17 },
-
-  /* 2608 */  { MAD_F(0x0461d451) /* 0.273884123 */, 17 },
-  /* 2609 */  { MAD_F(0x04626727) /* 0.274024154 */, 17 },
-  /* 2610 */  { MAD_F(0x0462fa01) /* 0.274164204 */, 17 },
-  /* 2611 */  { MAD_F(0x04638ce0) /* 0.274304271 */, 17 },
-  /* 2612 */  { MAD_F(0x04641fc4) /* 0.274444356 */, 17 },
-  /* 2613 */  { MAD_F(0x0464b2ac) /* 0.274584459 */, 17 },
-  /* 2614 */  { MAD_F(0x0465459a) /* 0.274724580 */, 17 },
-  /* 2615 */  { MAD_F(0x0465d88c) /* 0.274864719 */, 17 },
-  /* 2616 */  { MAD_F(0x04666b83) /* 0.275004875 */, 17 },
-  /* 2617 */  { MAD_F(0x0466fe7f) /* 0.275145050 */, 17 },
-  /* 2618 */  { MAD_F(0x0467917f) /* 0.275285242 */, 17 },
-  /* 2619 */  { MAD_F(0x04682485) /* 0.275425452 */, 17 },
-  /* 2620 */  { MAD_F(0x0468b78f) /* 0.275565681 */, 17 },
-  /* 2621 */  { MAD_F(0x04694a9e) /* 0.275705926 */, 17 },
-  /* 2622 */  { MAD_F(0x0469ddb2) /* 0.275846190 */, 17 },
-  /* 2623 */  { MAD_F(0x046a70ca) /* 0.275986472 */, 17 },
-
-  /* 2624 */  { MAD_F(0x046b03e7) /* 0.276126771 */, 17 },
-  /* 2625 */  { MAD_F(0x046b970a) /* 0.276267088 */, 17 },
-  /* 2626 */  { MAD_F(0x046c2a31) /* 0.276407423 */, 17 },
-  /* 2627 */  { MAD_F(0x046cbd5c) /* 0.276547776 */, 17 },
-  /* 2628 */  { MAD_F(0x046d508d) /* 0.276688147 */, 17 },
-  /* 2629 */  { MAD_F(0x046de3c2) /* 0.276828535 */, 17 },
-  /* 2630 */  { MAD_F(0x046e76fc) /* 0.276968942 */, 17 },
-  /* 2631 */  { MAD_F(0x046f0a3b) /* 0.277109366 */, 17 },
-  /* 2632 */  { MAD_F(0x046f9d7e) /* 0.277249808 */, 17 },
-  /* 2633 */  { MAD_F(0x047030c7) /* 0.277390267 */, 17 },
-  /* 2634 */  { MAD_F(0x0470c414) /* 0.277530745 */, 17 },
-  /* 2635 */  { MAD_F(0x04715766) /* 0.277671240 */, 17 },
-  /* 2636 */  { MAD_F(0x0471eabc) /* 0.277811753 */, 17 },
-  /* 2637 */  { MAD_F(0x04727e18) /* 0.277952284 */, 17 },
-  /* 2638 */  { MAD_F(0x04731178) /* 0.278092832 */, 17 },
-  /* 2639 */  { MAD_F(0x0473a4dd) /* 0.278233399 */, 17 },
-
-  /* 2640 */  { MAD_F(0x04743847) /* 0.278373983 */, 17 },
-  /* 2641 */  { MAD_F(0x0474cbb5) /* 0.278514584 */, 17 },
-  /* 2642 */  { MAD_F(0x04755f29) /* 0.278655204 */, 17 },
-  /* 2643 */  { MAD_F(0x0475f2a1) /* 0.278795841 */, 17 },
-  /* 2644 */  { MAD_F(0x0476861d) /* 0.278936496 */, 17 },
-  /* 2645 */  { MAD_F(0x0477199f) /* 0.279077169 */, 17 },
-  /* 2646 */  { MAD_F(0x0477ad25) /* 0.279217860 */, 17 },
-  /* 2647 */  { MAD_F(0x047840b0) /* 0.279358568 */, 17 },
-  /* 2648 */  { MAD_F(0x0478d440) /* 0.279499294 */, 17 },
-  /* 2649 */  { MAD_F(0x047967d5) /* 0.279640037 */, 17 },
-  /* 2650 */  { MAD_F(0x0479fb6e) /* 0.279780799 */, 17 },
-  /* 2651 */  { MAD_F(0x047a8f0c) /* 0.279921578 */, 17 },
-  /* 2652 */  { MAD_F(0x047b22af) /* 0.280062375 */, 17 },
-  /* 2653 */  { MAD_F(0x047bb657) /* 0.280203189 */, 17 },
-  /* 2654 */  { MAD_F(0x047c4a03) /* 0.280344021 */, 17 },
-  /* 2655 */  { MAD_F(0x047cddb4) /* 0.280484871 */, 17 },
-
-  /* 2656 */  { MAD_F(0x047d716a) /* 0.280625739 */, 17 },
-  /* 2657 */  { MAD_F(0x047e0524) /* 0.280766624 */, 17 },
-  /* 2658 */  { MAD_F(0x047e98e4) /* 0.280907527 */, 17 },
-  /* 2659 */  { MAD_F(0x047f2ca8) /* 0.281048447 */, 17 },
-  /* 2660 */  { MAD_F(0x047fc071) /* 0.281189385 */, 17 },
-  /* 2661 */  { MAD_F(0x0480543e) /* 0.281330341 */, 17 },
-  /* 2662 */  { MAD_F(0x0480e811) /* 0.281471315 */, 17 },
-  /* 2663 */  { MAD_F(0x04817be8) /* 0.281612306 */, 17 },
-  /* 2664 */  { MAD_F(0x04820fc3) /* 0.281753315 */, 17 },
-  /* 2665 */  { MAD_F(0x0482a3a4) /* 0.281894341 */, 17 },
-  /* 2666 */  { MAD_F(0x04833789) /* 0.282035386 */, 17 },
-  /* 2667 */  { MAD_F(0x0483cb73) /* 0.282176447 */, 17 },
-  /* 2668 */  { MAD_F(0x04845f62) /* 0.282317527 */, 17 },
-  /* 2669 */  { MAD_F(0x0484f355) /* 0.282458624 */, 17 },
-  /* 2670 */  { MAD_F(0x0485874d) /* 0.282599738 */, 17 },
-  /* 2671 */  { MAD_F(0x04861b4a) /* 0.282740871 */, 17 },
-
-  /* 2672 */  { MAD_F(0x0486af4c) /* 0.282882021 */, 17 },
-  /* 2673 */  { MAD_F(0x04874352) /* 0.283023188 */, 17 },
-  /* 2674 */  { MAD_F(0x0487d75d) /* 0.283164373 */, 17 },
-  /* 2675 */  { MAD_F(0x04886b6d) /* 0.283305576 */, 17 },
-  /* 2676 */  { MAD_F(0x0488ff82) /* 0.283446796 */, 17 },
-  /* 2677 */  { MAD_F(0x0489939b) /* 0.283588034 */, 17 },
-  /* 2678 */  { MAD_F(0x048a27b9) /* 0.283729290 */, 17 },
-  /* 2679 */  { MAD_F(0x048abbdc) /* 0.283870563 */, 17 },
-  /* 2680 */  { MAD_F(0x048b5003) /* 0.284011853 */, 17 },
-  /* 2681 */  { MAD_F(0x048be42f) /* 0.284153161 */, 17 },
-  /* 2682 */  { MAD_F(0x048c7860) /* 0.284294487 */, 17 },
-  /* 2683 */  { MAD_F(0x048d0c96) /* 0.284435831 */, 17 },
-  /* 2684 */  { MAD_F(0x048da0d0) /* 0.284577192 */, 17 },
-  /* 2685 */  { MAD_F(0x048e350f) /* 0.284718570 */, 17 },
-  /* 2686 */  { MAD_F(0x048ec953) /* 0.284859966 */, 17 },
-  /* 2687 */  { MAD_F(0x048f5d9b) /* 0.285001380 */, 17 },
-
-  /* 2688 */  { MAD_F(0x048ff1e8) /* 0.285142811 */, 17 },
-  /* 2689 */  { MAD_F(0x0490863a) /* 0.285284259 */, 17 },
-  /* 2690 */  { MAD_F(0x04911a91) /* 0.285425726 */, 17 },
-  /* 2691 */  { MAD_F(0x0491aeec) /* 0.285567209 */, 17 },
-  /* 2692 */  { MAD_F(0x0492434c) /* 0.285708711 */, 17 },
-  /* 2693 */  { MAD_F(0x0492d7b0) /* 0.285850229 */, 17 },
-  /* 2694 */  { MAD_F(0x04936c1a) /* 0.285991766 */, 17 },
-  /* 2695 */  { MAD_F(0x04940088) /* 0.286133319 */, 17 },
-  /* 2696 */  { MAD_F(0x049494fb) /* 0.286274891 */, 17 },
-  /* 2697 */  { MAD_F(0x04952972) /* 0.286416480 */, 17 },
-  /* 2698 */  { MAD_F(0x0495bdee) /* 0.286558086 */, 17 },
-  /* 2699 */  { MAD_F(0x0496526f) /* 0.286699710 */, 17 },
-  /* 2700 */  { MAD_F(0x0496e6f5) /* 0.286841351 */, 17 },
-  /* 2701 */  { MAD_F(0x04977b7f) /* 0.286983010 */, 17 },
-  /* 2702 */  { MAD_F(0x0498100e) /* 0.287124686 */, 17 },
-  /* 2703 */  { MAD_F(0x0498a4a1) /* 0.287266380 */, 17 },
-
-  /* 2704 */  { MAD_F(0x0499393a) /* 0.287408091 */, 17 },
-  /* 2705 */  { MAD_F(0x0499cdd7) /* 0.287549820 */, 17 },
-  /* 2706 */  { MAD_F(0x049a6278) /* 0.287691566 */, 17 },
-  /* 2707 */  { MAD_F(0x049af71f) /* 0.287833330 */, 17 },
-  /* 2708 */  { MAD_F(0x049b8bca) /* 0.287975111 */, 17 },
-  /* 2709 */  { MAD_F(0x049c207a) /* 0.288116909 */, 17 },
-  /* 2710 */  { MAD_F(0x049cb52e) /* 0.288258725 */, 17 },
-  /* 2711 */  { MAD_F(0x049d49e7) /* 0.288400559 */, 17 },
-  /* 2712 */  { MAD_F(0x049ddea5) /* 0.288542409 */, 17 },
-  /* 2713 */  { MAD_F(0x049e7367) /* 0.288684278 */, 17 },
-  /* 2714 */  { MAD_F(0x049f082f) /* 0.288826163 */, 17 },
-  /* 2715 */  { MAD_F(0x049f9cfa) /* 0.288968067 */, 17 },
-  /* 2716 */  { MAD_F(0x04a031cb) /* 0.289109987 */, 17 },
-  /* 2717 */  { MAD_F(0x04a0c6a0) /* 0.289251925 */, 17 },
-  /* 2718 */  { MAD_F(0x04a15b7a) /* 0.289393881 */, 17 },
-  /* 2719 */  { MAD_F(0x04a1f059) /* 0.289535854 */, 17 },
-
-  /* 2720 */  { MAD_F(0x04a2853c) /* 0.289677844 */, 17 },
-  /* 2721 */  { MAD_F(0x04a31a24) /* 0.289819851 */, 17 },
-  /* 2722 */  { MAD_F(0x04a3af10) /* 0.289961876 */, 17 },
-  /* 2723 */  { MAD_F(0x04a44401) /* 0.290103919 */, 17 },
-  /* 2724 */  { MAD_F(0x04a4d8f7) /* 0.290245979 */, 17 },
-  /* 2725 */  { MAD_F(0x04a56df2) /* 0.290388056 */, 17 },
-  /* 2726 */  { MAD_F(0x04a602f1) /* 0.290530150 */, 17 },
-  /* 2727 */  { MAD_F(0x04a697f5) /* 0.290672262 */, 17 },
-  /* 2728 */  { MAD_F(0x04a72cfe) /* 0.290814392 */, 17 },
-  /* 2729 */  { MAD_F(0x04a7c20b) /* 0.290956538 */, 17 },
-  /* 2730 */  { MAD_F(0x04a8571d) /* 0.291098703 */, 17 },
-  /* 2731 */  { MAD_F(0x04a8ec33) /* 0.291240884 */, 17 },
-  /* 2732 */  { MAD_F(0x04a9814e) /* 0.291383083 */, 17 },
-  /* 2733 */  { MAD_F(0x04aa166e) /* 0.291525299 */, 17 },
-  /* 2734 */  { MAD_F(0x04aaab93) /* 0.291667532 */, 17 },
-  /* 2735 */  { MAD_F(0x04ab40bc) /* 0.291809783 */, 17 },
-
-  /* 2736 */  { MAD_F(0x04abd5ea) /* 0.291952051 */, 17 },
-  /* 2737 */  { MAD_F(0x04ac6b1c) /* 0.292094337 */, 17 },
-  /* 2738 */  { MAD_F(0x04ad0053) /* 0.292236640 */, 17 },
-  /* 2739 */  { MAD_F(0x04ad958f) /* 0.292378960 */, 17 },
-  /* 2740 */  { MAD_F(0x04ae2ad0) /* 0.292521297 */, 17 },
-  /* 2741 */  { MAD_F(0x04aec015) /* 0.292663652 */, 17 },
-  /* 2742 */  { MAD_F(0x04af555e) /* 0.292806024 */, 17 },
-  /* 2743 */  { MAD_F(0x04afeaad) /* 0.292948414 */, 17 },
-  /* 2744 */  { MAD_F(0x04b08000) /* 0.293090820 */, 17 },
-  /* 2745 */  { MAD_F(0x04b11557) /* 0.293233244 */, 17 },
-  /* 2746 */  { MAD_F(0x04b1aab4) /* 0.293375686 */, 17 },
-  /* 2747 */  { MAD_F(0x04b24015) /* 0.293518144 */, 17 },
-  /* 2748 */  { MAD_F(0x04b2d57a) /* 0.293660620 */, 17 },
-  /* 2749 */  { MAD_F(0x04b36ae4) /* 0.293803113 */, 17 },
-  /* 2750 */  { MAD_F(0x04b40053) /* 0.293945624 */, 17 },
-  /* 2751 */  { MAD_F(0x04b495c7) /* 0.294088151 */, 17 },
-
-  /* 2752 */  { MAD_F(0x04b52b3f) /* 0.294230696 */, 17 },
-  /* 2753 */  { MAD_F(0x04b5c0bc) /* 0.294373259 */, 17 },
-  /* 2754 */  { MAD_F(0x04b6563d) /* 0.294515838 */, 17 },
-  /* 2755 */  { MAD_F(0x04b6ebc3) /* 0.294658435 */, 17 },
-  /* 2756 */  { MAD_F(0x04b7814e) /* 0.294801049 */, 17 },
-  /* 2757 */  { MAD_F(0x04b816dd) /* 0.294943680 */, 17 },
-  /* 2758 */  { MAD_F(0x04b8ac71) /* 0.295086329 */, 17 },
-  /* 2759 */  { MAD_F(0x04b9420a) /* 0.295228995 */, 17 },
-  /* 2760 */  { MAD_F(0x04b9d7a7) /* 0.295371678 */, 17 },
-  /* 2761 */  { MAD_F(0x04ba6d49) /* 0.295514378 */, 17 },
-  /* 2762 */  { MAD_F(0x04bb02ef) /* 0.295657095 */, 17 },
-  /* 2763 */  { MAD_F(0x04bb989a) /* 0.295799830 */, 17 },
-  /* 2764 */  { MAD_F(0x04bc2e4a) /* 0.295942582 */, 17 },
-  /* 2765 */  { MAD_F(0x04bcc3fe) /* 0.296085351 */, 17 },
-  /* 2766 */  { MAD_F(0x04bd59b7) /* 0.296228138 */, 17 },
-  /* 2767 */  { MAD_F(0x04bdef74) /* 0.296370941 */, 17 },
-
-  /* 2768 */  { MAD_F(0x04be8537) /* 0.296513762 */, 17 },
-  /* 2769 */  { MAD_F(0x04bf1afd) /* 0.296656600 */, 17 },
-  /* 2770 */  { MAD_F(0x04bfb0c9) /* 0.296799455 */, 17 },
-  /* 2771 */  { MAD_F(0x04c04699) /* 0.296942327 */, 17 },
-  /* 2772 */  { MAD_F(0x04c0dc6d) /* 0.297085217 */, 17 },
-  /* 2773 */  { MAD_F(0x04c17247) /* 0.297228124 */, 17 },
-  /* 2774 */  { MAD_F(0x04c20824) /* 0.297371048 */, 17 },
-  /* 2775 */  { MAD_F(0x04c29e07) /* 0.297513989 */, 17 },
-  /* 2776 */  { MAD_F(0x04c333ee) /* 0.297656947 */, 17 },
-  /* 2777 */  { MAD_F(0x04c3c9da) /* 0.297799922 */, 17 },
-  /* 2778 */  { MAD_F(0x04c45fca) /* 0.297942915 */, 17 },
-  /* 2779 */  { MAD_F(0x04c4f5bf) /* 0.298085925 */, 17 },
-  /* 2780 */  { MAD_F(0x04c58bb8) /* 0.298228951 */, 17 },
-  /* 2781 */  { MAD_F(0x04c621b6) /* 0.298371996 */, 17 },
-  /* 2782 */  { MAD_F(0x04c6b7b9) /* 0.298515057 */, 17 },
-  /* 2783 */  { MAD_F(0x04c74dc0) /* 0.298658135 */, 17 },
-
-  /* 2784 */  { MAD_F(0x04c7e3cc) /* 0.298801231 */, 17 },
-  /* 2785 */  { MAD_F(0x04c879dd) /* 0.298944343 */, 17 },
-  /* 2786 */  { MAD_F(0x04c90ff2) /* 0.299087473 */, 17 },
-  /* 2787 */  { MAD_F(0x04c9a60c) /* 0.299230620 */, 17 },
-  /* 2788 */  { MAD_F(0x04ca3c2a) /* 0.299373784 */, 17 },
-  /* 2789 */  { MAD_F(0x04cad24d) /* 0.299516965 */, 17 },
-  /* 2790 */  { MAD_F(0x04cb6874) /* 0.299660163 */, 17 },
-  /* 2791 */  { MAD_F(0x04cbfea0) /* 0.299803378 */, 17 },
-  /* 2792 */  { MAD_F(0x04cc94d1) /* 0.299946611 */, 17 },
-  /* 2793 */  { MAD_F(0x04cd2b06) /* 0.300089860 */, 17 },
-  /* 2794 */  { MAD_F(0x04cdc140) /* 0.300233127 */, 17 },
-  /* 2795 */  { MAD_F(0x04ce577f) /* 0.300376411 */, 17 },
-  /* 2796 */  { MAD_F(0x04ceedc2) /* 0.300519711 */, 17 },
-  /* 2797 */  { MAD_F(0x04cf8409) /* 0.300663029 */, 17 },
-  /* 2798 */  { MAD_F(0x04d01a55) /* 0.300806364 */, 17 },
-  /* 2799 */  { MAD_F(0x04d0b0a6) /* 0.300949716 */, 17 },
-
-  /* 2800 */  { MAD_F(0x04d146fb) /* 0.301093085 */, 17 },
-  /* 2801 */  { MAD_F(0x04d1dd55) /* 0.301236472 */, 17 },
-  /* 2802 */  { MAD_F(0x04d273b4) /* 0.301379875 */, 17 },
-  /* 2803 */  { MAD_F(0x04d30a17) /* 0.301523295 */, 17 },
-  /* 2804 */  { MAD_F(0x04d3a07f) /* 0.301666733 */, 17 },
-  /* 2805 */  { MAD_F(0x04d436eb) /* 0.301810187 */, 17 },
-  /* 2806 */  { MAD_F(0x04d4cd5c) /* 0.301953659 */, 17 },
-  /* 2807 */  { MAD_F(0x04d563d1) /* 0.302097147 */, 17 },
-  /* 2808 */  { MAD_F(0x04d5fa4b) /* 0.302240653 */, 17 },
-  /* 2809 */  { MAD_F(0x04d690ca) /* 0.302384175 */, 17 },
-  /* 2810 */  { MAD_F(0x04d7274d) /* 0.302527715 */, 17 },
-  /* 2811 */  { MAD_F(0x04d7bdd5) /* 0.302671271 */, 17 },
-  /* 2812 */  { MAD_F(0x04d85461) /* 0.302814845 */, 17 },
-  /* 2813 */  { MAD_F(0x04d8eaf2) /* 0.302958436 */, 17 },
-  /* 2814 */  { MAD_F(0x04d98187) /* 0.303102044 */, 17 },
-  /* 2815 */  { MAD_F(0x04da1821) /* 0.303245668 */, 17 },
-
-  /* 2816 */  { MAD_F(0x04daaec0) /* 0.303389310 */, 17 },
-  /* 2817 */  { MAD_F(0x04db4563) /* 0.303532969 */, 17 },
-  /* 2818 */  { MAD_F(0x04dbdc0a) /* 0.303676645 */, 17 },
-  /* 2819 */  { MAD_F(0x04dc72b7) /* 0.303820337 */, 17 },
-  /* 2820 */  { MAD_F(0x04dd0967) /* 0.303964047 */, 17 },
-  /* 2821 */  { MAD_F(0x04dda01d) /* 0.304107774 */, 17 },
-  /* 2822 */  { MAD_F(0x04de36d7) /* 0.304251517 */, 17 },
-  /* 2823 */  { MAD_F(0x04decd95) /* 0.304395278 */, 17 },
-  /* 2824 */  { MAD_F(0x04df6458) /* 0.304539056 */, 17 },
-  /* 2825 */  { MAD_F(0x04dffb20) /* 0.304682850 */, 17 },
-  /* 2826 */  { MAD_F(0x04e091ec) /* 0.304826662 */, 17 },
-  /* 2827 */  { MAD_F(0x04e128bc) /* 0.304970491 */, 17 },
-  /* 2828 */  { MAD_F(0x04e1bf92) /* 0.305114336 */, 17 },
-  /* 2829 */  { MAD_F(0x04e2566b) /* 0.305258199 */, 17 },
-  /* 2830 */  { MAD_F(0x04e2ed4a) /* 0.305402078 */, 17 },
-  /* 2831 */  { MAD_F(0x04e3842d) /* 0.305545974 */, 17 },
-
-  /* 2832 */  { MAD_F(0x04e41b14) /* 0.305689888 */, 17 },
-  /* 2833 */  { MAD_F(0x04e4b200) /* 0.305833818 */, 17 },
-  /* 2834 */  { MAD_F(0x04e548f1) /* 0.305977765 */, 17 },
-  /* 2835 */  { MAD_F(0x04e5dfe6) /* 0.306121729 */, 17 },
-  /* 2836 */  { MAD_F(0x04e676df) /* 0.306265710 */, 17 },
-  /* 2837 */  { MAD_F(0x04e70dde) /* 0.306409708 */, 17 },
-  /* 2838 */  { MAD_F(0x04e7a4e0) /* 0.306553723 */, 17 },
-  /* 2839 */  { MAD_F(0x04e83be7) /* 0.306697755 */, 17 },
-  /* 2840 */  { MAD_F(0x04e8d2f3) /* 0.306841804 */, 17 },
-  /* 2841 */  { MAD_F(0x04e96a04) /* 0.306985869 */, 17 },
-  /* 2842 */  { MAD_F(0x04ea0118) /* 0.307129952 */, 17 },
-  /* 2843 */  { MAD_F(0x04ea9832) /* 0.307274051 */, 17 },
-  /* 2844 */  { MAD_F(0x04eb2f50) /* 0.307418168 */, 17 },
-  /* 2845 */  { MAD_F(0x04ebc672) /* 0.307562301 */, 17 },
-  /* 2846 */  { MAD_F(0x04ec5d99) /* 0.307706451 */, 17 },
-  /* 2847 */  { MAD_F(0x04ecf4c5) /* 0.307850618 */, 17 },
-
-  /* 2848 */  { MAD_F(0x04ed8bf5) /* 0.307994802 */, 17 },
-  /* 2849 */  { MAD_F(0x04ee2329) /* 0.308139003 */, 17 },
-  /* 2850 */  { MAD_F(0x04eeba63) /* 0.308283220 */, 17 },
-  /* 2851 */  { MAD_F(0x04ef51a0) /* 0.308427455 */, 17 },
-  /* 2852 */  { MAD_F(0x04efe8e2) /* 0.308571706 */, 17 },
-  /* 2853 */  { MAD_F(0x04f08029) /* 0.308715974 */, 17 },
-  /* 2854 */  { MAD_F(0x04f11774) /* 0.308860260 */, 17 },
-  /* 2855 */  { MAD_F(0x04f1aec4) /* 0.309004561 */, 17 },
-  /* 2856 */  { MAD_F(0x04f24618) /* 0.309148880 */, 17 },
-  /* 2857 */  { MAD_F(0x04f2dd71) /* 0.309293216 */, 17 },
-  /* 2858 */  { MAD_F(0x04f374cf) /* 0.309437568 */, 17 },
-  /* 2859 */  { MAD_F(0x04f40c30) /* 0.309581938 */, 17 },
-  /* 2860 */  { MAD_F(0x04f4a397) /* 0.309726324 */, 17 },
-  /* 2861 */  { MAD_F(0x04f53b02) /* 0.309870727 */, 17 },
-  /* 2862 */  { MAD_F(0x04f5d271) /* 0.310015147 */, 17 },
-  /* 2863 */  { MAD_F(0x04f669e5) /* 0.310159583 */, 17 },
-
-  /* 2864 */  { MAD_F(0x04f7015d) /* 0.310304037 */, 17 },
-  /* 2865 */  { MAD_F(0x04f798da) /* 0.310448507 */, 17 },
-  /* 2866 */  { MAD_F(0x04f8305c) /* 0.310592994 */, 17 },
-  /* 2867 */  { MAD_F(0x04f8c7e2) /* 0.310737498 */, 17 },
-  /* 2868 */  { MAD_F(0x04f95f6c) /* 0.310882018 */, 17 },
-  /* 2869 */  { MAD_F(0x04f9f6fb) /* 0.311026556 */, 17 },
-  /* 2870 */  { MAD_F(0x04fa8e8f) /* 0.311171110 */, 17 },
-  /* 2871 */  { MAD_F(0x04fb2627) /* 0.311315681 */, 17 },
-  /* 2872 */  { MAD_F(0x04fbbdc3) /* 0.311460269 */, 17 },
-  /* 2873 */  { MAD_F(0x04fc5564) /* 0.311604874 */, 17 },
-  /* 2874 */  { MAD_F(0x04fced0a) /* 0.311749495 */, 17 },
-  /* 2875 */  { MAD_F(0x04fd84b4) /* 0.311894133 */, 17 },
-  /* 2876 */  { MAD_F(0x04fe1c62) /* 0.312038788 */, 17 },
-  /* 2877 */  { MAD_F(0x04feb415) /* 0.312183460 */, 17 },
-  /* 2878 */  { MAD_F(0x04ff4bcd) /* 0.312328148 */, 17 },
-  /* 2879 */  { MAD_F(0x04ffe389) /* 0.312472854 */, 17 },
-
-  /* 2880 */  { MAD_F(0x05007b49) /* 0.312617576 */, 17 },
-  /* 2881 */  { MAD_F(0x0501130e) /* 0.312762314 */, 17 },
-  /* 2882 */  { MAD_F(0x0501aad8) /* 0.312907070 */, 17 },
-  /* 2883 */  { MAD_F(0x050242a6) /* 0.313051842 */, 17 },
-  /* 2884 */  { MAD_F(0x0502da78) /* 0.313196631 */, 17 },
-  /* 2885 */  { MAD_F(0x0503724f) /* 0.313341437 */, 17 },
-  /* 2886 */  { MAD_F(0x05040a2b) /* 0.313486259 */, 17 },
-  /* 2887 */  { MAD_F(0x0504a20b) /* 0.313631098 */, 17 },
-  /* 2888 */  { MAD_F(0x050539ef) /* 0.313775954 */, 17 },
-  /* 2889 */  { MAD_F(0x0505d1d8) /* 0.313920827 */, 17 },
-  /* 2890 */  { MAD_F(0x050669c5) /* 0.314065716 */, 17 },
-  /* 2891 */  { MAD_F(0x050701b7) /* 0.314210622 */, 17 },
-  /* 2892 */  { MAD_F(0x050799ae) /* 0.314355545 */, 17 },
-  /* 2893 */  { MAD_F(0x050831a9) /* 0.314500484 */, 17 },
-  /* 2894 */  { MAD_F(0x0508c9a8) /* 0.314645440 */, 17 },
-  /* 2895 */  { MAD_F(0x050961ac) /* 0.314790413 */, 17 },
-
-  /* 2896 */  { MAD_F(0x0509f9b4) /* 0.314935403 */, 17 },
-  /* 2897 */  { MAD_F(0x050a91c1) /* 0.315080409 */, 17 },
-  /* 2898 */  { MAD_F(0x050b29d2) /* 0.315225432 */, 17 },
-  /* 2899 */  { MAD_F(0x050bc1e8) /* 0.315370472 */, 17 },
-  /* 2900 */  { MAD_F(0x050c5a02) /* 0.315515528 */, 17 },
-  /* 2901 */  { MAD_F(0x050cf221) /* 0.315660601 */, 17 },
-  /* 2902 */  { MAD_F(0x050d8a44) /* 0.315805690 */, 17 },
-  /* 2903 */  { MAD_F(0x050e226c) /* 0.315950797 */, 17 },
-  /* 2904 */  { MAD_F(0x050eba98) /* 0.316095920 */, 17 },
-  /* 2905 */  { MAD_F(0x050f52c9) /* 0.316241059 */, 17 },
-  /* 2906 */  { MAD_F(0x050feafe) /* 0.316386216 */, 17 },
-  /* 2907 */  { MAD_F(0x05108337) /* 0.316531388 */, 17 },
-  /* 2908 */  { MAD_F(0x05111b75) /* 0.316676578 */, 17 },
-  /* 2909 */  { MAD_F(0x0511b3b8) /* 0.316821784 */, 17 },
-  /* 2910 */  { MAD_F(0x05124bff) /* 0.316967007 */, 17 },
-  /* 2911 */  { MAD_F(0x0512e44a) /* 0.317112247 */, 17 },
-
-  /* 2912 */  { MAD_F(0x05137c9a) /* 0.317257503 */, 17 },
-  /* 2913 */  { MAD_F(0x051414ee) /* 0.317402775 */, 17 },
-  /* 2914 */  { MAD_F(0x0514ad47) /* 0.317548065 */, 17 },
-  /* 2915 */  { MAD_F(0x051545a5) /* 0.317693371 */, 17 },
-  /* 2916 */  { MAD_F(0x0515de06) /* 0.317838693 */, 17 },
-  /* 2917 */  { MAD_F(0x0516766d) /* 0.317984033 */, 17 },
-  /* 2918 */  { MAD_F(0x05170ed7) /* 0.318129388 */, 17 },
-  /* 2919 */  { MAD_F(0x0517a746) /* 0.318274761 */, 17 },
-  /* 2920 */  { MAD_F(0x05183fba) /* 0.318420150 */, 17 },
-  /* 2921 */  { MAD_F(0x0518d832) /* 0.318565555 */, 17 },
-  /* 2922 */  { MAD_F(0x051970ae) /* 0.318710978 */, 17 },
-  /* 2923 */  { MAD_F(0x051a092f) /* 0.318856416 */, 17 },
-  /* 2924 */  { MAD_F(0x051aa1b5) /* 0.319001872 */, 17 },
-  /* 2925 */  { MAD_F(0x051b3a3f) /* 0.319147344 */, 17 },
-  /* 2926 */  { MAD_F(0x051bd2cd) /* 0.319292832 */, 17 },
-  /* 2927 */  { MAD_F(0x051c6b60) /* 0.319438338 */, 17 },
-
-  /* 2928 */  { MAD_F(0x051d03f7) /* 0.319583859 */, 17 },
-  /* 2929 */  { MAD_F(0x051d9c92) /* 0.319729398 */, 17 },
-  /* 2930 */  { MAD_F(0x051e3532) /* 0.319874952 */, 17 },
-  /* 2931 */  { MAD_F(0x051ecdd7) /* 0.320020524 */, 17 },
-  /* 2932 */  { MAD_F(0x051f6680) /* 0.320166112 */, 17 },
-  /* 2933 */  { MAD_F(0x051fff2d) /* 0.320311716 */, 17 },
-  /* 2934 */  { MAD_F(0x052097df) /* 0.320457337 */, 17 },
-  /* 2935 */  { MAD_F(0x05213095) /* 0.320602975 */, 17 },
-  /* 2936 */  { MAD_F(0x0521c950) /* 0.320748629 */, 17 },
-  /* 2937 */  { MAD_F(0x0522620f) /* 0.320894300 */, 17 },
-  /* 2938 */  { MAD_F(0x0522fad3) /* 0.321039987 */, 17 },
-  /* 2939 */  { MAD_F(0x0523939b) /* 0.321185691 */, 17 },
-  /* 2940 */  { MAD_F(0x05242c68) /* 0.321331411 */, 17 },
-  /* 2941 */  { MAD_F(0x0524c538) /* 0.321477148 */, 17 },
-  /* 2942 */  { MAD_F(0x05255e0e) /* 0.321622901 */, 17 },
-  /* 2943 */  { MAD_F(0x0525f6e8) /* 0.321768671 */, 17 },
-
-  /* 2944 */  { MAD_F(0x05268fc6) /* 0.321914457 */, 17 },
-  /* 2945 */  { MAD_F(0x052728a9) /* 0.322060260 */, 17 },
-  /* 2946 */  { MAD_F(0x0527c190) /* 0.322206079 */, 17 },
-  /* 2947 */  { MAD_F(0x05285a7b) /* 0.322351915 */, 17 },
-  /* 2948 */  { MAD_F(0x0528f36b) /* 0.322497768 */, 17 },
-  /* 2949 */  { MAD_F(0x05298c5f) /* 0.322643636 */, 17 },
-  /* 2950 */  { MAD_F(0x052a2558) /* 0.322789522 */, 17 },
-  /* 2951 */  { MAD_F(0x052abe55) /* 0.322935424 */, 17 },
-  /* 2952 */  { MAD_F(0x052b5757) /* 0.323081342 */, 17 },
-  /* 2953 */  { MAD_F(0x052bf05d) /* 0.323227277 */, 17 },
-  /* 2954 */  { MAD_F(0x052c8968) /* 0.323373228 */, 17 },
-  /* 2955 */  { MAD_F(0x052d2277) /* 0.323519196 */, 17 },
-  /* 2956 */  { MAD_F(0x052dbb8a) /* 0.323665180 */, 17 },
-  /* 2957 */  { MAD_F(0x052e54a2) /* 0.323811180 */, 17 },
-  /* 2958 */  { MAD_F(0x052eedbe) /* 0.323957197 */, 17 },
-  /* 2959 */  { MAD_F(0x052f86de) /* 0.324103231 */, 17 },
-
-  /* 2960 */  { MAD_F(0x05302003) /* 0.324249281 */, 17 },
-  /* 2961 */  { MAD_F(0x0530b92d) /* 0.324395347 */, 17 },
-  /* 2962 */  { MAD_F(0x0531525b) /* 0.324541430 */, 17 },
-  /* 2963 */  { MAD_F(0x0531eb8d) /* 0.324687530 */, 17 },
-  /* 2964 */  { MAD_F(0x053284c4) /* 0.324833646 */, 17 },
-  /* 2965 */  { MAD_F(0x05331dff) /* 0.324979778 */, 17 },
-  /* 2966 */  { MAD_F(0x0533b73e) /* 0.325125926 */, 17 },
-  /* 2967 */  { MAD_F(0x05345082) /* 0.325272091 */, 17 },
-  /* 2968 */  { MAD_F(0x0534e9ca) /* 0.325418273 */, 17 },
-  /* 2969 */  { MAD_F(0x05358317) /* 0.325564471 */, 17 },
-  /* 2970 */  { MAD_F(0x05361c68) /* 0.325710685 */, 17 },
-  /* 2971 */  { MAD_F(0x0536b5be) /* 0.325856916 */, 17 },
-  /* 2972 */  { MAD_F(0x05374f17) /* 0.326003163 */, 17 },
-  /* 2973 */  { MAD_F(0x0537e876) /* 0.326149427 */, 17 },
-  /* 2974 */  { MAD_F(0x053881d9) /* 0.326295707 */, 17 },
-  /* 2975 */  { MAD_F(0x05391b40) /* 0.326442003 */, 17 },
-
-  /* 2976 */  { MAD_F(0x0539b4ab) /* 0.326588316 */, 17 },
-  /* 2977 */  { MAD_F(0x053a4e1b) /* 0.326734645 */, 17 },
-  /* 2978 */  { MAD_F(0x053ae78f) /* 0.326880990 */, 17 },
-  /* 2979 */  { MAD_F(0x053b8108) /* 0.327027352 */, 17 },
-  /* 2980 */  { MAD_F(0x053c1a85) /* 0.327173730 */, 17 },
-  /* 2981 */  { MAD_F(0x053cb407) /* 0.327320125 */, 17 },
-  /* 2982 */  { MAD_F(0x053d4d8d) /* 0.327466536 */, 17 },
-  /* 2983 */  { MAD_F(0x053de717) /* 0.327612963 */, 17 },
-  /* 2984 */  { MAD_F(0x053e80a6) /* 0.327759407 */, 17 },
-  /* 2985 */  { MAD_F(0x053f1a39) /* 0.327905867 */, 17 },
-  /* 2986 */  { MAD_F(0x053fb3d0) /* 0.328052344 */, 17 },
-  /* 2987 */  { MAD_F(0x05404d6c) /* 0.328198837 */, 17 },
-  /* 2988 */  { MAD_F(0x0540e70c) /* 0.328345346 */, 17 },
-  /* 2989 */  { MAD_F(0x054180b1) /* 0.328491871 */, 17 },
-  /* 2990 */  { MAD_F(0x05421a5a) /* 0.328638413 */, 17 },
-  /* 2991 */  { MAD_F(0x0542b407) /* 0.328784971 */, 17 },
-
-  /* 2992 */  { MAD_F(0x05434db9) /* 0.328931546 */, 17 },
-  /* 2993 */  { MAD_F(0x0543e76f) /* 0.329078137 */, 17 },
-  /* 2994 */  { MAD_F(0x0544812a) /* 0.329224744 */, 17 },
-  /* 2995 */  { MAD_F(0x05451ae9) /* 0.329371367 */, 17 },
-  /* 2996 */  { MAD_F(0x0545b4ac) /* 0.329518007 */, 17 },
-  /* 2997 */  { MAD_F(0x05464e74) /* 0.329664663 */, 17 },
-  /* 2998 */  { MAD_F(0x0546e840) /* 0.329811336 */, 17 },
-  /* 2999 */  { MAD_F(0x05478211) /* 0.329958024 */, 17 },
-  /* 3000 */  { MAD_F(0x05481be5) /* 0.330104730 */, 17 },
-  /* 3001 */  { MAD_F(0x0548b5bf) /* 0.330251451 */, 17 },
-  /* 3002 */  { MAD_F(0x05494f9c) /* 0.330398189 */, 17 },
-  /* 3003 */  { MAD_F(0x0549e97e) /* 0.330544943 */, 17 },
-  /* 3004 */  { MAD_F(0x054a8364) /* 0.330691713 */, 17 },
-  /* 3005 */  { MAD_F(0x054b1d4f) /* 0.330838499 */, 17 },
-  /* 3006 */  { MAD_F(0x054bb73e) /* 0.330985302 */, 17 },
-  /* 3007 */  { MAD_F(0x054c5132) /* 0.331132121 */, 17 },
-
-  /* 3008 */  { MAD_F(0x054ceb2a) /* 0.331278957 */, 17 },
-  /* 3009 */  { MAD_F(0x054d8526) /* 0.331425808 */, 17 },
-  /* 3010 */  { MAD_F(0x054e1f26) /* 0.331572676 */, 17 },
-  /* 3011 */  { MAD_F(0x054eb92b) /* 0.331719560 */, 17 },
-  /* 3012 */  { MAD_F(0x054f5334) /* 0.331866461 */, 17 },
-  /* 3013 */  { MAD_F(0x054fed42) /* 0.332013377 */, 17 },
-  /* 3014 */  { MAD_F(0x05508754) /* 0.332160310 */, 17 },
-  /* 3015 */  { MAD_F(0x0551216b) /* 0.332307260 */, 17 },
-  /* 3016 */  { MAD_F(0x0551bb85) /* 0.332454225 */, 17 },
-  /* 3017 */  { MAD_F(0x055255a4) /* 0.332601207 */, 17 },
-  /* 3018 */  { MAD_F(0x0552efc8) /* 0.332748205 */, 17 },
-  /* 3019 */  { MAD_F(0x055389f0) /* 0.332895219 */, 17 },
-  /* 3020 */  { MAD_F(0x0554241c) /* 0.333042249 */, 17 },
-  /* 3021 */  { MAD_F(0x0554be4c) /* 0.333189296 */, 17 },
-  /* 3022 */  { MAD_F(0x05555881) /* 0.333336359 */, 17 },
-  /* 3023 */  { MAD_F(0x0555f2ba) /* 0.333483438 */, 17 },
-
-  /* 3024 */  { MAD_F(0x05568cf8) /* 0.333630533 */, 17 },
-  /* 3025 */  { MAD_F(0x0557273a) /* 0.333777645 */, 17 },
-  /* 3026 */  { MAD_F(0x0557c180) /* 0.333924772 */, 17 },
-  /* 3027 */  { MAD_F(0x05585bcb) /* 0.334071916 */, 17 },
-  /* 3028 */  { MAD_F(0x0558f61a) /* 0.334219076 */, 17 },
-  /* 3029 */  { MAD_F(0x0559906d) /* 0.334366253 */, 17 },
-  /* 3030 */  { MAD_F(0x055a2ac5) /* 0.334513445 */, 17 },
-  /* 3031 */  { MAD_F(0x055ac521) /* 0.334660654 */, 17 },
-  /* 3032 */  { MAD_F(0x055b5f81) /* 0.334807879 */, 17 },
-  /* 3033 */  { MAD_F(0x055bf9e6) /* 0.334955120 */, 17 },
-  /* 3034 */  { MAD_F(0x055c944f) /* 0.335102377 */, 17 },
-  /* 3035 */  { MAD_F(0x055d2ebd) /* 0.335249651 */, 17 },
-  /* 3036 */  { MAD_F(0x055dc92e) /* 0.335396941 */, 17 },
-  /* 3037 */  { MAD_F(0x055e63a5) /* 0.335544246 */, 17 },
-  /* 3038 */  { MAD_F(0x055efe1f) /* 0.335691568 */, 17 },
-  /* 3039 */  { MAD_F(0x055f989e) /* 0.335838906 */, 17 },
-
-  /* 3040 */  { MAD_F(0x05603321) /* 0.335986261 */, 17 },
-  /* 3041 */  { MAD_F(0x0560cda8) /* 0.336133631 */, 17 },
-  /* 3042 */  { MAD_F(0x05616834) /* 0.336281018 */, 17 },
-  /* 3043 */  { MAD_F(0x056202c4) /* 0.336428421 */, 17 },
-  /* 3044 */  { MAD_F(0x05629d59) /* 0.336575840 */, 17 },
-  /* 3045 */  { MAD_F(0x056337f2) /* 0.336723275 */, 17 },
-  /* 3046 */  { MAD_F(0x0563d28f) /* 0.336870726 */, 17 },
-  /* 3047 */  { MAD_F(0x05646d30) /* 0.337018193 */, 17 },
-  /* 3048 */  { MAD_F(0x056507d6) /* 0.337165677 */, 17 },
-  /* 3049 */  { MAD_F(0x0565a280) /* 0.337313176 */, 17 },
-  /* 3050 */  { MAD_F(0x05663d2f) /* 0.337460692 */, 17 },
-  /* 3051 */  { MAD_F(0x0566d7e1) /* 0.337608224 */, 17 },
-  /* 3052 */  { MAD_F(0x05677298) /* 0.337755772 */, 17 },
-  /* 3053 */  { MAD_F(0x05680d54) /* 0.337903336 */, 17 },
-  /* 3054 */  { MAD_F(0x0568a814) /* 0.338050916 */, 17 },
-  /* 3055 */  { MAD_F(0x056942d8) /* 0.338198513 */, 17 },
-
-  /* 3056 */  { MAD_F(0x0569dda0) /* 0.338346125 */, 17 },
-  /* 3057 */  { MAD_F(0x056a786d) /* 0.338493753 */, 17 },
-  /* 3058 */  { MAD_F(0x056b133e) /* 0.338641398 */, 17 },
-  /* 3059 */  { MAD_F(0x056bae13) /* 0.338789059 */, 17 },
-  /* 3060 */  { MAD_F(0x056c48ed) /* 0.338936736 */, 17 },
-  /* 3061 */  { MAD_F(0x056ce3cb) /* 0.339084429 */, 17 },
-  /* 3062 */  { MAD_F(0x056d7ead) /* 0.339232138 */, 17 },
-  /* 3063 */  { MAD_F(0x056e1994) /* 0.339379863 */, 17 },
-  /* 3064 */  { MAD_F(0x056eb47f) /* 0.339527604 */, 17 },
-  /* 3065 */  { MAD_F(0x056f4f6e) /* 0.339675361 */, 17 },
-  /* 3066 */  { MAD_F(0x056fea62) /* 0.339823134 */, 17 },
-  /* 3067 */  { MAD_F(0x0570855a) /* 0.339970924 */, 17 },
-  /* 3068 */  { MAD_F(0x05712056) /* 0.340118729 */, 17 },
-  /* 3069 */  { MAD_F(0x0571bb56) /* 0.340266550 */, 17 },
-  /* 3070 */  { MAD_F(0x0572565b) /* 0.340414388 */, 17 },
-  /* 3071 */  { MAD_F(0x0572f164) /* 0.340562242 */, 17 },
-
-  /* 3072 */  { MAD_F(0x05738c72) /* 0.340710111 */, 17 },
-  /* 3073 */  { MAD_F(0x05742784) /* 0.340857997 */, 17 },
-  /* 3074 */  { MAD_F(0x0574c29a) /* 0.341005899 */, 17 },
-  /* 3075 */  { MAD_F(0x05755db4) /* 0.341153816 */, 17 },
-  /* 3076 */  { MAD_F(0x0575f8d3) /* 0.341301750 */, 17 },
-  /* 3077 */  { MAD_F(0x057693f6) /* 0.341449700 */, 17 },
-  /* 3078 */  { MAD_F(0x05772f1d) /* 0.341597666 */, 17 },
-  /* 3079 */  { MAD_F(0x0577ca49) /* 0.341745648 */, 17 },
-  /* 3080 */  { MAD_F(0x05786578) /* 0.341893646 */, 17 },
-  /* 3081 */  { MAD_F(0x057900ad) /* 0.342041659 */, 17 },
-  /* 3082 */  { MAD_F(0x05799be5) /* 0.342189689 */, 17 },
-  /* 3083 */  { MAD_F(0x057a3722) /* 0.342337735 */, 17 },
-  /* 3084 */  { MAD_F(0x057ad263) /* 0.342485797 */, 17 },
-  /* 3085 */  { MAD_F(0x057b6da8) /* 0.342633875 */, 17 },
-  /* 3086 */  { MAD_F(0x057c08f2) /* 0.342781969 */, 17 },
-  /* 3087 */  { MAD_F(0x057ca440) /* 0.342930079 */, 17 },
-
-  /* 3088 */  { MAD_F(0x057d3f92) /* 0.343078205 */, 17 },
-  /* 3089 */  { MAD_F(0x057ddae9) /* 0.343226347 */, 17 },
-  /* 3090 */  { MAD_F(0x057e7644) /* 0.343374505 */, 17 },
-  /* 3091 */  { MAD_F(0x057f11a3) /* 0.343522679 */, 17 },
-  /* 3092 */  { MAD_F(0x057fad06) /* 0.343670869 */, 17 },
-  /* 3093 */  { MAD_F(0x0580486e) /* 0.343819075 */, 17 },
-  /* 3094 */  { MAD_F(0x0580e3da) /* 0.343967296 */, 17 },
-  /* 3095 */  { MAD_F(0x05817f4a) /* 0.344115534 */, 17 },
-  /* 3096 */  { MAD_F(0x05821abf) /* 0.344263788 */, 17 },
-  /* 3097 */  { MAD_F(0x0582b638) /* 0.344412058 */, 17 },
-  /* 3098 */  { MAD_F(0x058351b5) /* 0.344560343 */, 17 },
-  /* 3099 */  { MAD_F(0x0583ed36) /* 0.344708645 */, 17 },
-  /* 3100 */  { MAD_F(0x058488bc) /* 0.344856963 */, 17 },
-  /* 3101 */  { MAD_F(0x05852446) /* 0.345005296 */, 17 },
-  /* 3102 */  { MAD_F(0x0585bfd4) /* 0.345153646 */, 17 },
-  /* 3103 */  { MAD_F(0x05865b67) /* 0.345302011 */, 17 },
-
-  /* 3104 */  { MAD_F(0x0586f6fd) /* 0.345450393 */, 17 },
-  /* 3105 */  { MAD_F(0x05879298) /* 0.345598790 */, 17 },
-  /* 3106 */  { MAD_F(0x05882e38) /* 0.345747203 */, 17 },
-  /* 3107 */  { MAD_F(0x0588c9dc) /* 0.345895632 */, 17 },
-  /* 3108 */  { MAD_F(0x05896583) /* 0.346044077 */, 17 },
-  /* 3109 */  { MAD_F(0x058a0130) /* 0.346192538 */, 17 },
-  /* 3110 */  { MAD_F(0x058a9ce0) /* 0.346341015 */, 17 },
-  /* 3111 */  { MAD_F(0x058b3895) /* 0.346489508 */, 17 },
-  /* 3112 */  { MAD_F(0x058bd44e) /* 0.346638017 */, 17 },
-  /* 3113 */  { MAD_F(0x058c700b) /* 0.346786542 */, 17 },
-  /* 3114 */  { MAD_F(0x058d0bcd) /* 0.346935082 */, 17 },
-  /* 3115 */  { MAD_F(0x058da793) /* 0.347083639 */, 17 },
-  /* 3116 */  { MAD_F(0x058e435d) /* 0.347232211 */, 17 },
-  /* 3117 */  { MAD_F(0x058edf2b) /* 0.347380799 */, 17 },
-  /* 3118 */  { MAD_F(0x058f7afe) /* 0.347529403 */, 17 },
-  /* 3119 */  { MAD_F(0x059016d5) /* 0.347678023 */, 17 },
-
-  /* 3120 */  { MAD_F(0x0590b2b0) /* 0.347826659 */, 17 },
-  /* 3121 */  { MAD_F(0x05914e8f) /* 0.347975311 */, 17 },
-  /* 3122 */  { MAD_F(0x0591ea73) /* 0.348123979 */, 17 },
-  /* 3123 */  { MAD_F(0x0592865b) /* 0.348272662 */, 17 },
-  /* 3124 */  { MAD_F(0x05932247) /* 0.348421362 */, 17 },
-  /* 3125 */  { MAD_F(0x0593be37) /* 0.348570077 */, 17 },
-  /* 3126 */  { MAD_F(0x05945a2c) /* 0.348718808 */, 17 },
-  /* 3127 */  { MAD_F(0x0594f625) /* 0.348867555 */, 17 },
-  /* 3128 */  { MAD_F(0x05959222) /* 0.349016318 */, 17 },
-  /* 3129 */  { MAD_F(0x05962e24) /* 0.349165097 */, 17 },
-  /* 3130 */  { MAD_F(0x0596ca2a) /* 0.349313892 */, 17 },
-  /* 3131 */  { MAD_F(0x05976634) /* 0.349462702 */, 17 },
-  /* 3132 */  { MAD_F(0x05980242) /* 0.349611528 */, 17 },
-  /* 3133 */  { MAD_F(0x05989e54) /* 0.349760370 */, 17 },
-  /* 3134 */  { MAD_F(0x05993a6b) /* 0.349909228 */, 17 },
-  /* 3135 */  { MAD_F(0x0599d686) /* 0.350058102 */, 17 },
-
-  /* 3136 */  { MAD_F(0x059a72a5) /* 0.350206992 */, 17 },
-  /* 3137 */  { MAD_F(0x059b0ec9) /* 0.350355897 */, 17 },
-  /* 3138 */  { MAD_F(0x059baaf1) /* 0.350504818 */, 17 },
-  /* 3139 */  { MAD_F(0x059c471d) /* 0.350653756 */, 17 },
-  /* 3140 */  { MAD_F(0x059ce34d) /* 0.350802708 */, 17 },
-  /* 3141 */  { MAD_F(0x059d7f81) /* 0.350951677 */, 17 },
-  /* 3142 */  { MAD_F(0x059e1bba) /* 0.351100662 */, 17 },
-  /* 3143 */  { MAD_F(0x059eb7f7) /* 0.351249662 */, 17 },
-  /* 3144 */  { MAD_F(0x059f5438) /* 0.351398678 */, 17 },
-  /* 3145 */  { MAD_F(0x059ff07e) /* 0.351547710 */, 17 },
-  /* 3146 */  { MAD_F(0x05a08cc7) /* 0.351696758 */, 17 },
-  /* 3147 */  { MAD_F(0x05a12915) /* 0.351845821 */, 17 },
-  /* 3148 */  { MAD_F(0x05a1c567) /* 0.351994901 */, 17 },
-  /* 3149 */  { MAD_F(0x05a261be) /* 0.352143996 */, 17 },
-  /* 3150 */  { MAD_F(0x05a2fe18) /* 0.352293107 */, 17 },
-  /* 3151 */  { MAD_F(0x05a39a77) /* 0.352442233 */, 17 },
-
-  /* 3152 */  { MAD_F(0x05a436da) /* 0.352591376 */, 17 },
-  /* 3153 */  { MAD_F(0x05a4d342) /* 0.352740534 */, 17 },
-  /* 3154 */  { MAD_F(0x05a56fad) /* 0.352889708 */, 17 },
-  /* 3155 */  { MAD_F(0x05a60c1d) /* 0.353038898 */, 17 },
-  /* 3156 */  { MAD_F(0x05a6a891) /* 0.353188103 */, 17 },
-  /* 3157 */  { MAD_F(0x05a7450a) /* 0.353337325 */, 17 },
-  /* 3158 */  { MAD_F(0x05a7e186) /* 0.353486562 */, 17 },
-  /* 3159 */  { MAD_F(0x05a87e07) /* 0.353635814 */, 17 },
-  /* 3160 */  { MAD_F(0x05a91a8c) /* 0.353785083 */, 17 },
-  /* 3161 */  { MAD_F(0x05a9b715) /* 0.353934367 */, 17 },
-  /* 3162 */  { MAD_F(0x05aa53a2) /* 0.354083667 */, 17 },
-  /* 3163 */  { MAD_F(0x05aaf034) /* 0.354232983 */, 17 },
-  /* 3164 */  { MAD_F(0x05ab8cca) /* 0.354382314 */, 17 },
-  /* 3165 */  { MAD_F(0x05ac2964) /* 0.354531662 */, 17 },
-  /* 3166 */  { MAD_F(0x05acc602) /* 0.354681025 */, 17 },
-  /* 3167 */  { MAD_F(0x05ad62a5) /* 0.354830403 */, 17 },
-
-  /* 3168 */  { MAD_F(0x05adff4c) /* 0.354979798 */, 17 },
-  /* 3169 */  { MAD_F(0x05ae9bf7) /* 0.355129208 */, 17 },
-  /* 3170 */  { MAD_F(0x05af38a6) /* 0.355278634 */, 17 },
-  /* 3171 */  { MAD_F(0x05afd559) /* 0.355428075 */, 17 },
-  /* 3172 */  { MAD_F(0x05b07211) /* 0.355577533 */, 17 },
-  /* 3173 */  { MAD_F(0x05b10ecd) /* 0.355727006 */, 17 },
-  /* 3174 */  { MAD_F(0x05b1ab8d) /* 0.355876494 */, 17 },
-  /* 3175 */  { MAD_F(0x05b24851) /* 0.356025999 */, 17 },
-  /* 3176 */  { MAD_F(0x05b2e51a) /* 0.356175519 */, 17 },
-  /* 3177 */  { MAD_F(0x05b381e6) /* 0.356325054 */, 17 },
-  /* 3178 */  { MAD_F(0x05b41eb7) /* 0.356474606 */, 17 },
-  /* 3179 */  { MAD_F(0x05b4bb8c) /* 0.356624173 */, 17 },
-  /* 3180 */  { MAD_F(0x05b55866) /* 0.356773756 */, 17 },
-  /* 3181 */  { MAD_F(0x05b5f543) /* 0.356923354 */, 17 },
-  /* 3182 */  { MAD_F(0x05b69225) /* 0.357072969 */, 17 },
-  /* 3183 */  { MAD_F(0x05b72f0b) /* 0.357222598 */, 17 },
-
-  /* 3184 */  { MAD_F(0x05b7cbf5) /* 0.357372244 */, 17 },
-  /* 3185 */  { MAD_F(0x05b868e3) /* 0.357521905 */, 17 },
-  /* 3186 */  { MAD_F(0x05b905d6) /* 0.357671582 */, 17 },
-  /* 3187 */  { MAD_F(0x05b9a2cd) /* 0.357821275 */, 17 },
-  /* 3188 */  { MAD_F(0x05ba3fc8) /* 0.357970983 */, 17 },
-  /* 3189 */  { MAD_F(0x05badcc7) /* 0.358120707 */, 17 },
-  /* 3190 */  { MAD_F(0x05bb79ca) /* 0.358270446 */, 17 },
-  /* 3191 */  { MAD_F(0x05bc16d2) /* 0.358420201 */, 17 },
-  /* 3192 */  { MAD_F(0x05bcb3de) /* 0.358569972 */, 17 },
-  /* 3193 */  { MAD_F(0x05bd50ee) /* 0.358719758 */, 17 },
-  /* 3194 */  { MAD_F(0x05bdee02) /* 0.358869560 */, 17 },
-  /* 3195 */  { MAD_F(0x05be8b1a) /* 0.359019378 */, 17 },
-  /* 3196 */  { MAD_F(0x05bf2837) /* 0.359169211 */, 17 },
-  /* 3197 */  { MAD_F(0x05bfc558) /* 0.359319060 */, 17 },
-  /* 3198 */  { MAD_F(0x05c0627d) /* 0.359468925 */, 17 },
-  /* 3199 */  { MAD_F(0x05c0ffa6) /* 0.359618805 */, 17 },
-
-  /* 3200 */  { MAD_F(0x05c19cd3) /* 0.359768701 */, 17 },
-  /* 3201 */  { MAD_F(0x05c23a05) /* 0.359918612 */, 17 },
-  /* 3202 */  { MAD_F(0x05c2d73a) /* 0.360068540 */, 17 },
-  /* 3203 */  { MAD_F(0x05c37474) /* 0.360218482 */, 17 },
-  /* 3204 */  { MAD_F(0x05c411b2) /* 0.360368440 */, 17 },
-  /* 3205 */  { MAD_F(0x05c4aef5) /* 0.360518414 */, 17 },
-  /* 3206 */  { MAD_F(0x05c54c3b) /* 0.360668404 */, 17 },
-  /* 3207 */  { MAD_F(0x05c5e986) /* 0.360818409 */, 17 },
-  /* 3208 */  { MAD_F(0x05c686d5) /* 0.360968429 */, 17 },
-  /* 3209 */  { MAD_F(0x05c72428) /* 0.361118466 */, 17 },
-  /* 3210 */  { MAD_F(0x05c7c17f) /* 0.361268517 */, 17 },
-  /* 3211 */  { MAD_F(0x05c85eda) /* 0.361418585 */, 17 },
-  /* 3212 */  { MAD_F(0x05c8fc3a) /* 0.361568668 */, 17 },
-  /* 3213 */  { MAD_F(0x05c9999e) /* 0.361718766 */, 17 },
-  /* 3214 */  { MAD_F(0x05ca3706) /* 0.361868881 */, 17 },
-  /* 3215 */  { MAD_F(0x05cad472) /* 0.362019010 */, 17 },
-
-  /* 3216 */  { MAD_F(0x05cb71e2) /* 0.362169156 */, 17 },
-  /* 3217 */  { MAD_F(0x05cc0f57) /* 0.362319316 */, 17 },
-  /* 3218 */  { MAD_F(0x05ccaccf) /* 0.362469493 */, 17 },
-  /* 3219 */  { MAD_F(0x05cd4a4c) /* 0.362619685 */, 17 },
-  /* 3220 */  { MAD_F(0x05cde7cd) /* 0.362769892 */, 17 },
-  /* 3221 */  { MAD_F(0x05ce8552) /* 0.362920115 */, 17 },
-  /* 3222 */  { MAD_F(0x05cf22dc) /* 0.363070354 */, 17 },
-  /* 3223 */  { MAD_F(0x05cfc069) /* 0.363220608 */, 17 },
-  /* 3224 */  { MAD_F(0x05d05dfb) /* 0.363370878 */, 17 },
-  /* 3225 */  { MAD_F(0x05d0fb91) /* 0.363521163 */, 17 },
-  /* 3226 */  { MAD_F(0x05d1992b) /* 0.363671464 */, 17 },
-  /* 3227 */  { MAD_F(0x05d236c9) /* 0.363821780 */, 17 },
-  /* 3228 */  { MAD_F(0x05d2d46c) /* 0.363972112 */, 17 },
-  /* 3229 */  { MAD_F(0x05d37212) /* 0.364122459 */, 17 },
-  /* 3230 */  { MAD_F(0x05d40fbd) /* 0.364272822 */, 17 },
-  /* 3231 */  { MAD_F(0x05d4ad6c) /* 0.364423200 */, 17 },
-
-  /* 3232 */  { MAD_F(0x05d54b1f) /* 0.364573594 */, 17 },
-  /* 3233 */  { MAD_F(0x05d5e8d6) /* 0.364724004 */, 17 },
-  /* 3234 */  { MAD_F(0x05d68691) /* 0.364874429 */, 17 },
-  /* 3235 */  { MAD_F(0x05d72451) /* 0.365024869 */, 17 },
-  /* 3236 */  { MAD_F(0x05d7c215) /* 0.365175325 */, 17 },
-  /* 3237 */  { MAD_F(0x05d85fdc) /* 0.365325796 */, 17 },
-  /* 3238 */  { MAD_F(0x05d8fda8) /* 0.365476283 */, 17 },
-  /* 3239 */  { MAD_F(0x05d99b79) /* 0.365626786 */, 17 },
-  /* 3240 */  { MAD_F(0x05da394d) /* 0.365777304 */, 17 },
-  /* 3241 */  { MAD_F(0x05dad726) /* 0.365927837 */, 17 },
-  /* 3242 */  { MAD_F(0x05db7502) /* 0.366078386 */, 17 },
-  /* 3243 */  { MAD_F(0x05dc12e3) /* 0.366228950 */, 17 },
-  /* 3244 */  { MAD_F(0x05dcb0c8) /* 0.366379530 */, 17 },
-  /* 3245 */  { MAD_F(0x05dd4eb1) /* 0.366530125 */, 17 },
-  /* 3246 */  { MAD_F(0x05ddec9e) /* 0.366680736 */, 17 },
-  /* 3247 */  { MAD_F(0x05de8a90) /* 0.366831362 */, 17 },
-
-  /* 3248 */  { MAD_F(0x05df2885) /* 0.366982004 */, 17 },
-  /* 3249 */  { MAD_F(0x05dfc67f) /* 0.367132661 */, 17 },
-  /* 3250 */  { MAD_F(0x05e0647d) /* 0.367283334 */, 17 },
-  /* 3251 */  { MAD_F(0x05e1027f) /* 0.367434022 */, 17 },
-  /* 3252 */  { MAD_F(0x05e1a085) /* 0.367584725 */, 17 },
-  /* 3253 */  { MAD_F(0x05e23e8f) /* 0.367735444 */, 17 },
-  /* 3254 */  { MAD_F(0x05e2dc9e) /* 0.367886179 */, 17 },
-  /* 3255 */  { MAD_F(0x05e37ab0) /* 0.368036929 */, 17 },
-  /* 3256 */  { MAD_F(0x05e418c7) /* 0.368187694 */, 17 },
-  /* 3257 */  { MAD_F(0x05e4b6e2) /* 0.368338475 */, 17 },
-  /* 3258 */  { MAD_F(0x05e55501) /* 0.368489271 */, 17 },
-  /* 3259 */  { MAD_F(0x05e5f324) /* 0.368640082 */, 17 },
-  /* 3260 */  { MAD_F(0x05e6914c) /* 0.368790909 */, 17 },
-  /* 3261 */  { MAD_F(0x05e72f77) /* 0.368941752 */, 17 },
-  /* 3262 */  { MAD_F(0x05e7cda7) /* 0.369092610 */, 17 },
-  /* 3263 */  { MAD_F(0x05e86bda) /* 0.369243483 */, 17 },
-
-  /* 3264 */  { MAD_F(0x05e90a12) /* 0.369394372 */, 17 },
-  /* 3265 */  { MAD_F(0x05e9a84e) /* 0.369545276 */, 17 },
-  /* 3266 */  { MAD_F(0x05ea468e) /* 0.369696195 */, 17 },
-  /* 3267 */  { MAD_F(0x05eae4d3) /* 0.369847130 */, 17 },
-  /* 3268 */  { MAD_F(0x05eb831b) /* 0.369998080 */, 17 },
-  /* 3269 */  { MAD_F(0x05ec2168) /* 0.370149046 */, 17 },
-  /* 3270 */  { MAD_F(0x05ecbfb8) /* 0.370300027 */, 17 },
-  /* 3271 */  { MAD_F(0x05ed5e0d) /* 0.370451024 */, 17 },
-  /* 3272 */  { MAD_F(0x05edfc66) /* 0.370602036 */, 17 },
-  /* 3273 */  { MAD_F(0x05ee9ac3) /* 0.370753063 */, 17 },
-  /* 3274 */  { MAD_F(0x05ef3924) /* 0.370904105 */, 17 },
-  /* 3275 */  { MAD_F(0x05efd78a) /* 0.371055163 */, 17 },
-  /* 3276 */  { MAD_F(0x05f075f3) /* 0.371206237 */, 17 },
-  /* 3277 */  { MAD_F(0x05f11461) /* 0.371357326 */, 17 },
-  /* 3278 */  { MAD_F(0x05f1b2d3) /* 0.371508430 */, 17 },
-  /* 3279 */  { MAD_F(0x05f25148) /* 0.371659549 */, 17 },
-
-  /* 3280 */  { MAD_F(0x05f2efc2) /* 0.371810684 */, 17 },
-  /* 3281 */  { MAD_F(0x05f38e40) /* 0.371961834 */, 17 },
-  /* 3282 */  { MAD_F(0x05f42cc3) /* 0.372113000 */, 17 },
-  /* 3283 */  { MAD_F(0x05f4cb49) /* 0.372264181 */, 17 },
-  /* 3284 */  { MAD_F(0x05f569d3) /* 0.372415377 */, 17 },
-  /* 3285 */  { MAD_F(0x05f60862) /* 0.372566589 */, 17 },
-  /* 3286 */  { MAD_F(0x05f6a6f5) /* 0.372717816 */, 17 },
-  /* 3287 */  { MAD_F(0x05f7458b) /* 0.372869058 */, 17 },
-  /* 3288 */  { MAD_F(0x05f7e426) /* 0.373020316 */, 17 },
-  /* 3289 */  { MAD_F(0x05f882c5) /* 0.373171589 */, 17 },
-  /* 3290 */  { MAD_F(0x05f92169) /* 0.373322877 */, 17 },
-  /* 3291 */  { MAD_F(0x05f9c010) /* 0.373474181 */, 17 },
-  /* 3292 */  { MAD_F(0x05fa5ebb) /* 0.373625500 */, 17 },
-  /* 3293 */  { MAD_F(0x05fafd6b) /* 0.373776834 */, 17 },
-  /* 3294 */  { MAD_F(0x05fb9c1e) /* 0.373928184 */, 17 },
-  /* 3295 */  { MAD_F(0x05fc3ad6) /* 0.374079549 */, 17 },
-
-  /* 3296 */  { MAD_F(0x05fcd992) /* 0.374230929 */, 17 },
-  /* 3297 */  { MAD_F(0x05fd7852) /* 0.374382325 */, 17 },
-  /* 3298 */  { MAD_F(0x05fe1716) /* 0.374533735 */, 17 },
-  /* 3299 */  { MAD_F(0x05feb5de) /* 0.374685162 */, 17 },
-  /* 3300 */  { MAD_F(0x05ff54aa) /* 0.374836603 */, 17 },
-  /* 3301 */  { MAD_F(0x05fff37b) /* 0.374988060 */, 17 },
-  /* 3302 */  { MAD_F(0x0600924f) /* 0.375139532 */, 17 },
-  /* 3303 */  { MAD_F(0x06013128) /* 0.375291019 */, 17 },
-  /* 3304 */  { MAD_F(0x0601d004) /* 0.375442522 */, 17 },
-  /* 3305 */  { MAD_F(0x06026ee5) /* 0.375594040 */, 17 },
-  /* 3306 */  { MAD_F(0x06030dca) /* 0.375745573 */, 17 },
-  /* 3307 */  { MAD_F(0x0603acb3) /* 0.375897122 */, 17 },
-  /* 3308 */  { MAD_F(0x06044ba0) /* 0.376048685 */, 17 },
-  /* 3309 */  { MAD_F(0x0604ea91) /* 0.376200265 */, 17 },
-  /* 3310 */  { MAD_F(0x06058987) /* 0.376351859 */, 17 },
-  /* 3311 */  { MAD_F(0x06062880) /* 0.376503468 */, 17 },
-
-  /* 3312 */  { MAD_F(0x0606c77d) /* 0.376655093 */, 17 },
-  /* 3313 */  { MAD_F(0x0607667f) /* 0.376806733 */, 17 },
-  /* 3314 */  { MAD_F(0x06080585) /* 0.376958389 */, 17 },
-  /* 3315 */  { MAD_F(0x0608a48f) /* 0.377110059 */, 17 },
-  /* 3316 */  { MAD_F(0x0609439c) /* 0.377261745 */, 17 },
-  /* 3317 */  { MAD_F(0x0609e2ae) /* 0.377413446 */, 17 },
-  /* 3318 */  { MAD_F(0x060a81c4) /* 0.377565163 */, 17 },
-  /* 3319 */  { MAD_F(0x060b20df) /* 0.377716894 */, 17 },
-  /* 3320 */  { MAD_F(0x060bbffd) /* 0.377868641 */, 17 },
-  /* 3321 */  { MAD_F(0x060c5f1f) /* 0.378020403 */, 17 },
-  /* 3322 */  { MAD_F(0x060cfe46) /* 0.378172181 */, 17 },
-  /* 3323 */  { MAD_F(0x060d9d70) /* 0.378323973 */, 17 },
-  /* 3324 */  { MAD_F(0x060e3c9f) /* 0.378475781 */, 17 },
-  /* 3325 */  { MAD_F(0x060edbd1) /* 0.378627604 */, 17 },
-  /* 3326 */  { MAD_F(0x060f7b08) /* 0.378779442 */, 17 },
-  /* 3327 */  { MAD_F(0x06101a43) /* 0.378931296 */, 17 },
-
-  /* 3328 */  { MAD_F(0x0610b982) /* 0.379083164 */, 17 },
-  /* 3329 */  { MAD_F(0x061158c5) /* 0.379235048 */, 17 },
-  /* 3330 */  { MAD_F(0x0611f80c) /* 0.379386947 */, 17 },
-  /* 3331 */  { MAD_F(0x06129757) /* 0.379538862 */, 17 },
-  /* 3332 */  { MAD_F(0x061336a6) /* 0.379690791 */, 17 },
-  /* 3333 */  { MAD_F(0x0613d5fa) /* 0.379842736 */, 17 },
-  /* 3334 */  { MAD_F(0x06147551) /* 0.379994696 */, 17 },
-  /* 3335 */  { MAD_F(0x061514ad) /* 0.380146671 */, 17 },
-  /* 3336 */  { MAD_F(0x0615b40c) /* 0.380298661 */, 17 },
-  /* 3337 */  { MAD_F(0x06165370) /* 0.380450666 */, 17 },
-  /* 3338 */  { MAD_F(0x0616f2d8) /* 0.380602687 */, 17 },
-  /* 3339 */  { MAD_F(0x06179243) /* 0.380754723 */, 17 },
-  /* 3340 */  { MAD_F(0x061831b3) /* 0.380906774 */, 17 },
-  /* 3341 */  { MAD_F(0x0618d127) /* 0.381058840 */, 17 },
-  /* 3342 */  { MAD_F(0x0619709f) /* 0.381210921 */, 17 },
-  /* 3343 */  { MAD_F(0x061a101b) /* 0.381363018 */, 17 },
-
-  /* 3344 */  { MAD_F(0x061aaf9c) /* 0.381515130 */, 17 },
-  /* 3345 */  { MAD_F(0x061b4f20) /* 0.381667257 */, 17 },
-  /* 3346 */  { MAD_F(0x061beea8) /* 0.381819399 */, 17 },
-  /* 3347 */  { MAD_F(0x061c8e34) /* 0.381971556 */, 17 },
-  /* 3348 */  { MAD_F(0x061d2dc5) /* 0.382123728 */, 17 },
-  /* 3349 */  { MAD_F(0x061dcd59) /* 0.382275916 */, 17 },
-  /* 3350 */  { MAD_F(0x061e6cf2) /* 0.382428118 */, 17 },
-  /* 3351 */  { MAD_F(0x061f0c8f) /* 0.382580336 */, 17 },
-  /* 3352 */  { MAD_F(0x061fac2f) /* 0.382732569 */, 17 },
-  /* 3353 */  { MAD_F(0x06204bd4) /* 0.382884817 */, 17 },
-  /* 3354 */  { MAD_F(0x0620eb7d) /* 0.383037080 */, 17 },
-  /* 3355 */  { MAD_F(0x06218b2a) /* 0.383189358 */, 17 },
-  /* 3356 */  { MAD_F(0x06222adb) /* 0.383341652 */, 17 },
-  /* 3357 */  { MAD_F(0x0622ca90) /* 0.383493960 */, 17 },
-  /* 3358 */  { MAD_F(0x06236a49) /* 0.383646284 */, 17 },
-  /* 3359 */  { MAD_F(0x06240a06) /* 0.383798623 */, 17 },
-
-  /* 3360 */  { MAD_F(0x0624a9c7) /* 0.383950977 */, 17 },
-  /* 3361 */  { MAD_F(0x0625498d) /* 0.384103346 */, 17 },
-  /* 3362 */  { MAD_F(0x0625e956) /* 0.384255730 */, 17 },
-  /* 3363 */  { MAD_F(0x06268923) /* 0.384408129 */, 17 },
-  /* 3364 */  { MAD_F(0x062728f5) /* 0.384560544 */, 17 },
-  /* 3365 */  { MAD_F(0x0627c8ca) /* 0.384712973 */, 17 },
-  /* 3366 */  { MAD_F(0x062868a4) /* 0.384865418 */, 17 },
-  /* 3367 */  { MAD_F(0x06290881) /* 0.385017878 */, 17 },
-  /* 3368 */  { MAD_F(0x0629a863) /* 0.385170352 */, 17 },
-  /* 3369 */  { MAD_F(0x062a4849) /* 0.385322842 */, 17 },
-  /* 3370 */  { MAD_F(0x062ae832) /* 0.385475347 */, 17 },
-  /* 3371 */  { MAD_F(0x062b8820) /* 0.385627867 */, 17 },
-  /* 3372 */  { MAD_F(0x062c2812) /* 0.385780402 */, 17 },
-  /* 3373 */  { MAD_F(0x062cc808) /* 0.385932953 */, 17 },
-  /* 3374 */  { MAD_F(0x062d6802) /* 0.386085518 */, 17 },
-  /* 3375 */  { MAD_F(0x062e0800) /* 0.386238098 */, 17 },
-
-  /* 3376 */  { MAD_F(0x062ea802) /* 0.386390694 */, 17 },
-  /* 3377 */  { MAD_F(0x062f4808) /* 0.386543304 */, 17 },
-  /* 3378 */  { MAD_F(0x062fe812) /* 0.386695930 */, 17 },
-  /* 3379 */  { MAD_F(0x06308820) /* 0.386848570 */, 17 },
-  /* 3380 */  { MAD_F(0x06312832) /* 0.387001226 */, 17 },
-  /* 3381 */  { MAD_F(0x0631c849) /* 0.387153897 */, 17 },
-  /* 3382 */  { MAD_F(0x06326863) /* 0.387306582 */, 17 },
-  /* 3383 */  { MAD_F(0x06330881) /* 0.387459283 */, 17 },
-  /* 3384 */  { MAD_F(0x0633a8a3) /* 0.387611999 */, 17 },
-  /* 3385 */  { MAD_F(0x063448ca) /* 0.387764730 */, 17 },
-  /* 3386 */  { MAD_F(0x0634e8f4) /* 0.387917476 */, 17 },
-  /* 3387 */  { MAD_F(0x06358923) /* 0.388070237 */, 17 },
-  /* 3388 */  { MAD_F(0x06362955) /* 0.388223013 */, 17 },
-  /* 3389 */  { MAD_F(0x0636c98c) /* 0.388375804 */, 17 },
-  /* 3390 */  { MAD_F(0x063769c6) /* 0.388528610 */, 17 },
-  /* 3391 */  { MAD_F(0x06380a05) /* 0.388681431 */, 17 },
-
-  /* 3392 */  { MAD_F(0x0638aa48) /* 0.388834268 */, 17 },
-  /* 3393 */  { MAD_F(0x06394a8e) /* 0.388987119 */, 17 },
-  /* 3394 */  { MAD_F(0x0639ead9) /* 0.389139985 */, 17 },
-  /* 3395 */  { MAD_F(0x063a8b28) /* 0.389292866 */, 17 },
-  /* 3396 */  { MAD_F(0x063b2b7b) /* 0.389445762 */, 17 },
-  /* 3397 */  { MAD_F(0x063bcbd1) /* 0.389598674 */, 17 },
-  /* 3398 */  { MAD_F(0x063c6c2c) /* 0.389751600 */, 17 },
-  /* 3399 */  { MAD_F(0x063d0c8b) /* 0.389904541 */, 17 },
-  /* 3400 */  { MAD_F(0x063dacee) /* 0.390057497 */, 17 },
-  /* 3401 */  { MAD_F(0x063e4d55) /* 0.390210468 */, 17 },
-  /* 3402 */  { MAD_F(0x063eedc0) /* 0.390363455 */, 17 },
-  /* 3403 */  { MAD_F(0x063f8e2f) /* 0.390516456 */, 17 },
-  /* 3404 */  { MAD_F(0x06402ea2) /* 0.390669472 */, 17 },
-  /* 3405 */  { MAD_F(0x0640cf19) /* 0.390822503 */, 17 },
-  /* 3406 */  { MAD_F(0x06416f94) /* 0.390975549 */, 17 },
-  /* 3407 */  { MAD_F(0x06421013) /* 0.391128611 */, 17 },
-
-  /* 3408 */  { MAD_F(0x0642b096) /* 0.391281687 */, 17 },
-  /* 3409 */  { MAD_F(0x0643511d) /* 0.391434778 */, 17 },
-  /* 3410 */  { MAD_F(0x0643f1a8) /* 0.391587884 */, 17 },
-  /* 3411 */  { MAD_F(0x06449237) /* 0.391741005 */, 17 },
-  /* 3412 */  { MAD_F(0x064532ca) /* 0.391894141 */, 17 },
-  /* 3413 */  { MAD_F(0x0645d361) /* 0.392047292 */, 17 },
-  /* 3414 */  { MAD_F(0x064673fc) /* 0.392200458 */, 17 },
-  /* 3415 */  { MAD_F(0x0647149c) /* 0.392353638 */, 17 },
-  /* 3416 */  { MAD_F(0x0647b53f) /* 0.392506834 */, 17 },
-  /* 3417 */  { MAD_F(0x064855e6) /* 0.392660045 */, 17 },
-  /* 3418 */  { MAD_F(0x0648f691) /* 0.392813271 */, 17 },
-  /* 3419 */  { MAD_F(0x06499740) /* 0.392966511 */, 17 },
-  /* 3420 */  { MAD_F(0x064a37f4) /* 0.393119767 */, 17 },
-  /* 3421 */  { MAD_F(0x064ad8ab) /* 0.393273038 */, 17 },
-  /* 3422 */  { MAD_F(0x064b7966) /* 0.393426323 */, 17 },
-  /* 3423 */  { MAD_F(0x064c1a25) /* 0.393579623 */, 17 },
-
-  /* 3424 */  { MAD_F(0x064cbae9) /* 0.393732939 */, 17 },
-  /* 3425 */  { MAD_F(0x064d5bb0) /* 0.393886269 */, 17 },
-  /* 3426 */  { MAD_F(0x064dfc7b) /* 0.394039614 */, 17 },
-  /* 3427 */  { MAD_F(0x064e9d4b) /* 0.394192974 */, 17 },
-  /* 3428 */  { MAD_F(0x064f3e1e) /* 0.394346349 */, 17 },
-  /* 3429 */  { MAD_F(0x064fdef5) /* 0.394499739 */, 17 },
-  /* 3430 */  { MAD_F(0x06507fd0) /* 0.394653144 */, 17 },
-  /* 3431 */  { MAD_F(0x065120b0) /* 0.394806564 */, 17 },
-  /* 3432 */  { MAD_F(0x0651c193) /* 0.394959999 */, 17 },
-  /* 3433 */  { MAD_F(0x0652627a) /* 0.395113448 */, 17 },
-  /* 3434 */  { MAD_F(0x06530366) /* 0.395266913 */, 17 },
-  /* 3435 */  { MAD_F(0x0653a455) /* 0.395420392 */, 17 },
-  /* 3436 */  { MAD_F(0x06544548) /* 0.395573886 */, 17 },
-  /* 3437 */  { MAD_F(0x0654e640) /* 0.395727395 */, 17 },
-  /* 3438 */  { MAD_F(0x0655873b) /* 0.395880919 */, 17 },
-  /* 3439 */  { MAD_F(0x0656283a) /* 0.396034458 */, 17 },
-
-  /* 3440 */  { MAD_F(0x0656c93d) /* 0.396188012 */, 17 },
-  /* 3441 */  { MAD_F(0x06576a45) /* 0.396341581 */, 17 },
-  /* 3442 */  { MAD_F(0x06580b50) /* 0.396495164 */, 17 },
-  /* 3443 */  { MAD_F(0x0658ac5f) /* 0.396648763 */, 17 },
-  /* 3444 */  { MAD_F(0x06594d73) /* 0.396802376 */, 17 },
-  /* 3445 */  { MAD_F(0x0659ee8a) /* 0.396956004 */, 17 },
-  /* 3446 */  { MAD_F(0x065a8fa5) /* 0.397109647 */, 17 },
-  /* 3447 */  { MAD_F(0x065b30c4) /* 0.397263305 */, 17 },
-  /* 3448 */  { MAD_F(0x065bd1e7) /* 0.397416978 */, 17 },
-  /* 3449 */  { MAD_F(0x065c730f) /* 0.397570666 */, 17 },
-  /* 3450 */  { MAD_F(0x065d143a) /* 0.397724368 */, 17 },
-  /* 3451 */  { MAD_F(0x065db569) /* 0.397878085 */, 17 },
-  /* 3452 */  { MAD_F(0x065e569c) /* 0.398031818 */, 17 },
-  /* 3453 */  { MAD_F(0x065ef7d3) /* 0.398185565 */, 17 },
-  /* 3454 */  { MAD_F(0x065f990e) /* 0.398339326 */, 17 },
-  /* 3455 */  { MAD_F(0x06603a4e) /* 0.398493103 */, 17 },
-
-  /* 3456 */  { MAD_F(0x0660db91) /* 0.398646895 */, 17 },
-  /* 3457 */  { MAD_F(0x06617cd8) /* 0.398800701 */, 17 },
-  /* 3458 */  { MAD_F(0x06621e23) /* 0.398954522 */, 17 },
-  /* 3459 */  { MAD_F(0x0662bf72) /* 0.399108358 */, 17 },
-  /* 3460 */  { MAD_F(0x066360c5) /* 0.399262209 */, 17 },
-  /* 3461 */  { MAD_F(0x0664021c) /* 0.399416075 */, 17 },
-  /* 3462 */  { MAD_F(0x0664a377) /* 0.399569955 */, 17 },
-  /* 3463 */  { MAD_F(0x066544d6) /* 0.399723851 */, 17 },
-  /* 3464 */  { MAD_F(0x0665e639) /* 0.399877761 */, 17 },
-  /* 3465 */  { MAD_F(0x066687a0) /* 0.400031686 */, 17 },
-  /* 3466 */  { MAD_F(0x0667290b) /* 0.400185625 */, 17 },
-  /* 3467 */  { MAD_F(0x0667ca79) /* 0.400339580 */, 17 },
-  /* 3468 */  { MAD_F(0x06686bec) /* 0.400493549 */, 17 },
-  /* 3469 */  { MAD_F(0x06690d63) /* 0.400647534 */, 17 },
-  /* 3470 */  { MAD_F(0x0669aede) /* 0.400801533 */, 17 },
-  /* 3471 */  { MAD_F(0x066a505d) /* 0.400955546 */, 17 },
-
-  /* 3472 */  { MAD_F(0x066af1df) /* 0.401109575 */, 17 },
-  /* 3473 */  { MAD_F(0x066b9366) /* 0.401263618 */, 17 },
-  /* 3474 */  { MAD_F(0x066c34f1) /* 0.401417676 */, 17 },
-  /* 3475 */  { MAD_F(0x066cd67f) /* 0.401571749 */, 17 },
-  /* 3476 */  { MAD_F(0x066d7812) /* 0.401725837 */, 17 },
-  /* 3477 */  { MAD_F(0x066e19a9) /* 0.401879939 */, 17 },
-  /* 3478 */  { MAD_F(0x066ebb43) /* 0.402034056 */, 17 },
-  /* 3479 */  { MAD_F(0x066f5ce2) /* 0.402188188 */, 17 },
-  /* 3480 */  { MAD_F(0x066ffe84) /* 0.402342335 */, 17 },
-  /* 3481 */  { MAD_F(0x0670a02a) /* 0.402496497 */, 17 },
-  /* 3482 */  { MAD_F(0x067141d5) /* 0.402650673 */, 17 },
-  /* 3483 */  { MAD_F(0x0671e383) /* 0.402804864 */, 17 },
-  /* 3484 */  { MAD_F(0x06728535) /* 0.402959070 */, 17 },
-  /* 3485 */  { MAD_F(0x067326ec) /* 0.403113291 */, 17 },
-  /* 3486 */  { MAD_F(0x0673c8a6) /* 0.403267526 */, 17 },
-  /* 3487 */  { MAD_F(0x06746a64) /* 0.403421776 */, 17 },
-
-  /* 3488 */  { MAD_F(0x06750c26) /* 0.403576041 */, 17 },
-  /* 3489 */  { MAD_F(0x0675adec) /* 0.403730320 */, 17 },
-  /* 3490 */  { MAD_F(0x06764fb6) /* 0.403884615 */, 17 },
-  /* 3491 */  { MAD_F(0x0676f184) /* 0.404038924 */, 17 },
-  /* 3492 */  { MAD_F(0x06779356) /* 0.404193247 */, 17 },
-  /* 3493 */  { MAD_F(0x0678352c) /* 0.404347586 */, 17 },
-  /* 3494 */  { MAD_F(0x0678d706) /* 0.404501939 */, 17 },
-  /* 3495 */  { MAD_F(0x067978e4) /* 0.404656307 */, 17 },
-  /* 3496 */  { MAD_F(0x067a1ac6) /* 0.404810690 */, 17 },
-  /* 3497 */  { MAD_F(0x067abcac) /* 0.404965087 */, 17 },
-  /* 3498 */  { MAD_F(0x067b5e95) /* 0.405119499 */, 17 },
-  /* 3499 */  { MAD_F(0x067c0083) /* 0.405273926 */, 17 },
-  /* 3500 */  { MAD_F(0x067ca275) /* 0.405428368 */, 17 },
-  /* 3501 */  { MAD_F(0x067d446a) /* 0.405582824 */, 17 },
-  /* 3502 */  { MAD_F(0x067de664) /* 0.405737295 */, 17 },
-  /* 3503 */  { MAD_F(0x067e8861) /* 0.405891781 */, 17 },
-
-  /* 3504 */  { MAD_F(0x067f2a62) /* 0.406046281 */, 17 },
-  /* 3505 */  { MAD_F(0x067fcc68) /* 0.406200796 */, 17 },
-  /* 3506 */  { MAD_F(0x06806e71) /* 0.406355326 */, 17 },
-  /* 3507 */  { MAD_F(0x0681107e) /* 0.406509870 */, 17 },
-  /* 3508 */  { MAD_F(0x0681b28f) /* 0.406664429 */, 17 },
-  /* 3509 */  { MAD_F(0x068254a4) /* 0.406819003 */, 17 },
-  /* 3510 */  { MAD_F(0x0682f6bd) /* 0.406973592 */, 17 },
-  /* 3511 */  { MAD_F(0x068398da) /* 0.407128195 */, 17 },
-  /* 3512 */  { MAD_F(0x06843afb) /* 0.407282813 */, 17 },
-  /* 3513 */  { MAD_F(0x0684dd20) /* 0.407437445 */, 17 },
-  /* 3514 */  { MAD_F(0x06857f49) /* 0.407592093 */, 17 },
-  /* 3515 */  { MAD_F(0x06862176) /* 0.407746754 */, 17 },
-  /* 3516 */  { MAD_F(0x0686c3a6) /* 0.407901431 */, 17 },
-  /* 3517 */  { MAD_F(0x068765db) /* 0.408056122 */, 17 },
-  /* 3518 */  { MAD_F(0x06880814) /* 0.408210828 */, 17 },
-  /* 3519 */  { MAD_F(0x0688aa50) /* 0.408365549 */, 17 },
-
-  /* 3520 */  { MAD_F(0x06894c90) /* 0.408520284 */, 17 },
-  /* 3521 */  { MAD_F(0x0689eed5) /* 0.408675034 */, 17 },
-  /* 3522 */  { MAD_F(0x068a911d) /* 0.408829798 */, 17 },
-  /* 3523 */  { MAD_F(0x068b3369) /* 0.408984577 */, 17 },
-  /* 3524 */  { MAD_F(0x068bd5b9) /* 0.409139371 */, 17 },
-  /* 3525 */  { MAD_F(0x068c780e) /* 0.409294180 */, 17 },
-  /* 3526 */  { MAD_F(0x068d1a66) /* 0.409449003 */, 17 },
-  /* 3527 */  { MAD_F(0x068dbcc1) /* 0.409603840 */, 17 },
-  /* 3528 */  { MAD_F(0x068e5f21) /* 0.409758693 */, 17 },
-  /* 3529 */  { MAD_F(0x068f0185) /* 0.409913560 */, 17 },
-  /* 3530 */  { MAD_F(0x068fa3ed) /* 0.410068441 */, 17 },
-  /* 3531 */  { MAD_F(0x06904658) /* 0.410223338 */, 17 },
-  /* 3532 */  { MAD_F(0x0690e8c8) /* 0.410378249 */, 17 },
-  /* 3533 */  { MAD_F(0x06918b3c) /* 0.410533174 */, 17 },
-  /* 3534 */  { MAD_F(0x06922db3) /* 0.410688114 */, 17 },
-  /* 3535 */  { MAD_F(0x0692d02e) /* 0.410843069 */, 17 },
-
-  /* 3536 */  { MAD_F(0x069372ae) /* 0.410998038 */, 17 },
-  /* 3537 */  { MAD_F(0x06941531) /* 0.411153022 */, 17 },
-  /* 3538 */  { MAD_F(0x0694b7b8) /* 0.411308021 */, 17 },
-  /* 3539 */  { MAD_F(0x06955a43) /* 0.411463034 */, 17 },
-  /* 3540 */  { MAD_F(0x0695fcd2) /* 0.411618062 */, 17 },
-  /* 3541 */  { MAD_F(0x06969f65) /* 0.411773104 */, 17 },
-  /* 3542 */  { MAD_F(0x069741fb) /* 0.411928161 */, 17 },
-  /* 3543 */  { MAD_F(0x0697e496) /* 0.412083232 */, 17 },
-  /* 3544 */  { MAD_F(0x06988735) /* 0.412238319 */, 17 },
-  /* 3545 */  { MAD_F(0x069929d7) /* 0.412393419 */, 17 },
-  /* 3546 */  { MAD_F(0x0699cc7e) /* 0.412548535 */, 17 },
-  /* 3547 */  { MAD_F(0x069a6f28) /* 0.412703664 */, 17 },
-  /* 3548 */  { MAD_F(0x069b11d6) /* 0.412858809 */, 17 },
-  /* 3549 */  { MAD_F(0x069bb489) /* 0.413013968 */, 17 },
-  /* 3550 */  { MAD_F(0x069c573f) /* 0.413169142 */, 17 },
-  /* 3551 */  { MAD_F(0x069cf9f9) /* 0.413324330 */, 17 },
-
-  /* 3552 */  { MAD_F(0x069d9cb7) /* 0.413479532 */, 17 },
-  /* 3553 */  { MAD_F(0x069e3f78) /* 0.413634750 */, 17 },
-  /* 3554 */  { MAD_F(0x069ee23e) /* 0.413789982 */, 17 },
-  /* 3555 */  { MAD_F(0x069f8508) /* 0.413945228 */, 17 },
-  /* 3556 */  { MAD_F(0x06a027d5) /* 0.414100489 */, 17 },
-  /* 3557 */  { MAD_F(0x06a0caa7) /* 0.414255765 */, 17 },
-  /* 3558 */  { MAD_F(0x06a16d7c) /* 0.414411055 */, 17 },
-  /* 3559 */  { MAD_F(0x06a21055) /* 0.414566359 */, 17 },
-  /* 3560 */  { MAD_F(0x06a2b333) /* 0.414721679 */, 17 },
-  /* 3561 */  { MAD_F(0x06a35614) /* 0.414877012 */, 17 },
-  /* 3562 */  { MAD_F(0x06a3f8f9) /* 0.415032361 */, 17 },
-  /* 3563 */  { MAD_F(0x06a49be2) /* 0.415187723 */, 17 },
-  /* 3564 */  { MAD_F(0x06a53ece) /* 0.415343101 */, 17 },
-  /* 3565 */  { MAD_F(0x06a5e1bf) /* 0.415498493 */, 17 },
-  /* 3566 */  { MAD_F(0x06a684b4) /* 0.415653899 */, 17 },
-  /* 3567 */  { MAD_F(0x06a727ac) /* 0.415809320 */, 17 },
-
-  /* 3568 */  { MAD_F(0x06a7caa9) /* 0.415964756 */, 17 },
-  /* 3569 */  { MAD_F(0x06a86da9) /* 0.416120206 */, 17 },
-  /* 3570 */  { MAD_F(0x06a910ad) /* 0.416275670 */, 17 },
-  /* 3571 */  { MAD_F(0x06a9b3b5) /* 0.416431149 */, 17 },
-  /* 3572 */  { MAD_F(0x06aa56c1) /* 0.416586643 */, 17 },
-  /* 3573 */  { MAD_F(0x06aaf9d1) /* 0.416742151 */, 17 },
-  /* 3574 */  { MAD_F(0x06ab9ce5) /* 0.416897673 */, 17 },
-  /* 3575 */  { MAD_F(0x06ac3ffc) /* 0.417053210 */, 17 },
-  /* 3576 */  { MAD_F(0x06ace318) /* 0.417208762 */, 17 },
-  /* 3577 */  { MAD_F(0x06ad8637) /* 0.417364328 */, 17 },
-  /* 3578 */  { MAD_F(0x06ae295b) /* 0.417519909 */, 17 },
-  /* 3579 */  { MAD_F(0x06aecc82) /* 0.417675504 */, 17 },
-  /* 3580 */  { MAD_F(0x06af6fad) /* 0.417831113 */, 17 },
-  /* 3581 */  { MAD_F(0x06b012dc) /* 0.417986737 */, 17 },
-  /* 3582 */  { MAD_F(0x06b0b60f) /* 0.418142376 */, 17 },
-  /* 3583 */  { MAD_F(0x06b15946) /* 0.418298029 */, 17 },
-
-  /* 3584 */  { MAD_F(0x06b1fc81) /* 0.418453696 */, 17 },
-  /* 3585 */  { MAD_F(0x06b29fbf) /* 0.418609378 */, 17 },
-  /* 3586 */  { MAD_F(0x06b34302) /* 0.418765075 */, 17 },
-  /* 3587 */  { MAD_F(0x06b3e648) /* 0.418920786 */, 17 },
-  /* 3588 */  { MAD_F(0x06b48992) /* 0.419076511 */, 17 },
-  /* 3589 */  { MAD_F(0x06b52ce0) /* 0.419232251 */, 17 },
-  /* 3590 */  { MAD_F(0x06b5d032) /* 0.419388005 */, 17 },
-  /* 3591 */  { MAD_F(0x06b67388) /* 0.419543774 */, 17 },
-  /* 3592 */  { MAD_F(0x06b716e2) /* 0.419699557 */, 17 },
-  /* 3593 */  { MAD_F(0x06b7ba3f) /* 0.419855355 */, 17 },
-  /* 3594 */  { MAD_F(0x06b85da1) /* 0.420011167 */, 17 },
-  /* 3595 */  { MAD_F(0x06b90106) /* 0.420166994 */, 17 },
-  /* 3596 */  { MAD_F(0x06b9a470) /* 0.420322835 */, 17 },
-  /* 3597 */  { MAD_F(0x06ba47dd) /* 0.420478690 */, 17 },
-  /* 3598 */  { MAD_F(0x06baeb4e) /* 0.420634560 */, 17 },
-  /* 3599 */  { MAD_F(0x06bb8ec3) /* 0.420790445 */, 17 },
-
-  /* 3600 */  { MAD_F(0x06bc323b) /* 0.420946343 */, 17 },
-  /* 3601 */  { MAD_F(0x06bcd5b8) /* 0.421102257 */, 17 },
-  /* 3602 */  { MAD_F(0x06bd7939) /* 0.421258184 */, 17 },
-  /* 3603 */  { MAD_F(0x06be1cbd) /* 0.421414127 */, 17 },
-  /* 3604 */  { MAD_F(0x06bec045) /* 0.421570083 */, 17 },
-  /* 3605 */  { MAD_F(0x06bf63d1) /* 0.421726054 */, 17 },
-  /* 3606 */  { MAD_F(0x06c00761) /* 0.421882040 */, 17 },
-  /* 3607 */  { MAD_F(0x06c0aaf5) /* 0.422038039 */, 17 },
-  /* 3608 */  { MAD_F(0x06c14e8d) /* 0.422194054 */, 17 },
-  /* 3609 */  { MAD_F(0x06c1f229) /* 0.422350082 */, 17 },
-  /* 3610 */  { MAD_F(0x06c295c8) /* 0.422506125 */, 17 },
-  /* 3611 */  { MAD_F(0x06c3396c) /* 0.422662183 */, 17 },
-  /* 3612 */  { MAD_F(0x06c3dd13) /* 0.422818255 */, 17 },
-  /* 3613 */  { MAD_F(0x06c480be) /* 0.422974341 */, 17 },
-  /* 3614 */  { MAD_F(0x06c5246d) /* 0.423130442 */, 17 },
-  /* 3615 */  { MAD_F(0x06c5c820) /* 0.423286557 */, 17 },
-
-  /* 3616 */  { MAD_F(0x06c66bd6) /* 0.423442686 */, 17 },
-  /* 3617 */  { MAD_F(0x06c70f91) /* 0.423598830 */, 17 },
-  /* 3618 */  { MAD_F(0x06c7b34f) /* 0.423754988 */, 17 },
-  /* 3619 */  { MAD_F(0x06c85712) /* 0.423911161 */, 17 },
-  /* 3620 */  { MAD_F(0x06c8fad8) /* 0.424067348 */, 17 },
-  /* 3621 */  { MAD_F(0x06c99ea2) /* 0.424223550 */, 17 },
-  /* 3622 */  { MAD_F(0x06ca4270) /* 0.424379765 */, 17 },
-  /* 3623 */  { MAD_F(0x06cae641) /* 0.424535996 */, 17 },
-  /* 3624 */  { MAD_F(0x06cb8a17) /* 0.424692240 */, 17 },
-  /* 3625 */  { MAD_F(0x06cc2df0) /* 0.424848499 */, 17 },
-  /* 3626 */  { MAD_F(0x06ccd1ce) /* 0.425004772 */, 17 },
-  /* 3627 */  { MAD_F(0x06cd75af) /* 0.425161060 */, 17 },
-  /* 3628 */  { MAD_F(0x06ce1994) /* 0.425317362 */, 17 },
-  /* 3629 */  { MAD_F(0x06cebd7d) /* 0.425473678 */, 17 },
-  /* 3630 */  { MAD_F(0x06cf6169) /* 0.425630009 */, 17 },
-  /* 3631 */  { MAD_F(0x06d0055a) /* 0.425786354 */, 17 },
-
-  /* 3632 */  { MAD_F(0x06d0a94e) /* 0.425942714 */, 17 },
-  /* 3633 */  { MAD_F(0x06d14d47) /* 0.426099088 */, 17 },
-  /* 3634 */  { MAD_F(0x06d1f143) /* 0.426255476 */, 17 },
-  /* 3635 */  { MAD_F(0x06d29543) /* 0.426411878 */, 17 },
-  /* 3636 */  { MAD_F(0x06d33947) /* 0.426568295 */, 17 },
-  /* 3637 */  { MAD_F(0x06d3dd4e) /* 0.426724726 */, 17 },
-  /* 3638 */  { MAD_F(0x06d4815a) /* 0.426881172 */, 17 },
-  /* 3639 */  { MAD_F(0x06d52569) /* 0.427037632 */, 17 },
-  /* 3640 */  { MAD_F(0x06d5c97c) /* 0.427194106 */, 17 },
-  /* 3641 */  { MAD_F(0x06d66d93) /* 0.427350594 */, 17 },
-  /* 3642 */  { MAD_F(0x06d711ae) /* 0.427507097 */, 17 },
-  /* 3643 */  { MAD_F(0x06d7b5cd) /* 0.427663614 */, 17 },
-  /* 3644 */  { MAD_F(0x06d859f0) /* 0.427820146 */, 17 },
-  /* 3645 */  { MAD_F(0x06d8fe16) /* 0.427976692 */, 17 },
-  /* 3646 */  { MAD_F(0x06d9a240) /* 0.428133252 */, 17 },
-  /* 3647 */  { MAD_F(0x06da466f) /* 0.428289826 */, 17 },
-
-  /* 3648 */  { MAD_F(0x06daeaa1) /* 0.428446415 */, 17 },
-  /* 3649 */  { MAD_F(0x06db8ed6) /* 0.428603018 */, 17 },
-  /* 3650 */  { MAD_F(0x06dc3310) /* 0.428759635 */, 17 },
-  /* 3651 */  { MAD_F(0x06dcd74d) /* 0.428916267 */, 17 },
-  /* 3652 */  { MAD_F(0x06dd7b8f) /* 0.429072913 */, 17 },
-  /* 3653 */  { MAD_F(0x06de1fd4) /* 0.429229573 */, 17 },
-  /* 3654 */  { MAD_F(0x06dec41d) /* 0.429386248 */, 17 },
-  /* 3655 */  { MAD_F(0x06df686a) /* 0.429542937 */, 17 },
-  /* 3656 */  { MAD_F(0x06e00cbb) /* 0.429699640 */, 17 },
-  /* 3657 */  { MAD_F(0x06e0b10f) /* 0.429856357 */, 17 },
-  /* 3658 */  { MAD_F(0x06e15567) /* 0.430013089 */, 17 },
-  /* 3659 */  { MAD_F(0x06e1f9c4) /* 0.430169835 */, 17 },
-  /* 3660 */  { MAD_F(0x06e29e24) /* 0.430326595 */, 17 },
-  /* 3661 */  { MAD_F(0x06e34287) /* 0.430483370 */, 17 },
-  /* 3662 */  { MAD_F(0x06e3e6ef) /* 0.430640159 */, 17 },
-  /* 3663 */  { MAD_F(0x06e48b5b) /* 0.430796962 */, 17 },
-
-  /* 3664 */  { MAD_F(0x06e52fca) /* 0.430953779 */, 17 },
-  /* 3665 */  { MAD_F(0x06e5d43d) /* 0.431110611 */, 17 },
-  /* 3666 */  { MAD_F(0x06e678b4) /* 0.431267457 */, 17 },
-  /* 3667 */  { MAD_F(0x06e71d2f) /* 0.431424317 */, 17 },
-  /* 3668 */  { MAD_F(0x06e7c1ae) /* 0.431581192 */, 17 },
-  /* 3669 */  { MAD_F(0x06e86630) /* 0.431738080 */, 17 },
-  /* 3670 */  { MAD_F(0x06e90ab7) /* 0.431894983 */, 17 },
-  /* 3671 */  { MAD_F(0x06e9af41) /* 0.432051900 */, 17 },
-  /* 3672 */  { MAD_F(0x06ea53cf) /* 0.432208832 */, 17 },
-  /* 3673 */  { MAD_F(0x06eaf860) /* 0.432365778 */, 17 },
-  /* 3674 */  { MAD_F(0x06eb9cf6) /* 0.432522737 */, 17 },
-  /* 3675 */  { MAD_F(0x06ec418f) /* 0.432679712 */, 17 },
-  /* 3676 */  { MAD_F(0x06ece62d) /* 0.432836700 */, 17 },
-  /* 3677 */  { MAD_F(0x06ed8ace) /* 0.432993703 */, 17 },
-  /* 3678 */  { MAD_F(0x06ee2f73) /* 0.433150720 */, 17 },
-  /* 3679 */  { MAD_F(0x06eed41b) /* 0.433307751 */, 17 },
-
-  /* 3680 */  { MAD_F(0x06ef78c8) /* 0.433464796 */, 17 },
-  /* 3681 */  { MAD_F(0x06f01d78) /* 0.433621856 */, 17 },
-  /* 3682 */  { MAD_F(0x06f0c22c) /* 0.433778929 */, 17 },
-  /* 3683 */  { MAD_F(0x06f166e4) /* 0.433936017 */, 17 },
-  /* 3684 */  { MAD_F(0x06f20ba0) /* 0.434093120 */, 17 },
-  /* 3685 */  { MAD_F(0x06f2b060) /* 0.434250236 */, 17 },
-  /* 3686 */  { MAD_F(0x06f35523) /* 0.434407367 */, 17 },
-  /* 3687 */  { MAD_F(0x06f3f9eb) /* 0.434564512 */, 17 },
-  /* 3688 */  { MAD_F(0x06f49eb6) /* 0.434721671 */, 17 },
-  /* 3689 */  { MAD_F(0x06f54385) /* 0.434878844 */, 17 },
-  /* 3690 */  { MAD_F(0x06f5e857) /* 0.435036032 */, 17 },
-  /* 3691 */  { MAD_F(0x06f68d2e) /* 0.435193233 */, 17 },
-  /* 3692 */  { MAD_F(0x06f73208) /* 0.435350449 */, 17 },
-  /* 3693 */  { MAD_F(0x06f7d6e6) /* 0.435507679 */, 17 },
-  /* 3694 */  { MAD_F(0x06f87bc8) /* 0.435664924 */, 17 },
-  /* 3695 */  { MAD_F(0x06f920ae) /* 0.435822182 */, 17 },
-
-  /* 3696 */  { MAD_F(0x06f9c597) /* 0.435979455 */, 17 },
-  /* 3697 */  { MAD_F(0x06fa6a85) /* 0.436136741 */, 17 },
-  /* 3698 */  { MAD_F(0x06fb0f76) /* 0.436294042 */, 17 },
-  /* 3699 */  { MAD_F(0x06fbb46b) /* 0.436451358 */, 17 },
-  /* 3700 */  { MAD_F(0x06fc5964) /* 0.436608687 */, 17 },
-  /* 3701 */  { MAD_F(0x06fcfe60) /* 0.436766031 */, 17 },
-  /* 3702 */  { MAD_F(0x06fda361) /* 0.436923388 */, 17 },
-  /* 3703 */  { MAD_F(0x06fe4865) /* 0.437080760 */, 17 },
-  /* 3704 */  { MAD_F(0x06feed6d) /* 0.437238146 */, 17 },
-  /* 3705 */  { MAD_F(0x06ff9279) /* 0.437395547 */, 17 },
-  /* 3706 */  { MAD_F(0x07003788) /* 0.437552961 */, 17 },
-  /* 3707 */  { MAD_F(0x0700dc9c) /* 0.437710389 */, 17 },
-  /* 3708 */  { MAD_F(0x070181b3) /* 0.437867832 */, 17 },
-  /* 3709 */  { MAD_F(0x070226ce) /* 0.438025289 */, 17 },
-  /* 3710 */  { MAD_F(0x0702cbed) /* 0.438182760 */, 17 },
-  /* 3711 */  { MAD_F(0x0703710f) /* 0.438340245 */, 17 },
-
-  /* 3712 */  { MAD_F(0x07041636) /* 0.438497744 */, 17 },
-  /* 3713 */  { MAD_F(0x0704bb60) /* 0.438655258 */, 17 },
-  /* 3714 */  { MAD_F(0x0705608e) /* 0.438812785 */, 17 },
-  /* 3715 */  { MAD_F(0x070605c0) /* 0.438970327 */, 17 },
-  /* 3716 */  { MAD_F(0x0706aaf5) /* 0.439127883 */, 17 },
-  /* 3717 */  { MAD_F(0x0707502f) /* 0.439285453 */, 17 },
-  /* 3718 */  { MAD_F(0x0707f56c) /* 0.439443037 */, 17 },
-  /* 3719 */  { MAD_F(0x07089aad) /* 0.439600635 */, 17 },
-  /* 3720 */  { MAD_F(0x07093ff2) /* 0.439758248 */, 17 },
-  /* 3721 */  { MAD_F(0x0709e53a) /* 0.439915874 */, 17 },
-  /* 3722 */  { MAD_F(0x070a8a86) /* 0.440073515 */, 17 },
-  /* 3723 */  { MAD_F(0x070b2fd7) /* 0.440231170 */, 17 },
-  /* 3724 */  { MAD_F(0x070bd52a) /* 0.440388839 */, 17 },
-  /* 3725 */  { MAD_F(0x070c7a82) /* 0.440546522 */, 17 },
-  /* 3726 */  { MAD_F(0x070d1fde) /* 0.440704219 */, 17 },
-  /* 3727 */  { MAD_F(0x070dc53d) /* 0.440861930 */, 17 },
-
-  /* 3728 */  { MAD_F(0x070e6aa0) /* 0.441019655 */, 17 },
-  /* 3729 */  { MAD_F(0x070f1007) /* 0.441177395 */, 17 },
-  /* 3730 */  { MAD_F(0x070fb571) /* 0.441335148 */, 17 },
-  /* 3731 */  { MAD_F(0x07105ae0) /* 0.441492916 */, 17 },
-  /* 3732 */  { MAD_F(0x07110052) /* 0.441650697 */, 17 },
-  /* 3733 */  { MAD_F(0x0711a5c8) /* 0.441808493 */, 17 },
-  /* 3734 */  { MAD_F(0x07124b42) /* 0.441966303 */, 17 },
-  /* 3735 */  { MAD_F(0x0712f0bf) /* 0.442124127 */, 17 },
-  /* 3736 */  { MAD_F(0x07139641) /* 0.442281965 */, 17 },
-  /* 3737 */  { MAD_F(0x07143bc6) /* 0.442439817 */, 17 },
-  /* 3738 */  { MAD_F(0x0714e14f) /* 0.442597683 */, 17 },
-  /* 3739 */  { MAD_F(0x071586db) /* 0.442755564 */, 17 },
-  /* 3740 */  { MAD_F(0x07162c6c) /* 0.442913458 */, 17 },
-  /* 3741 */  { MAD_F(0x0716d200) /* 0.443071366 */, 17 },
-  /* 3742 */  { MAD_F(0x07177798) /* 0.443229289 */, 17 },
-  /* 3743 */  { MAD_F(0x07181d34) /* 0.443387226 */, 17 },
-
-  /* 3744 */  { MAD_F(0x0718c2d3) /* 0.443545176 */, 17 },
-  /* 3745 */  { MAD_F(0x07196877) /* 0.443703141 */, 17 },
-  /* 3746 */  { MAD_F(0x071a0e1e) /* 0.443861120 */, 17 },
-  /* 3747 */  { MAD_F(0x071ab3c9) /* 0.444019113 */, 17 },
-  /* 3748 */  { MAD_F(0x071b5977) /* 0.444177119 */, 17 },
-  /* 3749 */  { MAD_F(0x071bff2a) /* 0.444335140 */, 17 },
-  /* 3750 */  { MAD_F(0x071ca4e0) /* 0.444493175 */, 17 },
-  /* 3751 */  { MAD_F(0x071d4a9a) /* 0.444651224 */, 17 },
-  /* 3752 */  { MAD_F(0x071df058) /* 0.444809288 */, 17 },
-  /* 3753 */  { MAD_F(0x071e9619) /* 0.444967365 */, 17 },
-  /* 3754 */  { MAD_F(0x071f3bde) /* 0.445125456 */, 17 },
-  /* 3755 */  { MAD_F(0x071fe1a8) /* 0.445283561 */, 17 },
-  /* 3756 */  { MAD_F(0x07208774) /* 0.445441680 */, 17 },
-  /* 3757 */  { MAD_F(0x07212d45) /* 0.445599814 */, 17 },
-  /* 3758 */  { MAD_F(0x0721d319) /* 0.445757961 */, 17 },
-  /* 3759 */  { MAD_F(0x072278f1) /* 0.445916122 */, 17 },
-
-  /* 3760 */  { MAD_F(0x07231ecd) /* 0.446074298 */, 17 },
-  /* 3761 */  { MAD_F(0x0723c4ad) /* 0.446232487 */, 17 },
-  /* 3762 */  { MAD_F(0x07246a90) /* 0.446390690 */, 17 },
-  /* 3763 */  { MAD_F(0x07251077) /* 0.446548908 */, 17 },
-  /* 3764 */  { MAD_F(0x0725b662) /* 0.446707139 */, 17 },
-  /* 3765 */  { MAD_F(0x07265c51) /* 0.446865385 */, 17 },
-  /* 3766 */  { MAD_F(0x07270244) /* 0.447023644 */, 17 },
-  /* 3767 */  { MAD_F(0x0727a83a) /* 0.447181918 */, 17 },
-  /* 3768 */  { MAD_F(0x07284e34) /* 0.447340205 */, 17 },
-  /* 3769 */  { MAD_F(0x0728f431) /* 0.447498507 */, 17 },
-  /* 3770 */  { MAD_F(0x07299a33) /* 0.447656822 */, 17 },
-  /* 3771 */  { MAD_F(0x072a4038) /* 0.447815152 */, 17 },
-  /* 3772 */  { MAD_F(0x072ae641) /* 0.447973495 */, 17 },
-  /* 3773 */  { MAD_F(0x072b8c4e) /* 0.448131853 */, 17 },
-  /* 3774 */  { MAD_F(0x072c325e) /* 0.448290224 */, 17 },
-  /* 3775 */  { MAD_F(0x072cd873) /* 0.448448609 */, 17 },
-
-  /* 3776 */  { MAD_F(0x072d7e8b) /* 0.448607009 */, 17 },
-  /* 3777 */  { MAD_F(0x072e24a7) /* 0.448765422 */, 17 },
-  /* 3778 */  { MAD_F(0x072ecac6) /* 0.448923850 */, 17 },
-  /* 3779 */  { MAD_F(0x072f70e9) /* 0.449082291 */, 17 },
-  /* 3780 */  { MAD_F(0x07301710) /* 0.449240746 */, 17 },
-  /* 3781 */  { MAD_F(0x0730bd3b) /* 0.449399216 */, 17 },
-  /* 3782 */  { MAD_F(0x0731636a) /* 0.449557699 */, 17 },
-  /* 3783 */  { MAD_F(0x0732099c) /* 0.449716196 */, 17 },
-  /* 3784 */  { MAD_F(0x0732afd2) /* 0.449874708 */, 17 },
-  /* 3785 */  { MAD_F(0x0733560c) /* 0.450033233 */, 17 },
-  /* 3786 */  { MAD_F(0x0733fc49) /* 0.450191772 */, 17 },
-  /* 3787 */  { MAD_F(0x0734a28b) /* 0.450350325 */, 17 },
-  /* 3788 */  { MAD_F(0x073548d0) /* 0.450508892 */, 17 },
-  /* 3789 */  { MAD_F(0x0735ef18) /* 0.450667473 */, 17 },
-  /* 3790 */  { MAD_F(0x07369565) /* 0.450826068 */, 17 },
-  /* 3791 */  { MAD_F(0x07373bb5) /* 0.450984677 */, 17 },
-
-  /* 3792 */  { MAD_F(0x0737e209) /* 0.451143300 */, 17 },
-  /* 3793 */  { MAD_F(0x07388861) /* 0.451301937 */, 17 },
-  /* 3794 */  { MAD_F(0x07392ebc) /* 0.451460588 */, 17 },
-  /* 3795 */  { MAD_F(0x0739d51c) /* 0.451619252 */, 17 },
-  /* 3796 */  { MAD_F(0x073a7b7f) /* 0.451777931 */, 17 },
-  /* 3797 */  { MAD_F(0x073b21e5) /* 0.451936623 */, 17 },
-  /* 3798 */  { MAD_F(0x073bc850) /* 0.452095330 */, 17 },
-  /* 3799 */  { MAD_F(0x073c6ebe) /* 0.452254050 */, 17 },
-  /* 3800 */  { MAD_F(0x073d1530) /* 0.452412785 */, 17 },
-  /* 3801 */  { MAD_F(0x073dbba6) /* 0.452571533 */, 17 },
-  /* 3802 */  { MAD_F(0x073e621f) /* 0.452730295 */, 17 },
-  /* 3803 */  { MAD_F(0x073f089c) /* 0.452889071 */, 17 },
-  /* 3804 */  { MAD_F(0x073faf1d) /* 0.453047861 */, 17 },
-  /* 3805 */  { MAD_F(0x074055a2) /* 0.453206665 */, 17 },
-  /* 3806 */  { MAD_F(0x0740fc2a) /* 0.453365483 */, 17 },
-  /* 3807 */  { MAD_F(0x0741a2b6) /* 0.453524315 */, 17 },
-
-  /* 3808 */  { MAD_F(0x07424946) /* 0.453683161 */, 17 },
-  /* 3809 */  { MAD_F(0x0742efd9) /* 0.453842020 */, 17 },
-  /* 3810 */  { MAD_F(0x07439671) /* 0.454000894 */, 17 },
-  /* 3811 */  { MAD_F(0x07443d0c) /* 0.454159781 */, 17 },
-  /* 3812 */  { MAD_F(0x0744e3aa) /* 0.454318683 */, 17 },
-  /* 3813 */  { MAD_F(0x07458a4d) /* 0.454477598 */, 17 },
-  /* 3814 */  { MAD_F(0x074630f3) /* 0.454636527 */, 17 },
-  /* 3815 */  { MAD_F(0x0746d79d) /* 0.454795470 */, 17 },
-  /* 3816 */  { MAD_F(0x07477e4b) /* 0.454954427 */, 17 },
-  /* 3817 */  { MAD_F(0x074824fc) /* 0.455113397 */, 17 },
-  /* 3818 */  { MAD_F(0x0748cbb1) /* 0.455272382 */, 17 },
-  /* 3819 */  { MAD_F(0x0749726a) /* 0.455431381 */, 17 },
-  /* 3820 */  { MAD_F(0x074a1927) /* 0.455590393 */, 17 },
-  /* 3821 */  { MAD_F(0x074abfe7) /* 0.455749419 */, 17 },
-  /* 3822 */  { MAD_F(0x074b66ab) /* 0.455908459 */, 17 },
-  /* 3823 */  { MAD_F(0x074c0d73) /* 0.456067513 */, 17 },
-
-  /* 3824 */  { MAD_F(0x074cb43e) /* 0.456226581 */, 17 },
-  /* 3825 */  { MAD_F(0x074d5b0d) /* 0.456385663 */, 17 },
-  /* 3826 */  { MAD_F(0x074e01e0) /* 0.456544759 */, 17 },
-  /* 3827 */  { MAD_F(0x074ea8b7) /* 0.456703868 */, 17 },
-  /* 3828 */  { MAD_F(0x074f4f91) /* 0.456862992 */, 17 },
-  /* 3829 */  { MAD_F(0x074ff66f) /* 0.457022129 */, 17 },
-  /* 3830 */  { MAD_F(0x07509d51) /* 0.457181280 */, 17 },
-  /* 3831 */  { MAD_F(0x07514437) /* 0.457340445 */, 17 },
-  /* 3832 */  { MAD_F(0x0751eb20) /* 0.457499623 */, 17 },
-  /* 3833 */  { MAD_F(0x0752920d) /* 0.457658816 */, 17 },
-  /* 3834 */  { MAD_F(0x075338fd) /* 0.457818022 */, 17 },
-  /* 3835 */  { MAD_F(0x0753dff2) /* 0.457977243 */, 17 },
-  /* 3836 */  { MAD_F(0x075486ea) /* 0.458136477 */, 17 },
-  /* 3837 */  { MAD_F(0x07552de6) /* 0.458295725 */, 17 },
-  /* 3838 */  { MAD_F(0x0755d4e5) /* 0.458454987 */, 17 },
-  /* 3839 */  { MAD_F(0x07567be8) /* 0.458614262 */, 17 },
-
-  /* 3840 */  { MAD_F(0x075722ef) /* 0.458773552 */, 17 },
-  /* 3841 */  { MAD_F(0x0757c9fa) /* 0.458932855 */, 17 },
-  /* 3842 */  { MAD_F(0x07587108) /* 0.459092172 */, 17 },
-  /* 3843 */  { MAD_F(0x0759181a) /* 0.459251503 */, 17 },
-  /* 3844 */  { MAD_F(0x0759bf30) /* 0.459410848 */, 17 },
-  /* 3845 */  { MAD_F(0x075a664a) /* 0.459570206 */, 17 },
-  /* 3846 */  { MAD_F(0x075b0d67) /* 0.459729579 */, 17 },
-  /* 3847 */  { MAD_F(0x075bb488) /* 0.459888965 */, 17 },
-  /* 3848 */  { MAD_F(0x075c5bac) /* 0.460048365 */, 17 },
-  /* 3849 */  { MAD_F(0x075d02d5) /* 0.460207779 */, 17 },
-  /* 3850 */  { MAD_F(0x075daa01) /* 0.460367206 */, 17 },
-  /* 3851 */  { MAD_F(0x075e5130) /* 0.460526648 */, 17 },
-  /* 3852 */  { MAD_F(0x075ef864) /* 0.460686103 */, 17 },
-  /* 3853 */  { MAD_F(0x075f9f9b) /* 0.460845572 */, 17 },
-  /* 3854 */  { MAD_F(0x076046d6) /* 0.461005055 */, 17 },
-  /* 3855 */  { MAD_F(0x0760ee14) /* 0.461164552 */, 17 },
-
-  /* 3856 */  { MAD_F(0x07619557) /* 0.461324062 */, 17 },
-  /* 3857 */  { MAD_F(0x07623c9d) /* 0.461483586 */, 17 },
-  /* 3858 */  { MAD_F(0x0762e3e6) /* 0.461643124 */, 17 },
-  /* 3859 */  { MAD_F(0x07638b34) /* 0.461802676 */, 17 },
-  /* 3860 */  { MAD_F(0x07643285) /* 0.461962242 */, 17 },
-  /* 3861 */  { MAD_F(0x0764d9d9) /* 0.462121821 */, 17 },
-  /* 3862 */  { MAD_F(0x07658132) /* 0.462281414 */, 17 },
-  /* 3863 */  { MAD_F(0x0766288e) /* 0.462441021 */, 17 },
-  /* 3864 */  { MAD_F(0x0766cfee) /* 0.462600642 */, 17 },
-  /* 3865 */  { MAD_F(0x07677751) /* 0.462760276 */, 17 },
-  /* 3866 */  { MAD_F(0x07681eb9) /* 0.462919924 */, 17 },
-  /* 3867 */  { MAD_F(0x0768c624) /* 0.463079586 */, 17 },
-  /* 3868 */  { MAD_F(0x07696d92) /* 0.463239262 */, 17 },
-  /* 3869 */  { MAD_F(0x076a1505) /* 0.463398951 */, 17 },
-  /* 3870 */  { MAD_F(0x076abc7b) /* 0.463558655 */, 17 },
-  /* 3871 */  { MAD_F(0x076b63f4) /* 0.463718372 */, 17 },
-
-  /* 3872 */  { MAD_F(0x076c0b72) /* 0.463878102 */, 17 },
-  /* 3873 */  { MAD_F(0x076cb2f3) /* 0.464037847 */, 17 },
-  /* 3874 */  { MAD_F(0x076d5a78) /* 0.464197605 */, 17 },
-  /* 3875 */  { MAD_F(0x076e0200) /* 0.464357377 */, 17 },
-  /* 3876 */  { MAD_F(0x076ea98c) /* 0.464517163 */, 17 },
-  /* 3877 */  { MAD_F(0x076f511c) /* 0.464676962 */, 17 },
-  /* 3878 */  { MAD_F(0x076ff8b0) /* 0.464836776 */, 17 },
-  /* 3879 */  { MAD_F(0x0770a047) /* 0.464996603 */, 17 },
-  /* 3880 */  { MAD_F(0x077147e2) /* 0.465156443 */, 17 },
-  /* 3881 */  { MAD_F(0x0771ef80) /* 0.465316298 */, 17 },
-  /* 3882 */  { MAD_F(0x07729723) /* 0.465476166 */, 17 },
-  /* 3883 */  { MAD_F(0x07733ec9) /* 0.465636048 */, 17 },
-  /* 3884 */  { MAD_F(0x0773e672) /* 0.465795943 */, 17 },
-  /* 3885 */  { MAD_F(0x07748e20) /* 0.465955853 */, 17 },
-  /* 3886 */  { MAD_F(0x077535d1) /* 0.466115776 */, 17 },
-  /* 3887 */  { MAD_F(0x0775dd85) /* 0.466275713 */, 17 },
-
-  /* 3888 */  { MAD_F(0x0776853e) /* 0.466435663 */, 17 },
-  /* 3889 */  { MAD_F(0x07772cfa) /* 0.466595627 */, 17 },
-  /* 3890 */  { MAD_F(0x0777d4ba) /* 0.466755605 */, 17 },
-  /* 3891 */  { MAD_F(0x07787c7d) /* 0.466915597 */, 17 },
-  /* 3892 */  { MAD_F(0x07792444) /* 0.467075602 */, 17 },
-  /* 3893 */  { MAD_F(0x0779cc0f) /* 0.467235621 */, 17 },
-  /* 3894 */  { MAD_F(0x077a73dd) /* 0.467395654 */, 17 },
-  /* 3895 */  { MAD_F(0x077b1baf) /* 0.467555701 */, 17 },
-  /* 3896 */  { MAD_F(0x077bc385) /* 0.467715761 */, 17 },
-  /* 3897 */  { MAD_F(0x077c6b5f) /* 0.467875835 */, 17 },
-  /* 3898 */  { MAD_F(0x077d133c) /* 0.468035922 */, 17 },
-  /* 3899 */  { MAD_F(0x077dbb1d) /* 0.468196023 */, 17 },
-  /* 3900 */  { MAD_F(0x077e6301) /* 0.468356138 */, 17 },
-  /* 3901 */  { MAD_F(0x077f0ae9) /* 0.468516267 */, 17 },
-  /* 3902 */  { MAD_F(0x077fb2d5) /* 0.468676409 */, 17 },
-  /* 3903 */  { MAD_F(0x07805ac5) /* 0.468836565 */, 17 },
-
-  /* 3904 */  { MAD_F(0x078102b8) /* 0.468996735 */, 17 },
-  /* 3905 */  { MAD_F(0x0781aaaf) /* 0.469156918 */, 17 },
-  /* 3906 */  { MAD_F(0x078252aa) /* 0.469317115 */, 17 },
-  /* 3907 */  { MAD_F(0x0782faa8) /* 0.469477326 */, 17 },
-  /* 3908 */  { MAD_F(0x0783a2aa) /* 0.469637550 */, 17 },
-  /* 3909 */  { MAD_F(0x07844aaf) /* 0.469797788 */, 17 },
-  /* 3910 */  { MAD_F(0x0784f2b8) /* 0.469958040 */, 17 },
-  /* 3911 */  { MAD_F(0x07859ac5) /* 0.470118305 */, 17 },
-  /* 3912 */  { MAD_F(0x078642d6) /* 0.470278584 */, 17 },
-  /* 3913 */  { MAD_F(0x0786eaea) /* 0.470438877 */, 17 },
-  /* 3914 */  { MAD_F(0x07879302) /* 0.470599183 */, 17 },
-  /* 3915 */  { MAD_F(0x07883b1e) /* 0.470759503 */, 17 },
-  /* 3916 */  { MAD_F(0x0788e33d) /* 0.470919836 */, 17 },
-  /* 3917 */  { MAD_F(0x07898b60) /* 0.471080184 */, 17 },
-  /* 3918 */  { MAD_F(0x078a3386) /* 0.471240545 */, 17 },
-  /* 3919 */  { MAD_F(0x078adbb0) /* 0.471400919 */, 17 },
-
-  /* 3920 */  { MAD_F(0x078b83de) /* 0.471561307 */, 17 },
-  /* 3921 */  { MAD_F(0x078c2c10) /* 0.471721709 */, 17 },
-  /* 3922 */  { MAD_F(0x078cd445) /* 0.471882125 */, 17 },
-  /* 3923 */  { MAD_F(0x078d7c7e) /* 0.472042554 */, 17 },
-  /* 3924 */  { MAD_F(0x078e24ba) /* 0.472202996 */, 17 },
-  /* 3925 */  { MAD_F(0x078eccfb) /* 0.472363453 */, 17 },
-  /* 3926 */  { MAD_F(0x078f753e) /* 0.472523923 */, 17 },
-  /* 3927 */  { MAD_F(0x07901d86) /* 0.472684406 */, 17 },
-  /* 3928 */  { MAD_F(0x0790c5d1) /* 0.472844904 */, 17 },
-  /* 3929 */  { MAD_F(0x07916e20) /* 0.473005414 */, 17 },
-  /* 3930 */  { MAD_F(0x07921672) /* 0.473165939 */, 17 },
-  /* 3931 */  { MAD_F(0x0792bec8) /* 0.473326477 */, 17 },
-  /* 3932 */  { MAD_F(0x07936722) /* 0.473487029 */, 17 },
-  /* 3933 */  { MAD_F(0x07940f80) /* 0.473647594 */, 17 },
-  /* 3934 */  { MAD_F(0x0794b7e1) /* 0.473808173 */, 17 },
-  /* 3935 */  { MAD_F(0x07956045) /* 0.473968765 */, 17 },
-
-  /* 3936 */  { MAD_F(0x079608ae) /* 0.474129372 */, 17 },
-  /* 3937 */  { MAD_F(0x0796b11a) /* 0.474289991 */, 17 },
-  /* 3938 */  { MAD_F(0x0797598a) /* 0.474450625 */, 17 },
-  /* 3939 */  { MAD_F(0x079801fd) /* 0.474611272 */, 17 },
-  /* 3940 */  { MAD_F(0x0798aa74) /* 0.474771932 */, 17 },
-  /* 3941 */  { MAD_F(0x079952ee) /* 0.474932606 */, 17 },
-  /* 3942 */  { MAD_F(0x0799fb6d) /* 0.475093294 */, 17 },
-  /* 3943 */  { MAD_F(0x079aa3ef) /* 0.475253995 */, 17 },
-  /* 3944 */  { MAD_F(0x079b4c74) /* 0.475414710 */, 17 },
-  /* 3945 */  { MAD_F(0x079bf4fd) /* 0.475575439 */, 17 },
-  /* 3946 */  { MAD_F(0x079c9d8a) /* 0.475736181 */, 17 },
-  /* 3947 */  { MAD_F(0x079d461b) /* 0.475896936 */, 17 },
-  /* 3948 */  { MAD_F(0x079deeaf) /* 0.476057705 */, 17 },
-  /* 3949 */  { MAD_F(0x079e9747) /* 0.476218488 */, 17 },
-  /* 3950 */  { MAD_F(0x079f3fe2) /* 0.476379285 */, 17 },
-  /* 3951 */  { MAD_F(0x079fe881) /* 0.476540095 */, 17 },
-
-  /* 3952 */  { MAD_F(0x07a09124) /* 0.476700918 */, 17 },
-  /* 3953 */  { MAD_F(0x07a139ca) /* 0.476861755 */, 17 },
-  /* 3954 */  { MAD_F(0x07a1e274) /* 0.477022606 */, 17 },
-  /* 3955 */  { MAD_F(0x07a28b22) /* 0.477183470 */, 17 },
-  /* 3956 */  { MAD_F(0x07a333d3) /* 0.477344348 */, 17 },
-  /* 3957 */  { MAD_F(0x07a3dc88) /* 0.477505239 */, 17 },
-  /* 3958 */  { MAD_F(0x07a48541) /* 0.477666144 */, 17 },
-  /* 3959 */  { MAD_F(0x07a52dfd) /* 0.477827062 */, 17 },
-  /* 3960 */  { MAD_F(0x07a5d6bd) /* 0.477987994 */, 17 },
-  /* 3961 */  { MAD_F(0x07a67f80) /* 0.478148940 */, 17 },
-  /* 3962 */  { MAD_F(0x07a72847) /* 0.478309899 */, 17 },
-  /* 3963 */  { MAD_F(0x07a7d112) /* 0.478470871 */, 17 },
-  /* 3964 */  { MAD_F(0x07a879e1) /* 0.478631857 */, 17 },
-  /* 3965 */  { MAD_F(0x07a922b3) /* 0.478792857 */, 17 },
-  /* 3966 */  { MAD_F(0x07a9cb88) /* 0.478953870 */, 17 },
-  /* 3967 */  { MAD_F(0x07aa7462) /* 0.479114897 */, 17 },
-
-  /* 3968 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */, 17 },
-  /* 3969 */  { MAD_F(0x07abc61f) /* 0.479436991 */, 17 },
-  /* 3970 */  { MAD_F(0x07ac6f03) /* 0.479598058 */, 17 },
-  /* 3971 */  { MAD_F(0x07ad17eb) /* 0.479759139 */, 17 },
-  /* 3972 */  { MAD_F(0x07adc0d6) /* 0.479920233 */, 17 },
-  /* 3973 */  { MAD_F(0x07ae69c6) /* 0.480081341 */, 17 },
-  /* 3974 */  { MAD_F(0x07af12b8) /* 0.480242463 */, 17 },
-  /* 3975 */  { MAD_F(0x07afbbaf) /* 0.480403598 */, 17 },
-  /* 3976 */  { MAD_F(0x07b064a8) /* 0.480564746 */, 17 },
-  /* 3977 */  { MAD_F(0x07b10da6) /* 0.480725908 */, 17 },
-  /* 3978 */  { MAD_F(0x07b1b6a7) /* 0.480887083 */, 17 },
-  /* 3979 */  { MAD_F(0x07b25fac) /* 0.481048272 */, 17 },
-  /* 3980 */  { MAD_F(0x07b308b5) /* 0.481209475 */, 17 },
-  /* 3981 */  { MAD_F(0x07b3b1c1) /* 0.481370691 */, 17 },
-  /* 3982 */  { MAD_F(0x07b45ad0) /* 0.481531920 */, 17 },
-  /* 3983 */  { MAD_F(0x07b503e4) /* 0.481693163 */, 17 },
-
-  /* 3984 */  { MAD_F(0x07b5acfb) /* 0.481854420 */, 17 },
-  /* 3985 */  { MAD_F(0x07b65615) /* 0.482015690 */, 17 },
-  /* 3986 */  { MAD_F(0x07b6ff33) /* 0.482176973 */, 17 },
-  /* 3987 */  { MAD_F(0x07b7a855) /* 0.482338270 */, 17 },
-  /* 3988 */  { MAD_F(0x07b8517b) /* 0.482499580 */, 17 },
-  /* 3989 */  { MAD_F(0x07b8faa4) /* 0.482660904 */, 17 },
-  /* 3990 */  { MAD_F(0x07b9a3d0) /* 0.482822242 */, 17 },
-  /* 3991 */  { MAD_F(0x07ba4d01) /* 0.482983592 */, 17 },
-  /* 3992 */  { MAD_F(0x07baf635) /* 0.483144957 */, 17 },
-  /* 3993 */  { MAD_F(0x07bb9f6c) /* 0.483306335 */, 17 },
-  /* 3994 */  { MAD_F(0x07bc48a7) /* 0.483467726 */, 17 },
-  /* 3995 */  { MAD_F(0x07bcf1e6) /* 0.483629131 */, 17 },
-  /* 3996 */  { MAD_F(0x07bd9b28) /* 0.483790549 */, 17 },
-  /* 3997 */  { MAD_F(0x07be446e) /* 0.483951980 */, 17 },
-  /* 3998 */  { MAD_F(0x07beedb8) /* 0.484113426 */, 17 },
-  /* 3999 */  { MAD_F(0x07bf9705) /* 0.484274884 */, 17 },
-
-  /* 4000 */  { MAD_F(0x07c04056) /* 0.484436356 */, 17 },
-  /* 4001 */  { MAD_F(0x07c0e9aa) /* 0.484597842 */, 17 },
-  /* 4002 */  { MAD_F(0x07c19302) /* 0.484759341 */, 17 },
-  /* 4003 */  { MAD_F(0x07c23c5e) /* 0.484920853 */, 17 },
-  /* 4004 */  { MAD_F(0x07c2e5bd) /* 0.485082379 */, 17 },
-  /* 4005 */  { MAD_F(0x07c38f20) /* 0.485243918 */, 17 },
-  /* 4006 */  { MAD_F(0x07c43887) /* 0.485405471 */, 17 },
-  /* 4007 */  { MAD_F(0x07c4e1f1) /* 0.485567037 */, 17 },
-  /* 4008 */  { MAD_F(0x07c58b5f) /* 0.485728617 */, 17 },
-  /* 4009 */  { MAD_F(0x07c634d0) /* 0.485890210 */, 17 },
-  /* 4010 */  { MAD_F(0x07c6de45) /* 0.486051817 */, 17 },
-  /* 4011 */  { MAD_F(0x07c787bd) /* 0.486213436 */, 17 },
-  /* 4012 */  { MAD_F(0x07c83139) /* 0.486375070 */, 17 },
-  /* 4013 */  { MAD_F(0x07c8dab9) /* 0.486536717 */, 17 },
-  /* 4014 */  { MAD_F(0x07c9843c) /* 0.486698377 */, 17 },
-  /* 4015 */  { MAD_F(0x07ca2dc3) /* 0.486860051 */, 17 },
-
-  /* 4016 */  { MAD_F(0x07cad74e) /* 0.487021738 */, 17 },
-  /* 4017 */  { MAD_F(0x07cb80dc) /* 0.487183438 */, 17 },
-  /* 4018 */  { MAD_F(0x07cc2a6e) /* 0.487345152 */, 17 },
-  /* 4019 */  { MAD_F(0x07ccd403) /* 0.487506879 */, 17 },
-  /* 4020 */  { MAD_F(0x07cd7d9c) /* 0.487668620 */, 17 },
-  /* 4021 */  { MAD_F(0x07ce2739) /* 0.487830374 */, 17 },
-  /* 4022 */  { MAD_F(0x07ced0d9) /* 0.487992142 */, 17 },
-  /* 4023 */  { MAD_F(0x07cf7a7d) /* 0.488153923 */, 17 },
-  /* 4024 */  { MAD_F(0x07d02424) /* 0.488315717 */, 17 },
-  /* 4025 */  { MAD_F(0x07d0cdcf) /* 0.488477525 */, 17 },
-  /* 4026 */  { MAD_F(0x07d1777e) /* 0.488639346 */, 17 },
-  /* 4027 */  { MAD_F(0x07d22130) /* 0.488801181 */, 17 },
-  /* 4028 */  { MAD_F(0x07d2cae5) /* 0.488963029 */, 17 },
-  /* 4029 */  { MAD_F(0x07d3749f) /* 0.489124890 */, 17 },
-  /* 4030 */  { MAD_F(0x07d41e5c) /* 0.489286765 */, 17 },
-  /* 4031 */  { MAD_F(0x07d4c81c) /* 0.489448653 */, 17 },
-
-  /* 4032 */  { MAD_F(0x07d571e0) /* 0.489610555 */, 17 },
-  /* 4033 */  { MAD_F(0x07d61ba8) /* 0.489772470 */, 17 },
-  /* 4034 */  { MAD_F(0x07d6c573) /* 0.489934398 */, 17 },
-  /* 4035 */  { MAD_F(0x07d76f42) /* 0.490096340 */, 17 },
-  /* 4036 */  { MAD_F(0x07d81915) /* 0.490258295 */, 17 },
-  /* 4037 */  { MAD_F(0x07d8c2eb) /* 0.490420263 */, 17 },
-  /* 4038 */  { MAD_F(0x07d96cc4) /* 0.490582245 */, 17 },
-  /* 4039 */  { MAD_F(0x07da16a2) /* 0.490744240 */, 17 },
-  /* 4040 */  { MAD_F(0x07dac083) /* 0.490906249 */, 17 },
-  /* 4041 */  { MAD_F(0x07db6a67) /* 0.491068271 */, 17 },
-  /* 4042 */  { MAD_F(0x07dc144f) /* 0.491230306 */, 17 },
-  /* 4043 */  { MAD_F(0x07dcbe3b) /* 0.491392355 */, 17 },
-  /* 4044 */  { MAD_F(0x07dd682a) /* 0.491554417 */, 17 },
-  /* 4045 */  { MAD_F(0x07de121d) /* 0.491716492 */, 17 },
-  /* 4046 */  { MAD_F(0x07debc13) /* 0.491878581 */, 17 },
-  /* 4047 */  { MAD_F(0x07df660d) /* 0.492040683 */, 17 },
-
-  /* 4048 */  { MAD_F(0x07e0100a) /* 0.492202799 */, 17 },
-  /* 4049 */  { MAD_F(0x07e0ba0c) /* 0.492364928 */, 17 },
-  /* 4050 */  { MAD_F(0x07e16410) /* 0.492527070 */, 17 },
-  /* 4051 */  { MAD_F(0x07e20e19) /* 0.492689225 */, 17 },
-  /* 4052 */  { MAD_F(0x07e2b824) /* 0.492851394 */, 17 },
-  /* 4053 */  { MAD_F(0x07e36234) /* 0.493013576 */, 17 },
-  /* 4054 */  { MAD_F(0x07e40c47) /* 0.493175772 */, 17 },
-  /* 4055 */  { MAD_F(0x07e4b65e) /* 0.493337981 */, 17 },
-  /* 4056 */  { MAD_F(0x07e56078) /* 0.493500203 */, 17 },
-  /* 4057 */  { MAD_F(0x07e60a95) /* 0.493662438 */, 17 },
-  /* 4058 */  { MAD_F(0x07e6b4b7) /* 0.493824687 */, 17 },
-  /* 4059 */  { MAD_F(0x07e75edc) /* 0.493986949 */, 17 },
-  /* 4060 */  { MAD_F(0x07e80904) /* 0.494149225 */, 17 },
-  /* 4061 */  { MAD_F(0x07e8b330) /* 0.494311514 */, 17 },
-  /* 4062 */  { MAD_F(0x07e95d60) /* 0.494473816 */, 17 },
-  /* 4063 */  { MAD_F(0x07ea0793) /* 0.494636131 */, 17 },
-
-  /* 4064 */  { MAD_F(0x07eab1ca) /* 0.494798460 */, 17 },
-  /* 4065 */  { MAD_F(0x07eb5c04) /* 0.494960802 */, 17 },
-  /* 4066 */  { MAD_F(0x07ec0642) /* 0.495123158 */, 17 },
-  /* 4067 */  { MAD_F(0x07ecb084) /* 0.495285526 */, 17 },
-  /* 4068 */  { MAD_F(0x07ed5ac9) /* 0.495447908 */, 17 },
-  /* 4069 */  { MAD_F(0x07ee0512) /* 0.495610304 */, 17 },
-  /* 4070 */  { MAD_F(0x07eeaf5e) /* 0.495772712 */, 17 },
-  /* 4071 */  { MAD_F(0x07ef59ae) /* 0.495935134 */, 17 },
-  /* 4072 */  { MAD_F(0x07f00401) /* 0.496097570 */, 17 },
-  /* 4073 */  { MAD_F(0x07f0ae58) /* 0.496260018 */, 17 },
-  /* 4074 */  { MAD_F(0x07f158b3) /* 0.496422480 */, 17 },
-  /* 4075 */  { MAD_F(0x07f20311) /* 0.496584955 */, 17 },
-  /* 4076 */  { MAD_F(0x07f2ad72) /* 0.496747444 */, 17 },
-  /* 4077 */  { MAD_F(0x07f357d8) /* 0.496909945 */, 17 },
-  /* 4078 */  { MAD_F(0x07f40240) /* 0.497072460 */, 17 },
-  /* 4079 */  { MAD_F(0x07f4acad) /* 0.497234989 */, 17 },
-
-  /* 4080 */  { MAD_F(0x07f5571d) /* 0.497397530 */, 17 },
-  /* 4081 */  { MAD_F(0x07f60190) /* 0.497560085 */, 17 },
-  /* 4082 */  { MAD_F(0x07f6ac07) /* 0.497722653 */, 17 },
-  /* 4083 */  { MAD_F(0x07f75682) /* 0.497885235 */, 17 },
-  /* 4084 */  { MAD_F(0x07f80100) /* 0.498047829 */, 17 },
-  /* 4085 */  { MAD_F(0x07f8ab82) /* 0.498210437 */, 17 },
-  /* 4086 */  { MAD_F(0x07f95607) /* 0.498373058 */, 17 },
-  /* 4087 */  { MAD_F(0x07fa0090) /* 0.498535693 */, 17 },
-  /* 4088 */  { MAD_F(0x07faab1c) /* 0.498698341 */, 17 },
-  /* 4089 */  { MAD_F(0x07fb55ac) /* 0.498861002 */, 17 },
-  /* 4090 */  { MAD_F(0x07fc0040) /* 0.499023676 */, 17 },
-  /* 4091 */  { MAD_F(0x07fcaad7) /* 0.499186364 */, 17 },
-  /* 4092 */  { MAD_F(0x07fd5572) /* 0.499349064 */, 17 },
-  /* 4093 */  { MAD_F(0x07fe0010) /* 0.499511778 */, 17 },
-  /* 4094 */  { MAD_F(0x07feaab2) /* 0.499674506 */, 17 },
-  /* 4095 */  { MAD_F(0x07ff5557) /* 0.499837246 */, 17 },
-
-  /* 4096 */  { MAD_F(0x04000000) /* 0.250000000 */, 18 },
-  /* 4097 */  { MAD_F(0x04005556) /* 0.250081384 */, 18 },
-  /* 4098 */  { MAD_F(0x0400aaae) /* 0.250162774 */, 18 },
-  /* 4099 */  { MAD_F(0x04010008) /* 0.250244170 */, 18 },
-  /* 4100 */  { MAD_F(0x04015563) /* 0.250325574 */, 18 },
-  /* 4101 */  { MAD_F(0x0401aac1) /* 0.250406984 */, 18 },
-  /* 4102 */  { MAD_F(0x04020020) /* 0.250488400 */, 18 },
-  /* 4103 */  { MAD_F(0x04025581) /* 0.250569824 */, 18 },
-  /* 4104 */  { MAD_F(0x0402aae3) /* 0.250651254 */, 18 },
-  /* 4105 */  { MAD_F(0x04030048) /* 0.250732690 */, 18 },
-  /* 4106 */  { MAD_F(0x040355ae) /* 0.250814133 */, 18 },
-  /* 4107 */  { MAD_F(0x0403ab16) /* 0.250895583 */, 18 },
-  /* 4108 */  { MAD_F(0x04040080) /* 0.250977039 */, 18 },
-  /* 4109 */  { MAD_F(0x040455eb) /* 0.251058502 */, 18 },
-  /* 4110 */  { MAD_F(0x0404ab59) /* 0.251139971 */, 18 },
-  /* 4111 */  { MAD_F(0x040500c8) /* 0.251221448 */, 18 },
-
-  /* 4112 */  { MAD_F(0x04055638) /* 0.251302930 */, 18 },
-  /* 4113 */  { MAD_F(0x0405abab) /* 0.251384420 */, 18 },
-  /* 4114 */  { MAD_F(0x0406011f) /* 0.251465916 */, 18 },
-  /* 4115 */  { MAD_F(0x04065696) /* 0.251547418 */, 18 },
-  /* 4116 */  { MAD_F(0x0406ac0e) /* 0.251628927 */, 18 },
-  /* 4117 */  { MAD_F(0x04070187) /* 0.251710443 */, 18 },
-  /* 4118 */  { MAD_F(0x04075703) /* 0.251791965 */, 18 },
-  /* 4119 */  { MAD_F(0x0407ac80) /* 0.251873494 */, 18 },
-  /* 4120 */  { MAD_F(0x040801ff) /* 0.251955030 */, 18 },
-  /* 4121 */  { MAD_F(0x04085780) /* 0.252036572 */, 18 },
-  /* 4122 */  { MAD_F(0x0408ad02) /* 0.252118121 */, 18 },
-  /* 4123 */  { MAD_F(0x04090287) /* 0.252199676 */, 18 },
-  /* 4124 */  { MAD_F(0x0409580d) /* 0.252281238 */, 18 },
-  /* 4125 */  { MAD_F(0x0409ad95) /* 0.252362807 */, 18 },
-  /* 4126 */  { MAD_F(0x040a031e) /* 0.252444382 */, 18 },
-  /* 4127 */  { MAD_F(0x040a58aa) /* 0.252525963 */, 18 },
-
-  /* 4128 */  { MAD_F(0x040aae37) /* 0.252607552 */, 18 },
-  /* 4129 */  { MAD_F(0x040b03c6) /* 0.252689147 */, 18 },
-  /* 4130 */  { MAD_F(0x040b5957) /* 0.252770748 */, 18 },
-  /* 4131 */  { MAD_F(0x040baee9) /* 0.252852356 */, 18 },
-  /* 4132 */  { MAD_F(0x040c047e) /* 0.252933971 */, 18 },
-  /* 4133 */  { MAD_F(0x040c5a14) /* 0.253015592 */, 18 },
-  /* 4134 */  { MAD_F(0x040cafab) /* 0.253097220 */, 18 },
-  /* 4135 */  { MAD_F(0x040d0545) /* 0.253178854 */, 18 },
-  /* 4136 */  { MAD_F(0x040d5ae0) /* 0.253260495 */, 18 },
-  /* 4137 */  { MAD_F(0x040db07d) /* 0.253342143 */, 18 },
-  /* 4138 */  { MAD_F(0x040e061c) /* 0.253423797 */, 18 },
-  /* 4139 */  { MAD_F(0x040e5bbd) /* 0.253505457 */, 18 },
-  /* 4140 */  { MAD_F(0x040eb15f) /* 0.253587125 */, 18 },
-  /* 4141 */  { MAD_F(0x040f0703) /* 0.253668799 */, 18 },
-  /* 4142 */  { MAD_F(0x040f5ca9) /* 0.253750479 */, 18 },
-  /* 4143 */  { MAD_F(0x040fb251) /* 0.253832166 */, 18 },
-
-  /* 4144 */  { MAD_F(0x041007fa) /* 0.253913860 */, 18 },
-  /* 4145 */  { MAD_F(0x04105da6) /* 0.253995560 */, 18 },
-  /* 4146 */  { MAD_F(0x0410b353) /* 0.254077266 */, 18 },
-  /* 4147 */  { MAD_F(0x04110901) /* 0.254158980 */, 18 },
-  /* 4148 */  { MAD_F(0x04115eb2) /* 0.254240700 */, 18 },
-  /* 4149 */  { MAD_F(0x0411b464) /* 0.254322426 */, 18 },
-  /* 4150 */  { MAD_F(0x04120a18) /* 0.254404159 */, 18 },
-  /* 4151 */  { MAD_F(0x04125fce) /* 0.254485899 */, 18 },
-  /* 4152 */  { MAD_F(0x0412b586) /* 0.254567645 */, 18 },
-  /* 4153 */  { MAD_F(0x04130b3f) /* 0.254649397 */, 18 },
-  /* 4154 */  { MAD_F(0x041360fa) /* 0.254731157 */, 18 },
-  /* 4155 */  { MAD_F(0x0413b6b7) /* 0.254812922 */, 18 },
-  /* 4156 */  { MAD_F(0x04140c75) /* 0.254894695 */, 18 },
-  /* 4157 */  { MAD_F(0x04146236) /* 0.254976474 */, 18 },
-  /* 4158 */  { MAD_F(0x0414b7f8) /* 0.255058259 */, 18 },
-  /* 4159 */  { MAD_F(0x04150dbc) /* 0.255140051 */, 18 },
-
-  /* 4160 */  { MAD_F(0x04156381) /* 0.255221850 */, 18 },
-  /* 4161 */  { MAD_F(0x0415b949) /* 0.255303655 */, 18 },
-  /* 4162 */  { MAD_F(0x04160f12) /* 0.255385467 */, 18 },
-  /* 4163 */  { MAD_F(0x041664dd) /* 0.255467285 */, 18 },
-  /* 4164 */  { MAD_F(0x0416baaa) /* 0.255549110 */, 18 },
-  /* 4165 */  { MAD_F(0x04171078) /* 0.255630941 */, 18 },
-  /* 4166 */  { MAD_F(0x04176648) /* 0.255712779 */, 18 },
-  /* 4167 */  { MAD_F(0x0417bc1a) /* 0.255794624 */, 18 },
-  /* 4168 */  { MAD_F(0x041811ee) /* 0.255876475 */, 18 },
-  /* 4169 */  { MAD_F(0x041867c3) /* 0.255958332 */, 18 },
-  /* 4170 */  { MAD_F(0x0418bd9b) /* 0.256040196 */, 18 },
-  /* 4171 */  { MAD_F(0x04191374) /* 0.256122067 */, 18 },
-  /* 4172 */  { MAD_F(0x0419694e) /* 0.256203944 */, 18 },
-  /* 4173 */  { MAD_F(0x0419bf2b) /* 0.256285828 */, 18 },
-  /* 4174 */  { MAD_F(0x041a1509) /* 0.256367718 */, 18 },
-  /* 4175 */  { MAD_F(0x041a6ae9) /* 0.256449615 */, 18 },
-
-  /* 4176 */  { MAD_F(0x041ac0cb) /* 0.256531518 */, 18 },
-  /* 4177 */  { MAD_F(0x041b16ae) /* 0.256613428 */, 18 },
-  /* 4178 */  { MAD_F(0x041b6c94) /* 0.256695344 */, 18 },
-  /* 4179 */  { MAD_F(0x041bc27b) /* 0.256777267 */, 18 },
-  /* 4180 */  { MAD_F(0x041c1863) /* 0.256859197 */, 18 },
-  /* 4181 */  { MAD_F(0x041c6e4e) /* 0.256941133 */, 18 },
-  /* 4182 */  { MAD_F(0x041cc43a) /* 0.257023076 */, 18 },
-  /* 4183 */  { MAD_F(0x041d1a28) /* 0.257105025 */, 18 },
-  /* 4184 */  { MAD_F(0x041d7018) /* 0.257186980 */, 18 },
-  /* 4185 */  { MAD_F(0x041dc60a) /* 0.257268942 */, 18 },
-  /* 4186 */  { MAD_F(0x041e1bfd) /* 0.257350911 */, 18 },
-  /* 4187 */  { MAD_F(0x041e71f2) /* 0.257432886 */, 18 },
-  /* 4188 */  { MAD_F(0x041ec7e9) /* 0.257514868 */, 18 },
-  /* 4189 */  { MAD_F(0x041f1de1) /* 0.257596856 */, 18 },
-  /* 4190 */  { MAD_F(0x041f73dc) /* 0.257678851 */, 18 },
-  /* 4191 */  { MAD_F(0x041fc9d8) /* 0.257760852 */, 18 },
-
-  /* 4192 */  { MAD_F(0x04201fd5) /* 0.257842860 */, 18 },
-  /* 4193 */  { MAD_F(0x042075d5) /* 0.257924875 */, 18 },
-  /* 4194 */  { MAD_F(0x0420cbd6) /* 0.258006895 */, 18 },
-  /* 4195 */  { MAD_F(0x042121d9) /* 0.258088923 */, 18 },
-  /* 4196 */  { MAD_F(0x042177de) /* 0.258170957 */, 18 },
-  /* 4197 */  { MAD_F(0x0421cde5) /* 0.258252997 */, 18 },
-  /* 4198 */  { MAD_F(0x042223ed) /* 0.258335044 */, 18 },
-  /* 4199 */  { MAD_F(0x042279f7) /* 0.258417097 */, 18 },
-  /* 4200 */  { MAD_F(0x0422d003) /* 0.258499157 */, 18 },
-  /* 4201 */  { MAD_F(0x04232611) /* 0.258581224 */, 18 },
-  /* 4202 */  { MAD_F(0x04237c20) /* 0.258663297 */, 18 },
-  /* 4203 */  { MAD_F(0x0423d231) /* 0.258745376 */, 18 },
-  /* 4204 */  { MAD_F(0x04242844) /* 0.258827462 */, 18 },
-  /* 4205 */  { MAD_F(0x04247e58) /* 0.258909555 */, 18 },
-  /* 4206 */  { MAD_F(0x0424d46e) /* 0.258991654 */, 18 },
-  /* 4207 */  { MAD_F(0x04252a87) /* 0.259073760 */, 18 },
-
-  /* 4208 */  { MAD_F(0x042580a0) /* 0.259155872 */, 18 },
-  /* 4209 */  { MAD_F(0x0425d6bc) /* 0.259237990 */, 18 },
-  /* 4210 */  { MAD_F(0x04262cd9) /* 0.259320115 */, 18 },
-  /* 4211 */  { MAD_F(0x042682f8) /* 0.259402247 */, 18 },
-  /* 4212 */  { MAD_F(0x0426d919) /* 0.259484385 */, 18 },
-  /* 4213 */  { MAD_F(0x04272f3b) /* 0.259566529 */, 18 },
-  /* 4214 */  { MAD_F(0x04278560) /* 0.259648680 */, 18 },
-  /* 4215 */  { MAD_F(0x0427db86) /* 0.259730838 */, 18 },
-  /* 4216 */  { MAD_F(0x042831ad) /* 0.259813002 */, 18 },
-  /* 4217 */  { MAD_F(0x042887d7) /* 0.259895173 */, 18 },
-  /* 4218 */  { MAD_F(0x0428de02) /* 0.259977350 */, 18 },
-  /* 4219 */  { MAD_F(0x0429342f) /* 0.260059533 */, 18 },
-  /* 4220 */  { MAD_F(0x04298a5e) /* 0.260141723 */, 18 },
-  /* 4221 */  { MAD_F(0x0429e08e) /* 0.260223920 */, 18 },
-  /* 4222 */  { MAD_F(0x042a36c0) /* 0.260306123 */, 18 },
-  /* 4223 */  { MAD_F(0x042a8cf4) /* 0.260388332 */, 18 },
-
-  /* 4224 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 18 },
-  /* 4225 */  { MAD_F(0x042b3962) /* 0.260552771 */, 18 },
-  /* 4226 */  { MAD_F(0x042b8f9b) /* 0.260635000 */, 18 },
-  /* 4227 */  { MAD_F(0x042be5d6) /* 0.260717235 */, 18 },
-  /* 4228 */  { MAD_F(0x042c3c12) /* 0.260799477 */, 18 },
-  /* 4229 */  { MAD_F(0x042c9251) /* 0.260881725 */, 18 },
-  /* 4230 */  { MAD_F(0x042ce891) /* 0.260963980 */, 18 },
-  /* 4231 */  { MAD_F(0x042d3ed3) /* 0.261046242 */, 18 },
-  /* 4232 */  { MAD_F(0x042d9516) /* 0.261128510 */, 18 },
-  /* 4233 */  { MAD_F(0x042deb5c) /* 0.261210784 */, 18 },
-  /* 4234 */  { MAD_F(0x042e41a3) /* 0.261293065 */, 18 },
-  /* 4235 */  { MAD_F(0x042e97ec) /* 0.261375352 */, 18 },
-  /* 4236 */  { MAD_F(0x042eee36) /* 0.261457646 */, 18 },
-  /* 4237 */  { MAD_F(0x042f4482) /* 0.261539946 */, 18 },
-  /* 4238 */  { MAD_F(0x042f9ad1) /* 0.261622253 */, 18 },
-  /* 4239 */  { MAD_F(0x042ff120) /* 0.261704566 */, 18 },
-
-  /* 4240 */  { MAD_F(0x04304772) /* 0.261786886 */, 18 },
-  /* 4241 */  { MAD_F(0x04309dc5) /* 0.261869212 */, 18 },
-  /* 4242 */  { MAD_F(0x0430f41a) /* 0.261951545 */, 18 },
-  /* 4243 */  { MAD_F(0x04314a71) /* 0.262033884 */, 18 },
-  /* 4244 */  { MAD_F(0x0431a0c9) /* 0.262116229 */, 18 },
-  /* 4245 */  { MAD_F(0x0431f723) /* 0.262198581 */, 18 },
-  /* 4246 */  { MAD_F(0x04324d7f) /* 0.262280940 */, 18 },
-  /* 4247 */  { MAD_F(0x0432a3dd) /* 0.262363305 */, 18 },
-  /* 4248 */  { MAD_F(0x0432fa3d) /* 0.262445676 */, 18 },
-  /* 4249 */  { MAD_F(0x0433509e) /* 0.262528054 */, 18 },
-  /* 4250 */  { MAD_F(0x0433a701) /* 0.262610438 */, 18 },
-  /* 4251 */  { MAD_F(0x0433fd65) /* 0.262692829 */, 18 },
-  /* 4252 */  { MAD_F(0x043453cc) /* 0.262775227 */, 18 },
-  /* 4253 */  { MAD_F(0x0434aa34) /* 0.262857630 */, 18 },
-  /* 4254 */  { MAD_F(0x0435009d) /* 0.262940040 */, 18 },
-  /* 4255 */  { MAD_F(0x04355709) /* 0.263022457 */, 18 },
-
-  /* 4256 */  { MAD_F(0x0435ad76) /* 0.263104880 */, 18 },
-  /* 4257 */  { MAD_F(0x043603e5) /* 0.263187310 */, 18 },
-  /* 4258 */  { MAD_F(0x04365a56) /* 0.263269746 */, 18 },
-  /* 4259 */  { MAD_F(0x0436b0c9) /* 0.263352188 */, 18 },
-  /* 4260 */  { MAD_F(0x0437073d) /* 0.263434637 */, 18 },
-  /* 4261 */  { MAD_F(0x04375db3) /* 0.263517093 */, 18 },
-  /* 4262 */  { MAD_F(0x0437b42a) /* 0.263599554 */, 18 },
-  /* 4263 */  { MAD_F(0x04380aa4) /* 0.263682023 */, 18 },
-  /* 4264 */  { MAD_F(0x0438611f) /* 0.263764497 */, 18 },
-  /* 4265 */  { MAD_F(0x0438b79c) /* 0.263846979 */, 18 },
-  /* 4266 */  { MAD_F(0x04390e1a) /* 0.263929466 */, 18 },
-  /* 4267 */  { MAD_F(0x0439649b) /* 0.264011960 */, 18 },
-  /* 4268 */  { MAD_F(0x0439bb1d) /* 0.264094461 */, 18 },
-  /* 4269 */  { MAD_F(0x043a11a1) /* 0.264176968 */, 18 },
-  /* 4270 */  { MAD_F(0x043a6826) /* 0.264259481 */, 18 },
-  /* 4271 */  { MAD_F(0x043abead) /* 0.264342001 */, 18 },
-
-  /* 4272 */  { MAD_F(0x043b1536) /* 0.264424527 */, 18 },
-  /* 4273 */  { MAD_F(0x043b6bc1) /* 0.264507060 */, 18 },
-  /* 4274 */  { MAD_F(0x043bc24d) /* 0.264589599 */, 18 },
-  /* 4275 */  { MAD_F(0x043c18dc) /* 0.264672145 */, 18 },
-  /* 4276 */  { MAD_F(0x043c6f6c) /* 0.264754697 */, 18 },
-  /* 4277 */  { MAD_F(0x043cc5fd) /* 0.264837255 */, 18 },
-  /* 4278 */  { MAD_F(0x043d1c91) /* 0.264919820 */, 18 },
-  /* 4279 */  { MAD_F(0x043d7326) /* 0.265002392 */, 18 },
-  /* 4280 */  { MAD_F(0x043dc9bc) /* 0.265084969 */, 18 },
-  /* 4281 */  { MAD_F(0x043e2055) /* 0.265167554 */, 18 },
-  /* 4282 */  { MAD_F(0x043e76ef) /* 0.265250144 */, 18 },
-  /* 4283 */  { MAD_F(0x043ecd8b) /* 0.265332741 */, 18 },
-  /* 4284 */  { MAD_F(0x043f2429) /* 0.265415345 */, 18 },
-  /* 4285 */  { MAD_F(0x043f7ac8) /* 0.265497955 */, 18 },
-  /* 4286 */  { MAD_F(0x043fd169) /* 0.265580571 */, 18 },
-  /* 4287 */  { MAD_F(0x0440280c) /* 0.265663194 */, 18 },
-
-  /* 4288 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 18 },
-  /* 4289 */  { MAD_F(0x0440d557) /* 0.265828459 */, 18 },
-  /* 4290 */  { MAD_F(0x04412bff) /* 0.265911101 */, 18 },
-  /* 4291 */  { MAD_F(0x044182a9) /* 0.265993749 */, 18 },
-  /* 4292 */  { MAD_F(0x0441d955) /* 0.266076404 */, 18 },
-  /* 4293 */  { MAD_F(0x04423002) /* 0.266159065 */, 18 },
-  /* 4294 */  { MAD_F(0x044286b1) /* 0.266241733 */, 18 },
-  /* 4295 */  { MAD_F(0x0442dd61) /* 0.266324407 */, 18 },
-  /* 4296 */  { MAD_F(0x04433414) /* 0.266407088 */, 18 },
-  /* 4297 */  { MAD_F(0x04438ac8) /* 0.266489775 */, 18 },
-  /* 4298 */  { MAD_F(0x0443e17e) /* 0.266572468 */, 18 },
-  /* 4299 */  { MAD_F(0x04443835) /* 0.266655168 */, 18 },
-  /* 4300 */  { MAD_F(0x04448eef) /* 0.266737874 */, 18 },
-  /* 4301 */  { MAD_F(0x0444e5aa) /* 0.266820587 */, 18 },
-  /* 4302 */  { MAD_F(0x04453c66) /* 0.266903306 */, 18 },
-  /* 4303 */  { MAD_F(0x04459325) /* 0.266986031 */, 18 },
-
-  /* 4304 */  { MAD_F(0x0445e9e5) /* 0.267068763 */, 18 },
-  /* 4305 */  { MAD_F(0x044640a7) /* 0.267151501 */, 18 },
-  /* 4306 */  { MAD_F(0x0446976a) /* 0.267234246 */, 18 },
-  /* 4307 */  { MAD_F(0x0446ee30) /* 0.267316997 */, 18 },
-  /* 4308 */  { MAD_F(0x044744f7) /* 0.267399755 */, 18 },
-  /* 4309 */  { MAD_F(0x04479bc0) /* 0.267482518 */, 18 },
-  /* 4310 */  { MAD_F(0x0447f28a) /* 0.267565289 */, 18 },
-  /* 4311 */  { MAD_F(0x04484956) /* 0.267648065 */, 18 },
-  /* 4312 */  { MAD_F(0x0448a024) /* 0.267730848 */, 18 },
-  /* 4313 */  { MAD_F(0x0448f6f4) /* 0.267813638 */, 18 },
-  /* 4314 */  { MAD_F(0x04494dc5) /* 0.267896434 */, 18 },
-  /* 4315 */  { MAD_F(0x0449a498) /* 0.267979236 */, 18 },
-  /* 4316 */  { MAD_F(0x0449fb6d) /* 0.268062045 */, 18 },
-  /* 4317 */  { MAD_F(0x044a5243) /* 0.268144860 */, 18 },
-  /* 4318 */  { MAD_F(0x044aa91c) /* 0.268227681 */, 18 },
-  /* 4319 */  { MAD_F(0x044afff6) /* 0.268310509 */, 18 },
-
-  /* 4320 */  { MAD_F(0x044b56d1) /* 0.268393343 */, 18 },
-  /* 4321 */  { MAD_F(0x044badaf) /* 0.268476184 */, 18 },
-  /* 4322 */  { MAD_F(0x044c048e) /* 0.268559031 */, 18 },
-  /* 4323 */  { MAD_F(0x044c5b6f) /* 0.268641885 */, 18 },
-  /* 4324 */  { MAD_F(0x044cb251) /* 0.268724744 */, 18 },
-  /* 4325 */  { MAD_F(0x044d0935) /* 0.268807611 */, 18 },
-  /* 4326 */  { MAD_F(0x044d601b) /* 0.268890483 */, 18 },
-  /* 4327 */  { MAD_F(0x044db703) /* 0.268973362 */, 18 },
-  /* 4328 */  { MAD_F(0x044e0dec) /* 0.269056248 */, 18 },
-  /* 4329 */  { MAD_F(0x044e64d7) /* 0.269139139 */, 18 },
-  /* 4330 */  { MAD_F(0x044ebbc4) /* 0.269222037 */, 18 },
-  /* 4331 */  { MAD_F(0x044f12b3) /* 0.269304942 */, 18 },
-  /* 4332 */  { MAD_F(0x044f69a3) /* 0.269387853 */, 18 },
-  /* 4333 */  { MAD_F(0x044fc095) /* 0.269470770 */, 18 },
-  /* 4334 */  { MAD_F(0x04501788) /* 0.269553694 */, 18 },
-  /* 4335 */  { MAD_F(0x04506e7e) /* 0.269636624 */, 18 },
-
-  /* 4336 */  { MAD_F(0x0450c575) /* 0.269719560 */, 18 },
-  /* 4337 */  { MAD_F(0x04511c6e) /* 0.269802503 */, 18 },
-  /* 4338 */  { MAD_F(0x04517368) /* 0.269885452 */, 18 },
-  /* 4339 */  { MAD_F(0x0451ca64) /* 0.269968408 */, 18 },
-  /* 4340 */  { MAD_F(0x04522162) /* 0.270051370 */, 18 },
-  /* 4341 */  { MAD_F(0x04527862) /* 0.270134338 */, 18 },
-  /* 4342 */  { MAD_F(0x0452cf63) /* 0.270217312 */, 18 },
-  /* 4343 */  { MAD_F(0x04532666) /* 0.270300293 */, 18 },
-  /* 4344 */  { MAD_F(0x04537d6b) /* 0.270383281 */, 18 },
-  /* 4345 */  { MAD_F(0x0453d472) /* 0.270466275 */, 18 },
-  /* 4346 */  { MAD_F(0x04542b7a) /* 0.270549275 */, 18 },
-  /* 4347 */  { MAD_F(0x04548284) /* 0.270632281 */, 18 },
-  /* 4348 */  { MAD_F(0x0454d98f) /* 0.270715294 */, 18 },
-  /* 4349 */  { MAD_F(0x0455309c) /* 0.270798313 */, 18 },
-  /* 4350 */  { MAD_F(0x045587ab) /* 0.270881339 */, 18 },
-  /* 4351 */  { MAD_F(0x0455debc) /* 0.270964371 */, 18 },
-
-  /* 4352 */  { MAD_F(0x045635cf) /* 0.271047409 */, 18 },
-  /* 4353 */  { MAD_F(0x04568ce3) /* 0.271130454 */, 18 },
-  /* 4354 */  { MAD_F(0x0456e3f9) /* 0.271213505 */, 18 },
-  /* 4355 */  { MAD_F(0x04573b10) /* 0.271296562 */, 18 },
-  /* 4356 */  { MAD_F(0x04579229) /* 0.271379626 */, 18 },
-  /* 4357 */  { MAD_F(0x0457e944) /* 0.271462696 */, 18 },
-  /* 4358 */  { MAD_F(0x04584061) /* 0.271545772 */, 18 },
-  /* 4359 */  { MAD_F(0x0458977f) /* 0.271628855 */, 18 },
-  /* 4360 */  { MAD_F(0x0458ee9f) /* 0.271711944 */, 18 },
-  /* 4361 */  { MAD_F(0x045945c1) /* 0.271795040 */, 18 },
-  /* 4362 */  { MAD_F(0x04599ce5) /* 0.271878142 */, 18 },
-  /* 4363 */  { MAD_F(0x0459f40a) /* 0.271961250 */, 18 },
-  /* 4364 */  { MAD_F(0x045a4b31) /* 0.272044365 */, 18 },
-  /* 4365 */  { MAD_F(0x045aa259) /* 0.272127486 */, 18 },
-  /* 4366 */  { MAD_F(0x045af984) /* 0.272210613 */, 18 },
-  /* 4367 */  { MAD_F(0x045b50b0) /* 0.272293746 */, 18 },
-
-  /* 4368 */  { MAD_F(0x045ba7dd) /* 0.272376886 */, 18 },
-  /* 4369 */  { MAD_F(0x045bff0d) /* 0.272460033 */, 18 },
-  /* 4370 */  { MAD_F(0x045c563e) /* 0.272543185 */, 18 },
-  /* 4371 */  { MAD_F(0x045cad71) /* 0.272626344 */, 18 },
-  /* 4372 */  { MAD_F(0x045d04a5) /* 0.272709510 */, 18 },
-  /* 4373 */  { MAD_F(0x045d5bdc) /* 0.272792681 */, 18 },
-  /* 4374 */  { MAD_F(0x045db313) /* 0.272875859 */, 18 },
-  /* 4375 */  { MAD_F(0x045e0a4d) /* 0.272959044 */, 18 },
-  /* 4376 */  { MAD_F(0x045e6188) /* 0.273042234 */, 18 },
-  /* 4377 */  { MAD_F(0x045eb8c5) /* 0.273125431 */, 18 },
-  /* 4378 */  { MAD_F(0x045f1004) /* 0.273208635 */, 18 },
-  /* 4379 */  { MAD_F(0x045f6745) /* 0.273291844 */, 18 },
-  /* 4380 */  { MAD_F(0x045fbe87) /* 0.273375060 */, 18 },
-  /* 4381 */  { MAD_F(0x046015cb) /* 0.273458283 */, 18 },
-  /* 4382 */  { MAD_F(0x04606d10) /* 0.273541511 */, 18 },
-  /* 4383 */  { MAD_F(0x0460c457) /* 0.273624747 */, 18 },
-
-  /* 4384 */  { MAD_F(0x04611ba0) /* 0.273707988 */, 18 },
-  /* 4385 */  { MAD_F(0x046172eb) /* 0.273791236 */, 18 },
-  /* 4386 */  { MAD_F(0x0461ca37) /* 0.273874490 */, 18 },
-  /* 4387 */  { MAD_F(0x04622185) /* 0.273957750 */, 18 },
-  /* 4388 */  { MAD_F(0x046278d5) /* 0.274041017 */, 18 },
-  /* 4389 */  { MAD_F(0x0462d026) /* 0.274124290 */, 18 },
-  /* 4390 */  { MAD_F(0x0463277a) /* 0.274207569 */, 18 },
-  /* 4391 */  { MAD_F(0x04637ece) /* 0.274290855 */, 18 },
-  /* 4392 */  { MAD_F(0x0463d625) /* 0.274374147 */, 18 },
-  /* 4393 */  { MAD_F(0x04642d7d) /* 0.274457445 */, 18 },
-  /* 4394 */  { MAD_F(0x046484d7) /* 0.274540749 */, 18 },
-  /* 4395 */  { MAD_F(0x0464dc33) /* 0.274624060 */, 18 },
-  /* 4396 */  { MAD_F(0x04653390) /* 0.274707378 */, 18 },
-  /* 4397 */  { MAD_F(0x04658aef) /* 0.274790701 */, 18 },
-  /* 4398 */  { MAD_F(0x0465e250) /* 0.274874031 */, 18 },
-  /* 4399 */  { MAD_F(0x046639b2) /* 0.274957367 */, 18 },
-
-  /* 4400 */  { MAD_F(0x04669116) /* 0.275040710 */, 18 },
-  /* 4401 */  { MAD_F(0x0466e87c) /* 0.275124059 */, 18 },
-  /* 4402 */  { MAD_F(0x04673fe3) /* 0.275207414 */, 18 },
-  /* 4403 */  { MAD_F(0x0467974d) /* 0.275290775 */, 18 },
-  /* 4404 */  { MAD_F(0x0467eeb7) /* 0.275374143 */, 18 },
-  /* 4405 */  { MAD_F(0x04684624) /* 0.275457517 */, 18 },
-  /* 4406 */  { MAD_F(0x04689d92) /* 0.275540897 */, 18 },
-  /* 4407 */  { MAD_F(0x0468f502) /* 0.275624284 */, 18 },
-  /* 4408 */  { MAD_F(0x04694c74) /* 0.275707677 */, 18 },
-  /* 4409 */  { MAD_F(0x0469a3e7) /* 0.275791076 */, 18 },
-  /* 4410 */  { MAD_F(0x0469fb5c) /* 0.275874482 */, 18 },
-  /* 4411 */  { MAD_F(0x046a52d3) /* 0.275957894 */, 18 },
-  /* 4412 */  { MAD_F(0x046aaa4b) /* 0.276041312 */, 18 },
-  /* 4413 */  { MAD_F(0x046b01c5) /* 0.276124737 */, 18 },
-  /* 4414 */  { MAD_F(0x046b5941) /* 0.276208167 */, 18 },
-  /* 4415 */  { MAD_F(0x046bb0bf) /* 0.276291605 */, 18 },
-
-  /* 4416 */  { MAD_F(0x046c083e) /* 0.276375048 */, 18 },
-  /* 4417 */  { MAD_F(0x046c5fbf) /* 0.276458498 */, 18 },
-  /* 4418 */  { MAD_F(0x046cb741) /* 0.276541954 */, 18 },
-  /* 4419 */  { MAD_F(0x046d0ec5) /* 0.276625416 */, 18 },
-  /* 4420 */  { MAD_F(0x046d664b) /* 0.276708885 */, 18 },
-  /* 4421 */  { MAD_F(0x046dbdd3) /* 0.276792360 */, 18 },
-  /* 4422 */  { MAD_F(0x046e155c) /* 0.276875841 */, 18 },
-  /* 4423 */  { MAD_F(0x046e6ce7) /* 0.276959328 */, 18 },
-  /* 4424 */  { MAD_F(0x046ec474) /* 0.277042822 */, 18 },
-  /* 4425 */  { MAD_F(0x046f1c02) /* 0.277126322 */, 18 },
-  /* 4426 */  { MAD_F(0x046f7392) /* 0.277209829 */, 18 },
-  /* 4427 */  { MAD_F(0x046fcb24) /* 0.277293341 */, 18 },
-  /* 4428 */  { MAD_F(0x047022b8) /* 0.277376860 */, 18 },
-  /* 4429 */  { MAD_F(0x04707a4d) /* 0.277460385 */, 18 },
-  /* 4430 */  { MAD_F(0x0470d1e4) /* 0.277543917 */, 18 },
-  /* 4431 */  { MAD_F(0x0471297c) /* 0.277627455 */, 18 },
-
-  /* 4432 */  { MAD_F(0x04718116) /* 0.277710999 */, 18 },
-  /* 4433 */  { MAD_F(0x0471d8b2) /* 0.277794549 */, 18 },
-  /* 4434 */  { MAD_F(0x04723050) /* 0.277878106 */, 18 },
-  /* 4435 */  { MAD_F(0x047287ef) /* 0.277961669 */, 18 },
-  /* 4436 */  { MAD_F(0x0472df90) /* 0.278045238 */, 18 },
-  /* 4437 */  { MAD_F(0x04733733) /* 0.278128813 */, 18 },
-  /* 4438 */  { MAD_F(0x04738ed7) /* 0.278212395 */, 18 },
-  /* 4439 */  { MAD_F(0x0473e67d) /* 0.278295983 */, 18 },
-  /* 4440 */  { MAD_F(0x04743e25) /* 0.278379578 */, 18 },
-  /* 4441 */  { MAD_F(0x047495ce) /* 0.278463178 */, 18 },
-  /* 4442 */  { MAD_F(0x0474ed79) /* 0.278546785 */, 18 },
-  /* 4443 */  { MAD_F(0x04754526) /* 0.278630398 */, 18 },
-  /* 4444 */  { MAD_F(0x04759cd4) /* 0.278714018 */, 18 },
-  /* 4445 */  { MAD_F(0x0475f484) /* 0.278797643 */, 18 },
-  /* 4446 */  { MAD_F(0x04764c36) /* 0.278881275 */, 18 },
-  /* 4447 */  { MAD_F(0x0476a3ea) /* 0.278964914 */, 18 },
-
-  /* 4448 */  { MAD_F(0x0476fb9f) /* 0.279048558 */, 18 },
-  /* 4449 */  { MAD_F(0x04775356) /* 0.279132209 */, 18 },
-  /* 4450 */  { MAD_F(0x0477ab0e) /* 0.279215866 */, 18 },
-  /* 4451 */  { MAD_F(0x047802c8) /* 0.279299529 */, 18 },
-  /* 4452 */  { MAD_F(0x04785a84) /* 0.279383199 */, 18 },
-  /* 4453 */  { MAD_F(0x0478b242) /* 0.279466875 */, 18 },
-  /* 4454 */  { MAD_F(0x04790a01) /* 0.279550557 */, 18 },
-  /* 4455 */  { MAD_F(0x047961c2) /* 0.279634245 */, 18 },
-  /* 4456 */  { MAD_F(0x0479b984) /* 0.279717940 */, 18 },
-  /* 4457 */  { MAD_F(0x047a1149) /* 0.279801641 */, 18 },
-  /* 4458 */  { MAD_F(0x047a690f) /* 0.279885348 */, 18 },
-  /* 4459 */  { MAD_F(0x047ac0d6) /* 0.279969061 */, 18 },
-  /* 4460 */  { MAD_F(0x047b18a0) /* 0.280052781 */, 18 },
-  /* 4461 */  { MAD_F(0x047b706b) /* 0.280136507 */, 18 },
-  /* 4462 */  { MAD_F(0x047bc837) /* 0.280220239 */, 18 },
-  /* 4463 */  { MAD_F(0x047c2006) /* 0.280303978 */, 18 },
-
-  /* 4464 */  { MAD_F(0x047c77d6) /* 0.280387722 */, 18 },
-  /* 4465 */  { MAD_F(0x047ccfa8) /* 0.280471473 */, 18 },
-  /* 4466 */  { MAD_F(0x047d277b) /* 0.280555230 */, 18 },
-  /* 4467 */  { MAD_F(0x047d7f50) /* 0.280638994 */, 18 },
-  /* 4468 */  { MAD_F(0x047dd727) /* 0.280722764 */, 18 },
-  /* 4469 */  { MAD_F(0x047e2eff) /* 0.280806540 */, 18 },
-  /* 4470 */  { MAD_F(0x047e86d9) /* 0.280890322 */, 18 },
-  /* 4471 */  { MAD_F(0x047edeb5) /* 0.280974110 */, 18 },
-  /* 4472 */  { MAD_F(0x047f3693) /* 0.281057905 */, 18 },
-  /* 4473 */  { MAD_F(0x047f8e72) /* 0.281141706 */, 18 },
-  /* 4474 */  { MAD_F(0x047fe653) /* 0.281225513 */, 18 },
-  /* 4475 */  { MAD_F(0x04803e35) /* 0.281309326 */, 18 },
-  /* 4476 */  { MAD_F(0x04809619) /* 0.281393146 */, 18 },
-  /* 4477 */  { MAD_F(0x0480edff) /* 0.281476972 */, 18 },
-  /* 4478 */  { MAD_F(0x048145e7) /* 0.281560804 */, 18 },
-  /* 4479 */  { MAD_F(0x04819dd0) /* 0.281644643 */, 18 },
-
-  /* 4480 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 18 },
-  /* 4481 */  { MAD_F(0x04824da7) /* 0.281812338 */, 18 },
-  /* 4482 */  { MAD_F(0x0482a595) /* 0.281896195 */, 18 },
-  /* 4483 */  { MAD_F(0x0482fd85) /* 0.281980059 */, 18 },
-  /* 4484 */  { MAD_F(0x04835577) /* 0.282063928 */, 18 },
-  /* 4485 */  { MAD_F(0x0483ad6a) /* 0.282147804 */, 18 },
-  /* 4486 */  { MAD_F(0x0484055f) /* 0.282231686 */, 18 },
-  /* 4487 */  { MAD_F(0x04845d56) /* 0.282315574 */, 18 },
-  /* 4488 */  { MAD_F(0x0484b54e) /* 0.282399469 */, 18 },
-  /* 4489 */  { MAD_F(0x04850d48) /* 0.282483370 */, 18 },
-  /* 4490 */  { MAD_F(0x04856544) /* 0.282567277 */, 18 },
-  /* 4491 */  { MAD_F(0x0485bd41) /* 0.282651190 */, 18 },
-  /* 4492 */  { MAD_F(0x04861540) /* 0.282735109 */, 18 },
-  /* 4493 */  { MAD_F(0x04866d40) /* 0.282819035 */, 18 },
-  /* 4494 */  { MAD_F(0x0486c543) /* 0.282902967 */, 18 },
-  /* 4495 */  { MAD_F(0x04871d47) /* 0.282986905 */, 18 },
-
-  /* 4496 */  { MAD_F(0x0487754c) /* 0.283070849 */, 18 },
-  /* 4497 */  { MAD_F(0x0487cd54) /* 0.283154800 */, 18 },
-  /* 4498 */  { MAD_F(0x0488255d) /* 0.283238757 */, 18 },
-  /* 4499 */  { MAD_F(0x04887d67) /* 0.283322720 */, 18 },
-  /* 4500 */  { MAD_F(0x0488d574) /* 0.283406689 */, 18 },
-  /* 4501 */  { MAD_F(0x04892d82) /* 0.283490665 */, 18 },
-  /* 4502 */  { MAD_F(0x04898591) /* 0.283574646 */, 18 },
-  /* 4503 */  { MAD_F(0x0489dda3) /* 0.283658634 */, 18 },
-  /* 4504 */  { MAD_F(0x048a35b6) /* 0.283742628 */, 18 },
-  /* 4505 */  { MAD_F(0x048a8dca) /* 0.283826629 */, 18 },
-  /* 4506 */  { MAD_F(0x048ae5e1) /* 0.283910635 */, 18 },
-  /* 4507 */  { MAD_F(0x048b3df9) /* 0.283994648 */, 18 },
-  /* 4508 */  { MAD_F(0x048b9612) /* 0.284078667 */, 18 },
-  /* 4509 */  { MAD_F(0x048bee2e) /* 0.284162692 */, 18 },
-  /* 4510 */  { MAD_F(0x048c464b) /* 0.284246723 */, 18 },
-  /* 4511 */  { MAD_F(0x048c9e69) /* 0.284330761 */, 18 },
-
-  /* 4512 */  { MAD_F(0x048cf68a) /* 0.284414805 */, 18 },
-  /* 4513 */  { MAD_F(0x048d4eac) /* 0.284498855 */, 18 },
-  /* 4514 */  { MAD_F(0x048da6cf) /* 0.284582911 */, 18 },
-  /* 4515 */  { MAD_F(0x048dfef5) /* 0.284666974 */, 18 },
-  /* 4516 */  { MAD_F(0x048e571c) /* 0.284751042 */, 18 },
-  /* 4517 */  { MAD_F(0x048eaf44) /* 0.284835117 */, 18 },
-  /* 4518 */  { MAD_F(0x048f076f) /* 0.284919198 */, 18 },
-  /* 4519 */  { MAD_F(0x048f5f9b) /* 0.285003285 */, 18 },
-  /* 4520 */  { MAD_F(0x048fb7c8) /* 0.285087379 */, 18 },
-  /* 4521 */  { MAD_F(0x04900ff8) /* 0.285171479 */, 18 },
-  /* 4522 */  { MAD_F(0x04906829) /* 0.285255584 */, 18 },
-  /* 4523 */  { MAD_F(0x0490c05b) /* 0.285339697 */, 18 },
-  /* 4524 */  { MAD_F(0x04911890) /* 0.285423815 */, 18 },
-  /* 4525 */  { MAD_F(0x049170c6) /* 0.285507939 */, 18 },
-  /* 4526 */  { MAD_F(0x0491c8fd) /* 0.285592070 */, 18 },
-  /* 4527 */  { MAD_F(0x04922137) /* 0.285676207 */, 18 },
-
-  /* 4528 */  { MAD_F(0x04927972) /* 0.285760350 */, 18 },
-  /* 4529 */  { MAD_F(0x0492d1ae) /* 0.285844499 */, 18 },
-  /* 4530 */  { MAD_F(0x049329ed) /* 0.285928655 */, 18 },
-  /* 4531 */  { MAD_F(0x0493822c) /* 0.286012816 */, 18 },
-  /* 4532 */  { MAD_F(0x0493da6e) /* 0.286096984 */, 18 },
-  /* 4533 */  { MAD_F(0x049432b1) /* 0.286181158 */, 18 },
-  /* 4534 */  { MAD_F(0x04948af6) /* 0.286265338 */, 18 },
-  /* 4535 */  { MAD_F(0x0494e33d) /* 0.286349525 */, 18 },
-  /* 4536 */  { MAD_F(0x04953b85) /* 0.286433717 */, 18 },
-  /* 4537 */  { MAD_F(0x049593cf) /* 0.286517916 */, 18 },
-  /* 4538 */  { MAD_F(0x0495ec1b) /* 0.286602121 */, 18 },
-  /* 4539 */  { MAD_F(0x04964468) /* 0.286686332 */, 18 },
-  /* 4540 */  { MAD_F(0x04969cb7) /* 0.286770550 */, 18 },
-  /* 4541 */  { MAD_F(0x0496f508) /* 0.286854773 */, 18 },
-  /* 4542 */  { MAD_F(0x04974d5a) /* 0.286939003 */, 18 },
-  /* 4543 */  { MAD_F(0x0497a5ae) /* 0.287023239 */, 18 },
-
-  /* 4544 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 18 },
-  /* 4545 */  { MAD_F(0x0498565a) /* 0.287191729 */, 18 },
-  /* 4546 */  { MAD_F(0x0498aeb3) /* 0.287275983 */, 18 },
-  /* 4547 */  { MAD_F(0x0499070e) /* 0.287360244 */, 18 },
-  /* 4548 */  { MAD_F(0x04995f6a) /* 0.287444511 */, 18 },
-  /* 4549 */  { MAD_F(0x0499b7c8) /* 0.287528784 */, 18 },
-  /* 4550 */  { MAD_F(0x049a1027) /* 0.287613063 */, 18 },
-  /* 4551 */  { MAD_F(0x049a6889) /* 0.287697348 */, 18 },
-  /* 4552 */  { MAD_F(0x049ac0eb) /* 0.287781640 */, 18 },
-  /* 4553 */  { MAD_F(0x049b1950) /* 0.287865937 */, 18 },
-  /* 4554 */  { MAD_F(0x049b71b6) /* 0.287950241 */, 18 },
-  /* 4555 */  { MAD_F(0x049bca1e) /* 0.288034551 */, 18 },
-  /* 4556 */  { MAD_F(0x049c2287) /* 0.288118867 */, 18 },
-  /* 4557 */  { MAD_F(0x049c7af2) /* 0.288203190 */, 18 },
-  /* 4558 */  { MAD_F(0x049cd35f) /* 0.288287518 */, 18 },
-  /* 4559 */  { MAD_F(0x049d2bce) /* 0.288371853 */, 18 },
-
-  /* 4560 */  { MAD_F(0x049d843e) /* 0.288456194 */, 18 },
-  /* 4561 */  { MAD_F(0x049ddcaf) /* 0.288540541 */, 18 },
-  /* 4562 */  { MAD_F(0x049e3523) /* 0.288624894 */, 18 },
-  /* 4563 */  { MAD_F(0x049e8d98) /* 0.288709253 */, 18 },
-  /* 4564 */  { MAD_F(0x049ee60e) /* 0.288793619 */, 18 },
-  /* 4565 */  { MAD_F(0x049f3e87) /* 0.288877990 */, 18 },
-  /* 4566 */  { MAD_F(0x049f9701) /* 0.288962368 */, 18 },
-  /* 4567 */  { MAD_F(0x049fef7c) /* 0.289046752 */, 18 },
-  /* 4568 */  { MAD_F(0x04a047fa) /* 0.289131142 */, 18 },
-  /* 4569 */  { MAD_F(0x04a0a079) /* 0.289215538 */, 18 },
-  /* 4570 */  { MAD_F(0x04a0f8f9) /* 0.289299941 */, 18 },
-  /* 4571 */  { MAD_F(0x04a1517c) /* 0.289384349 */, 18 },
-  /* 4572 */  { MAD_F(0x04a1a9ff) /* 0.289468764 */, 18 },
-  /* 4573 */  { MAD_F(0x04a20285) /* 0.289553185 */, 18 },
-  /* 4574 */  { MAD_F(0x04a25b0c) /* 0.289637612 */, 18 },
-  /* 4575 */  { MAD_F(0x04a2b395) /* 0.289722045 */, 18 },
-
-  /* 4576 */  { MAD_F(0x04a30c20) /* 0.289806485 */, 18 },
-  /* 4577 */  { MAD_F(0x04a364ac) /* 0.289890930 */, 18 },
-  /* 4578 */  { MAD_F(0x04a3bd3a) /* 0.289975382 */, 18 },
-  /* 4579 */  { MAD_F(0x04a415c9) /* 0.290059840 */, 18 },
-  /* 4580 */  { MAD_F(0x04a46e5a) /* 0.290144304 */, 18 },
-  /* 4581 */  { MAD_F(0x04a4c6ed) /* 0.290228774 */, 18 },
-  /* 4582 */  { MAD_F(0x04a51f81) /* 0.290313250 */, 18 },
-  /* 4583 */  { MAD_F(0x04a57818) /* 0.290397733 */, 18 },
-  /* 4584 */  { MAD_F(0x04a5d0af) /* 0.290482221 */, 18 },
-  /* 4585 */  { MAD_F(0x04a62949) /* 0.290566716 */, 18 },
-  /* 4586 */  { MAD_F(0x04a681e4) /* 0.290651217 */, 18 },
-  /* 4587 */  { MAD_F(0x04a6da80) /* 0.290735724 */, 18 },
-  /* 4588 */  { MAD_F(0x04a7331f) /* 0.290820237 */, 18 },
-  /* 4589 */  { MAD_F(0x04a78bbf) /* 0.290904756 */, 18 },
-  /* 4590 */  { MAD_F(0x04a7e460) /* 0.290989281 */, 18 },
-  /* 4591 */  { MAD_F(0x04a83d03) /* 0.291073813 */, 18 },
-
-  /* 4592 */  { MAD_F(0x04a895a8) /* 0.291158351 */, 18 },
-  /* 4593 */  { MAD_F(0x04a8ee4f) /* 0.291242894 */, 18 },
-  /* 4594 */  { MAD_F(0x04a946f7) /* 0.291327444 */, 18 },
-  /* 4595 */  { MAD_F(0x04a99fa1) /* 0.291412001 */, 18 },
-  /* 4596 */  { MAD_F(0x04a9f84c) /* 0.291496563 */, 18 },
-  /* 4597 */  { MAD_F(0x04aa50fa) /* 0.291581131 */, 18 },
-  /* 4598 */  { MAD_F(0x04aaa9a8) /* 0.291665706 */, 18 },
-  /* 4599 */  { MAD_F(0x04ab0259) /* 0.291750286 */, 18 },
-  /* 4600 */  { MAD_F(0x04ab5b0b) /* 0.291834873 */, 18 },
-  /* 4601 */  { MAD_F(0x04abb3bf) /* 0.291919466 */, 18 },
-  /* 4602 */  { MAD_F(0x04ac0c74) /* 0.292004065 */, 18 },
-  /* 4603 */  { MAD_F(0x04ac652b) /* 0.292088670 */, 18 },
-  /* 4604 */  { MAD_F(0x04acbde4) /* 0.292173281 */, 18 },
-  /* 4605 */  { MAD_F(0x04ad169e) /* 0.292257899 */, 18 },
-  /* 4606 */  { MAD_F(0x04ad6f5a) /* 0.292342522 */, 18 },
-  /* 4607 */  { MAD_F(0x04adc818) /* 0.292427152 */, 18 },
-
-  /* 4608 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 18 },
-  /* 4609 */  { MAD_F(0x04ae7998) /* 0.292596430 */, 18 },
-  /* 4610 */  { MAD_F(0x04aed25a) /* 0.292681078 */, 18 },
-  /* 4611 */  { MAD_F(0x04af2b1e) /* 0.292765732 */, 18 },
-  /* 4612 */  { MAD_F(0x04af83e4) /* 0.292850392 */, 18 },
-  /* 4613 */  { MAD_F(0x04afdcac) /* 0.292935058 */, 18 },
-  /* 4614 */  { MAD_F(0x04b03575) /* 0.293019731 */, 18 },
-  /* 4615 */  { MAD_F(0x04b08e40) /* 0.293104409 */, 18 },
-  /* 4616 */  { MAD_F(0x04b0e70c) /* 0.293189094 */, 18 },
-  /* 4617 */  { MAD_F(0x04b13fda) /* 0.293273785 */, 18 },
-  /* 4618 */  { MAD_F(0x04b198aa) /* 0.293358482 */, 18 },
-  /* 4619 */  { MAD_F(0x04b1f17b) /* 0.293443185 */, 18 },
-  /* 4620 */  { MAD_F(0x04b24a4e) /* 0.293527894 */, 18 },
-  /* 4621 */  { MAD_F(0x04b2a322) /* 0.293612609 */, 18 },
-  /* 4622 */  { MAD_F(0x04b2fbf9) /* 0.293697331 */, 18 },
-  /* 4623 */  { MAD_F(0x04b354d1) /* 0.293782058 */, 18 },
-
-  /* 4624 */  { MAD_F(0x04b3adaa) /* 0.293866792 */, 18 },
-  /* 4625 */  { MAD_F(0x04b40685) /* 0.293951532 */, 18 },
-  /* 4626 */  { MAD_F(0x04b45f62) /* 0.294036278 */, 18 },
-  /* 4627 */  { MAD_F(0x04b4b840) /* 0.294121029 */, 18 },
-  /* 4628 */  { MAD_F(0x04b51120) /* 0.294205788 */, 18 },
-  /* 4629 */  { MAD_F(0x04b56a02) /* 0.294290552 */, 18 },
-  /* 4630 */  { MAD_F(0x04b5c2e6) /* 0.294375322 */, 18 },
-  /* 4631 */  { MAD_F(0x04b61bcb) /* 0.294460098 */, 18 },
-  /* 4632 */  { MAD_F(0x04b674b1) /* 0.294544881 */, 18 },
-  /* 4633 */  { MAD_F(0x04b6cd99) /* 0.294629669 */, 18 },
-  /* 4634 */  { MAD_F(0x04b72683) /* 0.294714464 */, 18 },
-  /* 4635 */  { MAD_F(0x04b77f6f) /* 0.294799265 */, 18 },
-  /* 4636 */  { MAD_F(0x04b7d85c) /* 0.294884072 */, 18 },
-  /* 4637 */  { MAD_F(0x04b8314b) /* 0.294968885 */, 18 },
-  /* 4638 */  { MAD_F(0x04b88a3b) /* 0.295053704 */, 18 },
-  /* 4639 */  { MAD_F(0x04b8e32d) /* 0.295138529 */, 18 },
-
-  /* 4640 */  { MAD_F(0x04b93c21) /* 0.295223360 */, 18 },
-  /* 4641 */  { MAD_F(0x04b99516) /* 0.295308197 */, 18 },
-  /* 4642 */  { MAD_F(0x04b9ee0d) /* 0.295393041 */, 18 },
-  /* 4643 */  { MAD_F(0x04ba4706) /* 0.295477890 */, 18 },
-  /* 4644 */  { MAD_F(0x04baa000) /* 0.295562746 */, 18 },
-  /* 4645 */  { MAD_F(0x04baf8fc) /* 0.295647608 */, 18 },
-  /* 4646 */  { MAD_F(0x04bb51fa) /* 0.295732476 */, 18 },
-  /* 4647 */  { MAD_F(0x04bbaaf9) /* 0.295817349 */, 18 },
-  /* 4648 */  { MAD_F(0x04bc03fa) /* 0.295902229 */, 18 },
-  /* 4649 */  { MAD_F(0x04bc5cfc) /* 0.295987115 */, 18 },
-  /* 4650 */  { MAD_F(0x04bcb600) /* 0.296072008 */, 18 },
-  /* 4651 */  { MAD_F(0x04bd0f06) /* 0.296156906 */, 18 },
-  /* 4652 */  { MAD_F(0x04bd680d) /* 0.296241810 */, 18 },
-  /* 4653 */  { MAD_F(0x04bdc116) /* 0.296326721 */, 18 },
-  /* 4654 */  { MAD_F(0x04be1a21) /* 0.296411637 */, 18 },
-  /* 4655 */  { MAD_F(0x04be732d) /* 0.296496560 */, 18 },
-
-  /* 4656 */  { MAD_F(0x04becc3b) /* 0.296581488 */, 18 },
-  /* 4657 */  { MAD_F(0x04bf254a) /* 0.296666423 */, 18 },
-  /* 4658 */  { MAD_F(0x04bf7e5b) /* 0.296751364 */, 18 },
-  /* 4659 */  { MAD_F(0x04bfd76e) /* 0.296836311 */, 18 },
-  /* 4660 */  { MAD_F(0x04c03083) /* 0.296921264 */, 18 },
-  /* 4661 */  { MAD_F(0x04c08999) /* 0.297006223 */, 18 },
-  /* 4662 */  { MAD_F(0x04c0e2b0) /* 0.297091188 */, 18 },
-  /* 4663 */  { MAD_F(0x04c13bca) /* 0.297176159 */, 18 },
-  /* 4664 */  { MAD_F(0x04c194e4) /* 0.297261136 */, 18 },
-  /* 4665 */  { MAD_F(0x04c1ee01) /* 0.297346120 */, 18 },
-  /* 4666 */  { MAD_F(0x04c2471f) /* 0.297431109 */, 18 },
-  /* 4667 */  { MAD_F(0x04c2a03f) /* 0.297516105 */, 18 },
-  /* 4668 */  { MAD_F(0x04c2f960) /* 0.297601106 */, 18 },
-  /* 4669 */  { MAD_F(0x04c35283) /* 0.297686114 */, 18 },
-  /* 4670 */  { MAD_F(0x04c3aba8) /* 0.297771128 */, 18 },
-  /* 4671 */  { MAD_F(0x04c404ce) /* 0.297856147 */, 18 },
-
-  /* 4672 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 18 },
-  /* 4673 */  { MAD_F(0x04c4b720) /* 0.298026205 */, 18 },
-  /* 4674 */  { MAD_F(0x04c5104b) /* 0.298111243 */, 18 },
-  /* 4675 */  { MAD_F(0x04c56978) /* 0.298196287 */, 18 },
-  /* 4676 */  { MAD_F(0x04c5c2a7) /* 0.298281337 */, 18 },
-  /* 4677 */  { MAD_F(0x04c61bd7) /* 0.298366393 */, 18 },
-  /* 4678 */  { MAD_F(0x04c67508) /* 0.298451456 */, 18 },
-  /* 4679 */  { MAD_F(0x04c6ce3c) /* 0.298536524 */, 18 },
-  /* 4680 */  { MAD_F(0x04c72771) /* 0.298621598 */, 18 },
-  /* 4681 */  { MAD_F(0x04c780a7) /* 0.298706679 */, 18 },
-  /* 4682 */  { MAD_F(0x04c7d9df) /* 0.298791765 */, 18 },
-  /* 4683 */  { MAD_F(0x04c83319) /* 0.298876858 */, 18 },
-  /* 4684 */  { MAD_F(0x04c88c55) /* 0.298961956 */, 18 },
-  /* 4685 */  { MAD_F(0x04c8e592) /* 0.299047061 */, 18 },
-  /* 4686 */  { MAD_F(0x04c93ed1) /* 0.299132172 */, 18 },
-  /* 4687 */  { MAD_F(0x04c99811) /* 0.299217288 */, 18 },
-
-  /* 4688 */  { MAD_F(0x04c9f153) /* 0.299302411 */, 18 },
-  /* 4689 */  { MAD_F(0x04ca4a97) /* 0.299387540 */, 18 },
-  /* 4690 */  { MAD_F(0x04caa3dc) /* 0.299472675 */, 18 },
-  /* 4691 */  { MAD_F(0x04cafd23) /* 0.299557816 */, 18 },
-  /* 4692 */  { MAD_F(0x04cb566b) /* 0.299642963 */, 18 },
-  /* 4693 */  { MAD_F(0x04cbafb5) /* 0.299728116 */, 18 },
-  /* 4694 */  { MAD_F(0x04cc0901) /* 0.299813275 */, 18 },
-  /* 4695 */  { MAD_F(0x04cc624e) /* 0.299898440 */, 18 },
-  /* 4696 */  { MAD_F(0x04ccbb9d) /* 0.299983611 */, 18 },
-  /* 4697 */  { MAD_F(0x04cd14ee) /* 0.300068789 */, 18 },
-  /* 4698 */  { MAD_F(0x04cd6e40) /* 0.300153972 */, 18 },
-  /* 4699 */  { MAD_F(0x04cdc794) /* 0.300239161 */, 18 },
-  /* 4700 */  { MAD_F(0x04ce20e9) /* 0.300324357 */, 18 },
-  /* 4701 */  { MAD_F(0x04ce7a40) /* 0.300409558 */, 18 },
-  /* 4702 */  { MAD_F(0x04ced399) /* 0.300494765 */, 18 },
-  /* 4703 */  { MAD_F(0x04cf2cf3) /* 0.300579979 */, 18 },
-
-  /* 4704 */  { MAD_F(0x04cf864f) /* 0.300665198 */, 18 },
-  /* 4705 */  { MAD_F(0x04cfdfad) /* 0.300750424 */, 18 },
-  /* 4706 */  { MAD_F(0x04d0390c) /* 0.300835656 */, 18 },
-  /* 4707 */  { MAD_F(0x04d0926d) /* 0.300920893 */, 18 },
-  /* 4708 */  { MAD_F(0x04d0ebcf) /* 0.301006137 */, 18 },
-  /* 4709 */  { MAD_F(0x04d14533) /* 0.301091387 */, 18 },
-  /* 4710 */  { MAD_F(0x04d19e99) /* 0.301176643 */, 18 },
-  /* 4711 */  { MAD_F(0x04d1f800) /* 0.301261904 */, 18 },
-  /* 4712 */  { MAD_F(0x04d25169) /* 0.301347172 */, 18 },
-  /* 4713 */  { MAD_F(0x04d2aad4) /* 0.301432446 */, 18 },
-  /* 4714 */  { MAD_F(0x04d30440) /* 0.301517726 */, 18 },
-  /* 4715 */  { MAD_F(0x04d35dae) /* 0.301603012 */, 18 },
-  /* 4716 */  { MAD_F(0x04d3b71d) /* 0.301688304 */, 18 },
-  /* 4717 */  { MAD_F(0x04d4108e) /* 0.301773602 */, 18 },
-  /* 4718 */  { MAD_F(0x04d46a01) /* 0.301858906 */, 18 },
-  /* 4719 */  { MAD_F(0x04d4c375) /* 0.301944216 */, 18 },
-
-  /* 4720 */  { MAD_F(0x04d51ceb) /* 0.302029532 */, 18 },
-  /* 4721 */  { MAD_F(0x04d57662) /* 0.302114854 */, 18 },
-  /* 4722 */  { MAD_F(0x04d5cfdb) /* 0.302200182 */, 18 },
-  /* 4723 */  { MAD_F(0x04d62956) /* 0.302285516 */, 18 },
-  /* 4724 */  { MAD_F(0x04d682d2) /* 0.302370856 */, 18 },
-  /* 4725 */  { MAD_F(0x04d6dc50) /* 0.302456203 */, 18 },
-  /* 4726 */  { MAD_F(0x04d735d0) /* 0.302541555 */, 18 },
-  /* 4727 */  { MAD_F(0x04d78f51) /* 0.302626913 */, 18 },
-  /* 4728 */  { MAD_F(0x04d7e8d4) /* 0.302712277 */, 18 },
-  /* 4729 */  { MAD_F(0x04d84258) /* 0.302797648 */, 18 },
-  /* 4730 */  { MAD_F(0x04d89bde) /* 0.302883024 */, 18 },
-  /* 4731 */  { MAD_F(0x04d8f566) /* 0.302968406 */, 18 },
-  /* 4732 */  { MAD_F(0x04d94eef) /* 0.303053794 */, 18 },
-  /* 4733 */  { MAD_F(0x04d9a87a) /* 0.303139189 */, 18 },
-  /* 4734 */  { MAD_F(0x04da0207) /* 0.303224589 */, 18 },
-  /* 4735 */  { MAD_F(0x04da5b95) /* 0.303309995 */, 18 },
-
-  /* 4736 */  { MAD_F(0x04dab524) /* 0.303395408 */, 18 },
-  /* 4737 */  { MAD_F(0x04db0eb6) /* 0.303480826 */, 18 },
-  /* 4738 */  { MAD_F(0x04db6849) /* 0.303566251 */, 18 },
-  /* 4739 */  { MAD_F(0x04dbc1dd) /* 0.303651681 */, 18 },
-  /* 4740 */  { MAD_F(0x04dc1b73) /* 0.303737117 */, 18 },
-  /* 4741 */  { MAD_F(0x04dc750b) /* 0.303822560 */, 18 },
-  /* 4742 */  { MAD_F(0x04dccea5) /* 0.303908008 */, 18 },
-  /* 4743 */  { MAD_F(0x04dd2840) /* 0.303993463 */, 18 },
-  /* 4744 */  { MAD_F(0x04dd81dc) /* 0.304078923 */, 18 },
-  /* 4745 */  { MAD_F(0x04dddb7a) /* 0.304164390 */, 18 },
-  /* 4746 */  { MAD_F(0x04de351a) /* 0.304249862 */, 18 },
-  /* 4747 */  { MAD_F(0x04de8ebc) /* 0.304335340 */, 18 },
-  /* 4748 */  { MAD_F(0x04dee85f) /* 0.304420825 */, 18 },
-  /* 4749 */  { MAD_F(0x04df4203) /* 0.304506315 */, 18 },
-  /* 4750 */  { MAD_F(0x04df9baa) /* 0.304591812 */, 18 },
-  /* 4751 */  { MAD_F(0x04dff552) /* 0.304677314 */, 18 },
-
-  /* 4752 */  { MAD_F(0x04e04efb) /* 0.304762823 */, 18 },
-  /* 4753 */  { MAD_F(0x04e0a8a6) /* 0.304848337 */, 18 },
-  /* 4754 */  { MAD_F(0x04e10253) /* 0.304933858 */, 18 },
-  /* 4755 */  { MAD_F(0x04e15c01) /* 0.305019384 */, 18 },
-  /* 4756 */  { MAD_F(0x04e1b5b1) /* 0.305104917 */, 18 },
-  /* 4757 */  { MAD_F(0x04e20f63) /* 0.305190455 */, 18 },
-  /* 4758 */  { MAD_F(0x04e26916) /* 0.305275999 */, 18 },
-  /* 4759 */  { MAD_F(0x04e2c2cb) /* 0.305361550 */, 18 },
-  /* 4760 */  { MAD_F(0x04e31c81) /* 0.305447106 */, 18 },
-  /* 4761 */  { MAD_F(0x04e37639) /* 0.305532669 */, 18 },
-  /* 4762 */  { MAD_F(0x04e3cff3) /* 0.305618237 */, 18 },
-  /* 4763 */  { MAD_F(0x04e429ae) /* 0.305703811 */, 18 },
-  /* 4764 */  { MAD_F(0x04e4836b) /* 0.305789392 */, 18 },
-  /* 4765 */  { MAD_F(0x04e4dd29) /* 0.305874978 */, 18 },
-  /* 4766 */  { MAD_F(0x04e536e9) /* 0.305960571 */, 18 },
-  /* 4767 */  { MAD_F(0x04e590ab) /* 0.306046169 */, 18 },
-
-  /* 4768 */  { MAD_F(0x04e5ea6e) /* 0.306131773 */, 18 },
-  /* 4769 */  { MAD_F(0x04e64433) /* 0.306217383 */, 18 },
-  /* 4770 */  { MAD_F(0x04e69df9) /* 0.306303000 */, 18 },
-  /* 4771 */  { MAD_F(0x04e6f7c1) /* 0.306388622 */, 18 },
-  /* 4772 */  { MAD_F(0x04e7518b) /* 0.306474250 */, 18 },
-  /* 4773 */  { MAD_F(0x04e7ab56) /* 0.306559885 */, 18 },
-  /* 4774 */  { MAD_F(0x04e80523) /* 0.306645525 */, 18 },
-  /* 4775 */  { MAD_F(0x04e85ef2) /* 0.306731171 */, 18 },
-  /* 4776 */  { MAD_F(0x04e8b8c2) /* 0.306816823 */, 18 },
-  /* 4777 */  { MAD_F(0x04e91293) /* 0.306902481 */, 18 },
-  /* 4778 */  { MAD_F(0x04e96c67) /* 0.306988145 */, 18 },
-  /* 4779 */  { MAD_F(0x04e9c63b) /* 0.307073816 */, 18 },
-  /* 4780 */  { MAD_F(0x04ea2012) /* 0.307159492 */, 18 },
-  /* 4781 */  { MAD_F(0x04ea79ea) /* 0.307245174 */, 18 },
-  /* 4782 */  { MAD_F(0x04ead3c4) /* 0.307330862 */, 18 },
-  /* 4783 */  { MAD_F(0x04eb2d9f) /* 0.307416556 */, 18 },
-
-  /* 4784 */  { MAD_F(0x04eb877c) /* 0.307502256 */, 18 },
-  /* 4785 */  { MAD_F(0x04ebe15b) /* 0.307587962 */, 18 },
-  /* 4786 */  { MAD_F(0x04ec3b3b) /* 0.307673674 */, 18 },
-  /* 4787 */  { MAD_F(0x04ec951c) /* 0.307759392 */, 18 },
-  /* 4788 */  { MAD_F(0x04ecef00) /* 0.307845115 */, 18 },
-  /* 4789 */  { MAD_F(0x04ed48e5) /* 0.307930845 */, 18 },
-  /* 4790 */  { MAD_F(0x04eda2cb) /* 0.308016581 */, 18 },
-  /* 4791 */  { MAD_F(0x04edfcb3) /* 0.308102323 */, 18 },
-  /* 4792 */  { MAD_F(0x04ee569d) /* 0.308188071 */, 18 },
-  /* 4793 */  { MAD_F(0x04eeb088) /* 0.308273824 */, 18 },
-  /* 4794 */  { MAD_F(0x04ef0a75) /* 0.308359584 */, 18 },
-  /* 4795 */  { MAD_F(0x04ef6464) /* 0.308445350 */, 18 },
-  /* 4796 */  { MAD_F(0x04efbe54) /* 0.308531121 */, 18 },
-  /* 4797 */  { MAD_F(0x04f01846) /* 0.308616899 */, 18 },
-  /* 4798 */  { MAD_F(0x04f07239) /* 0.308702682 */, 18 },
-  /* 4799 */  { MAD_F(0x04f0cc2e) /* 0.308788472 */, 18 },
-
-  /* 4800 */  { MAD_F(0x04f12624) /* 0.308874267 */, 18 },
-  /* 4801 */  { MAD_F(0x04f1801d) /* 0.308960068 */, 18 },
-  /* 4802 */  { MAD_F(0x04f1da16) /* 0.309045876 */, 18 },
-  /* 4803 */  { MAD_F(0x04f23412) /* 0.309131689 */, 18 },
-  /* 4804 */  { MAD_F(0x04f28e0f) /* 0.309217508 */, 18 },
-  /* 4805 */  { MAD_F(0x04f2e80d) /* 0.309303334 */, 18 },
-  /* 4806 */  { MAD_F(0x04f3420d) /* 0.309389165 */, 18 },
-  /* 4807 */  { MAD_F(0x04f39c0f) /* 0.309475002 */, 18 },
-  /* 4808 */  { MAD_F(0x04f3f612) /* 0.309560845 */, 18 },
-  /* 4809 */  { MAD_F(0x04f45017) /* 0.309646694 */, 18 },
-  /* 4810 */  { MAD_F(0x04f4aa1e) /* 0.309732549 */, 18 },
-  /* 4811 */  { MAD_F(0x04f50426) /* 0.309818410 */, 18 },
-  /* 4812 */  { MAD_F(0x04f55e30) /* 0.309904277 */, 18 },
-  /* 4813 */  { MAD_F(0x04f5b83b) /* 0.309990150 */, 18 },
-  /* 4814 */  { MAD_F(0x04f61248) /* 0.310076028 */, 18 },
-  /* 4815 */  { MAD_F(0x04f66c56) /* 0.310161913 */, 18 },
-
-  /* 4816 */  { MAD_F(0x04f6c666) /* 0.310247804 */, 18 },
-  /* 4817 */  { MAD_F(0x04f72078) /* 0.310333700 */, 18 },
-  /* 4818 */  { MAD_F(0x04f77a8b) /* 0.310419603 */, 18 },
-  /* 4819 */  { MAD_F(0x04f7d4a0) /* 0.310505511 */, 18 },
-  /* 4820 */  { MAD_F(0x04f82eb7) /* 0.310591426 */, 18 },
-  /* 4821 */  { MAD_F(0x04f888cf) /* 0.310677346 */, 18 },
-  /* 4822 */  { MAD_F(0x04f8e2e9) /* 0.310763272 */, 18 },
-  /* 4823 */  { MAD_F(0x04f93d04) /* 0.310849205 */, 18 },
-  /* 4824 */  { MAD_F(0x04f99721) /* 0.310935143 */, 18 },
-  /* 4825 */  { MAD_F(0x04f9f13f) /* 0.311021087 */, 18 },
-  /* 4826 */  { MAD_F(0x04fa4b5f) /* 0.311107037 */, 18 },
-  /* 4827 */  { MAD_F(0x04faa581) /* 0.311192993 */, 18 },
-  /* 4828 */  { MAD_F(0x04faffa4) /* 0.311278955 */, 18 },
-  /* 4829 */  { MAD_F(0x04fb59c9) /* 0.311364923 */, 18 },
-  /* 4830 */  { MAD_F(0x04fbb3ef) /* 0.311450897 */, 18 },
-  /* 4831 */  { MAD_F(0x04fc0e17) /* 0.311536877 */, 18 },
-
-  /* 4832 */  { MAD_F(0x04fc6841) /* 0.311622862 */, 18 },
-  /* 4833 */  { MAD_F(0x04fcc26c) /* 0.311708854 */, 18 },
-  /* 4834 */  { MAD_F(0x04fd1c99) /* 0.311794851 */, 18 },
-  /* 4835 */  { MAD_F(0x04fd76c7) /* 0.311880855 */, 18 },
-  /* 4836 */  { MAD_F(0x04fdd0f7) /* 0.311966864 */, 18 },
-  /* 4837 */  { MAD_F(0x04fe2b29) /* 0.312052880 */, 18 },
-  /* 4838 */  { MAD_F(0x04fe855c) /* 0.312138901 */, 18 },
-  /* 4839 */  { MAD_F(0x04fedf91) /* 0.312224928 */, 18 },
-  /* 4840 */  { MAD_F(0x04ff39c7) /* 0.312310961 */, 18 },
-  /* 4841 */  { MAD_F(0x04ff93ff) /* 0.312397000 */, 18 },
-  /* 4842 */  { MAD_F(0x04ffee38) /* 0.312483045 */, 18 },
-  /* 4843 */  { MAD_F(0x05004874) /* 0.312569096 */, 18 },
-  /* 4844 */  { MAD_F(0x0500a2b0) /* 0.312655153 */, 18 },
-  /* 4845 */  { MAD_F(0x0500fcef) /* 0.312741216 */, 18 },
-  /* 4846 */  { MAD_F(0x0501572e) /* 0.312827284 */, 18 },
-  /* 4847 */  { MAD_F(0x0501b170) /* 0.312913359 */, 18 },
-
-  /* 4848 */  { MAD_F(0x05020bb3) /* 0.312999439 */, 18 },
-  /* 4849 */  { MAD_F(0x050265f8) /* 0.313085526 */, 18 },
-  /* 4850 */  { MAD_F(0x0502c03e) /* 0.313171618 */, 18 },
-  /* 4851 */  { MAD_F(0x05031a86) /* 0.313257716 */, 18 },
-  /* 4852 */  { MAD_F(0x050374cf) /* 0.313343820 */, 18 },
-  /* 4853 */  { MAD_F(0x0503cf1a) /* 0.313429931 */, 18 },
-  /* 4854 */  { MAD_F(0x05042967) /* 0.313516047 */, 18 },
-  /* 4855 */  { MAD_F(0x050483b5) /* 0.313602168 */, 18 },
-  /* 4856 */  { MAD_F(0x0504de05) /* 0.313688296 */, 18 },
-  /* 4857 */  { MAD_F(0x05053856) /* 0.313774430 */, 18 },
-  /* 4858 */  { MAD_F(0x050592a9) /* 0.313860570 */, 18 },
-  /* 4859 */  { MAD_F(0x0505ecfd) /* 0.313946715 */, 18 },
-  /* 4860 */  { MAD_F(0x05064754) /* 0.314032867 */, 18 },
-  /* 4861 */  { MAD_F(0x0506a1ab) /* 0.314119024 */, 18 },
-  /* 4862 */  { MAD_F(0x0506fc04) /* 0.314205187 */, 18 },
-  /* 4863 */  { MAD_F(0x0507565f) /* 0.314291357 */, 18 },
-
-  /* 4864 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 18 },
-  /* 4865 */  { MAD_F(0x05080b1a) /* 0.314463713 */, 18 },
-  /* 4866 */  { MAD_F(0x05086579) /* 0.314549900 */, 18 },
-  /* 4867 */  { MAD_F(0x0508bfdb) /* 0.314636092 */, 18 },
-  /* 4868 */  { MAD_F(0x05091a3d) /* 0.314722291 */, 18 },
-  /* 4869 */  { MAD_F(0x050974a2) /* 0.314808496 */, 18 },
-  /* 4870 */  { MAD_F(0x0509cf08) /* 0.314894706 */, 18 },
-  /* 4871 */  { MAD_F(0x050a296f) /* 0.314980923 */, 18 },
-  /* 4872 */  { MAD_F(0x050a83d8) /* 0.315067145 */, 18 },
-  /* 4873 */  { MAD_F(0x050ade43) /* 0.315153373 */, 18 },
-  /* 4874 */  { MAD_F(0x050b38af) /* 0.315239607 */, 18 },
-  /* 4875 */  { MAD_F(0x050b931d) /* 0.315325847 */, 18 },
-  /* 4876 */  { MAD_F(0x050bed8d) /* 0.315412093 */, 18 },
-  /* 4877 */  { MAD_F(0x050c47fe) /* 0.315498345 */, 18 },
-  /* 4878 */  { MAD_F(0x050ca271) /* 0.315584603 */, 18 },
-  /* 4879 */  { MAD_F(0x050cfce5) /* 0.315670866 */, 18 },
-
-  /* 4880 */  { MAD_F(0x050d575b) /* 0.315757136 */, 18 },
-  /* 4881 */  { MAD_F(0x050db1d2) /* 0.315843411 */, 18 },
-  /* 4882 */  { MAD_F(0x050e0c4b) /* 0.315929693 */, 18 },
-  /* 4883 */  { MAD_F(0x050e66c5) /* 0.316015980 */, 18 },
-  /* 4884 */  { MAD_F(0x050ec141) /* 0.316102273 */, 18 },
-  /* 4885 */  { MAD_F(0x050f1bbf) /* 0.316188572 */, 18 },
-  /* 4886 */  { MAD_F(0x050f763e) /* 0.316274877 */, 18 },
-  /* 4887 */  { MAD_F(0x050fd0bf) /* 0.316361187 */, 18 },
-  /* 4888 */  { MAD_F(0x05102b42) /* 0.316447504 */, 18 },
-  /* 4889 */  { MAD_F(0x051085c6) /* 0.316533826 */, 18 },
-  /* 4890 */  { MAD_F(0x0510e04b) /* 0.316620155 */, 18 },
-  /* 4891 */  { MAD_F(0x05113ad3) /* 0.316706489 */, 18 },
-  /* 4892 */  { MAD_F(0x0511955b) /* 0.316792829 */, 18 },
-  /* 4893 */  { MAD_F(0x0511efe6) /* 0.316879175 */, 18 },
-  /* 4894 */  { MAD_F(0x05124a72) /* 0.316965527 */, 18 },
-  /* 4895 */  { MAD_F(0x0512a4ff) /* 0.317051885 */, 18 },
-
-  /* 4896 */  { MAD_F(0x0512ff8e) /* 0.317138249 */, 18 },
-  /* 4897 */  { MAD_F(0x05135a1f) /* 0.317224618 */, 18 },
-  /* 4898 */  { MAD_F(0x0513b4b1) /* 0.317310994 */, 18 },
-  /* 4899 */  { MAD_F(0x05140f45) /* 0.317397375 */, 18 },
-  /* 4900 */  { MAD_F(0x051469da) /* 0.317483762 */, 18 },
-  /* 4901 */  { MAD_F(0x0514c471) /* 0.317570155 */, 18 },
-  /* 4902 */  { MAD_F(0x05151f0a) /* 0.317656554 */, 18 },
-  /* 4903 */  { MAD_F(0x051579a4) /* 0.317742959 */, 18 },
-  /* 4904 */  { MAD_F(0x0515d440) /* 0.317829370 */, 18 },
-  /* 4905 */  { MAD_F(0x05162edd) /* 0.317915786 */, 18 },
-  /* 4906 */  { MAD_F(0x0516897c) /* 0.318002209 */, 18 },
-  /* 4907 */  { MAD_F(0x0516e41c) /* 0.318088637 */, 18 },
-  /* 4908 */  { MAD_F(0x05173ebe) /* 0.318175071 */, 18 },
-  /* 4909 */  { MAD_F(0x05179962) /* 0.318261511 */, 18 },
-  /* 4910 */  { MAD_F(0x0517f407) /* 0.318347957 */, 18 },
-  /* 4911 */  { MAD_F(0x05184eae) /* 0.318434409 */, 18 },
-
-  /* 4912 */  { MAD_F(0x0518a956) /* 0.318520867 */, 18 },
-  /* 4913 */  { MAD_F(0x05190400) /* 0.318607330 */, 18 },
-  /* 4914 */  { MAD_F(0x05195eab) /* 0.318693800 */, 18 },
-  /* 4915 */  { MAD_F(0x0519b958) /* 0.318780275 */, 18 },
-  /* 4916 */  { MAD_F(0x051a1407) /* 0.318866756 */, 18 },
-  /* 4917 */  { MAD_F(0x051a6eb7) /* 0.318953243 */, 18 },
-  /* 4918 */  { MAD_F(0x051ac969) /* 0.319039736 */, 18 },
-  /* 4919 */  { MAD_F(0x051b241c) /* 0.319126235 */, 18 },
-  /* 4920 */  { MAD_F(0x051b7ed1) /* 0.319212739 */, 18 },
-  /* 4921 */  { MAD_F(0x051bd987) /* 0.319299250 */, 18 },
-  /* 4922 */  { MAD_F(0x051c3440) /* 0.319385766 */, 18 },
-  /* 4923 */  { MAD_F(0x051c8ef9) /* 0.319472288 */, 18 },
-  /* 4924 */  { MAD_F(0x051ce9b4) /* 0.319558816 */, 18 },
-  /* 4925 */  { MAD_F(0x051d4471) /* 0.319645350 */, 18 },
-  /* 4926 */  { MAD_F(0x051d9f2f) /* 0.319731890 */, 18 },
-  /* 4927 */  { MAD_F(0x051df9ef) /* 0.319818435 */, 18 },
-
-  /* 4928 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 18 },
-  /* 4929 */  { MAD_F(0x051eaf74) /* 0.319991544 */, 18 },
-  /* 4930 */  { MAD_F(0x051f0a38) /* 0.320078107 */, 18 },
-  /* 4931 */  { MAD_F(0x051f64ff) /* 0.320164676 */, 18 },
-  /* 4932 */  { MAD_F(0x051fbfc6) /* 0.320251251 */, 18 },
-  /* 4933 */  { MAD_F(0x05201a90) /* 0.320337832 */, 18 },
-  /* 4934 */  { MAD_F(0x0520755b) /* 0.320424419 */, 18 },
-  /* 4935 */  { MAD_F(0x0520d027) /* 0.320511011 */, 18 },
-  /* 4936 */  { MAD_F(0x05212af5) /* 0.320597609 */, 18 },
-  /* 4937 */  { MAD_F(0x052185c5) /* 0.320684213 */, 18 },
-  /* 4938 */  { MAD_F(0x0521e096) /* 0.320770823 */, 18 },
-  /* 4939 */  { MAD_F(0x05223b69) /* 0.320857439 */, 18 },
-  /* 4940 */  { MAD_F(0x0522963d) /* 0.320944061 */, 18 },
-  /* 4941 */  { MAD_F(0x0522f113) /* 0.321030688 */, 18 },
-  /* 4942 */  { MAD_F(0x05234bea) /* 0.321117322 */, 18 },
-  /* 4943 */  { MAD_F(0x0523a6c3) /* 0.321203961 */, 18 },
-
-  /* 4944 */  { MAD_F(0x0524019e) /* 0.321290606 */, 18 },
-  /* 4945 */  { MAD_F(0x05245c7a) /* 0.321377257 */, 18 },
-  /* 4946 */  { MAD_F(0x0524b758) /* 0.321463913 */, 18 },
-  /* 4947 */  { MAD_F(0x05251237) /* 0.321550576 */, 18 },
-  /* 4948 */  { MAD_F(0x05256d18) /* 0.321637244 */, 18 },
-  /* 4949 */  { MAD_F(0x0525c7fb) /* 0.321723919 */, 18 },
-  /* 4950 */  { MAD_F(0x052622df) /* 0.321810599 */, 18 },
-  /* 4951 */  { MAD_F(0x05267dc4) /* 0.321897285 */, 18 },
-  /* 4952 */  { MAD_F(0x0526d8ab) /* 0.321983976 */, 18 },
-  /* 4953 */  { MAD_F(0x05273394) /* 0.322070674 */, 18 },
-  /* 4954 */  { MAD_F(0x05278e7e) /* 0.322157377 */, 18 },
-  /* 4955 */  { MAD_F(0x0527e96a) /* 0.322244087 */, 18 },
-  /* 4956 */  { MAD_F(0x05284457) /* 0.322330802 */, 18 },
-  /* 4957 */  { MAD_F(0x05289f46) /* 0.322417523 */, 18 },
-  /* 4958 */  { MAD_F(0x0528fa37) /* 0.322504249 */, 18 },
-  /* 4959 */  { MAD_F(0x05295529) /* 0.322590982 */, 18 },
-
-  /* 4960 */  { MAD_F(0x0529b01d) /* 0.322677720 */, 18 },
-  /* 4961 */  { MAD_F(0x052a0b12) /* 0.322764465 */, 18 },
-  /* 4962 */  { MAD_F(0x052a6609) /* 0.322851215 */, 18 },
-  /* 4963 */  { MAD_F(0x052ac101) /* 0.322937971 */, 18 },
-  /* 4964 */  { MAD_F(0x052b1bfb) /* 0.323024732 */, 18 },
-  /* 4965 */  { MAD_F(0x052b76f7) /* 0.323111500 */, 18 },
-  /* 4966 */  { MAD_F(0x052bd1f4) /* 0.323198273 */, 18 },
-  /* 4967 */  { MAD_F(0x052c2cf2) /* 0.323285052 */, 18 },
-  /* 4968 */  { MAD_F(0x052c87f2) /* 0.323371837 */, 18 },
-  /* 4969 */  { MAD_F(0x052ce2f4) /* 0.323458628 */, 18 },
-  /* 4970 */  { MAD_F(0x052d3df7) /* 0.323545425 */, 18 },
-  /* 4971 */  { MAD_F(0x052d98fc) /* 0.323632227 */, 18 },
-  /* 4972 */  { MAD_F(0x052df403) /* 0.323719036 */, 18 },
-  /* 4973 */  { MAD_F(0x052e4f0b) /* 0.323805850 */, 18 },
-  /* 4974 */  { MAD_F(0x052eaa14) /* 0.323892670 */, 18 },
-  /* 4975 */  { MAD_F(0x052f051f) /* 0.323979496 */, 18 },
-
-  /* 4976 */  { MAD_F(0x052f602c) /* 0.324066327 */, 18 },
-  /* 4977 */  { MAD_F(0x052fbb3a) /* 0.324153165 */, 18 },
-  /* 4978 */  { MAD_F(0x0530164a) /* 0.324240008 */, 18 },
-  /* 4979 */  { MAD_F(0x0530715b) /* 0.324326857 */, 18 },
-  /* 4980 */  { MAD_F(0x0530cc6e) /* 0.324413712 */, 18 },
-  /* 4981 */  { MAD_F(0x05312783) /* 0.324500572 */, 18 },
-  /* 4982 */  { MAD_F(0x05318299) /* 0.324587439 */, 18 },
-  /* 4983 */  { MAD_F(0x0531ddb0) /* 0.324674311 */, 18 },
-  /* 4984 */  { MAD_F(0x053238ca) /* 0.324761189 */, 18 },
-  /* 4985 */  { MAD_F(0x053293e4) /* 0.324848073 */, 18 },
-  /* 4986 */  { MAD_F(0x0532ef01) /* 0.324934963 */, 18 },
-  /* 4987 */  { MAD_F(0x05334a1e) /* 0.325021858 */, 18 },
-  /* 4988 */  { MAD_F(0x0533a53e) /* 0.325108760 */, 18 },
-  /* 4989 */  { MAD_F(0x0534005f) /* 0.325195667 */, 18 },
-  /* 4990 */  { MAD_F(0x05345b81) /* 0.325282580 */, 18 },
-  /* 4991 */  { MAD_F(0x0534b6a5) /* 0.325369498 */, 18 },
-
-  /* 4992 */  { MAD_F(0x053511cb) /* 0.325456423 */, 18 },
-  /* 4993 */  { MAD_F(0x05356cf2) /* 0.325543353 */, 18 },
-  /* 4994 */  { MAD_F(0x0535c81b) /* 0.325630290 */, 18 },
-  /* 4995 */  { MAD_F(0x05362345) /* 0.325717232 */, 18 },
-  /* 4996 */  { MAD_F(0x05367e71) /* 0.325804179 */, 18 },
-  /* 4997 */  { MAD_F(0x0536d99f) /* 0.325891133 */, 18 },
-  /* 4998 */  { MAD_F(0x053734ce) /* 0.325978092 */, 18 },
-  /* 4999 */  { MAD_F(0x05378ffe) /* 0.326065057 */, 18 },
-  /* 5000 */  { MAD_F(0x0537eb30) /* 0.326152028 */, 18 },
-  /* 5001 */  { MAD_F(0x05384664) /* 0.326239005 */, 18 },
-  /* 5002 */  { MAD_F(0x0538a199) /* 0.326325988 */, 18 },
-  /* 5003 */  { MAD_F(0x0538fcd0) /* 0.326412976 */, 18 },
-  /* 5004 */  { MAD_F(0x05395808) /* 0.326499970 */, 18 },
-  /* 5005 */  { MAD_F(0x0539b342) /* 0.326586970 */, 18 },
-  /* 5006 */  { MAD_F(0x053a0e7d) /* 0.326673976 */, 18 },
-  /* 5007 */  { MAD_F(0x053a69ba) /* 0.326760988 */, 18 },
-
-  /* 5008 */  { MAD_F(0x053ac4f9) /* 0.326848005 */, 18 },
-  /* 5009 */  { MAD_F(0x053b2039) /* 0.326935028 */, 18 },
-  /* 5010 */  { MAD_F(0x053b7b7b) /* 0.327022057 */, 18 },
-  /* 5011 */  { MAD_F(0x053bd6be) /* 0.327109092 */, 18 },
-  /* 5012 */  { MAD_F(0x053c3203) /* 0.327196132 */, 18 },
-  /* 5013 */  { MAD_F(0x053c8d49) /* 0.327283178 */, 18 },
-  /* 5014 */  { MAD_F(0x053ce891) /* 0.327370231 */, 18 },
-  /* 5015 */  { MAD_F(0x053d43da) /* 0.327457288 */, 18 },
-  /* 5016 */  { MAD_F(0x053d9f25) /* 0.327544352 */, 18 },
-  /* 5017 */  { MAD_F(0x053dfa72) /* 0.327631421 */, 18 },
-  /* 5018 */  { MAD_F(0x053e55c0) /* 0.327718497 */, 18 },
-  /* 5019 */  { MAD_F(0x053eb10f) /* 0.327805578 */, 18 },
-  /* 5020 */  { MAD_F(0x053f0c61) /* 0.327892665 */, 18 },
-  /* 5021 */  { MAD_F(0x053f67b3) /* 0.327979757 */, 18 },
-  /* 5022 */  { MAD_F(0x053fc308) /* 0.328066855 */, 18 },
-  /* 5023 */  { MAD_F(0x05401e5e) /* 0.328153960 */, 18 },
-
-  /* 5024 */  { MAD_F(0x054079b5) /* 0.328241070 */, 18 },
-  /* 5025 */  { MAD_F(0x0540d50e) /* 0.328328185 */, 18 },
-  /* 5026 */  { MAD_F(0x05413068) /* 0.328415307 */, 18 },
-  /* 5027 */  { MAD_F(0x05418bc4) /* 0.328502434 */, 18 },
-  /* 5028 */  { MAD_F(0x0541e722) /* 0.328589567 */, 18 },
-  /* 5029 */  { MAD_F(0x05424281) /* 0.328676706 */, 18 },
-  /* 5030 */  { MAD_F(0x05429de2) /* 0.328763850 */, 18 },
-  /* 5031 */  { MAD_F(0x0542f944) /* 0.328851001 */, 18 },
-  /* 5032 */  { MAD_F(0x054354a8) /* 0.328938157 */, 18 },
-  /* 5033 */  { MAD_F(0x0543b00d) /* 0.329025319 */, 18 },
-  /* 5034 */  { MAD_F(0x05440b74) /* 0.329112486 */, 18 },
-  /* 5035 */  { MAD_F(0x054466dd) /* 0.329199660 */, 18 },
-  /* 5036 */  { MAD_F(0x0544c247) /* 0.329286839 */, 18 },
-  /* 5037 */  { MAD_F(0x05451db2) /* 0.329374024 */, 18 },
-  /* 5038 */  { MAD_F(0x0545791f) /* 0.329461215 */, 18 },
-  /* 5039 */  { MAD_F(0x0545d48e) /* 0.329548411 */, 18 },
-
-  /* 5040 */  { MAD_F(0x05462ffe) /* 0.329635614 */, 18 },
-  /* 5041 */  { MAD_F(0x05468b70) /* 0.329722822 */, 18 },
-  /* 5042 */  { MAD_F(0x0546e6e3) /* 0.329810036 */, 18 },
-  /* 5043 */  { MAD_F(0x05474258) /* 0.329897255 */, 18 },
-  /* 5044 */  { MAD_F(0x05479dce) /* 0.329984481 */, 18 },
-  /* 5045 */  { MAD_F(0x0547f946) /* 0.330071712 */, 18 },
-  /* 5046 */  { MAD_F(0x054854c0) /* 0.330158949 */, 18 },
-  /* 5047 */  { MAD_F(0x0548b03b) /* 0.330246191 */, 18 },
-  /* 5048 */  { MAD_F(0x05490bb7) /* 0.330333440 */, 18 },
-  /* 5049 */  { MAD_F(0x05496735) /* 0.330420694 */, 18 },
-  /* 5050 */  { MAD_F(0x0549c2b5) /* 0.330507954 */, 18 },
-  /* 5051 */  { MAD_F(0x054a1e36) /* 0.330595220 */, 18 },
-  /* 5052 */  { MAD_F(0x054a79b9) /* 0.330682491 */, 18 },
-  /* 5053 */  { MAD_F(0x054ad53d) /* 0.330769768 */, 18 },
-  /* 5054 */  { MAD_F(0x054b30c3) /* 0.330857051 */, 18 },
-  /* 5055 */  { MAD_F(0x054b8c4b) /* 0.330944340 */, 18 },
-
-  /* 5056 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 18 },
-  /* 5057 */  { MAD_F(0x054c435e) /* 0.331118935 */, 18 },
-  /* 5058 */  { MAD_F(0x054c9eea) /* 0.331206241 */, 18 },
-  /* 5059 */  { MAD_F(0x054cfa78) /* 0.331293553 */, 18 },
-  /* 5060 */  { MAD_F(0x054d5607) /* 0.331380870 */, 18 },
-  /* 5061 */  { MAD_F(0x054db197) /* 0.331468193 */, 18 },
-  /* 5062 */  { MAD_F(0x054e0d2a) /* 0.331555522 */, 18 },
-  /* 5063 */  { MAD_F(0x054e68bd) /* 0.331642857 */, 18 },
-  /* 5064 */  { MAD_F(0x054ec453) /* 0.331730198 */, 18 },
-  /* 5065 */  { MAD_F(0x054f1fe9) /* 0.331817544 */, 18 },
-  /* 5066 */  { MAD_F(0x054f7b82) /* 0.331904896 */, 18 },
-  /* 5067 */  { MAD_F(0x054fd71c) /* 0.331992254 */, 18 },
-  /* 5068 */  { MAD_F(0x055032b7) /* 0.332079617 */, 18 },
-  /* 5069 */  { MAD_F(0x05508e54) /* 0.332166986 */, 18 },
-  /* 5070 */  { MAD_F(0x0550e9f3) /* 0.332254361 */, 18 },
-  /* 5071 */  { MAD_F(0x05514593) /* 0.332341742 */, 18 },
-
-  /* 5072 */  { MAD_F(0x0551a134) /* 0.332429129 */, 18 },
-  /* 5073 */  { MAD_F(0x0551fcd8) /* 0.332516521 */, 18 },
-  /* 5074 */  { MAD_F(0x0552587c) /* 0.332603919 */, 18 },
-  /* 5075 */  { MAD_F(0x0552b423) /* 0.332691323 */, 18 },
-  /* 5076 */  { MAD_F(0x05530fca) /* 0.332778732 */, 18 },
-  /* 5077 */  { MAD_F(0x05536b74) /* 0.332866147 */, 18 },
-  /* 5078 */  { MAD_F(0x0553c71f) /* 0.332953568 */, 18 },
-  /* 5079 */  { MAD_F(0x055422cb) /* 0.333040995 */, 18 },
-  /* 5080 */  { MAD_F(0x05547e79) /* 0.333128427 */, 18 },
-  /* 5081 */  { MAD_F(0x0554da29) /* 0.333215865 */, 18 },
-  /* 5082 */  { MAD_F(0x055535da) /* 0.333303309 */, 18 },
-  /* 5083 */  { MAD_F(0x0555918c) /* 0.333390759 */, 18 },
-  /* 5084 */  { MAD_F(0x0555ed40) /* 0.333478214 */, 18 },
-  /* 5085 */  { MAD_F(0x055648f6) /* 0.333565675 */, 18 },
-  /* 5086 */  { MAD_F(0x0556a4ad) /* 0.333653142 */, 18 },
-  /* 5087 */  { MAD_F(0x05570066) /* 0.333740615 */, 18 },
-
-  /* 5088 */  { MAD_F(0x05575c20) /* 0.333828093 */, 18 },
-  /* 5089 */  { MAD_F(0x0557b7dc) /* 0.333915577 */, 18 },
-  /* 5090 */  { MAD_F(0x05581399) /* 0.334003067 */, 18 },
-  /* 5091 */  { MAD_F(0x05586f58) /* 0.334090562 */, 18 },
-  /* 5092 */  { MAD_F(0x0558cb19) /* 0.334178063 */, 18 },
-  /* 5093 */  { MAD_F(0x055926db) /* 0.334265570 */, 18 },
-  /* 5094 */  { MAD_F(0x0559829e) /* 0.334353083 */, 18 },
-  /* 5095 */  { MAD_F(0x0559de63) /* 0.334440601 */, 18 },
-  /* 5096 */  { MAD_F(0x055a3a2a) /* 0.334528126 */, 18 },
-  /* 5097 */  { MAD_F(0x055a95f2) /* 0.334615655 */, 18 },
-  /* 5098 */  { MAD_F(0x055af1bb) /* 0.334703191 */, 18 },
-  /* 5099 */  { MAD_F(0x055b4d87) /* 0.334790732 */, 18 },
-  /* 5100 */  { MAD_F(0x055ba953) /* 0.334878279 */, 18 },
-  /* 5101 */  { MAD_F(0x055c0522) /* 0.334965832 */, 18 },
-  /* 5102 */  { MAD_F(0x055c60f1) /* 0.335053391 */, 18 },
-  /* 5103 */  { MAD_F(0x055cbcc3) /* 0.335140955 */, 18 },
-
-  /* 5104 */  { MAD_F(0x055d1896) /* 0.335228525 */, 18 },
-  /* 5105 */  { MAD_F(0x055d746a) /* 0.335316100 */, 18 },
-  /* 5106 */  { MAD_F(0x055dd040) /* 0.335403682 */, 18 },
-  /* 5107 */  { MAD_F(0x055e2c17) /* 0.335491269 */, 18 },
-  /* 5108 */  { MAD_F(0x055e87f0) /* 0.335578861 */, 18 },
-  /* 5109 */  { MAD_F(0x055ee3cb) /* 0.335666460 */, 18 },
-  /* 5110 */  { MAD_F(0x055f3fa7) /* 0.335754064 */, 18 },
-  /* 5111 */  { MAD_F(0x055f9b85) /* 0.335841674 */, 18 },
-  /* 5112 */  { MAD_F(0x055ff764) /* 0.335929290 */, 18 },
-  /* 5113 */  { MAD_F(0x05605344) /* 0.336016911 */, 18 },
-  /* 5114 */  { MAD_F(0x0560af27) /* 0.336104538 */, 18 },
-  /* 5115 */  { MAD_F(0x05610b0a) /* 0.336192171 */, 18 },
-  /* 5116 */  { MAD_F(0x056166f0) /* 0.336279809 */, 18 },
-  /* 5117 */  { MAD_F(0x0561c2d7) /* 0.336367453 */, 18 },
-  /* 5118 */  { MAD_F(0x05621ebf) /* 0.336455103 */, 18 },
-  /* 5119 */  { MAD_F(0x05627aa9) /* 0.336542759 */, 18 },
-
-  /* 5120 */  { MAD_F(0x0562d694) /* 0.336630420 */, 18 },
-  /* 5121 */  { MAD_F(0x05633281) /* 0.336718087 */, 18 },
-  /* 5122 */  { MAD_F(0x05638e70) /* 0.336805760 */, 18 },
-  /* 5123 */  { MAD_F(0x0563ea60) /* 0.336893439 */, 18 },
-  /* 5124 */  { MAD_F(0x05644651) /* 0.336981123 */, 18 },
-  /* 5125 */  { MAD_F(0x0564a244) /* 0.337068813 */, 18 },
-  /* 5126 */  { MAD_F(0x0564fe39) /* 0.337156508 */, 18 },
-  /* 5127 */  { MAD_F(0x05655a2f) /* 0.337244209 */, 18 },
-  /* 5128 */  { MAD_F(0x0565b627) /* 0.337331916 */, 18 },
-  /* 5129 */  { MAD_F(0x05661220) /* 0.337419629 */, 18 },
-  /* 5130 */  { MAD_F(0x05666e1a) /* 0.337507347 */, 18 },
-  /* 5131 */  { MAD_F(0x0566ca17) /* 0.337595071 */, 18 },
-  /* 5132 */  { MAD_F(0x05672614) /* 0.337682801 */, 18 },
-  /* 5133 */  { MAD_F(0x05678214) /* 0.337770537 */, 18 },
-  /* 5134 */  { MAD_F(0x0567de15) /* 0.337858278 */, 18 },
-  /* 5135 */  { MAD_F(0x05683a17) /* 0.337946025 */, 18 },
-
-  /* 5136 */  { MAD_F(0x0568961b) /* 0.338033777 */, 18 },
-  /* 5137 */  { MAD_F(0x0568f220) /* 0.338121535 */, 18 },
-  /* 5138 */  { MAD_F(0x05694e27) /* 0.338209299 */, 18 },
-  /* 5139 */  { MAD_F(0x0569aa30) /* 0.338297069 */, 18 },
-  /* 5140 */  { MAD_F(0x056a063a) /* 0.338384844 */, 18 },
-  /* 5141 */  { MAD_F(0x056a6245) /* 0.338472625 */, 18 },
-  /* 5142 */  { MAD_F(0x056abe52) /* 0.338560412 */, 18 },
-  /* 5143 */  { MAD_F(0x056b1a61) /* 0.338648204 */, 18 },
-  /* 5144 */  { MAD_F(0x056b7671) /* 0.338736002 */, 18 },
-  /* 5145 */  { MAD_F(0x056bd283) /* 0.338823806 */, 18 },
-  /* 5146 */  { MAD_F(0x056c2e96) /* 0.338911616 */, 18 },
-  /* 5147 */  { MAD_F(0x056c8aab) /* 0.338999431 */, 18 },
-  /* 5148 */  { MAD_F(0x056ce6c1) /* 0.339087252 */, 18 },
-  /* 5149 */  { MAD_F(0x056d42d9) /* 0.339175078 */, 18 },
-  /* 5150 */  { MAD_F(0x056d9ef2) /* 0.339262910 */, 18 },
-  /* 5151 */  { MAD_F(0x056dfb0d) /* 0.339350748 */, 18 },
-
-  /* 5152 */  { MAD_F(0x056e5729) /* 0.339438592 */, 18 },
-  /* 5153 */  { MAD_F(0x056eb347) /* 0.339526441 */, 18 },
-  /* 5154 */  { MAD_F(0x056f0f66) /* 0.339614296 */, 18 },
-  /* 5155 */  { MAD_F(0x056f6b87) /* 0.339702157 */, 18 },
-  /* 5156 */  { MAD_F(0x056fc7aa) /* 0.339790023 */, 18 },
-  /* 5157 */  { MAD_F(0x057023cd) /* 0.339877895 */, 18 },
-  /* 5158 */  { MAD_F(0x05707ff3) /* 0.339965773 */, 18 },
-  /* 5159 */  { MAD_F(0x0570dc1a) /* 0.340053656 */, 18 },
-  /* 5160 */  { MAD_F(0x05713843) /* 0.340141545 */, 18 },
-  /* 5161 */  { MAD_F(0x0571946d) /* 0.340229440 */, 18 },
-  /* 5162 */  { MAD_F(0x0571f098) /* 0.340317340 */, 18 },
-  /* 5163 */  { MAD_F(0x05724cc5) /* 0.340405246 */, 18 },
-  /* 5164 */  { MAD_F(0x0572a8f4) /* 0.340493158 */, 18 },
-  /* 5165 */  { MAD_F(0x05730524) /* 0.340581075 */, 18 },
-  /* 5166 */  { MAD_F(0x05736156) /* 0.340668999 */, 18 },
-  /* 5167 */  { MAD_F(0x0573bd89) /* 0.340756927 */, 18 },
-
-  /* 5168 */  { MAD_F(0x057419be) /* 0.340844862 */, 18 },
-  /* 5169 */  { MAD_F(0x057475f4) /* 0.340932802 */, 18 },
-  /* 5170 */  { MAD_F(0x0574d22c) /* 0.341020748 */, 18 },
-  /* 5171 */  { MAD_F(0x05752e65) /* 0.341108699 */, 18 },
-  /* 5172 */  { MAD_F(0x05758aa0) /* 0.341196656 */, 18 },
-  /* 5173 */  { MAD_F(0x0575e6dc) /* 0.341284619 */, 18 },
-  /* 5174 */  { MAD_F(0x0576431a) /* 0.341372587 */, 18 },
-  /* 5175 */  { MAD_F(0x05769f59) /* 0.341460562 */, 18 },
-  /* 5176 */  { MAD_F(0x0576fb9a) /* 0.341548541 */, 18 },
-  /* 5177 */  { MAD_F(0x057757dd) /* 0.341636527 */, 18 },
-  /* 5178 */  { MAD_F(0x0577b421) /* 0.341724518 */, 18 },
-  /* 5179 */  { MAD_F(0x05781066) /* 0.341812515 */, 18 },
-  /* 5180 */  { MAD_F(0x05786cad) /* 0.341900517 */, 18 },
-  /* 5181 */  { MAD_F(0x0578c8f5) /* 0.341988525 */, 18 },
-  /* 5182 */  { MAD_F(0x0579253f) /* 0.342076539 */, 18 },
-  /* 5183 */  { MAD_F(0x0579818b) /* 0.342164558 */, 18 },
-
-  /* 5184 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 18 },
-  /* 5185 */  { MAD_F(0x057a3a27) /* 0.342340614 */, 18 },
-  /* 5186 */  { MAD_F(0x057a9677) /* 0.342428651 */, 18 },
-  /* 5187 */  { MAD_F(0x057af2c8) /* 0.342516693 */, 18 },
-  /* 5188 */  { MAD_F(0x057b4f1c) /* 0.342604741 */, 18 },
-  /* 5189 */  { MAD_F(0x057bab70) /* 0.342692794 */, 18 },
-  /* 5190 */  { MAD_F(0x057c07c6) /* 0.342780853 */, 18 },
-  /* 5191 */  { MAD_F(0x057c641e) /* 0.342868918 */, 18 },
-  /* 5192 */  { MAD_F(0x057cc077) /* 0.342956988 */, 18 },
-  /* 5193 */  { MAD_F(0x057d1cd2) /* 0.343045064 */, 18 },
-  /* 5194 */  { MAD_F(0x057d792e) /* 0.343133146 */, 18 },
-  /* 5195 */  { MAD_F(0x057dd58c) /* 0.343221233 */, 18 },
-  /* 5196 */  { MAD_F(0x057e31eb) /* 0.343309326 */, 18 },
-  /* 5197 */  { MAD_F(0x057e8e4c) /* 0.343397425 */, 18 },
-  /* 5198 */  { MAD_F(0x057eeaae) /* 0.343485529 */, 18 },
-  /* 5199 */  { MAD_F(0x057f4712) /* 0.343573639 */, 18 },
-
-  /* 5200 */  { MAD_F(0x057fa378) /* 0.343661754 */, 18 },
-  /* 5201 */  { MAD_F(0x057fffde) /* 0.343749876 */, 18 },
-  /* 5202 */  { MAD_F(0x05805c47) /* 0.343838003 */, 18 },
-  /* 5203 */  { MAD_F(0x0580b8b1) /* 0.343926135 */, 18 },
-  /* 5204 */  { MAD_F(0x0581151c) /* 0.344014273 */, 18 },
-  /* 5205 */  { MAD_F(0x05817189) /* 0.344102417 */, 18 },
-  /* 5206 */  { MAD_F(0x0581cdf7) /* 0.344190566 */, 18 },
-  /* 5207 */  { MAD_F(0x05822a67) /* 0.344278722 */, 18 },
-  /* 5208 */  { MAD_F(0x058286d9) /* 0.344366882 */, 18 },
-  /* 5209 */  { MAD_F(0x0582e34c) /* 0.344455049 */, 18 },
-  /* 5210 */  { MAD_F(0x05833fc0) /* 0.344543221 */, 18 },
-  /* 5211 */  { MAD_F(0x05839c36) /* 0.344631398 */, 18 },
-  /* 5212 */  { MAD_F(0x0583f8ae) /* 0.344719582 */, 18 },
-  /* 5213 */  { MAD_F(0x05845527) /* 0.344807771 */, 18 },
-  /* 5214 */  { MAD_F(0x0584b1a1) /* 0.344895965 */, 18 },
-  /* 5215 */  { MAD_F(0x05850e1e) /* 0.344984165 */, 18 },
-
-  /* 5216 */  { MAD_F(0x05856a9b) /* 0.345072371 */, 18 },
-  /* 5217 */  { MAD_F(0x0585c71a) /* 0.345160583 */, 18 },
-  /* 5218 */  { MAD_F(0x0586239b) /* 0.345248800 */, 18 },
-  /* 5219 */  { MAD_F(0x0586801d) /* 0.345337023 */, 18 },
-  /* 5220 */  { MAD_F(0x0586dca1) /* 0.345425251 */, 18 },
-  /* 5221 */  { MAD_F(0x05873926) /* 0.345513485 */, 18 },
-  /* 5222 */  { MAD_F(0x058795ac) /* 0.345601725 */, 18 },
-  /* 5223 */  { MAD_F(0x0587f235) /* 0.345689970 */, 18 },
-  /* 5224 */  { MAD_F(0x05884ebe) /* 0.345778221 */, 18 },
-  /* 5225 */  { MAD_F(0x0588ab49) /* 0.345866478 */, 18 },
-  /* 5226 */  { MAD_F(0x058907d6) /* 0.345954740 */, 18 },
-  /* 5227 */  { MAD_F(0x05896464) /* 0.346043008 */, 18 },
-  /* 5228 */  { MAD_F(0x0589c0f4) /* 0.346131281 */, 18 },
-  /* 5229 */  { MAD_F(0x058a1d85) /* 0.346219560 */, 18 },
-  /* 5230 */  { MAD_F(0x058a7a18) /* 0.346307845 */, 18 },
-  /* 5231 */  { MAD_F(0x058ad6ac) /* 0.346396135 */, 18 },
-
-  /* 5232 */  { MAD_F(0x058b3342) /* 0.346484431 */, 18 },
-  /* 5233 */  { MAD_F(0x058b8fd9) /* 0.346572733 */, 18 },
-  /* 5234 */  { MAD_F(0x058bec72) /* 0.346661040 */, 18 },
-  /* 5235 */  { MAD_F(0x058c490c) /* 0.346749353 */, 18 },
-  /* 5236 */  { MAD_F(0x058ca5a8) /* 0.346837671 */, 18 },
-  /* 5237 */  { MAD_F(0x058d0246) /* 0.346925996 */, 18 },
-  /* 5238 */  { MAD_F(0x058d5ee4) /* 0.347014325 */, 18 },
-  /* 5239 */  { MAD_F(0x058dbb85) /* 0.347102661 */, 18 },
-  /* 5240 */  { MAD_F(0x058e1827) /* 0.347191002 */, 18 },
-  /* 5241 */  { MAD_F(0x058e74ca) /* 0.347279348 */, 18 },
-  /* 5242 */  { MAD_F(0x058ed16f) /* 0.347367700 */, 18 },
-  /* 5243 */  { MAD_F(0x058f2e15) /* 0.347456058 */, 18 },
-  /* 5244 */  { MAD_F(0x058f8abd) /* 0.347544422 */, 18 },
-  /* 5245 */  { MAD_F(0x058fe766) /* 0.347632791 */, 18 },
-  /* 5246 */  { MAD_F(0x05904411) /* 0.347721165 */, 18 },
-  /* 5247 */  { MAD_F(0x0590a0be) /* 0.347809546 */, 18 },
-
-  /* 5248 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 18 },
-  /* 5249 */  { MAD_F(0x05915a1b) /* 0.347986323 */, 18 },
-  /* 5250 */  { MAD_F(0x0591b6cc) /* 0.348074720 */, 18 },
-  /* 5251 */  { MAD_F(0x0592137e) /* 0.348163123 */, 18 },
-  /* 5252 */  { MAD_F(0x05927032) /* 0.348251531 */, 18 },
-  /* 5253 */  { MAD_F(0x0592cce8) /* 0.348339945 */, 18 },
-  /* 5254 */  { MAD_F(0x0593299f) /* 0.348428365 */, 18 },
-  /* 5255 */  { MAD_F(0x05938657) /* 0.348516790 */, 18 },
-  /* 5256 */  { MAD_F(0x0593e311) /* 0.348605221 */, 18 },
-  /* 5257 */  { MAD_F(0x05943fcd) /* 0.348693657 */, 18 },
-  /* 5258 */  { MAD_F(0x05949c8a) /* 0.348782099 */, 18 },
-  /* 5259 */  { MAD_F(0x0594f948) /* 0.348870547 */, 18 },
-  /* 5260 */  { MAD_F(0x05955608) /* 0.348959000 */, 18 },
-  /* 5261 */  { MAD_F(0x0595b2ca) /* 0.349047459 */, 18 },
-  /* 5262 */  { MAD_F(0x05960f8c) /* 0.349135923 */, 18 },
-  /* 5263 */  { MAD_F(0x05966c51) /* 0.349224393 */, 18 },
-
-  /* 5264 */  { MAD_F(0x0596c917) /* 0.349312869 */, 18 },
-  /* 5265 */  { MAD_F(0x059725de) /* 0.349401350 */, 18 },
-  /* 5266 */  { MAD_F(0x059782a7) /* 0.349489837 */, 18 },
-  /* 5267 */  { MAD_F(0x0597df72) /* 0.349578329 */, 18 },
-  /* 5268 */  { MAD_F(0x05983c3e) /* 0.349666827 */, 18 },
-  /* 5269 */  { MAD_F(0x0598990c) /* 0.349755331 */, 18 },
-  /* 5270 */  { MAD_F(0x0598f5db) /* 0.349843840 */, 18 },
-  /* 5271 */  { MAD_F(0x059952ab) /* 0.349932355 */, 18 },
-  /* 5272 */  { MAD_F(0x0599af7d) /* 0.350020876 */, 18 },
-  /* 5273 */  { MAD_F(0x059a0c51) /* 0.350109402 */, 18 },
-  /* 5274 */  { MAD_F(0x059a6926) /* 0.350197933 */, 18 },
-  /* 5275 */  { MAD_F(0x059ac5fc) /* 0.350286470 */, 18 },
-  /* 5276 */  { MAD_F(0x059b22d4) /* 0.350375013 */, 18 },
-  /* 5277 */  { MAD_F(0x059b7fae) /* 0.350463562 */, 18 },
-  /* 5278 */  { MAD_F(0x059bdc89) /* 0.350552116 */, 18 },
-  /* 5279 */  { MAD_F(0x059c3965) /* 0.350640675 */, 18 },
-
-  /* 5280 */  { MAD_F(0x059c9643) /* 0.350729240 */, 18 },
-  /* 5281 */  { MAD_F(0x059cf323) /* 0.350817811 */, 18 },
-  /* 5282 */  { MAD_F(0x059d5004) /* 0.350906388 */, 18 },
-  /* 5283 */  { MAD_F(0x059dace6) /* 0.350994970 */, 18 },
-  /* 5284 */  { MAD_F(0x059e09cb) /* 0.351083557 */, 18 },
-  /* 5285 */  { MAD_F(0x059e66b0) /* 0.351172150 */, 18 },
-  /* 5286 */  { MAD_F(0x059ec397) /* 0.351260749 */, 18 },
-  /* 5287 */  { MAD_F(0x059f2080) /* 0.351349353 */, 18 },
-  /* 5288 */  { MAD_F(0x059f7d6a) /* 0.351437963 */, 18 },
-  /* 5289 */  { MAD_F(0x059fda55) /* 0.351526579 */, 18 },
-  /* 5290 */  { MAD_F(0x05a03742) /* 0.351615200 */, 18 },
-  /* 5291 */  { MAD_F(0x05a09431) /* 0.351703827 */, 18 },
-  /* 5292 */  { MAD_F(0x05a0f121) /* 0.351792459 */, 18 },
-  /* 5293 */  { MAD_F(0x05a14e12) /* 0.351881097 */, 18 },
-  /* 5294 */  { MAD_F(0x05a1ab05) /* 0.351969740 */, 18 },
-  /* 5295 */  { MAD_F(0x05a207fa) /* 0.352058389 */, 18 },
-
-  /* 5296 */  { MAD_F(0x05a264f0) /* 0.352147044 */, 18 },
-  /* 5297 */  { MAD_F(0x05a2c1e7) /* 0.352235704 */, 18 },
-  /* 5298 */  { MAD_F(0x05a31ee1) /* 0.352324369 */, 18 },
-  /* 5299 */  { MAD_F(0x05a37bdb) /* 0.352413041 */, 18 },
-  /* 5300 */  { MAD_F(0x05a3d8d7) /* 0.352501718 */, 18 },
-  /* 5301 */  { MAD_F(0x05a435d5) /* 0.352590400 */, 18 },
-  /* 5302 */  { MAD_F(0x05a492d4) /* 0.352679088 */, 18 },
-  /* 5303 */  { MAD_F(0x05a4efd4) /* 0.352767782 */, 18 },
-  /* 5304 */  { MAD_F(0x05a54cd6) /* 0.352856481 */, 18 },
-  /* 5305 */  { MAD_F(0x05a5a9da) /* 0.352945186 */, 18 },
-  /* 5306 */  { MAD_F(0x05a606df) /* 0.353033896 */, 18 },
-  /* 5307 */  { MAD_F(0x05a663e5) /* 0.353122612 */, 18 },
-  /* 5308 */  { MAD_F(0x05a6c0ed) /* 0.353211333 */, 18 },
-  /* 5309 */  { MAD_F(0x05a71df7) /* 0.353300061 */, 18 },
-  /* 5310 */  { MAD_F(0x05a77b02) /* 0.353388793 */, 18 },
-  /* 5311 */  { MAD_F(0x05a7d80e) /* 0.353477531 */, 18 },
-
-  /* 5312 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 18 },
-  /* 5313 */  { MAD_F(0x05a8922c) /* 0.353655024 */, 18 },
-  /* 5314 */  { MAD_F(0x05a8ef3c) /* 0.353743779 */, 18 },
-  /* 5315 */  { MAD_F(0x05a94c4f) /* 0.353832540 */, 18 },
-  /* 5316 */  { MAD_F(0x05a9a963) /* 0.353921306 */, 18 },
-  /* 5317 */  { MAD_F(0x05aa0678) /* 0.354010077 */, 18 },
-  /* 5318 */  { MAD_F(0x05aa638f) /* 0.354098855 */, 18 },
-  /* 5319 */  { MAD_F(0x05aac0a8) /* 0.354187637 */, 18 },
-  /* 5320 */  { MAD_F(0x05ab1dc2) /* 0.354276426 */, 18 },
-  /* 5321 */  { MAD_F(0x05ab7add) /* 0.354365220 */, 18 },
-  /* 5322 */  { MAD_F(0x05abd7fa) /* 0.354454019 */, 18 },
-  /* 5323 */  { MAD_F(0x05ac3518) /* 0.354542824 */, 18 },
-  /* 5324 */  { MAD_F(0x05ac9238) /* 0.354631635 */, 18 },
-  /* 5325 */  { MAD_F(0x05acef5a) /* 0.354720451 */, 18 },
-  /* 5326 */  { MAD_F(0x05ad4c7d) /* 0.354809272 */, 18 },
-  /* 5327 */  { MAD_F(0x05ada9a1) /* 0.354898100 */, 18 },
-
-  /* 5328 */  { MAD_F(0x05ae06c7) /* 0.354986932 */, 18 },
-  /* 5329 */  { MAD_F(0x05ae63ee) /* 0.355075771 */, 18 },
-  /* 5330 */  { MAD_F(0x05aec117) /* 0.355164615 */, 18 },
-  /* 5331 */  { MAD_F(0x05af1e41) /* 0.355253464 */, 18 },
-  /* 5332 */  { MAD_F(0x05af7b6d) /* 0.355342319 */, 18 },
-  /* 5333 */  { MAD_F(0x05afd89b) /* 0.355431180 */, 18 },
-  /* 5334 */  { MAD_F(0x05b035c9) /* 0.355520046 */, 18 },
-  /* 5335 */  { MAD_F(0x05b092fa) /* 0.355608917 */, 18 },
-  /* 5336 */  { MAD_F(0x05b0f02b) /* 0.355697795 */, 18 },
-  /* 5337 */  { MAD_F(0x05b14d5f) /* 0.355786677 */, 18 },
-  /* 5338 */  { MAD_F(0x05b1aa94) /* 0.355875566 */, 18 },
-  /* 5339 */  { MAD_F(0x05b207ca) /* 0.355964460 */, 18 },
-  /* 5340 */  { MAD_F(0x05b26502) /* 0.356053359 */, 18 },
-  /* 5341 */  { MAD_F(0x05b2c23b) /* 0.356142264 */, 18 },
-  /* 5342 */  { MAD_F(0x05b31f76) /* 0.356231175 */, 18 },
-  /* 5343 */  { MAD_F(0x05b37cb2) /* 0.356320091 */, 18 },
-
-  /* 5344 */  { MAD_F(0x05b3d9f0) /* 0.356409012 */, 18 },
-  /* 5345 */  { MAD_F(0x05b4372f) /* 0.356497940 */, 18 },
-  /* 5346 */  { MAD_F(0x05b4946f) /* 0.356586872 */, 18 },
-  /* 5347 */  { MAD_F(0x05b4f1b2) /* 0.356675811 */, 18 },
-  /* 5348 */  { MAD_F(0x05b54ef5) /* 0.356764754 */, 18 },
-  /* 5349 */  { MAD_F(0x05b5ac3a) /* 0.356853704 */, 18 },
-  /* 5350 */  { MAD_F(0x05b60981) /* 0.356942659 */, 18 },
-  /* 5351 */  { MAD_F(0x05b666c9) /* 0.357031619 */, 18 },
-  /* 5352 */  { MAD_F(0x05b6c413) /* 0.357120585 */, 18 },
-  /* 5353 */  { MAD_F(0x05b7215e) /* 0.357209557 */, 18 },
-  /* 5354 */  { MAD_F(0x05b77eab) /* 0.357298534 */, 18 },
-  /* 5355 */  { MAD_F(0x05b7dbf9) /* 0.357387516 */, 18 },
-  /* 5356 */  { MAD_F(0x05b83948) /* 0.357476504 */, 18 },
-  /* 5357 */  { MAD_F(0x05b89699) /* 0.357565498 */, 18 },
-  /* 5358 */  { MAD_F(0x05b8f3ec) /* 0.357654497 */, 18 },
-  /* 5359 */  { MAD_F(0x05b95140) /* 0.357743502 */, 18 },
-
-  /* 5360 */  { MAD_F(0x05b9ae95) /* 0.357832512 */, 18 },
-  /* 5361 */  { MAD_F(0x05ba0bec) /* 0.357921528 */, 18 },
-  /* 5362 */  { MAD_F(0x05ba6945) /* 0.358010550 */, 18 },
-  /* 5363 */  { MAD_F(0x05bac69f) /* 0.358099576 */, 18 },
-  /* 5364 */  { MAD_F(0x05bb23fa) /* 0.358188609 */, 18 },
-  /* 5365 */  { MAD_F(0x05bb8157) /* 0.358277647 */, 18 },
-  /* 5366 */  { MAD_F(0x05bbdeb6) /* 0.358366690 */, 18 },
-  /* 5367 */  { MAD_F(0x05bc3c16) /* 0.358455739 */, 18 },
-  /* 5368 */  { MAD_F(0x05bc9977) /* 0.358544794 */, 18 },
-  /* 5369 */  { MAD_F(0x05bcf6da) /* 0.358633854 */, 18 },
-  /* 5370 */  { MAD_F(0x05bd543e) /* 0.358722920 */, 18 },
-  /* 5371 */  { MAD_F(0x05bdb1a4) /* 0.358811991 */, 18 },
-  /* 5372 */  { MAD_F(0x05be0f0b) /* 0.358901067 */, 18 },
-  /* 5373 */  { MAD_F(0x05be6c74) /* 0.358990150 */, 18 },
-  /* 5374 */  { MAD_F(0x05bec9df) /* 0.359079237 */, 18 },
-  /* 5375 */  { MAD_F(0x05bf274a) /* 0.359168331 */, 18 },
-
-  /* 5376 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 18 },
-  /* 5377 */  { MAD_F(0x05bfe226) /* 0.359346534 */, 18 },
-  /* 5378 */  { MAD_F(0x05c03f97) /* 0.359435644 */, 18 },
-  /* 5379 */  { MAD_F(0x05c09d08) /* 0.359524759 */, 18 },
-  /* 5380 */  { MAD_F(0x05c0fa7c) /* 0.359613880 */, 18 },
-  /* 5381 */  { MAD_F(0x05c157f0) /* 0.359703006 */, 18 },
-  /* 5382 */  { MAD_F(0x05c1b566) /* 0.359792138 */, 18 },
-  /* 5383 */  { MAD_F(0x05c212de) /* 0.359881276 */, 18 },
-  /* 5384 */  { MAD_F(0x05c27057) /* 0.359970419 */, 18 },
-  /* 5385 */  { MAD_F(0x05c2cdd2) /* 0.360059567 */, 18 },
-  /* 5386 */  { MAD_F(0x05c32b4e) /* 0.360148721 */, 18 },
-  /* 5387 */  { MAD_F(0x05c388cb) /* 0.360237881 */, 18 },
-  /* 5388 */  { MAD_F(0x05c3e64b) /* 0.360327046 */, 18 },
-  /* 5389 */  { MAD_F(0x05c443cb) /* 0.360416216 */, 18 },
-  /* 5390 */  { MAD_F(0x05c4a14d) /* 0.360505392 */, 18 },
-  /* 5391 */  { MAD_F(0x05c4fed1) /* 0.360594574 */, 18 },
-
-  /* 5392 */  { MAD_F(0x05c55c56) /* 0.360683761 */, 18 },
-  /* 5393 */  { MAD_F(0x05c5b9dc) /* 0.360772953 */, 18 },
-  /* 5394 */  { MAD_F(0x05c61764) /* 0.360862152 */, 18 },
-  /* 5395 */  { MAD_F(0x05c674ed) /* 0.360951355 */, 18 },
-  /* 5396 */  { MAD_F(0x05c6d278) /* 0.361040564 */, 18 },
-  /* 5397 */  { MAD_F(0x05c73005) /* 0.361129779 */, 18 },
-  /* 5398 */  { MAD_F(0x05c78d93) /* 0.361218999 */, 18 },
-  /* 5399 */  { MAD_F(0x05c7eb22) /* 0.361308225 */, 18 },
-  /* 5400 */  { MAD_F(0x05c848b3) /* 0.361397456 */, 18 },
-  /* 5401 */  { MAD_F(0x05c8a645) /* 0.361486693 */, 18 },
-  /* 5402 */  { MAD_F(0x05c903d9) /* 0.361575935 */, 18 },
-  /* 5403 */  { MAD_F(0x05c9616e) /* 0.361665183 */, 18 },
-  /* 5404 */  { MAD_F(0x05c9bf05) /* 0.361754436 */, 18 },
-  /* 5405 */  { MAD_F(0x05ca1c9d) /* 0.361843695 */, 18 },
-  /* 5406 */  { MAD_F(0x05ca7a37) /* 0.361932959 */, 18 },
-  /* 5407 */  { MAD_F(0x05cad7d2) /* 0.362022229 */, 18 },
-
-  /* 5408 */  { MAD_F(0x05cb356e) /* 0.362111504 */, 18 },
-  /* 5409 */  { MAD_F(0x05cb930d) /* 0.362200785 */, 18 },
-  /* 5410 */  { MAD_F(0x05cbf0ac) /* 0.362290071 */, 18 },
-  /* 5411 */  { MAD_F(0x05cc4e4d) /* 0.362379362 */, 18 },
-  /* 5412 */  { MAD_F(0x05ccabf0) /* 0.362468660 */, 18 },
-  /* 5413 */  { MAD_F(0x05cd0994) /* 0.362557962 */, 18 },
-  /* 5414 */  { MAD_F(0x05cd6739) /* 0.362647271 */, 18 },
-  /* 5415 */  { MAD_F(0x05cdc4e0) /* 0.362736584 */, 18 },
-  /* 5416 */  { MAD_F(0x05ce2289) /* 0.362825904 */, 18 },
-  /* 5417 */  { MAD_F(0x05ce8033) /* 0.362915228 */, 18 },
-  /* 5418 */  { MAD_F(0x05ceddde) /* 0.363004559 */, 18 },
-  /* 5419 */  { MAD_F(0x05cf3b8b) /* 0.363093894 */, 18 },
-  /* 5420 */  { MAD_F(0x05cf9939) /* 0.363183236 */, 18 },
-  /* 5421 */  { MAD_F(0x05cff6e9) /* 0.363272582 */, 18 },
-  /* 5422 */  { MAD_F(0x05d0549a) /* 0.363361935 */, 18 },
-  /* 5423 */  { MAD_F(0x05d0b24d) /* 0.363451292 */, 18 },
-
-  /* 5424 */  { MAD_F(0x05d11001) /* 0.363540655 */, 18 },
-  /* 5425 */  { MAD_F(0x05d16db7) /* 0.363630024 */, 18 },
-  /* 5426 */  { MAD_F(0x05d1cb6e) /* 0.363719398 */, 18 },
-  /* 5427 */  { MAD_F(0x05d22927) /* 0.363808778 */, 18 },
-  /* 5428 */  { MAD_F(0x05d286e1) /* 0.363898163 */, 18 },
-  /* 5429 */  { MAD_F(0x05d2e49d) /* 0.363987554 */, 18 },
-  /* 5430 */  { MAD_F(0x05d3425a) /* 0.364076950 */, 18 },
-  /* 5431 */  { MAD_F(0x05d3a018) /* 0.364166352 */, 18 },
-  /* 5432 */  { MAD_F(0x05d3fdd8) /* 0.364255759 */, 18 },
-  /* 5433 */  { MAD_F(0x05d45b9a) /* 0.364345171 */, 18 },
-  /* 5434 */  { MAD_F(0x05d4b95d) /* 0.364434589 */, 18 },
-  /* 5435 */  { MAD_F(0x05d51721) /* 0.364524013 */, 18 },
-  /* 5436 */  { MAD_F(0x05d574e7) /* 0.364613442 */, 18 },
-  /* 5437 */  { MAD_F(0x05d5d2af) /* 0.364702877 */, 18 },
-  /* 5438 */  { MAD_F(0x05d63078) /* 0.364792317 */, 18 },
-  /* 5439 */  { MAD_F(0x05d68e42) /* 0.364881762 */, 18 },
-
-  /* 5440 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 18 },
-  /* 5441 */  { MAD_F(0x05d749db) /* 0.365060669 */, 18 },
-  /* 5442 */  { MAD_F(0x05d7a7aa) /* 0.365150131 */, 18 },
-  /* 5443 */  { MAD_F(0x05d8057a) /* 0.365239599 */, 18 },
-  /* 5444 */  { MAD_F(0x05d8634c) /* 0.365329072 */, 18 },
-  /* 5445 */  { MAD_F(0x05d8c11f) /* 0.365418550 */, 18 },
-  /* 5446 */  { MAD_F(0x05d91ef4) /* 0.365508034 */, 18 },
-  /* 5447 */  { MAD_F(0x05d97cca) /* 0.365597523 */, 18 },
-  /* 5448 */  { MAD_F(0x05d9daa1) /* 0.365687018 */, 18 },
-  /* 5449 */  { MAD_F(0x05da387a) /* 0.365776518 */, 18 },
-  /* 5450 */  { MAD_F(0x05da9655) /* 0.365866024 */, 18 },
-  /* 5451 */  { MAD_F(0x05daf431) /* 0.365955536 */, 18 },
-  /* 5452 */  { MAD_F(0x05db520e) /* 0.366045052 */, 18 },
-  /* 5453 */  { MAD_F(0x05dbafed) /* 0.366134574 */, 18 },
-  /* 5454 */  { MAD_F(0x05dc0dce) /* 0.366224102 */, 18 },
-  /* 5455 */  { MAD_F(0x05dc6baf) /* 0.366313635 */, 18 },
-
-  /* 5456 */  { MAD_F(0x05dcc993) /* 0.366403174 */, 18 },
-  /* 5457 */  { MAD_F(0x05dd2778) /* 0.366492718 */, 18 },
-  /* 5458 */  { MAD_F(0x05dd855e) /* 0.366582267 */, 18 },
-  /* 5459 */  { MAD_F(0x05dde346) /* 0.366671822 */, 18 },
-  /* 5460 */  { MAD_F(0x05de412f) /* 0.366761383 */, 18 },
-  /* 5461 */  { MAD_F(0x05de9f1a) /* 0.366850949 */, 18 },
-  /* 5462 */  { MAD_F(0x05defd06) /* 0.366940520 */, 18 },
-  /* 5463 */  { MAD_F(0x05df5af3) /* 0.367030097 */, 18 },
-  /* 5464 */  { MAD_F(0x05dfb8e2) /* 0.367119680 */, 18 },
-  /* 5465 */  { MAD_F(0x05e016d3) /* 0.367209267 */, 18 },
-  /* 5466 */  { MAD_F(0x05e074c5) /* 0.367298861 */, 18 },
-  /* 5467 */  { MAD_F(0x05e0d2b8) /* 0.367388459 */, 18 },
-  /* 5468 */  { MAD_F(0x05e130ad) /* 0.367478064 */, 18 },
-  /* 5469 */  { MAD_F(0x05e18ea4) /* 0.367567673 */, 18 },
-  /* 5470 */  { MAD_F(0x05e1ec9c) /* 0.367657288 */, 18 },
-  /* 5471 */  { MAD_F(0x05e24a95) /* 0.367746909 */, 18 },
-
-  /* 5472 */  { MAD_F(0x05e2a890) /* 0.367836535 */, 18 },
-  /* 5473 */  { MAD_F(0x05e3068c) /* 0.367926167 */, 18 },
-  /* 5474 */  { MAD_F(0x05e3648a) /* 0.368015804 */, 18 },
-  /* 5475 */  { MAD_F(0x05e3c289) /* 0.368105446 */, 18 },
-  /* 5476 */  { MAD_F(0x05e4208a) /* 0.368195094 */, 18 },
-  /* 5477 */  { MAD_F(0x05e47e8c) /* 0.368284747 */, 18 },
-  /* 5478 */  { MAD_F(0x05e4dc8f) /* 0.368374406 */, 18 },
-  /* 5479 */  { MAD_F(0x05e53a94) /* 0.368464070 */, 18 },
-  /* 5480 */  { MAD_F(0x05e5989b) /* 0.368553740 */, 18 },
-  /* 5481 */  { MAD_F(0x05e5f6a3) /* 0.368643415 */, 18 },
-  /* 5482 */  { MAD_F(0x05e654ac) /* 0.368733096 */, 18 },
-  /* 5483 */  { MAD_F(0x05e6b2b7) /* 0.368822782 */, 18 },
-  /* 5484 */  { MAD_F(0x05e710c4) /* 0.368912473 */, 18 },
-  /* 5485 */  { MAD_F(0x05e76ed2) /* 0.369002170 */, 18 },
-  /* 5486 */  { MAD_F(0x05e7cce1) /* 0.369091873 */, 18 },
-  /* 5487 */  { MAD_F(0x05e82af2) /* 0.369181581 */, 18 },
-
-  /* 5488 */  { MAD_F(0x05e88904) /* 0.369271294 */, 18 },
-  /* 5489 */  { MAD_F(0x05e8e718) /* 0.369361013 */, 18 },
-  /* 5490 */  { MAD_F(0x05e9452d) /* 0.369450737 */, 18 },
-  /* 5491 */  { MAD_F(0x05e9a343) /* 0.369540467 */, 18 },
-  /* 5492 */  { MAD_F(0x05ea015c) /* 0.369630202 */, 18 },
-  /* 5493 */  { MAD_F(0x05ea5f75) /* 0.369719942 */, 18 },
-  /* 5494 */  { MAD_F(0x05eabd90) /* 0.369809688 */, 18 },
-  /* 5495 */  { MAD_F(0x05eb1bad) /* 0.369899440 */, 18 },
-  /* 5496 */  { MAD_F(0x05eb79cb) /* 0.369989197 */, 18 },
-  /* 5497 */  { MAD_F(0x05ebd7ea) /* 0.370078959 */, 18 },
-  /* 5498 */  { MAD_F(0x05ec360b) /* 0.370168727 */, 18 },
-  /* 5499 */  { MAD_F(0x05ec942d) /* 0.370258500 */, 18 },
-  /* 5500 */  { MAD_F(0x05ecf251) /* 0.370348279 */, 18 },
-  /* 5501 */  { MAD_F(0x05ed5076) /* 0.370438063 */, 18 },
-  /* 5502 */  { MAD_F(0x05edae9d) /* 0.370527853 */, 18 },
-  /* 5503 */  { MAD_F(0x05ee0cc5) /* 0.370617648 */, 18 },
-
-  /* 5504 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 18 },
-  /* 5505 */  { MAD_F(0x05eec91a) /* 0.370797254 */, 18 },
-  /* 5506 */  { MAD_F(0x05ef2746) /* 0.370887065 */, 18 },
-  /* 5507 */  { MAD_F(0x05ef8574) /* 0.370976882 */, 18 },
-  /* 5508 */  { MAD_F(0x05efe3a4) /* 0.371066704 */, 18 },
-  /* 5509 */  { MAD_F(0x05f041d5) /* 0.371156532 */, 18 },
-  /* 5510 */  { MAD_F(0x05f0a007) /* 0.371246365 */, 18 },
-  /* 5511 */  { MAD_F(0x05f0fe3b) /* 0.371336203 */, 18 },
-  /* 5512 */  { MAD_F(0x05f15c70) /* 0.371426047 */, 18 },
-  /* 5513 */  { MAD_F(0x05f1baa7) /* 0.371515897 */, 18 },
-  /* 5514 */  { MAD_F(0x05f218df) /* 0.371605751 */, 18 },
-  /* 5515 */  { MAD_F(0x05f27719) /* 0.371695612 */, 18 },
-  /* 5516 */  { MAD_F(0x05f2d554) /* 0.371785477 */, 18 },
-  /* 5517 */  { MAD_F(0x05f33390) /* 0.371875348 */, 18 },
-  /* 5518 */  { MAD_F(0x05f391cf) /* 0.371965225 */, 18 },
-  /* 5519 */  { MAD_F(0x05f3f00e) /* 0.372055107 */, 18 },
-
-  /* 5520 */  { MAD_F(0x05f44e4f) /* 0.372144994 */, 18 },
-  /* 5521 */  { MAD_F(0x05f4ac91) /* 0.372234887 */, 18 },
-  /* 5522 */  { MAD_F(0x05f50ad5) /* 0.372324785 */, 18 },
-  /* 5523 */  { MAD_F(0x05f5691b) /* 0.372414689 */, 18 },
-  /* 5524 */  { MAD_F(0x05f5c761) /* 0.372504598 */, 18 },
-  /* 5525 */  { MAD_F(0x05f625aa) /* 0.372594513 */, 18 },
-  /* 5526 */  { MAD_F(0x05f683f3) /* 0.372684433 */, 18 },
-  /* 5527 */  { MAD_F(0x05f6e23f) /* 0.372774358 */, 18 },
-  /* 5528 */  { MAD_F(0x05f7408b) /* 0.372864289 */, 18 },
-  /* 5529 */  { MAD_F(0x05f79ed9) /* 0.372954225 */, 18 },
-  /* 5530 */  { MAD_F(0x05f7fd29) /* 0.373044167 */, 18 },
-  /* 5531 */  { MAD_F(0x05f85b7a) /* 0.373134114 */, 18 },
-  /* 5532 */  { MAD_F(0x05f8b9cc) /* 0.373224066 */, 18 },
-  /* 5533 */  { MAD_F(0x05f91820) /* 0.373314024 */, 18 },
-  /* 5534 */  { MAD_F(0x05f97675) /* 0.373403987 */, 18 },
-  /* 5535 */  { MAD_F(0x05f9d4cc) /* 0.373493956 */, 18 },
-
-  /* 5536 */  { MAD_F(0x05fa3324) /* 0.373583930 */, 18 },
-  /* 5537 */  { MAD_F(0x05fa917e) /* 0.373673910 */, 18 },
-  /* 5538 */  { MAD_F(0x05faefd9) /* 0.373763895 */, 18 },
-  /* 5539 */  { MAD_F(0x05fb4e36) /* 0.373853885 */, 18 },
-  /* 5540 */  { MAD_F(0x05fbac94) /* 0.373943881 */, 18 },
-  /* 5541 */  { MAD_F(0x05fc0af3) /* 0.374033882 */, 18 },
-  /* 5542 */  { MAD_F(0x05fc6954) /* 0.374123889 */, 18 },
-  /* 5543 */  { MAD_F(0x05fcc7b7) /* 0.374213901 */, 18 },
-  /* 5544 */  { MAD_F(0x05fd261b) /* 0.374303918 */, 18 },
-  /* 5545 */  { MAD_F(0x05fd8480) /* 0.374393941 */, 18 },
-  /* 5546 */  { MAD_F(0x05fde2e7) /* 0.374483970 */, 18 },
-  /* 5547 */  { MAD_F(0x05fe414f) /* 0.374574003 */, 18 },
-  /* 5548 */  { MAD_F(0x05fe9fb9) /* 0.374664042 */, 18 },
-  /* 5549 */  { MAD_F(0x05fefe24) /* 0.374754087 */, 18 },
-  /* 5550 */  { MAD_F(0x05ff5c91) /* 0.374844137 */, 18 },
-  /* 5551 */  { MAD_F(0x05ffbaff) /* 0.374934192 */, 18 },
-
-  /* 5552 */  { MAD_F(0x0600196e) /* 0.375024253 */, 18 },
-  /* 5553 */  { MAD_F(0x060077df) /* 0.375114319 */, 18 },
-  /* 5554 */  { MAD_F(0x0600d651) /* 0.375204391 */, 18 },
-  /* 5555 */  { MAD_F(0x060134c5) /* 0.375294468 */, 18 },
-  /* 5556 */  { MAD_F(0x0601933b) /* 0.375384550 */, 18 },
-  /* 5557 */  { MAD_F(0x0601f1b1) /* 0.375474638 */, 18 },
-  /* 5558 */  { MAD_F(0x0602502a) /* 0.375564731 */, 18 },
-  /* 5559 */  { MAD_F(0x0602aea3) /* 0.375654830 */, 18 },
-  /* 5560 */  { MAD_F(0x06030d1e) /* 0.375744934 */, 18 },
-  /* 5561 */  { MAD_F(0x06036b9b) /* 0.375835043 */, 18 },
-  /* 5562 */  { MAD_F(0x0603ca19) /* 0.375925158 */, 18 },
-  /* 5563 */  { MAD_F(0x06042898) /* 0.376015278 */, 18 },
-  /* 5564 */  { MAD_F(0x06048719) /* 0.376105404 */, 18 },
-  /* 5565 */  { MAD_F(0x0604e59c) /* 0.376195535 */, 18 },
-  /* 5566 */  { MAD_F(0x0605441f) /* 0.376285671 */, 18 },
-  /* 5567 */  { MAD_F(0x0605a2a5) /* 0.376375813 */, 18 },
-
-  /* 5568 */  { MAD_F(0x0606012b) /* 0.376465960 */, 18 },
-  /* 5569 */  { MAD_F(0x06065fb4) /* 0.376556113 */, 18 },
-  /* 5570 */  { MAD_F(0x0606be3d) /* 0.376646271 */, 18 },
-  /* 5571 */  { MAD_F(0x06071cc8) /* 0.376736434 */, 18 },
-  /* 5572 */  { MAD_F(0x06077b55) /* 0.376826603 */, 18 },
-  /* 5573 */  { MAD_F(0x0607d9e3) /* 0.376916777 */, 18 },
-  /* 5574 */  { MAD_F(0x06083872) /* 0.377006957 */, 18 },
-  /* 5575 */  { MAD_F(0x06089703) /* 0.377097141 */, 18 },
-  /* 5576 */  { MAD_F(0x0608f595) /* 0.377187332 */, 18 },
-  /* 5577 */  { MAD_F(0x06095429) /* 0.377277528 */, 18 },
-  /* 5578 */  { MAD_F(0x0609b2be) /* 0.377367729 */, 18 },
-  /* 5579 */  { MAD_F(0x060a1155) /* 0.377457935 */, 18 },
-  /* 5580 */  { MAD_F(0x060a6fed) /* 0.377548147 */, 18 },
-  /* 5581 */  { MAD_F(0x060ace86) /* 0.377638364 */, 18 },
-  /* 5582 */  { MAD_F(0x060b2d21) /* 0.377728587 */, 18 },
-  /* 5583 */  { MAD_F(0x060b8bbe) /* 0.377818815 */, 18 },
-
-  /* 5584 */  { MAD_F(0x060bea5c) /* 0.377909049 */, 18 },
-  /* 5585 */  { MAD_F(0x060c48fb) /* 0.377999288 */, 18 },
-  /* 5586 */  { MAD_F(0x060ca79c) /* 0.378089532 */, 18 },
-  /* 5587 */  { MAD_F(0x060d063e) /* 0.378179781 */, 18 },
-  /* 5588 */  { MAD_F(0x060d64e1) /* 0.378270036 */, 18 },
-  /* 5589 */  { MAD_F(0x060dc387) /* 0.378360297 */, 18 },
-  /* 5590 */  { MAD_F(0x060e222d) /* 0.378450563 */, 18 },
-  /* 5591 */  { MAD_F(0x060e80d5) /* 0.378540834 */, 18 },
-  /* 5592 */  { MAD_F(0x060edf7f) /* 0.378631110 */, 18 },
-  /* 5593 */  { MAD_F(0x060f3e29) /* 0.378721392 */, 18 },
-  /* 5594 */  { MAD_F(0x060f9cd6) /* 0.378811680 */, 18 },
-  /* 5595 */  { MAD_F(0x060ffb83) /* 0.378901972 */, 18 },
-  /* 5596 */  { MAD_F(0x06105a33) /* 0.378992270 */, 18 },
-  /* 5597 */  { MAD_F(0x0610b8e3) /* 0.379082574 */, 18 },
-  /* 5598 */  { MAD_F(0x06111795) /* 0.379172883 */, 18 },
-  /* 5599 */  { MAD_F(0x06117649) /* 0.379263197 */, 18 },
-
-  /* 5600 */  { MAD_F(0x0611d4fe) /* 0.379353516 */, 18 },
-  /* 5601 */  { MAD_F(0x061233b4) /* 0.379443841 */, 18 },
-  /* 5602 */  { MAD_F(0x0612926c) /* 0.379534172 */, 18 },
-  /* 5603 */  { MAD_F(0x0612f125) /* 0.379624507 */, 18 },
-  /* 5604 */  { MAD_F(0x06134fe0) /* 0.379714848 */, 18 },
-  /* 5605 */  { MAD_F(0x0613ae9c) /* 0.379805195 */, 18 },
-  /* 5606 */  { MAD_F(0x06140d5a) /* 0.379895547 */, 18 },
-  /* 5607 */  { MAD_F(0x06146c19) /* 0.379985904 */, 18 },
-  /* 5608 */  { MAD_F(0x0614cada) /* 0.380076266 */, 18 },
-  /* 5609 */  { MAD_F(0x0615299c) /* 0.380166634 */, 18 },
-  /* 5610 */  { MAD_F(0x0615885f) /* 0.380257008 */, 18 },
-  /* 5611 */  { MAD_F(0x0615e724) /* 0.380347386 */, 18 },
-  /* 5612 */  { MAD_F(0x061645ea) /* 0.380437770 */, 18 },
-  /* 5613 */  { MAD_F(0x0616a4b2) /* 0.380528160 */, 18 },
-  /* 5614 */  { MAD_F(0x0617037b) /* 0.380618555 */, 18 },
-  /* 5615 */  { MAD_F(0x06176246) /* 0.380708955 */, 18 },
-
-  /* 5616 */  { MAD_F(0x0617c112) /* 0.380799360 */, 18 },
-  /* 5617 */  { MAD_F(0x06181fdf) /* 0.380889771 */, 18 },
-  /* 5618 */  { MAD_F(0x06187eae) /* 0.380980187 */, 18 },
-  /* 5619 */  { MAD_F(0x0618dd7e) /* 0.381070609 */, 18 },
-  /* 5620 */  { MAD_F(0x06193c50) /* 0.381161036 */, 18 },
-  /* 5621 */  { MAD_F(0x06199b24) /* 0.381251468 */, 18 },
-  /* 5622 */  { MAD_F(0x0619f9f8) /* 0.381341906 */, 18 },
-  /* 5623 */  { MAD_F(0x061a58ce) /* 0.381432349 */, 18 },
-  /* 5624 */  { MAD_F(0x061ab7a6) /* 0.381522798 */, 18 },
-  /* 5625 */  { MAD_F(0x061b167f) /* 0.381613251 */, 18 },
-  /* 5626 */  { MAD_F(0x061b7559) /* 0.381703711 */, 18 },
-  /* 5627 */  { MAD_F(0x061bd435) /* 0.381794175 */, 18 },
-  /* 5628 */  { MAD_F(0x061c3313) /* 0.381884645 */, 18 },
-  /* 5629 */  { MAD_F(0x061c91f1) /* 0.381975120 */, 18 },
-  /* 5630 */  { MAD_F(0x061cf0d2) /* 0.382065601 */, 18 },
-  /* 5631 */  { MAD_F(0x061d4fb3) /* 0.382156087 */, 18 },
-
-  /* 5632 */  { MAD_F(0x061dae96) /* 0.382246578 */, 18 },
-  /* 5633 */  { MAD_F(0x061e0d7b) /* 0.382337075 */, 18 },
-  /* 5634 */  { MAD_F(0x061e6c61) /* 0.382427577 */, 18 },
-  /* 5635 */  { MAD_F(0x061ecb48) /* 0.382518084 */, 18 },
-  /* 5636 */  { MAD_F(0x061f2a31) /* 0.382608597 */, 18 },
-  /* 5637 */  { MAD_F(0x061f891b) /* 0.382699115 */, 18 },
-  /* 5638 */  { MAD_F(0x061fe807) /* 0.382789638 */, 18 },
-  /* 5639 */  { MAD_F(0x062046f4) /* 0.382880167 */, 18 },
-  /* 5640 */  { MAD_F(0x0620a5e3) /* 0.382970701 */, 18 },
-  /* 5641 */  { MAD_F(0x062104d3) /* 0.383061241 */, 18 },
-  /* 5642 */  { MAD_F(0x062163c4) /* 0.383151786 */, 18 },
-  /* 5643 */  { MAD_F(0x0621c2b7) /* 0.383242336 */, 18 },
-  /* 5644 */  { MAD_F(0x062221ab) /* 0.383332891 */, 18 },
-  /* 5645 */  { MAD_F(0x062280a1) /* 0.383423452 */, 18 },
-  /* 5646 */  { MAD_F(0x0622df98) /* 0.383514018 */, 18 },
-  /* 5647 */  { MAD_F(0x06233e91) /* 0.383604590 */, 18 },
-
-  /* 5648 */  { MAD_F(0x06239d8b) /* 0.383695167 */, 18 },
-  /* 5649 */  { MAD_F(0x0623fc86) /* 0.383785749 */, 18 },
-  /* 5650 */  { MAD_F(0x06245b83) /* 0.383876337 */, 18 },
-  /* 5651 */  { MAD_F(0x0624ba82) /* 0.383966930 */, 18 },
-  /* 5652 */  { MAD_F(0x06251981) /* 0.384057528 */, 18 },
-  /* 5653 */  { MAD_F(0x06257883) /* 0.384148132 */, 18 },
-  /* 5654 */  { MAD_F(0x0625d785) /* 0.384238741 */, 18 },
-  /* 5655 */  { MAD_F(0x06263689) /* 0.384329355 */, 18 },
-  /* 5656 */  { MAD_F(0x0626958f) /* 0.384419975 */, 18 },
-  /* 5657 */  { MAD_F(0x0626f496) /* 0.384510600 */, 18 },
-  /* 5658 */  { MAD_F(0x0627539e) /* 0.384601230 */, 18 },
-  /* 5659 */  { MAD_F(0x0627b2a8) /* 0.384691866 */, 18 },
-  /* 5660 */  { MAD_F(0x062811b3) /* 0.384782507 */, 18 },
-  /* 5661 */  { MAD_F(0x062870c0) /* 0.384873153 */, 18 },
-  /* 5662 */  { MAD_F(0x0628cfce) /* 0.384963805 */, 18 },
-  /* 5663 */  { MAD_F(0x06292ede) /* 0.385054462 */, 18 },
-
-  /* 5664 */  { MAD_F(0x06298def) /* 0.385145124 */, 18 },
-  /* 5665 */  { MAD_F(0x0629ed01) /* 0.385235792 */, 18 },
-  /* 5666 */  { MAD_F(0x062a4c15) /* 0.385326465 */, 18 },
-  /* 5667 */  { MAD_F(0x062aab2a) /* 0.385417143 */, 18 },
-  /* 5668 */  { MAD_F(0x062b0a41) /* 0.385507827 */, 18 },
-  /* 5669 */  { MAD_F(0x062b6959) /* 0.385598516 */, 18 },
-  /* 5670 */  { MAD_F(0x062bc873) /* 0.385689211 */, 18 },
-  /* 5671 */  { MAD_F(0x062c278e) /* 0.385779910 */, 18 },
-  /* 5672 */  { MAD_F(0x062c86aa) /* 0.385870615 */, 18 },
-  /* 5673 */  { MAD_F(0x062ce5c8) /* 0.385961326 */, 18 },
-  /* 5674 */  { MAD_F(0x062d44e8) /* 0.386052041 */, 18 },
-  /* 5675 */  { MAD_F(0x062da408) /* 0.386142762 */, 18 },
-  /* 5676 */  { MAD_F(0x062e032a) /* 0.386233489 */, 18 },
-  /* 5677 */  { MAD_F(0x062e624e) /* 0.386324221 */, 18 },
-  /* 5678 */  { MAD_F(0x062ec173) /* 0.386414958 */, 18 },
-  /* 5679 */  { MAD_F(0x062f209a) /* 0.386505700 */, 18 },
-
-  /* 5680 */  { MAD_F(0x062f7fc1) /* 0.386596448 */, 18 },
-  /* 5681 */  { MAD_F(0x062fdeeb) /* 0.386687201 */, 18 },
-  /* 5682 */  { MAD_F(0x06303e16) /* 0.386777959 */, 18 },
-  /* 5683 */  { MAD_F(0x06309d42) /* 0.386868723 */, 18 },
-  /* 5684 */  { MAD_F(0x0630fc6f) /* 0.386959492 */, 18 },
-  /* 5685 */  { MAD_F(0x06315b9e) /* 0.387050266 */, 18 },
-  /* 5686 */  { MAD_F(0x0631bacf) /* 0.387141045 */, 18 },
-  /* 5687 */  { MAD_F(0x06321a01) /* 0.387231830 */, 18 },
-  /* 5688 */  { MAD_F(0x06327934) /* 0.387322621 */, 18 },
-  /* 5689 */  { MAD_F(0x0632d869) /* 0.387413416 */, 18 },
-  /* 5690 */  { MAD_F(0x0633379f) /* 0.387504217 */, 18 },
-  /* 5691 */  { MAD_F(0x063396d7) /* 0.387595023 */, 18 },
-  /* 5692 */  { MAD_F(0x0633f610) /* 0.387685835 */, 18 },
-  /* 5693 */  { MAD_F(0x0634554a) /* 0.387776652 */, 18 },
-  /* 5694 */  { MAD_F(0x0634b486) /* 0.387867474 */, 18 },
-  /* 5695 */  { MAD_F(0x063513c3) /* 0.387958301 */, 18 },
-
-  /* 5696 */  { MAD_F(0x06357302) /* 0.388049134 */, 18 },
-  /* 5697 */  { MAD_F(0x0635d242) /* 0.388139972 */, 18 },
-  /* 5698 */  { MAD_F(0x06363184) /* 0.388230816 */, 18 },
-  /* 5699 */  { MAD_F(0x063690c7) /* 0.388321665 */, 18 },
-  /* 5700 */  { MAD_F(0x0636f00b) /* 0.388412519 */, 18 },
-  /* 5701 */  { MAD_F(0x06374f51) /* 0.388503378 */, 18 },
-  /* 5702 */  { MAD_F(0x0637ae99) /* 0.388594243 */, 18 },
-  /* 5703 */  { MAD_F(0x06380de1) /* 0.388685113 */, 18 },
-  /* 5704 */  { MAD_F(0x06386d2b) /* 0.388775988 */, 18 },
-  /* 5705 */  { MAD_F(0x0638cc77) /* 0.388866869 */, 18 },
-  /* 5706 */  { MAD_F(0x06392bc4) /* 0.388957755 */, 18 },
-  /* 5707 */  { MAD_F(0x06398b12) /* 0.389048646 */, 18 },
-  /* 5708 */  { MAD_F(0x0639ea62) /* 0.389139542 */, 18 },
-  /* 5709 */  { MAD_F(0x063a49b4) /* 0.389230444 */, 18 },
-  /* 5710 */  { MAD_F(0x063aa906) /* 0.389321352 */, 18 },
-  /* 5711 */  { MAD_F(0x063b085a) /* 0.389412264 */, 18 },
-
-  /* 5712 */  { MAD_F(0x063b67b0) /* 0.389503182 */, 18 },
-  /* 5713 */  { MAD_F(0x063bc707) /* 0.389594105 */, 18 },
-  /* 5714 */  { MAD_F(0x063c265f) /* 0.389685033 */, 18 },
-  /* 5715 */  { MAD_F(0x063c85b9) /* 0.389775967 */, 18 },
-  /* 5716 */  { MAD_F(0x063ce514) /* 0.389866906 */, 18 },
-  /* 5717 */  { MAD_F(0x063d4471) /* 0.389957850 */, 18 },
-  /* 5718 */  { MAD_F(0x063da3cf) /* 0.390048800 */, 18 },
-  /* 5719 */  { MAD_F(0x063e032f) /* 0.390139755 */, 18 },
-  /* 5720 */  { MAD_F(0x063e6290) /* 0.390230715 */, 18 },
-  /* 5721 */  { MAD_F(0x063ec1f2) /* 0.390321681 */, 18 },
-  /* 5722 */  { MAD_F(0x063f2156) /* 0.390412651 */, 18 },
-  /* 5723 */  { MAD_F(0x063f80bb) /* 0.390503628 */, 18 },
-  /* 5724 */  { MAD_F(0x063fe022) /* 0.390594609 */, 18 },
-  /* 5725 */  { MAD_F(0x06403f8a) /* 0.390685596 */, 18 },
-  /* 5726 */  { MAD_F(0x06409ef3) /* 0.390776588 */, 18 },
-  /* 5727 */  { MAD_F(0x0640fe5e) /* 0.390867585 */, 18 },
-
-  /* 5728 */  { MAD_F(0x06415dcb) /* 0.390958588 */, 18 },
-  /* 5729 */  { MAD_F(0x0641bd38) /* 0.391049596 */, 18 },
-  /* 5730 */  { MAD_F(0x06421ca7) /* 0.391140609 */, 18 },
-  /* 5731 */  { MAD_F(0x06427c18) /* 0.391231627 */, 18 },
-  /* 5732 */  { MAD_F(0x0642db8a) /* 0.391322651 */, 18 },
-  /* 5733 */  { MAD_F(0x06433afd) /* 0.391413680 */, 18 },
-  /* 5734 */  { MAD_F(0x06439a72) /* 0.391504714 */, 18 },
-  /* 5735 */  { MAD_F(0x0643f9e9) /* 0.391595754 */, 18 },
-  /* 5736 */  { MAD_F(0x06445960) /* 0.391686799 */, 18 },
-  /* 5737 */  { MAD_F(0x0644b8d9) /* 0.391777849 */, 18 },
-  /* 5738 */  { MAD_F(0x06451854) /* 0.391868905 */, 18 },
-  /* 5739 */  { MAD_F(0x064577d0) /* 0.391959966 */, 18 },
-  /* 5740 */  { MAD_F(0x0645d74d) /* 0.392051032 */, 18 },
-  /* 5741 */  { MAD_F(0x064636cc) /* 0.392142103 */, 18 },
-  /* 5742 */  { MAD_F(0x0646964c) /* 0.392233180 */, 18 },
-  /* 5743 */  { MAD_F(0x0646f5ce) /* 0.392324262 */, 18 },
-
-  /* 5744 */  { MAD_F(0x06475551) /* 0.392415349 */, 18 },
-  /* 5745 */  { MAD_F(0x0647b4d5) /* 0.392506442 */, 18 },
-  /* 5746 */  { MAD_F(0x0648145b) /* 0.392597540 */, 18 },
-  /* 5747 */  { MAD_F(0x064873e3) /* 0.392688643 */, 18 },
-  /* 5748 */  { MAD_F(0x0648d36b) /* 0.392779751 */, 18 },
-  /* 5749 */  { MAD_F(0x064932f6) /* 0.392870865 */, 18 },
-  /* 5750 */  { MAD_F(0x06499281) /* 0.392961984 */, 18 },
-  /* 5751 */  { MAD_F(0x0649f20e) /* 0.393053108 */, 18 },
-  /* 5752 */  { MAD_F(0x064a519c) /* 0.393144238 */, 18 },
-  /* 5753 */  { MAD_F(0x064ab12c) /* 0.393235372 */, 18 },
-  /* 5754 */  { MAD_F(0x064b10be) /* 0.393326513 */, 18 },
-  /* 5755 */  { MAD_F(0x064b7050) /* 0.393417658 */, 18 },
-  /* 5756 */  { MAD_F(0x064bcfe4) /* 0.393508809 */, 18 },
-  /* 5757 */  { MAD_F(0x064c2f7a) /* 0.393599965 */, 18 },
-  /* 5758 */  { MAD_F(0x064c8f11) /* 0.393691126 */, 18 },
-  /* 5759 */  { MAD_F(0x064ceea9) /* 0.393782292 */, 18 },
-
-  /* 5760 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 18 },
-  /* 5761 */  { MAD_F(0x064dadde) /* 0.393964641 */, 18 },
-  /* 5762 */  { MAD_F(0x064e0d7a) /* 0.394055823 */, 18 },
-  /* 5763 */  { MAD_F(0x064e6d18) /* 0.394147011 */, 18 },
-  /* 5764 */  { MAD_F(0x064eccb8) /* 0.394238204 */, 18 },
-  /* 5765 */  { MAD_F(0x064f2c59) /* 0.394329402 */, 18 },
-  /* 5766 */  { MAD_F(0x064f8bfb) /* 0.394420605 */, 18 },
-  /* 5767 */  { MAD_F(0x064feb9e) /* 0.394511814 */, 18 },
-  /* 5768 */  { MAD_F(0x06504b44) /* 0.394603028 */, 18 },
-  /* 5769 */  { MAD_F(0x0650aaea) /* 0.394694247 */, 18 },
-  /* 5770 */  { MAD_F(0x06510a92) /* 0.394785472 */, 18 },
-  /* 5771 */  { MAD_F(0x06516a3b) /* 0.394876702 */, 18 },
-  /* 5772 */  { MAD_F(0x0651c9e6) /* 0.394967937 */, 18 },
-  /* 5773 */  { MAD_F(0x06522992) /* 0.395059177 */, 18 },
-  /* 5774 */  { MAD_F(0x06528940) /* 0.395150423 */, 18 },
-  /* 5775 */  { MAD_F(0x0652e8ef) /* 0.395241673 */, 18 },
-
-  /* 5776 */  { MAD_F(0x0653489f) /* 0.395332930 */, 18 },
-  /* 5777 */  { MAD_F(0x0653a851) /* 0.395424191 */, 18 },
-  /* 5778 */  { MAD_F(0x06540804) /* 0.395515458 */, 18 },
-  /* 5779 */  { MAD_F(0x065467b9) /* 0.395606730 */, 18 },
-  /* 5780 */  { MAD_F(0x0654c76f) /* 0.395698007 */, 18 },
-  /* 5781 */  { MAD_F(0x06552726) /* 0.395789289 */, 18 },
-  /* 5782 */  { MAD_F(0x065586df) /* 0.395880577 */, 18 },
-  /* 5783 */  { MAD_F(0x0655e699) /* 0.395971870 */, 18 },
-  /* 5784 */  { MAD_F(0x06564655) /* 0.396063168 */, 18 },
-  /* 5785 */  { MAD_F(0x0656a612) /* 0.396154472 */, 18 },
-  /* 5786 */  { MAD_F(0x065705d0) /* 0.396245780 */, 18 },
-  /* 5787 */  { MAD_F(0x06576590) /* 0.396337094 */, 18 },
-  /* 5788 */  { MAD_F(0x0657c552) /* 0.396428414 */, 18 },
-  /* 5789 */  { MAD_F(0x06582514) /* 0.396519738 */, 18 },
-  /* 5790 */  { MAD_F(0x065884d9) /* 0.396611068 */, 18 },
-  /* 5791 */  { MAD_F(0x0658e49e) /* 0.396702403 */, 18 },
-
-  /* 5792 */  { MAD_F(0x06594465) /* 0.396793743 */, 18 },
-  /* 5793 */  { MAD_F(0x0659a42e) /* 0.396885089 */, 18 },
-  /* 5794 */  { MAD_F(0x065a03f7) /* 0.396976440 */, 18 },
-  /* 5795 */  { MAD_F(0x065a63c3) /* 0.397067796 */, 18 },
-  /* 5796 */  { MAD_F(0x065ac38f) /* 0.397159157 */, 18 },
-  /* 5797 */  { MAD_F(0x065b235d) /* 0.397250524 */, 18 },
-  /* 5798 */  { MAD_F(0x065b832d) /* 0.397341896 */, 18 },
-  /* 5799 */  { MAD_F(0x065be2fe) /* 0.397433273 */, 18 },
-  /* 5800 */  { MAD_F(0x065c42d0) /* 0.397524655 */, 18 },
-  /* 5801 */  { MAD_F(0x065ca2a3) /* 0.397616043 */, 18 },
-  /* 5802 */  { MAD_F(0x065d0279) /* 0.397707436 */, 18 },
-  /* 5803 */  { MAD_F(0x065d624f) /* 0.397798834 */, 18 },
-  /* 5804 */  { MAD_F(0x065dc227) /* 0.397890237 */, 18 },
-  /* 5805 */  { MAD_F(0x065e2200) /* 0.397981646 */, 18 },
-  /* 5806 */  { MAD_F(0x065e81db) /* 0.398073059 */, 18 },
-  /* 5807 */  { MAD_F(0x065ee1b7) /* 0.398164479 */, 18 },
-
-  /* 5808 */  { MAD_F(0x065f4195) /* 0.398255903 */, 18 },
-  /* 5809 */  { MAD_F(0x065fa174) /* 0.398347333 */, 18 },
-  /* 5810 */  { MAD_F(0x06600154) /* 0.398438767 */, 18 },
-  /* 5811 */  { MAD_F(0x06606136) /* 0.398530207 */, 18 },
-  /* 5812 */  { MAD_F(0x0660c119) /* 0.398621653 */, 18 },
-  /* 5813 */  { MAD_F(0x066120fd) /* 0.398713103 */, 18 },
-  /* 5814 */  { MAD_F(0x066180e3) /* 0.398804559 */, 18 },
-  /* 5815 */  { MAD_F(0x0661e0cb) /* 0.398896020 */, 18 },
-  /* 5816 */  { MAD_F(0x066240b4) /* 0.398987487 */, 18 },
-  /* 5817 */  { MAD_F(0x0662a09e) /* 0.399078958 */, 18 },
-  /* 5818 */  { MAD_F(0x06630089) /* 0.399170435 */, 18 },
-  /* 5819 */  { MAD_F(0x06636077) /* 0.399261917 */, 18 },
-  /* 5820 */  { MAD_F(0x0663c065) /* 0.399353404 */, 18 },
-  /* 5821 */  { MAD_F(0x06642055) /* 0.399444897 */, 18 },
-  /* 5822 */  { MAD_F(0x06648046) /* 0.399536395 */, 18 },
-  /* 5823 */  { MAD_F(0x0664e039) /* 0.399627898 */, 18 },
-
-  /* 5824 */  { MAD_F(0x0665402d) /* 0.399719406 */, 18 },
-  /* 5825 */  { MAD_F(0x0665a022) /* 0.399810919 */, 18 },
-  /* 5826 */  { MAD_F(0x06660019) /* 0.399902438 */, 18 },
-  /* 5827 */  { MAD_F(0x06666011) /* 0.399993962 */, 18 },
-  /* 5828 */  { MAD_F(0x0666c00b) /* 0.400085491 */, 18 },
-  /* 5829 */  { MAD_F(0x06672006) /* 0.400177026 */, 18 },
-  /* 5830 */  { MAD_F(0x06678003) /* 0.400268565 */, 18 },
-  /* 5831 */  { MAD_F(0x0667e000) /* 0.400360110 */, 18 },
-  /* 5832 */  { MAD_F(0x06684000) /* 0.400451660 */, 18 },
-  /* 5833 */  { MAD_F(0x0668a000) /* 0.400543216 */, 18 },
-  /* 5834 */  { MAD_F(0x06690003) /* 0.400634776 */, 18 },
-  /* 5835 */  { MAD_F(0x06696006) /* 0.400726342 */, 18 },
-  /* 5836 */  { MAD_F(0x0669c00b) /* 0.400817913 */, 18 },
-  /* 5837 */  { MAD_F(0x066a2011) /* 0.400909489 */, 18 },
-  /* 5838 */  { MAD_F(0x066a8019) /* 0.401001071 */, 18 },
-  /* 5839 */  { MAD_F(0x066ae022) /* 0.401092657 */, 18 },
-
-  /* 5840 */  { MAD_F(0x066b402d) /* 0.401184249 */, 18 },
-  /* 5841 */  { MAD_F(0x066ba039) /* 0.401275847 */, 18 },
-  /* 5842 */  { MAD_F(0x066c0046) /* 0.401367449 */, 18 },
-  /* 5843 */  { MAD_F(0x066c6055) /* 0.401459057 */, 18 },
-  /* 5844 */  { MAD_F(0x066cc065) /* 0.401550670 */, 18 },
-  /* 5845 */  { MAD_F(0x066d2076) /* 0.401642288 */, 18 },
-  /* 5846 */  { MAD_F(0x066d8089) /* 0.401733911 */, 18 },
-  /* 5847 */  { MAD_F(0x066de09e) /* 0.401825540 */, 18 },
-  /* 5848 */  { MAD_F(0x066e40b3) /* 0.401917173 */, 18 },
-  /* 5849 */  { MAD_F(0x066ea0cb) /* 0.402008812 */, 18 },
-  /* 5850 */  { MAD_F(0x066f00e3) /* 0.402100457 */, 18 },
-  /* 5851 */  { MAD_F(0x066f60fd) /* 0.402192106 */, 18 },
-  /* 5852 */  { MAD_F(0x066fc118) /* 0.402283761 */, 18 },
-  /* 5853 */  { MAD_F(0x06702135) /* 0.402375420 */, 18 },
-  /* 5854 */  { MAD_F(0x06708153) /* 0.402467086 */, 18 },
-  /* 5855 */  { MAD_F(0x0670e173) /* 0.402558756 */, 18 },
-
-  /* 5856 */  { MAD_F(0x06714194) /* 0.402650431 */, 18 },
-  /* 5857 */  { MAD_F(0x0671a1b6) /* 0.402742112 */, 18 },
-  /* 5858 */  { MAD_F(0x067201da) /* 0.402833798 */, 18 },
-  /* 5859 */  { MAD_F(0x067261ff) /* 0.402925489 */, 18 },
-  /* 5860 */  { MAD_F(0x0672c226) /* 0.403017186 */, 18 },
-  /* 5861 */  { MAD_F(0x0673224e) /* 0.403108887 */, 18 },
-  /* 5862 */  { MAD_F(0x06738277) /* 0.403200594 */, 18 },
-  /* 5863 */  { MAD_F(0x0673e2a2) /* 0.403292306 */, 18 },
-  /* 5864 */  { MAD_F(0x067442ce) /* 0.403384024 */, 18 },
-  /* 5865 */  { MAD_F(0x0674a2fc) /* 0.403475746 */, 18 },
-  /* 5866 */  { MAD_F(0x0675032b) /* 0.403567474 */, 18 },
-  /* 5867 */  { MAD_F(0x0675635b) /* 0.403659207 */, 18 },
-  /* 5868 */  { MAD_F(0x0675c38d) /* 0.403750945 */, 18 },
-  /* 5869 */  { MAD_F(0x067623c0) /* 0.403842688 */, 18 },
-  /* 5870 */  { MAD_F(0x067683f4) /* 0.403934437 */, 18 },
-  /* 5871 */  { MAD_F(0x0676e42a) /* 0.404026190 */, 18 },
-
-  /* 5872 */  { MAD_F(0x06774462) /* 0.404117949 */, 18 },
-  /* 5873 */  { MAD_F(0x0677a49b) /* 0.404209714 */, 18 },
-  /* 5874 */  { MAD_F(0x067804d5) /* 0.404301483 */, 18 },
-  /* 5875 */  { MAD_F(0x06786510) /* 0.404393258 */, 18 },
-  /* 5876 */  { MAD_F(0x0678c54d) /* 0.404485037 */, 18 },
-  /* 5877 */  { MAD_F(0x0679258c) /* 0.404576822 */, 18 },
-  /* 5878 */  { MAD_F(0x067985cb) /* 0.404668613 */, 18 },
-  /* 5879 */  { MAD_F(0x0679e60c) /* 0.404760408 */, 18 },
-  /* 5880 */  { MAD_F(0x067a464f) /* 0.404852209 */, 18 },
-  /* 5881 */  { MAD_F(0x067aa693) /* 0.404944014 */, 18 },
-  /* 5882 */  { MAD_F(0x067b06d8) /* 0.405035825 */, 18 },
-  /* 5883 */  { MAD_F(0x067b671f) /* 0.405127642 */, 18 },
-  /* 5884 */  { MAD_F(0x067bc767) /* 0.405219463 */, 18 },
-  /* 5885 */  { MAD_F(0x067c27b1) /* 0.405311290 */, 18 },
-  /* 5886 */  { MAD_F(0x067c87fc) /* 0.405403122 */, 18 },
-  /* 5887 */  { MAD_F(0x067ce848) /* 0.405494959 */, 18 },
-
-  /* 5888 */  { MAD_F(0x067d4896) /* 0.405586801 */, 18 },
-  /* 5889 */  { MAD_F(0x067da8e5) /* 0.405678648 */, 18 },
-  /* 5890 */  { MAD_F(0x067e0935) /* 0.405770501 */, 18 },
-  /* 5891 */  { MAD_F(0x067e6987) /* 0.405862359 */, 18 },
-  /* 5892 */  { MAD_F(0x067ec9da) /* 0.405954222 */, 18 },
-  /* 5893 */  { MAD_F(0x067f2a2f) /* 0.406046090 */, 18 },
-  /* 5894 */  { MAD_F(0x067f8a85) /* 0.406137963 */, 18 },
-  /* 5895 */  { MAD_F(0x067feadd) /* 0.406229842 */, 18 },
-  /* 5896 */  { MAD_F(0x06804b36) /* 0.406321726 */, 18 },
-  /* 5897 */  { MAD_F(0x0680ab90) /* 0.406413615 */, 18 },
-  /* 5898 */  { MAD_F(0x06810beb) /* 0.406505509 */, 18 },
-  /* 5899 */  { MAD_F(0x06816c49) /* 0.406597408 */, 18 },
-  /* 5900 */  { MAD_F(0x0681cca7) /* 0.406689313 */, 18 },
-  /* 5901 */  { MAD_F(0x06822d07) /* 0.406781223 */, 18 },
-  /* 5902 */  { MAD_F(0x06828d68) /* 0.406873138 */, 18 },
-  /* 5903 */  { MAD_F(0x0682edcb) /* 0.406965058 */, 18 },
-
-  /* 5904 */  { MAD_F(0x06834e2f) /* 0.407056983 */, 18 },
-  /* 5905 */  { MAD_F(0x0683ae94) /* 0.407148914 */, 18 },
-  /* 5906 */  { MAD_F(0x06840efb) /* 0.407240850 */, 18 },
-  /* 5907 */  { MAD_F(0x06846f63) /* 0.407332791 */, 18 },
-  /* 5908 */  { MAD_F(0x0684cfcd) /* 0.407424737 */, 18 },
-  /* 5909 */  { MAD_F(0x06853038) /* 0.407516688 */, 18 },
-  /* 5910 */  { MAD_F(0x068590a4) /* 0.407608645 */, 18 },
-  /* 5911 */  { MAD_F(0x0685f112) /* 0.407700606 */, 18 },
-  /* 5912 */  { MAD_F(0x06865181) /* 0.407792573 */, 18 },
-  /* 5913 */  { MAD_F(0x0686b1f2) /* 0.407884545 */, 18 },
-  /* 5914 */  { MAD_F(0x06871264) /* 0.407976522 */, 18 },
-  /* 5915 */  { MAD_F(0x068772d7) /* 0.408068505 */, 18 },
-  /* 5916 */  { MAD_F(0x0687d34c) /* 0.408160492 */, 18 },
-  /* 5917 */  { MAD_F(0x068833c2) /* 0.408252485 */, 18 },
-  /* 5918 */  { MAD_F(0x06889439) /* 0.408344483 */, 18 },
-  /* 5919 */  { MAD_F(0x0688f4b2) /* 0.408436486 */, 18 },
-
-  /* 5920 */  { MAD_F(0x0689552c) /* 0.408528495 */, 18 },
-  /* 5921 */  { MAD_F(0x0689b5a8) /* 0.408620508 */, 18 },
-  /* 5922 */  { MAD_F(0x068a1625) /* 0.408712527 */, 18 },
-  /* 5923 */  { MAD_F(0x068a76a4) /* 0.408804551 */, 18 },
-  /* 5924 */  { MAD_F(0x068ad724) /* 0.408896580 */, 18 },
-  /* 5925 */  { MAD_F(0x068b37a5) /* 0.408988614 */, 18 },
-  /* 5926 */  { MAD_F(0x068b9827) /* 0.409080653 */, 18 },
-  /* 5927 */  { MAD_F(0x068bf8ac) /* 0.409172698 */, 18 },
-  /* 5928 */  { MAD_F(0x068c5931) /* 0.409264748 */, 18 },
-  /* 5929 */  { MAD_F(0x068cb9b8) /* 0.409356803 */, 18 },
-  /* 5930 */  { MAD_F(0x068d1a40) /* 0.409448863 */, 18 },
-  /* 5931 */  { MAD_F(0x068d7aca) /* 0.409540928 */, 18 },
-  /* 5932 */  { MAD_F(0x068ddb54) /* 0.409632999 */, 18 },
-  /* 5933 */  { MAD_F(0x068e3be1) /* 0.409725074 */, 18 },
-  /* 5934 */  { MAD_F(0x068e9c6f) /* 0.409817155 */, 18 },
-  /* 5935 */  { MAD_F(0x068efcfe) /* 0.409909241 */, 18 },
-
-  /* 5936 */  { MAD_F(0x068f5d8e) /* 0.410001332 */, 18 },
-  /* 5937 */  { MAD_F(0x068fbe20) /* 0.410093428 */, 18 },
-  /* 5938 */  { MAD_F(0x06901eb4) /* 0.410185530 */, 18 },
-  /* 5939 */  { MAD_F(0x06907f48) /* 0.410277637 */, 18 },
-  /* 5940 */  { MAD_F(0x0690dfde) /* 0.410369748 */, 18 },
-  /* 5941 */  { MAD_F(0x06914076) /* 0.410461865 */, 18 },
-  /* 5942 */  { MAD_F(0x0691a10f) /* 0.410553988 */, 18 },
-  /* 5943 */  { MAD_F(0x069201a9) /* 0.410646115 */, 18 },
-  /* 5944 */  { MAD_F(0x06926245) /* 0.410738247 */, 18 },
-  /* 5945 */  { MAD_F(0x0692c2e2) /* 0.410830385 */, 18 },
-  /* 5946 */  { MAD_F(0x06932380) /* 0.410922528 */, 18 },
-  /* 5947 */  { MAD_F(0x06938420) /* 0.411014676 */, 18 },
-  /* 5948 */  { MAD_F(0x0693e4c1) /* 0.411106829 */, 18 },
-  /* 5949 */  { MAD_F(0x06944563) /* 0.411198987 */, 18 },
-  /* 5950 */  { MAD_F(0x0694a607) /* 0.411291151 */, 18 },
-  /* 5951 */  { MAD_F(0x069506ad) /* 0.411383320 */, 18 },
-
-  /* 5952 */  { MAD_F(0x06956753) /* 0.411475493 */, 18 },
-  /* 5953 */  { MAD_F(0x0695c7fc) /* 0.411567672 */, 18 },
-  /* 5954 */  { MAD_F(0x069628a5) /* 0.411659857 */, 18 },
-  /* 5955 */  { MAD_F(0x06968950) /* 0.411752046 */, 18 },
-  /* 5956 */  { MAD_F(0x0696e9fc) /* 0.411844240 */, 18 },
-  /* 5957 */  { MAD_F(0x06974aaa) /* 0.411936440 */, 18 },
-  /* 5958 */  { MAD_F(0x0697ab59) /* 0.412028645 */, 18 },
-  /* 5959 */  { MAD_F(0x06980c09) /* 0.412120855 */, 18 },
-  /* 5960 */  { MAD_F(0x06986cbb) /* 0.412213070 */, 18 },
-  /* 5961 */  { MAD_F(0x0698cd6e) /* 0.412305290 */, 18 },
-  /* 5962 */  { MAD_F(0x06992e23) /* 0.412397516 */, 18 },
-  /* 5963 */  { MAD_F(0x06998ed9) /* 0.412489746 */, 18 },
-  /* 5964 */  { MAD_F(0x0699ef90) /* 0.412581982 */, 18 },
-  /* 5965 */  { MAD_F(0x069a5049) /* 0.412674223 */, 18 },
-  /* 5966 */  { MAD_F(0x069ab103) /* 0.412766469 */, 18 },
-  /* 5967 */  { MAD_F(0x069b11bf) /* 0.412858720 */, 18 },
-
-  /* 5968 */  { MAD_F(0x069b727b) /* 0.412950976 */, 18 },
-  /* 5969 */  { MAD_F(0x069bd33a) /* 0.413043238 */, 18 },
-  /* 5970 */  { MAD_F(0x069c33f9) /* 0.413135505 */, 18 },
-  /* 5971 */  { MAD_F(0x069c94ba) /* 0.413227776 */, 18 },
-  /* 5972 */  { MAD_F(0x069cf57d) /* 0.413320053 */, 18 },
-  /* 5973 */  { MAD_F(0x069d5641) /* 0.413412335 */, 18 },
-  /* 5974 */  { MAD_F(0x069db706) /* 0.413504623 */, 18 },
-  /* 5975 */  { MAD_F(0x069e17cc) /* 0.413596915 */, 18 },
-  /* 5976 */  { MAD_F(0x069e7894) /* 0.413689213 */, 18 },
-  /* 5977 */  { MAD_F(0x069ed95e) /* 0.413781515 */, 18 },
-  /* 5978 */  { MAD_F(0x069f3a28) /* 0.413873823 */, 18 },
-  /* 5979 */  { MAD_F(0x069f9af4) /* 0.413966136 */, 18 },
-  /* 5980 */  { MAD_F(0x069ffbc2) /* 0.414058454 */, 18 },
-  /* 5981 */  { MAD_F(0x06a05c91) /* 0.414150778 */, 18 },
-  /* 5982 */  { MAD_F(0x06a0bd61) /* 0.414243106 */, 18 },
-  /* 5983 */  { MAD_F(0x06a11e32) /* 0.414335440 */, 18 },
-
-  /* 5984 */  { MAD_F(0x06a17f05) /* 0.414427779 */, 18 },
-  /* 5985 */  { MAD_F(0x06a1dfda) /* 0.414520122 */, 18 },
-  /* 5986 */  { MAD_F(0x06a240b0) /* 0.414612471 */, 18 },
-  /* 5987 */  { MAD_F(0x06a2a187) /* 0.414704826 */, 18 },
-  /* 5988 */  { MAD_F(0x06a3025f) /* 0.414797185 */, 18 },
-  /* 5989 */  { MAD_F(0x06a36339) /* 0.414889549 */, 18 },
-  /* 5990 */  { MAD_F(0x06a3c414) /* 0.414981919 */, 18 },
-  /* 5991 */  { MAD_F(0x06a424f1) /* 0.415074294 */, 18 },
-  /* 5992 */  { MAD_F(0x06a485cf) /* 0.415166674 */, 18 },
-  /* 5993 */  { MAD_F(0x06a4e6ae) /* 0.415259059 */, 18 },
-  /* 5994 */  { MAD_F(0x06a5478f) /* 0.415351449 */, 18 },
-  /* 5995 */  { MAD_F(0x06a5a871) /* 0.415443844 */, 18 },
-  /* 5996 */  { MAD_F(0x06a60955) /* 0.415536244 */, 18 },
-  /* 5997 */  { MAD_F(0x06a66a3a) /* 0.415628650 */, 18 },
-  /* 5998 */  { MAD_F(0x06a6cb20) /* 0.415721061 */, 18 },
-  /* 5999 */  { MAD_F(0x06a72c08) /* 0.415813476 */, 18 },
-
-  /* 6000 */  { MAD_F(0x06a78cf1) /* 0.415905897 */, 18 },
-  /* 6001 */  { MAD_F(0x06a7eddb) /* 0.415998324 */, 18 },
-  /* 6002 */  { MAD_F(0x06a84ec7) /* 0.416090755 */, 18 },
-  /* 6003 */  { MAD_F(0x06a8afb4) /* 0.416183191 */, 18 },
-  /* 6004 */  { MAD_F(0x06a910a3) /* 0.416275633 */, 18 },
-  /* 6005 */  { MAD_F(0x06a97193) /* 0.416368079 */, 18 },
-  /* 6006 */  { MAD_F(0x06a9d284) /* 0.416460531 */, 18 },
-  /* 6007 */  { MAD_F(0x06aa3377) /* 0.416552988 */, 18 },
-  /* 6008 */  { MAD_F(0x06aa946b) /* 0.416645450 */, 18 },
-  /* 6009 */  { MAD_F(0x06aaf561) /* 0.416737917 */, 18 },
-  /* 6010 */  { MAD_F(0x06ab5657) /* 0.416830389 */, 18 },
-  /* 6011 */  { MAD_F(0x06abb750) /* 0.416922867 */, 18 },
-  /* 6012 */  { MAD_F(0x06ac1849) /* 0.417015349 */, 18 },
-  /* 6013 */  { MAD_F(0x06ac7944) /* 0.417107837 */, 18 },
-  /* 6014 */  { MAD_F(0x06acda41) /* 0.417200330 */, 18 },
-  /* 6015 */  { MAD_F(0x06ad3b3e) /* 0.417292828 */, 18 },
-
-  /* 6016 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 18 },
-  /* 6017 */  { MAD_F(0x06adfd3e) /* 0.417477839 */, 18 },
-  /* 6018 */  { MAD_F(0x06ae5e40) /* 0.417570352 */, 18 },
-  /* 6019 */  { MAD_F(0x06aebf43) /* 0.417662871 */, 18 },
-  /* 6020 */  { MAD_F(0x06af2047) /* 0.417755394 */, 18 },
-  /* 6021 */  { MAD_F(0x06af814d) /* 0.417847923 */, 18 },
-  /* 6022 */  { MAD_F(0x06afe255) /* 0.417940457 */, 18 },
-  /* 6023 */  { MAD_F(0x06b0435e) /* 0.418032996 */, 18 },
-  /* 6024 */  { MAD_F(0x06b0a468) /* 0.418125540 */, 18 },
-  /* 6025 */  { MAD_F(0x06b10573) /* 0.418218089 */, 18 },
-  /* 6026 */  { MAD_F(0x06b16680) /* 0.418310643 */, 18 },
-  /* 6027 */  { MAD_F(0x06b1c78e) /* 0.418403203 */, 18 },
-  /* 6028 */  { MAD_F(0x06b2289e) /* 0.418495767 */, 18 },
-  /* 6029 */  { MAD_F(0x06b289af) /* 0.418588337 */, 18 },
-  /* 6030 */  { MAD_F(0x06b2eac1) /* 0.418680911 */, 18 },
-  /* 6031 */  { MAD_F(0x06b34bd5) /* 0.418773491 */, 18 },
-
-  /* 6032 */  { MAD_F(0x06b3acea) /* 0.418866076 */, 18 },
-  /* 6033 */  { MAD_F(0x06b40e00) /* 0.418958666 */, 18 },
-  /* 6034 */  { MAD_F(0x06b46f18) /* 0.419051262 */, 18 },
-  /* 6035 */  { MAD_F(0x06b4d031) /* 0.419143862 */, 18 },
-  /* 6036 */  { MAD_F(0x06b5314c) /* 0.419236467 */, 18 },
-  /* 6037 */  { MAD_F(0x06b59268) /* 0.419329078 */, 18 },
-  /* 6038 */  { MAD_F(0x06b5f385) /* 0.419421694 */, 18 },
-  /* 6039 */  { MAD_F(0x06b654a4) /* 0.419514314 */, 18 },
-  /* 6040 */  { MAD_F(0x06b6b5c4) /* 0.419606940 */, 18 },
-  /* 6041 */  { MAD_F(0x06b716e6) /* 0.419699571 */, 18 },
-  /* 6042 */  { MAD_F(0x06b77808) /* 0.419792208 */, 18 },
-  /* 6043 */  { MAD_F(0x06b7d92d) /* 0.419884849 */, 18 },
-  /* 6044 */  { MAD_F(0x06b83a52) /* 0.419977495 */, 18 },
-  /* 6045 */  { MAD_F(0x06b89b79) /* 0.420070147 */, 18 },
-  /* 6046 */  { MAD_F(0x06b8fca1) /* 0.420162803 */, 18 },
-  /* 6047 */  { MAD_F(0x06b95dcb) /* 0.420255465 */, 18 },
-
-  /* 6048 */  { MAD_F(0x06b9bef6) /* 0.420348132 */, 18 },
-  /* 6049 */  { MAD_F(0x06ba2023) /* 0.420440803 */, 18 },
-  /* 6050 */  { MAD_F(0x06ba8150) /* 0.420533481 */, 18 },
-  /* 6051 */  { MAD_F(0x06bae280) /* 0.420626163 */, 18 },
-  /* 6052 */  { MAD_F(0x06bb43b0) /* 0.420718850 */, 18 },
-  /* 6053 */  { MAD_F(0x06bba4e2) /* 0.420811542 */, 18 },
-  /* 6054 */  { MAD_F(0x06bc0615) /* 0.420904240 */, 18 },
-  /* 6055 */  { MAD_F(0x06bc674a) /* 0.420996942 */, 18 },
-  /* 6056 */  { MAD_F(0x06bcc880) /* 0.421089650 */, 18 },
-  /* 6057 */  { MAD_F(0x06bd29b7) /* 0.421182362 */, 18 },
-  /* 6058 */  { MAD_F(0x06bd8af0) /* 0.421275080 */, 18 },
-  /* 6059 */  { MAD_F(0x06bdec2a) /* 0.421367803 */, 18 },
-  /* 6060 */  { MAD_F(0x06be4d66) /* 0.421460531 */, 18 },
-  /* 6061 */  { MAD_F(0x06beaea3) /* 0.421553264 */, 18 },
-  /* 6062 */  { MAD_F(0x06bf0fe1) /* 0.421646003 */, 18 },
-  /* 6063 */  { MAD_F(0x06bf7120) /* 0.421738746 */, 18 },
-
-  /* 6064 */  { MAD_F(0x06bfd261) /* 0.421831494 */, 18 },
-  /* 6065 */  { MAD_F(0x06c033a4) /* 0.421924248 */, 18 },
-  /* 6066 */  { MAD_F(0x06c094e7) /* 0.422017007 */, 18 },
-  /* 6067 */  { MAD_F(0x06c0f62c) /* 0.422109770 */, 18 },
-  /* 6068 */  { MAD_F(0x06c15773) /* 0.422202539 */, 18 },
-  /* 6069 */  { MAD_F(0x06c1b8bb) /* 0.422295313 */, 18 },
-  /* 6070 */  { MAD_F(0x06c21a04) /* 0.422388092 */, 18 },
-  /* 6071 */  { MAD_F(0x06c27b4e) /* 0.422480876 */, 18 },
-  /* 6072 */  { MAD_F(0x06c2dc9a) /* 0.422573665 */, 18 },
-  /* 6073 */  { MAD_F(0x06c33de8) /* 0.422666460 */, 18 },
-  /* 6074 */  { MAD_F(0x06c39f36) /* 0.422759259 */, 18 },
-  /* 6075 */  { MAD_F(0x06c40086) /* 0.422852064 */, 18 },
-  /* 6076 */  { MAD_F(0x06c461d8) /* 0.422944873 */, 18 },
-  /* 6077 */  { MAD_F(0x06c4c32a) /* 0.423037688 */, 18 },
-  /* 6078 */  { MAD_F(0x06c5247f) /* 0.423130508 */, 18 },
-  /* 6079 */  { MAD_F(0x06c585d4) /* 0.423223333 */, 18 },
-
-  /* 6080 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 18 },
-  /* 6081 */  { MAD_F(0x06c64883) /* 0.423408997 */, 18 },
-  /* 6082 */  { MAD_F(0x06c6a9dd) /* 0.423501838 */, 18 },
-  /* 6083 */  { MAD_F(0x06c70b38) /* 0.423594683 */, 18 },
-  /* 6084 */  { MAD_F(0x06c76c94) /* 0.423687533 */, 18 },
-  /* 6085 */  { MAD_F(0x06c7cdf2) /* 0.423780389 */, 18 },
-  /* 6086 */  { MAD_F(0x06c82f51) /* 0.423873249 */, 18 },
-  /* 6087 */  { MAD_F(0x06c890b1) /* 0.423966115 */, 18 },
-  /* 6088 */  { MAD_F(0x06c8f213) /* 0.424058985 */, 18 },
-  /* 6089 */  { MAD_F(0x06c95376) /* 0.424151861 */, 18 },
-  /* 6090 */  { MAD_F(0x06c9b4da) /* 0.424244742 */, 18 },
-  /* 6091 */  { MAD_F(0x06ca1640) /* 0.424337628 */, 18 },
-  /* 6092 */  { MAD_F(0x06ca77a8) /* 0.424430519 */, 18 },
-  /* 6093 */  { MAD_F(0x06cad910) /* 0.424523415 */, 18 },
-  /* 6094 */  { MAD_F(0x06cb3a7a) /* 0.424616316 */, 18 },
-  /* 6095 */  { MAD_F(0x06cb9be5) /* 0.424709222 */, 18 },
-
-  /* 6096 */  { MAD_F(0x06cbfd52) /* 0.424802133 */, 18 },
-  /* 6097 */  { MAD_F(0x06cc5ec0) /* 0.424895050 */, 18 },
-  /* 6098 */  { MAD_F(0x06ccc030) /* 0.424987971 */, 18 },
-  /* 6099 */  { MAD_F(0x06cd21a0) /* 0.425080898 */, 18 },
-  /* 6100 */  { MAD_F(0x06cd8313) /* 0.425173829 */, 18 },
-  /* 6101 */  { MAD_F(0x06cde486) /* 0.425266766 */, 18 },
-  /* 6102 */  { MAD_F(0x06ce45fb) /* 0.425359708 */, 18 },
-  /* 6103 */  { MAD_F(0x06cea771) /* 0.425452655 */, 18 },
-  /* 6104 */  { MAD_F(0x06cf08e9) /* 0.425545607 */, 18 },
-  /* 6105 */  { MAD_F(0x06cf6a62) /* 0.425638564 */, 18 },
-  /* 6106 */  { MAD_F(0x06cfcbdc) /* 0.425731526 */, 18 },
-  /* 6107 */  { MAD_F(0x06d02d58) /* 0.425824493 */, 18 },
-  /* 6108 */  { MAD_F(0x06d08ed5) /* 0.425917465 */, 18 },
-  /* 6109 */  { MAD_F(0x06d0f053) /* 0.426010443 */, 18 },
-  /* 6110 */  { MAD_F(0x06d151d3) /* 0.426103425 */, 18 },
-  /* 6111 */  { MAD_F(0x06d1b354) /* 0.426196412 */, 18 },
-
-  /* 6112 */  { MAD_F(0x06d214d7) /* 0.426289405 */, 18 },
-  /* 6113 */  { MAD_F(0x06d2765a) /* 0.426382403 */, 18 },
-  /* 6114 */  { MAD_F(0x06d2d7e0) /* 0.426475405 */, 18 },
-  /* 6115 */  { MAD_F(0x06d33966) /* 0.426568413 */, 18 },
-  /* 6116 */  { MAD_F(0x06d39aee) /* 0.426661426 */, 18 },
-  /* 6117 */  { MAD_F(0x06d3fc77) /* 0.426754444 */, 18 },
-  /* 6118 */  { MAD_F(0x06d45e02) /* 0.426847467 */, 18 },
-  /* 6119 */  { MAD_F(0x06d4bf8e) /* 0.426940495 */, 18 },
-  /* 6120 */  { MAD_F(0x06d5211c) /* 0.427033528 */, 18 },
-  /* 6121 */  { MAD_F(0x06d582aa) /* 0.427126566 */, 18 },
-  /* 6122 */  { MAD_F(0x06d5e43a) /* 0.427219609 */, 18 },
-  /* 6123 */  { MAD_F(0x06d645cc) /* 0.427312657 */, 18 },
-  /* 6124 */  { MAD_F(0x06d6a75f) /* 0.427405711 */, 18 },
-  /* 6125 */  { MAD_F(0x06d708f3) /* 0.427498769 */, 18 },
-  /* 6126 */  { MAD_F(0x06d76a88) /* 0.427591833 */, 18 },
-  /* 6127 */  { MAD_F(0x06d7cc1f) /* 0.427684901 */, 18 },
-
-  /* 6128 */  { MAD_F(0x06d82db8) /* 0.427777975 */, 18 },
-  /* 6129 */  { MAD_F(0x06d88f51) /* 0.427871054 */, 18 },
-  /* 6130 */  { MAD_F(0x06d8f0ec) /* 0.427964137 */, 18 },
-  /* 6131 */  { MAD_F(0x06d95288) /* 0.428057226 */, 18 },
-  /* 6132 */  { MAD_F(0x06d9b426) /* 0.428150320 */, 18 },
-  /* 6133 */  { MAD_F(0x06da15c5) /* 0.428243419 */, 18 },
-  /* 6134 */  { MAD_F(0x06da7766) /* 0.428336523 */, 18 },
-  /* 6135 */  { MAD_F(0x06dad907) /* 0.428429632 */, 18 },
-  /* 6136 */  { MAD_F(0x06db3aaa) /* 0.428522746 */, 18 },
-  /* 6137 */  { MAD_F(0x06db9c4f) /* 0.428615865 */, 18 },
-  /* 6138 */  { MAD_F(0x06dbfdf5) /* 0.428708989 */, 18 },
-  /* 6139 */  { MAD_F(0x06dc5f9c) /* 0.428802119 */, 18 },
-  /* 6140 */  { MAD_F(0x06dcc145) /* 0.428895253 */, 18 },
-  /* 6141 */  { MAD_F(0x06dd22ee) /* 0.428988392 */, 18 },
-  /* 6142 */  { MAD_F(0x06dd849a) /* 0.429081537 */, 18 },
-  /* 6143 */  { MAD_F(0x06dde646) /* 0.429174686 */, 18 },
-
-  /* 6144 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 18 },
-  /* 6145 */  { MAD_F(0x06dea9a4) /* 0.429361001 */, 18 },
-  /* 6146 */  { MAD_F(0x06df0b54) /* 0.429454165 */, 18 },
-  /* 6147 */  { MAD_F(0x06df6d06) /* 0.429547335 */, 18 },
-  /* 6148 */  { MAD_F(0x06dfceba) /* 0.429640510 */, 18 },
-  /* 6149 */  { MAD_F(0x06e0306f) /* 0.429733690 */, 18 },
-  /* 6150 */  { MAD_F(0x06e09225) /* 0.429826874 */, 18 },
-  /* 6151 */  { MAD_F(0x06e0f3dc) /* 0.429920064 */, 18 },
-  /* 6152 */  { MAD_F(0x06e15595) /* 0.430013259 */, 18 },
-  /* 6153 */  { MAD_F(0x06e1b74f) /* 0.430106459 */, 18 },
-  /* 6154 */  { MAD_F(0x06e2190b) /* 0.430199664 */, 18 },
-  /* 6155 */  { MAD_F(0x06e27ac8) /* 0.430292875 */, 18 },
-  /* 6156 */  { MAD_F(0x06e2dc86) /* 0.430386090 */, 18 },
-  /* 6157 */  { MAD_F(0x06e33e46) /* 0.430479310 */, 18 },
-  /* 6158 */  { MAD_F(0x06e3a007) /* 0.430572535 */, 18 },
-  /* 6159 */  { MAD_F(0x06e401c9) /* 0.430665765 */, 18 },
-
-  /* 6160 */  { MAD_F(0x06e4638d) /* 0.430759001 */, 18 },
-  /* 6161 */  { MAD_F(0x06e4c552) /* 0.430852241 */, 18 },
-  /* 6162 */  { MAD_F(0x06e52718) /* 0.430945487 */, 18 },
-  /* 6163 */  { MAD_F(0x06e588e0) /* 0.431038737 */, 18 },
-  /* 6164 */  { MAD_F(0x06e5eaa9) /* 0.431131993 */, 18 },
-  /* 6165 */  { MAD_F(0x06e64c73) /* 0.431225253 */, 18 },
-  /* 6166 */  { MAD_F(0x06e6ae3f) /* 0.431318519 */, 18 },
-  /* 6167 */  { MAD_F(0x06e7100c) /* 0.431411790 */, 18 },
-  /* 6168 */  { MAD_F(0x06e771db) /* 0.431505065 */, 18 },
-  /* 6169 */  { MAD_F(0x06e7d3ab) /* 0.431598346 */, 18 },
-  /* 6170 */  { MAD_F(0x06e8357c) /* 0.431691632 */, 18 },
-  /* 6171 */  { MAD_F(0x06e8974e) /* 0.431784923 */, 18 },
-  /* 6172 */  { MAD_F(0x06e8f922) /* 0.431878218 */, 18 },
-  /* 6173 */  { MAD_F(0x06e95af8) /* 0.431971519 */, 18 },
-  /* 6174 */  { MAD_F(0x06e9bcce) /* 0.432064825 */, 18 },
-  /* 6175 */  { MAD_F(0x06ea1ea6) /* 0.432158136 */, 18 },
-
-  /* 6176 */  { MAD_F(0x06ea807f) /* 0.432251452 */, 18 },
-  /* 6177 */  { MAD_F(0x06eae25a) /* 0.432344773 */, 18 },
-  /* 6178 */  { MAD_F(0x06eb4436) /* 0.432438099 */, 18 },
-  /* 6179 */  { MAD_F(0x06eba614) /* 0.432531431 */, 18 },
-  /* 6180 */  { MAD_F(0x06ec07f2) /* 0.432624767 */, 18 },
-  /* 6181 */  { MAD_F(0x06ec69d2) /* 0.432718108 */, 18 },
-  /* 6182 */  { MAD_F(0x06eccbb4) /* 0.432811454 */, 18 },
-  /* 6183 */  { MAD_F(0x06ed2d97) /* 0.432904805 */, 18 },
-  /* 6184 */  { MAD_F(0x06ed8f7b) /* 0.432998162 */, 18 },
-  /* 6185 */  { MAD_F(0x06edf160) /* 0.433091523 */, 18 },
-  /* 6186 */  { MAD_F(0x06ee5347) /* 0.433184889 */, 18 },
-  /* 6187 */  { MAD_F(0x06eeb52f) /* 0.433278261 */, 18 },
-  /* 6188 */  { MAD_F(0x06ef1719) /* 0.433371637 */, 18 },
-  /* 6189 */  { MAD_F(0x06ef7904) /* 0.433465019 */, 18 },
-  /* 6190 */  { MAD_F(0x06efdaf0) /* 0.433558405 */, 18 },
-  /* 6191 */  { MAD_F(0x06f03cde) /* 0.433651797 */, 18 },
-
-  /* 6192 */  { MAD_F(0x06f09ecc) /* 0.433745193 */, 18 },
-  /* 6193 */  { MAD_F(0x06f100bd) /* 0.433838595 */, 18 },
-  /* 6194 */  { MAD_F(0x06f162ae) /* 0.433932001 */, 18 },
-  /* 6195 */  { MAD_F(0x06f1c4a1) /* 0.434025413 */, 18 },
-  /* 6196 */  { MAD_F(0x06f22696) /* 0.434118830 */, 18 },
-  /* 6197 */  { MAD_F(0x06f2888b) /* 0.434212251 */, 18 },
-  /* 6198 */  { MAD_F(0x06f2ea82) /* 0.434305678 */, 18 },
-  /* 6199 */  { MAD_F(0x06f34c7b) /* 0.434399110 */, 18 },
-  /* 6200 */  { MAD_F(0x06f3ae75) /* 0.434492546 */, 18 },
-  /* 6201 */  { MAD_F(0x06f41070) /* 0.434585988 */, 18 },
-  /* 6202 */  { MAD_F(0x06f4726c) /* 0.434679435 */, 18 },
-  /* 6203 */  { MAD_F(0x06f4d46a) /* 0.434772887 */, 18 },
-  /* 6204 */  { MAD_F(0x06f53669) /* 0.434866344 */, 18 },
-  /* 6205 */  { MAD_F(0x06f59869) /* 0.434959806 */, 18 },
-  /* 6206 */  { MAD_F(0x06f5fa6b) /* 0.435053272 */, 18 },
-  /* 6207 */  { MAD_F(0x06f65c6e) /* 0.435146744 */, 18 },
-
-  /* 6208 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 18 },
-  /* 6209 */  { MAD_F(0x06f72079) /* 0.435333703 */, 18 },
-  /* 6210 */  { MAD_F(0x06f78280) /* 0.435427190 */, 18 },
-  /* 6211 */  { MAD_F(0x06f7e489) /* 0.435520682 */, 18 },
-  /* 6212 */  { MAD_F(0x06f84693) /* 0.435614179 */, 18 },
-  /* 6213 */  { MAD_F(0x06f8a89e) /* 0.435707681 */, 18 },
-  /* 6214 */  { MAD_F(0x06f90aaa) /* 0.435801188 */, 18 },
-  /* 6215 */  { MAD_F(0x06f96cb8) /* 0.435894700 */, 18 },
-  /* 6216 */  { MAD_F(0x06f9cec8) /* 0.435988217 */, 18 },
-  /* 6217 */  { MAD_F(0x06fa30d8) /* 0.436081739 */, 18 },
-  /* 6218 */  { MAD_F(0x06fa92ea) /* 0.436175266 */, 18 },
-  /* 6219 */  { MAD_F(0x06faf4fe) /* 0.436268799 */, 18 },
-  /* 6220 */  { MAD_F(0x06fb5712) /* 0.436362336 */, 18 },
-  /* 6221 */  { MAD_F(0x06fbb928) /* 0.436455878 */, 18 },
-  /* 6222 */  { MAD_F(0x06fc1b40) /* 0.436549425 */, 18 },
-  /* 6223 */  { MAD_F(0x06fc7d58) /* 0.436642977 */, 18 },
-
-  /* 6224 */  { MAD_F(0x06fcdf72) /* 0.436736534 */, 18 },
-  /* 6225 */  { MAD_F(0x06fd418e) /* 0.436830096 */, 18 },
-  /* 6226 */  { MAD_F(0x06fda3ab) /* 0.436923664 */, 18 },
-  /* 6227 */  { MAD_F(0x06fe05c9) /* 0.437017236 */, 18 },
-  /* 6228 */  { MAD_F(0x06fe67e8) /* 0.437110813 */, 18 },
-  /* 6229 */  { MAD_F(0x06feca09) /* 0.437204395 */, 18 },
-  /* 6230 */  { MAD_F(0x06ff2c2b) /* 0.437297982 */, 18 },
-  /* 6231 */  { MAD_F(0x06ff8e4f) /* 0.437391575 */, 18 },
-  /* 6232 */  { MAD_F(0x06fff073) /* 0.437485172 */, 18 },
-  /* 6233 */  { MAD_F(0x0700529a) /* 0.437578774 */, 18 },
-  /* 6234 */  { MAD_F(0x0700b4c1) /* 0.437672381 */, 18 },
-  /* 6235 */  { MAD_F(0x070116ea) /* 0.437765994 */, 18 },
-  /* 6236 */  { MAD_F(0x07017914) /* 0.437859611 */, 18 },
-  /* 6237 */  { MAD_F(0x0701db40) /* 0.437953233 */, 18 },
-  /* 6238 */  { MAD_F(0x07023d6c) /* 0.438046860 */, 18 },
-  /* 6239 */  { MAD_F(0x07029f9b) /* 0.438140493 */, 18 },
-
-  /* 6240 */  { MAD_F(0x070301ca) /* 0.438234130 */, 18 },
-  /* 6241 */  { MAD_F(0x070363fb) /* 0.438327772 */, 18 },
-  /* 6242 */  { MAD_F(0x0703c62d) /* 0.438421419 */, 18 },
-  /* 6243 */  { MAD_F(0x07042861) /* 0.438515072 */, 18 },
-  /* 6244 */  { MAD_F(0x07048a96) /* 0.438608729 */, 18 },
-  /* 6245 */  { MAD_F(0x0704eccc) /* 0.438702391 */, 18 },
-  /* 6246 */  { MAD_F(0x07054f04) /* 0.438796059 */, 18 },
-  /* 6247 */  { MAD_F(0x0705b13d) /* 0.438889731 */, 18 },
-  /* 6248 */  { MAD_F(0x07061377) /* 0.438983408 */, 18 },
-  /* 6249 */  { MAD_F(0x070675b3) /* 0.439077090 */, 18 },
-  /* 6250 */  { MAD_F(0x0706d7f0) /* 0.439170778 */, 18 },
-  /* 6251 */  { MAD_F(0x07073a2e) /* 0.439264470 */, 18 },
-  /* 6252 */  { MAD_F(0x07079c6e) /* 0.439358167 */, 18 },
-  /* 6253 */  { MAD_F(0x0707feaf) /* 0.439451869 */, 18 },
-  /* 6254 */  { MAD_F(0x070860f1) /* 0.439545577 */, 18 },
-  /* 6255 */  { MAD_F(0x0708c335) /* 0.439639289 */, 18 },
-
-  /* 6256 */  { MAD_F(0x0709257a) /* 0.439733006 */, 18 },
-  /* 6257 */  { MAD_F(0x070987c0) /* 0.439826728 */, 18 },
-  /* 6258 */  { MAD_F(0x0709ea08) /* 0.439920456 */, 18 },
-  /* 6259 */  { MAD_F(0x070a4c51) /* 0.440014188 */, 18 },
-  /* 6260 */  { MAD_F(0x070aae9b) /* 0.440107925 */, 18 },
-  /* 6261 */  { MAD_F(0x070b10e7) /* 0.440201667 */, 18 },
-  /* 6262 */  { MAD_F(0x070b7334) /* 0.440295414 */, 18 },
-  /* 6263 */  { MAD_F(0x070bd583) /* 0.440389167 */, 18 },
-  /* 6264 */  { MAD_F(0x070c37d2) /* 0.440482924 */, 18 },
-  /* 6265 */  { MAD_F(0x070c9a23) /* 0.440576686 */, 18 },
-  /* 6266 */  { MAD_F(0x070cfc76) /* 0.440670453 */, 18 },
-  /* 6267 */  { MAD_F(0x070d5eca) /* 0.440764225 */, 18 },
-  /* 6268 */  { MAD_F(0x070dc11f) /* 0.440858002 */, 18 },
-  /* 6269 */  { MAD_F(0x070e2375) /* 0.440951784 */, 18 },
-  /* 6270 */  { MAD_F(0x070e85cd) /* 0.441045572 */, 18 },
-  /* 6271 */  { MAD_F(0x070ee826) /* 0.441139364 */, 18 },
-
-  /* 6272 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 18 },
-  /* 6273 */  { MAD_F(0x070facdc) /* 0.441326963 */, 18 },
-  /* 6274 */  { MAD_F(0x07100f39) /* 0.441420770 */, 18 },
-  /* 6275 */  { MAD_F(0x07107198) /* 0.441514582 */, 18 },
-  /* 6276 */  { MAD_F(0x0710d3f8) /* 0.441608399 */, 18 },
-  /* 6277 */  { MAD_F(0x07113659) /* 0.441702221 */, 18 },
-  /* 6278 */  { MAD_F(0x071198bb) /* 0.441796048 */, 18 },
-  /* 6279 */  { MAD_F(0x0711fb1f) /* 0.441889880 */, 18 },
-  /* 6280 */  { MAD_F(0x07125d84) /* 0.441983717 */, 18 },
-  /* 6281 */  { MAD_F(0x0712bfeb) /* 0.442077559 */, 18 },
-  /* 6282 */  { MAD_F(0x07132253) /* 0.442171406 */, 18 },
-  /* 6283 */  { MAD_F(0x071384bc) /* 0.442265257 */, 18 },
-  /* 6284 */  { MAD_F(0x0713e726) /* 0.442359114 */, 18 },
-  /* 6285 */  { MAD_F(0x07144992) /* 0.442452976 */, 18 },
-  /* 6286 */  { MAD_F(0x0714abff) /* 0.442546843 */, 18 },
-  /* 6287 */  { MAD_F(0x07150e6e) /* 0.442640715 */, 18 },
-
-  /* 6288 */  { MAD_F(0x071570de) /* 0.442734592 */, 18 },
-  /* 6289 */  { MAD_F(0x0715d34f) /* 0.442828473 */, 18 },
-  /* 6290 */  { MAD_F(0x071635c1) /* 0.442922360 */, 18 },
-  /* 6291 */  { MAD_F(0x07169835) /* 0.443016252 */, 18 },
-  /* 6292 */  { MAD_F(0x0716faaa) /* 0.443110148 */, 18 },
-  /* 6293 */  { MAD_F(0x07175d21) /* 0.443204050 */, 18 },
-  /* 6294 */  { MAD_F(0x0717bf99) /* 0.443297957 */, 18 },
-  /* 6295 */  { MAD_F(0x07182212) /* 0.443391868 */, 18 },
-  /* 6296 */  { MAD_F(0x0718848d) /* 0.443485785 */, 18 },
-  /* 6297 */  { MAD_F(0x0718e709) /* 0.443579706 */, 18 },
-  /* 6298 */  { MAD_F(0x07194986) /* 0.443673633 */, 18 },
-  /* 6299 */  { MAD_F(0x0719ac04) /* 0.443767564 */, 18 },
-  /* 6300 */  { MAD_F(0x071a0e84) /* 0.443861501 */, 18 },
-  /* 6301 */  { MAD_F(0x071a7105) /* 0.443955442 */, 18 },
-  /* 6302 */  { MAD_F(0x071ad388) /* 0.444049389 */, 18 },
-  /* 6303 */  { MAD_F(0x071b360c) /* 0.444143340 */, 18 },
-
-  /* 6304 */  { MAD_F(0x071b9891) /* 0.444237296 */, 18 },
-  /* 6305 */  { MAD_F(0x071bfb18) /* 0.444331258 */, 18 },
-  /* 6306 */  { MAD_F(0x071c5d9f) /* 0.444425224 */, 18 },
-  /* 6307 */  { MAD_F(0x071cc029) /* 0.444519195 */, 18 },
-  /* 6308 */  { MAD_F(0x071d22b3) /* 0.444613171 */, 18 },
-  /* 6309 */  { MAD_F(0x071d853f) /* 0.444707153 */, 18 },
-  /* 6310 */  { MAD_F(0x071de7cc) /* 0.444801139 */, 18 },
-  /* 6311 */  { MAD_F(0x071e4a5b) /* 0.444895130 */, 18 },
-  /* 6312 */  { MAD_F(0x071eaceb) /* 0.444989126 */, 18 },
-  /* 6313 */  { MAD_F(0x071f0f7c) /* 0.445083127 */, 18 },
-  /* 6314 */  { MAD_F(0x071f720e) /* 0.445177133 */, 18 },
-  /* 6315 */  { MAD_F(0x071fd4a2) /* 0.445271144 */, 18 },
-  /* 6316 */  { MAD_F(0x07203737) /* 0.445365160 */, 18 },
-  /* 6317 */  { MAD_F(0x072099ce) /* 0.445459181 */, 18 },
-  /* 6318 */  { MAD_F(0x0720fc66) /* 0.445553206 */, 18 },
-  /* 6319 */  { MAD_F(0x07215eff) /* 0.445647237 */, 18 },
-
-  /* 6320 */  { MAD_F(0x0721c19a) /* 0.445741273 */, 18 },
-  /* 6321 */  { MAD_F(0x07222436) /* 0.445835314 */, 18 },
-  /* 6322 */  { MAD_F(0x072286d3) /* 0.445929359 */, 18 },
-  /* 6323 */  { MAD_F(0x0722e971) /* 0.446023410 */, 18 },
-  /* 6324 */  { MAD_F(0x07234c11) /* 0.446117466 */, 18 },
-  /* 6325 */  { MAD_F(0x0723aeb2) /* 0.446211526 */, 18 },
-  /* 6326 */  { MAD_F(0x07241155) /* 0.446305592 */, 18 },
-  /* 6327 */  { MAD_F(0x072473f9) /* 0.446399662 */, 18 },
-  /* 6328 */  { MAD_F(0x0724d69e) /* 0.446493738 */, 18 },
-  /* 6329 */  { MAD_F(0x07253944) /* 0.446587818 */, 18 },
-  /* 6330 */  { MAD_F(0x07259bec) /* 0.446681903 */, 18 },
-  /* 6331 */  { MAD_F(0x0725fe95) /* 0.446775994 */, 18 },
-  /* 6332 */  { MAD_F(0x07266140) /* 0.446870089 */, 18 },
-  /* 6333 */  { MAD_F(0x0726c3ec) /* 0.446964189 */, 18 },
-  /* 6334 */  { MAD_F(0x07272699) /* 0.447058294 */, 18 },
-  /* 6335 */  { MAD_F(0x07278947) /* 0.447152404 */, 18 },
-
-  /* 6336 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 18 },
-  /* 6337 */  { MAD_F(0x07284ea8) /* 0.447340639 */, 18 },
-  /* 6338 */  { MAD_F(0x0728b15b) /* 0.447434764 */, 18 },
-  /* 6339 */  { MAD_F(0x0729140f) /* 0.447528894 */, 18 },
-  /* 6340 */  { MAD_F(0x072976c4) /* 0.447623029 */, 18 },
-  /* 6341 */  { MAD_F(0x0729d97a) /* 0.447717169 */, 18 },
-  /* 6342 */  { MAD_F(0x072a3c32) /* 0.447811314 */, 18 },
-  /* 6343 */  { MAD_F(0x072a9eeb) /* 0.447905463 */, 18 },
-  /* 6344 */  { MAD_F(0x072b01a6) /* 0.447999618 */, 18 },
-  /* 6345 */  { MAD_F(0x072b6461) /* 0.448093778 */, 18 },
-  /* 6346 */  { MAD_F(0x072bc71e) /* 0.448187942 */, 18 },
-  /* 6347 */  { MAD_F(0x072c29dd) /* 0.448282112 */, 18 },
-  /* 6348 */  { MAD_F(0x072c8c9d) /* 0.448376286 */, 18 },
-  /* 6349 */  { MAD_F(0x072cef5e) /* 0.448470466 */, 18 },
-  /* 6350 */  { MAD_F(0x072d5220) /* 0.448564650 */, 18 },
-  /* 6351 */  { MAD_F(0x072db4e4) /* 0.448658839 */, 18 },
-
-  /* 6352 */  { MAD_F(0x072e17a9) /* 0.448753033 */, 18 },
-  /* 6353 */  { MAD_F(0x072e7a6f) /* 0.448847233 */, 18 },
-  /* 6354 */  { MAD_F(0x072edd37) /* 0.448941437 */, 18 },
-  /* 6355 */  { MAD_F(0x072f4000) /* 0.449035646 */, 18 },
-  /* 6356 */  { MAD_F(0x072fa2ca) /* 0.449129860 */, 18 },
-  /* 6357 */  { MAD_F(0x07300596) /* 0.449224079 */, 18 },
-  /* 6358 */  { MAD_F(0x07306863) /* 0.449318303 */, 18 },
-  /* 6359 */  { MAD_F(0x0730cb32) /* 0.449412531 */, 18 },
-  /* 6360 */  { MAD_F(0x07312e01) /* 0.449506765 */, 18 },
-  /* 6361 */  { MAD_F(0x073190d2) /* 0.449601004 */, 18 },
-  /* 6362 */  { MAD_F(0x0731f3a5) /* 0.449695247 */, 18 },
-  /* 6363 */  { MAD_F(0x07325678) /* 0.449789496 */, 18 },
-  /* 6364 */  { MAD_F(0x0732b94d) /* 0.449883749 */, 18 },
-  /* 6365 */  { MAD_F(0x07331c23) /* 0.449978008 */, 18 },
-  /* 6366 */  { MAD_F(0x07337efb) /* 0.450072271 */, 18 },
-  /* 6367 */  { MAD_F(0x0733e1d4) /* 0.450166540 */, 18 },
-
-  /* 6368 */  { MAD_F(0x073444ae) /* 0.450260813 */, 18 },
-  /* 6369 */  { MAD_F(0x0734a78a) /* 0.450355091 */, 18 },
-  /* 6370 */  { MAD_F(0x07350a67) /* 0.450449374 */, 18 },
-  /* 6371 */  { MAD_F(0x07356d45) /* 0.450543662 */, 18 },
-  /* 6372 */  { MAD_F(0x0735d025) /* 0.450637955 */, 18 },
-  /* 6373 */  { MAD_F(0x07363306) /* 0.450732253 */, 18 },
-  /* 6374 */  { MAD_F(0x073695e8) /* 0.450826556 */, 18 },
-  /* 6375 */  { MAD_F(0x0736f8cb) /* 0.450920864 */, 18 },
-  /* 6376 */  { MAD_F(0x07375bb0) /* 0.451015176 */, 18 },
-  /* 6377 */  { MAD_F(0x0737be96) /* 0.451109494 */, 18 },
-  /* 6378 */  { MAD_F(0x0738217e) /* 0.451203817 */, 18 },
-  /* 6379 */  { MAD_F(0x07388467) /* 0.451298144 */, 18 },
-  /* 6380 */  { MAD_F(0x0738e751) /* 0.451392477 */, 18 },
-  /* 6381 */  { MAD_F(0x07394a3d) /* 0.451486814 */, 18 },
-  /* 6382 */  { MAD_F(0x0739ad29) /* 0.451581156 */, 18 },
-  /* 6383 */  { MAD_F(0x073a1017) /* 0.451675503 */, 18 },
-
-  /* 6384 */  { MAD_F(0x073a7307) /* 0.451769856 */, 18 },
-  /* 6385 */  { MAD_F(0x073ad5f8) /* 0.451864213 */, 18 },
-  /* 6386 */  { MAD_F(0x073b38ea) /* 0.451958575 */, 18 },
-  /* 6387 */  { MAD_F(0x073b9bdd) /* 0.452052942 */, 18 },
-  /* 6388 */  { MAD_F(0x073bfed2) /* 0.452147313 */, 18 },
-  /* 6389 */  { MAD_F(0x073c61c8) /* 0.452241690 */, 18 },
-  /* 6390 */  { MAD_F(0x073cc4bf) /* 0.452336072 */, 18 },
-  /* 6391 */  { MAD_F(0x073d27b8) /* 0.452430458 */, 18 },
-  /* 6392 */  { MAD_F(0x073d8ab2) /* 0.452524850 */, 18 },
-  /* 6393 */  { MAD_F(0x073dedae) /* 0.452619246 */, 18 },
-  /* 6394 */  { MAD_F(0x073e50aa) /* 0.452713648 */, 18 },
-  /* 6395 */  { MAD_F(0x073eb3a8) /* 0.452808054 */, 18 },
-  /* 6396 */  { MAD_F(0x073f16a8) /* 0.452902465 */, 18 },
-  /* 6397 */  { MAD_F(0x073f79a8) /* 0.452996882 */, 18 },
-  /* 6398 */  { MAD_F(0x073fdcaa) /* 0.453091303 */, 18 },
-  /* 6399 */  { MAD_F(0x07403fad) /* 0.453185729 */, 18 },
-
-  /* 6400 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 18 },
-  /* 6401 */  { MAD_F(0x074105b8) /* 0.453374595 */, 18 },
-  /* 6402 */  { MAD_F(0x074168bf) /* 0.453469036 */, 18 },
-  /* 6403 */  { MAD_F(0x0741cbc8) /* 0.453563482 */, 18 },
-  /* 6404 */  { MAD_F(0x07422ed2) /* 0.453657932 */, 18 },
-  /* 6405 */  { MAD_F(0x074291dd) /* 0.453752388 */, 18 },
-  /* 6406 */  { MAD_F(0x0742f4e9) /* 0.453846848 */, 18 },
-  /* 6407 */  { MAD_F(0x074357f7) /* 0.453941314 */, 18 },
-  /* 6408 */  { MAD_F(0x0743bb06) /* 0.454035784 */, 18 },
-  /* 6409 */  { MAD_F(0x07441e17) /* 0.454130259 */, 18 },
-  /* 6410 */  { MAD_F(0x07448129) /* 0.454224739 */, 18 },
-  /* 6411 */  { MAD_F(0x0744e43c) /* 0.454319224 */, 18 },
-  /* 6412 */  { MAD_F(0x07454750) /* 0.454413714 */, 18 },
-  /* 6413 */  { MAD_F(0x0745aa66) /* 0.454508209 */, 18 },
-  /* 6414 */  { MAD_F(0x07460d7d) /* 0.454602708 */, 18 },
-  /* 6415 */  { MAD_F(0x07467095) /* 0.454697213 */, 18 },
-
-  /* 6416 */  { MAD_F(0x0746d3af) /* 0.454791723 */, 18 },
-  /* 6417 */  { MAD_F(0x074736ca) /* 0.454886237 */, 18 },
-  /* 6418 */  { MAD_F(0x074799e7) /* 0.454980756 */, 18 },
-  /* 6419 */  { MAD_F(0x0747fd04) /* 0.455075281 */, 18 },
-  /* 6420 */  { MAD_F(0x07486023) /* 0.455169810 */, 18 },
-  /* 6421 */  { MAD_F(0x0748c344) /* 0.455264344 */, 18 },
-  /* 6422 */  { MAD_F(0x07492665) /* 0.455358883 */, 18 },
-  /* 6423 */  { MAD_F(0x07498988) /* 0.455453427 */, 18 },
-  /* 6424 */  { MAD_F(0x0749ecac) /* 0.455547976 */, 18 },
-  /* 6425 */  { MAD_F(0x074a4fd2) /* 0.455642529 */, 18 },
-  /* 6426 */  { MAD_F(0x074ab2f9) /* 0.455737088 */, 18 },
-  /* 6427 */  { MAD_F(0x074b1621) /* 0.455831652 */, 18 },
-  /* 6428 */  { MAD_F(0x074b794b) /* 0.455926220 */, 18 },
-  /* 6429 */  { MAD_F(0x074bdc75) /* 0.456020793 */, 18 },
-  /* 6430 */  { MAD_F(0x074c3fa1) /* 0.456115372 */, 18 },
-  /* 6431 */  { MAD_F(0x074ca2cf) /* 0.456209955 */, 18 },
-
-  /* 6432 */  { MAD_F(0x074d05fe) /* 0.456304543 */, 18 },
-  /* 6433 */  { MAD_F(0x074d692e) /* 0.456399136 */, 18 },
-  /* 6434 */  { MAD_F(0x074dcc5f) /* 0.456493733 */, 18 },
-  /* 6435 */  { MAD_F(0x074e2f92) /* 0.456588336 */, 18 },
-  /* 6436 */  { MAD_F(0x074e92c6) /* 0.456682944 */, 18 },
-  /* 6437 */  { MAD_F(0x074ef5fb) /* 0.456777556 */, 18 },
-  /* 6438 */  { MAD_F(0x074f5932) /* 0.456872174 */, 18 },
-  /* 6439 */  { MAD_F(0x074fbc6a) /* 0.456966796 */, 18 },
-  /* 6440 */  { MAD_F(0x07501fa3) /* 0.457061423 */, 18 },
-  /* 6441 */  { MAD_F(0x075082de) /* 0.457156056 */, 18 },
-  /* 6442 */  { MAD_F(0x0750e61a) /* 0.457250693 */, 18 },
-  /* 6443 */  { MAD_F(0x07514957) /* 0.457345335 */, 18 },
-  /* 6444 */  { MAD_F(0x0751ac96) /* 0.457439981 */, 18 },
-  /* 6445 */  { MAD_F(0x07520fd6) /* 0.457534633 */, 18 },
-  /* 6446 */  { MAD_F(0x07527317) /* 0.457629290 */, 18 },
-  /* 6447 */  { MAD_F(0x0752d659) /* 0.457723951 */, 18 },
-
-  /* 6448 */  { MAD_F(0x0753399d) /* 0.457818618 */, 18 },
-  /* 6449 */  { MAD_F(0x07539ce2) /* 0.457913289 */, 18 },
-  /* 6450 */  { MAD_F(0x07540029) /* 0.458007965 */, 18 },
-  /* 6451 */  { MAD_F(0x07546371) /* 0.458102646 */, 18 },
-  /* 6452 */  { MAD_F(0x0754c6ba) /* 0.458197332 */, 18 },
-  /* 6453 */  { MAD_F(0x07552a04) /* 0.458292023 */, 18 },
-  /* 6454 */  { MAD_F(0x07558d50) /* 0.458386719 */, 18 },
-  /* 6455 */  { MAD_F(0x0755f09d) /* 0.458481420 */, 18 },
-  /* 6456 */  { MAD_F(0x075653eb) /* 0.458576125 */, 18 },
-  /* 6457 */  { MAD_F(0x0756b73b) /* 0.458670836 */, 18 },
-  /* 6458 */  { MAD_F(0x07571a8c) /* 0.458765551 */, 18 },
-  /* 6459 */  { MAD_F(0x07577dde) /* 0.458860271 */, 18 },
-  /* 6460 */  { MAD_F(0x0757e131) /* 0.458954996 */, 18 },
-  /* 6461 */  { MAD_F(0x07584486) /* 0.459049726 */, 18 },
-  /* 6462 */  { MAD_F(0x0758a7dd) /* 0.459144461 */, 18 },
-  /* 6463 */  { MAD_F(0x07590b34) /* 0.459239201 */, 18 },
-
-  /* 6464 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 18 },
-  /* 6465 */  { MAD_F(0x0759d1e7) /* 0.459428695 */, 18 },
-  /* 6466 */  { MAD_F(0x075a3542) /* 0.459523450 */, 18 },
-  /* 6467 */  { MAD_F(0x075a989f) /* 0.459618209 */, 18 },
-  /* 6468 */  { MAD_F(0x075afbfd) /* 0.459712973 */, 18 },
-  /* 6469 */  { MAD_F(0x075b5f5d) /* 0.459807742 */, 18 },
-  /* 6470 */  { MAD_F(0x075bc2bd) /* 0.459902516 */, 18 },
-  /* 6471 */  { MAD_F(0x075c261f) /* 0.459997295 */, 18 },
-  /* 6472 */  { MAD_F(0x075c8983) /* 0.460092079 */, 18 },
-  /* 6473 */  { MAD_F(0x075cece7) /* 0.460186867 */, 18 },
-  /* 6474 */  { MAD_F(0x075d504d) /* 0.460281661 */, 18 },
-  /* 6475 */  { MAD_F(0x075db3b5) /* 0.460376459 */, 18 },
-  /* 6476 */  { MAD_F(0x075e171d) /* 0.460471262 */, 18 },
-  /* 6477 */  { MAD_F(0x075e7a87) /* 0.460566071 */, 18 },
-  /* 6478 */  { MAD_F(0x075eddf2) /* 0.460660884 */, 18 },
-  /* 6479 */  { MAD_F(0x075f415f) /* 0.460755701 */, 18 },
-
-  /* 6480 */  { MAD_F(0x075fa4cc) /* 0.460850524 */, 18 },
-  /* 6481 */  { MAD_F(0x0760083b) /* 0.460945352 */, 18 },
-  /* 6482 */  { MAD_F(0x07606bac) /* 0.461040184 */, 18 },
-  /* 6483 */  { MAD_F(0x0760cf1e) /* 0.461135022 */, 18 },
-  /* 6484 */  { MAD_F(0x07613291) /* 0.461229864 */, 18 },
-  /* 6485 */  { MAD_F(0x07619605) /* 0.461324711 */, 18 },
-  /* 6486 */  { MAD_F(0x0761f97b) /* 0.461419563 */, 18 },
-  /* 6487 */  { MAD_F(0x07625cf2) /* 0.461514420 */, 18 },
-  /* 6488 */  { MAD_F(0x0762c06a) /* 0.461609282 */, 18 },
-  /* 6489 */  { MAD_F(0x076323e3) /* 0.461704149 */, 18 },
-  /* 6490 */  { MAD_F(0x0763875e) /* 0.461799020 */, 18 },
-  /* 6491 */  { MAD_F(0x0763eadb) /* 0.461893897 */, 18 },
-  /* 6492 */  { MAD_F(0x07644e58) /* 0.461988778 */, 18 },
-  /* 6493 */  { MAD_F(0x0764b1d7) /* 0.462083664 */, 18 },
-  /* 6494 */  { MAD_F(0x07651557) /* 0.462178555 */, 18 },
-  /* 6495 */  { MAD_F(0x076578d8) /* 0.462273451 */, 18 },
-
-  /* 6496 */  { MAD_F(0x0765dc5b) /* 0.462368352 */, 18 },
-  /* 6497 */  { MAD_F(0x07663fdf) /* 0.462463257 */, 18 },
-  /* 6498 */  { MAD_F(0x0766a364) /* 0.462558168 */, 18 },
-  /* 6499 */  { MAD_F(0x076706eb) /* 0.462653083 */, 18 },
-  /* 6500 */  { MAD_F(0x07676a73) /* 0.462748003 */, 18 },
-  /* 6501 */  { MAD_F(0x0767cdfc) /* 0.462842928 */, 18 },
-  /* 6502 */  { MAD_F(0x07683187) /* 0.462937858 */, 18 },
-  /* 6503 */  { MAD_F(0x07689513) /* 0.463032793 */, 18 },
-  /* 6504 */  { MAD_F(0x0768f8a0) /* 0.463127733 */, 18 },
-  /* 6505 */  { MAD_F(0x07695c2e) /* 0.463222678 */, 18 },
-  /* 6506 */  { MAD_F(0x0769bfbe) /* 0.463317627 */, 18 },
-  /* 6507 */  { MAD_F(0x076a234f) /* 0.463412581 */, 18 },
-  /* 6508 */  { MAD_F(0x076a86e2) /* 0.463507540 */, 18 },
-  /* 6509 */  { MAD_F(0x076aea75) /* 0.463602504 */, 18 },
-  /* 6510 */  { MAD_F(0x076b4e0a) /* 0.463697473 */, 18 },
-  /* 6511 */  { MAD_F(0x076bb1a1) /* 0.463792447 */, 18 },
-
-  /* 6512 */  { MAD_F(0x076c1538) /* 0.463887426 */, 18 },
-  /* 6513 */  { MAD_F(0x076c78d1) /* 0.463982409 */, 18 },
-  /* 6514 */  { MAD_F(0x076cdc6c) /* 0.464077398 */, 18 },
-  /* 6515 */  { MAD_F(0x076d4007) /* 0.464172391 */, 18 },
-  /* 6516 */  { MAD_F(0x076da3a4) /* 0.464267389 */, 18 },
-  /* 6517 */  { MAD_F(0x076e0742) /* 0.464362392 */, 18 },
-  /* 6518 */  { MAD_F(0x076e6ae2) /* 0.464457399 */, 18 },
-  /* 6519 */  { MAD_F(0x076ece82) /* 0.464552412 */, 18 },
-  /* 6520 */  { MAD_F(0x076f3224) /* 0.464647430 */, 18 },
-  /* 6521 */  { MAD_F(0x076f95c8) /* 0.464742452 */, 18 },
-  /* 6522 */  { MAD_F(0x076ff96c) /* 0.464837479 */, 18 },
-  /* 6523 */  { MAD_F(0x07705d12) /* 0.464932511 */, 18 },
-  /* 6524 */  { MAD_F(0x0770c0ba) /* 0.465027548 */, 18 },
-  /* 6525 */  { MAD_F(0x07712462) /* 0.465122590 */, 18 },
-  /* 6526 */  { MAD_F(0x0771880c) /* 0.465217637 */, 18 },
-  /* 6527 */  { MAD_F(0x0771ebb7) /* 0.465312688 */, 18 },
-
-  /* 6528 */  { MAD_F(0x07724f64) /* 0.465407744 */, 18 },
-  /* 6529 */  { MAD_F(0x0772b312) /* 0.465502806 */, 18 },
-  /* 6530 */  { MAD_F(0x077316c1) /* 0.465597872 */, 18 },
-  /* 6531 */  { MAD_F(0x07737a71) /* 0.465692943 */, 18 },
-  /* 6532 */  { MAD_F(0x0773de23) /* 0.465788018 */, 18 },
-  /* 6533 */  { MAD_F(0x077441d6) /* 0.465883099 */, 18 },
-  /* 6534 */  { MAD_F(0x0774a58a) /* 0.465978184 */, 18 },
-  /* 6535 */  { MAD_F(0x07750940) /* 0.466073275 */, 18 },
-  /* 6536 */  { MAD_F(0x07756cf7) /* 0.466168370 */, 18 },
-  /* 6537 */  { MAD_F(0x0775d0af) /* 0.466263470 */, 18 },
-  /* 6538 */  { MAD_F(0x07763468) /* 0.466358575 */, 18 },
-  /* 6539 */  { MAD_F(0x07769823) /* 0.466453684 */, 18 },
-  /* 6540 */  { MAD_F(0x0776fbdf) /* 0.466548799 */, 18 },
-  /* 6541 */  { MAD_F(0x07775f9d) /* 0.466643918 */, 18 },
-  /* 6542 */  { MAD_F(0x0777c35c) /* 0.466739043 */, 18 },
-  /* 6543 */  { MAD_F(0x0778271c) /* 0.466834172 */, 18 },
-
-  /* 6544 */  { MAD_F(0x07788add) /* 0.466929306 */, 18 },
-  /* 6545 */  { MAD_F(0x0778ee9f) /* 0.467024445 */, 18 },
-  /* 6546 */  { MAD_F(0x07795263) /* 0.467119588 */, 18 },
-  /* 6547 */  { MAD_F(0x0779b629) /* 0.467214737 */, 18 },
-  /* 6548 */  { MAD_F(0x077a19ef) /* 0.467309890 */, 18 },
-  /* 6549 */  { MAD_F(0x077a7db7) /* 0.467405048 */, 18 },
-  /* 6550 */  { MAD_F(0x077ae180) /* 0.467500211 */, 18 },
-  /* 6551 */  { MAD_F(0x077b454b) /* 0.467595379 */, 18 },
-  /* 6552 */  { MAD_F(0x077ba916) /* 0.467690552 */, 18 },
-  /* 6553 */  { MAD_F(0x077c0ce3) /* 0.467785729 */, 18 },
-  /* 6554 */  { MAD_F(0x077c70b2) /* 0.467880912 */, 18 },
-  /* 6555 */  { MAD_F(0x077cd481) /* 0.467976099 */, 18 },
-  /* 6556 */  { MAD_F(0x077d3852) /* 0.468071291 */, 18 },
-  /* 6557 */  { MAD_F(0x077d9c24) /* 0.468166488 */, 18 },
-  /* 6558 */  { MAD_F(0x077dfff8) /* 0.468261690 */, 18 },
-  /* 6559 */  { MAD_F(0x077e63cd) /* 0.468356896 */, 18 },
-
-  /* 6560 */  { MAD_F(0x077ec7a3) /* 0.468452108 */, 18 },
-  /* 6561 */  { MAD_F(0x077f2b7a) /* 0.468547324 */, 18 },
-  /* 6562 */  { MAD_F(0x077f8f53) /* 0.468642545 */, 18 },
-  /* 6563 */  { MAD_F(0x077ff32d) /* 0.468737771 */, 18 },
-  /* 6564 */  { MAD_F(0x07805708) /* 0.468833002 */, 18 },
-  /* 6565 */  { MAD_F(0x0780bae5) /* 0.468928237 */, 18 },
-  /* 6566 */  { MAD_F(0x07811ec3) /* 0.469023478 */, 18 },
-  /* 6567 */  { MAD_F(0x078182a2) /* 0.469118723 */, 18 },
-  /* 6568 */  { MAD_F(0x0781e683) /* 0.469213973 */, 18 },
-  /* 6569 */  { MAD_F(0x07824a64) /* 0.469309228 */, 18 },
-  /* 6570 */  { MAD_F(0x0782ae47) /* 0.469404488 */, 18 },
-  /* 6571 */  { MAD_F(0x0783122c) /* 0.469499752 */, 18 },
-  /* 6572 */  { MAD_F(0x07837612) /* 0.469595022 */, 18 },
-  /* 6573 */  { MAD_F(0x0783d9f9) /* 0.469690296 */, 18 },
-  /* 6574 */  { MAD_F(0x07843de1) /* 0.469785575 */, 18 },
-  /* 6575 */  { MAD_F(0x0784a1ca) /* 0.469880859 */, 18 },
-
-  /* 6576 */  { MAD_F(0x078505b5) /* 0.469976148 */, 18 },
-  /* 6577 */  { MAD_F(0x078569a2) /* 0.470071442 */, 18 },
-  /* 6578 */  { MAD_F(0x0785cd8f) /* 0.470166740 */, 18 },
-  /* 6579 */  { MAD_F(0x0786317e) /* 0.470262043 */, 18 },
-  /* 6580 */  { MAD_F(0x0786956e) /* 0.470357351 */, 18 },
-  /* 6581 */  { MAD_F(0x0786f95f) /* 0.470452664 */, 18 },
-  /* 6582 */  { MAD_F(0x07875d52) /* 0.470547982 */, 18 },
-  /* 6583 */  { MAD_F(0x0787c146) /* 0.470643305 */, 18 },
-  /* 6584 */  { MAD_F(0x0788253b) /* 0.470738632 */, 18 },
-  /* 6585 */  { MAD_F(0x07888932) /* 0.470833964 */, 18 },
-  /* 6586 */  { MAD_F(0x0788ed2a) /* 0.470929301 */, 18 },
-  /* 6587 */  { MAD_F(0x07895123) /* 0.471024643 */, 18 },
-  /* 6588 */  { MAD_F(0x0789b51d) /* 0.471119990 */, 18 },
-  /* 6589 */  { MAD_F(0x078a1919) /* 0.471215341 */, 18 },
-  /* 6590 */  { MAD_F(0x078a7d16) /* 0.471310698 */, 18 },
-  /* 6591 */  { MAD_F(0x078ae114) /* 0.471406059 */, 18 },
-
-  /* 6592 */  { MAD_F(0x078b4514) /* 0.471501425 */, 18 },
-  /* 6593 */  { MAD_F(0x078ba915) /* 0.471596796 */, 18 },
-  /* 6594 */  { MAD_F(0x078c0d17) /* 0.471692171 */, 18 },
-  /* 6595 */  { MAD_F(0x078c711a) /* 0.471787552 */, 18 },
-  /* 6596 */  { MAD_F(0x078cd51f) /* 0.471882937 */, 18 },
-  /* 6597 */  { MAD_F(0x078d3925) /* 0.471978327 */, 18 },
-  /* 6598 */  { MAD_F(0x078d9d2d) /* 0.472073722 */, 18 },
-  /* 6599 */  { MAD_F(0x078e0135) /* 0.472169122 */, 18 },
-  /* 6600 */  { MAD_F(0x078e653f) /* 0.472264527 */, 18 },
-  /* 6601 */  { MAD_F(0x078ec94b) /* 0.472359936 */, 18 },
-  /* 6602 */  { MAD_F(0x078f2d57) /* 0.472455350 */, 18 },
-  /* 6603 */  { MAD_F(0x078f9165) /* 0.472550769 */, 18 },
-  /* 6604 */  { MAD_F(0x078ff574) /* 0.472646193 */, 18 },
-  /* 6605 */  { MAD_F(0x07905985) /* 0.472741622 */, 18 },
-  /* 6606 */  { MAD_F(0x0790bd96) /* 0.472837055 */, 18 },
-  /* 6607 */  { MAD_F(0x079121a9) /* 0.472932493 */, 18 },
-
-  /* 6608 */  { MAD_F(0x079185be) /* 0.473027937 */, 18 },
-  /* 6609 */  { MAD_F(0x0791e9d3) /* 0.473123384 */, 18 },
-  /* 6610 */  { MAD_F(0x07924dea) /* 0.473218837 */, 18 },
-  /* 6611 */  { MAD_F(0x0792b202) /* 0.473314295 */, 18 },
-  /* 6612 */  { MAD_F(0x0793161c) /* 0.473409757 */, 18 },
-  /* 6613 */  { MAD_F(0x07937a37) /* 0.473505224 */, 18 },
-  /* 6614 */  { MAD_F(0x0793de53) /* 0.473600696 */, 18 },
-  /* 6615 */  { MAD_F(0x07944270) /* 0.473696173 */, 18 },
-  /* 6616 */  { MAD_F(0x0794a68f) /* 0.473791655 */, 18 },
-  /* 6617 */  { MAD_F(0x07950aaf) /* 0.473887141 */, 18 },
-  /* 6618 */  { MAD_F(0x07956ed0) /* 0.473982632 */, 18 },
-  /* 6619 */  { MAD_F(0x0795d2f2) /* 0.474078128 */, 18 },
-  /* 6620 */  { MAD_F(0x07963716) /* 0.474173629 */, 18 },
-  /* 6621 */  { MAD_F(0x07969b3b) /* 0.474269135 */, 18 },
-  /* 6622 */  { MAD_F(0x0796ff62) /* 0.474364645 */, 18 },
-  /* 6623 */  { MAD_F(0x07976389) /* 0.474460161 */, 18 },
-
-  /* 6624 */  { MAD_F(0x0797c7b2) /* 0.474555681 */, 18 },
-  /* 6625 */  { MAD_F(0x07982bdd) /* 0.474651205 */, 18 },
-  /* 6626 */  { MAD_F(0x07989008) /* 0.474746735 */, 18 },
-  /* 6627 */  { MAD_F(0x0798f435) /* 0.474842270 */, 18 },
-  /* 6628 */  { MAD_F(0x07995863) /* 0.474937809 */, 18 },
-  /* 6629 */  { MAD_F(0x0799bc92) /* 0.475033353 */, 18 },
-  /* 6630 */  { MAD_F(0x079a20c3) /* 0.475128902 */, 18 },
-  /* 6631 */  { MAD_F(0x079a84f5) /* 0.475224456 */, 18 },
-  /* 6632 */  { MAD_F(0x079ae929) /* 0.475320014 */, 18 },
-  /* 6633 */  { MAD_F(0x079b4d5d) /* 0.475415578 */, 18 },
-  /* 6634 */  { MAD_F(0x079bb193) /* 0.475511146 */, 18 },
-  /* 6635 */  { MAD_F(0x079c15ca) /* 0.475606719 */, 18 },
-  /* 6636 */  { MAD_F(0x079c7a03) /* 0.475702296 */, 18 },
-  /* 6637 */  { MAD_F(0x079cde3c) /* 0.475797879 */, 18 },
-  /* 6638 */  { MAD_F(0x079d4277) /* 0.475893466 */, 18 },
-  /* 6639 */  { MAD_F(0x079da6b4) /* 0.475989058 */, 18 },
-
-  /* 6640 */  { MAD_F(0x079e0af1) /* 0.476084655 */, 18 },
-  /* 6641 */  { MAD_F(0x079e6f30) /* 0.476180257 */, 18 },
-  /* 6642 */  { MAD_F(0x079ed370) /* 0.476275863 */, 18 },
-  /* 6643 */  { MAD_F(0x079f37b2) /* 0.476371475 */, 18 },
-  /* 6644 */  { MAD_F(0x079f9bf5) /* 0.476467091 */, 18 },
-  /* 6645 */  { MAD_F(0x07a00039) /* 0.476562712 */, 18 },
-  /* 6646 */  { MAD_F(0x07a0647e) /* 0.476658338 */, 18 },
-  /* 6647 */  { MAD_F(0x07a0c8c5) /* 0.476753968 */, 18 },
-  /* 6648 */  { MAD_F(0x07a12d0c) /* 0.476849603 */, 18 },
-  /* 6649 */  { MAD_F(0x07a19156) /* 0.476945243 */, 18 },
-  /* 6650 */  { MAD_F(0x07a1f5a0) /* 0.477040888 */, 18 },
-  /* 6651 */  { MAD_F(0x07a259ec) /* 0.477136538 */, 18 },
-  /* 6652 */  { MAD_F(0x07a2be39) /* 0.477232193 */, 18 },
-  /* 6653 */  { MAD_F(0x07a32287) /* 0.477327852 */, 18 },
-  /* 6654 */  { MAD_F(0x07a386d7) /* 0.477423516 */, 18 },
-  /* 6655 */  { MAD_F(0x07a3eb28) /* 0.477519185 */, 18 },
-
-  /* 6656 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 18 },
-  /* 6657 */  { MAD_F(0x07a4b3ce) /* 0.477710537 */, 18 },
-  /* 6658 */  { MAD_F(0x07a51822) /* 0.477806220 */, 18 },
-  /* 6659 */  { MAD_F(0x07a57c78) /* 0.477901908 */, 18 },
-  /* 6660 */  { MAD_F(0x07a5e0d0) /* 0.477997601 */, 18 },
-  /* 6661 */  { MAD_F(0x07a64528) /* 0.478093299 */, 18 },
-  /* 6662 */  { MAD_F(0x07a6a982) /* 0.478189001 */, 18 },
-  /* 6663 */  { MAD_F(0x07a70ddd) /* 0.478284708 */, 18 },
-  /* 6664 */  { MAD_F(0x07a7723a) /* 0.478380420 */, 18 },
-  /* 6665 */  { MAD_F(0x07a7d698) /* 0.478476137 */, 18 },
-  /* 6666 */  { MAD_F(0x07a83af7) /* 0.478571858 */, 18 },
-  /* 6667 */  { MAD_F(0x07a89f57) /* 0.478667585 */, 18 },
-  /* 6668 */  { MAD_F(0x07a903b9) /* 0.478763316 */, 18 },
-  /* 6669 */  { MAD_F(0x07a9681c) /* 0.478859052 */, 18 },
-  /* 6670 */  { MAD_F(0x07a9cc80) /* 0.478954793 */, 18 },
-  /* 6671 */  { MAD_F(0x07aa30e5) /* 0.479050538 */, 18 },
-
-  /* 6672 */  { MAD_F(0x07aa954c) /* 0.479146288 */, 18 },
-  /* 6673 */  { MAD_F(0x07aaf9b4) /* 0.479242043 */, 18 },
-  /* 6674 */  { MAD_F(0x07ab5e1e) /* 0.479337803 */, 18 },
-  /* 6675 */  { MAD_F(0x07abc288) /* 0.479433568 */, 18 },
-  /* 6676 */  { MAD_F(0x07ac26f4) /* 0.479529337 */, 18 },
-  /* 6677 */  { MAD_F(0x07ac8b61) /* 0.479625111 */, 18 },
-  /* 6678 */  { MAD_F(0x07acefd0) /* 0.479720890 */, 18 },
-  /* 6679 */  { MAD_F(0x07ad543f) /* 0.479816674 */, 18 },
-  /* 6680 */  { MAD_F(0x07adb8b0) /* 0.479912463 */, 18 },
-  /* 6681 */  { MAD_F(0x07ae1d23) /* 0.480008256 */, 18 },
-  /* 6682 */  { MAD_F(0x07ae8196) /* 0.480104054 */, 18 },
-  /* 6683 */  { MAD_F(0x07aee60b) /* 0.480199857 */, 18 },
-  /* 6684 */  { MAD_F(0x07af4a81) /* 0.480295664 */, 18 },
-  /* 6685 */  { MAD_F(0x07afaef9) /* 0.480391477 */, 18 },
-  /* 6686 */  { MAD_F(0x07b01372) /* 0.480487294 */, 18 },
-  /* 6687 */  { MAD_F(0x07b077ec) /* 0.480583116 */, 18 },
-
-  /* 6688 */  { MAD_F(0x07b0dc67) /* 0.480678943 */, 18 },
-  /* 6689 */  { MAD_F(0x07b140e4) /* 0.480774774 */, 18 },
-  /* 6690 */  { MAD_F(0x07b1a561) /* 0.480870611 */, 18 },
-  /* 6691 */  { MAD_F(0x07b209e1) /* 0.480966452 */, 18 },
-  /* 6692 */  { MAD_F(0x07b26e61) /* 0.481062298 */, 18 },
-  /* 6693 */  { MAD_F(0x07b2d2e3) /* 0.481158148 */, 18 },
-  /* 6694 */  { MAD_F(0x07b33766) /* 0.481254004 */, 18 },
-  /* 6695 */  { MAD_F(0x07b39bea) /* 0.481349864 */, 18 },
-  /* 6696 */  { MAD_F(0x07b4006f) /* 0.481445729 */, 18 },
-  /* 6697 */  { MAD_F(0x07b464f6) /* 0.481541598 */, 18 },
-  /* 6698 */  { MAD_F(0x07b4c97e) /* 0.481637473 */, 18 },
-  /* 6699 */  { MAD_F(0x07b52e08) /* 0.481733352 */, 18 },
-  /* 6700 */  { MAD_F(0x07b59292) /* 0.481829236 */, 18 },
-  /* 6701 */  { MAD_F(0x07b5f71e) /* 0.481925125 */, 18 },
-  /* 6702 */  { MAD_F(0x07b65bac) /* 0.482021019 */, 18 },
-  /* 6703 */  { MAD_F(0x07b6c03a) /* 0.482116917 */, 18 },
-
-  /* 6704 */  { MAD_F(0x07b724ca) /* 0.482212820 */, 18 },
-  /* 6705 */  { MAD_F(0x07b7895b) /* 0.482308728 */, 18 },
-  /* 6706 */  { MAD_F(0x07b7eded) /* 0.482404640 */, 18 },
-  /* 6707 */  { MAD_F(0x07b85281) /* 0.482500558 */, 18 },
-  /* 6708 */  { MAD_F(0x07b8b716) /* 0.482596480 */, 18 },
-  /* 6709 */  { MAD_F(0x07b91bac) /* 0.482692407 */, 18 },
-  /* 6710 */  { MAD_F(0x07b98044) /* 0.482788339 */, 18 },
-  /* 6711 */  { MAD_F(0x07b9e4dc) /* 0.482884275 */, 18 },
-  /* 6712 */  { MAD_F(0x07ba4976) /* 0.482980216 */, 18 },
-  /* 6713 */  { MAD_F(0x07baae12) /* 0.483076162 */, 18 },
-  /* 6714 */  { MAD_F(0x07bb12ae) /* 0.483172113 */, 18 },
-  /* 6715 */  { MAD_F(0x07bb774c) /* 0.483268069 */, 18 },
-  /* 6716 */  { MAD_F(0x07bbdbeb) /* 0.483364029 */, 18 },
-  /* 6717 */  { MAD_F(0x07bc408c) /* 0.483459994 */, 18 },
-  /* 6718 */  { MAD_F(0x07bca52d) /* 0.483555964 */, 18 },
-  /* 6719 */  { MAD_F(0x07bd09d0) /* 0.483651939 */, 18 },
-
-  /* 6720 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 18 },
-  /* 6721 */  { MAD_F(0x07bdd31a) /* 0.483843902 */, 18 },
-  /* 6722 */  { MAD_F(0x07be37c1) /* 0.483939891 */, 18 },
-  /* 6723 */  { MAD_F(0x07be9c69) /* 0.484035885 */, 18 },
-  /* 6724 */  { MAD_F(0x07bf0113) /* 0.484131883 */, 18 },
-  /* 6725 */  { MAD_F(0x07bf65bd) /* 0.484227886 */, 18 },
-  /* 6726 */  { MAD_F(0x07bfca69) /* 0.484323894 */, 18 },
-  /* 6727 */  { MAD_F(0x07c02f16) /* 0.484419907 */, 18 },
-  /* 6728 */  { MAD_F(0x07c093c5) /* 0.484515924 */, 18 },
-  /* 6729 */  { MAD_F(0x07c0f875) /* 0.484611946 */, 18 },
-  /* 6730 */  { MAD_F(0x07c15d26) /* 0.484707973 */, 18 },
-  /* 6731 */  { MAD_F(0x07c1c1d8) /* 0.484804005 */, 18 },
-  /* 6732 */  { MAD_F(0x07c2268b) /* 0.484900041 */, 18 },
-  /* 6733 */  { MAD_F(0x07c28b40) /* 0.484996083 */, 18 },
-  /* 6734 */  { MAD_F(0x07c2eff6) /* 0.485092128 */, 18 },
-  /* 6735 */  { MAD_F(0x07c354ae) /* 0.485188179 */, 18 },
-
-  /* 6736 */  { MAD_F(0x07c3b967) /* 0.485284235 */, 18 },
-  /* 6737 */  { MAD_F(0x07c41e21) /* 0.485380295 */, 18 },
-  /* 6738 */  { MAD_F(0x07c482dc) /* 0.485476360 */, 18 },
-  /* 6739 */  { MAD_F(0x07c4e798) /* 0.485572430 */, 18 },
-  /* 6740 */  { MAD_F(0x07c54c56) /* 0.485668504 */, 18 },
-  /* 6741 */  { MAD_F(0x07c5b115) /* 0.485764583 */, 18 },
-  /* 6742 */  { MAD_F(0x07c615d6) /* 0.485860667 */, 18 },
-  /* 6743 */  { MAD_F(0x07c67a97) /* 0.485956756 */, 18 },
-  /* 6744 */  { MAD_F(0x07c6df5a) /* 0.486052849 */, 18 },
-  /* 6745 */  { MAD_F(0x07c7441e) /* 0.486148948 */, 18 },
-  /* 6746 */  { MAD_F(0x07c7a8e4) /* 0.486245051 */, 18 },
-  /* 6747 */  { MAD_F(0x07c80daa) /* 0.486341158 */, 18 },
-  /* 6748 */  { MAD_F(0x07c87272) /* 0.486437271 */, 18 },
-  /* 6749 */  { MAD_F(0x07c8d73c) /* 0.486533388 */, 18 },
-  /* 6750 */  { MAD_F(0x07c93c06) /* 0.486629510 */, 18 },
-  /* 6751 */  { MAD_F(0x07c9a0d2) /* 0.486725637 */, 18 },
-
-  /* 6752 */  { MAD_F(0x07ca059f) /* 0.486821768 */, 18 },
-  /* 6753 */  { MAD_F(0x07ca6a6d) /* 0.486917905 */, 18 },
-  /* 6754 */  { MAD_F(0x07cacf3d) /* 0.487014045 */, 18 },
-  /* 6755 */  { MAD_F(0x07cb340e) /* 0.487110191 */, 18 },
-  /* 6756 */  { MAD_F(0x07cb98e0) /* 0.487206342 */, 18 },
-  /* 6757 */  { MAD_F(0x07cbfdb4) /* 0.487302497 */, 18 },
-  /* 6758 */  { MAD_F(0x07cc6288) /* 0.487398657 */, 18 },
-  /* 6759 */  { MAD_F(0x07ccc75e) /* 0.487494821 */, 18 },
-  /* 6760 */  { MAD_F(0x07cd2c36) /* 0.487590991 */, 18 },
-  /* 6761 */  { MAD_F(0x07cd910e) /* 0.487687165 */, 18 },
-  /* 6762 */  { MAD_F(0x07cdf5e8) /* 0.487783344 */, 18 },
-  /* 6763 */  { MAD_F(0x07ce5ac3) /* 0.487879528 */, 18 },
-  /* 6764 */  { MAD_F(0x07cebfa0) /* 0.487975716 */, 18 },
-  /* 6765 */  { MAD_F(0x07cf247d) /* 0.488071909 */, 18 },
-  /* 6766 */  { MAD_F(0x07cf895c) /* 0.488168107 */, 18 },
-  /* 6767 */  { MAD_F(0x07cfee3c) /* 0.488264310 */, 18 },
-
-  /* 6768 */  { MAD_F(0x07d0531e) /* 0.488360517 */, 18 },
-  /* 6769 */  { MAD_F(0x07d0b801) /* 0.488456729 */, 18 },
-  /* 6770 */  { MAD_F(0x07d11ce5) /* 0.488552946 */, 18 },
-  /* 6771 */  { MAD_F(0x07d181ca) /* 0.488649167 */, 18 },
-  /* 6772 */  { MAD_F(0x07d1e6b0) /* 0.488745394 */, 18 },
-  /* 6773 */  { MAD_F(0x07d24b98) /* 0.488841625 */, 18 },
-  /* 6774 */  { MAD_F(0x07d2b081) /* 0.488937860 */, 18 },
-  /* 6775 */  { MAD_F(0x07d3156c) /* 0.489034101 */, 18 },
-  /* 6776 */  { MAD_F(0x07d37a57) /* 0.489130346 */, 18 },
-  /* 6777 */  { MAD_F(0x07d3df44) /* 0.489226596 */, 18 },
-  /* 6778 */  { MAD_F(0x07d44432) /* 0.489322851 */, 18 },
-  /* 6779 */  { MAD_F(0x07d4a922) /* 0.489419110 */, 18 },
-  /* 6780 */  { MAD_F(0x07d50e13) /* 0.489515375 */, 18 },
-  /* 6781 */  { MAD_F(0x07d57305) /* 0.489611643 */, 18 },
-  /* 6782 */  { MAD_F(0x07d5d7f8) /* 0.489707917 */, 18 },
-  /* 6783 */  { MAD_F(0x07d63cec) /* 0.489804195 */, 18 },
-
-  /* 6784 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 18 },
-  /* 6785 */  { MAD_F(0x07d706d9) /* 0.489996766 */, 18 },
-  /* 6786 */  { MAD_F(0x07d76bd2) /* 0.490093059 */, 18 },
-  /* 6787 */  { MAD_F(0x07d7d0cb) /* 0.490189356 */, 18 },
-  /* 6788 */  { MAD_F(0x07d835c6) /* 0.490285658 */, 18 },
-  /* 6789 */  { MAD_F(0x07d89ac2) /* 0.490381965 */, 18 },
-  /* 6790 */  { MAD_F(0x07d8ffc0) /* 0.490478277 */, 18 },
-  /* 6791 */  { MAD_F(0x07d964be) /* 0.490574593 */, 18 },
-  /* 6792 */  { MAD_F(0x07d9c9be) /* 0.490670914 */, 18 },
-  /* 6793 */  { MAD_F(0x07da2ebf) /* 0.490767239 */, 18 },
-  /* 6794 */  { MAD_F(0x07da93c2) /* 0.490863570 */, 18 },
-  /* 6795 */  { MAD_F(0x07daf8c6) /* 0.490959905 */, 18 },
-  /* 6796 */  { MAD_F(0x07db5dcb) /* 0.491056245 */, 18 },
-  /* 6797 */  { MAD_F(0x07dbc2d1) /* 0.491152589 */, 18 },
-  /* 6798 */  { MAD_F(0x07dc27d9) /* 0.491248939 */, 18 },
-  /* 6799 */  { MAD_F(0x07dc8ce1) /* 0.491345293 */, 18 },
-
-  /* 6800 */  { MAD_F(0x07dcf1ec) /* 0.491441651 */, 18 },
-  /* 6801 */  { MAD_F(0x07dd56f7) /* 0.491538015 */, 18 },
-  /* 6802 */  { MAD_F(0x07ddbc04) /* 0.491634383 */, 18 },
-  /* 6803 */  { MAD_F(0x07de2111) /* 0.491730756 */, 18 },
-  /* 6804 */  { MAD_F(0x07de8621) /* 0.491827134 */, 18 },
-  /* 6805 */  { MAD_F(0x07deeb31) /* 0.491923516 */, 18 },
-  /* 6806 */  { MAD_F(0x07df5043) /* 0.492019903 */, 18 },
-  /* 6807 */  { MAD_F(0x07dfb556) /* 0.492116295 */, 18 },
-  /* 6808 */  { MAD_F(0x07e01a6a) /* 0.492212691 */, 18 },
-  /* 6809 */  { MAD_F(0x07e07f80) /* 0.492309093 */, 18 },
-  /* 6810 */  { MAD_F(0x07e0e496) /* 0.492405499 */, 18 },
-  /* 6811 */  { MAD_F(0x07e149ae) /* 0.492501909 */, 18 },
-  /* 6812 */  { MAD_F(0x07e1aec8) /* 0.492598325 */, 18 },
-  /* 6813 */  { MAD_F(0x07e213e2) /* 0.492694745 */, 18 },
-  /* 6814 */  { MAD_F(0x07e278fe) /* 0.492791170 */, 18 },
-  /* 6815 */  { MAD_F(0x07e2de1b) /* 0.492887599 */, 18 },
-
-  /* 6816 */  { MAD_F(0x07e3433a) /* 0.492984033 */, 18 },
-  /* 6817 */  { MAD_F(0x07e3a859) /* 0.493080472 */, 18 },
-  /* 6818 */  { MAD_F(0x07e40d7a) /* 0.493176916 */, 18 },
-  /* 6819 */  { MAD_F(0x07e4729c) /* 0.493273365 */, 18 },
-  /* 6820 */  { MAD_F(0x07e4d7c0) /* 0.493369818 */, 18 },
-  /* 6821 */  { MAD_F(0x07e53ce4) /* 0.493466275 */, 18 },
-  /* 6822 */  { MAD_F(0x07e5a20a) /* 0.493562738 */, 18 },
-  /* 6823 */  { MAD_F(0x07e60732) /* 0.493659205 */, 18 },
-  /* 6824 */  { MAD_F(0x07e66c5a) /* 0.493755677 */, 18 },
-  /* 6825 */  { MAD_F(0x07e6d184) /* 0.493852154 */, 18 },
-  /* 6826 */  { MAD_F(0x07e736af) /* 0.493948635 */, 18 },
-  /* 6827 */  { MAD_F(0x07e79bdb) /* 0.494045122 */, 18 },
-  /* 6828 */  { MAD_F(0x07e80109) /* 0.494141612 */, 18 },
-  /* 6829 */  { MAD_F(0x07e86638) /* 0.494238108 */, 18 },
-  /* 6830 */  { MAD_F(0x07e8cb68) /* 0.494334608 */, 18 },
-  /* 6831 */  { MAD_F(0x07e93099) /* 0.494431113 */, 18 },
-
-  /* 6832 */  { MAD_F(0x07e995cc) /* 0.494527623 */, 18 },
-  /* 6833 */  { MAD_F(0x07e9fb00) /* 0.494624137 */, 18 },
-  /* 6834 */  { MAD_F(0x07ea6035) /* 0.494720656 */, 18 },
-  /* 6835 */  { MAD_F(0x07eac56b) /* 0.494817180 */, 18 },
-  /* 6836 */  { MAD_F(0x07eb2aa3) /* 0.494913709 */, 18 },
-  /* 6837 */  { MAD_F(0x07eb8fdc) /* 0.495010242 */, 18 },
-  /* 6838 */  { MAD_F(0x07ebf516) /* 0.495106780 */, 18 },
-  /* 6839 */  { MAD_F(0x07ec5a51) /* 0.495203322 */, 18 },
-  /* 6840 */  { MAD_F(0x07ecbf8e) /* 0.495299870 */, 18 },
-  /* 6841 */  { MAD_F(0x07ed24cc) /* 0.495396422 */, 18 },
-  /* 6842 */  { MAD_F(0x07ed8a0b) /* 0.495492978 */, 18 },
-  /* 6843 */  { MAD_F(0x07edef4c) /* 0.495589540 */, 18 },
-  /* 6844 */  { MAD_F(0x07ee548e) /* 0.495686106 */, 18 },
-  /* 6845 */  { MAD_F(0x07eeb9d1) /* 0.495782677 */, 18 },
-  /* 6846 */  { MAD_F(0x07ef1f15) /* 0.495879252 */, 18 },
-  /* 6847 */  { MAD_F(0x07ef845b) /* 0.495975833 */, 18 },
-
-  /* 6848 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 18 },
-  /* 6849 */  { MAD_F(0x07f04ee9) /* 0.496169007 */, 18 },
-  /* 6850 */  { MAD_F(0x07f0b433) /* 0.496265602 */, 18 },
-  /* 6851 */  { MAD_F(0x07f1197d) /* 0.496362201 */, 18 },
-  /* 6852 */  { MAD_F(0x07f17ec9) /* 0.496458804 */, 18 },
-  /* 6853 */  { MAD_F(0x07f1e416) /* 0.496555413 */, 18 },
-  /* 6854 */  { MAD_F(0x07f24965) /* 0.496652026 */, 18 },
-  /* 6855 */  { MAD_F(0x07f2aeb5) /* 0.496748644 */, 18 },
-  /* 6856 */  { MAD_F(0x07f31405) /* 0.496845266 */, 18 },
-  /* 6857 */  { MAD_F(0x07f37958) /* 0.496941894 */, 18 },
-  /* 6858 */  { MAD_F(0x07f3deab) /* 0.497038526 */, 18 },
-  /* 6859 */  { MAD_F(0x07f44400) /* 0.497135162 */, 18 },
-  /* 6860 */  { MAD_F(0x07f4a956) /* 0.497231804 */, 18 },
-  /* 6861 */  { MAD_F(0x07f50ead) /* 0.497328450 */, 18 },
-  /* 6862 */  { MAD_F(0x07f57405) /* 0.497425100 */, 18 },
-  /* 6863 */  { MAD_F(0x07f5d95f) /* 0.497521756 */, 18 },
-
-  /* 6864 */  { MAD_F(0x07f63eba) /* 0.497618416 */, 18 },
-  /* 6865 */  { MAD_F(0x07f6a416) /* 0.497715081 */, 18 },
-  /* 6866 */  { MAD_F(0x07f70974) /* 0.497811750 */, 18 },
-  /* 6867 */  { MAD_F(0x07f76ed3) /* 0.497908425 */, 18 },
-  /* 6868 */  { MAD_F(0x07f7d433) /* 0.498005103 */, 18 },
-  /* 6869 */  { MAD_F(0x07f83994) /* 0.498101787 */, 18 },
-  /* 6870 */  { MAD_F(0x07f89ef7) /* 0.498198475 */, 18 },
-  /* 6871 */  { MAD_F(0x07f9045a) /* 0.498295168 */, 18 },
-  /* 6872 */  { MAD_F(0x07f969c0) /* 0.498391866 */, 18 },
-  /* 6873 */  { MAD_F(0x07f9cf26) /* 0.498488568 */, 18 },
-  /* 6874 */  { MAD_F(0x07fa348e) /* 0.498585275 */, 18 },
-  /* 6875 */  { MAD_F(0x07fa99f6) /* 0.498681987 */, 18 },
-  /* 6876 */  { MAD_F(0x07faff60) /* 0.498778704 */, 18 },
-  /* 6877 */  { MAD_F(0x07fb64cc) /* 0.498875425 */, 18 },
-  /* 6878 */  { MAD_F(0x07fbca38) /* 0.498972150 */, 18 },
-  /* 6879 */  { MAD_F(0x07fc2fa6) /* 0.499068881 */, 18 },
-
-  /* 6880 */  { MAD_F(0x07fc9516) /* 0.499165616 */, 18 },
-  /* 6881 */  { MAD_F(0x07fcfa86) /* 0.499262356 */, 18 },
-  /* 6882 */  { MAD_F(0x07fd5ff8) /* 0.499359101 */, 18 },
-  /* 6883 */  { MAD_F(0x07fdc56b) /* 0.499455850 */, 18 },
-  /* 6884 */  { MAD_F(0x07fe2adf) /* 0.499552604 */, 18 },
-  /* 6885 */  { MAD_F(0x07fe9054) /* 0.499649362 */, 18 },
-  /* 6886 */  { MAD_F(0x07fef5cb) /* 0.499746126 */, 18 },
-  /* 6887 */  { MAD_F(0x07ff5b43) /* 0.499842894 */, 18 },
-  /* 6888 */  { MAD_F(0x07ffc0bc) /* 0.499939666 */, 18 },
-  /* 6889 */  { MAD_F(0x0400131b) /* 0.250018222 */, 19 },
-  /* 6890 */  { MAD_F(0x040045d9) /* 0.250066613 */, 19 },
-  /* 6891 */  { MAD_F(0x04007897) /* 0.250115006 */, 19 },
-  /* 6892 */  { MAD_F(0x0400ab57) /* 0.250163402 */, 19 },
-  /* 6893 */  { MAD_F(0x0400de16) /* 0.250211800 */, 19 },
-  /* 6894 */  { MAD_F(0x040110d7) /* 0.250260200 */, 19 },
-  /* 6895 */  { MAD_F(0x04014398) /* 0.250308603 */, 19 },
-
-  /* 6896 */  { MAD_F(0x04017659) /* 0.250357008 */, 19 },
-  /* 6897 */  { MAD_F(0x0401a91c) /* 0.250405415 */, 19 },
-  /* 6898 */  { MAD_F(0x0401dbdf) /* 0.250453825 */, 19 },
-  /* 6899 */  { MAD_F(0x04020ea2) /* 0.250502237 */, 19 },
-  /* 6900 */  { MAD_F(0x04024166) /* 0.250550652 */, 19 },
-  /* 6901 */  { MAD_F(0x0402742b) /* 0.250599068 */, 19 },
-  /* 6902 */  { MAD_F(0x0402a6f0) /* 0.250647488 */, 19 },
-  /* 6903 */  { MAD_F(0x0402d9b6) /* 0.250695909 */, 19 },
-  /* 6904 */  { MAD_F(0x04030c7d) /* 0.250744333 */, 19 },
-  /* 6905 */  { MAD_F(0x04033f44) /* 0.250792759 */, 19 },
-  /* 6906 */  { MAD_F(0x0403720c) /* 0.250841187 */, 19 },
-  /* 6907 */  { MAD_F(0x0403a4d5) /* 0.250889618 */, 19 },
-  /* 6908 */  { MAD_F(0x0403d79e) /* 0.250938051 */, 19 },
-  /* 6909 */  { MAD_F(0x04040a68) /* 0.250986487 */, 19 },
-  /* 6910 */  { MAD_F(0x04043d32) /* 0.251034924 */, 19 },
-  /* 6911 */  { MAD_F(0x04046ffd) /* 0.251083365 */, 19 },
-
-  /* 6912 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 19 },
-  /* 6913 */  { MAD_F(0x0404d595) /* 0.251180252 */, 19 },
-  /* 6914 */  { MAD_F(0x04050862) /* 0.251228699 */, 19 },
-  /* 6915 */  { MAD_F(0x04053b30) /* 0.251277148 */, 19 },
-  /* 6916 */  { MAD_F(0x04056dfe) /* 0.251325600 */, 19 },
-  /* 6917 */  { MAD_F(0x0405a0cd) /* 0.251374054 */, 19 },
-  /* 6918 */  { MAD_F(0x0405d39c) /* 0.251422511 */, 19 },
-  /* 6919 */  { MAD_F(0x0406066c) /* 0.251470970 */, 19 },
-  /* 6920 */  { MAD_F(0x0406393d) /* 0.251519431 */, 19 },
-  /* 6921 */  { MAD_F(0x04066c0e) /* 0.251567894 */, 19 },
-  /* 6922 */  { MAD_F(0x04069ee0) /* 0.251616360 */, 19 },
-  /* 6923 */  { MAD_F(0x0406d1b3) /* 0.251664828 */, 19 },
-  /* 6924 */  { MAD_F(0x04070486) /* 0.251713299 */, 19 },
-  /* 6925 */  { MAD_F(0x0407375a) /* 0.251761772 */, 19 },
-  /* 6926 */  { MAD_F(0x04076a2e) /* 0.251810247 */, 19 },
-  /* 6927 */  { MAD_F(0x04079d03) /* 0.251858724 */, 19 },
-
-  /* 6928 */  { MAD_F(0x0407cfd9) /* 0.251907204 */, 19 },
-  /* 6929 */  { MAD_F(0x040802af) /* 0.251955686 */, 19 },
-  /* 6930 */  { MAD_F(0x04083586) /* 0.252004171 */, 19 },
-  /* 6931 */  { MAD_F(0x0408685e) /* 0.252052658 */, 19 },
-  /* 6932 */  { MAD_F(0x04089b36) /* 0.252101147 */, 19 },
-  /* 6933 */  { MAD_F(0x0408ce0f) /* 0.252149638 */, 19 },
-  /* 6934 */  { MAD_F(0x040900e8) /* 0.252198132 */, 19 },
-  /* 6935 */  { MAD_F(0x040933c2) /* 0.252246628 */, 19 },
-  /* 6936 */  { MAD_F(0x0409669d) /* 0.252295127 */, 19 },
-  /* 6937 */  { MAD_F(0x04099978) /* 0.252343627 */, 19 },
-  /* 6938 */  { MAD_F(0x0409cc54) /* 0.252392131 */, 19 },
-  /* 6939 */  { MAD_F(0x0409ff31) /* 0.252440636 */, 19 },
-  /* 6940 */  { MAD_F(0x040a320e) /* 0.252489144 */, 19 },
-  /* 6941 */  { MAD_F(0x040a64ec) /* 0.252537654 */, 19 },
-  /* 6942 */  { MAD_F(0x040a97cb) /* 0.252586166 */, 19 },
-  /* 6943 */  { MAD_F(0x040acaaa) /* 0.252634681 */, 19 },
-
-  /* 6944 */  { MAD_F(0x040afd89) /* 0.252683198 */, 19 },
-  /* 6945 */  { MAD_F(0x040b306a) /* 0.252731718 */, 19 },
-  /* 6946 */  { MAD_F(0x040b634b) /* 0.252780240 */, 19 },
-  /* 6947 */  { MAD_F(0x040b962c) /* 0.252828764 */, 19 },
-  /* 6948 */  { MAD_F(0x040bc90e) /* 0.252877290 */, 19 },
-  /* 6949 */  { MAD_F(0x040bfbf1) /* 0.252925819 */, 19 },
-  /* 6950 */  { MAD_F(0x040c2ed5) /* 0.252974350 */, 19 },
-  /* 6951 */  { MAD_F(0x040c61b9) /* 0.253022883 */, 19 },
-  /* 6952 */  { MAD_F(0x040c949e) /* 0.253071419 */, 19 },
-  /* 6953 */  { MAD_F(0x040cc783) /* 0.253119957 */, 19 },
-  /* 6954 */  { MAD_F(0x040cfa69) /* 0.253168498 */, 19 },
-  /* 6955 */  { MAD_F(0x040d2d4f) /* 0.253217040 */, 19 },
-  /* 6956 */  { MAD_F(0x040d6037) /* 0.253265585 */, 19 },
-  /* 6957 */  { MAD_F(0x040d931e) /* 0.253314133 */, 19 },
-  /* 6958 */  { MAD_F(0x040dc607) /* 0.253362682 */, 19 },
-  /* 6959 */  { MAD_F(0x040df8f0) /* 0.253411234 */, 19 },
-
-  /* 6960 */  { MAD_F(0x040e2bda) /* 0.253459789 */, 19 },
-  /* 6961 */  { MAD_F(0x040e5ec4) /* 0.253508345 */, 19 },
-  /* 6962 */  { MAD_F(0x040e91af) /* 0.253556904 */, 19 },
-  /* 6963 */  { MAD_F(0x040ec49b) /* 0.253605466 */, 19 },
-  /* 6964 */  { MAD_F(0x040ef787) /* 0.253654029 */, 19 },
-  /* 6965 */  { MAD_F(0x040f2a74) /* 0.253702595 */, 19 },
-  /* 6966 */  { MAD_F(0x040f5d61) /* 0.253751164 */, 19 },
-  /* 6967 */  { MAD_F(0x040f904f) /* 0.253799734 */, 19 },
-  /* 6968 */  { MAD_F(0x040fc33e) /* 0.253848307 */, 19 },
-  /* 6969 */  { MAD_F(0x040ff62d) /* 0.253896883 */, 19 },
-  /* 6970 */  { MAD_F(0x0410291d) /* 0.253945460 */, 19 },
-  /* 6971 */  { MAD_F(0x04105c0e) /* 0.253994040 */, 19 },
-  /* 6972 */  { MAD_F(0x04108eff) /* 0.254042622 */, 19 },
-  /* 6973 */  { MAD_F(0x0410c1f1) /* 0.254091207 */, 19 },
-  /* 6974 */  { MAD_F(0x0410f4e3) /* 0.254139794 */, 19 },
-  /* 6975 */  { MAD_F(0x041127d6) /* 0.254188383 */, 19 },
-
-  /* 6976 */  { MAD_F(0x04115aca) /* 0.254236974 */, 19 },
-  /* 6977 */  { MAD_F(0x04118dbe) /* 0.254285568 */, 19 },
-  /* 6978 */  { MAD_F(0x0411c0b3) /* 0.254334165 */, 19 },
-  /* 6979 */  { MAD_F(0x0411f3a9) /* 0.254382763 */, 19 },
-  /* 6980 */  { MAD_F(0x0412269f) /* 0.254431364 */, 19 },
-  /* 6981 */  { MAD_F(0x04125996) /* 0.254479967 */, 19 },
-  /* 6982 */  { MAD_F(0x04128c8d) /* 0.254528572 */, 19 },
-  /* 6983 */  { MAD_F(0x0412bf85) /* 0.254577180 */, 19 },
-  /* 6984 */  { MAD_F(0x0412f27e) /* 0.254625790 */, 19 },
-  /* 6985 */  { MAD_F(0x04132577) /* 0.254674403 */, 19 },
-  /* 6986 */  { MAD_F(0x04135871) /* 0.254723017 */, 19 },
-  /* 6987 */  { MAD_F(0x04138b6c) /* 0.254771635 */, 19 },
-  /* 6988 */  { MAD_F(0x0413be67) /* 0.254820254 */, 19 },
-  /* 6989 */  { MAD_F(0x0413f163) /* 0.254868876 */, 19 },
-  /* 6990 */  { MAD_F(0x0414245f) /* 0.254917500 */, 19 },
-  /* 6991 */  { MAD_F(0x0414575c) /* 0.254966126 */, 19 },
-
-  /* 6992 */  { MAD_F(0x04148a5a) /* 0.255014755 */, 19 },
-  /* 6993 */  { MAD_F(0x0414bd58) /* 0.255063386 */, 19 },
-  /* 6994 */  { MAD_F(0x0414f057) /* 0.255112019 */, 19 },
-  /* 6995 */  { MAD_F(0x04152356) /* 0.255160655 */, 19 },
-  /* 6996 */  { MAD_F(0x04155657) /* 0.255209292 */, 19 },
-  /* 6997 */  { MAD_F(0x04158957) /* 0.255257933 */, 19 },
-  /* 6998 */  { MAD_F(0x0415bc59) /* 0.255306575 */, 19 },
-  /* 6999 */  { MAD_F(0x0415ef5b) /* 0.255355220 */, 19 },
-  /* 7000 */  { MAD_F(0x0416225d) /* 0.255403867 */, 19 },
-  /* 7001 */  { MAD_F(0x04165561) /* 0.255452517 */, 19 },
-  /* 7002 */  { MAD_F(0x04168864) /* 0.255501169 */, 19 },
-  /* 7003 */  { MAD_F(0x0416bb69) /* 0.255549823 */, 19 },
-  /* 7004 */  { MAD_F(0x0416ee6e) /* 0.255598479 */, 19 },
-  /* 7005 */  { MAD_F(0x04172174) /* 0.255647138 */, 19 },
-  /* 7006 */  { MAD_F(0x0417547a) /* 0.255695799 */, 19 },
-  /* 7007 */  { MAD_F(0x04178781) /* 0.255744463 */, 19 },
-
-  /* 7008 */  { MAD_F(0x0417ba89) /* 0.255793128 */, 19 },
-  /* 7009 */  { MAD_F(0x0417ed91) /* 0.255841796 */, 19 },
-  /* 7010 */  { MAD_F(0x0418209a) /* 0.255890467 */, 19 },
-  /* 7011 */  { MAD_F(0x041853a3) /* 0.255939139 */, 19 },
-  /* 7012 */  { MAD_F(0x041886ad) /* 0.255987814 */, 19 },
-  /* 7013 */  { MAD_F(0x0418b9b8) /* 0.256036492 */, 19 },
-  /* 7014 */  { MAD_F(0x0418ecc3) /* 0.256085171 */, 19 },
-  /* 7015 */  { MAD_F(0x04191fcf) /* 0.256133853 */, 19 },
-  /* 7016 */  { MAD_F(0x041952dc) /* 0.256182537 */, 19 },
-  /* 7017 */  { MAD_F(0x041985e9) /* 0.256231224 */, 19 },
-  /* 7018 */  { MAD_F(0x0419b8f7) /* 0.256279913 */, 19 },
-  /* 7019 */  { MAD_F(0x0419ec05) /* 0.256328604 */, 19 },
-  /* 7020 */  { MAD_F(0x041a1f15) /* 0.256377297 */, 19 },
-  /* 7021 */  { MAD_F(0x041a5224) /* 0.256425993 */, 19 },
-  /* 7022 */  { MAD_F(0x041a8534) /* 0.256474691 */, 19 },
-  /* 7023 */  { MAD_F(0x041ab845) /* 0.256523392 */, 19 },
-
-  /* 7024 */  { MAD_F(0x041aeb57) /* 0.256572095 */, 19 },
-  /* 7025 */  { MAD_F(0x041b1e69) /* 0.256620800 */, 19 },
-  /* 7026 */  { MAD_F(0x041b517c) /* 0.256669507 */, 19 },
-  /* 7027 */  { MAD_F(0x041b848f) /* 0.256718217 */, 19 },
-  /* 7028 */  { MAD_F(0x041bb7a3) /* 0.256766929 */, 19 },
-  /* 7029 */  { MAD_F(0x041beab8) /* 0.256815643 */, 19 },
-  /* 7030 */  { MAD_F(0x041c1dcd) /* 0.256864359 */, 19 },
-  /* 7031 */  { MAD_F(0x041c50e3) /* 0.256913078 */, 19 },
-  /* 7032 */  { MAD_F(0x041c83fa) /* 0.256961800 */, 19 },
-  /* 7033 */  { MAD_F(0x041cb711) /* 0.257010523 */, 19 },
-  /* 7034 */  { MAD_F(0x041cea28) /* 0.257059249 */, 19 },
-  /* 7035 */  { MAD_F(0x041d1d41) /* 0.257107977 */, 19 },
-  /* 7036 */  { MAD_F(0x041d505a) /* 0.257156708 */, 19 },
-  /* 7037 */  { MAD_F(0x041d8373) /* 0.257205440 */, 19 },
-  /* 7038 */  { MAD_F(0x041db68e) /* 0.257254175 */, 19 },
-  /* 7039 */  { MAD_F(0x041de9a8) /* 0.257302913 */, 19 },
-
-  /* 7040 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 19 },
-  /* 7041 */  { MAD_F(0x041e4fe0) /* 0.257400394 */, 19 },
-  /* 7042 */  { MAD_F(0x041e82fd) /* 0.257449139 */, 19 },
-  /* 7043 */  { MAD_F(0x041eb61a) /* 0.257497885 */, 19 },
-  /* 7044 */  { MAD_F(0x041ee938) /* 0.257546634 */, 19 },
-  /* 7045 */  { MAD_F(0x041f1c57) /* 0.257595386 */, 19 },
-  /* 7046 */  { MAD_F(0x041f4f76) /* 0.257644139 */, 19 },
-  /* 7047 */  { MAD_F(0x041f8296) /* 0.257692895 */, 19 },
-  /* 7048 */  { MAD_F(0x041fb5b6) /* 0.257741653 */, 19 },
-  /* 7049 */  { MAD_F(0x041fe8d7) /* 0.257790414 */, 19 },
-  /* 7050 */  { MAD_F(0x04201bf9) /* 0.257839176 */, 19 },
-  /* 7051 */  { MAD_F(0x04204f1b) /* 0.257887941 */, 19 },
-  /* 7052 */  { MAD_F(0x0420823e) /* 0.257936709 */, 19 },
-  /* 7053 */  { MAD_F(0x0420b561) /* 0.257985478 */, 19 },
-  /* 7054 */  { MAD_F(0x0420e885) /* 0.258034250 */, 19 },
-  /* 7055 */  { MAD_F(0x04211baa) /* 0.258083025 */, 19 },
-
-  /* 7056 */  { MAD_F(0x04214ed0) /* 0.258131801 */, 19 },
-  /* 7057 */  { MAD_F(0x042181f6) /* 0.258180580 */, 19 },
-  /* 7058 */  { MAD_F(0x0421b51c) /* 0.258229361 */, 19 },
-  /* 7059 */  { MAD_F(0x0421e843) /* 0.258278145 */, 19 },
-  /* 7060 */  { MAD_F(0x04221b6b) /* 0.258326931 */, 19 },
-  /* 7061 */  { MAD_F(0x04224e94) /* 0.258375719 */, 19 },
-  /* 7062 */  { MAD_F(0x042281bd) /* 0.258424509 */, 19 },
-  /* 7063 */  { MAD_F(0x0422b4e6) /* 0.258473302 */, 19 },
-  /* 7064 */  { MAD_F(0x0422e811) /* 0.258522097 */, 19 },
-  /* 7065 */  { MAD_F(0x04231b3c) /* 0.258570894 */, 19 },
-  /* 7066 */  { MAD_F(0x04234e67) /* 0.258619694 */, 19 },
-  /* 7067 */  { MAD_F(0x04238193) /* 0.258668496 */, 19 },
-  /* 7068 */  { MAD_F(0x0423b4c0) /* 0.258717300 */, 19 },
-  /* 7069 */  { MAD_F(0x0423e7ee) /* 0.258766106 */, 19 },
-  /* 7070 */  { MAD_F(0x04241b1c) /* 0.258814915 */, 19 },
-  /* 7071 */  { MAD_F(0x04244e4a) /* 0.258863726 */, 19 },
-
-  /* 7072 */  { MAD_F(0x04248179) /* 0.258912540 */, 19 },
-  /* 7073 */  { MAD_F(0x0424b4a9) /* 0.258961356 */, 19 },
-  /* 7074 */  { MAD_F(0x0424e7da) /* 0.259010174 */, 19 },
-  /* 7075 */  { MAD_F(0x04251b0b) /* 0.259058994 */, 19 },
-  /* 7076 */  { MAD_F(0x04254e3d) /* 0.259107817 */, 19 },
-  /* 7077 */  { MAD_F(0x0425816f) /* 0.259156642 */, 19 },
-  /* 7078 */  { MAD_F(0x0425b4a2) /* 0.259205469 */, 19 },
-  /* 7079 */  { MAD_F(0x0425e7d6) /* 0.259254298 */, 19 },
-  /* 7080 */  { MAD_F(0x04261b0a) /* 0.259303130 */, 19 },
-  /* 7081 */  { MAD_F(0x04264e3f) /* 0.259351964 */, 19 },
-  /* 7082 */  { MAD_F(0x04268174) /* 0.259400801 */, 19 },
-  /* 7083 */  { MAD_F(0x0426b4aa) /* 0.259449639 */, 19 },
-  /* 7084 */  { MAD_F(0x0426e7e1) /* 0.259498480 */, 19 },
-  /* 7085 */  { MAD_F(0x04271b18) /* 0.259547324 */, 19 },
-  /* 7086 */  { MAD_F(0x04274e50) /* 0.259596169 */, 19 },
-  /* 7087 */  { MAD_F(0x04278188) /* 0.259645017 */, 19 },
-
-  /* 7088 */  { MAD_F(0x0427b4c2) /* 0.259693868 */, 19 },
-  /* 7089 */  { MAD_F(0x0427e7fb) /* 0.259742720 */, 19 },
-  /* 7090 */  { MAD_F(0x04281b36) /* 0.259791575 */, 19 },
-  /* 7091 */  { MAD_F(0x04284e71) /* 0.259840432 */, 19 },
-  /* 7092 */  { MAD_F(0x042881ac) /* 0.259889291 */, 19 },
-  /* 7093 */  { MAD_F(0x0428b4e8) /* 0.259938153 */, 19 },
-  /* 7094 */  { MAD_F(0x0428e825) /* 0.259987017 */, 19 },
-  /* 7095 */  { MAD_F(0x04291b63) /* 0.260035883 */, 19 },
-  /* 7096 */  { MAD_F(0x04294ea1) /* 0.260084752 */, 19 },
-  /* 7097 */  { MAD_F(0x042981df) /* 0.260133623 */, 19 },
-  /* 7098 */  { MAD_F(0x0429b51f) /* 0.260182496 */, 19 },
-  /* 7099 */  { MAD_F(0x0429e85f) /* 0.260231372 */, 19 },
-  /* 7100 */  { MAD_F(0x042a1b9f) /* 0.260280249 */, 19 },
-  /* 7101 */  { MAD_F(0x042a4ee0) /* 0.260329129 */, 19 },
-  /* 7102 */  { MAD_F(0x042a8222) /* 0.260378012 */, 19 },
-  /* 7103 */  { MAD_F(0x042ab564) /* 0.260426896 */, 19 },
-
-  /* 7104 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 19 },
-  /* 7105 */  { MAD_F(0x042b1beb) /* 0.260524673 */, 19 },
-  /* 7106 */  { MAD_F(0x042b4f2f) /* 0.260573564 */, 19 },
-  /* 7107 */  { MAD_F(0x042b8274) /* 0.260622458 */, 19 },
-  /* 7108 */  { MAD_F(0x042bb5ba) /* 0.260671354 */, 19 },
-  /* 7109 */  { MAD_F(0x042be900) /* 0.260720252 */, 19 },
-  /* 7110 */  { MAD_F(0x042c1c46) /* 0.260769153 */, 19 },
-  /* 7111 */  { MAD_F(0x042c4f8e) /* 0.260818056 */, 19 },
-  /* 7112 */  { MAD_F(0x042c82d6) /* 0.260866961 */, 19 },
-  /* 7113 */  { MAD_F(0x042cb61e) /* 0.260915869 */, 19 },
-  /* 7114 */  { MAD_F(0x042ce967) /* 0.260964779 */, 19 },
-  /* 7115 */  { MAD_F(0x042d1cb1) /* 0.261013691 */, 19 },
-  /* 7116 */  { MAD_F(0x042d4ffb) /* 0.261062606 */, 19 },
-  /* 7117 */  { MAD_F(0x042d8346) /* 0.261111522 */, 19 },
-  /* 7118 */  { MAD_F(0x042db692) /* 0.261160441 */, 19 },
-  /* 7119 */  { MAD_F(0x042de9de) /* 0.261209363 */, 19 },
-
-  /* 7120 */  { MAD_F(0x042e1d2b) /* 0.261258286 */, 19 },
-  /* 7121 */  { MAD_F(0x042e5078) /* 0.261307212 */, 19 },
-  /* 7122 */  { MAD_F(0x042e83c6) /* 0.261356140 */, 19 },
-  /* 7123 */  { MAD_F(0x042eb715) /* 0.261405071 */, 19 },
-  /* 7124 */  { MAD_F(0x042eea64) /* 0.261454004 */, 19 },
-  /* 7125 */  { MAD_F(0x042f1db4) /* 0.261502939 */, 19 },
-  /* 7126 */  { MAD_F(0x042f5105) /* 0.261551876 */, 19 },
-  /* 7127 */  { MAD_F(0x042f8456) /* 0.261600816 */, 19 },
-  /* 7128 */  { MAD_F(0x042fb7a8) /* 0.261649758 */, 19 },
-  /* 7129 */  { MAD_F(0x042feafa) /* 0.261698702 */, 19 },
-  /* 7130 */  { MAD_F(0x04301e4d) /* 0.261747649 */, 19 },
-  /* 7131 */  { MAD_F(0x043051a1) /* 0.261796597 */, 19 },
-  /* 7132 */  { MAD_F(0x043084f5) /* 0.261845548 */, 19 },
-  /* 7133 */  { MAD_F(0x0430b84a) /* 0.261894502 */, 19 },
-  /* 7134 */  { MAD_F(0x0430eb9f) /* 0.261943458 */, 19 },
-  /* 7135 */  { MAD_F(0x04311ef5) /* 0.261992416 */, 19 },
-
-  /* 7136 */  { MAD_F(0x0431524c) /* 0.262041376 */, 19 },
-  /* 7137 */  { MAD_F(0x043185a3) /* 0.262090338 */, 19 },
-  /* 7138 */  { MAD_F(0x0431b8fb) /* 0.262139303 */, 19 },
-  /* 7139 */  { MAD_F(0x0431ec54) /* 0.262188270 */, 19 },
-  /* 7140 */  { MAD_F(0x04321fad) /* 0.262237240 */, 19 },
-  /* 7141 */  { MAD_F(0x04325306) /* 0.262286211 */, 19 },
-  /* 7142 */  { MAD_F(0x04328661) /* 0.262335185 */, 19 },
-  /* 7143 */  { MAD_F(0x0432b9bc) /* 0.262384162 */, 19 },
-  /* 7144 */  { MAD_F(0x0432ed17) /* 0.262433140 */, 19 },
-  /* 7145 */  { MAD_F(0x04332074) /* 0.262482121 */, 19 },
-  /* 7146 */  { MAD_F(0x043353d0) /* 0.262531104 */, 19 },
-  /* 7147 */  { MAD_F(0x0433872e) /* 0.262580089 */, 19 },
-  /* 7148 */  { MAD_F(0x0433ba8c) /* 0.262629077 */, 19 },
-  /* 7149 */  { MAD_F(0x0433edea) /* 0.262678067 */, 19 },
-  /* 7150 */  { MAD_F(0x0434214a) /* 0.262727059 */, 19 },
-  /* 7151 */  { MAD_F(0x043454aa) /* 0.262776054 */, 19 },
-
-  /* 7152 */  { MAD_F(0x0434880a) /* 0.262825051 */, 19 },
-  /* 7153 */  { MAD_F(0x0434bb6b) /* 0.262874050 */, 19 },
-  /* 7154 */  { MAD_F(0x0434eecd) /* 0.262923051 */, 19 },
-  /* 7155 */  { MAD_F(0x0435222f) /* 0.262972055 */, 19 },
-  /* 7156 */  { MAD_F(0x04355592) /* 0.263021061 */, 19 },
-  /* 7157 */  { MAD_F(0x043588f6) /* 0.263070069 */, 19 },
-  /* 7158 */  { MAD_F(0x0435bc5a) /* 0.263119079 */, 19 },
-  /* 7159 */  { MAD_F(0x0435efbf) /* 0.263168092 */, 19 },
-  /* 7160 */  { MAD_F(0x04362324) /* 0.263217107 */, 19 },
-  /* 7161 */  { MAD_F(0x0436568a) /* 0.263266125 */, 19 },
-  /* 7162 */  { MAD_F(0x043689f1) /* 0.263315144 */, 19 },
-  /* 7163 */  { MAD_F(0x0436bd58) /* 0.263364166 */, 19 },
-  /* 7164 */  { MAD_F(0x0436f0c0) /* 0.263413191 */, 19 },
-  /* 7165 */  { MAD_F(0x04372428) /* 0.263462217 */, 19 },
-  /* 7166 */  { MAD_F(0x04375791) /* 0.263511246 */, 19 },
-  /* 7167 */  { MAD_F(0x04378afb) /* 0.263560277 */, 19 },
-
-  /* 7168 */  { MAD_F(0x0437be65) /* 0.263609310 */, 19 },
-  /* 7169 */  { MAD_F(0x0437f1d0) /* 0.263658346 */, 19 },
-  /* 7170 */  { MAD_F(0x0438253c) /* 0.263707384 */, 19 },
-  /* 7171 */  { MAD_F(0x043858a8) /* 0.263756424 */, 19 },
-  /* 7172 */  { MAD_F(0x04388c14) /* 0.263805466 */, 19 },
-  /* 7173 */  { MAD_F(0x0438bf82) /* 0.263854511 */, 19 },
-  /* 7174 */  { MAD_F(0x0438f2f0) /* 0.263903558 */, 19 },
-  /* 7175 */  { MAD_F(0x0439265e) /* 0.263952607 */, 19 },
-  /* 7176 */  { MAD_F(0x043959cd) /* 0.264001659 */, 19 },
-  /* 7177 */  { MAD_F(0x04398d3d) /* 0.264050713 */, 19 },
-  /* 7178 */  { MAD_F(0x0439c0ae) /* 0.264099769 */, 19 },
-  /* 7179 */  { MAD_F(0x0439f41f) /* 0.264148827 */, 19 },
-  /* 7180 */  { MAD_F(0x043a2790) /* 0.264197888 */, 19 },
-  /* 7181 */  { MAD_F(0x043a5b02) /* 0.264246951 */, 19 },
-  /* 7182 */  { MAD_F(0x043a8e75) /* 0.264296016 */, 19 },
-  /* 7183 */  { MAD_F(0x043ac1e9) /* 0.264345084 */, 19 },
-
-  /* 7184 */  { MAD_F(0x043af55d) /* 0.264394153 */, 19 },
-  /* 7185 */  { MAD_F(0x043b28d2) /* 0.264443225 */, 19 },
-  /* 7186 */  { MAD_F(0x043b5c47) /* 0.264492300 */, 19 },
-  /* 7187 */  { MAD_F(0x043b8fbd) /* 0.264541376 */, 19 },
-  /* 7188 */  { MAD_F(0x043bc333) /* 0.264590455 */, 19 },
-  /* 7189 */  { MAD_F(0x043bf6aa) /* 0.264639536 */, 19 },
-  /* 7190 */  { MAD_F(0x043c2a22) /* 0.264688620 */, 19 },
-  /* 7191 */  { MAD_F(0x043c5d9a) /* 0.264737706 */, 19 },
-  /* 7192 */  { MAD_F(0x043c9113) /* 0.264786794 */, 19 },
-  /* 7193 */  { MAD_F(0x043cc48d) /* 0.264835884 */, 19 },
-  /* 7194 */  { MAD_F(0x043cf807) /* 0.264884976 */, 19 },
-  /* 7195 */  { MAD_F(0x043d2b82) /* 0.264934071 */, 19 },
-  /* 7196 */  { MAD_F(0x043d5efd) /* 0.264983168 */, 19 },
-  /* 7197 */  { MAD_F(0x043d9279) /* 0.265032268 */, 19 },
-  /* 7198 */  { MAD_F(0x043dc5f6) /* 0.265081369 */, 19 },
-  /* 7199 */  { MAD_F(0x043df973) /* 0.265130473 */, 19 },
-
-  /* 7200 */  { MAD_F(0x043e2cf1) /* 0.265179580 */, 19 },
-  /* 7201 */  { MAD_F(0x043e6070) /* 0.265228688 */, 19 },
-  /* 7202 */  { MAD_F(0x043e93ef) /* 0.265277799 */, 19 },
-  /* 7203 */  { MAD_F(0x043ec76e) /* 0.265326912 */, 19 },
-  /* 7204 */  { MAD_F(0x043efaef) /* 0.265376027 */, 19 },
-  /* 7205 */  { MAD_F(0x043f2e6f) /* 0.265425145 */, 19 },
-  /* 7206 */  { MAD_F(0x043f61f1) /* 0.265474264 */, 19 },
-  /* 7207 */  { MAD_F(0x043f9573) /* 0.265523387 */, 19 },
-  /* 7208 */  { MAD_F(0x043fc8f6) /* 0.265572511 */, 19 },
-  /* 7209 */  { MAD_F(0x043ffc79) /* 0.265621638 */, 19 },
-  /* 7210 */  { MAD_F(0x04402ffd) /* 0.265670766 */, 19 },
-  /* 7211 */  { MAD_F(0x04406382) /* 0.265719898 */, 19 },
-  /* 7212 */  { MAD_F(0x04409707) /* 0.265769031 */, 19 },
-  /* 7213 */  { MAD_F(0x0440ca8d) /* 0.265818167 */, 19 },
-  /* 7214 */  { MAD_F(0x0440fe13) /* 0.265867305 */, 19 },
-  /* 7215 */  { MAD_F(0x0441319a) /* 0.265916445 */, 19 },
-
-  /* 7216 */  { MAD_F(0x04416522) /* 0.265965588 */, 19 },
-  /* 7217 */  { MAD_F(0x044198aa) /* 0.266014732 */, 19 },
-  /* 7218 */  { MAD_F(0x0441cc33) /* 0.266063880 */, 19 },
-  /* 7219 */  { MAD_F(0x0441ffbc) /* 0.266113029 */, 19 },
-  /* 7220 */  { MAD_F(0x04423346) /* 0.266162181 */, 19 },
-  /* 7221 */  { MAD_F(0x044266d1) /* 0.266211334 */, 19 },
-  /* 7222 */  { MAD_F(0x04429a5c) /* 0.266260491 */, 19 },
-  /* 7223 */  { MAD_F(0x0442cde8) /* 0.266309649 */, 19 },
-  /* 7224 */  { MAD_F(0x04430174) /* 0.266358810 */, 19 },
-  /* 7225 */  { MAD_F(0x04433501) /* 0.266407973 */, 19 },
-  /* 7226 */  { MAD_F(0x0443688f) /* 0.266457138 */, 19 },
-  /* 7227 */  { MAD_F(0x04439c1d) /* 0.266506305 */, 19 },
-  /* 7228 */  { MAD_F(0x0443cfac) /* 0.266555475 */, 19 },
-  /* 7229 */  { MAD_F(0x0444033c) /* 0.266604647 */, 19 },
-  /* 7230 */  { MAD_F(0x044436cc) /* 0.266653822 */, 19 },
-  /* 7231 */  { MAD_F(0x04446a5d) /* 0.266702998 */, 19 },
-
-  /* 7232 */  { MAD_F(0x04449dee) /* 0.266752177 */, 19 },
-  /* 7233 */  { MAD_F(0x0444d180) /* 0.266801358 */, 19 },
-  /* 7234 */  { MAD_F(0x04450513) /* 0.266850541 */, 19 },
-  /* 7235 */  { MAD_F(0x044538a6) /* 0.266899727 */, 19 },
-  /* 7236 */  { MAD_F(0x04456c39) /* 0.266948915 */, 19 },
-  /* 7237 */  { MAD_F(0x04459fce) /* 0.266998105 */, 19 },
-  /* 7238 */  { MAD_F(0x0445d363) /* 0.267047298 */, 19 },
-  /* 7239 */  { MAD_F(0x044606f8) /* 0.267096492 */, 19 },
-  /* 7240 */  { MAD_F(0x04463a8f) /* 0.267145689 */, 19 },
-  /* 7241 */  { MAD_F(0x04466e25) /* 0.267194888 */, 19 },
-  /* 7242 */  { MAD_F(0x0446a1bd) /* 0.267244090 */, 19 },
-  /* 7243 */  { MAD_F(0x0446d555) /* 0.267293294 */, 19 },
-  /* 7244 */  { MAD_F(0x044708ee) /* 0.267342500 */, 19 },
-  /* 7245 */  { MAD_F(0x04473c87) /* 0.267391708 */, 19 },
-  /* 7246 */  { MAD_F(0x04477021) /* 0.267440919 */, 19 },
-  /* 7247 */  { MAD_F(0x0447a3bb) /* 0.267490131 */, 19 },
-
-  /* 7248 */  { MAD_F(0x0447d756) /* 0.267539347 */, 19 },
-  /* 7249 */  { MAD_F(0x04480af2) /* 0.267588564 */, 19 },
-  /* 7250 */  { MAD_F(0x04483e8e) /* 0.267637783 */, 19 },
-  /* 7251 */  { MAD_F(0x0448722b) /* 0.267687005 */, 19 },
-  /* 7252 */  { MAD_F(0x0448a5c9) /* 0.267736229 */, 19 },
-  /* 7253 */  { MAD_F(0x0448d967) /* 0.267785456 */, 19 },
-  /* 7254 */  { MAD_F(0x04490d05) /* 0.267834685 */, 19 },
-  /* 7255 */  { MAD_F(0x044940a5) /* 0.267883915 */, 19 },
-  /* 7256 */  { MAD_F(0x04497445) /* 0.267933149 */, 19 },
-  /* 7257 */  { MAD_F(0x0449a7e5) /* 0.267982384 */, 19 },
-  /* 7258 */  { MAD_F(0x0449db86) /* 0.268031622 */, 19 },
-  /* 7259 */  { MAD_F(0x044a0f28) /* 0.268080862 */, 19 },
-  /* 7260 */  { MAD_F(0x044a42ca) /* 0.268130104 */, 19 },
-  /* 7261 */  { MAD_F(0x044a766d) /* 0.268179349 */, 19 },
-  /* 7262 */  { MAD_F(0x044aaa11) /* 0.268228595 */, 19 },
-  /* 7263 */  { MAD_F(0x044addb5) /* 0.268277844 */, 19 },
-
-  /* 7264 */  { MAD_F(0x044b115a) /* 0.268327096 */, 19 },
-  /* 7265 */  { MAD_F(0x044b44ff) /* 0.268376349 */, 19 },
-  /* 7266 */  { MAD_F(0x044b78a5) /* 0.268425605 */, 19 },
-  /* 7267 */  { MAD_F(0x044bac4c) /* 0.268474863 */, 19 },
-  /* 7268 */  { MAD_F(0x044bdff3) /* 0.268524123 */, 19 },
-  /* 7269 */  { MAD_F(0x044c139b) /* 0.268573386 */, 19 },
-  /* 7270 */  { MAD_F(0x044c4743) /* 0.268622651 */, 19 },
-  /* 7271 */  { MAD_F(0x044c7aec) /* 0.268671918 */, 19 },
-  /* 7272 */  { MAD_F(0x044cae96) /* 0.268721187 */, 19 },
-  /* 7273 */  { MAD_F(0x044ce240) /* 0.268770459 */, 19 },
-  /* 7274 */  { MAD_F(0x044d15eb) /* 0.268819733 */, 19 },
-  /* 7275 */  { MAD_F(0x044d4997) /* 0.268869009 */, 19 },
-  /* 7276 */  { MAD_F(0x044d7d43) /* 0.268918287 */, 19 },
-  /* 7277 */  { MAD_F(0x044db0ef) /* 0.268967568 */, 19 },
-  /* 7278 */  { MAD_F(0x044de49d) /* 0.269016851 */, 19 },
-  /* 7279 */  { MAD_F(0x044e184b) /* 0.269066136 */, 19 },
-
-  /* 7280 */  { MAD_F(0x044e4bf9) /* 0.269115423 */, 19 },
-  /* 7281 */  { MAD_F(0x044e7fa8) /* 0.269164713 */, 19 },
-  /* 7282 */  { MAD_F(0x044eb358) /* 0.269214005 */, 19 },
-  /* 7283 */  { MAD_F(0x044ee708) /* 0.269263299 */, 19 },
-  /* 7284 */  { MAD_F(0x044f1ab9) /* 0.269312595 */, 19 },
-  /* 7285 */  { MAD_F(0x044f4e6b) /* 0.269361894 */, 19 },
-  /* 7286 */  { MAD_F(0x044f821d) /* 0.269411195 */, 19 },
-  /* 7287 */  { MAD_F(0x044fb5cf) /* 0.269460498 */, 19 },
-  /* 7288 */  { MAD_F(0x044fe983) /* 0.269509804 */, 19 },
-  /* 7289 */  { MAD_F(0x04501d37) /* 0.269559111 */, 19 },
-  /* 7290 */  { MAD_F(0x045050eb) /* 0.269608421 */, 19 },
-  /* 7291 */  { MAD_F(0x045084a0) /* 0.269657734 */, 19 },
-  /* 7292 */  { MAD_F(0x0450b856) /* 0.269707048 */, 19 },
-  /* 7293 */  { MAD_F(0x0450ec0d) /* 0.269756365 */, 19 },
-  /* 7294 */  { MAD_F(0x04511fc4) /* 0.269805684 */, 19 },
-  /* 7295 */  { MAD_F(0x0451537b) /* 0.269855005 */, 19 },
-
-  /* 7296 */  { MAD_F(0x04518733) /* 0.269904329 */, 19 },
-  /* 7297 */  { MAD_F(0x0451baec) /* 0.269953654 */, 19 },
-  /* 7298 */  { MAD_F(0x0451eea5) /* 0.270002982 */, 19 },
-  /* 7299 */  { MAD_F(0x0452225f) /* 0.270052313 */, 19 },
-  /* 7300 */  { MAD_F(0x0452561a) /* 0.270101645 */, 19 },
-  /* 7301 */  { MAD_F(0x045289d5) /* 0.270150980 */, 19 },
-  /* 7302 */  { MAD_F(0x0452bd91) /* 0.270200317 */, 19 },
-  /* 7303 */  { MAD_F(0x0452f14d) /* 0.270249656 */, 19 },
-  /* 7304 */  { MAD_F(0x0453250a) /* 0.270298998 */, 19 },
-  /* 7305 */  { MAD_F(0x045358c8) /* 0.270348341 */, 19 },
-  /* 7306 */  { MAD_F(0x04538c86) /* 0.270397687 */, 19 },
-  /* 7307 */  { MAD_F(0x0453c045) /* 0.270447036 */, 19 },
-  /* 7308 */  { MAD_F(0x0453f405) /* 0.270496386 */, 19 },
-  /* 7309 */  { MAD_F(0x045427c5) /* 0.270545739 */, 19 },
-  /* 7310 */  { MAD_F(0x04545b85) /* 0.270595094 */, 19 },
-  /* 7311 */  { MAD_F(0x04548f46) /* 0.270644451 */, 19 },
-
-  /* 7312 */  { MAD_F(0x0454c308) /* 0.270693811 */, 19 },
-  /* 7313 */  { MAD_F(0x0454f6cb) /* 0.270743173 */, 19 },
-  /* 7314 */  { MAD_F(0x04552a8e) /* 0.270792537 */, 19 },
-  /* 7315 */  { MAD_F(0x04555e51) /* 0.270841903 */, 19 },
-  /* 7316 */  { MAD_F(0x04559216) /* 0.270891271 */, 19 },
-  /* 7317 */  { MAD_F(0x0455c5db) /* 0.270940642 */, 19 },
-  /* 7318 */  { MAD_F(0x0455f9a0) /* 0.270990015 */, 19 },
-  /* 7319 */  { MAD_F(0x04562d66) /* 0.271039390 */, 19 },
-  /* 7320 */  { MAD_F(0x0456612d) /* 0.271088768 */, 19 },
-  /* 7321 */  { MAD_F(0x045694f4) /* 0.271138148 */, 19 },
-  /* 7322 */  { MAD_F(0x0456c8bc) /* 0.271187530 */, 19 },
-  /* 7323 */  { MAD_F(0x0456fc84) /* 0.271236914 */, 19 },
-  /* 7324 */  { MAD_F(0x0457304e) /* 0.271286301 */, 19 },
-  /* 7325 */  { MAD_F(0x04576417) /* 0.271335689 */, 19 },
-  /* 7326 */  { MAD_F(0x045797e2) /* 0.271385080 */, 19 },
-  /* 7327 */  { MAD_F(0x0457cbac) /* 0.271434474 */, 19 },
-
-  /* 7328 */  { MAD_F(0x0457ff78) /* 0.271483869 */, 19 },
-  /* 7329 */  { MAD_F(0x04583344) /* 0.271533267 */, 19 },
-  /* 7330 */  { MAD_F(0x04586711) /* 0.271582667 */, 19 },
-  /* 7331 */  { MAD_F(0x04589ade) /* 0.271632069 */, 19 },
-  /* 7332 */  { MAD_F(0x0458ceac) /* 0.271681474 */, 19 },
-  /* 7333 */  { MAD_F(0x0459027b) /* 0.271730880 */, 19 },
-  /* 7334 */  { MAD_F(0x0459364a) /* 0.271780289 */, 19 },
-  /* 7335 */  { MAD_F(0x04596a19) /* 0.271829701 */, 19 },
-  /* 7336 */  { MAD_F(0x04599dea) /* 0.271879114 */, 19 },
-  /* 7337 */  { MAD_F(0x0459d1bb) /* 0.271928530 */, 19 },
-  /* 7338 */  { MAD_F(0x045a058c) /* 0.271977948 */, 19 },
-  /* 7339 */  { MAD_F(0x045a395e) /* 0.272027368 */, 19 },
-  /* 7340 */  { MAD_F(0x045a6d31) /* 0.272076790 */, 19 },
-  /* 7341 */  { MAD_F(0x045aa104) /* 0.272126215 */, 19 },
-  /* 7342 */  { MAD_F(0x045ad4d8) /* 0.272175642 */, 19 },
-  /* 7343 */  { MAD_F(0x045b08ad) /* 0.272225071 */, 19 },
-
-  /* 7344 */  { MAD_F(0x045b3c82) /* 0.272274503 */, 19 },
-  /* 7345 */  { MAD_F(0x045b7058) /* 0.272323936 */, 19 },
-  /* 7346 */  { MAD_F(0x045ba42e) /* 0.272373372 */, 19 },
-  /* 7347 */  { MAD_F(0x045bd805) /* 0.272422810 */, 19 },
-  /* 7348 */  { MAD_F(0x045c0bdd) /* 0.272472251 */, 19 },
-  /* 7349 */  { MAD_F(0x045c3fb5) /* 0.272521693 */, 19 },
-  /* 7350 */  { MAD_F(0x045c738e) /* 0.272571138 */, 19 },
-  /* 7351 */  { MAD_F(0x045ca767) /* 0.272620585 */, 19 },
-  /* 7352 */  { MAD_F(0x045cdb41) /* 0.272670035 */, 19 },
-  /* 7353 */  { MAD_F(0x045d0f1b) /* 0.272719486 */, 19 },
-  /* 7354 */  { MAD_F(0x045d42f7) /* 0.272768940 */, 19 },
-  /* 7355 */  { MAD_F(0x045d76d2) /* 0.272818396 */, 19 },
-  /* 7356 */  { MAD_F(0x045daaaf) /* 0.272867855 */, 19 },
-  /* 7357 */  { MAD_F(0x045dde8c) /* 0.272917315 */, 19 },
-  /* 7358 */  { MAD_F(0x045e1269) /* 0.272966778 */, 19 },
-  /* 7359 */  { MAD_F(0x045e4647) /* 0.273016243 */, 19 },
-
-  /* 7360 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 19 },
-  /* 7361 */  { MAD_F(0x045eae06) /* 0.273115180 */, 19 },
-  /* 7362 */  { MAD_F(0x045ee1e6) /* 0.273164652 */, 19 },
-  /* 7363 */  { MAD_F(0x045f15c6) /* 0.273214126 */, 19 },
-  /* 7364 */  { MAD_F(0x045f49a7) /* 0.273263602 */, 19 },
-  /* 7365 */  { MAD_F(0x045f7d89) /* 0.273313081 */, 19 },
-  /* 7366 */  { MAD_F(0x045fb16c) /* 0.273362561 */, 19 },
-  /* 7367 */  { MAD_F(0x045fe54f) /* 0.273412044 */, 19 },
-  /* 7368 */  { MAD_F(0x04601932) /* 0.273461530 */, 19 },
-  /* 7369 */  { MAD_F(0x04604d16) /* 0.273511017 */, 19 },
-  /* 7370 */  { MAD_F(0x046080fb) /* 0.273560507 */, 19 },
-  /* 7371 */  { MAD_F(0x0460b4e1) /* 0.273609999 */, 19 },
-  /* 7372 */  { MAD_F(0x0460e8c7) /* 0.273659493 */, 19 },
-  /* 7373 */  { MAD_F(0x04611cad) /* 0.273708989 */, 19 },
-  /* 7374 */  { MAD_F(0x04615094) /* 0.273758488 */, 19 },
-  /* 7375 */  { MAD_F(0x0461847c) /* 0.273807989 */, 19 },
-
-  /* 7376 */  { MAD_F(0x0461b864) /* 0.273857492 */, 19 },
-  /* 7377 */  { MAD_F(0x0461ec4d) /* 0.273906997 */, 19 },
-  /* 7378 */  { MAD_F(0x04622037) /* 0.273956505 */, 19 },
-  /* 7379 */  { MAD_F(0x04625421) /* 0.274006015 */, 19 },
-  /* 7380 */  { MAD_F(0x0462880c) /* 0.274055527 */, 19 },
-  /* 7381 */  { MAD_F(0x0462bbf7) /* 0.274105041 */, 19 },
-  /* 7382 */  { MAD_F(0x0462efe3) /* 0.274154558 */, 19 },
-  /* 7383 */  { MAD_F(0x046323d0) /* 0.274204076 */, 19 },
-  /* 7384 */  { MAD_F(0x046357bd) /* 0.274253597 */, 19 },
-  /* 7385 */  { MAD_F(0x04638bab) /* 0.274303121 */, 19 },
-  /* 7386 */  { MAD_F(0x0463bf99) /* 0.274352646 */, 19 },
-  /* 7387 */  { MAD_F(0x0463f388) /* 0.274402174 */, 19 },
-  /* 7388 */  { MAD_F(0x04642778) /* 0.274451704 */, 19 },
-  /* 7389 */  { MAD_F(0x04645b68) /* 0.274501236 */, 19 },
-  /* 7390 */  { MAD_F(0x04648f59) /* 0.274550771 */, 19 },
-  /* 7391 */  { MAD_F(0x0464c34a) /* 0.274600307 */, 19 },
-
-  /* 7392 */  { MAD_F(0x0464f73c) /* 0.274649846 */, 19 },
-  /* 7393 */  { MAD_F(0x04652b2f) /* 0.274699387 */, 19 },
-  /* 7394 */  { MAD_F(0x04655f22) /* 0.274748931 */, 19 },
-  /* 7395 */  { MAD_F(0x04659316) /* 0.274798476 */, 19 },
-  /* 7396 */  { MAD_F(0x0465c70a) /* 0.274848024 */, 19 },
-  /* 7397 */  { MAD_F(0x0465faff) /* 0.274897574 */, 19 },
-  /* 7398 */  { MAD_F(0x04662ef5) /* 0.274947126 */, 19 },
-  /* 7399 */  { MAD_F(0x046662eb) /* 0.274996681 */, 19 },
-  /* 7400 */  { MAD_F(0x046696e2) /* 0.275046238 */, 19 },
-  /* 7401 */  { MAD_F(0x0466cad9) /* 0.275095797 */, 19 },
-  /* 7402 */  { MAD_F(0x0466fed1) /* 0.275145358 */, 19 },
-  /* 7403 */  { MAD_F(0x046732ca) /* 0.275194921 */, 19 },
-  /* 7404 */  { MAD_F(0x046766c3) /* 0.275244487 */, 19 },
-  /* 7405 */  { MAD_F(0x04679abd) /* 0.275294055 */, 19 },
-  /* 7406 */  { MAD_F(0x0467ceb7) /* 0.275343625 */, 19 },
-  /* 7407 */  { MAD_F(0x046802b2) /* 0.275393198 */, 19 },
-
-  /* 7408 */  { MAD_F(0x046836ae) /* 0.275442772 */, 19 },
-  /* 7409 */  { MAD_F(0x04686aaa) /* 0.275492349 */, 19 },
-  /* 7410 */  { MAD_F(0x04689ea7) /* 0.275541928 */, 19 },
-  /* 7411 */  { MAD_F(0x0468d2a4) /* 0.275591509 */, 19 },
-  /* 7412 */  { MAD_F(0x046906a2) /* 0.275641093 */, 19 },
-  /* 7413 */  { MAD_F(0x04693aa1) /* 0.275690679 */, 19 },
-  /* 7414 */  { MAD_F(0x04696ea0) /* 0.275740267 */, 19 },
-  /* 7415 */  { MAD_F(0x0469a2a0) /* 0.275789857 */, 19 },
-  /* 7416 */  { MAD_F(0x0469d6a0) /* 0.275839449 */, 19 },
-  /* 7417 */  { MAD_F(0x046a0aa1) /* 0.275889044 */, 19 },
-  /* 7418 */  { MAD_F(0x046a3ea3) /* 0.275938641 */, 19 },
-  /* 7419 */  { MAD_F(0x046a72a5) /* 0.275988240 */, 19 },
-  /* 7420 */  { MAD_F(0x046aa6a8) /* 0.276037842 */, 19 },
-  /* 7421 */  { MAD_F(0x046adaab) /* 0.276087445 */, 19 },
-  /* 7422 */  { MAD_F(0x046b0eaf) /* 0.276137051 */, 19 },
-  /* 7423 */  { MAD_F(0x046b42b3) /* 0.276186659 */, 19 },
-
-  /* 7424 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 19 },
-  /* 7425 */  { MAD_F(0x046baabe) /* 0.276285882 */, 19 },
-  /* 7426 */  { MAD_F(0x046bdec5) /* 0.276335497 */, 19 },
-  /* 7427 */  { MAD_F(0x046c12cc) /* 0.276385113 */, 19 },
-  /* 7428 */  { MAD_F(0x046c46d3) /* 0.276434733 */, 19 },
-  /* 7429 */  { MAD_F(0x046c7adb) /* 0.276484354 */, 19 },
-  /* 7430 */  { MAD_F(0x046caee4) /* 0.276533978 */, 19 },
-  /* 7431 */  { MAD_F(0x046ce2ee) /* 0.276583604 */, 19 },
-  /* 7432 */  { MAD_F(0x046d16f7) /* 0.276633232 */, 19 },
-  /* 7433 */  { MAD_F(0x046d4b02) /* 0.276682862 */, 19 },
-  /* 7434 */  { MAD_F(0x046d7f0d) /* 0.276732495 */, 19 },
-  /* 7435 */  { MAD_F(0x046db319) /* 0.276782129 */, 19 },
-  /* 7436 */  { MAD_F(0x046de725) /* 0.276831766 */, 19 },
-  /* 7437 */  { MAD_F(0x046e1b32) /* 0.276881406 */, 19 },
-  /* 7438 */  { MAD_F(0x046e4f40) /* 0.276931047 */, 19 },
-  /* 7439 */  { MAD_F(0x046e834e) /* 0.276980691 */, 19 },
-
-  /* 7440 */  { MAD_F(0x046eb75c) /* 0.277030337 */, 19 },
-  /* 7441 */  { MAD_F(0x046eeb6c) /* 0.277079985 */, 19 },
-  /* 7442 */  { MAD_F(0x046f1f7c) /* 0.277129635 */, 19 },
-  /* 7443 */  { MAD_F(0x046f538c) /* 0.277179288 */, 19 },
-  /* 7444 */  { MAD_F(0x046f879d) /* 0.277228942 */, 19 },
-  /* 7445 */  { MAD_F(0x046fbbaf) /* 0.277278600 */, 19 },
-  /* 7446 */  { MAD_F(0x046fefc1) /* 0.277328259 */, 19 },
-  /* 7447 */  { MAD_F(0x047023d4) /* 0.277377920 */, 19 },
-  /* 7448 */  { MAD_F(0x047057e8) /* 0.277427584 */, 19 },
-  /* 7449 */  { MAD_F(0x04708bfc) /* 0.277477250 */, 19 },
-  /* 7450 */  { MAD_F(0x0470c011) /* 0.277526918 */, 19 },
-  /* 7451 */  { MAD_F(0x0470f426) /* 0.277576588 */, 19 },
-  /* 7452 */  { MAD_F(0x0471283c) /* 0.277626261 */, 19 },
-  /* 7453 */  { MAD_F(0x04715c52) /* 0.277675936 */, 19 },
-  /* 7454 */  { MAD_F(0x04719069) /* 0.277725613 */, 19 },
-  /* 7455 */  { MAD_F(0x0471c481) /* 0.277775292 */, 19 },
-
-  /* 7456 */  { MAD_F(0x0471f899) /* 0.277824973 */, 19 },
-  /* 7457 */  { MAD_F(0x04722cb2) /* 0.277874657 */, 19 },
-  /* 7458 */  { MAD_F(0x047260cc) /* 0.277924343 */, 19 },
-  /* 7459 */  { MAD_F(0x047294e6) /* 0.277974031 */, 19 },
-  /* 7460 */  { MAD_F(0x0472c900) /* 0.278023722 */, 19 },
-  /* 7461 */  { MAD_F(0x0472fd1b) /* 0.278073414 */, 19 },
-  /* 7462 */  { MAD_F(0x04733137) /* 0.278123109 */, 19 },
-  /* 7463 */  { MAD_F(0x04736554) /* 0.278172806 */, 19 },
-  /* 7464 */  { MAD_F(0x04739971) /* 0.278222505 */, 19 },
-  /* 7465 */  { MAD_F(0x0473cd8e) /* 0.278272207 */, 19 },
-  /* 7466 */  { MAD_F(0x047401ad) /* 0.278321910 */, 19 },
-  /* 7467 */  { MAD_F(0x047435cb) /* 0.278371616 */, 19 },
-  /* 7468 */  { MAD_F(0x047469eb) /* 0.278421324 */, 19 },
-  /* 7469 */  { MAD_F(0x04749e0b) /* 0.278471035 */, 19 },
-  /* 7470 */  { MAD_F(0x0474d22c) /* 0.278520747 */, 19 },
-  /* 7471 */  { MAD_F(0x0475064d) /* 0.278570462 */, 19 },
-
-  /* 7472 */  { MAD_F(0x04753a6f) /* 0.278620179 */, 19 },
-  /* 7473 */  { MAD_F(0x04756e91) /* 0.278669898 */, 19 },
-  /* 7474 */  { MAD_F(0x0475a2b4) /* 0.278719619 */, 19 },
-  /* 7475 */  { MAD_F(0x0475d6d7) /* 0.278769343 */, 19 },
-  /* 7476 */  { MAD_F(0x04760afc) /* 0.278819069 */, 19 },
-  /* 7477 */  { MAD_F(0x04763f20) /* 0.278868797 */, 19 },
-  /* 7478 */  { MAD_F(0x04767346) /* 0.278918527 */, 19 },
-  /* 7479 */  { MAD_F(0x0476a76c) /* 0.278968260 */, 19 },
-  /* 7480 */  { MAD_F(0x0476db92) /* 0.279017995 */, 19 },
-  /* 7481 */  { MAD_F(0x04770fba) /* 0.279067731 */, 19 },
-  /* 7482 */  { MAD_F(0x047743e1) /* 0.279117471 */, 19 },
-  /* 7483 */  { MAD_F(0x0477780a) /* 0.279167212 */, 19 },
-  /* 7484 */  { MAD_F(0x0477ac33) /* 0.279216956 */, 19 },
-  /* 7485 */  { MAD_F(0x0477e05c) /* 0.279266701 */, 19 },
-  /* 7486 */  { MAD_F(0x04781486) /* 0.279316449 */, 19 },
-  /* 7487 */  { MAD_F(0x047848b1) /* 0.279366200 */, 19 },
-
-  /* 7488 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 19 },
-  /* 7489 */  { MAD_F(0x0478b108) /* 0.279465707 */, 19 },
-  /* 7490 */  { MAD_F(0x0478e535) /* 0.279515464 */, 19 },
-  /* 7491 */  { MAD_F(0x04791962) /* 0.279565223 */, 19 },
-  /* 7492 */  { MAD_F(0x04794d8f) /* 0.279614984 */, 19 },
-  /* 7493 */  { MAD_F(0x047981be) /* 0.279664748 */, 19 },
-  /* 7494 */  { MAD_F(0x0479b5ed) /* 0.279714513 */, 19 },
-  /* 7495 */  { MAD_F(0x0479ea1c) /* 0.279764281 */, 19 },
-  /* 7496 */  { MAD_F(0x047a1e4c) /* 0.279814051 */, 19 },
-  /* 7497 */  { MAD_F(0x047a527d) /* 0.279863824 */, 19 },
-  /* 7498 */  { MAD_F(0x047a86ae) /* 0.279913598 */, 19 },
-  /* 7499 */  { MAD_F(0x047abae0) /* 0.279963375 */, 19 },
-  /* 7500 */  { MAD_F(0x047aef12) /* 0.280013154 */, 19 },
-  /* 7501 */  { MAD_F(0x047b2346) /* 0.280062935 */, 19 },
-  /* 7502 */  { MAD_F(0x047b5779) /* 0.280112719 */, 19 },
-  /* 7503 */  { MAD_F(0x047b8bad) /* 0.280162504 */, 19 },
-
-  /* 7504 */  { MAD_F(0x047bbfe2) /* 0.280212292 */, 19 },
-  /* 7505 */  { MAD_F(0x047bf418) /* 0.280262082 */, 19 },
-  /* 7506 */  { MAD_F(0x047c284e) /* 0.280311875 */, 19 },
-  /* 7507 */  { MAD_F(0x047c5c84) /* 0.280361669 */, 19 },
-  /* 7508 */  { MAD_F(0x047c90bb) /* 0.280411466 */, 19 },
-  /* 7509 */  { MAD_F(0x047cc4f3) /* 0.280461265 */, 19 },
-  /* 7510 */  { MAD_F(0x047cf92c) /* 0.280511066 */, 19 },
-  /* 7511 */  { MAD_F(0x047d2d65) /* 0.280560869 */, 19 },
-  /* 7512 */  { MAD_F(0x047d619e) /* 0.280610675 */, 19 },
-  /* 7513 */  { MAD_F(0x047d95d8) /* 0.280660483 */, 19 },
-  /* 7514 */  { MAD_F(0x047dca13) /* 0.280710292 */, 19 },
-  /* 7515 */  { MAD_F(0x047dfe4e) /* 0.280760105 */, 19 },
-  /* 7516 */  { MAD_F(0x047e328a) /* 0.280809919 */, 19 },
-  /* 7517 */  { MAD_F(0x047e66c7) /* 0.280859736 */, 19 },
-  /* 7518 */  { MAD_F(0x047e9b04) /* 0.280909554 */, 19 },
-  /* 7519 */  { MAD_F(0x047ecf42) /* 0.280959375 */, 19 },
-
-  /* 7520 */  { MAD_F(0x047f0380) /* 0.281009199 */, 19 },
-  /* 7521 */  { MAD_F(0x047f37bf) /* 0.281059024 */, 19 },
-  /* 7522 */  { MAD_F(0x047f6bff) /* 0.281108852 */, 19 },
-  /* 7523 */  { MAD_F(0x047fa03f) /* 0.281158682 */, 19 },
-  /* 7524 */  { MAD_F(0x047fd47f) /* 0.281208514 */, 19 },
-  /* 7525 */  { MAD_F(0x048008c1) /* 0.281258348 */, 19 },
-  /* 7526 */  { MAD_F(0x04803d02) /* 0.281308184 */, 19 },
-  /* 7527 */  { MAD_F(0x04807145) /* 0.281358023 */, 19 },
-  /* 7528 */  { MAD_F(0x0480a588) /* 0.281407864 */, 19 },
-  /* 7529 */  { MAD_F(0x0480d9cc) /* 0.281457707 */, 19 },
-  /* 7530 */  { MAD_F(0x04810e10) /* 0.281507552 */, 19 },
-  /* 7531 */  { MAD_F(0x04814255) /* 0.281557400 */, 19 },
-  /* 7532 */  { MAD_F(0x0481769a) /* 0.281607250 */, 19 },
-  /* 7533 */  { MAD_F(0x0481aae0) /* 0.281657101 */, 19 },
-  /* 7534 */  { MAD_F(0x0481df27) /* 0.281706956 */, 19 },
-  /* 7535 */  { MAD_F(0x0482136e) /* 0.281756812 */, 19 },
-
-  /* 7536 */  { MAD_F(0x048247b6) /* 0.281806670 */, 19 },
-  /* 7537 */  { MAD_F(0x04827bfe) /* 0.281856531 */, 19 },
-  /* 7538 */  { MAD_F(0x0482b047) /* 0.281906394 */, 19 },
-  /* 7539 */  { MAD_F(0x0482e491) /* 0.281956259 */, 19 },
-  /* 7540 */  { MAD_F(0x048318db) /* 0.282006127 */, 19 },
-  /* 7541 */  { MAD_F(0x04834d26) /* 0.282055996 */, 19 },
-  /* 7542 */  { MAD_F(0x04838171) /* 0.282105868 */, 19 },
-  /* 7543 */  { MAD_F(0x0483b5bd) /* 0.282155742 */, 19 },
-  /* 7544 */  { MAD_F(0x0483ea0a) /* 0.282205618 */, 19 },
-  /* 7545 */  { MAD_F(0x04841e57) /* 0.282255496 */, 19 },
-  /* 7546 */  { MAD_F(0x048452a4) /* 0.282305377 */, 19 },
-  /* 7547 */  { MAD_F(0x048486f3) /* 0.282355260 */, 19 },
-  /* 7548 */  { MAD_F(0x0484bb42) /* 0.282405145 */, 19 },
-  /* 7549 */  { MAD_F(0x0484ef91) /* 0.282455032 */, 19 },
-  /* 7550 */  { MAD_F(0x048523e1) /* 0.282504921 */, 19 },
-  /* 7551 */  { MAD_F(0x04855832) /* 0.282554813 */, 19 },
-
-  /* 7552 */  { MAD_F(0x04858c83) /* 0.282604707 */, 19 },
-  /* 7553 */  { MAD_F(0x0485c0d5) /* 0.282654603 */, 19 },
-  /* 7554 */  { MAD_F(0x0485f527) /* 0.282704501 */, 19 },
-  /* 7555 */  { MAD_F(0x0486297a) /* 0.282754401 */, 19 },
-  /* 7556 */  { MAD_F(0x04865dce) /* 0.282804304 */, 19 },
-  /* 7557 */  { MAD_F(0x04869222) /* 0.282854209 */, 19 },
-  /* 7558 */  { MAD_F(0x0486c677) /* 0.282904116 */, 19 },
-  /* 7559 */  { MAD_F(0x0486facc) /* 0.282954025 */, 19 },
-  /* 7560 */  { MAD_F(0x04872f22) /* 0.283003936 */, 19 },
-  /* 7561 */  { MAD_F(0x04876379) /* 0.283053850 */, 19 },
-  /* 7562 */  { MAD_F(0x048797d0) /* 0.283103766 */, 19 },
-  /* 7563 */  { MAD_F(0x0487cc28) /* 0.283153684 */, 19 },
-  /* 7564 */  { MAD_F(0x04880080) /* 0.283203604 */, 19 },
-  /* 7565 */  { MAD_F(0x048834d9) /* 0.283253527 */, 19 },
-  /* 7566 */  { MAD_F(0x04886933) /* 0.283303451 */, 19 },
-  /* 7567 */  { MAD_F(0x04889d8d) /* 0.283353378 */, 19 },
-
-  /* 7568 */  { MAD_F(0x0488d1e8) /* 0.283403307 */, 19 },
-  /* 7569 */  { MAD_F(0x04890643) /* 0.283453238 */, 19 },
-  /* 7570 */  { MAD_F(0x04893a9f) /* 0.283503172 */, 19 },
-  /* 7571 */  { MAD_F(0x04896efb) /* 0.283553107 */, 19 },
-  /* 7572 */  { MAD_F(0x0489a358) /* 0.283603045 */, 19 },
-  /* 7573 */  { MAD_F(0x0489d7b6) /* 0.283652985 */, 19 },
-  /* 7574 */  { MAD_F(0x048a0c14) /* 0.283702927 */, 19 },
-  /* 7575 */  { MAD_F(0x048a4073) /* 0.283752872 */, 19 },
-  /* 7576 */  { MAD_F(0x048a74d3) /* 0.283802818 */, 19 },
-  /* 7577 */  { MAD_F(0x048aa933) /* 0.283852767 */, 19 },
-  /* 7578 */  { MAD_F(0x048add93) /* 0.283902718 */, 19 },
-  /* 7579 */  { MAD_F(0x048b11f5) /* 0.283952671 */, 19 },
-  /* 7580 */  { MAD_F(0x048b4656) /* 0.284002627 */, 19 },
-  /* 7581 */  { MAD_F(0x048b7ab9) /* 0.284052584 */, 19 },
-  /* 7582 */  { MAD_F(0x048baf1c) /* 0.284102544 */, 19 },
-  /* 7583 */  { MAD_F(0x048be37f) /* 0.284152506 */, 19 },
-
-  /* 7584 */  { MAD_F(0x048c17e3) /* 0.284202470 */, 19 },
-  /* 7585 */  { MAD_F(0x048c4c48) /* 0.284252436 */, 19 },
-  /* 7586 */  { MAD_F(0x048c80ad) /* 0.284302405 */, 19 },
-  /* 7587 */  { MAD_F(0x048cb513) /* 0.284352376 */, 19 },
-  /* 7588 */  { MAD_F(0x048ce97a) /* 0.284402349 */, 19 },
-  /* 7589 */  { MAD_F(0x048d1de1) /* 0.284452324 */, 19 },
-  /* 7590 */  { MAD_F(0x048d5249) /* 0.284502301 */, 19 },
-  /* 7591 */  { MAD_F(0x048d86b1) /* 0.284552281 */, 19 },
-  /* 7592 */  { MAD_F(0x048dbb1a) /* 0.284602263 */, 19 },
-  /* 7593 */  { MAD_F(0x048def83) /* 0.284652246 */, 19 },
-  /* 7594 */  { MAD_F(0x048e23ed) /* 0.284702233 */, 19 },
-  /* 7595 */  { MAD_F(0x048e5858) /* 0.284752221 */, 19 },
-  /* 7596 */  { MAD_F(0x048e8cc3) /* 0.284802211 */, 19 },
-  /* 7597 */  { MAD_F(0x048ec12f) /* 0.284852204 */, 19 },
-  /* 7598 */  { MAD_F(0x048ef59b) /* 0.284902199 */, 19 },
-  /* 7599 */  { MAD_F(0x048f2a08) /* 0.284952196 */, 19 },
-
-  /* 7600 */  { MAD_F(0x048f5e76) /* 0.285002195 */, 19 },
-  /* 7601 */  { MAD_F(0x048f92e4) /* 0.285052197 */, 19 },
-  /* 7602 */  { MAD_F(0x048fc753) /* 0.285102201 */, 19 },
-  /* 7603 */  { MAD_F(0x048ffbc2) /* 0.285152206 */, 19 },
-  /* 7604 */  { MAD_F(0x04903032) /* 0.285202214 */, 19 },
-  /* 7605 */  { MAD_F(0x049064a3) /* 0.285252225 */, 19 },
-  /* 7606 */  { MAD_F(0x04909914) /* 0.285302237 */, 19 },
-  /* 7607 */  { MAD_F(0x0490cd86) /* 0.285352252 */, 19 },
-  /* 7608 */  { MAD_F(0x049101f8) /* 0.285402269 */, 19 },
-  /* 7609 */  { MAD_F(0x0491366b) /* 0.285452288 */, 19 },
-  /* 7610 */  { MAD_F(0x04916ade) /* 0.285502309 */, 19 },
-  /* 7611 */  { MAD_F(0x04919f52) /* 0.285552332 */, 19 },
-  /* 7612 */  { MAD_F(0x0491d3c7) /* 0.285602358 */, 19 },
-  /* 7613 */  { MAD_F(0x0492083c) /* 0.285652386 */, 19 },
-  /* 7614 */  { MAD_F(0x04923cb2) /* 0.285702416 */, 19 },
-  /* 7615 */  { MAD_F(0x04927128) /* 0.285752448 */, 19 },
-
-  /* 7616 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 19 },
-  /* 7617 */  { MAD_F(0x0492da17) /* 0.285852519 */, 19 },
-  /* 7618 */  { MAD_F(0x04930e8f) /* 0.285902557 */, 19 },
-  /* 7619 */  { MAD_F(0x04934308) /* 0.285952598 */, 19 },
-  /* 7620 */  { MAD_F(0x04937781) /* 0.286002641 */, 19 },
-  /* 7621 */  { MAD_F(0x0493abfb) /* 0.286052687 */, 19 },
-  /* 7622 */  { MAD_F(0x0493e076) /* 0.286102734 */, 19 },
-  /* 7623 */  { MAD_F(0x049414f1) /* 0.286152784 */, 19 },
-  /* 7624 */  { MAD_F(0x0494496c) /* 0.286202836 */, 19 },
-  /* 7625 */  { MAD_F(0x04947de9) /* 0.286252890 */, 19 },
-  /* 7626 */  { MAD_F(0x0494b266) /* 0.286302946 */, 19 },
-  /* 7627 */  { MAD_F(0x0494e6e3) /* 0.286353005 */, 19 },
-  /* 7628 */  { MAD_F(0x04951b61) /* 0.286403065 */, 19 },
-  /* 7629 */  { MAD_F(0x04954fe0) /* 0.286453128 */, 19 },
-  /* 7630 */  { MAD_F(0x0495845f) /* 0.286503193 */, 19 },
-  /* 7631 */  { MAD_F(0x0495b8df) /* 0.286553260 */, 19 },
-
-  /* 7632 */  { MAD_F(0x0495ed5f) /* 0.286603329 */, 19 },
-  /* 7633 */  { MAD_F(0x049621e0) /* 0.286653401 */, 19 },
-  /* 7634 */  { MAD_F(0x04965662) /* 0.286703475 */, 19 },
-  /* 7635 */  { MAD_F(0x04968ae4) /* 0.286753551 */, 19 },
-  /* 7636 */  { MAD_F(0x0496bf67) /* 0.286803629 */, 19 },
-  /* 7637 */  { MAD_F(0x0496f3ea) /* 0.286853709 */, 19 },
-  /* 7638 */  { MAD_F(0x0497286e) /* 0.286903792 */, 19 },
-  /* 7639 */  { MAD_F(0x04975cf2) /* 0.286953876 */, 19 },
-  /* 7640 */  { MAD_F(0x04979177) /* 0.287003963 */, 19 },
-  /* 7641 */  { MAD_F(0x0497c5fd) /* 0.287054052 */, 19 },
-  /* 7642 */  { MAD_F(0x0497fa83) /* 0.287104143 */, 19 },
-  /* 7643 */  { MAD_F(0x04982f0a) /* 0.287154237 */, 19 },
-  /* 7644 */  { MAD_F(0x04986392) /* 0.287204332 */, 19 },
-  /* 7645 */  { MAD_F(0x0498981a) /* 0.287254430 */, 19 },
-  /* 7646 */  { MAD_F(0x0498cca2) /* 0.287304530 */, 19 },
-  /* 7647 */  { MAD_F(0x0499012c) /* 0.287354632 */, 19 },
-
-  /* 7648 */  { MAD_F(0x049935b5) /* 0.287404737 */, 19 },
-  /* 7649 */  { MAD_F(0x04996a40) /* 0.287454843 */, 19 },
-  /* 7650 */  { MAD_F(0x04999ecb) /* 0.287504952 */, 19 },
-  /* 7651 */  { MAD_F(0x0499d356) /* 0.287555063 */, 19 },
-  /* 7652 */  { MAD_F(0x049a07e2) /* 0.287605176 */, 19 },
-  /* 7653 */  { MAD_F(0x049a3c6f) /* 0.287655291 */, 19 },
-  /* 7654 */  { MAD_F(0x049a70fc) /* 0.287705409 */, 19 },
-  /* 7655 */  { MAD_F(0x049aa58a) /* 0.287755528 */, 19 },
-  /* 7656 */  { MAD_F(0x049ada19) /* 0.287805650 */, 19 },
-  /* 7657 */  { MAD_F(0x049b0ea8) /* 0.287855774 */, 19 },
-  /* 7658 */  { MAD_F(0x049b4337) /* 0.287905900 */, 19 },
-  /* 7659 */  { MAD_F(0x049b77c8) /* 0.287956028 */, 19 },
-  /* 7660 */  { MAD_F(0x049bac58) /* 0.288006159 */, 19 },
-  /* 7661 */  { MAD_F(0x049be0ea) /* 0.288056292 */, 19 },
-  /* 7662 */  { MAD_F(0x049c157c) /* 0.288106427 */, 19 },
-  /* 7663 */  { MAD_F(0x049c4a0e) /* 0.288156564 */, 19 },
-
-  /* 7664 */  { MAD_F(0x049c7ea1) /* 0.288206703 */, 19 },
-  /* 7665 */  { MAD_F(0x049cb335) /* 0.288256844 */, 19 },
-  /* 7666 */  { MAD_F(0x049ce7ca) /* 0.288306988 */, 19 },
-  /* 7667 */  { MAD_F(0x049d1c5e) /* 0.288357134 */, 19 },
-  /* 7668 */  { MAD_F(0x049d50f4) /* 0.288407282 */, 19 },
-  /* 7669 */  { MAD_F(0x049d858a) /* 0.288457432 */, 19 },
-  /* 7670 */  { MAD_F(0x049dba21) /* 0.288507584 */, 19 },
-  /* 7671 */  { MAD_F(0x049deeb8) /* 0.288557739 */, 19 },
-  /* 7672 */  { MAD_F(0x049e2350) /* 0.288607895 */, 19 },
-  /* 7673 */  { MAD_F(0x049e57e8) /* 0.288658054 */, 19 },
-  /* 7674 */  { MAD_F(0x049e8c81) /* 0.288708215 */, 19 },
-  /* 7675 */  { MAD_F(0x049ec11b) /* 0.288758379 */, 19 },
-  /* 7676 */  { MAD_F(0x049ef5b5) /* 0.288808544 */, 19 },
-  /* 7677 */  { MAD_F(0x049f2a50) /* 0.288858712 */, 19 },
-  /* 7678 */  { MAD_F(0x049f5eeb) /* 0.288908881 */, 19 },
-  /* 7679 */  { MAD_F(0x049f9387) /* 0.288959053 */, 19 },
-
-  /* 7680 */  { MAD_F(0x049fc824) /* 0.289009227 */, 19 },
-  /* 7681 */  { MAD_F(0x049ffcc1) /* 0.289059404 */, 19 },
-  /* 7682 */  { MAD_F(0x04a0315e) /* 0.289109582 */, 19 },
-  /* 7683 */  { MAD_F(0x04a065fd) /* 0.289159763 */, 19 },
-  /* 7684 */  { MAD_F(0x04a09a9b) /* 0.289209946 */, 19 },
-  /* 7685 */  { MAD_F(0x04a0cf3b) /* 0.289260131 */, 19 },
-  /* 7686 */  { MAD_F(0x04a103db) /* 0.289310318 */, 19 },
-  /* 7687 */  { MAD_F(0x04a1387b) /* 0.289360507 */, 19 },
-  /* 7688 */  { MAD_F(0x04a16d1d) /* 0.289410699 */, 19 },
-  /* 7689 */  { MAD_F(0x04a1a1be) /* 0.289460893 */, 19 },
-  /* 7690 */  { MAD_F(0x04a1d661) /* 0.289511088 */, 19 },
-  /* 7691 */  { MAD_F(0x04a20b04) /* 0.289561287 */, 19 },
-  /* 7692 */  { MAD_F(0x04a23fa7) /* 0.289611487 */, 19 },
-  /* 7693 */  { MAD_F(0x04a2744b) /* 0.289661689 */, 19 },
-  /* 7694 */  { MAD_F(0x04a2a8f0) /* 0.289711894 */, 19 },
-  /* 7695 */  { MAD_F(0x04a2dd95) /* 0.289762101 */, 19 },
-
-  /* 7696 */  { MAD_F(0x04a3123b) /* 0.289812309 */, 19 },
-  /* 7697 */  { MAD_F(0x04a346e2) /* 0.289862521 */, 19 },
-  /* 7698 */  { MAD_F(0x04a37b89) /* 0.289912734 */, 19 },
-  /* 7699 */  { MAD_F(0x04a3b030) /* 0.289962949 */, 19 },
-  /* 7700 */  { MAD_F(0x04a3e4d8) /* 0.290013167 */, 19 },
-  /* 7701 */  { MAD_F(0x04a41981) /* 0.290063387 */, 19 },
-  /* 7702 */  { MAD_F(0x04a44e2b) /* 0.290113609 */, 19 },
-  /* 7703 */  { MAD_F(0x04a482d5) /* 0.290163833 */, 19 },
-  /* 7704 */  { MAD_F(0x04a4b77f) /* 0.290214059 */, 19 },
-  /* 7705 */  { MAD_F(0x04a4ec2a) /* 0.290264288 */, 19 },
-  /* 7706 */  { MAD_F(0x04a520d6) /* 0.290314519 */, 19 },
-  /* 7707 */  { MAD_F(0x04a55582) /* 0.290364751 */, 19 },
-  /* 7708 */  { MAD_F(0x04a58a2f) /* 0.290414986 */, 19 },
-  /* 7709 */  { MAD_F(0x04a5bedd) /* 0.290465224 */, 19 },
-  /* 7710 */  { MAD_F(0x04a5f38b) /* 0.290515463 */, 19 },
-  /* 7711 */  { MAD_F(0x04a62839) /* 0.290565705 */, 19 },
-
-  /* 7712 */  { MAD_F(0x04a65ce8) /* 0.290615948 */, 19 },
-  /* 7713 */  { MAD_F(0x04a69198) /* 0.290666194 */, 19 },
-  /* 7714 */  { MAD_F(0x04a6c648) /* 0.290716442 */, 19 },
-  /* 7715 */  { MAD_F(0x04a6faf9) /* 0.290766692 */, 19 },
-  /* 7716 */  { MAD_F(0x04a72fab) /* 0.290816945 */, 19 },
-  /* 7717 */  { MAD_F(0x04a7645d) /* 0.290867199 */, 19 },
-  /* 7718 */  { MAD_F(0x04a79910) /* 0.290917456 */, 19 },
-  /* 7719 */  { MAD_F(0x04a7cdc3) /* 0.290967715 */, 19 },
-  /* 7720 */  { MAD_F(0x04a80277) /* 0.291017976 */, 19 },
-  /* 7721 */  { MAD_F(0x04a8372b) /* 0.291068239 */, 19 },
-  /* 7722 */  { MAD_F(0x04a86be0) /* 0.291118505 */, 19 },
-  /* 7723 */  { MAD_F(0x04a8a096) /* 0.291168772 */, 19 },
-  /* 7724 */  { MAD_F(0x04a8d54c) /* 0.291219042 */, 19 },
-  /* 7725 */  { MAD_F(0x04a90a03) /* 0.291269314 */, 19 },
-  /* 7726 */  { MAD_F(0x04a93eba) /* 0.291319588 */, 19 },
-  /* 7727 */  { MAD_F(0x04a97372) /* 0.291369865 */, 19 },
-
-  /* 7728 */  { MAD_F(0x04a9a82b) /* 0.291420143 */, 19 },
-  /* 7729 */  { MAD_F(0x04a9dce4) /* 0.291470424 */, 19 },
-  /* 7730 */  { MAD_F(0x04aa119d) /* 0.291520706 */, 19 },
-  /* 7731 */  { MAD_F(0x04aa4658) /* 0.291570991 */, 19 },
-  /* 7732 */  { MAD_F(0x04aa7b13) /* 0.291621278 */, 19 },
-  /* 7733 */  { MAD_F(0x04aaafce) /* 0.291671568 */, 19 },
-  /* 7734 */  { MAD_F(0x04aae48a) /* 0.291721859 */, 19 },
-  /* 7735 */  { MAD_F(0x04ab1947) /* 0.291772153 */, 19 },
-  /* 7736 */  { MAD_F(0x04ab4e04) /* 0.291822449 */, 19 },
-  /* 7737 */  { MAD_F(0x04ab82c2) /* 0.291872747 */, 19 },
-  /* 7738 */  { MAD_F(0x04abb780) /* 0.291923047 */, 19 },
-  /* 7739 */  { MAD_F(0x04abec3f) /* 0.291973349 */, 19 },
-  /* 7740 */  { MAD_F(0x04ac20fe) /* 0.292023653 */, 19 },
-  /* 7741 */  { MAD_F(0x04ac55be) /* 0.292073960 */, 19 },
-  /* 7742 */  { MAD_F(0x04ac8a7f) /* 0.292124269 */, 19 },
-  /* 7743 */  { MAD_F(0x04acbf40) /* 0.292174580 */, 19 },
-
-  /* 7744 */  { MAD_F(0x04acf402) /* 0.292224893 */, 19 },
-  /* 7745 */  { MAD_F(0x04ad28c5) /* 0.292275208 */, 19 },
-  /* 7746 */  { MAD_F(0x04ad5d88) /* 0.292325526 */, 19 },
-  /* 7747 */  { MAD_F(0x04ad924b) /* 0.292375845 */, 19 },
-  /* 7748 */  { MAD_F(0x04adc70f) /* 0.292426167 */, 19 },
-  /* 7749 */  { MAD_F(0x04adfbd4) /* 0.292476491 */, 19 },
-  /* 7750 */  { MAD_F(0x04ae3099) /* 0.292526817 */, 19 },
-  /* 7751 */  { MAD_F(0x04ae655f) /* 0.292577145 */, 19 },
-  /* 7752 */  { MAD_F(0x04ae9a26) /* 0.292627476 */, 19 },
-  /* 7753 */  { MAD_F(0x04aeceed) /* 0.292677808 */, 19 },
-  /* 7754 */  { MAD_F(0x04af03b4) /* 0.292728143 */, 19 },
-  /* 7755 */  { MAD_F(0x04af387d) /* 0.292778480 */, 19 },
-  /* 7756 */  { MAD_F(0x04af6d45) /* 0.292828819 */, 19 },
-  /* 7757 */  { MAD_F(0x04afa20f) /* 0.292879160 */, 19 },
-  /* 7758 */  { MAD_F(0x04afd6d9) /* 0.292929504 */, 19 },
-  /* 7759 */  { MAD_F(0x04b00ba3) /* 0.292979849 */, 19 },
-
-  /* 7760 */  { MAD_F(0x04b0406e) /* 0.293030197 */, 19 },
-  /* 7761 */  { MAD_F(0x04b0753a) /* 0.293080547 */, 19 },
-  /* 7762 */  { MAD_F(0x04b0aa06) /* 0.293130899 */, 19 },
-  /* 7763 */  { MAD_F(0x04b0ded3) /* 0.293181253 */, 19 },
-  /* 7764 */  { MAD_F(0x04b113a1) /* 0.293231610 */, 19 },
-  /* 7765 */  { MAD_F(0x04b1486f) /* 0.293281968 */, 19 },
-  /* 7766 */  { MAD_F(0x04b17d3d) /* 0.293332329 */, 19 },
-  /* 7767 */  { MAD_F(0x04b1b20c) /* 0.293382692 */, 19 },
-  /* 7768 */  { MAD_F(0x04b1e6dc) /* 0.293433057 */, 19 },
-  /* 7769 */  { MAD_F(0x04b21bad) /* 0.293483424 */, 19 },
-  /* 7770 */  { MAD_F(0x04b2507d) /* 0.293533794 */, 19 },
-  /* 7771 */  { MAD_F(0x04b2854f) /* 0.293584165 */, 19 },
-  /* 7772 */  { MAD_F(0x04b2ba21) /* 0.293634539 */, 19 },
-  /* 7773 */  { MAD_F(0x04b2eef4) /* 0.293684915 */, 19 },
-  /* 7774 */  { MAD_F(0x04b323c7) /* 0.293735293 */, 19 },
-  /* 7775 */  { MAD_F(0x04b3589b) /* 0.293785673 */, 19 },
-
-  /* 7776 */  { MAD_F(0x04b38d6f) /* 0.293836055 */, 19 },
-  /* 7777 */  { MAD_F(0x04b3c244) /* 0.293886440 */, 19 },
-  /* 7778 */  { MAD_F(0x04b3f71a) /* 0.293936826 */, 19 },
-  /* 7779 */  { MAD_F(0x04b42bf0) /* 0.293987215 */, 19 },
-  /* 7780 */  { MAD_F(0x04b460c7) /* 0.294037606 */, 19 },
-  /* 7781 */  { MAD_F(0x04b4959e) /* 0.294087999 */, 19 },
-  /* 7782 */  { MAD_F(0x04b4ca76) /* 0.294138395 */, 19 },
-  /* 7783 */  { MAD_F(0x04b4ff4e) /* 0.294188792 */, 19 },
-  /* 7784 */  { MAD_F(0x04b53427) /* 0.294239192 */, 19 },
-  /* 7785 */  { MAD_F(0x04b56901) /* 0.294289593 */, 19 },
-  /* 7786 */  { MAD_F(0x04b59ddb) /* 0.294339997 */, 19 },
-  /* 7787 */  { MAD_F(0x04b5d2b6) /* 0.294390403 */, 19 },
-  /* 7788 */  { MAD_F(0x04b60791) /* 0.294440812 */, 19 },
-  /* 7789 */  { MAD_F(0x04b63c6d) /* 0.294491222 */, 19 },
-  /* 7790 */  { MAD_F(0x04b6714a) /* 0.294541635 */, 19 },
-  /* 7791 */  { MAD_F(0x04b6a627) /* 0.294592049 */, 19 },
-
-  /* 7792 */  { MAD_F(0x04b6db05) /* 0.294642466 */, 19 },
-  /* 7793 */  { MAD_F(0x04b70fe3) /* 0.294692885 */, 19 },
-  /* 7794 */  { MAD_F(0x04b744c2) /* 0.294743306 */, 19 },
-  /* 7795 */  { MAD_F(0x04b779a1) /* 0.294793730 */, 19 },
-  /* 7796 */  { MAD_F(0x04b7ae81) /* 0.294844155 */, 19 },
-  /* 7797 */  { MAD_F(0x04b7e362) /* 0.294894583 */, 19 },
-  /* 7798 */  { MAD_F(0x04b81843) /* 0.294945013 */, 19 },
-  /* 7799 */  { MAD_F(0x04b84d24) /* 0.294995445 */, 19 },
-  /* 7800 */  { MAD_F(0x04b88207) /* 0.295045879 */, 19 },
-  /* 7801 */  { MAD_F(0x04b8b6ea) /* 0.295096315 */, 19 },
-  /* 7802 */  { MAD_F(0x04b8ebcd) /* 0.295146753 */, 19 },
-  /* 7803 */  { MAD_F(0x04b920b1) /* 0.295197194 */, 19 },
-  /* 7804 */  { MAD_F(0x04b95596) /* 0.295247637 */, 19 },
-  /* 7805 */  { MAD_F(0x04b98a7b) /* 0.295298082 */, 19 },
-  /* 7806 */  { MAD_F(0x04b9bf61) /* 0.295348529 */, 19 },
-  /* 7807 */  { MAD_F(0x04b9f447) /* 0.295398978 */, 19 },
-
-  /* 7808 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 19 },
-  /* 7809 */  { MAD_F(0x04ba5e16) /* 0.295499883 */, 19 },
-  /* 7810 */  { MAD_F(0x04ba92fe) /* 0.295550338 */, 19 },
-  /* 7811 */  { MAD_F(0x04bac7e6) /* 0.295600796 */, 19 },
-  /* 7812 */  { MAD_F(0x04bafcd0) /* 0.295651256 */, 19 },
-  /* 7813 */  { MAD_F(0x04bb31b9) /* 0.295701718 */, 19 },
-  /* 7814 */  { MAD_F(0x04bb66a4) /* 0.295752183 */, 19 },
-  /* 7815 */  { MAD_F(0x04bb9b8f) /* 0.295802649 */, 19 },
-  /* 7816 */  { MAD_F(0x04bbd07a) /* 0.295853118 */, 19 },
-  /* 7817 */  { MAD_F(0x04bc0566) /* 0.295903588 */, 19 },
-  /* 7818 */  { MAD_F(0x04bc3a53) /* 0.295954061 */, 19 },
-  /* 7819 */  { MAD_F(0x04bc6f40) /* 0.296004536 */, 19 },
-  /* 7820 */  { MAD_F(0x04bca42e) /* 0.296055013 */, 19 },
-  /* 7821 */  { MAD_F(0x04bcd91d) /* 0.296105493 */, 19 },
-  /* 7822 */  { MAD_F(0x04bd0e0c) /* 0.296155974 */, 19 },
-  /* 7823 */  { MAD_F(0x04bd42fb) /* 0.296206458 */, 19 },
-
-  /* 7824 */  { MAD_F(0x04bd77ec) /* 0.296256944 */, 19 },
-  /* 7825 */  { MAD_F(0x04bdacdc) /* 0.296307432 */, 19 },
-  /* 7826 */  { MAD_F(0x04bde1ce) /* 0.296357922 */, 19 },
-  /* 7827 */  { MAD_F(0x04be16c0) /* 0.296408414 */, 19 },
-  /* 7828 */  { MAD_F(0x04be4bb2) /* 0.296458908 */, 19 },
-  /* 7829 */  { MAD_F(0x04be80a5) /* 0.296509405 */, 19 },
-  /* 7830 */  { MAD_F(0x04beb599) /* 0.296559904 */, 19 },
-  /* 7831 */  { MAD_F(0x04beea8d) /* 0.296610404 */, 19 },
-  /* 7832 */  { MAD_F(0x04bf1f82) /* 0.296660907 */, 19 },
-  /* 7833 */  { MAD_F(0x04bf5477) /* 0.296711413 */, 19 },
-  /* 7834 */  { MAD_F(0x04bf896d) /* 0.296761920 */, 19 },
-  /* 7835 */  { MAD_F(0x04bfbe64) /* 0.296812429 */, 19 },
-  /* 7836 */  { MAD_F(0x04bff35b) /* 0.296862941 */, 19 },
-  /* 7837 */  { MAD_F(0x04c02852) /* 0.296913455 */, 19 },
-  /* 7838 */  { MAD_F(0x04c05d4b) /* 0.296963971 */, 19 },
-  /* 7839 */  { MAD_F(0x04c09243) /* 0.297014489 */, 19 },
-
-  /* 7840 */  { MAD_F(0x04c0c73d) /* 0.297065009 */, 19 },
-  /* 7841 */  { MAD_F(0x04c0fc37) /* 0.297115531 */, 19 },
-  /* 7842 */  { MAD_F(0x04c13131) /* 0.297166056 */, 19 },
-  /* 7843 */  { MAD_F(0x04c1662d) /* 0.297216582 */, 19 },
-  /* 7844 */  { MAD_F(0x04c19b28) /* 0.297267111 */, 19 },
-  /* 7845 */  { MAD_F(0x04c1d025) /* 0.297317642 */, 19 },
-  /* 7846 */  { MAD_F(0x04c20521) /* 0.297368175 */, 19 },
-  /* 7847 */  { MAD_F(0x04c23a1f) /* 0.297418710 */, 19 },
-  /* 7848 */  { MAD_F(0x04c26f1d) /* 0.297469248 */, 19 },
-  /* 7849 */  { MAD_F(0x04c2a41b) /* 0.297519787 */, 19 },
-  /* 7850 */  { MAD_F(0x04c2d91b) /* 0.297570329 */, 19 },
-  /* 7851 */  { MAD_F(0x04c30e1a) /* 0.297620873 */, 19 },
-  /* 7852 */  { MAD_F(0x04c3431b) /* 0.297671418 */, 19 },
-  /* 7853 */  { MAD_F(0x04c3781c) /* 0.297721967 */, 19 },
-  /* 7854 */  { MAD_F(0x04c3ad1d) /* 0.297772517 */, 19 },
-  /* 7855 */  { MAD_F(0x04c3e21f) /* 0.297823069 */, 19 },
-
-  /* 7856 */  { MAD_F(0x04c41722) /* 0.297873624 */, 19 },
-  /* 7857 */  { MAD_F(0x04c44c25) /* 0.297924180 */, 19 },
-  /* 7858 */  { MAD_F(0x04c48129) /* 0.297974739 */, 19 },
-  /* 7859 */  { MAD_F(0x04c4b62d) /* 0.298025300 */, 19 },
-  /* 7860 */  { MAD_F(0x04c4eb32) /* 0.298075863 */, 19 },
-  /* 7861 */  { MAD_F(0x04c52038) /* 0.298126429 */, 19 },
-  /* 7862 */  { MAD_F(0x04c5553e) /* 0.298176996 */, 19 },
-  /* 7863 */  { MAD_F(0x04c58a44) /* 0.298227565 */, 19 },
-  /* 7864 */  { MAD_F(0x04c5bf4c) /* 0.298278137 */, 19 },
-  /* 7865 */  { MAD_F(0x04c5f453) /* 0.298328711 */, 19 },
-  /* 7866 */  { MAD_F(0x04c6295c) /* 0.298379287 */, 19 },
-  /* 7867 */  { MAD_F(0x04c65e65) /* 0.298429865 */, 19 },
-  /* 7868 */  { MAD_F(0x04c6936e) /* 0.298480445 */, 19 },
-  /* 7869 */  { MAD_F(0x04c6c878) /* 0.298531028 */, 19 },
-  /* 7870 */  { MAD_F(0x04c6fd83) /* 0.298581612 */, 19 },
-  /* 7871 */  { MAD_F(0x04c7328e) /* 0.298632199 */, 19 },
-
-  /* 7872 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 19 },
-  /* 7873 */  { MAD_F(0x04c79ca7) /* 0.298733379 */, 19 },
-  /* 7874 */  { MAD_F(0x04c7d1b4) /* 0.298783972 */, 19 },
-  /* 7875 */  { MAD_F(0x04c806c1) /* 0.298834567 */, 19 },
-  /* 7876 */  { MAD_F(0x04c83bcf) /* 0.298885165 */, 19 },
-  /* 7877 */  { MAD_F(0x04c870de) /* 0.298935764 */, 19 },
-  /* 7878 */  { MAD_F(0x04c8a5ed) /* 0.298986366 */, 19 },
-  /* 7879 */  { MAD_F(0x04c8dafd) /* 0.299036970 */, 19 },
-  /* 7880 */  { MAD_F(0x04c9100d) /* 0.299087576 */, 19 },
-  /* 7881 */  { MAD_F(0x04c9451e) /* 0.299138184 */, 19 },
-  /* 7882 */  { MAD_F(0x04c97a30) /* 0.299188794 */, 19 },
-  /* 7883 */  { MAD_F(0x04c9af42) /* 0.299239406 */, 19 },
-  /* 7884 */  { MAD_F(0x04c9e455) /* 0.299290021 */, 19 },
-  /* 7885 */  { MAD_F(0x04ca1968) /* 0.299340638 */, 19 },
-  /* 7886 */  { MAD_F(0x04ca4e7c) /* 0.299391256 */, 19 },
-  /* 7887 */  { MAD_F(0x04ca8391) /* 0.299441877 */, 19 },
-
-  /* 7888 */  { MAD_F(0x04cab8a6) /* 0.299492500 */, 19 },
-  /* 7889 */  { MAD_F(0x04caedbb) /* 0.299543126 */, 19 },
-  /* 7890 */  { MAD_F(0x04cb22d1) /* 0.299593753 */, 19 },
-  /* 7891 */  { MAD_F(0x04cb57e8) /* 0.299644382 */, 19 },
-  /* 7892 */  { MAD_F(0x04cb8d00) /* 0.299695014 */, 19 },
-  /* 7893 */  { MAD_F(0x04cbc217) /* 0.299745648 */, 19 },
-  /* 7894 */  { MAD_F(0x04cbf730) /* 0.299796284 */, 19 },
-  /* 7895 */  { MAD_F(0x04cc2c49) /* 0.299846922 */, 19 },
-  /* 7896 */  { MAD_F(0x04cc6163) /* 0.299897562 */, 19 },
-  /* 7897 */  { MAD_F(0x04cc967d) /* 0.299948204 */, 19 },
-  /* 7898 */  { MAD_F(0x04cccb98) /* 0.299998849 */, 19 },
-  /* 7899 */  { MAD_F(0x04cd00b3) /* 0.300049495 */, 19 },
-  /* 7900 */  { MAD_F(0x04cd35cf) /* 0.300100144 */, 19 },
-  /* 7901 */  { MAD_F(0x04cd6aeb) /* 0.300150795 */, 19 },
-  /* 7902 */  { MAD_F(0x04cda008) /* 0.300201448 */, 19 },
-  /* 7903 */  { MAD_F(0x04cdd526) /* 0.300252103 */, 19 },
-
-  /* 7904 */  { MAD_F(0x04ce0a44) /* 0.300302761 */, 19 },
-  /* 7905 */  { MAD_F(0x04ce3f63) /* 0.300353420 */, 19 },
-  /* 7906 */  { MAD_F(0x04ce7482) /* 0.300404082 */, 19 },
-  /* 7907 */  { MAD_F(0x04cea9a2) /* 0.300454745 */, 19 },
-  /* 7908 */  { MAD_F(0x04cedec3) /* 0.300505411 */, 19 },
-  /* 7909 */  { MAD_F(0x04cf13e4) /* 0.300556079 */, 19 },
-  /* 7910 */  { MAD_F(0x04cf4906) /* 0.300606749 */, 19 },
-  /* 7911 */  { MAD_F(0x04cf7e28) /* 0.300657421 */, 19 },
-  /* 7912 */  { MAD_F(0x04cfb34b) /* 0.300708096 */, 19 },
-  /* 7913 */  { MAD_F(0x04cfe86e) /* 0.300758772 */, 19 },
-  /* 7914 */  { MAD_F(0x04d01d92) /* 0.300809451 */, 19 },
-  /* 7915 */  { MAD_F(0x04d052b6) /* 0.300860132 */, 19 },
-  /* 7916 */  { MAD_F(0x04d087db) /* 0.300910815 */, 19 },
-  /* 7917 */  { MAD_F(0x04d0bd01) /* 0.300961500 */, 19 },
-  /* 7918 */  { MAD_F(0x04d0f227) /* 0.301012187 */, 19 },
-  /* 7919 */  { MAD_F(0x04d1274e) /* 0.301062876 */, 19 },
-
-  /* 7920 */  { MAD_F(0x04d15c76) /* 0.301113568 */, 19 },
-  /* 7921 */  { MAD_F(0x04d1919e) /* 0.301164261 */, 19 },
-  /* 7922 */  { MAD_F(0x04d1c6c6) /* 0.301214957 */, 19 },
-  /* 7923 */  { MAD_F(0x04d1fbef) /* 0.301265655 */, 19 },
-  /* 7924 */  { MAD_F(0x04d23119) /* 0.301316355 */, 19 },
-  /* 7925 */  { MAD_F(0x04d26643) /* 0.301367057 */, 19 },
-  /* 7926 */  { MAD_F(0x04d29b6e) /* 0.301417761 */, 19 },
-  /* 7927 */  { MAD_F(0x04d2d099) /* 0.301468468 */, 19 },
-  /* 7928 */  { MAD_F(0x04d305c5) /* 0.301519176 */, 19 },
-  /* 7929 */  { MAD_F(0x04d33af2) /* 0.301569887 */, 19 },
-  /* 7930 */  { MAD_F(0x04d3701f) /* 0.301620599 */, 19 },
-  /* 7931 */  { MAD_F(0x04d3a54d) /* 0.301671314 */, 19 },
-  /* 7932 */  { MAD_F(0x04d3da7b) /* 0.301722031 */, 19 },
-  /* 7933 */  { MAD_F(0x04d40faa) /* 0.301772751 */, 19 },
-  /* 7934 */  { MAD_F(0x04d444d9) /* 0.301823472 */, 19 },
-  /* 7935 */  { MAD_F(0x04d47a09) /* 0.301874195 */, 19 },
-
-  /* 7936 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 19 },
-  /* 7937 */  { MAD_F(0x04d4e46b) /* 0.301975649 */, 19 },
-  /* 7938 */  { MAD_F(0x04d5199c) /* 0.302026378 */, 19 },
-  /* 7939 */  { MAD_F(0x04d54ecf) /* 0.302077110 */, 19 },
-  /* 7940 */  { MAD_F(0x04d58401) /* 0.302127845 */, 19 },
-  /* 7941 */  { MAD_F(0x04d5b935) /* 0.302178581 */, 19 },
-  /* 7942 */  { MAD_F(0x04d5ee69) /* 0.302229319 */, 19 },
-  /* 7943 */  { MAD_F(0x04d6239d) /* 0.302280060 */, 19 },
-  /* 7944 */  { MAD_F(0x04d658d2) /* 0.302330802 */, 19 },
-  /* 7945 */  { MAD_F(0x04d68e08) /* 0.302381547 */, 19 },
-  /* 7946 */  { MAD_F(0x04d6c33e) /* 0.302432294 */, 19 },
-  /* 7947 */  { MAD_F(0x04d6f875) /* 0.302483043 */, 19 },
-  /* 7948 */  { MAD_F(0x04d72dad) /* 0.302533794 */, 19 },
-  /* 7949 */  { MAD_F(0x04d762e5) /* 0.302584547 */, 19 },
-  /* 7950 */  { MAD_F(0x04d7981d) /* 0.302635303 */, 19 },
-  /* 7951 */  { MAD_F(0x04d7cd56) /* 0.302686060 */, 19 },
-
-  /* 7952 */  { MAD_F(0x04d80290) /* 0.302736820 */, 19 },
-  /* 7953 */  { MAD_F(0x04d837ca) /* 0.302787581 */, 19 },
-  /* 7954 */  { MAD_F(0x04d86d05) /* 0.302838345 */, 19 },
-  /* 7955 */  { MAD_F(0x04d8a240) /* 0.302889111 */, 19 },
-  /* 7956 */  { MAD_F(0x04d8d77c) /* 0.302939879 */, 19 },
-  /* 7957 */  { MAD_F(0x04d90cb9) /* 0.302990650 */, 19 },
-  /* 7958 */  { MAD_F(0x04d941f6) /* 0.303041422 */, 19 },
-  /* 7959 */  { MAD_F(0x04d97734) /* 0.303092197 */, 19 },
-  /* 7960 */  { MAD_F(0x04d9ac72) /* 0.303142973 */, 19 },
-  /* 7961 */  { MAD_F(0x04d9e1b1) /* 0.303193752 */, 19 },
-  /* 7962 */  { MAD_F(0x04da16f0) /* 0.303244533 */, 19 },
-  /* 7963 */  { MAD_F(0x04da4c30) /* 0.303295316 */, 19 },
-  /* 7964 */  { MAD_F(0x04da8171) /* 0.303346101 */, 19 },
-  /* 7965 */  { MAD_F(0x04dab6b2) /* 0.303396889 */, 19 },
-  /* 7966 */  { MAD_F(0x04daebf4) /* 0.303447678 */, 19 },
-  /* 7967 */  { MAD_F(0x04db2136) /* 0.303498469 */, 19 },
-
-  /* 7968 */  { MAD_F(0x04db5679) /* 0.303549263 */, 19 },
-  /* 7969 */  { MAD_F(0x04db8bbc) /* 0.303600059 */, 19 },
-  /* 7970 */  { MAD_F(0x04dbc100) /* 0.303650857 */, 19 },
-  /* 7971 */  { MAD_F(0x04dbf644) /* 0.303701657 */, 19 },
-  /* 7972 */  { MAD_F(0x04dc2b8a) /* 0.303752459 */, 19 },
-  /* 7973 */  { MAD_F(0x04dc60cf) /* 0.303803263 */, 19 },
-  /* 7974 */  { MAD_F(0x04dc9616) /* 0.303854070 */, 19 },
-  /* 7975 */  { MAD_F(0x04dccb5c) /* 0.303904878 */, 19 },
-  /* 7976 */  { MAD_F(0x04dd00a4) /* 0.303955689 */, 19 },
-  /* 7977 */  { MAD_F(0x04dd35ec) /* 0.304006502 */, 19 },
-  /* 7978 */  { MAD_F(0x04dd6b34) /* 0.304057317 */, 19 },
-  /* 7979 */  { MAD_F(0x04dda07d) /* 0.304108134 */, 19 },
-  /* 7980 */  { MAD_F(0x04ddd5c7) /* 0.304158953 */, 19 },
-  /* 7981 */  { MAD_F(0x04de0b11) /* 0.304209774 */, 19 },
-  /* 7982 */  { MAD_F(0x04de405c) /* 0.304260597 */, 19 },
-  /* 7983 */  { MAD_F(0x04de75a7) /* 0.304311423 */, 19 },
-
-  /* 7984 */  { MAD_F(0x04deaaf3) /* 0.304362251 */, 19 },
-  /* 7985 */  { MAD_F(0x04dee040) /* 0.304413080 */, 19 },
-  /* 7986 */  { MAD_F(0x04df158d) /* 0.304463912 */, 19 },
-  /* 7987 */  { MAD_F(0x04df4adb) /* 0.304514746 */, 19 },
-  /* 7988 */  { MAD_F(0x04df8029) /* 0.304565582 */, 19 },
-  /* 7989 */  { MAD_F(0x04dfb578) /* 0.304616421 */, 19 },
-  /* 7990 */  { MAD_F(0x04dfeac7) /* 0.304667261 */, 19 },
-  /* 7991 */  { MAD_F(0x04e02017) /* 0.304718103 */, 19 },
-  /* 7992 */  { MAD_F(0x04e05567) /* 0.304768948 */, 19 },
-  /* 7993 */  { MAD_F(0x04e08ab8) /* 0.304819795 */, 19 },
-  /* 7994 */  { MAD_F(0x04e0c00a) /* 0.304870644 */, 19 },
-  /* 7995 */  { MAD_F(0x04e0f55c) /* 0.304921495 */, 19 },
-  /* 7996 */  { MAD_F(0x04e12aaf) /* 0.304972348 */, 19 },
-  /* 7997 */  { MAD_F(0x04e16002) /* 0.305023203 */, 19 },
-  /* 7998 */  { MAD_F(0x04e19556) /* 0.305074060 */, 19 },
-  /* 7999 */  { MAD_F(0x04e1caab) /* 0.305124920 */, 19 },
-
-  /* 8000 */  { MAD_F(0x04e20000) /* 0.305175781 */, 19 },
-  /* 8001 */  { MAD_F(0x04e23555) /* 0.305226645 */, 19 },
-  /* 8002 */  { MAD_F(0x04e26aac) /* 0.305277511 */, 19 },
-  /* 8003 */  { MAD_F(0x04e2a002) /* 0.305328379 */, 19 },
-  /* 8004 */  { MAD_F(0x04e2d55a) /* 0.305379249 */, 19 },
-  /* 8005 */  { MAD_F(0x04e30ab2) /* 0.305430121 */, 19 },
-  /* 8006 */  { MAD_F(0x04e3400a) /* 0.305480995 */, 19 },
-  /* 8007 */  { MAD_F(0x04e37563) /* 0.305531872 */, 19 },
-  /* 8008 */  { MAD_F(0x04e3aabd) /* 0.305582750 */, 19 },
-  /* 8009 */  { MAD_F(0x04e3e017) /* 0.305633631 */, 19 },
-  /* 8010 */  { MAD_F(0x04e41572) /* 0.305684513 */, 19 },
-  /* 8011 */  { MAD_F(0x04e44acd) /* 0.305735398 */, 19 },
-  /* 8012 */  { MAD_F(0x04e48029) /* 0.305786285 */, 19 },
-  /* 8013 */  { MAD_F(0x04e4b585) /* 0.305837174 */, 19 },
-  /* 8014 */  { MAD_F(0x04e4eae2) /* 0.305888066 */, 19 },
-  /* 8015 */  { MAD_F(0x04e52040) /* 0.305938959 */, 19 },
-
-  /* 8016 */  { MAD_F(0x04e5559e) /* 0.305989854 */, 19 },
-  /* 8017 */  { MAD_F(0x04e58afd) /* 0.306040752 */, 19 },
-  /* 8018 */  { MAD_F(0x04e5c05c) /* 0.306091652 */, 19 },
-  /* 8019 */  { MAD_F(0x04e5f5bc) /* 0.306142554 */, 19 },
-  /* 8020 */  { MAD_F(0x04e62b1c) /* 0.306193457 */, 19 },
-  /* 8021 */  { MAD_F(0x04e6607d) /* 0.306244364 */, 19 },
-  /* 8022 */  { MAD_F(0x04e695df) /* 0.306295272 */, 19 },
-  /* 8023 */  { MAD_F(0x04e6cb41) /* 0.306346182 */, 19 },
-  /* 8024 */  { MAD_F(0x04e700a3) /* 0.306397094 */, 19 },
-  /* 8025 */  { MAD_F(0x04e73607) /* 0.306448009 */, 19 },
-  /* 8026 */  { MAD_F(0x04e76b6b) /* 0.306498925 */, 19 },
-  /* 8027 */  { MAD_F(0x04e7a0cf) /* 0.306549844 */, 19 },
-  /* 8028 */  { MAD_F(0x04e7d634) /* 0.306600765 */, 19 },
-  /* 8029 */  { MAD_F(0x04e80b99) /* 0.306651688 */, 19 },
-  /* 8030 */  { MAD_F(0x04e84100) /* 0.306702613 */, 19 },
-  /* 8031 */  { MAD_F(0x04e87666) /* 0.306753540 */, 19 },
-
-  /* 8032 */  { MAD_F(0x04e8abcd) /* 0.306804470 */, 19 },
-  /* 8033 */  { MAD_F(0x04e8e135) /* 0.306855401 */, 19 },
-  /* 8034 */  { MAD_F(0x04e9169e) /* 0.306906334 */, 19 },
-  /* 8035 */  { MAD_F(0x04e94c07) /* 0.306957270 */, 19 },
-  /* 8036 */  { MAD_F(0x04e98170) /* 0.307008208 */, 19 },
-  /* 8037 */  { MAD_F(0x04e9b6da) /* 0.307059148 */, 19 },
-  /* 8038 */  { MAD_F(0x04e9ec45) /* 0.307110090 */, 19 },
-  /* 8039 */  { MAD_F(0x04ea21b0) /* 0.307161034 */, 19 },
-  /* 8040 */  { MAD_F(0x04ea571c) /* 0.307211980 */, 19 },
-  /* 8041 */  { MAD_F(0x04ea8c88) /* 0.307262928 */, 19 },
-  /* 8042 */  { MAD_F(0x04eac1f5) /* 0.307313879 */, 19 },
-  /* 8043 */  { MAD_F(0x04eaf762) /* 0.307364831 */, 19 },
-  /* 8044 */  { MAD_F(0x04eb2cd0) /* 0.307415786 */, 19 },
-  /* 8045 */  { MAD_F(0x04eb623f) /* 0.307466743 */, 19 },
-  /* 8046 */  { MAD_F(0x04eb97ae) /* 0.307517702 */, 19 },
-  /* 8047 */  { MAD_F(0x04ebcd1e) /* 0.307568663 */, 19 },
-
-  /* 8048 */  { MAD_F(0x04ec028e) /* 0.307619626 */, 19 },
-  /* 8049 */  { MAD_F(0x04ec37ff) /* 0.307670591 */, 19 },
-  /* 8050 */  { MAD_F(0x04ec6d71) /* 0.307721558 */, 19 },
-  /* 8051 */  { MAD_F(0x04eca2e3) /* 0.307772528 */, 19 },
-  /* 8052 */  { MAD_F(0x04ecd855) /* 0.307823499 */, 19 },
-  /* 8053 */  { MAD_F(0x04ed0dc8) /* 0.307874473 */, 19 },
-  /* 8054 */  { MAD_F(0x04ed433c) /* 0.307925449 */, 19 },
-  /* 8055 */  { MAD_F(0x04ed78b0) /* 0.307976426 */, 19 },
-  /* 8056 */  { MAD_F(0x04edae25) /* 0.308027406 */, 19 },
-  /* 8057 */  { MAD_F(0x04ede39a) /* 0.308078389 */, 19 },
-  /* 8058 */  { MAD_F(0x04ee1910) /* 0.308129373 */, 19 },
-  /* 8059 */  { MAD_F(0x04ee4e87) /* 0.308180359 */, 19 },
-  /* 8060 */  { MAD_F(0x04ee83fe) /* 0.308231347 */, 19 },
-  /* 8061 */  { MAD_F(0x04eeb976) /* 0.308282338 */, 19 },
-  /* 8062 */  { MAD_F(0x04eeeeee) /* 0.308333331 */, 19 },
-  /* 8063 */  { MAD_F(0x04ef2467) /* 0.308384325 */, 19 },
-
-  /* 8064 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 19 },
-  /* 8065 */  { MAD_F(0x04ef8f5a) /* 0.308486321 */, 19 },
-  /* 8066 */  { MAD_F(0x04efc4d5) /* 0.308537322 */, 19 },
-  /* 8067 */  { MAD_F(0x04effa50) /* 0.308588325 */, 19 },
-  /* 8068 */  { MAD_F(0x04f02fcb) /* 0.308639331 */, 19 },
-  /* 8069 */  { MAD_F(0x04f06547) /* 0.308690338 */, 19 },
-  /* 8070 */  { MAD_F(0x04f09ac4) /* 0.308741348 */, 19 },
-  /* 8071 */  { MAD_F(0x04f0d041) /* 0.308792359 */, 19 },
-  /* 8072 */  { MAD_F(0x04f105bf) /* 0.308843373 */, 19 },
-  /* 8073 */  { MAD_F(0x04f13b3e) /* 0.308894389 */, 19 },
-  /* 8074 */  { MAD_F(0x04f170bd) /* 0.308945407 */, 19 },
-  /* 8075 */  { MAD_F(0x04f1a63c) /* 0.308996427 */, 19 },
-  /* 8076 */  { MAD_F(0x04f1dbbd) /* 0.309047449 */, 19 },
-  /* 8077 */  { MAD_F(0x04f2113d) /* 0.309098473 */, 19 },
-  /* 8078 */  { MAD_F(0x04f246bf) /* 0.309149499 */, 19 },
-  /* 8079 */  { MAD_F(0x04f27c40) /* 0.309200528 */, 19 },
-
-  /* 8080 */  { MAD_F(0x04f2b1c3) /* 0.309251558 */, 19 },
-  /* 8081 */  { MAD_F(0x04f2e746) /* 0.309302591 */, 19 },
-  /* 8082 */  { MAD_F(0x04f31cc9) /* 0.309353626 */, 19 },
-  /* 8083 */  { MAD_F(0x04f3524d) /* 0.309404663 */, 19 },
-  /* 8084 */  { MAD_F(0x04f387d2) /* 0.309455702 */, 19 },
-  /* 8085 */  { MAD_F(0x04f3bd57) /* 0.309506743 */, 19 },
-  /* 8086 */  { MAD_F(0x04f3f2dd) /* 0.309557786 */, 19 },
-  /* 8087 */  { MAD_F(0x04f42864) /* 0.309608831 */, 19 },
-  /* 8088 */  { MAD_F(0x04f45dea) /* 0.309659879 */, 19 },
-  /* 8089 */  { MAD_F(0x04f49372) /* 0.309710928 */, 19 },
-  /* 8090 */  { MAD_F(0x04f4c8fa) /* 0.309761980 */, 19 },
-  /* 8091 */  { MAD_F(0x04f4fe83) /* 0.309813033 */, 19 },
-  /* 8092 */  { MAD_F(0x04f5340c) /* 0.309864089 */, 19 },
-  /* 8093 */  { MAD_F(0x04f56996) /* 0.309915147 */, 19 },
-  /* 8094 */  { MAD_F(0x04f59f20) /* 0.309966207 */, 19 },
-  /* 8095 */  { MAD_F(0x04f5d4ab) /* 0.310017269 */, 19 },
-
-  /* 8096 */  { MAD_F(0x04f60a36) /* 0.310068333 */, 19 },
-  /* 8097 */  { MAD_F(0x04f63fc2) /* 0.310119400 */, 19 },
-  /* 8098 */  { MAD_F(0x04f6754f) /* 0.310170468 */, 19 },
-  /* 8099 */  { MAD_F(0x04f6aadc) /* 0.310221539 */, 19 },
-  /* 8100 */  { MAD_F(0x04f6e06a) /* 0.310272611 */, 19 },
-  /* 8101 */  { MAD_F(0x04f715f8) /* 0.310323686 */, 19 },
-  /* 8102 */  { MAD_F(0x04f74b87) /* 0.310374763 */, 19 },
-  /* 8103 */  { MAD_F(0x04f78116) /* 0.310425842 */, 19 },
-  /* 8104 */  { MAD_F(0x04f7b6a6) /* 0.310476923 */, 19 },
-  /* 8105 */  { MAD_F(0x04f7ec37) /* 0.310528006 */, 19 },
-  /* 8106 */  { MAD_F(0x04f821c8) /* 0.310579091 */, 19 },
-  /* 8107 */  { MAD_F(0x04f85759) /* 0.310630179 */, 19 },
-  /* 8108 */  { MAD_F(0x04f88cec) /* 0.310681268 */, 19 },
-  /* 8109 */  { MAD_F(0x04f8c27e) /* 0.310732360 */, 19 },
-  /* 8110 */  { MAD_F(0x04f8f812) /* 0.310783453 */, 19 },
-  /* 8111 */  { MAD_F(0x04f92da6) /* 0.310834549 */, 19 },
-
-  /* 8112 */  { MAD_F(0x04f9633a) /* 0.310885647 */, 19 },
-  /* 8113 */  { MAD_F(0x04f998cf) /* 0.310936747 */, 19 },
-  /* 8114 */  { MAD_F(0x04f9ce65) /* 0.310987849 */, 19 },
-  /* 8115 */  { MAD_F(0x04fa03fb) /* 0.311038953 */, 19 },
-  /* 8116 */  { MAD_F(0x04fa3992) /* 0.311090059 */, 19 },
-  /* 8117 */  { MAD_F(0x04fa6f29) /* 0.311141168 */, 19 },
-  /* 8118 */  { MAD_F(0x04faa4c1) /* 0.311192278 */, 19 },
-  /* 8119 */  { MAD_F(0x04fada59) /* 0.311243390 */, 19 },
-  /* 8120 */  { MAD_F(0x04fb0ff2) /* 0.311294505 */, 19 },
-  /* 8121 */  { MAD_F(0x04fb458c) /* 0.311345622 */, 19 },
-  /* 8122 */  { MAD_F(0x04fb7b26) /* 0.311396741 */, 19 },
-  /* 8123 */  { MAD_F(0x04fbb0c1) /* 0.311447862 */, 19 },
-  /* 8124 */  { MAD_F(0x04fbe65c) /* 0.311498985 */, 19 },
-  /* 8125 */  { MAD_F(0x04fc1bf8) /* 0.311550110 */, 19 },
-  /* 8126 */  { MAD_F(0x04fc5194) /* 0.311601237 */, 19 },
-  /* 8127 */  { MAD_F(0x04fc8731) /* 0.311652366 */, 19 },
-
-  /* 8128 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 19 },
-  /* 8129 */  { MAD_F(0x04fcf26c) /* 0.311754631 */, 19 },
-  /* 8130 */  { MAD_F(0x04fd280b) /* 0.311805767 */, 19 },
-  /* 8131 */  { MAD_F(0x04fd5daa) /* 0.311856905 */, 19 },
-  /* 8132 */  { MAD_F(0x04fd934a) /* 0.311908044 */, 19 },
-  /* 8133 */  { MAD_F(0x04fdc8ea) /* 0.311959186 */, 19 },
-  /* 8134 */  { MAD_F(0x04fdfe8b) /* 0.312010330 */, 19 },
-  /* 8135 */  { MAD_F(0x04fe342c) /* 0.312061476 */, 19 },
-  /* 8136 */  { MAD_F(0x04fe69ce) /* 0.312112625 */, 19 },
-  /* 8137 */  { MAD_F(0x04fe9f71) /* 0.312163775 */, 19 },
-  /* 8138 */  { MAD_F(0x04fed514) /* 0.312214927 */, 19 },
-  /* 8139 */  { MAD_F(0x04ff0ab8) /* 0.312266082 */, 19 },
-  /* 8140 */  { MAD_F(0x04ff405c) /* 0.312317238 */, 19 },
-  /* 8141 */  { MAD_F(0x04ff7601) /* 0.312368397 */, 19 },
-  /* 8142 */  { MAD_F(0x04ffaba6) /* 0.312419558 */, 19 },
-  /* 8143 */  { MAD_F(0x04ffe14c) /* 0.312470720 */, 19 },
-
-  /* 8144 */  { MAD_F(0x050016f3) /* 0.312521885 */, 19 },
-  /* 8145 */  { MAD_F(0x05004c9a) /* 0.312573052 */, 19 },
-  /* 8146 */  { MAD_F(0x05008241) /* 0.312624222 */, 19 },
-  /* 8147 */  { MAD_F(0x0500b7e9) /* 0.312675393 */, 19 },
-  /* 8148 */  { MAD_F(0x0500ed92) /* 0.312726566 */, 19 },
-  /* 8149 */  { MAD_F(0x0501233b) /* 0.312777742 */, 19 },
-  /* 8150 */  { MAD_F(0x050158e5) /* 0.312828919 */, 19 },
-  /* 8151 */  { MAD_F(0x05018e90) /* 0.312880099 */, 19 },
-  /* 8152 */  { MAD_F(0x0501c43b) /* 0.312931280 */, 19 },
-  /* 8153 */  { MAD_F(0x0501f9e6) /* 0.312982464 */, 19 },
-  /* 8154 */  { MAD_F(0x05022f92) /* 0.313033650 */, 19 },
-  /* 8155 */  { MAD_F(0x0502653f) /* 0.313084838 */, 19 },
-  /* 8156 */  { MAD_F(0x05029aec) /* 0.313136028 */, 19 },
-  /* 8157 */  { MAD_F(0x0502d09a) /* 0.313187220 */, 19 },
-  /* 8158 */  { MAD_F(0x05030648) /* 0.313238414 */, 19 },
-  /* 8159 */  { MAD_F(0x05033bf7) /* 0.313289611 */, 19 },
-
-  /* 8160 */  { MAD_F(0x050371a7) /* 0.313340809 */, 19 },
-  /* 8161 */  { MAD_F(0x0503a757) /* 0.313392010 */, 19 },
-  /* 8162 */  { MAD_F(0x0503dd07) /* 0.313443212 */, 19 },
-  /* 8163 */  { MAD_F(0x050412b9) /* 0.313494417 */, 19 },
-  /* 8164 */  { MAD_F(0x0504486a) /* 0.313545624 */, 19 },
-  /* 8165 */  { MAD_F(0x05047e1d) /* 0.313596833 */, 19 },
-  /* 8166 */  { MAD_F(0x0504b3cf) /* 0.313648044 */, 19 },
-  /* 8167 */  { MAD_F(0x0504e983) /* 0.313699257 */, 19 },
-  /* 8168 */  { MAD_F(0x05051f37) /* 0.313750472 */, 19 },
-  /* 8169 */  { MAD_F(0x050554eb) /* 0.313801689 */, 19 },
-  /* 8170 */  { MAD_F(0x05058aa0) /* 0.313852909 */, 19 },
-  /* 8171 */  { MAD_F(0x0505c056) /* 0.313904130 */, 19 },
-  /* 8172 */  { MAD_F(0x0505f60c) /* 0.313955354 */, 19 },
-  /* 8173 */  { MAD_F(0x05062bc3) /* 0.314006579 */, 19 },
-  /* 8174 */  { MAD_F(0x0506617a) /* 0.314057807 */, 19 },
-  /* 8175 */  { MAD_F(0x05069732) /* 0.314109037 */, 19 },
-
-  /* 8176 */  { MAD_F(0x0506cceb) /* 0.314160269 */, 19 },
-  /* 8177 */  { MAD_F(0x050702a4) /* 0.314211502 */, 19 },
-  /* 8178 */  { MAD_F(0x0507385d) /* 0.314262739 */, 19 },
-  /* 8179 */  { MAD_F(0x05076e17) /* 0.314313977 */, 19 },
-  /* 8180 */  { MAD_F(0x0507a3d2) /* 0.314365217 */, 19 },
-  /* 8181 */  { MAD_F(0x0507d98d) /* 0.314416459 */, 19 },
-  /* 8182 */  { MAD_F(0x05080f49) /* 0.314467704 */, 19 },
-  /* 8183 */  { MAD_F(0x05084506) /* 0.314518950 */, 19 },
-  /* 8184 */  { MAD_F(0x05087ac2) /* 0.314570199 */, 19 },
-  /* 8185 */  { MAD_F(0x0508b080) /* 0.314621449 */, 19 },
-  /* 8186 */  { MAD_F(0x0508e63e) /* 0.314672702 */, 19 },
-  /* 8187 */  { MAD_F(0x05091bfd) /* 0.314723957 */, 19 },
-  /* 8188 */  { MAD_F(0x050951bc) /* 0.314775214 */, 19 },
-  /* 8189 */  { MAD_F(0x0509877c) /* 0.314826473 */, 19 },
-  /* 8190 */  { MAD_F(0x0509bd3c) /* 0.314877734 */, 19 },
-  /* 8191 */  { MAD_F(0x0509f2fd) /* 0.314928997 */, 19 },
-
-  /* 8192 */  { MAD_F(0x050a28be) /* 0.314980262 */, 19 },
-  /* 8193 */  { MAD_F(0x050a5e80) /* 0.315031530 */, 19 },
-  /* 8194 */  { MAD_F(0x050a9443) /* 0.315082799 */, 19 },
-  /* 8195 */  { MAD_F(0x050aca06) /* 0.315134071 */, 19 },
-  /* 8196 */  { MAD_F(0x050affc9) /* 0.315185344 */, 19 },
-  /* 8197 */  { MAD_F(0x050b358e) /* 0.315236620 */, 19 },
-  /* 8198 */  { MAD_F(0x050b6b52) /* 0.315287898 */, 19 },
-  /* 8199 */  { MAD_F(0x050ba118) /* 0.315339178 */, 19 },
-  /* 8200 */  { MAD_F(0x050bd6de) /* 0.315390460 */, 19 },
-  /* 8201 */  { MAD_F(0x050c0ca4) /* 0.315441744 */, 19 },
-  /* 8202 */  { MAD_F(0x050c426b) /* 0.315493030 */, 19 },
-  /* 8203 */  { MAD_F(0x050c7833) /* 0.315544318 */, 19 },
-  /* 8204 */  { MAD_F(0x050cadfb) /* 0.315595608 */, 19 },
-  /* 8205 */  { MAD_F(0x050ce3c4) /* 0.315646901 */, 19 },
-  /* 8206 */  { MAD_F(0x050d198d) /* 0.315698195 */, 19 }
diff --git a/code/libmad-0.15.1b/sf_table.dat b/code/libmad-0.15.1b/sf_table.dat
deleted file mode 100644
index db1484a0..00000000
--- a/code/libmad-0.15.1b/sf_table.dat
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: sf_table.dat,v 1.7 2004/01/23 09:41:33 rob Exp $
- */
-
-/*
- * These are the scalefactor values for Layer I and Layer II.
- * The values are from Table B.1 of ISO/IEC 11172-3.
- *
- * There is some error introduced by the 32-bit fixed-point representation;
- * the amount of error is shown. For 16-bit PCM output, this shouldn't be
- * too much of a problem.
- *
- * Strictly speaking, Table B.1 has only 63 entries (0-62), thus a strict
- * interpretation of ISO/IEC 11172-3 would suggest that a scalefactor index of
- * 63 is invalid. However, for better compatibility with current practices, we
- * add a 64th entry.
- */
-
-  MAD_F(0x20000000),  /* 2.000000000000 => 2.000000000000, e  0.000000000000 */
-  MAD_F(0x1965fea5),  /* 1.587401051968 => 1.587401051074, e  0.000000000894 */
-  MAD_F(0x1428a2fa),  /* 1.259921049895 => 1.259921051562, e -0.000000001667 */
-  MAD_F(0x10000000),  /* 1.000000000000 => 1.000000000000, e  0.000000000000 */
-  MAD_F(0x0cb2ff53),  /* 0.793700525984 => 0.793700527400, e -0.000000001416 */
-  MAD_F(0x0a14517d),  /* 0.629960524947 => 0.629960525781, e -0.000000000833 */
-  MAD_F(0x08000000),  /* 0.500000000000 => 0.500000000000, e  0.000000000000 */
-  MAD_F(0x06597fa9),  /* 0.396850262992 => 0.396850261837, e  0.000000001155 */
-
-  MAD_F(0x050a28be),  /* 0.314980262474 => 0.314980261028, e  0.000000001446 */
-  MAD_F(0x04000000),  /* 0.250000000000 => 0.250000000000, e  0.000000000000 */
-  MAD_F(0x032cbfd5),  /* 0.198425131496 => 0.198425132781, e -0.000000001285 */
-  MAD_F(0x0285145f),  /* 0.157490131237 => 0.157490130514, e  0.000000000723 */
-  MAD_F(0x02000000),  /* 0.125000000000 => 0.125000000000, e  0.000000000000 */
-  MAD_F(0x01965fea),  /* 0.099212565748 => 0.099212564528, e  0.000000001220 */
-  MAD_F(0x01428a30),  /* 0.078745065618 => 0.078745067120, e -0.000000001501 */
-  MAD_F(0x01000000),  /* 0.062500000000 => 0.062500000000, e  0.000000000000 */
-
-  MAD_F(0x00cb2ff5),  /* 0.049606282874 => 0.049606282264, e  0.000000000610 */
-  MAD_F(0x00a14518),  /* 0.039372532809 => 0.039372533560, e -0.000000000751 */
-  MAD_F(0x00800000),  /* 0.031250000000 => 0.031250000000, e  0.000000000000 */
-  MAD_F(0x006597fb),  /* 0.024803141437 => 0.024803142995, e -0.000000001558 */
-  MAD_F(0x0050a28c),  /* 0.019686266405 => 0.019686266780, e -0.000000000375 */
-  MAD_F(0x00400000),  /* 0.015625000000 => 0.015625000000, e  0.000000000000 */
-  MAD_F(0x0032cbfd),  /* 0.012401570719 => 0.012401569635, e  0.000000001084 */
-  MAD_F(0x00285146),  /* 0.009843133202 => 0.009843133390, e -0.000000000188 */
-
-  MAD_F(0x00200000),  /* 0.007812500000 => 0.007812500000, e  0.000000000000 */
-  MAD_F(0x001965ff),  /* 0.006200785359 => 0.006200786680, e -0.000000001321 */
-  MAD_F(0x001428a3),  /* 0.004921566601 => 0.004921566695, e -0.000000000094 */
-  MAD_F(0x00100000),  /* 0.003906250000 => 0.003906250000, e  0.000000000000 */
-  MAD_F(0x000cb2ff),  /* 0.003100392680 => 0.003100391477, e  0.000000001202 */
-  MAD_F(0x000a1451),  /* 0.002460783301 => 0.002460781485, e  0.000000001816 */
-  MAD_F(0x00080000),  /* 0.001953125000 => 0.001953125000, e  0.000000000000 */
-  MAD_F(0x00065980),  /* 0.001550196340 => 0.001550197601, e -0.000000001262 */
-
-  MAD_F(0x00050a29),  /* 0.001230391650 => 0.001230392605, e -0.000000000955 */
-  MAD_F(0x00040000),  /* 0.000976562500 => 0.000976562500, e  0.000000000000 */
-  MAD_F(0x00032cc0),  /* 0.000775098170 => 0.000775098801, e -0.000000000631 */
-  MAD_F(0x00028514),  /* 0.000615195825 => 0.000615194440, e  0.000000001385 */
-  MAD_F(0x00020000),  /* 0.000488281250 => 0.000488281250, e  0.000000000000 */
-  MAD_F(0x00019660),  /* 0.000387549085 => 0.000387549400, e -0.000000000315 */
-  MAD_F(0x0001428a),  /* 0.000307597913 => 0.000307597220, e  0.000000000693 */
-  MAD_F(0x00010000),  /* 0.000244140625 => 0.000244140625, e  0.000000000000 */
-
-  MAD_F(0x0000cb30),  /* 0.000193774542 => 0.000193774700, e -0.000000000158 */
-  MAD_F(0x0000a145),  /* 0.000153798956 => 0.000153798610, e  0.000000000346 */
-  MAD_F(0x00008000),  /* 0.000122070313 => 0.000122070313, e  0.000000000000 */
-  MAD_F(0x00006598),  /* 0.000096887271 => 0.000096887350, e -0.000000000079 */
-  MAD_F(0x000050a3),  /* 0.000076899478 => 0.000076901168, e -0.000000001689 */
-  MAD_F(0x00004000),  /* 0.000061035156 => 0.000061035156, e  0.000000000000 */
-  MAD_F(0x000032cc),  /* 0.000048443636 => 0.000048443675, e -0.000000000039 */
-  MAD_F(0x00002851),  /* 0.000038449739 => 0.000038448721, e  0.000000001018 */
-
-  MAD_F(0x00002000),  /* 0.000030517578 => 0.000030517578, e  0.000000000000 */
-  MAD_F(0x00001966),  /* 0.000024221818 => 0.000024221838, e -0.000000000020 */
-  MAD_F(0x00001429),  /* 0.000019224870 => 0.000019226223, e -0.000000001354 */
-  MAD_F(0x00001000),  /* 0.000015258789 => 0.000015258789, e -0.000000000000 */
-  MAD_F(0x00000cb3),  /* 0.000012110909 => 0.000012110919, e -0.000000000010 */
-  MAD_F(0x00000a14),  /* 0.000009612435 => 0.000009611249, e  0.000000001186 */
-  MAD_F(0x00000800),  /* 0.000007629395 => 0.000007629395, e -0.000000000000 */
-  MAD_F(0x00000659),  /* 0.000006055454 => 0.000006053597, e  0.000000001858 */
-
-  MAD_F(0x0000050a),  /* 0.000004806217 => 0.000004805624, e  0.000000000593 */
-  MAD_F(0x00000400),  /* 0.000003814697 => 0.000003814697, e  0.000000000000 */
-  MAD_F(0x0000032d),  /* 0.000003027727 => 0.000003028661, e -0.000000000934 */
-  MAD_F(0x00000285),  /* 0.000002403109 => 0.000002402812, e  0.000000000296 */
-  MAD_F(0x00000200),  /* 0.000001907349 => 0.000001907349, e -0.000000000000 */
-  MAD_F(0x00000196),  /* 0.000001513864 => 0.000001512468, e  0.000000001396 */
-  MAD_F(0x00000143),  /* 0.000001201554 => 0.000001203269, e -0.000000001714 */
-  MAD_F(0x00000000)   /* this compatibility entry is not part of Table B.1 */
diff --git a/code/libmad-0.15.1b/stream.c b/code/libmad-0.15.1b/stream.c
deleted file mode 100644
index 8bb4d6a4..00000000
--- a/code/libmad-0.15.1b/stream.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: stream.c,v 1.12 2004/02/05 09:02:39 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include <stdlib.h>
-
-# include "bit.h"
-# include "stream.h"
-
-/*
- * NAME:	stream->init()
- * DESCRIPTION:	initialize stream struct
- */
-void mad_stream_init(struct mad_stream *stream)
-{
-  stream->buffer     = 0;
-  stream->bufend     = 0;
-  stream->skiplen    = 0;
-
-  stream->sync       = 0;
-  stream->freerate   = 0;
-
-  stream->this_frame = 0;
-  stream->next_frame = 0;
-  mad_bit_init(&stream->ptr, 0);
-
-  mad_bit_init(&stream->anc_ptr, 0);
-  stream->anc_bitlen = 0;
-
-  stream->main_data  = 0;
-  stream->md_len     = 0;
-
-  stream->options    = 0;
-  stream->error      = MAD_ERROR_NONE;
-}
-
-/*
- * NAME:	stream->finish()
- * DESCRIPTION:	deallocate any dynamic memory associated with stream
- */
-void mad_stream_finish(struct mad_stream *stream)
-{
-  if (stream->main_data) {
-    free(stream->main_data);
-    stream->main_data = 0;
-  }
-
-  mad_bit_finish(&stream->anc_ptr);
-  mad_bit_finish(&stream->ptr);
-}
-
-/*
- * NAME:	stream->buffer()
- * DESCRIPTION:	set stream buffer pointers
- */
-void mad_stream_buffer(struct mad_stream *stream,
-		       unsigned char const *buffer, unsigned long length)
-{
-  stream->buffer = buffer;
-  stream->bufend = buffer + length;
-
-  stream->this_frame = buffer;
-  stream->next_frame = buffer;
-
-  stream->sync = 1;
-
-  mad_bit_init(&stream->ptr, buffer);
-}
-
-/*
- * NAME:	stream->skip()
- * DESCRIPTION:	arrange to skip bytes before the next frame
- */
-void mad_stream_skip(struct mad_stream *stream, unsigned long length)
-{
-  stream->skiplen += length;
-}
-
-/*
- * NAME:	stream->sync()
- * DESCRIPTION:	locate the next stream sync word
- */
-int mad_stream_sync(struct mad_stream *stream)
-{
-  register unsigned char const *ptr, *end;
-
-  ptr = mad_bit_nextbyte(&stream->ptr);
-  end = stream->bufend;
-
-  while (ptr < end - 1 &&
-	 !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0))
-    ++ptr;
-
-  if (end - ptr < MAD_BUFFER_GUARD)
-    return -1;
-
-  mad_bit_init(&stream->ptr, ptr);
-
-  return 0;
-}
-
-/*
- * NAME:	stream->errorstr()
- * DESCRIPTION:	return a string description of the current error condition
- */
-char const *mad_stream_errorstr(struct mad_stream const *stream)
-{
-  switch (stream->error) {
-  case MAD_ERROR_NONE:		 return "no error";
-
-  case MAD_ERROR_BUFLEN:	 return "input buffer too small (or EOF)";
-  case MAD_ERROR_BUFPTR:	 return "invalid (null) buffer pointer";
-
-  case MAD_ERROR_NOMEM:		 return "not enough memory";
-
-  case MAD_ERROR_LOSTSYNC:	 return "lost synchronization";
-  case MAD_ERROR_BADLAYER:	 return "reserved header layer value";
-  case MAD_ERROR_BADBITRATE:	 return "forbidden bitrate value";
-  case MAD_ERROR_BADSAMPLERATE:	 return "reserved sample frequency value";
-  case MAD_ERROR_BADEMPHASIS:	 return "reserved emphasis value";
-
-  case MAD_ERROR_BADCRC:	 return "CRC check failed";
-  case MAD_ERROR_BADBITALLOC:	 return "forbidden bit allocation value";
-  case MAD_ERROR_BADSCALEFACTOR: return "bad scalefactor index";
-  case MAD_ERROR_BADMODE:	 return "bad bitrate/mode combination";
-  case MAD_ERROR_BADFRAMELEN:	 return "bad frame length";
-  case MAD_ERROR_BADBIGVALUES:	 return "bad big_values count";
-  case MAD_ERROR_BADBLOCKTYPE:	 return "reserved block_type";
-  case MAD_ERROR_BADSCFSI:	 return "bad scalefactor selection info";
-  case MAD_ERROR_BADDATAPTR:	 return "bad main_data_begin pointer";
-  case MAD_ERROR_BADPART3LEN:	 return "bad audio data length";
-  case MAD_ERROR_BADHUFFTABLE:	 return "bad Huffman table select";
-  case MAD_ERROR_BADHUFFDATA:	 return "Huffman data overrun";
-  case MAD_ERROR_BADSTEREO:	 return "incompatible block_type for JS";
-  }
-
-  return 0;
-}
diff --git a/code/libmad-0.15.1b/stream.h b/code/libmad-0.15.1b/stream.h
deleted file mode 100644
index 8bff8b49..00000000
--- a/code/libmad-0.15.1b/stream.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp $
- */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-# include "bit.h"
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADMODE        = 0x0222,	/* bad bitrate/mode combination */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
diff --git a/code/libmad-0.15.1b/synth.c b/code/libmad-0.15.1b/synth.c
deleted file mode 100644
index 1d28d438..00000000
--- a/code/libmad-0.15.1b/synth.c
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: synth.c,v 1.25 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include "fixed.h"
-# include "frame.h"
-# include "synth.h"
-
-/*
- * NAME:	synth->init()
- * DESCRIPTION:	initialize synth struct
- */
-void mad_synth_init(struct mad_synth *synth)
-{
-  mad_synth_mute(synth);
-
-  synth->phase = 0;
-
-  synth->pcm.samplerate = 0;
-  synth->pcm.channels   = 0;
-  synth->pcm.length     = 0;
-}
-
-/*
- * NAME:	synth->mute()
- * DESCRIPTION:	zero all polyphase filterbank values, resetting synthesis
- */
-void mad_synth_mute(struct mad_synth *synth)
-{
-  unsigned int ch, s, v;
-
-  for (ch = 0; ch < 2; ++ch) {
-    for (s = 0; s < 16; ++s) {
-      for (v = 0; v < 8; ++v) {
-	synth->filter[ch][0][0][s][v] = synth->filter[ch][0][1][s][v] =
-	synth->filter[ch][1][0][s][v] = synth->filter[ch][1][1][s][v] = 0;
-      }
-    }
-  }
-}
-
-/*
- * An optional optimization called here the Subband Synthesis Optimization
- * (SSO) improves the performance of subband synthesis at the expense of
- * accuracy.
- *
- * The idea is to simplify 32x32->64-bit multiplication to 32x32->32 such
- * that extra scaling and rounding are not necessary. This often allows the
- * compiler to use faster 32-bit multiply-accumulate instructions instead of
- * explicit 64-bit multiply, shift, and add instructions.
- *
- * SSO works like this: a full 32x32->64-bit multiply of two mad_fixed_t
- * values requires the result to be right-shifted 28 bits to be properly
- * scaled to the same fixed-point format. Right shifts can be applied at any
- * time to either operand or to the result, so the optimization involves
- * careful placement of these shifts to minimize the loss of accuracy.
- *
- * First, a 14-bit shift is applied with rounding at compile-time to the D[]
- * table of coefficients for the subband synthesis window. This only loses 2
- * bits of accuracy because the lower 12 bits are always zero. A second
- * 12-bit shift occurs after the DCT calculation. This loses 12 bits of
- * accuracy. Finally, a third 2-bit shift occurs just before the sample is
- * saved in the PCM buffer. 14 + 12 + 2 == 28 bits.
- */
-
-/* FPM_DEFAULT without OPT_SSO will actually lose accuracy and performance */
-
-# if defined(FPM_DEFAULT) && !defined(OPT_SSO)
-#  define OPT_SSO
-# endif
-
-/* second SSO shift, with rounding */
-
-# if defined(OPT_SSO)
-#  define SHIFT(x)  (((x) + (1L << 11)) >> 12)
-# else
-#  define SHIFT(x)  (x)
-# endif
-
-/* possible DCT speed optimization */
-
-# if defined(OPT_SPEED) && defined(MAD_F_MLX)
-#  define OPT_DCTO
-#  define MUL(x, y)  \
-    ({ mad_fixed64hi_t hi;  \
-       mad_fixed64lo_t lo;  \
-       MAD_F_MLX(hi, lo, (x), (y));  \
-       hi << (32 - MAD_F_SCALEBITS - 3);  \
-    })
-# else
-#  undef OPT_DCTO
-#  define MUL(x, y)  mad_f_mul((x), (y))
-# endif
-
-/*
- * NAME:	dct32()
- * DESCRIPTION:	perform fast in[32]->out[32] DCT
- */
-static
-void dct32(mad_fixed_t const in[32], unsigned int slot,
-	   mad_fixed_t lo[16][8], mad_fixed_t hi[16][8])
-{
-  mad_fixed_t t0,   t1,   t2,   t3,   t4,   t5,   t6,   t7;
-  mad_fixed_t t8,   t9,   t10,  t11,  t12,  t13,  t14,  t15;
-  mad_fixed_t t16,  t17,  t18,  t19,  t20,  t21,  t22,  t23;
-  mad_fixed_t t24,  t25,  t26,  t27,  t28,  t29,  t30,  t31;
-  mad_fixed_t t32,  t33,  t34,  t35,  t36,  t37,  t38,  t39;
-  mad_fixed_t t40,  t41,  t42,  t43,  t44,  t45,  t46,  t47;
-  mad_fixed_t t48,  t49,  t50,  t51,  t52,  t53,  t54,  t55;
-  mad_fixed_t t56,  t57,  t58,  t59,  t60,  t61,  t62,  t63;
-  mad_fixed_t t64,  t65,  t66,  t67,  t68,  t69,  t70,  t71;
-  mad_fixed_t t72,  t73,  t74,  t75,  t76,  t77,  t78,  t79;
-  mad_fixed_t t80,  t81,  t82,  t83,  t84,  t85,  t86,  t87;
-  mad_fixed_t t88,  t89,  t90,  t91,  t92,  t93,  t94,  t95;
-  mad_fixed_t t96,  t97,  t98,  t99,  t100, t101, t102, t103;
-  mad_fixed_t t104, t105, t106, t107, t108, t109, t110, t111;
-  mad_fixed_t t112, t113, t114, t115, t116, t117, t118, t119;
-  mad_fixed_t t120, t121, t122, t123, t124, t125, t126, t127;
-  mad_fixed_t t128, t129, t130, t131, t132, t133, t134, t135;
-  mad_fixed_t t136, t137, t138, t139, t140, t141, t142, t143;
-  mad_fixed_t t144, t145, t146, t147, t148, t149, t150, t151;
-  mad_fixed_t t152, t153, t154, t155, t156, t157, t158, t159;
-  mad_fixed_t t160, t161, t162, t163, t164, t165, t166, t167;
-  mad_fixed_t t168, t169, t170, t171, t172, t173, t174, t175;
-  mad_fixed_t t176;
-
-  /* costab[i] = cos(PI / (2 * 32) * i) */
-
-# if defined(OPT_DCTO)
-#  define costab1	MAD_F(0x7fd8878e)
-#  define costab2	MAD_F(0x7f62368f)
-#  define costab3	MAD_F(0x7e9d55fc)
-#  define costab4	MAD_F(0x7d8a5f40)
-#  define costab5	MAD_F(0x7c29fbee)
-#  define costab6	MAD_F(0x7a7d055b)
-#  define costab7	MAD_F(0x78848414)
-#  define costab8	MAD_F(0x7641af3d)
-#  define costab9	MAD_F(0x73b5ebd1)
-#  define costab10	MAD_F(0x70e2cbc6)
-#  define costab11	MAD_F(0x6dca0d14)
-#  define costab12	MAD_F(0x6a6d98a4)
-#  define costab13	MAD_F(0x66cf8120)
-#  define costab14	MAD_F(0x62f201ac)
-#  define costab15	MAD_F(0x5ed77c8a)
-#  define costab16	MAD_F(0x5a82799a)
-#  define costab17	MAD_F(0x55f5a4d2)
-#  define costab18	MAD_F(0x5133cc94)
-#  define costab19	MAD_F(0x4c3fdff4)
-#  define costab20	MAD_F(0x471cece7)
-#  define costab21	MAD_F(0x41ce1e65)
-#  define costab22	MAD_F(0x3c56ba70)
-#  define costab23	MAD_F(0x36ba2014)
-#  define costab24	MAD_F(0x30fbc54d)
-#  define costab25	MAD_F(0x2b1f34eb)
-#  define costab26	MAD_F(0x25280c5e)
-#  define costab27	MAD_F(0x1f19f97b)
-#  define costab28	MAD_F(0x18f8b83c)
-#  define costab29	MAD_F(0x12c8106f)
-#  define costab30	MAD_F(0x0c8bd35e)
-#  define costab31	MAD_F(0x0647d97c)
-# else
-#  define costab1	MAD_F(0x0ffb10f2)  /* 0.998795456 */
-#  define costab2	MAD_F(0x0fec46d2)  /* 0.995184727 */
-#  define costab3	MAD_F(0x0fd3aac0)  /* 0.989176510 */
-#  define costab4	MAD_F(0x0fb14be8)  /* 0.980785280 */
-#  define costab5	MAD_F(0x0f853f7e)  /* 0.970031253 */
-#  define costab6	MAD_F(0x0f4fa0ab)  /* 0.956940336 */
-#  define costab7	MAD_F(0x0f109082)  /* 0.941544065 */
-#  define costab8	MAD_F(0x0ec835e8)  /* 0.923879533 */
-#  define costab9	MAD_F(0x0e76bd7a)  /* 0.903989293 */
-#  define costab10	MAD_F(0x0e1c5979)  /* 0.881921264 */
-#  define costab11	MAD_F(0x0db941a3)  /* 0.857728610 */
-#  define costab12	MAD_F(0x0d4db315)  /* 0.831469612 */
-#  define costab13	MAD_F(0x0cd9f024)  /* 0.803207531 */
-#  define costab14	MAD_F(0x0c5e4036)  /* 0.773010453 */
-#  define costab15	MAD_F(0x0bdaef91)  /* 0.740951125 */
-#  define costab16	MAD_F(0x0b504f33)  /* 0.707106781 */
-#  define costab17	MAD_F(0x0abeb49a)  /* 0.671558955 */
-#  define costab18	MAD_F(0x0a267993)  /* 0.634393284 */
-#  define costab19	MAD_F(0x0987fbfe)  /* 0.595699304 */
-#  define costab20	MAD_F(0x08e39d9d)  /* 0.555570233 */
-#  define costab21	MAD_F(0x0839c3cd)  /* 0.514102744 */
-#  define costab22	MAD_F(0x078ad74e)  /* 0.471396737 */
-#  define costab23	MAD_F(0x06d74402)  /* 0.427555093 */
-#  define costab24	MAD_F(0x061f78aa)  /* 0.382683432 */
-#  define costab25	MAD_F(0x0563e69d)  /* 0.336889853 */
-#  define costab26	MAD_F(0x04a5018c)  /* 0.290284677 */
-#  define costab27	MAD_F(0x03e33f2f)  /* 0.242980180 */
-#  define costab28	MAD_F(0x031f1708)  /* 0.195090322 */
-#  define costab29	MAD_F(0x0259020e)  /* 0.146730474 */
-#  define costab30	MAD_F(0x01917a6c)  /* 0.098017140 */
-#  define costab31	MAD_F(0x00c8fb30)  /* 0.049067674 */
-# endif
-
-  t0   = in[0]  + in[31];  t16  = MUL(in[0]  - in[31], costab1);
-  t1   = in[15] + in[16];  t17  = MUL(in[15] - in[16], costab31);
-
-  t41  = t16 + t17;
-  t59  = MUL(t16 - t17, costab2);
-  t33  = t0  + t1;
-  t50  = MUL(t0  - t1,  costab2);
-
-  t2   = in[7]  + in[24];  t18  = MUL(in[7]  - in[24], costab15);
-  t3   = in[8]  + in[23];  t19  = MUL(in[8]  - in[23], costab17);
-
-  t42  = t18 + t19;
-  t60  = MUL(t18 - t19, costab30);
-  t34  = t2  + t3;
-  t51  = MUL(t2  - t3,  costab30);
-
-  t4   = in[3]  + in[28];  t20  = MUL(in[3]  - in[28], costab7);
-  t5   = in[12] + in[19];  t21  = MUL(in[12] - in[19], costab25);
-
-  t43  = t20 + t21;
-  t61  = MUL(t20 - t21, costab14);
-  t35  = t4  + t5;
-  t52  = MUL(t4  - t5,  costab14);
-
-  t6   = in[4]  + in[27];  t22  = MUL(in[4]  - in[27], costab9);
-  t7   = in[11] + in[20];  t23  = MUL(in[11] - in[20], costab23);
-
-  t44  = t22 + t23;
-  t62  = MUL(t22 - t23, costab18);
-  t36  = t6  + t7;
-  t53  = MUL(t6  - t7,  costab18);
-
-  t8   = in[1]  + in[30];  t24  = MUL(in[1]  - in[30], costab3);
-  t9   = in[14] + in[17];  t25  = MUL(in[14] - in[17], costab29);
-
-  t45  = t24 + t25;
-  t63  = MUL(t24 - t25, costab6);
-  t37  = t8  + t9;
-  t54  = MUL(t8  - t9,  costab6);
-
-  t10  = in[6]  + in[25];  t26  = MUL(in[6]  - in[25], costab13);
-  t11  = in[9]  + in[22];  t27  = MUL(in[9]  - in[22], costab19);
-
-  t46  = t26 + t27;
-  t64  = MUL(t26 - t27, costab26);
-  t38  = t10 + t11;
-  t55  = MUL(t10 - t11, costab26);
-
-  t12  = in[2]  + in[29];  t28  = MUL(in[2]  - in[29], costab5);
-  t13  = in[13] + in[18];  t29  = MUL(in[13] - in[18], costab27);
-
-  t47  = t28 + t29;
-  t65  = MUL(t28 - t29, costab10);
-  t39  = t12 + t13;
-  t56  = MUL(t12 - t13, costab10);
-
-  t14  = in[5]  + in[26];  t30  = MUL(in[5]  - in[26], costab11);
-  t15  = in[10] + in[21];  t31  = MUL(in[10] - in[21], costab21);
-
-  t48  = t30 + t31;
-  t66  = MUL(t30 - t31, costab22);
-  t40  = t14 + t15;
-  t57  = MUL(t14 - t15, costab22);
-
-  t69  = t33 + t34;  t89  = MUL(t33 - t34, costab4);
-  t70  = t35 + t36;  t90  = MUL(t35 - t36, costab28);
-  t71  = t37 + t38;  t91  = MUL(t37 - t38, costab12);
-  t72  = t39 + t40;  t92  = MUL(t39 - t40, costab20);
-  t73  = t41 + t42;  t94  = MUL(t41 - t42, costab4);
-  t74  = t43 + t44;  t95  = MUL(t43 - t44, costab28);
-  t75  = t45 + t46;  t96  = MUL(t45 - t46, costab12);
-  t76  = t47 + t48;  t97  = MUL(t47 - t48, costab20);
-
-  t78  = t50 + t51;  t100 = MUL(t50 - t51, costab4);
-  t79  = t52 + t53;  t101 = MUL(t52 - t53, costab28);
-  t80  = t54 + t55;  t102 = MUL(t54 - t55, costab12);
-  t81  = t56 + t57;  t103 = MUL(t56 - t57, costab20);
-
-  t83  = t59 + t60;  t106 = MUL(t59 - t60, costab4);
-  t84  = t61 + t62;  t107 = MUL(t61 - t62, costab28);
-  t85  = t63 + t64;  t108 = MUL(t63 - t64, costab12);
-  t86  = t65 + t66;  t109 = MUL(t65 - t66, costab20);
-
-  t113 = t69  + t70;
-  t114 = t71  + t72;
-
-  /*  0 */ hi[15][slot] = SHIFT(t113 + t114);
-  /* 16 */ lo[ 0][slot] = SHIFT(MUL(t113 - t114, costab16));
-
-  t115 = t73  + t74;
-  t116 = t75  + t76;
-
-  t32  = t115 + t116;
-
-  /*  1 */ hi[14][slot] = SHIFT(t32);
-
-  t118 = t78  + t79;
-  t119 = t80  + t81;
-
-  t58  = t118 + t119;
-
-  /*  2 */ hi[13][slot] = SHIFT(t58);
-
-  t121 = t83  + t84;
-  t122 = t85  + t86;
-
-  t67  = t121 + t122;
-
-  t49  = (t67 * 2) - t32;
-
-  /*  3 */ hi[12][slot] = SHIFT(t49);
-
-  t125 = t89  + t90;
-  t126 = t91  + t92;
-
-  t93  = t125 + t126;
-
-  /*  4 */ hi[11][slot] = SHIFT(t93);
-
-  t128 = t94  + t95;
-  t129 = t96  + t97;
-
-  t98  = t128 + t129;
-
-  t68  = (t98 * 2) - t49;
-
-  /*  5 */ hi[10][slot] = SHIFT(t68);
-
-  t132 = t100 + t101;
-  t133 = t102 + t103;
-
-  t104 = t132 + t133;
-
-  t82  = (t104 * 2) - t58;
-
-  /*  6 */ hi[ 9][slot] = SHIFT(t82);
-
-  t136 = t106 + t107;
-  t137 = t108 + t109;
-
-  t110 = t136 + t137;
-
-  t87  = (t110 * 2) - t67;
-
-  t77  = (t87 * 2) - t68;
-
-  /*  7 */ hi[ 8][slot] = SHIFT(t77);
-
-  t141 = MUL(t69 - t70, costab8);
-  t142 = MUL(t71 - t72, costab24);
-  t143 = t141 + t142;
-
-  /*  8 */ hi[ 7][slot] = SHIFT(t143);
-  /* 24 */ lo[ 8][slot] =
-	     SHIFT((MUL(t141 - t142, costab16) * 2) - t143);
-
-  t144 = MUL(t73 - t74, costab8);
-  t145 = MUL(t75 - t76, costab24);
-  t146 = t144 + t145;
-
-  t88  = (t146 * 2) - t77;
-
-  /*  9 */ hi[ 6][slot] = SHIFT(t88);
-
-  t148 = MUL(t78 - t79, costab8);
-  t149 = MUL(t80 - t81, costab24);
-  t150 = t148 + t149;
-
-  t105 = (t150 * 2) - t82;
-
-  /* 10 */ hi[ 5][slot] = SHIFT(t105);
-
-  t152 = MUL(t83 - t84, costab8);
-  t153 = MUL(t85 - t86, costab24);
-  t154 = t152 + t153;
-
-  t111 = (t154 * 2) - t87;
-
-  t99  = (t111 * 2) - t88;
-
-  /* 11 */ hi[ 4][slot] = SHIFT(t99);
-
-  t157 = MUL(t89 - t90, costab8);
-  t158 = MUL(t91 - t92, costab24);
-  t159 = t157 + t158;
-
-  t127 = (t159 * 2) - t93;
-
-  /* 12 */ hi[ 3][slot] = SHIFT(t127);
-
-  t160 = (MUL(t125 - t126, costab16) * 2) - t127;
-
-  /* 20 */ lo[ 4][slot] = SHIFT(t160);
-  /* 28 */ lo[12][slot] =
-	     SHIFT((((MUL(t157 - t158, costab16) * 2) - t159) * 2) - t160);
-
-  t161 = MUL(t94 - t95, costab8);
-  t162 = MUL(t96 - t97, costab24);
-  t163 = t161 + t162;
-
-  t130 = (t163 * 2) - t98;
-
-  t112 = (t130 * 2) - t99;
-
-  /* 13 */ hi[ 2][slot] = SHIFT(t112);
-
-  t164 = (MUL(t128 - t129, costab16) * 2) - t130;
-
-  t166 = MUL(t100 - t101, costab8);
-  t167 = MUL(t102 - t103, costab24);
-  t168 = t166 + t167;
-
-  t134 = (t168 * 2) - t104;
-
-  t120 = (t134 * 2) - t105;
-
-  /* 14 */ hi[ 1][slot] = SHIFT(t120);
-
-  t135 = (MUL(t118 - t119, costab16) * 2) - t120;
-
-  /* 18 */ lo[ 2][slot] = SHIFT(t135);
-
-  t169 = (MUL(t132 - t133, costab16) * 2) - t134;
-
-  t151 = (t169 * 2) - t135;
-
-  /* 22 */ lo[ 6][slot] = SHIFT(t151);
-
-  t170 = (((MUL(t148 - t149, costab16) * 2) - t150) * 2) - t151;
-
-  /* 26 */ lo[10][slot] = SHIFT(t170);
-  /* 30 */ lo[14][slot] =
-	     SHIFT((((((MUL(t166 - t167, costab16) * 2) -
-		       t168) * 2) - t169) * 2) - t170);
-
-  t171 = MUL(t106 - t107, costab8);
-  t172 = MUL(t108 - t109, costab24);
-  t173 = t171 + t172;
-
-  t138 = (t173 * 2) - t110;
-
-  t123 = (t138 * 2) - t111;
-
-  t139 = (MUL(t121 - t122, costab16) * 2) - t123;
-
-  t117 = (t123 * 2) - t112;
-
-  /* 15 */ hi[ 0][slot] = SHIFT(t117);
-
-  t124 = (MUL(t115 - t116, costab16) * 2) - t117;
-
-  /* 17 */ lo[ 1][slot] = SHIFT(t124);
-
-  t131 = (t139 * 2) - t124;
-
-  /* 19 */ lo[ 3][slot] = SHIFT(t131);
-
-  t140 = (t164 * 2) - t131;
-
-  /* 21 */ lo[ 5][slot] = SHIFT(t140);
-
-  t174 = (MUL(t136 - t137, costab16) * 2) - t138;
-
-  t155 = (t174 * 2) - t139;
-
-  t147 = (t155 * 2) - t140;
-
-  /* 23 */ lo[ 7][slot] = SHIFT(t147);
-
-  t156 = (((MUL(t144 - t145, costab16) * 2) - t146) * 2) - t147;
-
-  /* 25 */ lo[ 9][slot] = SHIFT(t156);
-
-  t175 = (((MUL(t152 - t153, costab16) * 2) - t154) * 2) - t155;
-
-  t165 = (t175 * 2) - t156;
-
-  /* 27 */ lo[11][slot] = SHIFT(t165);
-
-  t176 = (((((MUL(t161 - t162, costab16) * 2) -
-	     t163) * 2) - t164) * 2) - t165;
-
-  /* 29 */ lo[13][slot] = SHIFT(t176);
-  /* 31 */ lo[15][slot] =
-	     SHIFT((((((((MUL(t171 - t172, costab16) * 2) -
-			 t173) * 2) - t174) * 2) - t175) * 2) - t176);
-
-  /*
-   * Totals:
-   *  80 multiplies
-   *  80 additions
-   * 119 subtractions
-   *  49 shifts (not counting SSO)
-   */
-}
-
-# undef MUL
-# undef SHIFT
-
-/* third SSO shift and/or D[] optimization preshift */
-
-# if defined(OPT_SSO)
-#  if MAD_F_FRACBITS != 28
-#   error "MAD_F_FRACBITS must be 28 to use OPT_SSO"
-#  endif
-#  define ML0(hi, lo, x, y)	((lo)  = (x) * (y))
-#  define MLA(hi, lo, x, y)	((lo) += (x) * (y))
-#  define MLN(hi, lo)		((lo)  = -(lo))
-#  define MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-#  define SHIFT(x)		((x) >> 2)
-#  define PRESHIFT(x)		((MAD_F(x) + (1L << 13)) >> 14)
-# else
-#  define ML0(hi, lo, x, y)	MAD_F_ML0((hi), (lo), (x), (y))
-#  define MLA(hi, lo, x, y)	MAD_F_MLA((hi), (lo), (x), (y))
-#  define MLN(hi, lo)		MAD_F_MLN((hi), (lo))
-#  define MLZ(hi, lo)		MAD_F_MLZ((hi), (lo))
-#  define SHIFT(x)		(x)
-#  if defined(MAD_F_SCALEBITS)
-#   undef  MAD_F_SCALEBITS
-#   define MAD_F_SCALEBITS	(MAD_F_FRACBITS - 12)
-#   define PRESHIFT(x)		(MAD_F(x) >> 12)
-#  else
-#   define PRESHIFT(x)		MAD_F(x)
-#  endif
-# endif
-
-static
-mad_fixed_t const D[17][32] = {
-# include "D.dat"
-};
-
-# if defined(ASO_SYNTH)
-void synth_full(struct mad_synth *, struct mad_frame const *,
-		unsigned int, unsigned int);
-# else
-/*
- * NAME:	synth->full()
- * DESCRIPTION:	perform full frequency PCM synthesis
- */
-static
-void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
-		unsigned int nch, unsigned int ns)
-{
-  unsigned int phase, ch, s, sb, pe, po;
-  mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
-  mad_fixed_t const (*sbsample)[36][32];
-  register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
-  register mad_fixed_t const (*Dptr)[32], *ptr;
-  register mad_fixed64hi_t hi;
-  register mad_fixed64lo_t lo;
-
-  for (ch = 0; ch < nch; ++ch) {
-    sbsample = &frame->sbsample[ch];
-    filter   = &synth->filter[ch];
-    phase    = synth->phase;
-    pcm1     = synth->pcm.samples[ch];
-
-    for (s = 0; s < ns; ++s) {
-      dct32((*sbsample)[s], phase >> 1,
-	    (*filter)[0][phase & 1], (*filter)[1][phase & 1]);
-
-      pe = phase & ~1;
-      po = ((phase - 1) & 0xf) | 1;
-
-      /* calculate 32 samples */
-
-      fe = &(*filter)[0][ phase & 1][0];
-      fx = &(*filter)[0][~phase & 1][0];
-      fo = &(*filter)[1][~phase & 1][0];
-
-      Dptr = &D[0];
-
-      ptr = *Dptr + po;
-      ML0(hi, lo, (*fx)[0], ptr[ 0]);
-      MLA(hi, lo, (*fx)[1], ptr[14]);
-      MLA(hi, lo, (*fx)[2], ptr[12]);
-      MLA(hi, lo, (*fx)[3], ptr[10]);
-      MLA(hi, lo, (*fx)[4], ptr[ 8]);
-      MLA(hi, lo, (*fx)[5], ptr[ 6]);
-      MLA(hi, lo, (*fx)[6], ptr[ 4]);
-      MLA(hi, lo, (*fx)[7], ptr[ 2]);
-      MLN(hi, lo);
-
-      ptr = *Dptr + pe;
-      MLA(hi, lo, (*fe)[0], ptr[ 0]);
-      MLA(hi, lo, (*fe)[1], ptr[14]);
-      MLA(hi, lo, (*fe)[2], ptr[12]);
-      MLA(hi, lo, (*fe)[3], ptr[10]);
-      MLA(hi, lo, (*fe)[4], ptr[ 8]);
-      MLA(hi, lo, (*fe)[5], ptr[ 6]);
-      MLA(hi, lo, (*fe)[6], ptr[ 4]);
-      MLA(hi, lo, (*fe)[7], ptr[ 2]);
-
-      *pcm1++ = SHIFT(MLZ(hi, lo));
-
-      pcm2 = pcm1 + 30;
-
-      for (sb = 1; sb < 16; ++sb) {
-	++fe;
-	++Dptr;
-
-	/* D[32 - sb][i] == -D[sb][31 - i] */
-
-	ptr = *Dptr + po;
-	ML0(hi, lo, (*fo)[0], ptr[ 0]);
-	MLA(hi, lo, (*fo)[1], ptr[14]);
-	MLA(hi, lo, (*fo)[2], ptr[12]);
-	MLA(hi, lo, (*fo)[3], ptr[10]);
-	MLA(hi, lo, (*fo)[4], ptr[ 8]);
-	MLA(hi, lo, (*fo)[5], ptr[ 6]);
-	MLA(hi, lo, (*fo)[6], ptr[ 4]);
-	MLA(hi, lo, (*fo)[7], ptr[ 2]);
-	MLN(hi, lo);
-
-	ptr = *Dptr + pe;
-	MLA(hi, lo, (*fe)[7], ptr[ 2]);
-	MLA(hi, lo, (*fe)[6], ptr[ 4]);
-	MLA(hi, lo, (*fe)[5], ptr[ 6]);
-	MLA(hi, lo, (*fe)[4], ptr[ 8]);
-	MLA(hi, lo, (*fe)[3], ptr[10]);
-	MLA(hi, lo, (*fe)[2], ptr[12]);
-	MLA(hi, lo, (*fe)[1], ptr[14]);
-	MLA(hi, lo, (*fe)[0], ptr[ 0]);
-
-	*pcm1++ = SHIFT(MLZ(hi, lo));
-
-	ptr = *Dptr - pe;
-	ML0(hi, lo, (*fe)[0], ptr[31 - 16]);
-	MLA(hi, lo, (*fe)[1], ptr[31 - 14]);
-	MLA(hi, lo, (*fe)[2], ptr[31 - 12]);
-	MLA(hi, lo, (*fe)[3], ptr[31 - 10]);
-	MLA(hi, lo, (*fe)[4], ptr[31 -  8]);
-	MLA(hi, lo, (*fe)[5], ptr[31 -  6]);
-	MLA(hi, lo, (*fe)[6], ptr[31 -  4]);
-	MLA(hi, lo, (*fe)[7], ptr[31 -  2]);
-
-	ptr = *Dptr - po;
-	MLA(hi, lo, (*fo)[7], ptr[31 -  2]);
-	MLA(hi, lo, (*fo)[6], ptr[31 -  4]);
-	MLA(hi, lo, (*fo)[5], ptr[31 -  6]);
-	MLA(hi, lo, (*fo)[4], ptr[31 -  8]);
-	MLA(hi, lo, (*fo)[3], ptr[31 - 10]);
-	MLA(hi, lo, (*fo)[2], ptr[31 - 12]);
-	MLA(hi, lo, (*fo)[1], ptr[31 - 14]);
-	MLA(hi, lo, (*fo)[0], ptr[31 - 16]);
-
-	*pcm2-- = SHIFT(MLZ(hi, lo));
-
-	++fo;
-      }
-
-      ++Dptr;
-
-      ptr = *Dptr + po;
-      ML0(hi, lo, (*fo)[0], ptr[ 0]);
-      MLA(hi, lo, (*fo)[1], ptr[14]);
-      MLA(hi, lo, (*fo)[2], ptr[12]);
-      MLA(hi, lo, (*fo)[3], ptr[10]);
-      MLA(hi, lo, (*fo)[4], ptr[ 8]);
-      MLA(hi, lo, (*fo)[5], ptr[ 6]);
-      MLA(hi, lo, (*fo)[6], ptr[ 4]);
-      MLA(hi, lo, (*fo)[7], ptr[ 2]);
-
-      *pcm1 = SHIFT(-MLZ(hi, lo));
-      pcm1 += 16;
-
-      phase = (phase + 1) % 16;
-    }
-  }
-}
-# endif
-
-/*
- * NAME:	synth->half()
- * DESCRIPTION:	perform half frequency PCM synthesis
- */
-static
-void synth_half(struct mad_synth *synth, struct mad_frame const *frame,
-		unsigned int nch, unsigned int ns)
-{
-  unsigned int phase, ch, s, sb, pe, po;
-  mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
-  mad_fixed_t const (*sbsample)[36][32];
-  register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
-  register mad_fixed_t const (*Dptr)[32], *ptr;
-  register mad_fixed64hi_t hi;
-  register mad_fixed64lo_t lo;
-
-  for (ch = 0; ch < nch; ++ch) {
-    sbsample = &frame->sbsample[ch];
-    filter   = &synth->filter[ch];
-    phase    = synth->phase;
-    pcm1     = synth->pcm.samples[ch];
-
-    for (s = 0; s < ns; ++s) {
-      dct32((*sbsample)[s], phase >> 1,
-	    (*filter)[0][phase & 1], (*filter)[1][phase & 1]);
-
-      pe = phase & ~1;
-      po = ((phase - 1) & 0xf) | 1;
-
-      /* calculate 16 samples */
-
-      fe = &(*filter)[0][ phase & 1][0];
-      fx = &(*filter)[0][~phase & 1][0];
-      fo = &(*filter)[1][~phase & 1][0];
-
-      Dptr = &D[0];
-
-      ptr = *Dptr + po;
-      ML0(hi, lo, (*fx)[0], ptr[ 0]);
-      MLA(hi, lo, (*fx)[1], ptr[14]);
-      MLA(hi, lo, (*fx)[2], ptr[12]);
-      MLA(hi, lo, (*fx)[3], ptr[10]);
-      MLA(hi, lo, (*fx)[4], ptr[ 8]);
-      MLA(hi, lo, (*fx)[5], ptr[ 6]);
-      MLA(hi, lo, (*fx)[6], ptr[ 4]);
-      MLA(hi, lo, (*fx)[7], ptr[ 2]);
-      MLN(hi, lo);
-
-      ptr = *Dptr + pe;
-      MLA(hi, lo, (*fe)[0], ptr[ 0]);
-      MLA(hi, lo, (*fe)[1], ptr[14]);
-      MLA(hi, lo, (*fe)[2], ptr[12]);
-      MLA(hi, lo, (*fe)[3], ptr[10]);
-      MLA(hi, lo, (*fe)[4], ptr[ 8]);
-      MLA(hi, lo, (*fe)[5], ptr[ 6]);
-      MLA(hi, lo, (*fe)[6], ptr[ 4]);
-      MLA(hi, lo, (*fe)[7], ptr[ 2]);
-
-      *pcm1++ = SHIFT(MLZ(hi, lo));
-
-      pcm2 = pcm1 + 14;
-
-      for (sb = 1; sb < 16; ++sb) {
-	++fe;
-	++Dptr;
-
-	/* D[32 - sb][i] == -D[sb][31 - i] */
-
-	if (!(sb & 1)) {
-	  ptr = *Dptr + po;
-	  ML0(hi, lo, (*fo)[0], ptr[ 0]);
-	  MLA(hi, lo, (*fo)[1], ptr[14]);
-	  MLA(hi, lo, (*fo)[2], ptr[12]);
-	  MLA(hi, lo, (*fo)[3], ptr[10]);
-	  MLA(hi, lo, (*fo)[4], ptr[ 8]);
-	  MLA(hi, lo, (*fo)[5], ptr[ 6]);
-	  MLA(hi, lo, (*fo)[6], ptr[ 4]);
-	  MLA(hi, lo, (*fo)[7], ptr[ 2]);
-	  MLN(hi, lo);
-
-	  ptr = *Dptr + pe;
-	  MLA(hi, lo, (*fe)[7], ptr[ 2]);
-	  MLA(hi, lo, (*fe)[6], ptr[ 4]);
-	  MLA(hi, lo, (*fe)[5], ptr[ 6]);
-	  MLA(hi, lo, (*fe)[4], ptr[ 8]);
-	  MLA(hi, lo, (*fe)[3], ptr[10]);
-	  MLA(hi, lo, (*fe)[2], ptr[12]);
-	  MLA(hi, lo, (*fe)[1], ptr[14]);
-	  MLA(hi, lo, (*fe)[0], ptr[ 0]);
-
-	  *pcm1++ = SHIFT(MLZ(hi, lo));
-
-	  ptr = *Dptr - po;
-	  ML0(hi, lo, (*fo)[7], ptr[31 -  2]);
-	  MLA(hi, lo, (*fo)[6], ptr[31 -  4]);
-	  MLA(hi, lo, (*fo)[5], ptr[31 -  6]);
-	  MLA(hi, lo, (*fo)[4], ptr[31 -  8]);
-	  MLA(hi, lo, (*fo)[3], ptr[31 - 10]);
-	  MLA(hi, lo, (*fo)[2], ptr[31 - 12]);
-	  MLA(hi, lo, (*fo)[1], ptr[31 - 14]);
-	  MLA(hi, lo, (*fo)[0], ptr[31 - 16]);
-
-	  ptr = *Dptr - pe;
-	  MLA(hi, lo, (*fe)[0], ptr[31 - 16]);
-	  MLA(hi, lo, (*fe)[1], ptr[31 - 14]);
-	  MLA(hi, lo, (*fe)[2], ptr[31 - 12]);
-	  MLA(hi, lo, (*fe)[3], ptr[31 - 10]);
-	  MLA(hi, lo, (*fe)[4], ptr[31 -  8]);
-	  MLA(hi, lo, (*fe)[5], ptr[31 -  6]);
-	  MLA(hi, lo, (*fe)[6], ptr[31 -  4]);
-	  MLA(hi, lo, (*fe)[7], ptr[31 -  2]);
-
-	  *pcm2-- = SHIFT(MLZ(hi, lo));
-	}
-
-	++fo;
-      }
-
-      ++Dptr;
-
-      ptr = *Dptr + po;
-      ML0(hi, lo, (*fo)[0], ptr[ 0]);
-      MLA(hi, lo, (*fo)[1], ptr[14]);
-      MLA(hi, lo, (*fo)[2], ptr[12]);
-      MLA(hi, lo, (*fo)[3], ptr[10]);
-      MLA(hi, lo, (*fo)[4], ptr[ 8]);
-      MLA(hi, lo, (*fo)[5], ptr[ 6]);
-      MLA(hi, lo, (*fo)[6], ptr[ 4]);
-      MLA(hi, lo, (*fo)[7], ptr[ 2]);
-
-      *pcm1 = SHIFT(-MLZ(hi, lo));
-      pcm1 += 8;
-
-      phase = (phase + 1) % 16;
-    }
-  }
-}
-
-/*
- * NAME:	synth->frame()
- * DESCRIPTION:	perform PCM synthesis of frame subband samples
- */
-void mad_synth_frame(struct mad_synth *synth, struct mad_frame const *frame)
-{
-  unsigned int nch, ns;
-  void (*synth_frame)(struct mad_synth *, struct mad_frame const *,
-		      unsigned int, unsigned int);
-
-  nch = MAD_NCHANNELS(&frame->header);
-  ns  = MAD_NSBSAMPLES(&frame->header);
-
-  synth->pcm.samplerate = frame->header.samplerate;
-  synth->pcm.channels   = nch;
-  synth->pcm.length     = 32 * ns;
-
-  synth_frame = synth_full;
-
-  if (frame->options & MAD_OPTION_HALFSAMPLERATE) {
-    synth->pcm.samplerate /= 2;
-    synth->pcm.length     /= 2;
-
-    synth_frame = synth_half;
-  }
-
-  synth_frame(synth, frame, nch, ns);
-
-  synth->phase = (synth->phase + ns) % 16;
-}
diff --git a/code/libmad-0.15.1b/synth.h b/code/libmad-0.15.1b/synth.h
deleted file mode 100644
index 8ae4bc95..00000000
--- a/code/libmad-0.15.1b/synth.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-# include "fixed.h"
-# include "frame.h"
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
diff --git a/code/libmad-0.15.1b/timer.c b/code/libmad-0.15.1b/timer.c
deleted file mode 100644
index 4b909aba..00000000
--- a/code/libmad-0.15.1b/timer.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: timer.c,v 1.18 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include <stdio.h>
-
-# ifdef HAVE_ASSERT_H
-#  include <assert.h>
-# endif
-
-# include "timer.h"
-
-mad_timer_t const mad_timer_zero = { 0, 0 };
-
-/*
- * NAME:	timer->compare()
- * DESCRIPTION:	indicate relative order of two timers
- */
-int mad_timer_compare(mad_timer_t timer1, mad_timer_t timer2)
-{
-  signed long diff;
-
-  diff = timer1.seconds - timer2.seconds;
-  if (diff < 0)
-    return -1;
-  else if (diff > 0)
-    return +1;
-
-  diff = timer1.fraction - timer2.fraction;
-  if (diff < 0)
-    return -1;
-  else if (diff > 0)
-    return +1;
-
-  return 0;
-}
-
-/*
- * NAME:	timer->negate()
- * DESCRIPTION:	invert the sign of a timer
- */
-void mad_timer_negate(mad_timer_t *timer)
-{
-  timer->seconds = -timer->seconds;
-
-  if (timer->fraction) {
-    timer->seconds -= 1;
-    timer->fraction = MAD_TIMER_RESOLUTION - timer->fraction;
-  }
-}
-
-/*
- * NAME:	timer->abs()
- * DESCRIPTION:	return the absolute value of a timer
- */
-mad_timer_t mad_timer_abs(mad_timer_t timer)
-{
-  if (timer.seconds < 0)
-    mad_timer_negate(&timer);
-
-  return timer;
-}
-
-/*
- * NAME:	reduce_timer()
- * DESCRIPTION:	carry timer fraction into seconds
- */
-static
-void reduce_timer(mad_timer_t *timer)
-{
-  timer->seconds  += timer->fraction / MAD_TIMER_RESOLUTION;
-  timer->fraction %= MAD_TIMER_RESOLUTION;
-}
-
-/*
- * NAME:	gcd()
- * DESCRIPTION:	compute greatest common denominator
- */
-static
-unsigned long gcd(unsigned long num1, unsigned long num2)
-{
-  unsigned long tmp;
-
-  while (num2) {
-    tmp  = num2;
-    num2 = num1 % num2;
-    num1 = tmp;
-  }
-
-  return num1;
-}
-
-/*
- * NAME:	reduce_rational()
- * DESCRIPTION:	convert rational expression to lowest terms
- */
-static
-void reduce_rational(unsigned long *numer, unsigned long *denom)
-{
-  unsigned long factor;
-
-  factor = gcd(*numer, *denom);
-
-  assert(factor != 0);
-
-  *numer /= factor;
-  *denom /= factor;
-}
-
-/*
- * NAME:	scale_rational()
- * DESCRIPTION:	solve numer/denom == ?/scale avoiding overflowing
- */
-static
-unsigned long scale_rational(unsigned long numer, unsigned long denom,
-			     unsigned long scale)
-{
-  reduce_rational(&numer, &denom);
-  reduce_rational(&scale, &denom);
-
-  assert(denom != 0);
-
-  if (denom < scale)
-    return numer * (scale / denom) + numer * (scale % denom) / denom;
-  if (denom < numer)
-    return scale * (numer / denom) + scale * (numer % denom) / denom;
-
-  return numer * scale / denom;
-}
-
-/*
- * NAME:	timer->set()
- * DESCRIPTION:	set timer to specific (positive) value
- */
-void mad_timer_set(mad_timer_t *timer, unsigned long seconds,
-		   unsigned long numer, unsigned long denom)
-{
-  timer->seconds = seconds;
-  if (numer >= denom && denom > 0) {
-    timer->seconds += numer / denom;
-    numer %= denom;
-  }
-
-  switch (denom) {
-  case 0:
-  case 1:
-    timer->fraction = 0;
-    break;
-
-  case MAD_TIMER_RESOLUTION:
-    timer->fraction = numer;
-    break;
-
-  case 1000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION /  1000);
-    break;
-
-  case 8000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION /  8000);
-    break;
-
-  case 11025:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 11025);
-    break;
-
-  case 12000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 12000);
-    break;
-
-  case 16000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 16000);
-    break;
-
-  case 22050:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 22050);
-    break;
-
-  case 24000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 24000);
-    break;
-
-  case 32000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 32000);
-    break;
-
-  case 44100:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 44100);
-    break;
-
-  case 48000:
-    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 48000);
-    break;
-
-  default:
-    timer->fraction = scale_rational(numer, denom, MAD_TIMER_RESOLUTION);
-    break;
-  }
-
-  if (timer->fraction >= MAD_TIMER_RESOLUTION)
-    reduce_timer(timer);
-}
-
-/*
- * NAME:	timer->add()
- * DESCRIPTION:	add one timer to another
- */
-void mad_timer_add(mad_timer_t *timer, mad_timer_t incr)
-{
-  timer->seconds  += incr.seconds;
-  timer->fraction += incr.fraction;
-
-  if (timer->fraction >= MAD_TIMER_RESOLUTION)
-    reduce_timer(timer);
-}
-
-/*
- * NAME:	timer->multiply()
- * DESCRIPTION:	multiply a timer by a scalar value
- */
-void mad_timer_multiply(mad_timer_t *timer, signed long scalar)
-{
-  mad_timer_t addend;
-  unsigned long factor;
-
-  factor = scalar;
-  if (scalar < 0) {
-    factor = -scalar;
-    mad_timer_negate(timer);
-  }
-
-  addend = *timer;
-  *timer = mad_timer_zero;
-
-  while (factor) {
-    if (factor & 1)
-      mad_timer_add(timer, addend);
-
-    mad_timer_add(&addend, addend);
-    factor >>= 1;
-  }
-}
-
-/*
- * NAME:	timer->count()
- * DESCRIPTION:	return timer value in selected units
- */
-signed long mad_timer_count(mad_timer_t timer, enum mad_units units)
-{
-  switch (units) {
-  case MAD_UNITS_HOURS:
-    return timer.seconds / 60 / 60;
-
-  case MAD_UNITS_MINUTES:
-    return timer.seconds / 60;
-
-  case MAD_UNITS_SECONDS:
-    return timer.seconds;
-
-  case MAD_UNITS_DECISECONDS:
-  case MAD_UNITS_CENTISECONDS:
-  case MAD_UNITS_MILLISECONDS:
-
-  case MAD_UNITS_8000_HZ:
-  case MAD_UNITS_11025_HZ:
-  case MAD_UNITS_12000_HZ:
-  case MAD_UNITS_16000_HZ:
-  case MAD_UNITS_22050_HZ:
-  case MAD_UNITS_24000_HZ:
-  case MAD_UNITS_32000_HZ:
-  case MAD_UNITS_44100_HZ:
-  case MAD_UNITS_48000_HZ:
-
-  case MAD_UNITS_24_FPS:
-  case MAD_UNITS_25_FPS:
-  case MAD_UNITS_30_FPS:
-  case MAD_UNITS_48_FPS:
-  case MAD_UNITS_50_FPS:
-  case MAD_UNITS_60_FPS:
-  case MAD_UNITS_75_FPS:
-    return timer.seconds * (signed long) units +
-      (signed long) scale_rational(timer.fraction, MAD_TIMER_RESOLUTION,
-				   units);
-
-  case MAD_UNITS_23_976_FPS:
-  case MAD_UNITS_24_975_FPS:
-  case MAD_UNITS_29_97_FPS:
-  case MAD_UNITS_47_952_FPS:
-  case MAD_UNITS_49_95_FPS:
-  case MAD_UNITS_59_94_FPS:
-    return (mad_timer_count(timer, -units) + 1) * 1000 / 1001;
-  }
-
-  /* unsupported units */
-  return 0;
-}
-
-/*
- * NAME:	timer->fraction()
- * DESCRIPTION:	return fractional part of timer in arbitrary terms
- */
-unsigned long mad_timer_fraction(mad_timer_t timer, unsigned long denom)
-{
-  timer = mad_timer_abs(timer);
-
-  switch (denom) {
-  case 0:
-    return timer.fraction ?
-      MAD_TIMER_RESOLUTION / timer.fraction : MAD_TIMER_RESOLUTION + 1;
-
-  case MAD_TIMER_RESOLUTION:
-    return timer.fraction;
-
-  default:
-    return scale_rational(timer.fraction, MAD_TIMER_RESOLUTION, denom);
-  }
-}
-
-/*
- * NAME:	timer->string()
- * DESCRIPTION:	write a string representation of a timer using a template
- */
-void mad_timer_string(mad_timer_t timer,
-		      char *dest, char const *format, enum mad_units units,
-		      enum mad_units fracunits, unsigned long subparts)
-{
-  unsigned long hours, minutes, seconds, sub;
-  unsigned int frac;
-
-  timer = mad_timer_abs(timer);
-
-  seconds = timer.seconds;
-  frac = sub = 0;
-
-  switch (fracunits) {
-  case MAD_UNITS_HOURS:
-  case MAD_UNITS_MINUTES:
-  case MAD_UNITS_SECONDS:
-    break;
-
-  case MAD_UNITS_DECISECONDS:
-  case MAD_UNITS_CENTISECONDS:
-  case MAD_UNITS_MILLISECONDS:
-
-  case MAD_UNITS_8000_HZ:
-  case MAD_UNITS_11025_HZ:
-  case MAD_UNITS_12000_HZ:
-  case MAD_UNITS_16000_HZ:
-  case MAD_UNITS_22050_HZ:
-  case MAD_UNITS_24000_HZ:
-  case MAD_UNITS_32000_HZ:
-  case MAD_UNITS_44100_HZ:
-  case MAD_UNITS_48000_HZ:
-
-  case MAD_UNITS_24_FPS:
-  case MAD_UNITS_25_FPS:
-  case MAD_UNITS_30_FPS:
-  case MAD_UNITS_48_FPS:
-  case MAD_UNITS_50_FPS:
-  case MAD_UNITS_60_FPS:
-  case MAD_UNITS_75_FPS:
-    {
-      unsigned long denom;
-
-      denom = MAD_TIMER_RESOLUTION / fracunits;
-
-      frac = timer.fraction / denom;
-      sub  = scale_rational(timer.fraction % denom, denom, subparts);
-    }
-    break;
-
-  case MAD_UNITS_23_976_FPS:
-  case MAD_UNITS_24_975_FPS:
-  case MAD_UNITS_29_97_FPS:
-  case MAD_UNITS_47_952_FPS:
-  case MAD_UNITS_49_95_FPS:
-  case MAD_UNITS_59_94_FPS:
-    /* drop-frame encoding */
-    /* N.B. this is only well-defined for MAD_UNITS_29_97_FPS */
-    {
-      unsigned long frame, cycle, d, m;
-
-      frame = mad_timer_count(timer, fracunits);
-
-      cycle = -fracunits * 60 * 10 - (10 - 1) * 2;
-
-      d = frame / cycle;
-      m = frame % cycle;
-      frame += (10 - 1) * 2 * d;
-      if (m > 2)
-	frame += 2 * ((m - 2) / (cycle / 10));
-
-      frac    = frame % -fracunits;
-      seconds = frame / -fracunits;
-    }
-    break;
-  }
-
-  switch (units) {
-  case MAD_UNITS_HOURS:
-    minutes = seconds / 60;
-    hours   = minutes / 60;
-
-    sprintf(dest, format,
-	    hours,
-	    (unsigned int) (minutes % 60),
-	    (unsigned int) (seconds % 60),
-	    frac, sub);
-    break;
-
-  case MAD_UNITS_MINUTES:
-    minutes = seconds / 60;
-
-    sprintf(dest, format,
-	    minutes,
-	    (unsigned int) (seconds % 60),
-	    frac, sub);
-    break;
-
-  case MAD_UNITS_SECONDS:
-    sprintf(dest, format,
-	    seconds,
-	    frac, sub);
-    break;
-
-  case MAD_UNITS_23_976_FPS:
-  case MAD_UNITS_24_975_FPS:
-  case MAD_UNITS_29_97_FPS:
-  case MAD_UNITS_47_952_FPS:
-  case MAD_UNITS_49_95_FPS:
-  case MAD_UNITS_59_94_FPS:
-    if (fracunits < 0) {
-      /* not yet implemented */
-      sub = 0;
-    }
-
-    /* fall through */
-
-  case MAD_UNITS_DECISECONDS:
-  case MAD_UNITS_CENTISECONDS:
-  case MAD_UNITS_MILLISECONDS:
-
-  case MAD_UNITS_8000_HZ:
-  case MAD_UNITS_11025_HZ:
-  case MAD_UNITS_12000_HZ:
-  case MAD_UNITS_16000_HZ:
-  case MAD_UNITS_22050_HZ:
-  case MAD_UNITS_24000_HZ:
-  case MAD_UNITS_32000_HZ:
-  case MAD_UNITS_44100_HZ:
-  case MAD_UNITS_48000_HZ:
-
-  case MAD_UNITS_24_FPS:
-  case MAD_UNITS_25_FPS:
-  case MAD_UNITS_30_FPS:
-  case MAD_UNITS_48_FPS:
-  case MAD_UNITS_50_FPS:
-  case MAD_UNITS_60_FPS:
-  case MAD_UNITS_75_FPS:
-    sprintf(dest, format, mad_timer_count(timer, units), sub);
-    break;
-  }
-}
diff --git a/code/libmad-0.15.1b/timer.h b/code/libmad-0.15.1b/timer.h
deleted file mode 100644
index eb4542bb..00000000
--- a/code/libmad-0.15.1b/timer.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
diff --git a/code/libmad-0.15.1b/version.c b/code/libmad-0.15.1b/version.c
deleted file mode 100644
index e643fa71..00000000
--- a/code/libmad-0.15.1b/version.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: version.c,v 1.15 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-# include "global.h"
-
-# include "version.h"
-
-char const mad_version[]   = "MPEG Audio Decoder " MAD_VERSION;
-char const mad_copyright[] = "Copyright (C) " MAD_PUBLISHYEAR " " MAD_AUTHOR;
-char const mad_author[]    = MAD_AUTHOR " <" MAD_EMAIL ">";
-
-char const mad_build[] = ""
-# if defined(DEBUG)
-  "DEBUG "
-# elif defined(NDEBUG)
-  "NDEBUG "
-# endif
-
-# if defined(EXPERIMENTAL)
-  "EXPERIMENTAL "
-# endif
-
-# if defined(FPM_64BIT)
-  "FPM_64BIT "
-# elif defined(FPM_INTEL)
-  "FPM_INTEL "
-# elif defined(FPM_ARM)
-  "FPM_ARM "
-# elif defined(FPM_MIPS)
-  "FPM_MIPS "
-# elif defined(FPM_SPARC)
-  "FPM_SPARC "
-# elif defined(FPM_PPC)
-  "FPM_PPC "
-# elif defined(FPM_DEFAULT)
-  "FPM_DEFAULT "
-# endif
-
-# if defined(ASO_IMDCT)
-  "ASO_IMDCT "
-# endif
-# if defined(ASO_INTERLEAVE1)
-  "ASO_INTERLEAVE1 "
-# endif
-# if defined(ASO_INTERLEAVE2)
-  "ASO_INTERLEAVE2 "
-# endif
-# if defined(ASO_ZEROCHECK)
-  "ASO_ZEROCHECK "
-# endif
-
-# if defined(OPT_SPEED)
-  "OPT_SPEED "
-# elif defined(OPT_ACCURACY)
-  "OPT_ACCURACY "
-# endif
-
-# if defined(OPT_SSO)
-  "OPT_SSO "
-# endif
-
-# if defined(OPT_DCTO)  /* never defined here */
-  "OPT_DCTO "
-# endif
-
-# if defined(OPT_STRICT)
-  "OPT_STRICT "
-# endif
-;
diff --git a/code/libmad-0.15.1b/version.h b/code/libmad-0.15.1b/version.h
deleted file mode 100644
index d215d4c1..00000000
--- a/code/libmad-0.15.1b/version.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2004"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif

From f2d27aae3f38479a159d31c00766c24261c9cd82 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:06:37 +0200
Subject: [PATCH 0976/2040] Update getting_started_running.md

---
 docs/getting_started_running.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index f3b565db..5dc524be 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -4,15 +4,16 @@
 
 **Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
 
-**Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable. To play an expansion, append the following command-line arguments to the executable:
+**Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable.
+
+To play an expansion, append the following command-line arguments to the executable:
 
 - `+set com_target_game 1` for the Spearhead expansion (mohaas/mohta, mainta, a.k.a Team Assault)
 - `+set com_target_game 2` for the Breakthrough expansion (mohaab/mohtt, maintt, a.k.a Team Tactics)
 
-On Windows, you can create a shortcut to OpenMoHAA with these command-line arguments.
-The default value of `com_target_game` is 0 for the base game (mohaa, main).
+With `com_target_game`, OpenMoHAA will support the network protocol accordingly. The default value of `com_target_game` is 0 for the base game (mohaa, main).
 
-With `com_target_game`, OpenMoHAA will support the network protocol accordingly.
+On Windows, it's best to create a shortcut to the OpenMoHAA executable, and append the command-line arguments above to play an expansion.
 
 You can now start a local OpenMOHAA server or play on a server.
 

From 639da1a4b8eb72804889d2d2aeba56b6ae5c1a0b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:09:22 +0200
Subject: [PATCH 0977/2040] Remove unused variables

---
 code/fgame/archive.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index 6325c964..647b9450 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -517,7 +517,6 @@ void ArchiveSwapValue<Quat>(Quat* value) {
 #define ARCHIVE(func, type)                             \
     void Archiver::Archive##func(type *v)               \
     {                                                   \
-        int i;                                          \
         if (archivemode == ARCHIVE_WRITE) {             \
             type nv = *v;                               \
             ArchiveSwapValue(&nv);                      \
@@ -559,7 +558,6 @@ void Archiver::ArchiveSvsTime(int *time)
 
 void Archiver::ArchiveVec2(vec2_t vec)
 {
-    int i;
     if (archivemode == ARCHIVE_WRITE) {
         vec2_t nv = { vec[0], vec[1] };
         ArchiveSwapValue(nv, 2);
@@ -572,7 +570,6 @@ void Archiver::ArchiveVec2(vec2_t vec)
 
 void Archiver::ArchiveVec3(vec3_t vec)
 {
-    int i;
     if (archivemode == ARCHIVE_WRITE) {
         vec3_t nv = { vec[0], vec[1], vec[2]};
         ArchiveSwapValue(nv, 3);
@@ -585,7 +582,6 @@ void Archiver::ArchiveVec3(vec3_t vec)
 
 void Archiver::ArchiveVec4(vec4_t vec)
 {
-    int i;
     if (archivemode == ARCHIVE_WRITE) {
         vec4_t nv = { vec[0], vec[1], vec[2], vec[3] };
         ArchiveSwapValue(nv, 4);
@@ -784,8 +780,6 @@ void Archiver::ArchiveString(str *string)
             }
         }
     } else {
-        fileSize_t s;
-
 #ifndef NDEBUG
         CheckWrite();
 #endif

From b38b71eb44399b03af3d572bd318163a4bb5d8d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:11:34 +0200
Subject: [PATCH 0978/2040] Small mistake fix

---
 docs/features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features.md b/docs/features.md
index d2aa9130..b1c8cc39 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -8,7 +8,7 @@ A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, gre
 - OpenAL sound support (better sound quality)
 - Full 64-bit support
 - Cross-platform support
-- Multiuser support on OS (On Windows, user game data is stored in "%APPDATA%\Quake3")
+- Multiuser support on OS (On Windows, user game data is stored in "%APPDATA%\openmohaa")
 - Many bug fixes and additions from ioquake3
 
 Overall, better compatibility on modern systems and bugfixes.

From 085b72154fbe281ba14582d52844c21f7079132e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:25:33 +0200
Subject: [PATCH 0979/2040] Use a more modern implementation of minizip from
 ioquake3

---
 code/qcommon/CMakeLists.txt |   21 +-
 code/qcommon/files.cpp      |  182 +-
 code/qcommon/unzip.c        | 5058 ++++++++---------------------------
 code/qcommon/unzip.h        |  422 ++-
 code/zlib/zlib.h            | 1357 ++++++++++
 5 files changed, 2758 insertions(+), 4282 deletions(-)
 create mode 100644 code/zlib/zlib.h

diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index fd40183b..00006c36 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -55,6 +55,7 @@ set(SOURCES_COMMON
 	"${CMAKE_SOURCE_DIR}/code/qcommon/crc.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cvar.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/files.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/ioapi.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/huffman.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/md4.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/md5.c"
@@ -83,4 +84,22 @@ endif()
 
 target_compile_features(qcommon_standalone INTERFACE cxx_nullptr)
 target_compile_features(qcommon_standalone INTERFACE c_variadic_macros)
-target_link_libraries(qcommon_standalone INTERFACE omohtiki omohskeletor)
\ No newline at end of file
+target_link_libraries(qcommon_standalone INTERFACE omohtiki omohskeletor)
+
+#
+# FIXME: Opt-in for the using the system one rather than bundled one
+#
+add_library(zlib INTERFACE)
+
+target_sources(zlib INTERFACE
+	# zlib
+	"${CMAKE_SOURCE_DIR}/code/zlib/adler32.c"
+	"${CMAKE_SOURCE_DIR}/code/zlib/crc32.c"
+	"${CMAKE_SOURCE_DIR}/code/zlib/inffast.c"
+	"${CMAKE_SOURCE_DIR}/code/zlib/inflate.c"
+	"${CMAKE_SOURCE_DIR}/code/zlib/inftrees.c"
+	"${CMAKE_SOURCE_DIR}/code/zlib/zutil.c"
+)
+
+target_include_directories(zlib INTERFACE "${CMAKE_SOURCE_DIR}/code/zlib")
+target_link_libraries(qcommon_standalone INTERFACE zlib)
diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index e4ef082a..58227b7b 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -1711,106 +1711,10 @@ FS_Seek
 =================
 */
 int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
-#if 0
 	int		_origin;
 
 	if ( !fs_searchpaths ) {
-		Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
-		return -1;
-	}
-
-	switch( origin ) {
-		case FS_SEEK_CUR:
-			_origin = SEEK_CUR;
-			break;
-		case FS_SEEK_END:
-			_origin = SEEK_END;
-			break;
-		case FS_SEEK_SET:
-			_origin = SEEK_SET;
-			break;
-		default:
-			Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
-			_origin = 0;
-			break;
-	}
-
-	if( fsh[ f ].zipFile == qtrue ) {
-		if( !unzIsCurrentFileOpen( fsh[ f ].handleFiles.file.o ) ) {
-			Com_Error( ERR_FATAL, "Tried to read from a zip file %s that was not open\n", fsh[ f ].name );
-		}
-		return unzseek( fsh[ f ].handleFiles.file.o, offset, _origin );
-	} else {
-		return fseek( FS_FileForHandle( f ), offset, _origin );
-	}
-
-#if 0
-
-	if (fsh[f].streamed) {
-		fsh[f].streamed = qfalse;
-	 	FS_Seek( f, offset, origin );
-		fsh[f].streamed = qtrue;
-	}
-
-	if (fsh[f].zipFile == qtrue) {
-		//FIXME: this is incomplete and really, really
-		//crappy (but better than what was here before)
-		byte	buffer[PK3_SEEK_BUFFER_SIZE];
-		int		remainder = offset;
-
-		if( offset < 0 || origin == FS_SEEK_END ) {
-			Com_Error( ERR_FATAL, "Negative offsets and FS_SEEK_END not implemented "
-					"for FS_Seek on pk3 file contents\n" );
-			return -1;
-		}
-
-		switch( origin ) {
-			case FS_SEEK_SET:
-				unzSetCurrentFileInfoPosition(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
-				unzOpenCurrentFile(fsh[f].handleFiles.file.z);
-				//fallthrough
-
-			case FS_SEEK_CUR:
-				while( remainder > PK3_SEEK_BUFFER_SIZE ) {
-					FS_Read( buffer, PK3_SEEK_BUFFER_SIZE, f );
-					remainder -= PK3_SEEK_BUFFER_SIZE;
-				}
-				FS_Read( buffer, remainder, f );
-				return offset;
-				break;
-
-			default:
-				Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
-				return -1;
-				break;
-		}
-	} else {
-		FILE *file;
-		file = FS_FileForHandle(f);
-		switch( origin ) {
-		case FS_SEEK_CUR:
-			_origin = SEEK_CUR;
-			break;
-		case FS_SEEK_END:
-			_origin = SEEK_END;
-			break;
-		case FS_SEEK_SET:
-			_origin = SEEK_SET;
-			break;
-		default:
-			_origin = SEEK_CUR;
-			Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
-			break;
-		}
-
-		return fseek( file, offset, _origin );
-	}
-#endif
-#else
-	int		_origin;
-
-	if (!fs_searchpaths) {
-		Com_Error(ERR_FATAL, "Filesystem call made without initialization");
+		Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
 		return -1;
 	}
 
@@ -1819,67 +1723,64 @@ int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
 		//(but better than what was here before)
 		byte	buffer[PK3_SEEK_BUFFER_SIZE];
 		int		remainder;
-		int		currentPosition = FS_FTell(f);
+		int		currentPosition = FS_FTell( f );
 
 		// change negative offsets into FS_SEEK_SET
-		if (offset < 0) {
-			switch (origin) {
-			case FS_SEEK_END:
-				remainder = fsh[f].zipFileLen + offset;
-				break;
+		if ( offset < 0 ) {
+			switch( origin ) {
+				case FS_SEEK_END:
+					remainder = fsh[f].zipFileLen + offset;
+					break;
 
-			case FS_SEEK_CUR:
-				remainder = currentPosition + offset;
-				break;
+				case FS_SEEK_CUR:
+					remainder = currentPosition + offset;
+					break;
 
-			case FS_SEEK_SET:
-			default:
-				remainder = 0;
-				break;
+				case FS_SEEK_SET:
+				default:
+					remainder = 0;
+					break;
 			}
 
-			if (remainder < 0) {
+			if ( remainder < 0 ) {
 				remainder = 0;
 			}
 
 			origin = FS_SEEK_SET;
-		}
-		else {
-			if (origin == FS_SEEK_END) {
+		} else {
+			if ( origin == FS_SEEK_END ) {
 				remainder = fsh[f].zipFileLen - currentPosition + offset;
-			}
-			else {
+			} else {
 				remainder = offset;
 			}
 		}
 
-		switch (origin) {
-		case FS_SEEK_SET:
-			if (remainder == currentPosition) {
+		switch( origin ) {
+			case FS_SEEK_SET:
+				if ( remainder == currentPosition ) {
+					return 0;
+				}
+				unzSetOffset(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
+				unzOpenCurrentFile(fsh[f].handleFiles.file.z);
+				//fallthrough
+
+			case FS_SEEK_END:
+			case FS_SEEK_CUR:
+				while( remainder > PK3_SEEK_BUFFER_SIZE ) {
+					FS_Read( buffer, PK3_SEEK_BUFFER_SIZE, f );
+					remainder -= PK3_SEEK_BUFFER_SIZE;
+				}
+				FS_Read( buffer, remainder, f );
 				return 0;
-			}
-			unzSetOffset(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
-			unzOpenCurrentFile(fsh[f].handleFiles.file.z);
-			//fallthrough
 
-		case FS_SEEK_END:
-		case FS_SEEK_CUR:
-			while (remainder > PK3_SEEK_BUFFER_SIZE) {
-				FS_Read(buffer, PK3_SEEK_BUFFER_SIZE, f);
-				remainder -= PK3_SEEK_BUFFER_SIZE;
-			}
-			FS_Read(buffer, remainder, f);
-			return 0;
-
-		default:
-			Com_Error(ERR_FATAL, "Bad origin in FS_Seek");
-			return -1;
+			default:
+				Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
+				return -1;
 		}
-	}
-	else {
+	} else {
 		FILE *file;
 		file = FS_FileForHandle(f);
-		switch (origin) {
+		switch( origin ) {
 		case FS_SEEK_CUR:
 			_origin = SEEK_CUR;
 			break;
@@ -1890,13 +1791,12 @@ int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
 			_origin = SEEK_SET;
 			break;
 		default:
-			Com_Error(ERR_FATAL, "Bad origin in FS_Seek");
+			Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
 			break;
 		}
 
-		return fseek(file, offset, _origin);
+		return fseek( file, offset, _origin );
 	}
-#endif
 }
 
 
diff --git a/code/qcommon/unzip.c b/code/qcommon/unzip.c
index 20adcfe3..9a8ee451 100644
--- a/code/qcommon/unzip.c
+++ b/code/qcommon/unzip.c
@@ -1,1062 +1,65 @@
-/*****************************************************************************
- * name:		unzip.c
- *
- * desc:		IO on .zip files using portions of zlib 
- *
- * $Archive: /MissionPack/code/qcommon/unzip.c $
- *
- *****************************************************************************/
+/* unzip.c -- IO for uncompress .zip files using zlib
 
-#include "../client/client.h"
+   Modified for Quake III Arena to use the Z_Malloc() memory pool;
+   this means a system copy of minizip is not a suitable replacement.
+
+   Based on minizip:
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   Read unzip.h for more info
+*/
+
+/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+compatibility with older software. The following is from the original crypt.c. Code
+woven in by Terry Thorsen 1/2003.
+*/
+/*
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+*/
+/*
+  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+ */
+
+/*
+  This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+ */
+
+
+#include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
 #include "unzip.h"
 
-/* unzip.h -- IO for uncompress .zip files using zlib 
-   Version 0.15 beta, Mar 19th, 1998,
-
-   Copyright (C) 1998 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Encryption and multi volume ZipFile (span) are not supported.
-   Old compressions used by old PKZip 1.x are not supported
-
-   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-   CAN CHANGE IN FUTURE VERSION !!
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
 
 
-*/
-/* for more info about .ZIP format, see 
-      ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip */
-
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
 #  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 */
-#define OF(args)  args
-#endif
-
-typedef unsigned char  Byte;  /* 8 bits */
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-typedef Byte    *voidp;
-
-#ifndef SEEK_SET
-#  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
-
-#endif /* _ZCONF_H */
-
-#define ZLIB_VERSION "1.1.3"
-
-/* 
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio.
-
-     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.
-*/
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  (void *)0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-// static const char * zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/* 
-int deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-// static int deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide 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.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).
-
-    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
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so (that is, total_in bytes).
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). 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 NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).
-*/
-
-
-// static int deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/* 
-int inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. 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.
-
-     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.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-static int inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may some
-  introduce some output latency (reading input without producing any output)
-  except when forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated 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
-    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 application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
-  output as possible to the output buffer. The flushing behavior of inflate is
-  not specified for values of the flush parameter other than Z_SYNC_FLUSH
-  and Z_FINISH, but the current implementation actually flushes as much output
-  as possible anyway.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
-  may be used for the single inflate() call.
-
-     If a preset dictionary is needed at this point (see inflateSetDictionary
-  below), inflate sets strm-adler to the adler32 checksum of the
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
-  it sets strm->adler to the adler32 checksum of all output produced
-  so (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 checksum is equal to that saved by the
-  compressor and returns Z_STREAM_END only if the checksum is correct.
-
-    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
-  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
-  (for example if next_in or next_out was 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. In the Z_DATA_ERROR
-  case, the application may then call inflateSync to look for a good
-  compression block.
-*/
-
-
-static int inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, 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).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*   
-int deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  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 and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-                            
-/*
-static int deflateSetDictionary OF((z_streamp strm,
-                                             const Byte *dictionary,
-                                             uInt  dictLength));
-*/
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
-
-     Upon return of this function, strm->adler is set to the Adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-/*
-static int deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-*/
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-// static int deflateReset OF((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.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-/*
-static int deflateParams OF((z_streamp strm,
-				      int level,
-				      int strategy));
-*/
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression 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.
-*/
-
-/*   
-int inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. If a compressed stream with a larger window size is given as
-   input, inflate() will return with the error code Z_DATA_ERROR instead of
-   trying to allocate a larger window.
-
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
-*/
-
-/*
-static int inflateSetDictionary OF((z_streamp strm,
-                                             const Byte *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 this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the Adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) 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
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-// static int inflateSync OF((z_streamp strm));
-/* 
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a 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.
-*/
-
-static int inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-/*
-static int compress OF((Byte *dest,   uLong *destLen,
-                                 const Byte *source, uLong sourceLen));
-*/
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     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.
-*/
-
-/*
-static int compress2 OF((Byte *dest,   uLong *destLen,
-                                  const Byte *source, uLong sourceLen,
-                                  int level));
-*/
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 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.
-*/
-
-/*
-static int uncompress OF((Byte *dest,   uLong *destLen,
-                                   const Byte *source, uLong sourceLen));
-*/                                   
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     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.
-*/
-
-
-typedef voidp gzFile;
-
-gzFile gzopen  OF((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". (See the description
-   of deflateInit2 for more information about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-gzFile gzdopen  OF((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 (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-int gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-int    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-int    gzwrite OF((gzFile file, 
-				   const voidp buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-int    QDECL gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-
-int gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-char * gzgets OF((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.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-int    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-int    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-int    gzflush OF((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 returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-long gzseek OF((gzFile file,
-				      long 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
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-int    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-long    gztell OF((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.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-int gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-int    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-// static const char * gzerror OF((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.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-static uLong adler32 OF((uLong adler, const Byte *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is 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
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-/*
-static int deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-static int inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-static int deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-*/
-static int inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
-
-// static const char   * zError           OF((int err));
-// static int            inflateSyncPoint OF((z_streamp z));
-// static const uLong * get_crc_table    OF((void));
-
-typedef unsigned char  uch;
-typedef unsigned short ush;
-typedef unsigned long  ulg;
-
-// static const char *z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-        /* Common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-#define zmemcpy Com_Memcpy
-#define zmemcmp memcmp
-#define zmemzero(dest, len) Com_Memset(dest, 0, len)
-
-/* Diagnostic functions */
-#ifdef _ZIP_DEBUG_
-   int z_verbose = 0;
-#  define Assert(cond,msg) assert(cond);
-   //{if(!(cond)) SyScriptError(msg);}
-#  define Trace(x) {if (z_verbose>=0) SyScriptError x ;}
-#  define Tracev(x) {if (z_verbose>0) SyScriptError x ;}
-#  define Tracevv(x) {if (z_verbose>1) SyScriptError x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) SyScriptError x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) SyScriptError x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len));
-static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size));
-static void   zcfree  OF((voidp opaque, voidp ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidp)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-
-#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \
-                      !defined(CASESENSITIVITYDEFAULT_NO)
-#define CASESENSITIVITYDEFAULT_NO
-#endif
-
 
 #ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (65536)
+#define UNZ_BUFSIZE (16384)
 #endif
 
 #ifndef UNZ_MAXFILENAMEINZIP
@@ -1075,17 +78,95 @@ static void   zcfree  OF((voidp opaque, voidp ptr));
 
 
 
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info_internal_s
+{
+    uLong offset_curfile;/* relative offset of local header 4 bytes */
+} unz_file_info_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    uLong offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    uLong pos_local_extrafield;   /* position in the local extra field in read*/
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    uLong rest_read_compressed; /* number of byte to be decompressed */
+    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip_read_info_s;
+
+
+/* unz_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info gi;       /* public global information */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    uLong num_file;             /* number of the current file in the zipfile*/
+    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
+    uLong current_file_ok;      /* flag about the usability of the current file*/
+    uLong central_pos;          /* position of the beginning of the central dir*/
+
+    uLong size_central_dir;     /* size of the central directory  */
+    uLong offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info cur_file_info; /* public info about the current file in zip*/
+    unz_file_info_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+#    endif
+} unz_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
 /* ===========================================================================
      Read a byte from a gz_stream; update next_in and avail_in. Return EOF
    for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
+   IN assertion: the stream s has been successfully opened for reading.
 */
 
-/*
-static int unzlocal_getByte(FILE *fin,int *pi)
+
+local int unzlocal_getByte OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    int *pi;
 {
     unsigned char c;
-	int err = fread(&c, 1, 1, fin);
+    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
     if (err==1)
     {
         *pi = (int)c;
@@ -1093,104 +174,107 @@ static int unzlocal_getByte(FILE *fin,int *pi)
     }
     else
     {
-        if (ferror(fin)) 
+        if (ZERROR(*pzlib_filefunc_def,filestream))
             return UNZ_ERRNO;
         else
             return UNZ_EOF;
     }
 }
-*/
+
 
 /* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets 
+   Reads a long in LSB order from the given gz_stream. Sets
 */
-static int unzlocal_getShort (FILE* fin, uLong *pX)
+local int unzlocal_getShort OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
 {
-	short	v;
-
-	fread( &v, sizeof(v), 1, fin );
-
-	*pX = LittleShort( v);
-	return UNZ_OK;
-
-/*
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = unzlocal_getByte(fin,&i);
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
-    
+
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<8;
-   
+
     if (err==UNZ_OK)
         *pX = x;
     else
         *pX = 0;
     return err;
-*/
 }
 
-static int unzlocal_getLong (FILE *fin, uLong *pX)
+local int unzlocal_getLong OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
 {
-	int		v;
-
-	fread( &v, sizeof(v), 1, fin );
-
-	*pX = LittleLong( v);
-	return UNZ_OK;
-
-/*
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = unzlocal_getByte(fin,&i);
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
-    
+
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<8;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<16;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<24;
-   
+
     if (err==UNZ_OK)
         *pX = x;
     else
         *pX = 0;
     return err;
-*/
 }
 
+local int strcmpcasenosensitive_internal OF((
+    const char* fileName1,
+    const char* fileName2));
 
 /* My own strcmpi / strcasecmp */
-static int strcmpcasenosensitive_internal (const char* fileName1,const char* fileName2)
+local int strcmpcasenosensitive_internal (fileName1,fileName2)
+    const char* fileName1;
+    const char* fileName2;
 {
-	for (;;)
-	{
-		char c1=*(fileName1++);
-		char c2=*(fileName2++);
-		if ((c1>='a') && (c1<='z'))
-			c1 -= 0x20;
-		if ((c2>='a') && (c2<='z'))
-			c2 -= 0x20;
-		if (c1=='\0')
-			return ((c2=='\0') ? 0 : -1);
-		if (c2=='\0')
-			return 1;
-		if (c1<c2)
-			return -1;
-		if (c1>c2)
-			return 1;
-	}
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
 }
 
 
@@ -1204,220 +288,235 @@ static int strcmpcasenosensitive_internal (const char* fileName1,const char* fil
 #define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
 #endif
 
-/* 
+/*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
                                                                 or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
         (like 1 on Unix, 2 on Windows)
 
 */
-extern  int unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity)
+extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
+    const char* fileName1;
+    const char* fileName2;
+    int iCaseSensitivity;
 {
-	if (iCaseSensitivity==0)
-		iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
 
-	if (iCaseSensitivity==1)
-		return strcmp(fileName1,fileName2);
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
 
-	return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-} 
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
 
+#ifndef BUFREADCOMMENT
 #define BUFREADCOMMENT (0x400)
+#endif
 
 /*
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-extern uLong unzlocal_SearchCentralDir(FILE *fin)
+local uLong unzlocal_SearchCentralDir OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
 {
-	unsigned char* buf;
-	uLong uSizeFile;
-	uLong uBackRead;
-	uLong uMaxBack=0xffff; /* maximum size of global comment */
-	uLong uPosFound=0;
-	
-	if (fseek(fin,0,SEEK_END) != 0)
-		return 0;
+    unsigned char* buf;
+    uLong uSizeFile;
+    uLong uBackRead;
+    uLong uMaxBack=0xffff; /* maximum size of global comment */
+    uLong uPosFound=0;
+
+    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
 
 
-	uSizeFile = ftell( fin );
-	
-	if (uMaxBack>uSizeFile)
-		uMaxBack = uSizeFile;
+    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
 
-	buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-	if (buf==NULL)
-		return 0;
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
 
-	uBackRead = 4;
-	while (uBackRead<uMaxBack)
-	{
-		uLong uReadSize,uReadPos ;
-		int i;
-		if (uBackRead+BUFREADCOMMENT>uMaxBack) 
-			uBackRead = uMaxBack;
-		else
-			uBackRead+=BUFREADCOMMENT;
-		uReadPos = uSizeFile-uBackRead ;
-		
-		uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? 
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize,uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
                      (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-		if (fseek(fin,uReadPos,SEEK_SET)!=0)
-			break;
+        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
 
-		if (fread(buf,(uInt)uReadSize,1,fin)!=1)
-			break;
+        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
 
-                for (i=(int)uReadSize-3; (i--)>0;)
-			if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && 
-				((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-			{
-				uPosFound = uReadPos+i;
-				break;
-			}
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
 
-		if (uPosFound!=0)
-			break;
-	}
-	TRYFREE(buf);
-	return uPosFound;
-}
-
-extern unzFile unzReOpen (const char* path, unzFile file)
-{
-	unz_s *s;
-	FILE * fin;
-
-    fin=fopen(path,"rb");
-	if (fin==NULL)
-		return NULL;
-
-	s=(unz_s*)ALLOC(sizeof(unz_s));
-	Com_Memcpy(s, (unz_s*)file, sizeof(unz_s));
-
-	s->file = fin;
-	return (unzFile)s;	
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
 }
 
 /*
   Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer
-	 "zlib/zlib109.zip".
-	 If the zipfile cannot be opened (file don't exist or in not valid), the
-	   return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-	   of this unzip package.
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on a Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is an unzFile Handle, usable with other function
+       of this unzip package.
 */
-extern unzFile unzOpen (const char* path)
+extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
+    const char *path;
+    zlib_filefunc_def* pzlib_filefunc_def;
 {
-	unz_s us;
-	unz_s *s;
-	uLong central_pos,uL;
-	FILE * fin ;
+    unz_s us;
+    unz_s *s;
+    uLong central_pos,uL;
 
-	uLong number_disk;          /* number of the current dist, used for 
-								   spaning ZIP, unsupported, always 0*/
-	uLong number_disk_with_CD;  /* number the the disk with central dir, used
-								   for spaning ZIP, unsupported, always 0*/
-	uLong number_entry_CD;      /* total number of entries in
-	                               the central dir 
-	                               (same than number_entry on nospan) */
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    uLong number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
 
-	int err=UNZ_OK;
+    int err=UNZ_OK;
 
-    fin=fopen(path,"rb");
-	if (fin==NULL)
-		return NULL;
+    if (unz_copyright[0]!=' ')
+        return NULL;
 
-	central_pos = unzlocal_SearchCentralDir(fin);
-	if (central_pos==0)
-		err=UNZ_ERRNO;
+    if (pzlib_filefunc_def==NULL)
+        fill_fopen_filefunc(&us.z_filefunc);
+    else
+        us.z_filefunc = *pzlib_filefunc_def;
 
-	if (fseek(fin,central_pos,SEEK_SET)!=0)
-		err=UNZ_ERRNO;
+    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
 
-	/* the signature, already checked */
-	if (unzlocal_getLong(fin,&uL)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
+    if (central_pos==0)
+        err=UNZ_ERRNO;
 
-	/* number of this disk */
-	if (unzlocal_getShort(fin,&number_disk)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    if (ZSEEK(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
 
-	/* number of the disk with the start of the central directory */
-	if (unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* the signature, already checked */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* total number of entries in the central dir on this disk */
-	if (unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* number of this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* total number of entries in the central dir */
-	if (unzlocal_getShort(fin,&number_entry_CD)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* number of the disk with the start of the central directory */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if ((number_entry_CD!=us.gi.number_entry) ||
-		(number_disk_with_CD!=0) ||
-		(number_disk!=0))
-		err=UNZ_BADZIPFILE;
+    /* total number of entries in the central dir on this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* size of the central directory */
-	if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* total number of entries in the central dir */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* offset of start of central directory with respect to the 
-	      starting disk number */
-	if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    if ((number_entry_CD!=us.gi.number_entry) ||
+        (number_disk_with_CD!=0) ||
+        (number_disk!=0))
+        err=UNZ_BADZIPFILE;
 
-	/* zipfile comment length */
-	if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* size of the central directory */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if ((central_pos<us.offset_central_dir+us.size_central_dir) && 
-		(err==UNZ_OK))
-		err=UNZ_BADZIPFILE;
+    /* offset of start of central directory with respect to the
+          starting disk number */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (err!=UNZ_OK)
-	{
-		fclose(fin);
-		return NULL;
-	}
+    /* zipfile comment length */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	us.file=fin;
-	us.byte_before_the_zipfile = central_pos -
-		                    (us.offset_central_dir+us.size_central_dir);
-	us.central_pos = central_pos;
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
     us.pfile_in_zip_read = NULL;
-	
+    us.encrypted = 0;
 
-	s=(unz_s*)ALLOC(sizeof(unz_s));
-	*s=us;
-//	unzGoToFirstFile((unzFile)s);	
-	return (unzFile)s;	
+
+    s=(unz_s*)ALLOC(sizeof(unz_s));
+    *s=us;
+    unzGoToFirstFile((unzFile)s);
+    return (unzFile)s;
 }
 
 
+extern unzFile ZEXPORT unzOpen (path)
+    const char *path;
+{
+    return unzOpen2(path, NULL);
+}
+
 /*
   Close a ZipFile opened with unzipOpen.
   If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
-extern int unzClose (unzFile file)
+extern int ZEXPORT unzClose (file)
+    unzFile file;
 {
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
 
     if (s->pfile_in_zip_read!=NULL)
         unzCloseCurrentFile(file);
 
-	fclose(s->file);
-	TRYFREE(s);
-	return UNZ_OK;
+    ZCLOSE(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
 }
 
 
@@ -1425,21 +524,31 @@ extern int unzClose (unzFile file)
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
-extern int unzGetGlobalInfo (unzFile file,unz_global_info *pglobal_info)
+extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
+    unzFile file;
+    unz_global_info *pglobal_info;
 {
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	*pglobal_info=s->gi;
-	return UNZ_OK;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
 }
 
 
 /*
    Translate date/time from Dos format to tm_unz (readable more easilty)
 */
-static void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
+
+local void unzlocal_DosDateToTmuDate OF((
+    uLong ulDosDate,
+    tm_unz* ptm));
+        
+
+local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
+    uLong ulDosDate;
+    tm_unz* ptm;
 {
     uLong uDate;
     uDate = (uLong)(ulDosDate>>16);
@@ -1455,161 +564,176 @@ static void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
 /*
   Get Info about the current file in the zipfile, with internal only info
 */
-static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
+local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   unz_file_info *pfile_info,
-                                                  unz_file_info_internal 
+                                                  unz_file_info_internal
                                                   *pfile_info_internal,
                                                   char *szFileName,
-												  uLong fileNameBufferSize,
+                                                  uLong fileNameBufferSize,
                                                   void *extraField,
-												  uLong extraFieldBufferSize,
+                                                  uLong extraFieldBufferSize,
                                                   char *szComment,
-												  uLong commentBufferSize)
+                                                  uLong commentBufferSize));
+
+local int unzlocal_GetCurrentFileInfoInternal (file,
+                                              pfile_info,
+                                              pfile_info_internal,
+                                              szFileName, fileNameBufferSize,
+                                              extraField, extraFieldBufferSize,
+                                              szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    unz_file_info_internal *pfile_info_internal;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
 {
-	unz_s* s;
-	unz_file_info file_info;
-	unz_file_info_internal file_info_internal;
-	int err=UNZ_OK;
-	uLong uMagic;
-	long lSeek=0;
+    unz_s* s;
+    unz_file_info file_info;
+    unz_file_info_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (fseek(s->file,s->pos_in_central_dir+s->byte_before_the_zipfile,SEEK_SET)!=0)
-		err=UNZ_ERRNO;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (ZSEEK(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
 
 
-	/* we check the magic */
-	if (err==UNZ_OK) {
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
-			err=UNZ_ERRNO;
-		else if (uMagic!=0x02014b50)
-			err=UNZ_BADZIPFILE;
-	}
-	if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK)
-		err=UNZ_ERRNO;
+    /* we check the magic */
+    if (err==UNZ_OK)
+    {
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+    }
 
-	if (unzlocal_getShort(s->file,&file_info.version_needed) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.flag) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.compression_method) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.dosDate) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
 
     unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
 
-	if (unzlocal_getLong(s->file,&file_info.crc) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.compressed_size) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.uncompressed_size) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.size_filename) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.size_file_extra) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.size_file_comment) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.disk_num_start) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.internal_fa) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.external_fa) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	lSeek+=file_info.size_filename;
-	if ((err==UNZ_OK) && (szFileName!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_filename<fileNameBufferSize)
-		{
-			*(szFileName+file_info.size_filename)='\0';
-			uSizeRead = file_info.size_filename;
-		}
-		else
-			uSizeRead = fileNameBufferSize;
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
 
-		if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-			if (fread(szFileName,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		lSeek -= uSizeRead;
-	}
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
 
-	
-	if ((err==UNZ_OK) && (extraField!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_file_extra<extraFieldBufferSize)
-			uSizeRead = file_info.size_file_extra;
-		else
-			uSizeRead = extraFieldBufferSize;
 
-		if (lSeek!=0) {
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
-				lSeek=0;
-			else
-				err=UNZ_ERRNO;
-		}
-		if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) {
-			if (fread(extraField,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		}
-		lSeek += file_info.size_file_extra - uSizeRead;
-	}
-	else
-		lSeek+=file_info.size_file_extra; 
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
 
-	
-	if ((err==UNZ_OK) && (szComment!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_file_comment<commentBufferSize)
-		{
-			*(szComment+file_info.size_file_comment)='\0';
-			uSizeRead = file_info.size_file_comment;
-		}
-		else
-			uSizeRead = commentBufferSize;
+        if (lSeek!=0)
+        {
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek += file_info.size_file_extra - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_extra;
 
-		if (lSeek!=0) {
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
-				lSeek=0;
-			else
-				err=UNZ_ERRNO;
-		}
-		if ((file_info.size_file_comment>0) && (commentBufferSize>0)) {
-			if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		}
-		lSeek+=file_info.size_file_comment - uSizeRead;
-	}
-	else
-		lSeek+=file_info.size_file_comment;
 
-	if ((err==UNZ_OK) && (pfile_info!=NULL))
-		*pfile_info=file_info;
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
 
-	if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-		*pfile_info_internal=file_info_internal;
+        if (lSeek!=0)
+        {
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                err=UNZ_ERRNO;
+        }
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+    }
 
-	return err;
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
 }
 
 
@@ -1619,102 +743,77 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
   No preparation of the structure is needed
   return UNZ_OK if there is no problem.
 */
-extern int unzGetCurrentFileInfo (	unzFile file, unz_file_info *pfile_info,
-									char *szFileName, uLong fileNameBufferSize,
-									void *extraField, uLong extraFieldBufferSize,
-									char *szComment, uLong commentBufferSize)
+extern int ZEXPORT unzGetCurrentFileInfo (file,
+                                          pfile_info,
+                                          szFileName, fileNameBufferSize,
+                                          extraField, extraFieldBufferSize,
+                                          szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
 {
-	return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-												szFileName,fileNameBufferSize,
-												extraField,extraFieldBufferSize,
-												szComment,commentBufferSize);
+    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
 }
 
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
-extern int unzGoToFirstFile (unzFile file)
+extern int ZEXPORT unzGoToFirstFile (file)
+    unzFile file;
 {
-	int err=UNZ_OK;
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	s->pos_in_central_dir=s->offset_central_dir;
-	s->num_file=0;
-	err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											 &s->cur_file_info_internal,
-											 NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return err;
+    int err=UNZ_OK;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
 }
 
-
 /*
   Set the current file of the zipfile to the next file.
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
-extern int unzGoToNextFile (unzFile file)
+extern int ZEXPORT unzGoToNextFile (file)
+    unzFile file;
 {
-	unz_s* s;	
-	int err;
+    unz_s* s;
+    int err;
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
-	if (s->num_file+1==s->gi.number_entry)
-		return UNZ_END_OF_LIST_OF_FILE;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
 
-	s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-			s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-	s->num_file++;
-	err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											   &s->cur_file_info_internal,
-											   NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return err;
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
 }
 
-/*
-  Get the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-extern int unzGetCurrentFileInfoPosition (unzFile file, unsigned long *pos )
-{
-	unz_s* s;	
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-
-	*pos = s->pos_in_central_dir;
-	return UNZ_OK;
-}
-
-/*
-  Set the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-extern int unzSetCurrentFileInfoPosition (unzFile file, unsigned long pos )
-{
-	unz_s* s;	
-	int err;
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-
-	s->pos_in_central_dir = pos;
-	err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											   &s->cur_file_info_internal,
-											   NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return UNZ_OK;
-}
 
 /*
   Try locate the file szFileName in the zipfile.
@@ -1724,253 +823,403 @@ extern int unzSetCurrentFileInfoPosition (unzFile file, unsigned long pos )
   UNZ_OK if the file is found. It becomes the current file.
   UNZ_END_OF_LIST_OF_FILE if the file is not found
 */
-extern int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
+extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
+    unzFile file;
+    const char *szFileName;
+    int iCaseSensitivity;
 {
-	unz_s* s;	
-	int err;
+    unz_s* s;
+    int err;
 
-	
-	uLong num_fileSaved;
-	uLong pos_in_central_dirSaved;
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info cur_file_infoSaved;
+    unz_file_info_internal cur_file_info_internalSaved;
+    uLong num_fileSaved;
+    uLong pos_in_central_dirSaved;
 
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
 
     if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
         return UNZ_PARAMERROR;
 
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
 
-	num_fileSaved = s->num_file;
-	pos_in_central_dirSaved = s->pos_in_central_dir;
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
 
-	err = unzGoToFirstFile(file);
+    err = unzGoToFirstFile(file);
 
-	while (err == UNZ_OK)
-	{
-		char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-		unzGetCurrentFileInfo(file,NULL,
-								szCurrentFileName,sizeof(szCurrentFileName)-1,
-								NULL,0,NULL,0);
-		if (unzStringFileNameCompare(szCurrentFileName,
-										szFileName,iCaseSensitivity)==0)
-			return UNZ_OK;
-		err = unzGoToNextFile(file);
-	}
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
 
-	s->num_file = num_fileSaved ;
-	s->pos_in_central_dir = pos_in_central_dirSaved ;
-	return err;
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
 }
 
 
 /*
-  Read the static header of the current zipfile
-  Check the coherency of the static header and info in the end of central
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   // offset in file
+    uLong num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGoToFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
         directory about this file
-  store in *piSizeVar the size of extra info in static header
+  store in *piSizeVar the size of extra info in local header
         (filename and size of extra field data)
 */
-static int unzlocal_CheckCurrentFileCoherencyHeader (unz_s* s, uInt* piSizeVar,
-													uLong *poffset_local_extrafield,
-													uInt *psize_local_extrafield)
+
+local int unzlocal_CheckCurrentFileCoherencyHeader OF((
+    unz_s* s,
+    uInt* piSizeVar,
+    uLong *poffset_local_extrafield,
+    uInt  *psize_local_extrafield));
+
+
+local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
+                                                    poffset_local_extrafield,
+                                                    psize_local_extrafield)
+    unz_s* s;
+    uInt* piSizeVar;
+    uLong *poffset_local_extrafield;
+    uInt  *psize_local_extrafield;
 {
-	uLong uMagic,uData,uFlags;
-	uLong size_filename;
-	uLong size_extra_field;
-	int err=UNZ_OK;
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
 
-	*piSizeVar = 0;
-	*poffset_local_extrafield = 0;
-	*psize_local_extrafield = 0;
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
 
-	if (fseek(s->file,s->cur_file_info_internal.offset_curfile +
-								s->byte_before_the_zipfile,SEEK_SET)!=0)
-		return UNZ_ERRNO;
+    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
 
 
-	if (err==UNZ_OK) {
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
-			err=UNZ_ERRNO;
-		else if (uMagic!=0x04034b50)
-			err=UNZ_BADZIPFILE;
-	}
-	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (err==UNZ_OK)
+    {
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
 /*
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-		err=UNZ_BADZIPFILE;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
 */
-	if (unzlocal_getShort(s->file,&uFlags) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
 
     if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
                          (s->cur_file_info.compression_method!=Z_DEFLATED))
         err=UNZ_BADZIPFILE;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* date/time */
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* crc */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-		                      ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size compr */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-							  ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size uncompr */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && 
-							  ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
 
 
-	if (unzlocal_getShort(s->file,&size_filename) != UNZ_OK)
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
 
-	*piSizeVar += (uInt)size_filename;
+    *piSizeVar += (uInt)size_filename;
 
-	if (unzlocal_getShort(s->file,&size_extra_field) != UNZ_OK)
-		err=UNZ_ERRNO;
-	*poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-									SIZEZIPLOCALHEADER + size_filename;
-	*psize_local_extrafield = (uInt)size_extra_field;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
 
-	*piSizeVar += (uInt)size_extra_field;
+    *piSizeVar += (uInt)size_extra_field;
 
-	return err;
+    return err;
 }
-												
+
 /*
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int unzOpenCurrentFile (unzFile file)
+extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+    const char* password;
 {
-	int err=UNZ_OK;
-	int Store;
-	uInt iSizeVar;
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	uLong offset_local_extrafield;  /* offset of the static extra field */
-	uInt  size_local_extrafield;    /* size of the static extra field */
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uLong offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_PARAMERROR;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
 
     if (s->pfile_in_zip_read != NULL)
         unzCloseCurrentFile(file);
 
-	if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-				&offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-		return UNZ_BADZIPFILE;
+    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
+                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
 
-	pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-									    ALLOC(sizeof(file_in_zip_read_info_s));
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_INTERNALERROR;
+    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
+                                        ALLOC(sizeof(file_in_zip_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
 
-	pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-	pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-	pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-	pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
 
-	if (pfile_in_zip_read_info->read_buffer==NULL)
-	{
-		TRYFREE(pfile_in_zip_read_info);
-		return UNZ_INTERNALERROR;
-	}
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
 
-	pfile_in_zip_read_info->stream_initialised=0;
-	
-	if ((s->cur_file_info.compression_method!=0) &&
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
         (s->cur_file_info.compression_method!=Z_DEFLATED))
-		err=UNZ_BADZIPFILE;
-	Store = s->cur_file_info.compression_method==0;
+        err=UNZ_BADZIPFILE;
 
-	pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-	pfile_in_zip_read_info->crc32=0;
-	pfile_in_zip_read_info->compression_method =
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->compression_method =
             s->cur_file_info.compression_method;
-	pfile_in_zip_read_info->file=s->file;
-	pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
 
     pfile_in_zip_read_info->stream.total_out = 0;
 
-	if (!Store)
-	{
-	  pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-	  pfile_in_zip_read_info->stream.zfree = (free_func)0;
-	  pfile_in_zip_read_info->stream.opaque = (voidp)0; 
-      
-	  err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-	  if (err == Z_OK)
-	    pfile_in_zip_read_info->stream_initialised=1;
+    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
+        (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      if (inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS) == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=1;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+      }
         /* windowBits is passed < 0 to tell that there is no zlib header.
          * Note that in this case inflate *requires* an extra "dummy" byte
          * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. 
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the 
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
          * size of both compressed and uncompressed data
          */
-	}
-	pfile_in_zip_read_info->rest_read_compressed = 
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
             s->cur_file_info.compressed_size ;
-	pfile_in_zip_read_info->rest_read_uncompressed = 
+    pfile_in_zip_read_info->rest_read_uncompressed =
             s->cur_file_info.uncompressed_size ;
 
-	
-	pfile_in_zip_read_info->pos_in_zipfile = 
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + 
-			  iSizeVar;
-	
-	pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
 
 
-	s->pfile_in_zip_read = pfile_in_zip_read_info;
-    return UNZ_OK;
+    return err;
 }
 
-/*
-  Returns success if the current file is open
-*/
-extern qboolean unzIsCurrentFileOpen (unzFile file)
+extern int ZEXPORT unzOpenCurrentFile (file)
+    unzFile file;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
 
-	s = file;
+extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
+    unzFile file;
+    const char* password;
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
 
-	if(!s)
-		return qfalse;
-
-	pfile_in_zip_read_info = s->pfile_in_zip_read;
-
-	if(!pfile_in_zip_read_info)
-		return qfalse;
-
-	if(!pfile_in_zip_read_info->read_buffer)
-		return qfalse;
-
-	return qtrue;
+extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
 
 /*
@@ -1983,307 +1232,306 @@ extern qboolean unzIsCurrentFileOpen (unzFile file)
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
-extern int unzReadCurrentFile  (unzFile file, void *buf, unsigned len)
+extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
 {
-	int err=UNZ_OK;
-	uInt iRead = 0;
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
 
-	if (pfile_in_zip_read_info->read_buffer == NULL)
-		return UNZ_END_OF_LIST_OF_FILE;
-	if (len==0)
-		return 0;
+    if (pfile_in_zip_read_info->read_buffer == NULL)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
 
-	pfile_in_zip_read_info->stream.next_out = (Byte*)buf;
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
 
-	pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-	
-	if (len>pfile_in_zip_read_info->rest_read_uncompressed)
-		pfile_in_zip_read_info->stream.avail_out = 
-		  (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
 
-	while (pfile_in_zip_read_info->stream.avail_out>0)
-	{
-		if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
             (pfile_in_zip_read_info->rest_read_compressed>0))
-		{
-			uInt uReadThis = UNZ_BUFSIZE;
-			if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-				uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-			if (uReadThis == 0)
-				return UNZ_EOF;
-			if (s->cur_file_info.compressed_size == pfile_in_zip_read_info->rest_read_compressed)
-				if (fseek(pfile_in_zip_read_info->file,
-						  pfile_in_zip_read_info->pos_in_zipfile + 
-							 pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0)
-					return UNZ_ERRNO;
-			if (fread(pfile_in_zip_read_info->read_buffer,uReadThis,1,
-                         pfile_in_zip_read_info->file)!=1)
-				return UNZ_ERRNO;
-			pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
 
-			pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-			
-			pfile_in_zip_read_info->stream.next_in = 
-                (Byte*)pfile_in_zip_read_info->read_buffer;
-			pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-		}
 
-		if (pfile_in_zip_read_info->compression_method==0)
-		{
-			uInt uDoCopy,i ;
-			if (pfile_in_zip_read_info->stream.avail_out < 
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
                             pfile_in_zip_read_info->stream.avail_in)
-				uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-			else
-				uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-				
-			for (i=0;i<uDoCopy;i++)
-				*(pfile_in_zip_read_info->stream.next_out+i) =
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
                         *(pfile_in_zip_read_info->stream.next_in+i);
-					
-//			pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-//								pfile_in_zip_read_info->stream.next_out,
-//								uDoCopy);
-			pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-			pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-			pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-			pfile_in_zip_read_info->stream.next_out += uDoCopy;
-			pfile_in_zip_read_info->stream.next_in += uDoCopy;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
             pfile_in_zip_read_info->stream.total_out += uDoCopy;
-			iRead += uDoCopy;
-		}
-		else
-		{
-			uLong uTotalOutBefore,uTotalOutAfter;
-			const Byte *bufBefore;
-			uLong uOutThis;
-			int flush=Z_SYNC_FLUSH;
+            iRead += uDoCopy;
+        }
+        else
+        {
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+            int flush=Z_SYNC_FLUSH;
 
-			uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-			bufBefore = pfile_in_zip_read_info->stream.next_out;
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
 
-			/*
-			if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-			         pfile_in_zip_read_info->stream.avail_out) &&
-				(pfile_in_zip_read_info->rest_read_compressed == 0))
-				flush = Z_FINISH;
-			*/
-			err=inflate(&pfile_in_zip_read_info->stream,flush);
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
 
-			uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-			uOutThis = uTotalOutAfter-uTotalOutBefore;
-			
-//			pfile_in_zip_read_info->crc32 = 
-//                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-//                        (uInt)(uOutThis));
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
 
-			pfile_in_zip_read_info->rest_read_uncompressed -=
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
                 uOutThis;
 
-			iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-            
-			if (err==Z_STREAM_END)
-				return (iRead==0) ? UNZ_EOF : iRead;
-			if (err!=Z_OK) 
-				break;
-		}
-	}
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
 
-	if (err==Z_OK)
-		return iRead;
-	return err;
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
 }
 
 
 /*
   Give the current position in uncompressed data
 */
-extern long unztell (unzFile file)
+extern z_off_t ZEXPORT unztell (file)
+    unzFile file;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
-	return (long)pfile_in_zip_read_info->stream.total_out;
-}
-
-/*
-Seek to the specified offset according to the origin in uncompressed data
-*/
-extern long unzseek (unzFile file, long int offset, int origin)
-{
-	int new_origin;
-	int current_origin;
-	int amount;
-	unz_s* s = file;
-	char data[32000];
-
-	current_origin = unztell(file);
-	new_origin = current_origin;
-
-	switch(origin)
-	{
-	case SEEK_CUR:
-		new_origin = offset + current_origin;
-		break;
-	case SEEK_SET:
-		new_origin = offset;
-		break;
-	case SEEK_END:
-		new_origin = s->cur_file_info.uncompressed_size - offset;
-		break;
-	}
-
-	if(new_origin < current_origin)
-	{
-		return -1;
-	}
-
-
-	for( ; current_origin < new_origin; current_origin += amount )
-	{
-		amount = new_origin - current_origin;
-
-		if(new_origin - current_origin > sizeof(data))
-		{
-			amount = sizeof( data );
-		}
-
-		unzReadCurrentFile(file, data, amount);
-	}
-
-	return 0;
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
 }
 
 
 /*
-  return 1 if the end of file was reached, 0 elsewhere 
+  return 1 if the end of file was reached, 0 elsewhere
 */
-extern int unzeof (unzFile file)
+extern int ZEXPORT unzeof (file)
+    unzFile file;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-	
-	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-		return 1;
-	else
-		return 0;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
 }
 
 
 
 /*
   Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the static-header version of the extra field (sometimes, there is
-    more info in the static-header version than in the central-header)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
 
-  if buf==NULL, it return the size of the static extra field that can be read
+  if buf==NULL, it return the size of the local extra field that can be read
 
   if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of bytes copied in buf, or (if <0) 
-	the error code
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
 */
-extern int unzGetLocalExtrafield (unzFile file,void *buf,unsigned len)
+extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	uInt read_now;
-	uLong size_to_read;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    uLong size_to_read;
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
-	size_to_read = (pfile_in_zip_read_info->size_local_extrafield - 
-				pfile_in_zip_read_info->pos_local_extrafield);
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
 
-	if (buf==NULL)
-		return (int)size_to_read;
-	
-	if (len>size_to_read)
-		read_now = (uInt)size_to_read;
-	else
-		read_now = (uInt)len ;
+    if (buf==NULL)
+        return (int)size_to_read;
 
-	if (read_now==0)
-		return 0;
-	
-	if (fseek(pfile_in_zip_read_info->file,
-              pfile_in_zip_read_info->offset_local_extrafield + 
-			  pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)
-		return UNZ_ERRNO;
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
 
-	if (fread(buf,(uInt)size_to_read,1,pfile_in_zip_read_info->file)!=1)
-		return UNZ_ERRNO;
+    if (read_now==0)
+        return 0;
 
-	return (int)read_now;
+    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
 }
 
 /*
   Close the file in zip opened with unzipOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
-extern int unzCloseCurrentFile (unzFile file)
+extern int ZEXPORT unzCloseCurrentFile (file)
+    unzFile file;
 {
-	int err=UNZ_OK;
+    int err=UNZ_OK;
 
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
-/*
-	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-	{
-		if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-			err=UNZ_CRCERROR;
-	}
-*/
 
-	TRYFREE(pfile_in_zip_read_info->read_buffer);
-	pfile_in_zip_read_info->read_buffer = NULL;
-	if (pfile_in_zip_read_info->stream_initialised)
-		inflateEnd(&pfile_in_zip_read_info->stream);
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
 
-	pfile_in_zip_read_info->stream_initialised = 0;
-	TRYFREE(pfile_in_zip_read_info);
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
 
     s->pfile_in_zip_read=NULL;
 
-	return err;
+    return err;
 }
 
 
@@ -2292,2081 +1540,39 @@ extern int unzCloseCurrentFile (unzFile file)
   uSizeBuf is the size of the szComment buffer.
   return the number of byte copied or an error code <0
 */
-extern int unzGetGlobalComment (unzFile file, char *szComment, uLong uSizeBuf)
+extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
+    unzFile file;
+    char *szComment;
+    uLong uSizeBuf;
 {
-	unz_s* s;
-	uLong uReadThis ;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
 
-	uReadThis = uSizeBuf;
-	if (uReadThis>s->gi.size_comment)
-		uReadThis = s->gi.size_comment;
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
 
-	if (fseek(s->file,s->central_pos+22,SEEK_SET)!=0)
-		return UNZ_ERRNO;
+    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
 
-	if (uReadThis>0)
+    if (uReadThis>0)
     {
       *szComment='\0';
-	  if (fread(szComment,(uInt)uReadThis,1,s->file)!=1)
-		return UNZ_ERRNO;
+      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
     }
 
-	if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-		*(szComment+s->gi.size_comment)='\0';
-	return (int)uReadThis;
-}
-
-/* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 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.
- */
-
-struct inflate_blocks_state;
-typedef struct inflate_blocks_state inflate_blocks_statef;
-
-static inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-static int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-static void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLong *));                  /* check value on output */
-
-static int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-#if 0
-static void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Byte *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-static int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
-#endif
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* Table for deflate from PKZIP's appnote.txt. */
-static const uInt border[] = { /* Order of the bit length code lengths */
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1998 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.
- */
-
-/* Huffman code lookup table entry--this entry is four bytes for machines
-   that have 16-bit pointers (e.g. PC's in the small or medium model). */
-
-typedef struct inflate_huft_s inflate_huft;
-
-struct inflate_huft_s {
-  union {
-    struct {
-      Byte Exop;        /* number of extra bits or operation */
-      Byte Bits;        /* number of bits in this code or subcode */
-    } what;
-    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
-  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
-  uInt base;            /* literal, length base, distance base,
-                           or table offset */
-};
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 huft structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
-   exhaustive search).  The actual maximum is not known, but the
-   value below is more than safe. */
-#define MANY 1440
-
-static  int inflate_trees_bits OF((
-    uInt *,                    /* 19 code lengths */
-    uInt *,                    /* bits tree desired/actual depth */
-    inflate_huft * *,       /* bits tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-static  int inflate_trees_dynamic OF((
-    uInt,                       /* number of literal/length codes */
-    uInt,                       /* number of distance codes */
-    uInt *,                    /* that many (total) code lengths */
-    uInt *,                    /* literal desired/actual bit depth */
-    uInt *,                    /* distance desired/actual bit depth */
-    inflate_huft * *,       /* literal/length tree result */
-    inflate_huft * *,       /* distance tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-static  int inflate_trees_fixed OF((
-    uInt *,                    /* literal desired/actual bit depth */
-    uInt *,                    /* distance desired/actual bit depth */
-    inflate_huft * *,       /* literal/length tree result */
-    inflate_huft * *,       /* distance tree result */
-    z_streamp));                /* for memory allocation */
-
-
-/* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-1998 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.
- */
-
-struct inflate_codes_state;
-typedef struct inflate_codes_state inflate_codes_statef;
-
-static inflate_codes_statef *inflate_codes_new OF((
-    uInt, uInt,
-    inflate_huft *, inflate_huft *,
-    z_streamp ));
-
-static  int inflate_codes OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-static  void inflate_codes_free OF((
-    inflate_codes_statef *,
-    z_streamp ));
-
-/* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-1998 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.
- */
-
-#ifndef _INFUTIL_H
-#define _INFUTIL_H
-
-typedef enum {
-      TYPE,     /* get type bits (3, including end bit) */
-      LENS,     /* get lengths for stored */
-      STORED,   /* processing stored block */
-      TABLE,    /* get table lengths */
-      BTREE,    /* get bit lengths tree for a dynamic block */
-      DTREE,    /* get length, distance trees for a dynamic block */
-      CODES,    /* processing fixed or dynamic block */
-      DRY,      /* output remaining window bytes */
-      DONE,     /* finished last block, done */
-      BAD}      /* got a data error--stuck here */
-inflate_block_mode;
-
-/* inflate blocks semi-private state */
-struct inflate_blocks_state {
-
-  /* mode */
-  inflate_block_mode  mode;     /* current inflate_block mode */
-
-  /* mode dependent information */
-  union {
-    uInt left;          /* if STORED, bytes left to copy */
-    struct {
-      uInt table;               /* table lengths (14 bits) */
-      uInt index;               /* index into blens (or border) */
-      uInt *blens;             /* bit lengths of codes */
-      uInt bb;                  /* bit length tree depth */
-      inflate_huft *tb;         /* bit length decoding tree */
-    } trees;            /* if DTREE, decoding info for trees */
-    struct {
-      inflate_codes_statef 
-         *codes;
-    } decode;           /* if CODES, current state */
-  } sub;                /* submode */
-  uInt last;            /* true if this block is the last block */
-
-  /* mode independent information */
-  uInt bitk;            /* bits in bit buffer */
-  uLong bitb;           /* bit buffer */
-  inflate_huft *hufts;  /* single malloc for tree space */
-  Byte *window;        /* sliding window */
-  Byte *end;           /* one byte after sliding window */
-  Byte *read;          /* window read pointer */
-  Byte *write;         /* window write pointer */
-  check_func checkfn;   /* check function */
-  uLong check;          /* check on output */
-
-};
-
-
-/* defines for inflate input/output */
-/*   update pointers and return */
-#define UPDBITS {s->bitb=b;s->bitk=k;}
-#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
-#define UPDOUT {s->write=q;}
-#define UPDATE {UPDBITS UPDIN UPDOUT}
-#define LEAVE {UPDATE return inflate_flush(s,z,r);}
-/*   get bytes and bits */
-#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
-#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
-#define NEXTBYTE (n--,*p++)
-#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define DUMPBITS(j) {b>>=(j);k-=(j);}
-/*   output bytes */
-#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
-#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
-#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
-#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
-#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
-/*   load static pointers */
-#define LOAD {LOADIN LOADOUT}
-
-/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
-static  uInt inflate_mask[17];
-
-/* copy as much as possible from the sliding window to the output area */
-static  int inflate_flush OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-#endif
-
-								
-/*
-   Notes beyond the 1.93a appnote.txt:
-
-   1. Distance pointers never point before the beginning of the output
-      stream.
-   2. Distance pointers can point back across blocks, up to 32k away.
-   3. There is an implied maximum of 7 bits for the bit length table and
-      15 bits for the actual data.
-   4. If only one code exists, then it is encoded using one bit.  (Zero
-      would be more efficient, but perhaps a little confusing.)  If two
-      codes exist, they are coded using one bit each (0 and 1).
-   5. There is no way of sending zero distance codes--a dummy must be
-      sent if there are none.  (History: a pre 2.0 version of PKZIP would
-      store blocks with no distance codes, but this was discovered to be
-      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
-      zero distance codes, which is sent as one code of zero bits in
-      length.
-   6. There are up to 286 literal/length codes.  Code 256 represents the
-      end-of-block.  Note however that the static length tree defines
-      288 codes just to fill out the Huffman codes.  Codes 286 and 287
-      cannot be used though, since there is no length base or extra bits
-      defined for them.  Similarily, there are up to 30 distance codes.
-      However, static trees define 32 codes (all 5 bits) to fill out the
-      Huffman codes, but the last two had better not show up in the data.
-   7. Unzip can check dynamic Huffman blocks for complete code sets.
-      The exception is that a single code would not be complete (see #4).
-   8. The five bits following the block type is really the number of
-      literal codes sent minus 257.
-   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
-      (1+6+6).  Therefore, to output three times the length, you output
-      three codes (1+1+1), whereas to output four times the same length,
-      you only need two codes (1+3).  Hmm.
-  10. In the tree reconstruction algorithm, Code = Code + Increment
-      only if BitLength(i) is not zero.  (Pretty obvious.)
-  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
-  12. Note: length code 284 can represent 227-258, but length code 285
-      really is 258.  The last length deserves its own, short code
-      since it gets used a lot in very redundant files.  The length
-      258 is special since 258 - 3 (the min match length) is 255.
-  13. The literal/length and distance code bit lengths are read as a
-      single stream of lengths.  It is possible (and advantageous) for
-      a repeat code (16, 17, or 18) to go across the boundary between
-      the two sets of lengths.
- */
-
-
-void inflate_blocks_reset(inflate_blocks_statef *s, z_streamp z, uLong *c)
-{
-  if (c != Z_NULL)
-    *c = s->check;
-  if (s->mode == BTREE || s->mode == DTREE)
-    ZFREE(z, s->sub.trees.blens);
-  if (s->mode == CODES)
-    inflate_codes_free(s->sub.decode.codes, z);
-  s->mode = TYPE;
-  s->bitk = 0;
-  s->bitb = 0;
-  s->read = s->write = s->window;
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(0L, (const Byte *)Z_NULL, 0);
-  Tracev(("inflate:   blocks reset\n"));
-}
-
-
-inflate_blocks_statef *inflate_blocks_new(z_streamp z, check_func c, uInt w)
-{
-  inflate_blocks_statef *s;
-
-  if ((s = (inflate_blocks_statef *)ZALLOC
-       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
-    return s;
-  if ((s->hufts =
-       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
-  {
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  if ((s->window = (Byte *)ZALLOC(z, 1, w)) == Z_NULL)
-  {
-    ZFREE(z, s->hufts);
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  s->end = s->window + w;
-  s->checkfn = c;
-  s->mode = TYPE;
-  Tracev(("inflate:   blocks allocated\n"));
-  inflate_blocks_reset(s, z, Z_NULL);
-  return s;
-}
-
-
-int inflate_blocks(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt t;               /* temporary storage */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Byte *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Byte *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input based on current state */
-  while (1) switch (s->mode)
-  {
-    case TYPE:
-      NEEDBITS(3)
-      t = (uInt)b & 7;
-      s->last = t & 1;
-      switch (t >> 1)
-      {
-        case 0:                         /* stored */
-          Tracev(("inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          t = k & 7;                    /* go to byte boundary */
-          DUMPBITS(t)
-          s->mode = LENS;               /* get length of stored block */
-          break;
-        case 1:                         /* fixed */
-          Tracev(("inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
-          {
-            uInt bl, bd;
-            inflate_huft *tl, *td;
-            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
-            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
-            if (s->sub.decode.codes == Z_NULL)
-            {
-              r = Z_MEM_ERROR;
-              LEAVE
-            }
-          }
-          DUMPBITS(3)
-          s->mode = CODES;
-          break;
-        case 2:                         /* dynamic */
-          Tracev(("inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          s->mode = TABLE;
-          break;
-        case 3:                         /* illegal */
-          DUMPBITS(3)
-          s->mode = BAD;
-          z->msg = (char*)"invalid block type";
-          r = Z_DATA_ERROR;
-          LEAVE
-      }
-      break;
-    case LENS:
-      NEEDBITS(32)
-      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
-      {
-        s->mode = BAD;
-        z->msg = (char*)"invalid stored block lengths";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-      s->sub.left = (uInt)b & 0xffff;
-      b = k = 0;                      /* dump bits */
-      Tracev(("inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
-      break;
-    case STORED:
-      if (n == 0)
-        LEAVE
-      NEEDOUT
-      t = s->sub.left;
-      if (t > n) t = n;
-      if (t > m) t = m;
-      zmemcpy(q, p, t);
-      p += t;  n -= t;
-      q += t;  m -= t;
-      if ((s->sub.left -= t) != 0)
-        break;
-      Tracev(("inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      s->mode = s->last ? DRY : TYPE;
-      break;
-    case TABLE:
-      NEEDBITS(14)
-      s->sub.trees.table = t = (uInt)b & 0x3fff;
-#ifndef PKZIP_BUG_WORKAROUND
-      if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
-      {
-        s->mode = BAD;
-        z->msg = (char*)"too many length or distance symbols";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-#endif
-      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
-      if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
-      {
-        r = Z_MEM_ERROR;
-        LEAVE
-      }
-      DUMPBITS(14)
-      s->sub.trees.index = 0;
-      Tracev(("inflate:       table sizes ok\n"));
-      s->mode = BTREE;
-    case BTREE:
-      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
-      {
-        NEEDBITS(3)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-        DUMPBITS(3)
-      }
-      while (s->sub.trees.index < 19)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
-      s->sub.trees.bb = 7;
-      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, s->hufts, z);
-      if (t != Z_OK)
-      {
-        ZFREE(z, s->sub.trees.blens);
-        r = t;
-        if (r == Z_DATA_ERROR)
-          s->mode = BAD;
-        LEAVE
-      }
-      s->sub.trees.index = 0;
-      Tracev(("inflate:       bits tree ok\n"));
-      s->mode = DTREE;
-    case DTREE:
-      while (t = s->sub.trees.table,
-             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
-      {
-        inflate_huft *h;
-        uInt i, j, c;
-
-        t = s->sub.trees.bb;
-        NEEDBITS(t)
-        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-        t = h->bits;
-        c = h->base;
-        if (c < 16)
-        {
-          DUMPBITS(t)
-          s->sub.trees.blens[s->sub.trees.index++] = c;
-        }
-        else /* c == 16..18 */
-        {
-          i = c == 18 ? 7 : c - 14;
-          j = c == 18 ? 11 : 3;
-          NEEDBITS(t + i)
-          DUMPBITS(t)
-          j += (uInt)b & inflate_mask[i];
-          DUMPBITS(i)
-          i = s->sub.trees.index;
-          t = s->sub.trees.table;
-          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-              (c == 16 && i < 1))
-          {
-            ZFREE(z, s->sub.trees.blens);
-            s->mode = BAD;
-            z->msg = (char*)"invalid bit length repeat";
-            r = Z_DATA_ERROR;
-            LEAVE
-          }
-          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-          do {
-            s->sub.trees.blens[i++] = c;
-          } while (--j);
-          s->sub.trees.index = i;
-        }
-      }
-      s->sub.trees.tb = Z_NULL;
-      {
-        uInt bl, bd;
-        inflate_huft *tl, *td;
-        inflate_codes_statef *c;
-
-        tl = NULL;
-        td = NULL;
-        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;         /* must be <= 9 for lookahead assumptions */
-        t = s->sub.trees.table;
-        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
-                                  s->hufts, z);
-        ZFREE(z, s->sub.trees.blens);
-        if (t != Z_OK)
-        {
-          if (t == (uInt)Z_DATA_ERROR)
-            s->mode = BAD;
-          r = t;
-          LEAVE
-        }
-        Tracev(("inflate:       trees ok\n"));
-        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-        {
-          r = Z_MEM_ERROR;
-          LEAVE
-        }
-        s->sub.decode.codes = c;
-      }
-      s->mode = CODES;
-    case CODES:
-      UPDATE
-      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-        return inflate_flush(s, z, r);
-      r = Z_OK;
-      inflate_codes_free(s->sub.decode.codes, z);
-      LOAD
-      Tracev(("inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      if (!s->last)
-      {
-        s->mode = TYPE;
-        break;
-      }
-      s->mode = DRY;
-    case DRY:
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      s->mode = DONE;
-    case DONE:
-      r = Z_STREAM_END;
-      LEAVE
-    case BAD:
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-}
-
-
-int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
-{
-  inflate_blocks_reset(s, z, Z_NULL);
-  ZFREE(z, s->window);
-  ZFREE(z, s->hufts);
-  ZFREE(z, s);
-  Tracev(("inflate:   blocks freed\n"));
-  return Z_OK;
-}
-
-#if 0
-void inflate_set_dictionary(inflate_blocks_statef *s, const Byte *d, uInt n)
-{
-  zmemcpy(s->window, d, n);
-  s->read = s->write = s->window + n;
-}
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
- * IN assertion: s != Z_NULL
- */
-int inflate_blocks_sync_point(inflate_blocks_statef *s)
-{
-  return s->mode == LENS;
-}
-#endif
-
-
-/* And'ing with mask[n] masks the lower n bits */
-static uInt inflate_mask[17] = {
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
-};
-
-
-/* copy as much as possible from the sliding window to the output area */
-int inflate_flush(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt n;
-  Byte *p;
-  Byte *q;
-
-  /* static copies of source and destination pointers */
-  p = z->next_out;
-  q = s->read;
-
-  /* compute number of bytes to copy as as end of window */
-  n = (uInt)((q <= s->write ? s->write : s->end) - q);
-  if (n > z->avail_out) n = z->avail_out;
-  if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-  /* update counters */
-  z->avail_out -= n;
-  z->total_out += n;
-
-  /* update check information */
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-  /* copy as as end of window */
-  zmemcpy(p, q, n);
-  p += n;
-  q += n;
-
-  /* see if more to copy at beginning of window */
-  if (q == s->end)
-  {
-    /* wrap pointers */
-    q = s->window;
-    if (s->write == s->end)
-      s->write = s->window;
-
-    /* compute bytes to copy */
-    n = (uInt)(s->write - q);
-    if (n > z->avail_out) n = z->avail_out;
-    if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-    /* update counters */
-    z->avail_out -= n;
-    z->total_out += n;
-
-    /* update check information */
-    if (s->checkfn != Z_NULL)
-      z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-    /* copy */
-    zmemcpy(p, q, n);
-    p += n;
-    q += n;
-  }
-
-  /* update pointers */
-  z->next_out = p;
-  s->read = q;
-
-  /* done */
-  return r;
-}
-
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
-  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.
- */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-
-static int huft_build OF((
-    uInt *,				/* code lengths in bits */
-    uInt,               /* number of codes */
-    uInt,               /* number of "simple" codes */
-    const uInt *,		/* list of base values for non-simple codes */
-    const uInt *,		/* list of extra bits for non-simple codes */
-    inflate_huft **,	/* result: starting table */
-    uInt *,				/* maximum lookup bits (returns actual) */
-    inflate_huft *,     /* space for trees */
-    uInt *,             /* hufts used in space */
-    uInt * ));			/* space for values */
-
-/* Tables for deflate from PKZIP's appnote.txt. */
-static const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
-        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};
-        /* see note #13 above about 258 */
-static const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
-static const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
-        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};
-static const uInt cpdext[30] = { /* Extra bits for distance codes */
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-/*
-   Huffman code decoding is performed using a multi-level table lookup.
-   The fastest way to decode is to simply build a lookup table whose
-   size is determined by the longest code.  However, the time it takes
-   to build this table can also be a factor if the data being decoded
-   is not very long.  The most common codes are necessarily the
-   shortest codes, so those codes dominate the decoding time, and hence
-   the speed.  The idea is you can have a shorter table that decodes the
-   shorter, more probable codes, and then point to subsidiary tables for
-   the longer codes.  The time it costs to decode the longer codes is
-   then traded against the time it takes to make longer tables.
-
-   This results of this trade are in the variables lbits and dbits
-   below.  lbits is the number of bits the first level table for literal/
-   length codes can decode in one step, and dbits is the same thing for
-   the distance codes.  Subsequent tables are also less than or equal to
-   those sizes.  These values may be adjusted either when all of the
-   codes are shorter than that, in which case the longest code length in
-   bits is used, or when the shortest code is *longer* than the requested
-   table size, in which case the length of the shortest code in bits is
-   used.
-
-   There are two different values for the two tables, since they code a
-   different number of possibilities each.  The literal/length table
-   codes 286 possible values, or in a flat code, a little over eight
-   bits.  The distance table codes 30 possible values, or a little less
-   than five bits, flat.  The optimum values for speed end up being
-   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
-   The optimum values may differ though from machine to machine, and
-   possibly even between compilers.  Your mileage may vary.
- */
-
-
-/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
-#define BMAX 15         /* maximum bit length of any code */
-
-static int huft_build(uInt *b, uInt n, uInt s, const uInt *d, const uInt *e, inflate_huft ** t, uInt *m, inflate_huft *hp, uInt *hn, uInt *v)
-//uInt *b;               /* code lengths in bits (all assumed <= BMAX) */
-//uInt n;                 /* number of codes (assumed <= 288) */
-//uInt s;                 /* number of simple-valued codes (0..s-1) */
-//const uInt *d;         /* list of base values for non-simple codes */
-//const uInt *e;         /* list of extra bits for non-simple codes */
-//inflate_huft ** t;		/* result: starting table */
-//uInt *m;               /* maximum lookup bits, returns actual */
-//inflate_huft *hp;       /* space for trees */
-//uInt *hn;               /* hufts used in space */
-//uInt *v;               /* working area: values in order of bit length */
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
-   if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   lengths), or Z_MEM_ERROR if not enough memory. */
-{
-
-  uInt a;                       /* counter for codes of length k */
-  uInt c[BMAX+1];               /* bit length count table */
-  uInt f;                       /* i repeats in table every f entries */
-  int g;                        /* maximum code length */
-  int h;                        /* table level */
-  register uInt i;              /* counter, current code */
-  register uInt j;              /* counter */
-  register int k;               /* number of bits in current code */
-  int l;                        /* bits per table (returned in m) */
-  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
-  register uInt *p;            /* pointer into c[], b[], or v[] */
-  inflate_huft *q;              /* points to current table */
-  struct inflate_huft_s r = {{{0, 0}}};      /* table entry for structure assignment */
-  inflate_huft *u[BMAX];        /* table stack */
-  register int w;               /* bits before this table == (l * h) */
-  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uInt *xp;                    /* pointer into x */
-  int y;                        /* number of dummy codes added */
-  uInt z;                       /* number of entries in current table */
-
-
-  /* Generate counts for each bit length */
-  p = c;
-#define C0 *p++ = 0;
-#define C2 C0 C0 C0 C0
-#define C4 C2 C2 C2 C2
-  C4                            /* clear c[]--assume BMAX+1 is 16 */
-  p = b;  i = n;
-  do {
-    c[*p++]++;                  /* assume all entries <= BMAX */
-  } while (--i);
-  if (c[0] == n)                /* null input--all zero length codes */
-  {
-    *t = (inflate_huft *)Z_NULL;
-    *m = 0;
-    return Z_OK;
-  }
-
-
-  /* Find minimum and maximum length, bound *m by those */
-  l = *m;
-  for (j = 1; j <= BMAX; j++)
-    if (c[j])
-      break;
-  k = j;                        /* minimum code length */
-  if ((uInt)l < j)
-    l = j;
-  for (i = BMAX; i; i--)
-    if (c[i])
-      break;
-  g = i;                        /* maximum code length */
-  if ((uInt)l > i)
-    l = i;
-  *m = l;
-
-
-  /* Adjust last length count to fill out codes, if needed */
-  for (y = 1 << j; j < i; j++, y <<= 1)
-    if ((y -= c[j]) < 0)
-      return Z_DATA_ERROR;
-  if ((y -= c[i]) < 0)
-    return Z_DATA_ERROR;
-  c[i] += y;
-
-
-  /* Generate starting offsets into the value table for each length */
-  x[1] = j = 0;
-  p = c + 1;  xp = x + 2;
-  while (--i) {                 /* note that i == g from above */
-    *xp++ = (j += *p++);
-  }
-
-
-  /* Make a table of values in order of bit lengths */
-  p = b;  i = 0;
-  do {
-    if ((j = *p++) != 0)
-      v[x[j]++] = i;
-  } while (++i < n);
-  n = x[g];                     /* set n to length of v */
-
-
-  /* Generate the Huffman codes and for each, make the table entries */
-  x[0] = i = 0;                 /* first Huffman code is zero */
-  p = v;                        /* grab values in bit order */
-  h = -1;                       /* no tables yet--level -1 */
-  w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
-  q = (inflate_huft *)Z_NULL;   /* ditto */
-  z = 0;                        /* ditto */
-
-  /* go through the bit lengths (k already is bits in shortest code) */
-  for (; k <= g; k++)
-  {
-    a = c[k];
-    while (a--)
-    {
-      /* here i is the Huffman code of length k bits for value *p */
-      /* make tables up to required level */
-      while (k > w + l)
-      {
-        h++;
-        w += l;                 /* previous table always l bits */
-
-        /* compute minimum size table less than or equal to l bits */
-        z = g - w;
-        z = z > (uInt)l ? l : z;        /* table size upper limit */
-        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
-        {                       /* too few codes for k-w bit table */
-          f -= a + 1;           /* deduct codes from patterns left */
-          xp = c + k;
-          if (j < z)
-            while (++j < z)     /* try smaller tables up to z bits */
-            {
-              if ((f <<= 1) <= *++xp)
-                break;          /* enough codes to use up j bits */
-              f -= *xp;         /* else deduct codes from patterns */
-            }
-        }
-        z = 1 << j;             /* table entries for j-bit table */
-
-        /* allocate new table */
-        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_MEM_ERROR;   /* not enough memory */
-        u[h] = q = hp + *hn;
-        *hn += z;
-
-        /* connect to last table, if there is one */
-        if (h)
-        {
-          x[h] = i;             /* save pattern for backing up */
-          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = (Byte)j;     /* bits in this table */
-          j = i >> (w - l);
-          r.base = (uInt)(q - u[h-1] - j);   /* offset to this table */
-          u[h-1][j] = r;        /* connect to last table */
-        }
-        else
-          *t = q;               /* first table is returned result */
-      }
-
-      /* set up table entry in r */
-      r.bits = (Byte)(k - w);
-      if (p >= v + n)
-        r.exop = 128 + 64;      /* out of values--invalid code */
-      else if (*p < s)
-      {
-        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
-        r.base = *p++;          /* simple code is just the value */
-      }
-      else
-      {
-        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
-        r.base = d[*p++ - s];
-      }
-
-      /* fill code-like entries with r */
-      f = 1 << (k - w);
-      for (j = i >> w; j < z; j += f)
-        q[j] = r;
-
-      /* backwards increment the k-bit code i */
-      for (j = 1 << (k - 1); i & j; j >>= 1)
-        i ^= j;
-      i ^= j;
-
-      /* backup over finished tables */
-      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
-      while ((i & mask) != x[h])
-      {
-        h--;                    /* don't need to update q */
-        w -= l;
-        mask = (1 << w) - 1;
-      }
-    }
-  }
-
-
-  /* Return Z_BUF_ERROR if we were given an incomplete table */
-  return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
-}
-
-
-int inflate_trees_bits(uInt *c, uInt *bb, inflate_huft * *tb, inflate_huft *hp, z_streamp z)
-//uInt *c;               /* 19 code lengths */
-//uInt *bb;              /* bits tree desired/actual depth */
-//inflate_huft * *tb; /* bits tree result */
-//inflate_huft *hp;       /* space for trees */
-//z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uInt *v;             /* work area for huft_build */
-
-  if ((v = (uInt*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-  r = huft_build(c, 19, 19, (uInt*)Z_NULL, (uInt*)Z_NULL,
-                 tb, bb, hp, &hn, v);
-  if (r == Z_DATA_ERROR)
-    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-  else if (r == Z_BUF_ERROR || *bb == 0)
-  {
-    z->msg = (char*)"incomplete dynamic bit lengths tree";
-    r = Z_DATA_ERROR;
-  }
-  ZFREE(z, v);
-  return r;
-}
-
-
-int inflate_trees_dynamic(uInt nl, uInt nd, uInt *c, uInt *bl, uInt *bd, inflate_huft * *tl, inflate_huft * *td, inflate_huft *hp, z_streamp z)
-//uInt nl;                /* number of literal/length codes */
-//uInt nd;                /* number of distance codes */
-//uInt *c;               /* that many (total) code lengths */
-//uInt *bl;              /* literal desired/actual bit depth */
-//uInt *bd;              /* distance desired/actual bit depth */
-//inflate_huft * *tl; /* literal/length tree result */
-//inflate_huft * *td; /* distance tree result */
-//inflate_huft *hp;       /* space for trees */
-//z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uInt *v;             /* work area for huft_build */
-
-  /* allocate work area */
-  if ((v = (uInt*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-
-  /* build literal/length tree */
-  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
-  if (r != Z_OK || *bl == 0)
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed literal/length tree";
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"incomplete literal/length tree";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-  }
-
-  /* build distance tree */
-  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
-  if (r != Z_OK || (*bd == 0 && nl > 257))
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed distance tree";
-    else if (r == Z_BUF_ERROR) {
-#ifdef PKZIP_BUG_WORKAROUND
-      r = Z_OK;
-    }
-#else
-      z->msg = (char*)"incomplete distance tree";
-      r = Z_DATA_ERROR;
-    }
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"empty distance tree with lengths";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-#endif
-  }
-
-  /* done */
-  ZFREE(z, v);
-  return Z_OK;
-}
-
-/* inffixed.h -- table for decoding fixed codes
- * Generated automatically by the maketree.c program
- */
-
-/* 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.
- */
-
-static uInt fixed_bl = 9;
-static uInt fixed_bd = 5;
-static inflate_huft fixed_tl[] = {
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
-    {{{82,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}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
-    {{{82,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}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
-    {{{82,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}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
-  };
-static inflate_huft fixed_td[] = {
-    {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
-    {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
-    {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
-    {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
-    {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
-    {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
-    {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
-    {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
-  };
-
-int inflate_trees_fixed(uInt *bl, uInt *bd, inflate_huft * *tl, inflate_huft * *td, z_streamp z)
-//uInt *bl;               /* literal desired/actual bit depth */
-//uInt *bd;               /* distance desired/actual bit depth */
-//inflate_huft * *tl;  /* literal/length tree result */
-//inflate_huft * *td;  /* distance tree result */
-//z_streamp z;             /* for memory allocation */
-{
-  *bl = fixed_bl;
-  *bd = fixed_bd;
-  *tl = fixed_tl;
-  *td = fixed_td;
-  return Z_OK;
-}
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* macros for bit input with no checking and for returning unused bytes */
-#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
-
-/* Called with number of bytes left to write in window at least 258
-   (the maximum string length) and number of input bytes available
-   at least ten.  The ten bytes are six bytes for the longest length/
-   distance pair plus four bytes for overloading the bit buffer. */
-
-static int inflate_fast(uInt bl, uInt bd, inflate_huft *tl, inflate_huft *td, inflate_blocks_statef *s, z_streamp z)
-{
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Byte *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Byte *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  uInt ml;              /* mask for literal/length tree */
-  uInt md;              /* mask for distance tree */
-  uInt c;               /* bytes to copy */
-  uInt d;               /* distance back to copy from */
-  Byte *r;             /* copy source pointer */
-
-  /* load input, output, bit values */
-  LOAD
-
-  /* initialize masks */
-  ml = inflate_mask[bl];
-  md = inflate_mask[bd];
-
-  /* do until not enough input or output space for fast loop */
-  do {                          /* assume called with m >= 258 && n >= 10 */
-    /* get literal/length code */
-    GRABBITS(20)                /* max bits for literal/length code */
-    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
-    {
-      DUMPBITS(t->bits)
-      Tracevv((t->base >= 0x20 && t->base < 0x7f ?
-                "inflate:         * literal '%c'\n" :
-                "inflate:         * literal 0x%02x\n", t->base));
-      *q++ = (Byte)t->base;
-      m--;
-      continue;
-    }
-    do {
-      DUMPBITS(t->bits)
-      if (e & 16)
-      {
-        /* get extra bits for length */
-        e &= 15;
-        c = t->base + ((uInt)b & inflate_mask[e]);
-        DUMPBITS(e)
-        Tracevv(("inflate:         * length %u\n", c));
-
-        /* decode distance base of block to copy */
-        GRABBITS(15);           /* max bits for distance code */
-        e = (t = td + ((uInt)b & md))->exop;
-        do {
-          DUMPBITS(t->bits)
-          if (e & 16)
-          {
-            /* get extra bits to add to distance base */
-            e &= 15;
-            GRABBITS(e)         /* get extra bits (up to 13) */
-            d = t->base + ((uInt)b & inflate_mask[e]);
-            DUMPBITS(e)
-            Tracevv(("inflate:         * distance %u\n", d));
-
-            /* do the copy */
-            m -= c;
-            if ((uInt)(q - s->window) >= d)     /* offset before dest */
-            {                                   /*  just copy */
-              r = q - d;
-              *q++ = *r++;  c--;        /* minimum count is three, */
-              *q++ = *r++;  c--;        /*  so unroll loop a little */
-            }
-            else                        /* else offset after destination */
-            {
-              e = d - (uInt)(q - s->window); /* bytes from offset to end */
-              r = s->end - e;           /* pointer to offset */
-              if (c > e)                /* if source crosses, */
-              {
-                c -= e;                 /* copy to end of window */
-                do {
-                  *q++ = *r++;
-                } while (--e);
-                r = s->window;          /* copy rest from start of window */
-              }
-            }
-            do {                        /* copy all or what's left */
-              *q++ = *r++;
-            } while (--c);
-            break;
-          }
-          else if ((e & 64) == 0)
-          {
-            t += t->base;
-            e = (t += ((uInt)b & inflate_mask[e]))->exop;
-          }
-          else
-          {
-            z->msg = (char*)"invalid distance code";
-            UNGRAB
-            UPDATE
-            return Z_DATA_ERROR;
-          }
-        } while (1);
-        break;
-      }
-      if ((e & 64) == 0)
-      {
-        t += t->base;
-        if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
-        {
-          DUMPBITS(t->bits)
-          Tracevv((t->base >= 0x20 && t->base < 0x7f ?
-                    "inflate:         * literal '%c'\n" :
-                    "inflate:         * literal 0x%02x\n", t->base));
-          *q++ = (Byte)t->base;
-          m--;
-          break;
-        }
-      }
-      else if (e & 32)
-      {
-        Tracevv(("inflate:         * end of block\n"));
-        UNGRAB
-        UPDATE
-        return Z_STREAM_END;
-      }
-      else
-      {
-        z->msg = (char*)"invalid literal/length code";
-        UNGRAB
-        UPDATE
-        return Z_DATA_ERROR;
-      }
-    } while (1);
-  } while (m >= 258 && n >= 10);
-
-  /* not enough input or output--restore pointers and return */
-  UNGRAB
-  UPDATE
-  return Z_OK;
-}
-
-/* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-      START,    /* x: set up for LEN */
-      LEN,      /* i: get length/literal/eob next */
-      LENEXT,   /* i: getting length extra (have base) */
-      DIST,     /* i: get distance next */
-      DISTEXT,  /* i: getting distance extra */
-      COPY,     /* o: copying bytes in window, waiting for space */
-      LIT,      /* o: got literal, waiting for output space */
-      WASH,     /* o: got eob, possibly still output waiting */
-      END,      /* x: got eob and all data flushed */
-      BADCODE}  /* x: got error */
-inflate_codes_mode;
-
-/* inflate codes private state */
-struct inflate_codes_state {
-
-  /* mode */
-  inflate_codes_mode mode;      /* current inflate_codes mode */
-
-  /* mode dependent information */
-  uInt len;
-  union {
-    struct {
-      inflate_huft *tree;       /* pointer into tree */
-      uInt need;                /* bits needed */
-    } code;             /* if LEN or DIST, where in tree */
-    uInt lit;           /* if LIT, literal */
-    struct {
-      uInt get;                 /* bits to get for extra */
-      uInt dist;                /* distance back to copy from */
-    } copy;             /* if EXT or COPY, where and how much */
-  } sub;                /* submode */
-
-  /* mode independent information */
-  Byte lbits;           /* ltree bits decoded per branch */
-  Byte dbits;           /* dtree bits decoder per branch */
-  inflate_huft *ltree;          /* literal/length/eob tree */
-  inflate_huft *dtree;          /* distance tree */
-
-};
-
-
-inflate_codes_statef *inflate_codes_new(uInt bl, uInt bd, inflate_huft *tl, inflate_huft *td, z_streamp z)
-{
-  inflate_codes_statef *c;
-
-  if ((c = (inflate_codes_statef *)
-       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
-  {
-    c->mode = START;
-    c->lbits = (Byte)bl;
-    c->dbits = (Byte)bd;
-    c->ltree = tl;
-    c->dtree = td;
-    Tracev(("inflate:       codes new\n"));
-  }
-  return c;
-}
-
-
-int inflate_codes(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt j;               /* temporary storage */
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Byte *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Byte *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  Byte *f;             /* pointer to copy strings from */
-  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input and output based on current state */
-  while (1) switch (c->mode)
-  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-    case START:         /* x: set up for LEN */
-#ifndef SLOW
-      if (m >= 258 && n >= 10)
-      {
-        UPDATE
-        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
-        LOAD
-        if (r != Z_OK)
-        {
-          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
-          break;
-        }
-      }
-#endif /* !SLOW */
-      c->sub.code.need = c->lbits;
-      c->sub.code.tree = c->ltree;
-      c->mode = LEN;
-    case LEN:           /* i: get length/literal/eob next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e == 0)               /* literal */
-      {
-        c->sub.lit = t->base;
-        Tracevv((t->base >= 0x20 && t->base < 0x7f ?
-                 "inflate:         literal '%c'\n" :
-                 "inflate:         literal 0x%02x\n", t->base));
-        c->mode = LIT;
-        break;
-      }
-      if (e & 16)               /* length */
-      {
-        c->sub.copy.get = e & 15;
-        c->len = t->base;
-        c->mode = LENEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      if (e & 32)               /* end of block */
-      {
-        Tracevv(("inflate:         end of block\n"));
-        c->mode = WASH;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid literal/length code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case LENEXT:        /* i: getting length extra (have base) */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->len += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      c->sub.code.need = c->dbits;
-      c->sub.code.tree = c->dtree;
-      Tracevv(("inflate:         length %u\n", c->len));
-      c->mode = DIST;
-    case DIST:          /* i: get distance next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e & 16)               /* distance */
-      {
-        c->sub.copy.get = e & 15;
-        c->sub.copy.dist = t->base;
-        c->mode = DISTEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid distance code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case DISTEXT:       /* i: getting distance extra */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->sub.copy.dist += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      Tracevv(("inflate:         distance %u\n", c->sub.copy.dist));
-      c->mode = COPY;
-    case COPY:          /* o: copying bytes in window, waiting for space */
-#ifndef __TURBOC__ /* Turbo C bug for following expression */
-      f = (uInt)(q - s->window) < c->sub.copy.dist ?
-          s->end - (c->sub.copy.dist - (q - s->window)) :
-          q - c->sub.copy.dist;
-#else
-      f = q - c->sub.copy.dist;
-      if ((uInt)(q - s->window) < c->sub.copy.dist)
-        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
-#endif
-      while (c->len)
-      {
-        NEEDOUT
-        OUTBYTE(*f++)
-        if (f == s->end)
-          f = s->window;
-        c->len--;
-      }
-      c->mode = START;
-      break;
-    case LIT:           /* o: got literal, waiting for output space */
-      NEEDOUT
-      OUTBYTE(c->sub.lit)
-      c->mode = START;
-      break;
-    case WASH:          /* o: got eob, possibly more output */
-      if (k > 7)        /* return unused byte, if any */
-      {
-        Assert(k < 16, "inflate_codes grabbed too many bytes")
-        k -= 8;
-        n++;
-        p--;            /* can always return one */
-      }
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      c->mode = END;
-    case END:
-      r = Z_STREAM_END;
-      LEAVE
-    case BADCODE:       /* x: got error */
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-
-void inflate_codes_free(inflate_codes_statef *c, z_streamp z)
-{
-  ZFREE(z, c);
-  Tracev(("inflate:       codes free\n"));
-}
-
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#define BASE 65521L /* 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 */
-
-#undef DO1
-#undef DO2
-#undef DO4
-#undef DO8
-
-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#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);
-
-/* ========================================================================= */
-static uLong adler32(uLong adler, const Byte *buf, uInt len)
-{
-    unsigned long s1 = adler & 0xffff;
-    unsigned long s2 = (adler >> 16) & 0xffff;
-    int k;
-
-    if (buf == Z_NULL) return 1L;
-
-    while (len > 0) {
-        k = len < NMAX ? len : NMAX;
-        len -= k;
-        while (k >= 16) {
-            DO16(buf);
-	    buf += 16;
-            k -= 16;
-        }
-        if (k != 0) do {
-            s1 += *buf++;
-	    s2 += s1;
-        } while (--k);
-        s1 %= BASE;
-        s2 %= BASE;
-    }
-    return (s2 << 16) | s1;
-}
-
-
-/* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 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.
- */
-
-static inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-static int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-static void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLong *));                  /* check value on output */
-
-static int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-#if 0
-static void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Byte *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-static int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
-#endif
-
-typedef enum {
-      imMETHOD,   /* waiting for method byte */
-      imFLAG,     /* waiting for flag byte */
-      imDICT4,    /* four dictionary check bytes to go */
-      imDICT3,    /* three dictionary check bytes to go */
-      imDICT2,    /* two dictionary check bytes to go */
-      imDICT1,    /* one dictionary check byte to go */
-      imDICT0,    /* waiting for inflateSetDictionary */
-      imBLOCKS,   /* decompressing blocks */
-      imCHECK4,   /* four check bytes to go */
-      imCHECK3,   /* three check bytes to go */
-      imCHECK2,   /* two check bytes to go */
-      imCHECK1,   /* one check byte to go */
-      imDONE,     /* finished check, done */
-      imBAD}      /* got an error--stay here */
-inflate_mode;
-
-/* inflate private state */
-struct internal_state {
-
-  /* mode */
-  inflate_mode  mode;   /* current inflate mode */
-
-  /* mode dependent information */
-  union {
-    uInt method;        /* if FLAGS, method byte */
-    struct {
-      uLong was;                /* computed check value */
-      uLong need;               /* stream check value */
-    } check;            /* if CHECK, check values to compare */
-    uInt marker;        /* if BAD, inflateSync's marker bytes count */
-  } sub;        /* submode */
-
-  /* mode independent information */
-  int  nowrap;          /* flag for no wrapper */
-  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  inflate_blocks_statef 
-    *blocks;            /* current inflate_blocks state */
-
-};
-
-
-int inflateReset(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->total_in = z->total_out = 0;
-  z->msg = Z_NULL;
-  z->state->mode = z->state->nowrap ? imBLOCKS : imMETHOD;
-  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
-  Tracev(("inflate: reset\n"));
-  return Z_OK;
-}
-
-
-int inflateEnd(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->blocks, z);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  Tracev(("inflate: end\n"));
-  return Z_OK;
-}
-
-
-
-int inflateInit2_(z_streamp z, int w, const char *version, int stream_size)
-{
-  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-      stream_size != sizeof(z_stream))
-      return Z_VERSION_ERROR;
-
-  /* initialize state */
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->msg = Z_NULL;
-  if (z->zalloc == Z_NULL)
-  {
-    z->zalloc = (void *(*)(void *, unsigned, unsigned))zcalloc;
-    z->opaque = (voidp)0;
-  }
-  if (z->zfree == Z_NULL) z->zfree = (void (*)(void *, void *))zcfree;
-  if ((z->state = (struct internal_state *)
-       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
-    return Z_MEM_ERROR;
-  z->state->blocks = Z_NULL;
-
-  /* handle undocumented nowrap option (no zlib header or check) */
-  z->state->nowrap = 0;
-  if (w < 0)
-  {
-    w = - w;
-    z->state->nowrap = 1;
-  }
-
-  /* set window size */
-  if (w < 8 || w > 15)
-  {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->wbits = (uInt)w;
-
-  /* create inflate_blocks state */
-  if ((z->state->blocks =
-      inflate_blocks_new(z, z->state->nowrap ? ((check_func)0) : adler32, (uInt)1 << w))
-      == Z_NULL)
-  {
-    inflateEnd(z);
-    return Z_MEM_ERROR;
-  }
-  Tracev(("inflate: allocated\n"));
-
-  /* reset state */
-  inflateReset(z);
-  return Z_OK;
-}
-
-#if 0
-int inflateInit_(z_streamp z, const char *version, int stream_size)
-{
-  return inflateInit2_(z, DEF_WBITS, version, stream_size);
-}
-#endif
-
-#define iNEEDBYTE {if(z->avail_in==0)return r;r=f;}
-#define iNEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-
-int inflate(z_streamp z, int f)
-{
-  int r;
-  uInt b;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
-    return Z_STREAM_ERROR;
-  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
-  r = Z_BUF_ERROR;
-  while (1) switch (z->state->mode)
-  {
-    case imMETHOD:
-      iNEEDBYTE
-      if (((z->state->sub.method = iNEXTBYTE) & 0xf) != Z_DEFLATED)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"unknown compression method";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"invalid window size";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      z->state->mode = imFLAG;
-    case imFLAG:
-      iNEEDBYTE
-      b = iNEXTBYTE;
-      if (((z->state->sub.method << 8) + b) % 31)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"incorrect header check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev(("inflate: zlib header ok\n"));
-      if (!(b & PRESET_DICT))
-      {
-        z->state->mode = imBLOCKS;
-        break;
-      }
-      z->state->mode = imDICT4;
-    case imDICT4:
-      iNEEDBYTE
-      z->state->sub.check.need = (uLong)iNEXTBYTE << 24;
-      z->state->mode = imDICT3;
-    case imDICT3:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 16;
-      z->state->mode = imDICT2;
-    case imDICT2:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 8;
-      z->state->mode = imDICT1;
-    case imDICT1:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE;
-      z->adler = z->state->sub.check.need;
-      z->state->mode = imDICT0;
-      return Z_NEED_DICT;
-    case imDICT0:
-      z->state->mode = imBAD;
-      z->msg = (char*)"need dictionary";
-      z->state->sub.marker = 0;       /* can try inflateSync */
-      return Z_STREAM_ERROR;
-    case imBLOCKS:
-      r = inflate_blocks(z->state->blocks, z, r);
-      if (r == Z_DATA_ERROR)
-      {
-        z->state->mode = imBAD;
-        z->state->sub.marker = 0;       /* can try inflateSync */
-        break;
-      }
-      if (r == Z_OK)
-        r = f;
-      if (r != Z_STREAM_END)
-        return r;
-      r = f;
-      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
-      if (z->state->nowrap)
-      {
-        z->state->mode = imDONE;
-        break;
-      }
-      z->state->mode = imCHECK4;
-    case imCHECK4:
-      iNEEDBYTE
-      z->state->sub.check.need = (uLong)iNEXTBYTE << 24;
-      z->state->mode = imCHECK3;
-    case imCHECK3:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 16;
-      z->state->mode = imCHECK2;
-    case imCHECK2:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 8;
-      z->state->mode = imCHECK1;
-    case imCHECK1:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE;
-
-      if (z->state->sub.check.was != z->state->sub.check.need)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"incorrect data check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev(("inflate: zlib check ok\n"));
-      z->state->mode = imDONE;
-    case imDONE:
-      return Z_STREAM_END;
-    case imBAD:
-      return Z_DATA_ERROR;
-    default:
-      return Z_STREAM_ERROR;
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-// defined but not used
-#if 0
-int inflateSetDictionary(z_streamp z, const Byte *dictionary, uInt dictLength)
-{
-  uInt length = dictLength;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != imDICT0)
-    return Z_STREAM_ERROR;
-
-  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
-  z->adler = 1L;
-
-  if (length >= ((uInt)1<<z->state->wbits))
-  {
-    length = (1<<z->state->wbits)-1;
-    dictionary += dictLength - length;
-  }
-  inflate_set_dictionary(z->state->blocks, dictionary, length);
-  z->state->mode = imBLOCKS;
-  return Z_OK;
-}
-
-int inflateSync(z_streamp z)
-{
-  uInt n;       /* number of bytes to look at */
-  Byte *p;     /* pointer to bytes */
-  uInt m;       /* number of marker bytes found in a row */
-  uLong r, w;   /* temporaries to save total_in and total_out */
-
-  /* set up */
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->mode != imBAD)
-  {
-    z->state->mode = imBAD;
-    z->state->sub.marker = 0;
-  }
-  if ((n = z->avail_in) == 0)
-    return Z_BUF_ERROR;
-  p = z->next_in;
-  m = z->state->sub.marker;
-
-  /* search */
-  while (n && m < 4)
-  {
-    static const Byte mark[4] = {0, 0, 0xff, 0xff};
-    if (*p == mark[m])
-      m++;
-    else if (*p)
-      m = 0;
-    else
-      m = 4 - m;
-    p++, n--;
-  }
-
-  /* restore */
-  z->total_in += p - z->next_in;
-  z->next_in = p;
-  z->avail_in = n;
-  z->state->sub.marker = m;
-
-  /* return no joy or set up to restart on a new block */
-  if (m != 4)
-    return Z_DATA_ERROR;
-  r = z->total_in;  w = z->total_out;
-  inflateReset(z);
-  z->total_in = r;  z->total_out = w;
-  z->state->mode = imBLOCKS;
-  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 inflateSyncPoint(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
-    return Z_STREAM_ERROR;
-  return inflate_blocks_sync_point(z->state->blocks);
-}
-#endif
-
-voidp zcalloc (voidp opaque, unsigned items, unsigned size)
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return (voidp)Z_Malloc(items*size);
-}
-
-void  zcfree (voidp opaque, voidp ptr)
-{
-    Z_Free(ptr);
-    if (opaque) return; /* make compiler happy */
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
 }
 
 /* Additions by RX '2004 */
-long unzGetOffset (unzFile file)
+extern uLong ZEXPORT unzGetOffset (file)
+    unzFile file;
 {
     unz_s* s;
 
@@ -4381,7 +1587,9 @@ long unzGetOffset (unzFile file)
     return s->pos_in_central_dir;
 }
 
-int unzSetOffset (unzFile file, long pos)
+extern int ZEXPORT unzSetOffset (file, pos)
+        unzFile file;
+        uLong pos;
 {
     unz_s* s;
     int err;
@@ -4398,5 +1606,3 @@ int unzSetOffset (unzFile file, long pos)
     s->current_file_ok = (err == UNZ_OK);
     return err;
 }
-
-
diff --git a/code/qcommon/unzip.h b/code/qcommon/unzip.h
index 1b3c80a4..74dee975 100644
--- a/code/qcommon/unzip.h
+++ b/code/qcommon/unzip.h
@@ -1,259 +1,200 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.01e, February 12th, 2005
 
-This file is part of Quake III Arena source code.
+   Copyright (C) 1998-2005 Gilles Vollant
 
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
+   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
+     WinZip, InfoZip tools and compatible.
+
+   Multi volume ZipFile (span) are not supported.
+   Encryption compatible with pkzip 2.04g only supported
+   Old compressions used by old PKZip 1.x are not supported
+
+
+   I WAIT FEEDBACK at mail info@winimage.com
+   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
 
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
 */
 
+/* for more info about .ZIP format, see
+      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+      http://www.info-zip.org/pub/infozip/doc/
+   PkWare has also a specification at :
+      ftp://ftp.pkware.com/probdesc.zip
+*/
+
+#ifndef _unz_H
+#define _unz_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifdef USE_LOCAL_HEADERS
+  #include "../zlib/zlib.h"
+#else
+  #include <zlib.h>
+#endif
+#include "ioapi.h"
+
+#define NOUNCRYPT
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__; 
+typedef struct TagunzFile__ { int unused; } unzFile__;
 typedef unzFile__ *unzFile;
 #else
-typedef void* unzFile;
+typedef voidp unzFile;
 #endif
 
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
 /* tm_unz contain date/time info */
-typedef struct tm_unz_s 
+typedef struct tm_unz_s
 {
-	unsigned int tm_sec;            /* seconds after the minute - [0,59] */
-	unsigned int tm_min;            /* minutes after the hour - [0,59] */
-	unsigned int tm_hour;           /* hours since midnight - [0,23] */
-	unsigned int tm_mday;           /* day of the month - [1,31] */
-	unsigned int tm_mon;            /* months since January - [0,11] */
-	unsigned int tm_year;           /* years - [1980..2044] */
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
 } tm_unz;
 
 /* unz_global_info structure contain global data about the ZIPfile
    These data comes from the end of central dir */
 typedef struct unz_global_info_s
 {
-	unsigned long number_entry;         /* total number of entries in the central dir on this disk */
-	unsigned long size_comment;         /* size of the global comment of the zipfile */
+    uLong number_entry;         /* total number of entries in
+                       the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
 } unz_global_info;
 
 
 /* unz_file_info contain information about a file in the zipfile */
 typedef struct unz_file_info_s
 {
-    unsigned long version;              /* version made by                 2 unsigned chars */
-    unsigned long version_needed;       /* version needed to extract       2 unsigned chars */
-    unsigned long flag;                 /* general purpose bit flag        2 unsigned chars */
-    unsigned long compression_method;   /* compression method              2 unsigned chars */
-    unsigned long dosDate;              /* last mod file date in Dos fmt   4 unsigned chars */
-    unsigned long crc;                  /* crc-32                          4 unsigned chars */
-    unsigned long compressed_size;      /* compressed size                 4 unsigned chars */ 
-    unsigned long uncompressed_size;    /* uncompressed size               4 unsigned chars */ 
-    unsigned long size_filename;        /* filename length                 2 unsigned chars */
-    unsigned long size_file_extra;      /* extra field length              2 unsigned chars */
-    unsigned long size_file_comment;    /* file comment length             2 unsigned chars */
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
 
-    unsigned long disk_num_start;       /* disk number start               2 unsigned chars */
-    unsigned long internal_fa;          /* internal file attributes        2 unsigned chars */
-    unsigned long external_fa;          /* external file attributes        4 unsigned chars */
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
 
     tm_unz tmu_date;
 } unz_file_info;
 
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
-    unsigned long offset_curfile;/* relative offset of static header 4 unsigned chars */
-} unz_file_info_internal;
-
-typedef void* (*alloc_func) (void* opaque, unsigned int items, unsigned int size);
-typedef void   (*free_func) (void* opaque, void* address);
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    unsigned char    *next_in;  /* next input unsigned char */
-    unsigned int     avail_in;  /* number of unsigned chars available at next_in */
-    unsigned long    total_in;  /* total nb of input unsigned chars read so */
-
-    unsigned char    *next_out; /* next output unsigned char should be put there */
-    unsigned int     avail_out; /* remaining free space at next_out */
-    unsigned long    total_out; /* total nb of unsigned chars output so */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    unsigned char*     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    unsigned long   adler;      /* adler32 value of the uncompressed data */
-    unsigned long   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream *z_streamp;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-	char  *read_buffer;         /* internal buffer for compressed data */
-	z_stream stream;            /* zLib stream structure for inflate */
-
-	unsigned long pos_in_zipfile;       /* position in unsigned char on the zipfile, for fseek*/
-	unsigned long stream_initialised;   /* flag set if stream structure is initialised*/
-
-	unsigned long offset_local_extrafield;/* offset of the static extra field */
-	unsigned int  size_local_extrafield;/* size of the static extra field */
-	unsigned long pos_local_extrafield;   /* position in the static extra field in read*/
-
-	unsigned long crc32;                /* crc32 of all data uncompressed */
-	unsigned long crc32_wait;           /* crc32 we must obtain after decompress all */
-	unsigned long rest_read_compressed; /* number of unsigned char to be decompressed */
-	unsigned long rest_read_uncompressed;/*number of unsigned char to be obtained after decomp*/
-	FILE* file;                 /* io structore of the zipfile */
-	unsigned long compression_method;   /* compression method (0==store) */
-	unsigned long byte_before_the_zipfile;/* unsigned char before the zipfile, (>0 for sfx)*/
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-	FILE* file;                 /* io structore of the zipfile */
-	unz_global_info gi;       /* public global information */
-	unsigned long byte_before_the_zipfile;/* unsigned char before the zipfile, (>0 for sfx)*/
-	unsigned long num_file;             /* number of the current file in the zipfile*/
-	unsigned long pos_in_central_dir;   /* pos of the current file in the central dir*/
-	unsigned long current_file_ok;      /* flag about the usability of the current file*/
-	unsigned long central_pos;          /* position of the beginning of the central dir*/
-
-	unsigned long size_central_dir;     /* size of the central directory  */
-	unsigned long offset_central_dir;   /* offset of start of central directory with
-								   respect to the starting disk number */
-
-	unz_file_info cur_file_info; /* public info about the current file in zip*/
-	unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-	                                    file if we are decompressing it */
-	unsigned char*	tmpFile;
-	int	tmpPos,tmpSize;
-} unz_s;
-
-#define UNZ_OK                                  (0)
-#define UNZ_END_OF_LIST_OF_FILE (-100)
-#define UNZ_ERRNO               (Z_ERRNO)
-#define UNZ_EOF                 (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-#define UNZ_CASESENSITIVE		1
-#define UNZ_NOTCASESENSITIVE	2
-#define UNZ_OSDEFAULTCASE		0
-
-extern int unzStringFileNameCompare (const char* fileName1, const char* fileName2, int iCaseSensitivity);
-
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
 /*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-								or strcasecmp)
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
+                                or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-	(like 1 on Unix, 2 on Windows)
+    (like 1 on Unix, 2 on Windows)
 */
 
-extern unzFile unzOpen (const char *path);
-extern unzFile unzReOpen (const char* path, unzFile file);
 
+extern unzFile ZEXPORT unzOpen OF((const char *path));
 /*
   Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-	 "zlib/zlib111.zip".
-	 If the zipfile cannot be opened (file don't exist or in not valid), the
-	   return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-	   of this unzip package.
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on a Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is an unzFile Handle, usable with other function
+       of this unzip package.
 */
 
-extern int unzClose (unzFile file);
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
 
+extern int ZEXPORT unzClose OF((unzFile file));
 /*
   Close a ZipFile opened with unzipOpen.
   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
 
-extern int unzGetGlobalInfo (unzFile file, unz_global_info *pglobal_info);
-
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
 /*
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
 
 
-extern int unzGetGlobalComment (unzFile file, char *szComment, unsigned long uSizeBuf);
-
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
 /*
   Get the global comment string of the ZipFile, in the szComment buffer.
   uSizeBuf is the size of the szComment buffer.
-  return the number of unsigned char copied or an error code <0
+  return the number of byte copied or an error code <0
 */
 
 
 /***************************************************************************/
 /* Unzip package allow you browse the directory of the zipfile */
 
-extern int unzGoToFirstFile (unzFile file);
-
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
 
-extern int unzGoToNextFile (unzFile file);
-
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
 /*
   Set the current file of the zipfile to the next file.
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
 
-extern int unzGetCurrentFileInfoPosition (unzFile file, unsigned long *pos );
-
-/*
-  Get the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-
-extern int unzSetCurrentFileInfoPosition (unzFile file, unsigned long pos );
-
-/*
-  Set the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-
-extern int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity);
-
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
 /*
   Try locate the file szFileName in the zipfile.
   For the iCaseSensitivity signification, see unzStringFileNameCompare
@@ -264,19 +205,44 @@ extern int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensiti
 */
 
 
-extern int unzGetCurrentFileInfo (unzFile file, unz_file_info *pfile_info, char *szFileName, unsigned long fileNameBufferSize, void *extraField, unsigned long extraFieldBufferSize, char *szComment, unsigned long commentBufferSize);
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
 
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
 /*
   Get Info about the current file
   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-	    the current file
+        the current file
   if szFileName!=NULL, the filemane string will be copied in szFileName
-			(fileNameBufferSize is the size of the buffer)
+            (fileNameBufferSize is the size of the buffer)
   if extraField!=NULL, the extra field information will be copied in extraField
-			(extraFieldBufferSize is the size of the buffer).
-			This is the Central-header version of the extra field
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
   if szComment!=NULL, the comment string of the file will be copied in szComment
-			(commentBufferSize is the size of the buffer)
+            (commentBufferSize is the size of the buffer)
 */
 
 /***************************************************************************/
@@ -284,59 +250,81 @@ extern int unzGetCurrentFileInfo (unzFile file, unz_file_info *pfile_info, char
    from it, and close it (you can close it before reading all the file)
    */
 
-extern int unzOpenCurrentFile (unzFile file);
-
-/*
-  Returns success if the current file is open
-*/
-extern qboolean unzIsCurrentFileOpen (unzFile file);
-
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
 /*
   Open for reading data the current file in the zipfile.
   If there is no error, the return value is UNZ_OK.
 */
 
-extern int unzCloseCurrentFile (unzFile file);
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
 
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
 /*
   Close the file in zip opened with unzOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
 
-												
-extern int unzReadCurrentFile (unzFile file, void* buf, unsigned len);
-
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
 /*
-  Read unsigned chars from the current file (opened by unzOpenCurrentFile)
+  Read bytes from the current file (opened by unzOpenCurrentFile)
   buf contain buffer where data must be copied
   len the size of buf.
 
-  return the number of unsigned char copied if somes unsigned chars are copied
+  return the number of byte copied if somes bytes are copied
   return 0 if the end of file was reached
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
 
-extern long unztell (unzFile file);
-
-/*
-  Seek to the specified offset according to the origin in uncompressed data
-*/
-
-extern long unzseek(unzFile file, long int offset, int origin);
-
+extern z_off_t ZEXPORT unztell OF((unzFile file));
 /*
   Give the current position in uncompressed data
 */
 
-extern int unzeof (unzFile file);
-
+extern int ZEXPORT unzeof OF((unzFile file));
 /*
-  return 1 if the end of file was reached, 0 elsewhere 
+  return 1 if the end of file was reached, 0 elsewhere
 */
 
-extern int unzGetLocalExtrafield (unzFile file, void* buf, unsigned len);
-
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
 /*
   Read extra field from the current file (opened by unzOpenCurrentFile)
   This is the local-header version of the extra field (sometimes, there is
@@ -345,17 +333,23 @@ extern int unzGetLocalExtrafield (unzFile file, void* buf, unsigned len);
   if buf==NULL, it return the size of the local extra field
 
   if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of unsigned chars copied in buf, or (if <0) 
-	the error code
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
 */
 
+/***************************************************************************/
+
 /* Get the current file offset */
-extern long unzGetOffset(unzFile file);
+extern uLong ZEXPORT unzGetOffset (unzFile file);
 
 /* Set the current file offset */
-extern int unzSetOffset(unzFile file, long pos);
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
 
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* _unz_H */
diff --git a/code/zlib/zlib.h b/code/zlib/zlib.h
new file mode 100644
index 00000000..02281792
--- /dev/null
+++ b/code/zlib/zlib.h
@@ -0,0 +1,1357 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.3, July 18th, 2005
+
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
+
+/*
+     The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed
+  data.  This version of the library supports only one compression method
+  (deflation) but other algorithms will be added later and will have the same
+  stream interface.
+
+     Compression can be done in a single step if the buffers are large
+  enough (for example if an input file is mmap'ed), or can be done by
+  repeated calls of the compression function.  In the latter case, the
+  application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+     The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+     The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+     This library can optionally read and write gzip streams in memory as well.
+
+     The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+     The library does not install any signal handler. The decoder checks
+  the consistency of the compressed data, so the library should never
+  crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    Bytef    *next_in;  /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total nb of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total nb of bytes output so far */
+
+    char     *msg;      /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+   The application must update next_in and avail_in when avail_in has
+   dropped to zero. It must update next_out and avail_out when avail_out
+   has dropped to zero. The application must initialize zalloc, zfree and
+   opaque before calling the init function. All other fields are set by the
+   compression library and must not be updated by the application.
+
+   The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree. This can be useful for custom
+   memory management. The compression library attaches no meaning to the
+   opaque value.
+
+   zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+   On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+   The fields total_in and total_out can be used for statistics or
+   progress reports. After compression, total_in holds the total size of
+   the uncompressed data and may be saved for use in the decompressor
+   (particularly if the decompressor wants to decompress everything in
+   a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is
+   not compatible with the zlib.h header file used by the application.
+   This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression. The fields
+   zalloc, zfree and opaque must be initialized before by the caller.
+   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+   use default allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).
+   msg is set to null if there is no error message.  deflateInit does not
+   perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce some
+  output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows. deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide 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.
+
+  Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating avail_in or avail_out accordingly; avail_out
+  should never be zero before the call. The application can consume the
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumualte before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far. (In particular
+  avail_in is zero after the call if enough output space has been provided
+  before the call.)  Flushing may degrade compression for some compression
+  algorithms and so it should be used only when necessary.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there
+  was enough output space; if deflate returns with Z_OK, 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). If deflate does not return
+  Z_STREAM_END, then 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).
+
+    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.
+
+    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 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.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression. The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller. 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.
+
+     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.  msg is set to null if there is no error
+   message. inflateInit does not perform any decompression apart from reading
+   the zlib header if present: this will be done by inflate().  (So next_in and
+   avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows. inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated 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
+    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 application can consume the uncompressed output when it wants, for
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+  if and when it gets to the next deflate block boundary. When decoding the
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  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 inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error. However if all decompression is to be performed in a single step
+  (a single call of inflate), the parameter flush should be set to
+  Z_FINISH. In this case all pending input is processed and all pending
+  output is flushed; avail_out must be large enough to hold all the
+  uncompressed data. (The size of the uncompressed data may have been saved
+  by the compressor for this purpose.) The next operation on this stream must
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster approach
+  may be used for the single inflate() call.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call. So the only effect of the flush parameter in this implementation
+  is on the return value of inflate(), as noted below, or when it returns early
+  because Z_BLOCK is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the adler32 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
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  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.
+
+    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
+  if next_in or next_out was 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
+  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.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     inflateEnd returns Z_OK if success, 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).
+*/
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options. The
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
+
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer). It should be in the range 8..15 for this
+   version of the library. Larger values of this parameter result in better
+   compression at the expense of memory usage. The default value is 15 if
+   deflateInit is used instead.
+
+     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.
+
+     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.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state. memLevel=1 uses minimum memory but
+   is slow and reduces compression ratio; memLevel=9 uses maximum memory
+   for optimal speed. The default value is 8. See zconf.h for total memory
+   usage as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm. Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding). Filtered data consists mostly of small values with a somewhat
+   random distribution. In this case, the compression algorithm is tuned to
+   compress them better. The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+   parameter only affects the compression ratio but not the correctness of the
+   compressed output even if it is not set appropriately.  Z_FIXED prevents the
+   use of dynamic Huffman codes, allowing for a simpler decoder for special
+   applications.
+
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+   method). msg is set to null if there is no error message.  deflateInit2 does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output. This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any
+   call of deflate. The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary. Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size in
+   deflate or deflate2. Thus the strings most likely to be useful should be
+   put at the end of the dictionary, not at the front. In addition, the
+   current implementation of deflate will use at most the window size minus
+   262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor. (The adler32 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.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if the compression method is bsort). deflateSetDictionary does not
+   perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter. The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and
+   can consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.
+   The stream will keep the same compression level and any other attributes
+   that may have been set by deflateInit2.
+
+      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different
+   strategy. If the compression 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));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit()
+   or deflateInit2().  This would be used to allocate an output buffer
+   for deflation in a single pass, and so would be called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+  is that this function is used to start off the deflate output with the
+  bits leftover from a previous deflate stream when appending to it.  As such,
+  this function can only be used for raw deflate, and must be used before the
+  first deflate() call after a deflateInit2() or deflateReset().  bits must be
+  less than or equal to 16, and that many of the least significant bits of
+  value will be inserted in the output.
+
+      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+      If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter. The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library. The default value is 15 if inflateInit is used
+   instead. windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used. If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+   determines the window size. inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream. This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values. If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is. Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding. Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence. This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the adler32 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
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) 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
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+    Skips invalid compressed data until a full flush point (see above the
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
+  available input is skipped. No output is provided.
+
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  case, the application may save the current current value of total_in which
+  indicates where valid compressed data was found. In the error case, the
+  application may repeatedly call inflateSync, providing more input each time,
+  until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.
+   The stream will keep attributes that may have been set by inflateInit2.
+
+      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+  that this function is used to start inflating at a bit position in the
+  middle of a byte.  The provided bits will be used before any bytes are used
+  from next_in.  This function should only be used with raw inflate, and
+  should be used before the first inflate() call after inflateInit2() or
+  inflateReset().  bits must be less than or equal to 16, and that many of the
+  least significant bits of value will be inserted in the input.
+
+      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
+   force inflate() to return immediately after header processing is complete
+   and before any actual data is decompressed.
+
+      The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When
+   any of extra, name, or comment are not Z_NULL and the respective field is
+   not present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+      If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   be allocated, or Z_VERSION_ERROR if the version of the library does not
+   match the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is more efficient than inflate() for
+   file i/o applications in that it avoids copying between the output and the
+   sliding window by simply making the window itself the output buffer.  This
+   function trusts the application to not change the output buffer passed by
+   the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free
+   the allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects
+   only the raw deflate stream to decompress.  This is different from the
+   normal behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format
+   error in the deflate stream (in which case strm->msg is set to indicate the
+   nature of the error), or Z_STREAM_ERROR if the stream was not properly
+   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+   distinguished using strm->next_in which will be Z_NULL only if in() returned
+   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+   out() returning non-zero.  (in() will always be called before out(), so
+   strm->next_in is assured to be defined if out() returns non-zero.)  Note
+   that inflateBack() cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the
+   basic stream-oriented functions. To simplify the interface, some
+   default options are assumed (compression level and memory usage,
+   standard memory allocation functions). The source code of these
+   utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least the value returned
+   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed 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.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before
+   a compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen  OF((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", or 'R' for run-length encoding
+   as in "wb1R". (See the description of deflateInit2 for more information
+   about the strategy parameter.)
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.
+
+     gzopen returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).  */
+
+ZEXTERN gzFile ZEXPORT gzdopen  OF((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 (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+     gzdopen returns NULL if there was insufficient memory to allocate
+   the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy. See the description
+   of deflateInit2 for the meaning of these parameters.
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.
+   If the input file was not in gzip format, gzread copies the given number
+   of bytes into the buffer.
+     gzread returns the number of uncompressed bytes actually read (0 for
+   end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                   voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes actually written
+   (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).  The number of
+   uncompressed bytes written is limited to 4095. The caller should assure that
+   this limit is not exceeded. If it is exceeded, then gzprintf() will return
+   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.
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+      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.  The string is then terminated with a null
+   character.
+      gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+/*
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+/*
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+/*
+      Push one character back onto the stream to be read again later.
+   Only one character of push-back is allowed.  gzungetc() returns the
+   character pushed, or -1 on failure.  gzungetc() will fail if a
+   character has been pushed but not read yet, or if c is -1. The pushed
+   character will be discarded if the stream is repositioned with gzseek()
+   or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT    gzflush OF((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 returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
+     gzflush should be called only when strictly necessary because it can
+   degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT    gzseek OF((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
+   uncompressed data stream. The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow. If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+/*
+     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.
+
+   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns 1 if file is being read directly without decompression, otherwise
+   zero.
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state. The return value is the zlib
+   error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((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.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears 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.
+*/
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the
+   compression library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. If buf is 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
+   much faster. Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+/*
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. If buf is NULL, this function returns the required initial
+   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+/*
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;}; /* hack for buggy compilers */
+#endif
+
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */

From 0692b9dcdb3509c79e90ea8a6890a63606b24ddc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 18:54:40 +0200
Subject: [PATCH 0980/2040] Fix events sometimes not being posted to entities

Fixes #253
---
 code/cgame/cg_commands.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 4ddb3fd8..e14c2d18 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -1402,7 +1402,7 @@ qboolean ClientGameCommandManager::PostEventForEntity(Event *ev, float fWait)
     EffectsEventQueueNode *node;
     int                    inttime;
 
-    if (!m_fEventWait || current_entity_number < 0) {
+    if (m_fEventWait < 0 || current_entity_number < 0) {
         if (!str::icmp(ev->getName(), ")")) {
             m_fEventWait = 0.0;
         }

From b504e0d109b6ed590894ecfe472c21f7b310fa78 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 19:47:43 +0200
Subject: [PATCH 0981/2040] Call CurrentAnim() to retrieve the animation index

---
 code/fgame/animate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/animate.cpp b/code/fgame/animate.cpp
index c89539cd..5855f110 100644
--- a/code/fgame/animate.cpp
+++ b/code/fgame/animate.cpp
@@ -596,7 +596,7 @@ int Animate::NumAnims(void)
 
 const char *Animate::AnimName(int slot)
 {
-    return gi.Anim_NameForNum(edict->tiki, edict->s.frameInfo[slot].index);
+    return gi.Anim_NameForNum(edict->tiki, CurrentAnim(slot));
 }
 
 void Animate::AnimFinished(int slot)

From b03933392270434a82da4a46f80d7d31314d8c73 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 19:48:06 +0200
Subject: [PATCH 0982/2040] Call AnimName() to get the current animation name

---
 code/fgame/player_util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index a04510d2..2aaf2ce7 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -95,7 +95,7 @@ void Player::WhatIs(Event *ev)
 
         animname = NULL;
         if (ent->edict->tiki) {
-            animname = gi.Anim_NameForNum(ent->edict->tiki, ent->edict->s.frameInfo[0].index);
+            animname = AnimName(0);
         }
 
         if (!animname) {

From b5034e5b125d269b8b5cf054eeb01800bd642e9c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 20:04:58 +0200
Subject: [PATCH 0983/2040] Fix the m_iSaySlot being mistakenly used for the
 weight cross blend, the specified slot parameter must be used instead

This fixes #266 where some AIs would lack speech animation
---
 code/fgame/simpleactor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp
index 1521d740..dc5a16c5 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -865,9 +865,9 @@ void SimpleActor::UpdateCrossBlendAnimSlot(int slot)
 void SimpleActor::UpdateCrossBlendDialogAnimSlot(int slot)
 {
     if (m_iSaySlot >= 0) {
-        m_weightCrossBlend[m_iSaySlot] -= level.frametime / 0.1f;
+        m_weightCrossBlend[slot] -= level.frametime / 0.1f;
     } else {
-        m_weightCrossBlend[m_iSaySlot] -= level.frametime / 0.5f;
+        m_weightCrossBlend[slot] -= level.frametime / 0.5f;
     }
 
     if (m_weightCrossBlend[slot] > 0.0) {
@@ -881,9 +881,9 @@ void SimpleActor::UpdateCrossBlendDialogAnimSlot(int slot)
 void SimpleActor::UpdateSayAnimSlot(int slot)
 {
     if (m_iSaySlot >= 0) {
-        m_weightCrossBlend[m_iSaySlot] += level.frametime / 0.1f;
+        m_weightCrossBlend[slot] += level.frametime / 0.1f;
     } else {
-        m_weightCrossBlend[m_iSaySlot] += level.frametime / 0.5f;
+        m_weightCrossBlend[slot] += level.frametime / 0.5f;
     }
 
     SetBlendedWeight(slot);

From c76dda15232452a8f8c0d244c13dbc1d481eb484 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 20:22:42 +0200
Subject: [PATCH 0984/2040] Fix a small mistake in normal calculations for
 MM_ClipVelocity

This leaded to some occasional errors in AI movement, like in e3l2 where the medic gets stuck while going down the stairs
---
 code/fgame/g_mmove.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index 3bb107c5..0324c73d 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -49,8 +49,8 @@ void MM_ClipVelocity(float *in, float *normal, float *out, float overbounce)
             return;
         }
 
-        normal2[0] = in[0] + DotProduct2D(in, normal);
-        normal2[1] = in[1] + DotProduct2D(in, normal);
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
         normal2[2] = normal[2] * DotProduct2D(in, in);
 
         VectorNormalize(normal2);

From 54035776422c132173a2ac7dfede266bf61e89c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 21:04:55 +0200
Subject: [PATCH 0985/2040] Fix the return value of `FS_Seek`

It returns a negative value on failure, so handle that properly
---
 code/fgame/g_public.h           | 2 +-
 code/qcommon/cm_load.c          | 2 +-
 code/qcommon/files.cpp          | 6 +++---
 code/qcommon/qcommon.h          | 2 +-
 code/renderer/tr_bsp.c          | 2 +-
 code/renderer/tr_public.h       | 2 +-
 code/renderercommon/tr_public.h | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index e460f195..365f0676 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -260,7 +260,7 @@ typedef struct gameImport_s {
     size_t (*FS_Read)(void *buffer, size_t len, fileHandle_t fileHandle);
     void (*FS_FCloseFile)(fileHandle_t fileHandle);
     int (*FS_Tell)(fileHandle_t fileHandle);
-    int (*FS_Seek)(fileHandle_t fileHandle, long int offset, fsOrigin_t origin);
+    int (*FS_Seek)(fileHandle_t fileHandle, long int offset, int origin);
     void (*FS_Flush)(fileHandle_t fileHandle);
     int (*FS_FileNewer)(const char *source, const char *destination);
     void (*FS_CanonicalFilename)(char *fileName);
diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index 37ceae1d..932b5810 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -785,7 +785,7 @@ int CM_LoadLump( fileHandle_t handle, lump_t *lump, gamelump_t *glump, int size
 	if( lump->filelen ) {
 		glump->buffer = Hunk_AllocateTempMemory( lump->filelen );
 
-		if( FS_Seek( handle, lump->fileofs, FS_SEEK_SET ) ) {
+		if( FS_Seek( handle, lump->fileofs, FS_SEEK_SET ) < 0 ) {
 			Com_Error( ERR_DROP, "CM_LoadLump: Error seeking to lump." );
 		}
 
diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 58227b7b..7df3ebe8 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -1710,7 +1710,7 @@ FS_Seek
 
 =================
 */
-int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
+int FS_Seek( fileHandle_t f, long offset, int origin ) {
 	int		_origin;
 
 	if ( !fs_searchpaths ) {
@@ -1758,7 +1758,7 @@ int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
 		switch( origin ) {
 			case FS_SEEK_SET:
 				if ( remainder == currentPosition ) {
-					return 0;
+					return offset;
 				}
 				unzSetOffset(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
 				unzOpenCurrentFile(fsh[f].handleFiles.file.z);
@@ -1771,7 +1771,7 @@ int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
 					remainder -= PK3_SEEK_BUFFER_SIZE;
 				}
 				FS_Read( buffer, remainder, f );
-				return 0;
+				return offset;
 
 			default:
 				Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 58c7bc4d..be1abeb0 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -790,7 +790,7 @@ void 	QDECL FS_Printf( fileHandle_t f, const char *fmt, ... ) __attribute__ ((fo
 int		FS_FOpenFileByMode( const char *qpath, fileHandle_t *f, fsMode_t mode );
 // opens a file for reading, writing, or appending depending on the value of mode
 
-int		FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin );
+int		FS_Seek( fileHandle_t f, long offset, int origin );
 // seek on a file (doesn't work for zip files!!!!!!!!)
 
 qboolean FS_FilenameCompare( const char *s1, const char *s2 );
diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 0a22a2cb..ee9de085 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2187,7 +2187,7 @@ int R_LoadLump(fileHandle_t handle, lump_t* lump, gamelump_t* glump, int size)
     if (lump->filelen) {
         glump->buffer = Hunk_AllocateTempMemory(lump->filelen);
 
-        if (FS_Seek(handle, lump->fileofs, FS_SEEK_SET)) {
+        if (FS_Seek(handle, lump->fileofs, FS_SEEK_SET) < 0) {
             Com_Error(ERR_DROP, "R_LoadLump: Error seeking to lump.");
         }
 
diff --git a/code/renderer/tr_public.h b/code/renderer/tr_public.h
index 016bae99..c4ad0dd5 100644
--- a/code/renderer/tr_public.h
+++ b/code/renderer/tr_public.h
@@ -201,7 +201,7 @@ typedef struct {
     int     (*FS_OpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
     size_t  (*FS_Read)(void* buffer, size_t len, fileHandle_t fileHandle);
     void    (*FS_CloseFile)(fileHandle_t fileHandle);
-    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, fsOrigin_t origin);
+    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, int origin);
 	int		(*FS_FileIsInPAK)( const char *name, int *pCheckSum );
     int		(*FS_ReadFile)(const char* name, void** buf);
     int     (*FS_ReadFileEx)(const char* qpath, void** buffer, qboolean quiet);
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index 0699c969..507b2075 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -265,7 +265,7 @@ typedef struct {
     long    (*FS_OpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
     size_t  (*FS_Read)(void* buffer, size_t len, fileHandle_t fileHandle);
     void    (*FS_CloseFile)(fileHandle_t fileHandle);
-    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, fsOrigin_t origin);
+    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, int origin);
     long     (*FS_ReadFileEx)(const char* qpath, void** buffer, qboolean quiet);
 
     void        (*CM_BoxTrace)(trace_t* results, const vec3_t start, const vec3_t end, const vec3_t mins, const vec3_t maxs, int model, int brushMask, int cylinder);

From 36208de902fbe3620545c59e98ee8e4530c9dd81 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 22:12:29 +0200
Subject: [PATCH 0986/2040] Fix spawn time delta

---
 code/fgame/g_spawn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_spawn.cpp b/code/fgame/g_spawn.cpp
index 55c076f4..4eeda6de 100644
--- a/code/fgame/g_spawn.cpp
+++ b/code/fgame/g_spawn.cpp
@@ -543,7 +543,7 @@ Listener *SpawnArgs::SpawnInternal(void)
     }
 
     t2 = gi.Milliseconds();
-    if (t2 - t2 >= 100) {
+    if (t2 - t1 >= 100) {
         //
         // above 100 ms send a message to console
         //

From 1fb8327ca98bc7dee26a56501805fd0e71e5df9d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Sep 2024 22:14:27 +0200
Subject: [PATCH 0987/2040] Don't let the frame msec go below 0

---
 code/server/sv_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 1be02ad4..8b81355d 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -1028,6 +1028,12 @@ void SV_Frame( int msec ) {
 	}
     
 	frameMsec = 1000 / sv_fps->integer;
+	// don't let it scale below 1ms
+	if(frameMsec < 1)
+	{
+		Cvar_Set("timescale", va("%f", sv_fps->integer / 1000.0f));
+		frameMsec = 1;
+	}
 
 	sv.timeResidual += msec;
 

From fc6bffe6831b8ad183cd29453096f7f4c0e0d5ee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 01:01:27 +0200
Subject: [PATCH 0988/2040] Don't post event when loading save game

---
 code/qcommon/listener.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 60f9fd96..d21e8985 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -2691,6 +2691,12 @@ EventQueueNode *Listener::PostEventInternal(Event *ev, float delay, int flags)
     EventQueueNode *i;
     int             inttime;
 
+#if defined(GAME_DLL)
+    if (LoadingSavegame) {
+        return NULL;
+    }
+#endif
+
     if (!classinfo()->responseLookup[ev->eventnum]) {
         if (!ev->eventnum) {
 #ifdef _DEBUG

From 290e45062d870fe6a47547bbe5336796c679ca4b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 01:16:32 +0200
Subject: [PATCH 0989/2040] Set the server time before calling ge->RunFrame()
 in SV_SpawnServer()

This fixes an issue where some scripts wouldn't be initialized in time, like those that set AI animations. For example this caused an issue with the plane passenger in e2l1, where the animation would get reset due to a very specific chain of events
---
 code/server/sv_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 50268ff2..62aac797 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -794,8 +794,8 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		// run a few frames to allow everything to settle
 		for( i = 0; i < 3; i++ )
 		{
-			ge->RunFrame( svs.time, 100 );
 			svs.time += 100;
+			ge->RunFrame( svs.time, 100 );
 
 			p = ge->errorMessage;
 			if( p )

From 97c9075503c6345c64c08f474e282fb9254a860a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 18:20:25 +0200
Subject: [PATCH 0990/2040] Fix a small mistake in normal calculations for
 MM_ClipVelocity2D

Same error as commit c76dda15232452a8f8c0d244c13dbc1d481eb484. This fixes an issue where AI would run too slowly, like the crate guy in the intro of e1l1, the crate guy was too slow that it ran through the intro vehicle
---
 code/fgame/g_mmove.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index 0324c73d..0152d314 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -489,8 +489,8 @@ void MM_ClipVelocity2D(float *in, float *normal, float *out, float overbounce)
             return;
         }
 
-        normal2[0] = in[0] + DotProduct2D(in, normal);
-        normal2[1] = in[1] + DotProduct2D(in, normal);
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
         normal2[2] = normal[2] * DotProduct2D(in, in);
 
         VectorNormalize(normal2);

From dbc536c6c25ce09ea7c66761dc0eb4cff2229060 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:10:01 +0200
Subject: [PATCH 0991/2040] Fix voice chat time not working on FFA

---
 code/fgame/player.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 4a6f18ba..2f8aeab3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10448,10 +10448,10 @@ void Player::EventDMMessage(Event *ev)
             } else {
                 iMode = -1;
             }
+        }
 
-            if (g_voiceChatTime->value > 0) {
-                m_fTalkTime = g_voiceChatTime->value + level.time;
-            }
+        if (g_voiceChatTime->value > 0) {
+            m_fTalkTime = g_voiceChatTime->value + level.time;
         }
     }
 

From a977cbdd26ae7d10f2f17d6ca7621238aed41cda Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:27:11 +0200
Subject: [PATCH 0992/2040] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 69c338da..ead2ac66 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ All game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liber
 ## Features
 
 - [What's working](docs/features_implementation.md)
-- [New features](docs/features.md)
+- [List of new features](docs/features.md)
 - [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html)
 
 ## Compiling

From e43f0a92853a10b50149c541a38233a695f609a0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:27:49 +0200
Subject: [PATCH 0993/2040] Add a new feature to enable/disable instant
 messages and text chat with a variable to set the minimum delay between
 messages

---
 code/fgame/gamecvars.cpp | 22 +++++++++++++++++++++
 code/fgame/gamecvars.h   |  5 +++++
 code/fgame/player.cpp    | 41 +++++++++++++++++++++++++++++++++++++---
 code/fgame/player.h      |  8 +++++++-
 docs/features.md         |  2 +-
 5 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index d84961aa..c1c28e17 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -257,6 +257,10 @@ cvar_t *g_no_seasick;
 
 cvar_t *g_aistats;
 
+//
+// Added in OPM
+//
+
 cvar_t *g_obituarylocation;
 
 cvar_t *sv_scriptfiles;
@@ -269,6 +273,15 @@ cvar_t *g_spectatefollow_firstperson;
 
 cvar_t *cl_running;
 
+// Whether or instant messages are allowed
+cvar_t *g_instamsg_allowed;
+// Minimum delay, in milliseconds, between instant messages
+cvar_t *g_instamsg_minDelay;
+// Whether or not text messages are allowed
+cvar_t *g_textmsg_allowed;
+// Minimum delay, in milliseconds, between messages
+cvar_t *g_textmsg_minDelay;
+
 void CVAR_Init(void)
 {
     developer      = gi.Cvar_Get("developer", "0", 0);
@@ -596,6 +609,10 @@ void CVAR_Init(void)
     g_rifles_for_sweepers     = gi.Cvar_Get("g_rifles_for_sweepers", "0", 0);
     g_no_seasick              = gi.Cvar_Get("g_no_seasick", "0", 0);
 
+    //
+    // Added in OPM
+    //
+
     if (g_target_game >= target_game_e::TG_MOHTA) {
         g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "0", 0);
     } else {
@@ -624,5 +641,10 @@ void CVAR_Init(void)
         gi.cvar_set("sv_numbots", sv_maxbots->string);
     }
 
+    g_instamsg_allowed = gi.Cvar_Get("g_instamsg_allowed", "1", 0);
+    g_instamsg_minDelay = gi.Cvar_Get("g_instamsg_minDelay", "0", 0);
+    g_textmsg_allowed = gi.Cvar_Get("g_textmsg_allowed", "1", 0);
+    g_textmsg_minDelay = gi.Cvar_Get("g_textmsg_minDelay", "0", 0);
+
     cl_running = gi.Cvar_Get("cl_running", "", 0);
 }
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index 44bf853f..6ccbaa54 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -274,6 +274,11 @@ extern cvar_t *g_spectatefollow_firstperson;
 
 extern cvar_t *cl_running;
 
+extern cvar_t *g_instamsg_allowed;
+extern cvar_t *g_instamsg_minDelay;
+extern cvar_t *g_textmsg_allowed;
+extern cvar_t *g_textmsg_minDelay;
+
 void CVAR_Init(void);
 
 #ifdef __cplusplus
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 2f8aeab3..1c05140a 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2023,6 +2023,9 @@ Player::Player()
 #endif
     m_fpsTiki           = NULL;
     m_bConnected        = false;
+
+    m_iInstantMessageTime = 0;
+    m_iTextChatTime = 0;
     //====
 
     if (LoadingSavegame) {
@@ -10403,6 +10406,16 @@ void Player::EventDMMessage(Event *ev)
             return;
         }
 
+        if (!g_instamsg_allowed->integer) {
+            // Added in OPM
+            return;
+        }
+
+        if (g_instamsg_minDelay->integer > 0 && level.inttime < m_iInstantMessageTime + g_instamsg_minDelay->integer) {
+            // Added in OPM
+            return;
+        }
+
         GetTeamDialogPrefix(sAliasName);
         sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
         sRandomAlias = GetRandomAlias(sAliasName, &pSoundAlias);
@@ -10449,17 +10462,39 @@ void Player::EventDMMessage(Event *ev)
                 iMode = -1;
             }
         }
+    } else {
+        if (!g_textmsg_allowed->integer) {
+            // Added in OPM
 
-        if (g_voiceChatTime->value > 0) {
-            m_fTalkTime = g_voiceChatTime->value + level.time;
+            str errorString = gi.LV_ConvertString("Message Error");
+            str reasonString = gi.LV_ConvertString("Text chat is disabled on this server");
+
+            gi.SendServerCommand(
+                edict - g_entities,
+                "print \"" HUD_MESSAGE_CHAT_WHITE "%s: %s.\n\"",
+                errorString.c_str(),
+                reasonString.c_str()
+            );
+            return;
+        }
+
+        if (g_textmsg_minDelay->integer > 0 && level.inttime < m_iTextChatTime + g_textmsg_minDelay->integer) {
+            // Added in OPM
+            return;
         }
     }
 
-    if (!bInstaMessage) {
+    if (bInstaMessage) {
+        if (g_voiceChatTime->value > 0) {
+            m_fTalkTime = g_voiceChatTime->value + level.time;
+        }
+        m_iInstantMessageTime = level.inttime;
+    } else {
         iMode = ev->GetInteger(1);
         if (g_textChatTime->value > 0) {
             m_fTalkTime = g_textChatTime->value + level.time;
         }
+        m_iTextChatTime = level.inttime;
     }
 
     Q_strncpyz(szPrintString, "print \"" HUD_MESSAGE_CHAT_WHITE, sizeof(szPrintString));
diff --git a/code/fgame/player.h b/code/fgame/player.h
index fb3f8115..631e8953 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -345,7 +345,9 @@ public:
     bool  m_bWaitingForRespawn;
     bool  m_bShouldRespawn;
 
-    // new variables
+    //
+    // Added in OPM
+    //
     str                 m_sVision;    // current vision
     str                 m_sStateFile; // custom statefile
     bool                m_bFrozen; // if player is frozen
@@ -360,6 +362,10 @@ public:
     bool                m_bConnected;
     str                 m_lastcommand;
 
+private:
+    int         m_iInstantMessageTime;
+    int         m_iTextChatTime;
+
 public:
     qboolean CondTrue(Conditional& condition);
     qboolean CondChance(Conditional& condition);
diff --git a/docs/features.md b/docs/features.md
index b1c8cc39..d963da1f 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -34,7 +34,7 @@ Overall, better compatibility on modern systems and bugfixes.
 - More script commands for mods
 - Non-PVS optimization
 - Packet flood protection
-- Spectate players in first-person
+- Ability to enable/disable the text chat and the voice message chat and set a delay between chat/instant messages
 
 #### Non-PVS optimization
 

From 27e2063bf9303f82ed7146caf9887c9c32eb0563 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:30:37 +0200
Subject: [PATCH 0994/2040] Add server configuration documentation

---
 README.md                    |  1 +
 docs/configuration/server.md | 73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 docs/configuration/server.md

diff --git a/README.md b/README.md
index ead2ac66..02a9e061 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 
 - [Installing OpenMoHAA](docs/getting_started_installation.md)
 - [Running OpenMoHAA and using expansion assets](docs/getting_started_running.md)
+- [Dedicated server configuration](docs/configuration/server.md)
 
 ## Current state
 
diff --git a/docs/configuration/server.md b/docs/configuration/server.md
new file mode 100644
index 00000000..9b68d929
--- /dev/null
+++ b/docs/configuration/server.md
@@ -0,0 +1,73 @@
+# Server configuration and commands
+
+This documentation currently only lists new changes that were introduced in OpenMoHAA.
+
+## Home directory
+
+In original MOH:AA, the original directory is used to store mods and data, it's not the case in OpenMoHAA, it uses the home directory by default to write data in here and the home directory can be used to store mods. This behavior can be changed:
+- `set fs_homepath Z:\openmohaa_data` user data will be read and written in the directory located in `Z:\openmohaa_data`
+- `set fs_homepath homedata` the subdirectory `homedata` in the game directory will be used to read and store user data
+- `+set fs_homepath .` (not recommended) the game directory will be used for storing user data just like the original MOH:AA
+
+## Networking
+
+### Configure the network components
+
+The network components can be tweaked to use IPv4/IPv6. IPv6 is disabled by default on dedicated servers but that can be changed:
+- `set net_enabled 1` enables IPv4 only
+- `set net_enabled 2` enables IPv6 only
+- `set net_enabled 3` enables both IPv4 and IPv6
+
+### Optimization (or Antichams)
+
+There is a new variable, `sv_netoptimize` that helps in optimizing network by not telling players about other players they do not see, it is also an useful protection against cheaters. For each client, the server optimizes by only sending them information about other players that they can see. Clients won't see other players they can't see:
+- `set sv_netoptimize 0` disables the optimization
+- `set sv_netoptimize 1` enables the optimization for entities that are moving
+- `set sv_netoptimize 2` enables the optimization always
+
+Sounds will still be heard for consistency.
+
+### Managing bans
+
+The project introduces a feature to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` (it can be modified with the `sv_banFile` variable), here are commands to manage bans:
+- `rehashbans` to load saved bans from the banlist file.
+- `listbans` list all banned IP addresses
+
+|Name       |Parameters                         |Description
+|-----------|-----------------------------------|-----------
+|rehashbans |                                   |Load saved bans from the banlist file
+|listbans   |                                   |List all banned IP addresses
+|banaddr    |ip[/subnet] \| clientnum [subnet]  |Ban an IP through its address or through a client number, a subnet can be specified to ban a network range
+|exceptaddr |ip[/subnet] \| clientnum [subnet]  |Add an IP as an exception, for example IP ranges can be banned but one or more exceptions can be added
+|bandel     |ip[/subnet] \| num                 |Unban an IP address or a subnet, the entry number can be specified as an alternative
+|exceptdel  |ip[/subnet] \| num                 |Remove a ban exception
+|flushbans  ||Removes the banlist
+
+Examples:
+- `banaddr 192.168.5.2` will ban the IP address 192.168.5.2
+- `banaddr 192.168.1.0/24` will ban all 192.168.1.x IP addresses (in the range192.168.1.0-192.168.1.255)
+- `banaddr 2` will ban the IP address of the client #2
+- `banaddr 4 24` will ban the subnet of client #4 - i.e if client #4 has IP 192.168.8.4, then it will ban all IPs ranging from 192.168.8.0-192.168.8.255
+- `exceptaddr 3` will add the IP of client #3 as an exception
+- `bandel 192.168.8.4` will unban 192.168.8.4
+- `bandel 192.168.1.0/24` will unban the entire 192.168.1.0 subnet (IP ranging from 192.168.1.0-192.168.1.255)
+
+To calculate IP subnets, search for `IP subnet calculator`.
+
+## Game
+
+### Bots
+
+Bots can be used for testing. They don't move by default, so a mod will be needed, like [eaglear bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots):
+- `set sv_maxbots x` must be used to configure the maximum number of bots
+- `set sv_minPlayers x` is optional and can be used to set the minimum number of players that the server should have. Bots will be spawned based on the minimum number of players.
+- `addbot x` where x is the number of bots to add
+- `removebot x` where x is the number of bots to remove
+
+### Chat
+
+The chat can be configured:
+- `set g_instamsg_allowed 0` to disable voice instant messages
+- `set g_instamsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
+- `set g_textmsg_allowed 0` to disable text messages. All, team and private messages will be disabled
+- `set g_textmsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each text message to avoid spamming

From 40c847944860be8fdaa739a0dfab09654b2bd70d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:48:26 +0200
Subject: [PATCH 0995/2040] Update server configuration documentation

---
 docs/configuration/server.md | 61 ++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 9b68d929..1da7bc7c 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -4,55 +4,59 @@ This documentation currently only lists new changes that were introduced in Open
 
 ## Home directory
 
-In original MOH:AA, the original directory is used to store mods and data, it's not the case in OpenMoHAA, it uses the home directory by default to write data in here and the home directory can be used to store mods. This behavior can be changed:
+In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:
 - `set fs_homepath Z:\openmohaa_data` user data will be read and written in the directory located in `Z:\openmohaa_data`
 - `set fs_homepath homedata` the subdirectory `homedata` in the game directory will be used to read and store user data
 - `+set fs_homepath .` (not recommended) the game directory will be used for storing user data just like the original MOH:AA
 
+The variable defaults to the following value depending on the OS:
+- `%APPDATA%\openmohaa` on Windows
+- `~/.openmohaa` on Linux
+
 ## Networking
 
 ### Configure the network components
 
 The network components can be tweaked to use IPv4/IPv6. IPv6 is disabled by default on dedicated servers but that can be changed:
-- `set net_enabled 1` enables IPv4 only
+- `set net_enabled 1` enables IPv4 only - the default on the dedicated server executable
 - `set net_enabled 2` enables IPv6 only
-- `set net_enabled 3` enables both IPv4 and IPv6
+- `set net_enabled 3` enables both IPv4 and IPv6 - the default on the standalone executable
+
+The master server (gamespy protocol) doesn't support IPv6 servers, which means if IPv4 is disabled and IPv6 is only used, the server won't be visible in the internet game server list.
 
 ### Optimization (or Antichams)
 
-There is a new variable, `sv_netoptimize` that helps in optimizing network by not telling players about other players they do not see, it is also an useful protection against cheaters. For each client, the server optimizes by only sending them information about other players that they can see. Clients won't see other players they can't see:
-- `set sv_netoptimize 0` disables the optimization
+There is a new variable, `sv_netoptimize` that helps optimizing network bandwidth, by not telling players about other players they do not see. It is also an useful protection against cheaters. For each client, the server optimizes by only sending them information about other players that they can see. Clients won't see other players they can't see:
+- `set sv_netoptimize 0` disables the optimization - the default
 - `set sv_netoptimize 1` enables the optimization for entities that are moving
 - `set sv_netoptimize 2` enables the optimization always
 
-Sounds will still be heard for consistency.
+This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was enhanced: sounds like footsteps will be sent so players don't get confused.
 
 ### Managing bans
 
-The project introduces a feature to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` (it can be modified with the `sv_banFile` variable), here are commands to manage bans:
-- `rehashbans` to load saved bans from the banlist file.
-- `listbans` list all banned IP addresses
+A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` but it can be modified with the `sv_banFile` variable. Here are commands to manage bans:
 
-|Name       |Parameters                         |Description
-|-----------|-----------------------------------|-----------
-|rehashbans |                                   |Load saved bans from the banlist file
-|listbans   |                                   |List all banned IP addresses
-|banaddr    |ip[/subnet] \| clientnum [subnet]  |Ban an IP through its address or through a client number, a subnet can be specified to ban a network range
-|exceptaddr |ip[/subnet] \| clientnum [subnet]  |Add an IP as an exception, for example IP ranges can be banned but one or more exceptions can be added
-|bandel     |ip[/subnet] \| num                 |Unban an IP address or a subnet, the entry number can be specified as an alternative
-|exceptdel  |ip[/subnet] \| num                 |Remove a ban exception
-|flushbans  ||Removes the banlist
+|Name       |Parameters                             |Description
+|-----------|---------------------------------------|-----------
+|rehashbans |                                       |Loads saved bans from the banlist file
+|listbans   |                                       |Lists all banned IP addresses
+|banaddr    |ip[*/subnet*] \| clientnum [*subnet*]  |Bans an IP through its address or through a client number, a subnet can be specified to ban a network range
+|exceptaddr |ip[*/subnet*] \| clientnum [*subnet*]  |Adds an IP as an exception, for example IP ranges can be banned but one or more exceptions can be added
+|bandel     |ip[*/subnet*] \| num                   |Unbans an IP address or a subnet, the entry number can be specified as an alternative
+|exceptdel  |ip[*/subnet*] \| num                   |Removes a ban exception
+|flushbans  |                                       |Removes all bans
 
 Examples:
-- `banaddr 192.168.5.2` will ban the IP address 192.168.5.2
-- `banaddr 192.168.1.0/24` will ban all 192.168.1.x IP addresses (in the range192.168.1.0-192.168.1.255)
-- `banaddr 2` will ban the IP address of the client #2
-- `banaddr 4 24` will ban the subnet of client #4 - i.e if client #4 has IP 192.168.8.4, then it will ban all IPs ranging from 192.168.8.0-192.168.8.255
-- `exceptaddr 3` will add the IP of client #3 as an exception
-- `bandel 192.168.8.4` will unban 192.168.8.4
-- `bandel 192.168.1.0/24` will unban the entire 192.168.1.0 subnet (IP ranging from 192.168.1.0-192.168.1.255)
+- `banaddr 192.168.5.2` will ban the IP address **192.168.5.2**
+- `banaddr 192.168.1.0/24` will ban all **192.168.1.x** IP addresses (in the range **192.168.1.0**-**192.168.1.255**)
+- `banaddr 2` will ban the IP address of the client **#2**
+- `banaddr 4 24` will ban the subnet of client **#4** - i.e if client **#4** has IP **192.168.8.4**, then it will ban all IPs ranging from **192.168.8.0**-**192.168.8.255**
+- `exceptaddr 3` will add the IP of client **#3** as an exception
+- `bandel 192.168.8.4` will unban **192.168.8.4**
+- `bandel 192.168.1.0/24` will unban the entire **192.168.1.0** subnet (IP ranging from **192.168.1.0**-**192.168.1.255**)
 
-To calculate IP subnets, search for `IP subnet calculator`.
+To calculate IP subnets, search for `IP subnet calculator` on Internet.
 
 ## Game
 
@@ -66,8 +70,11 @@ Bots can be used for testing. They don't move by default, so a mod will be neede
 
 ### Chat
 
-The chat can be configured:
+Chat messages will be logged in the console and in the logfile without requiring to set the `developer` variable.
+
+The in-game chat can be tweaked:
 - `set g_instamsg_allowed 0` to disable voice instant messages
 - `set g_instamsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
 - `set g_textmsg_allowed 0` to disable text messages. All, team and private messages will be disabled
 - `set g_textmsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each text message to avoid spamming
+

From 340f1bb2872062b9be4db50887287b8326e70b25 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:08:12 +0200
Subject: [PATCH 0996/2040] Put chat first in game and add a statement for
 disabling text messages

---
 docs/configuration/server.md | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 1da7bc7c..40d28bf0 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -7,7 +7,7 @@ This documentation currently only lists new changes that were introduced in Open
 In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:
 - `set fs_homepath Z:\openmohaa_data` user data will be read and written in the directory located in `Z:\openmohaa_data`
 - `set fs_homepath homedata` the subdirectory `homedata` in the game directory will be used to read and store user data
-- `+set fs_homepath .` (not recommended) the game directory will be used for storing user data just like the original MOH:AA
+- `set fs_homepath .` not recommended, the game directory will be used for storing user data, just like the original MOH:AA
 
 The variable defaults to the following value depending on the OS:
 - `%APPDATA%\openmohaa` on Windows
@@ -26,12 +26,12 @@ The master server (gamespy protocol) doesn't support IPv6 servers, which means i
 
 ### Optimization (or Antichams)
 
-There is a new variable, `sv_netoptimize` that helps optimizing network bandwidth, by not telling players about other players they do not see. It is also an useful protection against cheaters. For each client, the server optimizes by only sending them information about other players that they can see. Clients won't see other players they can't see:
+A new variable, `sv_netoptimize`, enables a feature that optimizes network bandwidth by not sending players information about others they can't see. For each client, the server optimizes by only transmitting data about players within their view. Clients will not receive information about players they can't see. This feature also helps protect against cheaters:
 - `set sv_netoptimize 0` disables the optimization - the default
 - `set sv_netoptimize 1` enables the optimization for entities that are moving
 - `set sv_netoptimize 2` enables the optimization always
 
-This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was enhanced: sounds like footsteps will be sent so players don't get confused.
+This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was improved in OpenMoHAA: sounds like footsteps will be sent so players don't get confused.
 
 ### Managing bans
 
@@ -60,6 +60,19 @@ To calculate IP subnets, search for `IP subnet calculator` on Internet.
 
 ## Game
 
+### Chat
+
+Chat messages will be logged in the console and in the logfile without requiring to set the `developer` variable.
+
+The in-game chat can be tweaked:
+
+- `set g_instamsg_allowed 0` to disable voice instant messages
+- `set g_instamsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
+- `set g_textmsg_allowed 0` to disable text messages. All, team and private messages will be disabled
+- `set g_textmsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each text message to avoid spamming
+
+Temporarily disabling text messages can be useful in situations where tensions arise in the chat. Otherwise, it's best to keep them enabled under normal circumstances.
+
 ### Bots
 
 Bots can be used for testing. They don't move by default, so a mod will be needed, like [eaglear bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots):
@@ -67,14 +80,3 @@ Bots can be used for testing. They don't move by default, so a mod will be neede
 - `set sv_minPlayers x` is optional and can be used to set the minimum number of players that the server should have. Bots will be spawned based on the minimum number of players.
 - `addbot x` where x is the number of bots to add
 - `removebot x` where x is the number of bots to remove
-
-### Chat
-
-Chat messages will be logged in the console and in the logfile without requiring to set the `developer` variable.
-
-The in-game chat can be tweaked:
-- `set g_instamsg_allowed 0` to disable voice instant messages
-- `set g_instamsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
-- `set g_textmsg_allowed 0` to disable text messages. All, team and private messages will be disabled
-- `set g_textmsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each text message to avoid spamming
-

From 51afcd7b96861cba565f57e5002b88600acc803d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:56:47 +0200
Subject: [PATCH 0997/2040] Fix loading screen being incorrectly displayed

This fixes an issue where some part of the loading screen would not be drawn correctly, due to the screen being updated recursively through UI_Update()
---
 code/client/cl_scrn.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_scrn.cpp b/code/client/cl_scrn.cpp
index 420de08d..a14769a1 100644
--- a/code/client/cl_scrn.cpp
+++ b/code/client/cl_scrn.cpp
@@ -520,16 +520,18 @@ text to the screen.
 ==================
 */
 void SCR_UpdateScreen( void ) {
-	static int	recursive;
+	static qboolean screen_recursive;
 
 	if ( !scr_initialized ) {
 		return;				// not initialized yet
 	}
 
-	if ( ++recursive > 2 ) {
-		Com_Error( ERR_FATAL, "SCR_UpdateScreen: recursively called" );
+	if (screen_recursive) {
+		// already called
+		return;
 	}
-	recursive = 1;
+
+	screen_recursive = qtrue;
 	
 	CL_StartHunkUsers(qfalse);
 	SCR_SimpleUpdateScreen();
@@ -553,6 +555,6 @@ void SCR_UpdateScreen( void ) {
 		}
 	}
 
-	recursive = 0;
+	screen_recursive = qfalse;
 }
 

From facabc09f5d2a00017059f256a54ec2b2104be2e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Sep 2024 18:30:03 +0200
Subject: [PATCH 0998/2040] Don't set the label shader if the specified
 material name is considered empty (#364)

For labels linking to a variable for the shader, this prevents the label from still being rendered, drawing the tiled square grid (notexture)
---
 code/uilib/uilabel.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/uilib/uilabel.cpp b/code/uilib/uilabel.cpp
index 30085e49..ecc7bc32 100644
--- a/code/uilib/uilabel.cpp
+++ b/code/uilib/uilabel.cpp
@@ -166,7 +166,13 @@ void UILabel::LabelLayoutShader(Event *ev)
 void UILabel::LabelLayoutTileShader(Event *ev)
 {
     m_sCurrentShaderName = ev->GetString(1);
-    setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
+    if (m_sCurrentShaderName.length() > 1) {
+        setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
+    } else {
+        // Added in 2.0
+        //  Don't set the material if the shader name is considered empty
+        m_sCurrentShaderName = "";
+    }
 
     m_flags |= WF_TILESHADER;
 }

From 98fc0a8cb9398018c9a6585a27cc1009d885d091 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Sep 2024 19:30:06 +0200
Subject: [PATCH 0999/2040] Fix the letterbox not correctly rendering

When a letterbox was active, it was covering the entire screen
---
 code/client/cl_uiview3d.cpp | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 31798328..f7c529e3 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -376,21 +376,22 @@ void View3D::DrawLetterbox(void)
     col[0] = col[1] = col[2] = 0;
     col[3]                   = 1;
 
-    frac = cl.snap.ps.stats[STAT_LETTERBOX] / 32767.0;
-    if (frac > 0.0) {
-        m_letterbox_active = true;
-        re.SetColor(col);
-
-        re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
-        re.DrawBox(
-            0.0,
-            m_screenframe.size.height - m_screenframe.size.height * frac,
-            m_screenframe.size.width,
-            m_screenframe.size.height
-        );
-    } else {
+    frac = (float)cl.snap.ps.stats[STAT_LETTERBOX] / MAX_LETTERBOX_SIZE;
+    if (frac <= 0) {
         m_letterbox_active = false;
+        return;
     }
+
+    m_letterbox_active = true;
+    re.SetColor(col);
+
+    re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height * frac);
+    re.DrawBox(
+        0.0,
+        m_screenframe.size.height - m_screenframe.size.height * frac,
+        m_screenframe.size.width,
+        m_screenframe.size.height
+    );
 }
 
 void View3D::DrawFades(void)
@@ -459,7 +460,14 @@ void View3D::DrawFPS(void)
         qfalse
     );
 
-    Com_sprintf(string, sizeof(string), "t%5d v%5d Mtex%5.2f", cls.total_tris, cls.total_verts, (float)cls.total_texels * 0.00000095367432);
+    Com_sprintf(
+        string,
+        sizeof(string),
+        "t%5d v%5d Mtex%5.2f",
+        cls.total_tris,
+        cls.total_verts,
+        (float)cls.total_texels * 0.00000095367432
+    );
 
     m_font->Print(
         m_font->getHeight(qfalse) * 10.0,

From bfa0ef64eca207731394cebf7aa5c0bf6fbc8225 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Sep 2024 19:35:14 +0200
Subject: [PATCH 1000/2040] Fix the letterbox not transitioning smoothly

This fixes the letterbox being shown immediately
---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 1c05140a..a862eb35 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7483,7 +7483,7 @@ void Player::UpdateStats(void)
 
     float frac;
 
-    level.m_letterbox_time -= level.intframetime;
+    level.m_letterbox_time -= level.frametime;
 
     frac = level.m_letterbox_time / level.m_letterbox_time_start;
 

From 94f308c50f4b954593306effd674c43ec526171a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Sep 2024 19:50:10 +0200
Subject: [PATCH 1001/2040] Draw a black outline for game messages and death
 messages when targeting mohta or mohtt

---
 code/client/cl_uidmbox.cpp | 23 +++++++++++++++++++++++
 code/client/cl_uidmbox.h   |  4 +++-
 code/client/cl_uigmbox.cpp | 23 +++++++++++++++++++++++
 code/client/cl_uigmbox.h   |  4 +++-
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 357d7571..1d77899f 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -61,6 +61,7 @@ UIDMBox::UIDMBox()
 	m_iBeginDecay = 0;
 	m_boxtime = uid.time;
 	m_movespeed = 500;
+	m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
 }
 
 void UIDMBox::VerifyBoxOut( void )
@@ -278,6 +279,28 @@ float UIDMBox::PrintWrap( UIFont *font, float x, float y, str text )
 
 float UIDMBox::DrawItem( item_t *in, float x, float y, float alpha )
 {
+	if (m_drawoutline) {
+		//
+		// Draw an outline
+		//
+
+		in->font->setColor(UBlack);
+		in->font->setAlpha(alpha);
+
+		PrintWrap(in->font, x + 1, y + 2, in->string);
+		PrintWrap(in->font, x + 2, y + 1, in->string);
+		PrintWrap(in->font, x - 1, y + 2, in->string);
+		PrintWrap(in->font, x - 2, y + 1, in->string);
+		PrintWrap(in->font, x - 1, y - 2, in->string);
+		PrintWrap(in->font, x - 2, y - 1, in->string);
+		PrintWrap(in->font, x + 1, y - 2, in->string);
+		PrintWrap(in->font, x + 2, y - 1, in->string);
+		PrintWrap(in->font, x + 2, y, in->string);
+		PrintWrap(in->font, x - 2, y, in->string);
+		PrintWrap(in->font, x, y + 2, in->string);
+		PrintWrap(in->font, x, y - 2, in->string);
+	}
+
 	in->font->setColor(in->color);
 	in->font->setAlpha(alpha);
 
diff --git a/code/client/cl_uidmbox.h b/code/client/cl_uidmbox.h
index cf8660e1..eb893865 100644
--- a/code/client/cl_uidmbox.h
+++ b/code/client/cl_uidmbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -47,6 +47,8 @@ protected:
 	int m_movespeed;
 	int m_iBeginDecay;
 	int m_iEndDecay;
+	// Added in OPM
+	bool m_drawoutline;
 
 public:
 	CLASS_PROTOTYPE( UIDMBox );
diff --git a/code/client/cl_uigmbox.cpp b/code/client/cl_uigmbox.cpp
index 82761c1b..5266a01f 100644
--- a/code/client/cl_uigmbox.cpp
+++ b/code/client/cl_uigmbox.cpp
@@ -61,6 +61,7 @@ UIGMBox::UIGMBox()
 	m_iBeginDecay = 0;
 	m_boxtime = uid.time;
 	m_movespeed = 500;
+	m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
 }
 
 void UIGMBox::VerifyBoxOut( void )
@@ -272,6 +273,28 @@ float UIGMBox::PrintWrap( UIFont *font, float x, float y, str text )
 
 float UIGMBox::DrawItem( item_t *in, float x, float y, float alpha )
 {
+	if (m_drawoutline) {
+		//
+		// Draw an outline
+		//
+
+		in->font->setColor(UBlack);
+		in->font->setAlpha(alpha);
+
+		PrintWrap(in->font, x + 1, y + 2, in->string);
+		PrintWrap(in->font, x + 2, y + 1, in->string);
+		PrintWrap(in->font, x - 1, y + 2, in->string);
+		PrintWrap(in->font, x - 2, y + 1, in->string);
+		PrintWrap(in->font, x - 1, y - 2, in->string);
+		PrintWrap(in->font, x - 2, y - 1, in->string);
+		PrintWrap(in->font, x + 1, y - 2, in->string);
+		PrintWrap(in->font, x + 2, y - 1, in->string);
+		PrintWrap(in->font, x + 2, y, in->string);
+		PrintWrap(in->font, x - 2, y, in->string);
+		PrintWrap(in->font, x, y + 2, in->string);
+		PrintWrap(in->font, x, y - 2, in->string);
+	}
+
 	in->font->setColor(in->color);
 	in->font->setAlpha(alpha);
 
diff --git a/code/client/cl_uigmbox.h b/code/client/cl_uigmbox.h
index 6a904515..03993be5 100644
--- a/code/client/cl_uigmbox.h
+++ b/code/client/cl_uigmbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -44,6 +44,8 @@ protected:
 	int m_movespeed;
 	int m_iBeginDecay;
 	int m_iEndDecay;
+	// Added in OPM
+	bool m_drawoutline;
 
 public:
 	CLASS_PROTOTYPE( UIGMBox );

From bf184fb71921c9e625b03b00f013c97a178c7e0f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Sep 2024 20:19:11 +0200
Subject: [PATCH 1002/2040] Use #pragma once instead of #ifndef

---
 code/client/cl_uidmbox.h             | 5 +----
 code/client/cl_uigmbox.h             | 5 +----
 code/fgame/archive.h                 | 7 ++-----
 code/fgame/armor.h                   | 7 ++-----
 code/fgame/barrels.h                 | 7 ++-----
 code/fgame/baseimp.h                 | 7 ++-----
 code/fgame/beam.h                    | 7 ++-----
 code/fgame/body.h                    | 7 ++-----
 code/fgame/botlib.h                  | 4 +---
 code/fgame/bspline.h                 | 7 ++-----
 code/fgame/characterstate.h          | 7 ++-----
 code/fgame/crc32.h                   | 7 ++-----
 code/fgame/decals.h                  | 7 ++-----
 code/fgame/earthquake.h              | 7 ++-----
 code/fgame/effectentity.h            | 7 ++-----
 code/fgame/explosion.h               | 7 ++-----
 code/fgame/g_main.h                  | 5 +----
 code/fgame/g_phys.h                  | 7 ++-----
 code/fgame/gibs.h                    | 7 ++-----
 code/fgame/glb_local.h               | 7 ++-----
 code/fgame/gravpath.h                | 7 ++-----
 code/fgame/grenadehint.h             | 7 ++-----
 code/fgame/health.h                  | 7 ++-----
 code/fgame/hud.h                     | 7 ++-----
 code/fgame/huddraw.h                 | 7 ++-----
 code/fgame/inventoryitem.h           | 7 ++-----
 code/fgame/ipfilter.h                | 7 ++-----
 code/fgame/light.h                   | 7 ++-----
 code/fgame/mover.h                   | 7 ++-----
 code/fgame/playerbot.h               | 7 ++-----
 code/fgame/playerstart.h             | 7 ++-----
 code/fgame/portal.h                  | 8 ++------
 code/fgame/scripttimer.h             | 7 ++-----
 code/fgame/soundman.h                | 7 ++-----
 code/fgame/specialfx.h               | 7 ++-----
 code/fgame/stack.h                   | 7 ++-----
 code/fgame/umap.h                    | 7 ++-----
 code/fgame/viewthing.h               | 7 ++-----
 code/fgame/weapon.h                  | 7 ++-----
 code/fgame/weaputils.h               | 7 ++-----
 code/uilib/ucolor.h                  | 7 ++-----
 code/uilib/ui_extern.h               | 8 ++------
 code/uilib/ui_local.h                | 8 ++------
 code/uilib/uibutton.h                | 7 ++-----
 code/uilib/uicheckbox.h              | 8 ++------
 code/uilib/uiconsole.h               | 7 ++-----
 code/uilib/uifloatwnd.h              | 7 ++-----
 code/uilib/uilayout.h                | 7 ++-----
 code/uilib/uilist.h                  | 7 ++-----
 code/uilib/uilistctrl.h              | 7 ++-----
 code/uilib/uimenu.h                  | 8 ++------
 code/uilib/uinotepad.h               | 8 ++------
 code/uilib/uipoint2d.h               | 7 ++-----
 code/uilib/uipopupmenu.h             | 8 ++------
 code/uilib/uipulldownmenu.h          | 8 ++------
 code/uilib/uipulldownmenucontainer.h | 8 ++------
 code/uilib/uisize2d.h                | 7 ++-----
 code/uilib/uislider.h                | 8 ++------
 code/uilib/uistatus.h                | 8 ++------
 code/uilib/uivertscroll.h            | 7 ++-----
 code/uilib/ulist.h                   | 7 ++-----
 61 files changed, 118 insertions(+), 311 deletions(-)

diff --git a/code/client/cl_uidmbox.h b/code/client/cl_uidmbox.h
index eb893865..a02dab84 100644
--- a/code/client/cl_uidmbox.h
+++ b/code/client/cl_uidmbox.h
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIDMBOX_H__
-#define __CL_UIDMBOX_H__
+#pragma once
 
 static constexpr unsigned int DMBOX_ITEM_FLAG_BOLD = 2u;
 static constexpr unsigned int DMBOX_ITEM_FLAG_DEATH = 4u;
@@ -77,5 +76,3 @@ public:
 	void		setRealShow( bool b );
 	void		Clear( void );
 };
-
-#endif /* __CL_UIDMBOX_H__ */
diff --git a/code/client/cl_uigmbox.h b/code/client/cl_uigmbox.h
index 03993be5..4090b45d 100644
--- a/code/client/cl_uigmbox.h
+++ b/code/client/cl_uigmbox.h
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIGMBOX_H__
-#define __CL_UIGMBOX_H__
+#pragma once
 
 static constexpr unsigned int GMBOX_ITEM_FLAG_BOLD = 1u;
 
@@ -74,5 +73,3 @@ public:
 	void		setRealShow( bool b );
 	void		Clear( void );
 };
-
-#endif
diff --git a/code/fgame/archive.h b/code/fgame/archive.h
index 42e38602..71a649dd 100644
--- a/code/fgame/archive.h
+++ b/code/fgame/archive.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // archive.h: OpenMoHAA Archiver
 
-#ifndef __ARCHIVE_H__
-#define __ARCHIVE_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -343,5 +342,3 @@ void con_map<key, value>::Archive(Archiver& arc)
         arc.ArchiveInteger(&tempInt); \
         (thing) = (type)tempInt;      \
     }
-
-#endif // __ARCHIVE_H__
diff --git a/code/fgame/armor.h b/code/fgame/armor.h
index e1b97a5c..ee2f838e 100644
--- a/code/fgame/armor.h
+++ b/code/fgame/armor.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // armor.h: Standard armor that prevents a percentage of damage per hit. 
 
-#ifndef __ARMOR_H__
-#define __ARMOR_H__
+#pragma once
 
 #include "weapon.h" 
 
@@ -40,5 +39,3 @@ class Armor : public Item
 
       qboolean Pickupable( Entity *other ) override;
    };
-
-#endif /* armor.h */
diff --git a/code/fgame/barrels.h b/code/fgame/barrels.h
index 78caaf43..e8330feb 100644
--- a/code/fgame/barrels.h
+++ b/code/fgame/barrels.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // barrels.h : Barrels
 
-#ifndef __BARRELOBJECT_H__
-#define __BARRELOBJECT_H__
+#pragma once
 
 #include "entity.h"
 
@@ -90,5 +89,3 @@ inline void BarrelObject::Archive
 		arc.ArchiveVector( &m_vLeakNorms[ i ] );
 	}
 }
-
-#endif // __BARRELOBJECT_H__
diff --git a/code/fgame/baseimp.h b/code/fgame/baseimp.h
index 5eaff5e9..205a3ca1 100644
--- a/code/fgame/baseimp.h
+++ b/code/fgame/baseimp.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __BASEIMP_H__
-#define __BASEIMP_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,5 +85,3 @@ void CacheResource( const char *name );
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/code/fgame/beam.h b/code/fgame/beam.h
index 5cea8b7d..abd72ee7 100644
--- a/code/fgame/beam.h
+++ b/code/fgame/beam.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // beam.h: Beam
 
-#ifndef __BEAM_H__
-#define __BEAM_H__
+#pragma once
 
 #include "g_local.h"
 #include "scriptslave.h"
@@ -123,5 +122,3 @@ inline void FuncBeam::Archive
       SetBeamShader( shader );
       }
    }
-
-#endif // __BEAM_H__
diff --git a/code/fgame/body.h b/code/fgame/body.h
index 0abcb57a..b086ae89 100644
--- a/code/fgame/body.h
+++ b/code/fgame/body.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // body.h: Dead bodies
 
-#ifndef __BODY_H__
-#define __BODY_H__
+#pragma once
 
 #include "animate.h"
 
@@ -39,5 +38,3 @@ public:
 	CLASS_PROTOTYPE( Body );
 	Body();
 };
-
-#endif //__BODY_H__
diff --git a/code/fgame/botlib.h b/code/fgame/botlib.h
index c49455ab..d96340a4 100644
--- a/code/fgame/botlib.h
+++ b/code/fgame/botlib.h
@@ -13,8 +13,7 @@
  *
  *****************************************************************************/
 
-#ifndef __BOTLIB_H__
-#define __BOTLIB_H__
+#pragma once
 
 #define	BOTLIB_API_VERSION		2
 
@@ -503,4 +502,3 @@ name:						default:			module(s):			description:
 "max_levelitems"			"256"				be_ai_goal.c		maximum number of level items
 
 */
-#endif
diff --git a/code/fgame/bspline.h b/code/fgame/bspline.h
index e0cf70eb..50a69d82 100644
--- a/code/fgame/bspline.h
+++ b/code/fgame/bspline.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // bspline.h: Uniform non-rational bspline class.
 // 
 
-#ifndef __BSPLINE_H__
-#define __BSPLINE_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -580,5 +579,3 @@ inline void SplinePath::SetTriggerTarget
    {
    triggertarget = name;
    }
-
-#endif /* __BSPLINE_H__ */
diff --git a/code/fgame/characterstate.h b/code/fgame/characterstate.h
index 884136e2..83d43b16 100644
--- a/code/fgame/characterstate.h
+++ b/code/fgame/characterstate.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // characterstate.h: Character state
 
-#ifndef __CHARACTERSTATE_H__
-#define __CHARACTERSTATE_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -359,5 +358,3 @@ StateMap *GetStatemap(
     qboolean                  cache_only = false
 );
 void CacheStatemap(str filename, Condition<Class> *conditions);
-
-#endif /* !__CHARACTERSTATE_H__ */
diff --git a/code/fgame/crc32.h b/code/fgame/crc32.h
index 703aca60..0b0547e5 100644
--- a/code/fgame/crc32.h
+++ b/code/fgame/crc32.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // crc32.h: CRC32 Encryption (used by the Archiver)
 
-#ifndef __CRC32_H__
-#define __CRC32_H8_
+#pragma once
 
 static unsigned int crc32_tab[] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
@@ -84,5 +83,3 @@ unsigned int crc32( unsigned int crc, const void *buf, size_t size )
 
 	return crc ^ ~0U;
 }
-
-#endif // __CRC32_H__
diff --git a/code/fgame/decals.h b/code/fgame/decals.h
index 7786cf06..1ca2997a 100644
--- a/code/fgame/decals.h
+++ b/code/fgame/decals.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // decals.h: Decal entities
 
-#ifndef __DECAL_H__
-#define __DECAL_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -57,5 +56,3 @@ inline void Decal::Archive
       setShader( shader );
       }
    }
-
-#endif // __DECAL_H__
diff --git a/code/fgame/earthquake.h b/code/fgame/earthquake.h
index 98157027..0a6b1721 100644
--- a/code/fgame/earthquake.h
+++ b/code/fgame/earthquake.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,8 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // The earthquake effect is visible to the user as the shaking of his screen.
 // 
 
-#ifndef __EARTHQUAKE_H__
-#define __EARTHQUAKE_H__
+#pragma once
 
 #include "g_local.h"
 #include "trigger.h"
@@ -75,5 +74,3 @@ inline void ViewJitter::Archive
 	arc.ArchiveBoolean( &m_bDoneDeath );
 	arc.ArchiveFloat( &m_fTimeRunning );
 }
-
-#endif
diff --git a/code/fgame/effectentity.h b/code/fgame/effectentity.h
index 63c0c984..2379abee 100644
--- a/code/fgame/effectentity.h
+++ b/code/fgame/effectentity.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // actor.cpp: Base class for character AI.
 
-#ifndef __EFFECTENTITY_H__
-#define __EFFECTENTITY_H__
+#pragma once
 
 #include "animate.h"
 
@@ -34,5 +33,3 @@ public:
 
 	EffectEntity();
 };
-
-#endif // __EFFECTENTITY_H__
diff --git a/code/fgame/explosion.h b/code/fgame/explosion.h
index 19618004..4d123c49 100644
--- a/code/fgame/explosion.h
+++ b/code/fgame/explosion.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // explosions each time they are activated.
 // 
 
-#ifndef __EXPLOSION_H__
-#define __EXPLOSION_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -136,5 +135,3 @@ inline void ExplodeObject::Archive
    arc.ArchiveInteger( &debrisamount );
    debrismodels.Archive( arc );
    }
-
-#endif /* explosion.h */
diff --git a/code/fgame/g_main.h b/code/fgame/g_main.h
index 1c31728d..7f57e781 100644
--- a/code/fgame/g_main.h
+++ b/code/fgame/g_main.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // g_main.h -- Global header file for g_main.cpp
 
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
+#pragma once
 
 #include "g_local.h"
 #include "gamecvars.h"
@@ -55,5 +54,3 @@ void G_AllocGameData(void);
 void G_DeAllocGameData(void);
 void G_ClientDrawBoundingBoxes(void);
 void G_ClientDrawTags(void);
-
-#endif /* g_main.h */
diff --git a/code/fgame/g_phys.h b/code/fgame/g_phys.h
index 6690ff68..3f37b76f 100644
--- a/code/fgame/g_phys.h
+++ b/code/fgame/g_phys.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // g_phys.h: Header for g_phys.cpp
 
-#ifndef __G_PHYS_H__
-#define __G_PHYS_H__
+#pragma once
 
 #include "g_local.h"
 #include "vector.h"
@@ -79,5 +78,3 @@ void		G_Impact( Entity *e1, trace_t *trace );
 qboolean	G_PushMove( Entity *pusher, Vector move, Vector amove );
 void		G_CheckWater( Entity *ent );
 Entity		*G_TestEntityPosition( Entity *ent, Vector vOrg );
-
-#endif /* g_phys.h */
diff --git a/code/fgame/gibs.h b/code/fgame/gibs.h
index 382d201d..364ee54e 100644
--- a/code/fgame/gibs.h
+++ b/code/fgame/gibs.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // gibs.h: Gibs - nuff said
 
-#ifndef __GIBS_H__
-#define __GIBS_H__
+#pragma once
 
 #include "g_local.h"
 #include "mover.h"
@@ -88,5 +87,3 @@ void CreateGibs
    );
 
 extern Event EV_ThrowGib;
-
-#endif // gibs.h
diff --git a/code/fgame/glb_local.h b/code/fgame/glb_local.h
index 673a55f3..588f975d 100644
--- a/code/fgame/glb_local.h
+++ b/code/fgame/glb_local.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __GLB_LOCAL_H__
-#define __GLB_LOCAL_H__
+#pragma once
 
 #if defined( GAME_DLL )
 
@@ -79,5 +78,3 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #endif
-
-#endif /* glb_local.h */
diff --git a/code/fgame/gravpath.h b/code/fgame/gravpath.h
index efa56b6f..d3a6380e 100644
--- a/code/fgame/gravpath.h
+++ b/code/fgame/gravpath.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // gravpath.h: Gravity path - Used for underwater currents and wells.
 
-#ifndef __GRAVPATH_H__
-#define __GRAVPATH_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -202,5 +201,3 @@ inline void GravPathManager::Archive
    }
 
 extern GravPathManager gravPathManager;
-
-#endif /* gravpath.h */
diff --git a/code/fgame/grenadehint.h b/code/fgame/grenadehint.h
index 48bc9803..0661f769 100644
--- a/code/fgame/grenadehint.h
+++ b/code/fgame/grenadehint.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // grenadehint.h: Grenade hint for actors.
 
-#ifndef __GRENADEHINT_H__
-#define __GRENADEHINT_H__
+#pragma once
 
 #include "g_local.h"
 #include "archive.h"
@@ -53,5 +52,3 @@ inline void GrenadeHint::Archive
 
 	arc.ArchiveObjectPointer( ( Class ** )&m_pNext );
 }
-
-#endif
diff --git a/code/fgame/health.h b/code/fgame/health.h
index d32e77fe..a9064b62 100644
--- a/code/fgame/health.h
+++ b/code/fgame/health.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // health.h: Health powerup
 //
 
-#ifndef __HEALTH_H__
-#define __HEALTH_H__
+#pragma once
 
 #include "g_local.h"
 #include "item.h"
@@ -52,5 +51,3 @@ public:
 private:
     static SafePtr<Health> mHealthQueue[MAX_HEALTH_QUEUE];
 };
-
-#endif /* health.h */
diff --git a/code/fgame/hud.h b/code/fgame/hud.h
index 155915cc..61b53a54 100644
--- a/code/fgame/hud.h
+++ b/code/fgame/hud.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // hud.h: New HUD handler for MoHAA
 //
 
-#ifndef __HUD_H__
-#define __HUD_H__
+#pragma once
 
 #include "listener.h"
 #include "container.h"
@@ -208,5 +207,3 @@ public:
 };
 
 extern Container< Hud * > hudElements;
-
-#endif /* __HUD_H__  */
diff --git a/code/fgame/huddraw.h b/code/fgame/huddraw.h
index d924394d..3d15bb82 100644
--- a/code/fgame/huddraw.h
+++ b/code/fgame/huddraw.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // huddraw.cpp :	This is a HudDraw Functions Code section with huddraw functions reversed for 
 //					altering clients HUD
 
-#ifndef __HUDDRAW_H__
-#define __HUDDRAW_H__
+#pragma once
 
 #include "g_local.h"
 
@@ -49,5 +48,3 @@ void iHudDrawAlpha( int cl_num, int info, float alpha );
 void iHudDrawString( int cl_num, int info, const char *string );
 void iHudDrawFont( int cl_num, int info, const char *fontName );
 void iHudDrawTimer( int cl_num, int index, float duration, float fade_out_time );
-
-#endif // __HUDDRAW_H__
diff --git a/code/fgame/inventoryitem.h b/code/fgame/inventoryitem.h
index f9cbd738..b14129ce 100644
--- a/code/fgame/inventoryitem.h
+++ b/code/fgame/inventoryitem.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // inventoryitem.h: Items that are visible in the player's inventory
 
 
-#ifndef __INVITEM_H__
-#define __INVITEM_H__
+#pragma once
 
 #include "weapon.h"
 
@@ -52,5 +51,3 @@ class AntiSBJuice : public InventoryItem
 		void			UseEvent( Event *ev );
    };
 
-
-#endif /* inventoryitem.h */
diff --git a/code/fgame/ipfilter.h b/code/fgame/ipfilter.h
index a09c9216..28fb7a69 100644
--- a/code/fgame/ipfilter.h
+++ b/code/fgame/ipfilter.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,11 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // ipfilter.h: DESCRIPTION:
 // 
 
-#ifndef __IPFILTER_H__
-#define __IPFILTER_H__
+#pragma once
 
 #include "g_local.h"
 
 qboolean SV_FilterPacket( const char *from );
-
-#endif /* !__IPFILTER_H__ */
diff --git a/code/fgame/light.h b/code/fgame/light.h
index 9bbcaa66..08d5ac87 100644
--- a/code/fgame/light.h
+++ b/code/fgame/light.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // light.h: Classes for creating and controlling lights.
 // 
 
-#ifndef __LIGHT_H__
-#define __LIGHT_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -36,5 +35,3 @@ class Light : public Entity
 		
 								Light();
 	};
-
-#endif /* light.h */
diff --git a/code/fgame/mover.h b/code/fgame/mover.h
index d39eed77..0516c93d 100644
--- a/code/fgame/mover.h
+++ b/code/fgame/mover.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // class size down for objects that don't need such behavior.
 // 
 
-#ifndef __MOVER_H__
-#define __MOVER_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -64,5 +63,3 @@ inline void Mover::Archive
    arc.ArchiveEventPointer( &endevent );
    arc.ArchiveInteger( &moveflags );
    }
-
-#endif
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index e7f24707..e9f7b89d 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // playerbot.h: Multiplayer bot system.
 
-#ifndef __PLAYERBOT_H__
-#define __PLAYERBOT_H__
+#pragma once
 
 #include "player.h"
 #include "navigate.h"
@@ -178,5 +177,3 @@ public:
     void GotKill(Event *ev);
     void EventStuffText(Event *ev);
 };
-
-#endif /* playerbot.h */
diff --git a/code/fgame/playerstart.h b/code/fgame/playerstart.h
index 37beee68..e856a2df 100644
--- a/code/fgame/playerstart.h
+++ b/code/fgame/playerstart.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // PlayerStart.h: Player start location entity declarations
 // 
 
-#ifndef __PLAYERSTART_H__
-#define __PLAYERSTART_H__
+#pragma once
 
 #include "g_local.h"
 #include "simpleentity.h"
@@ -89,5 +88,3 @@ class PlayerIntermission : public Camera
 		CLASS_PROTOTYPE( PlayerIntermission );
       PlayerIntermission();
 	};
-
-#endif /* PlayerStart.h */
diff --git a/code/fgame/portal.h b/code/fgame/portal.h
index 1679378c..a7200819 100644
--- a/code/fgame/portal.h
+++ b/code/fgame/portal.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // portal.h:
 // 
 
-#ifndef __PORTAL_H__
-#define __PORTAL_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -45,6 +44,3 @@ class PortalCamera : public Entity
       PortalCamera();
       void Roll( Event *ev );
    };
-
-#endif // __PORTAL_H__
-
diff --git a/code/fgame/scripttimer.h b/code/fgame/scripttimer.h
index 96fff34a..9fcfd46d 100644
--- a/code/fgame/scripttimer.h
+++ b/code/fgame/scripttimer.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // ScriptTimer.cpp: Scripted Timer & Fader
 //
 
-#ifndef __SCRIPTTIMER_H__
-#define __SCRIPTTIMER_H__
+#pragma once
 
 #include "listener.h"
 
@@ -81,5 +80,3 @@ public:
 	bool		isEnabled();
 	void		setType( timertype_e type );
 };
-
-#endif /* __SCRIPTTIMER_H__ */
diff --git a/code/fgame/soundman.h b/code/fgame/soundman.h
index 3ac6e758..2f0943ad 100644
--- a/code/fgame/soundman.h
+++ b/code/fgame/soundman.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // soundman.h: Sound Manager
 // 
 
-#ifndef __SOUND_MANAGER_H__
-#define __SOUND_MANAGER_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -110,5 +109,3 @@ inline void SoundManager::Archive
    }
 
 extern SoundManager SoundMan;
-
-#endif /* camera.h */
diff --git a/code/fgame/specialfx.h b/code/fgame/specialfx.h
index 2e52e41a..fc2138a0 100644
--- a/code/fgame/specialfx.h
+++ b/code/fgame/specialfx.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // specialfx.h: special effects
 // 
 
-#ifndef __SPECIAL_FX_H__
-#define __SPECIAL_FX_H__
+#pragma once
 
 #include "g_local.h"
 #include "scriptslave.h"
@@ -174,5 +173,3 @@ inline void SinkObject::Archive
    arc.ArchiveBoolean( &active );
    arc.ArchiveVector( &startpos );
    }
-
-#endif /* specialfx.h */
diff --git a/code/fgame/stack.h b/code/fgame/stack.h
index 86d4807b..e67df81e 100644
--- a/code/fgame/stack.h
+++ b/code/fgame/stack.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // stack.h: Generic Stack object.
 // 
 
-#ifndef __STACK_H__
-#define __STACK_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -142,5 +141,3 @@ inline Type Stack<Type>::Pop
 
 	return ret;
 	}
-
-#endif /* stack.h */
diff --git a/code/fgame/umap.h b/code/fgame/umap.h
index e3cdfdae..2a44a341 100644
--- a/code/fgame/umap.h
+++ b/code/fgame/umap.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,8 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // stored data.
 // 
 
-#ifndef __UMAP_H__
-#define __UMAP_H__
+#pragma once
 
 #include "str.h"
 #include <stdlib.h>
@@ -335,5 +334,3 @@ inline unsigned UMap<Type>::getNumEntries
 	{
 	return m_numentries;
 	}
-
-#endif /* !__UMAP_H__ */
diff --git a/code/fgame/viewthing.h b/code/fgame/viewthing.h
index 29763439..fc466257 100644
--- a/code/fgame/viewthing.h
+++ b/code/fgame/viewthing.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // viewthing.h: Actor code for the viewthing. 
 //
 
-#ifndef __VIEWTHING_H__
-#define __VIEWTHING_H__
+#pragma once
 
 #include "animate.h"
 
@@ -113,5 +112,3 @@ inline void Viewthing::Archive
    arc.ArchiveVector( &baseorigin );
    arc.ArchiveRaw( origSurfaces, sizeof( origSurfaces ) );
    }
-
-#endif /* viewthing.h */
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index 769f67f7..d47ace5d 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,8 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // class will be usable by any Sentient (players and monsters) as a weapon.
 //
 
-#ifndef __WEAPON_H__
-#define __WEAPON_H__
+#pragma once
 
 #include "g_local.h"
 #include "item.h"
@@ -620,5 +619,3 @@ inline void Weapon::Archive(Archiver& arc)
 }
 
 typedef SafePtr<Weapon> WeaponPtr;
-
-#endif /* weapon.h */
diff --git a/code/fgame/weaputils.h b/code/fgame/weaputils.h
index f854c412..2e3269f1 100644
--- a/code/fgame/weaputils.h
+++ b/code/fgame/weaputils.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // weaputils.h:
 // 
 
-#ifndef __WEAPUTILS_H__
-#define __WEAPUTILS_H__
+#pragma once
 
 #include "g_local.h"
 #include "animate.h"
@@ -361,5 +360,3 @@ Entity* FindDefusableObject(const Vector& dir, Entity* owner, float maxdist);
 void DefuseObject(const Vector& dir, Entity* owner, float maxdist);
 qboolean CanPlaceLandmine(const Vector& origin, Entity* owner);
 void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon* weap);
-
-#endif // __WEAPUTILS_H__
diff --git a/code/uilib/ucolor.h b/code/uilib/ucolor.h
index f3272cc8..8200cd37 100644
--- a/code/uilib/ucolor.h
+++ b/code/uilib/ucolor.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UCOLOR_H__
-#define __UCOLOR_H__
+#pragma once
 
 class UColor {
 public:
@@ -85,5 +84,3 @@ extern UColor ULightGreen;
 extern UColor UBlue;
 extern UColor UYellow;
 extern UColor UHudColor;
-
-#endif /* __UCOLOR_H__ */
diff --git a/code/uilib/ui_extern.h b/code/uilib/ui_extern.h
index 3067bd23..22883147 100644
--- a/code/uilib/ui_extern.h
+++ b/code/uilib/ui_extern.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_EXTERN_H__
-#define __UI_EXTERN_H__
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -83,6 +82,3 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../client/cl_invrender.h"
 #include "../client/cl_uistd.h"
 #include "../client/cl_uiloadsave.h"
-
-#endif /* __UI_EXTERN_H__ */
-
diff --git a/code/uilib/ui_local.h b/code/uilib/ui_local.h
index a0f1b28d..d7e2487d 100644
--- a/code/uilib/ui_local.h
+++ b/code/uilib/ui_local.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_LOCAL_H__
-#define __UI_LOCAL_H__
+#pragma once
 
 #include "../client/cl_ui.h"
 
@@ -32,6 +31,3 @@ typedef struct uiGlobals_s {
 } uiGlobals_t;
 
 extern uiGlobals_t ui;
-
-#endif /* __UI_LOCAL_H__ */
-
diff --git a/code/uilib/uibutton.h b/code/uilib/uibutton.h
index 9b215866..3daab294 100644
--- a/code/uilib/uibutton.h
+++ b/code/uilib/uibutton.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIBUTTON_H__
-#define __UIBUTTON_H__
+#pragma once
 
 extern Event W_Button_Pressed;
 
@@ -102,5 +101,3 @@ public:
 	void	setCommand( const char *cmd );
 	void	setButton( UIButton *button );
 };
-
-#endif
diff --git a/code/uilib/uicheckbox.h b/code/uilib/uicheckbox.h
index f303f290..7e8dd134 100644
--- a/code/uilib/uicheckbox.h
+++ b/code/uilib/uicheckbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UICHECKBOX_H__
-#define __UICHECKBOX_H__
+#pragma once
 
 class UICheckBox : public UIWidget {
 	str m_checked_command;
@@ -60,6 +59,3 @@ extern Event EV_UICheckBox_SetCheckedCommand;
 extern Event EV_UICheckBox_SetUncheckedCommand;
 extern Event EV_UICheckBox_SetCheckedShader;
 extern Event EV_UICheckBox_SetUncheckedShader;
-
-#endif
-
diff --git a/code/uilib/uiconsole.h b/code/uilib/uiconsole.h
index 8e08bc22..5c9ddc02 100644
--- a/code/uilib/uiconsole.h
+++ b/code/uilib/uiconsole.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_CONSOLE_H__
-#define __UI_CONSOLE_H__
+#pragma once
 
 typedef void ( *consoleHandler_t )( const char *text );
 
@@ -172,5 +171,3 @@ public:
 	int				GetMessageMode( void );
 	void			SetMessageMode( int iMode );
 };
-
-#endif
diff --git a/code/uilib/uifloatwnd.h b/code/uilib/uifloatwnd.h
index 570bbda1..d1735dc8 100644
--- a/code/uilib/uifloatwnd.h
+++ b/code/uilib/uifloatwnd.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_FLOATWND_H__
-#define __UI_FLOATWND_H__
+#pragma once
 
 class UIChildSpaceWidget : public UIWidget {
 public:
@@ -78,5 +77,3 @@ public:
 };
 
 static UColor UWindowColor(0.15f, 0.195f, 0.278f, 1);
-
-#endif
diff --git a/code/uilib/uilayout.h b/code/uilib/uilayout.h
index 5affc03e..a7c2a02d 100644
--- a/code/uilib/uilayout.h
+++ b/code/uilib/uilayout.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILAYOUT_H__
-#define __UILAYOUT_H__
+#pragma once
 
 class Script;
 
@@ -48,5 +47,3 @@ public:
 	void	Load( const char *filename, bool bFullLoad );
 	int		ForceLoad( void );
 };
-
-#endif
diff --git a/code/uilib/uilist.h b/code/uilib/uilist.h
index 2f3e0115..e76638f7 100644
--- a/code/uilib/uilist.h
+++ b/code/uilib/uilist.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILIST_H__
-#define __UILIST_H__
+#pragma once
 
 class UIListItem {
 public:
@@ -71,5 +70,3 @@ public:
 
 	qboolean	KeyEvent( int key, unsigned int time ) override;
 };
-
-#endif /* __UILIST_H__ */
diff --git a/code/uilib/uilistctrl.h b/code/uilib/uilistctrl.h
index 6db528e8..77ffd9d1 100644
--- a/code/uilib/uilistctrl.h
+++ b/code/uilib/uilistctrl.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILISTCTRL_H__
-#define __UILISTCTRL_H__
+#pragma once
 
 typedef enum { TYPE_STRING, TYPE_OWNERDRAW } griditemtype_t;
 
@@ -105,5 +104,3 @@ public:
 	void				setCompareFunction( int( *func ) ( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname ) );
 	void				setHeaderFont( const char *name );
 };
-
-#endif
diff --git a/code/uilib/uimenu.h b/code/uilib/uimenu.h
index 43333e09..99dedeb3 100644
--- a/code/uilib/uimenu.h
+++ b/code/uilib/uimenu.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIMENU_H__
-#define __UIMENU_H__
+#pragma once
 
 #include "../qcommon/listener.h"
 #include "../qcommon/stack.h"
@@ -108,6 +107,3 @@ extern Event EV_LockMenus;
 extern Event EV_UnlockMenus;
 extern Event EV_ShowMenu;
 extern Event EV_HideMenu;
-
-#endif
-
diff --git a/code/uilib/uinotepad.h b/code/uilib/uinotepad.h
index 1d2c90e9..e3dc07a3 100644
--- a/code/uilib/uinotepad.h
+++ b/code/uilib/uinotepad.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015-2024 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UINOTEPAD_H__
-#define __UINOTEPAD_H__
+#pragma once
 
 class UINotepad;
 
@@ -103,6 +102,3 @@ public:
 };
 
 bool UI_LoadNotepadFile( const char *filename );
-
-#endif
-
diff --git a/code/uilib/uipoint2d.h b/code/uilib/uipoint2d.h
index fdfe4504..aa4cd073 100644
--- a/code/uilib/uipoint2d.h
+++ b/code/uilib/uipoint2d.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPOINT2D_H__
-#define __UIPOINT2D_H__
+#pragma once
 
 class UIPoint2D {
 public:
@@ -64,5 +63,3 @@ bool UIPoint2D::operator!=( const UIPoint2D& pos ) const
 {
 	return ( x != pos.x || y != pos.y );
 }
-
-#endif /* __UIPOINT2D_H__ */
diff --git a/code/uilib/uipopupmenu.h b/code/uilib/uipopupmenu.h
index 34df08df..927ea29c 100644
--- a/code/uilib/uipopupmenu.h
+++ b/code/uilib/uipopupmenu.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPOPUPMENU_H__
-#define __UIPOPUPMENU_H__
+#pragma once
 
 typedef enum { UIP_NONE, UIP_EVENT, UIP_EVENT_STRING, UIP_SUBMENU, UIP_CMD, UIP_CVAR, UIP_SEPARATOR } uipopup_type;
 typedef enum { UIP_WHERE_RIGHT, UIP_WHERE_DOWN } uipopup_where;
@@ -133,6 +132,3 @@ public:
 };
 
 uipopup_type UI_PopupTypeStringToInt(str type);
-
-#endif
-
diff --git a/code/uilib/uipulldownmenu.h b/code/uilib/uipulldownmenu.h
index 95598035..c9cbbbd3 100644
--- a/code/uilib/uipulldownmenu.h
+++ b/code/uilib/uipulldownmenu.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPULLDOWNMENU_H__
-#define __UIPULLDOWNMENU_H__
+#pragma once
 
 class uipull_describe {
 public:
@@ -102,6 +101,3 @@ public:
 	void	Realign( void ) override;
 	void	Draw( void ) override;
 };
-
-#endif
-
diff --git a/code/uilib/uipulldownmenucontainer.h b/code/uilib/uipulldownmenucontainer.h
index 75badfb3..291a1b93 100644
--- a/code/uilib/uipulldownmenucontainer.h
+++ b/code/uilib/uipulldownmenucontainer.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPULLDOWNMENUCONTAINER_H__
-#define __UIPULLDOWNMENUCONTAINER_H__
+#pragma once
 
 class UIPulldownMenuContainer : public UIWidget {
 protected:
@@ -54,6 +53,3 @@ protected:
 public:
 	void	AddPopup( Event *ev );
 };
-
-#endif
-
diff --git a/code/uilib/uisize2d.h b/code/uilib/uisize2d.h
index 2140147c..4f114e20 100644
--- a/code/uilib/uisize2d.h
+++ b/code/uilib/uisize2d.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UISIZE2D_H__
-#define __UISIZE2D_H__
+#pragma once
 
 class UISize2D {
 public:
@@ -65,5 +64,3 @@ bool UISize2D::operator!=( const UISize2D& pos ) const
 {
 	return ( width != pos.width || height != pos.height );
 }
-
-#endif /* __UISIZE2D_H__ */
diff --git a/code/uilib/uislider.h b/code/uilib/uislider.h
index 7fc3e463..0808dea9 100644
--- a/code/uilib/uislider.h
+++ b/code/uilib/uislider.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UISLIDER_H__
-#define __UISLIDER_H__
+#pragma once
 
 typedef enum { SLIDER_FLOAT, SLIDER_INTEGER } slidertype_t;
 
@@ -85,6 +84,3 @@ public:
 	void		setRange( float min, float max );
 	void		setStep( float value );
 };
-
-#endif
-
diff --git a/code/uilib/uistatus.h b/code/uilib/uistatus.h
index bc6b74be..706ae8ec 100644
--- a/code/uilib/uistatus.h
+++ b/code/uilib/uistatus.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UISTATUS_H__
-#define __UISTATUS_H__
+#pragma once
 
 typedef enum { M_NONE, M_DRAGGING } mouseState_t;
 
@@ -79,6 +78,3 @@ public:
 	void				ParentSized( Event *ev );
 	void				SelfSized( Event *ev );
 };
-
-#endif
-
diff --git a/code/uilib/uivertscroll.h b/code/uilib/uivertscroll.h
index 7efc2a04..f1f3232a 100644
--- a/code/uilib/uivertscroll.h
+++ b/code/uilib/uivertscroll.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIVERTSCROLL_H__
-#define __UIVERTSCROLL_H__
+#pragma once
 
 class unnamed_struct {
 public:
@@ -73,5 +72,3 @@ public:
 	void			InitFrameAlignRight( UIWidget *parent, float fWidthPadding, float fHeightPadding );
 };
 
-#endif
-
diff --git a/code/uilib/ulist.h b/code/uilib/ulist.h
index 3c141719..cf2a3636 100644
--- a/code/uilib/ulist.h
+++ b/code/uilib/ulist.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __ULIST_H__
-#define __ULIST_H__
+#pragma once
 
 template< typename type >
 class UListItem {
@@ -349,5 +348,3 @@ void UList< type >::setPosition
 {
 	m_at = static_cast<UListItem<type>*>(pos);
 }
-
-#endif /* __ULIST_H__ */

From 9ee0e0a3c98aba5e06b461ca985e4ddf54195d68 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:09:42 +0200
Subject: [PATCH 1003/2040] Correctly copy data on big-endian (#365)

---
 code/tiki/tiki_skel.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 01ef9715..14d6debf 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // tiki_skel.cpp : TIKI skeletor loader
+//
+// Some part of the code uses CopyLittleLong / LongNoSwapPtr, etc. because some CPUs can't read misaligned memory
+//
 
 #include "q_shared.h"
 #include "qcommon.h"
@@ -44,7 +47,7 @@ void LoadBoneFromBuffer2(boneFileData_t *fileData, boneData_t *boneData)
     boneData->boneType = fileData->boneType;
 
     if (boneData->boneType == SKELBONE_HOSEROT) {
-        i = *(int *)&fileData->parent[fileData->ofsBaseData + 4];
+        i = LittleLongPtr(fileData->parent[fileData->ofsBaseData + 4]);
 
         if (i == 1) {
             boneData->boneType = SKELBONE_HOSEROTPARENT;
@@ -253,7 +256,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     memcpy(pSkel->name, pHeader->name, sizeof(pSkel->name));
 
     for (i = 0; i < sizeof(pSkel->lodIndex) / sizeof(pSkel->lodIndex[0]); i++) {
-        Com_Memcpy(&pSkel->lodIndex[i], &pHeader->lodIndex[i], sizeof(pSkel->lodIndex[i]));
+        pSkel->lodIndex[i] = LongNoSwapPtr(&pHeader->lodIndex[i]);
     }
 
     pSurf     = (skelSurface_t *)((byte *)pHeader + pHeader->ofsSurfaces);
@@ -320,8 +323,10 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 
         if (pGameSurf->numTriangles) {
             const int *pTriangles = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsTriangles));
-            for (j = 0; j < numTriangles * 3; j++) {
-                Com_Memcpy(&pGameSurf->pTriangles[j], &pTriangles[j], sizeof(pGameSurf->pTriangles[j]));
+            for (j = 0; j < numTriangles; j++) {
+                pGameSurf->pTriangles[j * 3 + 0] = LongNoSwapPtr(&pTriangles[j * 3 + 0]);
+                pGameSurf->pTriangles[j * 3 + 1] = LongNoSwapPtr(&pTriangles[j * 3 + 1]);
+                pGameSurf->pTriangles[j * 3 + 2] = LongNoSwapPtr(&pTriangles[j * 3 + 2]);
             }
         } else {
             pGameSurf->pTriangles = NULL;

From 9823af9159ddf673a1cf09b2d488fedb4369e90d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:39:21 +0200
Subject: [PATCH 1004/2040] Fix light grid offsets endianness

---
 code/renderer/tr_bsp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index ee9de085..3c65b8e0 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2044,7 +2044,9 @@ void R_LoadLightGrid(gamelump_t* plPal, gamelump_t* plOffsets, gamelump_t* plDat
     }
 
     w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
-    Com_Memcpy(w->lightGridOffsets, plOffsets->buffer, plOffsets->length);
+    for (i = 0; i < plOffsets->length / 2; i++) {
+        w->lightGridOffsets[i] = LittleUnsignedShort(((short*)plOffsets->buffer)[i]);
+    }
     Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
 
     w->lightGridData = ri.Hunk_Alloc(plData->length, h_dontcare);

From c39bdd246a3df2e0871f7f547332189c962f00e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:56:55 +0200
Subject: [PATCH 1005/2040] Correctly load DDS file on bigendian architectures

---
 code/renderer/tr_image.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index ce4f747a..c5b236e1 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -1553,7 +1553,7 @@ static void LoadDDS(const char* name, byte** pic, int* width, int* height, qbool
 	// reject files that don't start with "DDS "
 	//
 	ri.FS_Read(&signature, sizeof(signature), handle);
-	if (signature != EncodeFourCC("DDS "))
+	if (strncmp(&signature, "DDS ", 4))
 	{
 		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
 		ri.FS_CloseFile(handle);
@@ -1562,6 +1562,14 @@ static void LoadDDS(const char* name, byte** pic, int* width, int* height, qbool
 
 	ri.FS_Read(&ddsHeader, sizeof(ddsHeader), handle);
 
+	ddsHeader.headerSize = LittleLong(ddsHeader.headerSize);
+	ddsHeader.flags = LittleLong(ddsHeader.flags);
+	ddsHeader.width = LittleLong(ddsHeader.width);
+	ddsHeader.height = LittleLong(ddsHeader.height);
+	ddsHeader.numMips = LittleLong(ddsHeader.numMips);
+	ddsHeader.pitchOrFirstMipSize = LittleLong(ddsHeader.pitchOrFirstMipSize);
+	ddsHeader.fourCC = LittleLong(ddsHeader.fourCC);
+
 	//
 	// Convert DXGI format/FourCC into OpenGL format
 	//

From 8aa059dd2138d827a4fc24754e397cbc319f1126 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 00:10:52 +0200
Subject: [PATCH 1006/2040] When paused, keep in sync with the server time
 (#371)

This fixes an issue where a temporary lag would occur when starting a single-player map, or when pausing/unpausing the game
---
 code/client/cl_cgame.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 6301864f..7c00aa89 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -1199,7 +1199,12 @@ void CL_SetCGameTime( void ) {
 	// allow pause in single player
 	if ( paused->integer && com_sv_running->integer ) {
 		// paused
-		CL_AdjustTimeDelta();
+		//CL_AdjustTimeDelta();
+		// Fixed in OPM
+		//  Keep in sync with the server time.
+		//  In OG, the game could lag for a short time
+		//  when pausing and unpausing frequently
+		cl.serverTimeDelta = cl.snap.serverTime - cls.realtime;
 		return;
 	}
 

From 277ca0c9519b657bd42859d056a7b4b8fa1b32af Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 12:34:07 +0200
Subject: [PATCH 1007/2040] Handle bigger offsets in sample_ms_offset()

This fixes an issue where when the offset was big enough, the value would overflow and start again from 0
---
 code/client/snd_openal_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 82d23fb6..46ec1c30 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3212,7 +3212,7 @@ U32 openal_channel::sample_ms_offset()
         return 0;
     }
 
-    return sample_offset() * 1000 / sample_playback_rate();
+    return sample_offset() * 1000ull / sample_playback_rate();
 }
 
 /*

From bee0bbbe90c92951f3b56097950fa3beae51337d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 13:02:56 +0200
Subject: [PATCH 1008/2040] Initialize the effect and destroyed model for the
 specific ThrobbingBox explosive classes

---
 code/fgame/Entities.cpp | 25 +++++++++++++++++++++++++
 code/fgame/Entities.h   | 12 ++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 18e7e1c1..b97e8482 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1809,6 +1809,7 @@ void ThrobbingBox_Explosive::OnBlowUp(Event *ev)
 
                 ent = veh->QueryDriverSlotEntity(0);
                 if (ent) {
+                    ent->takedamage = DAMAGE_YES;
                     ent->Damage(this, this, ent->health * 2.f, vec_zero, vec_zero, vec_zero, 50, 0, MOD_VEHICLE);
                 }
             }
@@ -1899,6 +1900,13 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerFlak88, "Thr
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodePlayerFlak88::ThrobbingBox_ExplodePlayerFlak88()
+{
+    spawnflags |= TBE_SPAWNFLAG_DESTROYED_MODEL;
+    m_sDestroyedModel = "statweapons/flak88_d.tik";
+    m_sEffect         = "fx/demodamage_flak88.tik";
+}
+
 /*QUAKED ThrobbingBox_ExplodeFlak88 (1.0 0.0 1.0) (-12 -12 -12) (12 12 12)
 
   Explosive throbbing box.  Connect to the object you want to make explode.
@@ -1921,6 +1929,12 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeFlak88, "Throbbing
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodeFlak88::ThrobbingBox_ExplodeFlak88()
+{
+    m_sDestroyedModel = "statweapons/flak88_d.tik";
+    m_sEffect         = "fx/demodamage_flak88.tik";
+}
+
 /*QUAKED ThrobbingBox_ExplodeNebelwerfer (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel
 
   Explosive throbbing box.  Connect to the object you want to make explode.
@@ -1943,6 +1957,11 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeNebelwerfer, "Thro
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodeNebelwerfer::ThrobbingBox_ExplodeNebelwerfer()
+{
+    m_sDestroyedModel = "statweapons/nebelwerfer_d.tik";
+}
+
 /*QUAKED ThrobbingBox_ExplodePlayerNebelwerfer (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel
 
   Explosive throbbing box.  Connect to the object you want to make explode.
@@ -1965,6 +1984,12 @@ CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer,
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodePlayerNebelwerfer::ThrobbingBox_ExplodePlayerNebelwerfer()
+{
+    spawnflags |= TBE_SPAWNFLAG_DESTROYED_MODEL;
+    m_sDestroyedModel = "statweapons/nebelwerfer_d.tik";
+}
+
 /*QUAKED ThrobbingBox_Stickybomb (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel WetFuse
 
   Stickybomb throbbing box.  Connect to the object you want to make explode.
diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index 806ef6b4..c26f3f93 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -275,24 +275,36 @@ class ThrobbingBox_ExplodePlayerFlak88 : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodePlayerFlak88);
+
+public:
+    ThrobbingBox_ExplodePlayerFlak88();
 };
 
 class ThrobbingBox_ExplodeFlak88 : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodeFlak88);
+
+public:
+    ThrobbingBox_ExplodeFlak88();
 };
 
 class ThrobbingBox_ExplodeNebelwerfer : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodeNebelwerfer);
+
+public:
+    ThrobbingBox_ExplodeNebelwerfer();
 };
 
 class ThrobbingBox_ExplodePlayerNebelwerfer : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodePlayerNebelwerfer);
+
+public:
+    ThrobbingBox_ExplodePlayerNebelwerfer();
 };
 
 #define TBE_SPAWNFLAG_DESTROYED_MODEL 1

From b9e9137f9035e3c9a81fbbd2cb3e5734f2bfb3c7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 13:03:10 +0200
Subject: [PATCH 1009/2040] Fix the spelling for the default explosive sound

---
 code/fgame/Entities.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index b97e8482..2f691792 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1635,7 +1635,7 @@ ThrobbingBox_Explosive::ThrobbingBox_Explosive()
 
     setModel("items\\\\pulse_explosive.tik");
     m_sUsedModel     = "items/explosive.tik";
-    m_sSound         = "explose_flak88";
+    m_sSound         = "explode_flak88";
     m_sActivateSound = "plantbomb";
     m_sTickSound     = "bombtick";
 

From 9ea40f31e4d1a33f8c9a42ce0bf84e2852438b57 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 13:30:56 +0200
Subject: [PATCH 1010/2040] Clear all entities on registration

---
 code/client/snd_dma_new.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index c2227e4e..80ded1dc 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -280,15 +280,25 @@ S_BeginRegistration
 */
 void S_BeginRegistration()
 {
+    int i;
+
     Com_Printf("------- Sound Begin Registration -------\n");
 
     S_StopAllSounds(true);
 
-    ++s_registrationSequence;
+    s_registrationSequence++;
     s_inRegistration                    = true;
     s_knownSfx[0].registration_sequence = s_registrationSequence;
 
     Com_Printf("------- Sound Begin Registration Complete -------\n");
+
+    // Added in OPM
+    //  Reset all sound entities
+    //  OG doesn't do this but this makes sure
+    //  entities don't leak info from previous sessions
+    for (i = 0; i < ARRAY_LEN(s_entity); i++) {
+        s_entity[i] = s_entity_t{};
+    }
 }
 
 /*

From 737ee3af64b574477cfb3f0618e11185e2819e57 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 14:19:51 +0200
Subject: [PATCH 1011/2040] Specify the compiler to use globally for macOS

---
 .github/workflows/shared-build.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 9ce7a664..2c3f7a83 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -347,6 +347,8 @@ jobs:
       working-directory: ${{github.workspace}}
       run: |
         echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
 
     ###
     # SDL
@@ -359,9 +361,7 @@ jobs:
       with:
         version: sdl2-latest
         build-type: Release
-        cmake-arguments: "-DCMAKE_C_COMPILER=clang
-          -DCMAKE_CXX_COMPILER=clang++
-          -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }}
+        cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }}
           -DCMAKE_VERBOSE_MAKEFILE=on"
     ###
     # OpenAL
@@ -382,8 +382,6 @@ jobs:
       run: |
         cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
-        -DCMAKE_C_COMPILER=clang \
-        -DCMAKE_CXX_COMPILER=clang++ \
         -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
         -DCMAKE_VERBOSE_MAKEFILE=on
         cmake --build ./build --config ${{env.BUILD_TYPE}}
@@ -403,8 +401,6 @@ jobs:
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DCMAKE_VERBOSE_MAKEFILE=on \
-        -DCMAKE_C_COMPILER=clang \
-        -DCMAKE_CXX_COMPILER=clang++ \
         -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \

From db6ff8901bdaacf116c3bc2d5dd08747345e8d24 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:27:54 +0200
Subject: [PATCH 1012/2040] Set the render effect of skyportal and skyentity
 when adding them to the snapshot

This fixes the issue where some entities like effects would be visible through the sky
---
 code/server/sv_snapshot.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index 2009947f..a32beace 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -444,6 +444,8 @@ SV_AddEntToSnapshot
 static void SV_AddEntToSnapshot( svEntity_t *svEnt, gentity_t *gEnt, snapshotEntityNumbers_t *eNums, svEntity_t* portalEnt, qboolean portalsky) {
 	// if we have already added this entity to this snapshot, don't add again
 	if ( svEnt->snapshotCounter == sv.snapshotCounter ) {
+		gEnt->s.renderfx &= ~RF_SHADOW_PLANE;
+		gEnt->s.renderfx |= RF_WRAP_FRAMES;
 		return;
 	}
 	svEnt->snapshotCounter = sv.snapshotCounter;
@@ -453,6 +455,14 @@ static void SV_AddEntToSnapshot( svEntity_t *svEnt, gentity_t *gEnt, snapshotEnt
 		return;
 	}
 
+	gEnt->s.renderfx &= ~(RF_SHADOW_PLANE | RF_WRAP_FRAMES | RF_SKYENTITY);
+
+	if ( portalEnt ) {
+		gEnt->s.renderfx |= RF_SHADOW_PLANE;
+	} else if ( portalsky ) {
+		gEnt->s.renderfx |= RF_SKYENTITY;
+	}
+
 	gEnt->r.lastNetTime = svs.time - svs.startTime;
 	eNums->snapshotEntities[ eNums->numSnapshotEntities ] = gEnt->s.number;
 	eNums->numSnapshotEntities++;
@@ -619,7 +629,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 		// broadcast entities are always sent
 		// or broadcast entities that are sent once
 		if ( (ent->r.svFlags & SVF_BROADCAST) || (ent->r.svFlags & SVF_SENDONCE)  ) {
-			SV_AddEntToSnapshot( svEnt, ent, eNums, NULL, qfalse);
+			SV_AddEntToSnapshot( svEnt, ent, eNums, portalEnt, portalsky);
 			continue;
 		}
 
@@ -717,7 +727,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 		}
 
 		// add it
-		SV_AddEntToSnapshot( svEnt, ent, eNums, NULL, qfalse);
+		SV_AddEntToSnapshot( svEnt, ent, eNums, portalEnt, portalsky);
 
 		// if its a portal entity, add everything visible from its camera position
 		if ( ent->r.svFlags & SVF_PORTAL && svEnt != portalEnt ) {

From 83938471ca7f45494b5835ce51e3cbb09e702d10 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 15:41:35 +0200
Subject: [PATCH 1013/2040] Set the blue component of the temp model entity

This fixes particles having an incorrect color sometimes
---
 code/cgame/cg_tempmodels.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index 778a6eba..2ae12c5d 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -439,9 +439,11 @@ qboolean ClientGameCommandManager::TempModelRealtimeEffects(ctempmodel_t *p, flo
 
         p->ent.shaderRGBA[0] = (int)((float)tempColor[0] * vLighting[0]);
         p->ent.shaderRGBA[1] = (int)((float)tempColor[1] * vLighting[1]);
+        p->ent.shaderRGBA[2] = (int)((float)tempColor[2] * vLighting[2]);
     } else {
         p->ent.shaderRGBA[0] = tempColor[0];
         p->ent.shaderRGBA[1] = tempColor[1];
+        p->ent.shaderRGBA[2] = tempColor[2];
     }
 
     if (p->cgd.flags & T_FADEIN && (fadein < 1)) // Do the fadein effect

From c406aaf74f2d14666e0eea2b2d7164406e86183f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:49:24 +0200
Subject: [PATCH 1014/2040] Add a feature that prevents teams from being uneven

---
 code/fgame/gamecvars.cpp     |  5 +++
 code/fgame/gamecvars.h       |  2 ++
 code/fgame/player.cpp        | 64 ++++++++++++++++++++++++++++--------
 code/fgame/player.h          |  4 ++-
 docs/configuration/server.md | 48 ++++++++++++++++-----------
 5 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index c1c28e17..64633ecb 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -282,6 +282,9 @@ cvar_t *g_textmsg_allowed;
 // Minimum delay, in milliseconds, between messages
 cvar_t *g_textmsg_minDelay;
 
+// Whether or not to prevent teams from being unbalanced
+cvar_t *g_teambalance;
+
 void CVAR_Init(void)
 {
     developer      = gi.Cvar_Get("developer", "0", 0);
@@ -646,5 +649,7 @@ void CVAR_Init(void)
     g_textmsg_allowed = gi.Cvar_Get("g_textmsg_allowed", "1", 0);
     g_textmsg_minDelay = gi.Cvar_Get("g_textmsg_minDelay", "0", 0);
 
+    g_teambalance = gi.Cvar_Get("g_teambalance", "0", 0);
+
     cl_running = gi.Cvar_Get("cl_running", "", 0);
 }
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index 6ccbaa54..9c88aad8 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -279,6 +279,8 @@ extern cvar_t *g_instamsg_minDelay;
 extern cvar_t *g_textmsg_allowed;
 extern cvar_t *g_textmsg_minDelay;
 
+extern cvar_t *g_teambalance;
+
 void CVAR_Init(void);
 
 #ifdef __cplusplus
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index a862eb35..0266b74e 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -9257,10 +9257,10 @@ void Player::Join_DM_Team(Event *ev)
     teamtype_t  team;
     str         teamname;
     const char *join_message;
-    float       startTime;
     Entity     *ent;
 
     if (ev->isSubclassOf(ConsoleEvent) && disable_team_change) {
+        // Added in OPM
         return;
     }
 
@@ -9286,19 +9286,7 @@ void Player::Join_DM_Team(Event *ev)
         return;
     }
 
-    startTime = dmManager.GetMatchStartTime();
-
-    if (startTime >= 0.0f && (level.time - startTime) > 30.0
-        && (level.time - m_fTeamSelectTime) < g_teamswitchdelay->integer) {
-        int seconds = g_teamswitchdelay->integer - (level.time - m_fTeamSelectTime);
-
-        gi.SendServerCommand(
-            edict - g_entities,
-            "print \"" HUD_MESSAGE_WHITE "%s %i %s\n\"",
-            gi.LV_ConvertString("Can not change teams again for another"),
-            seconds + 1,
-            gi.LV_ConvertString("seconds")
-        );
+    if (ev->isSubclassOf(ConsoleEvent) && !CheckCanSwitchTeam(team)) {
         return;
     }
 
@@ -11290,6 +11278,54 @@ int Player::GetMoveResult(void)
     return moveresult;
 }
 
+qboolean Player::CheckCanSwitchTeam(teamtype_t team) {
+    float startTime;
+
+    startTime = dmManager.GetMatchStartTime();
+
+    if (startTime >= 0.0f && (level.time - startTime) > 30.0
+        && (level.time - m_fTeamSelectTime) < g_teamswitchdelay->integer) {
+        int seconds = g_teamswitchdelay->integer - (level.time - m_fTeamSelectTime);
+
+        gi.SendServerCommand(
+            edict - g_entities,
+            "print \"" HUD_MESSAGE_WHITE "%s %i %s\n\"",
+            gi.LV_ConvertString("Can not change teams again for another"),
+            seconds + 1,
+            gi.LV_ConvertString("seconds")
+        );
+        return qfalse;
+    }
+
+    // Added in OPM
+    //  Check and prevent joining the team with the highest number of players
+    if (g_teambalance->integer && g_gametype->integer >= GT_TEAM && !dmManager.WaitingForPlayers()) {
+        DM_Team* pNewTeam = dmManager.GetTeam(team);
+        int i;
+
+        for (i = 0; i < 2; i++) {
+            DM_Team* pTeam = dmManager.GetTeam((teamtype_t)(TEAM_ALLIES + i));
+            int numTeamPlayers = pTeam->m_players.NumObjects();
+
+            if (pTeam->m_players.IndexOfObject(this)) {
+                // Don't count the current player
+                numTeamPlayers--;
+            }
+
+            if (pNewTeam->m_players.NumObjects() > numTeamPlayers) {
+                gi.SendServerCommand(
+                    edict - g_entities,
+                    "print \"" HUD_MESSAGE_WHITE "%s\n\"",
+                    gi.LV_ConvertString("That team has enough players. Choose the team that has the lowest number of players.")
+                );
+                return qfalse;
+            }
+        }
+    }
+
+    return qtrue;
+}
+
 qboolean Player::ViewModelAnim(str anim, qboolean force_restart, qboolean bFullAnim)
 {
     Unregister(STRING_VIEWMODELANIM_DONE);
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 631e8953..4d723792 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -913,9 +913,11 @@ public:
     bool HasVotedNo() const;
 
     //=============================
-    // Custom openmohaa stuff
+    // Added in OPM
     //=============================
 
+    qboolean CheckCanSwitchTeam(teamtype_t team);
+
     qboolean     ViewModelAnim(str anim, qboolean force_restart, qboolean bFullAnim);
     virtual void Spawned(void);
 
diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 40d28bf0..17ee3de1 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -5,9 +5,9 @@ This documentation currently only lists new changes that were introduced in Open
 ## Home directory
 
 In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:
-- `set fs_homepath Z:\openmohaa_data` user data will be read and written in the directory located in `Z:\openmohaa_data`
-- `set fs_homepath homedata` the subdirectory `homedata` in the game directory will be used to read and store user data
-- `set fs_homepath .` not recommended, the game directory will be used for storing user data, just like the original MOH:AA
+- `set fs_homepath Z:\openmohaa_data`: User data will be read and written in the directory located in `Z:\openmohaa_data`
+- `set fs_homepath homedata`: The subdirectory `homedata` in the game directory will be used to read and store user data
+- `set fs_homepath .`: Not recommended, the game directory will be used for storing user data, just like the original MOH:AA
 
 The variable defaults to the following value depending on the OS:
 - `%APPDATA%\openmohaa` on Windows
@@ -17,19 +17,19 @@ The variable defaults to the following value depending on the OS:
 
 ### Configure the network components
 
-The network components can be tweaked to use IPv4/IPv6. IPv6 is disabled by default on dedicated servers but that can be changed:
-- `set net_enabled 1` enables IPv4 only - the default on the dedicated server executable
-- `set net_enabled 2` enables IPv6 only
-- `set net_enabled 3` enables both IPv4 and IPv6 - the default on the standalone executable
+The network settings can be adjusted to use either IPv4, IPv6, or both. By default, IPv6 is disabled on dedicated servers. The following commands adjust network settings:
+- `set net_enabled 1`: This enables IPv4 only (the default setting for dedicated servers).
+- `set net_enabled 2`: This enables IPv6 only.
+- `set net_enabled 3`: This enables both IPv4 and IPv6 (the default setting when running the standalone game)
 
-The master server (gamespy protocol) doesn't support IPv6 servers, which means if IPv4 is disabled and IPv6 is only used, the server won't be visible in the internet game server list.
+*Note: The master server (using the GameSpy protocol) does not support IPv6. If IPv4 is disabled, the server won't appear in the online server list for internet games, even if IPv6 is enabled.*
 
-### Optimization (or Antichams)
+### Optimization / Antichams
 
 A new variable, `sv_netoptimize`, enables a feature that optimizes network bandwidth by not sending players information about others they can't see. For each client, the server optimizes by only transmitting data about players within their view. Clients will not receive information about players they can't see. This feature also helps protect against cheaters:
-- `set sv_netoptimize 0` disables the optimization - the default
-- `set sv_netoptimize 1` enables the optimization for entities that are moving
-- `set sv_netoptimize 2` enables the optimization always
+- `set sv_netoptimize 0`: This disables the optimization - the default
+- `set sv_netoptimize 1`: This enables the optimization for entities that are moving
+- `set sv_netoptimize 2`: This enables the optimization, always
 
 This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was improved in OpenMoHAA: sounds like footsteps will be sent so players don't get confused.
 
@@ -66,17 +66,25 @@ Chat messages will be logged in the console and in the logfile without requiring
 
 The in-game chat can be tweaked:
 
-- `set g_instamsg_allowed 0` to disable voice instant messages
-- `set g_instamsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
-- `set g_textmsg_allowed 0` to disable text messages. All, team and private messages will be disabled
-- `set g_textmsg_minDelay x` where x is the delay in milliseconds, the minimum delay between each text message to avoid spamming
+- `set g_instamsg_allowed 0`: This disables voice instant messages
+- `set g_instamsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
+- `set g_textmsg_allowed 0`: This disables text messages. All, team and private messages will be disabled
+- `set g_textmsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each text message to avoid spamming
 
 Temporarily disabling text messages can be useful in situations where tensions arise in the chat. Otherwise, it's best to keep them enabled under normal circumstances.
 
+### Balancing teams
+
+This setting prevents clients from joining a team if that team already has more players than the others. By default, it's turned off, but it can be switched on with the command `set g_teambalance 1`.
+
+This feature is passive: it only checks the team sizes when someone tries to join, so it won't automatically balance teams during the game.
+
+*Note: This check doesn't apply in server scripts; it only works when clients join teams directly.*
+
 ### Bots
 
 Bots can be used for testing. They don't move by default, so a mod will be needed, like [eaglear bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots):
-- `set sv_maxbots x` must be used to configure the maximum number of bots
-- `set sv_minPlayers x` is optional and can be used to set the minimum number of players that the server should have. Bots will be spawned based on the minimum number of players.
-- `addbot x` where x is the number of bots to add
-- `removebot x` where x is the number of bots to remove
+- `set sv_maxbots x`: Configure and allocate the maximum number of bots
+- `set sv_minPlayers x`: optional, can be used to set the minimum number of players that the server should have. Bots will be spawned based on the minimum number of players.
+- `addbot x`: x is the number of bots to add
+- `removebot x`: x is the number of bots to remove

From 3a7e249edf0e84db717ce3d8eaf78585fff896c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Sep 2024 19:58:41 +0200
Subject: [PATCH 1015/2040] Refactored svflags and use the correct entity
 server flags

---
 code/fgame/damagemodel.cpp |  2 +-
 code/fgame/g_public.h      | 43 +++++++++++++++++++-------------------
 code/server/sv_snapshot.c  |  8 +++++--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/code/fgame/damagemodel.cpp b/code/fgame/damagemodel.cpp
index 2603edb5..029ace6c 100644
--- a/code/fgame/damagemodel.cpp
+++ b/code/fgame/damagemodel.cpp
@@ -286,7 +286,7 @@ void DamageModel::SpawnOrientedBoundingBox(Event *ev)
     yawoffset = ev->GetFloat(3);
 
     boundingBoxEnt = new Entity();
-    boundingBoxEnt->edict->r.svFlags |= SVF_PORTAL;
+    boundingBoxEnt->edict->r.svFlags |= SVF_SENDPVS;
     boundingBoxEnt->edict->s.eFlags |= EF_LINKANGLES;
     boundingBoxEnt->edict->r.contents = CONTENTS_SOLID;
     boundingBoxEnt->setSolidType(SOLID_BBOX);
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 365f0676..5798b55d 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -36,29 +36,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // the server does not know how to interpret most of the values
 // in entityStates (level eType), so the game must explicitly flag
 // special server behaviors
-#define SVF_NOCLIENT 0x00000001 // don't send entity to clients, even if it has effects
+#define SVF_NOCLIENT                    (1<<0)	// don't send entity to clients, even if it has effects
+#define SVF_BOT                         (1<<1)
+#define SVF_BROADCAST                   (1<<2)	// send to all connected clients
+#define SVF_PORTAL                      (1<<3)	// merge a second pvs at origin2 into snapshots
+#define SVF_SENDPVS                     (1<<4)	// even though it doesn't have a sound or modelindex, still run it through the pvs
+#define SVF_USE_CURRENT_ORIGIN          (1<<5)	// entity->currentOrigin instead of entity->s.origin
+  									            // for link position (missiles and movers)
+#define SVF_NOTSINGLECLIENT             (1<<6)  // send entity to everyone but one client
+                                                // (entityShared_t->singleClient)
+#define SVF_MONSTER                     (1<<7)	// treat as CONTENTS_MONSTER for collision
+#define SVF_SINGLECLIENT                (1<<8)  // only send to a single client (entityShared_t->singleClient)
+#define SVF_USEBBOX                     (1<<9)	// do not perform perfect collision use the bbox instead
+#define SVF_NOFARPLANE                  (1<<10)	// only send this entity to its parent
+#define SVF_HIDEOWNER                   (1<<11)	// hide the owner of the client
+#define SVF_MONSTERCLIP                 (1<<12)	// treat as CONTENTS_MONSTERCLIP for collision
+#define SVF_PLAYERCLIP                  (1<<13)	// treat as CONTENTS_PLAYERCLIP for collision
+#define SVF_SENDONCE                    (1<<14) // Send this entity over the network at least one time
+#define SVF_SENT                        (1<<15) // This flag is set when the entity has been sent over at least one time
 
-// TTimo
-// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
-#define SVF_CLIENTMASK 0x00000002
-
-#define SVF_BROADCAST  0x00000004 // send to all connected clients
-#define SVF_SENDPVS    0x00000008
-#define SVF_PORTAL     0x00000010 // merge a second pvs at origin2
-#define SVF_NOTSINGLECLIENT                                                   \
-    0x00000040                      // send entity to everyone but one client \
-                                    // (entityShared_t->singleClient)
-#define SVF_MONSTER      0x00000080 // set if the entity is a bot into snapshots
-#define SVF_SINGLECLIENT 0x00000100 // only send to a single client (entityShared_t->singleClient)
-#define SVF_USEBBOX      0x00000200
-#define SVF_NOFARPLANE   0x00000400
-#define SVF_NOSERVERINFO                                           \
-    0x00000800 // don't send CS_SERVERINFO updates to this client  \
-               // so that it can be updated for ping tools without \
-               // lagging clients
-#define SVF_SENDONCE 0x00004000
-
-#define SVF_SENT     0x00008000
+#define SVF_NOSERVERINFO                (1<<16) // don't send CS_SERVERINFO updates to this client
+                                                // so that it can be updated for ping tools without
+                                                // lagging clients
 
 typedef struct gclient_s   gclient_t;
 typedef struct dtiki_s     dtiki_t;
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index a32beace..b15a7cd4 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -444,7 +444,7 @@ SV_AddEntToSnapshot
 static void SV_AddEntToSnapshot( svEntity_t *svEnt, gentity_t *gEnt, snapshotEntityNumbers_t *eNums, svEntity_t* portalEnt, qboolean portalsky) {
 	// if we have already added this entity to this snapshot, don't add again
 	if ( svEnt->snapshotCounter == sv.snapshotCounter ) {
-		gEnt->s.renderfx &= ~RF_SHADOW_PLANE;
+		gEnt->s.renderfx &= ~(RF_SHADOW_PLANE | RF_WRAP_FRAMES);
 		gEnt->s.renderfx |= RF_WRAP_FRAMES;
 		return;
 	}
@@ -592,12 +592,16 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 			}
 		}
 		// entities can be flagged to be sent to a given mask of clients
+		// Removed in OPM
+		//  This doesn't make sense it it only supports half of the client
+		/*
 		if ( ent->r.svFlags & SVF_CLIENTMASK ) {
 			if (frame->ps.clientNum >= 32)
 				Com_Error( ERR_DROP, "SVF_CLIENTMASK: clientNum > 32\n" );
 			if (~ent->r.singleClient & (1 << frame->ps.clientNum))
 				continue;
 		}
+		*/
 
 		parentEnt = NULL;
 		if (ent->s.parent != ENTITYNUM_NONE) {
@@ -648,7 +652,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
 			svCheckEnt = svEnt;
 		}
 
-		if (!(ent->r.svFlags & SVF_PORTAL) && !ent->s.modelindex && !ent->s.loopSound) {
+		if (!(ent->r.svFlags & SVF_SENDPVS) && !ent->s.modelindex && !ent->s.loopSound) {
 			// don't send entities that have nothing to draw
 			continue;
 		}

From 9dea8fc41edbb2b0b49506c1dda155b98cca8d49 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Sep 2024 21:59:14 +0200
Subject: [PATCH 1016/2040] Fix wrong pointer type passed to strncmp

---
 code/renderer/tr_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index c5b236e1..f8035d13 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -1553,7 +1553,7 @@ static void LoadDDS(const char* name, byte** pic, int* width, int* height, qbool
 	// reject files that don't start with "DDS "
 	//
 	ri.FS_Read(&signature, sizeof(signature), handle);
-	if (strncmp(&signature, "DDS ", 4))
+	if (strncmp(signature, "DDS ", 4))
 	{
 		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
 		ri.FS_CloseFile(handle);

From 020a6d8b66aa7e3406f77c9e3b5a3dc0ce388ac8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Sep 2024 22:39:33 +0200
Subject: [PATCH 1017/2040] Fix stupid compile error mistake

---
 code/renderer/tr_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index f8035d13..a2099700 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -1553,7 +1553,7 @@ static void LoadDDS(const char* name, byte** pic, int* width, int* height, qbool
 	// reject files that don't start with "DDS "
 	//
 	ri.FS_Read(&signature, sizeof(signature), handle);
-	if (strncmp(signature, "DDS ", 4))
+	if (strncmp((const char*)&signature, "DDS ", 4))
 	{
 		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
 		ri.FS_CloseFile(handle);

From 935efaeb3a5089e1869f0df015f8f7f56bf834fb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 18:09:56 +0200
Subject: [PATCH 1018/2040] Fix sound event being posted with incorrect
 arguments

The argument wouldn't contain "wait" when necessary, which would cause scripts to be stuck forever waiting for sound to be done
---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 04e41750..4c99e84e 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3363,7 +3363,7 @@ void Entity::Sound(Event *ev)
         Event *event = new Event(EV_Sound);
 
         for (int i = 1; i <= ev->NumArgs(); i++) {
-            event->AddValue(ev->GetValue(1));
+            event->AddValue(ev->GetValue(i));
         }
 
         PostEvent(event, level.frametime);

From 9a7ba0786ca43d777e9d9890e81f2929a73e35c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 18:52:39 +0200
Subject: [PATCH 1019/2040] Set the correct number of bits for the large bullet
 flag in 2.0 and above

This fixes the issue where there the client (in spearhead protocol mode) would read 2 bits instead of the 1 bit the server sent, which would cause a parse error
---
 code/fgame/actor.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index f053658e..90e066be 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -5653,6 +5653,13 @@ void Actor::EventDamagePuff(Event *ev)
 {
     Vector pos = ev->GetVector(1);
     Vector dir = ev->GetVector(2);
+    int      bulletbits;
+
+    // Fixed in OPM
+    //  Large bullet flag normally take 2 bits since 2.0.
+    //  However, in OG Spearhead and Breakthrough, EventDamagePuff
+    //  mistakenly uses 1 bit which causes a parse message error
+    bulletbits = (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) ? 2 : 1;
 
     gi.SetBroadcastVisible(pos, NULL);
 
@@ -5662,7 +5669,7 @@ void Actor::EventDamagePuff(Event *ev)
     gi.MSG_WriteCoord(pos.z);
 
     gi.MSG_WriteDir(dir);
-    gi.MSG_WriteBits(0, 1);
+    gi.MSG_WriteBits(0, bulletbits);
     gi.MSG_EndCGM();
 }
 

From 6103efa8ccf3c4792abf65ad63766e6f07cc89ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 19:03:17 +0200
Subject: [PATCH 1020/2040] Don't set the entity angles immediately during glue

The game expects objects to glue and keep their initial angles/origin
---
 code/fgame/entity.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 4c99e84e..6c3609e2 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5319,9 +5319,6 @@ void Entity::glue(Entity *master, qboolean use_my_angles, qboolean can_duck)
     m_pGlueMaster   = master;
     m_bGlueDuckable = can_duck == qtrue;
     master->m_iNumGlues++;
-
-    setAngles(master->angles);
-    setOrigin(master->origin);
 }
 
 void Entity::unglue(void)

From 26a1e24e3a9f5e17bb7a7127fa2eb88604a3de8f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 19:53:33 +0200
Subject: [PATCH 1021/2040] Fix TIKI_ParseAnimations incorrectly swallowing the
 full animation file when the map doesn't match

This fixes missing animations
---
 code/tiki/tiki_parse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index ef109c79..4e557ff7 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -439,7 +439,7 @@ void TIKI_ParseAnimations(dloaddef_t *ld)
 
                     if (strstr(token, "}")) {
                         if (!depth) {
-                            continue;
+                            break;
                         }
 
                         depth--;

From d6a00a59841403893352f3952577d6349905e33d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 20:24:12 +0200
Subject: [PATCH 1022/2040] Fix IsOpen event not being used

Some multiplayer and single-player scripts rely on it
---
 code/fgame/doors.cpp | 5 +++--
 code/fgame/doors.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 16f9a0fc..0730694b 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -177,9 +177,9 @@ Event EV_Door_OpenEnd
     "Called when the door finishes opening.",
     EV_NORMAL
 );
-Event EV_Door_IsOpen
+Event EV_Door_IsOpen // Added in 2.30
 (
-    "isopen",
+    "isOpen",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -301,6 +301,7 @@ CLASS_DECLARATION(ScriptSlave, Door, "NormalDoor") {
     {&EV_Door_Open,                &Door::Open              },
     {&EV_Door_CloseEnd,            &Door::CloseEnd          },
     {&EV_Door_OpenEnd,             &Door::OpenEnd           },
+    {&EV_Door_IsOpen,              &Door::GetIsOpen         }, // Added in 2.30
     {&EV_Door_Fire,                &Door::DoorFire          },
     {&EV_Door_Link,                &Door::LinkDoors         },
     {&EV_Door_SetTime,             &Door::SetTime           },
diff --git a/code/fgame/doors.h b/code/fgame/doors.h
index 6203e4ce..452b89d5 100644
--- a/code/fgame/doors.h
+++ b/code/fgame/doors.h
@@ -118,7 +118,7 @@ public:
     Door();
     qboolean isOpen(void);
     qboolean isCompletelyClosed(void);
-    void     GetIsOpen(Event *ev);
+    void     GetIsOpen(Event *ev); // Added in 2.30
     qboolean CanBeOpenedBy(Entity *ent);
     void     Archive(Archiver    &arc) override;
 };

From 6fef42d6e0160c0d7e1302f6f16ead5b5390c0e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 20:25:51 +0200
Subject: [PATCH 1023/2040] Localize the jammed door message

---
 code/fgame/doors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 0730694b..3a4dbf0d 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -745,7 +745,7 @@ void Door::DoorUse(Event *ev)
     if (health || (spawnflags & (DOOR_AUTO_OPEN | DOOR_TARGETED)) || other->IsSubclassOfActor()) {
         if (other->IsSubclassOfSentient() && (state == STATE_CLOSED)) {
             if (health) {
-                gi.SendServerCommand(0, "print \"This door is jammed.\"");
+                gi.SendServerCommand(0, "print \"%s.\"", gi.LV_ConvertString("This door is jammed"));
             } else if (spawnflags & DOOR_TARGETED) {
                 Sound("door_triggered", CHAN_VOICE);
             }

From 253d4e2c4dfefe9c89d8651916546ab9568b531f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 20:26:17 +0200
Subject: [PATCH 1024/2040] Fix jammed door message printed on the first client

---
 code/fgame/doors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 3a4dbf0d..ccbadb63 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -745,7 +745,7 @@ void Door::DoorUse(Event *ev)
     if (health || (spawnflags & (DOOR_AUTO_OPEN | DOOR_TARGETED)) || other->IsSubclassOfActor()) {
         if (other->IsSubclassOfSentient() && (state == STATE_CLOSED)) {
             if (health) {
-                gi.SendServerCommand(0, "print \"%s.\"", gi.LV_ConvertString("This door is jammed"));
+                gi.SendServerCommand(other->edict - g_entities, "print \"%s.\"", gi.LV_ConvertString("This door is jammed"));
             } else if (spawnflags & DOOR_TARGETED) {
                 Sound("door_triggered", CHAN_VOICE);
             }

From 56f850b59de99fa5f2832c8cf8cec9c3d9a7f6aa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 20:51:56 +0200
Subject: [PATCH 1025/2040] Don't add the same world surface more than once

This fixes an issue where shaders like water, ocean would look strange or completely black, due to them blending against each other multiple times
---
 code/renderer/tr_world.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
index 00b89a88..0d4dab98 100644
--- a/code/renderer/tr_world.c
+++ b/code/renderer/tr_world.c
@@ -642,7 +642,9 @@ static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits )
 				// the surface may have already been added if it
 				// spans multiple leafs
 				surf = *mark;
-				R_AddWorldSurface(surf, dlightBits);
+				if (surf->viewCount != tr.viewCount) {
+					R_AddWorldSurface(surf, dlightBits);
+				}
 				mark++;
 			}
 		}

From a0c20663a0ba733d3d8f4de4cb2d03606cb4942b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:25:01 +0200
Subject: [PATCH 1026/2040] Don't make the player not solid in a vehicle slot

This fixes player not taking hits from explosions
---
 code/fgame/VehicleSlot.cpp | 1 -
 code/fgame/VehicleTank.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/fgame/VehicleSlot.cpp b/code/fgame/VehicleSlot.cpp
index 8da80156..beed0f58 100644
--- a/code/fgame/VehicleSlot.cpp
+++ b/code/fgame/VehicleSlot.cpp
@@ -51,7 +51,6 @@ void cVehicleSlot::NotSolid(void)
     prev_contents   = ent->edict->r.contents;
 
     ent->takedamage = DAMAGE_NO;
-    ent->setSolidType(SOLID_NOT);
 
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
diff --git a/code/fgame/VehicleTank.cpp b/code/fgame/VehicleTank.cpp
index b336cbfb..ac81ab43 100644
--- a/code/fgame/VehicleTank.cpp
+++ b/code/fgame/VehicleTank.cpp
@@ -334,7 +334,7 @@ void VehicleTank::Postthink()
             //  the tank was non-solid with a player driver,
             //  instead of the driver being non-solid.
             //setSolidType(SOLID_NOT);
-            driver.ent->setSolidType(SOLID_NOT);
+            //driver.ent->setSolidType(SOLID_NOT);
         } else {
             driver.ent->takedamage = DAMAGE_NO;
             driver.ent->setSolidType(SOLID_NOT);

From ce5b954c4d8647da0614376cea3a72927b54daac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:36:05 +0200
Subject: [PATCH 1027/2040] Use the target game version when sending the
 version to the server, instead of the global project version

The non-dedicated server version of MOH: Breakthrough (standalone executable) rejects clients that have a version of 2.30 or below, or a version of 2.50 or above (0.1 difference), which prevents playing LAN sessions of Breakthrough. To solve this issue, the client now sends a version value that is within the allowed version range for the target game
---
 code/client/cl_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 482a0885..830ad675 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1994,7 +1994,7 @@ wombat: sending conect here: an example connect string from MOHAA looks like thi
 			Info_SetValueForKey(info, "protocol", va("%i", com_protocol->integer));
 		Info_SetValueForKey( info, "qport", va("%i", port ) );
 		Info_SetValueForKey(info, "challenge", va("%i", clc.challenge));
-		Info_SetValueForKey(info, "version", com_shortversion->string);
+		Info_SetValueForKey(info, "version", com_target_version->string);
 		if (com_target_game->integer == target_game_e::TG_MOHTT) {
 			// only send if maintt is loaded
 			Info_SetValueForKey(info, "clientType", "Breakthrough");

From 23e56e767f4dea15699494490e720979770d40c3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:18:58 +0200
Subject: [PATCH 1028/2040] Increase sphere light limit

Some servers have a lot of objects in maps, causing all spheres to be used
---
 code/renderer/tr_local.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index a30d1c26..60efee39 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1161,7 +1161,7 @@ extern	refimport_t		ri;
 #define	MAX_DRAWIMAGES			2048
 #define	MAX_LIGHTMAPS			256
 #define	MAX_SKINS				1024
-#define MAX_SPHERE_LIGHTS		128
+#define MAX_SPHERE_LIGHTS		512
 
 #define	MAX_DRAWSURFS			0x10000
 #define	MAX_SPRITESURFS			0x8000
@@ -1260,7 +1260,7 @@ typedef struct {
 	trRefEntity_t	*currentEntity;
     qboolean skyRenderedThisView;	// flag for drawing sun
     sphereor_t spheres[MAX_SPHERE_LIGHTS];
-    unsigned char numSpheresUsed;
+    unsigned short numSpheresUsed;
     sphereor_t* currentSphere;
     sphereor_t spareSphere;
     sphereor_t hudSphere;

From 2f8b6a20093084ba1e54f43c7dfb0517dfb1f783 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:19:49 +0200
Subject: [PATCH 1029/2040] Satisfy stufftext tests

---
 code/cgame/cg_servercmds.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 50032af3..a802adc1 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -481,7 +481,8 @@ static const char *whiteListedCommands[] = {
     "tmstart",
     "tmstartloop",
     "tmstop",
-    "tmvolume"
+    "tmvolume",
+    "`stufftext",
 };
 
 //

From 13d855c2e7f96c62dd0903614d0939529c245168 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:07:04 +0200
Subject: [PATCH 1030/2040] Use Cmd_Argv() to check for dmmessage

---
 code/server/sv_client.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 1e4b4646..7be88ed8 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -1581,14 +1581,10 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 		}
 	}
 
-	//if (!Q_stricmp(s, "dmmessage")) {
-	// 2.0 has it wrong, it uses Q_stricmp, but it never works
-	// because `s` is the full command string with arguments
-	if (!Q_stricmpn(s, "dmmessage ", 10)) {
-		//
-		// Since 2.0, displays chat messages
-		// NOTE: this should be handled by fgame, not server
-		//
+	// Added in 1.11 MAC server
+	//  Display chat messages
+	//  NOTE: this should be handled by fgame, not server
+	if (!Q_stricmp(Cmd_Argv(0), "dmmessage")) {
 		Com_Printf("%s (%zu): %s", cl->name, (size_t)(cl - svs.clients), s);
 	}
 

From 40141465b57e831a6bbcacb84ded47ac5a5edc7b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:28:26 +0200
Subject: [PATCH 1031/2040] Add a section about flood protection

---
 docs/configuration/server.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 17ee3de1..6ea9c4f1 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -58,6 +58,17 @@ Examples:
 
 To calculate IP subnets, search for `IP subnet calculator` on Internet.
 
+## Flood protection differences with MOH: Spearhead
+
+Flood protection is turned on by default in all games (`sv_floodProtection 1`).
+
+- In MOH: Allied Assault and OpenMoHAA, flood protection checks all commands.
+- In MOH: Spearhead 2.0 and later, flood protection only checks for text messages.
+
+While flood protection prevents spam, it can sometimes be annoying in certain situations like reloading and checking scores within a short period of time. If needed, it can be disabled with `set sv_floodProtection 0`.
+
+For more details on preventing message spamming, check out the [Chat](#chat) section below.
+
 ## Game
 
 ### Chat

From 33064f8392a31d3e7e470c517ef706f81b27336a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:31:45 +0200
Subject: [PATCH 1032/2040] Set a default minimum delay between text messages

---
 code/fgame/gamecvars.cpp     |  4 ++--
 docs/configuration/server.md | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index 64633ecb..51268372 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -645,9 +645,9 @@ void CVAR_Init(void)
     }
 
     g_instamsg_allowed = gi.Cvar_Get("g_instamsg_allowed", "1", 0);
-    g_instamsg_minDelay = gi.Cvar_Get("g_instamsg_minDelay", "0", 0);
+    g_instamsg_minDelay = gi.Cvar_Get("g_instamsg_minDelay", "1000", 0);
     g_textmsg_allowed = gi.Cvar_Get("g_textmsg_allowed", "1", 0);
-    g_textmsg_minDelay = gi.Cvar_Get("g_textmsg_minDelay", "0", 0);
+    g_textmsg_minDelay = gi.Cvar_Get("g_textmsg_minDelay", "1000", 0);
 
     g_teambalance = gi.Cvar_Get("g_teambalance", "0", 0);
 
diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 6ea9c4f1..463b9871 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -20,7 +20,7 @@ The variable defaults to the following value depending on the OS:
 The network settings can be adjusted to use either IPv4, IPv6, or both. By default, IPv6 is disabled on dedicated servers. The following commands adjust network settings:
 - `set net_enabled 1`: This enables IPv4 only (the default setting for dedicated servers).
 - `set net_enabled 2`: This enables IPv6 only.
-- `set net_enabled 3`: This enables both IPv4 and IPv6 (the default setting when running the standalone game)
+- `set net_enabled 3`: This enables both IPv4 and IPv6 (the default setting when running the standalone game).
 
 *Note: The master server (using the GameSpy protocol) does not support IPv6. If IPv4 is disabled, the server won't appear in the online server list for internet games, even if IPv6 is enabled.*
 
@@ -48,13 +48,13 @@ A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https
 |flushbans  |                                       |Removes all bans
 
 Examples:
-- `banaddr 192.168.5.2` will ban the IP address **192.168.5.2**
-- `banaddr 192.168.1.0/24` will ban all **192.168.1.x** IP addresses (in the range **192.168.1.0**-**192.168.1.255**)
-- `banaddr 2` will ban the IP address of the client **#2**
-- `banaddr 4 24` will ban the subnet of client **#4** - i.e if client **#4** has IP **192.168.8.4**, then it will ban all IPs ranging from **192.168.8.0**-**192.168.8.255**
-- `exceptaddr 3` will add the IP of client **#3** as an exception
-- `bandel 192.168.8.4` will unban **192.168.8.4**
-- `bandel 192.168.1.0/24` will unban the entire **192.168.1.0** subnet (IP ranging from **192.168.1.0**-**192.168.1.255**)
+- `banaddr 192.168.5.2` will ban the IP address **192.168.5.2**.
+- `banaddr 192.168.1.0/24` will ban all **192.168.1.x** IP addresses (in the range **192.168.1.0**-**192.168.1.255**).
+- `banaddr 2` will ban the IP address of the client **#2**.
+- `banaddr 4 24` will ban the subnet of client **#4** - i.e if client .**#4** has IP **192.168.8.4**, then it will ban all IPs ranging from **192.168.8.0**-**192.168.8.255**.
+- `exceptaddr 3` will add the IP of client **#3** as an exception.
+- `bandel 192.168.8.4` will unban **192.168.8.4**.
+- `bandel 192.168.1.0/24` will unban the entire **192.168.1.0** subnet (IP ranging from **192.168.1.0**-**192.168.1.255**).
 
 To calculate IP subnets, search for `IP subnet calculator` on Internet.
 
@@ -77,10 +77,10 @@ Chat messages will be logged in the console and in the logfile without requiring
 
 The in-game chat can be tweaked:
 
-- `set g_instamsg_allowed 0`: This disables voice instant messages
-- `set g_instamsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming
-- `set g_textmsg_allowed 0`: This disables text messages. All, team and private messages will be disabled
-- `set g_textmsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each text message to avoid spamming
+- `set g_instamsg_allowed 0`: This disables voice instant messages.
+- `set g_instamsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming. Defaults to 1000.
+- `set g_textmsg_allowed 0`: This disables text messages. All, team and private messages will be disabled.
+- `set g_textmsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each text message to avoid spamming. Defaults to 1000.
 
 Temporarily disabling text messages can be useful in situations where tensions arise in the chat. Otherwise, it's best to keep them enabled under normal circumstances.
 
@@ -95,7 +95,7 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 ### Bots
 
 Bots can be used for testing. They don't move by default, so a mod will be needed, like [eaglear bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots):
-- `set sv_maxbots x`: Configure and allocate the maximum number of bots
+- `set sv_maxbots x`: Configure and allocate the maximum number of bots.
 - `set sv_minPlayers x`: optional, can be used to set the minimum number of players that the server should have. Bots will be spawned based on the minimum number of players.
-- `addbot x`: x is the number of bots to add
-- `removebot x`: x is the number of bots to remove
+- `addbot x`: x is the number of bots to add.
+- `removebot x`: x is the number of bots to remove.

From 8e51c7ca3bc1ff202f8cda7ad00c2832bb457c8a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:09:07 +0200
Subject: [PATCH 1033/2040] Fix VEHICLE_TYPE state condition not returning the
 vehicle type

This fixes player lacking animation when using heavy weapons like the granatwerfer
---
 code/fgame/player_conditionals.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index 3c61fc69..ddd6c777 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -361,7 +361,7 @@ qboolean Player::CondVehicleType(Conditional& condition)
 {
     str sType = condition.getParm(1);
     if (m_pVehicle && m_pVehicle->IsSubclassOfVehicle()) {
-        return !str::cmp(sType, "vehicle");
+        return !str::cmp(sType, m_pVehicle->getName());
     } else {
         return !str::cmp(sType, "none");
     }

From c68fbfacb9b627a0b6cef7af3452fc43993b8237 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:09:27 +0200
Subject: [PATCH 1034/2040] Set the EF_PLAYER_IN_MENU flag when the player is
 talking

---
 code/fgame/player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0266b74e..0e392f1a 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4872,9 +4872,9 @@ void Player::Think(void)
     // Added in 2.0: talk icon
     //
     if (buttons & BUTTON_TALK) {
-        edict->s.eFlags |= EF_PLAYER_TALKING;
+        edict->s.eFlags |= EF_PLAYER_IN_MENU;
     } else {
-        edict->s.eFlags &= ~EF_PLAYER_TALKING;
+        edict->s.eFlags &= ~EF_PLAYER_IN_MENU;
     }
 
     if (m_fTalkTime > level.time) {

From 7d6ff3e6a43b81dae885f2c11747f132de531a33 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:09:36 +0200
Subject: [PATCH 1035/2040] Format bg source files

---
 code/fgame/bg_local.h         |   86 +-
 code/fgame/bg_misc.cpp        |  191 ++-
 code/fgame/bg_pmove.cpp       | 2331 +++++++++++++++------------------
 code/fgame/bg_public.h        |   30 +-
 code/fgame/bg_slidemove.cpp   |  427 +++---
 code/fgame/bg_voteoptions.cpp |    4 +-
 code/fgame/bg_voteoptions.h   |    2 +-
 7 files changed, 1442 insertions(+), 1629 deletions(-)

diff --git a/code/fgame/bg_local.h b/code/fgame/bg_local.h
index 7db944cc..93ed4584 100644
--- a/code/fgame/bg_local.h
+++ b/code/fgame/bg_local.h
@@ -22,70 +22,68 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // bg_local.h -- local definitions for the bg (both games) files
 
-#define	MIN_WALK_NORMAL	0.7f		// can't walk on very steep slopes
+#define MIN_WALK_NORMAL 0.7f // can't walk on very steep slopes
 
-#define	JUMP_VELOCITY	270
+#define JUMP_VELOCITY   270
 
-#define	TIMER_LAND		130
-#define	TIMER_GESTURE	(34*66+50)
+#define TIMER_LAND      130
+#define TIMER_GESTURE   (34 * 66 + 50)
 
-#define	OVERCLIP		1.001f
+#define OVERCLIP        1.001f
 
-#define HEAD_TAG		0
-#define TORSO_TAG		1
-#define ARMS_TAG		2
-#define PELVIS_TAG		3
-#define MOUTH_TAG		4
+#define HEAD_TAG        0
+#define TORSO_TAG       1
+#define ARMS_TAG        2
+#define PELVIS_TAG      3
+#define MOUTH_TAG       4
 
 // all of the locals will be zeroed before each
 // pmove, just to make damn sure we don't have
 // any differences when running on client or server
 typedef struct {
-	vec3_t		forward, left, up;
-	vec3_t		flat_forward, flat_left, flat_up;
-	float		frametime;
+    vec3_t forward, left, up;
+    vec3_t flat_forward, flat_left, flat_up;
+    float  frametime;
 
-	int			msec;
+    int msec;
 
-	qboolean	walking;
-	qboolean	groundPlane;
-	trace_t		groundTrace;
+    qboolean walking;
+    qboolean groundPlane;
+    trace_t  groundTrace;
 
-	float		impactSpeed;
+    float impactSpeed;
 
-	vec3_t		previous_origin;
-	vec3_t		previous_velocity;
-	int			previous_waterlevel;
+    vec3_t previous_origin;
+    vec3_t previous_velocity;
+    int    previous_waterlevel;
 } pml_t;
 
-extern	pmove_t		*pm;
-extern	pml_t		pml;
+extern pmove_t *pm;
+extern pml_t    pml;
 
 // movement parameters
-extern	float	pm_stopspeed;
-extern	float	pm_duckScale;
-extern	float	pm_swimScale;
-extern	float	pm_wadeScale;
+extern float pm_stopspeed;
+extern float pm_duckScale;
+extern float pm_swimScale;
+extern float pm_wadeScale;
 
-extern	float	pm_accelerate;
-extern	float	pm_airaccelerate;
-extern	float	pm_wateraccelerate;
-extern	float	pm_flyaccelerate;
+extern float pm_accelerate;
+extern float pm_airaccelerate;
+extern float pm_wateraccelerate;
+extern float pm_flyaccelerate;
 
-extern	float	pm_friction;
-extern	float	pm_waterfriction;
-extern	float	pm_flightfriction;
+extern float pm_friction;
+extern float pm_waterfriction;
+extern float pm_flightfriction;
 
-extern	const vec3_t MINS;
-extern	const vec3_t MAXS;
+extern const vec3_t MINS;
+extern const vec3_t MAXS;
 
-extern	int		c_pmove;
-
-void PM_ClipVelocity( vec3_t in, vec3_t normal, vec3_t out, float overbounce );
-void PM_AddTouchEnt( int entityNum );
-void PM_AddEvent( int newEvent );
-
-qboolean	PM_SlideMove( qboolean gravity );
-void		PM_StepSlideMove( qboolean gravity );
+extern int c_pmove;
 
+void PM_ClipVelocity(vec3_t in, vec3_t normal, vec3_t out, float overbounce);
+void PM_AddTouchEnt(int entityNum);
+void PM_AddEvent(int newEvent);
 
+qboolean PM_SlideMove(qboolean gravity);
+void     PM_StepSlideMove(qboolean gravity);
diff --git a/code/fgame/bg_misc.cpp b/code/fgame/bg_misc.cpp
index 246b1e44..b7f63276 100644
--- a/code/fgame/bg_misc.cpp
+++ b/code/fgame/bg_misc.cpp
@@ -31,9 +31,7 @@ BG_EvaluateTrajectoryDelta
 For determining velocity at a given time
 ================
 */
-void BG_EvaluateTrajectoryDelta( const trajectory_t *tr, int atTime, vec3_t result ) {
-
-}
+void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result) {}
 
 // FIXME: OLD Q3 CODE
 #if 0
@@ -50,9 +48,9 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 {
 
 	gitem_t	*item;
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 	int		upperBound;
-#endif
+#    endif
 
 	if ( ent->modelindex < 1 || ent->modelindex >= bg_numItems ) {
 		Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: index out of range" );
@@ -71,7 +69,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 		return qtrue;
 
 	case IT_ARMOR:
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 		if( bg_itemlist[ps->stats[STAT_PERSISTANT_POWERUP]].giTag == PW_SCOUT ) {
 			return qfalse;
 		}
@@ -87,22 +85,22 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 		if ( ps->stats[STAT_ARMOR] >= upperBound ) {
 			return qfalse;
 		}
-#else
+#    else
 		if ( ps->stats[STAT_ARMOR] >= ps->stats[STAT_MAX_HEALTH] * 2 ) {
 			return qfalse;
 		}
-#endif
+#    endif
 		return qtrue;
 
 	case IT_HEALTH:
 		// small and mega healths will go over the max, otherwise
 		// don't pick up if already at max
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 		if( bg_itemlist[ps->stats[STAT_PERSISTANT_POWERUP]].giTag == PW_GUARD ) {
 			upperBound = ps->stats[STAT_MAX_HEALTH];
 		}
 		else
-#endif
+#    endif
 		if ( item->quantity == 5 || item->quantity == 100 ) {
 			if ( ps->stats[STAT_HEALTH] >= ps->stats[STAT_MAX_HEALTH] * 2 ) {
 				return qfalse;
@@ -118,7 +116,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 	case IT_POWERUP:
 		return qtrue;	// powerups are always picked up
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 	case IT_PERSISTANT_POWERUP:
 		// can only hold one item at a time
 		if ( ps->stats[STAT_PERSISTANT_POWERUP] ) {
@@ -134,10 +132,10 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 		}
 
 		return qtrue;
-#endif
+#    endif
 
 	case IT_TEAM: // team items, such as flags
-#ifdef MISSIONPACK		
+#    ifdef MISSIONPACK		
 		if( gametype == GT_1FCTF ) {
 			// neutral flag can always be picked up
 			if( item->giTag == PW_NEUTRALFLAG ) {
@@ -153,7 +151,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 				}
 			}
 		}
-#endif
+#    endif
 		if( gametype == GT_CTF ) {
 			// ent->modelindex2 is non-zero on items if they are dropped
 			// we need to know this because we can pick up our dropped flag (and return it)
@@ -171,11 +169,11 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 			}
 		}
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 		if( gametype == GT_HARVESTER ) {
 			return qtrue;
 		}
-#endif
+#    endif
 		return qfalse;
 
 	case IT_HOLDABLE:
@@ -188,11 +186,11 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
         case IT_BAD:
             Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: IT_BAD" );
         default:
-#ifndef Q3_VM
-#ifndef NDEBUG
+#    ifndef Q3_VM
+#        ifndef NDEBUG
           Com_Printf("BG_CanItemBeGrabbed: unknown enum %d\n", item->giType );
-#endif
-#endif
+#        endif
+#    endif
          break;
 	}
 
@@ -297,8 +295,7 @@ void BG_EvaluateTrajectoryDelta( const trajectory_t *tr, int atTime, vec3_t resu
 BG_TouchJumpPad
 ========================
 */
-void BG_TouchJumpPad( playerState_t *ps, entityState_t *jumppad ) {
-}
+void BG_TouchJumpPad(playerState_t *ps, entityState_t *jumppad) {}
 
 /*
 ========================
@@ -308,43 +305,41 @@ This is done after each set of usercmd_t on the server,
 and after local prediction on the client
 ========================
 */
-void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean snap )
+void BG_PlayerStateToEntityState(playerState_t *ps, entityState_t *s, qboolean snap)
 {
-	if ( ps->pm_type == PM_NOCLIP ) {
-		s->eType = 0;//ET_INVISIBLE;
-	//} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
-	//	s->eType = 0;//ET_INVISIBLE;
-	} else {
-		s->eType = ET_PLAYER;
-	}
+    if (ps->pm_type == PM_NOCLIP) {
+        s->eType = 0; //ET_INVISIBLE;
+        //} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
+        //	s->eType = 0;//ET_INVISIBLE;
+    } else {
+        s->eType = ET_PLAYER;
+    }
 
-	s->number = ps->clientNum;
+    s->number = ps->clientNum;
 
-	VectorCopy( ps->origin, s->origin );
-	if ( snap ) {
-		SnapVector( s->origin );
-	}
-	// set the trDelta for flag direction
-	VectorCopy( ps->velocity, s->pos.trDelta );
+    VectorCopy(ps->origin, s->origin);
+    if (snap) {
+        SnapVector(s->origin);
+    }
+    // set the trDelta for flag direction
+    VectorCopy(ps->velocity, s->pos.trDelta);
 
-	VectorCopy( ps->viewangles, s->angles );
-	if ( snap ) {
-		SnapVector( s->angles );
-	}
+    VectorCopy(ps->viewangles, s->angles);
+    if (snap) {
+        SnapVector(s->angles);
+    }
 
-	//s->angles2[YAW] = ps->movementDir;
-	s->clientNum = ps->clientNum;		// ET_PLAYER looks here instead of at number
-										// so corpses can also reference the proper config
-	//s->eFlags = ps->eFlags;
-	//if ( ps->stats[STAT_HEALTH] <= 0 ) {
-	//	s->eFlags |= EF_DEAD;
-	//} else {
-	//	s->eFlags &= ~EF_DEAD;
-	//}
-
-	
-	s->groundEntityNum = ps->groundEntityNum;
+    //s->angles2[YAW] = ps->movementDir;
+    s->clientNum = ps->clientNum; // ET_PLAYER looks here instead of at number
+                                  // so corpses can also reference the proper config
+    //s->eFlags = ps->eFlags;
+    //if ( ps->stats[STAT_HEALTH] <= 0 ) {
+    //	s->eFlags |= EF_DEAD;
+    //} else {
+    //	s->eFlags &= ~EF_DEAD;
+    //}
 
+    s->groundEntityNum = ps->groundEntityNum;
 }
 
 /*
@@ -355,37 +350,35 @@ This is done after each set of usercmd_t on the server,
 and after local prediction on the client
 ========================
 */
-void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s, int time, qboolean snap )
+void BG_PlayerStateToEntityStateExtraPolate(playerState_t *ps, entityState_t *s, int time, qboolean snap)
 {
-	if ( ps->pm_type == PM_NOCLIP ) {
-		s->eType = 0;//ET_INVISIBLE;
-	//} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
-	//	s->eType = 0;//ET_INVISIBLE;
-	} else {
-		s->eType = ET_PLAYER;
-	}
+    if (ps->pm_type == PM_NOCLIP) {
+        s->eType = 0; //ET_INVISIBLE;
+        //} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
+        //	s->eType = 0;//ET_INVISIBLE;
+    } else {
+        s->eType = ET_PLAYER;
+    }
 
-	s->number = ps->clientNum;
+    s->number = ps->clientNum;
 
-	VectorCopy( ps->origin, s->origin );
-	if ( snap ) {
-		SnapVector( s->origin );
-	}
-	// set the trDelta for flag direction and linear prediction
-	VectorCopy( ps->velocity, s->pos.trDelta );
-	// set the time for linear prediction
-	s->pos.trTime = time;
+    VectorCopy(ps->origin, s->origin);
+    if (snap) {
+        SnapVector(s->origin);
+    }
+    // set the trDelta for flag direction and linear prediction
+    VectorCopy(ps->velocity, s->pos.trDelta);
+    // set the time for linear prediction
+    s->pos.trTime = time;
 
-	VectorCopy( ps->viewangles, s->angles );
-	if ( snap ) {
-		SnapVector( s->angles );
-	}
-	s->clientNum = ps->clientNum;		// ET_PLAYER looks here instead of at number
-										// so corpses can also reference the proper config
-
-
-	s->groundEntityNum = ps->groundEntityNum;
+    VectorCopy(ps->viewangles, s->angles);
+    if (snap) {
+        SnapVector(s->angles);
+    }
+    s->clientNum = ps->clientNum; // ET_PLAYER looks here instead of at number
+                                  // so corpses can also reference the proper config
 
+    s->groundEntityNum = ps->groundEntityNum;
 }
 
 /*
@@ -398,30 +391,30 @@ and after local prediction on the client
 */
 int BG_MapCGMToProtocol(int protocol, int messageNumber)
 {
-	int newMessageNumber = messageNumber;
+    int newMessageNumber = messageNumber;
 
-	if (protocol >= PROTOCOL_MOHTA_MIN) {
-		// no need translation
-		return messageNumber;
-	}
+    if (protocol >= PROTOCOL_MOHTA_MIN) {
+        // no need translation
+        return messageNumber;
+    }
 
-	if (messageNumber > 40) {
-		// unsupported...
-		return messageNumber;
-	}
+    if (messageNumber > 40) {
+        // unsupported...
+        return messageNumber;
+    }
 
-	if (messageNumber >= 17) {
-		return messageNumber - 3;
-	}
+    if (messageNumber >= 17) {
+        return messageNumber - 3;
+    }
 
-	if (messageNumber == 15 || messageNumber == 16) {
-		// return explosion effect number 2
-		return 14;
-	}
+    if (messageNumber == 15 || messageNumber == 16) {
+        // return explosion effect number 2
+        return 14;
+    }
 
-	if (messageNumber > 10) {
-		return messageNumber - 1;
-	}
+    if (messageNumber > 10) {
+        return messageNumber - 1;
+    }
 
-	return newMessageNumber;
+    return newMessageNumber;
 }
\ No newline at end of file
diff --git a/code/fgame/bg_pmove.cpp b/code/fgame/bg_pmove.cpp
index 65018c92..241eddbb 100644
--- a/code/fgame/bg_pmove.cpp
+++ b/code/fgame/bg_pmove.cpp
@@ -27,31 +27,31 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "bg_public.h"
 #include "bg_local.h"
 
-pmove_t		*pm;
-pml_t		pml;
+pmove_t *pm;
+pml_t    pml;
 
 // movement parameters
-float	pm_stopspeed = 50.0f;
-float	pm_duckScale = 0.25f;
-float	pm_swimScale = 1.0f;
-float	pm_wadeScale = 0.70f;
+float pm_stopspeed = 50.0f;
+float pm_duckScale = 0.25f;
+float pm_swimScale = 1.0f;
+float pm_wadeScale = 0.70f;
 
-float	pm_accelerate = 8.0f;
-float	pm_airaccelerate = 1.0f;
-float	pm_wateraccelerate = 8.0f;
+float pm_accelerate      = 8.0f;
+float pm_airaccelerate   = 1.0f;
+float pm_wateraccelerate = 8.0f;
 
-float	pm_friction = 6.0f;
-float	pm_waterfriction = 2.0f;
-float	pm_slipperyfriction = 0.25f;
-float	pm_strafespeed = 0.85f;
-float	pm_backspeed = 0.80f;
-float	pm_flightfriction = 3.0f;
-float	PM_NOCLIPfriction = 5.0f;
+float pm_friction         = 6.0f;
+float pm_waterfriction    = 2.0f;
+float pm_slipperyfriction = 0.25f;
+float pm_strafespeed      = 0.85f;
+float pm_backspeed        = 0.80f;
+float pm_flightfriction   = 3.0f;
+float PM_NOCLIPfriction   = 5.0f;
 
-const vec3_t MINS = { -15, -15, 0 };
-const vec3_t MAXS = { 15, 15, 94 };
+const vec3_t MINS = {-15, -15, 0};
+const vec3_t MAXS = {15, 15, 94};
 
-int		c_pmove = 0;
+int c_pmove = 0;
 
 /*
 ===============
@@ -59,36 +59,35 @@ PM_AddEvent
 
 ===============
 */
-void PM_AddEvent( int newEvent ) {
-
-}
+void PM_AddEvent(int newEvent) {}
 
 /*
 ===============
 PM_AddTouchEnt
 ===============
 */
-void PM_AddTouchEnt( int entityNum ) {
-	int		i;
+void PM_AddTouchEnt(int entityNum)
+{
+    int i;
 
-	if ( entityNum == ENTITYNUM_WORLD ) {
-		return;
-	}
+    if (entityNum == ENTITYNUM_WORLD) {
+        return;
+    }
 
-	if ( pm->numtouch == MAXTOUCH ) {
-		return;
-	}
+    if (pm->numtouch == MAXTOUCH) {
+        return;
+    }
 
-	// see if it is already added
-	for ( i = 0 ; i < pm->numtouch ; i++ ) {
-		if ( pm->touchents[ i ] == entityNum ) {
-			return;
-		}
-	}
+    // see if it is already added
+    for (i = 0; i < pm->numtouch; i++) {
+        if (pm->touchents[i] == entityNum) {
+            return;
+        }
+    }
 
-	// add it
-	pm->touchents[pm->numtouch] = entityNum;
-	pm->numtouch++;
+    // add it
+    pm->touchents[pm->numtouch] = entityNum;
+    pm->numtouch++;
 }
 
 /*
@@ -96,25 +95,15 @@ void PM_AddTouchEnt( int entityNum ) {
 PM_StartTorsoAnim
 ===================
 */
-static void PM_StartTorsoAnim( int anim ) {
+static void PM_StartTorsoAnim(int anim) {}
 
-}
-static void PM_StartLegsAnim( int anim ) {
+static void PM_StartLegsAnim(int anim) {}
 
-}
+static void PM_ContinueLegsAnim(int anim) {}
 
-static void PM_ContinueLegsAnim( int anim ) {
-
-}
-
-static void PM_ContinueTorsoAnim( int anim ) {
-	
-}
-
-static void PM_ForceLegsAnim( int anim ) {
-	
-}
+static void PM_ContinueTorsoAnim(int anim) {}
 
+static void PM_ForceLegsAnim(int anim) {}
 
 /*
 ==================
@@ -123,48 +112,44 @@ PM_ClipVelocity
 Slide off of the impacting surface
 ==================
 */
-void PM_ClipVelocity( vec3_t in, vec3_t normal, vec3_t out, float overbounce )
+void PM_ClipVelocity(vec3_t in, vec3_t normal, vec3_t out, float overbounce)
 {
-	float	backoff;
-	float	dir_z;
-	float	normal2[ 3 ];
+    float backoff;
+    float dir_z;
+    float normal2[3];
 
-	if( normal[ 2 ] >= pm_wadeScale )
-	{
-		if( in[ 0 ] == 0.0f && in[ 1 ] == 0.0f )
-		{
-			VectorClear( out );
-			return;
-		}
+    if (normal[2] >= pm_wadeScale) {
+        if (in[0] == 0.0f && in[1] == 0.0f) {
+            VectorClear(out);
+            return;
+        }
 
-		normal2[ 0 ] = in[ 0 ] * DotProduct2D( in, normal );
-		normal2[ 1 ] = in[ 1 ] * DotProduct2D( in, normal );
-		normal2[ 2 ] = normal[ 2 ] * DotProduct2D( in, in );
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
+        normal2[2] = normal[2] * DotProduct2D(in, in);
 
-		VectorNormalize( normal2 );
+        VectorNormalize(normal2);
 
-		dir_z = -normal2[ 2 ];
+        dir_z = -normal2[2];
 
-		out[ 0 ] = in[ 0 ];
-		out[ 1 ] = in[ 1 ];
-		out[ 2 ] = DotProduct2D( in, normal2 ) / dir_z;
-	}
-	else
-	{
-		backoff = DotProduct( in, normal );
+        out[0] = in[0];
+        out[1] = in[1];
+        out[2] = DotProduct2D(in, normal2) / dir_z;
+    } else {
+        backoff = DotProduct(in, normal);
 
-		if( backoff < 0 )
-			backoff *= overbounce;
-		else
-			backoff /= overbounce;
+        if (backoff < 0) {
+            backoff *= overbounce;
+        } else {
+            backoff /= overbounce;
+        }
 
-		out[ 0 ] = in[ 0 ] - normal[ 0 ] * backoff;
-		out[ 1 ] = in[ 1 ] - normal[ 1 ] * backoff;
-		out[ 2 ] = in[ 2 ] - normal[ 2 ] * backoff;
-	}
+        out[0] = in[0] - normal[0] * backoff;
+        out[1] = in[1] - normal[1] * backoff;
+        out[2] = in[2] - normal[2] * backoff;
+    }
 }
 
-
 /*
 ==================
 PM_Friction
@@ -172,76 +157,65 @@ PM_Friction
 Handles both ground friction and water friction
 ==================
 */
-static void PM_Friction( void ) {
-	vec3_t	vec;
-	float	*vel;
-	float	speed, newspeed, control;
-	float	drop;
+static void PM_Friction(void)
+{
+    vec3_t vec;
+    float *vel;
+    float  speed, newspeed, control;
+    float  drop;
 
-	vel = pm->ps->velocity;
+    vel = pm->ps->velocity;
 
-	VectorCopy( vel, vec );
-	if( pml.walking )
-	{
-		// ignore slope movement
-		vec[ 2 ] = 0;
-	}
+    VectorCopy(vel, vec);
+    if (pml.walking) {
+        // ignore slope movement
+        vec[2] = 0;
+    }
 
-	speed = VectorLength( vec );
-	if( speed < 1 )
-	{
-		// allow sinking underwater
-		vel[ 0 ] = 0;
-		vel[ 1 ] = 0;
+    speed = VectorLength(vec);
+    if (speed < 1) {
+        // allow sinking underwater
+        vel[0] = 0;
+        vel[1] = 0;
 
-		return;
-	}
+        return;
+    }
 
-	drop = 0;
+    drop = 0;
 
-	if( pml.walking )
-	{
-		control = ( speed < pm_stopspeed ) ? pm_stopspeed : speed;
+    if (pml.walking) {
+        control = (speed < pm_stopspeed) ? pm_stopspeed : speed;
 
-		// if getting knocked back, no friction
-		if( pml.groundTrace.surfaceFlags & SURF_SLICK )
-		{
-			drop += control * pm_slipperyfriction * pml.frametime;
-		}
-		else
-		{
-			drop += control * pm_friction * pml.frametime;
-		}
-	}
+        // if getting knocked back, no friction
+        if (pml.groundTrace.surfaceFlags & SURF_SLICK) {
+            drop += control * pm_slipperyfriction * pml.frametime;
+        } else {
+            drop += control * pm_friction * pml.frametime;
+        }
+    }
 
-	// apply water friction even if just wading
-	if( pm->waterlevel )
-	{
-		if( pm->watertype & CONTENTS_SLIME )
-		{
-			drop += speed * pm_waterfriction * 5 * pm->waterlevel * pml.frametime;
-		}
-		else
-		{
-			drop += speed * pm_waterfriction * pm->waterlevel * pml.frametime;
-		}
-	}
+    // apply water friction even if just wading
+    if (pm->waterlevel) {
+        if (pm->watertype & CONTENTS_SLIME) {
+            drop += speed * pm_waterfriction * 5 * pm->waterlevel * pml.frametime;
+        } else {
+            drop += speed * pm_waterfriction * pm->waterlevel * pml.frametime;
+        }
+    }
 
-	// scale the velocity
-	newspeed = speed - drop;
-	if( newspeed < 0 )
-	{
-		newspeed = 0;
-	}
+    // scale the velocity
+    newspeed = speed - drop;
+    if (newspeed < 0) {
+        newspeed = 0;
+    }
 
-	newspeed /= speed;
+    newspeed /= speed;
 
-	vel[ 0 ] = vel[ 0 ] * newspeed;
-	vel[ 1 ] = vel[ 1 ] * newspeed;
-	vel[ 2 ] = vel[ 2 ] * newspeed;
+    vel[0] = vel[0] * newspeed;
+    vel[1] = vel[1] * newspeed;
+    vel[2] = vel[2] * newspeed;
 }
 
-
 /*
 ==============
 PM_Accelerate
@@ -249,27 +223,25 @@ PM_Accelerate
 Handles user intended acceleration
 ==============
 */
-static void PM_Accelerate( vec3_t wishdir, float wishspeed, float accel )
+static void PM_Accelerate(vec3_t wishdir, float wishspeed, float accel)
 {
-	vec3_t		wishVelocity;
-	vec3_t		pushDir;
-	float		pushLen;
-	float		canPush;
+    vec3_t wishVelocity;
+    vec3_t pushDir;
+    float  pushLen;
+    float  canPush;
 
-	VectorScale( wishdir, wishspeed, wishVelocity );
-	VectorSubtract( wishVelocity, pm->ps->velocity, pushDir );
-	pushLen = VectorNormalize( pushDir );
+    VectorScale(wishdir, wishspeed, wishVelocity);
+    VectorSubtract(wishVelocity, pm->ps->velocity, pushDir);
+    pushLen = VectorNormalize(pushDir);
 
-	canPush = accel*pml.frametime*wishspeed;
-	if (canPush > pushLen) {
-		canPush = pushLen;
-	}
+    canPush = accel * pml.frametime * wishspeed;
+    if (canPush > pushLen) {
+        canPush = pushLen;
+    }
 
-	VectorMA( pm->ps->velocity, canPush, pushDir, pm->ps->velocity );
+    VectorMA(pm->ps->velocity, canPush, pushDir, pm->ps->velocity);
 }
 
-
-
 /*
 ============
 PM_CmdScale
@@ -279,30 +251,30 @@ This allows the clients to use axial -127 to 127 values for all directions
 without getting a sqrt(2) distortion in speed.
 ============
 */
-static float PM_CmdScale( usercmd_t *cmd ) {
-	int		max;
-	float	total;
-	float	scale;
-	float	fmove, smove;
+static float PM_CmdScale(usercmd_t *cmd)
+{
+    int   max;
+    float total;
+    float scale;
+    float fmove, smove;
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	max = fabs( fmove );
-	if(fabs( smove ) > max ) {
-		max = fabs( smove );
-	}
-	if (fabs( cmd->upmove ) > max ) {
-		max = fabs( cmd->upmove );
-	}
-	if ( !max ) {
-		return 0;
-	}
+    max = fabs(fmove);
+    if (fabs(smove) > max) {
+        max = fabs(smove);
+    }
+    if (fabs(cmd->upmove) > max) {
+        max = fabs(cmd->upmove);
+    }
+    if (!max) {
+        return 0;
+    }
 
-	total = sqrt( ( float )( fmove * fmove
-		+ smove * smove + cmd->upmove * cmd->upmove ) );
-	scale = ( float )pm->ps->speed * max / ( 127.0 * total );
+    total = sqrt((float)(fmove * fmove + smove * smove + cmd->upmove * cmd->upmove));
+    scale = (float)pm->ps->speed * max / (127.0 * total);
 
-	return scale;
+    return scale;
 }
 
 //============================================================================
@@ -313,33 +285,29 @@ PM_CheckTerminalVelocity
 =============
 */
 #define TERMINAL_VELOCITY 1200
-void PM_CheckTerminalVelocity
-	(
-	void
-	)
+
+void PM_CheckTerminalVelocity(void)
 {
-	float oldspeed;
-	float speed;
+    float oldspeed;
+    float speed;
 
-	//
-	// how fast were we falling
-	//
-	oldspeed = -pml.previous_velocity[ 2 ];
+    //
+    // how fast were we falling
+    //
+    oldspeed = -pml.previous_velocity[2];
 
-	//
-	// how fast are we falling
-	//
-	speed = -pm->ps->velocity[ 2 ];
+    //
+    // how fast are we falling
+    //
+    speed = -pm->ps->velocity[2];
 
-	if( speed <= 0 )
-	{
-		return;
-	}
+    if (speed <= 0) {
+        return;
+    }
 
-	if( ( oldspeed <= TERMINAL_VELOCITY ) && ( speed > TERMINAL_VELOCITY ) )
-	{
-		pm->pmoveEvent = EV_TERMINAL_VELOCITY;
-	}
+    if ((oldspeed <= TERMINAL_VELOCITY) && (speed > TERMINAL_VELOCITY)) {
+        pm->pmoveEvent = EV_TERMINAL_VELOCITY;
+    }
 }
 
 /*
@@ -399,18 +367,13 @@ PM_GetMove
 
 ===================
 */
-void PM_GetMove
-	(
-	float *pfForward,
-	float *pfRight
-	)
+void PM_GetMove(float *pfForward, float *pfRight)
 {
-	*pfForward = pm->cmd.forwardmove;
-	if( *pfForward < 0 )
-	{
-		*pfForward *= pm_backspeed;
-	}
-	*pfRight = pm->cmd.rightmove * pm_strafespeed;
+    *pfForward = pm->cmd.forwardmove;
+    if (*pfForward < 0) {
+        *pfForward *= pm_backspeed;
+    }
+    *pfRight = pm->cmd.rightmove * pm_strafespeed;
 }
 
 /*
@@ -419,184 +382,161 @@ PM_AirMove
 
 ===================
 */
-static void PM_AirMove( void )
+static void PM_AirMove(void)
 {
-	vec3_t		wishvel;
-	float		   fmove;
-	float       smove;
-	vec3_t		wishdir;
-	float		   wishspeed;
-	float		   scale;
-	usercmd_t	cmd;
+    vec3_t    wishvel;
+    float     fmove;
+    float     smove;
+    vec3_t    wishdir;
+    float     wishspeed;
+    float     scale;
+    usercmd_t cmd;
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	pm->ps->pm_time = 0;
+    pm->ps->pm_time = 0;
 
-	cmd = pm->cmd;
-	scale = PM_CmdScale( &cmd );
+    cmd   = pm->cmd;
+    scale = PM_CmdScale(&cmd);
 
-	wishvel[ 0 ] = pml.flat_forward[ 0 ] * fmove - pml.flat_left[ 0 ] * smove;
-	wishvel[ 1 ] = pml.flat_forward[ 1 ] * fmove - pml.flat_left[ 1 ] * smove;
-	wishvel[ 2 ] = 0;
+    wishvel[0] = pml.flat_forward[0] * fmove - pml.flat_left[0] * smove;
+    wishvel[1] = pml.flat_forward[1] * fmove - pml.flat_left[1] * smove;
+    wishvel[2] = 0;
 
-	VectorCopy( wishvel, wishdir );
-	wishspeed = VectorNormalize( wishdir );
-	wishspeed *= scale;
+    VectorCopy(wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+    wishspeed *= scale;
 
-	// not on ground, so little effect on velocity
-	PM_Accelerate( wishdir, wishspeed, pm_airaccelerate );
+    // not on ground, so little effect on velocity
+    PM_Accelerate(wishdir, wishspeed, pm_airaccelerate);
 
-	// we may have a ground plane that is very steep, even
-	// though we don't have a groundentity
-	// slide along the steep plane
-	if( pml.groundPlane )
-	{
-		PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP );
-	}
+    // we may have a ground plane that is very steep, even
+    // though we don't have a groundentity
+    // slide along the steep plane
+    if (pml.groundPlane) {
+        PM_ClipVelocity(pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP);
+    }
 
-	PM_StepSlideMove( qtrue );
+    PM_StepSlideMove(qtrue);
 
-	PM_CheckTerminalVelocity();
+    PM_CheckTerminalVelocity();
 }
 
-static vec3_t min3x3 = { -8, 0, 0 };
-static vec3_t max3x3 = { 4, 4, 8 };
-static vec3_t base_rightfoot_pos = { -5.25301f, -3.10885f, 0 };
-static vec3_t base_leftfoot_pos = { -0.123711f, 10.4893f, 0 };
+static vec3_t min3x3             = {-8, 0, 0};
+static vec3_t max3x3             = {4, 4, 8};
+static vec3_t base_rightfoot_pos = {-5.25301f, -3.10885f, 0};
+static vec3_t base_leftfoot_pos  = {-0.123711f, 10.4893f, 0};
 
-qboolean PM_FeetOnGround
-	(
-	vec3_t pos
-	)
+qboolean PM_FeetOnGround(vec3_t pos)
 {
-	vec3_t start;
-	vec3_t end;
-	trace_t trace;
+    vec3_t  start;
+    vec3_t  end;
+    trace_t trace;
 
-	VectorCopy( pos, start );
-	VectorCopy( pos, end );
-	end[ 2 ] -= 16.01f;
+    VectorCopy(pos, start);
+    VectorCopy(pos, end);
+    end[2] -= 16.01f;
 
-	pm->trace( &trace, start, min3x3, max3x3, end, pm->ps->clientNum, pm->tracemask, true, false );
+    pm->trace(&trace, start, min3x3, max3x3, end, pm->ps->clientNum, pm->tracemask, true, false);
 
-	return trace.fraction != 1.0f;
+    return trace.fraction != 1.0f;
 }
 
-qboolean PM_FindBestFallPos
-	(
-	vec3_t pos,
-	vec3_t bestdir
-	)
-{ 
-	trace_t trace;
-	vec3_t ang;
-	vec3_t dir;
-	vec3_t start;
-	vec3_t end;
-	vec3_t move;
-	int i;
-	qboolean set;
-	float radius;
+qboolean PM_FindBestFallPos(vec3_t pos, vec3_t bestdir)
+{
+    trace_t  trace;
+    vec3_t   ang;
+    vec3_t   dir;
+    vec3_t   start;
+    vec3_t   end;
+    vec3_t   move;
+    int      i;
+    qboolean set;
+    float    radius;
 
-	VectorClear( bestdir );
+    VectorClear(bestdir);
 
-	set = qfalse;
+    set = qfalse;
 
-	radius = pm->maxs[ 0 ] - pm->mins[ 0 ] + 1.0f;
+    radius = pm->maxs[0] - pm->mins[0] + 1.0f;
 
-	VectorCopy( pos, start );
-	start[ 2 ] -= 16.1f;
+    VectorCopy(pos, start);
+    start[2] -= 16.1f;
 
-	VectorSet( ang, 0, pm->ps->viewangles[ 1 ], 0 );
-	for( i = 0; i < 16; i++, ang[ 1 ] += 22.5f )
-	{
-		AngleVectorsLeft( ang, dir, NULL, NULL );
-		VectorMA( pos, radius, dir, move );
+    VectorSet(ang, 0, pm->ps->viewangles[1], 0);
+    for (i = 0; i < 16; i++, ang[1] += 22.5f) {
+        AngleVectorsLeft(ang, dir, NULL, NULL);
+        VectorMA(pos, radius, dir, move);
 
-		pm->trace( &trace, pos, pm->mins, pm->maxs, move, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+        pm->trace(&trace, pos, pm->mins, pm->maxs, move, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-		VectorCopy( trace.endpos, end );
-		end[ 2 ] = start[ 2 ];
+        VectorCopy(trace.endpos, end);
+        end[2] = start[2];
 
-		pm->trace( &trace, trace.endpos, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-		if( trace.fraction == 1.0f )
-		{
-			VectorCopy( trace.endpos, end );
-			pm->trace( &trace, end, pm->mins, pm->maxs, start, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+        pm->trace(&trace, trace.endpos, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+        if (trace.fraction == 1.0f) {
+            VectorCopy(trace.endpos, end);
+            pm->trace(&trace, end, pm->mins, pm->maxs, start, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-			if( trace.fraction < 1.0f )
-			{
-				VectorAdd( bestdir, trace.plane.normal, bestdir );
-				set = qtrue;
-			}
-		}
-	}
+            if (trace.fraction < 1.0f) {
+                VectorAdd(bestdir, trace.plane.normal, bestdir);
+                set = qtrue;
+            }
+        }
+    }
 
-	if( !set || !VectorNormalize( bestdir ) )
-	{
-		return qfalse;
-	}
+    if (!set || !VectorNormalize(bestdir)) {
+        return qfalse;
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
-void PM_CheckFeet
-	(
-	vec3_t vWishdir
-	)
+void PM_CheckFeet(vec3_t vWishdir)
 {
-	vec3_t		temp;
-	trace_t		trace;
+    vec3_t  temp;
+    trace_t trace;
 
-	if( pm->stepped )
-	{
-		pm->ps->feetfalling = 0;
-		return;
-	}
+    if (pm->stepped) {
+        pm->ps->feetfalling = 0;
+        return;
+    }
 
-	if( !pm->ps->walking )
-	{
-		return;
-	}
+    if (!pm->ps->walking) {
+        return;
+    }
 
-	VectorMA( pm->ps->origin, 0.2f, pm->ps->velocity, temp );
-	temp[ 2 ] = pm->ps->origin[ 2 ] + 2;
-	if( PM_FeetOnGround( pm->ps->origin ) || PM_FeetOnGround( temp ) )
-	{
-		pm->ps->feetfalling = 0;
-		return;
-	}
+    VectorMA(pm->ps->origin, 0.2f, pm->ps->velocity, temp);
+    temp[2] = pm->ps->origin[2] + 2;
+    if (PM_FeetOnGround(pm->ps->origin) || PM_FeetOnGround(temp)) {
+        pm->ps->feetfalling = 0;
+        return;
+    }
 
-	if( pm->ps->feetfalling > 0 )
-	{
-		pm->ps->feetfalling--;
-	}
+    if (pm->ps->feetfalling > 0) {
+        pm->ps->feetfalling--;
+    }
 
-	if( !pm->ps->feetfalling )
-	{
-		if( !PM_FindBestFallPos( pm->ps->origin, pm->ps->falldir ) ) {
-			return;
-		}
+    if (!pm->ps->feetfalling) {
+        if (!PM_FindBestFallPos(pm->ps->origin, pm->ps->falldir)) {
+            return;
+        }
 
-		pm->ps->feetfalling = 5;
-	}
+        pm->ps->feetfalling = 5;
+    }
 
-	VectorMA( pm->ps->origin, 15.0f * pml.frametime, pm->ps->falldir, temp );
+    VectorMA(pm->ps->origin, 15.0f * pml.frametime, pm->ps->falldir, temp);
 
-	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, temp, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if( trace.fraction == 0 )
-	{
-		pm->ps->feetfalling = 0;
-		return;
-	}
+    pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, temp, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    if (trace.fraction == 0) {
+        pm->ps->feetfalling = 0;
+        return;
+    }
 
-	if( ( vWishdir[ 0 ] == 0.0f && vWishdir[ 1 ] == 0.0f ) ||
-		DotProduct( vWishdir, pm->ps->falldir ) > 0.0f )
-	{
-		pm->ps->walking = qfalse;
-		VectorCopy( trace.endpos, pm->ps->origin );
-	}
+    if ((vWishdir[0] == 0.0f && vWishdir[1] == 0.0f) || DotProduct(vWishdir, pm->ps->falldir) > 0.0f) {
+        pm->ps->walking = qfalse;
+        VectorCopy(trace.endpos, pm->ps->origin);
+    }
 }
 
 /*
@@ -605,90 +545,81 @@ PM_WalkMove
 
 ===================
 */
-static void PM_WalkMove( void ) {
-	int			i;
-	vec3_t		wishvel;
-	float		fmove, smove;
-	vec3_t		wishdir;
-	float		wishspeed;
-	float		scale;
-	usercmd_t	cmd;
-	float		accelerate;
+static void PM_WalkMove(void)
+{
+    int       i;
+    vec3_t    wishvel;
+    float     fmove, smove;
+    vec3_t    wishdir;
+    float     wishspeed;
+    float     scale;
+    usercmd_t cmd;
+    float     accelerate;
 
-	PM_Friction();
+    PM_Friction();
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	cmd = pm->cmd;
-	scale = PM_CmdScale( &cmd );
+    cmd   = pm->cmd;
+    scale = PM_CmdScale(&cmd);
 
-	if( ( pm->cmd.buttons & BUTTON_RUN ) && fmove && !smove )
-	{
-		pm->ps->pm_time += pml.msec;
-	}
-	else
-	{
-		pm->ps->pm_time = 0;
-	}
+    if ((pm->cmd.buttons & BUTTON_RUN) && fmove && !smove) {
+        pm->ps->pm_time += pml.msec;
+    } else {
+        pm->ps->pm_time = 0;
+    }
 
-	// project the forward and right directions onto the ground plane
-	PM_ClipVelocity( pml.flat_forward, pml.groundTrace.plane.normal, pml.flat_forward, OVERCLIP );
-	PM_ClipVelocity( pml.flat_left, pml.groundTrace.plane.normal, pml.flat_left, OVERCLIP );
-	//
-	VectorNormalize( pml.flat_forward );
-	VectorNormalize( pml.flat_left );
+    // project the forward and right directions onto the ground plane
+    PM_ClipVelocity(pml.flat_forward, pml.groundTrace.plane.normal, pml.flat_forward, OVERCLIP);
+    PM_ClipVelocity(pml.flat_left, pml.groundTrace.plane.normal, pml.flat_left, OVERCLIP);
+    //
+    VectorNormalize(pml.flat_forward);
+    VectorNormalize(pml.flat_left);
 
-	for( i = 0; i < 3; i++ )
-	{
-		wishvel[ i ] = pml.flat_forward[ i ] * fmove - pml.flat_left[ i ] * smove;
-	}
+    for (i = 0; i < 3; i++) {
+        wishvel[i] = pml.flat_forward[i] * fmove - pml.flat_left[i] * smove;
+    }
 
-	VectorCopy( wishvel, wishdir );
-	wishspeed = VectorNormalize( wishdir );
-	wishspeed *= scale;
+    VectorCopy(wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+    wishspeed *= scale;
 
-	// clamp the speed lower if wading or walking on the bottom
-	if( pm->waterlevel )
-	{
-		float	waterScale;
+    // clamp the speed lower if wading or walking on the bottom
+    if (pm->waterlevel) {
+        float waterScale;
 
-		if( pm->waterlevel == 1.0f )
-		{
-			waterScale = 0.80f;
-		}
-		else
-		{
-			waterScale = 0.5f;
-		}
+        if (pm->waterlevel == 1.0f) {
+            waterScale = 0.80f;
+        } else {
+            waterScale = 0.5f;
+        }
 
-		if( wishspeed > pm->ps->speed * waterScale ) {
-			wishspeed = pm->ps->speed * waterScale;
-		}
-	}
+        if (wishspeed > pm->ps->speed * waterScale) {
+            wishspeed = pm->ps->speed * waterScale;
+        }
+    }
 
-	if( pml.groundTrace.surfaceFlags & SURF_SLICK ) {
-		accelerate = pm_airaccelerate;
-	} else {
-		accelerate = pm_accelerate;
-	}
+    if (pml.groundTrace.surfaceFlags & SURF_SLICK) {
+        accelerate = pm_airaccelerate;
+    } else {
+        accelerate = pm_accelerate;
+    }
 
-	PM_Accelerate( wishdir, wishspeed, accelerate );
+    PM_Accelerate(wishdir, wishspeed, accelerate);
 
-	if( pml.groundTrace.surfaceFlags & SURF_SLICK ) {
-		pm->ps->velocity[ 2 ] -= pm->ps->gravity * pml.frametime;
-	}
+    if (pml.groundTrace.surfaceFlags & SURF_SLICK) {
+        pm->ps->velocity[2] -= pm->ps->gravity * pml.frametime;
+    }
 
-	// slide along the ground plane
-	PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal,
-		pm->ps->velocity, OVERCLIP );
+    // slide along the ground plane
+    PM_ClipVelocity(pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP);
 
-	// don't do anything if standing still
-	if( pm->ps->velocity[ 0 ] || pm->ps->velocity[ 1 ] )
-	{
-		PM_StepSlideMove( qtrue );
-	}
+    // don't do anything if standing still
+    if (pm->ps->velocity[0] || pm->ps->velocity[1]) {
+        PM_StepSlideMove(qtrue);
+    }
 
-	PM_CheckFeet( wishdir );
+    PM_CheckFeet(wishdir);
 }
 
 /*
@@ -696,100 +627,95 @@ static void PM_WalkMove( void ) {
 PM_DeadMove
 ==============
 */
-static void PM_DeadMove( void ) {
-	float	forward;
+static void PM_DeadMove(void)
+{
+    float forward;
 
-	if ( !pml.walking ) {
-		return;
-	}
+    if (!pml.walking) {
+        return;
+    }
 
-	// extra friction
+    // extra friction
 
-	forward = VectorLength (pm->ps->velocity);
-	forward -= 20;
-	if ( forward <= 0 ) {
-		VectorClear (pm->ps->velocity);
-	} else {
-		VectorNormalize (pm->ps->velocity);
-		VectorScale (pm->ps->velocity, forward, pm->ps->velocity);
-	}
+    forward = VectorLength(pm->ps->velocity);
+    forward -= 20;
+    if (forward <= 0) {
+        VectorClear(pm->ps->velocity);
+    } else {
+        VectorNormalize(pm->ps->velocity);
+        VectorScale(pm->ps->velocity, forward, pm->ps->velocity);
+    }
 }
 
-
 /*
 ===============
 PM_NoclipMove
 ===============
 */
-static void PM_NoclipMove( void )
+static void PM_NoclipMove(void)
 {
-	float	   speed;
-	float    drop;
-	float    friction;
-	float    control;
-	float    newspeed;
-	int		i;
-	vec3_t	wishvel;
-	float		fmove;
-	float    smove;
-	vec3_t	wishdir;
-	float		wishspeed;
-	float		scale;
+    float  speed;
+    float  drop;
+    float  friction;
+    float  control;
+    float  newspeed;
+    int    i;
+    vec3_t wishvel;
+    float  fmove;
+    float  smove;
+    vec3_t wishdir;
+    float  wishspeed;
+    float  scale;
 
-	pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-	pm->ps->groundEntityNum = ENTITYNUM_NONE;
+    pm->ps->viewheight      = DEFAULT_VIEWHEIGHT;
+    pm->ps->groundEntityNum = ENTITYNUM_NONE;
 
-	// friction
+    // friction
 
-	speed = VectorLength( pm->ps->velocity );
-	if( speed < 1 )
-	{
-		VectorCopy( vec3_origin, pm->ps->velocity );
-	}
-	else
-	{
-		drop = 0;
+    speed = VectorLength(pm->ps->velocity);
+    if (speed < 1) {
+        VectorCopy(vec3_origin, pm->ps->velocity);
+    } else {
+        drop = 0;
 
-		// extra friction
-		friction = pm_friction * 1.5;
+        // extra friction
+        friction = pm_friction * 1.5;
 
-		control = speed < pm_stopspeed ? pm_stopspeed : speed;
-		drop += control * friction * pml.frametime;
+        control = speed < pm_stopspeed ? pm_stopspeed : speed;
+        drop += control * friction * pml.frametime;
 
-		// scale the velocity
-		newspeed = speed - drop;
-		if( newspeed < 0 )
-		{
-			newspeed = 0;
-		}
-		newspeed /= speed;
+        // scale the velocity
+        newspeed = speed - drop;
+        if (newspeed < 0) {
+            newspeed = 0;
+        }
+        newspeed /= speed;
 
-		VectorScale( pm->ps->velocity, newspeed, pm->ps->velocity );
-	}
+        VectorScale(pm->ps->velocity, newspeed, pm->ps->velocity);
+    }
 
-	// accelerate
-	// allow the player to move twice as fast in noclip
-	scale = PM_CmdScale( &pm->cmd ) * 2;
+    // accelerate
+    // allow the player to move twice as fast in noclip
+    scale = PM_CmdScale(&pm->cmd) * 2;
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	pm->ps->pm_time = 0;
+    pm->ps->pm_time = 0;
 
-	for( i = 0; i < 3; i++ )
-	{
-		wishvel[ i ] = pml.flat_forward[ i ] * fmove - pml.flat_left[ i ] * smove;
-	}
+    for (i = 0; i < 3; i++) {
+        wishvel[i] = pml.flat_forward[i] * fmove - pml.flat_left[i] * smove;
+    }
 
-	wishvel[ 2 ] += pm->cmd.upmove;
+    wishvel[2] += pm->cmd.upmove;
 
-	VectorCopy( wishvel, wishdir );
-	wishspeed = VectorNormalize( wishdir );
-	wishspeed *= scale;
+    VectorCopy(wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+    wishspeed *= scale;
 
-	PM_Accelerate( wishdir, wishspeed, pm_accelerate );
+    PM_Accelerate(wishdir, wishspeed, pm_accelerate);
 
-	// move
-	VectorMA( pm->ps->origin, pml.frametime, pm->ps->velocity, pm->ps->origin );
+    // move
+    VectorMA(pm->ps->origin, pml.frametime, pm->ps->velocity, pm->ps->origin);
 }
 
 //============================================================================
@@ -801,74 +727,62 @@ PM_CrashLand
 Check for hard landings that generate sound events
 =================
 */
-static void PM_CrashLand( void )
+static void PM_CrashLand(void)
 {
-	float delta;
-	float	dist;
-	float	vel;
-	float	acc;
-	float	t;
-	float	a, b, c, den;
+    float delta;
+    float dist;
+    float vel;
+    float acc;
+    float t;
+    float a, b, c, den;
 
-	// calculate the exact velocity on landing
-	dist = pm->ps->origin[ 2 ] - pml.previous_origin[ 2 ];
-	vel = pml.previous_velocity[ 2 ];
-	acc = -pm->ps->gravity;
+    // calculate the exact velocity on landing
+    dist = pm->ps->origin[2] - pml.previous_origin[2];
+    vel  = pml.previous_velocity[2];
+    acc  = -pm->ps->gravity;
 
-	a = acc / 2;
-	b = vel;
-	c = -dist;
+    a = acc / 2;
+    b = vel;
+    c = -dist;
 
-	den = b * b - 4 * a * c;
-	if( den < 0 )
-	{
-		return;
-	}
+    den = b * b - 4 * a * c;
+    if (den < 0) {
+        return;
+    }
 
-	//t = ( -b - sqrt( den ) ) / ( 2 * a );
-	t = sqrt( den ) + vel;
+    //t = ( -b - sqrt( den ) ) / ( 2 * a );
+    t = sqrt(den) + vel;
 
-	//delta = vel + t * acc;
-	delta = vel - t;
-	delta = delta * delta * 0.0001;
+    //delta = vel + t * acc;
+    delta = vel - t;
+    delta = delta * delta * 0.0001;
 
-	// reduce falling damage if there is standing water
-	if( pm->waterlevel == 2 )
-	{
-		delta *= 0.25f;
-	}
+    // reduce falling damage if there is standing water
+    if (pm->waterlevel == 2) {
+        delta *= 0.25f;
+    }
 
-	if( pm->waterlevel == 1 )
-	{
-		delta *= 0.5f;
-	}
+    if (pm->waterlevel == 1) {
+        delta *= 0.5f;
+    }
 
-	if( delta < 1 )
-	{
-		return;
-	}
+    if (delta < 1) {
+        return;
+    }
 
-	// SURF_NODAMAGE is used for bounce pads where you don't ever
-	// want to take damage or play a crunch sound
-	if( !( pml.groundTrace.surfaceFlags & SURF_NODAMAGE ) )
-	{
-		if( delta > 100 )
-		{
-			pm->pmoveEvent = EV_FALL_FATAL;
-		}
-		else if( delta > 80 )
-		{
-			pm->pmoveEvent = EV_FALL_FAR;
-		}
-		else if( delta > 40 )
-		{
-			pm->pmoveEvent = EV_FALL_MEDIUM;
-		}
-		else if( delta > 20 )
-		{
-			pm->pmoveEvent = EV_FALL_SHORT;
-		}
-	}
+    // SURF_NODAMAGE is used for bounce pads where you don't ever
+    // want to take damage or play a crunch sound
+    if (!(pml.groundTrace.surfaceFlags & SURF_NODAMAGE)) {
+        if (delta > 100) {
+            pm->pmoveEvent = EV_FALL_FATAL;
+        } else if (delta > 80) {
+            pm->pmoveEvent = EV_FALL_FAR;
+        } else if (delta > 40) {
+            pm->pmoveEvent = EV_FALL_MEDIUM;
+        } else if (delta > 20) {
+            pm->pmoveEvent = EV_FALL_SHORT;
+        }
+    }
 }
 
 /*
@@ -892,43 +806,45 @@ void PM_CheckStuck(void) {
 PM_CorrectAllSolid
 =============
 */
-static int PM_CorrectAllSolid( trace_t *trace )
+static int PM_CorrectAllSolid(trace_t *trace)
 {
-	int			i, j, k;
-	vec3_t		point;
+    int    i, j, k;
+    vec3_t point;
 
-	if ( pm->debugLevel ) {
-		Com_Printf("%i:allsolid\n", c_pmove);
-	}
+    if (pm->debugLevel) {
+        Com_Printf("%i:allsolid\n", c_pmove);
+    }
 
-	// jitter around
-	for (i = -1; i <= 1; i++) {
-		for (j = -1; j <= 1; j++) {
-			for (k = -1; k <= 1; k++) {
-				VectorCopy(pm->ps->origin, point);
-				point[0] += (float) i;
-				point[1] += (float) j;
-				point[2] += (float) k;
-				pm->trace( trace, point, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false );
-				if ( !trace->allsolid && !trace->startsolid ) {
-					point[0] = pm->ps->origin[0];
-					point[1] = pm->ps->origin[1];
-					point[2] = pm->ps->origin[2] - 0.25;
+    // jitter around
+    for (i = -1; i <= 1; i++) {
+        for (j = -1; j <= 1; j++) {
+            for (k = -1; k <= 1; k++) {
+                VectorCopy(pm->ps->origin, point);
+                point[0] += (float)i;
+                point[1] += (float)j;
+                point[2] += (float)k;
+                pm->trace(trace, point, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false);
+                if (!trace->allsolid && !trace->startsolid) {
+                    point[0] = pm->ps->origin[0];
+                    point[1] = pm->ps->origin[1];
+                    point[2] = pm->ps->origin[2] - 0.25;
 
-					pm->trace( trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false );
-					pml.groundTrace = *trace;
-					pm->ps->groundTrace = *trace;
-					return qtrue;
-				}
-			}
-		}
-	}
+                    pm->trace(
+                        trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false
+                    );
+                    pml.groundTrace     = *trace;
+                    pm->ps->groundTrace = *trace;
+                    return qtrue;
+                }
+            }
+        }
+    }
 
-	//pm->ps->groundEntityNum = ENTITYNUM_NONE;
-	//pml.groundPlane = qfalse;
-	//pml.walking = qfalse;
+    //pm->ps->groundEntityNum = ENTITYNUM_NONE;
+    //pml.groundPlane = qfalse;
+    //pml.walking = qfalse;
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -936,146 +852,140 @@ static int PM_CorrectAllSolid( trace_t *trace )
 PM_GroundTrace
 =============
 */
-static void PM_GroundTrace( void ) {
-	vec3_t		point;
-	trace_t		trace;
+static void PM_GroundTrace(void)
+{
+    vec3_t  point;
+    trace_t trace;
 
-	point[ 0 ] = pm->ps->origin[ 0 ];
-	point[ 1 ] = pm->ps->origin[ 1 ];
-	point[ 2 ] = pm->ps->origin[ 2 ] - 0.25f;
+    point[0] = pm->ps->origin[0];
+    point[1] = pm->ps->origin[1];
+    point[2] = pm->ps->origin[2] - 0.25f;
 
-	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+    pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-	pml.groundTrace = trace;
-	pm->ps->groundTrace = trace;
+    pml.groundTrace     = trace;
+    pm->ps->groundTrace = trace;
 
-	// do something corrective if the trace starts in a solid...
-	if ( trace.allsolid || trace.startsolid )
-	{
-		if( !PM_CorrectAllSolid( &trace ) ) {
-			trace.fraction = 1.0f;
-		}
-	}
+    // do something corrective if the trace starts in a solid...
+    if (trace.allsolid || trace.startsolid) {
+        if (!PM_CorrectAllSolid(&trace)) {
+            trace.fraction = 1.0f;
+        }
+    }
 
-	// if the trace didn't hit anything, we are in free fall
-	if ( trace.fraction == 1.0 )
-	{
-		pm->ps->groundEntityNum = ENTITYNUM_NONE;
-		pml.groundPlane = qfalse;
-		pml.walking = qfalse;
+    // if the trace didn't hit anything, we are in free fall
+    if (trace.fraction == 1.0) {
+        pm->ps->groundEntityNum = ENTITYNUM_NONE;
+        pml.groundPlane         = qfalse;
+        pml.walking             = qfalse;
 
-		pm->ps->walking = pml.walking;
-		pm->ps->groundPlane = pml.groundPlane;
-		return;
-	}
+        pm->ps->walking     = pml.walking;
+        pm->ps->groundPlane = pml.groundPlane;
+        return;
+    }
 
-	// check if getting thrown off the ground
-	if( pm->ps->velocity[ 2 ] > 0.0f && DotProduct( pm->ps->velocity, trace.plane.normal ) > 150.0f )
-	{
-		if ( pm->debugLevel ) {
-			Com_Printf("%i:kickoff\n", c_pmove);
-		}
+    // check if getting thrown off the ground
+    if (pm->ps->velocity[2] > 0.0f && DotProduct(pm->ps->velocity, trace.plane.normal) > 150.0f) {
+        if (pm->debugLevel) {
+            Com_Printf("%i:kickoff\n", c_pmove);
+        }
 
-		pm->ps->groundEntityNum = ENTITYNUM_NONE;
-		pml.groundPlane = qfalse;
-		pml.walking = qfalse;
+        pm->ps->groundEntityNum = ENTITYNUM_NONE;
+        pml.groundPlane         = qfalse;
+        pml.walking             = qfalse;
 
-		pm->ps->walking = pml.walking;
-		pm->ps->groundPlane = pml.groundPlane;
-		return;
-	}
+        pm->ps->walking     = pml.walking;
+        pm->ps->groundPlane = pml.groundPlane;
+        return;
+    }
 
-	// slopes that are too steep will not be considered onground
-	if( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-	{
-		vec3_t oldvel;
-		float d;
+    // slopes that are too steep will not be considered onground
+    if (trace.plane.normal[2] < MIN_WALK_NORMAL) {
+        vec3_t oldvel;
+        float  d;
 
-		if ( pm->debugLevel ) {
-			Com_Printf("%i:steep\n", c_pmove);
-		}
+        if (pm->debugLevel) {
+            Com_Printf("%i:steep\n", c_pmove);
+        }
 
-		VectorCopy( pm->ps->velocity, oldvel );
-		VectorSet( pm->ps->velocity, 0, 0, -1.0f / pml.frametime );
-		PM_SlideMove( qfalse );
+        VectorCopy(pm->ps->velocity, oldvel);
+        VectorSet(pm->ps->velocity, 0, 0, -1.0f / pml.frametime);
+        PM_SlideMove(qfalse);
 
-		d = VectorLength( pm->ps->velocity );
-		VectorCopy( oldvel, pm->ps->velocity );
+        d = VectorLength(pm->ps->velocity);
+        VectorCopy(oldvel, pm->ps->velocity);
 
-		if( d > ( 0.1f / pml.frametime ) )
-		{
-			pm->ps->groundEntityNum = ENTITYNUM_NONE;
-			pml.groundPlane = qtrue;
-			pml.walking = qfalse;
+        if (d > (0.1f / pml.frametime)) {
+            pm->ps->groundEntityNum = ENTITYNUM_NONE;
+            pml.groundPlane         = qtrue;
+            pml.walking             = qfalse;
 
-			pm->ps->walking = pml.walking;
-			pm->ps->groundPlane = pml.groundPlane;
-			return;
-		}
-	}
+            pm->ps->walking     = pml.walking;
+            pm->ps->groundPlane = pml.groundPlane;
+            return;
+        }
+    }
 
-	pml.groundPlane = qtrue;
-	pml.walking = qtrue;
+    pml.groundPlane = qtrue;
+    pml.walking     = qtrue;
 
-	if ( pm->ps->groundEntityNum == ENTITYNUM_NONE )
-	{
-		// just hit the ground
-		if ( pm->debugLevel ) {
-			Com_Printf( "%i:Land\n", c_pmove );
-		}
+    if (pm->ps->groundEntityNum == ENTITYNUM_NONE) {
+        // just hit the ground
+        if (pm->debugLevel) {
+            Com_Printf("%i:Land\n", c_pmove);
+        }
 
-		PM_CrashLand();
-	}
+        PM_CrashLand();
+    }
 
-	pm->ps->groundEntityNum = trace.entityNum;
+    pm->ps->groundEntityNum = trace.entityNum;
 
-	PM_AddTouchEnt( trace.entityNum );
+    PM_AddTouchEnt(trace.entityNum);
 
-	pm->ps->walking = pml.walking;
-	pm->ps->groundPlane = pml.groundPlane;
+    pm->ps->walking     = pml.walking;
+    pm->ps->groundPlane = pml.groundPlane;
 }
 
-
 /*
 =============
 PM_SetWaterLevel	FIXME: avoid this twice?  certainly if not moving
 =============
 */
-static void PM_SetWaterLevel( void ) {
-	vec3_t		point;
-	int			cont;
-	int			sample1;
-	int			sample2;
+static void PM_SetWaterLevel(void)
+{
+    vec3_t point;
+    int    cont;
+    int    sample1;
+    int    sample2;
 
-	//
-	// get waterlevel, accounting for ducking
-	//
-	pm->waterlevel = 0;
-	pm->watertype = 0;
+    //
+    // get waterlevel, accounting for ducking
+    //
+    pm->waterlevel = 0;
+    pm->watertype  = 0;
 
-	point[0] = pm->ps->origin[0];
-	point[1] = pm->ps->origin[1];
-	point[2] = pm->ps->origin[2] + MINS_Z + 1;
-	cont = pm->pointcontents( point, pm->ps->clientNum );
+    point[0] = pm->ps->origin[0];
+    point[1] = pm->ps->origin[1];
+    point[2] = pm->ps->origin[2] + MINS_Z + 1;
+    cont     = pm->pointcontents(point, pm->ps->clientNum);
 
-	if ( cont & MASK_WATER ) {
-		sample2 = pm->ps->viewheight - MINS_Z;
-		sample1 = sample2 / 2;
-
-		pm->watertype = cont;
-		pm->waterlevel = 1;
-		point[2] = pm->ps->origin[2] + MINS_Z + sample1;
-		cont = pm->pointcontents (point, pm->ps->clientNum );
-		if ( cont & MASK_WATER ) {
-			pm->waterlevel = 2;
-			point[2] = pm->ps->origin[2] + MINS_Z + sample2;
-			cont = pm->pointcontents (point, pm->ps->clientNum );
-			if ( cont & MASK_WATER ){
-				pm->waterlevel = 3;
-			}
-		}
-	}
+    if (cont & MASK_WATER) {
+        sample2 = pm->ps->viewheight - MINS_Z;
+        sample1 = sample2 / 2;
 
+        pm->watertype  = cont;
+        pm->waterlevel = 1;
+        point[2]       = pm->ps->origin[2] + MINS_Z + sample1;
+        cont           = pm->pointcontents(point, pm->ps->clientNum);
+        if (cont & MASK_WATER) {
+            pm->waterlevel = 2;
+            point[2]       = pm->ps->origin[2] + MINS_Z + sample2;
+            cont           = pm->pointcontents(point, pm->ps->clientNum);
+            if (cont & MASK_WATER) {
+                pm->waterlevel = 3;
+            }
+        }
+    }
 }
 
 /*
@@ -1085,159 +995,134 @@ PM_CheckDuck
 Sets mins, maxs, and pm->ps->viewheight
 ==============
 */
-static void PM_CheckDuck( void )
+static void PM_CheckDuck(void)
 {
-	pm->mins[ 0 ] = -15.0f;
-	pm->mins[ 1 ] = -15.0f;
+    pm->mins[0] = -15.0f;
+    pm->mins[1] = -15.0f;
 
-	pm->maxs[ 0 ] = 15.0f;
-	pm->maxs[ 1 ] = 15.0f;
+    pm->maxs[0] = 15.0f;
+    pm->maxs[1] = 15.0f;
 
-	pm->mins[ 2 ] = MINS_Z;
+    pm->mins[2] = MINS_Z;
 
-	if( pm->ps->pm_type == PM_DEAD )
-	{
-		pm->maxs[ 2 ] = DEAD_MINS_Z;
-		pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		return;
-	}
+    if (pm->ps->pm_type == PM_DEAD) {
+        pm->maxs[2]        = DEAD_MINS_Z;
+        pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        return;
+    }
 
-	if (pm->protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		//
-		// Prone was removed in 2.0
-		//
-		if (pm->ps->pm_flags & PMF_DUCKED)
-		{
-			pm->maxs[2] = 54.f;
-			pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START)
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
-		}
-		else
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-		}
-	} else {
-		if ((pm->ps->pm_flags & (PMF_DUCKED | PMF_VIEW_PRONE)) == (PMF_DUCKED | PMF_VIEW_PRONE))
-		{
-			pm->maxs[2] = 54.0f;
-			pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_DUCKED)
-		{
-			pm->maxs[2] = 60.0f;
-			pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_PRONE)
-		{
-			pm->maxs[2] = 20.0f;
-			pm->ps->viewheight = PRONE_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_DUCK_RUN)
-		{
-			pm->maxs[2] = 94.0f;
-			pm->mins[2] = 54.0f;
-			pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START)
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
-		}
-		else
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-		}
-	}
+    if (pm->protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        //
+        // Prone was removed in 2.0
+        //
+        if (pm->ps->pm_flags & PMF_DUCKED) {
+            pm->maxs[2]        = 54.f;
+            pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START) {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
+        } else {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
+        }
+    } else {
+        if ((pm->ps->pm_flags & (PMF_DUCKED | PMF_VIEW_PRONE)) == (PMF_DUCKED | PMF_VIEW_PRONE)) {
+            pm->maxs[2]        = 54.0f;
+            pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_DUCKED) {
+            pm->maxs[2]        = 60.0f;
+            pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_PRONE) {
+            pm->maxs[2]        = 20.0f;
+            pm->ps->viewheight = PRONE_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_DUCK_RUN) {
+            pm->maxs[2]        = 94.0f;
+            pm->mins[2]        = 54.0f;
+            pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START) {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
+        } else {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
+        }
+    }
 }
 
-
-
 //===================================================================
 
-
 /*
 ===============
 PM_Footsteps
 ===============
 */
-static void PM_Footsteps( void ) {
-	float		bobmove;
-	int			old;
-	qboolean	footstep;
+static void PM_Footsteps(void)
+{
+    float    bobmove;
+    int      old;
+    qboolean footstep;
 
-	//
-	// calculate speed and cycle to be used for
-	// all cyclic walking effects
-	//
-	pm->xyspeed = sqrt( pm->ps->velocity[0] * pm->ps->velocity[0]
-		+  pm->ps->velocity[1] * pm->ps->velocity[1] );
+    //
+    // calculate speed and cycle to be used for
+    // all cyclic walking effects
+    //
+    pm->xyspeed = sqrt(pm->ps->velocity[0] * pm->ps->velocity[0] + pm->ps->velocity[1] * pm->ps->velocity[1]);
 
-	if ( pm->ps->groundEntityNum == ENTITYNUM_NONE ) {
+    if (pm->ps->groundEntityNum == ENTITYNUM_NONE) {
+        //		if ( pm->ps->powerups[PW_INVULNERABILITY] ) {
+        //			PM_ContinueLegsAnim( LEGS_IDLECR );
+        //		}
+        // airborne leaves position in cycle intact, but doesn't advance
+        if (pm->waterlevel > 1) {
+            //			PM_ContinueLegsAnim( LEGS_SWIM );
+        }
+        return;
+    }
 
-//		if ( pm->ps->powerups[PW_INVULNERABILITY] ) {
-//			PM_ContinueLegsAnim( LEGS_IDLECR );
-//		}
-		// airborne leaves position in cycle intact, but doesn't advance
-		if ( pm->waterlevel > 1 ) {
-//			PM_ContinueLegsAnim( LEGS_SWIM );
-		}
-		return;
-	}
+    // if not trying to move
+    if (!pm->cmd.forwardmove && !pm->cmd.rightmove) {
+        if (pm->xyspeed < 5) {
+            pm->ps->bobCycle = 0; // start at beginning of cycle again
+            if (pm->ps->pm_flags & PMF_DUCKED) {
+                //				PM_ContinueLegsAnim( LEGS_IDLECR );
+            } else {
+                //				PM_ContinueLegsAnim( LEGS_IDLE );
+            }
+        }
+        return;
+    }
 
-	// if not trying to move
-	if ( !pm->cmd.forwardmove && !pm->cmd.rightmove ) {
-		if (  pm->xyspeed < 5 ) {
-			pm->ps->bobCycle = 0;	// start at beginning of cycle again
-			if ( pm->ps->pm_flags & PMF_DUCKED ) {
-//				PM_ContinueLegsAnim( LEGS_IDLECR );
-			} else {
-//				PM_ContinueLegsAnim( LEGS_IDLE );
-			}
-		}
-		return;
-	}
+    footstep = qfalse;
 
+    if (!(pm->cmd.buttons & BUTTON_RUN)) {
+        bobmove = 0.4f; // faster speeds bob faster
 
-	footstep = qfalse;
+        footstep = qtrue;
+    } else {
+        bobmove = 0.3f; // walking bobs slow
+    }
 
+    // check for footstep / splash sounds
+    old              = pm->ps->bobCycle;
+    pm->ps->bobCycle = (int)(old + bobmove * pml.msec) & 255;
 
-	if( !( pm->cmd.buttons & BUTTON_RUN ) )
-	{
-		bobmove = 0.4f;	// faster speeds bob faster
-
-		footstep = qtrue;
-	} else {
-		bobmove = 0.3f;	// walking bobs slow
-	}
-
-	// check for footstep / splash sounds
-	old = pm->ps->bobCycle;
-	pm->ps->bobCycle = (int)( old + bobmove * pml.msec ) & 255;
-
-	// if we just crossed a cycle boundary, play an apropriate footstep event
-	if ( ( ( old + 64 ) ^ ( pm->ps->bobCycle + 64 ) ) & 128 ) {
-		if ( pm->waterlevel == 0 ) {
-			// on ground will only play sounds if running
-			if ( footstep && !pm->noFootsteps ) {
-//				PM_AddEvent( PM_FootstepForSurface() );
-			}
-		} else if ( pm->waterlevel == 1 ) {
-			// splashing
-//			PM_AddEvent( EV_FOOTSPLASH );
-		} else if ( pm->waterlevel == 2 ) {
-			// wading / swimming at surface
-//			PM_AddEvent( EV_SWIM );
-		} else if ( pm->waterlevel == 3 ) {
-			// no sound when completely underwater
-
-		}
-	}
+    // if we just crossed a cycle boundary, play an apropriate footstep event
+    if (((old + 64) ^ (pm->ps->bobCycle + 64)) & 128) {
+        if (pm->waterlevel == 0) {
+            // on ground will only play sounds if running
+            if (footstep && !pm->noFootsteps) {
+                //				PM_AddEvent( PM_FootstepForSurface() );
+            }
+        } else if (pm->waterlevel == 1) {
+            // splashing
+            //			PM_AddEvent( EV_FOOTSPLASH );
+        } else if (pm->waterlevel == 2) {
+            // wading / swimming at surface
+            //			PM_AddEvent( EV_SWIM );
+        } else if (pm->waterlevel == 3) {
+            // no sound when completely underwater
+        }
+    }
 }
 
 /*
@@ -1247,62 +1132,51 @@ PM_WaterEvents
 Generate sound events for entering and leaving water
 ==============
 */
-static void PM_WaterEvents( void )
+static void PM_WaterEvents(void)
 {
-	// FIXME?
-	//
-	// if just entered a water volume, play a sound
-	//
-	if( !pml.previous_waterlevel && pm->waterlevel )
-	{
-		pm->pmoveEvent = EV_WATER_TOUCH;
-	}
+    // FIXME?
+    //
+    // if just entered a water volume, play a sound
+    //
+    if (!pml.previous_waterlevel && pm->waterlevel) {
+        pm->pmoveEvent = EV_WATER_TOUCH;
+    }
 
-	//
-	// if just completely exited a water volume, play a sound
-	//
-	if( pml.previous_waterlevel && !pm->waterlevel )
-	{
-		pm->pmoveEvent = EV_WATER_LEAVE;
-	}
+    //
+    // if just completely exited a water volume, play a sound
+    //
+    if (pml.previous_waterlevel && !pm->waterlevel) {
+        pm->pmoveEvent = EV_WATER_LEAVE;
+    }
 
-	//
-	// check for head just going under water
-	//
-	if( ( pml.previous_waterlevel != 3 ) && ( pm->waterlevel == 3 ) )
-	{
-		pm->pmoveEvent = EV_WATER_UNDER;
-	}
+    //
+    // check for head just going under water
+    //
+    if ((pml.previous_waterlevel != 3) && (pm->waterlevel == 3)) {
+        pm->pmoveEvent = EV_WATER_UNDER;
+    }
 
-	//
-	// check for head just coming out of water
-	//
-	if( ( pml.previous_waterlevel == 3 ) && ( pm->waterlevel != 3 ) )
-	{
-		pm->pmoveEvent = EV_WATER_CLEAR;
-	}
+    //
+    // check for head just coming out of water
+    //
+    if ((pml.previous_waterlevel == 3) && (pm->waterlevel != 3)) {
+        pm->pmoveEvent = EV_WATER_CLEAR;
+    }
 }
 
-
 /*
 ===============
 PM_BeginWeaponChange
 ===============
 */
-static void PM_BeginWeaponChange( int weapon ) {
-
-}
-
+static void PM_BeginWeaponChange(int weapon) {}
 
 /*
 ===============
 PM_FinishWeaponChange
 ===============
 */
-static void PM_FinishWeaponChange( void ) {
-	
-}
-
+static void PM_FinishWeaponChange(void) {}
 
 /*
 ==============
@@ -1310,18 +1184,18 @@ PM_TorsoAnimation
 
 ==============
 */
-static void PM_TorsoAnimation( void ) {
-	//if ( pm->ps->weaponstate == WEAPON_READY ) {
-	//	if ( pm->ps->weapon == WP_GAUNTLET ) {
-	//		PM_ContinueTorsoAnim( TORSO_STAND2 );
-	//	} else {
-	//		PM_ContinueTorsoAnim( TORSO_STAND );
-	//	}
-	//	return;
-	//}
+static void PM_TorsoAnimation(void)
+{
+    //if ( pm->ps->weaponstate == WEAPON_READY ) {
+    //	if ( pm->ps->weapon == WP_GAUNTLET ) {
+    //		PM_ContinueTorsoAnim( TORSO_STAND2 );
+    //	} else {
+    //		PM_ContinueTorsoAnim( TORSO_STAND );
+    //	}
+    //	return;
+    //}
 }
 
-
 /*
 ==============
 PM_Weapon
@@ -1329,9 +1203,7 @@ PM_Weapon
 Generates weapon events and modifes the weapon counter
 ==============
 */
-static void PM_Weapon( void ) {
-	
-}
+static void PM_Weapon(void) {}
 
 /*
 ================
@@ -1339,19 +1211,16 @@ PM_Animate
 ================
 */
 
-static void PM_Animate( void ) {
-
-}
-
+static void PM_Animate(void) {}
 
 /*
 ================
 PM_DropTimers
 ================
 */
-static void PM_DropTimers( void )
+static void PM_DropTimers(void)
 {
-	pm->ps->pm_flags &= ~PMF_RESPAWNED;
+    pm->ps->pm_flags &= ~PMF_RESPAWNED;
 }
 
 /*
@@ -1362,47 +1231,39 @@ This can be used as another entry point when only the viewangles
 are being updated isntead of a full move
 ================
 */
-void PM_UpdateViewAngles( playerState_t *ps, const usercmd_t *cmd )
+void PM_UpdateViewAngles(playerState_t *ps, const usercmd_t *cmd)
 {
-	short	temp;
-	int	i;
+    short temp;
+    int   i;
 
-	if( ps->pm_flags & PMF_FROZEN )
-	{
-		// no view changes at all
-		return;
-	}
+    if (ps->pm_flags & PMF_FROZEN) {
+        // no view changes at all
+        return;
+    }
 
-	if( ps->stats[ STAT_HEALTH ] <= 0 )
-	{
-		// no view changes at all
-		return;
-	}
+    if (ps->stats[STAT_HEALTH] <= 0) {
+        // no view changes at all
+        return;
+    }
 
-	// circularly clamp the angles with deltas
-	for( i = 0; i < 3; i++ )
-	{
-		temp = cmd->angles[ i ] + ps->delta_angles[ i ];
-		if( i == PITCH )
-		{
-			// don't let the player look up or down more than 90 degrees
-			if( temp > 16000 )
-			{
-				ps->delta_angles[ i ] = 16000 - cmd->angles[ i ];
-				temp = 16000;
-			}
-			else if( temp < -16000 )
-			{
-				ps->delta_angles[ i ] = -16000 - cmd->angles[ i ];
-				temp = -16000;
-			}
-		}
+    // circularly clamp the angles with deltas
+    for (i = 0; i < 3; i++) {
+        temp = cmd->angles[i] + ps->delta_angles[i];
+        if (i == PITCH) {
+            // don't let the player look up or down more than 90 degrees
+            if (temp > 16000) {
+                ps->delta_angles[i] = 16000 - cmd->angles[i];
+                temp                = 16000;
+            } else if (temp < -16000) {
+                ps->delta_angles[i] = -16000 - cmd->angles[i];
+                temp                = -16000;
+            }
+        }
 
-		ps->viewangles[ i ] = SHORT2ANGLE( temp );
-	}
+        ps->viewangles[i] = SHORT2ANGLE(temp);
+    }
 }
 
-
 /*
 ================
 PmoveSingle
@@ -1410,242 +1271,216 @@ PmoveSingle
 ================
 */
 
-void PmoveSingle( pmove_t *pmove )
+void PmoveSingle(pmove_t *pmove)
 {
-	vec3_t tempVec;
-	qboolean walking;
+    vec3_t   tempVec;
+    qboolean walking;
 
-	pm = pmove;
+    pm = pmove;
 
-	// this counter lets us debug movement problems with a journal
-	// by setting a conditional breakpoint fot the previous frame
-	c_pmove++;
+    // this counter lets us debug movement problems with a journal
+    // by setting a conditional breakpoint fot the previous frame
+    c_pmove++;
 
-	// clear results
-	pm->numtouch = 0;
-	pm->watertype = 0;
-	pm->waterlevel = 0;
+    // clear results
+    pm->numtouch   = 0;
+    pm->watertype  = 0;
+    pm->waterlevel = 0;
 
-	if( pm->ps->stats[ STAT_HEALTH ] <= 0 ) {
-		pm->tracemask &= ~( CONTENTS_BODY | CONTENTS_NOBOTCLIP );	// corpses can fly through bodies
-	}
+    if (pm->ps->stats[STAT_HEALTH] <= 0) {
+        pm->tracemask &= ~(CONTENTS_BODY | CONTENTS_NOBOTCLIP); // corpses can fly through bodies
+    }
 
-	if( pmove->cmd.buttons & BUTTON_TALK )
-	{
-		pmove->cmd.forwardmove = 0;
-		pmove->cmd.rightmove = 0;
-		pmove->cmd.upmove = 0;
-		pmove->cmd.buttons = BUTTON_TALK;
-		pm->ps->fLeanAngle = 0.0f;
-	}
+    if (pmove->cmd.buttons & BUTTON_TALK) {
+        pmove->cmd.forwardmove = 0;
+        pmove->cmd.rightmove   = 0;
+        pmove->cmd.upmove      = 0;
+        pmove->cmd.buttons     = BUTTON_TALK;
+        pm->ps->fLeanAngle     = 0.0f;
+    }
 
-	if( pm->ps->pm_type == PM_CLIMBWALL )
-	{
-		pm->ps->fLeanAngle = 0.0f;
-		pm->cmd.buttons &= ~( BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT );
-	}
+    if (pm->ps->pm_type == PM_CLIMBWALL) {
+        pm->ps->fLeanAngle = 0.0f;
+        pm->cmd.buttons &= ~(BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT);
+    }
 
-	// clear all pmove local vars
-	memset( &pml, 0, sizeof( pml ) );
+    // clear all pmove local vars
+    memset(&pml, 0, sizeof(pml));
 
-	// determine the time
-	pml.msec = pmove->cmd.serverTime - pm->ps->commandTime;
-	if ( pml.msec < 1 ) {
-		pml.msec = 1;
-	} else if ( pml.msec > 200 ) {
-		pml.msec = 200;
-	}
+    // determine the time
+    pml.msec = pmove->cmd.serverTime - pm->ps->commandTime;
+    if (pml.msec < 1) {
+        pml.msec = 1;
+    } else if (pml.msec > 200) {
+        pml.msec = 200;
+    }
 
-	pm->ps->commandTime = pmove->cmd.serverTime;
+    pm->ps->commandTime = pmove->cmd.serverTime;
 
-	// save old org in case we get stuck
-	VectorCopy( pm->ps->origin, pml.previous_origin );
+    // save old org in case we get stuck
+    VectorCopy(pm->ps->origin, pml.previous_origin);
 
-	// save old velocity for crashlanding
-	VectorCopy( pm->ps->velocity, pml.previous_velocity );
+    // save old velocity for crashlanding
+    VectorCopy(pm->ps->velocity, pml.previous_velocity);
 
-	pml.frametime = pml.msec * 0.001;
+    pml.frametime = pml.msec * 0.001;
 
-    if ((pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT) &&
-        (pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)) != (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)) &&
-        (!pm->cmd.forwardmove || pm->alwaysAllowLean) &&
-        (!pm->cmd.rightmove || pm->alwaysAllowLean) &&
-        (!pm->cmd.upmove || pm->alwaysAllowLean))
-	{
-		if( pm->cmd.buttons & BUTTON_LEAN_LEFT )
-		{
-			if( pm->ps->fLeanAngle <= -pm->leanMax)
-			{
-				pm->ps->fLeanAngle = -pm->leanMax;
-			}
-			else
-			{
-				float fAngle = pml.frametime * ( -pm->leanMax - pm->ps->fLeanAngle ) * pm->leanAdd;
-				float fLeanAngle = pml.frametime * -pm->leanSpeed;
+    if ((pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)
+         && (pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)) != (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT))
+        && (!pm->cmd.forwardmove || pm->alwaysAllowLean) && (!pm->cmd.rightmove || pm->alwaysAllowLean)
+        && (!pm->cmd.upmove || pm->alwaysAllowLean)) {
+        if (pm->cmd.buttons & BUTTON_LEAN_LEFT) {
+            if (pm->ps->fLeanAngle <= -pm->leanMax) {
+                pm->ps->fLeanAngle = -pm->leanMax;
+            } else {
+                float fAngle     = pml.frametime * (-pm->leanMax - pm->ps->fLeanAngle) * pm->leanAdd;
+                float fLeanAngle = pml.frametime * -pm->leanSpeed;
 
-				if( fAngle <= fLeanAngle ) {
-					fLeanAngle = fAngle;
-				}
+                if (fAngle <= fLeanAngle) {
+                    fLeanAngle = fAngle;
+                }
 
-				pm->ps->fLeanAngle += fLeanAngle;
-			}
-		}
-		else
-		{
-			if( pm->ps->fLeanAngle >= pm->leanMax )
-			{
-				pm->ps->fLeanAngle = pm->leanMax;
-			}
-			else
-			{
-				float fAngle = pm->leanMax - pm->ps->fLeanAngle;
-				float fLeanAngle = pml.frametime * pm->leanSpeed;
-				float fMult = pml.frametime * fAngle * pm->leanAdd;
+                pm->ps->fLeanAngle += fLeanAngle;
+            }
+        } else {
+            if (pm->ps->fLeanAngle >= pm->leanMax) {
+                pm->ps->fLeanAngle = pm->leanMax;
+            } else {
+                float fAngle     = pm->leanMax - pm->ps->fLeanAngle;
+                float fLeanAngle = pml.frametime * pm->leanSpeed;
+                float fMult      = pml.frametime * fAngle * pm->leanAdd;
 
-				if( fLeanAngle <= fMult )
-				{
-					fLeanAngle = fMult;
-				}
-				else
-				{
-					fLeanAngle = fMult;
-				}
+                if (fLeanAngle <= fMult) {
+                    fLeanAngle = fMult;
+                } else {
+                    fLeanAngle = fMult;
+                }
 
-				pm->ps->fLeanAngle += fLeanAngle;
-			}
-		}
-	}
-	else if( pm->ps->fLeanAngle )
-	{
-		float fAngle = pm->ps->fLeanAngle * pml.frametime * pm->leanRecoverSpeed;
+                pm->ps->fLeanAngle += fLeanAngle;
+            }
+        }
+    } else if (pm->ps->fLeanAngle) {
+        float fAngle = pm->ps->fLeanAngle * pml.frametime * pm->leanRecoverSpeed;
 
-		if( pm->ps->fLeanAngle <= 0.0f )
-		{
-			float fLeanAngle = pml.frametime * -pm->leanSpeed;
+        if (pm->ps->fLeanAngle <= 0.0f) {
+            float fLeanAngle = pml.frametime * -pm->leanSpeed;
 
-			if(fLeanAngle >= fAngle) {
-				fLeanAngle = fAngle;
-			}
+            if (fLeanAngle >= fAngle) {
+                fLeanAngle = fAngle;
+            }
 
-			pm->ps->fLeanAngle -= fLeanAngle;
-			if (pm->ps->fLeanAngle > 0) {
-				pm->ps->fLeanAngle = 0;
-			}
-		}
-		else
-		{
-			float fLeanAngle = pml.frametime * pm->leanSpeed;
+            pm->ps->fLeanAngle -= fLeanAngle;
+            if (pm->ps->fLeanAngle > 0) {
+                pm->ps->fLeanAngle = 0;
+            }
+        } else {
+            float fLeanAngle = pml.frametime * pm->leanSpeed;
 
-			if(fLeanAngle <= fAngle) {
-				fLeanAngle = fAngle;
-			}
+            if (fLeanAngle <= fAngle) {
+                fLeanAngle = fAngle;
+            }
 
             pm->ps->fLeanAngle -= fLeanAngle;
             if (pm->ps->fLeanAngle < 0) {
                 pm->ps->fLeanAngle = 0;
             }
-		}
-	}
+        }
+    }
 
-	if (pm->ps->pm_flags & PMF_NO_LEAN) {
-		pm->ps->fLeanAngle = 0;
-	}
+    if (pm->ps->pm_flags & PMF_NO_LEAN) {
+        pm->ps->fLeanAngle = 0;
+    }
 
-	// update the viewangles
-	PM_UpdateViewAngles( pm->ps, &pm->cmd );
+    // update the viewangles
+    PM_UpdateViewAngles(pm->ps, &pm->cmd);
 
-	AngleVectorsLeft( pm->ps->viewangles, pml.forward, pml.left, pml.up );
-	VectorClear( tempVec );
-	tempVec[ YAW ] = pm->ps->viewangles[ YAW ];
-	AngleVectorsLeft( tempVec, pml.flat_forward, pml.flat_left, pml.flat_up );
+    AngleVectorsLeft(pm->ps->viewangles, pml.forward, pml.left, pml.up);
+    VectorClear(tempVec);
+    tempVec[YAW] = pm->ps->viewangles[YAW];
+    AngleVectorsLeft(tempVec, pml.flat_forward, pml.flat_left, pml.flat_up);
 
-	if ( pm->ps->pm_type >= PM_DEAD )
-	{
-		pm->cmd.forwardmove = 0;
-		pm->cmd.rightmove = 0;
-		pm->cmd.upmove = 0;
-		pm->ps->fLeanAngle = 0.0f;
-	}
+    if (pm->ps->pm_type >= PM_DEAD) {
+        pm->cmd.forwardmove = 0;
+        pm->cmd.rightmove   = 0;
+        pm->cmd.upmove      = 0;
+        pm->ps->fLeanAngle  = 0.0f;
+    }
 
-	if ( pm->ps->pm_type == PM_NOCLIP )
-	{
-		PM_NoclipMove();
-		PM_DropTimers();
-		return;
-	}
+    if (pm->ps->pm_type == PM_NOCLIP) {
+        PM_NoclipMove();
+        PM_DropTimers();
+        return;
+    }
 
-	if( ( pm->ps->pm_flags & PMF_NO_MOVE ) || ( pm->ps->pm_flags & PMF_FROZEN ) )
-	{
-		PM_CheckDuck();
-		return;
-	}
+    if ((pm->ps->pm_flags & PMF_NO_MOVE) || (pm->ps->pm_flags & PMF_FROZEN)) {
+        PM_CheckDuck();
+        return;
+    }
 
-	// set watertype, and waterlevel
-	PM_SetWaterLevel();
-	pml.previous_waterlevel = pmove->waterlevel;
+    // set watertype, and waterlevel
+    PM_SetWaterLevel();
+    pml.previous_waterlevel = pmove->waterlevel;
 
-	// set mins, maxs, and viewheight
-	PM_CheckDuck();
+    // set mins, maxs, and viewheight
+    PM_CheckDuck();
 
-	// set groundentity
-	PM_GroundTrace();
+    // set groundentity
+    PM_GroundTrace();
 
-	if ( pm->ps->pm_type == PM_DEAD ) {
-		PM_DeadMove();
-	}
+    if (pm->ps->pm_type == PM_DEAD) {
+        PM_DeadMove();
+    }
 
-	PM_DropTimers();
+    PM_DropTimers();
 
-	if ( pml.walking ) {
-		// walking on ground
-		PM_WalkMove();
-	} else {
-		// airborne
-		PM_AirMove();
-	}
+    if (pml.walking) {
+        // walking on ground
+        PM_WalkMove();
+    } else {
+        // airborne
+        PM_AirMove();
+    }
 
-	walking = pml.walking;
+    walking = pml.walking;
 
-	// set groundentity, watertype, and waterlevel
-	PM_GroundTrace();
-	PM_SetWaterLevel();
+    // set groundentity, watertype, and waterlevel
+    PM_GroundTrace();
+    PM_SetWaterLevel();
 
-	// don't fall down stairs or do really short falls
-	if( !pml.walking && ( walking || ( ( pml.previous_velocity[ 2 ] >= 0 ) && ( pm->ps->velocity[ 2 ] <= 0 ) ) ) )
-	{
-		vec3_t   point;
-		trace_t  trace;
+    // don't fall down stairs or do really short falls
+    if (!pml.walking && (walking || ((pml.previous_velocity[2] >= 0) && (pm->ps->velocity[2] <= 0)))) {
+        vec3_t  point;
+        trace_t trace;
 
-		point[ 0 ] = pm->ps->origin[ 0 ];
-		point[ 1 ] = pm->ps->origin[ 1 ];
-		point[ 2 ] = pm->ps->origin[ 2 ] - STEPSIZE;
+        point[0] = pm->ps->origin[0];
+        point[1] = pm->ps->origin[1];
+        point[2] = pm->ps->origin[2] - STEPSIZE;
 
-		pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-		if( ( trace.fraction < 1.0f ) && ( !trace.allsolid ) )
-		{
-			VectorCopy( trace.endpos, pm->ps->origin );
+        pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+        if ((trace.fraction < 1.0f) && (!trace.allsolid)) {
+            VectorCopy(trace.endpos, pm->ps->origin);
 
-			// allow client to smooth out the step
-			pm->stepped = qtrue;
+            // allow client to smooth out the step
+            pm->stepped = qtrue;
 
-			// requantify the player's position
-			PM_GroundTrace();
-			PM_SetWaterLevel();
-		}
-	}
+            // requantify the player's position
+            PM_GroundTrace();
+            PM_SetWaterLevel();
+        }
+    }
 
-	// entering / leaving water splashes
-	PM_WaterEvents();
+    // entering / leaving water splashes
+    PM_WaterEvents();
 }
 
-void Pmove_GroundTrace( pmove_t *pmove )
+void Pmove_GroundTrace(pmove_t *pmove)
 {
-	memset( &pml, 0, sizeof( pml ) );
-	pml.msec = 1;
-	pml.frametime = 0.001f;
-	pm = pmove;
-	PM_CheckDuck();
-	PM_GroundTrace();
+    memset(&pml, 0, sizeof(pml));
+    pml.msec      = 1;
+    pml.frametime = 0.001f;
+    pm            = pmove;
+    PM_CheckDuck();
+    PM_GroundTrace();
 }
 
 /*
@@ -1655,219 +1490,207 @@ Pmove
 Can be called by either the server or the client
 ================
 */
-void Pmove( pmove_t *pmove ) {
-	int			finalTime;
-
-	finalTime = pmove->cmd.serverTime;
-
-	if( finalTime < pmove->ps->commandTime ) {
-		return;	// should not happen
-	}
-
-	if( finalTime > pmove->ps->commandTime + 1000 ) {
-		pmove->ps->commandTime = finalTime - 1000;
-	}
-
-	// chop the move up if it is too long, to prevent framerate
-	// dependent behavior
-	while( pmove->ps->commandTime != finalTime ) {
-		int		msec;
-
-		msec = finalTime - pmove->ps->commandTime;
-
-		if( pmove->pmove_fixed )
-		{
-			if( msec > pmove->pmove_msec )
-			{
-				msec = pmove->pmove_msec;
-			}
-		}
-		else if( msec > 66 ) {
-			msec = 66;
-		}
-
-		pmove->cmd.serverTime = pmove->ps->commandTime + msec;
-		PmoveSingle( pmove );
-	}
-}
-static void PmoveAdjustViewAngleSettings_OnLadder( vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState )
+void Pmove(pmove_t *pmove)
 {
-	float fDelta;
-	float deltayaw;
-	float yawAngle;
-	float temp;
+    int finalTime;
 
-	vAngles[ 0 ] = 0.0f;
-	vAngles[ 2 ] = 0.0f;
+    finalTime = pmove->cmd.serverTime;
 
-	if( vViewAngles[ 0 ] > 73.0f ) {
-		vViewAngles[ 0 ] = 73.0f;
-	}
+    if (finalTime < pmove->ps->commandTime) {
+        return; // should not happen
+    }
 
-	deltayaw = AngleSubtract( vViewAngles[ 1 ], vAngles[ 1 ] );
+    if (finalTime > pmove->ps->commandTime + 1000) {
+        pmove->ps->commandTime = finalTime - 1000;
+    }
 
-	yawAngle = 70.0f;
-	if( deltayaw <= 70.0f )
-	{
-		yawAngle = deltayaw;
-		if( deltayaw < -70.0f )
-		{
-			yawAngle = -70.0f;
-		}
-	}
+    // chop the move up if it is too long, to prevent framerate
+    // dependent behavior
+    while (pmove->ps->commandTime != finalTime) {
+        int msec;
 
-	vViewAngles[ 1 ] = vAngles[ 1 ] + yawAngle;
+        msec = finalTime - pmove->ps->commandTime;
 
-	fDelta = sqrt( yawAngle * yawAngle + vViewAngles[ 0 ] * vViewAngles[ 0 ] );
+        if (pmove->pmove_fixed) {
+            if (msec > pmove->pmove_msec) {
+                msec = pmove->pmove_msec;
+            }
+        } else if (msec > 66) {
+            msec = 66;
+        }
 
-	if( vViewAngles[ 0 ] <= 0.0f ) {
-		temp = 80.0f;
-	} else {
-		temp = 73.0f;
-	}
-
-	if( fDelta > temp )
-	{
-		float deltalimit = temp * 1.0f / fDelta;
-		vViewAngles[ 0 ] *= deltalimit;
-		vViewAngles[ 1 ] = yawAngle * deltalimit + vAngles[ 1 ];
-	}
+        pmove->cmd.serverTime = pmove->ps->commandTime + msec;
+        PmoveSingle(pmove);
+    }
 }
 
-void PmoveAdjustAngleSettings( vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState )
+static void PmoveAdjustViewAngleSettings_OnLadder(
+    vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState
+)
 {
-	vec3_t temp, temp2;
-	vec3_t armsAngles, torsoAngles, headAngles;
-	float fTmp;
+    float fDelta;
+    float deltayaw;
+    float yawAngle;
+    float temp;
 
-	if( pPlayerState->pm_type == PM_CLIMBWALL )
-	{
-		PmoveAdjustViewAngleSettings_OnLadder( vViewAngles, vAngles, pPlayerState, pEntState );
-		VectorSet( pEntState->bone_angles[ TORSO_TAG ], 0, 0, 0 );
-		VectorSet( pEntState->bone_angles[ ARMS_TAG ], 0, 0, 0 );
-		VectorSet( pEntState->bone_angles[ PELVIS_TAG ], 0, 0, 0 );
-		QuatSet( pEntState->bone_quat[ TORSO_TAG ], 0, 0, 0, 1 );
-		QuatSet( pEntState->bone_quat[ ARMS_TAG ], 0, 0, 0, 1 );
-		QuatSet( pEntState->bone_quat[ PELVIS_TAG ], 0, 0, 0, 1 );
+    vAngles[0] = 0.0f;
+    vAngles[2] = 0.0f;
 
-		AnglesSubtract( vViewAngles, vAngles, headAngles );
-		VectorScale( headAngles, 0.5f, pEntState->bone_angles[ HEAD_TAG ] );
+    if (vViewAngles[0] > 73.0f) {
+        vViewAngles[0] = 73.0f;
+    }
 
-		EulerToQuat( headAngles, pEntState->bone_quat[ HEAD_TAG ] );
-		return;
-	}
+    deltayaw = AngleSubtract(vViewAngles[1], vAngles[1]);
 
-	if( pPlayerState->pm_type != PM_DEAD )
-	{
-		fTmp = AngleMod( vViewAngles[ 1 ] );
-		VectorSet( vAngles, 0, fTmp, 0 );
+    yawAngle = 70.0f;
+    if (deltayaw <= 70.0f) {
+        yawAngle = deltayaw;
+        if (deltayaw < -70.0f) {
+            yawAngle = -70.0f;
+        }
+    }
 
-		if( !( pPlayerState->pm_flags & PMF_VIEW_PRONE ) || ( pPlayerState->pm_flags & PMF_DUCKED ) )
-		{
-			fTmp = AngleMod( vViewAngles[ 0 ] );
+    vViewAngles[1] = vAngles[1] + yawAngle;
 
-			VectorSet( temp, fTmp, 0, pPlayerState->fLeanAngle * 0.60f );
-			VectorSet( temp2, fTmp, 0, pPlayerState->fLeanAngle );
+    fDelta = sqrt(yawAngle * yawAngle + vViewAngles[0] * vViewAngles[0]);
 
-			if( fTmp > 180.0f ) {
-				temp2[ 0 ] = fTmp - 360.0f;
-			}
+    if (vViewAngles[0] <= 0.0f) {
+        temp = 80.0f;
+    } else {
+        temp = 73.0f;
+    }
 
-			temp2[ 0 ] = 0.90f * temp2[ 0 ] * 0.70f;
+    if (fDelta > temp) {
+        float deltalimit = temp * 1.0f / fDelta;
+        vViewAngles[0] *= deltalimit;
+        vViewAngles[1] = yawAngle * deltalimit + vAngles[1];
+    }
+}
 
-			AnglesSubtract( temp, temp2, headAngles );
-			VectorCopy( headAngles, pEntState->bone_angles[ HEAD_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ HEAD_TAG ], pEntState->bone_quat[ HEAD_TAG ] );
+void PmoveAdjustAngleSettings(vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState)
+{
+    vec3_t temp, temp2;
+    vec3_t armsAngles, torsoAngles, headAngles;
+    float  fTmp;
 
-			if( temp2[ 0 ] <= 0.0f )
-			{
-				fTmp = -0.1f;
-			}
-			else{
-				fTmp = 0.3f;
-			}
+    if (pPlayerState->pm_type == PM_CLIMBWALL) {
+        PmoveAdjustViewAngleSettings_OnLadder(vViewAngles, vAngles, pPlayerState, pEntState);
+        VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+        QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
 
-			VectorSet( temp, fTmp * temp2[ 0 ], 0, pPlayerState->fLeanAngle * 0.8f );
-			VectorCopy( temp, pEntState->bone_angles[ PELVIS_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ PELVIS_TAG ], pEntState->bone_quat[ PELVIS_TAG ] );
+        AnglesSubtract(vViewAngles, vAngles, headAngles);
+        VectorScale(headAngles, 0.5f, pEntState->bone_angles[HEAD_TAG]);
 
-			float fDelta = ( 1.0f - fTmp ) * temp2[ 0 ];
+        EulerToQuat(headAngles, pEntState->bone_quat[HEAD_TAG]);
+        return;
+    }
 
-			if( vViewAngles[ 0 ] <= 0.0f )
-			{
-				VectorSet( torsoAngles, fDelta * 0.60f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f );
-				VectorSet( armsAngles, fDelta * 0.40f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f );
-			}
-			else
-			{
-				VectorSet( torsoAngles, fDelta * 0.70f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f );
-				VectorSet( armsAngles, fDelta * 0.30f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f );
-			}
+    if (pPlayerState->pm_type != PM_DEAD) {
+        fTmp = AngleMod(vViewAngles[1]);
+        VectorSet(vAngles, 0, fTmp, 0);
 
-			VectorCopy( torsoAngles, pEntState->bone_angles[ TORSO_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ TORSO_TAG ], pEntState->bone_quat[ TORSO_TAG ] );
+        if (!(pPlayerState->pm_flags & PMF_VIEW_PRONE) || (pPlayerState->pm_flags & PMF_DUCKED)) {
+            fTmp = AngleMod(vViewAngles[0]);
 
-			VectorCopy( armsAngles, pEntState->bone_angles[ ARMS_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ ARMS_TAG ], pEntState->bone_quat[ ARMS_TAG ] );
-			return;
-		}
-	}
+            VectorSet(temp, fTmp, 0, pPlayerState->fLeanAngle * 0.60f);
+            VectorSet(temp2, fTmp, 0, pPlayerState->fLeanAngle);
 
-	// set the default angles
-	VectorSet( pEntState->bone_angles[ HEAD_TAG ], 0, 0, 0 );
-	VectorSet( pEntState->bone_angles[ TORSO_TAG ], 0, 0, 0 );
-	VectorSet( pEntState->bone_angles[ ARMS_TAG ], 0, 0, 0 );
-	VectorSet( pEntState->bone_angles[ PELVIS_TAG ], 0, 0, 0 );
-	QuatSet( pEntState->bone_quat[ HEAD_TAG ], 0, 0, 0, 1 );
-	QuatSet( pEntState->bone_quat[ TORSO_TAG ], 0, 0, 0, 1 );
-	QuatSet( pEntState->bone_quat[ ARMS_TAG ], 0, 0, 0, 1 );
-	QuatSet( pEntState->bone_quat[ PELVIS_TAG ], 0, 0, 0, 1 );
+            if (fTmp > 180.0f) {
+                temp2[0] = fTmp - 360.0f;
+            }
+
+            temp2[0] = 0.90f * temp2[0] * 0.70f;
+
+            AnglesSubtract(temp, temp2, headAngles);
+            VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
+            EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
+
+            if (temp2[0] <= 0.0f) {
+                fTmp = -0.1f;
+            } else {
+                fTmp = 0.3f;
+            }
+
+            VectorSet(temp, fTmp * temp2[0], 0, pPlayerState->fLeanAngle * 0.8f);
+            VectorCopy(temp, pEntState->bone_angles[PELVIS_TAG]);
+            EulerToQuat(pEntState->bone_angles[PELVIS_TAG], pEntState->bone_quat[PELVIS_TAG]);
+
+            float fDelta = (1.0f - fTmp) * temp2[0];
+
+            if (vViewAngles[0] <= 0.0f) {
+                VectorSet(torsoAngles, fDelta * 0.60f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
+                VectorSet(armsAngles, fDelta * 0.40f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
+            } else {
+                VectorSet(torsoAngles, fDelta * 0.70f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
+                VectorSet(armsAngles, fDelta * 0.30f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
+            }
+
+            VectorCopy(torsoAngles, pEntState->bone_angles[TORSO_TAG]);
+            EulerToQuat(pEntState->bone_angles[TORSO_TAG], pEntState->bone_quat[TORSO_TAG]);
+
+            VectorCopy(armsAngles, pEntState->bone_angles[ARMS_TAG]);
+            EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
+            return;
+        }
+    }
+
+    // set the default angles
+    VectorSet(pEntState->bone_angles[HEAD_TAG], 0, 0, 0);
+    VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+    VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+    VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+    QuatSet(pEntState->bone_quat[HEAD_TAG], 0, 0, 0, 1);
+    QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+    QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+    QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
 }
 
 // Used to set arms angles accordingly, calculated client-side
 // Without it, the arms will look like it has latency
-void PmoveAdjustAngleSettings_Client( vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState )
+void PmoveAdjustAngleSettings_Client(
+    vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState
+)
 {
     vec3_t torsoAngles;
-    int i;
+    int    i;
 
-	if (pPlayerState->pm_type == PM_DEAD)
-	{
-		for (i = 0; i < NUM_BONE_CONTROLLERS; i++) {
+    if (pPlayerState->pm_type == PM_DEAD) {
+        for (i = 0; i < NUM_BONE_CONTROLLERS; i++) {
             VectorClear(pEntState->bone_angles[i]);
             QuatClear(pEntState->bone_quat[i]);
-		}
-	}
-	else if (pPlayerState->pm_type == PM_CLIMBWALL)
-    {
-		vec3_t headAngles;
+        }
+    } else if (pPlayerState->pm_type == PM_CLIMBWALL) {
+        vec3_t headAngles;
 
         PmoveAdjustViewAngleSettings_OnLadder(vViewAngles, vAngles, pPlayerState, pEntState);
-		VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0.0, pPlayerState->fLeanAngle * 0.7);
+        VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0.0, pPlayerState->fLeanAngle * 0.7);
 
-		if (torsoAngles[0] > 180.0) {
-			torsoAngles[0] -= 180.0;
-		}
+        if (torsoAngles[0] > 180.0) {
+            torsoAngles[0] -= 180.0;
+        }
 
-		torsoAngles[0] += 8.0;
+        torsoAngles[0] += 8.0;
 
         VectorClear(pEntState->bone_angles[TORSO_TAG]);
         QuatClear(pEntState->bone_quat[TORSO_TAG]);
         VectorClear(pEntState->bone_angles[PELVIS_TAG]);
         QuatClear(pEntState->bone_quat[PELVIS_TAG]);
 
-		VectorCopy(torsoAngles, pEntState->bone_angles[ARMS_TAG]);
-		EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
+        VectorCopy(torsoAngles, pEntState->bone_angles[ARMS_TAG]);
+        EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
 
-		// head angles
+        // head angles
         AnglesSubtract(vViewAngles, vAngles, headAngles);
         headAngles[0] *= 0.5;
-		AnglesSubtract(headAngles, torsoAngles, headAngles);
+        AnglesSubtract(headAngles, torsoAngles, headAngles);
         VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
         EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
-	}
-    else {
-		// Clear the head, torso and pelvis
+    } else {
+        // Clear the head, torso and pelvis
         VectorClear(pEntState->bone_angles[HEAD_TAG]);
         QuatClear(pEntState->bone_quat[HEAD_TAG]);
         VectorClear(pEntState->bone_angles[TORSO_TAG]);
@@ -1875,8 +1698,8 @@ void PmoveAdjustAngleSettings_Client( vec_t *vViewAngles, vec_t *vAngles, player
         VectorClear(pEntState->bone_angles[PELVIS_TAG]);
         QuatClear(pEntState->bone_quat[PELVIS_TAG]);
 
-		VectorSet(vAngles, 0, AngleMod(vViewAngles[1]), 0);
-		VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0, pPlayerState->fLeanAngle * 0.7);
+        VectorSet(vAngles, 0, AngleMod(vViewAngles[1]), 0);
+        VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0, pPlayerState->fLeanAngle * 0.7);
 
         if (torsoAngles[0] > 180.0) {
             torsoAngles[0] -= 360.0;
@@ -1885,5 +1708,5 @@ void PmoveAdjustAngleSettings_Client( vec_t *vViewAngles, vec_t *vAngles, player
         torsoAngles[0] += 8.0;
         VectorCopy(torsoAngles, pEntState->bone_angles[ARMS_TAG]);
         EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
-	}
+    }
 }
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 39c80ab5..f3324ea2 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -604,16 +604,18 @@ movement on the server game.
 
 #define DM_FLAG(flag)             (g_gametype->integer != GT_SINGLE_PLAYER && ((int)dmflags->integer & (flag)))
 
-//
-// Content masks
-//
+    //
+    // Content masks
+    //
 
 #define MASK_ALL (-1)
 #define MASK_SOLID \
     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_FENCE)
 #define MASK_SAFESOLID (CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_USABLE    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
-#define MASK_PLAYERSOLID (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
+#define MASK_PLAYERSOLID                                                                                              \
+    (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP \
+     | CONTENTS_BBOX | CONTENTS_SOLID)
 #define MASK_GUNTARGET                                                                                               \
     (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX        \
      | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_UNKNOWN3 | CONTENTS_FENCE | CONTENTS_BODY | CONTENTS_CORPSE \
@@ -662,10 +664,14 @@ movement on the server game.
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
 #define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
-#define MASK_USE (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
-#define MASK_CLICKITEM   (MASK_SOLID | CONTENTS_UNKNOWN3)
-#define MASK_ITEM          (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
-#define MASK_TRANSITION    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
+#define MASK_USE                                                                                                    \
+    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP \
+     | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_CLICKITEM (MASK_SOLID | CONTENTS_UNKNOWN3)
+#define MASK_ITEM      (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
+#define MASK_TRANSITION                                                                                         \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_BBOX)
 #define MASK_TARGETPATH \
     (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_MONSTERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
 #define MASK_ACTORPATH (CONTENTS_SOLID | CONTENTS_FENCE | CONTENTS_MONSTERCLIP | CONTENTS_TRIGGER)
@@ -706,13 +712,17 @@ movement on the server game.
      | CONTENTS_WEAPONCLIP)
 #define MASK_CORNER_NODE \
     (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
-#define MASK_IGNORE_ENTS (CONTENTS_CORPSE | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_CLAYPIDGEON | CONTENTS_LADDER)
+#define MASK_IGNORE_ENTS                                                                                          \
+    (CONTENTS_CORPSE | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX \
+     | CONTENTS_CLAYPIDGEON | CONTENTS_LADDER)
 
 //
 // Marks
 //
 #define MASK_MARK (CONTENTS_TRIGGER | CONTENTS_SOLID)
-#define MASK_TREADMARK (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_SOLID)
+#define MASK_TREADMARK                                                                                                \
+    (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP \
+     | CONTENTS_BBOX | CONTENTS_SOLID)
 
     void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result);
 
diff --git a/code/fgame/bg_slidemove.cpp b/code/fgame/bg_slidemove.cpp
index a90e2a46..60d07da8 100644
--- a/code/fgame/bg_slidemove.cpp
+++ b/code/fgame/bg_slidemove.cpp
@@ -41,188 +41,186 @@ PM_SlideMove
 Returns qtrue if the velocity was clipped in some way
 ==================
 */
-#define	MAX_CLIP_PLANES	5
-qboolean	PM_SlideMove( qboolean gravity )
+#define MAX_CLIP_PLANES 5
+
+qboolean PM_SlideMove(qboolean gravity)
 {
-	int			bumpcount, numbumps;
-	vec3_t		dir;
-	float		d;
-	int			numplanes;
-	vec3_t		planes[ MAX_CLIP_PLANES ];
-	vec3_t		clipVelocity;
-	int			i, j, k;
-	trace_t	trace;
-	vec3_t		end;
-	float		time_left;
-	float		into;
-	vec3_t		endVelocity;
-	vec3_t		endClipVelocity;
+    int     bumpcount, numbumps;
+    vec3_t  dir;
+    float   d;
+    int     numplanes;
+    vec3_t  planes[MAX_CLIP_PLANES];
+    vec3_t  clipVelocity;
+    int     i, j, k;
+    trace_t trace;
+    vec3_t  end;
+    float   time_left;
+    float   into;
+    vec3_t  endVelocity;
+    vec3_t  endClipVelocity;
 
-	numbumps = 4;
+    numbumps = 4;
 
-	VectorCopy( pm->ps->velocity, endVelocity );
+    VectorCopy(pm->ps->velocity, endVelocity);
 
-	if( gravity ) {
-		endVelocity[ 2 ] -= pm->ps->gravity * pml.frametime;
-		pm->ps->velocity[ 2 ] = ( pm->ps->velocity[ 2 ] + endVelocity[ 2 ] ) * 0.5;
-		if( pml.groundPlane ) {
-			// slide along the ground plane
-			PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal,
-				pm->ps->velocity, OVERCLIP );
-		}
-	}
+    if (gravity) {
+        endVelocity[2] -= pm->ps->gravity * pml.frametime;
+        pm->ps->velocity[2] = (pm->ps->velocity[2] + endVelocity[2]) * 0.5;
+        if (pml.groundPlane) {
+            // slide along the ground plane
+            PM_ClipVelocity(pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP);
+        }
+    }
 
-	time_left = pml.frametime;
+    time_left = pml.frametime;
 
-	// never turn against the ground plane
-	if( pml.groundPlane ) {
-		numplanes = 1;
-		VectorCopy( pml.groundTrace.plane.normal, planes[ 0 ] );
-	}
-	else {
-		numplanes = 0;
-	}
+    // never turn against the ground plane
+    if (pml.groundPlane) {
+        numplanes = 1;
+        VectorCopy(pml.groundTrace.plane.normal, planes[0]);
+    } else {
+        numplanes = 0;
+    }
 
-	// never turn against original velocity
-	VectorNormalize2( pm->ps->velocity, planes[ numplanes ] );
-	numplanes++;
+    // never turn against original velocity
+    VectorNormalize2(pm->ps->velocity, planes[numplanes]);
+    numplanes++;
 
-	for( bumpcount = 0; bumpcount < numbumps; bumpcount++ ) {
+    for (bumpcount = 0; bumpcount < numbumps; bumpcount++) {
+        // calculate position we are trying to move to
+        VectorMA(pm->ps->origin, time_left, pm->ps->velocity, end);
 
-		// calculate position we are trying to move to
-		VectorMA( pm->ps->origin, time_left, pm->ps->velocity, end );
+        // see if we can make it there
+        pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-		// see if we can make it there
-		pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+        if (trace.allsolid) {
+            // entity is completely trapped in another solid
+            pm->ps->velocity[2] = 0; // don't build up falling damage, but allow sideways acceleration
+            return qtrue;
+        }
 
-		if( trace.allsolid ) {
-			// entity is completely trapped in another solid
-			pm->ps->velocity[ 2 ] = 0;	// don't build up falling damage, but allow sideways acceleration
-			return qtrue;
-		}
+        if (trace.fraction > 0) {
+            // actually covered some distance
+            VectorCopy(trace.endpos, pm->ps->origin);
+        }
 
-		if( trace.fraction > 0 ) {
-			// actually covered some distance
-			VectorCopy( trace.endpos, pm->ps->origin );
-		}
+        if (trace.fraction == 1) {
+            break; // moved the entire distance
+        }
 
-		if( trace.fraction == 1 ) {
-			break;		// moved the entire distance
-		}
+        if ((trace.plane.normal[2] < MIN_WALK_NORMAL) && (trace.plane.normal[2] > 0)
+            && DotProduct(trace.plane.normal, pm->ps->velocity) <= 0) {
+            // treat steep walls as vertical
+            trace.plane.normal[2] = 0;
+            VectorNormalizeFast(trace.plane.normal);
+        }
 
-		if( ( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL ) && ( trace.plane.normal[ 2 ] > 0 ) && DotProduct(trace.plane.normal, pm->ps->velocity) <= 0 )
-		{
-			// treat steep walls as vertical
-			trace.plane.normal[ 2 ] = 0;
-			VectorNormalizeFast( trace.plane.normal );
-		}
+        // save entity for contact
+        PM_AddTouchEnt(trace.entityNum);
 
-		// save entity for contact
-		PM_AddTouchEnt( trace.entityNum );
+        time_left -= time_left * trace.fraction;
 
-		time_left -= time_left * trace.fraction;
+        if (numplanes >= MAX_CLIP_PLANES) {
+            // this shouldn't really happen
+            VectorClear(pm->ps->velocity);
+            return qtrue;
+        }
 
-		if( numplanes >= MAX_CLIP_PLANES ) {
-			// this shouldn't really happen
-			VectorClear( pm->ps->velocity );
-			return qtrue;
-		}
+        //
+        // if this is the same plane we hit before, nudge velocity
+        // out along it, which fixes some epsilon issues with
+        // non-axial planes
+        //
+        for (i = 0; i < numplanes; i++) {
+            if (DotProduct(trace.plane.normal, planes[i]) > 0.99) {
+                VectorAdd(trace.plane.normal, pm->ps->velocity, pm->ps->velocity);
+                break;
+            }
+        }
+        if (i < numplanes) {
+            continue;
+        }
+        VectorCopy(trace.plane.normal, planes[numplanes]);
+        numplanes++;
 
-		//
-		// if this is the same plane we hit before, nudge velocity
-		// out along it, which fixes some epsilon issues with
-		// non-axial planes
-		//
-		for( i = 0; i < numplanes; i++ ) {
-			if( DotProduct( trace.plane.normal, planes[ i ] ) > 0.99 ) {
-				VectorAdd( trace.plane.normal, pm->ps->velocity, pm->ps->velocity );
-				break;
-			}
-		}
-		if( i < numplanes ) {
-			continue;
-		}
-		VectorCopy( trace.plane.normal, planes[ numplanes ] );
-		numplanes++;
+        //
+        // modify velocity so it parallels all of the clip planes
+        //
 
-		//
-		// modify velocity so it parallels all of the clip planes
-		//
+        // find a plane that it enters
+        for (i = 0; i < numplanes; i++) {
+            into = DotProduct(pm->ps->velocity, planes[i]);
+            if (into >= 0.1) {
+                continue; // move doesn't interact with the plane
+            }
 
-		// find a plane that it enters
-		for( i = 0; i < numplanes; i++ ) {
-			into = DotProduct( pm->ps->velocity, planes[ i ] );
-			if( into >= 0.1 ) {
-				continue;		// move doesn't interact with the plane
-			}
+            // see how hard we are hitting things
+            if (-into > pml.impactSpeed) {
+                pml.impactSpeed = -into;
+            }
 
-			// see how hard we are hitting things
-			if( -into > pml.impactSpeed ) {
-				pml.impactSpeed = -into;
-			}
+            // slide along the plane
+            PM_ClipVelocity(pm->ps->velocity, planes[i], clipVelocity, OVERCLIP);
 
-			// slide along the plane
-			PM_ClipVelocity( pm->ps->velocity, planes[ i ], clipVelocity, OVERCLIP );
+            // slide along the plane
+            PM_ClipVelocity(endVelocity, planes[i], endClipVelocity, OVERCLIP);
 
-			// slide along the plane
-			PM_ClipVelocity( endVelocity, planes[ i ], endClipVelocity, OVERCLIP );
+            // see if there is a second plane that the new move enters
+            for (j = 0; j < numplanes; j++) {
+                if (j == i) {
+                    continue;
+                }
+                if (DotProduct(clipVelocity, planes[j]) >= 0.1) {
+                    continue; // move doesn't interact with the plane
+                }
 
-			// see if there is a second plane that the new move enters
-			for( j = 0; j < numplanes; j++ ) {
-				if( j == i ) {
-					continue;
-				}
-				if( DotProduct( clipVelocity, planes[ j ] ) >= 0.1 ) {
-					continue;		// move doesn't interact with the plane
-				}
+                // try clipping the move to the plane
+                PM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+                PM_ClipVelocity(endClipVelocity, planes[j], endClipVelocity, OVERCLIP);
 
-				// try clipping the move to the plane
-				PM_ClipVelocity( clipVelocity, planes[ j ], clipVelocity, OVERCLIP );
-				PM_ClipVelocity( endClipVelocity, planes[ j ], endClipVelocity, OVERCLIP );
+                // see if it goes back into the first clip plane
+                if (DotProduct(clipVelocity, planes[i]) >= 0) {
+                    continue;
+                }
 
-				// see if it goes back into the first clip plane
-				if( DotProduct( clipVelocity, planes[ i ] ) >= 0 ) {
-					continue;
-				}
+                // slide the original velocity along the crease
+                CrossProduct(planes[i], planes[j], dir);
+                VectorNormalize(dir);
+                d = DotProduct(dir, pm->ps->velocity);
+                VectorScale(dir, d, clipVelocity);
 
-				// slide the original velocity along the crease
-				CrossProduct( planes[ i ], planes[ j ], dir );
-				VectorNormalize( dir );
-				d = DotProduct( dir, pm->ps->velocity );
-				VectorScale( dir, d, clipVelocity );
+                CrossProduct(planes[i], planes[j], dir);
+                VectorNormalize(dir);
+                d = DotProduct(dir, endVelocity);
+                VectorScale(dir, d, endClipVelocity);
 
-				CrossProduct( planes[ i ], planes[ j ], dir );
-				VectorNormalize( dir );
-				d = DotProduct( dir, endVelocity );
-				VectorScale( dir, d, endClipVelocity );
+                // see if there is a third plane the the new move enters
+                for (k = 0; k < numplanes; k++) {
+                    if (k == i || k == j) {
+                        continue;
+                    }
+                    if (DotProduct(clipVelocity, planes[k]) >= 0.1) {
+                        continue; // move doesn't interact with the plane
+                    }
 
-				// see if there is a third plane the the new move enters
-				for( k = 0; k < numplanes; k++ ) {
-					if( k == i || k == j ) {
-						continue;
-					}
-					if( DotProduct( clipVelocity, planes[ k ] ) >= 0.1 ) {
-						continue;		// move doesn't interact with the plane
-					}
+                    // stop dead at a tripple plane interaction
+                    VectorClear(pm->ps->velocity);
+                    return qtrue;
+                }
+            }
 
-					// stop dead at a tripple plane interaction
-					VectorClear( pm->ps->velocity );
-					return qtrue;
-				}
-			}
+            // if we have fixed all interactions, try another move
+            VectorCopy(clipVelocity, pm->ps->velocity);
+            VectorCopy(endClipVelocity, endVelocity);
+            break;
+        }
+    }
 
-			// if we have fixed all interactions, try another move
-			VectorCopy( clipVelocity, pm->ps->velocity );
-			VectorCopy( endClipVelocity, endVelocity );
-			break;
-		}
-	}
+    if (gravity) {
+        VectorCopy(endVelocity, pm->ps->velocity);
+    }
 
-	if( gravity ) {
-		VectorCopy( endVelocity, pm->ps->velocity );
-	}
-
-	return ( bumpcount != 0 );
+    return (bumpcount != 0);
 }
 
 /*
@@ -231,89 +229,80 @@ PM_StepSlideMove
 
 ==================
 */
-void PM_StepSlideMove( qboolean gravity )
+void PM_StepSlideMove(qboolean gravity)
 {
-	vec3_t start_o;
-	vec3_t start_v;
-	vec3_t nostep_o;
-	vec3_t nostep_v;
-	trace_t trace;
-	qboolean bWasOnGoodGround;
-	vec3_t up;
-	vec3_t down;
+    vec3_t   start_o;
+    vec3_t   start_v;
+    vec3_t   nostep_o;
+    vec3_t   nostep_v;
+    trace_t  trace;
+    qboolean bWasOnGoodGround;
+    vec3_t   up;
+    vec3_t   down;
 
-	VectorCopy( pm->ps->origin, start_o );
-	VectorCopy( pm->ps->velocity, start_v );
+    VectorCopy(pm->ps->origin, start_o);
+    VectorCopy(pm->ps->velocity, start_v);
 
-	if ( PM_SlideMove( gravity ) == 0 ) {
-		return;		// we got exactly where we wanted to go first try	
-	}
+    if (PM_SlideMove(gravity) == 0) {
+        return; // we got exactly where we wanted to go first try
+    }
 
-	VectorCopy( start_o, down );
-	down[ 2 ] -= STEPSIZE;
-	pm->trace( &trace, start_o, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	VectorSet( up, 0, 0, 1 );
+    VectorCopy(start_o, down);
+    down[2] -= STEPSIZE;
+    pm->trace(&trace, start_o, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    VectorSet(up, 0, 0, 1);
 
-	// never step up when you still have up velocity
-	if( pm->ps->velocity[ 2 ] > 0 && ( trace.fraction == 1.0f || 
-		DotProduct( trace.plane.normal, up ) < MIN_WALK_NORMAL ) ) {
-		return;
-	}
+    // never step up when you still have up velocity
+    if (pm->ps->velocity[2] > 0 && (trace.fraction == 1.0f || DotProduct(trace.plane.normal, up) < MIN_WALK_NORMAL)) {
+        return;
+    }
 
-	if( pml.groundPlane && pml.groundTrace.plane.normal[ 2 ] >= MIN_WALK_NORMAL )
-	{
-		bWasOnGoodGround = true;
-	}
-	else
-	{
-		bWasOnGoodGround = false;
-	}
+    if (pml.groundPlane && pml.groundTrace.plane.normal[2] >= MIN_WALK_NORMAL) {
+        bWasOnGoodGround = true;
+    } else {
+        bWasOnGoodGround = false;
+    }
 
-	VectorCopy( start_o, up );
-	up[ 2 ] += STEPSIZE;
+    VectorCopy(start_o, up);
+    up[2] += STEPSIZE;
 
-	// test the player position if they were a stepheight higher
-	pm->trace( &trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if( trace.allsolid )
-	{
-		up[ 2 ] -= 9.0f;
-		pm->trace( &trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-		if( trace.allsolid )
-		{
-			return;
-		}
-	}
+    // test the player position if they were a stepheight higher
+    pm->trace(&trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    if (trace.allsolid) {
+        up[2] -= 9.0f;
+        pm->trace(&trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+        if (trace.allsolid) {
+            return;
+        }
+    }
 
-	VectorCopy( pm->ps->origin, nostep_o );
-	VectorCopy( pm->ps->velocity, nostep_v );
+    VectorCopy(pm->ps->origin, nostep_o);
+    VectorCopy(pm->ps->velocity, nostep_v);
 
-	// try slidemove from this position
-	VectorCopy( up, pm->ps->origin );
-	VectorCopy( start_v, pm->ps->velocity );
+    // try slidemove from this position
+    VectorCopy(up, pm->ps->origin);
+    VectorCopy(start_v, pm->ps->velocity);
 
-	PM_SlideMove( gravity );
+    PM_SlideMove(gravity);
 
-	// push down the final amount
-	VectorCopy( pm->ps->origin, down );
-	down[ 2 ] -= STEPSIZE;
+    // push down the final amount
+    VectorCopy(pm->ps->origin, down);
+    down[2] -= STEPSIZE;
 
-	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if( !trace.allsolid )
-	{
-		if( bWasOnGoodGround && trace.fraction < 1.0 && trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-		{
-			VectorCopy( nostep_o, pm->ps->origin );
-			VectorCopy( nostep_v, pm->ps->velocity );
-			return;
-		}
+    pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    if (!trace.allsolid) {
+        if (bWasOnGoodGround && trace.fraction < 1.0 && trace.plane.normal[2] < MIN_WALK_NORMAL) {
+            VectorCopy(nostep_o, pm->ps->origin);
+            VectorCopy(nostep_v, pm->ps->velocity);
+            return;
+        }
 
-		VectorCopy( trace.endpos, pm->ps->origin );
-	}
+        VectorCopy(trace.endpos, pm->ps->origin);
+    }
 
-	if ( trace.fraction < 1.0f ) {
-		PM_ClipVelocity( pm->ps->velocity, trace.plane.normal, pm->ps->velocity, OVERCLIP );
-	}
+    if (trace.fraction < 1.0f) {
+        PM_ClipVelocity(pm->ps->velocity, trace.plane.normal, pm->ps->velocity, OVERCLIP);
+    }
 
-	pm->stepped = qtrue;
+    pm->stepped = qtrue;
 }
-
diff --git a/code/fgame/bg_voteoptions.cpp b/code/fgame/bg_voteoptions.cpp
index 714eafe0..8c9e20bb 100644
--- a/code/fgame/bg_voteoptions.cpp
+++ b/code/fgame/bg_voteoptions.cpp
@@ -254,7 +254,7 @@ void VoteOptions::ParseVoteOptions()
                 } else {
                     newOption->m_pListItem = newListItem;
                 }
-                listItem = newListItem;
+                listItem                 = newListItem;
                 newListItem->m_sItemName = token;
 
                 if (!script.TokenAvailable(false)) {
@@ -564,7 +564,7 @@ void CG_PushCallVoteSubClient_f(void)
         if (!strlen(cg.clientinfo[i].name)) {
             continue;
         }
-        
+
         VO_ExecuteCommand(
             va("globalwidgetcommand voteclientlist additem \"%i: %s\" \"callvote %i %i;popmenu 0\"\n",
                i,
diff --git a/code/fgame/bg_voteoptions.h b/code/fgame/bg_voteoptions.h
index 0d73ebeb..8c69377e 100644
--- a/code/fgame/bg_voteoptions.h
+++ b/code/fgame/bg_voteoptions.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #pragma once
 
 #ifdef __cplusplus
-#  include "listener.h"
+#    include "listener.h"
 #endif
 
 #include "g_public.h"

From 88ac49c0c91b5a74b1de809f97bcea36b5f0ee39 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:35:37 +0200
Subject: [PATCH 1036/2040] Set the correct flag when the player is using a
 turret

---
 code/fgame/bg_pmove.cpp | 135 ++++++++++++++++++++++++----------------
 code/fgame/bg_public.h  |   3 +-
 code/fgame/player.cpp   |  12 ++--
 3 files changed, 91 insertions(+), 59 deletions(-)

diff --git a/code/fgame/bg_pmove.cpp b/code/fgame/bg_pmove.cpp
index 241eddbb..69e4f1a7 100644
--- a/code/fgame/bg_pmove.cpp
+++ b/code/fgame/bg_pmove.cpp
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -1573,7 +1574,17 @@ void PmoveAdjustAngleSettings(vec_t *vViewAngles, vec_t *vAngles, playerState_t
     vec3_t armsAngles, torsoAngles, headAngles;
     float  fTmp;
 
-    if (pPlayerState->pm_type == PM_CLIMBWALL) {
+    if (pPlayerState->pm_type == PM_DEAD) {
+        // set the default angles
+        VectorSet(pEntState->bone_angles[HEAD_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+        QuatSet(pEntState->bone_quat[HEAD_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
+    } else if (pPlayerState->pm_type == PM_CLIMBWALL) {
         PmoveAdjustViewAngleSettings_OnLadder(vViewAngles, vAngles, pPlayerState, pEntState);
         VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
         VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
@@ -1586,67 +1597,87 @@ void PmoveAdjustAngleSettings(vec_t *vViewAngles, vec_t *vAngles, playerState_t
         VectorScale(headAngles, 0.5f, pEntState->bone_angles[HEAD_TAG]);
 
         EulerToQuat(headAngles, pEntState->bone_quat[HEAD_TAG]);
-        return;
-    }
-
-    if (pPlayerState->pm_type != PM_DEAD) {
+    } else {
         fTmp = AngleMod(vViewAngles[1]);
         VectorSet(vAngles, 0, fTmp, 0);
 
-        if (!(pPlayerState->pm_flags & PMF_VIEW_PRONE) || (pPlayerState->pm_flags & PMF_DUCKED)) {
-            fTmp = AngleMod(vViewAngles[0]);
+        if (pPlayerState->pm_flags & PMF_TURRET) {
+            vAngles[2] = 0;
+            // Added in 2.0
+            //  Clients checking this flag will draw an icon
+            //  above the head of teammates
+            pEntState->eFlags |= EF_PLAYER_ARTILLERY;
+        } else {
+            fTmp = AngleMod(vViewAngles[1]);
+            VectorSet(vAngles, 0, fTmp, 0);
+            pEntState->eFlags &= ~EF_PLAYER_ARTILLERY;
+        }
 
-            VectorSet(temp, fTmp, 0, pPlayerState->fLeanAngle * 0.60f);
-            VectorSet(temp2, fTmp, 0, pPlayerState->fLeanAngle);
+        if (pPlayerState->pm_flags & PMF_TURRET) {
+            // set the default angles
+            VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+            VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+            VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+            QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+            QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+            QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
 
-            if (fTmp > 180.0f) {
-                temp2[0] = fTmp - 360.0f;
+            AnglesSubtract(vViewAngles, vAngles, headAngles);
+            // Added in 2.0
+            //  Prevent rotating the player head like a monster
+            if (headAngles[1] > 90) {
+                headAngles[1] = 90;
+            }
+            if (headAngles[1] < -90) {
+                headAngles[1] = -90;
             }
 
-            temp2[0] = 0.90f * temp2[0] * 0.70f;
-
-            AnglesSubtract(temp, temp2, headAngles);
-            VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
-            EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
-
-            if (temp2[0] <= 0.0f) {
-                fTmp = -0.1f;
-            } else {
-                fTmp = 0.3f;
-            }
-
-            VectorSet(temp, fTmp * temp2[0], 0, pPlayerState->fLeanAngle * 0.8f);
-            VectorCopy(temp, pEntState->bone_angles[PELVIS_TAG]);
-            EulerToQuat(pEntState->bone_angles[PELVIS_TAG], pEntState->bone_quat[PELVIS_TAG]);
-
-            float fDelta = (1.0f - fTmp) * temp2[0];
-
-            if (vViewAngles[0] <= 0.0f) {
-                VectorSet(torsoAngles, fDelta * 0.60f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
-                VectorSet(armsAngles, fDelta * 0.40f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
-            } else {
-                VectorSet(torsoAngles, fDelta * 0.70f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
-                VectorSet(armsAngles, fDelta * 0.30f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
-            }
-
-            VectorCopy(torsoAngles, pEntState->bone_angles[TORSO_TAG]);
-            EulerToQuat(pEntState->bone_angles[TORSO_TAG], pEntState->bone_quat[TORSO_TAG]);
-
-            VectorCopy(armsAngles, pEntState->bone_angles[ARMS_TAG]);
-            EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
+            VectorSet(pEntState->bone_angles[HEAD_TAG], 0, 0, 0);
+            EulerToQuat(headAngles, pEntState->bone_quat[HEAD_TAG]);
             return;
         }
-    }
 
-    // set the default angles
-    VectorSet(pEntState->bone_angles[HEAD_TAG], 0, 0, 0);
-    VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
-    VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
-    VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
-    QuatSet(pEntState->bone_quat[HEAD_TAG], 0, 0, 0, 1);
-    QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
-    QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
-    QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
+        fTmp = AngleMod(vViewAngles[0]);
+
+        VectorSet(temp, fTmp, 0, pPlayerState->fLeanAngle * 0.60f);
+        VectorSet(temp2, fTmp, 0, pPlayerState->fLeanAngle);
+
+        if (fTmp > 180.0f) {
+            temp2[0] = fTmp - 360.0f;
+        }
+
+        temp2[0] = 0.90f * temp2[0] * 0.70f;
+
+        AnglesSubtract(temp, temp2, headAngles);
+        VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
+        EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
+
+        if (temp2[0] <= 0.0f) {
+            fTmp = -0.1f;
+        } else {
+            fTmp = 0.3f;
+        }
+
+        VectorSet(temp, fTmp * temp2[0], 0, pPlayerState->fLeanAngle * 0.8f);
+        VectorCopy(temp, pEntState->bone_angles[PELVIS_TAG]);
+        EulerToQuat(pEntState->bone_angles[PELVIS_TAG], pEntState->bone_quat[PELVIS_TAG]);
+
+        float fDelta = (1.0f - fTmp) * temp2[0];
+
+        if (vViewAngles[0] <= 0.0f) {
+            VectorSet(torsoAngles, fDelta * 0.60f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
+            VectorSet(armsAngles, fDelta * 0.40f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
+        } else {
+            VectorSet(torsoAngles, fDelta * 0.70f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
+            VectorSet(armsAngles, fDelta * 0.30f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
+        }
+
+        VectorCopy(torsoAngles, pEntState->bone_angles[TORSO_TAG]);
+        EulerToQuat(pEntState->bone_angles[TORSO_TAG], pEntState->bone_quat[TORSO_TAG]);
+
+        VectorCopy(armsAngles, pEntState->bone_angles[ARMS_TAG]);
+        EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
+    }
 }
 
 // Used to set arms angles accordingly, calculated client-side
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index f3324ea2..d2e19431 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -257,7 +258,7 @@ movement on the server game.
 #define PMF_LEVELEXIT       (1 << 11)
 #define PMF_NO_GRAVITY      (1 << 12)
 #define PMF_NO_HUD          (1 << 13)
-#define PMF_UNKNOWN         (1 << 14)
+#define PMF_TURRET          (1 << 14)
 #define PMF_NO_LEAN         (1 << 15)
 
     // moveposflags
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0e392f1a..91594cb3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3941,7 +3941,7 @@ void Player::ClientMove(usercmd_t *ucmd)
     client->ps.pm_type = GetMovePlayerMoveType();
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_NO_GRAVITY | PMF_VIEW_PRONE
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE
           | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
 
     if (level.playerfrozen || m_bFrozen) {
@@ -4130,11 +4130,11 @@ void Player::VehicleMove(usercmd_t *ucmd)
 
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_NO_GRAVITY | PMF_VIEW_PRONE
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE
           | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
 
     // disable prediction
-    client->ps.pm_flags |= PMF_NO_GRAVITY | PMF_NO_PREDICTION;
+    client->ps.pm_flags |= PMF_TURRET | PMF_NO_PREDICTION;
 
     if (level.playerfrozen || m_bFrozen) {
         client->ps.pm_flags |= PMF_FROZEN;
@@ -4165,13 +4165,13 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_NO_GRAVITY | PMF_VIEW_PRONE
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE
           | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
 
     // disable prediction
-    client->ps.pm_flags |= PMF_NO_GRAVITY | PMF_NO_PREDICTION;
+    client->ps.pm_flags |= PMF_TURRET | PMF_NO_PREDICTION;
     if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
-        client->ps.pm_flags |= PMF_NO_GRAVITY;
+        client->ps.pm_flags |= PMF_TURRET;
     }
 
     if (level.playerfrozen || m_bFrozen) {

From dfd04f0d41bcb0e97b19e37a6393c7a701e70dba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:50:11 +0200
Subject: [PATCH 1037/2040] Reset the player state when using a turret

This prevents the player from using the turret + hold their weapon to crouch and become impossible to hit
---
 code/fgame/player.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 91594cb3..7add90a3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3400,6 +3400,7 @@ void Player::DoUse(Event *ev)
     int        touch[MAX_GENTITIES];
     int        num;
     int        i;
+    bool       bWasInTurretOrVehicle;
 
     if (g_gametype->integer != GT_SINGLE_PLAYER && IsSpectator()) {
         // Prevent using stuff while spectating
@@ -3411,7 +3412,9 @@ void Player::DoUse(Event *ev)
         return;
     }
 
-    if (m_pVehicle || m_pTurret) {
+    bWasInTurretOrVehicle = m_pVehicle || m_pTurret;
+
+    if (bWasInTurretOrVehicle) {
         RemoveFromVehiclesAndTurretsInternal();
         return;
     }
@@ -3469,7 +3472,7 @@ void Player::DoUse(Event *ev)
         }
     }
 
-    if (i < num && m_pVehicle) {
+    if (!bWasInTurretOrVehicle && m_pVehicle) {
         //
         // Added in 2.30
         //  Make the vehicle also invincible if the player is invincible
@@ -3480,6 +3483,16 @@ void Player::DoUse(Event *ev)
             m_pVehicle->flags &= ~FL_GODMODE;
         }
     }
+
+    if (!bWasInTurretOrVehicle && (m_pVehicle || m_pTurret)) {
+        //
+        // Added in OPM
+        //  Reset the legs and torso state.
+        //  This prevents players from using a turret and hold the weapon fire
+        //  to crouch with their weapon and become impossible to hit
+        currentState_Legs = statemap_Legs->FindState("STAND");
+        currentState_Torso = statemap_Torso->FindState("STAND");
+    }
 }
 
 void Player::TouchStuff(pmove_t *pm)

From 15e8a7124960730cc9911fd2126d3ccd970176d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:59:41 +0200
Subject: [PATCH 1038/2040] Fix bot userinfo accumulating with previous bot
 userinfo

---
 code/fgame/g_bot.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index bcbc2fbf..35e0ea45 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -75,12 +75,13 @@ void G_AddBot(unsigned int num, saved_bot_t* saved)
 	gentity_t *e;
 	char botName[ MAX_NETNAME ];
 	char challenge[ MAX_STRING_TOKENS ];
-	char userinfo[MAX_INFO_STRING]{ 0 };
 	Event* teamEv;
 
 	num = Q_min(num, sv_maxbots->integer);
 	for( n = 0; n < num; n++ )
 	{
+		char userinfo[MAX_INFO_STRING]{ 0 };
+
 		for( i = maxclients->integer; i < game.maxclients; i++ )
 		{
 			e = &g_entities[ i ];

From 388ab210a7cbe5cc22b36426f4bb5175ce61cecc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:42:10 +0200
Subject: [PATCH 1039/2040] Fix incorrect obituary hit location

---
 code/fgame/g_utils.cpp |  6 +++++-
 code/fgame/player.cpp  | 18 +++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index ad5a94c9..92490c72 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -2116,7 +2116,11 @@ G_PrintDeathMessageEmulated(const char *s1, const char *s2, char *attackerName,
         return va("%c%s %s\n", hudColor, victimName, result1);
     } else if (tolower(type) == 'p') {
         if (*s2 == 'x') {
-            return va("%c%s %s %s\n", hudColor, victimName, result1, attackerName);
+            if (s2[1] && s2[2]) {
+                return va("%c%s %s %s %s\n", hudColor, victimName, result1, attackerName, s2 + 2);
+            } else {
+                return va("%c%s %s %s\n", hudColor, victimName, result1, attackerName);
+            }
         } else {
             return va("%c%s %s %s%s\n", hudColor, victimName, result1, attackerName, result2);
         }
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 7add90a3..bbca24a9 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2783,13 +2783,13 @@ void Player::Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int
         }
 
         if (bDispLocation && g_obituarylocation->integer) {
-            str szConv1 = s1 + str(" ") + G_LocationNumToDispString(iLocation);
+            str szConv2 = s2 + " in the " + G_LocationNumToDispString(iLocation);
 
             if (dedicated->integer) {
-                gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(szConv1.c_str()));
+                gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(szConv2.c_str()));
             }
 
-            G_PrintDeathMessage(szConv1, s2.c_str(), "x", client->pers.netname, this, "s");
+            G_PrintDeathMessage(s1, szConv2.c_str(), "x", client->pers.netname, this, "s");
         } else {
             if (dedicated->integer) {
                 gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(s1.c_str()));
@@ -2904,20 +2904,20 @@ void Player::Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int
         }
 
         if (bDispLocation && g_obituarylocation->integer) {
-            str szConv1 = s1 + str(" ") + G_LocationNumToDispString(iLocation);
+            str szConv2 = s2 + " in the " + G_LocationNumToDispString(iLocation);
 
             G_PrintDeathMessage(
-                szConv1.c_str(), s2.c_str(), attacker->client->pers.netname, client->pers.netname, this, "p"
+                s1.c_str(), szConv2.c_str(), attacker->client->pers.netname, client->pers.netname, this, "p"
             );
 
             if (dedicated->integer) {
                 str szLoc1, szLoc2;
 
-                szLoc1 = gi.LV_ConvertString(szConv1.c_str());
+                szLoc1 = gi.LV_ConvertString(s1.c_str());
                 if (s2 == 'x') {
                     gi.Printf("%s %s %s\n", client->pers.netname, szLoc1.c_str(), attacker->client->pers.netname);
                 } else {
-                    szLoc2 = gi.LV_ConvertString(s2.c_str());
+                    szLoc2 = gi.LV_ConvertString(szConv2.c_str());
                     gi.Printf(
                         "%s %s %s%s\n",
                         client->pers.netname,
@@ -2991,9 +2991,9 @@ void Player::Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int
         }
 
         if (bDispLocation && g_obituarylocation->integer) {
-            str szConv1 = s1 + str(" ") + G_LocationNumToDispString(iLocation);
+            str szConv2 = s2 + " in the " + G_LocationNumToDispString(iLocation);
 
-            G_PrintDeathMessage(szConv1.c_str(), s2.c_str(), "x", client->pers.netname, this, "w");
+            G_PrintDeathMessage(s1.c_str(), szConv2.c_str(), "x", client->pers.netname, this, "w");
 
             if (dedicated->integer) {
                 gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(s1.c_str()));

From 9b70e646dc03e35f1227a7fc15563213759612b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:52:22 +0200
Subject: [PATCH 1040/2040] Add "auto" to automatically choose a primary weapon

---
 code/fgame/player.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index bbca24a9..0e78db26 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -9905,6 +9905,27 @@ void Player::EventPrimaryDMWeapon(Event *ev)
         bIsBanned = (dmflags->integer & DF_WEAPON_NO_ROCKET);
     } else if (!str::icmp(dm_weapon, "landmine")) {
         bIsBanned = (dmflags->integer & DF_WEAPON_NO_LANDMINE) || !QueryLandminesAllowed();
+    } else if (!str::icmp(dm_weapon, "auto")) {
+        const char* primaryList[7];
+        size_t numPrimaries = 0;
+
+        //
+        // Added in OPM
+        //  Choose a random allowed weapon
+        //
+        if (!(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) { primaryList[numPrimaries++] = "shotgun"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) { primaryList[numPrimaries++] = "rifle"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_SNIPER)) { primaryList[numPrimaries++] = "sniper"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_SMG)) { primaryList[numPrimaries++] = "smg"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_MG)) { primaryList[numPrimaries++] = "mg"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_ROCKET)) { primaryList[numPrimaries++] = "heavy"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_LANDMINE) && QueryLandminesAllowed()) { primaryList[numPrimaries++] = "landmine"; }
+
+        if (numPrimaries) {
+            dm_weapon = primaryList[rand() % numPrimaries];
+        } else {
+            bIsBanned = qtrue;
+        }
     }
 
     if (bIsBanned) {

From 0472a93c3fbe9a5522c1f168079bea5765c1f9ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:02:48 +0200
Subject: [PATCH 1041/2040] Ignore kills when telefragging

This fixes an issue (that also occur on OG) where telefrags would also count towards teamkills
---
 code/fgame/player.cpp | 50 ++++++++++++++++++++++++++-----------------
 code/fgame/player.h   |  2 +-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0e78db26..23c84111 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3103,7 +3103,7 @@ void Player::Killed(Event *ev)
     RemoveFromVehiclesAndTurrets();
 
     if (g_gametype->integer != GT_SINGLE_PLAYER && attacker && attacker->IsSubclassOfPlayer()) {
-        ((Player *)attacker)->KilledPlayerInDeathmatch(this);
+        static_cast<Player*>(attacker)->KilledPlayerInDeathmatch(this, (meansOfDeath_t)meansofdeath);
     }
 
     deadflag = DEAD_DYING;
@@ -3275,36 +3275,46 @@ void Player::SetStopwatch(int iDuration, stopWatchType_t type)
     gi.SendServerCommand(edict - g_entities, szCmd);
 }
 
-void Player::KilledPlayerInDeathmatch(Player *killed)
+void Player::KilledPlayerInDeathmatch(Player *killed, meansOfDeath_t meansofdeath)
 {
     DM_Team *pDMTeam;
 
     pDMTeam = killed->GetDM_Team();
 
+    if (meansofdeath == MOD_TELEFRAG) {
+        //
+        // Added in OPM
+        //  Telefrag isn't the fault of anyone
+        //  so don't count any kill
+        //
+        return;
+    }
+
     if (killed == this) {
         pDMTeam->AddKills(this, -1);
         gi.SendServerCommand(
             edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString("You killed yourself")
         );
-    } else {
-        if (pDMTeam != GetDM_Team() || g_gametype->integer <= GT_FFA || g_gametype->integer >= GT_MAX_GAME_TYPE) {
-            current_team->AddKills(this, 1);
-        } else {
-            //
-            // A teammate was killed
-            //
-            current_team->AddKills(this, -1);
 
-            num_team_kills++;
-        }
-
-        gi.SendServerCommand(
-            edict - g_entities,
-            "print \"" HUD_MESSAGE_WHITE "%s %s\n\"",
-            gi.LV_ConvertString("You killed"),
-            killed->client->pers.netname
-        );
+        return;
     }
+
+    if (pDMTeam == GetDM_Team() && g_gametype->integer >= GT_TEAM) {
+        //
+        // A teammate was killed
+        //
+        current_team->AddKills(this, -1);
+        num_team_kills++;
+    } else {
+        current_team->AddKills(this, 1);
+    }
+
+    gi.SendServerCommand(
+        edict - g_entities,
+        "print \"" HUD_MESSAGE_WHITE "%s %s\n\"",
+        gi.LV_ConvertString("You killed"),
+        killed->client->pers.netname
+    );
 }
 
 void Player::Pain(Event *ev)
@@ -9485,7 +9495,7 @@ void Player::ArmorDamage(Event *ev)
 
         if (attacker && attacker->IsSubclassOfPlayer()) {
             if (attacker != this) {
-                if (g_gametype->integer > 1 && !g_teamdamage->integer) {
+                if (g_gametype->integer >= GT_TEAM && !g_teamdamage->integer) {
                     // check for team damage
                     if (attacker->GetDM_Team() == GetDM_Team() && mod != MOD_TELEFRAG) {
                         return;
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 4d723792..9f1cfb80 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -850,7 +850,7 @@ public:
 
     void EventDMDeathDrop(Event *ev);
     void EventStopwatch(Event *ev);
-    void KilledPlayerInDeathmatch(Player *killed);
+    void KilledPlayerInDeathmatch(Player *killed, meansOfDeath_t meansofdeath);
     void SetStopwatch(int iDuration, stopWatchType_t type = SWT_NORMAL);
     void BeginTempSpectator(void);
     void EndSpectator(void);

From 200a80aa0285cfe604303f880a0d09b1ca78546e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:02:59 +0200
Subject: [PATCH 1042/2040] Automatically choose a primary weapon for bots

---
 code/fgame/g_bot.cpp     | 2 +-
 code/fgame/playerbot.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 35e0ea45..24b43611 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -164,7 +164,7 @@ void G_AddBot(unsigned int num, saved_bot_t* saved)
             e->entity->PostEvent(teamEv, level.frametime);
 
             Event* ev = new Event(EV_Player_PrimaryDMWeapon);
-            ev->AddString("smg");
+			ev->AddString("auto");
 
             e->entity->PostEvent(ev, level.frametime);
         }
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 1241d9df..486e816a 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1294,6 +1294,10 @@ void PlayerBot::Killed(Event *ev)
     m_botEyes.angles[1] = 0;
 
     m_vLastDeathPos = origin;
+
+    // Choose a new random primary weapon
+    Event event(EV_Player_PrimaryDMWeapon);
+    event.AddString("auto");
 }
 
 void PlayerBot::GotKill(Event *ev)

From db625baaddb5a7a747937dc05cef17138e6524d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:12:10 +0200
Subject: [PATCH 1043/2040] Set the healrate to 0 (instant) by default on
 protocol 8 and below (vanilla AA)

---
 code/fgame/gamecvars.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index 51268372..d559870e 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -449,7 +449,14 @@ void CVAR_Init(void)
 
     g_teamdamage         = gi.Cvar_Get("g_teamdamage", "0", 0);
     g_healthdrop         = gi.Cvar_Get("g_healthdrop", "1", 0);
-    g_healrate           = gi.Cvar_Get("g_healrate", "10", 0);
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        g_healrate = gi.Cvar_Get("g_healrate", "10", 0);
+    } else {
+        //
+        // By default, no healrate on 1.11 and below
+        //
+        g_healrate = gi.Cvar_Get("g_healrate", "0", 0);
+    }
     g_allowvote          = gi.Cvar_Get("g_allowvote", "1", 0);
     g_maprotation_filter = gi.Cvar_Get("g_maprotation_filter", "ffa", 0);
     g_warmup             = gi.Cvar_Get("g_warmup", "20", CVAR_ARCHIVE);

From 95435ea51210cbe3bfb2dcf2fd2cb515825d5956 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:29:37 +0200
Subject: [PATCH 1044/2040] Improve bot movement

- The bot will immediately move upon spawning
- If blocked, the block will move randomly to get out
- There is now only 1/5 chance the bot will go to the location where they died
---
 code/fgame/playerbot.cpp | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 486e816a..8f0358b8 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -253,12 +253,8 @@ void PlayerBot::MoveThink(void)
             m_iTempAwayTime = level.inttime + 750;
 
             // Try to backward a little
-            //vDir = end - origin;
-            //VectorNormalizeFast( vDir );
-            //m_Path.FindPathAway( origin, origin + vDir * 16, vDir, this, 256, NULL, 0 );
-            //m_Path.FindPathAway( origin, origin + m_vLastValidDir * 16, -m_vLastValidDir, this, 256, NULL, 0 );
             m_Path.Clear();
-            m_vCurrentGoal = m_vLastValidGoal - m_vLastValidDir * 256;
+            m_vCurrentGoal = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
             return;
         }
     }
@@ -286,10 +282,15 @@ void PlayerBot::MoveThink(void)
     //vDir = m_vCurrentGoal - centroid;
 
     // Rotate the dir
-    vDir[0] = m_Path.CurrentDelta()[0];
-    vDir[1] = m_Path.CurrentDelta()[1];
+    if (m_Path.CurrentNode()) {
+        vDir[0] = m_Path.CurrentDelta()[0];
+        vDir[1] = m_Path.CurrentDelta()[1];
+    } else {
+        vDir = m_vCurrentGoal - origin;
+    }
     vDir[2] = 0;
-    VectorNormalize(vDir);
+
+    VectorNormalize2D(vDir);
     vAngles = vDir.toAngles() - angles;
     vAngles.AngleVectorsLeft(&vWishDir);
 
@@ -297,11 +298,11 @@ void PlayerBot::MoveThink(void)
     m_vLastValidGoal = m_vCurrentGoal;
 
     // Forward to the specified direction
-    float x = vWishDir.x * 255.0f;
-    float y = -vWishDir.y * 255.0f;
+    float x = vWishDir.x * 127;
+    float y = -vWishDir.y * 127;
 
-    m_botCmd.forwardmove = (signed char)(x > 127 ? 127 : x < -127 ? -127 : x);
-    m_botCmd.rightmove   = (signed char)(y > 127 ? 127 : y < -127 ? -127 : y);
+    m_botCmd.forwardmove = (signed char)Q_clamp(x, -127, 127);
+    m_botCmd.rightmove   = (signed char)Q_clamp(y, -127, 127);
     CheckJump();
 
     Weapon *pWeap = GetActiveWeapon(WEAPON_MAIN);
@@ -426,6 +427,7 @@ void PlayerBot::UpdateBotStates(void)
     }
 
     m_botCmd.buttons |= BUTTON_RUN;
+    m_botCmd.serverTime = level.svsTime;
 
     m_botEyes.ofs[0]    = 0;
     m_botEyes.ofs[1]    = 0;
@@ -721,7 +723,7 @@ Returns true if the bot has done moving
 */
 bool PlayerBot::MoveDone(void)
 {
-    return !m_Path.LastNode() || m_Path.Complete(origin);
+    return !m_Path.CurrentNode() || m_Path.Complete(origin);
 }
 
 /*
@@ -1293,11 +1295,18 @@ void PlayerBot::Killed(Event *ev)
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
-    m_vLastDeathPos = origin;
+    if (rand() % 5 == 0) {
+        // 1/5 chance to go back to the last death position
+        m_vLastDeathPos = origin;
+    } else {
+        m_vLastDeathPos = vec_zero;
+    }
 
     // Choose a new random primary weapon
     Event event(EV_Player_PrimaryDMWeapon);
     event.AddString("auto");
+
+    ProcessEvent(event);
 }
 
 void PlayerBot::GotKill(Event *ev)

From 123ca2812ae34a557dc9332a05c39f6019670c0a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 19:02:20 +0200
Subject: [PATCH 1045/2040] Define and use DEFAULT_SFX_NUMBER_PLAYING

---
 code/client/snd_info.cpp    | 4 ++--
 code/client/snd_local_new.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_info.cpp b/code/client/snd_info.cpp
index 6fa56996..0d994107 100644
--- a/code/client/snd_info.cpp
+++ b/code/client/snd_info.cpp
@@ -34,7 +34,7 @@ void load_sfx_info()
     sfx_infos[0].max_factor         = -1.0;
     sfx_infos[0].loop_start         = -1;
     sfx_infos[0].loop_end           = -1;
-    sfx_infos[0].max_number_playing = 5;
+    sfx_infos[0].max_number_playing = DEFAULT_SFX_NUMBER_PLAYING;
     number_of_sfx_infos             = 1;
 
     for (current_sound_file = 0; current_sound_file < 10; current_sound_file++) {
@@ -62,7 +62,7 @@ void load_sfx_info()
                     sfx_infos[number_of_sfx_infos].max_factor         = -1.f;
                     sfx_infos[number_of_sfx_infos].loop_start         = -1;
                     sfx_infos[number_of_sfx_infos].loop_end           = -1;
-                    sfx_infos[number_of_sfx_infos].max_number_playing = 5;
+                    sfx_infos[number_of_sfx_infos].max_number_playing = DEFAULT_SFX_NUMBER_PLAYING;
                     number_of_sfx_infos++;
                 }
             } else if (!Q_stricmp(token, "loopstart")) {
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 4636ccbb..02431e20 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -162,6 +162,7 @@ enum loopsound_flags_t {
 #define MAX_SFX         1400
 #define MAX_SFX_INFOS   1000
 #define MAX_LOOP_SOUNDS 64
+#define DEFAULT_SFX_NUMBER_PLAYING 10 //5
 
 extern qboolean   s_bLastInitSound;
 extern qboolean   s_bSoundStarted;

From 30f5442728c1a8b8c5ca971dc84d995ccb22e609 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 19:41:25 +0200
Subject: [PATCH 1046/2040] Limit bot vision distance to the farplane

---
 code/fgame/playerbot.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 8f0358b8..51121fe6 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1080,6 +1080,7 @@ static int sentients_compare(const void *elem1, const void *elem2)
 bool PlayerBot::CheckCondition_Attack(void)
 {
     Container<Sentient *> sents = SentientList;
+    float maxDistance = 0;
 
     bot_origin = origin;
     sents.Sort(sentients_compare);
@@ -1110,7 +1111,9 @@ bool PlayerBot::CheckCondition_Attack(void)
             }
         }
 
-        if (CanSee(sent, 80, world->m_fAIVisionDistance, false)) {
+        maxDistance = Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828);
+
+        if (CanSee(sent, 80, maxDistance, false)) {
             m_pEnemy      = sent;
             m_iAttackTime = level.inttime + 10000;
             return true;

From a9b4af98fc2586c503de667eb638f615058a6db5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 19:42:03 +0200
Subject: [PATCH 1047/2040] Make bots use random player models

---
 code/fgame/g_bot.cpp | 408 ++++++++++++++++++++++++++-----------------
 1 file changed, 246 insertions(+), 162 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 24b43611..e9b47c97 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -26,99 +26,178 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerbot.h"
 #include "g_bot.h"
 
-static gentity_t* firstBot = NULL;
-static saved_bot_t* saved_bots = NULL;
+static gentity_t   *firstBot          = NULL;
+static saved_bot_t *saved_bots        = NULL;
 static unsigned int current_bot_count = 0;
+static char       **modelList         = NULL;
 
-void G_BotBegin
-	(
-	gentity_t *ent
-	)
+Container<str> alliedModelList;
+Container<str> germanModelList;
+
+bool IsAlliedPlayerModel(const char *filename)
 {
-	level.m_bSpawnBot = true;
-	G_ClientBegin( ent, NULL );
+    return !Q_stricmpn(filename, "/allied_", 8) || !Q_stricmpn(filename, "/american_", 10);
 }
 
-void G_BotThink
-	(
-	gentity_t *ent,
-	int msec
-	)
+bool IsGermanPlayerModel(const char *filename)
 {
-	usercmd_t ucmd;
-	usereyes_t eyeinfo;
-	PlayerBot *bot;
-
-	assert( ent );
-	assert( ent->entity );
-	assert( ent->entity->IsSubclassOfBot() );
-
-	bot = ( PlayerBot * )ent->entity;
-
-	bot->UpdateBotStates();
-	bot->GetUsercmd( &ucmd );
-	bot->GetEyeInfo( &eyeinfo );
-
-	G_ClientThink( ent, &ucmd, &eyeinfo );
+    return !Q_stricmpn(filename, "/german_", 8) || !Q_stricmpn(filename, "/IT_", 4) || !Q_stricmpn(filename, "/SC_", 4);
 }
 
-gentity_t* G_GetFirstBot()
+bool IsPlayerModel(const char *filename)
 {
-	return firstBot;
+    size_t len = strlen(filename);
+
+    if (len >= 8 && !Q_stricmp(&filename[len - 8], "_fps.tik")) {
+        return false;
+    }
+
+    if (!IsAlliedPlayerModel(filename) && !IsGermanPlayerModel(filename)) {
+        return false;
+    }
+
+    return true;
 }
 
-void G_AddBot(unsigned int num, saved_bot_t* saved)
+void ClearModelList()
 {
-	int n;
-	int i;
-	int clientNum = -1;
-	gentity_t *e;
-	char botName[ MAX_NETNAME ];
-	char challenge[ MAX_STRING_TOKENS ];
-	Event* teamEv;
+    alliedModelList.FreeObjectList();
+    germanModelList.FreeObjectList();
+}
 
-	num = Q_min(num, sv_maxbots->integer);
-	for( n = 0; n < num; n++ )
-	{
-		char userinfo[MAX_INFO_STRING]{ 0 };
+void InitModelList()
+{
+    char **fileList;
+    int    numFiles;
+    int    i;
+    size_t numAlliedModels = 0, numGermanModels = 0;
+    byte  *p;
 
-		for( i = maxclients->integer; i < game.maxclients; i++ )
-		{
-			e = &g_entities[ i ];
+    ClearModelList();
 
-			if( !e->inuse && e->client )
-			{
-				clientNum = i;
-				break;
-			}
-		}
+    fileList = gi.FS_ListFiles("models/player", ".tik", qfalse, &numFiles);
 
-		if( clientNum == -1 )
-		{
-			gi.Printf( "No free slot for a bot\n" );
-			return;
-		}
+    for (i = 0; i < numFiles; i++) {
+        const char *filename = fileList[i];
 
-		if( gi.Argc() > 2 )
-		{
-			Q_strncpyz( botName, gi.Argv( 2 ), sizeof( botName ) );
-		}
-		else
-		{
-			Com_sprintf( botName, sizeof( botName ), "bot%d", clientNum - maxclients->integer + 1 );
-		}
+        if (!IsPlayerModel(filename)) {
+            continue;
+        }
 
-		Com_sprintf( challenge, sizeof( challenge ), "%d", clientNum - maxclients->integer + 1 );
+        if (IsAlliedPlayerModel(filename)) {
+            numAlliedModels++;
+        } else {
+            numGermanModels++;
+        }
+    }
 
-		e->s.clientNum = clientNum;
-		e->s.number = clientNum;
+    alliedModelList.Resize(numAlliedModels);
+    germanModelList.Resize(numGermanModels);
+
+    for (i = 0; i < numFiles; i++) {
+        const char *filename = fileList[i];
+        size_t      len      = strlen(filename);
+
+        if (!IsPlayerModel(filename)) {
+            continue;
+        }
+
+        if (IsAlliedPlayerModel(filename)) {
+            alliedModelList.AddObject(str(filename + 1, 0, len - 5));
+        } else {
+            germanModelList.AddObject(str(filename + 1, 0, len - 5));
+        }
+    }
+
+    gi.FS_FreeFileList(fileList);
+}
+
+void G_BotBegin(gentity_t *ent)
+{
+    level.m_bSpawnBot = true;
+    G_ClientBegin(ent, NULL);
+}
+
+void G_BotThink(gentity_t *ent, int msec)
+{
+    usercmd_t  ucmd;
+    usereyes_t eyeinfo;
+    PlayerBot *bot;
+
+    assert(ent);
+    assert(ent->entity);
+    assert(ent->entity->IsSubclassOfBot());
+
+    bot = (PlayerBot *)ent->entity;
+
+    bot->UpdateBotStates();
+    bot->GetUsercmd(&ucmd);
+    bot->GetEyeInfo(&eyeinfo);
+
+    G_ClientThink(ent, &ucmd, &eyeinfo);
+}
+
+gentity_t *G_GetFirstBot()
+{
+    return firstBot;
+}
+
+void G_AddBot(unsigned int num, saved_bot_t *saved)
+{
+    int        n;
+    int        i;
+    int        clientNum = -1;
+    gentity_t *e;
+    char       botName[MAX_NETNAME];
+    char       challenge[MAX_STRING_TOKENS];
+    Event     *teamEv;
+
+    num = Q_min(num, sv_maxbots->integer);
+    for (n = 0; n < num; n++) {
+        char userinfo[MAX_INFO_STRING] {0};
+
+        for (i = maxclients->integer; i < game.maxclients; i++) {
+            e = &g_entities[i];
+
+            if (!e->inuse && e->client) {
+                clientNum = i;
+                break;
+            }
+        }
+
+        if (clientNum == -1) {
+            gi.Printf("No free slot for a bot\n");
+            return;
+        }
+
+        if (gi.Argc() > 2) {
+            Q_strncpyz(botName, gi.Argv(2), sizeof(botName));
+        } else {
+            Com_sprintf(botName, sizeof(botName), "bot%d", clientNum - maxclients->integer + 1);
+        }
+
+        Com_sprintf(challenge, sizeof(challenge), "%d", clientNum - maxclients->integer + 1);
+
+        e->s.clientNum = clientNum;
+        e->s.number    = clientNum;
 
         if (saved) {
-			strncpy(userinfo, saved->pers.userinfo, ARRAY_LEN(userinfo));
-		} else {
+            strncpy(userinfo, saved->pers.userinfo, ARRAY_LEN(userinfo));
+        } else {
             Info_SetValueForKey(userinfo, "name", botName);
-            Info_SetValueForKey(userinfo, "dm_playermodel", "allied_pilot");
-            Info_SetValueForKey(userinfo, "dm_playergermanmodel", "german_afrika_officer");
+
+            //
+            // Choose a random model
+            //
+            if (alliedModelList.NumObjects()) {
+                Info_SetValueForKey(userinfo, "dm_playermodel", alliedModelList[rand() % alliedModelList.NumObjects()]);
+            }
+            if (germanModelList.NumObjects()) {
+                Info_SetValueForKey(
+                    userinfo, "dm_playergermanmodel", germanModelList[rand() % germanModelList.NumObjects()]
+                );
+            }
+
             Info_SetValueForKey(userinfo, "fov", "80");
             Info_SetValueForKey(userinfo, "protocol", "8");
             Info_SetValueForKey(userinfo, "ip", "0.0.0.0");
@@ -127,23 +206,24 @@ void G_AddBot(unsigned int num, saved_bot_t* saved)
             Info_SetValueForKey(userinfo, "snaps", "1");
             Info_SetValueForKey(userinfo, "rate", "1");
             Info_SetValueForKey(userinfo, "dmprimary", "smg");
-		}
+        }
 
-		current_bot_count++;
+        current_bot_count++;
 
-		G_BotConnect( clientNum, userinfo );
+        G_BotConnect(clientNum, userinfo);
 
-		if (saved) {
-			e->client->pers = saved->pers;
-		}
+        if (saved) {
+            e->client->pers = saved->pers;
+        }
 
-		if( !firstBot )
-			firstBot = e;
+        if (!firstBot) {
+            firstBot = e;
+        }
 
-		G_BotBegin( e );
+        G_BotBegin(e);
 
-		if (saved) {
-			/*
+        if (saved) {
+            /*
 			switch (saved->team)
 			{
             case TEAM_ALLIES:
@@ -159,129 +239,133 @@ void G_AddBot(unsigned int num, saved_bot_t* saved)
 				break;
 			}
 			*/
-		} else {
+        } else {
             teamEv = new Event(EV_Player_AutoJoinDMTeam);
             e->entity->PostEvent(teamEv, level.frametime);
 
-            Event* ev = new Event(EV_Player_PrimaryDMWeapon);
-			ev->AddString("auto");
+            Event *ev = new Event(EV_Player_PrimaryDMWeapon);
+            ev->AddString("auto");
 
             e->entity->PostEvent(ev, level.frametime);
         }
-	}
+    }
 }
 
 void G_RemoveBot(unsigned int num)
 {
-	num = Q_min(num, sv_maxbots->integer);
+    num = Q_min(num, sv_maxbots->integer);
 
-	for( int n = 0; n < num; n++ )
-	{
-		gentity_t *e = &g_entities[maxclients->integer + n];
-		if( e->inuse && e->client )
-		{
-			G_ClientDisconnect( e );
-			current_bot_count--;
-		}
-	}
+    for (int n = 0; n < num; n++) {
+        gentity_t *e = &g_entities[maxclients->integer + n];
+        if (e->inuse && e->client) {
+            G_ClientDisconnect(e);
+            current_bot_count--;
+        }
+    }
 }
 
-void G_SaveBots() {
-	unsigned int n;
+void G_SaveBots()
+{
+    unsigned int n;
 
     if (saved_bots) {
         delete[] saved_bots;
-		saved_bots = NULL;
+        saved_bots = NULL;
     }
 
-	if (!current_bot_count) {
-		return;
-	}
+    if (!current_bot_count) {
+        return;
+    }
 
-	saved_bots = new saved_bot_t[current_bot_count];
+    saved_bots = new saved_bot_t[current_bot_count];
     for (n = 0; n < current_bot_count; n++) {
-        gentity_t* e = &g_entities[game.maxclients - sv_maxbots->integer + n];
-		saved_bot_t& saved = saved_bots[n];
+        gentity_t   *e     = &g_entities[game.maxclients - sv_maxbots->integer + n];
+        saved_bot_t& saved = saved_bots[n];
 
-		if (e->inuse && e->client)
-		{
-			Player* player = static_cast<Player*>(e->entity);
+        if (e->inuse && e->client) {
+            Player *player = static_cast<Player *>(e->entity);
 
-			saved.bValid = true;
-			//saved.team = player->GetTeam();
-			saved.pers = player->client->pers;
-		}
-	}
+            saved.bValid = true;
+            //saved.team = player->GetTeam();
+            saved.pers = player->client->pers;
+        }
+    }
 }
 
-void G_RestoreBots() {
-	unsigned int n;
+void G_RestoreBots()
+{
+    unsigned int n;
 
     if (!saved_bots) {
-		return;
+        return;
     }
 
     for (n = 0; n < sv_numbots->integer; n++) {
         saved_bot_t& saved = saved_bots[n];
 
-		G_AddBot(1, &saved);
-	}
+        G_AddBot(1, &saved);
+    }
 
-	delete[] saved_bots;
-	saved_bots = NULL;
+    delete[] saved_bots;
+    saved_bots = NULL;
 }
 
-int G_CountClients() {
-	gentity_t* other;
-	unsigned int n;
-	unsigned int count = 0;
+int G_CountClients()
+{
+    gentity_t   *other;
+    unsigned int n;
+    unsigned int count = 0;
 
-	for (n = 0; n < maxclients->integer; n++) {
-		other = &g_entities[n];
-		if (other->inuse && other->client) {
-			Player* p = static_cast<Player*>(other->entity);
-			if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
-				// ignore spectators
-				continue;
-			}
+    for (n = 0; n < maxclients->integer; n++) {
+        other = &g_entities[n];
+        if (other->inuse && other->client) {
+            Player *p = static_cast<Player *>(other->entity);
+            if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
+                // ignore spectators
+                continue;
+            }
 
-			count++;
-		}
-	}
+            count++;
+        }
+    }
 
-	return count;
+    return count;
 }
 
-void G_ResetBots() {
-	G_SaveBots();
+void G_ResetBots()
+{
+    G_SaveBots();
 
-	current_bot_count = 0;
+    current_bot_count = 0;
 }
 
-void G_SpawnBots() {
-	unsigned int numClients;
-	unsigned int numBotsToSpawn;
+void G_SpawnBots()
+{
+    unsigned int numClients;
+    unsigned int numBotsToSpawn;
 
-	if (saved_bots) {
-		G_RestoreBots();
-	}
+    InitModelList();
 
-	//
-	// Check the minimum bot count
-	//
-	numClients = G_CountClients() + sv_numbots->integer;
-	if (numClients < sv_minPlayers->integer) {
-		numBotsToSpawn = sv_minPlayers->integer - numClients;
-	} else {
-		numBotsToSpawn = sv_numbots->integer;
-	}
+    if (saved_bots) {
+        G_RestoreBots();
+    }
 
-	//
-	// Spawn bots
-	//
-	if (numBotsToSpawn > current_bot_count) {
-		G_AddBot(numBotsToSpawn - current_bot_count);
-	} else if (numBotsToSpawn < current_bot_count) {
-		G_RemoveBot(current_bot_count - numBotsToSpawn);
-	}
+    //
+    // Check the minimum bot count
+    //
+    numClients = G_CountClients() + sv_numbots->integer;
+    if (numClients < sv_minPlayers->integer) {
+        numBotsToSpawn = sv_minPlayers->integer - numClients;
+    } else {
+        numBotsToSpawn = sv_numbots->integer;
+    }
+
+    //
+    // Spawn bots
+    //
+    if (numBotsToSpawn > current_bot_count) {
+        G_AddBot(numBotsToSpawn - current_bot_count);
+    } else if (numBotsToSpawn < current_bot_count) {
+        G_RemoveBot(current_bot_count - numBotsToSpawn);
+    }
 }

From e01e989c22fccb246063aab3a40123ab3486ef1e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:10:29 +0200
Subject: [PATCH 1048/2040] Check if the snap is valid when notifying for
 hit/kill

The game would crash otherwise, this is also an issue in the original game
---
 code/cgame/cg_parsemsg.cpp | 42 +++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 5ae902d1..5ef25bee 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1576,7 +1576,11 @@ void CG_ParseCGMessage_ver_15()
 
         case CGM_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
-            Q_strncpyz(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].shaderName));
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].shaderName,
+                cgi.MSG_ReadString(),
+                sizeof(cgi.HudDrawElements[iInfo].shaderName)
+            );
             cgi.HudDrawElements[iInfo].string[0]   = 0;
             cgi.HudDrawElements[iInfo].pFont       = NULL;
             cgi.HudDrawElements[iInfo].fontName[0] = 0;
@@ -1618,12 +1622,16 @@ void CG_ParseCGMessage_ver_15()
         case CGM_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
-            Q_strncpyz(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string));
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string)
+            );
             break;
 
         case CGM_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
-            Q_strncpyz(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName));
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName)
+            );
             cgi.HudDrawElements[iInfo].hShader       = 0;
             cgi.HudDrawElements[iInfo].shaderName[0] = 0;
             // load the font
@@ -1632,11 +1640,12 @@ void CG_ParseCGMessage_ver_15()
 
         case CGM_NOTIFY_KILL:
         case CGM_NOTIFY_HIT:
-            {
-                const char* soundName;
-                int iOldEnt;
+            if (cg.snap) {
+                const char *soundName;
+                int         iOldEnt;
+
+                iOldEnt = current_entity_number;
 
-                iOldEnt               = current_entity_number;
                 current_entity_number = cg.snap->ps.clientNum;
                 if (iType == CGM_NOTIFY_HIT) {
                     soundName = "dm_kill_notify";
@@ -1958,7 +1967,11 @@ void CG_ParseCGMessage_ver_6()
 
         case CGM6_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
-            Q_strncpyz(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].shaderName));
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].shaderName,
+                cgi.MSG_ReadString(),
+                sizeof(cgi.HudDrawElements[iInfo].shaderName)
+            );
             cgi.HudDrawElements[iInfo].string[0]   = 0;
             cgi.HudDrawElements[iInfo].pFont       = NULL;
             cgi.HudDrawElements[iInfo].fontName[0] = 0;
@@ -2000,12 +2013,16 @@ void CG_ParseCGMessage_ver_6()
         case CGM6_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
-            Q_strncpyz(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string));
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string)
+            );
             break;
 
         case CGM6_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
-            Q_strncpyz(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName));
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName)
+            );
             cgi.HudDrawElements[iInfo].hShader       = 0;
             cgi.HudDrawElements[iInfo].shaderName[0] = 0;
             // load the font
@@ -2014,10 +2031,11 @@ void CG_ParseCGMessage_ver_6()
 
         case CGM6_NOTIFY_KILL:
         case CGM6_NOTIFY_HIT:
-            {
+            if (cg.snap) {
                 int iOldEnt;
 
-                iOldEnt               = current_entity_number;
+                iOldEnt = current_entity_number;
+
                 current_entity_number = cg.snap->ps.clientNum;
                 if (iType == CGM6_NOTIFY_HIT) {
                     commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);

From 090ba308d8a477997d77c25c3077fd87264b2feb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:14:24 +0200
Subject: [PATCH 1049/2040] Clear bot buttons after spawning

This fixes a rare occurrence where the bot would fire and reload after spawning
---
 code/fgame/playerbot.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 51121fe6..e2e6cb9e 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1277,6 +1277,7 @@ void PlayerBot::Spawned(void)
 {
     ClearEnemy();
     m_iCuriousTime = 0;
+    m_botCmd.buttons = 0;
 
     Player::Spawned();
 }

From dfde4a58de16f887f7f6cd44838fc51a2e37a52a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:27:59 +0200
Subject: [PATCH 1050/2040] Improve bot movements

- Do random movements if the path cannot be found
- Reset the movement if the bot is really blocked
- Set an higher fall height
---
 code/fgame/playerbot.cpp | 57 ++++++++++++++++++++++++----------------
 code/fgame/playerbot.h   |  1 +
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index e2e6cb9e..c4eae437 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -50,7 +50,7 @@ PlayerBot::PlayerBot()
         return;
     }
 
-    m_Path.SetFallHeight(96);
+    m_Path.SetFallHeight(400);
     m_bPathing   = false;
     m_bTempAway  = false;
     m_bDeltaMove = true;
@@ -77,6 +77,7 @@ PlayerBot::PlayerBot()
     m_vCurrentAng    = vec_zero;
     m_iCheckPathTime = 0;
     m_iTempAwayTime  = 0;
+    m_iNumBlocks     = 0;
     m_fYawSpeedMult  = 1.0f;
 
     m_iCuriousTime = 0;
@@ -213,18 +214,18 @@ void PlayerBot::MoveThink(void)
         m_Path.FindPath(origin, m_vTargetPos, this, 0, NULL, 0);
     }
 
-    if (m_Path.CurrentNode()) {
-        m_Path.UpdatePos(origin, 8);
+    if (!m_bTempAway) {
+        if (m_Path.CurrentNode()) {
+            m_Path.UpdatePos(origin, 8);
 
-        m_vCurrentGoal = origin;
-        VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
+            m_vCurrentGoal = origin;
+            VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
 
-        if (m_Path.Complete(origin)) {
-            // Clear the path
-            m_Path.Clear();
+            if (m_Path.Complete(origin)) {
+                // Clear the path
+                m_Path.Clear();
+            }
         }
-    } else if (!m_bTempAway) {
-        m_vCurrentGoal = origin;
     }
 
     if (ai_debugpath->integer) {
@@ -233,29 +234,32 @@ void PlayerBot::MoveThink(void)
 
     // Check if we're blocked
     if (level.inttime >= m_iCheckPathTime) {
-        Vector end;
 
         m_bDeltaMove = false;
 
         m_iCheckPathTime = level.inttime + 2000;
 
-        if (m_Path.CurrentNode() && m_Path.CurrentNode() != m_Path.LastNode()) {
-            end = m_Path.NextNode()->point;
-        } else {
-            end = m_vCurrentGoal;
+        if (m_iNumBlocks >= 10) {
+            // Give up
+            ClearMove();
         }
 
-        if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= 8 * 8) {
-            gi.DPrintf2("Updating path for bot client %i\n", edict - g_entities);
-
+        if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
             m_bTempAway     = true;
             m_bDeltaMove    = false;
             m_iTempAwayTime = level.inttime + 750;
+            m_iNumBlocks++;
 
             // Try to backward a little
             m_Path.Clear();
             m_vCurrentGoal = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
-            return;
+        } else {
+            m_iNumBlocks = 0;
+
+            if (!m_Path.CurrentNode()) {
+                m_vTargetPos = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+                m_vCurrentGoal = m_vTargetPos;
+            }
         }
     }
 
@@ -275,8 +279,14 @@ void PlayerBot::MoveThink(void)
         }
     }
 
-    if ((m_vTargetPos - origin).lengthSquared() <= 16 * 16) {
-        ClearMove();
+    if (m_Path.CurrentNode()) {
+        if ((m_vTargetPos - origin).lengthSquared() <= Square(16)) {
+            ClearMove();
+        }
+    } else {
+        if ((m_vTargetPos - origin).lengthXYSquared() <= Square(16)) {
+            ClearMove();
+        }
     }
 
     //vDir = m_vCurrentGoal - centroid;
@@ -749,6 +759,7 @@ void PlayerBot::ClearMove(void)
 {
     m_Path.Clear();
     m_bPathing = false;
+    m_iNumBlocks = 0;
 }
 
 /*
@@ -795,7 +806,9 @@ void PlayerBot::AvoidPath(
     m_Path.FindPathAway(origin, vAvoid, vDir, this, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius);
 
     if (!m_Path.CurrentNode()) {
-        m_bPathing = false;
+        // Random movements
+        m_vTargetPos = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+        m_vCurrentGoal = m_vTargetPos;
         return;
     }
 
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index e9f7b89d..bf88241f 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -57,6 +57,7 @@ private:
     bool                       m_bAimPath;
     bool                       m_bDeltaMove;
     int                        m_iTempAwayTime;
+    int                        m_iNumBlocks;
     int                        m_iCheckPathTime;
     AttractiveNodePtr          m_pPrimaryAttract;
     float                      m_fAttractTime;

From 50a3df8dff9d4619f81925ef23fbe48f805018d2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:49:20 +0200
Subject: [PATCH 1051/2040] Fix the instant message maximum number on AA and
 SH/BT

---
 code/cgame/cg_ui.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_ui.cpp b/code/cgame/cg_ui.cpp
index 9a47196c..3adf953b 100644
--- a/code/cgame/cg_ui.cpp
+++ b/code/cgame/cg_ui.cpp
@@ -195,11 +195,17 @@ void CG_HudPrint_f(void)
 
 qboolean CG_CheckCaptureKey(int key, qboolean down, unsigned int time)
 {
+    char minKey = '1', maxKey = '9';
+
     if (!cg.iInstaMessageMenu || !down) {
         return qfalse;
     }
 
-    if (key < '1' || key > '8') {
+    if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        maxKey = '8';
+    }
+
+    if (key < minKey || key > maxKey) {
         if (key == K_ESCAPE || key == '0') {
             cg.iInstaMessageMenu = 0;
             return qtrue;

From c7561b1f6d2fc4fb8db6f8561c070abb32e1aeba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:50:59 +0200
Subject: [PATCH 1052/2040] Send the GotKill event to the attacker when killed

---
 code/fgame/sentient.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index d1eec6ca..f9938ac3 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1572,6 +1572,18 @@ void Sentient::ArmorDamage(Event *ev)
 
         health = 0;
 
+        if (attacker) {
+            // Added in OPM
+            event = new Event(EV_GotKill);
+            event->AddEntity(this);
+            event->AddInteger(damage);
+            event->AddEntity(inflictor);
+            event->AddInteger(meansofdeath);
+            event->AddInteger(0);
+
+            attacker->ProcessEvent(event);
+        }
+
         event = new Event(EV_Killed, 10);
         event->AddEntity(attacker);
         event->AddFloat(damage);

From 3ecdee1b89d9415c14c59fdccf38ae25ff56ec57 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:53:54 +0200
Subject: [PATCH 1053/2040] Make bots play a taunt when they get a kill

---
 code/fgame/playerbot.cpp | 21 +++++++++++++++++++++
 code/fgame/playerbot.h   |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index c4eae437..9fca25e4 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -83,6 +83,8 @@ PlayerBot::PlayerBot()
     m_iCuriousTime = 0;
     m_iAttackTime  = 0;
 
+    m_iNextTauntTime = 0;
+
     m_StateFlags = 0;
     m_RunLabel.TrySetScript("global/bot_run.scr");
 }
@@ -1332,6 +1334,25 @@ void PlayerBot::GotKill(Event *ev)
 
     ClearEnemy();
     m_iCuriousTime = 0;
+
+    if (level.inttime >= m_iNextTauntTime && (rand() % 5) == 0) {
+        //
+        // Randomly play a taunt
+        //
+        Event event("dmmessage");
+
+        event.AddInteger(0);
+
+        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+            event.AddString("*5" + str(1 + (rand() % 8)));
+        } else {
+            event.AddString("*4" + str(1 + (rand() % 8)));
+        }
+
+        ProcessEvent(event);
+
+        m_iNextTauntTime = level.inttime + 5000;
+    }
 }
 
 void PlayerBot::EventStuffText(Event *ev)
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index bf88241f..716025f8 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -87,6 +87,9 @@ private:
     unsigned int      m_StateFlags;
     ScriptThreadLabel m_RunLabel;
 
+    // Taunts
+    int m_iNextTauntTime;
+
 private:
     void CheckAttractiveNodes(void);
     void MoveThink(void);

From ef45c988c685cd0b8d01126b1c99a36090f45c2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 22:16:53 +0200
Subject: [PATCH 1054/2040] Fix player spectating often not spectating the next
 alive player

---
 code/fgame/player.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 23c84111..00930a01 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -9127,10 +9127,6 @@ void Player::SetPlayerSpectate(bool bNext)
         }
     }
 
-    if (m_iPlayerSpectating >= game.maxclients) {
-        m_iPlayerSpectating = 0;
-    }
-
     for (i = num; i < game.maxclients && i >= 0; i += dir) {
         ent = &g_entities[i];
         if (!ent->inuse || !ent->entity) {
@@ -9145,12 +9141,6 @@ void Player::SetPlayerSpectate(bool bNext)
             client->ps.camera_flags |= (client->ps.camera_flags & CF_CAMERA_CUT_BIT) ^ CF_CAMERA_CUT_BIT;
             return;
         }
-
-        if (!m_iPlayerSpectating) {
-            return;
-        }
-
-        m_iPlayerSpectating = 0;
     }
 
     if (m_iPlayerSpectating) {

From be1ef1de0e2f0de5744ad093767742b9e4ac3e3b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 22:18:07 +0200
Subject: [PATCH 1055/2040] Try respawning when the player should respawn

This fixes an issue where bots wouldn't respawn with `sv_team_spawn_interval` set
---
 code/fgame/playerbot.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 9fca25e4..6e579963 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -432,7 +432,7 @@ void PlayerBot::UpdateBotStates(void)
         return;
     }
 
-    if (IsDead()) {
+    if (IsDead() || m_bShouldRespawn) {
         // The bot should respawn
         m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
         return;
@@ -1346,7 +1346,7 @@ void PlayerBot::GotKill(Event *ev)
         if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
             event.AddString("*5" + str(1 + (rand() % 8)));
         } else {
-            event.AddString("*4" + str(1 + (rand() % 8)));
+            event.AddString("*4" + str(1 + (rand() % 9)));
         }
 
         ProcessEvent(event);

From 0b34d2dbb815685fa82de51f0aa681477dfeeaf0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 2 Oct 2024 23:04:30 +0200
Subject: [PATCH 1056/2040] Fix ammo bits being incorrect

---
 code/qcommon/msg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 6e3200d6..3b20d03f 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -3410,7 +3410,7 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 		}
 	}
 	ammobits = 0;
-	for (i=0 ; i<MAX_WEAPONS ; i++) {
+	for (i=0 ; i<MAX_AMMO ; i++) {
 		if (to->ammo_name_index[i] != from->ammo_name_index[i]) {
 			ammobits |= 1<<i;
 		}

From 10e4d3db119ef4d70a2b1ea9d4379e3d29e6dd5a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 19:05:51 +0200
Subject: [PATCH 1057/2040] Check if the activeItem is within the configstring
 range to avoid leaking data

---
 code/client/cl_uistd.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/client/cl_uistd.cpp b/code/client/cl_uistd.cpp
index fd7fe2c1..260535c5 100644
--- a/code/client/cl_uistd.cpp
+++ b/code/client/cl_uistd.cpp
@@ -1393,6 +1393,12 @@ void UIFakkLabel::Draw(void)
             return;
         }
 
+        if (cl.snap.ps.activeItems[m_itemindex] < 0 || cl.snap.ps.activeItems[m_itemindex] >= MAX_WEAPONS) {
+            // Fixed in OPM
+            //  Make sure to not overflow configstrings
+            return;
+        }
+
         m_font->setColor(m_foreground_color);
 
         if (m_bOutlinedText) {

From 0120e7e4a57955791d1ccfc8b3fe522c015c4711 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 19:06:03 +0200
Subject: [PATCH 1058/2040] Add liberation messages

---
 code/fgame/player.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 00930a01..91bdbb69 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10439,7 +10439,14 @@ void Player::EventDMMessage(Event *ev)
         }
 
         GetTeamDialogPrefix(sAliasName);
-        sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
+        if (g_target_game >= target_game_e::TG_MOHTT && sToken[1] == '6') {
+            // Added in 2.30
+            //  Liberation messages
+            sAliasName += va("lib%c", (sToken[2] + '0'));
+        } else {
+            sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
+        }
+        
         sRandomAlias = GetRandomAlias(sAliasName, &pSoundAlias);
 
         // find a random alias

From 6eb49f567af4594fda02be06e36c39a97690f3c4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 20:06:12 +0200
Subject: [PATCH 1059/2040] Made tempaway path better

---
 code/fgame/playerbot.cpp | 38 ++++++++++++++++++++++++++++++++------
 code/fgame/playerbot.h   |  4 ++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 6e579963..66517c49 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -241,12 +241,20 @@ void PlayerBot::MoveThink(void)
 
         m_iCheckPathTime = level.inttime + 2000;
 
-        if (m_iNumBlocks >= 10) {
+        if (m_iNumBlocks >= 5) {
             // Give up
             ClearMove();
         }
 
         if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
+            m_bTempAway = true;
+        } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(8) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(8)) {
+            m_bTempAway = true;
+        } else {
+            m_bTempAway = false;
+        }
+
+        if (m_bTempAway) {
             m_bTempAway     = true;
             m_bDeltaMove    = false;
             m_iTempAwayTime = level.inttime + 750;
@@ -254,6 +262,7 @@ void PlayerBot::MoveThink(void)
 
             // Try to backward a little
             m_Path.Clear();
+            m_Path.ForceShortLookahead();
             m_vCurrentGoal = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
         } else {
             m_iNumBlocks = 0;
@@ -263,6 +272,9 @@ void PlayerBot::MoveThink(void)
                 m_vCurrentGoal = m_vTargetPos;
             }
         }
+
+        m_vLastCheckPos[1] = m_vLastCheckPos[0];
+        m_vLastCheckPos[0] = origin;
     }
 
     if (ai_debugpath->integer) {
@@ -291,8 +303,6 @@ void PlayerBot::MoveThink(void)
         }
     }
 
-    //vDir = m_vCurrentGoal - centroid;
-
     // Rotate the dir
     if (m_Path.CurrentNode()) {
         vDir[0] = m_Path.CurrentDelta()[0];
@@ -412,6 +422,7 @@ void PlayerBot::CheckUse(void)
     // It may be a door
     if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.entityNum) {
         m_botCmd.buttons |= BUTTON_USE;
+        m_Path.ForceShortLookahead();
     }
 }
 
@@ -593,6 +604,20 @@ void PlayerBot::CheckReload(void)
     }
 }
 
+/*
+====================
+NewMove
+
+Called when there is a new move
+====================
+*/
+void PlayerBot::NewMove() {
+    m_bPathing = true;
+    m_iCheckPathTime = level.inttime + 2000;
+    m_vLastCheckPos[0] = origin;
+    m_vLastCheckPos[1] = origin;
+}
+
 /*
 ====================
 MoveTo
@@ -602,10 +627,11 @@ Move to the specified position
 */
 void PlayerBot::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
 {
-    m_bPathing   = true;
     m_vTargetPos = vPos;
     m_Path.FindPath(origin, vPos, this, 0, vLeashHome, fLeashRadius * fLeashRadius);
 
+    NewMove();
+
     if (!m_Path.CurrentNode()) {
         m_bPathing = false;
         return;
@@ -773,8 +799,8 @@ Move near the specified position within the radius
 */
 void PlayerBot::MoveNear(Vector vNear, float fRadius, float *vLeashHome, float fLeashRadius)
 {
-    m_bPathing = true;
     m_Path.FindPathNear(origin, vNear, this, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius);
+    NewMove();
 
     if (!m_Path.CurrentNode()) {
         m_bPathing = false;
@@ -804,8 +830,8 @@ void PlayerBot::AvoidPath(
         vDir = vPreferredDir;
     }
 
-    m_bPathing = true;
     m_Path.FindPathAway(origin, vAvoid, vDir, this, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius);
+    NewMove();
 
     if (!m_Path.CurrentNode()) {
         // Random movements
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 716025f8..b50daa2b 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -59,6 +59,7 @@ private:
     int                        m_iTempAwayTime;
     int                        m_iNumBlocks;
     int                        m_iCheckPathTime;
+    Vector                     m_vLastCheckPos[2];
     AttractiveNodePtr          m_pPrimaryAttract;
     float                      m_fAttractTime;
     Container<nodeAttract_t *> m_attractList;
@@ -180,4 +181,7 @@ public:
     void Killed(Event *ev) override;
     void GotKill(Event *ev);
     void EventStuffText(Event *ev);
+
+private:
+    void NewMove();
 };

From 1e73333fbe16aa757fc185fe2aaa370e720f31a9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 20:22:54 +0200
Subject: [PATCH 1060/2040] Make bot path more random when idle

---
 code/fgame/playerbot.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 66517c49..6552c9d6 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1029,7 +1029,10 @@ void PlayerBot::State_Idle(void)
                 m_vLastDeathPos = vec_zero;
             }
         } else {
-            AvoidPath(origin - Vector(orientation[0]) * 128.0f, 1024);
+            Vector randomDir(G_CRandom(1), G_CRandom(1), G_CRandom(1));
+            float radius = 512 + G_Random() * 4096;
+
+            AvoidPath(origin - Vector(orientation[0]) * 2.f, radius, randomDir);
         }
     }
 }

From 1c3596b1f94d27068acba56ce692800e0297e6ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 20:45:23 +0200
Subject: [PATCH 1061/2040] Add more conditions to check for valid enemies when
 attacking

---
 code/fgame/playerbot.cpp | 63 +++++++++++++++++++++++++---------------
 code/fgame/playerbot.h   |  1 +
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 6552c9d6..9077e629 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1121,6 +1121,42 @@ static int sentients_compare(const void *elem1, const void *elem2)
     }
 }
 
+bool PlayerBot::IsValidEnemy(Sentient* sent) const {
+    if (sent == this) {
+        return false;
+    }
+
+    if (sent->hidden() || (sent->flags & FL_NOTARGET)) {
+        // Ignore hidden / non-target enemies
+        return false;
+    }
+
+    if (sent->IsDead()) {
+        // Ignore dead enemies
+        return false;
+    }
+
+    if (sent->getSolidType() == SOLID_NOT) {
+        // Ignore non-solid, like spectators
+        return false;
+    }
+
+    if (sent->IsSubclassOfPlayer()) {
+        Player* player = static_cast<Player*>(sent);
+
+        if (g_gametype->integer >= GT_TEAM && player->GetTeam() == GetTeam()) {
+            return false;
+        }
+    }
+    else {
+        if (sent->m_Team == m_Team) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 bool PlayerBot::CheckCondition_Attack(void)
 {
     Container<Sentient *> sents = SentientList;
@@ -1131,30 +1167,11 @@ bool PlayerBot::CheckCondition_Attack(void)
 
     for (int i = 1; i <= sents.NumObjects(); i++) {
         Sentient *sent   = sents.ObjectAt(i);
-        Player   *player = (Player *)sent;
 
-        if (sent == this) {
+        if (!IsValidEnemy(sent)) {
             continue;
         }
 
-        if (sent->hidden()) {
-            continue;
-        }
-
-        if (sent->IsDead()) {
-            continue;
-        }
-
-        if (sent->IsSubclassOfPlayer()) {
-            if (g_gametype->integer >= GT_TEAM && player->GetTeam() == GetTeam()) {
-                continue;
-            }
-        } else {
-            if (sent->m_Team == m_Team) {
-                continue;
-            }
-        }
-
         maxDistance = Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828);
 
         if (CanSee(sent, 80, maxDistance, false)) {
@@ -1183,17 +1200,15 @@ void PlayerBot::State_EndAttack(void)
 
 void PlayerBot::State_Attack(void)
 {
-    Player *p                   = (Player *)m_pEnemy.Pointer();
     bool    bMelee              = false;
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
 
-    if (!m_pEnemy || m_pEnemy->IsDead() || (!p->IsSubclassOfPlayer() && m_pEnemy->m_Team == m_Team)
-        || (g_gametype->integer >= GT_TEAM && p->GetTeam() == GetTeam())) {
+    if (!m_pEnemy || !IsValidEnemy(m_pEnemy)) {
+        // Ignore dead enemies
         m_iAttackTime = 0;
         return;
     }
-
     float fDistanceSquared = (m_pEnemy->origin - origin).lengthSquared();
 
     if (CanSee(m_pEnemy, 20, world->m_fAIVisionDistance, false)) {
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index b50daa2b..5e1404d9 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -120,6 +120,7 @@ private:
     void        State_BeginAttack(void);
     void        State_EndAttack(void);
     void        State_Attack(void);
+    bool        IsValidEnemy(Sentient *sent) const;
 
     static void InitState_Grenade(botfunc_t *func);
     bool        CheckCondition_Grenade(void);

From 11abdd451fc2c8776ae493eb829d1a0aa6955ce4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 21:27:30 +0200
Subject: [PATCH 1062/2040] Fix incorrect dir for PathSearch::FindPathAway

---
 code/fgame/navigate.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index be8d3fde..50c681ea 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -662,7 +662,6 @@ int PathSearch::FindPathAway(
     PathNode  *next;
     int        f;
     float      fBias;
-    vec2_t     dir;
     vec2_t     delta;
     float      fMinSafeDistSquared;
 
@@ -687,13 +686,13 @@ int PathSearch::FindPathAway(
     open = NULL;
 
     VectorSub2D(Node->origin, start, path_startdir);
-    VectorSub2D(start, avoid, dir);
+    VectorSub2D(start, avoid, delta);
 
     fBias = VectorLength2D(vPreferredDir);
 
     Node->inopen = true;
     Node->g      = VectorNormalize2D(path_startdir);
-    Node->h      = fMinSafeDist - VectorNormalize2D(dir);
+    Node->h      = fMinSafeDist - VectorNormalize2D(delta);
     Node->h += fBias - DotProduct2D(vPreferredDir, delta);
     Node->Parent    = NULL;
     Node->m_Depth   = 2;
@@ -758,9 +757,9 @@ int PathSearch::FindPathAway(
                 }
             }
 
-            VectorSub2D(pathway->pos2, avoid, dir);
-            NewNode->h = VectorNormalize2D(dir);
-            NewNode->h += fBias - DotProduct2D(dir, vPreferredDir);
+            VectorSub2D(pathway->pos2, avoid, delta);
+            NewNode->h = VectorNormalize2D(delta);
+            NewNode->h += fBias - DotProduct2D(delta, vPreferredDir);
 
             f = (int)((float)g + NewNode->h);
 

From b74b6f8c1d2e0f4880cbb5084614d9e2855707ce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 21:33:12 +0200
Subject: [PATCH 1063/2040] Use the last attacker origin instead of the last
 death position

---
 code/fgame/playerbot.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 9077e629..3879f2c6 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1343,6 +1343,8 @@ void PlayerBot::Spawned(void)
 
 void PlayerBot::Killed(Event *ev)
 {
+    Entity* attacker;
+
     Player::Killed(ev);
 
     // send the respawn buttons
@@ -1358,9 +1360,11 @@ void PlayerBot::Killed(Event *ev)
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
-    if (rand() % 5 == 0) {
-        // 1/5 chance to go back to the last death position
-        m_vLastDeathPos = origin;
+    attacker = ev->GetEntity(1);
+
+    if (attacker && rand() % 5 == 0) {
+        // 1/5 chance to go back to the attacker position
+        m_vLastDeathPos = attacker->origin;
     } else {
         m_vLastDeathPos = vec_zero;
     }

From e623541861387dc825c205376f4e39c7336b29ca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 21:57:29 +0200
Subject: [PATCH 1064/2040] Improve the way bots turn, make it smoother

---
 code/fgame/playerbot.cpp | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 3879f2c6..542c0f8b 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -146,31 +146,15 @@ void PlayerBot::TurnThink(void)
         m_vTargetAng[i]  = AngleMod(m_vTargetAng[i]);
         diff             = AngleDifference(m_vCurrentAng[i], m_vTargetAng[i]);
         desired_speed    = diff * factor;
-        m_vAngSpeed[i] += (m_vAngSpeed[i] - desired_speed);
 
-        if (m_vAngSpeed[i] > 180) {
-            m_vAngSpeed[i] = maxchange;
-        }
-
-        if (m_vAngSpeed[i] < -180) {
-            m_vAngSpeed[i] = -maxchange;
-        }
-
-        anglespeed = m_vAngSpeed[i];
-
-        if (anglespeed > maxchange) {
-            anglespeed = maxchange;
-        }
-
-        if (anglespeed < -maxchange) {
-            anglespeed = -maxchange;
-        }
+        m_vAngSpeed[i] = Q_clamp_float(m_vAngSpeed[i] + (m_vAngSpeed[i] - desired_speed), -180, 180);
+        anglespeed = Q_clamp_float(m_vAngSpeed[i], -maxchange, maxchange);
 
         m_vCurrentAng[i] += anglespeed;
         m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
 
         //demping
-        m_vAngSpeed[i] *= 0.45 * (1 - factor);
+        m_vAngSpeed[i] *= 0.2 * (1 - factor);
     }
 
     if (m_vCurrentAng[PITCH] > 180) {
@@ -458,8 +442,6 @@ void PlayerBot::UpdateBotStates(void)
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
-    SetTargetAngles(Vector(0, 90, 0));
-
     CheckStates();
 
     MoveThink();
@@ -579,8 +561,14 @@ Make the bot face toward the current path
 */
 void PlayerBot::AimAtAimNode(void)
 {
-    if (m_Path.CurrentDelta()) {
-        AimAt(origin + m_Path.CurrentDelta());
+    if (!m_bPathing) {
+        return;
+    }
+
+    if (m_Path.CurrentNode()) {
+        if (!m_Path.Complete(origin)) {
+            AimAt(origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0));
+        }
     } else {
         AimAt(m_vCurrentGoal);
     }

From cabf1a90439f7e9a210afbe6ce8d05da0b86aa99 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 22:23:46 +0200
Subject: [PATCH 1065/2040] Make AI path more random

---
 code/fgame/playerbot.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 542c0f8b..dc4f3299 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1017,10 +1017,11 @@ void PlayerBot::State_Idle(void)
                 m_vLastDeathPos = vec_zero;
             }
         } else {
-            Vector randomDir(G_CRandom(1), G_CRandom(1), G_CRandom(1));
-            float radius = 512 + G_Random() * 4096;
+            Vector randomDir(G_CRandom(16), G_CRandom(16), G_CRandom(16));
+            Vector preferredDir = Vector(orientation[0]) * (rand() % 5 ? 1024 : -1024);
+            float radius = 512 + G_Random(2048);
 
-            AvoidPath(origin - Vector(orientation[0]) * 2.f, radius, randomDir);
+            AvoidPath(origin + randomDir, radius, preferredDir);
         }
     }
 }

From 592e3f47e9824e7b3142b938a5793a5dcb28e168 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 3 Oct 2024 22:50:39 +0200
Subject: [PATCH 1066/2040] Handle curiosity sounds better by getting the owner
 of concerned entities and ignoring team mates

---
 code/fgame/playerbot.cpp | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index dc4f3299..db51d8e9 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "consoleevent.h"
 #include "debuglines.h"
 #include "scriptexception.h"
+#include "vehicleturret.h"
+#include "weaputils.h"
 
 // We assume that we have limited access to the server-side
 // and that most logic come from the playerstate_s structure
@@ -840,20 +842,38 @@ Warn the bot of an event
 */
 void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared)
 {
-    // Ignore teammates
-    if (pEnt->IsSubclassOfPlayer()) {
-        Player *p = (Player *)pEnt;
+    Sentient* pSentOwner;
 
-        if (p->GetTeam() == GetTeam()) {
+    if (pEnt->IsSubclassOfSentient()) {
+        pSentOwner = static_cast<Sentient*>(pEnt);
+    } else if (pEnt->IsSubclassOfVehicleTurretGun()) {
+        VehicleTurretGun* pVTG = static_cast<VehicleTurretGun*>(pEnt);
+        pSentOwner = pVTG->GetSentientOwner();
+    } else if (pEnt->IsSubclassOfItem()) {
+        Item* pItem = static_cast<Item*>(pEnt);
+        pSentOwner = pItem->GetOwner();
+    } else if (pEnt->IsSubclassOfProjectile()) {
+        Projectile* pProj = static_cast<Projectile*>(pEnt);
+        pSentOwner = pProj->GetOwner();
+    } else {
+        pSentOwner = NULL;
+    }
+
+    if (pSentOwner) {
+        if (pSentOwner == this) {
+            // Ignore self
             return;
         }
-    } else if (pEnt->IsSubclassOfWeapon()) {
-        Weapon *pWeap = (Weapon *)pEnt;
 
-        if (pWeap->GetOwner()) {
-            Player *p = (Player *)pWeap->GetOwner();
+        if ((pSentOwner->flags & FL_NOTARGET) || pSentOwner->getSolidType() == SOLID_NOT) {
+            return;
+        }
 
-            if (p->IsSubclassOfPlayer() && p->GetTeam() == GetTeam()) {
+        // Ignore teammates
+        if (pSentOwner->IsSubclassOfPlayer()) {
+            Player* p = static_cast<Player*>(pSentOwner);
+
+            if (p->GetTeam() == GetTeam()) {
                 return;
             }
         }

From 272a4011892968b31b95ed6d8de41e4ff64b9d4d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 19:03:33 +0200
Subject: [PATCH 1067/2040] Make the bot jump even if the path is not valid to
 get out of spawns with no path nodes

---
 code/fgame/playerbot.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index db51d8e9..e86ee837 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -225,7 +225,7 @@ void PlayerBot::MoveThink(void)
 
         m_bDeltaMove = false;
 
-        m_iCheckPathTime = level.inttime + 2000;
+        m_iCheckPathTime = level.inttime + 1000;
 
         if (m_iNumBlocks >= 5) {
             // Give up
@@ -234,7 +234,7 @@ void PlayerBot::MoveThink(void)
 
         if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
             m_bTempAway = true;
-        } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(8) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(8)) {
+        } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
             m_bTempAway = true;
         } else {
             m_bTempAway = false;
@@ -249,12 +249,12 @@ void PlayerBot::MoveThink(void)
             // Try to backward a little
             m_Path.Clear();
             m_Path.ForceShortLookahead();
-            m_vCurrentGoal = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+            m_vCurrentGoal = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
         } else {
             m_iNumBlocks = 0;
 
             if (!m_Path.CurrentNode()) {
-                m_vTargetPos = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+                m_vTargetPos = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
                 m_vCurrentGoal = m_vTargetPos;
             }
         }
@@ -327,12 +327,7 @@ void PlayerBot::CheckJump(void)
     Vector  dir;
     trace_t trace;
 
-    if (!m_Path.CurrentNode()) {
-        return;
-    }
-
-    dir = m_Path.CurrentDelta();
-    VectorNormalizeFast(dir);
+    dir = m_vLastValidDir;
 
     if (ai_debugpath->integer) {
         G_DebugLine(origin + Vector(0, 0, STEPSIZE), origin + Vector(0, 0, STEPSIZE) + dir * 32, 1, 0, 1, 1);

From 292fe8eab4cb97d696212880dc1777bcf31b4af5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 19:04:00 +0200
Subject: [PATCH 1068/2040] Stop moving if there is a maximum fire movement so
 the weapon can be fired

---
 code/fgame/playerbot.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index e86ee837..a7a33c93 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1207,6 +1207,8 @@ void PlayerBot::State_Attack(void)
     bool    bMelee              = false;
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
+    Weapon* pWeap = GetActiveWeapon(WEAPON_MAIN);
+    bool    bNoMove = false;
 
     if (!m_pEnemy || !IsValidEnemy(m_pEnemy)) {
         // Ignore dead enemies
@@ -1216,8 +1218,6 @@ void PlayerBot::State_Attack(void)
     float fDistanceSquared = (m_pEnemy->origin - origin).lengthSquared();
 
     if (CanSee(m_pEnemy, 20, world->m_fAIVisionDistance, false)) {
-        Weapon *pWeap = GetActiveWeapon(WEAPON_MAIN);
-
         if (!pWeap) {
             return;
         }
@@ -1227,6 +1227,19 @@ void PlayerBot::State_Attack(void)
         float fSecondaryBulletRange        = pWeap->GetBulletRange(FIRE_SECONDARY);
         float fSecondaryBulletRangeSquared = fSecondaryBulletRange * fSecondaryBulletRange;
 
+        //
+        // check the fire movement speed if the weapon has a max fire movement
+        //
+        if (pWeap->m_fMaxFireMovement < 1 && pWeap->HasAmmoInClip(FIRE_PRIMARY)) {
+            float length;
+
+            length = velocity.length();
+            if ((length / sv_runspeed->value) > (pWeap->m_fMaxFireMovement * pWeap->m_fMovementSpeed)) {
+                bNoMove = true;
+                ClearMove();
+            }
+        }
+
         fMinDistance = fPrimaryBulletRange;
 
         if (fMinDistance > 256) {
@@ -1266,6 +1279,10 @@ void PlayerBot::State_Attack(void)
     m_vOldEnemyPos  = m_vLastEnemyPos;
     m_vLastEnemyPos = m_pEnemy->centroid;
 
+    if (bNoMove) {
+        return;
+    }
+
     if ((!MoveToBestAttractivePoint(5) && !IsMoving()) || (m_vOldEnemyPos != m_vLastEnemyPos && !MoveDone())) {
         if (!bMelee) {
             if ((origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {

From e7e95d47a51184fac94b81e318e2044c6bf938be Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 19:59:09 +0200
Subject: [PATCH 1069/2040] Prevent others from picking up the health item if
 their future health will be full

---
 code/fgame/health.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/code/fgame/health.cpp b/code/fgame/health.cpp
index 87e05825..b438b627 100644
--- a/code/fgame/health.cpp
+++ b/code/fgame/health.cpp
@@ -74,8 +74,19 @@ void Health::PickupHealth(Event *ev)
 
     player = (Player *)other;
 
-    if (player->health >= player->max_health) {
-        return;
+    if (g_healrate->value && other->IsSubclassOfPlayer()) {
+        // Added in OPM
+        //  OG doesn't check if the future health will be full
+        //  which is problematic as other can pickup the item
+        //  will healing
+        if (player->m_fHealRate + player->health >= player->max_health) {
+            // will be healing to 100%
+            return;
+        }
+    } else {
+        if (player->health >= player->max_health) {
+            return;
+        }
     }
 
     if (!ItemPickup(other, qfalse)) {

From a25442368b1f779a0b1b3f3785f286e536061b13 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 20:25:05 +0200
Subject: [PATCH 1070/2040] Make the bot jump more to avoid getting stuck

---
 code/fgame/playerbot.cpp | 68 +++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index a7a33c93..bce51889 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -232,35 +232,37 @@ void PlayerBot::MoveThink(void)
             ClearMove();
         }
 
-        if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
-            m_bTempAway = true;
-        } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
-            m_bTempAway = true;
-        } else {
-            m_bTempAway = false;
-        }
-
-        if (m_bTempAway) {
-            m_bTempAway     = true;
-            m_bDeltaMove    = false;
-            m_iTempAwayTime = level.inttime + 750;
-            m_iNumBlocks++;
-
-            // Try to backward a little
-            m_Path.Clear();
-            m_Path.ForceShortLookahead();
-            m_vCurrentGoal = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
-        } else {
-            m_iNumBlocks = 0;
-
-            if (!m_Path.CurrentNode()) {
-                m_vTargetPos = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
-                m_vCurrentGoal = m_vTargetPos;
+        if (groundentity || client->ps.walking) {
+            if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
+                m_bTempAway = true;
+            } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
+                m_bTempAway = true;
+            } else {
+                m_bTempAway = false;
             }
-        }
 
-        m_vLastCheckPos[1] = m_vLastCheckPos[0];
-        m_vLastCheckPos[0] = origin;
+            if (m_bTempAway) {
+                m_bTempAway     = true;
+                m_bDeltaMove    = false;
+                m_iTempAwayTime = level.inttime + 750;
+                m_iNumBlocks++;
+
+                // Try to backward a little
+                m_Path.Clear();
+                m_Path.ForceShortLookahead();
+                m_vCurrentGoal = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+            } else {
+                m_iNumBlocks = 0;
+
+                if (!m_Path.CurrentNode()) {
+                    m_vTargetPos = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+                    m_vCurrentGoal = m_vTargetPos;
+                }
+            }
+
+            m_vLastCheckPos[1] = m_vLastCheckPos[0];
+            m_vLastCheckPos[0] = origin;
+        }
     }
 
     if (ai_debugpath->integer) {
@@ -331,14 +333,14 @@ void PlayerBot::CheckJump(void)
 
     if (ai_debugpath->integer) {
         G_DebugLine(origin + Vector(0, 0, STEPSIZE), origin + Vector(0, 0, STEPSIZE) + dir * 32, 1, 0, 1, 1);
-        G_DebugLine(origin + Vector(0, 0, 56), origin + Vector(0, 0, 56) + dir * 32, 1, 0, 1, 1);
+        G_DebugLine(origin + Vector(0, 0, STEPSIZE * 3), origin + Vector(0, 0, STEPSIZE * 3) + dir * 32, 1, 0, 1, 1);
     }
 
-    Vector vStart = origin + Vector(0, 0, STEPSIZE);
-    Vector vEnd   = origin + Vector(0, 0, STEPSIZE) + dir * 4;
+    start = origin + Vector(0, 0, STEPSIZE);
+    end   = origin + Vector(0, 0, STEPSIZE) + dir * (maxs.y - mins.y);
 
     // Check if the bot needs to jump
-    trace = G_Trace(vStart, mins, maxs, vEnd, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
+    trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
 
     // No need to jump
     if (trace.fraction >= 0.95f) {
@@ -346,8 +348,8 @@ void PlayerBot::CheckJump(void)
         return;
     }
 
-    start = origin + Vector(0, 0, 56);
-    end   = origin + Vector(0, 0, 56) + dir * 4;
+    start = origin + Vector(0, 0, STEPSIZE * 2);
+    end   = origin + Vector(0, 0, STEPSIZE * 2) + dir * (maxs.y - mins.y);
 
     // Check if the bot can jump
     trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, true, "PlayerBot::CheckJump");

From 6ca12eb0de08178af110113f09fa45994bca4695 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 20:27:28 +0200
Subject: [PATCH 1071/2040] Fix bot sometimes being stuck respawning between
 team spawn intervals

---
 code/fgame/playerbot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index bce51889..d55712f5 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -426,7 +426,7 @@ void PlayerBot::UpdateBotStates(void)
         return;
     }
 
-    if (IsDead() || m_bShouldRespawn) {
+    if (IsDead() || IsSpectator()) {
         // The bot should respawn
         m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
         return;

From da86e0ce34ec61015e73b506b362bcecda55e8cd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 21:23:49 +0200
Subject: [PATCH 1072/2040] Fix bot incorrectly jumping

---
 code/fgame/playerbot.cpp | 50 +++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index d55712f5..05a40066 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -304,7 +304,7 @@ void PlayerBot::MoveThink(void)
     vAngles = vDir.toAngles() - angles;
     vAngles.AngleVectorsLeft(&vWishDir);
 
-    m_vLastValidDir  = vWishDir;
+    m_vLastValidDir  = vDir;
     m_vLastValidGoal = m_vCurrentGoal;
 
     // Forward to the specified direction
@@ -331,36 +331,54 @@ void PlayerBot::CheckJump(void)
 
     dir = m_vLastValidDir;
 
-    if (ai_debugpath->integer) {
-        G_DebugLine(origin + Vector(0, 0, STEPSIZE), origin + Vector(0, 0, STEPSIZE) + dir * 32, 1, 0, 1, 1);
-        G_DebugLine(origin + Vector(0, 0, STEPSIZE * 3), origin + Vector(0, 0, STEPSIZE * 3) + dir * 32, 1, 0, 1, 1);
-    }
-
     start = origin + Vector(0, 0, STEPSIZE);
     end   = origin + Vector(0, 0, STEPSIZE) + dir * (maxs.y - mins.y);
 
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
     // Check if the bot needs to jump
     trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
 
     // No need to jump
-    if (trace.fraction >= 0.95f) {
+    if (trace.fraction > 0.5f) {
         m_botCmd.upmove = 0;
         return;
     }
 
-    start = origin + Vector(0, 0, STEPSIZE * 2);
-    end   = origin + Vector(0, 0, STEPSIZE * 2) + dir * (maxs.y - mins.y);
+    start = origin;
+    end   = origin + Vector(0, 0, STEPSIZE * 3);
 
-    // Check if the bot can jump
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    // Check if the bot can jump up
     trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, true, "PlayerBot::CheckJump");
 
+    start = trace.endpos;
+    end = trace.endpos + dir * (maxs.y - mins.y);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    Vector bounds[2];
+    bounds[0] = Vector(mins[0], mins[1], 0);
+    bounds[1] = Vector(maxs[0], maxs[1], (maxs[0] + maxs[1]) * 0.5);
+
+    // Check if the bot can jump at the location
+    trace = G_Trace(start, bounds[0], bounds[1], end, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
+
+    if (trace.fraction < 1) {
+        m_botCmd.upmove = 0;
+        return;
+    }
+
     // Make the bot climb walls
-    if (trace.fraction >= 0.95f) {
-        if (!m_botCmd.upmove) {
-            m_botCmd.upmove = 127;
-        } else {
-            m_botCmd.upmove = 0;
-        }
+    if (!m_botCmd.upmove) {
+        m_botCmd.upmove = 127;
     } else {
         m_botCmd.upmove = 0;
     }

From b1e1b6cc68ad829e0ac849cdde7dc1eff00e3c72 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Oct 2024 21:36:42 +0200
Subject: [PATCH 1073/2040] Properly aim at the last enemy position with some
 randomness applied

---
 code/fgame/playerbot.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 05a40066..c016b3cd 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -582,12 +582,12 @@ void PlayerBot::AimAtAimNode(void)
         return;
     }
 
-    if (m_Path.CurrentNode()) {
-        if (!m_Path.Complete(origin)) {
-            AimAt(origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0));
-        }
-    } else {
+    if (!m_Path.CurrentNode()) {
         AimAt(m_vCurrentGoal);
+    } else if (!m_Path.Complete(origin)) {
+        AimAt(origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0));
+        //int maxIndex = Q_min(3, m_Path.CurrentNode() - m_Path.LastNode());
+        //AimAt((m_Path.CurrentNode() - maxIndex)->point);
     }
 
     m_vTargetAng[PITCH] = 0;
@@ -1237,7 +1237,7 @@ void PlayerBot::State_Attack(void)
     }
     float fDistanceSquared = (m_pEnemy->origin - origin).lengthSquared();
 
-    if (CanSee(m_pEnemy, 20, world->m_fAIVisionDistance, false)) {
+    if (CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false)) {
         if (!pWeap) {
             return;
         }
@@ -1294,11 +1294,11 @@ void PlayerBot::State_Attack(void)
         fMinDistanceSquared = 0;
     }
 
-    AimAt(m_vLastEnemyPos);
-
     m_vOldEnemyPos  = m_vLastEnemyPos;
     m_vLastEnemyPos = m_pEnemy->centroid;
 
+    AimAt(m_vLastEnemyPos + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
+
     if (bNoMove) {
         return;
     }

From a379e6efbf4500e1f9f8665ecc0b709c45dbad36 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 00:32:48 +0200
Subject: [PATCH 1074/2040] Don't use Ninja on Windows because of chocolatey
 servers causing troubles

---
 .github/workflows/shared-build.yml | 45 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 2c3f7a83..003be10e 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -172,9 +172,12 @@ jobs:
     # Packages
     ###
 
-    - name: Install required packages
-      run: |
-        choco install -y ninja
+    #
+    # Commented out for now, chocolatey servers started complaining about too many requests
+    #
+    #- name: Install required packages
+    #  run: |
+    #    choco install -y ninja
 
     - name: Install Flex/Bison
       working-directory: ${{github.workspace}}
@@ -185,21 +188,21 @@ jobs:
         cmake --build winflexbison-build --config Release --parallel
         cmake --install winflexbison-build
 
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_GENERATOR=Ninja" >> $env:GITHUB_ENV
-        echo "CC=cl.exe" >> $env:GITHUB_ENV
-        echo "CXX=cl.exe" >> $env:GITHUB_ENV
-        pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
-        cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
-          if ($_ -match "=") {
-            # Split into key=value
-            $var = $_.split("=", 2);
-            echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
-          }
-        }
-        popd
+    #- name: Settings
+    #  working-directory: ${{github.workspace}}
+    #  run: |
+    #    echo "CMAKE_GENERATOR=Ninja" >> $env:GITHUB_ENV
+    #    echo "CC=cl.exe" >> $env:GITHUB_ENV
+    #    echo "CXX=cl.exe" >> $env:GITHUB_ENV
+    #    pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
+    #    cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
+    #      if ($_ -match "=") {
+    #        # Split into key=value
+    #        $var = $_.split("=", 2);
+    #        echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
+    #      }
+    #    }
+    #    popd
 
     ###
     # SDL
@@ -212,7 +215,7 @@ jobs:
       with:
         version: sdl2-latest
         build-type: Release
-        cmake-arguments: ""
+        cmake-arguments: "-A ${{ matrix.architecture.config }}"
 
     ###
     # OpenAL
@@ -231,7 +234,7 @@ jobs:
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
-        cmake -B ./build `
+        cmake -B ./build -A ${{ matrix.architecture.config }} `
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
         -DALSOFT_BUILD_ROUTER=OFF `
@@ -259,7 +262,7 @@ jobs:
 
     - name: CMake Settings
       run: |
-        echo "CMAKE_PARAM= `
+        echo "CMAKE_PARAM=-A ${{ matrix.architecture.config }} `
         --log-level=VERBOSE `
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `

From 21a610d22cf81f7d1db0ea26a3a2ce643de0dac6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 11:56:08 +0200
Subject: [PATCH 1075/2040] Fix NoticeEvent ignoring other players on FFA

---
 code/fgame/playerbot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index c016b3cd..5c1c870c 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -888,7 +888,7 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
         if (pSentOwner->IsSubclassOfPlayer()) {
             Player* p = static_cast<Player*>(pSentOwner);
 
-            if (p->GetTeam() == GetTeam()) {
+            if (g_gametype->integer >= GT_TEAM && p->GetTeam() == GetTeam()) {
                 return;
             }
         }

From 732fd985933b0af174c6d0e0f02ecddd51e0d8e7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:43:09 +0200
Subject: [PATCH 1076/2040] Make the bot strafe when attacking

---
 code/fgame/playerbot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 5c1c870c..e5ad55bf 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1309,7 +1309,7 @@ void PlayerBot::State_Attack(void)
                 Vector vDir = origin - m_vLastEnemyPos;
                 VectorNormalizeFast(vDir);
 
-                AvoidPath(m_vLastEnemyPos, fMinDistance, vDir);
+                AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(orientation[1]) * 512);
             } else {
                 MoveNear(m_vLastEnemyPos, fMinDistance);
             }

From 8acc51c4897ac29ed2da056e61792ce19442364f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:54:53 +0200
Subject: [PATCH 1077/2040] Correctly add/remove bots

---
 code/fgame/g_bot.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index e9b47c97..8d409911 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static gentity_t   *firstBot          = NULL;
 static saved_bot_t *saved_bots        = NULL;
+static unsigned int num_saved_bots    = 0;
 static unsigned int current_bot_count = 0;
 static char       **modelList         = NULL;
 
@@ -253,13 +254,17 @@ void G_AddBot(unsigned int num, saved_bot_t *saved)
 
 void G_RemoveBot(unsigned int num)
 {
+    unsigned int removed = 0;
+    unsigned int n;
+
     num = Q_min(num, sv_maxbots->integer);
 
-    for (int n = 0; n < num; n++) {
-        gentity_t *e = &g_entities[maxclients->integer + n];
+    for (n = 0; n < game.maxclients && removed < num; n++) {
+        gentity_t *e = &g_entities[game.maxclients - sv_maxbots->integer + n];
         if (e->inuse && e->client) {
             G_ClientDisconnect(e);
             current_bot_count--;
+            removed++;
         }
     }
 }
@@ -278,12 +283,13 @@ void G_SaveBots()
     }
 
     saved_bots = new saved_bot_t[current_bot_count];
-    for (n = 0; n < current_bot_count; n++) {
+    num_saved_bots = 0;
+    for (n = 0; n < game.maxclients; n++) {
         gentity_t   *e     = &g_entities[game.maxclients - sv_maxbots->integer + n];
-        saved_bot_t& saved = saved_bots[n];
 
         if (e->inuse && e->client) {
             Player *player = static_cast<Player *>(e->entity);
+            saved_bot_t& saved = saved_bots[num_saved_bots++];
 
             saved.bValid = true;
             //saved.team = player->GetTeam();
@@ -300,7 +306,7 @@ void G_RestoreBots()
         return;
     }
 
-    for (n = 0; n < sv_numbots->integer; n++) {
+    for (n = 0; n < num_saved_bots; n++) {
         saved_bot_t& saved = saved_bots[n];
 
         G_AddBot(1, &saved);
@@ -320,10 +326,10 @@ int G_CountClients()
         other = &g_entities[n];
         if (other->inuse && other->client) {
             Player *p = static_cast<Player *>(other->entity);
-            if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
-                // ignore spectators
-                continue;
-            }
+            //if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
+            //    // ignore spectators
+            //    continue;
+            //}
 
             count++;
         }

From 7caa0adbabfa4947b210eec5334928ed7be128d5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 14:46:44 +0200
Subject: [PATCH 1078/2040] Toggle use button and don't use if the door is open

---
 code/fgame/playerbot.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index e5ad55bf..de7e12b0 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -411,8 +411,6 @@ void PlayerBot::CheckUse(void)
     Vector  end;
     trace_t trace;
 
-    m_botCmd.buttons &= ~BUTTON_USE;
-
     angles.AngleVectorsLeft(&dir);
 
     start = origin + Vector(0, 0, viewheight);
@@ -422,8 +420,21 @@ void PlayerBot::CheckUse(void)
 
     // It may be a door
     if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.entityNum) {
-        m_botCmd.buttons |= BUTTON_USE;
+        if (trace.ent->entity->IsSubclassOfDoor()) {
+            Door* door = static_cast<Door*>(trace.ent->entity);
+            if (door->isOpen()) {
+                m_botCmd.buttons &= ~BUTTON_USE;
+                return;
+            }
+        }
+
+        //
+        // Toggle the use button
+        //
+        m_botCmd.buttons ^= BUTTON_USE;
         m_Path.ForceShortLookahead();
+    } else {
+        m_botCmd.buttons &= ~BUTTON_USE;
     }
 }
 

From 355491a9508f1a1807b23808e45fbdff12a02c37 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 14:47:09 +0200
Subject: [PATCH 1079/2040] Reduce the bot attack time to avoid the bot getting
 stuck

---
 code/fgame/playerbot.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index de7e12b0..78d67dda 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1211,7 +1211,7 @@ bool PlayerBot::CheckCondition_Attack(void)
 
         if (CanSee(sent, 80, maxDistance, false)) {
             m_pEnemy      = sent;
-            m_iAttackTime = level.inttime + 10000;
+            m_iAttackTime = level.inttime + 1000;
             return true;
         }
     }
@@ -1300,6 +1300,8 @@ void PlayerBot::State_Attack(void)
         } else {
             m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
         }
+
+        m_iAttackTime = level.inttime + 1000;
     } else {
         m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
         fMinDistanceSquared = 0;

From 1169b84c2f215fc6a7e7f70e2be45efa5bddb378 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:12:37 +0200
Subject: [PATCH 1080/2040] Make sure the entity is valid before checking for
 the bad place team

---
 code/fgame/navigate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 50c681ea..658d1495 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -429,7 +429,7 @@ int PathSearch::FindPath(
             }
 
             if (pathway->fallheight <= fallheight
-                && (!ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
                 NewNode->m_Depth   = Node->m_Depth + 1;
                 NewNode->Parent    = Node;
                 NewNode->pathway   = i;
@@ -595,7 +595,7 @@ int PathSearch::FindPathNear(
             }
 
             if (pathway->fallheight <= fallheight
-                && (!ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
                 NewNode->m_Depth   = Node->m_Depth + 1;
                 NewNode->Parent    = Node;
                 NewNode->pathway   = i;

From 2980771deb81dba59aea65a2fb8eae78756cfbc3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:13:03 +0200
Subject: [PATCH 1081/2040] Fix path node connection, use the target node num

---
 code/fgame/navigate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 658d1495..6e4cfd66 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -1223,7 +1223,7 @@ void PathNode::SetLowWallArc(Event *ev)
 
 void PathNode::ConnectTo(PathNode *node)
 {
-    Child[virtualNumChildren].node            = nodenum;
+    Child[virtualNumChildren].node            = node->nodenum;
     Child[virtualNumChildren].numBlockers     = 0;
     Child[virtualNumChildren].badPlaceTeam[0] = 0;
     Child[virtualNumChildren].badPlaceTeam[1] = 0;

From 63465278a589d9135a6b41d7f0492e33973f38d6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:15:40 +0200
Subject: [PATCH 1082/2040] When there is no free player start spot, try to
 find a random player s tart one

---
 code/fgame/g_client.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 50b0e8f5..4ac3d80b 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -626,7 +626,10 @@ PlayerStart *SelectSpawnPoint(Player *player)
                 SimpleArchivedEntity *arc = level.m_SimpleArchivedEntities.ObjectAt(i);
 
                 classID = arc->classinfo()->classID;
-                if (!Q_stricmp(classID, "info_player_start")) {
+                // Fixed in OPM
+                //  If there is no free spot, just use any random player start
+                //  OG wants info_player_start directly
+                if (arc->isSubclassOf(PlayerStart)) {
                     int randVal;
 
                     spawnpoint = static_cast<PlayerStart *>(arc);

From 6bbbbcfb05ddcbedf779bce1e106ea87fc737d97 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:15:50 +0200
Subject: [PATCH 1083/2040] Allow spawning a simple entity

---
 code/fgame/player_util.cpp | 49 +++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index 2aaf2ce7..a089dc70 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -326,17 +326,17 @@ void Player::TestThread(Event *ev)
 void Player::SpawnEntity(Event *ev)
 
 {
-    Entity   *ent;
-    str       name;
-    ClassDef *cls;
-    str       text;
-    Vector    forward;
-    Vector    up;
-    Vector    delta;
-    Vector    v;
-    int       n;
-    int       i;
-    Event    *e;
+    SimpleEntity *ent;
+    str           name;
+    ClassDef     *cls;
+    str           text;
+    Vector        forward;
+    Vector        up;
+    Vector        delta;
+    Vector        v;
+    int           n;
+    int           i;
+    Event        *e;
 
     if (ev->NumArgs() < 1) {
         ScriptError("Usage: spawn entityname [keyname] [value]...");
@@ -360,16 +360,12 @@ void Player::SpawnEntity(Event *ev)
         cls = &Entity::ClassInfo;
     }
 
-    if (!checkInheritance(&Entity::ClassInfo, cls)) {
-        ScriptError("%s is not a valid Entity", name.c_str());
+    if (!checkInheritance(&SimpleEntity::ClassInfo, cls)) {
+        ScriptError("%s is not a valid SimpleEntity", name.c_str());
         return;
     }
 
-    ent = (Entity *)cls->newInstance();
-
-    e = new Event(EV_Model);
-    e->AddString(name.c_str());
-    ent->PostEvent(e, EV_PRIORITY_SPAWNARG);
+    ent = (SimpleEntity *)cls->newInstance();
 
     angles.AngleVectors(&forward, NULL, &up);
     v = origin + (forward + up) * 40;
@@ -396,12 +392,21 @@ void Player::SpawnEntity(Event *ev)
         }
     }
 
-    e = new Event(EV_SetAnim);
-    e->AddString("idle");
-    ent->PostEvent(e, EV_SPAWNARG);
+    if (ent->IsSubclassOfEntity()) {
+        e = new Event(EV_Model);
+        e->AddString(name.c_str());
+        ent->PostEvent(e, EV_PRIORITY_SPAWNARG);
+
+        e = new Event(EV_SetAnim);
+        e->AddString("idle");
+        ent->PostEvent(e, EV_SPAWNARG);
+    }
 
     ent->ProcessPendingEvents();
-    ent->ProcessEvent(EV_Entity_Start);
+
+    if (ent->IsSubclassOfEntity()) {
+        ent->ProcessEvent(EV_Entity_Start);
+    }
 }
 
 //====================

From 8451c11916f15a51f1b2e38fa90fabf72ed6b5e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:17:11 +0200
Subject: [PATCH 1084/2040] Add a feature to dynamically create a master class
 for development

---
 code/fgame/gamecmds.cpp | 75 +++++++++++++++++++++++++++++++++++++++++
 code/fgame/gamecmds.h   |  6 ++++
 2 files changed, 81 insertions(+)

diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index e7daa02e..ca9b0077 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -42,6 +42,11 @@ typedef struct {
     qboolean allclients;
 } consolecmd_t;
 
+typedef struct {
+    const char* prefix;
+    SafePtr<Listener> master;
+} commandmaster_t;
+
 consolecmd_t G_ConsoleCmds[] = {
   //   command name       function             available in multiplayer?
     {"say",             G_SayCmd,             qtrue },
@@ -74,6 +79,8 @@ consolecmd_t G_ConsoleCmds[] = {
     {NULL,              NULL,                 qfalse}
 };
 
+Container<commandmaster_t> commandMasters;
+
 void G_InitConsoleCommands(void)
 {
     consolecmd_t *cmds;
@@ -211,6 +218,14 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
                 return false;
             }
             return Viewmodel.ProcessEvent(ev);
+        } else {
+            //
+            // Added in OPM
+            //
+            Listener* master = G_FindMaster(cmd);
+            if (master) {
+                return master->ProcessEvent(ev);
+            }
         }
 
         if (ent->entity->CheckEventFlags(&ev)) {
@@ -221,6 +236,66 @@ qboolean G_ProcessClientCommand(gentity_t *ent)
     return qfalse;
 }
 
+/*
+==================
+G_CreateMaster
+==================
+*/
+void G_CreateMaster(const char* prefix, Listener* master)
+{
+    commandmaster_t commandMaster;
+
+    int i;
+
+    for (i = 1; i <= commandMasters.NumObjects(); i++) {
+        const commandmaster_t& commandMaster = commandMasters.ObjectAt(i);
+        if (!str::icmp(commandMaster.prefix, prefix)) {
+            return;
+        }
+    }
+
+    commandMaster.prefix = prefix;
+    commandMaster.master = master;
+    commandMasters.AddObject(commandMaster);
+}
+
+/*
+==================
+G_MasterMatches
+==================
+*/
+bool G_MasterMatches(const commandmaster_t& commandMaster, const char* command) {
+    const char* s1, *s2;
+
+    s2 = commandMaster.prefix;
+    for (s1 = command; *s1 && *s2; s1++, s2++) {
+        if (tolower(*s1) != tolower(*s2)) {
+            return false;
+        }
+    }
+
+    return *s1 == '_';
+}
+
+/*
+==================
+G_FindMaster
+==================
+*/
+Listener* G_FindMaster(const char* command)
+{
+    int i;
+
+    for (i = 1; i <= commandMasters.NumObjects(); i++) {
+        const commandmaster_t& commandMaster = commandMasters.ObjectAt(i);
+        if (G_MasterMatches(commandMaster, command)) {
+            return commandMaster.master;
+        }
+    }
+
+    return NULL;
+}
+
 /*
 ==================
 Cmd_Say_f
diff --git a/code/fgame/gamecmds.h b/code/fgame/gamecmds.h
index 97725eb1..a45ebc73 100644
--- a/code/fgame/gamecmds.h
+++ b/code/fgame/gamecmds.h
@@ -30,6 +30,12 @@ void G_InitConsoleCommands(void);
 
 qboolean G_ProcessClientCommand(gentity_t *ent);
 
+//===============
+// Added in OPM
+void G_CreateMaster(const char* prefix, class Listener* master);
+Listener* G_FindMaster(const char* command);
+//===============
+
 void     G_Say(gentity_t *ent, qboolean team, qboolean arg0);
 qboolean G_CameraCmd(gentity_t *ent);
 qboolean G_SoundCmd(gentity_t *ent);

From 627f66fb5bd95df2520251b4a46eae53b8fd7ed9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:45:56 +0200
Subject: [PATCH 1085/2040] Add basic pathnode editing feature

---
 code/fgame/navigate.cpp | 154 +++++++++++++++++++++++++++++++++++++---
 code/fgame/navigate.h   |  16 +++++
 2 files changed, 162 insertions(+), 8 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 6e4cfd66..6345838f 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "player.h"
 #include "debuglines.h"
 #include "scriptexception.h"
+#include "gamecmds.h"
 
 #define PATHFILE_VERSION 103
 
@@ -45,6 +46,7 @@ cvar_t *ai_fallheight;
 cvar_t *ai_debugpath;
 cvar_t *ai_pathchecktime;
 cvar_t *ai_pathcheckdist;
+cvar_t *ai_editmode; // Added in OPM
 
 static const vec_t *path_start;
 static const vec_t *path_end;
@@ -1031,8 +1033,8 @@ void PathSearch::ResetNodes(void)
     m_LoadIndex    = -1;
 
     if (!startBulkNavMemory && nodecount) {
-        for (x = PATHMAP_GRIDSIZE - 1; x >= 0; x--) {
-            for (y = PATHMAP_GRIDSIZE - 1; y >= 0; y--) {
+        for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+            for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
                 if (PathMap[x][y].nodes) {
                     gi.Free(PathMap[x][y].nodes);
                 }
@@ -1048,8 +1050,7 @@ void PathSearch::ResetNodes(void)
 
     for (x = 0; x < PATHMAP_GRIDSIZE; x++){
         for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
-            PathMap[x][y].numnodes = 0;
-            PathMap[x][y].nodes    = NULL;
+            PathMap[x][y] = MapCell();
         }
     }
 
@@ -1068,6 +1069,52 @@ void PathSearch::ResetNodes(void)
     }
 }
 
+void PathSearch::ClearNodes(void)
+{
+    int i;
+    int x;
+    int y;
+
+    m_bNodesloaded = false;
+    m_LoadIndex    = -1;
+
+    if (!startBulkNavMemory && nodecount) {
+        for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+            for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+                if (PathMap[x][y].nodes) {
+                    gi.Free(PathMap[x][y].nodes);
+                }
+            }
+        }
+
+        for (i = 0; i < nodecount; i++) {
+            if (pathnodes[i]->Child) {
+                gi.Free(pathnodes[i]->Child);
+            }
+        }
+    }
+
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            PathMap[x][y] = MapCell();
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        pathnodes[i]->Child = NULL;
+        pathnodes[i]->virtualNumChildren = 0;
+        pathnodes[i]->numChildren = 0;
+        pathnodes[i]->findCount = 0;
+    }
+
+    // Free the bulk nav' memory
+    if (startBulkNavMemory) {
+        gi.Free(startBulkNavMemory);
+        bulkNavMemory      = NULL;
+        startBulkNavMemory = NULL;
+    }
+}
+
 void PathSearch::UpdatePathwaysForBadPlace(const Vector& origin, float radius, int dir, int team)
 {
     float radiusSqr;
@@ -1718,9 +1765,8 @@ int PathSearch::DebugNearestNodeList(const vec3_t pos, PathNode **nodelist, int
 
     int node_count = NearestNodeSetup(pos, cell, nodes, deltas);
     int n          = 0;
-    int j          = 0;
 
-    for (i = 0; i < node_count && j < iMaxNodes; i++) {
+    for (i = 0; i < node_count && n < iMaxNodes; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
 
         VectorCopy(pos, start);
@@ -2093,21 +2139,32 @@ void PathSearch::Init(void)
     ai_debugpath           = gi.Cvar_Get("ai_debugpath", "0", 0);
     ai_pathchecktime       = gi.Cvar_Get("ai_pathchecktime", "1.5", CVAR_CHEAT);
     ai_pathcheckdist       = gi.Cvar_Get("ai_pathcheckdist", "4096", CVAR_CHEAT);
+
+    //
+    // Added in OPM
+    //
+    ai_editmode = gi.Cvar_Get("ai_editmode", "0", CVAR_LATCH);
+
+    navMaster.Init();
 }
 
 void *PathSearch::AllocPathNode(void)
 {
     if (!bulkNavMemory) {
         return gi.Malloc(sizeof(PathNode));
+    } else {
+        bulkNavMemory -= sizeof(PathNode);
+        if (ai_editmode->integer) {
+            return gi.Malloc(sizeof(PathNode));
+        }
     }
 
-    bulkNavMemory -= sizeof(PathNode);
     return bulkNavMemory;
 }
 
 void PathSearch::FreePathNode(void *ptr)
 {
-    if (!bulkNavMemory) {
+    if (!bulkNavMemory || ai_editmode->integer) {
         gi.Free(ptr);
     }
 }
@@ -3073,6 +3130,87 @@ PathNode *PathSearch::FindNearestCover(SimpleActor *pEnt, Vector& vPos, Entity *
     return NULL;
 }
 
+//===============
+// Added in OPM
+//===============
+
+Event EV_NavMaster_CreatePaths
+(
+    "nav_build",
+    EV_CHEAT,
+    NULL,
+    NULL,
+    "Build navigation path"
+);
+
+Event EV_NavMaster_SpawnNode
+(
+    "nav_newnode",
+    EV_CHEAT,
+    "S",
+    "type",
+    "Create a new node at the player's origin"
+);
+
+CLASS_DECLARATION(Listener, NavMaster, NULL) {
+    { &EV_NavMaster_CreatePaths, &NavMaster::CreatePaths },
+    { &EV_NavMaster_SpawnNode, &NavMaster::CreateNode },
+    { NULL, NULL }
+};
+
+NavMaster navMaster;
+
+NavMaster::NavMaster() {
+
+}
+
+void NavMaster::Init() {
+    G_CreateMaster("nav", this);
+}
+
+void NavMaster::CreatePaths(Event* ev) {
+    if (!ai_editmode->integer) {
+        return;
+    }
+    PathSearch::ClearNodes();
+    PathSearch::CreatePaths();
+}
+
+void NavMaster::CreateNode(Event* ev) {
+    str type;
+    int spawnflags = 0;
+    PathNode* node;
+    Entity* ent;
+
+    if (ev->NumArgs() > 0) {
+        type = ev->GetString(1);
+        if (!str::icmp(type, "corner_left")) {
+            spawnflags = AI_CORNER_LEFT;
+        } else if (!str::icmp(type, "corner_right")) {
+            spawnflags = AI_CORNER_RIGHT;
+        } else if (!str::icmp(type, "duck")) {
+            spawnflags = AI_DUCK;
+        } else if (!str::icmp(type, "sniper")) {
+            spawnflags = AI_SNIPER;
+        } else if (!str::icmp(type, "concealment")) {
+            spawnflags = AI_CONCEALMENT;
+        } else if (!str::icmp(type, "cover")) {
+            spawnflags = AI_COVER;
+        } else if (!str::icmp(type, "crate")) {
+            spawnflags = AI_CRATE;
+        }
+    }
+
+    ent = g_entities->entity;
+    if (!ent) {
+        return;
+    }
+
+    node = new PathNode;
+    node->nodeflags = spawnflags;
+    node->setOrigin(ent->origin);
+}
+
 Event EV_AttractiveNode_GetPriority
 (
     "priority",
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 69c3af2e..a3bc473f 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -305,6 +305,7 @@ public:
     static void *AllocPathNode(void);
     static void  FreePathNode(void *);
     static void  ResetNodes(void);
+    static void  ClearNodes(void); // Added in OPM
 
     static void      UpdatePathwaysForBadPlace(const Vector     &origin, float radius, int dir, int team);
     static PathInfo *GeneratePath(PathInfo *path);
@@ -368,6 +369,21 @@ extern PathSearch PathManager;
 // Added in OPM
 //===============
 
+class NavMaster : public Listener
+{
+public:
+    CLASS_PROTOTYPE(NavMaster);
+
+    NavMaster();
+
+    void Init(void);
+
+    void CreatePaths(Event* ev);
+    void CreateNode(Event* ev);
+};
+
+extern NavMaster navMaster;
+
 PathNode *AI_FindNode(const char *name);
 void      AI_AddNode(PathNode *node);
 void      AI_RemoveNode(PathNode *node);

From fd69d6b42c5f9bad3e615c8e8a6f258e141dcf19 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:46:16 +0200
Subject: [PATCH 1086/2040] Allow the bot to get out if stuck while falling

---
 code/fgame/playerbot.cpp | 52 ++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 78d67dda..58804363 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -232,37 +232,43 @@ void PlayerBot::MoveThink(void)
             ClearMove();
         }
 
+        m_bTempAway = false;
+
         if (groundentity || client->ps.walking) {
             if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
                 m_bTempAway = true;
             } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
                 m_bTempAway = true;
-            } else {
-                m_bTempAway = false;
             }
-
-            if (m_bTempAway) {
-                m_bTempAway     = true;
-                m_bDeltaMove    = false;
-                m_iTempAwayTime = level.inttime + 750;
-                m_iNumBlocks++;
-
-                // Try to backward a little
-                m_Path.Clear();
-                m_Path.ForceShortLookahead();
-                m_vCurrentGoal = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
-            } else {
-                m_iNumBlocks = 0;
-
-                if (!m_Path.CurrentNode()) {
-                    m_vTargetPos = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
-                    m_vCurrentGoal = m_vTargetPos;
-                }
+        } else {
+            // falling
+            if (GetMoveResult() >= MOVERESULT_BLOCKED) {
+                // stuck while falling
+                m_bTempAway = true;
             }
-
-            m_vLastCheckPos[1] = m_vLastCheckPos[0];
-            m_vLastCheckPos[0] = origin;
         }
+
+        if (m_bTempAway) {
+            m_bTempAway     = true;
+            m_bDeltaMove    = false;
+            m_iTempAwayTime = level.inttime + 750;
+            m_iNumBlocks++;
+
+            // Try to backward a little
+            m_Path.Clear();
+            m_Path.ForceShortLookahead();
+            m_vCurrentGoal = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+        } else {
+            m_iNumBlocks = 0;
+
+            if (!m_Path.CurrentNode()) {
+                m_vTargetPos = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+                m_vCurrentGoal = m_vTargetPos;
+            }
+        }
+
+        m_vLastCheckPos[1] = m_vLastCheckPos[0];
+        m_vLastCheckPos[0] = origin;
     }
 
     if (ai_debugpath->integer) {

From 7ef006cccac63b3dae99d529c24be724b37aa6ab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 21:15:37 +0200
Subject: [PATCH 1087/2040] Fix nodes improperly connecting to other nodes that
 are below the ground

---
 code/fgame/navigate.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 6345838f..2bce2d91 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2778,8 +2778,6 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
                     *path_fallheight = (short)test_fallheight + fallheight;
                     return test_fallheight + fallheight <= 1024.0f;
                 }
-            } else {
-                return true;
             }
 
             if (mm.groundPlane) {

From 1fde1647e8f5ef76319b1c9a5c9244924d7b1328 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 21:24:29 +0200
Subject: [PATCH 1088/2040] Use the proper enum for BroadcastAIEvent

---
 code/fgame/sentient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index f9938ac3..4d4ea4a2 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -2928,7 +2928,7 @@ void Sentient::UpdateFootsteps(void)
         iTagNum = gi.Tag_NumForName(edict->tiki, "Bip01 R Foot");
         if (iTagNum >= 0) {
             if (G_TIKI_IsOnGround(edict, iTagNum, 13.461539f)) {
-                BroadcastAIEvent(10, G_AIEventRadius(10));
+                BroadcastAIEvent(AI_EVENT_FOOTSTEP, G_AIEventRadius(AI_EVENT_FOOTSTEP));
                 // simulate footstep sounds
                 Footstep("Bip01 L Foot", (iAnimFlags & TAF_AUTOSTEPS_RUNNING), (iAnimFlags & TAF_AUTOSTEPS_EQUIPMENT));
                 m_bFootOnGround_Right = true;
@@ -2949,7 +2949,7 @@ void Sentient::UpdateFootsteps(void)
         iTagNum = gi.Tag_NumForName(edict->tiki, "Bip01 L Foot");
         if (iTagNum >= 0) {
             if (G_TIKI_IsOnGround(edict, iTagNum, 13.461539f)) {
-                BroadcastAIEvent(10, G_AIEventRadius(10));
+                BroadcastAIEvent(AI_EVENT_FOOTSTEP, G_AIEventRadius(AI_EVENT_FOOTSTEP));
                 // simulate footstep sounds
                 Footstep("Bip01 R Foot", (iAnimFlags & TAF_AUTOSTEPS_RUNNING), (iAnimFlags & TAF_AUTOSTEPS_EQUIPMENT));
                 m_bFootOnGround_Left = true;

From c0dd08f6e062fb141ffc2286933dca393b806313 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 21:24:45 +0200
Subject: [PATCH 1089/2040] Set an higher firing sound in MP

---
 code/fgame/weapon.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 7a579100..f98866c6 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2004,11 +2004,17 @@ void Weapon::Shoot(Event *ev)
             break;
         }
 
-        if (!quiet[mode]) {
-            if (next_noise_time <= level.time) {
-                BroadcastAIEvent(AI_EVENT_WEAPON_FIRE);
-                next_noise_time = level.time + 1;
+        if (!quiet[mode] && next_noise_time <= level.time) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER) {
+                BroadcastAIEvent(AI_EVENT_WEAPON_FIRE, 1500);
+            } else {
+                //
+                // Added in OPM
+                //  Weapon firing sounds can be heard 8000 units away
+                //  (from ubersound.scr)
+                BroadcastAIEvent(AI_EVENT_WEAPON_FIRE, 8000);
             }
+            next_noise_time = level.time + 1;
         }
 
         if (owner && owner->client) {

From 46935b165c2709cc52029ed038b4e8dc58c60d1d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:01:21 +0200
Subject: [PATCH 1090/2040] Fix MoveDone() not checking for height, also return
 false when temporarily getting away

---
 code/fgame/playerbot.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 58804363..b584fda7 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -783,7 +783,26 @@ Returns true if the bot has done moving
 */
 bool PlayerBot::MoveDone(void)
 {
-    return !m_Path.CurrentNode() || m_Path.Complete(origin);
+    if (!m_bPathing) {
+        return true;
+    }
+
+    if (m_bTempAway) {
+        return false;
+    }
+
+    if (!m_Path.CurrentNode()) {
+        return true;
+    }
+
+    if (!m_Path.NextNode()) {
+        Vector delta = Vector(m_Path.CurrentPathGoal()) - origin;
+        if (delta.lengthXYSquared() < Square(16)) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 /*

From 9293930628038e9986ce0487de55ca6f6ced782b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:59:32 +0200
Subject: [PATCH 1091/2040] Make bots jump off ladder

They don't support ladders yet
---
 code/fgame/playerbot.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index b584fda7..8ceee55f 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -335,6 +335,15 @@ void PlayerBot::CheckJump(void)
     Vector  dir;
     trace_t trace;
 
+    if (m_pLadder) {
+        if (!m_botCmd.upmove) {
+            m_botCmd.upmove = 127;
+        } else {
+            m_botCmd.upmove = 0;
+        }
+        return;
+    }
+
     dir = m_vLastValidDir;
 
     start = origin + Vector(0, 0, STEPSIZE);

From 16b0f0d62599d3364e71acba777c8aa34fa8b32a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 00:53:31 +0200
Subject: [PATCH 1092/2040] Use random() in CuriousSound()

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 90e066be..2924d23d 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -9158,7 +9158,7 @@ void Actor::CuriousSound(int iType, vec3_t sound_origin, float fDistSquared, flo
         }
     }
 
-    if ((fRangeFactor * m_fSoundAwareness) < (rand() / (0x7fffffff / 100.0))) {
+    if ((fRangeFactor * m_fSoundAwareness) < random()) {
         return;
     }
 

From b6c2638c1b23bc8651198732f2ac23166ae6d9ce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 01:01:03 +0200
Subject: [PATCH 1093/2040] Make curiosity random

---
 code/fgame/playerbot.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 8ceee55f..9be4645c 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -903,6 +903,13 @@ Warn the bot of an event
 void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared)
 {
     Sentient* pSentOwner;
+    float fRangeFactor;
+
+    fRangeFactor = Q_min(4.0 / 3.0 - ((4.0 / 3.0 * fDistanceSquared) / fRadiusSquared), 1);
+
+    if (fRangeFactor < random()) {
+        return;
+    }
 
     if (pEnt->IsSubclassOfSentient()) {
         pSentOwner = static_cast<Sentient*>(pEnt);

From 5869ba06bc44121db2e1f51e0d88872266da0bf7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 01:13:12 +0200
Subject: [PATCH 1094/2040] Update the attack time when moving

---
 code/fgame/playerbot.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 9be4645c..fa46b5fd 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1371,6 +1371,10 @@ void PlayerBot::State_Attack(void)
             MoveTo(m_vLastEnemyPos);
         }
     }
+
+    if (IsMoving()) {
+        m_iAttackTime = level.inttime + 1000;
+    }
 }
 
 /*

From 09eb130b6dd77173fbc5c1df2b939b800f8e1c1c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:24:32 +0200
Subject: [PATCH 1095/2040] Update curiosity and MoveDone()

---
 code/fgame/playerbot.cpp | 24 ++++++++++++------------
 code/fgame/playerbot.h   |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index fa46b5fd..b75d131e 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -209,7 +209,7 @@ void PlayerBot::MoveThink(void)
             m_vCurrentGoal = origin;
             VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
 
-            if (m_Path.Complete(origin)) {
+            if (MoveDone()) {
                 // Clear the path
                 m_Path.Clear();
             }
@@ -659,7 +659,7 @@ Move to the specified position
 void PlayerBot::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
 {
     m_vTargetPos = vPos;
-    m_Path.FindPath(origin, vPos, this, 0, vLeashHome, fLeashRadius * fLeashRadius);
+    m_Path.FindPath(origin, m_vTargetPos, this, 0, vLeashHome, fLeashRadius * fLeashRadius);
 
     NewMove();
 
@@ -792,6 +792,8 @@ Returns true if the bot has done moving
 */
 bool PlayerBot::MoveDone(void)
 {
+    PathInfo* next;
+
     if (!m_bPathing) {
         return true;
     }
@@ -804,11 +806,9 @@ bool PlayerBot::MoveDone(void)
         return true;
     }
 
-    if (!m_Path.NextNode()) {
-        Vector delta = Vector(m_Path.CurrentPathGoal()) - origin;
-        if (delta.lengthXYSquared() < Square(16)) {
-            return true;
-        }
+    Vector delta = Vector(m_Path.CurrentPathGoal()) - origin;
+    if (delta.lengthXYSquared() < Square(16) && delta.z < maxs.z) {
+        return true;
     }
 
     return false;
@@ -905,7 +905,7 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
     Sentient* pSentOwner;
     float fRangeFactor;
 
-    fRangeFactor = Q_min(4.0 / 3.0 - ((4.0 / 3.0 * fDistanceSquared) / fRadiusSquared), 1);
+    fRangeFactor = 1.0 - (fDistanceSquared / fRadiusSquared);
 
     if (fRangeFactor < random()) {
         return;
@@ -961,7 +961,7 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
     case AI_EVENT_GRENADE:
     default:
         m_iCuriousTime    = level.inttime + 20000;
-        m_vLastCuriousPos = vPos;
+        m_vNewCuriousPos  = vPos;
         break;
     }
 }
@@ -1147,11 +1147,11 @@ bool PlayerBot::CheckCondition_Curious(void)
 
 void PlayerBot::State_Curious(void)
 {
-    //AimAt( m_vLastCuriousPos );
     AimAtAimNode();
 
-    if (!MoveToBestAttractivePoint(3) && !IsMoving()) {
-        MoveTo(m_vLastCuriousPos);
+    if (!MoveToBestAttractivePoint(3) && (!IsMoving() || m_vLastCuriousPos != m_vNewCuriousPos)) {
+        MoveTo(m_vNewCuriousPos);
+        m_vLastCuriousPos = m_vNewCuriousPos;
     }
 
     if (MoveDone()) {
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 5e1404d9..c89ba06c 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -68,6 +68,7 @@ private:
     int               m_iCuriousTime;
     int               m_iAttackTime;
     Vector            m_vLastCuriousPos;
+    Vector            m_vNewCuriousPos;
     Vector            m_vOldEnemyPos;
     Vector            m_vLastEnemyPos;
     Vector            m_vLastDeathPos;

From afd7943b622db0e6273a76d0ebada3dfceeffd4d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:20:45 +0200
Subject: [PATCH 1096/2040] Fix incorrect teams and controllers for TOW
 objectives

---
 code/fgame/Entities.h       |  2 +-
 code/fgame/Tow_Entities.cpp | 16 ++++++++--------
 code/fgame/Tow_Entities.h   |  2 +-
 code/fgame/dm_manager.cpp   |  6 +++---
 code/fgame/dm_manager.h     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index c26f3f93..bbb454a3 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "animate.h"
 
 typedef enum {
-    CONTROLLER_ALLIES,
     CONTROLLER_AXIS,
+    CONTROLLER_ALLIES,
     CONTROLLER_DRAW
 } eController;
 
diff --git a/code/fgame/Tow_Entities.cpp b/code/fgame/Tow_Entities.cpp
index d4b1921b..b59c2ec7 100644
--- a/code/fgame/Tow_Entities.cpp
+++ b/code/fgame/Tow_Entities.cpp
@@ -269,13 +269,13 @@ void TOWObjective::TakeOver(Event *ev)
 
     switch (controller) {
     case CONTROLLER_ALLIES:
-        gi.cvar_set(m_sAxisObjName.c_str(), "1");
-        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
-        break;
-    case CONTROLLER_AXIS:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "1");
         break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
     default:
         break;
     }
@@ -308,13 +308,13 @@ void TOWObjective::OnInitialize(Event *ev)
 
     switch (m_eController) {
     case CONTROLLER_ALLIES:
-        gi.cvar_set(m_sAxisObjName.c_str(), "1");
-        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
-        break;
-    case CONTROLLER_AXIS:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "1");
         break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
     case CONTROLLER_DRAW:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "0");
diff --git a/code/fgame/Tow_Entities.h b/code/fgame/Tow_Entities.h
index eee8cd6f..dca59a86 100644
--- a/code/fgame/Tow_Entities.h
+++ b/code/fgame/Tow_Entities.h
@@ -59,8 +59,8 @@ class TOWObjectiveMan
 {
 private:
     Container<TOWObjective *> m_towObjectives;
-    int                       m_iNumAxisObjectives;
     int                       m_iNumAlliesObjectives;
+    int                       m_iNumAxisObjectives;
 
 public:
     TOWObjectiveMan();
diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index c6d3ab50..bfd8f321 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1720,10 +1720,10 @@ void DM_Manager::SetBombsPlanted(int num)
 
 void DM_Manager::StopTeamRespawn(eController controller)
 {
-    if (controller == CONTROLLER_AXIS) {
-        m_bAllowAxisRespawn = false;
-    } else if (controller == CONTROLLER_ALLIES) {
+    if (controller == CONTROLLER_ALLIES) {
         m_bAllowAlliedRespawn = false;
+    } else if (controller == CONTROLLER_AXIS) {
+        m_bAllowAxisRespawn = false;
     }
 }
 
diff --git a/code/fgame/dm_manager.h b/code/fgame/dm_manager.h
index 55a72e28..087ea5b0 100644
--- a/code/fgame/dm_manager.h
+++ b/code/fgame/dm_manager.h
@@ -179,8 +179,8 @@ private:
     int m_iNumBombsPlanted;
     int m_iTotalMapTime;
 
-    bool m_bAllowAxisRespawn;
     bool m_bAllowAlliedRespawn;
+    bool m_bAllowAxisRespawn;
     bool m_bRoundActive;
 
     // scoreboard data

From a150cb5c6e68f8d01398653e6f5b75cfc923b50e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 16:58:20 +0200
Subject: [PATCH 1097/2040] Also check for liberation game type when the team
 is dead

---
 code/fgame/dm_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index bfd8f321..643e7346 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -534,7 +534,7 @@ bool DM_Team::IsDead(void) const
         return false;
     }
 
-    if (g_gametype->integer == GT_TOW) {
+    if (g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
         if (dmManager.AllowTeamRespawn(m_teamnumber)) {
             return false;
         }

From e564a97b05001e6643cce1e5437df212ffaba654 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:31:02 +0200
Subject: [PATCH 1098/2040] Check if the delta is exactly 16

---
 code/fgame/misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index 333874f1..7dd84950 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -3068,7 +3068,7 @@ void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
 
     fHeight = ((int)(pUser->origin[2] + 8.0f) & ~15);
 
-    if (vDelta.length() > 16.0f && pUser->origin[2] == fHeight) {
+    if (vDelta.length() == 16.0f && pUser->origin[2] == fHeight) {
         return;
     }
 

From 9b9642df8f631588df9c9f6dd9f73acde4fc39e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:33:48 +0200
Subject: [PATCH 1099/2040] Add a very tiny offset off the facing dir as a
 workaround the 1 bit difference between 32-bit and 64-bit

In 64-bit, some windings are off by 1 bit (float values) compared to 32-bit, which causes issue on some maps like `dm/mp_stadt_dm` where the player would get stuck climbing up because of the blocking patch at the top
---
 code/fgame/misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index 7dd84950..effbe0d9 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -3094,7 +3094,7 @@ void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
         );
     }
 
-    pUser->setOrigin(trace.endpos);
+    pUser->setOrigin(trace.endpos + m_vFacingDir * 0.005);
 }
 
 void FuncLadder::EnsureOverLadder(Entity *pUser)

From d3d85fded0415d75d1fca27eb277bdfb5ffed271 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:37:31 +0200
Subject: [PATCH 1100/2040] Add TEAM_MAX

---
 code/fgame/bg_public.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index d2e19431..3a64c016 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -560,7 +560,8 @@ movement on the server game.
         TEAM_SPECTATOR,
         TEAM_FREEFORALL,
         TEAM_ALLIES,
-        TEAM_AXIS
+        TEAM_AXIS,
+        TEAM_MAX
     } teamtype_t;
 
     typedef enum {

From 911931942911a04a316fe367010232da9ac2ccb3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:46:02 +0200
Subject: [PATCH 1101/2040] Avoid unbalancing teams when removing bots

---
 code/fgame/g_bot.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 8d409911..a42fc61b 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -256,9 +256,42 @@ void G_RemoveBot(unsigned int num)
 {
     unsigned int removed = 0;
     unsigned int n;
+    unsigned int teamCount[2]{ 0 };
+    bool bNoMoreToRemove = false;
 
     num = Q_min(num, sv_maxbots->integer);
 
+    teamCount[0] = dmManager.GetTeamAllies()->m_players.NumObjects();
+    teamCount[1] = dmManager.GetTeamAxis()->m_players.NumObjects();
+
+    while (!bNoMoreToRemove) {
+        bNoMoreToRemove = true;
+
+        for (n = 0; n < game.maxclients && removed < num; n++) {
+            gentity_t *e = &g_entities[game.maxclients - sv_maxbots->integer + n];
+            if (e->inuse && e->client) {
+                Player* player = static_cast<Player*>(e->entity);
+                if (player->GetTeam() == TEAM_ALLIES || player->GetTeam() == TEAM_AXIS) {
+                    unsigned int teamIndex = (player->GetTeam() - TEAM_ALLIES);
+                    if (teamCount[teamIndex] < teamCount[1 - teamIndex]) {
+                        // Skip bots in the lowest team
+                        continue;
+                    }
+
+                    teamCount[teamIndex]--;
+                    bNoMoreToRemove = false;
+                }
+
+                G_ClientDisconnect(e);
+                current_bot_count--;
+                removed++;
+            }
+        }
+    }
+
+    //
+    // Remove all bots regardless
+    //
     for (n = 0; n < game.maxclients && removed < num; n++) {
         gentity_t *e = &g_entities[game.maxclients - sv_maxbots->integer + n];
         if (e->inuse && e->client) {

From b77464386c1d570962ae19c08e3b450b5a9ac9e1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:46:23 +0200
Subject: [PATCH 1102/2040] Count actual clients that aren't spectating

---
 code/fgame/g_bot.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index a42fc61b..59f7682d 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -359,10 +359,10 @@ int G_CountClients()
         other = &g_entities[n];
         if (other->inuse && other->client) {
             Player *p = static_cast<Player *>(other->entity);
-            //if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
-            //    // ignore spectators
-            //    continue;
-            //}
+            if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
+                // ignore spectators
+                continue;
+            }
 
             count++;
         }

From d19328230cee2a3825102671a5829c8e9e669427 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:50:42 +0200
Subject: [PATCH 1103/2040] Allow more bots to be spawned alongside the minimum
 number of players

---
 code/fgame/g_bot.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 59f7682d..fca4e0e2 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -392,9 +392,9 @@ void G_SpawnBots()
     //
     // Check the minimum bot count
     //
-    numClients = G_CountClients() + sv_numbots->integer;
+    numClients = G_CountClients();
     if (numClients < sv_minPlayers->integer) {
-        numBotsToSpawn = sv_minPlayers->integer - numClients;
+        numBotsToSpawn = sv_minPlayers->integer - numClients + sv_numbots->integer;
     } else {
         numBotsToSpawn = sv_numbots->integer;
     }

From f5558d106e3c34d37efa24b60148ea875988134c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:19:44 +0200
Subject: [PATCH 1104/2040] Don't set the last radar time if the entity number
 is above the max number of clients

---
 code/server/sv_snapshot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index b15a7cd4..b173223c 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1044,7 +1044,7 @@ static void SV_BuildClientSnapshot( client_t *client ) {
 	frame->first_entity = svs.nextSnapshotEntities;
 	for ( i = 0 ; i < entityNumbers.numSnapshotEntities ; i++ ) {
 		ent = SV_GentityNum(entityNumbers.snapshotEntities[i]);
-		if (ent->client) {
+		if (ent->client && ent->s.number < svs.iNumClients) {
 			assert(ent->s.number < MAX_CLIENTS);
 			client->lastRadarTime[ent->s.number] = svs.time;
 		}

From a5058c7babbf50755e280a3d2e2add95d65d5fc8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:57:03 +0200
Subject: [PATCH 1105/2040] Call Delete() instead of deleting the item as it
 could cause issues if the item is being deleted while iterating over edicts

---
 code/fgame/sentient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 4d4ea4a2..8b454201 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1032,7 +1032,7 @@ void Sentient::FreeInventory(void)
     num = inventory.NumObjects();
     for (i = num; i > 0; i--) {
         item = (Item *)G_GetEntity(inventory.ObjectAt(i));
-        delete item;
+        item->Delete();
     }
     inventory.ClearObjectList();
 

From a7befa8882e042c127eae31beeb9e8a5de2a6664 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:00:40 +0200
Subject: [PATCH 1106/2040] When a client disconnects, delete the entity on the
 next frame if the function is called while in thinks

---
 code/fgame/g_client.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 4ac3d80b..e8dfd598 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -1049,9 +1049,14 @@ void G_ClientDisconnect(gentity_t *ent)
 
         G_PrintToAllClients(va("%s has left the battle\n", ent->client->pers.netname), 2);
 
+        assert(ent->entity->IsSubclassOfPlayer());
         ((Player *)ent->entity)->Disconnect();
 
-        delete ent->entity;
+        if (g_iInThinks) {
+            ent->entity->PostEvent(EV_Remove, 0);
+        } else {
+            delete ent->entity;
+        }
         ent->entity = NULL;
     }
 

From 2aa02058720176a92c2b992a5e8684152559ba6c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:01:05 +0200
Subject: [PATCH 1107/2040] Clear client persistent to avoid leaking data

---
 code/fgame/g_client.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index e8dfd598..86547941 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerbot.h"
 #include "playerstart.h"
 #include "scriptmaster.h"
+#include "g_spawn.h"
 
 // g_client.c -- client functions that don't happen every frame
 
@@ -1058,6 +1059,8 @@ void G_ClientDisconnect(gentity_t *ent)
             delete ent->entity;
         }
         ent->entity = NULL;
+
+        G_InitClientPersistant(ent->client);
     }
 
     catch (const char *error) {

From 5019d1e4f97713fd6b33a79983ba805217ce6ef4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:43:42 +0200
Subject: [PATCH 1108/2040] Spawn bots after the server has spawned

---
 code/fgame/g_main.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index c980ead1..89474439 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -302,8 +302,6 @@ G_SpawnEntities
 void G_SpawnEntities(char *entities, int svsTime)
 {
     level.SpawnEntities(entities, svsTime);
-
-    G_SpawnBots();
 }
 
 /*
@@ -376,6 +374,8 @@ void G_ServerSpawned(void)
 {
     try {
         level.ServerSpawned();
+
+        G_SpawnBots();
     } catch (const ScriptException& e) {
         G_ExitWithError(e.string.c_str());
     }
@@ -698,11 +698,13 @@ void G_RunFrame(int levelTime, int frameTime)
             }
         }
 
-        //
-        // Added in OPM
-        //
-        // Add or delete bots that were added using addbot/removebot
-        G_SpawnBots();
+        if (level.Spawned()) {
+            //
+            // Added in OPM
+            //
+            // Add or delete bots that were added using addbot/removebot
+            G_SpawnBots();
+        }
     }
 
     catch (const char *error) {

From b1f7d641fc49fbecb48df8f4eb04eee4f3d7572b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:44:10 +0200
Subject: [PATCH 1109/2040] Use game.maxclients for the maximum number of bots

---
 code/fgame/gamecmds.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index ca9b0077..9f3f4146 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -644,12 +644,13 @@ qboolean G_AddBotCommand(gentity_t *ent)
     }
 
     numbots = atoi(gi.Argv(1));
-    if (numbots > sv_maxbots->integer) {
-        gi.Printf("addbot must be between 1-%d\n", sv_maxbots->integer);
+
+    if (numbots > game.maxclients) {
+        gi.Printf("addbot must be between 1-%d\n", game.maxclients);
         return qfalse;
     }
 
-    totalnumbots = Q_min(numbots + sv_numbots->integer, sv_maxbots->integer);
+    totalnumbots = Q_min(numbots + sv_numbots->integer, game.maxclients);
 
     gi.cvar_set("sv_numbots", va("%d", totalnumbots));
     return qtrue;

From a503e1896607c17ac7ee9852457d5cb83ef810bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:19:15 +0200
Subject: [PATCH 1110/2040] Make the bot move to the enemy only if it was seen

---
 code/fgame/playerbot.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index b75d131e..7ca9ab2e 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1343,15 +1343,14 @@ void PlayerBot::State_Attack(void)
         }
 
         m_iAttackTime = level.inttime + 1000;
+        m_vOldEnemyPos = m_vLastEnemyPos;
+        m_vLastEnemyPos = m_pEnemy->centroid;
     } else {
         m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
         fMinDistanceSquared = 0;
     }
 
-    m_vOldEnemyPos  = m_vLastEnemyPos;
-    m_vLastEnemyPos = m_pEnemy->centroid;
-
-    AimAt(m_vLastEnemyPos + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
+    AimAt(m_pEnemy->centroid + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
 
     if (bNoMove) {
         return;

From d4b3f7378e76bd37575ef965bd68f9e921d08d30 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:29:55 +0200
Subject: [PATCH 1111/2040] Don't update the new path check time when there is
 a new move

---
 code/fgame/playerbot.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 7ca9ab2e..0fff59a3 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -644,7 +644,6 @@ Called when there is a new move
 */
 void PlayerBot::NewMove() {
     m_bPathing = true;
-    m_iCheckPathTime = level.inttime + 2000;
     m_vLastCheckPos[0] = origin;
     m_vLastCheckPos[1] = origin;
 }

From 295c267c31697adf8561152453dc5976d6f65649 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:30:28 +0200
Subject: [PATCH 1112/2040] Automatically join a team if the bot was put in
 spectator, and automatically select a primary weapon if none was selected

---
 code/fgame/playerbot.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 0fff59a3..e9a925da 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -470,6 +470,36 @@ void PlayerBot::UpdateBotStates(void)
         return;
     }
 
+    if (!client->pers.dm_primary[0]) {
+        Event *event;
+
+        //
+        // Primary weapon
+        //
+        event = new Event(EV_Player_PrimaryDMWeapon);
+        event->AddString("auto");
+
+        ProcessEvent(event);
+    }
+
+    if (GetTeam() == TEAM_NONE || GetTeam() == TEAM_SPECTATOR) {
+        Event* event;
+        float time;
+
+        // Add some delay to avoid telefragging
+        time = entnum / 20.0;
+
+        if (EventPending(EV_Player_AutoJoinDMTeam)) {
+            return;
+        }
+
+        //
+        // Team
+        //
+        PostEvent(EV_Player_AutoJoinDMTeam, time);
+        return;
+    }
+
     if (IsDead() || IsSpectator()) {
         // The bot should respawn
         m_botCmd.buttons ^= BUTTON_ATTACKLEFT;

From 0d53adf9bd8170f71338da37dce2d6bf14af31f3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:57:39 +0200
Subject: [PATCH 1113/2040] Rework bot spawning

- Add a sv_sharedbots to specify if real client slots should be used
- Removed m_bSpawnBot from level, bots are spawned directly in G_BotBegin instead
- sv_numbots can be used to directly configure the number of bots to spawn
- Fix the way bots spawn/unspawn on-demand
- Documented g_bot functions
---
 code/fgame/g_bot.cpp         | 610 ++++++++++++++++++++++++++---------
 code/fgame/g_bot.h           |  23 +-
 code/fgame/g_client.cpp      |  15 +-
 code/fgame/gamecvars.cpp     |  19 +-
 code/fgame/gamecvars.h       |   1 +
 code/fgame/level.cpp         |   1 -
 code/fgame/level.h           |   2 -
 docs/configuration/server.md |  11 +-
 8 files changed, 499 insertions(+), 183 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index fca4e0e2..71dafdc1 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,25 +26,47 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerbot.h"
 #include "g_bot.h"
 
-static gentity_t   *firstBot          = NULL;
 static saved_bot_t *saved_bots        = NULL;
 static unsigned int num_saved_bots    = 0;
 static unsigned int current_bot_count = 0;
+static unsigned int botId             = 0;
 static char       **modelList         = NULL;
 
 Container<str> alliedModelList;
 Container<str> germanModelList;
 
+/*
+===========
+IsAlliedPlayerModel
+
+Return whether or not the specified filename is for allies
+============
+*/
 bool IsAlliedPlayerModel(const char *filename)
 {
     return !Q_stricmpn(filename, "/allied_", 8) || !Q_stricmpn(filename, "/american_", 10);
 }
 
+/*
+===========
+IsGermanPlayerModel
+
+Return whether or not the specified filename is for axis
+============
+*/
 bool IsGermanPlayerModel(const char *filename)
 {
     return !Q_stricmpn(filename, "/german_", 8) || !Q_stricmpn(filename, "/IT_", 4) || !Q_stricmpn(filename, "/SC_", 4);
 }
 
+/*
+===========
+IsPlayerModel
+
+Return whether or not the specified filename
+is a player model that can be chosen
+============
+*/
 bool IsPlayerModel(const char *filename)
 {
     size_t len = strlen(filename);
@@ -60,12 +82,27 @@ bool IsPlayerModel(const char *filename)
     return true;
 }
 
+/*
+===========
+ClearModelList
+
+Clear the allied and axis model list
+============
+*/
 void ClearModelList()
 {
     alliedModelList.FreeObjectList();
     germanModelList.FreeObjectList();
 }
 
+/*
+===========
+InitModelList
+
+Initialize the list of allied and axis player models
+that bots can use
+============
+*/
 void InitModelList()
 {
     char **fileList;
@@ -113,12 +150,28 @@ void InitModelList()
     gi.FS_FreeFileList(fileList);
 }
 
+/*
+===========
+G_BotBegin
+
+Begin spawning a new bot entity
+============
+*/
 void G_BotBegin(gentity_t *ent)
 {
-    level.m_bSpawnBot = true;
+    level.spawn_entnum = ent->s.number;
+    new PlayerBot;
+
     G_ClientBegin(ent, NULL);
 }
 
+/*
+===========
+G_BotThink
+
+Called each server frame to make bots think
+============
+*/
 void G_BotThink(gentity_t *ent, int msec)
 {
     usercmd_t  ucmd;
@@ -138,128 +191,300 @@ void G_BotThink(gentity_t *ent, int msec)
     G_ClientThink(ent, &ucmd, &eyeinfo);
 }
 
-gentity_t *G_GetFirstBot()
+/*
+===========
+G_FindFreeEntityForBot
+
+Find a free client slot
+============
+*/
+gentity_t *G_FindFreeEntityForBot()
 {
-    return firstBot;
+    gentity_t *ent;
+    int        minNum = 0;
+    int        i;
+
+    if (sv_sharedbots->integer) {
+        minNum = 0;
+    } else {
+        minNum = maxclients->integer;
+    }
+
+    for (i = minNum; i < game.maxclients; i++) {
+        ent = &g_entities[i];
+        if (!ent->inuse && ent->client && !ent->client->pers.userinfo[0]) {
+            return ent;
+        }
+    }
+
+    return NULL;
 }
 
-void G_AddBot(unsigned int num, saved_bot_t *saved)
+/*
+===========
+G_ChangeParent
+
+Fix parenting for entities that use the old number
+============
+*/
+void G_ChangeParent(int oldNum, int newNum)
 {
-    int        n;
+    gentity_t *ent;
     int        i;
-    int        clientNum = -1;
-    gentity_t *e;
-    char       botName[MAX_NETNAME];
-    char       challenge[MAX_STRING_TOKENS];
-    Event     *teamEv;
 
-    num = Q_min(num, sv_maxbots->integer);
-    for (n = 0; n < num; n++) {
-        char userinfo[MAX_INFO_STRING] {0};
-
-        for (i = maxclients->integer; i < game.maxclients; i++) {
-            e = &g_entities[i];
-
-            if (!e->inuse && e->client) {
-                clientNum = i;
-                break;
-            }
+    for (i = 0; i < game.maxentities; i++) {
+        ent = &g_entities[i];
+        if (!ent->inuse || !ent->entity) {
+            continue;
         }
 
-        if (clientNum == -1) {
-            gi.Printf("No free slot for a bot\n");
-            return;
+        if (ent->s.parent == oldNum) {
+            ent->s.parent = newNum;
         }
-
-        if (gi.Argc() > 2) {
-            Q_strncpyz(botName, gi.Argv(2), sizeof(botName));
-        } else {
-            Com_sprintf(botName, sizeof(botName), "bot%d", clientNum - maxclients->integer + 1);
-        }
-
-        Com_sprintf(challenge, sizeof(challenge), "%d", clientNum - maxclients->integer + 1);
-
-        e->s.clientNum = clientNum;
-        e->s.number    = clientNum;
-
-        if (saved) {
-            strncpy(userinfo, saved->pers.userinfo, ARRAY_LEN(userinfo));
-        } else {
-            Info_SetValueForKey(userinfo, "name", botName);
-
-            //
-            // Choose a random model
-            //
-            if (alliedModelList.NumObjects()) {
-                Info_SetValueForKey(userinfo, "dm_playermodel", alliedModelList[rand() % alliedModelList.NumObjects()]);
-            }
-            if (germanModelList.NumObjects()) {
-                Info_SetValueForKey(
-                    userinfo, "dm_playergermanmodel", germanModelList[rand() % germanModelList.NumObjects()]
-                );
-            }
-
-            Info_SetValueForKey(userinfo, "fov", "80");
-            Info_SetValueForKey(userinfo, "protocol", "8");
-            Info_SetValueForKey(userinfo, "ip", "0.0.0.0");
-            Info_SetValueForKey(userinfo, "qport", "0");
-            Info_SetValueForKey(userinfo, "challenge", challenge);
-            Info_SetValueForKey(userinfo, "snaps", "1");
-            Info_SetValueForKey(userinfo, "rate", "1");
-            Info_SetValueForKey(userinfo, "dmprimary", "smg");
-        }
-
-        current_bot_count++;
-
-        G_BotConnect(clientNum, userinfo);
-
-        if (saved) {
-            e->client->pers = saved->pers;
-        }
-
-        if (!firstBot) {
-            firstBot = e;
-        }
-
-        G_BotBegin(e);
-
-        if (saved) {
-            /*
-			switch (saved->team)
-			{
-            case TEAM_ALLIES:
-                teamEv = new Event(EV_Player_JoinDMTeam);
-				teamEv->AddString("allies");
-				break;
-            case TEAM_AXIS:
-                teamEv = new Event(EV_Player_JoinDMTeam);
-                teamEv->AddString("axis");
-				break;
-            default:
-				teamEv = new Event(EV_Player_AutoJoinDMTeam);
-				break;
-			}
-			*/
-        } else {
-            teamEv = new Event(EV_Player_AutoJoinDMTeam);
-            e->entity->PostEvent(teamEv, level.frametime);
-
-            Event *ev = new Event(EV_Player_PrimaryDMWeapon);
-            ev->AddString("auto");
-
-            e->entity->PostEvent(ev, level.frametime);
+        if (ent->r.ownerNum == oldNum) {
+            ent->r.ownerNum = newNum;
         }
     }
 }
 
-void G_RemoveBot(unsigned int num)
+/*
+===========
+G_BotShift
+
+If the specified slot is used, the bot will be relocated
+to the next free entity slot
+============
+*/
+void G_BotShift(int clientNum)
+{
+    gentity_t *ent;
+    gentity_t *newEnt;
+
+    ent = &g_entities[clientNum];
+    if (!ent->inuse || !ent->client || !ent->entity) {
+        return;
+    }
+
+    if (!ent->entity->IsSubclassOfBot()) {
+        return;
+    }
+
+    newEnt = G_FindFreeEntityForBot();
+    if (!newEnt) {
+        G_RemoveBot(ent);
+        return;
+    }
+
+    //
+    // Allocate the new entity
+    //
+    level.spawn_entnum = newEnt - g_entities;
+    level.AllocEdict(ent->entity);
+
+    //
+    // Copy all fields
+    //
+    newEnt->s        = ent->s;
+    newEnt->s.number = newEnt - g_entities;
+    memcpy(newEnt->client, ent->client, sizeof(*newEnt->client));
+    newEnt->r     = ent->r;
+    newEnt->solid = ent->solid;
+    newEnt->tiki  = ent->tiki;
+    AxisCopy(ent->mat, newEnt->mat);
+
+    newEnt->freetime  = ent->freetime;
+    newEnt->spawntime = ent->spawntime;
+    newEnt->radius2   = ent->radius2;
+    memcpy(newEnt->entname, ent->entname, sizeof(newEnt->entname));
+    newEnt->clipmask             = ent->clipmask;
+    newEnt->entity               = ent->entity;
+    newEnt->entity->edict        = newEnt;
+    newEnt->entity->client       = newEnt->client;
+    newEnt->entity->entnum       = newEnt->s.number;
+    newEnt->client->ps.clientNum = newEnt->s.number;
+
+    G_ChangeParent(ent->s.number, newEnt->s.number);
+
+    //
+    // Free the old entity so the real client will use it
+    //
+    level.FreeEdict(ent);
+    memset(ent->client, 0, sizeof(*ent->client));
+
+    G_SetClientConfigString(newEnt);
+}
+
+/*
+===========
+G_GetFirstBot
+
+Return the first bot
+============
+*/
+gentity_t *G_GetFirstBot()
+{
+    gentity_t   *ent;
+    unsigned int n;
+
+    for (n = 0; n < game.maxclients; n++) {
+        ent = &g_entities[n];
+        if (G_IsBot(ent)) {
+            return ent;
+        }
+    }
+
+    return NULL;
+}
+
+/*
+===========
+G_IsBot
+
+Return whether or not the gentity is a bot
+============
+*/
+bool G_IsBot(gentity_t *ent)
+{
+    if (!ent->inuse || !ent->client) {
+        return false;
+    }
+
+    if (!ent->entity || !ent->entity->IsSubclassOfBot()) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===========
+G_IsPlayer
+
+Return whether or not the gentity is a player
+============
+*/
+bool G_IsPlayer(gentity_t *ent)
+{
+    if (!ent->inuse || !ent->client) {
+        return false;
+    }
+
+    if (!ent->entity || ent->entity->IsSubclassOfBot()) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===========
+G_AddBot
+
+Add the specified bot, optionally its saved state
+============
+*/
+void G_AddBot(saved_bot_t *saved)
+{
+    int        i;
+    int        clientNum;
+    gentity_t *e;
+    char       botName[MAX_NETNAME];
+    char       challenge[MAX_STRING_TOKENS];
+    Event     *teamEv;
+    char       userinfo[MAX_INFO_STRING] {0};
+
+    e = G_FindFreeEntityForBot();
+    if (!e) {
+        gi.Printf("No free slot for a bot\n");
+        return;
+    }
+
+    clientNum = e - g_entities;
+
+    if (gi.Argc() > 2) {
+        Q_strncpyz(botName, gi.Argv(2), sizeof(botName));
+    } else {
+        Com_sprintf(botName, sizeof(botName), "bot%d", botId);
+    }
+
+    e->s.clientNum = clientNum;
+    e->s.number    = clientNum;
+
+    if (saved) {
+        strncpy(userinfo, saved->pers.userinfo, ARRAY_LEN(userinfo));
+    } else {
+        Info_SetValueForKey(userinfo, "name", botName);
+
+        //
+        // Choose a random model
+        //
+        if (alliedModelList.NumObjects()) {
+            const unsigned int index = rand() % alliedModelList.NumObjects();
+            Info_SetValueForKey(userinfo, "dm_playermodel", alliedModelList[index]);
+        }
+        if (germanModelList.NumObjects()) {
+            const unsigned int index = rand() % germanModelList.NumObjects();
+            Info_SetValueForKey(userinfo, "dm_playergermanmodel", germanModelList[index]);
+        }
+
+        Info_SetValueForKey(userinfo, "fov", "80");
+        Info_SetValueForKey(userinfo, "ip", "localhost");
+    }
+
+    current_bot_count++;
+    botId++;
+
+    G_BotConnect(clientNum, userinfo);
+
+    if (saved) {
+        e->client->pers = saved->pers;
+    }
+
+    G_BotBegin(e);
+}
+
+/*
+===========
+G_AddBots
+
+Add the specified number of bots
+============
+*/
+void G_AddBots(unsigned int num)
+{
+    int n;
+
+    for (n = 0; n < num; n++) {
+        G_AddBot(NULL);
+    }
+}
+
+/*
+===========
+G_RemoveBot
+
+Remove the specified bot
+============
+*/
+void G_RemoveBot(gentity_t *ent)
+{
+    G_ClientDisconnect(ent);
+    current_bot_count--;
+}
+
+/*
+===========
+G_RemoveBots
+
+Remove the specified number of bots
+============
+*/
+void G_RemoveBots(unsigned int num)
 {
     unsigned int removed = 0;
     unsigned int n;
-    unsigned int teamCount[2]{ 0 };
-    bool bNoMoreToRemove = false;
-
-    num = Q_min(num, sv_maxbots->integer);
+    unsigned int teamCount[2] {0};
+    bool         bNoMoreToRemove = false;
 
     teamCount[0] = dmManager.GetTeamAllies()->m_players.NumObjects();
     teamCount[1] = dmManager.GetTeamAxis()->m_players.NumObjects();
@@ -267,41 +492,52 @@ void G_RemoveBot(unsigned int num)
     while (!bNoMoreToRemove) {
         bNoMoreToRemove = true;
 
+        // First remove bots that are in the team
+        // with the higest player count
         for (n = 0; n < game.maxclients && removed < num; n++) {
-            gentity_t *e = &g_entities[game.maxclients - sv_maxbots->integer + n];
-            if (e->inuse && e->client) {
-                Player* player = static_cast<Player*>(e->entity);
-                if (player->GetTeam() == TEAM_ALLIES || player->GetTeam() == TEAM_AXIS) {
-                    unsigned int teamIndex = (player->GetTeam() - TEAM_ALLIES);
-                    if (teamCount[teamIndex] < teamCount[1 - teamIndex]) {
-                        // Skip bots in the lowest team
-                        continue;
-                    }
+            gentity_t *e = &g_entities[n];
+            if (!G_IsBot(e)) {
+                continue;
+            }
 
-                    teamCount[teamIndex]--;
-                    bNoMoreToRemove = false;
+            Player *player = static_cast<Player *>(e->entity);
+            if (player->GetTeam() == TEAM_ALLIES || player->GetTeam() == TEAM_AXIS) {
+                unsigned int teamIndex = (player->GetTeam() - TEAM_ALLIES);
+                if (teamCount[teamIndex] < teamCount[1 - teamIndex]) {
+                    // Not enough players in that team, don't remove the bot
+                    continue;
                 }
 
-                G_ClientDisconnect(e);
-                current_bot_count--;
-                removed++;
+                teamCount[teamIndex]--;
+                bNoMoreToRemove = false;
             }
-        }
-    }
 
-    //
-    // Remove all bots regardless
-    //
-    for (n = 0; n < game.maxclients && removed < num; n++) {
-        gentity_t *e = &g_entities[game.maxclients - sv_maxbots->integer + n];
-        if (e->inuse && e->client) {
-            G_ClientDisconnect(e);
-            current_bot_count--;
+            G_RemoveBot(e);
             removed++;
         }
     }
+
+    //
+    // Remove all bots that haven't been removed earlier
+    //
+    for (n = 0; n < game.maxclients && removed < num; n++) {
+        gentity_t *e = &g_entities[n];
+        if (!G_IsBot(e)) {
+            continue;
+        }
+
+        G_RemoveBot(e);
+        removed++;
+    }
 }
 
+/*
+===========
+G_SaveBots
+
+Save bot persistent data
+============
+*/
 void G_SaveBots()
 {
     unsigned int n;
@@ -315,22 +551,30 @@ void G_SaveBots()
         return;
     }
 
-    saved_bots = new saved_bot_t[current_bot_count];
+    saved_bots     = new saved_bot_t[current_bot_count];
     num_saved_bots = 0;
     for (n = 0; n < game.maxclients; n++) {
-        gentity_t   *e     = &g_entities[game.maxclients - sv_maxbots->integer + n];
-
-        if (e->inuse && e->client) {
-            Player *player = static_cast<Player *>(e->entity);
-            saved_bot_t& saved = saved_bots[num_saved_bots++];
-
-            saved.bValid = true;
-            //saved.team = player->GetTeam();
-            saved.pers = player->client->pers;
+        gentity_t *e = &g_entities[n];
+        if (!G_IsBot(e)) {
+            continue;
         }
+
+        Player      *player = static_cast<Player *>(e->entity);
+        saved_bot_t& saved  = saved_bots[num_saved_bots++];
+
+        saved.bValid = true;
+        //saved.team = player->GetTeam();
+        saved.pers = player->client->pers;
     }
 }
 
+/*
+===========
+G_RestoreBots
+
+Restore bot persistent data, such as their team
+============
+*/
 void G_RestoreBots()
 {
     unsigned int n;
@@ -342,28 +586,60 @@ void G_RestoreBots()
     for (n = 0; n < num_saved_bots; n++) {
         saved_bot_t& saved = saved_bots[n];
 
-        G_AddBot(1, &saved);
+        G_AddBot(&saved);
     }
 
     delete[] saved_bots;
     saved_bots = NULL;
 }
 
+/*
+===========
+G_CountPlayingClients
+
+Count the number of real clients that are playing
+============
+*/
+int G_CountPlayingClients()
+{
+    gentity_t   *other;
+    unsigned int n;
+    unsigned int count = 0;
+
+    for (n = 0; n < game.maxclients; n++) {
+        other = &g_entities[n];
+        if (G_IsPlayer(other)) {
+            Player *p = static_cast<Player *>(other->entity);
+            // Ignore spectators
+            if (p->GetTeam() != teamtype_t::TEAM_NONE && p->GetTeam() != teamtype_t::TEAM_SPECTATOR) {
+                count++;
+            }
+        }
+    }
+
+    return count;
+}
+
+/*
+===========
+G_CountClients
+
+Count the number of real clients
+============
+*/
 int G_CountClients()
 {
     gentity_t   *other;
     unsigned int n;
     unsigned int count = 0;
 
-    for (n = 0; n < maxclients->integer; n++) {
+    for (n = 0; n < game.maxclients; n++) {
         other = &g_entities[n];
-        if (other->inuse && other->client) {
-            Player *p = static_cast<Player *>(other->entity);
-            if (p->GetTeam() == teamtype_t::TEAM_NONE || p->GetTeam() == teamtype_t::TEAM_SPECTATOR) {
-                // ignore spectators
-                continue;
-            }
+        if (G_IsBot(other)) {
+            continue;
+        }
 
+        if (other->client && other->client->pers.userinfo[0]) {
             count++;
         }
     }
@@ -371,13 +647,28 @@ int G_CountClients()
     return count;
 }
 
+/*
+===========
+G_ResetBots
+
+Save and reset the bot count
+============
+*/
 void G_ResetBots()
 {
     G_SaveBots();
 
     current_bot_count = 0;
+    botId             = 0;
 }
 
+/*
+===========
+G_SpawnBots
+
+Called each frame to manage bot spawning
+============
+*/
 void G_SpawnBots()
 {
     unsigned int numClients;
@@ -392,19 +683,30 @@ void G_SpawnBots()
     //
     // Check the minimum bot count
     //
-    numClients = G_CountClients();
+    numClients = G_CountPlayingClients();
     if (numClients < sv_minPlayers->integer) {
         numBotsToSpawn = sv_minPlayers->integer - numClients + sv_numbots->integer;
     } else {
         numBotsToSpawn = sv_numbots->integer;
     }
 
+    if (sv_sharedbots->integer) {
+        unsigned int numClients = G_CountClients();
+
+        //
+        // Cap to the maximum number of possible clients
+        //
+        numBotsToSpawn = Q_min(numBotsToSpawn, maxclients->integer - numClients + sv_maxbots->integer);
+    } else {
+        numBotsToSpawn = Q_min(numBotsToSpawn, sv_maxbots->integer);
+    }
+
     //
     // Spawn bots
     //
     if (numBotsToSpawn > current_bot_count) {
-        G_AddBot(numBotsToSpawn - current_bot_count);
+        G_AddBots(numBotsToSpawn - current_bot_count);
     } else if (numBotsToSpawn < current_bot_count) {
-        G_RemoveBot(current_bot_count - numBotsToSpawn);
+        G_RemoveBots(current_bot_count - numBotsToSpawn);
     }
 }
diff --git a/code/fgame/g_bot.h b/code/fgame/g_bot.h
index f81addb1..3d4b0e5b 100644
--- a/code/fgame/g_bot.h
+++ b/code/fgame/g_bot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,17 +24,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 struct saved_bot_t {
     client_persistant_t pers;
-    bool bValid;
+    bool                bValid;
 
     saved_bot_t()
         : bValid(false)
     {}
 };
 
-void G_BotBegin(gentity_t* ent);
-void G_BotThink(gentity_t* ent, int msec);
-gentity_t* G_GetFirstBot();
-void G_AddBot(unsigned int num, saved_bot_t* saved = NULL);
-void G_RemoveBot(unsigned int num);
-void G_ResetBots();
-void G_SpawnBots();
\ No newline at end of file
+void       G_BotBegin(gentity_t *ent);
+void       G_BotThink(gentity_t *ent, int msec);
+void       G_BotShift(int clientNum);
+gentity_t *G_GetFirstBot();
+void       G_AddBot(saved_bot_t *saved = NULL);
+void       G_AddBots(unsigned int num);
+void       G_RemoveBot(gentity_t *ent);
+void       G_RemoveBots(unsigned int num);
+bool       G_IsBot(gentity_t *ent);
+bool       G_IsPlayer(gentity_t *ent);
+void       G_ResetBots();
+void       G_SpawnBots();
\ No newline at end of file
diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 86547941..965dc0a1 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerstart.h"
 #include "scriptmaster.h"
 #include "g_spawn.h"
+#include "g_bot.h"
 
 // g_client.c -- client functions that don't happen every frame
 
@@ -833,6 +834,9 @@ void G_BotConnect(int clientNum, const char *userinfo)
     memset(client, 0, sizeof(*client));
     G_InitClientPersistant(client, userinfo);
 
+    //
+    // Use "localhost" as some code relies on it to check whether or not it should be kicked
+    //
     Q_strncpyz(client->pers.ip, "localhost", sizeof(client->pers.ip));
     client->pers.port = 0;
 
@@ -873,6 +877,9 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     //    return NULL;
     //}
 
+    // Added in OPM
+    G_BotShift(clientNum);
+
     ent = &g_entities[clientNum];
 
     gi.GetUserinfo(clientNum, userinfo, sizeof(userinfo));
@@ -969,13 +976,7 @@ void G_ClientBegin(gentity_t *ent, usercmd_t *cmd)
         } else {
             // a spawn point will completely reinitialize the entity
             level.spawn_entnum = ent->s.number;
-
-            if (level.m_bSpawnBot) {
-                level.m_bSpawnBot = false;
-                PlayerBot *player = new PlayerBot;
-            } else {
-                Player *player = new Player;
-            }
+            Player *player = new Player;
         }
 
         if (level.intermissiontime && ent->entity) {
diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index d559870e..c33c423d 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -265,9 +265,20 @@ cvar_t *g_obituarylocation;
 
 cvar_t *sv_scriptfiles;
 
+// The maximum number of allocated bot clients
 cvar_t *sv_maxbots;
+// The number of bots that should be spawned
 cvar_t *sv_numbots;
+// The minimum number of players that should be present in-game.
+//  If the number of real players is below this number,
+//  the game will automatically add bots to fill the gap
 cvar_t *sv_minPlayers;
+// Whether or not the bots use a shared player slots
+//  NOTE: Setting this cvar is not recommended
+//  because when a client connects and the slot is used by a bot
+//  the bot will be relocated to a free entity slot
+cvar_t *sv_sharedbots;
+
 cvar_t *g_rankedserver;
 cvar_t *g_spectatefollow_firstperson;
 
@@ -632,7 +643,8 @@ void CVAR_Init(void)
 
     sv_scriptfiles               = gi.Cvar_Get("sv_scriptfiles", "0", 0);
     sv_maxbots                   = gi.Cvar_Get("sv_maxbots", "0", CVAR_LATCH);
-    sv_numbots                   = gi.Cvar_Get("sv_numbots", "0", CVAR_LATCH);
+    sv_sharedbots                = gi.Cvar_Get("sv_sharedbots", "0", CVAR_LATCH);
+    sv_numbots                   = gi.Cvar_Get("sv_numbots", "0", 0);
     sv_minPlayers                = gi.Cvar_Get("sv_minPlayers", "0", 0);
     g_rankedserver               = gi.Cvar_Get("g_rankedserver", "0", 0);
     g_spectatefollow_firstperson = gi.Cvar_Get("g_spectatefollow_firstperson", "0", 0);
@@ -646,11 +658,6 @@ void CVAR_Init(void)
         gi.Printf("sv_maxbots reached max clients, lowering the value to %u\n", lowered);
     }
 
-    if (sv_numbots->integer > sv_maxbots->integer) {
-        gi.Printf("numbots overflow, setting to %d\n", sv_maxbots->integer);
-        gi.cvar_set("sv_numbots", sv_maxbots->string);
-    }
-
     g_instamsg_allowed = gi.Cvar_Get("g_instamsg_allowed", "1", 0);
     g_instamsg_minDelay = gi.Cvar_Get("g_instamsg_minDelay", "1000", 0);
     g_textmsg_allowed = gi.Cvar_Get("g_textmsg_allowed", "1", 0);
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index 9c88aad8..f13e74a4 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -269,6 +269,7 @@ extern cvar_t *sv_scriptfiles;
 extern cvar_t *sv_maxbots;
 extern cvar_t *sv_numbots;
 extern cvar_t *sv_minPlayers;
+extern cvar_t *sv_sharedbots;
 extern cvar_t *g_rankedserver;
 extern cvar_t *g_spectatefollow_firstperson;
 
diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 27174a2e..2111ee6f 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -834,7 +834,6 @@ void Level::Init(void)
 
     m_pAIStats = NULL;
 
-    m_bSpawnBot    = false;
     m_bScriptSpawn = false;
     m_bRejectSpawn = false;
 }
diff --git a/code/fgame/level.h b/code/fgame/level.h
index 7355e278..5748b1e6 100644
--- a/code/fgame/level.h
+++ b/code/fgame/level.h
@@ -251,8 +251,6 @@ public:
 
     // New Stuff
 
-    bool m_bSpawnBot;
-
     // Script stuff
     bool m_bScriptSpawn;
     bool m_bRejectSpawn;
diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 463b9871..913a4f83 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -95,7 +95,10 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 ### Bots
 
 Bots can be used for testing. They don't move by default, so a mod will be needed, like [eaglear bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots):
-- `set sv_maxbots x`: Configure and allocate the maximum number of bots.
-- `set sv_minPlayers x`: optional, can be used to set the minimum number of players that the server should have. Bots will be spawned based on the minimum number of players.
-- `addbot x`: x is the number of bots to add.
-- `removebot x`: x is the number of bots to remove.
+- `set sv_maxbots x`: Required, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
+- `set sv_numbots x`: Set the number of bots to spawn. It will be capped to the value of `sv_maxbots`.
+- `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected, the game will spawn 3 bots to make sure there are always 8 players in the game.
+
+Commands:
+- `addbot x`: x is the number of bots to add. It only changes the `sv_numbots` variable.
+- `removebot x`: x is the number of bots to remove. It only changes the `sv_numbots` variable.

From 1624d10a0135e284dac4a36d04dd35e827181e27 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 7 Oct 2024 00:51:01 +0200
Subject: [PATCH 1114/2040] Don't check for bots for smoothclients

---
 code/fgame/player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 91bdbb69..5b2e1c42 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4478,7 +4478,7 @@ void Player::ClientThink(void)
         client->cmd_angles[1] = SHORT2ANGLE(current_ucmd->angles[1]);
         client->cmd_angles[2] = SHORT2ANGLE(current_ucmd->angles[2]);
 
-        if (g_gametype->integer != GT_SINGLE_PLAYER && g_smoothClients->integer && !IsSubclassOfBot()) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && g_smoothClients->integer) {
             VectorCopy(client->ps.velocity, edict->s.pos.trDelta);
             edict->s.pos.trTime = client->ps.commandTime;
         } else {
@@ -6960,7 +6960,7 @@ void Player::FinishMove(void)
     DamageFeedback();
     CalcBlend();
 
-    if (g_gametype->integer != GT_SINGLE_PLAYER && g_smoothClients->integer && !IsSubclassOfBot()) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER && g_smoothClients->integer) {
         VectorCopy(client->ps.velocity, edict->s.pos.trDelta);
         edict->s.pos.trTime = client->ps.commandTime;
     } else {

From aa15b3ea7f7c4319791a056c2e95f573dabef14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Noel?= <sebastien@twolife.be>
Date: Mon, 7 Oct 2024 20:51:23 +0200
Subject: [PATCH 1115/2040] Allow to build against system libs instead of
 bundled copy

---
 CMakeLists.txt               | 20 ++++++++++++++++++--
 code/client/CMakeLists.txt   | 20 ++++++++++++++++++--
 code/qcommon/CMakeLists.txt  | 33 ++++++++++++++++++---------------
 code/renderer/CMakeLists.txt | 18 ++++++++++++------
 code/renderer/tr_image.c     |  2 +-
 5 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff966a77..7d0274e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,15 @@ include(TargetArch.cmake)
 
 target_architecture(TARGET_ARCH)
 
+set(USE_INTERNAL_LIBS ON)
+if(USE_SYSTEM_LIBS)
+	set(USE_INTERNAL_LIBS OFF)
+endif()
+
+option(USE_INTERNAL_JPEG "If set, use bundled libjpeg." ${USE_INTERNAL_LIBS})
+option(USE_INTERNAL_MAD  "If set, use bundled libmad."  ${USE_INTERNAL_LIBS})
+option(USE_INTERNAL_ZLIB "If set, use bundled zlib."    ${USE_INTERNAL_LIBS})
+
 
 if(TARGET_GAME_TYPE)
 	message(SEND_ERROR "TARGET_GAME_TYPE is now unsupported, it is now done at runtime.")
@@ -125,11 +134,18 @@ if (NOT BUILD_NO_CLIENT)
 	target_link_libraries(openmohaa PRIVATE qcommon qcommon_standalone)
 
 	### Gamespy dependency
-	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib" "code/jpeg-8c")
+	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib")
 	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BIN_SUFFIX}")
 	set_target_properties(openmohaa PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
-	target_link_libraries(openmohaa PRIVATE jpeg8)
+	if(USE_INTERNAL_JPEG)
+		target_include_directories(openmohaa PUBLIC "code/jpeg-8c")
+		target_link_libraries(openmohaa PRIVATE jpeg8)
+	else()
+		find_package(JPEG REQUIRED)
+		target_include_directories(openmohaa PUBLIC ${JPEG_INCLUDE_DIRS})
+		target_link_libraries(openmohaa PRIVATE ${JPEG_LIBRARIES})
+	endif()
 
 	if (MSVC)
 		target_link_options(openmohaa PRIVATE "/MANIFEST:NO")
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index f98186ff..059cfeb3 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -52,8 +52,24 @@ endif()
 
 set(OLD_VALUE ${BUILD_SHARED_LIBS})
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
-target_link_libraries(omohclient INTERFACE mad)
+
+if(USE_INTERNAL_MAD)
+	add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
+	target_link_libraries(omohclient INTERFACE mad)
+else()
+	include(FindPackageHandleStandardArgs)
+	find_path(LIBMAD_INCLUDE_DIRS mad.h)
+	find_library(LIBMAD_LIBRARIES mad)
+	find_package_handle_standard_args(
+		LibMad
+		DEFAULT_MSG
+		LIBMAD_LIBRARIES
+		LIBMAD_INCLUDE_DIRS
+	)
+	target_include_directories(omohclient INTERFACE ${LIBMAD_INCLUDE_DIRS})
+	target_link_libraries(omohclient INTERFACE ${LIBMAD_LIBRARIES})
+endif()
+
 set(BUILD_SHARED_LIBS ${OLD_VALUE} CACHE BOOL "" FORCE)
 
 target_sources(omohclient INTERFACE ${SOURCES_CLIENT} ${SOURCES_UILIB})
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index 00006c36..ca02ff6a 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -86,20 +86,23 @@ target_compile_features(qcommon_standalone INTERFACE cxx_nullptr)
 target_compile_features(qcommon_standalone INTERFACE c_variadic_macros)
 target_link_libraries(qcommon_standalone INTERFACE omohtiki omohskeletor)
 
-#
-# FIXME: Opt-in for the using the system one rather than bundled one
-#
-add_library(zlib INTERFACE)
+if(USE_INTERNAL_ZLIB)
+	add_library(zlib INTERFACE)
 
-target_sources(zlib INTERFACE
-	# zlib
-	"${CMAKE_SOURCE_DIR}/code/zlib/adler32.c"
-	"${CMAKE_SOURCE_DIR}/code/zlib/crc32.c"
-	"${CMAKE_SOURCE_DIR}/code/zlib/inffast.c"
-	"${CMAKE_SOURCE_DIR}/code/zlib/inflate.c"
-	"${CMAKE_SOURCE_DIR}/code/zlib/inftrees.c"
-	"${CMAKE_SOURCE_DIR}/code/zlib/zutil.c"
-)
+	target_sources(zlib INTERFACE
+		# zlib
+		"${CMAKE_SOURCE_DIR}/code/zlib/adler32.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/crc32.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/inffast.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/inflate.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/inftrees.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/zutil.c"
+	)
 
-target_include_directories(zlib INTERFACE "${CMAKE_SOURCE_DIR}/code/zlib")
-target_link_libraries(qcommon_standalone INTERFACE zlib)
+	target_include_directories(zlib INTERFACE "${CMAKE_SOURCE_DIR}/code/zlib")
+	target_link_libraries(qcommon_standalone INTERFACE zlib)
+else()
+	find_package(ZLIB REQUIRED)
+	target_include_directories(qcommon INTERFACE ${ZLIB_INCLUDE_DIRS})
+	target_link_libraries(qcommon_standalone INTERFACE ${ZLIB_LIBRARIES})
+endif()
diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
index 0f947f4e..c91ddfcb 100644
--- a/code/renderer/CMakeLists.txt
+++ b/code/renderer/CMakeLists.txt
@@ -3,15 +3,21 @@ project(omohrenderer)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
 
-file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
-add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
-target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
-
 add_library(omohrenderer STATIC ${SOURCES_RENDERER})
-target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon" "../jpeg-8c")
+target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon")
 target_compile_features(omohrenderer PUBLIC cxx_nullptr)
 target_compile_features(omohrenderer PUBLIC c_variadic_macros)
 target_compile_definitions(omohrenderer PRIVATE USE_INTERNAL_JPEG=1)
 target_link_libraries(omohrenderer PRIVATE qcommon)
 target_link_libraries(omohrenderer PRIVATE omohsdl)
-target_link_libraries(omohrenderer PRIVATE jpeg8)
+
+if(USE_INTERNAL_JPEG)
+	file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
+	add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
+	target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
+	target_include_directories(omohrenderer PUBLIC "../jpeg-8c")
+	target_link_libraries(omohrenderer PRIVATE jpeg8)
+else()
+	target_include_directories(omohrenderer PUBLIC ${JPEG_INCLUDE_DIRS})
+	target_link_libraries(omohrenderer PRIVATE ${JPEG_LIBRARIES})
+endif()
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index a2099700..5782a8d7 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #define JPEG_INTERNALS
-#include "../jpeg-8c/jpeglib.h"
+#include <jpeglib.h>
 
 
 static void LoadBMP( const char *name, byte **pic, int *width, int *height );

From e2f11879d580d16ee7ed11f4e28e9808869759ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 7 Oct 2024 23:05:37 +0200
Subject: [PATCH 1116/2040] MAXS_Z is 94

---
 code/fgame/bg_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 3a64c016..77e09aa9 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -35,7 +35,7 @@ static const unsigned int MINS_Y = -15;
 static const unsigned int MINS_Z = 0; // IneQuation: bounding box and viewheights to match MoHAA
 static const unsigned int MAXS_X = 15;
 static const unsigned int MAXS_Y = 15;
-static const unsigned int MAXS_Z = 96;
+static const unsigned int MAXS_Z = 94;
 
 static const unsigned int DEAD_MINS_Z           = 32;
 static const unsigned int CROUCH_MAXS_Z         = 49;

From f94099e3501780ffd9c10ad942ca0c5ac8ce0d30 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 7 Oct 2024 23:49:39 +0200
Subject: [PATCH 1117/2040] Don't link nodes that can't be reached with an high
 fall height

---
 code/fgame/navigate.cpp | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 2bce2d91..8caaa8e3 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2729,15 +2729,14 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
     mm.mins[2] = 0;
     mm.maxs[0] = size;
     mm.maxs[1] = size;
-    mm.maxs[2] = 94.0f;
+    mm.maxs[2] = MAXS_Z;
 
     testcount  = 0;
     fallheight = 0.0f;
     air_z      = mm.origin[2];
 
-    for (i = 200; i != 1; i--) {
-        testpos[i - 1] = mm.origin;
-        testcount++;
+    for (i = 0; i < 200; i++) {
+        testpos[testcount++] = mm.origin;
 
         MmoveSingle(&mm);
 
@@ -2745,6 +2744,22 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
             test_fallheight = air_z - mm.origin[2];
 
             if (test_fallheight > fallheight) {
+                if (test_fallheight > MAXS_Z) {
+                    Vector start;
+
+                    //
+                    // Added in OPM
+                    //  Check to make sure that the target is reachable enough
+                    //  so that AIs don't block trying to move to the target position
+
+                    start = origin;
+                    start.z += MAXS_Z;
+
+                    if (!G_SightTrace(start, vec_zero, vec_zero, pos, (gentity_t*)NULL, (gentity_t*)NULL, MASK_PATHSOLID, qfalse, "CheckMove")) {
+                        return false;
+                    }
+                }
+
                 if (test_fallheight > 1024.0f) {
                     return false;
                 }
@@ -2761,7 +2776,7 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
             error = mm.origin[2] - pos[2];
 
             *path_fallheight = (short)fallheight;
-            if (fabs(error) <= 94.0f) {
+            if (fabs(error) <= MAXS_Z) {
                 if (error <= 0.0f || mm.groundPlane) {
                     return true;
                 }

From b2fa21a1117b37f9fe7015a80fb3218e7453a594 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 7 Oct 2024 23:52:39 +0200
Subject: [PATCH 1118/2040] Format navigation source file

---
 code/fgame/navigate.cpp | 80 ++++++++++++++++++++++-------------------
 code/fgame/navigate.h   | 14 ++++----
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 8caaa8e3..070fd8aa 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -160,7 +160,7 @@ PathInfo *PathSearch::GeneratePath(PathInfo *path)
             if (pathway->dist) {
                 VectorCopy(pathway->pos2, current_path->point);
                 VectorCopy2D(pathway->dir, current_path->dir);
-                current_path->dist      = pathway->dist;
+                current_path->dist = pathway->dist;
                 assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
                 current_path->bAccurate = true;
                 current_path++;
@@ -431,7 +431,8 @@ int PathSearch::FindPath(
             }
 
             if (pathway->fallheight <= fallheight
-                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team]
+                )) {
                 NewNode->m_Depth   = Node->m_Depth + 1;
                 NewNode->Parent    = Node;
                 NewNode->pathway   = i;
@@ -597,7 +598,8 @@ int PathSearch::FindPathNear(
             }
 
             if (pathway->fallheight <= fallheight
-                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team])) {
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team]
+                )) {
                 NewNode->m_Depth   = Node->m_Depth + 1;
                 NewNode->Parent    = Node;
                 NewNode->pathway   = i;
@@ -1048,7 +1050,7 @@ void PathSearch::ResetNodes(void)
         }
     }
 
-    for (x = 0; x < PATHMAP_GRIDSIZE; x++){
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
         for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
             PathMap[x][y] = MapCell();
         }
@@ -1101,10 +1103,10 @@ void PathSearch::ClearNodes(void)
     }
 
     for (i = 0; i < nodecount; i++) {
-        pathnodes[i]->Child = NULL;
+        pathnodes[i]->Child              = NULL;
         pathnodes[i]->virtualNumChildren = 0;
-        pathnodes[i]->numChildren = 0;
-        pathnodes[i]->findCount = 0;
+        pathnodes[i]->numChildren        = 0;
+        pathnodes[i]->findCount          = 0;
     }
 
     // Free the bulk nav' memory
@@ -1184,8 +1186,7 @@ Event EV_Path_SetNodeFlags
 );
 
 // Added in 2.0
-Event EV_Path_SetLowWallArc
-(
+Event EV_Path_SetLowWallArc(
     "low_wall_arc",
     EV_DEFAULT,
     "f",
@@ -2755,7 +2756,17 @@ qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, floa
                     start = origin;
                     start.z += MAXS_Z;
 
-                    if (!G_SightTrace(start, vec_zero, vec_zero, pos, (gentity_t*)NULL, (gentity_t*)NULL, MASK_PATHSOLID, qfalse, "CheckMove")) {
+                    if (!G_SightTrace(
+                            start,
+                            vec_zero,
+                            vec_zero,
+                            pos,
+                            (gentity_t *)NULL,
+                            (gentity_t *)NULL,
+                            MASK_PATHSOLID,
+                            qfalse,
+                            "CheckMove"
+                        )) {
                         return false;
                     }
                 }
@@ -3155,7 +3166,6 @@ Event EV_NavMaster_CreatePaths
     NULL,
     "Build navigation path"
 );
-
 Event EV_NavMaster_SpawnNode
 (
     "nav_newnode",
@@ -3166,22 +3176,22 @@ Event EV_NavMaster_SpawnNode
 );
 
 CLASS_DECLARATION(Listener, NavMaster, NULL) {
-    { &EV_NavMaster_CreatePaths, &NavMaster::CreatePaths },
-    { &EV_NavMaster_SpawnNode, &NavMaster::CreateNode },
-    { NULL, NULL }
+    {&EV_NavMaster_CreatePaths, &NavMaster::CreatePaths},
+    {&EV_NavMaster_SpawnNode,   &NavMaster::CreateNode },
+    {NULL,                      NULL                   }
 };
 
 NavMaster navMaster;
 
-NavMaster::NavMaster() {
+NavMaster::NavMaster() {}
 
-}
-
-void NavMaster::Init() {
+void NavMaster::Init()
+{
     G_CreateMaster("nav", this);
 }
 
-void NavMaster::CreatePaths(Event* ev) {
+void NavMaster::CreatePaths(Event *ev)
+{
     if (!ai_editmode->integer) {
         return;
     }
@@ -3189,11 +3199,12 @@ void NavMaster::CreatePaths(Event* ev) {
     PathSearch::CreatePaths();
 }
 
-void NavMaster::CreateNode(Event* ev) {
-    str type;
-    int spawnflags = 0;
-    PathNode* node;
-    Entity* ent;
+void NavMaster::CreateNode(Event *ev)
+{
+    str       type;
+    int       spawnflags = 0;
+    PathNode *node;
+    Entity   *ent;
 
     if (ev->NumArgs() > 0) {
         type = ev->GetString(1);
@@ -3219,7 +3230,7 @@ void NavMaster::CreateNode(Event* ev) {
         return;
     }
 
-    node = new PathNode;
+    node            = new PathNode;
     node->nodeflags = spawnflags;
     node->setOrigin(ent->origin);
 }
@@ -3233,7 +3244,6 @@ Event EV_AttractiveNode_GetPriority
     "Get the node priority",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetPriority
 (
     "priority",
@@ -3243,7 +3253,6 @@ Event EV_AttractiveNode_SetPriority
     "Set the node priority",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetDistance
 (
     "max_dist",
@@ -3253,7 +3262,6 @@ Event EV_AttractiveNode_GetDistance
     "Get the max distance for this node",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetDistance
 (
     "max_dist",
@@ -3263,7 +3271,6 @@ Event EV_AttractiveNode_SetDistance
     "Set the max distance for this node to be attracted, -1 for unlimited distance.",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetStayTime
 (
     "stay_time",
@@ -3273,7 +3280,6 @@ Event EV_AttractiveNode_GetStayTime
     "Get the max stay time for this node",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetStayTime
 (
     "stay_time",
@@ -3283,7 +3289,6 @@ Event EV_AttractiveNode_SetStayTime
     "Set the maximum stay time AI will stay on this node",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetRespawnTime
 (
     "respawn_time",
@@ -3293,7 +3298,6 @@ Event EV_AttractiveNode_GetRespawnTime
     "Get the how much time will this node re-attract already attracted AIs",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetRespawnTime
 (
     "respawn_time",
@@ -3304,7 +3308,6 @@ Event EV_AttractiveNode_SetRespawnTime
     "AI will get stuck.",
     EV_SETTER
 );
-
 Event EV_AttractiveNode_GetTeam
 (
     "team",
@@ -3314,7 +3317,6 @@ Event EV_AttractiveNode_GetTeam
     "Get the attractive node team. 'none' for no team.",
     EV_GETTER
 );
-
 Event EV_AttractiveNode_SetTeam
 (
     "team",
@@ -3324,8 +3326,14 @@ Event EV_AttractiveNode_SetTeam
     "Set the attractive node team. 'none' for no team.",
     EV_SETTER
 );
-
-Event EV_AttractiveNode_SetUse("setuse", EV_DEFAULT, "b", "use", "Set if AI should use or not");
+Event EV_AttractiveNode_SetUse
+(
+    "setuse",
+    EV_DEFAULT,
+    "b",
+    "use",
+    "Set if AI should use or not"
+);
 
 CLASS_DECLARATION(SimpleArchivedEntity, AttractiveNode, NULL) {
     {&EV_AttractiveNode_GetPriority,    &AttractiveNode::GetPriority   },
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index a3bc473f..92df618c 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -108,14 +108,12 @@ public:
     void Archive(Archiver& arc);
 };
 
-
 inline PathInfo::PathInfo()
     : bAccurate(false)
-    , point{ 0, 0, 0 }
+    , point {0, 0, 0}
     , dist(0)
-    , dir{ 0, 0 }
-{
-}
+    , dir {0, 0}
+{}
 
 inline void PathInfo::Archive(Archiver& arc)
 {
@@ -307,7 +305,7 @@ public:
     static void  ResetNodes(void);
     static void  ClearNodes(void); // Added in OPM
 
-    static void      UpdatePathwaysForBadPlace(const Vector     &origin, float radius, int dir, int team);
+    static void      UpdatePathwaysForBadPlace(const Vector& origin, float radius, int dir, int team);
     static PathInfo *GeneratePath(PathInfo *path);
     static PathInfo *GeneratePathNear(PathInfo *path);
     static PathInfo *GeneratePathAway(PathInfo *path);
@@ -378,8 +376,8 @@ public:
 
     void Init(void);
 
-    void CreatePaths(Event* ev);
-    void CreateNode(Event* ev);
+    void CreatePaths(Event *ev);
+    void CreateNode(Event *ev);
 };
 
 extern NavMaster navMaster;

From 58f6c719a999dfc6041eada61ef053f0c3686795 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 01:14:40 +0200
Subject: [PATCH 1119/2040] Add code to select current node in view and draw it
 for editing later

---
 code/fgame/navigate.cpp | 83 +++++++++++++++++++++++++++++++++++++++++
 code/fgame/navigate.h   |  7 ++++
 2 files changed, 90 insertions(+)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 070fd8aa..94569e96 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2068,6 +2068,8 @@ void PathSearch::ShowNodes(void)
             }
         }
     }
+
+    navMaster.Frame();
 }
 
 qboolean PathSearch::ArchiveSaveNodes(void)
@@ -3188,6 +3190,12 @@ NavMaster::NavMaster() {}
 void NavMaster::Init()
 {
     G_CreateMaster("nav", this);
+
+    if (ai_editmode->integer) {
+        // show routes by default
+        gi.cvar_set("ai_showroutes", "1");
+        gi.cvar_set("ai_shownode", "30");
+    }
 }
 
 void NavMaster::CreatePaths(Event *ev)
@@ -3235,6 +3243,81 @@ void NavMaster::CreateNode(Event *ev)
     node->setOrigin(ent->origin);
 }
 
+void NavMaster::Frame() {
+    float phase;
+    vec3_t color;
+
+    if (!ai_editmode->integer) {
+        return;
+    }
+
+    phase = fmod(level.time * 2, 2.0);
+    if (phase > 1.0) {
+        phase = 2.0 - phase;
+    }
+    //phase = (sin(level.time * 5) + 1) / 2.0;
+
+    selectedNode = DetermineCurrentNode();
+    if (selectedNode) {
+        Vector mins, maxs;
+        Vector org;
+        vec3_t colorPhase;
+
+        GetPathnodeColor(selectedNode->nodeflags, color);
+
+        colorPhase[0] = 0;
+        colorPhase[1] = (1.0 - phase) * 0.5;
+        colorPhase[2] = phase;
+        color[1] = Q_max(color[1], colorPhase[1]) - Q_min(color[1], colorPhase[1]);
+        color[2] = Q_max(color[2], colorPhase[2]) - Q_min(color[2], colorPhase[2]);
+
+        mins = Vector(-24, -24, -24);
+        maxs = Vector(24, 24, 24);
+        org = selectedNode->centroid;
+        org.z += 24;
+
+        G_DebugBBox(org, mins, maxs, color[0], color[1], color[2], 1.0);
+    }
+}
+
+PathNode* NavMaster::DetermineCurrentNode() const {
+    Entity* ent;
+    PathNode* bestnode;
+    float bestdist;
+    Vector delta;
+    int i;
+
+    ent = g_entities->entity;
+    if (!ent) {
+        return NULL;
+    }
+
+    bestdist = 1e+12f;
+    bestnode = NULL;
+
+    for (i = 0; i < PathSearch::nodecount; i++) {
+        PathNode* node = PathSearch::pathnodes[i];
+        float dist;
+
+        delta = node->centroid - ent->centroid;
+        if (!ent->FovCheck(delta, cos(DEG2RAD(80.0 / 2.f)))) {
+            continue;
+        }
+
+        if (abs(delta.z) > MAXS_Z) {
+            continue;
+        }
+
+        dist = delta.lengthSquared();
+        if (dist < bestdist) {
+            bestdist = dist;
+            bestnode = node;
+        }
+    }
+
+    return bestnode;
+}
+
 Event EV_AttractiveNode_GetPriority
 (
     "priority",
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 92df618c..66494bee 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -378,6 +378,13 @@ public:
 
     void CreatePaths(Event *ev);
     void CreateNode(Event *ev);
+    void Frame();
+
+private:
+    PathNode* DetermineCurrentNode() const;
+
+private:
+    SafePtr<PathNode> selectedNode;
 };
 
 extern NavMaster navMaster;

From de18fa2860374b67a39133aa15f46d9ca35f6905 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 20:14:10 +0200
Subject: [PATCH 1120/2040] Refactor Entity::FovCheck

---
 code/fgame/entity.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 6c3609e2..371c33af 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -2876,20 +2876,20 @@ qboolean Entity::IsInside(Entity *e1)
 
 qboolean Entity::FovCheck(float *delta, float fovdot)
 {
-    float deltadot = delta[0] * orientation[0][0] + delta[1] * orientation[0][1];
+    float deltadot = DotProduct2D(delta, orientation[0]);
 
     if (fovdot < 0.0f) {
         if (deltadot >= 0.0f) {
             return true;
         }
 
-        return (delta[0] * delta[0] + delta[1] * delta[1]) * fovdot * fovdot > (deltadot * deltadot);
+        return VectorLength2DSquared(delta) * Square(fovdot) > Square(deltadot);
     } else {
         if (deltadot < 0.0f) {
             return false;
         }
 
-        return (deltadot * deltadot) > (delta[0] * delta[0] + delta[1] * delta[1]) * fovdot * fovdot;
+        return VectorLength2DSquared(delta) * Square(fovdot) < Square(deltadot);
     }
 }
 

From d467b681874259aae7a6677d51c76dbdb9553d01 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 20:18:03 +0200
Subject: [PATCH 1121/2040] Add node editing support, with a way to dynamically
 load, remove and modify nodes while editing

---
 code/fgame/navigate.cpp | 453 ++++++++++++++++++++++++++++++++--------
 code/fgame/navigate.h   |  10 +-
 2 files changed, 376 insertions(+), 87 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 94569e96..1dd5745f 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -388,6 +388,9 @@ int PathSearch::FindPath(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
 
             if (vLeashHome) {
                 VectorSub2D(pathway->pos2, vLeashHome, vDist);
@@ -562,6 +565,9 @@ int PathSearch::FindPathNear(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
 
             g = (int)(pathway->dist + Node->g + 1.0f);
 
@@ -729,6 +735,9 @@ int PathSearch::FindPathAway(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
 
             if (vLeashHome) {
                 VectorSub2D(pathway->pos2, vLeashHome, vDist);
@@ -889,7 +898,11 @@ PathNode *PathSearch::FindCornerNodeForWall(
             pathway = &Node->Child[i];
 
             NewNode = pathnodes[pathway->node];
-            g       = (int)(pathway->dist + Node->g + 1.0f);
+            if (!NewNode) {
+                continue;
+            }
+
+            g = (int)(pathway->dist + Node->g + 1.0f);
 
             if (NewNode->findCount == findFrame) {
                 if (NewNode->g <= g) {
@@ -1044,7 +1057,7 @@ void PathSearch::ResetNodes(void)
         }
 
         for (i = 0; i < nodecount; i++) {
-            if (pathnodes[i]->Child) {
+            if (pathnodes[i] && pathnodes[i]->Child) {
                 gi.Free(pathnodes[i]->Child);
             }
         }
@@ -1057,8 +1070,10 @@ void PathSearch::ResetNodes(void)
     }
 
     for (i = 0; i < nodecount; i++) {
-        delete pathnodes[i];
-        pathnodes[i] = NULL;
+        if (pathnodes[i]) {
+            delete pathnodes[i];
+            pathnodes[i] = NULL;
+        }
     }
 
     nodecount = 0;
@@ -1073,7 +1088,7 @@ void PathSearch::ResetNodes(void)
 
 void PathSearch::ClearNodes(void)
 {
-    int i;
+    int i, j;
     int x;
     int y;
 
@@ -1090,7 +1105,7 @@ void PathSearch::ClearNodes(void)
         }
 
         for (i = 0; i < nodecount; i++) {
-            if (pathnodes[i]->Child) {
+            if (pathnodes[i] && pathnodes[i]->Child) {
                 gi.Free(pathnodes[i]->Child);
             }
         }
@@ -1103,10 +1118,34 @@ void PathSearch::ClearNodes(void)
     }
 
     for (i = 0; i < nodecount; i++) {
-        pathnodes[i]->Child              = NULL;
-        pathnodes[i]->virtualNumChildren = 0;
-        pathnodes[i]->numChildren        = 0;
-        pathnodes[i]->findCount          = 0;
+        if (pathnodes[i]) {
+            pathnodes[i]->Child              = NULL;
+            pathnodes[i]->virtualNumChildren = 0;
+            pathnodes[i]->numChildren        = 0;
+            pathnodes[i]->findCount          = 0;
+        }
+    }
+
+    // Rebuild node list
+    for (i = 0; i < nodecount; i++) {
+        PathNode *node1 = pathnodes[i];
+        if (node1) {
+            continue;
+        }
+
+        for (j = i + 1; j < nodecount; j++) {
+            PathNode *node2 = pathnodes[j];
+            if (node2) {
+                pathnodes[i]   = node2;
+                pathnodes[j]   = NULL;
+                node2->nodenum = i;
+                break;
+            }
+        }
+    }
+
+    while (nodecount > 0 && !pathnodes[nodecount - 1]) {
+        nodecount--;
     }
 
     // Free the bulk nav' memory
@@ -1126,6 +1165,9 @@ void PathSearch::UpdatePathwaysForBadPlace(const Vector& origin, float radius, i
 
     for (i = 0; i < nodecount; i++) {
         PathNode *node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
 
         for (j = node->virtualNumChildren; j > 0; j--) {
             pathway_t& pathway = node->Child[j - 1];
@@ -1142,21 +1184,47 @@ void PathSearch::UpdatePathwaysForBadPlace(const Vector& origin, float radius, i
 
 void AI_AddNode(PathNode *node)
 {
-    int i = PathSearch::nodecount;
+    int i;
 
     assert(node);
 
-    if (i < MAX_PATHNODES) {
-        if (i > ai_maxnode) {
-            ai_maxnode = i;
+    //
+    // Find a free slot
+    //
+    for (i = 0; i < PathSearch::nodecount; i++) {
+        if (!PathSearch::pathnodes[i]) {
+            PathSearch::pathnodes[i] = node;
+            node->nodenum            = i;
+            return;
         }
-        PathSearch::pathnodes[i] = node;
-        node->nodenum            = i;
-        PathSearch::nodecount++;
+    }
+
+    if (i > ai_maxnode) {
+        ai_maxnode = i;
+    }
+
+    if (i >= MAX_PATHNODES) {
+        gi.Error(ERR_DROP, "Exceeded MAX_PATHNODES!\n");
         return;
     }
 
-    gi.Error(ERR_DROP, "Exceeded MAX_PATHNODES!\n");
+    PathSearch::pathnodes[i] = node;
+    node->nodenum            = i;
+
+    PathSearch::nodecount++;
+}
+
+void AI_RemoveNode(PathNode *node)
+{
+    int num;
+
+    num = node->nodenum;
+    delete node;
+
+    PathSearch::pathnodes[num] = NULL;
+    if (num == PathSearch::nodecount) {
+        PathSearch::nodecount--;
+    }
 }
 
 /*****************************************************************************/
@@ -1186,12 +1254,14 @@ Event EV_Path_SetNodeFlags
 );
 
 // Added in 2.0
-Event EV_Path_SetLowWallArc(
+Event EV_Path_SetLowWallArc
+(
     "low_wall_arc",
     EV_DEFAULT,
     "f",
     "arc_half_angle",
-    "Marks this node as good for low-wall behavior, and gives the arc"
+    "Marks this node as good for low-wall behavior"
+    "and gives the arc"
 );
 
 CLASS_DECLARATION(SimpleEntity, PathNode, "info_pathnode") {
@@ -1340,6 +1410,9 @@ void PathNode::DrawConnections(void)
     for (i = 0; i < numChildren; i++) {
         path = &Child[i];
         node = PathSearch::pathnodes[path->node];
+        if (!node) {
+            continue;
+        }
 
         G_DebugLine(origin + Vector("0 0 24"), node->origin + Vector("0 0 24"), 0.7f, 0.7f, 0, 1);
     }
@@ -1361,27 +1434,32 @@ static void droptofloor(Vector& vec, PathNode *node)
 
 static bool IsValidPathnode(int spawnflags)
 {
-    if ((spawnflags & AI_DUCK) && (spawnflags & AI_COVERFLAGS2)) {
+    if ((spawnflags & AI_DUCK)
+        && (spawnflags & (AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_CONCEALMENT) && (spawnflags & AI_SNIPERFLAGS)) {
+    if ((spawnflags & AI_CONCEALMENT) && (spawnflags & (AI_COVER | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER))) {
         return false;
     }
 
-    if ((spawnflags & AI_CORNER_LEFT) && (spawnflags & AI_COVER_LEFT_FLAGS)) {
+    if ((spawnflags & AI_CORNER_LEFT)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_CORNER_RIGHT) && (spawnflags & AI_COVER_RIGHT_FLAGS)) {
+    if ((spawnflags & AI_CORNER_RIGHT)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_LEFT | AI_SNIPER | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_SNIPER) && (spawnflags & AI_CRATEFLAGS)) {
+    if ((spawnflags & AI_SNIPER)
+        && (spawnflags & (AI_DUCK | AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE))) {
         return false;
     }
 
-    if ((spawnflags & AI_ALL) && (spawnflags & AI_COVERFLAGS3)) {
+    if ((spawnflags & AI_CRATE)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER))) {
         return false;
     }
 
@@ -1390,27 +1468,51 @@ static bool IsValidPathnode(int spawnflags)
 
 static void GetPathnodeColor(int spawnflags, vec3_t color)
 {
-    if (IsValidPathnode(spawnflags)) {
-        if (spawnflags & AI_CORNER_LEFT) {
-            VectorCopy(COLOR_PATHNODE_CORNER_LEFT, color);
-        } else if (spawnflags & AI_CORNER_RIGHT) {
-            VectorCopy(COLOR_PATHNODE_CORNER_RIGHT, color);
-        } else if (spawnflags & AI_DUCK) {
-            VectorCopy(COLOR_PATHNODE_DUCK, color);
-        } else if (spawnflags & AI_SNIPER) {
-            VectorCopy(COLOR_PATHNODE_SNIPER, color);
-        } else if (spawnflags & AI_CONCEALMENT) {
-            VectorCopy(COLOR_PATHNODE_CONCEALMENT, color);
-        } else if (spawnflags & AI_COVER) {
-            VectorCopy(COLOR_PATHNODE_COVER, color);
-        } else if (spawnflags & AI_CRATE) {
-            VectorCopy(COLOR_PATHNODE_CRATE, color);
-        } else {
-            VectorCopy(COLOR_PATHNODE_DEFAULT, color);
-        }
-    } else {
+    if (!IsValidPathnode(spawnflags)) {
         VectorCopy(COLOR_PATHNODE_ERROR, color);
+        return;
     }
+
+    if (spawnflags & AI_CORNER_LEFT) {
+        VectorCopy(COLOR_PATHNODE_CORNER_LEFT, color);
+    } else if (spawnflags & AI_CORNER_RIGHT) {
+        VectorCopy(COLOR_PATHNODE_CORNER_RIGHT, color);
+    } else if (spawnflags & AI_DUCK) {
+        VectorCopy(COLOR_PATHNODE_DUCK, color);
+    } else if (spawnflags & AI_SNIPER) {
+        VectorCopy(COLOR_PATHNODE_SNIPER, color);
+    } else if (spawnflags & AI_CONCEALMENT) {
+        VectorCopy(COLOR_PATHNODE_CONCEALMENT, color);
+    } else if (spawnflags & AI_COVER) {
+        VectorCopy(COLOR_PATHNODE_COVER, color);
+    } else if (spawnflags & AI_CRATE) {
+        VectorCopy(COLOR_PATHNODE_CRATE, color);
+    } else {
+        VectorCopy(COLOR_PATHNODE_DEFAULT, color);
+    }
+}
+
+static int GetNodeTypeFromName(const char *name)
+{
+    if (!str::icmp(name, "corner_left")) {
+        return AI_CORNER_LEFT;
+    } else if (!str::icmp(name, "corner_right")) {
+        return AI_CORNER_RIGHT;
+    } else if (!str::icmp(name, "duck")) {
+        return AI_DUCK;
+    } else if (!str::icmp(name, "sniper")) {
+        return AI_SNIPER;
+    } else if (!str::icmp(name, "concealment")) {
+        return AI_CONCEALMENT;
+    } else if (!str::icmp(name, "cover")) {
+        return AI_COVER;
+    } else if (!str::icmp(name, "crate")) {
+        return AI_CRATE;
+    } else if (!str::icmp(name, "none")) {
+        return 0;
+    }
+
+    return -1;
 }
 
 void DrawNode(int iNodeCount)
@@ -1545,6 +1647,9 @@ void DrawAllConnections(void)
 
     for (int i = 0; i < PathSearch::nodecount; i++) {
         node = PathSearch::pathnodes[i];
+        if (!node) {
+            continue;
+        }
 
         if (Vector(node->origin - playerorigin).length() > ai_showroutes_distance->integer) {
             continue;
@@ -1562,7 +1667,11 @@ void DrawAllConnections(void)
             }
 
             reverse = false;
-            to      = PathSearch::pathnodes[path->node];
+
+            to = PathSearch::pathnodes[path->node];
+            if (!to) {
+                continue;
+            }
 
             for (int k = to->numChildren - 1; k >= 0; k--) {
                 path2 = &to->Child[k];
@@ -1769,6 +1878,9 @@ int PathSearch::DebugNearestNodeList(const vec3_t pos, PathNode **nodelist, int
 
     for (i = 0; i < node_count && n < iMaxNodes; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorCopy(pos, start);
         VectorCopy(pos, end);
@@ -1821,6 +1933,9 @@ int PathSearch::DebugNearestNodeList2(const vec3_t pos, PathNode **nodelist, int
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
 
         if (pos[2] > node->origin[2] + 94.0f) {
             continue;
@@ -1877,6 +1992,9 @@ PathNode *PathSearch::DebugNearestStartNode(const vec3_t pos, Entity *ent)
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorCopy(start, end);
         VectorAdd(end, deltas[nodes[i]], end);
@@ -1927,6 +2045,9 @@ PathNode *PathSearch::NearestStartNode(const vec3_t pos, SimpleActor *ent)
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorAdd(start, deltas[nodes[i]], end);
 
@@ -1994,6 +2115,9 @@ PathNode *PathSearch::NearestEndNode(const vec3_t pos)
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
         VectorAdd(start, deltas[nodes[i]], end);
 
@@ -2425,6 +2549,9 @@ void PathSearch::CreatePaths(void)
 
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
 
         droptofloor(node->origin, node);
         node->centroid = node->origin;
@@ -2435,6 +2562,9 @@ void PathSearch::CreatePaths(void)
 
         for (j = i - 1; j >= 0; j--) {
             PathNode *node2 = pathnodes[j];
+            if (!node2) {
+                continue;
+            }
 
             if (node->origin == node2->origin) {
                 Com_Printf(
@@ -2456,7 +2586,7 @@ void PathSearch::CreatePaths(void)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (node->nodeflags & PATH_DONT_LINK) {
+        if (!node || (node->nodeflags & PATH_DONT_LINK)) {
             continue;
         }
 
@@ -2466,7 +2596,7 @@ void PathSearch::CreatePaths(void)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (node->nodeflags & PATH_DONT_LINK) {
+        if (!node || (node->nodeflags & PATH_DONT_LINK)) {
             continue;
         }
 
@@ -2668,6 +2798,9 @@ bool PathSearch::Connect(PathNode *node, int x, int y)
 
     for (i = 0; i < cell->numnodes; i++) {
         node2 = pathnodes[cell->nodes[i]];
+        if (!node2) {
+            continue;
+        }
 
         if (node2->findCount != findFrame) {
             node2->findCount = findFrame;
@@ -3119,6 +3252,9 @@ int PathSearch::NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, ve
 
     for (i = 0; i < node_count; i++) {
         node = pathnodes[cell->nodes[i]];
+        if (!node) {
+            continue;
+        }
 
         if (pos[2] > node->origin[2] + 94.0f) {
             continue;
@@ -3170,17 +3306,61 @@ Event EV_NavMaster_CreatePaths
 );
 Event EV_NavMaster_SpawnNode
 (
-    "nav_newnode",
+    "nav_create",
     EV_CHEAT,
     "S",
     "type",
     "Create a new node at the player's origin"
 );
+Event EV_NavMaster_SetNodeFlags
+(
+    "nav_node_set_type",
+    EV_CHEAT,
+    "sSS",
+    "type1 type2 ...",
+    "Set the selected node type. Type can be one of the following values:\n"
+    "- corner_left\n"
+    "- corner_right\n"
+    "- duck\n"
+    "- sniper\n"
+    "- concealment\n"
+    "- cover\n"
+    "- crate\n"
+    "- none\n"
+);
+Event EV_NavMaster_SetNodeTargetName
+(
+    "nav_node_set_targetname",
+    EV_CHEAT,
+    "S",
+    "targetname",
+    "Set the selected node target name"
+);
+Event EV_NavMaster_SetNodeTarget
+(
+    "nav_node_set_target",
+    EV_CHEAT,
+    "S",
+    "target",
+    "Set the selected node target"
+);
+Event EV_NavMaster_RemoveNode
+(
+    "nav_node_remove",
+    EV_CHEAT,
+    NULL,
+    NULL,
+    "Delete the selected node"
+);
 
 CLASS_DECLARATION(Listener, NavMaster, NULL) {
-    {&EV_NavMaster_CreatePaths, &NavMaster::CreatePaths},
-    {&EV_NavMaster_SpawnNode,   &NavMaster::CreateNode },
-    {NULL,                      NULL                   }
+    {&EV_NavMaster_CreatePaths,       &NavMaster::CreatePaths      },
+    {&EV_NavMaster_SpawnNode,         &NavMaster::CreateNode       },
+    {&EV_NavMaster_SetNodeFlags,      &NavMaster::SetNodeFlags     },
+    {&EV_NavMaster_SetNodeTargetName, &NavMaster::SetNodeTargetName},
+    {&EV_NavMaster_SetNodeTarget,     &NavMaster::SetNodeTarget    },
+    {&EV_NavMaster_RemoveNode,        &NavMaster::RemoveNode       },
+    {NULL,                            NULL                         }
 };
 
 NavMaster navMaster;
@@ -3215,21 +3395,10 @@ void NavMaster::CreateNode(Event *ev)
     Entity   *ent;
 
     if (ev->NumArgs() > 0) {
-        type = ev->GetString(1);
-        if (!str::icmp(type, "corner_left")) {
-            spawnflags = AI_CORNER_LEFT;
-        } else if (!str::icmp(type, "corner_right")) {
-            spawnflags = AI_CORNER_RIGHT;
-        } else if (!str::icmp(type, "duck")) {
-            spawnflags = AI_DUCK;
-        } else if (!str::icmp(type, "sniper")) {
-            spawnflags = AI_SNIPER;
-        } else if (!str::icmp(type, "concealment")) {
-            spawnflags = AI_CONCEALMENT;
-        } else if (!str::icmp(type, "cover")) {
-            spawnflags = AI_COVER;
-        } else if (!str::icmp(type, "crate")) {
-            spawnflags = AI_CRATE;
+        type       = ev->GetString(1);
+        spawnflags = GetNodeTypeFromName(type);
+        if (spawnflags == -1) {
+            ScriptError("Unrecognized node type '%s'", type.c_str());
         }
     }
 
@@ -3238,13 +3407,91 @@ void NavMaster::CreateNode(Event *ev)
         return;
     }
 
-    node            = new PathNode;
+    node = new PathNode;
+
     node->nodeflags = spawnflags;
     node->setOrigin(ent->origin);
 }
 
-void NavMaster::Frame() {
-    float phase;
+void NavMaster::SetNodeFlags(Event *ev)
+{
+    str type;
+    str typelist;
+    int spawnflags;
+    int i;
+
+    CheckNodeSelected();
+
+    if (ev->NumArgs() < 1) {
+        ScriptError("A type is required");
+        return;
+    }
+
+    spawnflags = 0;
+
+    for (i = 1; i <= ev->NumArgs(); i++) {
+        int flags;
+
+        type = ev->GetString(i);
+
+        flags = GetNodeTypeFromName(type);
+        if (flags == -1) {
+            ScriptError("Unrecognized node type '%s'", type.c_str());
+        }
+
+        spawnflags |= flags;
+
+        if (i != 1) {
+            typelist += ", ";
+        }
+        typelist += "'" + type + "'";
+    }
+
+    selectedNode->nodeflags = spawnflags;
+
+    gi.Printf("Node %d set type %s\n", selectedNode->nodenum, typelist.c_str());
+}
+
+void NavMaster::SetNodeTargetName(Event *ev)
+{
+    CheckNodeSelected();
+
+    selectedNode->targetname = ev->GetString(1);
+
+    gi.Printf("Node %d got new targetname '%s'\n", selectedNode->nodenum, selectedNode->targetname.c_str());
+}
+
+void NavMaster::SetNodeTarget(Event *ev)
+{
+    CheckNodeSelected();
+
+    selectedNode->target = ev->GetString(1);
+
+    gi.Printf("Node %d got new target '%s'\n", selectedNode->nodenum, selectedNode->target.c_str());
+}
+
+void NavMaster::RemoveNode(Event *ev)
+{
+    int num;
+
+    CheckNodeSelected();
+
+    num = selectedNode->nodenum;
+    AI_RemoveNode(selectedNode);
+
+    gi.Printf("Node %d removed\n", selectedNode->nodenum, selectedNode->targetname.c_str());
+}
+
+void NavMaster::CheckNodeSelected()
+{
+    if (!selectedNode) {
+        ScriptError("No node selected");
+    }
+}
+
+void NavMaster::Frame()
+{
+    float  phase;
     vec3_t color;
 
     if (!ai_editmode->integer) {
@@ -3268,43 +3515,59 @@ void NavMaster::Frame() {
         colorPhase[0] = 0;
         colorPhase[1] = (1.0 - phase) * 0.5;
         colorPhase[2] = phase;
-        color[1] = Q_max(color[1], colorPhase[1]) - Q_min(color[1], colorPhase[1]);
-        color[2] = Q_max(color[2], colorPhase[2]) - Q_min(color[2], colorPhase[2]);
+        color[1]      = Q_max(color[1], colorPhase[1]) - Q_min(color[1], colorPhase[1]);
+        color[2]      = Q_max(color[2], colorPhase[2]) - Q_min(color[2], colorPhase[2]);
 
         mins = Vector(-24, -24, -24);
         maxs = Vector(24, 24, 24);
-        org = selectedNode->centroid;
+        org  = selectedNode->centroid;
         org.z += 24;
 
         G_DebugBBox(org, mins, maxs, color[0], color[1], color[2], 1.0);
     }
 }
 
-PathNode* NavMaster::DetermineCurrentNode() const {
-    Entity* ent;
-    PathNode* bestnode;
-    float bestdist;
-    Vector delta;
-    int i;
+PathNode *NavMaster::DetermineCurrentNode() const
+{
+    Entity   *ent;
+    PathNode *bestnode;
+    float     bestdist;
+    Vector    delta;
+    Vector    dir;
+    int       i;
 
     ent = g_entities->entity;
     if (!ent) {
         return NULL;
     }
 
+    if (ent->IsSubclassOfSentient()) {
+        Sentient    *sent       = static_cast<Sentient *>(ent);
+        const Vector viewAngles = sent->GetViewAngles();
+
+        Vector forward;
+        viewAngles.AngleVectorsLeft(&dir);
+    } else {
+        dir = ent->orientation[0];
+    }
+
     bestdist = 1e+12f;
     bestnode = NULL;
 
     for (i = 0; i < PathSearch::nodecount; i++) {
-        PathNode* node = PathSearch::pathnodes[i];
-        float dist;
+        PathNode *node = PathSearch::pathnodes[i];
+        float     dist;
 
-        delta = node->centroid - ent->centroid;
-        if (!ent->FovCheck(delta, cos(DEG2RAD(80.0 / 2.f)))) {
+        if (!node) {
             continue;
         }
 
-        if (abs(delta.z) > MAXS_Z) {
+        delta = node->centroid - ent->centroid;
+        if (abs(delta.z) > (MAXS_Z * 2)) {
+            continue;
+        }
+
+        if (!FovCheck(dir, delta, 45)) {
             continue;
         }
 
@@ -3318,6 +3581,26 @@ PathNode* NavMaster::DetermineCurrentNode() const {
     return bestnode;
 }
 
+bool NavMaster::FovCheck(const Vector& dir, const Vector& delta, float fov) const
+{
+    float fovdot   = cos(DEG2RAD(fov / 2.f));
+    float deltadot = DotProduct(delta, dir);
+
+    if (fovdot < 0.0f) {
+        if (deltadot >= 0.0f) {
+            return true;
+        }
+
+        return VectorLengthSquared(delta) * Square(fovdot) > Square(deltadot);
+    } else {
+        if (deltadot < 0.0f) {
+            return false;
+        }
+
+        return VectorLengthSquared(delta) * Square(fovdot) < Square(deltadot);
+    }
+}
+
 Event EV_AttractiveNode_GetPriority
 (
     "priority",
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 66494bee..7c888252 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -378,10 +378,16 @@ public:
 
     void CreatePaths(Event *ev);
     void CreateNode(Event *ev);
+    void SetNodeFlags(Event *ev);
+    void SetNodeTargetName(Event *ev);
+    void SetNodeTarget(Event *ev);
+    void RemoveNode(Event *ev);
     void Frame();
 
 private:
-    PathNode* DetermineCurrentNode() const;
+    void      CheckNodeSelected();
+    PathNode *DetermineCurrentNode() const;
+    bool      FovCheck(const Vector& dir, const Vector& delta, float fov) const;
 
 private:
     SafePtr<PathNode> selectedNode;

From feb76f4fb4261ee04e66f69a73098b222493da6c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 20:31:50 +0200
Subject: [PATCH 1122/2040] Allow entities other than SimpleActor for finding
 covers and sniper nodes

---
 code/fgame/navigate.cpp | 42 +++++++++++++++++++++++++++++++----------
 code/fgame/navigate.h   | 20 ++++++++++----------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 1dd5745f..df612788 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -322,8 +322,10 @@ int PathSearch::FindPath(
     PathNode  *to;
 
     if (ent) {
+        // Added in OPM
+        //  Check for simple actor
         if (ent->IsSubclassOfActor()) {
-            Node = NearestStartNode(start, (SimpleActor *)ent);
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
         } else {
             Node = DebugNearestStartNode(start, ent);
         }
@@ -505,8 +507,10 @@ int PathSearch::FindPathNear(
     vec2_t     delta;
 
     if (ent) {
+        // Added in OPM
+        //  Check for simple actor
         if (ent->IsSubclassOfActor()) {
-            Node = NearestStartNode(start, (SimpleActor *)ent);
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
         } else {
             Node = DebugNearestStartNode(start, ent);
         }
@@ -678,8 +682,10 @@ int PathSearch::FindPathAway(
     fMinSafeDistSquared = fMinSafeDist * fMinSafeDist;
 
     if (ent) {
+        // Added in OPM
+        //  Check for simple actor
         if (ent->IsSubclassOfActor()) {
-            Node = NearestStartNode(start, (SimpleActor *)ent);
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
         } else {
             Node = DebugNearestStartNode(start, ent);
         }
@@ -825,7 +831,7 @@ int PathSearch::FindPathAway(
 }
 
 PathNode *PathSearch::FindCornerNodeForWall(
-    const vec3_t start, const vec3_t end, SimpleActor *ent, float maxPath, const vec4_t plane
+    const vec3_t start, const vec3_t end, Entity *ent, float maxPath, const vec4_t plane
 )
 {
     int        i, g;
@@ -836,7 +842,18 @@ PathNode *PathSearch::FindCornerNodeForWall(
     vec2_t     delta;
     vec2_t     dir;
 
-    Node = NearestStartNode(start, ent);
+    if (ent) {
+        // Added in OPM
+        //  Check for simple actor
+        if (ent->IsSubclassOfActor()) {
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
+        } else {
+            Node = DebugNearestStartNode(start, ent);
+        }
+    } else {
+        Node = DebugNearestStartNode(start);
+    }
+
     if (!Node) {
         last_error = "couldn't find start node";
         return NULL;
@@ -982,7 +999,7 @@ PathNode *PathSearch::FindCornerNodeForWall(
     return NULL;
 }
 
-PathNode *PathSearch::FindCornerNodeForExactPath(SimpleActor *pSelf, Sentient *enemy, float fMaxPath)
+PathNode *PathSearch::FindCornerNodeForExactPath(Entity *pSelf, Sentient *enemy, float fMaxPath)
 {
     PathNode *pPathNode[4096];
     PathNode *pParentNode;
@@ -996,7 +1013,12 @@ PathNode *PathSearch::FindCornerNodeForExactPath(SimpleActor *pSelf, Sentient *e
         return NULL;
     }
 
-    vEyePos   = pSelf->EyePosition();
+    if (pSelf->IsSubclassOfActor()) {
+        vEyePos = static_cast<SimpleActor*>(pSelf)->EyePosition();
+    } else {
+        vEyePos = pSelf->origin + Vector(0, 0, pSelf->maxs.z);
+    }
+
     vEyeDelta = vEyePos - pSelf->origin;
 
     for (pParentNode = Node->Parent, i = 0; pParentNode; pParentNode = pParentNode->Parent, i++) {
@@ -2358,7 +2380,7 @@ int node_compare(const void *pe1, const void *pe2)
 }
 
 int PathSearch::FindPotentialCover(
-    SimpleActor *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind
+    Entity *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind
 )
 {
     nodeinfo  nodes[MAX_PATHNODES];
@@ -2414,7 +2436,7 @@ int PathSearch::FindPotentialCover(
     return nNodes;
 }
 
-PathNode *PathSearch::FindNearestSniperNode(SimpleActor *pEnt, Vector& vPos, Entity *pEnemy)
+PathNode *PathSearch::FindNearestSniperNode(Entity*pEnt, Vector& vPos, Entity *pEnemy)
 {
     Actor    *pSelf = (Actor *)pEnt;
     PathNode *pNode;
@@ -3286,7 +3308,7 @@ int PathSearch::NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, ve
     return n;
 }
 
-PathNode *PathSearch::FindNearestCover(SimpleActor *pEnt, Vector& vPos, Entity *pEnemy)
+PathNode *PathSearch::FindNearestCover(Entity *pEnt, Vector& vPos, Entity *pEnemy)
 {
     // not found in ida
     return NULL;
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 7c888252..74d07235 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -66,6 +66,7 @@ extern int path_checksthisframe;
 
 class Path;
 class PathNode;
+class SimpleActor;
 
 #define NUM_WIDTH_VALUES 16
 #define WIDTH_STEP       8
@@ -292,7 +293,7 @@ public:
     static MapCell *GetNodesInCell(const vec3_t pos);
 
     static class PathNode *DebugNearestStartNode(const vec3_t pos, Entity *ent = NULL);
-    static class PathNode *NearestStartNode(const vec3_t pos, class SimpleActor *ent);
+    static class PathNode *NearestStartNode(const vec3_t pos, SimpleActor *ent);
     static class PathNode *NearestEndNode(const vec3_t pos);
     static int             DebugNearestNodeList(const vec3_t pos, PathNode **nodelist, int iMaxNodes);
     static int             DebugNearestNodeList2(const vec3_t pos, PathNode **nodelist, int iMaxNodes);
@@ -341,15 +342,14 @@ public:
         float        fLeashDistSquared,
         int          fallheight
     );
-    static class PathNode *FindCornerNodeForWall(
-        const vec3_t start, const vec3_t end, class SimpleActor *ent, float maxPath, const vec4_t plane
-    );
-    static class PathNode *FindCornerNodeForExactPath(class SimpleActor *self, Sentient *enemy, float fMaxPath);
-    static int
-    FindPotentialCover(class SimpleActor *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind);
-    static void            PlayerCover(class Player *pPlayer);
-    static class PathNode *FindNearestCover(class SimpleActor *pEnt, Vector& vPos, Entity *pEnemy);
-    static class PathNode *FindNearestSniperNode(class SimpleActor *pEnt, Vector& vPos, Entity *pEnemy);
+
+    static class PathNode *
+    FindCornerNodeForWall(const vec3_t start, const vec3_t end, Entity *ent, float maxPath, const vec4_t plane);
+    static class PathNode *FindCornerNodeForExactPath(Entity *self, Sentient *enemy, float fMaxPath);
+    static int  FindPotentialCover(Entity *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind);
+    static void PlayerCover(class Player *pPlayer);
+    static class PathNode *FindNearestCover(Entity *pEnt, Vector& vPos, Entity *pEnemy);
+    static class PathNode *FindNearestSniperNode(Entity *pEnt, Vector& vPos, Entity *pEnemy);
 
 private:
     static int NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, vec3_t *deltas);

From a05fbfe69b36a25b65413278fc54df772c44f4cb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 20:38:28 +0200
Subject: [PATCH 1123/2040] Fix incorrect value of AI_CONCEALMENT_MASK

---
 code/fgame/navigate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 74d07235..481ee42f 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -150,7 +150,7 @@ typedef enum {
 #define AI_COVER_LEFT_FLAGS  (AI_CRATE | AI_SNIPER | AI_CORNER_LEFT | AI_CONCEALMENT | AI_DUCK)
 #define AI_COVER_RIGHT_FLAGS (AI_CRATE | AI_SNIPER | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_DUCK)
 #define AI_COVER_MASK        (AI_CRATE | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_COVER)
-#define AI_CONCEALMENT_MASK  (AI_CRATE | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_LOW_WALL_ARC)
+#define AI_CONCEALMENT_MASK  (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
 #define AI_ALL               (AI_DUCK | AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE)
 
 void DrawNode(int iNodeCount);

From dcd9ce91a8f9da1d3ee73b2f733f35b57a197559 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 20:42:22 +0200
Subject: [PATCH 1124/2040] Use the raw integer value of the squared distance
 when comparing nodes

---
 code/fgame/navigate.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index df612788..97685a11 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2367,15 +2367,15 @@ int node_compare(const void *pe1, const void *pe2)
     nodeinfo *Pe2 = (nodeinfo *)pe2;
     int       iConcealment;
 
-    iConcealment = (Pe1->pNode->nodeflags & AI_CONCEALMENT_MASK) != 0;
+    iConcealment = (Pe1->pNode->nodeflags & AI_CONCEALMENT_MASK) ? 1 : 0;
     if (Pe2->pNode->nodeflags & AI_CONCEALMENT_MASK) {
-        --iConcealment;
+        iConcealment--;
     }
 
     return (
-        (Pe1->fDistSquared) + (iConcealment << 23)
+        *(unsigned int*)&Pe1->fDistSquared + (iConcealment << 23)
         + (((Pe1->pNode->nodeflags & AI_CONCEALMENT) - (Pe2->pNode->nodeflags & AI_CONCEALMENT)) << 21)
-        - (Pe2->fDistSquared)
+        - *(unsigned int*)&Pe2->fDistSquared
     );
 }
 

From 5ec106642d046f04005136f9152b28ab845624d0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 21:00:01 +0200
Subject: [PATCH 1125/2040] Fix node cover mask

---
 code/fgame/navigate.cpp |  2 +-
 code/fgame/navigate.h   | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 97685a11..eac92c28 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2328,7 +2328,7 @@ void PathSearch::PlayerCover(Player *pPlayer)
     for (i = 0; i < nodecount; i++) {
         node = pathnodes[i];
 
-        if (!node || !(node->nodeflags & AI_COVERFLAGS)) {
+        if (!node || !(node->nodeflags & AI_MOVE_MASK)) {
             continue;
         }
 
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 481ee42f..1b86d7c0 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -141,17 +141,10 @@ typedef enum {
 // Added in 2.0
 #define AI_LOW_WALL_ARC 256
 
-#define AI_COVERFLAGS \
-    (AI_CRATE | AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_COVER | AI_LOW_WALL_ARC)
-#define AI_COVERFLAGS2       (AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT)
-#define AI_COVERFLAGS3       (AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_DUCK | AI_CONCEALMENT)
-#define AI_SNIPERFLAGS       (AI_SNIPER | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_COVER)
-#define AI_CRATEFLAGS        (AI_CRATE | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_COVER | AI_DUCK)
-#define AI_COVER_LEFT_FLAGS  (AI_CRATE | AI_SNIPER | AI_CORNER_LEFT | AI_CONCEALMENT | AI_DUCK)
-#define AI_COVER_RIGHT_FLAGS (AI_CRATE | AI_SNIPER | AI_CORNER_RIGHT | AI_CONCEALMENT | AI_DUCK)
-#define AI_COVER_MASK        (AI_CRATE | AI_CORNER_RIGHT | AI_CORNER_LEFT | AI_CONCEALMENT | AI_COVER)
-#define AI_CONCEALMENT_MASK  (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
-#define AI_ALL               (AI_DUCK | AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE)
+#define AI_MOVE_MASK \
+    (AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE | AI_LOW_WALL_ARC)
+#define AI_COVER_MASK       (AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
+#define AI_CONCEALMENT_MASK (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
 
 void DrawNode(int iNodeCount);
 void DrawAllConnections(void);

From 34c44ab2cff6fc9d9f545e179cbe625a056f19e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 21:50:41 +0200
Subject: [PATCH 1126/2040] Add a method to get the max fire movement

---
 code/fgame/weapon.cpp | 7 +++++++
 code/fgame/weapon.h   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index f98866c6..37e8f484 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -4567,3 +4567,10 @@ Listener *Weapon::GetScriptOwner(void)
 {
     return owner;
 }
+
+//======================
+//Weapon::GetMaxFireMovement
+//======================
+float Weapon::GetMaxFireMovement() const {
+    return m_fMaxFireMovement;
+}
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index d47ace5d..17b71a22 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -455,6 +455,8 @@ public:
     float      GetBulletRange(firemode_t firemode);
     firemode_t GetFireMode(void);
     qboolean   IsSemiAuto(void);
+
+    float GetMaxFireMovement() const;
 };
 
 inline void Weapon::Archive(Archiver& arc)

From 7dbf1d7bf5bc98551f0ee073faca8732b26c524f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 21:52:49 +0200
Subject: [PATCH 1127/2040] Add a method to get the ladder

---
 code/fgame/sentient.cpp | 4 ++++
 code/fgame/sentient.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 8b454201..cbe578ed 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -3053,6 +3053,10 @@ void Sentient::SetTurret(TurretGun *pTurret)
     m_pTurret = pTurret;
 }
 
+Entity* Sentient::GetLadder() const {
+    return m_pLadder;
+}
+
 #define GROUND_DISTANCE        8
 #define WATER_NO_SPLASH_HEIGHT 16
 
diff --git a/code/fgame/sentient.h b/code/fgame/sentient.h
index 184629e9..02edcd6d 100644
--- a/code/fgame/sentient.h
+++ b/code/fgame/sentient.h
@@ -349,6 +349,8 @@ public:
     TurretGun* GetTurret() const;
     void SetTurret(TurretGun* pTurret);
 
+    Entity* GetLadder() const; // Added in OPM
+
     //
     // Custom openmohaa stuff
     //

From 0b07858bfcffe0921fd1f00cd2e6cb18c19a714b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 8 Oct 2024 22:16:57 +0200
Subject: [PATCH 1128/2040] Refactor PlayerBot to use a separate controller
 class, alongside classes that manage bots

---
 code/fgame/g_bot.cpp            |  42 ++-
 code/fgame/g_bot.h              |   2 +
 code/fgame/g_main.cpp           |   8 +-
 code/fgame/g_utils.cpp          |  19 +-
 code/fgame/gamecmds.cpp         |   8 +-
 code/fgame/playerbot.cpp        | 574 ++++++++++++++++++++------------
 code/fgame/playerbot.h          |  89 ++++-
 code/fgame/playerbot_master.cpp | 114 +++++++
 8 files changed, 607 insertions(+), 249 deletions(-)
 create mode 100644 code/fgame/playerbot_master.cpp

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 71dafdc1..1f7d1493 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -159,10 +159,16 @@ Begin spawning a new bot entity
 */
 void G_BotBegin(gentity_t *ent)
 {
+    PlayerBot     *player;
+    BotController *controller;
+
     level.spawn_entnum = ent->s.number;
-    new PlayerBot;
+    player             = new PlayerBot;
 
     G_ClientBegin(ent, NULL);
+
+    controller = botManager.getControllerManager().createController(player);
+    player->setController(controller);
 }
 
 /*
@@ -174,6 +180,7 @@ Called each server frame to make bots think
 */
 void G_BotThink(gentity_t *ent, int msec)
 {
+    /*
     usercmd_t  ucmd;
     usereyes_t eyeinfo;
     PlayerBot *bot;
@@ -189,6 +196,7 @@ void G_BotThink(gentity_t *ent, int msec)
     bot->GetEyeInfo(&eyeinfo);
 
     G_ClientThink(ent, &ucmd, &eyeinfo);
+    */
 }
 
 /*
@@ -468,6 +476,12 @@ Remove the specified bot
 */
 void G_RemoveBot(gentity_t *ent)
 {
+    if (ent->entity) {
+        BotController *controller = botManager.getControllerManager().findController(ent->entity);
+
+        botManager.getControllerManager().removeController(controller);
+    }
+
     G_ClientDisconnect(ent);
     current_bot_count--;
 }
@@ -658,10 +672,36 @@ void G_ResetBots()
 {
     G_SaveBots();
 
+    botManager.Cleanup();
+
     current_bot_count = 0;
     botId             = 0;
 }
 
+/*
+===========
+G_BotInit
+
+Called to initialize bots
+============
+*/
+void G_BotInit()
+{
+    botManager.Init();
+}
+
+/*
+===========
+G_BotFrame
+
+Called each frame to manage bots
+============
+*/
+void G_BotFrame()
+{
+    botManager.Frame();
+}
+
 /*
 ===========
 G_SpawnBots
diff --git a/code/fgame/g_bot.h b/code/fgame/g_bot.h
index 3d4b0e5b..c41031bd 100644
--- a/code/fgame/g_bot.h
+++ b/code/fgame/g_bot.h
@@ -42,4 +42,6 @@ void       G_RemoveBots(unsigned int num);
 bool       G_IsBot(gentity_t *ent);
 bool       G_IsPlayer(gentity_t *ent);
 void       G_ResetBots();
+void       G_BotInit();
+void       G_BotFrame();
 void       G_SpawnBots();
\ No newline at end of file
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 89474439..cd1057fd 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -271,7 +271,7 @@ void G_InitGame(int levelTime, int randomSeed)
 
     Director.Reset();
     Actor::Init();
-    PlayerBot::Init();
+    G_BotInit();
 
     sv_numtraces   = 0;
     sv_numpmtraces = 0;
@@ -556,11 +556,7 @@ void G_RunFrame(int levelTime, int frameTime)
             start           = clock();
         }
 
-        for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
-            if (edict->entity->IsSubclassOfBot()) {
-                G_BotThink(edict, frameTime);
-            }
-        }
+        G_BotFrame();
 
         for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
             for (num = edict->s.parent; num != ENTITYNUM_NONE; num = g_entities[num].s.parent) {
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 92490c72..1659993d 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1687,15 +1687,13 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radi
             continue;
         }
 
-        if (!ent->IsSubclassOfActor() && !ent->IsSubclassOfBot()) {
+        if (!ent->IsSubclassOfActor()) {
             continue;
         }
 
-        if (ent->IsSubclassOfActor()) {
-            act = static_cast<Actor *>(ent);
-            if (act->IgnoreSound(iType)) {
-                continue;
-            }
+        act = static_cast<Actor*>(ent);
+        if (act->IgnoreSound(iType)) {
+            continue;
         }
 
         delta = origin - ent->centroid;
@@ -1717,15 +1715,10 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radi
             continue;
         }
 
-        if (ent->IsSubclassOfActor()) {
-            act->ReceiveAIEvent(origin, iType, originator, dist2, r2);
-        } else if (ent->IsSubclassOfBot()) {
-            PlayerBot *bot = static_cast<PlayerBot *>(ent);
-
-            bot->NoticeEvent(origin, iType, originator, dist2, r2);
-        }
+        act->ReceiveAIEvent(origin, iType, originator, dist2, r2);
     }
 
+    botManager.BroadcastEvent(originator, origin, iType, radius);
 #if 0
     gi.DPrintf("Broadcast event %s to %d entities\n", ev->getName(), count);
 #endif
diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index 9f3f4146..63989d97 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -678,9 +678,9 @@ qboolean G_RemoveBotCommand(gentity_t *ent)
 qboolean G_BotCommand(gentity_t *ent)
 {
     const char *command;
-    PlayerBot  *bot;
+    BotController *bot;
 
-    if (!G_GetFirstBot() || !G_GetFirstBot()->entity) {
+    if (botManager.getControllerManager().getControllers().NumObjects() < 1) {
         gi.Printf("No bot spawned.\n");
         return qfalse;
     }
@@ -690,7 +690,7 @@ qboolean G_BotCommand(gentity_t *ent)
         return qfalse;
     }
 
-    bot = (PlayerBot *)G_GetFirstBot()->entity;
+    bot = botManager.getControllerManager().getControllers().ObjectAt(1);
 
     command = gi.Argv(1);
 
@@ -713,7 +713,7 @@ qboolean G_BotCommand(gentity_t *ent)
 
         bot->AvoidPath(ent->entity->origin, rad);
     } else if (!Q_stricmp(command, "telehere")) {
-        bot->setOrigin(ent->s.origin);
+        bot->getControlledEntity()->setOrigin(ent->s.origin);
     }
 
     return qtrue;
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index e9a925da..b613e130 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -42,12 +42,46 @@ CLASS_DECLARATION(Player, PlayerBot, NULL) {
     {NULL,                 NULL                      }
 };
 
-PlayerBot::botfunc_t PlayerBot::botfuncs[MAX_BOT_FUNCTIONS];
-
 PlayerBot::PlayerBot()
 {
     entflags |= ECF_BOT;
+    controller = NULL;
+}
 
+void PlayerBot::setController(BotController *controlledBy)
+{
+    controller = controlledBy;
+}
+
+void PlayerBot::Spawned(void)
+{
+    controller->Spawned();
+
+    Player::Spawned();
+}
+
+void PlayerBot::Killed(Event *ev)
+{
+    Player::Killed(ev);
+
+    controller->Killed(ev);
+}
+
+void PlayerBot::GotKill(Event *ev)
+{
+    Player::GotKill(ev);
+
+    controller->GotKill(ev);
+}
+
+CLASS_DECLARATION(Listener, BotController, NULL) {
+    {NULL, NULL}
+};
+
+BotController::botfunc_t BotController::botfuncs[MAX_BOT_FUNCTIONS];
+
+BotController::BotController()
+{
     if (LoadingSavegame) {
         return;
     }
@@ -72,7 +106,7 @@ PlayerBot::PlayerBot()
     m_botEyes.angles[1] = 0;
     m_botEyes.ofs[0]    = 0;
     m_botEyes.ofs[1]    = 0;
-    m_botEyes.ofs[2]    = viewheight;
+    m_botEyes.ofs[2]    = DEFAULT_VIEWHEIGHT;
 
     m_vAngSpeed      = vec_zero;
     m_vTargetAng     = vec_zero;
@@ -91,13 +125,13 @@ PlayerBot::PlayerBot()
     m_RunLabel.TrySetScript("global/bot_run.scr");
 }
 
-void PlayerBot::Init(void)
+void BotController::Init(void)
 {
     bot_manualmove = gi.Cvar_Get("bot_manualmove", "0", 0);
 
     for (int i = 0; i < MAX_BOT_FUNCTIONS; i++) {
-        botfuncs[i].BeginState = &PlayerBot::State_DefaultBegin;
-        botfuncs[i].EndState   = &PlayerBot::State_DefaultEnd;
+        botfuncs[i].BeginState = &BotController::State_DefaultBegin;
+        botfuncs[i].EndState   = &BotController::State_DefaultEnd;
     }
 
     InitState_Attack(&botfuncs[0]);
@@ -124,7 +158,7 @@ float AngleDifference(float ang1, float ang2)
     return diff;
 }
 
-void PlayerBot::TurnThink(void)
+void BotController::TurnThink(void)
 {
     float diff, factor, maxchange, anglespeed, desired_speed;
     int   i;
@@ -150,7 +184,7 @@ void PlayerBot::TurnThink(void)
         desired_speed    = diff * factor;
 
         m_vAngSpeed[i] = Q_clamp_float(m_vAngSpeed[i] + (m_vAngSpeed[i] - desired_speed), -180, 180);
-        anglespeed = Q_clamp_float(m_vAngSpeed[i], -maxchange, maxchange);
+        anglespeed     = Q_clamp_float(m_vAngSpeed[i], -maxchange, maxchange);
 
         m_vCurrentAng[i] += anglespeed;
         m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
@@ -165,24 +199,24 @@ void PlayerBot::TurnThink(void)
 
     m_botEyes.angles[0] = m_vCurrentAng[0];
     m_botEyes.angles[1] = m_vCurrentAng[1];
-    m_botCmd.angles[0]  = ANGLE2SHORT(m_vCurrentAng[0]) - client->ps.delta_angles[0];
-    m_botCmd.angles[1]  = ANGLE2SHORT(m_vCurrentAng[1]) - client->ps.delta_angles[1];
-    m_botCmd.angles[2]  = ANGLE2SHORT(m_vCurrentAng[2]) - client->ps.delta_angles[2];
+    m_botCmd.angles[0]  = ANGLE2SHORT(m_vCurrentAng[0]) - controlledEnt->client->ps.delta_angles[0];
+    m_botCmd.angles[1]  = ANGLE2SHORT(m_vCurrentAng[1]) - controlledEnt->client->ps.delta_angles[1];
+    m_botCmd.angles[2]  = ANGLE2SHORT(m_vCurrentAng[2]) - controlledEnt->client->ps.delta_angles[2];
 }
 
-void PlayerBot::CheckAttractiveNodes(void)
+void BotController::CheckAttractiveNodes(void)
 {
     for (int i = m_attractList.NumObjects(); i > 0; i--) {
         nodeAttract_t *a = m_attractList.ObjectAt(i);
 
-        if (a->m_pNode == NULL || !a->m_pNode->CheckTeam(this) || level.time > a->m_fRespawnTime) {
+        if (a->m_pNode == NULL || !a->m_pNode->CheckTeam(controlledEnt) || level.time > a->m_fRespawnTime) {
             delete a;
             m_attractList.RemoveObjectAt(i);
         }
     }
 }
 
-void PlayerBot::MoveThink(void)
+void BotController::MoveThink(void)
 {
     Vector vDir;
     Vector vAngles;
@@ -199,14 +233,14 @@ void PlayerBot::MoveThink(void)
 
     if (m_bTempAway && level.inttime >= m_iTempAwayTime) {
         m_bTempAway = false;
-        m_Path.FindPath(origin, m_vTargetPos, this, 0, NULL, 0);
+        m_Path.FindPath(controlledEnt->origin, m_vTargetPos, controlledEnt, 0, NULL, 0);
     }
 
     if (!m_bTempAway) {
         if (m_Path.CurrentNode()) {
-            m_Path.UpdatePos(origin, 8);
+            m_Path.UpdatePos(controlledEnt->origin, 8);
 
-            m_vCurrentGoal = origin;
+            m_vCurrentGoal = controlledEnt->origin;
             VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
 
             if (MoveDone()) {
@@ -217,12 +251,11 @@ void PlayerBot::MoveThink(void)
     }
 
     if (ai_debugpath->integer) {
-        G_DebugLine(centroid, m_vCurrentGoal + Vector(0, 0, 36), 1, 1, 0, 1);
+        G_DebugLine(controlledEnt->centroid, m_vCurrentGoal + Vector(0, 0, 36), 1, 1, 0, 1);
     }
 
     // Check if we're blocked
     if (level.inttime >= m_iCheckPathTime) {
-
         m_bDeltaMove = false;
 
         m_iCheckPathTime = level.inttime + 1000;
@@ -234,15 +267,17 @@ void PlayerBot::MoveThink(void)
 
         m_bTempAway = false;
 
-        if (groundentity || client->ps.walking) {
-            if (GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= Square(8)) {
+        if (controlledEnt->groundentity || controlledEnt->client->ps.walking) {
+            if (controlledEnt->GetMoveResult() >= MOVERESULT_BLOCKED
+                || controlledEnt->velocity.lengthSquared() <= Square(8)) {
                 m_bTempAway = true;
-            } else if ((origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32) && (origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
+            } else if ((controlledEnt->origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32)
+                       && (controlledEnt->origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
                 m_bTempAway = true;
             }
         } else {
             // falling
-            if (GetMoveResult() >= MOVERESULT_BLOCKED) {
+            if (controlledEnt->GetMoveResult() >= MOVERESULT_BLOCKED) {
                 // stuck while falling
                 m_bTempAway = true;
             }
@@ -257,18 +292,18 @@ void PlayerBot::MoveThink(void)
             // Try to backward a little
             m_Path.Clear();
             m_Path.ForceShortLookahead();
-            m_vCurrentGoal = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+            m_vCurrentGoal = controlledEnt->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
         } else {
             m_iNumBlocks = 0;
 
             if (!m_Path.CurrentNode()) {
-                m_vTargetPos = origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+                m_vTargetPos   = controlledEnt->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
                 m_vCurrentGoal = m_vTargetPos;
             }
         }
 
         m_vLastCheckPos[1] = m_vLastCheckPos[0];
-        m_vLastCheckPos[0] = origin;
+        m_vLastCheckPos[0] = controlledEnt->origin;
     }
 
     if (ai_debugpath->integer) {
@@ -288,11 +323,11 @@ void PlayerBot::MoveThink(void)
     }
 
     if (m_Path.CurrentNode()) {
-        if ((m_vTargetPos - origin).lengthSquared() <= Square(16)) {
+        if ((m_vTargetPos - controlledEnt->origin).lengthSquared() <= Square(16)) {
             ClearMove();
         }
     } else {
-        if ((m_vTargetPos - origin).lengthXYSquared() <= Square(16)) {
+        if ((m_vTargetPos - controlledEnt->origin).lengthXYSquared() <= Square(16)) {
             ClearMove();
         }
     }
@@ -302,12 +337,12 @@ void PlayerBot::MoveThink(void)
         vDir[0] = m_Path.CurrentDelta()[0];
         vDir[1] = m_Path.CurrentDelta()[1];
     } else {
-        vDir = m_vCurrentGoal - origin;
+        vDir = m_vCurrentGoal - controlledEnt->origin;
     }
     vDir[2] = 0;
 
     VectorNormalize2D(vDir);
-    vAngles = vDir.toAngles() - angles;
+    vAngles = vDir.toAngles() - controlledEnt->angles;
     vAngles.AngleVectorsLeft(&vWishDir);
 
     m_vLastValidDir  = vDir;
@@ -321,21 +356,21 @@ void PlayerBot::MoveThink(void)
     m_botCmd.rightmove   = (signed char)Q_clamp(y, -127, 127);
     CheckJump();
 
-    Weapon *pWeap = GetActiveWeapon(WEAPON_MAIN);
+    Weapon *pWeap = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
 
     if (pWeap && !pWeap->ShouldReload()) {
         m_RunLabel.Execute(this);
     }
 }
 
-void PlayerBot::CheckJump(void)
+void BotController::CheckJump(void)
 {
     Vector  start;
     Vector  end;
     Vector  dir;
     trace_t trace;
 
-    if (m_pLadder) {
+    if (controlledEnt->GetLadder()) {
         if (!m_botCmd.upmove) {
             m_botCmd.upmove = 127;
         } else {
@@ -346,15 +381,24 @@ void PlayerBot::CheckJump(void)
 
     dir = m_vLastValidDir;
 
-    start = origin + Vector(0, 0, STEPSIZE);
-    end   = origin + Vector(0, 0, STEPSIZE) + dir * (maxs.y - mins.y);
+    start = controlledEnt->origin + Vector(0, 0, STEPSIZE);
+    end   = controlledEnt->origin + Vector(0, 0, STEPSIZE) + dir * (controlledEnt->maxs.y - controlledEnt->mins.y);
 
     if (ai_debugpath->integer) {
         G_DebugLine(start, end, 1, 0, 1, 1);
     }
 
     // Check if the bot needs to jump
-    trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
+    trace = G_Trace(
+        start,
+        controlledEnt->mins,
+        controlledEnt->maxs,
+        end,
+        controlledEnt,
+        MASK_PLAYERSOLID,
+        false,
+        "BotController::CheckJump"
+    );
 
     // No need to jump
     if (trace.fraction > 0.5f) {
@@ -362,29 +406,40 @@ void PlayerBot::CheckJump(void)
         return;
     }
 
-    start = origin;
-    end   = origin + Vector(0, 0, STEPSIZE * 3);
+    start = controlledEnt->origin;
+    end   = controlledEnt->origin + Vector(0, 0, STEPSIZE * 3);
 
     if (ai_debugpath->integer) {
         G_DebugLine(start, end, 1, 0, 1, 1);
     }
 
     // Check if the bot can jump up
-    trace = G_Trace(start, mins, maxs, end, this, MASK_PLAYERSOLID, true, "PlayerBot::CheckJump");
+    trace = G_Trace(
+        start,
+        controlledEnt->mins,
+        controlledEnt->maxs,
+        end,
+        controlledEnt,
+        MASK_PLAYERSOLID,
+        true,
+        "BotController::CheckJump"
+    );
 
     start = trace.endpos;
-    end = trace.endpos + dir * (maxs.y - mins.y);
+    end   = trace.endpos + dir * (controlledEnt->maxs.y - controlledEnt->mins.y);
 
     if (ai_debugpath->integer) {
         G_DebugLine(start, end, 1, 0, 1, 1);
     }
 
     Vector bounds[2];
-    bounds[0] = Vector(mins[0], mins[1], 0);
-    bounds[1] = Vector(maxs[0], maxs[1], (maxs[0] + maxs[1]) * 0.5);
+    bounds[0] = Vector(controlledEnt->mins[0], controlledEnt->mins[1], 0);
+    bounds[1] =
+        Vector(controlledEnt->maxs[0], controlledEnt->maxs[1], (controlledEnt->maxs[0] + controlledEnt->maxs[1]) * 0.5);
 
     // Check if the bot can jump at the location
-    trace = G_Trace(start, bounds[0], bounds[1], end, this, MASK_PLAYERSOLID, false, "PlayerBot::CheckJump");
+    trace =
+        G_Trace(start, bounds[0], bounds[1], end, controlledEnt, MASK_PLAYERSOLID, false, "BotController::CheckJump");
 
     if (trace.fraction < 1) {
         m_botCmd.upmove = 0;
@@ -399,7 +454,7 @@ void PlayerBot::CheckJump(void)
     }
 }
 
-void PlayerBot::CheckEndPos(void)
+void BotController::CheckEndPos(void)
 {
     Vector  start;
     Vector  end;
@@ -412,31 +467,40 @@ void PlayerBot::CheckEndPos(void)
     start = m_Path.LastNode()->point;
     end   = m_vTargetPos;
 
-    trace = G_Trace(start, mins, maxs, end, this, MASK_TARGETPATH, true, "PlayerBot::CheckEndPos");
+    trace = G_Trace(
+        start,
+        controlledEnt->mins,
+        controlledEnt->maxs,
+        end,
+        controlledEnt,
+        MASK_TARGETPATH,
+        true,
+        "BotController::CheckEndPos"
+    );
 
     if (trace.fraction < 0.95f) {
         m_vTargetPos = trace.endpos;
     }
 }
 
-void PlayerBot::CheckUse(void)
+void BotController::CheckUse(void)
 {
     Vector  dir;
     Vector  start;
     Vector  end;
     trace_t trace;
 
-    angles.AngleVectorsLeft(&dir);
+    controlledEnt->angles.AngleVectorsLeft(&dir);
 
-    start = origin + Vector(0, 0, viewheight);
-    end   = origin + Vector(0, 0, viewheight) + dir * 32;
+    start = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight);
+    end   = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight) + dir * 32;
 
-    trace = G_Trace(start, vec_zero, vec_zero, end, this, MASK_USABLE, false, "PlayerBot::CheckUse");
+    trace = G_Trace(start, vec_zero, vec_zero, end, controlledEnt, MASK_USABLE, false, "BotController::CheckUse");
 
     // It may be a door
     if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.entityNum) {
         if (trace.ent->entity->IsSubclassOfDoor()) {
-            Door* door = static_cast<Door*>(trace.ent->entity);
+            Door *door = static_cast<Door *>(trace.ent->entity);
             if (door->isOpen()) {
                 m_botCmd.buttons &= ~BUTTON_USE;
                 return;
@@ -453,24 +517,24 @@ void PlayerBot::CheckUse(void)
     }
 }
 
-void PlayerBot::GetUsercmd(usercmd_t *ucmd)
+void BotController::GetUsercmd(usercmd_t *ucmd)
 {
     *ucmd = m_botCmd;
 }
 
-void PlayerBot::GetEyeInfo(usereyes_t *eyeinfo)
+void BotController::GetEyeInfo(usereyes_t *eyeinfo)
 {
     *eyeinfo = m_botEyes;
 }
 
-void PlayerBot::UpdateBotStates(void)
+void BotController::UpdateBotStates(void)
 {
     if (bot_manualmove->integer) {
         memset(&m_botCmd, 0, sizeof(usercmd_t));
         return;
     }
 
-    if (!client->pers.dm_primary[0]) {
+    if (!controlledEnt->client->pers.dm_primary[0]) {
         Event *event;
 
         //
@@ -479,28 +543,28 @@ void PlayerBot::UpdateBotStates(void)
         event = new Event(EV_Player_PrimaryDMWeapon);
         event->AddString("auto");
 
-        ProcessEvent(event);
+        controlledEnt->ProcessEvent(event);
     }
 
-    if (GetTeam() == TEAM_NONE || GetTeam() == TEAM_SPECTATOR) {
-        Event* event;
-        float time;
+    if (controlledEnt->GetTeam() == TEAM_NONE || controlledEnt->GetTeam() == TEAM_SPECTATOR) {
+        Event *event;
+        float  time;
 
         // Add some delay to avoid telefragging
-        time = entnum / 20.0;
+        time = controlledEnt->entnum / 20.0;
 
-        if (EventPending(EV_Player_AutoJoinDMTeam)) {
+        if (controlledEnt->EventPending(EV_Player_AutoJoinDMTeam)) {
             return;
         }
 
         //
         // Team
         //
-        PostEvent(EV_Player_AutoJoinDMTeam, time);
+        controlledEnt->PostEvent(EV_Player_AutoJoinDMTeam, time);
         return;
     }
 
-    if (IsDead() || IsSpectator()) {
+    if (controlledEnt->IsDead() || controlledEnt->IsSpectator()) {
         // The bot should respawn
         m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
         return;
@@ -511,7 +575,7 @@ void PlayerBot::UpdateBotStates(void)
 
     m_botEyes.ofs[0]    = 0;
     m_botEyes.ofs[1]    = 0;
-    m_botEyes.ofs[2]    = viewheight;
+    m_botEyes.ofs[2]    = controlledEnt->viewheight;
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
@@ -522,7 +586,7 @@ void PlayerBot::UpdateBotStates(void)
     CheckUse();
 }
 
-void PlayerBot::SendCommand(const char *text)
+void BotController::SendCommand(const char *text)
 {
     char        *buffer;
     char        *data;
@@ -541,7 +605,7 @@ void PlayerBot::SendCommand(const char *text)
         return;
     }
 
-    m_lastcommand = com_token;
+    controlledEnt->m_lastcommand = com_token;
 
     if (!Event::GetEvent(com_token)) {
         return;
@@ -554,7 +618,7 @@ void PlayerBot::SendCommand(const char *text)
         return;
     }
 
-    ev.SetConsoleEdict(edict);
+    ev.SetConsoleEdict(controlledEnt->edict);
 
     while (1) {
         com_token = COM_Parse(&data);
@@ -569,35 +633,12 @@ void PlayerBot::SendCommand(const char *text)
     gi.Free(buffer);
 
     try {
-        ProcessEvent(ev);
+        controlledEnt->ProcessEvent(ev);
     } catch (ScriptException& exc) {
         gi.DPrintf("*** Bot Command Exception *** %s\n", exc.string.c_str());
     }
 }
 
-void PlayerBot::setAngles(Vector ang)
-{
-    Entity::setAngles(ang);
-    SetTargetAngles(angles);
-}
-
-void PlayerBot::updateOrigin(void)
-{
-    Entity::updateOrigin();
-
-    if (origin == client->ps.origin) {
-        // no change because of Pmove
-        return;
-    }
-
-    m_pPrimaryAttract = NULL;
-
-    if (m_Path.CurrentNode()) {
-        // recalculate paths because of a new origin
-        m_Path.ReFindPath(origin, this);
-    }
-}
-
 /*
 ====================
 SetTargetAngles
@@ -605,7 +646,7 @@ SetTargetAngles
 Set the bot's angle
 ====================
 */
-void PlayerBot::SetTargetAngles(Vector vAngles)
+void BotController::SetTargetAngles(Vector vAngles)
 {
     m_vTargetAng = vAngles;
 }
@@ -617,9 +658,9 @@ AimAt
 Make the bot face to the specified direction
 ====================
 */
-void PlayerBot::AimAt(Vector vPos)
+void BotController::AimAt(Vector vPos)
 {
-    Vector vDelta = vPos - centroid;
+    Vector vDelta = vPos - controlledEnt->centroid;
 
     VectorNormalize(vDelta);
     vectoangles(vDelta, m_vTargetAng);
@@ -632,7 +673,7 @@ AimAtAimNode
 Make the bot face toward the current path
 ====================
 */
-void PlayerBot::AimAtAimNode(void)
+void BotController::AimAtAimNode(void)
 {
     if (!m_bPathing) {
         return;
@@ -640,8 +681,8 @@ void PlayerBot::AimAtAimNode(void)
 
     if (!m_Path.CurrentNode()) {
         AimAt(m_vCurrentGoal);
-    } else if (!m_Path.Complete(origin)) {
-        AimAt(origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0));
+    } else if (!m_Path.Complete(controlledEnt->origin)) {
+        AimAt(controlledEnt->origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0));
         //int maxIndex = Q_min(3, m_Path.CurrentNode() - m_Path.LastNode());
         //AimAt((m_Path.CurrentNode() - maxIndex)->point);
     }
@@ -656,9 +697,9 @@ CheckReload
 Make the bot reload if necessary
 ====================
 */
-void PlayerBot::CheckReload(void)
+void BotController::CheckReload(void)
 {
-    Weapon *weap = GetActiveWeapon(WEAPON_MAIN);
+    Weapon *weap = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
 
     if (weap && weap->CheckReload(FIRE_PRIMARY)) {
         SendCommand("reload");
@@ -672,10 +713,11 @@ NewMove
 Called when there is a new move
 ====================
 */
-void PlayerBot::NewMove() {
-    m_bPathing = true;
-    m_vLastCheckPos[0] = origin;
-    m_vLastCheckPos[1] = origin;
+void BotController::NewMove()
+{
+    m_bPathing         = true;
+    m_vLastCheckPos[0] = controlledEnt->origin;
+    m_vLastCheckPos[1] = controlledEnt->origin;
 }
 
 /*
@@ -685,10 +727,10 @@ MoveTo
 Move to the specified position
 ====================
 */
-void PlayerBot::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
+void BotController::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
 {
     m_vTargetPos = vPos;
-    m_Path.FindPath(origin, m_vTargetPos, this, 0, vLeashHome, fLeashRadius * fLeashRadius);
+    m_Path.FindPath(controlledEnt->origin, m_vTargetPos, controlledEnt, 0, vLeashHome, fLeashRadius * fLeashRadius);
 
     NewMove();
 
@@ -708,7 +750,7 @@ Move to the nearest attractive point with a minimum priority
 Returns true if no attractive point was found
 ====================
 */
-bool PlayerBot::MoveToBestAttractivePoint(int iMinPriority)
+bool BotController::MoveToBestAttractivePoint(int iMinPriority)
 {
     Container<AttractiveNode *> list;
     AttractiveNode             *bestNode;
@@ -768,11 +810,11 @@ bool PlayerBot::MoveToBestAttractivePoint(int iMinPriority)
             continue;
         }
 
-        if (!node->CheckTeam(this)) {
+        if (!node->CheckTeam(controlledEnt)) {
             continue;
         }
 
-        distSquared = VectorLengthSquared(origin - node->origin);
+        distSquared = VectorLengthSquared(controlledEnt->origin - node->origin);
 
         if (node->m_fMaxDistanceSquared >= 0 && distSquared > node->m_fMaxDistanceSquared) {
             continue;
@@ -807,9 +849,9 @@ CanMoveTo
 Returns true if the bot has done moving
 ====================
 */
-bool PlayerBot::CanMoveTo(Vector vPos)
+bool BotController::CanMoveTo(Vector vPos)
 {
-    return m_Path.DoesTheoreticPathExist(origin, vPos, NULL, 0, NULL, 0);
+    return m_Path.DoesTheoreticPathExist(controlledEnt->origin, vPos, NULL, 0, NULL, 0);
 }
 
 /*
@@ -819,9 +861,9 @@ MoveDone
 Returns true if the bot has done moving
 ====================
 */
-bool PlayerBot::MoveDone(void)
+bool BotController::MoveDone(void)
 {
-    PathInfo* next;
+    PathInfo *next;
 
     if (!m_bPathing) {
         return true;
@@ -835,8 +877,8 @@ bool PlayerBot::MoveDone(void)
         return true;
     }
 
-    Vector delta = Vector(m_Path.CurrentPathGoal()) - origin;
-    if (delta.lengthXYSquared() < Square(16) && delta.z < maxs.z) {
+    Vector delta = Vector(m_Path.CurrentPathGoal()) - controlledEnt->origin;
+    if (delta.lengthXYSquared() < Square(16) && delta.z < controlledEnt->maxs.z) {
         return true;
     }
 
@@ -850,7 +892,7 @@ IsMoving
 Returns true if the bot has a current path
 ====================
 */
-bool PlayerBot::IsMoving(void)
+bool BotController::IsMoving(void)
 {
     return m_bPathing;
 }
@@ -862,10 +904,10 @@ ClearMove
 Stop the bot from moving
 ====================
 */
-void PlayerBot::ClearMove(void)
+void BotController::ClearMove(void)
 {
     m_Path.Clear();
-    m_bPathing = false;
+    m_bPathing   = false;
     m_iNumBlocks = 0;
 }
 
@@ -876,9 +918,11 @@ MoveNear
 Move near the specified position within the radius
 ====================
 */
-void PlayerBot::MoveNear(Vector vNear, float fRadius, float *vLeashHome, float fLeashRadius)
+void BotController::MoveNear(Vector vNear, float fRadius, float *vLeashHome, float fLeashRadius)
 {
-    m_Path.FindPathNear(origin, vNear, this, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius);
+    m_Path.FindPathNear(
+        controlledEnt->origin, vNear, controlledEnt, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius
+    );
     NewMove();
 
     if (!m_Path.CurrentNode()) {
@@ -896,25 +940,27 @@ AvoidPath
 Avoid the specified position within the radius and start from a direction
 ====================
 */
-void PlayerBot::AvoidPath(
+void BotController::AvoidPath(
     Vector vAvoid, float fAvoidRadius, Vector vPreferredDir, float *vLeashHome, float fLeashRadius
 )
 {
     Vector vDir;
 
     if (vPreferredDir == vec_zero) {
-        vDir = origin - vAvoid;
+        vDir = controlledEnt->origin - vAvoid;
         VectorNormalizeFast(vDir);
     } else {
         vDir = vPreferredDir;
     }
 
-    m_Path.FindPathAway(origin, vAvoid, vDir, this, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius);
+    m_Path.FindPathAway(
+        controlledEnt->origin, vAvoid, vDir, controlledEnt, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius
+    );
     NewMove();
 
     if (!m_Path.CurrentNode()) {
         // Random movements
-        m_vTargetPos = origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+        m_vTargetPos   = controlledEnt->origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
         m_vCurrentGoal = m_vTargetPos;
         return;
     }
@@ -929,10 +975,10 @@ NoticeEvent
 Warn the bot of an event
 ====================
 */
-void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared)
+void BotController::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared)
 {
-    Sentient* pSentOwner;
-    float fRangeFactor;
+    Sentient *pSentOwner;
+    float     fRangeFactor;
 
     fRangeFactor = 1.0 - (fDistanceSquared / fRadiusSquared);
 
@@ -941,22 +987,22 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
     }
 
     if (pEnt->IsSubclassOfSentient()) {
-        pSentOwner = static_cast<Sentient*>(pEnt);
+        pSentOwner = static_cast<Sentient *>(pEnt);
     } else if (pEnt->IsSubclassOfVehicleTurretGun()) {
-        VehicleTurretGun* pVTG = static_cast<VehicleTurretGun*>(pEnt);
-        pSentOwner = pVTG->GetSentientOwner();
+        VehicleTurretGun *pVTG = static_cast<VehicleTurretGun *>(pEnt);
+        pSentOwner             = pVTG->GetSentientOwner();
     } else if (pEnt->IsSubclassOfItem()) {
-        Item* pItem = static_cast<Item*>(pEnt);
-        pSentOwner = pItem->GetOwner();
+        Item *pItem = static_cast<Item *>(pEnt);
+        pSentOwner  = pItem->GetOwner();
     } else if (pEnt->IsSubclassOfProjectile()) {
-        Projectile* pProj = static_cast<Projectile*>(pEnt);
-        pSentOwner = pProj->GetOwner();
+        Projectile *pProj = static_cast<Projectile *>(pEnt);
+        pSentOwner        = pProj->GetOwner();
     } else {
         pSentOwner = NULL;
     }
 
     if (pSentOwner) {
-        if (pSentOwner == this) {
+        if (pSentOwner == controlledEnt) {
             // Ignore self
             return;
         }
@@ -967,9 +1013,9 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
 
         // Ignore teammates
         if (pSentOwner->IsSubclassOfPlayer()) {
-            Player* p = static_cast<Player*>(pSentOwner);
+            Player *p = static_cast<Player *>(pSentOwner);
 
-            if (g_gametype->integer >= GT_TEAM && p->GetTeam() == GetTeam()) {
+            if (g_gametype->integer >= GT_TEAM && p->GetTeam() == controlledEnt->GetTeam()) {
                 return;
             }
         }
@@ -989,8 +1035,8 @@ void PlayerBot::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanc
     case AI_EVENT_FOOTSTEP:
     case AI_EVENT_GRENADE:
     default:
-        m_iCuriousTime    = level.inttime + 20000;
-        m_vNewCuriousPos  = vPos;
+        m_iCuriousTime   = level.inttime + 20000;
+        m_vNewCuriousPos = vPos;
         break;
     }
 }
@@ -1002,7 +1048,7 @@ ClearEnemy
 Clear the bot's enemy
 ====================
 */
-void PlayerBot::ClearEnemy(void)
+void BotController::ClearEnemy(void)
 {
     m_iAttackTime   = 0;
     m_pEnemy        = NULL;
@@ -1024,7 +1070,7 @@ ____________________
 ====================
 */
 
-void PlayerBot::CheckStates(void)
+void BotController::CheckStates(void)
 {
     m_StateCount = 0;
 
@@ -1064,7 +1110,7 @@ void PlayerBot::CheckStates(void)
 
     assert(m_StateCount);
     if (!m_StateCount) {
-        gi.DPrintf("*** WARNING *** %s was stuck with no states !!!", client->pers.netname);
+        gi.DPrintf("*** WARNING *** %s was stuck with no states !!!", controlledEnt->client->pers.netname);
         State_Reset();
     }
 }
@@ -1076,14 +1122,14 @@ Default state
 
 ====================
 */
-void PlayerBot::State_DefaultBegin(void)
+void BotController::State_DefaultBegin(void)
 {
     ClearMove();
 }
 
-void PlayerBot::State_DefaultEnd(void) {}
+void BotController::State_DefaultEnd(void) {}
 
-void PlayerBot::State_Reset(void)
+void BotController::State_Reset(void)
 {
     m_iCuriousTime    = 0;
     m_iAttackTime     = 0;
@@ -1101,13 +1147,13 @@ Idle state
 Make the bot move to random directions
 ====================
 */
-void PlayerBot::InitState_Idle(botfunc_t *func)
+void BotController::InitState_Idle(botfunc_t *func)
 {
-    func->CheckCondition = &PlayerBot::CheckCondition_Idle;
-    func->ThinkState     = &PlayerBot::State_Idle;
+    func->CheckCondition = &BotController::CheckCondition_Idle;
+    func->ThinkState     = &BotController::State_Idle;
 }
 
-bool PlayerBot::CheckCondition_Idle(void)
+bool BotController::CheckCondition_Idle(void)
 {
     if (m_iCuriousTime) {
         return false;
@@ -1120,7 +1166,7 @@ bool PlayerBot::CheckCondition_Idle(void)
     return true;
 }
 
-void PlayerBot::State_Idle(void)
+void BotController::State_Idle(void)
 {
     AimAtAimNode();
     CheckReload();
@@ -1134,10 +1180,10 @@ void PlayerBot::State_Idle(void)
             }
         } else {
             Vector randomDir(G_CRandom(16), G_CRandom(16), G_CRandom(16));
-            Vector preferredDir = Vector(orientation[0]) * (rand() % 5 ? 1024 : -1024);
-            float radius = 512 + G_Random(2048);
+            Vector preferredDir = Vector(controlledEnt->orientation[0]) * (rand() % 5 ? 1024 : -1024);
+            float  radius       = 512 + G_Random(2048);
 
-            AvoidPath(origin + randomDir, radius, preferredDir);
+            AvoidPath(controlledEnt->origin + randomDir, radius, preferredDir);
         }
     }
 }
@@ -1149,13 +1195,13 @@ Curious state
 Forward to the last event position
 ====================
 */
-void PlayerBot::InitState_Curious(botfunc_t *func)
+void BotController::InitState_Curious(botfunc_t *func)
 {
-    func->CheckCondition = &PlayerBot::CheckCondition_Curious;
-    func->ThinkState     = &PlayerBot::State_Curious;
+    func->CheckCondition = &BotController::CheckCondition_Curious;
+    func->ThinkState     = &BotController::State_Curious;
 }
 
-bool PlayerBot::CheckCondition_Curious(void)
+bool BotController::CheckCondition_Curious(void)
 {
     if (m_iAttackTime) {
         m_iCuriousTime = 0;
@@ -1174,7 +1220,7 @@ bool PlayerBot::CheckCondition_Curious(void)
     return true;
 }
 
-void PlayerBot::State_Curious(void)
+void BotController::State_Curious(void)
 {
     AimAtAimNode();
 
@@ -1195,11 +1241,11 @@ Attack state
 Attack the enemy
 ====================
 */
-void PlayerBot::InitState_Attack(botfunc_t *func)
+void BotController::InitState_Attack(botfunc_t *func)
 {
-    func->CheckCondition = &PlayerBot::CheckCondition_Attack;
-    func->EndState       = &PlayerBot::State_EndAttack;
-    func->ThinkState     = &PlayerBot::State_Attack;
+    func->CheckCondition = &BotController::CheckCondition_Attack;
+    func->EndState       = &BotController::State_EndAttack;
+    func->ThinkState     = &BotController::State_Attack;
 }
 
 static Vector bot_origin;
@@ -1226,8 +1272,9 @@ static int sentients_compare(const void *elem1, const void *elem2)
     }
 }
 
-bool PlayerBot::IsValidEnemy(Sentient* sent) const {
-    if (sent == this) {
+bool BotController::IsValidEnemy(Sentient *sent) const
+{
+    if (sent == controlledEnt) {
         return false;
     }
 
@@ -1247,14 +1294,13 @@ bool PlayerBot::IsValidEnemy(Sentient* sent) const {
     }
 
     if (sent->IsSubclassOfPlayer()) {
-        Player* player = static_cast<Player*>(sent);
+        Player *player = static_cast<Player *>(sent);
 
-        if (g_gametype->integer >= GT_TEAM && player->GetTeam() == GetTeam()) {
+        if (g_gametype->integer >= GT_TEAM && player->GetTeam() == controlledEnt->GetTeam()) {
             return false;
         }
-    }
-    else {
-        if (sent->m_Team == m_Team) {
+    } else {
+        if (sent->m_Team == controlledEnt->m_Team) {
             return false;
         }
     }
@@ -1262,16 +1308,16 @@ bool PlayerBot::IsValidEnemy(Sentient* sent) const {
     return true;
 }
 
-bool PlayerBot::CheckCondition_Attack(void)
+bool BotController::CheckCondition_Attack(void)
 {
-    Container<Sentient *> sents = SentientList;
-    float maxDistance = 0;
+    Container<Sentient *> sents       = SentientList;
+    float                 maxDistance = 0;
 
-    bot_origin = origin;
+    bot_origin = controlledEnt->origin;
     sents.Sort(sentients_compare);
 
     for (int i = 1; i <= sents.NumObjects(); i++) {
-        Sentient *sent   = sents.ObjectAt(i);
+        Sentient *sent = sents.ObjectAt(i);
 
         if (!IsValidEnemy(sent)) {
             continue;
@@ -1279,7 +1325,7 @@ bool PlayerBot::CheckCondition_Attack(void)
 
         maxDistance = Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828);
 
-        if (CanSee(sent, 80, maxDistance, false)) {
+        if (controlledEnt->CanSee(sent, 80, maxDistance, false)) {
             m_pEnemy      = sent;
             m_iAttackTime = level.inttime + 1000;
             return true;
@@ -1298,27 +1344,29 @@ bool PlayerBot::CheckCondition_Attack(void)
     return true;
 }
 
-void PlayerBot::State_EndAttack(void)
+void BotController::State_EndAttack(void)
 {
     m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
 }
 
-void PlayerBot::State_Attack(void)
+void BotController::State_Attack(void)
 {
     bool    bMelee              = false;
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
-    Weapon* pWeap = GetActiveWeapon(WEAPON_MAIN);
-    bool    bNoMove = false;
+    Weapon *pWeap               = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
+    bool    bNoMove             = false;
 
     if (!m_pEnemy || !IsValidEnemy(m_pEnemy)) {
         // Ignore dead enemies
         m_iAttackTime = 0;
         return;
     }
-    float fDistanceSquared = (m_pEnemy->origin - origin).lengthSquared();
+    float fDistanceSquared = (m_pEnemy->origin - controlledEnt->origin).lengthSquared();
 
-    if (CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false)) {
+    if (controlledEnt->CanSee(
+            m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false
+        )) {
         if (!pWeap) {
             return;
         }
@@ -1331,11 +1379,11 @@ void PlayerBot::State_Attack(void)
         //
         // check the fire movement speed if the weapon has a max fire movement
         //
-        if (pWeap->m_fMaxFireMovement < 1 && pWeap->HasAmmoInClip(FIRE_PRIMARY)) {
+        if (pWeap->GetMaxFireMovement() < 1 && pWeap->HasAmmoInClip(FIRE_PRIMARY)) {
             float length;
 
-            length = velocity.length();
-            if ((length / sv_runspeed->value) > (pWeap->m_fMaxFireMovement * pWeap->m_fMovementSpeed)) {
+            length = controlledEnt->velocity.length();
+            if ((length / sv_runspeed->value) > (pWeap->GetMaxFireMovement() * pWeap->GetMovementSpeed())) {
                 bNoMove = true;
                 ClearMove();
             }
@@ -1349,7 +1397,7 @@ void PlayerBot::State_Attack(void)
 
         fMinDistanceSquared = fMinDistance * fMinDistance;
 
-        if (client->ps.stats[STAT_AMMO] > 0 || client->ps.stats[STAT_CLIPAMMO] > 0) {
+        if (controlledEnt->client->ps.stats[STAT_AMMO] > 0 || controlledEnt->client->ps.stats[STAT_CLIPAMMO] > 0) {
             if (fDistanceSquared <= fPrimaryBulletRangeSquared) {
                 if (pWeap->IsSemiAuto()) {
                     m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
@@ -1371,8 +1419,8 @@ void PlayerBot::State_Attack(void)
             m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
         }
 
-        m_iAttackTime = level.inttime + 1000;
-        m_vOldEnemyPos = m_vLastEnemyPos;
+        m_iAttackTime   = level.inttime + 1000;
+        m_vOldEnemyPos  = m_vLastEnemyPos;
         m_vLastEnemyPos = m_pEnemy->centroid;
     } else {
         m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
@@ -1387,11 +1435,11 @@ void PlayerBot::State_Attack(void)
 
     if ((!MoveToBestAttractivePoint(5) && !IsMoving()) || (m_vOldEnemyPos != m_vLastEnemyPos && !MoveDone())) {
         if (!bMelee) {
-            if ((origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
-                Vector vDir = origin - m_vLastEnemyPos;
+            if ((controlledEnt->origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
+                Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
                 VectorNormalizeFast(vDir);
 
-                AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(orientation[1]) * 512);
+                AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(controlledEnt->orientation[1]) * 512);
             } else {
                 MoveNear(m_vLastEnemyPos, fMinDistance);
             }
@@ -1412,19 +1460,19 @@ Grenade state
 Avoid any grenades
 ====================
 */
-void PlayerBot::InitState_Grenade(botfunc_t *func)
+void BotController::InitState_Grenade(botfunc_t *func)
 {
-    func->CheckCondition = &PlayerBot::CheckCondition_Grenade;
-    func->ThinkState     = &PlayerBot::State_Grenade;
+    func->CheckCondition = &BotController::CheckCondition_Grenade;
+    func->ThinkState     = &BotController::State_Grenade;
 }
 
-bool PlayerBot::CheckCondition_Grenade(void)
+bool BotController::CheckCondition_Grenade(void)
 {
     // FIXME: TODO
     return false;
 }
 
-void PlayerBot::State_Grenade(void)
+void BotController::State_Grenade(void)
 {
     // FIXME: TODO
 }
@@ -1436,20 +1484,21 @@ Weapon state
 Change weapon when necessary
 ====================
 */
-void PlayerBot::InitState_Weapon(botfunc_t *func)
+void BotController::InitState_Weapon(botfunc_t *func)
 {
-    func->CheckCondition = &PlayerBot::CheckCondition_Weapon;
-    func->BeginState     = &PlayerBot::State_BeginWeapon;
+    func->CheckCondition = &BotController::CheckCondition_Weapon;
+    func->BeginState     = &BotController::State_BeginWeapon;
 }
 
-bool PlayerBot::CheckCondition_Weapon(void)
+bool BotController::CheckCondition_Weapon(void)
 {
-    return GetActiveWeapon(WEAPON_MAIN) != BestWeapon(NULL, false, WEAPON_CLASS_THROWABLE);
+    return controlledEnt->GetActiveWeapon(WEAPON_MAIN)
+        != controlledEnt->BestWeapon(NULL, false, WEAPON_CLASS_THROWABLE);
 }
 
-void PlayerBot::State_BeginWeapon(void)
+void BotController::State_BeginWeapon(void)
 {
-    Weapon *weap = BestWeapon(NULL, false, WEAPON_CLASS_THROWABLE);
+    Weapon *weap = controlledEnt->BestWeapon(NULL, false, WEAPON_CLASS_THROWABLE);
 
     if (weap == NULL) {
         SendCommand("safeholster 1");
@@ -1459,20 +1508,38 @@ void PlayerBot::State_BeginWeapon(void)
     SendCommand(va("use \"%s\"", weap->model.c_str()));
 }
 
-void PlayerBot::Spawned(void)
+void BotController::Spawned(void)
 {
     ClearEnemy();
-    m_iCuriousTime = 0;
+    m_iCuriousTime   = 0;
     m_botCmd.buttons = 0;
-
-    Player::Spawned();
 }
 
-void PlayerBot::Killed(Event *ev)
+void BotController::Think()
 {
-    Entity* attacker;
+    usercmd_t  ucmd;
+    usereyes_t eyeinfo;
 
-    Player::Killed(ev);
+    UpdateBotStates();
+    GetUsercmd(&ucmd);
+    GetEyeInfo(&eyeinfo);
+
+    G_ClientThink(controlledEnt->edict, &ucmd, &eyeinfo);
+
+    if (m_vCurrentOrigin != controlledEnt->origin) {
+        m_pPrimaryAttract = NULL;
+        m_vCurrentOrigin  = controlledEnt->origin;
+
+        if (m_Path.CurrentNode()) {
+            // recalculate paths because of a new origin
+            m_Path.ReFindPath(controlledEnt->origin, controlledEnt);
+        }
+    }
+}
+
+void BotController::Killed(Event *ev)
+{
+    Entity *attacker;
 
     // send the respawn buttons
     if (!(m_botCmd.buttons & BUTTON_ATTACKLEFT)) {
@@ -1500,13 +1567,11 @@ void PlayerBot::Killed(Event *ev)
     Event event(EV_Player_PrimaryDMWeapon);
     event.AddString("auto");
 
-    ProcessEvent(event);
+    controlledEnt->ProcessEvent(event);
 }
 
-void PlayerBot::GotKill(Event *ev)
+void BotController::GotKill(Event *ev)
 {
-    Player::GotKill(ev);
-
     ClearEnemy();
     m_iCuriousTime = 0;
 
@@ -1524,13 +1589,92 @@ void PlayerBot::GotKill(Event *ev)
             event.AddString("*4" + str(1 + (rand() % 9)));
         }
 
-        ProcessEvent(event);
+        controlledEnt->ProcessEvent(event);
 
         m_iNextTauntTime = level.inttime + 5000;
     }
 }
 
-void PlayerBot::EventStuffText(Event *ev)
+void BotController::EventStuffText(Event *ev)
 {
     SendCommand(ev->GetString(1));
 }
+
+void BotController::setControlledEntity(Player *player)
+{
+    controlledEnt = player;
+}
+
+Player *BotController::getControlledEntity() const
+{
+    return controlledEnt;
+}
+
+BotController *BotControllerManager::createController(Player *player)
+{
+    BotController *controller = new BotController();
+    controller->setControlledEntity(player);
+
+    controllers.AddObject(controller);
+
+    return controller;
+}
+
+void BotControllerManager::removeController(BotController *controller)
+{
+    controllers.RemoveObject(controller);
+    delete controller;
+}
+
+BotController *BotControllerManager::findController(Entity *ent)
+{
+    int i;
+
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        BotController *controller = controllers.ObjectAt(i);
+        if (controller->getControlledEntity() == ent) {
+            return controller;
+        }
+    }
+
+    return nullptr;
+}
+
+const Container<BotController *>& BotControllerManager::getControllers() const
+{
+    return controllers;
+}
+
+BotControllerManager::~BotControllerManager()
+{
+    Cleanup();
+}
+
+void BotControllerManager::Init()
+{
+    BotController::Init();
+}
+
+void BotControllerManager::Cleanup()
+{
+    int i;
+
+    BotController::Init();
+
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        BotController *controller = controllers.ObjectAt(i);
+        delete controller;
+    }
+
+    controllers.FreeObjectList();
+}
+
+void BotControllerManager::ThinkControllers()
+{
+    int i;
+
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        BotController *controller = controllers.ObjectAt(i);
+        controller->Think();
+    }
+}
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index c89ba06c..6b6c2261 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -34,19 +34,42 @@ typedef struct nodeAttract_s {
     AttractiveNodePtr m_pNode;
 } nodeAttract_t;
 
+class BotController;
+
 class PlayerBot : public Player
 {
+public:
+    CLASS_PROTOTYPE(PlayerBot);
+
+public:
+    PlayerBot();
+
+    void setController(BotController *controlledBy);
+
+    void Spawned(void);
+
+    void Killed(Event *ev);
+    void GotKill(Event *ev);
+
+private:
+    BotController *controller;
+};
+
+class BotController : public Listener
+{
+public:
     struct botfunc_t {
-        bool (PlayerBot::*CheckCondition)(void);
-        void (PlayerBot::*BeginState)(void);
-        void (PlayerBot::*EndState)(void);
-        void (PlayerBot::*ThinkState)(void);
+        bool (BotController::*CheckCondition)(void);
+        void (BotController::*BeginState)(void);
+        void (BotController::*EndState)(void);
+        void (BotController::*ThinkState)(void);
     };
 
 private:
     static botfunc_t botfuncs[];
 
     // Paths
+    Vector                     m_vCurrentOrigin;
     ActorPath                  m_Path;
     Vector                     m_vTargetPos;
     Vector                     m_vCurrentGoal;
@@ -138,9 +161,9 @@ private:
     void CheckStates(void);
 
 public:
-    CLASS_PROTOTYPE(PlayerBot);
+    CLASS_PROTOTYPE(BotController);
 
-    PlayerBot();
+    BotController();
 
     static void Init(void);
 
@@ -175,15 +198,61 @@ public:
 
     void SendCommand(const char *text);
 
-    void setAngles(Vector angles) override;
-    void updateOrigin(void) override;
+    void Think();
 
-    void Spawned(void) override;
+    void Spawned(void);
 
-    void Killed(Event *ev) override;
+    void Killed(Event *ev);
     void GotKill(Event *ev);
     void EventStuffText(Event *ev);
 
 private:
     void NewMove();
+
+public:
+    void    setControlledEntity(Player *player);
+    Player *getControlledEntity() const;
+
+private:
+    SafePtr<Player> controlledEnt;
 };
+
+class BotControllerManager : public Listener
+{
+public:
+    CLASS_PROTOTYPE(BotControllerManager);
+
+public:
+    ~BotControllerManager();
+
+    BotController                    *createController(Player *player);
+    void                              removeController(BotController *controller);
+    BotController                    *findController(Entity *ent);
+    const Container<BotController *>& getControllers() const;
+
+    void Init();
+    void Cleanup();
+    void ThinkControllers();
+
+private:
+    Container<BotController *> controllers;
+};
+
+class BotManager : public Listener
+{
+public:
+    CLASS_PROTOTYPE(BotManager);
+
+public:
+    BotControllerManager& getControllerManager();
+
+    void Init();
+    void Cleanup();
+    void Frame();
+    void BroadcastEvent(Entity *originator, Vector origin, int iType, float radius);
+
+private:
+    BotControllerManager botControllerManager;
+};
+
+extern BotManager botManager;
diff --git a/code/fgame/playerbot_master.cpp b/code/fgame/playerbot_master.cpp
new file mode 100644
index 00000000..d4cdcd4e
--- /dev/null
+++ b/code/fgame/playerbot_master.cpp
@@ -0,0 +1,114 @@
+#include "playerbot.h"
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_master.cpp: Multiplayer bot system.
+
+#include "g_local.h"
+#include "actor.h"
+#include "playerbot.h"
+#include "consoleevent.h"
+#include "debuglines.h"
+#include "scriptexception.h"
+#include "vehicleturret.h"
+#include "weaputils.h"
+
+BotManager botManager;
+
+CLASS_DECLARATION(Listener, BotControllerManager, NULL) {
+    {NULL, NULL}
+};
+
+CLASS_DECLARATION(Listener, BotManager, NULL) {
+    {NULL, NULL}
+};
+
+void BotManager::Init()
+{
+    botControllerManager.Init();
+}
+
+void BotManager::Cleanup()
+{
+    botControllerManager.Cleanup();
+}
+
+void BotManager::Frame()
+{
+    botControllerManager.ThinkControllers();
+}
+
+void BotManager::BroadcastEvent(Entity *originator, Vector origin, int iType, float radius)
+{
+    Sentient      *ent;
+    Actor         *act;
+    Vector         delta;
+    str            name;
+    float          r2;
+    float          dist2;
+    int            i;
+    int            iNumSentients;
+    int            iAreaNum;
+    BotController *controller;
+
+    if (radius <= 0.0f) {
+        radius = G_AIEventRadius(iType);
+    }
+
+    assert(originator);
+
+    r2 = Square(radius);
+
+    const Container<BotController *>& controllers = getControllerManager().getControllers();
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        controller = controllers.ObjectAt(i);
+        ent        = controller->getControlledEntity();
+        if (!ent || ent == originator || ent->deadflag) {
+            continue;
+        }
+
+        delta = origin - ent->centroid;
+
+        // dot product returns length squared
+        dist2 = Square(delta);
+
+        if (originator) {
+            iAreaNum = originator->edict->r.areanum;
+        } else {
+            iAreaNum = gi.AreaForPoint(origin);
+        }
+
+        if (dist2 > r2) {
+            continue;
+        }
+
+        if (iAreaNum != ent->edict->r.areanum && !gi.AreasConnected(iAreaNum, ent->edict->r.areanum)) {
+            continue;
+        }
+
+        controller->NoticeEvent(origin, iType, originator, dist2, r2);
+    }
+}
+
+BotControllerManager& BotManager::getControllerManager()
+{
+    return botControllerManager;
+}

From a425038fa6ef2d715828ee17fee7b2cf20215905 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 9 Oct 2024 19:24:34 +0200
Subject: [PATCH 1129/2040] Set macOS rpath to @executable_path

---
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d0274e5..5d8e1163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,13 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug)
 	#endif()
 ENDIF()
 
+if(APPLE)
+	# macOS doesn't search the executable path by default
+	# so, locate libraries like SDL in the executable path
+	set(CMAKE_INSTALL_RPATH "@executable_path")
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+endif()
+
 # Common stuff
 
 add_subdirectory("code/qcommon")

From f27be7314e9cec61bb2ebfb08848dbcef075f789 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 9 Oct 2024 20:46:39 +0200
Subject: [PATCH 1130/2040] Add a BotMovement class for managing bot movements

---
 code/fgame/gamecmds.cpp           |   6 +-
 code/fgame/playerbot.cpp          | 679 +++---------------------------
 code/fgame/playerbot.h            |  98 +++--
 code/fgame/playerbot_movement.cpp | 606 ++++++++++++++++++++++++++
 4 files changed, 729 insertions(+), 660 deletions(-)
 create mode 100644 code/fgame/playerbot_movement.cpp

diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index 63989d97..69f94876 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -695,7 +695,7 @@ qboolean G_BotCommand(gentity_t *ent)
     command = gi.Argv(1);
 
     if (!Q_stricmp(command, "movehere")) {
-        bot->MoveTo(ent->entity->origin);
+        bot->GetMovement().MoveTo(ent->entity->origin);
     } else if (!Q_stricmp(command, "moveherenear")) {
         float rad = 256.0f;
 
@@ -703,7 +703,7 @@ qboolean G_BotCommand(gentity_t *ent)
             rad = atof(gi.Argv(2));
         }
 
-        bot->MoveNear(ent->entity->origin, rad);
+        bot->GetMovement().MoveNear(ent->entity->origin, rad);
     } else if (!Q_stricmp(command, "avoidhere")) {
         float rad = 256.0f;
 
@@ -711,7 +711,7 @@ qboolean G_BotCommand(gentity_t *ent)
             rad = atof(gi.Argv(2));
         }
 
-        bot->AvoidPath(ent->entity->origin, rad);
+        bot->GetMovement().AvoidPath(ent->entity->origin, rad);
     } else if (!Q_stricmp(command, "telehere")) {
         bot->getControlledEntity()->setOrigin(ent->s.origin);
     }
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index b613e130..25d6c74f 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -86,11 +86,6 @@ BotController::BotController()
         return;
     }
 
-    m_Path.SetFallHeight(400);
-    m_bPathing   = false;
-    m_bTempAway  = false;
-    m_bDeltaMove = true;
-
     m_botCmd.serverTime = 0;
     m_botCmd.msec       = 0;
     m_botCmd.buttons    = 0;
@@ -111,9 +106,6 @@ BotController::BotController()
     m_vAngSpeed      = vec_zero;
     m_vTargetAng     = vec_zero;
     m_vCurrentAng    = vec_zero;
-    m_iCheckPathTime = 0;
-    m_iTempAwayTime  = 0;
-    m_iNumBlocks     = 0;
     m_fYawSpeedMult  = 1.0f;
 
     m_iCuriousTime = 0;
@@ -125,6 +117,11 @@ BotController::BotController()
     m_RunLabel.TrySetScript("global/bot_run.scr");
 }
 
+BotMovement& BotController::GetMovement()
+{
+    return movement;
+}
+
 void BotController::Init(void)
 {
     bot_manualmove = gi.Cvar_Get("bot_manualmove", "0", 0);
@@ -204,319 +201,6 @@ void BotController::TurnThink(void)
     m_botCmd.angles[2]  = ANGLE2SHORT(m_vCurrentAng[2]) - controlledEnt->client->ps.delta_angles[2];
 }
 
-void BotController::CheckAttractiveNodes(void)
-{
-    for (int i = m_attractList.NumObjects(); i > 0; i--) {
-        nodeAttract_t *a = m_attractList.ObjectAt(i);
-
-        if (a->m_pNode == NULL || !a->m_pNode->CheckTeam(controlledEnt) || level.time > a->m_fRespawnTime) {
-            delete a;
-            m_attractList.RemoveObjectAt(i);
-        }
-    }
-}
-
-void BotController::MoveThink(void)
-{
-    Vector vDir;
-    Vector vAngles;
-    Vector vWishDir;
-
-    m_botCmd.forwardmove = 0;
-    m_botCmd.rightmove   = 0;
-
-    CheckAttractiveNodes();
-
-    if (!IsMoving()) {
-        return;
-    }
-
-    if (m_bTempAway && level.inttime >= m_iTempAwayTime) {
-        m_bTempAway = false;
-        m_Path.FindPath(controlledEnt->origin, m_vTargetPos, controlledEnt, 0, NULL, 0);
-    }
-
-    if (!m_bTempAway) {
-        if (m_Path.CurrentNode()) {
-            m_Path.UpdatePos(controlledEnt->origin, 8);
-
-            m_vCurrentGoal = controlledEnt->origin;
-            VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
-
-            if (MoveDone()) {
-                // Clear the path
-                m_Path.Clear();
-            }
-        }
-    }
-
-    if (ai_debugpath->integer) {
-        G_DebugLine(controlledEnt->centroid, m_vCurrentGoal + Vector(0, 0, 36), 1, 1, 0, 1);
-    }
-
-    // Check if we're blocked
-    if (level.inttime >= m_iCheckPathTime) {
-        m_bDeltaMove = false;
-
-        m_iCheckPathTime = level.inttime + 1000;
-
-        if (m_iNumBlocks >= 5) {
-            // Give up
-            ClearMove();
-        }
-
-        m_bTempAway = false;
-
-        if (controlledEnt->groundentity || controlledEnt->client->ps.walking) {
-            if (controlledEnt->GetMoveResult() >= MOVERESULT_BLOCKED
-                || controlledEnt->velocity.lengthSquared() <= Square(8)) {
-                m_bTempAway = true;
-            } else if ((controlledEnt->origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32)
-                       && (controlledEnt->origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
-                m_bTempAway = true;
-            }
-        } else {
-            // falling
-            if (controlledEnt->GetMoveResult() >= MOVERESULT_BLOCKED) {
-                // stuck while falling
-                m_bTempAway = true;
-            }
-        }
-
-        if (m_bTempAway) {
-            m_bTempAway     = true;
-            m_bDeltaMove    = false;
-            m_iTempAwayTime = level.inttime + 750;
-            m_iNumBlocks++;
-
-            // Try to backward a little
-            m_Path.Clear();
-            m_Path.ForceShortLookahead();
-            m_vCurrentGoal = controlledEnt->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
-        } else {
-            m_iNumBlocks = 0;
-
-            if (!m_Path.CurrentNode()) {
-                m_vTargetPos   = controlledEnt->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
-                m_vCurrentGoal = m_vTargetPos;
-            }
-        }
-
-        m_vLastCheckPos[1] = m_vLastCheckPos[0];
-        m_vLastCheckPos[0] = controlledEnt->origin;
-    }
-
-    if (ai_debugpath->integer) {
-        PathInfo *pos = m_Path.CurrentNode();
-
-        if (pos != NULL) {
-            while (pos != m_Path.LastNode()) {
-                Vector vStart = pos->point + Vector(0, 0, 32);
-
-                pos--;
-
-                Vector vEnd = pos->point + Vector(0, 0, 32);
-
-                G_DebugLine(vStart, vEnd, 1, 0, 0, 1);
-            }
-        }
-    }
-
-    if (m_Path.CurrentNode()) {
-        if ((m_vTargetPos - controlledEnt->origin).lengthSquared() <= Square(16)) {
-            ClearMove();
-        }
-    } else {
-        if ((m_vTargetPos - controlledEnt->origin).lengthXYSquared() <= Square(16)) {
-            ClearMove();
-        }
-    }
-
-    // Rotate the dir
-    if (m_Path.CurrentNode()) {
-        vDir[0] = m_Path.CurrentDelta()[0];
-        vDir[1] = m_Path.CurrentDelta()[1];
-    } else {
-        vDir = m_vCurrentGoal - controlledEnt->origin;
-    }
-    vDir[2] = 0;
-
-    VectorNormalize2D(vDir);
-    vAngles = vDir.toAngles() - controlledEnt->angles;
-    vAngles.AngleVectorsLeft(&vWishDir);
-
-    m_vLastValidDir  = vDir;
-    m_vLastValidGoal = m_vCurrentGoal;
-
-    // Forward to the specified direction
-    float x = vWishDir.x * 127;
-    float y = -vWishDir.y * 127;
-
-    m_botCmd.forwardmove = (signed char)Q_clamp(x, -127, 127);
-    m_botCmd.rightmove   = (signed char)Q_clamp(y, -127, 127);
-    CheckJump();
-
-    Weapon *pWeap = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
-
-    if (pWeap && !pWeap->ShouldReload()) {
-        m_RunLabel.Execute(this);
-    }
-}
-
-void BotController::CheckJump(void)
-{
-    Vector  start;
-    Vector  end;
-    Vector  dir;
-    trace_t trace;
-
-    if (controlledEnt->GetLadder()) {
-        if (!m_botCmd.upmove) {
-            m_botCmd.upmove = 127;
-        } else {
-            m_botCmd.upmove = 0;
-        }
-        return;
-    }
-
-    dir = m_vLastValidDir;
-
-    start = controlledEnt->origin + Vector(0, 0, STEPSIZE);
-    end   = controlledEnt->origin + Vector(0, 0, STEPSIZE) + dir * (controlledEnt->maxs.y - controlledEnt->mins.y);
-
-    if (ai_debugpath->integer) {
-        G_DebugLine(start, end, 1, 0, 1, 1);
-    }
-
-    // Check if the bot needs to jump
-    trace = G_Trace(
-        start,
-        controlledEnt->mins,
-        controlledEnt->maxs,
-        end,
-        controlledEnt,
-        MASK_PLAYERSOLID,
-        false,
-        "BotController::CheckJump"
-    );
-
-    // No need to jump
-    if (trace.fraction > 0.5f) {
-        m_botCmd.upmove = 0;
-        return;
-    }
-
-    start = controlledEnt->origin;
-    end   = controlledEnt->origin + Vector(0, 0, STEPSIZE * 3);
-
-    if (ai_debugpath->integer) {
-        G_DebugLine(start, end, 1, 0, 1, 1);
-    }
-
-    // Check if the bot can jump up
-    trace = G_Trace(
-        start,
-        controlledEnt->mins,
-        controlledEnt->maxs,
-        end,
-        controlledEnt,
-        MASK_PLAYERSOLID,
-        true,
-        "BotController::CheckJump"
-    );
-
-    start = trace.endpos;
-    end   = trace.endpos + dir * (controlledEnt->maxs.y - controlledEnt->mins.y);
-
-    if (ai_debugpath->integer) {
-        G_DebugLine(start, end, 1, 0, 1, 1);
-    }
-
-    Vector bounds[2];
-    bounds[0] = Vector(controlledEnt->mins[0], controlledEnt->mins[1], 0);
-    bounds[1] =
-        Vector(controlledEnt->maxs[0], controlledEnt->maxs[1], (controlledEnt->maxs[0] + controlledEnt->maxs[1]) * 0.5);
-
-    // Check if the bot can jump at the location
-    trace =
-        G_Trace(start, bounds[0], bounds[1], end, controlledEnt, MASK_PLAYERSOLID, false, "BotController::CheckJump");
-
-    if (trace.fraction < 1) {
-        m_botCmd.upmove = 0;
-        return;
-    }
-
-    // Make the bot climb walls
-    if (!m_botCmd.upmove) {
-        m_botCmd.upmove = 127;
-    } else {
-        m_botCmd.upmove = 0;
-    }
-}
-
-void BotController::CheckEndPos(void)
-{
-    Vector  start;
-    Vector  end;
-    trace_t trace;
-
-    if (!m_Path.LastNode()) {
-        return;
-    }
-
-    start = m_Path.LastNode()->point;
-    end   = m_vTargetPos;
-
-    trace = G_Trace(
-        start,
-        controlledEnt->mins,
-        controlledEnt->maxs,
-        end,
-        controlledEnt,
-        MASK_TARGETPATH,
-        true,
-        "BotController::CheckEndPos"
-    );
-
-    if (trace.fraction < 0.95f) {
-        m_vTargetPos = trace.endpos;
-    }
-}
-
-void BotController::CheckUse(void)
-{
-    Vector  dir;
-    Vector  start;
-    Vector  end;
-    trace_t trace;
-
-    controlledEnt->angles.AngleVectorsLeft(&dir);
-
-    start = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight);
-    end   = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight) + dir * 32;
-
-    trace = G_Trace(start, vec_zero, vec_zero, end, controlledEnt, MASK_USABLE, false, "BotController::CheckUse");
-
-    // It may be a door
-    if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.entityNum) {
-        if (trace.ent->entity->IsSubclassOfDoor()) {
-            Door *door = static_cast<Door *>(trace.ent->entity);
-            if (door->isOpen()) {
-                m_botCmd.buttons &= ~BUTTON_USE;
-                return;
-            }
-        }
-
-        //
-        // Toggle the use button
-        //
-        m_botCmd.buttons ^= BUTTON_USE;
-        m_Path.ForceShortLookahead();
-    } else {
-        m_botCmd.buttons &= ~BUTTON_USE;
-    }
-}
-
 void BotController::GetUsercmd(usercmd_t *ucmd)
 {
     *ucmd = m_botCmd;
@@ -581,11 +265,44 @@ void BotController::UpdateBotStates(void)
 
     CheckStates();
 
-    MoveThink();
+    movement.MoveThink(m_botCmd);
     TurnThink();
     CheckUse();
 }
 
+void BotController::CheckUse(void)
+{
+    Vector  dir;
+    Vector  start;
+    Vector  end;
+    trace_t trace;
+
+    controlledEnt->angles.AngleVectorsLeft(&dir);
+
+    start = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight);
+    end   = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight) + dir * 32;
+
+    trace = G_Trace(start, vec_zero, vec_zero, end, controlledEnt, MASK_USABLE, false, "BotController::CheckUse");
+
+    // It may be a door
+    if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.entityNum) {
+        if (trace.ent->entity->IsSubclassOfDoor()) {
+            Door *door = static_cast<Door *>(trace.ent->entity);
+            if (door->isOpen()) {
+                m_botCmd.buttons &= ~BUTTON_USE;
+                return;
+            }
+        }
+
+        //
+        // Toggle the use button
+        //
+        m_botCmd.buttons ^= BUTTON_USE;
+    } else {
+        m_botCmd.buttons &= ~BUTTON_USE;
+    }
+}
+
 void BotController::SendCommand(const char *text)
 {
     char        *buffer;
@@ -675,16 +392,15 @@ Make the bot face toward the current path
 */
 void BotController::AimAtAimNode(void)
 {
-    if (!m_bPathing) {
+    Vector goal;
+
+    if (!movement.IsMoving()) {
         return;
     }
 
-    if (!m_Path.CurrentNode()) {
-        AimAt(m_vCurrentGoal);
-    } else if (!m_Path.Complete(controlledEnt->origin)) {
-        AimAt(controlledEnt->origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0));
-        //int maxIndex = Q_min(3, m_Path.CurrentNode() - m_Path.LastNode());
-        //AimAt((m_Path.CurrentNode() - maxIndex)->point);
+    goal = movement.GetCurrentGoal();
+    if (goal != controlledEnt->origin) {
+        AimAt(goal);
     }
 
     m_vTargetAng[PITCH] = 0;
@@ -706,268 +422,6 @@ void BotController::CheckReload(void)
     }
 }
 
-/*
-====================
-NewMove
-
-Called when there is a new move
-====================
-*/
-void BotController::NewMove()
-{
-    m_bPathing         = true;
-    m_vLastCheckPos[0] = controlledEnt->origin;
-    m_vLastCheckPos[1] = controlledEnt->origin;
-}
-
-/*
-====================
-MoveTo
-
-Move to the specified position
-====================
-*/
-void BotController::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
-{
-    m_vTargetPos = vPos;
-    m_Path.FindPath(controlledEnt->origin, m_vTargetPos, controlledEnt, 0, vLeashHome, fLeashRadius * fLeashRadius);
-
-    NewMove();
-
-    if (!m_Path.CurrentNode()) {
-        m_bPathing = false;
-        return;
-    }
-
-    CheckEndPos();
-}
-
-/*
-====================
-MoveTo
-
-Move to the nearest attractive point with a minimum priority
-Returns true if no attractive point was found
-====================
-*/
-bool BotController::MoveToBestAttractivePoint(int iMinPriority)
-{
-    Container<AttractiveNode *> list;
-    AttractiveNode             *bestNode;
-    float                       bestDistanceSquared;
-    int                         bestPriority;
-
-    if (m_pPrimaryAttract) {
-        MoveTo(m_pPrimaryAttract->origin);
-
-        if (!IsMoving()) {
-            m_pPrimaryAttract = NULL;
-        } else {
-            if (MoveDone()) {
-                if (!m_fAttractTime) {
-                    m_fAttractTime = level.time + m_pPrimaryAttract->m_fMaxStayTime;
-                }
-                if (level.time > m_fAttractTime) {
-                    nodeAttract_t *a  = new nodeAttract_t;
-                    a->m_fRespawnTime = level.time + m_pPrimaryAttract->m_fRespawnTime;
-                    a->m_pNode        = m_pPrimaryAttract;
-
-                    m_pPrimaryAttract = NULL;
-                }
-            }
-
-            return true;
-        }
-    }
-
-    if (!attractiveNodes.NumObjects()) {
-        return false;
-    }
-
-    bestNode            = NULL;
-    bestDistanceSquared = 99999999.0f;
-    bestPriority        = iMinPriority;
-
-    for (int i = attractiveNodes.NumObjects(); i > 0; i--) {
-        AttractiveNode *node = attractiveNodes.ObjectAt(i);
-        float           distSquared;
-        bool            m_bRespawning = false;
-
-        for (int j = m_attractList.NumObjects(); j > 0; j--) {
-            AttractiveNode *node2 = m_attractList.ObjectAt(j)->m_pNode;
-
-            if (node2 == node) {
-                m_bRespawning = true;
-                break;
-            }
-        }
-
-        if (m_bRespawning) {
-            continue;
-        }
-
-        if (node->m_iPriority < bestPriority) {
-            continue;
-        }
-
-        if (!node->CheckTeam(controlledEnt)) {
-            continue;
-        }
-
-        distSquared = VectorLengthSquared(controlledEnt->origin - node->origin);
-
-        if (node->m_fMaxDistanceSquared >= 0 && distSquared > node->m_fMaxDistanceSquared) {
-            continue;
-        }
-
-        if (!CanMoveTo(node->origin)) {
-            continue;
-        }
-
-        if (distSquared < bestDistanceSquared) {
-            bestDistanceSquared = distSquared;
-            bestNode            = node;
-            bestPriority        = node->m_iPriority;
-        }
-    }
-
-    if (bestNode) {
-        m_pPrimaryAttract = bestNode;
-        m_fAttractTime    = 0;
-        MoveTo(bestNode->origin);
-        return true;
-    } else {
-        // No attractive point found
-        return false;
-    }
-}
-
-/*
-====================
-CanMoveTo
-
-Returns true if the bot has done moving
-====================
-*/
-bool BotController::CanMoveTo(Vector vPos)
-{
-    return m_Path.DoesTheoreticPathExist(controlledEnt->origin, vPos, NULL, 0, NULL, 0);
-}
-
-/*
-====================
-MoveDone
-
-Returns true if the bot has done moving
-====================
-*/
-bool BotController::MoveDone(void)
-{
-    PathInfo *next;
-
-    if (!m_bPathing) {
-        return true;
-    }
-
-    if (m_bTempAway) {
-        return false;
-    }
-
-    if (!m_Path.CurrentNode()) {
-        return true;
-    }
-
-    Vector delta = Vector(m_Path.CurrentPathGoal()) - controlledEnt->origin;
-    if (delta.lengthXYSquared() < Square(16) && delta.z < controlledEnt->maxs.z) {
-        return true;
-    }
-
-    return false;
-}
-
-/*
-====================
-IsMoving
-
-Returns true if the bot has a current path
-====================
-*/
-bool BotController::IsMoving(void)
-{
-    return m_bPathing;
-}
-
-/*
-====================
-ClearMove
-
-Stop the bot from moving
-====================
-*/
-void BotController::ClearMove(void)
-{
-    m_Path.Clear();
-    m_bPathing   = false;
-    m_iNumBlocks = 0;
-}
-
-/*
-====================
-MoveNear
-
-Move near the specified position within the radius
-====================
-*/
-void BotController::MoveNear(Vector vNear, float fRadius, float *vLeashHome, float fLeashRadius)
-{
-    m_Path.FindPathNear(
-        controlledEnt->origin, vNear, controlledEnt, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius
-    );
-    NewMove();
-
-    if (!m_Path.CurrentNode()) {
-        m_bPathing = false;
-        return;
-    }
-
-    m_vTargetPos = m_Path.LastNode()->point;
-}
-
-/*
-====================
-AvoidPath
-
-Avoid the specified position within the radius and start from a direction
-====================
-*/
-void BotController::AvoidPath(
-    Vector vAvoid, float fAvoidRadius, Vector vPreferredDir, float *vLeashHome, float fLeashRadius
-)
-{
-    Vector vDir;
-
-    if (vPreferredDir == vec_zero) {
-        vDir = controlledEnt->origin - vAvoid;
-        VectorNormalizeFast(vDir);
-    } else {
-        vDir = vPreferredDir;
-    }
-
-    m_Path.FindPathAway(
-        controlledEnt->origin, vAvoid, vDir, controlledEnt, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius
-    );
-    NewMove();
-
-    if (!m_Path.CurrentNode()) {
-        // Random movements
-        m_vTargetPos   = controlledEnt->origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
-        m_vCurrentGoal = m_vTargetPos;
-        return;
-    }
-
-    m_vTargetPos = m_Path.LastNode()->point;
-}
-
 /*
 ====================
 NoticeEvent
@@ -1124,7 +578,7 @@ Default state
 */
 void BotController::State_DefaultBegin(void)
 {
-    ClearMove();
+    movement.ClearMove();
 }
 
 void BotController::State_DefaultEnd(void) {}
@@ -1171,11 +625,11 @@ void BotController::State_Idle(void)
     AimAtAimNode();
     CheckReload();
 
-    if (!MoveToBestAttractivePoint() && !IsMoving()) {
+    if (!movement.MoveToBestAttractivePoint() && !movement.IsMoving()) {
         if (m_vLastDeathPos != vec_zero) {
-            MoveTo(m_vLastDeathPos);
+            movement.MoveTo(m_vLastDeathPos);
 
-            if (MoveDone()) {
+            if (movement.MoveDone()) {
                 m_vLastDeathPos = vec_zero;
             }
         } else {
@@ -1183,7 +637,7 @@ void BotController::State_Idle(void)
             Vector preferredDir = Vector(controlledEnt->orientation[0]) * (rand() % 5 ? 1024 : -1024);
             float  radius       = 512 + G_Random(2048);
 
-            AvoidPath(controlledEnt->origin + randomDir, radius, preferredDir);
+            movement.AvoidPath(controlledEnt->origin + randomDir, radius, preferredDir);
         }
     }
 }
@@ -1210,7 +664,7 @@ bool BotController::CheckCondition_Curious(void)
 
     if (level.inttime > m_iCuriousTime) {
         if (m_iCuriousTime) {
-            ClearMove();
+            movement.ClearMove();
             m_iCuriousTime = 0;
         }
 
@@ -1224,12 +678,12 @@ void BotController::State_Curious(void)
 {
     AimAtAimNode();
 
-    if (!MoveToBestAttractivePoint(3) && (!IsMoving() || m_vLastCuriousPos != m_vNewCuriousPos)) {
-        MoveTo(m_vNewCuriousPos);
+    if (!movement.MoveToBestAttractivePoint(3) && (!movement.IsMoving() || m_vLastCuriousPos != m_vNewCuriousPos)) {
+        movement.MoveTo(m_vNewCuriousPos);
         m_vLastCuriousPos = m_vNewCuriousPos;
     }
 
-    if (MoveDone()) {
+    if (movement.MoveDone()) {
         m_iCuriousTime = 0;
     }
 }
@@ -1334,7 +788,7 @@ bool BotController::CheckCondition_Attack(void)
 
     if (level.inttime > m_iAttackTime) {
         if (m_iAttackTime) {
-            ClearMove();
+            movement.ClearMove();
             m_iAttackTime = 0;
         }
 
@@ -1385,7 +839,7 @@ void BotController::State_Attack(void)
             length = controlledEnt->velocity.length();
             if ((length / sv_runspeed->value) > (pWeap->GetMaxFireMovement() * pWeap->GetMovementSpeed())) {
                 bNoMove = true;
-                ClearMove();
+                movement.ClearMove();
             }
         }
 
@@ -1433,22 +887,22 @@ void BotController::State_Attack(void)
         return;
     }
 
-    if ((!MoveToBestAttractivePoint(5) && !IsMoving()) || (m_vOldEnemyPos != m_vLastEnemyPos && !MoveDone())) {
+    if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving()) || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())) {
         if (!bMelee) {
             if ((controlledEnt->origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
                 Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
                 VectorNormalizeFast(vDir);
 
-                AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(controlledEnt->orientation[1]) * 512);
+                movement.AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(controlledEnt->orientation[1]) * 512);
             } else {
-                MoveNear(m_vLastEnemyPos, fMinDistance);
+                movement.MoveNear(m_vLastEnemyPos, fMinDistance);
             }
         } else {
-            MoveTo(m_vLastEnemyPos);
+            movement.MoveTo(m_vLastEnemyPos);
         }
     }
 
-    if (IsMoving()) {
+    if (movement.IsMoving()) {
         m_iAttackTime = level.inttime + 1000;
     }
 }
@@ -1525,16 +979,6 @@ void BotController::Think()
     GetEyeInfo(&eyeinfo);
 
     G_ClientThink(controlledEnt->edict, &ucmd, &eyeinfo);
-
-    if (m_vCurrentOrigin != controlledEnt->origin) {
-        m_pPrimaryAttract = NULL;
-        m_vCurrentOrigin  = controlledEnt->origin;
-
-        if (m_Path.CurrentNode()) {
-            // recalculate paths because of a new origin
-            m_Path.ReFindPath(controlledEnt->origin, controlledEnt);
-        }
-    }
 }
 
 void BotController::Killed(Event *ev)
@@ -1603,6 +1047,7 @@ void BotController::EventStuffText(Event *ev)
 void BotController::setControlledEntity(Player *player)
 {
     controlledEnt = player;
+    movement.SetControlledEntity(player);
 }
 
 Player *BotController::getControlledEntity() const
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 6b6c2261..37481757 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -55,6 +55,62 @@ private:
     BotController *controller;
 };
 
+class BotMovement
+{
+public:
+    BotMovement();
+
+    void SetControlledEntity(Player *newEntity);
+
+    void MoveThink(usercmd_t& botcmd);
+
+    void AvoidPath(
+        Vector vPos,
+        float  fAvoidRadius,
+        Vector vPreferredDir = vec_zero,
+        float *vLeashHome    = NULL,
+        float  fLeashRadius  = 0.0f
+    );
+    void MoveNear(Vector vNear, float fRadius, float *vLeashHome = NULL, float fLeashRadius = 0.0f);
+    void MoveTo(Vector vPos, float *vLeashHome = NULL, float fLeashRadius = 0.0f);
+    bool MoveToBestAttractivePoint(int iMinPriority = 0);
+
+    bool CanMoveTo(Vector vPos);
+    bool MoveDone();
+    bool IsMoving(void);
+    void ClearMove(void);
+
+    Vector GetCurrentGoal() const;
+
+private:
+    void CheckAttractiveNodes();
+    void CheckEndPos(Entity *entity);
+    void CheckJump(usercmd_t& botcmd);
+    void NewMove();
+
+private:
+    SafePtr<Player>            controlledEntity;
+    AttractiveNodePtr          m_pPrimaryAttract;
+    Container<nodeAttract_t *> m_attractList;
+    ActorPath                  m_Path;
+
+    Vector m_vCurrentOrigin;
+    Vector m_vTargetPos;
+    Vector m_vCurrentGoal;
+    Vector m_vLastValidDir;
+    Vector m_vLastValidGoal;
+    Vector m_vLastCheckPos[2];
+    float  m_fAttractTime;
+    int    m_iTempAwayTime;
+    int    m_iNumBlocks;
+    int    m_iCheckPathTime;
+    bool   m_bPathing;
+    bool   m_bTempAway;
+};
+
+class BotRotation
+{};
+
 class BotController : public Listener
 {
 public:
@@ -68,24 +124,7 @@ public:
 private:
     static botfunc_t botfuncs[];
 
-    // Paths
-    Vector                     m_vCurrentOrigin;
-    ActorPath                  m_Path;
-    Vector                     m_vTargetPos;
-    Vector                     m_vCurrentGoal;
-    Vector                     m_vLastValidDir;
-    Vector                     m_vLastValidGoal;
-    bool                       m_bPathing;
-    bool                       m_bTempAway;
-    bool                       m_bAimPath;
-    bool                       m_bDeltaMove;
-    int                        m_iTempAwayTime;
-    int                        m_iNumBlocks;
-    int                        m_iCheckPathTime;
-    Vector                     m_vLastCheckPos[2];
-    AttractiveNodePtr          m_pPrimaryAttract;
-    float                      m_fAttractTime;
-    Container<nodeAttract_t *> m_attractList;
+    BotMovement movement;
 
     // States
     int               m_iCuriousTime;
@@ -116,11 +155,7 @@ private:
     int m_iNextTauntTime;
 
 private:
-    void CheckAttractiveNodes(void);
-    void MoveThink(void);
     void TurnThink(void);
-    void CheckEndPos(void);
-    void CheckJump(void);
     void CheckUse(void);
 
     void State_DefaultBegin(void);
@@ -177,22 +212,6 @@ public:
     void AimAt(Vector vPos);
     void AimAtAimNode(void);
 
-    void AvoidPath(
-        Vector vPos,
-        float  fAvoidRadius,
-        Vector vPreferredDir = vec_zero,
-        float *vLeashHome    = NULL,
-        float  fLeashRadius  = 0.0f
-    );
-    void MoveNear(Vector vNear, float fRadius, float *vLeashHome = NULL, float fLeashRadius = 0.0f);
-    void MoveTo(Vector vPos, float *vLeashHome = NULL, float fLeashRadius = 0.0f);
-    bool MoveToBestAttractivePoint(int iMinPriority = 0);
-
-    bool CanMoveTo(Vector vPos);
-    bool MoveDone(void);
-    bool IsMoving(void);
-    void ClearMove(void);
-
     void NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared);
     void ClearEnemy(void);
 
@@ -206,8 +225,7 @@ public:
     void GotKill(Event *ev);
     void EventStuffText(Event *ev);
 
-private:
-    void NewMove();
+    BotMovement& GetMovement();
 
 public:
     void    setControlledEntity(Player *player);
diff --git a/code/fgame/playerbot_movement.cpp b/code/fgame/playerbot_movement.cpp
new file mode 100644
index 00000000..791cba1c
--- /dev/null
+++ b/code/fgame/playerbot_movement.cpp
@@ -0,0 +1,606 @@
+#include "playerbot.h"
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_movement.cpp: Manages bot movements
+
+#include "playerbot.h"
+#include "debuglines.h"
+
+BotMovement::BotMovement()
+{
+    controlledEntity = NULL;
+
+    m_Path.SetFallHeight(400);
+    m_bPathing     = false;
+    m_bTempAway    = false;
+    m_fAttractTime = 0;
+
+    m_iCheckPathTime = 0;
+    m_iTempAwayTime  = 0;
+    m_iNumBlocks     = 0;
+}
+
+void BotMovement::SetControlledEntity(Player *newEntity)
+{
+    controlledEntity = newEntity;
+}
+
+void BotMovement::MoveThink(usercmd_t& botcmd)
+{
+    Vector vDir;
+    Vector vAngles;
+    Vector vWishDir;
+
+    botcmd.forwardmove = 0;
+    botcmd.rightmove   = 0;
+
+    CheckAttractiveNodes();
+
+    if (!IsMoving()) {
+        return;
+    }
+
+    if (m_vCurrentOrigin != controlledEntity->origin) {
+        m_vCurrentOrigin = controlledEntity->origin;
+
+        if (m_Path.CurrentNode()) {
+            // recalculate paths because of a new origin
+            m_Path.ReFindPath(controlledEntity->origin, controlledEntity);
+        }
+    }
+
+    if (m_bTempAway && level.inttime >= m_iTempAwayTime) {
+        m_bTempAway = false;
+        m_Path.FindPath(controlledEntity->origin, m_vTargetPos, controlledEntity, 0, NULL, 0);
+    }
+
+    if (!m_bTempAway) {
+        if (m_Path.CurrentNode()) {
+            m_Path.UpdatePos(controlledEntity->origin, 8);
+
+            m_vCurrentGoal = controlledEntity->origin;
+            VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
+
+            if (MoveDone()) {
+                // Clear the path
+                m_Path.Clear();
+            }
+        }
+    }
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(controlledEntity->centroid, m_vCurrentGoal + Vector(0, 0, 36), 1, 1, 0, 1);
+    }
+
+    // Check if we're blocked
+    if (level.inttime >= m_iCheckPathTime) {
+        m_iCheckPathTime = level.inttime + 1000;
+
+        if (m_iNumBlocks >= 5) {
+            // Give up
+            ClearMove();
+        }
+
+        m_bTempAway = false;
+
+        if (controlledEntity->groundentity || controlledEntity->client->ps.walking) {
+            if (controlledEntity->GetMoveResult() >= MOVERESULT_BLOCKED
+                || controlledEntity->velocity.lengthSquared() <= Square(8)) {
+                m_bTempAway = true;
+            } else if ((controlledEntity->origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32)
+                       && (controlledEntity->origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
+                m_bTempAway = true;
+            }
+        } else {
+            // falling
+            if (controlledEntity->GetMoveResult() >= MOVERESULT_BLOCKED) {
+                // stuck while falling
+                m_bTempAway = true;
+            }
+        }
+
+        if (m_bTempAway) {
+            m_bTempAway     = true;
+            m_iTempAwayTime = level.inttime + 750;
+            m_iNumBlocks++;
+
+            // Try to backward a little
+            m_Path.Clear();
+            m_Path.ForceShortLookahead();
+            m_vCurrentGoal = controlledEntity->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+        } else {
+            m_iNumBlocks = 0;
+
+            if (!m_Path.CurrentNode()) {
+                m_vTargetPos   = controlledEntity->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+                m_vCurrentGoal = m_vTargetPos;
+            }
+        }
+
+        m_vLastCheckPos[1] = m_vLastCheckPos[0];
+        m_vLastCheckPos[0] = controlledEntity->origin;
+    }
+
+    if (ai_debugpath->integer) {
+        PathInfo *pos = m_Path.CurrentNode();
+
+        if (pos != NULL) {
+            while (pos != m_Path.LastNode()) {
+                Vector vStart = pos->point + Vector(0, 0, 32);
+
+                pos--;
+
+                Vector vEnd = pos->point + Vector(0, 0, 32);
+
+                G_DebugLine(vStart, vEnd, 1, 0, 0, 1);
+            }
+        }
+    }
+
+    if (m_Path.CurrentNode()) {
+        if ((m_vTargetPos - controlledEntity->origin).lengthSquared() <= Square(16)) {
+            ClearMove();
+        }
+    } else {
+        if ((m_vTargetPos - controlledEntity->origin).lengthXYSquared() <= Square(16)) {
+            ClearMove();
+        }
+    }
+
+    // Rotate the dir
+    if (m_Path.CurrentNode()) {
+        vDir[0] = m_Path.CurrentDelta()[0];
+        vDir[1] = m_Path.CurrentDelta()[1];
+    } else {
+        vDir = m_vCurrentGoal - controlledEntity->origin;
+    }
+    vDir[2] = 0;
+
+    VectorNormalize2D(vDir);
+    vAngles = vDir.toAngles() - controlledEntity->angles;
+    vAngles.AngleVectorsLeft(&vWishDir);
+
+    m_vLastValidDir  = vDir;
+    m_vLastValidGoal = m_vCurrentGoal;
+
+    // Forward to the specified direction
+    float x = vWishDir.x * 127;
+    float y = -vWishDir.y * 127;
+
+    botcmd.forwardmove = (signed char)Q_clamp(x, -127, 127);
+    botcmd.rightmove   = (signed char)Q_clamp(y, -127, 127);
+
+    CheckJump(botcmd);
+}
+
+void BotMovement::CheckAttractiveNodes()
+{
+    for (int i = m_attractList.NumObjects(); i > 0; i--) {
+        nodeAttract_t *a = m_attractList.ObjectAt(i);
+
+        if (a->m_pNode == NULL || !a->m_pNode->CheckTeam(controlledEntity) || level.time > a->m_fRespawnTime) {
+            delete a;
+            m_attractList.RemoveObjectAt(i);
+        }
+    }
+}
+
+void BotMovement::CheckEndPos(Entity *entity)
+{
+    Vector  start;
+    Vector  end;
+    trace_t trace;
+
+    if (!m_Path.LastNode()) {
+        return;
+    }
+
+    start = m_Path.LastNode()->point;
+    end   = m_vTargetPos;
+
+    trace =
+        G_Trace(start, entity->mins, entity->maxs, end, entity, MASK_TARGETPATH, true, "BotController::CheckEndPos");
+
+    if (trace.fraction < 0.95f) {
+        m_vTargetPos = trace.endpos;
+    }
+}
+
+void BotMovement::CheckJump(usercmd_t& botcmd)
+{
+    Vector  start;
+    Vector  end;
+    Vector  dir;
+    trace_t trace;
+
+    if (controlledEntity->GetLadder()) {
+        if (!botcmd.upmove) {
+            botcmd.upmove = 127;
+        } else {
+            botcmd.upmove = 0;
+        }
+        return;
+    }
+
+    dir = m_vLastValidDir;
+
+    start = controlledEntity->origin + Vector(0, 0, STEPSIZE);
+    end =
+        controlledEntity->origin + Vector(0, 0, STEPSIZE) + dir * (controlledEntity->maxs.y - controlledEntity->mins.y);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    // Check if the bot needs to jump
+    trace = G_Trace(
+        start,
+        controlledEntity->mins,
+        controlledEntity->maxs,
+        end,
+        controlledEntity,
+        MASK_PLAYERSOLID,
+        false,
+        "BotController::CheckJump"
+    );
+
+    // No need to jump
+    if (trace.fraction > 0.5f) {
+        botcmd.upmove = 0;
+        return;
+    }
+
+    start = controlledEntity->origin;
+    end   = controlledEntity->origin + Vector(0, 0, STEPSIZE * 3);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    // Check if the bot can jump up
+    trace = G_Trace(
+        start,
+        controlledEntity->mins,
+        controlledEntity->maxs,
+        end,
+        controlledEntity,
+        MASK_PLAYERSOLID,
+        true,
+        "BotController::CheckJump"
+    );
+
+    start = trace.endpos;
+    end   = trace.endpos + dir * (controlledEntity->maxs.y - controlledEntity->mins.y);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    Vector bounds[2];
+    bounds[0] = Vector(controlledEntity->mins[0], controlledEntity->mins[1], 0);
+    bounds[1] = Vector(
+        controlledEntity->maxs[0],
+        controlledEntity->maxs[1],
+        (controlledEntity->maxs[0] + controlledEntity->maxs[1]) * 0.5
+    );
+
+    // Check if the bot can jump at the location
+    trace = G_Trace(
+        start, bounds[0], bounds[1], end, controlledEntity, MASK_PLAYERSOLID, false, "BotController::CheckJump"
+    );
+
+    if (trace.fraction < 1) {
+        botcmd.upmove = 0;
+        return;
+    }
+
+    // Make the bot climb walls
+    if (!botcmd.upmove) {
+        botcmd.upmove = 127;
+    } else {
+        botcmd.upmove = 0;
+    }
+}
+
+/*
+====================
+AvoidPath
+
+Avoid the specified position within the radius and start from a direction
+====================
+*/
+void BotMovement::AvoidPath(
+    Vector vAvoid, float fAvoidRadius, Vector vPreferredDir, float *vLeashHome, float fLeashRadius
+)
+{
+    Vector vDir;
+
+    if (vPreferredDir == vec_zero) {
+        vDir = controlledEntity->origin - vAvoid;
+        VectorNormalizeFast(vDir);
+    } else {
+        vDir = vPreferredDir;
+    }
+
+    m_Path.FindPathAway(
+        controlledEntity->origin, vAvoid, vDir, controlledEntity, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius
+    );
+    NewMove();
+
+    if (!m_Path.CurrentNode()) {
+        // Random movements
+        m_vTargetPos = controlledEntity->origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+        m_vCurrentGoal = m_vTargetPos;
+        return;
+    }
+
+    m_vTargetPos = m_Path.LastNode()->point;
+}
+
+/*
+====================
+MoveNear
+
+Move near the specified position within the radius
+====================
+*/
+void BotMovement::MoveNear(Vector vNear, float fRadius, float *vLeashHome, float fLeashRadius)
+{
+    m_Path.FindPathNear(
+        controlledEntity->origin, vNear, controlledEntity, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius
+    );
+    NewMove();
+
+    if (!m_Path.CurrentNode()) {
+        m_bPathing = false;
+        return;
+    }
+
+    m_vTargetPos = m_Path.LastNode()->point;
+}
+
+/*
+====================
+MoveTo
+
+Move to the specified position
+====================
+*/
+void BotMovement::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
+{
+    m_vTargetPos = vPos;
+    m_Path.FindPath(
+        controlledEntity->origin, m_vTargetPos, controlledEntity, 0, vLeashHome, fLeashRadius * fLeashRadius
+    );
+
+    NewMove();
+
+    if (!m_Path.CurrentNode()) {
+        m_bPathing = false;
+        return;
+    }
+
+    CheckEndPos(controlledEntity);
+}
+
+/*
+====================
+MoveToBestAttractivePoint
+
+Move to the nearest attractive point with a minimum priority
+Returns true if no attractive point was found
+====================
+*/
+bool BotMovement::MoveToBestAttractivePoint(int iMinPriority)
+{
+    Container<AttractiveNode *> list;
+    AttractiveNode             *bestNode;
+    float                       bestDistanceSquared;
+    int                         bestPriority;
+
+    if (m_pPrimaryAttract) {
+        MoveTo(m_pPrimaryAttract->origin);
+
+        if (!IsMoving()) {
+            m_pPrimaryAttract = NULL;
+        } else {
+            if (MoveDone()) {
+                if (!m_fAttractTime) {
+                    m_fAttractTime = level.time + m_pPrimaryAttract->m_fMaxStayTime;
+                }
+                if (level.time > m_fAttractTime) {
+                    nodeAttract_t *a  = new nodeAttract_t;
+                    a->m_fRespawnTime = level.time + m_pPrimaryAttract->m_fRespawnTime;
+                    a->m_pNode        = m_pPrimaryAttract;
+
+                    m_pPrimaryAttract = NULL;
+                }
+            }
+
+            return true;
+        }
+    }
+
+    if (!attractiveNodes.NumObjects()) {
+        return false;
+    }
+
+    bestNode            = NULL;
+    bestDistanceSquared = 99999999.0f;
+    bestPriority        = iMinPriority;
+
+    for (int i = attractiveNodes.NumObjects(); i > 0; i--) {
+        AttractiveNode *node = attractiveNodes.ObjectAt(i);
+        float           distSquared;
+        bool            m_bRespawning = false;
+
+        for (int j = m_attractList.NumObjects(); j > 0; j--) {
+            AttractiveNode *node2 = m_attractList.ObjectAt(j)->m_pNode;
+
+            if (node2 == node) {
+                m_bRespawning = true;
+                break;
+            }
+        }
+
+        if (m_bRespawning) {
+            continue;
+        }
+
+        if (node->m_iPriority < bestPriority) {
+            continue;
+        }
+
+        if (!node->CheckTeam(controlledEntity)) {
+            continue;
+        }
+
+        distSquared = VectorLengthSquared(controlledEntity->origin - node->origin);
+
+        if (node->m_fMaxDistanceSquared >= 0 && distSquared > node->m_fMaxDistanceSquared) {
+            continue;
+        }
+
+        if (!CanMoveTo(node->origin)) {
+            continue;
+        }
+
+        if (distSquared < bestDistanceSquared) {
+            bestDistanceSquared = distSquared;
+            bestNode            = node;
+            bestPriority        = node->m_iPriority;
+        }
+    }
+
+    if (bestNode) {
+        m_pPrimaryAttract = bestNode;
+        m_fAttractTime    = 0;
+        MoveTo(bestNode->origin);
+        return true;
+    } else {
+        // No attractive point found
+        return false;
+    }
+}
+
+/*
+====================
+NewMove
+
+Called when there is a new move
+====================
+*/
+void BotMovement::NewMove()
+{
+    m_bPathing         = true;
+    m_vLastCheckPos[0] = controlledEntity->origin;
+    m_vLastCheckPos[1] = controlledEntity->origin;
+}
+
+/*
+====================
+CanMoveTo
+
+Returns true if the bot has done moving
+====================
+*/
+bool BotMovement::CanMoveTo(Vector vPos)
+{
+    return m_Path.DoesTheoreticPathExist(controlledEntity->origin, vPos, NULL, 0, NULL, 0);
+}
+
+/*
+====================
+MoveDone
+
+Returns true if the bot has done moving
+====================
+*/
+bool BotMovement::MoveDone()
+{
+    PathInfo *next;
+
+    if (!m_bPathing) {
+        return true;
+    }
+
+    if (m_bTempAway) {
+        return false;
+    }
+
+    if (!m_Path.CurrentNode()) {
+        return true;
+    }
+
+    Vector delta = Vector(m_Path.CurrentPathGoal()) - controlledEntity->origin;
+    if (delta.lengthXYSquared() < Square(16) && delta.z < controlledEntity->maxs.z) {
+        return true;
+    }
+
+    return false;
+}
+
+/*
+====================
+IsMoving
+
+Returns true if the bot has a current path
+====================
+*/
+bool BotMovement::IsMoving(void)
+{
+    return m_bPathing;
+}
+
+/*
+====================
+ClearMove
+
+Stop the bot from moving
+====================
+*/
+void BotMovement::ClearMove(void)
+{
+    m_Path.Clear();
+    m_bPathing   = false;
+    m_iNumBlocks = 0;
+}
+
+/*
+====================
+GetCurrentGoal
+
+Return the current goal, usually the nearest node the player should look at
+====================
+*/
+Vector BotMovement::GetCurrentGoal() const
+{
+    if (!m_Path.CurrentNode()) {
+        return m_vCurrentGoal;
+    }
+
+    if (!m_Path.Complete(controlledEntity->origin)) {
+        return controlledEntity->origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0);
+    }
+
+    return controlledEntity->origin;
+}

From 4157a49c7e0c3d2d63c7596950b278267dd9dcbb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 9 Oct 2024 21:20:49 +0200
Subject: [PATCH 1131/2040] Remove useless include

---
 code/fgame/playerbot_movement.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/fgame/playerbot_movement.cpp b/code/fgame/playerbot_movement.cpp
index 791cba1c..d6463539 100644
--- a/code/fgame/playerbot_movement.cpp
+++ b/code/fgame/playerbot_movement.cpp
@@ -1,4 +1,3 @@
-#include "playerbot.h"
 /*
 ===========================================================================
 Copyright (C) 2024 the OpenMoHAA team

From 1a33e9a15b751ff3e99a40f9737e420e43987877 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 9 Oct 2024 21:21:19 +0200
Subject: [PATCH 1132/2040] Add BotRotation class to handle bot turning

---
 code/fgame/playerbot.cpp          | 190 ++++++++----------------------
 code/fgame/playerbot.h            |  68 ++++++-----
 code/fgame/playerbot_rotation.cpp | 139 ++++++++++++++++++++++
 3 files changed, 227 insertions(+), 170 deletions(-)
 create mode 100644 code/fgame/playerbot_rotation.cpp

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 25d6c74f..28e3d525 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -35,45 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 cvar_t *bot_manualmove;
 
-CLASS_DECLARATION(Player, PlayerBot, NULL) {
-    {&EV_Killed,           &PlayerBot::Killed        },
-    {&EV_GotKill,          &PlayerBot::GotKill       },
-    {&EV_Player_StuffText, &PlayerBot::EventStuffText},
-    {NULL,                 NULL                      }
-};
-
-PlayerBot::PlayerBot()
-{
-    entflags |= ECF_BOT;
-    controller = NULL;
-}
-
-void PlayerBot::setController(BotController *controlledBy)
-{
-    controller = controlledBy;
-}
-
-void PlayerBot::Spawned(void)
-{
-    controller->Spawned();
-
-    Player::Spawned();
-}
-
-void PlayerBot::Killed(Event *ev)
-{
-    Player::Killed(ev);
-
-    controller->Killed(ev);
-}
-
-void PlayerBot::GotKill(Event *ev)
-{
-    Player::GotKill(ev);
-
-    controller->GotKill(ev);
-}
-
 CLASS_DECLARATION(Listener, BotController, NULL) {
     {NULL, NULL}
 };
@@ -103,11 +64,6 @@ BotController::BotController()
     m_botEyes.ofs[1]    = 0;
     m_botEyes.ofs[2]    = DEFAULT_VIEWHEIGHT;
 
-    m_vAngSpeed      = vec_zero;
-    m_vTargetAng     = vec_zero;
-    m_vCurrentAng    = vec_zero;
-    m_fYawSpeedMult  = 1.0f;
-
     m_iCuriousTime = 0;
     m_iAttackTime  = 0;
 
@@ -138,69 +94,6 @@ void BotController::Init(void)
     InitState_Weapon(&botfuncs[4]);
 }
 
-float AngleDifference(float ang1, float ang2)
-{
-    float diff;
-
-    diff = ang1 - ang2;
-    if (ang1 > ang2) {
-        if (diff > 180.0) {
-            diff -= 360.0;
-        }
-    } else {
-        if (diff < -180.0) {
-            diff += 360.0;
-        }
-    }
-    return diff;
-}
-
-void BotController::TurnThink(void)
-{
-    float diff, factor, maxchange, anglespeed, desired_speed;
-    int   i;
-
-    if (m_vTargetAng[PITCH] > 180) {
-        m_vTargetAng[PITCH] -= 360;
-    }
-
-    factor    = 0.25f;
-    maxchange = 360;
-
-    if (maxchange < 240) {
-        maxchange = 240;
-    }
-
-    maxchange *= level.frametime;
-
-    for (i = 0; i < 2; i++) {
-        //over reaction view model
-        m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
-        m_vTargetAng[i]  = AngleMod(m_vTargetAng[i]);
-        diff             = AngleDifference(m_vCurrentAng[i], m_vTargetAng[i]);
-        desired_speed    = diff * factor;
-
-        m_vAngSpeed[i] = Q_clamp_float(m_vAngSpeed[i] + (m_vAngSpeed[i] - desired_speed), -180, 180);
-        anglespeed     = Q_clamp_float(m_vAngSpeed[i], -maxchange, maxchange);
-
-        m_vCurrentAng[i] += anglespeed;
-        m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
-
-        //demping
-        m_vAngSpeed[i] *= 0.2 * (1 - factor);
-    }
-
-    if (m_vCurrentAng[PITCH] > 180) {
-        m_vCurrentAng[PITCH] -= 360;
-    }
-
-    m_botEyes.angles[0] = m_vCurrentAng[0];
-    m_botEyes.angles[1] = m_vCurrentAng[1];
-    m_botCmd.angles[0]  = ANGLE2SHORT(m_vCurrentAng[0]) - controlledEnt->client->ps.delta_angles[0];
-    m_botCmd.angles[1]  = ANGLE2SHORT(m_vCurrentAng[1]) - controlledEnt->client->ps.delta_angles[1];
-    m_botCmd.angles[2]  = ANGLE2SHORT(m_vCurrentAng[2]) - controlledEnt->client->ps.delta_angles[2];
-}
-
 void BotController::GetUsercmd(usercmd_t *ucmd)
 {
     *ucmd = m_botCmd;
@@ -231,8 +124,7 @@ void BotController::UpdateBotStates(void)
     }
 
     if (controlledEnt->GetTeam() == TEAM_NONE || controlledEnt->GetTeam() == TEAM_SPECTATOR) {
-        Event *event;
-        float  time;
+        float time;
 
         // Add some delay to avoid telefragging
         time = controlledEnt->entnum / 20.0;
@@ -266,7 +158,7 @@ void BotController::UpdateBotStates(void)
     CheckStates();
 
     movement.MoveThink(m_botCmd);
-    TurnThink();
+    rotation.TurnThink(m_botCmd, m_botEyes);
     CheckUse();
 }
 
@@ -356,33 +248,6 @@ void BotController::SendCommand(const char *text)
     }
 }
 
-/*
-====================
-SetTargetAngles
-
-Set the bot's angle
-====================
-*/
-void BotController::SetTargetAngles(Vector vAngles)
-{
-    m_vTargetAng = vAngles;
-}
-
-/*
-====================
-AimAt
-
-Make the bot face to the specified direction
-====================
-*/
-void BotController::AimAt(Vector vPos)
-{
-    Vector vDelta = vPos - controlledEnt->centroid;
-
-    VectorNormalize(vDelta);
-    vectoangles(vDelta, m_vTargetAng);
-}
-
 /*
 ====================
 AimAtAimNode
@@ -400,10 +265,12 @@ void BotController::AimAtAimNode(void)
 
     goal = movement.GetCurrentGoal();
     if (goal != controlledEnt->origin) {
-        AimAt(goal);
+        rotation.AimAt(goal);
     }
 
-    m_vTargetAng[PITCH] = 0;
+    Vector targetAngles = rotation.GetTargetAngles();
+    targetAngles.x      = 0;
+    rotation.SetTargetAngles(targetAngles);
 }
 
 /*
@@ -881,13 +748,14 @@ void BotController::State_Attack(void)
         fMinDistanceSquared = 0;
     }
 
-    AimAt(m_pEnemy->centroid + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
+    rotation.AimAt(m_pEnemy->centroid + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
 
     if (bNoMove) {
         return;
     }
 
-    if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving()) || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())) {
+    if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving())
+        || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())) {
         if (!bMelee) {
             if ((controlledEnt->origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
                 Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
@@ -1048,6 +916,7 @@ void BotController::setControlledEntity(Player *player)
 {
     controlledEnt = player;
     movement.SetControlledEntity(player);
+    rotation.SetControlledEntity(player);
 }
 
 Player *BotController::getControlledEntity() const
@@ -1123,3 +992,42 @@ void BotControllerManager::ThinkControllers()
         controller->Think();
     }
 }
+
+CLASS_DECLARATION(Player, PlayerBot, NULL) {
+    {&EV_Killed,           &PlayerBot::Killed        },
+    {&EV_GotKill,          &PlayerBot::GotKill       },
+    {&EV_Player_StuffText, &PlayerBot::EventStuffText},
+    {NULL,                 NULL                      }
+};
+
+PlayerBot::PlayerBot()
+{
+    entflags |= ECF_BOT;
+    controller = NULL;
+}
+
+void PlayerBot::setController(BotController *controlledBy)
+{
+    controller = controlledBy;
+}
+
+void PlayerBot::Spawned(void)
+{
+    controller->Spawned();
+
+    Player::Spawned();
+}
+
+void PlayerBot::Killed(Event *ev)
+{
+    Player::Killed(ev);
+
+    controller->Killed(ev);
+}
+
+void PlayerBot::GotKill(Event *ev)
+{
+    Player::GotKill(ev);
+
+    controller->GotKill(ev);
+}
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 37481757..363ce60f 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -36,25 +36,6 @@ typedef struct nodeAttract_s {
 
 class BotController;
 
-class PlayerBot : public Player
-{
-public:
-    CLASS_PROTOTYPE(PlayerBot);
-
-public:
-    PlayerBot();
-
-    void setController(BotController *controlledBy);
-
-    void Spawned(void);
-
-    void Killed(Event *ev);
-    void GotKill(Event *ev);
-
-private:
-    BotController *controller;
-};
-
 class BotMovement
 {
 public:
@@ -109,7 +90,25 @@ private:
 };
 
 class BotRotation
-{};
+{
+public:
+    BotRotation();
+
+    void SetControlledEntity(Player *newEntity);
+
+    void          TurnThink(usercmd_t& botcmd, usereyes_t& eyeinfo);
+    const Vector& GetTargetAngles() const;
+    void          SetTargetAngles(Vector vAngles);
+    void          AimAt(Vector vPos);
+
+private:
+    SafePtr<Player> controlledEntity;
+
+    Vector m_vTargetAng;
+    Vector m_vCurrentAng;
+    Vector m_vAngSpeed;
+    float  m_fYawSpeedMult;
+};
 
 class BotController : public Listener
 {
@@ -125,6 +124,7 @@ private:
     static botfunc_t botfuncs[];
 
     BotMovement movement;
+    BotRotation rotation;
 
     // States
     int               m_iCuriousTime;
@@ -140,12 +140,6 @@ private:
     usercmd_t  m_botCmd;
     usereyes_t m_botEyes;
 
-    // Direction
-    Vector m_vTargetAng;
-    Vector m_vCurrentAng;
-    Vector m_vAngSpeed;
-    float  m_fYawSpeedMult;
-
     // States
     int               m_StateCount;
     unsigned int      m_StateFlags;
@@ -155,7 +149,6 @@ private:
     int m_iNextTauntTime;
 
 private:
-    void TurnThink(void);
     void CheckUse(void);
 
     void State_DefaultBegin(void);
@@ -204,12 +197,10 @@ public:
 
     void GetEyeInfo(usereyes_t *eyeinfo);
     void GetUsercmd(usercmd_t *ucmd);
-    void SetTargetAngles(Vector vAngles);
 
     void UpdateBotStates(void);
     void CheckReload(void);
 
-    void AimAt(Vector vPos);
     void AimAtAimNode(void);
 
     void NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared);
@@ -274,3 +265,22 @@ private:
 };
 
 extern BotManager botManager;
+
+class PlayerBot : public Player
+{
+public:
+    CLASS_PROTOTYPE(PlayerBot);
+
+public:
+    PlayerBot();
+
+    void setController(BotController *controlledBy);
+
+    void Spawned(void);
+
+    void Killed(Event *ev);
+    void GotKill(Event *ev);
+
+private:
+    BotController *controller;
+};
diff --git a/code/fgame/playerbot_rotation.cpp b/code/fgame/playerbot_rotation.cpp
new file mode 100644
index 00000000..28d913b9
--- /dev/null
+++ b/code/fgame/playerbot_rotation.cpp
@@ -0,0 +1,139 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_rotation.cpp: Manages bot rotation
+
+#include "playerbot.h"
+
+BotRotation::BotRotation()
+{
+    m_vAngSpeed     = vec_zero;
+    m_vTargetAng    = vec_zero;
+    m_vCurrentAng   = vec_zero;
+    m_fYawSpeedMult = 1.0f;
+}
+
+void BotRotation::SetControlledEntity(Player *newEntity)
+{
+    controlledEntity = newEntity;
+}
+
+float AngleDifference(float ang1, float ang2)
+{
+    float diff;
+
+    diff = ang1 - ang2;
+    if (ang1 > ang2) {
+        if (diff > 180.0) {
+            diff -= 360.0;
+        }
+    } else {
+        if (diff < -180.0) {
+            diff += 360.0;
+        }
+    }
+    return diff;
+}
+
+void BotRotation::TurnThink(usercmd_t& botcmd, usereyes_t& eyeinfo)
+{
+    float diff, factor, maxchange, anglespeed, desired_speed;
+    int   i;
+
+    if (m_vTargetAng[PITCH] > 180) {
+        m_vTargetAng[PITCH] -= 360;
+    }
+
+    factor    = 0.25f;
+    maxchange = 360;
+
+    if (maxchange < 240) {
+        maxchange = 240;
+    }
+
+    maxchange *= level.frametime;
+
+    for (i = 0; i < 2; i++) {
+        //over reaction view model
+        m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
+        m_vTargetAng[i]  = AngleMod(m_vTargetAng[i]);
+        diff             = AngleDifference(m_vCurrentAng[i], m_vTargetAng[i]);
+        desired_speed    = diff * factor;
+
+        m_vAngSpeed[i] = Q_clamp_float(m_vAngSpeed[i] + (m_vAngSpeed[i] - desired_speed), -180, 180);
+        anglespeed     = Q_clamp_float(m_vAngSpeed[i], -maxchange, maxchange);
+
+        m_vCurrentAng[i] += anglespeed;
+        m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
+
+        //demping
+        m_vAngSpeed[i] *= 0.2 * (1 - factor);
+    }
+
+    if (m_vCurrentAng[PITCH] > 180) {
+        m_vCurrentAng[PITCH] -= 360;
+    }
+
+    eyeinfo.angles[0] = m_vCurrentAng[0];
+    eyeinfo.angles[1] = m_vCurrentAng[1];
+    botcmd.angles[0]  = ANGLE2SHORT(m_vCurrentAng[0]) - controlledEntity->client->ps.delta_angles[0];
+    botcmd.angles[1]  = ANGLE2SHORT(m_vCurrentAng[1]) - controlledEntity->client->ps.delta_angles[1];
+    botcmd.angles[2]  = ANGLE2SHORT(m_vCurrentAng[2]) - controlledEntity->client->ps.delta_angles[2];
+}
+
+/*
+====================
+GetTargetAngles
+
+Return the target angle
+====================
+*/
+const Vector& BotRotation::GetTargetAngles() const
+{
+    return m_vTargetAng;
+}
+
+/*
+====================
+SetTargetAngles
+
+Set the bot's angle
+====================
+*/
+void BotRotation::SetTargetAngles(Vector vAngles)
+{
+    m_vTargetAng = vAngles;
+}
+
+/*
+====================
+AimAt
+
+Make the bot face to the specified direction
+====================
+*/
+void BotRotation::AimAt(Vector vPos)
+{
+    Vector vDelta = vPos - controlledEntity->centroid;
+
+    VectorNormalize(vDelta);
+    vectoangles(vDelta, m_vTargetAng);
+}

From 36f9bdb88c8ca0d47b9ab3a910684d824c2ee548 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:07:20 +0200
Subject: [PATCH 1133/2040] Use intptr_t instead of size_t because intptr_t can
 hold a pointer which is not always the case for size_t

---
 code/renderer/tr_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 0a90a396..d5b0ca57 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1559,7 +1559,7 @@ void R_Init( void ) {
 
 //	Swap_Init();
 
-	if ( (size_t)tess.xyz & 15 ) {
+	if ( (intptr_t)tess.xyz & 15 ) {
 		Com_Printf( "WARNING: tess.xyz not 16 byte aligned\n" );
 	}
 	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );

From be5deddc1d064c8d0c3b9e427f920ad7dc763787 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:10:12 +0200
Subject: [PATCH 1134/2040] Make indexes and coordinates 16-bytes aligned

---
 code/renderer/tr_local.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index 60efee39..a0680686 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1863,19 +1863,19 @@ typedef struct stageVars
 
 typedef struct shaderCommands_s 
 {
-	glIndex_t	indexes[SHADER_MAX_INDEXES];
-	vec4_t		xyz[SHADER_MAX_VERTEXES];
-	vec4_t		normal[SHADER_MAX_VERTEXES];
-	vec2_t		texCoords[SHADER_MAX_VERTEXES][2];
-	color4ub_t	vertexColors[SHADER_MAX_VERTEXES];
-	int			vertexDlightBits[SHADER_MAX_VERTEXES];
+	glIndex_t	indexes[SHADER_MAX_INDEXES] QALIGN(16);
+	vec4_t		xyz[SHADER_MAX_VERTEXES] QALIGN(16);
+	vec4_t		normal[SHADER_MAX_VERTEXES] QALIGN(16);
+	vec2_t		texCoords[SHADER_MAX_VERTEXES][2] QALIGN(16);
+	color4ub_t	vertexColors[SHADER_MAX_VERTEXES] QALIGN(16);
+	int			vertexDlightBits[SHADER_MAX_VERTEXES] QALIGN(16);
 
-	stageVars_t	svars;
+	stageVars_t	svars QALIGN(16);
 
-	color4ub_t	constantColor255[SHADER_MAX_VERTEXES];
+	color4ub_t	constantColor255[SHADER_MAX_VERTEXES] QALIGN(16);
 
 	shader_t	*shader;
-  float   shaderTime;
+	float		shaderTime;
 	int			fogNum;
 
 	int			dlightBits;	// or together of all vertexDlightBits

From a3050f6c6410c17811cbd71becb3ae8523a417d7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:48:23 +0200
Subject: [PATCH 1135/2040] Avoid using too much performance to update the
 loading screen, especially on low-end PCs

---
 code/client/cl_ui.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index f74bb5be..5911451e 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -136,7 +136,8 @@ static unsigned int  startCountHigh;
 static unsigned int  loadCountLow;
 static unsigned int  loadCountHigh;
 static unsigned int  loadCount;
-static unsigned int  lastTime;
+static unsigned int  lastTime = 0;
+static unsigned int  updateTime = 0;
 static unsigned int  loadNumber;
 static unsigned int  totalLoadTime;
 static unsigned int  currentLoadTime;
@@ -5507,12 +5508,19 @@ UI_TestUpdateScreen
 void UI_TestUpdateScreen(unsigned int timeout)
 {
     unsigned int newTime = Sys_Milliseconds();
+    unsigned int startRenderTime, endRenderTime;
 
-    if (newTime - lastTime >= timeout) {
-        lastTime = newTime;
-        Sys_PumpMessageLoop();
-        SCR_UpdateScreen();
+    if (timeout > 0 && (newTime - lastTime) < (timeout + updateTime)) {
+        return;
     }
+
+    startRenderTime = Sys_Milliseconds();
+    Sys_PumpMessageLoop();
+    SCR_UpdateScreen();
+    endRenderTime = Sys_Milliseconds();
+
+    updateTime = Q_min(endRenderTime - startRenderTime, 1000);
+    lastTime = endRenderTime;
 }
 
 /*

From 36a080b3a9b68b5b48d5b37b8e4dbb2385cbe98f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 20:11:12 +0200
Subject: [PATCH 1136/2040] Call InitModelList() once

This fixes an issue where the model list would get initialized each frame
---
 code/fgame/g_bot.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 1f7d1493..aebf8b49 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -30,7 +30,6 @@ static saved_bot_t *saved_bots        = NULL;
 static unsigned int num_saved_bots    = 0;
 static unsigned int current_bot_count = 0;
 static unsigned int botId             = 0;
-static char       **modelList         = NULL;
 
 Container<str> alliedModelList;
 Container<str> germanModelList;
@@ -687,6 +686,7 @@ Called to initialize bots
 */
 void G_BotInit()
 {
+    InitModelList();
     botManager.Init();
 }
 
@@ -714,8 +714,6 @@ void G_SpawnBots()
     unsigned int numClients;
     unsigned int numBotsToSpawn;
 
-    InitModelList();
-
     if (saved_bots) {
         G_RestoreBots();
     }

From 1e41a2595d71166f0fbc9e5a33f3d535b2842a2a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 20:27:52 +0200
Subject: [PATCH 1137/2040] Leave 1 second minimum between each call to
 RefindPath()

---
 code/fgame/playerbot_movement.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/playerbot_movement.cpp b/code/fgame/playerbot_movement.cpp
index d6463539..7cde3abe 100644
--- a/code/fgame/playerbot_movement.cpp
+++ b/code/fgame/playerbot_movement.cpp
@@ -58,7 +58,7 @@ void BotMovement::MoveThink(usercmd_t& botcmd)
         return;
     }
 
-    if (m_vCurrentOrigin != controlledEntity->origin) {
+    if (level.inttime >= m_Path.Time() + 1000 && m_vCurrentOrigin != controlledEntity->origin) {
         m_vCurrentOrigin = controlledEntity->origin;
 
         if (m_Path.CurrentNode()) {

From 211ce09c0be66b0739cef3f4232458457dc055c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:22:35 +0200
Subject: [PATCH 1138/2040] Don't create sound index for non visible players if
 net optimization is disabled

---
 code/fgame/entity.cpp    | 19 ++++++++++++-------
 code/fgame/gamecvars.cpp |  4 ++++
 code/fgame/gamecvars.h   |  4 +++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 371c33af..37a950b9 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -1863,13 +1863,11 @@ Entity::~Entity()
 }
 
 void Entity::ClassnameEvent(Event *ev)
-
 {
     strncpy(edict->entname, ev->GetString(1), sizeof(edict->entname) - 1);
 }
 
 void Entity::SpawnFlagsEvent(Event *ev)
-
 {
     // spawning variables
     spawnflags = ev->GetInteger(1);
@@ -6402,17 +6400,24 @@ void Entity::PlayNonPvsSound(const str& soundName, float volume)
         return;
     }
 
+    if (!sv_netoptimize->integer) {
+        // don't use sound indexes for nothing
+        return;
+    }
+
     if (edict->r.num_nonpvs_sounds >= MAX_NONPVS_SOUNDS) {
         return;
     }
 
     name = GetRandomAlias(soundName, &ret);
     if (name.length() && ret) {
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].index = gi.soundindex(name.c_str(), ret->streamed);
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].volume = G_Random() * ret->volumeMod + ret->volume * volume;
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].minDist = ret->dist;
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].maxDist = ret->maxDist;
-        edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds].pitch = G_Random() * ret->pitchMod + ret->pitch;
+        nonpvs_sound_t* npvs = &edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds];
+
+        npvs->index = gi.soundindex(name.c_str(), ret->streamed);
+        npvs->volume = G_Random() * ret->volumeMod + ret->volume * volume;
+        npvs->minDist = ret->dist;
+        npvs->maxDist = ret->maxDist;
+        npvs->pitch = G_Random() * ret->pitchMod + ret->pitch;
         edict->r.num_nonpvs_sounds++;
     }
 }
diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index c33c423d..b1993d83 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -261,6 +261,8 @@ cvar_t *g_aistats;
 // Added in OPM
 //
 
+cvar_t *sv_netoptimize;
+
 cvar_t *g_obituarylocation;
 
 cvar_t *sv_scriptfiles;
@@ -634,6 +636,8 @@ void CVAR_Init(void)
     // Added in OPM
     //
 
+    sv_netoptimize = gi.Cvar_Get("sv_netoptimize", "0", 0);
+
     if (g_target_game >= target_game_e::TG_MOHTA) {
         g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "0", 0);
     } else {
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index f13e74a4..1f03a1dd 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -262,7 +262,9 @@ extern cvar_t *g_no_seasick;
 
 extern cvar_t *g_aistats;
 
-extern cvar_t* g_obituarylocation;
+extern cvar_t *sv_netoptimize;
+
+extern cvar_t *g_obituarylocation;
 
 extern cvar_t *sv_scriptfiles;
 

From bcea5af30fabc18408bee014b0c33fc13d56bae9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:22:59 +0200
Subject: [PATCH 1139/2040] Remove unused sound index that were used for non
 visible players

---
 code/server/server.h      |  7 ++++
 code/server/sv_snapshot.c | 82 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/code/server/server.h b/code/server/server.h
index 498c15b8..dba52237 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -274,6 +274,12 @@ typedef struct {
 	cdKeyState_e	cdkeyState;
 } challenge_t;
 
+// Added in OPM
+typedef struct {
+	qboolean inUse;
+	int deleteTime;
+} nonpvs_sound_cache_t;
+
 // this structure will be cleared only when the game dll changes
 typedef struct {
 	qboolean	initialized;				// sv_init has completed
@@ -309,6 +315,7 @@ typedef struct {
 	int				tm_loopcount;
 	int				tm_offset;
 
+	nonpvs_sound_cache_t nonpvs_sound_cache[MAX_SOUNDS]; // Added in OPM
 #ifndef DEDICATED
 	soundsystemsavegame_t	soundSystem;
 #endif
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index b173223c..75d43130 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -294,20 +294,27 @@ static int QDECL SV_QsortEntityNumbers( const void *a, const void *b ) {
 	return 1;
 }
 
+/*
+===============
+SV_AddNonPVSSound
+===============
+*/
 static void SV_AddNonPVSSound(client_t* client, gentity_t* ent) {
 	int i;
 
     for (i = 0; i < ent->r.num_nonpvs_sounds; i++) {
+		nonpvs_sound_t *npvs = &ent->r.nonpvs_sounds[i];
+
         SV_ClientSound(
             client,
             &ent->s.origin,
             ENTITYNUM_NONE,
             1,
-            ent->r.nonpvs_sounds[i].index,
-            ent->r.nonpvs_sounds[i].volume,
-            ent->r.nonpvs_sounds[i].minDist,
-            ent->r.nonpvs_sounds[i].pitch,
-            ent->r.nonpvs_sounds[i].maxDist,
+            npvs->index,
+            npvs->volume,
+            npvs->minDist,
+            npvs->pitch,
+            npvs->maxDist,
             qfalse
         );
 	}
@@ -1189,6 +1196,57 @@ void SV_SendClientSnapshot( client_t *client ) {
 	SV_SendMessageToClient( &msg, client );
 }
 
+/*
+=======================
+SV_CacheNonPVSSound
+=======================
+*/
+void SV_CacheNonPVSSound(void)
+{
+	gentity_t* ent;
+	nonpvs_sound_t* npvs;
+	int i, j;
+
+	for (i = 0; i < sv.num_entities; i++) {
+		ent = SV_GentityNum(i);
+
+		for (j = 0; j < ent->r.num_nonpvs_sounds; j++) {
+			npvs = &ent->r.nonpvs_sounds[j];
+			if (npvs->index) {
+				svs.nonpvs_sound_cache[npvs->index].inUse = qtrue;
+				svs.nonpvs_sound_cache[npvs->index].deleteTime = svs.time + 1000;
+			}
+		}
+	}
+}
+
+/*
+=======================
+SV_CleanupNonPVSSound
+=======================
+*/
+void SV_CleanupNonPVSSound(void)
+{
+	nonpvs_sound_cache_t* cache;
+	int i, j, k, l;
+
+	for (i = 1; i < MAX_SOUNDS; i++) {
+		cache = &svs.nonpvs_sound_cache[i];
+
+		if (!sv.configstrings[i]) {
+			continue;
+		}
+
+		if (!cache->inUse) {
+			continue;
+		}
+
+		if (svs.time >= cache->deleteTime) {
+			SV_SetConfigstring(CS_SOUNDS + i, NULL);
+			cache->inUse = qfalse;
+		}
+	}
+}
 
 /*
 =======================
@@ -1197,9 +1255,12 @@ SV_SendClientMessages
 */
 void SV_SendClientMessages(void)
 {
-	int		i;
-	int			rate;
-	client_t	*c;
+	int				i, j;
+	int				rate;
+	client_t		*c;
+	gentity_t		*ent;
+
+	SV_CacheNonPVSSound();
 
 	// send a message to each connected client
 	for(i=0; i < sv_maxclients->integer; i++)
@@ -1245,9 +1306,12 @@ void SV_SendClientMessages(void)
     }
 
     for (i = 0; i < sv.num_entities; i++) {
-        gentity_t* ent = SV_GentityNum(i);
+        ent = SV_GentityNum(i);
 		ent->r.num_nonpvs_sounds = 0;
     }
+
+	// Free up sound indices
+	SV_CleanupNonPVSSound();
 }
 
 qboolean SV_IsValidSnapshotClient(client_t* client) {

From 224c1df553a53f973d0c337d523a304f8c3fa8c3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:38:51 +0200
Subject: [PATCH 1140/2040] Test against entities with BSP solidity when
 testing client visibility

---
 code/server/sv_snapshot.c | 63 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index 75d43130..da69c863 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -320,6 +320,62 @@ static void SV_AddNonPVSSound(client_t* client, gentity_t* ent) {
 	}
 }
 
+/*
+====================
+SV_ClipMoveToBSPEntities
+
+====================
+*/
+static qboolean SV_ClipMoveToBSPEntities(const vec3_t start, const vec3_t end, int mask) {
+	int				i, num;
+	int				touchlist[MAX_GENTITIES];
+	gentity_t		*touch;
+	trace_t			trace;
+	clipHandle_t	clipHandle;
+	vec3_t			boxmins, boxmaxs;
+
+	for (i = 0; i < 3; i++) {
+		if (end[i] > start[i]) {
+			boxmins[i] = start[i] - 1;
+			boxmaxs[i] = end[i] + 1;
+		}
+		else {
+			boxmins[i] = end[i] - 1;
+			boxmaxs[i] = start[i] + 1;
+		}
+	}
+
+	num = SV_AreaEntities(boxmins, boxmaxs, touchlist, MAX_GENTITIES);
+
+	for (i = 0; i < num; i++) {
+		touch = SV_GentityNum(touchlist[i]);
+
+		// skip non-solids and triggers
+		if (touch->solid != SOLID_BSP) {
+			continue;
+		}
+
+		// if it doesn't have any brushes of a type we
+		// are looking for, ignore it
+		if (!(mask & touch->r.contents)) {
+			continue;
+		}
+
+		// might intersect, so do an exact clip
+		clipHandle = SV_ClipHandleForEntity(touch);
+
+		CM_TransformedBoxTrace(&trace, start, end,
+			vec3_origin, vec3_origin, clipHandle, mask,
+			touch->s.origin, touch->r.currentAngles, qfalse);
+
+		if (trace.allsolid || trace.startsolid || trace.fraction != 1) {
+			return qfalse;
+		}
+	}
+
+	return qtrue;
+}
+
 /*
 ===============
 SV_WorldTrace
@@ -330,7 +386,12 @@ qboolean SV_WorldTrace(const vec3_t start, const vec3_t end, int mask)
 	trace_t trace = { 0 };
 
     CM_BoxTrace(&trace, start, end, vec3_origin, vec3_origin, 0, mask, qfalse);
-    return trace.fraction == 1;
+	if (trace.fraction != 1) {
+		return qfalse;
+	}
+
+	// Also test against brush models
+	return SV_ClipMoveToBSPEntities(start, end, mask);
 }
 
 /*

From 46a46a9536e4433f7269eae8b9791f271352f985 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 10 Oct 2024 22:29:17 +0200
Subject: [PATCH 1141/2040] Remove unnecessary code

---
 code/renderer/tr_backend.c | 25 -------------------------
 code/renderer/tr_init.c    |  4 ----
 2 files changed, 29 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index e84b41ec..d3e5761b 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -686,9 +686,6 @@ void RB_BeginDrawingView (void) {
 	}
 }
 
-
-#define	MAC_EVENT_PUMP_MSEC		5
-
 /*
 ==================
 RB_RenderDrawSurfList
@@ -704,15 +701,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	drawSurf_t		*drawSurf;
 	int				oldSort;
 	float			originalTime;
-#ifdef __MACOS__
-	int				macEventTime;
-
-	Sys_PumpEvents();		// crutch up the mac's limited buffer queue size
-
-	// we don't want to pump the event loop too often and waste time, so
-	// we are going to check every shader change
-	macEventTime = ri.Milliseconds() + MAC_EVENT_PUMP_MSEC;
-#endif
 
 	// save original time for entity shader offsets
 	originalTime = backEnd.refdef.floatTime;
@@ -757,15 +745,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			|| ( entityNum != oldEntityNum && !shader->entityMergable )
 			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )) {
 			if (oldShader != NULL) {
-#ifdef __MACOS__	// crutch up the mac's limited buffer queue size
-				int		t;
-
-				t = ri.Milliseconds();
-				if ( t > macEventTime ) {
-					macEventTime = t + MAC_EVENT_PUMP_MSEC;
-					Sys_PumpEvents();
-				}
-#endif
 				RB_EndSurface();
 			}
 			RB_BeginSurface( shader );
@@ -924,10 +903,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 
 	// add light flares on lights that aren't obscured
 	RB_RenderFlares();
-
-#ifdef __MACOS__
-	Sys_PumpEvents();		// crutch up the mac's limited buffer queue size
-#endif
 }
 
 /*
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index d5b0ca57..656c1898 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1339,11 +1339,7 @@ void R_Register( void )
 	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
 	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE );
 	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE );
-#ifdef __MACOS__
-	r_gamma = ri.Cvar_Get( "r_gamma", "1.2", CVAR_ARCHIVE );
-#else
 	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
-#endif
 	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
 
 	r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE );

From 9d744367ac9580896c9ed73db4a17713aa725fbe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 11 Oct 2024 21:46:42 +0200
Subject: [PATCH 1142/2040] Add firstTime parameter for bots

---
 code/fgame/g_bot.cpp    | 2 +-
 code/fgame/g_client.cpp | 2 +-
 code/fgame/g_local.h    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index aebf8b49..93d6dafc 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -441,7 +441,7 @@ void G_AddBot(saved_bot_t *saved)
     current_bot_count++;
     botId++;
 
-    G_BotConnect(clientNum, userinfo);
+    G_BotConnect(clientNum, saved == NULL, userinfo);
 
     if (saved) {
         e->client->pers = saved->pers;
diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 965dc0a1..60a6325d 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -818,7 +818,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
     Q_strncpyz(client->pers.userinfo, u, sizeof(client->pers.userinfo));
 }
 
-void G_BotConnect(int clientNum, const char *userinfo)
+void G_BotConnect(int clientNum, qboolean firstTime, const char *userinfo)
 {
     gclient_t *client;
     gentity_t *ent;
diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index 3f0c085e..55c25869 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -422,7 +422,7 @@ void QDECL G_Error(errorParm_t type, const char *fmt, ...) __attribute__((noretu
 //
 // g_client.c
 //
-void        G_BotConnect(int clientNum, const char* userinfo);
+void        G_BotConnect(int clientNum, qboolean firstTime, const char* userinfo);
 const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differentMap);
 void        G_ClientUserinfoChanged(gentity_t *ent, const char *userinfo);
 void        G_ClientDisconnect(gentity_t *ent);

From d5a90ded177ab3b6b28633c258f2d7e7500038c8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 11 Oct 2024 21:47:12 +0200
Subject: [PATCH 1143/2040] Add a comment about primary weapon selection on map
 change

---
 code/fgame/g_client.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 60a6325d..c68fcb33 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -919,6 +919,9 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
         }
     } else {
         G_ReadClientSessionData(client);
+        // Added in 2.1
+        //  Let clients choose their primary weapon
+        //  on map change
         if (differentMap) {
             client->pers.dm_primary[0] = 0;
         }

From 24309095ff341cc126b2ac353a252abdbe48952e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:54:40 +0200
Subject: [PATCH 1144/2040] Rework bot save/load: - Only save and restore the
 userinfo - Restore bots when the server spawns - Read client session data
 like real players

---
 code/fgame/g_bot.cpp    | 99 +++++++++++++++++++++++------------------
 code/fgame/g_bot.h      | 10 ++---
 code/fgame/g_client.cpp | 13 +++++-
 code/fgame/g_main.cpp   |  2 +-
 4 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 93d6dafc..97b2af2d 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -390,7 +390,7 @@ G_AddBot
 Add the specified bot, optionally its saved state
 ============
 */
-void G_AddBot(saved_bot_t *saved)
+void G_AddBot(const saved_bot_t *saved)
 {
     int        i;
     int        clientNum;
@@ -408,44 +408,42 @@ void G_AddBot(saved_bot_t *saved)
 
     clientNum = e - g_entities;
 
+    current_bot_count++;
+    // increase the unique ID
+    botId++;
+
+    if (saved) {
+        G_BotConnect(clientNum, qfalse, saved->userinfo);
+        G_BotBegin(e);
+        return;
+    }
+
     if (gi.Argc() > 2) {
         Q_strncpyz(botName, gi.Argv(2), sizeof(botName));
     } else {
         Com_sprintf(botName, sizeof(botName), "bot%d", botId);
     }
 
-    e->s.clientNum = clientNum;
-    e->s.number    = clientNum;
+    Info_SetValueForKey(userinfo, "name", botName);
 
-    if (saved) {
-        strncpy(userinfo, saved->pers.userinfo, ARRAY_LEN(userinfo));
-    } else {
-        Info_SetValueForKey(userinfo, "name", botName);
-
-        //
-        // Choose a random model
-        //
-        if (alliedModelList.NumObjects()) {
-            const unsigned int index = rand() % alliedModelList.NumObjects();
-            Info_SetValueForKey(userinfo, "dm_playermodel", alliedModelList[index]);
-        }
-        if (germanModelList.NumObjects()) {
-            const unsigned int index = rand() % germanModelList.NumObjects();
-            Info_SetValueForKey(userinfo, "dm_playergermanmodel", germanModelList[index]);
-        }
-
-        Info_SetValueForKey(userinfo, "fov", "80");
-        Info_SetValueForKey(userinfo, "ip", "localhost");
+    //
+    // Choose a random model
+    //
+    if (alliedModelList.NumObjects()) {
+        const unsigned int index = rand() % alliedModelList.NumObjects();
+        Info_SetValueForKey(userinfo, "dm_playermodel", alliedModelList[index]);
+    }
+    if (germanModelList.NumObjects()) {
+        const unsigned int index = rand() % germanModelList.NumObjects();
+        Info_SetValueForKey(userinfo, "dm_playergermanmodel", germanModelList[index]);
     }
 
-    current_bot_count++;
-    botId++;
+    Info_SetValueForKey(userinfo, "fov", "80");
+    Info_SetValueForKey(userinfo, "ip", "localhost");
 
-    G_BotConnect(clientNum, saved == NULL, userinfo);
-
-    if (saved) {
-        e->client->pers = saved->pers;
-    }
+    // Connect the bot for the first time
+    // setup user info and stuff
+    G_BotConnect(clientNum, qtrue, userinfo);
 
     G_BotBegin(e);
 }
@@ -553,6 +551,7 @@ Save bot persistent data
 */
 void G_SaveBots()
 {
+    unsigned int count;
     unsigned int n;
 
     if (saved_bots) {
@@ -566,18 +565,22 @@ void G_SaveBots()
 
     saved_bots     = new saved_bot_t[current_bot_count];
     num_saved_bots = 0;
-    for (n = 0; n < game.maxclients; n++) {
-        gentity_t *e = &g_entities[n];
-        if (!G_IsBot(e)) {
+
+    const BotControllerManager& manager = botManager.getControllerManager();
+
+    count = manager.getControllers().NumObjects();
+    assert(count <= current_bot_count);
+
+    for (n = 1; n <= count; n++) {
+        const BotController *controller = manager.getControllers().ObjectAt(n);
+        Player              *player     = controller->getControlledEntity();
+        if (!player) {
+            // this shouldn't happen
             continue;
         }
 
-        Player      *player = static_cast<Player *>(e->entity);
-        saved_bot_t& saved  = saved_bots[num_saved_bots++];
-
-        saved.bValid = true;
-        //saved.team = player->GetTeam();
-        saved.pers = player->client->pers;
+        saved_bot_t& saved = saved_bots[num_saved_bots++];
+        memcpy(saved.userinfo, player->client->pers.userinfo, sizeof(saved.userinfo));
     }
 }
 
@@ -597,7 +600,7 @@ void G_RestoreBots()
     }
 
     for (n = 0; n < num_saved_bots; n++) {
-        saved_bot_t& saved = saved_bots[n];
+        const saved_bot_t& saved = saved_bots[n];
 
         G_AddBot(&saved);
     }
@@ -702,6 +705,20 @@ void G_BotFrame()
     botManager.Frame();
 }
 
+/*
+===========
+G_BotPostInit
+
+Called after the server has spawned
+============
+*/
+void G_BotPostInit()
+{
+    G_RestoreBots();
+
+    G_SpawnBots();
+}
+
 /*
 ===========
 G_SpawnBots
@@ -714,10 +731,6 @@ void G_SpawnBots()
     unsigned int numClients;
     unsigned int numBotsToSpawn;
 
-    if (saved_bots) {
-        G_RestoreBots();
-    }
-
     //
     // Check the minimum bot count
     //
diff --git a/code/fgame/g_bot.h b/code/fgame/g_bot.h
index c41031bd..3eb222dc 100644
--- a/code/fgame/g_bot.h
+++ b/code/fgame/g_bot.h
@@ -23,19 +23,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #pragma once
 
 struct saved_bot_t {
-    client_persistant_t pers;
-    bool                bValid;
-
-    saved_bot_t()
-        : bValid(false)
-    {}
+    char userinfo[MAX_INFO_STRING];
 };
 
 void       G_BotBegin(gentity_t *ent);
 void       G_BotThink(gentity_t *ent, int msec);
 void       G_BotShift(int clientNum);
 gentity_t *G_GetFirstBot();
-void       G_AddBot(saved_bot_t *saved = NULL);
+void       G_AddBot(const saved_bot_t *saved = NULL);
 void       G_AddBots(unsigned int num);
 void       G_RemoveBot(gentity_t *ent);
 void       G_RemoveBots(unsigned int num);
@@ -44,4 +39,5 @@ bool       G_IsPlayer(gentity_t *ent);
 void       G_ResetBots();
 void       G_BotInit();
 void       G_BotFrame();
+void       G_BotPostInit();
 void       G_SpawnBots();
\ No newline at end of file
diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index c68fcb33..4c20f06e 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -832,7 +832,14 @@ void G_BotConnect(int clientNum, qboolean firstTime, const char *userinfo)
 
     // read the session data
     memset(client, 0, sizeof(*client));
-    G_InitClientPersistant(client, userinfo);
+    if (firstTime) {
+        memset(client, 0, sizeof(*client));
+        if (!game.autosaved) {
+            G_InitClientPersistant(client, userinfo);
+        }
+    } else {
+        G_ReadClientSessionData(client);
+    }
 
     //
     // Use "localhost" as some code relies on it to check whether or not it should be kicked
@@ -903,7 +910,8 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     if ((strcmp(ip, "localhost") != 0)) {
         // check for a password
         value = Info_ValueForKey(userinfo, "password");
-        if (strcmp(sv_privatePassword->string, value) != 0 && *password->string && strcmp(password->string, value) != 0) {
+        if (strcmp(sv_privatePassword->string, value) != 0 && *password->string
+            && strcmp(password->string, value) != 0) {
             return "Invalid password";
         }
     }
@@ -979,6 +987,7 @@ void G_ClientBegin(gentity_t *ent, usercmd_t *cmd)
         } else {
             // a spawn point will completely reinitialize the entity
             level.spawn_entnum = ent->s.number;
+
             Player *player = new Player;
         }
 
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index cd1057fd..e725ec3c 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -375,7 +375,7 @@ void G_ServerSpawned(void)
     try {
         level.ServerSpawned();
 
-        G_SpawnBots();
+        G_BotPostInit();
     } catch (const ScriptException& e) {
         G_ExitWithError(e.string.c_str());
     }

From 8667d11c5299011dd1db3d8d6cda5a897268bfe3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 11 Oct 2024 20:29:32 +0200
Subject: [PATCH 1145/2040] Prevent SV_DropClient() from being called
 recursively if the client is dropped by a kick or timeout and has too many
 reliable commands

---
 code/server/sv_client.c | 10 ++++++++++
 code/server/sv_main.c   |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 7be88ed8..8f7a99f6 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -642,6 +642,16 @@ void SV_DropClient( client_t *drop, const char *reason ) {
 	// Free all allocated data on the client structure
 	SV_FreeClient(drop);
 
+	// Reset the reliable sequence to the currently acknowledged command
+	// This prevents SV_AddServerCommand() from making another recursive call to SV_DropClient()
+	// if the client lacks sufficient space for another reliable command
+	// it also guarantees that the client receives both the print and disconnect commands
+	drop->reliableSequence = drop->reliableAcknowledge;
+	// Setting the gamestate message number to -1 ensures that SV_AddServerCommand()
+	// will not call SV_DropClient() again, even though it is unlikely the client
+	// will receive many server commands during the drop
+	drop->gamestateMessageNum = -1;
+
 	// tell everyone why they got dropped
 	SV_SendServerCommand( NULL, "print \"%s %s\n\"", drop->name, reason );
 
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 8b81355d..b6cb8363 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -174,6 +174,12 @@ void SV_AddServerCommand( client_t *client, const char *cmd ) {
 	// we check == instead of >= so a broadcast print added by SV_DropClient()
 	// doesn't cause a recursive drop client
 	if ( client->reliableSequence - client->reliableAcknowledge == MAX_RELIABLE_COMMANDS + 1 ) {
+		if ( client->gamestateMessageNum == -1 )  {
+			// invalid game state message 
+			// this can occur in SV_DropClient() to avoid calling it more than once
+			return;
+		}
+
 		Com_Printf( "===== pending server commands =====\n" );
 		for ( i = client->reliableAcknowledge + 1 ; i <= client->reliableSequence ; i++ ) {
 			Com_Printf( "cmd %5d: %s\n", i, client->reliableCommands[ i & (MAX_RELIABLE_COMMANDS-1) ] );

From 4f2907ef777325a9a2c568c592fd833320325d33 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 12 Oct 2024 01:16:04 +0200
Subject: [PATCH 1146/2040] Remove LADDER_HAND_HEIGHT (useless)

---
 code/fgame/player_conditionals.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index ddd6c777..f4a28bb8 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -1438,8 +1438,6 @@ qboolean Player::CondPull(Conditional& condition)
     return qfalse;
 }
 
-#define LADDER_HAND_HEIGHT (MAXS_X - MINS_X)
-
 qboolean Player::CondLadder(Conditional& condition)
 {
     trace_t trace;

From 13698a959089ed6875d1399a0b96be363787f7fb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 12 Oct 2024 01:16:23 +0200
Subject: [PATCH 1147/2040] MINS and MAXS must be signed values

---
 code/fgame/bg_public.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 77e09aa9..bedc5ce8 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -30,15 +30,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define GAME_VERSION "mohaa-base-1"
 
-static const unsigned int MINS_X = -15;
-static const unsigned int MINS_Y = -15;
-static const unsigned int MINS_Z = 0; // IneQuation: bounding box and viewheights to match MoHAA
-static const unsigned int MAXS_X = 15;
-static const unsigned int MAXS_Y = 15;
-static const unsigned int MAXS_Z = 94;
+static const int MINS_X        = -15;
+static const int MINS_Y        = -15;
+static const int MINS_Z        = 0; // IneQuation: bounding box and viewheights to match MoHAA
+static const int MAXS_X        = 15;
+static const int MAXS_Y        = 15;
+static const int MAXS_Z        = 94;
+static const int DEAD_MINS_Z   = 32;
+static const int CROUCH_MAXS_Z = 49;
 
-static const unsigned int DEAD_MINS_Z           = 32;
-static const unsigned int CROUCH_MAXS_Z         = 49;
 static const unsigned int DEFAULT_VIEWHEIGHT    = 82;
 static const unsigned int CROUCH_RUN_VIEWHEIGHT = 64;
 static const unsigned int JUMP_START_VIEWHEIGHT = 52;

From 61a2b6a83743d5d41da1627d8186f374bf0c6fc5 Mon Sep 17 00:00:00 2001
From: Leszek Godlewski <github@inequation.org>
Date: Sun, 13 Oct 2024 00:25:17 +0200
Subject: [PATCH 1148/2040] Don't call into the OAL channel in
 S_OPENAL_GetMusicFilename if QAL init failed

Prevent a crash upon vid_restart
---
 code/client/snd_openal_new.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 46ec1c30..00d2f797 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2570,7 +2570,8 @@ S_OPENAL_GetMusicFilename
 */
 const char *S_OPENAL_GetMusicFilename()
 {
-    if (!openal.chan_trig_music.is_playing()) {
+    // Don't call into the channel if QAL initialisation did not succeed.
+    if (!al_initialized || !openal.chan_trig_music.is_playing()) {
         return "";
     }
     return openal.tm_filename;

From 037af5d728a04d7411b931d4ea226a973ecb8301 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 13 Oct 2024 11:31:49 +0200
Subject: [PATCH 1149/2040] Don't access the removed node

---
 code/fgame/navigate.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index eac92c28..3a7410da 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -3494,14 +3494,16 @@ void NavMaster::SetNodeTarget(Event *ev)
 
 void NavMaster::RemoveNode(Event *ev)
 {
+    str targetname;
     int num;
 
     CheckNodeSelected();
 
     num = selectedNode->nodenum;
+    targetname = selectedNode->targetname;
     AI_RemoveNode(selectedNode);
 
-    gi.Printf("Node %d removed\n", selectedNode->nodenum, selectedNode->targetname.c_str());
+    gi.Printf("Node %d removed\n", num, targetname.c_str());
 }
 
 void NavMaster::CheckNodeSelected()

From b1c5d6c62aece1754cc1c4e79eaf4f1f8fbc0c15 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 13 Oct 2024 11:32:20 +0200
Subject: [PATCH 1150/2040] Increase the backtrace size to 64

---
 code/sys/new/sys_unix_new.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sys/new/sys_unix_new.c b/code/sys/new/sys_unix_new.c
index 6146f477..023e9429 100644
--- a/code/sys/new/sys_unix_new.c
+++ b/code/sys/new/sys_unix_new.c
@@ -49,7 +49,7 @@ Sys_PrintBackTrace
 ==================
 */
 void Sys_PrintBackTrace() {
-    void* backtrace_arr[20];
+    void* backtrace_arr[64];
     size_t backtrace_size;
 
     printf("----\nBacktrace:\n");

From 032fb9b5bad5aaab3903ceaebafa36c541539cd6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 13 Oct 2024 22:09:38 +0200
Subject: [PATCH 1151/2040] Make sure to delete all conditional objects

This fixes the issue where memory would be leaked by conditionals
---
 code/fgame/player.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 5b2e1c42..e023440d 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4973,10 +4973,25 @@ void Player::InitTorsoStateTable(void)
 
 void Player::LoadStateTable(void)
 {
+    int i;
+    Conditional* cond;
+
     statemap_Legs  = NULL;
     statemap_Torso = NULL;
 
+    //
+    // Free existing conditionals
+    //
+    for (i = legs_conditionals.NumObjects(); i > 0; i--) {
+        cond = legs_conditionals.ObjectAt(i);
+        delete cond;
+    }
     legs_conditionals.FreeObjectList();
+
+    for (i = torso_conditionals.NumObjects(); i > 0; i--) {
+        cond = torso_conditionals.ObjectAt(i);
+        delete cond;
+    }
     torso_conditionals.FreeObjectList();
 
     statemap_Legs =

From 8c2b92d151338afd627abfbeae5503bf77f1ecfe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 13 Oct 2024 23:22:13 +0200
Subject: [PATCH 1152/2040] Remove player from turret when deleted

---
 code/fgame/player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index e023440d..24f70e41 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2201,6 +2201,11 @@ Player::~Player()
     legs_conditionals.FreeObjectList();
     torso_conditionals.FreeObjectList();
 
+    // Added in 2.11
+    //  Make sure to clean turret stuff up
+    //  when the player is deleted
+    RemoveFromVehiclesAndTurrets();
+
     entflags &= ~ECF_PLAYER;
 }
 

From 2e673a6bc9e29f4b65541397c4c7640168b0dce4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 13 Oct 2024 23:22:41 +0200
Subject: [PATCH 1153/2040] Delete posted events when canceling

---
 code/qcommon/listener.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index d21e8985..4b88f2b5 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -2595,6 +2595,7 @@ void Listener::CancelEventsOfType(Event *ev)
         next = node->next;
         if ((node->GetSourceObject() == this) && (node->event->eventnum == eventnum)) {
             LL_Remove(node, next, prev);
+            delete node->event;
             delete node;
         }
         node = next;
@@ -2627,6 +2628,11 @@ void Listener::CancelFlaggedEvents(int flags)
         next = node->next;
         if ((node->GetSourceObject() == this) && (node->flags & flags)) {
             LL_Remove(node, next, prev);
+            // Added in OPM
+            //  Original doesn't delete the posted Event
+            //  which would cause a memory leak
+            delete node->event;
+
             delete node;
         }
         node = next;
@@ -2649,6 +2655,7 @@ void Listener::CancelPendingEvents(void)
         next = node->next;
         if (node->GetSourceObject() == this) {
             LL_Remove(node, next, prev);
+            delete node->event;
             delete node;
         }
         node = next;

From 8f8b75e0aa3a21c71e670326587bc3e68837e589 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 14 Oct 2024 20:34:19 +0200
Subject: [PATCH 1154/2040] Set symbols visibility to hidden by default

This fixes an issue where shared libraries would use functions from in the executable because they have the same name, which would cause memory corruption
---
 CMakeLists.txt | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d8e1163..0459605d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,23 +23,38 @@ endif()
 set(TARGET_BASE_GAME "./")
 set(CMAKE_DEBUG_POSTFIX "-dbg")
 
+#
+# Microsoft compiler specific parameters
+#
 if(MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
 	# Treat no return type as error
 	add_compile_options(/we4715)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+#
+# Clang and GCC specific parameters
+#
+if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	add_compile_options(-Wno-comment)
 	# Treat no return type as error
 	add_compile_options(-Werror=return-type)
+	# Don't export symbols, there are some OSes that can resolve symbols
+	# globally
+	add_compile_options(-fvisibility=hidden)
 endif()
 
+#
+# Clang specific parameters
+#
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# Ignore warnings for code like 'assert("Assert string")'
 	add_compile_options(-Wno-pointer-bool-conversion)
 endif()
 
+#
+# GCC specific parameters
+#
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	# Add this option on gcc to prevent functions from having the STB_GNU_UNIQUE binding
 	# Otherwise, it would prevent libraries from being unloaded

From ddbdcc91ddea10010c3d674301244fcc6a0487f2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 19:22:54 +0200
Subject: [PATCH 1155/2040] Don't use an offset for the reverse table

---
 code/qcommon/con_arrayset.h | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/code/qcommon/con_arrayset.h b/code/qcommon/con_arrayset.h
index 2a0ac750..753c1e2c 100644
--- a/code/qcommon/con_arrayset.h
+++ b/code/qcommon/con_arrayset.h
@@ -128,7 +128,7 @@ con_arrayset<key, value>::con_arrayset()
     tableLengthIndex = 0;
 
     defaultEntry = NULL;
-    reverseTable = (&this->defaultEntry) - 1;
+    reverseTable = &this->defaultEntry;
 }
 
 template<typename key, typename value>
@@ -184,14 +184,13 @@ void con_arrayset<key, value>::resize(int count)
     }
 
     // allocate a bigger reverse table
-    reverseTable = (new Entry *[this->tableLength]()) - 1;
+    reverseTable = new Entry *[this->tableLength]();
 
-    for (i = 1; i <= oldTableLength; i++) {
+    for (i = 0; i < oldTableLength; i++) {
         reverseTable[i] = oldReverseTable[i];
     }
 
     if (oldTableLength > 1) {
-        ++oldReverseTable;
         delete[] oldReverseTable;
     }
 }
@@ -209,10 +208,9 @@ void con_arrayset<key, value>::clear()
     Entry       *next  = NULL;
     unsigned int i;
 
-    if (this->tableLength > 1) {
-        reverseTable++;
+    if (tableLength > 1) {
         delete[] reverseTable;
-        reverseTable = (&this->defaultEntry) - 1;
+        reverseTable = &defaultEntry;
     }
 
     for (i = 0; i < tableLength; i++) {
@@ -278,8 +276,6 @@ typename con_arrayset<k, v>::Entry *con_arrayset<k, v>::addNewKeyEntry(const k&
 
     index = HashCode<k>(key) % tableLength;
 
-    count++;
-
     entry = new Entry;
 
     if (defaultEntry == NULL) {
@@ -289,11 +285,12 @@ typename con_arrayset<k, v>::Entry *con_arrayset<k, v>::addNewKeyEntry(const k&
         entry->next = table[index];
     }
 
+    reverseTable[count] = entry;
+    count++;
+
     entry->key   = key;
     entry->index = count;
-
-    table[index]        = entry;
-    reverseTable[count] = entry;
+    table[index] = entry;
 
     return entry;
 }
@@ -331,7 +328,7 @@ bool con_arrayset<k, v>::remove(const k& key)
 {
     int i;
 
-    for (i = 1; i <= this->tableLength; i++) {
+    for (i = 0; i < tableLength; i++) {
         if (reverseTable[i] && reverseTable[i]->key == key) {
             reverseTable[i] = NULL;
         }
@@ -343,7 +340,7 @@ bool con_arrayset<k, v>::remove(const k& key)
 template<typename key, typename value>
 value& con_arrayset<key, value>::operator[](unsigned int index)
 {
-    return reverseTable[index]->key;
+    return reverseTable[index - 1]->key;
 }
 
 template<typename key, typename value>

From 581585a47cdee3d29bcfb3f78ba8c5f4360cb88c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 20:52:53 +0200
Subject: [PATCH 1156/2040] Prevent clearing the event command list if the
 event system is not initialized

This fixes the issue where the game could crash (especially in optimized release) due to a memory corruption, because the event command list was deconstructed earlier
---
 code/fgame/scriptmaster.cpp | 7 +++++++
 code/qcommon/listener.cpp   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 71fbc3c7..ce3fa48e 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -533,6 +533,13 @@ void ScriptMaster::InitConstStrings(void)
         AddString(ConstStrings[i]);
     }
 
+    if (!Listener::EventSystemStarted) {
+        // Added in OPM
+        //  This usually means the game module is getting destroyed
+        //  most often, the event command list has been destroyed earlier
+        return;
+    }
+
     Event::normalCommandList.clear();
     Event::returnCommandList.clear();
     Event::getterCommandList.clear();
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 4b88f2b5..8d744950 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -612,6 +612,12 @@ void L_ShutdownEvents(void)
 
     Event::commandList.clear();
     Event::eventDefList.clear();
+#ifdef WITH_SCRIPT_ENGINE
+    Event::normalCommandList.clear();
+    Event::returnCommandList.clear();
+    Event::getterCommandList.clear();
+    Event::setterCommandList.clear();
+#endif
 
     Listener::EventSystemStarted = false;
 }

From f6b459b408df864bea998b4e87ef9e55b00cacfe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 22:49:23 +0200
Subject: [PATCH 1157/2040] Correctly copy long/short taking into account
 memory overlaps

---
 code/qcommon/q_shared.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index b64c516c..3912e3c6 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1482,20 +1482,26 @@ void CopyShortSwap(void* dest, const void* src)
 {
 	const byte* from = src;
 	byte* to = dest;
+	byte tmp[2];
 
-	to[0] = from[1];
-	to[1] = from[0];
+	Com_Memcpy(tmp, from, sizeof(tmp));
+
+	to[0] = tmp[1];
+	to[1] = tmp[0];
 }
 
 void CopyLongSwap(void* dest, const void* src)
 {
 	const byte* from = src;
 	byte* to = dest;
+	byte tmp[4];
 
-	to[0] = from[3];
-	to[1] = from[2];
-	to[2] = from[1];
-	to[3] = from[0];
+	Com_Memcpy(tmp, from, sizeof(tmp));
+
+	to[0] = tmp[3];
+	to[1] = tmp[2];
+	to[2] = tmp[1];
+	to[3] = tmp[0];
 }
 
 void SwapValue(void* dest, size_t size) {

From d78d8abb9f9b9f5ee8dd42a9189c936e697e891c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:07:58 +0200
Subject: [PATCH 1158/2040] Correctly load SKB models on big endian
 architectures

---
 code/tiki/tiki_skel.cpp | 93 +++++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 37 deletions(-)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 14d6debf..6fb825e9 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -205,8 +205,8 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         char    *pMorphTargets;
         intptr_t nLen;
 
-        nBoxBytes                 = pHeader->numBoxes * sizeof(skelHitBox_t);
-        pMorphTargets             = (char *)((byte *)pHeader + pHeader->ofsMorphTargets);
+        nBoxBytes     = pHeader->numBoxes * sizeof(skelHitBox_t);
+        pMorphTargets = (char *)((byte *)pHeader + pHeader->ofsMorphTargets);
 
         if (pHeader->ofsMorphTargets > 0 || (pHeader->ofsMorphTargets + pHeader->numMorphTargets) < length) {
             for (i = 0; i < pHeader->numMorphTargets; i++) {
@@ -315,7 +315,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         pGameSurf->pCollapse = (skelIndex_t *)gs_ptr;
         gs_ptr += sizeof(*pGameSurf->pCollapse) * numVerts;
         if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
-            pGameSurf->pCollapseIndex = (skelIndex_t*)gs_ptr;
+            pGameSurf->pCollapseIndex = (skelIndex_t *)gs_ptr;
             gs_ptr += sizeof(*pGameSurf->pCollapseIndex) * numVerts;
         }
 
@@ -447,7 +447,7 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
         if (pHeader->ofsBoxes <= 0 || (nBoxBytes + pHeader->ofsBoxes) > length) {
             Com_Printf("^~^~^ Box data is corrupted for '%s'\n", cache->path);
             pSkel->numBoxes = 0;
-            pSkel->pBoxes = NULL;
+            pSkel->pBoxes   = NULL;
         } else {
             memcpy(pSkel->pBoxes, ((byte *)pHeader + pHeader->ofsBoxes), nBoxBytes);
         }
@@ -588,28 +588,35 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
         return qfalse;
     }
 
+    TIKI_SwapSkel(pheader);
+
     surf = (skelSurface_t *)((char *)pheader + pheader->ofsSurfaces);
     for (i = 0; i < pheader->numSurfaces; i++) {
-        if (surf->numVerts > TIKI_MAX_VERTEXES) {
+        int numSurfVerts, numSurfTriangles;
+
+        numSurfVerts     = LongNoSwapPtr(&surf->numVerts);
+        numSurfTriangles = LongNoSwapPtr(&surf->numTriangles);
+
+        if (numSurfVerts > TIKI_MAX_VERTEXES) {
             TIKI_Error(
-                "TIKI_LoadSKB: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts
+                "TIKI_LoadSKB: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, numSurfVerts
             );
             TIKI_Free(pheader);
             return qfalse;
         }
 
-        if (surf->numTriangles > TIKI_MAX_TRIANGLES) {
+        if (numSurfTriangles > TIKI_MAX_TRIANGLES) {
             TIKI_Error(
                 "TIKI_LoadSKB: %s has more than %i triangles on a surface (%i)",
                 path,
                 TIKI_MAX_TRIANGLES,
-                surf->numTriangles
+                numSurfTriangles
             );
             TIKI_Free(pheader);
             return qfalse;
         }
 
-        surf = (skelSurface_t *)((char *)surf + surf->ofsEnd);
+        surf = (skelSurface_t *)((char *)surf + LongNoSwapPtr(&surf->ofsEnd));
     }
 
     if (pheader->numBones > TIKI_MAX_BONES) {
@@ -621,8 +628,8 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
     totalVerts = 0;
     surf       = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
     for (i = 0; i < pheader->numSurfaces; i++) {
-        totalVerts += surf->numVerts;
-        surf = (skelSurface_t *)((byte *)surf + surf->ofsEnd);
+        totalVerts += LongNoSwapPtr(&surf->numVerts);
+        surf = (skelSurface_t *)((byte *)surf + LongNoSwapPtr(&surf->ofsEnd));
     }
 
     newLength = totalVerts * sizeof(unsigned int);
@@ -645,47 +652,60 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
     for (i = 0; i < pheader->numSurfaces; i++) {
         skeletorVertex_t *newVerts;
         skelVertex_t     *oldVerts;
+        int               numVerts;
 
         memcpy(newSurf, oldSurf, oldSurf->ofsVerts);
-        if (newSurf->ofsCollapse > newSurf->ofsVerts) {
-            newSurf->ofsCollapse += sizeof(unsigned int) * newSurf->numVerts;
+        if (newSurf->ofsCollapse > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset =
+                LongNoSwapPtr(&newSurf->ofsCollapse) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsCollapse));
         }
-        if (newSurf->ofsCollapseIndex > newSurf->ofsVerts) {
-            newSurf->ofsCollapseIndex += sizeof(unsigned int) * newSurf->numVerts;
+        if (newSurf->ofsCollapseIndex > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset =
+                LongNoSwapPtr(&newSurf->ofsCollapseIndex) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsCollapseIndex));
         }
-        if (newSurf->ofsTriangles > newSurf->ofsVerts) {
-            newSurf->ofsTriangles += sizeof(unsigned int) * newSurf->numVerts;
+        if (newSurf->ofsTriangles > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset =
+                LongNoSwapPtr(&newSurf->ofsTriangles) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsTriangles));
         }
-        if (newSurf->ofsEnd > newSurf->ofsVerts) {
-            newSurf->ofsEnd += sizeof(unsigned int) * newSurf->numVerts;
+        if (newSurf->ofsEnd > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset = LongNoSwapPtr(&newSurf->ofsEnd) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsEnd));
         }
 
         oldVerts = (skelVertex_t *)((byte *)oldSurf + oldSurf->ofsVerts);
         newVerts = (skeletorVertex_t *)((byte *)newSurf + newSurf->ofsVerts);
 
-        for (j = 0; j < oldSurf->numVerts; j++) {
-            VectorCopy(oldVerts->normal, newVerts->normal);
-            newVerts->texCoords[0] = oldVerts->texCoords[0];
-            newVerts->texCoords[1] = oldVerts->texCoords[1];
-            newVerts->numMorphs    = 0;
-            newVerts->numWeights   = oldVerts->numWeights;
+        numVerts = LongNoSwapPtr(&oldSurf->numVerts);
+        for (j = 0; j < numVerts; j++) {
+            int numMorphs, numWeights;
+
+            memcpy(newVerts->normal, oldVerts->normal, sizeof(newVerts->normal));
+            memcpy(newVerts->texCoords, oldVerts->texCoords, sizeof(newVerts->texCoords));
+
+            numMorphs  = 0;
+            numWeights = LongNoSwapPtr(&oldVerts->numWeights);
+            memcpy(&newVerts->numMorphs, &numMorphs, sizeof(newVerts->numMorphs));
+            memcpy(&newVerts->numWeights, &numWeights, sizeof(newVerts->numWeights));
 
             skelWeight_t *newWeights = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
 
-            for (k = 0; k < oldVerts->numWeights; k++) {
+            for (k = 0; k < numWeights; k++) {
                 memcpy(newWeights, &oldVerts->weights[k], sizeof(skelWeight_t));
                 newWeights++;
             }
 
-            oldVerts = (skelVertex_t *)((byte *)oldVerts + sizeof(skelWeight_t) * oldVerts->numWeights
+            oldVerts = (skelVertex_t *)((byte *)oldVerts + sizeof(skelWeight_t) * numWeights
                                         + (sizeof(skelVertex_t) - sizeof(skelWeight_t)));
-            newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
-                                            + sizeof(skelWeight_t) * newVerts->numWeights);
+            newVerts =
+                (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t) + sizeof(skelWeight_t) * numWeights);
         }
 
-        memcpy(newVerts, oldVerts, oldSurf->ofsEnd - ((byte *)oldVerts - (byte *)oldSurf));
-        oldSurf = (skelSurface_t *)((byte *)oldSurf + oldSurf->ofsEnd);
-        newSurf = (skelSurface_t *)((byte *)newSurf + newSurf->ofsEnd);
+        memcpy(newVerts, oldVerts, LongNoSwapPtr(&oldSurf->ofsEnd) - ((byte *)oldVerts - (byte *)oldSurf));
+        oldSurf = (skelSurface_t *)((byte *)oldSurf + LongNoSwapPtr(&oldSurf->ofsEnd));
+        newSurf = (skelSurface_t *)((byte *)newSurf + LongNoSwapPtr(&newSurf->ofsEnd));
     }
 
     memcpy(newSurf, oldSurf, pheader->ofsEnd - ((char *)oldSurf - (char *)pheader));
@@ -763,8 +783,8 @@ void GetLODFile(skelcache_t *cache)
         }
 
         for (i = 0; i < MAX_LOD_CURVE_CONSTS; i++) {
-            LOD->consts[i].base = LittleFloat(LOD->consts[i].base);
-            LOD->consts[i].scale = LittleFloat(LOD->consts[i].scale);
+            LOD->consts[i].base   = LittleFloat(LOD->consts[i].base);
+            LOD->consts[i].scale  = LittleFloat(LOD->consts[i].scale);
             LOD->consts[i].cutoff = LittleFloat(LOD->consts[i].cutoff);
         }
     } else {
@@ -873,8 +893,7 @@ qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
     for (i = 0; i < pheader->numSurfaces; i++) {
         if (surf->numVerts > TIKI_MAX_VERTEXES) {
             TIKI_Error(
-                "TIKI_LoadSKD: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES,
-                surf->numVerts
+                "TIKI_LoadSKD: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts
             );
             TIKI_FreeFile(pheader);
             return qfalse;

From 53c09b534273019f9bb4f3553896cef1b9178367 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:10:04 +0200
Subject: [PATCH 1159/2040] Correctly swap skeletons for CPUs that don't
 support misaligned memory access

---
 code/qcommon/tiki_main.cpp | 185 ++++++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 85 deletions(-)

diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index 4ad22bd9..66489025 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -228,19 +228,19 @@ TIKI_SwapSkel
 Swap the skeleton header on Big-Endian systems
 ===============
 */
-void TIKI_SwapSkel(skelHeader_t* pheader)
+void TIKI_SwapSkel(skelHeader_t *pheader)
 {
 #ifdef Q3_BIG_ENDIAN
-    skelSurface_t* pSurf;
-    int i, j, k;
+    skelSurface_t *pSurf;
+    int            i, j, k;
 
     //pheader->ident = LittleLong(pheader->ident);
-    pheader->version = LittleLong(pheader->version);
+    pheader->version     = LittleLong(pheader->version);
     pheader->numSurfaces = LittleLong(pheader->numSurfaces);
-    pheader->numBones = LittleLong(pheader->numBones);
-    pheader->ofsBones = LittleLong(pheader->ofsBones);
+    pheader->numBones    = LittleLong(pheader->numBones);
+    pheader->ofsBones    = LittleLong(pheader->ofsBones);
     pheader->ofsSurfaces = LittleLong(pheader->ofsSurfaces);
-    pheader->ofsEnd = LittleLong(pheader->ofsEnd);
+    pheader->ofsEnd      = LittleLong(pheader->ofsEnd);
 
     if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
         for (i = 0; i < TIKI_SKEL_LOD_INDEXES; i++) {
@@ -261,131 +261,146 @@ void TIKI_SwapSkel(skelHeader_t* pheader)
     }
 
     if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
-        boneFileData_t* boneBuffer;
+        boneFileData_t *boneBuffer;
 
-        boneBuffer = (boneFileData_t*)((byte*)pheader + pheader->ofsBones);
+        boneBuffer = (boneFileData_t *)((byte *)pheader + pheader->ofsBones);
         for (i = 0; i < pheader->numBones; i++) {
-            boneBuffer->boneType = (boneType_t)LittleLong(boneBuffer->boneType);
-            boneBuffer->ofsBaseData = LittleLong(boneBuffer->ofsBaseData);
+            boneBuffer->boneType        = (boneType_t)LittleLong(boneBuffer->boneType);
+            boneBuffer->ofsBaseData     = LittleLong(boneBuffer->ofsBaseData);
             boneBuffer->ofsChannelNames = LittleLong(boneBuffer->ofsChannelNames);
-            boneBuffer->ofsBoneNames = LittleLong(boneBuffer->ofsBoneNames);
-            boneBuffer->ofsEnd = LittleLong(boneBuffer->ofsEnd);
+            boneBuffer->ofsBoneNames    = LittleLong(boneBuffer->ofsBoneNames);
+            boneBuffer->ofsEnd          = LittleLong(boneBuffer->ofsEnd);
 
-            boneBuffer = (boneFileData_t*)((byte*)boneBuffer + boneBuffer->ofsEnd);
+            boneBuffer = (boneFileData_t *)((byte *)boneBuffer + boneBuffer->ofsEnd);
         }
     } else {
-        skelBoneName_t* TIKI_bones;
+        skelBoneName_t *TIKI_bones;
 
-        TIKI_bones = (skelBoneName_t*)((byte*)pheader + pheader->ofsBones);
+        TIKI_bones = (skelBoneName_t *)((byte *)pheader + pheader->ofsBones);
 
         for (i = 0; i < pheader->numBones; i++) {
-            TIKI_bones->parent = LittleShort(TIKI_bones->parent);
+            TIKI_bones->parent   = LittleShort(TIKI_bones->parent);
             TIKI_bones->boxIndex = LittleShort(TIKI_bones->boxIndex);
-            TIKI_bones->flags = LittleLong(TIKI_bones->flags);
+            TIKI_bones->flags    = LittleLong(TIKI_bones->flags);
 
             TIKI_bones++;
         }
     }
 
-    pSurf = (skelSurface_t*)((byte*)pheader + pheader->ofsSurfaces);
+    pSurf = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
     for (i = 0; i < pheader->numSurfaces; i++) {
-        skeletorVertex_t* pVert;
-        skeletorMorph_t* pMorph;
-        skelWeight_t* pWeight;
-        int* pTriangles;
-        int* pCollapse, * pCollapseIndex;
+        skeletorMorph_t *pMorph;
+        skelWeight_t    *pWeight;
+        int             *pTriangles;
+        int             *pCollapse, *pCollapseIndex;
+        int              numVerts, numTriangles;
 
-        pSurf->ident = LittleLong(pSurf->ident);
-        pSurf->numTriangles = LittleLong(pSurf->numTriangles);
-        pSurf->numVerts = LittleLong(pSurf->numVerts);
-        pSurf->staticSurfProcessed = LittleLong(pSurf->staticSurfProcessed);
-        pSurf->ofsTriangles = LittleLong(pSurf->ofsTriangles);
-        pSurf->ofsVerts = LittleLong(pSurf->ofsVerts);
-        pSurf->ofsCollapse = LittleLong(pSurf->ofsCollapse);
-        pSurf->ofsEnd = LittleLong(pSurf->ofsEnd);
+        CopyLittleLong(&pSurf->ident, &pSurf->ident);
+        CopyLittleLong(&pSurf->numTriangles, &pSurf->numTriangles);
+        CopyLittleLong(&pSurf->numVerts, &pSurf->numVerts);
+        CopyLittleLong(&pSurf->staticSurfProcessed, &pSurf->staticSurfProcessed);
+        CopyLittleLong(&pSurf->ofsTriangles, &pSurf->ofsTriangles);
+        CopyLittleLong(&pSurf->ofsVerts, &pSurf->ofsVerts);
+        CopyLittleLong(&pSurf->ofsCollapse, &pSurf->ofsCollapse);
+        CopyLittleLong(&pSurf->ofsEnd, &pSurf->ofsEnd);
+
+        numVerts     = LongNoSwapPtr(&pSurf->numVerts);
+        numTriangles = LongNoSwapPtr(&pSurf->numTriangles);
 
         if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
-            pSurf->ofsCollapseIndex = LittleLong(pSurf->ofsCollapseIndex);
+            CopyLittleLong(&pSurf->ofsCollapseIndex, &pSurf->ofsCollapseIndex);
         }
 
-        pTriangles = (int*)((byte*)pSurf + pSurf->ofsTriangles);
-        for (j = 0; j < pSurf->numTriangles; j++) {
-            pTriangles[j * 3 + 0] = LittleLong(pTriangles[j * 3 + 0]);
-            pTriangles[j * 3 + 1] = LittleLong(pTriangles[j * 3 + 1]);
-            pTriangles[j * 3 + 2] = LittleLong(pTriangles[j * 3 + 2]);
+        pTriangles = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsTriangles));
+        for (j = 0; j < numTriangles; j++) {
+            CopyLittleLong(&pTriangles[j * 3 + 0], &pTriangles[j * 3 + 0]);
         }
 
         if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
-            pVert = (skeletorVertex_t*)((byte*)pSurf + pSurf->ofsVerts);
+            skeletorVertex_t *pVert = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
-            for (j = 0; j < pSurf->numVerts; j++) {
-                pVert->normal[0] = LittleFloat(pVert->normal[0]);
-                pVert->normal[1] = LittleFloat(pVert->normal[1]);
-                pVert->normal[2] = LittleFloat(pVert->normal[2]);
-                pVert->texCoords[0] = LittleFloat(pVert->texCoords[0]);
-                pVert->texCoords[1] = LittleFloat(pVert->texCoords[1]);
+            for (j = 0; j < numVerts; j++) {
+                int numMorphs, numWeights;
 
-                pVert->numMorphs = LittleLong(pVert->numMorphs);
-                pMorph = (skeletorMorph_t*)((byte*)pVert + sizeof(*pVert));
+                CopyLittleLong(&pVert->normal[0], &pVert->normal[0]);
+                CopyLittleLong(&pVert->normal[1], &pVert->normal[1]);
+                CopyLittleLong(&pVert->normal[2], &pVert->normal[2]);
+                CopyLittleLong(&pVert->texCoords[0], &pVert->texCoords[0]);
+                CopyLittleLong(&pVert->texCoords[1], &pVert->texCoords[1]);
 
-                for (k = 0; k < pVert->numMorphs; k++, pMorph++) {
-                    pMorph->morphIndex = LittleLong(pMorph->morphIndex);
-                    pMorph->offset[0] = LittleFloat(pMorph->offset[0]);
-                    pMorph->offset[1] = LittleFloat(pMorph->offset[1]);
-                    pMorph->offset[2] = LittleFloat(pMorph->offset[2]);
+                numMorphs = LittleLong(pVert->numMorphs);
+                memcpy(&pVert->numMorphs, &numMorphs, sizeof(pVert->numMorphs));
+
+                pMorph = (skeletorMorph_t *)((byte *)pVert + sizeof(*pVert));
+
+                for (k = 0; k < numMorphs; k++, pMorph++) {
+                    int    morphIndex;
+                    vec3_t offset;
+
+                    CopyLittleLong(&pMorph->morphIndex, &pMorph->morphIndex);
+                    CopyLittleLong(&pMorph->offset[0], &pMorph->offset[0]);
+                    CopyLittleLong(&pMorph->offset[1], &pMorph->offset[1]);
+                    CopyLittleLong(&pMorph->offset[2], &pMorph->offset[2]);
                 }
 
-                pVert->numWeights = LittleLong(pVert->numWeights);
-                pWeight = (skelWeight_t*)pMorph;
+                numWeights = LittleLong(pVert->numWeights);
+                memcpy(&pVert->numWeights, &numWeights, sizeof(pVert->numWeights));
 
-                for (k = 0; k < pVert->numWeights; k++, pWeight++) {
-                    pWeight->boneIndex = LittleLong(pWeight->boneIndex);
-                    pWeight->boneWeight = LittleFloat(pWeight->boneWeight);
-                    pWeight->offset[0] = LittleFloat(pWeight->offset[0]);
-                    pWeight->offset[1] = LittleFloat(pWeight->offset[1]);
-                    pWeight->offset[2] = LittleFloat(pWeight->offset[2]);
+                pWeight = (skelWeight_t *)pMorph;
+
+                for (k = 0; k < numWeights; k++, pWeight++) {
+                    CopyLittleLong(&pWeight->boneIndex, &pWeight->boneIndex);
+                    CopyLittleLong(&pWeight->boneWeight, &pWeight->boneWeight);
+                    CopyLittleLong(&pWeight->offset[0], &pWeight->offset[0]);
+                    CopyLittleLong(&pWeight->offset[1], &pWeight->offset[1]);
+                    CopyLittleLong(&pWeight->offset[2], &pWeight->offset[2]);
                 }
 
-                pVert = (skeletorVertex_t*)pWeight;
+                pVert = (skeletorVertex_t *)pWeight;
             }
         } else {
-            pVert = (skeletorVertex_t*)((byte*)pSurf + pSurf->ofsVerts);
+            skelVertex_t *pVert = (skelVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
-            for (j = 0; j < pSurf->numVerts; j++) {
-                pVert->normal[0] = LittleFloat(pVert->normal[0]);
-                pVert->normal[1] = LittleFloat(pVert->normal[1]);
-                pVert->normal[2] = LittleFloat(pVert->normal[2]);
-                pVert->texCoords[0] = LittleFloat(pVert->texCoords[0]);
-                pVert->texCoords[1] = LittleFloat(pVert->texCoords[1]);
-                pVert->numWeights = LittleLong(pVert->numWeights);
+            for (j = 0; j < numVerts; j++) {
+                vec3_t normal, texCoords;
+                int    numWeights;
 
-                pWeight = (skelWeight_t*)((byte*)pVert + sizeof(*pVert));
+                CopyLittleLong(&pVert->normal[0], &pVert->normal[0]);
+                CopyLittleLong(&pVert->normal[1], &pVert->normal[1]);
+                CopyLittleLong(&pVert->normal[2], &pVert->normal[2]);
+                CopyLittleLong(&pVert->texCoords[0], &pVert->texCoords[0]);
+                CopyLittleLong(&pVert->texCoords[1], &pVert->texCoords[1]);
 
-                for (k = 0; k < pVert->numWeights; k++, pWeight++) {
-                    pWeight->boneIndex = LittleLong(pWeight->boneIndex);
-                    pWeight->boneWeight = LittleFloat(pWeight->boneWeight);
-                    pWeight->offset[0] = LittleFloat(pWeight->offset[0]);
-                    pWeight->offset[1] = LittleFloat(pWeight->offset[1]);
-                    pWeight->offset[2] = LittleFloat(pWeight->offset[2]);
+                numWeights = LittleLong(pVert->numWeights);
+                memcpy(&pVert->numWeights, &numWeights, sizeof(pVert->numWeights));
+
+                pWeight = pVert->weights;
+
+                for (k = 0; k < numWeights; k++, pWeight++) {
+                    CopyLittleLong(&pWeight->boneIndex, &pWeight->boneIndex);
+                    CopyLittleLong(&pWeight->boneWeight, &pWeight->boneWeight);
+                    CopyLittleLong(&pWeight->offset[0], &pWeight->offset[0]);
+                    CopyLittleLong(&pWeight->offset[1], &pWeight->offset[1]);
+                    CopyLittleLong(&pWeight->offset[2], &pWeight->offset[2]);
                 }
 
-                pVert = (skeletorVertex_t*)pWeight;
+                pVert = (skelVertex_t *)pWeight;
             }
         }
 
-        pCollapse = (int*)((byte*)pSurf + pSurf->ofsCollapse);
-        for (j = 0; j < pSurf->numVerts; j++) {
-            pCollapse[j] = LittleLong(pCollapse[j]);
+        pCollapse = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapse));
+        for (j = 0; j < numVerts; j++) {
+            CopyLittleLong(&pCollapse[j], &pCollapse[j]);
         }
 
         if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
-            pCollapseIndex = (int*)((byte*)pSurf + pSurf->ofsCollapseIndex);
-            for (j = 0; j < pSurf->numVerts; j++) {
-                pCollapseIndex[j] = LittleLong(pCollapseIndex[j]);
+            pCollapseIndex = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapseIndex));
+            for (j = 0; j < numVerts; j++) {
+                CopyLittleLong(&pCollapseIndex[j], &pCollapseIndex[j]);
             }
         }
 
-        pSurf = (skelSurface_t*)((byte*)pSurf + pSurf->ofsEnd);
+        pSurf = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
     }
 #endif
 }

From 2b6fc0602a47aec1918215722dc3c82e26634b85 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:18:14 +0200
Subject: [PATCH 1160/2040] Avoid misaligned memory access

---
 code/qcommon/lz77.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/qcommon/lz77.cpp b/code/qcommon/lz77.cpp
index 57eacd3e..03743eae 100644
--- a/code/qcommon/lz77.cpp
+++ b/code/qcommon/lz77.cpp
@@ -584,6 +584,7 @@ LABEL_19:
 int cLZ77::Decompress( unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len )
 {
 	unsigned int t;
+	unsigned short s;
 
 	this->ip_end = &in[in_len];
 	*out_len = 0;
@@ -615,7 +616,7 @@ LABEL_5:
 			}
 			t += 15 + *this->ip++;
 		}
-		*(unsigned int*)this->op = *(unsigned int*)this->ip;
+		memcpy(this->op, this->ip, sizeof(unsigned int));
 		this->op += 4;
 		this->ip += 4;
 		if (--t)
@@ -632,7 +633,7 @@ LABEL_5:
 			{
 				do
 				{
-					*(unsigned int*)this->op = *(unsigned int*)this->ip;
+					memcpy(this->op, this->ip, sizeof(unsigned int));
 					this->op += 4;
 					this->ip += 4;
 					t -= 4;
@@ -686,7 +687,8 @@ LABEL_5:
 				t += 31 + *this->ip++;
 			}
 			this->m_pos = this->op - 1;
-			this->m_pos -= LittleUnsignedShort(*(unsigned short*)this->ip) >> 2;
+			CopyLittleShort(&s, this->ip);
+			this->m_pos -= s >> 2;
 			this->ip += 2;
 			goto LABEL_42;
 		}
@@ -712,7 +714,8 @@ LABEL_5:
 			}
 			t += 7 + *this->ip++;
 		}
-		this->m_pos -= LittleUnsignedShort(*(unsigned short*)this->ip) >> 2;
+		CopyLittleShort(&s, this->ip);
+		this->m_pos -= s >> 2;
 		this->ip += 2;
 		if (this->m_pos == this->op)
 			break;
@@ -731,13 +734,13 @@ LABEL_5:
 		}
 		else
 		{
-			*(unsigned int*)this->op = *(unsigned int*)this->m_pos;
+			memcpy(this->op, this->m_pos, sizeof(unsigned int));
 			this->op += 4;
 			this->m_pos += 4;
 			t -= 2;
 			do
 			{
-				*(unsigned int*)this->op = *(unsigned int*)this->m_pos;
+				memcpy(this->op, this->m_pos, sizeof(unsigned int));
 				this->op += 4;
 				this->m_pos += 4;
 				t -= 4;

From e00ebda641a1a089f0ec07d7e1d657ca441c1490 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:33:00 +0200
Subject: [PATCH 1161/2040] Disable compression for big endian systems

---
 code/fgame/archive.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index 647b9450..ac849cb9 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -109,6 +109,11 @@ const char *ArchiveFile::Filename(void)
 
 qboolean ArchiveFile::Compress()
 {
+#ifdef Q3_BIG_ENDIAN
+    // FIXME: Decompressing crashes on big-endian architectures
+    return false;
+#endif
+
     byte  *tempbuf;
     size_t out_len;
     size_t tempbuf_len;

From 7d1067108b58e4412e20e3fe777efb661bcc2502 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:33:26 +0200
Subject: [PATCH 1162/2040] Swap the archive type on big endian architectures

---
 code/fgame/archive.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index ac849cb9..a151ee7e 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -1123,7 +1123,8 @@ int Archiver::ReadType(void)
 
 void Archiver::WriteType(int type)
 {
-    archivefile.Write(&type, sizeof(type));
+    int nt = LittleLong(type);
+    archivefile.Write(&nt, sizeof(nt));
 }
 
 void Archiver::CheckType(int type)
@@ -1146,8 +1147,7 @@ void Archiver::CheckType(int type)
             }
         }
     } else {
-        int nt = LittleLong(type);
-        archivefile.Write(&nt, sizeof(nt));
+        WriteType(type);
     }
 }
 

From 6413e770e1515b2d128cfb5508fbba6942ca88b7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:46:21 +0200
Subject: [PATCH 1163/2040] Update compiling doc

---
 docs/compiling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compiling.md b/docs/compiling.md
index 393329bc..f29b9912 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -43,6 +43,6 @@ Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compi
 Visual Studio (2019 or 2022) is generally preferred.
 
 Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
-OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.23.1
+OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.23.1 rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
 
 Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.

From 6b6adf1147ec93f0fea50b9bae9ef96024be536b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 16 Oct 2024 18:28:41 +0200
Subject: [PATCH 1164/2040] Copy second and third triangles, this was forgotten

---
 code/qcommon/tiki_main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index 66489025..f5f58024 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.cpp
@@ -314,6 +314,8 @@ void TIKI_SwapSkel(skelHeader_t *pheader)
         pTriangles = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsTriangles));
         for (j = 0; j < numTriangles; j++) {
             CopyLittleLong(&pTriangles[j * 3 + 0], &pTriangles[j * 3 + 0]);
+            CopyLittleLong(&pTriangles[j * 3 + 1], &pTriangles[j * 3 + 1]);
+            CopyLittleLong(&pTriangles[j * 3 + 2], &pTriangles[j * 3 + 2]);
         }
 
         if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {

From e9a76f933b783a58d2508f11c211fd547f01849b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:52:47 +0200
Subject: [PATCH 1165/2040] Cast to int32 rather than uint32 when writing the
 packed velocity

This fixes an issue where the integer could overflow, on some platforms like ARM the integer would be 0
---
 code/qcommon/msg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 3b20d03f..a1b601a3 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2758,7 +2758,7 @@ int MSG_ReadPackedSimple(msg_t* msg, int fromValue, int bits)
 
 void MSG_WritePackedVelocity(msg_t* msg, float value, int bits)
 {
-	int32_t packed = (uint32_t)(value * 8.0f);
+	int32_t packed = (int32_t)(value * 8.0f);
 	if (value < 0) {
 		packed = ((-packed) & 65535) | 65536;
 	}

From 32da07ea80a3e9ca67c9cb6f79eecf0b4e75ff94 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 16 Oct 2024 20:19:27 +0200
Subject: [PATCH 1166/2040] Cache Linux apt packages

This avoid overloading servers by downloading the same set of packages multiple times
---
 .github/workflows/shared-build.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 003be10e..eb38251e 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -40,14 +40,18 @@ jobs:
     # Packages
     ###
 
-    - name: Install required packages
-      run: |
-        sudo apt update && sudo apt install -y flex bison ninja-build cmake clang \
-            libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required packages
+      with:
+        packages: flex bison ninja-build cmake clang libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
+        version: "0.1"
 
-    - name: Install required cross-platform packages (${{ matrix.architecture.triple }})
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required cross-platform packages (${{ matrix.architecture.triple }})
       if: matrix.architecture.name != 'amd64'
-      run: sudo apt install -y gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
+      with:
+        packages: gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
+        version: "0.1"
 
     - name: Settings
       working-directory: ${{github.workspace}}

From 6f3d79ae1b724b05cba10565129f49f7b4750731 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:13:53 +0200
Subject: [PATCH 1167/2040] Use multi-config generators and specify the build
 type in the `--config` when using the cmake command instead of using
 `CMAKE_BUILD_TYPE`. Also build third-party libraries in Release mode

---
 .github/workflows/shared-build.yml | 38 +++++++++++++-----------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index eb38251e..9b68e420 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -56,7 +56,7 @@ jobs:
     - name: Settings
       working-directory: ${{github.workspace}}
       run: |
-        echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
         echo "CC=clang" >> $GITHUB_ENV
         echo "CXX=clang++" >> $GITHUB_ENV
         echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
@@ -71,7 +71,7 @@ jobs:
       id: sdl
       uses: libsdl-org/setup-sdl@main
       with:
-        version: sdl2-latest
+        version: 2-latest
         build-type: Release
         cmake-arguments: ""
 
@@ -92,10 +92,10 @@ jobs:
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
-        cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+        cmake -B ./build \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
-        cmake --build ./build --config ${{env.BUILD_TYPE}}
-        cmake --install ./build --config ${{env.BUILD_TYPE}}
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
 
     ###
     # Project
@@ -108,7 +108,6 @@ jobs:
     - name: CMake Settings
       run: |
         echo "CMAKE_PARAM=--log-level=VERBOSE \
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
@@ -123,7 +122,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}
       run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
 
     - name: Test
       working-directory: ${{github.workspace}}
@@ -190,7 +189,7 @@ jobs:
         git clone --depth 1 --single-branch --branch v2.5.25 https://github.com/lexxmark/winflexbison.git
         cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
         cmake --build winflexbison-build --config Release --parallel
-        cmake --install winflexbison-build
+        cmake --install winflexbison-build --config Release
 
     #- name: Settings
     #  working-directory: ${{github.workspace}}
@@ -217,7 +216,7 @@ jobs:
       id: sdl
       uses: libsdl-org/setup-sdl@main
       with:
-        version: sdl2-latest
+        version: 2-latest
         build-type: Release
         cmake-arguments: "-A ${{ matrix.architecture.config }}"
 
@@ -239,7 +238,6 @@ jobs:
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
         cmake -B ./build -A ${{ matrix.architecture.config }} `
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
         -DALSOFT_BUILD_ROUTER=OFF `
         -DALSOFT_REQUIRE_WINMM=ON `
@@ -251,8 +249,8 @@ jobs:
         -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DNDEBUG" `
         -DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG" `
         -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG"
-        cmake --build ./build --config ${{env.BUILD_TYPE}}
-        cmake --install ./build --config ${{env.BUILD_TYPE}}
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
         if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
 
@@ -268,7 +266,6 @@ jobs:
       run: |
         echo "CMAKE_PARAM=-A ${{ matrix.architecture.config }} `
         --log-level=VERBOSE `
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
@@ -285,7 +282,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}
       run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
 
     - name: Test
       working-directory: ${{github.workspace}}
@@ -353,7 +350,7 @@ jobs:
     - name: Settings
       working-directory: ${{github.workspace}}
       run: |
-        echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
         echo "CC=clang" >> $GITHUB_ENV
         echo "CXX=clang++" >> $GITHUB_ENV
 
@@ -366,7 +363,7 @@ jobs:
       id: sdl
       uses: libsdl-org/setup-sdl@main
       with:
-        version: sdl2-latest
+        version: 2-latest
         build-type: Release
         cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }}
           -DCMAKE_VERBOSE_MAKEFILE=on"
@@ -387,12 +384,12 @@ jobs:
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
-        cmake -B ./build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+        cmake -B ./build \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
         -DCMAKE_VERBOSE_MAKEFILE=on
-        cmake --build ./build --config ${{env.BUILD_TYPE}}
-        cmake --install ./build --config ${{env.BUILD_TYPE}}
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
 
     ###
     # Project
@@ -405,7 +402,6 @@ jobs:
     - name: CMake Settings
       run: |
         echo "CMAKE_PARAM=--log-level=VERBOSE \
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DCMAKE_VERBOSE_MAKEFILE=on \
         -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
@@ -422,7 +418,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}
       run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
 
     - name: Test
       working-directory: ${{github.workspace}}

From 35fea912687459b58ac49e75efe0018476cafdb1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 16 Oct 2024 22:22:08 +0200
Subject: [PATCH 1168/2040] Download and install ninja on Windows, from the
 official ninja-build GitHub repository

This greatly reduces the compile time on Windows
---
 .github/workflows/shared-build.yml | 43 +++++++++++++++++-------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 9b68e420..899f5974 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -182,6 +182,13 @@ jobs:
     #  run: |
     #    choco install -y ninja
 
+    - name: Install required packages
+      run: |
+        $DownloadPath="$($env:USERPROFILE)\Downloads"
+        Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "$($env:PROGRAMFILES)\ninja"
+        echo "$($env:PROGRAMFILES)\ninja" >> $GITHUB_PATH
+
     - name: Install Flex/Bison
       working-directory: ${{github.workspace}}
       run: |
@@ -191,21 +198,21 @@ jobs:
         cmake --build winflexbison-build --config Release --parallel
         cmake --install winflexbison-build --config Release
 
-    #- name: Settings
-    #  working-directory: ${{github.workspace}}
-    #  run: |
-    #    echo "CMAKE_GENERATOR=Ninja" >> $env:GITHUB_ENV
-    #    echo "CC=cl.exe" >> $env:GITHUB_ENV
-    #    echo "CXX=cl.exe" >> $env:GITHUB_ENV
-    #    pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
-    #    cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
-    #      if ($_ -match "=") {
-    #        # Split into key=value
-    #        $var = $_.split("=", 2);
-    #        echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
-    #      }
-    #    }
-    #    popd
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $env:GITHUB_ENV
+        echo "CC=cl.exe" >> $env:GITHUB_ENV
+        echo "CXX=cl.exe" >> $env:GITHUB_ENV
+        pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
+        cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
+          if ($_ -match "=") {
+            # Split into key=value
+            $var = $_.split("=", 2);
+            echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
+          }
+        }
+        popd
 
     ###
     # SDL
@@ -218,7 +225,7 @@ jobs:
       with:
         version: 2-latest
         build-type: Release
-        cmake-arguments: "-A ${{ matrix.architecture.config }}"
+        cmake-arguments: ""
 
     ###
     # OpenAL
@@ -237,7 +244,7 @@ jobs:
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
-        cmake -B ./build -A ${{ matrix.architecture.config }} `
+        cmake -B ./build `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
         -DALSOFT_BUILD_ROUTER=OFF `
         -DALSOFT_REQUIRE_WINMM=ON `
@@ -264,7 +271,7 @@ jobs:
 
     - name: CMake Settings
       run: |
-        echo "CMAKE_PARAM=-A ${{ matrix.architecture.config }} `
+        echo "CMAKE_PARAM= `
         --log-level=VERBOSE `
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `

From 11e9d0f9bad341834dbccc7e692671bcbc339133 Mon Sep 17 00:00:00 2001
From: Jesse Mitchell <TotalTechGeek@users.noreply.github.com>
Date: Wed, 16 Oct 2024 18:24:22 -0500
Subject: [PATCH 1169/2040] [macOS / Compiler Fix] Alter offset for Mouse
 Buttons

Fix the mouse buttons code and alter how the mouseButton check works
---
 code/client/cl_keys.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_keys.cpp b/code/client/cl_keys.cpp
index f8b9396b..39474cb9 100644
--- a/code/client/cl_keys.cpp
+++ b/code/client/cl_keys.cpp
@@ -1140,9 +1140,9 @@ void CL_KeyEvent(int key, qboolean down, unsigned time)
 
     if (key >= K_MOUSE1 && key <= K_MOUSE5) {
         if (down) {
-            cl.mouseButtons |= (1 << (key + (256 - K_MOUSE1)));
+            cl.mouseButtons |= (1 << (key - K_MOUSE1));
         } else {
-            cl.mouseButtons &= ~(1 << (key + (256 - K_MOUSE1)));
+            cl.mouseButtons &= ~(1 << (key - K_MOUSE1));
         }
 
         if (in_guimouse) {

From 02df233205c64873988b840c83472cda54767bbc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:17:20 +0200
Subject: [PATCH 1170/2040] Refactor UploadCompressed

---
 code/renderer/tr_image.c | 80 +++++++++++-----------------------------
 1 file changed, 22 insertions(+), 58 deletions(-)

diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 5782a8d7..b52203ff 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -769,22 +769,12 @@ static void UploadCompressed(
 	scaled_width = width;
 	scaled_height = height;
 
-	for (i = iStartImage; i; i--) {
+	for (i = 0; i < iStartImage; i++) {
 		int w, h;
 
-		w = scaled_width + 3;
-		if (scaled_width + 3 < 0) {
-			w = scaled_width + 6;
-		}
-		w >>= 2;
-
+		w = (scaled_width + 3) / 4;
 		if (w > 1) {
-			h = scaled_height + 3;
-			if (scaled_height + 3 < 0) {
-				h = scaled_height + 6;
-			}
-
-			h >>= 2;
+			h = (scaled_height + 3) / 4;
 			if (h > 1) {
 				offset += blockSize * w * h;
 			}
@@ -792,69 +782,43 @@ static void UploadCompressed(
 
 		scaled_width >>= 1;
 		scaled_height >>= 1;
+
 		if (!scaled_width) scaled_width = 1;
 		if (!scaled_height) scaled_height = 1;
 	}
 
 	*pBytesUsed = 0;
 
-	for (;;)
-	{
-		while (scaled_width)
-		{
-			int w, h;
+	while (scaled_width || scaled_height) {
+		int w, h;
 
-			if (!scaled_height) scaled_height = 1;
-			w = scaled_width + 3;
-			if (scaled_width + 3 < 0) w = scaled_width + 6;
-			w >>= 2;
+		if (!scaled_width) scaled_width = 1;
+		if (!scaled_height) scaled_height = 1;
 
-			h = scaled_height + 3;
-			if (scaled_height + 3 < 0) h = scaled_height + 6;
-			h >>= 2;
+		h = (scaled_height + 3) / 4;
+		w = (scaled_width + 3) / 4;
+		size = blockSize * w * h;
 
-			size = blockSize * w * h;
-			if (w > 1 && h > 1) *pBytesUsed += size;
-			
-			qglCompressedTexImage2D(GL_TEXTURE_2D, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, data);
-			GL_CheckErrors();
-
-			if (i < iMipmapsAvailable)
-			{
-				w = scaled_width + 3;
-				if (scaled_width + 3 < 0) {
-					w = scaled_width + 6;
-				}
-
-				if (w >> 2 > 1)
-				{
-					h = scaled_height + 3;
-					if (scaled_height + 3 < 0) {
-						h = scaled_height + 6;
-					}
-
-					if (h >> 2 > 1)
-						data += size;
-				}
-			}
-			scaled_width >>= 1;
-			scaled_height >>= 1;
-			++i;
+		if (w > 1 && h > 1) {
+			*pBytesUsed += size;
 		}
 
-		if (!scaled_height) {
-			break;
+		qglCompressedTexImage2D(GL_TEXTURE_2D, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, offset);
+		GL_CheckErrors();
+
+		if (i < iMipmapsAvailable && w > 1 && h > 1) {
+			offset += size;
 		}
 
-		scaled_width = 1;
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+		i++;
 	}
 
 	if (numMipmaps > 1) {
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
+	} else {
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	}

From 631abd2b0fdc8c159fab5c4e2366f2d1281cb74c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:59:03 +0200
Subject: [PATCH 1171/2040] Update section about bots

---
 docs/configuration/server.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 913a4f83..9567880c 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -94,7 +94,7 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 
 ### Bots
 
-Bots can be used for testing. They don't move by default, so a mod will be needed, like [eaglear bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots):
+Bots are supported and can be used for testing or for entertainment. They don't move by default, so the [mp-navigation](https://github.com/openmoh/mp-navigation) pk3 will be needed. The following variables are used to configure bots:
 - `set sv_maxbots x`: Required, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
 - `set sv_numbots x`: Set the number of bots to spawn. It will be capped to the value of `sv_maxbots`.
 - `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected, the game will spawn 3 bots to make sure there are always 8 players in the game.

From cd83091101bc60dcea24aabcfa01fe966e3f30e6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:59:50 +0200
Subject: [PATCH 1172/2040] Update the ubuntu version for publishing tags

---
 .github/workflows/tags-publish-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tags-publish-release.yml b/.github/workflows/tags-publish-release.yml
index 04c2557b..4bb77996 100644
--- a/.github/workflows/tags-publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -42,7 +42,7 @@ jobs:
           'macos-arm64'
         ]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     environment: "release"
     needs: [build-all]
 

From 373fe45b50660eea759e1ca4ca9dd3f423c71e7d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:33:26 +0200
Subject: [PATCH 1173/2040] Add an example for using bots

---
 docs/configuration/server.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 9567880c..2c2fad63 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -94,11 +94,23 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 
 ### Bots
 
-Bots are supported and can be used for testing or for entertainment. They don't move by default, so the [mp-navigation](https://github.com/openmoh/mp-navigation) pk3 will be needed. The following variables are used to configure bots:
-- `set sv_maxbots x`: Required, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
+Bots are supported and can be used for testing or for entertainment. The [mp-navigation](https://github.com/openmoh/mp-navigation) pk3 will be needed so bots can navigate and move on MP maps. The following variables are used to configure bots:
+- `set sv_maxbots x`: **Required**, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
 - `set sv_numbots x`: Set the number of bots to spawn. It will be capped to the value of `sv_maxbots`.
 - `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected, the game will spawn 3 bots to make sure there are always 8 players in the game.
 
 Commands:
 - `addbot x`: x is the number of bots to add. It only changes the `sv_numbots` variable.
 - `removebot x`: x is the number of bots to remove. It only changes the `sv_numbots` variable.
+
+Example with the requirement of 6 players:
+```cpp
+set sv_maxbots 16 // Reserve 16 client slots for bots
+set sv_minPlayers 6 // When there is 0 player in a team, there will be 6 bots. When there is 1 player in a team, there will be 5 bots, and so on
+```
+
+Example with 4 bots playing:
+```cpp
+set sv_maxbots 16 // Reserve 16 client slots for bots
+set sv_numbots 4 // Spawn 4 bots
+```

From d9166478e564ad00f1863ce2e5175208c39c2b70 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Oct 2024 17:50:28 +0200
Subject: [PATCH 1174/2040] Set the weapon animation back to idle when finished
 animating

This fixes an issue that also occur in OG, where some weapons would constantly replay the same sounds (often reload/rechamber) when the weapon entity is removed then added to the client snapshot
---
 code/fgame/weapon.cpp | 62 +++++++++++++++++++++++++++++++++++++------
 code/fgame/weapon.h   |  1 +
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 37e8f484..8fca5cf6 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -195,7 +195,14 @@ Event EV_Weapon_DMSetFireDelay
     "Set the minimum time between shots from the weapon",
     EV_NORMAL
 );
-Event EV_Weapon_NotDroppable("notdroppable", EV_DEFAULT, NULL, NULL, "Makes a weapon not droppable");
+Event EV_Weapon_NotDroppable
+(
+    "notdroppable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes a weapon not droppable"
+);
 Event EV_Weapon_SetAimAnim
 (
     "setaimanim",
@@ -205,8 +212,14 @@ Event EV_Weapon_SetAimAnim
     "Set the aim animation and frame for when a weapon fires",
     EV_NORMAL
 );
-Event
-    EV_Weapon_SetRank("rank", EV_DEFAULT, "ii", "iOrder iRank", "Set the order value and power ranking for the weapon");
+Event EV_Weapon_SetRank
+(
+    "rank",
+    EV_DEFAULT,
+    "ii",
+    "iOrder iRank",
+    "Set the order value and power ranking for the weapon"
+);
 Event EV_Weapon_SetFireType
 (
     "firetype",
@@ -216,7 +229,8 @@ Event EV_Weapon_SetFireType
     "Set the firing type of the weapon (projectile or bullet)",
     EV_NORMAL
 );
-Event EV_Weapon_SetAIRange(
+Event EV_Weapon_SetAIRange
+(
     "airange",
     EV_DEFAULT,
     "s",
@@ -350,7 +364,8 @@ Event EV_Weapon_SetDMBulletRange
     "Set the range of the bullets",
     EV_NORMAL
 );
-Event EV_Weapon_SetBulletSpread(
+Event EV_Weapon_SetBulletSpread
+(
     "bulletspread",
     EV_DEFAULT,
     "ffFF",
@@ -358,7 +373,8 @@ Event EV_Weapon_SetBulletSpread(
     "Set the min & optional max spread of the bullet in the x and y axis",
     EV_NORMAL
 );
-Event EV_Weapon_SetDMBulletSpread(
+Event EV_Weapon_SetDMBulletSpread
+(
     "dmbulletspread",
     EV_DEFAULT,
     "ffFF",
@@ -654,7 +670,8 @@ Event EV_Weapon_SetMeansOfDeath
     "Set the meansOfDeath of the weapon.",
     EV_NORMAL
 );
-Event EV_Weapon_SetWorldHitSpawn(
+Event EV_Weapon_SetWorldHitSpawn
+(
     "worldhitspawn",
     EV_DEFAULT,
     "s",
@@ -870,6 +887,20 @@ Event EV_OverCooked_Warning
     EV_NORMAL
 );
 
+//
+// Added in OPM
+//
+
+Event EV_Weapon_DoneAnimating
+(
+    "doneanimating",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signals the end of animation",
+    EV_NORMAL
+);
+
 CLASS_DECLARATION(Item, Weapon, NULL) {
     {&EV_SetAnim,                       &Weapon::SetWeaponAnimEvent     },
     {&EV_Item_Pickup,                   &Weapon::PickupWeapon           },
@@ -966,6 +997,10 @@ CLASS_DECLARATION(Item, Weapon, NULL) {
     {&EV_OverCooked_Warning,            &Weapon::OnOverCookedWarning    },
     {&EV_Weapon_SetCurrentFireAnim,     &Weapon::SetCurrentFireAnim     },
     {&EV_Weapon_SetSecondaryAmmoInHud,  &Weapon::SetSecondaryAmmoInHud  },
+    //
+    // Added in OPM
+    //
+    {&EV_Weapon_DoneAnimating,          &Weapon::DoneAnimating          },
     {NULL,                              NULL                            }
 };
 
@@ -3106,7 +3141,8 @@ void Weapon::SetWeaponIdleAnimEvent(Event *ev)
 //======================
 void Weapon::SetWeaponAnimEvent(Event *ev)
 {
-    SetWeaponAnim(ev->GetString(1));
+    //SetWeaponAnim(ev->GetString(1));
+    SetWeaponAnim(ev->GetString(1), EV_Weapon_DoneAnimating);
 }
 
 //======================
@@ -3344,6 +3380,10 @@ void Weapon::DoneReloading(Event *ev)
 {
     SetShouldReload(qfalse);
     weaponstate = WEAPON_READY;
+
+    // Added in OPM
+    //  Set to idle when done reloading
+    SetWeaponIdleAnim();
 }
 
 //======================
@@ -4568,6 +4608,12 @@ Listener *Weapon::GetScriptOwner(void)
     return owner;
 }
 
+void Weapon::DoneAnimating(Event* ev) {
+    // Added in OPM
+    //  Set to idle when done reloading
+    SetWeaponIdleAnim();
+}
+
 //======================
 //Weapon::GetMaxFireMovement
 //======================
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index 17b71a22..9b2fcb9e 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -455,6 +455,7 @@ public:
     float      GetBulletRange(firemode_t firemode);
     firemode_t GetFireMode(void);
     qboolean   IsSemiAuto(void);
+    void       DoneAnimating(Event *ev);
 
     float GetMaxFireMovement() const;
 };

From 84c5bfa777d4cb32c4431d131121a9a7621869ee Mon Sep 17 00:00:00 2001
From: KevDoy <KevDoy@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:26:01 -0700
Subject: [PATCH 1175/2040] Add Open MoHAA Text Logos

Add a logo and update the README file to use the new logo

---------

Co-authored-by: smallmodel <15067410+smallmodel@users.noreply.github.com>
---
 README.md                    |    9 +-
 misc/openmohaa-lowdetail.svg | 2254 +++++++++
 misc/openmohaa-text-mono.svg |  109 +
 misc/openmohaa-text-sm.png   |  Bin 0 -> 73017 bytes
 misc/openmohaa-text.png      |  Bin 0 -> 247852 bytes
 misc/openmohaa-text.svg      | 8500 ++++++++++++++++++++++++++++++++++
 6 files changed, 10864 insertions(+), 8 deletions(-)
 create mode 100644 misc/openmohaa-lowdetail.svg
 create mode 100644 misc/openmohaa-text-mono.svg
 create mode 100644 misc/openmohaa-text-sm.png
 create mode 100644 misc/openmohaa-text.png
 create mode 100644 misc/openmohaa-text.svg

diff --git a/README.md b/README.md
index 02a9e061..8c834ae1 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,7 @@
 
 ![Discord](https://img.shields.io/discord/596049712579215361?logo=discord&logoColor=white&color=5865F2)
 
-
-```
-     / _ \ _ __   ___ _ __ |  \/  |/ _ \| | | |  / \      / \
-    | | | | '_ \ / _ \ '_ \| |\/| | | | | |_| | / _ \    / _ \
-    | |_| | |_) |  __/ | | | |  | | |_| |  _  |/ ___ \  / ___ \
-     \___/| .__/ \___|_| |_|_|  |_|\___/|_| |_/_/   \_\/_/   \_\
-          |_|
-```
+![logo](misc/openmohaa-text-sm.png)
 
 ## Intro
 
diff --git a/misc/openmohaa-lowdetail.svg b/misc/openmohaa-lowdetail.svg
new file mode 100644
index 00000000..31994e76
--- /dev/null
+++ b/misc/openmohaa-lowdetail.svg
@@ -0,0 +1,2254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1733 851" style="enable-background:new 0 0 1733 851;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3F3F41;}
+	.st1{fill:#28282A;}
+	.st2{fill:#9BB9DB;}
+</style>
+<g id="Background">
+	<path class="st0" d="M1299.5,6.2c-0.8,0.6-1.6,1.3-2.3,1.9c0.3,2,0.6,4,0.9,6.1C1298.4,11.5,1299.6,9,1299.5,6.2z"/>
+	<path class="st0" d="M1214.6,22.4c0.3-0.6,0.7-1.3,1-1.9c-1.1,0.2-2.2,0.4-3.3,0.5c0.2,1,0.4,2,0.7,2.9
+		C1213.4,23.6,1214.2,22.8,1214.6,22.4z"/>
+	<path class="st0" d="M1402.6,33.3c0.1,0,0.2,0,0.2,0c2.4,1.1,5.3,1.1,8,1.5c-0.1-0.7-0.3-2-0.4-2.9c0.1-0.2,0.1-0.3,0.2-0.5
+		c0.8,0.1,2.2,0.2,2.9,0.2c0-0.3,0.1-0.7,0.1-1c0.2,0,0.4,0,0.6,0c-0.2-0.3-0.3-0.5-0.5-0.8c0.1-0.6,0.1-1.1,0.2-1.7
+		c-0.4,0.1-0.7,0.1-1,0.3c-0.1-0.2-0.3-0.4-0.4-0.7c-0.2,0.3-0.6,0.9-0.9,1.4c-0.5,0.3-0.9,0.8-1.2,1.3c-0.3,0-0.6,0-0.8,0.1
+		c-0.8-0.3-1.8-0.7-2.3-0.9c-2.1,0.9-4.2,1.7-6.3,2.5C1401.3,32.4,1401.9,32.8,1402.6,33.3C1402.6,33.2,1402.6,33.2,1402.6,33.3z"/>
+	<path class="st0" d="M1394.5,113.8C1394.5,113.8,1394.6,113.8,1394.5,113.8C1394.6,113.8,1394.6,113.8,1394.5,113.8
+		c0.2,0,0.5,0,0.7-0.1c0-0.5,0.1-0.9,0.3-1.3c0.7-1.7,1.9-3,3.4-4c0.3-0.1,0.5-0.2,0.8-0.4c-0.1-0.4-0.3-1.3-0.3-1.8
+		c-0.2,0.1-0.3,0.2-0.5,0.3c-0.1-0.2-0.3-0.4-0.4-0.7c-0.1,0.3-0.3,0.7-0.5,1.1c-1,0.5-2,1-3,1.5c-0.1,0-0.2,0-0.3,0
+		c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0.1c0,0.7,0,1.4,0.1,2.1C1394.5,111.9,1394.5,112.8,1394.5,113.8z"/>
+	<path class="st0" d="M1449.8,827.5c-0.1-0.7-0.4-2.2-0.5-2.9c-0.5-0.1-1.5-0.2-2-0.3c0.3,1.8,0.7,3.7,1,5.5
+		C1448.8,829,1449.3,828.2,1449.8,827.5z"/>
+	<path class="st0" d="M131.7,828.6c0-0.4,0-0.8,0-1.2c-1.7,0.1-3.4,0.1-5.2,0.2c0,0.3,0,0.7,0,1c0,0-0.1,0-0.1,0
+		c0,0.2,0.1,0.5,0.1,0.7c0,1.9-0.1,3.8-0.1,5.7c2.1,0,3.8-1.1,5.3-2.5c0-1.1,0-2.2,0-3.3c0.1-0.2,0.1-0.3,0.2-0.5
+		C131.8,828.6,131.7,828.6,131.7,828.6z"/>
+	<path class="st0" d="M1490.7,832.6l1.9-0.7c0,0.4,0,1.2,0,1.6c0.8-0.6,1.6-1.3,2.4-2l0.7-0.1c0-0.7-0.1-2-0.1-2.6
+		C1493.5,829.5,1492.2,831.2,1490.7,832.6z"/>
+	<path class="st0" d="M167.7,835.3c-0.6-1.4-2.3-2.1-3.5-3c-2.3,0.3-4.6,0.7-6.8,1.2c0,0.3,0,0.7,0,1.1c-0.1,0-0.2,0.1-0.3,0.1
+		c0.1,0.1,0.2,0.2,0.3,0.3c0,1,0,2.1,0,2.8c3.5-0.2,6.9-1.5,10.5-1.2c0.1-0.5,0-0.9-0.1-1.2c0,0,0-0.1,0-0.1
+		C167.7,835.3,167.7,835.3,167.7,835.3z"/>
+	<path class="st0" d="M316.5,37c0.8-2.5,2.7-4.4,4.6-6.1c0.5,0.6,1.4,1.9,1.9,2.6c1.2,0.1,2.4,0.2,3.7,0.2c0-1.1,0-2.1,0-3.2
+		c-1.5,0-3.1,0-4.6,0c-1.7-0.7-3.6-1-5.4-1.2c0-0.8,0-2.5,0-3.3c2.7-1.8,4.9-4.2,5.3-7.6c-1.1,0.1-2.1,0.2-3.2,0.2
+		c-0.3,1.8-0.5,3.8-2,5c0-5,0.6-10,0.2-15c1.7-0.2,3.2-0.8,4.6-1.7c-1.2-0.1-3.6-0.2-4.8-0.2c0.2-2.2,0.4-4.4,0.6-6.6h-1
+		C315.6,12.3,316.7,24.6,316.5,37z"/>
+	<path class="st0" d="M349.5,4.5c0.2-1.5,0.2-3,0.3-4.5h-1.5c-1.3,2.4-6,5.3-3.4,8.1C347,7.7,347.5,5.1,349.5,4.5z"/>
+	<path class="st0" d="M376.6,1.7c-0.1-0.4-0.3-1.2-0.4-1.7H364C367.7,2.3,372.3,2.2,376.6,1.7z"/>
+	<path class="st0" d="M425.8,2.6c-0.1-0.6-0.3-1.9-0.4-2.6h-2.2c0.1,0.5,0.3,1.5,0.4,2C424.1,2.2,425.2,2.4,425.8,2.6z"/>
+	<path class="st0" d="M459.9,0h-3C456,3,460.6,3,459.9,0z"/>
+	<path class="st0" d="M1268.6,1.6l-0.2-1.4c1.3-0.1,2.6-0.1,3.9-0.2h-10.7c0,0.4-0.1,1.3-0.2,1.7c2.2-0.6,4.5-1.2,6.8-1.7
+		C1268.4,0.4,1268.6,1.2,1268.6,1.6z"/>
+	<path class="st0" d="M1359,3.4c0.6,0,1.7-0.2,2.3-0.2c0-0.7-0.1-2.2-0.1-2.9l0.9-0.2h-1.7c-2.3,0.9-4.6,2.3-4.3,5.1
+		C1357,4.5,1358,4,1359,3.4z"/>
+	<path class="st0" d="M1401.6,17.5c-1.4,0-2.9,0-4.3,0c0,1,0.1,2,0.1,3c0.8,0,2.4-0.1,3.2-0.1c0,1.8,0,3.7,0,5.5
+		c0.4-0.1,1.2-0.4,1.6-0.5c0.3-0.5,1.1-1.6,1.4-2.1c0.7,0,2.1,0.1,2.8,0.1c1.7-2.1,4.2-2.2,6.7-2c1-0.7,2-1.5,3-2.2
+		c0-2.3,0-4.6-0.1-6.8c-0.7,0.5-1.5,1-2.2,1.5c0.4,1.6,0.8,3.3,1.1,5c-1.1-0.1-3.2-0.4-4.3-0.5c-1.3-1.5-2.5-3.2-4.2-4.3
+		c0-0.8,0.1-2.5,0.2-3.3c3-1.2,6.2-2.8,9.3-0.9c0-0.7,0.1-2,0.1-2.7c-0.3,0.2-0.8,0.7-1.1,0.9c-0.4,0.1-1.1,0.3-1.5,0.4
+		c-2-2.6-3.4-5.7-5.3-8.4h-5.8c2.5,1.8,5.1,3.6,7.9,5.1c-2,1.7-4.2,2.8-6.7,1.2c-1.3,1.4-2.6,2.9-3.8,4.3c1.2-0.1,2.4-0.1,3.6-0.2
+		c0.5,0.8,0.9,1.6,1.4,2.4c-0.1,1.2-0.2,2.5-0.2,3.7c0.7,0,2.2-0.1,3-0.2c0.5,1.4,1.1,2.8,1.6,4.3c-1.7-0.1-3.4-0.1-5.1-0.2
+		C1403.1,19.5,1402.3,18.5,1401.6,17.5z"/>
+	<path class="st0" d="M1416.1,1.6c-0.1-0.4-0.2-1.2-0.3-1.6h-2.7C1413.6,1,1414.8,2.3,1416.1,1.6z"/>
+	<path class="st0" d="M356.4,3.5c0-0.5,0.1-1.6,0.2-2.1c-1,0-2,0.1-3.1,0.2c0,0.5,0,1.5,0,1.9C354.5,3.5,355.5,3.5,356.4,3.5z"/>
+	<path class="st0" d="M1292.6,7.6c-0.3-0.3-1-1-1.3-1.3c0-0.6-0.1-1.8-0.1-2.4c-1.7,0.1-2.3-1.3-2.9-2.5c0.2,1.2,0.4,2.4,0.6,3.6
+		C1290.3,5.6,1291.5,6.6,1292.6,7.6z"/>
+	<path class="st0" d="M441.8,7.3c0.3,0,1,0.1,1.3,0.1c0.5-1,0.9-2.1,1.4-3.1c-1.4-1.8-3.6-1.8-5.6-1.7c0.9,0.4,1.8,0.7,2.8,1.1
+		C441.7,4.9,441.7,6.1,441.8,7.3z"/>
+	<path class="st0" d="M1392.7,9.3c1.5,0.1,3,0.2,4.5,0.3c-1.9-2.1-4.4-3.6-6.3-5.8c-0.8-0.1-1.6-0.3-2.3-0.4c0,1-0.1,2.1-0.1,3.1
+		c1.4-0.1,2.8-0.2,4.2-0.3C1392.7,7,1392.7,8.6,1392.7,9.3z"/>
+	<path class="st0" d="M379.8,6.1c-0.6-1-1.7-3-2.3-4c-0.2,1.9-0.1,3.8,0,5.7C378.3,7.2,379.1,6.6,379.8,6.1z"/>
+	<path class="st0" d="M341.6,4.1c-2.4-0.1-3.4,1.4-3.5,3.6c1.1,0,2.3-0.1,3.5-0.1C341.6,6.4,341.6,5.2,341.6,4.1z"/>
+	<path class="st0" d="M394.7,5.7c-1-0.1-2.1-0.2-3.1-0.3c0,1.3,0.1,2.5,0.1,3.8c-2.1,0.9-3.9,2.3-4.8,4.4c1.9-0.1,4,0.2,5.5-1.3
+		C393.7,10.3,394.1,7.9,394.7,5.7z"/>
+	<path class="st0" d="M1260,5.5c-1.8,0.3-4-0.5-5.3,1.1c-0.2,1.1-0.3,2.1-0.4,3.2C1257,9.7,1258.5,7.4,1260,5.5z"/>
+	<path class="st0" d="M335.6,8.6c0-0.5-0.1-1.5-0.1-2c-1.1,0-2.2-0.1-3.2-0.1c0,0.6,0.1,1.7,0.1,2.3C333.5,8.6,334.5,8.6,335.6,8.6z
+		"/>
+	<path class="st0" d="M602.2,7.8c-0.8-1.5-1.7-1.5-2.5,0C600.6,9.2,601.4,9.2,602.2,7.8z"/>
+	<path class="st0" d="M382.5,13.5c0.1-1.1,0.1-2.2,0.2-3.3c-2.5,0.2-5.2,0.9-6.6,3.1C378.3,13.5,380.4,13.5,382.5,13.5z"/>
+	<path class="st0" d="M440.2,14.8c0,0.2,0.1,0.5,0.1,0.7c1.9,0.1,3.7,0.2,5.6,0.3c-0.1-1.4-0.3-2.8-0.4-4.2c-0.4,0-1.2,0-1.6,0
+		C443.7,13.7,442.4,15.1,440.2,14.8z"/>
+	<path class="st0" d="M332.9,12.5c1.2,0.9,2.5,1.8,3.7,2.7c2.4,0.3,4.7,1,6.8,2.2c-0.1-0.8-0.1-1.6-0.2-2.4
+		C339.6,14.4,336.7,11.7,332.9,12.5z"/>
+	<path class="st0" d="M407,15.4c1.6-0.6,0.6-3.4-1-3C404.4,13.1,405.4,15.9,407,15.4z"/>
+	<path class="st0" d="M371.1,14.7c-1.5-0.1-3.1-0.2-4.6-0.3c0,0.6-0.1,1.9-0.1,2.5C368.2,16.8,370.1,16.5,371.1,14.7z"/>
+	<path class="st0" d="M1255.4,14c-1,1.3,1.1,3.5,2.2,1.8C1258.6,14.5,1256.4,12.3,1255.4,14z"/>
+	<path class="st0" d="M362.8,15.3c-1.1,0.1-2.2,0.2-3.3,0.2c-0.1,1.1-0.2,2.2-0.3,3.3c1.1-0.4,2.3-0.8,3.4-1.2
+		C362.7,17.1,362.7,15.9,362.8,15.3z"/>
+	<path class="st0" d="M402.1,15.3c-1.3,0.1-2.5,0.1-3.8,0.2c0.1,1.8,0.2,3.5,0.3,5.3C400.1,19.1,401.3,17.3,402.1,15.3z"/>
+	<path class="st0" d="M1386.7,18.9c-0.1-1.2-0.2-2.3-0.2-3.5c-1.5,0-3,0-4.5,0C1381.8,18.5,1384.4,18.8,1386.7,18.9z"/>
+	<path class="st0" d="M347.5,16.2c0,0.6,0.1,1.8,0.1,2.4c1.3-0.1,2.7-0.1,4-0.2c0.5,0.9,0.9,1.7,1.4,2.6c0.3,0.1,1,0.4,1.3,0.6
+		c0-0.9,0.1-1.8,0.1-2.7C352,18,350.2,15.9,347.5,16.2z"/>
+	<path class="st0" d="M381.3,22.4c1.6,0.1,3.3,0.1,5,0.2c-0.5-0.3-1.3-1-1.8-1.4c0-0.4-0.1-1.1-0.1-1.4c1.5-0.8,2.9-1.8,3.8-3.3
+		c-1.1-0.1-2.3-0.1-3.4-0.2C382.8,17.9,380.8,19.6,381.3,22.4z"/>
+	<path class="st0" d="M393.1,17.3c-2,1.9-5.6,3.4-4.7,6.8c2.8-1.8,5.4-3.9,8.6-4.8C395.1,19.9,392.9,19.9,393.1,17.3z"/>
+	<path class="st0" d="M331,20.6c-0.2-3.3-3.2-3.2-5.7-3.2C324.5,21.3,328.5,20.5,331,20.6z"/>
+	<path class="st0" d="M412.5,19.2c-3-0.2-3,2.3-3.3,4.5c1.1,0,2.2,0,3.3,0C412.5,22.5,412.5,20.3,412.5,19.2z"/>
+	<path class="st0" d="M1250.7,20.2c-0.5,0.1-1.4,0.2-1.9,0.3c-0.6,1-1.1,2.1-1.7,3.2c1.1-0.1,2.2-0.2,3.3-0.3
+		C1250.5,22.3,1250.6,21.3,1250.7,20.2z"/>
+	<path class="st0" d="M1692.7,823.4c-0.1-0.5-0.2-1.3-0.3-2h16v-13.6c0,0.2,0.1,0.3,0.1,0.4c1.8,0,3.6,0,5.5,0.1
+		c-0.4,1.6-1.3,2.6-2.9,3.2c1,0.4,2.1,0.7,3.1,1.1c0-3.3,0.3-6.6,0.4-9.9c-1,0.8-1.9,1.6-2.6,2.6c-1.2,0.3-2.4,0.6-3.6,0.8v-3.7
+		c0.6-0.1,1.2-0.2,1.9-0.2c0.1-0.9,0.2-1.7,0.2-2.6c-1.3-0.7-1.9-1.7-2.1-2.9v-17.5c0.7,0,1.4,0,1.9-0.1c0-1.4,0-2.7,0-4
+		c0.9,0.1,2.6,0.3,3.5,0.4c-0.1-0.5-0.3-1.6-0.4-2.1c-0.5-0.4-1.5-1.1-2-1.4c-0.1-1.2-0.1-2.5-0.1-3.7c-1,0-2-0.1-3-0.1v-8.6
+		c0.7-0.1,1.8-0.1,2.4-0.2c-0.3-2.3-0.6-4.6-2-6.6c-0.1,0.4-0.3,0.8-0.4,1.2v-12.4c0.4-0.1,0.7-0.2,1.1-0.4
+		c-0.1-0.8-0.2-2.5-0.2-3.3c1.8,0,3.6,0.1,5.4,0.1c-0.1,2-0.2,4.1-0.3,6.1c-0.6,0-1.9,0.1-2.5,0.2c-0.6,1.6-1.2,3.2-1.7,4.8
+		c1.2,0.5,2.5,0.9,3.7,1.4c-0.5,1.1-1.1,2.3-1.6,3.5c1.4,1.1,2.8,2.1,4.3,3.1c2.5-0.5,5.1,0,7.6-0.1c1.9-0.5,3.3-2.1,4.9-3.2
+		c-1.6-1.1-3.4-1.8-5.2-2.2c-0.8,1.3-1.7,2.7-2.5,4c-2.6-0.6-5.2-1.5-7.6-2.7c0.8-1.3,1.6-2.6,2.4-4c0.8,0.1,2.5,0.2,3.4,0.2
+		c0.3-3.4-0.4-6.7-2.1-9.6c0-1,0-3.1,0-4.1c4,0.8,3.7,5.6,5.1,8.7c0.5,0,1.5,0,2,0c0-2.1,0-4.3,0-6.4c1.3,0.3,2.6,0.7,3.9,1.1
+		c0.5,1.7,1.1,3.3,1.6,5c0.2-1,0.5-2,0.7-3c-0.9-1.6-1.8-3.2-2.7-4.8c-0.7,0-1.5,0.1-2.1,0.1c-1.3,1.1-2.6,2.1-4.3,2.3
+		c-0.7-1.5-1.3-2.9-1.8-4.4c0.9,0,2.7,0.1,3.6,0.1c0.4-0.8,1.1-2.3,1.5-3c-1.3,0-2.6,0-3.8,0c-2.5,3.2-5.8,7.2-10.3,5.9
+		c-0.2-1.4-0.4-2.8-0.5-4.2c-0.4,0.1-1.1,0.3-1.5,0.4c-0.1,0.3-0.2,0.6-0.4,0.8v-15.8c1.4-1.5,3.1-2.8,5.1-3.7
+		c0.5-2.1,0.8-4.2,1.2-6.2c-2.1,0-4.2-0.3-6.3-0.6v-5.7c0.1-0.7,0.2-1.5,0.4-2.2c-0.1,0-0.2,0.1-0.4,0.1V680
+		c0.3-0.4,0.6-0.9,0.7-1.6c-0.2,0-0.5,0-0.7,0v-13.2c0.4,0.1,0.8,0,1.2-0.4c0.6-0.9-0.3-2.2-1.2-2.3v-3.4c1.1,0.4,2.2,0.6,3.5,0.4
+		c-1.1-1-2.3-1.9-3.5-2.7v-13.5c0.4,0.2,0.8,0.4,1.1,0.5c0,0.7,0.1,2,0.1,2.6c0.9-0.1,1.7-0.1,2.6-0.2c0-0.7,0-2,0.1-2.7
+		c0.3-0.2,1.1-0.5,1.4-0.7c-0.8-0.1-2.5-0.3-3.3-0.4c0-1.3,0.1-2.6,0.1-4c-0.7,0-1.4,0-2.1,0v-17.8c0.1-0.1,0.2-0.2,0.3-0.3
+		c1.2,0.1,2.5,0.2,3.8,0.4c-0.1-0.5-0.1-1.6-0.2-2.2c-1.1,0.1-2.3,0.2-3.4,0.3c-0.1,0.5-0.4,0.9-0.6,1.2v-21.2
+		c0.5-0.1,1.5-0.4,2-0.5c0.2-2.6,0.1-5.3-1.6-7.5c-0.1,0.3-0.3,0.7-0.4,1v-13.6c0.6,0.6,1.3,1.2,2,1.9c0.1,0.8,0.3,1.6,0.5,2.4
+		c0.7-1,1.7-1.4,2.9-1.2c0.3,0.5,1,1.4,1.3,1.8c0.5,0.5,1.6,1.4,2.1,1.9c1.3-2,2.5-4.2,2.4-6.6c-1.6,0.5-3.2,1.2-4.7,1.8
+		c-2.4,1.1-4.9,0.4-4.9-2.5c-0.4,0-1.1,0.1-1.6,0.1v-3.2c0.6,0,1.2,0,1.8,0c0.3-1.1,0.7-2.1,1-3.2c1.6,0,3.2-0.1,4.9-0.1
+		c-1.3-0.3-2.6-0.5-3.8-0.8c0-0.6-0.1-1.7-0.1-2.2c-1.3,0.9-2.8,1.8-3.8,3v-45.5c0.4,0.1,0.8,0.2,1.2,0.3c-0.1-2-0.1-4-0.2-6
+		c-0.4,0.2-0.7,0.4-1.1,0.6V263.3h-210.2c0.1-1.3,0.1-2.5,0.2-3.8c-0.8,0.1-2.3,0.2-3,0.2c0-0.7-0.1-2.2-0.1-3
+		c-1.5,1.6-2.9,3.3-4.4,4.8c0.7-0.5,2.1-1.6,2.8-2.1c0.4,0.9,1,2.7,1.5,3.8h-7.8c-2.4-0.5-4.7-1.1-7-1.9c-0.1-1.1-0.2-2.2-0.3-3.3
+		c-0.4,1.7-0.8,3.5-1.2,5.2h-88.1V232c0.6,0.7,1.7,1.8,2.3,2.4c1.5-0.8,2.9-1.5,4.4-2.2c0-2.1-0.1-4.2,0-6.3
+		c1.1-0.8,2.1-1.6,3.2-2.4c0-0.7-0.1-2-0.2-2.7c-1.9,0.5-3.4,1.7-4.6,3.2c-1.2,0.6-2.3,1.3-3.5,1.9c1.2,0.9,2.5,1.7,3.7,2.6
+		c-0.6,2.4-1.5,4.9-4.6,4.3c-0.1-1.3-0.2-2.5-0.3-3.8c-0.2-1.4-0.3-2.7-0.4-4.1v-36.3c0.1-0.5,0.1-1.1,0.2-1.6
+		c-0.1-0.6-0.1-1.1-0.2-1.7v-11.1c0.1-0.8,0.2-1.5,0.4-2.3c-0.1-0.7-0.3-1.5-0.4-2.2v-3.5c1.3-0.4,2.6-0.9,4-1.3
+		c-1.3-0.2-2.7-0.5-4-0.8c0-0.1,0-0.3,0-0.4v-15.6c0.1-1,0.2-2.1,0.3-3.1c0.1-2.2-0.1-4.4-0.3-6.6v-4.6c0.8-0.5,1.6-1.1,2.4-1.6
+		c-0.8-0.8-1.6-1.7-2.4-2.5v-29.1c0.1-0.9,0.1-1.9,0.2-2.8c0.5,1.7,1.1,3.4,1.6,5.1c0.9-1,1.8-2,2.7-3c-0.4-1-0.9-1.9-1.3-2.9
+		c0.7-0.3,2.2-1,3-1.3c-0.8-1.6-1.6-3.2-2.4-4.8c0.3-0.8,0.9-2.5,1.2-3.4c-1.2,0.1-2.3,0.2-3.4,0.3c0.3,2.1,0.8,4.2,0.9,6.3
+		c-0.6,0.3-1.8,0.9-2.6,1.2V46.6c0.6-0.1,1.1-0.2,1.7-0.3c0.2,0,0.3,0,0.5-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c-1-0.4-1.7-1-2.3-1.8
+		v-1.8c0.1,0,0.2-0.1,0.3-0.1c0.6,0.2,1.2,0.4,1.6,0.5c0-0.3-0.1-0.7-0.1-1.1c0.2-0.1,0.3-0.1,0.5-0.2c0.1,0,0.1,0.1,0.2,0.1
+		c0,0.3,0,0.8,0,1.1c0.5,0,1.4,0,2-0.1c0,0,0.1,0,0.1,0.1c0,0,0,0,0-0.1c0,0,0.1,0,0.1,0c0-0.5,0.1-1.2,0.1-1.9c0-0.1,0-0.3,0-0.4
+		c0,0,0,0,0,0c0-0.1,0-0.1,0-0.2c-0.9,0-1.8,0.1-2.7,0.1c-0.8,0-1.5,0-2.3,0v-6.9c0.6-0.4,1.4-0.9,1.9-1.2c-0.1-0.4-0.2-1.3-0.2-1.8
+		c-0.6-0.6-1.1-1.3-1.7-1.9v-3.2h-0.5c-0.1,0-0.2,0-0.2,0c-2.3-0.1-4.6-0.1-6.9-0.2c-1.1-1.1-2.1-2.3-3.2-3.4
+		c-0.5,1.2-1,2.3-1.4,3.5c-0.9,0-1.8,0-2.7,0l-876.1,0c-37.6,0-75.2,0-112.8,0c-5.1-0.4-10.2-1.3-15.2,0h-1.2
+		c-0.2-0.2-0.4-0.3-0.6-0.5c-0.4-0.3-0.8-0.7-1-0.9c-0.2,0.2-0.6,0.4-0.9,0.7c-0.4,0.2-0.8,0.4-1.1,0.6c-0.5,0-1.5,0.1-2,0.1
+		c0,0,0,0,0,0c-0.8,0-1.6,0-2.4,0c-2,0-4,0-6.1,0h-1.2c-1.4-0.1-2.8-0.2-4.3-0.6c-0.3-0.2-0.7-0.5-0.9-0.6c-0.4,0.3-1.1,0.8-1.6,1.1
+		c-0.1,0-0.1,0.1-0.1,0.1l-2.8,0c-0.5,0-1,0-1.5,0c-0.7,0-1.4,0-2.1,0c-0.7,5.9,0.5,12-0.4,17.9c-0.3,0.1-0.7,0.3-1.2,0.4
+		c-0.3,0-0.7,0-0.9,0c0.1,0.3,0.1,0.5,0.2,0.7c0,0.2,0,0.5,0,0.7c0,0,0.1-0.1,0.1-0.1c0,0.1,0,0.1,0,0.2c0.3-0.2,0.9-0.6,1.4-1
+		c0.2-0.1,0.4-0.2,0.6-0.3c0,1.5,0.1,3.1,0.1,4.6c0.1,13.8-0.3,27.6,0,41.4c-0.1,2.5-0.1,5.1-0.1,7.6c-0.1,6.1-0.2,12.3,0.1,18.4
+		c0,0.4,0,0.9,0,1.3c0,1.6,0,3.2,0,4.8c-0.1,4.2-0.3,8.4,0,12.6c-0.1,0-0.2,0-0.3,0c-0.4,0-0.9,0-1.2-0.1c0,0,0.1,0.1,0.1,0.1
+		c-0.1,0-0.2,0-0.4,0c0.3,0.1,0.5,0.3,0.7,0.5c0.4,0.7,0.8,1.5,1.1,2.2c0,0.3,0,0.6-0.1,1c0,0,0,0.1,0,0.2c-1.1,0-2.1,0.1-3.2,0.1
+		c0,1.3-0.1,2.6-0.1,3.8c-0.9,0-2.8-0.1-3.7-0.1c0.6,1.6,1.2,3.1,1.9,4.7c0.9-1.9,1.7-3.7,2.5-5.6c0.6-0.4,1.9-1.1,2.5-1.4
+		c0,3.7,0.1,7.5,0.1,11.2c0,0.7,0,1.3,0,2c-1.4,0.2-2.7,0.5-4.1,0.8c0,0,0.1,0,0.1,0c-0.1,0-0.2,0-0.2,0c1.4,0.1,2.7,0.2,4.1,0.4
+		c0,0.5,0.1,1.1,0.1,1.6c-0.1,2,0,4.1,0,6.1c-0.1,2.7-0.2,5.5-0.3,8.2c-0.1,0.9-0.3,1.7-0.5,2.5c0.2,0.9,0.4,1.8,0.5,2.7
+		c0,1.4,0.1,2.8,0.2,4.2c0,2.8,0,5.7,0,8.5c0,4.4,0,8.8,0,13.2c0,12.5-0.1,24.9-0.1,37.4c0,3-0.1,5.9-0.2,8.9
+		c0.1,1.9,0.2,3.7,0.2,5.6c0,1.4,0,2.9,0,4.3l0,5.9c-14.9,0-29.7,0-44.6,0c-89.2,0-178.4,0-267.6,0v121.6c-1.2,0.2-2.4,0.4-3.6,0.6
+		c1.2,0.3,2.4,0.5,3.6,0.8v88c-0.2,1.5-0.7,2.9-1.2,4.4c0,0.1-0.1,0.2-0.1,0.3c0,0,0,0,0,0.1c-0.1,0.3-0.2,0.6-0.3,0.8
+		c0.4,0.4,1.1,1.2,1.6,1.6v5.5c-0.1,3.2-0.3,6.4-0.2,9.6c0.1,2.2,0.2,4.4,0.2,6.6v16.7c-0.1,5.6-0.1,11.3,0,16.9
+		c0,9.5,0,19.1,0,28.6c0,0.6,0,1.2-0.1,1.8c0,0.3,0,0.6,0.1,0.8c0,4.4,0,8.9,0,13.3v22.7c0,2-0.2,4.1-0.4,6.1
+		c-0.7-1.7-1.4-3.4-2.1-5c-0.9,0-1.8,0.1-2.7,0.1c-0.3,1-0.7,2-0.9,3c1.7,2,3.9,3.5,6,5.1c0,0.7,0.1,1.4,0.1,2.1v8.5
+		c-0.1,4.4-0.3,8.7-0.2,13.1c-0.3,0.4-0.7,1.2-1,1.8c-0.2,0.2-0.3,0.3-0.5,0.5c-1,0.1-2.8,0.2-3.7,0.3c0.1-2.4,0.1-4.8,0.2-7.2
+		c-0.5-0.3-1.5-1-2-1.4c-0.1-1.6-0.2-3.3-0.2-4.9c1.5,0,3.1,0,4.6,0.1c-1-1.9-2-3.7-3.1-5.6c-0.1,1.6-0.2,3.2-0.2,4.9
+		c-1.6,0.4-3.2,0.8-4.8,1.2c-0.8,1.2-1.6,2.5-2.4,3.7c-1.5-0.1-3.1-0.1-4.6-0.2c-0.1,1.2-0.3,2.4-0.5,3.6c-2,1.9-4.8,2.8-6.3,5.2
+		c2.2,0.1,4.5,0.2,6.8,0.2c0.1,2.9-0.4,5.8-1.2,8.7c1,0.5,1.9,0.9,2.9,1.4c0.5,3,1.4,6,0.3,9c-1,0-2.9,0-3.8-0.1
+		c-1.7-1.5-3.4-3-5.1-4.4c-0.3-1.5-0.6-3-1-4.6c-1.2-0.1-2.5-0.3-3.7-0.4v17.1c2.3,0.2,2.5,5.2,0,4.9v7.8c0.4-0.5,1.1-1.4,1.5-1.8
+		c1.8,0,3.6,0.1,5.4,0.2c-0.5,1.8-1,3.6-1.5,5.4c-1.8-0.6-3.6-1.2-5.4-1.8v10c0.9,0.5,1.8,1,2.7,1.4c1.6-0.5,3.3-1.1,4.9-1.6
+		c0,1.2,0,3.5,0,4.6c-2.5,0-5.1,0-7.6,0.1v3.1c2,0.8,2.6,2.9,3.5,4.6c1,0.2,2,0.3,2.9,0.4c0.3-0.5,1-1.6,1.3-2.2
+		c2.8-0.2,5.5-0.9,8.3-0.9c2.5,0.8,4.9,1.7,7.5,2.2c0-0.9-0.2-2.8-0.2-3.7c1.7,0.2,3.4,0.4,5.1,0.7c-0.1,1.6-0.4,3.3-0.7,4.9
+		c-1.2,0-2.4-0.1-3.5-0.1c-0.9,4.8-8.3,4.1-9.3-0.3c-0.9,0.9-1.8,1.9-2.8,2.8c5.9,0.9,11.6,3.1,17.6,2.2v2.6
+		c-0.1,1.8-0.2,3.6-0.4,5.3c-3.9,0.9-7.9-0.4-11.8-1c0,1.5,0.1,3.1,0.2,4.6c3.2,1,5.8,3.2,8.1,5.6c1.3,0,2.5-0.1,3.8-0.1
+		c0,3,0.1,6,0.1,9v14.5c0,0.4,0,0.8,0,1.2c0.1,1.6-1.2,2.7-2,3.9c-0.1,0.7-0.2,1.3-0.3,2c0,0,0,0,0.1,0c0,0.1-0.1,0.2-0.1,0.3
+		c0.3,0,0.6,0.1,1,0.1c0.8,0.5,1.2,1.2,1.4,2v4c-0.2,1.3-0.3,2.5-0.2,3.5c-0.8-0.7-2.3-2.1-3-2.8c0-0.5-0.1-1.6-0.2-2.1
+		c-3-1-5-3.3-5.2-6.5c-1.9-0.1-3.7-0.1-5.6-0.2c0.3,4.7,0.8,9.7-1.9,13.9c-1.8,0.1-3.7,0.1-5.4,0.5c-3.3,1.7-2.5,5.8-2.8,8.9
+		c1-0.1,2-0.1,3-0.2c0.3-1.8,0.6-3.5,1-5.3c2.4,0.1,4.7,0.1,7.1,0.2c1.2-3.6,1.3-7.4,1.1-11.2c1.4,0,2.8,0,4.2,0
+		c3.3,2.8,5.3,6.6,6.9,10.5c0.5,2.9,1,5.9,1.2,8.8v3.9c-4.6,0-9.4,0.3-13.6-2c0.6-1.7,1.2-3.4,1.8-5.1c-1.3-0.4-2.6-0.8-3.9-1.1
+		c-1.5,3.9-5.4,6.2-7,10c1.1,0.1,2.2,0.3,3.4,0.5c0.4-0.4,1.2-1.2,1.7-1.6c1.2,1.1,2.4,2.2,3.6,3.4c4.7-0.3,9.4,0.5,14,1.1v1.7
+		c-0.1,1.9-0.2,3.8-0.4,5.7c-0.5-0.4-1.6-1.3-2.1-1.7c-2.8,0.4-5.6,0.8-8.3,1.7c-0.2,1.2-0.4,2.4-0.5,3.7c-1.2,1.3-2.5,2.6-3.8,4
+		c-0.5,0-1.5,0-2-0.1c0-1.9,0.1-3.8,0.1-5.7c1.7-0.5,3.4-1,5-1.6c1.1-2.8-1.8-3.3-3.7-4.2c-1.8,1.8-3.9,3.4-5.4,5.5
+		c-0.9,1.7-1,3.8-1.3,5.7c1.9,0.8,3.7,1.6,5.5,2.4c-0.5,2.2-1,4.5-1.4,6.8c0.8,0.7,1.5,1.4,2.3,2.1c0.9,0,1.8,0,2.7,0
+		c0.2-1.8,0.5-3.5,0.8-5.3c1.5,0,3.1,0.1,4.6,0.1c0,3.1-0.1,6.1-0.1,9.2c1.8,0.7,3.7,1.3,5.5,2c-0.6,1.8-1.1,3.5-1.7,5.3
+		c2.1-0.3,4-1,5.8-2.1c2.5-0.3,4.9-0.7,7.3-1.3c0-1,0-2,0-3h12c0.1,1.1,0.2,3.2,0.2,4.2c-3.1,2.2-6.7,3.2-10.4,2.8
+		c0.1,1.2,0.1,2.5,0.2,3.7c2.5,1.9,3.6,4.7,3.1,7.8c-1.4,1.1-2.8,2.2-4.1,3.3c0,0.9,0.1,1.7,0.2,2.6c1.8,1.3,4.8,2.2,3.9,5.1h4
+		c-0.7-8.2,1.7-16.1,2.3-24.2c2.9-0.4,5.8-0.2,8.6-0.2c2-1.7,4-3.4,5.9-5.1h1.1c0,1.1,0,2.1-0.1,3.2c1-0.1,2-0.2,2.9-0.3
+		c0-0.7,0.1-2.2,0.1-2.9c0.1,0,0.2,0,0.2,0h8.8c0,2.6,0.5,5.2,2,7.5c1,0.4,2,0.9,3,1.5c0.2,2.1,0.1,4.2,0.2,6.3c-2.5,0-4.9,0-7.3,0
+		c-0.1-2-0.2-3.9-0.4-5.9c-1.8-0.1-3.5-0.1-5.3-0.2c-0.8-0.7-1.5-1.5-2.3-2.2c-0.4,0-1.1-0.1-1.5-0.1c-0.9,1.5-1.8,3-2.7,4.6
+		c1.4,3.7,0.4,8.1,2.2,11.6c4-0.5,7.9-1.3,11.9-1.3c0.3-0.5,1-1.6,1.4-2.1c1.6,0.3,3.3,0.5,4.9,0.8c0,1.1-0.1,3.3-0.1,4.4
+		c-4.3,0.3-8.6,1-12.9,1.2c-0.2,1.1-0.4,2.2-0.6,3.3h1.3h7.1h1.8c0-0.9,0-2.7,0-3.6c2.2,0,4.4-0.1,6.6-0.1c-0.2,0.9-0.5,2.8-0.7,3.7
+		h8.3c0.8-0.4,2.3-1.2,3.1-1.6c-0.1-1.2-0.1-2.3-0.2-3.5c-0.5-0.3-1.3-1-1.8-1.3c-0.3-1.7-0.7-3.5-1-5.2c-1.1,0-2.2,0-3.3,0
+		c0.1,1.2,0.2,2.5,0.3,3.7c1.2,0.5,2.4,1,3.6,1.5c-0.5,1.4-1.2,2.8-1.8,4.2c-4.4,0.3-5.9-4.7-7.8-7.7c-1.8-2.7-1-5.9-0.3-8.8
+		c2.1,0.1,4.2,0.2,6.4,0.4c-0.1-0.9-0.2-1.8-0.2-2.8c-3.6-1.5-6.8-4.3-7.2-8.4h43.3c0,0.3,0,0.6,0.1,0.8c-1.6,0.1-3.1,0.2-4.7,0.5
+		c-0.3,1.1-0.5,2.3-0.7,3.4c1.4,0.5,2.8,1,4.2,1.4c0.6-1.1,1.1-2.1,1.7-3.2c2.8,0.6,5.6,1,8.4,1.3c0.1-1,0.1-2.1,0.1-3.1
+		c-0.3-0.3-0.7-0.7-1.2-1.1H157c-0.1,2.2-0.5,4.3-0.7,6.5c0.5-0.2,1.4-0.5,1.9-0.7c0.4-1,0.7-1.9,1.1-2.8c-0.3-1-0.3-1.9-0.1-2.9
+		h11.7c-0.1,0.8-0.2,2.3-0.3,3.1c1.6,1.1,3.3,2.2,4.9,3.4c0-1-0.1-2-0.1-2.9c-1.2-1.2-2.4-2.3-3.6-3.5h66.8c0,0.6,0,1.3,0,1.7
+		c1.6,0.4,3.2,0.8,4.9,1.3c0-1-0.1-2-0.1-3h38.6c-2.3,3-5.3,5.3-8.4,7.4c0,1.2,0,2.4,0,3.7c1.3,1.2,2.6,2.5,4,3.7
+		c0.6,0,1.8,0.1,2.4,0.1c-2.7-2-2.9-5.3-2.7-8.4c3,0.7,6.7,2.5,9.3-0.2c-0.1-2.1-0.1-4.3-0.1-6.4h30.9c1,0.3,2,0.7,3,1.1
+		c0.5,1.3,0.9,2.6,1.4,4c1,0,2.1,0,3.1,0c-0.1-0.9-0.2-1.8-0.3-2.7c-0.7-0.8-1.4-1.7-2-2.5h839.3c0,0.2,0,0.5-0.1,0.7
+		c-0.6,0.8-1.2,1.6-1.8,2.4c1.8,1,3.8,0.5,5.8,0c-0.1-0.6-0.1-1.5-0.2-2.3c0-0.3,0-0.5,0.1-0.8h12.2c0.6,0,1.2,0,1.8,0h7.9
+		c0.1,0.9,0,1.9,0.1,2.9c0,0.5,0,1,0,1.3c0.1,0,0.2,0,0.3,0c0.4,0.7,1,1.2,2.2,1.3c0.4-0.9,0.7-2.2,1.1-3.3c0.2-0.5,0.5-0.9,0.7-1.4
+		c0.2-0.3,0.5-0.6,0.8-0.8h19.9c0.8,0.2,1.6,0.5,2.4,0.9c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0.1c0.1-0.1,0.2-0.2,0.2-0.2
+		c0.5-0.2,0.9-0.5,1.4-0.7h8.2c2.2,0.3,4.3,1,6.2,2.2c0.7-0.7,1.4-1.5,2.1-2.2h11.5c2.3,0.9,4.5,2.2,6.8,3.2
+		c-0.1,1.8-0.1,3.6-0.1,5.5c-0.7,0.8-1.3,1.7-2,2.5c0,0.4-0.1,1.3-0.1,1.7c0.3,0.5,1,1.5,1.4,2.1c0.4,0.1,1.2,0.2,1.7,0.3
+		c0.8-2.1,1.7-4.1,2.8-6.1c0.1,1.6,0.1,3.2,0.2,4.8c0.9,0.3,1.9,0.7,2.9,1.1c0.2,2.3,0.6,4.6,1.1,6.9c0,0-0.1,0-0.1,0.1
+		c-0.1,0.1-0.2,0.1-0.3,0.2c-0.9-0.5-1.9-1-2.8-1.5c0.1,1.3,0.2,2.7,0.3,4c-0.3,0.5-1,1.4-1.3,1.8c1,0.6,1.9,1.3,2.9,1.9
+		c0,0.1,0.1,0.3,0.1,0.4l-1.4,0.6h1.6h1.6h5h7.2h4.4c1.4-1.8,2.8-4.5,5.6-3.5c0.2,1.2,0.3,2.3,0.4,3.5h2.3c0.5-0.8,1.1-1.6,1.7-2.4
+		c0.2-1.1,0.2-2.2,0.1-3.2c-1.2-1.2-2.4-2.4-3.8-3.3c-1.1-0.2-2.2-0.4-3.3-0.7c-0.2-1.4,0.9-2.5,0.8-3.8c-1.6,0-2.5,1.5-3.7,2.3
+		c-2.1,0.5-4.3,0.1-6.3,0.5c-0.6,2.1,0.6,5.1-1.6,6.5c-1.6,0.3-3.6,1.1-5,0.2c0.8-0.6,1.8-1.2,2.8-1.6c-0.1-2.3-0.9-4.7,0.3-6.7
+		c0.5-0.5,1-0.9,1.6-1.3c-0.2-0.4-0.4-0.7-0.6-1.1c0-0.5,0-1,0-1.3c-0.3,0-0.8-0.1-1.3-0.2c-0.5-0.4-1-0.7-1.5-0.9
+		c-0.1,0.4-0.2,0.8-0.3,1.2c-1,1.2-1.1,3-1.9,4.4c-0.4-0.2-1.3-0.5-1.7-0.6c-1.4-1.7-1.6-4-1.1-6.1c0.6-1.5,2.5-1.2,3.8-1.6
+		c-2.3-1.6-5.2-1.1-7.7-1.3c-2.3-1.8-2.1-5.1-3.9-7.3c-0.4-0.3-1.3-0.9-1.8-1.2l0-0.1h8.2c-0.2,0.9-0.3,1.7-0.4,2.6
+		c0.1,0.1,0.2,0.3,0.3,0.4c0,0.1,0,0.2,0,0.3c0.1,0,0.2,0,0.3-0.1c0.5,0.4,1.1,0.2,1.5-0.3c0.3,0,0.5-0.1,0.8-0.2
+		c0-0.2-0.1-0.5-0.2-0.8c0.3-0.7,0.6-1.4,0.7-1.9h5.2c-0.8,1.6-1.7,3.2-2.3,4.9c-0.4,0.7-0.3,1.6,0.1,2.2c0,0.1,0,0.1,0,0.2
+		c0,0,0.1,0,0.1,0c0.3,0.3,0.7,0.5,1.3,0.3c1-1,1.2-2.3,1.6-3.6c0.3-0.4,0.5-0.8,0.9-1.2c0.4-0.2,0.9-0.4,1.2-0.6c0-0.8,0-1.5,0-2.2
+		h10.8c0.5,0.1,1,0.3,1.5,0.5c0,0.1,0,0.2,0,0.3c-1,0.1-2.3,0.2-3.1,0.3c-0.1,0.2-0.1,0.6-0.2,0.9c-0.3,0.3-0.4,0.6-0.2,0.9
+		c0,0.2-0.1,0.4-0.1,0.5c0.2,0,0.3,0,0.5,0c0.1,0.1,0.2,0.2,0.3,0.2c1.3,0,2.6,0,4,0c0.6,0.3,1.2,0.6,1.8,0.9
+		c0.3,0.4,0.5,0.8,0.8,1.2c0-0.2-0.1-0.5-0.1-0.8c0.1,0.1,0.3,0.1,0.4,0.2c-0.1-1.8-0.9-3.4-1.4-5.1h51c0.1,0.6,0.1,1.2,0.3,1.8
+		c1.5,1.3,3.2,2.1,4.8,3.4c0.6,1,0.2,2.3-0.5,3.2c-2.1,1.3-4.1,2.6-5.7,4.4c0.4,3.3,3.6,5.2,4.4,8.4c1.8-1.3,3.3-2.9,5.1-4.1
+		c0.2-1,0.1-2-0.3-3c-1.7-0.8-3.5,0.3-5.2,0.2c-0.2-0.4-0.6-1.1-0.8-1.5c0.5-0.2,1.6-0.7,2.1-0.9c1.9-1.8,3.2-4.4,5.8-5.3
+		c0.2-0.5,0.5-1.5,0.7-2c-0.9-1-2.3-1.2-3.1-2.3c-0.3-1.1,0-1.9,0.7-2.4h4.4c0.4,0.2,0.7,0.5,0.9,0.8c0.2,0.5,0.5,1.7,0.7,2.2
+		c0.6,0.1,1.8,0.4,2.4,0.5c1,0.3,1.8,1,2.2,2c-0.7,1.1-2,1.7-3.2,2.1c-0.9-0.4-1.7-1.1-2.5-1.6c-0.1,1.1-0.4,2.1-0.7,3.2
+		c-1.1,0.3-2.3,0.6-3.4,0.8c-0.1,1.7,1.1,4.3,3.1,4.2c0.2-1.2,0.5-2.3,0.8-3.4c2.4-1,5.4-0.8,7.5-2.6c2.2-2.2,0.2-5.7,1.5-8.3h4.1
+		c0,0,0,0.1,0,0.1c0.1,0.9,0.2,1.8,0.3,2.7c1-0.7,1.6-1.8,2.1-2.9h28.1c0.5,1.7,0.4,3.6,0.8,5.4c0.1-0.1,0.2-0.2,0.3-0.3
+		c0,0.1,0,0.2,0,0.3c0-0.1,0-0.2,0-0.4c1-1.4,0.4-3.5,1-5h11.8c0.3,1,0.5,2.1,0.7,3.2c0.5,0.5,1.2,0.9,1.9,1.2c0-0.1,0-0.1-0.1-0.2
+		c0,0,0.1,0,0.1,0.1c0,0-0.1-0.1-0.1-0.1c-0.1-0.5-0.4-1.3-0.5-1.8c0-0.6,0.1-1.6,0.1-2.3h75.6c0,0.2,0,0.4,0,0.6
+		c-0.4,0.8-0.7,1.6-1,2.4l1.4-0.6c0.5,1.1,1,2.2,1.5,3.3c0,0.2,0,0.5,0.1,0.7c0-0.2,0-0.4,0-0.6c0,0.1,0.1,0.1,0.1,0.2
+		c0.1-1.8,0-3.7,0.3-5.5c0.3-0.1,0.7-0.4,1.1-0.6h74.5c0.2,0.1,0.4,0.3,0.6,0.5c0.2,1.4,1.1,3,0.2,4.3c-1,0.4-2,0.8-3,1.2
+		c0.1,0.4,0.4,1.3,0.5,1.7c1.2,0.5,2.6,0.5,3.9,0.4c0.7,0.5,1.5,1,2.3,1.5c1.7,0,3.7,0.2,5-1c-1.9-1.6-5.1-1.6-6.3-4
+		c-0.1-1.5-0.2-3.1,0.3-4.6h16.5c-0.9,1.7-1.8,3.6-3.2,5c-0.3,1-0.3,2,0.2,2.9c0.8,0.5,1.7,0.5,2.6-0.1c0.5-0.9,1.1-1.8,1.9-2.5
+		c1.7-0.3,3.4,0.4,4.7,1.4c1,0.6,2.3,0.4,3.3-0.1c0.9-0.8,1-2.6-0.1-3.3c-2.3-0.8-4.7-0.7-7-0.4c-0.1-0.6-0.2-1.8-0.2-2.4
+		c0.2-0.2,0.5-0.4,0.8-0.6h16.8c0.1,0,0.1,0,0.2,0c-0.6,0.2-1.6,0.7-2.1,0.9c0,0,0,0.1,0,0.2c-0.1,0.1-0.3,0.1-0.4,0.2
+		c0.1,0.1,0.2,0.3,0.4,0.4c0,0.2,0,0.3,0,0.5c1.9,2.2,4.3,4.6,7.3,5.1c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.4,0.2
+		c-0.1-0.2-0.3-0.4-0.4-0.6c-0.1-0.5-0.2-1.1-0.2-1.5c-1.1-1.4-2.4-2.5-3.4-3.9c0.2-0.6,0.6-1.1,1.1-1.4h1.5
+		c0.4,0.4,1.1,1.2,1.5,1.6c1,0,1.5-0.8,2-1.6h19c0.3,0.1,0.6,0.2,0.9,0.3c1.3,1.9,0.4,4.6,0.7,6.8c-2,0-4,0.1-6,0.1
+		c0.9,0.3,1.8,0.5,2.8,0.8c0.4,1.8,0.8,3.6,1.2,5.4c-4.3-0.5-6.1-4.7-8.7-7.5c-0.6,1.3-1.1,2.6-1.7,3.8c-0.4,0.1-1.3,0.4-1.7,0.5
+		c-0.1-0.7-0.1-2.1-0.2-2.9c-1,0.3-1.9,0.7-2.9,1.1c-1.7-0.4-3.3-0.7-4.9-1c2.1,3.5,5.6,5.6,9.5,6.9c0.9-0.9,1.9-1.8,2.8-2.7
+		c1.2,0.4,2.4,0.9,3.7,1.3c0,0.6-0.1,2-0.1,2.6c1.9,1,4.1,1.8,5.2,3.7c-0.2,1.1-0.4,2.3-0.7,3.4c0.2,1,0.5,2.1,0.8,3.1
+		c-1.8,1.4-3.6,3.1-5.9,3.5h4.6c2.2-1.1,4.7-1.6,7.2-1.6c-0.1-1-0.1-2-0.2-3c-1.8,0.6-3.7,1.1-5.5,1.6c-1.4-4.6,1.6-8.7,2.8-12.9
+		c-0.8-1-1.6-2-2.3-3c0.5-2.6,2.2-4.7,3.4-6.9c2.1,0.1,4.3,0.4,6.4,1c0.8-1,1.6-2,2.5-2.8c2.4,0.5,4.1,2.6,5.9,4.1
+		c0.7,0,2.1,0,2.8-0.1c0,1,0,2,0,3c-1.6,0.1-3.2,0.1-4.7,0.3c-0.1,1-0.4,3-0.6,4c2.3-0.5,4.7-1,7.1-1.5c0.1-1.2,0.3-2.4,0.5-3.6
+		c3.5,1.7,3,6,3.8,9.2c1.7-0.8,3.4-1.5,5.1-2.3c-0.1-1.2-0.1-2.4-0.2-3.5c-1.5,0.6-3,1.3-4.4,2c0.5-2,1.1-3.9,1.6-5.8
+		c-2.3-0.8-3.9-2.5-5.4-4.3c-1.8-0.7-5.6-0.3-5.2-3.2c0.2-0.1,0.3-0.1,0.5-0.2h10.2c-0.8,0.6-1.7,1.2-2.5,1.8c2,0.8,4.1,1.3,6.3,1.7
+		c0.3-1.2,0.6-2.3,0.9-3.5h4.2c-0.2,3-0.3,6-0.2,9c-0.3,0.3-0.9,1-1.2,1.3c0,0.7,0.1,2.2,0.2,3c0.8-0.1,1.6-0.2,2.5-0.2
+		c1.8-1.9,3.7-3.6,5.8-5.1c2.5,1.5,5.3,1.1,7.9,0.1c0-2.2,0-4.4,0.1-6.6c-0.8-0.5-1.6-0.9-2.4-1.4h5.3c0.1,0.6,0.2,1.3,0.3,1.7
+		c1.1,2.2,2.3,4.5,2.7,7.1c0,2-0.8,3.8-1.3,5.7c1.4-0.5,2.9-1.1,4.4-1.6c0-1.3,0-2.7,0.1-4c-0.5-0.3-1.6-0.9-2.1-1.1
+		c0-0.9,0-2.7,0-3.6C1690.6,824.9,1691.6,824.2,1692.7,823.4z M1.5,689.5c0-1.3-0.1-2.7-0.1-4c1.7,0,3.5-0.1,5.2-0.1
+		c0,1.1,0.1,3.2,0.1,4.3C5,689.6,3.2,689.5,1.5,689.5z M1277.3,842.4c0.8,0.6,1.6,1.3,2.4,1.9c-0.1,1-0.2,2.1-0.3,3.1
+		c-1,0-2.9,0.2-3.9,0.2c-1.4-1.5-2.3-3.2-2.3-5.2C1274.2,842.4,1276.2,842.4,1277.3,842.4z M1710.1,772c1.1,0.9,0,3.5-1.4,2.4
+		c-0.1-0.1-0.2-0.2-0.2-0.2v-1.8C1708.8,771.8,1709.4,771.4,1710.1,772z M1713.4,711.2c-0.2,0.4-0.5,1.1-0.7,1.5
+		c-1.2,1-2.8,0.6-4.2,0.7c-0.1,0.2-0.1,0.3-0.2,0.5v-3.5C1710.2,710.2,1711.9,710.3,1713.4,711.2z M29.5,694.6c-0.8,0-2.3,0-3,0
+		c-0.8,1.4-1.5,2.8-2.2,4.2c-2.8-0.1-7.1,0.4-5.9-3.9c1.2-1.5,3.9-2.9,2.8-5.2c-1.4-3.7-0.5-7.5,0.6-11.1c-1.4-0.1-2.9-0.1-4.3-0.2
+		c0.1,2.4,0.1,4.7,0.2,7.1c0.8,1.1,2.4,1.9,2,3.6c0.7,2.5-2.2,2.7-3.8,2.6c0,2.6-2.1,3.5-4.5,3.3c0-1.1-0.1-3.2-0.1-4.2
+		c1-0.1,1.8-0.6,2.3-1.3c-0.6-0.3-1.8-0.8-2.4-1.1c0.1-2.4-0.2-5,2-6.5c0.1-1,0.1-2,0.2-3c-3.5-0.2-6.7-1.6-10-2.5
+		c0.5-2.3-1.7-7.4,2-7.2c0-0.9-0.1-1.7-0.1-2.5c-0.8,0-2.3,0.1-3,0.1c0.1-2.9,0.1-5.7,0.1-8.6c1.7,0.1,3.5,0.2,5.2,0.3
+		c0,1.5,0.1,3,0.1,4.6c0.4,0.2,0.8,0.5,1.2,0.7c0,0,0,0.1,0,0.1c0.3,0.1,0.8,0.3,1.2,0.5c1,0.5,1.9,1.1,2.7,1.9
+		c1.1,1.8,2.3,3.7,3.9,5.1c1,0,2,0.1,2.9,0.1c0-2-0.1-4-0.1-5.9c-0.7-0.8-1.4-1.5-2-2.2c0-3,0-6-0.1-9c0.9-0.1,2.5-0.2,3.4-0.3
+		c-0.1,1.8-0.1,3.5-0.2,5.3c1.1,0.1,2.1,0.1,3.2,0.2c-0.1-1.7-0.1-3.3-0.2-5c-1.8-1.7-3.2-3.6-4.3-5.8c-1.2-0.5-2.4-1-3.6-1.5
+		c0-2.3,0-4.6,0-6.9c-0.8-0.8-1.6-1.6-2.4-2.4c0.4-0.7,1.2-2.1,1.6-2.8c0.9,0,2.6,0,3.5,0c2.6,3.2,4.7,6.9,7.2,10.2
+		c1,1.4,2.8,0.7,4.2,0.7v8.7c0,2.5,0,4.9,0,7.4v8.3c-1.4-0.1-2.8-0.2-4.2-0.4c0,0.5,0.1,1.6,0.1,2.1c1.3,1,3.3,1.4,4,3
+		c0.1,0.5,0.1,1,0.1,1.5v5.6c-1,0-2.9-0.1-3.8-0.1c1.2,1.1,2.5,2.2,3.7,3.2C29.6,688.8,29.5,691.7,29.5,694.6z M23.2,817.7
+		c0.1-2.1,0.2-4.2,0.3-6.3c1.7,0,3.4,0,5.1,0c0,1.9,0,3.8-0.1,5.8C26.7,817.6,25,817.7,23.2,817.7z M33.6,823.8
+		c-1.6-0.1-3.2-0.3-4.7-0.5c-1.2-1.5-0.2-3.6-0.3-5.3c0.2,1,0.6,1.7,1.2,2.1v1.4h3.9C33.6,822.2,33.6,823.2,33.6,823.8z M60.7,821.8
+		c-2.7,3.4-6.8,0.3-10.1,0.1c0.4-0.2,0.7-0.3,1.1-0.5h8C60,821.6,60.4,821.7,60.7,821.8z M1353.4,823.3c-1.1,1.3-3.8-0.4-2.6-1.8
+		h2.7C1353.9,822,1354,822.6,1353.4,823.3z M1639.4,824.2c-1.6,0.4-3.3,0.6-4.9,0.8c0-0.9-0.1-2.6-0.1-3.6h5.3
+		C1639.5,822.4,1639.4,823.6,1639.4,824.2z M1674.6,823.7c-1.1,0-2.1-0.1-3.1-0.1c-0.4-0.5-1.1-1.6-1.6-2.1h4.7
+		C1674.7,822.2,1674.6,823.2,1674.6,823.7z"/>
+	<path class="st0" d="M340.6,27.6c-1.8,0.1-3.6,0.1-3.3-2.1c-0.5,0-1.4,0-1.9,0c0,1.1,0,2.2-0.1,3.3c0.5-0.1,1.4-0.3,1.9-0.4
+		c0.4,1.4,0.9,2.8,1.3,4.2c0.5,0,1.5,0.1,2.1,0.1C340.7,30.9,340.6,29.2,340.6,27.6z"/>
+	<path class="st0" d="M1402,29.3c-1.6-1.2-3.1-2.5-4.5-3.8c-0.1,0-0.2,0-0.3,0l-0.2-0.1c-0.1,0-0.3,0.1-0.5,0.1
+		c-0.7,0-1.5-0.1-2.2-0.1c0,0.6,0,1.7,0.1,2.2c0.8,0.4,1.6,1,2.5,1.6c0.2,0.2,0.3,0.4,0.5,0.6l0.5,0
+		C1399.3,30.4,1400.7,30.7,1402,29.3z"/>
+	<path class="st0" d="M1413.6,35.7c1-1.2-1-3.2-1.9-1.6C1410.6,35.3,1412.6,37.3,1413.6,35.7z"/>
+	<path class="st0" d="M322.1,52.3c-1.8,1.3-3.7,2.6-5.5,3.9c0,0.5,0,1.4,0,1.8c0.8-0.9,1.6-1.8,2.4-2.7c1.2,0,2.5,0,3.7,0.1
+		C322.4,54.4,322.2,53.4,322.1,52.3z"/>
+	<path class="st0" d="M340.8,64.4c-0.5,0-1.5,0-2,0c-1,1.7-2,3.4-2.8,5.1c0.6,0,1.8,0.2,2.4,0.2c0.2-1.5,0.8-2.8,1.9-3.9
+		C340.4,65.5,340.6,64.8,340.8,64.4z"/>
+	<path class="st0" d="M1404.4,81.8c0.9-0.5,1.8-0.9,2.7-1.4c1.2,0,2.5-0.1,3.8-0.1c-0.5-1.3-1.6-2.1-3-2.2c0.3-1.5,1.1-2.5,2.5-3.1
+		c0-0.4,0.1-1.1,0.1-1.4c-2.6,0-5.1-0.2-7.6-0.3c1.2,0.2,2.4,0.4,3.6,0.5c1,1.8,1.2,3.8,1.4,5.9c-1.2,0.4-2.4,0.7-3.6,1.1
+		C1404.3,81,1404.4,81.6,1404.4,81.8z"/>
+	<path class="st0" d="M336.1,92.6c0.4-2.4,1-4.8,1.7-7.1c-1.7,0.1-3.3,0.2-5,0.2c-0.9,0.6-1.8,1.3-2.6,1.9c-1.5,0-2.9,0-4.4,0.1
+		c-0.1,0.7-0.3,2.1-0.3,2.9c-0.8,0-2.3,0-3.1,0c0,0.2-0.1,0.6-0.2,0.8c2,0,4.1,0,6.1,0c0-0.8-0.1-2.2-0.1-3c2.6-1.4,7.8-1.5,7.5,2.7
+		c-3.1,2.4-1.8,6.1-0.8,9.2c-1.7,0.3-3.4,0.7-5,1.3c0.7,0.6,1.3,1.3,2.1,1.8c2-1.5,3.8-3.4,5.6-5c-0.1-1.6-0.2-3.2-0.3-4.9
+		c1-0.3,1.9-0.7,2.9-1C339.1,92.6,337.1,92.6,336.1,92.6z"/>
+	<path class="st0" d="M316.5,96.7c-0.4,5.4-0.2,10.9,0,16.3c0.8-1.1,1.6-2.2,2.5-3.3c-0.8-0.7-1.5-1.4-2.2-2.1
+		c0.2-2.8,0.1-5.7,0-8.5c1.3,0.5,2.7,1,4,1.5C319.3,99.3,317.9,98,316.5,96.7z"/>
+	<path class="st0" d="M326.3,105.1c0-0.8,0-1.5,0-2.2c-0.4-0.2-1.1-0.4-1.5-0.6c0,2.1-0.9,3.9-3.3,3.4c0,1,0.1,2,0.1,3
+		c1.1-0.1,2.2-0.2,3.3-0.4C325.4,107.2,325.8,106.1,326.3,105.1z"/>
+	<path class="st0" d="M331.3,109.4c0,1.2,0.1,2.4,0.1,3.6c1.9-0.9,3.8-2,5.4-3.3C335,109.5,333.2,109.4,331.3,109.4z"/>
+	<path class="st0" d="M328.3,134.8c2-0.3,3.8-1.1,5.5-2.2c1.5-0.1,3.1-0.2,4.6-0.3c0.1-1.1,0.2-2.2,0.3-3.3c-2.3,0.4-4.5,1.1-6.6,2
+		C330,131.5,327.7,132.2,328.3,134.8z"/>
+	<path class="st0" d="M1410.6,131.1c1,0.7,3.2,1.1,3.8-0.3C1414.1,129,1409.4,128.9,1410.6,131.1z"/>
+	<path class="st0" d="M1416,137.6c-1.6-0.5-3.2-1-4.7-1.5c-0.4,1.5-0.8,3-1.2,4.6c2-0.1,3.9-0.2,5.9-0.3
+		C1416,139.4,1416,138.5,1416,137.6z"/>
+	<path class="st0" d="M1401.4,137.6c-1-0.1-3-0.2-4-0.2c0,0.5-0.1,1.6-0.1,2.2c1.4,0.4,2.9,0.9,4.4,1.3
+		C1401.5,139.8,1401.4,138.7,1401.4,137.6z"/>
+	<path class="st0" d="M327.4,145.2c0-1.2,0.1-2.5,0.1-3.8c-0.5,0-1.5,0-1.9-0.1c-0.9,1.6-1.9,3.2-3.7,3.7c-0.2,0.8-0.4,1.7-0.6,2.5
+		c0.4-0.1,1.3-0.2,1.8-0.2C323.8,145.5,325.5,145.1,327.4,145.2z"/>
+	<path class="st0" d="M1397.6,143.6c-0.1,1.4-0.2,2.7-0.2,4.1c1.4,0,2.8,0,4.2-0.1c0-1.4,0-2.8,0-4.3
+		C1400.2,143.4,1398.9,143.5,1397.6,143.6z"/>
+	<path class="st0" d="M1411.3,143.6c-1-1-3.3-0.3-2.8,1.3c0.8,1.1,1.7,1.3,2.9,0.6C1411.4,145,1411.4,144.1,1411.3,143.6z"/>
+	<path class="st0" d="M1416,167.8c-0.5-0.3-1.4-0.9-1.9-1.2c-0.9,0.5-1.7,0.9-2.5,1.4c0,0.8,0.1,1.6,0.2,2.4
+		c1.4-0.1,2.8-0.1,4.3-0.1C1416,169.3,1416,168.5,1416,167.8z"/>
+	<path class="st0" d="M1407.5,178.4c1,0.1,2,0.2,3.1,0.2c-0.2-1.6-0.3-3.2-0.4-4.8c-0.9-0.1-1.8-0.2-2.7-0.4
+		C1407.5,175.1,1407.5,176.8,1407.5,178.4z"/>
+	<path class="st0" d="M1409.1,197.5c1,1.6,4.1,5.3,5.7,2.5c-1.5-0.5-3.1-1-4.6-1.5c0-0.7,0.1-2.2,0.2-2.9c-1.4,0-2.8,0-4.1-0.1
+		c0.2,0.4,0.5,1.2,0.7,1.6C1407.4,197.3,1408.6,197.4,1409.1,197.5z"/>
+	<path class="st0" d="M1412.1,202.8c-0.5,0.9-1,1.8-1.5,2.7l1.6-0.1c0.9,1.6,2.2,2.8,3.8,3.8c0-1,0-2,0-3
+		C1414.2,205.8,1412.5,204.7,1412.1,202.8z"/>
+	<path class="st0" d="M1400.2,205.4c-1-0.1-2.1-0.1-3.1-0.1c0.5,0.9,1.1,1.8,1.6,2.7c-0.3,0.5-1,1.5-1.3,2c-0.2,1.8,1.8,1.4,3,1.8
+		c0.4-1.3,0.8-2.6,1.2-3.9C1401.2,207.3,1400.5,206,1400.2,205.4z"/>
+	<path class="st0" d="M1403.2,237.6c1.4-0.6,2.9-1,4.5-1.3c0.2-1.6,0.4-3.2,0.7-4.8c0.9-0.1,2.5-0.2,3.4-0.3
+		c-0.9-1.8-3.9-2.9-4.7-0.4c-1.8-0.1-3.6-0.2-5.4,0.1c2,1.2,4.8-0.3,6.4,1.7C1406.6,234.5,1402.7,234.4,1403.2,237.6z"/>
+	<path class="st0" d="M1398.6,236.8c-1.3,2,2.6,2.3,2.7,0.4C1400.6,236,1399.7,235.9,1398.6,236.8z"/>
+	<path class="st0" d="M1482.7,247.6c-0.1,1.7-0.2,3.5-0.2,5.2c1.7,1.3,3.2,2.8,4.6,4.5c0.8,0.1,1.6,0.1,2.4,0.2
+		c0-0.4,0.1-1.3,0.2-1.8c-1.6-0.3-3.1-0.5-4.6-0.9c0.2-1.8,0.7-3.5,1.6-5c-0.7-2-2.7-3.7-2.2-6c1.6-2.3,4.8-1.1,7.3-1.6
+		c0.3,1.2,0.7,2.3,1.1,3.5c1.5-0.1,2.9-0.3,4.4-0.4c-0.9-0.3-1.8-0.6-2.8-0.9c0-0.7-0.1-2-0.1-2.6c-1.8,0-3.6-0.1-5.4-0.2
+		c-1.7-1.9-4.9-0.2-6.4-2.4c0,2.6,0.7,5,1.4,7.5c-1,0-3.1,0.1-4.1,0.1C1480.8,247,1481.7,247.3,1482.7,247.6z"/>
+	<path class="st0" d="M1474.7,247c0-2-0.1-3.9-0.2-5.9c-2.2-0.1-3.6,1.2-4.5,3C1471.3,245.5,1472.8,246.7,1474.7,247z"/>
+	<path class="st0" d="M1536.5,245.6c0.4-1,0.8-2.1,1.2-3.1c-1.1,0-2.2-0.1-3.3-0.1c0,1,0,2,0.1,3.1
+		C1535,245.5,1536,245.6,1536.5,245.6z"/>
+	<path class="st0" d="M1509.8,246c1.6-0.1,2.2-3,0.3-3.1C1508.6,243,1507.9,246,1509.8,246z"/>
+	<path class="st0" d="M1524.9,247.6c1.7-1.1-0.6-3.2-1.9-2.1C1521.3,246.5,1523.6,248.6,1524.9,247.6z"/>
+	<path class="st0" d="M1413,251.4c0.9-1.5,2.2-2.8,3.8-3.6c-3.4,0-5.3,3.3-8.2,4.4c0.1,2.6,1.1,5.1,1.2,7.7c2.5-2.5,6-0.2,9.1-0.3
+		c-1.7-1.3-3.4-2.8-3.7-5.1c-1.6,0.1-3.2,0.2-4.8,0.4c0-0.8,0.2-2.5,0.2-3.3C1411.1,251.4,1412.4,251.4,1413,251.4z"/>
+	<path class="st0" d="M1463.8,254.5c0.3,0,1-0.1,1.4-0.1c0.9-0.6,1.9-1.1,2.9-1.7c-0.9,0-2.8,0-3.7,0c0-1.4,0.1-2.8,0.1-4.2
+		c-1.1,0-2.1,0-3.1,0c0.1,1,0.1,2,0.2,3C1462.3,252.5,1463.1,253.5,1463.8,254.5z"/>
+	<path class="st0" d="M1504.9,253.4c0.4,0,1.2,0.2,1.6,0.2c-0.4-0.5-1.2-1.3-1.7-1.8c-0.7-0.1-1.3-0.1-2-0.2c-1.2,1.4-2.4,2.7-3.6,4
+		c0.3-0.2,1-0.8,1.3-1C1502.1,254.2,1503.5,253.8,1504.9,253.4z"/>
+	<path class="st0" d="M1510.5,256.2c1.3,0.1,2.7,0.2,4.1,0.3c-0.1-1.1-0.1-2.1-0.1-3.2c-1.6,1.8-3.7,2.5-6,2.4c0,1,0.1,2,0.2,3
+		C1509.2,257.9,1509.8,257.1,1510.5,256.2z"/>
+	<path class="st0" d="M1527.1,258.8c-1.5-0.2-3-0.3-4.5-0.4c-0.1-1.2-0.2-2.5-0.3-3.8c-0.9,0-1.7,0-2.6,0.1
+		c-0.1,1.2-0.2,2.4-0.3,3.6C1521.9,258.4,1524.6,259.8,1527.1,258.8z"/>
+	<path class="st0" d="M1713.1,259.6c-0.8,2.1,0.2,4.1,1.3,5.9C1715.3,263.2,1715.2,261.1,1713.1,259.6z"/>
+	<path class="st0" d="M21.5,318.6c0-1.4,0-2.8-0.1-4.1c-1,0-2,0-3.1,0c0,1.3,0.1,2.6,0.1,4C19.5,318.5,20.5,318.5,21.5,318.6z"/>
+	<path class="st0" d="M1720.8,322.2c-0.2,2.5-0.2,5-0.3,7.4c0.6,0,1.7-0.1,2.2-0.1C1722.6,327,1722.3,324.4,1720.8,322.2z"/>
+	<path class="st0" d="M11.5,330.6c-1-0.1-2-0.2-3-0.3c-0.4,1.4-0.9,2.8-1.3,4.2c1.5,0,3,0,4.4,0C11.5,333.6,11.5,331.6,11.5,330.6z"
+		/>
+	<path class="st0" d="M19.8,377.2c1.4,0.1,2.4-1.1,3.5-1.8c0-1.2,0-2.5,0-3.7c-1.3,0-2.5-0.1-3.8-0.1
+		C19.6,373.5,19.6,375.4,19.8,377.2z"/>
+	<path class="st0" d="M16.5,410.5c-1.3,0.1-2.5,0.1-3.8,0.2c0,0.9-0.1,1.9-0.1,2.8c1.4,0.1,2.7,0.2,4.1,0.2
+		C16.6,412.6,16.5,411.5,16.5,410.5z"/>
+	<path class="st0" d="M17.2,480.3c1.5-0.7,1.3-2.5,1.6-3.9c-2.2,0-4.5,0-6.7,0c0.6,1.4,1.1,2.8,1.7,4.2
+		C15,480.5,16.1,480.5,17.2,480.3z"/>
+	<path class="st0" d="M12.9,482.5c-1.1,0-2.2,0.1-3.2,0.1c-0.1,0.6-0.2,1.8-0.3,2.4c-0.2,0.6-0.7,1.8-1,2.3c-1.2,0.5-2.5,1-3.7,1.5
+		c0,0.9-0.1,1.8-0.2,2.6c1,0,2.1,0,3.1,0C9.5,488.6,11.4,485.6,12.9,482.5z"/>
+	<path class="st0" d="M21,484.6c-1.6,2-2.8,4.2-2.3,6.8c3.4,0.5,4.8-2.8,5.5-5.5c-0.7-0.4-1.5-0.7-2.2-1.1
+		C21.8,484.8,21.2,484.7,21,484.6z"/>
+	<path class="st0" d="M18,499c-1-1.7-2.5-2.9-4.6-2.7c0,1.8,0,3.6,0,5.4C15.5,501.8,17,500.7,18,499z"/>
+	<path class="st0" d="M21.7,502.3c-0.6,0-1.8,0-2.4,0c0,0.6,0.1,1.7,0.1,2.2c0.5,0,1.5,0,2,0C21.6,504,21.7,502.9,21.7,502.3z"/>
+	<path class="st0" d="M1717.2,520.1c0.7-2,1.1-4,0.7-6c0,0.7,0,2,0,2.6c-0.6,0-1.8,0-2.5-0.1c0,1.3,0,2.7,0,4
+		C1715.9,520.6,1716.8,520.3,1717.2,520.1z"/>
+	<path class="st0" d="M23.7,519.6c-0.1,1.3-0.1,2.6-0.2,3.9c1.4,0,2.8,0,4.2,0.1c0-1.4,0-2.8-0.1-4.2
+		C26.3,519.5,25,519.5,23.7,519.6z"/>
+	<path class="st0" d="M1728,525c-1.6-0.4-3.2-0.8-4.8-1.3c0.2-1.5,0.5-2.9,0.7-4.4c-0.6,0-1.8,0.1-2.3,0.2c0,1.3-0.1,2.7,0,4
+		c-0.5,0.1-1.6,0.2-2.2,0.3c0.9,0.8,1.8,1.7,2.8,2.5C1724.2,527.1,1726.2,525.7,1728,525z"/>
+	<path class="st0" d="M27.2,540.5c-2.1-0.2-3.9,1.3-5.4,2.5c2.2,1.5,4.5,3.3,7.2,1.8C28.6,543.3,28.7,541.5,27.2,540.5z"/>
+	<path class="st0" d="M1729.5,542.6c0,0.5-0.1,1.5-0.1,1.9c0.8,0,2.4,0,3.3,0c0.1,0.4,0.2,1.2,0.3,1.5v-3.3
+		C1731.8,542.7,1730.7,542.6,1729.5,542.6z"/>
+	<path class="st0" d="M4.7,552.6c0-1.1,0.1-2.2,0.1-3.3c-1.2,0-2.3,0-3.5,0c0,1.1,0,2.2,0.1,3.4C2.5,552.7,3.5,552.6,4.7,552.6z"/>
+	<path class="st0" d="M19.7,559.7c0.7-0.3,2.2-0.9,2.9-1.2c0.1-2.5-0.4-4.8-3.1-5.7C18.7,554.8,17.2,558.2,19.7,559.7z"/>
+	<path class="st0" d="M1723.8,568.1c-1.3,0.2-2.6,0.3-3.8,0.5c-0.6,0.6-1.2,1.2-1.8,1.8c1.8,0,3.6,0,5.4,0
+		C1723.7,569.8,1723.8,568.7,1723.8,568.1z"/>
+	<path class="st0" d="M8.2,570.5c-0.4,0-1.3-0.1-1.7-0.1c-1.6,1.5-3.4,3-3.3,5.4c2.5-0.2,5-0.5,6.7-2.5
+		C9.5,572.6,8.6,571.2,8.2,570.5z"/>
+	<path class="st0" d="M1730.9,581.7c0.5-2.5,0.6-5,0.6-7.6c-0.8,0.3-2.3,0.9-3.1,1.2c0,2.1-0.1,4.3-1.2,6.2
+		C1728.4,581.5,1729.7,581.6,1730.9,581.7z"/>
+	<path class="st0" d="M3.1,581.5c-1,0.1-2.1,0.2-3.1,0.3v4.7c1.3-1,2.7-2,4.1-3C3.8,582.9,3.4,582.2,3.1,581.5z"/>
+	<path class="st0" d="M1728.2,584.5c-0.8,0-1.6,0.1-2.4,0.2c-0.2,0.9-0.3,1.8-0.5,2.7c2.6,0.4,5.1,0.9,7.7,1.4v-0.6
+		C1731.1,587.3,1729.5,586,1728.2,584.5z"/>
+	<path class="st0" d="M27.8,598.5c0.5-3.5-2.7-4.4-5.4-4.3c0,1.4,0.1,2.9,0.1,4.4C24.2,598.6,26,598.5,27.8,598.5z"/>
+	<path class="st0" d="M15.3,596.6c-0.9,0-1.8,0-2.7-0.1c0,1.3-0.1,2.7-0.2,4c1.1,0,2.1,0.1,3.2,0.1C15.5,599.3,15.4,598,15.3,596.6z
+		"/>
+	<path class="st0" d="M3.4,604.8c-1.8-2.1-3.2-4.5-3.4-7.3v10.4c1.2-0.6,2.3-1.2,3.5-1.8C3.5,605.7,3.4,605.1,3.4,604.8z"/>
+	<path class="st0" d="M15.6,622.6c0-1.2-0.1-2.4-0.1-3.6c-1.2-0.9-2.4-1.8-3.6-2.7c0.9-2,1.9-3.9,3.5-5.4c-1.4-1.9-2-4.1-2-6.4
+		c-1,0-2,0.1-3,0.1c-1.1,1.1-2.1,2.3-3.2,3.4c1.5,0.5,2.9,1,4.3,1.5c0.1,2.8-0.5,5.9,1,8.4c-0.4,1.5-0.8,3-1.2,4.6
+		C12.8,622.5,14.2,622.6,15.6,622.6z"/>
+	<path class="st0" d="M0,616.4v5.3c1.1-1.8,2.4-3.4,3.8-5C2.5,616.6,1.3,616.5,0,616.4z"/>
+	<path class="st0" d="M3.4,624.9c-1.2-0.6-2.3-1.2-3.4-1.8v5.4c1.2-0.4,2.5-0.8,3.7-1.2C3.6,626.5,3.5,625.7,3.4,624.9z"/>
+	<path class="st0" d="M1722.3,644.7c1.8-0.2,3.4-0.7,5-1.6c-1.6-1.1-3.2-2.1-4.7-3.1C1722.4,641.6,1722.4,643.2,1722.3,644.7z"/>
+	<path class="st0" d="M1731.8,643c-2.1,0.5-4.1,1.1-6.1,1.8c1.2,1.7,3.2,1.9,5,2C1731.1,645.6,1731.5,644.3,1731.8,643z"/>
+	<path class="st0" d="M1723.3,656.3c-0.3,0.3-0.9,0.8-1.2,1c1.7,0,3.5,0,5.2,0c0-1.3,0-2.5,0.1-3.8c0.7-0.1,2-0.3,2.7-0.3
+		c0.2-0.5,0.5-1.4,0.6-1.9C1727.3,651,1724.5,653.2,1723.3,656.3z"/>
+	<path class="st0" d="M1715.2,652c-0.9,3.2,1.8,4,4.3,4.7C1720.7,653.5,1717.7,652.7,1715.2,652z"/>
+	<path class="st0" d="M1720.3,667.7c2.6,2.7,6.5,1.6,9.8,1.6c-0.2-0.4-0.7-1.3-0.9-1.7C1726.3,667.1,1723.3,667.3,1720.3,667.7z"/>
+	<path class="st0" d="M1727.3,678.5c-0.8,0-1.7-0.1-2.5-0.1c-0.3-2.1-0.7-4.2-1.9-5.9c-2.2,3.4-0.4,7.3-0.2,11
+		c-1.6,1.3-3.1,2.7-4.7,4c1.3,0.1,2.7,0.2,4,0.4c0.6-0.6,1.2-1.2,1.8-1.8c-1,2.4-2,4.7-2.8,7.1c4.1-0.5,5.7-4.6,7.8-7.4
+		c-1.3-0.5-2.6-1-3.8-1.5c0.8-0.9,1.5-1.8,2.3-2.6c1.8-0.1,3.7-0.1,5.6-0.1v-4.8c-1.5-0.1-3-0.2-4.4-0.3
+		C1728.3,676.9,1727.6,678,1727.3,678.5z"/>
+	<path class="st0" d="M1711.6,680.6c-0.1,0.8-0.2,2.4-0.2,3.2c4.1,0.2,7.8-3.6,8.5-7.5C1716.7,676.9,1714.1,678.7,1711.6,680.6z"/>
+	<path class="st0" d="M1713.3,688c0.9-2.9-4.2-3.4-2.6-0.2C1711.6,688.9,1712.4,689,1713.3,688z"/>
+	<path class="st0" d="M1733,687.8v-1.6c-0.4,0.2-1.1,0.6-1.5,0.8C1731.9,687.2,1732.6,687.6,1733,687.8z"/>
+	<path class="st0" d="M1712.7,692.7c-0.1-1.2-0.1-2.5-0.1-3.7c-2.8-0.6-2,2-2.4,3.5C1710.8,692.6,1712,692.7,1712.7,692.7z"/>
+	<path class="st0" d="M1714.2,694.7c0.6,0,1.8-0.1,2.4-0.1c1.2-1.1,2.4-2.2,3.6-3.2c-2,0-3.9,0.3-5.7,1.2
+		C1714.4,693.1,1714.3,694.2,1714.2,694.7z"/>
+	<path class="st0" d="M1726.4,692.6c0,0.5-0.1,1.6-0.1,2.1c0.7,0,2,0.1,2.7,0.1c0.6-0.6,1.2-1.1,1.8-1.7c0.6,0.2,1.6,0.7,2.2,0.9
+		v-1.3C1731.1,690.8,1728.6,692,1726.4,692.6z"/>
+	<path class="st0" d="M1719.6,699.4c-1,0.1-2,0.1-3,0.2c-0.1,0.5-0.2,1.5-0.3,2c1.1,0,2.3,0,3.5,0.1
+		C1719.7,701.1,1719.6,700,1719.6,699.4z"/>
+	<path class="st0" d="M1724.6,700.4c-0.6,0-1.8,0-2.5,0c0.1,1.9,0.9,3.6,2.2,4.9C1724.4,703.6,1724.5,702,1724.6,700.4z"/>
+	<path class="st0" d="M1713.7,704.5c0-0.6,0.1-1.7,0.1-2.2c-1.2,0-2.4,0-3.5-0.1c0.1,0.6,0.2,1.7,0.2,2.2
+		C1711.5,704.5,1712.6,704.5,1713.7,704.5z"/>
+	<path class="st0" d="M1718.6,715.4c-0.9,0.6-1.9,1.2-2.8,1.8c2,0.2,4,0.4,6,0.6c0-0.6-0.1-1.8-0.1-2.4c-0.7,0-2,0-2.7,0
+		c0-1.7,1-3.3,2.4-4.1c2.4-0.8,3.4,1.8,4,3.5c-0.6,3.6-2.6,7.1-0.8,10.7c0.5,0.1,1.5,0.1,2,0.2c-0.1-2-0.2-4-0.2-5.9
+		c1.1-1.4,2.2-2.8,3.3-4.2c0.5-0.3,1.4-0.8,1.9-1.1c0-0.5,0.1-1.5,0.1-2c-2-0.4-4-0.9-6-1.2c-0.5-1-1-2-1.4-2.9
+		c-1.7,0.5-3.3,1.1-5,1.3C1718.9,711.5,1718.7,713.5,1718.6,715.4z"/>
+	<path class="st0" d="M8.4,710.3c-1.5-1.1-3.5-0.8-5.3-1.2c0,3,1.6,5.5,3.4,7.8c-0.9,1.3-1.7,2.8-0.9,4.4c1.8,0.4,3.8,0.6,5.5-0.1
+		C12.3,717.5,11.8,712.6,8.4,710.3z"/>
+	<path class="st0" d="M1.3,721.7c0.9,0,2.6,0,3.5,0c0-1.4-0.1-2.8-0.1-4.2c-0.8,0-2.5,0-3.3,0C1.3,718.8,1.3,720.2,1.3,721.7z"/>
+	<path class="st0" d="M1717.6,724.5c0.8-1.1,1.6-2.1,2.5-3.1c-1.9,0-3.8,0-5.7,0c0.1,0.9,0.2,2.6,0.2,3.4
+		C1715.4,724.8,1716.9,724.6,1717.6,724.5z"/>
+	<path class="st0" d="M1717.9,729.4c0.7,0.1,2.2,0.3,2.9,0.4c0-0.6-0.1-1.8-0.2-2.5c-0.5,0.1-1.4,0.3-1.9,0.4
+		c-1.2,1-2.6,1.9-4.2,2.1c0,1,0,2.1,0,3.2C1716.3,732.6,1717.2,731,1717.9,729.4z"/>
+	<path class="st0" d="M1728.3,729.4c0.8-1.2,0.6-2.1-0.5-2.7C1725.8,726.8,1726.4,730.8,1728.3,729.4z"/>
+	<path class="st0" d="M1733,729.2v-1.7c-0.6,0.2-1.9,0.6-2.5,0.8C1731.1,728.4,1732.4,728.9,1733,729.2z"/>
+	<path class="st0" d="M19.5,727c-4.1,1.8-7.8,4.8-12.6,4.5c-0.8-1-1.5-2-2.3-3c-0.6,0-1.9-0.2-2.6-0.2C4,733,4,738,3.4,742.9
+		c-0.3,0.9-1,2.7-1.3,3.5c1.7,0,3.5,0.1,5.2,0.1c0.3-0.5,1-1.6,1.3-2.1c1,0,2,0,3,0c0,1,0,2.1-0.1,3.2c-0.5-0.1-1.6-0.2-2.2-0.2
+		c0,0.6,0,1.8,0,2.5c1.6-0.2,3.3-0.3,4.8-1.1c1.1-0.2,2.2-0.3,3.3-0.4c0.1-1.6,0.2-3.2,0.1-4.8c0-0.4,0-0.8,0.1-1.2
+		c-0.1,0-0.1,0-0.2,0c-1.5-0.8-3.2-1.4-4.8-2c-0.1-1.7-0.2-3.3-0.3-5c2.4-0.8,4.9-1.3,7.3-1.9C19.6,731.3,19.6,729.2,19.5,727z"/>
+	<path class="st0" d="M28.5,745c-0.3-0.6-1-1.9-1.3-2.5c-0.8,0-1.6,0-2.4,0.1c-0.4,1.6-0.9,3.1-1.3,4.7c-0.4,0.3-1.2,0.9-1.6,1.2
+		c1.8,0,3.5,0,5.2,0C27.6,747.3,28,746.1,28.5,745z"/>
+	<path class="st0" d="M1733,752.5v-3.1c-1.7,0-3.4-0.1-5.1-0.1C1727.2,752.7,1731,752.2,1733,752.5z"/>
+	<path class="st0" d="M8.2,755.5c0-0.3,0-0.6,0-0.9c-0.4,0-0.9,0.1-1.4,0.1c-0.5-0.2-0.9-0.5-1.3-0.6c-1.4,3.3-1.6,7.4,0.1,10.7
+		c1.9,0.3,3.1-1,4-2.4c-1.2-2-1.2-4.4-1.1-6.7C8.4,755.6,8.3,755.5,8.2,755.5z"/>
+	<path class="st0" d="M1718,760.1c-2,0.1-4,0.3-6,0.5c0.4,2.2,0.9,4.4,1.5,6.6c1.8-1.7,3.7-3.4,5.5-5.1c0.9,0.8,1.8,1.6,2.7,2.4
+		c0.9,0,1.7,0.1,2.6,0.1c0.3-0.5,0.9-1.4,1.2-1.9c2.1-1.1,4-2.3,6-3.7c0,1.3,0,2.6,0.2,4c0.3,0.4,1,1.1,1.4,1.5v-5.8
+		c-1.3-0.5-2.6-1-3.8-1.4C1726,759.9,1722,761.2,1718,760.1z"/>
+	<path class="st0" d="M1730.6,765.8c-0.8,0.6-1.6,1.2-2.3,1.8c-0.4,0-1.2,0-1.6,0c-0.3-0.3-1-0.9-1.4-1.2c-1.3,1.4-2.8,2.6-4.3,3.8
+		c-0.7-1.5-1.4-2.9-2.1-4.4c-1.4,1.6-2.2,3.5-2.6,5.5c1.2,0,2.3,0.1,3.5,0.2c-0.5,2.6,0.4,5.8-1.4,8c-1.3,0-2.7,0-4,0
+		c0,1.7,0,3.4,0,5.1c0.6,0.3,1.7,0.9,2.3,1.1c-0.1,1.2-0.2,2.5-0.3,3.7c1.7,0.1,3.4,0.2,5.2,0.2c-0.1-0.8-0.1-2.4-0.2-3.2
+		c0.9,0,2.8,0,3.7,0c-0.8,1.8-1.9,3.4-3.2,4.8c2.5,0.3,5,1,7.3,1.9c-2.1,0.6-4.2,1.2-6.3,1.4c-1.9-2.1-4.6-2.2-7.2-2.2
+		c-0.7-1.3-1.3-2.5-2-3.8c-0.7,2.2-1.2,4.4-1.6,6.7c2.8,2.6,5.7,5.2,7.9,8.5c2-3.3,4.6-6.3,8.2-7.8c0.1,1.5,0.2,3,0.3,4.6
+		c-1.3,0.4-2.7,0.8-4,1.2c-0.5,2.6-1.8,5.5-0.3,8c0.9,1.9,3.3,1.8,5.1,2.4c-0.9-1-1.9-2-2.8-3c-0.1-1.2-0.3-2.5-0.4-3.7
+		c1.6,0,3.3,0.1,4.9,0.2c0.6-1,1.2-2,1.8-3V800c-1-1.5-2-2.9-3-4.4c0.8-0.1,2.3-0.3,3-0.4v-7.5c-0.7-0.5-2.1-1.5-2.8-2.1
+		c0.2-1.8,0.8-3.4,2.8-3.7v-2.8c-0.8-0.9-1.7-1.8-2.5-2.7C1730.6,772.8,1730.6,769.3,1730.6,765.8z M1729.6,775.5
+		c-0.1,2.8-0.1,5.8-1.6,8.3c-2-2.4-1.5-5.5-1.7-8.3C1727.4,775.4,1728.5,775.4,1729.6,775.5z M1730.6,787c-0.4,0.8-1.1,2.3-1.5,3.1
+		c-1.6-1.1-4.6-3.1-3.4-5.3c0.9-0.1,2.6-0.4,3.5-0.5C1729.6,784.9,1730.3,786.3,1730.6,787z"/>
+	<path class="st0" d="M6,807.5c-0.4-2.7-2.1-4.7-4.1-6.5c-0.7-1.6-1.3-3.2-1.9-4.9v9c0.4,0.6,1.2,1.9,1.6,2.6
+		C3.1,807.6,4.5,807.5,6,807.5z"/>
+	<path class="st0" d="M1725.1,812.6c-2.9-0.5-5.9-0.2-8.7,0.8c0,0.5,0,1.5,0,2.1C1719.6,815.6,1723.6,816.3,1725.1,812.6z"/>
+	<path class="st0" d="M1729.7,817.3c-2.9-0.9-4.3,1.2-4.5,3.7c0.9,0.5,2.6,1.6,3.4,2.1C1729.4,821.3,1729.5,819.3,1729.7,817.3z"/>
+	<path class="st0" d="M1717.6,825.5c0,1-0.1,2.9-0.1,3.8c-1,0.4-2.1,0.9-3.1,1.3c0,0.5,0.1,1.4,0.2,1.9c3.4,0.2,7.1,0.1,9.9-2.1
+		c0.2-1.4,0.2-2.9,0.2-4.3c-1.6,0.8-3.3,1.3-5,1.6c-0.2-1.1-0.3-2.1-0.4-3.1c1.3-0.5,2.7-0.9,4.1-1.5c-1.6-1.3-3.2-2.8-5.4-2.9
+		c-1.2,1.2-2.6,2.1-4.1,2.8C1715.1,823.9,1716.3,824.7,1717.6,825.5z"/>
+	<path class="st0" d="M4.3,822.8c-1.5-0.6-2.9-1.2-4.3-1.9v4.6c1.6,0,3.2-0.1,4.8-0.1C4.7,824.8,4.4,823.5,4.3,822.8z"/>
+	<path class="st0" d="M298.4,822.5c-1-0.1-2-0.1-3-0.2c0,1.3,0.1,2.7,0.1,4.1c1,0,2,0,3,0.1C298.5,825.2,298.5,823.9,298.4,822.5z"
+		/>
+	<path class="st0" d="M375.7,822.7c-0.4,0-1.2,0-1.6,0c-2.1,0.8-2.9,2.5-2.6,4.7c1,0,1.9,0,2.9,0.1
+		C374.5,825.7,373.7,823.5,375.7,822.7z"/>
+	<path class="st0" d="M1175.2,828.5c0.6,0,1.9,0.1,2.5,0.1c1.8-1.8,1.9-4.2,2-6.6C1176,821.7,1175.6,825.8,1175.2,828.5z"/>
+	<path class="st0" d="M1330.6,822.2c-0.8,0.1-2.5,0.2-3.4,0.2c0.1,1.5,0.1,2.9,0.2,4.4C1330.4,827.3,1330.4,824,1330.6,822.2z"/>
+	<path class="st0" d="M1558.2,824.7c0.1-0.7,0.4-2,0.6-2.6c-1.7,0.2-3.5,0.4-5.1,0.7C1555.2,823.5,1556.7,824.1,1558.2,824.7z"/>
+	<path class="st0" d="M1706.5,822.7c0,1.2,0,2.4,0,3.6c-0.7,0.5-1.9,1.4-2.6,1.9c1.8,1.2,3.6,2.2,5.5,3.2c0-2.9,0.5-5.8,1-8.6
+		C1710.8,820,1707.6,822.2,1706.5,822.7z"/>
+	<path class="st0" d="M204.3,829.9c0-0.1,0.1-0.2,0.1-0.3c-0.4-0.4-1.1-1.1-1.5-1.5c-0.1-0.1-0.3-0.3-0.4-0.5c0-1.4,0-2.8,0-4.2
+		c-1.4-0.4-2.8-0.9-4.1-1.3c-0.2,3.5,0,7,1.2,10.2c1.2,0,2.3,0.1,3.5,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0.5,0,1.1,0,1.6,0.1
+		C204.8,831.6,204.6,830.7,204.3,829.9z"/>
+	<path class="st0" d="M1700.9,829.9c0.5,1.2,1.4,1.9,2.8,2c-0.2-1.5,0.2-3.4-1.2-4.5c-1.5-1.2-0.9-3.2-1.1-4.8c-1,0-3-0.2-4-0.2
+		c0,2-0.1,3.9-0.8,5.8c-2.5,0.1-2.2,2.4-2.1,4.1c1.5,0.1,3,0.3,4.6,0.5c-1-1-2.1-2-3-3C1697.2,828,1699.9,828,1700.9,829.9z"/>
+	<path class="st0" d="M1729,822.7c-0.4,1.5-0.4,3.1-0.5,4.7c1.5-0.1,3-0.2,4.5-0.3v-3.3C1732.3,822.2,1730.3,822,1729,822.7z"/>
+	<path class="st0" d="M1315.5,824.6c-0.5-0.1-1.6-0.2-2.1-0.3c0,1.4,0.1,2.8,0.1,4.3c-3.8-0.7-7.5,0.2-10.5,2.7
+		c2.2-0.4,4.3-0.7,6.5-1c0,1.5,0.1,3.1,0.2,4.6c0.8,1.2,2.6,2.5,1.1,4c-3.4,1.7-6-2.9-7.8-5.3c-0.9-0.1-1.7-0.3-2.5-0.4
+		c-0.3,0.6-1,1.9-1.4,2.5c-1.6-1.5-3.3-2.8-5.1-4c0.7,1.8,1.5,3.6,2.1,5.4c0.2,2.4-1.1,4.7-0.5,7.1c0.7,2.3,3,3.5,4.5,5.1
+		c-1.6,0.6-3.2,1.1-4.9,1.6h3c2-1.1,4-2.3,5.9-3.5c-1,0-2.9,0-3.9,0c0.1-3.5,0.2-7,0-10.5c2.2,0.4,4.3,0.8,6.5,1.3
+		c-0.5,2.1-0.9,4.3-1,6.5c-0.1,0.5-0.2,1-0.3,1.5c0.1,0,0.2,0.1,0.3,0.1c0,1.5,0.2,3.1,0.6,4.6h4.1h1.2h0.7c-1.1-3.1-2.3-6.3-2-9.7
+		c3.5-1.7,4.5-5.9,5.3-9.4c4.2,0.4,3.8,5,3.8,8.1c-1.7,0.8-3.4,1.7-5.1,2.6c1.8-0.5,3.5-1,5.2-1.4c-0.4,1.9-0.7,3.9-1.1,5.8
+		c0.2,0.3,0.3,0.7,0.5,1c0,0.1,0,0.2,0,0.3c0,0,0.1,0,0.1-0.1c0.5,0.9,0.9,1.8,1.4,2.8h4.3c-0.5-0.1-1.4-0.4-1.9-0.6
+		c0.6-4,1.5-7.9,1.5-11.9c-0.6-0.3-1.8-0.8-2.4-1.1c0-0.9,0.1-1.8,0.1-2.8c0.6-0.3,1.2-0.6,1.8-0.8c0.1,0,0.2,0,0.3,0.1
+		c0-0.1,0-0.1,0.1-0.2c0.6-0.3,1.2-0.6,1.8-0.8c0-1.4,0.1-2.8,0.1-4.1c-3.7-0.1-7.4-0.5-11.1-1.2
+		C1315.4,826.8,1315.4,825.4,1315.5,824.6z"/>
+	<path class="st0" d="M1565.8,826.3c1.3,0.2,2.6,0.3,4,0.5c-0.2-1.3-0.3-2.6-0.4-3.8C1568,824,1566.8,825.1,1565.8,826.3z"/>
+	<path class="st0" d="M120.3,833.7c-1.6-0.3-3.1-0.7-4.6-1.2c-0.7-2.4-1.5-4.7-2.3-7.1c-1.7,0-3.4,0-5,0c-0.4,1.1-0.9,2.1-1.3,3.2
+		c0.8,0,2.3-0.1,3.1-0.1c3.4,4,6.9,8.1,8.4,13.2c0.5,0,1.6-0.1,2.1-0.2c0-0.8-0.2-2.3-0.2-3.1c0.8-0.8,1.7-1.7,2.5-2.5
+		C122.1,835.2,121.2,834.4,120.3,833.7z"/>
+	<path class="st0" d="M224,825.7c-0.2,3-3,3-5.4,2.8c-0.4,1.7-0.9,3.3-1.4,5c1.6,0,3.2-0.1,4.8-0.1c0.4-1.7,0.8-3.4,1.3-5
+		c1.4,0,2.8,0.1,4.2,0.1c0-1-0.1-2-0.1-3.1C226.3,825.5,225.2,825.6,224,825.7z"/>
+	<path class="st0" d="M32.6,833.2c-0.6,0.8-1.3,1.6-1.9,2.5c0.4,1.3,0.8,2.6,1.1,4c-2.7,0.8-3.7-2.4-5.3-3.8
+		c-2.1-0.3-4.1-0.5-6.2-0.8c0.1-3,0.2-6,0.3-9c-0.8,0.6-1.5,1.2-2.3,1.8c-2.1-0.5-4.2-1-6.4-1.5c-0.6,1.1-1.1,2.1-1.6,3.2
+		c-1.8,0-3.7,0-5.5,0c-0.8,1.8-1.6,3.7-2.5,5.6c2.7,1,6.2,2,5.7,5.8c-3.4,0.2-6.2-1.3-7.9-4.2V851h19.3c-2.3-0.9-4.6-1.9-6.9-2.8
+		c0-0.9,0-1.9,0-2.8c3.2,0.1,6.5-0.2,9.6,0.4c0.4,1.2,0.6,2.5,0.9,3.7c-0.5,0.3-1.6,1-2.1,1.4h12c1.7-1.2,3.4-2.4,5-3.7
+		c-2.2-2.3-4-4.8-5.1-7.8c2-0.5,4-1,6.1-1.4C39,834.5,35.4,833.5,32.6,833.2z M8.6,848.6c-2.5-0.1-4.9-0.1-7.4-0.1
+		c0.1-2,0.6-4,2.4-5.1c1.7,0,3.3-0.1,5-0.1C8.6,845.1,8.6,846.9,8.6,848.6z"/>
+	<path class="st0" d="M142.8,826.5c-0.4,0.7-1.3,2.2-1.8,3c1.2,0.6,2.5,1,3.9,1.1c2.4,0.5,2.8-2.5,2.8-4.1
+		C146.1,826.4,144.5,826.4,142.8,826.5z"/>
+	<path class="st0" d="M180.3,832.4c0.6,0.1,1.6,0.2,2.2,0.3c0.5-2.1,0.9-4.2,1.2-6.4c-0.5,0-1.5,0.1-2,0.2
+		C181,828.4,180.5,830.4,180.3,832.4z"/>
+	<path class="st0" d="M187.7,825.6c-0.2,1.3-0.3,2.7-0.5,4.1c1.2-0.1,2.4-0.1,3.6-0.2C190.7,827.9,190.3,824,187.7,825.6z"/>
+	<path class="st0" d="M361.7,829.2c1.3,0.1,2.5,0.2,3.8,0.3c0-1,0-2.1,0-3.1c-1.4,0-2.8,0-4.2,0
+		C361.5,827.4,361.6,828.3,361.7,829.2z"/>
+	<path class="st0" d="M1222.6,831c0.4-2,0.9-3.9,1.2-5.9c-2.6,0.1-4.2,2.3-6,3.9C1218.7,830.8,1220.9,830.6,1222.6,831z"/>
+	<path class="st0" d="M1300.3,825c-1.9,0.7-3.6,1.9-5.2,3.1c0.8,0.8,1.7,1.7,2.5,2.5c1,0,2,0.1,3,0.1
+		C1300.5,828.8,1300.4,826.9,1300.3,825z"/>
+	<path class="st0" d="M1376.5,828.9c0.3,0.8,1,2.3,1.3,3c-2,1.6-1,4.3-1.3,6.4c-1.2,1.2-2,2.7-2.3,4.4c0.5-0.1,1.4-0.2,1.9-0.3
+		c0.5-1.3,1.1-2.6,1.9-3.7c0.3-4.7,4.3-9.3,1.2-13.8C1377.8,825.9,1376.2,826.9,1376.5,828.9z"/>
+	<path class="st0" d="M1530.4,829.7c0.5-0.1,1.4-0.2,1.9-0.3c0.1-1,0.1-2,0.2-3c-1.1,0-2.2,0-3.3,0.1
+		C1529.6,827.3,1530.1,828.9,1530.4,829.7z"/>
+	<path class="st0" d="M1542.9,824.6c-2.4,2.2-1.3,4.7,1.7,5.4C1544.7,828,1544.6,826,1542.9,824.6z"/>
+	<path class="st0" d="M1660.2,826.5c-1.7,0.9,0.1,3,1.4,1.9C1663.3,827.6,1661.4,825.4,1660.2,826.5z"/>
+	<path class="st0" d="M101.5,830.6c0-1.4,0-2.9,0.1-4.3c-1.5,0.4-3,0.8-4.4,1.3C97.3,830,99.2,830.9,101.5,830.6z"/>
+	<path class="st0" d="M349.6,825.9c-1.5,1.8-0.8,4,0.1,5.9c1.4-0.5,2.8-1.1,4.2-1.6C353.6,827.8,351.5,826.8,349.6,825.9z"/>
+	<path class="st0" d="M1240.6,826.6c0,1,0,1.9,0,2.9c1.3,0.1,2.6,0.1,4,0.2c0-1-0.1-2.1-0.1-3.1
+		C1243.5,826.5,1241.5,826.6,1240.6,826.6z"/>
+	<path class="st0" d="M299,828c0.7,1,1.5,2,2.4,2.9c0.1,1.2,0.1,2.3,0.2,3.5c1.2-0.1,2.5-0.1,3.7-0.1c0-1.3,0.1-2.5,0.2-3.7
+		c-1.1-0.1-2.3-0.2-3.4-0.2C301.1,829.5,300.2,828.7,299,828z"/>
+	<path class="st0" d="M1180.6,829c2,1.3,4.2,2.1,6.5,2.8c0.3,0.4,0.9,1.3,1.2,1.7c0.5,0,1.4,0,1.8,0c0.5-1.3,1-2.6,1.6-4
+		c-1.6,0-3.2,0-4.8,0C1185.1,827.7,1182.5,826.7,1180.6,829z"/>
+	<path class="st0" d="M1277.5,835.7c0.3,0,0.6,0.1,1,0.1c0.1-0.1,0.1-0.3,0.2-0.4c0.7-0.3,1.1-0.8,1.1-2c1-0.1,1.9-0.1,2.9-0.1
+		c1.1,1.4,2.2,2.8,3.2,4.2c0.7,0,2.1,0.1,2.8,0.2c-0.1-1-0.1-1.9-0.2-2.9c-1-1.3-1.8-2.8-2.3-4.3c-1.9,0.1-3.7,0.1-5.6,0.2
+		c0,0,0,0,0,0c0-0.9-0.1-2.6-0.1-3.5c-2.6,0.2-4.1,2.1-5.3,4.2c-0.1,0.1-0.3,0.2-0.4,0.4l-0.3,0.3c0,0.1,0.1,0.3,0.2,0.4
+		c-0.1,0.2-0.2,0.4-0.3,0.6c0.4,0.7,1.1,2.1,1.5,2.8C1276.3,835.7,1276.9,835.7,1277.5,835.7z"/>
+	<path class="st0" d="M1554.7,831.3c0.9,0.1,1.9,0.3,2.8,0.4c0-1.2,0.1-2.3,0.2-3.4c-1.1,0.1-2.2,0.1-3.3,0.2
+		C1554.5,829.4,1554.6,830.4,1554.7,831.3z"/>
+	<path class="st0" d="M1270.5,829.5c-1.2,0-2.3-0.1-3.4-0.1c0.9,2.3,1.8,4.5,2.8,6.8c1.1,0.5,2.1,1,3.2,1.5c0.4-0.8,1.4-2.3,1.8-3.1
+		c-1.4-0.8-2.8-1.6-4.3-2.4C1270.6,831.5,1270.5,830.2,1270.5,829.5z"/>
+	<path class="st0" d="M1385.5,831.1c-0.1,0.8-0.2,1.7-0.2,2.5c0.5-0.1,1.4-0.4,1.9-0.5c0.5-1.3,1.1-2.6,1.8-3.9
+		C1388.1,830.4,1386.8,830.8,1385.5,831.1z"/>
+	<path class="st0" d="M1602.8,831c-0.4-0.4-1.1-1.2-1.5-1.6c-0.6,0-1.7-0.1-2.2-0.1c0.5,1.8,1,3.5,1.5,5.3c0.8-0.1,2.3-0.2,3.1-0.3
+		c-0.1,0.7-0.2,2.2-0.3,2.9c1,1.1,2.1,2.2,3.1,3.3c0.5,0,1.5,0.1,2,0.2c0.3-1.2,0.6-2.4,0.8-3.6
+		C1607.3,834.9,1605.4,832.5,1602.8,831z"/>
+	<path class="st0" d="M1638.6,829.5c-1.4-0.1-2.7-0.1-4.1-0.2c-0.3,0.8-1,2.3-1.3,3.1c1.6,1.3,3.7,1,5.5,0.4
+		C1638.6,831.7,1638.6,830.5,1638.6,829.5z"/>
+	<path class="st0" d="M376.5,837.5c1,0,2.1,0.1,3.1,0.2c0.5-2.4,0.8-4.8,0.9-7.2c-1.4-0.1-2.8-0.1-4.2-0.1
+		C376.5,832.8,376.5,835.1,376.5,837.5z"/>
+	<path class="st0" d="M1360.2,828.8c-1.3,3.2-2.5,6.4-3.1,9.8c0.6,0,1.8,0.1,2.4,0.1C1360.1,835.5,1361.2,832.1,1360.2,828.8z"/>
+	<path class="st0" d="M1593.2,830.6c-1.3,0.8-0.3,3.6,1.2,2.5C1595.4,832.2,1594.6,829.5,1593.2,830.6z"/>
+	<path class="st0" d="M1201.2,830.8c-1.1,0.6-1.3,1.5-0.7,2.6C1203,835.2,1204.6,830.1,1201.2,830.8z"/>
+	<path class="st0" d="M1211.2,834.8c-2-3.4-4.4,0.5-4.1,2.8c1.1,0,2.2,0,3.2,0c1.1-1.4,2.4-2.6,4-3.5c0.4-0.7,1.1-2,1.5-2.7
+		C1213.2,830.6,1212.3,833.1,1211.2,834.8z"/>
+	<path class="st0" d="M1728.5,831.5c0,1.4,0,2.8,0.1,4.3c-0.9-0.1-2.6-0.3-3.5-0.4c-1.2-0.3-2.4-0.5-3.6-0.8c0.8,0.3,2.3,0.9,3,1.2
+		c0,2.9,0.4,6-1.4,8.6c-1.2-2.4-2.1-4.8-2.9-7.3c-2.7,0.5-5.4,1-8,1.4c0.1,0.4,0.2,1.3,0.3,1.8c2.2,0,4.5,0,6.8,0.1
+		c0.8,1.7,1.7,3.5,2.6,5.2c2.1-0.5,4.1-1,6.2-1.5c0.6,1.6,1.3,3.2,1.9,4.8c1-1.7,2-3.4,3-5.2c-1.5-0.5-3-1-4.4-1.5
+		c-0.1-1.3-0.1-2.6-0.1-3.9c1.5,0.1,3,0.2,4.5,0.3v-2.2c-0.6-1.7-1.2-3.4-1.8-5.1C1730.3,831.4,1729.4,831.4,1728.5,831.5z"/>
+	<path class="st0" d="M55.5,846.6c0-2.5-0.3-5.1,0.3-7.6c0.9-1.8,2.4-3.2,3.7-4.8c0.1-0.5,0.3-1.4,0.3-1.9c-1.4,0-2.8,0-4.2,0
+		c-0.7,0.7-1.3,1.5-2,2.2c-0.4,2.5-0.9,5.1-1.3,7.6c-0.7,1.2-1.3,2.4-1.9,3.7c0.6,1.8,1.6,3.4,2.6,5.1h5.2c2.2-0.9,3.8-2.6,5.2-4.4
+		C60.7,846.5,58.1,846.5,55.5,846.6z"/>
+	<path class="st0" d="M135.5,835.2c1.3,1.5,3.3,2.1,5.1,2.9c0-2.3-0.1-4.5-0.1-6.8C138.2,831.1,134.8,832.3,135.5,835.2z"/>
+	<path class="st0" d="M1523.5,835.5c0.6,0.1,1.6,0.1,2.2,0.2c0-0.6,0-1.9,0-2.5c-0.5,0.1-1.6,0.3-2.1,0.4
+		C1523.6,834.1,1523.5,835.1,1523.5,835.5z"/>
+	<path class="st0" d="M1682.6,837.5c-0.1-1.4-0.1-2.8-0.1-4.2c-3.7,1.2-7.5,1.7-10.9,3.6C1674.6,840.3,1678.9,837,1682.6,837.5z"/>
+	<path class="st0" d="M1705.4,837.4c1.1,0.5,2.2,1,3.3,1.6c0.5-1.8,0.8-3.8,1.1-5.7c-1.5,0-2.9,0.1-4.3,0.1
+		C1705.4,834.4,1705.4,836.4,1705.4,837.4z"/>
+	<path class="st0" d="M1014.6,836.4c1.6,0.5,3.2,1,4.9,1.4c0.1-1.1,0.1-2.3,0.2-3.4c-1.8,0-3.5,0.1-5.3,0.1
+		C1014.5,835,1014.5,836,1014.6,836.4z"/>
+	<path class="st0" d="M1547.8,837.6c-1,0-3.1,0-4.1,0c-0.3-1.2-0.6-2.3-0.8-3.5c-0.5,1-1,1.9-1.5,2.9c2,0.3,3.5,1.3,3.5,3.6
+		c1.2-0.1,2.4-0.2,3.7-0.3c-0.2-1.8-0.3-3.6-0.6-5.4C1547.8,835.6,1547.8,837,1547.8,837.6z"/>
+	<path class="st0" d="M1567.4,834.1c0,0.5-0.1,1.4-0.1,1.8C1570.2,838.5,1570.3,831,1567.4,834.1z"/>
+	<path class="st0" d="M170,835.3c0.4,2.4,1,4.9,1.6,7.3c1.4,0,2.8,0,4.1,0c-0.1-2.5-0.4-5-1.2-7.3
+		C173.1,835.3,171.6,835.3,170,835.3z"/>
+	<path class="st0" d="M196.6,834.4c-0.1,1.8-0.1,3.6-0.2,5.4c1.8-0.3,4.2,0.6,5.2-1.4C201.9,835.6,199,833.8,196.6,834.4z"/>
+	<path class="st0" d="M1134.6,840.3c1.2,0,2.4,0.1,3.7,0.1c0.1-1.7,0.1-3.4,0.2-5.1c-1.3,0.1-2.6,0.3-3.9,0.4
+		C1134.6,837.3,1134.6,838.8,1134.6,840.3z"/>
+	<path class="st0" d="M1238.5,840.8c-0.3,0-0.9,0-1.2-0.1c0.1-1.9,0.3-3.9,0.3-5.8c-2.9,0.3-3,3.3-3.1,5.5c-0.6,0.2-1.9,0.7-2.5,0.9
+		c-0.6,0.1-1.9,0.2-2.5,0.2c-1.5,1.3-3.1,2.4-4.9,3.3c-0.1,0.9-0.2,1.8-0.2,2.7c1.4-0.1,2.8-0.1,4.1-0.1c0-0.8-0.1-2.3-0.2-3.1
+		c1.3,0,2.6,0,3.9,0c1.6-1.3,3.9-1.6,4.9,0.7c-0.5,0.4-1.6,1.3-2.1,1.8c0.5-0.1,1.6-0.3,2.1-0.5c0.2-2.2,1-4.3,2.3-6.1
+		c0.8,0.1,2.3,0.4,3.1,0.5c0.6-2.1,1.1-4.2,1.2-6.4c-1,0-3.1,0.1-4.1,0.2C1239.3,836.7,1238.9,838.8,1238.5,840.8z"/>
+	<path class="st0" d="M1352.5,837.1c-0.1-0.6-0.3-1.7-0.4-2.3c-0.3,0.9-0.6,1.8-0.8,2.7c-0.8,0.1-2.3,0.1-3,0.2
+		c0,0.2-0.1,0.6-0.1,0.7c0.7,0,2.1,0,2.8,0c0.8,1.3,2.4,1.2,3.8,1.5C1354.4,838.6,1354,837.3,1352.5,837.1z"/>
+	<path class="st0" d="M1498.2,835.3c0.1,1.1,0.1,2.2,0.2,3.3c0.5-0.1,1.4-0.3,1.8-0.4c0.1-0.9,0.2-1.9,0.4-2.8
+		C1500.1,835.4,1498.8,835.3,1498.2,835.3z"/>
+	<path class="st0" d="M1396.3,836.3c0,0.5,0.1,1.6,0.2,2.2c1,0,2,0,3,0.1c0-0.5,0-1.6,0-2.2C1398.4,836.3,1397.3,836.3,1396.3,836.3
+		z"/>
+	<path class="st0" d="M1491.1,835.8c-1.1,0.6-1.3,1.5-0.6,2.6C1493.2,840.4,1494.3,835.3,1491.1,835.8z"/>
+	<path class="st0" d="M1563.1,838.4c0.6-0.3,1.7-1,2.2-1.3C1564.9,834.1,1560.1,837.2,1563.1,838.4z"/>
+	<path class="st0" d="M1576.4,834.9c-1.6,1.2-3.2,2.4-4.7,3.7c0,0.8-0.1,2.3-0.2,3c-0.5,0-1.5-0.1-2-0.1c0,0.5,0,1.6,0,2.2
+		c1-1.8,2.9-2.4,4.9-2.5c0-0.7,0-2,0-2.7c0.6,0,1.7,0,2.3,0C1576.6,837.3,1576.5,836.1,1576.4,834.9z"/>
+	<path class="st0" d="M1636.6,835.5c-0.1,0.8-0.2,1.7-0.3,2.6c1.2,0.8,2.5,1.7,3.7,2.5c1.2-0.4,2.4-0.8,3.6-1.2
+		c0-1.1,0.1-2.1,0.1-3.1C1641.3,836.6,1638.9,836.3,1636.6,835.5z"/>
+	<path class="st0" d="M1700.5,839.3c0.1-1.2,0.1-2.3,0.2-3.4c-0.8,0.6-1.7,1.2-2.4,1.8c-1.7-0.1-3.3-0.2-4.9-0.3
+		c0,0.5,0,1.6-0.1,2.2C1695.7,840.5,1698.3,841.1,1700.5,839.3z"/>
+	<path class="st0" d="M265.7,844.6c-0.8,0.7-1.6,1.4-2.4,2.1c-2.2,0-4.4,0-6.6,0c-0.1,1.2-0.2,2.4-0.2,3.7c-0.4,0.2-1.1,0.5-1.5,0.7
+		h3.3c2.4-1.6,5.2-1.8,7.9-1.8c0.1-3.8,0.4-7.6,1.2-11.4c-0.5-0.1-1.5-0.4-2-0.6C265.6,839.7,265.6,842.1,265.7,844.6z"/>
+	<path class="st0" d="M1484.3,837.8c0,1.8,0.1,3.7,0.1,5.6c2.2,0,4.3,0.1,6.5,0.2c-0.2-0.4-0.6-1.2-0.8-1.6
+		C1488.2,840.7,1486.2,839.3,1484.3,837.8z"/>
+	<path class="st0" d="M123.5,841.5c-0.1,0.5-0.2,1.4-0.2,1.9c1.4,0.4,2.8,0.9,4.2,1.3c0-1.8,0-3.6,0-5.4c-0.5,0-1.5,0.1-2.1,0.1
+		C124.8,840.2,124.2,840.8,123.5,841.5z"/>
+	<path class="st0" d="M1156.7,839.6c1.8,2,4.3,2.1,6.8,2.1c0-0.5,0-1.6,0-2.2C1161.3,839.5,1159,839.5,1156.7,839.6z"/>
+	<path class="st0" d="M1181.4,841.7c1.9,0.8,4,0.9,6.1,1c0-1.1,0.1-2.2,0.2-3.2c-2,0.1-4,0.1-5.9,0.2
+		C1181.6,840.1,1181.4,841.2,1181.4,841.7z"/>
+	<path class="st0" d="M1203.5,843.9c1-0.4,2.1-0.8,3.2-1.2c0-1.1,0-2.2,0-3.3c-1.1,0-2.2,0-3.2,0
+		C1203.4,840.9,1203.4,842.4,1203.5,843.9z"/>
+	<path class="st0" d="M1289.6,839c-1.3,0.5-3.5,0.2-3.5,2.3c1.2,0.1,2.3,0.3,3.6,0.4C1289.7,841.1,1289.6,839.7,1289.6,839z"/>
+	<path class="st0" d="M1366.2,841.4c1.2,0,2.4,0,3.7,0c-0.4-0.8-1.3-2.3-1.7-3C1365.9,837.6,1366.7,840.3,1366.2,841.4z"/>
+	<path class="st0" d="M1595.6,839.6c-0.1,1-0.3,2.1-0.4,3.2c1.8-0.2,3.6-0.3,5.4-0.4c-0.4-1-0.8-2-1.2-2.9
+		C1598.1,839.5,1596.8,839.5,1595.6,839.6z"/>
+	<path class="st0" d="M1611,839.1c0.8,1.2,1.6,2.4,2.4,3.6c0.7,0,2,0,2.7,0C1615.9,839.8,1613.4,839.2,1611,839.1z"/>
+	<path class="st0" d="M138.6,839.5c-3.3-1.2-4.2,2-5,4.4c0.5,0.8,0.9,1.6,1.4,2.4c0.8,0,1.5,0.1,2.3,0.1
+		C137.8,844.1,138.3,841.8,138.6,839.5z"/>
+	<path class="st0" d="M1173.7,842c0,0.5-0.1,1.4-0.1,1.9c0.8,0.5,1.5,1,2.3,1.5c1.8-1.5,1.8-3.5,0.3-5.3
+		C1175.4,840.7,1174.5,841.3,1173.7,842z"/>
+	<path class="st0" d="M1361.2,840.5c-1.9,1,0.2,3.2,1.6,2.1C1364.7,841.6,1362.6,839.3,1361.2,840.5z"/>
+	<path class="st0" d="M1717.9,843.7c-4.4-0.4-10.5,1.7-13.1-3c-0.2,0-0.6,0-0.8,0c-0.9,1.1-1.8,2.2-2.6,3.2c0.5,1.6,1,3.1,1.6,4.7
+		c-0.8-0.1-2.5-0.2-3.4-0.2c-0.4,0.6-1.1,1.9-1.5,2.6h16.3c-0.8-0.1-2.5-0.4-3.3-0.5C1710.8,846.4,1714.9,845,1717.9,843.7z
+		 M1703.4,847.5c0-1.8,0-3.7,0-5.5c2.6,0.7,5.4,2.5,5.5,5.5C1707,847.5,1705.2,847.5,1703.4,847.5z"/>
+	<path class="st0" d="M1247.4,843.6c1.4,0.8,2.7,1.7,4.1,2.5c0-1.6,0.1-3.1,0.1-4.6c-1.5-0.1-2.9-0.2-4.3-0.2
+		C1247.3,841.8,1247.4,843,1247.4,843.6z"/>
+	<path class="st0" d="M1346.8,847.1c2-1.3,3.2-3.2,3-5.7c-1.1-0.1-2.2-0.1-3.3-0.2C1346.1,843.3,1345.2,845.4,1346.8,847.1z"/>
+	<path class="st0" d="M1500.5,841.4c0,1,0,2,0,3c1.9,0.7,3.9,1,5.9,1.2c0.1-0.5,0.1-1.5,0.2-2.1c-1.7,0-3.2-0.7-4.3-1.9
+		C1501.9,841.7,1501,841.5,1500.5,841.4z"/>
+	<path class="st0" d="M1676.7,840.6c0.8,1.9,2.2,3.4,3.8,4.8c0.6,0,1.7,0,2.2,0c-0.9-1.6-1.7-3.3-2.5-4.9
+		C1679.3,840.5,1677.6,840.6,1676.7,840.6z"/>
+	<path class="st0" d="M107.2,841.8c-1.6-0.4-3.2-0.6-4.8-0.6c0,1.1,0,3.2,0,4.3c1.5,1.4,3.2,2.4,5.3,2.4
+		C107.5,845.9,107.9,843.8,107.2,841.8z"/>
+	<path class="st0" d="M159.9,843.2c-0.8,0.6-1.7,1.3-2.5,1.9c0-0.7,0.1-2.1,0.2-2.8c-1.7,0-3.4,0.1-5.1,0.1c0,1.3,0,2.6,0,4
+		c1.4,0,2.8-0.1,4.2-0.1c-0.1,0.6-0.2,1.8-0.2,2.4c2.5-0.4,4.9-0.9,7.4-1.4C164.3,844.6,162,843.9,159.9,843.2z"/>
+	<path class="st0" d="M1659.2,846.8c3.2-0.3,6.2-1.4,9-2.7c-2.3-1.8-5.3-1.4-7.7-2.9C1660.1,843,1659.6,844.9,1659.2,846.8z"/>
+	<path class="st0" d="M1675.3,840.5c-1.5,1.3-2,3-1.9,4.9c1.2,1.3,2.3,2.8,3.2,4.3c0.5,0,1.5,0,2,0c0.1-0.6,0.2-1.7,0.2-2.3
+		c-0.8,0-2.4,0-3.2,0.1C1675.6,845.1,1675.5,842.8,1675.3,840.5z"/>
+	<path class="st0" d="M205.8,845c-0.4,1.3-0.5,2.6-0.6,4c3.9,0.4,6-3.6,5.4-7C209,842.9,207.3,843.8,205.8,845z"/>
+	<path class="st0" d="M295.3,847.5c0.8,0.7,1.5,1.5,2.3,2.3c1.3-1.9,2-4.1,1.9-6.3c-1.2,0.1-2.4,0.3-3.6,0.6
+		C295.5,845.1,295.5,846.3,295.3,847.5z"/>
+	<path class="st0" d="M1353.5,846.5c1.3,0,2.6-0.1,3.9-0.1c0.1-1.1,0.2-2.1,0.3-3.2c-1.4,0.1-2.8,0.1-4.2,0.2
+		C1353.5,844.5,1353.5,845.5,1353.5,846.5z"/>
+	<path class="st0" d="M1405.1,843c-0.4,1.5,0.2,2.1,1.9,1.5C1407.4,842.9,1406.8,842.4,1405.1,843z"/>
+	<path class="st0" d="M404.5,843.3c0,1.4,0,2.9,0,4.3c2.2-0.1,5.3,0.1,5.5-3C408.2,844.2,406.3,843.7,404.5,843.3z"/>
+	<path class="st0" d="M194,848.6c1.6,0,3.2,0,4.8,0c0.1-2-0.5-3.6-1.8-4.9C195.8,845.2,194.7,846.8,194,848.6z"/>
+	<path class="st0" d="M1199,846.7c0.4,3.1,5.2,4.2,6.6,1.5c-0.2-0.8-0.6-2.4-0.8-3.2C1202.8,845.3,1200.8,845.8,1199,846.7z"/>
+	<path class="st0" d="M1289.1,848.1c0.1,1,0.4,2,0.8,2.9h0.7c1-1.5,2.3-2.9,4.1-3.6c-0.1-0.4-0.3-1.2-0.5-1.6
+		C1292.2,844.9,1290.3,846.7,1289.1,848.1z"/>
+	<path class="st0" d="M111.8,851h5.1c-0.9-1.9-1.8-3.7-2.9-5.5C113.3,847.3,112.6,849.2,111.8,851z"/>
+	<path class="st0" d="M1337.6,845.6c-0.4,0-0.7,0-1.1,0.2c-1.1,0.5-2.2,1-3.3,1.5c-1.2,0.4-2.4,0.9-3.6,1.3c-0.1,0-0.3,0.1-0.4,0.1
+		c0,0,0,0,0,0c0,0,0,0,0,0c0.2,0.7,0.3,1.5,0.5,2.2h0h4.5h0c0.6-1.3,1.1-2.6,1.7-3.9c0.5,0.2,0.9,0.5,1.4,0.7c0.9,0.5,1.7,1.2,2.2,2
+		c0.2,0.3,0.3,0.7,0.4,1.1h0.2h3.4h0.1c-1.7-1.8-3.2-3.8-4.6-5.9C1338.5,845.3,1338,845.5,1337.6,845.6z"/>
+	<path class="st0" d="M1654.8,849.8c-0.8,0.3-2.5,0.9-3.3,1.2c0-1.9-0.1-3.8-0.1-5.7c-1.4,0.3-2.8,0.7-4.1,1.1
+		c0.3,1.5,0.7,3.1,1.1,4.7h7.2c3.2-1.2,2-4.7,0.4-6.7C1655.6,846.1,1655.4,848,1654.8,849.8z"/>
+	<path class="st0" d="M1694.2,849.8c1.1-0.1,2.2-0.2,3.3-0.3c0-1.2,0.1-2.3,0.2-3.4c-1.1,0.5-2.2,1.1-3.3,1.6
+		C1694.3,848.2,1694.2,849.3,1694.2,849.8z"/>
+	<path class="st0" d="M168,846.5c-2.7-0.7-2.5,2.8-2.6,4.5h7.7C171.9,849,170.8,846,168,846.5z"/>
+	<path class="st0" d="M287.5,850.5c-0.3,0.1-1.1,0.4-1.4,0.5h5.5c0-1.2,0-2.5,0-3.7c-0.9,0.1-1.7,0.2-2.6,0.3
+		C288.5,848.6,288,849.5,287.5,850.5z"/>
+	<path class="st0" d="M1422.2,847.4c-1.9,0.9,0.1,3.3,1.6,2.1C1425.7,848.6,1423.7,846.2,1422.2,847.4z"/>
+	<path class="st0" d="M1447.2,851h2c0.2-1.2,0.5-2.5,0.7-3.7c-0.6,0-1.7,0.1-2.3,0.1C1447.4,848.6,1447.3,849.8,1447.2,851z"/>
+	<path class="st0" d="M1617.6,851h2.7c0.1-1.3,0.2-2.5,0.4-3.7c-1.1,0.1-2.2,0.2-3.3,0.4C1617.4,848.8,1617.5,849.9,1617.6,851z"/>
+	<path class="st0" d="M1666.2,851h7.4c-2.1-1.6-4.1-3.4-6.1-5.2C1667.1,847.5,1666.6,849.3,1666.2,851z"/>
+	<path class="st0" d="M147.7,851h5c-1-1.3-2-2.7-3-4.1C149.1,848.3,148.4,849.6,147.7,851z"/>
+	<path class="st0" d="M374.9,848.5c-0.2,0.6-0.7,1.8-0.9,2.5h3.5c0-0.6-0.1-1.7-0.2-2.3C376.5,848.6,375.7,848.6,374.9,848.5z"/>
+	<path class="st0" d="M410.8,848.3c-0.2,0.7-0.6,2-0.8,2.7h4.7c-0.4-0.6-1.2-1.8-1.6-2.5C412.3,848.5,411.5,848.4,410.8,848.3z"/>
+	<path class="st0" d="M1371.4,851h3.8c0.1-0.7,0.2-2,0.3-2.7c-1.3-0.4-2.7-0.8-4-1.2C1371.5,848.4,1371.4,849.7,1371.4,851z"/>
+	<path class="st0" d="M1598.1,848.3C1596.6,851.2,1601.5,848.3,1598.1,848.3L1598.1,848.3z"/>
+	<path class="st0" d="M137.2,851h3C141.2,848.5,136.8,848.5,137.2,851z"/>
+	<path class="st0" d="M1510.5,849.8c-0.4,0.3-1.3,0.9-1.7,1.2h9.3C1516.4,848.4,1513,850,1510.5,849.8z"/>
+</g>
+<g id="Shadow">
+	<path class="st1" d="M373.2,40.6c1.5,0.1,2.5,3.7,0.8,4.3C372.5,44.3,372.3,41.8,373.2,40.6z"/>
+	<path class="st1" d="M377.4,50.5c2.5-1.1,1.6,5.5-1.2,4.2C375.4,53.2,376.4,51.7,377.4,50.5z"/>
+	<path class="st1" d="M367.7,51c2.2,0.3,4.4,0.7,6.6,1.2c-1.8,1.5-4.1,2.6-6.5,1.9C367.9,53.3,367.8,51.8,367.7,51z"/>
+	<path class="st1" d="M438.7,56.8c0.4-1.7,2-2,3.4-2.5c0.2,0.7,0.6,2,0.8,2.7C441.6,57,440.1,56.9,438.7,56.8z"/>
+	<path class="st1" d="M353,65.9c0.3-2.9,3-3.6,5.5-2.9C357.1,64.8,355,65.4,353,65.9z"/>
+	<path class="st1" d="M383.3,72.2c3.1-0.2,0.8,3.6-1.2,2.5C380.4,74,382,72,383.3,72.2z"/>
+	<path class="st1" d="M443.2,73.2c2.4-0.8,1.2,2.8-0.5,2.4C441.2,75.4,442.2,73.3,443.2,73.2z"/>
+	<path class="st1" d="M1380.1,78.2c1.6-0.6,2.2,0,1.7,1.6C1380.2,80.3,1379.6,79.8,1380.1,78.2z"/>
+	<path class="st1" d="M1361.1,80.1c1.6-0.5,2.2,0,1.7,1.6C1361.2,82.3,1360.6,81.7,1361.1,80.1z"/>
+	<path class="st1" d="M346.1,91.9c-1.8-1.9,0.2-4.2,1.8-5.3C349.5,88.6,348.8,91.4,346.1,91.9z"/>
+	<path class="st1" d="M403.9,104.1c0.8-1.5,0.5-4.5,3-4.1c0.5,1,1,2,1.4,3C406.9,103.4,405.4,103.8,403.9,104.1z"/>
+	<path class="st1" d="M1087.5,113.3c0.5,0.1,1.7,0.3,2.2,0.5c-0.3,0.3-1,0.8-1.3,1.1c-0.1,1.4-0.1,2.7-0.2,4.1l1.5-0.1
+		c2.7,0,5.5,0,8.2,0c3.7-0.1,7.5-0.1,11.2,0c2.2,0.1,4.5,0.2,6.7,0.1c5.2-0.2,10.4-0.1,15.6-0.1c0,2.8-0.1,5.5-0.2,8.3
+		c-32.4,0.5-64.8,0.1-97.1,0.2c-101.4,0-202.7,0-304.1,0c-43.3-0.1-86.6,0.2-129.9-0.1c0-2.8,0-5.6,0-8.4c3.9,0,7.9,0,11.8,0
+		c4,0.1,8,0.2,12,0c3.7-0.2,7.5-0.2,11.2,0c2.2,0.1,4.5,0.2,6.8,0.1c13.7-0.5,27.5,0,41.2-0.3c39,0.4,78-0.2,117,0.2
+		c17.8,0.2,35.5-0.4,53.3,0.1c2.3,0.1,4.6,0.1,6.9,0c3.9-0.2,7.9-0.1,11.8,0c2.2,0.1,4.4,0.1,6.6,0.1c69.7-0.1,139.5-0.3,209.2,0
+		C1087.7,117,1087.6,115.2,1087.5,113.3z"/>
+	<path class="st1" d="M1291,117.1c0.8,0,2.3,0,3.1,0.1c-0.4,1.6-0.5,4.4-2.8,2.8C1291.2,119.2,1291.1,117.8,1291,117.1z"/>
+	<path class="st1" d="M369,141c1.4,0.7,2.8,1.5,4.2,2.3c-0.9,0.6-1.8,1.4-3,1.6C369.8,143.6,369.4,142.3,369,141z"/>
+	<path class="st1" d="M689,189.1c0.4-1.9,2.3-2.5,3.7-3.3c0.3,1.9,0.7,3.7,1,5.6c5.2-0.1,10.4,0,15.5,1.2c3.6,2.8,6.6,6.5,7.5,11.1
+		c2.4,11.7,1.7,23.6,1.7,35.4c-0.1,7,0.3,14-0.3,21c-1,9.3-0.2,18.6-0.3,27.9c-0.4,19-0.1,38-0.3,57c-0.1,3.4,0.3,6.9,0.6,10.3
+		c-0.5,6.7-0.7,14-5.2,19.5c-0.4-1.6-0.8-3.2-0.8-4.8c0.3-16.6,0-33.3,0.1-50c0.1-6.4-0.2-12.7,0.4-19c0.6-5.4-0.4-10.7-0.4-16.1
+		c0-20,0-39.9,0-59.9c-0.4-4.6-0.8-9.8-3.9-13.4c-4.8-4.1-11.6-2-17.3-3.7c-2.5-0.7-2.6-3.8-2.8-5.9
+		C688.3,197.7,687.9,193.3,689,189.1z"/>
+	<path class="st1" d="M858.6,188.6c0.7-2.2,3-2.6,4.9-3.1c0,1.9,0,3.9,0.1,5.8c3.8,0,7.6-0.1,11.5,0.1c4.5,0,8,3.8,9.8,7.6
+		c3.5,8.5,2.5,18,3.3,26.9c-0.7,12.3-0.3,24.6-0.4,36.9c0.1,8.4-0.4,16.7,0.4,25.1c0.3,4.7-0.9,9.3-0.3,14c0.8,5-0.4,10-0.2,14.9
+		c0.5,6.7,0.2,13.3,0.7,20c-1.5,10.3,0.4,20.9-2.5,31.1c-0.7,2.8-2.2,5.4-4.2,7.4c0.5-14.8,0.2-29.7,0.2-44.5c0-34.7,0-69.4,0-104
+		c-0.2-5.2-0.8-10.8-3.8-15.2c-4.8-4.1-11.5-2.4-17.2-3.7c-3.1-0.9-3-4.5-3.1-7.1C858,196.9,857.5,192.6,858.6,188.6z"/>
+	<path class="st1" d="M1018.4,186c1.5,1,3.3,2,3.3,4c1.8,15.6,1.9,31.4,4.2,47c0.2,3.6,1.1,9.3-3.3,10.7c-5.9,2-12.3,1.5-18.4,2.3
+		c0-0.6,0.1-1.8,0.2-2.3c-0.6,0-1.8,0-2.4,0c-2.1-8.7-2.5-18.3-7.9-25.8c-3.2-4.6-8.8-6.9-14.2-7.8c-8.3-1.4-16.7-2.2-25-2
+		c-7,0.1-14.1-0.6-21,0.9c-2,7.9-1.3,16-1.3,24.1c0.1,12.2-0.2,24.4,0.1,36.5c-2,0-3.9,0-5.8-0.2c0.5-11.7,0.3-23.5,0.4-35.3
+		c0.1-3.2,0.2-6.3,0.1-9.5c-0.1-4.5-0.9-9-0.3-13.5c0.7-6.1-0.5-12.4,1.3-18.3c3.3-1.4,6.9-2.6,10.6-2.3c13,0.3,26.1-0.7,38.9,1.6
+		c7.5,1,15.6,3.4,20.3,9.8c5.8,7.4,6.9,16.9,9,25.7l0.2,0.8c2.1-0.1,4.3-0.3,6.5-0.6c2.3-0.3,4.5-0.7,6.8-1.1l0.5-0.1
+		c0.1-2.7-0.5-5.3-1.6-7.7c-0.4-2.6-0.6-5.2-0.7-7.8c-0.1-2.9-0.3-5.7-0.7-8.5c-0.8-4.9-0.8-9.8-1.1-14.8
+		C1017.6,189.7,1018,187.9,1018.4,186z"/>
+	<path class="st1" d="M1044.2,191c0.2-2.5,2.4-3.9,4.3-5c0.3,1.8,0.6,3.5,1,5.3c5.8,0.1,11.9,0.2,17.3,2.9c3.5,3.4,5.9,8,6.4,12.9
+		c0.9,7.9,1.6,15.9,1.3,23.9c-0.2,30-0.3,60-0.1,90c-0.2,8,0.3,16-0.6,24c-0.8,9.6,0.9,20.4-4.8,28.8c-1.8-3.3-0.8-7.2-1-10.8
+		c-0.3-8.4,1.2-16.7,1-25c-0.1-29.7,0-59.3,0-89c-0.2-5.3-0.7-10.7-0.6-16c-0.3-6.7,0.2-13.9-3.6-19.8c-2.6-3.9-7.7-3.8-11.8-4.3
+		c-3-0.4-7.1,0.1-8.6-3.2C1043.6,200.9,1043.8,195.9,1044.2,191z"/>
+	<path class="st1" d="M1206.4,189.2c0.3-2.6,3.2-2.8,5.1-3.5c0,1.8-0.1,3.7-0.1,5.6c5.9,0,12.2,0.7,17.1,4.1
+		c4.7,4.7,6.8,11.3,7.4,17.8c0.3,3.9,1.9,7.8,1,11.7c-0.7,4-0.4,8-0.4,12c0.1,6.7-0.5,13.4,0.7,20c0.3,5-1.2,9.9-0.7,14.9
+		c0,2-0.1,4,0,6c0,6-0.2,12.1,0.7,18c0.3,11.8,0.7,23.6,1.1,35.4c-2.9-1.6-5.2-4-6.9-6.7c-0.8-25.2-0.2-50.5-0.5-75.7
+		c-0.2-11.2,1.1-23-3.5-33.5c-2.1-4.8-7.7-6.1-12.4-6.5c-3-0.5-7.1,0-8.6-3.3C1205.5,200.3,1205.7,194.6,1206.4,189.2z"/>
+	<path class="st1" d="M1281.2,185.6c5.2,0.4,4.5,6.6,4.7,10.3c-0.3,3.8,0.9,8.7-2.2,11.7c-5.2,2.1-11.6,0.1-16.3,3.7
+		c-2.7,2.8-3.4,6.9-3.7,10.7c-0.1,9.4-1.5,18.6-1.5,28c0,16,0,32-0.2,48c-1.5,36-0.6,72.1-1,108.1c0.4,3.1-2.5,5.4-5.4,5.4
+		c-5.4,0.2-10.8,0.3-16.2,0c-3.4-0.1-5.3-3.3-7.2-5.7c-23.1-30.9-49.1-59.6-74.1-88.9c-19.9-22.8-39.5-45.8-58.8-69
+		c-0.9,11.1,1.1,22.1,0.9,33.2c0.2,14.7-0.4,29.4,0.6,44c0.7,12.3,0.3,24.6,0.6,37c0,4.3,2,8.5,0.8,12.8c-4-4.2-5.2-10.1-5.6-15.7
+		c-0.5-8.1-1-16.1-0.9-24.2c0.3-5.1,0.2-10.2-0.7-15.2c-0.3-15.9,0-31.8-0.3-47.7c0-10-0.9-20-1-29.9c-1.1-8.3-1.3-16.7-1.3-25.1
+		c5.6,7,11.5,13.8,17,20.9c4.8,7.7,11.1,14.2,17,21c7.5,8.5,14.2,17.7,22.2,25.7c4.3,4.1,7.1,9.4,11.5,13.4
+		c5.8,5.3,9.8,12.2,15.3,17.7c6.4,7.9,12.8,15.9,20.1,23c3.7,4.6,7,9.5,11,13.8c4.7,6,10.5,11,15,17.2c6.3,7.3,10.9,15.9,17.8,22.8
+		c5.1,1,10.3,1.2,15.4,1.2c-0.1-4.6-0.4-9.1-0.1-13.7c0.2-3.7,1.8-7.6,0-11.2c-0.2-3.3,0.3-6.5,0.7-9.8c0.4-3.4-0.8-6.6-0.8-10
+		c0-4.7,0.7-9.3,0.8-14c0.3-7.1-0.1-14.1,0.6-21.2c0.2-2.1,0.3-4.2,0.2-6.2c-0.4-4.3-0.5-8.5-0.2-12.8c0.1-1.8,0.2-3.6,0.2-5.3
+		c0.2-6.7-0.2-13.4,0.4-20.1c1.3-6.5,0.8-13.2,0.4-19.8c-0.9-8.2,0.7-16.5,0-24.7c-0.5-4.4,0.8-8.7,0.6-13
+		c-0.3-6.5,1.7-13.3,6.7-17.7c5.1-2.6,11-2.3,16.5-3.1C1280.9,189.2,1281,187.4,1281.2,185.6z"/>
+	<path class="st1" d="M551,191.6c6.7-0.1,13.4-0.3,20.2-0.3c0.5-0.2,1.4-0.6,1.9-0.9c3.5,2.2,7.8,2.6,11.6,4.1
+		c14.5,4.7,26.4,15.4,34.7,28c5,5.8,7,13.3,9.7,20.4c2.4,7.2,4.8,14.6,5.4,22.2c1.6,8.2,0.9,16.7,1.9,25c0.3,2.4-0.5,4.7-0.8,7
+		c-0.8,7.4-1.4,14.8-3.2,22c-0.4,1.5-0.8,3.1-1,4.6c0,0.6-0.2,1.8-0.2,2.5c-1.4,3.1-2.7,6.2-4.1,9.3c-0.3-0.4-0.8-1.3-1.1-1.8
+		c0.3-3.6,1.3-7.2,1.9-10.7c1.3-6.6,1.4-13.3,2.3-20c1-6.7-0.7-13.3-1.1-19.9c-1.3-15.6-6.2-30.8-14.1-44.3
+		c-4.9-7.8-11.1-14.9-18.8-20c-6.4-4.5-13.9-7.1-21.4-8.9c-11.5-2.9-23.8-0.1-34.3,4.8c-13.5,6.7-23.2,18.9-29.9,32.1
+		c-11.7,25.5-13.3,55-6.3,82c0.7,2.4,0.8,4.8,0.7,7.2c-5.9-11.8-8.5-24.9-9.8-37.9c-2.7-21.3,1.1-43,8.5-63c0.8-1.6,1.5-3.3,2.2-4.9
+		c1.8-3.7,4.4-6.8,6.8-10.1c5.6-7.4,11.5-14.8,19.5-19.8c2.4-1.9,5.1-3.2,8.1-3.7c1.4-0.4,2.9-0.8,4.3-1.3l1.3-1.2
+		C547.9,193.6,549.7,193,551,191.6z"/>
+	<path class="st1" d="M1146.3,193c1.9-0.6,2.8,2.6,0.8,3C1145.2,196.5,1144.4,193.5,1146.3,193z"/>
+	<path class="st1" d="M757.7,195.7c13.1-1.8,27.6-1,38.8,6.8c9.7,6.8,14.6,18.7,15.2,30.2c-0.1,5.6-0.1,11.2,0.1,16.8
+		c0.1,8.1-1.8,16.2-5.7,23.4c-1.5-3.1,0-6.6,0.2-9.9c1.4-8.3,0.5-16.8-1.3-24.9c-1.9-7.6-5.8-15.1-12.6-19.3
+		c-8.6-5.6-19.3-6.6-29.3-5.5c0,49.3,0,98.6,0,147.9c-0.2,4.5,2.2,9.3,0,13.6c-0.7-0.9-1.3-1.8-2-2.7c-1.2-4-1.9-8.1-2.7-12.2
+		c-1-6.5-0.8-13-0.8-19.6c0.2-30.5-0.2-61,0.2-91.6c0.3-6.8,1-13.7-0.1-20.4C757.2,217.4,758,206.5,757.7,195.7z"/>
+	<path class="st1" d="M1378.2,209.2c1.7-1,3.7,1.8,1.4,2.4C1378,212.6,1376.1,210,1378.2,209.2z"/>
+	<path class="st1" d="M850.4,218.2c0.3-0.6,0.8-1.6,1.1-2.2c3.2,6.9,5.6,14.4,6.1,22c0,11.3,1,22.9-3,33.7
+		c-6.3,17.5-19.8,31.9-36,40.8c-13.9,7.3-29.9,11-45.6,9.3c-2.6-0.6-4.2-3.2-4.1-5.8c-0.2-4.6-0.3-9.3,0.3-13.9
+		c0.1-2.1,2.2-2.8,3.8-3.4c0.2,1.8,0.3,3.6,0.5,5.4l0.9,0.1c11,1.2,22.1-0.8,32.4-4.7c3.4-0.9,6.8-1.9,9.8-3.7
+		c4.8-3,9.9-5.9,13.8-10.2c2.6-2.4,4.9-5.3,6.9-8.2c8.5-7.5,12.3-18.8,14.4-29.6c0.9-2.1,1.7-4.4,1.7-6.7c0-6.8,0.8-13.8-2-20.2
+		C851,220.1,850.6,218.8,850.4,218.2z"/>
+	<path class="st1" d="M673.5,248.4c0.3-0.4,0.8-1.1,1.1-1.5c5.5,13,9.3,26.9,9.3,41.1c1,20.3-1.3,41.2-10,59.7
+		c-12.4,29.7-39.5,52.2-70.2,60.8c-8.3,2.6-17,4.1-25.6,5.5c-10.7,0.2-21.4,0.2-32.1,0c-25.8-4.1-51.3-15.2-69.4-34.6
+		c-17.5-16.9-27.2-40.5-30.3-64.3c0-11.7-0.2-23.4,0.1-35.1c2.2-10.6,4.5-21.4,9.5-31.2l0.8,1.9c-3.1,8.8-3.9,18.1-4.8,27.4
+		c-0.2,2.4-0.2,4.7-0.2,7.1c-0.4,14.9,1.6,30,7.1,43.9c2.8,7.8,7.1,14.8,11.2,22c0.6,0.9,1.2,1.8,1.9,2.6
+		c7.4,8.7,15.3,17.2,24.9,23.5c6.8,4.7,14.3,8.2,21.7,11.7c1.1,0.5,2.2,0.9,3.3,1.3c5.7,2,11.7,2.9,17.5,4.5
+		c5.1,1.4,10.4,2,15.7,1.9c8-0.2,16,0.6,23.9-0.8c6.8-0.4,13.2-2.7,19.9-3.7c2.3,0,4.6-0.5,6.6-1.8c0.5-0.3,1.5-0.9,2-1.2
+		c23.4-7.2,43.5-23.8,55.9-44.8c0.6-1,1.1-2,1.6-3c2.2-5,3.8-10.3,6.5-15c2.9-4.6,3.4-10.1,4.7-15.2c0.8-3.5,1.3-7.2,1.3-10.8
+		c-0.1-5.4,1.4-10.7,1.1-16.1C678.7,272,676.8,260,673.5,248.4z"/>
+	<path class="st1" d="M986,268c-1-4.9-1.7-11.4,3.7-14c0.3,0.6,0.9,1.7,1.2,2.3C990.4,260.6,988.9,264.8,986,268z"/>
+	<path class="st1" d="M1003.4,286c0.2-10.9-0.3-21.9,0.6-32.8c3.4,1.1,6.9,3.8,6,7.9c-2,16.9-0.6,34-1,51c-0.3,5.4,1.5,10.6,1,16
+		c-0.2,2.5-2.3,4.8-4.9,4.9c-4.7,0.3-9.4,0.2-14.1,0c-2.6,0-5.2-1.9-5.4-4.6c-0.5-5.8,0.3-12.4-3.9-17.1c-3-2.5-6.9-3.4-10.7-4.2
+		c-12.7-1.6-25.5-1.6-38.2-1.2c-0.5,13-0.1,26.1-0.2,39.1c0.2,7-0.5,14,0.5,20.9c0.2,1.3,0.1,2.6-0.2,3.9c-3.8-4.4-5-10.2-5.5-15.8
+		c-0.5-11,0.2-22-0.5-33c0.3-6,0.8-12,0-18c-1-4.8,0.8-9.7-0.5-14.5c12.5,0,25-0.2,37.5,0.2c7.7,0.8,16.5,1.2,22.2,7.1
+		c4.9,5.2,4.2,12.8,5.6,19.4c4.2-0.5,8.5-0.8,12.8-0.5C1003,305.2,1003.6,295.5,1003.4,286z"/>
+	<path class="st1" d="M1481.6,284.9c1.6-1.7,4.1,0.3,4.9,2C1484.8,286.7,1482.1,287.1,1481.6,284.9z"/>
+	<path class="st1" d="M1449.2,296.2c2.8-0.5,1,3.7-1,2.7C1446.5,298.3,1447.9,296.1,1449.2,296.2z"/>
+	<path class="st1" d="M1291.2,318.2c1.4-1.1,2.7,1.4,1.3,2.2C1291.2,321.5,1289.9,319,1291.2,318.2z"/>
+	<path class="st1" d="M45.2,330.2c1.5-1.2,3,1.4,1.6,2.4C45.4,333.9,43.8,331.2,45.2,330.2z"/>
+	<path class="st1" d="M1025.4,391.5c3.4-16.2,7.2-32.4,11.4-48.5c2,0.9,4.7,1.1,5.8,3.3c2.2,4,0.3,8.7-0.7,12.8
+		c-3.8,12.7-6.5,25.6-9.4,38.5c-0.8,3.9-0.6,9.1-4.8,11c-4.5,1.1-9.1-0.2-13.6-0.4c-10-0.4-20.1,0.2-30.1-0.6
+		c-10.3-1-20.6-0.4-30.9-0.6c-15,0.2-30-0.5-45,0.8c-14.7,0.7-29.5-0.6-44.1,1.1c-2.9,0.4-5.8-2-5.9-4.9c-0.2-4.9-0.5-9.9,0.2-14.8
+		c0.4-2.2,2.7-2.8,4.5-3.4c0.3,1.8,0.6,3.7,0.9,5.6c14.1-1.3,28.2-0.9,42.3-1.2c28.6-1.3,57.3,0,86-0.7
+		C1003.1,391.1,1014.3,390.1,1025.4,391.5z"/>
+	<path class="st1" d="M1049.3,379.3c0.7,0,2.1,0,2.8,0c-0.7,0-2.1,0.1-2.7,0.2c0,4,0,7.9,0.1,11.9c10.1-1.4,20.4-0.4,30.5-1.5
+		c11.8,0.6,23.6,0.2,35.3,1c0.4-0.4,1.1-1.1,1.5-1.5c0.6,0.1,1.8,0.4,2.4,0.5c0.1-3.5,0.1-6.9,0.2-10.4l0-0.6
+		c0.2,2.2,0.4,4.4,0.6,6.6c1.7,0.9,4.2,1.4,4.6,3.7c0.9,4.5,0.2,9.1,0,13.7c-0.1,2.4-0.9,5.4-3.6,5.9c-4.3,0.5-8.6-1-12.9-0.8
+		c-8.7,0.3-17.4-0.8-26-0.1c-10.7,0.5-21.4-0.6-32,0.9c-2.6,0.5-5.7-1.1-5.8-3.9c-0.4-5.2-0.5-10.6,0.2-15.8
+		c0.3-2.2,2.9-2.6,4.6-3.5C1049.1,383.5,1049.2,381.4,1049.3,379.3z"/>
+	<path class="st1" d="M688.6,389.7c0.3-2.1,2.4-3,4-3.9c0.3,1.9,0.7,3.8,1,5.7c3.4-0.2,6.8-0.6,10.1-1.2c10.3,0.4,20.6-1.1,31-0.5
+		c7.7,1.1,15.5,0.3,23.2,0.7c7.9,0.6,15.9,1.2,23.8,1.3c1.4-1.5,1-4,1.6-5.9c2.2,0.8,4.2,2.6,4.2,5.2c0.1,4.9,0.5,10-0.5,14.9
+		c-1,3.5-5.2,3.2-8.1,2.8c-5.9-1-12-0.5-17.9-0.9c-9.6-1.3-19.4-0.6-29.1-0.8c-8-0.2-15.9,1.3-23.9,1c-5.1-0.2-10,1-15.1,0.9
+		c-2.6,0-4.5-2.6-4.6-5.1C688.2,399.2,688,394.4,688.6,389.7z"/>
+	<path class="st1" d="M147.6,426.2c0.8-1,2.9-0.8,3.2,0.6C150.5,428.7,146.6,428.1,147.6,426.2z"/>
+	<path class="st1" d="M161.2,437.5c2-1,2.8,3.2,0.7,3.4C160.4,440.6,160.1,438.4,161.2,437.5z"/>
+	<path class="st1" d="M1053.5,475.5l0-0.5c0.1,2,0.2,4,0.3,6c2.1,1.1,5.3,1.9,5.1,4.9c0.3,5.3,0.3,10.7,0.1,16
+		c0,2.6-1.9,5.2-4.6,5.4c-6.2,0.7-12.8-0.6-18.5,2.3c-3.6,2.1-4.9,6.4-6,10.1c-2.9,15.5-2,31.4-2.1,47.2c0,39-0.1,78,0,116.9
+		c0.1,8.6-0.5,17.2,0.8,25.7c0.5,3.5,0.7,7.1,0.5,10.6c-1-1-2.4-1.7-2.8-3.2c-1.8-5.5-2-11.3-2.7-17.1c-1-7.1,0.3-14.3-1-21.4
+		c-0.4-6.2,0.3-12.5-0.5-18.7c-0.7-4.4,0.5-8.7,0.4-13.1c-0.2-41,0.1-81.9,0-122.9c0-9.3,0.6-19.1,5.6-27.3
+		c3.3-2.7,6.9-5.5,11.3-5.9c4.4-0.4,9-0.1,13.4-1C1052.7,485,1053.2,480.3,1053.5,475.5z"/>
+	<path class="st1" d="M1236.2,476.1c0.4-0.3,1.3-0.8,1.7-1.1c3.8,8.3,6.1,17.3,8.7,26c7.2,21.3,14,42.7,21.2,64
+		c13.5,39.3,27,78.6,40.3,117.9c1.2,3.7,2.9,7.1,4.1,10.8c0.6,1.3,0.3,2.7-0.4,4c-3.9-9-7.2-18.2-10.5-27.5
+		c-2.7-7.6-4.7-15.4-8.4-22.5c-1.8-9.2-5.5-17.9-8.4-26.8c-2.8-8.6-6.8-16.9-8.8-25.7C1262.2,555.6,1248.6,516,1236.2,476.1z"/>
+	<path class="st1" d="M1524.4,474.8c3.8,0.1,4.1,4.2,4.9,7c15.9,51.1,33.5,101.6,50.8,152.2c3.5,8.7,5.9,17.8,9.2,26.5
+		c2.8,7.7,4.7,15.7,7.9,23.2c0.5,2.2,2.5,5.1,0.3,7c-0.4-1.4-0.8-2.8-1.1-4.2c-0.5-2.8-1.6-5.4-3.1-7.8c-2.2-4.7-3.9-9.6-5.2-14.6
+		c-0.6-2.8-1.4-5.6-2.6-8.2c-2.4-5.6-4.8-11.2-6.3-17.2c-6.3-18.8-12.9-37.5-19.2-56.4c-1.4-4.4-3.9-8.3-5.2-12.8
+		c-2.5-8.2-5.4-16.2-7.6-24.5C1539.5,521.6,1531.7,498.2,1524.4,474.8z"/>
+	<path class="st1" d="M432.1,480.8c2.1,0.8,4.2,2.1,4.4,4.6c0.4,5.2,0.1,10.5,0.1,15.7c-0.1,2.4-0.6,5.9-3.6,6.2
+		c-7.7,0.9-15.8,0.5-23,3.8c-3.6,1.5-5.2,5.5-5.9,9.1c-1,6.6-1.4,13.3-0.5,20c0.6,21.9-0.8,44,1.1,65.9c0.7,13,0.4,26,0.5,39
+		c0.7,7,1.1,14,1.1,21c0.9,8-0.1,16,1.1,23.9c1,6.6-0.3,13.3,1.1,19.8c0.5,3.3,1.7,7.2-0.5,10.1c-4.9-8.7-5.5-19.1-5.7-28.8
+		c-1.9-15.9-1.1-32-2.5-48c-0.3-8,0.2-16-0.8-24c-0.3-3.3,0.6-6.7,0.2-10c-1.2-9.6-0.1-19.4-1.2-29c-0.8-7.6,0.3-15.3-1-22.9
+		c-0.5-5.7-0.7-11.4,0.2-17.1c0.6-3.7-0.6-7.3-0.2-11c0.7-6-0.8-12-0.2-18c0.8-3.3,2.2-6.5,2.9-9.9c3-3.4,6.7-6,10-9.1
+		c7.1-1.7,14.5-1.6,21.7-2.4l0.4,0C431.7,486.6,431.9,483.7,432.1,480.8z"/>
+	<path class="st1" d="M755.5,485.3c0.1-2.5,2.3-3.9,4.5-4.6c0.2,2.8,0.3,5.6,0.3,8.4l1.2,0.2c6.8,0.5,14.2,0,20.3,3.7
+		c4.3,2.7,6,7.7,8.5,11.8c1.8,7.9,1.1,16.1,1.2,24.2c0.1,11.3-0.2,22.6,0.1,34c1.3,9.3,0.7,18.7,0.5,28c0.3,10,0.5,20.1-0.5,30
+		c-0.1,21.7,0,43.3-0.1,65c-0.1,11.7,0.7,24.3-5.5,34.8c-2.8-5.5,0-11.9-0.2-17.8c-0.2-14,0.5-28,0.3-42c0-27.3,0.1-54.7,0-82
+		c-1-16.6,0.7-33.4-1.2-50c0-5.8-1-11.9-4.3-16.8c-4.8-5.2-12.4-4.7-18.8-4.7c-3,0.1-6.3-1.7-6.5-4.9
+		C755.2,496.9,755.2,491.1,755.5,485.3z"/>
+	<path class="st1" d="M98.3,487c2.2-1.9,3.5-5.1,6.7-5.3c0.2,2.5,0.3,5,0.4,7.6l1.2,0.2c7.4,0.6,15.6,0.5,21.5,5.5
+		c7.4,6,9.2,16.1,9.2,25.1c0.3,9.8-0.7,19.7-1.1,29.5c-1.1,8.8-0.2,17.8-1.5,26.5c-0.3,11-1.3,22-1.6,33c-0.7,3.5,0.4,6.7,1.3,10
+		c-0.6,1.3-1.6,2.5-1.9,4c-1.5,8.9-0.4,18-1.7,27c-0.5,7-0.3,14-1.2,21c-0.8,6,0.3,12.1-0.8,18c-0.8,3-1.3,6.1-1.5,9.2
+		c-0.9,0.7-1.4,1.6-1.5,2.8c-0.8,6.1-1.8,12.5-5.7,17.5c1.3-8.5,2.1-17,3.1-25.5c0.2-5-0.5-10.1,0.8-15c1.8-8.1,0-16.5,1.4-24.6
+		c1.7-9,0.1-18.3,1.4-27.3c0.9-6,0.2-12.1,0.5-18.1c0.1-6,2-11.9,1.5-18c-0.3-3.5-0.3-7,0.1-10.5c-0.8-0.2-2.3-0.7-3-1
+		c5.6-4.4,4-12.2,4.4-18.5c-0.9-11.1,3.3-22,0.8-33c-1.3-5.2-1.8-11.3-6.2-14.9c-5.1-4.4-12.4-4.3-18.8-4.6c-2.3,0-4.4-1.4-5.2-3.5
+		C98.9,498.5,102.6,491.7,98.3,487z"/>
+	<path class="st1" d="M873.2,481.5c2,0.4,4.8,0.8,5,3.4c0.8,5.6,0.4,11.4,0.3,17.1c0.1,3.4-3.3,5.9-6.6,5.7
+		c-6.5,0-13.9-0.4-19.1,4.3c-4.2,6.9-5.2,15.2-4.9,23.2c0.3,7.6-0.8,15.3-0.2,22.9c0.5,9,0,18,0.2,27c0.1,3.9,0,7.8-0.9,11.5
+		c-1.9,0.1-3.8,0-5.7,0c0.2-8-0.4-16.1,0.1-24.1c1.7-6.4,0.9-12.9,1-19.4c-0.2-6.9,0.2-13.8-0.7-20.6c-0.5-5-0.5-10.1,0.5-15
+		c1-4,1.6-8.2,1.9-12.3c0.5-2.9,1.6-5.6,2.6-8.3c2.9-2.2,5.8-4.5,9.3-5.6c5.5-1.8,11.4-1.5,17.2-1.6
+		C873.2,486.9,873.2,484.2,873.2,481.5z"/>
+	<path class="st1" d="M935.6,485.6c0.2-1.9,2-4.7,4.2-3.5c0.5,2.6,0.4,5.3,0.4,7.9c4.4,0.7,8.9,0.3,13.4,0.2
+		c5.6,0.4,11.1,3.4,13.8,8.4c4.1,7,4.1,15.3,4.3,23.1c1,8.7,0.8,17.4,0.7,26.2c0,16.2-0.1,32.4,0.1,48.6c-0.8-0.1-2.5-0.2-3.3-0.3
+		c-1.4-0.7-3.4-1.4-3.2-3.2c-0.3-13,0-26,0.3-38.9c-1.3-13.2,1.8-27-3.8-39.5c-1.5-3.9-5.7-5.7-9.6-6.5c-4.4-0.9-8.8,0-13.2-0.7
+		c-2.9-0.6-4.5-3.5-4.4-6.3C935.3,495.9,935.1,490.7,935.6,485.6z"/>
+	<path class="st1" d="M41.8,486.8c2.9,1.3,4.7,4.5,4.5,7.6C43,494,42.3,489.4,41.8,486.8z"/>
+	<path class="st1" d="M561.6,496.6c8.8-2.2,17.4-5.7,26.4-7.2c5.4,0.1,10.8-0.1,16.2,0.5c14,1.6,27.5,7,38.8,15.3
+		c3.9,2.9,7.4,6.2,11.2,9.3c3.3,5.3,8.4,9.4,10.8,15.1c0.9,2.3,2,4.5,3.7,6.3c0.4,0.2,1.3,0.6,1.7,0.8c0.2,0.5,0.5,1.6,0.7,2.1
+		c1.1,3.8,2.8,7.4,5.1,10.6c0.8,4,1.7,8,4,11.5c1.2,9.3,4.7,18.3,4.4,27.8c0.2-0.6,0.5-1.2,0.7-1.8c0,3.3-0.1,6.7,0.4,10
+		c1.4,6.9,1,14,0.2,21c-0.6,8.2,0,16.5-1.6,24.7c-3.3,11.2-5.7,22.8-10.5,33.5c-0.8,1-1.6,2-2.5,3c2.1-8.8,5.4-17.2,6.5-26.2
+		c0.6-5.6,2-11.2,2.1-16.8c0.1-12,1.3-24.1-1-36c-2.6-21.3-9.2-42.6-22-60c-15.7-22.8-44.6-36.4-72.1-31.6
+		c-22.6,3.7-42.3,19.1-53.3,38.9c1.1,1.2,2.2,2.5,3.3,3.8c-1.6-0.3-3.3-0.6-4.9-0.9c-8.1,13.6-12.5,29.1-15.1,44.7
+		c-1.7,12.4-3.3,25-1.3,37.5c0.8,4.2-0.4,9.1,2.9,12.5c-1.2,4.2,0.6,8.5,1.2,12.7c1.8,5.6,2.2,12.1,6.4,16.6
+		c-0.6,0.7-1.2,1.4-1.8,2.2c-4,1.4-2-4.1-3.2-6.3c-2.6-5.8-5-11.7-5.8-18c-0.6-4.7-2.1-9.3-2.8-14c-1.1-6.5-1.7-13-2.8-19.4
+		c-0.2-1.4-0.2-2.8-0.3-4.2c-1.5-0.1-2.9-0.2-4.3-0.3c1.5-0.4,3-0.6,4.5-0.7c-1.6-8.2-0.5-16.7-1-25l0.9-0.1
+		c0.9-2.5,1.3-5.1,1.3-7.8c1-4.6,2.3-9.2,3-13.8c1.5-4.6,3-9.2,4.1-13.9c0.7-2.9,2.1-5.5,3.6-8c1.6-4.5,4.3-8.6,6.5-12.8
+		c4.3-5.5,7.3-12,12.6-16.6c4-3.6,7.2-8.3,12-10.8c3.9-2,6.9-5.4,10.8-7.5L561.6,496.6z"/>
+	<path class="st1" d="M32.2,507.3c1.8,0.2,1.5,3.4-0.2,3.5C30.1,510.6,30.5,507.5,32.2,507.3z"/>
+	<path class="st1" d="M202.3,513.3c0.8-1.5,3.5,0,2.4,1.4C204,517.2,199.8,514.9,202.3,513.3z"/>
+	<path class="st1" d="M208.3,521.2c1.9-0.7,2.8,2.6,0.7,2.9C207.2,524.6,206.4,521.6,208.3,521.2z"/>
+	<path class="st1" d="M407.9,525.3c1.2-0.4,2.3-0.9,3.5-1.3c0.1,1.7-0.2,3.5-0.5,5.2C409.6,528.1,408.5,526.9,407.9,525.3z"/>
+	<path class="st1" d="M424.1,525.2c1.6-0.5,2.2,0,1.7,1.7C424.2,527.4,423.6,526.8,424.1,525.2z"/>
+	<path class="st1" d="M1206.8,527.8c1.3,2.2,2,4.6,2.5,7.1c4.6,23.2,12.4,45.6,19.2,68.2c1.7,6.2,4.7,12,5.8,18.3
+		c-3.4,0-6.8-0.1-10.2-0.1c-3.8-11.1-6.9-22.5-10.5-33.7c-2.6-8.1-4.2-16.6-7.4-24.5c-3.9,9.7-6.8,19.8-10.7,29.5
+		c-3.6,9.1-6.5,18.5-10.8,27.2c-3.7,1.2-7.6,1-11.3,0.1c8.9-22.3,17.9-44.5,25.5-67.3C1201.6,544.3,1203.6,535.8,1206.8,527.8z"/>
+	<path class="st1" d="M465.2,529.3c1.5-1.1,2.9,1.5,1.6,2.5C465.3,532.9,463.9,530.2,465.2,529.3z"/>
+	<path class="st1" d="M1486.3,555.9c3.1-9.3,6.2-18.7,8.7-28.2c0.8,1,2.1,1.9,2.2,3.4c1.4,7.6,2.8,15.3,5.1,22.7
+		c1.5,4.7,2.1,9.7,4.9,13.9c0.4,7.8,4.2,14.8,5.9,22.4c3.1,9.8,5.7,19.7,9.7,29.1c-3.3,1.1-7.1,2.1-10.4,0.5
+		c-3.4-8.4-5.4-17.3-8.2-25.8c-3.5-10.3-5.7-20.9-9.5-31.1c-7,19.4-13.4,39-21.9,57.8c-3.5,0-7.1,0.1-10.6,0.1
+		c1.7-3.7,3.2-7.5,4.1-11.5c4.4-11.2,8.9-22.2,13-33.5c1.4-4.1,2.1-8.5,3.6-12.6C1484.4,560.9,1485.5,558.5,1486.3,555.9z"/>
+	<path class="st1" d="M158.2,542.3c0.5,0,1.6,0,2.2,0.1c1.2,3.4,2.2,6.9,4.3,9.8c0.7,4.2,2.3,8.1,4.2,11.9c0.9,0.4,1.8,0.8,2.6,1.3
+		c-0.2,2.7-0.7,5.8,1.5,7.9c0.7,2.4,1.4,4.8,2.4,7.2c12.4,28,25.7,55.5,38.5,83.3c2.4,6.6,5.4,13.1,8.9,19.2
+		c6.7,12.9,12.3,26.4,18.9,39.4c1.1,3,2.5,5.9,4.4,8.5c1.1,4,2.9,7.7,4.5,11.5c0.5,0.2,1.6,0.7,2.1,0.9c3.2-0.6,6.6-0.8,9.9-0.7
+		c6.5-13.3,12-27,18-40.5c6.4-15.1,13.7-29.7,20.6-44.5c18-38.4,36.9-76.5,50.7-116.7c1.9,2.4,0.7,5.5,0.5,8.3
+		c-1,5.9-0.2,11.9-0.8,17.9c-1.3,11.5-1.6,23.1-0.6,34.6c1.2,29.1-0.3,58.3,0.2,87.5c-0.3,11,1.2,23.7-6.4,32.8
+		c-0.4-1.1-0.5-2.3-0.5-3.4c1.2-8.8,1.4-17.7,1.3-26.5c0-29,0-58,0-87c0-5.7,0.2-11.4-0.2-17.1c-5.2,10.3-9,21.3-14.2,31.6
+		c-2.7,5.2-4.5,10.7-7.2,15.8c-4.3,8.2-7.5,16.9-11.8,25c-3.6,6.7-6.3,13.7-9.6,20.4c-10.9,21.7-20,44.1-29.8,66.3
+		c-2,4.4-3.5,9.4-7.2,12.8c-2.8,2.3-6.5,1.5-9.8,1.5c-2.7-0.1-5.7,0.5-8.1-1.2c-1.9-0.9-2.5-3-3.3-4.8c-2.5-6-5.8-11.6-8.3-17.6
+		c-3-7.6-7-14.8-10.6-22.2c-3-8.4-7.8-16-11.1-24.3c-14.3-30.3-28.7-60.6-42.5-91.2c-2.4-5.1-3.9-10.7-7-15.5
+		c-0.7,14.4-0.3,28.9-0.4,43.3c-0.1,4-1.3,8-1.4,12c-0.2,5.3,0,10.7-0.1,16c0,5.6-1,11.1-1,16.8c0.8,0.2,2.3,0.7,3.1,0.9
+		c-1,1.2-2,2.3-3,3.5c-0.1,11-0.1,22-0.1,33c-0.1,3.6,0.9,7.3,0,10.8c-4.9-5.8-5.6-13.5-5.9-20.8c-1.3-7.5,0.1-15.1,0.4-22.7
+		c0.6-5.9,0.9-11.9,0.2-17.9c-1-9.2,1-18.4,0.8-27.6c0.4-6.7-0.8-13.4,0.7-20c0.8-8,0.3-16,0.6-24
+		C160.2,572.8,158.8,557.5,158.2,542.3z"/>
+	<path class="st1" d="M255.2,546.2c1.8-1.3,4.2,0,5.1,1.7C259.9,551.5,253.1,549.5,255.2,546.2z"/>
+	<path class="st1" d="M639.2,551c1-0.8,3.5,0.1,2.5,1.6C640.5,554.5,636.6,552.4,639.2,551z"/>
+	<path class="st1" d="M618.2,552.2c0.8-1.3,3.4-0.1,2.2,1.3C619.6,554.8,617,553.6,618.2,552.2z"/>
+	<path class="st1" d="M1661.5,552.6c1.4-0.1,2.9-0.1,4.4,0c-1.1,1.2-1.5,3.8-3.7,3.3C1662,555.1,1661.7,553.5,1661.5,552.6z"/>
+	<path class="st1" d="M418.3,553.1c1.3,0.1,2.9,0.1,2.9,1.9c0.3,1.8-1.7,2.6-3.1,1.8C418.1,555.6,418.2,554.4,418.3,553.1z"/>
+	<path class="st1" d="M542.9,552.7c1.1,0.6,2.5,1,3.2,2.2c0.5,1.2-1.8,2.6-2.3,1.1C543.5,555,543.1,553.8,542.9,552.7z"/>
+	<path class="st1" d="M550.3,553.9c2-0.7,2.6,2.6,0.7,3C549.2,557.4,548.5,554.4,550.3,553.9z"/>
+	<path class="st1" d="M630.3,557.3c2.1,0.3,0.9,4.5-1,3.4C628.3,559.7,628.9,557.6,630.3,557.3z"/>
+	<path class="st1" d="M446.3,607.9c2.3-17.1,5.2-34.7,13.5-50.1c0,0.7-0.1,2-0.1,2.7c0,0.3-0.1,0.9-0.1,1.2
+		c-1.2,4.5-3.3,8.7-3.7,13.3c-0.2,2.1-0.8,4.1-1.4,6.1c0.6,0.3,1.8,0.8,2.4,1.1c0.2,0.8,0.5,1.5,0.8,2.3c-1.1-0.4-2.2-0.9-3.2-1.3
+		c-0.3,1.2-0.5,2.3-0.8,3.5l-0.2,0.8c-1.7,4.7-2.3,9.8-1.2,14.8c-0.2,5.8,0.2,11.6-0.2,17.5c-0.4,2.5,0,5.1,0.7,7.5
+		c0.6,2.9,0.9,5.9,1,8.8c0.2,0.1,0.7,0.4,0.9,0.5c0.2,5.6,1.4,11.2,3.4,16.5c0.6,4.5,2.9,8.6,3.9,13.1c0.9,4.6,3.1,8.8,5.7,12.6
+		c1.5,2.4,3,4.7,4.5,7c2.2,3.3,3.7,7.2,7.1,9.4c0.1-0.9,0.2-2.8,0.3-3.7c1.4-0.1,2.8-0.2,4.2-0.3c-0.1,0.5-0.2,1.4-0.2,1.9
+		c-1.2,0.6-4,0.7-3,2.8c0.9,3.3,3.1,5.9,5.5,8.2c0.3,0.6,1,1.9,1.3,2.6c1.3,1.5,2.9,2.8,4.5,4.1c2,1.5,4,3,5.7,4.7
+		c7.5,7.5,17.1,12.3,25.9,18c1.5,1,3.1,1.9,4.8,2.7c16.5,6.9,33.8,12.8,51.9,13.5c13.9-0.8,28.5,1.8,41.9-2.9
+		c12.8-1.4,24.9-5.8,37.1-9.6c3.3-0.5,6.3-1.9,8.9-3.8c3.5-2.4,7.2-4.3,10.8-6.5c6-3.5,10.9-8.6,16.5-12.6c7.9-7,15.6-14.5,21-23.8
+		c7-10.2,12.9-21.4,15.6-33.5c1.5-3.5,2.5-7.2,2.9-10.9c1.1-2.5,1.7-5.2,2-8c2-4.8,1.7-10,1.9-15c0.2-0.5,0.6-1.5,0.8-2
+		c1.4-3,1-6.3,0.9-9.5c-0.2-4.3,0-8.6,0-12.9c0.8-3.5,1.3-7.2-1-10.3c-0.8-7.1-2.3-14-4.1-20.9c0.2-0.9,0.5-2.8,0.6-3.7
+		c6.3,11.8,7.7,25.4,9.9,38.4c0.5,9.3,0,18.7,0.2,28c-1.5,23.5-7.2,47.2-19.4,67.7c-8.6,15.4-20.8,28.6-34.6,39.5
+		c-21.2,15.9-46.8,25.6-73.1,28.9c-2.7,0.6-5.2,1.8-8,1.6c-11,0-22,0-33,0c-3-0.1-6.2,0.3-9.1-0.6c-7.8-2.5-16-3.4-23.8-6.1
+		c-26.3-8.7-50.8-24.1-68.1-45.9c-2.2-2.6-3.9-5.4-6.2-7.9c-0.9-1.2-2.6-0.7-3.8-0.9c0.3-1.1,0.6-2.3,1-3.4
+		c-2.9-4.7-5.6-9.5-8.1-14.5c-0.6-0.2-1.9-0.6-2.5-0.8c2-4-1.3-7.7-2.4-11.5c-3.8-10.5-6.2-21.5-7.3-32.6c-0.3-2.1-1-4.1-1.6-6.1
+		c-0.9,0.1-2.2,2.2-2.8,0.5c-1.1-2.2-3.7-4.2-3.2-6.9c2.4-0.2,3.8,3.1,6,4.1C446.7,626.1,446.2,617,446.3,607.9z"/>
+	<path class="st1" d="M533.7,561.1c1.3,0.1,2.7,0.2,2.5,1.9c-0.8,1.8-2.3,3-3.8,4.2c-0.2-0.3-0.6-1-0.8-1.3
+		C532.3,564.2,533,562.7,533.7,561.1z"/>
+	<path class="st1" d="M54.2,565c3.8-0.6-0.1,4.6-1,1.2C53.5,565.9,54,565.3,54.2,565z"/>
+	<path class="st1" d="M442.1,566c0.9-0.1,2.6-0.2,3.4-0.2c-0.6,1.6-1.5,3-3.3,3.5C442.2,568.5,442.1,566.8,442.1,566z"/>
+	<path class="st1" d="M522.7,569.9c0.6-0.8,1.4-1.6,2.2-2.2c0.4,1.4,0.7,2.9,1.1,4.3C524.7,571.7,522.4,572,522.7,569.9z"/>
+	<path class="st1" d="M1620.1,570.1c3.9-0.6,0,4.5-1,1.2C1619.3,571,1619.9,570.4,1620.1,570.1z"/>
+	<path class="st1" d="M99.3,576.1c1-1.5,3.5,0.2,2.4,1.6C100.6,579.2,98.1,577.6,99.3,576.1z"/>
+	<path class="st1" d="M1329.1,586.1c1.6,0.3,3.9,0.6,3,2.9C1330.1,590.1,1328,588.1,1329.1,586.1z"/>
+	<path class="st1" d="M99.2,590.8c-0.4-2.4,1.9-3.7,3.9-4C103.2,589.3,102,591.6,99.2,590.8z"/>
+	<path class="st1" d="M619.2,587.1c1.6-0.5,2.2,0,1.6,1.7C619.2,589.3,618.7,588.8,619.2,587.1z"/>
+	<path class="st1" d="M1616.3,588.1c1.3,0.3,2.6,0.7,3.9,1.2c-1.2,1-2.8,1.5-4.3,1.8C1616.1,590.4,1616.2,588.8,1616.3,588.1z"/>
+	<path class="st1" d="M444.2,591.4c1.3-1.4,3.6,0.8,2.1,2.1C445,595,442.6,592.7,444.2,591.4z"/>
+	<path class="st1" d="M1111.2,591.2c1.6-0.5,2.2,0,1.6,1.7C1111.2,593.3,1110.6,592.8,1111.2,591.2z"/>
+	<path class="st1" d="M118.2,593.3c1.5-1.2,2.9,1.5,1.5,2.5C118.2,597,116.8,594.3,118.2,593.3z"/>
+	<path class="st1" d="M1313.7,602.7c1.9-1.6,5.3-0.2,6.2,2c-1.5,2.4-4.5,1.2-6.6,0.8C1313.3,604.6,1313.4,603.7,1313.7,602.7z"/>
+	<path class="st1" d="M775.1,606c2.8-1,1.6,3,1.8,4.4C775.2,609.8,773.2,607.6,775.1,606z"/>
+	<path class="st1" d="M1676.7,611.2c0-1.8,0.6-5,3.2-4C1680.8,609.6,1678.3,610.5,1676.7,611.2z"/>
+	<path class="st1" d="M644.3,608.2c1.5-1.1,2.9,1.5,1.6,2.5C644.4,611.8,643,609.2,644.3,608.2z"/>
+	<path class="st1" d="M69.2,610.2c1.8-1.1,2.2,4.3,0,3.4C67.5,613.3,67.6,610.6,69.2,610.2z"/>
+	<path class="st1" d="M1680.8,610.4c2.4-0.8,4.8-0.8,7.3-0.3c-0.4,1-0.7,2-1,3C1685,612.2,1682.9,611.3,1680.8,610.4z"/>
+	<path class="st1" d="M56.2,615.8c-0.2-1.6-1.5-4.2,0.8-4.8c1,0.5,2,1.1,2.9,1.7C59.2,614.4,58.5,617,56.2,615.8z"/>
+	<path class="st1" d="M562.8,615.6c1.3,1.5,5.4,4.2,2.1,5.8C562.7,620.3,562.6,617.8,562.8,615.6z"/>
+	<path class="st1" d="M841.5,624.7c0-2.7,0-5.4,0-8.1c12.1,0.3,24.3,0.1,36.5,0.1c31.6-0.2,63.1,0.3,94.7-0.3
+		c-0.5,13.3,0.2,26.6-0.5,39.8c-0.2,1.6-0.2,3.2,0,4.8c0.9,5.6,0,11.3,0.3,16.9c0.4,13.2-0.7,26.5-3,39.5c-0.4,0.5-1.3,1.5-1.8,2
+		c-0.6,0.1-1.9,0.4-2.6,0.5c1.3-5.6,0.9-11.3,0.9-17c0-17.3,0-34.6,0-52c-0.1-5.4,0.3-10.7,0.8-16.1c-12.9-0.7-25.9-0.1-38.8-0.3
+		c-22,0-44,0-66,0c-4.9,0.3-10-0.6-14.8,0.4c0.3,7.3,1.1,14.6,0.8,21.9c-0.1,19-0.2,38,0.1,57c0,2.5,1.4,5.2,0,7.5
+		c-2.4-3.4-3.9-7.4-4.7-11.5c-2.4-13.9-1.7-28-1.8-42c0.1-14.2,0-28.5,0-42.7c-0.7-0.1-2-0.3-2.7-0.4
+		C839.5,624.9,840.8,624.8,841.5,624.7z"/>
+	<path class="st1" d="M1678.2,617.2c0.7-0.1,2-0.2,2.7-0.2c-0.4,2.1-0.8,4.2-1.3,6.3C1678.2,621.6,1677.7,619.4,1678.2,617.2z"/>
+	<path class="st1" d="M38.1,620.3c1.5-1.2,2.9,1.6,1.6,2.5C38.1,624,36.8,621.2,38.1,620.3z"/>
+	<path class="st1" d="M753.2,620.4c0.9-1.2,3.3,0.2,2.3,1.5C754.5,623.1,752.1,621.8,753.2,620.4z"/>
+	<path class="st1" d="M546.3,624.5c1.3-0.9,3.9,0.6,3.4,2.3C548.3,627.5,545.5,626,546.3,624.5z"/>
+	<path class="st1" d="M1637.3,629.3c1.4-1.2,2.5,1.4,1.3,2.2C1637.1,632.7,1635.9,630.1,1637.3,629.3z"/>
+	<path class="st1" d="M86.3,631.2c2-2,2.9,0.9,2.5,2.6C87.1,634.8,84.1,632.6,86.3,631.2z"/>
+	<path class="st1" d="M50.2,632.4c1.5-1.2,3,1.5,1.6,2.5C50.3,636,48.8,633.4,50.2,632.4z"/>
+	<path class="st1" d="M105,637c-1.9-1.5-1.4-4.1,0.9-4.9c0.6,1.2,0.9,2.5,1.2,3.8C106.6,636.1,105.5,636.7,105,637z"/>
+	<path class="st1" d="M32.3,634.1c2,0.9,3.9,2.2,4.7,4.4c-2.4,1.2-4.7,2.4-7.1,3.5C30.4,639.3,31.2,636.6,32.3,634.1z"/>
+	<path class="st1" d="M63.5,643.2c-0.2-3.3-3.8-7.3-0.5-10C64.8,635.9,68.4,641.5,63.5,643.2z"/>
+	<path class="st1" d="M599.5,636.5c1-0.9,3.9-1.5,3.9,0.6c-3.1,2.9-9,5.7-11.7,0.9C594.2,637.7,597.2,638.1,599.5,636.5z"/>
+	<path class="st1" d="M540.1,641.2c0.9-1.9,1.3-4.8,4-4.8C546,638.7,541.5,639.9,540.1,641.2z"/>
+	<path class="st1" d="M86.2,638.3c2-0.5,1.2,4,0.7,5.4C83.3,645.2,84,639.2,86.2,638.3z"/>
+	<path class="st1" d="M618.2,638c3.9-0.7,0,4.5-1.1,1.2C617.4,638.9,617.9,638.3,618.2,638z"/>
+	<path class="st1" d="M1321.2,641c2-1.9,2.5,1.6,2,3c-0.6,1.6-3.3,2-3.6,0C1319.5,642.7,1320,641.7,1321.2,641z"/>
+	<path class="st1" d="M1520.8,642.6c2.5,0,5.1-0.2,7.7-0.2c0.6,0,1.7,0.2,2.3,0.2c1.4,4.5,1.8,9.2,3.4,13.6c3.2,9.2,5.7,18.6,9,27.8
+		c1.4,5.3,2.5,10.7,3.8,16c1.4,7.4,3.2,15.8-1.3,22.6c-0.7,0.1-2,0.2-2.7,0.2c-1.3-4-1.7-8.1-2.5-12.2c-4.2-16.8-9.8-33.1-14.8-49.6
+		c-9.5-0.9-19.1-0.2-28.7-0.4c-12.3,0.1-24.6-0.2-36.9,0.1c-1.6-0.2-2.2,1.3-2.6,2.5c-6.1,16-12.3,32-18,48.1
+		c-1.5,4-1.8,8.4-3.4,12.3c-3-2.3-4.9-5.9-4.8-9.7c-0.8-8.6,2.3-16.8,5.2-24.8c3.4-8.5,6.3-17.3,9.9-25.7c2-3,3.3-6.4,4-10
+		c1-3.6,1.2-7.7,3.7-10.7c3.6-0.7,7.3-0.3,11,0c4.3,0.6,8.7,0.8,13,0.6c6.3-0.2,12.7,0.5,19-0.6
+		C1504.9,642.2,1512.8,642.7,1520.8,642.6z"/>
+	<path class="st1" d="M1165.7,642.5c25.2-0.1,50.4,0.1,75.6,0c6,20.8,14.1,41,17.9,62.3c0.8,6.2,1.6,13.5-3.1,18.4
+		c-2,0.1-2.6-1.6-2.8-3.2c-0.9-11.7-5.5-22.7-8.5-33.9c-2.6-7.3-4.6-14.7-6.9-22c-0.6-1.3-1.1-3.6-2.9-3.3
+		c-15.7-0.1-31.3-0.1-47-0.1c-6,0.2-12-0.4-17.9,0.3c-3,4.8-4.4,10.5-6.5,15.7c-4.8,14.5-11.8,28.2-15,43.1
+		c-0.5,1.3-0.6,3.3-2.4,3.3c-0.7-0.9-1.3-1.9-1.9-2.8c-1-4.9-1.4-9.9-1.4-14.9c0.5-1.5,0.9-3,1.3-4.5c1.3-10,6.8-18.6,9.9-28.1
+		C1158.1,662.8,1161,652.3,1165.7,642.5z"/>
+	<path class="st1" d="M1653.1,646.7c-1.4-2.6,2.5-2.1,4-2.8C1657.5,646.4,1655,646.5,1653.1,646.7z"/>
+	<path class="st1" d="M628.3,645.2c0.9-1.4,3.8-0.1,2.5,1.4C629.9,648,627.1,646.8,628.3,645.2z"/>
+	<path class="st1" d="M1663.5,647.3c0.6-1,3.1-0.9,2.9,0.5C1665.8,648.7,1663.3,648.7,1663.5,647.3z"/>
+	<path class="st1" d="M60.9,656c0.1-3.9,4.4-5.7,6.4-8.7c1.9,3.9-1.8,7.5-2,11.4C63.7,658.2,61.5,658,60.9,656z"/>
+	<path class="st1" d="M532.9,647.7c2.1,0.8,4,2.1,4.5,4.4c-1.3-0.2-2.5-0.4-3.8-0.7C533.1,650.2,532.8,649,532.9,647.7z"/>
+	<path class="st1" d="M574,653.9c0.3-1.6-0.7-4.6,1.9-3.8c0.8,1.1,0.9,2.6,1.2,3.9C576.4,654,574.8,653.9,574,653.9z"/>
+	<path class="st1" d="M524.7,655.4c0.6-1.7,1.2-3.4,2.2-4.9C530.1,651.2,527.4,656,524.7,655.4z"/>
+	<path class="st1" d="M32.3,656.2c0.6-1.2,2.2-1.6,2.9-0.2c0,2.6-1.4,5-2.5,7.3C30.5,661.4,31.4,658.4,32.3,656.2z"/>
+	<path class="st1" d="M56.5,659.3c1.3-1.6,3.8,0.7,2.1,2.1C57.3,662.8,55,660.6,56.5,659.3z"/>
+	<path class="st1" d="M560.8,663.3c-0.5-1.6-3.1-4.8,0.2-4.6C562.2,660.2,561.7,661.9,560.8,663.3z"/>
+	<path class="st1" d="M585.1,659.2c0.8,0,2.5-0.2,3.4-0.2c-1,2.4-2.6,4.8-5.6,4.3C583.6,661.9,583.6,660,585.1,659.2z"/>
+	<path class="st1" d="M601.3,659.4c0.8-0.9,3.2-1.1,3.5,0.4C604.5,661.8,600,661.6,601.3,659.4z"/>
+	<path class="st1" d="M527.2,663.8c-1.3-0.8-0.7-2.3-0.7-3.5c1.5,0.6,3.1,1.3,4.6,2C530.1,663.3,528.8,664.7,527.2,663.8z"/>
+	<path class="st1" d="M650.5,661.3c2.7-1,1.2,4.6-0.8,3.2C648.9,663.4,649.5,661.9,650.5,661.3z"/>
+	<path class="st1" d="M1692.8,664.9c1.3-2.2,3.7-3.2,5.8-4.3C1699.4,664.1,1695.3,665,1692.8,664.9z"/>
+	<path class="st1" d="M62.4,665.2c0.3-1.6,1.8-4.2,3.5-2.1C66.6,665.4,64.1,666.1,62.4,665.2z"/>
+	<path class="st1" d="M606.7,662.3c3.6-0.7,1.2,4.4-0.7,5c-2,1.4-1.2-1.4-0.8-2.1C605.5,664.2,606,663.2,606.7,662.3z"/>
+	<path class="st1" d="M1662.8,667.1c-1.5-3.3,2.8-4.4,4.5-1.9C1666.1,666.5,1664.8,667.9,1662.8,667.1z"/>
+	<path class="st1" d="M1605.2,665.3c0.9-1.3,3.8,0,2.5,1.5C1606.8,668.1,1604,666.8,1605.2,665.3z"/>
+	<path class="st1" d="M1675,665.3c2.8,0,6.2-0.9,8.3,1.5C1680.4,667.6,1677.6,666.6,1675,665.3z"/>
+	<path class="st1" d="M1630.1,665.8c2.5-0.7,4.8,1.5,6.4,3.2c-2.2,0.1-4.5,0.1-6.7,0.1C1629.8,668.3,1630,666.7,1630.1,665.8z"/>
+	<path class="st1" d="M641.2,666.8c1.7,1.9,3.4,4.4,2.7,7C640.3,673.5,640.8,669.3,641.2,666.8z"/>
+	<path class="st1" d="M551,667.7c3.6-0.6,4.1,3.2,4.3,5.9C552.8,672.7,552.1,669.9,551,667.7z"/>
+	<path class="st1" d="M165.4,672.3c0.6-1.5,1.3-3.5,3.4-3.2c0.1,0.7,0.3,2.2,0.4,2.9C168.2,672.1,166.4,672.2,165.4,672.3z"/>
+	<path class="st1" d="M440.1,677.3c-0.6-1.8-0.4-6.4,2.5-4.9C442.7,674.4,442.2,676.5,440.1,677.3z"/>
+	<path class="st1" d="M1345.4,672.4c0.7-1.2,4.2-0.1,2.6,1.4C1346.7,675.9,1343.2,674.3,1345.4,672.4z"/>
+	<path class="st1" d="M58.3,673.1c1.9-0.7,2.7,2.6,0.7,3C57.2,676.6,56.5,673.5,58.3,673.1z"/>
+	<path class="st1" d="M598.1,674.2c1.6-0.5,2.2,0,1.7,1.7C598.2,676.3,597.6,675.8,598.1,674.2z"/>
+	<path class="st1" d="M632.7,675.2c1.8-0.8,3.6-1.6,5.6-1C636.8,675.6,634.3,677.4,632.7,675.2z"/>
+	<path class="st1" d="M549,678.1c0.8-1.3,1.5-2.7,3-3.2c-0.6,3-1.7,6.3-4.8,7.6c-0.3-0.5-0.8-1.6-1.1-2.2
+		C547.1,679.5,548.1,678.8,549,678.1z"/>
+	<path class="st1" d="M1101.2,675.3c1,0.1,2.1,0.4,3.1,0.8c-1,0.7-1.8,2.5-3.3,1.9C1099.3,678.3,1100.2,675.4,1101.2,675.3z"/>
+	<path class="st1" d="M1639.3,675.3c0.8-1.4,3.3-0.1,2.1,1.3C1640.6,677.9,1638.1,676.7,1639.3,675.3z"/>
+	<path class="st1" d="M1678.7,677.3c1.9-0.8,5.8-1.5,5.4,1.8C1682.2,678.8,1680.3,678.4,1678.7,677.3z"/>
+	<path class="st1" d="M560.3,681.1c0.7-1.5,1.5-3.3,3.4-3.1c0.2,0.8,0.5,2.3,0.7,3C563.4,681.1,561.3,681.1,560.3,681.1z"/>
+	<path class="st1" d="M49.3,683.4c0.9-1,3.1-0.7,3.4,0.7C52.5,686.2,48.1,685.5,49.3,683.4z"/>
+	<path class="st1" d="M1353.3,684.2c1.4-1.2,2.6,1.4,1.2,2.2C1353.1,687.7,1351.9,685,1353.3,684.2z"/>
+	<path class="st1" d="M555.4,684.7c1,1.3,2.3,2.6,2,4.4c-0.8,1.2-2.3,1.4-3.5,2C554.3,688.9,554.8,686.8,555.4,684.7z"/>
+	<path class="st1" d="M177.8,688c0.6-1.4,1.4-2.8,3.3-2.4c0.3,0.6,1,1.8,1.3,2.4C180.8,688,179.3,688,177.8,688z"/>
+	<path class="st1" d="M569.3,687.3c1.4-1.6,3.7,0.7,2,2C569.9,690.9,567.6,688.6,569.3,687.3z"/>
+	<path class="st1" d="M537.1,688c1.4,0,2.8,0.1,4.3,0.1c-1.1,2-3.2,2.4-5.3,2.1C536.3,689.6,536.8,688.5,537.1,688z"/>
+	<path class="st1" d="M55,690.1c0.7,0,2.2,0,3,0c-0.2,2.4-0.1,5.2-1.9,7.1C53.4,696.4,55.1,692.3,55,690.1z"/>
+	<path class="st1" d="M561.3,690.2c1.3-1,2.7,1.4,1.5,2.3C561.5,693.5,560.1,691.1,561.3,690.2z"/>
+	<path class="st1" d="M549.6,694.9c1.1-1.6,3.2-0.9,4.8-1.1C554.3,696.2,550.2,697.5,549.6,694.9z"/>
+	<path class="st1" d="M107.6,697.9c2.1-3.1,6.5-1.9,9.4-0.9c0.6,1.3,0.7,2.7,1,4.1C114.6,700,111.1,699,107.6,697.9z"/>
+	<path class="st1" d="M1674.8,699.8c0.7-1,1.4-2.1,2.1-3.1c0.4,3.2,0.9,6.5,1.5,9.7c-0.8,0.8-1.7,1.5-2.1,2.6
+		c-0.3,2.3,3.7,4.1,1.7,6.3c-2.2-1.8-3.7-4.4-4.6-7.1C1676.8,706.5,1675.8,702.8,1674.8,699.8z"/>
+	<path class="st1" d="M89.8,705.3c1.9-1.8,3.7-3.7,5.3-5.9c1.1,1.1,2.1,2.2,3.2,3.4c-1.5,1.6-3,3.2-4.5,4.8
+		C92.5,706.8,91.2,706.1,89.8,705.3z"/>
+	<path class="st1" d="M71.6,705c1.8-1.1,6.4-1.3,5.2,2C74.7,708.2,72.7,706.9,71.6,705z"/>
+	<path class="st1" d="M1192.4,704.3c1.2-3.1,5,2.8,1.4,2.7C1192,707.7,1191.7,705.4,1192.4,704.3z"/>
+	<path class="st1" d="M53.3,705.3c0.8-0.9,3.2-1.1,3.4,0.5C56.5,707.9,52,707.5,53.3,705.3z"/>
+	<path class="st1" d="M1343.8,711.5c0.5-2.5,0.2-6.6,3.6-6.9C1347.4,707.4,1346.3,710.1,1343.8,711.5z"/>
+	<path class="st1" d="M455.9,706.6c1.3,1.4,3.2,3.4,2.1,5.5C454.6,713.2,455.9,708.4,455.9,706.6z"/>
+	<path class="st1" d="M1680.4,707.4c2-1.1,3,3.2,0.9,3.4C1679.8,710.5,1679.4,708.4,1680.4,707.4z"/>
+	<path class="st1" d="M218.9,712.9c-3-0.7-1-4.2,0.2-5.6C220.1,709,220.7,711.4,218.9,712.9z"/>
+	<path class="st1" d="M98.2,709.2c1.2-1.5,4.4-0.1,2.9,1.8C100.9,713.2,96.7,710.7,98.2,709.2z"/>
+	<path class="st1" d="M1334.8,713.9c-2.9-0.7-0.9-4.5,1.2-5C1335.9,710.5,1336.4,712.7,1334.8,713.9z"/>
+	<path class="st1" d="M1189.2,711.6c1.7-0.2,2.9,3.5,1.1,4C1188.8,715,1188.2,712.8,1189.2,711.6z"/>
+	<path class="st1" d="M1329.2,712.3c1.8,0.2,1.5,3.4-0.2,3.5C1327.2,715.6,1327.5,712.5,1329.2,712.3z"/>
+	<path class="st1" d="M1629.2,715.8c-0.3-1.4,1.4-2.7,2.7-1.9c0.5,1.1,0.9,2.2,1.3,3.3C1631.9,716.9,1630.3,716.8,1629.2,715.8z"/>
+	<path class="st1" d="M71.6,717.1c0.7-1.4,2.1-1.9,3.4-2.5c0,0.9,0.1,2.8,0.1,3.7C73.9,718.1,72.7,717.7,71.6,717.1z"/>
+	<path class="st1" d="M1652.2,717.1c2.4,0.5,5.2,0.6,7.2,2.2c-1.9,0.2-3.8,0.6-5.6,1.2C1653.3,719.4,1652.7,718.2,1652.2,717.1z"/>
+	<path class="st1" d="M60.9,721.1c1.8-0.8,6.5-1.5,5.8,1.7C64.6,724,61.1,724.3,60.9,721.1z"/>
+	<path class="st1" d="M1375.3,720.3c1.4-1.2,3.5,1.1,2.4,2.4C1376.2,724,1374,721.7,1375.3,720.3z"/>
+	<path class="st1" d="M459.2,721.2c1.6-0.6,2.2,0,1.7,1.6C459.2,723.3,458.7,722.8,459.2,721.2z"/>
+	<path class="st1" d="M1678.3,721.3c1.5-1.2,2.9,1.5,1.5,2.4C1678.2,724.9,1676.8,722.2,1678.3,721.3z"/>
+	<path class="st1" d="M86.1,722.1c3.1-0.7,4.7,4.5,1.7,5.8C84.4,729.9,84.3,723.7,86.1,722.1z"/>
+	<path class="st1" d="M208.1,726.7c1.9,0.2,5.8-0.9,5.2,2.3c-1.6,2.2-3.4,4.3-5.4,6.3c-0.4-0.1-1.3-0.2-1.7-0.3
+		C206.9,732.2,207.7,729.5,208.1,726.7z"/>
+	<path class="st1" d="M219.1,727.4c1-0.5,2.3,0.9,2.5,1.8c0.6,1.5-1.6,1.6-2.5,1.7C218,730.1,217.7,727.8,219.1,727.4z"/>
+	<path class="st1" d="M940.5,728.1l0,0.5c0.2,4.6,0.8,9.3,0.9,13.9c3.5,0,7-0.2,10.5-0.7c5.3-0.7,10.6,0,16-0.2
+		c8-0.4,16.1,0.1,24.1-0.7c4.7,0.1,9.3,0.8,14,0.1c5.3,0.8,10.7-0.6,16,0.4c10.1,1.3,20.2,0.8,30.3,1.7l1.2,0.1
+		c0-3.1,0.1-6.2,0.4-9.2c2.2,0.9,5.1,2.1,4.9,5c0.2,6,0.3,12-0.1,18c0,2.8-3.1,4.1-5.5,4.4c-2.6,0.1-5.1-0.7-7.6-1.1
+		c-0.4,1.8,0,4.7-2.8,4c0.1-1.4,0.3-2.8,0.5-4.2c-7.1-0.3-14.3,0.4-21.4-0.5c-10.6-1.6-21.3-0.7-32-0.9c-9.7-0.2-19.4,1.7-29.1,1.4
+		c-7-0.2-14,0.2-21-0.1c-3.2,0.1-4.7-3.2-4.6-5.9c0-5.1-0.3-10.3,0.2-15.4c0.1-2.5,2.5-3.7,4.3-4.9
+		C940.1,731.8,940.3,730,940.5,728.1z"/>
+	<path class="st1" d="M32.2,729.2c2.3-1,5.1-0.9,7.2,0.4c1.2,1.6-1.2,2.4-2.4,2.5c-2.1,0.1-5.3,1.5-6.4-1.1
+		C31,730.6,31.8,729.7,32.2,729.2z"/>
+	<path class="st1" d="M1687.4,730.3c2-1.2,2.9,3.2,0.7,3.3C1686.7,733.4,1686.4,731.2,1687.4,730.3z"/>
+	<path class="st1" d="M94.1,738c0.1-2.1,1.9-3.3,3.6-4.1c0.7,2.8-1,7,1.4,9c9.9,1.1,19.9,0,29.9-0.8c8.4-1,16.9,0.7,25.3-0.6
+		c4.6-0.2,9.2-0.1,13.8,0.4c5.8,0.8,11.7,0.3,17.6,0.7l1.1,0.1c0.1-2.9,0.2-5.8,0.3-8.7c1.8,1,4.4,1.7,4.7,4c0.6,5,0.1,10,0.3,15
+		c-0.2,2.2,0.2,4.8-1.4,6.6c-1.4,0.9-2.9,1.4-4.4,2.1c0.6,1.1,1.2,2.2,1.8,3.4c-2,0.1-3.9-0.3-5.4-1.8c0.7-0.7,1.3-1.3,2-2
+		c-5.8-1.6-11.8-1.2-17.7-1.2c-3.6,0-7.3-1-10.8,0.4c-2.3-1-4.6-1.9-7.1-1.8c-7,0.1-14.1-0.4-21,0.7c-11.1,1.7-22.3-0.1-33.4,1.2
+		C93.5,753.1,93.1,745.5,94.1,738z"/>
+	<path class="st1" d="M317,739c-0.1-2.5,2.3-3.8,4-5.1c0.2,2.9,0.2,5.8,1.3,8.5c0.1,0.2,0.2,0.7,0.3,1c6.7-1.2,13.6-0.5,20.4-1.4
+		c5.3-0.6,10.7-0.5,16-0.6c24.5-0.2,49.1-0.6,73.5,2c0.1-3.2,0.2-6.4,0.2-9.7c2.1,0.8,4.8,1.7,5.1,4.3c0.5,6.3,0.6,12.7,0,19
+		c-0.2,3.4-4,5.2-7,4.4c-4.8-1.3-9.8-1.5-14.8-1.3c-7.7,0.3-15.3-1.6-23-1.4c-15.4,0.2-30.8-0.8-46.1,1.6c-1.4,0.4-2.6,1.1-4,1.6
+		c-1.7-0.5-3.2-1.4-4.7-2.1c0.3,0.6,0.8,1.9,1.1,2.5c-1.2,0.7-2.1,3.2-3.8,2.1c-1.5-1.5,0.5-2.9,1.1-4.3c-4.1-0.2-8.3,0-11.9,2.3
+		c-5.3-0.4-8.4-5-11.6-8.6c-1-0.9-0.9-2.2-0.6-3.4c0.8,1,1.5,2,2.2,3c0.5,0.1,1.4,0.4,1.9,0.5C317.1,748.9,316.6,743.9,317,739z"/>
+	<path class="st1" d="M756.1,737.1c0.5-1.8,2.5-2.2,3.9-3.2c0.2,2.9,0.4,5.9,0.5,8.8l0.8,0.5c0.3,0.2,0.9,0.5,1.1,0.6
+		c9.5-0.8,19.2,0,28.7-1.5c5-0.7,10-0.3,15-0.1c9.8,0.1,19.6,0.2,29.3-0.7c1.4,0,2.8,0.1,4.2,0.1c4.9,2.1,10.3,1.1,15.5,1.6
+		c6.1,0,12.2,0.5,18.3,1.2c0.6-3.4,0.8-6.9,0.8-10.4c1.6,0.9,3.8,1.6,4.1,3.8c0.8,4.3,0.3,8.8,0.5,13.1c-0.2,3,0.4,6.5-1.8,8.9
+		c-2.1,2.1-5.3,1.7-7.9,1.1c-6.6-1.5-13.3-0.8-20-0.9c-7.7,0.3-15.3-1.6-23-1.4c-12.3,0.1-24.8-0.7-37,1c-8,1-16.1-0.6-24,1.4
+		c-2.8,0.7-6.2,0.4-8.4-1.8c-1.8-3.1-1.1-6.9-1.3-10.3C755.5,745,754.8,740.9,756.1,737.1z"/>
+	<path class="st1" d="M1069.8,737.9c0.1-2.1,2.3-2.9,3.8-3.9c0.4,3.2,0.9,6.3,1.3,9.5c5.7,0.4,11.3-0.5,17-0.5
+		c2.9,0,5.9-0.2,8.4-1.7c0.4-0.1,1.2-0.4,1.6-0.5c1.5-0.1,3.1-0.2,4.7-0.1c3.4,0.8,6.8,1.1,10.3,0.7c2.6-0.2,5.2-0.2,7.8,0
+		c3.5,0.3,7,0,10.4-0.5c1.5,0,2.9,0.1,4.4,0.2c4.8,0.2,9.5,1.7,14.4,2.1c3.5,0.3,7,0,10.5-0.3c2-0.2,4-0.2,6.1-0.2l1.2,0
+		c0.1-2.9,0.1-5.8,0.3-8.7c4,1.1,4.9,5.4,4.8,9c-0.1,4.6-0.1,9.2-0.4,13.7c-0.3,3.1-3.7,5.4-6.7,4.8c-5.6-1.2-11.9-2.6-17.4,0.1
+		c-5.1-2.5-10.9-2.3-16.5-2.7c-10.3,0-20.7-0.3-31,0.1c-6,0.7-12,1.6-18,1.2c-4.6-0.5-9.3,2.9-13.7,0.7c-2.8-1.5-3.6-4.8-4-7.7
+		C1068.2,748,1069.2,742.9,1069.8,737.9z"/>
+	<path class="st1" d="M1228.2,738c0.4-2.2,2.7-3.2,4.5-4.1c0.1,3.2,0.2,6.4,0.2,9.6c5.8,0.3,11.6-0.3,17.3-0.6
+		c5.9,0.2,11.9,0.6,17.8-0.5c-3.6-0.3-7.3-0.4-10.9-0.5c-0.4-0.3-1.2-1-1.6-1.3c4.5,0.8,9,1.2,13.6,0.9c7.2-0.3,14.4,0.2,21.5-0.6
+		c1.2-0.1,2.5,0,3.7,0.3c5.5,1.4,11.2,0.7,16.8,1.2c2.2,0.3,4.4-0.2,6.4-1.3c0.5,0.5,1,1,1.5,1.5c1.2-0.1,2.4-0.1,3.6-0.1
+		c3.2-0.1,6.3-0.1,9.5-0.1c-0.1,0.5-0.2,1.5-0.3,2.1c4.5-0.3,9.1,0.2,13.5-1c0.9-2.8,0.6-5.9,0.7-8.8c1.6-0.2,3.2-0.3,4.8-0.5
+		c-0.9,2.7-0.7,5.5,1.6,7.5c-3.7,5-0.2,11.7-2.7,17.2c-0.5,1.1-1.6,1.8-2.8,2c-6.9,0.7-14.1,2-20.7-0.8c-1.2,0.7-2.2,3.3-3.8,2
+		c-0.3-0.5-0.9-1.4-1.2-1.8c-5.8,0.1-11.5-0.8-17.3-1.5c-4.3-0.8-7.4,3.4-11.7,3.3c0.9-1,1.8-2,2.8-3c-11.3-1-22.8-0.2-34,1.2
+		c-7.3,0.2-14.7-0.9-21.9,0.6c-2.4,0.3-4.8,1.2-7.1,0.5c-2-1.2-3.7-2.7-5.7-3.6c0.6-0.9,1.7-1.5,1.6-2.6
+		C1228.3,749.4,1227.4,743.7,1228.2,738z"/>
+	<path class="st1" d="M1358.1,739c-0.2-2.6,2.3-3.8,4.2-4.9c0.5,1,1,2,1.5,3c-0.2,2.4-0.2,4.8,0,7.2c4.7-0.3,9.4-1.3,14.2-1
+		c3.8,0.3,7.7-0.4,11.3-1.7c2.1-0.1,4.2-0.2,6.4-0.3c0.9,0,1.9,0,2.8,0c9.2,0.2,18.5-0.1,27.8,0.2c5.2,0.5,10.4,1.7,15.7,1.6
+		c5.7-0.1,11.5,0.8,17.2,0.3c2.1-2.6,1.2-6.4,1.9-9.4c1.6,1.1,3.8,1.8,4.1,4c0.8,4,0.3,8,0.5,12.1c-0.1,3.1,0.4,6.6-1.3,9.4
+		c-2.2,2.3-5.6,2.6-8.4,1.7c-7.2-1.9-14.6-0.4-21.9-1.5c-10.9-1.6-22-0.7-33-1c-7.4-0.4-14.7,1.7-22.1,1.4c-4.1-0.1-8.2,0-12,1.5
+		c-1,1.6-2.3,2.9-4.1,3.4c0.5-1.2,1.1-2.3,1.6-3.5c-3-0.7-5.5-2.7-6.1-5.8C1357.5,750.2,1357.9,744.5,1358.1,739z"/>
+	<path class="st1" d="M1517.2,738.1c0-2.3,2.1-3.3,3.9-4.2c0.2,2.7,0.2,5.5,0.3,8.2l1.1,0.2c6.8,0.4,14.2,1.4,20.5-1.7
+		c3.1-0.1,6.3-0.2,9.4-0.1c0.3-0.5,0.9-1.5,1.3-2c0.6,0,1.9,0,2.5,0c0,1.1,0,2.3,0.1,3.5c2.3-0.1,4.6-0.3,7-0.5
+		c16.2-0.4,32.5-0.2,48.7,0.2c6.8,1.2,13.7,0.6,20.6,0.8c0-1.8,0-3.5,0-5.3c0.2-0.8,0.8-2.5,1-3.3c1.9,0.8,4.4,1.4,4.7,3.9
+		c1,5.9,0.3,12,0.4,18c0.1,3.1-2.9,4.7-5,6.4c-9.4-4-19.9-1.1-29.8-2.4c-12.6-1.7-25.3-1-38-1c-7.3-0.1-14.6,1.7-21.9,1.3
+		c-6.6-0.3-13.2,0.1-19.7,1.3c-3.1,0.7-6.9-0.9-7.2-4.4C1516.6,750.7,1516.7,744.3,1517.2,738.1z"/>
+	<path class="st1" d="M79.8,735.1c0.8-0.2,2.5-0.5,3.3-0.6c1,1.9,3.3,3.8,2.5,6.2c-1.6,0.8-3.8,1.2-5.1-0.4
+		C79.1,739,79.9,736.8,79.8,735.1z"/>
+	<path class="st1" d="M73.3,737.4c1.3-1.4,3.9,0.6,2.3,2C74.3,740.7,71.8,738.8,73.3,737.4z"/>
+	<path class="st1" d="M193.2,739c-0.1-2.1,2.2-1.3,3.2-0.5c1.2,1.3,0.5,3.1,0.5,4.6C195,742.5,193.2,741.2,193.2,739z"/>
+	<path class="st1" d="M1666.3,743c2.1-0.8,2.4,2.5,0.5,2.8C1664.7,746.5,1664.4,743.3,1666.3,743z"/>
+	<path class="st1" d="M1642.2,745.3c1.3,0,2.1,1.2,1.6,2.4c-1.3,0.5-2.6,0.6-4,0.3C1639.7,746.6,1640.6,745.2,1642.2,745.3z"/>
+	<path class="st1" d="M1682.6,747.2c0.3-2.8,3.3-2.6,5.3-1.9C1689.1,748.4,1684.3,746.9,1682.6,747.2z"/>
+	<path class="st1" d="M1648.1,748.1c1.4-0.8,2.7-1.5,4.1-2.2c0.1,1.2,0.5,2.4,0.3,3.6c-1.1,0.6-2.3,0.9-3.6,1
+		C1648.7,749.9,1648.3,748.7,1648.1,748.1z"/>
+	<path class="st1" d="M1695.5,750.5c-1.1-1.8,1.5-2.5,2.4-3.6c0.4,1.8,0.8,3.5,1.2,5.3C1697.7,752,1695.8,752.2,1695.5,750.5z"/>
+	<path class="st1" d="M54,747.7c1.3,0.7,3.7,2.7,1.8,4c-0.9,1.7-2.7-0.6-2.8-1.6C53.2,749.5,53.7,748.3,54,747.7z"/>
+	<path class="st1" d="M63.3,752.3c1.8-0.6,4.1,0.5,2.5,2.5c-1.8,0.9-7,1.6-6-1.8C61,752.7,62.1,752.4,63.3,752.3z"/>
+	<path class="st1" d="M83.5,753.8c1.5-0.7,3-1.3,4.5-1.8c-0.3,1.7-1.3,3.1-2.7,4.1C84.9,755.5,84,754.4,83.5,753.8z"/>
+	<path class="st1" d="M1662,756.7c2,1.2,2.3,3.3,2,5.5C1661.7,761.1,1661.4,758.9,1662,756.7z"/>
+	<path class="st1" d="M1693.9,761.3c-3.1,0.3-2.8-4.5,0-4.5C1693.9,758.2,1693.9,759.7,1693.9,761.3z"/>
+	<path class="st1" d="M84.1,759.7c1.6,1.4,3,3.1,3.4,5.3c-0.5,2.1-3.8,1.5-4.4-0.2C82.3,763,83.4,761.3,84.1,759.7z"/>
+	<path class="st1" d="M232.2,762.1c1.1-0.9,4.3,1.8,2.5,2.4C233,766.6,229.3,763.3,232.2,762.1z"/>
+	<path class="st1" d="M1173,764.8c0.7-1.2,1-3.2,2.8-2.6c0.6,1.4-0.2,2.7-0.8,4C1174.6,765.8,1173.5,765.1,1173,764.8z"/>
+	<path class="st1" d="M133.9,769.5c2-4.2,6.5-6.3,11-6.6c-1.9,1.4-3.8,2.9-5.3,4.8C137.7,768.3,135.8,768.9,133.9,769.5z"/>
+	<path class="st1" d="M194.2,763.2c1.9-1.1,3.2,1.6,1.9,2.9C194.3,766.7,191.6,764.1,194.2,763.2z"/>
+	<path class="st1" d="M71.2,765.2c0.7-1.8,3.1-1.7,4.2-0.3c0.3,1.7-1.5,2.6-2.4,3.7C72.4,767.5,71.5,766.5,71.2,765.2z"/>
+	<path class="st1" d="M1343.2,764.2c0.6,0.2,1.8,0.6,2.4,0.8c-1.2,1.2-2.9,2.5-4.7,2.1C1340.2,765.5,1342.1,764.7,1343.2,764.2z"/>
+	<path class="st1" d="M1675.9,763.9c2.6,0.4,7.1,2,6.1,5.2C1679.6,768.2,1676.2,766.9,1675.9,763.9z"/>
+	<path class="st1" d="M1360.8,765.8c3.6,0.5,5.3,4.1,4,7.4C1363.1,770.9,1361.6,768.5,1360.8,765.8z"/>
+	<path class="st1" d="M236.1,771.8c0.3-1.8-0.1-6.4,2.9-4.8c0.9,2.2,0.5,4.6-0.6,6.7C237.8,773.2,236.6,772.2,236.1,771.8z"/>
+	<path class="st1" d="M1593.8,767c2.6-0.1,5.2,0.3,7.8,0.9c-0.2,0.7-0.7,2-0.9,2.7C1597.8,771.7,1595.6,768.8,1593.8,767z"/>
+	<path class="st1" d="M212.3,769.3c1.5-1.1,2.8,1.2,2.6,2.5C213.5,774,209.6,770.5,212.3,769.3z"/>
+	<path class="st1" d="M1345.2,769.2c0.7,0,1.9,0,2.6,0c1.1,2.2-2,3.7-3.8,3.9C1343.5,771.7,1343.8,770,1345.2,769.2z"/>
+	<path class="st1" d="M1587.9,769.8c1.2-0.8,2.6-0.3,3.9,0c-1.7,1.3-3.4,3-5.6,3C1584.3,771.7,1587.1,770.4,1587.9,769.8z"/>
+	<path class="st1" d="M1621.6,770.2c1.7-1.3,5.1-2.2,5.7,0.7C1625.3,771.2,1623.4,771.2,1621.6,770.2z"/>
+	<path class="st1" d="M1685,770.1c0.3-1.4,2.8-0.8,2.5,0.6c0,0.9,0,1.9,0,2.8c2.1,2.9,2.4,6.6,1.4,10c-2.4-2.1-1.6-5.5-2.5-8.2
+		C1686,773.5,1684.8,771.9,1685,770.1z"/>
+	<path class="st1" d="M1694.5,772.6c-1-2.5,3.4-5.3,4.7-2.5c-1.6,3.2-2.5,6.7-0.8,10c1.6-1.8,2.6-3.9,3.5-6.1c0.7,3.2,1,6.6,0.8,9.9
+		c-2.5-1.1-5.2-1.7-7.6-3.1C1694.5,778.1,1695.1,775.3,1694.5,772.6z"/>
+	<path class="st1" d="M1256.7,769.9c1.2,2.1,0,4.2-0.9,6.1c-0.9-0.6-3-1.3-1.6-2.6C1254.9,772.2,1255.8,771,1256.7,769.9z"/>
+	<path class="st1" d="M135.2,770.9c1.2,0.5,2.7,0.7,3.1,2.2c0,2-1.8,1.7-3.2,2C135.1,773.6,135.2,772.3,135.2,770.9z"/>
+	<path class="st1" d="M355,774.1c-0.8-2.3,1.4-2.6,3-3.2C357.6,772.7,357.6,775.5,355,774.1z"/>
+	<path class="st1" d="M47.1,777.2c0.8-2,1.9-3.8,3.5-5.3c0.5,0.5,1.5,1.6,2.1,2.1c-1.5,3.8-5,8-9.6,7c0.1-0.6,0.3-1.7,0.5-2.3
+		C44.7,778.2,45.9,777.7,47.1,777.2z"/>
+	<path class="st1" d="M252.8,779.2c-3.2-0.4-4-4.7-1.8-6.7C253.6,773.8,252.8,776.8,252.8,779.2z"/>
+	<path class="st1" d="M193.1,778.4c-2.8-1.5-0.3-4.2,1.9-4.6C194.9,775.3,195.5,778.6,193.1,778.4z"/>
+	<path class="st1" d="M1355.4,778.6c-3.2,0.3-4.6-4.2-1.2-5.1C1355.8,774.5,1354.9,777,1355.4,778.6z"/>
+	<path class="st1" d="M60.1,775.1c2-2.1,3.4,3,0.8,3.2C58.6,779,58.8,775.9,60.1,775.1z"/>
+	<path class="st1" d="M1064.5,775.1c0.9-1.3,3.3,0.1,2.3,1.4C1065.9,777.8,1063.4,776.5,1064.5,775.1z"/>
+	<path class="st1" d="M1153,774.7c2.7,0.2,4.8,2.1,6.2,4.2c-0.6,1.5-1.6,1.8-3.1,1C1154.6,778.6,1153.9,776.6,1153,774.7z"/>
+	<path class="st1" d="M204.2,776.2c2.7-0.4,3.6,2.7,3.8,4.8c-0.8,2.1-4.7,2.6-5.2,0C202.4,779.4,202.4,776.9,204.2,776.2z"/>
+	<path class="st1" d="M1206.1,775.9c1.8-0.3,3.9-0.3,3,2.2C1207.2,779.7,1203.9,778.1,1206.1,775.9z"/>
+	<path class="st1" d="M1649.3,777.2c2.9-1,2.3,3.6,3,5.3C1649.4,782.5,1649.1,779.5,1649.3,777.2z"/>
+	<path class="st1" d="M241.9,778.2c0.7,0.1,2.1,0.3,2.8,0.3c0.1,1.7-0.1,3.5-1.4,4.8C242.3,781.7,241.9,780,241.9,778.2z"/>
+	<path class="st1" d="M351.1,778.1c1.6-0.5,2.2,0,1.7,1.6C351.1,780.3,350.6,779.8,351.1,778.1z"/>
+	<path class="st1" d="M93.4,781.2c1.4-1.9,3.3-3,5.7-2.3c-0.6,1.3-1,2.9-2.2,3.8C95.6,782.5,94.5,781.7,93.4,781.2z"/>
+	<path class="st1" d="M1310.3,779c0.6,0.2,1.8,0.5,2.4,0.6c-0.5,2.3-0.2,5.9-3.5,5.5C1309.5,783,1309.9,781,1310.3,779z"/>
+	<path class="st1" d="M340.3,780c2-0.7,2.7,2.6,0.7,2.9C339.2,783.5,338.5,780.5,340.3,780z"/>
+	<path class="st1" d="M231.1,781.1c0.8,0,2.3,0,3-0.1c-0.1,2.7,0.1,6.5-3.2,7.4C230.7,786,230.8,783.5,231.1,781.1z"/>
+	<path class="st1" d="M69.2,782.3c1.8-0.6,2.8,2.5,0.8,2.9C68.1,785.8,67.2,782.7,69.2,782.3z"/>
+	<path class="st1" d="M220.2,782.3c0.9-1.2,3.3,0.2,2.2,1.5C221.5,785.1,219.1,783.6,220.2,782.3z"/>
+	<path class="st1" d="M126.3,786.8c3.3-1.1,6.5-2.7,9.7-4.2c2.7-0.4,3.6,2.6,5.2,4.1c2.7,1.9,5.9,0.1,8.8,0c1.8,1.1,4.1,2.1,4.8,4.2
+		c-5.4,0-10.9-1.2-16.4,0c-0.2-1.3-0.5-2.6-0.8-3.9c-3.5-0.6-6.7,1.2-9.8,2.4C127.5,788.8,126.7,787.5,126.3,786.8z"/>
+	<path class="st1" d="M30.2,786.7c4.2-0.4,8.4-3.3,12.5-1.2c-0.2,0.9-0.7,2.6-1,3.5c-4.1-1.3-8.4-0.9-12,1.7
+		C29.9,789.3,30.1,788,30.2,786.7z"/>
+	<path class="st1" d="M197.2,790.4c0.3-2,0.2-5.8,3.2-4.9c0.4,1.8-0.2,3.6-0.6,5.4C199.2,790.7,197.9,790.5,197.2,790.4z"/>
+	<path class="st1" d="M1644.3,785.5c1.3-0.6,3-1.2,3.7,0.5c-0.2,2.8-4.1,2.2-4.6-0.1L1644.3,785.5z"/>
+	<path class="st1" d="M113.2,787.7c-1.1-4,5.2-1.1,4.5,1.7C116.3,789.1,113.4,789.8,113.2,787.7z"/>
+	<path class="st1" d="M1162.2,790.9c-2.3-1.7-1.1-5.1,1.7-5.1C1163.7,787.5,1164.3,790.1,1162.2,790.9z"/>
+	<path class="st1" d="M1378.3,786.1c0.4,0,1.3-0.2,1.7-0.2c0.1,3-2.9,5.1-4.2,7.6c-1.1-0.8-1.7-2-1.8-3.4
+		C1375.2,788.6,1376.7,787.3,1378.3,786.1z"/>
+	<path class="st1" d="M75.4,795.6c0.2-3-0.2-6.6,2.4-8.8c2.8,2.5,1.7,5.9,0.8,9C77.6,795.7,76.5,795.6,75.4,795.6z"/>
+	<path class="st1" d="M1139.9,786.9c2.9-1.1,2.6,3.1,2.7,4.9c-0.2,2.5-2.2,0.7-3.1-0.3C1138.6,790.1,1139.2,788.2,1139.9,786.9z"/>
+	<path class="st1" d="M1233.5,786.8c2.1,0,4.7-1,6.1,1.1C1239.1,791.8,1233,790.5,1233.5,786.8z"/>
+	<path class="st1" d="M1603,787.5c1.1-0.3,2.6-0.1,3.4,0.9C1606.3,790.4,1600.9,789.1,1603,787.5z"/>
+	<path class="st1" d="M1696.1,787c1.9,0.4,4.8-0.6,5.3,2c-1.4,0.1-2.9,0.1-4.3,0.2C1696.8,788.7,1696.3,787.5,1696.1,787z"/>
+	<path class="st1" d="M279.9,788.1c0.7,0.1,2,0.3,2.7,0.5c0,0.6,0,1.7,0,2.2C280.4,792.4,279.5,790,279.9,788.1z"/>
+	<path class="st1" d="M1589.1,790.6c0.7-0.8,1.4-1.6,2.2-2.4c1.5,2,3.6,3.5,5.5,5.2c0.2,1.3-0.3,1.9-1.8,1.8
+		C1593,793.8,1591.1,792.1,1589.1,790.6z"/>
+	<path class="st1" d="M1677.2,788.2c0.6,0,1.9,0.1,2.5,0.1c0.3,1.1,0.5,2.2,0.8,3.3c1.5,0.6,3.3,0.9,4.1,2.5
+		C1680.3,795.3,1678.2,791.6,1677.2,788.2z"/>
+	<path class="st1" d="M308.8,794.4c0.2-1.7-0.9-4.8,1.2-5.6C312.5,790,311.7,794.5,308.8,794.4z"/>
+	<path class="st1" d="M48.8,792c-0.4-2.5,2.4-1.8,4-2.2c0,0.8,0,2.4,0,3.2C51.4,792.9,49.6,793.5,48.8,792z"/>
+	<path class="st1" d="M1216,791.3c1-0.5,1.8-1.2,3-1.4c1.2,0.7,2.2,1.5,3.3,2.4c1.9-0.2,3.7-0.6,5.6-0.2c0.3,3.2-3.8,2.8-5.8,3.1
+		C1220.1,793.9,1218.1,792.6,1216,791.3z"/>
+	<path class="st1" d="M1349.9,791.4c1.7-0.5,3.5-1,5.3-1.5c-0.4,1.5-0.8,3-1.2,4.5C1352.3,794,1350.9,792.9,1349.9,791.4z"/>
+	<path class="st1" d="M1650.5,789.9c0.8,0,2.5,0.1,3.3,0.2c0.8,1.4,1.3,2.9,1.9,4.4c2.7,0.8,5.7,1,8.1,2.7c-0.1,0.3-0.3,1-0.4,1.4
+		c-2.4,0.1-4.8-0.4-7.1-0.7C1654.3,795.2,1652.1,792.8,1650.5,789.9z"/>
+	<path class="st1" d="M1660.1,790.1c0.7-0.1,2.2-0.2,2.9-0.3c0.2,0.5,0.6,1.5,0.8,2.1c-1.3,0.4-2.5,0.8-3.7,1.2
+		C1660.1,792.3,1660.1,790.8,1660.1,790.1z"/>
+	<path class="st1" d="M61.3,792c1.8-0.6,2.3,2.4,0.6,2.8C60.1,795.2,59.6,792.4,61.3,792z"/>
+	<path class="st1" d="M130.7,793.3c2.5-0.5,5-0.8,7.5-1C138.6,797,132.4,796.5,130.7,793.3z"/>
+	<path class="st1" d="M1153.2,792.2c1.6-0.3,3.4-0.5,3.1,1.7C1155.6,796.8,1151.4,794.4,1153.2,792.2z"/>
+	<path class="st1" d="M1696.8,795.7c2.1-1.4,4.2-2.8,6.4-4.1l-0.1,0.8c-2.4,2.3-2,5.6-1.5,8.6
+		C1700.1,799.1,1698.4,797.4,1696.8,795.7z"/>
+	<path class="st1" d="M106.5,793.2c1.4-1.6,3.7,0.9,2.1,2.2C107.3,796.7,105.2,794.5,106.5,793.2z"/>
+	<path class="st1" d="M1200.5,793.1c0.8-1,3,0.1,2.3,1.4C1202,795.4,1199.8,794.3,1200.5,793.1z"/>
+	<path class="st1" d="M1191.9,797.1c-0.7-2.9,2.6-2.9,4.5-3.4C1195.3,795.2,1194.4,798.1,1191.9,797.1z"/>
+	<path class="st1" d="M1340,793.5c2.2,1.8,4.3,3.7,6.2,5.8c-2.2-0.1-4.3-0.5-6.3-1.1C1339.8,796.6,1339.9,795,1340,793.5z"/>
+	<path class="st1" d="M1669,794.9c1.7-0.5,3.4-1.5,5.2-0.9C1674.6,796.9,1670.2,796.6,1669,794.9z"/>
+	<path class="st1" d="M1224.9,796.1c1.8,0.9,3.6,1.9,4.3,4C1226.6,800.2,1225.5,798.2,1224.9,796.1z"/>
+	<path class="st1" d="M97.3,797.3c1.9-0.6,3.4,1.2,5,2c-1.3,2-4,2.8-6.1,1.5C95.4,799.6,95.6,797.5,97.3,797.3z"/>
+	<path class="st1" d="M1158.9,797c0.8-0.1,2.3-0.2,3.1-0.3c-0.1,0.8-0.2,2.5-0.2,3.4C1160.3,799.5,1158.2,799.2,1158.9,797z"/>
+	<path class="st1" d="M1306.4,797.5c2.6,1.2-2.3,4.5-2.9,2C1304,798.3,1305.3,797.6,1306.4,797.5z"/>
+	<path class="st1" d="M1585.7,801c1.4-2.8,4.6-4,7.6-4C1591.8,799.7,1588.6,801,1585.7,801z"/>
+	<path class="st1" d="M1606.1,800.1c2.3-1,4.4-2.8,7-3.2c0.1,2.7-2.5,4.6-3.9,6.8C1608.2,802.5,1607.1,801.3,1606.1,800.1z"/>
+	<path class="st1" d="M1640.6,801.3c-0.3-3.6,3.5-5,6.6-4.5C1647.1,800,1642.8,800.1,1640.6,801.3z"/>
+	<path class="st1" d="M30.3,799.4c2-0.4,3.9-0.9,5.9-1.1c4.3,0.1,5.6,9,0.2,8.3c-1.6-1.9-3.3-3.8-5.8-4.5
+		C30.5,801.2,30.4,800.3,30.3,799.4z"/>
+	<path class="st1" d="M52.6,799.1c2.4-1.9,5.3-0.8,7.4,1.1C57.7,802,54.1,801.8,52.6,799.1z"/>
+	<path class="st1" d="M118.2,798.3c1.7,0.3,1.5,3.4-0.2,3.6C116.2,801.7,116.5,798.6,118.2,798.3z"/>
+	<path class="st1" d="M199.9,807.1c-3.5-2.2-0.1-7.1,2.1-9.2C201.8,800.9,202.1,804.6,199.9,807.1z"/>
+	<path class="st1" d="M180.7,806.6c-0.1-3,0.4-6.1,2.4-8.5C185.2,801,184.4,805.6,180.7,806.6z"/>
+	<path class="st1" d="M1189.2,799.4c0.9-1.1,3.4,0.1,2.4,1.5C1190.6,802,1188.1,800.8,1189.2,799.4z"/>
+	<path class="st1" d="M1242.3,799.3c1.2-1.2,3.3,0.8,2.1,2.1C1243.2,802.6,1241.1,800.5,1242.3,799.3z"/>
+	<path class="st1" d="M1621.3,800.1c1.9-0.7,2.8,2.6,0.8,3C1620.2,803.5,1619.4,800.5,1621.3,800.1z"/>
+	<path class="st1" d="M229.2,801.4c1.8-0.5,2.8,3.4,0.8,3.7C227.7,806.4,226.9,801.8,229.2,801.4z"/>
+	<path class="st1" d="M1632.1,800.8c1.2,0.4,3.5-0.5,4,1.2c-0.7,1.8-2.5,2.5-4.1,3.4C1632.1,803.9,1632.1,802.3,1632.1,800.8z"/>
+	<path class="st1" d="M371.5,802.8c1.8-0.1,3.9-1,5.4,0.2c0.5,2-0.3,3.9-0.8,5.8C373.9,807.4,371.5,805.8,371.5,802.8z"/>
+	<path class="st1" d="M1282.5,806.3c1-1.9,2.5-3.4,4.7-3.8C1287.4,805.4,1285.2,806.7,1282.5,806.3z"/>
+	<path class="st1" d="M1330.7,802.6c1.5,0.5,3,1.1,4.5,1.7C1333.7,806.8,1330,805.8,1330.7,802.6z"/>
+	<path class="st1" d="M1695.4,810.6c-3.1-3.1,1.2-5.9,3.4-7.8c1.2,1.5-0.2,3.2-0.6,4.7c1.7,0,3.5,0,5.2,0.1c0,0.6,0,1.9,0,2.5
+		C1700.8,810.5,1698.1,811,1695.4,810.6z"/>
+	<path class="st1" d="M1051.3,804.1c1.9-0.7,2.8,2.5,0.8,2.9C1050.2,807.5,1049.3,804.5,1051.3,804.1z"/>
+	<path class="st1" d="M1224.2,804.2c0.9-1.4,3.7,0,2.5,1.6C1225.7,807.1,1223,805.7,1224.2,804.2z"/>
+	<path class="st1" d="M66.2,810.6c-1.5-3,1.2-5.1,3.9-5.6c1.6,1.4,2.3,3.5,3.3,5.3C71,810.4,68.6,810.5,66.2,810.6z"/>
+	<path class="st1" d="M1129.3,807.7c-0.8-1.4,1.3-2.5,1.8-3.7c0.3,0.5,0.8,1.6,1.1,2.1C1133.5,807.8,1129.7,809.9,1129.3,807.7z"/>
+	<path class="st1" d="M1244,804.8c3.1-1.1,2.9,4.5-0.1,3.8C1242.1,807.8,1243.3,805.8,1244,804.8z"/>
+	<path class="st1" d="M1292.1,804.8c2.6,0.2,2.5,3.5,2.9,5.4C1292.7,809.5,1290.9,807.3,1292.1,804.8z"/>
+	<path class="st1" d="M413.9,810.2c-1.7-1.3,0-3.7,1-4.8c0.7,0.8,1.5,1.6,2.2,2.5C416.1,808.6,415,809.5,413.9,810.2z"/>
+	<path class="st1" d="M1099.7,811.4c0.5-1.8,1.3-3.6,2.2-5.3C1104.3,808.3,1102.8,811.5,1099.7,811.4z"/>
+	<path class="st1" d="M1219.7,808.5c2.7,0.2,6.7-2.7,8.5,0.1C1225.4,808.8,1222,810.8,1219.7,808.5z"/>
+	<path class="st1" d="M1619.2,807.5c1.5-1.2,2.9,4.4,0.7,3.4C1618.2,811,1617.6,808,1619.2,807.5z"/>
+	<path class="st1" d="M1189.2,808.3c1.4-1.5,5.2,2.5,2.5,3.2C1189.9,813.1,1187.3,809.2,1189.2,808.3z"/>
+	<path class="st1" d="M1363.5,808.1c0.9-0.9,3-0.5,3.4,0.8C1366.6,810.8,1362.8,809.8,1363.5,808.1z"/>
+	<path class="st1" d="M1327.2,809.2c1.6-0.5,2.2,0,1.6,1.7C1327.2,811.4,1326.6,810.8,1327.2,809.2z"/>
+	<path class="st1" d="M79.9,809.7c2,0.2,4.5,0.1,5.5,2.3c-1.2,2.8-4.3,0.4-6.3,0C79.3,811.4,79.7,810.2,79.9,809.7z"/>
+	<path class="st1" d="M1685.5,810.2c1.5,0.1,3.1,0.2,4.6,0.7c1.1,3.4-3.2,2.2-5.1,2.1C1685.1,812.3,1685.4,810.9,1685.5,810.2z"/>
+	<path class="st1" d="M266,811.9c3-0.9,6.1-0.4,9.2-0.1c-0.2,1.3-0.4,2.7-0.6,4C271.5,815.1,268.4,814.1,266,811.9z"/>
+	<path class="st1" d="M284,811.8c2.4-1.5,4.7,0.5,6.2,2.2c0.7,2.2-1.6,2.4-3,3.1C286.1,815.4,285,813.6,284,811.8z"/>
+	<path class="st1" d="M1318.2,816.1c-3.5,2.6-7.1-2.7-5.5-5.9C1315,811.6,1316.7,813.8,1318.2,816.1z"/>
+	<path class="st1" d="M1629.2,811.2c1.6-0.6,2.2,0,1.7,1.6C1629.2,813.4,1628.7,812.8,1629.2,811.2z"/>
+	<path class="st1" d="M1673.6,814.1c0.2-3.3,3.8-0.9,5.7-0.9C1678.6,815.9,1675.2,815.6,1673.6,814.1z"/>
+	<path class="st1" d="M262,816c-0.7-2.4,1.9-2.9,3.6-2.4C264.8,815,264.1,817.2,262,816z"/>
+	<path class="st1" d="M1216.2,813.6c0.9-0.8,2.6,0,2.8,1.2C1218.6,816.7,1215.2,815.2,1216.2,813.6z"/>
+	<path class="st1" d="M1259.2,813.2c2.3-0.1,1,3,0.8,4.2C1257.6,817.1,1257.7,814.5,1259.2,813.2z"/>
+	<path class="st1" d="M1644.5,813.1c0.9-1.2,3.4,0.2,2.3,1.5C1645.9,815.7,1643.5,814.4,1644.5,813.1z"/>
+	<path class="st1" d="M1231.7,813.7c3.3-0.9,5.5,1.8,7,4.3c-0.6,0.2-1.9,0.6-2.5,0.8C1234.4,817.4,1232.8,815.7,1231.7,813.7z"/>
+	<path class="st1" d="M30.2,814.8c1.7,0,3.5,0,5.2,0.1c0,2.1,0.2,4.2,1.2,6c-2.1-1.1-4.3-2.1-6.4-3.1
+		C30.1,817.1,30.2,815.6,30.2,814.8z"/>
+	<path class="st1" d="M41.8,820.1c-0.3-2.2,0.2-4,2.1-5.3c0.6,1.7,1.1,3.5,1.6,5.3C44.5,820.1,42.7,820.1,41.8,820.1z"/>
+	<path class="st1" d="M109.7,816c2.3-3.9,5.7,1.1,5.4,3.9C113.2,818.8,111.1,817.8,109.7,816z"/>
+	<path class="st1" d="M1167.7,814.6c2.1,0.8,4.2,3.3,2.1,5.4C1168.2,818.7,1167.9,816.6,1167.7,814.6z"/>
+	<path class="st1" d="M1288.7,817.8c1.2-1.3,2.5-2.4,4.2-2.6c1,0.9,0.4,2.2,0.3,3.3C1291.7,818.2,1290.2,818,1288.7,817.8z"/>
+	<path class="st1" d="M59.4,820.4c0.5-1.7,0.7-5.3,3.4-4.3c0.2,1.2,0.2,2.5,0,3.7C62,821,60.5,820.4,59.4,820.4z"/>
+	<path class="st1" d="M318.7,821.4c0.2-2-0.8-5.8,2.3-5.6C322.6,818,321.4,821,318.7,821.4z"/>
+	<path class="st1" d="M1301.4,816.5c2.3-0.7,1.2,4.2-0.7,3.2C1299.9,818.7,1300.5,817.2,1301.4,816.5z"/>
+	<path class="st1" d="M1341.5,821.2c-1.2-2.3-0.1-4.7,1.8-6.2C1344.5,817.3,1342.7,819.3,1341.5,821.2z"/>
+	<path class="st1" d="M1350.9,820.2c0.1-1.6-0.2-4,2-4.2c0.3,0.5,1,1.5,1.3,2C1353.9,819.5,1352,819.4,1350.9,820.2z"/>
+	<path class="st1" d="M1229.3,817.2c2,0.3,2.3,2.3,3,3.9c-1.4-0.4-2.8-0.7-4.2-1.2C1227.9,818.7,1228.2,817.8,1229.3,817.2z"/>
+</g>
+<g id="Text">
+	<path class="st2" d="M317.5,0h30.9c-1.3,2.4-6,5.3-3.4,8.1c2-0.5,2.5-3,4.5-3.6c0.2-1.5,0.2-3,0.3-4.5H364
+		c3.8,2.3,8.4,2.2,12.6,1.6c-0.1-0.4-0.3-1.2-0.4-1.6h47.1c0.1,0.5,0.3,1.5,0.4,2c0.6,0.1,1.6,0.4,2.2,0.5c-0.1-0.6-0.3-1.9-0.4-2.6
+		h31.4c-0.8,3,3.8,3,3,0h801.8c0,0.4-0.1,1.3-0.2,1.7c2.2-0.6,4.5-1.2,6.8-1.7c0.1,0.4,0.3,1.2,0.4,1.6l-0.2-1.4
+		c1.3-0.1,2.6-0.1,3.9-0.2h88c-2.3,0.9-4.6,2.3-4.3,5.1c1-0.6,2-1.1,3-1.7c0.6-0.1,1.7-0.2,2.3-0.2c0-0.7-0.1-2.2-0.1-2.9l0.9-0.2
+		h40.2c2.5,1.9,5.1,3.6,7.9,5.1c-2,1.7-4.2,2.8-6.7,1.2c-1.3,1.4-2.6,2.9-3.8,4.3c1.2-0.1,2.4-0.1,3.6-0.2c0.5,0.8,0.9,1.6,1.4,2.4
+		c-0.1,1.2-0.2,2.5-0.2,3.7c0.7,0,2.2-0.1,3-0.2c0.5,1.4,1.1,2.8,1.6,4.3c-1.7-0.1-3.4-0.1-5.1-0.2c-0.8-1-1.6-1.9-2.3-2.9
+		c-1.4,0-2.9,0-4.3,0c0,1,0.1,2,0.1,3c0.8,0,2.4-0.1,3.2-0.1c0,1.8,0,3.7,0,5.5c0.4-0.1,1.2-0.4,1.6-0.5c0.3-0.5,1.1-1.6,1.4-2.1
+		c0.7,0,2.1,0.1,2.8,0.1c1.7-2.1,4.2-2.2,6.7-2.1c1-0.7,2-1.5,3-2.2c-0.2,39.5,0,79,0,118.5c-1.6-0.5-3.2-1-4.7-1.5
+		c-0.4,1.5-0.8,3-1.2,4.6c2-0.1,3.9-0.2,5.9-0.3c0.1,9.1-0.2,18.3,0,27.4c-0.5-0.3-1.4-0.9-1.9-1.2c-0.9,0.5-1.7,0.9-2.5,1.4
+		c0,0.8,0.1,1.6,0.2,2.4c1.4-0.1,2.8-0.1,4.3-0.1c-0.3,12,0.1,24.1,0,36.2c-1.8-0.5-3.4-1.6-3.9-3.5c-0.5,0.9-1,1.8-1.5,2.7l1.6-0.1
+		c0.9,1.6,2.2,2.8,3.8,3.8c-0.1,8.3,0.1,16.5-0.1,24.8c105.7,0,211.4-0.1,317.1-0.1v308.7c-1.2-0.1-2.3-0.1-3.5-0.2
+		c0,0.5-0.1,1.5-0.1,1.9c0.8,0,2.4,0,3.3,0c0.1,0.4,0.2,1.2,0.3,1.5v42.2c-1.9-0.9-3.5-2.2-4.8-3.7c-0.8,0-1.6,0.1-2.4,0.2
+		c-0.2,0.9-0.3,1.8-0.5,2.7c2.6,0.4,5.1,0.9,7.7,1.4v87.8c-1.5-0.1-3-0.2-4.4-0.3c-0.3,0.5-0.9,1.6-1.3,2.2c-0.8,0-1.7-0.1-2.5-0.1
+		c-0.3-2.1-0.7-4.2-1.9-5.9c-2.2,3.4-0.4,7.3-0.2,11c-1.6,1.3-3.1,2.7-4.7,4c1.3,0.1,2.7,0.2,4,0.4c0.6-0.6,1.2-1.2,1.8-1.8
+		c-1,2.4-2,4.7-2.8,7.1c4.1-0.5,5.7-4.6,7.8-7.4c-1.3-0.5-2.6-1-3.8-1.5c0.8-0.9,1.5-1.8,2.3-2.6c1.8-0.1,3.7-0.1,5.6-0.1v4.8
+		c-0.4,0.2-1.1,0.6-1.5,0.8c0.4,0.2,1.1,0.6,1.5,0.8v4.9c-1.9-1.9-4.4-0.7-6.6-0.1c0,0.5-0.1,1.6-0.1,2.1c0.7,0,2,0.1,2.7,0.1
+		c0.6-0.6,1.2-1.1,1.8-1.7c0.6,0.2,1.6,0.7,2.2,0.9v33.5c-0.6,0.2-1.9,0.6-2.5,0.8c0.6,0.2,1.9,0.7,2.5,1v20.3
+		c-1.7,0-3.4-0.1-5.1-0.1c-0.8,3.4,3.1,2.8,5.1,3.2v6.2c-1.3-0.5-2.6-1-3.8-1.4c-3.1,2.6-7.2,3.8-11.1,2.7c-2,0.1-4,0.3-6,0.5
+		c0.4,2.2,0.9,4.4,1.5,6.6c1.8-1.7,3.7-3.4,5.5-5.1c0.9,0.8,1.8,1.6,2.7,2.4c0.9,0,1.7,0.1,2.6,0.1c0.3-0.5,0.9-1.4,1.2-1.9
+		c2.1-1.1,4-2.3,6-3.7c0,1.3,0,2.6,0.2,4c0.3,0.4,1,1.1,1.4,1.5v14.5c-0.8-0.9-1.7-1.8-2.5-2.7c0.1-3.5,0.1-7,0.1-10.5
+		c-0.8,0.6-1.6,1.2-2.3,1.8c-0.4,0-1.2,0-1.6,0c-0.3-0.3-1-0.9-1.4-1.2c-1.3,1.4-2.8,2.6-4.3,3.8c-0.7-1.5-1.4-2.9-2.1-4.4
+		c-1.4,1.6-2.2,3.5-2.6,5.5c1.2,0,2.3,0.1,3.5,0.2c-0.5,2.6,0.4,5.8-1.4,8c-1.3,0-2.7,0-4,0c0,1.7,0,3.4,0,5.1
+		c0.6,0.3,1.7,0.9,2.3,1.1c-0.1,1.2-0.2,2.5-0.3,3.7c1.7,0.1,3.4,0.2,5.2,0.2c-0.1-0.8-0.1-2.4-0.2-3.2c0.9,0,2.8,0,3.7,0
+		c-0.8,1.8-1.9,3.4-3.2,4.8c2.5,0.3,5,1,7.3,1.9c-2.1,0.6-4.2,1.2-6.3,1.4c-1.9-2.1-4.6-2.2-7.2-2.2c-0.7-1.3-1.3-2.5-2-3.8
+		c-0.7,2.2-1.2,4.4-1.6,6.7c2.8,2.6,5.7,5.2,7.9,8.5c2-3.3,4.6-6.3,8.2-7.8c0.1,1.5,0.2,3,0.3,4.6c-1.3,0.4-2.7,0.8-4,1.2
+		c-0.5,2.6-1.8,5.5-0.3,8c0.9,1.9,3.3,1.8,5.1,2.4c-0.9-1-1.9-2-2.8-3c-0.1-1.2-0.3-2.5-0.4-3.7c1.6,0,3.3,0.1,4.9,0.2
+		c0.6-1,1.2-2,1.8-3v21.3c-0.7-1.5-2.7-1.8-4-1.1c-0.4,1.5-0.4,3.1-0.5,4.7c1.5-0.1,3-0.2,4.5-0.3v9.3c-0.6-1.7-1.2-3.4-1.8-5.1
+		c-0.9,0-1.8,0.1-2.7,0.1c0,1.4,0,2.8,0.1,4.3c-0.9-0.1-2.6-0.3-3.5-0.4c-1.2-0.3-2.4-0.5-3.6-0.8c0.8,0.3,2.3,0.9,3,1.2
+		c0,2.9,0.4,6-1.4,8.6c-1.2-2.4-2.1-4.8-2.9-7.3c-2.7,0.5-5.4,1-8,1.4c0.1,0.4,0.2,1.3,0.3,1.8c2.2,0,4.5,0,6.8,0.1
+		c0.8,1.7,1.7,3.5,2.6,5.2c2.1-0.5,4.1-1,6.2-1.5c0.6,1.6,1.3,3.2,1.9,4.8c1-1.7,2-3.4,3-5.2c-1.5-0.5-3-1-4.4-1.5
+		c-0.1-1.3-0.1-2.6-0.1-3.9c1.5,0.1,3,0.2,4.5,0.3V851h-18.7c-0.8-0.1-2.5-0.4-3.3-0.5c-0.2-4,3.9-5.4,6.9-6.8
+		c-4.4-0.4-10.5,1.7-13.1-3c-0.2,0-0.6,0-0.8,0c-0.9,1.1-1.8,2.2-2.6,3.2c0.5,1.6,1,3.1,1.6,4.7c-0.8-0.1-2.5-0.2-3.4-0.2
+		c-0.4,0.6-1.1,1.9-1.5,2.6h-24.4c-2.1-1.6-4.1-3.4-6.1-5.2c-0.4,1.7-0.9,3.4-1.3,5.2h-10.6c3.2-1.2,2-4.7,0.4-6.7
+		c-0.4,1.8-0.6,3.7-1.2,5.5c-0.8,0.3-2.5,0.9-3.3,1.2c0-1.9-0.1-3.8-0.1-5.7c-1.4,0.3-2.8,0.7-4.1,1.1c0.3,1.5,0.7,3.1,1.1,4.7
+		h-20.9c2.2-1.1,4.7-1.6,7.2-1.6c-0.1-1-0.1-2-0.2-3c-1.8,0.6-3.7,1.1-5.5,1.6c-1.4-4.6,1.6-8.7,2.8-12.9c-0.8-1-1.6-2-2.3-3
+		c0.5-2.6,2.2-4.7,3.4-6.9c2.1,0.1,4.3,0.4,6.4,1c0.8-1,1.6-2,2.5-2.8c2.4,0.5,4.1,2.6,5.9,4.1c0.7,0,2.1,0,2.8-0.1c0,1,0,2,0,3
+		c-1.6,0.1-3.2,0.1-4.7,0.3c-0.1,1-0.4,3-0.6,4c2.3-0.5,4.7-1,7.1-1.5c0.1-1.2,0.3-2.4,0.5-3.6c3.5,1.7,3,6,3.8,9.2
+		c1.7-0.8,3.4-1.5,5.1-2.3c-0.1-1.2-0.1-2.4-0.2-3.5c-1.5,0.6-3,1.3-4.4,2c0.5-2,1.1-3.9,1.6-5.8c-2.3-0.8-3.9-2.5-5.4-4.3
+		c-1.8-0.7-5.6-0.3-5.2-3.2c3.2-1.5,7.3,0,10.8-0.3c-0.9,0.6-1.8,1.3-2.6,1.9c2,0.8,4.1,1.3,6.3,1.7c0.3-1.2,0.6-2.5,1-3.7
+		c1,0,3.1,0.1,4.1,0.1c-0.2,3-0.3,6-0.2,9.1c-0.3,0.3-0.9,1-1.2,1.3c0,0.7,0.1,2.2,0.2,3c0.8-0.1,1.6-0.2,2.5-0.2
+		c1.8-1.9,3.7-3.6,5.8-5.1c2.5,1.5,5.3,1.1,7.9,0.1c0-2.2,0-4.4,0.1-6.6c-1.1-0.6-2.1-1.2-3.1-1.8c1.9-0.1,3.9-0.2,5.9-0.3
+		c0.1,0.6,0.3,1.8,0.4,2.3c1.1,2.2,2.3,4.5,2.7,7.1c0,2-0.8,3.8-1.3,5.7c1.4-0.5,2.9-1.1,4.4-1.6c0-1.3,0-2.7,0.1-4
+		c-0.5-0.3-1.6-0.9-2.1-1.1c0-0.9,0-2.7,0-3.6c1-0.8,2.1-1.5,3.2-2.2c-0.1-0.7-0.3-2-0.3-2.7c3.5,0,6.9,0,10.4,0
+		c0.5-3.5,0.7-7.1,0.7-10.7c0-0.6,0-1.9,0-2.5c0.2-2-1.2-5.4,2-5.5c0.1-0.7,0.2-2.2,0.2-2.9c0.7,1.1,1.5,2.3,2.3,3.4
+		c0.8-0.1,1.6-0.2,2.4-0.3c0.1-0.9,0.2-1.7,0.2-2.6c-2.4-1.3-2.4-3.9-2.3-6.3c-0.4-0.1-1.2-0.2-1.6-0.3c-0.8,2.1-1.2,4.8-4,4.8
+		c0.1-1.9,0.3-3.8,0.5-5.7l0.1-0.8c0-1.8,0-3.5,0-5.2c1.4,0.1,2.8,0.1,4.2,0.2c0-0.9,0.1-1.8,0.2-2.7c-1.3-0.9-3.6-0.9-3.8-2.8
+		c0.7-2.6,4.4-1.2,6.5-1.7c0-1.4,0-2.7,0-4c0.9,0.1,2.6,0.3,3.5,0.4c-0.1-0.5-0.3-1.6-0.4-2.1c-0.5-0.4-1.5-1.1-2-1.4
+		c-0.1-1.2-0.1-2.5-0.1-3.7c-1,0-2.1-0.1-3.1-0.1c-0.4,0.3-1.1,0.9-1.5,1.2c-0.8-0.1-1.6-0.2-2.4-0.3c-0.3,1.5-0.6,3-0.8,4.6
+		c-0.2-2.5-0.3-5-0.4-7.5c1.2,0.4,2.4,1.2,3.8,0.9c0.6-1.4,0.4-2.9,0.7-4.3c-1.1,0.5-3.4,1.6-4.5,2.1c-0.4-3.1-0.7-6.2-0.7-9.2
+		c2.2-0.2,4.1-1,4.9-3.3c-1.4,0-2.8,0-4.1,0c-0.2-3.7-0.5-7.4-0.5-11.1c2.1,1.3,4.4,1.1,6.6,0.2c-0.1-0.8-0.2-2.5-0.2-3.3
+		c1.8,0,3.6,0.1,5.4,0.1c-0.1,2-0.2,4.1-0.3,6.1c-0.6,0-1.9,0.1-2.5,0.2c-0.6,1.6-1.2,3.2-1.7,4.8c1.2,0.5,2.5,0.9,3.7,1.4
+		c-0.5,1.1-1.1,2.3-1.6,3.5c1.4,1.1,2.8,2.1,4.3,3.1c2.5-0.5,5.1,0,7.6-0.1c1.9-0.5,3.3-2.1,4.9-3.2c-1.6-1.1-3.4-1.8-5.2-2.2
+		c-0.8,1.3-1.7,2.7-2.5,4c-2.6-0.6-5.2-1.5-7.6-2.7c0.8-1.3,1.6-2.6,2.4-4c0.8,0.1,2.5,0.2,3.4,0.2c0.3-3.4-0.4-6.7-2.1-9.6
+		c0-1,0-3.1,0-4.1c4,0.8,3.7,5.6,5.1,8.7c0.5,0,1.5,0,2,0c0-2.1,0-4.3,0-6.4c1.3,0.3,2.6,0.7,3.9,1.1c0.5,1.7,1.1,3.3,1.6,5
+		c0.2-1,0.5-2,0.7-3c-0.9-1.6-1.8-3.2-2.7-4.8c-0.7,0-1.5,0.1-2.1,0.1c-1.3,1.1-2.6,2.1-4.3,2.3c-0.7-1.5-1.3-2.9-1.8-4.4
+		c0.9,0,2.7,0.1,3.6,0.1c0.4-0.8,1.1-2.3,1.5-3c-1.3,0-2.6,0-3.8,0c-2.5,3.2-5.8,7.2-10.3,5.9c-0.2-1.4-0.4-2.8-0.5-4.2
+		c-0.4,0.1-1.1,0.3-1.5,0.4c-1.1,2.7-3,5-5.9,5.8c-0.1-9.4,0.4-18.7,0.4-28.1c3.3-0.5,7-1.8,10.2,0c-0.2,0.4-0.5,1.1-0.7,1.5
+		c-1.2,1-2.8,0.6-4.2,0.7c-0.4,1.3-0.8,2.6-1.2,3.9c-1.2,0.8-2.3,1.7-3.4,2.6c0.2,1.5,0.5,2.9,0.8,4.4c1.9-4,4.6-7.6,8.8-9.3
+		c0.5-2.1,0.8-4.2,1.2-6.2c-3.9,0-7.7-1-11.6-1.4c0.6-6.6-1.1-13.2,0.5-19.7c0.3,0.9,0.8,2.7,1,3.6c0.8-0.5,2.5-1.3,3.4-1.8
+		c-0.8-1-1.5-2-2.2-2.9c-0.4-1.1-0.8-2.1-1.2-3.1c-0.6,1-0.9,2-1.3,3c0.4-6.4-1-12.9-0.2-19.3c0.5-4.1-0.2-8.1-0.5-12.2
+		c2.7,2.3,5.4,5.3,9.3,4.6c-2.7-2.5-5.9-4.2-8.8-6.4c-0.8-2.6-0.4-5.4-0.5-8.1c0.2-5.7-0.3-11.3,0.3-17c1-7-0.7-14.1,0-21.2
+		c0.2-1.3,1.5-2,2.3-2.9c0.2-0.8,0.4-1.7,0.6-2.5c-0.8,0.1-2.4,0.3-3.2,0.4c0.5-3.3,0.6-6.7,0-10c1.5-0.6,3-1.2,4.5-1.8
+		c-1.5-0.6-3-1.1-4.5-1.7c1.1-8.7-0.7-17.5,0.1-26.2c0.9-7-0.4-14-0.1-21.1c0-46,0-91.9,0-137.9c-0.3-9.4,0.6-18.7,0-28.1
+		c-0.1-15.9,0-31.9-0.1-47.8c1.7,1.3,3.4,2.6,5.4,3.5c0-0.9,0.1-1.8,0.1-2.6c-1.8-0.5-4.3,0-5.3-1.9c-0.4-2.7-0.2-5.5-0.2-8.2
+		c1,0.5,2,1,3,1.6c-0.2-0.3-0.6-1-0.8-1.4c-0.6-0.1-1.7-0.2-2.2-0.3c0.1-18,0-35.9,0-53.9c-54.9-0.1-109.9,0-164.8,0
+		c-13.2-0.2-26.5-0.2-39.7-0.1c0.1-1.4,0.2-2.8,0.3-4.1c-0.8,0.1-2.3,0.2-3,0.2c0-0.7-0.1-2.2-0.1-3c-1.5,1.6-2.9,3.3-4.4,4.8
+		c0.7-0.5,2.1-1.6,2.8-2.1c0.4,1.1,1.2,3.2,1.7,4.3c-5.2,0.5-10.2-0.8-15-2.4c-0.1-1.1-0.2-2.2-0.3-3.3c-0.4,1.9-0.8,3.8-1.3,5.6
+		c-29.4-0.1-58.9,0.1-88.3-0.1c0.2-10.6-0.2-21.2,0.1-31.7c0.6,0.6,1.8,1.9,2.5,2.6c1.5-0.8,2.9-1.5,4.4-2.2c0-2.1-0.1-4.2,0-6.3
+		c1.1-0.8,2.1-1.6,3.2-2.4c0-0.7-0.1-2-0.2-2.7c-1.9,0.5-3.4,1.7-4.6,3.2c-1.2,0.6-2.3,1.3-3.5,1.9c1.2,0.9,2.5,1.7,3.7,2.6
+		c-0.6,2.4-1.5,4.9-4.6,4.3c-0.1-1.3-0.2-2.5-0.3-3.8c-1.2-9.6-0.5-19.4-0.6-29.1c-0.1-4.3-0.2-8.7,0.4-13c-0.6-5-0.9-10.1,0.3-15.1
+		c-0.4-1.8-0.7-3.7-1-5.5c1.5-0.5,3-1,4.6-1.5c-1.3-0.2-2.7-0.5-4-0.8c-0.7-6.4-0.5-12.8,0.3-19.2c0.2-3.7-0.6-7.3-0.7-11
+		c0.9-0.6,1.8-1.2,2.7-1.8c-0.9-0.9-1.8-1.8-2.6-2.7c0.1-10.6-0.6-21.2,0.4-31.7c0.5,1.7,1.1,3.4,1.6,5.1c0.9-1,1.8-2,2.7-3
+		c-0.4-1-0.9-1.9-1.3-2.9c0.7-0.3,2.2-1,3-1.3c-0.8-1.6-1.6-3.2-2.4-4.8c0.3-0.8,0.9-2.5,1.2-3.4c-1.2,0.1-2.3,0.2-3.4,0.3
+		c0.3,2.1,0.8,4.1,0.9,6.3c-0.7,0.3-2,1-2.7,1.3c0.1-16.2-0.3-32.4,0-48.7c0.8-0.2,1.6-0.3,2.4-0.4c-1.5-0.6-2.5-1.7-3-3.3
+		c0.9-0.5,2.2-0.9,3.2-1.4c0,0.3,0,1,0,1.3c0.6,0,1.7-0.1,2.3-0.1c0-0.6,0.1-1.8,0.1-2.5c-1.8,0-3.5,0.1-5.2,0.2
+		c0-2.3,0-4.5-0.1-6.8c0.6-0.3,1.7-1.1,2.2-1.4c-0.1-0.4-0.2-1.3-0.2-1.8c-0.7-0.8-1.3-1.5-2-2.3c0-0.7,0-2.1,0-2.8
+		c-2.4-0.1-4.9-0.1-7.3-0.2c-1.1-1.1-2.1-2.3-3.2-3.4c-0.5,1.2-1,2.4-1.5,3.6c-116.1-0.2-232.3,0-348.4,0c-214.3,0-428.7,0-643,0
+		c-5.4-0.4-10.8-1.4-16.1,0.3c-0.5-0.4-1.5-1.3-2-1.7c-0.5,0.4-1.5,1.1-1.9,1.4c-5.8-0.3-11.6,0.8-17.2-0.8
+		c-0.4,0.2-1.2,0.7-1.6,0.9c-2.1,0-4.2-0.1-6.2-0.1c-0.7,5.9,0.5,12-0.4,17.9c-0.5,0.2-1.4,0.5-1.9,0.7c0,0.4,0,0.8,0,1.1
+		c0.5-0.3,1.6-0.9,2.2-1.2c0.2,15.7-0.3,31.4,0.1,47.1c-0.1,8.3-0.5,16.7,0,25c0.3,6.2-0.4,12.5,0,18.7c-0.4,0-1.1-0.1-1.4-0.1
+		c0.9,1.2,1.4,2.6,1.9,4c-1.2,0.1-2.4,0.1-3.6,0.2c0,1.3-0.1,2.6-0.1,3.8c-0.9,0-2.8-0.1-3.7-0.1c0.6,1.6,1.2,3.1,1.9,4.7
+		c0.9-1.9,1.7-3.7,2.5-5.6c0.6-0.4,1.9-1.1,2.5-1.4c0,4.4,0.1,8.8,0.1,13.2c-1.4,0.2-2.8,0.5-4.2,0.8c1.4,0.1,2.7,0.2,4.1,0.4
+		c0.6,8.5-0.8,17,0.1,25.4c0.1,27.9-0.2,55.8,0,83.8c-104.1,0-208.1,0-312.2,0c0,40.5-0.1,81,0,121.6c-1.2,0.2-2.4,0.4-3.6,0.6
+		c1.2,0.3,2.5,0.6,3.7,0.8c0,28.8,0,57.5,0,86.3c0.1,2.5-0.8,4.8-1.7,7.2c0.4,0.4,1.3,1.3,1.7,1.8c0,5-0.5,10-0.4,15
+		c0.7,13.4-0.1,26.8,0.2,40.2c0,22.3,0.1,44.6,0,66.9c0,2.1-0.2,4.3-0.5,6.4c-0.7-1.7-1.4-3.4-2.1-5c-0.9,0-1.8,0.1-2.7,0.1
+		c-0.3,1-0.7,2-0.9,3c1.7,2,3.9,3.5,6,5.1c0.4,7.9-0.3,15.8-0.1,23.6c-0.3,0.5-1,1.7-1.3,2.2c-1,0.1-3,0.2-4,0.3
+		c0.1-2.4,0.1-4.8,0.2-7.2c-0.5-0.3-1.5-1-2-1.4c-0.1-1.6-0.1-3.3-0.2-4.9c1.5,0,3.1,0,4.6,0.1c-1-1.9-2-3.7-3.1-5.6
+		c-0.1,1.6-0.1,3.2-0.2,4.9c-1.6,0.4-3.2,0.8-4.8,1.2c-0.8,1.2-1.6,2.5-2.4,3.7c-1.5-0.1-3.1-0.1-4.6-0.2c-0.1,1.2-0.3,2.4-0.5,3.6
+		c-2,1.9-4.8,2.8-6.3,5.2c2.2,0.1,4.5,0.2,6.8,0.2c0.1,2.9-0.4,5.8-1.2,8.7c1,0.5,1.9,0.9,2.9,1.4c0.5,3,1.4,6,0.3,9
+		c-1,0-2.9,0-3.8-0.1c-1.7-1.5-3.4-3-5.1-4.4c-0.3-1.5-0.6-3-1-4.6c-1.2-0.1-2.5-0.3-3.7-0.4v-20.7c1.2-0.4,2.5-0.8,3.7-1.2
+		c-0.1-0.8-0.2-1.6-0.2-2.5c-1.2-0.6-2.3-1.2-3.4-1.8v-1.4c1.1-1.8,2.4-3.4,3.8-5c-1.3-0.1-2.5-0.2-3.8-0.3v-8.6
+		c1.1-0.6,2.3-1.2,3.5-1.8c0-0.3-0.1-1-0.1-1.3c-1.8-2.1-3.2-4.5-3.4-7.3v-11c1.3-1,2.7-2,4.1-3c-0.3-0.7-0.7-1.4-1-2
+		c-1,0.1-2.1,0.2-3.1,0.3V234c105.5,0,211,0,316.5,0c0-40.3,0.1-80.7,0-121c0.8-1.1,1.6-2.2,2.4-3.3c-0.8-0.7-1.5-1.4-2.2-2.1
+		c0.2-2.8,0.1-5.7,0-8.5c1.3,0.5,2.7,1,4,1.5c-1.5-1.3-2.9-2.5-4.3-3.8c0-12.9,0.1-25.8,0-38.7c0.8-0.9,1.6-1.8,2.4-2.7
+		c1.2,0,2.5,0,3.7,0.1c-0.2-1-0.4-2.1-0.5-3.1c-1.9,1.3-3.7,2.6-5.6,3.9c0-6.4,0-12.8-0.1-19.2c0.8-2.5,2.7-4.4,4.6-6.1
+		c0.5,0.6,1.4,1.9,1.9,2.6c1.2,0.1,2.4,0.2,3.7,0.2c0-1.1,0-2.1,0-3.2c-1.5,0-3.1,0-4.6,0c-1.7-0.7-3.6-1-5.4-1.2c0-0.8,0-2.5,0-3.4
+		c2.7-1.8,4.9-4.2,5.3-7.6c-1.1,0.1-2.1,0.1-3.2,0.2c-0.3,1.8-0.5,3.8-2,5c0-5,0.6-10,0.2-15c1.7-0.2,3.2-0.8,4.6-1.7
+		c-1.2-0.1-3.6-0.2-4.8-0.2C317,4.4,317.3,2.2,317.5,0 M353.5,1.5c0,0.5,0,1.5,0,1.9c0.9,0,1.9,0,2.9,0c0-0.5,0.1-1.6,0.2-2.2
+		C355.5,1.4,354.5,1.5,353.5,1.5 M1288.3,1.3c0.2,1.2,0.4,2.4,0.6,3.6c1.4,0.6,2.5,1.6,3.7,2.7c-0.3-0.3-1-1-1.3-1.3
+		c0-0.6-0.1-1.8-0.1-2.4C1289.5,4,1288.9,2.6,1288.3,1.3 M438.8,2.6c0.9,0.4,1.8,0.7,2.8,1.1c0.1,1.2,0.2,2.4,0.2,3.6
+		c0.3,0,1,0.1,1.3,0.1c0.5-1.1,0.9-2.1,1.4-3.1C443.1,2.4,440.9,2.5,438.8,2.6 M1388.6,3.4c0,1-0.1,2.1-0.1,3.1
+		c1.4-0.1,2.8-0.2,4.2-0.3c0,0.8,0,2.3,0,3.1c1.5,0.1,3,0.2,4.5,0.3c-1.9-2.1-4.4-3.6-6.3-5.8C1390.1,3.7,1389.3,3.6,1388.6,3.4
+		 M377.5,7.8c0.8-0.6,1.5-1.1,2.3-1.7c-0.6-1-1.7-3-2.3-4C377.4,4,377.4,5.9,377.5,7.8 M338.1,7.7c1.1,0,2.3-0.1,3.5-0.1
+		c0-1.1,0-2.3,0-3.4C339.2,4.1,338.1,5.5,338.1,7.7 M391.6,5.4c0,1.3,0.1,2.5,0.1,3.8c-2.1,0.9-3.9,2.3-4.8,4.4
+		c1.9-0.1,4,0.2,5.5-1.3c1.4-1.9,1.8-4.3,2.4-6.5C393.6,5.6,392.6,5.5,391.6,5.4 M1254.7,6.7c-0.2,1.1-0.3,2.1-0.4,3.2
+		c2.7-0.1,4.2-2.4,5.7-4.3C1258.2,5.8,1255.9,5,1254.7,6.7 M332.3,6.4c0,0.6,0.1,1.7,0.1,2.3c1,0,2.1-0.1,3.2-0.1
+		c0-0.5-0.1-1.5-0.1-2C334.4,6.5,333.4,6.4,332.3,6.4 M599.7,7.8c0.8,1.4,1.7,1.4,2.5,0C601.4,6.3,600.5,6.3,599.7,7.8 M376.1,13.3
+		c2.1,0.1,4.3,0.2,6.4,0.2c0.1-1.1,0.1-2.2,0.2-3.3C380.2,10.4,377.6,11.1,376.1,13.3 M443.8,11.5c-0.1,2.1-1.4,3.6-3.7,3.2
+		c0,0.2,0.1,0.5,0.1,0.7c1.9,0.1,3.7,0.2,5.6,0.3c-0.1-1.4-0.3-2.8-0.4-4.1C445,11.5,444.2,11.5,443.8,11.5 M332.9,12.5
+		c1.2,0.9,2.5,1.8,3.7,2.7c2.4,0.3,4.7,1,6.8,2.2c-0.1-0.8-0.1-1.6-0.2-2.4C339.6,14.4,336.6,11.7,332.9,12.5 M407,15.4
+		c1.6-0.6,0.6-3.4-1-3C404.4,13.1,405.4,15.9,407,15.4 M366.5,14.3c0,0.6-0.1,1.9-0.1,2.5c1.9,0,3.8-0.3,4.8-2.1
+		C369.5,14.5,368,14.4,366.5,14.3 M1255.4,14c-1,1.3,1.1,3.6,2.2,1.9C1258.6,14.5,1256.4,12.3,1255.4,14 M359.5,15.6
+		c-0.1,1.1-0.2,2.2-0.3,3.3c1.1-0.4,2.3-0.8,3.4-1.2c0-0.6,0.1-1.7,0.1-2.3C361.7,15.4,360.6,15.5,359.5,15.6 M398.4,15.5
+		c0.1,1.8,0.1,3.5,0.3,5.3c1.4-1.7,2.6-3.5,3.5-5.5C400.9,15.4,399.6,15.4,398.4,15.5 M1382,15.5c-0.2,3.1,2.4,3.3,4.7,3.5
+		c-0.1-1.2-0.2-2.3-0.2-3.5C1385,15.4,1383.5,15.4,1382,15.5 M347.5,16.2c0,0.6,0.1,1.8,0.1,2.4c1.3-0.1,2.7-0.1,4-0.2
+		c0.5,0.9,0.9,1.7,1.4,2.6c0.3,0.1,1,0.4,1.3,0.6c0-0.9,0.1-1.8,0.1-2.7C352,18,350.2,15.9,347.5,16.2 M384.8,16.4
+		c-2,1.5-4,3.2-3.5,6c1.6,0.1,3.3,0.1,5,0.2c-0.5-0.3-1.4-1-1.8-1.4c0-0.4-0.1-1.1-0.1-1.4c1.5-0.8,2.9-1.8,3.8-3.3
+		C387,16.5,385.9,16.4,384.8,16.4 M388.4,24c2.8-1.8,5.4-3.9,8.6-4.8c-1.9,0.6-4.1,0.6-3.9-2C391.1,19.2,387.5,20.6,388.4,24
+		 M325.3,17.4c-0.7,3.9,3.2,3.1,5.7,3.2C330.8,17.3,327.7,17.3,325.3,17.4 M409.2,23.6c1.1,0,2.2,0,3.3,0c0-1.1,0-3.3,0-4.4
+		C409.5,19,409.5,21.5,409.2,23.6 M1248.8,20.5c-0.6,1-1.1,2.1-1.7,3.2c1.1-0.1,2.2-0.2,3.3-0.3c0.1-1,0.2-2.1,0.3-3.1
+		C1250.2,20.3,1249.2,20.4,1248.8,20.5 M335.5,25.4c0,1.1-0.1,2.2-0.1,3.3c0.5-0.1,1.4-0.3,1.9-0.4c0.4,1.4,0.9,2.8,1.3,4.2
+		c0.5,0,1.5,0.1,2.1,0.1c0-1.7-0.1-3.3-0.1-5c-1.8,0.1-3.6,0.1-3.3-2.1C336.9,25.4,335.9,25.4,335.5,25.4 M1394.3,25.3
+		c0,0.6,0,1.7,0.1,2.2c2.3,1.2,5.2,4.4,7.6,1.8c-1.6-1.2-3.1-2.5-4.5-3.8C1396.4,25.4,1395.4,25.3,1394.3,25.3 M1410,30.6
+		c-0.8-0.3-2.2-0.9-3-1.2c-2.1,0.9-4.2,1.7-6.3,2.5c2.7,2.6,6.6,2.5,10.1,2.9c-0.1-0.9-0.4-2.6-0.5-3.5c0.8,0.1,2.4,0.2,3.2,0.2
+		c0.1-1.2,0.2-2.4,0.4-3.6C1412.1,28.2,1410.8,29.1,1410,30.6 M1411.7,34.1c-1.1,1.2,1,3.2,1.9,1.6
+		C1414.6,34.5,1412.6,32.5,1411.7,34.1 M338.7,64.4c-1,1.7-1.9,3.4-2.8,5.1c0.6,0,1.8,0.2,2.4,0.2c0.2-1.5,0.8-2.8,1.9-3.9
+		c0.1-0.3,0.4-1.1,0.6-1.4C340.2,64.4,339.2,64.4,338.7,64.4 M1402.9,73.4c1.2,0.2,2.4,0.3,3.6,0.5c1,1.8,1.2,3.8,1.4,5.9
+		c-1.2,0.4-2.4,0.7-3.6,1.1c0,0.3,0.1,0.8,0.1,1c0.9-0.5,1.8-0.9,2.7-1.4c1.2,0,2.5-0.1,3.8-0.1c-0.5-1.3-1.6-2.1-3-2.2
+		c0.3-1.5,1.1-2.5,2.5-3.1c0-0.4,0.1-1.1,0.1-1.4C1408,73.6,1405.4,73.5,1402.9,73.4 M332.8,85.7c-0.9,0.6-1.8,1.3-2.6,1.9
+		c-1.5,0-2.9,0.1-4.4,0.1c-0.1,0.7-0.3,2.2-0.3,2.9c-0.8,0-2.3,0-3.1,0c0,0.2-0.1,0.6-0.2,0.8c2,0,4.1,0,6.1,0c0-0.8-0.1-2.2-0.1-3
+		c2.6-1.3,7.8-1.5,7.5,2.7c-3.1,2.4-1.8,6.1-0.8,9.2c-1.7,0.3-3.4,0.7-5,1.3c0.7,0.6,1.4,1.3,2.1,1.8c2-1.5,3.8-3.4,5.6-5
+		c-0.1-1.6-0.2-3.2-0.3-4.9c0.9-0.3,1.9-0.6,2.9-1c-1,0-3,0-4,0c0.4-2.4,1-4.8,1.7-7.1C336.1,85.6,334.4,85.6,332.8,85.7
+		 M324.7,102.2c0,2.1-0.9,3.9-3.3,3.4c0,1,0.1,2,0.1,3c1.1-0.1,2.2-0.2,3.4-0.4c0.4-1.1,0.9-2.1,1.4-3.2c0-0.8,0-1.5,0-2.2
+		C325.9,102.7,325.1,102.4,324.7,102.2 M1394.4,108.7c0,1.7,0.1,3.4,0.2,5.1c0.2,0,0.5-0.1,0.6-0.1c0.2-2.7,2-4.7,4.4-5.6
+		c-0.1-0.4-0.3-1.3-0.3-1.8C1397.7,107.3,1396.1,108.1,1394.4,108.7 M331.3,109.4c0,1.2,0.1,2.4,0.1,3.6c1.9-0.9,3.8-2,5.4-3.3
+		C335,109.5,333.2,109.4,331.3,109.4 M332.1,131.1c-2.1,0.3-4.4,1.1-3.8,3.7c2-0.3,3.8-1.1,5.5-2.2c1.5-0.1,3.1-0.2,4.6-0.3
+		c0.1-1.1,0.2-2.2,0.3-3.3C336.4,129.4,334.2,130.2,332.1,131.1 M1410.6,131.1c1,0.7,3.2,1.1,3.8-0.3
+		C1414.1,129,1409.4,128.9,1410.6,131.1 M1397.3,139.6c1.4,0.4,2.9,0.9,4.4,1.3c-0.1-1.1-0.2-2.1-0.3-3.2c-1-0.1-3-0.2-4-0.2
+		C1397.4,137.9,1397.3,139,1397.3,139.6 M325.6,141.4c-0.9,1.6-1.9,3.2-3.7,3.7c-0.2,0.8-0.4,1.7-0.6,2.5c0.4-0.1,1.3-0.2,1.8-0.2
+		c0.7-2,2.5-2.3,4.4-2.2c0-1.2,0.1-2.5,0.1-3.8C327.1,141.4,326.1,141.4,325.6,141.4 M1397.6,143.6c-0.1,1.4-0.2,2.7-0.2,4.1
+		c1.4,0,2.8-0.1,4.2-0.1c0-1.4,0-2.9,0-4.3C1400.2,143.4,1398.9,143.5,1397.6,143.6 M1408.5,144.9c0.8,1.1,1.7,1.3,2.9,0.6
+		c0-0.5-0.1-1.4-0.1-1.9C1410.4,142.6,1408,143.3,1408.5,144.9 M1407.6,173.5c0,1.6,0,3.3,0,4.9c1,0.1,2,0.2,3.1,0.2
+		c-0.2-1.6-0.3-3.2-0.4-4.8C1409.3,173.7,1408.4,173.6,1407.6,173.5 M1406.2,195.6c0.2,0.4,0.5,1.2,0.7,1.6c0.5,0.1,1.7,0.3,2.2,0.4
+		c1,1.6,4.1,5.3,5.7,2.4c-1.5-0.5-3.1-1-4.6-1.4c0-0.7,0.1-2.2,0.2-2.9C1409,195.6,1407.6,195.6,1406.2,195.6 M1397.1,205.2
+		c0.5,0.9,1.1,1.8,1.6,2.7c-0.3,0.5-1,1.5-1.3,2c-0.2,1.8,1.8,1.4,3,1.8c0.4-1.3,0.8-2.6,1.2-3.9c-0.3-0.6-1-1.9-1.4-2.5
+		C1399.1,205.3,1398.1,205.3,1397.1,205.2 M1407.1,230.8c-1.8-0.1-3.6-0.2-5.4,0.1c2,1.2,4.8-0.3,6.4,1.7c-1.5,2-5.4,1.9-4.9,5.1
+		c1.4-0.6,2.9-1,4.5-1.3c0.2-1.6,0.4-3.2,0.7-4.8c0.9-0.1,2.5-0.2,3.4-0.3C1410.9,229.4,1407.9,228.2,1407.1,230.8 M1398.6,236.8
+		c-1.3,2,2.6,2.3,2.7,0.4C1400.6,236,1399.7,235.9,1398.6,236.8 M1482.5,239.2c0,2.6,0.7,5,1.4,7.4c-1,0-3.1,0.1-4.1,0.1
+		c1,0.3,1.9,0.6,2.9,0.8c-0.1,1.7-0.2,3.5-0.2,5.2c1.7,1.3,3.2,2.8,4.6,4.5c0.8,0.1,1.6,0.1,2.4,0.2c0-0.4,0.1-1.3,0.2-1.8
+		c-1.6-0.3-3.1-0.5-4.6-0.9c0.2-1.8,0.7-3.4,1.6-5c-0.7-2.1-2.7-3.7-2.2-6.1c1.6-2.3,4.8-1.1,7.3-1.6c0.3,1.2,0.7,2.3,1.1,3.5
+		c1.5-0.1,2.9-0.3,4.4-0.4c-0.9-0.3-1.8-0.6-2.8-0.9c0-0.7-0.1-2-0.1-2.6c-1.8,0-3.6-0.1-5.4-0.1
+		C1487.2,239.7,1484,241.4,1482.5,239.2 M1470,244.1c1.2,1.4,2.8,2.5,4.7,2.9c0-2-0.1-3.9-0.2-5.9C1472.3,241,1471,242.3,1470,244.1
+		 M1534.4,242.4c0,1,0,2.1,0.1,3.1c0.5,0,1.5,0.1,2,0.1c0.4-1,0.8-2.1,1.2-3.1C1536.6,242.5,1535.5,242.4,1534.4,242.4 M1509.8,246
+		c1.6-0.1,2.2-3,0.3-3.1C1508.6,243,1507.9,246,1509.8,246 M1523,245.4c-1.7,1.1,0.6,3.2,1.9,2.1
+		C1526.6,246.5,1524.3,244.4,1523,245.4 M1408.5,252.1c0.1,2.6,1.1,5.1,1.2,7.7c2.5-2.5,6-0.2,9.1-0.3c-1.7-1.3-3.4-2.8-3.7-5.1
+		c-1.6,0.1-3.2,0.2-4.8,0.3c0-0.8,0.2-2.4,0.2-3.3c0.6,0,1.9,0,2.5,0c0.9-1.5,2.2-2.8,3.8-3.7C1413.4,247.8,1411.5,251,1408.5,252.1
+		 M1461.4,248.5c0.1,1,0.1,2,0.2,3c0.7,1,1.4,2,2.1,3c0.3,0,1-0.1,1.4-0.1c0.9-0.6,1.9-1.1,2.9-1.7c-0.9,0-2.8,0-3.7,0
+		c0-1.4,0.1-2.8,0.1-4.2C1463.5,248.4,1462.5,248.4,1461.4,248.5 M1502.9,251.6c-1.2,1.4-2.4,2.7-3.6,4c0.3-0.2,1-0.8,1.3-1
+		c1.4-0.4,2.9-0.8,4.3-1.2c0.4,0.1,1.2,0.2,1.6,0.2c-0.4-0.5-1.2-1.3-1.7-1.8C1504.2,251.7,1503.5,251.6,1502.9,251.6 M1508.5,255.8
+		c0,1,0.1,2,0.2,3c0.6-0.9,1.2-1.7,1.9-2.6c1.3,0.1,2.7,0.2,4.1,0.3c-0.1-1.1-0.1-2.1-0.1-3.2
+		C1512.9,255.2,1510.8,255.9,1508.5,255.8 M1519.7,254.7c-0.1,1.2-0.2,2.4-0.3,3.6c2.5,0.1,5.2,1.5,7.7,0.5c-1.5-0.2-3-0.3-4.5-0.4
+		c-0.1-1.2-0.2-2.5-0.3-3.8C1521.4,254.7,1520.6,254.7,1519.7,254.7 M1713.1,259.6c-0.8,2.1,0.2,4.1,1.3,5.9
+		C1715.3,263.2,1715.2,261.1,1713.1,259.6 M18.4,314.5c0,1.3,0.1,2.6,0.1,4c1,0,2,0.1,3,0.2c0-1.4,0-2.8-0.1-4.1
+		C20.5,314.5,19.5,314.5,18.4,314.5 M1720.8,322.2c-0.2,2.5-0.2,4.9-0.3,7.4c0.6,0,1.7-0.1,2.2-0.1
+		C1722.6,327,1722.3,324.4,1720.8,322.2 M8.4,330.3c-0.4,1.4-0.9,2.8-1.3,4.2c1.5,0,2.9,0,4.4,0c0-1-0.1-3-0.1-4
+		C10.4,330.5,9.4,330.4,8.4,330.3 M19.5,371.6c0.1,1.9,0,3.7,0.3,5.6c1.4,0.1,2.4-1.1,3.5-1.8c0-1.2,0-2.5,0-3.7
+		C22.1,371.7,20.8,371.7,19.5,371.6 M12.7,410.6c0,0.9-0.1,1.9-0.1,2.8c1.4,0.1,2.7,0.2,4.1,0.2c-0.1-1.1-0.1-2.2-0.2-3.2
+		C15.2,410.5,13.9,410.6,12.7,410.6 M12.2,476.4c0.6,1.4,1.1,2.8,1.7,4.2c1.1-0.1,2.3-0.1,3.4-0.3c1.5-0.7,1.3-2.5,1.6-3.9
+		C16.6,476.4,14.4,476.4,12.2,476.4 M9.7,482.6c-0.1,0.6-0.2,1.8-0.3,2.4c-0.2,0.6-0.7,1.8-1,2.3c-1.2,0.5-2.5,1-3.7,1.5
+		c-0.1,0.9-0.1,1.8-0.2,2.6c1,0,2.1,0,3.1,0c1.9-2.9,3.8-5.8,5.3-9C11.8,482.5,10.7,482.6,9.7,482.6 M21,484.6
+		c-1.6,2-2.8,4.1-2.3,6.8c3.4,0.5,4.8-2.8,5.5-5.5c-0.7-0.4-1.5-0.7-2.2-1.1C21.8,484.8,21.2,484.7,21,484.6 M13.5,496.3
+		c0,1.8,0,3.6,0,5.4c2.1,0.1,3.5-1,4.6-2.7C17,497.3,15.6,496.1,13.5,496.3 M19.3,502.3c0,0.6,0.1,1.7,0.1,2.2c0.5,0,1.5,0,2,0
+		c0-0.5,0.1-1.6,0.2-2.2C21.1,502.3,19.9,502.3,19.3,502.3 M1717.9,516.7c-0.6,0-1.8,0-2.5-0.1c0,1.3,0,2.7,0,4
+		c0.4-0.1,1.3-0.4,1.7-0.6c0.7-2,1.1-4,0.7-6C1717.9,514.8,1717.9,516.1,1717.9,516.7 M23.6,519.6c-0.1,1.3-0.1,2.6-0.2,3.9
+		c1.4,0,2.8,0,4.2,0.1c0-1.4,0-2.8-0.1-4.2C26.3,519.5,25,519.5,23.6,519.6 M1721.6,519.5c0,1.3-0.1,2.7,0,4
+		c-0.5,0.1-1.6,0.2-2.2,0.3c0.9,0.8,1.8,1.7,2.8,2.5c2,0.8,3.9-0.5,5.7-1.3c-1.6-0.4-3.2-0.8-4.8-1.3c0.2-1.5,0.5-2.9,0.7-4.4
+		C1723.4,519.4,1722.2,519.5,1721.6,519.5 M1706.2,521.9c-0.3,2.4,1.1,3.9,3.5,4.2c-0.1-2-0.1-4-0.2-6
+		C1708.4,520.7,1707.3,521.3,1706.2,521.9 M21.7,543c2.2,1.5,4.5,3.3,7.2,1.8c-0.3-1.5-0.2-3.4-1.7-4.4
+		C25,540.3,23.3,541.8,21.7,543 M1.3,549.3c0,1.1,0,2.2,0.1,3.4c1.1,0,2.2,0,3.3,0c0-1.1,0.1-2.2,0.1-3.3
+		C3.6,549.3,2.5,549.3,1.3,549.3 M19.7,559.7c0.7-0.3,2.2-0.9,2.9-1.2c0.1-2.5-0.4-4.8-3.1-5.7C18.7,554.8,17.2,558.2,19.7,559.7
+		 M1703.9,555.2c0.3,0.5,0.9,1.5,1.2,2.1C1708.2,556.9,1705.2,552.2,1703.9,555.2 M1707.2,574.6c1,0,2-0.1,3-0.1
+		c0.3-1.1,0.7-2.1,1-3.2c1.6,0,3.2-0.1,4.9-0.1c-1.3-0.3-2.6-0.5-3.8-0.8c0-0.6-0.1-1.7-0.1-2.2
+		C1710,569.8,1707.1,571.3,1707.2,574.6 M1720,568.7c-0.6,0.6-1.2,1.2-1.8,1.8c1.8,0,3.6,0,5.4,0c0-0.6,0.1-1.7,0.2-2.3
+		C1722.5,568.3,1721.2,568.5,1720,568.7 M6.5,570.4c-1.6,1.5-3.4,3-3.3,5.4c2.5-0.2,5-0.5,6.7-2.5c-0.4-0.7-1.2-2.1-1.6-2.8
+		C7.8,570.5,6.9,570.4,6.5,570.4 M1728.5,575.3c0,2.1-0.1,4.3-1.2,6.2c1.2,0,2.5,0.1,3.7,0.2c0.5-2.5,0.6-5,0.6-7.6
+		C1730.8,574.4,1729.2,575,1728.5,575.3 M1708,577.7c0.8,0.8,1.6,1.5,2.4,2.3c0.1,0.8,0.3,1.6,0.5,2.4c0.7-1,1.7-1.4,2.9-1.2
+		c0.3,0.5,1,1.4,1.3,1.8c0.5,0.5,1.6,1.4,2.1,1.9c1.3-2,2.5-4.2,2.4-6.6c-1.6,0.5-3.2,1.2-4.7,1.8c-2.4,1.1-4.9,0.4-4.9-2.5
+		C1709.6,577.6,1708.5,577.7,1708,577.7 M1708.9,590.8c-1.1,2.6-2,5.4-0.4,8c0.5-0.1,1.5-0.4,2-0.5
+		C1710.6,595.7,1710.5,593,1708.9,590.8 M22.4,594.2c0,1.4,0,2.9,0.1,4.4c1.8,0,3.6,0,5.4,0C28.3,595,25.1,594.2,22.4,594.2
+		 M12.6,596.5c-0.1,1.3-0.1,2.7-0.2,4c1.1,0,2.1,0.1,3.2,0.1c-0.1-1.3-0.2-2.7-0.3-4C14.4,596.6,13.5,596.6,12.6,596.5 M10.4,604.6
+		c-1.1,1.1-2.1,2.3-3.2,3.4c1.5,0.5,2.9,1,4.3,1.5c0.1,2.8-0.5,5.9,1,8.4c-0.4,1.5-0.8,3-1.2,4.6c1.4,0,2.8,0.1,4.2,0.1
+		c0-1.2-0.1-2.4-0.1-3.6c-1.2-0.9-2.4-1.8-3.6-2.7c0.9-2,1.9-3.9,3.5-5.4c-1.4-1.9-2-4.1-2-6.4C12.4,604.5,11.4,604.5,10.4,604.6
+		 M1709.1,618.8c-0.6,2.4-3.1,2.9-5.1,3.6c0.6,0,1.8,0.1,2.4,0.1c0.8-0.7,1.6-1.5,2.4-2.2c1.2,0.1,2.5,0.2,3.8,0.4
+		c-0.1-0.5-0.1-1.6-0.2-2.2C1711.3,618.6,1710.2,618.7,1709.1,618.8 M1707.4,638.4c0,1.4,0,2.9,0,4.3c0.5,0.2,1.6,0.8,2.1,1
+		c0,0.7,0.1,2,0.1,2.6c0.9-0.1,1.7-0.1,2.6-0.2c0-0.7,0-2,0.1-2.7c0.3-0.2,1.1-0.5,1.4-0.7c-0.8-0.1-2.5-0.3-3.3-0.4
+		c0-1.3,0.1-2.6,0.1-4C1709.5,638.5,1708.5,638.4,1707.4,638.4 M1722.3,644.7c1.8-0.2,3.4-0.7,5-1.6c-1.6-1.1-3.2-2.1-4.7-3.1
+		C1722.4,641.6,1722.4,643.2,1722.3,644.7 M1725.7,644.8c1.2,1.7,3.2,1.9,5,2c0.3-1.3,0.7-2.5,1.1-3.8
+		C1729.8,643.5,1727.7,644.1,1725.7,644.8 M1723.3,656.3c-0.3,0.3-0.9,0.8-1.2,1c1.7,0,3.5,0,5.2,0c0-1.3,0-2.5,0.1-3.8
+		c0.7-0.1,2-0.3,2.7-0.3c0.2-0.5,0.5-1.4,0.6-1.9C1727.3,651,1724.5,653.2,1723.3,656.3 M1715.2,652c-0.9,3.2,1.8,4,4.3,4.7
+		C1720.7,653.5,1717.7,652.7,1715.2,652 M1707.5,663c-0.9,1.2,1.1,3.2,2.1,1.8C1710.4,663.6,1708.5,661.6,1707.5,663 M1720.3,667.7
+		c2.6,2.7,6.5,1.6,9.8,1.6c-0.2-0.4-0.7-1.3-0.9-1.7C1726.3,667.1,1723.3,667.3,1720.3,667.7 M1711.6,680.6
+		c-0.1,0.8-0.2,2.4-0.2,3.2c4.1,0.2,7.8-3.6,8.5-7.5C1716.7,676.9,1714.1,678.7,1711.6,680.6 M1704.4,678.4
+		c-0.1,1.2-0.2,2.3-0.3,3.5c1.9-0.8,4.7-0.9,5.1-3.5C1707.5,678.4,1705.9,678.4,1704.4,678.4 M1710.7,687.8c0.8,1.1,1.7,1.1,2.6,0.2
+		C1714.2,685.1,1709.1,684.6,1710.7,687.8 M1710.2,692.5c0.6,0.1,1.9,0.2,2.5,0.2c-0.1-1.2-0.1-2.5-0.1-3.7
+		C1709.8,688.5,1710.6,691.1,1710.2,692.5 M1714.5,692.5c-0.1,0.5-0.3,1.6-0.3,2.2c0.6,0,1.8-0.1,2.4-0.1c1.2-1.1,2.4-2.2,3.6-3.2
+		C1718.2,691.3,1716.3,691.6,1714.5,692.5 M1716.6,699.6c-0.1,0.5-0.2,1.5-0.3,2c1.1,0,2.3,0,3.5,0.1c0-0.6-0.1-1.7-0.1-2.3
+		C1718.6,699.4,1717.6,699.5,1716.6,699.6 M1705.3,701.2c0,1.2,0.1,2.4,0.1,3.7c0.9-0.2,1.8-0.5,2.7-0.7c0.3-1.3,0.5-2.6,0.7-3.9
+		C1707.6,700.5,1706.5,700.8,1705.3,701.2 M1722.1,700.4c0.1,1.9,0.9,3.6,2.2,4.9c0.1-1.6,0.1-3.3,0.2-4.9
+		C1724,700.4,1722.8,700.4,1722.1,700.4 M1710.3,702.2c0.1,0.6,0.2,1.7,0.2,2.2c1,0,2.1,0.1,3.2,0.1c0-0.6,0.1-1.7,0.1-2.2
+		C1712.6,702.3,1711.4,702.2,1710.3,702.2 M1719.2,709.7c-0.3,1.9-0.5,3.8-0.6,5.7c-0.9,0.6-1.9,1.2-2.8,1.8c2,0.2,4,0.4,6,0.6
+		c0-0.6-0.1-1.8-0.1-2.4c-0.7,0-2,0-2.7,0c0-1.7,1-3.3,2.4-4.1c2.4-0.8,3.4,1.8,4,3.5c-0.6,3.6-2.6,7.1-0.8,10.7
+		c0.5,0.1,1.5,0.1,2,0.2c-0.1-2-0.2-4-0.2-5.9c1.1-1.4,2.2-2.8,3.3-4.2c0.5-0.3,1.4-0.8,1.9-1.1c0-0.5,0.1-1.5,0.1-2
+		c-2-0.4-4-0.9-6-1.2c-0.5-1-1-2-1.4-2.9C1722.6,708.9,1720.9,709.4,1719.2,709.7 M1714.4,721.4c0.1,0.9,0.2,2.6,0.2,3.4
+		c0.7-0.1,2.2-0.2,3-0.3c0.8-1.1,1.6-2.1,2.5-3.1C1718.2,721.4,1716.3,721.4,1714.4,721.4 M1705.9,726.9c-1.2,1.1,0.4,3.5,1.9,2.5
+		C1709.1,728.3,1707.3,725.8,1705.9,726.9 M1718.7,727.7c-1.2,1-2.6,1.9-4.2,2.1c0,1,0,2.1,0,3.2c1.8-0.4,2.7-2.1,3.4-3.6
+		c0.7,0.1,2.2,0.3,2.9,0.4c0-0.6-0.1-1.8-0.2-2.5C1720.1,727.4,1719.2,727.6,1718.7,727.7 M1728.3,729.4c0.8-1.2,0.6-2.1-0.5-2.7
+		C1725.8,726.8,1726.4,730.8,1728.3,729.4 M1708.1,759.8c0.7,0,2.1-0.1,2.8-0.2c-0.3-2.3-0.6-4.6-2-6.6
+		C1708.1,755.2,1707.6,757.5,1708.1,759.8 M1712.1,805.4c-1.3,0.3-2.7,0.6-4,0.9c0.1,0.5,0.3,1.5,0.5,2c1.8,0,3.6,0,5.5,0.1
+		c-0.4,1.6-1.3,2.6-2.9,3.2c1,0.4,2.1,0.7,3.1,1.1c0-3.3,0.3-6.6,0.4-9.9C1713.7,803.6,1712.8,804.4,1712.1,805.4 M1704.1,814
+		c0.8,0.5,2.5,1.4,3.4,1.9c1.7-1.5,0.5-3.3-0.1-5C1705.8,811.5,1704.7,812.5,1704.1,814 M1716.4,813.5c0,0.5,0,1.5,0,2.1
+		c3.1,0,7.1,0.7,8.7-2.9C1722.2,812.2,1719.2,812.5,1716.4,813.5 M1725.2,821.1c0.9,0.5,2.6,1.6,3.4,2.1c0.8-1.9,0.8-3.9,1-5.8
+		C1726.8,816.5,1725.4,818.5,1725.2,821.1 M1717.9,820.3c-1.2,1.2-2.6,2.1-4.1,2.8c1.2,0.8,2.5,1.6,3.7,2.4c0,1-0.1,2.9-0.1,3.8
+		c-1,0.4-2.1,0.9-3.1,1.3c0,0.5,0.1,1.4,0.2,1.9c3.4,0.2,7.1,0.1,9.9-2.1c0.2-1.4,0.2-2.9,0.2-4.3c-1.6,0.8-3.3,1.3-5,1.6
+		c-0.2-1.1-0.3-2.1-0.4-3.1c1.3-0.5,2.7-0.9,4.1-1.5C1721.7,821.9,1720.1,820.4,1717.9,820.3 M1706.5,822.7c0,1.2,0,2.4,0,3.6
+		c-0.7,0.5-1.9,1.4-2.6,1.9c1.8,1.2,3.6,2.2,5.5,3.2c0-2.9,0.5-5.8,1-8.6C1710.8,820,1707.6,822.2,1706.5,822.7 M1696.6,828.2
+		c-2.5,0.1-2.2,2.4-2.1,4.1c1.5,0.1,3,0.3,4.6,0.5c-1-1-2.1-2-3-3c1.2-1.7,3.9-1.7,4.9,0.2c0.5,1.2,1.4,1.9,2.8,2
+		c-0.2-1.5,0.2-3.4-1.2-4.5c-1.5-1.2-0.9-3.2-1.1-4.8c-1,0-3-0.2-4-0.2C1697.4,824.4,1697.3,826.3,1696.6,828.2 M1660.2,826.5
+		c-1.7,0.9,0.1,3,1.4,1.9C1663.3,827.6,1661.4,825.4,1660.2,826.5 M1634.5,829.3c-0.3,0.8-1,2.3-1.3,3.1c1.6,1.3,3.7,1,5.5,0.4
+		c-0.1-1.1-0.1-2.2-0.1-3.3C1637.2,829.4,1635.8,829.3,1634.5,829.3 M1671.6,836.9c3,3.5,7.3,0.1,11,0.6c-0.1-1.4-0.1-2.8-0.1-4.2
+		C1678.8,834.5,1675,835,1671.6,836.9 M1705.5,833.4c0,1-0.1,3-0.1,4c1.1,0.5,2.2,1,3.3,1.6c0.5-1.8,0.8-3.8,1.1-5.7
+		C1708.3,833.3,1706.9,833.4,1705.5,833.4 M1636.3,838.1c1.2,0.8,2.5,1.7,3.7,2.5c1.2-0.4,2.4-0.8,3.6-1.2c0-1.1,0.1-2.1,0.1-3.1
+		c-2.4,0.3-4.9,0-7.2-0.8C1636.5,836.4,1636.4,837.2,1636.3,838.1 M1698.3,837.7c-1.7-0.1-3.3-0.2-4.9-0.3c0,0.5,0,1.6-0.1,2.2
+		c2.3,1,5,1.6,7.2-0.1c0.1-1.2,0.1-2.3,0.2-3.4C1699.9,836.5,1699.1,837.1,1698.3,837.7 M1676.7,840.6c0.8,1.9,2.2,3.4,3.8,4.8
+		c0.6,0,1.7,0,2.2,0c-0.9-1.6-1.7-3.3-2.5-4.9C1679.3,840.5,1677.6,840.6,1676.7,840.6 M1659.2,846.8c3.2-0.3,6.2-1.4,9-2.7
+		c-2.3-1.8-5.3-1.4-7.7-2.9C1660.1,843,1659.6,844.9,1659.2,846.8 M1673.4,845.4c1.2,1.3,2.3,2.8,3.2,4.3c0.5,0,1.5,0,2,0
+		c0.1-0.6,0.2-1.7,0.2-2.3c-0.8,0-2.4,0-3.2,0.1c0-2.3,0-4.6-0.2-7C1673.9,841.8,1673.3,843.5,1673.4,845.4 M1694.4,847.7
+		c0,0.5-0.1,1.6-0.2,2.1c1.1-0.1,2.2-0.2,3.3-0.3c0-1.2,0.1-2.3,0.2-3.4C1696.5,846.6,1695.4,847.2,1694.4,847.7z"/>
+	<path class="st2" d="M1408,0h5c0.5,1,1.7,2.3,3,1.6c-0.1,1.8-0.1,3.7-0.1,5.5c-0.3,0.2-0.8,0.7-1.1,0.9c-0.4,0.1-1.1,0.3-1.5,0.4
+		C1411.3,5.8,1409.9,2.7,1408,0z"/>
+	<path class="st2" d="M1406.5,10.6c3-1.2,6.2-2.8,9.3-0.9c0,0.6,0.1,1.9,0.1,2.6c-0.7,0.5-1.5,1-2.2,1.5c0.4,1.6,0.8,3.3,1.1,4.9
+		c-1.1-0.1-3.2-0.4-4.3-0.5c-1.3-1.5-2.5-3.2-4.2-4.3C1406.4,13.1,1406.5,11.5,1406.5,10.6z"/>
+	<path class="st2" d="M600,76.7c25.6,0,51.3,0,77,0c1.4,0,2.8,0.1,4.2,0.4c0.1,0.4,0.2,1.3,0.3,1.8c1.2,0.2,1.6-0.5,1.2-2.1
+		c18.7,0.1,37.4,0,56.2,0.1c-0.8,2.9-1.6,5.8-2.3,8.7c-0.3,0.4-0.9,1.1-1.3,1.4c0.4-0.1,1.3-0.4,1.8-0.5c0.7-3.2,1.4-6.5,2.8-9.5
+		c0.6,0.1,1.8,0.2,2.5,0.2c1.2,3.4,1.8,7,3.5,10.2c-0.6-3.5-1.8-6.9-2.7-10.4c29-0.6,58-0.1,87-0.2c7.3,0.2,14.7-0.4,22,0.4
+		c5.6-0.6,11.3-0.4,17-0.3c22-0.1,44,0,66,0c7.7,0.6,15.3-0.2,23-0.1c10.6,0.2,21.1-0.1,31.7,0.1c-0.8,3.6-1.8,7.2-3.1,10.7
+		c2.3-3.1,2.5-7.1,4.2-10.5c0.6,0,1.8,0.1,2.4,0.1c1.2,3.4,1.8,7,3.5,10.3c-0.6-3.5-2-6.9-2.8-10.4c19.7-0.5,39.4,0,59-0.2
+		c13.7,0.6,27.4-0.7,41.1,0.5c12.4-1,24.8-0.3,37.3-0.5c0.2,14,0.1,28.1,0.1,42.2c-5.2,0-10.4-0.1-15.6,0.1
+		c-1.2-3.7-2.5-7.4-3.8-11.2c3.4-2.5,6.8-4.9,10.4-7.1c0-1.2,0-2.4,0-3.6c-3.6,3.1-7.6,5.5-11.4,8.3c0.8,3.9,2.1,7.7,3.6,11.3
+		c-0.7,0.6-1.3,1.2-1.9,1.8c-3-2.5-5.8-5.6-9.5-7.2c-3.9,2.2-6.8,6.1-11.2,7.2c0.6-4.6,3.6-8.6,3.7-13.3c-3.1-3.1-7.1-5.1-10.5-7.9
+		c-0.9,0.1-1.8,0.1-2.6,0.2c0,0.4-0.1,1.3-0.1,1.7c3.5,3.3,7.6,5.6,11.5,8.4c-0.6,3.6-1.3,7.2-2.6,10.7c-0.4,0.1-1.2,0.4-1.6,0.5
+		l-1.5,0.1c0-1.4,0.1-2.7,0.2-4.1c0.3-0.3,1-0.8,1.3-1.1c-0.5-0.1-1.7-0.3-2.2-0.5c0.1,1.8,0.2,3.7,0.3,5.5
+		c-69.7-0.3-139.5-0.1-209.2,0c-1.6-3.8-3.2-7.7-3.5-11.9c3.3-1.5,6.5-3.4,9.4-5.7c0.1-1.4,0.2-2.8,0.4-4.2
+		c-3.5,3.2-7.7,5.5-11.3,8.5c0.8,4.5,2.6,8.7,4.3,12.9c-0.8,0-2.5-0.1-3.3-0.1c0-0.6-0.1-1.8-0.2-2.4c-3-1.1-5.4-3.6-8.4-4.7
+		c-3.8,1.1-6.3,4.7-9.6,6.7c-0.3-0.1-0.9-0.2-1.2-0.3c-0.1-0.3-0.2-0.8-0.3-1.1c1.3-3.8,3.1-7.5,2.8-11.6c-4.1-2.3-7.4-5.9-11.4-8.3
+		c0.1,1.3,0.3,2.5,0.6,3.8c3,2.6,6.6,4.4,9.9,6.6c-0.3,4.2-1.8,8.1-3.5,11.8c-17.8-0.4-35.5,0.1-53.3-0.1c-39-0.3-78,0.3-117-0.2
+		c-13.7,0.3-27.5-0.2-41.2,0.3c-1.3-3.7-2.9-7.3-3.5-11.1c3-2.9,6.8-4.8,10.3-7.1c0-1.2-0.1-2.5-0.1-3.7c-3.7,3.2-7.7,6-11.8,8.8
+		c0.9,4,3.9,7.9,3.1,12c-4.2-0.1-6.7-5-10.6-6.4c-3.6,2.2-6.7,5.1-10.3,7.4c-0.4-0.3-1.1-0.8-1.4-1c-1.9,0.5-3.8,0.9-5.7,1.1
+		c-3.9,0-7.9,0-11.8,0C600,104.8,600,90.7,600,76.7 M1085.5,81.3c-0.1,1.2-0.1,2.3-0.1,3.4c0.3,0,0.9,0,1.2,0c0-1.2,0-2.3,0-3.4
+		C1086.3,81.3,1085.7,81.3,1085.5,81.3 M721.7,87.2c-0.1,1.1-0.2,2.3-0.3,3.4c3.5,2.8,7.5,5.1,10.9,8.2c0.4-0.9,0.8-1.7,1.3-2.6
+		C729.6,93.2,725.2,90.8,721.7,87.2 M748.5,95.1c0.5,4.8,3.4,9.1,3.1,14c-3.5-2.7-7.4-4.8-10.7-7.8c-3.5,2.9-7.2,5.8-11.3,7.8
+		c-0.1-1.6-0.1-3.2-0.2-4.8c-0.8,2.6-1,5.3-0.9,8c1,0.1,1.9,0.1,2.9,0.2c3.2-2.8,6-7.3,10.8-7.3c2.9,2.3,5.8,4.6,8.3,7.2
+		c1.1,0,2.2,0.1,3.3,0.1c-0.8-5-2.9-9.7-3.8-14.7c3-2.3,6.2-4.4,9.4-6.3c0.2-1.4,0.2-2.9,0.4-4.3C756.8,90.7,752.7,93.2,748.5,95.1
+		 M972.3,90.6c3.5,2.4,7,4.8,10.5,7.2c-0.6,5-3.4,9.5-3.6,14.7c0.6,0,1.9-0.1,2.5-0.2c3.8-2.2,7-5.2,10.1-8.1c2.7,3,6.2,5,9.4,7.4
+		c1.1,0,2.3,0.1,3.5,0.1c-0.9-4.7-2.9-9.1-3.6-13.8c3.6-1.9,6.8-4.4,10.3-6.7c0-1.2-0.1-2.4-0.1-3.6c-0.4,0-1.1,0.1-1.4,0.1
+		c-3.5,3-7.4,5.4-10.5,8.9c1.2,4.3,2.6,8.4,4.5,12.5c-5.2-0.2-7.5-5.7-11.9-7.7c-3.5,2.7-7.1,5.1-11,7.1c0.7-4.1,2-8.1,3.4-12
+		c-3.7-3.3-8.4-5.3-11.6-9.1C972.6,88.3,972.5,89.4,972.3,90.6 M1049.4,88.4c0.3,1.4,0.6,2.8,0.9,4.3c0.5,0,1.6-0.2,2.2-0.2
+		c0-1.4-0.1-2.8-0.1-4.2C1051.4,88.4,1050.4,88.4,1049.4,88.4 M610.4,96.7c0,1.3,0,2.6,0.2,3.9c3.1,2.6,6.7,4.6,10,7.1
+		c0.1,0.7,0.2,2.1,0.3,2.8c0.3-1.7,0.6-3.4,0.9-5c-3.3-2.1-6.3-4.7-9.8-6.5C611.4,98.2,610.9,97.5,610.4,96.7z"/>
+	<path class="st2" d="M623.8,118.9c1.6-1.8,3.4-3.4,5.2-4.9c2.1,1.5,4.1,3.1,6,4.9C631.3,118.7,627.6,118.7,623.8,118.9z"/>
+	<path class="st2" d="M860.2,118.9c1.9-1.5,3.9-3,5.8-4.5c2,1.5,4.1,3,6,4.5C868,118.7,864.1,118.7,860.2,118.9z"/>
+	<path class="st2" d="M1097.9,118.9c1.6-1.8,3.3-3.4,5.1-4.9c2.2,1.4,4.3,2.9,6.1,4.9C1105.4,118.8,1101.7,118.8,1097.9,118.9z"/>
+	<path class="st2" d="M546,176.3c9.5-1.2,19-2.3,28.6-1.9c0,1.9,0,3.8,0,5.7c0.6,0.3,1.8,0.9,2.4,1.3c0.8,0.1,1.5,0.1,2.3,0.2
+		c0.5-0.4,1.4-1.4,1.8-1.8c-1.2-0.6-2.5-1.1-3.8-1.4c0-1.1,0-2.1,0-3.2c0.9,0.4,2.7,1.1,3.6,1.5c1.4-0.1,2.8-0.3,4.1-0.9
+		c5.8-0.1,11.5,1.6,17,3.1c17.1,5.2,33.6,14.1,44.9,28.2c2.9,3.5,7.3,5.4,9.6,9.3c5.8,8.2,11.9,16.9,14,26.9c1,1.7,2.2,3.3,2.8,5.2
+		c3.4,11.5,5.3,23.5,5.1,35.5c0.2,5.4-1.2,10.7-1.1,16.1c-2.9,4.2-7.1,7.1-11,10.3c-2.2,2.4-4.5,4.6-6.6,7.1c-2.3,3-6,4.2-8.7,6.8
+		c-3.4,3.2-6.2,7-9.6,10.3c0,0.7-0.1,2.2-0.1,3c-1.6,0-3.2,0-4.8,0c0.8,6.1-6.6,6.1-9.5,10c-0.6,0.1-1.8,0.2-2.4,0.3
+		c-0.1,1.9-0.2,3.8-0.2,5.7c2.8-1.4,5.2-3.3,7.2-5.6c3.8-4.2,8.6-7.4,12-12c2-2.4,3.3-5.3,5.3-7.8c3.9-2.7,8.2-4.7,12.3-7
+		c0-0.6-0.1-1.8-0.1-2.4c2-2.2,4.2-4.3,6.4-6.3c1.1,0,3.2-0.1,4.2-0.2c1.3,2.6,0.2,4.8-2.3,5.8c-0.1,0.8-0.1,1.6-0.2,2.4
+		c0.6,0,1.7-0.1,2.3-0.1c-0.1,1.9-0.2,3.8-0.2,5.7c-2.7,4.7-4.2,10-6.5,15c-0.4-0.5-1.1-1.6-1.5-2.1c0.9-1.6,1.9-3.2,2.8-4.9
+		c-1.8,0.4-3.7,0.8-5.5,1.2c-0.5,2.4-0.6,5.1-2,7.2c-2.1,1.8-4.6,3-7,4.4c-0.1,0.7-0.2,2.2-0.3,2.9c-1.8,1.8-3.5,3.6-5.2,5.6
+		c-1.4,0-2.8,0-4.1,0c-0.8,2.6-2.6,4.6-5.2,5.5c-1.2,1.9-2.2,4-2.8,6.2c4.2-3,7.2-7.2,11.6-10c1.5,0.1,3,0.2,4.4,0.2
+		c1.9-3.2,3.8-6.4,5.7-9.6c2.7-2,5-4.5,7.8-6.4c-0.1,0.6-0.2,1.9-0.3,2.6c-12.4,21-32.5,37.6-55.9,44.8c-0.5,0.3-1.5,0.9-2,1.2
+		c-0.6-1.8-1-3.7-1.2-5.6c0.8,0,2.5-0.1,3.3-0.1c-0.1-0.8-0.2-2.3-0.3-3c5.7-1.6,9.2-6.5,14-9.5c0.5-1.7,1-3.4,1.6-5.1
+		c3.2-2.2,6.2-4.7,9-7.4c0.7,0,2.1,0.1,2.8,0.2c-0.1-1.7-0.1-3.4-0.1-5.1c-0.5,0-1.4,0.1-1.9,0.1c-2,2.4-4,4.8-6.1,7.1
+		c-1.2-0.1-2.3-0.1-3.5-0.2c-0.4,3.2-2.4,5.6-4.8,7.5c-0.7,1.4-0.8,3.2-2.1,4.1c-2.3,1-4.8,1.3-7.2,1.7c-0.5,1.8-0.9,3.6-1.4,5.4
+		c-3.4,4.5-8,7.8-12.3,11.3c0.9,0.1,2.8,0.3,3.8,0.4c-6.7,1-13.1,3.2-19.9,3.7c-7.9,1.4-16,0.6-23.9,0.8c-5.3,0.1-10.6-0.5-15.7-1.9
+		c-5.8-1.6-11.8-2.5-17.5-4.5c0.7-1.6,1.5-3.3,2.4-4.8c0.1-0.5,0.3-1.5,0.4-2c-1.5,0.5-3,1.1-4.5,1.6c-0.5,1.3-0.9,2.6-1.5,3.9
+		c-7.4-3.5-14.9-7-21.7-11.7c-9.6-6.3-17.6-14.8-24.9-23.5c1.5-0.5,3-1.1,4.6-1.6c0-0.9,0-1.7,0-2.6c-0.7-0.7-1.4-1.4-2-2.1
+		c-1.1,1.6-2.3,3.4-4.5,3.7c-4.1-7.1-8.4-14.2-11.2-22c-5.5-13.9-7.5-29-7.1-43.9c0.2-0.7,0.7-2,0.9-2.7c0.8,0,2.3-0.1,3.1-0.1
+		c1.9-2.4,3.8-4.8,5.8-7.1c0.7,0,2.2,0.1,2.9,0.1c0-1.6,0-3.1,0-4.6c0.5-0.3,1.5-1,2-1.3c0-0.9-0.1-1.9-0.1-2.8
+		c-0.9-0.9-1.8-1.7-2.7-2.6c0,1.1-0.1,2.2-0.1,3.3c-4,3.5-6.4,9.2-11.8,10.7c0.9-9.2,1.7-18.5,4.8-27.4c1.2-4.5,4.4-8,5.7-12.4
+		c0.8-2.7,2-5.2,3.5-7.5c2.8-4.2,4.1-9.5,8.3-12.7c3.6-2.8,5.4-7.1,8.4-10.4c7.1-6.7,14.7-13.1,23.6-17.2
+		C518.2,182.6,532.2,179.1,546,176.3 M588.6,181.8c0,0.9-0.1,1.8-0.1,2.6c2.3,0,4.7,0,7,0.1c0.6-0.6,1.2-1.2,1.9-1.9
+		c0.1-0.6,0.2-1.7,0.3-2.2C594.6,180.3,591.5,180.6,588.6,181.8 M543.5,183.4c0.4,3.1,0.1,6.4-2.9,8c0,1.7-0.1,3.4-0.1,5
+		c-3,0.5-5.8,1.8-8.1,3.7c-8,4.9-13.9,12.4-19.5,19.8c-2.4,3.3-5,6.4-6.8,10.1c-0.7,1.7-1.5,3.3-2.2,4.9c-7.4,20.1-11.2,41.7-8.5,63
+		c1.3,13,3.9,26.2,9.8,37.9c0.3,2.1,1.2,4,2.1,5.8c4.3,7.7,9.9,14.7,16,21c2.1,3.1,5.6,4.7,8.4,7.1c-1.4,2.5,0,7.6-4.2,6.9
+		c0.1,1.5,0.1,3,0.2,4.5c1.7-3.5,4.1-6.6,7.1-9.1c9.2,4.4,18.9,8.6,29.2,8.5c2.3,0,4.6,0.9,6.9,1c3.3-1,6.5-2.1,9.9-2.5
+		c0.4,1.8,0.7,3.6,1.1,5.4c0.1,0,0.3,0,0.4,0c-0.3-2-0.4-4.1-0.5-6.1c10.3-1.4,18.3-8.7,27.3-13.3c1.6-1.5,2.1-3.9,3.5-5.5
+		c6-7.1,11.6-14.8,15-23.6l-0.3-0.5c1.4-3.1,2.7-6.2,4.1-9.3c0-0.6,0.2-1.8,0.2-2.5c2.4-0.9,4.6-2.3,7.1-2.6c0,2.1,0,4.2,0,6.4
+		c-1.5,2.4-3.7,3.6-6.5,3.1c-0.1,2.5,1.7,4.1,4,4.3c0.9-4,2.7-8.8,7.3-9.7c0-1.1,0-2.2-0.1-3.3c0.5-0.7,1-1.4,1.5-2.1
+		c-1.6,0-3-0.5-4.3-1.4c0.8-0.9,1.7-1.8,2.5-2.8c-2.3-0.1-4.6-0.1-6.8,0c-1.1,1.4-2.3,2.6-3.8,3.5c1.8-7.2,2.3-14.6,3.2-22
+		c0.3-2.3,1-4.6,0.8-7c-1-8.3-0.4-16.7-1.9-25c-0.7-7.6-3.1-15-5.4-22.2c-2.7-7-4.8-14.5-9.7-20.4c-8.3-12.6-20.2-23.2-34.7-28
+		c-3.8-1.5-8.1-1.9-11.6-4.1c-0.5,0.2-1.4,0.6-1.9,0.9c-6.7,0-13.4,0.2-20.2,0.3c-1.3,1.4-3.1,1.9-4.9,2.3l-1.3,1.2
+		c-0.2-1.2-0.3-2.5-0.5-3.8c0.6,0,1.7,0,2.3,0.1c0-2.7-0.1-5.4-1.1-8C545,183.4,544,183.4,543.5,183.4 M489.6,222.8
+		c0,0.9-0.1,1.8-0.1,2.7c2.9,0,5.7-0.1,8.5,0c-2.6-0.7-4.4-2.4-3.8-5.2C493.4,222,491.7,223,489.6,222.8 M476.5,252.4
+		c0,1.6,0,3.3,0,4.9c2.9-0.6,3.7,2.4,4.2,4.5c-0.8,1.1-1.2,2.3-1.5,3.6c0.6,0,1.8,0,2.4-0.1c0.9-0.9,1.9-1.9,2.8-2.8
+		c0-1.7,0.1-3.4,0.1-5.2c-1.3,0.1-2.6,0.1-3.8,0.2c-0.8-0.8-1.6-1.5-2.3-2.3c0.1-0.7,0.2-2.2,0.3-2.9
+		C478.1,252.4,477,252.4,476.5,252.4 M649.6,304.5c0,0.5-0.1,1.4-0.1,1.9c1.3,0,2.7,0,4,0c0-0.7,0-2.1,0-2.8c1.1-0.5,2.3-1,3.4-1.6
+		c0.8-1.8,1.9-3.4,3.1-4.9C656.3,299.2,652.5,301.3,649.6,304.5 M662.4,322.5c0.1,1.2,0.2,2.4,0.2,3.7c-3.5,1.6-5.5,5-7.4,8.1
+		c-0.6,0.2-1.6,0.7-2.2,0.9c-2.5,0.6-4.3,2.6-4.8,5.1c-0.5,0.3-1.6,0.9-2.1,1.2c-0.5,0-1.5,0-2.1,0.1c-0.8,0.8-1.6,1.7-2.4,2.5
+		c-0.1,0.4-0.4,1.1-0.5,1.4c1.7,0.1,3.7-0.2,5.1,1c0.1-0.4,0.2-1.3,0.3-1.7c2.8-2.7,5.9-5.1,8.5-8c1.4-0.5,2.7-1,4.1-1.5
+		c0.9-1,2-1.9,3.5-1.9c0-1.9-0.3-3.8,0.1-5.7c1.3-0.1,2.7-0.2,4.1-0.2c-0.1-0.4-0.2-1.1-0.3-1.5c0.9-1,1.1-2.3,1.4-3.5
+		C666,322.5,664.2,322.5,662.4,322.5 M516.4,369.6c-0.6,0.7-1.2,1.3-1.8,2c2.7,1.7,2,4.8,2,7.5c-1,0.7-2,1.5-3,2.2
+		c0,0.6-0.1,1.7-0.1,2.2c1-0.1,2-0.1,2.9-0.2c0.1-0.6,0.2-1.8,0.2-2.4c2.4-1.9,2.6-5.2,3.8-7.9c-1-1-2-2.1-2.3-3.6
+		C517.7,369.5,516.8,369.6,516.4,369.6 M540.6,382.4c0,1.7-0.1,3.4-0.1,5.1c1.2-0.1,2.5-0.1,3.8-0.2c0.2-1.6-0.3-3.5,1.3-4.5
+		c-0.9-0.8-1.8-1.6-2.7-2.4C542.1,381.1,541.3,381.8,540.6,382.4z"/>
+	<path class="st2" d="M694.2,179.4c7.9,0.3,15.8,1.5,23.8,1.4c16-0.3,32,0.4,47.9-1c11-0.3,22.1-0.4,33.1-0.3
+		c7.8,0.1,15.6,1.6,22.8,4.5c7.9,2.2,13.9,8,19.2,14c1.5,2.2,2.6,4.7,4.1,6.9c2.8,4,3.9,8.8,5.4,13.4c0.2,0.7,0.6,2,0.8,2.6
+		c0.3,4.4,1.6,9.3-1.2,13.1c-1.8,2.7-2.7,5.9-4.2,8.8c-1.9,2.6-4,5.1-5.6,7.9c-0.6,0-1.9,0-2.6,0c0.1,3.7-1,7.1-3,10.2
+		c-1.5-0.1-2.9-0.2-4.3-0.4c0.1,2.7,0.2,5.5,0.4,8.2c-1,0-1.9-0.1-2.8-0.1c-0.8,2-1.7,4.1-2.5,6.1c-1.4-0.1-2.7-0.2-4-0.3
+		c0,1.2,0.1,2.3,0.2,3.5c2.3-1.5,4.9-2.6,7.8-2.7c0.2,1.5,0.6,2.9,0.9,4.4c0.1-2,0.2-4.1,0.3-6.1c1.6-0.8,3.1-1.6,4.7-2.4
+		c0.5-3.2,2.2-5.8,4.5-8c-1.4-0.7-2.7-1.5-4.1-2.2c1.6-0.6,3.2-1.2,4.8-1.8c1.7-3,3.3-5.9,5.1-8.8c0.7,0.1,2.2,0.2,2.9,0.3
+		c0-2.7,0-5.9,3-7.1c0.1,1.1,0.2,3.1,0.2,4.2c-2.1,10.8-5.9,22.1-14.4,29.6c-2,3-4.2,5.8-6.9,8.2l-1.9,0.4c0-1.8,0.1-3.6,0.1-5.3
+		c-1.7-0.5-3.4-1-5.1-1.4c0.1,2.3,0.1,4.6,0.2,7c-2.1,0.2-4.2,0.4-6.3,0.5c-0.6,2.2-0.8,4.6-2.2,6.5c-2.7,2.3-6.2,3.5-8.5,6.3
+		c-10.3,3.9-21.4,5.8-32.4,4.7c-0.1-4.1-0.2-8.2-0.2-12.3c3.4-0.6,6.8-1.3,10.3-1.6c8.7-3.5,16.8-9.2,21.6-17.5
+		c3.9-7.1,5.8-15.3,5.7-23.4c1.2,0,2.4,0,3.6-0.1c0-2.3,0.1-4.7,0.2-7c-1,0.2-2.1,0.4-3.1,0.6c0-2.7,0-5.4,0.1-8.1
+		c2.8,0.5,4,2.9,5,5.3c1.3-2.9,0-6.1-0.4-9.1c-0.6,0.5-1.2,1.1-1.8,1.6c-1.2,0-2.4,0-3.7,0c-0.6-11.5-5.6-23.4-15.2-30.2
+		c-11.2-7.8-25.7-8.6-38.8-6.8c0.3,10.8-0.5,21.7,0,32.5l-1.1-1.3c-0.2-2.1-0.2-4.3-0.2-6.4c-0.4,1.9-0.7,3.8-1.1,5.7
+		c-4.4,3.4-8.3,8.5-14.4,8.6c-1.5,3.9-3.8,7.4-4.8,11.4c1.1-1.6,2.2-3.2,3.3-4.8c1.9,0,3.8,0,5.8,0c0.8,0.4,1.6,0.9,2.4,1.3
+		c-0.6-2.4-1.1-4.8-1.6-7.2c3.5-2.9,7.7-4.7,11.6-6.9c-0.1,4.9,0.9,10.4-2.2,14.6c-3.2,6-7.2,13.7-15.1,13.7c0-1,0.1-3.1,0.1-4.1
+		c0.4-0.9,0.9-1.9,1.3-2.8c-1.8,1.4-3.5,2.9-5.2,4.4c1.3,3.2,0.6,6.6,0,9.8c-1.1,1.4-2.2,2.8-3.3,4.2c1.8,0,3.6,0,5.4,0
+		c-0.1-2.5-0.1-4.9-0.1-7.4c1.6,0.4,3.2,0.9,4.8,1.4c3.3-3.2,7-6,10.9-8.4c0.4-2,0.8-4,1.3-5.9c0.6,0.1,1.8,0.3,2.4,0.4
+		c-0.4,30.5,0,61-0.2,91.6c0,6.5-0.2,13.1,0.8,19.6c0.1,1.7,0.1,3.4,0.1,5.1c-0.5-0.1-1.6-0.2-2.1-0.3c0.1,3,0.1,6,0.2,8.9
+		c-1,1.1-2.1,2.1-3.1,3.2c0,0.8,0.1,2.2,0.2,3c-0.8,0.7-1.5,1.4-2.2,2.1c-1.6,0-3.3,0-4.9,0c-1.6,2.1-3.1,4.3-5.1,6
+		c-1.5,0.1-3.1,0-4.6,0c-0.1,1.4-0.9,2.1-2.1,2.2c-10.4-0.6-20.7,0.9-31,0.5c-3.3,0.6-6.7,1-10.1,1.2c1-4,0-8-0.1-11.9
+		c6.6-0.4,14.5,0.6,19.5-4.8c4.4-5.5,4.7-12.8,5.2-19.5c0.8-17.8,0-35.6,0.4-53.4c0-1.9,0.6-3.7,1.8-5.2c3-3.7,6.6-6.9,10-10.2
+		c0.1-0.5,0.2-1.6,0.2-2.1c-1.2,0-2.5,0.1-3.7,0.2c-0.8,1.7-1.6,3.3-2.4,5c-1.9,0-3.7,0-5.6,0.1c-0.1-2.2-0.5-4.4-0.1-6.6
+		c1.4-1.4,3.1-2.5,4.8-3.7c0.6,0,1.7,0,2.2,0c1.9-3.3,4.4-6.3,7.1-9c-1.5,0.1-3,0.2-4.5,0.3c-0.8,1-1.6,1.9-2.4,2.9
+		c-0.5,0.1-1.4,0.3-1.9,0.4c-0.9,2.5-2.8,4.1-5.5,4.3c0.3-5.2-0.8-10.7,0.9-15.7c1.5-4,6.1-5.4,10.1-5.2c-0.1-1.2-0.1-2.3-0.2-3.5
+		c1.6-2.5,3.5-4.9,5.6-7.1c-3.1,2.2-6.2,4.6-8.8,7.4c-2.4,2.3-4.5,5.3-8,6c0.6-7,0.2-14,0.3-21c-0.1-11.8,0.7-23.8-1.7-35.4
+		c-0.9-4.6-3.9-8.3-7.5-11.1c-5.1-1.2-10.3-1.2-15.5-1.2C693.8,187.3,693.2,183.3,694.2,179.4 M830,202.4c-1.6,2.1-4.1,2.3-6.6,2.1
+		c0,0.5,0.1,1.4,0.1,1.9c1.4,1.5,2.9,3,4.4,4.4c-0.9,2.6-2.3,5-3.6,7.4c-0.8,1.5-1.7,3-2.7,4.3c-0.1,1.7-0.2,3.4-0.2,5.1
+		c1-0.1,2.1-0.1,3.1-0.1c0-2.3,0-4.5-0.1-6.8c1.4-2,2.7-4.2,4.5-6c1.7-0.3,3.4-0.3,5.1-0.4c-1.6-2-3.4-3.7-5.4-5.2
+		c-0.1-1.6-0.2-3.1-0.2-4.6c2.3,0,4.6,0,7,0C833.7,203.3,831.9,202.4,830,202.4 M836.4,205.5c0,1,0.1,2,0.2,3c1.7,0,3.3,0,5,0.1
+		c0-1.1,0-2.1,0.1-3.2C839.9,205.4,838.1,205.4,836.4,205.5 M830.6,224.7c0,1,0,2.1,0,3.1c1.1-0.4,2.3-0.7,3.4-1.2
+		c1.1-0.1,2.2-0.1,3.4-0.2c0.1-1,0.2-1.9,0.3-2.9C835.2,223.5,832.8,223.7,830.6,224.7 M804.3,281.5c-0.6,1-1.2,2.1-1.8,3.1
+		c-1.6-0.1-3.3-0.1-4.9-0.1c0,1.3-0.1,2.7-0.1,4c0.9-0.1,1.9-0.1,2.8-0.2c1.3-2.8,4.1-4.3,7.2-4c0-1,0-1.9,0-2.9
+		C806.4,281.5,805.4,281.5,804.3,281.5 M704,382.1c0.8,1.3,1.4,2.7,1.9,4.2c1.5,0.5,3.1,1,4.7,1.4c-0.1-1-0.1-2-0.2-2.9
+		C707.8,384.8,705.4,384.4,704,382.1z"/>
+	<path class="st2" d="M1098.7,180.2c3.4-0.4,6.8-0.8,10.2-0.3c2.4,1.6,4.1,4.1,6.2,6.1c1.6,1.9,4.2,3.6,3.6,6.5
+		c-3.4,2.2-7.7,0.9-11.4,1.1c0,0.2,0,0.5,0,0.7c0.9,0.4,1.9,0.7,2.9,0.9c2.6-1.5,5.9-1,7.9,1.4c1.3-0.8,2.6-1.7,4-2.5
+		c0.9,1.3,1.9,2.7,2.9,4.1c-1.1,2-2.3,3.8-3.6,5.7c0.6-0.1,1.6-0.3,2.2-0.4c1.3-1.2,2.8-2.1,4.7-2.1c3.4,3.7,5.3,8.4,8.8,12
+		c4.9,5.8,9.7,11.6,14.8,17.2c6.2,5.2,10.8,11.9,16.1,17.8c6,7.4,12.7,14.2,18,22c8.4,8,15.3,17.4,22.8,26.4
+		c6.1,6.2,11.7,12.9,16.8,20c1.3,3.2,3.8,5.6,6.1,8.2c1.8,2.7,4.1,5.1,6.9,6.7c-0.4-11.8-0.9-23.6-1.1-35.4c-0.8-6-0.6-12-0.7-18
+		c3.9,0.5,5.3,4.3,6.4,7.5c0.9,0,1.7,0,2.6,0.1c-0.1-1.5-0.1-2.9-0.2-4.4c0.5-0.3,1.4-0.9,1.9-1.2c-2.9-0.2-5.5-1.6-6.3-4.5
+		c-0.6,0.1-1.8,0.2-2.4,0.2c-0.7-1.2-1.3-2.4-2-3.7c-0.5-5,1-9.9,0.7-14.9c-1.2-6.6-0.6-13.3-0.7-20c0-4-0.4-8.1,0.4-12
+		c1-3.9-0.7-7.8-1-11.7c-0.6-6.5-2.8-13.1-7.4-17.8c-4.9-3.5-11.2-4.1-17.1-4.1c0-1.9,0-3.7,0.1-5.6c0-2.2,0-4.3-0.1-6.5
+		c3.1,0.7,6.3,1.5,9.5,1.4c19.6-0.3,39.2,0.6,58.7-1.3c1.3,3.5,0.4,7.2-0.4,10.6c-1-1.1-1.9-2.1-2.9-3.2c-1.9-0.1-3.6-0.9-5-2.2
+		c-2.3-0.1-4.5-0.1-6.8-0.1c0,1.3,0.1,2.6,0.2,3.9c-0.5,0.2-1.6,0.7-2.2,0.9c0,0.6-0.1,1.7-0.2,2.2c0.6-0.1,1.9-0.3,2.6-0.4
+		c-0.2,0.7-0.5,2.2-0.7,3c-5,4.4-7.1,11.2-6.7,17.7c0.3,4.4-1.1,8.7-0.6,13c0.8,8.2-0.9,16.5,0,24.7c-1.1,0-2.3,0.1-3.4,0.1
+		c-0.7-1.4-1.2-2.8-2-4.1c-1.1,0.7-2.1,1.4-3.1,2.1c0,0.3,0.1,1,0.2,1.3c2.6,1,6.5,1,7.3,4.2c1.1,3-0.6,6-1.6,8.7
+		c1.9,2,2.4,4.7,2.1,7.3c-0.6,6.7-0.2,13.4-0.4,20.1c-0.9,0-2.6,0.1-3.4,0.2c-0.4-0.2-1.1-0.8-1.5-1c-2.7,2.1-6.1,2.1-9.3,2
+		c0,0.2,0.1,0.6,0.1,0.8c4.6,0.4,11.2-1.8,13.8,3.4c-0.3,4.3-0.2,8.5,0.2,12.8c-2.7,0-5.3,0-7.9,0c1.4,2.4,2.7,4.8,3.6,7.5
+		c1.3-0.4,2.7-0.8,4.1-1.2c-0.7,7-0.3,14.1-0.6,21.2c-0.2,4.7-0.8,9.3-0.8,14c0,3.3,1.1,6.6,0.8,10c-0.4,3.2-0.9,6.5-0.7,9.8
+		c1.8,3.6,0.2,7.5,0,11.2c-0.3,4.6,0.1,9.1,0.1,13.7c-5.2-0.1-10.4-0.2-15.4-1.2c-6.9-6.8-11.5-15.5-17.8-22.8
+		c-4.5-6.2-10.3-11.2-15-17.2c-4.1-4.3-7.3-9.2-11-13.8c-7.3-7.1-13.7-15.1-20.1-23c-5.6-5.5-9.6-12.4-15.3-17.7
+		c-4.4-4-7.2-9.3-11.5-13.4c-8-8-14.8-17.2-22.2-25.7c-5.9-6.8-12.2-13.3-17-21c-5.5-7.1-11.4-13.9-17-20.9c0,8.4,0.2,16.8,1.3,25.1
+		c0.1,10,1,19.9,1,29.9c0.3,15.9,0,31.8,0.3,47.7c-2.3,2.2-0.3,5.2-0.2,7.9c-1.9,1.2-2.6-1.1-3.8-1.9c-1.7,1.1-3.5,2.3-5.2,3.4
+		c0,0.8,0,1.6,0,2.5c1.3,1.1,2.6,2.3,3.9,3.4c0,0.9,0.1,1.9,0.2,2.8c1.8-1.2,3.8-2.1,5.9-2.8c-0.1,8.1,0.4,16.2,0.9,24.2
+		c0.4,5.6,1.5,11.5,5.6,15.7c4.8,4.1,11.5,3.8,17.4,4.7c-0.1,3.5-0.2,6.9-0.2,10.4c-0.6-0.1-1.8-0.4-2.4-0.5
+		c-0.4,0.4-1.1,1.1-1.5,1.5c-11.8-0.8-23.6-0.4-35.3-1c-10.2,1-20.4,0.1-30.5,1.5c-0.1-4-0.1-7.9-0.1-11.9c0.7,0,2-0.1,2.7-0.2
+		c5.2-0.2,10.3-1.4,15.2-2.9c0.5-0.9,1.1-1.8,1.6-2.6c5.8-8.5,4-19.2,4.8-28.8c0.9-8,0.3-16,0.6-24c-0.2-30-0.1-60,0.1-90
+		c0.3-8-0.4-16-1.3-23.9c-0.6-4.9-2.9-9.5-6.4-12.9c-5.3-2.7-11.4-2.8-17.3-2.9c-0.1-3.6,0.1-7.3,1.1-10.8c1.5-0.3,2.9-0.7,4.5-0.8
+		c9.1,1.3,18.3,0.9,27.5,0.9c0,1,0.1,2,0.2,3c-0.5,0-1.6-0.1-2.1-0.1c0,0.5-0.1,1.5-0.1,2c1.6-0.1,3.1-0.1,4.7-0.1
+		c0.4-1.3,0.9-2.6,1.4-3.9C1090.5,180.1,1094.7,180.7,1098.7,180.2 M1101.6,183.1c0,0.8,0,2.4-0.1,3.2c-0.9,0.7-1.8,1.3-2.7,2
+		c1.5,0.1,3.1,0.2,4.6,0.3c0.7-0.6,1.5-1.2,2.2-1.8C1104.3,185.5,1103,184.2,1101.6,183.1 M1231.9,186.8c-0.3,0.9-0.6,1.7-0.8,2.6
+		c2.7,1.1,5.6,1.2,8.5,1.2c0-1.1,0-2.3,0-3.4c-0.5,0.1-1.5,0.3-2,0.4l-0.2-1.3C1235.6,186.5,1233.7,186.4,1231.9,186.8
+		 M1084.6,193.9c0,2-0.1,3.9-0.1,5.9c0.8-0.3,1.6-0.7,2.4-1c1-0.4,2-0.8,3-1.2c1.4-0.1,2.8-0.1,4.2-0.2c-1-0.3-1.9-0.6-2.9-1
+		c-0.4-1.2-0.8-2.5-1.1-3.8c-1.2-0.1-2.7,0.2-3.2-1.2C1086.2,192.3,1085.4,193.1,1084.6,193.9 M1235.3,199.5
+		c0.1,0.4,0.3,1.2,0.4,1.6c2.5,0.7,5,1.3,7.6,1.4c0-1,0-1.9,0.1-2.9C1240.7,199.6,1238,199.6,1235.3,199.5 M1156.2,245.3
+		c0.4,0.9,0.8,1.8,1.2,2.7c0,0.6,0.1,1.9,0.1,2.5c1,0,1.9,0,2.9-0.1c0-1.2,0-2.4,0-3.6C1159,246.4,1157.6,245.8,1156.2,245.3
+		 M1186.7,279.3c-0.3,1.4,0.6,3.8-1.4,4.2c-1.6,0.6-3.3,0.9-4.9,1.2c0.1,0.4,0.2,1.2,0.3,1.6c1.6,0.2,3.6-0.2,4.6,1.4
+		c0.1-1.3,0.1-2.6,0.2-3.9c2-0.5,4-1,6-1.5c0-0.4-0.1-1.2-0.1-1.7C1189.8,280.1,1188.3,279.6,1186.7,279.3 M1084.2,293.6
+		c-1.5,0-3,0-4.5,0c-1,0.8-2,1.6-3,2.4c-0.2,1-0.3,1.9-0.5,2.9c1.2-0.5,2.4-1,3.6-1.5c2.1,0,4.3,0,6.5,0c0.7-2.1,1.1-4.3,1.3-6.5
+		C1086.5,291.8,1085.3,292.7,1084.2,293.6 M1180.8,296.5c-0.6,1-1.1,2-1.6,3c2.1,0,4.2-0.1,6.3-0.1c0-0.9,0-1.9,0-2.8
+		C1183.9,296.6,1182.3,296.5,1180.8,296.5 M1205.3,345.5c0.1,0.9,0.2,1.7,0.3,2.6c0.4,0.3,1.3,1,1.7,1.3c0.5,0,1.5,0.1,2,0.2
+		c0.5-1.4,0.9-2.7,1.4-4C1209,345.5,1207.2,345.5,1205.3,345.5 M1242.2,379.5c-1.7-0.2-3.2-0.8-4.7-1.3c0,1.6,0.1,3.1,0.2,4.7
+		c0.8,1.1,1.6,2.2,2.3,3.4c1.2,0,2.3,0.1,3.5,0.2c-0.1-2.3-0.1-4.7,0-7.1c0.8,0,2.3,0,3,0c0-0.6,0-1.8,0-2.4
+		C1244.9,377.6,1243.5,378.5,1242.2,379.5z"/>
+	<path class="st2" d="M863.5,185.5c0-2.1,0.1-4.1,0.2-6.1c5.7,1.7,11.9-0.2,17.4,2c4.4,0.3,8.8-0.5,13.2,0.4c-1.5,0.4-2.9,1-4.2,1.7
+		c-0.6,0-1.9,0-2.5-0.1c0,1.8,0,3.5,0,5.2c0.5-0.1,1.5-0.1,2-0.2c0-0.7,0-2,0-2.7c0.5-0.3,1.6-0.9,2.2-1.3c2.4,0,5,0.2,7.3-0.5
+		c3.2-2.2,7.1-3.8,11-3c4.3,0.9,8.7-0.4,13-0.3c11,0.1,21.9-0.2,32.9,0.1c1.6,1.1,3.5,1,5.1-0.1c10.6-0.6,21.3,0.3,31.9-0.7
+		c7.9-0.4,15.7-0.3,23.6-0.5c0.1,4.1-0.2,8.2,0.8,12.2c0.3,4.9,0.3,9.9,1.1,14.8c-1.2,0.1-2.4,0.2-3.5,0.3c-1.5,2-3.1,4-4.6,5.9
+		c-1.4-0.1-2.8-0.1-4.2-0.2c0.1,0.5,0.4,1.4,0.5,1.9c0.6,0,1.9,0.1,2.5,0.2c1.2,1.4,2.4,2.9,3.6,4.3c-0.6,4.2-1.4,8.4-1.4,12.6
+		c-1.4,0-2.7,0-4.1,0c-2.1-8.8-3.2-18.4-9-25.7c-4.7-6.4-12.8-8.8-20.3-9.8c-12.9-2.3-26-1.3-38.9-1.6c-3.7-0.3-7.2,0.9-10.6,2.3
+		c-1.8,6-0.6,12.2-1.3,18.3c-0.6,4.5,0.2,9,0.3,13.5c-0.7,0-2.1,0-2.8,0c-0.4-2.1-0.9-4.2-1.3-6.2c-0.4,0.1-1.2,0.4-1.5,0.5
+		c-1.7,1.6-3.4,3.1-5.1,4.6c0,1.8,0,3.5,0,5.3c-1.5-0.1-3.1-0.1-4.6-0.2c-0.8-0.7-1.6-1.4-2.3-2.2c-0.3-1.7-0.8-3.4-2.2-4.5
+		c-0.4,0.4-0.9,0.9-1.3,1.4c0.6,1.2,1.2,2.4,1.8,3.6c1.1,0.4,2.1,0.8,3.2,1.3c0.5,1.9,0.3,3.9,0.3,5.9c-3.1,3.2-0.5,7.5-0.7,11.4
+		c-1.1,0.6-2.2,1.2-3.3,1.9c0,1,0.1,2.1,0.1,3.1c2.5,0,5,0,7.5,0c1.4-1.6,2.9-3.1,4-4.9c0.5-3.2,0.2-6.5,0.2-9.7
+		c1.4-1.2,2.9-2.4,4.3-3.6c0.9,0.1,1.8,0.2,2.8,0.3c0.2,0.4,0.7,1.2,0.9,1.6c-0.1,11.8,0.1,23.5-0.4,35.3c1.9,0.2,3.9,0.2,5.8,0.2
+		c13.7-0.4,27.5,0.6,41.2-1.2c4.2-0.5,8.4-1.9,12-4.3c3-3.2,4.4-7.5,4.9-11.8c0.5-2.8,0.6-5.7,0.8-8.6c3.5,0,6.9,0,10.4,0
+		c0.6,0,1.8,0,2.4,0c0,0.6-0.1,1.8-0.2,2.3c-0.1,1-0.2,2.1-0.3,3.1c-0.9,10.9-0.5,21.9-0.6,32.8c0.2,9.6-0.4,19.2,1.2,28.7
+		c-4.3-0.3-8.5,0-12.8,0.5c-1.4-6.5-0.7-14.1-5.6-19.4c-5.7-5.9-14.5-6.3-22.2-7.1c-12.5-0.4-25-0.2-37.5-0.2
+		c1.3,4.8-0.5,9.7,0.5,14.5c0.8,6,0.2,12,0,18c0.8,11,0,22,0.5,33c0.4,5.6,1.7,11.5,5.5,15.8c4.9,4.4,11.8,4.9,18.1,4.9
+		c2.5-0.1,6.2,0.5,5.7,3.9c1.2-0.1,2.4-0.1,3.6-0.2c0-0.7,0-2.1,0-2.8c7.1-1.4,14.4-0.5,21.6-1.1c5.4-0.4,10.5-2,15.7-3.3
+		c0,0.7-0.1,2.2-0.1,2.9c0.6,0.3,1.8,0.9,2.4,1.1c3.8,0.4,7.6,1.5,11.5,1.3c0-1.6-0.1-3.2-0.1-4.8c-1.1-0.4-2.1-0.9-3.2-1.2
+		c-0.8,0.6-1.5,1.2-2.2,1.9c-2.4,0.1-6,0.5-6-2.9c9.1-3.8,15.5-11.9,20-20.4c2-5,3.6-10.1,5.4-15.2c4.2,0.3,8.1,1.9,12.1,2.8
+		c0.2,2.1-0.3,4.1-0.8,6.1c-4.2,16.1-7.9,32.2-11.4,48.5c-11.1-1.3-22.3-0.3-33.3-1.9c-28.6,0.7-57.3-0.6-86,0.7
+		c-14.1,0.3-28.3-0.1-42.3,1.2c0.1-4,0-7.9,0-11.8c6.1-0.2,13.1,0.2,18.1-4.1c2-2.1,3.5-4.6,4.2-7.4c2.9-10.1,1-20.8,2.5-31.1
+		c-0.5-6.7-0.3-13.3-0.7-20c-0.2-5,0.9-10,0.2-14.9c-0.6-4.7,0.6-9.3,0.3-14c-0.8-8.3-0.3-16.7-0.4-25.1c0.1-12.3-0.3-24.6,0.4-36.9
+		c-0.9-9,0.2-18.4-3.3-26.9c-1.8-3.9-5.3-7.6-9.8-7.6c-3.8-0.2-7.6,0-11.5-0.1C863.5,189.4,863.4,187.5,863.5,185.5 M947.5,183.5
+		c0,1.3,0.1,2.6,0.1,4c2.3,0,4.6,0.1,7,0.1c0-1.4,0-2.7,0-4.1C952.2,183.5,949.8,183.5,947.5,183.5 M893.4,310.6c-0.9,1-1.8,2-2.8,3
+		c0,0.5-0.2,1.4-0.2,1.9c1.1,0,2.1-0.1,3.2-0.1c0.6-0.6,1.2-1.2,1.8-1.9c0-1.1,0-2.1,0.1-3.1C895,310.5,894,310.6,893.4,310.6
+		 M1022,362.7c-1.5,1.8-3.5,3.4-3.8,5.8c0.6,0,1.7,0,2.3,0c1.3-1.3,2.6-2.6,3.9-3.9c0.1-0.5,0.2-1.7,0.2-2.2
+		C1023.8,362.4,1022.9,362.5,1022,362.7z"/>
+	<path class="st2" d="M1014.4,212c2.6,0.1,4.4,1.4,4.8,4.1c0-0.3,0-0.9,0-1.2c0.1,2.6,0.3,5.2,0.7,7.8c-0.5-1.1-1.1-2.2-1.6-3.2
+		c-1.2,0-2.5,0.1-3.7,0.1C1014.5,217,1014.4,214.5,1014.4,212z"/>
+	<path class="st2" d="M1014,231.7c0.9-3.2,1.7-7.2,5.5-8.1c0.5,2.3,0.9,4.6,1.3,6.9C1018.6,231,1016.3,231.3,1014,231.7z"/>
+	<path class="st2" d="M759.5,370.7l1.6,1.1c0.6,0.9,1.3,1.8,2,2.7c4.6,5.1,12.2,4.9,18.6,4.8c0.1,4,0,8-0.1,11.9
+		c-6.7-1.4-13.6-0.3-20.4-1.7c0.1-0.6,0.1-1.9,0.2-2.5c-4.3,2.3-9.1,3-14,2.4c-0.1-1-0.1-2-0.1-2.9c4.7-2.4,6.7-8.1,12.1-9.6
+		C759.4,374.9,759.4,372.8,759.5,370.7z"/>
+	<path class="st2" d="M545.8,477.4c18.7-6.2,38.5-9.5,58.2-8.8c5.9-0.2,11.8-0.1,17.6,1.1c0,1.3,0,2.5,0,3.8c1.7,1.3,2.8,3,3.2,5.1
+		c0.4,0,1.3,0,1.7,0c0-2.5-0.1-4.9-0.2-7.4c3.5-1.2,7,0.4,10.5,1c7.4,2,15,3.8,21.8,7.5c5.8,2.8,12.8,4.4,17,9.6
+		c7.8,2.7,14.1,8.6,20.1,14c6.9,5.4,12.4,12.3,17.7,19.2c1.8,2.3,2.3,5.4,4.5,7.5c5,5.1,7.3,12,10.7,18.2c-0.3,0.4-1,1.1-1.4,1.4
+		c0.5-0.1,1.3-0.4,1.8-0.5c2.5,5.9,4,12.2,6.4,18.2c1.8,6.9,3.3,13.8,4.1,20.9c0.1,1.8,0.1,3.6,0.1,5.5c-1.9-0.1-3.8-0.2-5.7-0.3
+		c-0.9,7.1-6.5,12.7-12.8,15.5c-1.1,1.5-2.2,3.1-4.4,2.6c-1.2-1.6-2.2-3.3-3.1-5.1c-1,0-2.1,0-3.1,0c-1,1-2,1.9-3,2.9
+		c0,1,0,2.1,0,3.1c2.9-0.1,5.8-0.2,8.6-0.2c-0.7,1.4-1.3,2.8-2,4.2c2.8-0.1,5.6-0.1,8.4-0.1c0-0.7-0.2-2.1-0.2-2.8
+		c1.8-1.4,3.6-2.8,5.4-4.2c0.7,0.1,2,0.2,2.7,0.2c0-1.8-0.2-3.8,0.4-5.5c1-1.4,2.3-2.6,3.5-3.8c0.1-1.6,0.1-3.2,0.2-4.9
+		c1.6,0,3.3-0.1,4.9-0.1c0.4,1.1,0.7,2.2,1.1,3.3c0,4.3-0.2,8.6,0,12.9c-0.9,0-2.5-0.2-3.4-0.2c-0.4,2.4-0.7,4.8-0.9,7.3
+		c1.1,0.8,2.2,1.6,3.3,2.4c-0.2,0.5-0.6,1.5-0.8,2c-0.2,5.1,0.1,10.3-1.9,15c-0.3,2.7-1,5.4-2,8c-0.5,3.8-1.4,7.5-2.9,10.9
+		c-2.8,12.1-8.6,23.4-15.6,33.5c-5.4,9.2-13.1,16.7-21,23.8c-5.7,4-10.5,9.1-16.5,12.6c-3.6,2.2-7.3,4.1-10.8,6.5
+		c-5.2,1.5-7.5-5.5-12.8-5.2c0.1,0.5,0.4,1.6,0.6,2.2c0.8,0,2.4,0.1,3.1,0.1c-0.3,2.3-0.6,4.7-1.1,7c0.3-0.1,0.9-0.2,1.2-0.2
+		c-12.2,3.8-24.3,8.2-37.1,9.6c-13.5,4.7-28,2-41.9,2.9c-18-0.8-35.4-6.6-51.9-13.5c0.5-1.9,1.1-3.8,1.6-5.6c-1.1,0-2.2-0.1-3.4-0.1
+		c0,0.8,0.1,2.4,0.1,3.2c-0.8,0-2.4-0.1-3.2-0.2c-8.8-5.7-18.4-10.5-25.9-18c-1.8-1.8-3.7-3.2-5.7-4.7c-0.1-0.7-0.4-2.2-0.5-2.9
+		c0.4-0.4,1.1-1.3,1.4-1.8c-1.6-1.2-3.3-2.2-5.1-3.2c-0.1,1-0.2,2.9-0.3,3.8c-0.3-0.6-1-1.9-1.3-2.6c-2.4-2.3-4.6-4.9-5.5-8.2
+		c-1-2.1,1.8-2.2,3-2.8c0.1-0.5,0.2-1.4,0.2-1.9c-1.4,0.1-2.8,0.2-4.2,0.3c-0.1,0.9-0.2,2.8-0.3,3.7c-3.4-2.3-4.9-6.2-7.1-9.4
+		c-1.5-2.3-3.1-4.7-4.5-7l-0.6-1.2c1.4-0.1,2.8-0.1,4.2-0.1c0.2-1.3,0.4-2.6,0.6-4c-1.1,0.4-2.2,1.3-3.4,1.2c-2.1,0-1.8-2.9-2.3-4.2
+		c1.4,0,2.8,0,4.1,0c0.5-1.3,1-2.6,1.5-4c1.6-0.1,3.2-0.2,4.9-0.3c0,1.3,0,2.7,0,4c-0.5,0.3-1.6,0.9-2.1,1.2c0,0.5,0.1,1.4,0.1,1.8
+		c3,2.6,6,5.4,9.7,6.9c-1,0.8-1.9,1.6-3,2.3c-1.7-0.1-3.3-0.8-4.9-1.3c0.1,0.9,0.2,1.7,0.3,2.6c1.8,1,3.3,2.4,4.4,4
+		c0.9-1.9,1.9-3.8,3.2-5.5c0.1-1.3,0.3-2.6,0.4-3.9c-1.8-1.2-3.7-2.4-5.5-3.5c-0.1-2.9,2.1-4.3,4.5-5.3c0,1-0.1,2.9-0.1,3.9
+		c3.4,0,6.7-0.5,10-1.3c-0.1-1.5-0.2-3-0.3-4.5c-1.3-0.1-2.6-0.2-3.8-0.3c0-0.9-0.1-2.8-0.2-3.7c0.8-0.8,1.6-1.6,2.5-2.3
+		c-0.4-1.4-0.9-2.9-1.4-4.3c-0.9,0.8-1.8,1.5-2.7,2.3c-0.2,2.8,0.8,6.6-2.6,7.9c-0.6-1.7-1-3.4-1.7-5.1c-1.1,0.3-2.2,0.7-3.2,1
+		c0.6,1.3,1.1,2.6,1.7,3.9c-2-3-3.6-6.2-5.5-9.2c0.5-3,1.2-6,1.7-9c-1.2,0.7-2.4,1.4-3.4,2.3c-0.1,2.2,0.7,4.2,1.2,6.3
+		c-1.1,0-3.3,0.1-4.4,0.1c0-1.8,0.1-3.6,0.2-5.4c-0.5,0-1.4,0-1.9,0c-0.4,1-0.9,1.9-1.3,2.9c-0.8,0.3-1.6,0.6-2.4,1
+		c1.5,0,2.9,0.1,4.4,0.1c1.1,1.5,2.2,3,3.4,4.5c0,1.5,0,3,0,4.5c-1.3,0.5-2.6,1-4,1.5c-0.1-2.6-0.7-5.1-2.4-7.1
+		c-1.7,2.2-3.5,4.4-5.4,6.4c-1-4.5-3.3-8.5-3.9-13.1c-2-5.3-3.2-10.9-3.4-16.5c-0.2-0.1-0.7-0.4-0.9-0.5c-0.1-3-0.3-5.9-1-8.8
+		c-0.1-1.6-0.2-3.1-0.3-4.7c2.4-2.1,5.4-2.6,8.3-1.1c-0.1-0.5-0.4-1.4-0.5-1.9c-0.8,0-2.3-0.1-3.1-0.2c0.2-2.8,1.6-5.3,2.5-7.9
+		c-0.5-0.4-1.4-1.1-1.9-1.5c-0.7-1.2-1.3-2.4-2-3.6c-0.4,4.1-1.1,8.1-1.4,12.2c-0.6,0.3-1.8,0.8-2.4,1.1c0.4-5.8,0-11.6,0.2-17.5
+		c0.5-2.7,1.3-5.4,0.2-8.1c1.6-0.2,3.2-0.5,4.8-0.8c0.5-1.2,1-2.5,1.5-3.7c0.6,0.5,2,1.6,2.6,2.1c0-0.4,0-1.1,0-1.5
+		c-0.9-0.9-1.9-1.9-2.8-2.8c-0.2-6.4-2.8-13.3,0.8-19.3c0.8,0,2.4,0.2,3.1,0.2c0.1-0.5,0.2-1.5,0.2-2c-0.8,0.1-2.5,0.2-3.4,0.2
+		c0.1-1.7,0.2-3.3,0.3-5c0-0.3,0.1-0.9,0.1-1.2c0.7,0,2.1-0.1,2.9-0.2c-0.3-3-0.2-6,1.1-8.8c0.9-0.1,2.6-0.4,3.5-0.5
+		c-0.5-0.2-1.5-0.5-2-0.6c0.5-4.7,3.3-8.8,6.1-12.5c0.1-0.5,0.3-1.4,0.4-1.8c2.8-3.5,4.2-8.3,8.2-10.9c1.2,0.3,2.4,0.8,3.6,1.3
+		c0-2,0.3-4.2-1.2-5.7c2.6-2.6,4.7-5.7,7.2-8.3c1.2-1.5,3.3-1,4.9-1.3c0.9,1.6,1.8,3.3,2.6,5c0.9,0.1,1.9,0.2,2.8,0.4
+		c-0.9-2.5-2-5-4.4-6.4c0-0.8,0-2.5,0-3.3c2.2-1.9,4.4-4,7.3-5c0,0.9-0.1,2.7-0.2,3.6c0.7,0.7,1.3,1.4,2,2.2
+		c0.9-1.4,1.9-2.9,2.8-4.3c0.1-0.5,0.2-1.4,0.2-1.9c-0.9,0-2.8,0.1-3.7,0.1c0.3-0.6,1-1.8,1.3-2.4c6.4-5.7,14-9.8,21.5-13.7
+		C532.8,482.1,539.6,480.4,545.8,477.4 M635.3,476.1c1.1,0.6,2.2,1.2,3.3,1.8c0-0.7,0.1-2.2,0.2-2.9
+		C637.6,475.4,636.4,475.7,635.3,476.1 M558,490.5c-1.4,1.1,0.2,3.9,1.9,3C561.1,492.5,559.5,489.9,558,490.5 M561.6,496.6l-0.2,0.5
+		c-3.9,2-6.9,5.5-10.8,7.5c-4.9,2.5-8.1,7.2-12,10.8c-5.3,4.6-8.3,11.2-12.6,16.6c-2.2,4.3-4.9,8.3-6.5,12.8c-1.5,2.5-2.9,5.1-3.6,8
+		c-1.2,4.7-2.6,9.3-4.1,13.9c-0.7,4.7-2,9.2-3,13.8c0,2.7-0.4,5.3-1.3,7.8l-0.9,0.1c0.5,8.3-0.6,16.8,1,25c-1.5,0.1-3,0.3-4.5,0.7
+		c1.4,0.1,2.9,0.2,4.3,0.3c0,1.4,0.1,2.8,0.3,4.2c-0.1,3.3,0.8,9-4,9.2c-0.1,0.9-0.2,1.9-0.3,2.8c0.5,0,1.6,0,2.2,0
+		c0.4-1,1.3-3.2,1.7-4.2c1.1,3.2,1.6,6.7,1.7,10.1c-0.7,0-2.2-0.1-2.9-0.2c-1.1,2.4-2.1,4.8-3.1,7.3c-1.5-0.1-2.9-0.2-4.3-0.3
+		c0,0.7-0.1,2-0.1,2.6c1,0.9,1.9,1.7,2.9,2.6c0.8-1.1,1.6-2.2,2.4-3.3c2.5,0,4.9,0,7.4-0.1c0.3,1.3,0.6,2.5,0.9,3.8
+		c-1.6,0.8-3.2,1.7-4.8,2.7c0.5,0.5,1.4,1.4,1.8,1.8c1.4-0.7,2.9-1.2,4.4-1.6c0.7,6.3,3.2,12.3,5.8,18c1.2,2.2-0.8,7.7,3.2,6.3
+		c0.3,2,0.2,4,0.2,6.1c0.6,0.1,1.8,0.2,2.3,0.3c1.6,2.6,2.9,5.3,4.8,7.7c2.1,3.1,5.2,5.8,5.4,9.8c-1.6,0.3-3.1,1-4.5,1.8
+		c0.2,1.5,0.3,2.9,0.5,4.4c-2.3,0-4.6,0.1-6.9,0.1c-0.1-2.3,1.4-3.7,3-5c-1.2-0.1-2.4-0.1-3.6-0.2c0.1,1.7,0.2,3.4,0.4,5.1
+		c-0.5,0.1-1.5,0.4-2,0.5c1.5,0.1,3,0.2,4.5,0.4c0.2,2.2,0.9,4.3,1.8,6.4c1.1,3.2,5,4.8,4.7,8.6l-1.4,0.2c0,1.3-0.1,2.6-0.1,4
+		c1.4-0.1,2.9-0.1,4.3-0.2c-0.6-2.3-1.3-4.5-1.5-6.8c1.2-0.9,2.7-1.1,4.1-1.4c0-0.6,0-1.8,0-2.5c1.4-1,2.7-2,4.1-3
+		c0-1.6-0.1-3.2-0.1-4.7c4.5,1.6,8.1,4.9,11.5,8.1c2.3,2.6,6,3.2,9,4.9c9.9,5.1,21,7.7,32,8.5c-0.2,1.7-0.4,3.4-0.5,5.1
+		c1.1,0,2.2,0,3.3,0.1c-0.1-1.8-0.2-3.5-0.4-5.2c2.4,0,4.9,0,7.3,0c0,1.4-0.1,2.8-0.1,4.2c1.3-0.4,2.7-0.8,4-1.2
+		c-0.1-0.8-0.2-2.3-0.3-3c4.6-1.2,9.2-2.6,14-3.2c4.4-2.6,9.9-2.8,14.1-5.9c6.9-5.7,14.9-10.3,20.8-17.3c4.4-3.8,6-9.9,10.7-13.4
+		c3.5-2.1,5.1-6.1,8.1-8.8c-0.7-0.3-2-1-2.7-1.3c0.1-0.9,0.4-2.6,0.5-3.4c4.9-10.7,7.3-22.2,10.5-33.5c1.6-8.1,1-16.5,1.6-24.7
+		c0.8-7,1.2-14.1-0.2-21c-0.4-3.3-0.3-6.7-0.4-10c-0.2,0.6-0.5,1.2-0.7,1.8c0.3-9.5-3.2-18.5-4.4-27.8c-2.3-3.4-3.2-7.5-4-11.5
+		c-2.4-3.2-4-6.8-5.1-10.6c-0.2-0.5-0.6-1.6-0.7-2.1c-0.4-0.2-1.3-0.6-1.7-0.8c0.2-0.5,0.7-1.6,0.9-2.1c2.8-1.6-0.3-4.6-1.4-6.2
+		c-0.5,1.6-1.9,1.7-3.2,2c-2.4-5.8-7.6-9.8-10.8-15.1c-3.8-3-7.3-6.4-11.2-9.3c-11.3-8.3-24.8-13.7-38.8-15.3
+		c-5.4-0.6-10.8-0.4-16.2-0.5C578.9,490.9,570.4,494.4,561.6,496.6 M674.2,498.4c0.9,2.3,1.7,4.7,1.4,7.2c2.3-0.1,4.5-0.2,6.8-0.6
+		c-0.5-0.1-1.6-0.3-2.1-0.4c0-0.6,0-1.8,0-2.4c1.1,0.1,2.2,0.2,3.3,0.3c0-1.4-0.1-2.9-0.1-4.3c-0.8,0.4-1.5,0.8-2.2,1.3
+		c-1.2,0.1-2.4,0.2-3.5,0.4c-0.3-0.4-0.9-1.1-1.2-1.4C675.9,498.4,674.7,498.4,674.2,498.4 M531.5,500.6c-0.1,0.5-0.2,1.6-0.2,2.1
+		c0.6,0,1.8,0,2.5,0c-0.1-0.5-0.2-1.6-0.3-2.2C533,500.6,532,500.6,531.5,500.6 M520.6,515.7c0,1,0,2,0,3c1.3-0.5,2.7-0.9,4.1-1.3
+		c0-0.5,0.1-1.6,0.1-2.1C523.4,515.4,522,515.5,520.6,515.7 M662.4,520.2c0,1.1,0.1,2.2,0.2,3.2c1.1,0,3.2,0.1,4.3,0.1
+		C667.3,520.4,664.7,520.2,662.4,520.2 M493.8,523.6c1.1,1.7,1.8,3.6,2.2,5.6c0.4,0.1,1.1,0.2,1.4,0.2c0-1.5,0-3,0-4.4
+		c-1.4-0.4-2.9-1-2.9-2.7C494.2,522.8,494,523.2,493.8,523.6 M679.2,525.1l2.5,0.5c-0.6,0.6-1.1,1.3-1.7,1.9c1.2,2,0.7,3.2-1.5,3.5
+		c0,0.1,0,0.3-0.1,0.4c1.9-0.7,3.8-1.1,5.8-1.3c0-0.8,0.1-1.7,0.2-2.5c-0.7,0.1-2.2,0.3-2.9,0.4c0.3-1.2,0.7-2.4,1-3.5
+		C681.4,524.6,680.3,524.8,679.2,525.1 M501.5,530.6c-0.1,1.4-0.1,2.7-0.2,4.1c0.6,0,1.8,0,2.4,0c0-1.4,0-2.9,0-4.3
+		C503.1,530.4,502,530.5,501.5,530.6 M690.6,530.4c-0.7,0.8-1.4,1.5-2.1,2.3c0,0.9,0,1.8,0.1,2.7c0.9,0,1.8,0,2.8,0c0-0.7,0-2,0-2.7
+		c0.5-0.8,1.1-1.6,1.6-2.4C692.4,530.4,691.2,530.4,690.6,530.4 M497.3,542.6c-1.8,0.3-3.3-0.4-4.7-1.3c0,0.5-0.1,1.7-0.1,2.2
+		c0.6,0,1.9,0,2.6,0.1c1.4,0.6,2.9,1.2,4.5,0.9c1.8-2,3.9-4.7,1.8-7.3C500.4,539.2,499.3,541.3,497.3,542.6 M675.8,541.9
+		c0.1,1.5,2.8,1.2,2.9-0.2C678.6,540,675.9,540.5,675.8,541.9 M701.4,549.1c2.1-1.3,3.4-3.5,3.5-6
+		C700.8,542.5,701.4,546.5,701.4,549.1 M497.5,549.2c0,1.8,0,3.6,0,5.4c0.5,0,1.6,0.1,2.1,0.1c0-0.7,0-2.1,0-2.8
+		c0.8-0.6,1.7-1.2,2.5-1.9C500.5,549.7,499,549.5,497.5,549.2 M472.3,550.3c0.1,1.3,0.1,2.6,0.2,3.9c0.8,1.1,1.7,2.2,2.5,3.3
+		c1,0,2,0,3,0c-1.3-2.2-2.7-4.5-2.8-7.1C474.2,550.4,473.3,550.3,472.3,550.3 M507.7,554.6c-1.4,1.3,0.8,3.7,2.1,2.1
+		C511.5,555.3,509,553.2,507.7,554.6 M483.6,554c0,1.9-0.1,3.8-0.1,5.6c1.5,0,2.9-0.1,4.4-0.1C487.1,557.2,486.6,554.2,483.6,554
+		 M469,557.7c-0.9,1.5-1.8,2.9-2.6,4.3c1.2,0.7,2.5,1.5,3.7,2.3c1.4,0.1,2.7,0.2,4.1,0.3c1.8,2.2,4.7,4.1,4.6,7.4
+		c3,1.9,5.8,4.5,9.6,3.4c0.8,0.7,1.6,1.5,2.4,2.2c1.4-1.2,3.1-2.1,4.9-2.3c-0.1-0.8-0.2-1.6-0.3-2.4c-1-0.8-2-1.5-3-2.2
+		c-2.3,0-4.5-0.3-4.2-3.1c-2.4,0-4.9,0.5-7.2-0.3c-1.3-1.2-2.4-2.6-3.6-3.9c0.1-0.7,0.2-2,0.2-2.6c-1.1-0.4-2.2-0.8-3.2-1.2
+		c0-0.5,0-1.5,0-2C472.6,557.5,470.8,557.6,469,557.7 M681.8,561.8c0.9,1.4,1.8,1.3,2.6-0.1C683.5,560.3,682.6,560.3,681.8,561.8
+		 M704.8,567.8c0.9,1.3,1.7,1.3,2.6-0.1C706.5,566.3,705.6,566.3,704.8,567.8 M460.5,575.1c-1.1,1.3,1.1,3.5,2.1,1.8
+		C463.7,575.6,461.5,573.4,460.5,575.1 M468.3,581.4c0.9,0.1,2.6,0.4,3.4,0.5c-0.3-1.9-0.8-3.9-1.6-5.6
+		C469.1,577.9,468.5,579.6,468.3,581.4 M482,578.2c0.7,1.3,1.4,2.7,2.1,4c0.3-0.5,1-1.6,1.3-2.2C485.8,578,483.2,578.6,482,578.2
+		 M687.1,582c0.8,1.6,1.5,1.6,2.3,0.1C688.6,580.5,687.9,580.4,687.1,582 M484.2,584c-0.2,3.6,3.7,5.6,3.6,9.1
+		c0.8-2.5,1.5-5,1.9-7.6c-0.6,0-1.9-0.1-2.6-0.1C486.2,585,485.2,584.5,484.2,584 M501.2,584.4c0,2.3,0.4,4.7,3.4,4.5
+		c0-1.1,0-3.3,0-4.5C503.4,584.4,502.3,584.4,501.2,584.4 M466.3,585.3c0,0.6,0,1.7,0.1,2.2c1.4,0.8,2.8,1.6,4.1,2.4
+		c0-1.5,0-2.9,0.1-4.3C469.1,585.5,467.7,585.4,466.3,585.3 M497,595.5c-1.7-1.8-3.4-3.7-5.1-5.6C488,593.4,493.7,596.3,497,595.5
+		 M489.5,597.6c-1.3,1.5-2.8,2.9-4.8,3.3c-0.1,0.4-0.3,1.2-0.5,1.7c1.9-0.2,4.1,0.2,5.7-1.1c0.6,0,1.9,0,2.6,0c0-1.3,0-2.7,0.1-4
+		C491.5,597.5,490.5,597.6,489.5,597.6 M494.4,608.5c1.1,0,3.5,0.1,4.6,0.1c-0.2-2.3-1.5-4.1-3-5.7
+		C494.3,604.3,494.4,606.5,494.4,608.5 M467.9,613.1c1.5-0.3,2.8-0.9,2.8-2.6c0.9,0,1.9-0.1,2.8-0.1c0.3,0.5,1,1.5,1.3,2
+		c1.7,0.1,3.4,0.2,5.2,0.3c-0.6-1-1.2-2-1.9-2.8c-2.2-0.4-4.4-1-6.2-2.5C469.8,608.6,468.4,610.7,467.9,613.1 M471.4,614.8
+		c-0.3,2.7,2.6,4.6,5,5c0-1.5,0.1-2.9,0.1-4.3C475.2,614.1,472.8,612.3,471.4,614.8 M691.7,616.5c1.5-0.8,1.5-1.6,0.2-2.5
+		C690.4,614.7,690.3,615.5,691.7,616.5 M463.1,618.3c2.7,1.5,0.1,3.8,0.7,5.8c0.9,0.2,2.6,0.4,3.5,0.6c0.8-2,1.3-4.2,0-6.2
+		C465.9,618.5,464.5,618.4,463.1,618.3 M480.6,623.5c0,1-0.1,2-0.1,3.1c1.3-0.1,2.5-0.2,3.8-0.3c0-0.9,0-1.9,0-2.8
+		C483.1,623.5,481.9,623.5,480.6,623.5 M463.2,631.3c2,1.3,2.7-0.6,3.4-2c0.3,0.4,0.9,1.3,1.2,1.7c1.8-0.7,2.8-1.9,3.2-3.6
+		c-2.4,0.4-4.9,0.6-6.5-1.7C463.7,627.4,463.1,629.3,463.2,631.3 M488.1,628.6c-1.2,0-2.4-0.1-3.5-0.1c-0.1,1-0.1,1.9-0.2,2.9
+		c0.6,0.3,1.8,0.9,2.4,1.2c-0.4,2.1-1.8,4.4-0.2,6.3c1.6-1.3,3.2-3.2,5.5-2.5c1.3,1,2.5,2.1,3.6,3.2c1.2-0.5,2.5-0.9,3.7-1.4
+		c0-2.2,0-4.4,0-6.6c-0.5,0-1.6-0.1-2.2-0.1c0.1,2.1,0.2,4.2,0.3,6.3c-0.8-0.1-2.3-0.2-3-0.3c-1.7-0.5-1.1-2.5-1.4-3.8
+		c-0.7,0-2-0.1-2.7-0.1c-0.1-2.1-0.1-4.2-0.2-6.3C489.6,627.7,488.9,628.1,488.1,628.6 M711.2,627.3c0,0.6,0,1.8,0,2.4
+		c0.6,0,1.9,0,2.5,0c0-0.6,0-1.8,0.1-2.4C713.1,627.3,711.9,627.3,711.2,627.3 M707.3,630.2c0.1,1.3,0.2,2.6,0.2,3.9
+		c1.3-0.8,2.1-2.1,2.4-3.6C709.3,630.4,708,630.3,707.3,630.2 M474.1,633.4c-1.7,1.3,1,3.4,2.3,2.1
+		C477.8,634.1,475.5,632.1,474.1,633.4 M479.4,633.2c0.1,0.8,0.2,2.4,0.3,3.2c-0.7,0.7-1.5,1.3-2.2,2c0,0.7,0,2.2,0,2.9
+		c-1.6,0.9-3.3,1.8-4.9,2.8c2.5,2.6,6-1.1,8.5,1.3c1.3,0,2.6-0.1,3.9-0.2c-1-1.5-2.7-1.8-4.4-1.9c0-3.4,0-6.7-0.1-10.1
+		C480.2,633.2,479.7,633.2,479.4,633.2 M464.4,634.3c0,1,0,3,0,3.9c0.7,0.7,1.4,1.5,2.2,2.2c1.3-0.8,2.7-1.5,4-2.2
+		c0-0.8-0.1-1.7-0.1-2.5C468.4,635.4,466.4,634.8,464.4,634.3 M491.6,645.5c1.3,0,2.6,0,3.9,0c0-1.3,0-2.6,0.1-3.9
+		c-1.3-0.5-2.6-0.9-3.9-1.3C491.6,642,491.6,643.7,491.6,645.5 M460.5,643.1c0,1.4,0,2.8,0,4.2c2.7-0.5,3.4,2.5,4.4,4.3
+		c0.5-1.4,0.8-3.2,2.7-3.3c2.1-0.3,2.8-2.3,3.3-4.1c-1.7,0.2-3.9-0.4-5,1.5C464,645.1,462.2,644.1,460.5,643.1 M705.8,644.2
+		c0.8,1.5,1.6,1.5,2.5,0.1C707.5,642.8,706.7,642.8,705.8,644.2 M713,644.1c-1.2,1.4,1.5,2.3,2.4,1.3
+		C716.5,644,713.8,642.9,713,644.1 M718,648.9c1.5-0.7,1.5-1.5,0-2.3C716.5,647.3,716.5,648.1,718,648.9 M483.4,648.6
+		c0.1,0.9,0.2,1.9,0.3,2.8c2,0.1,4,0.2,6.1,0.3c-0.1-1.1-0.1-2.2-0.1-3.4C487.5,648.4,485.4,648.5,483.4,648.6 M491.3,650.3
+		c0.1,0.6,0.2,1.8,0.3,2.4c2.4,0.3,3.2-1.2,3.1-3.3C493.6,649.7,492.4,650,491.3,650.3 M480.3,655.5c0,0.6-0.1,1.7-0.2,2.3
+		c0.6,0,1.9,0,2.5,0c-0.1-0.5-0.2-1.6-0.2-2.1C481.9,655.5,480.9,655.5,480.3,655.5 M505.7,676.7c-0.6,1.4-0.9,2.9-1.3,4.4
+		c1.2,1.6,2.3,3.2,3.5,4.9c1.9,0.9,4.2,1.8,4,4.4c-1.8,1.5-5.1,2.9-4.2,5.8c0.9,0.2,1.7,0.4,2.6,0.6c0.4-1.4,0.8-2.8,1.2-4.2
+		c1-0.5,2.1-0.9,3.2-1.3c-1.8-2.6-2.9-8.8,2.1-8.1c0-0.2-0.1-0.8-0.2-1c-1.9,0.6-4,1.1-5.6,2.4c-1.1,0-2.1-0.1-3.2-0.1
+		c0.4-1.6,1.3-2.9,2.5-4c0-1.3-0.1-2.6-0.1-3.9c0.7-0.3,2.1-1,2.8-1.3c1,0.5,2,1,3,1.5c-1.2-1.2-2.5-2.3-3.8-3.4c-0.9,0-2.6,0-3.4,0
+		C508.4,675.1,506.9,675.7,505.7,676.7 M494.1,675.3c0.4,2.9,2.9,4.7,3.8,7.4c2.8,0.6,2.7-1.8,2.7-3.8
+		C498.2,678.1,496.9,675.3,494.1,675.3 M699.2,682.4c-0.5,3.1,1.4,4.7,4.4,4.4c-0.1-1.5-0.1-2.9-0.1-4.3
+		C702.4,682.5,700.3,682.4,699.2,682.4 M519.7,688.4c1.4-0.4,1.7-3.2,0.2-3.7C518.4,685.2,518,688,519.7,688.4 M498.8,694.2
+		c-2-0.1-2.6,1-2.4,2.7c2-1.1,3.9-2.4,6.1-2.8c-0.6-2.4-2.6-4.2-3.6-6.4C497,689.6,498.2,692,498.8,694.2 M515.5,693.1
+		c2.7,1.4,6.5,2.3,6.4,6.1c0.4,0.1,1.2,0.4,1.6,0.5c-0.1-1.2-0.1-2.5-0.2-3.7c-1.8-1.7-0.7-3.8,0.4-5.3c-0.7-0.3-2.2-1-3-1.4
+		C519.3,690.9,517.7,692.4,515.5,693.1 M486.2,697.6c1,0,2-0.1,3-0.1c0.9-1,1.9-1.9,2.8-2.9c-2.2-0.9-4.6-1.5-6.7-2.5
+		C485.2,694,485.5,695.9,486.2,697.6 M528,692.8c-1,1.3,1.2,3.7,2.5,2.4C531.6,693.8,529.3,691.6,528,692.8 M511.4,697.5
+		c0,0.6,0,1.7,0.1,2.3c1.7-0.3,3.5-0.7,5.2-1c0-0.7,0-2,0-2.7C514.9,696.5,513.1,697,511.4,697.5 M503.3,699.5
+		c0.1,1.1,0.1,2.2,0.2,3.4c2.4,0.2,3.2-1.4,3.5-3.5C505.8,699.4,504.5,699.4,503.3,699.5 M496.4,701.2c0,0.6,0,1.9,0,2.5
+		c1.6-0.1,3.3-0.2,4.9-0.5c0.1-0.7,0.4-2.2,0.5-3C499.9,700.5,498.1,700.8,496.4,701.2 M518.6,712.7c-0.6,0.7-1.3,1.3-1.9,2
+		c0,1.9-0.1,3.8-0.1,5.7c-2.2-0.1-3.3,1.7-4.5,3.2c1.2,0,2.3-0.1,3.5-0.3c1.1-1.5,2.1-3.2,3.7-4.3c0.6-1.7,1.1-3.5,1.4-5.3
+		c0.4-0.3,1.1-0.8,1.4-1C520.9,712.6,519.7,712.6,518.6,712.7 M548.2,724.5c1.1,2.2,2,4.4,2.7,6.8c0.4,0.1,1.3,0.2,1.7,0.2
+		c-0.2-2.4-0.7-4.7-1.4-6.9C550.2,724.6,549.2,724.6,548.2,724.5z"/>
+	<path class="st2" d="M1229.7,469.9c1-1.3,2.5-1.5,4-1.8c0.9,2.7,1.6,5.3,2.5,8c12.4,39.9,26,79.5,39.5,119c2.1,8.9,6,17.1,8.8,25.7
+		c2.8,8.9,6.6,17.6,8.4,26.8c3.7,7.1,5.7,15,8.4,22.5c3.3,9.2,6.6,18.5,10.5,27.5c0.7,1.8,1.3,3.6,1.8,5.5c0.6,1,1.3,1.9,1.9,3
+		c-0.3,1.5-1,2.9-1.5,4.4c0.9,0,2.6-0.1,3.4-0.2c1.3,1.8,2.4,3.6,3.4,5.5c3,3.1,6.1,6.2,9.2,9.2c-1.2,0.1-2.3,0.2-3.5,0.3
+		c-1,1.3-2,2.5-2.9,3.8c1.5,0.6,3,1.1,4.6,1.5c1-2.8,2.8-5.2,6.1-4.5c0,0.9,0,2.6,0,3.5c0.4-0.2,1.1-0.5,1.5-0.6
+		c1.7-1.7,3.9-1.9,6.1-1.2c0.6,0.1,1.8,0.3,2.4,0.4c-0.2,4.1,0.7,8.5-0.5,12.4c-3,1.5-6.4,2.1-9.6,2.7c0.4-1,1.1-3.1,1.5-4.1
+		c-0.5,0-1.6-0.1-2.1-0.1c-0.5,1-1.1,1.9-1.6,2.9c-3.2,0-6.4,0-9.5,0.1c0-0.5,0-1.6,0-2.2c-1.1,0.5-2.2,0.9-3.3,1.4
+		c-1-1.6-2-3.1-3.3-4.4c-0.2,1.5-0.3,3-0.4,4.5c-5.4-0.4-10.9-1.1-16.3-0.3c0-1.2,0.1-2.5,0.2-3.7c-1.4-0.5-2.7-1.1-4.1-1.6
+		c0,0.6-0.1,1.8-0.1,2.4c1.1,0.9,2.1,1.8,3.2,2.7c-1.1,0-3.2,0-4.3,0c-1.2-0.2-2.5-0.4-3.7-0.3c-7.1,0.8-14.4,0.3-21.5,0.6
+		c-4.6,0.2-9.1-0.1-13.6-0.9c-1.2,0.7-2.3,1.4-3.4,2.1c-0.8-0.7-1.6-1.5-2.4-2.2c-0.5,0-1.6,0-2.2,0c-0.3,0.5-0.9,1.4-1.3,1.9
+		c-3.7,0.1-7.4,0.2-11.1,0.4c0.1-0.6,0.4-1.7,0.5-2.3c-0.5,0.1-1.6,0.2-2.1,0.3c0.1-2,0.2-4.1,0.3-6.1c1,0.8,2,1.6,3.1,2.4
+		c0.5,0.2,1.5,0.6,2,0.8c-0.4-0.4-1.2-1.1-1.6-1.5c0.1-0.8,0.2-2.3,0.3-3.1c-1.3-0.3-2.7-0.6-4-0.8c0-1.4-0.1-2.9-0.1-4.3
+		c1.8,0.3,4.1-0.5,5.5,1c1.5-1.7,4-1.7,6-1.4c2.7,0.7,5.3-0.3,8-0.5c0.8-1.5,1.9-2.8,3.1-4.1c4.7-4.9,3.8-12.2,3.1-18.4
+		c-3.8-21.3-11.9-41.6-17.9-62.3c-25.2,0.1-50.4-0.1-75.6,0c-4.7,9.8-7.5,20.3-11.7,30.2c-3,9.5-8.6,18.1-9.9,28.1
+		c-0.2,0.4-0.7,1.2-0.9,1.6c-0.6,0-1.9,0.1-2.5,0.1c-0.5,0.9-0.9,1.8-1.3,2.6c-0.5,0.3-1.5,0.8-2,1c0,0.6,0,1.7,0,2.2
+		c1.6-0.1,3.3-0.2,4.9-0.2c0.2,4-1.1,8.6,1.8,11.9c0.6,0.9,1.2,1.9,1.9,2.8c0.2,0.3,0.6,0.9,0.8,1.2c2.4,0.8,4.8,1.9,6.9,3.3
+		c4.3,0,8.6,0.1,12.9,0.2c-0.2,1.1-0.3,2.2-0.5,3.3c1.5-0.3,2.9-1,4.1-1.9c0.3,4.5,0,9.1,0.2,13.6c-2,0-4.1,0.1-6.1,0.2
+		c0-2.2-0.1-4.5-0.3-6.7c0.8,0.1,2.4,0.2,3.2,0.3c0.1-1.4,0.2-2.7,0.3-4.1c-1.5,0.1-3.1,0.2-4.6,0.4c0.3,1.8,0.5,3.7,0.8,5.6
+		c-0.6,0.3-1.8,1-2.4,1.3c0,0.6,0,1.7,0,2.3c-2.7-0.2-5.5-0.4-8.2-0.5c0.1-0.9,0.2-2.7,0.2-3.7c1.2-0.6,2.5-1.3,3.7-1.9
+		c-1.6-0.6-3.2-1.2-4.8-1.8c0,2.5,0.1,5,0.2,7.5c-1.1,0-3.2-0.2-4.2-0.2c0-0.7,0-2.2,0-2.9c-1.3-1.1-2.6-2.3-3.9-3.4
+		c-0.1-1.5-0.2-3-0.3-4.5c-0.7-1-1.5-1.9-2.2-2.9c-2.9,2.1-5.6,4.5-6.9,7.9c-1.3,0-2.6-0.1-3.8-0.1c0,0.6,0,1.9,0,2.5
+		c2.7-0.6,5.7-3.4,8.2-1.6c0.2,1.6,0.1,3.1,0.1,4.7c-1.5-0.1-3-0.1-4.4-0.2c-4.3-1.3-7.8-4.2-11.9-5.9c0.5,2.1,1,4.2,1.5,6.3
+		c-2.6-0.1-5.2-0.2-7.8,0c-0.9-1.1-1.8-2.2-2.6-3.3c-1.8,0.2-3.6,0.6-4.5,2.3c-1.1,0.1-2.1,0.2-3.1,0.3c-1.6,0-3.1,0-4.7,0.1
+		c-0.4,0.1-1.2,0.4-1.6,0.5c-4.7,0.1-9.4,0.1-14.1,0.5c0.1-1.9,0.6-4.2-1.9-4.7c0-0.8,0.1-2.4,0.2-3.2c-0.3,0.4-0.9,1.1-1.2,1.5
+		c-2.1,0.2-3.4,1.8-4.8,3.1c0,0.5-0.1,1.6-0.1,2.1c0.6-0.1,1.7-0.3,2.2-0.4c0,0.6-0.1,1.8-0.1,2.5c-1,0-3-0.1-4-0.1
+		c-0.5-4.7-1.6-9.3-1.2-14.1c4.1,0.2,7.9-1.3,12-1.1c0.2,0.9,0.4,1.8,0.6,2.6c-0.1-4.6,5.2-5.4,7.9-8.1c5.8-5.8,10.3-12.7,13.8-20
+		c10-20.3,18.4-41.2,27.1-62.1c7.6-18.6,15.5-37,23.1-55.6c1.1,1.3,1.9,2.8,2.2,4.5c0.2-1.3,0.7-2.6,1.3-3.7
+		c-1.1-0.6-2.1-1.3-3.1-2.1c8.9-20.2,17-40.7,25.2-61.2c1.2-2.8,2.7-5.5,4-8.3c1.6,0.1,3.3,0.2,5,0.2c1.5-1.6,3.1-3.2,4.8-4.5
+		c0.1-0.9,0.2-1.7,0.3-2.5c-1,0.1-2,0.1-2.9,0.2c0,0.7-0.1,2.2-0.1,2.9c-2.2,0.1-4.4,0.1-6.5,0.2c1-3.4,2.4-6.6,4.3-9.5
+		c2.6,0.2,5.6-0.3,7.5,2.1c3.5,0.1,7.1,0.1,10.6,0.1c0-1.4-0.1-2.7-0.1-4c1.7,0,3.4,0.1,5.1,0.1c0-0.5,0.1-1.5,0.2-2
+		c-2.5,0.5-6.7-1.4-7.5,2c-1.6,0.1-3.2,0.1-4.7,0.2c0-1.1,0.1-3.2,0.1-4.3c1.6,0.1,3.3,0.1,4.9,0.2c0.3-1.5,0.6-2.9,1-4.3
+		c1.4,0.1,2.8,0.3,4.3,0.5c-0.1-1.4-0.2-2.7-0.2-4.1c1.4-0.5,2.8-0.9,4.1-1.4c-0.1-0.6-0.2-1.9-0.2-2.6c1.7-1.8,3.5-3.5,5.3-5.2
+		c1.7,0,3.4,0.1,5.2,0.1C1229.6,475,1227.1,471.8,1229.7,469.9 M1212.1,510.5c-1.4,0-2.9,0-4.3,0c0.4,0.3,1.1,0.9,1.5,1.2
+		c0,3.2,3.3,3.6,5.7,4.6c0.1-2.4,1.8-4.2,4.3-4.2c-0.6-0.8-1-1.7-1.1-2.6c-0.6,0-1.7,0-2.2,0
+		C1214.8,507.8,1212.3,508.4,1212.1,510.5 M1206.8,527.8c-3.2,8.1-5.2,16.6-8,24.8c-7.5,22.8-16.5,45.1-25.5,67.3
+		c-0.5-0.1-1.4-0.3-1.8-0.4c-0.2,1.3-1.8,2.9-0.5,4c4.1-2.9,9.3-1.9,14-2.1c13-0.9,26.1-0.9,39,0c3.4,0,6.8,0.1,10.2,0.1
+		c-1.1-6.3-4.1-12.1-5.8-18.3c-6.8-22.7-14.6-45-19.2-68.2C1208.8,532.4,1208.1,529.9,1206.8,527.8 M1238.5,575.6
+		c0,0.5-0.1,1.6-0.2,2.1c0.6,0,1.8,0,2.4,0c0-0.5-0.1-1.6-0.2-2.2C1240,575.5,1239,575.5,1238.5,575.6 M1250.9,607
+		c-0.2,0.8-0.3,1.7-0.5,2.5c1.5-0.1,3.1-0.2,4.6-0.3c0.7-0.3,2-0.9,2.7-1.2c-0.3-0.1-1-0.4-1.3-0.5c0-0.5-0.1-1.5-0.2-1.9
+		C1254.6,606.5,1252.7,606.7,1250.9,607 M1159.4,616.3c0,1.1-0.1,2.1-0.1,3.2c0.7,0.2,2.1,0.7,2.8,0.9c1.5-0.7,1.4-2.4,1.5-3.8
+		C1162.2,616.5,1160.8,616.4,1159.4,616.3 M1268.6,616.7c0,1.4,0,2.8,0,4.1c1.4-1.2,2.9-2.2,4.7-2.7c0.1-0.4,0.4-1.1,0.5-1.5
+		C1272,616.6,1270.3,616.6,1268.6,616.7 M1278.5,617.5c0,1.6,0,3.2,0.1,4.8c0.9-0.4,1.7-0.9,2.6-1.4c0.1-1.2,0.2-2.3,0.3-3.5
+		C1280.5,617.5,1279.5,617.5,1278.5,617.5 M1277.5,628.5c-0.1,1.1-0.2,2.2-0.3,3.4c1.8,0.4,3.5,0.6,5.3,0.9c0-1.4-0.1-2.8-0.1-4.2
+		C1280.8,628.5,1279.2,628.5,1277.5,628.5 M1286.1,657.7c1.2,0,2.4,0,3.7,0c-0.1-0.8-0.2-2.5-0.3-3.4
+		C1286.8,653.8,1286,655.4,1286.1,657.7 M1285.3,671.1c1.7,0.4,3.4,0.8,5.1,1.4c0-1.8,0-3.6-0.1-5.3
+		C1288.5,668.3,1287.1,669.9,1285.3,671.1 M1257,677.2c1.6,0.5,3.3,1,4.9,1.6c0.9,0.8,1.8,1.7,3.1,1.9c-2-1.8-3.5-4-5.2-6
+		C1258.6,675.2,1257.9,676.3,1257,677.2 M1134.3,690.7c0.2,1.5,0.8,3,1.3,4.5c0.6,0.4,1.7,1.1,2.3,1.5c0.7-0.4,2-1.1,2.7-1.5
+		c0-0.8,0.1-1.7,0.2-2.5c-2.5,0-2.1-2.5-2.5-4.2C1136.5,687.9,1135.4,689.8,1134.3,690.7 M1266.2,696.2c0.9,0,2.8,0.2,3.8,0.2
+		c-1.8,3.3-0.7,7.1-1.6,10.7c-0.8,1-1.6,2-2.4,3c1,1,2,2,3,3c1-1,1.9-1.9,2.9-2.9c-1.3-1.6-2.6-3.3-2.8-5.4c0.6-0.4,1.9-1.1,2.5-1.4
+		c-0.1-1.2-0.1-2.3-0.1-3.5c0.4-1,0.9-2.1,1.3-3.1c-2.5,0.7-3.6-1.2-3.9-3.4C1268,694.3,1267.1,695.2,1266.2,696.2 M1287.7,693.6
+		c-0.1,1-0.2,2-0.3,2.9c1,0.4,2.1,0.9,3.1,1.3c0-1.5,0-3,0-4.5C1289.5,693.4,1288.6,693.5,1287.7,693.6 M1293.3,701.9
+		c0.8-0.4,2.4-1.3,3.1-1.7c0-1.1,0.1-2.1,0.2-3.2c0.9-1.2,0.9-2.7,1-4C1294.2,694.4,1294.1,698.8,1293.3,701.9 M1279.9,700.3
+		c-2.2,1.4-4.6,3-3.4,6.1c-1.4,1.4-2.9,2.8-3.4,4.8c0.8,0.1,2.5,0.4,3.3,0.5c0.1,0.9,0.2,2.7,0.3,3.6c1.6-1.2,0-2.9-0.3-4.4
+		c1.2-3.1,2.6-6.2,4.2-9.2c1-0.4,2-0.7,3-1c0.1-0.6,0.2-1.7,0.2-2.3c-1.5,0.1-3,0.2-4.5,0.4c0-1,0.1-3,0.1-4
+		C1277.8,696.3,1278.6,698.7,1279.9,700.3 M1136.4,698.9c-0.5,1.6,0,2.2,1.7,1.7C1138.6,698.9,1138,698.4,1136.4,698.9
+		 M1285.8,702.8c-0.8,2.1-1.4,4.4-1.6,6.7c0.6,0,1.7,0,2.2,0c0-0.6,0.1-1.9,0.2-2.5c1.3-1.1,2.6-2.1,4-3.2c0-0.7,0.1-2,0.2-2.7
+		C1289,701.6,1287.4,702.2,1285.8,702.8 M1113.5,703.6c0,2.5,0,5,0.1,7.5c1.7-2.2,2.1-5,2.1-7.7
+		C1115.1,703.5,1114.1,703.6,1113.5,703.6 M1123.5,704.5c0,1.7-0.1,3.4-0.1,5.1c1-0.1,2.1-0.1,3.1-0.2c0.7-0.6,1.3-1.3,2-1.9
+		c-0.3-1-0.7-2-1-3C1126.2,704.5,1124.9,704.5,1123.5,704.5 M1303.3,707.8c1,0.2,2.1,0.5,3.2,0.6c1.8-1.1,0.8-3.4,1.1-5.1
+		c-0.9,0.1-2.7,0.4-3.6,0.5C1303.3,705.1,1303.4,706.5,1303.3,707.8 M1309.5,708.5c0.1,0.8,0.2,2.4,0.3,3.2
+		c-1.8-0.1-3.5-0.1-5.2-0.1c0,1.3,0,2.5,0,3.8c1.2,0,2.4,0.1,3.6,0.2c0.8,0.9,1.7,1.8,2.5,2.6c-0.3-1.9-0.9-3.8-1.4-5.6
+		c2.1-0.8,4.7-1.4,4.8-4.1C1312.5,708.4,1311,708.4,1309.5,708.5 M1107.7,714.6c-0.1,1.3-0.2,2.6-0.4,4c2.8-0.1,5.7-0.1,8.5-0.1
+		c0-0.2,0-0.7,0-1c-1.4,0-2.8,0-4.2,0.1c-0.5-1-1-2-1.5-3.1C1109.3,714.5,1108.5,714.6,1107.7,714.6 M1135.3,715.3
+		c0,0.6,0.1,1.8,0.2,2.4c1,0,2,0,3-0.1c0.1-0.6,0.2-1.7,0.3-2.3C1137.6,715.3,1136.4,715.3,1135.3,715.3 M1283.1,715.4
+		c0.1,2.3,1.3,4.4,2.6,6.3c1.1-0.1,3.2-0.2,4.2-0.2c0-1.6-0.8-2.7-2.2-3.5c0-0.7,0.1-2,0.1-2.6
+		C1286.1,715.4,1284.6,715.4,1283.1,715.4 M1296.2,715.1c0.1,2.2,0.9,6.8,4.1,5.2C1301.1,717.9,1298.8,714.8,1296.2,715.1
+		 M1273.1,721.6c1.2,0,2.4,0,3.5,0c0-0.6,0-1.9,0-2.5C1275.2,719.6,1272.4,718.8,1273.1,721.6 M1283.6,726.8
+		c1.5-0.4,3.7,0.2,4.4-1.6c-1.6-1.5-3-3.1-4.3-4.9C1281.4,722,1283,724.6,1283.6,726.8 M1293.5,727.6c1.4-0.4,4.3,0.4,4.1-1.9
+		c0.2-1.8-0.9-3.3-1.5-4.9C1293.7,722.4,1293.1,724.9,1293.5,727.6 M1320.8,725.8c2.1-0.2,4.2-0.7,6.2-1.4c-0.4-0.8-1.3-2.3-1.7-3.1
+		C1322.5,721,1321.5,723.7,1320.8,725.8 M1114.7,723.5c-0.1,0.7-0.2,2.1-0.3,2.7c-0.5,0.9-0.9,1.7-1.4,2.6c2.7-0.9,5.3-2,8-2.7
+		c-0.7-0.3-1.4-0.7-2.1-1C1118,723.6,1116.4,723.4,1114.7,723.5 M1258.4,723.6c0,1,0,2,0,3c0.6,0,1.7,0.1,2.3,0.1
+		c-0.1-1.1-0.1-2.1-0.1-3.2C1260,723.5,1259,723.5,1258.4,723.6 M1266.4,724.1c0,1.9,0,3.8,0,5.7c0.9-0.2,1.9-0.4,2.9-0.5
+		c0-1,0.1-1.9,0.2-2.8c-0.4-0.4-1.1-1.3-1.4-1.7C1267.7,724.6,1266.9,724.3,1266.4,724.1 M1272.3,724.4c0,1.1,0,2.2,0,3.3
+		c1.1,0,2.1,0,3.2-0.1c0-1.1,0-2.1,0.1-3.2C1274.5,724.4,1273.4,724.4,1272.3,724.4 M1285.3,728.4c0.4,1.6,0.8,3.2,1.3,4.8
+		c0.7-0.5,2.2-1.6,2.9-2.2C1290.7,727.8,1287.2,728.6,1285.3,728.4 M1277.4,730.4c-1.7,0.4-3.6,0.2-5.3,0.3c0.3,2.2,2.4,2.7,4.3,3
+		c0.4,0.6,1.1,1.9,1.5,2.5c1.1-1.5,2.2-2.9,3.5-4.3c0.1-1,0.2-2.9,0.3-3.8C1279.9,728.2,1278.6,729.1,1277.4,730.4 M1294,733.5
+		c1.2,0,2.4,0.1,3.6,0.1c0-1.2-0.1-2.4-0.1-3.6C1295.5,730.3,1294.1,731.3,1294,733.5 M1313.5,733.3c0.1,2.5,3.1,0.4,4.4,0.1
+		c-0.6-1.5-1.2-2.9-1.7-4.4C1314.4,729.9,1312.7,731.1,1313.5,733.3 M1335.3,733.2c-0.2,0.4-0.5,1.3-0.7,1.7
+		C1336.6,738.2,1339,731.1,1335.3,733.2 M1255.3,735.4c0,0.6,0,1.7,0,2.3c0.6,0,1.7-0.1,2.3-0.1c0-0.5-0.1-1.5-0.1-2
+		C1256.9,735.5,1255.9,735.4,1255.3,735.4z"/>
+	<path class="st2" d="M1509.5,472.5c4.2-1.8,8.3-3.9,12.7-5.1c0.8,2.4,1.5,4.9,2.2,7.3c7.3,23.5,15.1,46.9,22.9,70.2
+		c2.2,8.3,5.1,16.3,7.6,24.5c1.2,4.5,3.8,8.4,5.2,12.8c6.2,18.8,12.9,37.5,19.2,56.4c1.5,5.9,3.9,11.6,6.3,17.2c0,2.2-1,4.3-1.9,6.2
+		c-2.6-0.2-5-1.1-7-2.8c-0.1-0.5-0.4-1.6-0.5-2.1c-1-1.2-2-2.5-2.9-3.7c-0.5,0-1.5-0.1-2-0.1c0.1,0.4,0.4,1.1,0.5,1.5
+		c3.4,2.4,1.4,7.2,1.8,10.7c1.7-0.1,3.4-0.2,5.2-0.3c-0.1,1.3-0.1,2.6-0.1,3.8c-0.4,0.5-1.1,1.5-1.4,2c4-1.8,7.4-4.7,11.1-7.1
+		c1.3,5,3.1,9.9,5.2,14.6c0.1,0.8,0.3,2.5,0.4,3.4c-0.6,1-1.1,2.1-1.7,3.2c1.4,0.4,2.9,0.9,4.4,1.3c0.3,1.4,0.7,2.8,1.1,4.2
+		c1.2,3.5,3.1,6.8,3.3,10.6c-0.3-0.5-1-1.5-1.3-2c-0.6,0-1.7,0-2.2,0.1c0,0.6,0,1.7,0,2.3c1.9,1.5,3.6,3.3,4.6,5.5
+		c-0.7,0.4-1.9,1.1-2.6,1.5c0,0.9,0,1.9,0.1,2.8c0.5,0.1,1.5,0.3,2,0.4c0.1-2.2,1.2-4,3.2-4.9c3.6,6.8,7.9,13.8,14.6,17.8
+		c1.8,1.3,4.6,1.1,5.7,3.2c-1.5,0.7-3.1,1.2-4.7,1.8c0.1,3-0.6,6.5,1.9,8.8c0.2-3.7,0.9-7.3,3.1-10.3c2.4,0,4.8,0,7.2,0.2
+		c-1.1,0.5-2.1,1-3.2,1.5c0.3,1.8,1.6,3,2.9,4.1c0.1,1.1,0.2,2.2,0.3,3.2c0,1.8,0,3.5,0,5.3c-6.9-0.3-13.8,0.4-20.6-0.8
+		c-16.2-0.4-32.5-0.5-48.7-0.2c-1.5-1.3-3.1-2.5-4.6-3.7c0.9-1,1.9-2,2.9-3c-1-1-2-2-3-3c0,1.6,0.1,3.1,0.1,4.7
+		c-0.8,0.6-1.6,1.2-2.4,1.9c-0.6,0-1.9,0-2.5,0c-0.3,0.5-1,1.5-1.3,2c-3.1-0.1-6.3,0-9.4,0.1c-6.3,3-13.7,2.1-20.5,1.7
+		c-0.2-4.6-0.2-9.3-0.2-13.9c7.9-1.2,17.2,0.5,23.3-5.8c4.6-6.8,2.7-15.2,1.3-22.6c-1.3-5.3-2.4-10.7-3.8-16
+		c-3.4-9.1-5.8-18.6-9-27.8c-1.6-4.4-2-9.1-3.4-13.6c-0.6-0.1-1.7-0.2-2.3-0.2c-0.7-1.2-1.1-2.5-1.3-3.9c1.1-0.5,2.2-1,3.3-1.5
+		c0-2.6,0-5.1,0-7.7c0.8,0,2.4,0.1,3.2,0.1c-0.1-1.1-0.2-2.2-0.3-3.3c-5.5,0.8-8.4,6.7-14.1,7c0-2.9,0.3-5.9,1.3-8.7
+		c-4.6-0.1-9.1,0.3-13.7-0.2c-0.2-0.7-0.8-2.2-1-2.9c6-0.3,12,0,18,0c-0.3-0.8-0.6-1.5-0.9-2.3c-4-9.4-6.6-19.4-9.7-29.1
+		c-1.8-7.5-5.5-14.5-5.9-22.4c-2.8-4.1-3.4-9.2-4.9-13.9c-2.3-7.4-3.7-15.1-5.1-22.7c-0.1-1.5-1.4-2.3-2.2-3.4
+		c-2.5,9.5-5.7,18.8-8.7,28.2c-0.8,2.6-2,5-3.5,7.2c-1.5,4.1-2.2,8.4-3.6,12.6c-4.1,11.3-8.6,22.4-13,33.5c-0.3,0.4-0.9,1.3-1.2,1.8
+		c-1.2-0.1-2.5-0.2-3.7-0.2c-1.7-1.7-3.2-3.5-4.5-5.4c-1.7,2.6-4.7,2.7-7.5,2.6c0.2,0.5,0.4,1,0.7,1.5l0.3-1.1c2.5-0.4,5,0.6,7.4,1
+		c-0.2,1.6-0.5,3.3-0.8,4.9c-1.1,0.3-2.2,0.6-3.3,0.8c-0.3,1.2-0.6,2.5-0.8,3.7c0.3,1.6,0.6,3.2,0.9,4.9c-1.9,1.5-3.9,2.7-6.2,3.6
+		c-0.2,0.8-0.4,1.7-0.5,2.5c2.8-1.9,5.7-0.2,8.3,1.3c0-1.8,0-3.7,0-5.5c2.5,0,5.1,0,7.7-0.1c0.5-1.3,1-2.6,1.5-3.9
+		c3.6-0.1,7.3-0.2,11-0.2c-0.1,1.6-0.1,3.3-0.1,4.9c0.8,1.1,1.6,2.1,2.5,3.2c4.8-0.5,9.8-0.2,14.3-2.2c-1.9-0.7-3.9-1.5-5.8-2.2
+		c2-1.8,4.7-1.7,7.2-1.9c-0.1,1-0.2,2.9-0.2,3.9c0.3-0.4,0.9-1.3,1.2-1.8c0.9,0,2.8,0.1,3.7,0.1c0.4,1,0.8,2,1.3,3
+		c1,0,1.9,0.1,2.9,0.2c0.7-1.1,1.5-2.2,2.2-3.3c7.6-1.2,12.4,5.5,15.7,11.2c-1,0-2.9,0-3.9,0c-0.1,1-0.2,2-0.2,3
+		c1.4-0.2,2.8-0.4,4.3-0.6c0,0.9,0.1,2.6,0.1,3.5c-7.9,0.1-15.9-0.4-23.8,0.3c-2-1.2-2.6-3.3-2.8-5.4c-2.2,0-4.4,0.1-6.5,0.2
+		c-0.7-0.5-1.3-1-1.9-1.5c-0.4,1.5-0.7,2.9-1.1,4.4c-3.3,0-6.6,0.6-9.9,1c-4.4-2.2-8.4-5.2-12.5-7.8c-1-0.1-1.9-0.2-2.8-0.3
+		c0,1.1,0.1,2.2,0.1,3.3c1.8-0.1,3.5-0.2,5.3-0.3c0.8,2.2,3.3,5.1,0.2,6.5c-3.7-0.2-7.4-0.7-11,0c-2.5,3-2.7,7.1-3.7,10.7
+		c-0.7,0.1-2.2,0.2-2.9,0.3c0-1.3,0-2.6,0.1-3.9c-1.2,0.7-2.5,1.3-3.7,2c-0.1,2.1-0.2,4.2-0.2,6.4c-3.1,1.9-7.3,4.9-10.4,1.3
+		c-0.9-0.1-1.8-0.2-2.6-0.2c0,1-0.1,2.1-0.1,3.1c1.4,1.1,2.8,2.3,4.2,3.4c2.3,0.8,4.6,1.7,6.8,2.9c-0.1-1.3-0.1-2.7-0.2-4
+		c0.8-1.1,1.5-2.3,2.3-3.4c0.8-0.1,2.3-0.2,3-0.3c-0.1,0.6-0.3,1.8-0.4,2.4c-3.6,8.4-6.5,17.2-9.9,25.7c-2.9,7.9-6,16.2-5.2,24.8
+		c-0.1,3.8,1.8,7.4,4.8,9.7c2.8,1.3,2.7,4.4,3,7.2c0.2-1.5,0.4-3,0.7-4.5c1.8,0.4,3.7,0.8,5.6,1.2c0.3,0.5,0.8,1.6,1.1,2.1
+		c2,0,4.1-0.1,6.1-0.1c0.1-0.8,0.3-1.5,0.4-2.3c0,4.4,4.3,1.2,6.6,1c-0.2,4.4,0.4,8.9-0.9,13.2c-7.1,2.4-14.4-0.1-21.6,0.1
+		c-2.5-0.2-5.6,0.7-7.1-1.9c-0.6,0-1.2,0-1.8,0.1c-0.5,0.5-1.4,1.3-1.8,1.8c-9.3-0.4-18.5,0-27.8-0.2c-0.1-0.7-0.2-2-0.3-2.7
+		c3.1-0.1,6-1.4,9.1-1.3c0-0.4,0-1.1,0-1.4c-1.3-0.9-2.2-2.1-2.3-3.8c0.4-0.7,1.2-2.1,1.7-2.8c0.8,0.1,2.3,0.5,3.1,0.6
+		c-0.1-0.7-0.2-2.1-0.3-2.9c-0.8,0.6-1.6,1.1-2.3,1.7c-2.9,0-5.7-0.1-8.6,0c-1-1-2-2.1-3-3.1c-0.5-1.9-1.1-3.8-1.6-5.6
+		c-0.4,0.9-1.3,2.8-1.7,3.7c-2.9-0.1-5.8-0.1-8.7-0.1c4.3-5.4,8.8-10.6,12.1-16.8c2.4-4.4,4.5-8.9,6.9-13.3c1.2,0,2.4-0.1,3.7-0.1
+		c0.9,0.7,1.9,2.2,2.5,0c2.3,0,4.6,0.1,6.9,0.2c-0.1-0.5-0.2-1.7-0.3-2.2c-0.7-0.7-1.4-1.5-2.1-2.2c1.5-2.1,1.6-4.6,0.4-6.9
+		c-0.2,1.7-0.3,3.4-0.3,5.2c-0.9,0.5-1.8,1-2.8,1.5c-0.1,1.2-0.1,2.4-0.1,3.6c-2.1,0-4.3,0-6.4,0c0.1-3.4,1.6-6.5,2.9-9.6
+		c0.5,0.4,1.6,1.3,2.1,1.7c1.4-1.5,2.6-3.1,3.8-4.8c-0.7-0.4-2.2-1.2-2.9-1.5c1.7-7.6,5.7-14.4,9.1-21.3c2-7.8,5.4-15.1,8.7-22.4
+		l1.8-0.7c0,0.6-0.1,1.8-0.1,2.4c2.6-0.1,5.9-0.7,6.5,2.7c0.3,0.2,0.8,0.5,1.1,0.7c0.4-1.5,0.9-3.1,1.3-4.6c1.7,0.3,3.5,0.7,5.2,1.1
+		c-0.1,2.1-0.2,4.2-0.3,6.3c1.4,0,2.8,0,4.3,0c-0.1-0.7-0.2-2.2-0.3-2.9c0.7-0.7,1.4-1.4,2.1-2c0.1-0.5,0.2-1.7,0.3-2.2
+		c-0.8,0.1-2.5,0.2-3.3,0.3c0-1.4,0.1-2.8,0.2-4.2c-3.6,0.1-7.1,0-10.7,0c-0.5,0.7-1.4,2-1.8,2.7c-1.3-1.3-2.6-2.6-3.8-3.9
+		c1.9-7.8,5.7-15,8.6-22.5c3.9-9.5,8.1-18.9,11.8-28.4c2.7-6,4.7-12.3,7.8-18.1c2.1,0,4.1,0,6.2,0c-0.8-1.9-2.1-3.5-3.3-5.1
+		c-0.7-3.1,1.4-5.8,2.8-8.4c2.1-7.6,5.6-14.6,8.2-22c5.4-14.3,11.3-28.4,15.4-43.1C1494.6,478.5,1502.3,475.9,1509.5,472.5
+		 M1504,514.3c-1.5,0.3-3.1,0.6-3.9,2.1c-0.5,0.2-1.4,0.6-1.9,0.8c2.2,1.5,4.9,1.5,7.5,2.2c0,0.8-0.1,2.3-0.2,3.1c1,0,2-0.1,3-0.1
+		c-0.1-1.7,0-3.8-2.1-4.3c0-1.6,0-3.3,0-4.9C1505.6,513.5,1504.8,513.9,1504,514.3 M1515.3,525.1c0.7,1.7,1.2,3.5,1.5,5.3
+		c1.3,0.1,2.6,0.1,3.9,0.2c-0.1-0.9-0.3-1.8-0.4-2.7C1518.6,527,1516.9,526.1,1515.3,525.1 M1453.6,583.6c-1.3,1.2-2.7,2.4-4,3.5
+		c-0.1,1.1-0.1,2.3-0.1,3.4c2.7,0,5.4,0,8.1,0.1c-0.1-1.7-0.1-3.5-0.1-5.2c-0.7-0.6-1.3-1.2-2-1.9
+		C1455,583.6,1454.1,583.6,1453.6,583.6 M1523.5,623.5c0,0.5-0.1,1.6-0.1,2.2c0.6,0,1.8,0.1,2.4,0.1c0-0.6-0.1-1.8-0.1-2.3
+		C1525.1,623.4,1524,623.4,1523.5,623.5 M1548.2,629c1.3,1,4.4,3.8,1.1,4.6c2-0.3,4.3-0.9,5.7,1.1c-0.8-1.3-1.4-2.6-1.7-4.1
+		c-0.6-0.1-1.7-0.4-2.3-0.5c0-0.8,0.1-2.3,0.2-3l-0.5,3.8C1550,630.3,1548.8,629.4,1548.2,629 M1564,632.8c-0.9,1.8-2.1,3.4-3.4,4.9
+		c0,0.5,0,1.4,0,1.9c0.9,1,1.9,2,2.9,3c0.4,0,1.2,0,1.6,0c0.5-1.7,1.5-3.2,2.6-4.5c-0.8-0.9-1.6-1.8-2.3-2.7c0-0.8,0.1-2.3,0.2-3
+		C1565.2,632.3,1564.4,632.6,1564,632.8 M1564,666c0.2,3.3,4.7-0.2,1.8-1.4C1565.4,664.9,1564.5,665.7,1564,666 M1546.6,669.6
+		c0,0.9,0,1.8,0,2.8c1,0.1,2,0.2,3,0.2c-0.1-1-0.2-2-0.3-3C1548.4,669.6,1547.5,669.6,1546.6,669.6 M1554,688.2
+		c1.3,0.9,3.2-1.4,1.8-2.4C1554.4,684.7,1552.5,687.1,1554,688.2 M1398.5,712.5c1.3,0,2.7,0,4.1,0c0-1.7,0-3.4,0-5.1
+		c-1,0-2.9,0.1-3.8,0.2C1398.6,709.2,1398.6,710.8,1398.5,712.5 M1563.3,712.9c0.1,0.8,0.4,2.5,0.5,3.3c1.2,0.3,2.5,0.4,3.8,0.6
+		c-0.1-1.6-0.1-3.2-0.2-4.9c3.1-0.2,2.3-4.3-0.7-3.6C1565.6,709.8,1564.5,711.4,1563.3,712.9 M1592.2,709.7c0.7,2,1.4,4,2.1,6
+		c0.7,0,2.1-0.2,2.8-0.2c-0.8-1-1.7-1.7-2.8-2.3c0.1-1.4,0.3-2.7,0.4-4.1C1594.2,709.2,1592.9,709.5,1592.2,709.7 M1588.8,713.4
+		c1.4-0.9,1.4-1.8,0-2.6C1587.3,711.8,1587.3,712.6,1588.8,713.4 M1397,715.7c-1.1,0.8-2.1,1.6-3.2,2.4c-0.2,0.4-0.5,1.3-0.6,1.7
+		c0.5,0,1.4-0.2,1.9-0.2c1-1.5,2.9-1.1,4.4-1.4c0-0.9,0-1.8,0-2.6C1398.6,715.6,1397.8,715.6,1397,715.7 M1583.6,715.6
+		c0,0.8,0.1,1.5,0.2,2.3c1.2,0.5,2.4,1.1,3.6,1.7c0-1.4,0-2.8,0-4.1C1586.1,715.5,1584.9,715.6,1583.6,715.6 M1415.5,717.4
+		c0,0.6,0,1.8,0,2.4c1.1,0.6,2.1,1.3,3.2,1.9c-0.1,1.2-0.1,2.5-0.1,3.8c1.2,0,2.5,0,3.8,0c1-1,2.1-2.1,3.1-3.1c0-1.3,0-2.6,0.1-3.9
+		c-1.9,0-3.8,0-5.6,0C1418.7,717.4,1417,717.5,1415.5,717.4 M1406.2,719.5c0.2,1.7,0.8,3.3,1.7,4.8c1.6-1.7,2.3-3.9,3-6
+		C1409.3,718.5,1407.4,718.2,1406.2,719.5 M1399.5,726.5c0.5,0,1.5,0,1.9-0.1c1-0.9,0.4-3.3-1.2-2.8
+		C1399.1,724.3,1398.8,725.3,1399.5,726.5 M1567.4,727.4c-0.1,0.6-0.2,1.7-0.2,2.3c0.5-0.1,1.6-0.2,2.2-0.3c0.8-1.4,1.6-2.8,2.3-4.1
+		C1570.3,726,1568.8,726.7,1567.4,727.4 M1528.4,729.9c-1.2,1.3,1,3.5,2.1,1.8C1531.7,730.4,1529.5,728.3,1528.4,729.9 M1546.6,737
+		c3.6-0.8,3.5-5.2,0-5.9C1546.4,733.1,1546.2,735,1546.6,737 M1541.3,734c0.3,1.5-0.6,3.9,1.3,4.6c1.2,0,3.4,0,4.6,0
+		c-0.8-1.5-2-2.6-2.9-4C1543.5,734.4,1542.1,734.1,1541.3,734 M1443.8,739.7c1.4-0.2,1.2-2.3,0.4-3.1
+		C1442.1,735.3,1441.8,739.5,1443.8,739.7z"/>
+	<path class="st2" d="M1208.1,479.2c5.3-2.9,10.6-6.4,16.8-7.1c-0.9,2.7-0.7,7-4.6,6.8c-3,3.4-6.4,6.7-10.8,8
+		c-0.7,0.9-1.4,1.8-2.1,2.7c-2,0-4.1,0.1-6.1,0.2c0-3,0-6,0.1-9.1C1203.5,480,1205.8,479.5,1208.1,479.2z"/>
+	<path class="st2" d="M106.5,475.4c14.5,0.2,29,1.7,43.5,1c9.8-0.8,19.6-0.7,29.4-1.9c1.6,3.1,2.9,6.4,4.1,9.8
+		c5,12.3,10.6,24.4,15.7,36.6c2.3,5.3,6.3,10.5,5.2,16.6c0.7,0,2,0.1,2.6,0.1c6.1,14.1,12.9,27.8,19.5,41.7c0.9,1.6,0.7,3.5,0.8,5.4
+		c0.5,0.3,1.6,0.8,2.1,1.1c3.6,7.7,7.7,15.2,10.5,23.2c1.6,3.5,4.5,6.4,4.7,10.4c1.6,2.2,3.1,4.5,4.1,7
+		c5.6,12.5,11.9,24.7,16.4,37.7c-0.9-0.2-1.8-0.4-2.7-0.5c0.1,2,0.1,4,0.2,6c2.5,0.2,6.1-1,6.2,2.7c2.9-3.1,3.7-7.3,5.4-11
+		c2.8-6.5,4.8-13.3,8.5-19.3c1.9-6.1,4.5-12,7.9-17.4c3.6-7.4,5.7-15.5,10.6-22.2c2.5-8.2,6.5-15.8,10-23.6
+		c12.6-27.1,25.4-54.1,37-81.7c0.9-2.5,2.6-4.5,3.9-6.8c0.7-4.9,2.6-9.6,4.7-14.1c5.1-1.2,10.7-0.3,15.8,0.6
+		c-0.1,1.3-0.2,2.6-0.2,3.9c-0.8,0.8-1.6,1.5-2.4,2.2c-0.7,0-2.1-0.1-2.8-0.1c0.1,0.5,0.2,1.5,0.2,2c1.4,0,2.7,0,4.1,0.1
+		c2.2-2.1,2.4-5.2,2.8-8.1c3.5,0,7.1-0.3,10.6,0.3c3,0.6,5.9-0.6,8.9-0.1c3.8,0.6,7.5-0.1,11.3-0.3c0.3,0.3,1,1,1.3,1.3
+		c1.2-2.2,3.8-0.9,5.5-0.1c5.2-2.9,11.4-1.7,17-2.8c2.2-0.7,2.3,2,1.7,3.4c-0.5,3.8,0.7,7.7,0.4,11.6c-7.3,0.7-14.6,0.7-21.7,2.4
+		c-0.9-0.6-1.8-1.2-2.6-1.8c-1.2,1.1-2.4,2.2-3.6,3.3c-1.3,0-2.6-0.1-3.9-0.1c-0.9,0.8-1.9,1.6-2.8,2.4c-0.1,0.4-0.3,1.3-0.4,1.7
+		c0.9-0.1,2.6-0.2,3.5-0.2c0,1.2-0.1,2.5-0.1,3.8c-0.7,3.4-2.1,6.5-2.9,9.9c-0.6,6,0.9,12,0.2,18c-0.4,3.7,0.8,7.3,0.2,11
+		c-0.9,5.6-0.7,11.4-0.2,17.1c1.3,7.6,0.1,15.3,1,22.9c1.2,9.6,0,19.4,1.2,29c0.5,3.3-0.5,6.6-0.2,10c1,8,0.4,16,0.8,24
+		c1.4,16,0.7,32.1,2.5,48c0.2,9.8,0.8,20.1,5.7,28.8c5.8,7.2,16,7.6,24.6,7.9c0.1,2,0.2,4,0.2,6c0,3.2,0,6.4-0.2,9.7
+		c-24.4-2.6-49-2.1-73.5-2c-5.3,0.1-10.7,0-16,0.6c-6.8,0.8-13.6,0.2-20.4,1.4c-0.1-0.2-0.2-0.7-0.3-1c0-4.7,0.1-9.5-0.1-14.2
+		c2.1-0.4,4.2-0.6,6.3-0.7c0,1.7-0.1,3.3-0.1,5c1.2,0,2.5,0,3.8,0c0.3-1.4,0.6-2.8,0.9-4.2c1.2,0,2.4,0.1,3.6,0.1
+		c-0.1,0.5-0.3,1.6-0.4,2.2c1.6,0,3.1-0.1,4.7-0.1c-1-1.2-2.1-2.5-3.1-3.7c2.2-2,5.1-2.8,7.1-4.9c7.6-9.2,6-21.8,6.4-32.8
+		c-0.5-29.2,0.9-58.3-0.2-87.5c0.9-0.1,1.9-0.1,2.8-0.1c1.1-2.1,2.4-4,3.9-5.8c0.6,0,2-0.2,2.6-0.2c0-0.5,0.1-1.5,0.1-2
+		c-1.8,0.1-3.5,0.2-5.3,0.4c0-1.8,0.1-3.6,0.1-5.4c1.8,0,3.6,0.1,5.4,0.1c-0.5-1.7-1-3.4-1.5-5c-1.1,0.1-2.3,0.1-3.4,0.2
+		c-0.4,1.3-0.7,2.7-1,4c-0.8,0-2.5,0-3.3,0.1c0.1-4.3-0.3-8.7,0.4-13c0.7-1.7,3-1.2,4.4-1.7c0-0.8,0-1.6,0-2.4
+		c-1.3-0.1-2.5-0.2-3.8-0.3c0-9.7,1.1-19.4,1.8-29c-0.8-0.2-1.6-0.4-2.3-0.6c-13.9,40.1-32.7,78.3-50.7,116.7
+		c-6.9,14.8-14.3,29.4-20.6,44.5c-6,13.5-11.5,27.2-18,40.5c-3.3-0.1-6.6,0.1-9.9,0.7c-0.5-0.2-1.6-0.7-2.1-0.9
+		c-1.6-3.8-3.4-7.5-4.5-11.5c-1.9-2.6-3.3-5.5-4.4-8.5c-6.6-13-12.2-26.5-18.9-39.4c-0.1-0.8-0.4-2.5-0.5-3.4
+		c2.4-0.5,4.8-0.9,7.3-1.3c-0.1-1.3-0.2-2.6-0.3-3.9c2.4-1.4,4.7-2.9,6.9-4.5c-0.1-3.4,1.7-7,0.1-10.3c-0.5-1.2-1-2.3-1.4-3.4
+		c-0.9,0.9-1.7,1.7-2.6,2.6c2.1,2.1,2.4,4.9,2.4,7.8c-4.7,2.5-10,3-15.2,3.3c-1.8-2.3-3.3-4.8-3.4-7.7c-0.6,0.4-1.7,1.2-2.2,1.6
+		c-12.8-27.8-26.1-55.3-38.5-83.3c-0.9-2.3-1.6-4.8-2.4-7.2c-2.2-2.1-1.7-5.1-1.5-7.9c-0.9-0.4-1.8-0.9-2.6-1.3
+		c-1.9-3.8-3.5-7.7-4.2-11.9c-2.1-2.9-3.2-6.4-4.3-9.8c-0.5,0-1.6,0-2.2-0.1c0.6,15.2,2,30.5,0.6,45.7c-0.3,8,0.2,16-0.6,24
+		c-1.5,6.6-0.3,13.3-0.7,20c0.2,9.2-1.8,18.4-0.8,27.6c-2.8-0.1-5.7-0.4-8.2,1.2c2.6,1,5.2,2,7.9,2.9c0,2.3-0.1,4.6-0.1,6.9
+		c-2.9-1.5-5.8-0.9-7.9,1.5c1.9,0.6,3.8,1.2,5.7,1.8c0.8,1.2,1.6,2.3,2.4,3.5c-0.3,7.5-1.8,15.1-0.4,22.7c0.3,7.2,1,15,5.9,20.8
+		c4.9,4.9,12.2,6.7,19,6.7c1.4,0.3,3.5-0.5,4.5,0.8c0.4,4.7-0.1,9.5,0.2,14.3c-5.9-0.5-11.8,0.1-17.6-0.7c-4.6-0.5-9.2-0.6-13.8-0.4
+		l-0.7,0c0-0.7,0-2-0.1-2.7c-1.3,0.3-2.5,0.8-3.7,1.5c-4.5,0.2-9,1.3-13.4,0.3c0-2.5-0.1-5-0.2-7.4c-0.8,0.8-1.7,1.6-2.5,2.5
+		c-0.3,1.1-0.6,2.3-0.8,3.4c-0.8,3.8-5.4,1.9-8.1,2.3c0.4-0.6,1.3-1.7,1.7-2.3c-0.1-0.8-0.3-2.4-0.4-3.2c-1.2-0.5-2.5-0.5-3.8-0.7
+		c0,2.1,0.1,4.2,0.2,6.4c-2.9,0-5.8,0.1-8.6,0.2c0.2-2,1-3.9,2.3-5.4c0.1-1.3,0.2-2.6,0.3-3.9c-1.3,0.1-2.6,0.1-3.9,0.2
+		c-0.1,1.1-0.1,2.3-0.2,3.4c-0.3,0.7-0.8,2-1.1,2.7c-1.3-0.1-2.7-0.2-4-0.3c0.1,0.8,0.3,2.3,0.4,3.1c-2.8,0-5.7,0.4-8.4,1
+		c-0.3-4.7-0.1-9.4,0-14.1c4.4,0.1,8.7-1.2,13-1.2c3.9-2.7,7.7-5.6,10.5-9.5c1.3-0.5,2.6-1,3.9-1.4c-1.8-4-1.7-8.4,0-12.5
+		c0.4-1.9,0.5-3.8,0.6-5.7c0.2-3.1,0.7-6.2,1.5-9.2c1.1-5.9,0.1-12,0.8-18c0.9-7,0.7-14,1.2-21c1.3-9,0.2-18,1.7-27
+		c0.3-1.5,1.3-2.7,1.9-4c-0.9-3.3-2-6.6-1.3-10c0.3-11,1.3-22,1.6-33c1.3-8.8,0.4-17.7,1.5-26.5c0.4-9.8,1.4-19.6,1.1-29.5
+		c0-9-1.8-19.1-9.2-25.1c-6-5-14.2-5-21.5-5.5C106.6,484.7,106.5,480,106.5,475.4 M413.5,478c0,1.8,0,3.7,0,5.5c1,0,2-0.1,3-0.1
+		c0-1.3,0-2.5,0-3.8C415.5,479.1,414.5,478.6,413.5,478 M376.6,485.8c-0.1,1.3-0.1,2.5-0.1,3.8c1.7-0.1,3.5-0.2,5.2-0.4
+		c0.4,1.1,0.8,2.2,1.1,3.4c1.5-0.6,3.1-1,4.7-1.4c0-1.2,0-2.4,0-3.6c-1.2-0.5-2.5-0.9-3.7-1.4c-0.3-0.5-0.9-1.4-1.2-1.9
+		C380.6,485,378.6,485.5,376.6,485.8 M153.9,485.5c0.4,2.8,0.1,5.7-0.3,8.5c-1.2,0.8-2.5,1.5-3.8,2.1c-0.1,0.4-0.2,1.1-0.3,1.5
+		c0.4-0.1,1.1-0.2,1.5-0.3c0.8-1,1.6-2,2.4-3c1.7,0,3.4,0,5.1,0c0.2-2.3-0.4-4.2-2.7-5C155.1,488,154.5,486.7,153.9,485.5
+		 M358.6,503.4c0,0.7,0,2.2,0,3c-1.8,1.3-3.5,2.7-4.6,4.6c1.9-1.1,3.6-2.6,5.8-3.4c2.4,0.8,5,1,7.5,0.9c0.1-0.9,0.1-1.8,0.2-2.7
+		C364.6,504.6,361.7,503.4,358.6,503.4 M348.3,513.9c0.4,1.2,0.9,2.3,1.4,3.5c1,0,1.9,0.1,2.9,0.1c-0.1-1.7-0.2-3.4-0.2-5.1
+		C351,512.9,349.6,513.4,348.3,513.9 M346,527.6c-0.9,1.2-1.9,2.5-2.8,3.6c1.8,0.1,3.6,0.7,4.9,2c0.3,0.1,1,0.3,1.4,0.4c1-1,2-2,3-3
+		c0-1,0.1-2,0.1-3C350.4,527.6,348.2,527.6,346,527.6 M390.4,532.7c0.7,2.3,1.1,4.6,1.4,7c-1.8-0.1-3.6-0.1-5.4-0.2
+		c0,0.4,0,1.3,0,1.7c3-0.2,1.8,3,2.1,5c-0.8,0.8-1.6,1.6-2.3,2.5c-1.7,0-3.3,0-5,0c0.1-0.8,0.2-2.5,0.3-3.4
+		c-2.3,0.9-4.7,1.5-7.1,1.6c0-1.1,0-3.3-0.1-4.4c1-0.6,2.1-1.2,3.1-1.8c0-1.6-0.1-3.2-0.1-4.7c-2,1.1-3.3,2.9-3,5.3
+		c-1.7,1.3-3.4,2.8-4.9,4.3c0,1.3-0.1,2.6-0.1,3.9c2.1-0.1,4.2-0.2,6.3-0.3c0,1.6-0.1,3.3-0.1,4.9c0.9,0.9,1.8,1.8,2.7,2.8
+		c0.4-2.2,0.5-5,2.5-6.4c1.6-0.2,3.3-0.3,4.9-0.3c0,2.4,0,4.9,0,7.4c-2.1-0.1-4.2-0.1-6.3,0c2.3,0.8,4.7,0.8,7.1,0.9
+		c-0.1-3-0.2-6,0-8.9c0.8-2,3.3-1,5-1.2c-0.3-3.9,0.5-7.8,1.2-11.6c0.4-0.3,1.3-0.9,1.7-1.2c0.1-1,0.1-2.1,0.2-3.1
+		C393.2,532.5,391.8,532.6,390.4,532.7 M144.8,541.6c-0.1,0.5-0.3,1.4-0.4,1.9c1,0,1.9-0.1,2.9-0.1c0.1-0.6,0.3-1.7,0.4-2.2
+		C146.7,541.3,145.7,541.4,144.8,541.6 M179.2,541.3c-0.9,4.2,4.6,5.2,7.1,2.9C184.9,541.4,181.9,541.4,179.2,541.3 M177.7,554.4
+		c-0.5,1.3-0.9,2.7-1.4,4.1c1.7,0,3.5,0,5.2,0c0-1,0.1-3.1,0.1-4.1C180.3,554.4,179,554.4,177.7,554.4 M137.5,556.5
+		c0,1.3,0,2.7-0.1,4c1,0,2.1,0,3.1,0c0-1.4,0-2.7,0-4.1C139.5,556.5,138.5,556.5,137.5,556.5 M320.5,571.6c-2.2,1.6-4.1,3.6-5.5,5.9
+		c1.1,0,2.3-0.1,3.5-0.1c1.3-0.8,2.6-1.6,3.9-2.4c0.1-1.2,0.2-2.4,0.3-3.5C322,571.5,321,571.6,320.5,571.6 M324.4,580.5
+		c0,1.2,0,2.4,0.1,3.7c1.4,0.3,2.4,1.4,3.3,2.5c-0.1,1.5-0.2,3.1-0.2,4.7c-0.4,0.3-1.2,0.8-1.6,1.1c0.6,0.1,1.8,0.2,2.5,0.3
+		c0.5-1.7,0.9-3.4,1.2-5.1c-0.8-0.7-1.6-1.4-2.4-2.1c0.1-1.7,0.2-3.3,0.3-5C326.5,580.5,325.5,580.5,324.4,580.5 M222.8,599.6
+		c-0.1,2.3-1.1,4.3-2.6,6c0.4-0.1,1.2-0.3,1.6-0.4c1-1.8,2.8-2,4.7-1.9c0-1.4,0.1-2.7,0.1-4.1C225.4,599.4,224.1,599.5,222.8,599.6
+		 M198,606c-1.8,1.4,0.7,6.6,3.1,4.1C202.7,607.8,200.8,603.5,198,606 M141.7,621.7c-0.1,0.9-0.1,1.9-0.1,2.8
+		c0.6,0.7,1.2,1.4,1.8,2.1c0.7-0.8,1.5-1.6,2.2-2.4c-0.5-0.9-0.9-1.8-1.4-2.6C143.3,621.6,142.5,621.6,141.7,621.7 M225.2,625.8
+		c0.4,0.1,1.1,0.4,1.5,0.6c-0.1,2.1,0.1,4.2,1.4,5.9c0.6,0,1.7,0,2.2-0.1c0.1-1.2,0.2-2.3,0.3-3.5c0.4-1,0.8-2.1,1.1-3.1
+		C229.5,625.7,227.3,625.8,225.2,625.8 M287.3,635.3c0,1.2,0,2.5,0.1,3.7c2-0.4,3.3-1.5,3.5-3.6
+		C289.7,635.4,288.5,635.3,287.3,635.3 M242.4,641.5c0,1,0,2.1,0,3.1c1.1,0,3.2-0.1,4.2-0.2c-0.1-1.3-0.1-2.7-0.3-4
+		C245,640.5,243.7,640.9,242.4,641.5 M143.9,644.7c-0.1,0.6-0.3,1.8-0.4,2.5c-0.4,0.8-0.9,1.5-1.3,2.3c2.1,0,4.2,0,6.3,0.1
+		c0-1.7,0.1-3.4,0.1-5.1C147,644.5,145.4,644.6,143.9,644.7 M284.4,648.7c-0.7-0.1-2.2-0.3-3-0.4c0,1.1,0.1,2.1,0.1,3.2
+		c1.3,0,2.7,0,4,0c0-2-0.1-4-0.2-6C285,646.5,284.7,647.6,284.4,648.7 M150.3,651.5c0.1,1.5,0.3,3.1,1.3,4.4
+		c0.7-0.4,2.2-1.2,2.9-1.6c0-0.9,0-1.8-0.1-2.7C153.1,651.5,151.7,651.5,150.3,651.5 M369.4,655.1c0,0.5,0.1,1.5,0.2,2.1
+		c2.7,1,5.2,2.5,7.4,4.4c0.8-0.8,1.5-1.5,2.3-2.3c0.1-1,0.1-2,0.2-3c-1.8,2.2-4.5,0.8-6.6,0.1C371.7,655.9,370.5,655.5,369.4,655.1
+		 M285.5,656.5c-0.7,0.7-1.5,1.5-2.2,2.2c-1.3-0.1-2.6-0.2-3.8-0.4c0.1,2,0.1,4.1,0.2,6.1c0.5,0,1.5-0.1,2-0.1
+		c1.9-1.8,3.5-4,4.5-6.5c1-0.5,2.1-0.9,3.1-1.3C288,656.6,286.7,656.6,285.5,656.5 M254.3,657.1c0,1.2,0,2.4,0.1,3.6
+		c1.8-0.1,3.6-0.1,5.3-0.2c-0.1-0.5-0.3-1.4-0.4-1.9C257.8,657.9,256.1,657.4,254.3,657.1 M277.2,674.6c-1.9-0.1-3.8-0.1-5.8-0.2
+		c0.1,1.9,0.1,3.9,0.2,5.8c-2.2,0.7-4.2,2-6.1,3.3c0,0.6-0.1,1.6-0.1,2.2c3.4-0.8,7.4-0.4,10.4-2.3c0.4,0,1.2,0.1,1.7,0.1
+		c-0.1-2-0.1-3.9-0.2-5.8c1.3-1.8,2.5-3.6,3.7-5.4C279.4,672.5,277.3,672.4,277.2,674.6 M369.5,687.4c0,1.1-0.1,2.2-0.1,3.2
+		c1.8,0,3.5-0.1,5.3-0.2C375.4,686.9,371.8,687.5,369.5,687.4 M255.7,691.7c0.2,2.3-0.3,4.6-2.2,6.1c0.4,1.5,0.9,3.1,1.4,4.6
+		c2.2,0,4.8,0.6,6.1-1.7c1.3-2.1,4-1.1,6-1.3c-0.7-0.6-1.3-1.3-1.9-1.9c-0.6,0-1.9,0.1-2.5,0.1c-0.9-1.1-2.8-2.2-1.9-3.9
+		c0.5-0.1,1.6-0.2,2.1-0.3c-0.1-1-0.2-2.1-0.2-3.1C260.1,690.4,257.9,690.9,255.7,691.7 M271.1,693.8c0.5,1.3,1,2.6,1.4,3.9
+		c2.1-0.2,7,0.9,6-2.9c-1.5-0.9-3-1.7-4.5-2.4C273.3,692.7,271.9,693.4,271.1,693.8 M132.6,698.5c0,1.6-0.1,3.2-0.1,4.9
+		c1.6,0,3.1,0.1,4.7,0.1c0.4-1.3,0.8-2.6,1.2-4c1-0.3,1.9-0.5,2.9-0.8C138.5,698.5,135.6,698.5,132.6,698.5 M359.6,702.5
+		c-1.9,1.7-3.9,3.4-6,5c0,0.5,0,1.4,0,1.9c1.2,0,2.4,0,3.5,0c1.2-1.6,2.8-2.8,4.3-4C361.2,704.2,360.2,703.4,359.6,702.5
+		 M130.5,710.4c0,1.2,0,2.3,0,3.5c0.6-0.5,1.6-1.3,2.2-1.8c2.7,1.7,1.5,4.5,0.7,7c1.4,1,2.8,2.2,4.1,3.3c0.4,0,1.1-0.2,1.4-0.2
+		c1.2-0.4,2.5-0.8,3.7-1.1c-0.2-1.4-0.3-3-1.1-4.2c-0.2-1.4-0.3-2.9-0.4-4.3c-2.5-0.1-5.2,0.3-6.9-1.9c0.8-1.5,1-3.1,1-4.8
+		C133.7,707.5,132.1,708.9,130.5,710.4 M241,713.4c0.4,0.8,1.1,2.3,1.4,3.1c1.4,0,2.8,0,4.2,0c-0.1-1-0.2-2-0.3-3
+		C244.6,713.5,242.8,713.5,241,713.4 M358.6,713c0,1.4,0,2.8,0.1,4.2c1.5,0,3,0.1,4.5,0.1c0.5-0.4,1.3-1.1,1.8-1.5
+		c-1.7-0.5-3.4-1.1-5.1-1.6C359.5,714,358.9,713.4,358.6,713 M148.5,714.5c0,1.2,0.1,2.3,0.1,3.5c2.7,0.3,3.1,3.3,4.2,5.3
+		c0.4,0.1,1.1,0.3,1.5,0.4c0.4-2.3,1.5-4.3,2.7-6.3c-1.8,0.1-3.5,0.1-5.3,0.2c-0.4-1.1-0.8-2.2-1.2-3.3
+		C150,714.4,149,714.5,148.5,714.5 M123.9,720.5c-1.8,3.1-3.9,6.1-5.9,9.1c1.5-0.1,3,0.1,4.4-0.4c2-1.8,4.8-3.5,4.2-6.7
+		c0.5-0.7,1-1.3,1.5-2C126.7,720.5,125.3,720.5,123.9,720.5 M374.4,721.5c0.5,0.9,1.1,1.8,1.7,2.7c1.1,0.2,2.3,0.3,3.4,0.5
+		c0-1.1,0-2.2,0-3.3C377.9,721.4,376.1,721.5,374.4,721.5 M105.4,731.4c0.1,1.4,0.1,2.8,0.2,4.2c0.5,0,1.7-0.1,2.2-0.1
+		c0.6-0.7,1.1-1.4,1.7-2c0-0.5,0.1-1.4,0.1-1.9C108.2,731.5,106.8,731.4,105.4,731.4 M356.5,731c-0.1,2.6-0.1,5.2,0.8,7.7
+		c1.5-0.1,2.9-0.1,4.4-0.1c-0.5-2.1-0.9-4.1-1.3-6.1C359.1,731.9,357.8,731.4,356.5,731 M256.2,736.3c0.4,1.6-0.2,4.1,2,4.6
+		c2.2-1.1,1.2-2.8,0.4-4.5C258,736.4,256.8,736.3,256.2,736.3z"/>
+	<path class="st2" d="M761.5,489.4c-0.1-5-0.3-9.9,0-14.9c4.2,0.1,8.3,1.2,12.5,1.1c4.4-0.4,8.6,1.9,13,0.8c15,0.2,30,0.7,45,0
+		c4-0.3,8.1,0.6,12.1,0c8.2-1.6,16.6-0.1,24.9-1.4c1.5-0.4,2.9,0.2,4.4,0.5c0,2-0.1,4-0.1,6c0,2.7,0,5.4,0,8
+		c-5.8,0.1-11.6-0.2-17.2,1.6c-3.5,1-6.5,3.4-9.3,5.6c-1,2.8-2.1,5.5-2.6,8.3c-1.4,0.6-2.8,1.2-4.2,1.8c0.8,1,1.7,1.9,2.6,2.9
+		c-0.1,2.5-0.1,5.1-0.2,7.6c-1,4.9-1,10-0.5,15c-1.9,1.8-3.8,3.6-5.8,5.3c-0.4,1.4-0.7,2.8-1.1,4.2c2.2-0.3,4.3-0.5,6.5-0.8
+		c-0.1,10.4,0.1,20.9,0.1,31.3c-0.5,8,0.1,16.1-0.1,24.1c1.9,0,3.8,0.1,5.7,0c4.9-0.8,10-1.4,14.9-0.5c3.7,1,7.3-0.9,11-0.2
+		c4.6,1,9.3-0.6,14,0.4c9.3-0.6,18.7-1.2,28,0.2c3.7,0.3,7.3-1.3,10.9-0.3c6.2,1.2,12.4-1,18.5,0.4c0,1,0.1,3,0.2,4
+		c-2,0-3.9-0.1-5.9-0.1c-0.6,0.9-1.1,1.9-1.6,2.8c1.3,0.5,2.6,1,3.9,1.5c1.4,0.4,2.9,0.8,4.5,0.6c1.7-2.6,2-5.9,2-8.9
+		c7.2-1.3,14.5-1.1,21.7-0.3c0.8,0.1,2.5,0.2,3.3,0.3c-0.2-16.2-0.1-32.4-0.1-48.6c0.1-8.7,0.3-17.5-0.7-26.2
+		c-0.3-7.8-0.2-16.2-4.3-23.1c-2.8-5-8.2-8-13.8-8.4c-0.1-1.5-0.2-3-0.2-4.5c2-2.2,3.8-4.6,6-6.6c0-0.7,0-2.1,0-2.7
+		c8.6-0.4,17.1,0.3,25.7,0.2c15.7-0.2,31.4,0.4,47-0.9c7.1-0.2,14.3-0.4,21.4-0.2c-0.3,4.7-0.8,9.5-0.8,14.2
+		c-8.1-0.3-16.3-0.2-24.4,0c-1.3-1.7-2-3.8-2.3-5.9c-0.8,2.6-1.3,5.3-1.4,8.1c1.4,0.5,2.8,1,4.3,1.6c-0.2,0.8-0.7,2.4-0.9,3.2
+		c-4.9,8.1-5.6,18-5.6,27.3c0.1,41-0.2,81.9,0,122.9c0,4.4-1.1,8.7-0.4,13.1c0.8,6.2,0.1,12.5,0.5,18.7c-0.5,1.2-1.1,2.3-1.7,3.4
+		c-0.1,1.9-0.1,3.8-0.1,5.6c-0.8,0-2.5-0.2-3.4-0.2c-1,2-2.2,3.9-4.2,5c1.9-0.1,3.8-0.1,5.7-0.2c-0.1,1.6-0.2,3.2-0.3,4.7
+		c-0.9,0.7-1.7,1.5-2.5,2.3c1,0,2.1,0,3.2,0c1.1-0.5,2.2-0.9,3.2-1.2c-0.8,7.3,2.6,14.1,2.4,21.3c-0.6,0.3-1.6,0.8-2.2,1.1
+		c0,1.6,0,3.2,0,4.8c0.5,0.3,1.6,0.9,2.1,1.2c0,1.2,0,2.5,0.1,3.8c1.8,0,3.5,0.1,5.3,0.1c-1.2-1.1-2.4-2.1-3.6-3.2c0-1-0.1-3-0.1-4
+		c0.9,0.1,2.8,0.2,3.8,0.3c3.1,2,6.5,3.3,9.9,4.9c4.2,0.2,8.5,0,12.7-0.2c-0.2,5-0.5,9.9-0.3,14.9c-10.1-1-20.3-0.4-30.3-1.7
+		c-5.3-1-10.7,0.4-16-0.4c-4.7,0.7-9.4,0-14-0.1c-8,0.8-16.1,0.3-24.1,0.7c-5.3,0.2-10.7-0.5-16,0.2c-3.5,0.5-7,0.7-10.5,0.7
+		c-0.1-4.7-0.6-9.3-0.9-13.9c5.7-0.8,11.7,0.3,17.2-2c4-1.1,7.2-4,9.9-7.2c0.4-0.5,1.3-1.5,1.8-2c2.3-13,3.5-26.3,3-39.5
+		c-0.2-5.6,0.7-11.3-0.3-16.9l1.7,0.5c-0.2,1.7-0.3,3.3-0.5,5c2-0.6,4-1.1,6-1.6c0.1-1.1,0.2-2.2,0.3-3.3c-1-0.5-2.1-1-3.1-1.4
+		c0-2.4,0-4.8,0-7.1c-1.4,1.1-2.9,2.1-4.4,3.1c0.7-13.2,0-26.6,0.5-39.8c-31.5,0.6-63.1,0.1-94.7,0.3c-12.2-0.1-24.3,0.2-36.5-0.1
+		c0,2.7,0,5.4,0,8.1c-0.7,0.1-2,0.2-2.7,0.2c0.7,0.1,2,0.3,2.7,0.4c0,14.2,0.1,28.5,0,42.7c0.1,14-0.6,28.1,1.8,42
+		c0.8,4.1,2.3,8.1,4.7,11.5c6.2,7.2,16.6,6.5,25.3,6.9c-0.5,4.7-0.5,9.5-0.7,14.2c-11.1,0.4-22.1-2-33.2-1.1
+		c-1.4-0.1-2.8-0.1-4.2-0.1c-2.7-0.1-5.5-0.2-8.2-0.3c0.1-1.8,0.2-3.7,0.4-5.5c-1.4,1.1-3,1.9-4.6,2.5c-0.1,0.7-0.1,2-0.2,2.7
+		c-5.8,0-11.6,0-17.5,0c0.1-1.9,0.1-3.7,0.2-5.6c1.6-0.8,3.2-1.6,4.8-2.3c2-3.5,1-7.7,1.4-11.6c-1.9-0.8-3.7-1.5-5.6-2.2
+		c-0.9,2.1-1.9,4.2-2.9,6.3c1.8-0.1,3.5-0.1,5.3-0.2c0.7,1.4,2.7,2.8,1.4,4.5c-0.9,0.5-1.9,0.8-2.9,1.1c-0.1,2.7-2.1,4.2-4.3,5.2
+		c0,1.5-0.1,2.9-0.1,4.4c-8.5,1.4-17.1,0.3-25.7,1.5c-5.2,0.7-10.5,0.2-15.7,1.2c0.3-5.2-0.1-10.3,0.3-15.5c3.8,0,7.7,0.1,11.5-0.2
+		c4.3-0.3,8.1-2.7,12-4.6c0.3-0.7,0.7-1.5,1.1-2.2c6.2-10.5,5.4-23.1,5.5-34.8c0-21.6,0-43.3,0.1-65c1-10,0.8-20,0.5-30
+		c0.2-9.3,0.9-18.7-0.5-28c-0.3-11.3,0-22.6-0.1-34c-0.2-8.1,0.5-16.2-1.2-24.2c-2.6-4.1-4.2-9.1-8.5-11.8
+		C775.7,489.3,768.3,489.9,761.5,489.4 M826.5,479.8c0.1,0.6,0.2,1.9,0.2,2.6c-1.3,1.5-2.7,3-4,4.4c0,0.8-0.1,2.2-0.1,3
+		c-1.6-0.2-3.3,0-4.7-1.1c-1.1,0.4-2.2,0.9-3.3,1.3c-0.1,1.3-0.1,2.7-0.1,4.1c0.7-0.5,1.4-1.1,2.2-1.6c1.5,0,3.1,0,4.7,0
+		c0.7,1.1,1.4,2.2,2.2,3.3c1.3-1.6,2.8-3.1,4.8-3.6c0.1-0.8,0.2-1.6,0.3-2.3c-1.1-0.4-2.2-0.9-3.3-1.3c0-1.6,0.2-3.1,0.5-4.6
+		c1.3-0.2,2.6-0.4,3.9-0.4c0.6-0.6,1.1-1.1,1.7-1.7c0-1.1,0-2.2,0-3.2C829.8,478.9,828.1,479.3,826.5,479.8 M849.6,478.5
+		c-0.1,1-0.1,2-0.2,3.1c0.6,0,1.7-0.1,2.2-0.1c0.7-0.9,1.4-1.9,2.1-2.8C852.4,478.6,851,478.6,849.6,478.5 M1014.1,482.8
+		c0,0.2,0.1,0.6,0.1,0.7c0.6-0.1,1.8-0.2,2.4-0.2c-0.1,0.6-0.2,1.7-0.3,2.2c1.3,0,2.7,0,4.1,0c0-1.4,0-2.8,0-4.2
+		C1018.3,481.8,1016.2,482.4,1014.1,482.8 M795.3,486c0.6,1.3,1.1,2.5,1.7,3.8c1.5-1.4,2.9-2.8,4.4-4.2c0-1.2,0.1-2.3,0.1-3.5
+		C799.8,483.9,797.9,485.7,795.3,486 M998.5,486.3c0,1.9,0,3.9,0.1,5.8c-0.4,0.5-0.8,1.1-1.1,1.7c1.6,1.9,2.4,4.5,4.6,5.8
+		c0.7-0.6,1.3-1.2,2-1.8c1.8-0.9,3.5-1.9,5.4-2.7c0-1,0.1-2,0.1-2.9c-1.2,0.3-2.4,0.7-3.5,1.3c-1.4,0.1-2.9,0.1-4.2-0.2
+		c-0.9-2.4-0.3-5-0.3-7.5c0.5-1,0.9-1.9,1.4-2.9C1001.3,483.9,999.9,485.1,998.5,486.3 M810.1,496.6c-1.3,2-3.1,3.9-5.6,4.2
+		c0,0.4,0.2,1.1,0.2,1.5c0.5,0.3,1.6,0.9,2.1,1.2c0,0.7-0.1,2.1-0.2,2.8c0.5,0.1,1.4,0.3,1.9,0.3c0-1.6,0-3.2,0.8-4.7
+		c0.1-0.6,0.2-1.7,0.3-2.2c1.2-1,2.5-2.1,3.7-3.2C812.1,496.6,811.1,496.6,810.1,496.6 M837,497.7c-1.2,2.1-2.5,4.3-2.8,6.8
+		c1,0,2,0,3,0c0.6-2.4,1.4-4.7,2.3-7C838.7,497.5,837.8,497.6,837,497.7 M815.7,500.5c-0.4,0.5-1.1,1.4-1.5,1.9
+		c-0.5,0.1-1.6,0.3-2.1,0.4c0.4,0.4,1.2,1.4,1.6,1.8c1.6-0.4,3.1-0.9,4.7-1.3c0-1,0.1-2,0.1-3C817.6,500.4,816.6,500.5,815.7,500.5
+		 M799.5,509.4c0,0.5,0.1,1.5,0.1,2c3.2,1.8,4.8,5.4,7.8,7.4c1.2,2.1,1.1,4.5,1.2,6.9c-1.4,0-2.7-0.1-4.1-0.1c0,0.4-0.1,1.2-0.2,1.5
+		c0.8,0.4,1.7,0.8,2.5,1.2c1.1-0.5,2.2-0.9,3.3-1.3c0-0.6,0.1-1.7,0.1-2.2c1-1.8,2.2-3.6,3.5-5.2c-0.8,0-2.4,0.1-3.2,0.2
+		c-2-1.9-4.2-3.5-5.8-5.8c-0.5-0.1-1.6-0.3-2.2-0.4c-0.6-1.2-1.1-2.4-1.6-3.6C800.7,509.7,799.9,509.5,799.5,509.4 M818.5,536.8
+		c0.9,1.8,1.7,3.7,2.4,5.7c0.5,0.6,1.4,1.7,1.9,2.3c-1,0.8-1.9,1.5-2.9,2.3c-0.3,0.4-0.8,1.3-1.1,1.7c-0.5,0.3-1.6,0.9-2.1,1.2
+		c0,0.6,0,2,0,2.6c-1.3,0-2.6,0.1-3.8,0.1c-0.1,0.6-0.2,1.8-0.3,2.5c-2.9,1.8-7,3.7-6.1,7.8c1.1-1.4,2.2-2.9,3.3-4.3
+		c1.4-0.5,2.8-1,4.1-1.6c1.1-1.9,2.2-3.9,3.9-5.3c1.2-0.8,3-1.2,3.3-2.9c1.1-0.9,2.2-1.7,3.4-2.5c0-0.9,0-1.7,0-2.6
+		c-1.5-0.3-4.4-0.8-3.1-3.2c1.1-1.3,2.1-2.5,2.4-4.2C822,536.6,820.3,536.7,818.5,536.8 M821,563.9c0.9,1,1.8,1.9,2.7,2.9
+		c-1.9,3.3-0.8,7.3-1.1,10.9c-0.6-0.1-1.7-0.2-2.2-0.2c0.1,1.6,0.1,3.3,0.2,4.9c-0.4,0.2-1.3,0.6-1.7,0.7c4,0.1,5.3,4.9,5.7,8.1
+		c1.4,0.5,2.8,1,4.3,1.6c-0.5-0.9-1-1.8-1.5-2.7c0-0.6,0-1.7,0-2.3c-1-0.5-2-1-3-1.5c0-2.3,0-4.6-0.1-6.8c1.9-1,4-1,6.2-1
+		c0-1,0-2.1,0.1-3.1c-1.8,0.1-3.5,0.2-5.2,0.3c0.1-3,0.1-5.9,0.1-8.8C824,565.8,822.5,564.8,821,563.9 M988.9,579.4
+		c-0.4,1.4-0.9,2.7-1.5,4c2.6,1,5.4,2.7,8.1,1.1c0-0.9,0-1.8,0-2.8C993.3,580.9,991.1,580.1,988.9,579.4 M997.6,587.5
+		c0,1.7,0,3.3,0,5c-0.7,0-2.1,0.1-2.8,0.2c-2.7,2.2-5.9,3.5-9.4,2.8c0.3,1.3-0.1,3.1,1.3,4c3.1-0.1,6.2-2,9.4-0.6
+		c2.1,0.9,4.4,0,6.5-0.6c0.2-1.8-0.5-4,1.1-5.3c-2-1.1-0.7-3.7-1-5.5C1000.9,587.5,999.2,587.5,997.6,587.5 M951.8,601.7
+		c-0.1,0.4-0.3,1.3-0.4,1.8c0.6,0.1,1.8,0.2,2.4,0.3c0-0.6-0.1-1.8-0.2-2.4C953.1,601.4,952.2,601.6,951.8,601.7 M809.5,605.9
+		c-2.1-0.1-4.1-0.4-5.9-1.4c0,1.3,0,2.6,0,3.9c-1.2,0.7-2.5,1.5-3.7,2.2c-0.3,2.6-2.2,4.4-4.8,4.3c2.6,0.9,1.2,4,1.5,6.1
+		c-1.1-0.2-2.2-0.4-3.2-0.6c0.1,0.5,0.3,1.4,0.3,1.8c1.4,0.2,2.8,0.6,3.8,1.6c-0.1-2.3-0.1-4.6-0.1-6.9c0.3-0.6,0.8-1.7,1.1-2.2
+		c1.4-1,2.8-2.1,4.2-3.2c1.9,0,3.8,0,5.6,0.1c0-1.6-0.1-3.1-0.1-4.7c1.8-0.9,2.5-2.7,3.4-4.4l-0.9-0.2
+		C810.4,603.4,809.9,604.6,809.5,605.9 M806.4,628.3c0,1.4,0.1,2.8,0.1,4.2c0.5,0,1.5,0.1,2.1,0.2c0-1.4,0-2.9,0-4.3
+		C808,628.4,806.9,628.4,806.4,628.3 M809.5,640.7c-1.3,0-2.5-0.1-3.8-0.1c0.2,4.5-2.7,8.3-6.1,10.9c0,1.3,0,2.6,0,4
+		c0.9,0,1.8,0,2.7-0.1c0-1.6,0-3.2,0.2-4.8c1.2-1.5,2.9-2.8,3.2-4.8c1.5-1,2.9-2.2,2.9-4.2c0.5-0.3,1.4-0.8,1.8-1
+		c-0.1-1.2-0.2-2.5-0.4-3.7C809.9,638.2,809.7,639.4,809.5,640.7 M983.6,670.5c-0.7,1.2-1.3,2.3-2,3.4c0,0.4-0.1,1.2-0.1,1.6
+		c1,1,1.9,1.9,2.9,2.9c0.5,0.1,1.5,0.2,2.1,0.3c-0.1-2.7-0.1-5.5-0.1-8.2C985.5,670.5,984.5,670.5,983.6,670.5 M799.5,698.8
+		c0,0.3,0.1,1,0.1,1.3c1.4,0.4,2.8,0.8,4.2,1.3c-0.5,2-1,3.9-1.4,5.9c-0.9,0.3-1.8,0.7-2.6,1c3.2-0.3,6.5-0.2,8.6,2.5
+		c-0.5-5.6-1.3-11.2-0.9-16.9C804.9,695.7,802.3,697.5,799.5,698.8 M988.9,703.1c-0.3,1-0.6,2-0.9,3c0.6,2.2,1.3,4.8-0.1,6.9
+		c-0.5,1.4-1,2.9-1.5,4.4c0.8,0,2.3-0.1,3.1-0.1c1.4,1.6,2.6,3.4,3.6,5.3c0.9-0.6,1.9-1.1,2.8-1.7c-1.8-1.5-4.1-2.6-5.6-4.4
+		c-0.2-1.7,0.5-3.2,1-4.8c2.5-0.8,4.4-2.5,6.3-4.3c1,0,3,0,4,0c-0.1,0.8-0.2,2.5-0.2,3.3c1.6,2.2,4.4,1.4,6.6,2.4
+		c0.5,1.4,0.9,2.8,1.3,4.2c0.1-1.9,0.1-3.8,0.2-5.7c-1.4-0.4-2.8-0.8-4.2-1.2c0.1-0.7,0.2-2.1,0.3-2.8c-2.6,0.4-4.9-0.6-6.1-3
+		c-0.9,0-1.8,0.1-2.8,0.2c-1.2,0.7-2.2,2.2-3.8,1.9C990.6,707.3,990,704.5,988.9,703.1 M981.6,719.6c0,1.4,0,2.7-0.1,4.1
+		c1.8-0.3,3.6-0.8,5.3-1.4c-0.8-0.9-1.7-1.8-2.5-2.7C983.4,719.6,982.5,719.6,981.6,719.6 M1028.4,732.5c0.1,0.4,0.2,1.1,0.3,1.5
+		c1,0.8,2,1.6,3,2.4c1.1,0,2.1,0.1,3.2,0.2c-0.1-1.7-1-3.1-2.3-4.1C1031.2,732.5,1029.8,732.5,1028.4,732.5z"/>
+	<path class="st2" d="M946.5,476.4c2,0,4,0,6.1,0c0,2,0,4,0.1,6c-1.2,1-2.4,1.9-3.8,2.6c-0.1,4.1-4.4,4.6-7.7,4.6
+		c0.4-3.5,3-5.9,4.8-8.7C946.2,479.5,946.4,477.9,946.5,476.4z"/>
+	<path class="st2" d="M1195.2,497.4c0.5-3.3,0.7-9,5.6-8.4c-0.1,1.9-0.1,3.7-0.1,5.6C1198.9,495.6,1197,496.5,1195.2,497.4z"/>
+	<path class="st2" d="M453.6,586.7c0.8-0.1,2.3-0.4,3.1-0.6c-0.4,2.2-0.9,4.4-1.3,6.7c-0.5,0.1-1.6,0.4-2.2,0.6c0-2,0.1-3.9,0.1-5.9
+		L453.6,586.7z"/>
+	<path class="st2" d="M14.7,635.4c0.9,0,2.6,0,3.5,0c2.6,3.2,4.7,6.9,7.2,10.2c1,1.5,2.9,0.6,4.3,0.8c-0.2,8.2-0.1,16.3-0.1,24.5
+		c-1.4-0.1-2.8-0.2-4.2-0.4c0,0.5,0.1,1.6,0.1,2.1c1.3,1,3.3,1.4,3.9,3c0.3,2.3,0.1,4.7,0.1,7.1c-1,0-2.9-0.1-3.9-0.1
+		c1.2,1.1,2.5,2.2,3.7,3.2c0,2.9-0.1,5.8-0.1,8.7c-0.8,0-2.3,0-3,0c-0.8,1.4-1.5,2.8-2.2,4.2c-2.8-0.1-7.1,0.4-5.9-3.9
+		c1.2-1.5,3.9-2.9,2.8-5.2c-1.4-3.7-0.5-7.5,0.6-11.1c-1.4-0.1-2.9-0.1-4.3-0.2c0.1,2.4,0.1,4.7,0.2,7.1c0.8,1.1,2.4,1.9,2,3.6
+		c0.7,2.5-2.2,2.7-3.8,2.6c0,2.6-2.1,3.5-4.5,3.3c0-1.1-0.1-3.2-0.1-4.2c1-0.1,1.8-0.6,2.3-1.3c-0.6-0.3-1.8-0.8-2.4-1.1
+		c0.1-2.4-0.2-5,2-6.5c0.1-1,0.1-2,0.1-3c-3.5-0.2-6.7-1.6-10-2.5c0.5-2.3-1.7-7.4,2-7.2c0-0.9-0.1-1.7-0.1-2.5
+		c-0.8,0-2.3,0.1-3,0.1c0.1-2.9,0.1-5.7,0.1-8.6c1.7,0.1,3.5,0.2,5.2,0.3c0,1.5,0.1,3,0.1,4.6c1.7,1,3.6,1.8,5,3.2
+		c1.1,1.8,2.3,3.7,3.9,5.1c1,0,2,0.1,2.9,0.1c0-2-0.1-4-0.1-5.9c-0.7-0.8-1.4-1.5-2.1-2.2c0-3,0-6-0.1-9c0.8-0.1,2.5-0.2,3.4-0.3
+		c-0.1,1.8-0.1,3.5-0.2,5.3c1.1,0.1,2.1,0.1,3.2,0.2c-0.1-1.7-0.1-3.3-0.2-5c-1.8-1.7-3.2-3.6-4.3-5.8c-1.2-0.5-2.4-1-3.6-1.5
+		c0-2.3,0-4.6,0-6.9c-0.8-0.8-1.6-1.6-2.4-2.4C13.5,637.5,14.3,636.1,14.7,635.4z"/>
+	<path class="st2" d="M466.2,665.3c0.6,0.1,1.9,0.2,2.5,0.3c-0.4,1.6,0.7,4.6-2.2,4.4C466.4,668.4,466.3,666.9,466.2,665.3z"/>
+	<path class="st2" d="M0,666.3c2.3,0.2,2.5,5.2,0,4.9V666.3z"/>
+	<path class="st2" d="M484.7,667.7c1.6-0.9,3.4,0.2,5,0.5c0,1.1,0,3.3-0.1,4.4c-1.8,0-3.7,0-5.5,0
+		C484.3,671,484.5,669.3,484.7,667.7z"/>
+	<path class="st2" d="M0,679.1c0.4-0.5,1.1-1.4,1.5-1.8c1.8,0,3.6,0.1,5.4,0.2c-0.5,1.8-1,3.6-1.5,5.4c-1.8-0.6-3.6-1.2-5.4-1.8
+		V679.1z"/>
+	<path class="st2" d="M1.4,685.5c1.7,0,3.5-0.1,5.2-0.1c0,1.1,0.1,3.2,0.2,4.3c-1.8-0.1-3.5-0.2-5.2-0.2
+		C1.5,688.1,1.4,686.8,1.4,685.5z"/>
+	<path class="st2" d="M1019.3,694.2c0.4-1.9-1.1-5.2,2-5.4c0.2,0.8,0.5,2.5,0.7,3.3c-0.2,1.6-0.3,3.3-0.5,5
+		C1020.8,696.1,1020.1,695.1,1019.3,694.2z"/>
+	<path class="st2" d="M0,691.1c0.9,0.5,1.8,1,2.7,1.4c1.6-0.5,3.3-1.1,4.9-1.6c0,1.2,0,3.5,0,4.6c-2.5,0-5.1,0-7.6,0.1V691.1z"/>
+	<path class="st2" d="M0,698.7c2,0.8,2.6,2.9,3.5,4.6c1,0.2,1.9,0.3,2.9,0.4c0.3-0.5,1-1.6,1.3-2.2c2.8-0.2,5.5-0.9,8.3-0.9
+		c2.5,0.8,4.9,1.7,7.5,2.2c-0.1-0.9-0.2-2.8-0.2-3.7c1.7,0.2,3.4,0.4,5.1,0.7c-0.1,1.6-0.4,3.3-0.7,4.9c-1.2,0-2.4-0.1-3.5-0.1
+		c-0.9,4.8-8.3,4.1-9.3-0.3c-0.9,0.9-1.8,1.9-2.8,2.8c5.9,0.9,11.6,3.2,17.7,2.2c-0.1,2.6-0.2,5.3-0.6,7.9c-3.9,0.9-7.9-0.4-11.8-1
+		c0,1.5,0.1,3.1,0.2,4.6c3.2,1,5.8,3.2,8.1,5.6c1.3,0,2.5-0.1,3.8-0.1c0.1,8.2,0.4,16.5,0.1,24.7c0.1,1.6-1.2,2.7-2,3.9
+		c-0.1,0.7-0.2,1.3-0.3,2c4.2,1.5,1.8,6.8,2.1,10c-0.8-0.7-2.3-2.1-3-2.8c-0.1-0.5-0.1-1.6-0.2-2.1c-2.9-1-5-3.3-5.2-6.5
+		c-1.9-0.1-3.7-0.1-5.6-0.2c0.3,4.7,0.8,9.7-1.9,13.9c-1.8,0.1-3.7,0.1-5.4,0.5c-3.3,1.7-2.5,5.8-2.8,8.9c1-0.1,2-0.1,3-0.2
+		c0.3-1.8,0.6-3.5,1-5.3c2.4,0.1,4.7,0.1,7.1,0.2c1.2-3.6,1.3-7.4,1.1-11.2c1.4,0,2.8,0,4.2,0c3.3,2.8,5.3,6.6,6.9,10.5
+		c0.7,4.2,1.5,8.4,1.3,12.7c-4.6,0-9.5,0.3-13.6-2c0.6-1.7,1.2-3.4,1.8-5.1c-1.3-0.4-2.6-0.8-3.9-1.1c-1.5,3.9-5.4,6.2-7,10
+		c1.1,0.1,2.2,0.3,3.4,0.5c0.4-0.4,1.2-1.2,1.6-1.6c1.2,1.1,2.4,2.2,3.6,3.4c4.7-0.3,9.4,0.6,14.1,1.1c-0.1,2.5-0.3,4.9-0.5,7.4
+		c-0.5-0.4-1.6-1.3-2.1-1.7c-2.8,0.4-5.6,0.8-8.3,1.7c-0.2,1.2-0.4,2.4-0.6,3.7c-1.2,1.3-2.5,2.6-3.8,4c-0.5,0-1.5,0-2-0.1
+		c0-1.9,0.1-3.8,0.1-5.7c1.7-0.5,3.4-1,5-1.6c1.1-2.8-1.8-3.3-3.7-4.2c-1.8,1.8-3.9,3.4-5.4,5.5c-0.9,1.7-1,3.8-1.3,5.7
+		c1.9,0.8,3.7,1.6,5.6,2.4c-0.5,2.2-0.9,4.5-1.4,6.8c0.8,0.7,1.5,1.4,2.3,2.1c0.9,0,1.8,0,2.7,0c0.2-1.8,0.5-3.5,0.8-5.3
+		c1.5,0,3,0.1,4.6,0.1c0,3.1-0.1,6.1-0.1,9.2c1.8,0.7,3.7,1.3,5.5,2c-0.6,1.8-1.1,3.5-1.7,5.3c2.1-0.3,4.1-1,5.8-2.1
+		c2.5-0.3,4.9-0.7,7.3-1.3c0-1.1,0-2.2,0-3.2c4,0,8,0.1,12,0.2c0.1,1.1,0.2,3.2,0.2,4.2c-3.1,2.2-6.7,3.2-10.4,2.8
+		c0.1,1.2,0.1,2.5,0.2,3.7c2.5,1.9,3.6,4.7,3.1,7.8c-1.4,1.1-2.8,2.2-4.1,3.3c0,0.9,0.1,1.7,0.2,2.6c1.8,1.3,4.8,2.2,3.9,5.1H32.8
+		c1.7-1.2,3.4-2.4,5-3.7c-2.2-2.3-4-4.8-5.1-7.8c2-0.5,4-1,6.1-1.4c0.2-3.7-3.4-4.6-6.3-4.9c-0.6,0.8-1.3,1.6-1.9,2.5
+		c0.4,1.3,0.8,2.6,1.1,4c-2.7,0.8-3.7-2.4-5.3-3.8c-2.1-0.3-4.1-0.5-6.2-0.8c0.1-3,0.2-6,0.3-9c-0.8,0.6-1.6,1.2-2.3,1.8
+		c-2.1-0.5-4.2-1-6.4-1.5c-0.6,1.1-1.1,2.1-1.6,3.2c-1.8,0-3.7,0-5.5,0c-0.8,1.8-1.6,3.7-2.5,5.6c2.7,1,6.2,2,5.7,5.8
+		c-3.3,0.2-6.2-1.3-7.9-4.2v-11.1c1.6,0,3.2-0.1,4.8-0.1c-0.1-0.7-0.4-2-0.5-2.7c-1.5-0.6-2.9-1.2-4.3-1.9v-15.8
+		c0.4,0.6,1.2,1.9,1.6,2.6c1.5-0.1,2.9-0.1,4.4-0.2c-0.4-2.7-2.1-4.7-4.1-6.5c-0.7-1.6-1.3-3.2-1.9-4.9V698.7 M3.1,709.1
+		c0,3,1.6,5.5,3.4,7.8c-0.9,1.3-1.7,2.8-0.9,4.4c1.8,0.4,3.8,0.6,5.5-0.1c1.1-3.7,0.7-8.6-2.8-10.9C6.9,709.1,4.8,709.5,3.1,709.1
+		 M1.3,721.7c0.9,0,2.6,0,3.5,0c0-1.4-0.1-2.8-0.1-4.2c-0.8,0-2.5,0-3.3,0C1.3,718.8,1.3,720.2,1.3,721.7 M2.1,728.3
+		C4,733,4,738,3.4,742.9c-0.3,0.9-1,2.7-1.3,3.5c1.7,0,3.5,0.1,5.2,0.1c0.3-0.5,1-1.6,1.3-2.1c1,0,2,0,3,0c0,1,0,2.1-0.1,3.2
+		c-0.5-0.1-1.6-0.2-2.1-0.2c0,0.6,0,1.8,0,2.5c1.6-0.2,3.3-0.3,4.8-1.1c1.1-0.2,2.2-0.3,3.3-0.4c0.1-2,0.2-4,0.1-5.9
+		c-1.6-0.8-3.3-1.4-4.9-2.1c-0.1-1.7-0.2-3.3-0.3-5c2.4-0.8,4.9-1.3,7.3-1.9c0-2.1,0-4.3-0.1-6.4c-4.1,1.8-7.8,4.8-12.6,4.5
+		c-0.8-1-1.5-2-2.3-3C4,728.5,2.8,728.3,2.1,728.3 M24.8,742.6c-0.4,1.6-0.9,3.1-1.3,4.7c-0.4,0.3-1.2,0.9-1.6,1.2
+		c1.8,0,3.5,0,5.2,0c0.5-1.2,0.9-2.3,1.4-3.5c-0.3-0.6-1-1.9-1.3-2.5C26.4,742.5,25.6,742.5,24.8,742.6 M5.6,764.7
+		c1.9,0.3,3.1-1,4.1-2.4c-1.2-2-1.2-4.4-1.1-6.7c-0.8-0.4-2.3-1.2-3-1.6C4.1,757.4,3.9,761.5,5.6,764.7z"/>
+	<path class="st2" d="M535.2,709.2c0-1.9,1.1-3.2,2.6-4.2c0.7,0.4,2.1,1.2,2.8,1.6c-0.1,1.2-0.1,2.5-0.2,3.7c-1.1,1.4-2.2,2.8-3.5,4
+		c-1.5,0.3-2.9,0.4-4.4,0.5c-0.4-0.7-1.3-2.2-1.7-2.9C532,710.4,533.4,709.3,535.2,709.2z"/>
+	<path class="st2" d="M1378.6,725.3c3,0,6,0.4,8.9,1.4c-1,1.8-3.1,2-4.7,2.7c2.3-0.4,6.7,1.6,6.9-1.9c0.7-0.1,2-0.2,2.7-0.3
+		c0.1,1.7-0.1,3.8,2.4,3.5c0,1.6,0,3.3,0,4.9c-1.6,0.5-3.1,1-4.7,1.5c-0.2-1.6-0.4-3.1-0.6-4.7c-0.6,0-1.9,0.1-2.5,0.1
+		c0.4,1.9,1.3,3.6,2.6,5c-0.3,0.4-0.9,1.3-1.2,1.7c0.5,0.1,1.4,0.3,1.8,0.4c-0.5-2.8,2.7-2.9,4.5-3.8c0.7,1.8,0.9,3.6,1,5.5
+		c-2.2,0.1-4.3,0.2-6.4,0.3c-7.1-0.1-14.3-0.4-21.3,1.4c0.4-2,1-3.9,1.5-5.9c-1.6,1.8-2.9,3.8-3.2,6.2l-1.7-0.8
+		c-0.2-2.8-0.1-5.6-0.1-8.4c1.8-1.5-0.1-3.7-0.4-5.4c2.8-0.3,5.6-0.7,8.4-1.1c0,0.8-0.1,2.4-0.2,3.2c1-0.1,2-0.1,3-0.2
+		c-0.1-1-0.2-2.1-0.3-3.1c0.6,0,1.8-0.1,2.5-0.1c0.1,0.8,0.2,2.3,0.3,3C1378.2,728.6,1378.4,726.9,1378.6,725.3z"/>
+	<path class="st2" d="M1708.7,774.4c-1.1-0.9,0-3.6,1.4-2.4C1711.2,772.9,1710.1,775.5,1708.7,774.4z"/>
+	<path class="st2" d="M1726.4,775.4c1.1,0,2.1,0,3.2,0.1c-0.1,2.8-0.1,5.8-1.6,8.3C1726.1,781.3,1726.5,778.2,1726.4,775.4z"/>
+	<path class="st2" d="M1706.2,778.5c-1.7,0.5-2.8-2.3-1-2.8C1706.7,775.2,1707.9,778,1706.2,778.5z"/>
+	<path class="st2" d="M1730.2,785.7c0.2-1.8,0.8-3.4,2.8-3.7v5.8C1732.3,787.2,1730.9,786.2,1730.2,785.7z"/>
+	<path class="st2" d="M1725.7,784.8c0.9-0.1,2.6-0.4,3.5-0.5c0.4,0.7,1.1,2,1.4,2.7c-0.4,0.8-1.1,2.3-1.5,3.1
+		C1727.5,788.9,1724.6,787,1725.7,784.8z"/>
+	<path class="st2" d="M1730,795.6c0.8-0.1,2.3-0.3,3-0.4v4.8C1732,798.5,1731,797.1,1730,795.6z"/>
+	<path class="st2" d="M23.5,811.4c1.7,0,3.4,0,5.1,0c0,1.9,0.1,3.8-0.1,5.8c-1.7,0.3-3.5,0.5-5.2,0.5
+		C23.3,815.6,23.4,813.5,23.5,811.4z"/>
+	<path class="st2" d="M28.9,823.3c-1.2-1.5-0.2-3.6-0.4-5.3c0.5,2.8,2.8,3,5,2.9c0,0.7,0.1,2.1,0.1,2.8
+		C32,823.6,30.4,823.5,28.9,823.3z"/>
+	<path class="st2" d="M100.1,821c9.1,0.6,18.2-0.2,27.3-0.3c0,0.4,0.1,1.2,0.1,1.6c-1.6,0.1-3.1,0.2-4.7,0.5
+		c-0.3,1.1-0.5,2.3-0.7,3.4c1.4,0.5,2.8,1,4.2,1.4c0.6-1.1,1.2-2.1,1.7-3.2c2.8,0.6,5.6,1,8.4,1.3c0.1-1,0.1-2.1,0.1-3.1
+		c-0.5-0.5-1.5-1.4-2-1.9c5.1,0.1,10.2,1.1,15.3,0.6c2.3-0.2,4.7-0.7,7-0.1c-0.1,2.3-0.5,4.5-0.7,6.8c0.5-0.2,1.4-0.5,1.9-0.7
+		c0.4-1,0.7-1.9,1.1-2.8c-0.3-1.1-0.3-2.1,0-3.2c3.8-1.1,7.8-0.3,11.6,0.1c-0.1,0.8-0.2,2.4-0.3,3.2c1.6,1.1,3.3,2.2,4.9,3.4
+		c0-1-0.1-2-0.1-2.9c-1.2-1.2-2.5-2.4-3.7-3.6c4.8-0.7,9.6-0.9,14.3-0.4c8.6,1,17.3-0.5,26-0.2c8.9-0.3,17.8,0.8,26.7-0.1
+		c0,0.6,0,1.9-0.1,2.5c1.6,0.4,3.2,0.8,4.9,1.3c-0.1-1.2-0.1-2.5-0.2-3.7c13,0.1,26-0.1,39,0.1c-2.3,3.3-5.5,5.7-8.8,8
+		c0,1.2,0,2.4,0,3.7c1.3,1.2,2.6,2.5,4,3.7c0.6,0,1.8,0.1,2.4,0.1c-2.7-2-2.9-5.3-2.7-8.4c3,0.7,6.7,2.5,9.3-0.2
+		c-0.1-2.4-0.1-4.8-0.1-7.2c8.9,0.7,17.8,0.7,26.7,0.2c2.5-0.2,4.9,0.9,7.2,1.8c0.5,1.3,0.9,2.6,1.4,4c1,0,2.1,0,3.1,0
+		c-0.1-0.9-0.2-1.8-0.4-2.7c-0.9-1-1.7-2.1-2.6-3.1c9.1,0.1,18.1-0.3,27.2,0.2c36.3-0.5,72.6-0.1,109-0.2c178,0,356,0,534,0
+		c8.7-0.4,17.3,0.8,26,0c17.3-0.1,34.7,0,52,0c11.3,0.1,22.6-0.4,33.9,0.5c8.6-0.8,17.3-0.4,26-0.5c10.8,0.2,21.5-0.5,32.2,0.7
+		c-0.8,1-1.6,2-2.4,3c1.8,1,3.8,0.5,5.8,0c-0.1-0.9-0.2-2.6-0.3-3.4c7.3,0,14.7,1,22-0.3c0.4,2.3-0.7,6,2.8,6.2
+		c1-2.3,1.2-6.5,4.8-5.7c6.7,0.4,13.8-1.8,20.1,1.2c1.3-0.5,2.5-1.4,4-1.4c4.2,0.2,8.7,0.3,12.4,2.6c0.7-0.8,1.4-1.5,2.2-2.3
+		c3.1-0.4,6.3-0.9,9.5-0.5c3.1,0.7,5.8,2.5,8.6,3.8c-0.1,1.8-0.1,3.6-0.1,5.5c-0.7,0.8-1.3,1.7-2,2.5c0,0.4-0.1,1.3-0.1,1.7
+		c0.3,0.5,1,1.5,1.4,2.1c0.4,0.1,1.2,0.2,1.7,0.3c0.8-2.1,1.7-4.1,2.8-6.1c0.1,1.6,0.1,3.2,0.2,4.8c0.9,0.3,1.9,0.7,2.9,1.1
+		c0.3,2.5,0.7,5,1.2,7.5c-1.1-0.6-2.2-1.2-3.3-1.8c0.1,1.3,0.2,2.7,0.3,4c-0.3,0.5-1,1.4-1.3,1.8c1.1,0.7,2.2,1.5,3.4,2.2l-1.8,0.7
+		H414.7c-0.4-0.6-1.2-1.8-1.6-2.5c-0.8-0.1-1.5-0.1-2.3-0.2c-0.2,0.7-0.6,2-0.8,2.7h-32.5c0-0.6-0.1-1.7-0.2-2.3
+		c-0.8-0.1-1.6-0.1-2.4-0.1c-0.2,0.6-0.7,1.8-0.9,2.5h-82.5c0-1.2,0-2.5,0-3.7c-0.9,0.1-1.7,0.2-2.6,0.3c-0.5,1-1,1.9-1.5,2.9
+		c-0.4,0.1-1.1,0.4-1.4,0.5h-27.6c2.4-1.6,5.2-1.8,7.9-1.8c0.1-3.8,0.4-7.6,1.2-11.4c-0.5-0.1-1.5-0.4-2-0.6c0,2.4,0.1,4.8,0.1,7.3
+		c-0.8,0.7-1.6,1.4-2.4,2.1c-2.2,0-4.4,0-6.6,0c-0.1,1.2-0.2,2.4-0.2,3.7c-0.4,0.2-1.1,0.5-1.5,0.7h-82c-1.1-2-2.2-5-5-4.5
+		c-2.7-0.7-2.5,2.8-2.6,4.5h-12.6c-1-1.3-2-2.7-3-4.1c-0.7,1.4-1.3,2.8-2,4.1h-7.6c1.1-2.5-3.3-2.5-3,0h-20.2
+		c-0.9-1.9-1.9-3.7-2.9-5.5c-0.7,1.8-1.4,3.7-2.2,5.5H94.5c0.8-0.4,2.3-1.2,3.1-1.6c-0.1-1.2-0.1-2.3-0.2-3.5
+		c-0.5-0.3-1.3-1-1.8-1.3c-0.3-1.7-0.7-3.5-1-5.2c-1.1,0-2.2,0-3.3,0c0.1,1.2,0.2,2.5,0.3,3.7c1.2,0.5,2.4,1,3.6,1.5
+		c-0.6,1.4-1.2,2.8-1.8,4.2c-4.4,0.3-5.9-4.7-7.8-7.7c-1.8-2.7-1.1-5.9-0.3-8.8c2.1,0.1,4.2,0.2,6.4,0.4c-0.1-0.9-0.2-1.8-0.2-2.8
+		c-3.9-1.6-7.2-4.7-7.3-9.1C89.5,821.7,94.8,820.5,100.1,821 M295.4,822.4c0,1.3,0.1,2.7,0.1,4.1c1,0,2,0,3,0.1c0-1.3-0.1-2.7-0.1-4
+		C297.4,822.5,296.4,822.4,295.4,822.4 M371.5,827.3c0.9,0,1.9,0,2.9,0.1c0.2-1.7-0.6-3.9,1.3-4.7c-0.4,0-1.2,0-1.6,0
+		C372,823.5,371.1,825.2,371.5,827.3 M1175.2,828.5c0.6,0,1.9,0.1,2.5,0.1c1.8-1.8,1.9-4.2,2-6.6
+		C1176,821.7,1175.6,825.8,1175.2,828.5 M198.4,822.2c-0.2,3.5-0.1,7,1.2,10.2c1.7,0.1,3.4,0.1,5.2,0.2c0-1.9-0.6-3.6-2.2-4.7
+		c0-1.5,0-3,0-4.5C201.2,823,199.8,822.6,198.4,822.2 M108.3,825.4c-0.4,1.1-0.9,2.1-1.3,3.2c0.8,0,2.3-0.1,3.1-0.1
+		c3.4,4,6.9,8.1,8.4,13.2c0.5,0,1.6-0.1,2.1-0.2c0-0.8-0.1-2.3-0.2-3.1c0.8-0.8,1.7-1.7,2.5-2.5c-0.9-0.8-1.7-1.5-2.6-2.3
+		c-1.6-0.3-3.1-0.7-4.6-1.2c-0.7-2.4-1.5-4.7-2.3-7.1C111.7,825.4,110,825.4,108.3,825.4 M224.1,825.7c-0.2,3-3,3-5.4,2.8
+		c-0.4,1.7-0.9,3.3-1.4,5c1.6,0,3.2-0.1,4.8-0.1c0.4-1.7,0.8-3.4,1.3-5c1.4,0,2.8,0.1,4.1,0.1c0-1-0.1-2-0.1-3.1
+		C226.3,825.5,225.2,825.6,224.1,825.7 M142.8,826.5c-0.4,0.7-1.3,2.2-1.8,3c1.2,0.6,2.5,1,3.9,1.1c2.4,0.5,2.8-2.5,2.9-4.1
+		C146.1,826.4,144.5,826.4,142.8,826.5 M181.6,826.5c-0.6,1.9-1.1,3.9-1.3,5.9c0.6,0.1,1.6,0.2,2.2,0.3c0.5-2.1,0.9-4.2,1.2-6.4
+		C183.2,826.4,182.1,826.5,181.6,826.5 M187.7,825.6c-0.2,1.3-0.3,2.7-0.5,4.1c1.2-0.1,2.4-0.1,3.6-0.2
+		C190.7,827.9,190.3,824,187.7,825.6 M361.4,826.5c0.1,0.9,0.2,1.8,0.3,2.7c1.3,0.1,2.5,0.2,3.8,0.3c0-1,0-2.1,0-3.1
+		C364.2,826.5,362.8,826.5,361.4,826.5 M1217.8,829c0.9,1.8,3.1,1.6,4.8,2c0.4-2,0.9-3.9,1.2-5.9
+		C1221.2,825.2,1219.6,827.4,1217.8,829 M97.1,827.6c0.2,2.4,2.1,3.3,4.4,3c0-1.4,0-2.9,0.1-4.3C100,826.7,98.6,827.2,97.1,827.6
+		 M349.7,831.8c1.4-0.5,2.8-1.1,4.2-1.6c-0.2-2.4-2.4-3.4-4.3-4.3C348.1,827.7,348.8,829.9,349.7,831.8 M1240.5,829.4
+		c1.3,0.1,2.6,0.1,4,0.2c0-1-0.1-2.1-0.1-3.1c-1,0-2.9,0-3.9,0C1240.6,827.5,1240.5,828.5,1240.5,829.4 M126.5,827.5
+		c-0.1,2.4-0.1,4.9-0.1,7.3c2.1,0,3.8-1.1,5.3-2.5c0-1.7,0-3.4,0-5C129.9,827.4,128.2,827.5,126.5,827.5 M299,828
+		c0.7,1,1.5,2,2.4,2.9c0.1,1.2,0.1,2.3,0.2,3.5c1.2-0.1,2.5-0.1,3.7-0.1c0-1.3,0.1-2.5,0.1-3.7c-1.1-0.1-2.3-0.2-3.4-0.2
+		C301.1,829.5,300.1,828.7,299,828 M1180.6,829c2,1.3,4.2,2.1,6.5,2.8c0.3,0.4,0.9,1.3,1.2,1.7c0.5,0,1.4,0,1.8,0
+		c0.5-1.3,1-2.6,1.6-4c-1.6,0-3.2,0-4.8,0C1185.1,827.7,1182.5,826.7,1180.6,829 M376.4,830.4c0,2.4,0.1,4.7,0.1,7.1
+		c1,0,2.1,0.1,3.1,0.2c0.5-2.4,0.8-4.8,0.9-7.2C379.2,830.5,377.8,830.4,376.4,830.4 M1200.5,833.4c2.5,1.8,4-3.3,0.7-2.6
+		C1200.1,831.4,1199.9,832.3,1200.5,833.4 M1211.2,834.8c-2-3.4-4.4,0.5-4.1,2.8c1.1,0,2.2,0,3.2,0c1.1-1.4,2.4-2.6,4-3.5
+		c0.4-0.7,1.1-2,1.5-2.7C1213.2,830.6,1212.3,833.1,1211.2,834.8 M135.5,835.2c1.3,1.5,3.3,2.1,5.1,2.9c0-2.3-0.1-4.5-0.1-6.8
+		C138.2,831.1,134.8,832.3,135.5,835.2 M157.4,833.5c0,1.1,0,3.3,0,4.4c3.6-0.2,6.9-1.5,10.5-1.2c0.3-2.4-2.2-3.2-3.7-4.4
+		C161.9,832.6,159.6,833,157.4,833.5 M1014.4,834.5c0,0.5,0.1,1.4,0.2,1.9c1.6,0.5,3.2,1,4.9,1.4c0.1-1.1,0.1-2.3,0.2-3.4
+		C1017.9,834.4,1016.2,834.5,1014.4,834.5 M170.1,835.3c0.4,2.4,1,4.9,1.6,7.3c1.4,0,2.8,0,4.1,0c-0.1-2.5-0.4-5-1.2-7.3
+		C173.1,835.3,171.6,835.3,170.1,835.3 M196.6,834.4c-0.1,1.8-0.1,3.6-0.2,5.4c1.8-0.3,4.2,0.6,5.2-1.4
+		C201.9,835.6,199,833.8,196.6,834.4 M1134.7,835.7c0,1.5,0,3.1,0,4.6c1.2,0,2.4,0.1,3.7,0.1c0.1-1.7,0.1-3.4,0.2-5.1
+		C1137.2,835.5,1135.9,835.6,1134.7,835.7 M1238.5,840.8c-0.3,0-0.9,0-1.2-0.1c0.1-1.9,0.3-3.9,0.3-5.8c-2.9,0.3-3,3.3-3.1,5.5
+		c-0.6,0.2-1.9,0.7-2.5,0.9c-0.6,0.1-1.9,0.2-2.5,0.2c-1.5,1.3-3.1,2.4-4.9,3.3c-0.1,0.9-0.2,1.8-0.2,2.7c1.4-0.1,2.8-0.1,4.1-0.1
+		c0-0.8-0.1-2.3-0.2-3.1c1.3,0,2.6,0,3.9,0c1.6-1.3,3.9-1.6,4.9,0.7c-0.5,0.4-1.6,1.3-2.1,1.8c0.5-0.1,1.6-0.3,2.1-0.5
+		c0.2-2.2,1-4.3,2.3-6.1c0.8,0.1,2.3,0.4,3.1,0.5c0.6-2.1,1.1-4.2,1.2-6.4c-1,0-3.1,0.1-4.1,0.2
+		C1239.3,836.7,1238.9,838.8,1238.5,840.8 M125.5,839.5c-0.7,0.7-1.3,1.4-2,2.1c-0.1,0.5-0.2,1.4-0.2,1.9c1.4,0.4,2.8,0.9,4.2,1.3
+		c0-1.8,0-3.6,0.1-5.4C127,839.4,126,839.4,125.5,839.5 M1156.7,839.6c1.8,2,4.3,2.1,6.8,2.1c0-0.5,0-1.6,0-2.2
+		C1161.3,839.5,1159,839.5,1156.7,839.6 M1181.7,839.6c-0.1,0.5-0.2,1.6-0.3,2.1c1.9,0.8,4,0.9,6.1,1c0-1.1,0.1-2.2,0.2-3.2
+		C1185.6,839.5,1183.6,839.5,1181.7,839.6 M1203.4,839.4c0,1.5,0,3,0.1,4.5c1-0.4,2.1-0.8,3.2-1.2c0-1.1,0-2.2,0-3.3
+		C1205.5,839.4,1204.5,839.4,1203.4,839.4 M133.6,843.9c0.4,0.8,0.9,1.6,1.4,2.4c0.8,0,1.5,0.1,2.3,0.1c0.5-2.3,1.1-4.6,1.3-6.9
+		C135.3,838.3,134.4,841.5,133.6,843.9 M1173.7,842c0,0.5-0.1,1.4-0.1,1.9c0.8,0.5,1.5,1,2.3,1.5c1.8-1.5,1.8-3.5,0.3-5.3
+		C1175.4,840.7,1174.5,841.3,1173.7,842 M1247.3,841.2c0,0.6,0.1,1.8,0.1,2.3c1.4,0.8,2.7,1.7,4.1,2.5c0-1.6,0.1-3.1,0.1-4.6
+		C1250.2,841.4,1248.7,841.3,1247.3,841.2 M102.4,841.2c0,1.1,0,3.2,0,4.3c1.5,1.4,3.2,2.4,5.3,2.4c-0.2-2,0.2-4.2-0.5-6.1
+		C105.6,841.5,104,841.3,102.4,841.2 M152.5,842.5c0,1.3,0,2.6,0,4c1.4,0,2.8-0.1,4.2-0.1c-0.1,0.6-0.2,1.8-0.2,2.4
+		c2.5-0.4,4.9-0.9,7.4-1.4c0.5-2.8-1.8-3.5-3.9-4.1c-0.9,0.6-1.7,1.3-2.5,1.9c0.1-0.7,0.1-2.1,0.2-2.8
+		C155.9,842.5,154.2,842.5,152.5,842.5 M205.8,845c-0.4,1.3-0.4,2.6-0.6,4c3.9,0.4,6-3.6,5.4-7C209,842.9,207.3,843.8,205.8,845
+		 M295.9,844c-0.4,1.1-0.5,2.3-0.6,3.5c0.8,0.7,1.5,1.5,2.3,2.3c1.3-1.9,2-4.1,1.9-6.3C298.3,843.5,297.1,843.7,295.9,844
+		 M404.5,847.6c2.2-0.1,5.3,0.1,5.5-3c-1.8-0.5-3.7-0.9-5.6-1.4C404.5,844.7,404.5,846.2,404.5,847.6 M194,848.6c1.6,0,3.2,0,4.8,0
+		c0.1-2-0.5-3.6-1.8-4.9C195.8,845.2,194.7,846.8,194,848.6 M1199,846.7c0.4,3.1,5.2,4.2,6.6,1.5c-0.2-0.8-0.6-2.4-0.8-3.2
+		C1202.8,845.3,1200.8,845.8,1199,846.7z"/>
+	<path class="st2" d="M1609.6,820.7c3.7-0.2,7.3,0.4,11,0.6c2.8,0.1,5.8-0.7,8.4,0.5c1.3,1.9,0.4,4.6,0.7,6.8c-2,0-4,0.1-6,0.1
+		c0.9,0.3,1.8,0.5,2.8,0.8c0.4,1.8,0.8,3.6,1.2,5.4c-4.3-0.5-6.1-4.7-8.7-7.5c-0.6,1.3-1.1,2.6-1.7,3.8c-0.4,0.1-1.3,0.4-1.7,0.5
+		c-0.1-0.7-0.1-2.1-0.2-2.9c-1,0.3-1.9,0.7-2.9,1.1c-1.7-0.4-3.3-0.7-4.9-1c2.1,3.5,5.6,5.6,9.5,6.9c0.9-0.9,1.9-1.8,2.8-2.7
+		c1.2,0.4,2.4,0.9,3.7,1.3c0,0.6-0.1,2-0.1,2.6c1.9,1,4.1,1.8,5.2,3.7c-0.2,1.1-0.4,2.3-0.7,3.4c0.2,1,0.5,2.1,0.8,3.1
+		c-1.8,1.4-3.6,3.1-5.9,3.5h-2.6c0.1-1.3,0.2-2.5,0.4-3.7c-1.1,0.1-2.2,0.2-3.3,0.4c0,1.1,0.1,2.2,0.2,3.4h-99.5
+		c-1.6-2.6-5.1-1-7.5-1.2c-0.4,0.3-1.3,0.9-1.7,1.2h-59.7c0.2-1.2,0.5-2.5,0.7-3.7c-0.6,0-1.7,0.1-2.3,0.1c-0.1,1.2-0.3,2.4-0.4,3.5
+		h-72c0.1-0.7,0.2-2,0.3-2.7c-1.3-0.4-2.7-0.8-4-1.2c-0.1,1.3-0.1,2.5-0.1,3.8h-27.9c-1.7-1.8-3.2-3.8-4.6-5.9
+		c-3.3,1.3-6.5,2.6-9.8,3.7c0.2,0.7,0.3,1.5,0.5,2.2h-4.5c-0.5-0.1-1.4-0.4-1.9-0.6c0.6-4,1.5-7.9,1.5-11.9
+		c-0.6-0.3-1.8-0.8-2.4-1.1c0-0.9,0.1-1.8,0.1-2.8c1.3-0.6,2.6-1.2,3.9-1.8c0-1.4,0.1-2.8,0.1-4.1c-3.7-0.1-7.4-0.5-11.1-1.2
+		c0-0.7,0.1-2.2,0.1-2.9c-0.5-0.1-1.6-0.2-2.1-0.3c0,1.4,0.1,2.8,0.1,4.3c-3.8-0.7-7.5,0.2-10.5,2.7c2.2-0.4,4.3-0.7,6.5-1
+		c0,1.5,0.1,3.1,0.2,4.6c0.8,1.2,2.6,2.5,1.1,4c-3.4,1.7-6-2.9-7.8-5.3c-0.9-0.1-1.7-0.3-2.5-0.4c-0.3,0.6-1,1.9-1.4,2.5
+		c-1.6-1.5-3.3-2.8-5.1-4c0.7,1.8,1.5,3.6,2.1,5.4c0.2,2.4-1.1,4.7-0.5,7.1c0.7,2.3,3,3.5,4.5,5.1c-1.6,0.6-3.2,1.1-4.9,1.6h-4.8
+		c1-1.5,2.3-2.9,4.1-3.6c-0.1-0.4-0.3-1.2-0.5-1.6c-2-0.9-3.9,0.9-5.1,2.3c0.1,1,0.4,2,0.8,2.9h-4.9c0.5-0.8,1.1-1.6,1.7-2.4
+		c0.2-1.1,0.2-2.2,0.1-3.2c-1.2-1.2-2.4-2.4-3.8-3.3c-1.1-0.2-2.2-0.4-3.3-0.7c-0.2-1.4,0.9-2.5,0.8-3.8c-1.6,0-2.5,1.5-3.7,2.3
+		c-2.1,0.5-4.3,0.1-6.3,0.5c-0.6,2.1,0.6,5.1-1.6,6.5c-1.6,0.3-3.6,1.1-5,0.2c0.8-0.6,1.8-1.2,2.8-1.6c-0.2-2.8-1.2-5.7,1.3-7.9
+		c0-0.6-0.1-1.8-0.1-2.5c-0.7-0.1-2-0.3-2.6-0.3c-1.4,1.2-1.5,3.3-2.4,4.9c-0.4-0.2-1.3-0.5-1.7-0.6c-1.4-1.7-1.6-4-1.1-6.1
+		c0.6-1.5,2.5-1.2,3.8-1.6c-2.3-1.6-5.2-1.1-7.7-1.3c-2.3-1.8-2.1-5.1-3.9-7.3c-0.4-0.3-1.3-0.9-1.8-1.2l0-0.3
+		c2.7-0.3,5.5-0.4,8.2-0.1c-0.2,1-0.4,1.9-0.5,2.9c1.6,2.5,3.1-1.4,3.3-2.8c1.7-0.7,3.6-0.3,5.3-0.1c-0.9,1.7-1.8,3.4-2.5,5.2
+		c-0.7,1.1,0,3.1,1.5,2.7c1.2-1.2,1.3-3,1.9-4.5c0.4-0.2,1.3-0.6,1.8-0.8c0-0.8,0-1.6,0-2.3c3.1-0.7,6.4-0.5,9.6-0.4
+		c0.9,0.1,3,0,2.7,1.5c-0.7,0.1-2,0.4-2.7,0.5c-1.1,0.6-1.2,1.3-0.1,2c1.3,0,2.6,0,4,0c1,0.4,1.9,1,2.9,1.5c-0.1-1.9-1-3.6-1.4-5.4
+		c3.2-0.5,6.4-0.2,9.6-0.1c13.8,0.1,27.6-0.3,41.4,0.2c0,0.7,0.1,1.3,0.3,2c1.5,1.3,3.2,2.1,4.8,3.4c0.6,1,0.2,2.3-0.5,3.2
+		c-2.1,1.3-4.1,2.6-5.7,4.4c0.4,3.3,3.6,5.2,4.4,8.4c1.8-1.3,3.3-2.9,5.1-4.1c0.2-1,0.1-2-0.3-3c-1.7-0.8-3.5,0.3-5.2,0.2
+		c-0.2-0.4-0.6-1.1-0.8-1.5c0.5-0.2,1.6-0.7,2.1-0.9c1.9-1.8,3.2-4.4,5.8-5.3c0.2-0.5,0.5-1.5,0.7-2c-0.9-1-2.3-1.2-3.1-2.3
+		c-0.9-3.5,4.4-3.7,6-1.6c0.2,0.5,0.5,1.7,0.7,2.2c0.6,0.1,1.8,0.4,2.4,0.5c1,0.3,1.8,1,2.2,2c-0.7,1.1-2,1.7-3.2,2.1
+		c-0.9-0.4-1.7-1.1-2.5-1.6c-0.1,1.1-0.4,2.1-0.7,3.2c-1.1,0.3-2.3,0.6-3.4,0.8c-0.1,1.7,1.1,4.3,3.1,4.2c0.2-1.2,0.5-2.3,0.8-3.4
+		c2.4-1,5.4-0.8,7.5-2.6c2.2-2.3,0.1-5.9,1.6-8.4c1.2-0.8,2.7-0.4,4-0.1c0.2,0.8,0.4,1.9,1.5,1.9c0.4-0.6,0.6-1.2,0.8-1.9
+		c5.7-0.8,11.6,0,17.3-0.3c3.6,0.1,7.3-0.5,10.8,0.2c0.6,1.8,0.5,3.8,0.9,5.7c1.5-1.4,0.6-3.9,1.4-5.6c3.8-0.6,7.8-0.6,11.7,0
+		c0.3,1.1,0.5,2.2,0.8,3.4c0.5,0.5,1.2,0.9,1.9,1.2c-0.1-0.5-0.4-1.5-0.5-2c0-0.6,0.1-1.9,0.1-2.5c1.6-0.6,3.3-0.3,4.9-0.4
+		c23.6,0.2,47.1-0.2,70.7,0.3c0,0.4-0.1,1.3-0.1,1.7c0.6,1.6,1.4,3.1,2.1,4.7c0.1-1.8,0-3.7,0.3-5.5c0.5-0.3,1.5-0.8,2-1.1
+		c23.3,0.1,46.7-0.3,70,0.1c1.3,0.1,3.1-0.3,4.1,0.9c0.2,1.4,1.1,3,0.2,4.3c-1,0.4-2,0.8-3,1.2c0.1,0.4,0.4,1.3,0.5,1.7
+		c1.2,0.5,2.6,0.5,3.9,0.4c0.7,0.5,1.5,1,2.3,1.5c1.7,0,3.7,0.2,5-1c-1.9-1.6-5.1-1.6-6.3-4c-0.1-1.6-0.2-3.3,0.4-4.8
+		c5.4-0.7,11-0.4,16.5,0c-1,1.8-1.8,3.7-3.3,5.2c-0.3,1-0.3,2,0.2,2.9c0.8,0.5,1.7,0.5,2.6-0.1c0.5-0.9,1.1-1.8,1.9-2.5
+		c1.7-0.3,3.4,0.4,4.7,1.4c1,0.6,2.3,0.4,3.3-0.1c0.9-0.8,1-2.6-0.1-3.3c-2.3-0.8-4.7-0.7-7-0.4c-0.1-0.6-0.2-1.8-0.2-2.4
+		c0.3-0.2,0.9-0.7,1.2-1c5.5-0.4,11.1-0.5,16.6,0.3c-0.6,0.2-1.7,0.7-2.2,0.9c0,0.3,0,0.9,0,1.2c1.9,2.2,4.3,4.6,7.3,5.1
+		c-0.1-0.5-0.2-1.5-0.3-2c-1.1-1.4-2.4-2.5-3.4-3.9c0.3-1,1.4-2,2.6-1.5c0.4,0.4,1.2,1.2,1.6,1.6
+		C1608.5,823.1,1608.9,821.6,1609.6,820.7 M1327.3,822.4c0.1,1.5,0.1,2.9,0.2,4.4c2.9,0.5,2.9-2.8,3.2-4.7
+		C1329.8,822.2,1328.1,822.3,1327.3,822.4 M1553.7,822.8c1.5,0.6,3,1.2,4.6,1.9c0.1-0.7,0.4-2,0.6-2.6
+		C1557.1,822.3,1555.4,822.5,1553.7,822.8 M1565.8,826.3c1.3,0.2,2.6,0.3,4,0.5c-0.2-1.3-0.3-2.6-0.4-3.8
+		C1568,824,1566.8,825.1,1565.8,826.3 M1295.1,828.1c0.8,0.8,1.7,1.7,2.5,2.5c1,0,2,0.1,3,0.1c-0.1-1.9-0.2-3.8-0.3-5.7
+		C1298.4,825.7,1296.8,826.9,1295.1,828.1 M1376.5,828.9c0.3,0.8,1,2.3,1.3,3c-2,1.6-1,4.3-1.3,6.4c-1.2,1.2-2,2.7-2.3,4.4
+		c0.5-0.1,1.4-0.2,1.9-0.3c0.5-1.3,1.1-2.6,1.9-3.7c0.3-4.7,4.3-9.3,1.2-13.8C1377.8,825.9,1376.2,826.9,1376.5,828.9 M1529.3,826.5
+		c0.3,0.8,0.9,2.4,1.2,3.2c0.5-0.1,1.4-0.2,1.9-0.3c0.1-1,0.1-2,0.2-3C1531.4,826.4,1530.3,826.4,1529.3,826.5 M1544.6,830
+		c0.1-2,0-4.1-1.7-5.4C1540.5,826.8,1541.7,829.4,1544.6,830 M1274.3,833c0.4,0.7,1.1,2.1,1.5,2.8c1.7-0.2,4,0,3.9-2.4
+		c1-0.1,1.9-0.1,2.9-0.1c1.1,1.4,2.2,2.8,3.2,4.2c0.7,0,2.1,0.1,2.8,0.2c-0.1-1-0.1-1.9-0.2-2.9c-1-1.3-1.8-2.8-2.3-4.3
+		c-1.9,0.1-3.8,0.2-5.6,0.2c0-0.9-0.1-2.6-0.1-3.5C1277.2,827.4,1275.6,830.5,1274.3,833 M1554.4,828.5c0.1,0.9,0.2,1.8,0.3,2.8
+		c0.9,0.1,1.9,0.3,2.8,0.4c0-1.2,0.1-2.3,0.2-3.4C1556.6,828.4,1555.5,828.4,1554.4,828.5 M1267,829.4c0.9,2.3,1.8,4.5,2.8,6.8
+		c1.1,0.5,2.1,1,3.2,1.5c0.4-0.8,1.4-2.3,1.8-3.1c-1.4-0.8-2.8-1.6-4.3-2.4c0-0.7-0.1-2-0.1-2.7
+		C1269.3,829.5,1268.2,829.4,1267,829.4 M1385.5,831.1c-0.1,0.8-0.2,1.7-0.2,2.5c0.5-0.1,1.4-0.4,1.9-0.5c0.5-1.3,1.1-2.6,1.8-3.9
+		C1388.1,830.4,1386.8,830.8,1385.5,831.1 M1599.1,829.3c0.5,1.8,1,3.5,1.5,5.3c0.8-0.1,2.3-0.2,3.1-0.3c-0.1,0.7-0.2,2.2-0.3,2.9
+		c1,1.1,2.1,2.2,3.1,3.3c0.5,0,1.5,0.1,2,0.2c0.3-1.2,0.6-2.4,0.8-3.6c-1.9-2.2-3.8-4.7-6.4-6.1c-0.4-0.4-1.1-1.2-1.5-1.6
+		C1600.8,829.4,1599.6,829.3,1599.1,829.3 M1357.1,838.7c0.6,0,1.8,0.1,2.4,0.1c0.7-3.2,1.8-6.6,0.7-9.9
+		C1358.9,832,1357.6,835.2,1357.1,838.7 M1593.2,830.6c-1.3,0.8-0.3,3.6,1.2,2.5C1595.4,832.2,1594.6,829.5,1593.2,830.6
+		 M1523.6,833.6c0,0.5-0.1,1.5-0.1,1.9c0.6,0.1,1.6,0.1,2.2,0.2c0-0.6,0-1.9,0-2.5C1525.1,833.3,1524.1,833.5,1523.6,833.6
+		 M1541.3,837c2,0.3,3.5,1.3,3.5,3.6c1.2-0.1,2.4-0.2,3.7-0.3c-0.2-1.8-0.3-3.6-0.6-5.4c0,0.7,0,2-0.1,2.7c-1,0-3.1,0-4.1,0
+		c-0.3-1.2-0.6-2.3-0.8-3.5C1542.3,835.1,1541.8,836.1,1541.3,837 M1567.4,834.1c0,0.5-0.1,1.4-0.1,1.8
+		C1570.2,838.5,1570.3,831,1567.4,834.1 M1351.3,837.5c-0.8,0.1-2.3,0.1-3,0.2c0,0.2-0.1,0.6-0.1,0.7c0.7,0,2.1,0,2.8,0
+		c0.8,1.3,2.4,1.2,3.8,1.5c-0.3-1.2-0.8-2.5-2.2-2.7c-0.1-0.6-0.3-1.7-0.4-2.3C1351.8,835.7,1351.6,836.6,1351.3,837.5
+		 M1498.2,835.3c0.1,1.1,0.1,2.2,0.2,3.3c0.5-0.1,1.4-0.3,1.8-0.4c0.1-0.9,0.2-1.9,0.4-2.8C1500.1,835.4,1498.8,835.3,1498.2,835.3
+		 M1396.3,836.3c0,0.5,0.1,1.6,0.2,2.2c1,0,2,0,3,0.1c0-0.5,0-1.6,0-2.2C1398.4,836.3,1397.3,836.3,1396.3,836.3 M1490.6,838.3
+		c2.6,2,3.8-3,0.6-2.6C1490.1,836.4,1489.9,837.2,1490.6,838.3 M1563.1,838.4c0.6-0.3,1.7-1,2.2-1.3
+		C1564.9,834.1,1560.1,837.2,1563.1,838.4 M1571.7,838.6c0,0.8-0.1,2.3-0.2,3c-0.5,0-1.5-0.1-2-0.1c0,0.5,0,1.6,0,2.2
+		c1-1.8,2.9-2.4,4.9-2.5c0-0.7,0-2,0-2.7c0.6,0,1.7,0,2.3,0c-0.1-1.2-0.2-2.4-0.3-3.6C1574.8,836.1,1573.2,837.3,1571.7,838.6
+		 M1484.3,837.8c0,1.8,0.1,3.7,0.1,5.6c2.2,0,4.3,0.1,6.5,0.2c-0.2-0.4-0.6-1.2-0.8-1.6C1488.2,840.7,1486.2,839.3,1484.3,837.8
+		 M1286.1,841.3c1.2,0.1,2.3,0.3,3.6,0.4c0-0.7,0-2.1,0-2.8C1288.3,839.5,1286.1,839.2,1286.1,841.3 M1366.2,841.4
+		c1.2,0,2.4,0,3.7,0c-0.4-0.8-1.3-2.3-1.7-3C1365.9,837.6,1366.7,840.3,1366.2,841.4 M1595.6,839.6c-0.1,1-0.3,2.1-0.4,3.2
+		c1.8-0.2,3.6-0.3,5.4-0.4c-0.4-1-0.8-2-1.2-2.9C1598.1,839.5,1596.8,839.5,1595.6,839.6 M1611,839.1c0.8,1.2,1.6,2.4,2.4,3.6
+		c0.7,0,2,0,2.7,0C1615.9,839.8,1613.4,839.2,1611,839.1 M1361.2,840.5c-1.9,1,0.2,3.2,1.6,2.1
+		C1364.7,841.6,1362.6,839.3,1361.2,840.5 M1346.4,841.3c-0.4,2-1.3,4.1,0.3,5.8c2-1.3,3.2-3.2,3-5.7
+		C1348.6,841.4,1347.5,841.3,1346.4,841.3 M1500.5,841.4c0,1,0,2,0,3c1.9,0.7,3.9,1,5.9,1.2c0.1-0.5,0.1-1.5,0.2-2.1
+		c-1.7,0-3.2-0.7-4.3-1.9C1501.9,841.7,1501,841.5,1500.5,841.4 M1353.5,843.5c0,1,0,2,0,3.1c1.3,0,2.6-0.1,3.9-0.1
+		c0.1-1.1,0.2-2.1,0.3-3.2C1356.3,843.3,1354.9,843.4,1353.5,843.5 M1405.1,843c-0.4,1.5,0.2,2.1,1.9,1.5
+		C1407.4,842.9,1406.8,842.4,1405.1,843 M1422.2,847.4c-1.9,0.9,0.1,3.3,1.6,2.1C1425.7,848.6,1423.7,846.2,1422.2,847.4
+		 M1598.1,848.3C1596.6,851.2,1601.5,848.3,1598.1,848.3z"/>
+	<path class="st2" d="M50.6,821.9c3.2-1.5,6.8-1.4,10.1-0.1C58,825.2,53.9,822.1,50.6,821.9z"/>
+	<path class="st2" d="M58.5,826.6c2.3-2,4.7-4,7-6c0,1.4-0.1,2.8-0.1,4.1c1-0.1,2-0.2,2.9-0.3c0-0.7,0.1-2.2,0.1-2.9
+		c3-0.5,6-0.8,9.1-0.8c-0.2,2.9,0.3,5.8,2,8.2c1,0.4,2,0.9,3,1.5c0.2,2.1,0.1,4.2,0.2,6.3c-2.4,0-4.9,0-7.3,0
+		c-0.1-2-0.2-3.9-0.4-5.9c-1.8-0.1-3.5-0.1-5.3-0.2c-0.8-0.7-1.5-1.5-2.3-2.2c-0.4,0-1.1-0.1-1.5-0.1c-0.9,1.5-1.8,3-2.7,4.6
+		c1.4,3.7,0.4,8.1,2.2,11.6c3.9-0.5,7.9-1.3,11.9-1.3c0.3-0.5,1-1.6,1.4-2.1c1.6,0.3,3.3,0.5,4.9,0.8c0,1.1-0.1,3.3-0.1,4.4
+		c-4.3,0.3-8.6,1-12.9,1.2c-0.2,1.1-0.4,2.2-0.6,3.3h-12c2.2-0.9,3.8-2.6,5.2-4.4c-2.6-0.1-5.3-0.1-7.9,0c0-2.5-0.3-5.1,0.3-7.6
+		c0.9-1.8,2.4-3.2,3.7-4.8c0.1-0.5,0.3-1.4,0.3-1.9c-1.4,0-2.8,0-4.2,0c-0.7,0.7-1.3,1.5-2,2.2c-0.4,2.5-0.9,5.1-1.3,7.6
+		c-0.7,1.2-1.3,2.4-1.9,3.7c0.6,1.8,1.6,3.4,2.6,5.1h-5.4c-0.7-8.2,1.7-16.1,2.3-24.2C52.7,826.4,55.6,826.5,58.5,826.6z"/>
+	<path class="st2" d="M1351,821.3c1.3-1.4,3.9,0.4,2.4,1.9C1352.3,824.6,1349.5,822.7,1351,821.3z"/>
+	<path class="st2" d="M1634.3,821.3c1.8-0.2,3.5-0.5,5.4-0.7c-0.1,0.9-0.2,2.7-0.3,3.6c-1.6,0.4-3.3,0.6-4.9,0.8
+		C1634.4,824.1,1634.3,822.2,1634.3,821.3z"/>
+	<path class="st2" d="M1669.9,821.4c1.6-0.3,3.2-0.4,4.8-0.5c0,0.7-0.1,2.1-0.1,2.8c-1.1,0-2.1-0.1-3.1-0.1
+		C1671.1,823.1,1670.3,822,1669.9,821.4z"/>
+	<path class="st2" d="M1315.9,831.9c4.2,0.4,3.8,5,3.8,8.1c-1.7,0.8-3.4,1.7-5.1,2.6c1.8-0.5,3.5-1,5.2-1.4
+		c-0.4,1.9-0.7,3.9-1.1,5.8c0.7,1.3,1.3,2.6,2,4h-8.2c-1.1-3.1-2.3-6.3-2-9.7C1314.1,839.6,1315,835.4,1315.9,831.9z"/>
+	<path class="st2" d="M1300.4,837.1c2.2,0.4,4.3,0.8,6.5,1.3c-1.1,4.2-1.4,8.4-0.3,12.7h-8.2c2-1.1,4-2.3,5.9-3.5c-1,0-2.9,0-3.9,0
+		C1300.4,844,1300.5,840.5,1300.4,837.1z"/>
+	<path class="st2" d="M1273.2,842.4c1,0,3.1,0,4.1,0c0.8,0.6,1.6,1.3,2.4,1.9c-0.1,1-0.2,2.1-0.3,3.1c-1,0-2.9,0.2-3.9,0.2
+		C1274.1,846.2,1273.2,844.5,1273.2,842.4z"/>
+	<path class="st2" d="M1703.4,842c2.6,0.7,5.4,2.5,5.5,5.5c-1.8,0-3.7,0-5.5,0C1703.4,845.6,1703.4,843.8,1703.4,842z"/>
+	<path class="st2" d="M1.2,848.5c0.1-2,0.5-4,2.4-5.1c1.7,0,3.3-0.1,5-0.1c0,1.8,0,3.5,0,5.3C6.2,848.6,3.7,848.5,1.2,848.5z"/>
+	<path class="st2" d="M12.4,848.2c0-0.9,0-1.9,0-2.8c3.2,0.1,6.5-0.2,9.6,0.4c0.4,1.2,0.6,2.5,0.9,3.7c-0.5,0.3-1.6,1-2.1,1.4h-1.6
+		C17,850.1,14.7,849.1,12.4,848.2z"/>
+	<path class="st2" d="M80.3,847.4c2.2,0,4.4-0.1,6.6-0.1c-0.2,0.9-0.5,2.8-0.7,3.7h-5.8C80.4,850.1,80.3,848.3,80.3,847.4z"/>
+	<path class="st2" d="M1276.6,851c1.4-1.8,2.8-4.5,5.6-3.5c0.2,1.2,0.3,2.3,0.4,3.5H1276.6z"/>
+	<path class="st2" d="M1334.2,851c0.6-1.3,1.2-2.6,1.7-3.9c1.7,0.9,3.5,1.9,4.2,3.9H1334.2z"/>
+</g>
+</svg>
diff --git a/misc/openmohaa-text-mono.svg b/misc/openmohaa-text-mono.svg
new file mode 100644
index 00000000..ca7dd433
--- /dev/null
+++ b/misc/openmohaa-text-mono.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1733 851" style="enable-background:new 0 0 1733 851;" xml:space="preserve">
+<g>
+	<path d="M316.5,0H1416c0,78,0,156,0,234c105.7,0,211.3,0,317,0v617H0V234c105.5,0,211,0,316.5,0C316.5,156,316.5,78,316.5,0
+		 M342,25.5c0,79.4,0,158.8,0,238.2c-104.1,0-208.2,0-312.2,0c0,185.7,0,371.4,0,557.1c557.7,0,1115.3,0,1673,0
+		c0-185.7,0-371.4,0-557.1c-104.1,0-208.2,0-312.3,0c0-79.4,0-158.8,0-238.2C1041,25.5,691.5,25.5,342,25.5z"/>
+	<path d="M600,76.5c46.6,0,93.3-0.1,139.9,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.1-0.1-13.7,0c3.5,3,7.4,5.5,11.1,8.2
+		c-1.3,4.5-2.8,8.9-4.5,13.2c4.2-2.1,7.3-5.8,11.6-7.7c4,2,7.2,5.3,10.9,7.7c-0.6-4.6-2.7-8.7-3.9-13.1c3.7-2.9,7.6-5.5,11.4-8.3
+		c-4.7-0.2-9.4-0.1-14.1-0.1c-1.3-3.6-2.5-7.3-3.6-11c83.1-0.1,166.2-0.1,249.2,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.3-0.1-13.9,0.1
+		c3.7,2.8,7.6,5.5,11.3,8.2c-1.3,4.5-2.8,8.8-4.5,13.2c4.2-2,7.4-6,11.7-7.7c4,2.1,7.2,5.3,11,7.7c-1-4.5-2.8-8.8-4.1-13.1
+		c3.7-2.9,7.6-5.5,11.4-8.3c-4.7-0.2-9.3-0.1-14,0c-1.4-3.6-2.5-7.2-3.5-11c46.2-0.1,92.5,0,138.7,0c0,14.1,0,28.3,0,42.4
+		c-10.8,0-21.7-0.1-32.5,0.1c-2.3,0-4.7,0.4-6.7-0.8c4-2.1,7.4-5.1,11.1-7.7c3.8,2.7,7.4,5.6,11.3,8c-1.3-4.3-2.8-8.6-4.3-12.9
+		c3.7-2.9,7.6-5.6,11.4-8.3c-4.6-0.1-9.3,0-13.9,0c-1.9-4.1-2.1-8.9-4.8-12.6c-1.3,4.2-2.6,8.4-4.1,12.6c-4.6,0.1-9.3,0-13.9,0.1
+		c3.8,2.8,7.7,5.4,11.4,8.3c-1.6,4.6-3.2,9.1-4.8,13.7c-12.2-0.8-24.5-0.1-36.8-0.3c-52.7,0-105.3,0-158,0
+		c-6.6-0.2-13.2,0.4-19.7-0.2c-1.5-4.5-3-8.9-4.2-13.5c3.8-2.6,7.5-5.2,11.1-8c-4.6-0.1-9.1,0-13.6,0c-1.9-4.3-3-9-4.6-13.4
+		c-1.5,4.5-2.8,9-4.5,13.4c-4.6-0.1-9.2-0.1-13.8,0c3.6,3,8.1,4.9,11.1,8.5c-1.1,4.5-2.9,8.7-4.1,13.2c-78,0-156-0.1-234,0.1
+		c-0.8-0.2-1.5-0.5-2.2-0.8c3.9-2.2,7.4-5.1,11-7.7c3.8,2.7,7.4,5.6,11.4,8c-1.4-4.3-2.9-8.6-4.4-12.8c3.6-2.9,7.6-5.5,11.3-8.3
+		c-4.6-0.2-9.2-0.1-13.7-0.1c-1.3-3.3-2.3-6.8-3.3-10.2c-0.2-1-0.8-1.7-1.6-2.3c-1.2,4.2-2.4,8.5-4.2,12.6c-4.5-0.1-9.1-0.1-13.6,0
+		c3.6,2.7,7.3,5.3,11,7.9c-0.8,4.9-3,9.4-4.3,14.2c-5.9-0.7-11.8-0.2-17.7-0.4C600,104.8,600,90.7,600,76.5z"/>
+	<path d="M854.8,118.8c3.6-3,7.5-5.6,11.2-8.4c3.2,3,7.5,4.7,10.1,8.2C869,119.3,861.9,118.9,854.8,118.8z"/>
+	<path d="M555.6,175c17.6-1.9,35.8-0.4,52.5,5.7c29.2,10.3,53.1,34,63.7,63c7.6,20.8,8.4,43.6,4.3,65.3c-3.7,20-12.9,39.3-27.1,54
+		c-19.9,21-48.7,31.4-77.1,33.4c-7,0-14,0.1-21,0c-31.2-2.9-61.7-18.6-80-44.4c-12.9-17.9-19.4-40-19.3-62c0-4.7-0.1-9.4,0.2-14
+		c1.7-27.8,14.7-55,35.9-73.2C506.6,186.4,531,177.4,555.6,175 M555.6,191.8c-16.2,2.6-30.8,12.2-40.6,25.2
+		c-13.6,17.6-19.3,40-20.4,61.9c-0.4,14.9,1.4,29.8,5.5,44.1c5.4,18.2,15.8,35.4,31.4,46.4c12.4,9,28.3,12.4,43.4,10.6
+		c15-2,28.8-10.1,38.5-21.6c13.1-15.6,19.5-35.8,21.6-55.7c1.8-20.6,0.7-41.8-6.6-61.3c-6.2-17.8-18.2-34.2-35.1-43.2
+		C581.9,192.1,568.5,190,555.6,191.8z"/>
+	<path d="M770.9,179.6c10-0.1,20-0.3,30-0.1c13.4,0.9,27.5,4.7,36.9,14.8c10.9,11.6,15.2,28.1,14.6,43.7c-0.4,9.6-2.2,19.3-6.8,27.9
+		c-13.2,25-41.8,40.4-69.8,38.4c-0.4-0.1-1.1-0.3-1.5-0.4c-0.4-4-0.2-8.1-0.1-12.1c10.6-1.4,21.6-5.6,28.4-14.3
+		c7.7-9,9.3-21.2,9.7-32.6c0.3-12-1-24.9-8.2-35c-5.7-8.3-15.5-12.8-25.1-14.3c-7-0.9-14.2-0.6-21.2-0.1c0,52.5-0.1,104.9,0,157.4
+		c0.8,7.3,0.3,15.8,5.6,21.7c4.7,5,12.1,4.7,18.4,4.7c0,4,0,8,0,12.1c-19.5-1.8-39.1-2.1-58.7-1.6c-9.5,0.8-19.1,0.5-28.6,1.7
+		c-1.1-3.9-0.6-8-0.6-12c6.5-0.1,14.2,0.4,19.1-4.7c5.4-6.2,4.8-15,5.6-22.7c0.1-42.7,0-85.4,0-128.1c0.2-6-0.6-12-1.2-18
+		c-0.9-4.9-2.9-10.3-7.7-12.6c-4.9-2.6-10.5-1.9-15.8-2.1c-0.1-3.9-0.1-7.8,0-11.8c5.8-0.3,11.5,1.1,17.3,1
+		C731,180.7,751,181.1,770.9,179.6z"/>
+	<path d="M1262.9,180.5c5.8,0,11.6-1.2,17.4-1.1c0,4,0,7.9,0,11.9c-5.8,0-12.5-0.3-17.1,4c-5.1,4.8-5.4,12.2-5.7,18.7
+		c-0.4,15-1,30-0.9,45.1c-0.9,44.8-1.4,89.7-1.3,134.5c-5.4,0.1-10.8,0.2-16.2-0.1c-10.5-13.6-20.9-27.4-32.2-40.3
+		c-25.5-30.1-51.5-59.8-77.2-89.8c-8.5-9.8-16.9-19.8-24.9-30.1c-4.3-5.3-7.9-11.1-12.6-16.1c0.8,19,2.1,37.9,2.2,56.9
+		c0.2,12,0,24,0.6,36c0.3,17,0.1,34.1,1.5,51.1c0.6,5.1,1.8,10.9,6.1,14.2c4.7,3.7,11,3.3,16.6,4.2c-0.5,3.9,0.9,8.3-1,11.8
+		c-14.1-1.4-28.2-1.1-42.3-1c-8.8,0.3-17.7-0.2-26.5,1.1c-0.1-4-0.1-7.9,0-11.9c5.8-0.6,12.2-0.4,17.3-3.7c4.1-3.2,5.7-8.6,6.3-13.6
+		c2-28.4,1-56.8,1.3-85.2c0-19.7,0-39.3-0.1-59c-0.6-8-0.8-17.2-7.2-23.1c-4.9-3.8-11.6-3.4-17.5-3.7c-0.2-3.9-0.2-7.9,0.1-11.8
+		c3.8-0.1,7.5,0.4,11.3,0.8c16.3,0.7,32.7,0.5,48.9-0.9c36.7,44.8,75,88.1,112.2,132.5c5.4,6.4,10.2,13.3,15.6,19.7
+		c0.2-10.9-0.2-21.8-0.9-32.6c-0.3-26,0-52-0.2-78.1c-0.1-8.2-0.9-17.3-6.6-23.8c-4.6-5.1-12-6-18.5-5.9c-0.1-4-0.1-8,0-12
+		c4.5,0,9,0.7,13.5,1C1237.6,180.8,1250.2,180.7,1262.9,180.5z"/>
+	<path d="M863.7,179.4c16.7,1.7,33.6,1.2,50.4,1.4c24.7-0.1,49.4-0.3,74-0.4c9.5-0.8,19-0.6,28.5-0.9c0.6,17.1,2.3,34.1,4.3,51.1
+		c-4.5,1-9.2,1.3-13.8,1.2c-1.4-9.1-3.1-18.6-8.8-26.1c-4-5.5-10.9-8-17.3-9.3c-13.9-2.5-28-2-42-1.9c-3.5,0.1-7.8,0.2-10,3.5
+		c-1.6,3.4-1.5,7.3-1.6,11c-0.2,21.5,0.1,43-0.2,64.5c12.6-0.2,25.3,0.1,37.9-0.3c7.1-0.7,14.9-0.7,20.8-5.3
+		c5.5-5.2,4.9-13.3,5.7-20.2c4.3,0,8.6,0,12.9,0c-1.8,18.1-0.9,36.3-0.9,54.4c-0.3,4.4,0.9,8.7,0.7,13.1c-4.2,0.3-8.4,0.1-12.6,0.2
+		c-0.9-6.9-0.6-14.8-5.9-20.1c-5.8-5.4-14.2-5.8-21.6-6.6c-12.5-0.4-25.1-0.1-37.7-0.2c1.4,6.4,0.7,13,0.9,19.5
+		c0.1,15.3-0.2,30.6,0.2,46c0.6,6.6,2.1,14.8,8.7,18.1c7.7,3.9,16.5,2.1,24.8,2.9c5,0.6,10-0.5,15.1-0.3c11.3,0.3,22.8-3,31.9-9.7
+		c9.7-7.9,13.7-20.2,17.9-31.5c3.9,1.3,7.8,2.5,11.8,3.4c0.4,4.2-1.4,8.1-2.3,12.1c-3.7,14-6.7,28.3-9.8,42.5
+		c-15.1-1.1-30.3-0.8-45.4-1.6c-21-0.2-42-0.2-63,0c-17.6,0.8-35.2,0.6-52.8,1.1c0-3.8,0-7.6,0-11.4c4.8,0,9.9,0.1,14.4-2
+		c3.5-1.6,6-4.9,7.1-8.6c2.2-7.1,2-14.6,2-21.9c0-43.3,0.1-86.7-0.1-130c-0.2-7.3-0.3-15.5-5.4-21.2c-4.9-5-12.3-4.5-18.7-4.4
+		C863.4,187.3,863.5,183.3,863.7,179.4z"/>
+	<path d="M586.6,469c16.1-1.3,32.4-0.8,48.2,2.8c32.1,7,61.2,26.3,80.2,53c17.7,24.5,26.3,55.1,25.4,85.3
+		c-0.8,29.9-8.9,60.2-26.8,84.5c-18.5,25.6-47.1,42.8-77.6,50.2c-9.9,2.6-20,3.9-30.2,4.8c-9.7,0.2-19.4,0.1-29.1,0
+		c-32.6-3.4-64.1-17.8-87.4-41.1c-10.9-11.3-19.9-24.5-26.1-39c-8.3-19.3-11.8-40.6-11.3-61.5c-0.1-33.3,11.7-66.8,34-91.8
+		c12.3-13.8,27.6-24.7,44.3-32.6C548,475.2,567.3,470.8,586.6,469 M587.6,490c-17.4,1.9-33.6,10.3-46.1,22.4
+		c-12.6,12.2-21.2,28-26.8,44.5c-5.1,15.5-7.8,31.8-7.5,48.1c-0.8,27.2,4.8,55,18.2,78.8c8.1,14.2,19.6,26.7,33.6,35.2
+		c17.8,10.2,39.6,13.3,59.5,7.9c14-3.5,26.5-11.6,36.4-22c14.6-15.7,23.3-36.1,27.7-57c3-15.1,4.3-30.5,3.8-46
+		c-0.5-3.7-1.1-7.3-1.1-11c-1.9-19.9-7.3-39.6-17.4-57c-6.9-11.7-15.7-22.4-26.9-30.1C625.6,493.3,606.3,487.8,587.6,490z"/>
+	<path d="M1213,476c6.7-2.9,13.4-6,20.2-8.7c5.5,15.8,10.1,31.9,15.4,47.8c14.1,43,29.1,85.8,43.7,128.7c7.1,20.5,13.4,41.4,22.7,61
+		c3.5,7.3,7.8,14.6,14.5,19.5c4.4,3.1,9.8,3.4,15,4.3c0,4.7,0,9.4,0,14.2c-4.3-0.3-9.1,1.2-13.1-0.9c-25.5-0.4-51-0.8-76.5,0
+		c-7.1,1-14.4,0.8-21.5,1c0-4.8,0-9.6,0-14.5c7.4-0.4,15.9,0.2,22.1-4.7c5.1-4.3,4.4-11.8,3.7-17.8c-3.7-21.6-11.8-42.2-18-63.2
+		c-25.4,0.1-50.8-0.2-76.2,0.1c-3.3,10.6-7.7,20.8-11.5,31.2c-3.8,10.6-8.6,20.9-10.8,32c-0.7,5.7-1.2,12.5,3.5,16.8
+		c6.5,6.2,16.2,4.8,24.4,5.6c0,4.8,0,9.6,0,14.4c-8.6,0.2-17-1.4-25.6-1.3c-15.4-0.2-30.7-0.3-46.1,0c-7.8-0.1-15.5,1.7-23.3,1.2
+		c-0.3-4.7-0.3-9.5-0.3-14.2c4.8-0.8,9.9-0.7,14.4-2.8c8.5-3.4,13-12.1,17.5-19.5c10.6-20.3,19-41.7,27.9-62.7
+		c21.9-53.6,45.4-106.5,64.6-161.1C1203.7,479.4,1208.7,478.2,1213,476 M1206.8,527.7c-1.1,2.7-2,5.4-2.8,8.2
+		c-6.1,20.8-13.6,41.1-21.6,61.2c-2.9,8.2-6.9,16-9.4,24.3c5.3-0.2,10.7-0.1,16-0.3c15.3-1.2,30.6,0.2,45.9,0.3
+		c-3-8.1-5.9-16.2-8.3-24.4c-5.9-19.8-12.8-39.3-16.8-59.6C1209.1,534.2,1208.6,530.7,1206.8,527.7z"/>
+	<path d="M1499.5,476.9c7.5-3.2,14.8-6.9,22.6-9.5c19.2,62,40.8,123.2,61.8,184.6c6.5,18.9,12.5,38,21.4,55.9
+		c3.7,7,8.3,14.4,15.8,17.9c3.6,1.8,7.7,1.8,11.6,2.6c-0.1,4.8,0,9.6,0,14.4c-6.2-0.1-12.5-0.1-18.7-1c-15.7-0.5-31.4-0.5-47.1-0.4
+		c-9.3,0.2-18.6-0.3-27.8,1c-5.6,0.4-11.3,0.3-16.9,0.4c0-4.8,0-9.6,0-14.5c7.7-0.4,16.6,0.1,22.8-5.3c4-4.5,3.8-11.1,3-16.6
+		c-3.6-21.9-12-42.5-18-63.8c-25.4-0.1-50.8-0.2-76.2,0c-4.4,12.5-9.3,24.9-14,37.3c-3.1,8.5-6.9,16.9-8.5,26
+		c-0.3,5.2-1.2,11.1,2.2,15.5c2.3,3.2,6.2,4.7,9.8,5.8c5.3,1.1,10.8-0.3,16,1.3c-0.1,4.8-0.1,9.5,0,14.3c-7.2,0-14.4-0.2-21.5-1.1
+		c-19-0.4-38.1-0.4-57.1,0.1l-0.8,0.6c-5.2,0.2-10.4,0.4-15.6,0.5c-0.2-4.8-0.3-9.5-0.2-14.3c7.4-0.7,15.5-1.7,21-7.2
+		c8.1-8.6,13.1-19.6,18.1-30.2c8.4-18.5,16.2-37.2,23.9-56c15.3-37.2,31.2-74.2,45.9-111.8c5.1-13.5,10.6-26.8,14.6-40.6
+		C1491.2,479.9,1495.6,478.9,1499.5,476.9 M1494.9,528.1c-8.9,31.9-21.2,62.7-33.6,93.4c5.6-0.2,11.2,0,16.8-0.4
+		c15-1.2,30.1,0.3,45.2,0.3c-2.5-8.3-5.7-16.4-8.1-24.7c-6.5-21.9-14.3-43.6-18-66.3C1497.2,529,1495.8,528.7,1494.9,528.1z"/>
+	<path d="M392,476.5c13,0.4,26-0.8,39-2c0.5,5,0.2,10,0.4,15c-8.2,1.1-17.1,0.1-24.6,4.4c-5.6,2.9-8.3,9.1-9.1,15
+		c-0.5,4.7-0.4,9.4-0.4,14.1c0.3,15.7-0.3,31.4,1,47c0.2,12.7,0.1,25.4,0.5,38.1l0.7,0.8c0.1,11,0,22,0.4,32.9
+		c1.3,10.9,0.4,22,1.5,32.9c0.3,4,0,8,0.6,11.9c1.1,6.1,0,12.3,1.5,18.3c1.2,6.4,2.1,13.9,7.9,18c6.2,4.4,14.2,4.2,21.5,5.1
+		c0,4.9,0,9.8,0,14.7c-9.2,0.3-18.4-1.4-27.6-1.3c-20.7-0.3-41.3-0.3-62,0.2c-6.9,1-13.8,0.9-20.7,1c0-5-0.1-10.1,0.2-15.1
+		c7.5,0.1,15.8-0.3,21.9-5.2c6.5-6.7,6.8-16.7,6.9-25.5c0.2-39.7-0.1-79.3,0.2-119c0.1-5.3,1.3-10.6,1-16
+		c-0.1-6.9,1.6-13.7,1.2-20.6c-0.5,0-1.5,0-1.9,0c-13.7,38.9-31.6,76.1-49.3,113.4c-8,17-16.4,33.8-23.6,51.2
+		c-5.5,12.5-10.5,25.2-16.7,37.3c-3.4-0.1-6.7,0.2-10.1-0.2c-1.3-0.3-1.8-1.8-2.4-2.9c-18.2-39.6-37-78.9-55.4-118.4
+		c-12.4-26-24.3-52.4-34.1-79.5c-0.5,0-1.6-0.1-2.1-0.1c0.1,10.3,1.5,20.5,1.1,30.8c0.4,13.1-0.6,26.2-0.9,39.3
+		c-1.2,9.9-0.1,19.9-1.6,29.8c-0.4,11.4-0.2,22.9-0.4,34.4c-0.8,9.1-1.4,18.4-0.1,27.5c0.4,6.4,2.1,13.3,6.8,18
+		c6.2,5.1,14.6,6.1,22.4,5.8c0.3,5,0.2,10,0.2,15.1c-7.9,0.3-15.7-1.4-23.6-1.2c-12.8-0.3-25.6-0.4-38.4,0.1
+		c-8.3,1.1-16.6,0.8-25,0.8c0.4-4.9-1-10.1,1-14.7c6.6,0.3,14.1-0.1,19-5.1c5.4-5.9,7-14,8.3-21.6c0.8-3.9,0.8-8,0.4-11.9
+		c0.3,1.7,0.6,3.4,0.9,5.1c0.4-9.1,1.1-18.1,2-27.2c0.2-4.4,0-8.8,0.6-13.1c1-6.6,0.4-13.3,0.9-20c0.9-7.6,0.7-15.3,1.5-22.9
+		c-0.3-9,1.4-17.9,1.2-27c-0.2-5.4,1-10.7,1-16c-0.1-17.7,2.7-35.4,1.6-53.1c-0.6-8.3-3.8-17.1-11.2-21.6
+		c-5.7-3.6-12.7-3.2-19.2-3.1c-0.2-4.9-0.1-9.9-0.1-14.8c14.5,0.2,29,1.7,43.5,1c9.8-0.7,19.7-0.7,29.4-1.9
+		c15.6,37.3,32.4,74,49.9,110.4c13.4,28.9,28,57.3,39.5,87c0.3-0.2,0.9-0.5,1.3-0.7c7.5-18.6,15.2-37.2,23.9-55.3
+		c18.6-40.6,38.1-80.9,55.6-122c2.8-6,4.7-12.4,7.8-18.3C368.9,475,380.4,476.6,392,476.5z"/>
+	<path d="M761.3,489.6c-0.1-5.1-0.1-10.1,0-15.1c26.2,2,52.5,2.5,78.7,1.7c9.6-1,19.3-0.1,28.8-1.3c1.5-0.3,3,0.2,4.4,0.7
+		c-0.2,4.7-0.1,9.3-0.1,14c-8.3,0-18.2-0.4-24.5,6c-6.9,8.1-5.9,19.5-7,29.4c-0.3,23.8,0.1,47.6-0.3,71.4c31.5-0.4,63.1,0,94.6-0.2
+		c12.2,0.1,24.4-0.2,36.6,0.2c-0.3-17.8-0.2-35.6-0.1-53.4c-0.2-8.3,0.3-16.7-0.9-25c-0.2-8.1-1.2-17.2-7.3-23.2
+		c-6.4-5.7-15.5-5-23.5-5.2c0-4.6,0-9.3,0-13.9c8.1-0.2,16.2-0.1,24.2,0.7c19.3,0.8,38.7,0.2,58,0c9.9-0.8,19.8-0.5,29.7-0.8
+		c0.1,4.7,0.1,9.5,0,14.2c-6.5-0.1-13.3-0.3-19.2,2.6c-4.3,2.1-7.2,6.2-8.5,10.8c-3.5,10.6-2.4,21.9-2.6,32.9c0,47,0,94,0,141.1
+		c0.2,12.3-0.9,25,2.3,37c1.3,5,4.6,9.8,9.5,11.8c4,2.1,8.5,1.6,12.8,2.3c1.8-0.2,3.6-0.4,5.5-0.6c0.4,5.1,0.2,10.2,0.2,15.2
+		c-7.2-0.2-14.5-0.3-21.7-0.6c-8.3-1.1-16.7-0.8-25-0.9c-13.8,0-27.7,0-41.5,0.4c-7.7,1.1-15.4,0.5-23.1,0.9
+		c-0.8-4.8,0.2-9.6-0.1-14.5c6.9-1.2,14.6,0.8,20.7-3.5c7.6-4.9,9.2-14.6,9.6-22.9c1.4-9.9,0.7-19.9,0.9-29.9
+		c0-18.5,0-36.9,0.1-55.4c-43.7,0.2-87.3,0.3-131,0c0.2,26.8,0,53.6,0.2,80.4c1,8.4,1.2,17.8,6.7,24.7c6.2,7.1,16.4,6.1,24.9,6.9
+		c-0.1,4.7-0.1,9.4,0,14.2c-7.5,0-14.9,0-22.3-1c-23-0.5-46-0.6-69,0c-6.8,1-13.7,1.1-20.6,1.1c0-4.8,0-9.7,0-14.5
+		c7.9-0.3,17,0,23.2-5.8c5.5-6.4,6.5-15.4,7-23.5c0.2-57.3,0.1-114.6,0.1-172c-0.1-10.3,0.1-21.7-6.1-30.5
+		C779.8,489.4,769.7,489.5,761.3,489.6z"/>
+</g>
+</svg>
diff --git a/misc/openmohaa-text-sm.png b/misc/openmohaa-text-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..e27733be560006b633f4b0e985320b40a40839b2
GIT binary patch
literal 73017
zcmeAS@N?(olHy`uVBq!ia0y~yV4T3fz;J|vje&t-<Mr~H3=9mCC9V-A!TD(=<%vb9
z42~)JNvR5+xryniL8*x;m4zo$Z5SAsH8MjYN+NuHtdjF{^%6m9^eS=-7(l?rzM>#8
zIXksPAt^OIGtXA({qFrr3YjUkO5vuy2EGN(sTr9bRYj@6RemAKRoTgwDN6Qs3N{s1
z6}bhusU?XD6}dTi#a0!zN?>!X@`|lM!um=IU?nBlwn`93Mfe6NIOi9oDp=|n>Lwc)
z7%7-r>ZKW*nxv*Bn;YmT7#SED>l+&C8(8WZ8d({bTA3OvK!K8-f=y9MnpKdC8`Qd@
zlr&qVjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(y-J+B<-Qvo;lEez#ykcdT2`;I{
z$wiq3C7Jno3Lp~`lk!VTY?YLt##ZDO`1-;P&MSt7RdRl=ennz|zM-Cher_(vYhXVY
zmjtCEoPkw!aY$uBs(w&vaeir0a%xa&nlh4A_$>k{Eb#TUa>-9F%}vcK@pQ3Os>m(S
zOUX>Ja&tDbbTe@@voJMrGBk8`b22b=b}@0XaJ4XZvNUrwf$8<kD=taQOHPI9&CE=(
zaxro?FgCF;u`o3;!l~EFxhOTUB)=#mKR*W+fdLu$CHch}`2`9_rg|m{8or6inRy@)
zO;G59gU-q&wJ5VJHN~wcKUV=9JXV=loZxJ3;9~CPYHnd_Y=Yeh5WOi_ybjfCfm5%(
zoq~-%C~lGB8YUFv;s#=ZQzj^t+9@ECe`;Qetx}Paz1`u*EWa2SC6{};IEGZ*db78@
zB;|Rjdd2<Kb5=Jvo$Ec<c{b0@Q$;muQIqH~JH8^n^z(CM`_t2N&d;>Bkv?X(``%Z{
z-*axpR_pXX&#;YKs~dT6nyQzHrq)D}lWI5L+~Hjyo$;jS)XrCL|K5GS_Z5?r!(!<d
z4xeg6IC&pDY<*vQfA9D5!|$_F`e*mu|MB+z|KIBNKfULB`o%41xbNQQVScs5JhZEF
zSJgw6%DZ|+JN{m=teA0XsgiH+oTWcI6JOoiI{(q#YK_T$K|1&RetzMS+$t5St$N9%
zmuIot)~u<gX1W&rJS_71j&I1hAkD1~OTBt)beTh*eohV2F3Jgx=2v}w{G@o6(sp~5
z?`aZjnM+o#zuNR?P0-~Zbv8eqer<p7I&&)1%UO;qQzm(}@|c#tef;}u;LZtCi=~Qe
z<ioW;-oJLD;8y{wCI7qYyW$LIt8CYInYHfp`I5ViM`I?Lv`>!7n_oHa*z2^Pt0(i^
zU3{)Qoc+A-TBYwxtYcR{KO*<lGU&al@&BD)EiZNNF`HXwBqLXO-EFIr_T}&sPk93r
zu6gk--@Q++WX*Z6c|878`b$65MJVyFuWol%Uw+y-c=7bqx$e<cCm(-ZZMybl$cd#V
z9~Mo#{BTj$P7lB3%idjF5wtaGanR1Jb@yk*sN32f^iMuvSNyxl#IR_dlJ4CnpDj+F
zKF+FqHsrM4q+{3T%%8iA>wW9C*y9;#KUB{4#4lY|p}n>IyXybL`+sf~<}UtY@a;x{
z#aqoCKTka8?#t0~Y_oRh*7jbqw0nx5PN3RO57SF4ch<{`cB_W5iM~<HdM~>qqj-*&
z>c4s7wQGYG=2#s(RPSZRcJ<Vf%^O+;zPm<6bcjdH;NSE>@AGn}BeM%L3mdB*i>}&u
zpxuH0Gus2<lh<>S8t2H_Kb`b>Q{k$olXA@F+dHs|y=$%MGf(TVpZIIpp|-<n>p!-A
zVewcOyH>>YhjoRrBrlV^^ku27UNc)8y0xBe`s4Ndd1FDtrvuN-D%gs2IQBGV#2#ED
zRTR7b>si~1>KfmD{%1p4zD2CIjyO2oNQZL+TgALpd#1_klfE}~Pj<F$rdLDuo-z(M
zH&ylQD+TRGJ2*_sI~f;ue_C;MYDnvkio2)(pZ99)UHRtHnmt0x!xn0q?XdbTw|r`=
zq*jvc$6ux?_L(6`&TFTg4lp>?6wjkpTHZEU+-U027rXY|;rZkqeZ=5&`n0EVw}110
z`o%Np*y~*<PGuBTHr~2@>%`G?O>yomhpKfi&3m@>?Xm(Bx6Q`FS7iFF{~TN}`Pm!Q
zO)D7_{STgXSKPZKe(w*p)S^nR@;8Z$bC*YCn}2;<-_f_{y|BpZ8?KE7Ayb+dT>?)`
zoUB`zv*77ZPrGf+=k|Z||Fc^tpUI8Ck)t*Gw@bm{PhF+*3tn~xx*0ED5pZJi@|E4U
z*!j9rr$)|v&dcb1PWjsGIIoHJ0uy*&BroLU=I3By+8dxDAe|zT^X|dts-s-W!j>`j
z6HJRXe#(4xOL?~U<+)G3vH3n+wJ}e7)1-%MpMD6k+j&4*FH~Ial#)uNU(OpRGsW{=
z_wUEvJz&n5{Y{OFF~h&FZBwzuo44B=>rChD36oHCI&f%5Wd7MHHy><xCg;V*WjQ}C
z?eNM24<=n~($;w1<oJlMMf6s)VTzLUp5~gYnVWi+anBU>()XR%eX()&#p=A&zLM?J
zPvtCmP`;^Ohq>*3;*5zt!tWOzU7dgW{$nYFwheXNKet4&Khu3|wd=HQw*94B-v0{b
zJc?xw(M)?%S9{US?1@@M?)ku}ywVcxvb*~(d^)4CblUTXiLuEnSKM7~Gp2Ywou&IX
zhh@`S!34&87q`zBTkd}H^%d6%Mq8GC+qXC5%(5G|G>zAkUAl51TIoW!PDu4P+2tXx
zxGXD-&-KPG`uA7;#QV>e|NKaGWHXKX-0;4DeJh{LQYCHfh!{D$wo{e6ie9l_xwN_c
zR@HaIpcN<7u02p&k#e)i_{b$~V=IP3j9iKl&5LAevJNK+J2rGJU9o<m<R9b353Pd*
z9$Va;U~@z@V6~A`*J-t~gQ{xo+T!9O{1-aTojNSbb8_SMcSbuylW%Tn;&sd{UAb{y
z=-GI$qicftzOTIPvHIDR*XfI&@5tux)eLt|UwA%j$1yjqJ3$V4i+n0JKD#l4<LK_6
z0oyg$3?qWPpK!WGavBI7`2D<eO4N*mg?A4*&0*bh@b!|YC-R$j6|zeFY)f6cR9x+8
zEYnFVSw2TrKD+kAPnGL6&OPtZeA>J<T07`y!Gz7TmWsLYMy+UG<uIkqX-WV?!RKq!
zCo71|6?N;Yj}v&j`jA_o!8OO1M?H%^@8d9X+FA0_=%-p*%Kdjq$)_F{a!$&8`(o+5
zy~iu~(|dEQQk}!18{e>;D*xbAx~VjN@yhJOB@Y%ZUm2ox@}HOf`OBByu$1!4Ez()s
z)Ys@Nl9s*dnDnY{(K8=jPERfT?ZoFbEi9ulbEcKk+9xTF@k!aMcc#x*;F#V#eXqVt
zXhcy??EBmM=YL7Cj-PD4?A-oj)z*lnhg=iSG2MBZR$^;+<i)aXbNAgb{(H|^9e7?F
zFS>o!?YkNerq17WN?L>?V`@6*hxxi@fd)DjO}?^^7AXnd;`=FCb74k*kecVcg3Dij
zbaO}t8%zp{acgeXHI(1!Hg&%8`STC=JND&T{I~k^v|Ff{>uB|r%{fb&e^>>)nCjKJ
zN2fzaq{zNa)<mplQ^&iNOp(v`El^3AFys5ujT8Dxc|KLG;`D0N7SG?lvU<Jd2Ggin
zQfmGyB4g&Ut@poY7?Ru?q7!~%wdjwn**Q8(Rn;0x)mO~CAG$7L(X_Y)iPLxNb<(|?
zr1C=4&1M;QcZ}e_z5RD=LPPiI?}_JWKOI?r+%)dIgWj^^lWO*u6`xcsTz~MyMH|Jq
z^}1V3ibL1k-Tj<H_pEQ=ij}>aP6to%(+N_VDcEXO_0Lqoeb?>Br8h2}4^y};$8DS}
zq%UDnFh~5Zit2Q639;|qIfrjPTj;PPQfH>vwm7eyBCVCmQ$J}&N$ftxz2nTZ@Q#Jw
zg}%P2Y&ah*)~&JC;%I@bXJMFvsGYgavIct<0lC=+<ll)+VVW+%vRwGn&4<a_7c~oc
zV$D|+Ur)Sg^TT$gA!iQXj-y&j_jDP5O4HeNpw-)ZjVDKh*t$nd$t4RfbZ*nLThTc+
z=E47T*C!kr=h^1-uhZsW)L6c2_hF%DPv=C;TeAD;tCm{^KO8q4RODgVxnXJg2BD_g
zPkzbg>A0BgTh`n<>*1QN4+eQ+ryUN=Ij?`{&AzzEg3ou_x%f`<^?p}XShA|8Imv0E
zL%z>7!GFCKF$xE=Cksy1zvnk4{+Yf0iCJ-T;uoB|>+U+Cx>@j)&e;>co25h36K!p)
zI<0R0__V<>^z@lvv&oCO)~{aH7n>rIuF7~+I=!T+^!<lmyR9dVP2N7Qr>S&q<jjd*
z8^7w@({a;%^zYEUmDi5^IIVxaBkf?}j(#rXx6dl1wU5<B&6HcX>>J}L@l!(1Z|;;%
zxafVaz(U51X`|?gZ|>gD8Gi1uTlJ|e<NZz7&%(+j&)WZc6kpftj^;Lya*~#2W-JWU
z$?=^UF=KaS@&ThF!;*bJUTsemJgn3t)R<cP?P>n%H=_3hHmrF)(`lCGG2Wnqm7Ufv
zuCwNy6(~tKs`|kHy2MHc$CtZaPI_=Zaq{V7g;uZa%0-z?!xlDQef8LFb=*<uAF~1+
zmMUorY|pec-*M>3?vOCY>>aK?;X*AwSGTB@-p$-~HgC@n--HE4iKYrG&-QH<>9oz0
zZH$?3oqM(B)U1a;%^Q>^${czxa*XlXzGa$MILnu>@oe|Lu<VF-+@D!p$FGK@iQKEV
zweG%t?4^8NtYTQoY0h0H!qzUHBC7w&ZMi30>|A%}#0_VQ^RG(p6r6Wk+n1o-an+)v
zb=S{5GmlJ~bNcwHCqLNjeGljFciFhj?v=ES!@mgWvwd+13*t5=D{N!B`EQ2gUWf4L
zM~gU=E^4qowq0X!ETiz%Du;M>vy)PZYwkE$i55o&N32&ieCocHmnG@($7PQqCd=(!
zXJ7rc^3`=iv+vFKXLUxEPhQI=aO+j^to_%*{+_$x@Z<KOfBR&Q-TJ<Itz)05sPt~e
z!|OKdUDx`)tMF1mo$$+5^)clquhmDIZ@9MmTyI1aAN!?s@11>BCw$mHE$w(_+8ZU=
z-xvHn3;wQsUq4qgxU=e;oM=l5e{^F`bqU{_)o(4oF$RjA2>N6kB4_i5qj%0P#ni8&
ztx|agO<QO0j(U^GUwy~<Xog48iF@ty72`FO^v*B#uWR%A$@6W?vyZHAbV8#WbLzKz
zeY<`UgXVnS$@cd={n`%gI<I~3Xzv{r56=>-w=cK0+rGQKP&37-?xk<h3#p$f-fP?@
zK66Y7lA7vua~nf0>!!bfj~^O%iSV(moHKK2ld(eRtrH%%PE^LPzWFY=`o`nB>k1t^
zE5347?u|?Aa<CERSTe!$+Nsu>qw|zO{!qwhS1`GhAt)0wZ?3}h>+XE*#m-M3mhFDJ
zdfk01uDm6@8{2K)6fSS;>NnZ?J!r|w)|iC6gjS~TX_uvoEGB5@_n%E&Y|Cmcf4Vrh
z@8wBP&)6$-;vQah)II8^JpFXw#)v8X%kEb7)r-Dt7rp&sW4rCU4gUgWzHJm+HTCln
z>CjVYMj<*+4yG;-J*^sTcZ(y1{o2gH%YV*k>H6^n?u=RJu%-8q?e8TL7ask}<eA0Z
ze6Vf*UQ?0A&o|!bSKoN7$GfC`c5A1{t+Q)%0!;3?9Spcou<PzN?gL>8x8={C{kY26
zyd_BG+SchopC2!>2?^bH%G3SAou@@_8#WoedcH9>;@gJfbKMo66mT{!IUKt5oo&1C
zviq|l%TqxyTs|epjbp_j;iWZt&U*13YVPN**6)=}+A+5zF1ql>VYza_mXK~W&eEAh
z54Nq=D9dg?z4qqjWbFyL{altktJY7=daCkNs95Cf9p~IU`&gTwv6C;HRn*-5nzQbR
zQOQEdom;nNn0$G#L!ZZVbNNZL?OM5E1{HJlPe*(&-@q|-)4pP^Z*44WpMU?FyMEX9
z*GDJb;^o=qwpVEX#T$2DykGnNsm-jDDlzMyn7=CC9JzC4nQ(K;-mhEalp95EX1=ex
znK@%}+mjhw`fqcJJXgK``!Fr>^0gD!<hL>1Y<&2^ZA*}%|I->b4mL%P&8IJ?O!-`D
z)!!Sy%=Bpc<WAP<5=J}U@jp%Ecs^mj<}HPY{J_5KuIt=eUVREJzq4U(;?K?xMxGzn
z{Bsjnay6*))Y3f#8V@C6udfTvxze+1lJU_G$L?s%N(@>g@w!XI^~!S1Bs&@QU3?o@
zKYVl&Y<~5`>Ss!5hw{Ofs$ISrc3DOB3%)btwg;|_4R@Ng=*No9T#Ns6TO4$F&(y_d
zC+=bOP-|+PM8GYzy}e$y3{I?AJMXfa<NkZbopwbQPi8IH8EL&fA!OT&f|lDnyob3g
zGkd<p1t=~1^?Yl%K-3hj>`5=P4`12-o^c`DruMZC+iWjnu<f-KkzVO`U2p!P3FmXa
z&A1WMRb?~pc9G{@{Zq~XAv--}nb}{=jQ_PgL^s-2&L>OsLtLbZVA}MfThlhCd98VJ
z$29PO(hjK`aZ?pSeA`w%Wnw+Rl%vRdnaf}Ae4ygwMFqvymCT97x7WLI_j2;SzWG>y
z<AEl#yX1<aCzAy8HhePH-t4ro|J{TDrIkOkpYXb^j5!mmIeVGM@rFk~5A6-@Uec_1
zQ+#>Pgk-gl<_$@GH4A6_shw4?Hz%;B!a_>be~YsS%evLmgPnTgKbuVs^qCyy6=XDZ
zVVAPT-_%c?l`FkDj@;7RYT>!?nV;JM?nNHDF;_I6T#HWs8Pj)*jc?Mq^V8-?i_2-7
zy6-v@Z*Whu*75-VR-<CqKI^}qw!b{J^ZIL%fA8BEozEo(P3Bl#vNfyhbIRufN3$7K
z=6?|BC|tyC8oo4U)8@z=)=hsWre#={J@n0toPB=Hgxj5dIdQA5<-JR*+J3}Xp`gVf
z@Q#j(t;B+WgFRh!d;v-xS`8aSk471X?M%90-83csrpl$=`^+0XL>8umX6#TjS$f~4
zXkyWya=-iubN-m0mHn&6_3_lkQ%ghd9@?9&^yOd(4_Cpda7Eb@Z~Hyc-877s-`1_-
zzx(BaHfxdPW~217avtyZTszEKdd^opHIjF{DtvT()StFUg~vBP)!bhiGl{=&vh<a&
zIy?R@*kArTf-`1vW#^V}0h)%cN2f{_mR8MSt5nW?^6B`JiPMkE3)nvW_ABD!w$pc}
zeadvq%9yp}#aHiT6CWFt{(ALQjH7kw@iV9HERkTkBslqk_ELrO-Tw>)7QOh+*n0g4
zm(cm@?7y-1IA51<T@)I}c(~+rR**}_Jv)c}vAg+#4Cgy;ce0kq)SmFR|HvhoxAhMU
zXU&!n3%hA__|CLve1*#u@@+&q_pvAJOEhA;E)uAcZ=%j^XtJPbL(2!2skUoAIIKCl
z=0)g!W-rHL`R>deX=d_52ixQ1Z?dFLPj}_8w#{8-D0sfoZnDaDXYpxaSME7PMxJ2T
zJ36&BGwbD>{WG5k9Az^LOPr`{{Um0=0e{^d?pp<)Di7z@p3=HLC6upmPQ)D1g^v;$
z<ucy}uT$CiU0Nny=}uu>=D(x&e<!b<l74vc8LuPvFZsJ^dRK;tWU%v1QF_t-++gB4
zLD8@kdsj~{+Nq;0-F{(_cu@Bm3#KW)x|a{#5&0@#6H(RixbEZjS5<~yhN}+zP1alR
zWlxWq)Kud>U!VA?zu6XT5XrOJsiVQkk(Qd}GR1qz+WGe#f3&fsyywzCWOcqpwWD-a
zTFCQfI~~~%|Gc>QNs@Bn%!@^>*VowQ8Lj^&a;N6YJ3A-4`T!Q6`}dNQTGK9R3NAY*
z>v6Z1JyUS=(zT2CF>gFslQYwKhk5CH!RrBOnX@JpCr^o-C)~J7<LT7j9HIMWN$MP{
zdG!9_t|G%z9A@RSdRK^?ynE<MXjIBWPHw?dQiu3Gd5pu)Up#R$JoG+)d-3JptX2(E
z<21G9%|$||O>Av`fBopSiY>Jc_tLBCnoezacX0=IZKy=z!krUtKb~rK&~NVl^+7j2
zREe2Zni-z=P}k39p0;QGO7BPFTZ8<PWHUBRO;2HUoe()EtwdnS$(5PAs(#A++*9L!
z<ixrO6V6q7{`-64r}@ewUOJZ6YI-J&c5)@(yHC|FVib;&c<r=4F4pxp-_fRTn?#N0
zCDwk(aZuW|LsVU4F1r=?FDB~=8Xx(bRMj@c&DrVJ{W<v3HuEc&R8P&H+VQMtXYS7o
zP-0wqv(Q~ZYWcK2IkB$GTWpM%Rq21`+cP(!b?e0YmDYY=6Fk=ItXdY*W2O+GSfS7&
zsP0tmvfTdAwZdZOZ!^`L_&J=vW`-Avn#^=k*5R)@vi<9-dxC9FRvb#--`XlYXJ<OI
zDX3||XZPDbezRu1zvp@}Vsm8o;<c}foEI;A^2hY&_AgVPSATJjUh-N=fa3z|6xn&K
z^M8Ky-eO{@!X=bvx+i-5dG(XR98;VbRc>C2zwdNi<yxbuVs0z1=$^7eveV<I@KyWe
zdo(?n>g2bM-K2ZQxsB@f&O294UZ#Hh=+X9T$6su)GPiZBt>z1?KEFW2(I$J!#Gn;h
zqbD#w<LpvC>}4pyHQ8QbWqCq~@9aH2eaTI8gt|YgZS4#Cm#3j!ax-P=y(?SWYi#Tl
zxNFz5oYO7gTAY$NNib@sM)5OVvyBst{5QVa+xBb|H)pQ+H9nqgv;J<-5$4IBD0|hg
zV8WxfwvWVi%03O$5P9<YE!&OvQ@4hlOLvv<?~fCCcIn;ScGnqB83!*Ny}ogwdE`Nz
z3-1>9dpZbhWZMza;8UZsV{O@z4Tl7C+}3C9*pp>yydtyA<H+|9zZbJ=?Q_2%d}8s^
z><LlTWq~bgk6byVBDqqvYeRtR;#HyRq&fFxU;4W743l-jF@Xg)66PxJ=>5U|PSEy!
z^V{5%GkuqjPS&4vS$ttdy8X+!%|hJ`K4+g7m%N*rAG~E}tJB75Ro~`%DQuXfVHwKA
zP_NG=^tR>V6~0(m({_zJT?+$eh%)T@@zCPV{Pv4)*E#o3m^OEzkCvymxA&jT8e2=>
zFWYu+Z_kWpPpuYSlgnJk@;1anZ!)`{#sbr@bFEiCef^p3ar>%itBb(#*)t^;{<C#I
zA>ZYp9kHEX&skqJLbH#5?z7Up^OI`w-*3Hm>6+)mj9}Y|OrL{RPKl_mcx$2)-I!DF
z@<`Uix@;!bQKh$5e>AkGC@p=azGVH6wcj>Rn-U>lyzlU@R*wTyTP<52y;JVLc;tiR
zuCkXRU*&BQzb!J0sNAFLw7dMf;z_SfELJ)R3xu!c`t4lzAiG^!eXD_E;yfq*#nWa5
z3VxsTB`tj+-)oD5pL^u)zKG{_Y0j=<Rup@bd*#mN@TNCA#8|$sdSFxUdcJIdG)I8v
z$*o*=Kjj|$a&!}ZWEPN?Al6a-cG2QLr7y1VAC1aSoYI`F^q}V7*5@l{vih2cO>Z#X
zbaK@ip3j}GfqepRUd)>wIcw_rinM%%Q~bwPoWAT*W$Las_aggx#T{>$YSw4G@7lq3
zZtD4^nx@81+}+-j;>EuFUb#8neDO|$)*mrV4qmKo`jLhEE1d$jwk_Brxz_a-yT)#t
z!(BE?FAukVF}hzqk7<q0gH^92Z@6psJaN<8<H#=mZ^DkfAGUiJKQ^iT%Jfy%!Y?uG
z)Yezk9nHKM)9q{7<<;7qpQnf0MICuNp;SHR_O}h9C(4drx%&BNV}E@ZtF~n8ncjKJ
z6Esqmt-E(@$?RIEd!3R|kIWwaet);zXP1%JEA8mR3q6E?M%>uCLEzZu)X7@+8Z4YO
z?ybG!^k+WHmTXhbxI=%L64|pPjs#9v_p0c(N}OV@zu<|uxMfV-KkvHBEl=1o^H^k|
z<4k5o*Jvx%a}161W=MyA<Y^C5YLjGUFg3rREYj({<1~-4-Ghnu7w@;8`JJ^yq;vb_
zd+hcK#~B|Uux<IwCs#LTmUWe?HG7zy(FKJZfy0g3I=2iJR&f5^Cg@(^J!`|N*9Db_
z*W~PZ@^pUn9Y3$lk75K(mUliXG;Wfx`);*#`tytltUIqiU*7stQfgnpEWYErBn*!n
zS^LOPaLScg8N8(i8Iotd%jdnG-omV*c1AzIM{TmI`1!!KX&ac{JgZ(kvHyJFgKDws
zi%vVo?&dSx^h)5$5~I`ilz$yIQJZkc+P=1zt^eDJ-7d#scLtfQ3Y|UWT$qBj!L6$A
zBGJ`l!CmGRU96$!_X$rr_^9fq^{G{RkDi<U-r{KDiX6@L`VOMo<~)3Uep#4?MCP)c
z9}~UK`3JS={&G-JW8!Jz&RqTU4VQ9f+Nbv9RqL%6HwZ~KSse*|@NrW2c}3gDl6QAJ
z{QW#TLUV6{e(5*9Py0`cWWSwKdHXDf!L2J!Pkovu9&UOiaI#4>gU$Z))~}O7FY+#&
zb$a<vE4jcdIb&ze?-S$ZJc-r`@_t_zShD8i3Kc`y_L;HMmQK8^-`%9WIaTVt%!J<`
zH$RPEukk#)LXwqHl0kHV=EQT~m2CI?T#?gsQRM&L>(>vp|Ca3h5yEi)aRT#_$N;aZ
z%q~&q8GQENcy_uzTq?Qr$%_~FgoP#>{CMv@Q`B<4{S_52e-V}Q{CBcFd<uRyf2!HA
zNOnz6k<_Ke$7^<2OC~N&&13%a_ss?AH9Fsdczvfx=sx;)yZZZy&q}?Ly4-g-*1dke
zG;CeljfUTHzb3qxH1(yX+al&iNn3Vq$YI^2yf{qHVw!rpOQT8o+hqmb{a&0`?@M#@
zG^y^j@n3KMUv%T1#7ys5x}Tm^%H6tsJM+t<=n&Ppvm!41ZZ^~s-5iqkP&ISmvhLGG
z@&|KSPRr`4%X6o29#CG8DOMi&|6zT>%>#2E*!-Qv;U8PPVZwFQc?{e6Cb0JDrcF|c
z*!Xeb1cf<EAN1F&ebrvJ`%qErlOXP8)u;V`URiWytHNKgY1Uou#nO*yiscJ0`TXj0
z{IY^z?X4RH8|4hLc^Sf_U&%!zGKKDR4U{b1Qd~P%<7h{fh)i(e(|{+>Kd|_ntUPU_
z{;B6gk#%v<zeNX5F-L~X(Dr{YXVnAtO%ttJ=QstgnK5B1>rv(@tlCkV&IqI*thZSo
z8Y7;0;HlA4Ax^ihzd<wWK0f)bA&@6z!hW>zdHf8ysq4RAKJonXr7xMwoBtfDJo;Li
zlYK`0k|br{_#TN(j2&wo$`T@2-2!B8tl>^hSN-rSE>K}Z!1LwDU%Z)JUody_$(~dV
z`#lS_76m?5ocbb-b>~m(WZ#D^c{}5KUSEBD?R$2&j!t;*#$&S+0vAS1eIMq!ZB_8b
zBU?-Febull2^O4j^+ooRNpbf3wX7zedOBO=`bo>RTz}cVZn|fD_2<fx?y#c~-{Yj;
zuPx-0ijBDbJTTV#T&9Hiywhijf~Q{FY85ou()fP!k-Dhcnlhbt!gE>QwS3B$Bi`BG
z=;*L%gV=?2xA+#_=1NI-3%>p?YRlICwF}lf={lUxrya91^&Ydr{8m1$wX>pcWf%*s
zIU7^_e&v@7)_?T!QvLFu&s8Y>Sy#OIp5aqPwxmh3Zdaca?&+M^u;zf*&NY?~gtve?
zqSlvAZ>~zp>$#-;dCMLP|IVe6uU_0tjau@a@mi2G>lWplsrP&|Za$uCt5fnNuHtx?
z@M^cm)BS>;>$wI`iIbTAPhn@tp$)xq(T#6T2uwQ{6!+)Q#Ajw%FJCP6h}NH5^H2Nz
z%E}Gas{6JJoU4A2d9?QGosHfV=LMJ#9+&4^#3iC}WZRTHqnwUytq*zKvM0r5Wn8f<
z2#5$guD@5+E7eweY1rzUVY_VKeC)fRXv)Ruyv48hx?bR#z4K-A>~+ujdCK<M=CE$6
zWqDK(v@T*v_8OB3{rhdq{i-Z|8v{DB+BWj(th;q>m+hOv`}|WK8j}20ihHS_l+T>{
z=;~j7Ti3>dGv5+#a;5xEF8re;8kY9r#cw;urA~dbX3t*v|H9)C<>$OJ^}_s%SATD?
zeUsS#TddAQEn4B0TIAFP>pk^-0)wmdD+6nO$|+6Tb2st0!!`r1n@f~MdN;Rjayl5$
zGKX(&(9AU&!qykk_^bC6e{Dbfa1oPKkLaf>oBt=S>|H6gc~W}B>aZO9Exiug?4y41
zWu4v2t}!=a(UVU?S4;RMuTBbiKS}oWhIZR~D}On6u^tR)SajoQtK_OFMImR^S8OoK
z4DqVG&7Z41LAD_?Z~m03g_VM<YA1IG2fgJv#T8w9<FMTOGYemt@n*(^=}o`#-Q(=_
z(xRPrqSl6OeY$w9Ls`m|7Ollm%L0N||M0mO?6mr};Wv<7jan|>41T<w6}4MKq%TO*
z(z~v{!RV#RUh%9w+j3)W2XFY=xFz<>nPa<})`!f9yx-W8y<wA1R^Mw|6%kpsPmfw(
zG1;$}nVT-l=lVABc=el)deS%8bJwoDa^;FoYfx)Rd=F1~i`UiE+xxbOp5Wt*NeQbA
zl@9E7=E&T&^_I1=H*?pbLtOrXzb#Kla|8#kX>Gb_(Yi=?5szbj-#+z|M<t_X&R?S~
zp0X%qQuh?k1&kqqn@-R1``)KH*=uJ=`m3!!=Dw0i&VKCe#=Lr3;oO2it8LP=7dmd9
zt3Cg^;@*gDN)jdu%hyjkt@d=gnpcVF_wd@f?9#psZkIg1u048n>Gk~e=j^xgMb2OJ
z+$hZaxYE&1)<gSy?-%x-dYUwM@tLGKfg;JXPS&T+u)Vu<_1~|Sg%<B`>|>n0G0%+C
z_=VN{=~t&-UNwDJoO$Y%-9cJuDd*=NRZ#d?!n(4p?C7rPOulnV-hR@2b+>-cGD{iJ
z=wCOvQf?m(63IB&RloSR>@ST9pKDit2WL;%u-A#BscK*G2adyE_+DCEH>_}3aq!@s
zS!qWNjH@R8;<t0z=g{%&nBFJ0s@acn=U&<OdPP9jdH>jnanBYMN$&r#><go#vFaDy
z`+Q8zMX&DFx=2YrE!Na(tlS<V#8u>BcVy<4*VeJI+-qBYt`0b`c)9!Bt~<Iuj9wK{
zTr1MFRw{}9uw1}0xqEYn6Qjm_caeu}-@_Jqc#9vsUH$ZZ;KDh+3q6B9Up(|ay2!vN
z+15il(%{~wIUSP>mzw_*&MN;Gxi)5kot8jPMnJ2b+Kl?l*S8l$6!2u+b-cxSa2?AY
z?~Z@R&h1~v@<Hk;Zz{9apMTE%CkkH_t(X{jp{w{)?V`m>=bk4kdz4$9c+T&2f9jJ<
zHucZS=G0!#^1gHBqV`Gk1d%o+M`MFCg1<H;$BAxIy(;e(9`Y+=;u~%^&FL|VIv-vx
z?}@u-z^fI$VJ1&_hu6#0z!JT7HIe_b-X7j0dZI5vbI;+6+Z&G_lxnQ3*W$l0C%Jgb
z7oJP=lKlhD|9dQwmo@oZwOyDD_vFJ<&a150T5cbk+?r5&?{s>QNLJqRZR_l^-rZ9d
zd62wf$MfEO?+>bLDE-}S?_2!Xx#VT9xa)$2QP-dDvt1SvvHZ7O)hs@nUxHfCjFPTC
z{~;GxF8tnB!)c1tE{-Uk{akBbD8*duFAXltkoM$C<ZKi0*73Rc)O??Q@dg7+rP|XM
zTe9BnK4QE$^V($lkLO)AmQPR1eDdbCPD69kjZZsuv=uHSeAyiIZqd|}id|)IR-I?=
z6I6Zr(YwF*WcT{uq)NwMYphM1|4dBF3}O9MFzu6CjKadz?yF<3emKQ%s!;Mpd$VxK
z+e6ZSVy}h-^sc+Q=*(mG`d9H69&Po0@?ig0cIT8So0t5I(y%o4x!!jE@;l}J0E2tV
zhibpQiu|HEA+PKH?^DlP_Q}03eBNSwOM?C75q5j$)|zQXD_Kf;<<#OW+)n?|(F}``
z3=@dmyL-uePN}Y|6?fIb#h$#sUG?2#{il!K%O5!Jb$;Qj8TqAnV}P6p*FE+1&J)~j
zf4T@7FMsioA$t|q>8%H=cHY0>9{Q_)^|@koyHAm?ZdUuOiP_PqkaA%*vsYr_vsoNQ
z5uY+1T)DS9d;*u*6(R1>FZ&$k^C>jd9-klZ^V5sTj8WBg97l>{dt{!eufOo}{a@Qy
z+wZfYe70XW%lF)K`Q;wADXCrAiy1@GGG|5o;`7W7E8K2z?eg_gN0URQUbyNLKH+NT
zg`iKXtCwgqHXaK&JO7pVLBpzdp;ez-^*!fLcMIoyr#t&>fZF8A*;9Y)6kqQC^toNV
z!xZ=X@0cg~FqS{K^d$A_Y35T*D?$QRIqTFcVE>}lx$RrP#EYUa4TalI?LDYAYwstq
z^Ytx{{<iyU7ro-@d+YzAW`$?+hXYrh*nKvw_|H9=D;`3t-%Xu5)7-<)u6)bdc9|M^
z1A!v#(<0BZ*=zEwemq$Gq<2g3+6fDi(p={)uYDk}_#*oY<^3Oae|hu#|Ajg1-}yMw
zdQUwyQWf^(GTQY<B4@H`hu8as!TN@iVpZ7B`!CVdn^Tl=@-+8^XBDx2{rw#&@$+Uc
z5>dXFqUGv)_H6k%6PNiSJO2H!-(#<k`!aE{b?%Qu?Fn-~u}MDpxI;63^@=!&@3;SM
zeByX{X~v$pZ2WT<*s9N47IAz*(QXy-ki`ny{r~)b@reC9cgu;V+vAtkEOb~N|5H8l
zL&)lBE*;<B)J|aQw>cK}Adkyoq6oLrfmhd!bhlL;XW*WHf8oW?>o2Z8|8IZJUH{En
z-`@UY8y>;9=g(XHOGnM)n|>`0&~V|m`<l7!+~bg>)uo>;y47NTtP0&BD*C8s*B&8t
zjc1pe4$0`{-}PNM#oL!<rh?=@{;=Kcte^Vl{bf>}CU!(MtUPg|pZL8Wa?z)gOQ&2l
zt>}2J?2{)x%kOFAMbpcNeyE;Gn-rq+B=g7H=^5WI9zQa7TH5PfAs(y6Ha)c1`6uwz
zt<Mb_Tyq8cT`o!FE_k}WomG6M=F)&K0eLUXIvB&Jf3bD9uL^4r6+7b>#?^bwd*=GW
zSMBGGjAR}@ZoYEsroQckh3TJkT2}WIcui&U?d|nwcQ4;Clh5WG&-uc6Q(tHsP2bDz
zcVX%E_<)Zx#%!#v0V_j7UdOgSp2o9`>wa)r;<SBV&FfDUi!J8cC(n_-W^=)oPOD$v
zHwTI>si~T2uYKuZ(Bseg=lw7LxuUUn8qd<{;wxiTo~XI=>g)C$9I5#SQp3)u9+mAh
zZ7yy3S$5~)kM6Y&_pGH_viRgBt9sXbTKwC!H{tN%yPN($lwaIF|L2+?&r6rPuX<A0
z{lZ)>Q~JT#$i=N2i%VXfmA`cKvbyF*i^ERq71pL_Z@pD|U52~+VR8ON{{0_Wv))QB
zQSPsuAy@I=eQ9>=#tG4)H>Szms`<0-aR25_H{I=jyqbUcM(gCJs%?uL7F<}iK5og$
zhntrO39m9Sv~sflzWzUd;co@LjT2kDKlc9rCZAdMW|C9qhxMCPZ{NA+ys)67%>F~2
z*bRQKWimA{1vng-QcR<ork?5Axb-_j?UU#Av*Z5kwioX+KF#Fb!&<z>#CqMj<Ml>%
zMf2(&U9X$|$hJD;&7<fi^LIH-ycXxB8m2K_zazo_T<qcyBTe2NZGL;5JjEVd5|TLh
zyX{E6jdjcP<Ikr{1gu#)`PT1mLI3|HKgtX7<VjnsUT3~T-*NKJBfXzrIEWw2UgYrP
z<B$C6GWkXRf9~v8;A%T5p1E*kcm5?I?)1CDOYYgOJtEe^^0AP=)u(G$q@_|=(X*%d
z-KTw4t25r&bzvLRlL-Cv`Y$zqW!B!^{i1pPKi9&Ei_R9#ywCf`MT$E|<6Niq^A}s6
z|M#1+Zil+6U+Hpd<*cS72U}I=%Isx~O8U}VeYIqE--$2<>y1aUcnVb~+`Dk*_!*s@
z%k{K5BJR!UuYENA<%7raqK-@pqZ7L&b$u7c%-Z#R)0&87r`OxNuiyKlbk^KGVdve7
zcHW(>q1K!hVd1=E|HntyUpU+Uynk`xaeJi~$)fH8@%tlAcrEyMgxy}X_LzFag-3CD
z(^f7GVCG)UcDnw{q1j)qeg8jk-k&e)0~Dv<yinPjK3l@dd-LPNLi!udnb&+X-S{T{
z|Gn)JXKT9To>iYxf9BF?vhC2SP%j}7^N5Nq-{hCL+kcDv^)3GI#FtFLa~TCo@<b9=
zK4sli@XCG5|B3wF+%Hc3G|x!5Z|Lc8LXG{%biQmc-p+ezA?8&-O)6{avS(d8xb@Uo
zvy-1yy<)CwT)N`dU;ifk#m4kHw}slp>s%Wbg#X_4$EWSi@@o(3X6-0yJh$hUQtg}R
zb+a!zv?}F%-CnZkL0ak}!=%%C{(&2NW_b7ZHVc@Rz7^gcZm)d4(2R*?>%(1s&vUhf
zG)i9<=J)+vxw_|7ox{atVY6x;@4jNXVSZHAw^KFGf5z_lb?ADEf9|y0GW9jiXEsh2
zw6YR>Wz+7v_U@y!&6!=>KJ>lSyb)B;xUpuNV`4_m#wGc;9)0oS)8OLh<^TU@|1#(I
zzb&FaiL3N6KAaUfbLrESidWNTFZ}uX{}<O^*TnyGpY`iK{Y+$G?zWP<FPIbAw)1XE
z3wxIS;&lBl`-|rPU-dt|c|GmTfuz>ctc)M_9=CIt+w88ITVcF#v3J?T$8E2b#28hZ
z_Q&sTe0{L!^smID50j3tUKh5@t20YEcCdGvuj&iy9<6<Up6~ZRxUEj`P1srPq{xEZ
zy|GqDKbts-$JP3={CL3Je?9PO)%Uh+pZ?foqHd~|cJ)g`7Oh<Ue5rl4!lg4AOJ)aY
zb5HSCfAaG~-4grV8^qT9-SOo6iD%5Wnyil>zNSA#>e<g${lDpz^+C;t&(DdQ6&XGu
z`}G}dwtIJPT#)oS(>LkhDWRraJBtI1-Zm`jezJIFpqaor9!{aySu%^3ZHxQ$A^ku5
ztGo40ysfvF8*P`GV0w(}<HrxheDiHRc??$Uu3x`n%er~BQ`_$SV&t7$IhE^X&zbI0
zn|qwkE_ylM3tYS*G56u$guP2AX>a=1G*PWETIpFjzjR~HeYZl^5Fz{MyqsIzS2?1-
zueu<Ar&ilFi{r=V#`AyJ-r9Xr$=@SV$|oc6u&<hXdr7e3UZq1{r{>#v>)U=e{dhXs
zuI}{m9tW!#&2xjK7Z!aAjA&)hunRr?tMu{A*e{Fo|F2#0_umuy|MIDe4?9isy7$x5
z>r8)eQR>X5Mux8&L;Gf&eDk8!$|@p%!QqAX->>KHuCdcM>=KEtUs}^={<$>XUW7f0
zGg)EsnzRVLd0*Eib7U^L9%uR6s`jt`{|R-^w*R|c^}kS^`;~)=-%TEkpUOfa?b=U2
zB+D<}$erKmD#f$O;d{({{X5Z(ylp1h9YssERxoFt<yfQ~y(a4z*8-M53s>xzyYBw(
zZR;k)`YR^H)z+MoxBagA>czX|jn4d@4wZ>%kE+&xH~lL7uppwUZS}1sQlea3s%b&m
zA&;tg4Q9=lyW`ZUOwVV5F%$pjd|Y=|D0{}Pveqc;U6s1E6P~H957@GIzEZL9l(>C+
zzr+QK*_0=&T^AO5QR^LNHrKkVk^7Dv_W#ea_JgU7=^B0gSi8@&ig-S6PV`NPeRRJ!
zyI7t5-SM|!nfE6x+GpYGS$FT-zrRd#E?W3)kB!*IbW@Y3$)?azaap&r#Cx$F)!R>s
zxSsg@%)a6g=gO-d=lo}^TwtmtzG=xu)7B|x_WeEn;?HXR3+4O&U2hU7xf{5hM^Q$x
zK<E3BU+*?*O}%mG+|!~@p+*y$60Lr}`n*WQ?(^&aeOfv^2{-*WE;_Mf(xN3{LYiDH
zi@$t1|4+N>aqIr2-s|h#b>8%@2{|1!_4Dr<lXy+<Z-PwUy?$N^Q=D*YfBOWU4Tree
z4wb65EYN=^E+1%CbDpDZ{;z}PFCX&%U*aY1_F>jkr758cBc_<7FI?3)e_uJjZ@i_p
zSdFr({kz=E%)m{@1Pt=C-V1J*ogz{5EsRm-(t?lW0#o$F0t6OGOG-{Vu>D;$i_WuI
zqOog3M8!jbqs4uDc{#aFn0{2;e;s+bV*V9{261umr$0^1DgxRK4Zmzt@K=!4U`=T%
zePiVzJpKN%E1&i(5SCyGxMg7Si_hNeaQ+^RlRUq2x2YA()(g6+zvtPs>C=zuYI1VV
zV{pB3q4VR;zl|Kcd;fMx$S$nt-gDWlwNQPN?7{_8+!v}vUU^s{-YRJ+R-Eam=ppye
zH0iU*O|F!71^p@Ry=#4zPiHN4J1WVr{rxWUwLZ=5eU}#=xAWQOF`K1rYgA;-uboer
zSZ7;H_P$v@bK~hR{qz4TUlKTAI+dM;+h}e{?EaU>S_E1y9AWoj(cCUjvf<VJe-F)9
z&SbsaUiZj+iKxcRsZSObv~=kt{N|f8VZra;c0X5dF|k!^ZC_V9;Y5_8;`J}TmOPTZ
zX*EkM_eZU-(Ig)Zw=gYz7REJq-LmDsb2|1^w*|C0Sp1y3-ouGuil)fhM_)`|-T%&@
z-LrR+(Q8g6>Er6_<gOfZXf(MupXKGxdtN771hSYIqh@CIa;-a}v2up*iY=KtuCnaC
zTQk+<Ub)f9Q#0mscO5?ee#heVYNZ+n6EY6FrS^6lsVe7q_FSU#nDs9S(T$rXFFGpq
z*8by^JO3@T`)6i5U%9zGx=T&)e$#*Z*)a=eepHmQ_+-($=clb^*`B!#MUQPGy;SCU
z1r#NEMdVNPvop8zxmeM@<6nc++VaZf!B4Kr1&IC(tqboCUVKSd<%k!r3iFKoJ<ioP
z3@6B5kei`to_Tf8r^~x*yRJRaJMQpcdF#_1zdsxn>DfB*wD_cuvz^}g7cR`au5sy_
z`k|s%rz(H_s{iYJN^$j(r>k~%e^?nDbtk3S?AN+P!9$bEX6mW#$c+1W?Y`HotfXgN
zd+#wFP12pqJc*Z8r19~+|1aaiGnYrdxxf+962(zcbtP|y`qZf`M|ro;UGikz&T#Jo
zQF<aZM?ZcJPBy9h%5;CS|E1o>0s(#pQM;&_lRUdGUE1m$6mVTkY?WK$szwQmi&DZY
zA&!erNilKCzmg5f?cSC-Cv)#_wn-gsi-rE5STZd$?~_*RBHt<LSCU`6(~W!*7Hk|-
zpY&r*$gIP2IbFX0>i+Mr-tN1q*o4b#7U*?vS~+#olo`9#B9pXj%)5<~A3fr7i(c{l
zg7UK21=VMsU9(kuHaTX_wAac3y1zYx)^A?@>`h*7PU2%<-Hi%sIuj$@bo4hW==n{*
zp6`A!mvxhJowAWkj^xfmNe4X>KKCsbzqf;N<H5fD{|{fecJU;)t)ke{z>~omFBbRp
znQ5sm%Xo68|3&Znf6TtIdqdXiv^i|L!?b;~rQ#ih8?$H4nv!s-RPf&Uzi;PXyrUDH
z)#kTbzGBWdx%wv74-KmhO`FxKRQle|i(S6j?N!LOPd$eWSsPV38B3a5`B`WBs;e;c
zRUC7h88_`J_tMU4_O+))v;{Pak{uZr&hgbVbdm~ft=HKw(M_hqMDUgH_03;&->qPC
z)2mbuxWTbQDfP##r<b>E+M;mko>SF!tLp((4%P)1&-TTp90^{Kuw>@9#Vd-t^<?ip
zd8PH_(i)LvCk~%jy>)N&BV+x#ulp~YxH<XBw;xBD{MW6yaJ5+d<)@X?muQH*|9L^#
zpF65|>(`*~{~l{e=ge-3UHV;0q^~?^$I|wio)rP+#s{9eAKq4diSfdkg<fjYjx0Fv
zt7zdjH%+74t);=u>o0CkFv;`qb&Tt7ev!s>ZN**jm20;f-?(+zjH6^z&dMng`<f&B
z1w9(GW<^)bw)uA=wmi1<y`9I#irpN`mhR;IlqS^0F>!x?`TNDKFAe|wTv8Ajd4k!A
z;a$($ZyDQTls887Oq(|CNqYC@$tK2yQ|11C@aL4>HnmKv(evN;D<>ocYxr%xO71Fp
zChExhORV#^P;v63TN`wOPR`Ss{!`L@DU;o?{mwPY^XJ_EGH;>HgI%Z7jZN$gov!Q6
zaao`J>PD$c=-YDMQ&R1}^{-rUym@5N5t9#vyJWKO<Xo#N3}kMcI)^{9pu+48^9LKz
zPdjhl<KD6C`f35@O_LMmh6_wia!oSPI6gb_dO*k8KQ+Jm?OmV8{Z-f6=*0hFPGkNX
zRX4@=|8JZ>W%}vpqy_w(n}j8pDr)u5PjEI)scrnk#;F|ayj<nMUfpid$Yh-*f~#N4
zSZH(#o^0hb^mrF??CRNPnzMa_i=XR#YM-5vS{Nqex{Hnfde+oUX}gMT3m&di>6x`A
zcWa;M%f*LZPTLhQFTaMzd&Y^l3F$#R*SmuKSI^{j-aJK1IpwSp``WN~ll3~%w0>uq
z^LXB!;d(@q>q-63JLd7Gt5zLzT%B^FfK9d8MSrQpEB^`Vw><9!d|viWYEJ=+qV2&G
z)<)&CN>{9_*>h|czj$8OYkg0~>1jfbr>;;ql3mVU>u~=2dt0xcK~rl!ie=ru?)~$~
znvg#B+0`q!#HH{5zjH*?RrH{kx(NG(<7HFb7nky=Hm#X2x-Cjk=b=>AyBDI22{YI@
zu6d<JE}iSNvL#7(%m0VVU-mxV@A7W8rod;>mdCb_s)W4ft?%@Ds;%SW7_p<DRcXSZ
zusd2|ZUTQ^pLjRx@$a|yN&|!xM7TG&X|I`bfOD#NSHIy-RuwIa%-Sh8PpsiqY?NU3
zkP38M%k^(h+TRmzPcw<${&?xl57Ak2(yOF1<&0%3wVT8~x9vFg;br&}Z4sju6{e>V
z%IR@``Q}!9I{upH@~+5@^UtPem={f4G*O_{neo&!E~Doi&kqO`R5RapQrz+V>CM7Z
zYjgtK|1%nvO)#sr?#SK!g86%M&X#4{@;c8>`B_``){e(j{Lj<+pYQk2I<L}wFCnD(
zw^LA#M90>y-@ZZh-If>TeVC%Cd+9>6@7t)AA#2X|#1%MveC4<OqHV<lF*SEhiQH+m
z2VO6o7B}Zo$?{<CO$R6W>t+2b@Hsrki)YP@^>-CcXjc|4yeyk5yKttL^F_wS3nJBr
zZcT}r`TpQb!NVNCg<RJrEigU0==h$-6)d_385gfAmGl*vwxXR?%<}L1Uv>iKw>u(u
zPE`e%+`Q*8r)TyR%Qq&!I?BI(PM;9P*5~0k`}{-I_%+cxmj-;D9kt}hC!w=((nd3L
zWSi{X9f@%?6zz6BwTR>0smfUrmhOA2`?>@ajMrY1&s~@iJ%7>jgr}Fb|7V%|@89+9
z8Mc#86&Uw7hxRnNDeQOH5oz|AX|ceL-Y>Irw76R>&dgKGoxAr?%<7po9tHMGr$5j9
zKGEIv=QNdqDr5UUrQAI6jXXt?qTfIKY7$yv_x;y*3D@5I)3KWJDXUCVPUl|bT{$y!
z@`@67H@SJTDKj|2oL@Q$HnJ+*y5r?v^XPeIW}Vj*ldOzYhxUdp46)K)XCTx6^Y?}G
zf5e_%^6ZpedB*DTwpP)3io1>cRmJWsbV!$Nywkmxe+p04tX1|dat6jzK0W!;D%0#P
zZ?EC9aM$EhN7rzKo=Ltx@9-8IQ=Mbc!Pnyy|9@HVXg+W56^5^0>fJ6_u4qj9Q*$t2
zN>KOZD_6HiS9}e+$RYjIuuw5gxcJE@wwnnnHwJuLpInil_51R}hxJx3`vi6<H8S7q
zU!zbMpQ7<(r&jCjge#%v0<TI66nWqM!ecRUou;F6d$h;VFF|gcjOiYCS5NIsh+~nI
z)Z1Qv+i`38J%hjZ1J<27sl)Ul??o8L$$!o2E%&)3jX2_*Jv^tbe_GaZ>B09&5wj+{
z_Eqt4dR)&cPrJ<8Jjt7%E&jsdFYoI=>`HKzXWw=q;7{8u-i=qfGc!4RteV$e5zAQC
z%F!)1MXBL?yL`1<0CSehvWOp@375BTvJbI!TscA9>2TjOzQWlm;%OP3_HXy@)-<$N
zbP{2@U1FN^=}(v4F(#jB6WXm0KjxosUVhbg&7E@t4Nv~nnKkp+8q3vsN!sUij`2lL
zG!0`b4tC~>jpRKNu=iZYqf62HmnR;#*K!j4YT%K-uj-+$VsA_ICYC3cE~%D$S$S0R
z*9HIoYPP?B{_hR?lb3&eZfm*3^Q{6sN0w9w=%%ifxNd78A6XHu^7~Yxk>hXQe(t2G
zm4~*hTG&+Zo#n~B?mhnw<uY$EDfGO>a^yFE@T}{Xk30?DVo*9&uI|}$joEP%LlRP)
ztt$2<>%QG{PfhdWF|KFA&zZR<HznkIBu&%JQF)Y~cW1NJ47Z=zKl^sBo^Z5tf>Mv7
z<DwHrI%3z}c$mFfV$b)QCv1h2$gBQsSIrw1=?DB3*&<z&kR>wd^qRR{X;JrgOU#ro
zPkY$FCp$Z^%5Fx%f4}pLI-3jjH1pLynBN%C>88I=(JrUJ<ZK^5XOd1zn2W`^80m@s
zWCfTUILo;dBb#_6op=0u(Q5wW7e@nk^O~1=i7)i0XmzAlGz;GP{=(SlNrf?EhUv5>
zX+9_ZgZU!rhph76y_o#PKf+@})Am_P+PxcM^j0=U%#&O^u{i(2nI|g(dKNEBt}FA>
z)Tv`zP*}UT+Jsm0%ua`DmZy#l5vHxSs}8-c$=q(Y-s1jmyRX?_F2?^X|MK$w58Ez7
zr-ss=@0yNpBXYV6nVwE!IwZCG$Fh_Yo#$^o6;zA4>f)t2Y5m`$@)vX#>woDv_%B>C
z%Q5SvT*{YE6HMf|4HmIH<$5N|GHb>E$l1sCgeI~+<as4@=KGti-6l1^QVTcU<z`Vb
zyyqonyE=7k*}LkNi|eP0RrEIAVtx15VTtQMTf>s58O;~j)sAv0-?`<U_vM15{IZ~{
z3mO;8FZj!EtGn`Y0N;YIFVmm!&NE)ZQGH`Z*2`PIiYi%8rY}9pu;Tkf)@ujdc!Hj6
zPydj)UH5fEPs`!H=~qA9S(3#Pc5cOzg+d}VxxMovW4*U0Nw>KgvBygvR(*2Hd-Lq7
z4=i^LvP3$za@;jZV(4OusTY66C#n%Wb(LnG==7VF=L~9hp0j>+Y*UM{l!N1kSj*p9
zPlL3tT)nHRCo|z);^l*1C34;gJyrVS{Nd+)&Tp4Y5BY`i?2er2d*RFr)+niP`E1_>
zkF4j%i7dNZkZr&9+q=h4pWY4nWjxFF;hq=nOeM`fn0BmBxaiwAN0j@T_Q!^`xfU_P
zA@4Yp`r~T6MT+N$vR`1olPtMIj*UOSv+HNq>~CU?Ph~r{UT-zI)D-wtHlcgh+Uo76
z_;$z6x0#>+;KE{)9|wM~{C|Mct%|YB^r*^YzK!bBvtQq=7x<76V)toZ|HTIfAOG1i
zcTvkmw~$pE^fCla{lBUI=l-NQ7w%m1jJ2)pIhLj|Iby=rI1w-Y-fuQPmIQ3u^7ZXf
z{(o2UXML{9X5v53ev>ij{LYJ;o2EQ;b8g*VrZ3X5qhaoY#}jw;$7BU&<Z<;JOOo9a
zH|v(_1AgWe#UBLDyG}|?_WM@Xn!4obPT@U;5y5_DSt)gm_kuoev8fBoDp+vfx%#@U
zgIhP5_%EFm%;C3j{lOH5eY>KkE-jszyH?g9^-h=2&V`0E7tYG>dLzKbcXY)9%NFhc
zW34qg#a!JV?p<>@zFBU`<(BGnuZ*qC6R%ad+wGmD%$^-u<hoMhEO*u-mxQYl*>PMV
z6HbfYsmxwDC$v$n{KdJj#`VU=cICl)YgdY<@A&*Wdhxe;cefZduWNA4%FJEL!9D5c
zPu9pS4t)zwpGytmnSVTF>&ENV#~&Mi-BaggZRuvKynLT~b)VfD7Hu)bd;<=y1AnId
zQ%;I(O)d<plARJc>&BK!!E5ptLKUYks&KcDJ}h`jZQ7E3OeeTYp3eRITV&=FF>@Xf
zUzK}$Q&cqcTxR9$S?n(5qbl}%#mc45B6qms|NfcwNbB0I<_URuuP2&>*a&Z$mACxr
z#v?%y45HdyvpH8TJ;63>_S|Ix+Jc_1_l73+a+S`rHaWZM!>yGmMW^1T?E136B|x@s
zf&Hdm`~EEdKhN$f_kY{1+qZJu?bIvzVS4kpLCS=t=u^vo>|OQag|hr#%c`$8_fIR%
zGp%HE_dIGHZ+zvFI+Mhq6ASNKJBzI4JK$$vTs3djtlLW&N}75_cHEet*>*$VN#v5H
zozIS+3)ryIyK3(OIgaAnckbza`7&ek%#Dg!Pybp~{4mVivuv}Wx#b@-?Yn<PZhvPu
z>)XS@Z5R{eP+R-^@FI_dDX*gy6k=0j7A=^%e^*S;k?fo^*Kh17wc4&A9@%Hqb?KDm
z#D{Ix8mU~@?kg@lu;SVoBkzA3<;?bS{n>k3lS6ierpWua{X(+brnmNa-w}M#zW3Fo
z6E_aEMmikG=UL6j7@R!!-_@t5PMtfh$Rlhhdg^=5!Ifthao#;Xx2N%h+vBsMnR$Zy
zD~hw*zj#M@Jw0kAYxUJxY#Fl?`@EQ0p^gFfX6Q|Sy^iIF?yrd@MvgaQCRXv)Ik51C
z$;Q|eD=*i$w$(joo?yV2A5K@U-19ztS-EDu^o|=#*j+m}?Rm#%_sK+FJmBvg$BPHA
zWi46Ry6d}acuhidja%s)x3#f<H@!?$Y~mE#IHgnj`O_KiV%b$bRKC4*JE){w`<)1f
z;D>O|B3FOT<)61bGn#%j;QGDCrQvK-f|tfTe7^qPw>rhipN`7+O*VeF^vnfG*QrU@
zW-stlo9MxD@!^xJr@#CO|KDZzqjP>(c68LIT^X5aK3ZFqH>QcLvn$MB(C+?z-r*@0
zA4OuTKC^E>vVdD#X5B&_>6JU&7KJR!dMlT*J}c|q#5W5*{&LxH``~AWx-E^i?5-14
zo`v3F%G21f%x2+^Qxe5huT0E7_bjvdr}6WU?;$2b-btq(8eg%ki0GR;d)|b$_(ZWi
zb#5{{gZw^Te`}@kF5?ZagzwBFHg_jj>}F+TW~uzE|7rG{M$_lhqO{|lFExob-|V(8
zQdc}C#CcEu)4ZZo&zPBd>=iF3>3okqxijvmdd*F@qYK3MeNb1L5yo!2mCb%e;P=J%
zzM9v|Z<*|B&)I&t_V~H}XO8b2e0JSrlsoUYM{%af*}K&&KNmjD+OgBO&sXPM(8Txb
zPT%rEKSyb}JZGKi^0!6visA+_xAUi%xVL}NnwDVfyP<QfDa$5j>3hn1KFs>@@1c^z
zGA<U0HEZ`BWag4J&iY_zb!}URokGXK=&QTGGkRWaxxHX(zWiB#p3iK0o0m#Ht$ec}
zegB8~8t0{zCGJ_AOIWj=Z)s}Y*I&<!JvDo!|E)@VFA+8;Hgw_i2#v-5mKk@}N_1(h
zS-tj^Lq+uNrBNa0gHC$)xL>Wf`YO-kLqX#=R>|may?weXo+jJ>j}{Wp+fdL|{!WQs
zBQk51<+VRABomVv*l#D>|I_YywaKLH-;-T)(#<87=ZGjquUwffudOKNlxKE?%hT~J
z=i_&$1$SJD`+H41g_qfsyUHZiQYnU4JNI^uWzMBL&WxvIvQF7%$+Cax;4zb^QU7^A
z?`3uTQt$P)>iO|3n_hkk%081aQ!SKz)2-ZfZ++O-L?&;lJaZ&ssl%GBoGPC_xYy14
zX7gjp1&fFO?)EtC*>`u!`P37dYc1x!3pLjY-N_;H>5zl!>sKXuo1)Lo{;Ux8O14R1
zm2O7oq8w4iQr``(%;J9k8{3bB2CaU@G<$6n+Yaj^vJcAc@6|MDe%aBy<fhfZD5r@L
zRdsHc3T9XHtw;*V7MU#4*R-(I_>02skRMA5j$Gx=pU_;-a)cqAx#)T8Y|qQ)H$=>p
zq>h+82=dtYiQ)09b%*-{(o*AeT<^YIu<qYp6Vs}h_kR5|ugI(Q(##WDVdj&lbj6JC
zJ?}g7)y_+n)PMdRd34X}SaBXFwUg6yKE1to;KhN(=RK+uCDaPIub)xjJ#H3}cr>4P
z`}$|b-Pc0I!q4te*U)EqzR=~<&!&Lhm;@KYf**lae_mW}%G#VGDgLQ)+a_nBFTJIF
zU8h-JE-#oVSN|!vN9(vmr{4P0m1T>CR!-8tq2fB*SXlVV{^tUgvcGJz1$%EC@6FEa
zotTxQRDE57O>C3n$JBLOtTLD6q`fzlvS+)ypY?r4WW(QQ4oQ4msfGLZ%nJzVy(OXk
z%hvkP*{=-K4szQW7Kc`uMaN#wiF#c9SWR2h+i5+6<8~8k&)VO8LDTMwuc<BYi<JHS
zA!w=UikG+d&1P;AV-kO}`Ov>p_n(KQtz7zjLFCTpwcJGomW^JA4Op-5sw*}Y))aWZ
zF#E9hk*6geCdyCVasAU3QA_!tW?8xW(^{P^t~tH`|71PK{mEQK;i|<v8VmPs_HX%n
z-TwdaBAq`!#Wue^yC!_gldE6b^7?*A{#tN7=F7zSe|=ZVHh5nY5)0s%b<<D$qwx{%
z2minSI-K-3+3yrDOI=v{{<jjE90J$(7>3<*)e7h3?6@TLrM>>})YOTVO17VG?*EtE
z87XV=kww=a$XQ<G$gXcTAMCQ;-&AIu8^#@{@TmX)ulE;=>%Y3MTK`MUi{+R`-_D|E
zs$E7^Zt*{7E$<YZQF#8;*_P99{C1u&yKFuC&zm~Qiueito$^-AURNlh>%3B-LoVS5
z-?YfX1v6#^i~rwhGWB}Ssx{S?0WmEPemuG}Wy!{}4WfKY811)QSsY=j{zLg}g-l<y
z1FK?)fzb8?rIS5wrZT?gb747}^szIW+eAI+;H&k<=dEO3i@42<%zH3}%Y9bHhX<UW
zkMnVD{~E*?%d-7dQcB{BwA2q*{Qt1AGTD9lCO@TT`j<~@ILa0%)*HCo|M%#*i-Qth
zgPdURn|-q_0~c1@(aAA&Gn{riIW;R{#lPL<@<y%2xv~7yzFHqvN!Pi1Ks4=*#%ku4
zl%%Q|?{}t1wH)JZV`zG{VC6(D3AfJpzjx#>=>L5u&wYB+B3H=;k@M7FUgS$lGLuSL
zA;|dILCdqh{#E$P-|_#9T^aW~uI*0>Eie{}5eR8MbdF~~e{%c$?{x+Y_hmz(6n1~%
zo>f$JM#=r`LaBY0+Do#RektX4-_q@u+syC9c5UyQ9pC4DpU|1VM~f-{!-vI-Y#v0n
z*58xw>-sQpT}PUfcHh=j)8Bt{n>gj+EX8$vDd{bb)5O^CM^{z4^*LVP-T6PLAbr#B
zb?W*imyb5?`LWNoUBy+b_Si>mbEb)F_a<%4pJTV`5&wyf&ZE(-?>U=Zow_+WC|oJV
z?dhT;-5)+r-~U%t%JP5P5|-oz4n^9BBD6k9?(}}<)7-6fZEN@>))n(!y$yIWJ5BY^
z*Z0yEleCtW)~Z-*Hf)%_SavtZ8sXCNTUPHpR-a?JrfRWc-;esga>^3~!=9ZLs=xjF
z0ej2F?}tu`x3)5@e7xdu#5~!_RzfD0!sf@>-n(!5=%o1S-OK4rPCIx6tyfO#ey?@k
z!szckUM`m3BENla9QTcE{yP6`+R~-1o1f(>X-6LpQaTmB`nGN3dsC*w)v{so8pn!f
zw(Ml=W#c}+MAkgGOLzM5yD>Y2c%Ed7-`o@{vEL(hcmG7^<_T$sUA}uV+||-**)Nmp
z9Li9x{BixC!xm+UWnL|3=FR)Q@{sT81(AzYbX}ScsJ3jf7g%KLK5q%TTy57fwe%lm
zO{*@;+<$)QO6bFBPNpAc-~Y|VeUQ7yqULMEr?3m`K~~p=4~acF-tT^HkJ?PL*H_Iv
z{Hwxj3ZfU*YHfPq(AYHN`mINM-tP52tn_;FXC>RnTTiln?XuLE;e6!6nlm~_j1S0v
zyEFa&B)RHm%QI3d=l%L-@6p^Yw=84N+(o)`h1N&TlA5^c>z6|ordzjMOqT!eTJ===
zf4|q&dk4H47UgBWU-a~6Vdqi}p>yT^dsc35t2=H#xoDx;y5u+UUt|xxpYu9c?@pZR
zTHCT;S7+|~e9WQbFq3Q5nut$qxl!ST&toHW?yR;vd4}`o?vTQ%&O5gyy=6|zIih${
zvfyB-`NFqs--XQXzBn3u<<d>}-SQRk+%p<DBu>kgEq<`N%lp+w|9@KC8_Kp#TYO1>
zX^=<Y`F&=W_A2hI>kJgwWqK&K^yih+N-`7cx^}iaa9MaSjVaog`9Z<Qrrt)ggzN^V
zzwg5T2SrRY_sZXTf%9JUj+IjbpE-Z|aokS(tBQx)hL-=^SSDopEchX0Yv(jkjLU7d
znduk9{T^qJSvw_bpV98J@c;WDvg-fw`e|uy`hgvya#@pC9W|*`G7M|zzkKFI^b~)6
zZYAyyrn|n&EnfNXviXI%4+_1O8i{(Tc76}x?d|Q#Jo)0{*Yf_;HLH7%+*_Ha`)0Y4
z^wwUT+^_SFxRfor`q#*7>7ix%LU*rB2<OZCT%G#%!Kw#Ov!pFlUUS$4FMOt_C0gvX
zul?U8tuSYkqhj@Iw{6^-xsWs7Kxwbif+-=J80Jr38yeuWM%3$&<596c2M!7+<yzmV
z(^}}h(^@O!d%^6r8yIZ=o+>W+`DL|<eP!r1E1jIvrOf~Thh2~^<K$W~Ava80?Al!3
z!%IvWv(q-OQ8}!#mf7_5mm8{5mcOn39(w=BJy6Md@r}7oiTve~&qO5SII8kz9JsK+
z<-j8zRi<#(pumeguP;UGpOk6lRebT;i|h5BAEI8m=YzgKP|SL3@AX(bZsF9QkyRf$
z<)3ezx%}nD)7c&3fzN{{^T%u|bi3|Yw_Lyeb-u=A|NY6|R8P39&Dq;~@9l05zlmX9
zlfv{SJnWnBvU!@t^vg|GIQ$OXWysU1zGJ_5f@l6Lzg0ITo33=*AD*e>;P@|~<<G;k
zunJ49r$JLL%`q{o>DyJdGDj!YXiC?m`PG{lHhx`WyPMy;OsMJfhO#0L)zs7SdskoQ
z`*O-dWt!%06X%QH>WVC7LktDjPj>v5JG)$OZk6k<-;sH0-M%7D4i~H52z>2!OFQ53
zY8ngYvtuiFtLBQIc;SBkms0Jc>Hm9Qp1O7K_YvC$Cz(8T4HFTKxT?>;qpSR6m|fUX
zn_kr}`M&S(DSJ=*A0B&}#R4BcC<|1bpVE3=XXCDzBEOiZ9eNd0?S5R|@2UUi?0?NI
z)?z}Fy-F_oiYK^ohOBDVz4<iH!2MnQ!`-1lr^}l^O?b%lsp(R<VxH&YZP!*@=$lbj
zYW@4wKZ%0EB})$mrq-5o{@NBW@s8fyLuc21z4yGldO@24OOb7uT<6TduG06*Pv_T7
zUmLOC#O+Y6XpyAiV((2`cisHul&UY#Y%Z`WxQXKshnwo|)2A*)^+xb`>FQnJj{m)9
z!}&!F!W)Gz+&k>s+F*6=rHGv7+Ivo7>t-D@+aG;6$|bV0jr}!m+qFCk4Q7t)9ghoo
zw>ItE*t<4SOx7twNzB-;C`_wckU6Mu?QQ)lN8{Y`tCkop4}X?XSk$ur-2I@XHqY3<
zw||LSuu{>jpu#L<;o@|!Y<K<jd;RRb8!X-vsP%bq$%5lm(d!qSNU!@?{_^$w-}5ym
z#|Wq-UwxX;@agahk(CqT1SbVO-L!i%kE`{|ZMFV92F@Sql6=mVy^>m085i#-(7e#F
z%l^`;U%tv)gPi}aPGi6Lek+q>>-R@%I7D)O-I~Rhm>_s`MV4Kc+1Ae04ynm^&mLXt
z=_P+BWJA!w*4Akon>DUQ&l1aIFu!);<#bh1fiLgF-oNgRaVc@;&vPzqFuwNwSo`OP
za(eUY&Mvuq{fuA1DkF)5uR>S!*7qsATf6;d=<!M>!Kit&12XsDyV}y%)~S^cSZynp
z$sc`NMfqfqLV@Vh8vzZE4qLZ)3rw@k2+f;4=i(c$jL`7rrX}g;1FtTw>(*c?&Mizk
z7{K6t^rgJ5e>K01NY%fEr>AHBx+Pj!q{6u6J5SK}d+eF1@1%TVswP{N$u3%M|2z82
z+VlSx?pR~us~D)#p%B(KZLe^0_|o}Z3mmF%->+XhOFVVsJjKPkefp}Gv~ayYd&eR*
zm~*nmg)oKhVT~4=J2xrJmySA^l_K_h=ZaI(wj$l#?`5tXx*PIm*2_(t=0}%?R~8j^
z>3+#vxH{wZSB95z_PulJTL0)AS?cbQ<k>T&_Yv={s;l9p8haxfq9-@37kXv4ahfh0
ztGA~^p+n}8$Ay6k+ncWyykGDgv?1Wiwl$^FS<|G}guZ5-+`D4&$K<6B$`87}MD}0L
z{uchzZf^Zw>yoE;JU7?A%l$2XWiN+fl1J3#COy}?x35(mDd-PS+I4fDDA&vA`tOxd
zaWh0&)n7haV{kEe$<k_vbG%0^tu5W2$N%p8a@FG3zkbeGb~TQ!BQXy|vfnNX(8&0g
zms})ud&b`K!*8#I6m=in6L{a8E#@H4W@X*d`W&^LDmp8!Uv_z0_&#A%Fbmf&-a8js
zIGsGcYwSwBcOb65A?oI@>@_L-to4GXPHeQ3pML+J;MvU=7?w}a(@hc2cyYyBX^rwl
ziM1OZ9Q|xjcBMXNP1cSpKQ_kjuFz?>-@kKb<UT8zzT2;NC#<OA(s)&Se7*?Rq_0^^
zc{VSq(LR4;g-^|zl*F0;57+;_|B}1@Q~t}<^MBWFJd;2D*_~JO^EeYq_Rrp3RW)_h
z?N`>@l3XPm3>2>YKK}o`e#=?WqcawI_(c8o>z$L%YVH2;S=lS88|rILCIl9+&z9(w
z5#!T5bN0&*4ee<*tc!KG{6Ek*+eqU;Yg&Kx!-J1XgI93<4N#oCK<h=<mQ`AxS3L3D
zekbgKsbibl`+Lb(?%b=t>$Tyyt+d$ccQ0DEn+dqBj*VIorawEcY4<V*mB%MsKW>xb
zYB_Z2?j`BI?n}(k25Y7#DSAi7)o5_Jc&$JEX7wgxE+1BthgwZV8|*f`SZL5-_90(^
zUpt`gcA=8*)rUK39Y49xGWX4!;Ilbe<kGZkekQ4pOxr!LZ;HJ2`K;P;Bc{^H0s@|#
zrjM^}ZYkKav?J7Xr~9t>xQfTWw}`L2*5h(+{-1SQB;8I&i)1gl?{)s)<16P@u&7MU
z-OcA|Zl^IpV!ikdv4@+ymm7aQv!OTdwXJaRj`M8-8Er|E^72eCc`x6b75g&p()!;M
zO*wBgepcCRq+NF^>gqa|{nxozw(w^(O!3q)-LY{C8+VW~bF6BhLR|feb$iXv@^mcf
zV{EB-@$$mf-y1IMKD_<z)$QIfUY6TT9J8C^I5eK^j%4fR_!<4>_hJSCuS35aZbWuv
z>1y3PCagVOAh%ABBm3pV;_mCK@4sft$l7Y1|Jr~>+J1J#g3gDVLo`D3|H?dTnBcxq
zRbc6bgVnVrMekH<UvvNWyfe9D;sOhS(5Hvf<EM+<`<dP4%>9Y&wa^LPwI$3>LQ#ve
z4?oYS$cWI1sh!-?SRUMa!kVk`!=C1;lJfZmYBuSYlf^}f8KQ0-y2_ya;EwkFpxSvq
z|5}!$J1c}4v$~#qQ=j-->HR$J(~8sNn6@P>ZS9Z$si57JDrzEeb<>4;$;HQ_tXF1#
z=tz;hyLL+4kr=jb@{51o^laR!w{6~Y^|p-j7u_psf3`+ziuD@(nz8Wc&dk)<{IHbL
z+p(6{`;G5(PK=%R*fPGpk9R5O86Wk>)85H*oqwg4S!)p9%X3<&WPRw8aQ;a`d5b2B
z1TOe8D`E+Y#ANNORpDoE&rRR(-O1DYsnueYCEw#}UaNMQ9bNiaZXNq!rn%pb>FxLR
z{(O0o>WyogqqT0>|2(~4S+X!dZ{?9qlERz6|Nd*`a#J~Q>6Ga?JNy1IA5zkt`r?63
zQz?h{_9#7%HqJFJ84|wcx_ZTh`>Qz)-DA9PktZ(c9`~O`et$niS`|F<^sIQWUHOk^
z#Z0aGd$I4&*S+cV_gEdUi~H}bg<F^&YP_v{5ctqU>)B-!V>=(++}JfP>oy#kF~#H_
z7x%1*-1*(nSA;)sF&UaYHrhG=K6kxJpn|3Qzlh~uj>q}4XKgq9zG2hDuIxFp-KwNg
z0*_j=y}0QAN60tc)<0M|J+tuFtG3LGm)az4^(xLTSk4|)v3ceeC-<v|wmoB9r=!3p
za%Jb;xT?3-{}tZxmQ2tQEB<qj`HJa=>Fa}+z5J-H<9|w|=cp^Fu=*RD5Wv7$`PXi;
z#Ff6C_xkm8mNX^*O$mF}a?D<)Z$h9?;LQsj@$;mn&H25TzcxZc`2+igbzVES6e&kc
zeYvf(z@JSgNF=d0u43}KdDfaMH$C|zX!$oNM*XkS83yY+5xTN_MY3NCq!c{A=st1n
z#JyKGzi%ms)jj7o`TXleC0R3tPJ3_3{@<KryIA@5kEz|OBzf!q_m#PCn2`O-W$s}I
z+lIW0TTH5EY*XgZU3&3`q~EjIynFXG^LwuEOZKmu#Ao;AiLc0{W|6>xUX!p}we0fC
zYLCwsXnS<qODV%3uOPoem($AV{pYRkYkHrhA8VOW^x#2Z=Hppsm#ml&F8d>G{VG$2
zs*0DJ*Ujv-uIbsZ`<Bu(yDy2F*HhO{37*+2)pNbcWOpm$YUj)aw#xF3Rlc0E{swOQ
zGG2f6i}|)=IhV_(wi~zVpYGK6Vn0%(s4t?fRlV+D=;3%{ZR0J^Z~PA9oM+uS;lV$f
zUq{k2603UL&d*;GFd@*Ruhn&<%Wgh<pOqn#WabI<_Qy<kmQukda_#OGtLPa0=+g<i
zZm$qHbx6ExO_EwGcg3qyKc%bIN?O<C_8<4(``h26OJ|?F{LT}nthTNzOjnFp?`@v!
zWxB9|aq-8pF5&RK^^=+8u5Y~cq{*0D_Vt6L*%DT&*Rt>LV?S~B^^UdW6MlV{pS;ZL
zU&QQ`+{m{aA!klsQ~17=Z{pX`soUgVJcvwul30=agv)F)->2PChK`@Z?=4CyYWtEE
zXXJ5Y*H*=+w&lqO?<Oytu)4=7?*F;)jI1XzOQ%0u@-^e}vgUy9GM-Bt`Tv?kuk82O
z-)3#9pwMUYuW(_|&Z2jvT<(W1h4NiJ>Mr+RL-)LIkl9Y1LyvA94GvOg$o`u4_f~I}
zZNs*u^JKmsP!QfeA??}x2fuG-Pd{2!cIP0IpUU<vU*9fHbDL41fB3`fnNrI`jCSVb
z2xU8F+_XJd72~$*nd<4&dwU-px%&FD*ZWXYUBAFQ`ybElUlNiQeKEUlN34RxwCuiE
zJ7?$R@e4zeT8;LYHH0u7oNz`dis|;N$9Am>LHW-V4?h$W7nAZ{=x+6;Id7)dzJNI~
z7v=0usP7lq-jTNa++BX=nfek1@q0fk{qN(gGv^|A>{qG%7jqkX|NiLz-&G(MddfOp
zyvfZgcW?E}#^rX(Co=Sv<pMeyQZ}qC7C+m|fAP{8)2^*$7r+1i_xY>X7LGl6sVlgO
zj*Imb-YXSR+UtACdyRwfC!Y<wCjPo-Sa9G~mhKDB!YOa3C<Y2Y`FtSwzmJ*0Gd3R9
z%`5nCIVg5_b1{~*dvnR1-npfyeAA@zU2AzZzU|IAc`S*UeTsTm)%z<qQmwuo&JQT}
z*VpxnU%b$G{X}~ap)WH%*Lh4oo0Qg?rr!4SeQe(Jl!Tl6`hMS<6Ux$MFmHq0>aN}>
z^Hr)vKNg8(Nl(#h$zrxx+SrjRct>7?Wtz2_{2i7PkL|zz>Yg;6*KvbcgO=>OQ>t99
z(Jx-k|2bXgPTcL}Bx~m9TyBrQd@#0G@6fn&Md|9(&%xJQ+Ws8MKEK)3P9>%4{?AYG
z7Y<!nvE!~n%C<|{&O4Sw7+Sn$s`$HYdy!xL2R&_pX4Xx?Qt6F54{rLk)Kl!%K_?IC
zt}<1HwbkWr9*Z|#p2+{lqLf!|(U(Iii!JrF`vo^Xx|?@?m&*hPi4{r5Ym;mj%-@rE
zsi67Ou~+B!2_N=)?^-tPO1HtL9W~E*e|-!8C++%pZC0<>9T&~NIc8^1WJ=oBWnMqn
zz9RiPqv`Z*yZ_XEPc^)y`*GH(hQmjE1kdY#=+^OGT(UPTM6_*5)#B?syZN5fN#2;V
zVb?@6OS_tB`+hzD-zc_zVR}Vgth|K?uho&iH`4!4<#;?dKuK)n;|CknH75IcB$T|k
za{7^9cGlYkGe2ryxwN}quIAO{H8J-VP29Y`bHky(xl1q4Un%XP@O;werkG9In}hb=
zkw`RknJ5~mSowa{g~ot3?RC#D{BF6i(eGP^merQeqK&*Q*Nip1Qmq>k75LA5e3vZ0
zz}@~^_amWM`--NWkDiv-P$6%icdh#Wi~W2i4RT-jR$b*3d6>q;6fh^z+I)e_2DgPC
zDto8j|2^~iK5u>d@2M+)M?^*~FwvM)a&!*Edp3=VfEX^h4Y&BTOsek~W{35N=dY0b
z!+%QHVV{Mhl)m2d_*uIY-uj6@+GjnVEvtX+Vu2%0Qo4J*m&Yxt|FhbDA=9lUucM!O
zo3_Mw1it^r{_+RAy=UCEYxz;;1;X1!HFkfWTQTcV?CzC|^XIdqHoAS2t9M#+=Uwgb
zmHF?Pzx)yZ-{ZIc%NhZusJ*J&E+x1Nb1zrA`&LP}Yn$xasT0HQt<YFvkeAxHhNWru
zRK<>J?v`Yc9+UMm^PKPO`?$~f(|H^1@R0P!JAyu5yPWz^Y|V`KuMYD6RjK{)ye@iO
z;oD2IgZ_4B{djrNd)0Ff=iU>yid~X@MZRS%nc1coWwzjdg-qcT>wuiBzypgrgqgR>
zrPqC7@{Qf8abmIIYMpyG{e5%)+gHDry^~Qlk8|G%21X`@8O3>J=GMnKFR7gES@cw;
zeQWLOueYMZ%U^Sc+WpS@zHVJjb@=xGZ?3I7f3Iln_N@2ca!z_~OZ{mwDa}pUm(SMr
z^3K_3=NNMeC^!hby!ZU)K7N<)B?>n?l|M>5=1h9fe*Zgne$Bn-xf3~S`AS-sY`Qzu
z-1_R*1#>i4II`#8&@ejhQ5DL|q+-2s!Ge%;i@ay#{djSwB_*gcHtM@<Nn|3^o{kfN
z4{a{hhwl6Q)n4VPwbljmYth$rr%#*M{r=RCtNcqger~9F7hdn)6v`V@Q?}=}inR8<
z{*;<-t@ic*Hs7DFzVFlPoXoBbqEWlIy|MH-y?fcp;8m}pp05A*qJG-;_+M7Gs@?w%
z1=Y;vp19V#_<EftcUWXdgL%#qUf0Q!yI!$1uQB*9a6s<YOo#nj-`l2X9lLXE#sr@;
zYP}yO*ss_Yv9o2>t0%4T|8m!HKRaI)>9b`4Z`1S+@hO|XR@>MI#AR$Ld9!o9=W?w@
zttTC;CS;txUH8G{q~G)9?vne8cE)VyH7%2?@yU7mbyB(HoY)nTPReWY%wByGn|kGM
zh=N%4`qN9!wQt)0<KJqb=sAnOr!BmGA%dr8Z-N#Fi*tzCZqqdDOEsoDzcuYD-!nz_
zfw#*KnG;sa-OVd%7`c)|olJFwf)5(l)<k}rTXF2j&i7HQ)-Rh{*&lW?=@oFs+W%ko
z=Xw3#+n=7+f7*Si^uZRz79X$gS3^Z31U!E2OUa3x_vcl9z=noWhR(bkwrI{=dlrSv
z{S)V;&pWuZYoT|Q{QoAdP3n?d-FiNo9WU>CH@&OC;~D#T&mH?>!-8Lb694~je_95s
z(`Ba@3OlQob35@YlvupVPJ1r9->Hw!>*h_fJ~pj=!sWz++G#R#T{|jg&X=0j_O13+
z@6RW%s_*M_=|}AHoBsQsMs5X@RlV5q5a;7{m4CYT$FQhH6h!R!Z0SDp$(0vHv;Kqz
zaIM&xk#T=@aZx90iNiYA=gU+U&U4tY$!+gUFJ_KF1C2+FE*)3Qyj^oAADNzZ)2r;o
zr^vQf7cMV$I<G!2w`$9L4)gWvR=YO#l|J1y^K~a*<8Oa^eQ#soH;*`O_8g1WTOa)@
zYS)vS^MCvPe8FCSxHKh$d#=p;!+Rn>#I3Q`c)*>oG2m$RySML8z7(&EJH_N^SH0oP
zVFNLR`;vE0?+!{k{)+#w^_Al7a@}5vlP4M64ioROQg(23<a@s2n}qEB4T0JA=L4oG
zMwG2>nk#Zj>+N}lD#`Wh?ml|6q~`DafBc_rbnjR2uX`CT8RqnkA^ZBhYOkrsnLfwx
zzWuGKp`^7yY<YX?qg(AuBqF^fS*l-N;R+O+_$!RlEo<rT6X{Dg?dxqi`XT0%QPp1?
zY4@)(l`*H3O^ud!y;!_Geroyt@8Z9{dx|YhI_$V%;e|JTbN?wUXpCbjUhR9Ic~<wl
zV0{lG!Eo0JD(`Ai>teK`zilkl|JD7&X=;v$XgK4oZU0+jY96^}-mZ>WcI8E*K<~<?
z*^>Kq<+9!8?bml-61`O`fa9%4Y<I~DSN^9Sr(>@x&W(9kv&$xRmzbvLtIs)4vo)<X
z90e}Ewf?rmE8~gQoHfr_--s(7a9Gm!dDkj?XL(U09+93nn;&xud>3>5P?1y$((Z11
zzQQZ}$ES9kJ(~}OCrnzA_b#cPFQoPQmbb|t<vt0#;Iq6|-X}Lv@ZaWc-Ti9E{p;Os
zeUq8=@}r~d_eE#=Vjl0XyJ(g$`?pAPvrwno;yLyba?|ZAeCs~W|F8Xy|4C8Fq9vPl
z`K2)&xL{dYWxKn*=J`)~H$54)rBw<y<S))lT)cL3u<e8=r<m>t>^irBVK1Y;ZNG`u
zMefR*y8L%5y;z(W4oS9OekIZ#a8COEzw<?3-^~7WbN!!LCZ^`z+0na~gjgsZxwPxO
zO5)rX@wIOc%X`)qx64%g=@yxy@v7;=+;_hNRz+9e^yRaa`O<zz{Ett2tQwnMcW~>S
z#`ATq=2Lywo(g}mclv*?W$wRtzD2A*pOL<59{aI!_ftYz6M9Ny>zw**J{NDYFjP4G
zIe1G}+VNjY)~yU~()u!CLflN*i3PFN!fTtw?}vL^t-kj6a!wL!+VyR5i>;(*SARHU
zZDd*yDD$m)^D@D6xi2gZq<KhQmOhnsd5*eNnAz@|yoTu&(OPS?Us?D3nmW5jFJOnr
zCpW`s`T}YnQ|>)ndg<Wri&7?Ydpd6~T{rFWam(#1OW!5UzTtXu^`lNbpN+>W9C-H>
ze$9CBSAy$^!lgGBA7;p0EIqi>Rk2`}V#aKRLl3^S?{t6TlKOI&mCYng3)L9uX{VOu
zeVc6m{n!21zv4u`*9Itroe(|YSaEt|M9&Jx27A4||7Xcqd|jh+=DgSBs`Q7u!X%~l
z9NT(#s)=>Tvl+Z66Q-~#@e0kAH9LHa^+lh6dA`=ZCF~2j3*R1jwB<%@UUO1q`M<Iy
zLXD~X_f#|{Zry6CB^t5zbn)a*+v`8=_YTfpE@Sm|%9A&7mP^8R*~gsyAa-lxuhY(L
z4-)LToh^CdE4)QLWv8+~`Yb8z`y~8nlakw(#dGJ&2y9=gkpJiK{8Ll=?@hURv2O9-
zoX7<hdJd)Lmy=}<>CW@m@PUVm?@pX%z`pao9u`5qQ$n?NYCT<LF>QHUikH3iOp_wk
z1leP3ayve(3o$P<&^aV?G;2yzv8r4+tJuwLADcI-e%<`>=L-K5o2%z>o=V;8G_U<s
zYMF8iJ7dLS`w(SMTlWXElvM8Zd>8LIsaf^qz(w&lY^Cgn^A?<JbKg8~@(-W=Dq?C&
z_WhQadbn$z>$SUAu6CckugSRePf(}*lRr{xjyZ{3UUg3OR*>_~ru0)8f2KUYpCr2=
zL-yRCV>{V+gwIcD++<X-QmCrmYySUzPnC2SSS>bBI;k@C#OnKh`X7ZlFW&rI;5n0*
z&{wC{*k|u$D>oL1ZFPAjcTRkhmh!C~+d1DUHm{OvDLS^bKq5&*=Y`|jPe00pqpc%4
zA2coPZ<g;r{?qmlYsFcgzSB?Q|J$or&ykd$cFmUk$otP5exCn#Szn@*F>Rg7K8urn
zrKMSghl66no0(eU{&iIqNyb+FXD{*<WfNM+;p*^0xuiLzC^LgMAa;+L^DfVY(@viJ
zSzfQ;9De>~ZTgP?2^SA9YCB-OCg|I$#g8_unrr{(;`VN)<B#>zm8P9v%Ov{o%a^LQ
z`qwu~)_?YovlLzTclx;#=Kt=#-*}wWhQA^_?9#loNsOiKMVe21y!e>a^J`VQe{zK>
zEKr%9p=GxFX4&+fooP>PS?n%^rXJ)noOHqLnbn>uv0Oj%!*<;{%U^42y<F4x^-=Zu
zQ#+~zJY)5HCfj;0@G;6XWw|C1R=ly{LP%7A1E2Ey#ycnfJmIKv7X4jx=X`CJp#Gs~
zwn@*Y=Kt&5^WpP;O~%?|Gbg@&61wT_rLFG+c$4PrycFV=DQucPZ$m6IBjXJ9HPaJH
zh4)UVsk^TA!$d=fBe%tPfy<h6xei+&wC?zMw0yt5_`RQUlizXtzGAZPjEzU6g3D|B
zjV9Wu54C2>NMHQEJS8(NCh3=PK(TYCLxb4wp3TR9v_0CehfiUx&Wd+wzjF^)OTONp
zqG1#^@3#4q*Sv3i&4vC(dU`AFEUe#hvDIOFRmK7?naYN0)0zUc3!eO)InswigF+a$
z38@w=-mrJ0Z2rmJ`NFY!w$ods=LwrUUs@cxA?nwmSC^lEUX_}!nI*!r==!NICrp_+
z3J**8#%=Up<9#rs<k<5h-I(v3H3i!Jd_M&Oe&5c~d)Bt^^Vk0YDvU>ecpTrf+NEq6
ze-V50q0T3Fn&d<tY&vY}E3_^<xkjARX^Z}y)Q5jdGz2;FOCESH4f^7-Db3yU*r~m#
z&whW}WMaMY+OrqDIUCu2X~pNHr5GH%)jdUNLrngYJ4P&mMY0W|o4x9!L;jaE#=g^i
zzft=B+lqk6UJGB9?36n>>t5%nqg;u38V1aU<@zs-Pj}Y{Jl`uaar>S<F-vYcE?mK=
zIQeeO>*ZgHm^e4>niask<=7XOPm@Ak8;hD-J$TEu!7f%&m!tSfoPvJSj$*aRnlHO^
z!yS|Vr__J-y}LVrXZL}}2cAF3&OE+<ZPe23;a1y{>K>Fay)E-ytn)ByfBT22U+0+r
z|9ke!EA#&~yP0n6iho)A-t5~YCMV^Y^Yt%1ncnv~?Ek*2f4!q$*>!B#IyK~YUCZ*E
zp3=j~r=OR1MwhQh*_oWLsLs_rYZqTvN?2-QlEbOcg$$GBGGCY})b6&N;J;RBBcD!|
zo4~C@`?psGoP3dGwyo(<!-Gw0?pMG3mELM<VD{QLFHEmo_{16aDLsv~+z!!o)2Hp6
zJ=3}6$r`n+^4G`r-u!s)t?~OSo)<UVFrT-6%O?5ctr`FGzy37ufBo$I0o#i~*B%$z
zUznqA$Nn&^Wp%=XDSe%9XUk9AzP<YHRmuH(*$=hqN}QN*^rhe=4L0pnN8Ycwzt-iy
zVStLolxZ7IZZy#Ib}cg3;^uzZeEn?G%Q_B8?KK-E7k>2IC1jjeKi%N`-k2TV({46z
z->mmtN=vKOPW`j^y5Cm&*ee;APB#|*Yp(qu_QJVyyWedIpF6EfbH^!9Z(cqf=FCaA
zW6#J7yC$t&d^P>{BduL?5A3iE`Mls)cmC6P^K0@SHlDw|{N=y-%Qi>NI{ee5@4vcF
z?To!CMcbduEtX<Btam#2@0zl;8E?#zR^2?K``h+?-2A%rDaHb~?`D7hWupD!?(2V5
z3M+V%^^Sybz1%9v#nSmXp|rat&@)@iVPVqOG^w}jm5O3~=6CjSKfS%TZ2jHr@3#U^
z$@y@v2-N!eC-Bc}lTEK##Y8rWacz}%xW#ga-?Xz&<-xnH)o<f=Uw^k%`RWOETjAZz
zQ=`**buOs+v1`ZQoEF8iZ+`6evhTMb=KWg2<hb_6t){GrdzK^{Z!)>4-kp3sMY-!s
z28-pP$lYEkP=)F7-<UkEvRt{GIaBIo`im}EF8Rb%jR2?Jq8~t3Rlkk1{#}&zHg!^L
z@8tWn^Y5#d<p;zzq-q}EzOk0?F2t@|dkY#{jHj!0M<0B*^l@Uj#od;Vi(Uqpr3<`%
z_<QTs6@gp#yykoZc6#;SCE5G|oE}=8ddpjtHh0?2_Vdcg3%O&rf6Yt%xs6%-Zmz!n
zK4>OfaXg!N+`$*D3TCfZADjDqX<d<J>+sFr-{XXX*3T_BYD9NecFg}#8@xleXVH{<
zHQ#UTHQT%N#+g&!g!h;C{4;FzXK$@lQ{8q)DslI{PhHYc%oe#X4$L|KV)nHoZ#g{<
zKAW`XtoEen`*+{kJ5Il-qq*HNlA%NHS3<*0v4VF($09izWg_ZQn>oeyyTy0ioyWKP
zy6$)J?_u-y`dkQkr5;}RB=Rb+SGCA<(P)+T3GWv_xL{iR!)24^V#Ual`Exb=x2Fo#
zELN7DZd2ts`Dw_z)6I#86mlwN&b{9Af9CgXxfPzQn-kCV%J{gon`}9J=Ouf~?1MRb
zLPVB?Y44i7FG}{s4XH_==cd0q`SP31mfoJYyAs=jV}sV)D>N2tZP9wIvSPi%4zGGK
z5s7Y&)MeqxId{7Z+oi3JzWZ__<v*zVCE9;o`(%YrQupOaPR;58GAq=x_xu0d`u>5!
z#>8nC#jg3ew!O<Vn|;S2|J>f3?YVy@UfsTD$ztJWcKPd?Me5Vvc&<Bb`{mY&*|tm1
zP78cycVj{Gj>(33bA^*v{7lNe$osw^c}<601n<(aQ>~l(&vm?b8W(t9&9+^BGI#!7
z74FN6qw};sWQH#YkkMQ3f2+!WqqfGhk5kwGzb*7|!)E<C#wIdHB4XwCi(ENba7!jn
zbIR2hPRmp4(p>hWI%>N6XVu<_(W^f1bn30<<Wt|wE-gyAK6%pB^NkNqJ=`#9;^ez2
zD<*DScwx_pmqkWP+V-9O=OJtU@Iq_(yBjIb1M~Uz?<$-6b?uvN)8eA1eobjQuPL!P
zb78a;%Wc+}<QH?_a<ha6O!uDo@9(cDuVd?Kzc{R|sE~?a?$=kCdN%jcg^m8JO6~~S
z-f1l06`gVPP|i`C>yJ(wnV0xQRrybLH4V9{5O;f5$d9|1o@-CPCp=$px4MS#UvZV)
zyEHZ{PfxANiCENKoYwg2ueeB<@v3{t{S&2X66^d<g*<c>U-qMV`|;z~cHd|YNU2DZ
za#^<LXk5|jKit3T8g{8?u5-R|r@w6RrLg<$WxGBLH{X_9ZXa=S-=}G!edp%KB!8Q6
zPW-Us{5Qr)%eVFwzX)l4TO!>c{^jk$rn07A$1^Lss_ZpBJUR7A`8!jlk7MDB&7tNc
z9`A+cPyhP0=iJ9tSGK*I+IG`(rsVE_!V4WPd^Fv?@0{3C+vD>m?p3!}zuG%D<zIxv
z{$;<ftp0T9MdJR?d)41~wkM{fhE81Zu3(+&qDR3GS!d@wIJ8@6UETy|-uS7lD-9!i
zb?;8T(6&J<{Pg4Q|4-tBDn%~XnXl(M^6u#ouOi1-<<Nw643;|*Y^`L<l8thYF_x`(
z+97w-J8PrP`CiU|Wb3z0sfBNf<0mus*9VGv1cil9OG)~$X-kQ`h<jb^m1EbLTkc(1
z{V439Y`7x3<K9hsJhb;`o)_dge6TqG#EY$)zuy&0yq_bwU`Bkrf=;ZvopN=bo$A3=
zRb1OjjLseISuc=RcH!0v0fVTWQm+Fp?r^usim|wB7uxfB)3mPc>#wK%YGYd{xM;Rk
zNT~W$+r5vjRBwA@tN3xL<j$&hwz1nY@15V+`>wg%$j|1NrTe^!xMj=IpI#`Q8+7@G
z-r?}`r|#Tnkh`{ARc>zj{kIh*j%w`so(dupJz}N*#|B2O?NV30>Kl8fx;XjorEULr
z`1Hmsc4}2;V?O@!<B2a9LVvc~|BUak-Ffum<DIK#SuNf8dP0j+;>>vx%O+l{{II3c
zZId+D5|zg-#taRoAGyejN?lvOX=C)M)l$5y{O2#EZE~F<_e;C}TYk!iKhZqGwnmDJ
z&vQRsvTCvK_pgaBYu|j{wCFSc<3;<nMt=|38M6J&R3EkFpFceIz0bFk_2>5QM~W|1
z{xF`h)<Emy=TcLn(vMfQv!`ENEx+nx@IL3~hY}w7s!uz*F8w|uvvAzcsF0_#m_Hpj
zf7rsbCe-|E@)noJ7hP*VXhj{js1bN|yRf`xU4`b>gy||P_3K^NTGR;sjkx>a=9GC2
z9U?Xll~TKGh0Xc6xg-}pEvl??T2Pnw>dtbn+z7dXkQ8Yzqt$ZJYfZk(EdAuM_E>7s
z3$FRixs8)g3uV0#+^*FXvPB_vq1INp*i~DUC!LL*n36N^@AGEUvn_${i%$!6hTPr$
zG4+b_p+8&ST6?w%uFIWPt3K~x+EKN>v;CeccFkP4{7jUSsMk!bHly0U87kA$RWEI6
z*Dc)WKSTYb<iittmIvjuuDP<sT;jac?4arduO`K>M`nHVs?$}|{@C(m&M&6lSuxh1
zyWVYl-K5a-SWaB9np;fQ>h{u5PL=B+FLm_|T5ep~IRBp9vG~<Z)p<1zMcIWnuUAJL
zJLYy%c;BjZoqrDtYa5<?@q5m_2Cb{=5_+Fjvooz0@S4Q9q-leCjgHjR0N0e$k9}T9
zT#U9`^0}$n>BsgjGLAX!+splQFMAp1r0qWV`NX>ADRo~~UD+m|&_D0t=ll~pxE>zM
ziDH`C`zX|zp?dv{zH8MwD;D{^oXNfF`&W$?!P#*yUmxM#uhKsMm*%^@8~1%Svc9G+
zyH|Zl(B6qlw7#Bt6{X1?{@QrmzZ+GG0Y6ID+I~8;{$JmZFK?7>W?e`>{&~~)PAQI1
z-QP=|-?(g4^760jT;_ujcmGW|cp_U%WR9WB+BqA-mbK}voNA%TKL3x9xhBhlmEv_1
z-);0=)0eta*L3Z{G^hM`n?fedKDKlk`yr+cQx-H9o9&(c@3x=$U5S9CO1Djw?NhFA
z%iR)KTA{KyuO|4r;>+JJeE+@m^SY82nsL=++sXwePtM{}p1#|M|Fov3YEse9Guc*^
zN~yt@H@UB^({FWkv}xp$+oJY0;M$j3!>?-;1U3Y`ydw2nO0lb2kV#;ffWe2nzSZSV
z3My0Uiac(8pKnqmpH>lM-XO?#Y3qXaho2_!pIsK0S(E7WETm&<xano9vejQ7e*4v9
z<IC87M4;*0n^kLGRNu9FcH;{JtCjg&c3HuVW$r5y9zL8``SbkM868F;JMXroE}4Gq
z{JE6kSE?`mzFw7*Ss3@{t8Y!;v2)FLti3NQhlrH+>KfUaYRbu4KeL*yed5oT9U)<%
zt0#u&{qt}ZlnJ=LslE2X!WoxVvhe#VZ9DPpz|&WbIjON9_J#hnmfm~Cbf%Pi*uqWj
ztE8h|E*1M?yk>*gwZo?*9ZxvCShrSHb%C4sE>^P=`Kec5%+Wd5bK=pRDJJFeVg45v
z*GC(yeDh}2ny@eVmsTB-pZi@fB$+GQz}|34+z-{r$T^dbZPPoM9+b7l$6!gXP-9zP
zoMce{?f7^9Hhyv1Ft57L{`7?sCtkyn%2xN8k;V*K|GKIoV`mAtC;HlME1LIn?irVT
zg<;$+AD`vceYDv7sAYj;&Zg4)g|!0q<_s}wZHh%-n^y=&2P*uKUcbJ_^V<F&kL!=J
z%y(z?I(;v>=+n;mQ#V8%zHs8>QBKZPtUQdnHi#tO`IF$Q9b0kONLXvrw7>l;4Qjl9
z+1E`L`*^N{Q|yKBmX~)Fw}cr8zu<8Hab;3&=t4_#!vg^xC3Rhf-)3&Co9n*)Ob_3Q
zEF~@P&69byK8SnyMC<Xb?^TLv@p3CC2J8P*erfef<oJmVzNLHR68crb1+2J>&+z#-
z9CLR5Z5MUx^5W|$5xR>${_ECCIo@S^b>qAMj(-6zt6oPhUAa13_vPWB(A!Iza(Py(
zTwVJ+HK)X7YUs=>CR<M*dLgPMapX|0<&nd;pMDYl&mB2WcKYe}b^XT<luf?Ov3A`G
z_K)-bJ*Z!t<e+39^3~b$)0OZg8@G0|OYEGLcK5KQ=)JG2Lgx6jYi<0lx-w2_@~oL1
zQJ;CM^u<5(1Z183v1!iFgZEE9c*>s|D#~8hH$8dw<0Dc0F;?2m;pYPbe>96;`u;IG
zYeB8=DydsnUUUQ>T;rBrnwMQ-yXVgLmnltNId5J?R`q=-`kS@&cFCILU1slV{_B5z
ztr~gRwmJRiXBA=XM}_uQVc8lJ{JxqPS-s0nzrSG9+T5I_;o-}=1RQv5<eg$<+5Jv_
z-Ms#9#WULyxd~zolT>CnpO-(kWd9<+{pY2^{@mJh<C<{L^*g#(&(1Yk?6zmU&WDu&
z%U-{nGA~-+(bVtDUk!bJ!Bf^14|7+p$Xvv_#qZsB-qeP;W7}VOl$xtH9o}wZpUdR_
z$*AP*oS2&LqCc1Z|Mq{vE;U<+LizjKrDB5|lc%pc?7vBzbBegp-x&qdZy$Gc6v_%%
zdt>gCWsBz5d_Vd8>glME#0_TzCivU()=I3*&zZDpml!kCYGHxsS%KX-VQuT?Ol|Cz
z4`^@_h~hM1e*5@VU3_j;m*g`Gx&N2!)h21JoVG5QwZ1f1{cx)A^!pP7V%ZP3Mf86v
zP_=D(U;CFo<;5q-$bi=VC32trkA`hy%gQWGjT8(0(I4~E<J_Ka<soWwfA^hu_;~q}
z&j&I$P7n3;b&d;5b5BitvWRO-OUtU+DwDfbFW+`fCSY^bB-!8n-WEZc&+pZECUIZ3
zO5dleotGW6@+ylclg`J^hjm|n#Z5n7_fq`n%K1NiwTd}R>s@(853JET9u`_<v8ZBN
z*R8a@t<IviW^jG$(E6GAbG7}S`6*>J6F9S##nX*{FUr?{(`LA&Gsf`I$?R22mba~6
zDO4F<_sYDkzlqhMt$}O$kxA!Txvn>82}u-x4u1S<Cy%E>(AmNT^3J_g9@o$B*M493
zfA$u(?vvqtpD#vkFj-b2o2xg!D!Wj2zyGNag|sWp-m4p5_1{<$Gu8BvTySmrlDMfg
z3z#0vy~6DN+V%~1<&kOgl7-f+S-QPHz^o_XiG8FT<3GoeRGsygYr|FVW<5C=(7<$a
zqnyXZg5p);HtUjkjo4rPc(wk2`TqBxepOyjYu8)-b%WN&r<Ge@oJ#p|s@+9IaAK0&
zlC>KA8(tl1I{I+)=DDjTE9&fc|Cl-a$%mEaJt{Bgo0U&s=M~$;o_z6SthdhPx5qQf
ztv>~wSmU{~N^5encxg?sb<$-<&(cra`<14au9dOpbB{CcKP~;>`_CU+v^q@-e>K&p
zRirdeKY!|`{9op^v3nM*S?RLEgNHF7ENok9`86(2)AzQD$L+s!e^E+gQJJ=kM<P$i
z$wqy}Z$~Abof0+wes15dUH|#`|J5<!t0m+(j`bRd*|>42b5F|IF8zRQjp81*Jq>y@
z!~9=;Ixc_W%8v;yAqvykPnDj%EVL%`vZ2YUuTK{keQIB|bOBS|i%XJU_x)ND*!t|=
z<@gCNA8Nm9J(qX#(D8_CUpGG#jsD!W-cRkN>$7F*OI|<7+&bZzM47WjmJ6@=ii0jW
zp0*MDuWWnsw0ND)SwptFH*RX@|2h0$JKVlzZX)};$lZtU{66;Y{<&QWUs|_rKPPaE
zQ$xL|+amq={NI_+7A<(w`OE2sgr(8fu)TKr&f7h9E&pP(Adewq<NMmj{Gpb|E2i}r
z=Dm@P_-i-+{X=eFTkeSZ9&rwxJq$7*r@y{AZH{1XS>>5s3)ieUE-vZT;`p>^cl{ob
zj(JCu&;OlMHRG*`(Oo-R;a%*qX13KcMeiQa+I{C~m0ZrGP-Z5}?fd%gDWudbzuI!3
z;JwWk6-J{oJ4H(yFEAARd1L?g?tOKa0NwN!!wDOLHCM2oP*YwdDjBvhU%&I5%iCX7
z7o9fh$$WY7XGu$TwC0DT;>T=E+=h2c<}jU)l}q%wx72BSgI=eZ`r7J<Z-=MfuYYpV
zTxLest~ATFTrBNng=sy943{=Z8OFIQE<W^i*ORNS^!R^Bu0KBGe)Z4UJn4};+b{hz
za+1?io4eggEM7sy|NkNT=iwS`73>>Y5(Hkf2!*`~*518f9>auqj`KC&&;Q%I=il1@
zv*WlAHI-cpxRJ-GzO^=qSJ%<6-*f*t-<}h#<?&+6xt{-B9yg&xX;rq`qpPJQ7I%C;
zCG}2EcT<fBbWLz`&7HhOz9wc-@#IY=#@n8nwl)T3F-9-cJy6cb_2Nc-kXGlWP2Nte
zr3NyNO^t`5xGWE8eAc>m=NC`sjix=H@9t00xfK><l6m*`S|>iPl+!z<wmKxb+%;%V
zdm()4&5OzL3l=yoy8rN-^umBMQ|nxBaD~}Av3@x9@T}v-`VX(}8;Pgd7O%X}_^H62
zsgdX5ryt>Ub3L@@_pRMl+COFWCykUInE-{L^}kJg*RS-k)v1_kP_W=e<Fem{r)qyV
zPc8C#+I08LJFoWw>8xEMU56hAx~r)2*-rm>)br!(nXCs=QZw6rCoR{U@NThxw>Ph&
z#EAqw#|W_(XMY@8Vi7LBykni?4b{E7jydzqkahBSEvdZi)r7Utzi-^RaYmqnRrqn=
z;VE8AzwDFbTD|bJ{Hc@Y|IW#o;vsV8LRUaw#L>7Ta@~xsu7Z9)zUE)#uAJh<a;UQ3
zPiM_l$xxAC=kUzJWS<kyA3R`KBpzVSFJO_My4#26`^8^nvjS2|5|5mISRkSsa$GF&
za)6vi7IS>x9F`wvV)UFj95b9bnH?Jq4?a4#Ry8H;_=maqe<q&sTkuZ3p!w1P3x$Ra
zd12j&-VTuoTpTX1Q(Gt7ta`DrKknLZKmPd1^MCc;U;1=TAh-5Di*s?O93Ga+)*ZSL
zthfHjSAm~*{3<`n|DX5g!TJAtdEzSC7tTKWMz?3<s#T{H{+JwRYh~(||8OldRAFlG
z+b?Ak)8ASBv6#HWG;7NN<(aRl=d*dwTo+z^UhwCGsr#pih8o?NUXiE4Ex~qev-LK{
z^y3!I2NME63M^gn_=tpI7{`U3osKIrUrw}nW;tEu$lVHkF5BL8=YIzhj_IBF@nC9F
zp1^n4*Udr9@8b@N-xf78i1@IQIm<<H4yU4(k>!aExl5Ks_D&NJRoqk7vW!vXrR6`F
zsS6WtTGi=@a2&dHwz|*A#C65GiRIUd*WKGFH8HZiy@>C?qD=+8Em^l;RGMsiKk;NE
zcUH|ilZ?%QyV;H(deNP?DP+T&L#lo{bG-S5beg_og_!!>C@?)(y(mhpl>Y>S^2t35
zYYJX03`yE3q1_>9$8beIAToZ<F|qdTGu|G5Ften|eMz#{i!>M4*YlG7Pg>vq87w-7
zmFq!!T|z?Y3eoODhsvH9Ywh3ucJAkyxh90^JTnPcs+Z;SDeLa?>(^4!eyj?dv(iaZ
zhVS!-`+4`wc1KQ}Qu{Bw&Yl0&9G<!L?zi}DjxG7RtI8=aenM;N>CKDV5-;rXzZTm0
z|M2{OjXLLijeUZ4`9(<gtSmYEZp*d+1p^KNFQqP*R-FJ}@%z<N6=&6diT}&}H@5A>
zu7c3DYhEpEbUmx&^;J#qQNgX)SGR6Ixf%Z_SFKNQ(H$NSrupv+Eb;{2T)QDIem%6%
zB{eb2Wop&l82j&L#i0vliFvMi{xq<g|4+UHH=|_p#t^fzAb~^G-7ZRd@?TorIW4En
zI$t1W(c_q?s36yASBwp`%T8WU@LH?m<$F9a*1mhwf*%jvmhL%Mm{ZvHoavOZ2v==V
zOuy5Qgcy!=hMwT{^Vqu#Hy)cA6L;-WWRv#<_7CA^A9hYy@AN~M^>k_O@04BtmERrp
zx0T|q4*DMdeBtr@2>T5RM?#;S_2m<O8ouoJ`L%7cWAA%EUFpUn5G}v=r_lEYi_fIq
zeYeK&m-Dxt-j9_fbKh>@DqJz~4)==FZzfJj5#kn_E1P`gM_o<DOK$cRd-lxvBI&Wt
zaltK}^@~?nn8g$?I5=%Nd-v2Mm3ODiZJ(#G>F`0VNA3GxF6gx8w>#+Eyn5F@-?eXx
zW?pI*h@T@?T_?*aG;u5I$@OamzHV8zzHQsPMGKlY?5oV<+P=bV-{h<8t$)6p|7V=}
z#zrCccmKu!JuBlgcLJlX3v-xr$ULzV*d)34$Fx6B|Nqoat*mRaTzBc~iZyFg0uF6T
zc>iq^50i$|A6=GNU#&TqTh#V_o&T@b?)#iG{{2Ba6-u6Rhfa(=@IkBfb*D4S`xiIk
zf922E-I#Re+`XpK{K~xsHphOS_tx5|B)eDr>aN`yo0G3cPTn%F%X?;2#|N>6HU{hr
zLJAK%pErCm$nf2^O>MU1@`KW88VnId8WZNqTX?TX*AWX%4chT|mhzIGYnPXPuHAoZ
z=h@|t|G&5YYPm0924{y=i?YJwz3TI(x`p05v-yxiOuVS{`Qy886lY&5{h*>OWG{BF
zUF+<sV|*(^RSk_R{E8%-8w9?(ex9uS>gRW16DED}g|V|aFFA-X>WG=1y_>S>Mj>a(
z6Nb;3CzmZUs(Gqxr~X7{-g&<=AMNAwd|$Gi^DKF_izmKnyGLr_{;iUH8baweW7@*R
z*E}uV8W6E0>{I29f{vB$v#Kg?1lF*;;%w=%;<HN&aanJBhx2&N&eMM`6+e<}+ZeF*
z&YtHRd}58e8Ut!L&5|!xUQrhf-_a=(oVsex-bRkK`r2#C^{4syO=bGT-aGd<?<<ke
zV;W4Y6Bro|uI1u&&04{h_tsW-;xXG#-?Z!XH}9Glt7CGySZ2evg%)cJu7w>-<#f@I
z)tJ=P)wSp;pK8(DL+(Xi7jIv>VV;5zzoK-@`2{hZU%JnpI`kq{tXpZ1B+rj0JJ<hV
z+S~BQZ1&8F=DiFI%S%=+WYlNwGL5<H!D0F>AacX48|{AE8+$Ht-`lWMM1G6HGFSI4
zbN|hDjS_XM2%pN_6__9SJjM7Q-%l-dNog7DLrLwM)@Qz)Hf`_mt1o0!!-a%iIBc<;
zk-y3%VT;6~N8uVme`j@{_o&VmKD_2bQk~2vd0F=P2_BNwQXKXY#V2I9tQKUpY;<kk
zbNGF(MgA{yjzZ^er7{&ga}&#hl;*mw)rvp2_uuy=^RsSNyR4g6>HBQ?u_JGF+Ye4w
z58}|6(PUR}OmyO@ZHF%vKk>|(#a_B|!hVB=dpB@gzb?e)>-lowhKaK-xZKPsxZu3w
zjrCWX*Fth-hXfXGpEmFDlI0PhPtEK8CePea)~2}a)wZ}vJkMmaa&Ou$G4S;H?wM8C
zGv$P3M7+l`#fz)E&U>wk`nm8dhg_c{fA05%!JGcyc)TXUZ}n7r%M#C^l}kdlzDb=V
z)OBQDICrA$xd|6$%GX7+t)G)RgLl943;t7&=S_|5Y~_6|f3Ks|zyG}U`#s-eXU?CQ
zvi4+DP2lm(N|&3Ts|wE+n0{E`5ufpOrt|C8?eyNoH%H-5@op}b?@k`PFT~bs{dUQT
z6jN_s8mH@AVc$CGA6wXU-!m&~r7c&yJtuywLq)4=lauLLA+B~#!)=y(x4$`<tZn$?
zt!u^C#rp*u9b6c8YWG;#*?T%lg`S^YDYJ;#*EwXr`w8JU>rQm0#wu#&-%$Vh_BZc~
zAIo>tvV0R{(8>MnA0QdFT|OlxJvDF2$u#SmCRIxp*6L?Au<7qRd|^}QOWy8%wf_yJ
z&RDM$);Y)3V8q+&`{;^ox70ijU*VTsVPeNvC(V4wm*M(M{=qtn+9g*L-h5@`<#CPO
z;MBO^U81)$JveiMlhg5ufvc@1$1R;|Y+mF!Z8^J&nX%4;_d$2p>Bawc-WJ1khr{;O
zw8c$zg-H%>zt4HssA`$+N|f<C&zqs3upq$WWl__s<hC%$x;|G&iPJ(`EG)`TTTkE&
z7WIpYz4NL~tn$^-`O~@*0)Cy}um4y4-t=S3!rEk>yRF->f$wPH$El)MuhhN#|HA##
zHShT4ht59lJ>RxHVgGqWhi2aEfgwIgLb-ElU;j?A_+at*$+;ryx0AYbPu%!0;YZ2a
z<kQ?mKmSfo&8mvJv}=y9Z1vJz`zkLlTr*pLH>b7STWj^n%+p`+ZhdQg%z!cJ;|gz0
zCWAA-I1ep&yRChiyMf4D-%Y#bHLPTLy*qT`mWk83+3vnQ)-d1d%{N)a99^M{*Y>LK
zSbrd*;YdMbrN=V&UnylZ3nDbKI9#Q_t8#`M3|RB&*s~84c0Rl;cZ{h-Rv=Aez0{gJ
zRqK3j%`{$L-~Ok30{aJxKfB~>{|PwP8ra0HSjpkCWYH?Wtl7K2_AD>+Q;(2{tg@2|
zIk`K<H*EScRe=wyHx?ghn9IFmj@Bw(?>OC-8Zo^od2OevzBN@$Nbj`xc4*g)qRb$f
z2@&f~T*y9?sI~3HkJ`#5^A@u6NG(*3-_SKn;Hx&j{`ZY~Ti4po@oDK@6<w9mU&Yk%
zwd-t{3^z-VU+m96Q6Z~dOO<S9Ny)2oWNp2x;h~+AF5A0--Ddkd=jExHnSpC}hK4Sh
zE3_ta>c)e0noFj6Xg8V0#Li2!V7zc(d)%+$FrCS9N8T>_v_mxJdtKD^Fbi(3VpFlH
zJ5M@(-NbY1S67$8TH|<E=HplD-|2FRKRL3f`}3t+TjT9MU#-uoINJJWn_YZ{WhKW{
zS0`~xt@d~3|8(S%dD||2KBAWV_jzh!(UBMFpC<6FoB1^Pj5NE6zMGS1HAm&F*?;<G
z_elIc#}U7B`i)KRceJc}Ey>Tm*ZhP~qDM^4_fS(Qy^lSIA9VZi7p=8TWo(=G{J5U9
z&sMF9=<jm>uC#AV2q=@Ue0A)@?!5}$pM#5DHp@>cW&XL1=}C57?DMxOI}c7^RykZ0
z)+;r2_lIXjTIpq7`fZOHK6opw-gV%m_;y?WCz>gV0laM0R#uwK;`b)*h%DH)ZIjC9
z#kDF6H{V?vesC}6ESss*4ofSo5o!%w`64FJyV>OwZ`RLOYLSiBIp0okT-|20k6+@!
z#pm^rckkD#oxJXB@x@BK-R^VnmQ@881nt+a$X1`lcE@Mh_ZF#HD-U*W5{jLcup>xK
zEj?9qPeNmnS{C<h7IlR)m#%Dd|0ZYSwk=}!ZGE||T(fRjEnWAy;f%gcr+I|4qi>^3
ze89s$%X(t=dvFPJggw!coAPOg<$2aA0(-SXYZhPE_s+?TGm2DBeAjC-IpjjT+{ABj
z8V`lpik2_nx)!g^TithZ-s1VHUisG7Y@H%jd~oaIc<9*TDOkMC`p%kd?yMFMt^}+p
ze%ze4>GQ*dGjv{99X=AqFSM~@(kma=upLi3?_~wPZw_kw@W|o1bKNedw%S&Q+l_JZ
z#>vc^42<)hOx;t*`O5NH$MtX@jTOzp3`;qq7XRw|yCm<YN!!K`f2Q*0n&=seHMjfr
zF5kp4`P{~%ktc8Wgo(25_WrcaNb2OVxZur3dlz`AYTw-BYxPYo$ThiTW_cUiM&mPk
zj7oi<-kfAn<G8L^O>}W_;`gwvp2rU!&opG($<#QvLtlE!BeUDg7v+yJo;SYv@{CfA
z*kW#(b@|hGt`yu^_mKJHi+^7FJgZKd96cg5$>M<~Q&oHDJ<G$ZY(6}hzO5nVRDQI>
zhD%|(YhUeBGd53I9=*??$}{fwGkM{+hr1HC@=agXcIDHIiAMY5#ioaA9Jp{jF)^uO
z-Mg~ZP1j#fe(YZ#IW4)0!`AVnCG(^((WWX{5p|_kJLaABEJ^d&lwG)TW%iWU;^(Dm
zJ&!m<-|e4s{Mqr>sevljq&XjH%kOtTXlJ|hUClO!(`k7>Yz~L6U~?~wY1VSOl6&Cv
zo7z9!Yl3f9`BWrdZ@V(tt&i1ZTIUM6l&zBvPra(MB*uTeP{4-wPc{byUM@KQH-Fpn
zww#T7vmH~^P2`&nvK$Fbjpgok3*F>#F!o%)n-5brv-q6x=bQXGJ8Ox*+i$%K+4?)0
z*95Q1vrPy%J45l#I_BjPi~eqTW}hW}TgB?Cd-Am;J%>7>FAjG;Te0W#GJZ*ni<o(?
zX4<~|%&_y#zP&SV^l<G>U74S^_{?oZPk|~wjh7#8UD{-2?z1RD#Od7XIh)V(#7}tg
zXvezxj=Yn1Zj@dUkgs{feU!B>AWE7wFJmglvA`?FAD(N?IsflP^dwR7RuvP&gofqz
z|FwhUc!Vw{Kk<;66ftY+tY2X(!`|+nSz-BNzxV2<?OFn}cUQeEinioy>15!IjhmBR
z*XSNy&TgZ2=I)0J9X`H2o<=M0weLUk;=Y5<*WRm#XG`)=I<>V|H|Tm{L{S<4+O0)%
z&71S?s*674>I}KM={=X-?Z^D5e)ii<xY)SbWzR&;oi3F&9NOQ~M8rkRL^xWw)~xrI
z->V+3A3J5u;xh}1F8X%<Q(6(q>9%TV;MxF%6GGg=I)|LjF+G`mbFEhF?PGhy&e+IV
zJFF6758~jg6^LGUruX%8UC+uLx1LO?Ix%hU*%g8tq+)Al=~Z;EC||K6`)<PvBc*w&
z=cS#(ANWYU{T*RDNicHO><KR)+9~geIB{2?N^S90DZvF<Hw~wK7gN%_aoo4M&&$=>
zeDdjtU>8jXH!I_!xzG8ZEOB+_F!4XR<KnIB&!$Xu>H5vTC-3FfEhX>mo!I)@H;TXi
zCVA}h&m*#VBJK;qY!*gstaLI7)6SlKq|fWim8iBRnTOf}dmFz=U(nV5_?6+4(Unsl
z6yEIPDt&z?$=m(rPJM}$6HhK&UG(=)wa|*3v?Rf4)*g(JCBX(iB4%{3rBCEiQt>dK
zyvETZ)!M*UL;b@anW|^mK0l;mpI%VVQsnMFZSz~9-}nU2<|XMbgTh4;cX(JRIBxwj
zyV`GsbT(&q@A>UoyWek_aHjsnj@|wC`Y*roXr^u2*%VbC7}<SXWhs+{!0wqBR}00@
zxVHYUk-4ST;o9jdDiQ=2D&2CDcxe3b7SE^Ge)nQl9?iH|_8|0^j(|i1=i}F2B@?&2
z=GC1$DPqo)Em6xu*Z%IE;~Bd5%&Q-a#cj(4=F2aiaI5^4Yn#`$U1=N>8?@{tXB%t1
zFwWi;zbZ8?Y0A|529r*$o~2@DuC?+<&_>aBheH(1gmpe;YR`9GcSwGflD5mSH-e4a
zt|b8?38@8(&l(=Olx3rM(eK-nr;*AkFZXP05WAP=``Rw^mEE6}+{p)D<h``i%59&g
zu`SR~M?YvHU;MubSKI=YeK>SrU#_9GflsFSg%W{d!Or0+d09Qrmv39S*CX?@g8m7H
z1&;4c?*E9b$((g`!Rwn%ON?2a&aQ28ul{~g->dd|V(sNMQCx?8_N-ePWD~R0wf1}b
z=bN1q-Ci(#c-WL>s>4t{f3<+*-fxCmEvj;2{(fkGBRVNA{NVCy+5sjG9~-0?yDu!5
zrhQ^x5kE&+&+m7Z|9D<*5q!Mm*YxS(+fOv)3CRm>(OZ9GGv~(C>oaD5sInE}VtesQ
z{H5KMAmvXhQwl$vDPLWg@U~OmVb9+qU;DdctX3N?n7+@yT&TEJPVn3&fnpcNuN4B_
z+l&j}>4}|~s?~7ERz+90|JaGMDLq?_U;5{*d$3I){fD$l*v4fZYn1dGO<n#=Dx3_^
zX6j$CXx-$W`XUL}wv>3f=AOQG?b?&sO3P=NAJ{c{=EKuPZ{NHQx_n3V>eZ{0V&|%_
z_g}KGJ9*<wjUDZ?=4_i<)zs?y|Lo$j@EJeumB%zqEwwp3&75(4(T7ixo-3S=?K?b+
zv9nc7FoOSyQ<v@C{Cobp%y(Z|{Buj|#s|3%a*m}P-#LHrX5m+jdynr@+QMgW=$2pS
zszh^hyCVgwM5Pa%4}2jVJ#YHWmzvKc)YR2elB%ZJWZeAvmEF2bcw60a+w;$IS1z%;
zzd~_yY3&6belETx3%*S~n(6tHk;z*7h0KIAIXSN%J`$G;*>hE=tBJkoko986fT*<g
z^TPky-j&zN@7MG;UcAO7|D{!enSzkod;>EbshBvMkkHF=TSMY26u4O8{5LFe+tpVy
z?T_hdZ{uT$7Yv&^%aT5D9nSZNSbv5`a_`fRGCzAvwr%nDjh*`<aM1@Z)yZm+QHh5)
zU*Ih@w-Qr1U(Gjf!j(%)&YVBDK~kJgZ&pO8yOzp+IrBB&S_?n^ZZ3LqC3uNn{H*y)
zQ+o}B-tqIPt^RQS*PZr4$3lraL3v`IV{87KI?j{7qO`G9^3tja>tgn<ez=cYW#JdW
zmmA%h7iFGbsC4^7*rCjf``q4~zd1sTWZC^zm0nlO{$<IU-f%M8VClNXl{b9q>|#nL
z_nz-Ke=qZkX!)%0ik7?X_NR**<m4m6Vs2OdTUY;O+Rf9)6?$a${o1JYmhWc$r{Yb|
zKM2oP5Y(+&|LUYkxqQm}S$__nbIrZoWL|YH#Jp_71oQRx4&V6txoX$vDe)6{{WkX+
z+n63Wb=Q20p1}c@b4tqF=avRcoaNSeWvjrgKMH#{1}T5=o7kpxm7DQfai>(J?_cvL
z?>`+WHJx=mEK;V)H&AZn<CKQkTB7mG4E9w1DcJbwd(?|V5tVVLniMkwQd28cUUV{u
zw0pBkztFGyarS?AZrF4&@s!HMYa2ukGK(0kSpQI0v8A;jY%`Z+h|K+b4F$1%zkgf~
zl3VrU`Sj~1;xEtY@A+K2>waFh*pf9}?U{K+F0FfRCmg%V8s)pz@C%FihcMp7d8%6k
zn77)98~j`pcl>3Mm-q8H&CivptBRQpcCb1BTNU<IsehvwtKp55YiiTa%{8rBwIlY6
zgO305Esy@xae7~mt(x(m_+;?X_s*x|Ik;6$E7}AWxQQh!IQHT$=jz`ZKL)t+Eo3R$
zwI^roRE9^Vjg`Ys#97<hdg_aM{_fn@pITVtaqNphGds7NqtExSMjeiC?K(Z5RTie?
zwy?h0>)YFY_D$`-6^~;rH;1lnwfMARlG}bc2`%o+$tu+>r}$i#zF28wZm802ES#g-
zv&hr=;hl)wT$Ar!pKUV^eaYlZe)vYd;!*dK0?sh=NlzJmGHp=kiQTV|y^`g-%{RLz
z+4pyDPhIqXkpzd?;m2zOQUfEepSd9SYJ1kz$8PhN*s}LE{{Pq5zVV$NbIvBI+3EAN
zSFp)jonChJvep8H2wq!j!<&;2Z((V4i;tJP8h^~wf<3YP^IKWfTJ3jNe;s<haMSGX
zSAE4-WSPX+&33Hau;87-I;*V-4ADmwqh`)mSg9m*<7GupH^)P+@?Fn=Y`(2$w|nb@
z(-(KY2z#HLnHThDVpZ9rrUQq+Uq8Rs`6=TPPA>h6(K1_k8{RdUFMI!~a%a)gS!>oD
z>Hd7|->2CEOkrz8HilgBxw0b3eSL|^il*ruX{L*v{~FyWkJQ`yS5|WOk7c_K7vDKz
z(NKK(@f>{(ehuY2`KwJne*b*vbM(Axhu)|JYP`5M!*jW2jRQkx>H1YG!`~|(+57PG
z4$sr?!u794$8G(&b*tpbJ0B0O4sojPfBoxaoRsvAHN_i`nKEw?a;>SXO5;@K|N7x<
zWz>>ylaww!`7|d{Lv-rQi&^58vuZ9bs4h7q`kA%))G6=CF5YQn|9_TuTxe|1R`_>k
z$u)MNlZ(<BAG1^?MEtG!AR1SjQ+I|VdFAv;C*RfZx3EllsFms5{bJ6=(hCO-iu7N;
zX;j-f^USp;GlE?=t>6;#N=dDBWYe!zU>3iZEHBW&8{iTVdtGC3`1woOpV<#DaX6Ku
z+><Ie_ug{fQ#IEw{V`drVemrji;Sp|=2xxxg4I@%lMfdE5)iJv!_)n_c$394_I{5h
z|4UjqM~!yG_RRH+xsX}Wd&HK-^p$;p$&82@Mr)(C`}D?4f4R}|+m3a)cTY=AU`U)9
zCnnVP>h{ZbO-6T~6?iYtv#U2Kxj#WBz|TXZ$+h^+uj6T<xs5BjwbScde&t`<uG}~;
zq(9-yoEss=kADVv9`5p5`8`oHX7<fF8OBma774`%rwa64SrK~aoTayp?+e?@JV&ow
z+rDA@@hdk33cr7IYWr|yMU~pe7fP&~ugX8VIPq<6PFB!$YuPO!xqjx_N36fer(Raf
zIkW7W+{zVs3e1hWrcElYkX*)d-E6h=-E(peXWy(h(>}K5bFY%$qV;0SdJ7uYDJFf4
zXg~RIb<*jzp5D>B*Q_%9wBhNdiToQjvK^S`8}yO!*Ga9PkBX&Y*)Oihxtde^XT=qE
zXS1vo3qS1%nVGB?C{X$JjkMcg9b@rlX1lExF)w%RZkaPB_PT;#tij2^;;b)MR(-sx
zbUOI(r5pREGigu1dvm8ih0j}dzsa&Pe^Mq)t`Pf@Q@A>uvsvajf3;lt&6C@<X&#y_
zcs8O}*YJG~yM{-v`j(^*Y+5Hy33Th7zH?@aRPWo{PQAC@8LRT!x=%fy!PLHmd6#F`
za;MbK6K*)l*S;x^Pwr*RFgoO0{Zk-e@|owx-$R1xR|kksHsU$YvD!%SP2)Dkl49L`
zIlFS&Qkmac*SxjiH)~P<$7U1s;>xo^u@j{&@`q-*%G_Lih^-~%`(f_Hg^RhQRL)Oi
z$+=zb)Oumc&D}PN;`eK3vdhk1wr^>(O~mSxOMH61oPM=R%eg2vH8SKx%Q`ugE2$ee
z3b~tPijT@kT5i4aHSF<W=2uROB(zsMZSDQL-{0nQXxQP+(_3$=Z+`5YbMuv%`Fp>e
zJ$A}+QU6aD3oqIF?T2&D>gfA-^tQhJedH~F@!_cKjEg-XA=h4<-!yykK3<Ed2Mw20
zOUCgOX>NF;_#ogx+n%5h-iE6;j22FAYpDLQNU~*-#w1puix0Y@QuT$IA7!pQ#B|c)
z^i}8SzYk5^TieX_HvHk#=bK+2{mJB1;5F57f}4(z>1~mOy@JP_PBWYE77N75J*pPi
zWN6&z_TBqU?A_-JS4CyMvD&iuaKseeSC;Q=KhEL$KbzNnI#2BG0|h$g<eo8{Z(JX6
zK->Fs%D)#@UnF?hL?ohh<>ow-J32?<%<bYYo<TOb>gpx+i(Ha~wx=!GwsiJO?g?*{
z_BK9xzwq???!Ev2REw0D%C_%_f2?&vx%aM6psQ2%Pq{VMZmVWW8ed<(BGDm+_o24G
zg3`iWW{dW7rS-AQUjP4+<gOYAxto{0U93{W(^50DW=!T$;eB~<;)=B^RJZQDTlW5|
z_KgP%GFRl^Rxe$9cZ=GCq9nui^|d;e7ytb-X#?k+ZF|o2$0bgx$tw%H_H}{dhu?ow
zUolSkxM0GzdtcUUGujrjZvj`P>;H2nt;86gM2hPFI6a}jMCfCl+Jj3xN0+EBo-J^#
z@AT7KhV2&?Ni=R~6y3JsHM<o1n)uY(*(Rm(3mF?HXbF`#Op`42sEiEtUb|@-<F+5m
z_LxVn+&IZ^^CcNJkK>KOUs87Fe_0@J^LLMmv8AN6<ee<b`?VkKK2)+@I_B2Ty>M>p
z%fhm4KC4>amE@RgndI&hduYjy+sad~Zp{fyIDh2j-kUyCE>7jIJ7Jv6d6qY1-s}>i
z2R+3*cr&yP*@|xMJ(|90Px2L(M7@S%r`{?!9rT~$d10G*slg=!<9qQu=7%ggUvE~@
zVcpPhJf(ia0i%F9GuT_!C%8m%Ef3^X|Dz{4d%B13UYAv`BHrBE^?k;b?fJIqCHCiS
zu9=(JYGiA3$LzMOjWg+Tc2r5YUbbZ}%SOed$(L)>XN2%vFTXT**Yw5>$D3~Q|GLJ!
zdGdd*7p+GwnLIw=puKP#V`nx;oKIdz?7{B$d!6!`r>=|K9p1+FTQlNf4aZ)mH_MK4
zZr`-?`HVM~-@dRdJzy&{?cQbmPYMnX8V)aCw5)UCgwOeVLvlhp=Nvn9sHumC_mcEV
z4yh7V3zw@`O<m`hnnmkWsrN1RKPRtHoSM~G^2S>2^XA}9TXtxyygFlD=pB(Jzs|L5
zJc>-u?Q}V+v8rL>0p&d(7>z{pr#b$Z9M{p^q!zxx)79BpSMN#15uGQG6+@Jdz0^yd
zG@HwH?KQ7j{krXv6IgW0BxL?MSaJ$YpDsRg#ky<N4Qm8EtG=|gPiM=P;;=umf}8&V
z!@a<hiM<Ewk2*?!zEJzb^Jei6!^l~(*SG#TP;pN-fhA$TW5Sg15U;w@zI4O<;t4IH
zXAl3ftGm76c>DFlZ&Nnzihd*&u&`4~{_)M+HH=Ihhw{qrTzEHq{^hIM{|e4dI}~BD
zJmFWZ#B|mllDj@BdO96^ka)s)e$<Qf3>Jk;0k;hJPO%&lmfC-of9~X`GY#im{C4kg
zP8HiPwK)&B{awDK^grh}X(yH?pC7!`oo~E4_(g5-jMttgRi=Htv*qN&<#n@c?>5H7
zgrC3rj-N&1Uu1aqwoR$>hWj@BxX}DFPQX`sNtyXGyPhMnXWV`AW{F|rQ^u63DPc#a
z_7)ooEIZ`Zvb5q|?|TEc-d|m7_Sws<yuw=ORk|cb%ZbfJ^aY>FHANTxx@X#K&uV6e
z@t7H|y8rstH?N$soW&o5G?X?cGaFTW<Z(6(W8YJe)0&}P!MV>!e!t$T4e}Ba4~(5H
zLa!cJwIaFVS>6e*?n?8SF{-kbS|17>Ufrr%l6=0dtxmwmdDFgq`=+_%UKUn<werYP
z8<~sm#dn^RPx+CxyD&_GwL&Z+%Pgw+^__IH;1A4Cnf3V#Q$K_?J`ix?O5lFto2M7D
zXYbRL^!2%CDx23WKJ0Vr)~3}#fuYX-mOfl9|M8#0`<-{?q-1}{d`NkCU!dTR-P~Od
zTmMen`7-^798-UN@;!DoUZ+BXjt|za?_J}5GVy~*_fLV@1_%4U>+7zVZfkw=7SnHL
z9kV0<?ue`kI^H(HH}`np$!eu%vu+-FUihN&M+0lijpt#Dw*(#Jd@a>^eaB6s8?Szz
z+xH@Swe$)dC6>>-)~}A3vwa(DSNVxqw@ZKQxqpxSm!NFbqt8LNZ|HqpYir`S!96gx
z?&Dv1k?)n6?*!A2awI>ESQr-?d-j5+)c3{(1~WUl%tM@y+`3`<q~}tbBTq*0h9d7%
zU;aI_>dg?iBpsox;G^EQ?!pFr{?@DBWtE+G9BYaTt6UD5>K6T+JAH<R*$ne-`G4=k
z+&{2w`7&?zY@^j)t8_xn&UpXm$$}8GvJTsT<ggdFc1T|QCgS;Kb$a~t$LDK8KRvw~
zB)-n{MffSDEr)J)g^04pS?merb<mOx4ga*(cdPr~luIY{*4}NuB0W1<qW8_NT@7E~
zRzFn^O<S?Sl}TbNZ}v)+?BGi;d$?AK`Bmgqt@D`1c95m*VZf5MuUc=8gzqq(o3v5X
zpi1-g!WXu`W?1ZXJbBYb$nD0Nb=N-K+GLj<!(`WgW)<s`X+0q<S6t&}rSCZ7P-A=J
zp4jb;R}9rS$}dc3@MVAa`V;GsW9J$U8OTgw?{dAH_4MfTV<}ZN6Aa>7Sc@z}?5f`>
zz2=#;Z|aRrQ>NaI;N_{Yjp#CdC0G^8*sPWsxVA>b@KDF9?3YvC9rj<by?n;Tj15W$
zP8A7+<xRLhk&m^q>qyr<<%~=7MY=5NTT~xhY=~leVRY?P!j@luC&}&bC}rk8vSx|)
zk4q7&C!H;dOLJ#WNs~FTrF5RCe3$*)b-9!C^U7@B%`=F5USql<u=Q(GI4`sD5-*8E
zpAS{9FSxe$Naf3!>G!&)eb<px`zBlOb!o{tbD{UFW+y%g-W8oMAKZWD*gb^>-1~q1
zJI!BXpJ!XS&+pisQ@_NNmO32nI}}kSJ4b4&psAOFaezmRSJWw|q-QFzMg?D+Y`#BT
zzw-D+?Q@$9I>nwJ|E+qlypi*(!_4So>-XsQR{IOxx^tz}qwW0ug>A_N!KWV9nY(g_
zT{E8bB<MZo-<AN2uC1R}ClxQ^657h!VYzrZi_YeG!TLppzt8WjJ)hVY{nW*%W$LP}
zadK%}4Yka*SMhw|o#Zpkm8Dy0VnNV@Ie#y1e|q7uzR@=}{~OYo6Q{O%7P`FZ_57?<
z^Le4pdEb*K)AuX2_t_siYLX@YCVG<r)2mj+iN}+UJGgGF;5yN@T7KWT57Q<Jl!;DF
z%+A)f&(6qr(Pq_Mu%ye2#euQqxs2Xnrv1@Avw5d|$*<Yv@vbY3Yja3RTcw;>)=QfM
zQXRVbp6e2(pR=t_Rh655>(;HLcZc(~zu#eZS!|AErS6gNwfkgF)GzqXZR0K>`oT+)
zPsrhAXY4nbx|n;FFQs?IhaKI{$>^l9_}%8vz4^EAB?sNTqR9QY_C>F{p6!>^gB>Mu
z7M`s_9H9Z0wttQHUfTA4ho@bp$V90`ujMz(EaT7gD?UHMmSIxXQ?>AOe(m%Z7Dv`i
zTr&O29G>s7)1KV2ivC&lRZg^gL6=Po>*Q}uQ;f1d7=4lnmRKtqvQSFkQ^$@yY%`xM
zK9l;;r$qLjPAmH!wJR(V!tbWMd|7zy$^)MVdmhbP^EvvB-KyV)Gfx<O<A0(4tT?VW
z)Ijx3_<FWATpY@5C3lS#q~^?5+RP$!;)~1MzT0hU-(?^Ak@u;`cX5+Tydz(uF5@AQ
zxX?%oo%j2{eK*l-4B2&4+Nj6VTv@bxbFh)&UWHh9yTxtkvl45b<SDXm*18jvy<%(d
z;mQ|tc2xO!p5J)>)Pdvc?UndlLe{PEa?ZBxy?Mkd<oe1<$9Qdoet)>S*{Jj_^UN3f
z9eTYEE*A5*ntJDo!?sNu*Zw}}lqPP~esSX3UCSJmelabXzJ+7ivo_H@kp(NcZ7L#v
z>F+y#NLys_!sDhF!cW}1F#Do!-v)=|bp68$Q@8d8HM?9Fd)RPeitX|F%TizPhKU~M
z>3{R*_WkgK=Epa%?@_j~x_5usDdrQa_wC!aXnN=~eh=SV=KIZD^$n~ZYZrbutVl6)
zT(F|)%=5x7<=F|J6(5{2UgaU=9W1gg;rH5=YbVy)Rxf#f%5~dGmyL>A5wiUovhTjN
zo4(NDvayrJ@wfbwrpcG6X>ho<YG;%P^tpUL)Vk7f=InU^?-Tg7|0kA+<OzrE4fSK2
zfB8~vfK6(hq|Ntfa_>Z?yv3OFcI=8=b;X#m+0e#w{k!ccIh|Zg^K_guZ-oD{me3ZM
zx1xB4wAFg2{5CJ;$urcISa~PSDwWqc+h?SHV4u~mcmo;5Bu$R;`@#zv6z2qg*UD0v
z!5?HfBksKL+w`j|7I?=?{LS+^Jon9l8PzLJ)_G4{*lLn_+m}nJW$(ktn7a3&cI~BM
z`Jt(KEgSEcya+nYHc9XepYE%t%y$H0XG}eEXTz_lo^3}QR&_EZi)cIX-QBg}lAFKA
zL=T%Swda-v#<rjAp6+V>_G*h%p>xQ*8O_@1af=<Fl--|o>3Bjz!Q~wid#dg^+%L4{
zelwA;$mxXJocm0oizojUDQ0~9$kBQB+JL`j+ahx6nyM`(M+wfK7db`WAZB&-fqPf0
zC;epK;v5^x`uyaEGd%H=e(ua%yz!*2*z$m;c{lu&Ow)_vZt@uWuZsSDQPfRw;py;m
z1+xV83~nuns?n9-_pN+Rz!C1_ArGf6F5piNKRWrc?_PIPs|RU6es^|ya$YabJ^OpX
z>U&D<^Z!Y5u?l<$T)66id)&i6x9=}Ca_&3KabB{1dcae`UbpTq-vbn;Ui})9#hsPg
zz#*i-sK2_*)<yoVuci3!-q(BEt{6r3`)z!doVLYZ@3qANQL(%i(^g$$ex$KJ@%h1%
zFC%Bpo|}GIbNAni8vGg;zR3Qvy6t<O<26Trv9E2wrSKOIS?+9(pD+5y^YX7bhr`cb
zROSr7cH&Zsz2}`Le5Xz(8Kj;#-gd6dwuOU#PW|-4=Nq*6m(P5?;no_Z^B3wL#(v}b
z*j&%?@yBew5VOfjFCSH%TJVPd+BU<Jr)6f}{o?n<KH%^6?OQim3fL*@#&w#!pL*}H
z|Ausnd#@e$=Qt#A8gIKi;ZUPX==!O<8?VobnDb9%@1C>YE=)Xj;`^3&)@fz8jD`Mj
zykrdG`Ecy2vHhc&8ou-H-}>}zLqc9wNkewS`-L;EC10N8w<`Ue=JY+6In0~)@CRJH
z7kplFZeafAdmM_36Fw$Z-aO&TxIj6rQGW{Cx0go_sP6pru>VFnTbGd0>$0|~f!t3Q
znYXQAvOZwN!@xPC_paJj4hHsyvgU-6(z+h6ua4in+ntWxJbL{S_W_kHKRLpr-3km+
z4(wo_Shca4Rd~bQUDNcq+*FPq+7<a~wspSe+=in}bFOe*%rRS8Y0SjBPV+{|b9FYA
zh3p)KnKcqq#1+>s6Hh8Mb9~5<$f9<uiK~i(twv{URq4-(Hph=eOZ@4m?O3eMY5Dh&
z{zcO}IfpevoVS0KG0a#h*sji{;k^D~SDwHTi??ZoafZ_u$3K78yJ7bE*AM4BynlJJ
z@}?~Y%Rk>bTfn~N&7PO<^6CytXKc7RlQXhs-HHt#4Uh3@Gca*I+;#Hb=Oz2tzX+Nt
zdR)8xwtwBj38I^JC_73|>d_OAO%TyI_*vm{k=^RY`4e1fT*aQJEnT(C?VDV!)25TI
z-zG=+ufHGGxFKVMN+WmZykKv>&QDxh-&FbA>oeXpPKe#{<=yF)Z$|s1S5CY)`TR=r
zODc?8yH0<to*s26qIi$Oiv>Gof19UPYqut^f@{HT#>Z=J$2)FvYthL47Zv(yZp!>t
z$IaV}&ZoO_2+N6RZ+^`E<%8{w<W*~~P1Y8=^n0P9)E=4o%80Dn{2iBH8?Ol#C~sOR
zH6f)|f6tlr)>DhFu6ey>{r3g4?iZF_a{eChaHjU;#_sp051o<tzD0DCChz?y+vmMb
zR?DldNbdaiarUDV>m_^csHN=w{9v-ss`pdo9QF?@uzCFH%Y+tZMKQg5E7!eFd|TYJ
zaMea<sa-r=avEGBy3Gor)vxwW|9^|8ys7ZvGZ~kMY^h!Q=gyUwbn>9K8q56(doGRF
z(Ytp}zaXDkRWswvtqI=0{q`3`r&jIPyLA2z%btU`7A>!CTXV?nS>lHBw|?f`=jV#w
z|2@xS>sv#v>XHi!XN7T{W3%OmyQ{JyNAKx#MbV8nRXEm1?_68%e!}9#zoXOBBp$P`
z*5P~i=7D9~DlWIfJ&%6RT(hjq=OnxR59^;V@BfkawJMGE2-()ey8S_-FQZl3!@s@v
z3=T7%{q1++#@FK6MOQDb+Ncxa>9INbJ@X!`1xr3#o!e~xM@;zJ_M)qSJ|Y^Qg;s8u
z7N;MTx79aSgeOVtaOBA!XN9B=-s;uUH&73d<2cc}{h$4$8>;8`s!sKtyGwHKCXx6c
z{-?2bQ_NOoW=xe5wM%_E)$RIr-!i!))du@3*8MJ2cz-Lof$PW`j_}ns8!e8`zgjBu
zVE;vZrPqZURafYm>c6a*^3X;hc+Rr))WG!nW$(TyG<S3GuDtb4ZfW9?N1?Il5q}>f
zE}q`L@9M5+>GA)!#r*zI+N3N|te<*9H{zkWbgNv0K-p#OZJjf|pPQ(7@CLu7+F!|I
zm!2O^+$@o;$>aN8h_&x(@7hm4<Nv-tnpnI!S*bht>)yE7!%W@jU;W+{DZfZ_nkzr+
zdn4bBxqE}I7KVH;n^t+T^PzUphm-Sz)>~<%$Nh~y#akwJ)j8oyuHg#b991{T>&`u1
zZ@cC9DEimEynZA+aYOoI->kmR5er)7=Sok1IWfDc%&PN{)9Ggqz2AGzJpI?>bEUv5
z+vD>WDssQ)P?_`MR#(@jBd0d`^nVrRd058gGcA`pGDE`Hsms-7@rE51lKv-tZr`sy
zm)%dYT5bNcJyjPJzfMxFde#`E!{4^l^{MzbZx4HMBO`YG8!xLA64OsGXgFw0N|N)Q
z&z#J3x;$j>BO_aRw%OYPzr1x>=oMM%vG$u`6{|za*;Uco>}-?N_;}-{2DyZ;T)k_q
z>)DA9w{?lB3;7jW{q(qSfSXb0-Qw-_A2`Kl9QEAA_}i||TP(faS85l(@JZ%_Iqv2r
z2Y!TXWPHTM_=L|Y()eNc!+^_I*1mf>!PB*9Ht(YE>q3^E?0PD5>!s95@A*+v3;dVg
zkT_QD?2+rNcuQs9EG46Z3(`+`IZPGYBX78WxsaOD@|?@XZTmZQ^-m|C-_pH#!la)c
zUq3le^=Wy%_q23(Nv9P#)+rm3R!ujq_&Uc$>Q*PyuG{HTxDtAP=B=6Y{pL2)HIjF;
zwLee3!@uCvc9ET@8>>90|0v;AXgJ*zD#X)c{QSYE%I<mZWnafgq@9?cAfo7ZAd%5w
z#igH))14x&RX%%UGbcS_qWHb)sa(&e{i=1A%E@rN-FssFqdB+D>e3D<<o}6m+%n7T
zQ_;<nM_!p&oZs;M%l?p@dEeU$T^}<u-CVMwenn1~mcoSJ1wRgLva(<3v_H(Mbhbsw
z{(ipLX@Ax2w3pBOA9?sy7(e#{CiU)?T$jj;lhls7hg~|6d-Q7X`6VjR8*&po8uEf$
zeYnIY7_c3>w7`q|gnYoF_x67m@hoh6BB;e5wBw42*YSnwJC+9=IjwYct4KKW`R`Yz
z*ZXEgf8TI2R%u(tB3@b7X-P&L3cG>@QzXP6=1$)~NtY)eI{1Xhi$*1_X17>R3E!*}
zRS{d3&z~AG<=8h{qk?y`A8i#<v&=n{@>@#9uQ1PiROK+U$N!6W?CrX?$AYqjd@H;w
zUl_-$9T(B4zF1Y5m=z&!;>3OATovzgbs?wnODW~Q_g>`N?DlGR|3+@{LyZ3lbZr|Z
zzMg)zPTD*w>O+;ld}pQ4&R?DO{fhqIWSAK-nRR*pQ5&smsWPr5H&ql1ZcMnF@nzBZ
zkFU)C&Fy&2cduP*-mPbRQT?kgMlOm!z{=MB;Zu9Q*lW25ckg)ZlE}^e>=wB3pYP{+
zhyT>%n6(_a@U2*NqYLXM$?O9OQ_fCKU%hql>_f&u*R?)AwVXLyLgnk3Gd}yTm~Zv2
z)L8L(liJ*Be$Nnd6``#~)3a(MSi}1Hnpot5R!19)`($XFsZ7WenDW4w*(0GcZHnUJ
zRky_I;y<(>4K>Je{$#oM;LN$Ea^=eoEPuM>l-Pv=2HmhP35TmWu5A-a%e=~Qag}=1
z3C}4L)1^1Ouij~s<>2Tkb|Lsq#wk6!uND{Ix8<DL$H1-q@w37SH+ch--CulI4hd>r
z{>%Qb&p2iCYSEahXZBv+^L<9i*Eds}PWwx&x|udPrY!Z9uCmmIO$LY0&4~M|_E7Qp
z^+j%P-4CujrMmR}^}pNYrmi`=IP7oNzU^~9CoWtcFeCi_HRrmOAtkeRPIF)6@a3ko
zb=A@JModleY6q@7P>q~3Td6ka@WkUw*OlrAF5UdfmN(8aTZ?~o2!qSSaK$xp(p=j%
z=3i`*Vq^T2`g)`0%sH~l3Wcxi)J?hm<#W&(Z}C&gZhF2?*?4pmSORB#Sa4|S_O}1G
zB>YNOU4L@1w)4@&6<TEmP0z0!-X>r1rZ`BB&30FJ#qaL-wewjGGbV-X;M5Jd_2)&|
z$*;3lJLZQjIr7MAvpz%8$_208WI1A##q`DOI8ScbBT&IO{rsN^oZ2l?3Kb3u@0EXZ
z7n#SStPnUmdh(GkrL|u@Z~sdUx_hVe_O%rSwhQk{&$_*$f@vZfSN#E9$9N;A8H*w<
zDps@U{Mfh2$mt8K8Q&+tr>_zjGnuQHBKC7XzP>`G@cwSjERDrH6GQwWV`fY*etz!c
zi4z=+d>fuPFf*-Qk$PTGa!*-cSd!t&{1uZM_}PurO277&=Zd8|>X|2t+&Ldne9+{$
zpj>NEgL+f7eoySQOxr1W0k=ZTH=8jZsorqxd1&GyjS21BTl)U_Npby_44WKm6f^zD
zDXz)$R=nTwFn{Cmw`%+s&wl*P{#Qs@Cr$g~44o^YEF2B08y+#Lx=U;h;7PWvaOLk3
zeWIo%#iOG9`*`)=SDC9Df`ffSE-YLj{=A^-MVDjNEUyU~hVwl)ZOD`Da&Jvn%b)(_
z63gzn$HbSrp3QWVUtt)_=(O$PYB@JCp;HaT=lf!&^2hzu{<`IOsZ9ULsI0dWpMKrI
z$FaRH{=Y|?{(gTw(-Vyzsar!r!Y&0gigzxls7#%EYLeW_0Oma#mrgdZop_5aGwA1|
z?>kGMZF*EF!Ma(&ch0<7Dw>Io``IrXTlPtN^=H$9kFksAaVM7CSZc+lu`wa^@U&=~
zXoksW=brVC<9P0z_fSXCJ@W1i%~Z9HBb=w$O{O?S+C4~Re4_FwFzQkOTSxcLzm3vU
z7@Z;-&QHDO6yfyj*&&rX%wg4<v5gPkJx|&7zP9kygF~gVlhoE$A6#Lvt^SkUkLo+@
z!i-FN`s4m@v-w`U-!(#2DDdrXzW@#fvzMn>QYu&7KcN45$?q6H%Yrvs{uCrV5Sx}Y
z&qQ_MEVYf*OiwBoK7FpaSoHtD)%TZZ^QV?-zi;lW+p2S`s_)dNPey{aWy1Hk{abt|
zKXdDhXqaAZ&awV!?U4{ohlvX|=n3&%(waYS)}rOCAwqm&Q$(I+R%T9QvYZ+-m6@II
zl!r!*JO7ispUu&>i;r?u*{{0&R_(ZGOfm=0Gy7frljn+@f9x{jyzG?Li>r0)vNPXL
zn7NWuIcDe0!sNcI9TR*Se>2%`|Gb3vX2*Hsu=Py=Me~#x7}nOyA8Xy&qnF;jP^O0e
zhtXk+DmFv$$<5Q3?)|Q^wrsIz(Z9y;?FQGZ{TUc%t(Y2acIwn03tQ$nj3%N@7uiDm
z4hm0e2!3w9GwI7N&6KOR3%b36G;b8Uyp6Ds@pqkkg*}@iR<zx*i7UT8G0!d4kM%rf
z3*UwG%)RnaDl&C{SU<KaU0PUN@NH|p-6R9CMFubGg;wQG`}pv++mE=ZN>Mx}rEi}8
zYTV7k(pkE;`i1S)?QcVW8hd0|*jn2D=6JvH#mp`<y_t9B`1twF;t?19Vld${>m1qF
zyf3Wk(zi;ye^I)DS-~S%f6vGANBZA$>_qZz+pP^e=pl1yhHv^Op$kjB*XzB!7&S2<
zwA*51#7fr9+6#9j<i`F^&G|4Z>wxjARcFNcb2eJ-atT&klCslQ?62FyWlwTfe!9`I
zN|M#B;bD`D;Gtc)_dWAsoGR7|oXd?`{H$cs`TbvQEx-P`zT@BrbBW!d4`Vf^y#5~f
z@%r~w;YNC|wKrcXeb6$e{<~?XuCB=Jof6mf?OGno9$~?;ntvMO9k(Zb7v>3{(C1JH
znRZX>jI&R*z={<uRSbMLuUB`xljGkN6}lqU@x{V@duPvnp2u`UYu_Q;g)RYKdv+Ao
zeh%zh|5Q~ne%h>Ue~bRToqnd`W%4EyQy0}s_in0AKfhQ1vGZRaw)<Xz5!X0kUY?C8
zsj$zA(YcXg$kRDtZs(-iUV3X1w#_;!k+kc5z>KFCzBXTA5#n;%;uBl0^2UvQ-3*(g
zO36KSM_07o%;8|?%t&|mG;e~6xO(L5#`6XeQ#QN$FJ*YK;;_T{$iKJcr!hH3Fc%j7
zQu@iH_>%SOvhXzb3cXv^{sA)#p6u9`b!nqbOV;bJCac#bF3{=w9(Yo@r0tjXh1Vu!
z+dj`p<t|h55LoW7F7|TiZ7z)sU%Jk|G+*$fb&q9Q?fT2?FGQV<&P-ns%HNi0H(N8N
z@c`HLZC<Xm?A5mx`!ZWe9eUM!mS?lv>t}ymlHW46e%oO8TfRDQSHIoa4WbbnpQo!u
zb~S8bUX#51l=6k@1@-}<vBL9NJ4?5$(0$UjWZzQnS>I&B^4D#?aqgg@oyP0K;VVrN
z1Qr=ye{+Gg=z!!;%delC1l3;Zo)@W!Tx;9@<k0N<`_fZ)MK<sjSvYtr@rPdC=6^je
z^3J47&%-4fOutWxyQ%G)%O|<3F0SgLRM_=DU-SREbN=`{rze`zm)mIP+zagg*i`x^
zu8Q(}9=plH_*83>-~!32omcNi`c7Q1A|U7M$JzQPi|v2Up2SoyBrPO)(y~YX>amS4
z*7U^v4Y<25>SfLy{kzBKP5r*_ce*Oqkp+?YcZ)s5H_p4dG(h7+UqS7MSNDrPPN>;m
z`tEQ@j@AsJ)0-a^zWU*0%47ZD!IP_@>v`By>gt+KMmkjOwY$HpWesb5-})mnJmlZ*
z*NH5B9J_6f&noTS-mP!uP7B-WvB)^NXR>~)laZ;deraxXO4gMXvp-Dzng2mx?T4#j
zW>PI#FWWXxne#PYWAfPwwWDm2S~eG$Sz22X;@#v}674uvY`rQfxvwtp|K3H#?=GL$
zo4)a4;MNo35fNKW9TR(m&#)GT9{GCLy-Q`r(UcxZ0jC|;UJ3sXI3eP@<9nN(!J$09
zNb&T%&_|y++c*^pGN(9J-gv{W-m`fA<;ow%Y4c^-yAvkw+8=%;`ONE^)j!Yw@3`_d
z<=R%uGtYv4UYg;5F?p9@YeI#2!@)%bKZ@gj>-Vx{t3`U3<Tc&N53}%J%b*;%`ni70
zT?e(spoWgr6AGson_t&eYdqPzDmSG=woSFiW4pdm<XvSs0rj{V|9ijg#TV9mnRVr{
zL6M_c%psO@8-i>FjOJZp32|s#q|U`*+i&xYr_pD|`;Q0hn34)gS3bP8>wCw&@~Hv&
z0y#?jQEYiSrV+BYU6Lm%e9KdqGKquNj$a^2!*z<lk;R3k5#nEVs$co-qZWBlhtFDg
zt8@5yFYoa6HQ!F}SIe(|?tfA)Q}E(loil5j45K}t{zzLBxa-7$^Ubql!hYQhR~1<|
z<=VQvPj2nJ+`L(UJ(2Hj#PfT9`sP%8Tg_v=_V{zveKxLo>!-fhbK_I?o63q8E9WP2
zXfC^VWuEZ)Q%lSDAKxIb`ubOc3Cb%Il;_E&bP5C=oRuc|+TK5lF~TP7-_x-3tu3=I
zKc2p-@9`#!GS{HZi-T5*xh55cOcQ^uvM9`b$=*o?$M@WHU$9}N<t>3rj}QM13cRkg
zIry=V4!=k8dCt&~t6Q#}-}i@i<%-;i_tfj%#Fn*3+JrCbuKC$4?`g9#ZmDiS$d_ry
zE7TQBHgCF_(|6>P&HJ*(S9T$hy0O3eyf&=!eX~>Lv+V0va_&r`B0d*?dNx0b7gaj6
ze6n!z5|fRya&qGWBsg~5^qf2W9J9`bBaI3+V)tfV*6m;Ao^$Zj)f;c_6yNAy{ZX~>
z^`zeyCmKG#(ro3QedRH~@Y592gsKT~9G`qbJ8o_-U2*(Ddc1VVqsL5ZM9zr5-}}it
zEjs;pTfm;L!qX01_wwsGXUoOaZ~IkLs+V;tqeEKbB{@aoXLSos6l;o|QQ~PaD1NBs
zCG7poW<`>dhCqoj>wC!;ZWm6oENJVJn!RSdp75_;y&j9p+p}F`Ua8*9n<cx((r)ql
zLz0$1|6E_uVH2lvlUL66%1wqdEKd}?xEo^5uG8~~{%*%q&GhuPdvfHar|*u%H||`&
zZJo2uGgrgBU5kR8t_D_J_*R_1UnTIWTF1_XeF<r6;{VluyQi~bqlvY!^$m_D7EY!+
z-)%jg%?sUmCGKwM-t8$XReMuCr<wA{i9DRK;rPS$$`8)%vfsLo^Y?9Ve!TIxuy9d^
z$>NDuUWJvfzH)bKNqAUl?oR!bqWk4dEDj7R8-LW?Kk9$arBUU?nKdt8X_jm>o~)wx
z?(hH4^FPmhYh9fD{mLtrVo|Nui^7MbjxQB#C^+z$v6bc2)p@^<)oaDpra$?%`+j=Q
z*9GqigE?7Wcb~gv{r>+EDehHnd{^BIO_fAbUu5N{`ggOdH22!B*>G@+^#xVsmwB8;
zQF|wadzM5r@dbsRy4R&3&O0^k_Q@yvcJ{k7&hBPz@LDakbk8#HvP+R>(-W6@aqc=2
znfqA1%lS|65(`xi=asXq%}S<w{C(4Xe}VL#BWg!0Iafyav#1EjW}R`Y3|QO77W<`?
zm)9p@)~~$gHT+3&rimxs)=F@EtCmfD$1!QM!7Yhs?)93=9|Y#O6m%?BF6@|~=JEX6
zwL?axwu|o_H(LGPqT&U|PU$~(DJ(`jVfT)1jE?y|H>GK+YoCAV>-w@_Y2QaOr$jtN
zSj87_zaRc|;r#fEDoY!yp2=Rief!#++|X4o?xZt))vQts$WZsQ*Pi#rER}WBkwC6r
z-#@LAnkljG^zP#`n-4K-Z(Y9RLU`u8)Bnm}-~XVLu;Rkey`u9bmDrq_r+a~aAybj|
zamn^0MpA7D#R|S1a$T97lfLp#deQ?y)&R?#H&$l_4{J~UUUX!Z9b^3inNI!Vkr~Vr
zI=3D;&t1FmIj8T+ZTf$tjrvS)a;!h)ckJM#;tCnjopP!MjSHkiTtyOD+q)NEU%F|J
z%elCkj~%=x=d=Ak)*vHiSrGB~T=9F!Uq8}$H1*H)bO(RGCmGb;#Fu@+gMss^xk<5s
z(4FTgMcro$f1WzH<Ja*_o6Vm@_>O&5*1r74g7uM$&&G8NJ&R(a+4tT5l9W*Fu&HAY
zgHzbnx#CA6<J7JDgr@Ck+Gw^o{(|KSNBMs*cwbspP7@XNn6lV#`NGdC*;fy*nxMEt
zAY~2fvEoI0Bu;(&kmku!^!U*!l_QJqU3m0pQIEgRsZ(q2Ia?k4>SQCnLh7o?(Pumv
z4gt4T#U<FxOL(d09PVA*<)Q77bFK7QrIb6*Os9Arp2+g|oRuH9<{STMs5LSXK31*$
z<mS!QcYQi@)Yd0u+CL7yV0_zMufSe+@A9RKw)xr~ZxDUVy0uqsMeEA;O)KKJnqJ*?
zd}+`_ePwH=Czp9Nth)9b{OypzU?Q-?xn^0i`m*!SA3ix;v#Y+^>Gw-*jn#oByEZCK
zb~aB5{w~BB9io~Pue|#68Quz!iUr|p512)6bqLw4{cXG_Tz7AJN>x(Cw9w2$$CCUw
z4@qdepD(j3d8(s*8mrX2+7R0slM_w*Iyz*WXN0IJRfz>kcB<GG&9+!Q!{t`_uS1O{
zmi{HW7gmQ|_6X=I=Kl8Z!=DZnrPVz1`&TQrDjMqY9sm32M)qHxfJe=L4}}LFKBe6d
zZ6FcSCdDB&Vg6m8Hz$t$Vk-_#I8-Y%Ih=pBbK^q?`@0=Y(jO)%`U-^mTfY9XLFqKF
z*oAlV<bHmbYo1bA6%qIQto<VH-ZqIza$*4%*S75alzjH4S-0D_vkA&CEydi{6)QjL
zY|+uz6{wZ@Qm5f8A*i9e;N$G~HU4`0f0c@U;VScacO)z&F)z%^`_7tITvM-h9*$nw
zZmLuJSAFT))$ww7YU2I&f6!H0Gqbb(Qt>mcl`}Uc$nXDZJMBs3)!3uOa%l@Y(+ub4
zrcd^~z3La=rEZHL!<&qyu93Z=e9Pm+g?1h-YnP4^P<bqO@1H{z`#FZi#c#u&sV`al
zDw1=xfq(C!m9M?;=x<-{qcq#Iw0!l_Z3{y${uY|J<E4qdM3~lukmI+M_H=$|*eld+
z9MyHgc}79xz9y!n>=g?y+-dI;UVqxR$ZNsdr#~gvr7u_&v}ad&>DS&(d-j|W5P9-g
z<7{7;WyT~n4llv%!!wOnE(zuQa{5qE&!z7#*!I>P*?I9e%QyB9{;g3}Gi%s1BIZd=
z5_Ns#aA0N1o0Y2Pf6uG+-FqkQ;|jssed~?+XGO>f$CpY6noHex$ml8#T(M;Dj63{K
zGK^<Wym>M(vNz8&HMaT4wDcYJ8sV{VGZak)Up$&9E>ZC;b!sDL*<0p}lyc$E{^sti
zTrwgr9llMn&g49wu;qZt``pyBNeo9^T)KFFKKn2C$(-YM^P{Ej-?$d}JpAl+$M2<t
zh5po6md5T9+?SOlWn_}#HrqsKZ|qHd)pYpRyS|_&N&JHOxw)5DOkE}C^6s!WhfzuU
zGPf;UIqQ5nZ!f<lzqDMTCOYJbo#`isbt{b6dK>od>EY@5DbMHHa%1Mz^MyR&UaSf?
zE;w4HaQHm#^e(YEz-CkN+Bxz>-<vRPkzLzXax^s^ejZ=@_`YXtu(W#R(yNa>)UWCO
zlZ|&cwR(1j?%uljb85eCPf7mPc;rj1PO!~)B|)tfhnin?9@LGQH+#Zv`8_B9u~<vl
zYq)W+%>A11EA~*zi6u*)Z<%*uhmPhVzKR1@(i>LQ6&c^}7m{<@_x#&#`$;z*&1jjm
zYst2y(a(;*Uv;T+!S}mIe$-{|%*(6cvRk=E-=}N;8TH=WyRX)snY4f9gw<I+m5PTa
z#ZPRhe=KFd!)7D%Ozk=MvuRQrcU`kvnVB=WwDe@;q?r4ji%zwhuQ%#perjTEy!^x!
z_a(b`SsXqWXYxaKW%N8n4*8iCyqXIWtETO_xPx!^Z^chHTQ<s6KlG1Jb&!gxF4doX
zv;4}X;x?H8;bwD*xV5Wt6_O91JiY$(*Yf{;d$RnMQ<}35zcZe$x^d%*>X?=Fc_(iL
z%~&|?l0&o2j*oKhrGF<dav$F)V%)%T`s3AtKHD9N)1!WQ@H%Dj_^-TTw#_RjP*00<
z?J8UK$f@3&4TZwio$>$p$8M|51f_q!w%Pfqxb73tX9x@Vlq!2-XUInJBQ4uEip~Fa
zPL@4&e^GW~X<c)pR3N{BrFqF5#Yn|;Ma><o3~{0SGCU#&L!$N`$o$G-wsi4(8A<0)
z+6kYFw|cfcoXdKiuZ};HgITDzJiR2&?0Q1?PaTac$9d{kYMjK5<(>AciC}ugxzh0K
z$tV@YxzFP#hhK`EDJT16!S{$Wubc~H8v6R19aO@PaW2(}7M%EF))ehqJ+9`dA0|sb
zIl+{4@8r((-&4;?>8mVr<1wBtf9IFSw&E+dXMb$b+FxYGl6H4#R)E=xH9>s~q^4>K
zeYv{*+lK>cj|GbqBM(I@UBCacF-ObF?4G-!XY`I)D`EumRn70Nx_;eWMsDR>o87Bt
zhh4E)STgnGaiyKB)_j=U&Lqtfc5<iqe!Zu5>wOk%ayFMUUZu`%KQZ8d{=roZM}j5q
z9iDbuRX0}s%Z2^%2G=}W_if$E&B1lC;QjRaTly)fEJAI|FYI&7{9^l?D=;iFFXiQl
zx8H9ta8+i!eDk>2DZ*T7wvnx=^7nQ7&mZnEwcv}`IHSmTx7|)=pB)k>o>rJN{)_xB
zVNoO}S=6hpzt`=t<>wD->K78XWE$<%%;sWw(5oQRoz(PcRn}_dKbj5sQw}N5iN1X2
ztfXyRfz`|J3%PHF^j%A9OUZg6=3UBr`%Ph0(59Pv_qF)ml{Qd~|MRJQNyuK8Inq-u
zH2)Oe`2WW-q5rn#hG#zASj9De%X|xG{}a_5vFGcKDja>5aj?4e)4#Pp)J{i~HZJ*n
zMOA87|GhtQj=VfFQ*!H8nBNb0Q{VscZew&upN^lu21i}ov~A@g8DCEyyJK*jrDc9X
zD#KY}r-vt|UfEV+)X2ZcxkB;VDv#eYO)Aej?K&0`ajUfVuT+W1frh}_D!Ex3(vG*Q
zNcDR7{`TZcE}nY5tGG0Es_gz5#dq#pQc~C7r=?fF_Q>|uP_LhtvPArU&3K$=Y{|@I
zo>QC~c5V8zh|T?*OfGf2V4B%z$1bVyxOGPB?2zmBoAxPQyrCxj+aYg<+4q1$!se=?
zGgF0fV$F|)Mk&@#-|tsqSo2xjrG~SVztEuJn&Ic>llx*M-!8oBo^;i#xyo|w3zlFW
z$L9^3?4SGTxGzdq^>)0<lw2w>*V?iy<f7D5zeQGjiA5)Gy_%$QU68$f`Q(XwuB%>z
z9~7}oS3Ajf&n2Zb=j3Yd&zG)UJbkF+?b<`Jd#=?qJqoZDIM;YJwCX&A%rS|l_VRlg
zxXv_OaIXA+%YVl9CYb`WZF1+f2|t(6yP=rc7HqY<N@A1b&idO)M|8i6&2>0`i>pDd
zGVfdMl*`Iz-JAN(XJ}kpZezM2pxt}g@;1>uchhZTSUo@Ns5-arK+u~T$GS|t%FP@9
z{17|x<>L+ATQAe+P4-bbvzhr+*QsffFWtGR|MVc+&f?F>Qe_fF#uD!e<5F&fEwwPV
z(+T{#X7TFcO&fP5oLsWL>6qxkMP0AdGT-l4n7Z}sqYu};uN$wQEOlZ+@VoLhp4o>3
zc{zI6XIL8av!1#v64erQ!RN-gNAnN9ejik}mb3ZYaVGh+JezsqinbwX6D3&=znE2Z
zlr?tAd2Z(Z3)+YFOIU7P`kX!eq)qZa8UDq}h5ZIUBKn;yeSTMSwLOe@F>%rL=tn-n
zA<cib@f6Q;NV$FGips>No;!d3^H<%o&8<#+%9^dO&MGea{?cXfQ#ILit{GQFrae<q
z+|!VvXnt0DQrEM|MZa3(lVxsH$g$V9y_~9`+McI2L7T-uV%5X|U)j^#j?;Su96c9I
z<X~$ruC41iQSRHz`pi$6F?Jz4%e~{h^Z!p^$y;+f>~Y8$W2+vfro`U0o0YUKTsZin
z?%Lz@{LY!$Jq42c_^kdv+u5U?RWX0TgF~yeH|^W!7E<=?j;rm3M8Cq<7GL-HXhg|N
z?^%5B+AN=5+Z0D8FDCuHUqsh!kFA)o!}(3<RJ+V=-7EH3>AX+0x%5})u18nW0r6$;
z7Z$N9c1=;T_F;D6W0BoH+1Wf&gW*=0Pu}4R249|v9Ig$u2%44n^Ks${fl#xcgc;}3
zzcQ`Ry7-*CE$ikARymyoaZjXYNl7nVxp3l%>&I{2SgHPLW*I|AcGIGLi?lSNrMqq9
zIiwvM^>oindYJIy+Sa>?p2xdvM7YjY+32tywcEYTJSFkVwk3-`=N!0ub4KdRqBdda
z<S$Wyf0}|G?Rv)7w@dFEkL=b74VA1<P8GRKSaB;^c-1RbA6r&Y>n}$q&pPPmykvf-
zP^O620p{e(IqPy{A6iM2Hh73gZCIhSOYiUW`1^C?DlbH(bj`^)xoY=X_v=$#7I!a*
zt~_Bk#X7uxMZ)uiJa>0!z5oBi|L9HwTdm^YWFvFy(?<{e$vAU$hWzf+le~k2vLEGa
zNb!6AQF_*l8P{EJM9d0O?Y^|v?dxRmBMakSzL2?VWz4g3#y#f6F9IhrD4h^~RdubL
zXM(lnl`=1;waY#3iFK=c+>5w-P2XFK!Q%|mQ^og9XAhrwHv9d*2~CL_xB0ayx2`of
zDXqHmSYD7x?8Z~vXM6kHUvA&HZ`qR{8;(q`tzG-FJ!75M>BH6AmpI<N{`6>Nr>nU~
zRJ)q|1r3WkuTE)sH4C<0XS}B)@Mxj%H6LT+>#aft_nZtrU*^A^uPoeJ945)cc4c#Q
ztpw*Unbming&YeL)9DhD_`hlvTXtUCyW=1JMi>2l{QXDy`s>v$n~uN9Gro1}%Z0^f
zn=LoLFWFf>pVRZynY_9uo43hj2^d8OMP5EsxMRlujb`S0#j8RRJpx=d?Adf^iB=o8
zqWMpiJ*w5Ls^^}p<UT*~HmB;gxO6Wu_dJi1+NnN!uHX9;9XWS)MUvO$mIJy^=1x3l
zef{g^)lXgO=UaIF*~MnPM3>##&1&btMYDXrzDW$3cqKRIWrAkrMz4(-(^w`<*V>V3
zS2%C+*0u8#@AltR>`rt0Dpv91#KSTl=B@EFq!K@zxYgyudtY?BvhK|vpYo2X{z}>8
z*Zql|)td2HzxIvmPgZk8PF&=?C&<|A*9PM`_B`C@`@0VO>YKcYRp@M^_oHxT_E#(S
zeb!(7eT^6UW7X{0x0asiZ>d^2h4q!CUvP^4!`~5={WcF1GZ(}yUzO^hw2>uwR)=QN
zs(DX8T9ol`woM5;anvY|Bj)wViPc8-b@8WSHCOVr?)b1nY!=V-XUkk4in2dipuK11
zUiYY5x|@tu`1ALFZ>v%*c8UCUAtKPzv1I-3wTi(U!Dnsu=pB~--*bMZKUe1r^NFF$
zeh56!+ZFD(yZ*ED&ce6PgRWn3npGvly6%kEf^EG^@@A;sE&V4tbB@Gx-mhU7WPeY+
z|HC%y+QhKv>q70PDkd(Qeq7~5zw|5{3(cLnrn+}8)jsR`!E|+vMWZ15Z{t_@m=9)Y
z&s_hz=>p?1#`wP{zn4`Wu5m4SFW!~B@bTVdxeaj|7o~gJF0absI^X-|oXz^I7b%~<
zZC-z-sK7(m`+z9Nk5yTbX8YH5?cTL<uB(8fZM$q%!9{ka<liYw5!DZRmhRS)o~mUY
z8Q!V0=BUSmnYa2juaWv|uKYcJg6#Gi8}c?jKPD9(t2FtQ;bQSz<87LL2j{)ETluhP
zmH30t(^lB65}t4GV!*wOslYd~XYWcSp>H#lPik^-udn(0U1b%Ays<um-fOG#LHv5Y
zyeB1A_I~RKoj=8}^`FyXLmL^M8D8&FuFklV$RYe>>dQ6lRcwNMYnbQBPwiel|94hj
zib?d9I&p3B-EOY$b5qk?_Rh1s)i$fmEHXY;rP-vUSNN)2Mp5#l^3c2K1$WZRPDH&D
zc)najQiNv~NB^V7H;P%@3!MV5l+Ia{-Ss5U_qXOpw%MvrH57dtT$?A<s`Qmlc(_P>
zk-huePwn}CvbS_~Zr*dOtNeKQ(Z$ghEI;V1_Q>1w*Vb>@;SxiY`-%xGzV7?@Sw7O&
ze&>@vfnqXp4VNEJo_f<Ta<=^PhDI5_cjZ>se;mDYEUc;1+@^lxLJn*5X-|JmKXKds
zpZBh-(x)$PvavlQz!6}U^}RfSCFDf`fA;FrMy7U37k}_AzjM=;Gv@l2jtA#!s=ljd
z+BlV-E&Axaf1$$C?nJGSu*Njmt0@Uq4wXtL_$L1GU+t3+^YPM~5WSS3q9+SeBPX*5
za`&a^%;WIw?%14Ow8zO|)3pbS??@y~54QWg?u*XTV-G)GUXgg<)}cF7PQ_c!=9c~S
zXGO&4)lKZJX77G_F1)w*!__{mvy5#;2Scx3x_I1FT6$N0FW(Hg$ya}Be(QL9-Mu8{
zC}(Bz%&H1kv2f*}ix&?6NpSnhKWX>7H)5wBIv(YBZl6>=LC5U-yy@qH!)H9O>j_=>
z;+|sI!bYQ|k!^OB?X9wNO8NO2dFNVt?)>;{|7Fw2duN$#SJrOOn(rkNviqv`{`0Sb
z@>6XkYqCWjM77x+y(n<vpg_oR<s&ziuiJC%^VD0Owz8a8(`|kqGM7j?>Qlk<eN}+_
z;(a@P5B_2<Ty%>0C&Q6{(?crOMqV|Pyxu(T-to2iYIhRvn;f}4@kXnFf~3fr{H3p3
zi-H4K7e}28UDckF7h-hVeQ|Exlvj688$I~xYAW?qu~2OqYptH9`^rVzBP07=u1?vJ
z>8seG{C)lDFNbG;deA)o#HTwJqG1ag1KT;}?6_+c<hD=V=vl!uqopJAh4t-1HLpe~
zF*UZ-<kX9^y6ad{QaV)D*7SETTy6h*|G)6E8|PoD`Q82RpyYiy=ziA5Mkm3gUyHAP
zPmk|89<RMOeg5RW$>NbK60V8MwR<j+o;5*zCi4TI^8RqWJ)d4bTEAw}hes_(LNpss
zURh`_z3=C`y0VpDVt;L75k1>-#WX(P@W+eM_BT||T8r&W)SJ(^p4pgtS^K)vS00p3
z5^1`|c1l2p@q<sogXD*;F+taU&J0U7OnJob#nxG3QnhMPR;K+z4;!V;!Ha{U1Rrf!
z`n8p_sA=NI2b|yRCv@)G5~H{0-|k1;TRqhFsl9x`v@&^tNwd~*j<<_WUMzJ<2<`E4
zepZkdXwhglL+E&4%i(OJHF8>2tFB#B-n6vK@L0gPo;$n02@6TC(>u4Rh?lqTrt`VL
zjo-Vg8Km8>ztm<is}+x1)Mr#FVDj$VdA~__4^BSr^iSp5p`Kl?d@0W7IezIH%q`|V
zBN~~=p?g|ut3{*O0b2&G4tK*Z+-IltSM#^dWB(=PD)Lr+y~p=feQ)RMkzYIJPv0hd
ze$vbXbN$>>|J*x%>E8dIDbs(3%xIl^KGkk@;_;3ASts<xH~+sK;xMB^Q)JW0`3DYv
z2yYWf)IGg6+kR@8t9^#ps$Bb%ah%83eJYdT6g<TJ(4oRK?E1Z58~3d0xU_u!WTE*L
z+NZ9b?hx3U%%k(-RUqrNCF=@8SA_lhr~hwf#L`9X_9}aVUD^AdNTr{g&KjiB`Z@I4
zrfTsn#?F`vA=4}FJYv5uw)1G8UQNKVX_vlF2>tQws`-=X{r}@nU-}_?^G-z2_cC|>
z`?povT8s{@sqUA$utLd3<L$0*b=NMq2fUr6++pKqoUzeM=Eb(ZZ&U*wdAbOiy0Irb
z<7(s4-8j$o)Di`+;MF1_4S#>K|9>_A*@_QqFU~sdHShVJFcta3pM`%#PCiq9wRFDn
z?UhGcr=IH#i`#x9@v9zh=iQ4xw#mJJ`g!q!gsC6jd2I+@?c{#5&}O2_iIp5zy*p3!
zpI-evKC5#5NA)Z0O>)h`=l85?+ud7Oa{ZgtXTGanbuUH4Ym1i3>M%cFa!Kg_LQ(hQ
zk>;yQt|)T9db!|^-GkzjPuwE5eXR?d_Dpr()JKuMZr7Kre7$7L%6U#Fjn6UIs0Z9*
zo?v@!Z^T|TJ;@z^te#$w`j-*-yjfNvG{Ep~x2mav$&#IaE>1REX5jPj?2I#7D{}K*
zr|3&Dt~$kX=uJT9ingw`z22qS_Pn?6oZ!6~HrL_6RCBIB8gc@qo9mvwwr9A1;?a&X
ze2u*fXP(bCvNrNnxOHXm^OXy?PTqKJ*)+4rm>KFDm69fU+=+Z_{yk~kvLjdKl^kt9
z_|&K~?o!C=?FVZbv^0eC%~k58f4xueottyqe97Y@mO`)B>YeL6Zmw9G`!{6Q%`+W0
z7Dc!!mrS0r`~Su0qECNPUuIcqc5bZ<`x&A!E9(+7^Dm*0Ejk)S@9k;>#nRPMs&XcX
zD*oo}u~O+d+xPk6!}b_yA71BD@kz%x_?H<3`o#Jxu&Z33$n2P2l9L+N_i4gzr)A$e
z&pV!Y*r&8fXuGr3@AKY!rP_P1susRt3pd>|S(*E)Yv)!;&h=|1o)z_VwH1$>`tWuB
zM7=`+t@gaz#i!P!$NgDWSL^L2x*$g*;lm_*&%5>UJr9rV<JRA-Qt5ax-Rt|?x$=MN
zH?6y;DD-B|<O$gYR@WLsn0FeL#!oGtu{r3Hq~DqieEW2F_AACOJmwe4zg}K)t6gVl
zQfB!IPqE{rydiFnW*4gUI?kVXv+HHuw7|Rwp8&ZB@AcE=?EO<!d$gZk;l3Zj@N?l6
z)AEzI?r3~&n_=0=7_fca-kH+r5AMo3Y@7c)N9(u3e0R>`jXtqYt8yzFRhpzPE-_i9
zcdN&Z<)y`w!*cibshzKTY0cBF=gW5~dSz}#*oT|T<NjXQ$F*@r1}E>zc^A(apMQOw
zo6Ev&sgC)NvkeP^Y^}K`JEtsWWvCTOJ<}?5BceOP<ZR??^>enzjVA>h<~(rpU{KbX
z15vSZYo=d)>DZQ>ePzOd2Zs+ZbXdn8pMQO_mOxm!kV%TiYT>|i<r_6kisw!|68Sx4
z&PR(`Y|3wh+%(csb7QY9HZ+T#_|4|`%Zi%1w;SeeI&|hZLsXl?P4yES=lBH5C(SSv
z6)=dtwq;Jj^|D!|?>MIk%WZW$sdCG=gZ<vICqFa<Rby<{+k2F6-?p?p#_7R3|Cfp^
z#qZx{+dn?Gz~%jllTqF)t2+b^7;zsg*E+N||MkK~m#ZAhtephBPp^K#$Mlx%YDUyz
z!|rOcHH$5G989>-)%?8W-Qn%^8vJ>+3RivS&Z%L$HTj~o{E5H(^~VIHl2&_cS-)1t
zkSFN=4XxVg`xdb+@Ar7;xxb-n!@TtPUt-STo<a;-O`-fN_P)1Sec^z0*ir>1x2++)
zmT5kJ{_g*oZe(0E{n+6X7YbJz&A6So=iXt?$^xC3SDkBD7dd#GmNI`e$(L1J;r-$C
zAEEE=_-9`G;^?I;uqIShP;9@J?g@{WgU9wPDtun%^7Kn%5C1&@cCVOrd$qufQs>vg
z8YKk*X213KxotY68yaLiv9fc~3n$x6C;n`B^Ja;~RFTB=@O950ZaB7g@v{qMr*myp
zc~0~3+D))zE%D~&HnO%}eEybBN8^_jMfw*v%f>|}{Nvdh@?l9}W`~wna6<BnvJXrr
zwAvJ{4sX2pwCLT>>rdzI|06u@#G+fLCTc%%oT=lqaK!|tdz+q2sCo0aZDYay3-K@1
zot0BvS4@;U`RIu==XsluzZ)G_sYrB{tjoH#a8s=#ug<UQpPZ{)C(l`wX|vp2wo<e^
zftkJ5dXKWo`HT9;B~{M}eRT*~c<0X#+fs4yr-x48-*(7xm*WD7%7VAY=bt+zE)g&#
zKO|=7zUG?g)2I2Eo2_FP_sFVE?Gw3nclkPnh68*zejO8A9rR2iaY>A(77xcBMZP(^
zekEHL{$lDpAN6});`g)=QSldt6ge_tm~&5F=#3Xhl-(L~W!Bq$x=*tfMEUR4iSslH
zd885U5`AAy@~d4&f`JOVFkh(QyA>PTidc8buiDr3^vEW4rjK(%Lqj+1+LaY}QX{D9
z!^zOf-|PS7XTF!5;AJ2%{nw0g&ve;M%NiCeT^jj6X7R>o*L=t04ReB7>%ZpzYqk0D
zVY!RB-u1`+QZ61Wu~+o#pYNa2=)L}Qi_+~>+ZPg6A=mG$Y`X8XExl#3)7G=Ee%@Vv
zz2xy-`OW?8$C!(n)0RFyc3W5MvhG*C^&ZaeS;b5fu9?gTEqwd*<L<Bwe_rv7ODl7(
zOlX?QVC(TR<kQC4hr7=5FO<@s*>Up9;b@n?0k2-<TNFNG@qE4Dzy;1e(?fseTy53N
z%z3}`a@7=>Tg#`kz6)MkCA0T={G`xOueY*qLw3Bl%*cLolU7GU?e3<XQr+9nJ+=$T
zlscO1<=Vfg?AljboqrB%_Hua%C=1QW64+*bbmF~-6|6573#1i)nK$j=Yx{JGU#CuU
zwMfl=(!2kMc-8-xF)uWCOHb5LJHxVX%jx*vzL_i5PCI)|Ec2CJ@<wrmntanr!!`S+
z-m$q<+W&derwM+qJWecIeZ~K-;j-r|{(lOWjCA;EWTO_c_~D+ltDlEmzH|7AJ(qso
z-#_^$7A3|lyM8)wf#Myz`^Qa0o{MKL__X@_A?;UFub%pILigipL3Yo#kM8s=S?+f9
z>z~!}fAw0#^imWAQv6R`db4BAIsa3i&Txp|DD-fizti(~uc%Z$_mK<5&n9gt`@Zt^
zRqe&)_Gz0#6atRkIr`^HM@VRNbMT}!yT8eBo|RN||08l{i-d9K&W9_OA9oOsC{)lg
zTlVtd-ro;r8?AX~cqgdEyU%Ey=y~zm9H&oe$4?HP9zXfXv|ZOfU(Ql7yW(&zDt6YY
zDZxCkKQ%iFj2kmH+<aVaf8y%2>aHrY-3$_OS}jY~d_7lC#xTQ2zy7U!faPzkRUsej
zrmgataIdk>UhVbk*GsnKzk0R&p`%8ik@XW5r%(4284d+LTCwKYragQY4%a-E|0itw
z<hcd2+}tOorM+L08vDLXmtb?yI}-kC>c!vYPY;{_kNRGnH(i8}U4-q^k1orzrT;&@
z{}X<#BFXgAYwqOTU+!$Y8mZP1Sb3sSAyQ)M?N<j&PrFsPK6B3xHk<eC^dr`8;aIb6
z^Alp^??=y-e#+u?Y1@mvO8Hl>R0dsI<zar+JMn$<<-;>=^OhfdR-N*A<7U@}k6-P7
zslVCobW`IA+m$;K`n{X#P8_JR@ZpzJna4L(@OQ$dq?9ij&&?KY>ilqLdfjLFuH&sm
z?~FWEm4vw1QgU8w)A8Z=-dUIb=A5b0n`P7dR!7@CR@m&4S~}T>|9;raviEMzT{A10
z@0L9}v$^Qu(e)=jJg5!YcHpsNqHk67*NaCKKF>VitCAdORFZ7h{#kRQ*n?dQ%HCVm
zdivRZFBPj$n8Nm6@{N?lm8WMUUw@tIda5nu;D><q_r5T-mn>W*D4OE7USdJwyPGZF
zeHeRXXS`efpP|A$EN$ub?dI1LW~wDuCl_ztaW1y%<?am;TYY6y_8+-)uIFBIr<hRh
z3g>h4&pVoX>o-UnzWwtoEzzgP)OjicpUGjVstLQ<=BXa%Ih8h1p21P(Ui`XK>!R%C
zKjyb2K9E)5%aE1oE>d)Md7zWw`Sz-_+eRl&y_ME~4w=`_e_FZV44a{>){+NZj+J}9
zhX3b}H8hcx3wwL`()pgJ&k|!F95wkqXW^np4+C3VSe}3WY#01;P0yWOr-Xc3E^gY{
zXe9PYCph)C>gTQlh7)@>?=qgbS8xk!%YBoATNk-_mMMBWpJ#p%v!PtqcKHp_{hKAH
zt#WXfCN5s#TTyv8ecs{%Mf;{xYp31&T=eQ_{^VTY*RuVQTONHonYFE?f9rY=y;r-I
zM%KRzS$su<S$w}r_`Z+qG1H&EY|rU%p3jwbcJU>BIqu?brn_bxd~H(kc-5Zo$Kp4f
zKhV;rV9s$-wBBL!ADeZte#bsMU%LJe^GnO`LjQZ0^62}Wd~;>Tkwc$@Rv%z>?%uTX
z-5sBG8$}Ca&uB)@lYLszn6pmo#+%!Y##vp4SxeTRysMscmE&sNSN?y7skV#Rl1lSp
z4y_W2+QpudoIH2wOwrW1lT$)G-Fn%ayi%u{vXnjD)n{?RVUbvr+4IE=b6M?;&k7~1
z5w-cR|Nr=Zk6DddLKPG5l`F|z{2XxV;^_}AYk#j+zR+kmS9<5(+rf>`Cos(~p2B69
zZF{Nu`?C6ZmG4$RiFOkHeCrO!^+PW;7cXx#$VuJV-=G_Ccg6kh9wt)iyIbrdj(_Gk
z+P1LJ<H!5s%}38)DRtT*r}*U8wY;4_UTsgUD~sBDNsiOxTa-f5n|V{FRj6#+dGdFI
zc}rr+3YOae1>UXP{dd>wUYq|m<6e<k`M1j{SqvPjSFD??U;BK&!ilJ`eqqtok*sl<
zU(No!T6j>o@t%t`Q${yKTaBn=Q%%czhFOBU+@2hrD1CVj|C6_FhZA3KH_j31Un4#9
zviFlGFF(&wvNAL~lcXr%9rk+f&V9dL@Be(atuOe}t@?=?Eau$@T|Dk67P4r^zHoT{
zS!3o6<0_XI&tCq&aJ7^DkcHQUrRDQ$<HD|9-WZYRy>#Jg6Mim{6KNHliQMz|clq{A
zeI<CsWZUFNlJlEWq--RP{m9|x@Xjhf+GBY8-n~Ru&K;kv{pPqH-FxL_;?15lTAx-w
zoiOXQ{r_mC!V39$&Kgf97PuW&ouVf6P<`IdO?!Ubu0O+ktkKUhm8)EQ=@y3|J@cN`
z-BV>IS-+Sh{j!t!R`tWDa}?L6I0=iIaV&pgpS<wG!b0<t&t`71n6#nq^efwYzaOMO
z`d<0u%Fpza+|t(HPSfuMYb|UGlbZeYsN|(<3P1T2b6#3%%c|>p%C^}y-spR`+EA$4
z*5*v*OXI~Cd1YLg&+j{R>A04w{lpKOeERPsuT(x&^f9g?#)skceBQguLp$|PTi^d5
zUiA0w{_T50&Kx@DJBz2)$(^fl!4c5~?DtdyBzS&3UH`w4C+1(*)yn>@fr~rj1g5;$
zCA!w^_OV-!E;K2x-E&H5wR6VW*I$ZxZaQQpoS%5#Ny)JG&Q0za@r&oNta|S;J2+Ig
zwyJ)5+<#fuX_?uxH}h#Z^=P{`wual^Z+vC)Aklo%b-8K37p)Q594KYY_T<g!{l^Yw
zaHJ;WD%yv*z1(}L`qWyxU{<vgD+^cTWlayS|7<_~*EV6H==h-XH8bBczBsUt;mFPy
z)h|;Ny<adp26Bk7JrQc#Z<KI0@TQkqU+<AXq3Cs9{JR)K)Bm2|bHZuDns@5UD%7rW
zH}^R1V>GKx6<ZplvQ1NV`MMS5&z@T*8+I{mING^eC-S&V=?huoSqGQ|s-Lg$`MyBs
z`_A;ZU)$ndZ<6ZQ+;ltXm$HEUp%ohbYxCX;@BepFaQ92ybG7W!n_L@Sr0!h%Rp;NG
zn|8OBc)aUfSG-ip<-^U!ZL-Ce<Nx2SU*fQR+A%&W2|-?oJ5R#AoT{EJ;`&v#EooJA
z*2|?%^A{wr)oOXNrfcqf_w;&Q@WJ+ZAFrm~lb3Lnds<g4^2Myjaig@@oT=v;(^ss2
z^y0tv$|(-c)920AT^;_i{?Fw7r_TA?rL-%4VlF6*|FzX#DeC9u|8MsvOEBf#PUQ9Z
z#<n#l&*8%B{on7eatv}g;HWuuRl>CuJ_;+=oV&#8;SzpyeTRVQ`4eB9fBw3Xkr2nS
zV~vB_v$8Zx^<Vk_zWAs31~#lTIgq|~%^DAfz-@sx%Y?WsnG|{*Rz&^V{QuwlO`o{B
zL>3y(*P2uRyS^rTnfv<{1;3W=+V#ufi%WR8?efq1wZXB!zE^e>9Ekd*XJo^gYHD23
zTPr!W>PCUa+(K7|)T?i-7ZxgRx}D<DEgD&6Ust-fldp)C?ZdZy|Ihzp&t{64Xvt|~
zzUN?XZ*MHC|9gk|TUWo|GH356RXLWJ`3eW0CO(q5yVv;DH|Lj8atvZ7z9xLBT|cyT
z9Ck>zEqkxL^2_uf&h_ioZu~9UC9S%tSj$=<X4k36ZZoDBS6Sxi7BXDMX}7*6G(3Cy
z*Zf~^&6j8K#y-qXb8L)+w^?<4RG7Rr?z8=`$NxJ!&O9s<;&EtPR%HBgv!y?0m(Yq$
zF8s02S9+Vsd^jZF<TA0@{>qN%9gSZ<T72Dm(K0YT%C@1w=iXkm_jUi{qeMI1U1nMM
zi^u=YHT9X^`NlBPXsfXL3I<JC5n%@*CyNQvchsi{e_Oxv_Y$pMzG-ijTmsj5xy^~2
zDZ6i_+mim&Qyh_J{CmBgpX~m0@B9DwnX-G&+M3L-eVM&q{q0`$qv2N<xFt<Ic5Q7J
z=RI|&DvSKtSqYALk%9L;ZxyUjoUyq5eT{-``ut?emuu!toy=Uz5_OpW-KoFQ*Hb*d
zf71xHzc!EciT3{g{g!Q(+sw{OSf84HJxwl1anTlOul%$p(_GB2EeUsg{^*LqVPl2j
z9Q&^}_uH%E=g2KIzkj9F?Ooj8=uGJy9y5K9UO&0E?EmEWCmGE~cixBBz3yMSZDp|S
zI*Gkf2Dc9>vvIgARrqZka$kX;DUDB=|HRp(86sAf68{*zdVA*Hey^i%3o4(^mH(sp
z{HT1Y?gLxCn18GGe0Xc0(yXo4>-1c)@?GGDhA78xhK}hgzxTahyv819(>=Q=j^9pL
zf%AK~T+Wn^s`VVw{IS0$ntY2}5dQIB|Gz1x_RW}(Ubj@Y=fms&C+n4a=l<PfQyI@&
z)$^xh;V-dQcIKzbkB2(m`T4*%^X02>m0vb14IQ@g#{If-?b*VUslk66^i>=T<4h-d
zTw1j#(qLl8$y>KpT`@N)`uyl3@2(F5lYU)`^L)j&k;hk5L+zVm<-(iV`*y1E)#h*A
zHGPui^dr}{U5!ube!np4_>`+}3vWc*`2V>3;nO0UJwNA}lz-FO6*+a=JH{ZEGcO!X
zuUui*)azzGlQhe9dqHjOUXv|fyG}2k-J|#DEk}Bx%JwpeO}qYly?_0=zh=>vXRgL=
zGiUETYq7s2BVd6*gOpL`>4t)3n-sz)o)Glg)on9n=G|xRPb@yf8G9AyypSu7>ey_*
zc-^k~BCl@$lDR74b;RuLRQH@U&J}vkS$~GCR7^RL)&I3}(Vts<Q(ND%M3$r<fA{)t
zzOi2R#CsMemOcqf-M7+fw;TV%6{oIA|Nl1MuyWrngVR}3=UShqcrDzMz~4V>28)w(
z>8#-El5G0RUUz0YNWMR!JSUg=@S(2#y#~uFJ)_@Sc3(R3Sf!MY!6(#t>(kW8My=Nc
z?_c~|xu~pab;pE_?X!1YxE)w5+aa2M@#x&e>m4OOpL$~P-TKCz)2|#PEb81U8t+5|
z2xvSlef?G?WZ{PWo`U<mMST|RbLP)qeP{2twvunL6VyV57<5mpT$7me(66hgSA6yN
z3oXm+Z#OWeUa~t_>wb@6Q-hpHOCrOS1Lm$y0j4(Gn}thK41{)kzw`NvmiY8(OYej$
zb-pzT{Bz`j?<8rl{4d5X8*j)rIIpRXaTIl$lTcjn;`^*C!fi6^&h$;#yK~!D7G<G;
zNg90zTpZ>sKl{OE?{9}(W7`*#&(}A9F_9>{a>a51L($C2ISHk`rfCXNk7wTUQ+S_I
z8KLmz%r2)p)i2~v)UB-BueOB2Q1t1o)VZOrCSJL;!9`4+vn<f_=Dq5uO-oI$gnl?C
zajslEyd`;x$ua+gxZdQ`O8GrHeJ5XBknQ7qxBtVUb)WfoWr|XM%#nWor=jHk!dX>e
zW{0#}ZH_CSHp%%ghjE!;?!k_j3iH*w`Zi`vv8g&Y>G1FKK8};_GB@fu&J%jFoMGk%
z5kn4vO>f-pH+1e+=Dbz)DDv-x#O{fgYbzq>c`ka~`ayJxB#Y{{nM+#P5B0lTJ9$-z
zhb_fzugrz%2a^2z`8Qf|wX>X5{&2qJ)gg&0Zj*nFrxLx_e(kFgUcu|$&)LG;bvz_a
zbe4G2?*!Lr|IWSrUa$2$?ibt7)M?L`J^gk2{(V!E_Nnh?{e16n=K8AW*QZo&-rscA
zrbBAl8t-jipD+AXw)gmqHTvf}RKf$@7v+^Ub?QH1cA40vr_nm&bAUxyxx4v6&nb_;
zMNADiqnkKu{`M~(y#XKgJn%dyY`C;S!?NX*y!;-`4@U3n|8QIWK6Je!%y6Bso7G&u
z_s7}_?e(UA-MewOyhp4ze=md0iO{cKHmwSos2(wEhjw;Xh1b`6viFK^cH|Z9@Y%V)
zY0Br%mmSv6-;kB@<zK0m0f*ILMl(g%7auIn_RRU*m+oU7!NAzseSvxPG?A;y`<e4J
z*Vq=Zov2r|Z`GW9X7$TN_6#P*)T!&3xn)ZJ3Lf&<Xkv2W<ut#&Y&~{Uyj`w~`W$p$
zd%;OYc7+5N|8My?iEx#@=K^$REG+c5NS9dEdO_{fg^A|P=}kdZ6^k>^MRq>faaJhi
zc-+^F54$shj@}4=GU-4bZ=~yv>FEN0V~kgITuo*xT9bO>^4SYlemzogUc(*itaFy-
z;L}Szp*GEvUTfVwFUsnd-EF+9Zo9|w_*mJbue`sGiK(?$iX}R9-8FvESz>ln-~yl3
znv)_ECgmD1zWDheEM)R--W<jcvjW#~9XNSm$2@KZl`T>UcQ#&rJw0JXXxNv3Hs{t<
zozQZ>S{fAka{4T`sW-3OHu=?<&~eIE=w<?kjq+77@A694&;2uO`&I0&2`OfUJa&ET
zDW%y~J30G~{hem>@_A-r>Pxf=X8GKny>W$$vY^oPMfX=kFgF$Nn|o)G_~exrHm_J9
z+<T`ZV#*G$C-2(x3-`~q^6Ln`&eJ0_q4)&XtRltbFV{?+sl)iX?eftHY7R1Ph2?Xr
z+^#K?zp%R1$AHJZ>Biyr=k*>Nq?zCQmHn!FUw8bZ7k5OuwV##z_ZInW_3!!r&*wLN
z&#!knx^c~lx1Yl6+|Ad;ik>i?x#v4$rr#UYdB1tpZq6=!qmsnmZXWV;dy(*lMh~u!
z4>s#3%uZ}6Q9H_RK9w=;imo<?j9>Pa#s8$uc~rSuS(=<A`VVU@i}2jE@7ycp8n&3k
z67$PX=U42A*6X@((ouEd4)rI30%3<kO!#&NDsJa<o;FSPe6onaO?%(P*Y8budq>`{
z`-Z;xYnk&|wNr(5GEcPK^L5@2FYk`B{>#jXJeD3pZ%xka*#CCP)#=TDSc`*}>l;mc
zv3^aOrtzw)7iJ$Wn9Zf}jVF<-#ca2qt@o^#vYQTC-MG-gHFfGz)pzDjf`+0$UVe1E
z)~RgPYx~VW?rqJIU##qcaqKp?A5U4Fl)rFKz|U)IyRN8QC_KNSo4x5+>E#6b1NUZZ
zHQZ@*(|gmSdcW<e>23d5l6eH`+XUMao3<N${m^&i$`zTL4LUD>Ex5k;%=`4tciT>e
zH#X~}2DUCQUNZ4!?99Rs_H9>-m}lr@>8pS5-0Q9p_c5a0eI0w;-8V04-#Kr+r+(a4
zU(cwl_XGd4Hx2js?z5{)7fF5S;4$s8etva%(VDXnk4>B;tI`yv|FGdHbP|&NE2+K8
z!@({pJU)I)&Y|B9?X~Y`dfyS3uz6ykAn)+8!mPpQ$?O{*Gp)UE#8*A#SiNIyq}~N~
zj^Ia;Iv*aX3#K~zJ@@IeQJAsn<XYAeNAK^R^UTd&teo>;SB0DeYw($a7uioJ-~6UH
z`L(g*!cJ@VWT$rqE}kM^)}8TR?NhDuC4LFx!52IgwF+%VJ};iYbWF&N`5vp#E1u8O
ze|7vye9~JpONk|YUG1TVcd{2dWXxz@7m|1Ja`SsVtqi@Zzn$f0*xpJywf^i8r^~C`
zzb3tIi10ZZzVB=Mnf|7QKi>V$_Xxh;z;v3gZNgm+`#F{0Tt(X|+rkb^>eiCF!*IHs
z+h^+L=`}YmKA!jbal+9{GP_-5`(^s>dTISjH+JLG?qJw5>v!txONQ6Wg9Ci#JvIp8
zV`em$tKa|q;_N-*$}K$QQ)K%jX1oYJ7!|4*IZN(o+Q)Nq``oR*$gll%qkhiPN|Vnq
zY8&(Zu4I=C%}hQ1TEP5#Q<qUiTF9o8DSGCQ?&$jS>YqRPyZ-z0PY?b72L*=rYPFb2
zP1-fhPwi`?L*uSM7e<#Z=B}N0XRc9he`J2b-{kKHvESwmPYNcSd7#B%DH`Ob`F5e?
z`FDG7dh_&uo^!)pqu=`d|JuBhbCb6Ey*asH;>M;m7TeyZes)t&=Vi6{*19p{`$qQ_
zNxETI7Nm)9-kGK6p6B6Tw*LG9J^jAez@J+*o}N7W?&b+j(I;1yA3MKBF#W`uGn;?r
zg`4p<F1Z|~TwKY({Cls&;@S7S1S@WwxBL_rG5M0R*}X?~2`(2Oo@+?YTe6xlJnh=f
zrTUBdul)ZQcVqM94UP=2YZn}Kl;GQyQ&w|@Yj=fL+3rWaf+t(59xeOzZlagb37ud1
zW$b05(?p*ne2eH=yFmBdd{@4us_v7y_pa}#n)_OQf9}4+UlaYVsBJ%4VY2<`%{%u}
z<ae%IW22?t*2KC!^O~50&EvxNO(ic_D*i8fp|M~6$b>bMc1rggk5rV9-uqcDvy4F_
z;Yr$Yxen=%g%Ov!cKNN$e*08Sp^!cN`8EB0|2=*#vJK>$l09ED(aX2oJ5VtEi_E=G
z?>A_&YGoJ7ty1W})X@IBSx|H1#j+U_&L{4a-F)K-=b@gjO3S~CUS_PmVQiN-S?U|x
zJ<)Xk*Kv|k<*S(vZ|=5O_$ScTwCcOFcSB>It(bjan)&=k&)gUdnJtA>mtFc(oBocw
z?dmztlzP53rafOLXC1or+O#NY;p+HD;ztfV{Z*noeMg@f_t6u<3r{fE{obG!cv@jM
z_dM^@D=g;Em@|vfvo(I5^Z7~1^8H^vd@Z<eSi?>H?f;^;)%W^}&u!Fy=ltuyJeKV%
zGhaRHh?-J#yP>$Qd4;R){_B_78BD%@Pzx5|<^38IRohyX_~ThM*R#`CnKjo><*)yt
zzjWbu$!XVW|6JZbp*#L>Y-IebNx2tPZ<`(0h${~MdGh(*X9xFg@LZUCGoR(L<Kg(8
zOBNXgfr`%Q-<{qtMe>|pz45|N!>Zq3`Ky;XUANJA_TS>z@(T|)dM(>)qSCSZ+4(;P
zmXg1Jm#usz%fK4Fr0`r~5Z4yzrzht%^RJPVNZ}Cll|MMyV1gT8m*lChJAQ90zY*(x
zPdr#CvS)hqnZ0t`>dI~!8mI8Qy0bpz^N#G~11AC*95?>nf4|B=WZv!eq-%#3WPhIL
zw7*`&^5*#fk=4^bJx$`zk&oBwniyZK`+MHZZQRPY=dY4Gv(~htK`MIpi=ClL$9I`2
ze~bwE^VBXgD^t|`q=5P2HG7<FjgtC>`RyjQJu5T28|ggl&io*upLZ<O=B1teP-Y~z
zL%zsJHR<P0VVenauOIt2^BBj0DlsX&ssBHyNw(-WA33`<p|d-+@@Va%oxBefCeJbd
zyuWvni3s1ffNPG|&pnyNCclv9LjB^bGZR+XdM@*S+?(is=7v|zL(5O^5AXQizHot4
z#&rWz=_m>7htDQ2sWZsgePZ#1bE?-vX6h#&Epr#Y#lPD+Un;HN>vE&`H5sGo8Ad0=
z#eO;*(%9fsl)S6UH}3o&nb*u05}eMJ{oEpbr1{C!6H7b0yHC9PGh^`tu34Lt=PA~o
z-?Urg&pH3Os>RDZm1ccTdYhe?5pw4H87rv=Nh$Y5e%`R(9${&?X~O<*Zr5j|YnSQv
zh$nno6tH=ItX|hn^UpuaB#o-p3z$xbw6Bgkzi#r`5B4wiPr0maY`l5W-EC?~N+}YN
z{N0c1e?G6D+xyf_EbrLlUBQKFE7H`Cr~H^~9x1;s{_lpBYZ?p~FDe&iABsA<=Yt)`
zk3`QxW54Sh^8}atX+QTr_ON1T26Nx+1>1~k-%SswjnRLU`PpD*wK1o$vGCnB(T4hu
zU)|dO#_Q!~1=T+~&!#^=-ah|Zt=OcO&Fd0*x?{z@zdlkIq!_;Vz``B<r+lJyPH1hB
zI~sRCVDjzbLGQ(0+8nf$Yi)R!uDhGf=XteJ>$!)C-`Sb7pR;U<FgLn%=c@kP=kcjt
zN!7{oWM7_mIAwZxN3}OE%dSv$w)~T)PA!^K`>nDxa@Wj^)S#02Cl*B7EVg*_V)>0$
zlaD(NYem12eO7U^m;Im1yh9SY!fA)UZ%|N+{IX+X`S0hFTN1*zz1e@lIb{DD{oe~s
z;+hxUyYC<QZ1F=U#ktGPqMzKKys$QCeql_|iKO)#<<I^K<n-*%^58d;`#pEN)2Gy)
z2aZ=>yU%(%u{+IyeMYqj+Y?WrR6EYvqC3;?zCLvSv%CD0^C?=-SoK+7r!_GCUQ=+)
zHZ?`t;`<|W)n{cVk2LqMh-MCTEM%L#OGT=8<GEeS-)~`IURAJNIq3d{3Em6dhejMc
zyy3E{bV)vcs7Q9=+Zr8rM<q7R+Y^24csm_a(%d-3KCeiw=;q`W<(gf4FRrZo>N`L2
zPkL|cPuIWK-+b^7|J$R6r++`O>-%lhRi4EVYPdhYKS|~)x7CYuHi?5B58@Vh%wO{T
z<NM#K=afWh7w)uF>9Ji@o^j}T8`pi2dkHn`E>D~~bE5U78+Hrq{U_SaJSMf5d%-u0
z(x0c7TyhBRopRN)vQ&F^yOHJ5q@MQ9t+yWMwqBTITe$Z=_loZ;jHkU#Em@#_(D7#f
z^;Vzxokup#bmH%xeS7u!zNDA-`fN`Ztk;j*e`meAr)8edIu3L3;yxdVpBrM9PBhop
zwfNj#bJ6*~V=vpyJ~A)<XK3Zq>G#EMH9NITKW1#55r2jya?L}x6lX8TZMQEd9Zc|0
zd%xG+tzp$Gsj$nI7fV=~cAjLv{`8yr`;8M-1?Q!|IK`u3SbEUIZFcX0w%hs30$i^i
zWSWqcbW5eL+c#yVglye)l`Ch?`}B9MG}}~d$^NxQX8EpT3OdcV_6Mwr-%~fU=XhY_
zO~>bl=2%xZ{o7DnCGe;|#vuLFYks4EZ#xx!KL4z7=HUG0w)$*eq?ijYnDTgPU+XiT
zc4g%Xju7uEYrVtY?E-CQKaq&t(7Gf0w%;U!e09l0@#hczS{Hr3b$ip)j+2+}@a(q!
zc<{uL_s_Lvz0wr+I`sYRp|nHs%beKb825cpnCOvWelyj}k6$?G@uyi@GR+1(2X3w2
z!?Ve9#i^A2LEHXL>Q+0S#Q(SE<F7|wSARPsX*$*C8TW%Te0RFO*1c(!zQEcq9Ap&g
zbNu6`o^qB3PT8-ObvI8pe6;y?u()-eb^W`_eeaB>E>&CPeB5z;C+F%1xwpG?Cay5t
zBsi_>6vN8sJCW^^J-;mb7I!mn@x-gILql0rrQ)V;um2+ch%vl>q2kF>)7e2`!K*T*
zt|p{>(%tL$>f0x4jrcn$`z~rO^Sd+ez*+gXnJlM1M2mJ$^U=)sxA*aeH`fb(v>yL>
z^mX`OR@dwcD*^-9H8p=%Zeli);4%I+OF5_bdd(c;5FdGgFPw{HRtS_n>20uBVgBUv
zqe2IJNjv+`HteGMGqxVDlQ84AUfrQN)$G^h82+3$)*C}N`7JoPWAE#hHG29d-+XD=
zQ7$B?skwT|azk@dz0zLYYdXdKM{AkiAGsrPp=0m0TX!V#6zun9OsZIR=+M2}39D2J
zHvgPm9ihCi@E{+zw5Ybku}5M?0{+D{PsKq=_Kp7JIa{Cq`WCz=MJ{Y_V*lCM#k~0k
zTjq528i{o8`5wGR?N@@0=<l6o^Nv6N86zE#cPPlMUG$dn?>!Zp^^UD@{{P5!*#(CE
z$@h1s6nTd|KjxA9<ZFA%himMQv{x%QF25hIxo%(M<@>tYpHDydx;o_}OXl?lb6;<=
zu-4ryti0)*q@3#RCdQ@wj)rFg)$Yx@-_zuK<gCQ&j8nP2Ta86oj_z9Xp~y#kPvLs*
zv%k*XQ2%ZF>~-O~kFFW7yRWDBddz>e^~_Jbki6_ePHj`x2lzKJPWTpZt&Y{8eeZ&1
zz9hCAj~j~qda0g!`<gR0tEZ!~(dJUir{3wQMTg6n-<Rz!-|Ha!Zu{%h-&RR)HtyJ)
z;`grlnW)g3Jhy90w(X0&79M`Y*7{?>rRYMl&MDK_Q*u)$il``vAC^fv^Uh%Ij$_=0
z_4O?~FFvz-oBs4I+u|Q9i~IbivPeC=ogc7grC4=L%SVg%{OyNhnwwX7zlr@3zh_^C
zZJ(2&*P}x3P~&ZjX8wumZQk>>c~#S!v)k3aJUP>wpxf4cF7tWJ=BK9LKR0Y(^WSv;
z@$|P_<4aiXwHQi$i!*h0&98b?rrs@<uxEpGrNqK3eqOVpZ!cZB+h2_>-($nJxKn%b
zX3n3RB6sBGLi+<VE(?ptO_{pXGAO)RD57Yi;RQwURS8DYZ7Mqo=YDAX&3UL$TmDSa
zjqJIK9<4jpyfL=p6F#$CH)hBE=9U`^wyDRi|9|wg{hsL)e=iPUR&v@9zvj;Zu2X+`
zSa@da{bcxm&CGjEe{JS8cZGgP{T1*nnax09yFmHez$L$5E<gWy-|hHg+Qy2S!G^o<
zpPBoYOSUKRc-2vZ_bOu3FLg;($<3Jjh~Kop{}-EIr}fUcla}o&D{NXBbpOh&tH*c6
zPj7lOpZC7lbH=G2I}C-BP3BmBGniaCGv)hams{<spT1T1N5%x#<!J4E@bBS!f3BS}
z$I?^Pm;F&X{^{uJ!gzPv=-;71Z=a`%SjGRWyzp1V{G7P+J%#6YJl|g8nc2}&s&{e0
z8x09L<B9z>57<9&>F*D?vF5@rnXMb&g){ox_<U7u(&Y8CdHNULR8M}x*i^eTZrba-
zV@j9mAErjmka<#a=-IcrLRP6GZ;w9s^<q|td8xN|wYfFl;$Np1NVXMvsxAsz#Vy~T
ze<@XQyNz3L(UJ6@@7}Nk%&oqYy5x7=mCpr6j{W)-ylY-CZ4c{PDbDPD<6|GA)eO~l
zp9(s7mN!29u3++DNqI!D@X-$+Rv$dQ<kHU99(^Cr&pMu$COIK>TC(h=>W2n=D^C_=
z2s<ZA#4SGmO7~+#utYI)iqVt%<wa(Onrk0cNgHjwlm2wspNL}LH!IE_J2dO8d-1ai
za%m=Ke7LhYj)+Tr`n>k;+POAdZ@<4|STko&s{G%Z>ps~jP2EvDBTOxK@?++w2D`1V
zH3kb5pK4pEBEcciGAGC>ex~Vd<=xhw<)$BZPyBF$&)YLJuyD$j<mu`Bj~OMb%B$9X
zp6(fK@`I!FsoO6l_iT>n!sw;<gyu!oGQU4P=Pb|9yW2wLD^sG^cW=&>KbQLVXygN#
zS@Tc6oApLY_wcEW*84TS*MF;Y+j;((M)q{W6*KSj%(}Bj`1f;LqkGBuFJ!(>Jv^&E
z<zD{mKZ!4A-`Sh8!gy`zrjn2Md_-68x-xmT#jfKfj>&V+o{jO3T&$(D`0<nXzh;DQ
zT-W=0>$f@6R;?0HUme!^N_F?-2`NfS=OSkANPac#%9fJCo+Y<aHESZ~eyDPp_y1M?
z$rpF~m%cv2ke=**eY)zNU56xjW?wAb`eLb2R?hTQx6~>t9*fUuyLQR+K;_QVP}5CY
zcPe&fM4bB4W-#sATke7<8gA*wzWfbcDD~31)bHB$Fw2QLSMF$^E}pzc?pR6EAt|+n
ztET0}bw8dR6H?!m7<DJCWTt4cWVxmL+D)@~nBN;`@~zeUYLQa(!D{{G8?}C{T4#U0
z%Q&sSdeznECB;sOHbT>+-~Z|5vH88~iuu+Pj}Gl&d3}4$&HWY<siHD-L}KG7{!8Dl
zqADl)V=eDpWmCU<UN`-6UKy|RN{waz>?Sj7@|`DJ?0Tjg?aAA|+$8;qKt#-QjWcVO
z7oGo6`|850`jsv7RxR<GDCgt9Gcou)XT-DM{rdY)nLYdbr^cbYif@yazg_){g8a!|
z8mb?^s%r9I`^=CmSCQ$OF}=)w?yX5Jr<Bz+e=%*{nc00*DJ0wDT3W@#%L28cj;Aur
zCZEzRIcMQmsQx%4jU!WCB!%e&@7*1z_A&UJ@k!XVqHg`dg^_vnAEt#|-RgDxz~)Vo
zkq<XNTGRSfh9&!=^#;9-9j}^i?AlWH#l!cvrmga2BjcjzS=Q_-%XS@&zpJvkSh!*8
zrQ(OClKcMkt<m#41)4~gn&=xjyHaD{DJ$FfK+Y@MJaS5>ah+ekOH(NB>5T*p-=4ci
zmw4G+K6GS3h<RDTTdmd7N90#L`=$1^(!g6*Id%J^KtJaa&5C=Tk?GyOS57R?Q@3<y
z5w<uO(x>li)FHUZ;x@yAjUSlYm8OSXyEJ3%nV!OXl^gbjnthS{u({~2c7CP7@+Z0p
z-7n{_^J&^u?7ruk=^w}1zTC)pa$!r~1v1ZE!sOp5Db+k@*|8<tRyu2C&-!Z2WK{E5
z*3)I0>WbI*iyk$tIoBV&-qiH<zM7iQrh{3U;k7n~Rw_$>otdkC?#0*glrR5yGv7!o
zU~cT3bDI0|r7M@teLQ)wmzQsPGh^24-3KJU{yQ~6=bXQ1S#@ws)}QvPW;-@oOgyT|
z#ka<$jcM!Fa<6NKYnh_7*4IDp4`GmE30!e>X5z^md;V;AH(A`GYSYgDlcr1yKlSK~
z#`5c-t6H<{zwU|C*5gjzzSJl1(5X*NQ(m`!kFD`N_P+j*XA#HLtJlm|31&<y_%Z8B
z`4{isFQ=<at&HAve$RsIU!t8KiZ5Tf^LdX>-~CA`XEg6Vk9(4`cl*CT_0un(uWg;8
z9T~c5_O8Z@y{2Wp^FqSC^ZjO3o%1x?s3yT26Lwke;#F0xA6*U&PP1;@nX>z{u*kZ$
zbCZQutqe|m`+UxuSIhkV{*8=`j+<hvU*~OhO>C#5#KW1rs}@YVx;jsP`ptv<C4zG=
zRX<dXoFn!0%BE#$q7mhtC12tL{7+{4o<6-yMK)HTe|4<U(yM!(J1xJLcwrUS6lGE2
z!l@TLK81&J=C0mwc*RZj+LP<Tzi7Xl^88KvW5FfUZJ(JOK7X&y!eX(k*WqwMEvuN$
znGY?x`O06en-iflVbY6JJr%qBf*5~lWqm2XBev+st|yghX-`%@z50IY#eDT7nM9t$
zPr@9Y`5Zsmc>iOVXO^{JLdYxr6Q`~yOwG(q*5+kOn`&M%KXmCf-Q@3fk5;VwHH}X)
z;O~Vi#bK*NY8(^UW><x*TwBEQ<<p-nKQ`&@{B+h{<wn%pUF)rm=pLL^rK!JrO@^7~
z-*o*|(;r<c-lMWNeI19zFC**OMg>1jL&GFPlk|g5GDoz&^6OfyqcNFFih1i<p{y4Z
zZa$P=mBO53tMTz?=*F-UFQ4yMyMF)IyenD`@9aL?q@R0yM<pq7rqnLIx6IS8D6p!o
zOuyEer4o82li`w&S^F#5O*YngQx8V@W!+`uIQAp+YPquc{j0_I{0(BGBAuJ3EL4B8
zOfci6?fKGgp)4v>Yub+8So^(AhN<WCvsW^ud9AN@JT1IBd6m3*n0QEFzqf1f>bm_i
z+r;;ZYa1(1y0~>^$br4<+JuT&k~ghAAAkRj+Vl9Ir8D>ZUua@t)*1d@^qA6Y4sY-1
z*+<NTAFa>4xc9DD{f0i@hV0d+FIg8v^?ELCdTspa<L&#8D>Bwg=`EK!a<9>^bGfZh
z(Btyg;`Q2}gAbd0nZECj?A^(UQp=Bhi_0uo`SH)U{QnQj1^>^VKX=os<#*#k7w}%X
zP&$i0U};$1lW*0Z{+-{)esMCleyw-xj2%&zyk^dmnD+H)<+%yRdhVpysBs7L@066N
zmWZAwGM`^>WvZ!R{F0@=xAffI=XK=bok}OMXUkI5Ux$PkJ9zg^`?*7@v!%+-KtWMd
zV8M*9OD(rPds}nDM@uu9-%e4AW9yed1G%{WJAHWWF1qAqp*uCqJm|{a(>W*a9C6Ou
z6KyLZBQt&dq=)MlO21#laMk1dP3=e8pMyOW{iNa|1ClM4cDSTC?p^xoSK6eG)XUK!
ze=@fom~mr9Y1I|&OUw(uiw8Ysx@U04i0zW&^k+Bbu6`m}oLZie`l(N6WkJQ4&9e6z
z)}7pD>O8l2=H(b=nF0yj1-9jxtxGoLIZolTKirXEqi*Bcf8DDqk;PEtaGR3l<A3jB
zKZif`zV3SWX^+;Hl50|vdzxq5h)7#u{Qvt#vHd>h`)#{)d^@8B_qb0rN#82}ZBORw
ze=EOCPGsegPB~_F*|yQ)u4?KYIiAUkd=>mDg7^4R0*c(sR-P)V{50>LbEF>MyhTcP
zx^g{cR$0uh;!_OITYpOWS@UbDN4o+_G+C!OT&ugvI3ZfYeU7d|3eRk3&-4Y$Jdd@%
zD|lAby68!+snO}pi$fwDu1nO<@j3EUCZzLtV((qvE9Eb?CI^Kjwfe}}?N~d1_3Ndt
zAG-?Awv)f`{q1V|AlIn%3~O8BE<O6vVR0$pM(OFj{r9GAWZ$0R)O%y^_j;YRwdVy4
zkBhumDHifqWJ2XvyO^r|2Y03QEiJHIGxPn6+}U#bR<|wpeIIJedRKmqYJ+Ko%$&pP
z*yQg!N3c(1nx?t>%+hVbRc_B${MfsyVWIHZdy$HJmMqyeX--4e+Q>OI8rfV;+0nbc
z&RlGwC;7K$hm`J}<SOk`CXPaLKOR*3_T-?(L5DLodrn5a4BK*K?YxlbQcpx*+I*g~
zWqwWHrcD-Q(~F;Ow6k8N!?yl^)4Z0`69X^oR=OSJl)!j6HZamvZuN|HM`tzt`u49o
z>ql7XtB1Ln@83;#Gj&tA*t(9V{knvwX87J2J?=Z$|DE!3>sa*4w`@*TU!dl7?fCz_
z@7uzst(ldx^@D&OM_}uIC-I+sHb0)^zI^d2?0Rb0-VOz4&&SQ?M;7y&*xN2M-|6tB
z+1Kk;^OrAk7I;4?v{qRnW*i_n;ny)Su77X&?+3EHdvfPlLzL%-ytC(hPR!JfpZqCc
zvE08UJh8tw)_gd&KkQ)amBSm>Whg3L-Ss2-qUg$?<VWF(GiCRkY=8Oct$2GCqr;Dg
zC2Fpz2Y-ppl-;Qx_k3H0(d;ub5Ac4`3OcO#kR!y^Y~7kX6`vlxs_rTa2OWVt83(mb
zFBZKskZGIwV2`+ImYpk?Ow#_`(D_rtO+B5f<=-!K5p0X+7v$fyFaN{i?N<!uEf93Q
zBamoyhuiAE;)!#2BJAb1#pH3wv9ZiJ)ali6W0stYIKK(2b*dt3wT>v)smK-c<ko$9
ze%H8g#|nXOkG^SYX|~9JayAaQ;5YsE^b@}egtk8Z;P_KUEWIeD%xBJ}DmB*%zH-j_
z)m0yoU6&_^S+H#^Y?)T`?~X>4wmYK;k7TPjcSCyX?rlFea=e#v>&y*}n@~LE?O_4M
zCrqj=l`Vk`4v{nE)xQUZCY$GLZZbG{VdMHuRp!?j7Y8hSE~cp4F2(SK|KlD$R(H{-
zON&1Lo&WKB_54a#n;GZ#8Jw#2*8UMSQ*!Ah)1xZ0FRs{9R`&Y&ISqx`Q|JEJrL`r@
zP1|4x$AU7?-czqG?P*z+J@dN5%0DZ`_q(dv6+B%XwCqGp)tg4GM{FNoexA<m#P#P_
zMnj?x^FlT^EsI%U*SXnP_}dN4d1U99rAS}9+N^c?_c6Nz5)asKpLm;gX{Y3C&8qeZ
zt}Po1csErXc<~|Kj+O87m$nRz(4Fm~8Pk7jv!0Q^5u0B*waQL9>%euDD>qgu6m+q%
zS~b`QAMKmtAA4N$tH`OJma4yMT@*JwyHNgbm6cn4(8&&;6@n}B-c7o-%<rDM&9v5+
zfu=31#I4y?q~a!Ks2pnf@$&QeOE+{hJ=O&=zr9|{74qY%b>!wxH-F{ael^iy{nXVL
z8CUA<IpKCSHFVYU)!EV!jn&_q=Xb3Bf2Q?4+m*MSuF5+tR-E|rq(kRykD*+I<cdkJ
zW<_<nTwNMkA`mLR**A87T4`<AGqoAg9WUA4uTR_AuyyO!J1G&LX6*95!4h#kp_F%j
z{?SjHFWtI#@@U(oqfCe29?_P(`1-rO_FnP$<>khfCBarz{@#`6COgWdrv6go+#B^v
z|8;HtsUyw(OSf%x7Yxvy{3x~S*T&AK!{I>-k1d|1S9Ps-nOl3*+uL0q{#IF3y{L4V
zw*1Qm70r}6v)9Z%qF3X}TF2ubnEmeKwBq9OD_YfmO{;R{MN7g0xqDa-G0yJl*?7?*
zE`-tAuy%glo`3tcA6Y6LukZKOZi2W|jHH~%x`#o`n|fb~7$~o9^l}L+$~f<Bvf+08
z;--h^jwZ@`ep(v5^TYJl6OS||t0!s3x4&+9a_IT#0|x>wHJn-;s?zbC`HsYrza=_N
zpHG~Wcw?-c%$GakaNSW2>;5;>|H-B^KV+M)Wu<?PlV{~At|G;CcW)kw{3kahvGbG(
zmqUS^qJ6-!DU)Mlc(|AnHEX6lN}sn{)peQ$w}G66Gry<>lc~Ddw3OPqkc$~U*Pf}T
zCa2DuAGq$6_O4|If*S=7U1FG$D(bj0>qW|sva&x5ue|&%IJtc~^Wy&BH+x!AtG>)z
z^Xlfh)%gJhVw1M@>4knXHL^52GvWHl&-w;SnDuQ0HaKPVcJ(a(GHYonquDmc=L|m>
zU+VktuAXG$8Qb)G{^i%<=G$IM>MibTiu+Kpchf$DlUu#j%y#NKN+|L3m??2)e|Q{{
z7$&^t;0mkY*<V;>vi>|*Z|k^uEnIwQ$o$P$!q43i`F3z^gT#ABkNN3hnT=mVBWKho
zOifjN#C=7uLrMS0pGoVgof;QL|6ddEo^PJAl5*oIuFxx!H|?^}?yZokz4o+ochI97
z*OK2%UO4-`*H)${KYlH0xq2dTuCJr>hHaj`pElTK_nMS`+1!-H%{%><wShwM<S>zC
z3-`wF&+mP*LgV`?pU~CrpN&dCzdFR@JYnjtxPxtck~=@!eP6w4S7)N33q#s*_Q(Yd
zru-o<qrT4H`z1C<PG?p4)U1_JCxb+nwCt*k-gRN_Ugk|343;yQ>0aISKw8VhbZf6j
zh00cK=Bqu2O-)RnrsXNz+plc>XrXuI*Z2QovZSIiY6XLvRomN}TE5<umiL^!D~ZE5
zHMGM$Z_i?G3)j_Af+4S0F)4PPTBUVriHoTH1ZyXciK3;Pvv++l_PTQR??R~_t+?Bl
z+Wo#3ZF&@<+)(YXf~U|{e8Ma)rnVH_vwka7b1yp!E_Y-w(&mrk+&1;7WLd1z$^N2e
zY_T=drIai5Zlvfa9V(9gWvAfaUer6^Gi%xpw*BqC&F0M?LbHNdRVOR7pXod8|F}``
zkhC`Ums>Kc6ehh`9yxE}@2-^CoZL9p)ur2iaUbJ+?|evD<Ko86C%=2@?dwfX;9O#@
zzy8succHUI9FFgZ=d$g2`&`ZYtdZrZ?z;((ZZ5Q$=XZ2gbKAX%_nKI(<K&i0ocFNp
zbNbDCG<p%&>JY(<l+?C3roHE4rY?GN^|^zc&}@%i&(>`hU08JFtL&@F-64inUfOG)
zd#w!Lvw2;@s_vqBXODhllzI3zYQZUQ=T;T-6oJl&6RK@Im4aIXKCsFLE%OjN#_h)D
zvHk56Q7MNq<JWujUhKT>m3Oh?>zo(KeF-1#>AI;rTXr0@SIF(0{r6c*L~Pf$UYGPb
zR%uiCYK~UbcBu)8EAw71U2a_Rx%Oqa^JWXvBZ7Bo#rLmSrL@kzSa7HF{NDR})fUdG
zdS+vzCGYTK$N3(qIF;>!_s(5<e&Krvn?$RFocPK7=~9~RdOlqnB#vlF#f8NNpA6VD
z`Ra;mQHnktwFfMZPI}~X@B~APxru4;&vmP}o2>dC938&?p2V-D5bK|(e%dw6`}E1^
zD&yuyA40veziaMYE$gOScBLTv%C^;)?oZmajPGmME)Pv6{p`FqdNDq%bGKf)R2!BR
zRh3d&Hsz>z#W|^~6aSr3IDFv5cL)CH-epewf^Nxyyg3{f7rVp+eKfs$*oxEad%^iv
zQPrvo*!1=oEIY8Y=i;n}rUVJ+2A&gLueJAoY`?Foy*`11`%JgPFM+Zhdjb|@irxzd
zozPjJFlENBD(+nd1+&@w<_BL1TzRds<ruT)3)Q`v93DzyOP4dXFc%&BI8iZn!-6YY
z`ClyBcG0+C%9Ox~p)IdcUj1WV_3r8i4I%eA0(nmked#dSQetS<S!C0{B-J<e<<+IE
zoG+dE?(aFpZe97)bafB!ahLnj@iV8qz0t*0Jk@lP`1!@t%CcTet1{Vs<n>pN++z00
zuV=4Xb5Vl%h`_vk*?aw2c|}!UTyU?EkUqJ`rL*;qAoINl3Gs3*uf&3iQyMK3<g_aH
zPWQOcb#z+jl@-!5;^mbcvsn%^nVW4gaxa(fD$w3`uG--Sm&U?9tLoOTo2!?qd2#B}
z78#!t>4B_m6I@QsD&Mrv;^>Cf%TG^zHsEvkT;&j>viZ-S3PqEehncRE7e6|cx7vqQ
z;?RkuGv+5rMjTt!Q!JaicTJk!_vHJtH91))6s~rkbJSFj@7B$8Q#-BBEL)YcBO;Qe
zxvRMGGjn9i9EP`PLNlCRE&sH{F@$BF<4G$XmD5k>nn+o&bKGZ$VbnaV-5@R!IWLWm
zpNmVhH^Ze*$9I)@zT&-u{q@UMY@OGtF^T7OsjyI7Tu|)vN!Ruj>lARZGV4@i=4FOo
zk)QCedb{MJd!FejFMe6G#82%in3(W=<t4uL>$RQMU)gMb+#o1|*ZcSZS6g9Kp5nO{
z|GQo_e;4`6Z>V+Yf}z6K6V^HE9C8a|t`>RNh$Y_GyKJZT{F}L<!He{GLpN5%FO4(r
zZuhy!RHX8+;nmt}a#uNZuT1P<P`Dl)C-`V4^9*I~hF9J%eBWHYmNui3>BauDQ#J1y
zAG)d0bt57+C@0))@r!^3+>3YZGB|3(@yX+h*5%vN^j730CNlCceQ_!(o~z3t=ehD+
zRB-LB^|Owzni3r^GkI3PgrhFjnI=rfQvcj*@0p-*N+f))iD^mm)vO<~6<(%Wzw-E3
zHm;BLoAm0@ybbQbi=DriEN~X&EqYOVb$gkxi1~`?kBgQ({V$%t;IQMSSp0sGoeT^N
N44$rjF6*2UngIUtjDr9G

literal 0
HcmV?d00001

diff --git a/misc/openmohaa-text.png b/misc/openmohaa-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..57e1c665b1c61250e260595ebbfe976a386a8c2d
GIT binary patch
literal 247852
zcmeAS@N?(olHy`uVBq!ia0y~yU~XYxVBE#Q#=yW3u(0Di0|SF(iEBhjaDG}zd16s2
zgJVj5QmTSyZen_BP-<dIW#P$G8wLhujm(gUk_cZPtK|G#y+n{2y^7od1`x2ZuP8`N
z&Q2{+NJ>r5%(GQ`zk9!uLS~AsQn;zFfp39xYDT6<RZ(him0w75Rd%vvijuvZf=z{0
zMQ%ZEYDuC(MQ%=Bu~mhw64+d;ykaYmu)dN4SV>8?trEmh5xxNm&iO^D3YL0?y2%Cx
zMhfPZdTGX{CaG!3<_0<nMg~U4`i6%329~;pMpg!<R;I=ZP@rU|U{jQmW)<Y(2DPpz
zCCyeTqokz3N?*Ucyj-u`STDaQUEk2s(o)~RNZ-gvw<sk|x41H|B(Xv_uUHvof=g;~
za#3bMNoIbY0?5R~r2NtnTO}o^u@$)maAWg|p&^x=pQ~SySfFpHX8`gQ#Jjl#zP|XC
z=H|jx7ncO3BHWAB;Np<Vf>iyW)Z+ZoqU6+|)HG#~n+mL)i&7Iy@{2<9^K)PU8IX}*
zl3$#WU!Y)Qs%N60;hUJ8nFkWl1Z(m2werj>E=kNwPW5!LRjSA>(96tBv2r#ya4~mt
zHMcM|HZe4Gb#pQ>bapXuvT(I9cd|5dHG%1M$xklLP0cHT=}kfCwZN$tlpsJMV&#%r
zlv$RV;#QQOs{r=3RVHq?nBp`Ksy79<Tg-6k)wffy(FesXQe4A?f?V7{OmNBsrBXWu
zMDkC~OR-fdQnI&8yIyvgf%(WRPZ!6Kid%2?Mov}<FH<YKlYIYs&mCj!&1NF20$P_|
ze34gHJS(NxgRk8v$av8+$HV3`J&i8UzmPxSrDMOc@k|q=EEDdNnMG}HUb1GGT+<TC
ziZ8maWc1DUQ0#N->$XNk=e0x{ULCW2@#0iZPr?4WzrSpsTc0lHxwPo1>ZJR>AJ_le
z|L+6;|2Oq#&crI$Yq*7N_L%3`%yU@b_O`31#T9SQ4~T#8o%isR{ndNzZbj94Wb@lC
zefhKd%KNV?VzdHu<}UxZ)B98GVUv~DGlMJB=bFvCxAg8=)mLAuKi&JX^R!9%zfh?N
zX0DdUB3>ygPrskNto=`;K>aeut%s!k>pEUM!}5`FW#GMKWqW-teqs69lqmIOcMAWn
zl&YGPPZb~X6QAly-qkufS#nq9XSLWJ1@nZ2pJyhpTrrKXHM-6EZ@Yi<!G;<;eaU+Y
zU;k##Y3h$(RF*qk>183;@k?J0-v6(9^)&0Rd-DHTKVF@D^!{q`Yb!6W`k3$1=+UIK
zve3vzPV#Z*q0eT2c%E&#|FGUyslWb*`R#4z>X@HO<Qf&&*6`exRy`~~)iPs>S>~&$
z<tJWqf11I5`22Tk-I?1REZWTd?2j(+-Ns&g{ISaKnb*Xxd2YY@VCA#Vu9MS$)ud*7
zK2x-_tN&FaH>caNz2_R=`kNXz8%65xU*g{>rW@6F&pi5e)_>E=_dF_B?bNH!-P^}3
zdrc=dc=M*i_SGr%ZR@^l*!Pj`(4yUacQ)TGF40bzy(T##f5RjN?J0NHGyk}nef8;$
zxOxv+?qs2juJ_AkmG1ig(f{P5{j7%ryN(2j_@-$J`A<AAFA!V3#9{u2dWqFXckw;n
z6cK-|TY8bc^2$BMde!;spS+*(R!Q*N-xC(4yDyZlo-!vQ;qNQkPcahJ?O%)b?$E0;
zm^L%%@7*O~TQ#14X<f9Y%=*fj@RfU_7o;tAdmjH=uhq%%R>cR!rOWgJl5+fxwSAPB
zD<rwMZSj1aedd`;*Rp#ru}!@$AGrSZvNvx;yPhs{ou6y>r-QAg=EcshQ<ravzO!)U
z%*v|YyZ8IrZu1ViZuUa||JDEB^zCc^tN-`XuhZ4<uJ|gFQ8`mZ$p7~z?)4MZ1(vGi
z-)mjIT|<B)Kt*bCfQ8P2^Ph|h5?mE7G@9S>+k9$v{%oz?w@Y46|KIs(a`B>qtgBpG
zXYq0!-L=RiH_YM28e5)ApEiqYn3wjIU6=n{Sr)nR=BA(9Z~J;ZOV^a}HC*uK!s6NQ
z12v?Ux313bzT~@6h{-`C*G6o?jcjw5O2>~04gr_U`aK&R_iL=t>*w!M6zROQ^QWa<
z*({x~9}JxgjSLn&3^&<67<<%ue06IMT4|!X{7}!zLpJ|Rn$LDL%+S-`dOH7417k@1
zI{8ylk2})TPo7>N$RN^iAw`v=^>vff^@0t$*+=XQQrB!tPMI;+C~&)*$hpAz=UD}~
zCcNf9`c&%e<|aimqc;g*lE!UJ6}58a$2twau2lZ~sLz){|335iCrvTWUr6wGo$Q(^
zk#ck4pU4f5C%OeLkDOR7+p$!}`n27xilTo^3jbo59<vt<oOvT@8O0}&x6DR<Z<%+G
zV>EM`Zv1&Knc9N=^Ars{gx%HOOJ=<{IU1>vaP|xD@zz=kiSq&5W2ZkqCeG8@9CTn}
zX%qALoBeMt%wQ^8D_eSZ(|YMmp~>~@rf*+yd&MMsq2&=}vv~gO4W9T>@U{4xn+Fpb
z&c**<XS3gtExavrgWoI5s$+KdexBG=^j|IYSi0sh2BE5p4<0jloSet)uK3!O`Fd_C
zt3>odnf*py@lpjvt3G%9v-)ImBRH$i&n)77#mZfqjrMG>c`D-f#HC!{exLW-ux_S>
z8>(D|MIP<E8@pG%j7es%(K?4YI`J)~{PTAoUNGr6+w6s#_B!cqldM^je|xJEv;Vcj
z{}klywab{^OnAA|mFt7;t(f?wPnY*+<UMS%Xw{F|H7DI+g}kk<lt9+SqA5pi{P@-?
zbS0^^#bdVpoCSWX{l1<p{q$*>bg!z$ByNs|Rd4eyJ^SQ*uZQ=O;f$(^?_#_XK1+&(
zd7kYO>2uK#;R;-z&wEf%#93on;@xSfcON~SKRM;QwMcqv$j!S8ue#6QEF_Vh`e5m!
zV?tN8U1!bMuadAVQrlaFTW;Uf<J&dF{DaDJnskoOU@&O?WEiQqMLP8pyKmQqrWYU1
z2TWR;)R^{6JaT96MkB@t22&?FtMIltlusApVF|x}ZDm+?K*=AbpFiH4X}jw;b2azx
z{`x~WaM8?{-hG0}-FEFwJnF|!q_jrH>{ef(Wn1cKclov1(Zw<;3@tCzc-THNZFb5D
z<IeH%`Q+gfI7P&#+cD^V)U($s4JCR4ra!kAInQ;%*3^k@G4rwRhc#hr?u#P2v%hD)
zeYbncygeSBdmh)Oeq=qAa-`C1&%a=Y<qst|_vCI=+;o1m?=eMZ52fSF4EKCDvY9vC
z!$|*ny^Mqie@$iko<@QDhczl|8y6~mi&=0%I%xSuQw19vTeI6U91Bx!NEu}RjM}h3
z_+<Kp#fysmO-#R9_AT=9Y1Xby`Bjy-dpuOmY_Jhhob1D$->@bjFW;wQ#zs9CF^|n#
zRL?oQm^)b}ll{Bv!Nxt;Z?`ecy1}>5c}<@Cfdv-lq(m$IH~9)&eLZc(`RdHgH=ooR
z`b_+?=f%xW*Mtk@9$EivmHxfiFT?(vm~GVhfVbz`OTNyPUs*fj!Tqnn^BI?(F_W3j
zWcQa#;nt1)wv!SKOD>;m=vB_={3dvY|I4i7&&3<sI8sg*&N##wb^oqFtz_EV8MC97
zl+?AACWq{sf8zY-fBVnQ*WYxn_u{Y1)>9G=^m44YFF)<K^7j)L7jLzibH=7TWI@Pu
z#wv|tR=P@$5C2QsWH)n;<?(MGJ#zPc&nf!J>9w@@N8h~<TlR!Jx){9RY3ig3rGN3)
zyI-5HS}H3wzrOY0;U<PH0{M3WDq7c;YUQm9TD{44>m@Z^+kNgUedbxsoyM^4_5Huj
zU4|JgO^z=4$v*|P#rad!pQRLkV^<bxZPH^5IDCwM{VIErsU8u9#jZBf746*m`z4?F
z+E`cing39@`|s)fONagI{T^TD7V+;7EXoOT;Mg<qZdmW3PQz2@_9?w*3|O*UpW{Pg
zP;RJ1LWQkJ`q3nZi;QlE1kygFR66BMFzNi2`$>KI%A;K7hZ2MZeYiE}90*m@_6ajv
z+UqWo$|~Elv|TQIad@%K2`|q_v#Q?i(kQz8dg_W7?`|;%e)y2EYRgTr&~4L?OyD>k
znx$n}VE9+@)rLcESNIexB|N)~cwHVXig{`2D0pcGgU8-`3o16pIy2ONW~})5(f6>;
z&mT!UN>%>~Ex1r{sa4m^OW-T>1{v1U+=|ZAu3WB<N(`QQot?XvKWCNU%0kl{2?<Yh
zAOCvhwzlV?)bF74hmMKJ7=RLH)wG?SZu=L`Dc)m0amnJ<TQjzmtA<{9wzo<@_tR-9
zHu?GA%@^-I{5<E>43-@SBQ1m!OTPQM%nvc^_<rV`)|<i;HJMXFva}9Nn!WAjDlwI%
zm+roQviU9B&&v0FElOKHeGuFG|8xC<w`WUd&6}qv|C+0t@#(u;wik6J{B>+AKg~N>
z-@R#H<G+vXhZglOte^g_&f#H()3N00rgOCq=6`(OXt_zk!s))#e3|KLi!P;4UCcTE
zBb)Q4<2xcbJf6FV1+=|wstB{>Slt?WQE>z7hq)DbZB`vh_x7K(DxAKEvDxWfW6BDT
zolMQ&*<M$!zMZxpCvb1vbIXU89?wFqao4*qnmU*7s+Q`iDdj6;w74$JpBcSiw*0>D
zkFCw^Yr^dtqT<9Z3OecPPmh?UKF`NnB=7IX=TlDfbekKA_!<|S{G=wcbne#UDW8tb
zO)Qu!Wv?E0Ja4zBC0p|2=j%2Ut>UUUm^SC6KUc-17tF8u8XR4YX|<XLaxF55kmL~v
z^jZGmRe7CD9ec!sJDqP@T%N4@^Rp;%Zqmv%8k-`@x@^`6L{Dw15x=OSA<%EH@KroO
zYvPj`F3W|IH?KMJE96#<(`@bjxgvhSadGuC91EP3;=>HIHI0g==kr{)>~&~bWqms2
z-X7IcMklX#Uw2rP-L_=5l*iYWrY6P1Y&;GomU78U&N5u_jjeNMSSq|B_^ad}CW+v-
zKGnDfWouo0*=}#V)8is6dg1KKD52B;n6`&rO-<7IQF*0d<6VzOoCjPi=jLuokdZvq
z-@1$U45!Wh75t7_Z&y5IUcC5do0pdP&i^0S&#SU;uc)g^a(Pgv^!Mar`3vUeXD<t!
z-@{N~IAOm_LdNSG3#P3PROyme<f;^rki0AZX5W&p_OF>t=ZJi~d`bOo@xjcFH^Rcd
zH=FyIeY5DC#5%WQY3Y#-p<g~l9#Hsp@76i4_ocEIgBcty7@wHaXcuzPIeErS#^sCp
zzej8iUs|<Q>3Q|rula!*mVU9HIyVbit+}4%;o0W$-0z0z!pRJOo~_@b`Sp|9{Or#c
zkAHc1|F8X*_`m%ByKlX&4qchQrD^5g?@WT`b@Haa^(NTv3kiHFa=25)>3n-ce`3lB
z0l^LLKc27%tZVEK-#$&H$inQu)Kax`n`09LGSi*ytZj{*Z~9F7^<#~_*R=3Pw-iHF
zBg<LyZTw$*^GllCPx}y|wEz6+Un{+{wf!YSwyFH$yuhp1<WxBQnz>o#_J}Lz=ZW!h
zY|XIrdnT@b^SS<hukyV6X%D`)Yzvd~v^w@jJ3pW-tMOQxn5I-G2ZKWvyNJLP!9DXj
zlnzZ0S5@bn&{kpgw{CxfoQCj{DNdS|HH@CgEkbTAJY7OBr(HdzXIt}&+w$HW?ff8{
zx#9t(zyJRCnfgfVtlpkO4Vye~_vd@o#x^kaEt&D@<B`LsyI3`qzg`l{wf*ICubs*1
z?ZWx?-LEyp%~;kX_+0duAru}zc^9AO)+dD(d+Qi$V%cmMmVd}#TkOf0_Mw1FqQpe8
zhqalvEcrsv^*g~wjLIz3RrJ<+1vW@16?cfO+M;xrv2oc10S(u)ZA|BxU+r8pQ&X{G
zBbzPbt{r|~_v)u@do028a-QUj2m2!X-0w_V!lqH>Ds|y=#nZZqzm2sky%-*CydrVb
z_-C!=V&!$uYEyV4m<vR9xUhcQD4ALiaX(;%(#0Egl53fyPg$zJz546XagpuKYZo_0
z#i_Zhcr|ZgrGeLjroTscKHTDGw&lrw>vxy^XYt><=x>6bSIn}qVUL}9wUI-@LE_c<
z2}dW+-hb?uvi&5x+FP5G<Uj5<WP0`Oo6Bv+Rm-k0md!1^`A9>=Afsx|L+f9H2?7^4
zJ>x5_=G82pVOu`$&`Zs%+jeXL{;UGL6Vy&xF;zX@v1?!RIme#U$v2!9J>D8MW&UoB
zD(R~04qX~Db61GUPkN={5Pkpdq!-e2*68UU@LV91Dsv(8gcz5{vW`<8H<+)Ou(V%%
zGv!Y6p-;J|^bcviE^n|6To^FrlW>RnylF;ECw*RSIr-?k@3BiIeQ#R>ES!1|8TH#b
zybYUNV<*3LHgA`jkxBW>(o;R>116MepD1tonB#9>9c7|$Wzka!&FQDNd@1pCog&er
zQY3t3&9oJ_HG+3XEfH&OICQM5;;z@y*i(Mzf=%Wr+UIWyy7I2Vf>(V}<9*e&%?CLa
z#eTT7u+3oNd{KqYD}D@1HJH~PIu=~@KmWh}%6OMsFAiPJ=axKmIC}q*wOf~)*i|>)
zKkvaJ#QL|EEyp9CamRs*1#y=iZ!XeVB6Damr?OPTg)~+6^Dlm8=U@Kx*MH^pw;peu
z)^F2&xwvdT<0Ae*=df#XlkI-C{|{f(mH+pi{p1si4b9ZM3QwG~G)eK<By&k9kwdju
zp22yE$f;P4RJT`2AMB=B*sNW*klCTPsmg`7UE$QW`RmKxxjqzHvVGfao&)x&8@73D
zeDg#ul8?jl$2_JzOgrSZoz@AhD`H6SG7$+3jgJT_JQ~>WOLU&TgusgFQ?@A1-naAR
zq8ZjMYKI<AD*EfnDAQwU5igZ<;b3sTNKSO~A^q1YB^jBj`p)xk@vn1#vps<=>`koR
zoQ0Eb^e)V2Yu3xP`w>ugUVoq6qk!Ufyd6h&?fGBfw28e@XU&Eh_j&z$H%1(P*WUK{
z%&qm@Qzmo2TwB1kD(b`nrqD@wtJX2zcR!n0n(g{(^+IWZr^4yWit|zm8$7%llD8{W
z3BH^lH-8nk`J%@>>yjp^Hs5mG5TmXxuDaM|-9fuqOHQx78Ma_z{rjsY-)+^D@$Nc&
zz4w)(YuLsP`F-ju&Sp!et`fcewBWeWDk~;+C7HGhM-PTw(hUC~^Na5s?{eLS!qVzU
zJAU?@S&T7-#WQnzm9A!){>)L>qO#5LfPBK<`^)&wSBgKe`}6zCBhy>FtSk3?oH6O8
z&Qc>wtv4bkgnPIYLf)*ZT_s|knf>*mgME2aoZ3axmZ&(bnXxrb{nN$t<Jq}yzF8{m
z^n^()z*9Nb{D`*sghStUxxCpBX|A<9=yf}<qyn#;_mbQlJ@XkX-j#3s`1t*7|M!>v
z`q#M$hPh>iu`r0lv3bt?)3Zck-><jwAMXo=+>TV`XWsJXj_R&IYwu6o#p$BXyuy;l
zZN=#We1d1Hmik;Rn%LCXa7E3*aFLwyQ3bY(Y7G*%6~%7ejhZTTq@-@vR4(nCb-^Or
zGrzKE*!_7E{^iBy?<bExpS!ofS91e%=CpQRht8!N4G(xt>*Z+*pM6mvD8<n4kLbOu
z&=+}~j1BuWxA{+vVt(wfs9?FotGwC$>rdS{QoGXdz_H4OOLC7V9Qu2-f8(7i0$=8x
zj9@d)Uaxhpex>V^^5%&xR~|3;cEv)#_Rpo>a-)6I($B6vX!Fs^_dK_?_@19Dz8<Nn
zc~=#pn;vnW+3*Rkr}Y)Bf2@_uQv7@;)Fjrcex6b4cX*bKP58fpkRYw^*LH0V_tq_m
zxb#Q&q9|*j*HIazDHqRkFJAVU=V0Phja<%-&z8S`9egfo#qf(I(0}@rV{09c7<c>?
z5j0+Jk*dR}e_^&<e!`CZ%^p4sGsNF&S{<^wo3%CL<;B`Accv*GX(zw9FR7Ee|JL|L
z)8$|<(<N@VWf)hQ&f7lg3aip%rnR&FsJ%bfyzI@>IJQ|2zif$G&;Du`e^Ochef?k2
zN<Bg95>|pwxTiNve%oZ_-r&qoGX3eV2WOcNwA^F!UNK>A=R_NUWmn~H^B3rRw~}Qn
zDR?sNCR?L&X--z$7d53hKlF?m98R?*FOp#X#^oh5X(wl-w0F7PlH2ls|Ew=F3$I@)
zuLtQIx756r|2x_K??L(hr(YYg`N)O2Eq!a6D9LK!9Pc>UQ7DMf(So@xK;rw2DHCVU
zKjU}d(%bk;pZ4~vu&NmER1jPrVB_1L|G!Jl;DXb{inN@ru4wH;T2_Y}wC9CBG0?Db
z&tmsTu~~Cv+w^yrnxo%)R~<jJwcKSVLyXhQh5QfxM(<yewbJ3|%g<9zJkvDax*$t0
z;-N=0bC`>VqYP_=)8(`8_3!?Ta9DWdS>+GawI)nFA*Vz>+?wL^JR_+p?3a4vaYi<c
z8jagwj)DRnS(E$g^CoF6=|4SVe$BteijY8_{$Cab?Yn$R+fDT5va#`IUG>VDU?S7}
z<h1!K-<R#8Q@+F)PV;bmcj3Ii_i6JO=V&pcc<6g4XNc@5Rg+8i+o!c4X~h?foqL~!
z|C*C1m#`%wXGYW0&)&@GetXxXtp9kYZPCij8?R<n);&lnJ((f8)RaH#Ldld5tZ$up
zI2?aDtuVI{%#aRx-#3YcF|u7I^pDLCr&Efo&qcoYWjV<Nc|0_4zi2h}>;<thpY<}_
z39B~z+3B(&z^>rLMkU*n=1X!;N)!K1yYg7^t?2oh+VZ*kqbL3qao{X%$ylhe_vezD
z17hiFi~19<%~h~-=5(<UTikG7Ia)WuNbut(p7jmhjNwKhYzZ|n76F1QO(OX{S6O}$
zdB!)<G2QNhA7?7xqdg7hxYR<feBk-bxygKq=;X!6{lu0&XWH|=q1&N?`Nq12d$LMD
z9=hk=Tzu%{oF&tp@|kPGZ~Ao{dGzP6!d0zQ%ecz)-ZHakF6?JxcPSRPTAi7@d^<~k
z(|_g{kK-2IVO(O|o8>v@_y+Y;IoH?N?fhS!?ahDxvi~$ld(LTH{qOerS(4KG|Go78
zZ+leo2kRlhs9oPV^Y@(&x-fV4oar3`B7r6or)fl2<;*&CamJE`rmsz-s;m0Vrpcdj
z;}J7#5I1paciQpe8UNC)tQpIei?7?DBqzLH{*};!g)K$Rmm;b^aMpfXy?=VuUheDr
z)whb2+yCNhKI{L(+VWOpypTg@+xOt-@yfS7rCle-ZJ7S3f}uSwb7=za-nn1z`f|BF
zzLFKj+R%1EMm8??%B%&ctlIAb4tUSJBM~1z?N{21h{erEiY*H+rP!{j7iIP~WV&#=
zlehWafn{5d&!2cVJE;G7%SM-jEZ=R|c1~_<D~XU{x1Ie$l7m;}?n}!Tw-?S}v@1OS
zc4F0}#JkU4{P63n&{R?kezrSOGhla=z+ny+rf;9mo&0Q6=yiYXyo&RoR~~Ac<W=%r
zC|a_kCY(p1|M>Sqjm=$LT0$HZpM4qIq~_G@OtP+S^q=VSlH(zFan6d$uhwU#A6r>{
zEpTgd^|{r|zo$&znAo%Ba-*J;=izIM`&FG?8oVt0{^kWQDq69)IMU?m#@K+zkE7)S
zHSY^8T)n#Zr;?Cn_D4g(mB&9iuSst46?tN?@4y933C|wRZgq~`R%hE@>~FAKu#wX)
zy=0Eg3)SN*JN7T!uJ@(!&BqJ&9X^L{K21r`P}<zs<9JHM$Mr$;`CVUUXH|WBcGMy*
z|88=po%6P?%l=}LP6cgVX*}n9J#DXE4vUhg<bR>bzxBYD*qaN>7CYUZoo({qXaDib
zDOL;;6Ay&#_4+yUv&q(qsi&g-SMK@farII7>7ZYi-mW(4O*o)G)8X$whn%)k@1{-o
zm9xg?-|nf$zt=5<mvS+Cem$FS)UbQsw<pC`^>3}$%rLrSl~Db4q02QR;m?nz3O5P4
zzx*Z1!6b7)d-{n!?{#)r41uesOU|EsjrVR<U>3t+o&y)|#NP7x@bS*EJsk@;eNFy{
z--}x4fB)~shMlkP|Fqr4sPyGy{m<=RzI<aB3Uw3-+_*XNQak6xV{4zX3#qm+{e1EM
z|0J877snZ6{;mq+>f(4S<M4&aKdbJY5o=S|A2wZ0h7bWkR!5$LyKiJqX7%6leM5Ww
zi8<Fay>+<`w8);)P-cE0{L)d*^?L8UI?s8NuiW4{YQ!@~lA+pW`BXmX>Rd%WDU&6y
z%p6?v<_L0lhHTuW-LvM<npa=GR;M|CKk_|?G2A0Ri0ht>0o&x|Ta~?}GxvWuve?#r
zd#LCkxyzq>o?hvD$n<_UqneZYryo7+fyKSc&hN-Kc(8Ag$HFu0>+ha=mhAa8sN{{l
zguti0@5*n5Xs<b0bun{M{L(aji<~`G`{M7+`8Ch@(W?gWm$B~0o4+uhZ@c1QzWULQ
ziE`WH=1)=nG54={OJ>VAk>+Vj7D(|)xOg&u5&Y6A|6q0e^!>^IzqL+sX6Se>UoHRY
z!NU4Ge`A%V&E#Y(i1z-j!p&9{8suK<xpMb3G1;J|1;13eE*m%Ny;-{=a>^O@e|s97
zw|seED|CNxV3F2@Q#+nmtw|2N#JE7aFZKg#gMja>d$W&QsaMZ!^C~Yja_6h%X%O~{
z+jlIg&^IVX@aPxzN}0D^UGu6YL@t(@w&Po`dU@v4f9fKgE=z5e2Hg_fBw?{YU3|UZ
zsYtbFdKaG@5<O+)Ah%&1Tcb>tMxgPl#JfS7d8@x%ikrXd&!K{+-}C%~+?6j{<gT;%
z`EfG)_R`y&ka~8C&w2fSE6-=g`EPQXWmoUZVehc7>4bt(i?sK5)mY_OXFR?Xyyz^g
z{$}N(b@Gfw@A>#iZC^bmwp?Ey6)}Aa-xcviVayBoRvKQKu>HR1Hd75R4UYz&m##;i
z-;AquS>2y^`AqBe7t#B_pVzdn4vf&fxI?asO;`WebG=Jn9)(8Le$cetTR&Ot=bfE1
zy|t`fOt_<v)sfu1!foQN6(1KL7qmHes7=gsf?$t!^SQ?c>AUR0+!LKYc1^#UDY{UJ
zQCU!K`O5Wsj>kJ%tqpewIPp>Aw%^|whL5(IwK)Wwh^UZT`b<F6{Ez-38;x!4({B~n
ztlD<?&&w%C-`L+fahkPn#pHuG60azj9>4M2^gok+MW>)<Ztm(^lAd!-zt<ki-P2Rq
zaOwW)g<mXdHT#)M*q_~Bx!d?*se4x3_GLjQReVp^w`|Pd$^Po_D8V8-v194Oz;?%W
zlX%JP*XN#D9RFoe+>%Q(EB?Aqvb^f?^TF4;i{es&n*+HP2R9xRuc`TK_3_`n55Ir*
z&i8*j#nLwKegL0JaF&2JmyYF|MejE2C9up?I(EYHg4)UC0FxIB9Rik?{$8Bfd5YC`
z&;3%bP5BAujeq6dbgwzqaP3{a%l;p$|4-K2`_;K}-Ni#rvsNr#xJzHjij9Bq7rrm7
zGMh|~<~RLi_<F_T<eHrI7j9kt&C{iG@nBp0!~)KrTI*OH`WfXqW^9+MQ~AZ~VmwKy
z@Ac-8(|j@E?WHN3FW<k;<du4=+Qon7K7r6}^SC0VOU^Vn3Lk5YI=*+8i?~MhihaA?
zT9@9wQhZBkp~;~@jo;t0H*eNvxFYT4c|KO={%Nbz@}8Onr}USsx+ba9Rp;OzbM3Dp
zTeDh~==SI<Ndl7o1_JKhEB&Ism<Qz^jDEoHmKyE6TJ4VfmX@xiMXT07e7Eh*Muw>j
ztp`0~ekmRo_B{3M)0RI!?)AUF|IdTjNmsu&V_KlD{?r8Fy+2;PF8OL*uQ6Mv>p)<8
z`>uT{c|jbJOfQ&E%wFf+r^L34IqrjXgVdtV4k11nwQYCqh-UH!#_W7OVL1!So`*XY
zW;i)G%AT!ysG4}d;3R|pj5|L}?QHcg9=)<7E3dy~c7nkXh7Vm8e+$;RsOi6FuTj&D
z+vS$Lc{+=URuQ9W=SE4XFQ1&+nsx~!9)GgYq0^(d+C7qU<LM3Ovg#+=?wPniga3GN
zN_E7>_DLlwqPt$_PLs>umbA0DFTJNhdh)ksv&<K9+Me$Z-?<aI^1Z-$qjjz4b#)CT
zY^IyZb)}0XyB`T-kh|af@Z+6Ci~szo8PA@x2r#Mah>M%tlN{X4Cmo?a;njz*v>>lv
zowC=rbKmE0`Lt#Cw+X9yjZ&Y-Emh#C-{2PGRr&Zr__uS~b?ng+UKh1be={!V@6&c*
ze|(7XR9@7Yx99B7+XihtAhkM6bZ^p}j)~2d(gqUJ6(^ZAq;2nCT)0>KIq#F-289nx
zgVx%zowxkH+})k0zQCh!z3b`q^Cgt~8*2Y--nd>a_siyjs89EqR^4A?GWYoRLy|{#
zXxau?Z(6Th#X8O3X10pL#QkaN8dClS65K)Z)jSOm%hhU@yD4Zo_y)PI<-5uA>(k`R
zU)=vc+P}O)OFN<O(2M8OL%#MeD~{<u?&*1VQo8(KhP{qgr^xbIPl;rha5Qk5q2c<7
z#)mnj%MTy6T6Ow(wpd02OUSj(g&e&X9(m0B{(@!ZUar!gyUMn0*PJysY~|x?9!LBm
z)_KlJU6mUWZaN`7fTKvPhqr3ub+`QcJ1h#9>IS5BS*=+vv?h4L{)O%Q>1#f`zi7C1
z`{$3!8zk4vv#1R`t-f_ZpP-CyUuW)x$MuX^${)A51SIqPyYSBIK+$^V`TyS7d$hdg
zYR<Ko5U9>IugN8^uWVZW=DeN$H)o!nGJDSCx|0d=y~iGjBs*A|edl`pN8>8j>peWP
zLNrCKe%-vZh;gBq?s1M+Z2P}f|L@g$p|_@MqaN!mgE>D<&Gst%{4M|g$^XR#CVG48
zyJl;DdFlUuu7(hUutA5CsfneT?n;Ai1`>}a-ru;8pY8uFu04s$x7arX=`W63u*&ZE
zaYhCweuwq(8~vOVAMIJ(wpqh`$r*`N?`4l=de3KW-gbRn-<2~v85|o8uQLcF95_Cq
zV`8S&MN83-CT=COHZ9c+z1z6Ye~roBLk-WGEN>;379V`TArK<C|6m;RkBKiHY+yTF
za4c(rhEs*(--q(2CGK`8GCX)L|Ia6A(u0Gt*9tAZyWRNUvwhiN3B$HGwYD4iCcRl<
zI49uu^S<v}zQw<*xU(<XS-|Mh?>>7apDi`LasT6aJ4NQG#kMnwH!OX7jb-J|C;I$*
z|2aKUe!P6|H1%^4cPpoV?Vi55%pm-5HNQLCfkj`QS=lBg=jX+X>@f0UU2yFBk)~Cy
zr%yMrw^#4jEH1xOzxSQI`@4hFQugflJ)u)>)3U5ahPzEVqHh!nBD@}#ZokVN<$lAf
z`bOX9V|ULpo?&=*r>?R>UeM#kA;!PFJC=U`=Ac*?nC!Uh)I8-g7yJ8+gJk+`#HOky
zUATPvz2)ughMRQ1eP5T&^84Q3AL3mmSr+lzUI@LZ*X#ZoaDBqw_r;GMlpcHd?*5JC
z3peX_npCC63Gi-NTAx(CV?N*Q!V4aApLML;>@Krpk^N7Lync_R+o#q!ALF01MK1l{
z(V53Tt2}<Nf9kgIm3P+!CniT4<tuEEzxPwUUXkzq?f3t9uh#up|MKhm|AI?5S6Y@?
z2#MA)^%P!s-~D;#;o?j0ziw&w>1Jz*+9IRQ5ZCPI%(bo6OzKV6pH)T{ErPuv{#O=7
z-W9w1`^mJ5-xGd)`togk%RVV<okbB#!<ri(U1CfQ`}($6RC>zgYoBaC>h1D6`gaDm
znw#j!d5I3c`z^Bsc=n#0wm6&rat42}YVPcBQEc<i8WrxZ{?^fLXq5B#MB(k<cW*g2
zSlsHl$2xz}7T)3`A8x+ql%LzTIPLWVfp7nQu8Oj`U=UkYpMNZU_W#4zv)}L6dwgI!
zAER&elAm8TGw9_yXI%XBx=o}1PV?Nq_3^Lv*xY0PuKL)(O!e^z+j4*V9o4P1r{u~M
ze!c8_*|AZsL`3$dwZkJu-h`fpO&8;K96x)}u6?25q;>X8o37qJQ~SB%)4dFt8S<|`
z+-(1z@c&Q$yZaq?n(nNLxglX?&M0<1{=b~+Wl686YB%&Mr+Y<ffB9SgOI*bNY0Hdr
zUnC~kWqq0vIDdxpY>Q&vePW=N)K53ATRt@(=Kl{`F*CWdr^257b^priYXX*sihf{E
z*irHIc1Ze#9e-XFcey49sn~h(G(B-WFWKSrAooh^mZ&Wm7Z<s9PuqNAMJ{7P`S-u_
zm#1#u=Rdi7{l)&G;w|4^OtaW}F^cP^^IA9Gjx?{<(p}#l`oH*H|L4A~^~9MF`<HoE
zmb)v3+<tvJWc{>^oT9#S@s-V0ch#<Pt)4P_zuU$$EN5ePxUKGgKjHlAizVM+R;~}3
z5EXSJVxd{{zB_-ir`Z3uIvf9U+LlE-etzD+?CEdw)?OLg2?yu=TWtS-eu%G~7yp)w
ziwyzY(-t4y#C8m{D$BBbUes49(ei7ei9Lw{8ne;@ZU`;&Sdyp`WZ8As<KnBu=Ru>^
zuH9m~QCn)Z9@=)i_x?X&srVggrIY5S`9?`KvZUwy+S72*Ej4`3?Tn=OJ2w~j<T*+B
zZiU#B+~OElUsN`+F@Ac|%)(RpF;m$do%IUL`g7s6`_>qPCH)E8BNZ<#5r_Lnf=4N}
zB<Z86mw&v-p;>powjYYH`ur;Y;?wef4PyC!#7d<?Uk3K<`oli|Z`Y)mHcywIXaB;I
z1@=>N%Ckpb<uc}1@0DX+<k^0AlXB~mWe-KOvaX0e`Wv9MJY&V#+f|PsaV4f3udDXt
zKbyz@k{Ll4#V_WXvpx&TS5R7CP~^k#SUMwH(0kIy)AMIlecO`Zu)_7U;Uj)mo}3jK
zY}{snCNAu`rn8>51wUTpF2ASfuhjl19xipwhP3VO-{xBHezSPlwMCEs%dl+za!WUB
z^Vz0t!T$n!ii$H|n#V-dYph)SVr55|m`3@*)8btV^w%y;_k(0@<!z~7mtLR0_7~%!
z!(v_Onv>3XC&&K0y}@31){S4^e%-NE7s%NfRn${pvBq&BC`vLeE_$lN#!~5{|M$)P
zKkr5QmY;n7{j&A`|IbA_RF;Gr#J#QR+_lzf&fQB|%(c9?4+`Y2waIwRc?D8MbqC}t
z@-mw?o$Pe|RJA19YUbQYulmJ(CO_?;_>lYZxnoA6*XO_cs#3-0DDTwZ#Neb0i>Avg
zd?{bl{+xUNNAT#S%B*cwPD+<`*G+!;)$_h%ifLn~$Wr}+BIVgDudiEdSnGa%0c3c_
z^TLU;3#yBQ)#RD&s|^%3M=w2iVA0(}YOKnsT~E#%EARv^->K7^^wM(no+M}fR;MSQ
zf0mR4fRkRv#Ui)hqYM02yS_f%|8lo@{L-A1IlGt_m96zy>ot+BZ2qE`oLt8)AF95P
zZNB7t;rhT!y)U<dV@@(bN^-B%#RZ40wV9orxAtvcYiIhZbk!8^DKB_6EbIEx^!GYW
zeYEUP?}`6+X79TH{(1x4#<JfBO*E%@c&1!<^ZB&&LJuwd1MBzg_S~1?av)*t4!5~g
zt(StuHEe4eYZk6Zle`KJ)8!8wH!)=z)fgJ>N?lafo^#pxUcsbGlet5*-v;d6;kPzx
zqSVgJS7xi7FZ@{JP*CB;&XZLn2@TiNk*PUZeM}QozTVpH;@GU?9}sbAq88W69NobE
zw-<R7_59+In*CL)`9zQZ`8kjvjr)_~qQCRopG`jUGuO(xb;NGkBiQx4Sj5Zk(yhDY
znHOFMlva0US+9Pyv^p$vd#LaB>#wJVFTXr7Tu1D3xg#uS7fGZ9-{-lgU~<ep^yG_c
z9W`P%?@joi5b@Wpb+YBBUrd+ORtMf)S}p&tMQZ9IHqbP}#oB-^dt$gRJ^pI)Dz&QQ
zv#nO{+6gbeP8Rh!y)8S!mW6-iuFXD;1u-^7HxiO}&P?xmwKMR5*HWk5yLX4IzS<J8
z>|%z;|HJEzx641jwv`o<tWKZS^Gg$Kwr_0vwBDDE;{#jl&&}onBHJ$dt#+L2Ch0Jt
z>Mq~b=+e1eOP($jl2yF&Daf<1_~yRf5B*o{+U@)|uKm(Z&QCMc@^?7CDt#4lD`u%%
z=HzATYo<qSjs5hq`O2%P^H<sfen}X;@LGPEi6zj!<9_qO1uk6s{TOd&?!Uj>LuFAT
zG*5jpdhBRXsOo%DZF8)`re7)TpPibn-?*E^u;X;u*)A6$_4H>eLT)T`(C~Ta5p#Y%
zBr5#0j_U3zdh0t&;(V}$$P&MgoTV4OY`r=~#Q%%xnYp{wW*2M^U7S+a$JU=`e|_fx
zomWgQ+xZv%{(XH>^p8Dv^U5vcCQt2Imwp9OcEqJ62HeONc$hjP<%Zb)<V(*kSBGfk
z1Spw%8jG*{Xf0N1mD{C$iHAeE>K3GgDl{torxjcASUymE%bB%IYxV2}6<&N@J*9_*
z`9Mb1q-}C_DkbMWoT>CVUp)7<!i`_M4vH%^b-E<Udt8OsxMk0sq}g`cRvb>LX7Z3y
z?LY6{eSM#<N`)s|%M14#ueWGO1l_d%TNkfg0je-B7QJcu!kV)rPUPDB33pdcI{$uo
z-g@_+t=W4PvZYMc)w#dWaliY-FFTlm<lc8GyiR4PKF=Mr6<kk>>FRHNre^dvrFE0a
z6`5^E|4UD}F2Cf=51q(An@wMM%R3n?az20k)X{bG%po?-Dan%E3|d2@=)iAUd(|t_
zEIi)8=jmDXkcZ((HH~a{`L^!z%?d5+Tf5zv>sf-q0tbZ!*`Htqy?$JPcgMYxf6Z<-
zwj>;J?63d!qphC*=p~US)32Lo*qW{VEdZ@Qj=q{;`y$Y2s$&0f=e23ghc2o#AJo{I
zrK*){v*^vA&{tbuZK?VFJmurEXx(-EzyH2@dzQ^~w(qL2)grxarV`MI+ft*M5D*tO
zzbCKtg!rPy+@R9x)<?;kpL}Is!C7{(%vt94$~z{^hnLJV*VUi;Vw-SO+_t$>Th?+{
zuQpxapyHU!eSN8ZV(M#7)nm^zY%3f0EVP(<TJ#m4kJpp)o?XXQD5x@DJQ|~?4lkt^
zJ$1dU<F?<|ZM~;i76)_2<fT=bkFREisQ7NVpBc0}a9LGhbJ=zIfZbu2f|o-xPEqb!
zoo(ta+m`F+#NLSEy{z4{=te}aa5v94wvg3RR@{Dj@#oR-m3ua;y;bH5I=x_S3pXDu
z>Z0PNtXL<^R{6_RDbr)V%58b!?b|Y?o^ZRajJ!2z(sVnHR3%O>w_uUJBTM!LbVG86
z+pONK{ymPHoD^T)R+iR_oRrlVzIczW@5|(qI%nf{`R!a;yk+;!k}qk0SsNa#mzL~>
z)oj@UnWlyld{n2b|FT;*Yg+k<O}|9W`dnIYU9sN6?O}?a%$+*MmR&6Ykjhhg+fiw)
zPak;gBmdf6<ytM$m3~5sXUR{SMJ>!%B%Y~h7#n&&J*1Yq-tN)){WspEZ`s8l*?W8T
zht*;(Hon2>CE1`hoS3fu#;c2Dj`MIlJkr)1q`yu(x~;V0`sE3i#OJ%P_;!jt%D;7U
zjVrU0Zj|2ykE}cCKNq>o<umn)zLFWnD!`Vk$)#R2sjTtrl`p?CzCKK6VmtWi>!O3g
z9GL>De^xOnp1YZ~b;ZSu0JX^%xgT|}$PC-D;8)$wBNM81Hs)VfV6c|8jW(&8qH;1!
z{P!E>hv{yz$0xjB{rUF!S{o~mJ1PAC-)GOtGF_h+`{~6liz>UjzaRa}Tb*g(H?w~+
z$LhBE<}WJjw3E-zuz9pkF28P`!S=)N`(r*I+}J<Q`RSgwZ|85~bL$D6d3bN~P4;VR
z&PXm&N|*i4Y5cL~{EvUi^G*1EAE@-JzQ-rW?dR@n{c?*;#T1>>ViVMNyYF{C>*aWD
z+V1_=yjY{EYx;jR%e5*M&f5QJn%d6GkXo<vDeujmZxzkCp08SuuYSew_aKLFOhtFp
zSD~45{JFaJOSZaie|c!>>5y9{FP<eRu-?)43R-#PI$M%Mn{fZ}uSq|eKEL2^(U9@q
z8#6D$Y~DrZ%U^!99aHV$-1Gc%dyGZdDp8vkr8lKE$|_$i?nwQv)3E7wR>1Pm>Bf)l
zRIKy4Z2Tv@r*4mdU$sd34WWZ}7HSh5_C_#A#m?srnJ;RV5SQv>aE_%#`(p!JoxH}Q
zpDm9Y?77{A?QXx`a`N@((=i&4&lP{MDq442rCR^2%zsI_^f%K|tYn(h+L#`C$TQF0
z#Jv5-zHfee^#t-558Ny||J^yRup#1A&5rh>yKU+Bzb3^!iLzZ*BYac*YgVKrOP&4u
zt%*0w3;EV~%Us^uAF+MiXNLEWf7#ghZ<~Cu@Q$t2y2Z-Zw=+%M_LYZE@bcXK6SwyN
zzVTl6cjZZ?!fSeU$4%vSo1ggl)vd;i?Q6AcmTA_l8UK$pJ3PLyYa{Rcs%Mq8$B(BS
z$$b0HI`W!xcEA1dsqNb}%(p5`bh^Fms}*GQVY%e)bz*&~>PPz+7xM6!ZkgrqH(~K6
z@6&sB_WAo<xN=2gs@c4MZoZA@pG!AM>7G|Nxc5wNzoY%1{Qv1M!+!=z2;~Tr-&nBb
zoldZdrCVa%L%H(XzFAjKPm!6OcKFwpj%7wlRVxBDa|8EtKM-0_QOC#8VEE`|wi|;&
z{qxV?|4-W_{CvfZoi3d|^EL%{J3G7Xxqa%F<(xiSAzvA(FF)Qhc$l=^uRT}Fqdcc^
zCcDDf$DtEfY_5-N6k~JW`ZkrZ#_7ue1%-pfOC8oR8~sc-_`fxK_Y-cG%KI~y{d%`-
z1JkT?m5X0`erio-TJmk~;ZCJlwf}OquX(V*+$T)o?18gO@|G(;pZ<9T=hWmy%Qzl8
zYenjqo6cDjw$#D*<?1ZC>i0>B`%`=({w*<9@A`DFY*BTBwMm6eoABMuPL`W&>q_@B
zyu7>WPp!cQ7L#e^W*M6UmYsRRG<AFU%SX}nDLywB=WTY=oj2Jr{_FW^8`IRD+CBao
zwpHQ!<VWwfz81}zw!Po~ZuuN;b<2WtGE>`(7cbuAbZJl8!!sLx?EWG9o%c;|`?;s{
z?#J%_Q*2_a`0L1|7w29Szk2w5i`Ujew?0@D@HsrM`7r-qP~EjpXBn#4|KEH6ed%^X
zqxQD>t;&a_m9>q|9rJ3p;o)HyTkn7E@gb8}U%Mu=zBZQe=DRNS-ZSc8Hn=NvnPpz3
zOK{a%w#pkG&W&Z;0~cPp#`RWg+td7|L7m&owyy|T`NysDwuwMZVD||TgGBx{!XKwf
zpZvLLvovqNyNt{-;as5&2alB+2u+^O(sxJg*m8~=ub39D__8x7a8^ST_qWDuX-1{R
z4SWoo^Im=Yd77!oi-*POA`A1`Z*^Zb{%60QWXE%+NBF{XWB)1H4KqLex!!eK<owwV
z#eX`1Dl*5j*)%7e;(l=WiSjH~23sHAr>0FNUl^P1`K9wbyuY_6O_AXbs{Gt(A*^!B
z{Do!qNt>!Y`&5`6;+%PS)&{iMEDL{j@AcQWr(+tDxf?_hxL2kY6q$P8wmD|l8F7%a
zZSUH<7FGU-s}B}T=~=)u=gAT|<*4UhH79Y+e!u$Q^~{p8jSEgZc&(Jq6ExpfwuNcs
z{cOQ_$<k`uS^IuisUBapB2f2Kp)}98TVFS=33Uk(4E@4>Xw$h_Pj%U1T`l7*W<LEY
zJaNAD*H6XG|I=^oFFb#0w(CiT84uDAJkxgS5j`g&zyEsnRX>)=?`AS2eB`P4X}$Qh
z*EN^zs)8Zn4_<{_yr1KEMZ!T}f@j{Zoqul%R`;nh$KLr-nfWHK^DxVASBr^LAFs3D
zshzz(=!VF1X}QTkiK`c<$AN3OIUH<zudE8seEc$&i<N1L{CsicE$5_Pz5C?+>U;H`
z!uFdA9G6brvYP5G>U&_(Q;n3jBJZP*OD*(x?(Cu{alXf;S43jsC9Bh6H_Q4y{`HyI
zQ~Nw9g{h;=JLl}Sw)M|9EzJFBz<n^tV3m~2`|b+|Z=b#1=F#7Ek5|Q1V4~)Qx%@wV
zGc@d&ry>1yHGf_Z|JR-AtA1~e=lNj$@x!(yN1A4?KlxzEroCqreBUy&Kaa2c)-TcG
zdsri;ol(L;;y`@+`$qdERg)i;yEG+SsH}11`Vgb^R^YRUUr%6ddGo=!Ufv=`9gD9`
zTFY~|(f-^IZ4a|!9UhA&FSA;6_Q}>K+-@qqCIY@E&v&pT{VkmxYPsEB;%U9GkZGB6
zvGd`{|GC*~Qdp8yHU_zD`w`R87QTJjkBUG;2gX}E`7_SMHD70FzI#i|YPZ)~;l54{
zcBQP75iJMjIo6(D;Gv}Kpm`=a!)OEd(VG)otv0&2T;2Kb!T~AgDD7)P*90}bFuM8n
z#~*mdz}KpO+wypFhkE5dro`ul+a-=jZTa|w@2cd5Wt$(DY{)CI{}57tcys^G&mLU!
zpSm2gHFDok=DB?8m8khHDGxO+oZEHZrck+gZ`^wq2aQw?kCor#{Y=ZU*$%ew8ECw`
zzo&0QeaS6ZuYTXI!>S^ET1_^Of1cU`9z{8A&c$Q4N_E%&kN!*JlHYye{rJk+P}!@&
z_xjfu?_QouA1avZaugpedhUPPcqUWQnQd9FpWGh_`4(mWsG7S>;&7aq)xrZ4o!AaD
z9@`~-)0*?oPSYemiLPG%2`agpAI6slY0j_R_|8?6$8Znhq=Z{+$|s#2SPKO#{8o8{
zZ+UAgBrWHi_Dm^vy-kwCjF5@*6J{_i>{yb-EF-su_0OtaV~Lj@_j{J9A8~MRS-<J$
zl>5mG4mGgXdbEE&!*rPY`;!w>^v!K2^oKtE*>LdMx_4X(G9PRiy9;N(=agu@eA4h=
zb?}Kb6S`*4v2b76*_ycPq38FQMt-)x_a4}J^CyR7E)ROB{@Sy#JoGb<*Dr?q`^A`N
zhAq|5T>Po>U(fyLs`JCI2JopEC2l?_^`N-r8)JQp@U_C_fzwQ`v-C?Zm@K}P;bGKb
zW0R=Z4bL2TmHyve^Lf{|R#mT_*Ugg|G8Y?9zt3_|{Hml5zjIax&*$@YS0v18jLJIe
zytdp{W)Pfc+T3%vPn><vJ_-ANU&Xlf{{m82o(P)$h+5N_l)kNRNB9q!cg5?kPqoT*
zxe+^|J)PUH!Edio&9{#}2WK{X$#Z#9+h~2O>woVT>03d^yLbJ)%<#XkzWln`7Z#;I
z{|aKR3CAV4gqOCix_4u(zRR^n@JQgrqMnjjyj7omu3vGu?dFp|si)4z$w-y)nsJ=o
z&1&|*JLyczO$Cp%&ucamKdEZ=U(I}BQL6vW)gh-{>h3Ad2(Vqk;P&9=(Me8o19!(w
z@|YC#L$s2=ZEr10fzYgvVX+?Z0tX%bdMw|l&9;9+vBwt=$qVVKo)eR;1od2|CbTRL
z<2uH6OzCSWJ7=tqbI*-98{L=Jx+)GY^QemHdA4@x?vkh0^$U~~Y<k{&S>&>`WzAu$
zoHq|@86N9%&yZGLz<j+md#h0LqbDD&+pOO)E1Bv&IA(irPtv}LS`w%IPR7VS-Ftk_
z(W1*j3t1hfO55Dh%?a#nG`OUs{Ba3`k>Zbs=M#K)Ts*${t>*9Gvb&#?YInX_yG&S9
zPHOs}LslPqTc1`rgx`O@wfVE#VaHEymtPed$g#)1ENxpM-+1KE&gBu=ZO%+BZa4Do
zE_=(l>crfe(|`81F<;Wzee+e&^6TOcwrt+%xA2dur1_$@#)2NX`+s)6+076W$5zj9
zlA*Ffuj$Ws2Nk{Zy#jR~%NgcvRR4bKYwZI5$9&d27k^YoE2+C%F#4XKXu4uKr^m#C
z7#GcnNz%P;k}sC_rA|Eh>+Zdn$EEicm6Y{dVwy8GdD-nXCyZM=cFpE(IAQIu{><6J
zi;24X0}p(#+^3o?_wo&Mp~Y2M_wy}l(p}y?JaBB*D@)Up1qE+yc51G?9tG*o8*cjb
z!|do|!&!SPn$^zlRnjbM?Nz-MS*??~WYxaKi)~)yupIgvcH^GNdYL_kzE;KZF!vu{
z+_-Ss=G-Q}*RwCZpLWGbv6SCUYs!w`j2BCuZ&iK8meBg*U`E!gD|@y|Pio5GHeT#y
z+M<5LqHE66H)ib;LIygwdN)ZtmylL^u5ffg^F_xxw}9152@}uxb2F>(q`PJXPt<t&
zXKMb$^YQ_iOa9ua8a@8>`QVAJ_Ve6K{5JJFU$U<3tp0djbVfM4b3<Qc&{nIziGO1)
zCJHW&5Be)`HC3VGr$E8c?F%linzVe?E7p^8GQ9sP-*~i^Jm;PsxO$4_DTfW$Uk2?B
zT2!E-^qSEjAtL&h>%(>KjeNyNUX;A{aKGFpSm_+Xx5Qau@!S4MPkUFr|H0$QC~H!_
zBK)S>{{HJ>1}Eotdb4OBIUp~rSlXxMA1cGTVC{-Gc^A*zv1w(p+j%@q#i8u*w2VkC
zYrlmo^Os+rWGeS1%B1$4($s76yvnoR-P$U#!v4>f^eJ-lmy4{|W<STdljmJ;W)(k!
zZE#Ss;}hYhznK=_EZwqWiC)Kvw|VO)$-i7a@r7~oA-Bxnpf3zh0-OrwB=%>oxSnma
z%tg!DHZGsx?~G~-DFM;2gEi0NK5lLJ;>mjL>WqNoRWlX0%G{a#P{(=l&#&s`D~>AY
zo9|t5qr%sF-a)?g>!S*NzfE=dCv&wdtX1I6&)I7;E-qqRI4!@y<>rQ+f1dHH%v~OI
zM_|{pSMT~HgrCP(w=4ZA&)E}wnqOn$T%qP0Uso(Hk6#-$*@~gx{ds?u<zheimC{qB
zw9RS+bDNHfKQNecrt@Hi<&<v>Dq9cj>bmjK%2ZZa=(uBxr>RQWz0JSc8x@)giq>pq
z)|L<s`h7gP_;R3QL({Ic&2A>gf**a%wcG2zb7iqf{ZHPXeyewBC;R)IIraU{>%!n)
z0mq-EE{@9DJmJ-eW5sJ@7A)N@Z~P!DpsZ+K-|Dkfc^i&A&)_gliL7&*wJggt+56XG
ziMJkipVmKKID_HKscVyjb3=1h#MR&M{I2a8!oJ|siWh5d+uUN+)@$^$nYc)c`Ec4|
zy$1%TzQ@gBnGwD+a?8FKOvSm!ADSk|Ic7A4#EKU%tobQ0^>ce@Y@ETv2G^;5S-iVK
zR&JFzb3^3AY#aHPiVsQ}cUev2ek9>yw4$csw{w<J!@f_qq<Qu*rQEXhI_6Y#BcjPM
zb^WRJvx+1P49se^-iErK=DAwce0<xN7kq1Ne$6=-zj9(b+a$4exs5CKnye_}Xn1VJ
zut??ar2Eb){O^^8#8V$gcP(w*l3x3g@n^H5-MiV7q^hSqzbf%^dxj_Xw8_TKAGW70
z_L}I?<5)kX>uA%Q(+@sA*jeECs^CrI3&E8SZ#7&m;^61I&N?Se!DQCXFUK~l<qul1
zG5ukrr2YS84adLk-alnm%G(Xsz#VUOkGiypLN9GX%eH4W^G00}Zd2-zh+Cc#wlwj9
zvGwZy8!K)tOv??*>e{e<k)Fy-AGydcYh6#jd~rnJDKCTi%9%Vy2V6KBCe4WuXjr6_
z6>F#zsDCL@V5|IV*(KNQPj#4xB%X-8wjz<|yn5|LnFhsD-;Gx$3W`>`EfZJuintS#
z_~7!wn7UIht(QMZn7g3C=*qKAAN#-fNW514XD4H%Fx#{LJlBhghaqb&1#eWoF4mQn
zvX1ctW7fe#nk+muwtM}WlV)l%-Z~f&CD{4l{G_~-3-+9CV85sy<E~=tC$}ZCVAkn=
zx5{sf7qe!5=bFFe0f&LWy|uaAf&DL+BuV|<CAG->lM|!CqT|v2?*okNPhXdL{CjtO
z&W`nm&s!}BS#-$8{fFpwLzYk6{tlA!_OLDe%fakpzEtA%j?kFp9!l=w_kS?f{`$OM
ztnAtA{JqXM@9elT-D}HLsh6@HVj8x~kDZJ>zT<gsRqMPvyFHiA<z+jgndo`sXTpa^
zHXT!D|28rTsduo@ag*hUC}wD7coQ_c`<Cu}|2gHCR)6%V-gfY~#|cyZ-*WSWwg$gt
zs@k*emk7&)G8s1CYq}F7oUT5Tsy-lieZA6UDTXY|T+>xod6%2W_+0&@Cn<Mz8p|)n
z>dfu2%b)zP?7XM^t3RFn%*%%!KDX~fc92+XoTGL(&qbir_lAdKmBRbq&Rc%Hm>!~+
zcgn5j3y(<lVGD<Rh47Wx7mLhzGJ0GZa|}%m=5RKPwQ2J>Uzw}u#UXb5V%l2<`AgyN
zB=_!JHP6$~be8%uGiileQ+63GS+pvn*Z<Ocho<5fZZ;d|L^jdQ;_EKHI(%M5>guYg
zn#N{+8(pHZt{zykB5L=FboT2n3m5tHdQA+Qe`m4VTBYljh3`aXMeW$c9<Z<B=Mt$S
zx49nhNY9i$w4t-avwF*R#q<43K27wR>B^-URJr(Np}Los^9II%CJl+6_5Y3qcb4ob
z&C4q(wHIFLTRLyL1~bzfV*#F%``23Cf9=-l)M?1pqPxhky-~dW`WHUVta;NTTs(ZM
zY!x?2&bRfS_@!mZYdMzBD;@{iYX>PUKK%Wl)8B;YLLWE0$`w23m47fSwO#7z+r$>`
zty4PO7R2#yt!J?BzP|79b@7F>-~Z$N`^Nsi>E5cp(OW7$ini<Bw`w>a8h<q5fcM0L
z33B#TClWpcdrF`4pTGF#QSC{q^i>S~xQvuKCrRo0@s-Z)*ucC(zURuVAY;iwk3OBq
z^P8W?mmVvM>Rq+!<dMJcKYV?#)8h4>@>?&izf_$cFZo(wspcBnWsX*hqq<kToV-Fe
zC}tyj29u<2dTG|y2QoRPD<aniWTy89?c^*JQ#<x-NxAwwQJ24qXKEJSGAWxj;pCIc
zlb3^sA^QXk%Vd%`wm+X{;LUNjGJKK5?bF{|B^cgxe29o%til_$WloaJs$KgUB^o;1
zN*|s~ZD5_iq%2kY=#B<^Pqs$cm3ce2#x)ps1U>w`;_>8rIT`W+`tu{yEu@w@g?MaC
zZp$=zmBw@VnoL_zotTf}o|VB0B9m_&eH^63-*m`B$Ma`r=BjDlA)4>G8a?)34;Hit
zcxl|>bV@#muQ2A%o~<SQX4j`3{n>Qlk4f{XFE_R@wCi)R720<EQoJf=n!iH-aP^9-
zhirDW1Q^T{S-eVj<>L+xMcs>QGnp5-9ue4jq-}HhgIPK4Ti8GM6icKXPGsN8TEOIS
zV;j@b8}<wd6O1%<MJ_ZO$Sh3T?DsKj?)&_<i;T@o@gWBuWOz3{U&s3NJ>!bR9ErvJ
z=h_3lcnHaS|Lit>{laL;Ya5vSzS{<Vs%+*-iL#mR%DRr%HK2KgtVdbOdlzZ$IO7fv
zpZWW}KKjhFtA2m{%SrbA3xW#U*X{df*1Y?`zTaGF!TRglBTRf&pYDJ8Zu$F<axx3M
zuismC=SR=0lNOu4Ey<hqo_(6`qHCXW8h47V+@QWj{EoBB{lL#NPn|ziIwx#>XXQtu
z876GGX3PFwd7dutwYzQdJsr*a&HpCeXI;?i^7x$8<{vjZF1|Y__EjlyX7m~1Id)mH
zRU*MJ4Ub=1l=_5mg6Y<h@5*t>x+{0;<?Bwo9;RDgbyw}@jkd<m0)DnG|0mW8`lg&P
z`j_u(yb6*?CQoIb-xhWMKl9Cq*r)e2)_G?$G>4?9o@sk^?pW8A`v;WQ+3t+;V^Rt_
zug<ebZECq0i_L;<e8-F%WDfK{-NNYLyDHkA%~ifj^MX=uyYKl8Q&~LJn|QLy!sLUM
zto;(d<O)0Ax4U++@x`{=rwbya&4MPWFENdEeb;z?7hBPUgIYWxiaw1W>!)oKxb)<n
zcF%-lo)t+ebwsya*u2?e=E=%URk>MHwzJqY)C#v5%u{XPkT`U+({k3%53_34ZTT0W
z)Kyn`Pw8-Wg_%wY$4p*_hA$#_?<NFXoACLhVej78hir~qNIJ$a(LG_t&i2BS-wn=B
z^0F*i>vy^GPV^h$x|NP$7hOBM%A(KB;QcB8ZCZxTHvSxyNs?J+Sw%bzuKo5p&kx46
zY`Oh*>Fz0#^Gg?PKF{2jn>d$uqv47m>)PY_v27x=CS6=@y=J=CEm?_~qF!zx`(2it
z=4Rwt?<%@9I9oDXLg7a5k)%HcPW%5ZwqM@9{oc~w^Z(3wc0PVlPDV|{_I67SwwgmO
zUGsAI-`y3wH1nwT`rwY|oA1Au<^C%8_Q>W(Zi#oFxA!P7IyLE8l=P;LiwyrrF85d3
zpHkXdYAWEzabVi7k5R4;@mjOXWt6V%tA73Y=aGYnmbIRNho^cx{~`JDWK`p32N^-X
zCza`cIqU7t9Wea5bz9=aPp=iH9%`H5<a;)LQRmFhk4!|=r!6)PiJq})Nkp=LbMZ3&
zWo#|bIz@AheQ*62{{L-pKd-$HvX~~)|L5H++nXMryVnPo{ZcB`oop69|H6?wNB4Sk
ziRrq}SQVswM1jSDzhT*Nx5tlf?_U(P(jmAze91QEQ&s&DY5j8!<w^^9K5J+2>#(};
zZDG)osqEWT_6jAOKJ2F2Q;>PLV8JraUok&#a3nl1jY@xdO?&6_qfzVMt>LQRRV@n2
zXU&!l6r6v!sw%8W_~<Ih3HRnsaJhHd?F7r)JiX8RCu?;bW3%jtI54a0{7lBljjmlu
zFAZl^Kjmd~5}jwAI3efi5<mWxB?kY_D&Ml6lXixA!`rV<f^}^K=1ygMp7DqGSO~kK
za_XJEe49d}yW9#VTb=DXe9!9Ay@vmv-6g&(a^;A+^r1ZA!TX%G7x(tpdp*~STmDl!
z-_vVNgN6&w&5F}LbElhJmOIb9s6}pl`@zLYM_FF-J(JRG`&u;7?%&J(!qd)fyvhA#
z&(_o(*LN&Gyzw@B<5!MDtW%gJwy^&`r>=8)?XoMeyL_)5yw*A8=Ebc`&#^Db;a|LL
zN7<j6mtW;MW_p=ONpBMpba?yG<MJ;z;ap7}E_dN6lCzg6G>0>Ig|17Ni%R$S%In$u
z>+eM8FRn+XGc5S793Slvv3s9(!?oUwc@GQ2-t?Bm*BMGa*;y-aeVW{bZ@+@2=0`5L
zc{Kd#KRy|T?#j+1j}9xgBuU;B7y8(9C;j`KpzTrXFWg#uJE(eh#oJuQi%S?6P779<
zEWJEyt=cbFsT-d+H=C}jy36-Ovhgr)q{@xM9p59?AJ2X@6EXvI{KTWH+ndAh|2&@b
z<Y0Bot%@ZY4}R`Hbm{q)Z$J3n=IC6G-v9f&#>BZ3N>n}hjrZ-_E6V1&GGx;H;FVMS
zVrw%WEXZQ$6JzZ<p>!l6qem&{Oa6M>w1Dm2o5kZ7r{ooJaP|A$m(CPD@ITjP@9Fi`
zi~c-($=mk$@D!)(Gwdz+8f-lsnI$Z;YCW1i?s8eS#BSpj&96Nk%UhoRtW*wK_2#V1
zrjAA1T(bmu`<LWiTfLj7Ln=gnoo6j~(3Xo`8zQxhEl!=-nfk`)U*oHlN5e%<`@UWM
z&{}rEt)w%D8RSbugI8tEZ!Foj%!T`L@@AonA*Ki0`@1#X7ABlA3C(v}vUk_ljLXmC
z7xymx{pG>t_`uz_muBx-&vHmmu^~XgcEyd9rSB7Cvs?u|UA)APbv}Fh+W+09^!I<=
z6}RuIdAxho%U|LtvPZva@+4XO5B|^h-tZZlY4hJ>3txY&-g{+(^&^V|rrx!t%x0ZQ
zz2|0H==o&&^ndYL;=C&`^h<H-i{lRZDi<9Ej+Y2B-o2#~uW@ccfN6QZy784ql_!1Y
zEe=r9xM<q>p^qWP#oF-s;bWiMKA-W}n=+lTyz!C{@7>i?kA6R}tn2;TuP1D_B=o6w
zPyBpi(yf=*^v=!QuM~Ly>{Rs-?e~}d9L=60SGjKE1*SdQoIlQa!<={balyWyTlapN
zaBbcl!R35eUV+*xzZdDI-@Gk!(xg>_W!dN8O?9{STz7h|u$sBn|87a(m8*-siB_ph
zmF0hN^YSO7&S%fAe+oMJ`u@+m^@U&G%EujQ+x7QFvR2NzN%pgrbso*WB7bAc=6_T4
z?)}g`<#)!r-|501@oRFO57X;-*Q%*(I^1UTOa9Q|zG>o7`|27MXPi2J;nCOkp0yK{
zL^m$^9>=sqWbHDSpQo%}f2z}&T72nfpZCu%9Nl*&pSPbfP2GU$!Xk!wiA!!AeDTg>
z{+{FsniH3}&stXb#+~P~_PO4NyONx@pFS>f?Q+1A2n9_+<HIFcXZYlAPI{i=ZgY7>
ztIJzmCA-t#?F0{8&fL!OMk>s|=PR3i@ZWz92lN(I1$B${S+3REb!c1Hi^cj9Rm*a6
zx3l>xIR#0-6uu-b!`?HcQMkiq$xq|^)(q~^uk3qk&nw6{GnCCx4>iv?S-R+8)$GQ5
zuMW@Na`v~2&D`Y?M!VS;%+WA#5M7kB!_Q^%#=3WPANZNrHrk1;-{Y7(d2>;JtF3`V
z*hQ^P{CBuNANjHH^^QXk?0i4iIdZ3!9Vu*_zF~P)z=K;hTRK9lma8rZQ%dk?f3oqh
zUGKTMs}`^Eek*isO1O-YW9P5DwRTGD?=A~bQ-6H(PQ=pwd;cYEcNBa7a#Z`d&zm<%
z;XuO%&&lF>E2cbLkQ9CNFSCZ5i}*#)!nO~;Pds{2ek)5?v8m_(k2uBBuN?8MufArk
zj+@_RT>tLxk*_<}y1MOe`EK~V<;6<(wd`kDPb6&0=~;Z%b>{|8>)G0m4s<NvRMb<T
z<UR4r65)m0+Dun1yCVF3=~gZoTZNyVy}pMGHFf*$lms%ozk61-s_OUO#C#v!s5{U9
z|LJ`nXf##uSkfB)!;D=81&V*=SH4@}?>@`;SK6bOJL+FI%isU`WN-ObnXJl4m-jhQ
zaYlwbDOQa-40{jW%K7tVjjf=5X<Piwl}8mfHZF-b(Q>bzvES*v0#BchTJf5V>z`)F
z1^PwJWa?sGX}h=Jul1I#pFEUmSNGd34%_Rrd3v6PSJm%=`2Asfz54B|<CU^DrnDVP
z*9%a1Fum>lA+su{$CVAj60B`568-V+A2hg~Q)<gOJ}7jYQdsry+mqYRdlCW~PE2c1
ziK}PWZ!oJ}bHksw-Fv*hUfQN~@?rM+cX^kEnh(0APH&nxLne8)qvLGHBBQ%vTK|eN
zk9!)1Xl`N16J*RS%v=-GJY71MCF$kEAO7_bI*ij*+Jc;djPEXc{#z-<{apVnXMukT
zt6DPDC954gXQ;4FXnt5UDI~jp-ksOx^*_>0%=T(9yce(kT7O~c_WJT0voDstP|fvj
z^l6x<b^hvd`@j4lDGU>2=P$i^G`wXGSD*aUXE&`)!j8&V3rq`M^5c}P#e^)42mOuO
zGlG9#Vh(imW%T&K^x&)aE5r4U`4cpzhzD>8iB5X4!t1|CP>ko|(5)+0H23~a7df%f
zamtltx4w0Cc}QpF{NOpT>1_6bGxfU*^7^9IvfbVJmD9GeV!F^u8Q*hrmv3GAdk>#f
z$=lv?jp_2swbt9ZTx#9Zz20AGLrttiy^ggmpQQ`a;+ch+y-l<11VmPf>@=t}Zmezl
zyh5?JT#4sG;ocp~FLkxD%Op<d+$OU1ZEEK)No5DY+Iu=nsvhkxOT3|Ur0CuKH;1%q
zbR!epVk`gbT+*Nyv(NElLCuL3uXQwLdJ8n#{QSebO2nKs#BbhipJe0b?camDrv-mh
zxU}AQa?t7?9X0;-&m*du=5L=NEV=#2!`6Q*H?dXvKHmA#Wc9A~osg9<epYYO?!W#T
zFu$~L@ybshgOj;0t>?NIomp~5Iwv>1cU5cXPgy|$qka4KhQ2yAZ|gFz)8U=BzW;qC
z)o<|cQ4WXw-rs^#%dTbCyj!%zd?WvjMuRPm+V|E>KWf-$66~VMAi(hGRYq??h`mF!
ztHPg)GbC7!X`bEO8fq+5p0)nlZ5al^j~gXFRk%q{&{kk}cqMmTdPP7{&ArT}3opeo
z8m;nwAFLrXb<2*@CA&8{&X=0KXy@tm!Mg*K8-5s0EiY#gQ7Tel(c@vcP@JbfH!N0v
zk&{8*g#?+G^D>OyxyAVv&tqU=GI+Ce_NrM2A4g@#u(WnuQHb4o+v`JVzRap<W{FMh
zZxu5nQfKY|v+U09==cBJ6Itf$tvGyAV}q(z`z_}UDN2)A7TifFD1Q9=|CD9o@l#9I
zn=x}=ey5etrO|N3;$1&q(-QXM2W46%w`gq0;h*cq;J4y>N%qe>TfEljpV2(9>EV{`
z6Lz|=T$&srsN22&vhL*G6-xi7_pn#~y?N!`w-%X|yEZF5W}nb>u=7pl!sbH-N|Rnp
zz4rQI!}{eBcNXrRU#s<Ib4Sg*{h!)g%pLZ8`f|_r*OTe>{^t9>+MY_=yoZnL5sRa)
z>^jvsQqs%zCe@ltu&^b2F1#)tw9KJkhnU-3LwDQhPAP{!v!t_2WEiF`xwcS0vFW;@
zgVHs-WBo7Prmza0N|4apQ2Xho@6=;&maJ;}!4`N>d;Nbg+g+apMYn}zCVgwVBm6o*
z-^=;Z?+fR}0w2%pz8?BTg5mC_FZ)(L^{Kc}TDH(%YhL@ISIku(Uh2QtD*vbRaLDQ#
zs~@^#nV;$lcAq0S>sT0gs#r$-^mqGQ`#nF`1x!4gJbUJhr7K&*MValJ_dhx&wAS{|
zl%$Ch9^VYlbdKM?+PC>&ym?QC_o~P#ymvLtewoj^BPyhPUEqtw6Lp4uhFFCg4!tLM
znjM$Sf3#a*LJPx_1$r(r!pho)lg?O9G`KIwqNHpqF!$NZLyKPUdzGAAySdoDy@SU=
zLMcMX)k)vHa~7-Sthqu8N@r$FI+pQfdxS*FmcZ+W*2ks0-kURHx5`?Mgc%B5Wrlxh
zJEts2e|YZNuAc2N5$Vj9x(seN>{xg3hHRO%U)g6O&y>{$ha}g`TPeTTnE%rB)$5g#
zFJ-YggqKdR|GLlf*9!d#jTbHPdpoT9zIm4{YG63v!5FjWTkfs6T9xYV241$UOb31%
zGpKk-`lhL8JiNL+^W&@Sk`ARRPX)gVJ_xQdQ_?EEz}Pa4!!Mg>O><S|<nuR$Hu(6}
zE?(07DazrNo?UabR<`!k=_Qeo)qdX&Yb;(XbMNqHc@M))x0hw8IK=fcRX?22e`~JY
z)mOfe@_Nqi9F?S+Z8j~FeyWtaR{!Fw%fBC8m|<Do`AjdSbk_FonOX0cS}Sz;?f*~s
zcl!R{>REH<J+8KPHz}{&A$BzKKsNJdc80mLb{XVI3q43rxgTYpYwNLV{j2E`zWzLO
zSq$d<ez91B$9wO5CDo(_vYp(P?DtvcsXHsZdYIz>?AluEmd64s9~O(R3)~&K{L7Cu
zhi|QtG0B@{|BUmml`@ZqqXFyl3BO~qFBYY>Z`g3TDy8%8-w*0rzWiLD@$px_<?D-6
zUeqj)n`Y~>$x<ct=HcIk?wflcYa}1H@NN%V9-7W<<2U{OuiVTPYdAD*w(PCxxBGK)
zzv|@jdncY|f0~z=VX*9JH>0!5i2(iOJ(Xt1Zr-?evqH=ELxRd72DY1B_vI(O2-GsS
z{Il;%%wyB87apnAsTl{l3(v4IC`GxuO5f=aTqMiD`6)@+@$17cLGy2Q<)l3MEaqY5
zu;|ErPd^=tgyYjr2q_tFyR1`F|G6Z(fuXN^+3SQ$XZ-aqeQAANv{viTvP&7~_kZKF
z-St)Os+a3Q;TOE&arHjTc6kmw@8@&{?0VrHRV5L`9Il_o(f#UW@9nGQ0#`GqmWS--
z-<K!x&%@Zp@Y1^_)0LuF81!DYa4oaa+{RXV;{n%ao5XvnO<DYHN31OJmTvHzS$H*F
z=(r<S()P=OW`QnqtS(Kl)1Jw$Fv(G+LjTs$@9lH8+*dx){=t^PNOE?tcIMIFPYjv;
z4*%RS!Dq)4=W3qK%Pxyw?o<*BQ$56?V8yb{hV6FBg`*2DTu%IufAjEfg<NHs=ZptL
z&o%$<J+Z9F=ZU0+E9-`9r@yZ_cb%1;o#FD2FFR{_Usd1Ld#d(K!@j=tUCjsnEq|UA
zdzs(fQt)+d;w!az?41=K?kJ^NSr+E?bG(rJmXw)u{xyT(fg?XGJ-y44j}_@ZEXcTi
zb+2o_OI-Ync!u&N%aZy&_B2XxoL5k~)?9a7F)(P&s+WIwj{baq$*$!(%d57Da(z-I
z(errwZ5}5~@=ZDRwQa@IpAHK*i|gP0IYCT<XWzfW_KW$9xaUk_N?~aEX?f&d(_hDl
zt*&2=WP+C`Jyx-<TvzyS>-!Cfmu{!`h=#upu6?c<yQ8Ri(Vm%$zH#a_Dw@rD<@@E{
zuj;cCmOPETx<jIC1-Fau0wa~(TYfz-z7<!gvX);>d>u!_q>!T}ep$T}vML35IwsoR
z3ckRYc8&7^+sj@BX@fb-ZoS*Ts(rSl&9@a3c|WL}ed4|-A<xC*k{N%4D5t=u-z(2Z
zv^FVnwJJ|J)93x`PDa=AD;s_?Z7F!F8&zE~Icw@BlTT$Q!*6|^)WGYa-a2)2sC-{w
z)<%hlMjgh#61vp|HWDlsbaJ_WFVR*odKr2<>5BK}UyJwY3(9rR+S=5^deQajBxRk6
z%AKDUdRDDocp{ZavGc%HuIx!|-C@i@`6sV49G3sg;m(kCw#+QNGH#Jc?Yl`=_A+i!
zENTfkbmt0Feg67)Z;rIY&(q$(aqL*y5e^ZCxA(LE@C7W3>g8$syf8@i`=XgM#4~T5
zTflz&mU!t=+t02N4Bu8Bd%YoF^GAzmn#F4dL8}d0w^jNw`#2V?XV5Fucdqfzule7v
zT5Bf3#l67UYK@ET9Jcq4aq%5f_I<UkcjLaD|Jf##HGxrOG3$v9^=dQKg$#S8PHVN^
zENW8AvwH7vm5<BOFZ`YILC1%NM?OCI#(Lz&pT-$pzeNn9rdM*R6!9^?cTl=^@r_ET
z*?g}l{MWCgIat=c6J?uN*D3XAW?XemG{@8le71)hB+i%4na`fWp}{nBV*3w{=M%+r
zk8@tT`{t?ni&NX{U1aaIpXglXeUm|^>@Ody&%N}|n@`<Le!V3HvM79wkM2IJhD5IQ
zww5jYKi1z~)pc;P%<N?wi`VnczIHhIjcvsF#jd9%S&r%7(mr6odRk)<`--K`{Z0~7
zJQgwwr|*qfu+!UI!`RN*Kd;_k&2K5Gj*Km5-Bx+OG0NFk;KZe>q-7v<$3#i|hT^M7
zZq-Kw_}o-oFZ&uh370p_J<Ou>?P8hby%c7dC5i_d>LpGF>dJqU-fs}c(6Q`X{A8)S
zfB#B`rtk@RWmcU_W_OV3EjqY^{p0DvTqBWX(i{tfKODN=_hMPK%+=&~71J)3Empax
zlBkh7L3)za-YI`%1+}v;O#NAOGftYvhLP)I?3DsDNtK@!H7|6xZ!DRf_xDl$il|$O
z8*KdEmNmbt`6Va1{rZd0dCettv#!b2>NR|bbP3A3SX`9j$Lj6=jB$y!$J!$@ybpKP
z7Wi6Sbbh(N;>=&354$`+{Y_@zD+|5);hz7)k}!#YKxd8*PngPFxC-Ah)CtJS&bC`0
zwD91R*_<b9Gp1}`D!<tKMU!bC_lchKr)rYxUhj_PIbyAxId$8eY}RjV#~B=*&-E5I
z&J{awNncle)2rWqjH^77?lx+8e9iJX^}~Jf(L<YFbDYTe=CEv*wyT)v(x|Oo(f)ZC
zzt{iw|8cMFLBbNh&5qjqc|nPfSGp)J)SqD1<Dr<9A*gt#qR72Lf7Zq5<5xEK+3`ok
zHCVs9GV4|R{?|J{oqNy!yKd1|{%=Ze@@3<)A6882_^u)R^8S*aDUd}JosYh=+iI;n
zv$?-Z#`e;ZbW!Q14_|hdJUDD(sT=iTL*ZL~mj0ZowH*yMPNwrc`Y*n_)+NzvP<H&2
zaLKznHm0+DqvGPk!u%$%oQd0`w{mKS(b1sfRoA>PS_Dad`QK>k+OPI<vEaMIZF{?v
zs??u}UgYpF=9AzwxFWjt|GdN;?<q&+K5gt#nJTyAz(jdgk2V$wi8!+hyLIbKm)`sv
zc)suY{An4o2c~a1SWuvRDJsxdtV3n#Jn_H{$NrzcSIrPPZSM2L|FxFO&sqBR%~syP
zEzroo>7>HwX`*{sWOau3rpR@hVqG_%(u>qv9aARi8mMz~OG=YkYU30Ej|mJL8Fp~a
zPESu$Uq0{UoZnwhTgJ|RZ~uK?-QB;tmRB#UUY7p-PeSpw-SPX&-|tkfxi7zO{#EaA
z>9x}@-a3?SGQ<4W?wQ}SHyuiFx8JXybxcY$(3f%AS&qbYQO|A}q_DBvs$SZ_<sN)=
zpCU)i&V*&x#5DCe`1DRUUX$3$B|7P}Nc^0KFW%jl%Kze4`+B2J37e8GHa?m3)Uz93
zi(5qfc)0rh!sGG3v?hP%%Hm+Xc%x9>BloRsvyVd8%I>|VrC&z9<=)X}sJvHDg?q`R
zjhU+jAIVkPeUxLEJ*i`N#7lv_s+POd?s320=%u&%QEl^{_(f{`fgUw-Cp0(d#3Zeo
z+8wFfn|t<XaSFfYtUFAsDRX8Yvi`9>U|wqI6}8VYON8p#19H}h?lJC=e-#@TFZoW&
zFe~Nrl+(+9%6+Koa7+3d;^nHx>u_XRu-EI0Cyzb6&{O$Zpm^2XHB%kS$`xGsUmY-B
zEUu~k&ox)$nnB0MGjmsq#Lru5J>CAn{DX>9%;TCf78y#1pI0@!XT%$MGf!f>v}X6$
zoc}v|R*Li)%`M%-zwmpu-O;T_UVQG_+V%I&DJO3&s}(+iPN}E1nJ{jf%iwo3rp?jl
z(o8R=l%!zR3Wv8LzU$XA>dsoWC->B~$&TFD8}9C_ar>4X-R;K0c%tBLfYrV;rxtn0
zKdG|WK0B&OPV6oN=f-PXcUEuEIq>$*4_~&q9a;;`IG;?+{$L_$%Wz`a%6z`AqmSL@
z@7OKKep7wI>$5x5{LW?HY&zsWZKZX}(_2p3_k;It?er^M&e8n7bnnkI91}7{#ipDz
zz4F7evZUkaiCwPQ%^kfrFD*LM;O3Ut!PzGJwe?s!^NraPRg73F7ED^%8)rBrCe_|*
zf@t52Pqq=gc6nB=)5SdRho#JCpRqW?Cx=C_=lC>L(G4elS$A|5Xf3<gydkZ@XtTNI
zF@s$u-dAV&oi;9?p;G>ZXVUS<i(6+FZt6&v&3n6`q^LDaY}w1V@_#fdSppBqa1}Ry
ze!E5ChKg7BHjYO(i&%Ib8K35!!?$Z!d1m&r<}{5ZvsAK8y;iR+<$7S*ZF%f`=#0Ci
zmpe9HtB@1xoi}ZV#uib=my@^lW`4YLDo8bCk6bZtu~^IMhkhwXZe<uI3Z3}sH}%CM
z8S9r)!Sg;|{~>Lm;G;M%jU|3_%u^3zJ9*QkGj8`S{b@D-*w^ITgncTLv#V>oHZGs_
z@&4-f{7LUOO?i3gr}368GEeIk-<f>rtsu*;sbb6WKKD3_2(SpOT+AK3*yo4Bo5@}7
zuU9Ufqm<30YG{{Hza)zL?*2mQDKULPD@C?$-(D>HTv=B0iu5&&f9+Rllk@YWZBAy(
zr!#)w`Iflae1So?kt@ek&E2zApB>jN-fovtY7r*a@}h-7YvH*>t}S0r_Fn7gbEt97
zU2|$yUJg@=UvJ!^{(JRvT|2IQI(XGXM3~Ka=Ovd#&)%CZezx|W)WUnJj`7S_q#f72
zT%N)5ww&D~Wkv5g)wR0<rH?t>Ua@@D^|v#>C$0*(cCC9(&YQ{M;U=+rPb|BhvFz8?
z_bVr=T?wn+IdiRW*vSjOzMI_glt{jD!~b1e<C9kwYnMfzk~+thlp5FU#ydarN{W<{
z*^YM`v!AObW>(Z2-(7w0R`T|ORo5)0@jhPk{!i^S`|Ve&F5hxXikyFCtLe-AOHBD5
zUrRDr{W&rA$%Jh}lP<ohzdlDm>d7|6r#JSne||6Z{NAkejd?sJ&b^^s?3pqrSBHgF
z8_b%iW~5qedUp27xsl?xQhe7JZs?d_y*IAQB`W0B3q1*?=DPj=A75T~a!31<Pa@}|
zuPAOd+PrYVnc9rPYge+|<e$!3r5Lh|W1&%M^!wFYwXS?{ij|!cq?X;C!}H<c&eWwl
zZrFIQan?|}WBVtdT0rae{$p=Bb7ouezAHcX;>&|q4q?jvr2>22*{LW-nW}utJ*VN*
zw&~~G+;7`|%z5^HZQ<HS-;TZg*A^RJ{#SZknyh6`O%%_mp8KKKUH_`=Tq%{(VsWU_
zTybV~YWvscOYdHupZ}?3dq-U6wYAF+_ep5pE#+IgSLgOJhFNQ-@qS;BziHa_`Yoxw
z?x}B!x0rgnZi#rG*ehMX%6n^E>h8j0ub&iH{CNG?X<e$djCQ*70?XQ})M=MjPW;4U
zsCh2QWBrE7f`W&?H7Y;($QHUIa;8$tsVTW>3;P;_zCTP~5wp_d%8ePDUYLgQ_ME@_
z%w%QO&I2tQ!b1PXPR(Ua*lJsKpS_%)|I+h?Z=aW6FZ;ol*0SN{`YpTTmoL-&*={?N
z?bf`r`|qBX3iPkj=e%<KO`pZ1b}@Z{bzbYw6oy=Q$XT??td9Mn+Pj@EOE#aFsxMKt
zV&(#HiD+hc#aEFlLPzYH>?biV*XJ60Z4R5NuV{6=Z**nB29aGxsnu*e@A(g`*piky
zzocOQ?d$||j-!6-J=Z3u&i=`}gYS0MQyn!9W5?GE^qN|xb2#0ws+hB+_`Fhm`07;~
zgTXO7Tkgx&TgR;U7XLeZ|57uDQa7*8y`LRLovKkY_hp*shqZ6rw6#G{({t_GwY%9=
z-ha)%dMD(Yr+Vw}UV(Q{s?J=m%XxKo%3CYt7J;~|%2~G$D0p!!-|G3JYp00iow}K7
zXCFn2Ub>qX`f3r_N89d1@rpX-ZPGRKU()JyQsC@TMYf4C^OpYH=q=K(=V5v<Yv!ek
zFH0YZpPJ&S@crXN)9__JH|x~*owBP;=c!UU-xs$eOVQV_p1b@0OkeLun-|~NxBU5y
z&uffqYX3TS>7BjYDD1zIV<EUuxP59<r|R!hZ*-?sw_mYba(ZHY{&$wly0l4)HkYpm
z(J5HJ?%O=YEcv<~uh1n~d%VI-YfgzY1TXWMX_U&}CDQfZ_wGKgwRf4X+`D()FL#dh
z$C<OIM9q8Tk&u?!cc*b$RrjJI#pP^%kfh?t@z~oeXWp)~r)oD;_HEi&*`@E(akez9
z=C*Hav-^s@<t;Y<1l)yAFI}|ie>m8RQ&VgMn14#!{8G7j;oXuLlTA}sttn<mX!;iM
zai{f^m{}^*Z#y@$_XnLnc)8@~r&QC5QzD8X%W{mfUs?vdw*96w^^~esYOu~#nOAlW
z6Za{XeDLJ{uHvKX7qGSEMB)VLeQwW>c?LHsq@J3h8NAHrX7kdPD~1(4GGU939I~*q
zbu8LZD<Zgq^=tFgphla<uxkz{jy%(t?Kk0UtB}OgqhXMwG3)9(9mS_gR+UqueH3E1
zJU>zV<WuX?l43*moh5VLXk1de8L_AOhs9l+?`={xaGO{!y_kFFo@;lqc;=%^vqLVg
zdBVM|=zod}uk&2zC!AXY)%H1*ud6-sRDZI${wgJ>)Gh(7;B7NGFD+O8D}3o}hW*3*
zmukz+HKy*&G7Wq0G~emZx{wnWZ(iT$-FZ~g@A?jL=fEASj3M!KYRX%IjRtKEOl!?A
zx$b4!uH$oW(Z<#C7e2jVDJ}UPv|($zq0iQk1vf6~O!acz^vrmQ@6jnj^B}3?63a*K
zE#ErV$DK+KF8SBHe?jv3n!cDk`|m#wvc+gl*N}`}6t&agZ}VXj`?B6O)84*c|3_{r
zSH0z2KhtNBK%Kcsc81SypX1L~PH5Y;qP2=|j>`J$z9)}ru6k+uX=_PwY@*_9h20Gr
z$LIeM;gzYMx9RArvX^hHvpA-{l@6BUO8s3td+Ui4caLtbcL+Auzwqb?@8jo1r{-1v
z)qnA3_5EeR{x-h<942%=^5c2WyFSin=8_z<)m2A9(K*v7^;DS;*W_;DkP|AJ)4MKx
znYukA?~T=37xA6b1fJ?`nEI15YSw(k?dA^q5>DHun`(kG`zHTm*SfxNubw->^4G=L
z^{y9xdRl#a^Zdl~&zDb~(bZa#{6}ha*y4Bd>|VWiwbW~8&H4GFoh~QdmaX0r2#Z`k
z-{(PM{wt=QjNcit;ALlE)Qq`G%guelW;g%VTwG_+TNX8y>$RfBnT0v~XL?D7Zd<=5
zY;90j&K&N^*H_Hwy!crEFVk098(;0q=8<bxPdPv7w)`^nd6g5tWX(MFP2s8x<Gm^G
zk6zdjlY0gp!pYNS`EYNw-n*taKvd$`!-5HCmG`X=OPSey)$gzSyoKB5F+btkVstKW
z8KivK@Z*ncluY*WBs*vI`Tvzzt=o5QWtp|hsr1UT0#2so6IqiC-Wgn7Bd2tFuYa;D
z+f-<1eos1K;uOt!E@qSE%Hk&?t+%R|DpeJAKFeEjQaDF>y1mcAKF3W3kAKaQvVf%5
zsaLf`tzWTRtXed|bHefosX{OKTml?Utdv|5z9Q}W#CIPiAI?%;U9r{(7IMwTb4z)1
z%GjS8dG>LzMOB{=f2p)LY^j%~|IQ;usgJs+L`WpZ2<N<CzHZ{>6s}7epa?TcJ?o<^
zU46b}ZjK-S^8RJQ+9I!HRN@tUs`R|3=uUW-`Pl04jYBG~&($N2dV|sgD6hX^{OD-b
zeb#Sh$Q-r&Iu~~T{SI>V91ER~85}&P_=#JnqiFgng${vP7k~1HR!xHBg*p6DYj&M|
zsJ49n)I)dKSA?y-aAd7^$f_$R>fdl~Yz;fIrnK|=P0ig#{wJSGYCSjhQVoIH_RZm^
z!kmi-<oz7KbTxfR4dz@m?erD{Q!nS^^VL?LJ=XOsuf0Nc`c8|PT*nr3tC}`J3Nc~s
za^B$c6Q8e$I8$u6?P`{C{f@blF0y{yEOgUmZp`=glAf%c9?Zw*FD}~ZcHORK>Y61f
zb6_#WKSAPJ){}3nC!T)X_+#$7ZvlFfAI!h5mFlH`PjUWfzn4C40#4$k-}!>p&IlBA
zO8tE*WZv9OwW(pV=kCqC;c>HfS>~RL&x$jn=E(}PTs*aZy-2YShvmmb%f5voV(N+N
z!Xrzg)=s$laEV8{{n5prMe^P+ocHkY9I2=iM|ReR?F$gGP;<X|!zOZd<j3t?+cj>-
zFH>qc^=)e5m-UKU<z}xn7g#oJo8PJ@m#0L{Q*2jv*qL&rLulHov#(&jI3=fHc*W%3
zD><7(H+_=B&us{{zH-gCY`XshSMk+L%X#K1Xf4&$?pRo7|LMi4DVk0z-UufgJ(hpr
z@p1Vq)#nq{HH2p`kI~ZF7v|BN@0WAns#mA<eyyW=a4#e`F=)E{^yvx{Tc$a;qi7|!
zN8<Z~!71CVJ+@n)e8?N<njqS7CPPpEXj)#-(x_llJxIiGuWn}-{CRnG=q1*Vn>&0(
zrPp4TRcJr%FSfdOf53^{s^_2t2C5)W$w?@S{4f97EFZjLZ+{Ha?2>QtOZxsfr(9k&
zrN3|D?bqttFS~`E^$O7qJo{|XzDC7Qm9eg-bzocG<lSC#)a&LCrKQu<R@VLy3GJ$M
z{I%vu_S<J23vzrF<I=a97I{E@GIJAqf|dEK_p%ZTzugn$DwS8+u74s`e`!shSo*OO
z${dN=(d?0H!Y+Afo;vzmGf*dB=c3in>VLPkqKc%Vj`*fMJEPX{ac%k9b@uwPwHi`u
zgY-O`R)9S*MKk!@0*%DAZnb}#uUx(E&bldJYgFo@jN+=3;x88-dBmc<u)KecP)b4H
zy7-+wv(Ea>EQwlbsu|o8Fmu!HNM8Y)?fYBj+*3GhX1$j&OgPs6&jhVm{_58_E^5H5
zr?r_e(h{+=7Wds#yyQDq!dcPwQuU0_(-)LFl*vcd%)Me8BfS68$;b8ayz{|Xarf%N
zkPB{Q+xt%)ouks?yQtyE%~OY_h|CQ9)?u5}{6PBDrXNfP+mBzZxwgyk*V=2P(W0;1
zcoP*v?N@<)BzMhnnzy<qgV-f6Pqn&TXV0cf^evlq&w0+(miKez>`QrNAMSE`eZR)r
zbXhpKj=!zi>gT^8PXERolXu=La_Z%02(UbI-q_}R=}^l3X9W}PK1}t@Yd?KB{%KI4
z%rwTL9kxv@w@#*&cgz>n*k+=AyC+2JkKK#kEbFs(&Uo&2U~AUZig@koB`d;Iz$JLj
zdS1Sh4!;#vadv7|-kg2mSyIlSr+SZUR!uqm<>Ko53;#JUU-|q1XP#rAme`aPJ>Vd?
z-Ph<+;rv#H^-z8OHpzDDUppArY^wcqhb7Yal)mE8@IU7tmQ1$4<F{~|-p8xXjnn)-
zu|}VG%021wQ`P0SPoJ;Ido#;I<#Wl0FWfp>ESqoTh|He9;P&+M9zvO0Pkc%E$m*0K
z{yul3rN;EGKqD*tea|%JMl4IxJFM%yrcG*Xmy%t`bcWm<?#pk|PfgLhJ^Smjob|_U
zWo@0LeZ?^}eD#lWM_0YrvaW^ohpN^&LymJ_ID=Mrz6lC^yc|;hn4JAFX?B+8bhX(G
z|9ph5<!(`6@6gaZ@L!<cMJ+v5tx2Jv(SyD6$iepKmkcXfcDeaYh!?1KVGulM9PFC9
zC17!rLcZ|z^MP5Z6Z!0a8vS1vH07qr)vn&InLB<6xUjSC++un1ZCTNl3&L*}Z96F3
zBvN&QoBI=|(hSda0X2zTVru!H!jm%Fyjo?1omZdz=W$lFM|-*4!P_|u0>zvemz0z4
zoKIW1`PZ}!g_Hkh{E(?VJLz(U?X@dXb<5TkUo-jVWBz~ryAzo{qGqyIn_7E9ZPZ^g
zGi;qTV{@w5QYV+2KGxT-$J!eSoY{Ew`d)|2*LY`d+ocvJf92NSoVUssum3x@r;T^(
zC9%&dO=4PVp52+39{cO-w$A2#-)znAb%pI$&;4ru>Uzu9lKa2gZ?J1UU9>09*O=w#
zny=YYRz4I<o)Px^<Sh5ZbM<FWc&rG!em3>)jOb}st1ms3NIL(k;_dMxzZX~DU;TJ#
zuEgZ6#Xi};;=Vpqx>fMc>|E)+%hzrB&z!wGL-}{*8pH6nWxHjVSJ#%-&PwGKm?4;a
z;hwEW)l!$EIbCxm`t3Qf>OwOloiQy5U9GB>lJtagOOc3%>|E9QXno5&`<5lRZ(ddV
zRZ*tZCv3u@mj%@;7ynl%<&}N>&s%T$WXCOcA1+IHzJTSP>C9K057MPhB<jswbdmc#
zSI~@Q^ByKQ`E2|A+iczr59zY*?`NKLO*#AY=XZ?<?g#BoFyAwljbHZTlFnrBGlCP&
zKd*adpL{;2rf^o8oBqWsy`M$q%0AXua`xSm^Y`DUe7LfF|DoEoTud$tzH+VG8*yUO
zl1jt*Pv4(D$`q<))H<y(ZtXU%4^j>%*_L;wEr~Y2lDx@eSK7+u_mk$x_^JQz{t~;I
z!LIDj_QR<)?-LHR>vvz(`+rU8|2(OVti5Vi6m)mUb+{_J?ofHRe1dQHPJ!h)UNx%8
zBGK~}uTscjcx`kj`)2b;-N5G$1f}dg&bg5<<Z!X3HudAq0)>Pg@1rtLjWqZ93IBMs
z&+)wWjQ>p)5i|BE=teaqohjaZ`Kadk9pw}Je){kTsUJK3M|yI^!}K&U7Gd4p#b=Ax
zbXlHzASIaJ)2S98uk}QezkTKowJYj3-{{r-y?gn^)~YJgd7Ad=8~Yv}apc;5^pA}4
z-&y}nJtWsLDoCun_5SYz|B5y5zWzM1OH033rlPSa_il~s%#<n9mb?FyGgxl$EnxPs
z&x+1lnvZwQcb|H&%+;oSQibd_o&%OfLPxr1K1y0sbC6?atzF&PJ|4E7wL7M}lr*a4
z$JIITb?hxa^U!i`#lvnJ@!%x?Bbzn5_5D_xd+Bcwe_U$T9&B~#$oaD&HAW|Pyv#Xd
z{9x9*UolfZUsIX!!}i|sMj!tE{@)*V?y37H?&s)o^xXbmx%2$x^KT@*+4$?#taGZ<
zj_i1T^7^H--|Igdxx8oj(rL?1W?lTCFo(-s16-M`<ufbX!Tcwx;6gX=R7Qubo3_sO
zyV+c6#?%oivEug1t?4an{dTUk?edEQs`Zz*En1eJ`fD1)?<S2l=Md3^MQR6fN<K+d
zHm!Y<|2CGnW_sE?1IaJ#w^w9;_|SGGq2_&eN#OSmKks1k9b${umbV<b%g!SZw{)g;
zct&MejGK()fe=;=&Qq^N*bBYC3vB%^yCiu2FD}>T$6lOU`aR>(ElIDV(|&yaeYLsw
z_sbXdKJ4=<JR5fH5j<(Q=VM!Yy!kQii5Hh{?Di>|vu{F$95c_d*Y%fM1dIxePelJc
z-P0y{aZ1&bHHsJ1>+>VU8FNZR1#<67heWHozdpfu&C=n`CWUt%jQff|#(J$gQ!J}_
zEZO{Wy`x+e-<&1tcHc|Y?ns<=YY(=ZzwpN+5#2Ms(ra@|vNChk=i7U{3~35FSz)_N
zqjB4s$-G<30{=g}%%rhfbAFUy@qe!VrTe$G%gD_<D=>Sn>%l(9vRNu($7Y%&`7NKe
zTyjsjY~8H?Y}1)9>@}(DRDLSfoHC0+#9^OChjz#2Xq)c^=N-$Iocy@vUaQc$E~Arg
zx~1Ip4UX|S@~jMt{w@-(JV#-2rQ@UXe_otFGC$RGxBGpr6Zcm7|7Y6!f%|{Jo$`%*
zON=+N&f|~x%@;o-Yo_X=ph+d=vqj!Gumr^HTRUe-k)G#vx1)BG&T}71UwGKPfAaFb
z49CTMx4IjjnjJZF@sB^UYAp)RvbN5DK7W)JpQ&T_>G$RxPdCh{pV%ko$dNq7Q+=k!
zdMlNVsNHNUwpJJPUT(_1b!6A+B}qwdeK#cQO7sP2+&T4Gs#xAnVN2biTjsKSX-njt
zb?0*XCG$^v++EanI{&|e-R=IwSo1K&4zqK+O{*2JO^I-iI4v`GTgD~M#EIuFu9<N^
zuflRFq_N}MZ{o+lb_zF7LF_-VE{+MwOev}S$5Tu;=p0C!!DsU=^Pf|QfN9O8-7(WH
zuJ&na+-iPF@xc22{u4=Nj;FaVr$o+MF38v+DboF%M`?zDy>rW=^d}PTv#+_Z`vz(7
z-AOpkP|v2s8j#z(q9;wj&1Jfef_`I1@2>Vfg9C?Ob0nECyn8eu@4dCl+-CQe8>j#0
z>y7{0kXQ3#mO|%a9v8vXo8bw~jk83~F)FTd7Fa7-<<U4VCu!pK9`A<deG7wq+*A}V
zY>Ub6&7AXkpQ7=t73Rt{)el<?FR{MWTdxq}KjG_+-ZnoQ_v`2P`FR@p2VIQp(m(ql
zLZPelzPvg^*3}L+rCZBQW7zYI*p0SZq`Pc2?b=c{;r8prM_VJcnid#e*nFyE&RH+H
z_Wna}?_SaKusKldDR8Q!WY&G7E0!9nFL;^aPc1$1wtvEDX`$B#{WBdy_B`|};x?Mz
zckYCSBFEl^+un$sH=W!OWEZ?5e$m}L<>{ACcC~I2ESn{kKmYmngH?q){(cSF=R5CT
zR@v;OTGuis1$hU*+2J^U%i3?z0!|IFm%jd1dZECp8{2GjO4q|#PjYEa%|f}UCeLRb
zeW>WItIpA{a91Hu=A_vE^`aR`MO~kMGWFj)@Ic{b)bACC%)@g(h&S<^yYS|%w~tiq
z!my7veO#C3FH5cnOX54zcmGy-^?|<Q!8YAo-)tsi?w=o%CoakwsJG!qSf`Wj+bgC;
zo9yxn?|*!1sn&2Ky=$kA`<tasY8@tveoO6_S2}Uyz2W-LGkNO!EjQR0A3JhS?OWmW
z8=nQ|9+jCC=(yyGRmI#|9p0P#SEbU0Ox7`%c`b6gC;gx>;ZTOfhiex1ra)5P+J;$E
z=gd>ky|?qg*;w5&^~sHA9aboHRj02w%IL|x{riQ3>T!!E2I~iGSlaD5i*woa91RcQ
zw^Gkcl)m)3JW-e(A*SFe(>8Sx!@kW|o^c!A=+?jgY>Ruv>SkS8AD!6~l`57b7jM_x
zY2c<?>mHsR=CN$Oti@NGrII@8m3j<sejZ*siO1}m@JDl=cSl2<sxEhm*Y)w)e%z$c
zmj2?@Zu=!qU*7&|b@*?>(xA+#EbG(@+tTF@$fOu-wK$owq4vcRmV~M90u7SqMI83U
z91<_Qb@Soz_#~khAKO_B=Pd2N_eak6zQy^t@;k5h)=u%;nG<&A^sOx0<hfI_nr7$}
z>1HjQ@cbixo03T1mY|Z%xIeM8=IEKbbLqyotAEp;-d@8daO?}q!S1tto0yqbzWcY$
zE>3^aoJ^5dlLYh5xUW9zxv<Z%PtWV<p}Kj;)3(UeH|KCR6fJSPRuXF!<t4gFaqab0
zg(hcIuT4EHo4|hN&RPDWUrRc^OFbyrch+U66r;{M;dACo9wfiLcQjx9puwy5qoy}|
zZ#}4Hyi&2wD0kx#7s>0~lX#8`UQ<%iYFZd1sk2^0z59l@NjS%D;ZX0&A}g7WZ2{gY
zE))CgHtvyq!?J3*4)=%H6Gt-NolEsf|2${ibKc0G#R2s_h1D@<7Ki-l*AR_PyX4$I
z!(-;mX}k};${rQGmYe%0X?+>@rdX|%AL&Mi)W1(wxs;k8o6tVX^1bh(q-FD~lw<!y
z3D|FGaGJv1*Bnz6*;5<P6FFs?`15Nq?YU)>m>!zFvaINupJ_Jt$=(}p%j$K0vp()Q
zvsB3U(lXtcU#p}ALsIe%JZxCQc-0&_^3T5J;RlW_0ryW%m-z7F=ZqT>Z-Y+lJn0q{
z+*0tJ-_oys^(1|PWykG)pKjvVcVere4^#I~U&g&xKWv!&R&^DV#{xBuAD6N=7P2s8
zW`1yTPd{dHb?w&bgtbxaX<So3WO`{|zOK2~=J3Si3G>|88#KiPb6!3Pu@!b$FFG}&
zu4DQt%Q8Eex=));O8!Lds{NR|>&xZ+&oo4o0{D%OYEJYB(3|`$N+DO6f!~N_L3>He
za&r&a!^<NJzveyoA85qjxqe2oLcM}!$Gf`B2L`>dKO5|--db-lvOjsQeQwol!+j?!
z_V{s}o#lQ;c8QKy!1);`KYZs~a;o*vraHef;TDRwZtXsC^wo|d6D^j{n7*R^aJ9lK
zk=Z*>ZjJVker%;P!S-X0fN#WlrcAdFDhsYiGwh3-|F~mT)t^UFI+~}RezMV*;aj~!
zOyD5LWREqxYxe)RBfGAXMYGjd?T+c0mXQ0$_8hpso~tt>njw7daYoID7c-_rMMWR|
zYEi~gBAoPR<1yK$DGzTRl59SqHuK`-wtGty4xTKT7wpRXXse$EC#&a{=qwW(BcG{W
zQ+50tBV-aUul9&?eG?oi;J}?aO-*z5*^^fS9aT0?pP_kb){W`A_-y><|E=Edn*aZ*
z`Hp8l0)?Co{#ejvp?7Tasn6bS;d7JX6dv{b-4t`?)83@{2flL$Z_mj4WA$FN_j^{C
zFl&?ICw7*`LN7%FYxmiyy=&F4=sjEPzh<Ju(eP=#UpHILFVwx*nt96k<<6*OTNGN3
zCUqXa_p+pp=cK?KrKf5qC3a0r%3nEMf5#ueO<jMNOzPBj-)01wuDpFuGhMKK?+st>
zz)AtjKQ6vU4X3<)by1B^v!S5F;0vGZvW3FuFC94PU+8uHS4Kjy-wJaZC+?@lhK@N#
zf3E0+Mc&_TQa5q2@rvA!Y)T?|uM-23F0ba{S<19>&2cZCzF<XB)%MfAjeU+{-7D94
z+b0PGuf6m6?<S459oLf2*G**Ww{;G`_meTU^1bN4pLt8v-ih21?RGu&{Ig7J>jrig
zbDtuv1=Ic48zeFcIz*YSIorYW&e|wrN&LO@yPj4XZ3tc)^3>3(;Fs&PeEa{ew!b*F
zd;Nra0oO~me{_8!ntW!x`1$$Ou}&-8CuD0#IUivCY&_fdv|Q3uqqFDz0yXY9=^6gN
zWnFEdbmH}rrL&cNitc)RlyKR;tKY`Gv(?b=zsuUhU!Qhgv8`#UnaKC@K$P-bEzV3y
zCbOm<rBm<3UN>bs1nyVeH^J~?<p)ncZdVarL1_UE7ulFN&l%aFo&~F>E>aXoNp?7=
znRUB{sZ=P-Maf*4IdPI!$Bxh#?Q4a4)03Tc+_ju{^vAPJPsEnodgdY@G<`?j>V?a+
zgQq^+vQo12;M1I-Ww#4MBJTJb`h|sct__I1v;C}kNB?1Wv5oB+SCw8qm8t)DQ}La>
zgh0y1?d@HUZvKw0(qL%HS@uWD@8~_}{)@u;^;6^ipZg!X-n}k_=Qry!(;zqJxqq)1
z7Ii6ae<qjCmEpLB)Aahw8$$PY9}Orry;}E?$9baJrw-fWB6X{{6%u<ts;SHu3iAE<
zMprDj<<zECkGPUFzGYrvJl(=Km#dXY_)x!m$i_{Z)AlAW|EP21&e>z)Hw6>LtJ{x@
zKbR7o3K?h9QwUnkd0~FE(p^ar_Sy?qE`=p;Zf|3jF;!sao4e@U!DglmwiQdiD@eV_
z>(HA~Dqv)~^4c7Z4rjx?M*d5SS{vmKv;{ZVU)k}5Th&k8H7f4aRQu$_o;3=VN0``z
zSZ1G}6Z+<eqg4_=$AUY0*~={Mt}D6j@xZTBvE%vX_<!s^E$8=q@}0G-w2`y<=%)uF
zo(~h*Gu(J@&J6$G<fcFW;k-VDb_w=XQ#B=cf_7{bp0#Jrv-I++)Tpob^v{JF&U6cu
z++2FZYLRmG86D|4tlz(`3D6He@%aajd~M7d(bQdK?{xig@0}|)YBb_Fdv)`A?gZ=P
zZ>+|P0!{Ob?%uk2{AEv&>~^2i-Jh>qy{vy=&irZ5(vQ@Xoe~M$Eam^_{--0Uk)Opg
z5=-yMTxXods_7H>^O~!aNcL&rcPl0vb8{cRqA|ZG$WAo%6L%4pqjdg`x!Ds=FkI<K
z+4)zu^rD34X5K_avH2InTpN0-R0ZTaZoWAZc%V<FP`9<D$tl*k#=dHDnZ3u_FAM#3
zF4>mv;G4OpBRy2?{2TZCf5Jt0wtu|UY_-%};L()B39H|PM+u&nn&|ggGP36kV^6eN
z^plM|yShVq)Q{8&2_I2**PSSKPkmLG`OBm`Z}POaw*Nk|d24})?8=^s_%IpPPCfBV
zSAn;Se%x+MK7ZlJ)bF0gESY7G&QwNR)YqJ(eEnwi`ahPjzd!J<Tj*9I`|@9|ZL>(;
z>oh_AE02@>bN@u|5esy@azN?ojt;AXSGe3~#U}BFM9f&Gb$g4$S<$5YnB<J7w;bQx
zpQ$mYo>QwpHmUEm&_umc7o)Gd4qGjMI5_xub@Sp&J!#6R(wh&Ih|FxVS-39I@9(jh
zslv~7g0?{W54jBfcO`|4udI0<F!7+R^(BWkFIFjwl39FnD!eA}IX0}}>-r)m*kH27
z@!?e4Z%kX1W;Nd5{f9Sm4x7h;&)Q4EB^EF?7%FIpXMB03;oE<IQAEi^N0zL^TFaLF
zm)f-Os^hdw`90ri^YZT3e^BY2Q#0+?k^PMY+U}yM(G9=LB_3>G3v4xdIlb<0`HNT8
z>o4rw|5uE8j+?;N>ks-)HZeR}EPnsK#Xo@qf={djvKH=psQhK-dS{2@ZcA;IT0ACi
zxgA^jDbU!#<XD%o=8mvD+lK~I46|$aE0$ecxq45T;tD0zcjf7_%0WjK=^8p-`o(XM
zx&Ozx{+U1S^oq>7-jLmQ&iCS>D{tHEa*w?~QhmVkl5x!xw?6x$6O*<dKRnUVLP<eu
zvhVT}FTWM7QhW7oLLR4*g>J`uGyAiq!5NJYgkG-<&<S)rQ(hA`{fCZu#}tXhPG)|c
zOC!ZtKK*L`V<~#&Qs>vH^W{>VUI@L<G!;!YS5%rMsJQi3={~lGpb2tUOdm;QyDhoc
zv+L@YTh|UbxanK(k(+ob?YF+2c<;8-s9uA&DSfju7hXU2uf%lMq0*dLGtTol9&5g0
zThZZX^ELC;8|j5zde1|QCa>Qv=yGcP)ht1l+G&e-6xco7d-<h~tj%AgOui+H!@}0z
zyWwY~&23WsTxg!j{pjB6m0>Hj;ySkSU%hAf@%P&$eVcwvmRKI5<r=rX{P@bvyLYBP
zh+0?o;g%G8!&Qa08|Jrn#6@rWX82!CfG2p#+R3kZC(i2Gd%e5<==<UVo|H#6IX8W}
zf?XnWx9{zCou&{{{B5oLrAJ?6*SW?7Z_k}jZfv#lvgN0a4+pDE=0&G<7PdO+T~p2q
zIlFc7N1IEpoHFE3Zwvqrc<<hSvg>S+aPVcp6{p{5-<D?H!FsXsTYCLezq(h?Zv^w@
z?@_;TOzuo?ic9i>9X6FykFxIKw-0uY^q9-&*id5k%KJ;!#Ko};+}y#7MWW{<3Y^^<
zap%6zB=?H&?dG~Ab^S|c8e08-_T93{pyrLI)xR_6FC2JyxrSl!zC!aXV;{~xm-TC>
zR$txwcdz{-RmKbQIb17!PAeCg#VVhyn6l{oUaf`?Du4gp|Mgsk^FZl)ElCjvbt`*U
zbNj0HO(#XmSQ7d?0)ijk-@I$V3~f8d07Z+I*AD(Wy%d$7IfgVT)z&h93oVL%e{g$q
z>AAS_<<Si{;=~$W%2}N%^-Hh&^mf<se|aqvvf~1UcX%cjE%Cg+ug2}neZ#6(#_<dH
z9Tc4RIDnt$`DdMFg0XW_AI=WAu5jME<M5PIrn6*s`yEZ0wYbA$sj*$3r!0e+lEI6E
zGduJ*bE$B=U8G>L;&oKytjE*%?!0Qctg?3Yq!_=WW+Il1dl>%-?sPuF?sD>J<y57)
z%pw9u1Y8(u?F37mZ8uB}_R{`3O{({CbCmJ&9r}LJcMn}`S~1Vl<4dkq-#Yd~e9KqA
z%${(s;_sc?CBIKaR{i_D-(~sy|1wiq86D@&;auUE<nSiBI5}kP!gUu<#b-L6OFLrx
zLR6*WRg(PbvzK!H)P+ARsyHUFdDDYmM=P$fXkJ;JDrNbvWyi`z6@BL0mfD<Z3Y~h&
zd3AceOmOw&k7u}z%AcOej^VF<aAmVe(WA_H+7qXleX6LHIoQ<Ef5+N%l}NE$zTezC
z2gTkMM$XxFbdj4xe213kr^u@B?)Mj+yd7RK|53)mqZ{8o|5tcKSHeAow?Rb7HDsBZ
zuyv<^;amHXS#veOGkHEY{bKUFINq&v)Y`o@yTk5l_kPd2hmT7zWcz8iTDA8`%~LC_
z6fh82ugz`npnJyG;9WTiu^z!W-?sgj>$6vCcV%l{{ND~CZST^bHM<|*OTBB^dnu!d
zuX)ppo#y|#^!EI9ekE(^=3n>i{e_Lo?GCdD3%&Zz?GUlm|4w@Jd5*t-^8fUIIkx>@
z!?E>qpB{VjWrONr%cUU`B)9j9Ezi6B{ojlF#q}TV|J7^Wba#z1%MKRJU$gE1ia#l-
zmXbQR-Ys8Ma6-fER%MomFYL-9neP|%y{nV5`e(B9ucDZWmbpM!jCR(e2MrCs5;tEt
zvi5+uoyn!@39TL<;%wdLKaVSU9{>B?wz)jfd>eO&GsK?R+<)(vw3JQ3ltWEFb~fkg
z@EjBjaJ=_ydH&})U$&QRzNLO^V?)K+JNvvkU&PeLFzi_v)^&Xet6-1o^d(NqfAmcG
z(ZgT&N!C$lvQNPEFZCuJOSb*=i@dKbEn0E*eW`Py@Ml&*KbLML*}Ye)AFx=5>|*0H
zeEIN7fpSrVc>Au?pAAmR#Hk1K=k8|uW4gG1HuI9unE%oCfB2t#WPfqtWO`-(!3w7Z
z%<((omITe7Xl3M46x3t8DE{C%$Aj-S$3$~nnkL#JyVmm8A6*&SDZRHp%LKY!V{#W+
zt!kxVr!CnXq$hfN(?+Xz;wme*ZY{kpByYhzCv4`mipPJVeYV+u_uhZ5c+%7*M<W|d
z65l-ETGV<e>5YM$g894v>Gi+2?Q3q+=&yNa|L@!X!zmYba%aB{G&kPJnz?O-^RXJu
zXB)Qb8t%MyM8>bvwEpoQ|ICOt?Xk@4q6~rC-k(|3=5Vua)AG1qpQf`P@r=2dc3+8M
z<J6s;vvzz_WR^?4eejZ%@G|E9+Ah2QtN-h^-m11x-NdK%^{U#jvyGdk?qO1?U^Upr
z@gPF@fZ|RQ$IhRIVVkA*m$u&fdwc(~+t>9BP8>1b6tQ;qy>iY6F4w+CYRJu9{yP2s
zl8>*SOMck)ooBt<ymyy(JY&ubkK>>G@Wv;bllLC%_UH1wC|r~K{jVY0#h;#^I6s&b
zJlVKxugv?O4FcbLGsKUHu56z);r6Sn*?+EnxbGpztZ_bV(w032&Xdd6UB2<PKcg~j
zPHUHdtqE^wamJ2$z50e5%6HV<X1E+>yXu5#@f^KO(_f9DE3<#h$jRDob6w=f<F8MP
zX1b<sv);F3y^qnk$2EU$>VK$tP{!J%@cc5T-%{t~YL_Q-0+L1Eb5Cl2_Mjtbv2KgL
zK!Q=mi|1XIx11JE<69T3-M#nSt@iw&oXly;c@f$?dw4hURjxnw-FM$BK__LejE(DR
z&35F?-pKaw$;s~QqcuB=zdG;w^zZ(qAHARdSY4TUbH`Et)Z3r)>i)3x#{Ft|&Ki`m
z_S#!Vu8su>^Kza`ZV-0z>2@`2Z|k>nv)lOn$L*@fJ?_`MuBBWNH9g>`{*$GUXZyBb
z@AUl&#%nkItWtD~QuWqO@^gB@Qd;EE?{cfKDAViD?4(H&VoxsKzjQW*LswL0ABXC+
zv<QQY<mkp)C$}RKP8*J{vE8>i*!N8L)T5H0elcCKE}Am?`to2;ucKm`ir0MYWRpwt
zJKk^bTB-OcdDYLZmp<lt`~2nieY|e1)LbBz&{uP3hQhID2VVLIE?7GGIN!w3&9&?@
z%gqeW-}=p8$RFRMZxpjZ-0$wrkB?VBzgOk2D3tp9s7O=Tw*TL5B+W5d;d?Fk?3B0D
z3avRAW#;{ux&Gqi_&@$V&z`4d%{rIvqIvC#v}9)DotQX=B{@0s9(^un*|0XqNN#a)
z{(lyB+2-?UD-)_)I$o`uvpM<ti}UsW%U?YC9KYav?c4niW;wh3d?#M8@S0$0Y`dSm
zdmiJGyqYiX=4lGv<Gwh>w8VaidfdOCRj=MTJ1rM7Sv2qLk3h4j3pTI+uNqtR{&>l&
zpZb?h@BhJXdAI!EHI{zu7H^v-h1{um;r%{~>?UTvF`C1c{ygOBwp~`L9A{sO@Av5z
zHaGK4+_U^+sl|(LTR%?`PT|_xx<*TDo$Ldt>ugic-uyWGjR8j~--byFcJeB#mo5%J
zbI>HT$4n$6II(=^&-WAT%3eRJ7Kxu#t+1BQApYk~iTSPBbM_QAa@uF9?*F0v-?Wrh
z?%usw4^PbT-o|36)KZ<Qu;%0qp;+txe0%>~jaOdn7!%3j@u&Ow#as7Imagf@O6)n?
zVf?*N<bB}A9V-LYZJ6L=Wu@&=+w)!TU-jbkt3F={p7XZh%ZnVn^DDPDtIu1!kvsow
z_S1`V&t+QZoZJ6dSxSiIwr)qMiS7AAo;P04eN@iwXLr_XyUj5RX`L9&Gb@jLOqrs$
z@Bb@i(Ob9v`-ROs_J((BvCF;*o>DJQM%^`(%zU4^aB=I&XqknfyEsmLo4rzWZBG2n
z;Q9Y<>hpgqwe4;@yX$Q6bzfly11s}&N-eiHtYTac_vckUhtrQzwkwa5?g-rdz;>8-
z)8C*gtb+Co`72b{iL)I1e)6bi*V#Ks`JaBQUH#><eBJCt-NkOUCl53F$t)GR-nQb}
z+0XffhpU$ydAr4J?L~*Yhd<A{JpZBV6!3k^Zp)$tvmZ(9=6F*kb#Riy{Zk6bPo5Zy
z<h{LR`ZZL*cZuD-eP8UZbKTSCoLCxR<=Y##Y_|Blh1=dSzLK*$$E4ACElxNr*G}!I
zjp#?7r0%4>{ueI2Vfk(qJ#V(sL4lJ`i>@lW9$42QrrTYc_;+5yw;X4eRQ1Q*Kj)lZ
zYH^qQkjx7HrtS8E-BPEIR@{%7CKI-HUz*QHk;uhQpa08MNS>pmeUDkiP%>I9`O`bw
z$ya~R&6jZ%xxU55-t+qTeU5AA{=IUuzTmXS<}{AXBVx;59CLsF!T6Z*hMPIJfBE$M
zFH>&WvP*m8t~Vzp2K)R;VXoAyYYx-NxZb$)$pa1DwP#B<bkrUcR$PAjcv5)A-HDz0
zfug1HX4;bvY-@b%Q*oh0_UoY;{)rpwWh#FaKjGib`KZRvEl0j=SH<LyN9r1DlXqWl
z`>oNnv&;D5m*x9>;v7Q+3f<3UD~Kr8F9{aPx)K(4de6TA;hz7;?o~aUEC2pRW8=<;
zA8Y<x@-Ea<x~+EM(!u9Frz3uQh_;4uMZVj6+AnD1zloU_FPb}<>+f3+UK|y9ML^?r
zesIwCj^<@iSpti0@W=^Vugehg<-L9P!~%wLg{=9%r~YsA+w&on>7iTi;ZJWYzE6&N
z{r0NmSN@lI+Lz5U62HXQ@*Y!ZUNO}}ug`df&Hs1VUoMC5JAA6U?D*mL#;gG?%O0+{
z`QzIDfAe2#eg9{6)vr6YdnDz5%$&OO*A0iNy`dAD7EadRu<J>l`{SJN1#{Cxiu3*)
zoA%X@|NG7ei(PCtf7}0_zTekezxIG;l~wM-9qA_B=Z}eHq$W;Ub}X;puG}S^yK(YA
zYwG6B?kKvu^NU<>y!CmO*B>71PqM#qYl_5u?FH+(4%pgPb~nc9NiL1iJDe*l<*DrA
zb?KypFke>2_Japz{pP=>vD3s?`1-k^qSVIcDlFD1D$gEDUHY$3^Kq{IpZPD(O*Q^g
zn|wAy`QUL|#Zzoe3`rX<b3EK@!+hqoOHOC@q~cCjwY*8MZ=O`=;9;>@ll0#(ROb4O
zyUJH59{t?-DBEiGa*=(PEKj9z&#~*uKD1A4_FmN!YbUey+qf|wpZBcL;^U#|FRm=F
zZ~Sfl?)=uRpQnj?FuGcm>rH<y#IWDqLpOKs6R~WQ=@Dt|4-WkZmD>MH@$Sw)jJ|jN
zbUf-d-og}m$Lne1o9zCsnV%)A9dhdCsO8Oh{BLPN6pIzxkN62$d-x)C%+KvRD3}i!
zgvz-*_iEDgT6R_kt#mWd_Y9mZlTwrZ@rh2-{=IEq^8N{qODzArS^w9JcYaml<%16-
z-PYb+c-+qQFT20wTc$8ZRtM2pdF{LT4LqWD)XwXED%g3*xN*9y!ne8e|A@v`{O6UN
zx%r*V!vi7Qdv0I171Z9{y#Dpq_x}X{KHdNKInRsjizPDTKI{l@xSLbc$l0)l+wflW
zWz8G+yq%BFH$HIV-2|u2mRmGq_iz4qA)_+y(Yymak)JPpnYDwj`1_^VIXt(r|M=+b
z{p_6gZQs#`55*3@S+iqH+>!++o_kl9_5R)B0&i>c6MoAlPdU3}Wr$9Y_j$&uH&5fA
z+*<$jard(uGJ$s<{z$3`_|LqEo$2AnUpv>f<UCclZTX;jvVv)FNUJg9#G^mD6sFwd
zsbrn_@Qb_ikEe;!*Vw1n)PGRlf4XJsnZSivwRHz1TjWYEuAFUB_*&>F%g<?nH|DMl
z-jcpS;z*JD<9?1rqkU)gN?g`1PLl8XymjHVvuP=6Yp(g<>iv}}y}bF{y?svGSugr7
zGxFieZi~u{`}6(NAtvA0-wtnzpa0l8mwjHs#zj%S->$c85b#LPK7V4}wHNQEDSp~^
zbKXYHAI?{-nN6={|G8ti>uLVO46|RH=X`oD-MJ#Mox^Evj@sNsOOIBDUAwEpoU-|O
z=XLv6Uz^kBU)pM}GdFD3L@T~V(=D$X4(SG+aAXP0f0O<4;l4#PR=?ON89ht*_klf3
z>ZiU<T`6Oo`uj|l*%!GhZ|g2~Y5VZ(lutZ-u&sA{(3#ERmu*f=$!%JGaYKZ_*6I7c
z^{-5SqH_A~YzOHB+m>!V|KVM}jPoBJqhB7USvlIz*zcdu5XtJucfacCZj;LA$NI8a
zeJ3cf@~wGed2IU9#wjx#m@-p)<9pjbfBVC2q{XTl)G&Yj-^cZ*xTZvRi)HF)1qvVF
z&lQ{Wxm?2J(W<|3o^f-SYDB#)8Kr(_Ecm8lzDaEHj_kh90*f=62|J#<C9qy%d~Z{?
zeV-fO<LN>SvJIuT1(_GOiL6ywpwl^T;_Kk-?@6_c8y*+`|JDDW-|zKXS<8dE&Staq
zJ#<+E&Obl$+2cs$C%gIQIg`{K(+p%D79O-|TEXF=GDlv#?w9SUr9#qkL>C5hv{p+g
z%ifuvfBNHAqnXY3)E5Q5*xz~V>&hQo!nPAaYWQ74m$a?xmzjO`>0w#hIS&M~UO&8Y
z$!PoZ8}?saIzBm<JX>D>leg+0_x>Z_Uq2ObvYxuh(C=oio~J>!tCrdnSMQ^_?i{|$
z*+VQp@_Z-{-E6<;V`|<0!nv=v7#KVH*V;MRy;~ao&@@h{SW$59`tOH~gQE<mFU*<k
zt-eCz+NNL|Wp$;{n9r*B1<&tp+I1*r>YJpw+qaY!T)9>w|K*mnu!~TV&EMnm(%Pf+
zwr<K-`go_w^-i#g(8}{KkL}FqOWj;6TyL#@;&f-ao%XkK{+-Qh|JVe&J>YLS5*Mko
zU%}{x`lCDgn@{jHr(JLO-sXJd&grv%_Z0TmPl@)QQ7p>0v{$|DSndoX?awjU=QRJk
zWLaPCa%p3Ip|tuHp)O<QM}gP%<^?jiLiT4QhKBVOpNg}U;&`}AE=}jNt_K(2`Xal(
zA6QJjSxcrkg)Urf_x<#h>IX|KPJI4)?4jC@Re8%aGGv}eRINCh_#@kmUu(ir^L_u*
zO$vYC+7|lk)!73Vr#Z;1U}))m@G!6bHpi8-RWsd^D$SWSUEbc>{_lLfSN-?-fApC)
z?6yeC_*WadD}J)ogww*|nzMTnnT!<lrn4$O-LhY&@{Zm*>rYiNQ+(1{Gv6(bV|=wd
ze@^Ph*1IbV4^^8m%Po8OZ}Ux^)uyxNvnR|stzsGKnXM#r<&7k>#PaFOE$4Cuu1|Q*
zuvT0mOXX2HbBXoNa+iFC&;S40|BU^0zW(?3nE|GA``bPrQf|nUNHW?f<IW<u^Tmr-
zlP|KbpZ{wQqcd+%^3zKm=NVtw|6u{m1{Fn^yQv%OJA3TL8_nxEHJe{9QIL;hd}otV
z-u3a7K>VHTGX-oC#XEn_Q~7SVMm>JVWr5ijcmsv^zLdz9+IrW;Abs`o&6CrcPaNC&
zIsfuS^|&WuN-vjc*0Fh9_u*p7`DQ<*Yjc_N+=}#Cm5tL)x}|3JDXjVIqqaHEMrVrO
znu7NZ`QFQKOes-oUYwNMykX|+@Ob8HyoR!l4{llQ)@(9KwRs%Wc)4CYO}*#eiXg@7
zy<uV%)0%RcWE4X!mA^5CnTWkNtaubDW&3^Co6ueUE@@|eHk>HmyjM7x^WoyJrELXM
z7F-j1{FJxcW1+(K`Ozy{j!JS*>UiG0zp?1^m9^Y^!q@!gsabda`QyJet1W-8kXkO>
zy_aF@`ht`bn>QAoy|$y4^S`!-ahBo4#$a9X8!I_3>a5T@ys~TkyobqGZkaA{=rRIN
z?wt}$H@Wxd#DlC?Q}>BQbn@O}cGa(+p;Nw2)AUl>nW%=x&CBO4v@85^B+X6ogY#6u
zN8Cn}mabQ1Ulz2OWlLz(tobQl&n;kxTXsl};UfRPFXb=4J>}nNQMcPgfJNW|Kf|8D
zS#`TL7p5J~WZ+*in{fm4lLrlY<^sESPds$7`~AiEf4Bcn-S^G^-%Q2B@u}<07unDG
zmVC$BeG$ve!`VLNEX&tSWz}4pGE*SwoZ_jcye=<(&i`+k^<H+7@%oz0dSx4>74m}*
z=$$ZG6k{-X%Z42-3fc^-6vE48!(y3oEW#Q31Qn+gC)_<Pb)whv(bI_aPVc`?ocnfC
z=@(0vyN|8wKfiy;UH^aoqO3Y&cGkipVaq0*s&+kpaA~V#*6SBy4BOgc?kRNtS14XE
z!8@=jbzU1w#s0cy`R^-hK3XzdN{iAxU=X!3;obEwud+_fP<zgK_p0Sm>4{F>&i{{X
zz25l6zGk0f>Pl<fSuy#Kf0(&V^bNYI^J|;zq0aNJ{ztN(-&-VJ|LygZ4&7ia!DOX#
zhqM^@k6Ez=9@@7tc<RNq$K;F8%*p;(vFGIdQ?q>5++I4<dd<JAX!W8?Hzo@nxt(Z!
ztJ2}+)u+nScYHr{YRwt33r}MBSeovX9h&p`hs^Th+oRMqPwc)ezNj(z{DryQ`T1UF
z<kbvwwv{KHKk{$3kJ@z$OM|)-S`J!z?i+a8d6c4-86WeR=&I)N{X$@w#ai{|6B##7
z*8S743jbSYKRM3$YUSQyUR5zaL-P;$2A3R<#<Uro6g}s0aP{S+b&Q)EQcf3!&43hM
zchAbVE6*{hIJdTM+3#g(451p|cOH4TboJTNUdAUpvXwncpIE+9^6=X^Lpj>cw{ctD
zJNX?|%QAhMKA0=8GlZQy!o|(GAeT9cr9neM>c_G8n&#OD7kmCJYvANiIKaV?m~8c8
zFO%%&_y*TK>i2Gcse62X_e6mShqBY}E8I8#->~n~>;JY>vsu0LeT(I7T;}**l;~-F
z`S-e%!wSo|r<+*(K785sUH*w-^&8{;E}cs)cU8Xo8k^ZuxBcURTBZdJBBy_EE4ZZ^
z^km!jpGLo4c9$43v=lA&ljiK2X>@AStE4@S5wmO$A2W&HJbls3w5?Z-4{n`T`?k8|
z(@y<>=<^1`U(&SYG$Sh+H+lV;Q|c$)YNa$Q^D(!ulrFnPmk8?x{ebBAj9lBl2PIXO
zxog%v`|+rbalzSahm<bHqQ`$<Sl_OFvggtdU4dNvCBmg2l>`<zC|r;!x%a##)90Ys
z{Ig-_L<II;JS~4Ic>Z6loqHJ_IUc78%>7@wd#=qjzv<Q2I~#u1DM-)A@3`i*oIS|K
zyN2JaEJZ|9GWN!e{}V0;%}w%)wqzCK6M7S0;4tI$j-XS4R@;s|KA>_U^ZB#as~cj|
zTo*iBUH-(vw?FPth=Wc275?usHonH@=Q*1)?_W=Ew45ffKfxg4{1$`POFrK;aSxZ4
ztub1aW%_KJi0dJ{15frh{+L~TVeh-w{UTZqrJ_zR>yvyFEulPT;iLbTKRwd1?&q6V
z)%SeW{;kvJZYqik{g$e`3Q`EQFQ36M@hHp7yoN7ZFX}L?N>V%cs%hdp!62!{(kBz%
ze+VoTusz+*$ER_{gpuc=!zPoC;(~6?!VkxvAB$X|eyMs!ldSU--j)|HF3+E;xsW0J
z(S2?CJzn{Lo|;R<TohZJ#}r)=a#m#7UZx(OPe;-pa39f_>vw;v<L1+E7xTye)!SP3
z_44QVU!q3J=YCB047EGFBx~=_KZ<#K4`>!Y+RV;p@Ah`@VVh$T#XYaN_kVaT5<hF<
zi#sy{t9Nd9;D5|>DR*1o3XV-7LPzeecU`e<uld6-7B0PKJ5E()uTi|y_ksO{)xI+x
zdK_27dQU{&ahkB#_|eRoujc>Sd0Pa|vzYb?n0l!`uIbf%JNL>Z(*uEyXWmztc+{}%
z`NFXI1uF-;!|?}!VeDU7ovi(`V~qFlJUJC~^GDnwr&%R?o(OCEcsZC|*uOa_rq*6S
z`rX>??3o{W&mR-H$|%WnGwa$jmWzcZ>HT`TmsUQvKW{6Xetdm!*cwB>l`M?kcb$;u
zxb$b&iN|^83I&`jYF?d_VBBQrK0$3xWambPuAUFkubw+ES=xKmsJ7`$;jP7YcShYm
zZTiBp>umqUNepje#Gh>lettl)&t!f0vZH(6zOdJL{r1S;&*zWKdM{yd#_Ozi@OC*5
z{*!l$loDgrggSrC(dhiiQyMA8vuM+s)iXT{?=F3#{`#4Q=IV1wiw`LnrRly{94B3&
z-*+-CTYGxnW-I+`tTM$X)@8nxOG;P%ru?VdSZ#h+P~B1n_0ZNSnz!ATEs>o1_IPgi
zn++fQxDJGzG!MLg*&<$Ekon5z3ClDRW%qO(-nDgef1k}qC4TP}#T`zuho5A>oaAs*
zrTNi??HQ(<LN6`3s`aQmag$X{TX@7Z=hmp*EDOGE4wrZ})&5WU{&4@fx4V`w7HrwF
zWldnwo!8E{dej!|d%R9An<3e;FaGbh{R=;4KVPx*y@C5IOJ7OT(u<LdC2z8`qzms)
zyjB)A?FomYH@mqkyM>WGdt5xja{vF2^0@?_Rwg95Go&8d^dQ5)#h`4P+Lx`ix34kI
zt*({p71Te&zL`C8^YbQ?+tSbPEt=Z;viE_MuIVR*X6-d+B(pM?t~;nKb92kBSm{ok
zDK2}1BG@kWoLiWDC*@Dv^TfwLlID2noLO@Bw9DG<<&L(2hO-j_ryNU9-5Mo-A}X`z
zfpZVb`Haak587&Mj8_m{7u{ps?ZNn^=vT?q&gmsGZ|pQpvUweoe4UzCa9@f%JFj5|
z_uIYfKW5G-=BvKe`aOPm%|e&F`Uof4=8Wf)y-n=PT18DR_Q?MI&U8?LJHxY3zV>i2
zv!_eG+X~au-xRG@Px&TSHRouf+|msH<XiiCg2H#GFV54r8^y9QZjRj2jjPjlJUz0O
z`~8L9&H0~fBIZa<y(!GL^H}jkyOYn?ySYW>w$>aJ%WG~nl(Z<B<!AG|@|E?M2wPj3
z$K5`&vpn5|STBav9+;}>w8H1+UGpeI)3tn;ygb9CV&^YnEo#n~el??Ft<N%Z#tkyn
zzf${Bww8a}@PKurOxaexlnBEu)0PL-w9W3D&SKEoQ+<Bo^N0^j?NdXpYa1Or@O$5<
z_x1CGI$tcCS0KD&;WU;9pW=Qcy=ALtdHA_d_BHqa>p3+UGBJ9W`2X*}|5(JO;$Yxx
zvH7x3txP6(Z$BORTyoPiox>L$C1y>YUA*z4z}^=U7B2pE|K8toJz4TSC%1n6UF8Rx
zwkLkv_p12pEHfMKC94<et&hAVI*<KTE`yzPbaRGVi0<^R&W-(rS$PI`+{(7^_Y)8}
zdLVr9;zM&@uUOnF!IpK5>t}WM8^#A~Yme>xEy1spzhW-u>Z2aAvDSRk*!QJ<U{&vm
zoV=?n?`CR<!PEyEnRgcLy6Yq2xJ~G!PNc=JWp8JGKHifvi-)Z`sHCo`t5v4;_O8q)
zM~wHppV{QZ@cd;;lUjb<g7^O(+9y8^eABM*>11o+tob{RzN|6gT0N0DWpmV`JvZ2O
zeO&@0G=u-t<UMMWVGp)AQ80&BratV={D)PuUhXT~Dy6I7!1X#(>Cye0(efAntThff
z=X}I{UG?Tv_G>~{R)&i$%lP$8wXbgG-umyi8b4+jINjuz+#A%qkfZe5m&s=r1#4NU
zAJf%6cKg^PqZh9uPN?17DD=|O<6gq*Pbu2qeF(X-ac1j7s<e+>&)H|uAsFcJ<@B=;
zZ?sQ-YqyBvnbv3XPpOijk4589V_dYntz*iDSxbN1$=y}?SL*DUvzLFo2=!~-yrH0J
z&3C4YYyvWSKbZY}asJ<edn>ApCompp^JqT3LcMCmksA}(+(S;iIeS&)g>{UHy`@)v
z-TVHZ^TL;{3(l&X<ruIuNVH*l#CPWhwu`%qo2Ix}h6<KWy_)rzLxDxA&;Gxvl*K0&
z;Ujy^jL#NKZ3yiwQ=BNJ!ksHt!2f;qvW!Wr9MKJH%$4mFS{F~hw|@Is15SoZzbEYK
z_{Ot>`>~bU3YV_=>B8P3v!$Qwf9W#$pLW$VNIBlXXJVh+sgz6KZT8jd-F2sV)zn93
za|3)YC9f6pd+EDqXO-FIDK$20Oq<i0lWy#Y+aPwK-(Z`D@^+8>tG$)$B?W^g<l0yp
zJM9qv9?+km$faQ?ziNKD-v0A5xdl{biKm>+DOM2m;$HK~!nA5;-6#3~6GYv*Us`nQ
zDZahYqxZ=2*4s-9Cq>P9azeLb?#*RKL@v#mzvJY~MU#H4%Uc-}uKsP}LSg-a{X5;4
zvIZ@l%zS>0#y6dmyANa>uFSe_bMoJ+e+9E6?Dy_@|I_)co7dWJ0WuQ5zdT80Tpgr$
z^t1BZj>}i(O3S34bxA*RezJ}Jgm3eD&wiFD=Gq*}$}#n=ez0lFsc$d!v=6kNb$ya0
zx;(FQfBu(vgN%(49<J<56~C^0f50&7z2uX_GA<i*8n&)>w7kMnIJIV$n%Z)f46T#D
z92xyC7VOUcV9?#eFk$(l%~PTxMG^`o>h1fjyy>RQY^K@?>#v?T|1X0v$xX*G=(_f6
zQ>i0`=l1@*?jzUya9Y(Dt;uJ-8@e-A9#x1*k`SEu!oDKwa+USv#D$S>zMPr<FIf5L
zstAA4JKV-c`Bq)MwQisKzMze+Y!`Q5jlZb!x<hPMsZZ$zeTP?%zU0m;ZuHnav2A%_
z3VV{#B#9dm0gQW&PkXL8*K5OP=7!Zv_jdp4w+RhzGkqv^q=+G7xtqRW<PEK&J2`SQ
zlNU-qW^!62eR1j8Z}K+zapk+h;)NB&J9hQQ{+(dNdGpu-b&qbz+{zg(7i!ErzMD<0
z4xgI+d5gk4@Ba&f?<D(PYns)v+et1yV1iQn8K)b{=>fJvsY_fBJ8)h8_;lA|Zq2)K
z@eS1~MgCrf`vkl!^{<)V@|Cgt`-bh(sdM^a#aoLw4?ViU+7vfs|Jv!h+WJ1lS=GK4
z(mmT(xaCUHibJn<Ev#L8+R)+s$%T{8U!KctZ)&9T%{(y6=j#(O^AjB$+a?{BeQ>62
zmExVtrWGB(_~t$NePq|68PPl&B|}$jOuW3rMaS#ojZHa)muwGI`v<)VZTwcpRl>7@
zY15tSB};qOfp;#JHN5iN?mYE$w!op@t+J<h^!Hx&W%sx7m5sd{a^m@pN`n@m3)d!^
zNMBDr)ilw_@<?UfiwlZgOM~33#9EBAQcmh$zI4gx>{*|}^G+R$?(8g^<`|ePb-&7}
zqvQNx55c>7GuVGNm@2n2<S{s;-}@t7_3d-KIQz~w$zfs*LMp3^UvOM+D`?><?TV|n
z?alIT(rd66G4|j0qxj3i{{J=SL)@>srKI$R^h#&l=U=zc;Kyv)-F}6RyLSBiuGeI5
zEX8`M(XO~x=!d{2hb!zyW;fdZsuC@J^I*c#^<sSiFSZ&z-IUoU#k8Wj#*S<IcM}e^
znI!>z-TD#_&$o7XZN682Tk-g^7Xs-wb02mb+T)l~TKJ5Qn|~pnxXMALe`TM}g*vi@
zTij~<ZR}d~jakveUViJmf<-20jH2dArXOlg4>VPBnUSvG8(}EF@0)ni{gdxHCC=R{
zyjbzJ@HFQ}_0Zn)kK?Au>AO#uxNZBUJtwNCMSlKs`F;K5TUJ$;v$orH%{(jqdgYX(
zL6L8SS-qC7-@I5+H2%@Pb~(fJ3*{oZ>H)jE)Z22H&Rq9dcS7O*{Y##IkI!4!sr~-#
z?lO_H&sLNuo$N?E{=hIx-s))f>N&n2=gDWiT`+IrW0}<Tt8K1lWrt5wYE5bDxj0ER
zaf--+of7Y4RJs*fUO0E$s@;9}=vvz^wn7O(;NuhI|DO%J{h~8CrQj+<%!9rCTS~cv
zUObp3q2^#&C@?ksgy0K>yU(Tx_G!)9B`zVd_*!4^938$so@-u_QS;_6T4Zs+!63QY
z*u=iB*tuSRa)*L!@%~8%)0PPQ&s|lx?j{RsK}@8;cdOFws`h@#wL+_|C^4j*|4`UG
z<3;JGy^@kKZ_ldpE_ii>JAT<l@ArX9R@>FRTF#1Sp0z9g{wYS~=GseF&T`+mf0pfK
z-RpPU?j~-Fr9u-K1EwE+E?4&_*hgUEq4to~VvK%@51O~63SViDwwf{J#!;Iut+#g;
z{>|#2V5)q`G)18};PM?!#T>U8=Kd$IR@8Utp8fEvklV<j;*ICOLNn3jKQ86e$}vn>
z&Z;;?v**^nNc|P_Sp&_Vi#}uVsG7D|TC~~a#hh*Yspq<8JkRiEOg*(%r6v3MW|5aK
z<m^t_&z9fsDBAKZ=FzXaai4xL&k^Et-omz4H17ZEdiV1+|E8O}bZ9@S3%a>yA^)Q5
zmlscLJ5_6S^#0=KN?D}~5A}$t@A<!TkBNO%*q&u7(N$BtMP5oh>1lZRI(@0bbvqRw
zwV$~@r_)${1YDM+cAK&-lFxi^cr3;$dFiRVR9~-MN-f9Y&cA%4*B6j(?5Q``WBr+l
z=66ndose+8vMFlk{uRExb0K|0MXm=@PP}rat8-@QvdWg^EnZ-+^i`@l(_&7bvT4DK
zB?^VBbNL=^6pf0Edo)XReR-$Tqk{5ZQLGi-mk+(sslFDdFCykJJ0_7$pS5s;D3>dn
zgMvf(x_PF*YIAdb@D!w&y}S4Rp5J7VM^(uiC4~3!PIO{yJGO4#;&b~ZTK&j*`NrI(
zRO|MPRbqWh93vVozi3*kQ}sm1;pdgp@k`D3eO-Ujt6JapJnvCqZ<G4hIzMm!lI+Q0
zUvj#mv3Ju;i|^6i$HXf4E_7vIlwJL?<Ks+)*4~R6J=V9%970X>IoPsT9N+C}>|j`%
z7$$0(ozIk88{^)QG54@?sL{d)$2IqbtzP&l^Wk?!OLjqrtgnC1hR@}kBx#uQt$I)W
z`xBgfa=K@GC+lBvlC5R8xOF5qAt(Fw_6IvM|NKjwt!dR1#&0Bh^VG`2H-9MI-#zs<
z&y^Khvm2g!SP7cWx_o(A>DJvlX1%VJ+1=iE(xkjl*CRhZGEN}D=4hXmg@Di3V2LWh
zbA9)haKHaI!_V$_<-61jzpUKm;Pk7ONm2VE9zD*e{KVC|+pS`ss8ONc<-D4-P{aMV
ze)E0Yzj?9vw_Iy3<FkA0R#|wz&io){zTkMh^5w?Y_m0R3y^=975?IxC-#OT{<rvSY
zWx;cPz5V!0<M1KpFgy43{JH9Plho^%%w4zVyK+(0pD$mY?>m+}y+e2Ul^c-VRlaMq
z{9YaVqTp?)7;3au_v>|rlHaTnF_)uX343#7H}T9%T3=x|TX8o-HsA7QM%jO<tvj3=
z7ZnRXDbX!*VRN^OW1rxXXSr@#)XY$3#upbRF?JPoaIH~qR-3`F^OmRXwK}C%ZEbDo
zsz;HLHpvsyj^|x?F!6ZAv3ufqcg-YO7I>ZUzi_B$$|nA;TLQnI@ML3CR*zrs`u+b1
zw>xk8Y|9sgc(Jm*pBEs0a@Xy%oQm(H{RRGBS@gN$*<+oqW{;Tc^9o=2<i!)zHIJ>|
z_4>H$<_wYV4#M-dTT}`+bjDx4c-Md5wRu(EBE{z#C2sVVDH^z}n$-Q6sf6|D>)o#%
z$_rnqxr^_dpXh6rcHi^;mapqK-<lI$^?l>BfZb*#e=?=^{?PM{u|HqT9jN6ktl0Ti
zLeqeAp^96WA-m9*$?yN|-^8~m#;nS9-zna+f#G3>LFM1O1g;%Fp>Zes<(p(94(%tK
z-bgT?JiR2fRxGF|@cIpnwiNO2CY6tyB4*28ssE62Ic{<E*+!pz9<7fi?YQ4^BmXYP
z^phU9rLH%e^INj+;p08!XZmBGS#A33#dW>9%4gHruM5~TkKNJ{H~RYQ%N?!OEo~vM
z{I?apS}QSq>e5QDV~c9)+N{`5KISjvGI~Eh=}kaW<2BWqxQ>HoQ!kz7`lxw3yyb&&
z{LicPS7b7~T;p{&e6bHYb?xVi2?=gnliH?U+M#wtKCS;p-mXcKXPyOp{lcTou*OUD
z&U7)3?N%~=)1TULI^{li@G*TtH^0ycTaKeLSMI+3s(d|Z>RTou?#DLje{}E8zv0Z;
zzS&+vu>A~UpN)!erJw!lchU;wJGyr<8!hD%y7BW0*I7URiPxVmy|=IK(wn?Xa~)S@
zGMR*WFPWMoQ)@c^-jlQ5Z#d)h+nSzthXhwV{H|r2qwl%!=063wesflj%iGsqIKBUe
zv`Eg&I~NpcjRRUaT+>qf9$l==%WWuh)Kch>oR!3^AXESF^p+p;|E}J<ul((i19#~+
z-p=#iBwg|*XNx<qu^4Q$IsdXJ^>N)qt!vs0#+Miz6TSyo3MOzZ5jcDCYzOm{nCI#0
zm44n|y(C2^t=#o1YEha%tp;!UV{Tr}+(|Ku&S|T5sJ<8Uuvqc3)T!cqU+Zq`g$`VQ
z7KW`;l-XZ3Elg~AuZivHU*>nFXCKYmew}sN4%S|U#>LamuTkDmq_abFkK>+ib^a5I
z87G=AF<P(Vck#;E?m5r&zH8l-7kHakp!@86icCQA@<Uts?>|WwJ|wk1$KIp4d_@SW
z;Th2zmCwF+Zq403>G<14C1&nlO}zHCamm&{+Z=M{$j<F*LF>OOD_*%?+rMvL=*E1@
zJ8^x-9#8wT_HIpG!kY_^MV>cp>z^yh|05((J;wdN;=RKPdL|W53O}($SN!KH{}#N%
zdCvZsDsyWddW+<}U%E*m-a^^W=HHj;Uz4mRolni0wb4A`ebH~0X=T4x1f3|HyXI=z
z`uC+4*%KI>{<5-M7S4J6HQ<CwgviNf1(VgUgo(WmH9eKP!9X^G`<7Oo#&NOqqtVx7
zYMGnQ-8kjt`ryYewf^Vaf%<R$e|&0LXj}L3zT>>hR%=h5(*HOuYW1ztKY2ba-Z|HA
zak0>;t#bX><#JwcTqiy!`QoM{UMoXRTrV@Z7j*Zvu+3u?=EZGu*WT2Y`mQYYSZjL3
z0^Y0>X75yQw+Q@u_WsYk|Em8zjQ_=5bI53w$UMq&HAZ)dHB;M)_8Nhxr4G}Iy1G--
z)s9zAD(jgeCcLpYy!vCpp_C-<q+s8G71b%Fi5j=(-#Zp-a3a3=znQ?Hq9_Gn{g+|O
z=hW*6BnZ#WYdL5p@}A*Hw%g(B{xXUp(&gtr2=;wRJX6r|c*2H?+bh$=v#+UfOelP@
z+eF*7DDo4Rg3CO!RZ+2O%@0aqCOG@fe%=wNwavwQ^JD2O_Ol&)m;T6^8r`Vi@2Gnq
zC&lWUa3em+yLgL%>8T|z-tAqsl*RU$!Y^;u!)uu`wn^0T#-_AS;Bg5&5+iH#&17pS
zf8mo-{mUnAR6hGwY=3f+MUVMy{fXbEpI?&sYMSGp-fN-?hm_UloBrB4wbJfQslBTW
zf5S?vnX5vMoR0}f_}D7--L`qt@|+KMQtk`JpO9jh!OG}9-@ajWke%+l=Q`IlUM<sE
zQucqz(m>IY*Iy$Q^)JO7{d{fJR9=O)@4DT^_ccD7ol~6PI3dk=@2sQCw>f5gvvSIC
zTRVZxrtGbAnESCGo{dwu&R_R%mtSrb?pwH&?Mln_L|Z4zpF8zy=FT<UDjTyoEnx}Q
zoU2PWDV}JptBspC`)Jb4`ab^B>c3wu>Hk;$_0jx4>-URy@+TfjV~XA^VC&_!a&h&9
zTfg|FpWHsU_wxc1UiHYejwhZ6YDnJ5w(IyQp7mPj^Sby|+}E|{=<(d)a((jgqV|<r
zwm$u}zqI$b7f#t5wCEwTdtGkDlLzY$uACb+FVTkA>1yQzPqsHJT{Yje%?e$vkW%!o
zW3S#u5AVm*EBfEte6V2meU>*TG4)2@#N#KP@)qjH&c3Ys?JSq|r3rcG&&l4~zvhk;
z>r%!W)u*3!t?4zN#(Ctz0?&r1w@+^x&XV5k*X%z3!RCdx8r~bmKXCDLPhXj)vD|5{
z`1P*yN8V5F7XEWTvGM-wZzryPef#=IvV7BLsXa&TdKvwGI@$EQ!LkF=FLp|0yfr;{
zq&GQ1^H@bq$?o=##`D{m7B88$Oyi2_ndd2+i;uIpIz74<TJ)&E-e~pQH5Ok=*57z|
z<h=LFUFt5*zTtU+T{o4Z1h_sg)B3z(^6Ddn<?rU{l$l#Hmoaj2E#cm@;LYSs7Z<&4
zX+Ihe#%jA{`z`60Q=|*mo?=M2$G|#&&BK+34;;=)GgwRAb^4npy7h%y)!c{g3RyHS
z)z2yEZoUy7A+PVbRJTcF*Bv=EF5^cG4eAn_;n`-A8-M=z`_H}pO^@3h0SUvWU&HIe
z7k|#Lo6l$e@#XF&S%Kyty|e8$S!{D3Jvg>-t>k%!<ySStTBP`FzeZL)ufBid^Dd=3
z%+<x_JIiF0j>b$|mRF~;c$wRlHDOnGKA+*qlv<V0DShm+oMp@zxoI7DW;qBiQ4+~a
zzIrO6<YLD!&JFp6>lhh=er{Fc+nE_PM^1VAareDUN1Sf**H7-%Eov@``dsss{n;6Y
z52sQm@%+2ye#^0{Sy$Gi<d3G;v1#vCMg2B7!8DJX<6+;NkU3!yw=bU%{HAzi*E5y}
zY@SDN6y05Xga3AQn})#42Pd}OeY(tCr(P$tJag@1cE9zf<@dPx@B8w(Xl>Z)uiKPv
z?=0(^6}IY6sQQJr;H52Ap&#vC8m-#=E}Z|f_x_^re_!g;`D>G7AK5j}DvIkeHl2Su
zFe!E7o<@O6*2srDGvBBd2pQhkzGBM7ujeA)*ne#0>^ggA$;{5cckDf%CHFQe-({~j
z+pJLO^ma}l`}1w5@4LM#FprF_V|)G1L0da!`YFvYZuhxaW|EKhs@yO<;p7*#d_I%x
zVV@(**3W-<{ea`WTlGCUeELT>%HP|0z;B-v%kCq0-q`)&ahEMs&XRj6GvVvUV^OAa
zmGa^zEN*`BxO20iU~GcA=9Du2IdzTS*Q|P}dDZ0b!^lNJiieArtUAvXwBn?U(?QjM
z_#U5iEed;%=6EHEIB)zN_k+RZqrjR~p{!;X*T_dZWpG_NX<YMmX1K-^i?00dDQ2P(
zTc#AXbtHt;B&*-OdZ^D}qh?T~&Fdhwn_r4^e}+ssRrzveL%QTv^@QIC*D2O1XYEl)
zkk-3VKB=$7?x5XWyN!t%n@;>$mr}6&)r6q*IkQt%pLn1?L3q*A7C&h*+h!}f8LOUr
z`C&J)n0a=k`+I}$7nx^%Hj=#3b9m*U(u9nO3CnICH0Lndk!JgOn=XT|p5JLE1|2<}
z4MMjbUCCu!l`DNrCZ#}qYxwWl!$<$F@t0*iFlSF?<8St|FS2)xa;F?EmC@rW=kNZw
zN&2Qv)!`{uuM0HHn<)Hf=8qXU+5CY$j13GEy&CK!zee&dG<aY<Pd{$EL238Vz;99y
zlH(c|Ouon?JzuPE%cti`yxcCk<E&2vI&yQLQepiuQ#?gr>&6v}U2jb}t<SeVrb~$F
zi}K%^+LY5Qj@6d^z7tw+-Q~SobmaN=GX8-73op-^#(MsDT}j4UleO1mf+s7y{q|#4
zvB2XljfC?TCRX(ah<!9zcb#R8Li`TC#ZPkI?!7s8jZ&4i#KOtv|MBd!-K6VdHu+gp
z&e<1*-62n^4rLymHTC7<P_HFMU$Zwy>CTyS=6UeeQ=fSj>DaRSUG(1nCH_+O|Bw7U
zMqBG&-z%&wV0m!sb5qG}mKo;Cc5}+YR!Y3Syy`@Pa5~2~&E@7U>ht~!O}3kT`Sd~I
zlnD(cicM@E^-|asf|#AB@K$k5yyt9l-$M1elJPf#cEP!>AqK*;pMQz9*t6%MULS|s
z^1Kf=xo@oxxd_kTs8*QX)v>vgb4HrswI!nYCtfb?P;fHgUEisHE}*1t(w-NcT6V%S
z!xiSuST0w{-%;0e<7{uN>U#SV^YvXjIy`mH*(q@5dy8A{SQc$AlHJ{NSzzTAmdeMa
zD+SZ#PJS)azsWMqw%G5TbPm&{>0KX-KXe*CT~X|OTYL%U_2UVXZMQw+`B=QXXxf%P
zn<Pq7`gfiXyD`iArjhpNH=YhxSSRy8e0}7P#8j5q<-eL%*RP3u#T8<jK0{i+SZih4
z&9V@IhuLQX4DK8hTY8Gkeq&F;WDfS_&8aI?9OTVnf3>)>8|r;%DCa$K%Tb1}=0ris
zeYeevuSZ<`@M7}(iN3phg;wO3T!_$ejhZ!o!O54AT%CuP?XYl{+$cG7(p$BUj%O8q
zO|FeOv3;ghm&lD{|61<MQkcI~`uV*@^ByKgUl&wL;yvn_ym(#pnbKP4`Bn`pvJ`!F
z-`bj(SI*Ai=M_0+msfGjNK1Y38wTS7BZXU;O_?Tt+ln7Jx~yk#QdOM7vQcRrt6WyS
z!Vz6npL~-B`)8GQTXoK@U|Fkk_T&AB?<X$nK6aiVzT=pJ)rs>*D(tee^uJZfEv{QO
z<GIJRDyD|_3$0E)&RbIQ)}2}Lj{bsrUy=Af{9o%|aB5thnX0=ua(?F4%&+ga@2YF~
z9xZ-<@x6tIOI~otD>ojM)X?v+oG(<&{`&CCvch`jGt*LRwy_<VrCG7(R%vhWWZgMY
z+8&Me3a(`=8SUx+9z34EY)wS*``Z8hOPZ7JPt^2G+0A<Loci?F6Lu>+TYvaza>My|
zhqD$R_E_4pPW`gSdlzng<EgT_#bIfA263F*_ye;42dX*Wm@n|cAxe`YYD2Qawc5gb
z{*-SKKWg7J1z7#B|8~#XYSWuN!oTBEL(ZL8$XGIiPq@nH@R<(JP9a^bh(${lf32$B
zVs~$9cy-C2_1_}4h2Kk<|9I<GuGO2TgkACqNfPj!=p1y$c+SgC+qt_ho><s$N>X&*
z`}e!w+lp|tvPtc{_&#XqF%hoN_3w6n-+li*_x|~}&)3GE;5Zb2JUfy3??%OUpJQh3
zIyHw&FW-Z~C^CwxfYac`n@_<@r#vlkoa4w)>hY_h)~+so%JpPlWrrCta~@UqoUwXR
zWaIc{(fkyq<x5x2ex$R*Q+xAv4J(6l3nr8%AB}QsyCg3A;QhTT4N6tlEf*;K;i%zr
zNZ#<8g?*0r^1Q;(#4Y(x{^iKu6aTDrfcJ4<@(kH2jYq7`YyWbb*^sgM<c(A1V&54=
z%ewBWKkv@<i!R%y>zV%gQ~Sy|P49#8Zx668jy}8~^%_fMHmll<KvC=ESr>~{vKMXJ
zw=iarikR(pqf9BgX9maD@vK)rptQc~$d5!Rjg{Ts_$FPKf7C1`s4P)E#Yt6snTDbH
z!QEm@>kekDzvg}Updeep#@(7~Je$?cobGwp@BRIEeZiDXcRdtmm&x$g$8zWIU7V5b
z{_(H<zi!<Wwb{~fq0Ey?85z8Gir#!9-?P@z??t6hpBi710D~?^`{xa9ey3O_F~`Wy
zkXmee_{|n2E}iOx6f=gKj&mbFC>&_7yO5|ixzqLIoT+RVlwW_6_*KBrsIcRL@yyVD
z<yzlmm;{(^D1DgWr?=Tm;_@S7%`QE=eaq%=yS#M|o0-m)jrwl4(>pfp-phDu>2yn{
zeR@r|b7X$*WpOwnxh>Z!x61Q>T?#vIz=~66wk|%cYv0Wr=gaq~;iTx&V!elFlwNn4
z9(_I2>bXb?!*QqewU3KSe!b)mtVx(6yF9?;{3k|@&)--UZTe!q`Akdfl?g1o8z$~^
z@UXa6=e2y=&ZS4?IX*vc3ShaJ&7$-0$Zw^+e}4Aw{V+L1#O&wX{Q7zKf4^WoIqQk&
zeepLlG)z-!4$Tbzy=!wgzuqj#L+7d)`Yc|GGF=W|8Y1?+th!S5+A7y~{5)GYt{-0Z
zaE`-$<DA*{c1Ozi9RzM#xO(4uz;kiC*msTgU6uQF@6~k|X>VpK_$4{#rQ?d6q)C&E
zum7|=BzJGeAGPhX7TlMO^t@B-DfjG2*5Z2)FY{b`7q{1C<?P}+Q5URD+{~7q{I7Ik
zYOIs|EzWCi=kEThXZz`jw{AkfRH3j(zZ+(XrLOxSWBXx;M#IxXPk8xkj<6q#`1fj`
zfZ~RBWryS2%L5W$s(ktJbJ5@3-**PAeZVvEp3{|+)AQ~gH_PAQFEdTFa!2OGTx;XU
zr6;*B{$|tm^!)J9$vFM<zW3~AtV$9>A6I?ZVA?z@Ie+oY7_Xeo5)B^`y9^I>ERNw~
z@3Iz{K2hae<jM<w?!Hb5Tq4Zw^&??TKfjcVO5&7U-KW<zyiYDynaE>uS7AwS(aA73
zo4Forl7}9%v3>ow^_z~O((i=(EIZFU_`w=ky?^WWQ!ES?H*Duz+_WKCq4lw%XJLCi
z|H0=kZ-*a^IseAlexlCRWKGVklbiLcnH_~1n)l^@(Ruwe(bn>=+&lRx2>}b67}^t_
zyO=#zsCu{N+EyWx*xNjkPSw->nd5x5IMXvK-|5+(|7)0Zf3g2*O_}8jFZ*w};v8q;
zI>F<_b0ao`Mmbrp?>}}&W`1v9<F@1Q(l|5g`^WuKI4kS~-af6{%AWXQ!Oa)jlO=CR
zeK*N<)mS{eOX>B#>y65?8Lw{j@38w4+Gw&eNGCvZe%iD<p>KlMx|jSoBm6}Cb>yj<
zoH|_%W7qmC_y7INzo`H3biKRpM)!|%8Ce2#kN#cpRcq<dy4)+Oh62|@6=aqLteL*q
zpfO_q4S!a(H;*P+h6HlXU%6pTP#S9x%W08!l8>(2{$9NQNcHP;yYJgiS}<X5)mq<n
z?LroY1M?2w;pd3HQN%R6VMB9lM7r{kI;WkvJN}C_J1kcV;IEYN-!c0-m(hk9?~~GI
zHp&}iMZ8~e;qim@75ph&2RHEN@pEcj_j-QuH<!G^74vhdOMU0=@p{bMXzOxPvq92M
zd!vE(Qm4K~m8c^L$4@P_*{@#Wy7;g94L`o#`RVZr^P`m7eIM?-ldxs})6NCnGiT0!
zkfUnn|K6A7VfU48H9iY9v1ccq_J1mOXcMt>^VwrR!+YWB9mPBaHFIs>y%f)8Sb9+U
z?TStRerwM?<+fGl^RDMt&Si)0QJX&FQ7LCy(KNS%Oj`?=IK)0L*tS!WX@+$~Lh<qV
zEh~$%WaPV!>Y6U~3CQTv%~|7D>-RP_E_>;bs@z|P4GI$4AJvw8`zx=$J^uR1U`uAh
z>fg4jxDKCoU}iu6O3Qjp0@v)l#jR}qaSt{Hqyz|9>ZeW5{P`}`Zo>zwj1tk7<fl1>
zAv2B~e{6ZJc$cF0iISV5vvw49Y95L9H2eC`bgOQ*n&Z^|)0F{9OK%6<*!kvB3!6yw
zivM3OZ`opS{)p`fgE!nK-aT0H@ZTa9k#-xIpcJ;>$IqQqNC>|EEnC9RXpX~GjsG|6
zt@no2snxq}?Fv03>n%C)id^iBT_=~;WT$t%QIy;NVNSt=!<%~c1TA|~lr(qlho8)I
z9B*m6GhOfe-T8)p(fu9ItG4X@TiS6f|Apk^dD|CXaaVim{{IH+S@8_1>+<5i6?Sep
zaB$+;b&~6y&HU08?rndwz^pt%`ttUBSD(0D`=Wh)mBK8UD-&&7w&~_u8z~hh+5da{
z{-5@*7ykc~`P!IYXwIpf^0Zd;A&0jlH+SpeyK^K{gft)SDebg;EyN%+pZO$rq;AI3
zd3qb}tWy!Q+-;%I;E?mfWbcQQ@lQVmPI>6*v~O`ks?H|);LE?Re7}CC*Zjx7!*vU8
zEisMAU^*0LE@Qrb+qd|Fbw{nbdgqvX%}fn-2wu~z5zedQ8>hazw0FjF-E-{a3Wp+h
z{Q1Q5+w|m9*PtA}#K-f*&5o^Om01$sa)8ySjiIMXQd4fz{apudt=>4%edb%K`LFwV
zFZ_I7KV#bRb-@7)F0QXR=kEN;xBmUi==|boGPjS)zg#%Ee}BKDiqVWS1zOkGHqX5!
zJIC<7tfjMa`n;6buoKOiPenhf?pnDr!ZNu3J@*3c+YA96TU)a&ia)aQwb|rMjlI47
z=-L(|>D&dYLerwOG@soJ$i39&@pFUD%5w{jWPRUsIP3JO+@1Vpi*)&FLYHOEUc<Wl
z&5n3(?isIpKWoPAkqOPv^fWzwIN56A%v*79cPL#u!{vTDXPsWz3hRkywiy4Az0aUB
zqo&y8-w*C5?)&3cE|{7TnfdHnY97z_Z7Fjvyq`E@r*HYa>fXim78iJxb^fiJ5^2Pz
z_s6>M>m{q0weElVlgl=IwN~=(c+VM-k+QPI*rM{U?m50!6Rpk|d%YA?b?x-oJ=ev4
zq2GJoTd%c`@_bKue4&qb{^M62`#y4qtTjDxH$&p)hQBg8%Qu>MPriQdK~L2A51MKw
z2h)?!DljlOF?x0>NJ<DEZB@Sf^lP!FVU^bR$+DsBEi!c?d@bQMdR5z{t_of4ik!8(
zdM;Pe+t;62+1ZV>8JaZ;n-5R)Jrk5vcuiyCvG0t<djHs@ChnSh!Pw6_?(z-sLx!t6
zt5;n$$lKy6P<(!AW|T$r+KXCmj4hn`_A)*9V43;EX788H|9kcvJYkhpIi2B2e*Jsz
zFE{W1jz22*(&*jfIH^^_Oea72oZct=bq(tp(RD2WZ_L>0B4(e_(PH3ckS$@eoXyU}
zy+-ummZbje-e+GhS3kJ+^!iMb$H(iRnn(Qaz3I7dv&KH@oaTRb1NwS?=RW?o?f{#b
z1K$xxdq0~ykN&RF<}5px*#GcJ^4)(I&i^g`bxHo8*!0ZDyZC>{BpL}>{NEbNR;v-Y
znp@$*n$ROvrG@n>=Oj|5Z(Dr$=Z2pq33{8R2&FJ;_GmlpQfYb<n<rH!(WrUCc7c<M
z-kVjn0tOvz0(TD0auwiFT^tnWaA$f@+x6bwt&VF|PIGBbiJ$pgL82+}gbZ7?U&his
zVynWuzMPu=Kjg-*%O(GA_J6W$`{a|dxAsu~DV1eMtaOcyH9L|O?gy=p(9}Jrl_ET`
z*X4lZa~TdlmCUHg-(~E$Lp^`ZntnQd+9@q2iFIayX*o-S{c9SG-~5pETEQ6C{gNg8
z!kuo`+cLR!>(cU<x7auRw%0h9*L-W~90j2pJbRl~9mqU$DC+ElTcXkX?QY)>4(|PM
zoPFmbr|-veZ|~nR*Szr2BSA;zzdCwNrUpFAwyO!woVcu=^}+#xDaDf4g!ZWa-7xJ^
z+r#9>SF_yQmVBMKg-<4d|1j5~hZ~~uFLW0BXYaBX;yLdd^VBVOZmR#J0~R+|`s?{@
zX1--#Rwg^+Sx`VB|APw^M;ROIoTtp*mYrH!T52njEqs5osdq=^0Y%P>-vZXmpX=3N
z{Uuo;=~nftOgo9|tY#rwTRDTfc$TN-7p0h()l8EOpQ7g$xu#-**Gt!Pac`d=%t&Ed
zzyIXZMSGce_>3gB6g{hWbm}z^U!dNqh>$+N!-<KptCme!_`yjmQND9_RP}iVKN~rF
z;aY{P-c3uMoVsLXu;Rb({};+q6I@lQTAv-2Tan4LZqCNiT^jc;`#(*JYq%r2wx*!J
zi9=8SXOixjO}gJFeBF7Z_Sl^!mxG)1Jc5@Ol-o}>Gu<Y(%VvY3H%sbz)lD(KRz$95
znlfEesPoR|BY~k;nTtLIbcHL|Yn*y|E?eoV+1i?Lt1}E18s$&!g}mK$fxY)@sMb`g
zCa3n*-S;ZLzP?iYNN4Z=<8>3Y4&8iqFXv&wcmDp1PtJZ{am+~AG%7A?LPA7?KOd86
zYQMI`ZO0Fdc6uL-58QkwYjZGLL1T{oyL8cP=7T$@*S(v6@&5md`SQDDSf4SKow}#P
z?GTarT>iN+GcV(gw~X>rPl*<~Ey>7y))&~Akj8ORp)qqs(pk%zCF`c${uAjt&v{L6
zPSM1<RSlaj7M~ATQr>Z$X%+8*jf}s0dW^5>IV3tT>}iV#zj`(F-OQ`o!*jPD39>%%
z<^j*4+DY@1MHe_+ZJOg3_nmw4^&guBK3w=cZKMAKdxvLA0@6v+{bg+#ITNIoiY!g*
zN_o#U;qcq^b!^ikj?Zcn($)7X5_Q{CKjkm)-tEza9j}9{emr+mJbzuKS#{GdmftMb
zcNi6~eLCx^a+z{xUrLeJ)h+pk{~w)sCugN;yk?z&X6f{4OPmufv4u%2s+u_^?d%Dm
zPv_t0+{%b$@_YR~=PS4F_tMbUVmni-Q}rw6I;`F1HdAK8Hi2#*b2STr&E3Io65g(A
zar53NCw!%ZMe@Wq^-H@`MHt&Fw#;|>o9uI4$M}kDRq40L>u*<_iQE~oq@bo@Yj40S
z#tV~TW+nbAX)cPD5xRT#u8EaZR)Dp$^$E?M4_0k9AB|5f66id_xY5Yo_2!jJR?BBb
zew%YH*?xPKn#jyUVQjV?@&2*9RroU5MT5Gh?D)K`;D^dto9PE~(uz&k74{aiYbzc2
zkyie*hgtGiO~D_V;5+X{XS^zz_Hf@K6W*ok3(Oei1*mmhU$5g+^i$*Crd5XBi|)UC
zcKiP0_qi8e{9(R0kNNW3$*(t^Oby<n*Ls=ZP@j|CZa$tzRZUC+FPu&m^jzw+Oq0Iq
zedaCGgD<?jfi*u&rmkN7=Fa=nG-sw~%ha}C3A@Eyd&;Y`y5j5mBWIc(?P-o-TJ-Jg
zG@UyOZzrwse7NCek5|K1_PYL0X0Ziv>~(MZn@esN=)O4ng?l%f6Hi0-l*^583;sP*
zeYf-y>zj@2QS0>uI6lO^FF6}jebF=i_nG$>Zr}ea)P4JOox{|FcU~IzPdNS5M2kV7
zCP3OWYiYyr$dvL^Z#s4O-z=MV@pF>wyopPzZ^bc1wDO!~xBKXCvV3Rd39|sM$<9WM
z&$&)5+<fR~``NB9^A}At7T0|6eeLRFhQ>Cp{|a1v`Mk*XF58JL*{Q~bC%&EKsOB~>
zE&CU#`H|rx-^MrvU4{?GS&UX?ZCG(wzmIR;lem1gCY{a3x?A&(W(QPBNm-n%ZJ$~b
zRO9EF|L#dp${PKU>OCL%>lfd&uS|M)Kj6KFE1PQKbbFb{2U<6ucHjHg`HF0BKw{-2
zvAlifF0pTtnZ4uI!*fsN4GejfbWFI}cE3>}sVcKiszEqx`o*>YAN``R38@Ax`<Vi6
zxU~9OmOnViGS?yN^Y3tV*R}F(jQ7~eCVuX8cz2`q`IE>M(@Ssf_2F4@x^v?v=6BAq
zUKS@=yyogmP2J>RAGdZr|BEf5=6A{?PAz&lW687pLJ`dy#=91#B+X4e;xtM7kyG=m
z1Ddm@<wh-8bEtdYzE{Q#kNo;L(h?UXGc2jtm-XqGlW||4d?$NJ_5|HL(cO1{<*$(z
z%gdh8#J{p#Au3X+;lq>1@=ww}s7ak~O=JzYxZhglX@-f{;ls`$I%2$wxfid^NKsz<
zG@;6p`_!6e>iHap;}Vnl!X|9FpPJy#S+JO$t3`EfHuqmq=f~+gWCG*63nrN@ZNBDJ
zVcaczXyLBYzb5P}ke}?c#VX!;x!lt0asRZ-^45mEo_F5xRQIHA<1=FFo`oV}GRGA8
z3Obx+uQRfn&5v9ronJTm(@W8_6WN3_dtV;=XwH7~wc<=Z<(k+T!VS-^HOItHpZJbZ
zlEbMo#PIA*Ztrg1j<WCFn=@yepL)|eod1jUgUtu@xYVswukji=yg1uDPuy#}XJB8?
z6_y+~t(i*#?%z<0^qv}|?Y(8wCMUr!M`bsC;n}oNY;~*afx@*_6TAi2`4~=4sOG3=
zICDDU_$Ha)SaBOpw&p1!_a##&yzSFuUp8Cp*KYs+)_U@`r4KXtW|$m3{o(%O$H^s+
zkLgBTHM+<U@XK;pR)fH~y?OCZP1m>fRp@5_XDlfA^~igQxZm&W_@A4dRcBtTwKyaB
z>)wTX%<XblV>o0URUd81H>!QzW!A68_D15!HKVkkxQA-t^KO`avTolHZ4sZh|9960
zZsRX!-0S+BKGtnJzM?4Ts;M+bS<sE1A1{)Fz6Y+E{pFADxA|Z8r7}1Q>?siCdUyMS
zrI&t;qJV4CU*-y>47NiCb6#@<`EmzvePBPN8lTf)&o3nWeBMukyL-Q>#qO?}dPwkv
zdezBSUkddX7yr=7E>4<L^@o`!t#IE0do$H@5-dU!JKggaY(4E=d}w+>*ZVWCBV)`D
z7({IUT34X`!-Ma}`gPf}Ix<3UI~-D~QSh#u8PX6LUNJxQOjH4v9s55!qw?qz-(TKZ
zr@$E!ExGFIHZIi@jAchn3bd~;&MGdxEpODmcACh)c|1-g<$N4pSF-e4DTyWUZOS>6
zr9RbXX-(^<S;|YNJ=SL^@Zejo6MQk_+)abmfe(InSUr0G>GbEA)jb~Fw`v@uLj_wM
zSA{pE3nc_Rop&}l)71QgRL<!Od7@A4o-rR-croMBgCCan4!n?ecyd;^XYcLDizit$
z1SpwXSSWZm1ZkGNVl)ft-dy9*+9E9bQtryK;MnvWhZ`5|`WZa<FCX~s+8>zxA=~v#
zY+mI#gF`b+Sq?2>$lshSA~e(S3-6-yOnuvKZEJgYqKv<%=sd@%kngj$uz#0XVxSS}
z@_y32+0QTjl1^M7n{>8;lW*diteq}XgB;nyW(A4tE6<qn%k6ymo11svAHFT#_32L2
zsd)DLYl~&Nj+}hTZItM-IBek@21e0XE6<qy_5w=^)-SPsuCu<NDeAX8zmpy7`~G{U
zGu}^db4z-<GtKRZG83ES@9C#M&T^mNnZ7XgyX`Ek>|iB^sb|xAS2Z4HXx;Uu<!aV_
zhnC~#c(RwTYI~yfYi^FuhK(0Da<w|~aLvx$^16zFm+#5*f0zIJ&Hv-R-|b(*jDynI
zNx%MFxqshXxLobW=Ld&PX1`uq^W~LhnQ7=u%_pxILUK%A-D&5kW|9sPUcdXt!}$wq
ztQ@b${l3-M?DSXaYi*eB(;J0u@-tNg3Z))QJL%=Kuf3Pg@cXKD6U7td6(x@ATvhku
zJfNED!NBo(r%w7E@1Ht*zrH<x`Lq3}m8Dm$!)};lguimpi&)RKD)f@f2ad0OAL}3g
z{PHJPtMhr-(dzapzkuoXr|c{bq@4fZs&|&9GGel}$g4BQdTN`eF}!K~c>LaRGp;%&
z6GlU|b^9E*E>mi_|9i*tf>)o)Eee}+9-UD3m)d7}Zi6PH!pD0G?#>H1bVV=7&Dr%)
zt=%EONLJeBXzKD8^J8_NR(4g)m&*uk<T>zkdb;L?>L%7(<|$8h-nq2(eY&(z3eTA>
zL4H~5ikf&L?NWZfyE^OmzvE$3RnMGCoBpYx>Ni)}+R!)2tAn|tPNWNNVYAMCU314?
zL8P8zimZTxz}Iu%{SKR{a`*k%G%ah^im)qct}<U%#mw>3Q~tV9Q0wWWIYDf!tNixw
zo-50F`0A;?Ql3wuDMD{^>LYZH?>;HZ$NlA+z*A=K2tNt4l$RTyS!RiJ1$bJNcDNlf
zNH>y<nlWE}{jsFThjOb}>;u@I^1Ag-GJRLQa@x+8fcMD{XVn)TkWDw5>31yb|GAi|
z6`6BVFKhd3dBFd@V2ezjah3jU<K?>q3X9$?+hK3~CuT$W6iN5nr<n_XEY4@Hb%`w0
z|IQ<z^{MXM-JPpu-nTMVVtdql$GK@uXmIk3*5JKzC!$P?ChENs%+|SNziex-34hMN
zk3SRIdCK`WIQPjp?ahri7aiPia7M&)xw0Uxm6cl0FHMQ`l=yz=>8nL6epFjH@2H>A
z-NJBuZNrBJZ(8T|USI0IqH;?PSCfy=5|sw6hV1HF?&{AP=QO)oKi_E1x4P#~+_sL*
zO$RNG9td0@7<a(VE6iu><2d)98ab)U8_y)!&0eTq`^^5bd;P2Fsr9Nx`;*qU9ZsAz
zckWcx#;!94YtGJWo%=LM@${}GVXN09G}Rw=R9$y!f}dp5s}l*kTOa>9!~ef2;=H$s
zbz!UVR(8n-!E-YXn(!!SG{<UvcY3t%xSRab|7^)Bx4d=LR{FG8><hK-UwUr!?$fS&
znU!nOobQXznj+R7Jx5*B?(oH9ftt@U{;hlS@$%(kKXWFXp0@kA-1Jb5s$+o+POi$D
z(X%RM-?VRLl5uN4fAP^<^O*(wug^)pda9%3<#F)l!tK2;_E|rPnDCJKq{KCS6GmlQ
z=NxTDuEM>3YmevuI`w+WX;Ib(Ym6*<=kC~WF5jZ?n`Tkv-<Wy*L18h%8xHPFw?DSe
z&B*XP7wg7@g?843dXHu;Fe<q3*%*7XS8aNs^YOr&3K{yHy0dkbyZ`Q2obe+yl*#c<
zG2<nR=5`%}H_cZ!WnZ8FoA;*V1WBhk&Q>=U#4)y{FrBJoWV?82ky#lB$5)Pslox`U
zzgC%*9-37ht2ohEqoF|j^%REQ(?4b&+N;#jwqVbyxanuF=Ba9J?z`QyL`i7j^{@69
zPAXkty8X*DJ;3;Q*?|R9mFFC<T@WJ@6~-X6$!E%z6Pr^`aJML*VK6r|Joq%0W6PYX
zN6lxF%AbE)y=Q(($*yhdl4Q>rda))Ri2lv~-P!+*qr{JU1yxV)G+Yg}DD&n1I<Lwr
z&7UFW$}=|u4Y#6SQcov;{<Aq;#!g|{3zb*vjD3}?cAFHhPM(%@yhC87%)<z`$F?G}
z63c&_h_pL1d)9$Ht4?|>Fn9UpzSfh6rAblmsLRTwHFpmxNXX7vpf9#Sbm^+lhdPY~
z3%>?@uh?_Pnj@X%T(Q>7g!H8=Q%x^2x4%Ejv!P38;=ZbvvtN5H<X3Je3HdJIrDj;J
zA^Be3_V&g#VOO7IU%U0B?^$``g!Z6aKQ{C%N%p;=8*}TLr&a4$&E2~y?kalU%KV=g
zC-nL9muKJi`<<_U@i^&xNTiXQ|E$-07hWpN&w5=naasP}<D$|P?%S`sPt4$-zSFCS
zqx;%DrT=m~eF`E6x7vSw=wI}K^UMXa;|H7GExUG{!+y=2*oU9?g+4Sf+TmGVJWX+S
zjM7yVhBpbNqVIIw_y5RRdf;#Us)ApM$9FLq`sHny;<=<hdKtsJUGr-iJ68ty^?hww
zV{%Psm6g*)JGH*aGgEFxF@F-D^6ph*tHXEBqFsOIR5AyzP%)eI?Uwx8<yZdXdflmY
zPpi7ySo$f}R(bi(eo01ig9**;3*H}zWDI(IXLffhS3Sd879O|NrCP=sG08&D9yqR<
zUj1_7&LiIsSYB3Lr)(uLeM#1#`x$Ek7+*NLaUDFd?9zf<#rd`-=6PGRa@p6vd2r+I
zzQbDIwr-yunfbK-b`;mCP|f&FbAJX{ofkaO$Z%%n(}+9#b6SJV?<F03U3|W-<+^|E
zR=1a}xA*iFoxXhL*DD4_ff9rAjJluy119gOU1qYjY#ZP5tf|+InCjjsxt-vcqHVc1
z@!!t46LwpkrJgT8WGL5Br*OD*4*MLlDMyZ0wOdq$C%j6Rm)8g_+_9iXL8Q-U^TRV=
zcq;!oTK#<SStheB`0#?rJ;$DYn|NG4&RwW!)9y6}{}PgNc%5u`QjF%Z8MS1eTX=|F
zN<y!+?M|OynPGl{JgdZ!*9G~9n3wm?n{-a$gww`<f@P;Z-k6=Url+h)M*W`kiHpe|
zi5^J|+RSw_9~P*vUvT9VK2`fb<Z=3T2H)6w6DsC9Pn#gS;B&hv=K))TGQUmtI<wo_
z=9^A7GHN&cIQN2ebKT4<e_~fnJI%J>%J0JwRSY*BH~d<wb7`yh{V4TS>$0E8$`<Qy
zZf{S0`|v|^rP$I`juT}}EuVVqe>p7JyM*iYbZ_s>-apGke|Wk@^S|HkJJWrx-mZV=
zvPC%DUi_K-{&7!|Ui<?&x7}yGp5Ea~Pyf=x&c4MqPVedQ`(D4Z6OZ$Jj#w?y`+J=S
z^O@qFAp3>`%j;eUf0?WQNAUZRDE<jLyq{S-o1Cl;-scRB;`sG^np$S+E8De~&V2E-
zdK-VoKIE-Mj#%>g18g^s{OtM7#n4g9cC4hqbxP>D*m~bn);CPlJl5W2aEY+k&i&H$
zlBAdC@40KDHZt0NigIg{Tp+mq=yQ*-^K9Siy(a!*6W#22Qbemk>JMwmza=p}Q>()Z
z_a-ddH}RjC_tu6je6!Z=Xq)Ih@6o5AEn-u;T;GZ7JU_C_g@3*If#0hSy;&j3_w1l}
z^xCzXV%vJve8c?IdrB$}otZVuUq3TA{qChTTV8d`#s1Gx&&~S&{<*epab}3rgflmi
zV-M6Zuq-kWcaS}7RWRxL!AoCstDd~%_cYQ;Y_>U=r?$sQ()v%j`}8LTH$R^2VEue<
zyPg00y`NHhL$jaz`BdLrsp*>7_xom8LCTwNk2w<(cpMWN{v8b1a{NNyLyg%62Rb~S
zZ_eauOP(X!=*-iYnLhot27k-JrgaxCygYu>F;jKg!G{wB`;6xlwr}gds9v&U&NJo`
zjZ$AzlmD-EVs2jf^o-G7Y~FtFpHm}mHnTs>Vq~+_F7L0ZzhU7rVQ2pGs8oj?=Jy@H
zl^pSp5oq5ux7w%ckfXzUPWMGe4^E7nH@Uq*UqR;XhKYfR>We2NG0DVOpQ@R2W=n-Y
zqpao<n@=Z%W13jPtSs)vG^y6LsV%g>re8fvr1IZ^#C5MF^Vgd9Xr9dt>VJ1PeBY@S
z_O&ja><g!F7dE)Fi;e%%wgVHZKP~nDAoDV3^XqHE8eb#(^Uub~n6}p}w%c^(z(g^H
z3&t%~{}X=8{Qg@Pm+T{Q`QXnZvnn6&*5B+<@%@74r(ez@Z(lyosJ7dAB3nG6E7FxY
zP)dl;Vv{QaQ`ItAN%Qp#tvi=$UNb!UH7QQgfi3CHmPVPA@-LT)*ZrzrGX4LT`<s35
zmG{QxzGwe^Y(@1K!=klkE*?7Ty{CP`#7`DSek!k9tuv=)j^k!2#%Y?C7mL_9r2n1!
z{%_v(&W+o)Y<9j{<?(gPrZ@Uq*CkKOWwnhdUCwGyvdHCV#PiqhrPE6p-Ap#Do9_JT
zNxIi*xxB3TSG^7#KXd$-<kIk#f&)HT8Jl<}e3Lr&t@A6#!)g}(9G#C!Ctnrt{)lz{
zY<{cy+4W72P91yxeq-Mb*>g(F>)dZ-S_HHuaB`$d?#fzY@48z&%&PVytCV2fysPpP
zKWoox_G!)gJ&Wnn&OM4BYpz7_@0=>RE%brghPTHA4zG03y7X|(o4MurYzxn9WIpa@
zd91c2=CHn*jZAGybq=5Td;6S6Urq@<{XFRn<9>OuV+^&L1z$c$SyXNOCoIBIZk+t2
zt!G~auaPF3^1Npz@7X^;ZQe9(LgM9{ZX4GfSf+OHZWZ&<s$x-3)^*d*yZ`drcre#2
z>$^#b4!hDj_DviNEphMV81#MDbG+}&PU>A<Gs(NlVw280^+m@O<~%&bGo}B^Q^maE
zojad%@@K4Ec;@6%?)CBq4wNRW?X&+i=b1({?^-Rj2LcZLzYQOHbicp4Vyf!T_I>jN
zH8@)=H#a^HyjS*8dj3<ROJ&dNo;L*C6rag@Z#Da#>pOBH?mRaZxA*AZ``<l+Ez$aL
z)>gTtXIFiFd?iJ`kBwz&)-;ih6zkunv7uLA1m^DlSN7~8+w_KQ--Ec^z4qLHegBVA
z?UTuOOTM-CPgc67R<-C^`n#Z5n=1En0q;AF-#8SDx!LTPGv#TtPFpRj!5Q`ETULpM
zGMubSOE}VM94PdKi`Am~lk@x~;ro85$9$_2cyKzw|Jgq8>C4)$Ke0=BvphlLOj+uq
zXQEjPwwy`Ywq?sY=a3sG+Mb(6?>V>r?xDQ<&-JhEFZ`XZb^DLbQf9^ZUPZav7^0V&
zo^T3spFDH*)oVYxS!#G!<^Dbqu>Job<+}g;mkRPf&0LkjtD72b@tSA$B6j6F_Y}Ub
ze5K21^M3WF)Fp|fn`Ag<B*gA!YEhXj{I%WkOk&?(Nr7dq$C&?y7F-Mb)p$v`V~Utb
z)W1y?a=s7CJc1+w?IU&g9~RzdIQR6f*7TljZVHSYa?cubWW7#&;gG7*3GCBeyzsU1
zoQzNI^6bxU$xBbDZT_Cb6r5tlyi_XVT{))!OPjyNqSs1ic6TT&N>SNd(0(we<_XhI
zR*zL-U2}AG9D@C9-oJU36c!~`@V(`v^vlEo?rDw;8}#B^79V+geRKRd%~KKV$Ib<P
zKOnI__l#nckimO~u7~pyA8$Qc(lkx{`Ha?(i(cCtOqe6tS1<0~?6kh_t1-`$=xX+_
z)w^#CS01*#bVI-V)lQiu4z-hwH?EdRu=@Ok|Ke}EfBh=f*~ha3c-nmKGFuuo2=r-1
z{5oY+z5dp&p6n2Z8y6fV?9!~}h(2&X?SaI7?ga*O{mN@(-!Qzp{C(diNh!PECSQB)
z4t@Ej_g+WTNP9}$yyY_@cAHJ}&Mf-C#B<nfr#zEe(mTh`>%#dTSh5&=>DaH6uUhuT
z;oruR?^?bw)!viO-T2PIc-ySu;JwS|3)uEe@eRoO#<z2hUsq|l_et^g!y1Jq?yrAY
zs4+y|WZM_`?yAp%9BGA_+8O!m=d#~Kd!D$NGjVTb_N*g+nGdG#by;QX;#c0`nHF}s
za?{JFv%b&$W|QC;RXpQyqO{dbwhp!hqECvdEe@Tza%uB+jjfXmHpw<7gcR$Uy}Rsd
zdPBssIsSyo^{Kh`ZyE#+_!u6E)|L6|>LRk`?klVGNKu7sPbQ7}5Q_$NQ{^>zbrZNg
zoVaAf$A8+-;org;=Or2n)U%feC$h<D2)mw-%_^Lg_I}UtzGduNejZMakz-0YCFpwg
z<Z;KO%cuWu4cf%ataV7z_VbNmpH|*7tByKnK4z;Z=R=lkg+g;O1SE9)?mye-=j|<a
zTb`rvnM~^W%jWl&Uf=(3yBlZ8>zKEpnR(ny;_cb<rd(xOxo(4s@9y)(f|J;)Ov>Lb
zEQ@oKRyv%Uu=Qz9T(y5Fb8*?Hj>=cIh12|EYXTc)73<nIZPAP{dT}~3`SS~leO_x1
z*aqvctqc74d0)#K(buxk*Kd5?_948a)_Y3-BL5A-4;(v<s($}_W&cm@@2C7f@n?i=
z%HB!7<9ANuUm#=~dNpX;%0GfD-Q&f-Szgo1S?g+%`%$>RXqohUg_ED9UNdTcaXh+L
z%KE>^RPV}J^Y?6B$6r>@(ECRJSox9CWzX`0^$d^RteT@eNoc=Xr=QRE^D@sYX4x%1
zdWh#vhWN&A<I5I@Z*LJ_xRYb1^|TcZvprKB*p?P`W|lFjF!xva+wd>bv6Jsn^SW#_
z<FL$c%Ya=sR+yi7`09}lf6TrsZ*tE~c=7wH;v81{8E>}S(@xX5eB<Oh*@eM8T_xQY
z4<}S={AQ1qb+#z0*if+5^<j~f#oHH|mnEM)e6Vok{yE-7SM04S+%AXQU3GBJ%0|zV
zNgR(v)IuCjKH=-EiF#{R=XOEij=kT%9|mXd@AWD!U-#kQfu|V{cQAA<_Bq>M6coeV
z!Su$D|K@HRw}cN0&9x_(`sUR(owNUMc&Kv9=_O0AxEnYvem?(M50}ivq^yZw_f8PK
zeo#T?UxA4pL-O=xu@TGG|GEBuLFc<&*UoYuP-v2^{(U#(+C-xxt>p$Xv9U4-QUek<
z7rSvV>=gcy#cDPw|Ij9}oP;7q?e7c^cQ4*9?-G<(-|>ejqS-*{itUO2z27fH7Qa{j
zQ82~Gxgcx7_0_kcO3s=TrUkueYrc{>zl6`rWM-wv|GaZHw_LTkFMl!L|2_K4%J~2G
zGj(q)Vx8bMGxgoeW9K`UR`O-MxFo*d+xyF2UKi7IR8KFvzT|!4kJRV${~CDnHC{-L
zpW(js{fx-Ab-8ZeIvqFbTCUC%c1k|)xypNvtyizsR4rM}zaqsm4$B-nurtni+4+m5
z?~S=<wfMYBzFaUz?Q(Mt^Xn%+oTB7=Ze7fHV0!e6k^8zC*Jg`s&N(3S%!0w;L~8A!
zj~lGtOo^MZ<jA2O7VWN-gI`#8ofPi4w5q^C!H}_6`OB6q=7r_At`{6z{j|x^du{W=
zcFW)V?sphk7|tH@bZWbxF(q)x1>F-VAM{IV-mLk#WoyQoEWvYAchA0mSWm{&;*HPS
z`1S95C-W?Pkg=a(MZZDo&qG&un>`eS-Y+e<zoOuSjE{_RKikd4)1zmmo+{|}Wm5a{
zMswO<eg2ePb%nVC8Q<C-)y!aZX4QIPe8s+|>!3nalo;!Vvns+NYs0QFPVw+rQ@h^(
zRM-`*FQ4N7?4P5Uqc3{2Ve@|ecn2n--R?rOa~5B6Q?F?_+`H+9y4{b*CKh##%q(VV
z#S>gKc{pyLi}3unSxr>wYkBJX6|R?^m{&~Umu~h+<G*&pN6=tZ==S@c*Kd}QJ9vV3
zdgrQB$NqUwt5`72@{XFqm3Zc7foqm0ZM<>tc;HPj|G4_@eIH)dd)xnAy?>>lfcG}L
z6Mq$iU+X<t$+XRNlH`M<C#7?y&wLtrgR`{TmT}qrADzd4*tH#v`}f=aSMI5GIt7t0
z=OsHOzMl46{pGja>o;ui-tnE~>%5vt)0VFbS{sxw&5Nm%b%{oZ^h`~s;u()MX1PRu
z@|9ZsXPN6xk5`WGn4UA8dbgI3S>)D*18a;UbJGky{!Y^K?CdQ6ae(v7oCOvdXMNY&
z6wgSGXK!G#ez8vPU8=Xvx$HIdT>rU~Ce0I0x3rGXeiBhG;HRANWU6jRt_ZKdp~Q>d
zH^u4w+%UaadT&tGO+Ay3TP&MG-0M=?IHMe7`M93z9!ywmdhH)0NBV<BUenIrtu7N<
zvFXo=wdIi|5$DCKYZ<%vdki1C21nZ$=uLEW>g>F=qA*`hkIm8kIOE3dL!JA6Je<Gu
z;AQ_4b&mcMZ1(j;TsQpGlEk)=)$8j8_17PN{hWAK<z$zf&i3gy`5!LX|8cGUrR@0M
z(*Jf|{#&y1Til1}>B^cZVmn;e&wbwejW3S>;)`W*UF|*_FRL;<+}WGjJDVl_c4Oe_
zRZ5GG2VOq8+Pp;f_*{c+E2Cz<5aboudU{s|qrr*&3*z<f*sEp!Eq@U4v&QH|z{(IS
zwta!R1wW@wpSj|-yWQ7po;QLW2cIwOnX|cBH&lGb{qA7%%s&^O^WHtQP1^fy)6GdQ
zFP@6L%m4q+{ssE=zy2@qGTg6UBoZSPuN4?LNAZMDS^u1+_da&-vETW{C;8N!eRGZ5
zEzcBQ_!jVr|JKg6CtM$%trbXN*X0Yk;GPlBJ@1yl*`SqM;~npcR35rvnq{iR?fybx
zW!TxozV^ZwOIr#wE==AuCt^y%1Qkn{^A|M5ri5+bvD^IAwR&cn#P3}jk3Kvrc`T~6
zI-$h<a+Z*b<bjH}b{<i=nwA+)S5#L0GkeX;R_(U^e)e(=UB5jg+fwJxPI0)yz5Mnf
z*WbnK^lolfxhK9W<L+N&rW{rt#@ra=1Bwi~zvdl?IIVQ@#nMkdw%%Lzck9Q5GqyjE
zbbq<xUN=qZOjX+BAo2Je(`EAJ@9>*lw%3fyE$Pnxj>CLX`J2A`o>F88XsmhsJN|F>
zOvlXgt1^|I{8lzsWK`U8dzR_^Gt2G>+n8mf{*v0f^V__-S&RnX^w?#-U5~!8E9n8F
zJV(R9d5*#&uf=bEm|GWrXSIXEg0BVFt(u%zisOEMs#mSoaC`rMqkmz-TE%zSRfTO{
zOPdtc7rdV0$dvl;o#`uCyR(kskI!YyO1hBx_<Gh7-3^u+Pu~drHq^`c)&B2x{NnY0
zKJK4r<WxOpZ+i7|R;J+7-8J_Vl6lhtPn{^*bmGCuQcs4>PG@AESp;=V_^ufh(KR#G
zxhyBxNO$#Qov${UFO07<1(}(o8v7crm>sJaS%2RzXu-w0=6y0tUCnl%&WJJhZL&PG
zk^fxpw3$XGr+CuzU+}LqF{qnY)#kskd8M^XfsCL1N5_9VH=gy-<EvX1b^YIMmKLcE
zm%Pq?xwMas*=gnHDYJGTRj|5O-=$o1yLZ;+jBSC>)Hw}G#9Z#A+bmhU{9V>vh3Ld`
z4_Qr*i7ZE$Z)%9G)PEYWWtwZx)*^>Ld<h%(MWsEza&T|UZ*G|hj*QWdz3o5ypWHQT
zVNKS=96kG+dkl*jWjwFHOzKtDo_;N?_3&OB^Rs`O78Xp&VS2IXNKtBH+rE!K|0hkc
z+0JkCylnUPw*qWGIF7ViY~B=leci1oOKqw$-!<M4+Q{eilI45HqVO*j?8Qq}of8_j
z?u>Fc{rAlFb+<*iTHh(UFDzK_Cwu<Sew|mf4|nnhmt{^0W8E?R);!*K(qFpn>-yba
z5|cGEEk9Q5znX@`>&N@szbSit6TI^v;obv_g?k0|ZhSF)Z}rznBE9^snQ#7V{?h3G
zNBGyX_`m1mxXMoJWUE|rZcJziV%jpz+x48tuNud$Z(mM+UJ|s#%kHd-T?&(9@r=hO
z_~txiXeoWjZqed@!%{=7dTsV<QziG_-z^`lW-py1aL;3I$Zmf3+spQG$grBPzI}Xa
zhuB0<tz^F9H_3a_WgA<PIQH|+tC^yzCh=u!?zd-ZOVoVUT?m`BEM3e}c*%^04YDpT
z{;A4jOqg@v;2C`%j^y1(qMF|Ylpp_@_F%;pBa>4vqU%!oP6jIYHfqQ*`>*}uz5n`d
z-$yUzzx>K};x)fVCTD~1$DLQ5X03Oe6jpI^Rq7cF4UWL_k8`g42>Y%(S!MHDQz`rM
ziE+Pf)_ZNOX?o`uvphx1`R+#z-ud5xV>hldjLu@QnPLAW<zdys4Ndp<mnXDv?KIi@
z=X$-z(wc3`!pd>{20P+wHwLlXa`XFgHUDJF%_slP&ikmIa+NoQZB{RH<oPpvky)Q=
z?bjVQdnV2}>&6MzlXFfNzqw)9aC4qaYpc|w;{6|9);ph#n#tDYKk2-@NcL72){Sb8
zR>JS(5*()c>jx*5H5r}e=HXiEd(Ajk>**x#5WSSh^8yTphQ+rhtk8IB9HRH^#l&<w
zrF-g*>+8Rs|GD>j7H{=kzgI8criNV(+IXPBM4+o+0W+hH$F&EHp3=s~6=$3@Zv8b0
zW$tU_%`uyKUg3uID%Pb}eBW2Dy||$DB`4Px0oH0i4r}I{Reu7*dn9*%30ij6e$7Tb
zuH`cxEqP{eypcEHgL2aw&X(<KW7WK;%?k0-E!5{YB@;bUMYK0>&MPa!)}710RvPnp
zC59N@Uvc`p-rc9q6*Y1rukTqal_0R*`|Mqjb5{(y_nx}s&AG4iWBKlfXEdb`{P*K8
zDf`np(LMh1Np-sePZTv$b+|4}5kIHuATq;@F>UQzNv+V_Y}p&X6-`<1e%aSw)8sd=
zzDp?hdS+o^<Kihl-sI@{Z&fpD`ec-{Ui8Env6QgOPamCOWp_Uk!^BhfRR4d&H1V{Q
z%xHFZ@imJWT7JKNlT-JhOv;M+j$_)ZfTr6ij~4x&$$s?0=Bfz}4eA1q^E<t`)_lHe
zvFG-r#R3mjhONC6{_j!wOX2;WUW>eyToO?(&u+ggf8XJ6=5_{J-%`zgIv1YeOt2_?
zYP$AG<TOF$8&5v{*m=i#?<R$2^+%QMcirUbr~Eo5|5)dz*7rOAc$iN~Pv5sueSyH{
zq|K2hl^qf-gr57@M2R{)V2N(+*{g4Mq~W^E@%#sI@7tc<l5sy(I8pWaioOfyzMg#}
zbxzU4bZeN!%`59PR*D_pcH`o;*#btMsb>=Vm?ds(Xw1-`TNPvRbL**E?nvhnsYqRa
z13ek%diVJO=aXk%jJIUyDJ_z<VMtqWnw6ci_yymwD3iKZY_-M=Ws0W$Kc`0O-F<Os
ziIc(Z*h7J(JD7!dUZp6U{bi-RSGaxaTh26Nmu>v}oif!_ydK;s<utfvZsRBSaE9EI
z168>lJEf#-&n8@W%YV80eXQ8Iw_4|C9+yvusxvUq3TwaSztlkDjLsp)xFudIk3>e<
z^!q5tJbM4<?)-wC8R`Zr_$M^KDSf|S(Z+^%HyHD+v)7v4o;PRdDzOWuP29W06sI%(
zE?c6zGF#Fv;9C%XOtz$*WJEyu$GYg#feXIu4mol0`u}g2za-E9H9uvg@#zaDnZJ(R
z_BqF7Sk1z>!9Gx~D@XC2EmMsGqw~#|T?{QRj9vaKG)Xo#%>U&Vf5oddRBM@dYi;C$
z^!gvqErWL$6qe52bL#JUN!uT(iShzVpJ~V+E#RzXl;n-E);jFqa5cx|%;AR-57}D}
zCYa5BdO-5c(wUky3GbJ!Y1zpxkaPEkPlRc~q*=P3oXte5Y}FilEYB3Cuy50vlkh{)
z+Hyjm-P7(bh7(>s={dD#LDiF%<@~w(OoP~McXxH3UwbCl@I~sfz!dhKQ@Ee-T{Q{Z
zyCyW!!h-t+?^mPZ<>pr|KWbS0ghk>x$33Y=o>S`AW!~FbbR7LX{j((7k`p{?&z46%
zxy$GH=ANP+<89u=Gv8MHPPJdMFYIB0-LE&^C7%vWe)B|a+O!#aFJ^5GFc5hh=aga<
zA+}J_({#brFdw~3hrY;q-q-&poh|%3A@dpE-ruLL?`X+0KA0D4#}N2_Z)t&u-t61P
zlf*vCy?n~L^8c~VOW!5b-{vt3NI7Dl{^{W(AureD`K>Nz|88=5bxDlBW%7yIYh7C=
z-}-e;)$ZFNwFKLPm3mXXW@m_49j%+aX!`$W_Lm>a{}7xR>6+mAhfjh3{YCq-K4z7_
zi=Xf47r5!VUH`=Yq`%DqXXN_=s|vfk_b9SHe(@<dd8^mVBPyxl>Xr#Yk`})5zjoI9
z#s6rocWpg$O3t8v)v<f6J>7hZKHg6)loj20eL?)qklAhqM|kAq`Zx2L8HshjmE1Vf
zQf|(H$m!;5=3f7_X4}l#hGz!HCvLwL^&~xAQpLhGw(-R=IrUJXqz4<Xolg2D^x_=f
zclOK_p`A}`OxxNeuT(1U&3^hhmqGfNsOg`L4?nAHHa%OqU%B+}-j&?$`T8=e!@7PS
z`J=L#EzBVzaBY#pg5CKZ78576)!W~2{%HF^=g>x1wS&*U1z6nkR`-ivurRoP;_0Ug
zqL%uEPTBIS*2Ju;N#>B?$D{5ZTP>G*RCzNnFVNOzP&AtTBi~{VgOB;WUvhW%{h4*G
z`T32Kvx`m2>=)f-h+P^pDb?NP;l9{QA5P~y-){dsv+6y2{C$x-dGGIef07kjCjOb}
zWv^cT1g41=uGQ@;-5Gk{9W+ck(qi9V^l0sKH`}75FLU3uFJj%Y!Or2^lId#O-}mk<
zm=|cpb-dEplIzalot@cFKC-`@*e$;#)c3RC>+-@^Z54Jdii|7|D;KglOp`V@y(t+v
z>z$C<vivuJ|8~v*jheBo-<hR({C%r~@VAZbcOLWqc~b8l|Nry<_JjZYX1JFwGMekc
z?!D+(@s3kV7b~1NSp8UP<GP}mQzT7nmOYm}$MgA3{f!v!n|uqlzMOn^ju5En5uN?g
z;7wc35?+=UZU>fiMr@ySeTMTnW(Nz6=Z60iwjJ58_+nesTetTKmnA1n3yBoYx#!m@
ztMs8@%?05rx7>GJ&W^3WFQWCVI3(ZWq)@}b9~Uyygl_W-3GaFSa(UdN^A0zchd1!`
zJF8BQwdh-Ca5aR{Pues{#_XDHkcj$G7K_leu~!c4+4^PK;hpR|SQ=gJra!H0n%t{%
zYpeM_Uv2K-Idkux(Yz`f?ZNhD>b$h&wv0CgGb}wPZJm2=<*8ZI_9e9J|9oz<%_nOn
zhZR!UDRHra2U3G3xn=Gx`7x()V{ysDpZyn49-n8vgjeoL;{#@|_Ky*3r>zLm;<yl!
z@Sy0|Bkt_#LjK%aWluCd{M>&3Z(~Yr-5X2BHC|E%AsLy^wz08f?yWG{Tz<-Qt^4bV
zcUx6>W_TwSr)<0CbTw&O+WNl@jZz%FesMLO>*9a4J-c&PJ>v4DJ4b_BSFJAHw=Bo%
z==D2SuJ!Fv^HkaK|C7cu3!8$3ri1Ml&oeex1<u)iub`ik<7{G|^8U=uZ(GWp#V>E$
zWU;eZHqSOFrElxP@ADqUPiJV^cY>kx=VG_84sABkUdE-oYrPFNeXNw_xfZ5vQvKT~
zdvavXw%Ggr-N%%&E%u8&v@sK9YrcCp{X`MJoA=ze1?qc~jF@v5et!Qu@ReL;%d0~l
zQ=f0#=w+I=VQbd8byGv!8$zsE-s@huGDGw$&uX~^4l`pkH~YLyX*&J+z>@0UXRl{|
zx;2|8E+W04dnbeTlRDSk4^?(E8@{srsuKVH-R8AM-s>aEl$94q{NJ+Axq2Um>XG+*
zzwz$+^vnK&CL>4vkKq5tuDjT`EI7i<#&-1Y*)?Y_&pmB#P~~0PB=#lxc8l-iB16+#
zr-j__$|dwJ4O;2@RAa(g=WE-`AF#~b^}%GV&e=dUUCw!4tvcxfSKWf|)$e_CM^tgs
z?&~V~78<F_+c#KVU`yS0{*BS}ex?IcS8w{RE+N0beO}GPd(~f``fh&qJ<gV^`C!b#
zLygTDdyXqC+hBQ@X~wP!|K<<NJ~FTi^sRQzXR<6ViI7N{aQAL;tw+3oquO-y3Vw$j
zz5h5aH=49t^05gqIhcH3a9zB5+YG;ety5A1i!5%uxNl_KGM91TzxDbe%JnrFvJ4p+
zsZncf!{+?l9Hn};K6u*eGNx_@^B1kn#Thr5odjhAUY7Is749jYP{raAyu)XUu>^~R
zqZm{D{ZkIr_6^6fN<TbrtXZ_Ik^A4hIi|6%7fyNJdGyE3-&3ZTy6>J5wWNumd1p==
z*G?W?pSw#sSLb&;pEO7JrdD&?cZYAso))crS^n;4K%^1Nnz=V7S1X=pd^Ddq^8BMX
z>$Q{qa4g;4xzqF4&-mZhuh^O#Q(eM;X<rM^;X8A+_q@ybwd=rMfzx^-@2`JznEU=>
z+-(!RaIuCE_SV^~ksp5E|9NTtWP6dsXBRi^IDfPztl^MIC3E6OrKzS1R!$RlxZvHz
z5I41`(WtX>o1(zJ@5kFTu9)X-a8#C<IHST{`Se7qMK6B7maS-1)y|8rn_BH&{>WbI
zRMdYHud{zYTHLm+Wl7rm<y-lFA78`wVVfpf^3`84T^6;u=eo?=^eI8&&kHuYc`ZK0
zCA8}Be$McoQ|a30>hk1oebJrGJK6P$%rgt2gK{0c(@pmth_y1G<tCT$=c9wm&eMD2
zx(>-?_btDov^j7^dW-3kFPn52_8q;Qf9X%}^%X&9HXLqS!#Xd1#vVWO*2BGLx{of(
zc{JzrAKvM2-fle1<!+)fXZya7+)@%bc~!hezfAfemmgqexK~+H(bjmeSysrYbp|h8
z%O2{jUwf|aN7Mtxp0yU~2K&EyHF_NioHu))^Y#0`?Dl@Tx_?P|eC5oqthqibmgKx#
zvN&D9r}8%^+t;A@d6#W(XjjZX)tJ3olgG^H^ye=(?SI^7nQ%h#^~c5y?MeR*9_#!R
zz;bee>$6X8AML+*EHV-MEs{EmVb^cN?N#%&m;`3u^jY&d$k09h-{<>Fqr>k_y6IB*
zmLZR=!8PEB<g#Vjr|i|At7W`;W^GdWS9jLFe`>~JkN+~(C`vP}swlgoV`R*t7O?&H
z>6rmjn7;GPpVZj(JA!+LdF}ax+{Gc)b>H;vR=nPAQvF$Xm6(yvL`H#E1?vn|W*<C!
z_$wy^+w|$vGfPXa?h$|X;B#j#&%gF-J)w!|AMzLb%>F9<QbzdS4~1~18&;CHH(AVB
z82^;_`#XcI9KPZi$^2{W-TNN?(7468kK4bkGw{^SB`GJLOj@#lljZ%>AC|FCc-?w+
zq`P-@{SFjXaLYf$DB+{)bNS6&?KzAMJxo;{R;i_54@);}jElBDQ(nA6`a8ehB8DH$
z>hh1PcSo)?<ZCRlbJY$G|55GemaOi(>S)r$oNrd?lAV!G**cf{?DqG)4q3iKe7$b!
z^dmo&=0rYx;<x8JbJchD`%8B2zP>W%O!2eQ-B0s%*1Y}t>G8p+<3;+#@z)eBN>=b3
zsEPk|EdAxt|Ig%ux5iW?d{fbqK9tmN858@*_J`s(O=hu4GpnYgFFK#+e<Q(sC*O&{
z1DvOyTQ^sw=yTr`iT(BL`OBI7^^^YZj?z0-6fmXhwiC~>57VE%>0;Pf`7Ye;YQyc<
z>FU1fyiRR0)zen<Z&|PW`_C-5`7eUye`WqUCvN9^bE+%flAP~8E3*GiIJ@lB5gWPw
z>G#iTHKZHv_K8cG#`<GRgsvLzL&2NORWCo?GuE8_m@!U5WhbxFk{h*iRG+9En0DHE
z+VnCV$+e+fcesO2F8_Jpo_=!{C{kWC9*!6EGwM(e;9K&Ji{I?zvp0_>nOpekY&s`c
zdetVxN@mv#eV2z1Ggd|Q%N-Dj_~-CK;GKMW?eW&#*ClvX9kOKU{qx|Ydo)jpw1mk2
z?MC)TXDYgUn;QG-$<}+;3;`RwtnSL4)5@1i-mrl=Dq1&qMR^Rvy?4J~1t0ycG5z$E
zlPM?P^A{}RetqSls8alz`xXg1oIN9}1=6iwP4U&c@aRh}qetF_CuhIUSSPQ#qhQAS
z<@{dhbuB6f{;iMS8=t;@hIuI82ZzJ&Htfl1-=ID{zINt3v4o@RzTVAc`QWboyP@=!
zagEoSn;jGX#$Arhk^0Rj84!9mUaQttf-zvnOc~Z|##OENf8M))`KY-4xk&FXk5}q=
z<UieXCT;JjBYbxC6KWa-zJGQoV%ocZgZb*GHczJohn!OTVZ3_lEF1Ats;8Dsj+w;O
zq|ETR|KFwj3*rBM+z+tZyJzp-BMk*tBPM^`C%CD+QldmVY<J4SYq^o9zZ-83YJV@T
zppZE4_OlH8@EMjjw7%`T>KXlA@Kycg&eV{pd)Wl^r!6{_(gYe65@4TGo_0Z7+)~N!
zZ0ugiz~re%Cy34t=9<~Pcik2Xi)!5`e;4q@PCxn7ZOff33)ho3rFkCx^0Rl=^LMZ)
z7d9#WZCf^B&ZDi#;`2n$#Y|wVvF>QfojZSrmp1ogo*NGuqD`G9?mZ#!=w4-u^G?y5
zoG$n8Hd?szH{VsZUd41VQY>&+3(vOO;t%RruDuLSm5kcEPixLip{ZPwY0W-*=Yo>n
z>FMhG1nccxH1+Dbm(TB>|9+J-h3}T;s<2NyS>Ky3FuvwkGx_yX&v(ylr^c#^TW;QK
z;@xe$J>$t4;VWy*tk&FId|f|nO5m$a^1uFF?1(5j>B{D^$$tCR-DUObSRFYVoW9&E
zWoz{_JYN3d)$99<xX;(m@SOCeny+(0fXb<*^L?`lQpHl5o=9!pAW)n2ZP}0ap=nFk
zhP>XgE9&v@zWtmnk7ZgI3yzq&RJp%U-v8nCm#6;!v+a!6L{A7?yRlu%h=J{`v%f=_
z%ZfIq#N!JlSn}1&&p0e2U1P(%{qFr=8**b3d_T49y1wYzvnJzqOTO~@=ByZ*H%DvQ
z{xIzkd>iuHr)!b+Q_)S_4i`e2u7tEY3%;F}^mLV`&uuHISsqo>3wA9zv1RI}&)YR^
z%O^M4E|xi}|MZec@#jrf3O7Y%6#S9tKA`U(yU?NL#)K~yB305^3u5N%I(cAU$ceWn
zYgWIC;-4_@>s=!`jkxzBe)4nnhgJRj{WoUXIe~LervHER{pQBj&zToHN-mVMxC`%%
zVW|5tbMu5*m-8OZTe42JR?oxs!v5Bxm49DL-m!>iH<-KN$lY>HqmnZJRp~VcUs$Q%
zUiJ0!R`1S$*~#~2N#^~pynSxBTfr6^bI--;^Iu8yOp-jKoFl&B-cc!y=aZ7oU$dA!
zUw}dUAcw5RyYEk5ALN{HCP&S^v4Q;;bF7^H+`2!td*l<61tg;4<}6RJI3?-yMQeT0
zhx2DYX`js0%(@>Ss>vT1EBgAL>%WAKLwB7I#dl|Ki+yjdA6WB41hh|l>H5Dn|F6Bd
zuKGLs`fXoi7nvTMpdEN|nL^z*i<J2*D{W>RmT|ZC*wFp?!nSoPM=V07=-v;>bY1k!
zpxyG@)td}~4rV)D{w_Ymx%RC9&#TZHu?7+C*9Q!JcQedn(CF}(-B6%>qNuvorf_Rk
zXVK})a||6>;`KFoIovlyYEKS5lW)1%W9L!pn13(2zZ4(iiR5ZncTze(xG3>f$Bo6u
zGo$@}i)9~XXx6>HZ}0mXS5~|)w{!pHuz_iB&}%KPDc6buyLI9>UtVX=FX=e{yne&v
zrw#`bUWYk-<zbF@O$#ln;aI$U`{~>iX~(YSoXchJ60Ie!$j=b|%XpxXM^7%>vAOp(
z&&}I>(~sR3T<}-pHY;aSSI8Ni!V7GF*Hms4ORiNv!RRTg_IT5q-Ft6%^)WFsE}H#*
zkJCCm{oeWYlWOAlmtM})+wZqtCBoih<CX&ovP$2!7R_VUn^CtniSgisiuVkxNq?Vw
zVDap_-CW}4m2==(!`t#Nhl;;^IbJs}?(Ze}$#-8as!sLfofi3oVM3{E!pgv<Zyx1p
ziG2d?|9<r;$Zqo*)|xYke8n=l))^1~-9K}PrIa=K&^3$qyFVRgQ)bGQ{$jM_PoiG#
zjddT*z1hwr_BBf~<Y~OUb#q>D1oye1vw@c-7pQ$%=V5fmbav^vfQlMNwmI#O666aV
zBzj6FpO#)!Q`ISxXU}Y#(Y)}wR8Ft*^ZC!`JN}q3YxmLb8dt23ePYR3!a8IAjv`Ns
zyWVdEHc6~0xX}G`i{Q@tt0!GNEcHg^-QvX>H{;gcS<iZ*B;vj#`<lzL3iTxo_V%-5
zo+NY?w?E02ng4K-kK|gzi0JJf?|%8ZN%mCbIhVETiss*D3v>EteBjS9lUd6SzO=lR
zV(atgNzr8W8)u8GRxJC#5uf(tO>oI%*4tN^J7c$>3S@YaJ8h+F!;8D&@yiZAOsx8J
zvRh}fk-fct=Mkf3dnOCv^`~|8PyB9q)imuq!^<9biyFW6I=t*BeH1Ov2gz)RWSDf%
zga7ut<8ePcKiU<SyxqF~qf9Or$Ig@xZi9@n^IoN1ToYzR_<g#!IchSKfZFw!DzgsD
zJhM<L6ZjS-`0b#yKy~rrJ6E?cD0V;U>g7FEFeRGhk@J>mUN;^o7%RIzGdRxZS}&sa
z`qso`HuWX59^P|g%-`}?*ZXe4kMhbIk)E$y2Q1T>oT5(eGBsT^#p8a*8LnSSZ%PiO
z9g0(Xx9{+Q^Ww59yBSy#QrL8Dl)m`+2S}v5{wPxwJJ0rGa_Y`YCy#yh`F?-W&KteW
zr7?4j_l6572qXyfy-aKpW^0+pFqz9YuDV%ld0xQ#0~}wSSH#`@b?43>lc|lf=YCPm
zd;WEX`5DDcs}tH-wU;qIySRLsub0^4Z|BATzZHG(%Huj$kydcc{(w2&3j*^bH(Fnx
zEGesEarKFY(M+G`d$}C0W?Z^%|2<u#`}>6#FN;kqEL7fkHhMk%B=sO`B9oy<F~g6V
zx_|SGK67r4TXyD@($Yz%KYgCe$tAu?<fWuqxq;XF|3~W2|D94?u2+6V<H(mQ7Thbd
zrY_%97_jw*rc7s$*4(GrlT;VK+PK~FnZa@9S34)HjZ|EJ+;?hQsXL<=x0$KA;qOCI
zQ>#2B)_j$YUCt2h^U=F_#^V6C14lj`Qu*HgCPjV`d&?TVwIx|=Z_Y5*Ps%_3+kNMn
zjfL_)laE)vkaTLld{TvXlgK8|ud5h}Zl-#ji<xZISFmA6%7%lV*^dP>u>J6QF?)CM
z&(LWLA6&9-54L!cw{QB<7`KK)n+o-Hqxv5<hiuwCpKqZZzralX_QP)y<jo|e+`oC~
zl9aLe{iUrdXUlZD&g7HdXFY@OPp67oAb*PO>oqghu31y?g;8U|*0Rc)IbWyooBx-7
zD_tjGwkBnlXf=1j$-a9bEb%$telwk`HodMFF8(^{Uhv`#Aq)2ZTl~LYh<o#%|4Z8<
zp4T4RcKGqq0u#T5KNf_YT$=hRhwops?Tr>Ww>|1xc+&It`5wKZWc$_G{^S$a-m0~S
z|AnUPf4b}W(JDph|Gn2=Km4A5WwsReT22<wNXJX{rr%3vU3Pi#zJC6#FC1&s?;N%@
zn(8!5vz_;_DvwsnwDi2a&X4=|%|CSaZ%x4rQ1aiw$j+qdvh&KO0*+rR3higwFo^9A
zw-S(*6`9J~yK~A#mKGZeXN_lv#CZaXw|W#`uXkA5^yWEZYWHP5hIyw?t1ekP(c)Se
z%kB9Er_|Q%acj+)<-NygqD18$yJem3l3`|36BH6QTJ-4LI4oBf9?i0T;z=hr?wiw^
zOP+1t;lw7x!SUp>HV>a{8TU`+y?1smGb=05%UYuMit)VhGqI<Od6bTnJF&f-y8e%)
zF!Mrr5!+M-evAK!#TJ`OMBX(n`hLmOdY5(4T$4(ErY8&L3w-yq{jl{;$_3u)uAUtC
zNs=c5J9hqkGyjiX?T_Vkt_(YWwOxPtU{iTUPpXCjbC~#h&XZDlj7R?pzkgg*?cu2&
zU7-;2aVP7?6PG_7;&I*mJ0j}I?)V?cD{Hg1uKT?v&H0vs#T14aMO(YSm$9y_PiR=C
zw%o$tamlQ2r(~X4tYS7Yta3=VRmfQzche(4ZT>coX@NKACq92srnvRQ*^}8%eZ$uI
z&foJ-?dx0%?~C^ovodtr&$e;$oK5Vjy?tlxEdNIf+&Uj#dXw9CW4l|``@>NI%Y9gw
zZ0<Hc)|nZw{`#5D>x>H-%J(_U_?`CYr;_Qz9M0rd0tp+uE!=#n`J-QMkvwO#Nq2{N
zIg12KMngo|p5^l$6`z^Sjd}Ln>{m0-f&AJBMlIExOokWgTYD4^EbvvnXPNc+pz5`K
z9F@(1jIX9^NW5K~@co0^-+jL&5)zk+8Po_A_kCq+3!5<W#p`#{^?%uOpICG;HbwrQ
zaz&Z>%==Q=6W7EyYllS4T<B$|DS4THp-9~H#RuxHKi^q<z|QCHPDlOvZ|7fh^8eGA
z{&t(&_nrEI40icD+TSqoEYeDRc5Jqeb>Xi^>{~Y<Ja%h&S87|T<{u85&{H8#OI3fn
zi$7nsbIZ>+#`24{@Bi$&E%?{h7fVuCPF3C1S^c)(`srNu%_}X8_Z*a%YyDa*`+(x+
zFVzg|zn(YqJaZ<oZ?E*#WxZj#a*`~Unar)YH*foRBFJ-6R%zj+hFo5bC1INxO0qWz
zcVsxO*~NYF)HGi%X3^L3OXn@Tye9Tq)rXn0Z^}HoVV~Z#cx#xpG0Ula+t|+D+2!+m
z{@)XQvMc?Vt7RgO7wnloi97hs0h>1$<M*;~UlMwn6)P3g+&go{y$qw5PT2uGH$?=Z
z?(D7dOq-w+#>LVUQ^o#io{!c+zgZ$_(|bDBHhgfDF56xE_QFp856i7vEBI3w8T~%I
z4=fic^t%<C*VR8~alm_x`-h(`oB921Zxr{_|Bm<V8K#;RT-vJ2Vg1VX7=zWxo7PjJ
zXDQ7-e6o6z>4{<qNAW4vub0@(ZalQJbM+H$w-;xG-#`DVu-bA<QQ*hwb@v3$KNn(p
zqVzfZL||57+oD?KKYQmKD(7xdy7T^J|CfT-{G0ae%;`F{l*zioo7?!w2e%c~PXxVu
zV&nNaSTFc253`uD^;W>kBRAD~e@fY`iSo?Oj(qKRp5u>fRm9HNldnzxdKAw{*3X%L
zW3k7*yE{Lz_0FsJ^YZKd8>5?cL+-~S<`~HZMM(>4-)k+o@@Z|ugv_KJhS9m}Tpv8x
zQ_;Gx>VN-#A!*UgF`!|m9lU)$p0T%!3-Z$P_NxEpuw>d|eok_cyFk3Wgzagm$^wHA
zJNZ95uDyJ$+Tq@Uuj((2xEPvSlRA|qa!fw);=9`18H;D$o<8#mQ{T$dFBN7l^}HH1
zPiiaI%_(Zr>vetZFDx?D_mtX_c-zV5mj;{8gp<vaZ*ysx6*H99+S+`GWpw+nVOxq;
z)YdP3pB|hsD7j_vY1eO|*H*?ha(%ToPwul|TK#_BekNvv2=k5ct5<(@j*YK6;4*#j
zh34wF%-<d#i@yI@=ibic@k`u-|J}{nd4O>@E2D&T(%OYyERL#gq;I@(*wX%c#=(p?
z{0*^NrpN3v_#U`x59225Wtnx)*0Fqg6m{YKE%R?0(=Sa+Q{zb&$d0;N5-#bIeIU~D
zXYS@@g%eh~Elb?4y7=0*Nuk9v4$JKR`dI2rd4W^I!K$@~e(#Dp6SQ^0)m7F<;?y?2
z-=%bkPbz)-s*m0gw_9I^vNg|@akFL3<SU->_<@^tzyZg-Hujow!B>oHit=SWMFSsp
zm%Nm>JMMS7nJwU3RRW*E{f=9Uue0COzG44`A<J#z?{&F;;-*Kl)AROvdmC@xda0JX
z*>U~y?oX{sYnNT(`Nw3(zw>UHS4Z`Uy=}ToPxxQeDF1G(Gnu==B{x~|%E_V<_6@Qv
zHW~^6<#P&GoYI-ODc!cT{p(+O7l#!Y4_b{s%QCQ@HmYFq(P9o-?p6Br!t+S|i&q^J
zmviyRCe(g^Z|_|DSp3BmVfiJi7@BV`)r^|4%a@grrPS7ck9b(Z&KZlBzKp(7{-{Sx
zCS=7y(KuhWa<l2vW900GFHJe^dbqv$uB6>>o~4sHPc`O-y*}OZg=eC^%;JDG{nyRd
z_iMRkO*?&vZBvTr^t11e*2pX?0ZoMJFfP2|?IE@yK5+84qp}^F()2!yevr&b{HYz%
zyuj7tDwC^L75`elTie8yzD~;d!*=Jw+Nr{zYW2qcMjfx!mlsS|;p>@uH`sxLsjYG2
z=NR4w4wI^#a@QE2b38GOtDoTJAHP6Pz>MSh&IzZ3c7~)p=5l=DP&4CXvfBFCMNcNB
zaBZ=k%cRnJLNBMt_0H-d*J%%|b#^tB%?x8%kbjo%)yxO%r7w=?-?rS~!(Q;XVB3Tp
zwj9-uPaG=ceX#6#o}uGBUkl4KyUI^A1pLpr@u~V`-~ly<e-Df6f874U{a?w$?h6x_
zLd43D86iH`6?)3Q7xq8!N@^6^EPN$KH~Y=eFi)-*CB?t_*_xuvrj$*;_Q9CJ)XQh0
zXM|@>SeB$&))noB)aeWp&dk!zHxs>d`p~wsg^?z2qW0dqA#BNinQz8nnd+S6Bg`qm
zYooRm&DYFfw~$cz({tpFte&_1_cQJ*@5Ovp4Bg#t*2ZC-Te8+fZNHJa%q5xcz79E(
zyysGu{RP#F(hOW{e+xR!oc(^!A)SWm$fD*G^$M4Koz?X@76;X2JdaL~id`Ev^Ctfi
zqfH@RPxr}AIkUS~QL65VX5Y3(Pm`S%%I_u@d}~U4^-@};UgJ=iU_!w39~+`{-^_4)
zEjTNGSKDg6w6lG$^X96w^87v0yyeudgPX5DzA<Oll6RV)_x+u>xBB<)YyI9g<%Ex$
zyqdD3dgin=HH~nM;L@#X`{!4gICP}&lp0<<lXjiSl5;}D->dKcEZd+Re5anLEJ?Ow
zbJ&s}>*C@YcHN1qtBbrb<>yXKFFpOhoe>M1vKqs@Emwtdh3KWMjJjD7){rR@<edC`
zUfS$1QM3Ijaoq{iQ|z||ZJn_2X=~=GuGg9=o40H+xZcQm)n@V8#J<IkcBh1k?Z^*!
zbvnAodG*zM3JOzVBTZIued%2jHTN~6qP&2vy|mv71HPv*K@zviciM36*Ip*R@}S6@
zQ_h7CW*nAjf9UX{HvCr`+v7Wb?!Mk)QQKXAZ{gDnL$Pdi>o4y9@qZXD&$mCr^!38W
zLl%Y43eVPYR)?PnG@PG&bFQ&}-2|I|0(bX*WBbm#tL5@F^#jT8Ph=KVGR<N2SswIe
zLQ~JdyHADs7BtUYescDEPoYU+4i_e|njOC=x1&79Y<v52sr&z(E!4jj-TPf?)z|d+
za@PJCw;dSfwBF9Y_~?vEXxQr{eshg@9q+SMr!OjMT{^95t{xnC@?AmE(Szo8zukGx
zEwIhFo@0AJdh?~O^(ohlKL7Yvnz*^>rirQ;tHqpo3wGX~e)MtdEb#|3mKJU4aSVPf
zJmr1p;>rDX?suCPGksXP!(MRj^rdgQRQ5&9OrOpE-+$u_UFT;8#{=cW64?*b{e8Rt
zZ|$$w|3B;x$jZDmVM6A{d2X%CH~Dor-I6<9wKz)D?W^ppecz;{Z-g!GzVEn4ZcX*1
zTKy9L#vHcZqmP!AoCb}ZY<vD^%k<twet%vq&0m{*;Wf)IE326WJT1Wit8=a#TeWuG
zr587s@919=9P%?!Qe!6X(W;f@KU8$j`d?mDp`(9p^I|c<b2EJ<Ztm>N-eP30nX3AW
zP1CGm(w>QSo_dpG%&Ml#@L7KsvTAXjep)57?iF9UaP;vqZ@sgHC#nPI&HR+}gyEE&
z!Qre+e(ZZMe@PJDbon;tzZVG%IUCx!R(PDV{w-(az{p%&JC$pv$<^6b30Ka{7rS7o
z)ex|suj5+tl+4Z9PW}8%?)U#)ivMu_U&4umO5LelZ~k0V`@4&wK{K&=(rM0ZFO9sl
zo@)PjxFba>C-ZOR$H)6U9zUP|Y+u^y3g5Lc3xcX9ZhASj)V5ho!KB@??_I*oH3jCj
zA20a_zCRK9E!bn~AAPH7&P&r3E;)Z}+}QWYQ0#D}$o?}bX)j*QzP~U#zi#@cm9ESm
z47nFFG+caG%(i>s;inUATfe_hVPTe)1BG#!-7RAe4eee3j%`nQndrWg>7jsWi*kT|
zaCNTqw|vX_Pc|(QGY^-V;x<>dZF0Yz{+zx)&er$0W=%bI-qurY{d}*ZHq$R0lH_Vz
z%;a-D<Kw%~s5$#i7R&Rvo)qtzeDz_Hdsby$kX6pCw^ud`hdr$DzrQmt;J|BUzn^(V
zE#H-YC-m7mv?Q(DST2^g*YT>;tn&x<a{Q7B+rVj?tC4)=;E^<b2KPN;4F$ys3pVgF
z&h%cquPTAT$*Zw~HKU7j!IEu@+`lD8eZL*ZWIDrt?wVDX9riz{USHp>SNq#rr0d8{
zzl4<y3niL9zfjJJwXVu6)3&(6F5y+(=67l4^0*}*xz8IKYrdPxUwcV>-ctX+r|VBY
zG4Xr&Tye!zZ#~Z2;RbIc?wu+;agYJjNcb+t5!UvY`OCrizvNHIzfGJFq5JfRvi9x7
zSEk#T)pvx{EPl4d*Ir^laG-db4Evm5iI!yrH6gvey^IOd&l~L9!s{eiwxG$;cvA{r
z@tdM8uQtDYz*L*PKy&|(NB#yEeRl7g7UXNVcEhWesSlG}x_*3@IrDK-gW>mCg-iCT
zp1P88q4l}FTlu|z=bUdU94g|9lkc5h-}PKwr0-%;(!4uz^2{#pZbr^{CZzj?r|K^w
zqr&Ma(X*aCH$K@iaVD#=yq8;c=?RgL7w>vcyS-oVFS6j1PMYO4=4Ot_HPLSbFI4J3
zySM1Z2g^?^yUTTa&Zp$gF%08NUCaEU^>Ctd`DWQAug<^J+4wzb`3j|1vexc@7eCMZ
z^y>ALs96(*EY~d0y021E`d_&1Z&U4(b+v*vo)a4<hnz{DVObpOxpL`VlUErxB+sO4
zh%8Dm+PPAO)yp;h@2&Kc@?AwonOL5EyrudvU;BQuW0Z1^5QFS9nQbywEuy|+Y!0%;
ztSh@7UhcnqS9^V+!7X32<?Xe5y$qfGw$HzwtTuPbn@_WHnJjusze{FclX+%vT#&Uj
zD!}iS9rt%(bJib+?>$=}`@1pfcJsx53pV6uJpRP(n#L%rXFj*~(O(%$rYFrajHVy`
zaR2dv%ZqXk9XPe$So!iZgX4}CxfKhxpA`@m`~7}x{(srnig$~RJ_Scly~(w1s!)A;
z@#IBjD#>Yzo_%`j51OQwSDv`{)KH^6nqA`Afds3nZ=SRE7tcI8SAH4erq+p*pKGYd
zs2VO5k(PNL6!@}5D@5R2+Rm7yu>Aol$IdtJP~5r4W9p=mx<ECqo19a6pK+-&s_dOI
zWA>7eq(tYL>o520vXA&3$Y9UHyn%b6W9R0eyRF@40-g%|E{$fqAGZFsRz~B$Q||Nr
zaoB!(<Nopxd)=JY%i<G!=kL<1o0oR+$=%;Pn^H=eYdUx6^OZMLxydd3wRZc;2)Fxl
zyyW`*-|h7Jd4e@|##jFuep!*SDT^JJ`R{o*d;Wj@FOU5H7-e%ebxygK$~HU3>DFa?
zr+o!;e5)+CAF7YmdBQ2OILt6T!QAcrW_^*#jSgGBc2qxFFA}M}bxQ2ARo)D*e7c^N
zMnyNJlr79-TX!b0kNwpiAv1$J+MdZjI@!YeCmvOtklZ>YYU1BH%dYw!(o~7oocw_K
zq-;;%g6AxYkNnD-x$3CQcd0@bY2VXVg+woP&obQR$;*A&0<^cvu0Vp>;zf$O1cRpW
z_VpL$evf<nuYYQ*^%Kso8=mpZQNF6U*fGgCSaYw->Z3Y8cek4!eE4ixV%$4jp$DJ;
z{H|+xrhczl<9T($8yWND-OhLC__n?_t$iJvCg=Kv_kqo=yQeQ!Piat__Ds^_ko)Hy
zbA6OHN3FiR>R8c>EzvKZJ@uA;v$XZ#;+ytA9Ar1#`p^HRuj}u%)6bKOr$73#W~F=k
z`G%dl-(OIu-!Z$&{d|z6eyZpq=EYZvAMvnH4CXF>+5P|J_7x##)}Eep|9`1hCELv0
z5c4yO!!7J5-ZR;`N%NC?RZIWl<@x{b&d)k@#{GQ!MdrE{%e<CfmW^+I&vpB=?nm2s
zzi*tMpf6#1YHy1Ein(omwq6G#<bS6t{C19Z(3_i-mLhv2aqhjnMV-G{K7O}g7vkPL
z$JSvfGgH@u*C&=vzs~44&046Ts<5u@zn`M9U;<yUjfVQQs08=K5AGjA!-|;%)}2x)
zS9714)AuM@{3MeD$6Kk`9Rh9#AAXyxf9w1#(W(>yTca1sEysAJR}{_T?aY(`?OK(8
z@%g4etoZLwSJ(ejWzT84t2~D_q?FD3-ge)@AJ!*3S8TF)p(wifX<e(tMgxfx6Id79
z@-)avUG9v_+&=x~jk^ae(i;R6oPV;uxHC~Q<@ojIYFopez4%p><jCAC_Db6FXw!K=
z{|T!?SH5Rn*?IHi?JWki>9X26+0U-?tg*FdU+wyaKVL)d+ilK$&v&ynA5Y!T_wuCs
z$;bSk=OlO@wvU*(%g<Z*eSqceJ?1JlDvScnr+9z6-P&{FfTonycN^DsIl;Q_;<IXU
zS3{Sc3|z3hz&N@=LH1Ps{a@#%?{Iavu6kr9L**Qg_ZviZ2%f*1EvhB@X^NNHts9SY
zH_Z|8S$0UQQC3oFwZcM2HO6i7ds`0{tVveee)GyLKA-95Wu8?qv>jWcI(5CrN^w?!
zGm~F^2;8jgwW`A8tz*%z$0F~f)8C{&p2Q;S_$pPgEij13`Ly3k{Uhf+PX$HpO5A1i
z%;5MxYo58M+}`?$`^HsIUbp{i?5+=Y+?UiX*j6su9P6KYsI^G%s8wu9f0@)?chF^p
zq1>8MGWPB>!^K<8KTWXMx>bvJZe>%|F*#M&%O5q<gti!zPR{yjWy!MRbLHJfb`cuW
zPY11xx%fu)V#5q=4(r8LO7mlc8U#|J#NM6V_37C68#6a;vpiD3RG$0k;D#GPMHyay
z-<<z<xzAni?CVc#CeN$07aXh#aJkL5#%9Gq#wm07>_3%6|6J|Vy5-6d?Pr^rPCO}}
zDtqO9<K;y4YF$;e@E^)y;_SKC&d$GP&mqV1=Ha;qA2WF0ByQ+C6!+xw&%WvzC*y)n
ze>wMkznA~MFT#KJDs9YLCztrv@JF)3M2(b+eSx=fHb(K-^Vzn2oL5)GzDTFP`TDwP
z+%k9CQ(B!H(l@9ozc`<|cxqW&#Z{iTnTKWgS;Rt41f5mTa`#Q==zaCcChBZ}@b4Rf
zDxwE7_JlCFEMI1tfAF81iA*ZXu2p+4rrdCgJs)!PQNP7(jUM4m{7cNvo-}W_{8n49
zEz8I<@BcmV{~-+r!`v)dWiL3DwHi0gQ5E59IQ#V8E`E<cv6k~6tqCvx&(WGxD|>TA
z-~7w>QyM?G$Nyll++}0Kzq$P0;^_DLwB{`3`Of<5ubke-h8Lw9LmsZM%1QcvBl4QU
z8j&KC+RwSuR;{=$E%H`&S&fzF>Ccm;tJohpyk}L2`LBA7;bGja+%>Ujd^@)v`McdZ
zW=m+N`a8x=Ruj}BXY9$7xpchnz%`adf3Mh<bQ!nmerRO+n8@|L|MH<bI;!DeR^LwE
zeQ)=+sC;8dcbDA^zi&SLS*s_7MsAFfn{j~o3+KY%9Xkv5Hcv}?cj4;w{YMiny#8GL
z)V(gX?`D2+XJ*t|5e<R9p!**rZhy$wGyPAa0K4!+-jbcQF{Vun_J8bdRHcY~v^I#?
z{a3K4+H4z3;Z})v^Jgl78m{|n1J@j~2=~nN`oA{w<)YB+h7gvED>OIG{uZ#+OPsre
zHFb-J+qD*L&udZB)`ULv2@6_cvdZnqTG3iB=WNsTyE4x#7A(Acczv;ejNh!;JG}C1
zK7aP%I-1~Y;oW(Y(@Xc9SDXFE`x=bl+XOX_zs_ZnXbj!){E2JTulD-Hvj?q?Ee>0I
z;pK8Wm)gb8HReYyjLxs`7kd|%?6zNT`s6=x=F_>&EHu<^Mg>~g*F58VC2y<!Pwixo
zLUH*z1Kk>pd+r<m3734mWWICH>bn~c?PbxpGr!~aJ*%9v%Ot;CW}nRcux{0Nw&oq{
zFPq<6crrWx!lN&`Y`(`$i@BXv9}Mp2wm)=zlHwFI=38?f{sW!6etf3>gymbpEbs6~
zOj7Mmh%K9#B)*{YuTbgf->pKIx9YsVxGi~y-TwRa{+0Yws{P{XyWhpt&u)&;NS!}(
zhu*yEcCqyLpJZCA{R960NH(eX#o5K*!`1No;r_Gf#!Lock=q5MwkZ5=oKb5av+&+T
z<0Us_WZtm<>{;}-Hu-;cE(fU9-}flshI-)Fy;<J_FJIPXSP=Z~Y1LFCZSF(MZ`!O#
zE@n^q#CzoZ+Fl`3FU?a=jdgrvx!O;L=?7na_<UFJC8G|5UmEL`HrF4Ld1hhY&ZxRr
zL2>1l&ST6Xb??3Fy_U<@+q+h^YZw-{KV$W9Df7?O{eSO}<Rn{7u~&8<SE%$0^}RoF
zGd<(W#qXRAUvi5q?jFCqaP9RO6COTlubXwLGjdn)Pj()G#F)2c+T5pK`|Z2BXu|o&
zD(U(5th@Xt+?IY|w0>u&w$Gl1>y^!cR>dD(fBlO8D|eq;pkOOA+m!aVKcyB<n{?5(
zq~><B0RKn5C0n^>RkMet<?T7^Adp&9yEt9)h|KA_7~c;yPwrfn{jIrCOwoSgjKBYH
zR-acmx#_jfn>}Cdg-t7e`}WM2if%~;W^aKAo#`qZlRA3uPB>x8l^MSKV0>4Er=qLJ
zk}$_kLG5>0)0c2a1x7S6I5s&aILu&VOKvE<Yy8%?v~qgn%UZj+@9%uyv}x6*RjX@5
zzuO91UY$Di+1~7Pw)YM1@6^!jyrI1_#xE*1=k}S6mljRcGhV7UUE)dL>!{7CUB+p(
zC3VMVm)7i8nCZFv^4)`*zqFQIUVZ;pao3SaCRGo1H0)Zoq{HfVZqAd7IVbld+-a3*
z`+DojQT`M1bEa%OxlYGBrC{Fu_g`99+RIEgb6qj{t*nN}X|5VR2X&=RtJIM0X>-?F
zUz-<xDpRdSsD|yQb79@ZXVo_n-G9n#)p;teclpcJ(_0Me-LF<n7Ig{PQ{cAv%DeDJ
zez&MYr_Q)4t}@`s)ycS6w4CLo%WGD4>mcF%zs3J|ZaV$h<lr$45#|#CQEyKi`Nm(g
zyO#AHck-i;{(pp87ukMa;+P#3_g>xZ=V_)V&(zOxS2Dko_gU9DZ(o_dp7l~Y!<vp?
z-|bxfIYew=bV$+LtFWH=hxMNq+$NPDrwIJJ5qSID`{wWRUv0J@-eI)F_So91C;8@b
zZenD~EmZPm*?FwZyr*o5Q1g-u?N5@X`*s^waZI>iUpJ%5ozG)Q!Cr<vzVTMROKYxW
z3FUiSxyz<;eY5}VUwjPb3vwmC=lzgPeqFS)Ty(<5+kp%sdDC1MlmvC}`@GeD!n`fD
z%*u~+T(~svMf;o&YRfgTIbgtRefHm+pp_2Z+{PyM)|!3w?N_665<fA;KHa={(s_dk
zYfjHv^LdVv(oMFR9b&I~0(GOxy3Hbs^H?9(u9;jLwxs^CTUco8m81*d8~^2SRXVLH
zZ&`ajj??(oyuiR`TQ`|3_{ys6v|xd2_cZHtjRzNwFAiJ1)^Nq1e+;!Bo|T_`{Pp66
zd&)U0W*&08z9RJG+t2agM^;>BaQvck%h<vH@0sZ@-v7J*fAX2?HUBkcoszHqHF?YX
zgXv4e*u4Y}TtA<@?fHwxJS~$=YM+^|iss!GoP6AM<)H)Z8{6bsg2nx|etrDop}Wf5
zFZuia+@9pR@YUIMysz@7ewrTgFPe`dcF9_Ytm_%K6wY0IbE)W1QsNP-1Al%qb^R<i
zcDR)1lmEu6RVDlF!RPksUnhOdGH;*gD4c%(Zoz-^Nk&=qZ44O=Gx~0Y38dww7=|7x
zSGa#GSM&Yr+kqv~_600qr&WK=w*Srl<@En2<}W55ms?u3)^BFcJh5lbB+i7U{;{=_
zKl;d%t@rSh$T*P+>DIkhzV8sV?A3QLo;+Q1w~6;dk2yv!U02HMiE?*sa0}+hy140d
z?um0-x_TE}Sm<ZTZdz+A;>CCI!V5d8Tg5I_vpnlnMAW*>&t=&^{1%jx(EmlJq>|Zc
zc}({-YYl@XO<}et+V+1`{Qpn-zG!~U`xACjwk1v;%z4)&m@=#i9yyo%nd#4Muq*w5
z0`q};6aRjBvV6Zvo2}BSju*Ur^3$fA&)76S?3undf0&Dc&|&sScRr5l#KlolPCRIx
zy#Dm>1@g)tMO1&gzl^T`_I}B<0$YhKi<_gbvftH7DD)6{c8$qtCx0*d)y9*LZ?6eo
zF=OUpr>b*qozl-F88{OPOs^Jx_AK6MldWX2+jYachaQr)KQ?4dyXPt&>Qy;wUrp4p
z#kOX$nZ4$ZmK0gsopep(^_^2ur_RL+nqB^SPM}7d;bERn>6WjoSzOzdW;)(KkpJi8
z`ygJ;*E~Ye%ML#9Gn{57RjT!5)0RCJ{*3`M*xHUuyji<#`-GC1)pAljOFqt<;!+^!
z%Jb><UAg`}Z1%|?<yeoI>Rnlsdi_>^!KB8FV}Vf$%s<v{{&V7z4bz`l^E4#?2)xON
z5<3>ftIBo!VrFB;#YIp1q&e>{YWeUeOmaixi6<My|L>DnVjz@vO(JOT+N>`}me<V;
z6I=fB)z0nZwYG|LViRuv{-FP-*sw@%&-Y}{&(;->BvTiBF8&;T{_>U9$xohdWb^b{
zlHS5~+L%X3JwtV`%hRq`uR99!HwjLCA;0i@+~4S`&(`sx%P!?@lAN*MwBo{)5-W-P
z?WY)~eSOA%=lfcnH~+FNd`{m~ou&Q!#M#&C67TP}yeP7D-JiI%=H`hzFCK4ATK@Fi
zw8CRm?p<G#<^MMwm3bww+evW33^9pf?$cRSbydEy@(#0NCs*4(&fk8dD6;qJ>Z5BW
z#3%X%$ZxiD%DC?09RBv&i)&@K0u{7VUVW<k^=f+kbi0q-`_%;hMr?9-c&OCBSE_rO
z%Wnhqy#DQX4_}yf`sYo}Oiw|sjl4JV19rwN3Aw+4;Z%{KdbS9kNwBa_=EY6k2NyJZ
z-E_UCTB^xtBqN=@T6XnX)iY)Cht|r@THO_?)N!kHjq7RI@1Gjx?U}u!we*Wg?c?wD
z!8{D@kFQ;+Un$~gzW2lD|2<V~-#Q96RQFbkZms<Hyl(EIm5Nq}8LBeNoaVVp*(~CD
z`BQV&o&qn4ovV7)uC8{Cnq%R)S^WOe)}4}!&1SFVddyrDm+9^E*Z=$R|3bUP-d8xz
zEZVMXmGLs|idxm3?R)}{jQ<|o;3c{HKBubB)iNgueMTRfI&Gz`y@ieHVh1u~S-9EE
zBxD6!@9I8YoztRb`}L)M;Fk1&pybm#Rkc1gTiKlJ;PQ*NQeOFb?r+9(YowW;Z0q~X
z+M;Q^-(+bO@2C2Nz_Q;>(hS_kZi{og%bND&?Uuz2m!F-f&cCEx|5@}RW5lGgzYB|$
zeyNylX%iE@d1ltn31+T5T;k7{W#&E8S~~sN(&f3#Z(V*J)3|8A%3(*I{bJYCdS)_L
z6~j*IZvGplY&;>z=j_~@;%>5cUvsZst11v=BAv1&Yxd@qk(pALb~`<G)Qx(#qmdzj
z@qD2<^TF5rmrh>a=X?L}t9p_5hBn78Dg0K;K7AosN5b<$_x?Znnv-4x`yAe#|KZ3F
zN8cy&lKn45vNa$5)8%3iFqwIQb@5N0*t-9|PXnJDe%_GSz3b)F*347lr!OT7u+^+d
zZxE_g7U@%M?RfS({&(%`%`vf#f8O@+MQvAO5m+0RJon)94N<JI`!})O;B9&QC}YQc
zW2X(*@9;29_K@}a;+=o~Ef43nxK93uGmG<s)=r5RKH0QbRl+yGKxT85<J&*XqA5lE
zbuTuTJb1`|a{oh}6S{tv{<Lmi5p`-~;Kr!=W|a@0%!;1$#d-Vhwqy6iTvmtpKbiJ)
z%Dt#P|1PYH-&tnOWii!^xm9lc{Cl-;Q>&g|&7XYy`SKdQ#lP4-&1inQZNm9Whu)-w
zKMRr;StPIcug`tyjOpJ*4jxfB%Jw~YOS#L$n=j57=th;z=X2cVxTHOa`S*#ZA4_$=
z7fW8{@zh+{9seNU38S0tadlCFl>Ma+Go>4rF|}CLI&@Flt@=SKeD&3L3oeK+k^gs9
zKG5W%_wo4^jbYE$2dzl&sA+sLt*8CE37e$B(dzb>kN1CC{~|j6pRQKg^w7DF^aLAj
zJ#6N`e2;zJw0(^)EIFFR+WdA-SbW+3r=Ijqt{1yv_`1}CpA<<wGSr{4il^!IrE|$Y
z4m30Ed1%SL@r?Z6+x5CzZSH!c7}$S!SDlxr^*qf@d6DAHpQjgnux(tiz{MqBtETrw
zq?k|1^_O>D_wubgo{@V=<Ldj@f7@yw^R{SOZi&C<eL3mj-D}mea}vajw%C+TW8<^A
z#nx)!%)F4}D^Jg*OK+~q^6$!isw7+Sq_XOfaD2{o#RLDovnGd}(b-@Zk+N7>)3j-7
zP~$VTbD#eeZojVH5%gil#af03LL6<a`xP!(YX#oQ{wR@9^S;$?)sF8OAzOFe<hi1F
z_wVuh|F|DkIefWR#<VVF+AYC-Yh|2uJ5yG#?KiW!S`(FZVxh9&)T^=TTQY9mee{j(
zR^+_bN4X>&I8DNMSx+A>&y8PtjW24;9nt*$)R@-858rKhQuD(4ZeG<(|N8d0`j`GI
zqC77DY2B{5-{x*>?|UmpMQM(e4{N_{)c?o*Y4gU`s(E)6cAUF+(fP{$=Mr-(U$bx7
zWTM=_CnzPcp~H;fL!!-Jo;An#=Pzii<zM-0Zc^lppBHlK-ZT4iDa#*|V32&d^Rl@8
z4G|ut((KJ5_oH{I{n+m?gV$}}vZpJHwQBtjcm(%6YYS!GGS@+o$J4;8d5!XR6W=^D
zgZJUt1zT5Eb~oAVTk(DJi7RHuoo_V$Rs7UG`N`MzRN1B#9BUaJe401P*?;P2IDO5p
zbknS^trhn>pTGE7|H1$1ljC2Nenp<sGnnzTG-y>&US-??eWiCDD;5iGTCAMJxBNu!
zcGtjaO_|=#!^{_r7H?Z5bK`Z8!qTIy&P$zJAFnjkJimLZT-oin8b9{S@BQ-s;-^1L
zUYI{Uld<-j#@&><gJsrL4;-cL)yK?<?a(;q8^3V%^LvX=FTX$O*!LCom)0KJl5z9r
zIpt*LgL4wE=54pyFx%BAd2{;gdn_~mO)1$d&dl^xaGu208qJsPm#4b&=DW=8xxCgr
zu6x?<3<ZTxTOwm;-Hm_ce*d3U?B0?vh7`;BJ2{(AtTQ)Lu@c~MfANsNw(HPFxu3P_
z{lYyT_HA@Fsrq5~a{9F_6AjZH?R_@i5?{$%uc*@TVt%7`G?=;M!NcbohCAXHW#9C1
zQ`)%lV4;-tmkmbqbOJtX{r|!K;>zp$l{KSgb2|J^W4oivs{6;|8y}~1){gWYz8@OR
zBtIV9EAmo0`+LZpwzs;km&8OYeDkS^!M7&vwcR-`#u<G}*;wD?)a&t9%AfFO<Fj+K
zO+GHcGfmUD*74gSeG%aUbq^LUUph@-tE{!}hI0>pR6Mvje_{WhNA<3L?NPrCRJ4AY
z_|EyKnYuYr^exZvCzT9Gcb?>ye#O3Ub>0uFD78vvM@E;lx;74-N`_`X{+sWzB^*3b
z&+GeoSLq!yJ6L__?EPx}HSxCvJ3JnyRozkBS@pbKKXB!Q$ss?o`*SBZ7W4DIwRTfx
zmwWK_M^8_=-fY1p$rtu7WmjgmY{|I!F+t#$)qV@ttCL>+Uv=uwtVR5}6EY&siyD7^
z^yK(wzQfXq1}~zYry3n;&{}uq^h4LzK}H{rO>+_Pl~uX2=&2rembcmGUD^*WEeVhN
zr4?&e-Sy~ivU$ad$FaIaGfTsyR_SXxh-A%|tNeGFXWB6l?z?>5N{;;x|FM6!KhfWQ
z#nfFm>BAe#Zx%nD1Ec2bQ#pGiQRHjyo8`6qHYXYMPn<H*-x}z5t$k&qVdmq+D4q5d
zl7CL^|7~9KY3p>=rA68Y_C>CJzE*7cY0uilzcsJzpML1%L9@w=D_GX=wqKZ}V`}(%
zMZDJ+t_LitfB)+Iwb^%lYr2n%(Cn1S+ZC&xefp&-;O!}^6eRc1=itA}2P^vncZS>u
ze8Aksl=Z<u?d!tx|7S5thuxLC7Cx=Fuf|S2n^}SN<rXsw=AEI>H?{Zen)vHrXu_=}
z6`Q6j{jq)f@5DQUnR@$E7q8%19+cL2YNtu+bM+M)HaVPZ3|v_$7F)n?Ve&?*sONiH
z6>I64qcLs~{R^+J+xeYwNp@(|yuGLTIZrJYU&`BhxFCXOQ`wQk-7lX-ZOPdAc-O+K
zn{rGSWf`hh-})!(w`itzy3Vnjr#IS@`Tg=!Rv+*y5S_OCXThu3X1#|GSBG~!a@GI9
z9Vq;O`{>lhgX<ml&(Bg+p7-td+`gFZX}fb}ZpbB@7`)pie|y1)=z7P0KNM`go{U%7
zeCt-7?m_|IkJ;YcCg$e43I=z!hf4~sVRnf5{7C%2wAJ6q?=PPW-?z|+W81^2`_3{e
z*Ip91$k^ypRIvVw3-b)-*nNk+CZEvp3C^o@yw~KRzUOh-7G3M|nX8^MeciCJ?*v~S
z&-Y!MOx)xDe*do=Yx()xv;=`;`iq*&oecI*%m`9ynKAimiuCpDW1LUiTO|K}{4v4t
zipc91b;(j&z6&?B=u0enSbKc?Or^DMcUI_pOy9BM>HEMnTb4*&WEW=sRKA-}e&wn2
zf8R{c_;tv0Rp_Un_m$hfaGuC5h*c1}_4@?(mlNIg`nHy*TYDsU^ZXa=oi>3>nyXDi
zqBHRQjfZ8mTn$g|T>UI0x!qp;<sx%oO?U2=i?+W{N_PYt4e`r)Xlsz`lN_)&M&$NU
z`95wzk$0*m{>$0_G1zNZ>M0{-eyC`d@K-w--yQRv7G4N_?|fa?Cw}2&``Xq%`=5bX
zTVBo1Vr=;8Waj()esyTvqKKu|ohQzGi(K?^ftap!khVs<`0I@2x7|M;tS!2BBUMRn
zoBO7m-3r}{m)D2LRIm8o$Nwh#Hut(#ZS|Gq=bJ^mc)WgWIN7mjR;<uA19|Nrn*~n_
zIh5-6oO2WX_5aAP<4+AP^uFAhvGeya##fmE%eT!eR9G-Ul=+rY%H_{r9-aShwe!c$
zw@a&}p5%mPrln0<=jS*1xUD;LYt8O!7IUPQX1rfvvQqD9u}S&QTDHhyp~OwUSKsvv
z{GM`Yp}W14f6b?Ek*?)yM6S<BI<Z-5NAs7YSBEq!`JBbLSa1KmvWYufb9cqmrj2o4
zeKLabvyaO!SpEFo()EAu|2Nh>=jSo^Y})6>^Xwk`@3Gx6uQ|VFe*1Ts1r93vKK^cT
z+@O~EFYDa4nMSAB%<RPZCkQ{RE9AS=|5lx$Kp@nQx3^olq*^+7YQlwIm$+8vIxkO%
zQQqTc|3CY`Z0&#h|M5awk1_Uz>6b*$U3aRZ!SO=Ywv=9Xi9f9scfa?(NoA<%kxIR%
zo?h=Ywa9awt?8EOjJfmou>ZE3^CJ96P+Kq~=e_Sczc8hWrI}sfzc=Oa>9>z;|1z2G
z^)z}dv47guDQCa!(5f}@nddOW=gPUL<lh%I&tJ4X{%7{oNzxp5jH~4N)GabkJuM2~
z+dpqfL5!ko$)5|(HUF=twH^E8>cqKn=CL{6PYyg?I4@-X)x!a|YofNiDJgi7vwgl0
zxBJ)Z)Y?6pER-8A*gbc2VBN==6>?$LF>QSpE$$*u!N1Na7oL9g%$Jw&_;H~;?kC$*
zWA2hCM=m?<ek(jHXRXARjGLav7;TP;n)tkD<C^&CF#E6mf3NygO<x%Q{}3N+a#Ow3
z?lxoV)hu5|nSZ+bH=Sv?r1*qy;=Dw|eGVFeUEeR&nb`%%n^u0)J+(QJqwQ4mRsKS4
z!R4a%2^;J_J<`80FWJANvFnRpYj=q7Pp_pOk!)+YgT>cMsjIg#<-FM7wB~a*_e{%E
zXXZ@b#<X%{@}talrP|lO>pkm#tM5PT7UbxWx=pCT(S;-5ykb+ZQ>~r-TkEPO#vjL~
z*xWI{<o+S*itw!49X#G!mPRcK%5$}pX-cem@Y4Un?fbuHH9Y>^Sta*;&Sc(4%k96i
z7JY~?+h)4FYmTo{b6a$y=$n(e_qwONmW$gx|F8c4YOBwe_b=vt|7Sv&*s_+d*D}6y
zFAFUau%3E8ugc%7al+1<Ns*=kYmPmM(0^ep`C4|_!M*O97p*;(COI;&NvN-nv$?CL
z<lsB=?%`scNfUG!TFYy*Y$INCO;j~lHjV41*-FkMPj`J>!#Mfv<iq^-?u(DlOSKIV
z+>q-b*0fX1<kP;Aj<ZQiJ)<96RefNrdNI@g;!64bE*B%-%!`_D_BmtiHQi+Imo_Q+
z3vB%kol<xqW4v{X4AVEJ#sw3;RUFVdlkT}QWJ!{uyI|e=+i#V0qqe+xvw2l<el)w=
z?SE4CpH^&|nj_7yYwyuA*{qGysYSdpRZey)#>Ig_IxY(vf~4mqhAml8K26Cr>`;f!
zf`;42+k|*{BzTrcF5i-Iv+$Usc~sHu87zi}XKs&MxYUxZHU3xlmj4IUB~7Mo_fTxT
z`h2MX^SPr-Q%^55J#xTV*YMIQ!NyZfffJ%kc06COq4-&3{G6(<`7i!huQ%9mf@4J!
zW0m&hGl@S;TP3%sy1l)qZm&1dvEN>!O`+6)TS>^M@}F&I%oW$`D}T*sIPYt>zWr-#
z?=!tUs#Rx?y5(iPvG{q|aOKgT=feNl{{6B$etL(yx!J|92WnQ=C2kiJ*rt;7_0aSG
zg0i*GHm`cN-aAUYp?YFtp2DroY%?UnbPr0c-~VTB%0Dkv(ZXXlY<?T>_v!U&RP*1j
z`MBDC3U`9eLz5pD()YVm_t{-5)60qG+1~m%<Zi9{?NoEev+Ob&>Ty48)<5;XaOq5H
zWr)O*s}-@2WY$gP{!{H2v`Fw{qp|o`MFvlgw=Ie5CCskg6XiHjE&a7Cf?Y3DSa71q
zOONvm`_mmbavub;DS9Vnwuvp%3oKJz8#F=Zz=MJWen}>wtfw|V4|%TakEypWFgWiY
zCm?-@t;Iabp5r#lG4D0Y=g<55MclPLB`v+>%(CgFJ#%N>P7|1V>)9^RrSYsi67$9D
zKhEd4{pr#b%a`hv=9|Rx+MPLm3%FRHK7G3DM{2D#mjT=7m_5H=ZGZ97|4)-ZLSk%k
z-r<QFu8+Ocf9&nxVN3DoUaIxlL#f`tr7^+dn*OoSZZTc!AA6$G4{J_Z%k}h9anSC*
z9(8AltFv>}6&Ef!DE)k~)}dds;<p%8yGl)9dT}rz+hkQpvNJ>G;=K7@-AzgImLCMZ
z^2k4MUg6XFRB~z07nzKUo05B&CE`9-%;|03@}wg_ZHw|>{;$RLpKkA0Z2MO{|7U1s
z4v+F?X*rXdC!C!#+Fi9S+_u+PnRGR&ElvG=(83VG)GPKjUV9g}AKl<8{5#$5cmInU
zm*+3(e*brd-v0kqsn3=l>1Yiqif~cC&aCr>qn(#&Z==B1e))xe`E9+E-Q|QQNiZDz
zwd=QoNpj*Zo3rtI724KsP!XPG+rBbAqyNJH!xzk!uH4-m^!T`H>AOF>?U(KUd-?vv
zw6FKF8x%SZur^QHRjqyS!L9Q_rRfIGa{m6lalCG#-2W%~p0ZMU{;r*22W9_#Hez6K
zjOgZd_Eg=-$2^tkme7U`QkF#lYiCTI#@OY;wq}*w%ISZOtpCGZ^>+P!pXc}gHLej|
zY5dAy4exE8a*MLd$6odrN3uBcdUhU}`Qy(0-^agP_&i_OpiG(RK%ATXcCWxqdF!rP
zpYO{`miu*_@8W}d$*Z3@EK{=AN}aB`+rqcIICv6U=WAbs3@OVG3YLr<yzbUookILJ
zkD7lkU3R35WyYa~TOltO{n@N}KQmwg<D&`oE`s-jTXWokR%bKJ>zLwoyM0H^JadWQ
zHCwlZ-`enURTLA)+r3HGE%T?@-L1_3c0YRBJEzD~2VN+8@x7b4Mm0wLQm*z<(W$$*
z-<uy;75cu->fz@6y-u}@*)tN}EMQQa*__qLB*$L+?)pF8y}$pizx;FizVqL=>D<r$
zt|-br@$ik(T+uhz%oti<mh5_+y}_Sb`?OQj*B9LLMa>;GWFBs`RfuFxNOgUm+3>Gs
zqgQKEq~O%8At|>CG>%=Y^8M_VadA^|sbjWtC*v1M4yT7lR)66MKK~-n`}j=RUo*}#
z9jnum;Qvsy_~dGJflT=c0Y9Gp+2q1GQLp&R$^O8GUR}|o9L|ep)>(bonz7U0L9wT~
z!bVNS_^!>dZ3?k6)jzB2KhA$~>9_sD{`!aWIe#)Sgl?Yfdnq8N^Jr3>9lwIsBq^oK
z(-rpLcJI5Xx$4@dDPBu8j-GPk@x7vKE?U5Oy!z!u@%njk74Onj>;ImrwogeYYwNPS
zX832O(9;al+ishDbFS{oyB4|ay8IHo3+~D7@{2DX?hnYSSZ|WhcCa~QMV_F{;iL=E
zv-atHH7t7HlbG~T<!i6Jvi$2!347*;rRi@z7d@%EpsM-HS^GcRzZ@&yr<J@>veM`I
zj^-zfJ?poN@!a}*Smx~t_X&*l5%wP)w0l23_CGC=q&JaEx<_g6=~wp0K5sRt4s%G%
zNto~A%JSu4#kq8qEDt7$#ZG!`8#taP<Yl&fx+&Ue^{~c4cV^cLi<dv=|1P!q^27bb
zr<K<;-x)o-*d-+`cHlts@f`CjQa2Nh$R)4Q?bml$7~vJ9@!jr+iE5Smwv-E7Z^oFr
zM6cZ})V^`<CT<1sm$LWbB-N|jnJy??%3a!VYk~EFVjgwfhRcucn79gidhxC>zQgwW
zQ<Q<L(Tw)yB}YC#;a1mSIDS1^|4?w!#*$g9&#}MR>@Z`}9}gZA)nbm{T)ih}mx`87
zzw+wKnu<B$oJ+2xi%44N_{C>7`*SR6{$^3itQ}GA5q#vv<Ie(b<?Sk(m>%w!a5?1X
z?<c!_C%xEvSL5%ipTSH#7qboSS*t{HEsU6yWXqhxAbK=XG1nl=Qf@WZ&RWB&Pm|*p
zEcUN$dbV!PvZE`zH>G>+5nsiyuc-g)?U?PA)z>zjwb`|4(<aT6XWksCwEBIn|HZ@S
zcCIV`C32~Xmb0ALe4*T6{^y{bLC^NiUzlNY&}x&ro%QA|4lkEhYTu1vcG8V1o5Q!D
zSJ0`jVxyd##fKRw^*V8uC(|!1I{H6JOZr00+Jj{e1$Z_ZvMjwB8U3hRMMZS!nRbpT
zY%_K(sXOqA?U%Bx*y0)Ml&>sGT`tLPaNvO<o5q&eLgl7uk`fJJb*~Qn{_^zxul$!E
z`|IY-`}swjHRk}wmiy8AOEMGl;&_(c+h<p_gZWC%K@Ky`2mApB0Z9di98NvXHV$)K
ze#I*?YDZPrOOZNRCB4V)ej5yp6dnk@tT_6I>#4E#pGr3S5a!Y=3SOtwSC$xWXyJQf
z>sGs%y>$bdX7>ugBfme^MjP5Ioy|%7wWz`W&+X@>f&TY5e0lBsSD433B#d9CBI2Fo
z%Psf+|C0Yut+#Qa=me2HZyOG-&3KUSQV`o;`-ofU=a$*0z5NXvlC}Q|ut;4}m~%WM
z?~{`6oZ9w2qlnL5Q4!us?kjlP1Nj5)TK{9naG7%P{O7oHyHfsW9g>Qj`XbbD`m(1#
zH9NU}N{aNz*M?l;ertH_`8U4z%l~aW%w!@km9d~vvG=u(@sFP$&FlJ~mlV1$fBLXN
z#`=$j?VpSF3ds!VjF(LJ?wjB;FVW%gyxneRt-taAx+@wk#<E6P_4-@xEsdi8`c^2+
zFx<Fp!Y0q_7Y|<uObv+BpYYP#sDPWpVY-B6|K{8BVrl+M>bL!fo3OL_b!mw~<t*Q8
ztb4*4SX5WL&)Lc8YQ%8uWYs+L8Ml*Ozv-A9_1tEid}-y6bqXsxiYD)8Kd|lC=Q~d}
zHXdxOT>s&3sF!QhtohSEO*;3l{4Pgoimfq2{m1VAlZ0xWuOt|R>8?5PeIfgbxwm?<
zXY4I<bC3_ZEO?RW=3H4;-HrbwB<ywkr0>6AWSrX3qVGR<^7Vr^ldF_cu1Nd|4_gta
zJHg(@<F|iJ2cONKJ!fp^cy=&6{#W<sdc8;Zz53W|hw_A8yn1WUA7}BCt@pjX*KhfX
zpkv!kexG}OEys(^zo-0ScI;C7rSmL|?SF=Dk~NQs+?7SC>QZ&mH;%r29?16M>1LUp
zMW-jHKY1y)?YfHbislDrT0Inam^+yy{GM8}Xv<178wfFNv<vb{S@v|N`IdH%?rE_M
zT!}5JLY>)eT#9+?{d*3`*M07PX~L{@<+aU^GwQCLCa1McEDIYy<)nQ1`ZdUCrpl_P
zCsGbCPBmkxs5)dTl=(Wu<A>dZq%-Gzx~|&`ed!L&`hLXu3RmWe74f(Jf8Z8*E4w|U
z+i~;rdm{c~@04#@A9Hv%qbTa2@VPd5hlLE+(l*C_zNY(zNm;(3IPcM%FE6{@oTf-w
zIy`(*Fgr<p<tC4XyDDD!{t~?Z|7dVN$Bj=voo`E}OY`K3G43qvpYQqco}d@+Tj2s8
zW(l^BpPpDU8h6aIxUnEFGM7o<WrJYcNnKAf_G8?tj0=x2JQZ8#wO?_Gp3-jS^~b9p
z{?Im@k@&*#WvisthQu2J$4)NWuxXL{V*cy|-Unu)hOJl2I5KxlQtRT7ZWc5-9OwUI
zqw@C-lc4^~5B5D4`e^iami3ayWfKHrv;P&YSfs|A++A{VMgE*yy>>pXdXIUJ{t(=L
zNh$hvJR^hcJdK%t@7WYOU$->!E6s@7tI2nVxB5<3jF(Esd(L#LXLmBDJT>-RKg;@+
zf<go{kM4)alV^=Pyt?K&^!wFZJ9J8kxpU1Q>0d|hbtg!;9=WAvbl`h_s6EH?V2f#s
zlFlhs-#h(Uh>y)$>Z-AU+WLcbTYqy{#m4P?^HI6~L==y!@Y|o0->^9^_2l-}K6dfx
z^xsEow_jeT%6el<j=Xcwp@$hv8TZ%rz0021t(m0D{`bSu^%s6H`(M6rFL{zz*yD{8
zOzPT`BHu|%Eq?N$?&kNMt)8Ag*M|ArEp+OhHdpJA+PxbhI*;;CFfnDu8QQ9!+wnDh
zi?@{i?!8Q0i8c=u+BdCvGL2Q?kir&zjtROQ2ixW1+ceK6mfl(+rfYrOqCv53)}glz
zPH$2h6gIThJ?5|LzW3{3{N>B@|F~LJeKBZ0Ajc^E_iybd$;-mxnTd%LC)sjJ$=>(Z
zi!aih**VpY!$^|#iN}lY)o!67eQTl|_VBTp_MB<k;#Lr}b%&B0*FACX-k_Qn4HC6x
zH$HvJKHO=?=(#QFbF)rr>~>qm=0AU@->VN^6h3i6yob3Gk4>VDw!j^csBhQz|DFHx
zj<x-yUEb%-st?>WZT1k}TEBm4)5a6Jeiu*ON&Vy+%(S5J?uCQg#h0H%#Vsk?>UHv8
zpd@pQb;dJ8uGXiKTwi$>{g|A@T)nhz?U4op+uFWGUky7YJWX^2Qk82ur#(w=@x9>Z
z`?XzZ%m2pZx7MoV*zTVf8Rf8b>$+E^uE&%GPxFPHnOj|F6;jf1&^vkeT9sWgTRKiK
z7BGG}`D5$CDT!BatW}TO7~!~mW1Nrw6}Nh6Mzdqv;}qRZedj%3(4SE-{r#p6cZn5B
zo0e6vTL*-=v&FsU(>mtYUc`2L<@(%7Vpk@I6-}8rf6BZv58bx84OO>Y<BU7zwJRGk
zrfd*R@cwgm{(pBvI~lq3-E|wH|2syDGw$)&T>Ve4U;oH9j~$QW3VqvL{$4YBvGPlx
zMSG2#xRUBWX&FVK6}kJ*2YlaMXR}r+$g?<Iwxwgk#?vQ1ZBr6&E?yUN>auy=d-Ipx
z`#;`xnk3qJtX0Qj=~8ReL$_9hsodgC((ONg{DFNkW2&scg+;09w`$g|mF-cuFMT6j
zu;-`wi<Ig8{D#)48rJo$Hs=EbR=9R7aa(iji0?{qhpvvymCaucO%c%5P}2u>)>8sH
zR>(O#Onb9<E|Ws*@i$X9e|f(DxBUg_YQ77>^8ZX^D_<0Ps?M4*W5LOlnLl$DF8Y4#
zNXF!S3EM6zwxu}sX#e3gtzPlbaZ7$}RCA_aDu=MffpbSB+0-i;^EV!>mF|gIvO>{T
z$J}0VqO8Q-6_u|-3iRrH*}itA-<y=-Y9OG{e_S_nqTjwNYWv@viMC&`ec$)#B_IFJ
z?^wv=eEnrnes#>l&iz+ejJ7T8@!(kTUwZ4N2HUA}?H@}yCh)Qxp5mz=^zx5qk+tj<
z<D!5Dqn?_04K2;OWv0sv7%pa;*%r_HblRAQ>%8~lJc)Y>oe^{9ikSt@W)u!wZtE^D
zo*cb3rXYCdgwTXLRe81s2Y-L^4i@21Kba8FQQF4gY9Mi|u$DXbK=Vh}s5OP$-z4~=
zrv$8U4rg5X<&34`3Qr!{7}f@%#_W?}fiEjvqTPbFTRmV*iD8V>E`6z(ns-smfv0wP
z($A?Uq!;yFi{w)`I9Km7@u0_a89SZdC;c3m7OMyCoGzC3V`pZT=lx)N)nH~3p4Qa8
zF29eZ#wX=moV4uoyj@rMxr%f5IzIJU>#Np$B4$hdog~-XwWcXi&(scIzE$$YY@Ky+
zw1UiQv25i%r-R(CpV@kqT~x*Rt`}Rv<FhfAzW4up`tMi&Uj9EDtCL`tdR4@7ovpuv
z!n`9B)k=&#_}P@V_-y{=aCK2CyLbBR`DeeVezW5^7UKKO%0c3tq?l{xF4-%y7BI-M
zaqQ{bww&)xNvIjef{=hey|bK6mc&NJEoeQ-{hg(DvzYF8BaN1JxtEJ?=9FEwYkhrm
z-Q3x;cDTg<{Cj_4<HSO%k59Otd~jXr#(PiA<+jS)waQB`YzR7<kYLp_ZA<Bgsu&(8
zp{|0I$=}2bd^T^Mo>5pA_U2imN05V8@!521m0O_^v&52F1-S(rS8z<b$+jg!#=h`b
zZY7`Z)QQ(#mRK*<`|xD;`U^*nUgoJdf6~^$(W<sFw_mkKcge|n>#hkIoJcsqIkC<4
z$D$ekVit8TJTiG@9hd8(KT=b_wf&U2SL|`g{^Dld%pDcA>VfAk96a8lk(2t4D|Pzw
zm78`bT$G%>=J>Xm-({+O4(z_d{^`cD=gTuPpK-M&*_M1*n7+h5R$W<T-P$>+&Osiv
zTu%}&1g;Fz*t<uEkD1~5Tox|FeG2y&3f&HO<#9bQJMrpe`o`3<FMp%?8^Y%sTHV{;
zWxau&Y0tgQ+`>E}dnZle7U{4&sT()dbdHSO7O6tRH~zaBD_-$OBrNBhe=T9b*8c|A
z?yxJJ`*~Dzr{Coy>9teCe*AeK+V|jT<kbedX(G=Zm&Ppl_pk1xm4j{GzJNtlmqYGz
zPKZ6zt$gfap#2WJSdqt_^D19{DXQ-EdVj#|@rI2@XGA~FElFfHef#>wru^IIXRls)
zaM?{p5zhlgzq*xTP3L+hZ(|90o93>tPQLFzUem3Q!Rz<xtW}@)<HPwNm3bjsk5B4)
zGwoKylIhB?q`Q`%V60tP?Vo*dlk!mo*Bx7R*_YkC%T|2T_0TEn?e1I;6d!rIXmQG?
zB+Q(APqfD2z!hh0t|bKu_v@Bd)^E+YxXE<F$>*O#bi{T`@4nlx@M-C+`SX_K*FEK5
zvTaRzg3E!%B<n9+9Kn0n&PwuFb0$`3QLlr6)5U#;Q>V#w<nggx)aK@WEa~!S7E|4N
zfx;3gg-^4hX7b+f+&SMtM>Wt<-tKZpo7_5PhBU5;#+mCGE_KSxoo(Y@9Ik)i(3w!h
zeGS5=Yv&3!_$hOLow@dQf{dr|&#X|Mw2yB#ALMz=^FUxt=Zcdq{8pjsm&Wb4sh&D5
zO<lEB?BYzTOH6a`Pkx;n)o}ipxdt=C%hR9kgsxVLxmuKDBXW9K_wg5-j^2tAUnEo`
zc#O-%IK%ASb4%6+ms2ZeRf~rfXLhDp{@gt=wdwuQ=gOCww%nTQ6q?^Gcw1BHchma&
zYqmU@^{^%*QnTk<RbHfNtC{l3yMOlHUAOS&mV4pC$F(l;@%GsMmtA?jySO+^WRK$f
zP|dWZZug)5uCrdcF_kgL`s>D2!^Tx&5^KxMOtOB+#-29eS^dxZtg4J=0n^R@$9{{P
z?B2*G5zeK3Xv0mR^M)LyHB-($T^W<hRq3N>tUtfI_Gw~*G#9Jn1NSGpKFS$Hn`w7F
zI3dn+`AKW=qnv`WE!$s&*+*ziO}X>HW<zdw*HH@|hijXT#lPKs)o}X169qOQ-ka7t
zW~lt0bbT>@S?7JF#z(KS7c86f|M0IZ*UhrH=GNHybxzxL>v6MtRbteo(-VI_Nv!6`
zHdmO*IxjZ!`Hin<3w}8~FTdSf5Vq%EdHiw@9mjTmo8<J5r|)nz2JBUfOvo_YVwW2Z
z8YuL3d4I2EU6JEWvFT|~6qu7`r7m($j<gOv8ZvKDfzvPPsbOL(51zX5_VeqD*B7Nu
zm*fz*vge@3>8C}}MicS^#Qw<H2w2YA^@CB`Fa70R`MoNFOFufRYfST)G&w4V<@u3}
z=7X&2!78R&$BI^acO6=_@ZEx`KRL~uw5Pm!z5K|5IM3+(oAY#5t8Lt1lfHDim4t-f
z=jZ*NtCssFG~P>^ZvTUmd7kG_^NyfR-o-)k&9_Akf3qr`ZkuPoXINI|_57{S?rXx=
zf1O)>e;N1t{~--CBo6S*GTfG=FnMn0ilDsQ#XBeSRv8Cekvte#zWtEWszrT$SO4XR
zeQaY|*=6I#lWDjqcG9XOdx65U%cdV;2)}-9lGUcUNg=nh<r=;z^}qf9dH<j5Op^{8
zb#4?bNN+qCx?!7?Xs&U^thHC~tCkk#dM(+zF1H|^cfG+r&!(*wMq$VA##r-a$L^o~
zw|Ce6a}j$5UY94oeLmxr^xKY%<(H2t@;~48e9kqS-A5yPqC#ipPmgvGl`-yEr)YKK
zXXTGIdBy#Pg%J)P^y}Z(hn_ja!x4D?=9Y$Sd)uz}?ELZ|q-Xc*ub#ILCc5&4%PJmw
zReK}*)~@Ad6S@Ak@7fi$ROc7tZ|3_KbIi)Oo;xm~xc08!L$h69G>RqEYTrxO>$rqG
zZkLNWd*Z>v&mN~T9G=zwIKcc%09=7Bzqe1(LF1m~WveqfZHCbkA00m3%A@N)cj>&1
z$s!$JJnU5`2q+jiSXr%bJ-v>l?Ssti1p<OA{SLp3QVRLPCu-UfE}J5pzwb}zO8uVY
zzgFf~%&B5`)0p-q^kPri+PSyyZR&a9cbD-o_sYJbU)H>s`tNT)2lKMb>rzpH{7Y09
z%{A-rd$a7-(?48i{o{nz|NHXv@)m>2iACDpLcW`M>qU9L-1!i}_=kZ*$#u)+3w!3e
z%~@N&T>Tuk#m2?<ZthXB>Shgz&x`Iay7E`|l*Zgk7v_X9X6(JiCSEp0Y~{qVyUEK9
z_g|J#?x=Zkse4M~j7ZsVPhXQ;Iopp(wOl<r<K4gQrpeoWiyWC{X*_#XrR}2f5F_hn
zRk`n-E-T$|ymG_u<eO^~>PmfAaJ;?JIypu7gT%KV<qbD^cO8GZKw8NxbMo;STDD>r
zKljD9{ET^PUX_2->_nEsk`0Nj@2*Qsv`Ig~R`FB6ZvHWTyNs7o?Kb@-r7zMu*Mw{5
zx`lz-kS2|5AMemSt6Iy^YI7`TTei*VKjvGOu9#Nzc7@^%21lQONohx<1hOt}igr}&
zF})(HRLfnvdfic{TUT#v<;YO@;B?+EZsE+;(^Y0Y;BV8A@ec6+&#{#4xW+|ur-v2&
zTMQd6W<<Pc@Yv|QN`oV*=3-oDTcG<F*7c63o;<p`dCF-W&f*Na*~@CuW)}U~ykS$0
zA@iye*R!l{obByjvW|`EQR4e!lPc6%1SM{%T|7J2viRE7qF8o@+nEglZu<{=t-f+8
zx9_@?^zCroY|hkmJCEJHx4R(zcKrVDP3yLwW(}BqC)ZwSR=l3rizm|eqkrG)dtvrP
z@sgXV!j(l&?}>!FR;k}?o9jN~P)JqS>bn+Z*Y;1pb8o>a;}7jmb_S(6&U*N2n{d>Y
zH*wC4O;Y+-m>5MC<sD;lzMh-!`J^CJUcq<sjPn=I9C1ypS*$O2>5Prm)iZvMIgwL7
z2R%-yU272MwQJrg`7DpzC|`%wzDFLu@c27v#Y0^g;VZn197!={N-HidN;N-G#_-Tj
z?6_^x{TpA;ulRo^EqvFj@;lkHW4yY>bid0hxGc_?8XvbzL7Thcz3smalTz2Sd{sXi
zGTgdeIch0C5lCD$b<-h@<<*xmE^gY*x`0Q}V2P;WRFMN8sxEt&8!wyUxHU^;ksSA#
z8KIkV7J4i){n8`r(>Zr#@(v!+vpa2b^TKY2?qK0ivi%ZfK5KuxtGmd%`<3PI9=%vy
z*uT`BOECO^{t{aS(aXPsy2W&}859r1<z=>orKx4A?p676sWW7M(uB_%S(Tf2-ntQ*
zRsJf}Q*~;c8z{XL`AcvMxE!0{#^u0~z~Oc*I`hhV6Xn&y97;i43K`dJG7T#7nVfPt
z?n^RC+*zf#H*R;i`~8KyJWUK2-d5>nTwJu2m!o##5`&tZcf)UTtO-ae;6GaROIK}u
zY1bUyrCxb6xn^2kJ$~rI%SBOJ?sOjzSUIVJL1NJ{0sDNDsU^$rExvNZfWd8ULb}U`
zJm!PdCp~U=et&c!m9IRd|E46<-EWukA|HQON;qVzD4i1dt7V&s#+5}+<u>2XlMtA7
zspX1yU46qO9ya0H!%n|@>O$upeRxS=SImMtm!^DSat;nQj|!Ra&U>-z>AieB4}INg
z6&n`%9^E&ar_;~1a|P==&X*hIx@$|+U0L$g&YsKLwKte2Me)~77Lhxz8w$3&%*a1(
zcWm$NuiLj*^Q|*IXI@lqw)=x$^zQ9hdnO2O482?h%9p$5>eg_ZFFqT4$>+xF<qw(p
zJ?}2aV&nd$8+!P1Slc0?T#w{%#gYvk8Cx<g7QJV7W>B|bU}NOEc$rI~uy+0WxjamT
ze>+$nEzh0s&V|iK;*vtci)oj(hMrpcchBOx-g#T=A7sVbJf79IrEAK%Z#T2e);@dl
z`qziG`>ws=TJh2Pm0|g$z}(5%2P7HT-M4>yZT9Rs^Cv6&<8^E1^S_>I&U){9{PVQy
z+x9(e7O>1Unt$Ecf3{`d2bph@O7Caa${mxpT4L<9^`_O^vfSHu#h?B9CUJX@_-@nl
zdpS6)pL6^c_I<sceZl&xKdsirbx*5yjd`S7bo*-)57X>Wqo`7&xpo^YIDTtHFeJ(>
zaLlZE(O}TqR9ErtRcdVdV%O8PEIf>B5?(w^yuR?j2Iu<K=hEJmGb^k!mq`4<9K*=)
z=>A-V0`=FrG3u`@-WF~>*dn{}#;J;Eeun&~H}XvL%uc+hQQ%@+T&&(_x=4A4S<m{t
z>pt$7`0@2Luf1|N-k7wXteQ}=xA;mP=jE)mg%UTCISsZ-YEFLp#Y1iKqnJ%6)2$po
z_clCQ>+odjfd#elT}N-^yzZ;Mxo@Ma*$w7`zMS$q?@KqVaXnqj&2jrwP!`iqg*B;?
zs@F2|vL@P9{Ezio!uImRVtK)YjxRw5e_ewPue!L!WYhKL6|SfMvhgSy%=*9}$=$;x
zt?)>_Zhvfw&|SOhY(5N%a+%o=C$;~bySr0m*=F`fXQh5^4|-Ghu59h=%Q59%w$H+t
z94d?#<nMm{x$NxmwX-h!xgT0vrjYZsJi0#T`oUu5<Xe)a`}+bFA6o9?Kfrg4{V%5>
zf7#q0X;#<j7&P)l|6X0>dRmXIMOJE>Pq@Rpb>ZGyY^)v6Mos0LQ{l(3z)N}4l!n8e
zZOOTF7mDddz4I@~U^b}edu!q>Epe;=oW`NE5(Z@^$N%}+yx}<f>&w2oIa}Tw$-b|5
z<0kLpI_1EPzf<ksZ+XA_X7=uV-|yR-_1fxnh&<XTs_^E|%7Y8UbiZ3E9C0geUvZAh
z(5|Rw-rq9{u0ngCd}VDdEwQb*@+Kr|OUBDIg&PiQKfiy?`0%Tg=<Dn!yJDNoLbhaF
zT=ewWm+xuY=3ZMLwdGBS;fa%G*U!GW&>K6?QRRUBo`n{?M}Dukxgv0Jm}>iklO;<E
zJ}~DjiQ1BJag*%fhhe5GuO0C37Sja@EP8tFB%6aq<s-i3CUf<dq-$E+JI-^MA>_>7
z8k06Rb(woWx0tRukI>ePi;G;rdhTc$uDDzO$m)&W^(uoKIagLrnY%D4ZQiP*I{)LQ
ziV45|{K_}?K_*N!NZaYV?M+TEt}Xd<NQ5;>v#7fHlIo*hj0+EY-fZQbGSlw<J7bBr
zvWqkB?=a{ot6TUh=<bv_uuUMnAVwL3j>w-hiN4oW*QFddE{J!1pX@B*BKw42{iJk9
zL&Hv94n`K~uUb<#cVAf(y6!hO!mS_^POlZ-?HZ(Exnjd@Gp6#g*(<g-Ot}BzWBW<z
zo^AE_59oCr38_n78xtXHx<}u@oL{QyYs%)xmv@`%(yemCK-PnT8{~CsW{Euc`KGT;
zi+033dGSqAq5t4w=?91J$Hwh9S+0J#Fuqh#gyn2=Tb*r!&y@sFxPb#0q;<FFn@js2
zono4KHf;Jf;oFREJR-J@96M_nGlL85Ie*P(Wn$!ILw5G2*Dgz^TWQRZVX;y<eztZ(
z;eEbE&<F#W7q#V0)W#hNc@hF#B76K9L8%kw%BU@G@(gnwGA?AXJ9EF1lszxm##VQm
z^<<beA0)yd`ZI3wJ}S5prc;v9d_c_d3>&lbRH0WUub-@1b~59tiNPK=37x54Q%*kx
z)ele|7Z<snUMC=a^%D<6^p#I)Ec{ldGPRyvdh+qt$+sUbJUS$kYAh*bTQDak(SGK#
zEN4YVw^;A(ZnMs+U430@D*z9Rs4W>cRT~5@u5p{l6W-ucXE8@_*8JH^WA=H(v9<hk
zYOIMnUwd4wYA@3w$t{Zy`1@KdM%dpyEtZkP*T1F5t@Fgoumi`07gg9edY_ieGLbSd
zv2dt8ocx4KZROT=`U~0Yq+OSHXCWoS)b<6!i?U1l(j6pJi`rK-`hE3VH0`wW$A5-i
zOQxTES#t5kzQb3(99hBoL49ePY>F|mgD);hP3JoGm*LZs`*#}`atp5YQgm;9D%tg=
zcjEE4YL|tV)&Az6crz>Lu<XO{QrFnGoX9YH+RUr||6bOmsJ0-KaKBh|{b<32#nY6t
zuCd&osTUs}@M6>dhXuP%GJffhvN-I?mp?=1E7Q!cLXv6C_AAaYY*5?U!Z7h`*W_1Q
zyZk0zfo4Kb!tS0XtFE@yMp2R1G)p_hs@ikw!gy}3*bb(uX2VZxN>2)QW~RQ|^yl68
z-zy`}1t^*;8#?Si@2t0ezWrfuUAC^)BH#XvsA<Y!;)c10ebYAhFYQ}pCMX@JF6flG
z;$2Db;;3bJ9;tl&arlXWk5*__$V#&lFF#E<K3hS(*==#?@+?K?-eqc2kiy!vdzvge
z+r*0}Z>*bip2Mi5y7>vO+pc}rQYHAZuAG`ObMKLSkI&qTpY*G&3_TmP_MXD@+uj%V
z8FtDkJ-xDG`iZwi6VAU^UVhnAN(?y$T~GTtweYQ)&K+`2H&|iTlC-_2`lWW-*c~fb
zTiS5p;RKV5cMh@qJXGk_CnM%^GwZ|bC|#qNA2#h-h8MF0u692uvN|E!G5O(_7tg++
zL~c<y<AQ~9Wl<W<cH8Y;Cf-Z@)GGAJd<xgB*s9aJqyDsK+_%_S>)6T1m6f8<G37$o
zX_du+i_;eCotNIK(|l-`!IdpGiQNHipqXeyF3i~Joe{uP?zY%V&BKXzIm_oearVi3
z8WMJ|RhZrV<S1j;*Y|=)Ze*FUI9f4tcI|3rIq;&uDm>C{uAI@`z{=h<iK{44y}N_;
zb!ySHXDcF;*F5t!&?s4XPVkcZzgq{b6{j)^n9N>#)&J;!NtRu69e-Y(!vEy@kLtDi
zjU|q>Tgy}lAvx;eqNjNr2J*?qmxY&3yBy&AV*TbN=M@>w7p$?nP_i#BYq6JTl8LUu
zi-^Bzh*Z1#e4R<4*p*An3!jGR>$FO5xl`$qu|q<@O(pb;+mF~7CWhIjtSl47Zmn4%
z6XHK3YTgQ_POhqTU5T!op38f(E-rd{PSQZ@>%y!5wr6VEX3l+F(BbDaYqw21Pg~i3
z+2&iXR{gy<?NZ{Oxc0*<@9D3<Smg`q0vHJ7ESfuGc1@!|s26MOzr|0NExno(v^h|D
zxpeL;rjYfaUv}-1UJ!61$&9%<`oq2tF*}dQt$HfK5f;v?=##Y9fv@gd$<NL?aVK3(
zrBZ+1&Df-PHRILB>x*1ZzugeABDGSom9zUl?}le3JAW+rIQhE#1NV;JnF^J)j-Nif
z_gmr~&^^a*x<Tg0-K}Xiw;WKu^;)9sRKbDg7I*Ddg?UYho3YSsuiMd_S-gw)NO-N9
zwrk}*^#hkyzFGk)#8bCRy-5&DnfvP7FO6%~KJD^#eKC3Fe?P4Mx8ZQal|@f~u{>9g
z&_4W8q*tbD#<%%D1g`$bsr}jif30Z1rPo>NjBYm^r6t{XIXQNz9C_hADbUmV+{%{)
zt2-1qQldQMbv;&deq7=$GO<ya*}3Rz_rfKh^3lBgf7GO1Da&UvZ1^ehg!ND$*YPTi
zNpBW=Eb4dKC}J<Jp0A*@Ch|jpbXW>Mdr)EO#8*#kRNebL@~_U^oPXl;qIU~eKF0p3
zPWmC>8g%$iesII$i>of*+#a{^X{%-3x`Wp*DVQ@K$l9vpV7S}FxpnH&ZQ-&HF0f4p
z<)clD8yC2WaNL!AFTGTw`Cx&GXYJwSMaQeyj%Ox*TJ*w9H)>mX+H4+{)lVL5-k$%3
zLAK&YrIht2iTM|8A01eGebuIG)6&<!DBa4;GBL^}|8vf1mPMMMel&-bP3657-NQJ2
zg3+x>FXq4W-x}=rG&M(MWu2JV3uk^OiExIlyyaao?><C1bs9um&)5=ttmhlU-B-Lx
z$_3RCXZr3ZrmX5{_te|o-s@%lGU|*qyG6pE)iT+O=c-k>Uy`&6l75>Z8hL=FedFoJ
zd-M54M0<@-KK>l6B9eIFy7$L>igi539B-B@FgvWb_wkccK77eJ%{n&ZqWbFdnWyHk
zCD*!qtjjWcy~U<>-m9xdtwPLyHoII+3cL5Xpz?%p$A`qQa6yM_#qZqu9$n;kx+$`#
z$>;RrWs8r?DR6xa+<b3A)=mfQ?#o+DYCG4>tL$ccWD=?^%D7P|SETBB^<D0)6FbbL
zd$;{-F-%zgvg}o4vhB?oYo*^Gk|@1?I_>-GZ25V8z26JWd4Gi!AO5-3N_)%Z>+^0}
z-pb}X)~oF^`O4j(M#dW{cO`uJE*#kR_)$P}VP9>IgxYH-b5*wQ7k^w-&wO_(GIvMz
z&1t@|=?X7C{>nJNQT@e-$NHBP*6VIRuFfDh(eZ_{`TUzJ4;tDT>wnt)W!Ejv=jPAW
z9kp7x#mGPJzFfA`?A)I8UCv#pTYROISB9$8vU_WD7rn5)8}~A>W4;R4;q=FztD-0G
z59U`|GRbm|9_tYUiJA?EI701bXY-WqzIGy}`bydF2Yvew{RsT(-XUe7<Lq=*N%KJC
z^92>kw#_0vYA5A;E?oKfearJFd{QlbY>aXB0neB}-#g$Kx&Gt%U7zO7I(0yF!^V3z
zqRc;k+p|4*WAD{)>ACBTrzCb-wiUU|;=3ff&?42=;K9miTqR%M-2U!6Z|@iL+$$*!
z2687G1Ep*~Ff48R7Bu7d;o}axdjsB{VXn?Uv_f(7#;@tCBjiPdb^YfpJM^h1YyRQl
z`7*XnN6*-Vev*87^zo-3s;>6}wFOMQt~}X(RJd@~+}Vqx*1GxCG5uq{cX7@4J0hRH
zdBnOXOj?qBzGjxz%}Ou-c?)-*^fsyfDztR^vlW4>C!g+;yEplms`SLahpSiQXY??Z
zxjs|byT@f}QDB2POO?Rq?)!$<vlp+(+PvlaOi|IWmj}-ARy#OMcoE<(?XzvQ{4Iua
z8-n7`Y<2KEVKn71tL70eb?e)u%PyQu`LD9+-?m--M>jnDeTy?)`kkUc-<I<_HerHO
zS1!8qBYL%F!d;c(V1_#5^2G;cIc8@CSj~-T+gPP0wVKbode7CFH$E2o@+UjnF*6)9
z**f{lv&MwjYo1vZ^0JkWT-j>+FMoMzJZ0W|r@H&Any-W;-?y%6$aR`7XQ3PY;(yx>
zpMM2Cd^VqKWb586o+5QqKg?g6BdV!b!MeP)X`#T(wo7ZPqVMNg?@*P{Guz>xn&ilS
z{nI0X{GUR9n4C{!#7xRdU1#g!WA`UruioKhYh<dxM<t0{)l&|wOq`ih6R~#2(y2>l
z%4VNA)cx^?`hJggxxWUXr&UE4uAY9APbXk=Sm=TUQ9=O?MIJvj9Tw_!%O_vhG$sA^
zgY>1G%=ce@+7$Rw@bSIJpC^X%)SB=7@qUuuvkh{7W&*KxMmCIW%M%T?KF;HQzsKqR
zuTS}}LaW$W8s38z?MYexSz)Ddvml6T&6x%r|EEcPT{}&lUgloS#?#}`*<o_cf^p8Z
zg_+A0lh);`-D6v?=`!g<6n`_{eETD9F+G14a<DG8o%F23z_zMxS4DD?u81-BBMFT)
zI`?;*W*K}bnDOBTyHcUl?awo=NUE?O*OYlb@h=1O#xTvGyu?W{aTbMVwoR<GRqu4v
z66)Vr@;TygVyI?ns-B?ck;7$7mIs!^oR98}?zGu6zq&fu#ISH`qil28_VY%5zB|92
ze!u_Zue`oK+n<JBOWZUBKVE+D!!a`6Lw#?>FWX%;?^IHay@d?-T%TjhApMxV|Dv#d
zO;ncKhH$@mHm)<j7`ax+wSSkLe5O4}(OZ7cM_H}Z>5=YCU-|<TM1&UvJ$PPpy7*Jw
z%C9_atu+fK#4a-0@6Y;C<OGMi(3*Z}CX2x5DuPM#63pMrUg`6i#`->Vjkt8iluz25
zrf=B)@#k;3npsX8m&}RO{pVwTe&yQ(uX~uv+?LtM+0U)}oLco&x?aJrdv|Wj(zfrH
zUrapCs&nwf_g{aE>`d97p4!Q|KEJtMKhVZh<1y3WwY&;}=4scDbSXOIK7UbGF8XX&
z*r~w1#~kD@R=k#J(fiD*{3vDOeciomf7@O+yj6I<^s?^6l6L3DVt4CB`?#KLRNME}
z{lBzmgu0c9#ZJZJ%Qe%ZdxdJ1zdZOn|MA!VJo8;0CDVKMpV?hH@8)xboOv$)HMYvc
zX?=>6;A%D1xPD1&x1GT>sYSK?w#r`{3;%6jBmZSrwD`OByWKf+zMNsT6A!v#A{%l-
zT*CQ9X({{Nj@+1Sb!S@n8J9MGa!;wfcH2zsQ%wvjTj{@yAe)z55|dmE?$j9Q>7P5b
z@bYE*L&yA!eN_r8pG|r)clDLyb2B@XWY5cYaT$fJ^i2`nx$0nn*z*%5>?gi_pODCG
zFTvGoBzaZTG=Xn>OVHATiyuY>t7IP+p1S?4m;c*IqRE%7XV<JSyYWHxR{5N%A0(Eh
zt3P45TJ*c;hK97~iCl5!qh^<SJG$yNKWwbD{Qs{1#s;2C58dZa*O+&RanHR#@9xU!
zJHrJ(CRO$AIoR=(G2Pkil3;PJGxx<WV)9$Oxi^0bomeqx(cZ;Rk`{9wo02J6rTsa4
z1(WiO7xUKa+{T%ha7UH>*vkWl<rf9AJ-wK+|5W;RrLVr8-$UfG`I|Ee1Gd^P)^uCK
zd*)h}nRe2Zg&$N{Medsyx%52JdT$<B_jbxdKKDj-FTOWF-2&AZUNbZl6c$cgbWy^x
z($+-BwyE-7^&d}0U51~%UVUGkC!U*c?f$i@nT?(OWoLg)n_TU?<dUa%G=DvKdp)DD
zEQs-Z^^$uR>=GDUif)QVMMW*D$!k4ykwv!RMP}ionS0U$mX}O;UiIpbrewIp^6Gwj
z#mCX7(q9~^Ucd33^g=nduDFvnA1}0)$1hcV;dF1lgmJxs!*BTtFPW_8_x>qP^{$jW
zoS@<Kk!22toR-)pCNXzD8<&3`K?fe*Ibyl%$N^i4&ddAQ=S`U(T6gx#QhtryHvWs*
z<(EVhT`2l8BQ{w4;TgflRq9JVC;vUc_%5OOu4kUy{C^J%+2Zn|X3Soe6t_12jdI0n
ze*0fe)=s<LHJjaeUG|=@m}%~IgTk(_;m&VZZm@i_^YyZQ*D<yAa!jz=#wxj4*+J#k
z<K@12?3^%pm-1P!iduyYiavdOQyYaiE-yT8=X8Aj&n-7>3xW<!G_bEccq?A-o^v8s
z+u|pWuRk)KVV<I!D8Kh}^L`PB6|UZgZ*}jzpxs|P<ygP1;%nA(7iUcs+%$8|nfPg+
z#Ut&VtNAYew*P6j-g57{cLHJ}d#&qV#&R92(!67wk~($GJk4df_A|@2b#5wLpdGWd
zsIjJ|<Mv902$l$*kMr!L?$(Ehm|oiT;o#d{=Gt0|Y*t(If4%*3)`vNV1P=B-vWpID
zIngR|D4=InTfhE%UO%0JP7ekiv6CxOPWTlX{r!;hq1JrDy^#3o{XgbSTh*-8)4S7h
z?&?784T3YnDtBE}G@KQeth)AT8PlOzOHM1qZZTf!*dt)J<dv^ko-t^GYGHth-skYO
zQ(8SvI(%6XDSk-xvaCpZ+0qS8OYcmwkodDPWVhXhY4fI+J}mmJA@F{&S6*aKgv43{
zkB3t`zw~JoT%MTMx|KuuMBL`@P3*px_9dij@Ovq1>+!HcU$*wu<0)^Xr-nEM1eU)G
zzP;e+47SIAwLV^Ey3HMKC%|lCSW}?8V6sk|+SW76HniUIS@O0pca?@>LzCC)*Y|{1
zKJA{&JpHo9hub$klo<=$tZ#6v?U=Qq`oQz3&p~JPxf>dj8LgNfEIaa<+w98e>3SF5
zoH052sL+e=?eg^B$6mZyIp51GbKZ5fMe{Gr?Td|4Udpg%Rr2A8m|Z0^ua`}He(Yr1
z6K1Cm%I$rwCKrqi{BAC_Jf(B)!l5gwojlA8N>Vis7N$?R?7HWCsOMYP5DpcmhaNpf
zFI_D=H-s^56sZ5#T=MeD>p$B$T$4N_#l1fpZ<!Q1>0{4&oessGBDR`&`VvVDr>f^Q
z%GSlt+wFB({QmSxmIdw3i>}_W`74nv_;S%V$)fGwmc%aRY>uDP*}=yq;lM0o7X2yU
z<&~`cJUuHjN>|^DvHg+%>DI=yiCKFKe%eY-|8c-><>k5izx27N6xMbNzxUpox2Ar*
zgu=JDJ@eil`#QbbEBw~i9aggnbPa9@-K}_Vq}Zh9L(7_Mm+a<?Eh&}<+YU=CvPsQ*
zWRuS?&fD{5sl|L}y?ga#Vw2~7s(!F=`HQvhYv;cD6K5gw<;VT~uen~Q&-nW8V|slX
z+jlwfbmnW9tE96we|HaFEb>xvp}=jY-{Q|+T$z1eSm9;S%hJ-{>H&&79hSIzCGYCr
zzA#7n!=Z>8sTtdos;0$kJh(SkDoCTFYN-Qv`1zCVeeZ0w4sbRIo^t2&NnBGD@cxFN
zl<f}z@Oe%TZ$`e%Yjtwec>30Anvk^2Q>Q3iG5Mqf2@!sEDT}geF$W}EV<(D4J$fH#
zG}q2`+2%waMmcXDx#^uxO6Q$DXgIHImB->GD?XMgKKgJlyWYFfQ~Zji(e}gDT>1a!
zCHv<YFffWeTR%@cIW$P=NkOUimP0uP4y#jDZzWb7-ow_kK`8aHLQ|`6n8*2(3%l4G
zc=oZkMH^gHf6XiCBHw%=DUPu%ZS9%1_iLicuibL|rF2W?Nl_%5n5CD>q}?~H^P*lV
zt9;dP{w*hPEa`<XLnBAC)1B9B6Are!SlYY)3pms@W%ZWjNoAg|zSb<Xke;(#B1TO@
zX34F2dJQM0wsJ<z-0gGmo}r;z=%YioG8Vphyw*frsrjBn{BrN8*IQ)dJ{fwL=x&m_
z`S_3I+Dk&IY3I5h$=H10*vVX2)cQL!<3IDHG(nCZCtep_cyoniuI1lGiI9C6^0Km4
z9(D7lr|Io;pMLK@=lXWhLbtbOpL(WF71f&F^(o&)@=x78W}ddiCmj=~HaoMvT(B@B
z=u(S9a=ZLA51C6F)z9rwEuQ{HeqvSB8_pE3H99_@?i*jZZ0&GS<Gt>`9P#EeH(z?P
zP1zjeFV%BQmFeaRF;!Q=-)58JCcS5PVJvNWGVEm9w5PZDZ2#<$F!+&|!k|zq=;GSZ
zbR?+xw%61aWA)i*gH%pc-+aCIu^Z1fHlEKmui5+!?&a-fI-tWB{V)3LtB<S;`buI2
zj25cx3_5Y*v&Htp_vTe^EheAZsXA+aO^{Oa%8iR3iL@R0_1!?j#`7uHDV<r<_*Cy5
zFZ@^Tn!~#C?)_)w&gq938)k*9Kd$^T)hcMm)_q5Rym`L$-<Rd}Q_m~TcS&jausCXJ
zEki-=*EiN%4*mA{QgB~jsT&{H%4u4a2?F!{S8o;d{2*nem2*z@-t!X^E)><@@`(ud
z|Nq8*iiYvG4^;{pH}%9C6kdOQ`}tati{tkbH&3mf7_>QJlGanB_t|G>7A{x0WSy1j
zw$*Irn`xW+Z#)z1nG!4DzQUVBX3e2GnO&cS(=!vxygvP(eE9d#%lroq#y&c1d(T{H
zo?}Jo-h&&ivJ|Fstm94)Xy17`pnZh_&$LZX5)__&Vn5Q&>0GzD(P(erqPFm_aV0;^
zcG_QUIvg0RS-<RYRObAg7gir<+8HV^@^#IO^y2LeHrwm5tNQp_ahFwX-)uEZeGWP8
zJomb%BuJtsNd1Vv^52|akJ$HUehPW~wdt2?y~WA-f+Au*4dNAN1Yc?|dw%o-SL2)(
zdvg|N&r8gAPd!L!Xv|>C3Qz8oyBYoC&Yw>_tv5T|M0hlp#MQg3TYTn}(fJ34QoZl2
z_-8Gd_Q8(XqRCzG@7f8Ark~dd>gfG&aIgC=sfQAi?>us4EOmCDC#Dvd_&D|P<}(cf
zf`V6c7W45=ylyJ!B*6Nyc!lq&GjUUvKWhGcv|#T!;efv{3V61j3Ej}<v2pXn=~2M~
z*Jhj*n>t-x^-$|;sT;)+8?%&xZl<Ji?R{CYZL<!;gk$|SPPWa-Q#`(2d~|2c5|gl{
zdU?;6cRjZ2I=aYa!S-2)%1*ZXs`z~VTx`@X?!V7(=F!ZX@{^vuEI6^B@y|E=A6s19
zrGqXn^GI2+xO=8$)SP{17!oG_X;k?7^?UGz_Y0%;swS{2q^DNS6JmZmsp)Mp^I^fa
z3!T#9IBNc6cna}&zLHMca412f*#1Pez}CClm^l_0oO094dd<_h#?;(i!Meos+42~z
z&wquM25HW`Y`s(eW30vDQ)}!KdKxdVe}DCzJ(Xwr^k<^pdjGAjUH1RGnEh$o!xyVQ
zM!B9Am0(`@<bvrOrP*^A`!P0$`~MG#TF>*=QX}C)+6>nz22&!I9D1Va<PenAP<iH=
z-k%mN9u1{Gx8_}39Mr!5ZfRRb^4>7vpyg`!!)@fQUu^MZd2KQ0#pGLGiZtCHROfqE
z?R8%CZ6^58tDtLr76%p=dTwu1KDN>7#UYE1%{(`QH+(&E@c*yVd-gA`n(*G)(e3EH
z$Nm>P#qIR7-Ot%xiK}kbN?>speINWH{0eXKeeKxY(;{zek$IseFLv>Y0PlNSpXc{$
z=Q1X`@PCrMEO>oW>l(IiVbd5+u_QBBUno0tN`7s)hHbHD*8C4mDeos-Y2LEt8t?nR
zFJ@2bu6uA~bIF^|{*y}%YhPW<aO%wmnLD11fxHeHD<eBTd^j8S>2#58$B7jpMz`i{
zI26O0m#y3`?Ps94^Z?r-?>m1=uiKPadsJ&36=f8$tvy`w^ow=X*L!`u2VWO|x!|0n
z^3>Qvn|tf)l)?pvX2?s}r!)$;Uy+zw|NUyHzQi1b*408kCGJ#*EaFM?Ui$LD?@L+h
zg!nvv@m_rO-sX705+3$LkCslK#=d9&s#a0gf<p@e;?f0AdgvxC-njbM_P}t~rwmQ}
zHs2+sEPoiJ-rTX{2m|BA$}7@uEWhn=iM#$}LpcY-T%`pcqHeEM-I~$iaD$yYNdA`3
zfwwzzKh?dPK4r?EPbRwl^QL;_E=iBrGilqt+htb2rIw$6W#`Jqu!&jVsOjyT88vse
z@<^`G&Rf*BMWJugQ&%?anWCOAUk3;$xin7|zFzg><@t*X)$JVZf4q7hRP}CElG?q8
z_Y~H67cScpCFbebE!5ev<l3UX4JUqyCHKuzaas9h=eC3M?Im)zdml(o5m(E2cFNK$
zMbz1}=c?7>uAfJFboI^zHy)Q#FqHB>u`iJC^s*J_XP!=fTJ@{_n2ME#=A=Iy>Om$g
zR%WLo?ycaSb$7GPE<M)Z1A7iDMQ3+BesS*XL<`{`){I@UVmqc?iP-1<M|bZQjg>Dd
z&OI!;_+Z}Rw<1|GuL>54T-yA|VCTXjzV0`vnZKBxR^~Y`Tu_v>HSA`Lq29@f&P+c(
zX?xeK)m_Q#Hf4Rtx}dq&%Tz2K?iB?6s#+zKu=(}Z8P{x;H?@|ssLL)|yf)0+opXDE
z#DR}(hFKqWNGi6!n47iKWAk*s%R>G8v;IGtvRB0aTSv2rxxL~|?RyD6Mn(dS?4OO!
zEwySs)XZ<|`+o1QNo(xqnpMT?=}6iB>9{oA<MBCNZ`%h48jpv}GPIwb{C95rEU{<r
z9JaVu{av&^mjC~~YkN2JN2Z5QS6^`~{mF@ai%Wj34R>9BH}m<dX=lIK%+J)bZ!ViY
z=j^@(r?@hnYbj-IwJ_JsnXO^t#xFQqMA6pXb7pJi(R=BFTR4g(dm@q_H?p<HJz|y@
z?6<C*ux*W9z1GxaORcoF%{o<)(7Y$?%n64B9S$wQOHY-(_AGtN+I@Rnh*rtdQ=zvu
zw;$Ir_4DO<H?2EX^osH<!Dr0Ifu}A%-K@@<vD;+l8Qm+{x^^7SB7Lh4{R%3Z=vdK~
zR9k%_?P_RGwOjSMW}XKEoG!1DZwnM!wDf+tw9;JVmf(BYEqk6UbLlwZ(e}Kj=jty5
zXUW3>liHlO&J}3hc4NwS7A4L^-;&6l&2H?Lr}6@(T-vrcZt1>@%_WZx&lf)=w?yM=
zh5mw8Hk-d5=Wmz);q;uH8zpz-Yqgg{?0JEme-#Z=LThK;QqD^}wpsd``E{$LHB&@G
zKYLH=>z?P)TNHQfiW-aInrQ~BTlBhatUSACN9vLj8#rubrbM6Qd~wk6+I4${my?9U
z^}J1(*=4@OO#LtG`Q_q`h3zXhl!Pu)*;#Y=lDqE5Wn33|_wUP3v9J9i{!er7-{$>E
zkKfj=%oYy2Et~bHY@O$t(jLPF$6iFtXmfW{+12~6*CM81{wdELzv4E_E{vMXFP)+m
z{8#AZ>d!lL&YTZaoG+@t@uAt2HQ98#P5;crLgyXzW{WYzo_PL4=97kydcK2<&N9#J
zIc(8$g&AZwJ-fEVdZkE`i<xin*81GlrO%BM-V~p?=4iX7e8coh-k<l}<Jxp@=`wv&
z4Z(ofPY%lQKMgS4wXTryd$fg5NXc%er8Ry*%l7_>eVrY6WbvDVz^wDlBFO?w7uc7(
zSN*avU9#4{`T93cHeKZ+Tfan^uP6Ph|4W6PPyW+#Z|hvXCo!?sW*XNwU9)41jI&sn
zm3TR4dZVZK5<`X1CgXEyhuii}^Z9ymXLIe%l)b!Z*@}NWc)LIIT1ouo;gnEj?+ezL
zHQ~gT+iMrMe80LWskSNVedFHaA#UvJbzg*TzkA@$CjTVn-%l#}U%i=K+Ff{mzhAq>
zipZEHtuHw@9#)>nahoM^<Mif(3*_GHw!i&q&PTOde1*}ccZJ;8?)KSO_|ev{8xLN#
z-_*Zn;R+d_jHL`&buv~PuQ2o;Y*t`l()}2>&b{SQg>1W}znzGc*x|VWuYU9uSomDc
z3U!VCvG3mBkEi!&=yx}@G%_Z$=_)xy&y%_1yz-*6*86$<2lB3Gl*q&#T5#>=lN)cB
zS2;_zq@SO&?BlfV#(Vp6TeCh!>iIV`@ksI6{Surt*JAbc7rG)1+Zr$aO=(bQ;uTvm
zM=@1cmvheCmwRQ4`98FTI4rT#WWIaRY{CXMv2?xQHR%rj+J31`xVXUX-0=g#44k^0
z7wQ;}{=K2@;mSJ0<w@bgSCLxJFQr(Y3jN(JCi+uh-ND1J4a!=D7!RjRV0=4S|4*06
zlA{%g?^l#WsaHzgX_QHN^MRA`#--v7n-^}|Y4%oFE{7p~%WDV4-S#rMn<uZk-LY!E
zOg+mYw-*z;Hpb1Gz2v7RTRQJGSKTe!e-!T&duiMG%dkKEnYu)uXKwVC<?|Qu+(~e_
zS*!W6>bGrnL;7Nkkl!n^54{fBTgwzD)z)uxlS#B#yU6xXM&*aZLNSF$H+9x~$Yxo*
z5Vp<GUAJxV%EYZK9(->S7w0)#J9cO4<*eLy0msq`qdxrE_py2U%TGIvZQjQ*s@iFn
z8q4&a+%fHtt<kyFDW207yUZ!|s&@-=HaYN{$#iLf&8-IR%mtkH%s1XsysEck!o({l
zk`%AoCBMngdc|tkxALE&nID^o<uTI+>3iL_onO03o2P_MxTnC(pt<PLi;W#IX?k@R
z(p2_IH*B~o#ky7YDAV4bck=`0z8C*}KJRwJUp6JlFYjFJ{VzHvOuci2QMr5Sd)4hG
zx+|L+Bi38EUhkjn^<U@2_nUW^O0O+kWxwKd5tr!|Io27QWmf;|a6CG-GAlLg$@dZ~
zU+tM&uF4(p6lIgFFj=~H@~i*1rg&sHuTwm1C7Qlv?ydEW57N@3=d!u;2W-mk_;j<!
z;`POCOAozfdERk()!iezj{ch>X2El;xzjPRo7LT=IoI;2$ZL_qa$7%M@bCD*|K8ef
zy5GNu<-PaPn`|wu$~-(CB%HtTh+9=BHz`UoDDUL4i8*qIotfF?gMaP4x#e6HyQD8m
zeAtwK<(u*f*fplT5#76*@!>g<shyXD1f7<gTwup|YT0!D=^5`kOtf64r`xc%9awJv
z)m2d-V9TAHEjNAl?v~rf$Hl_LG|g$@1=+7(ZpOuH9Q&+(f5GPW|0;UTh1fMaWSMe$
zc;44H$klwCyyg9k$6B^0KIN_6=OOClKX<d4Ymd{KfVcaKlg@0Kq&p?6=v-6Pz60N9
z?cl4byz0G5MX_o^-h%dPwzs?A@iB{^v0Y^PA%*b(>&*{*Cc(2eUB7uR<BG$<$6Xz|
zJuV+-9N66(!pT;q!0Om&@{IG|ji)zPCv_}*u6k+dhggR14DC;Y8pFiWB?a_O*myH%
z?(Qs}eJ##aWtZEk@)?3n+4es^eExFd_<n`8HU<0Ve!1+ltXWFkP9n#MyGOXE+CZ>r
z3X|Ui(}eSjt{$&g{Ph5L{r~+NZuzVzF}(UYc<G$9XX`IL*||OA+b7AW88fFuZDMLR
z$~>0qUU8=M-%7s2m;Tx4pAVn%J^KBJxO@MPXQbRW^x`wxz-~C9!C7KOsZkaekCM;~
zpRZgWvUeyy`OtPn>cQ7b)|>i;_O3c7$aAc~?uPFz#xkMW!(kzt4l0zzEouqabu}n3
zD@;(b^2uWR^KN%p_I__(AIxaWb9bJssBVm`J-e>{InUaiJN0(8yk`Budf{I6m%^$q
zhv!e;$oj*}KYoH`n9kKzx&C|Vdy2Xzzx~YI#^%6#>DNao37Ld+SCtF*F1PV!`H24g
z`e|RFPu4!);7Pd$Et1a&PPP5{>+}|b(nyAtylqy;rOR7&B#!fW<W9QR#nWM5@w#1l
zop8~^C$GOep8l_=s^U$b%{QjG75|Kjrme{r$~~XFIB;{-)lhTY?+qSvCtTeuz<2GZ
z_xp*HkKa7`TRgBOV9)-y4*~^$PU{iB!FqA`j-cRNO@UTc<u_9==U+Br7PmN&bKD`C
zJ?gC{L(GE%7mL=qI+|?yZ}FA4=Y+(wuuDZ@H@7h#6WgWUAUD6G%(?!v-H{t^H~W|;
z`fz6M+rt)?eOTu0Rwkz9#`b?3C$Kg?@MQk{+x=Ld%{rwYb8j+C3zmI-M7ihpmTh`F
zW2;g<W}7Ld=1h_B|B;bV67x%77gOM^{|{1U?JC(8>$Twe)w`u1xL!^Vz0N;d#kxH5
zO={t8<^47XPT0!y23wda?cI};%=@{g?bhGq_FKnzFQ|xgWy)WP?crcJxZ8K>eOumO
z(^GEDFQ3Zqby*%)9m#ju|Ia1+=`Z|lpLqJZZMxL=PAk<V7ggN(xGNdijHkyvIGh)@
zQR^qONY|0650%(A?BxB#G_{U>g6+A6FMGrPb=jP2h+Av^`ehPx-H!*(B|m1Kf6yV^
z+E!)1J8aw8Nn7*kR8}2%&AM_z#vZHMm$jAo|9>QAg=m|Uew?yJ%0W1<rtOOlv$C4K
z`pPbzALr)QOjXn0v%bf7ce});%OB?IJ)Y(E-B08Vdqv;;KUda!El!?2ZT>aM<w;k*
z_j_<HF|k<}zNW-KIKpY^#)|18rc357Y5TT~Uv$akq%#wmwpkRnuA5gqU2o5KtFv*I
z%Et;Xe{!*!yUKp{<EkEyEgXr9OX^-NV)$NO_rsU*%U<W|9|x+s_~unidtPt9^R=p$
zvQqGR<BFbOorz19sr#u_P5M;p<lnG{L$i8?JPRZHt0JSz&ofl_9(kV~kd+V-q)|A5
zX^X<Er0uB<`&?Ja%LI8`l)6(L(e<<b*IWCg#`Zt=@x1j*k(=hz?YoXUTcYQr{oi}n
zUp&da{||I`!HZLu-dMfa)6xE=p?!`q*VN$h((+RO?>_zyR3<rJymG<Ba><rGTc)K%
zo?iB3>!0)8lj<u@p0@wfZlv2S<a;qm;N(M|c4Hae1poG#=R#vG8CvJae<)&#`*8F3
z?(Yv3LqxSom|LsLIl`3f@BFTPZvA^s?YC*-`~PGY{b~(Y-DGjD`q^dE2EECN?mvF8
z&G*pZJY&kpbL+Rz+{ihyyuD|AN(9v}a}^y(FqF@~wDp>^>FyfAE4cxk=4q94d(I|@
z-<vA`=jHy3wl!xBT<^q{ZJ*zB`1Z*~7xyL|e{@E6rtE$_`F;P)KRu2AFaPAj&FPU#
z4t;+#=TIg4N691R7d#gql)M|yxw6Ql^G!)yWUDsA`;xR+qwK)H0W<86$44tSFP9d5
zlN)Bx%FFhrM{$aox#h9>-L=);j@st}O7>sW)eyIpUurQ~om=_Bt)od1MuNAOMf4ai
z-?uQbW}nxw`;VkQn{5w?D*D3Lo@@MUiGX02fkxX`Sv%ilY;UIDnRR&T`sVt?+J>K(
z8Fyur<x1b+_KSTy^LE{fJ7u377nVG;JM5$-X}IB4)6rS0o6hts4Aws>UH|#G$Vw*Z
zB{gr)w(emH^LhBx@>%Q&=SdeuBd^|JP0G((wdy5f%!ZnaNmUUF9yc~!oS@mpVk73H
zwdYK0plHU<_j}lw_%!DH?*I4D;E;evp4Qp>6_Jh)|6Ixa`TPHuc+cHTOezN#L~h}=
zUCfy>N7T%Er}F_{m$1wkJ+1dlOZHUUP<q)ME}OPM>p^emEE93FreA3RGp0Vgy#7S*
z_qsjlNjB`SE?hB}Sh>i1YhGZoQupL(=5t?KBs$Dua-QAND)UA5%=+awPQJ3PDSO-=
zcKwvc-{rdTr{}1urQ}5I+2yzB;ew{_{Y#ISPx3v(X6JJ?E&lHDJrgIhbJ+Z!dVfk3
zYistj_~o|snX~uZZugq1_Ch&5e&UHsQ+(oUH+$?odS=b+xYC=lb^I%QP3K&6d1P;2
z>77^iqpc^lHhx<A`w2~5OW40(WxLToAy(Vs`0H=48lUR!dw0|Ndg`ZdsXt$S{})lk
zKX;1p`Mny>?tZ5ZT<BOhMQlz`frJ;U(EVM@%KnuXJQHhw<9PM(E~X2`nU`LlvOHU}
zqO|JJY2HGSsbNRL*I(EE_e(7(^5RsLv)bF$Y7e^~4SzUQTD;!v|MkBH;d^eEW}bhx
z^GhVtlD~K3|5-=Q+od@F*Qe`8gCkEr*Jphk+r8xQyCqFU9jBJO3=&aUlg-{_UApU@
z$IIi!m#SNgxqfr+XKs>WnDOn6?$srZ#aDj6ZVO+cwnsy(!Rh<2?f>H|->&~>J74+0
z|H(lIYbX5fD{b2T;?<%*&+q?@fAaeO-~V3q9zXOK8MprpUH!UuYUOGN;mA1?ZhX?Y
zTDwvIqhWRa!r~`^59UN0f4N+9@XWs5rMb<r4_KHL;%|sme%yF$o%0*Jec$HVKa?~3
zeCg@A`^lbn0v)d1(ViTc?08%3o+Hn?RUf?<Fg`N04C*%Q@7~+!WdF?n?bfCp?>5#r
zOx)odke2wySu8t>-EZ<$2I<K!rRBX!B?at6#gCaXuw^ryJ-TC$sr%X$pQ4ZMeB-w7
zi3V#cYm~$TUa!Bb<)IsQv^>h|ZtB0bj*&A{FO03FdbZ+X38^`=4UQ@w)%#(7!7_)d
z9CYU7lX8Q}&R){i4Q}VGrgoet^*!_K*!u4M+xpbnye}s&F}rl$Q~cPS8={=&{O@kf
z+9NLR!YAjl@Qhu+W3Er{Vk-Ul=GFx=7VH(dHmQoCE98nvhyOw5w#P5CSD5q9RSNNL
z_nRYLpKLti(lduEy%TwKg+v}b+cbGqg3#P!B{@@>xPMsQ@mP~FyG0`Q(9)N;cSSDy
zesyonBPQt=XLD_f-gWN}W6?63dm*!Q>&2I>s$7ic&gA5V?3nX1wD5ozizDyd1y1WC
zE^O#s^wH<x+HJcm4xh5kSn~egi`hc_>m$CLZ)YxhQPG&TH~yWnm4$xIQ|V8Krq?gd
z@X3BJzCuFn@M#|f-$n5nO@+%<mo%?3ezB-SeMh?M<yW%b<TGAy2QU7#z5Yx6ss4X|
z{!hC-{oXW}l-BbsCspd^9iHX-+hS7wKUt9_Cr^L6vn1y42U*G8g`M;Bb23vyZJ)0(
zXkZiixpIY$f863*QjZiEJX}NPhL~>&jB&dr{H7}Ow$=(RnTZ<BeBEE$m*}kIl-?Eh
zql&{;r!Rg{Q||wj;Y<Gi;5M=^j1_vAP&h4jeFJCO!Cb)^>_6@HygNFR^QCoNT$^8g
zmqO$DfcJ{;q(j#BO64!EFm*hUYAkd`!os+&xp?bVu4#^ek9cO?KK+~X>g!j#-2QE!
z+YxZUVSl;bLH~fq%U|4LEtR}-Z1wwp5&OQr|7XrT;|@Rjx>`GVQE~f|)qQ#v=Qg&l
z{I}?UVclQna}|e9$ZekUG9~8y-1)H#4P2Kd9rfI(`zH8^>-@TND~hELuKAkM@wt0h
zetg2hMQhUoX6<tCYVCVF<uViZ!r<-ePtCsn_rK0Xo#)PXnU6R<7k+mA=f~$oteLOv
zS2f(puGGoDQ{SPp@UZyBVhuUY;2T`$<rX<q9G=O3YX$GG-Wf9!+Y4n?7R?b}m;LTh
z)y|I(UvJ^m5MMFBDRrsg<2TRiTBjAw?%w8R&#2A7TC)Awx^4ZNl%=n4Z%O=Tap$N^
zm&1k7M9uR2j68?!%$AqldcXHryMNuDb#~L50;eg}pN(z4rt`B;vE{sysQF`wfb;J6
z8lQ99vR~J)dp!RyA0G#gm~-HX6@Q=3cyZ3}P8#d(m0O$nD>4(OU0p84>cjEJc)MQE
z-B+G$Ek|2oge7!tTy2%K{C4R1(avk-X`z#Mt2}67Vks9)U`TA1W51biygy0IE=?_<
z&~>X+^X(P;7H;A_rI^|MtGFg^IiqZ4c82^H=QAr`eovaQJ16M>2k{q+0`|3tI;~5Q
z6Pc2Jrg0Hh7ncOzWiJ&6y>QN_jQ13|9({iONT@a}kD1H-qVgKkr>o79cm$U0`0?z!
zh5C;bcjweHa&WV%E&jkKW%aj9#`3#m(3>LFX%c4D2jXr=eAXyx5bI76nG(2u{jAve
zK1@Z=41Y~q$h=Wh;L*Qi{n(1f`A_ug-^ZWoQTzI%R!+O{=Mw(j-kq-7T};Jd_J7%T
zXV<5N|9b5*-%38rW{v36JwHK>tAUwIZpD*2-z5xrHKvUJ?*5qLf1ll4K0bKqcLsau
z`N!+#&z5=Gqxs_K4ENSan!7eI{=Jp8H++V!+e8hgjlFvrTlu*;-o96zTUh1OXZJf(
z&S}Bxb!U2mOODT*?HbO1rt9fU>rEEsN58Uvy?821Mc}kl|8i3n_srx&=jNZ@n<@J+
zve9pkL2Y|inZWG^Rn7xP{QteO|4>skh3{${!=W`#eSaCeo-fxl>rS$M-LL8Y6nEdu
zwEZ*rqCt0RSoBmKv68MGYNdOpij^4{H8n-*2@AL1d)>B7?4^W_Ug_G}qb?WEL_9NR
zbiVVswDws2U-tjj+{gK6i$8eZ_QOR|U|L&RZQ8DXj2zysQ+l4wY~FlM;O#;UaiP7(
z(lRq&n{2-Ln(a&C`JY+LZPR$Uth)-Qx`n7Mo!=gBe9bYp);Kcwg4O4W)32Vh%ep+c
z(`eT4Sucuh#?^CcQ%~d>vPRj?4zxL+)e{vSu%a^fU~J;W^K&<q?z_|T%Ho8<0iNyQ
zk6)@w2G0+3$jDxvW36oROxf=7XNl^Kyl*r`zHGh!=k0w*fdkSjlsslJme^Qm)J&Z-
z^U<0fIim=J4_h4<IE2>M{jti7{mm($)Oa$|?FoOC;>!3-``L4^yjz&;=DIcEjds9K
z1N%)I4&J_ha1&FgMUK>;I+;~$mFAz~<9h?&H9g#_JbT+7hnh7P68yLstOa9le!rLU
zyU4g<(~9=HKj;7VHNGD{$>h=`mPPVhehI-1yp3HJtJfS24sGPSqw;m9i)rPltf2RW
znFh}32e~p<ELnV+`@rQp7teeBSvtS&|Hd=QZ%q}BI5G&_wXE@~>bE<d!oy_UxQvf`
zLQcqUhKx-!Rd_epnq;n5vEb45IrX;x-m|^@TS_8jZ}RMJ{?Mp1<&5-&N6z)~X}d3o
z9{IdE*W%mZ)FaDng!<i{{%YNx^6Hsu*yUN)zbtmQWl2qu%H6ftc6nC?W2)JaK$c{N
z#D)V-b&CsHSa=vM1$hM>E*nTOSS;V@{a#yR8iPZv`}vK+d%48gj_Z~SGv4fPxUjE1
z;BjjLhsxXh_&=KIw+iMx*!NV^XWO}(7oHxC<ZcKJ(vrWsa_Lda&eqcXp%p9Z(wiNP
zZ@+tT_rO8(>gQ73j&^tL-~M&CNEeNbRLT{7{VH)+$T!y66ZgInuzM3{;B|ugl66tk
ztt$S&uM)BH+r_nRhq_*Cx&2r<_4<znv2Amb?N&W#;tjce>F^?{?)eOBW=?Twz8tdl
z$gOS9nFQI_@B3c<=^g+7M-!74>3W5;walKp_t!H$NxRRJLbCb7R-MRdQ8YW|tC8WV
zHKUoy`Q;I<WOfGIuJVr$WVoZ2#J>Js;j#If<kz&?WvsT$feD>$O}}JLt(w68^U#`)
z7hX=cd^}xuBhRf#vIXZCXE4lR*r?=q_{h_#P1~o*I%)}6Z)<iu(lh7j%{k{)QmWp}
zI-;cArF?43#eQjlSvw!TT_8{>TFL%Nx9jQJr6=Q@7M{#4{_m~Np~4^&cGdjjhK41-
zugsk-625}pWK(v>gN>K<Z=XKB?5k~1(mKxvyX}7zTYkIq{7CFoFUyLs&7Un#mmf{m
z+>keI<@Rs9j%+LZEHb)<cTCfg|LmHx=#*G7!)E4GjZTIe?dR&;?)|y;-g~F#j|bw<
zezE!4oIkQLB$fYxtYhYzQ`T?X4)8Buw#_f;^yNDo22a*-ZE3VQ+^}_zf%?gmruLk@
zYJt9UnJ0ZVHN1FSC&JBKh(Vy?|B>GAe%?LI0`I1B1RoTVv-o*Rf0H%GFOz9obd%o~
zT6m=$pS#4dneSEV!Nr{-4mTVV?mm`W;4o$T8X1P36+yGiTSeY*Fsxk}JzbRNpPp+n
z!-ntLtw+u{RHl5oruuX7|Ht!BbK8F}t$Zq87u*<kVAE>DtKWW{(y<j~EQwj79(9c|
z!1HXn_q?^0t3QO!`d_xga(!rU=)r0^e%+3E;SX!-cocqd@BgR&WNrTceRnF}yDxcX
z$F-yK#*;sRX|pfBW%bC&cxk}o`juCwZzA6+_8=`G6$YlI!knJH`}=;2b}frAUvOxu
zn9Rnuq}88orYH35nbs%x=E39Auf5BP7iCv|x#T~y!X|5Dn!W?4NVL3bXaAP8ySuO7
z`@NAzrgqx<az44_gYEX0A8u(${#3s8&e7VEsJdPjS&dCe|AMdoIrR3sq<%s~@7BEN
zfCtIp_kT`w)vWz-Xv$ynDN{Mj)vKGA$4xmX{9Kbsko~Pxq4n%!$CG{x8^Z%~m``i3
zO~3jps%x>}haMGg=6z?b)|GK($}?OIuQ;dq<G3yV+4~FEr=-7MaK`tZ-mf>));Cu^
z)OlzBZBFQhJ?=h@aZS&*oS4oPCKs@RBg5|XX5skFUIN=crG?2ne{|`F>#^2r2QR0H
ze(RkxW&85ur>cKHKIZgmPuTKx8xx-A-}7NT7tO0-eNSoqQRBm(3-fI~a-5?-oV0xx
zRlMT$@n3y&ruyWxCQM*BHtV3#!X)<li*0u~m_}~)SzPXw^lti%4c->T?#I^e_5XTt
zYtO=jBjL|1@*5qx9z@<)vTlk9`--LatnMnztCri6X1;UnxvGUM7uI<G|M>jrCF%Ou
zZ3`+oRG1b#x^UA!Kk5hH=@T_sUzE$#3j8mAZ0MJKrX1jU)QatCqOFzs>CeWK+VmAz
zCjR*vbpOVgKE({d7XphPci(6Jm06HCX)fn=<^b3CVk{pE11^74yLjT`zCAy#)+?yT
z|ErAsy;z8wb!N^1m%GbP9$vPSsigPO!$%7&ne3mZvR;|Q7F781?aGt&)09l4tMg*N
z`x|Z3djIc7bkW1J?}ZB%&HijL?|<H;C+<5LbUu_jE=l?H%=PE1{J-2UUs&tR3<<j4
z;5o}tR9&Gk&!b#iXTK{$%Irvos$*4Nk5>mj?w!4ee`~L<j>&=xY2q_{%x`PY|2MV%
zP~_q7^*_>U!se?qGt8BW;9s+T{r#_U_g>%IWl=1>NYp#~J40;_W690HqiZ4-Og$>v
zqokvMF52yd=%t(HXQDYAI9CgtS^wa@Tey`;`RwnTw`~l5WzDvdXZGc4{%>4e!ly59
zUr|!E|98py(&qCEtvMJM_#0Ik%FWW7mwYkf%e?R3=6#P9wl$~-`Z!@@b)x%*rq62^
z9DTfI*ZrBfx1DpUas_6t&Q@f-80nPCCUDTW&0+FyJCnn|@0Rbjj_{K@>pJzuG`)HG
zKk}1*PJVWiS(|f?XG%rNb(N(Ff=73jDEaL7e8XrU7Ql1#Ug4$b7ewX@Z1<h_Fu{g>
zt*lA;4Xz!lq@Nx-|IhE*CCRGb>GO{=#)Myp$#_3`+PlQF_SfI<R6oe_Y0H;c6PJ~A
z#2#cyXDvSJWGE5AB9?I6ps#YtrhPkKL@=cJp1)97`F`vB4>muSB)<-3VCJ0~Z<f{)
zSn$=nG*|oERIW9QPn;{IJ|4`ytx`~@G5adNn&g+e(}I!?PWssP@zX4|lN*<2hH*X6
zZgtU^>*uNZ^u%|$0|F8+l(I827O*GT&DZa0x{+UbyZW&lyOzM07f-i8eX-Mj_QC8Q
zXB2N<{@tLmT|xEKlodT|j!xJ+Gcjs<x%h(}8{T>gOi<Kg4n5AjzIJnt<3|SZ2G#>5
z!N(ai1zZhQye{%{l=gYLGw{=~-&|ffAM#&G*c@Efry{m8fx|OJ%i$X9l67_gHDTw@
ztXkLkRp}^O=ieJo%QIHI+tnT6nz>+eD0AlI2PJvc@>5J04*6SITrv(2&Z~GRTmSO(
zpK1re+;?xD*Q7i@aM8EuOIy|MV=agKBqg+tGfrsg(w<^gxM9I=4t?Y9<9q>=yL19g
zUb@$RZGW?^(lhY8?G-uwy&6f$rQvU@qknB(T3xsL(MRU<M-%k|m|uQ*A^P)h{a^c2
z;rl+`F8cIGJT>?1$_GmhFEYN>xu%(i>kt2`)dp|#-rAq6Zv4%3vH#t{#cOUY)@ZEg
z&QD${x6x$v$*3yVPgBqS`LQ|v$F7iTKc245|6hG<xj&Q0qxTNmPxURonNxQA`P=H*
zr=OPXTfRVI-TJ^zal6VFYi=Do&d~iMZoQnx+FJLBwa1Pd92U!XyJeUEv&urb(CZ;a
zTT-}0HiS4#kFO8A{vgxys1sLENw4nN(=WF2m)PsSiwL>>#CzrZ?brMM?s|J(neWZi
zPNTg~zLY=S%Ge|B)x{nC{`cK;Mr-<CWKH<DvUjfYu6ad48(5Sq4)@J}%za@^-Swj}
ztAp>{D0W%3XqVo{Gqz?7rNI(hW;WI<b#AY}yRG}?swG+b;{yX772^CvydP~*d*?p?
zKhx@83z+=x?NO0rt+>nVE>Z2--6pho^(5IlB}zwZgBG06U3$f2o3M?NS+iD_Mp9b7
zgZUyc&c#a|y#9N%N8c*7-&VqV>eL$z#>AgiGa3Y@rE6$7F#ewRTTYqxhq-7<;L3oj
zn{>}D4w%@tPQsUQ`|Rv>ocDHLW92`yt4%HQ!VNw})AidI{t=KfSJCNQIfu7x#?s!<
zB^#3ESZ$tPO>f)rfK7kKrB_uM%!*0}DwvNMDNgR#^r$6;wUaB2?@w;+(S)WH0};N>
zk6KpUtK)dICM}~WHavX$+sEG=yN<BURg&3e&3R$NE~~=stMzOi7YtVY4f}d{zvPY1
z;7<!gHi<skbY-fX%+1-nv!*`Wy#B=3@_LV|SL(j})k)@!c8d=`w~H3>Q7{dBFPn1x
z;!))nmzo8W4CK7iWE};(T0#zf`L%T8>kU^ji%u>P=`YkhDL<W6bUDL?G>yQ3is%`8
zJgZv{*)nhoWvWcAxUKo|&aP*6FZVXv_E#HJ{7OB??mB&$r~Zl8_xTh&tXVqLrZPCq
z)@t&S&u~lgf8xPtvibNj>%J|*+jNipF>%-Ke{g9|&HwZN*6N)14`lt6=%DaCc1>f+
zo|{*8%@sPc_V>O7&Swel7h831&$)Qz-@yZl2XxLX`2Xqqzo~0<d`@e}|7K6&V@MF!
zQ4P9tzokj&&h3bTSy!u>g?e`xOv<_~E?jN9w$p^~>8f98!ttLY!{TLGKN~wX+m-$E
z{`1TH->d(Lo1Xt*dC^mLoJ-89{P!N&V8iciJ9Y^l6){OsTRBb8?8Ub3%Zo2vxp;c-
z%a2z*g3oiXRy&wBh4OUunasOxDl%t}8@Gb7eTL-gsIKjavD?4CWoBu3Ep^%PBP+*U
zuhPwodJOCh$FJE|?tgSxz4l>g*gaLr?bnTO80>ieqg?pFrLByjw<9tFXYFoRP4_w+
z^daQs#H-6*XW!irW%2v*JyQ*n*uyd_AF<9Z%R0*XqxxC#&gy@<-{$STUZ>rB@a#zo
zt0x)_cXoYfYx<LF%)cso&b6>>#m;#`v!qim@-F)nx!NOmYO%-MV~bAhQZqic=>Fsj
zw#|#=lFa5U{#*T~{`0RIM{8M|I=^N4^(u|+0xz}Wf7eDn-MQ{p-<-|omc>3<@!C+(
z#D34#HmzNuD(5nDG$&nD=oUyh6!Avsuu9b9fA3$}>xieRdv(2g`g)^%d`1>aROx;5
z{2NVoc;CD(J}hI%uvgmo$hX#O3v&f{KKA@LwP$NVR=221Rhp>TpZQE*zuLrn4;I*e
zJA2_J!QRfhZ%!z5GU}=)Uu5a#juvi>u+TVJ;ga=QO7*$M2Ihq7^*Lsy+Zz%LQ|neN
zPfs&2G0e$$J@MT{W235%yxU&B)jRR;bMYN{aiRUw-YKqnurT<9rTE_)XWpI;kvMW8
zC;Gg>>ebtB_#d?Up>wZ>k#pkuIGd@*reBDduWfK<c}itsAQzW}wUqP`&S)mzDlxUZ
znU+Tnojb}A@_nQFwsZ2LT&=Yezc8$E*pl+#iT9FPrIQRFGG4xzJnNZWFvG?J2@~Do
z3=Xk+_$-h*b?*GEkE$-$Pp9%viQa54VRw8X!>pgD4)xT0@BgpQxn9Tag3okbojoFl
zS3H<~`|UpM8T+p9+iu+%*L^N*Rsi#n2lv?-+eP#){r>!T|BvlLk+D<O|2dZbIr-R)
z>zNl_zNSCZmdvT0=XTFI;Cx}fgLRv}nue@omuxCWgU88(rwd*;zFui~;KEbwrbCPM
z|HwRjQvYqPy}>ue`3{T9_HWG+xA{;b;H^CI#4;zQ)rUW7*s4nJ@Z02*vC;mcS;ZU6
zmFu_#{``#I^|GJ6fJZgDf1dk-TIGqZ?E>qM-oK(-x^{2RbdMZI^`rI9J<E5NySzHK
zPV)R2-MdL|PS2VpweQ-cie2%KU;T{}|Hkx)w`*gkOOo)>D~Y9P$qz+u+B|=su=W1b
z?#(Zze!e1|*ulPsJvzN_gPmf-mQveCwIb=>njfET&iO9>y!Mr~hhXe1$?aW=dRqI#
zgAAuERgC?gZ8E#>$fGdDn@_X^JXT-)(c&a5y2z9->71miZAnqjt^B&<#z`NJ6n{Ea
z{%=C{t~*<8Bg9#su=#r|*xG&c{@o`lSo=k-?@lf674OhZkj?#Tb4{~L=(W`Ps<yt9
zt=sp-FYB#4linV9z3k3)<9ijZQg?aHS$M8Z3Jl|1^>AS-qcmIDUwf6F4-YpxUQjzF
zsu3dfV!n#$hD+D`nN0;a3>q~<OO@rLChKc_{K0&-qwm@;y*sR*-{v`5uQ`|XGO??g
zBY<xqA5Z-w_g<UdTDlrL3QaSQI`;qGbHCwxouz^MyvnI2suByBM4ZkV$i;>V+|W6^
zJnm79#=dn4cYnYAz9FIWx5#D*HP6VE6QBKK^EOaC%~D_ZNvvK><;(VU+A^~|>T(=g
z{{C2#WANkX{Xg?9r<>LOp2W0Gv(r^MD0cHHKXHv7meT^uJ=Ax|XQbtX&-zju;B@h<
zB4_yiX?Edq^49TYw%gt6?N%(m|MzkI;)H_EyEpH?3p^sSdv(K-?OQZH8GJ8Y{(fV(
zv&V|uYYdMXe0%rE-#Bz{ZNP@_|N8f<p7ijjd%69e<nH;Ae{bLA`gUhu)XA6Yb6?sY
zUEeCC{ak-D+lhqzlP@j&e%|jAkFIUz+1!ZYIMsQxI=p9mb;<el;ds5D;i|tP!EcY)
zi*QYCV7e^GQY-js&lj;P5jQT@yByQoue;s;*GiswHI2_+cD*}t|CaNEJ%KyRJd(c)
zp5rOH#(9_T-BX>(Q4Dz--J}cR67M>eUddf+UhQ`M{r6}?<$8sr_?K}E7mh|UCS<IS
z{xf&O>;!embpDbvT-lR&{7zmvBy)b>uWMB&Z6Cchko~yki1R_;*zBhAz0YqPW`8>G
z{ZZpKN!uhn-O7^pCMH|GioZ`tOo{j|>N?TkcSB3qeew3&C!;vtS^6Bfn<sAl?!_Ty
zmq(J7wWdc47szt2m0Fyj!sq<)!=*2=)>ogt=8O&hWmfQL&%&$g@9%fcV0kFBX_wUX
znul86KDF-iHE*#?3U1xAZljh_+cslXpN%^fZ3|@culHiQ|2y~<=akIF^51vH+z?y6
z{h5=<|I2rna~RDvCRn)e*56^%snqH%`Z1#}!8&AOhxq&)RfFBkjVkw+O_JoA_|nFa
z@9)P8o6f9J<at$i-l8P?qIBTO#t7a6ZquCa<#{dN{!LElhr?g~&Q;sruy2v&NxHFb
zrSq>o+w{BE%bP?>$__7+X7OfOVe{%bBM0M_2DQkl3GW1c9%1Z1v2}(@aAsk}>Z9SY
z$88%dm+o?CmfO<0sIz#Z)Z%v2N%Q}%>1$_Uj9nA{|DXL<wv)yp-Aw@pUp?A#BsuWo
zLW_mjf?5+^{87|%nXWFn=S#)~gTs$@^e_C$8O7zHsGXPHy@WgQl05U<W|j%3FE9QS
zzW@JvRgst*q3IXcnqEA)@x|!(V|jO{om(wfqL%0`YC2MNS8B_Cbpw~}>sPt0tNpO6
zY0rc|zwH0b-w~#^e3`05OrlWvkDKQ`SfA`N<>W5mnOMtM#r8<|%$u7N*RIh#_hEqp
z`>uWaw@z2sZSpN>kK4hkJLmrnWxegV^XtLv-%KLY)*0@e-Mu3<*htVnP^RJ5`v;xR
zS88#^?<rAoi~4?J>2^^OJN-J}I@wC~ZlRE`S8sHvFn{OhY}@<(VP|V~OLg$|OVKg2
zcQ|}KKV9suPW<lOqHKIT1pxsa)p5JR4K8n&i&i^(ne(&+Ys+cx&zm;vII=UKzWDfJ
z??aL2&6l1(C0D%R`Onh{A1+=hJ9BYc$u~`ooHU-+0&y;-=<^0|Ivd_C?+fvomUc`+
zIbhB!+fO|^9M)dj%M#XPF?Y7GYkP9BdHef(4u78cHI8xrzwvhKKAQ4ZNiJfaoNm6;
zoVQYTM-R<BStvX0Q$eD;LC4QcFK<s*-C`0gGCk_FL&1tw8g{M5XEd%qdoQ-6C(JE&
zF^|TKKM#)I*SYLwf9-VN8`ez|SJ=(<+oTYk;+&W!-x_m-?eB!$83kN@>(!bn5(0J~
zcI;j?dChUt%idiTg$s7AS(rR+{teTK>M@gUu(ewFn6J8Z%wBbFhy6TDyQXyYs~-)t
zS?m=mW;8D9uAI3??U|lbofK#OnJYZ=>t;4-Sg=GzMe&swecm8GX~M$G^B4VBu!>w!
zwlLVk)QKxRr=(`#rfmjgjo-Je{4U}6bK3#eqc^5l7%N`-By@4fyNL!Xvo$6hC|b1Y
z*7=*x@2BOxtqVV<JRv~f)1&Zu?_KWaf*jby<BILIYH!^2b6(ub`g}%B^P!BMYl}r(
z8yPjb#2Iw7s|*&b?qFVcuRl^OIj?Kx;~c4kEZ@2xXYH5V{PFj|g1zj8{2Tch&)L1?
zTmAR<2dfE37A<bcQ*3ycSMy_nP4C?uO7_3b#h(zbd%1sNgwDA>UMuy5M<p}gTj#9&
zXL<6idHZ`e1wA8!2^~LYulVtNLCg1V)eY-UT7UYqa{b@!Z%&=@kGUOqB3WPmj&p->
zb$p_|;<96h9jmPP0$$npTeHLzKW1oszrlggVCEGTv2>ni`iyLble;dmGPtgqob|`$
zIJ3g8D<QJtHyD?e1XNG^u5jFc_l!f;%N@?MJzDTeuP6SY)taDyJ9oHRbB?#|=uS=f
zmvMYHV@pEDlzG!5m{WguwD13L=E2RI^-p+;S=SV|pH5CXK5cXNM(_V`B`lP9*TxF*
z>Sp?^N-Y;WSu^)p(Tf@Rf9-xKimzq<ppt0BXRXtIIzwuXm41Hhd;5#Wj<{QQe=4qg
z^jXceeHZ`ysjqgi8Lcwd#?ZK~ZJqO$*|)F!*~rBreBFMD{>IvA&5Pz=u;7-~-^g;?
z;pg^^hxamYonsV{y7&8{`ROee`z86Uj1mjOu6Slt#vNO~|M<t1egBfL8Ea+4ZO>s)
z>{@H#>?Lm_e(cf`!CM=4HA&dCYt1y?sj_Zs=*cyHCx2YsE_$a&b3)|iJsk7@9KJHo
z|CWc!r%ls5Px)0Y(2e@Uu)pDCiSu)gb{j>`TzdnRmKQ8nB0f9+_-heU&1bK?_3PQ&
zQSYBVeAl~V$Et1f4%}Qe?P1))UnWZqE_;8%cvg$N(Q%nwccx8XWT=>S{%Yp6QY(!<
zr)jg9-&<eO{!&mB`fKU7jdN{sZm08w=N3;ll)9f()Bknz{OjgI&&BP2e=hoTRKFlr
ze0A%z`!^1Je7<Dk*5xl0TORPOKj@Ot_&}gOzoc-|1A(i{b}cJ=X<gz})z)`u$F5}y
zo73Lfd4GL(_Wl2*O$T4bHabR2?pU{OUgxT{9J{7}Kh5^Dx3`yN<!;RrAsQBSzqh_W
zIhDUoEB)NOsq5DHtqe%mxy$186Ryjv`<^iUG51lwm8nx_Cci)}@_gzemJe<F-rw1H
zihI|S^tz|=-TU`-%6|B}<=zLMw-u*;DaNlCl!}@+d&1F~f!rUSEy;edLoTG<<fYHa
z8&k_)`gS%oMSNbZaZJH)lSAgw;5XiDycwKtYoG7Cy_$P=`ps{rE~V<PTU*HSUC^%d
zwV3LzDP_ICo0KL**7p~zv*4)}&%UtlEyL{8u+z#+PIrwDr`xTqJUpS|V9-XFUGGxk
zTWX)JUbQS$;8<+YnTs*Yv;(-<1nUzVCtYeWkT$<JrJ~}O;ghNjmrku)zI5yA`ByHw
z*u>Q-urDq;a>KIX)1Ix<J_%i%BcId5viIoR+r{CrVj3COOt*=(9{k|g!_cvG#ooY>
zz0wjoBHer^@~waMd({@VFPYT&$@r(l1O+Ldc{N^hZceed6W6KzVR!LUS)<|!<wu-O
zU-4)>aOKer)?MlwZf;+Bu04h4RQ0t#0<65Bt{q(CxheWuYTh3!cBkj+`QoeD*&m5T
zJrZ4d+B};zSen6V4WEE0WAH|Hru1!2nYSNEX3E>8^VqFr;62EqQvNMXD=J`4)kckr
zdHFknBtI?x*|gW?{>9>;`<HfVN*=TQlKmj-tz_DB1JUS-51xc_>i2xEbAG|%sWRn?
z1Mk$BTNN)K{N1|Zr=%!v&<E2=@6Y9}W0F<b^dm0l_Zo$W3B0>j=!R^R*I%O^kt0+8
z&Ul*9gJZ9CygoOFiDx7iy<Kpqz(uKBcuv0SrttgM{1y8hjyGJ{`qlIJfx^tjhW0uh
zCxs8q%(9!*E@+A0uk%%NUw<*`Vci1m1nz_jA)KFo`_19{&J>cc$F2W(@%iiNYk2N_
zGOz!}ZdCew84oY7x0&q1S!!C}{K{Fi-=E8A+NkR6TzdW6s(DXTw^g`5%iE)T`tfwj
z>K%Vy%jo2=th)Q@RCwLdS-0=lU$MFEca(40j{Lpt=L1$Sg#?yN_Hjyj)?m%v@5O7Q
z6Ij8~t|Hg_;(Wn{X^W%2YbT|wd_On#$%DvHCAO9bfyX+tvybnnyPzL^^zyz9=K{W#
zcNi{wX1mCJ{p5M87l>J@{_m)`kQkXDVYyCSQSIILZjlSm{3I>EN4^t1cO}T=>{iS7
z4rdCh&2C<}z~=VdaiZB?<=cxkJXB<V>R~;xJiL&Hp*7Gw$x-XGp`=|+Pwewgn`=Jl
zpJ_8I=kxNuZZK0nLjB8fmy0#t0voztoSFSf`ssz2{wEK7d~RvpZ^2t1`RoLrrdC?M
zE&s_~OwQhn>^Gc$%#4_R^<ULX`=T(Rj}bo?+T<C$IC1*X57C`JuHDb-iGTb#JLmmG
z@%^88Gv7&Fxud6-U;p3!<d3W0mu&oPP@CF2BQ~>r!lz@U%O1Tl*=*exbIWVO>#vTx
zzCKJ(t<0SG>>y`{@{?lrS7Bnp64o1Dr8T}6-KF&U<&HJWh3*)wSQaq#Ipgk9*4>{U
zPB>faczYL%+n>iLcAnqNee9;vg>~1ir>3T+hKp=#j(wsvL8<+4(eDqN7XE(3doZi?
z*EE;u%QBYq^f?8eH(YErGiqUh&%#w_CDvHknq=#RyqI0SSUII3K|1yA!^n*8wNv7@
z)$EmJk-z5iD|w~SYb&lTU%iUoCvxiP=5qb=P*T#~HSO}T4L7DuG(Yyq^L76F2ltMj
zZ|qXm^u8het8`1`21kyTG9ksC{~pdRdir<!JI}-|Yk3s161i*NJWpwktK`zUpnF8;
z*4{YnhMTk0Zr=aXzyEmT+L&`^{^%yiNqpb7sdLla3B~(=E}Utd;?&-tbB&Q}m)&0f
zGYWQVL?1No+F7+ayTVp2du7KLKG~`1@joxUyYk2`u^_2AX0!U|H%|O>ZS-TCkDDLi
zD5$Ru4Z5GR<kUv9KaFl5qpwtz^?d#rtC1*GIN8T4aEaC}t`+{yM!PTH@0RFT#M@;N
zad^k{fGeySENd$tos*3UuzB_3__cL)nLax4{1bQFek|~hL394f7h0`}lO8Tr>Tce=
zlS@c_UA@A>r#IO@tFd|<i44Dbh-t;t4hdFI|J;v%W6X39AD{o!;&hnlw@+VL#H7B=
zaVwwj<zdrBkrgXeJ^$H!X#3puB;CX_Y`mPm_@Ddm-MVt`w4b7b+@6ycE00}oDC&~A
z88_X{Mb~Yk%O;M}y^W0?Wz#Ni;CJ`i?_tXpy?b$uZJW~?JNJ^mdVBs|H!`dW4q9oF
zynFpEe`~`de@{k>t4MNtm*zTXWxraQ`XOZFjaNErB^uS(CNj7Cem%J?!q90E&-%T4
z4(lF2KWB3I{x9F3JTZQr=~F$SFOuQVr6Y17E)Dx%d=ja>#h?@Ll)=K`>aT}dpIT!*
zYm^z?zi0n=v)r=2Isf2m=b$LB+*&LC(>*1;a~BwR1$Iuj#-x|b=J(!1+_&OkY}@&T
z%(pL8b{sPHIV1W+WKP`U!=VOVeJmaCqza#yB%XR5t*5&42a|QGo`37qqA1U5&!V`f
ziO0`K-g{T3DEWJdi<rP4!}6<^HM3$HQ?y*)oBb2rkZ|#<NYt!}<#iv@CozeN7<*hT
z?O_ynwIct0db^t398)pjAAYlgT2wZ<I52%LH{GF;U-RAntnrTa?X!IaS@*v66r8i+
zyEH>iZS7xMN1Z7Q&E3VH?*9M7Ui9cp@uhplE{;>5-sHR_7kGv9oNwUY^Rs(T+<D<H
z<mkk{*S$$z;(GN>UWHzp=}V<na&CL}bK|c5A8Y>edj7hszelUKz0Wx8&GgfuCT-<2
zn3ytJKYTqBy>Ui{j^nhncOC_Gr%G03{|UN&C(@{Y)9Hxk1}4_du_Yq$hbJ#-`g`JQ
z;_21Ji!G)-wdF10`8-c;GG~x`tQ7ldt=gdA*VFr**%Kb$oW7pD-?Z}F|F81(jjVlh
z=9ROaES|#NAdoYCYfB=pLSTCbPsU4rlYNg3mO7r{7rP@myCF&L)iI4pukvHdL%dFZ
zu*`h<YI@4f*`HI^YuiRA9KKroBvMS~jm?&g)h<zNet~Omib%)kEI5C+X1doS*NvV5
z=Sy|BeeFH*@pHUF@0D+|Y>PE4if1Pr*<k)DW_8&dcgMz~XQx^oTe7Cf;Y@$>7nPYB
zm)+#E-voTPe$_hT(*vP}0U|vg^=C2c$cw9pz4!Ov{7b=-=O@@rT*`37&w=M^xcsW!
zQJZ7UC-bYF3)KyZy?bbV^kvowcc(6VIypRcEAMK>6oy#~tR<IUiZv2aIWJXmc$UNL
z6N_JOo_ZmVJ8XiP{bak$Usiqle~3!%{h{XS@S))JHQ}~-1wVG47gz0n`$XTwUX9at
z&)hJfj+^!@N)_3cp3JIC6<d2UIz7W^_PeEO%YSZBnReVWH6t(c@tmBDJgK5RvsP#&
z__(|5`R98z;&z7Qde(#sVW;l=nxpY)!GbrBHwfI+x|eXCQ`YM5q%Eaoo!1{vYde<a
zt6kFj`rbL!X{EaB1AqNL#%@1x=Ec)RFV1KO@g5Yud?>A{@svq=tf<5!mEB@$Q}0aV
z^gMVy#^(j&rTE|9>X%%4aQ7M8+nuT_e!WX)ocH@E=NU02zm~&^-F4e-1y_FvJ@vK!
z-t=?(5;Nae9dTlK@$IXrXwc(R0S^}YHKs1Di?uS-{OJ?(N}KzUj>Oc*r&dY%z6qC@
zo-ML~dB*KGOdKIIccz$csgckxIN(&1RQIco?b}!XBU}FMyL#%<^#skMN%wcGnQ5=W
zc4PHtVe=IU?dKhrtk}49v4+HFhiZqO@Vs+I&UI0ZCzqXDb2n1gqtLCkV8i^^r(;Dg
z?2*5w(U+@sIn`mubXNb<%IlVPCkQ+j(+Lll674;69WR$lobR6tk?Ym2T5Zox$PZrq
z(3tmV5L084Tyy>0qn`z3o!^{XD183(?D|?~rq*Sjn5&Ymhq|%(&0BtV%1r<J362kI
zw$IGaa8R1g<j`Pb_o&2hf5N;sX*}sZ%lS9XKC^J?Oi#}B>pZ;EW6s+z=HU%3Up2dW
zPl%kqy218s3w}mSzjDRY<Nw9YMK903|D>Z6-_QI-IzGeX-Ky-wpTUVo>~&2OZ4NJf
zZnt{=>gUCc_U7My9(wydRrX3^aY1&`Vr~XwZSCOeXAd3VcQ3#2ax0%mcHXInm)fP4
zTKU@5Z)o5YlK5@#^bBjt=GU`4qMLZ?r|v(wVxv=E-S(4jrsYlI&Dao`b5E~TnZdx}
z>g9H)=F(5=CQmwjWXa<E84oVpJK+C2vGeDFa|?x+T)JVhd+N>GMz&R<V&czI67$@i
zr7u&N?C0hD++gp=1sAqy9^4bn6mr7LL}*fkiPl7q8QC`M^Y^}JvbeNbi1YPxr*7*e
z!#~~c1Q`zBJ-}k+(;pq$ZLA!<V)F};xmEv+i~e1nKYialxtA|q1bhfoT$eNFbEdgo
z{Dh@DHCL|u^f68<AXp<PF87s&)#9s-WtWyG&vJO;sQ*doa0v(h1A`SSR!y5<_ul`>
zxvSsbbFwY8>iGS6Nz=hgzjMni-(OwZ{{B(4{hvM-@idG5ttvW_yk4cHQ)TRIl-BC%
z?%MWg%e0wuXHUO5Q!=XJfkNM_Tg)ez1=i%gG4PtLr!3ej(bzXTWV`3SO|9*P8L2Zr
zuVv=q@@BkP$8@Q}SzYSh^cPt-Uh_O+Dy=eD_<%{&hvS6BoOQlO=e560vh}@taBadF
z#h^=_rd)@vhE8RXy63RnqUI|bPaTiV{N*3_*`Le)aK-zm1*g^Y{=x;5Ki|@Ei)u{~
z38~_nJ4v+HaD&86+1x9EUz}7wA5Q9>GOst~{Ek|&ToZ2x4nsqcZKuBMQ#aXv)i}lD
z`qVcMoYSAXv1a=$-1**ud*;T13DZ=+y;(K)wAk_a5f){aZ{Jw_TBP+$>r3mZb8Dq$
zE8M=ua;RGB`b783=GQ*y%2@uLG_NuB){A7D%%eU`Rw)HfW>nbzx)ZeeXnKP>zw4KY
zo7bP%_}u>Z&bsA?Bd=%{++M)i{CwloNKcoZhL(b5s{7wgf5_W-WJ?$SyTmT(S7p`R
zpKBfN<;73EvXyrR*Y~jh^L95lvcwf^ocQEMmCx&$EVgeqa2DzZx*n{#Wwp9K^OsZ7
zJLQ$04^MsZWo>CsNqe*F=<~W={81%8+WhvPku<GXl_0o&`JyFr);{Mt$~@6?_j<R3
zHO5c>l`}iMu;)~pC)W_c{<6eN_&-->R^C(xX9uI1rgisT>*XwZexor*U*+A$-H$(7
z#2ddjvdt^^{RKhG?=STuS0$)P_PaT6656A=a6?mX&b=EmmpB!Dd2`w%;CN4XN~-6h
z(~~cizS#2Qh^s<xb(dFS!K+ms?+Y(2m5ob$s=3)pKbSlC)8_a8SKfPH-RxMx#^1%W
zS9eaMrN@n{Z%nSA)+<$0y>4F-%hoq9bw`I8+ZRjIiPzGf?MU+3G;7wZ2-V)Bi-cn0
z9z`8iycv`EEV58wy^i1HvRR%-XUuVQ+O=}A|E86D)-`H$i{EuVo|0J><aD}tS=a94
ztlQR}uP%GDO2_AJ7{d*%v%hZbG+UKr8dy28YukcDH#wQtMHE~MF`8}Fy(sRxca_)t
z!<T2IOlisx5$!6zHc#qgv(k%|oBBTKa$QqBd2jK*e?|&5H$LlXm-fCrrhLwfC;gAv
zW6K4B%|{#e9QtO|cK^ZF@BjK@XMB$T6B=}&tV*r5X|BPnj|*1)QhO%*?R>eFcX}@O
zQ7gt73Awh;QrT6SM%(6#ZasbdoOsv7-nV-%T`NyXj?Il$IhW+faNz9QwUg|B-mTYk
zR#$&|djH4ss-pb`ej8rQ&R#Eiq@cc;Wmc5RZiCY^n%9{f3w^Up@c9w#-sd}YZCbB0
zw!Zwe%xqO})vHsnhmH&UDdgC6BIk&hq5HzhPrELjXy|4+7m_gRTH|GrZ09@f5BINp
zzT%~T5{IMT{?8{WGo@{!mrT2(D*R~9M8k0ViuSd!Q=Jd-&n$`TzC63#=<LqYk5)R$
z=VKXpl8tzUQ@ws|I`rt#@6*E5Mc>>FNRcyiemqg(rJ_mul?C}rX3yz4nem=U<XO?q
z<yC7JABq*um=rggIe)FY%5hWEtwE6wx1BrD^ka`6=a#b1#k*M*D&lT#RXIADi)WFg
zZ`f)P9<##av**s8ICRHke)H+4_Y7a&;r?%Pd;j@=cO|~aS$<x$<E!bqbu6j1XYZ`;
z{Ky#@6_?i3A-QPhPuHEsRlzbVMOS{=WqQ)%^wI14Rkc5t-|)P%g7IL7n9+Y<o=*Y$
zTHY%QeZ6`!`qSk6zl@V7%w2VP+tSmHOwHDfhjw#LfAIO>&rDAJ^OL{H1_#XBER=W0
zp5d@_d)v>j=ih^OFy?P`2|Dt0sgWVm?<ZfmLs*;p<*(UANO4a#KfC!#LY%z8ApyO=
zwa@MUcUxEWy%km1@}0wW{g=|mTP<V!xHrwH?cK`ExcJtzyi<#Ae-zzlxP9KfeE!pC
zye%s0H{^TQzYh*q)(ebf4L(rPV`}!IN~>a3_nIk_b|3%G|21d#jo%vS)sg~se_HqQ
zetn}Av}@b^?;1*rcknz5I=G1^DsslOqc5$CULT5{{VaVu(^)0$w!2K~Yn$HOtT^+?
zS$?5L-qx4pQj@DnI45^jMCN|sWNl$qKQ}pP&t0iQT~o6Ie_czQtFS+EmgLl@J3S-k
z$u946N_oilIpQ31)Put-<M~~qmLHoo?Vhqx#h*w?i*G$wGG(@N3#e+J^iuznk|a5M
z1KZzU>8G<6_iKOK%&6d|uyNB&OP1vqKfM<D!6+*6UH*)vf9lr6=2thl&vM*YY1z%~
z#N2W`{4~pvW&KkZ`MGyCu$*Z;$f#$#gFmWNw0^z#zVH_<%bH>i>`~vjmG}Kr-B0JO
zFV6B=efK0|bc0>Y*IedHcdC7uWSc|wx@60K?z&c{7%K8je#J6}HO#Xm>m2-l$FK=`
zX{20bn{}2komG7Lb@g25<u9j;WULUc-|9chy2|w6n>$}+gdF#=ZSQi5Vp5frnS4cR
z<BY3ULwz%nC;6$GH_qQ{r|>cA?JC`CUe_N4u3KJ^5gMQEHBIdK&a`aNDF<Kd*jenb
zD(laixU>2?r@pS9uDZ=a>)n~ID<R>NoB0k3ah$jiB6BJsrkZc{raNbzFq)jWdD3vE
zq`c^PzDxf^W?#I{HtU6>>56TR3;&wG+puXyz}Y)H6?uKn1}*N4Gm_K4$A3ruP4<~-
zi%xeupW&sg;j?_H+!edK|7Y07%-WlL@l34ishxp6K9^51HEh_r*ZI%Zt(U5QteI2!
zb-H=vwKqp=HAC-goxhh?<eKOgsgp(ShM@=UhXzJwuh6~reQ^NiwieyB`-PpGOzL94
zm#^Eazj*q+n=5+kzFtjA+-jFzzFzm^nz`p}M3e(9kHtu~s>*%a8NKDR`dqPn;ni%M
zzaN|w?|y#!*`K7}mCZ~7R__u{>tsHXi;catK}hJbVf(j(Z@$j=G_go#w0rFtImNz=
z=j)yZdD)iFWn9S`S_kfne>q^3`-L+)eAj%(mo5tv-S<Zwc^Tt&Frg(`AwoJLT-aQ1
zR^;V^3Cc+k`WKQN_JwYEHmTS2?yjXf108dD>yz6})%O{HVCg7X7T*2y_KBJP6U}~Y
zS^eC;Xvg&#+z0pseKt5AS=?|wI^Sx)fY+5B7pyA6toZgHFjS~sb|Gx?ajU}MMF$uS
znQK?P&J5$2D6lIls(Y%F%GDKDW<5;as4->dq7w%l_e@w)S!;Ll@N{=!z2i|aT%wG|
z!J5-bS@`_4UoO;nKW&x9J3*_JFM<|co!7Ib;PQjy58H2ZyklK?>Am}P)+;v3-)E~y
z<h-=kT)6Xg(c8b*zkb%d<UH@zg0Q#K51+5giw-#ae1n;Eb)VPVCUFLd8IjT#Xa316
zn`9yS$LH=orCwj(OIPkFm40n}q!X5=tNpR%WBr;n>!v=NCs?@mzuU+3_oa`L|JO0J
zyt-v&S@zBKWQNj?JzEZJ<=myVZ`uBOhb5~#W#(zETYvQA?O8r|f;LD`KRR{Am22iF
zZ$7tI?W_nX@{9fc&Z{h4%*}p@DDSEh2Tx|tS?Sv%{_}f$<^Qvb^dDclo)YaX^X18f
zcTGulCPJM#%llr{cC<Aud0h6DFVku2#H@{Le9!Ptc)2n&Gdq8Blx@Lpw^gcAy_5L5
zb}-2s{dT&}FpalynqOq>tckPV?{{mQ_3vKZ%2k(s#N5`Hxu-oTWb*ZUlU-}~<(<D5
zxTmY3|1Qt;Enj7)9eG;rVLxmB4ozF-<zKV8=FIlVe8Vg%^YP-lvf#aCg>GTb)FXNr
ze6KC9zVNQ@)`6-=x7daF&P972e)?{T=YE-Kt6sl*<FUd>E<^F_hrnH@pDua#Q14CS
zI_Kp}Hg2vzExBAldTRZ0_ibXY1o_{^)b>|%2YovD({p8hmVOrBhd*8|nj5xV-FEC>
z<Qo<31u6dwYn#u@&)c$e!IZQ|we3rGZtg$zI`!6z$;E{&PflzOx_`%$dx`8M?c}|o
zOD*mHZo8|aw&+0H)(IVLo-cFW$_nZyZH`Sz=RcCy7qMeOLH{d}qSO+F>&aU-2^(!H
zIm<8ic-GPPE52TzDt|-ysZ!;;r#?n!{MOB$H<4F_u_QHYiC1x>li5OxxchTNQ|e~g
zTsy+7zE5MXktX-!>8W2{wHN(;<-W!$pJDDA7xCpPi}GhwZ$3NyZEK0cdoA{ziW3}n
zEOWTP__%2K${M8&YNi@a9qN8|c?T~zS=Q{fmHZfX)x$S<`Hw8-V+m!pn+;E7U#`~p
z`Ch!<yZ_3|+1`#S?`)rO&#vk}dGq}L>qYOl_wOoheXhAf;6&T`JxaW}w$}HURSb5-
zzvwxbarx=DH+qH_7d)9(%6YEu)SW*}>AQGl6n;u~d6dcNK6#SY@|}r)zJ4{yOf64t
z?|OUh-r^n}Ia}pgXXQ(mE-iCd*!Ex>E5o&LWxeHUPhT$ZusU;OXK<tI|BLBM!zX`g
zeEd9Bb=EZN<m8~(;NwmnQl2gU_^&FT*_(8Z<?6EsS4y?|;(p$&pLq19=dJKJQ$(87
zer>5Zz}VBgtJ-|N)0(BL<@cygysBWm`kU>h>jC-o^Fv;JK4qn~WZTl|+q6U$olIYv
z{Gj6p^I4yF3-7Tl=;+GV5_@Reb)4Zr?WFZr*00PEs6Dl1pT*}_^{G}_)g}MUty-ju
zRX%K#vi!Y?CCXYeVuJe7vn%UwOGS!!biIufySy`M^39FfEY%O6T55m4@n)%H?A3@p
zn;cec$@$1wE44f1=>D7E>d)MdZk(jUeWCC6FU#kjEz&qnFZl3q-t7-Br|;}DpSN&w
zth9TUqs;4%y_Wi7Ywrqi>Ye!VR(na}<CvIPb8k#(p5eE9vf&)N;>vEmo|y-)DAg}J
z{P0nXk$c#hz^QZ3g-0ZUrmTfJBX<7&ts>fHk}qrX_fl=<1J(*2>z+&hUR|1_<8yDB
zK~&KE@3*S@Hm{COW^Pr#8~UA_LoF|Pt)|41=bLYz>6D)QtAR(x`grl08rxf~e*2r1
z7M7<x`*nMhRq^E#uGQ8VtEZ{gnkYZKd3%#l@#>bF8Q(TbKl^MPJXwfG@AG7VWeH1f
zuDZZ9V?hyzsg{)YvWX2YN80_a#%4_NuL^kfVOt(o|Ls(l)CJq7#!vrx!Y2B*=+?77
zAw{zq7B}@C?mtzr^yKu~e2zaB6OaAWzT?c`?s4++pJLmy^I4<0wR)SH!ZsfKyzP0m
z6<eQY@%0Hk@zvpnyf;_tNqju1cH5FQ(YNT&()D-51s+EpP?;)MW6J3Kd+%))p%uP;
zdzOTyr>3PHyP;n2&*NaInSLN^GegJ33tR`q+TUFdp5%G#?1O!x3E!Ki%RQ4yd{+Bu
z=k%B6!NJk15AaoA(Y0J3|H%9CByabh<~!~tu3VEpd5^wAFV}{^ShqvAb&r+B>=xL(
zIJPHHPwQRQe3P=?g51RnPT5jxqW8*Qx35Y+euTezMOeMPj@mqt`3H}ST7M{S4%!-O
z%A2jdkp13PZu_au?*0-C`|}P=xV<!gp4Z8rQai)A#hy-7(wdg}dxPAIk0-S1`Hoay
z__=vEV}N7}i|thRwL2P_ytdcv`F$aC=AMs?*7?<}TxU;AaxD%G=w?ZHaisEGNZti!
z(|c9gnqdjYFEmMb$;@D!VVm>XRwYy_-TWxS-+wMDE?u?rWG5Fbiqg_*{@Y%?NxSCR
z9o5B2*Z1$QdHbuUc}CB>r{Df5hZMId++s5*o^^4m%pZ<y?@9LkK6iJiZ2ZtA_~p{?
zzRLBNm;}1c%@AjLI-e<7Ou=Q2cu8L@Yxk-s-KnO$OPHN*RxJPN`eye;WBrro_x(@r
zDNN;F^SA!tOvg|OGqqze|KzIgR84!q<#%t#iszv-SUn6vn!1g}?(X04@-_FoS-$so
z2lqXV=$3RXI@|bC>-D-VZ{D2ISsjr3h4tqL_4{hMUoyYntb6f?+4beGv~x^u;b|+i
zAD&WEv8W7vW!+{H_hR#>T`KK6{Y@4W%wH&We%*%d*0Az((fV_h)0eK(RoNL5F-t1z
z?1K7Eec#Xptyh(2Xy4!Sr>~`n`_eVj1BZVtXszSgF2d7(>+zY5t$LG0m*2Z#eO>=l
z)j37?dB4|$Tr=JDxSfT~{L8to+?UFqNKQWT^wS-d727m+ZSJu>`)6vf`R%ja`5)h1
z%SgI%<Bp!_FXKJaW-W-_cz0IDp&BX2`X@8PpDwTeD?d-mf#a9=_X~wVQtwq)p0Diu
zFv&&iSjw++yff#|p1!{3@pezc)9)2d9QG>93SD;W{R_tJ=PWm@TjzJuDc5+K(vNb+
zKPg6O=MKG1O3%rAv&p5Y`)FkEUx7UZH|#%Odah|{V{GYo^pw^O*9?J%@~fu~O?kO5
z;=z*T`@Ds?N}j8)n;6uwxA*YjrzHUuNxGA#T)3mr%rc2(qt@9EX)Y7$|F4xl{ppa7
zbzt;$t&p&bn$@!oB)pvElrHjlS@d<*cUOO$)fT$?``)FCx{DWI_gwk*)vF16E-P1_
zZn?K&!_yTzIJcVr;(K-etGP*WufAXJsV8T<m+14$)c5(c<(g!1C0jnd(H%eOWwiL(
z=9+q!?02pwCWK!V37sP-{rVPr7Y|RDj8SFjr2`TtJwtuxvYL6N-8uN|!us##+k$>D
zWnVFfIK_GNSmdJ{Z^iA~;v=FsH0+!2#wE=8GQXnHIP&vi@g<*Mbn6JsZrY-DLA2LR
zVbP9tXaDZ4efjp$@eS{$KUbTfJtHz&c=O|np=FOAhIgdc=U?>azWP>8@%sJFKZ|pJ
zyg9b+=EIv0O&4igzGtqq@aIQR1D3IcSv^kW#G%T*z=>_=oTbYItQjmsnB7dzZ=WgA
zaeQ<6y4iQKUw@x!;vi%F%t^!UMb+tLs?$zMeB7PnZm7R*>yCNFo-gzACpiRb`@Z^H
zntJQS;+TN8@|VWhnXf1G9BZ0+vhb)8>%I65?RQ#BGcVcj<t!<kak08aC_2{Ye)p5}
z&r7|gHc6ifP#60;-*ok*H#&T>hi+I)_7_!1GO~(B>)ZV1i!e2qZyqq?+3c#v3l6-v
z@;mUvTH(s_5*{gQu5H)fzCU?t>HNBQvE|2~eBS@-{>#6fn@#()?o=u1pA3mI%FYhD
zZ@0#A=fv;%iD`#e-UvTW`EaE2@$RYjCAS2~Fu8rL+HY7;_w(%jhdh0slLcnp{IF2_
zO*ix1Gkn*)veWt5)3hC{Z!(G~WuzKwZac{M=-IMksdZ_aGF<i_Ht*1$Jw?)Yo$^JA
zOrg1RW&ea|$b=hYY?5BlbLfHas|k9`86SR_x;XN+o#zJ2`xmV>+RyLtkh8mY;b8Xn
z?cJ*n<)*D?J3rwYXMjhcQ2bg8<JBUsI@`l%S}gi}{fgy*6h(`|nVZ*p|5`tHi}|6t
z#Tx?`J=}0-&zF0Ba~W!QHkbHkJ4JAHT#UV!(zqa7q{&76UY+m0UtjArn3<WmgzgIQ
zxvNOc4RkP3nc8u<YOVU?O%`R1Y;OY?oS*WaPk;4`-Kh9@!;f$K4zGD|&(}@nyx7!-
zeT|QetgAY=Z1R_qxzAmb6D$AY_lEUJ-obBz7<d*7G)KO>H7iSU|2Mnc_j%XOP1>c#
zs;2otHTSZLs7N$}yYTK)n~chwp6LX-=*9mwNptXV`^=zHT+y7?eEm|+gX<O9ydO3n
zo%v;tQ+h$wmrV=3qAj_f<vK1r)?-*Cd1H@`-(9m)x2yV^d=oC8_nq#RqZI6UaYe!P
z>yZoBzrAqs`ID_1wSzJ;bnN&1-Lvk?&+AuAwFEMz&CIr6s#%koyZETh&7YFW{9S8w
zPW7yl-hMqUT<+JgBp1flCi{=BJGL!6S(&xu`C3-ip7}1NYyJFBpLn=<Nsp3wS>`{(
z)s<4m3j1X36`7TfgLX!(<Kd9koiQWO-pJX<eaFtVv9DfBr<hu}*FU!U`@V~7zK;Gq
zv3%d=Eqrq(-4?$;<>$)iM_U*ftdc#%xK-V@xz${Wd?U0ayQuKp=KVVA^M23ak*iJf
ze;#bN?m*5O*&hG?)6uS)ajvCnE`61$?F;>7!&>@jn$+yWtLAj<`Mo&bE92ykdQqFL
zj|xIPqJ(!p{h8_dpj*WHqo#t*$4AqjeCf7VKYqT}?bh%9F6qwmweOORHl4}x?^SC%
zoF2FA!13dSjmOfe7r$kH#s5yX?PlQ&Ro$uA=1!9P!#`=4fMa9E@jFjuyp(vOV!*g+
z#S@i%M%vum-qU8S=sy4N+1c4f*2bv}LK$WzwdO(lW@sO=b=;b3&l&!}bZ*r<QP#@R
zN4amNJ5<{<CPpwf9DemC(N6T(u^Gaj%*%`4E=sC#`TptRbGy|iPjDA`To)D5T4>f@
znRte03-8?2rBYv1;!~$Kot+Z1_sha{FK0f|iFx_YkyYT-O#kBYhDUZ>9Oa)DyG;LZ
zsy*LZ!tK+qpPikaJL~?o`S|r*w!V;g^s(u=FKYr*xWr5aS`Q>z7yhlCxwACTF;IN6
z-EQL-8?Jr0_MFk6Am;JexV6{WI~Cnja|6Sct$TUD<|xPXmwS0$)i1um{6IQx#*`C(
zEHb~Fv7S<~XWhpypwrj>`!72i(=D%?Nh|B7xt4wV+FE<>UU`dM;fK1{7Jv3UeK<}3
z>^t+PQ4EcnldsR%bGu>wEw+steD3W!a{hdO{PdqErQN=Y?%UP5;?B-rdfh*JME?|4
zom<*8M_cIl-Gd34A2;sZeEkQ*^s8>)zwf%VXX(<-{&QM&q%Ak}uF99capHaXjtzMp
z&U~!h&pEI8rIdO$aR;ZIdpo68F-$qXL&x{x_nkZRCe-iHR+;CK`EJ4#od%7%JUj31
z^+%T`d|V@CS2k;!PwM1f?gtFQ5;?Bi_Q(iroFD$`71I%&6Xphd9Nqm-pQ@VK_UJD;
zvC_Xb^xVErriJOjftMUtYiTc;&?&uu`9D|t>@OBFdn{5`zm^ic5gw4ZVgJJ31?h=d
zUk<3$nQ5d6EHg~+waC8xwU&3vOMzvE8Q*4{e`+3jvEYG~sb=F&qg`df=6WYKudnmH
zWV!zd*VUk_3%={jRC{}od7{+co1wc5fA?)K*j(^VJ^RVS-mV+Z7Q}4OGP&t9%P#N*
z509L+`eO0>6I6D!_+3xl%RXU$`yoXw*BR=6ReZ0NubC6}gM)+H<C~7*ytU$@*F+4I
zXSS5997u@ZKb3ZAmaVmj?w5u$>rbvyd%BI&_Uf&7J)di1w7t25u3yl2cvWHVbO-UZ
zAEX$btTuQg+B)g_&gqW(7w(L;`rT$}9(JKwYMYwRjKDjE5vxu5r_Q?1C?VbOdi94F
zwIxPk4pvqhcX<d0dx$7IM(+AN@r<9phtcH8-S7WAdB@&$J9b%jWHsmKmIZxzv8y+F
zc+`FS#eZWj_sd_a)~s3>;jF9u-E9xos+|E!Zp#_w#>#A(G1>W#Maj3+m)9j82spnt
zR0@}RQ2cre^Cn@BS^pP#ThvUNd;jUojY;N-|HHN#{*Lx9X#d-jVlEOhWyi4#ZPWNN
zbMhYBMsn*<40_$J>e{LG>{{vfE$U)?+4HBb|2yZ1Xv&K-r(<3-#LNlZKIvukQSl4E
zw)HtZuwIr|r_$~>cX}ji%L!Str2g5T6B3NR%33NPeca$W^)AN-%OAhAv}-S2x#nsR
zwXFBu^Ft|p$!;6E8s;(8KAW>n_PMipk>14H@_%zK|2)T(YUO)NgXM*bQS?6b^XtsM
zm?XHfmbI_W@C<+OB1CEG#9r04Gq;>x{osOQnQReTAM00M&)5Z>2QCJ`6S8~5sHK;`
zbjugn$v;l@q};7*EwbBWudU4#boIrN2`iF>y?30=ED2iRam%zM=FY>JuZuo5Z(q80
zv3KA6sxX;Q-6;!HbuOkDZ!yq4xU}*kyVQ>jXWq<m{^KjVCQV)?t}k=*vza#GAz_jW
z9(>Sr$P;`nWfK+TmawcuulaME+%3n1&5c%7ua@fHR9g4w!&UFs2P9WV<*zDY?W%dY
zX2E>n^s3hXR(C=tt<Siz&3WR7ouV(6B(3(j!RS}r=6~|)_c|57_m7!dDtce!+_)a6
z?Xu|i#e3E||JuaL)?`_(e|dw)Rp!`p-hZBD$G@FBd)jBs>g?C=t^8RE`m;D!WZ2n0
zxOTl*sQYNQU1mU#x7uS@Z^i)C%`aUpW*yDsWO!R!S{a-5r><CDC-T$Oo3|(V9XoRW
zQgqRUd_9u{U8Rb{1!jxmXM3oubO>E-&mEg_f&03#X5`iRp)0=&CK%6)nVeA(8YZ4r
zHYf3DRcF+f+v+R5cU;wezfsh9Ph3=;%GU;MR<#wI;&y+~Te)EC*WOFEB~GtIuN*c$
zC)WBglHGzYTCMh%eoN21|CiQ#FJ)2_asN;gBiH}YvX|}V$8CFm#cav{Anv-hs^3QW
z;7#k_zv`OxxE#9u%&rxeWIBndsjG_ldj-3%{~}x0mMsy_zK!A9vtLm`vwr)DShw~q
zN`IGj|M2pi28k^yr*>Yd+Y@l1*+7J4!Hv83TxAZ)xvL8teZH1e?wsH`{|!H4qOWUw
z%*ePb$DqNoRD^S1pz+n5L)R6i&A(CG&HbaxtG>B}x97y6H#@F~Gd*qJAzyrRPT+f+
zZ<q8vlCLLhoUuccXWFr(HFF~}JeTFg-`ciL!1;n@&BN~a`<4F!?yp~!{b&Z~Ju^;e
z#bjNHXWh4xA|F0q7~N5Gn{B1(zp9tgc1q#*>R+#1*lYLh(ayt%QUXN2X&M}_^>Yo+
zv}InJIGyR^jZZyKOC~(FdibX<+Ws?ty598ZE;f3cXLkQEVf+}f(U?P^$we^4@Q=Bb
z>dO?TPp`8lomI))-oQ{cL2E<nA-C)652Z8ATWRyUX&r||$MhNE=~*XNlteyYaoo1)
z*m)Hx$6tHp|EfN%>iwBL?^Ukf=^NF$qEkasW_}4|{uU$h@d4YZ_3wG&9FAUAS-Ea&
z`yvwymny!wOMb;YG~_N<n0cH>;@&s2nMO&1>Ty43ZQ-?5=8aYM5!-$)@=^AskD*Pe
zC8c+-_8Qrno-2(GjZUw8kZXUfh;O|~iTpI><?$01DlcEUfB*c0T?b<4XFD(Od-Xa?
za}$&Qp>xj9J+?bM@Jhc{Ie*)_+12W){q^$$LcI<~6~8a+OyB$H%e5Exd`|T8$4_6`
z8JPE_ch|;+{8E=Q#CcaZzAwmXa45~NoxS+Jk^@@<>z>mLzl0XDMoR7X%Aft}mDV{S
zhk~@#TkKcW`1<+^aa?&{;qUeSVBO@U><P@iPwUPLh^$<?RP|&^nf&*FgqyqiD?YSM
zSDo5%amw~p%fc3&-pul1&iQNgA8U%P#jshkbDdD;F28Z{=;nr6UaKA1CncKgBG^0J
z4aD8I+pPV4ut!Gp#~%MZUqXFttiLtp_Ab0JJ?LJyR=R|LgZhfw4R;<qn$r>%zGU4-
z-zxWW5u5#3)nv9#xtKrc$1A4VsHG{nmfp|J<_De1*jVtaAaBz@jriX@0!}{9esIsS
zXL)yXr{>-XYtH-LnR4~$+pNbOq7R=|UUG`w)xIsV*|0CO$Nymdtv>HE_4M$c6P=l4
z4;Ot3-hZHYv5)lK<qZMXFU>svXVaFivWfHZ4kXk?zdK@@u`+7$4vt-gIi;1i?-+j4
ztP*o~vVPXO&9K(=M)SS1uQv0&K6Cheds4OCMx9A<Pj9e@On4h86XWhbw>m3hamt63
z&Hct7r0oOGa&FpIx}Z*C26G|943<@kCLS&1d>w5ix9!uRUWrF-x6YhQKj-cKUr=!V
zqM}-d2!)q7m>3l`swEs)&T=+!tlir_Q(#@TgJnj$PoPJu^S!A&+ipaJJU#UMf@P`H
z`e{y{?H$HZVc)s_@BXt{{>0|>|1PopN)JEjcq?4T!u=MTnS9%^i>wVd)%$Z+Oqv!J
z-({D|cj-jQ^NdH~2ifCduOAT8zx8|GaSgGJ@w=?%gubxWn#+9r=PZNY$7U|dovOL;
zEX%rY3ojRaTyDQ)za*dU4>iZU-5j$D^F?0-d_5JbS;^Yk<ja)r>+dvwySI5r*sR%7
zOSi9|&X`k^({nYfp{hRET=n4Q&a1Jj_ayPE2z4r1RLuD<9=j;{`F@S_^-raBt{EJ7
zk;q@bcIx%1OKZNcMMbi5o$tSNj^%T6_DPMO{}wbUNvv5eEY!JQ^W4^!ioJ4r`+J)1
zow;ST+RfwI=V`MZAG$JQ>8#y954~A1^Jqz4wEK_u6*hkJ?HFF>m_@Tp{GE8dS*`ba
z?fP}gRxa4}!~9K{*zJGPA8mj9_U5+;NO^WFKVoB9=>0=Ayel&<NH{68g}$_1yCRL}
z0AsJS?c^R0C8<X~?Xk736L<G>HQCk49*Hn$?l8}vdVdjLsQ3Aa=_yaQuCxu-IJWEH
zeXHu%wQ2`+nV0|g*t5=ECM2Re#PLe4dF}5_YxMLzdynn>xA?q>u6EC^MS?cjFRYI2
z7i{G{5?CT8o0|M<Qt3AKjdwQgKR5C3ynKcHh5(rt_jd0)D%D=_Zt;puSDD2OSr)5E
zJeRckC*!VhKuL2cZ?oZqjy0Pud@^W_n!~wvZ~Kx^#^<l@%y`y*_G$ah^9K~%_DDtV
z)=+tT;KaqKuDOag=2otWDb<}jsq?kGM{RNYmQw!DK2prQmF&@6mm}k*9i3??Y4dH(
znzsvX<rUqPZ4sR7rYdcD<j0R46`3EOCe$TH*D^9N$t1-voLM&|iMRiGLOEx6SlADJ
zu9yAV@0LGO<n+7$?60dFgW;}Mzr?iomD4|%Z}BR=Ul=)apJQ6De=+-<)n$gKUaopS
zZDG2d{=Q#)r|(q9il3XZ=8V6mmZ14mre4+6-j|K+ZN1hR)HS|m)Qa+tTOjsJ$L%Yd
zp3l9crldzJgFo$aI~jf@-!A)W@t2=YrMKRyDR@p;_3+jd9#tjBoeLZPT&lL8n4xiE
zTW(J3w5k8rZ1$@6@C{TwaU(qCEKi`-y3Q+Ht2@&i?x?u`b)ToY^=n~;``g{=3l1he
zxf#Be<zmMViRR0`U4qB*118_ww$S*|r!Z}a|N3u^J+gavZ-aA&y-LHZGpj7FO+Na)
z_g3P(P_2MJ2HG79runG+WQ&Zmi7wOo^1NwX`}&(}i{|sTF<8lcZ@qq@^u-pHL#K`E
zU&lu7_{-Q@I_tL8(p}5Kj;-J8emIeVq2X5c`<i&YKTmGkC@}Dxttp6Nb~m*?w>Fk}
zSDm(skhh1;)QMN8s?NM@JOAjMq~yga$!r}vy#AHV4&pxVxO>5-SldgU0vW6G9^Egn
z*pojg{miL%PgZW->cm;les1S$#;diA9NWt|V~y5tWIg=*>)O4`UMMVk?R{!->Zv}9
zh9mlm*{%7`MzT&U<~pVPP=Mce#cs!1@w*8&!AH_>JbaMf$jW`SV59#5EsH-r3z^<d
z4YY08Fi-!6e?{-MM8kh(BBw5V<?*{aC0c%;qBi&CUDvZxAKdty_RUIII6Z4;#<{b$
zufKUEe^0#oye{Yz<GPLR-Nq45SLX=r@7EXkV#U_)?OgrdEdT88V>R7+RnK2lm(OK)
zV=VafO||!Rs18f6{|9cCUVdrz4c~3%aY@>Jw0XYw)Pwr{PyH(UY9B}*H(3@W?s9)Z
z{v(}(KY1_i+;}?QJ0o*ieE%NPJvQpb$=A*1zK`zyvcbAa;A+y5$1WvPcW#kP4^UY3
zJi=;om<@aL!38lpi$d4M?bTYnaK)DIJi(fO7sQ`X5Adju`8czWWmdZGIe%@2Gbf^q
zls;aqe0DtG{=Sa~{Z|w-^>W1fHn*hZ8?#M4#-8pN<MQGgyXXCj=4TRgb<YSzE>d#I
zEcV^Ud-ZsQuvHBEWrs_ND_8s7-K8OX-9DtiCNsC`5Fh*6${8Hz__PxaU(PLj#&^)?
zBm1krt(P()Ccjy8&$%q_t0Svb+l`-0y&*bzrc19+Pxp{^p47rskyAO%t2rp7^=#0`
zExzXdWwn1D?$*y*xvi}5-N_YfRw|3RB^OyO>6xYx@vy0*YyZmNW$yYDy$&}A?Pn7@
zdF;m(8|E{OTxV+MzUvhc{T@8oC!j%^`Rk+gD<3VJHD|_z+lv=Z@=9M3!^LMdkGsz7
zNb0t*wD+ZqE)EG#3d5)0Y`oMg8EU$Hd(fndqMfdXCdHlhEdQ_g(L#1s!u<!kT(@$>
z+TU5c^knv%WiDdssSmIHUUK)UX{pES2bx+FfBr2sDtadR@|FC=eT{;Wl9Ce-E>w)1
zH}^*1U9pDeb?dM0W8Wr}dDm{1;0?{Tg&ZteFR!hy4#+=x>0Hvw_l1+pb{%r8-FURV
zYm57G)8Et6kC#WzSLA!udNZ@rRe9RP-OgEAuTA<wUfkoDe5l{Hp@Qj^$%`orznAnG
z&0Am0$FFwu`=?KTEZ*yCUvCU6TlV*?t?MuIcdU~p_*kiO7aPyH>pHdK1<Q(((x3?M
z4rSRZduQJZX*^c<<>jsQ*{_uij>)O&-rBja?ypHz;<WYZD(5f!cQmY-9rfGxn$9`-
zBTWzf+_nCD!~4aCV4e%|3JxZlPeeX8U46fO=TY~QcQ#4+vxy2csYNX7eYd`Q-<n@F
z3!53H$+H|U_*cC;%Tj34wV13wuXeL=%7|YqX1d>OD$J*MNA$zP#{xQ0=a-a!-E;Ov
zWYZ(}rO9g6qALU5_^1Wjd|n{kIP-9`pLFYcQxi5h@wP+f9XD=Wx%6&Qyksr!obQd#
z{3NX^=gm8MMczZ*B1(w+T!6@CiFgm!Eqvi^8YPaeW*zO%VruYIIihgoVzo!juSb@1
zUKuiJT5DU#@wmJw*s(^^b785=$|^p_Vlkl?k1s9Yl-MG5_u8FqMia}Ol@EC>YrX}$
zUg+qJc({7XLFM$7Ygi_yJ`!P_An}cb_sSWWXB-S4H@}Li`cbX$hcQaiMJY$l{_jtd
zO8Y-|#8ZA<TguGN!9Vve&+VJp*Vd?t>1Xh-$T=XqSz)%YZ%p|8pMvux8x-=a#q2%z
zRQ1n|tZlp5vhe94iK(02e)-Paa3ZQF=!B@<{2h;$9d39Y85w%gc0$+M0yn|ATfcr?
zvu5pcIgho1v;XBCc$~;BHuKD^E5BZ+me$2II_k!&yTor2o65|%aO>js5F2TmYuB!B
z&YtD#s$#^xE2%B?@Y0W`-&|VofZ>$VZl6$7Ba@;SnVS;KZWbbwW_Cu;=HrgGNX;(K
zRlg_@y`aPKG}GnZTW7Rf@3(YZ@pjSYpB8+o42PcZUHvj!{N57JHMbvM`~4>AA;%a0
z2I)6{x0b|&O&8~!G~va~xo%>uCSu2v1K0g`(NU5Ma552G@yWbs8gnaC6lY}Hp%-E$
zd~+wHimd+DVHWj8ev5AJoM$qP`yYIIWTSnZ_pIzC<Dyw|-8v2jCP=U0Ssu-`?v!tF
zV1iJ?+NPvHqfLh*qP!$)SM3&O)jT)RLMHWf=ijnprdvwAuV3(dY^)<a@3012^8ZB}
zHis%RWdHtlbo-CL<<`v`<_GL?o-Vtu`Ptt>u86B_Q9tyLX@2StkZ_6tZ3(#c&XH5s
zXWCV_@297omu{{35v!bk^yh)%!*A0P75bSLuj`G-Xq9(gsIY63#>A_xlDj|YN!yo8
zJ39GoS(48FW};M-mE`94wS8I&KI&g}x{F<2<teoFip)uG-E;Lt#=`J4ulW7T*ZoVd
zUw>RPrTyH7ckjP7K0YF_WmV9D{-jL5;&hP-nVszZFW((Lv+$(Prq<&L+oyZFq{i+S
zeD5%CnrB?9ZfN>~5M~ACYkvY9xvnvn7$_t*d{pp?l6F4Nmibmv==z>;soUnOZn}9a
zb5LaFuwYmc8p2z2_~vx?=Eu6eU!J+?dndc^x483eQHPKFd4+{NGiA97=dBJh*PpU`
zf~sRcQ^JO=?F&S*8r!(<Y+C6ZnXFo~pmFP0`H4RZlf(Wli4U2*Du3F-%laP+Ogh(p
zJYEtJvT-fjE{>cD2lkZ~ezsBFwZX$;^T`D&O~O1Kyk}?3KGAJGeZqxDTaGBNzI63&
z@}9?8SueLfFR|)=r0o&3_+p33B*`+qgU!cd+I}+%y*j>Dsnw6`-No?wxAKM)*p{!G
zm^JaN=n2_$R&kNDODfk!oS$(yD<><_A>;j<XMcHKN*(zlxhr7d&cJoKC#Fch+VOAg
zj^i7iUNE(=H9RKSwAM_W!76&{CWaaY2Jgm4*Jd92E4PHPgt_rRGGlYubb$w(LJCD*
ziwS-BZ2Y)q^NM$jN7$|Yys1fCd;DSis`f3}r)$-}nn_*T9&qxWX21%zxurIn*Bnc~
z;OVH^+ROSa?EAvYMNikhe<ylHPmN2XMpfj%tgRE4Z{^-KqoaSr$%OFBw>~f16`ane
zciL~U$X5%?>8qYkR1=6ezcl+x<{N=L-6IYz43C0m7}|C`X7$%nkg@qWX<hi4-)cEq
z+z;A43$?zfo%qJ(`|lf9zrT;1u!OhwS!wWgJEerzFYI-E-|k)J;1&ESW@E>%4O;En
zJpX=J`T5hW8=;(2d|!R{{5M6Fd&#C<%U)!5+e{R5o#o!xCCRxyN~v8<%sJ)7vFi0F
zue?27zO-BHdZ>-k<;CGkcW(Z_uR-87&!M`nx^IQz;%>Z4^k}WyzGX|f_tbsIPMl)W
zZ98C-^HOSpb@)B8|BUP{{r@|*>a4!?OJ$ddv!i5{)a%Xc%7PJ160ZB%&KK+MTlGWV
z>u7C{)6R=VN17YwPv#V>Y!><Yfq{4JrJw~`%O0?PzE`D`c2dP!?!#9*PPtS*rtZGR
z#g}eeJH3CqMaj#8OFB}Y!*?*eT5{Lp+pSZ19Cu!<+4uRd{q*yH4&`@T4)(mz8@c9&
z*Obu7QS}a5t5-!ljSv44_cG@h8`Gli+fBp{o^R{f6|t(Za^;%rC!Y^)Zrb$n;`99q
z#pUbdI==RpnwI=i4Kqqy_NqYYW{k{&6*UVp0{2LkJ@uL#&vUc+T|$~xucWn=(u}=x
zr2hugznfJzSM4V+?;{VrlV|SiIdfir1NV*2`OmVSod1&Iq{_ZQ@U!RA>nXnTCtnUS
zD2WKY(LecI!TQ>!nJye$j5pS@P2ZvZP?@Vr+d<L#?~}>TE!I!xI9t4Tlfc3S7R@(}
zIlgY;_l))4e(yQU^Ror=nirBagT-W~PSJGRp7Z8es9kf=fnL27%@>=kvlj+*lys=?
z%<6He+WyFJ_udPddUI8eF64>)QBmP46@BZ-^4HcEZuw4Qn;{Xh#n+|B{2^cV+9{jP
zHMOZR@~)lxs9^Ta=#p)+B0ff4$1Cd2#x{!x9(Z#?{hq2$#OH}Cy!3rf-?^gkSiVN0
zcAwYFch)MsvCe;H2V8YoqkQ4=SI*$vh~EudrvqF69P41t*w`5{<-73QtDjQcJ-Bt&
zFO7WQxOl5g%uai*a|@il&#!2lyX_Lo&6U;Hm(O49^kv$O=Fi-ln^$)m-`-^reV%(x
zP;&Ua$?0~VO{>%w-#8+Z*8PsTZvSV+#|+=pGVbQrJ?~HPJ)hgbKkYf^_YEfwyo;K>
z=g;?l6D>^39=&n!<78`{ZTyOrwORY<#O6nl%g@*U`X<_EkfUp|z+&Il6=rpRnJd3t
zjZeuj+;{i8K+@&;wiSO^XYMWTwcD|jSLKNUZ=+l0OFNf?)+O7uYPP3V7W&PyuDZFA
zCHITxrVY0~cg#2cyomFMP`Yu7pp-V(a??X;;x9g@n57vP?kxSvbUwc4>yD3=A)(tZ
z2}gM9h<GzUn;w}p^Nq!eq{W(_n8T(n*pbn#^JaVdo{2ZOGTU4C=w97Db6&@9)>fMm
zj+J$p)jZQ;IBrb8U+J6mhqvg@&FQ*@9c$L;>3>+B`0o7c*UyfB{&j!ByN8XTA=kyN
zH!f)tQdv6VO9(TMXiI{?Bl{&=v=SUmm+o8~A13zA&+$W{?38_3_D54D?77u;d!@&O
z?|YW5yv#6ll9qX6znabT`~MhwufFYdytUkpx#nDKpzkWp=Qg&XvvSfnR(-nWBO$l(
zaBSu&x$Frq&K8}$%@vW!I(ey0cGxx>xtlL4EaZM$nK-%K-udl^MVi?JnZ?yR_v~<Z
zaOqlkgwRCMCT^ab=38CwTV0PmdQ$pv*WIJl+ok$Eg3kx8Z2Z9?qM@A~X?y7TMNb!_
zcUSiJi%jmSnmKQWM)zjn+bb$wROH@0e&aqvQ*`>Xc_+U9m{H4FxZ&a2l4oopvK97o
z{~yxtj-Jmv#q6Tw^7Uzo%Nq>$yk*$l7~sg|%B7aZd3%?k_wCfRUdt<LOsDl8W@~6#
zmH7RH<jg&_p-jE=*H|fV3156#r6zY;rpDiR9@7UU#)hdZD{k(Pm%F>#$4#d-UF71l
z65c}s(sDa2))zE-_5EOA%?UZWF-`VU$$8`46{)lJN}P`~oS!=PS^eqjaw4{+_52zW
zR^`7l;aM|j4!5h%9?=x_*K*76?D(+E_3N4&Q??}QNsD|}s(7;IVQ5#w)gR2apS8(O
z%Mf)@|D${N+M2(A-%S2j|Lxuu%XP+Qg{q4j^&H;aC~sic@m^``>X6vz@N$2jt%o1a
zl(UvetS_-RwEvL2>_h&4&-nZL3j1Z}b#U&kTDEFew*FKv)y_#Cfp;95ZhWuxWaxC!
zt2<Zues87mL<Yw~L02VJ7Dt1LGr#Y9|9j1I%j3~qylYd0Tv8qwM$D5-bE^3AgH6~e
zwtt>+xa!qAN0Y3M^(g2jaBzLTvb0-ODz!Fs=Ndhh`wUH+y)-p{Xc;VSW;plH{Ec>x
z#=_Yg5$bN<PZ}PXa%Nv)Gu={l^3WHLn{tnHYE_;YWGueWzW@5<)hg-}D{QT2nYzaw
zI&7<Rvvcdsz?)I=&vv@qd9$Y1bwP%Qc5Tn(iyj>9*{Qj<y3#Lwk2KhY3Gh`3pMSTk
zf@`Od5&tGJ+qSkgMW>V2Rq^^o8&0VBPG*x?^;bsE=>4*LpVvHj7+0~{Vb_N}uj_xM
zvuW=rZ%|gsNL(<lQS8DpPpdLxnRhM<ajO<o%xUgXU}u*u5ORK~-LgPQ;*ivnZRVVJ
zC*)TuY+2p6>HC@2bJiX(eQx^DwTVfoD<k>%yp#(ezRhdweEII`Ii__l^X7i+D%AZr
z+@#T7f91L0AP(~m^IKZS{pT-FlPj_4ZjH_I{#AZmR>CE%I=Zc`Eu}6o)4w57L^xw6
z%gP^9&YOI5a}yI2`&QD%6Jz3hr#vm)eO>JrcDAbt48BWdElGXQb>#JIRk>~tqp2yD
zjK_8M&YYO*%VQWn<Ggrf{$8<?4&$^HQj?FUtaq$rXBIoa%Xu_5diu?mn!YCDr)L;_
zjC^y`<NHnrr5{@sOw*sg_nSfIx-|#%vWh~sMC5N|+o1Wdf;snTT2=D;cf#K~=5d=F
zC$8G(d41hg#b1Z&6PnlgnnY~dmT_{Mh)G68a2fZ}<ClVK7QNn9bL`ivO+MKV8qXz6
zyA|Pj&Zu<$9+l2%a!%1{ZtqWCxgoGWZTYc^zdw3j6r_}_Z%!=De6?`tLKVK>ulOdN
zuDLhU*QP4MG1kDN;zDCUVE5HuE6+%ZJ)J3XGHw|=(}Tv-@56l$+_@A!b^qp#n-mT=
zbnn{LY_{j_v@aVUYaJ<l{p-)kh0#|ZE^Syo>0r(0fT~MBzTbT#)_r-~n}CZ_^DXK=
z%HG_R(%&a{|4yX4@Z%dhxAPRMTud|l!gy{)@A1<~Q93h=PVz`hId$sL895`#H`+fc
zw%bfmbdH{~-tO1ZJNrK>dWuJG2>IPu!T3J%XX{_~MXuZTJLNQ2NGulUs4w2d-{|*A
zq-@F7opHCUb}e1Gx14|D?Te2eH1S^Oj<{Xnz1`R@@p#pl;2O7EdYkttSf5UQr2TBk
z(ygJ%+bo{y|4Gr}xhCZmp*>^6>P;eB&*n~E6<_0cvOVa^1LcoCYwG;N-vmmFNpl~3
z)SYF))!KCR8Q+O_*Sd6i?p}JG^F(K9b=uhwJ1^r_9|xUEK22rr)1Kk~C2bpc*AyIH
zaqO|@;Y%!M&HOtBRN3cF*lBo<>so^dYw;|p7Xj1HaNP*B?Pt3kS?c(8Kbusl++y!5
zmuj7ade<)D`)5|hncKD`c>Vtd7eO~GB@dk~*ZGQ8zkK{+pKG~*PvnbPGiNOEkT`QL
z>{bcSo^5S2IeWO}_TSsxab?xU+c!L<XL|T@O@IC@rKqS&R9NEh&YhL-ZtgvINvyKo
zY>wB8GmR5BONAr_%jW0ms6O1aLhgy#%NK8+y-Bv)tR}S5G(EC6JNtd*N1j^E?$4Vi
zofVy7aZBK^)PDc>Uv1gMW}fAh%JCJv`L<7W_6!&Op8M0T{X6}KCt9i|+3f6V%}kzK
z1py)acY79=9V!-)38{auZ|Ck+1&dC<>Un-#-e9J=kyaZoU%`Vps<we)5(0~pUwmG@
z_mi0Fyfw><kH&qsEQ@~Yo7Nd*=DPKE!h)^VZ#}mPe?1$!$;y7Cx?^qFRBsuP4x#GE
zEeAzKR4!i7iB;Eo{q<Vmw5q&6c27+TmI)gCczd%nWai$ud9G*9E6q&VF7FahYG`CG
zu8}s!bnb=4F-JBA*TtW0+<rK1>%E(Pm!BzB+Ps-n6?63T;^PnHEYADJGP{&KDdWGt
z(e?PBdwXAR+GTM#(&77Ix2y;L3h`csUV&|SwMyyt|2ST~{v>DLJj0&NGF#r26;>C1
zF?$>2d|mUHW=CTIFZ1*J6YT#juRqQ-S=YYgOT|8Zg)>%Hr<rY;n)dsR(*o<XqgLiy
zN<QAdcJ<n$Kg^MBmWNIqYV=*v7IDJ%H(&JbeMb6c=N?Z<tqYn}YOh>&J0dngrmZ&J
zdwJ!W^Nce#f2>|sIqAX@lX(WoR@%mkRa~2M{Y}lHITjnl|9|*4+kL~u!%@`*^Or=a
zT)cI9qVSO#{(XOhe+F3f$3KX2W_ogM{{K#u;N|CHrwOO)dwCUaN=cs0rf&Fgd3YL!
z=BKMIsYyThn)fw!zmJ%!UwUGvuT{dtH7tRlT+4PGZJM~`O3?dPA2V;n-*9$qb7MC5
z$vSZ5O7+3kkL&;KoSE@r@29}BL&3-DI*;UJr38eDrK_&$W>P!tQXG_2^*PsfTGQ2~
zj$8HoSKMeZp5N9oiL;mWrmOW06^poT+si5{3D*uM+I{`S|J48gkNO&IVW$vH#>I_`
z@A$1h{pX4EAwePEx1rk0p8fk}X>L*R*Z--ps7HiT;>_6<4u5A)TUR&fqzKR2)gr!p
z@ocAAYD$WVqKszB8dcnKdip!`V69KYUjMmE4)W@*NqKkV-<enG*}kTymafjvOjzi6
z^jn+UKc4f;pOjq*+`gf@=g5Z7S3-FO>eQR(|Mi=Eg5~G|^RQ<r#ifDEk_unGuy=NI
z59z#aZkAGQ?fmU_Mez2#mmQYRcd;qlTbUy7{8XS#>aNd$sc$NGD=+^0Vv&T5&b!%f
zO$=A;-?vZeZu<QxOFJDSqi0-ksq_2(aN9ga;T5T0f974xzi{&L`6cgKGwx&@x+He9
z`Cfv~*H?0zdRi3uZz*Mlnq1Y%J??k%%M06gn&s&aZ$4|4Ywo!4okh{L`aI{|^ftEY
z)Uqbd4cC(=J>3vjUYyN-ve2WZq2;KS2Lorq;l%8c`G@TvZfZQjaO8!7Y=8KUo;Npw
z-q@-zPng^I-mz(JhV8MY7j<Q451+dvmL3xE_d0`c;Q_(!mx<lyDtp)8OJ>+B&y@Mz
z*F62-yY%`S*5Mg9g?9%>e9M;-?%}_eA|P?0cvHCfu8g1e&M0fmmOH1cD9Ms-`bel+
zue0F&w>Y8eXZr6~+p#WN?7nq^OJDrIzL)pJHnYD|UEn`y*R-u$1AF<enfghs;}YNc
zSY9RLouBNy?!HC5?5qdxb^Tg%arbp^-$jc;XKg<wyC-Z<OXSuN=glpz7P<XXn7uS_
zo+F=_WV>S&=Qf#6o_z~SBR}(=40-suS(wq#&vfl0@wX2*U*Y>;`M%~?w&dRLtuDG#
z0{BzznDjY+Ua|4>4wLKZJj|KCKH`?=N|U0w3y!Y*C^&QWybBDA9j*H3PFTU#x<K1K
zG%>T#aqhcyCflE=_K4*lNT|A79HQ?!wYADtEYi&)$@18x1<PtB<}@$l6HSq|mP!%*
zoc7H3lj`E`CHc9jj_dyZvp@a4?$iBCoCSOrW<A&3B_wf%MQOtQyZ4@aH`rzxce(d#
z#L2}MJGN+Vc0JuT+y3Ltg_$MKAJ?lzU*4{z`NUvv{JDLfulv}w<<+S~OJ|!XEx(e{
zsJK4h%=@*oUj3E%^N87~=hj`v-vW={zu<8?627gp){JYCzQiWUe2d1Ob6fq?erD(7
zOz7-9xmRGX)-iFO4d=C9+&TY3q4U6glgtHkvN9&lVOjDZoc&Bo!2i^ASEqw5KO8mJ
z{1$C2UafXx!F;xjC;r@6aO73=(uHql^wfM!pZW8x|I+72TrJCfZMtG!Ua&v8O!wLq
z*Cb{EwU6nuLc-a;?T9Zk`1DqxtEy10KqtbxJT*VDY|;m9k5xIn_m-YZ4UV3E@4iCw
z*R5McBV*%qR$o$*^jWd@oUmhnL78*Uv&@UDw`t$W+0SS_F+uunZ*H-ENruypm+Sv4
zum074X=2SKl?|I_q<t~Yo^!6=?X9}jIo8#}9ZBK~E(%=F4X|f%YI(Yn{alQxmGsM{
znqsyBPnJo|TB5h=cj)AUSEs6ah3`2PyL#{DbiMgYw=ME0lUy&XC{_PhQRME0N#gu^
zSuBUXcq;t<wB-7YyQ29ImZr$muR6KlSB8Q?m0x`Ans*8_=1+gV++@e@jqG|^%6tW7
zIkV?%PZF4aUwyUIj`KZs6ZUNmzsag~Tl~V~qg8D>l4?CEB3#wi?r%_8UH``N^xwwH
zVuRqt46QTN1-wsoo_>Go#@^TNbq{8DL@Op<x}zz3T;EDa?f1NRA;Gq#W*0T?^{Ota
zS5OY*6hFFe(_gD^Q>CvuU2^Ho-oD*TWnPw2h^c_d9tAUR&68&o$`=-j*~v$o|M=cF
z_wJ;Omy1kpAA7{&zP#bh2KRMu7Rgype#OryExY&k%p?08?<SoItc$jq@@&no)Ve&6
zw)Zt!vVWgH`SiQ~v}wbA7B0=JR}MaZYW#W<`}93(&8~m9PyK25G3Y?V=3*VM+T?B%
zlkKOj-BOzD7?M)XRTrybJm1jV`gGPJ{rzuMH1&5G*UWK0H>=Ynb?uDn(k7n+rm3-~
zrdQvc<^3_jeA|~+Nqd6_ZyR#AcztMIlKSIasq^w~=4s|r&i~N574I6HX?R34m*<4w
zo`=78rEn{*o)LK@z+mS0D-yGt<4fikuxgktv?+UbYI|RlOf`R%kEW>ze_oA;gtDT+
zEFQK)S5JE8^v<4L|L>~Ysubr<jMtW|m}67vB)r!xGGfN$lZLV9cWQooQuyAdTwto^
z0hfm^hTY+xISy7j|Cppc^Ze&~|2>on*1q6)xc0f*zDaMVN;2EKH7u(Z_%*#b{!idC
z_jg7H>poU4S^Ij1i_(tiiN^EAd{1>=uUGhZj89Vb&!m8T1+hJIl~m-rg};B@`u^0l
zS95gycnu$J)2`pvyurF@S#XsIhut}5&n>%OG*nxgm(Ay3P_g7Ry}{diHb~lg(qGA@
zLkn8VCR;7IG%F_~O!}hY#b0HMdtV(`^mdagr_qxPhgYv3t1C2dw7#BEVf()QVze=<
zL37QGd&S2Jb)&P`C*&mf1*}P|xU;=?Yv@dged>>!%~Ps#9bX9tW@cwjS@tZ=Dbv%V
zbc^cC^>0*W8NbZ>ZgZQv<@oGfjuTIsb=i3wx@fuL+2L=~4!5v4IB?Fa{2hCaQTFa9
z_aow2(bebn=uLDvoSey^Bv)DR`TU&2tDa~T7+c<MJ$osV>2k@mH500jSD(4z98k-6
ztp37JX2r;Lt0Z=G8h^04p|r>9OW?x8dp4S!eX{NU9ch=zZ)AeD{CV-QMEKA??)Mpc
zL~bvRj<nT0^ZAX^F&X(?k9&-FzTI5?h1u@j-t{N`?3=1)rG4|txxJ#^rbah6ob3K!
z-K(2>>Doo*-m|&qUMp9+IKA4;-Sj4E`u^>@ze5wg?`%J@F5hd(y?x^Mm)XW{xDm^K
zZojg+Uak9ey^MvsZMOW}z*&6QJf-Z-I+4FyzbyQ|?yuK0lXst&-Rdt^dwFE%^{0=l
z?XM{;4&8Qn^_61>Kd~?3o%G5g&ryQg$lhMtJD6W(`ppfw=ei&M`to_<+Pz!0eAzn5
z>B8sRE#?LX6f7cS_G_;;KFs5>CvN|noV73SyPtTpdD*do(yAG47v-*q9RE43UN7X?
zGqra9IXg?NCWf`Hi_o!fobz*M<L0I}$*%XyOMfj~GCi$lb^E-Ix;|dtYu3Nddv4lT
z%fI>tx9qkTu5)UC9~bdC+F+cge8a8UFV0B%=H~DSNqhO-<<7$Mt5ZXRf5#;)TlN2m
zWv7|^<Qm^8SJebgxFi*R{Cz=6-=dBEld!Wh|I%ac?E|tJ0&IQPB+Z&|vUrWyRF0XO
z?l?DOY*=k#e!4dMHSgNB`2zO@`i?BwS==Dt7~uc-R^W@BAD(?*y7;+8Gsl~cmuHFm
z`*8nH|0T<Ud496j#aHI5vhW{~f1#9MmtCB^Rj09#UC~|i;c@+lpW5FfWgdU}vt*6_
zS*cBOyn6&zEOzdG$D3yL)~SW}_p1Cn^==8FnxHF_8??$hzUyDOcxa+?9h2y-^p#iB
zSDkruAUStq$(vM%n;ZJGAAhwuKTnI*$|JqutmJ3C-D1|--_$3$8r=FN$@1G$oO^}&
z`u^+1B2ylTJ;}9W$TP7|JaTUD$ByFtCrs8cK23Zx%U7u}&n#^Zqp|6(neN*jEU0cv
zkkFWS+><SLW7PrIyC0jS>)!2qKXpT3PiPPCJp&=Xyod#CZ4a~@lK5})#Wh#Y|L<7)
zN_^V-uOYrFGYVeJbDVx*o9&KyRV6Eaom=rg&OYkR^PTH85+_aASDbGv*1h4lK>Udh
zccoKZ+fFsTulvo_+xv8<<}bk?Do2j*UB13x3S+&y&R&CV!8y9mzvfCRGMlbdoc+#m
zAN%^t<*yc*Z2LAL=FM!I-S?NVpHrUnd2;wZZx^S&&4(Vnn8D1tZJ$AA%9}4cAD7!t
z-N?RuNk@vzhE31*b^j{$?EP)XeE6dHi6zr}joFiZgT;IItyOOAJM`s&X;{8(+<oq1
z<qeq^@72!9xyK?A`KtNm2emTW4^<C4w(#t6(<;w7H>Y*scHZR1`_ToL+!H>yzpJe*
z_<HQnlj-}`biF&bD)i#k6WJz`9Fga48|;0zY1iz#G3El3Zmp29{$17i<yq_cS!qjm
zzHZs_eZKk|?z!Fbf~P+{^7OsOT(+*=)(O>jpKU0Lycxg$|0n<dAy;>PvP-yN7oc4k
zzgC2~P<i!&{mepBmbOOvR<wC;?%vAD#(e3@l@lqa=Dof3Ua(g+;-l9UbGvY7M&@n?
zNfuYu*R}rhE!WQ9eR5`NOl;gEIp0-=4QZk-CpV@)__BT5w$!8-eQH|_GqW<MPuu2~
zd1?KM!%mr(JFA!M+uLt{JU1d_@&3~@b=DWhY0W)+@$u`MTFW=B|6W#YtgBrteC~qn
zsug919Or}&O1o4A_GIL}p4Qf9*Uhpf!7@cY@k|+O`F`7+^N-)=tt(o0?Oyo#RZP3?
zzgE(0{loG_-&Rby;3@MHKLtmJ>jzJKo$^KRsFKeO*M%zK6TX(XoqxZ{F-}HR&2Q~A
z#u=7(gRU%CE0OnLepwQq3xidS!_EZVGcvChe{b@QX#8>T`DgjNpWT1$l+Ao??Y*OJ
z=YsDCze_z&N_*4j!+T$MW5#Z-;;GM1w|$r{bVzFEe3^+yXBw6@#cF5V<i2crK=O^%
z!oq~`{ZHBX+IW?B^q7|ii{F@b*Xrl3>J%oun$rSa_rKL%UHMwfUHE~Z)5oX3wKOL4
zzd!Nk3J3R@ckWyJBA)I$RL6Mbiru#jyB!XHombVn{;gp1pIP%~PI<bt(w&W+)$exL
zh7OhA;`ccXbKhS*@~rk|(Eo~*M83!Qd-;-0x~!AG=Wh^b?R#_T%?h5nPyT!Q*Uq}$
zP&wcDN%rX!OZ7PtceO(%?y=+NWqihA6PJHd<A$+zrS?z3jZOUTlS6mSa~F&6?Rjjl
zpZ)MGucdR|DXr6$@%Bvq9(nGzfcAUMp!K{}4K03Gj-GK)<5PULm8qLu>g&mgj*)Zb
zPMLR%Z<5>;)utV1f3EScOKwTtxMCKI*uf87)#qpO8^7S6)S408p1l4om;Qq#ihs|T
zN_mv=q&&HHeE*`26&Kt8Zd~rS_oFj&tB<MYo`qL0ynkK)B8b2CYdY7;#X_wMBi69K
zQ;(R`mRIMa9P;*HAG6TQJ8W}Bd7}L8XJ@AQ*=+uNZo}sL?<fEJSJ&zC>dCXS>vbN7
zCA8+`e_eIrf#m$1eZMUC9iJ3eIf?z*%7S-6zPW$o99wsHO}}?%%F>^aPL^dCb>n8J
zL<(x{a5UYMP(Ek2+|*}%arf+nkDQ$6XSD0#$7gacZHryS)Z|W_+9N3^9?xm_X$$M^
z_^&M&7H}9%`F0~_-qf>SML)jSxz2m*28VX**wtq4;#0nH%$4Mbh+b>XR+Z4PReO8G
zSN21tG3Digr%GObx+2#cnsH%o%BpQU)2BUoKYPZie$V`z7pD3fHk>F<*{JvU&e2C%
z_15ev0n!t<K4mRT*0(Ufap&aC8&8k2M#e{nN^i_vb+P?IaCPe<W+#S?>^U#{7aiAE
z)!5knyf(9N+7aHynT4H4go5thQZ7BY?C`<!eH}~qYWe*3e7hUOD0}qlon<1-FHXJV
zzwGK%{(bZP&4-`Qo4j5v@p0Stn^DV`EV_Sd!bI!%f_Zytj;&!)Z{MHu?#*_tyFZ=R
z?!F$%;gI<K#!GFXz9XE@{O#HO-;NenD6mQH__5A-b9>4kgXd!3zJF8S|8&>RpK23Y
zb_zOti#q%~IsfKS=h+wX(@FyR;%lPczE`_1onolKb^D&dn;Q;hiZhk{Ti$thEspLL
z_gWeGZDq#sLrQ$cniEYL1>*nv+y7=4TV@zszh(Wm?S>!TK2UV5DR^_{^{1oqbzZ(s
zYtH|9A~0L&Ewi{u+lvWjuUcwpGB~!e1@T<UYo7n#@m<ZY=&%VJgarQQ+5epOFM0aZ
zrN2{h>*iDxPF9&aaoWGrm&!iz8eg7PUuYHRf7DX6SCDPWwKnG)o!m{6cexn%TBQ|E
zP*Acw(#w<aVe5RwrFC=EOt;(rZ)iXDcEd!DD&y`)H|Lq(b+~Z!{i`OivXr7EuQCOL
zcVDf2d><+8)I7^2#yLBMHSoHD#Hy)LDr<g<@AmFU*|l%2d)1YR4$TvaCwOeqogqB=
z&>6GI@_a|4C&Z|j#Ml1G-eml4xux4B@x9acz1g(J&wjxQQ<MA)ye$_$M{Uk8m{+m?
z;lsqT&X3=>ZM*iWC+Jsr`O;UFoC%MMQ_6WWFW&gO-oifhy=nCJf)Dp<4{_Yy&0aA-
zBWLsNl3NveE0&#){k!gR=gK8ZwypM_@w#abr`4*?XL&b|<gBs2xQ*>hznuTK4YF%;
z**CnuEWJ8r`_Y@6%`6=eI_Ct|@VRT4@HqD^nqa9N>AURG6}d+zFI;ENV(e)M-EH&B
zSfFu1cg*7T;rDO3{_cD5QF>+G<5}0wO1hcuoS-jI)N)|c`#;fN%zx&ziQIa(_twSo
zuwUo*YsMZw|9M{H+>+|*&lzPai*~M^SuVD1PIYj}IjfUhCM&%2B}zD%ezxw+RC}4S
z(JqOvHmh!(<K#E@F0c1goV{#{_=Bo1f1`_!{TKgMmR4vMD8tmfZFh4X`{}D)_pb`b
zRLpJPzAkd})_JwHJvX)6`z7zZ?``5+@p`w(jU#ndRW|*#Q>V6lvn!i-@J!!EW{+H3
zFTTEChrBl%eF?2}thL{<Vy;HmCvAm&d;Xrx-{JoDktNsHA3Ac~Eo`@We+!<NcI{nV
zr$XJe`3KV#&p9YECEHwh&Sq@$B-BD|@qELZ7Z!P@cu1ML<-D|8xADZWi;LuEJo%lH
zUL2a%Za2Mmspl~PX7PJdugwc~xy{(h5+dN%xuM*EUncj(l^8`Ob^ZP7XZJoo!vB_E
zLfT&I+<~d=S+c!~EK|NcFqpKs?cHXd7J-r<Sx$X2hfaUcP@TLis_n_CT$#67(Y<P|
zuZxp;E(EOI?wMG?!LauRe;#w=gWd5p8u|aP?ogQ>rMkRRZgtBmo*SZHUS?mtQgmYT
zvKdpqJZd>}_Pn>v#0eYLot>tp&2eqxhN}-2oMY6Rk)4t8TFv-o_ZhP;mp4zYzMp(?
z>!haJ^L8>U{rT&YOlR6A>*yN2s5=HOp{(U|#Wf5b#LbAG*zSBdD<?}uY~|#NEq$Td
z9b23K$sPRg_cwor%I@8}Ic4wOx$`I{ap~tR?JLXQ__>H4|Dm(W?#G@LXAVYe`zo{i
zqw5DT9;xKM7J=`Z7Cx1j-@GcithzhJV?w`x)o-2BIt2xp&SR^~90V=atk*lWSKt0x
z!|&XC)pxSL*H(zUJa_SN!M0=Xw%mI3;YVau>C8h1Crmu}M?uKC-uHyk+*OK|J&gZm
zS313zCT23xNnPONVoC0mic`2*Coa+!T<|GAZ~7+T4G(9C`kHRtY{hZo#pe~f!o=R>
zG)Z{)2uyqPwP4=VVtx;SuTm2gnE%N#_}Y6+Dyc8db3M;;!g5z%{DhCc%}<|y6&Uy8
z4m-=M(B~x|@*M<T*s<`)ovEvscmDPB^MVlx>n8kO5n-|Fl>I{9@2@R?e|cW7zg&M`
zUP*Fcd^6{yKOAoUYj)c9FMr}M(0=FtC*{allIqMGe?LrXTvPLArgF$^TVpeil?^Ry
zH~X8!Zf*J6FMfOG&P$Wm?_JILhW(tx;m>=HpT8x(zk|~u_&TTL?&`TZXJ0TeK4fp2
zzpEnaejCFqc4u?@iJ==dx1W++#y^So;5_GxcPeGK9_7!kU$*hadWq>9S1kEBac_I#
z^~aqeyN@ZX-}1aCu;bP>3+CJ0ol1`_xC>9{Z~gtDI`C`j72j)rYaU(N{b@G4x$4AK
z_C^~0H-u-f&y(MK_U7-D=>7M8hxIX}Zoj7TL|FWze{W9erb#z-Pj!BtE-|?xaZZ(A
zi~>tL=Y*xnteRaj*-w}(|FJkg<>-<LNz1M!eC&Q!naliB#jWw+EUAFm42>rZTPAsy
z+8v(Vb57%VdCvJ&_Z2cXer-yapl$85=3C~0?@#B~C7xx9DCl*F>3XQ9*&@v;|53DD
zb+egza`NM8!5jvhl?(b9-%R9S($;J`eYR-g{P(Z=|DC%ed$Ur}T#v7A(ZZ>78;m$|
zGZlBtTf0|1<G=+?mm(%+vx>jYT`T3Lym|KJ>-B5bD&++;(l%T2*64~w@*Z(s*wCzV
z_<q0q`{{jsWp(z(#(V8I_PqOR8tZ=e*<;OOxAU(KTI&Dxx?+B^lRIA^e17TKuWMhG
z9#XvX?+tU;oX0uu(zfq7T2^kBnw!>g<zFQ47Y6OQGo?1WWZu2y%o=yDiB10XYHuT3
zs}o$0zNP(~^WpRi0jWdNp4)$K+WX9Ir^Ry(6Gef3rhS2Cv!5!>+VrOLy!?~zirsGo
z`^xfO?6P{=EA)GVs%*>t#S2<m1XD~rL;@zV?q1`$Z(c4#`iy#KmFgn)Sq+kB&-)rH
za=zU9__Tn`%$;u*+%j@_s-WxmsXNE*7~6X5qq_=X?`#xT+IF(e?&vIWd-*LTd8;S9
zInbAAXMFXZ`rO*|C9D5$*;4w=E4$h}_sy+CQ+)32_nVgZW8dPuhu80XS9r6s_rz5B
zf6-eno<65lvFUZtmuoBT=U+Nvkol#MTTNlx!Us2YZ@2qbdR6a1U1RlDJ^mcl6So2^
zEH`vym9{=KmRWo7c*TMK?{oI(ly0n=6l#0EMWCfgW8GdY{yEtqIR_;-T38=zl6s_g
z#505CO?jNHnAFp2>iaddvu3j#+|I5S6`7%te*D`e>xesNJ=~+a_kCX`Ed01u=p@_9
z{MSnZta8r2dZTetD!0j`!bs`Otm+eM{F_!yi}TDBYQAq+{Dt+H-QVYN`kCkKme+<(
zs`&lw4d)5AZRKU&I%3QBl^jgE+qUNR%j@+jymyy({yS2dyH5Ayn;W*j?p4qKADH}#
z^P|({H8V~Z7`|PQRQRV)r|+)fmJ{p5erCnxC~@wdylKY{k8eAV$9jB!blZ8`xBG@U
z{Aq!IIv;SasgLVd)2R%|6<3*mciDsOXP31&2lw7#>*P%lTJSn;iO`i7*Ikyp;J>7(
zAbBT7X1aBGUa*GDCeDc(&%~ymP&(BYRu#CX^^IJUD7#hWOP7VGKiuN~Z#wzBxS@vA
z1@nTRwJR?-^dHO+RpJTR@n~gQ=DQb<4L)7_#l?HSm%lzxR4Yqb`%fp|trI6Yo)lFw
z^M3t(x@B)|&HhUtj9RXJe17WGsx|BL-!!`J(wttdGpi=+vrT_>s%%!q@vrmidK2GY
z*n8WA;blpbn7EkAv=z^7qvp+@aORm7FC&+9;@<snw!0s?ELOXozT!XIHn+upAD1$*
zsVJI0)R^pRz$?9Wp{vu}z1Mb0%vGGf$A|w7Z-}j6fKC46_kQap{yFR4ANi}r_4LYL
ztHNKdP2x=BWDI9l*4$OU;WleG;{`Q_!#0Y$ny%dc^6O`fg7l_YCcmyMOittZt^K_x
zJ@Mh6*RQ2j=dCH{GIY(p$NF3*-s8_5tBN0s)gs)Z!=lBfuCTJa;dwwN{kZ%GIUk!H
znu@$TH2swiJ+F|{ocm#tdec0i?u>;AZam*^-)i7%7xtZWg<(zPTjxbPCs(Hz*14sr
zA5Y2pF>g(Fkw(yz#n)b6|5$8&>0Y^?72CO!SNH$1X8WL%)?mPA{7&K5%9X}1CSPTJ
zm8+!49BOl{!tGsMV&JjeT-s7I<c~}Z;Jw#AReImwmCiC@sh10SFLHS3`_`{5<Tw(a
zVE)Fg@ZZkEZi(jCuU(5<=;R!?sKfc<)k4n$3xC9x#^2be>)G}0^pgu~ZD&op5&q%*
z)w=z&{<KUqy%}0<qn!Kp?WIeXUWtU=<lK^W?_v3Yy^MDqiyRml#W^<qh+MtxcyeaK
zqU6^3w~O1pc}!`HDff<kfAaaZ^>21OxE+#mApKrMw3<BQpUOpB&l^mMe#Pp+b&$XD
zN55UT@XwIF7eBZ%X1sc+`!VUEz?}7GdxMe~gSaA0N@fc9uw_5?TRPKm$LY-?aRzGM
z%yUoI>o&1iE1HOIYhXRCb>i3`i=)pAnH9DAcZ#VQ+~ob3bN2Q1IX}v$FI~6oT4Mc{
z&MYm>g@zrwjqFvo+x^VtWO|gO@%72}R8QesZ{PN~C=0%P`BJe)J?{1N;`H;U4mj+0
zSuD8ez_b;Id$%o|{c-CFzCbsrTUARR|7d+ByCeU`48}_Ze=e1KbauP2-MyY=%y;9&
z%-q9lU9Xv2&3YnzSszQyQDE8j_IK~PD6`$(R#gXF9&fZ#Yc(rgy!T#<+j9eF3nlJZ
z5x%~@Z-4U0Y~gD?`Xb<&${NNM*B{qD>)iG`s^HrJgI!y9`gt5^V#`r>ZvK<gS>fY1
zf3L#y`@iPNeQ<Ni4xE^6RTlV2cdw63mXlzo+9atd*FTp(Iw>;Q$!5cHPRlF5x$oFT
z=m^R%G)>wb!JgZ`VgBJC*Q~-Eq7NmC70mlyy09z%y{XFG7iXT$-CS#s(*0R-#fw+F
z6g3+7WVje7rf_?vRp|aQN>FF*>1au8Nz31KA$)emgk8VNtP*UlPrFmOOw>nv;?{24
zuex_Hl|E{^SbKENlDe?q7aP}GuiuvI{%6;8K?{agJ`vq&=Zl4%=Y%uP&ij7SyT-P}
zH>q>V)P^t>_w^qhJ1nepzjUI8|Ju&8XL-w3KU{wy_Rg&XHbrd*pRF#dpZBG4uhoJ&
zKGt2kQdWy(&;I(r-A5+$#LgrJMSjLz|Gv%nv-iCHgT3o@>f~5nZ<e1rS8mU}BNuXw
zelOa*`F^bfgZxVKTScy`gCixs%Z7YAxY;kJs(-P>dEwHD9x5s`efAkWmweKge(%@B
zmP3KsKTpln_hzW`H;OPQRO8AkxBGin?(M<D?^d6Bo-p5shrdXK^=RgI&s!1klh<Bl
z?XzRhyH)l{w|U*=8=L|`FS5H`{kC}WKIKnIPOa-Na=iHK&T;*{-k(-Kf4Y1k&!brr
zf@`GzaCH5>ZvU&d=GQ^{i}M#t_|!&dKXhxX|Ip3<<X!sy<U$S)r61lKo|S)}KQTD`
zpOc4ahh9+bqKOAR&h7Vo%+G$t%a~<D`@RWpzjVD>5`J^r)`ycM{AvP48r~k@lm1rN
z95%b~Qe4TIH5(4~Jz)MkRm$XJ-Ib$f<|r`Da`4%lX`7<ZaPf9W!cosRYpx%9zH*I0
zLh}6|kIz53R9%1ey|?F9HLcy&LY-H<>hBv0wK&++7L{~Fyjk`vj8pL?%duOouYE4f
zZ{>`fCo|>Pz2ajpADHSgO*78_x3uT(-#d*9_i*r+{Pf%VQMvQ#_E+C;`&4beCRU-l
z^<-Lz{2VS3EAHJBeqYG$%X0eCKL4NX>Y%(GEB1bSw`xUf>>{_wUQ_+_yUi2qrhgJD
zyDKeKmz}+7Rs21!84OJ-2I;0-w`4Bbx3n!gcG6ehNvEf4t@Xd{uyOAGOr9KPXJ+0>
zykBR^>^%Rv=JDS56AQTumNaf&zwz>$$as<Sk9g9#XIJ@k>gQ<LUt^J6ed%P%oT>UE
zqVMkh2@(3LJ1OVR1XEKnj~>GWo{ahPKTOtbPn=SHUFlKf&4h~kQ#Pg-F(<xv`Wd(B
z`PA;P>E}B--p~CWGh1GH$^LzhS>6WMKKG2ATe-r|{NyX`?|CYjv&DrkEIzSxzwj;3
z6?@NHpJ_d>thmLsJ=gliotwuk4{Tj(X{5*&QL=IV8`1OUW>u7#p5QQ@6rjGyPHW31
zmFSneV*L{Y=GDBdHIAQiQN{e~26YK5B?qelSDmfO^4&!*_}1#{3kb#Y?be;4lw$BF
zi0%3WrLN<T{rBETom{u&+dQp<3v8>_J9~Z<@!ft~^RL2*>n^%8y`1(&Z!7h`zwg^`
z+hoBXJ?)%#ax3OXzZQ9(Q}tusoE?AqQa<0FYToo*xNw1Fu-=revr^9)TMq<^{{DA^
zwdAzkLAi|rYYlzgzdSAEZF)KW+Ev$i-TOCiK8j=Qu-JX>@AD<^|J<H)Gdg<K#t95*
zCI_xDZ8>i)#C(9=P>Z4C`QF#{YrKL&rh2>={LNK(=*^WGXZ-!WytB0*Yt<yqXX@fG
zi80CPs?e}lulsu6=T?<jE1v&gvb+E5RFlo0SHjPPUuJ|nwmDqzrcQp&(tVr5UtVwc
z=fv|}=epE-+3utJLN~AMxPR}*yZF;PSHGXwSy%8uPjP3%gGB;=K3rQqMZD{(d9gf$
zQC7C_wk_W!jO6p!N{<}e<+9RsHRr;Ezr=1F>oqMs{pZ7UBh!jrHeSY}6=qqR&Wn4r
zU*NNl+gfp9_Tgvi-*8#Xmf3Q)in)2>6txK5pdRUmzEZyHXG-d1NkwoZP7`3)_Wm*T
zckzu_CmECN=fwFQz4<YL=iZOWF%{2`zd2+fT4JlQ@>=qvl^2hk4_4m!)w8VdkG0*&
z-^yy0H)FRvGmpKxC}3{O<KAmI=^M`!Y>~Cro_kzBGpHgrzO(K5+Xlgwq-zIe`hL9e
zOLMA#r7=HO?xB!kcI)IB@;o6i?6Nb}PUqc-ZVZ*3IQPvu!P4sw%vYT(b5CEcb~i9G
zDr(BptEK7!>%}Z?#fnvzadSp&S>3;@Zpk5iG1-K(m(3&!^1l6BqQhWy>gb#;CgvwQ
zC#$Q>%SqW3zM@mGs71x<iM~g6w)9f2JqJ5xGBYlgec(C4^k8v`e_L~1+2n*f&zHNW
z7H50E_cs6j>dzk=*92xMh9_Dl*iWV3>yz`Z;^PV3(f|9h+E0fEJGL6B%hflqYB-!=
zV0Yc5-uEvqGpr)Ds$)s~ifwJlyqio4`>$N~5b6%vP^2yY_NQM}Yx;={Z@UCV0nZt{
z+v~SI@o<ywG<iJ5e3j}=h8yn!cB<q^o?N+lh1$QUvmuwWK3^;CZ-04*p|DkBZ}?w<
zRj0g*h54+LIG-lo=<2@5#JStTJ@;(0_05fw1uDJlA6jnz|7?-N^h@XOv^qOa|EHmm
zdeNY)>hyCd-%alY%`Y9U<iB3rb#(7$9oA@tJzk2;`+J+DyE1Cl&w4dC%}M0C*iL<h
zXqSc!+f2^iTz^W5bAP?3_1Ya~D$VVk(sI^{SB$ULKa4GV;k_g?&3?h>U3<;aFBq*f
zGj3vPlH7XHbYj)c`rlT&AN-s3>5zI-mwRoP`JVG?YmMv-)emo9AE;k&|Gw_zl^?S%
zSa`RHEJ$z2bKZ7ro3n?}1dXZ{i+3G+{RMOj_I2;?o!v$6H{Ul>teI!_RaEn_Ky2&p
zeVezcNpI#~`t^sX7*p;|fkg`@EOAz;vp)Nbjpfb$U!T{fWTq|J^Fxh&vPh^}-@97Z
zX~n*O<nH_p+V|i5zt^FK3wrwcPJa5twVm@@>yK&^zs?T(-HZOcT6ji(-3vKS&s9q&
z&rh!Tz$Ta*=*w0-lecL4gL3KW^U<wsO4jqg{`%9m@3N6;$z;xlr=v9f-TEzG<m<Dg
zR_gd!&$RULzmJ!wL|1iwThXoNp~vjG@oKB2uYmo<`zL1@@@?f6Sp9vrgMP-@;t0R1
z&lj)wdhF92lahG}3mV1VAG)%kr=LgA?t1y7H{6zi1rm!Jc;C)zEn;_ZyLWKC<IO!%
zyRE_uC$JRDIh(7lC=y(-aFSa_m~Y4@)4G$@O{phm*e17S$ywPxJ$FNS{{MgSPtRQ4
zuOaKi!XS0yId3$ls_>tAdrYz$<T)}g$Qy{(Uu0QOBm6{C<LWCZ(W8C=d;El&uiJlr
z_B}P}19zq1GlvN*Wm!fN96wBN$WGejGI`<E^}SX)A=PG;t0E7T2LAl{|L6WwWmUaB
zVefwDl(V1SEu;D)FHQaQ^DX6NnMM+c?rEv1y`iS-%j+5QRepMO85nmYrm<`gcyx4L
zf%UoNZ#(WBaWUBAk+*lD)Jsb<g}r~(XFPfK$55@~#h;H{MUwAY1AK&C>*ucAkSgY5
z#KES|J*%;6^V~mWU->q4Jy$)PC4S#{s@JJzcIQ3yQ*~0^IUjC*J!9e-$L|umV(%4r
zlwA|+@af1<U{mk9na6k2o3l)EmA6Oo`N+tbh6ewAeOV@kh@HMMac@eupT6J4V{6v0
zpLA2Wuj2Zp1)JW=N2<*iRFRlpkysbCX}9H}wG$=$c<(E=$Z<-qx>XRyy4rZ-+UxQc
zUVmmxYTwJdEHuO5Rq?dv=@BXiUn|Vm(4)1U(QN1UE2)1!i~SWjkzsJXWv7U>=GNxN
zdzLD9S96v5p4oPzCH7m*;@sncGZZc~{poGoRvl^bQSOn?f&2x<k2VVMr+j6TE-*W7
zIlGDbVxs!oi1rMdgY%c0Upr&@wQ7gk*R!%b?@rxVrfc8y)xBWrwoOY89uQeL|4ZW0
zq{wiA{oLP9g?|0`v*uuv>&ZAHF7GO?fJ4(ubv{SFsa%ukBE0yX@%qgt9@~BXVcxT-
z;R$EX+oaz)3v2?8e7tr-m-o)+Y0uXEE}Zdhf%S=U<tYW%+`sO*a4ex_5!aH-ef4KD
zT<3AhKkExD*(S|)L-};@caII%>puAwNi*Ez+J9$pI{%xaFP_zWy=Xt%_~)cv$(qd{
zFRxSi`e!@;oadIuqgodPb}Kc9<}B9TATdiY*s)F_!O?sFuOH#nP7cy%%WkkgV)?%B
zP`bpfV&{85@5O(<|La$k>dcPSwLBS<qVjK)l=?saTG@DE$(0}1ecQ8YZ)#3?_}$6T
z_*KLC-q#FSI@c~F=9qNL)LB-(w5|Mcb@}<ZN54f2`oGwF<jr>di0ncohjW_m4>Ysu
z?R)HTQ|D~Y$3Kg2Ub=GaX!X4NXEU5Q)E|7F9xBMWkon%1)BR6h@gKUf(PP`U)t~2W
zv$BfI+mx^USwc&2YGcj9fJN8%3ZAL?pIzrs+kH>zaGv=ZNz)^jk~>vAEd(}5@{~Ay
z;yaV1e^36y{!J|*%>AA0@h3mbJ)ipE(CilLo9C`4?6whEt;-f16n$OGLH*Fh$MeLU
zJwMx&Pro4a?a0A16Lb!pmvoH@t}Bka6)nAV?{|xh_e}2_SPHBPn|u7c@s6WvN8V`l
zi1F=9pMOgIo3fT{!m&^9FUzj^V=LX&UESa({Y-zO*bi&12nG3D{R&47l-QQUHJ`jG
zd3kAToA;uXmo2q*=GYuQwS;-<1};$#KjWQ?QnDva`YiEc;;x#u85Sq(?l!Zsod09V
z#g)0~M&)0}$oLu8Y-dcn_Ki>3e4+l{iT9Ecm84cq?(5UL$9*8}_;GcM|AD?`Pg9kr
zR0_(KO?s=yozb>oUB!LRoA)9fD%5S+7<_1B=vM2@va13XO?SBN#ve!z;BiXTcMmzP
zR^PVyX<OObCD+&R&6<9aHLc^<xqW`tElTrOx{J<j`EZlf*fL#@lk?`66S24SviRri
zJk`=8TgW@*;?x_V?rpEd&$L|L#+A$Z;HR{7_O!El0^35wJ71npw&7o{w|BAKYnJz#
zCfw4usw3`fNN<13$1W6jCtu~!g#hRFOBoe2>$gj;F7(SOGA+4xpkU5L7w$>oEnj2{
z{v}>cnEXEe|Am^k*!Ex7@?Kh2p5*!eI^Cc%vG1Gp_N_XP`Pn-UWoEv8@cgFFa?aC_
z>Mm}zuKk(Id1Th=Q~W!*lXj$4*X?PUry(W3)Q!Q8_e0_Q(zD0@ig-<AunNjDe*K7d
z+L54#OKqCZAF5O4d}CMYx@hIHB2U#hpU<dqFV=`#@cGz9!82LxkH38M&RXAYa&3jm
zWXFq}Cry74$hpuu<Cx{advj;kXw3cle8<13`$W=30&;57IBvEtY<=~se0JhJy{>{Y
z8sQJVzDpA?o&P`Z*SWn5*Vl)AFX;KO@7Ate%Fh2qgbyV@zo+KJpWU)?-LvH9vbkB+
zbGKb7Utr83Cty-+;B9CAG2qy{*!5mPA->fg7Suk?D_YQPYiy~;y*c>Ol~v!Ok|(x(
zOAh*yx#y{=LEMQO4~iY{OS`VxYAP<gZJ(}Hx56*y!o=ju0;^la)V_SaE^S+&WV@;8
z&707_k#juSZr$3o*vYx_g7&_Em{+^~yfbnGFFBX5H0{~lQ{36c_UL`+iHk31If`%H
zcl5>C#Xr0b&Hr+%>&Wa~ULwCHM4U+3ar1$O(X6H7MSp{sXWZXee!?v*M42J$mF52v
zjpshxe!_4^)@ec;gA=!g?yB7a7w5?B_Mf4U(41)7vSQ9crDm=BeR6gz1w2w(_t@QJ
z*gK4~`wGn%FFxP@f903?^~w3G<r+Kq&n#B^c{4&LHQZ?3_j$Tsw5}gn_w3lJnBQOP
z7503+R9>$nXv(te(A$Zd!|y%)bJKiR{8u?<KPDqifiEI!7xef9U*mDw%0B6~_5Qze
z*Cg5L#cV%5BeZx@LWT<ioBECG<vpSXB?5}hjGtySGsQEX<$PIv)hjtzyV>-QY))@M
zgTW??fHj+Tb#b0wlytN<Gt<UZ%F6WQ;e97&Et%r9Bs-;*IoG&npX?UV+F3R~USCmI
zJ@M<>6W6Y-(K&PeWSN?__vzKw?nDJjNlVE@Tzd0HX0lU;q0{V~nh)JVyH~BAUHYYB
z*ImwX!Q|A!uwUon9^Oj&$Db0YG0Ws@T!E108q0IOZvT(eIPm6P>@z8u`()RwokuR^
z7=3ds%MLZWcKxIj_uT!vBDyA-8I~;6$@pfh+PH!3cDHEkVV7X*$;!819{$$Yap1th
zYe(1rTP|j-8n%gP_w75j3Lnpw@*RErT#=XOf~VoE>I-6L4Ft1Zy_tNhFK+8xv3G}f
zJ=+_$tKIOG+Hs@E(Y1Tx=10lVCll{!iYW!C&0=F+<1VmT^s}44Xm(52jtG^!G`C~R
z>$ddG72U`C<&{%a?@>8PN!jTiC$fJrms|a)e~Dh)`fcw0ij#S`!*>1G{T@+vRf+v(
zr0S<7605}f?R9)*YgLs@&+uknN-viPWHFxApDUD`Vav5gPXB<y%bN$5e*d;WCub+W
z0mCg$F)sOK%-I}o74)aZ#cF*nEi3%F!T3(z4GpfEGR2he#{wdY3ZKRFdJ8+hh?^;~
z(^Jgr&CO-!>Xs+>shI6GQa1eRXqORGK6jzM%R#0UDJ;`p*yQA{S$Y3QkY8M7eAKRA
zsZ~F|1$%PDyUsnhH#_RW0=s3L4`=sHQ+XRU)mChqha%_s<-IE>TVJm`ee;U?-Ea@N
zkFJ}nrOkHDoHp@c`=z2krJ5;M`EE-+6)O?d5Y2eK>=yfyjl~X|tm99H9s5_S*v0LC
zeE#l)Ieb?>#GJAF(X&a!;nace3xD4+Er@e_UvsME!;8Ru?-DxwUi`gvDPrrwm9A1z
z)i0zCSNH#rtlRH>-fqT|hm#vBVrK0*{<+8EpuM%_nH)Ku5(5qn6SJ#|<|f;-udQn=
z%X4q;;LTgbuu9O@GcsP{`J9K2=UzmIR~8C6>GShEEB>>vBS+8w^qCh6*s?yW+{w7q
zW4*Lfa^7|`^FzN|`(zRo*GbBMXO`7*R)6nTbV%mYoT>`<Tm5tI1+U$_JD_cvt^4C{
zJw_|0N$01^#_f(S{eCOoBy;ZLgSRd|FS58UKIzW6WhJuKnzFXcK3sqA2TT`m<C$8`
z=J0DK<9-(gcaCRv)tm=)w|vO^^YM9TDSKi5>aw^if`=r{%&rKlb?v-(@}%a?8#gLk
zj53(AUK9s8Yl)a`u=3sXP$ZDy!1=!qS4>ndG(2tBZ7CA=ZRU?Qi4(IO?!VzJVcQ<|
z{LGmt@8nC`j|6j7cs4BAFP;15Qc79iG%@iM+r7CPTdP#XdOcR{YxJAD<^REkITnR6
zQqt0?#oEpuYpeThyI)(s5|}o_&9jvEkzUD9ooBu*@fUbMDP?|-*wqxqc;e6xL(f~6
zzAnxE@Wfkz+3>U4jr|ki8DBBmJ5EX|e|%T=d-_?f7xQ)=t@Ac3Etq%kfZ^Gl-uh>S
z#QF|Mi2QX(+Hqc@sr#0T@p@B#!|L^{ub(fOw?@}DJ7HJaLD$*7lb+w0#${1u_}_G$
z;(G&wXXQpR>u-e19jWp^^UyuX^Jc>x0j8C6bKToddpdml`8l%8eey{W#kZR`Z*EyV
zJLTGmPfK2v_U>go*R-(UX4#u7`<Sj&A318uIpxs0<mXB&#n>1%G*}<p{~9O#NZ@ht
zge4Ll$sb?bv7dJKTu{~`Pv-c;QhUrl9_lgpW}4Qp@!N%X=jUQ`m=YAfhdNAr`*HGd
z-$emBu1+uXWcu&?^VwAY`Ti6E%hZi6*PTwZ=+<Y8%5A@vn)-_IV!+8`Vw&%AI@D)O
zStR<yeB1X=+|`1z<<fRtwZBXf7FY28aQg8j{3<`AXTv(<H_z@>Y~1p!t?}0TGfKr`
zCCQ<}hwR^U{+*W+ztg>>VNr!eMReT%jrTt}wsx^>oyV#5Ehu)A@1vEGCw0$wmR<LF
zbih9MO`hdOokzlN{EuAiPTrpBe9`y#dB51o`;IX(M^)B6+BC0s;_dk-K7DcSR2Pyt
zerm~d&AV4F*7wCrh&pZ*@#XuWFria1kX=$X&FrtXcd=33fA5zsZg0(4ZqAW<aPmsd
z)Xaz*(u_OqoqZZ<B~aNZrj&0P8g_MpWp-QabABVvb-hP+zI=3&t<!9afyZgaZwqIO
z-WHd>yR7WKGQ*o!NtRQsUdJtp>W@5huCe$kzgf>}Hjb9b6+M1}O$yB6yweOj7@sk6
zgt;&;{g#}*;{Ngb+9|rX;`Yy}e_T6LO8VEaRpJefjA@|>PN(_(W*l&AWxaEKcm2Pm
zXZ(0BdWMFr%1P5HFXzj?xuEg#(QfgS%1qC^ySs8VCaztTxmD$YT0Y0CYL(a0oU0p{
znPRw(GCFM!d$vPgz=iQ$a!HNXg-z*#4$q68#j!G(3TZ5HO=#Zh=+0nv>w@D9K{<tv
zgaV$E9cNA7-EFwPy!|iZ!xn=-32TnpIxF#>H9J$p%X@EP-#NLLZ{C>vE=qSlcI=o8
zTbT7t+e2^c|F+l0zt!VQSR4_)ySdNOa)RX<-un|Og3Y@%I;Y7kXU^EdYMm+W(DHP`
zrixy>P`&-it3M03d}i1;H6ugOMu?BmjPdu4MWQu}Z2z3#+UGneX+h5mk5axl%m2p2
z&k3?lkjQzyyp8j>i{Wast4Yt^-T8L#-L;psAKA0Lj~Zv6%P-BG_x@tTxqYeDxyP;@
zj~2gtRwrt1$!jg&ORN6n*VfH3h&@wq$S&mEXV0S+PRZ``mzZieKTl6C4V?CT8OQUJ
z)<=Bh&UqP0HZRtD;$3VMmbk&JXHmf7Cr8fnCBC$fb1J{+HkTnRuUDp_q+^rvuk#Ai
zn~sSeS@-+={-<wFI^Q*4T^zgN#Kb<WudZe6g7#0fJ9f^|+y6^Yj7?#(=(@*JEGCTZ
zOs2+WEB39O!+J?=MfDxyuKUIPYZe4>#qY8(R`gw)>ms%w!>428J4=zAkCNGoId8GA
z)3ge95Xm?*-BZ8Q<?GL#xgQhwTZ3eR8Im`~b~07Uo;$qJIQ&WT{C|6YO+F)BUL0`2
z^-oKSfQmyu^W54<xebLA3~pXe`}s$;`nlF41;3sDpSo{ak$z{Q_2zF^uO~iTzi&O0
zk!{WN*cB10RwmsS=M}lXDf!2o50Ni4-aj*{uHpE1CaqYAPim6O8GEH?sdbC$-rab4
zo#W`aj6X5IWjwp%endDW@BcmjZ=CS6?>A&wvIKuh$tleA-uCU}uTwU;JX@;!<7>`K
z#eU!Lqy4wvncHn@QqtVQJVGntH%@&h{CHv%?;~ZN22H({H=iB4p<61GIjJE*;a_Uy
z4FRj1Fo%@_F;_DhdV6o&DW28IVDz&0Xy%<NZ-<)}-kYpnp8qzvY{T<Accxld-`x5A
zD7%sU&-{}MQuyaT-kN^=op7FDue$2hh^Fvo=F?s{91(uTu<L9?d)LLE+y8eJEDKOc
zW9upWQPg&(!KY^52DxiuH!n0CYiqLE{%Ts?x9fEu;yttPTi%SAb@BYP;<oGjTt<cd
z`+oebU!^rAyZdB#HE;AB@y$&OM2~-;S9?uO#4Lz=VL-%wbH`_Iu2`5xy|SK^cFg&@
zl&F?Uq}oq?qf8yK`MFLR<+%mxZ7!r-?lB0TJYmoJY3&lC^UglCEDH`e+Imc85~GMv
zf<o3G!At7b+jK65ujed#TWw-xq-1XYJ0fkl`qNL+?<cj27*BioB`xw(%(NXcw)41J
zPR`Ak{cfh>90r>?j!73cbS`4<;L^^~zb3<~u|Bn$VZF<wMwL^~zfbKdk4s+6@bJ(A
z%QscM>vC^zynKx(^4v`J?du<UTD5%Zxz%Xg;VL{~(jJeuvJ)htUxrHV{l4_y9seaq
zucbxZ+WkwzezUsd8lQrkCRq`~ZDyIqffB3pbDmkcsfzFkwnVc#UeabR+hexG(xAI@
zrt9n_+@T+??hK5ax9fbi=N38THP;R5syL6ggt%Q?&seDNP9^I?5YN?$Cr?%y8yVL4
zr=_QHp6)i^67}u$4>|s>a>lK9tMX<?TfZ<~u$#4s;mj{nGt*A<IU%dxho=AAwl$vX
zlSPichtr;G_cnYtT(E7m_USv-2j7@Y)cEjTUzq8|&ZB}-&PSzhFM0js>8fA*k1c<@
zVMm7^--FnFvl@(7b6w*9kyq|?LPA;OSJbzoY8N)oJXiRP@xAokznxpmYy3a4&VMNr
zZO8MQ$u+v!=altFo+E3DS^M9tTko}R;XM_>pFI`ZpMCw_oU&UiT48TSnntwM@1;wh
z@6hq%vn_P$U^yapwnDUaf?)dlz~8lL{GNi3HTIf&97}V1H>qUV+TSdXe=Z9Bz_vSM
z>u<4tQaN+q)rJ<F>|1hu+Krf9KknV1qT0f@aptjFMeoluT&7Ok;ix3K`uO7;n>Re}
zy_+txH|CAI$k79xhBdD*Pq$L6xg*is(#!n($(5_`KmT64)m81X%G@4vqx01TkCks;
zyt8cK($gQD82&E%fAdqwziHp}4js!$JpJWbAG0X)yzORLZ0F3wpQmL0na6hh^_7Iv
zr^SrFOkbLvQ1WUGpW?}+mLE|EKHPYA&4tTc($RdT)YsF~UKyN>I`%3g)ZW41#Z)1Y
zf-^II@BVju{>lFTum7)nvtWJp1bf3TqLNRecJ&#*baCQx?`4tQ6>zMxLUn!pwpEN9
zv|aj?jg*4-EX(9|diLzuQqTBo=eZX@o27lt-FwC5OQz7%==d~t?%7`yZirn={BbVb
z#OR%4#_xNwPgHs%vgZZd{d?1}yQSLHWb4afABFDwkuzqit(KqUB4Ko{T*Rj!F1b{7
zM!_vNuX(*<iJdP_Bw1Z4og*VZHR5j{+nL;;JHD$8O@)LwVjiEpYgG9?_?_k%e^JxO
zmX=QQTWSl>G;s!9?G)dX`AS#mMoeVv<PB1xXZY^P%S_pzc2s+o1AEic@83ECmL>T=
z|9sA_;!^3c>?dm<oaU>rn7t;QCE)3;ioGt<w^j;oH>nH1<+tbD&#PB=7S5E~cbc*K
z!1UR-tt^Yv%C{Xj#_79r(N#ev=X8~Mk19<ZUFIF!|D5x-)ebh1*n)Ek0<mv(7A%+)
zV1N16z1#;~U)TQG`*f%0A*J&2Ub$owsp%RWdvs2fe6J4Kr`IHK;AEow3fC1U`PQvp
zxb^k|^Mu3Kr>pGVdQeaM+`Gk-WOiTQW@UWl31`kF4v#%zAKBx$%ed!8c?m_Hl=*-C
zz^%!rGm^GPPg?9C(5L59Hr2D*zg+x!b!~2J*X>y++8+mf`QiIX+UG;{8KJhItwFQ1
z+Sx=}=U%it#^HSK!vV<|e-|#CBX@3MKX0Ap>CKPlC}uj88_h4j5m{J2d8J#YdeE!y
z(@sckxX*Fq;^PH}(!+k8+v{p1R`%w52|xF)zO=RpWm}IK>``9Eka@p(_WU<5AIXF%
z=k4Fz$<z})iL>s>!?X4$XW##6$1O1R%?m$+{)WKsXP+FtZDjoKLS@|VytqRLIZS7q
zEa}aC!p?Hmxti%V%M7V?kN-s5Pn!RK_xgDfW?V`Ktg^*EhPH4f`To+|bNHs;>?J1*
zg40t<6I)cm+Z5JlM87m$XZ^_ShKI;WH<P|qDw7ZH`?YIs*c!$<@m8&Jz7G#h_dh+f
zyFN70nkPqeqx@s_o~IE47g~2pngwgw3Oo`nurQI|t<ktk;-ZAY$wvPpD|k4zzq|kA
z$I`amMa<deleLm>|LqF=JAJ?QTPgXJFL8}EeHl(05?{ae>9<|*t~~m^X69?_!)<a!
zb1J;~JKHm6F9_mK=iH+?Cq41i!X=lZ&)h2h#d2oR**p8)o@X4fH(hyhc8bd8xs|VG
zzTd3$ydvc2;lC@c_DFRq<b}EMhg(cD`NSv1QLt@7XM=%<vdbd1fFv&42eUSAc>Vfy
z^`v>x^8cgm{dl-v$=CGe?t&Xv6d!+Zu8?8pdf&O^N|yA7Lmh`3-^kl<Pjr(jS8wNB
zcjD2XMLxd1vv2OO&@$!>d$#wyr?b%Yl25O`SLkxwx^VW;bN(n}?NIX_TiF>_o(&gV
zv|aek-(Af+&cA*wooeO7ZptcP;uw{bnK<pFLg}tA=g&^9RO`JGt<>pqP%--hJ5y>-
z%lSnfiTm{yY<;nyr{8YMqZ1SMeE!FO;>1&K(@7#)3%-kq?&`1qDR0rkdqbS5H(7kY
zbKw&wJFjp02byjEMJ29ydvn4xGm#dln|s|7_O0q%sNDL%=(2l@(bIIv%_}&HUcG)j
zUn1+}zU|*;x=a@kwVT8LLXc^lsOMHgONSz+Xj@yW6=oH)8Rd4_ykI#rk9ptLO?v|3
zHf(;Q_0@8vqxt&k>S^yCU%gj<^Y4+(v(N13pB(hN)^cdeVh$dL!s9h&&zG)=T$Zt^
z@n~;Tw;})h{!7}^zBoT+7Vz2Fl{{l*_v%<Sk#jE!pXy3XJ??c$ZmV3J=XxLGfa5cd
z-!bTNV%$G*ErZLH%6V7M>SouAeN8{;Qkm8HpINXh(4aqFCvEBC#m=ABR+V*2YQDMF
zp+04a+mhq#RX-Yjo~ft}JHmWH{NnFt8%u<^)fB!+>@b+f9Cu%NSBvYRUkTNM8ap}{
zz0oTz&bGd&+%Q-9LzA20iG8QI%gmg!6XUD@YT0ivOQ?Ud`^US3FEr1+W1D;5FkM;W
z`@SCmW?^FACe+EeReuP)Yg#h%Eqj-HaPr|RUESMFKdlMT?OmX~Z*AeByr`s!QJgPc
zvs{qmYFT;EXKp}Dvw1>*=Iqs*_8B;``0iOcz3%sysqas?@Bgv?%U^TTmEE?1J>OOd
zoeo%SG;Pwo&G{QHgqE#4Dza*}^>4{|U*7xA`qky{B(1r$uJQj@{yMibe*wp^GWPi_
zUz=-NTQ1xT-_?Fx?v6_FW=)%CbH09B_11mQn<HKmQUj}*dG}0xy43c~pAEIQqa`C}
z?D6;JlFq5{{xl`p>gzH7r@xNxPY>L!_o=9q^Q6VT-KQnQUaX7JdwwQ6%<Ea`uXRoH
zp5}g4osoR+>=H{MCKjeyZoaa|BXrjG9!be9o5Gs*#Q2KEGuv|+PB*IWU94B$yi979
zXY7?P-}*MsSP{1PQL~Ds#5LE*s3|#m|F_O%FpAGv=B4Yv61n3;h}PF$xvH*;tVONT
z-8#~Y+)?Y(6t=S@8=bqdp7F?>C4y5b_||Q`EhLhcAtv){mE3~a@_&Qw{XbcM`~W+f
z)bYjpwzl7uo*i_<*P)^HNP5u&wJYCFO;Av{cjxfACiU%_ueH66{uH<<bymH!{3<1T
z?$)CzJ$L?0u3$cIr+DP+k)Ym7rUeH}92lj8+Z(G7So&I@Tq|Vb*Ux*Zd3L?t>KRs^
zzwJ_tzQvu&P_nSHdUYo|`q}DRzZ5<?8_kG|U#zS??H0dMhXk*|vsM8GHs!+QTl;?Z
zJ{OS>+*%pM&+^yo=GhB>t&5(o)=zoxXZEge=2<*!k~;Ojy6g3I=hj}TeKg5uRdPka
zV}GNcANu}0ssAzGRFX%~@73i4S00;RO{>q{Yx4Doi9~Gb^oiB|9*s7f+S8V~pV8TP
zMdmDj7>oLfu-(Gn)Jqx4d}8OxRK+U2s1))~kYC{4+T?X`((H|^mqgzE++Zah^Q*Gt
z&q9Ut8<Wo7Rr`25YRb=v(VO;8o~$c=^Xm1zV#W4Kd{IgJpEqpW>G6Bo)xD-#la;?$
z7;yh&%GH+mGU=??<E^VdaX-?%vG(2M=@z$B$_==94k)|0J3O$vctNXB!BU`Sal@h4
z{1yi<E3fa5{VBt()w}ok7vt6+<>lKaZQH*i{#WQR!`NB>oduq(Tv)@ltNz}ZF16;@
zBH3*{0#-j2iVj!1yuKYNsJ=5)%=qxHr`)sNExfL>)Z<oy_1hGII?02fsuyR(F5O<A
zSMHasqonvlScJvlfk5Z>O$I#k+4~sY=!-mTx?;U0{jsUzjl0tp?O*q%%5rnc#7%oI
z-94BSHu<3Ur3oFU_&lHOS^DH=TIHm@9YX6?9*fv+|M%>?K)ybc8r~f%e&1O*`ElF#
zg$0{t#-(3>k@cL@*8kq5CsSYRR1{geOx{wu;_ip`hz$wuk!$?s>%X|grpER$;z*12
z?AMbn8^_+bIVD+L|I}Ll`rj^`54HEMFVX)R|Euqabkr#+{%<$Dyq`1dXSYmrdvBe_
zy0JeXCwh+LbnEMN$D5o}FaGiTCMtI${GAhPjc~_ixA%342i=NOT_+?(s_$|*wCY-N
zdaC*FnG+AL>M*<{rQQ7dU~<IPCCA=R?l@+pVb*YC<Le)lJHOw2AGfRJg5CEM%{jV(
zA|(xF%#KQF8LLlietDDm;qx;OmQOnDv;Eh}koNg6oPHRd(ptEB&9=1CvKC(lmF5r2
z6{a$NTwvd$9z8WSB#5zjWw)<KRrW0Bb1S}GVL8NR*6zxG)ic?9g2=Pa@y_i6;!Un@
zNmnjh2-vo8U*THge$RxmuNMxUY_ec)UVr=X_fqDv;=bd&mW!?&el<s@@BULqn-xJ>
z!m}1=C7bPBuJiNfr^EA4Pu>56Gto7BR>Oi*Ow8Uz%}(oVGPR;E9G$S-#g^~JOesDc
zlU27~i2ShG-O~AvNom<R+a=OWj@Pfs|I3~!zkB()`n#9zR&5KtJWp7hBT_4>*nXRX
z71QinPK%#fbf>OKuQ>PB{!jWjHrcSOMV}IlcW=5OXdruR?%g@snkJ!j4lcQse9;oS
zcJA%|mC=xOQ)m5w1Cw1koHpEHJa6-H#UJaZ-e2VW{Lg#5UuyL++R?t}edqOkhb0|q
z>Yu&(zU2Fr>`f;2xw|yFCyN-k8*l`v@JKdKVSa9P<k4}hxx4PCKggb8+pN;N*0k!1
z;u@WZD>lte4F|t)Ki{=!4NseLDc?@<e=Uab*SESX;Ow}+Yn@<6Q-bpaMV%cS2R^Lu
zKe}}1?<Fllxy!6)+@Ci0%cPuilZ@calkT3hTYLA{3%@<4`rB=6b&8EAtK4^R7wGhg
zwQ;?q5oWnoPwm^s6L-(2mL|^n{^a0v`H4F(B;H<X`_ZHNerD!t+swM_XY;~mE~&hu
zUO#{Jh3gGd+&Ndh-JT}8cipl1tFK4s)I0XS-rJy;@KNjD0|DC^eTgB9_vp?`{v#ux
z-^1{r`i!2N$;TumF`rEv)UC7o_>}A9T}@Q_CE_)neQJ~Fn7>{{rmxFtlG_a}uc{Ti
z-X_~71)Six@qW|n<S)91h0@G7oOooQ^>@SBD>0=nBdbg-KfGDf!SY$`%7s5N9-<vn
ziuw1fT4VI)7weNRN6mM}-D`?WKlMLBK5?5!{r8IRA`XIA`ZEM<ZHw0XsQ)Oex!ZX3
zh}H)?mj3T~HA?IE{<Zy@WEylpX5sO*?zy{8>9{N?c=&OuxLwy%CL^^l!-BLoN7rtx
zJe~G)>H9CKJ4@ewPwU&c>{$liU&HUBUH^`oDy}hmoLj->W61X5x6Z_xV_^#uco&KP
zC^XN0J9&ag=&{Wa=Z!?B{j2=`ng7WjYx_EtCo*Q7y}TmY<!yQ1X5n^4p<w~d%gXL8
zQ0o$F6n(a0|F6&b^SQd;c83)l`+DPb^VUPtXHO}*zbshg>73)+9*3W-bS(0G&B$c_
zL}cx+{JL&#W|o;BSY7r`e4so(b@@WQiyo8vR2Z3dY~3p8E+G_}Y11^zfk}RTmiCE9
zS0?oE&*D4uIAvekw|n8!cpmwu?7#o!!iM&lUw7RTmaw(>bn~QOWOQVjIA_zVInp{3
zKZNGI{B(smGBQrZ=CuL8O3R6FcdvIi<R@17<kkPO_T~D&bje>wxwQWD+Z>(IA{$%S
zEWc~}7bXgG%urFAZh9+3`n0i%MaJtFO4h1cAD)?VEz7!aNmYG)jsLp8ul`SLSpV&2
zDf?IB>&Jp7WxZRX$F(3yt>c50+v#h0KCjc=ggSo8sOSn@*t^*8N#XA1ci*@1`^V;b
zWH~!J>1^J;b5-@Gk_%mvvNDpEAF}gt^$xhz_T<(<rQPguzyHoNWMrPi@>gf(TVJbt
z!7UGtsqWq7;Lflj=J-eN6o)?#{{Oun8M^1!-~U19_IyodyXL`>`$_S{iG=*)44urY
zQx6)PyxEw#Z$oa$V=a%=dD9L5n4Mv<IeY%O*{6bkJL(JsnD^aT<hgrd+DBv0I}tOU
zNVb1*TKi8bHLzsv0_pHf>+Hjhovw?2sdI#xX@);OyWG^^&ZO9k&oAv(xz&7JqcyK(
z*{Zcsv5}9S=f1O8X7<&IlPgPfd(KYT6Q34*P7hwnti>5s=YJ~r+b*}LMJmb<)f=aj
z=YKyJ8*I&x6gllmL_v|r%?S+)132nCj5FTMsJ0iGtHSw7@aJ6LxbuD2lQk~ST_QBs
z&R1yj>!1%JUv!pv2(*1)(DC`$rXL2*i%-s6?j~DvLZB?7sdJi-qq%jZ#~-DW$ArGz
zyTyEa#@37HH|(9I?#MrZ(RKCWoP;FSW|xci58J3LHCba>HR0uigIg!1UWs--$vq+Z
z<IcFtjE6H=cg?ZczCKIbJvXQO*X?81%6>_zh3{~$J2T<cyt}dHEOred;b+c1j!DR2
zG20y!_44(Ex{&ISL%#)1`1jnoz9TtAD%vV#`vOn(g}2xB^{q4A-EfWPQ(YbB|Gv$P
zeastcG!t)KtIN%Ktt5Wv+AX1%ANu9`ugm7Vw$?rytFHB6(Yus8%BPK$jjSpzzq(X4
zH|pw@6MI)}duL#HB~k8$k&>d$+tmu`Q^nJdm7KLcU16wYwzqTP0^ivCY7>8QM#jZW
z&C>b%pqxQ@7r)Dytl(muX=zKJA5lGY=izy!i7&i&{>$^w@3LY)D%as|I9vWowWHae
zf+LzA68sr{Ha&{HqqHeX;%C?XX1|5KJ|E(LpRJ#g;@n;GW!{qJgah3(bxXKxo-r3z
z%o9Dy`|r;Ab%_B^dc7--SE@`tx$4H#d@YWW%XgJtxEXEQX?323t&JzQN=QD#ps8ho
zv2K<^__BA|hb*+byFc?3@Cmyp9Xzb)6ci!Gu}b;JBmVyy&+q^A_T2Jqf<;<s-KC_)
z+p2d?$s1hFVpG~Jow9{lWI{!qp@71H-V0srN1X2kEBE@I4O;yEC2M8lR?7g{Jn0<@
zTjl>>I@4yiI6;0sdy3I+)(s5nrlwV{$x~qBmrm>MQ(tvv$MKKH${yV_6b`>B+oF8<
zZ}pS7ja@T1x*V_P{oLWc&VSQBN2yz1{<SX-OFin$VaTL5-`O&eNAjWc`GR!^_u9Yt
z-FAqDrT+HrzL$*gQ&+ZcPpPb%_4@9L?^5YPO}Cq`+duKiQa*A@ch4H%pFC{4pS~2F
zDOv5|By=Ev@ww-UM77-u=9Qi~<kQPPyE;I)LT^Ig9`=II1!3!>RBz6k`0#=KQ#F@a
zQPwMUr)+0(Wfnf`xn^Z_(^f+@f!p&`CpBF3dtGb1*}Kh!CAM(F-j3%BRf08_FK*K_
z{>I|>*DvjLW&BF!Ql_JO&o;!Yoz?SB@yMOGTox@?4A~#HDIHu_;QxA_`pH9nZgpSl
z|L02?yb1Usds6Y8Y>I9{TjuL7(Yc4aN)=9a32*<QGxuDqchtfM9x*pIPd|1|<Y>}7
zrIl?r3X=L`pL}@h8#Gg*V$M&=HMu9tW^T@!k<c5zX|nC^N3*vtm2=VAQ9kc=|6e9c
z$-4F5U(MbB%UnlHbSaCX>v#QYSB`#v?z3n0g4DxF+C4i(Y7;fDv3Wa2U;MEsB3PX}
zv^9Lk=VsH!p04%lCeGzk3s$)FLFDV5b0?<HuRXE%a``*o%(vG0Zyzdg&vRfdG*J?`
z6)fSb^xZ^m>Ib_wtKXj8a%cC?om+VJsNIZRIq8cif61(}JzG5Ao==U8GDs<vFmLGF
z8vd6@=v<2P<}dU1C|s}mKEF@s(DCiliXLr!ze@gtx83I5>T(|<GA5lhHEvHoUes~<
zdbrq(89!_O*&1HCJn8L?&FdN5??p`9J-=4r{@>gG_jx&GBx&$3_@Hp%6MN}=7Rme{
z;bA6WI_|SrvT81^+v&OKtHi<+FP~b9tt+fEU@Lue$-3z8cl+9xLQcwiC#Ht~y|8(n
zYjS(Tj}IA>+ShGZ`_Vf#@@w<TK1SbF#zv*@lh1WcF0Dwu`LXoh+O=Cs)TCctzxK>+
zX2%28gCRRM87MDbZ(=yxWvbvw=2Z?U>lmN@y}o2=-NoCxRa9q6C%1D%q@Ia*ptgu9
zSJ+s`_s(RWDp&I&+5MaP1tTW<)$E?r(q^Tn+$?g(=KHmNiwpggekC;%Ry;l}&oedj
zgG7MHCcmbj=^59a?7eEpWqF~4ebS|<`%4#goxixXiLp`6Gx>Rg&%OP5XK&fOW!Qc|
zF}>tg+1g4j=Qjzg)xEOItTWCoPcY+`4d1dpy)FOrboqaa&N%LRe>ahR;l||~%h<vK
zr>s45uI`k=pFI~Nno9O8n;fa}T4%?@^fLF0B{}oY*WHPTpDca-pO5eIP}}Ln&hZ|>
z-rTLrrl-5jWN=94JNSC#>UzbGztY}ms@%NzEHBfx&NVDeZjwie`s~TQXLG~0e!R8%
zv~|`I)5P!BJiO0)dS^uIY~o5jH2*q};x(>W!3x=xR})sHu<*=M;!J1^R1p-DesSxL
zMY`=me-7!ryEl7ER4jTcA$;`iTHelM!fURCPttcdr8v>2uufrhy5Q!vg9*KL{Y;0C
z?aTgc!nrT!lMJ)&=SjR<c@z)z?K|%&QOJL*+JCa7sIjKSe38U*RlOFsRsK!9j4%6q
zzZ8A%=1=8S`tYt&=lr~UzHe))Uw`mxK9?)L<kjh_H^&yejytvRP3X_R_y2#ku>ZDW
z{)=O4XC2^XJUI3H|6>lH?yh&~NWQV_{xLS^ZwKnmCM}G3TB|7+{jWH?Zf;8S`iu*G
z4@8W#)bIbBzUlSF>R0++X|)qK2AN#-IhHoZ@kHs|Z*MxxH|tc^pW$d*uXpln|G$|$
zi#J@Kleqm`6i4wXpAY3;yBC}?*t7hW-o|qQD>pn;b*Vhgs_F8l?DH-8r?2Aw&Hdrr
zdA#rW2QiJP2i%)PH1wE4r(IwXIMceid$Wt>lcL?1u9mym{eK|d!<v=F<i6pe^V`+2
zi&pRQ+k5PH_U*t0D_0oy@C95HxmUb<w<xd0dLN#<N;7$O^69WJpEKop;_ChUOJ|n?
ztMXJPwOec7@_b)=*Jao5m-$b=zW*<N=W^=%!;-I3%g(A^(sEt@G5<wWq6_z8t%eK9
z`ilM?Zm&AlDLh`Q)_387?yZ!>UssI_qV`>A5lFxAokie=_{T;W#=F-Kmlt=RxhQ4j
ze@U$8-rtyK>g`Lm{<g3_Bf-yfoa2$hhyE)^XG^#r;8%Da9X&(f|4s9HmAmSCL8o<^
zcQTfqN?Cew31f=-HXo)s&d^MUD+bbmH)W3$7cjo4NtE~$=y<<7Z0>gJsI8@eo~Dt9
zzgEp%QP*@gzv>0s${iE8BrphX@L`eZ3~4@MA|So%=gWnA_QfuAeA@px;ho+Dxi#nO
zz6V>DKCM+gvGTk1v(<^Kucr&%vREdcv`OlKc<0~mR#&5}cWlx=KSlmorH+N8T|$J1
z)`ia5(!0}V_|7jn(9dGJv|W6z{eE@*#ImrzEn=1@+k#h`pW`-g^WFV)b$0!PuUC(*
za{AK#iqDJl(G0)l){7o1MZQgBefarnoT4O4&8xubDWAWn%=NSpU#llk&LSe5e7I$E
z(z*PcCybu?3*K*8_*-Pc#B-0uD}N*_TtBczU{V6F&!t%+i=;1HDfTlH_H8Lyu<82k
z+oxa8nK2`woKc9a;Kr4On|4_wseU~F`V5m<pJcSPWaU&Qc9tx+cZY+U`d<F?()Zge
zoxx%EX-=vulSo%fO1P|Hj?iuom0YcNidJ5xCYurhKD?@W_DSZ@am!mC`LEvRy|ezl
zXV0E9uT(fn=9S3WOuP4R5!=3o9}f2#IAi2C=S*(dbok?AsoWJx3635d?0WlhQ^fx?
z8m0N$u(x^%D~QZtV%w$1=#=^Qla{^59foPQZfSJ0PrdqUQTIvFZ&Fvw&pbcyUgGc3
ztmo@@95+k+f3y0-Rh~PWFO~n(J$LY3218$M$IO5-r!1$cu-i}0e*f>)d{@+S)!%dC
zU49S#oUZ>7pOW@vo{W8YE9;de(|HW>;@2Wr>;#UMi?j>IY`)EVQ@gC+Hf;GVk)Ru;
zEc{M->80)EJD(-+vzXK*=enAiT|3IWl0!|%QccLa`0}NyHT$kCTzBcBW_<DdqZOwa
zmAy7MyxhKWY3!@3?T=(OXRj~h+dW50yDY<rLvzX2oraz&ulqOcbyjO(o_;U=`<YCO
zh=QsgEH4&J3JLh`trvdJ_K42IZ_n5~pEZd^+dh~Rx8J{MmtI8ndgerP<MeYcdcHnw
zJ14F?+ed}TLes`|<!avI^9#LuoJ@B`nus@C7XK`j?C0rye&we$&ea^V;#rup^2H+F
zbeNU}M2kPp^!&TGrYzd%WoYEgI*%vp9J;+aGSAq(cb&<Y#`4!SGvjRvv$j<APLJ+4
zl7|kPJM2;6JbdeXAFt3$iQenpX{BMywqNfQaQwu#Ea!}r(>~?dp2a@gue%OyvcG!e
zoU?pphVqr8axMPX%)KJSZDcxkE7Ung#?47C=-Szu<l1^ruH{de)p;fJvfyZO#gc7i
z!hC0M{FN^He(U{{D@(VlriQ+D_}V{PYE^fkg7NYB^7j;#UY}1nm1<p(aQyxKDHE;d
zd;kAw&gscAhy9@Z36*Wv#XK02KKz}<bIr`V^5(81-&h`I#uk3I>A$}5rNwK7$(=`n
zMBLaa4?IZUzxGyd^`z>~>&!7Cu~!{7v~AYoanQ+_5qo5tz172YRdYGK-qrkjI4_dx
z_dMCEeP`ZH>Ig8uTzufwffcH=qf~F+`g}q%EI8Bjb3j9;-RYL2bC)nbtNwGv(z5iM
zlJ-v4<x2YxRjSR|U32ZsvZQ@y;tJkKpUKZ#emx@A`Oxf)sEI4v<2_BJ7VZ=7ve>+N
zGml=tO1A9e2Ik|f%l*Fo)i^1+ecIjClX#|a_|&Yqa?`;1jbXySgACldhdgSnoBf$N
zO=bW4ZspvT!u<cNRXnSZ)sGvJYj~x@?mKCy)x`%yF_}&ZlitUAESXy@_HE<dk6SLt
zd|P0{mB-<uXpwWn`fQ9bQwGaAN0p{u%lo4?98(LfQx6FbEjlzIaBAA>K-IDooj$o`
z8zlN{7Om4+TD!Q8|IDoq+!`%atJm1SGq-fl{hxnOdhfiwCl9ZlP@-JuJn3-Cg-K5t
zHplZOp2^y6Yu9N~=4lh9ZMlA)>jYNM#@~`bOwaHA6~9#cYn5WZmY9rNbU&-{H;a^X
zrEh0$#7SpawcDJZ7O^u}X4A9mx9irMZ(ib8c>4(3PT7;}LaCgtl|~U7H`!M|=D3!t
zveJWvcZ;P$uWZ{(A=hH*YdyucmtUWrllT1RTl?R;{uKV;Tguia*RQdnxiBL6&A;yV
zZ#18@n3gS$_gG($#&dK=toXx@vsU#F-|k;>*0s_6=9Pn~Di_ZjzHMatFX4WZ<h<tZ
z+mj!>s=KBBx3)GX?@8mk4GS0C*xcChq;!7%8r_p~)YKlV(YWaQavsmI89i&x@kw`1
zdM0Pa<x|tq77{V}h{R;4YM0d~3YFIz|L^&`)uu8&>6P&Bb9>aT*ZuC-4|U4$UVZaP
zX?s-#FZ0(YbNgTX)7$skTt_0I{!H(^iJcD}Ghe=1yhbj^yd>zLXM+t}w)2zc?)LxL
zFO@pqm8)Mgsil|A%t%F9Fr<1<T;8dlFAZOvd~npk&G}*IZtbsABsT6_IXl1pV1#N(
zGg~t6n=YjV->P|<CHR}9enu2;XWecXkz2Cw4*RFTyJoX3Iliyzu{<GlY~Q!r|NVcR
z+nf0Jj)2qw4&}-Eq1>wul<O?->zkmzf9d?QC1ti-dvngtUSO!+`_}f-ovZ%eA`Zm1
z=huA+d6>APt?Jxn$sjQai8CqJ&h%ykT{`|s<eRW!ik_Nv$TxTSJJXi#JZT%{<L@-N
z=0fO97ZV-Xzt88qiq7P<eY$3og3zfYoNN8Iec4p>-G=%6vT0%GL~a;|q;1pGf6FYs
zbmi8$jrI~U$-QrPeQR4Qbhk0m^xyZqnj;S$fBIdo?aM30uw?erdwU%-^YhDD>Juxn
z*Jzofoen5Hd~0gjl6g9UEPoj9+Go6eW3K$;lvAh9kI)5b0ZpxqYaE3u*DSWrVA2&f
ziJE$?Ns*1Q(eohd;zr>P^O6;tbJRl18Fy{mAS$<kb5Zq1&Dk$`tv+q4+}ZUx|Gd8K
zTGNBCTe7p4E?qm>i1Sdx^}|jocGfw%UnX)*JJRO+AZ7AGnJHg3oL;(r`wBa*ZBISa
zj=s@6*UECZ-$$x&eeb$;nobERO#Knb;WPUcg<l<FS$I+)+<l^i=K<yWkC(oE^km87
z8=4<0d(8~CUeozeT$MVlTD(Y3aqC%?*(dW?o#!qt<9hz<P<dU_uBzMGK__x1M~3Od
zpMA0}>E6`|$KPJiFU%`Tzxv|zFW*m{4E+1kpE-a1`LidH`zxz&pvi7E)-(AJLzyeq
z3vjZoo}}Z*roK5T%{}|okKa4oN@gGa*tTiO3>BAY_FL@@ySf%W<2bL%_3ZESdsF!9
zzrB~#u9bd#<oT}kSK7YDR)i<5OcTlsl?gZ2U)%U^*|CS0lfU0wxH<XoqR@ilwtlAD
z45qmUGO{+x{B-mwnzlZOWrJW&!iKmRvmed-8nLl)_m_tIdyAj<1y^i8?)9P7sW>}&
zch9}Ox?8s<X6EEQ&3|fA#$;`n<}EmX%iM~)Did6NzioTYo3v!xO_TJZNa6I?mW5l2
zuTSq$OWxG_=AVX?+HLkHH(rMReDmEtdHe1ELWTSlD{cQ)utthaxpM!vv!K$WqUg+f
zo3H)ro|EgQ!|@{b_yN{eR!oj<eLCmzw`>gl)6n5qGq)#0qKNORp(2Z+=K`~H;?3($
z9=Q-+vSr1aq|GySZoRYJZiaF5MO7QqrkpeHD;4*7O{|!|<=ebx`>$Vhjhwqu@pJsa
zl_3o|?fc(PbXINo#@tw879IE3@hHoiDq;RS&*ujs?-kEZz4Cg|l5PFVobwV&SvRyj
zKHR)%?@qtP7jIwI{JL<(lRbgUyF6Yjvy)%@=hwBoyuOLi^Fva<{IPPBU!XhpZ+grv
z<2D6G0R|qH#}3L593F5r@ywp7vv~IRU+wnyFUzJVNb=c#y%}tM)0vg`<lI~Z-miNb
z@BCPMPV*b<t&iQw+ixE9*!tD-P5b%8=~hztam&5Z-Z4iM?v?6I;CC)#i0a~feR|dx
z`NzM~Om}p<2wzdlIe6ybwK*r=P1};G)X{b8aQopBnY(xI3T3`iwP9|ww7P0=WChFN
zPMeo|8t?u+EXCCJFJkKY>HAJ6Jc-!w-uL0jSzoW(cAVR#_=)S|AE)(v2h|jQ+i~r^
ze)7;2XD3I<bvfrub_?y^sXoEuN!O8mf(i%chOXJWI_heW{;X+k^CsFTpDsGm;{1^R
z+jLIrKl*<z8b0JN`*FI(InmoNYipGE`>S_DuWp^7GwG<PN=Gew5wnm7!_J@cKJUp_
z+Bkv5p&@1R87>xX2PNbC&-b3MeOL6(a^EgCU#8nj4Ec0-8+04Y;7whSuR0?|>}oWp
z<L@rhoPQcC=Nx{wOhLo(;34^*k5$*EU*@SR_^V+sYgK70qe`0U_o#x6)~gbE>lk*|
ziss~rapvxL_jr=i>f<VLDi!~%zG}~tUEiACxKSeK=)`Sx+AmF567?U?N<P1>Om_V-
zrm_P*Dx5+ay*fEVSl29`$5trvdCqUKkDDiR-0xa)cA~$b;F_`^9o=(tm-@Er^xc1C
zIm@EVQTel}m(zv#oHd2~3uiYe89i$`z@a_k`lq%d5Ba+fiz|uTjyyFxkN2tbsp!=l
z->Me|M_xJ4W|o`ZP<47v{<R+*ts2FCvlo5&c9C=U0xuPAj~`#|KRcJK(#EvtlyvP?
z)tVHe1?j1KmNuWXUwYh(z3t|~=Qr1XPspqCDSGvIu9z1S>)l@t%(V#%40RY)-c6g*
zzjL*plgHm(`@_SEcAtB>ew~i@f`t=Xcbf`nt^1fRx;o(H#}_}Dk9q&KV6{DMZpIaw
zWPC*Nhg`v>%gg;Ya>PW;n)>snrKg^rmw`+wqqJwI?DLBy3GEw_y?3#Ed-U;I_-y$b
z-X22F<zgm3OJ2WmLB#zGmD5trfkNU78}3SQ*>1LZr19tezPRA)JSUE39B){&M7(6}
zx=Z{E3dFBiEd2b#vUlV3lQ!JF#gopz*p>GD_z#)B@~`tO^b0etS@vE$aPh{Ov=c9$
z2Yogw`Q61fOEdG`i*V(aM(x`|ch(Au?GH<sb^X}{DaA)!Y~hM8Z9ZD1$6i}${$c?S
z``rAUM-J=`y4-!s+bN@*Q&57rI`($#oeR7bPZ!GvRb1Y1O){|{r1_4nZD?1a1tZUc
zXGYy?uCy&W`)B(;#Ul^za9Pd1Vp<&OIDay`otDuHi4O`F|NHI#94ooI*wrkOYu=Ki
zs0r8h1y9Pz40hkThL4#sVL98%xo_5W))rW;$x=#W@(UAQU;it4rrf^MeRse8{;Ohg
za%s>^<B+Z2m*#l3m+&(9UEHTC=_0^qB$idaRW3QGL&d<-(1V><L-fPDZ)YxD-tfI?
z-}|@G=1a@>YHZ9{a>{1wy2je9ycnYk(;15smP9^FSCdRJcYCxYR$yYu+{*CDH)k9D
z_$oT-^?`Ti=2-eJ@7>E^duo#Z+)u|g@w~1(pJpt?<7(j^p|M83YYiLU{0&EqzH24i
zzj@ZNv9Xvrtgth{>+8uk2QrfS4hgSVWc!cp+-)W<j*K$1$ro*7ry0NBqsQy<uV`~n
zq;AB+#fNVtt7T02+OuP>sL%xmzjnrzk6*?pteUX!Szbo=j3wbb-ir6^Cwon_Sh;g;
zGi#TS@Sy|y?z4V-Rj}vMnKfT!f4`hItM=uU1B-4uRBb=(dUTF^??N?ao#VxqwrU^w
z?^^$%ro+_R*}}=AUi8(<*JmT=ZB6amCY%1C)v4pK{M{DY>uLe2!6I%&$C`Nm=qgO#
zm+QGrbozrek0Kn7o?yMn^ig5TiYYxdqN#x&Bx?iz-t+!@V(C&7=JF5nEU*6xl{O!|
zVUT*bULnv`eZwQpFwaa0>j$3~zFzRVJXcdQc)NY_L6ci`O-GmM_A+L#6Wqsj=(~jf
z!9P)p{?6F)eg4G9;`gTZ*H^R$d<*Yyf8+S|zs5Voou?hFZ%o>?@vqdksK{KE*}la!
zr{&}u*0wY&W@f!zvTjA}g_SwpKQ4agFnyj<TjTNf|FW}IodTae$Q-(_uu`Sp`GiWR
z<XP4|GaSGCT$Ro?V~uy+{3l_bq|_xkRvu4&7JZPtp+#V>OZ2QmQ+-d}DhiTHlAT@F
zTyZZs!m0RW<*yIB98UbYGkZz0!wJ*U`Kqr@<|!>W$sl%r+q=4*g)hy|>nOS;v!{RG
z?6OQk_GX7#i~7!e9`hV0NF15-m(AnFpG)Q6a*JFQcII)IPs|Z;`ZnWuPx)LSb1TaR
z<%<i$Ple8UyF|69Cu?7?{_zJNj#c$vxjNh7Mne1iJR$cttM&F7dL383pTE9w`QDj5
zZi{9|Za$oJ#8|2%HP4GBvEkGrFMq@P$7VEMU#WcWp6=b(vlK3#Oxqk?*XL_d@ilo{
z`NFHM*V~$p`<grv5>&I`4nAyTS8?{0pVgBqNAEw5NoZDM`W(DiC}TzP)D=&@bWWan
zDAYH__(*nh;fYZB$&2)aOY(00K7Z=S-q&p&PacS!RA4k~brADuJA0RzO?ln6qs<p@
z-T4vu_Jfg!vfkfE?A9s<SsSnX-Z<a4Fl@VtxqE72o#Wfm;KyqWXHEE)oPOrljSHNs
znfS!?H;C^#(2`NA8XWxn#0i#7tr5=;%oG0Kd}I6DIp&&&d>`yt<9X}MnKft5zIxVs
z+(dKDbkWi)Uw_Rkc%ih>S%~8j-yfMRe_v!Q4(e&HNvw;Tw#oado~(+T0%P-EUaq3{
zf3j^yH|~G*QLXdXqE9pT-!qsX7xeLYsM3yN+c)|pFJkqy6;m!Q_o>(#F6>aYR@eII
zA671r&BDre*55sTUQp|Bq|h1J<^nI~16KJSe-8RFzZBYgd}gGitkjfs@ACF;_cgLK
zO4)ebw%7U0330`fw<F@WIted6-+q2x)Qt3t%#3~KrB}zjj*HtKw&~H-+N*7KQ+0Qx
zScjdv)N0atckSm4x9O(>pNg!^l6e(%eE0bc1$*Y&en_o;aOXw+UuVxRbEZDIGGR(?
ztz)dZz<I{Zhg%fBN63}^zPnGWrvLQrjXs>3)pq>l55wy}&)@Oy{?F6@mui_OiT5&W
z&a*3PEU-ND-*Se?G@g|qg>(NMikIK$vRwDavgL7ep6;0<=B_&T+=rc!6DnH{{i-|_
zw9;wz6*&i+P}Qo-#wX-2bH}DLN-k-#v-J+!%x%M+&HU}GvADtaDLT66GI)%1W*(iH
z#kg(j_a$?7e3<v=+x-8x4!D`NRd0<i?`HH8@+=87mh3c7*yXXpYg*3q+e%_i;`}R2
zOP(%h-n;0e`GS)fAr?iMEAxAzqZUS=msaW8_{~nqXH)m)Wrz7oxSnX#l=|!l__0iH
z)z{+(3wjFb?^Fxx=kHT{)R*AAS4Ve!#+!gg*^TnaH8o8=54U}*n0tQpd`pLt6Mbou
zQdjdzCEwrorTE=i?)U!<3pzrVNY?Oq9C<UdvP{s_&hyJ&z4X1kpT17tU#YesaF6(t
zxlXfse$CtHn;d)n>%HYBfo^ZEOT1Um;$fY?X>)7#jp9$Gw}h@qxTYR^o>goy`|g!2
z?xU;38GlG-oD5uRdhGEdo9nySq_Yp`JU5!PclN2=qf%D2F`L{!HBS{)vwxR+Wy5dJ
zI~>{}&dn1|O-*f!J~~cmR7ukBJW@8X!a>G7tXSrPi$QN|l56yJrX^M!3;O5QHCt3k
z)Q8QDTif`4YQ*t2r=;8*v+&;w*qpC~@BcUP&&T>7@w#)@TA6;^`s$CwJ$;9y8Df!s
z`eEsX4}3PPbm+N!^Jd<)YF*EZzmD#VTqiG7`Qn_Zs@9!?a}JZ|{5|$PHS5J|^;bfN
zP8e*F>M}Fj(ahtvV(0Y@(?hrUX@)#xdT}62q2~9e^(jR!p7Gt#`g)b=_j{2UGZ$@Y
zaqhiz`L_1M0v9=(3k*8~Og`9@c6~iqAnKJEzMpgQmBV73n{Pi(KPo1qykfzF-xc38
z55L)}?egs8>Yrx8`YGaB@xtG$n-_g~wWqXSPfzV@oZrQLiiVD#^!~=GOq;OcYM@II
zLzsC;FIU!S4u(%N+&65wCMGU!s>mb!s8K5}Ioada@83_JoMbG^REUd{=kd&{>pEZm
z)nXSj>u<i_2Rf=>ue;L1FJN$nNm1bNd4U+IEe)%y6rAKmH!m!Bp~>sToqhVzp~lxn
z0>OJ`?Vb|+d+xN069a9x6bl8{U%oPB!TjdAHlZC)tHS2|Ea5det62I^Vc|S&ZSN_I
zZ$w_Lb1~x3RA5=NC+_=drXz8G1<zetIwdreFS;=~HTuxz#L_J?JezWE82)+iOy+l*
z;fJTUHm9CD@qJG1bmOLd4lU2;G*(+L4Q$pq!tXLMLe{xQnjx>#kaKo3gRJF2o~deW
zn>M;w*L~hy?`VHu^UAOwmh+dZAF)m0I~jiS&%MU|#j}mM_w6g&w_d8b(rH#oiI=m*
zx{r5f9V=d)VqJR8)br-Ub(Y_=XWnCozQ7_@kkD(bCALcK$|ddIs%y;)&RlzX<i2Fe
z*)7MExu4A9aQzx(I<bLG<D9BU?QH8`CT<pfVQ*e2X6o$ANN4PNRT!&2AwMyN!>(%X
zrgSswwUPN7+?&@*a%jxIug`l>;VrMg`K50<Ojg<R9=mP9mbAI$*0%2FjzPQ|ZJz|L
z3Q|AVG0$A_*rW?B=k%BVs8d*PC|j^xM}7G!R%YvO<w5M%&!2B{G8R%1nKqHbXgvda
z%lWm{YG;0|+T(4LxL@o-?uLb`zAerd#g0ww5I5XqR`-6_JkhmM_4|*`pZvosUi#?Y
zjN<k+I=ZiBxy;+O-Zk-W<ms1+;iu2_o>+6=x4xy~V#c{^kp`u~Dk+Hvl}e)HFS=~o
z>AnBEL|Jl)lR|bvw$MR~AnwgqXM0@YjkmQ9c@eU3azOST=~)xSuW(Gb@n)OEH(xiU
zO>;$#oLeLK;eG0f8}GytKi=iPD6_Hf%!^$QOTU}1e)3?EUeCQrrgwe5@k9o{w={jy
zA^Ad2?8mQf&zMR?LWQd*TwmArX1jNXZ^&<lq>|U&@h5iQ|NUL)ns0BOiWNhOz*d9b
z4Q=0EHnyDaI{R|<YV*kb`~Cdp*{aLApFHFEDqctLjPb<-<_%28gx8jQTfwpD_Jx}_
z6?12u@$I#(Saj2(W7*>cni-QEa}AEaJLr`Aojbeh-GjXI8&8(=ZMyj3*2W4Su6G+)
zqGv7H`)KOJ+u<jjX2i`%+HTI_o_@YAqS&Lr=#7B$;{3E3Dn={TB%~dS7F}aMi~WuC
z5pA=l^>3L=4sDExxpjNiOdbb4rKvulosM3j!Vi95J*j`j*Z4xesp;u6Cvr32*{nM`
z*IUL|c#Ybk=-F5H_a418rSs#<VnhEN{;8My6xRxNMOpPdRWB+#@8tAogJe*@m4HL(
zG}q2W3*Wm5aH`p#<6HJ@h6K~2MlSuo+kV~q<;LvHJm=1GMy-gOIor&Byx)3ei;hq4
zi6o<=i-Z++ce*%jdX?|?jz7;+rZ4FG#w5dtAoHzT5=)hBRCYJC_$f$CyY@})-Pxkv
zmLrcRNx3J6$|U%H$rgBUo71`Z{S95mDnXC*ZSPll`A**wpkY&VHz6TGo=s7Zt8a?Q
zMyr??LCc@1rT+PMokvK@$#Bw~o9p*RZ~C|9nESk|%#BtlbqyyD+Ni$S%2Kp^lIJXk
z8*JBd&ecb5(s(gpaR=Wc6@y=mH}BqKZ>YUB;iAB^g+^_Y?x$vdJ9y1JjN|W`j$bV0
zw!$vP**gx}KHxtxQ$WhI<I}VhS>v9myIOX<KJ{qgCX<X$UFlQi#;vw~eCG|%HI^CL
z-kEIA&(8guCdPXy=7mipYq;3?&y~H+(=7a&jkTu6EXXaBwbop?j87=M;0&vb=&Q$U
zdUXo>f83T9sx)=qVO)6p#MzIRmwAUfBrn?_`Ym>4gk^Q4(MlC*A-j6ndY^0IEI(&W
zQ5S!vGTYC~xhU?@+SoRkOK;bD{kpM_$-qaYu7j~~f1`@iLJm%abJFYU_-^T+%9Y}N
z+!N{L=dtB&%agDBnqC~$Q>%0|d-DC%saLy}GQQn3Ng(l%heXzbK%V}i%Suj8dwu=J
zt2@>8C(b+l>)AB%+{x6*K5QR<$EbN)Gk5Dwa@+86`!}8qzyI9a|L1G4KZoRcd-W8v
zA3P0pzoZr!RsZiwxpG}0PdE6T@A<2bcHKK+_2~#hUiACo&izZHz2Y95-?3mZkZxB=
z$SrksV_P3sFL2Ur$I7{lN=$rbRz5Agth~Y@^u*i3Ps@}~MqGa&f2Q#O&--tTi4ref
z<odHjJdBHfeqL^QY{Xlgm)Q?%<=7HeM~K|uSoU4JF;Tsk_4LNu?C;vFtR`42FuH!J
z&_{TK&gS=@4zbLf*DziEi<{5y8vDl3-02&>%_^9nv-)BD?;rD@TG#)xf64nf_|4Tw
z=Z$&c`HH+wljgs=|GM;tbI>{cO}h>|-Y-4ub4?&GZMwI`iZ@RJb|shkT|cFme(z5M
z=fg&snfusR^&6V%9SFLxtN--l$qZ*4c<=sja(f?lS9D#~gm(+JZc4e!;<xL~hoUm2
zIWH#NXeykx=lat<Ha%*x?HdnUoiX%hURWTr&3z`%ts~kuyfvmMtk|5(c`~!8%qeN2
z!d(7$wf9eQKa!K4`Y?KWs;q(F>KzQvZnVfT{ji%IwZNnN`bl%1J(XXBBj?PWvh7}Q
z%<qX4Cu&_@E6Jz-**4Mm`@4H;H~V<wZ8d~-zfU--^W9|ffu~PXe~CL-%01gKzw}as
z_WFY=wS|46e;hP|T91i*trnSk;bh@XUP)Fi;X>a}7k8fX;s5;Lm`(rN%>^BcUKkd=
zp7fGshfmXuTel8ry?d~?+Q`~;+tKj1%O{jJaGN@6N$@%<ENBmM{VzY&vqbD#_~v8r
zm#>|AQ)Ux)h(VTTe@IPY?cFNFC(N@uME`WN+)!Ipnc3uZ_wb8<)8(&S-F|JEp2Wna
zUkv8fN1ke}*5)fa!@GEKbE)%F*>A~<gXOLnR^ODnyZoMstn{Db?;IkhJy&0Aygh;G
zm6h@PmIj&Eyw3uU@Nle=HH(~KeL#Ox)hpYGOV>U8?kJjwcrLl2vpbKO*;QOHwy;c8
zcY&s=%92gog1%?t1i6hHRHl4Roq9I%SZ<eM+O)d4kFL$=&&hhNda9$Bx#w!ci;aJR
zrpYQFQQZ;daAD51?B+XM87c;s*cfAl56`Ro^QZdL$NqoD$wKr0i!z41-RJVC<|F^V
zo|Cul{HQ(UD!6O4cSyMWh7;d?66NR4+d0!SGw<z$ifZ}Y)frM1o4Q@1795y;@rjJG
z{KX$OJB4a&oNH!pirMksWod^_s_~wD3-)U!`&<uQb;!LjVWZ>f3j*)0eB(G&7HDUk
zudsbJ?R<aq#?{H~FBRiBTdY+ia*cacebog051yB{4_&z_Lt1G+mvmrTLXNZA`}+n*
z#bV`E8bsE|pAF>GyLHL)@6%){{@Rb1_dhJHwz;>QPrCM5-ToA}jRx^Om5&nE_&#&b
zm)OU6HvY|{%)mRF78Ke|`tITLmz&F1N|||Wg7JzK7nh{wRRvAktQjVmAdsMxm6d5e
zbC1=Il^d&hCT)DsFiq*gmW6#D8E;h9Y;tcblaOn2F%n#PxiV&2Zqv2itf$`t&+|qe
zUiy2swQ;QAIi6q4ZU)9zQrapqd-OVA9n%i@p4uxdv7z(H9hcIG8hwFVvTNh+PT+VV
zc;Fh_ofkrJ|G%hzdM5uzQ~O1O&>IoX^>3~`XNtQKs?OK1_M%nhJ?FLL(!)7v?N&KC
z54`Mj-<`4wzUg#OHMUlL<zWkZ<HQpg-#$8|3$dq!@b^7=G~MS(4)5u#2X74y&b#u5
zXaD{$r}rECEnH^&bID!D8>JR9N$KmKm=qiFX`bBpua497+Us<mSzqt$EBhs>c+;@*
z{jN2lE`4)rXE$1{%l}>6@ATuAp1=(O-#6O39VX10Z?<Nl;(^IrA{Du>t&b}vb{r7$
zTXDWwx#91jk9^sSa(|~!mwT2V-)pkfOJh=kpvKfW)7hO5Us>b)yu+C5*JuCwU*C<a
zYT~2%=bC=YFXi~YhB@*x!x3rzl5hR1jFV4C-FO|kBq6W!_p8JJzDZwK+-LL=pH+SS
z*Tc)q@^_;b7(`v&ze~qfgQaT46D!?n<LOD0oYu$J3Mypz%Fh0GE^z|i%T~#CjT2WH
z{O0_gP*>+zbW^99w|d{1Gs|}L|GIL;nf*if{@Nzby2^Wtg!Q9YdtA?bU9?-NI`LS^
zius>rKDimVG5uN0>{!pR8S!$y-n%bk-DZ4~zWvCAx@CrXrD4Ylk}D@xGd_>K8My3#
z#j~~vEKE`HTJM-XuA1pzHM6OzB=6Q${ieBAmWBOh?nZWEAw4Bm)Hbh9Y@1h85Zt`h
zXyNvj8CjbmY`3pnvZ*TGB;cLJU%SZv1#wAn{EeHLk1F_b$zD<1#`1FE{b!epuSwrh
z&e<L`b<+a<ZGU&(om!q#R{im(Q`I$viLMvbjE$W*cK3!URcovZo!^}#vTL53*n*p9
zbh8us)0lV7oAK4Ch{;25_tM4h*POB0aj@mXg0g>$Zpz$<KbSH9g^l0hh8UNsyr5-n
z?+Rj*eRZXjDpL#d+$L||;`-pxLKD_WW=`5y{S-dk>sjP-@kF(*-kDQ>-l!zE7w8=P
zo5PjowtR<=(Ber;OvN@>^2kinb$hJ&(xR|&BlEmwLxmfbLe)q7A5KeF+je0yv&Qx}
zZ)7HKytOm6XGewYF@5W`JA_=Du6&trtoyIZ&W92$61TOBj@>!<&f=VnLd>*F+@VjT
zxb=V4E_y7{9U7rN=ljNKd_u1pUaQD_J9YZUfjSq%%*?`RJRAMmLn@6QJbu0B)#_8O
zo6h`R6DZiXI49-Ga*MMUS{plmF4?&@xT#n1<ob05W~$q#O!Kf=$X?PTvg3t90=M27
zzmreydS|U@=2`Ii^&cMwzNUq&E_{qP<5s-b?(D;F8TIhsi=fA@p-VO{J%2z(XNP<4
zhSqK7MtSGL0-m4lICCv)<D2h|2So2)yQQZn#K)6*|Hqr<pU&F<<X_YAM*9cT)e=dc
z*4JyUnf_2}`S)nnGr1V`gFdmf0kee8&WiqVRJh~BN$&j9cb;fy@PGdrmtdaz+VUV*
zVs<)z>904;hc=|F6MWX@aK7!}g98ja4-WQv@AisI@a22*W9<>vo?z*nOLC@6dQ_NL
zaLYk@mXNMc?%T^tBKdD_ow6=?$EhQ)wDM2fxe?2?^|2mb-B;<Cwtv;EpWSv=l1X!)
z`ar?)U}<vx4L>Qqd25oyrrH!d%&YhC+xJuV<8^b7=N~_dG@3GYMT?~$Q(5~>_$teV
zMAgT4m)~2Y7prHfz4~-!W(LQkIcgFgA_H>zd-(27&7S{1$f|GuvBS&)DIrh4Rm;C&
z;`{b0??vO`x*MFl*SOzv{;rI1JQ#O7U24ztvv&j+*w0}Oo&Wmb9M_2#43}#kWtMT3
zVd;$HRpXRhFTo-9Zn<p3t~+f#X^B-K(}IexeV_fFQ{!)u-tn0QLY$FLy#2Uueh6vO
z$v(%$D8M0{^GLWyOD8qx(v^$H4<zQ_{c-A=<?81fihh5Q=A9jt(qA`EP?r7kmeqUw
z#JmK86c(^ob~w)CIKO?ZY?yL{-))wit{VS>UfL-c9J`aJFe%{=vs=~~?oU1$9G`iP
z+`93tTZKa)=7_HDUG*6O8-M8Jd8cnqIe4UZ!}j>=bAK=1p!PGTOGS`l7H{;*hei(K
z=U(<ph;;9cD=RsmoAL0RZQ^z&-WF-jgH?Km&vz}Ec0_2}4jU_%g%RAfy{Cm1rBCAW
z<G8!sL1)A4!%S1EgQZqRX_&SYR?IuxWzD1C7kzHe-`_?>zb`eqI|l4=*z;5ArtGz^
zKVI)Y&LlVEbz!dWtS<>V3bvmco*TF~ym>dzPX6dah6Rg6h4mkuzI{tuQH1NuzjZpQ
zC*8VI4EJwSW9_}mtbO`w3PYi}l#RpE5AW~xWnE;jDx1N|Dq_LnQMq$drr*@L-<K?Y
z-{T_ucGA@wOwai_FI~9#rTWVsb6&CC9zs3aitqdI$6o%Qzc5DV+l5<RZbiQ;5B6WY
z^k3@ntBhjx*?JB7(wE%X9}6v*?ziV(qh?iOW%%EK^PR<?p05Ard1&DW@8{nO+w_*F
zsXi#rez#3UnV)Ux>l>QCgrD%0=ii;MZXMqu)02uD4UW4Bf7cW`{^(JfQ-|xfM$5}Z
zZ2a%y9?J+>xqUomabIUkPvXTbK6iF&ZC+f?`LWw=@6{)76lP1;XP?%$Iman+?DC_D
z7L3lP60a!;^%_O5<Mo*FBGT#9mG@fH*Kn;_DRC>iBEVxVZ}HJT5pS~>Xcc`m|F5$C
z|GoWYe2M3u$fdmqH!yg2<^1dZSqlRBizY1Lxx34!Y3jUxjGg9383m>{9oCP1Za3k<
za{K95?`$$%zhnBTu*T*`jJ{JCjk9e3xm``X8EY<MWuc;+u)XNVnm@M{r`P{vJ~Vkj
zZ}4upZLu;(mYqplwr!2)r7u62V=t$Q$=$Nr<(stBy)bfe>hoJlrPGdtE4y#ZOStGU
zWkSzE&b#~nMO)TAlnxTVvF6pITL)gGZk`~wFD-iMt*wsFPjCCbwB%BTQd-fbiLqk-
zhou&(Jiqr_&)m#q=|qbIYVYIz^{y0(iY=8faXl2o+~QFGb@l$`E8d##`+widznncc
zJ1fgeO>H^n^^6Xa&{UsmCY3kdo8A(*v0Tw9=l#OB7e2f1U4Pf~_Stju#HNUFCf@w@
zCN6*O)B~X@vCK>=KQ(St{Bh*^IEh6iAgNR?G~q;`g2M5?tP5G0%0(uKrBC2FH{0cO
zV#(qU|2@vJv%kNXe|TN@v}rT;miZg+*p#?%LTO~Y-^n{qI+g@;ulcq}Vf*6Z{mX?f
zUbE8470j%Y6h2hzay@0@mmOE;|E!fVSr=TfPol>&RwJ$C;Hu8n#j{dGuBtEG%>80<
z#H?a{SEC5C#e%WR?<IUcI?wcY<ul%h4Y><eeA2$A(HRgS^L&wabI6aYQ@_}Je`(e6
z+Jy1=o$Y5=y;f>o68^nSv67*Ref{(+5oab`i{M}|Sg34q?00@-b@!gL+Zv@FemMI(
zWTS}(x2a)Y^LzIBmkkRh3JIs&zqb7OLeW+K`+ugqiLCCI)Ra_iXNWeaT0T4d`mA|B
zr<_nQev-CO`lRQgz0*&soHP4xm$2CEqm&f0M#8UnffJhVoRjy2?(*N~xMJPjJ{PX3
zJge;jloS{@1}1h~J^agD;y>dpCeO=3YLU5W452JRGoHNJ@lf){BjN37WuYn3LS^1%
zd7G1`PoHs2c52rfm&I3YEV|cx{CujYjZ<+Q^GEiaEz94xsI|my(Y|3mOY3W|;Yr{A
z(`SxIbV}M*eRCAbu3hYLZeqcr$sMdm6!z}A-?r~xPfEAODh1CY+2?zBy|T)hdR`qr
zw?}vH^7|7`@BeAI(|4ZRosIXMjs+eQd2{Y{m8-SiiC25GFI|wBXnHr^Sn4t3$HoZ8
zJ;DkRd&*uK&y<m$wmH8}<Kwe3F_sPbiW(=fws>Zp@+k-~j5w=n=x}F4Q{eu4He1p)
zLuQ`8xZr|su@(QhHOYtF4zAcS{Q>WJ*XK`Gq{TkC!F13qXiL6AV8PF|S=)9_JpJm#
z#7t!m?v|vhXIq*NhCDHQ7|tFkyxV)n+^-_DUtgOpf71H?Ph+P_c`07YZK*qc-JCnM
zDP+|VJyB2p`;*Vyv3MWte4*q)Somil9*Gs+3b*u*pQ~56UibI=qtdJIEARHrt?fP&
zGGn_=<_0bvW0{tVLaR3zzsOv<K1@PzieLYoi3eBDe|60E$h!rlDovdJuNGA?_;(5S
zq(5AdYJRQ3?no84<wnKJ0<6a-><jL?bn&L<+FaGhi%)8*%KU=5KTrAYV7lts%12TW
ztk#d#O<()4`8=Pc#2RytbTM(UufN=mKL7f$z+L>>1^4RIw4xBBmm<QCr^bZY{l9sC
zLc@x^?|W`~&+zQsz9RN-(526pjl_FTzStW*OQ*Wxd|zxu{Hw2ahZGldwK%ihUHW%Z
zrfqJ<dB;iD?#h{^eAnm<d-Gj0`Zr^M=bL<)sukOmA~(&vBhx3Q_G?CJ>)u5g)8l4L
z-DjNtfkAHPcV)4#J=31ej6HMkwYre+8zz2!{_xeWZa%p)EqlB0q2*N#N|B-U6K2Ux
z>``m}@up!?<FxxFOZo1}uJ+v#e~s_qJbBmbKaDz#qFuht94w;MXH*-PPB?mgQsOL@
zL(B(jmaIMRrJ}_@bz8+nIg8hZ{dXm@FCM8p)v=XXj#KeNfm4no|2dIYQHnF%KC&L?
zVX7#(R`+T9|LHvUcV?xTot~N{^n8M^WBEDZyvaN(Q_Jq|**jI&^nv@cr?+SC*|fEx
zH#<A;{lxn3_GLnRJC2=8JZNy~)&IkC2MoGwyEjfg^JmJB*G5;*EjVd>=5^qv1srGZ
zwUoMrZQC$i=^l&qx2&{6_L~nL%USTxSKah@#hX>{?^M5GTjY^&JXE1_N$<vW?;iPN
zdYos^`kMJE?wV=bEcxZVfA9YPyZ_{*UxDtv&r7lu6U>tf-b5*{`de9QcVpW8LYpQ3
z9|*kOBXnzPuDFNEGPye@D*Y}ySXL|R>Z}kqxpt~qf1$@Z_BpN-?s%N-^T>9darZ;j
zSLcrX0`=^N3zgZ^&z@@56m^w~5p+v(+NgF;qH6EO=cm*cPdFH}>exO0-)CGev8UB9
zuq<BvTIa->Uj9Nh366aWrQ=Us3YzA{ko`;MMa#L2I~L}qTC#hYAF;7+3KuV_Oq`T6
z^@IJ4<b!RZ=ceU`v|b2g^lISyyEXq*(fiDktDI*@?#=D+<5R4@clywcfL(|AW6msO
za}3yLBE&YGmvhaD-uwT$efsYuFDm}^_4|_}v+o-&n)fRv?1#bXM>ZBM2mLA%bv(GT
z<JmnQPL2N?aIXGwb<MeN3hi?lUTvKcp?PSFOvGt}ig|wL3_Urjn&+JNJl|*NY4QDC
zd1XiAs=CBHw=O@K4{np+Ke>H>+ClC8N}sPh=Bu(WDq)Y_&CWAB$4;H`kaM`|{wYc}
z$K<lMYELdReR<0L|AAMUW?#OoyEHlMpTXm<%I*Sh`PFK6>u0w|=UHl(HtgEbJ?)>+
zhs)k7%L=lbI99l6?bJBf##XA68+5;B&RuScm^Hp@W7u}xdb3NE%U#Ul`nl4Fc8jz5
z-MjOQ-hEzWb*b0Mb<?hTb+-MJKEJPv-gSP?)QInrhZ0VPENkpO{Pt;&l%jgW`7DR)
zH|zcOeZT+ryio4DNo(ZJy!453TJfyuxSuSCR?a_%<}D?1lQ&jh=Uph0zA5H>s8EH-
zR2!B3JJ>{4_kD_*uwmh)n^!I=?o~fG!IE#v;}tJvGVJmB=AMz1G~xb<(?6CheZHl|
zaC`85jqJ;hXSwKI<hOqHpjqo`iiTXjcY3<||N69L=U9RhtbESp3Ko>xH8;pH>PxH>
zPgC1*Y=gV;`Y?+t%|EU_78K3CQ{JvPmBC3(WX<HKQ*AmQJ+O9&a!KjAs_W3sAX+Cd
zCsfj4>8DE$Zh{R>g`zInFZL-EI$h$~BzDBNZux9h%jn7c2dz&0l4??1na^?R!dmS=
zk9zFBfBLpyPmt{A)hFU^M9c2}_x|y`UAO-o*s6QZcj6hA%@J|F7B*KLN<+@)+^M!v
z*x$-j>0WMs(s2gQb%U<Q@280^SBVI#4>sgvint(n=Xv-h7lSQXcM7WWHgUz?dtG<z
z2jjW@&(|`S6v&6BrEhzGi2Zg=e5<VEDaM8~?zvnk#uFwLSf#H$x9H;E-IXt|Pl}wg
zHEHFkZBOd=R~Ji1x%Jd1Oib#pKl;PlXHLW44Hm1*mOc+Tf1t8#4x{+fJGomsl|mzV
zt*<RKd;2S0h3$xpcG@#T{gcKQZz-P5a_+Eyc${J5u|2t~k7;jTSM$r~hMWAe^ocx7
zf7|~oHM6rSd13tQ+10iSv2U*|k@B71_iyta_K7a-U*<a(>+9t5`l>XvoZt2Ls`?(r
z2_1!pZv>n*oU(<(j_0#zQ`!L;2Ooo)*OQJ!?>61gm(_4LdDY2tjFS6)E=~IvZ(rz?
zA?);^RNh^uScLDuy1YikE1}|(iso8v->Q1qvgzPD)tMd(*K#@Ywwq|GmhNhw%`$i9
z;a@QYB?j|!Jsa<xxw*00=*QLLMGu?b8+UHnt`)gFT>NU`k`77t>tf&6#a!2U`Ze|B
zvfw>zFNAh!SAP6?WuZ!y&-X^1bfwSA@vraeM_>8iD&_b7=Ju!G#O;%>{+sAH_ulV+
zpWjbpv#_++^?vEvx%KNtCKid4S!wgWiDtc9r#5}Zyq_l%v-sbcS$CLLELyTCX;Q{K
z|5+T>HN8BmrZ0bg>d%`kCMN4Vyt8jVlM?$JbT49Jh}vOEwU8}L6T>u<wgtp<^MqM1
z73WbFi_GM1RetS~lh}CWNkLv!lkDlL3EzI)SyG|aqj^m${r=y+Enns>IVbv#dsV&y
zlY;@1toL@g1rkr%@={&C7cbcw9`#FK;&;THX_J;_i}xM#)Nqy9Dfh@DtU@QD-e#Hg
z2^RPLe9;TOW~$AskT=+C*V}Tagrob?ns$jNPPcX~-eqsvs6DHxb@86GXEA>b!@?~;
zFJ=@?>niYgG_PTi%x94s-V2@_vvW>reW#bRGskg9z(UrXlHAhBY11!7D?D`f)7X65
z_Ud^{d(%T%dVJq1qRn$98`F2j+;W<f_`C1#Dd|0LCR}XqH9U~V@Kry{>D^~`*RIvO
zwy~a5Z*I_uFFA24=vqm~g<i+NjVqg<AKrCOU*yjOfm=OGUA;Fwb8YK;Bz1dNpJ#To
z_4TD2Z~lmMxTW^4_Uz2J#_wx(XDx3y&L|nYZNbYM-5hta-&S5<bM|9Tn4t0fs=j{y
zyOZ8EUO$q4())vq?z-7bS|_{=ikCfiS+X*A(c8aib_J((*4sX3e==qM+#{V2Z%Y*%
zi!5kwVc=SS<GlwLPtKOS^VOpJverLo-LGAC)wE!utHUHwD;Y7K8v^!;Y?l|mZac*D
zM=34jy2G?^lg*DUHoL!zTR)MzI*7UGP1>a2e^=}BA926@`0%G|^8Zwi&p6;Sd#>!p
z({fke6}`=NIHxz&%iC(|q+eF^f0&lFuBZ(@Z`pij^To~=OS0C?oU=z=&pq<o{-68q
z?EJ=hepkA#NdE6+6N_!fx0(rC&3wqu`YY$elMh-NItlfOEQ^<P8hO+ROjhnc{NDJq
z+Bw(suf6>LT_%6&kqrFxD7{|!Vg<LNSHga#yZfGPm=vF@W@2J$esEoc-e!edsVx!{
z%dQ-jSvD)MGDtq9L;ZkD#^uBIZ`qqGyC*dEwas!+Tpbm-?6SRCL7!+}1KV}QvrFbm
zN7mZSnK8NZQ6k6ZTbql`K4-mk<a@mT&&B(vUv974?<H`kcU5~u=2e3ui|)?zF!8os
zs@dgJGGR+X@Pp4+S0^v@3yi%J(Ba&sbnDa+-nNwf*@s{9?D?p>b3Nya#Y@;eNNs$^
z=egzkiM8t$(hU^<rr$Ft_Lf@EG?AyheeY>)Q_gqc`+rVcvr6z<8T(s@)ZPE?IT|?y
zH;S%4k$CNVp!n6VGlb>S<L2(!{w?R;l_L_?dmH@C%jc_=uJ`<;wdCdftj)_-<*CO;
ztJ?GJR@xhB>$IuA@pbj~{nrjG2^X6CSL%ko@rrfp*H3nN%@CRLF(R1Vpy;)C=>*Zv
zR|k7t9v#cC_Ysm;;eG%2V!W5rdgJXSv#a;(-BBsL`~C%&Mb0uy9?k5gIh*IS-ko{h
z&o1e3xyG_J|L6Ottu``gf7-KAKBxA`@{b#Ymn@$spk$Hr_SJT+`G+JOoj$EqntSnG
z^zt7j*ONp8_N}<_*`c$~?vNYfa>t|$W7bKB;@&>Kb~ZZHo_pHi)|afOp6$r$Slky<
z^hj~;v@3s>oay7uN|K)TEqQrwo!p7MX+bT=Zhh|EljiFb@V7N%lV$U%>TfIcUoTdg
zs+D+N%#!cjWg%7155NC$zn}d%Px<i8S6!?9{=B*!GfRWXGDUb^LLE<N)g5MI_q3n>
zyh#h4zZ<FCQjf0=x7oDrce-y(sqeKEx6Tj0m0rH9oy9Oq()x(7#vKNw?HgxJefiMZ
z$oOB1)qeNC2WGal2(0z4m|jyB$F*9L^T!t%E)|}}-g}?_eSW{mI?H>i#kRNRDhJ=b
zm3<U)f2(5MI`6c^V+OvvdNx?4T|UUe*_NZyqMtpHy;>l}Xxb~A(usm=4xeA>9liIN
zmi6xL#nBF}E|1S<1wVGFkzsxPbK%XY^Yl;tj6Aj?Z+-M3-MwnZX2@T^p?W}~sx)`8
z)v7>W1KGZ;O&#lu|D5}CqEyLSVMSksn9sHu8~Ixg3-uk5_`S94n~_}Vo8K{al8>)D
zYSr^VW|^<`c84>rVbjG_EbH3$?cVv`RLFK(!>5!v&sAPcPL>Y-Zu$9T+&MMLlw;O?
z-fK25UG??iii1b9)}36m>1)9>0iA-05qB<WRe$Q*dsouMD8rd`{?TTq&tXD|tL8mh
z;4C`fD|f!juJd&Yw#=4=)52yt@Z8(sbIhIR^rr(hN6t5U{d;z2MkRx>onc9ETV9Rc
z@_RofED=s=D%xTB=I(_F7oQ|_#>)M5cyvPl!u~B=N;{(Yzio2g|KQ2T-CMWpOJHX9
zxg=T6GsES=st-z?*{@zqpEi$irqr&3TrbvjZdvF5{A71aOOk=9O!l;A+wyMpg!l5Y
zC%zTf9bsjBa;N9ck2lZHtjR6^(m#pwMzumpc*5!*%(rqJCdZcq?oqh;(X6A`_UzU}
z%<rQ)O}vt`?V072pX~g-c*C^I_p8qy*w0$2G1bfcvB&l^WtJz-SXf)0Vquzceqmbd
z=3^ZuZHuqWo;|z5VPcp{-S>61TK9kai_h9{$<4j$&!Wjw-9o-gABZtCSFF7I{O2`4
zBQB**{UzaFE!nP3IG_4t{=Z-UCsZtow5s}*TJ(i6cfVQXfzJ-+x#0&UY+1OW_(ri@
zL&2e)kGIZubNI039&_xhs@U=k7S6kKl()Mvsh#<2cFdadxp>Bu#CehL|F@|%i=Iw9
z%Ju1_K>L$C?!)n^-bS&uQy7lUoPVp(z}EMEw{3If@t5q|EAN?PJ8`=?t7t~@3QQAI
z^O(Ub#A+nG%HGjcvN51mLs5V7vImK*KU2A9^{B8~7nOY2wM2ZG>WY2R`}iiYrG_8c
zpgY-n!3l?je)aRc&jplmefCMYw&mTzxl@w$&h^aLv*WJgkMA99_hbJqw^VY-3p>WC
zS2us={AE7vv7xEzp_3h0A{(wZX=J8+_@A17_VxPey!FC$DTQfG#(Q(`b?NlnQ~5b(
z_uAO=9L`pUn%2)-oG_myit(V@B<BOSaz7SZYqD5r+_<2!{Qf_)KtJxu{6C~R3j1VV
z3x^x3|Nn6P|MDryPp5aSEW5m}ODHdE^0s}Odv+JxTd$L9(y?EA;x)TWg~0P^MjiJT
zD|bjR*!QbPrDm0Eu(JPm=hoC;3K>ey(X$^5q&|wb2x5tSQ<E0=%q`zDEwj9jXTI9;
zv$f(^uDyz=iJG%R`DEw8RYDHM+13*SQdbKUKl@t#<oN&80IiGDU$4;+R(&yTk!v02
zOaTS<%a^~W{<@bM`?^>tW6Kx$tM``4-<j}pX5rm_N6WHz(vNtKMwKo$KlSEE?M(UI
z$({XK7uHD2nY=JOd+4=vPu-18Qd&n{99JzmSUUCKD+cMC@6I&no?6yfA7;S7_F44u
zPNlWF{1=+e*zM3-dD2n&%38swgTj-VE{Ei(9e02FZteQD2flwea!P*b{`P$RzmM2U
zl)mLCPnN9@VLs(&71^<F`Ipm?hB_-^g4@q3tT^dyxISL{QG|b1(T+qX?U1)iRQjCG
zm9(#UcVy$|`xP0g`<x2jFciMumk<(V^?T{w-#b*pW<L?InjfxwJ5hbxb^D*`=LB-n
z4Yz)k;J5rEa{Sn&xYdbGU$Z{NtnBVwE1p`OYN*cMp8RE@T%CQQ^vs)yGxvOr=Bo~0
znB#uLWS8u+PKTVdnvO=PmB+t+KRb8VJGuQm_kMaEV_QGzAfLI==EjA~__7=p-r_iW
zX#4)};zjTF+D~!0-tc8kRr7!T7(1Dj$E^YaT$yqNi@EE+Jg-;%e>VQFyJg`wB}Ip$
zkHVhCItg6Awk>2?LVLn*n={OE)sI}cByvu6Hm!@dxTlo(_3%Ci7bniI+oehlcPa}q
zIXc{wpWJo&u*-$Ex&wTP;va5*Uth0vy6Q&WB)>N)K3n$(Ncx=h&D|Nlt=IN!wtGTP
zWirdOg%zt4t=HtJJzAR8l&BJRVAU;wT*bnxt9KswD>}s>so?!BbsvVpV~qxSw)RWE
z-$|aJc(wNFnoW*})+^p%e{w(Z<eh}Hyyl*nt980=dT{>e<~87onpL8o@*qyf<NX24
zmHadGT#FLJm@mr+ub4UUc8c|qcX>Bi-p`oHe&_t0deySxWAE;-(Y#@^zb>=ZR$sU|
zTtfcGYvxP$ZmKdau+5TC>y2@{>A|YAJT<d$(qm56zxUpG99CO)?08DvAGxoe5BaX0
z*0;$cJG+~unfFrpCz-%-3+K3FEdsxJKgW5${He7y!1FpU>$E3NVk0GXIwmdB^6dHb
zH`KsIoVVCQ<pG0usqOo+rDlwGZ*Q!Qk3M>O)0(wQGz0kW=ihMoyZbkPt=@?;f&M97
zuWRDG|GSzwU3$s$SnR~pscS0u3Qv8!ynbRy`d`&e+CPdif}B5J@d()Y;(ujcR!znK
zZ>B##rT>?AXH0(kSLNN$Uz_Kjdh}(*7KeN(*12r~J`+TgG@I5vcyz>;S#gQS%EkuA
z2i5{B(pwF;?>Ta6t)Q3Lp_3l3a-wekwaNLI@n>%D`r22Lrq6S9xKdSGezlgB1PMFJ
zbYxd?Jc@tCGmV?AYDIU=qbre>kMHtF%+!e3@~{1;L%`m@4=*mLcyccE@2{-QyWI-Y
zY-cc^o%F&|xwlIHqUjn7TefeEXX@jGe}37q<C-|{?q#8@WjQ+DTbFdczkWF=Zl0LG
zrM{@I%))GTv#WPkv@!NKc4(En=a6-}6r;5%YS*?+J}U%QY|l<teXwN$N8Ilx$9;IV
ztJ}XYk_`)7;5EZBV(nGYt136!;&yzIN?)e-<l5TXMn*<T+{K$G`TKcgW_qQR25t-3
z7FcwoEtd1)61jTWME(^$T~m4FTo>%xTixu-_ri5yiid(vD2GnmcF&sTTJ8?>6q^N4
zo8NssvG%l&*h7v}-}bEeI%|&SWoFp`+b;RlXGP3D?fK-PvgDwH`u}Ci|4*s7`Y%h^
z={MsIXWg*>8rPWSIvxm!Uy{PGk6qTu<F|>~R!@a%hu-O|S~h`I@$%!Wby?Lr&d-om
z>~gMWbGKXRxNNQU%da`DJFRqf_%4l#EtBLZFpHe~d)vu1^JcLvyrIJ7xap|l^E1ca
zCEU!|bItU_>5Lg-E4OwwiE>SNmcBlX<NIUl4c8Wz>s@~T%&7ZIX2Y@DO-EjY-P~;P
zWX8rVXI3OmoA-GCvHeqhmzO0r$;Nna<W4#nq7j_(`?k1VntRjp&!;y|elE$Zd*-aC
z)lQA<og&wl&N%P2SIso;+`*~3g+DjAZb@?Ez98#;&NuY$yU(#M1t%|DpKq*|k(Vi6
zA6r{mlVt3sUp(LK)-TmX2bbPGyPf;smwZ2a=8Ie^MqgqMu5c<!o3hv=JNxyQ+JzoH
z>D-S_P1h5@^0oC|x<~E*554*?&TpJ=u!}X<F=yG-Gdi<{Qr>S#^8b-<%_t$gOSgOT
z<md<g&u?^I6kB*+<eG(4<C1fSS|-g{`DX$fOJLRv@2fM64&QX1cw{5@qwEgQTE>eV
ztN1ql(zy}3XKQd+Sdo6O?ahC6kN#bEX<u5h{$O}|ntSH~&n+cg?vIc6{t-Iv{VwM3
zjQ{igAN#J#BXYCK?+(Yk*G!JWGFb-vm%5fcGm}!dY3!}4mdznyG;__>xtm-k*rps|
z`6hn;ruLf?et&Y-TC&VM&-6Mw{N?FuZ}?=Y^ekO%a+hqKFS_r_k=U8i`~1{9&v&d6
zn>6#>JiBcNeW#z^`1sbmFASS@x4bxz6T~4c@%m}}ABVoVm7AqLbk5yZ(JXZQz*?&`
z4GG2gh&YL97ulU__6jo}U)y|t8QZ-FYZeAvKB4{d&#ah#Z`WTbh`Q=If64~7oags`
zEvxzVS^ibyj?K*%{@-G6X;E1&C%`q~{Q6D1II7-O1aq73U7qG9aJNCf?q7Vw+<SJ`
z8I$8=PSuLet~pd>;-@d1_`Is^ZpganYG*G<&6znfbooXlZf@?Ym3yyE6U%(p@3k`N
z;O#F`hSyn|81}10TKp-vA$`nuyG-esopUoq49<V7Hea%|x?yUz3g1JIDO0bloVa_^
z6=o*Sg>#pze|DxOl1XX%K?7@+Vqs^Y%&e7c)fO8r{(OFaO}5g0qt%|pjXujR=;h?S
zSJJVVJSVv*jCaaBhvt&<_OP493H!xk=RcqM@rufIKF=-X(iZdIIYv9Lca;5dX^++C
znTeYu%v_>gG;4h7X%2k<{>=~D*{kRM-nnz9=lgblHMQkG9=AEj-c)jQjMbPX5ukIf
zZ}W^`>*HU(Jl`g(ljdN4%I?UUW*MJV933Ydru%m--k~IV;P&3$PZ@o?!~0{q`F3sF
zp!*}*NOd~b?7Im)nH9W~&Hh9*u37Zi?M~Ep)7@Ks$j&fv{J+jF$#nM$%U`oZuJ~PC
z+qU;y@7?7MTR*c-o#(K9+3zdSm#&y9Wb$s>G}B~#sikGI(9%n7$9&dqi44B6;lTsx
zY@HK~eC6+7Ex%KK-gr&^<`*v}zU&nA)IV43vLd3zWApV4sp!VNx|>t)7dv!*p0eyj
zVAZMU`zsDsg+#I6TO@l^s{O~InWpyZ*UNHxCu``a>+ezBzOMG;Ax}@6viw#1xz(*!
z1;sFKxT>^_;k~oMkz+jPs#Weqh#gUUxl*%tz8df1EzBGf6_xKl_+t0{dbcrq>+77N
zd3V?}mZ?{r|7dmKd4dO@`AoOY2}K;80=D<8w9lFT=6bXDgQst2n56u<Q-6PdU%GyM
z|5<IDYuC(G?p<?EZJ2&^T>|@s44##~zF9##Ci!~#B=2cEHep@q+%59fstd31bpLma
zefR8K-OCsD?$SD$MjdSvs$H35H*js+y7go;dzxEDVqKV#RL>cn`;)dkUVo9%;ci`F
z;Y6hyD}pxPW;)TJrel%t&A7R#QsIt5$R9>s?MTu0>4G~#v$hoO$y#vb{KfOl3OrY(
zFZ?UoAh#pN^oS_$vckOw3J+TZ-aXdvK2cgGj{n2S-rT$HTaLfK|0722-Tf)+9;e?t
zD`GTn7pL~(2}^E#U|RlUTCvZq>t9Q!O)C<*#M_*8C(7>p_3uBG_L#AByPj>Bwn?+}
znsF9$@u!F7|2+EUSH|Ym{LH>|`PMo4w)QTk=O4Kz&5@hdIq_gt5Q}w(`mKy9GED1E
z`RtIG5cBtI{};=9vfmlzKfR!En9sT5h%xtv8@)Y=-MZ_#7K<ok2Aqskf4HsA@+E)P
zA)6DG0m^%#u2sJhX5YGmXA5Jc>a$&Ebe6IvH}4g?^nBXld6~ENZ7+~tAYbwEuzli$
zZHs2hIA7I0eqZ4IOY_thzw%c;W&0ttK$Tg%{(QpgLfc<AmwyqMIe&+~_`SboU$<Nk
zePGk!%JXoI#gaF9MlOb|hwZpu1l&Im`SY#5+s^o0iR@hSR|`57|A~28Ub{DK>dn*l
z7c{U=(<_-~$-Jw3hfNLdJa+ry5W8m!uJd__M#NP6?e}$a3UkkW#J~0WF_-0R4?KS<
zgxpgUxhIgj+U#qiki(+<{pKB#N*5(c+Zf)uPi$Cobl3msC3Ayjs?MA*b5qIu;}sz%
z?y?U4bLWIP*G8>TIIxauHdCMGrigZni#*qOdV}M7`QN=RFm`omH#K5lI~>V7!D~*x
z*#vvxhFz+b#(I<a^CrIF-dFWt>vvC!XB)Pp<gQR|3RY>&-nr%1+(;ui=TpnwzP@2y
zv&UNVsLDNs^MNJ#0$ZL>pDZKaz|WV|!sapMkyQ6;(Z7<dyO?`7ZJINUef$1f7mr%<
z+^-a=>nYBWQtr94TlJ&;kL{ZRi)Jn|JXe1@ZO%2hr`xXFVEkrmXyfrh?wFo}O`Kx#
zhUHx<&H7e_|6&j27E7h`@b{lMIhpxV^`k8;&Vrj(FV^_8spRX!=SsS<I=70RsEefD
zVOn;->DUz4)gA1W{h^1phO17GzG$&F$Al|<dTL%#1$#`%_TmD6!w-x(PYc(F|F%&I
z`C>Es%90JMx5r=me0tL!3s1LludO@o%>E~9m^e2+>1^&LiT4UcY)3_ZC@uPNEu3?y
z>%Jt3$=yaKCMumSO|N$@Db$ZB2>fs;LOkca>z36~_XD?`J9#fSKO-jI|0E~J<#wC8
zV{bNSs-2ed-;(u4I{RG;AM>P{r%uTnIQ2;FXx)N1;e8h7PmVlU(sO^O&gbNER~-*2
ztuwv7j+UjbrmR^fzEYoALN$+zk3VGZH!qe)H_Xa2R!v^_JgJcJB+s#1C5dNwWcmDf
zz9}t^yZm}9zpI70f&Mu^-wSn{XNHu@z1y&AiCK%#K`EwNx4zzrxIf{v{eS6~FEb`~
zv3>Mww@QomvF!=ZO7BQe__&Ovlr2%B`17*eo7XrNx!D(oG`rU?nR}j9(s#qk;JE7N
z&Si~C7cH3o7i{tLn^*6>uI86<VU$5=h*kBuJ-!<QI_}(_&pls2h;`z&xVu~a=^C?p
zq^z(1q@Qx+&RXk=8JnAbsH`YkZ1hfJUDQ>d=s8=1bc@#Iha8C&pY~Y%-t?m@6C*D(
z%YBk*aG3VVQ`3U^RYTL19FFZ@FRJ-`h^kz5j@2w+_L&8n%q(l7_rH7bY`;g2?Ty!6
zj~3dc1-zGhka&6~>r9zlis|?M>D_E%%ytqFxM8Xx5a0hw_ekDBxf$Mmmmi9me|mF@
zgZ*Io(Z_2xd@gzP=JltW?*E<Gv+wKQv3~LTfZ}5VdkxD@Ujx>(OSYkhPc2yDmpifJ
zMlS!t%ZZyO%Y_<sEb=|+6!hk~ZNL=9;G9LTTQ;ti>h=3<<rj9(@m9+DHvzlPJWMHM
zx_fWwm!_Aq1NpC>VR;<)@W16`>5K%y^?{QQcN#7Z4Sk)TyK?^W!h*zq{Go*`mqa4j
zmgKeXUlY>poqA&50^^9;BKxY|92bl#vRs<A$!uvIv+<=m-W#zzX5uMt-kB<~S)5*M
z|K6s~@0E1&vFA5-Rfs)0lz4VYLS4<Hf2Ajvh-dnLcxl5Nzact><Jzw!i{H=55jm~X
zV#QooxTCfuPIU9-N7pP)zP=-H{MDK%=GRoG#!d@3o>>-_JXih6tM&gH3ob?(NgndL
z8h@bQE?b28o;2&usI=lg-7^<=-~abLL$a%x=YaMk@AI1y<T^~c*Cz@e;+<su=IzrQ
zx7xFtSQ<+%ERis7)9cPqTi)rr=kJUow|=KQIVb9Q&Tk`U;jc51SsU){{PlC;!j?Mm
zUCka0g3gL;`8{f@T8)qRo}OipUc7pl@Qi5FPf4Mbjt0lfPkmT>TIa!)MYeAq{hDmN
z)qbb%L+*`^xqrCqOP-&e?-}jByky?rWjbejJ@rf%7k)FG7o0a;t-NaC!8WVRx3;cH
zTYcr#d_Fi#ndI%ed2@tbe#p@`AK!oZQt~xsHNTmc$MsT6+wW(tKMs8U$npEW-hv}i
z%Hau#wU$SZd23wL>D|b}&HmxEgEZscj$(1&^)IWZOQ;tYG#trg?NpC)So8Ao(N*eO
z>!PczB^A=!@}-JIGv=((F$_H7>-uO%T+BlQrIH^7{fxUmSJeJC5|J)yV~-Oz?s!=6
zW201yd+vb-6Sv#`28t?&HMA06otag2-n;0Lp7!F5+{JV6m%pp^+;V=C6Z53Dy<y4U
zst-R@*l4$v|BNwD-2WK6-&Z*=#eSE49lHGOO3nG!t4j99nND$VcK9UqXS#PP+q@ah
z-0jLf-%k0>zo8SBIz8UXzutM*g?;+3K7ZDn8NU4Pg4w5DuU?<$^<bi-MRSW}_OmTt
z3X?j+GA}WdR~vaGHD8?*^Y2Bwb(%&Fd)bQb^Fm&{_Q|=kZv&?W_cE)X!ia+g3#NN_
zx1=VpEqZ(;Td8XAxuiaW-K{qZUp?3|ucDh>DpB^+m*$|^5p12)c;(HO$YdYsl(+xC
zj_1|>@VdYLRlLDQAHIG6;&82HLgTFH=Dn*Y#m)(oo~sh}=f=+Rm8Ps~PoA5cU!cap
zC;6t=Lr7ZcP|$ln15L&-drMO_-3xaQ>1?!`v22^4+U%{Idvy17RaZ>-y(99^hj*3n
zH#leThSuMxzP0(}2jc`|J1+ZXy{C0gg5I3xpTfAR^2YhsKSSRwZ=JY)=9KnX)mNS|
zg&jy$SXdUwz+&|J)s>ItW!w4Bdu28C?3~k-s=oEt3>zJHc3#tcPuJ(BJy%ctdiVOZ
zE7=Ygdu4wg|K&AV#CxgEdO3fA8M$@N|N9?oe*VNY>rmpol&l}q5<5$(zdT<rY|1c0
z<=>>M<(sm+wpQn=&$8RP_}aI;mHg699sU15{;zzv>VvB7ale>96IjnaI<;trtkmx(
z&owVU{K|gxdCtTyUj*iJ=iXR)HB>C*b@JOsc{xc=m7h<?zw6-Mu+G8RhQF%nTl(r$
zGxte`mPPTKxU2rDS4HY*g!9ai^<bMLsp0i-&GDQ3Hzim;3-jkq?v=X`pwi-C-Xdf>
zrAJfTyrL%Q-@f;6tY5XS&t%%`6JPP_&+MYdm(+cx$ea_Gm+CWpZTHt~ckG9o7k;zt
z6gz!Q%AfUcV3yMKwMk`5mld<6c$|M}Zc(>+F9UNt-|nhec7F@YT8p>;`g!G^;{Hbk
z(jHd3T6}HObzL}i82{NNCzV`%cTR2dk)SP)Q$p`8bCK5i_{TstOZlVHwK;#o*h<v5
z{t!!dljoGS^=SWRu<O^4=p!Y&Pi9^fODlVvvVr@>3El_Z5gr%!q$U=*<kkKw?)@0%
znNs@i?|bhpJDWXNgG2NT9bFbK>k1G!EXOlt&g|HEIc>5|drrRmEbe)~>gVJ6UR8N9
zY3}*n2Dg+X|JLe=Ep>d9<|@VfXkp&`?E8MX+AkfSTF(4zD1BBU;;cX8*2})LFDw!8
z6WCxisq+OR<J`T|?itIxF?Hcz=lr(JZkP8Cz3uDk7MlO5<~b%UbvI~>L8wZg=GxBH
zd;FAS9N0fb&8QcN_gJL+>V$WtCbM3a;F%le*bG=7Ppzq{uQe+9zRbtBZ}L;lHM2aV
zc9~3UIH3AZp50w%-h)QT%y*YcIdeSO-oATqegEIiGd=fiJMOH#ara<Ux&!~?PcKWW
zjzrE<KQpsfKvdYtx#^(8vOR1`uQHeHOUp`|U=VHlt75^zW;d}Twl}^6T87<l(5;aW
z(oAl?{$%m~zy3x`I3Lcw|4TSBHhTKcPQ_9d%j~;X=S@E~Me;yZ&z*fb#gqAOh*o^&
z|CfD<|8d}zCrm*i8}bj-I-R}y>;L9S^C}fSx-=Eby}Y9IRFy&T-=pdOBT6@H6+QXa
z!D##Y%HrPY&&p<kr{a!0etZAn=Gmpi@?9~0x{Z8x$Lk)hXu0+J-b?%ceAYKP_FW8Q
zI3v~kz~;=Z^D9nH)7`|+e{_z!>A`rfvyoB-%YM0AsIA(lU3qW1)%@#C9C;zvwYE=D
z%DnNdiN|V%|Jnah`|e#A*jAJM^CGL5bEVGKxqtu8(Ql7k@cZs*Hr|l=CQqhylzLw;
z%(N~$<+R)4%YT3Gu(z3|mZ$Htnnt=9aa6~hUVq}wkJ_)|-Iwl_M=hFR>S!8yo?FEI
zu<u(Rwm^k5%bvyWND*+XHn`;CQC?Xa`DrDm+PQgcGc2wL2VF`@t4oUtE6rcn@#6Ak
zsplp_&ikFeZ@+Bd)PMhXRd>ncyRt|2*=YT}RV#k@YfWQ5%caBDrnqkBPe0ST?eV5{
z&lj&>H__8T$hwdB>KpH02R&kDMO*(UUwu<#J^v<7IbXh9PW>bP5!^pE&kGhmIx+r9
zcImfy3v$>K7q_p7|6NnY-mCEA=>7k}C)Luw#_V%q@h?u7-@51{!=&XK7y6z5!X#}_
z7I?vLpJBVXaoPMy1-Bo&M)Uuutawnfa%=G-p=r}o-h5N-GchsyF7U8r<C>>OGZ#g_
zdbQW*huO6v7o}TDUlb~ioKaaPY~;I5%_{B5gb?v;t_5$jURlXoS31hw`7=pp8^5%+
zV^V7c|MMSl!kKT1k40Sj_5OO?TSLj{`daHmxkt=3deTp~%uPP(C-kxWhwQt`MCKFy
z3vPw^d~U9a`~T#xw2C;3w|NOi_-1aIn+3aMCONoY`1eQb*NMB;Yy8#J)lY7@arw4(
z(EJJe%zqyd?KpWg{%=59TmFehSC}(jTd7U#(5tf*5)t1oH*N2`>w-rge^gG+ymMSP
zY3aR?JKk6IZa+KAcG0<=<>&_In+7hg^sm<BNgGu~6f>GJug-0lEo#$$CcA+D*}9!O
z8`N?N^VWDJhVH*+p+6}ya%zZ{?oCzW?;Ux0N7tS&WL>g^Q~5-g+2;7$JHvAn?F%!E
zQg>;l9&#?4$@=frkJtB8K6U$YtVk?Auc>w-W%cc8Jd>ul+Miw;|F5Aq_xAh!Yh%k-
ze4nRuN>1&^8jDw3xz=5mHkr$LF3VCgt1EAPNUs0fj^&O{vgu0{Hy-14UB3D3PN8ED
zi{5z%l?&(E`yA(D4_dn=)5y@?Qs?ze%TCkn-s%4{eL1eBc+8cbbL7Cv$wr?NIzm2|
zO=S9fC?U_K!J_81x7z0m4o*Uo{C$NK`;M@PK6vwIMPt*;+PQOQKDwhh>B6^nc83l-
zynW+*Xy@7;o3FFKskGkx)X}QD`t32r8wYpUWPVDX9B}p48%I9YkjD%5U%yp*D4-+y
zpUS;bFR9s97W+@-?Gru2%*M1seo|#gk;6A;t?v<gX0G2l#aDWMuwkqP`_0L`yyowW
zpH(~jVUgc{cip@yhF#MWSUvL+TZ1e_<6UZ}ecyPuGR*4g|2N0F{utRSXt%CY__AN1
zM0$zG(HH!y<lor-T_$46kjdeyJ3sBg*U8T2ojMDyWn?)%T5G#Scf!hqWmoTCa%S;e
z8BwEno%inEca!rCG|%|mowjo&XXgvk_GH0%imSUP&w1-KQFZ?=CE?^WyX`x-`pWEc
zE6n;-@%+^KldC%O-h4CuTUm90|M#}d9?WJ{pC`rqcn}|MZS?JC^P|wCQgb(`dWHoR
zi_B*Kb>!YEi)2Q_Rvvd|jtfSgbut<qR0Xa!i2UBQNAF-jL{<O%Nw*t%-xcOODF4bh
z<=6q~`$|vbPkuaA)b^TDqI_pg$pJ(C<9bETwvv&CpO|euMB-=Ns(yOB{_p<H4iVOM
z%)6bOe%!gTcufUII*(ATv2fmn=*P2GxZL|G_W1awrKR_(9`W9qs;FI*{itct7XfZI
zzxch0j>{ctZJ)mue4n&V?n9YM-{;MfQ>@n+d@S(_IqzoBdvDj5>~oi8!yYrvXXI3y
z;CSPBnfo^dLs_?!vfb%s`rJa!H8)#t-)jF`UiPkK^ZKRP4s3dLlX>~hyuA18PkPb&
zSI4JFaJxl$_?a)Z<mPy}fSWVZvB%Rjxv)rJ$3@9Gvu9s!P&zFr)_(c$%!Ajql|@>8
z=j#>r<7ZU3;lf<{>$g*+tiwFER}&5=UaiqvCCM>uO{B5AtFVFZI+<x|vP)$z#BO4X
zpKj_99r!%#R)py$QPaED(aD02?-MsHKlEY(&lRs~fpfdJDH$h!uQ+jkXQAt#UvVoQ
zh;gY(O?-Rjqq)I~T@K6-H~2Kf*lB+(p25{K#q)ReC#P(-!28M~e3v5xW;E?N^0d$E
zdFS<+JXRK`Q+g(;XzymJinweY|F=!W;&$r`{>hOg>Fg)ZzOvx#Ua*&AR&Du#U$v23
z8U3p#-&~k|OsTbBAaJwEQ{AYZHFMI$OeLk08bZA9*H0<yS(04sI`jR@g1{LvIxClQ
zC3y4}eR|?~PufQGb;C@>HO>Ld`;1@dJZNaoi=XKK@1y<cqx}1hcO~z=t~l5B_>!Rf
zC0aSX$9CS#?9N!;C%e2sE~#^yU*sIgbf=1d_AX{7v#J|at^C$gzFqRYbNczQsD>5G
zz7@->Omt=V`A&NOapu~&pLCW5pYKYjT|BW{^H8CELc93+hmH@wMcl1B<9=l3hGeme
z+k6$w%&xpoU`bHjuU7hU%a&FDcNG8izUlXivAXIP&*I+^`EPDt+BI=r!Oth6i_hG9
zTe4X?a8lpC&6loRJA8=g`6^5INt4gKk(eldu%g;@K|;fO6IUCN2@#I#W+VwM(f;uM
z&=uxiuKU^kr^tuS)`<!d)4#+VyXM~J_m}=B`yFrnsd~<2Wpe5D&9fU9^eWvJbJ?wV
zF~_8(d-bMiGu3vlIQ{l^AWQwU$A<jX3SldCtrjs@e0(rZN58MzzRoB2q=>KiSHJ8@
z>08C~YbWsB$y4iI^QRzhWr$8hz~!zblejlc@$?EV-fd^Ts<CF)V%dis{ZZSm>(_2-
z-SWn@dV+7r<Qb2}?M*i1>^=5QxNXNpy<-p3Q$B3%s+@awx#`d7#N~1vIwhak_y0;c
zy&~-Go<E;6!Yg0*Y)U@*@?)aq=U>%5rVrM>YBDU63%O=)QrH<SB+WNTEosg1$s8Lj
z?ic>C`LEhCQ|U|GB9RB@y;@ACTbkd$a?ACI)TB4U;`gRrJotL|A-7z&`e?K4_1W#E
z+q$hflFMG(+3B$z_**66z1y}aY5%*t^?Prhw>gtI$4z$8!oa@$-|V<gmh06XablX`
zYPkFT9J#A=^p&6bguT_!ZJm^8UEW+aU#F(9HmJ5|YWk(X*UR3$$w*h28z1@1_w;)4
zh_xPidLEAa)7GRdU_V-IA7Ap}*h1#-=lFsuePt>qm`>4EyxMhRib}yh<IBQEHShUu
zx-PuPEXnYETZ@3BG7sw-ceCC1CbMiY;FIx+=GSRH{?78}EUQ@GJK>*A85<A3+Bbtm
z<Ay+jQ`ntPkqU0>>w`}?R$dSJyQlZ+&O<>*b>}jRFZC97*fL{j$b^XJnjc@8u3znY
zVB+E+p4#13ygC935|5^O`Iax!m|pj>S(fSh)`A;{w>NjWp3d3Tm?{t)vE^%oRLBd4
z(}%yZc}z&yxNwm+SFT$QqkqA57V$nV7M>U9*pxf9Sl(|CI&}A2EAQ{aQMuwDj(#sK
zeXYaRFj4!)1qXFwQ%l9}V&NmVll9BLe3`L?StH760;6Zd<VRU<F|R#KIb6ejYtOSf
z7jx)k(vKNW<X<HOe)Uro_td{%`DO_lSGnm)F4-Rs+!PO}8C6K}B(#71)sp6r{aI09
z%HBKi6Mim8E(j7nq%`?G)Ad_V*BbAdW|3l|5D{QKd#03XXV2nOAEF=CvhCq7o9C^6
z;?=33tN(SLu3?(WYA7W?e+sMbtBZ<XDr~KpE<ZQ>!1Q>%z7pTv?Fl(GrtUvn{Eo7C
zs~(Qx_*gK(cd7XEB}+F?XHgWrsl$?VgdyE^(PIB)a(9vhnOHjyu9la!jT4io4GQ_+
zcuv5S+cDz71o5^Ek#rWO6)w*Uoi0iV-<@SqzA4~D(#*rU`#ffwtlmFozDz0;?+d91
zUoS9zdsQa8^XE>Tj0aEenMvmgJJ{s^&a1vC$Qml}Y+-QCs+Hc?D(Afun=viZd7BJt
zE=!%z!9PW_WL=N-Yg=yGa=Unig!hSa{gWB^WM92&yuQMh%dNOXx9<^8#WjJV8=?Ez
zUS5cIZSS|+8+2=uPU8`Q*T*X3W4}9W@qJb5d-&{Loel9nzxJzawm6*k@O@LPqTEVX
zriC87Z;$Lzt1q2!YePV0{NGpaUpm<R+5VsTEypFV3y+`fnf=bPghg<*ZqL0%cFC_h
zw`;Pt-K-XoeK1+-u%VLTf~VQ1^Gd(YO;eQq$oC_ttb6^pZ1;%Qx6a*jy!NNCe)Ihq
zLMqlB(gweRw>|N8&}-Ir*ngQj_|1dkx2vDrVgKLO{$?6m^SZs&Wod22v9eM>j3sm=
ze+V^+Bs>&8`}WR*&}r5(8q%*ft(yI9L0S8CCx=w&Q^vj4It%lh)FuchP0)IFbm43f
z72Y2`3xc*SoZ!(G_|`#*<KpQ#Ru&~0Z}=3~otArZ*XP{4nr5X8wsSi-vCiwdxnRqg
zUjEEWWd{$0Z;zS1Avu8m6Yu`UcB_eh3jKnF8!lO`Of!DDrEck!1GPe3M~=$BzBqqZ
z&yKy;hy3F&?XUdZ|G$gP+`MM;dsgcRwWEJ$sqtjn{D_$ruse2bMZsqw*NfZB**{vm
zxp`3Qi$M0~)UZ|460c+yyj*c&;o5x`s=a6L{<`_sXP(T2$O3k`$cM~ZxXxKzx)SCq
z#VdSmGV9u{6=f6VzX{81uDxm}@5){>yXIXN!@pj~l9ErGUb;H5yuPx`e_nli?30NH
z*Qe$cwe&H4f49~A{?u*f<eGUB7EPKy^=Tky<_G3>u057bEYe;g{wBsV5B~l8>T-O>
zh6xirOsW?API0!V7vFOF&AA1ZXJUNPwma|m{+Z#=w(n=Gue7p!zW3*c0_)?zzd1eI
zrL4CxX$RjZ2w~QbuXV8cr9a`Rpq*5UqYG2Se8GRKc3K`xsZLFudh&nx{CXGZn|}Yk
znmll2=l9dn@d=r;u2#^}GHc7lINK~frtDm=R#Psq^vj;Vj;Q|K9$CBd^y~FI!`o_>
zZB1`*ylGS0w!7-tl|3qnP5T@!eER*#dgJu(Y^LIsf2HqV{G0M**{chV7mPP=TKIhV
z>T@DKv5dZ4&6l3!O}Kj0@K=tP_|LCrzU+AVY^y$R%-zjf7ksff_-mW^yzK{mA8~ln
z{;ozh{obzt@uNL441MW03{Hnul%=wBZ)i47xDwF2ZN|A7w}f^zbwo-@Df2v=z3aTu
zv;#9mJhn_W{e5n_z5SJz3-hi!Im({sOZSdj@%z<{neMk@>nbO1{`2CA!>^?&y&^YG
zY>tlqbI3&RN%`S*Z<4m1O*$Rn{JFjLXQkzGGlri$e{vo?YS&qF!&Uu=qC)s;*_SIr
zWO^>&@ZEY$N8{>3PqmV7HH{vn>o%>)ZjDSo^Q|l^h$AgprNzB;oo)6{36%pAm`|PS
zyO4i5@4&^266qUTe>S|!7l}6u+x*5#`QSI!o^6I))p;R}0y28Ke%?xQrf(*x3cs0h
zip`BFOe0|LEVFgNudW0vZ+q`iRP@4Owy;}oqF0We#K+CcVz$j)cz)Fm1<$C!=Z$?F
zlf)+FS4dm5vn_KC*irs{Zc6L(XIJ%8eq1y4et+^{!o4%EO=V^k-e5Gj)|H}e8mcGr
zN!WS&4#{ouWeI<?a#k$oFfn+sxoU&7di*N2Ljv=T251{zoOQ=>vrfzkkL1^di+y)Y
zO#ja0yi(OyVe)0=O$O$%vF0)o1^0L-vYb>}6>Hjl@!;++-TNQ6t-YGCDtEg4)xG!E
zZB5g-?90l^x$y9;&W5$?pKp59cde7TEMCvXs8L^dd2Lgp;3|K<=q2AL$eAsEpV!!J
zYZLRkSS<X@y|`az{Wbm@{d=%(&(E{(Pp&LppFL^*l$k3zw?5V3PY5|xFri`AkGJpt
z?K~p&T4lbeRZ{Omj@@nE#mZCWbGXdf;jg&1>H5LFRe#@p*JO!a&zNw3C3n&1PsfGU
zxja>H4L=+uV<EI+?Oy(mKezK|%cs0wc)S1lA-jVI+pg<OKh3_5OYCaix&7Z|Z~2xb
zPWsKM*6y_;B+BQzA9GVhv_Aj29J5$eu8!>)o8)*r<KAmNE8K9L@p<g&^<mo6@7|47
zY1dlSJYPy)IpxS+UuIsrSCMD<-&t#}dGq|{RH?m(!~0|Zo(`JCxby5Yj{7|i4nAFb
zTk^w-y`}T_oUmN}a^mhaZzfkP2{71vOu>Mw%{1fnC5faAcCIItJbn+$3wZlqi7f2C
ze6iZ8Z?1*v>d($so*e$HSQX2dy><7!NsgMua+lXLhS%244GBBbV|#8_h?O$`yL(UO
z<iGuWxZR%r%%c8R&#oN$?GeW|_ukSe6|Z{yXU>?XHcREw6|K^*j;9nuzOSBp^}*IZ
zylv48)j@wnwr~n6J8ZhR;l5N}o0fR1#nUg*_a{lu|NG@a;^K(nBSq(h1Ope<6?eNl
zUTfX;{pydVNpfp1-MDi0@5z?i@7BDW#XL9VSbmMQRoHpsGh$`&r<1yEjVithSH6$`
z%W8eGLpr)z$L!)Ew_dv)C&WG}nVN05#&nMN_Mu-4p~6`k1p*}ME}6O{ZP_*_EvRMP
ztBse}pZ+TyFO#_E<%(m^+B+*Y3BTBT#M5KaM!wwT_f)HreJAg`@?^oYvdJmTe8-|x
zXV01@+WYgFTH8rU!7j5-djYkH3*wV&mita>P&{9~eVv!t+*NEmdl+9hWo%&l$$7`6
zBf6P$<^Mm`DeG6h*{q$UZZ5FP{!~lC``K4EEDQACxQuoF>6xooB^f44Fnhhs7Ya|F
zU2!<}SN?7_U*@7`XZcHg=UkO;JD1RWbW-V!>un5Gza867<yIB88ON4g3Kfm`zH=te
zt*h2C!FiQ4FI?JFXL#~R&ti3j&TD0ySqr#r4_$d9@$$XmX@;G=c_vN{pLlGt(}h1u
zN!(kyEaL3bLy5jCe0gjCvPQaXx6k>zRQcu{rQMf)C<(^+`9<?xb99m{JM3gAd`4ly
zk;L~kUt&b(1guP%wC!!uVgFwZ$@hJ`&#&8(d*683>KzByT|RFA&szA!%ky?WPx3!`
z^78Yg+BZAy>@JK{b7#wZe6V7++!I-uB>f#sn--OQc<F9Gk-fS6#@BZ*UM*F4^XEsc
z<j#8cpp%s^<t=p8{pKbg;xH_oFk{Z157SD%ed!dmx$(Ps(Q$3<=%&86=iVDI*~>Vv
zH<rBn7PUit#lPE)cP2aZZ)j`ac2zPwnd!uySjjT=k-=x7E7n_gHElTWRy%L)+Y^7E
zeHB_)^Ziu5hG5I76~{MmuF;)zedkWr?rZx3kG-qaUA=Ru?uEMD3ZKs~bvW-jf1BH3
z_ugmTXN`6(HV&IM>D_$?gCh!^#uf^?QSocV&dB&ZpJrJqusR`aWnAsymzS3>*}s23
z7q81g2_Ypu?=5%K;;ZA<%h#nB7H&MX<mU>n>f-B#eJu&GL7Kjc4&LE;v1xan_d$X4
ztbfE>gO;B@xz21sE`MIlxtZR(7e~FmKmYmhvMXXLtAe_v9Q=Aaj|X0uk>HqitgT|3
z^S2CTW5sn}T??o9nm46q*y+CZE`IcleN~X^w%mrT(&+|Gb;1v3=kfnjZT|VOIAy|-
zj6;cHOa*cZX4TXFF}$yNHut@OfO~n`_CuoI7OX9gdE0c;bM0~G{rjh#x1Eykq_Q^Q
zZ??TL7q7xm=9}HR=AlZ#FOHpCwBU-^fzvYSon<^7OY4(G6?o=I^6c>boV;n$EYr`O
z9}=tf@$LEeTgb0OK(jc+jA4J$F;l+xjVi)tjiZa+6sle<+IYlI{#!&@-jo+?H-hyn
zHHEj^Pktype<Nd)gx>741#d5Zo?P_udA;|Eb;1YJ{r&srSd~WIukqctuP$`|y6gbM
z^IF9#118KoX(+k-|JF18cNd<r)sp4-WVof`!m0;(x1`TMYV2Cr*t5%I!z$x7GkzIA
z==D5$=6vMF8Je;x9~(lLKWuB=<jnL@ZzVU&>emG!D!gS%d$Yef?stEX-p#&yjwt7q
z-#1Tglr=I_V7r%Gc%uD?h48eD*JADpimLt-yi^t}%<WNGQO|a0&dr6|EquRj{?slk
z*lw1wo%!^xwh8l^-$_LqoZtE7^!~>+4sUDMy)BcAHF$O7&7H_IVLzP8FD%=y7CcqW
zO`@edV#AiM!^%&0sjb|=^rvFCn?b{?%BK@H1eJaIxWXmP{P_8w3Z)(OzwZBc|M?*P
zuVm)_%d<|jn#`>DeE0t3>-Yb)ojKn#iAnamp+NT5O=-3@Ooes7vcv5r&kooBT-W51
zQK@<ON&lHevsAui2Hm)I?PzJMi0l2%%a^Jj>Fj3x&3S49N7LMF>zk9#-eKMN(>;^z
zt@_83{K*j(FJ32{<$t_YM(hliiu{bzY=4a>eR#Hw@0^@r#?|JW%EGSAJ8v}maWiEK
z*-iJc-JyGUyI$ck?(dSU4BJm{erl_5j+?1{=S$9=e_rZuE75#&d~>p8Nl3GO`{x3c
zDjBicn|<RxzS_7u|6o<~29ETQMO&TU?wa>l$)O=7-958f<Ikb_3odjly52lH-lM3j
z=}FRyo@ADT_r&L1ZhV`#XU@TZk2_@*w@9un{ASB#)bUrO%f!>-p3dgr$vQcY?mT(2
z_j2}$8%F|l9TNQWUc|{r?>o-N@qEMArSD^Zr?Bro^!eV@?dPAZeVzR6+KIiluU39)
zoUE=Y)LU4Skd@>!XTo-^H3k~xVO+1Sr>U5ls_+RoMLw2_;4WFNsLLP`UzT@7p)@C~
ztb6aa9ouw{pWk=zz~2q)-_A6X*D<@6Q`EO+GwXzwT>YrmznXUNuh2QJH{n7}p69!`
zzZLAaxW1oJbFGYfd#bHB%zp7z&OPOCx4&|ZvF2*yZ<Q6ixzzJ|mD`-3k%c1Rx<A$^
z9&XCbRY+v}xj2-?xko%JYjWdt`vm7FE7l4A+xT#TYVey!K5L)cSj@Gy;eOoTv-T%a
zd-qNkTeiB4-Dvs3-R2tdZO0e_T(x(m&Xkg$ICEv;IWA$(D|hdDZgXI%f32-~Qpe}y
zBsrcH%eIz&i;CUE%l2(&&MbkYrv6b<i_R{4yVt$qTp7om&q;fh-A?7X7M{*_Z1QL0
zBPX|)mCR(~oy2Tm<G<IUW2X5gVZQ0%T)Qf>mx}fM+BHEZ=l!||AL3@nJ-(3P|KBt7
zN`rh({E8(@)ZTAQeRFL;x2jd=!Dq`3J$zPB?AC5PS!8XI*PhoZH?=0(JlyrlsW2|v
zZgz@$Ql(|IY0&Jm#nsb!7&R1*Hiz5abu7-0KRl7oezut6?%REnwod$_u%2H%LiGLx
zU+0BCPnB`~*~@+Ywkr!uNPDGh|K%&qkIN(9tStM`y(Bj+DP&#!&y9cn$^W;W85=+K
z`~Khg5sXc5<?Jh`vHw_l|6kOs-E1mi92<pu9<cxTxUaF;$j(NC|J~h1JWjQH=clMg
zc<kABJN0#NWMe{YgFxm4)+yg31Xqi;yC-bhd)f1u@7C9c*KClzR%^ND`oSpEmZU2F
zUnhckX2wo9edN~fm*v;Oc;-k3OfU82IJjxs6yK{E6RcJhx3>MfI)P(@@kZSbE>GW2
zp8waQXx5G2SrhopW}dn1l>X*It<#0Yod(Zjl46(72nm^&@a@{X_jBZTp7Z5=>sHAs
zdH1N|tXI3_pKx9I7B%_VwsTr<_HUV&-acyu`<v{)vwyzi+|+ewzqRLufJsZ2rv73&
z_ef!*{+gG6i%&kf6EaojNoDPhyYG%4GM#v3+t)b>hN6p2vRAL3#pAyA_0`%P)0W5t
zd!F|**i_uIY+>LtHMtW<ek|dclQ-q!?fIvVT*%!Ndi`B<`mL$=k2BBTEOw7w<WTcL
z=}%|h{|(>L@1dfzFhIH1@`9$qE#cJx3a`Cgj1&#ZriCqi^6BH91M|*jZ|Hj<Qpo9Y
zvUrxvCXa=77t&VyXDM-Z8m~WpCeyxu%}n-^kUQ?%^=n<6Hdu+=j4UbZxI4G~e7wYN
z*V@++#~DmBR&QIq&7|o0DjlD{?<R=ke!tuin<XrL<`?h%eM;H0W=wc{SM8hgB=?yc
zK1_RLeLX8VQbszmyD}<Se|vrLG=XoA%yX6`>~GIGdMvB&TWeBccDTK?Wy(DJCd<!@
zBmPHynst1yUDC&s?B+)vnhA-{;AY=aR`Q}R<v_sd{qBPD#(O;&1ijCk_j?)F{4IHJ
zAn%Vai|0q3seHZW+hf;_86AdEvu3NzJ^88HI63@yZ})-JFkWGk9p`Lc<UcrYQ1R2A
z64vZ|g_BAaIWLpDC1W>E{bJMVym5xb7Z2B<3#A%5(Q_AfP2IcOV{-Iu1*<Hs+BJ$i
zOUgdnez1(&sO<Z!J)hs&Up=z?W=Qtec~@VTDk!E{$JzuP(^*o>drgMrU9Q#Kg@F~X
zWcMsTAbh*OM$b3m%qCOs!0ya%0V&sXw@zf(xBt^c{+mZvTs>KtGX3-a^!I0*q<z<G
zAM9?G=9s{+vEcsoly}wFCT(36qBZsOq|}>5yYFthefeER`FS7rGpG0bTB@v;l(b0s
zkAd;L&Tl0p{ibnGT&LaD(p{=GHS7GT+SH=^;sPw?3@RLFY@h$G7f3PMJY(sZlr+x?
z5+{`$8UBB-zaM+v_IYEQ{jt3klM1=+GcnE5?A%bw_jlHlOM4nOM#VZDs*>r`t@s;z
zhgaM3lWmZ5jrp<2l1=yj9=z|JeO+<oy8MS$@pk_=e!06(k=J*vP`@kZYu)}UPbXRU
z<vxgOUa@53%ulTACKYM&guFU`>WW;C=kbk~A8G5WPpL7pI(%f)8k+;}7oHbgnY~P>
z>Gackp;HY6IC55|J+n4C^WyE-gl~sy66#sAqkEjUFVNo?AiH|zIwf_*u!f41D`Jxu
z*;=jTyqhLEcN2qHv)-gn0ZWcK^nB__PdKkMb!v(zYispGzJlC0^Y?NqY??FGMO0j;
zStBM@^>gv9qde!$R=nRHe@WlEEn-3MS-sYGqAV;cmMj*YSkEVWZO*GZZ?;@yEAD!!
zkR`yrLRE-?<)wsk!&!&p?C}mlk`*dB2W~yy%`@M$xw*0;ey5CGZP=b)@6|jbrX3Y$
zoAi3t6BY5L^$8x=%r{-SR69xFLzb`7#lMm=5>rmg??3GIH*SK3Z3p|C;(hgwfdyGP
zGdh}I{dy*|hW~Dull10Y`3^^>`39@8?PJ*JRFoIT#G86Yf5L~R{-gJbSNb}+&-(n{
zyYQS;Q>O5T<g)rNt2eFdyzrx_{=q_3js8>T54=n6cagG6dGc&|kFCM>*&BC=`q(`-
z2onAk<5AkMnOT{+Y%^o}=V!~`8*Du3&mr&bdph>LcJKP+$;w8ix72yxw$EtZ@M6*|
z^UNa7T_4&Ktrl9cf0He_uvyR6oi%lm?uUq7mts<GnV774V_B3TbLjj5Jx4Kie;${t
zuUj8g?K?fML*j9ro$@zHu7k42<EKnGCh4Gejwg0{%PpmnZ_(dmr~X<uS?5t|)%r{O
zLRk*y{5i<qtbU|(rWg;`<A7g=@gb4=2UofADn%cOj#?ByFXocFMA*c3=~<ggcZ;;S
zg)#(exce|c{%z9pBTKJVtk*kJ5L|i6St!R!W#%HTSNw~D_+^ZErmobP5y_ZT=2$uV
z<_T4o`K7gd$KTB>Uw_>1bGd<zuyU=??70u0w=QgRs9kC8>?vqv9uhZ!CDnN6k#?V@
zRUW^8{Zd)?{lwD^pO5g?J&c`p^``UYBV~PSzO5+cW=wju{=u1+zg6#;j32W&-rIea
z&#pww!K-~u_YyH5a}gH?u^NYb4OOF<6kAir3#a~UIimhc=giK>b$hy|ObgGswAEgT
zIhp-Sw6LpqqM7}l-}%ya_T0-aVeq=D!Sn6w3(51R4la*-YWIB31lGw%|L|*E^*-&C
zayeH0&LRilgW^l}C@u1Q)HUb#gV>)R((?=d@t$`q)m(Pc%OFTMeg7xlyUYt?JA>b=
z%$a>(@Q>2@hQRH<?_FDOh1KxSRf*qmP9*rsIu*v{vm_NKKeXZseyqI7LjL^8dlR<m
zZ`Il?++5OEkWo<g@0FM)_w{E&Hgnc8ZI8b9Z~6NT2g;w@-OM(#VxMe&D9mQxZ<}l9
ztP_@*c`071@mO`sf5O=t3y#*WjGPg@JtSt%$;e=)Qz<VGJK8anH1K}ju6axScspnM
zF$>3~b)i>H3@oF(m!4R~t0Kr{t>JMao2T}$&fi0m_xf>IMDOD3+^;mpTHB+6ot-_k
zu5R9c-^hk7igTkQ1FS7foubM;N;W*Qv(<g<yf?b$&SZwyx8q9Ay+0$#_A2z{-nz=-
zc{iIjGG|WF<jiE4<UWr%Bc<ltq!|XW2L6Q$f1KW<qIifW_*&AWmh(r8Zzx`F(Xh+w
z;CdZxb+fi6;-rGrg6{6_{v-PpBv<CVnIgRY&$61g{r{LRdOlYETea6ax~ukH!q$1G
z(>5h1@tvzNVXtN3())Y;{M!|_KP)DT<k~Yw+i3?lXM1kCF!`v&i|J2vw(d7~*dfOJ
z({ufo_}?yhnKqq$dqq~BKTxM_WR#S&P{?D-jL7pV6%%YH3M9RqW^!=eTnPoi=v3$1
zeScWvIjsA?`lzPvdEceh>{c#mJXQDY-J%y~rY|Y{9~>0$Xld>Ixid|Uvh+`n>V0_Z
z@1t&$4(p)XI;nQ@vR_VRO**N#NT9<yFJhOgfc>%V4Tpu+J<nmZs+;U=ZoheP(s@_M
z{(NiaM~|n7C~aPL@cI$1sA`cfV%sgay)}IsTEw0hK7GpgaoSIl$S=Y2+Ouce+3Gee
zx5MENLqzM@O%?m+Ur&3nC9}rd+}X?S=f(0R8y|15NJyD%C?`}>YO#6xwdd)V8BTOX
z^wdbPojCMmgVkY^)dwEF+F{}4qol*;;bqCUVdAVKJ8y7&5)=EhokQ!+(Rng&POq(g
z@@V&e7p0~@?-VA7u?X>Rw4P!7j*t1gbGmi+5;;-TY_=(zo2E@LXnMc%W1O=|v&-q_
zok@-fn-}ftW}l>1c_eo2*RLkRf8KVQKG?a}T<_%0?{zx<`@dM-jAvAolYTeZBUgL!
z_12kzWo%vE%t0?cUXrYCHVt~idm`oh@ieyzTUEQg>n7{hPcB}-QDwD@|MWiQ_EgWg
zFM3ytbFR#Le{21@wH|(RYF+RBdN=?5Dz4pg1&-TsTeEtnJPEP>tnlpnw_l9yqU+u(
zOi^9ZS>o!;tv&t45r?v*O1rcN=~5Yw=S*SO>S<{@efBp`=Jbe?W>@RkwR|n|8_uWx
zGWLk@>HV^aqxj$9?WqsGl{z_YTmL-H`0c^K#oAtsuMa(v$^Dx?KUe*Ep20GPy}=WG
zZLh9jm2?U`WAOi<kkPKxw+ZKsURVBBIJ}Zw<d}t&gXE%~Gk*R?nyc33PPybD%3M-n
z6!61&qM%RdzXIOcr*1_vj|SX`JhRB=Bdhd*kKQ&q9sNAK7nZa;B_3KEoGo4S`I)ZJ
ztCmB@rXNbveYG|Dh}y<G>o#7{{WWds(H%z?3yWo?eg3F&;McbD;!h82+03e3=l%U8
zohDY38Yv`|U(w_n)bV***Xri$5{oTP{B@gHvenn+e$JZC(-TFPFOOlao&2ETs(|q&
zvpfC!940F?UpeWuWZAr`;~Fj^b}cTyK5ufV-&Y%|wU&LpQ2c^P>1ky(4cA-Wg|4)p
zQ!RH*E8@E2Oa>FR2ht5e&eQ+>Qn#PjdUK`hR`&TzT39zG?@JN>)VFY+x6ii|f8t(<
zr<eIYQ*V3n?d|O=*IWA?($CAUQ%mG}vccdOn`fVl_gYh?$@|~=ePwsu^<3cnkCM64
zR^6JVm&(5;i)~LlzR#o8`AK^4;q59`_w;|yuj<|SQiY5Em3g+ce}Gg*UeSzQ4?5Zn
zo$U;*JakV;#ddc#W;-y?=yPn8zMy>Or-a4BA3s>qPd=z%RAmXC8}ZAyBJqyG8M$|5
zj^@n*$CE=3ZtXQO`7E%HX@4w3uRgB}W9b3Kp0hq5ix+bmE%qz+otv^CYVv|d4JmiH
zi}o}5Y*YAs{<A~E^#0H3o0c6^Xe)95z0T7)cI%q-GcpqFuRKGNwA7pW@~?TROfK~0
zzwC2Gpkn>{tcG`&4zo6iW(cmD=>C)|ltqOr;kegwofU!$vQrP<c{({STK37+{<@m>
zcMD{D?79{;95(u)@Ly4TPUzAzQJ=%VZC=K<&g1^p;*y$D-&~%6_s`=VeHBpHd6$*n
zrM+M~zkqdu8#7Nx`5!<2Z@csV&E4|eUTNQ_29ejbxfxmJk1kI$o+tfU)n(VJzZQwz
z1*f_%8XCp9X-UsaNk|jf@G?E_zj)E>%iB}qgirp6@tHhHLveAOuUVji<02-ZhJW+2
zjVeA*dg%~#$w;ApqiRH1QmyMj&gvW2tj_o=e6+Q?J|nd*rrUEjpWT&>)2FekuJBA)
zprjJoJNM0@L+||fzGN8OJZ#$j__K=F(q#*M|4ijou{$*Hhzv_dT0;2&HSXun7o5A^
zC6d49vY-ot>r~!DyY%*aUo5-uPsC;RwSRwFI;k8E^S$xrU5DHTzYUg`nWw+FqaEF!
zc|qjPET3l?Z|Z;Es5{TOpj=EU#5?YzP(bRN^;ef#OjPB(n|?4r^}Ow_jt}2O=3W0A
zcE8LaxAw%GKoyp5!<n-sRDu{jAM=~E#^R~xUe-B=Ss~Vu&(tq985g+5ot)<8;>^@}
z{NCi1D>Z$EnzwyCFPimhU5&@>&WNm{9n&}Dm*4yI!0$xI@xP5NdiT>7JIKwIn%=rI
zl9T1I3s2+94J<|Mk-gIwT#Q(tzF~(G@4Z<pPJ+!cUh7Z&^6FW^dcf;r*No(&^PJe*
zGZ-_XmDgP;?KY90^75Z|(9J8lXYZ;neSc}UkWQD)2Nm9r=MKxo9%N=+bM5c)B_ZE0
z|GA=Y{%TCgq*i<06&kWB{m(a8F0>Q;&pYMTshTM-R154G^mgrK^}pAh>$?B={tE#s
z>}>5jH7C5d!SL|fi!J#pcu!h*AAK5o@pDF3xW(+LU)Q!B@chm>Bg^)w;OY<4pT1W-
zmM3d=noUwS)ZoNrrX&-$<cJ?9Uq8P$ZRJ1hpa<)JBuQ4^wO?AbP3&1(%8y^|LAURm
z+>;mk_R5(Dp&!+!Ee#NUa_rpUP5W%rA1AYI>uqE3cq3Gt{K##a-Tn>d?6+(@^F#dL
ztz&FrrE@pC@_aJ5-*l5H<r;@w?7QDqEoA~74*a6q_U4s7fA&!2^eNYgc@mFqM9wVC
z6fkpZGY!dTdZ<+_=lN*C_4hhS;(Qa>58acQ&zry5(=n&*?D^`q-(DZccz(FRm)%Hl
z{=XmVm%c3j-<xypt7L}zwgc%$o^8HXy5!l{&+9#QY>IN4y46Q5U}dLUdTLyAeOQ{w
zL(SDWO4hRC493c0KN(hqYVb{vi{yFp?G?NIlQx}w-sK-ATK?cw7Ef~5SW&QkmGNW7
z6)TJi6teA;*&kRvIKU%4zxee1Jb!b}ldOWw5-+usV%S;OUdA3!lW#HJ?CJQS?q_UL
z^;|{2|CitYU;F3R`@hyJ*JdXuZC}H9`qiSD%4_bHx77y+<XE-v`Tl)utemCbw&ddl
z?mcxS><f~GSG`WyE^wju<VQm%>jt?QmmVm{&7XSsxL<IBS-@@0&A&E>cDEc-+j~<k
zB4@9=^qu3|f}NYPouzV98vlOx&oY{^HDX^BzwOy`-S$D+>y&~eBInFjlVsh^xy!|F
z{rncOeO<3)vh|-CKTlVa*s{1f`8;QWnE>l7SKlie%P+qDR&km`n`u_E^~}k!6DqHm
zl`sFkEBMH*S;x;^SKYiN==1KV6<o}Za{l<29ZwN{{pyr=Tm8g^izBsXx*51Ud-5l#
z=iS^;UbDp26M2~8-h8aEWNNst>*~J3m!m@3BjbXmPTPLwT}}_!mZhX+^(+=q@h%jx
zy{OGPJM{J?*V#|_SuD&Z>v3_Yxt=m*T$P(4H2s$6nwPD`@+ZC=+0l|c>qq%&@6SEr
z8{C4GYom8Hn=N|ospP(~mWTU@*c+MWS}Qw0eYw&Sa;4nUwKtmSLWQ=@1qr3pWBi-a
zj!CAJ=6%)e<Ndn+<c>9JLA%y_Y2I!u?%l!FxYs<u^<kCG1znzy?M3?^u8!GUkRf#M
z$CKk?H#;6LyuGx2<N5%J4wEgx;(lMUmpoteCGN+{E%Mdp3^q7FmOK*ma~t0_|5~@A
zOuw)sVI%8n%j?T4-FLj0>=3l&^1e+=;}gDzi#_kmTe)IQauK`aGNazZwT&FLvnTdN
zJdfa-#~-1~#rbBzq?x5%_nYMp1$;><?qyv5)#h0CuU3ij`yZdDl>Im+e(v64#fx<>
zc)A7h+}kn?N}O!tl(!2>?_T>{SEF>6#<#d%lF8SWeft{}d0XW&^Yob(yFa&UKNK;V
zrm<xGnfb{J8^6hDxn$gD3OY91Kz^y;`M*gU1ivhNwg3CnS8HdQYMB{$WL$jw>ts{w
zD&~l-SyoF_1kN2)+AKEZQl{aCd+!%k2(aH+_bq?<VpoM5#Xp^A%2bCcUH#g|DQ5Bi
z(Fd__w$Fb}N(t`Xv}M)o<H36K98A|+n$<?<#r<)ZCjRV3Q~vGxIU54P7j(qBs+@ii
zwB}{8xA){JD;5N@r~XTd(X0Q^JZIgRZwX%lCH40(n^`wKiMi_WUQ(-Ao7-?Dn@SL`
zpYQEJ&M@=K9Eojar@cN(t)A-Y(J=R%ZsTgrj3uUuagPtIGyKsiw(!*A*8;b)JG8#}
zl^oGXh_U>>uSC{L(fz!Q{{7$G_LC?6oBip{>iY}!iS24-ZI!zj;oT9;tJkBQP}BYV
z{`5xa=SzNHnXaK=V_o8VjJ-PL!L!QDthb8{kI$ShA^WH%+91Z$XwkoYaZ>l%YSo{9
zTb_S0@6PHEiQ-8bg@GF*mu{Zh66?Et_Y41`fd0?r558#IxO1HA-ot36mGIZSdc6d1
z$m-oeq4%9MMT+-E&Xj#WePQ(UVq-InDAp#yb0rUT66YH43TL!s(s}vqYH`u$L%(b8
z-F<U3`R2hQ3(NhyFU*AO`t8psoV@n9>8|U94&&|w={1Gl)71W|PVC9$)a(y<VY=aG
zuWxk+pL}QSm1)f;Yyt)Kt&-dhj+~Fau2{CXfpPzXZA`{9F14_|SDBI=ZtZ=<DRJZM
zobCQe)5RLoHf#!;JWXLH*X1Yf7mT-Wa}w#vXbQex=@S#VxNzH+EnY9~PdeuCRIFw8
z+`dl5U%uDPI(|=f`nB<I%ptqyhkqA5`&Cu7<nI^hN1vq1+&`#Wa9xvVNZWAS#Ij`B
zbWc6!P1Z{3o2I;8@a0I5&v(BmtZR8rEHJs}Bwl4`HR<wK)mg6Jqk^9c`U**zq{Te=
zad`4G_8sfL@GRZzCn@_Xb<G5?wce)}E|2tJWG-Rh(2iEhF8+A4(D!Aj^J`(9i7)Qi
zuT*i3=B_^%V_0oG@#ca#m;MFoM^1kqvVZ0i4dFL@Das19Zjr)w^<S?HRdN$pywp==
z+Cv|czpcK9l12B5Em~ZYw<B}Eq;-V1r}y{5ou4jq?EZC*U8VL*g-VNbP~1(Gv%mel
zx;*wx@$uQ?nctC8k*TV=@y7z4<I8vE`RcyS`pk62$2YUjU2?0Juhgcn&?Gy##|8#W
zF)UZOKO3G~nz&!-G|TCXrW?<AJC80pV`uL#*6sW8LZ|B|p4)esvZSB2XS2I7Zeqzk
z8Oq1lyy@Cgy+>!3u;0j6>vXf`77b@9JY6ijX^rEVxE!tB&6DDDH}VTB=s&;zzjM#W
zwe}b8-&~@VmM3t_fzOxC@h$h27q_aSCP^_YSk>+oUsE>gdPg4f38x1tikBHAm>*{E
z(r^2{-n+=P{@F(_7ukf|;^`q*ww?Oge}7VBY1i$-cV@=Vl%u6tCbX(P()l!Vmfkws
zxf7oLjC6|istr`zwqt#qZ;RQ&>_|4R11p?2>^l)%*DidhR{rJQGp`Cf_7`+;oIia^
z*_-3Dc1yX@xv1*6|Nr~zf2Oxc=Dqm3|JUvRi>HW)pJM<2_V%*JvMVQ^3y#0```W_l
zx=1y)d`b6~tXXxUOh(J}o0hQNEoA8~n=W6?z{l;herc%etOV<&&;MBOd7s-pU-8J5
zz=HA)^+^#Ke2*A6Cj3sUpI>`K#g^Y#a!tOq$6w_$zjvB)Y;t{WSl?@TdrnHX>j&o-
z8r^}Hg=A$Fcw_>kN*3K!*nUan9?u2o6QVMz58eekZ-27a{Qs#5A~~BYBit2?zAf@D
zT>t%XI_v7E75zt+yJsXfhD1irNL$ExH|Ivmnc4@XJrWz=%;34DGc)9T;m-XA)i0h$
z7OxTZVCFilwS65k*Mg^tY+)b19?jyPaD;)$LV9k{|Lw<SEZDK8sdLBvRWqw4=Q^>3
zb39mB$TfSzn(B(Wys(%Fi4{)i=84;P`|VXSl~pg1=L^(6|Gax+!=#NDOeV~5TEY2+
zCq=DeL4bTj)U;E*?hYGjck6wg%<+1&{Es`@l|Ss}tbcK2!IEi<f?CcgxEXNOY?@Yh
z;;Xm3XKJcTme%36KZl#d)F)@_Ea<-7^JIa7wXNm4f6KjU4r*<UHc$ESE!C^!$m8$~
zWyds*X}<oIttIoT0_}br|9`0EL#Owu(!B?sKlnWLV)~-rJxOy9OKm;0PkBvQG-J22
z{+ldGYx`v<pZG<c^JntB=*NFV_vd51j`?cs)g28FORadN1PeWsHtKZGx)Qog&QQbD
zHvR=iQVGL8#sK#}w%wo14qddmJmav7Og_g~-j|}+u1a@!)E*DqS^7@5SI~Q(MVb5_
zrVAbJ#fKR?)&%?2{)`rq-m7}~vGNm}m8;gP*H~V9kz~mBsi3?2bC0s2(TjOk79^)u
zHs1U`>mEyq_l5%n3>;xOW|}2JonNob7MnYBi<R*A{gQ9_4lI5p#uzl6zj{OTwKWfN
za-JwONvLg4ml5vXyu@JpbM1?wPoIUjM~LMGJP%(W`E}9}x4d_muD90xYSz{M-{^H|
z>u32>GpEN*|MZH_(^_HvM6u_$7F`Tx`LcXLNOReGk>$@*N)7#Vta&Uao!sQ0s=so=
zqSt)yI724$?tU|CCC@9nh_J_f)9lht71-<V|Nl%jX-~CdisP|$4iR_udGTGbx;E|0
zt>;VEE%lx@E!=d&IiV&7=ip`6-HSxK7FzSRTzR<Xv6auHrzxT`<-7mCI<CU%n0`#e
z{M#{u#oig};nB>3=IsCf|2qHAWnR@+^QRwf#wRireg0Ej^!t$i%n!;J{Pd2dEc)J*
zaxLuX6Yu*IUOlTlb}{*w?|FMJM-8ckw>X!#{jPAB`=zvYZtD-7=7qD4@!bvk9HTtn
zUgNWIa!W(bb?;5r1&>LkfAUn0+Ob|ixbL|9w8Q7?uD-g;p_r;+(eO?3l6n&F;oBL^
zD$kbv7MgnF%MPo<p_$etZcG!cE^A)?@3=cVG`?AObHQ9sjncpO{vQ9|f4B4PQHk9O
z%`FA%t@(bo8VfyM5j#_Ims+v0@T92gPgr;LwCdfG`NO9oeBl_kxvaq92|I(8UTiU0
z5tI^Qe5Oe6=hMS1uB!KnZfV@!KJ%s&^F(&81y0{JPi%Q``+x!0CT{WEIgR(ybPuMl
z(ckif=VGh%_Vpdh7%w^-B^y4oi_B)Z-)8yY+TrxdvIYOAJ^ZS|xsdfY->&7{pEny>
zSuJbKX-emd+Mm{U;ixGi^M^ZMZixMyTXXk@`q^VQKiD<9oOtr?drgj;*mCxzt2PBC
zFDhN<Xth)C^W<71;~HnLd3BAk>^2XkA3JV3V}0&5+b3oxIC`Z8w=BCdz2QQ}k872$
z?Alk&_IWh--h`VkH9t=2onW)-_ml3Tk8|r6_*YHh;`7LJ_;PjAf0o>>6Stg_)SV~#
zMp@;+?YB~#fnUB~l~qsq^2~Ckob*2DYcD;&&Gq2;Y{@ubMuG|VtmR8n8Ryym@GP30
zQN-+4VSGzzPIy^n3>QnMZF$zN_C^1SI}NQ*q!<)6rt#&-e32Dg{j|&U*FM?f@e}TK
z+i$k{EZ%Z5X1~B><FErAN82VQD>biprmNC&q|TUchH`#lujeUePPOKW9gC$Zc;f2%
zRfOw&yXL5zFp!;=5bAucQ(EzGk4~l;XPBXb@cZz98|y;sU-Z^&zh1n-X=;k8(&XfW
zCEgk$kM^s`IZkD3T)+NK#@Ce_nU3nKa>OiqbmmlR-Qlw@^`885bUIRb$|msJ-WB^6
ze{R!?t1IXFp5xhkxcj;N)bM?!ZktXQKk|6#<~jRR{<aNgUP)OU4Gwh9vH$RDWlGZI
zy++!9-b?a&IeIV~2zuyk61mP7>DcD6W0jxR)q=&7O>R|}o;KL~*5w=1s<doX%WKn*
zPMov2Av1D`*Pl?mQZLTP88RtBGn%J9<0)lS-0*XQNjod=G23?G;%7H_jn}LZPTS+|
zC;eL@ovV0fxd)HKf|&EB5nGS_TEF^o?iA(o^|4J4J6cw~O0~3eJ<RP~_@p&ops8`E
z7u$_j2M$Qw-uAwOjq$RP*&Tn6%HtE$m#q8TvZK4U=<8y6!C4IEZ?)H-SR4Ae@$#$-
zJ%$eVJ=Gr69SNI%g^yRJD)zZyWHh@><!33ukm9(2=4DAi-=lNNSLD6=ZoIhGNW9x9
zV^ee0ov;lI$z`IUK_Pas*P;%W{e5t|UTN=idj;tae)CyfoA+{f6~Aw<?b;d6+h^JQ
z%z*P)#rew4^Jl$|DeXwQe);j_u3dWG(pN-oZz@kLRAbTD>f~#DW_QvZMyuHk#s8Jc
zIX>qx1j<}6J#01Yhq9W%DT$kkH!S7^I(!j``1n&*PK<4$Mq=I8eQTP|Jl@c`;Xfzu
ztpsMl2g@!;el;%aetI?4QFXpa#Qj|*a`h7@8D!7tEe|@RvU%M;0i`c5p85NoJaUBP
zyvn!r?z!R4wQDQ>PTjQ1GB7DKu4;Xa%4+RyoBrF~_x)cTZu@?dLu68~uKpyC6}y(X
zUC)S3O5Q89Zq3By^Qv9%RehF!a%kuGr*FL1KYhkOefl()W9_MWR;pKZ@48q!9GCj2
ze67y)I^Ra|n#uM-i#NJX&`>tfY`DS|YJOthV*k?*zV^RUSXDhoe#Y^vmv#p$HnK#m
zwiNueR`Ji>9b6xTS>6XPX1+4<^!3TLlfF+~>)w;pe73%!w$1WTMad+AH#aXv&oS23
z?U!gZ_b!>&8vJ#&gsj7xsE8=Hw(98Xg{!{X)blU0*|1Dmv8C5};shggF{}0`xmoA6
zO!jyB^5u3ul%LL?RCVOr_vR%>-bKwd-`J?V`s1NvvzElF#%LRK?phPk^X5X;w@W8e
zkJT*vrFVIvTiul#mlTVWZH<i0R&a-FO>EOMR$s~|eN|@nDSivieH%g*70xdBSUe%a
zrsn_)TlRA1rtg~C+Q|oa9=GszoLlCbn!lp`?1Id~&g+YU<EBW9*QGrxz9P72*VQ|f
z9diTA{XVN4W<A!{yt&juwmNG|?!r%hS{ROfzI8nR<icQm15KyyyYYe|;S>8$D)4z!
z<+d6GIBfnf-Q!!i)gFmYzOVMOH?nFi`<F1oK=F)Gqc2bF=G)<R4=0rDd$>vXn!9Vt
z#Q$<T$|bVePiQK?Vw!v)DSorn^3EWoeKV9dZBPm_TCnqzkd0G;uEfffL6#;zKX%)P
zoIPbUM@+>c$Kq+6&4&GfKTfpsJwG?wYRQWu8}@v?Uaz(Pr~M!HuE%0K=Ds>nEy3{c
z*FhsziyL>IFmTInoXMG$X}Y!CyY_jZ)8aj|KA4uypEm1R?VNh<>)TEoO!l8R_1eQN
z51dyldA+Y8q4;y-@{|Xss?*NOoZEeGxqeEz+gtTXjwKv|9E~-rC0qr$XXTu}^W^-m
zg^xOS>MYPt=)cp)bZbuM!P!d=>n}^2-|T3~R3Y(Yky3xnuXFcLx99&;&Ha9N)t~w9
z_ntY<_hxCxoBnc%@rEnLt&ygeE=051b_6re;wxIuQ+s;vB&*Hm1uYsn^|M*MJR-Wd
z?(7#?GTm2`l_MrOFD3Pd74uS|`4{_+dayiEjo`R!8!l+H=$!H7WF0l%{x6=93QGGN
zI=+d-x@PT|<dHMiDl7HZZl?)<68@bI{opb;cTO-zTe(d2xk&|uQ74Pkjx+TXKl>=+
z{rz8_Z;#>ktqVT-&-`+C&#H~B@k(1|gCh3C=gs-QvaxkH_qI8E4;@mUeM?T(FM50L
zk)~Jni-UzH*_O0?vs<x|VN3UQvon>gE;D5xAAI-V*Ym6E7^lgE)i-bM{c+IoTqCP5
zhxn5hpZ9Bh&27K&w{ic9tTzktoBRu{yOzE^vDv8L?P2xhCl>rxh`Fv+`nJ7ejn>0k
z0vuJ}6Ygmpx_wk%-81!(QN`y&V*fMC=gwD|v}pI+)iU1uwyt01p64AJJNb<N7wO-V
zBBneFy1b)6Tr~eH`!tgocV(~0YCK%l+>^~Xkww{Pmat^^93De?3rB;ZjeGW}Fq`WY
z*hz6de4Mep@Yy^0*asr+YN{`f7H-<MNK<H4rs=KTU!OPrlk4>BdohzYvSU5V!uuW_
z-Htg+o}a&a@1o+y&c8<TvzPjLE!pN-6K9;ybd$BCnQ7M)50y&h?Ck8NJ9m2iVsG2l
z;Z;9x!QXi|-|20+o0C=Lpq5xO;m_MI8(0k|&bjf+*z5}H$v*V}J-@RnCUPhT9DL@Y
zY9O#~THCh2HS#JBljbg+u_>|j)Qp+a)+EN>K7B~Ts^CS_v-P5@wifcf(ckmA{8HtI
zC2BmYZ4{n9<z2REUd)u%nSw$V4W+`;i+m<Gh1%+@UajrMeOCSf&%)(r49+vwajG*M
zQe-KfU~*t9v)iTh>^bTk59aY+S$)vK$iu^m>B7<#J8Wke1YWpuaBIYje(#0(j$Wq^
zPuj-Qe)r)PW}h>s82wbmqL&z6+hsP3XVP51^PG~Qn`hb@%k5Bq!Q^OD*`B^(_U-DY
z&ZVp5y_ZVe*?L6ieQ2huDQELC_H`%x|3CY`WXqYA)Ay@+axkrS)VuDoalsMwiO-mW
z>K{lt`2=27U6OCAcF<wwoeRJFQkFW+wV8D3#~jZ&rw?zvbfea*ZCx$PuDS6NxfT)+
z6G|7Wox5A|DSM^KO$l$Wy;+NEe0mDD6>)NZn`)&!=it$!tYJOMp=}?<moR_cHLv-)
z{lr^sVQe28%$*PO&y~M(+5G<>|B7qxr!gez73(i_-M02<>FroH4uRxvho65vajVKL
zOh|Kel%7p}<m!O$lIzc0=e@E;@L2yk`*W67kM3zdfA>Lo{{+s3^L8uQZoXiut)n^l
z=S#(zSC>pM_+PMhU99%}=}~>Bf4x$&UhN^!T>AFTbOossKNGm`^(;~lTG@50OiYM5
zRPxYGvFGW<tsB)}t|^=U(}>&L(>L#OnB(P`=E)}{r&}whE{r<4V{g!k><4Q-Jj`|~
zyuI7LWXFmLK}-UR_t$>>YwcnG;J4h9o5eOsd!xmsNwQmQFS(O^S$Ni-nM?}1%_W^>
znk%?o2;WdP5pH9zN;Q;Ay~I0vnwz=3nPa8Wk(r`W@v=5wC%KqZKDx8e_YB(-hmGyO
zd0M?hHm!bj+vC<}i?ZT(9voNqmCmheP3I}{bNhC5t7z|*xBDJhJygDVR;hEw<l?Ir
zPhOOLxXAz4W4>>Nd%vALI9nvJy`K5XWS)Po(@c0j1PJ`Ux#9bq-pvos?9zYW?C5eh
zt^J*;$lklGM@5p||8U)QpE>u5mE^vM$&ITV8-Evm7A~tRivLtn#kt`j^WN<llbISD
z@^&XiMnp{Uuu!?VRdmvSMa#b9izeMWF=;vj&teBx1@VIOKE47{RezSQ_tuC}4Gk4k
z^I!8#U&liw=;RTBgK|PnH(DDT9rt-UCLVmg>%!d=#tRm2pX*ffThS?6G%9_~x4X>y
zcE$4CuB%sT*;T3K6xxz~*7u8W*v&hYE$2C3oG+BPSjl)<OX!%Z!NbU$#)^hl*K#i|
zcz<-+rri~0B_{uk6&zmeuXK(2E^D}X^1f3tJ9%!p2Tt{0|MZ#0#j5rUvu7NRHchMK
zm@G;r6ev7T(~}f4;LXc^H9K-H<FntFj^_(6ikf1+f6MZzIw7lNCACkUKXu|n$C-2I
zybi?c_2&LQ@^E9xwl9oEq6b23?DpSup0R$5R+WK~^lQ$;F<Wz2NDHuD*u)&>d8b-!
z^Kv$p*EQS!roU#Y`@jF6d*##Xb;nCiPv+EIpLH=|dEdDmh4nofJ|^6?^VD<u>Ju{g
zqtIL_o*%`19dD|o1bXfY#c!NE<;}^IuJf+$iLSz4b2QcG?^YAN>T7c2u({pM&7VK6
zVD@oX<X8K0cGe8uKV?NZ9e1auh8-4{)VX=r@qorf+m@a~K{akcDYnHPo%6Ia{8_*B
zuzh)c`g369<=?G&$}*ZSb}W`E_<OkiSNxB8)}l#oZr(lKSaIM+lh8RCMx*X^aZZy3
z-bi*ttyk-fzd5IP_x$$Bokr)3Be?=)KC;Veuf1)1hC}j$!U3Pxm0wu1E#>)7e0+3<
zV|Ocu)AIJ}9pa7-%+=3zG#>8RaQyXBeg)+PN7=fQG`gHP9&GZN^&;bi`ox-N;*4^y
z7sRe-+`MzHdfXyi`5pf_n~(J=r?1^OQ>Xi(^h(vc(UF=T#3s24OJ({U-&ApxT~Am4
z^n<r{k}r23JECqMx$$YS+#K)Xh>zjlCQiI^Lz(l(rl)HoWctq<$g%wNc4~h8^s1?m
z*&+7O>!t>bvwHnbFZH*da%z@aX2#nzMO&+D+U9zD&YyGneQ~qUC6#`In63RfEH8hb
z<%^rR^ru8RAGhg4u}yAiOIN-Ycz&jC-q&i8YN2luFJ?|-PLFuO{985B(C~Fw)V|N@
z4#~-RT^~ghY9h5?8eX`0RJVrhM!3J0=f!Wetvjx|nLf;BJep!+amx7-XNct8gGYpN
zMct#X>`SQaVfY&s7UuBqBBM)AkeJcpe24cBbAm5*#MW<bk@~)Q0_&6`y~X(-=Oy^v
zJ#w`F_~CQa@1l?K%u%{m^sDy9s{{j$<mAVjw(K~u`O1#}Jth|1x?i5VSM@DElN=z>
z?f<2y?J{p#pvA*u$J{vE4(;SOTq~ItAHP3sT4H8iW*R#m+sgg><C#xwQR6up{iUod
z`@*A-7K+Qug;}@G7w<k=^ttZ#?PX?$t#?J6AAbG)_j~P&w=DuLQgZbk(-N;-UBRe!
zN^dq>REqVb=Tm;2;%T0nr?+h$qpBvq;NqTxf8WTdv)o|GFwTE3wCIqD;T`?s@&8IS
zb$BH%iCj3{^l`%H{MOk|S-ZpTM2D^G%wvw{*6}ra$fa@W;5XJA0t;d#zWHW;s(5{f
zJvvSOll|qzZ~Suh^*eK|N&L~+Sm&kupjbzD{Ruar)}ElSM-vztRrA+;@48~L?W0w<
zsilihOEu53z(;E*KFQJcS+IzmxzAXj<4RO)ue&hE+bzqsCGNfb`|-ase*LGb?SHK^
z+4BDSlKQIwC$bA70<SBk@B6j;j<`mb&N-e=@k=5*vns>Vj{V}Cd^9qm&$ny)vam42
zXeL|t(xwRu8`#q7L~oY}MS1Ak6@8Xz{;r=D)ZuU-T5Ll4{U5a}vkWgxojEbu($;PH
zVT;N$P6`{<{@l|#a)8mNmp?N7!ixik4rXps`FF~#tm5(I#dEed`}X+xpK!PTC7pF*
z=FVAf`dpPtdgZ5|VY%RX!mFW1dA4DS%!*md7qDi%?0H!1JU_?0`iNTHsZ!yy63cGw
z5mGzT7w_dSA-!hb$y*{R$G>H6V2RM>s`WUx@ma%{hjI=DGA#0^b>1wItS~b%5zuUM
zv3^{z`Y!+MslMtFHqCPw9!_*UD&l(1pF{rn=Dydr|9=Tz5>hL<i#1_^-lc30z2i3>
zT@`NC{|%lg_44}bPbY)Z<EJ%U;!-=<cV?E)xg#lAS+maUP;kAqYUa-eCsQisKYPCY
z#TL6$d40P1E#KQ!IJut0<*!_`X3>H*2md(DiRx|a63C6)xK8!j=4BgWzsK-KM!Nr6
zSFG~<#Lf7Lx2`es_#Di*UH;UW*UR}=mEEbCU+?eodJ>lXyzbnVM}h(Og*&bknB6Uv
zFI@gsUr_p?lt8uJnXQMjll|mb({31L9MtvUzZiD4WX`FHCV4-lZL1T0t8u3t`@ucu
zdPPZ7@$a(dH~UKGyG&X%_nqgyKP|TI9QQknIV`M%9L{ZvH2!va^W#apOE??VrMEwg
zerWF4B_X@(RLjOi>*lhu9!bCaSG;rA!I^AJL|AqI#I`;Yy>Q=cq3P<6XC9}me8K(M
z<XCy}e$DF(U$@RVx%j83kkf(Nfm^;8<mmZc;Yhl9YMI_m565+<PJd-Ol)U2krX9H&
z;%)VUCRMd|Y$~o*o4vek->g}axq+Eky!&kA!M0-VmUnflm>Np&afjz$e!2K=ru9^7
zz6oE8GiE4O9!dXg)7k#lDztZQ)|RZBe!ZCwtQR*H@3hzWI@i6@!O*4urfil;RDE|B
ztC{=)-V+<XYbhRi?tYv-n>%^qu3c5^u7&5ndVjhi{eQ0M`P3fX2lfA6U7N#Uou|4^
zaLXf)mcYXJ%S+m`mxS+K;3pib$|24i*TvlV?nZ0>e(lYZ5A#HQzAt?Bko(=aC*EJ0
z`qFX6?Ae#sSL9jj+q<@v(<UN3F+_WnROHm6-7+dy8Q-urpHkpIWVO(!wT1txZ^+M2
z%rRWcqK=4%^1iL%m+t$sfl1NJZq3?{wV#@qexGSM%(kub+&{nhjD4v&3)+jNdu7>E
zb>~iG+MCbOcj4@zJ<c_Irn50id`WpVhb22Y@}lg%N=Kouxk4**pV%FWTIkj1AQ-jO
zZ}q8k@ocXv6P?#F6|d~uWp*yA@7}K|o<GES?Yg#p&U7e#b~V4#J|^4pFVFeY&*}`m
z8HI$pb{JY2tk(8^b1b>6?XK?hg+lFrxH<aI{3|Lr&(!p^L{k07OY8f|0$EJ0bI*&v
zc@xLZck|AfB{MV6rSbM!of8pqdb4}0Y4KZ*HKoRZI<m3ZH{?Z<--U6qDr+Y!pYgQK
z#nrBP&iX}{JpBJOsWtu-a!L5Rm78DX#le_qM{lJcUcX_zz>)K3{hnKGWs}^jxOZ>u
zqt8{QhHEBYN?6O5vwG7;DfNduT}PI_`n^QuOv?rxiIX=IrBD5{U|Xm0%<2BRzb7Kk
z?LEAI_KGX1$CwqOS&p>+<LLAc>~uV3aV^}ZFywl6Wo7GQErpokcL~|@Y-{+_e+8a>
zobS(JZazKu?X6WuO!Qhrj_>*<P$EC=dGeJ$XPM3;c@-O`7eBxEiQ&7{x6@mWh3T^U
zdFOt%<GQH4!JSdg@Y<J*`Da$Y)z<%9#KM@(m76j92Y>&nwy;j$-r99dn(wB*R@}^g
znBO67(ccrsuk`JwuKaiUNkqfhV_UmaI}5fix_PaC&eWq7Z~9*UP&(lH`TJB|dq=bX
zS5uEk9hGDL=#u0ivGyJNf-4sq)qgHLwzPHEJO>K}!5;r_($il0MC}p1x+S|zDRYwJ
z;VqpOdOK~7H<_hAy>O6K+{HB_Z+`vkvX6xu?nVgTNS^H|=lMCWf+0b=?N`3=Uda_4
zr(Rv!Gll&NPnGSmis^o@7EPa(lyfa3gZUWGB98@57G9~@{faA?cgN<|E)HRFeifp8
zDe|I5@nz*HsvemRP0Xhxl_aXmAJ%4b-s+h=zclfu(y8xNdVD+n+DP!KFhq!yaNEDO
z&FRrgi{7B=VY=7gc&Wqk!(ztlsRm8LTf!FBH=SzLU8WPp&~vUqc82Y%RV!jGk32g#
z-IigWD(8#cde_hI)pb8t7rNds&5XZoKj&qGo?;6Np90&|HS5$@JTzL%R`1(Zt#>k}
zr0I#J>n`>eGGFU8eHHZnyqRBi<g5LwcL{Y2UDZ<SGPej#PO6)>Ygd%!#p)S)8p|KM
z8$<<0E`Pna-HEwC<&YVxVdS0~(M=+<##S+=x|3q&C>u75X3cEgo$!Un+ccp;@bE#?
zHCy@5XC|L#QrjzQmZYA%Bdn(H?T3eRE(RzY*jq1d`#z^c##Z}k?(vANN9AUOAMUDr
zc;#0co0s&Y$e5&XL-)7+3zG%Br~JBND7vxg_N7ZcDhHq0p7`+m;VP*t?}fJ+dg@Le
zTy8QmXIl6BKXdnmJ=?c>PycJ?C+rh{m0A9MdSAppQ<7Ph#cc=sY3`4@qINf~o;t>-
zsqyV(RZ?echCs!d%uR2?5BJWLns9iHYS@))J_Y-Pv;F^W-|{jfzV1K!oTZu?I=fy=
zHhiwQ65BF2XNP0Lj0C<-t_l{PvYmP?x3*>~Pl$e{`EaLqW)jD&9Fe$Xzw|v^bJYbU
ztj`KJ6)+x^3c07O+kW=WS+`@Kn5BJ!47jKHto!q58{5MVSGO%(eLf-dtu$AS=ig7S
zeo4;{TlYJFIo0;@>uIrvl|@!fc=aml*35$o6C=Z-FBR|hkGef4NbtkSH-B`x{Wvz+
zDnxd!@y=Wl*)+A(W$6vaJ+BR?{x{g%yxybp{Q8Z(iN3Dx_f~Ja9Q<Tb(p~G*ou$0X
zl!ETwQ0w(Q8?@wkW>rxWXHshD)+?*+8Lu;O3GJP3e`}Mw{FZMEa-H8){&BBe_xY*1
zOxPZarP+?0%b7$L*=|}=$a?MBvEJE_H1!_*NjQG+a>>dBI~J4mk8gaww5%?nux!dD
zOVhc_JzQAkKPpnym=_xrsC@oieOOxCIxn@YO2Wd6pX4{J5mflv;rK4JWGkm-PGs93
zr;mqSd?qMHem}eN`92jr_prRIJ*BTF%bzq}|92Y8p->m;z(p#XrSI_;_s)2EU+%r#
zOBL7K->1f!7#)2l!o9RZ-{;dDRn8vs2;UH?bS_gl*_V5l6`q_i=ijOP%?FMq?RAxD
z{&BU=cGDc|Gd~a7JiIhX^Fc!df5DxL2X9LW@7FUu`#ZJj$26UDuDZ*f?5$Pc)Jbt(
zH)W&kthn71dmm{`UYDq2<!XD=>6M)I44!T8oEI*NGvb?mYxVckC)bt-y<0y)YC`6#
z;+jT-@5^V;Dw5jc^YY-~gN!vxejgCzG%Lxz5U7?aI`xrJSO1wUoLikIg+wTEXFM!w
z7QfRz|CHT^=eg|@Z*A`1%^P-RkFd+L&6BPj(6ci>w#v?o)k=OwspF$=E?X^|8#5$|
zmWs_6ELgCZH#96-^n-hKz~}Xc_tjY_<*d+kdRnFX{NAtVoAsYu&-EwB37ivPTz;`)
zqjt!$ZpVm(8n<QYZa$Nmud|;K`6QEZT{-Yt!<ROxy(<^qUc>kNzVPnoo#H0n3&I+v
zO}YB+`c{o8e;cz3bJrA9l<hshEwjONdV&@20?Rf-cY%EVvco$U&)Tx8uPanprQ=1{
zD#y6F{hw?PFr>{ejcvJ@RF;#LWN|#<_XfFd|F$u&dmEr?<Dk;CuF&pDLU;1T^XzAL
z@$dUTJ?QQg)zp6z&SW>(+FNU$UaiR-z42c6k-$i1cUDu2XKICF0j*An40Hc@s3-*o
z2iN#@&YS8{s(YW=xL85{&~vVAqlyPB!*5Kj{a;<Lwt82czfkWFKSl<vLu=dTPuv{;
z-`Po@LBHRh@5GM-x@y<T7*efvxVDIiPni;FZ!Bb|P+)Y|QCwJ3MCp<6Un66?BYTfL
z2oioXb*k#lADjQXy?9raIsMP?^ODZ<-*4oQD(Y;!y|l4(w_3itk0956Z|R3mnXGir
zgi77Y?r*i5ac#+jBkEUkZOVUg@UU?GklkfDrTykHJ)X2P4ykK<zTW@AdX{x_OXl<i
zo8IwfCG1q#JKZi};g&_qTC2|__H?Rsc3bYS{wC$-e(0gVca^l*=g-A0o;BY8{{3sm
z=Dl-6(*@FXvVwNZ^6)D9vhB*WFpm|>I*XsIJo0MZ`H=gjl2;ly&DQ@tQT&QsSm#sH
zc@xv^Sqk&7ITSasXso<qwR`o#Q(Bx;Dpl;n7k?3(V6g6y(J@xR`n48Zw#VF4%&*s3
z3!XlIw{p`Dk$2k}{xA48Y4X1NxhYIXHf(;xeblw2WKz~)g<v-!9^3OrpC*274^COo
zI@kHr^VKURIs5NVoAHu4w1qiM_jkn23&$Ra+A()3Px^9lqTN3B6kn<6TT2(NY(0Pc
z$LVVOKhfN&k8W(-%{1xYA3v#ei~$$hXZk1#*#CX>T4-hFl&`Ivg=yD2+8mh`Fa1~~
zGS!vGys`Ddub!F-vC=P^o{NiYfBoI|rP(Q0$4c?<=DVu|!nW^A54@MWYgGb|tI>`n
zKi%$cEjC(Mt-PX;CF$bTlCDjhANGD=SD2`1J@fF3W;J2X$X-{^s_7B2*IG8t*>~7p
zUi|-+8Mih~c(>EY^3R{^Pv^e>^M1D<hrHTB;Ys#4Vvc<L@h|Ujsr6A60~cL(zm@yn
zs`NV=Z9MbnNR?ahET#26-(sh3ye+OGv2M!BkAcVJJ40sqe01pAad@H@uh}$By?p}x
zCzERY*sgpKuP9x3YSS7GrgP1fmi#3>F>dYrCmTO2I_|f7pLF=)+i&kLi8-?Ek_%=I
zU&_LK=GVT2El!)5f1J5;LqS|~Nu!Lx_9ZUgrx*&lDK#Ws`Ff;_#guX7h4nXAUUYxO
zk(<oBX2ad7ho0Tk3+a2!Sb1vg=l34D&c?kz63(ZZ#`y|mW;`#Iw3V5xvM`Bjl7t0=
zh5MSooU*n~{*1+&!&Lu0s=mKHMS7cE&fh8SxjT$}-dtO{ZD};~X@=FleMzQTv!3|)
z^L49l(3@AVT8hivPs1$v<=%r6b}+j|Pww+-4q;jDA>zw!df267M_ISf{12?AKN?@D
zt$c5xGx_k|@Ae!u^S?{`F-m-_E{*?aZQ)RI#=OYlckWe7-XyoG^(X%S-v7`4)1&o&
zrp^0b<aFeOKvdw#cbZM|B?qQmb(|b&8loCp)$6=HZ$naC-oahY3m3R74qRtHv+C-J
z2epAQhweEBo_yi2o5}Qb%Q5D!pEmFR8@#FOskrdGDeRiBuIkOH`nvt;3GVpqLK97%
z_lbR(HC;?R!`!Fws8WSvxM}_|uJw%UsrKyxUJLX~co|<F-J{SXH=*{-IiFKczu%j3
z<I4-%$&Pa@?|eV*x?#pqEnEH>zRhN;U7QWy3hG=Yi;6^gy$rtd?D>j-N56CyR=(iA
zb?8e=!!3bK@AVs2y_M*mBEqp;qiWi7sgsq-&jlsJq`!B2=p=I`OQ)QS>vGqOZDN{W
zFR{?~_6CnlW<gRm*-kB|Y`E%teS2HxDm%=cHSe0O#PnZnRegO4eA2RxFFux*mU2E~
z6FBFRzO2$dK;@_;dr4Jk<%43w3HD$9u6WKp^~3Ugzs}EWXebqJOzCvboq63W!{GXq
zlTp7GI7GOnxV}~TBfn+^J4^I0;|X7u2x*>Nw`PXmtUbq@-|;2g{kY+H#<x|ooo6z%
zN4m4jzPmhbk#D=-y`-F3=U3<6^`B(6hVxCRsHDqeBlCOSJLInMpShaQb0*@qz@jh9
zcI@@ra`DLpUCEdG7v2{?eQ>e*(#^L$f*$m=Yh|aDJebCFXV;+}$DYk`5X$)MyFhq`
zeEkg-S<phS%&f_W)8ig|uh_qNeT{G5yvli(V)Qn|JQHPqyJSM0<mL;L{Ewsrc+Kqn
zYJF_Nyb`0CbH9B{bIQ2Aj;EXJ#TUkfZF86nug`k7ap?^U&h`b%!|z`@*&@9{SS01t
z>RC6hY)rpcx!?R!*y1G<GA3VrGV9;pHEUMrvdlVI_(9~l#K(fy3zt8=wsX5i?Z(+o
zTYKv&FC49}{wLv~Kd0KL^_|hQHr~8fR%-6&_Z_r&^Qzr`g2k5wU+1)H{fW8#;>ZFS
z`>#DA*UV0AJw5-_SMT|!9{uru>Hc@2RN?e&q1J_kEQJXsP7d8i3hL5)Y$}ZnGOjCI
zq;$*kRJzJ}AG!7OfH|ifvzG0NzW2+u%J#PyS?qZ#s`x5dal`k_pf?}cQo?v8)1EEh
zZfg*oQMNwMPp6_NbzW4W#0<8LeCPD*?w38-p*DfJI%z|$+WDF^f0<2hH@Ar2`#JB*
zzjynmSLC=IYp?opKQqkbP^n&NO<l9`wcZvzrDwBG#I2GpPOa=@<GB!V#%Ga)fn`l}
zTVC7_=3Qy8mEMIibbTwozHxKe$s-dORxs`?{L1uPIxCvr>+-(EL90ABM40?wW81uO
zYf<~wFE0~)be{8U_7pMA&@H)`QQf>%>WbRU%-rC|Meo+`uU27gyu0Dct<Srxy#r^k
zHz|o2?)xA9f4j~9TjopGJ?;>h+Nx>ve#6Y2GK!}(5^Nc^9@?{_`MbofqIGkGwe_?n
zgz`=>n9O|R>#{=qX}`WTyItlE_1~(P@V)xu?0OaXf0yg8J^3UwS$+BCuPzpbHFak=
z?LM!rSK!U6xmb9hG-;Vc3rB*mtH6Ws-Ap@lChg8K%RT8E5ptXF@i*=ncO?G?+z2`2
zvt+V%3zwp#&ZP$Fq`lKkBwLhsM;pzEXSvZWxw!hRGfThjUH7FnG3kohXU-e$f3qcR
zo5AsbH)}U^F!8($U9oZYL92wD3%>DRE5B&=G~Ai{gh<Y$11y|DMlFkzrY-q<LGtH^
zv-@wTy1ee5E|6q@#iZQR=e#zPT>T0!E$Q86Z-o^yKO4U}z_5yYf1+^Snd6U*tc*_0
z|7{|elbJVZ)~hT@DY>xya~}LLn5?k+GOwHcoo=QxC&J86T*<hfd|mO(rr=nG^!m5)
z*-Fu;b}DaZPCEDO$IJ9o)s20EVdw1hb=E#RH)ZpQGw(#EvYoil)%2m)zfOhI_I0Y1
zb)uZaT%*~Xm()&IOyIBPNzj-7*{FYh<}VHro{38u1=u|2-c^g8HG9&eM^2n3W(95q
zwY<jDKO5QIIsGW0^mpLL&?^y}4`>(toLv8CPvYx?#&^se-ahzhpx&G0sy6%NTkkh}
znbpsoN;p6Dj!pW%=g#Q`>Lr&BZ|eMzd30V-<+rQ(5yp{{ovzD&&OAIZOKqpi9g!Ut
zvy6-@rnb~xm~=Pb_q3?F&vz-VEEKOgb7zOd-Y0)dw^s`6%jiFweI`ojtKP9-A0}b%
zNq%cjow}ovsxd*M%4_c{Z_{I?DKEPxT0DxG^xpBmSaIu($)7KBO3LriRQ+}5)i&oT
zcOxS^JhSR1ssw3NY(6o=uq9;!uX@}s)5_=h|MbNy?6Q}zPN+O`Lu0|)K9;i^U+?X>
z&-}Fc*tx&&q79}ft1~CRsJI{M6~49f?etR}YDYE(&UEXW6qRz1`Gm$g;cC&xI=QjG
zkJwroy1g-1@V#eb|5ejx)08ugLhA19H&r#RGDsG4rc7~}G$W!?!?-wt<BWsi#)^ok
zvIfdZ-gW<0?_cPdAjzM*Q!a!hbM@crsihY)ZYVDB%qVKHT=B+j%7h@5Nk4u*xnZzg
zzBA?e#N|&;9e=;US+&37L%DT{7$1vt+3AD9$)=00w_0ATT^^UXv?O+Njm(LuKYA>_
z?s7agA*Ro$V{7EmOClS50&C{Q3fQ(>P~G$Ir2maRJ-v^4KV|qo&#Mh97w8F8sK~rq
zKk49-+zd0WJyJX`)2_S78OL2bsJ&@Hr*4<DnTmv))qGR&x$zd2B}&^uUTrG#H_2X`
zEjYO;&6iK>byUV2x#<f8`UKlpuU_6gH(2G12Fu?cyX*Dx|D3k6yi+<UG(PC`b6cJ>
zCd>94uYdY^>eFXlVbi9sJh^q=y$9ml3&bitF7JDs5_7uV_ORac3F{W0@9^&pdOx*)
zCX1-eu@+;tbDP{IK3N|3zn0Bl1LqG*8L_mDLfWUd@V|Ja$jI|D(&1r7RZ-73wt(Ch
zPZz#sb!VUT|7hzD){|N%4hGEhcpcUAs&enYlecT;&t0PW>AmTs|9j_2-`V(L!Tiko
zAD{a)9^}iCZM&mlRpmYHxmv}t103OTH&s;kDb(}dn8CYoS9H+ytyayaF9vq@-dS=_
zMC(+8?A2{$#)`9KUyFaO*&o2E$kB0OsiUaO)FhVKys_>(mYdBe$W~fcCh&VgE7#rn
z7n^$e{XLr5K055)^1>`CNIobyT047PkOWs|j^>os8$CBapY|3Cjz5$T`j)|??!oV(
z#%syj_zTzh?f+(dX~TP#Zk`$Z{pbB&U7r%OGs5NN+DSsnOY(#!@SHp<kg|w7@Qv<v
zA*cCj*SCVUU9Md5bJ8y-`N>Ysx%1DSy>07J7O3*NT30?<{MpIBOX`dT%od9&lsP@<
z`^-Is_l8SgM#C|UG|q?e*Dk9X*=<n~etg*N-QrD+>s{wD{hc*eVnS!*>sdN(Dj~PM
zZlrE_Rer@k-fXetwL3P?gfFhOD|ut`{;7I?-R&DQ4xRm4d1Vf(1^4+qpGsG*%3UP?
zc6X_7RbEWuqu*z^*XQ(AtWi(RTjTzi|MJ&EFHU~B!0UbcrsMB^+h^Qin^&aHc>CAV
z;(PPG@cwA0j?;&vru=eN*_Eug#KuR~{l;XW<<ZGo+*V#N_O6Zpy40fogQN#rx_jOP
z$1S@atK9s&++DHo)4X5vo-f_Hs+BeRh-xF3eXaQ<wM9i&^pj0^J}Ox-`0e?_`}4!^
z`^)C;37;rcIMw&V_Ss5nY>%ZLPAQ*y=dF;|Eb%{+8H~2txSxF)+Iw}u^r{CZIFE%I
zzf!(C%j5i6x73`935#VCR9%xg7D>3V#LQ*y`~UH+bofq9MeT-^_9Fg?SyJ{Y%)-ih
z=jb;nJE{uscx8*}2+ln+fBCNWCz93Aysubj{bNJhrNR!!<9{!i|7$oVQ{2Gu=3qce
zL496Ui>F|R6T?*3RC%R06?%L+9-a&bZzdd9_H^ggb(X0+P~7$1tH(C~?*_)VlFMSA
zhnj!*bZL)F<u_AKmsgQDnPz%<H3zfLbhpj9?EIeRI@@BlCIObUDkm?fNY3Tj^47lQ
zv%cv9kGz);ZpC)F`>H+I(B#H(cK@ff_1dMm>^IKds%h%J<?wYa`<L=|j^JoE)_rV-
zuUCpDUFr7zd&SfFD&H~Y7Ws8flT}XZX<6OS-tlhZyw5zF<c^xYUnX&wf!(h%`gq0a
z&E<lVia%d2muxZ5{NUl{tu3&f_2}_Hjf)Hn8&<jT$`rm&U#5OjwD{5m%ac-`C)%W@
zKYJ&vvh{>NTjH6^vmTuB=Ph`9aVNtWj;ZB0BqXZR_Z9q}r+!URZNr5K>ra2AKYfv|
zcj!H5^3~d0BBE*TRM~*o^*+}eCSJU|Ih{4pdqWs&9`By%;-9)iohmeWHlCM%VCU>E
zT0A}6?#IM0F;(|V%-#jA-Qt-dH+|>9KYu%oB`!U9_wsuE@r-Mc^UuF&Y&p~WJ%Y0}
zdXkjH!d1KH#awbQ^s<n*>RQ1Sex+3E(W<#AU32)XN^j_%k^k9bs@9>Wm)KDF_;Pu~
zo(b^+ja5!O2bI>OOWd^*S*`Ut%Jf3sGT8$&*oBl1eA=KM$a1XGEl|Ss$dfE5ufx1S
z&-lF#guAGn^qF|etvy<XRZg=cH8m^8W4`tL#m(${dUNWHAJ4fsZ?@c31`F4SpN~H<
zcn1I8_*`Rc^H+zacBU24*O^Y{Cng%6k8qqgGhg-eu3O4Sm|Kij|D7fM*6_FXr2~Bu
z9GkLc?UuZgoc}GRrhlVw!WPx)H~;02&D(S`DuH{ol=YLyIhi8NU+*}+&o#6<6(}rF
z*>I>XXGQ$=3+HzT^(?#*zoB_XWRcYs`L*Y~y_m!Lk14$PrK5MuvsZq_8sW&fg5hq-
zMi~mqju(D2pD=op?OZ!o<cCtw?ZP=K?T5GP-MQFU8FBLdx9<)UAO6_9UP#MIe754m
zb8Fac-*xx%cE4WtPBX^dM9V!te%TwgH@kN+MqV+Eo^k#2wrSJ0e&zLid9P94bs^hh
z)(e*o*X^!*r*3)eoxW1al-9<U%uOw(E7|5qKh}J)rfK<+U^$apJ&}i-_(Lx5dT0D2
z^hfLs$-b&kY2VayD<-=i5{Rj+VXW)l%XV{dLhN+4JA#)r7&?8EJpZ~+a%HcMVKe-H
z<UnurJMGyI(zoArRFHeSPAR!DmgC%evtzgKESdFz&H0I>#LK-}zxn4+dFSk2+{&#|
zr~CG|#bj==OPw1NkL4dfKj*5%BA;V!CZ09Vp059A_{^qY$Aw5IC4rS|p4u=xTX8|s
z$)MwudBNk2AL}HqE)ahrVDImgaryG%YQ{BdY~@q`zf0r|INb5@nSA}n@T-Ytr>{J*
zSiQKRJ7M$2r*qB<=q2C!aV+vc#?PkES1PL_YFi^rUQB=JGtnaP@->svA`g2r%R}e)
zhdZv_JJEt=-gn6r-WGNz^fHpK2bOlFIWtddyQ#h**)fW_edDTittyP3ya@+Cv3f|$
z99$*!^|sUsrdQ9;-M&($D*WT`UJf6}NFK4xoA>{!F8O7Bw|q7ypQBonM~JcEe32Dd
z&unhLc&j~YicdiFM5g&q7skGKRtdVg<A2r?wf4NC^EN&|IaU5xtloWa!{dDl3%76O
zdLPDkEI;69Umx!zJLwGyWg;d8hxR#M<=wt*-@bV_zP()Od8pv6Y0}fYvl9duPsasD
z&Tr<tC8}dHp=YtRV^Wh+f6FWDrJs+S4!T}9qkgx6^-+a$DvPQw8y<P?aH&0sf8Em?
z#rYF7ueNIKP&=xynBmCfd7Z{l)k}p|Whtx_Y{}<+lR9&1vP8=I?K$1^R4+&*96FMd
zxAGrfD~o{e-p_acYY9tjP+qw6`q#sChtlkGa@U@p?QuBL{_8FK>9eLWM}K#`c4Aw@
zf}ZRZzl$<eJ(mTF%zdyR)=zo6V5Z%Q*ROW3Uc<j`7NfJ8?o!dVHB148Z`O9GIeosI
z{A#h=`<sb>m24UKb6?pg>DN5wzv_N{GRLX)zXe<MN>*&V$Ng&aL8o>-`5HYpMhCX$
zB{FyG)`%uNma5$NLUCP^nB&R17g|c599@<-X20P1dFbn}Tc<be$tv-5yyCEFT27k3
z^*^`kMWM5H`Jdw6|M9)gbgRvY3SVDcXU>{0pp#T~%p)_^=aTrkWSN8~$wz+eoZt8)
z=t{@p>Cvt1ZybJj-srw}TE6H{n)$(dlO^^j&vgF&^XBzB?^m~Wao%US#B64;cV0ph
z%MP<IpPxNnCaIq`x3$MPpr-Y&v-_dm$O8qU&jSJ*+T)qpS(A85YBr=FW6Sf5kDt$$
z8mGBF@4CWW^@$B?uJej+7W|Ib!`fRHSh(;^)}B=7v+~!NKmXXU{f$f0YKP>WX7zKY
zisOH>DJ}}+U1R9P7`g1$y5L7TpE`GVt3*FYHB8;|e$^Qt-whX=_O|))bs1;BemQ4a
zT-zyYzPr((zm~^wzWT|U=>LDKzr>k(!SA9;?N_IY{^~aW_w@gnN22Fm>^ZiidHcD`
z%f%}9>`YRa<g_6;_<Z@@8(RVn+s!*)nytTU%?`0|``0KPVtRAtfoN7Q`)jM>A~%JQ
zEtV<_xo&f~O%h6-tvl}=*xlIlxVhtTLVDu^$B$*^hO=e&D>vTxTYJ9f{F$>ymxK!M
ze|PvePv>O23C|l`(vnI#cE$wlKX%;hMr{7;JNl0oAAVFI-uYTP{(pLXj+Numl!L1?
zFY)ZsnIK%oGSO{goKL6RGv2!!H+DL5?O<O$yW+9fqQ~>C6_<RlG;hxAtQT{Ws&9VI
zY}asf@BJl$Q|)TPI2M~_I<XjL9M*buDZ9jY7efkXXs6Tm$)3zw#t9lsU%1`mW0jT9
z>^`Q#BE8&3KqP*J-<)4oqFFC4WX=v=&i%Yc?OhzpR_jvEx27#SUN2l8pSX0&$%%4H
zZhUFc(LFZvLD;peo-?hy<{bQav#?C3AVAvW!hw4~UbNSr<$GDSu`F8sWuR5f;a{_^
zCH(E#^Jne<c?FH<ue6+zy2<MxbU|0;?OrzL1L2F6`%?7QT=(Wm&i-2#%6aL(X_;(#
zXr<d^brxklF*dnBbJp^{yqmj}^EvCWr*WQ&={K*;@az4u=@GAx<Ob(7q0h54>JA;O
zP-)(}b*qv1>{NHN={!;2m8V7-OIcl6u<AyU{syrZDgo{tYl>VStzI!rXfMCT><YUR
z?o!tMh4D=6^CO}XCQO`MRXM|R!O^0&*ALQf);sapf1YLX*7}$p(~|TcsQ~{~iyPiD
zxJb4t?G}y*cp<27`o-%-PJ<Q0l#<lUdEdERw{I%YZT2lW5%y)z!+8h(DJkx${8;<*
zVfjB{>ko6z?ma$l^TV48m#WsV9B{1dUA6XK^_!>pryO~9EWciEp}ow2`NsKAk0vcK
zF({gpbw`Bj;D?BtMMoxB+%4t1;MmT4LV&B3<JsoQ^R2a6_v&NB($rPWERPhw{Lxg#
z<=MC3pkU7T)BoSx_g=87ac+9FyqJ)zz!G->*7@v*bYI1-THka{L+hoUyW97L(*x2R
zp3aqatBEt=d@`N&BI}|i7d}B>v(>YH+@HZ3JEQ+%`UAU$o%w}jO)qA<?|V08idXUd
zlKFM6^ZtLWciuhi=8Y}N3f!BYZY~H5ToBcDe!^LS`LaiYcAs$4HQ~MBxWU}GpwotF
z-Y1U9*&T_GO{4g2k0x2}642N)EApZKxwy^TKh)!EoOkife>l^rAvUAG=Ysfhi5%r=
zYdGAFbl%*dv^dwM;<r_;e{l44lkH^__V8~!v|Rr0nHSR2vk&psuZfQozmfY`D*c>L
z6VD<g&off>@ghswiq8Ms{<OXRpS)>B{^VunoOQAmJJjEgo%%a-|AA!*ZXx&g$NjCT
z{jK=5-1D4S(&{5u)fcT0x@NrMyh;=st4ql)g@qHZ&JetQvLgKYQkxL(44XfzbQ9TT
z<YrcO7#H8@e(|OGubgYhoag#dml)H9jvm?^|GW03)u%1DmWHa8SUA5Z@#VdrcAT$j
zT7oMZv$+Y&X>DoC>3vEG3quW#L>}=Fh;YfR&pZF-FrQ<*$wraKe+wcvRVsM8^ffc-
zbxparGO(;f`*rkHv1!7djn6Kezx`liC_~xpv)fKC5s-f)R>+WaV%0G-&hXbWHMP~f
zj=BD*bF0dan;d;z-)Py|Tw9gQy~}=_VX+TplxCCG*|%$6{nzYzpA)n7yaJ4Kd3H-Z
z>QT}w3-pvUe#5lAn~`^t%ekx{e|Rdyue_*_JF&v{ecPJK?GlwGB7!kDb#K3Q6yndj
zmc*(2_9t62i-Gf@4RflVnlEwW|8(aKkFad<;?^Y+6>{tS`EATNn`|BKd3iV}t#Mnh
zx~0B#%e^?YF4v=RY~5=vtkVf9Z|htbCwz^=I5N|Ff1pmB-{+s3ES(GNv$xp_-aE;0
z>-=p!$HrA6LN~WDFVD!C{!A^^nV(xGLu=xMfZXmMUl%+yZfecTD+)1+Wbcd+IMV+$
zetLi1hw$h*HFljRoBe)ly5{gxE#+`xY31cRixs|EeE#+R)Wqle-Cp>mDeujdol~^D
zqI}x<*3Cwu$%zM<Jr!l7(j--OJ1*uu#G*2H#T4t9O7^PuuVSy?ExH`Kyt?NIZ};ab
z*(^2Z-W)x%?Azn>3u8O?=1=B)TXz3J&%pzCdMmHgDO7mr=m+gC%FK(BlFsrpmFHts
z72@2yi>2(~+g3Ifp3W(fi`pI6Cj=@^-p$Y978o#V?#xH;10C6PPMh4|S;P39e;e!f
ztxqppp0e6uQLk}J>6Xdd?SKCC-G8(A>z(YRw8hJoMt_s7ciiQ_&tqGZNO?ekf=Y<2
z_>rm4lLPPVoWd%8+|oSl_=fmfJ=13dA9&q-l_#5RljNE60>2iW*VfWm@bH*i&HJ<a
zC-vX|mDl&@(dKikLN(TsH6eE$nFY7Z{9yJr$89cmllYs$HNm05(`|lltyjI9zHg2&
z$G*izYra|A-ODbKHWxUMzWu<atlNCW%hG;V-uorRy7Q-?7jxy`=r0dEY!)B1v);Yy
z{<14OXYcec{&!^3?UN5#im$8n`#;J!?|S!XcJu3bN-29^AMq~wvNQf-^~5B{>#2s@
z)-`e#86G>p`A>F|^S=bube_g9juV9)B`zr5IR9e8!idK=Jd%EJE-ksNy5*f^SKfzC
zjhY)%s~z?|x-7gU^TTHLFZUkvC<{b)_!_ktv<AArEB$o+&ct?w8(-tLd{g|caC0HA
zp~NF`18Mv3z4f~7^M6YzrnKF;c<_PnUGLont+l7$O;_6zetxg=<;TsBuAP6$?XqM4
zo4*ZvpKRN8t6^E-G>>>@v$OFxk4SKEIyI^uZFqey!ZY*S^i-YM^QRu)W{~*aw7Tr<
zw}Us5+0WN__PzcmCB0`U=e^Lq_YP<Mwh@{wIeq3u#@?w~mStPEEV{mbUYg<DPeNJD
zf-n62da`699a033yuN6-yY{nIx3J>f?upNs#a4Pv`&}IQU58_jmx<ZrEovW*D*9gO
z=G5H(=kor?aja(qTD={nGJ3iOow98_Kfioi`QCe$`*YSGW_zEw@LsqG=W40lOE&%%
zsT6V8;8NLeMJjQA$JPt7yltyrN*f$+y&3XDV2_`Jz4{KW4-SC>XJ(u{Dp|((@uinH
z*VkIEAO9?t%j~`I^@YtZovlCB*wzOZ_ZuZ7sNY?9G2ysa|IvS&t{d6+ZB8l@4o+QJ
z{_oE9|5IhE|GjpRW2kzw>6zwfro^%&!?K22wrLlCxUBz?9i@6{NBkx}@!UC=wRSDu
zk#XdW?3azReeU~-{ZDK*I2`$E{gS<>qqZ?Um#GhqdbWH$+amRdyE<#z=PfiVD6&*r
zt)1pJD@JOjPhQo-#C67xwm$mZaQAU>=&MSOu&W<8Kg!=YpCS2PLX7By#Zv0Z6WLa&
zZ8b`-VgF(BMdx7O&bO=NdFI$k#3mUUY%1PlbpBv`jD=RGo#~cm8}v>j<#c_k{k^DW
z9z&{meX_dc&zoicn59qJX{4zwn9;}-;SgAumtlWkLBGk#&l_U|USB>O8xeEFMSt(K
zGl9(0r$|@TzsXFw<{|LF=aSgNzS~?UdRrXZq`9R_>WbzRx4dolTRpjMV(0TSHx$yB
zY<S6g=FG{nt*<1uhL`Q!ctO$Cp}&Pe`dC`(R`#&sD{sOsRIoqRNUy$T8GZRm?HLQJ
zz3W!}3M&-<t#Lg;nEyfX!dGHz)+`KcZvOqF{r<!I;$r!+^&y6GIR#mh%tDF^?0uEE
zH%%5XFW#|lZfAC>v-ZRF3U5!myWr`dI^&kfq`kqL^|Ni`o8{K<Svd(TP~Uwus_7VK
zI`h?J9;@b(j?PVNq8I#%pI9yFizyYks-6{m&E)jw`+v5#h`AqUO9>NJ3<+JhpWQ-*
zPf3XP^ZQ@Umio8n_ituip+4uvT@$X)lb!yYJ)Zw}FHhY6kbR$C|9AQ(Yj?8Lt^7hp
zh1L6pdJ(Y~H;boxq&io}wcfo~?PpbJaNN<0aYD$N_uu#~u({s2T$AUU%)Wd7i)D>M
zRYecl&h&jh{pb$Q^}@rKd_-1%dS8%tsUqM1+S>zt%#VNV<5=`?g2M!Xb(xR$ZxF4p
zd*I)oFSXWF{r&G#S0tF{)wnr2+dX_}d;EFa49REzOk&%Vtm-5(&Uh)EF!7lsT_eAI
zbKJTAPx5yhTT!4~d6TzU=iIHh6W%*ke12tS;PkrgQO}~&PeP+REw|p<=3MpO`bTkC
zYWb$eeurQ2#A?>WzhX2_P~3gG^NG}CNfqhuNgPN2M$ep|)Zp-ArK-msVJ(*Tg@3&7
zPr7xD*{Je&u#!rF{N&ZEH~FpX?>&3ubdv5_JGD)mDGyrXZ!csxG;?}DFWU<Bt7UVA
z>X-D%uA14Xy=hGy*HJN+X&chz>Ss7kJe%}lL$IuNW1E`%gR>1M50@)7oKG`#(7lpy
zCsL!*sd`JP^tJj~=h-4xF<7TIL_V%r_&fUUouhjhwy?PDI{tgT;g9lNcXle|HOn#;
z-;@2mQ}0;&uFTaQq3ieU3#qjfy0>dtS)av*3!M8G&cAthYlNC0SB+_8o@qynx6Y|6
z9`e@zmhLN>Wca{x>8`rjTU~-5d~D5HoAi#&owp&cp<m}xb#vwR^!@+ZjSBt>OTOKE
z=pFw%=4aD${^tqx@Cd)?IohSWDg5B><`>;2ONC<8@-7+k$+z7&ndvO~)lx&Qc>%N3
zWRIL3`8qc{W?r<D+*2Bu+b~}?ljE9r;hkj~(*qVJcl>>=t9|`P_SDC04fCC@o#IUi
z&9#m+<9xn3N$<q*1*az#W~_O*^2xo~(z}mJ^tgof>7;MSkF`AS7yJC=^qrHMXLT4#
zUf-J`zQp6&R_<rf%S~6GN%7gQf93VTc}{n_)fk`TG+pKW^73-k-J3q^QXJ}=^osvq
z<yVaf)j!J0_jir(B)^KAd&|WukH$Wld@7;$>e@1|)YFb1!*vViHe7M4;n+0y=SfD+
zD_aWxKPrAx|0;B*)T@ieTl-n372b`Xakb=Tk#(f8d{1%0`TXuTcO@EgcN@-YF)fYi
zv@7O45;W^Yd#UVe>;9~`i^qyNe;PYmq<57?oWIt*+*diHtmldT)V1!J$Jy4^>(qwZ
zO?a&Tch@uJ(6+788A7q^e}vdS-g@a1NA1+kuSPxh3+molF#N7nwLAHje}3;@iP=($
zS44~tb<B1=b?MfnBRk*t-~ZeAC2seE-wWq>cN@>~TW^2m;)373Gjr`Zgf5)ARTb&8
zCfI&zcIBH?r3c5V^u1l)7L~qEEc_C`NZ;k-viFaytHer~UDe%FGc#K~74x`wOq$|K
z*wspelh!RQy&uTA`k}6_;RFx=nyC06ljL^sMtaUvX;nHkYl)3dkYLHeoQ{`ej*r|*
zyEu*no;}EPLpQix^;OoFN!PwA9L;oSnEy4rh4W|3_71r-Zs($=x;Zl`PRk4Hlw#w%
zpnqnT-_)y553?N;7t*$fTO&KK*@1QThIPL+Z!Uk&d)(zxPYRDFi*=s--p|Woem|LO
z{Y1LV?4ERvvNGeAnaAH;Gx~6B8=rrjLf^aBWiJ^eerL<?SN+{LXQCAEB!+AU)#LBJ
z+>#cYk+a5eCfhp$FXip}-uta~zr9t+@0`Wd{`tUV{fS*t0*pLz$$5e&C56m69<Eze
z+~t0JY0e`5>pM9Y-kG*Q`25^=yAK?Z<701pHf@RE_09%+K~uhUDmtnn?EFux+*jy{
z3wEVx#jMb1W|MCeU7&2>G)4I$15<soB!>uJPLT8gS%Ec*D>r_ZZ&v#&UcLGIqurnW
zegF4a@7@3AmH%#eDt<fiP4e<w9-#;JFP7E+_Wy5g`SFc+(W{-|occG;RkT$K?U}Ou
zit@r`%shQ>T*R+BSg_7%zw~JV+kfFX@rP{ph3m9@J+g;ENZaD+w!`PWcGoRr>i3e9
zQJ$1@!DBP`@<wqhhi^QMobQZx>P>cZn&O#zx^CrzHSw`}nykSZ3W;fbSra#D|EMXu
ze#%emQ{rllmcqF^o_o|iIFYDtn9Y2XGemsv!K`y0T}!i%E%Caa|KOKp<@f6Uu5Ed7
zCY>dLC)d5ZAE(+Jah>^m&D34p9!H7|BsK|)8w(i9{^Fh2{&njUTb-GSl1J+t7#e=s
z&tc79$(eTTQrn9cc^`SwL$6Ld#~1s2wc`v4j_JEMO;lpI{yX^Q6<yO(UZs;3))ET4
z4(#<x<F#TvC}GE);8i=_{)f-2kL`aC>|A-Z;pKtg^)vj!;uzI-PYjG+TD@jhYwOxj
z1BTVSPK>;-yHpI;l@-=i1u(Dk)8sb&V4Cwgy^`adEz6$`8#TT>EM@pVXQs?!AMIT=
z@0x^ec`|SHIq~SsiqHh(4e|23EV7<EJTtvh9C$uCBrm?oKZ<{j(iRcf<TF>@+VfAv
zl+4<7+~>uY&;m9=1*S{YAK&iZxJ&*!UrR!G)Kxx*b7{G%=eo?_R6Et03g}$<sP$EF
z)2r)C)&`va({$_2){~-f%-1-S1wUN3*sO4~(cbdwo6|k4%hHo(9nqa=khXe4g_-z?
z$BY@albHUjdHiDY6R{W9Q&OVp<C-E}_S&D{^F_+j<&)`0hg;wF=Kq)XspvWJ`<{q=
zLj2!}Q7`TOrmES^xgJ!{Ce68`I;&K%{Mg1cjY&bzgCDPQXce5x9&NN>LR-k%h70AB
z95W}i@4Wi+rl#25)vuzLoO(U|W8>_!V<x+g{EokV;mqGIr<T3uZzFhR!*>@n9D4U=
zgXQ~_Nmu?F*S!{&lzz2%UiRX5t&8>lNPV3wxIOIZmEu1~H^lCK^2*(Q;)-J%zYED7
z-?u8$TIH?#{KfWcO{}d}6JitRaGjJq@p6-NcGX?&Wj9*#LK>rOj=FA|6!YBjfRCaO
z&zXjP{yPT7?NxDt#cp5T7wQ>>{o&|rP2!Gi+xskdx0!LlOhdLLzmm;4wYQ${|LLxC
zWAgXJ50m!%{r;a{IO)fuYwr%vni7BYe0_vd>D!`z?)4L;BX0`tzFHRGSMziG8l~lv
zuQx<G+~NMivr+h5Y{`#V6`wA!`P}%jBB3_1o8iBYs+g+XJ@tvxoO{kL`=uB3YiZ$q
z&Z4;m%9(!}ZCgygOliGw^8PFSO_q1Px%Cd*s7<VD@zocZeC@L2F+StR%x|owx34m7
zi&0+Ak;YvpdwhQV+@pCtn;Eq36#rX3r@uC2^QG^XGTL<+R~ZLf*896leAf5r0aj<1
zZWG=3e#X4Lk+#gQI3i{ojIwU)N=bUsX0rYL<eMi83)`jnPb9?mpXukh)akrNW`ffN
z!^hkQr}GxFSSKvp+;C`7ocEtXGqY@oCu`VmynD0cZ6eE-Z)dK|wKA5xD|2<z|0}0U
zdM>ayv-Lj>7Ef5QWG$DvRdr%%z>7x<KLsyplV=m)Y&pGXUwMO};l?9f+Cogm{?nd5
zJo@@@g{5Wl^Tc#Pw+p#vT@P|TtZbN~V5p*b{*_X*goUKk{;jG~QCkYjH_zO_AF%Pn
zgwhK~OSf6iDQK9z<-$$t1*x}px5zxXy5RdE|No8#R+3k28IIeUU-bXMWOdNvS0Jy7
z%DN+m_c!)E+@&TsWA+`nC3YEJDOs{pSxprz6*nuJr>=Rw%0+57ho$D{N}Uz6W;_0V
z^=FM#-?5k-nc<rXcNF$Nn%ul+`vH%|Msu2{UNqQoM*P{8pu&?Dy-T>5waYI~YhnE^
z-`Q&(ad>ZIi{yW)_Pl3I8~P$|My)te{$ttXXorngm`c}pOptq9aW*Z8<C?b0t@)x2
zH|Kunum9!za%Y)mU*@8FS2oUXllCi0y(-W&MNE8x*&Xgz^=upT&fQ5|V122k<EWa-
z^M;VctLpThpE<wsbx7RRBlW%$vuwAwNr-)K&+a*VI!#x?y-jrAyl#8tu7z8-wodtV
z`LeN*sp-)rIzhKpblLr8OD^70m+I@teo|$@f^G#<&*kqE?6*BU_45M{v!uRZdeD1y
zo}7T|iWlp99U0F>c;sffmI~)`SV>;&RQx$ptts68m*M(!^Uei(<uu;i*!DGW@`(h0
z=2P5<m|3KLPFS$UbaUx?zjD5`xu&k>EIwD~s%Kg|9_0Jk>5}9-xi$3Mg&pr$+qa!F
zn<KyK=#O3ETS|m=Cp@xQ<F<;;E##Hr*~)9lyTt$Ke3U$=w{iA{<CkVga$jNz;TDQ&
zb}GB{{YH>wgU7<lr&y{r&#mM6D(Uzswb%YZ`3!lTGm|+sZAtWy+9ol3%8M&AZf!1g
zu4oKwz8boyz=7upLtsDe=PkP)ePjN{|4rO@PDA<P2!Z}SPt7mc&(&VOpOA3r`^vS4
z?_6n7yYsm?aPpb!CPpXH9`q|YSpA)uA^9pIOXybRBUN86J2RaFv(6|;xVsm-3Ny_)
z>9inhj+_2P=@pk0s!zl;UtL%xKDFq*Lc>}PYmKQ5QDr4j!Y8{-zdr7rqk1PspIdan
zYfIxx%G=l19NF8o*WBFpn4aZ1_6yt&n>Q#o6^eYFzD-a0Po~z)OBPSP-#FELdi-8s
z-hTDQ-RnvN)_*(@y#86s<y?!eO>8^2oS(7$*c>s5=Ycxi{@z00gX{ZWyNPd!n!NYa
zuC%SiXW1B+7G8h#i0h<N(&o!=n8L1<otU%k|CJ*efoflU-%4dqJ+bNC+@mKAxvu?Q
z9o4g>^H%fGnThY%|Huk;%qz~nxb40D-%U3!?_zH*l?~c0k$(MVe4L-k?C|&L-#>1y
z>RWy$PIYmzVz>0o^DkxuItM+LE9q#^c>HF?K5;kE4gMSVhl!`HNbG#%xnt8TkA5Y8
z&9^tt{NT8#-(b#klJ$1p?W~&nH@5U|xXf#9xbay0Cwp-r$)3E06J(`#9{uljT<pB-
zo5M*mf9B8o8~^jIy^{6H;Kw2!%Vll8GR=%l?)F?XeUq6;HUF;WeO(48j|8|h+&NZI
z-~Yz?m(F$0R*ol9dfuC~&8oVu`%Ia8TVZm-WuG@&{JuD*zD_)LDWY0s((<@pZ7r{?
zXRLNHZCsuAM&+S^P)>D>PP+THm)^4_ZX8{wqOfD(vA;XdDcbQ*VG7vr*5=!uW3xny
z9`7xG`u6?bRvFvhvr6p$T5)^UPQRCWTzrmH$J>eeHeKv)&)%szZ(e4&+dfF&fB(Pg
zFRT&KIqOw>v%`dgx17!k@AUZ+JMmE`W9?ig%Zg{I=iZsg*l6dK?2WSGKe?2@UT5;+
zzi-&`B1G1t&9^F2+9HwDI@wX2C)B)zf6vl5qX{=dR(&_V{$+tt^6o62!;P~;7tLp%
z{p8sH^Y^O%dQ40EnfSbI`^(y}U7yyi-kp8x%8$8E`K}l2U}Nzpa1?CPaLBK^B)_4b
ziDfTWlN?LnB`1L`N*klx-<^9mL-zjN%ggqh^m?D0;^NlEKllF6cRMSMwUqX*T(j@K
z&!Syg%IkifvD|-u<NQC1Ljs)p9V)I)6HjODDgXM#^19O@V-_2R**Rf>^G@$MAzAov
z_W7x@-8LMId@Dqbb-1eBU!)}ZWzE|OEEQoD%8eF>yxJ~(kvgxJx~A60MC-LsS@S8o
zsI>a^mCf$#^Bda_>{WC)F`+why`;gq?)%LG?-+i5_|a>(@b>%q$+uLiHu<bBe!OMR
z78R!zpAWgt6o1mo<gwrZ7gz6<Z6Oz4%YTo`wuqa@c>LF+B@qu7ZSeT*drp1NfsGL%
zFY2a<PIG2kt$MpW`ImcR0b|1%zuAj~?uy@k_B!hJLy;X49tzDaoU*zf>o|_(UI<?M
zdZ|I@iDeIbuAYlMIB((xN0TYM=I`VmKbgoRaeHSb$5)HDF$Q<|Ei){(2gFrRbUNvn
z!ZbUP_0Qt{KaHiTe>J?T`JkJX^e9wA(uj>)L1d~>!fC$srgDpQyP9}53o&H2O!C_x
zbMy7wzl{NR)ebv3lucj|KGgfX<*MCDE+e_#lj#DNI1<<z9xm^y;Oi0JkyEv)(>*0<
z&$MZK#j4M;^C)PrHNWcGFln~wdX55(lwcEkW5r4p?#+{vB;9tr_{=VU@%+DE|0iA3
zWsv(<kPx4}v~AnwRS#az<2N_FKW%T_?aLweR@Qv2R(Qj}cw)8FMZRghY}0=)Ef={a
z5f&*SmQeEYiRF>6r%GoR-e#G5zUcP>-s9Pu?+aMY$z2^|uz)dDzs7Ktli95VmW6K1
ze%!eE{qT`1j`^NfIIA{(+{emjytBb}8NbZ?yQ}7|Yp^_*?i<}YZK9xIQj-1SYK9vc
zEkgOPw=IrmN@|UdpE1R5rrKMEgmXoQnjgMx<a3S?S;sju{pR1@TijKy$t@9SVT@C2
z>2%Ut?DbB|Mq5Wd>5-{c=XRO*MlDX}{`(h9ZPol)E+OHtf<@`~w`tC4xj75Y7B^}z
zJ(;+uNr7X<%4NIG9oZ3lLcT=0z_IxK2A4k%zDH|b)(<<B^^@Igp-)=yA@S%aYn4OH
zn`Bx7o`~Bk?_+P4Z&0zZ*Ho*!@z%3W{Yl@!;)V+aPpWN`V>#C!x^u@Sc8|rQIk#t?
zG?bFARb#!y@ZstF^BPGZzub*x#7fnx9Aj6lo5B4gyRl;CHfh%75dzQT_6xr`@?d9H
zwU1ySqX8dJ(_a>U*+p&%AuptNDyH8%UY%R;W6~FvymSNp^Jk8HW}me0^4V;T$PH%S
zC!M^*)Ftcjo3Y}wz@+^q=8i8*x~46k@2zNLp}OIk^LD!_(-d44<<1}J;I?E=Vq=!M
z#(jN~ll?aLJ@XvTDisBVEV-YT<@m+v_ygZvweNR-lAIu7!~g5y*7zMs+motXW}iM?
z^6{E06OW^X6%UWXuH3uLe%@>P&hhOk__*tdcX+}Ct%WBz&u4Eq8S-K4e0NTPciq>l
zZ(P?{mwGcU`1HS=lj5rJOJ*iLWC~pr8#1A(qh{S<&sBM6EUVt+JeiidszjW-Y5nAn
z9I<<=dYhJ(u6k0V)La{Sd4KpK+ihkU&pzsBR3%NRV$;9)VeR@`mjkEnWlv`)nj2l^
zz9hYD(OUm+T5PN4`|qzvSfw4mKl{V1*tsz&Ayen<x$^e;=aZ3Qn^aT^PA8Pqsac3U
znAsMXp81Q_bZ=?@vSaaHGhR$B-+yw?a@P`8r_);%o@JifT;j4p*)ZPpmQ%b$U&D)L
zQ9JJy8oV(rTsz*b)jjm|+Vx<QpPvlB^7mbsoBxNAHHW#|;&i~@6?;`R9pt?nW8M^H
z=xEyBy?9rjiQo415v48rG#2O`WMF@&ba4fz_$pR|;~Q6Q`~1-3kdK4eYs2J?8V1Gd
zGWa^?-dCyYw-s;svqtA!_ff9Bd0RfIO?h+YiSw)WqZ`vJsuwHV&(3ZARZ;xt!{fOd
z6BqgDEr?jq()A*qi7DWO<;mwi>aNz6Mev>~>ldk%Z|Uyb-us?^X;;yaM6m@tUJNdd
zd%h`Mp44*sfWVXW*MxW6{_b#NL*?BT!BYvzxl_}Q#b0>3`+v(dF|{9(-j_V2EEzQ_
z7!%*6Pw4;p_m6tLb7a`EsI7kQyT3ZvJuX~leT}t}O-M_L^H-!L%SR0^>7y&wo?XMt
zdeOjA?c~w69^)goqs-2(Sv*(Z<Dw-S)|&@OKbreeV$Zqvaz&q9cwcJY^t!p}^y>GF
zm+nqAek&tip?xjwC&MS3Bz;ebysev_?>?l(?=Rc6ZBE+b$i4kxZLLo;?GO1LexVj;
zvux+e=~v8ars~DidH3j?c+GP|*S4p9vC_Ox|D@xE`}x+)KEd4Z$X#M-^2yuBi?12;
zz5P>rHBU(TQE~OmSy8t&r=IJ0F7%-M#i`uDZ3g!g)~heL7t@ls{?P37Lv{=t%{KBs
zofank_OvN3j&6_m=O|ZT8)7?o)3>s7O((a1_HMoS{JXsnLuY^$NBVckTm9zZYzsDL
zS?O0#;S|0lc;)}z^XCqq^5A#K_0roU&^GDp6b9`rs~eAR>HXSS@ny-3$se~V)N?1u
zB=GQFVbps)(Q#!~jOkiYpT6u?zA5U>f1jntiY5s}r=-f|O*P|E>pv&)<-uKzMZ9iS
zx}uDt4)c!gN%mv8@yU+&*I_3wvuSEeS1rH4a#p6zlV!Xu_xU7wZ_Yc|6=<_9k7+}g
zEIWVyv&{=T#JUzQd{f1yDP(hDi6q;CJuQ68QezVfjz&bzn?7&bT-(29Q`T+hi+Nxw
zDU#FhxtB?P0)Ozo<0c0jcGUmqN;Yv=cjM@7d5;~YJsv0c+a|L7iY(eF^``Xf^yAM}
z(&y+Lztuk>SmY<ePmj&-;^Jm3RBC=-r>4ZVK&(|l&H5LM{DB4Cahn&(3+}vd#ZB8s
z<3X;AFJp}LQ5J`;<&N8?^z=DY{IYuOJ3;sid(je?`-hEBr7%=>D~L_{ee(V8GbxPq
zd^|A|&f8Xgm?^MK<F#tVwSsLI7VF6Q&-o?Cyv)e;dBBHkZ>KK-1_BjqDXUd14@_$)
zsHmt_R5m^u(QM#xuekGDouS0zYKHe0Q?&2?`!N5)p&QQo>Y^5D>|$Gg^R?WxfJ0?!
z)*WWisYTcCnxCkCthM!P{Io;v7x)!kuH8Gm^8Q-xjN|vFo!^+}I8iKk%W9<-VK=^d
zg+ueJb!KG$JF0GSZWpJn-n#p{oF{&BT-niA+xLCx8vhSnyI*dvj(_O?@z;{+PpaJP
zY|U9ORQL(J++_7T<_Z6yDI4Q2)Nd|YoZ_y#(eAnJqTf!bicjJ#ZS{Zd*q7v{H0eo<
zle(+*kqv7%`9z6q)L~sVqy8VKZcm-p+{5`Ns~`VSHrH!t>QZg_@M+(-^rc5#XQs|R
zpT6qBW7~#>7cRXpc{=^c`c$){&0ISfa?*}gYlwMyhQwT*=DPF?Q}WX3O{W#kH&1L?
z!@o;x!TQwf_pX;$aol_LG_v#F&YuU%dmL8>m2!P)+>;!yC}PxfEnoS1<oz`#Z4(M6
z{HyMHSbjysfraIZ(5$P!eXV6*EV=S%N6Ut?k1_Wv{+s)D*!~xrmvP0rvFAW(AjjIE
z8%qi<=-2)^RnzupdCHpH?Ck6}HY=pwG554xi%ssgUz~QVT%4^fBe5>*m0Qk|$Zyk6
znHUuHvgzM{_I0Di^tj18*$mU3Y}RuSS;9HZAy{&~j_BgN+NaUSrgA+!H(PcmbHJYs
z9o`XhV=Er1s5wbnJi3{(cuA1cj0x)D+))=*%qO3-Xy<2P`q@}+_oq)LrNu5SGU0I*
zLytyM!>Y1w?#)5E-0jkZp98kA-qTp2F~wOU)<7$<c2Y9S!V@Y2U1Ch~OoDrZ4y-eD
zSE$c8o>+Be!V|7t+%XI?r`tAtzM-|yOmI)o&kokWGHvz5np1yXPmF8$-dr_FB*f|D
zwW_8MHTrV3Ug3H5N(_t-`J-DWaTHasJY;NiH{H6)gTL-$t!2el<|kivuyTF6oe=Aq
z$IZd2;}jsmVDsX*aMruUlk^`o2(Aj*c6N=;{u-x~O$(m<H(OYxwo`Vm*hX_D&Odh_
zou6`2Ye|6L)jQI>Gin_lJATMk&dDynp!s{h&g(8QF%1`H0a51}?xpqz&bv!$D2WwW
zyirJBu6sbRtE0HhIP9J~Uq5H95$}8Td9{w0_2(PykQB2l{Cqf1(Po33ccBu)NrwxZ
zC!J5UH@LO<PUo9$t?ZlfcIWq-iiyA8pLo2p@VoS;^!c{6I^WqOa^LPwnPMvZZOYv*
zdx~F(34dDCVmb4gOk$Vo;Y&U{j$GFgJH74tl1+!RlTUa$Ou2XJ(jLylC%-)oa&m-C
zW7SY%RcPEJ+OqYB%5#&d1*MI9m?dpiuIT<d>EP6<qPwf&WyQtTA9;1A_~luRr@K|<
zk9|>Zc9l)8Eo}{BoF(9;@;A43(&V->`_-Q>Z!s{{Vvw5J!}!DNXt=Zg#&a{jiq4u{
zq4oULr@7T3Yu~+>4XOA1mSmW_h(Sp<=-#|Lp`LHcnJ(N&aEjP={z>E+YaSEnB029z
ztVcE<5MKUy-7dZ&>6Vy7-l|W|2yh!FESh3fRFM<8UU~OMl~z9mf5%@+-<IXQe<fJh
zK1YW^MuI8%q8ek^g>=`CEys^GWUgWjOUa)WkQi8$ljajBWp{si{$BswxwVg6o7*>J
zHH)5YJ#PJtCvM{Nrj0Delukas<HX(cEPT&Hu3H!R`R1{=xGhvySmb_bcH5EX-D)aa
z>zV)Vu`qUgTPv=5W&NS5vdl+{Ut{X7PnpX<>yMF$YSd=WrB60L(z)HX=;uq$o#ON4
zcL^MoykIS2Bz5)AgR^bl<4fNtz4j52xwy#i*B6CY*WIt=SM{53{qAwY=GWgxzcfCv
z78M7rH2cbyVk@=S`QGe94Lp~)k8w*S72La3?YXDapd#7nVX5}A>#PjrCEo)XE?WD{
zh?=p(Q^bAgqbFUW#hHe8ycYl5cY0I0)}xp2HkB5Jrfm3Frmo_}m9nO@{(h~YMvH)3
z*pvNE=MHJ`uU`;fB<cIh;p#V*g9qA0rp-J3KA`H|PKgI@dhyH8={=s=cG$Y>k&=aQ
z&9aTp8#mwi&E+6DgZby<8|x>o$lNRBx#jY$PfEUazkAm0`D;4)`57a-&1U*W{O3EA
z^gr;O@39qYX8va3w5L&B^+{llk<ESS%*@xVb=|2Fn^d(r3%Qc{y9@g!y5^;GJiDxa
zM8I{?gOjc5(taK3^8aOHC3d;2)jb=st)`D>^{;IkmCtc~6D<<=-|VmZOmJ_f_PPv9
zf$Ldy&7Rplzl;uje6U(9RsTS;)$!*%f+lb8GEd^0^2nHXXL~`;1nW%Zt5ZxSh8UcW
zP~+dL<oa`4_hZHN{BE0gUe9faO*xg7@W4FunewLmtHykPTmQHuh>P?b+W+uhr%O*&
z`+Bb>tjnb0qMyuSmw3&*yy?y4*!7Q>Jg;1TLiFV0=jF5HY8C3AB~&E-<*sYwkeO57
zvQ~L3U;5LJ?)D1;4lF9rQ21@i@E~U6X*2B=Y~Ab&ohC|hFVr|O{qybAHCw;@=A7ym
z#xLl=af0p8tu2cdMig#}bdP+I9ypgz!Edk2hJQ1YjOxT5aPP^O-KV~2?b_B^LV;fC
zpEu3;VZ*{WMb1XL<FEV6%-lF`*TkZWKC@XTJnX${vi75ja-@~a%&Du=PF!>_WNPVb
zow!|`>-Jj76D_fBNsrb}njo&JoqtGT$&Ze?%&j$gpY19G`M%!rmMJ@+)VA}spxLQY
zGKKFiubI%k?%u+46Rkz&$fh$^#7~jGw|Dh-rrLj(_fLFMV7?&qz^?mcioav4Gn2Bv
z-?(gaSK~}`(Lqt`?W?0$ZtBgt7cuGc@@uASbr;K&6?BEw7@qcrF-3%be6ipF=P4fX
z>#aOd%Pz5pI{Q8{+)$+b>>gwBj<tu{KI*hY$2{1W^?&~>r%7t*%U!>9p5JyV+V6#P
z>;?VM?SDQoC-dC<Yx3K|iske<=iK~!afPVct5UXq6=FTFZ)y9jXW9Sj{~PPRHt%0x
z9sfIb*SB}qRp+y9V!p@1*#A%>cE?ZC%hNN@8`yi#mcG_-NU8VU|5ncMNB3iQ{ayHE
z8|R4@_C+(2jdr+nf4=-F^vRxedS^Yiy0%<U)RB2E`IBSwc{?TD*!xp@yd#X>?pZpg
zaoIGp<2nrIMZ3<eS+DCY(ztW|{M2I>%x_H<PkgukB`AE*Gw@Z=*7ps*7ftoUQx8O%
z%{@ME&5qB8Sv`szC%w0Q?=BDM((ime_edAlrQVuXViDE3u2)P8jt0ie2x#d#wBXXs
z`pBY_OKt=m(9=lHeb2haw#Yi6*IiL4v}RYt)mtC(q)nzQsVoe;7H7lFbmUW6MrFqF
z%p*H{y)3drwRD{L7*EKjvmDu{tg>yJj8OXr_a|P=4YMcxO0BGC5IN!MZhm9o6~!kV
z%cm_dlIN+4@?g}IXZZ2q9K(^<Dz8^3t}iuQ*!bNh=eyF8=LsA-XZvSsEzzBO<<7OY
z5`hnNolnH;BrfV<c(&y&SC`h-@~@oxCL~2oY6>i^Vmx*8;eKa+?}$Zv&o5Y><n(4u
z__swah70QrU*CSZQay-geT0_v=e8OnktvR$-WBe(VOQ79i<|gc`PTBS|G7lN7k<8e
zCg!=%`;a;2PgW|=_jS^Ip5FQ)cgZy$51ZHh-_GTEnQc80cQ1))w}G|l4d(YV9{-G-
zQFCxf!3hD+y7q$y9lg|qmn}+^DoSo$cXy|Hk>d85f=c?LTOyw^U7u6(W2R8{o%P$c
zOFauM@_o2AGP+>Z%GVBG0^Gy-OZj4^I=QWA(M;UB=<}aV)4U(^w;HrA_SD>_>Sm<a
zts*C5J9`56$!~G9=GVA!Uw*uXKkm|rx8Efz;wS%J=V!Z&DS6X9?f0HLG{0TGvADnG
z&Uc=;r;ksoC@()2b1!&fUe?RqUb;6~7cZY#BD(N=Bjb{;9ajxR9SW!a<NH+g=w<pQ
z@sD*voX4%$>f2*3bXe>W@0ou>@=j8LZOPwtUncO1_Dqzi(o}QXq*j@?L@#8C*808{
zo7Fbb>(V6;GnI&)Gj!^oc)Rrrn}yPn7hca<tA3p9KT>h?-Zd}P`XDC*-e()n+-!C{
zr&rNjet4hN%NNSF^+Br-rSJUV656rqX+OuYN%h)KTYR=|+j{xat6fhv&dU0r_)yy5
z*@Ab>T<;$4o^&tp&Z4Co&r2q6^_(JWQx&?(Dv+;pS{dipBbLq?yH+afQaH!*ktwXq
z?T13w!vDW)4NDlN&*+%C>WeV@vPMRpg~v|h^Z(F&CA&-Kw^Wrc&qblNNkOR}_7!Z)
zSo(Lf)P&*!uZ2aHi~a;ON*%o{HtqV-rcEuo%(i<r?oglqCqm0}acYR8Oum|vp@N)g
zW<>0r!iQ6jMuuHWF8Sy;|E}{|rG=9&J$Gi(TD9)Q>&IUsGA?rGBx&9|AiUQ1TK4BB
zKKmBm)n~u&zOf@IPUP9GOM6s;xmG^jue^QX>dnG(=^s0yqReci#Fuu|m>$`u+`@W(
zgVATFLrM&B-evbiOz!)x)ieHREPDEqv}c#DA1C8c#(Srps$4Xme%^Wk=e6~H^Xe4m
z?%)&QoF~o1w6p7WX#kI*%hd}DzPz%OGv6|M&()?{j(N}d?U$DC|Ezyx(WQIVKA(dZ
zZ_0Gw+IaK*|3~j%i!oUK3lqM5PlESl%O;n1OhS7<OP?0HCGsh8@AithmCn&TJj^-~
z%!0EwY<#f!@Cp@{HBn3EJ(Pa3ewvSjeuwxiQ3V;5{SUu1>HJQ}j8crZOfM@t5EAiu
z>gGjnRvqkVv7aC+uztE`^t;=6Hu>T;0^ECjnRItg+5S-^`nJi1&}&uFSEL%N!WL(V
zcOKe#_}}64b&nr!U1)nRx9W?auaV}jlkxxLlS21?J(z!~)!SV4NlekiriHQ&b=N=a
z)4D34wD^J}8>7<1!*8}UZ0OGQn18rcQdsFYi@%e(V?fw*-*Z>fx<noB=;h}+E&5Z&
zxBlJ!n0*>kL$>zu?71{S{6~I>=akx)pKsTm?F#CA_wo4REjH$wzPYMjOeAc!ykRy7
zJ^wp$lH=6%TE|1;W^LUjv$J*6!<6T}9gV%uZ&XZ9+SE3ol6iXmX{pX~_4E!#oz*LN
zI#=+XdH?Frl;9mMPJVBT9wvQ!_Wt3WMHbCpwnfhqU$p4yr`odBid)wmj^b~4*K+v7
z=LJb~^(U!tyYbYYQ1r^$GVycX<np=SH(N{=-MwgI)AR|kTW>h!hgAFt2rZFS3|}lX
z%k5g(3l$|Tl^pS@0^E^oTU3`n5OUx-v}Bd(!fWU1y*J8jUdQox(j!MFqi&~|fC|pU
zk1rI(dt09999XS>)MCk<z30y{uDMloaZb4XOb_`lizlx-x98gIHPe;LQcu6-I(;?#
zTvPRb?Tq7_Pt;zFm{l6Jb5{8`@1uOz^WMHNTDWjceDj`X%kD4m=Q^#xQr2C_<MfJ0
za?5XtO*Q$;8!F_N2Dk^$)_i;ZxAEL4aVPeEtrAThXO6}=_t&~cwmuupR#fR8D}K;h
z5o42jDUV&{@l)=VT%2>IH)tz{=kf=+-g-F2UscM%aI&@6QHl9~o90fq&3cog=26A9
z+GlH)Tn{_@+pJt7Ddeu-`^cG9TJzFdf|QPnerA(dSbgTpOw*mI9~O8eZVd40c{+jf
z!?7HreNOpLMAi!*`tWzp_r#6{J=YVqt4<ush&r(*AlqAb>y|CIt}1_?WdHs3{69Ta
zzt~rPezZI2q-}&>_dX5L&*$n`Je#&}i;Lx&(Ac}x)i5Ns_V?>6SMIsqm42-hEwE6b
zitXpC6`=>0FojF(D-8c;u&+C7wf1M>Bp%s4pSHcQF7EF-c;o1;Q@5riCmh>%(ooWE
zX`D@Q^!J94-ESmzWL}b9mHM;z$t&5cOurL$?z*jB8cFRJrd7TZTe?@$=3JHXTZV$H
zqSMosFH4y9_j|y834YgO8)P;(DQ59)-OMw?e8;JK@*J5*ZaSu3m;Zls{-wM5_5Ezo
zyEBcsZT6-es`wdOtyk}=bYMgNg|eiE=PcO`mCm)3bw#8f74MlDHA(BKTK=tD#{@4(
z_B>qV`B;@Dzaf3s((DtN-Ob0{1lO$nG9jeaR8T4{j`jD`qH{k3e99%5-xVfig#51i
za{9gZ6%M)2zxLi=w)_51<(u95cK<Ec>iM0%;}mB5>*{^)(`z3}$4}&#`{tQgX-R3b
zz@(OtRpNQkg414Xp8t<mzAshta$kUa1y7=F)Er55d+tclG<Cx}3ny>5aHx7A?}hl6
z>gn3f6))<({{26_vCXqZKeOJxdh^2opMJYC7Nw-qf=U}~tW%HIPha|LqT+F}Ub`Ph
zI0SjUg`Y-j<K80K%`>Ic<J3BLA9)vR9ntpCNmE*Feq`o7+G(;OtbO8?`%jsh_t-oR
zGzt^lG54x-*&XKV=bnFFU%{EK?xtEIBARyAhIK`T_H*_5|AV@iub7=a79&?~DEYn0
zX`?e^a$S%%chW{(Lk@=<%Y*giv0968uPO_Tn3;KyJK{3y2l2D_4cA|iaw)Q^<+~8H
zdV-LEs94h1iv{ebpZ_?!-Lvy$eQLvs`yZJ+f7b5i+5d)f<qvVuqg|U9KXBi3^v`__
z@4h51(c6#euQ@+wYU7w=S;1ZYWy785EjJ(N>9|ep|M$=S!gBk6+OH&c`CPyElPz{<
zale&*kA(M1kycIXw>D)ewTrnFn7J!V9xQEGaP3vwjoBHlOb6vV)qVA5=5j<ii&{s_
z{#mtGyltiEPc@B(K%?G?N1dCN)QT7-s;){rVRa$FV)xYYqMnoAI2N%727B-R66d?z
zH@iEPt?2{PA_KO2SD)zq=D%v^@?2Jd)$&lIL&5n!moKZROZ{Tj|9$Guln}8g&u&{(
zGnCh?`*8n7D*J@?Rh<SiIDejg&ZBVnrprXemzLpWv&y<Jx*RTwJ#zo5M*eJt8-n6Z
zmj52r-+yPDDakB<Kw=R?$imf%7q<NRFngQVhZ@&Mo7kN{35zP|E6CXzPE6jlaob^s
zg0SZShf;n<y2;n+u(&-FNDS(?n_hWr&f@hV&m`Hz_w4@Cue&(F+mE9pu4qH=@q>!D
z^bW6zxG8%n`{ulBa}&2r^OX|0G0Qml`-3gBZ?y+p;B~c8U}x-8e6H|+Lb`h8vuEcY
z9O1s0Z@{*t<eS&hgcsSS^WLVh1QzveoftQ1rf+4KKsbZ*8TJO1drUj0Z&LqkdD48!
zgphsx6QV05Pqs|m#mO5aQupQg|9hUj1{ZlNk1q%>y{i7<=CR&A5%*R<3Up1*Ub5mu
z%!WTl{_Xx>81N;p=X&}~P7{v;&sDAIKJj;pD%%ZzY+>KiT9H2|_>JzIr#6pw`-a5E
z%}f7lqMg2c>UA!+9n0tcZL<2+&iY3BZkCP7gpCTfR!nA4(l~qkt%uQF^GlPK<rK^m
zk<oneG{>p$an&uQoOG8ds?Vi=a}<fq$o+EAT`1|s_51qw!YeEr7z@rG-~Ugu_I><+
z^Q1SibLTJFc`{IQUONZhX|qQwpZ~x5MMhZ4+WcS0wd%|=ADh<MJ|T*im%NX;xTR;3
zef^*E8r|x9Z}zg;HW#zYe3-odSMYIzP4mA9o+-Zht)ZR8pDiWs%I*x0<%UH{&rRgy
zCqJ_Kmod5GZ(`4pKMc=3PE9^<b+zkC-<?O_BWB1g{%!yN{IX9~7cAmct}dRCD6?Jb
zx$$hz%Qs$d7am&CXV7}mhnw}mii_>?o);xJJKN`os|$X(G`~~M!N2fKZ`-fczgFBj
z#(w(atf*!G8fE3)Zsy#SS)VLztlJ#FL4KlpSJws&uTDRP8K2L*>bk;h@bgMyXHC&{
z2a7j0*I&P^k$BW$`}5oO{|+UJRc8HnYW#x?8Wys;>z_aMZ(r&A-Abo7_<yK=al~+5
z`V)@m|9}7gsSlqn{yg)|QQ?^@I7Ct;8uVO0>&tg2{QV~XFWjW$Gjrj8`@diLD;NHs
zR@J`FX!aVT2ft4<x4Xz*Q;oHLnf2E3&Ze;9TNjU?;7wVr_r53jqgl%N2-8)4?1y%S
z-!)h=H}2x9+=F#XIk*4bscWrq!01S*ch2wJ?{x>yITr}upS&Wj<+URF;%)!ud<$-A
z5AIldS4ZX$=Yhkr%hzTzTw?f8HRll9_lDQ9E-pPx7iVZNJy|{_Cu#ZBe8o39;iZ0S
zCoRd2Tw9#`^9|qrZC|?<=CwC2ez-dK{lZ-B->bh138c2$uKIdr%Uli#fuqH-Vw;kx
zwjI<inf3ACZ$Y~cB63S-O$%X}>a|!^@u019_zNZORS&Z@<ct)m{Z1BK{q`!UEbtDq
zWk!a5!y(ppbqTY~HSWb)yVR7{HBFP;ld;6v|GvQ2m_1LYY@D{pc-uh*3A1VM*M8{=
zS?WA>^V5~-TPEJzw0F`pUOAt4k}Vp07!{mPv^EQJK8$-+`tj!<_n<`v>mJzb)r)id
zF6SWE<tEw@et2Eka+iHs?PpK?TNjeuvBpyT8ee42&VQG)O7@h^JALeU0ej+|X^)?T
zSlqR1pJvTedi;G&p8vkR&lDtPZLgKusrb&ay{2tWS%=roCra5{+BY7US6seZ<TR((
z;_&XMD0kymVcF02H{L5-C3h>-$#jj#`6t_@!@aw;qt7|;@9N#Z{)OHbY3F&<TAF5g
z9aBqR9rIb{s;uJ1+wZe2OOIsTUmmr&UFw~`b;|__18vh|y4kz0cKyB2c-vy3oASyH
zS^JIaCakZTqbbq*P5hkkxveiEj#Y0=*_?aF&}DhX<au4PuU5VkoMG7cVS>y)t)1!@
zEYq(@a9gI|Kj?gokLPK{>+&1T+xA|c7Q4co+i&OhInOpL@oe0?I=rLGYHQkd-_1w3
z*Yq)LpI7=``;OpW<)t%(>f@bW<uomOTe|K0@o)P!m7S2D->kV^`>TA4?e<{RRqHlC
zE#cc*bNiU&)=2A3CA(J{TTZ>TTIg%>CD)TvGLrSKE^OH;d}t|~sC&GG|30w|B?jA5
zcP7kGy>EInd6g;Kp|{t}rTFeWSQvLvu-9YF)2>U#7Dwh4TYH_o$XlkVefsD2x3+!1
z)NV9yZJX=n;`f~AWnuN&iEi%irUkJqK2ZMuY`y#Sd;j|+RG0kEQ&dmkUn0e(apwEp
z`#+OsRsIa%v3XzjdVY6Y`}bHGX^z<q)sm{qgioqvy?-Nk;Mb>{%qzXx8fV1rP!zQ9
zUQ(y)7_a$+Z^upk_i}g7m-F1TdiyMpeP{gDk48d=0=O%WCw+XyW-EC;+g5+!o%`XU
z+1_Qv$?S=%?tWPn;eW{b2baOAyi?1*-fTFh?{Z-O+8tjjmy{m4X*MyBW!jr_x*`Ym
zl}MUC&^;;k$+}l){nf?!;fk#boSgQ(o8A1z_pI@in8Pcd^JhFdneN1Qd#1oQp15W2
zxW!j4&W~7gVZ*V5T2c+_=^tk4&e`r5clGI3#tAN|drmH&KZ~nq+olO|OD~z1b~`mL
z2zI^n#MyPurr&2d6u&IashjfjmhofXC)Eo%c${tpWp_`BiW4}kt#c$u<v5@CS9!zh
z!3Q}GaGqH3rDk<V+-}`BaoHNvS4o{K6EK?{adOI@w&xrAE-qVjgzIN+h*Em_&6HDB
zytn*b{MpZUk@>hLfA7Q<FV1Xd`g8Z$A5s2UvJV$Oi7TD@zvmjSu29+PfW3FMmTL$`
z@-4J!eqJigePppdYvUSOmt1q@{qF?=1$Nt?KWK0}?|fU5rMC9zzB%^-UCv)^-}$fj
zhf0g=JdfmpZ83gK_Z6SrD1T(Mw(tC*mb7^vKin1+&zqx`?PO==@i_J1=jwfZ|Ia*`
zS<P_$@Jz<ob*zi7Ff`Y%7Qef~_ULym(e}&SKe&I~eQR>#;PMHFnB4s?R_Hb6ZkX<y
zJGtj=qn?+Z-KENH62_f=+lvhzO7cG__!29zr14<ltt3a*(<jb6@jjJuX_C#I%l0}`
ze;=?DpC)fyacjY{X?(AC8aNdv`}3L93++07NPgZ1{pTCXswCGoPrkRfDIhm1^0lgo
z)A{}Dvl|rVgqWVWrM2Rp+oc1!AM10c@BU}JYi(lhy}zZBS(U9{rS4T!@OX1Q;QO&>
z+E&@1uD#7(+g2RmT*%+lA<%p6oZYJzvLc&0{<kgY@{pLe(m;LZ{(vtvq9V<+QWe=6
zrMG-Oc|l8IVosUE-Y3BmKgwj>P+D_Lp_U_>d4<b4)<-XlrB`p68I|mq>6Mr*(b?9)
zTC*_OvRT5yS>T-(cf7k%1iwL~*xbvBS1Z5eO4j7XzmCyuEM0TYbN>DMzPP(j6~ABq
z|2OhP{bcbs)y>;xsQ#SQ{_mfplxSa@`uFygapF8*mYp#EE|dLZ`+3n{eEv2Clfx#|
zPyO)gTd20n?Xy>f+!G8FjQ+$0U7qpg;14;W^YyF0Wcql^ZHeFW|3JWr{qA>}Tef>o
zy|`iJuAW5|jq~o=O}3HAT)3>rb<(2AFSi_-TK0{P)8lePVatcRdw!Sh3zRl3{pP*%
z#otLx<rV5Nt6#~jy&s(O{_Njfl_BRYuXwI%bHYON{eslW4R1<is;+H#XP~x#OQG)D
z?L~_&MtLt3GqSZ2H0z$=vn8|Q+t2eycXg~P%V=%-^iZMo#AK(#p-<8k{>e72%P?1P
zGj(lw(Du{#MC6CxOhJ2?&i8%b)HK*MQ&8W+X@Vn%>idrMkG~XeX5I3vO)h;)<2gkR
z1rdkE-;C~6#5V3R-&6Vh*z6_e_dM)<d?)zA+gWi7?y#u{?6TY8J#pvXH}0k~*O#49
zoXg%KkRmuW`r@aY)I6t-MNekAIS1`#IriaT_WJ<s&t^}8&hM#6`0l&T%gRS>YtF0r
zERS<T92cKCBo_HmFH1gSS%vrZDQnxbH-_l!xUpvbq*&Xs%a_)u2+AKh!Y;&N@FeX*
zMZwypE#W6?Qy)h4zV;24S^iOPSK-IzA5WX_1h1YdS1wuhc6aFdD?7~N^cS{&Jt%q2
zOf72D?~LEqC+)En>i_U<Z-4=_Ah$-|hPl$a=BlS%ZDF}u`DoTQdF#)oRAkPdd}<r{
zfpKZWUtY-<jY9l3?^OA1Eq^>!?z}gv`t!Tq&+GN?SRIzNsuGF4r13v+Z})A*C3czo
z5fd{G2;ANC*Q~T;%jM?Z^Djro|CQ}r(xfO8>bA6NODflo1r|a<o0+B-X#ZT27(R<@
zb@UVO63_eMne`j2(x-niYh`izxFk~}R`c?&LrYq+-)^6?HjKkH-jOFpo^!>~MV@hP
zK~M7vx7<>xtgNhbUorLk^Uq}u6<HJxyi8m*Q!CRtZ$Zmm#_zu(zdZbW>|pEUWBZcr
z8$?ze|FA>kjhV)`xshE50$a^fggF*eg`HOx{L-=7JWhP>)9=6UzbOB5?$%45`R70J
z@ZPhSYI!eG;)Tk$P5u^BCmnkFQhdusBloxBdd5Fri}dW@w#jGbn`I#hZeK%8mbkZw
z2BmCzY0BmPsO0zD>PxqSE^ODIwBY6R?=R*5{qcYKuKeGGy!y}lnv*gN&(2;R*TpaJ
zFrxPC+)KL`@0cpqw$sL1Q8g-azJB!UcPzVgZ=OB&eO1#ETe~e%^Ec%!uevF{X{BFN
z&ehr8XPK}3ynnvj;Ra(~|L>n$K8f=%e-NpQ^!!(O>-aAAJ4Xa|)+n?Y+^LZiop_G(
z+*Bb)(}FqS8@{KS@0go<kw5>9%msS`yUI`hGal>wzPnHE^PbN>`%kvDUG6da@Z{RT
z=dU$(B<w!4FE(>~%%X*_^Ml`CFx3iQWn%ejM%Xm#6}$5rmMuT_GQIw9z1M5i!gUMJ
z=P0UYT01L?zx*`SJLt~ovf~k3X5O5#PvLcU@FfRZk=#jYx4DJ=Gv6H4U)e0V++Jj=
zomGaytvlCL*Q#G=f4yO+*)5rp{d<E73LZ9<iYI)y`Idc2{Yk_8H@8?<pDnj}lXT76
z!mGl+*qCWUQ^VWR2~%s5-}!fKSoK>vyL-ory*hfk&pxhu{%^(46~}k}dmd`I^YK$h
zu8qqRrZN>c&s#O`s(EPSj!wfxVhWd?%J?_Q`tCpf^1`FQ-<JLEmdxsrwZAkRo^3h5
z#O+c7f9CG~%M1m(r@GzGJ=Y)2mi5JPFWdPKo8FtrvsX@ge2KaG?9IAoA@?Qi)phk1
z`ipno>74U&@tKX*tCH+*ywZ5S$c&5gH&<oE@xAN)g4dZIoANJsa$;3p`D)#QD|<^r
zDl3G(hrii(f7zE=zu0<8W|(N^`nJgPdR~3b;VyLL(nal~pDw-j-m-0%lXLm~<@bNQ
z`<{`R*mv!E7{^@IPd{b0ZrKu8p1<FsRj&4<=Fvx-ToH$KPA_|D>@|P!_n5R^r;TYR
zFFGc_O;FJaWw=<M{p_gtl$@+(-P`R29yUFj+pgNet{VET?c%#ujs;DAD_?yvx%obE
zON=N>sKV~wi>`1Pe&4z^NvlO$Ox!7L_rcty@4nBGQ#V!Ja`ksxz>Ud4zqWpE*#Ee$
zqW$igbymkUN~`beZ2tPLmA8*EC}MZpyRR#=e)BDoUBdi&!RwXTtL?A#-AlPPk)^d-
z_T%E6Yu}l!GynhY{grk9J->5V=@u=Snqw$$AukZ4(5Zem=&8y5i@r>UFI8AS(TH2l
zepTAQ;e(?5mDkbQ*3u_W-8#SX>Fd6G!R#!4@6Nyd&hw7#%IbA;3%9zs2MhcC_IYHf
zm@gXh*4^!@b+Fa(uTK_8$!A|r+-{kz^1tNX=}YVd_0{pp!LPo)X-eEsX0H+GX43R+
z<=t%kUG?jKuMaye-zu={`@Bbte+$K@7F_pPG4=nuJvsL^x5yvbE0DD8Z)$e?ysK{M
zyRIp`KIZ>!Z|H8Zuis|4u_W%hBPhD+_Sw2s7WKQ%ulP6nUiSVtf72T~&)fgwyVH2h
z>s^ih_up4f$<=PZ`|WDo)2O|B-`xv-_kDf)YpF!88a288xu^C8&EaTT{CUT1$-AdH
zwu-CS^Yj&*4}B|_ZL)uB`htt;8|(S3&RaAesBM2~yXpqlrwg`Dj`Oz!IUVmv@m8Pz
zQCCV<_G!Jg_r;m-=G8qb3jD~Xr>}S6?|HjLPnWW;e5AM5Fd%YSOh9YYq^?D(yZ0+R
z@)6FxTk?GNetp|L7dDinX5JHE*?mbq)ZZ=Rs<6um%Ofn;%-&zybL8-j<KI93bmL-f
za&gwk-dnv}cSD|*?y1JJEw8T#+qlcFs*sM9H!R;_&M-e(!fNlmAJytN(-sM89=YR`
zxN_43Eibc|$M{?L>iX{lPvEWbE8co;R>2!n{~6I|w(njrY2E+X6WkxEePFnnRS~dy
z+B07H=~v%xxhC|Q`R8IMnfhJl|IVJqyrhU%b@Rr&TX`<kT00M3@{B6=za+Fqf$@33
zL7QWdQW;m0m+VwbPxQ23x$}D3nG@peZ;l<fFM8+o&a4m@#!W2y!}X_E1y4OP=W5Ij
z<+&T$6&`<?vm@9sWc#c1JFfTqve#=i9JSs0SL7N0=O}Ns^61-(Ta+JFAF%Iwo)tau
z>grQ3)RGx4AMpF3H!sq#L3+(~A@0kQlx`HnKa_0HF3@GjeRFj4z3|_b;qPjf&tN*g
z?AWQxx5BOZZ+woL@AN$G{K402^tUkFjSJ*hrLEAs;eNriZ?BXi{P$g-w6obpyCm55
zoFHerh9v)G7d79z%+r@1`t@0zUvu+5oxmvu*A)MruaGP*>g^6+cX?{|_LmQz&ktY_
z_gs6%tG?^u>hc+(+h(6y^e69yZN%D;m9319`Tpj{XQxj|W@Ngq?6vpwL+i$)f!E%Z
zy<P3V%DLk0@xmzqr}s{oZdAB+n)#+9a!)S2RJ{28%6{#@h6P8`Ec*n6w){L$Yh`UM
zy=(W?#l<oVuXpgNo7v3se11Il>!JOQk{S{P%-a{Ye42Od!dJV~mUg+U%N}rWG5;3)
zE#t*pziR2b(x7d51`Aa#@Xk1QI?lSU^5Tb2izlqRUb^G@PO&NTo)*i0y|@1JoYg+Z
zD}x^Fx}RPyyrQ}0xyg0!)Yjkk@2a?_E?jno;qsa_YdoyiUB0$4>gx}M880lJg%!4+
zn%W%W-pO9~rBZ6^p`bkrs`Jc)mi`XxeNuh$`}L<iJ5wWc`>eauZO-hgl6`hHM>YHW
z&TF67RzES|lev4i_nX9r3wenvc3+J>nYT=Ha@=xlW%HBmNxj|1e|8$F&Yrz;d;J8l
z=jobT_Z_QNb$Y+&d*~~9nQ2^$UxZ3T$oy{FW;RV#<;%6-_r;pT^IwZ@SC+C5|8brn
zf6KFPdAr{5U)sFfpXErSNZy+DA6on5cO0zhsCIDB`goY7W$FC3jceXsyZ(3wpX8c=
zAB`W{RA23ISf#h<w$ZZp92070yqe$3wnkiP-SQ=$Z5rBd&1s5ixOMN|yEVrvGhY2w
z6W-svZ?jNRs8m+r;hop!-`dbKIc(Xg0MRus>#uJ<RD1LK`D*ignbdU)KR+n7dvj<1
zyVqN<f4=%pZj+yKwBPLyRo7gesqo6byLX-8{ekG+vFuhHZ51bK`Gfb&{Iq3T!Q;Xc
z^B=EsTxi+!K#oH-{Lzl<-ybgd{pI<8hpF@b*@n)15WDLyW9iqJB`Mz0xv60<=dQoA
zcwb}Uty6hinmnJL@2>i-s#TJg*p_#vuAM2m%-JbM#&_Oh-B^)MQ%=P*IcvPvWEzMp
znPl&`@tXuMZ|cjV-P0e{xi~vpr8%wO*>i1g&-25Hp{p-==I;v8Qk`bak=3$oj*Er-
zy3X>VW}iLx>!PgRn7?;C%*L?Gam&Voe%gONs~pc%c~JehM5Il~WourR$J91WxosUs
z^H>c-&OMm-Zi8O`pUT71>innnY}8Hm<Gx%Y$zH<Qv0!&Y;@-a<=Nl~!HN4xpugW;J
zS4`(hKymL6OO1&(y){1NS8H{5MDYLLF`s*m&b?dSx^w>?IxV)$P4nIzzwP(`^RC+S
zJ5;Sz^Vh@s|5#)9|J4&dtXNg^KUhk>`rIdV&&`*Gzns1QCwH=Q#vVNt*VIkYr%isn
z<X;h>b@|Sd6(Umwz3Y~qSYqIq8~gXlN%r(q)6`qOGMfv^#l<pN<ot^q4R$gt+`)fH
z=kC!YKd%JYki<uk0%1}5eLDmh+OD&<GrnIu`?ar<X!Y8a%X7}3kIIsW%#FC=c&%=|
z%nUbHw>=Me^D7>gUQ18s-EjW&W~~j^HpECAy_>k~-TBND7BY+nYVTDTpIET0CNbBM
zp|O7Bu>*$>9Q=LuGMoAVxl6k^mK#3MxwPtSh1;K(eNmV0y{WK&$h2pz^F)c(nGaGg
zYtE9cKciAG_ul_^`=7jT&B%JhZgP^vVD{Z589I*M+?!PtH(lj&eat!edymTDf;F95
zOPO-ltiAB(j>yv`Crbh!c`fb~vkaNyUfrY<y3%KF?cOaDPf8h8Fcg%@G(9o7vGbYv
z4(+IYezRp}2b+JbGyf7NDtABRQcJnhjgBaey&s=4c(C){{?uj;^5h%42OAj_?DYS7
zZtds~TgE!=tEJzBxii>V7#BpZK2~k@sAjUGi^Rd#tB<ZSXkc!9`!L|<>O42yXUA^%
z+r27$7wemNu>NuE9mOR<|63~=?gj6ed$6IUex05{`)!}@X8u@(Y0KPKroWKdTJj~}
zd~5d<zqOar)O2k*<{CF`nX6<WKY8D^d)_r04bGmIGLq<2)x3Gh)%We*D|c_FPZFQ0
z5VcfC__)n~+pIMjzt>#gWa}<CdTX2D@|z}~7tH2lVhQz)cV}$py>#`e>g?qGDFR|b
zYv+W%|K1T^cbR3uI^}z3m7DK<XfxkaX!rC-W$nAm)n%`bREIfDXY$y;ZpYe-#n};h
zulO`3T%Y4;&UWbimb=~VZ1;I~HfA_qQ3?!N`g%=h+4t`G2OA&MSo&0VE`C&N8uy^`
zuC3hF8;nLB_Zv?u>X^(w?Irc#YxzDm-Q3tOU#{CPWBMO`{eWoI@9h1`_Z(`rUCRhc
zGLm%o{Ig)sO_RyzmaSa;UMY6>@7zT}eTVijxxPKbf9`d(+B376J|B*-eJ_<z^!T9k
zE+Bws%8$@v|8}V!Jrr6!t1|1=y*5z?>6-Uq_m&mD`(0~iE3?(`LevSiX>7UmAC_@A
z^Ga3<JEiOer`gkNFHAzXjsDm??cIIZ%5V9@Ju5HO1kJNP%A3c3yE2k}?bQYK*SCds
zY+&+S^Vajl#DnI{zjtz*UAv}ek#qm$;S(F0AAGsXw!w0a^t*kxC1!EYOttKMwdk+x
z-6^+ET{`r|Tdh4><iY*r;m=pDO?OeUf5;o+)+qOBVn)yY*%PY_?cx<u?yQcU9dhFN
zik*AgJs%ouepR+g<g-qXaf;W*Pu#4FLOM%>O$8=j6WJFlWHgn>N#oIjove$G?aR9H
zxKN|-*0L||vH=dgUXt^#9EiDM)_L74^7QG`e&-h~&UtmKca_%@g|o5eFE<2ym~;f<
z-#<;eKeJsjHR7t0X1hN5+X}^5oZnaV9<n;e`2J?y;z@nQa{Z5MUrl6s8-0UAx$^L2
zY4^LkZ^?h&!J%icYc~4|#uFCzf<hi%|NCltUALQF{Nj}xmtVPe*MIx{-(pjXB~L9A
zTN!i0SW(BbM7<-iI9ob)S5@#LyYTR7ngM4F1@D{+==i^I@9O@f&a_X4KWEF;d+q;s
zlz-+I))(0|&C8yJX|+ZFbYj$Eopj}zt;5~eSd+hNbZmKE`?Bnbox#(hc}=W~(XyrV
z*@|A{uW_>?Dr3avUB2hB>jB5nwO?m6g}heF2+2s^FUA!b^5dfE#b+CSuif!wm*%}H
zSI>l;1NW>}Kf44@-w%5izjS$_a(1%4e^HEb(S>*c3y#EW^_P*8t@vHk-|e-28xSaQ
za;xrz!gs6PUK-!~aIBE8Kscd%yZSGUbpGcI=}vP)e^^_H*|fWcq^u8l(H;Lk=-=Ai
z`5pCbD|?zINo#M}W#IXe_wY#;^V6mm^Ryi{Ry4WIw=-%n*lOb1Y`))1d|kal;sS1A
z|CgWR|0>sS^qJ@oFo{2~=9pG)py`YUt3N#KF)Zv{bjxq+L&va%5&CBs>euu7+pMS#
zb@ob-ZC?7^!nW%8%U8B1Y+nneh_>CDzc!G=%eIK+(em1>cjh}w@LhA|+!E$zmG33~
z@Wc$^@<Q45Q?`T4uRWGWKG@h9^Q>iPdbQR1<adkyU)A=%WEak@SpJyd%GT@OdXC<+
zc*!W)V9PVF=!%o;jm=$;zgj)u-m!1aWUj~emWgG(mrc`~vcN&ZXKK*IqS>#v>@o1=
z-h8>uUqf6VJ<6}@tT<PtmdNLpd0ZmCTe{Q*%p>R3xbWNk68wKjt>o-l5&sz~F7>IC
zSN(a<A<6q=LUe}d7P-cp9j#a5dPPl5gqFBJ-uqp-<nG6Z?q^+1&gXOfYz^moyydXl
zYr&MYua^Fml&(B-r?N?ksVm8@f_?i`QI&w-Z|8iU^n2@Ht<s9nL!dIc;;?kOFPFdb
z{(UP&51HOQG21wQj(JQM;~L&KwK4O)W|%y?@+ssv`#Z*WTV|dNP~7gC?OiPLM*7+L
z&`j;UYX5d`x_kcSd$0MQKDKW9Gk4?j{#Jpqvadl4RxY0ZXzkr)m!6z5@$J7iebSPI
zi4~n+zlQ$0*}u=<S9k5BFdjA^reu?gJ|FZB-CfaZYZ@oU@Ymp)c#Zh=6?1RwmD(bI
z#A;h~anReyMV0+gwd^gM%_e>}Vd?tjeC64v-K}S@%+9wdUVQ%X+;h7fu3YG^%6`aM
zonLWS`re0Qp3M92mYfY#THq(WXJ6j=Wi3&M6XT~>e%jD#{_WOw)!7Y+|Fcw{6mGfH
z<)&=CZYiJKpCd_uJMVuvt-i&=+VT4RUD{XORt7DLQ1U!z>Jp?h|Dwg-59ynBy58b$
zQx1G3EwRiY`+n;6zVDpLJ|?EY6Y@7~+~?++*4NFwd5eL)^Ug0;#%G%<gb$j0zUiB`
z%u;KavC{&F6(;ZGS)M6;eDgy_Xj-<m)1z6xbNB7L?Rd>=mVjO!<6;+qh3y?*uTJn0
z&{<pXOwXt3eAfI~lUK<tTe#tbeMWBX)Zf>$6W-U=_qMNpZo4Ku(fZwo?#)6|<`sN{
zRJC(j-%U(A*LYx_9E0!W0~hR))}OXMz`<9;$n(+as^Eb+TeoiAD^?|Up2?lDK;@Ng
z#pAOEcivo`|J&euqmP4>^pit@PIF&Bd{x!QU%KdL&9o1jK*O5p|2ay%{w2&4i>vcH
ztDF1j=E{%aPArdo1Oh$OZr<_I&6V9U)9>Q1S6ohRxtG|21hW^e+sBwTQ&BN-_FL&G
z_dEg_T{<P7Mk#u~JR|kAoAqTRqj_qY@oSOZLi;(@jC{$BMds650xYsDR!j=!NHzEt
zwTX*q*)<K(o(g*%osOBiXZ25V<7k`Q<$Qd%{1U6cy}eE8NAAo`(M;w2dNoY8J<vny
z*K1yAq*pS`xNz|R`)|!Y_A?DO^DloZdz-c<^usFKMUEkf4Rv?-w5Xe^v+uOK#^=ZE
zqEfk)^W6N0Z0TFYR<EAO_Cqw{pGCo@sy7Y0v#Zz1n?x~GpOclnk@3R%$fCqu<<GOf
zoXh_+(c;|&P9+iFpha8T&BC8wSUJVgFCyy77yh0LuTClH>YfQwy6Gal(llzuY(<r*
zoBUx9^^a>_yyUp^jMYI!QGb(<?Xz7YT7E2aD&Oa{bFJ^Gv`dFH;_d#;nU;2ZX@4u9
zXvNl0-NabN#1+@$*IzuXrO9;iO2nVTT+SOxLw;TQW3~OXXbOwdUNd>#?;%AIx8E_w
zIfZ;X_}*_(|Ds*9`X_N;U*U1Kkbez-9iJD6X{Jo^&s~~Ikf3QZ|Hjmy5c*XsY}Lg`
z!}dq>FDq1gIW_LyvVX&Ej&<i*=P=$~y|XHwO?J(UAkPnR#XNtwj5u<Bt1Y=zbCbth
z!P}tf$~NDN`)1wvemrvS^}Ec1&bwI-WG)MA?Fc&(!0f#DIh$VCy(=1jx#u6QK54h^
zP+)3cR$`3Q#pg!ZB0TP`n^TRXA91>TNuSuMWYhWbiq-kEYPR(?@iH|hG^Z>wN~z}1
zt#4?W$da48=2QLeC-V=gwF-RVF8lt)GI1f}zuouKFP{4IWS;O!p1Z!UdbsPn*WF*S
zo%dbo6g!hwiN)XTbGCe_;;&)1ms-WOXvgfU?^V`B<Y^x+jL`9mQj~M`cokFabWIvu
zkrl>uD3okzIvJ(I*t9gk&zAqzvzI%ZPTcvi>|XlRHBDz4u4Kp?+pM=XWk1i6P$T!-
z_Fek9SEBkZPa>VVRNuXQ+Z-roANTar=Ssgqw~g1LCdOTl{eIX}M4`lb?}2IuhOMo9
z^A4Vsy>tGN+<~hKn>w5h+{?b=AAS4c!WCy8T`BHrZ4OCkau-sS5O{z8%^8)?+nJ6|
zRtpjFH@7Hiz4Wp)Dmt=g-tlh&w|bvv?iSQo)wL+F_QpB;)6YNoyed-iX<7Shb;v4B
zhRwH|O3KUkEAbrkDnH#@Eca<b?@_~<Qf52nXU%%Gu}R^2lF{zSvwoY@&sS#uFSxNY
z!1W1d6eJxStGra*TXg3``2!Bt?BfgXZ@F(&qUNwnY=80gn4<ggJ2=m`zt705Qf=NE
z7?i*0-BqXdcPmWRhBj8-@b^#m-D~;MZqhxAosFf<;=Iop(+|YHc)Dc6wt4zr4?XT_
zn$YC`!1BS=>q&EdRrW3kS-(`s!$s-P!fPGu52ZMy&n_`vv32d-TUNVYK71}8oc>;+
zl=uFUtNs7x?Tnh2w)}XDg3=;mG5=HZ7Y59DKYfAFX~92w8+MxccYdo|6?RI<Eb2^Z
zE05k8-;1X%F>T$lEx7!C!-VZKUwS6a-C(p(vUZj{Luk%7;mNVyQe~?JUjDOHd#=E9
zPxnQ_#Oy1}7GAXdD4Qd;=dtIrd$QLKeN~IfKPSxyEj23^PmE*cc=PI25zmWT?Qb;P
zQYs|3%#d9dIeT94drN}_$%2=-d=_7fTfcdqZJ$!9R1y1ou7V}kc3ddDu&-A=)Zv2k
z^6k?L;u_wTzcy*uINxbn^}|w$tO8zBr3d>aFrGerdeiiRzOR*2EW}!;{4Bqseek&h
zm-O4vuNBT_E{7EVbp~YBP8EB;Ec3%F>nm4GJ<i%5HnBDIa-8j+>vd}W$7#nV`%cQ1
z=scEL@Wkln{o4Qc=5HzE_j-E4=zmgj;hePP$1*Al&xu4nY-To_dC%jsYy1VF|G!^-
zQp#Pk_R_CcOu4yhf^Tj+@_=o3<>w_^SvSY(p4v3M;K<f*r({E>@#ZVsFjWhlzi^x4
zZob^!i!Z9G?oZY$c~mBDUNvpeUH(rhdnbak4Y=X|qwT!eH0A^?fjj--t1dFE40foV
z!5Fjnp3{UQZr5*ePoMK;!n~~6v)y0WzhL{mW8S&>=KErpBjkU}{?6R4wJYkTe4I^z
z<oA2G_5X$G%kSWL*Z%pL-TPZ>5BN%Lm2UoBBY))w!@5P5ZK0>#S8K1{^WJ+(#_MI%
z`sA|S?mAGf?^QMb>1S&dQOj24>FbTZb6?{6yemV;@t=2i{vXaN9<^Il8O6DM%i?V&
zWEm&)DNkP)tX;n{WZk7lk8D!Sug%e#{iC=xweeY++LEs<YD{@&-6p@w`^)gCt+`4@
zbbH8ytU{qbCSF2U(;KdGe79SDYFY)KK=PUB#VW<$*=&1+K6t29etrt6W-N-6RycfE
zaP;F9W(FCC_16Lox~pXF<Zgad%NBao^vYKqwgX$lzF4pF3)k<t{rOR^KKs1GcGtOf
zeGoGL)T1qTJl*lq1K+UaldMt?NWZe&oyDEfbU$O^^eQ&qv({zR+OK2ZFL>XzSt*dY
zQ>^RAq#%}(ygw@ow%vR9`igNy>-YWh!=9<N>X;d>m)=!!_Ri$}?CX{Gv@y!;d-;6+
zWY+MctWNb**C4LNAJw?pl$KrM6&A1H56n0=m!We*;MWV887v($k6pdKPeX0-=FOK2
zd*#}>@5MTbd~a8{se4A~`&Efgo4FVZ!vEiTD>=nNzKv&<df4Hjy&Hea9cnyYwa2e^
z2DrKS_%y>kKJK=2rvnbZcf221&9ger>Xl69?lpH;iM<Ou@JJ(j&;4}wx~qxLSIHf?
zR{qh+Zhy=Sziy{h%j>p(y>1i#=I^aje+o(%{dZTdUTrRLwA108iHhXIxl(_3MBhI=
z*}&>(a^a_kHQToZXIHcP_Sh|+w{Z2R{GV%edhb;9Z_56>#lqZGeEnYMsX_CO&9h(N
zbni+NV<69iKRV~me{@kfDbM4%o6}Q|$5myy!E9|0!<j*b{>y&!cn35-C@l$U^He?2
zy)F61+ofBRg7==Z^x8Kk>R#FJeQF%$tFo%1PWfwRXWejH+}q6iyv$I3N=cG%a&z^^
z_q)0IDta6_3Lm_dH1>1mtOB<(rx#|VzQ1m}<h{niDei9<)?E1(*kzrt;r{8%91XWS
z4CKDuJ7E36rb!|@^wVRuvlkv$=r?>i{6*@^vDxVvMceCczRhV8XtKGMlv<wMb?a}}
z=a%~7YNoCCPG-Kf>{U3h*+n_=)th&q!8=W*;_tKfyW38Gci}Yq{v}siHFte|m>=jJ
zZEd=BOR&yGm(P>WYi`~4EN1oE#obID(s$3~T)6XQ%M``8uVfd*$kl2&O}Td_s497`
z(d*O4oFkNZdeblLa5tRj<xs|asM<8C<$Hjxi@It-e7lq3jg)G^%eT&!P52({-5xHP
zouA5`xWHDw-?*O1O{lzQ2e?~Q@i^3>*+W(L(5GE5wQJoTNK5ee-#$<!^UK3<X4u`F
zFMPAYnm<_Xd0qH5;#!BsQR7+99=|(Vc7^fG<8`TpH$GVRyX><}-v4?<>w;I7D_?D0
zec8!yR#n*~QSa}Qye(E6G@U38@o`c7cgJh}rN8t4s#kqHdVa;?e3yS~gVuFy*55yK
z(b+Fjsz3h3?kQ@%f4Ai_Tbq9DVjrv2=4)JE`Qw-NZgurqYPO`_HLH?uy=LsYc-`Eb
z=!tKF_O*L<ToHGEqdTREi(ls5tsi&HA1+umy=eO>N516r#+nG$N|~^u`rQW#z6aXq
zJ>@>kc8GIJ=8Eln;8O78sz13YjrMsTST->TEmFPDZ=`VEG3i`V#{PqcC&>t?NZ4$h
zA^$9KdyHGnJB#a1(Y8CD$2h<HAoFfshr8l#t_%H-?y|74mRWf@O6Tv9d=mIQV{w)G
zyQ~GvJ(;d%Ha>UCGn~h4q%`%mkp54Hl|CoeInJ6};n%%cSjb4K?^vtAq8&b};fn%P
zj@{P`4i4sy-CgPaiNoA1NJK!qI(xUwqG|WMuUs-dwB>`{Qi(HpORu+n`T6&t>|0ft
z^8KsZ7YNNg%%yWy`v}A9QuUZesi7UR(~rKgiO}oIva~)|8RXq*eP!`P)2BAyOqmL;
z&!rzryt++OPVx(=XVLqMS>lPwo;(AS>>1Y+IeOco=9w|Dbg~+_dfZNob`yCs@1la$
z?nI5VkuGc7A0HEVm%TFZkHOm`S?qH-4|LC%efL+?`|y0`?y8mx(pel$6BkSqnCEIW
zLCPv5ENi3IoLrmar7=d8y(@XWN_Z|=-~Z+8`Bl3952xr1ov@00^{Cw|R~9!cIvExf
z8M}PvM)xm&PC8G^_x$%xjP=q?oui8sy|#T1Hr{-SYx9W&4XwSJTt9VJMl>4)-Ko)L
zUl=6%{ZW{ibM|N9<4z7+4z9la_LbPJTRL**8y*?vb7|W6I+cegb@(ptEh|;tRc!ag
zSmE=n?=NiDUM$qM+hhOiAZ&c^+b+M=zh&9ZT;-OwUb|3Gja}8cYaxSz;H=2}ef+{o
zl`@G_UtPTY+G>Y*0eizbVX^SfmAQ{<WwIB4e)2LmKjT&C-mKjQP8lDUKE9`2W&1tu
zx`x*r<~QZG+))Z%T~&*!GK6KMT^{?_`F1`l<7!hjG5<J4FQ%@0k#Fvk^t|vBshN3S
z>{OE#H?ipjW!3hsnijum0$Wk5(hl{l?S&S)R}@TpLsZiz<lngG>v^(t^@qbEE4Hqk
z+t%KmkyqEaY~H_J3ma~%zff8|_s-6+ckdr9-MaB{V(X^x2agMw4@o#n-%fJQG7W!H
zbLHH|XUz^9=B0j=>%UM9D&gA9L&R2Jf4-sU=MLq(Z^gd46$_7^<9ig?+$d&$t7UIl
zhQ`Wo?zi>hny<6iyLZ-Ea;y|dXL-z3;~t!QCt3gTXU7fmmv7!1xV!w-+x2%}6=y7T
znq!@7Q$OK%<B!ZKDm(gT&&dj|zI*vy)&bRL8I1`uie^i1u`t$pS-)3#`wQ*+Kb1HA
zC_iuak6o(%UqhFMP}GTwOQqjmIJ^FzTxia}R=HM2`Ty>A@r$;$YIbcc2{bsg##~~N
z3UgJwLe6fl)xWk}xpYhEe;d2AHJ3>YZ`+yYcZAuMHb#FAuJxQ?^Yw@6EDPOri*)t)
zb}cyZbkc+yvt9+?yHTCd?3?4Jp{l_odM?j#wdYQSCXb@40-})ibDMb_d(e+v4L%ZK
zSG~8%2UXl)tX;dac`I8rL(~HkhJYub@5~pm&Umn*c8R0Q-Kp2gtIHpF-QhkT)ouLU
z*xsvZ@5A25lcaag6)k@~?eG@Az(?WHJr`t4udV3leY!d0$FuMiD|fbP9o^H?({{*k
zR{cN2+_m}vCNfXv3$!k_y;A;Cm&;8!h?&i3QH<84|GWRciT}f?7j-6mrmL9dwL6{*
zGlVan)m>CH(XsA8<p!sPM-C}yU)?q>JS;OebK0}z$5+HSE)Krz5pr6(S>(a{-d{H#
z6btBBtohx0{a$s^*YDPor+>7mNYmZ&sP`}bn%?T#4S|O3y=#iHa<61<2A6=Kc3`r)
z;+0iz)J+$(zc$@}tRYaGE#^g8f`RYX8>{)(t1h_w{Ke11d#rno8eH1#xwNhAQRJ&c
zlRvZX74P41DAwadt^6HkxjBdTHJk6*c>Tals~rFAqc^_xNbKHr{=w%frWL(;wLfCJ
zT$4i*o77eGC4|!BqTh3Tjo;<_(WOZ#@yTtm%+$0gpdtUDr<-TwEOgKiNnw**R1qz&
z8nsKsCqzh$`HYe?<D5F{M!~bZmrZQVba`Ly){j|qZ{g`FQ8SlcZMF3D=sBJol%ckL
z>e3`d|C?udvL;*IQ+eL{p*iJc@02|za<??Y4$XJeS;Kcn++J<gRxQiEZzshbhGc);
zbfh<Xvh!@u_6Iw?)Sk@j`njNG|Ece~^Sw_jocUzi4d&#scd6WttJ4x!eS5DvKk;)#
zf7Hj9n`ei3Ib|%p<56UJzUh3(+wbe57c7mcd@A>BuC`0w>c;4dQ+IwnDXxoV@Y?UO
za@MsIrydrsOYC9~Ee{pGAzTrD#?c_*pU&$$kF1Q?Q`6smtvxFhI;Zl&_iMEgdRHr?
zbmMEC5A@Y0+}o<<xud#ritff$0#{A8-2FWF<UIM)UwO8CFaNgu)SJ`uj%)=DXU}n#
z+NjIzH*IasYo+Oam9FYn{^aS)e(G9de{^H6+BTV<hi6v2xUu(s>UZ(4dsj`rYjv)U
zOY>a%>k|f#*E!ugKjTQ=^VDRa?R(bWU{zTV?V5huf^+{GFV%qgi+?xv>fGPv_to)y
z_-bpzo~Ok;PhP+7cy!X+#lN^%__5MsUxtn~w?d!(?V0_-g>CnX&!L(L$+P}UTglb`
z{4oE#^SyUhZF?u4^WgCAXJ>3a`xhJOU3bo!l(c>A*)0NFk`z@|2d|adlW=o}f(Xxv
z-P629-QBgP9saug^V*tYorwo$&s4O3U4G}biy>qFG?kWf{AZ4x@1B>tqs~C&;ZDQ%
zAGBVE%z1EV!}=WN{oIe=I&`z05BSRP`%KZZ>iYW|rB1M&*5v5i`{3C9UExP61bA*g
zJn-|a`gGej<+WR?T8eY7-r2nC_vYKrkIS|$%Z^z&<-1A<+v91k&dn|26;O>7pQAcI
z^@r=u9ec~n_FX=HP3v$4U#4At@|j7sdX4peA838!RI;>Q|1H)0{Pw@qw(C#jAE|!N
zZ}I2Ym$LO7W#*d>-C39w&OB}Nq5sVLJ-2K*S*dN9cg(aqT2kxytQA||Z<^D2_N!`T
zy2uPoqxrLEOD(^-(oky0AF)#2n1u&^y)xRmt=!N$XQ{`g-lCbNQ8TN&ex5D8`QY~C
zh>07RWTGM>4BFP;S@v$9;w-6JpUsc`D~&p4{cKc7F;L7XkWV?ded4*Gl`#v|{>AFd
zo3iu7l4}~4wkMemm~?HgVXSLZXjL}MdM}xBP;x?RMD(16SAS~mOAp(3|I#(x>)&q9
zwwaSLai5e#N4IW@d5%-~G)``|87z^Zf;O{fNB_BLa5TzlCePG}AEHmJcILE+Jy*-r
z-mKW&^;BA7mq)DaUq7Sow_bJmEZXbkG$U{=JNNdDyH32{>{P34ekOg+-}j4ucBTi-
zSzi6X$Tf-c`FEu~t5s4HHcM-7*=Ta~`^unAd;RAXYHvM~V(D{s?K1HRd;0C2Qnk12
zJ*lfKvOVau$ivDF5f2?!I3IXen_B#E!{<Lo7A1cCWmos3mE+yPhuv3hRZlz>dSAPp
z?R?mo+#tKjlYB*UU)^xM8TPbpvcKKZpC8??6h1WSjoIfIxKDl^*LowT?vHamPUGYB
zJSM08Y}2Pd2MgvXeN3~gsaUu3qxzPaQA=g=pQL1~^TzMbmiH=dSd-M2pCunvn<qc{
zPr#)$-0S1>j9oM5ozDoiJ{nzJ7IL^&G&ypL_xc<24Vyea`3kKq+8`B`vfzz2>t~ya
zmW<uGXDr$-Jz2z|efyL{gXnzMIqv$$4@%$rajC$8HRU$jiOJo&1RPFOnN5$Je%pa<
z(Sew&(>gC0i%O@oCV6rhUs$0npL;j_#IluB&QJQw)TDmsWElIEIZqB0zuJ7#__OY2
z>D7OHB##?#HL2BRWZyr^_^5il|IUadOs}<KoO@>4B}{He;Qqo`%wP~N+$uLM?bwS~
z*7q0q9rLaHC+8trW#fE|IbvFu>%l06l((|7i;nOA@!~j>*vGxo&czu{a#Eiz5xzuB
zUE|_4XU=21t!H_gRVDh*7{2Q;xVEd}v+c#ztu=i?uh|YiaoE!o9P%K0dl_$l|9^#}
zKcyn_6-zH2)^XLB|L1jWU;YQK$A{CR_p?2ze7-C$;QWPBwgs}2Hh;O<|8Gten||>7
zrQ0>mRf#jdpB5Lr;O2CG&Dn9wzt_Ev4>Y;>Mqu^YFH&pI_ggzyAKYbi;s?L&r3U-J
zCjzYo3r-u(zs;8A?BR5A$sTKimzSOdGc7svIXBfj(|EF3iq$Qjv$?X54lp=IJbC`E
z_o$?I*@f=k`vvY;7kridd3Upaor>I)dlP2|^(ZG)hkdwL5w^y7gUGd80xRaW)aNG7
zirURyCbjbIoi%5_rrt~D{26!mU%%b_#|HxT^llX@QgExuF2Ad9mU5qOQQEgf^PgAv
zeDm4#w<+hP(tGJ<e%_M@WY!p;n<riEVZQ&Dwas<apXGDze>t^gB~#D$z9YFwLdyd7
z?ELsS!t}gW7;D{hrsU%Kj#USDREEvgSZ#RZVCIkfxPIMxrxjKxym}yHyk~jfd6wSm
zQ$@ITZu}oTH_&+UW2cT??CXMhzWW=<l%BBqW`3`}d!z0*)j2WK^Y*%*xBJg(YItu?
z<@@=k{+;{0o7vq-PDxAX*vxzP;wq=UJZb1<n1ASfv~~51bL{tpjJ6qAyMEq$*~ujJ
zoP<4J+#balS1e{|wTSGkoW>aWOlrnym14mfy}jFxe1E^7?;ZD)n-Pnjwn|=}q&{!K
zJ?`eDJreS@Za?o#J2SigzV*5HZGZcAcA9Pvw7Kb2E1qxJx6)+(_W~8IIUGk*md&eo
z6YjU4xK1cH*4C)J(C&JM<Hn=uKNi3LZ!a=KN`C6I&qtNaeAaVpG!oV}msGj!Wm59d
zD0WZL+<CUudJpGWl$`w|BoGwQkg;j*y?wt$U%irFxas~AIW{dzwQl{4nxrOmD|frN
zIV$!wYnINQ<g?<?!wE;Wtjo{&<Q?{c$v@%x2jBE!n}0vpjU4UfJ<-TN^f0^pN5HWh
z?Z}z4cD1`2NNC5mc3#~wK{7cqVW}8jkazJMv(2nt>1LJ1M^-F-FO<9P+~s3N@=YtJ
zw;ZzSSjzk1{i<yTPUbv)X(j(|-95XF8ovI160bW`SN&XI>wdd6d((&c|9<>WJ~V5w
zwEUlG$&G?RM`tgYaK78XZRT}toeR7Zzn-)S*H%^Yyu0PYC*xah-lZkZShDZ6{HgEh
z^Z#{CJ??$-vCPi8*-jZUouwTcHt@RSuAi^klv7(a<@u)h;?tftmg}q$@#=V5@agZL
zpP{Fgi)ENjUAFb9YvkhB?`u3-9gMe4KQlMVXS>-nP41`X-^=!yd-@9>?+V`fR&c|H
z1Fxo^zVPGn`PKtJXR7eW?DlRB&kr<`n`oy#+or$Rcye1yTy6KQU-~B-??lW<QQE2c
z`QD);BGNUVZax=!bg}#=pRe8Dkb4VfPxU*0AvD?Z=;SnU8K;O;C5=NWS6rqhG%ZMX
z@Dq2lU%D)1&Mo~I@k`nd4m>Tr`nM<i)Mu+R{q{?Bv?unR%llj%xA@vU??nP}FZX6v
zFYD}Fz|Z8@A}IeYLp+q(aHEafO{eqMw|&ywx$bSUsnewUo27iNeG~$9YAQCLSfF}u
z*4eMFZ0gcXK1pZSWbbyDa-Su0+4lPLxUM~U?<CU%W^eh*A#B6uKRf#~PsJggBh{=u
zI~wCd8+GgLW=AF2Zpvylbyf*DX>;Vr>nl&E%UVu({M>W%IrDiYm-kp6IIw?ZcE;~m
zh5x797KF~c5xHBErLj74`<k=+mShy~mQXl);f%dOMOx+CCx3O5W#(6XYZWQkQSfuy
zi!Eojy0T4u?bM{yX;xMCKm5wAi_Xo;;TkWt9|`#PVskv_##c#B#h;t+o1DEnIoIid
zSbUw|$&{X`-|IHS?e&^@)iP3E;L_^%%btV^u&F(qF<Wxh?0Eu<OD0_BXV`GSLQ|@D
z<GP-W^YRzY(=I>Cz{oTyZsuZ#14(bD3OWBhFx6UwX~VOvHNRf^9|`!-YyV??s^0&P
z_W$%3UDm%>GhHvHcKZD1t9%6iy=|}mX1~!dt>NsFwcj84O6~l+@XziSq4(6gAM;Ce
zpXEHctKjo%r<iB+>UCH)yuW2Tb9Srv{7Y$B7Z1i6XdRa5|I5<+>-hf<@*0<}oVxL4
z*+-L2dh*r(B5W2K#!cosW_AC^y?V{xA3o3j$LnkVKgQ$1nH$McJ3pKLvih%goQ3ho
zw|npZMrS=U6*#=^v_r%5vxbfbXR%et&DzzTV-#FkX1~hvn^D}vy@9txWaE0v49a>h
zF(vcFn9KO?c@^u-Vdzn%q4U+E;HZvpW<{}*&w`KZ9$hVQT^X8tkM#`er>3p_AEewQ
z(%*e}W&DhBAIrw<S1*>IduaWr()6CW^Qnf%|K9okcYn2~VCKDl&+Nr{mcF0!@cmM;
zV@GZ_)v_yd^#~rAeO2o5_NtbLsfXq69P_dJWSF+O;jV&rlcCnH$4$BBZ*6Bk*y{7?
z^U89u@6{h)_RnCkTh20h*}>D>SFkucEOq!RzW(;Sos%R2PHkJr^LgXcvzIQtvMSxS
z<>H5@vkyr(O>9|mD6#*svqwI&WX-3O{7XKZx^UHc%7eem$`0>8m|m{xpRc^v$XR=G
ze`fDa&Ra%zb`-`wdm_8<eY*VrId(rU#v9hXUn1SJ*s$))-~G$3$vwVlGOxbv)t+$n
z8J82@Hu#&*<j~VQ_i^)r2;V91{=SnBZhHF5|NpD|-OgOqTUYLNuVUg_|13K<ZTpM8
z)%Qho{{8s3T#5OSPJV#vl`rk)t`4W4cI|2I&);HW@9S^(Tk~$k_t!pJvojuD)c^6`
z-hARbon|J-XRf)jj}BzNez9!pR9D5NjS~AcB-T`12z!2_#gZ+q@Tt~8uFt%JQe8j3
z`&2ofP_eseTrkl}GQfOmY4EwO$)N`qhfTQZGttAt?Bu6AEq^+FZ(XzX=u8oIRcN0n
z(Hi;Vh_J7XWbK-YO@0w9Eemsm{!Q=w8v4;CZb!-NNj@yvf6hcGObKi?b#W4}U|yr|
zb3*0drVTp-mmS@?$l-N`jpjUC<q29QroTGW;%ugzFa7%M^xxtd`<zVz#@T{zY$_E>
z70N|9&uW}(dR*|p%AzOOC*{Dki?5w+eX>*=U3GTPTr~BkW>!+;Mbm=FDMyU*O)5?;
z+9O%?(sXCtl9i`hT0gwssHPv`c%bUq#moL{-_AXDDKc)M*N(H63<3*2I5@rd#Z+T4
zW6QEI@gMtq-G1CyazX1;al6o$hui;Yo<BJ&$4_AYs;%d`Pq`cxHw^Pqd%Ln#GqRLn
z0>}R;5*z_DTUq3b6ccOSGfd5BZvArPg>lu-7s65V>ipL3Sr*Z3v)<it&xvEZqbBTs
zo>5xpwr8^)$JA+hf@YR>ECD?mavn|CR`T`o)9vpze(Jo?JpX_CuP5#QC+_=q{-3Vv
zq7UmnSwAzMJE2)i{)-m3sFw52l+=EQgHL8WIa%k*=U8`|Gx=bnvEqtp5&nf6#43EB
zrK`K#Jg6X$z}jNVvM9E!b-xD3hKL!zxO}d4?eRZiDk1hhWoyUQlXCs+=aUp3c~5Bl
zJ!Rwanq!;7&VH^k`yiwhxRtfVe9yz);&*Z_taDTKY=m25+8(XlyQo-e>g4PRd=G@u
z?y@zn43V1tNL}ix(1a^O!etRDk`Wb04|6DNKbatQp4*l)S@((N0p$|?l7o@0`+i59
zKkPg+a^~dy%{Sa;S-oxIGV^5ocQfjVyUxbCmrGXJM=)=wO)_XR6i$fQW3CZnZhr3i
zTysHJRcou`X8*D>RJv?=;_9dWT7OS;^&W|ynNto<*uBfboBOgpYrJa{o3)PK+6!U(
zR3;i-zxS7o`KsdW)xtteQ+?M4+&<u|W-Hs|ED);tKIo3npQMtwD2Mv2+|WhsRc-Hr
zqSNPB*lh6ge*B#^Lj33c@U%FC18;@=3$ijNMM)Ykl^>XG`0q*ZtC#XZX9RnXuGn4Q
zVE=#4a}zgzyI<_PKK?70_-*Jpw?aqITES5A+G{c9AJOvv)LLhL=)3=4@@P_^B9o%T
zgP9>_#y{L%NZE84``bVJ?$P;h;on1{GtD`_isT<(<ucvWSnzQ9gQY_K_fPAum~_5F
zk3DnJwoINfc6YsQb@k&<3Z{NM^LPG#^<76&N`4%RRkS%!+xCDZMQ`K${r`Ud_bXsH
zG1EHaVg=LcE&FVaXP>q>D?VZC>Z^x;=zVB=(83hoJb!7>liGk&AATQW5${}nYVG`o
zj8Eo2kN@MdCoFu%0<*2<(rZ+|m3N1w$8)*0h+7<Dk)OeL?A6NW@fV&<_J48s{%`#i
zEHzW5rvBtyDcIg~T;#LvjNXqz-=uq#ZY(x9cc7!uvikS!dW~w1*AL_ZuZTQ6ub6e<
z%YnzQKkj67TYps2$*kh<v-$s{s%AZobO|%e(_VAlV}{AMcef5{to>Y-^f&QE({$Uz
zPsEQ+Tz1ZJqVW##9`3u&*Hi2q8z!C6eRf>#(wi$Rdu#r6?5bvOakfxgdZ2i7@FgMt
zJ$K^&c*z)W2=^JEf4R3}wrA+(Ils5vQ{45r_x;7g^Z#zO(3*8?_YsM0CLcYDA_eU_
zi~H_GJ^3B?;{9Y(b~*lyGK^Ej^7S8Yx|r_&qefSFk*<F1Ue)YfCic#nb;m!Z$6w%j
ze9v#+{R<ylU%ks&DqVhW`Nrq`nGKab#*_C?{poq{{^_Ka9sgI$TP(a6b+jb0uk+<6
zrLXZ4i=OwtKP~s_)qaiptnVv+tlmG_=D@RWadG!=hxCbN{(7pslh1-dCO=~H)K*D5
ze(93L7n5A%U)_5rxyMV}yZF%*&YqZkd52WWO=hZl<>s7Vblw^$Xw+fJs@dhz!jrUG
z?NMP?UhZ<We~sC}PH!q6Pu;8?@}RkA1M`F(Ay&GTHR5jTZWeA*O`iGaed6Imrn223
ztuqfNvm9jAY`E__^X{YbNtvfx5<WGxFD|q^^T9}}>E&dD&Xwx&-g7Lu9zNLo!J}_)
zh1cv%VXmsjbJt60&uiIZa``~-cNHG~xOMv)1#eyuFe*5|t-S1%agxHly0k2xJ6m<v
z=K6Tt7h2t%+V0vgl|OcW_VWu<WxkutWAtKpD8@bceB_2@Jzo`epZmNi$;sf7_LeOM
z`o*`aU*@v&cvSG-ub=mx+u=cX+~T0C`wuI%HV18#etSrF&o&Fyu*TB3JJtI?AHQOI
z!zoqlgix12&*%QiXDNHSYj&pITT$%uDtO8h=c_#3{!3zY94rh1-bnrS-)Xui=-N$(
z2!4(i7cU0Ji8G4{eB;z#(OG<tZ)wAVcQ0N|-O1hVv?xd57^k-M0VW1M9hcYI-pgiI
z2d}Q-KP25GooL$U8godkxoyrVk%mc*A8#r$cWi%V+P<B?UHhC9Pojp`G`0D4ev)bj
zXT(R?{MNs>AV7wxtY>PZ_||W+CLeDJJSjb~VErKljpJUkIPEyJzj?Mk=l<+9_0z-?
z3xv7zs&^@7teVIdrWUza=1=0KZ3gS>uB$(hd(I)IDeyD=klCx6_BF?T3f!v*P8K*B
z{r>Z&5S{mjI@4bH+$lV8-E)#7@9w4;zAtVko949s`@p*Gb6c7A!~Q)+74sC@4;gNp
z*Z#=&Q*6aW2Zw-@e=2U9%jlSMUvxddV6ex@&*`}1elLm43wmixvWHvFYvpaY^Y%uf
zh<k+EqH2LwmIb1m+dOV@1=($q?q0(l%{t+D<a&==tdpfr_kDUHzf*CZ%i~hr;Na^E
zDs%;wGWE;eQ#`ppKKi`J5iyRq^9NLay{-Ryf7TpZwq0HET6@gY?w@2xe4)*dQ*qX8
z+H%=H8+UCw@uR&^V)AA&1`jn6(du;%Od0!{%)_0ypT}J~bi{b3^p$BByxIkiMROeP
zKKkg2y@gM+bG)egfmdgY8TWOh>@4|R`$}SmUw3kRhu)#$Cznq96xdB!q5fd$$@cvT
zOuqusgeO{eJYc*Q?VWq!$mH`cK7Eb8a`&>ot6J|{j^3yI%f!{6{G2BCY{k~aPPyU}
z{5ET-EShm&WO0>x{qhhUt90fH(epMnKc#&4*7!-U44oxedm!b5?X{bXyMDjDpFYXL
z_y3RS|7Sli74nZh!1;Evjq5%+gDwe+u;;0)^XoqrE7s)S{hd2gU$|?}TygeGkFIPe
zco{lprNm>YmHdJ3_1>(1`r<evd2VOAaunyhlr^m8W2<~((YDxnPoaTUkNvNXeV?NL
zPdb^TKYwH3!A*}^%jc%QDVE^<@V<iWkL(hGI9D6~LwU1*{=3=xK|9^sgY&(!1lO6`
z)xE_WKP3}$4*p{oyJ8}<BuDX3UbeQocz(UZ#B<&viy3kaIa&0M+-nM#IY0m5PQNYR
zPMP{lS#)q4|NK9*Hh%El=Nh{2@-Y^^A2G3EL5G{K=k$6?_Grc4-P^PAdPZ%o>l~{C
z-!tvRSGE=&Trb;f{!&gjv*oni|1a$&Z{Jp%)V$Ps`l+(&)05!J>Fey~)gL>1)|b(9
z`elLW`UCoHZTq~pzgWHhcm9#)cj-axUneAW|FKbsHCVPr=WMXmR=>sB`_nG%_IQ8y
zH`~`Q{1?s~(RhDxhQz6BDoTqJ+Bf`;{CBK1=h4{*TR;D<owQxrUu`DC<~JW&U);Kz
z&uQ6ykfo1r(_&Ufz2H4;1-}jmw5K1lbNf;H|3qokmy`WRt2x<y8$0vl|3@obbX+@E
zza^Yi<^H-Hu9;K3M72KFr_VUBR?qKrQ&`3got`g>X99!0t+`tTZ|ZQ~JFu@H$caz&
z;B@(_$~VTxWBdO;;BP(Zdi(Nq{T6o)1@43vRtJevo;wS+{xs|i*Z;BX1eeQ<uiIv+
zc;BlyaoXARvI+MVi+VXlriAMoQg}Ww=1)%X-2a5#=I^8FSFT+=-1K0VbI!!_4rl(=
z2XB3{DgDA{weeQMO^&%WpFZzjcE0Y{{M65ieE%+ewSMF~rQnR|=9SmNr&kE49Q9&#
zTz7J9$HM>D-v75Q{GL5Y-6mv%i-#V=f7!f@C$7`p?r9UzFUnHZ&6VjXnvvQ%VWLIu
z@!z3_q4f?H_J2>_?{Ymn{mp7kmgLT*>Ajo}PAT6j(D|{!a$+{a!%fXsRuoL?4R-mo
zDCC|~@TsX&Qv-WC=ZVemJ<8SEtUE2_N#-$!S+kBj&NkFMl|Jpo(;G7;IEJV(OTLra
zqxHE*$#Lsj4TU)mJMTqAr#}2M<yM7m!a<gb1CGazwKRS7R>}?irfl}<YWe<`El0Cn
z_^O_%PVV-UJrTKdi>-KBowG^jh1va@Q=^iNVg!#S-;~RbX#BLs<-ti_kGQl}s|x-D
z-QCBh79{_xwYaFYpd+VyW6Pf@n?r6yJYe3ZkjT0Buegd`tdoWIQ{~9LM=JugPSh0^
z@s#{?Fq1uSS)wEKsBpGUGRNeFv058FIRv$HD{k~2H+%3k{+Ce2>;#skM90s$<;Efx
z^l}^a6kZbSvzvVSc$Lb{!h_!~L@s|8DZH1ppoydPkd@$}hpI+PUWxo!bw%?CQ?mXO
z&wxd`iyjG1*>~(h^`z<Bv=noDpPVfdob`%tZ|L3B^-7CeySBc$I6uO!TZ)-y-NVd_
zbIx2j)FNOma5cjFO2WK?&6Q&HCtTTTh4eUrx~m_4{!o-SMa3!objbZ4RaF+z1f8I~
z#R~h4o&IlV`yez+=HRN}8%&xymeY=2xPJXz-Q-)lf3q%UIDJIO_sYGi{%3RNE|Q)Y
zEGouaIpO5(6?dfN8aB0bPjxA0_@exk{k&#Hi~Z(pCd&8JE0{i1u3@&Z{BVq+e(6tZ
zR%;#0`DuS6bh-_9?Oq=J!LcgYnIUCXr)tkyhC7Q^KMed3S@OF1{e`rwna`8ks@Ct*
zSE;CdXX$J6Z${_!o;QhiR%d_U@?FY%tszi?IdRtI#r&#0Ya?_#C8RI)&$IurRG?LB
zy}r`+t{&ZE^XeRh{q2Qobp>s0jx*eSyZ6|{4I52fKDp`D5^>;35u^OQpSRuzE!x>@
z_v_z$&UI1qq@PztET3jw`$^`&WI;tmgB$stE6TjjZ>ZSP@bp9ZgEn1}OB;jz|1ds2
z%DnREyf$(EdZz1HCqA0lZ9LqQ{e8vX@&_@e)l9v%ZIO`Qz#$`{;<8oYJd2FP^Y4|f
zrSBIP$v&KVHOA$8B%9=Vua9$d54JlVOFnUS39oRG)(zQZr4JOurx`um-M@l8&T9Vd
zh=s3vZruw$WB4i3JS^?Sp|k5x?i2f?**Vv-P-o#LouH-%FS(EB1uxY0Jso^r<ID`M
zmk|>)R!f*RG#Aedoh4m=ie;_G$A}r1R&zJ;KD3aOuhsHnQ?wRzp7*c*+qu^#*L^<q
z?)SahFU$J27dtJU=-9wC*<<3PfTI^(GHvD+{XCeu`&9lv?JxX4j)vB4KCNH(v1fHo
z<UE~|Dy~6F2V3S?Ei68_^Y^{if1~ePZr|O=*6f;TqP&I6mGN%vJInh&55-ll-D_5@
z`o2xY*0imn>_FbTH*dUVhUF;6UAgyozqxJ6*}`+1Y(KB+k2hMs)z;Yd;m4P&=COWi
zaKCdSVsqD}3v(G_OkUh*`%!W^`P%b+pVRru&MsrK+w4*oZ!f(4XmZJ_RoQEIE%VD!
z%TY|Z_B;Q-%cpP#iv^XfPtLw;OG<h4V9tH-T}nR|t+BF5iw*dEy!6MR&8Z*$<*rTd
zSmA%~*TRTP$9!h@^56gZ_2bGVOBznqu-sW$n(}Uq?%8a9DcL#&HyP&TlkZo=E;+fn
z{!hO1oZr97_y1>ByZ7taHeE}Dh|&#AwWm`UK28h2=5p)p9Ob83+WD`xU3%4{!jPmp
z!^Xg*bA!h<v14!V_4YUC1W0Zw^`0KiQL#~Qv*!Arhg7>gwk_PW?q=FCS%G{1JQnn~
zdYW;E%rE=U`fM*>r}LANqk9=@u3Zab)mW9470RRA5H)ezw{v>zjit9LDi3@+m&dD?
z7o7dCn!zo?eN$tl;r!}ZQ?}djZ0)jLp78&Y<F%K<qUs@L_GYOElCHnZ|8a=(rd;=(
z2BytBmN%!SrkxN!mSNDYsi$pVs<>GoX7{oL?!TK~&5l~T^?#RxmZZv-OBU6R|0fqd
zNncpGaPjS3zhy3LX{)mDR$aL;Ecu4|`!`QI1paB)|Hxmn`2C(cXC4K7@CewkJEe1O
z>R-JD9lY~4I_>W3nf#hLZ{oa73ql=YC-pT1dI<@N-T3on%dw?<zi-JurEABTeN=4v
z^l(v$okteWZm&Ok-uHFois00^6@t${En+bI-n=Z5%~Ehh%-4-i;=C5sX`TvGKH4df
zJmdVKg>!ihayd-<zo>WJs?#t2RbDscJsURtWx&Tg-&${zmYoFx7B}YZ`ahBP-oG0~
zd|cTJZz?a}wuIePdf&yf=X`#(Z3{0b_74AH%Xp)%^P5!R0wd!eon0?a_SqICiPXLG
zEW54PaOct=Wr5^B^X3@x2R-J!pD?kpg?Z5@&FnA!^YcELZdSaezGmj*=a>GyTekk}
zT!nJ)W%Ky%+P7@E`2F45t*opO2D<%?OX9E3VU&26|7(7(_mge87n@%^ooT2#&w}~s
zKZ%|CYJ6`)uRLX){vsx^J~^M6r)Zu{TGFyzi)%GqEyPoDgd&%{Ug0e&YwYH_&CEXS
z^OXga2JFI~FWvtYKlyScP<0W5b=rl5n;otOXE=T<Fvc2Pd8yvrC$XdO-0@{4Z#H@|
zUXq=9Yl270`(<)*=ifZwdf@iKS5_uHLL>ZyyyblZpTzfU4@$noPdlWwf4{P)_{S4x
zj&%GB5DL0I;i9Q%x(~nRjaJ?U!`o5wrakG){#<iHrE`9TT9W3u@B7mCX-@8(dGP!b
zL5DZ44<yfApQY-#Zk5jVX~&}2n{|^|b{@a^(vyEmv-Znp$J&^l-+ZabI(^R42`roC
z-UOX%*7RP<JVDz2_rkloeofQWKWAm2{pq*l)|ngG!`>E#JUgO#SJ`Xhs#|W}(<>F;
zCa?-bg~lfHx65g~%gk6YedhgFuQsi<J`g)oRy=vrqXx;%2P5UhuX@{kw`Q8Vr#&Y{
z<b?GM8R<{I<F<X)-@9^Wi$3GB(#d=dKi^EYlbf>qz=oPn*ZzxqNaPa?H;R`OPm*cM
zzIXr4j|u<k-|u{G!oQ>ac6hx~P{WK#_aE*Jemq0x)6N-Q(Qgb+eV?@QgyH`gEV`Y%
zHw<@f`Cao+Qf#^V)D-n~-E$v_tIK8NC+L3kn`m|{)oagb_udal<rhQmdo$D@O|mTy
zS$8-lQLjD4&uoUY=haZ1W53@2zg@rK<igoy&wjp_k$Cds=fo3v?OPAtO0QQie82y&
z)Uxlg*Qd^z^;dEJ)<5S~HLp_2&de0MZE9QO-Z1T_`=>=)e@{ueKkM1N2ilL4IRiJD
zSTDU{5<72Njby3Z$;KHom%drK^7EE&9@orz%s88_35(at&YO~`sIYzI+VBMvFD;w#
z(ap5t_vCWZc&$^X*O*<-OkS*PW>pZKns|F+&9qV$?s@B0Y<PB!@1*(rJ3m~O7N+m}
zIP323C%U`8UbODhotDC&*&5^05}@yqE9awnrhMl5y_Nlnk+;S7{fvD$?PvRTmDg^b
zCpU*x_}si)erf(@r%TU$yl2ndTi|K*R+jzv3YO*W>|5SH`Frnu-7n*}-0FVuVS7%+
zdB-ks-FhHl{*wL8FE9Q!D|jxv*LafqnYo+K?_anp&_Ie|#?Ek&s;zHMUQH{`)jXA=
zz_@1Htz+Aou4+%-X!0s}^K|~-X{WyBW}iHG@XQqU`@UTJqN8uGS^Rv7{;`P;=I%##
zrYt*g&iCH#SN8Vr__yTy>ZT=czrX$B!Qa0m<=D3SZQ@%HIU%pGcBO<f*T(m?pZfNn
zF|sayS;=m6yRTsKsVNuDC%RUC`m|kl<6eccM$FooD;AfnNR`^ccX$8NGq<;OZSmKd
zeJp*`gA-Dv))Ge)+H-EKVP3j%BIDjY=k86uR`={^hVW^(*7b_kJ0D0Jw~ODLUMjF-
zzskDfOe)T+bfo%1`IbcV{B*guYE@RwY4yZu4^G$bTeIq*)seb)*&j~cE8J_ff4ca-
z&$U-$KUn{qYr1*TtwT=g%B;VpKNe#@b+Vi3!=;VKi^BHTH^y(ca<1u2K*@v1H!<Qp
zNeuV)T&#Gg-978He2xL@``Gvosw)$2`n)|@cg`qwZ(@^M<n_bHtWr!3#RJSPKj)XW
z>v{d{+O(tZ79QlXS??3BG|4i6=gdM;vrCT_{GFy^DZga#9e%y}SL#Gsd#5jP?UZ**
zkN*?PDwyMS$Jx=V>ECT}Rp~>C)(MslKdTx3=<A)yF6O_~G3S-%Cpm#!54E`(U!JHa
z9^8Gd<Of^8y$FpJ|L*+So18M|&i!-GHZAeUIr8wkusf5nDDQh0vHPk^Crz@IQaDy>
zH%Y2yT}%iQx99X3$4@SI{GWeNyx3BZXXU4z>YIF7et1u2o+Ol5cJ)qqWLMMjlTGpe
z#V@U|zfkDDEiT0I;oSTQ)^Z_FL}Cs;Vo17SzRH%P|Mij7n6Qwf!ngkqp5gAhbK?Gr
z-&S??JPifzGjp_e*t4g<Qq%r^!0_IEzHettS&z>#pYxFA&BK`LNlWS+59sT%pJD#W
zwdv&J>!%<4@G+VPMRcoVY0RB)PtfD)wl60|lod4}&g;Lp<3NJzlR2E(9hMjBLYPm*
z?cZs$ct*$H7$evJ<(9jDrC-@Te@ow1SN;?4Z!BSNnE6evR;}pF+OMj$=MKGDvF(?4
zcwEo{i{}ctRUd*+t9rlv)^5Kw|KGj+Tc+K!TbXdB|IB&+Gr>VCh3;BE*IqN}z{dFg
zh=pr*U3xre$&AjgTWt-kq9+<>=hikK&%5l!u%-MPo3Pp3^_4TZ&s9CB`TKYO*6#4Q
zZ4<5MSN++T%6m4~%gW!Ur}Lqv*4i!C{&6V$w%-5s;QiC?Or5d~#c5f0{N~xEFFzM|
z<<88H>9dLzj&1%PU+L`mc;oN+oLdApB(GC$&_9_o^O!_j$)V$C{PTZblmDB2HS+Hh
z{eP2hEd9)vSCF!%%VCaBxQvF-XU%;bDrHmUes@)VwQra_CuRQEu5Lx18P?xzC7w&}
z5KHd(^67#KFPm0i%z=4Q%<umsKh;?Ht*p3GZ`OQAJ-@eV-$S1^%&wTQbGe1_q$;zr
zxmyqKTKG71j;Ck2p{3S(&W)$r&RZXwf5fTaN=%@RCl7lz>+J3)8+L8Hs<-#sUMD8E
zMA@wqt>w;7HO;D@aGvq?^<;x9k-Pq9yq)0SrCz>-?{sL&8kOhgEzB35XL9ej*dt`p
zu$@``>7HlVsZ*O5J(=edw4%A?WA+z|4eyJVdQ893+&qKdQ+rZ?gX(wvtI11N2~CcO
z5t|eJ`KN<R==G?@=g;nz-<x~(?cHy^=KprqF8<sTTmAk2jUxwq8^6cOG%WQyeN$b2
z-*Tgc_x4@xQ_gc&s0%-%@U?S8qYD4F^0H95_BEvy5BePBioe}4K7Z@fr%fmNk4^KF
zbTccRD_9}7um14$6T6!4sqOyr=k&E3GdiFA+-t`ddHY+rx;|h3*6FgzZ+^%fx@G(O
z&g*Z7X8(8E^icMUglvTQ&#kT3&!otSK6(0E?tXYgcKZB=I^Wu3uZ-Us<?DRfTbc4?
z-rfD*)@}Vdr<>v7y?JteUz2ZK_~pAOH7tHsjz-@zh8c6`Zrz&`XXFzhnsIC4@A54j
z<=ew#PsV*aT66E$`Is$Vdv!C@MC%qcem&}StoX@6-ID@FecMioF_cMosBZjgyshSP
z8slaQ#`e&C7eD+~C}rEea^=ZizkfeHWNd1vC$Pb!@P5$EvdpQUxr+F|Dmfl|v0%eS
zP2oGs|ENxsl=$AeZT0&ahPnF$?Y{q#=k(Fk)(l@~npxlN?IlyP_Vos>uFMZF7CdG+
z^V3$>hwtWG|9io1{u;Lr`V_mb{~BN8sNYh>u<mZnr%3kh&}%LSU)@`lB37(yzI8+J
z(bU$~BTh#*wC_(UYrYfKy6m5In~UKjxe1+0#%2F@YHi$jLixLLb(-3d6L0&s&Mg1(
zExOoywVg3r^GCPPsIXPDPH)-&S;63>>(fq6?pMugHrf0!WOu7%PcSt#z4lJ}$BhpS
z@)6s=<^(*5Ium&Qgwy}oDW5LPe8t|LpJyZ;Aa-*}dfT+;eJh=LXCKU)AhGsLE3?`5
z_01;Jo+j-QV%O??TghI(?}m3)6JvwDd}(9rf@c$RW=1?rZfZ*jnGnC?a_24E74I(n
zzkTPHnxx6LLtA1wZL7ci5er+Z5&OKc*lW`49jvDcC+&49GoKVEyY{B0?)r&e980?b
zFaAtqFL~wS96jl8fJxu%HxnD49(W{Gd1Cs+mX9-6HT$aUYs!8Y{<inam)GW8BAdP`
zcb=bIx9k{mxJ0R;<u}#Nl{?PA37+}#`tkFwoe|fvj3)jP{m>lWR(hu0_9`Qbwacz8
z*R-T|FZG%!_v6YjxtPl{y*__F_s=`*dfls!w_dL}9`?wSF?-K{ueS0NX7QdGlTThx
z{w}%ZKxnhu90gVGO*?A7MSN?0AntkNadm9mZHWaF_Fhd{86WfGkGt<trv;+trX0O#
zc>A-%tm5tjkqc21ZmUh682x?Gw>%li)Fo|GHfY7aC_M9-Yl7Qa&ZN(iE_hhIWLSJQ
z%BF0^`7L7S)ICKLIXAyv<(l>S#WZH6?^edfPahOU7&7?CURRUrtd$B&mvfsxRih!L
zsc7q>59M8(UwnGA<H-RP-_G3?`$DG{FL`t3=jpQ2r@4{854V-ff3bb)QOn<7n#<Qb
zK4Q6g)ym0#jJI!ocJQgEX5+e=*S@c<t8cEW{lqOTE487W@0r)%A8nC2uXbukKHJlr
z{)m&u(PPUZnXIqri|5VX!CXA6?VFw9oD+72<txh$T)X<eXYQUaMH;Gt4pz%+U*D>(
zUo7$9=k@*TzoqSb%3A&Hc74*}?RHz{eLjEsNNYpvJqd|3cm5v9l8&AdqRz**;6hi{
zuY<?0U8z2}K7Q@Bls`48xe2^8i>Jr`etbdy-Gx29Gvgcf-I8@N%DDIP%?H!f_idNj
znw77JU)a%IGPNPStbTcb9FvBko$9xk_&FcHUKQVCTyW+~1+RfRv(wiGJ*&F^Uw<pj
z>k$pv^LkCQ&oi-2ff1h18lRk#yU(=i)9%;T?%c^a`~S`T%9!9c4+;VqmhD^WZMx!<
zxd+QNyXkpcJc&8WW^C6u7@%_5O=>~#d$&82y~Co6dbd<vYOGoPtu=JM{g#_eg@-SS
z*EQ|z3bsl1xzss-sjg3k{KPFg+sohHI$y8DEXQDF6g|nnl}{`21?!_lEFK>|pUCVv
zxA()c4%Q^i1IgXV0?%%|xiX{n$K(Hr)AxUE|8_^ZKCO4{UNgfIV<khaC;A6}@Bj5L
zx@gl<mb|O?j~}|S;%i*Z(Ou{FsyHzkpH7W;-??eejMr}R>z6HKo9HE=C_QD)&mX<~
z_cyD~KRiAD=Q`8UFWzjYo|~AmukT&DlyzfQH+S(i3;WfT-%q{HU*#(Q%Hvhf%VQ2c
zcS>JP+WKwI#plZP>V=!$y)I2_k~*q&l{d^}OH^xrcJcYjvx1X)uSnhd`$IN6<L$KP
z9BV%Q`O>j8uKIJey~A%Wd#<LSDC-rv4fX~NJZrVinecFwmTV3dF1qYk?rr>Q<w;LV
zmqR}k*>k?~a!nShDqmyikhFO1*Q56@+)C}9eAvv?PG`%l%k^<?Dl#HBW8w~$X6%u=
zQ_Au0WY8L&Gb?7yQc8%6%gtT;OGZhxA=T@oV(IOJSDQ=@da#sj+y1w5RsR}p2gT1*
z8Qs4*yqEIHo$=tppFJr?B`>n1rKDP4{j?Dike21P)mvlBqZE|1DJ}O<yivj~yUS{?
zUj)^=t+*3<|A8Ez{e^``?k6&bPJiCO(JcBRDki%7vT5tCrrxER(z1J$Gudvk8x>AE
zqvY>1RqT~2gM5mx>tE(Yi_JJcE>lsPEXHLj8aAzK_71r)rAyD39MgJf=wcHdQa5ET
z(}Fkaw3N4O-<qW96Vr7{C;XPis`<>#XM(k6hKspxIy#s4@9cl}wbNc?mUbjQsb&1b
z!m%>{!%mmqLeE^BlZzQH>}#BOFl6oHg>?ZZ+?Z!`1ZYpsY2@McoAXGbTZ`|2*PofK
zY|F)Z-CtP<rmj$qm^U$!&-K;UeVQ8D({waz#Llg<F=qX~>2>bAEsIvA-TXUg>teB%
z-d~2-d>`+~>D;?@h1vzallGsJ3OL0=svjS;n0+&G<`lDRKA!sUNs8)|`%@2C-nb#6
z{mLj_N<l?#=Q(lj6Pp~B4&9Jbeq8nIYrm}Vv#GM`4>Y!X`st)2(UilKr*eYjS$uAs
z?O!XsMCC|DA=mrTlU6=jA890YeTv=*RwE6aeHt?bW_r3TGyYRsR^s4jpPqL6WVcs<
zon3mLS#$lTxR52!m!veMyKx?@3tv^2-v8g`x5E9$f1F<y?=bwCysC%EfT#3Us+WXZ
zu8iK(%kQ@N^4$+?IP(Aa%HJ1@7@E#h%kR&<e*bs2q4^GlWrbR2-)Wst@zmS7`u*`&
z$=mjd9W~u~;fw96*U9JG9H00od&YzWRTZeM5K&!ufY(fwp^w?v@*KytmHXZs3Y?OD
zG_P^@_CMvH%O1ViT=s71d$+z7j1?YzuN@!XJGU$1kVn_!gsq43>VG6l?=22}uKbUG
z#s!nDTOy;Yr(eBle!`!Tt>u$+#G%suw-fen-LkE^p!)v3pQr7^gZ>_QnXWQ<@%#Im
z_4lPc*W3RhJ!SWj{HYsG|Gs%*!?Gh$*41mb?7De=Z`4&*rM2Cs^E3Jn{`7h)a<a6e
z<JU93-5(y!E@Ee&Q!tlX|Np$^<FB0Vn_lalp~T+ceK|R(>8yXBMnV3&H=EB*K7V7~
z@hbEBkL6}X&y%NK6L@~;OX>W7ZOrq|HF@jk+E(!INImrB<4l9HvvdD)y*m17)%}=@
z6OX-&meaof|4S_Eog?gC1}?v~44Kkv4Z^yjnr=2qXKb8vrP)&8m}>Xs$3`kDYWjZD
zU*CWFNAL4Kp^Zz<SpM6+Uv|>PlZzg?S23u4xhY`N*m_!X+o}=<vE~yOmYrR5%F%2=
zNq*|3b^E?5Yx_O9va0E)LB(U{-q_@5e-^gIEkapKHN*n`s-D?=EA>j2-xbsH?0J);
z68`G?@n!gUJX82Nr+9)*!RzE~>%wzwd36e^iucuDvh2Qhqckp?Me_NBuitau+*@8$
z;r{DR-K#E@eb?{*_5S*M84I`N?=EI(hj_*pzkW?Rv{7k_{lR0K$_z>t?LEEAXZkbU
z?R&L6v%KG1u6!$HENfJ_@TqsJJ-=yhurR-A9>WSY`R-@yF0Z;P{h>NpUnP=>k;U<V
z^(*VjQ`bFL1TW?L_V597f93L{E5es}yFA%4XUCKC^^Q5;4_$HI{qN#$GovpK2?4rF
ze<TZku*N*zxadju@k;N@{JDu~F`o-R9McymXI^8tW{zC#f~~C2GBVy?yz^-Dv=l4j
zwRP{k`_{hr)1dhL-n(gDSGx+%xBOeL;V&Lzvr;joXt`(u+v<#)uFns7$IiGnrEc%S
zm98ZPfrZ=m^^4gE8glSNt(0*t5B<~eB$qkr7W>mb-Rrq-K6|RL<&pFm_Dun?g;#v+
ztph$R+pogct`(zU=<UgRT-k2=PrdRL8p=w?)i>o;Gcx4n=B{!uj+GN@kaA+`dG$JX
z?M~lGN0sIWZ2juHutP?2#ec`BTQg2(Y&yuabxSGdloK10vwaU32b^c0ZG7G{jk9fH
z`uaqnl?hf7<vDqGuI$j$*S&S=%#2OWKGTxsFX^2r7I?s7@v)$TH7?Unr%t_Puw=#`
z>)!LhnX)mjPk%P6`oGKc2OHZ3KHkD$_nw#^SuZVRE$mZFcWgYg;-L&XGwb1LT-$a^
z991z(Pwkiabw@Tw<Hl9JbA7j7+-R9=U4E_0;B@D##!KESPl~fj>O{F8NfTi*-I9Cb
z{zb+58(Eh18r`DoeGTv3=6idd^k39GIY(DW_J7R`^HhuU<7=!gOL{5^GljDlbKX}t
zl3*ufSs;70{8!o`wWCc5&QpVLPfYt-*{GAHSM~e+s%eTA;i8%gCqCa?v*(1<C26gP
z-G<>YYd<PSZqmDXA#Z{p^8{^v(_Ge`MLU<LCwi7%iLqPF+q&Sm(o7afgL$Q|{)KLA
zNcq6G>22qVK4XK+h5Jv`{1a$xmfg{O>c+!wr&&H3Mt@m)D`Z98f%$^Y^M#J>J@aqj
zo5%C({%TEalHhr=k7<L!)i+6Aj0zqqLjLR@vk&HQ&U7xU6S`1)x5D7yy{6{ERd2N8
zXV<P=_p~LpYHggBxKN~um2>R9#NGc|&KdFed4!xi@Thpnn;A20t+vnGGTqa4;#t`f
zpFjEg6>U%#Y7t&i6xO=U&-LOzNz3<YLA$Qc{CF_oMqq4u>CA1)Z*pQ@TfBadU_R+X
zVJuV8945xtgR*<9OxC&wGCzL!e0kQKE~ojHSxY8NIM&0Z&}YmN)?Ga%bzha5pQhtH
zt1IsV-!52`?%3s({Qcua!MVjdRG5Np`R`v~c=Kk&rOhJVSvzEXa=e@_O>c<klwsH0
zF}Z!#q@;~z40n(DZ1#EXQTA=li|;=Y;|;~1mn_S5Ws{ygJKD^uBK%`ey8ryIbFGqP
z=PvvzqH}iL@$SRr@1vb-*Ph#x&=)8zaaYJb+WfiB+*4UT9v8Nk%-Qhlo80W#GdD=j
zuY1Cfb9UBkt0^h(Eo(i`zOqy=Y<nWR=lA~qt7HFt`!3SFVrT6W&W4q8j_a#_i@N7-
zTJiTwdDo)OTl=5>^xT@8k!8QINO^{kVZ9x@*s*t9EDvuw{OL9+oIHu||9^%pJEn@O
zns(OSs-4os7<{w)e4*sC++2}whb}Pb>biZ|kkx6|dL-`WCm#=u^}4IJn?7z|&XndL
z%6BAtv6<rO;>mKqbv5+zUcM5qNPcUWKT+tgfS~n~B-PM4Pd?8uWt3QAcFr;P&Wcz&
zMI*;oTW(IYHv9E?|7PR!fBQmzeDzNCnl$xM-+%wzCXdc0i@LTy@lkxo-8tQjUFqkG
z%I(+0P1hZ{=y75t=UP4eZSUUYovy0+dhY)({Z9f9%U9XBWnY%zdunuhwf8oQy6c4x
z_H3=F>DyA2nj8Bzf+6W}x&6nT^=_PnD%Tleo>{w`Z)<jHNL}`O&HZ$Z(jaZ&{pu2_
z*Vw*RKTcL=Dk|pB&#c?>#a6lW(7!`1Yk&M=sF=6^(<<KTJHFi#lFFgiv)^2{Yuixd
zF(a{b_3K$jV>YSf-`}<J31{hqGl!R5^RvEO;JI$$?LhCnNh=RC6`cPe6IobuX!oLZ
zM(;Ll*tvE2M)zLFXoYKbOUs+f?Y6GUe$QP$cjp&h)fDUVF%vzN?ewll^2JnNPm?*Z
zDLmLO?CJHr56&NoNLc5>Ti||PvR1$J)0d<24OusNihepQeSf0Oa_Jf#a~FP5wnBTZ
zs+rGyDrQ)i2}tS8vn;>&>zBV}m+t19J1u8_wm+J+CGy#9hu&XhXM9_Gmw!K#YMS(P
zA!k!~?c>>U(pR1zn`F{xBGvuKOYG{#)_?B%G)>uFryh9o<;jZB--|T6?`%){9VX!(
z6IgjtHSim+*aTO8<<N(XwpLM5`aOJiCtCV0TN=7xf?Sok-CnJm8ob&kCtdhqx~-{~
zpZ(u<BU6c6P5~EgT}$Vcb^Nz7$FFp<ky>%^;-WokR;}6;RdSIpFVte*BJ-qH{@ThT
z=UPwa>-e48*ufOJX3=TmS|<5D4k}xn&Fw=JO{Cdo%Sj(AY>e0=@%Y&nMuuh0f?R9F
zXQt0<UZdJ3oa6VWT1R{7gnRq@PiyC`4!Gqi`t{=Oj;y~LbH2N7-Mv>V>(Zb1S9R}N
zZ7^XAWc-(R$4-f<@uWwXbJ<KDmB@1n7dhWc&VHix^=@XsF~6<iHv<aRelJ+D=3>Z!
z*s2MFeGPnHWjAcMe!WmlIIWwN$GCP%syB-=yJyX|ulgzFnTd+V3R%*Lin0|#4ymW5
zSl=YDoV+mcpyRcGckJGUIR}a@esu9g|FUiSZoQUALb^)F^5Hh|WA9Edu3NYD{YRhp
zg;5HD6U>i(onCbQb3+X4qo4Z1*=%OwZBct$yS(?$c_QF8&GOLZKa&~)&d>32d-EnZ
z;b;HMP!)&7y=>)smp6QP{piD$<TC9|6VKP*?JzJ&*Pp{2|8wheW`$LG0Tbd@$UoQV
z6cO6!GCyTrkJ-MCmpzO^2aI;h2E_*o|2!hR^xV%01&@CpH@w`sjlq&NV}nX-eekBd
z<CCntAO7Z>#vpIN<jdz5)W2ilv4ryb%;&mJNl9K|EMnXfo&7mb$#`|KGn>)IN5>n5
z*FBojsG_^v!QXe&XGgIe`%Kb}lbMa4D1^<F+m$N6|F80FIr*To{I$$C7f<}tS{k<e
z`LcW2rHRMH#Kb~wM?N!jUiN%X%%-C(l|2qZ(SPTdhc~S;m5<Una_zH$vPNEl=ET<%
z3!cr%&&?Ko!JKpKWYON@l<e29w{6>)Su9t5_xF?7>W5$NZ%>c^*XQfkbMwcKmZbeB
zPip=(pX$}o+Bx~tjuQXh=S#~<XD2(cuH2yLwXJH+)xIwh%Z@)jef#?QTYuj4MCF_O
zs9soB^yeV&(XJ~26D5}0Z94dvcjJ7%B1`+zM;C~mZg<L=@?Y<sz-9jTp8wis@*H3`
zTe@l8MJqqM#fA$_k3Rdf<;JzEQ$-mUcu5>@)wI>#+9bJOoL9-SbuMeAgoIjbXGn@%
zgpPY<6{nc%^Hn0wTtAu@Y5V<Cf6}-?^BOy=oR-l6?o&G+-VSf}x%xOZDfhtZGcOu=
z#I^tYR0#OgncxtrB0Nh;)jFZmD^xnNWP-)Hcc-^bZee}jaQ=auilW=6Hw-*(pZ|TG
zf4l3rkHw1bU%p0LrY4^ZI%>XQ?$NBRQ@iejCV#)O<EvZ5d=1x%xQ57s%N3QllBQ06
zmz#fgeY~1MPqux+hGiRlpG|J~QS&D4&Bk+gE|^~Baeff6t67RSSmMN#+wyyLugwzL
z!p45t=JuyE8|;KXwJu@Wx>nAC>p}m${b|?h|7}nDTyS@7?z>6BdOkK=OV^zJecgUT
z=fmCCu2t)0z1+6!lckSYwcZ|)l-Yc4FEc$?_uN`mmi^Xt^?b#R4fj2F|JSST2x+S`
z-mx_4*3F9-Gu40ns^ML`GEFR}QHfpWNX5r@r!tp6{4EsG{`1I=0BugmW4lxpmsH$;
zoOr|0Zt>dRTlyWBpY`q6bh9gb=z3M_5YOT_DrV~UmYDEdR==m3E!6D6@NgyfdFyK*
zEKj!_QcRzJ%OPIjY0-gA7b?Q~Od|It$Vqi4s7>mL=ee?f&Agn_f3^bp4XM7@)_l)N
zO$;mYSyNcq_~+fTW4lsjoszh=J#&#}u<PMM(+fI!CycsO+kLbpmhTYR){}ks&e^kP
zqpPcDr%V^gJoH2Hqx1is=4(c?mn=>%dDyEfJ1O>9yL+kc*3y!1Cl*aRn^9F0z!x>6
zO-0!{(d6@&y$i!Ooix7@kUT**B{u1}`>fNG3!UC|@D$Z&$KERT$$Rw6lB>9oYtcc~
z2T}!-KQL=ZGMa9j&6F1CSaT%9>ya0C<E>{W=BO>yIdGwue@mdpp{UsPc1kDRXU~;O
zELCz7I3U^Bp&)znibe5??2oMRiR}6t+S`rR)y0cUTm4Q!^p{W3>I)xrl$sb12wYDz
z)>_S3#CA1VK%vV}XXB=`Qn}Y=Ts@$1VZN%!D)Y$F?A`Mw`pnTekZlwt(JCg>zGPit
zzO-0?nRFHF(f?v|M7D=UXQ-N<@-n{uO=<Gn9qrRz6-`-W!BSRJzV^LE>SzA%Q;r7h
z*JSUwUFWc+Y@Wr7gP}o74WIlhe6@&gy;6}*@6C_O67A=U8ICTKPjMCA)?RArV{o&c
zeF94@_u}oL0{Y7~sMPM!wdVQxtE=RHr^e!ziH=6wKKAiCe7S$v;nNI-ll6VhTRR#i
z^Mo4xJnE<}d0^A8#gPa9>l@6Nu!Y&(@tJRe{rsjw_ia2rSr)&zFehMw?A7GIldJnT
z27h|Kwf1Ld?Uoz={>C4C?v@jrx%RKo*8@xq?J0*XoPv`AFW(6@n83*L>HC65=WB1W
z_e)h<AMpBpb2bMXzu^a)PsJ;oL)_zDRR<?8Ibe~XBUC-xtL&L~)?&5K{Tj{|XDpQe
z-tm}v!0xK}uQj&2*q<wJ6I`iSt^VBP{2B3dyPK8gmOPlUYqi46m(0dt`{r}!I9cib
zoc3hS%?F28Rix^@c_|U}AetfA?6ty@O{>BdSjXNDiI~3e@Xy5OnNP|$I4?9We&MU*
znYAb=T{PX~;Df&T8w~_ZR`KU<C^~rN%=*BWj8);wk6Vk1%B{}5_2h^1%{QMp*YEpS
z-L;sZN@GqzS#8B@=1P$Oevb!!GX>VNc3tVVkl1i?>%H>{Us>N+r}FkrZ+cpL<j&K#
z3&izOg&5cxOgV3+ZWQmm_JpDP2lpeVzf6DIR+KKOb@Z*>eDCF>AGTY2AK8Q`?OfyY
zarVC-=NH`B`SD*o=a;x&&)%O3nea`5`!REpe&(CrFYj+&->0tj{^8mA+zbZSq_a;?
zI#c#-F1MCi(xbPPTMZd5c;to#IJ8EvOx`y^X5q4IN4<?Z=E#Rle^{;1cCWrK%8x;D
zL2l8Hc}Y!1|NofwZ)I$Z5w`E$HgEI7&MLF$2<Dq7CbZezW2isI=)lI1Dr@Bbv+jlG
zjEiM%L9-%Ot3(C&82h~c^JPbD?RWKWkG9_vSS=<0^~?X=AOFR7OJvy>#yQ9&DL1~9
zJEdMPcBQUCeaUk7B!NGAFRa&EC@-Cs*x8$T`{wb~@~~Iy(&K(MJN;f8bL4=S#PPik
zZZdFB|6n0_c}7ms#bfd@n}etC%Ut=VPe^ses*1XXir!}DDOE>Bw{9!^>^w6q$!zBv
zh7}x6YV`)+U)}osRx<wk8QUby4W~~0m7bKpt*S;grm0+X@wA^64~?YHsD5AM$CYig
zzv|oV`}P4sPn@FVqBech_;csV1KqW{LWarw?5_KA^K*aKo3o^;+JCz*{rUU+GkK@i
zGkyEC^Zrla*Hg+}T9a<>$n~#{o^Sd+j-yU~Vo|}zd%n>#=7t<%{vH;RynO%1w}<|@
z7Cn4-Jin8p`R}@KzmHukPfNNXHOt!PQM{3q?<6_3rHuY6&gZ*#c&29@7h~X<DPy)R
z*782fao>m??fmX**RQ|c)-L~xCGG;l3b(W7CY!h}O!u%X{I1x%&7#b`O(UZ=(r4zh
zK862Z*tNe&yOy7O78x6>n#Q~B{j;;tMO$Xgn>S7MW9#Yg5?`~+X7f9~%BFA8$oun1
z-K^w!aAq#&v(WSx8MAL4ytT_J`^(t|9sxIt*t_aAle?-nvL0y3))JO~TXai3O7E4t
z1pCuHTYg^Lo%LzQrcH15&llXVaG%jz=IHBp-p$UhEinALG4liqXJ%pKl^kP1PvyT3
z2Q)(?)s|>pDRODome!rU;?3H>|0bRd+TI}2^!>t(Te*AtUR`AJw)@@EJhfS`F=nE}
zy@NarCV5W}*gotDJyz}O&hDoap{%Y{sq}cmyT@t=;!mikPubZtGb!*yL({Ukfx2^C
z%O3w+5q@<_{ucgqd(-Et>qivFPp)zcYUgUc^W^-(dA%YzzZZ)38~4O5_`7|ote1<M
zl@*I<&l~Ou=4JEyZ+WFWt#DNkJR{Jg9J5t_$(s1?Y=x5@k=y<l=4f5dv@1MW^!l<_
z(33@Mn=6^vQnfDa(z|)^LNUkkHD$Tmwy*o=^15Y>&-tC=A^p`q9vnL-A9>+l+zv6x
z&jH1g`6ZveDA4PSIDGt!BwwS`rVD3e4W}0#n6<^}zKdsIhJJt)*Ma`m;>*&O+L^5i
zoU}XYTle8}H6g|c`%@mw=Qt2n%CuEdJ5Pr{Z@d5gx@3m{r)=G6D^;1JKeGgUS<3vk
zzNA6o=@Gvh{v5yh3cvroD!BgO7N47c?yS$K*?;W2Tf?ckvsP*6`P4GYGy*?}9>`L%
zcqCM!E_)_7FMVm6MwV{3%x3<(+hvvqA7uOQp`>%>x=QKoH}_ZF)!TTyN+#%1LzdcZ
z)kyoN0$c_2OD@k5mbg*zK~?<9iqgZk4z>K3&2K2u{<L7Wf?z^(A-h7agvz_`%Vub1
z35u*vO;Bb$AJcElAUw5iXQx8&m-@#xEsR~~d09`?EVGaH4Q;)_|LSg%Wqh1tg+^__
zp=-x^zp-)GW-YUrJYmzs6KZ0SQ8P9#^VytgB)Rp)tdfKSKkvN!c=5%D1-?DKCqmLr
zF+RL;fOmFng}Tw3Vu6i2Qq(somNC63yxVr-`-6wgrtFf*igF*yi=MVl50zgYB)i}J
zR8@kjdC2BSY0HIrD{WaA_138WcasUyd;VMO>gJ>GJ_zs`t<HXTvDldHkInU*yw_Z3
zJY3h_V_(1J%E52fE-mT(kp5tv#1-S|ag)xh`+dlJmfUXX)7NUhS@y~n<`}NYjP3|d
zdTiM<?bFgy_X7_eTFT5%KjL%5-r#`#|AYIjlvai<vI`B$@NQfqVYdF_<Kx%f)t%LD
z;MptVtpEDli#PYT?=YL5xzEgA^TYX?Ab$J)ViWT}#Yu;iZ>0Q6oTQ-s(09}9*TV5a
z)gS(L>;K>PuC~6~H*aRBU6^OTsz$iiGAC`xtjlULH|Es-vo3pgYW1|cCP!mbPKAbd
zri9tfDeixpE*0Z7eVh1|{rMLiPhNP?Adwicf!X<W!U6Hk>y|3542tqLTI_l0b>US%
z`|oX8BA(}1_H5Fx%qhOVxodOh)(G(#>w50)PxFlD-zy%!&8}+Auk(zzHU~xuUcXvB
z;r05PGt=V*5395PJGG1HKsTr1mB}-1vh43zF}-?8pTj<GgTAw}TkjndKB{^3d|qB2
zS8~9A@3{|V-M5$MjF@I>YHF47R`xB^)A@BjjAxhnT)g<d=b7@EID>UsTw7;ulwvkI
zXUOz4UH$j(+?13Xd9@aL6XthVF(o|GRNK1q^0HdHNi!I|6-4*ee_mCpuyNf-#@8=w
zWqVwe+<o#y9`{_Dl%#v>N4EW{+pEh21e*_99NzM9L1ICH$0hr$jS(J^Uxm186DN3U
zEZ(-~!GaA@If}KJr!GBZvfGic$x_6f_we`cn~UsS^9+rRwcC2n_urLuKYncO|CIT*
zpWkqQyLSJ-$EGtr?_E>*&+YxtCKvXX?WD%frhAE#rR!gCtL08zyL|0NwJRA<XPlYc
ztu-U{K#f;q?eoa&Pv=#FH!NRtZc@`9XVWQsX^|ycu4~Ma=#{#z&yxM<lvn+{En+cB
zMf{sPY=b_`<yrIk)2(R^VWp`vjiz`$VXofy@o9I><#{4W_SHXKFYb}n_AYz7cmJlH
z9~uAd-L~<nUrdGKrT+K!mMcDIFZ)#e#%tRB*ljYiix#OAHFCAS%2|{6T&vHh*R#>j
zrzVBRxp0qvLY9x@>6kbF#4PPT7DVJ2%cty~%f+3NUV6)GvZAwD$=~#U>)Ks6e?EH5
z>#gRb77J;OWhT-NYHw5{*GCjh=&^I}(JEq<+&Cq(cuBvv_j^|Fw`*6}x}3>j;49{O
z<f9`enP&EK)2UYl{rz*kJ08m7(h0hn+Zt!|^KI(ob;s{_Yb&*t#^=aO&zJD}<@wXv
zY2JbFC(le^?VG*lQdrZzdczZs9oAoAlj!<4(SPyGc151vr1=5n!je`DPdFyrSn;TC
zirDqT8OC23I3%xb<XtP=x}dwqy8ZpTb8Yf(L|KCu=^xhnQ*<y-??m=#EiT@W`E`Gn
zJy@`$>BHWymRC1w-0oc>{kiSY3e&Us%(J!2GOf25GD-Zpb$+Vp-&=P}h1*{puWJrH
z?3MJ8qoZqy#s0N%+mjsTT}XSxy>zjP$LZOj?fdqctxD)$U^&fJj&H?JOK%a|ZT6yn
zm~W(W8l+l%`>{7b&9S!D!irDTHfiRoiEj5Dllq%jg_mABHS5CtT-~)53s)_4WXy>=
zd8xK>Qvj2&cGIM!>nee#OE~{rbeX-0-!%I8QmG3ouL=L<y4PvW@oZ)1B2gZnCx>p>
zZjC=MaY9|=%y-5MS&!6hdHy=$#$;xdo~W|w>(A8MpT=p}w;oeF`PoC@@e$8QQpOHR
zYg&KqWO~scxx3`4>&E6Ix<)c33{1g?EbkQmbKR=$yq9$*L$UiE*Z;;2dan#;*hbAt
zWU(-}&+p~^>h((BYQmcJ>$g9<Rwlh;`;vS4Us|47u8f`Xa!$Pd1R=|-|37baz0D;5
zxounA)%>HW3R9QIPf2?F?&|zoZ{z>;npQj1|NLtI)o|UH?DZ@3HZ9$JU&_jF<+IIO
z-Yooe+O%|jv4hAhTZT8~p2t?p*=OEf&E3WAy;w~2<IOpX|AyCmt2-xN_@eW(e#G^c
zr&(JsJubeR@}+sbLu5$&ET7ieZFlE$uV-UmHf=g`wMeQzX2HbGLdoIbr6PAOo=yn}
zU)S>5?@HFv2??w6!y>)C(n1x@o=IjnUk#nEX)wp)R`BCY%lXH%FK>&Ed0Y6kT*WnI
z-fC_~zQ;{!n)f;^L$1G?FKwgTw{E`6ku^-uq+g#}yL74VBu|dT!q4Z2=SU{qteH^o
zxWoU<oO2P+jyx4u{PXX+Gc1QCPCCoJdDp#TrIy9*XqE|0i?lV<|6WQ7E6h%HZf8C+
z&8h$G;d#=3ex19v>MZa5f(^4a9Q!u8>+O%5Yp;fGz0-M~_1el`p}%fiifpi*HDhXB
zhf0;%)8!KbY}yxVY|LA>GgKlYFUv)3_Mhn7+QnPTzrENu-L|dG!O1ruIyyO8t~faB
z`>EIWw@y8)Ab<7q&(8?~GxT#O^fL#=r#wD!=evk8yV0`En{Uh6R4foOe&iPMY1_PD
zyZPyVV}EY76-!@#vgC^w)9;tJ?L&IzR6RXw|C5n>ZbDh}n!j!@>W?TLP*IBwOG<4x
zd`YO6-IhD~W{Or?uTWw@;eVTpx0M^%i`i^DH}d$|`eekoR~kIwN?B5o!Pa_~d0L<6
z#wW9nJh(7n)?~iBdsj{q^RZcX|LWDHYpbe@on0qidb&P;g)Pe#V_pr;e-k4vNHK2r
z&tlb<W$EeXyM3YAno03wMq+p3M@QeOVXID9K4kR2rf&BozxuxANyn`_FIuZ<xuj1#
zYqw|Z$!q1GdS-<xB`>v`7}t|><;8!)hYyPL(t^Ib`MVrzJj(Pg;{F}c2fBJ*TqVp(
z)5H$XSfhLH)}J>^)HK5GrSQ1t)i0Ul$e=2n^Z)5|(IvJMU6p2hWUj2wbvt_Ni~Yfr
z<#!sh7MU0XcnIkj<!Sb2g-D3|)UvJn8?$b0gi~_XVU^V@S8n^YOziYT&8{;gCz_5(
zu6|G#y8aC>Z|MF1x9!DE`7cZtNh~|&H@DiYFULdhg08yo!lOs>u5e6yR3mofU@_}T
zMx)?}EdkCEf-*N39lMz$@N@10cYC1>hyCKMk1`Jk2l2d{=yPGQPy3v+a`(aynz24J
zVp-&N&{5`ZqE~nDG@Y^s;Zd?eLLSYw5*poe94A}-xTSOX+S)~lv!1V;y!Df_*iOF}
z>!<3Qm_C~;S9-KN%I(J=j=db8=X0N!(6~ZB`AYh;j|}Q>5BgVzgwL$k@od<w@O8<K
z-{<&h)i%pn{_?c@^g6Lx!Z`JW@X6)6I(5wvhFhB=XHJRfwPFtum8r6LGwoo;|7$Zi
zT}$`>VaySk>V9^{{5sp0XE=qn3bD#?ZJcKk&i8%m-#d3)f*e@ObPV{X3MQPg@0un5
zd(H**itB9eV?IkPJ9DaQa?-B17i|q!^&VSjwWDG=_wS8QmZ@CrTe)${Ve|CB5cO@+
ztZ`4}Lev)-tIl}wq_0PiGl0qMobNfSB!Q;Wmr9;0=bAgsZm8@xy;9z1e4~-+YgkNk
z-9qEw<X3aM3wykhSGWc-%)9z?{+-y3Pxduy+slVf?5KJ(HT-7J@#vY~5-vO|<kp+R
z>+2g9IZrIwg;(~wzjgPoHnsnkSJ<^D35AE{9Jb&5`c3g9-k|mFbILz2{%(_3asQdy
z`%YCIz4ae=Bs*?o`p3g^c7yqb370P$n;BYaF59qmZRmr9y1cNb)*DW*O7&u2(0-(U
zmJXxcSGRMwj$F{y{<ve!|4-YO<R#l(nD*w`@A};Le?QoBZz-E!d(W==x%;G_Tj%dt
zQGW5twdLv0=7joYmz|z<>o?1W2?3XW-&izFaAB|KJ-M21>wJ6eZ2omkj{ni>{Y=sF
zs_EaaIs2!aQj)Wb=5A^HZ~boDm942BYQJk3PCU_#oNzC%;?BuPPVZ&MzOKB$*L3WK
zhlQuZ?S<2HjY_|iADAWRx2S*q|GdB_g$GPKVyCIGi8u$oQu+L0Qo<~b&3#r$R}TuT
zF{=H4N!8P^^2&y()0QpXb=&A|?-Wr@#-^xl{}XJfQ6I9k0-e%}eyoc~Pbz!#`0m~{
zbNBq1G)YXt;MGnAEsrOg%RMHBN<Gauv}f7Tm{jN0S6WpzGtRuS;q%SivrmUjI>qj}
z>fYqz+xM}(XmXgVtLv?x`b_TL#+3)pui3TI`Qx--)$4StbV_245~Aj9h<{-A=b(SR
zMpKKK-UPwj6Q2}ad;V&|@u%INgZGvFse2W*MLobxq{gRf$s!ra9czDlKlJo@=xGa^
z0`rPyix12^+e%Ab-kUZpe5%SS9q*`c|M|T4_Gk0IyZhzGPT$VOF-y)I`a1u)ca@Hn
zsa3+_?{>v+wk36Me*DYk)JeAYcZ0a6r?|A4mVf0gnSRpL^2nK&B{R2{%)eHvyi`};
z^XALX;%hzl9Hg^bZKoX!yzsgqH8s~+B*iLL%dGoQs&&fr`W<OY)~@v}t*zO*ZJULH
zO(OH_)lqYDR5sMV*eU)zeaTvOpKaw|#hxrQ6y5)zp`hl$G++L^0moQgU-{+JKG)`E
zdT(#<Etd^eYO`IQ^?UkG%+2*(YPVWv(p^PGh3>YJhBGJ6JlQehyeNANj|QjpCY~2(
zS88mYw2N7iv$oRANie(6NaXwRz1uPl8(JByaJ_x=>f-6Xg4-M%WA_?mX6<>mKs2q_
zSJutg<gMxLJGXk1iyPnl;C`t+(`4cAdzWW@5ZSXxf7ymP&!6xgU43DXOqsux3!_f=
z;_}?`^zbyZJ;_VNO-~+RnCdp|S;}F#zjv3;EDU^mLNBBtCUD)E#Ms!gjWVh&eS(Ll
ziU+&SO;wr{ap&iY<wXHWdm=Z;XzB0!)u!L#b4A^7>7nvtJQt?kzOS1zfnANEGWV20
z=B9`;hGU5fd!@V6?%VwEv70RwU{ouUu#eSaUqdBdGQUJH|EiQ3+U`aNSoeP4XQXR!
z`%_A;ZTc6<NmoCeEB{uS+o*fL;)YF9X8xUj&G#n7bnDzZ+kfxc@0|rtO)dM5zT21@
z`1o4$vX$=5OCJBqu<cCzUBjkdxh5ne|17`84d;|oKV2rs3rwlGX~rDCT;-jnz#rcb
z&v%*=o42^k{28<E!hfB9ZB;g|X<P13o8=$E_;BX@bJz957Pys$sBS&(6~ricWwPSR
ztT%SwTMurX)$;qE*8w?o?Y{qW)%S~g`SQicPG`yv_@WX}Iblw)!S2mMOB$IbwomE}
z+#B6FsoZjI>p|TOHdE$_yfgeS@mp?t@THqCpC7n&XU4pZOZK?Enm<FZ@3u;zSaF!J
z$hGZX+jsfc&o<tBzN7c(2VQ;FNjH9KWP}~!KW4mYa{TQZ8*BgTtlU@-cfQrd;5)-^
z2PUhjCn6Wm|2XI8mdOwH=uDD2&b3j}P+I4<!au>fbxeFLyVmc0U3fTSLe?_vHS3mI
zPqCjO5?vZ<aQgP`^}%z(<KxwX7Hryd$nWd-(<i4~3y#^n`1zLOcIiysPv+mR{ME%9
zTOa;?g<Muz(n5yC%;t3qr=@J{{=2vT|N7cLkM{@Ezq$VZ&HdY*-S<OyANc?OUBAVu
zU;ek=-k1Pa!*wd5jGjj#J^p*#F<Q6B`CR&|4*^1g8TwWR9P1XwFP-a`uybW|sf*C7
z(#P8(E`AT3zp&-dr}-OKeyrHc643S7x;o!V*!OZw$9lev@oSdOy!d<D9s}triRgb3
zooP1nSBP87Sf5Z7eO~v!?#~;8n3(d)yhCNv)MZv|*Le4EUI3q%dhMHQ%XF5fYhJ(M
zZ=o=AzRa|qNi%+&lCED>K4CiN{iq1*tVjFQ%_EYom$GkazFwa=_pi9>&!fRf!FflY
zcKLc9c*_0Pq4=TYqD`}Je3eg?=$zE%H*5Fx8+VR$`10M`FmGPo#&bJsa^&V{ZD>34
z<w(wv7K82yETwDJnNJ$m#I|{!T^l>8ROs{a?&7Yc!F)=L6&tQ@xBIj4PMjy7iCOuI
ztFEE7-9oSa@Xb)2r~dOq3J3F?=<9ZyT7O1PJ=Rzm5v&rU_*g<ZPCV;GW22*W@v}9j
z9zIK7wsy~=Q=4XY7g_UN`LgfnX{p+dOH9|30{>R2uxFePUuzXAaWQ4#5pJW-9o94T
vgJhLX3QP+8v6kW8<4@{K9{u-kU}RXWlN|Q$fQ38*0|SGntDnm{r-UW|NgL7`

literal 0
HcmV?d00001

diff --git a/misc/openmohaa-text.svg b/misc/openmohaa-text.svg
new file mode 100644
index 00000000..8de0f98e
--- /dev/null
+++ b/misc/openmohaa-text.svg
@@ -0,0 +1,8500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1733 851" style="enable-background:new 0 0 1733 851;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3F3F41;}
+	.st1{fill:#28282A;}
+	.st2{fill:#9CBADC;}
+	.st3{fill:#57626E;}
+	.st4{fill:#7F8E9F;}
+	.st5{fill:#9EAFC2;}
+	.st6{fill:#8A9EB6;}
+	.st7{fill:#6D7E92;}
+</style>
+<g id="Background">
+	<path class="st0" d="M1390.8,263.3v-74.6c0.1-0.5,0.1-1.1,0.2-1.6c-0.1-0.6-0.1-1.1-0.2-1.7v-11.4c0-0.1,0-0.2,0-0.3
+		c0.1-0.4,0.2-1.2,0.3-1.6c-0.1-0.7-0.2-1.3-0.4-2v-4.5c1-0.3,2-0.6,3-0.8c-1,0-2,0-3,0v-31.1c0-0.2,0-0.4,0-0.6
+		c0.5-0.3,1-0.6,1.6-0.8c-0.7-0.7-1.3-1.4-1.6-2.3V46.5c0.6-0.1,1.7-0.2,2.2-0.3c-1-0.3-1.7-0.9-2.2-1.7v-2.2
+		c0.6,0.2,1.4,0.4,1.9,0.6c0-0.4-0.1-1.2-0.1-1.6c0.9,0.5,1.9,1,2.9,1.5c0.1-0.6,0.2-1.8,0.3-2.4c-1.7-0.1-3.3-0.1-5-0.1v-7
+		c0.5-0.6,1-1.1,1.5-1.7c-0.5-1-1.1-2-1.5-3v-3.2h-0.5l0,0c-0.5,0-1.4,0-1.9,0c-1.8,0-3.5,0-5.2-0.1c-1.1-0.8-2.1-1.7-3.2-2.5
+		c-0.2,0.6-0.6,1.9-0.8,2.5c-1.1,0-2.2,0-3.3,0.1l-991.4,0c-3.1-0.2-6.1-0.7-9.2-0.4c-1,0.1-1.9,0.2-2.9,0.4h-1.7
+		c-0.5-0.4-1.2-1-1.6-1.3c-0.5,0.3-1.6,0.8-2.1,1.1c-0.5,0-1.5,0.1-2,0.1c-0.2,0-0.8,0-1,0c-2.5,0-5,0-7.5,0l-4.6,0
+		c-0.5-0.3-1.3-0.9-1.7-1.2c-0.4,0.3-1.2,0.8-1.7,1.2l-2.8,0c-1.1,0-2.2,0-3.2,0c-0.1,0.3-0.2,0.9-0.3,1.1c-0.3,4.1,0.1,8.3,0,12.4
+		c-0.1,1.6-0.2,3.2-0.2,4.7c-0.6,0-1.7,0-2.2-0.1c0.1,0.5,0.2,1,0.4,1.6c0.5-0.4,1.5-1,1.9-1.4c0.1,1.9,0.1,3.8,0.1,5.6
+		c0,0.8,0,1.6,0,2.5c0,3.5,0.1,6.9,0.1,10.4c0,1.1,0,2.2,0,3.3c0,2,0,4.1,0,6.1c0,0.4,0,1.2,0,1.5c0,1.9,0,3.8,0,5.8
+		c0,1.3,0,2.5,0,3.8l0,0.9c0,5.2-0.3,10.5-0.2,15.7c0.1,3.2,0.1,6.5,0,9.7c0,0.6,0,1.8,0,2.4c0.1,5.7,0.1,11.3,0,17
+		c0,0.5,0,1.6,0,2.1c0,1,0,3,0.1,3.9c-0.6,0-1.1,0.1-1.7,0.1c1.4,0.8,2,2,1.7,3.7c0,0.4,0,1.2,0,1.6c0,2.3,0,4.5,0,6.8
+		c0,2.2,0,4.3,0,6.5c-1.4,0.2-2.7,0.5-4.1,0.8c1.4,0,2.7,0.1,4.1,0.2v1.3c-0.1,2.5,0,5.1,0.1,7.6l0,4c-0.1,1.9-0.3,3.8-0.8,5.7
+		c0.6,2.3,0.8,4.6,0.8,6.9c-0.1,8.8-0.1,17.5,0,26.3c0,2.4,0,4.8,0,7.2c0,4.4,0,8.9,0,13.3l0,4.9c0,5.5-0.1,10.9-0.2,16.4
+		c0.1,2,0.2,4,0.2,6l0,9.8c-104.1-0.1-208.2,0-312.3,0v121.7c-0.8,0.1-2.1,0.3-2.7,0.5c0.9,0.3,1.8,0.5,2.7,0.8v89.2
+		c-0.2,1.2-0.6,2.4-1.3,3.5c0.4,0.8,0.9,1.6,1.3,2.4v83.7c0,0.7,0,1.4-0.1,2c0,0.3,0,0.6,0.1,0.9v62.3c-0.1,2.4-0.1,4.9-0.1,7.3
+		c-0.6,0.5-1.7,1.5-2.3,2c-0.8,1.2-2.5,2.5-1.6,4.2c0.9,1.4,2.6,1,4,1.1v55.2c0,0.2,0,0.3,0,0.5c0,0.2,0,0.3,0,0.5v50.9
+		c-0.4,1.2-1.2,2.2-1.9,3.3c-0.1,0.4-0.3,1.3-0.5,1.7c0.6,0.1,1.7,0.2,2.4,0.3v7.9c-0.3,2.8-0.1,5.6,0,8.3v12.7
+		c-2.7-0.1-5.5-0.1-8.2-0.1c0.2,0.8,0.4,1.6,0.6,2.4c2.6,0.2,5.1,0.7,7.6,1.3v19.7c0,1.4,0,2.8,0,4.1v7.4h252.9
+		c-1.1,1.7-2.3,3.3-3.3,5.1c1.4,0.6,2.9,1,4.4,1.5c0.5-2.2,1-4.4,1.5-6.6h876.5c-0.1,1.1-0.2,2.1-0.3,3.2c1.2-0.1,2.4-0.1,3.6-0.1
+		c0.1-0.2,0.2-0.6,0.2-0.8c0.1-0.6,0.1-1.5,0.2-2.3h22c0,0.4,0,0.8,0,1.1c0,0.8,0,2.3,0,3.1c0.9,0,1.8,0,2.7,0
+		c0.7-1.4,1.4-2.8,2.1-4.1h20.8c0.7,0.3,1.5,0.6,2.2,0.9c0.3-0.3,0.6-0.6,0.9-0.9h11.9c1.7,0.8,3.4,0.9,5,0h26.3
+		c-0.3,0.4-0.6,0.9-0.8,1.1c-0.1,0.5-0.2,1.6-0.3,2.1c0.8-0.2,1.7-0.3,2.5-0.5c-0.1-0.7-0.4-2-0.5-2.7h6.2c-0.8,1.7-1.5,3.4-2.1,5.2
+		c0,0.5-0.1,1.6-0.1,2.1c0.4-0.1,1.3-0.3,1.8-0.4c0.7-2,1.6-3.9,3.4-5.2c-0.2-0.4-0.6-1.3-0.8-1.7c0,0,0,0,0,0h11.7
+		c0.8,0.2,1.5,0.4,2.3,0.7c-1,0.1-2.9,0.2-3.9,0.3c-0.1,0.6-0.4,1.7-0.5,2.3c1.4-0.1,2.8-0.3,4.2-0.4l1.1-0.2
+		c0.7,0.9,1.4,1.9,2.1,2.9c-0.1-0.6-0.3-2-0.4-2.6c-0.3-1-0.5-2-0.8-3h69.4c0.1,0.4,0.2,1,0.3,1.4c0.1,0.5,0.2,1.5,0.2,2.1
+		c0.8-1.2,1.5-2.3,2.4-3.4h4.7c0.1,0.9,0.2,1.9,0.4,2.9c1-0.7,1.6-1.8,2.1-2.9h28.9c0.1,1.8,0.2,3.6,0.3,5.4
+		c0.1-1.8,0.2-3.6,0.2-5.4h13.5c0,1,0,1.9,0,2.9c0.6,0.4,1.1,0.8,1.8,1.3c-0.4-0.3-1-0.9-1.4-1.2c0-0.7,0-2,0-3h76.7
+		c-0.5,1-0.9,2-1.3,3l2.6-1c0.1,1.5,0.2,3,0.3,4.5c0.1-2.2,0.2-4.3,0.3-6.5h115.6c0.1,0,0.3,0,0.4,0.1c-0.7,0.3-2.1,0.9-2.7,1.2
+		c1.6,1.9,3.4,3.5,5.4,4.9c0.8,0.4,1.7,0.8,2.6,1.2c-1.4-2.2-4.4-3.9-4.1-6.8c0.2-0.2,0.4-0.4,0.6-0.6h2.6c0.4,0.4,0.8,0.9,1.2,1.3
+		c0.5-0.4,0.9-0.9,1.4-1.3h22.1c0.2,0,0.4,0.1,0.6,0.1c-0.4,2.1-0.8,4.2-1.1,6.4c1.2-2.1,2.5-4.3,3.6-6.5h74.5V263.3H1390.8z"/>
+	<path class="st0" d="M1299.5,6.2c-0.8,0.6-1.6,1.3-2.3,1.9c0.3,2,0.6,4,0.9,6.1C1298.4,11.5,1299.6,9,1299.5,6.2z"/>
+	<path class="st0" d="M1214.6,22.4c0.3-0.6,0.7-1.3,1-1.9c-1.1,0.2-2.2,0.4-3.3,0.5c0.2,1,0.4,2,0.7,2.9
+		C1213.4,23.6,1214.2,22.8,1214.6,22.4z"/>
+	<path class="st0" d="M1397.9,29.7c0.8-0.1,2.5-0.2,3.3-0.2c-1.2-1.3-2.4-2.6-3.6-3.7l-0.6-0.5c-0.7,0.1-2,0.4-2.6,0.5
+		c1,1.3,2,2.6,3,3.9L1397.9,29.7z"/>
+	<path class="st0" d="M1409.3,34.6c0.4-1.3,0.9-2.6,1.4-3.9c0.8,0,2.5-0.2,3.3-0.2c-0.6-1-1.2-1.9-1.7-2.9c-0.3,0.4-0.9,1.3-1.2,1.7
+		c-0.2,0.2-0.7,0.7-0.9,1c-2.8,0.2-5.5,0.5-8.2,1.2c0.1,0.5,0.3,1.4,0.4,1.9C1404.8,33.6,1407.1,34.1,1409.3,34.6z"/>
+	<path class="st0" d="M1394.6,108.5c-0.1,1.8-0.1,3.5-0.1,5.3c0.1,0,0.4-0.1,0.5-0.1c0.6-2.6,2.3-4.5,4.6-5.7
+		c-0.4-0.7-0.8-1.4-1.2-2c-0.3,0.6-0.8,1.8-1.1,2.4C1396.6,108.4,1395.2,108.5,1394.6,108.5z"/>
+	<path class="st0" d="M18.8,670.1c-0.2-2.7-1.4-5-3.1-7.1c-0.1-1.6-0.1-3.2-0.2-4.9c-2.6,1.4-6,2.5-6.7,5.8c0.5,0.2,1.6,0.7,2.1,0.9
+		C14.2,665.6,15.4,669.4,18.8,670.1z"/>
+	<path class="st0" d="M7,701.2c-0.3-1.1-0.7-2.2-1-3.3c-1.1-0.5-2.1-1-3.2-1.4c-0.4,0-1.2,0.1-1.7,0.1c0.3,1,0.7,2,1,3
+		c0.2,0.7,0.8,2.1,1,2.8c0.8,0,1.5,0.1,2.3,0.2C5.9,702.2,6.7,701.5,7,701.2z"/>
+	<path class="st0" d="M27.6,724.9c0-2.3,0-4.6-0.1-6.9c-1.7,1-4,2.3-4,4.6C24.3,724.2,26,724.5,27.6,724.9z"/>
+	<path class="st0" d="M17.7,742.3c-0.4,0-1.2,0-1.6,0c-0.7,0-1.9,0.1-2.6,0.1c0,1.3,0,2.6,0.1,3.9c1.3,0.3,2.6,0.5,3.9,0.8
+		C17.5,745.6,17.5,743.9,17.7,742.3z"/>
+	<path class="st0" d="M5.3,754.8c0,2.9,0.1,5.8,0.2,8.7c1,0,1.9,0,2.9,0c0-3-0.1-5.9-0.3-8.9C7.5,754.6,6.1,754.8,5.3,754.8z"/>
+	<path class="st0" d="M16.3,756.4c0.1,1.4,0.3,2.8,0.4,4.2c1.3-0.3,2.6-0.7,3.9-1c-0.1-1-0.2-1.9-0.3-2.8
+		C18.9,756.6,17.6,756.5,16.3,756.4z"/>
+	<path class="st0" d="M201.2,823.5c-0.5-0.1-1.6-0.2-2.2-0.3c-0.3,2.6,0.1,5.3,0.8,7.8c1.1,0.5,2.2,1,3.4,1.5c0.4-1,0.8-2,1.2-2.9
+		c-0.4-0.4-1.1-1.1-1.5-1.5C201.7,826.9,201.6,825.1,201.2,823.5z"/>
+	<path class="st0" d="M1447.2,824.3c0.3,1.8,0.7,3.7,1,5.5c0.5-0.8,1-1.6,1.5-2.3c-0.1-0.7-0.4-2.2-0.5-2.9
+		C1448.8,824.5,1447.8,824.4,1447.2,824.3z"/>
+	<path class="st0" d="M126.4,828.5c0.2,1.8,0.5,3.7,0.9,5.5c2.6-0.6,3.9-3,4.5-5.4C130,828.5,128.2,828.4,126.4,828.5z"/>
+	<path class="st0" d="M1274.8,831.7l-0.3,0.3c0.4,1.2,0.8,2.3,1.3,3.5c0.9,0.1,1.8,0.2,2.7,0.3c0.5-1.1,1.1-2.1,1.7-3.1
+		c0.2-0.3,0.5-1,0.7-1.3c-0.5-1.2-1-2.3-1.5-3.5C1277.8,829.1,1276.3,830.4,1274.8,831.7z"/>
+	<path class="st0" d="M1310.3,834.3c1,0.9,2.1,1.7,3.2,2.6c0-1.5,0-2.9,0.1-4.4c3.5-2.6,7.3,0.7,10.9,1.3c0.3-1.3,0.7-2.7,1.1-4
+		c-3-0.1-5.9-0.4-8.7-1.3C1314.6,830.4,1312.3,832.2,1310.3,834.3z"/>
+	<path class="st0" d="M1490.7,832.6l1.9-0.7c0,0.4,0,1.2,0,1.6c0.8-0.6,1.6-1.3,2.4-2l0.7-0.1c0-0.7-0.1-2-0.1-2.6
+		C1493.5,829.5,1492.2,831.2,1490.7,832.6z"/>
+	<path class="st0" d="M157.1,834.8c0.8,0.8,1,3.4,2.6,2.7c2.4-0.8,5-1,7.5-1.2c0.1-0.2,0.4-0.7,0.6-0.9
+		C164.8,832.7,160.4,832.8,157.1,834.8z"/>
+	<path class="st0" d="M1265.6,844.1c0-0.4,0-1.2-0.1-1.6c-0.7-2.3,1.3-3.7,2.9-4.9c-0.7-1.5-1.8-2.8-3.5-3.4c-0.4,2.2-1.2,4.3-2,6.4
+		c-1.2,1-2.4,1.9-3.6,3c-0.8,0.5-1.6,1-2.4,1.6c0.5,2,1,3.9,1.5,5.9h1.6c-0.8-1.6-1.3-3.3-1.8-5.1c1,0.4,2.2,1,3.2,1.4
+		C1262.8,846.2,1264.2,845.2,1265.6,844.1z"/>
+	<path class="st0" d="M1319.4,845.2c0,0.8-0.1,2.3-0.1,3.1c1.3-0.9,3.3-1.2,4.1-2.8c0.4-2.2,0.2-4.5,0.1-6.7
+		C1321.5,840.5,1320.1,842.7,1319.4,845.2z"/>
+	<path class="st0" d="M1308.4,841.2c-0.7,0.6-1.4,1.3-2.1,2c-0.2,1-0.5,2.1-0.6,3.1c2.2,0.9,3.7,2.7,5,4.7h1.2
+		c-0.4-1.6-0.8-3.2-1.3-4.8C1309.9,844.5,1309.2,842.8,1308.4,841.2z"/>
+	<path class="st0" d="M102.5,844c0.7,1.7,2.2,2.8,4.1,2.7c1.4-1.3,0.4-2.9,0-4.4C105,842.5,102.7,841.7,102.5,844z"/>
+	<path class="st0" d="M1265.9,849c-0.2,0.5-0.7,1.5-0.9,2h7.2c0.8-1.4,2.2-2.8,1.2-4.5C1270.8,845.9,1268.4,848.2,1265.9,849z"/>
+	<path class="st0" d="M1336.4,845.9c-2.4,1.2-4.8,2.2-7.3,2.9c0.2,0.7,0.3,1.5,0.5,2.2h4.5c0.6-1.3,1.1-2.6,1.7-3.9
+		c1.7,0.9,3.7,1.7,4,3.9h3.6c-1.1-1.3-2.2-2.7-3.3-4C1339.1,846.1,1337.9,845.2,1336.4,845.9z"/>
+	<path class="st0" d="M71.5,851h7.1c0-0.7-0.1-2-0.1-2.7C75.8,848.3,72.9,848.3,71.5,851z"/>
+</g>
+<g id="Shadow">
+	<path class="st1" d="M373.2,40.6c1.4,0.3,2.6,3.8,0.8,4.4C372.4,44.4,372.3,41.8,373.2,40.6z"/>
+	<path class="st1" d="M377.2,50.2c0.5,0.2,1.4,0.7,1.9,0.9c-0.7,1.5-0.5,4.4-2.9,3.7C375.4,53.1,376.5,51.7,377.2,50.2z"/>
+	<path class="st1" d="M367.5,53c0.1-3.7,4.6-0.8,6.8-0.8C372.6,53.6,369,55.7,367.5,53z"/>
+	<path class="st1" d="M438.9,56.9c0.4-2.8,4-3.1,4.3-0.1C441.7,56.8,440.3,56.9,438.9,56.9z"/>
+	<path class="st1" d="M353,66c0.2-3,2.9-3.5,5.4-2.9C357,64.7,355,65.5,353,66z"/>
+	<path class="st1" d="M383.3,72.2c3.1-0.3,0.8,3.7-1.2,2.5C380.4,73.9,382.1,72.1,383.3,72.2z"/>
+	<path class="st1" d="M443.2,73.1c2.4-0.7,1.2,2.9-0.5,2.5C441.2,75.3,442.2,73.3,443.2,73.1z"/>
+	<path class="st1" d="M1380.1,78.2c1.6-0.5,2.2,0,1.7,1.6C1380.1,80.3,1379.6,79.8,1380.1,78.2z"/>
+	<path class="st1" d="M1361.1,80.2c1.6-0.5,2.2,0,1.7,1.7C1361.2,82.3,1360.6,81.8,1361.1,80.2z"/>
+	<path class="st1" d="M347.1,87.2c1.3-0.8,2,1.7,1.8,2.6c-0.7,1-1.8,1.6-2.8,2.1C344.7,90.7,345.6,87.9,347.1,87.2z"/>
+	<path class="st1" d="M403.9,104.1c0.8-1.5,0.5-4.6,2.9-4c0.8,1,1.5,2.2,0.5,3.3C406.2,103.7,405.1,103.9,403.9,104.1z"/>
+	<path class="st1" d="M1087.6,113.7c0.5,0,0.9-0.1,1.5-0.1c-0.7,1.7-0.9,3.6-1.1,5.4l1.6-0.1c2.9-0.1,5.9-0.1,8.8-0.1
+		c3.4,0.1,6.8,0,10.2,0c2.5,0,5.1,0,7.6,0c5.1,0,10.1,0,15.2,0.1c0,2.8-0.1,5.6-0.2,8.4c-32.4,0.4-64.8,0.1-97.2,0.2
+		c-104.7,0-209.3,0-314,0c-40-0.1-79.9,0.2-119.9-0.1c-0.1-2.8-0.1-5.6-0.1-8.4c3.9,0,7.9,0,11.8,0c4.2,0.1,8.4,0,12.6,0
+		c3.3,0,6.7,0,10,0c2.6,0,5.1,0,7.7,0c16.9-0.1,33.8-0.1,50.7-0.1c4.4,0.2,8.8,0.4,13.3,0.3c27.5-0.4,55,0.2,82.5-0.4
+		c11.2,0.3,22.3,0,33.5,0.2c10.5,0.3,20.9-0.2,31.4,0.1c2.4,0,4.8,0,7.2,0c3.7,0,7.4,0.1,11.1,0c2.4,0,4.8,0,7.3,0
+		c51.4-0.1,102.8-0.1,154.1-0.1c18.3-0.1,36.7,0.3,55-0.2l-0.3-1.2C1087.7,116.3,1087.6,115,1087.6,113.7z"/>
+	<path class="st1" d="M1291.5,117.4c1.5-2.3,3.8,2,1.5,2.7C1291.4,121.6,1290.7,118.3,1291.5,117.4z"/>
+	<path class="st1" d="M369.1,141.1c1.5,0.7,2.9,1.5,4.1,2.7c-1,0.4-1.9,0.8-2.9,1.2C369.9,143.7,369.5,142.4,369.1,141.1z"/>
+	<path class="st1" d="M688.9,189.2c0.3-1.9,2.3-2.6,3.8-3.3c0.3,1.8,0.6,3.7,0.9,5.5c3.2,0,6.5-0.1,9.7,0.2c2.5,0.5,4.8,1.3,7.1,2.2
+		c7.3,5.3,7,15.1,7.8,23.2c0.3,14.1,0.1,28.2,0.1,42.3c-0.5,14.6,0.3,29.2-0.1,43.8c-0.3,17.5,0.4,35-0.4,52.4
+		c-0.2,6.3-1,12.7-4.2,18.3l-0.8,1c-0.3-1.2-0.5-2.4-0.6-3.6c0.1-20.7,0.1-41.4,0-62.1c0-5,1-10,0.5-15c-0.6-6.6-0.4-13.3-0.5-20
+		c0.1-16.3-0.1-32.7,0-49c-0.3-4.6-1-9.7-4-13.4c-4.6-3.7-11-2.5-16.4-3.3c-3.1-0.3-3.5-3.8-3.6-6.2
+		C688.3,197.8,687.8,193.4,688.9,189.2z"/>
+	<path class="st1" d="M858.4,189.2c0.4-2.5,2.8-3.5,5.1-3.6c0,1.8,0,3.7,0.1,5.5c3.3,0.4,6.7,0.3,10,0.3c3.5,0.6,6.7,2.4,9.4,4.8
+		c0.8,1.2,1.6,2.5,2.3,3.9c1.5,4.7,2.3,9.6,2.4,14.6c-0.1,28.4,0,56.9,0,85.3c0.1,12.3-0.3,24.7,0.4,37c-0.6,7.2-0.3,14.5-0.6,21.7
+		c-0.4,5.9-1.3,12.4-5.7,16.8c0.6-49.2,0-98.3,0.3-147.5c0.1-5.3-0.8-10.9-3.3-15.6c-3.8-3.9-9.8-3.7-14.8-3.8
+		c-2.6,0.1-6-1.5-5.8-4.5C857.8,199.2,857.6,194.1,858.4,189.2z"/>
+	<path class="st1" d="M1018.4,186c1.5,0.9,3.4,1.9,3.4,4c1.7,14,1.7,28.1,3.6,42.1c0.3,4.8,2.1,10.3-0.7,14.6
+		c-6.1,3.6-13.6,2.3-20.4,3.4c0-0.6,0.1-1.7,0.2-2.3c-0.6,0-1.8,0-2.4,0c-2.2-8.7-2.6-18.3-7.9-25.9c-3.7-5.2-10.1-7.3-16.1-8.2
+		c-7.7-1-15.3-1.9-23.1-1.7c-7,0.3-14.1-0.7-21,0.9c-1.9,7.5-1.3,15.3-1.3,23c0.1,12.5-0.1,25,0.2,37.6c-1.9-0.5-5.4,1.3-5.8-1.4
+		c0.5-11.3,0.2-22.6,0.3-33.9c0-3.2,0-6.3,0-9.5c0.1-5.3,0-10.6,0.1-15.9c0-1.2,0-2.4,0-3.6c0.7-4.8-0.5-11.3,4.7-13.8
+		c3.4-1,6.9-1,10.4-1c12.6,0.1,25.2-0.3,37.6,1.9c7.7,1.2,15.8,4.6,19.7,11.7c1.2,2.2,2.3,4.4,3.3,6.6c1.5,4.4,2.6,8.9,3.4,13.4
+		c0.1,0.9,0.3,2.7,0.5,3.6c2.7,0.2,5.4,0.2,8.2-0.2c1.8-0.2,3.5-0.5,5.3-0.8l0.7-0.1c-0.3-2.8-0.7-5.6-1.3-8.4
+		c-0.4-2.4-0.5-4.8-0.8-7.1c-0.4-3.1-0.5-6.2-0.8-9.4c-0.2-2.6-0.5-5.2-0.7-7.8c-0.1-2.1-0.2-4.2-0.3-6.2
+		C1017.6,189.7,1018,187.9,1018.4,186z"/>
+	<path class="st1" d="M1044.2,191c0.2-2.5,2.3-3.9,4.4-4.9c0.3,1.7,0.6,3.4,0.9,5.1c6.7,1,15.7-0.2,19.9,6.4c2.7,3.4,3.5,7.8,4.2,12
+		c-0.2,6.8,1,13.6,0.7,20.4c-0.4,8.8-0.2,17.5,0.1,26.3c-0.1,17.2,0.1,34.5,0,51.7c0.1,10.9,0.3,21.9-0.2,32.8
+		c-1.2,10.1,0.6,20.8-3.5,30.4c-0.5,0.9-0.9,1.7-1.4,2.6c-2.1-2.5-1-5.9-1.2-8.8c-0.1-7.3,0.4-14.6,0.9-22c0.1-21.7,0-43.4,0-65
+		c-0.2-12.6,0.5-25.3-0.5-37.9c-0.1-6.6,0-13.2-0.9-19.7c-0.8-3.8-2.2-8-5.8-9.9c-4.5-1.6-9.3-1.3-13.9-2.1
+		c-2.1-0.4-3.8-2.2-3.7-4.3C1043.8,199.7,1043.7,195.3,1044.2,191z"/>
+	<path class="st1" d="M1206.3,189.2c0.3-2.4,2.9-2.7,4.8-3.5c0,1.9,0.1,3.7,0.3,5.6c4.5,0,9.1,0.3,13.2,2.1c2,1.2,3.9,2.6,5.6,4.3
+		c1.6,2.3,3,4.8,4.1,7.4c1.3,4.5,1.9,9.1,2.2,13.7c0.1,1.1,0.2,2.1,0.4,3.2c-0.2,1.4-0.3,2.8-0.4,4.2c-0.1,8,0.1,15.9-0.1,23.9
+		c0,4.6,0.2,9.2,0.1,13.8c0,2.6,0,5.3,0,7.9c0,2.2,0,4.4,0,6.6c0,0.5,0,1.4,0,1.9c-0.1,3.6-0.1,7.2,0,10.8c-0.2,8.4,0.8,16.7,0.9,25
+		c0,2.1,0.1,4.2,0.3,6.3c0.3,2.7,0.6,5.4,0.8,8.1l-1.2,0.2c-0.4-0.4-1.2-1.1-1.6-1.4c-1.4-1.7-2.7-3.5-4-5.2
+		c-0.8-10-0.8-20.1-0.8-30.2c0.1-18.7-0.1-37.4,0.1-56c0-7.8-0.4-16-4-23.1c-2.9-5.3-9.7-5.7-15-6.3c-2.7-0.1-6.1-1.5-5.9-4.7
+		C1205.9,199.1,1205.5,194.1,1206.3,189.2z"/>
+	<path class="st1" d="M1280.5,190.5c0.3-1.8,0.8-3.6,1.3-5.3c1.3,1,3.3,1.7,3.5,3.6c0.9,4.3,0.5,8.8,0.5,13.2
+		c-0.2,2.4-0.6,5.9-3.6,6.2c-5.1,0.8-11.1-0.1-15.3,3.5c-1.9,2.6-2.7,6-3,9.2c-0.2,10.4-1.7,20.6-1.6,31c0.1,24,0.1,48.1-1,72.1
+		c0,27,0,54-0.1,81c0.3,3-1.5,6.1-4.7,6.3c-5.7,0.5-11.4,0.4-17,0.1c-3.7-0.2-5.5-3.7-7.6-6.3c-23.1-30.7-48.8-59.1-73.7-88.3
+		c-12.6-14.4-25-29.1-37.5-43.6c-7.4-8.3-14-17.2-21.4-25.4c-0.3,4.4-0.2,8.8-0.1,13.1c1.8,18.6,0.5,37.4,1.1,56
+		c0.6,10,0.9,20,0.8,29.9c0.3,7.3-0.6,14.8,1,22c0.4,1.9,0.7,3.9-0.2,5.8c-3.7-3.9-5-9.4-5.4-14.7c-0.6-8.1-1-16.2-1-24.3
+		c-0.2-5.4-0.3-10.7-0.3-16.1c0-4.3,0-8.7-0.1-13c-0.1-9.3,0.4-18.7-0.6-28c0.1-14-1-28-1.2-42c-0.2-6.2-0.9-12.3-1-18.5l1.6,0.5
+		c1.3,1.6,2.5,3.2,3.7,4.9c1.2,1.7,2.5,3.4,3.8,5.1c3.4,4.5,6.9,8.8,10.3,13.3c0.2,0.2,0.5,0.7,0.7,0.9c1.1,1.4,2.3,2.8,3.4,4.1
+		c0.9,1.1,1.8,2.2,2.8,3.3c1.6,1.9,3.3,3.7,4.9,5.6c0.2,0.2,0.7,0.8,0.9,1c2,2.6,3.9,5.2,6.2,7.7c0.6,0.7,1.2,1.4,1.9,2.1
+		c0.2,0.3,0.8,0.9,1,1.2c4.2,4.6,8.1,9.5,12.3,14.1c1.5,1.6,2.8,3.3,4.2,5c2,2.5,4,4.9,6.1,7.2c0.6,0.8,1.3,1.5,2,2.3
+		c3.9,4.1,7.4,8.6,11.3,12.8c2,2.1,3.9,4.4,5.8,6.7c1,1.3,2.1,2.6,3.2,3.9c0.5,0.5,1.4,1.6,1.9,2.1c1,1.2,2.1,2.4,3.1,3.6
+		c3,3.5,5.9,7.2,9.1,10.7c2.5,2.8,4.9,5.7,7.3,8.7c2,2.4,4.1,4.8,6.2,7.2c1.1,1.2,2.1,2.4,3.2,3.7c1.6,2,3.3,4,5,5.9
+		c5,5.9,9.7,12.1,14.6,18.2c0.6,0.8,1.2,1.5,1.8,2.3c1.5,1.8,2.9,3.6,4.3,5.5c1.6,2,3.3,3.9,5,5.9c2.7,0.1,5.3,0.1,8,0.1
+		c2.5,0,5,0,7.5,0l0-1c0.1-5.6,0.1-11.3,0.3-17c0-2.1,0-4.2,0-6.3c-0.1-2.5-0.2-4.9-0.2-7.4v-1.1c0-0.6,0-1.7,0-2.3c0-2,0-4,0-6
+		c0.1-10.3,0.6-20.6,0.3-30.9c0-2.5,0-5,0.1-7.5c0-2.4,0.1-4.7,0.2-7c0.2-4,0.1-8,0-11.9c0-2.1,0.1-4.1,0.2-6.2
+		c0.1-3,0.1-5.9,0.1-8.9c0-2.3-0.1-4.6,0-7c0.1-1.3,0.2-2.5,0.3-3.8c0.4-6.7,0-13.4,0.2-20.1c-0.3-8.8,0.5-17.6,0.5-26.5
+		c0.4-5.5,0.8-11.1,1-16.6c0.2-4.8,2.9-9,6.4-12.1C1269.5,191,1275.3,191.9,1280.5,190.5z"/>
+	<path class="st1" d="M558.2,191.6c0.6-0.1,1.8-0.3,2.4-0.3c5,0.3,9.9,0.1,14.9,0.5c3.3,0.8,6.6,1.9,9.8,3c14.6,5,26.7,16,34.8,29.1
+		c0.2,0.3,0.6,0.9,0.7,1.2c1.7,2.9,3.2,5.8,4.7,8.9c2.5,5.4,4.5,11.1,6,16.8c1,4.5,2.2,9,2.9,13.6c1.5,8.2,1.2,16.6,1.8,25
+		c-1.1,9.6-1.8,19.3-3.7,28.8c-0.3,1.9-0.7,3.7-1.1,5.6c-1,4.2-2.9,8.1-4.5,12.2c-1.5-3.7,0-7.5,0.7-11.2c1.6-7.1,1.7-14.5,2.7-21.7
+		c0.9-6.4-0.7-12.7-1.1-19c-1.2-15.9-6.1-31.5-14.1-45.2c-6.2-10.1-15.1-18.8-25.8-24.1c-11-5-23.5-7.9-35.4-4.7
+		c-16,3.4-29.8,14.1-38.2,28.1c-5,7-7.9,15.2-10.6,23.3c-6.7,22.6-6.4,47-0.3,69.7c0.5,1.6,0.3,3.3,0,5c-7.9-17.5-10.6-37-10.4-56
+		c0.7-13.1,2.6-26.2,7.2-38.6c2.6-6.8,5.7-13.5,9.7-19.6c2.5-3.8,5.3-7.4,8.4-10.7c5.7-6,12.4-11.3,20.1-14.6c1.5-0.6,3-1.2,4.5-1.7
+		c1.8-0.6,3.7-1.3,5.6-1.8C552.8,192.4,555.5,192.1,558.2,191.6z"/>
+	<path class="st1" d="M1146.2,193.1c1.9-0.8,2.9,2.6,0.8,2.9C1145.3,196.5,1144.4,193.6,1146.2,193.1z"/>
+	<path class="st1" d="M757.7,195.7c0.9-0.2,1.8-0.3,2.7-0.5c9.4-0.2,19-0.2,28,3c12.4,4.1,20.3,16.1,22.7,28.5c0.3,2,0.5,4,0.6,6
+		c0.5,5.8,0.1,11.5,0,17.3c0,0.7-0.1,2.2-0.1,2.9c-0.3,5.8-1.8,11.5-4.1,16.8c-0.1,0.2-0.3,0.7-0.4,0.9c-0.3,0.5-0.8,1.5-1,2
+		c-0.2-0.5-0.5-1.4-0.7-1.8c0.3-6.3,2-12.6,1.6-19c-0.8-10.9-2.8-22.9-11.2-30.7c-8.9-7.7-21.4-9.3-32.7-8.1
+		c-0.1,49.3,0,98.6,0,147.9c-0.3,4.5,2.2,9.3,0.1,13.6c-0.8-1-1.5-2.1-2.2-3.2c-1.3-3.8-2-7.8-2.5-11.7c-1.1-8.6-0.6-17.2-0.7-25.8
+		c0-28.4,0.1-56.9-0.1-85.3c-0.2-7.2,0.9-14.4,0.2-21.6C757.2,216.7,758,206.2,757.7,195.7z"/>
+	<path class="st1" d="M1378.2,209.2c1.2-0.8,3.5,0.9,2,2.1C1378.7,212.9,1375.8,210.3,1378.2,209.2z"/>
+	<path class="st1" d="M851.1,215.8c4.7,8.5,7,18.4,6.6,28.1c-0.2,6.7,0.5,13.5-1,20c-2.2,11.8-8.6,22.4-16.5,31.4
+		c-16.5,18.9-42.3,28.8-67.2,26.5c-2.5-0.6-4.3-3.2-4.1-5.8c-0.1-4.6-0.3-9.3,0.2-14c0.2-2,2.3-2.7,3.9-3.4c0.1,1.8,0.3,3.6,0.5,5.5
+		l0.8,0.1c11,1.2,22.4-0.4,32.6-4.7c8.5-3.1,16.4-7.9,23.3-13.8c3.7-3.1,6.4-7.2,9.6-10.7c5.4-6.8,9.2-14.7,10.9-23.2
+		c0.3-1.5,0.7-2.9,1-4.4c0.7-3.1,0.8-6.2,0.8-9.3c-0.1-5.8,0.6-11.7-1.4-17.3c-0.2-0.6-0.5-1.8-0.6-2.4
+		C850.6,217.7,851,216.4,851.1,215.8z"/>
+	<path class="st1" d="M673.4,248.5c0.3-0.4,0.8-1.2,1-1.6c3.3,6.4,4.7,13.6,6.9,20.4c3,13,2.9,26.4,2.3,39.7
+		c-0.3,11.6-3.3,22.9-6.8,33.9c-4.3,10.2-8.8,20.4-15.9,29c-14.6,19.1-35.7,32.8-58.9,39c-7.5,2.5-15.3,3.5-23,5
+		c-10.7,0.4-21.4,0.1-32.1,0.1c-20.3-2.8-39.9-10.5-56.6-22.4c-17.5-13.4-31.9-31.4-38.4-52.6c-2.8-7.1-3.8-14.7-5.5-22
+		c-0.4-12,0-24.1-0.1-36.1c1.7-11,5-21.6,9-32c0.4,0.2,1.1,0.7,1.4,0.9c-3,8.9-4.6,18.3-5,27.7c-0.1,2.5-0.1,5-0.1,7.4
+		c-1,23.2,5.3,46.6,18.3,65.8c0.8,1.2,1.6,2.3,2.5,3.4c2.1,2.6,4.2,5.1,6.4,7.6c2,2.2,4.1,4.4,6.4,6.3c7.4,6.6,15.8,12.2,24.7,16.6
+		c2.5,1.3,5.1,2.5,7.8,3.6c1.5,0.6,3.1,1.2,4.7,1.8c1.8,0.6,3.6,1.2,5.4,1.8c8.8,2.4,17.8,5,27.1,4.6c7.4-0.2,14.8,0.5,22.2-0.6
+		c2.9-0.4,5.8-0.7,8.6-1.2c4.1-1,8.2-2,12.4-2.7c2.6-0.4,5-1.2,7.5-2.1c2.4-0.9,4.9-1.7,7.3-2.7c14.5-6.1,27.9-15,38.5-26.7
+		c0.8-0.9,1.6-1.8,2.3-2.8c3.4-4.2,6.6-8.6,9.3-13.4c0.7-1.3,1.5-2.5,2.2-3.8c2.5-4.6,4.3-9.5,6.2-14.3c4.1-10.6,5.8-22,6.8-33.2
+		C679.3,278.1,677.8,262.9,673.4,248.5z"/>
+	<path class="st1" d="M986,268c-1-4.8-1.7-11.5,3.7-14c0.3,0.6,0.9,1.7,1.2,2.3C990.4,260.6,988.9,264.8,986,268z"/>
+	<path class="st1" d="M1003.4,286c0.2-11-0.3-22,0.6-32.9c2.2,1.1,5.2,2.1,5.8,4.9c0.9,5-0.8,10-0.7,15c0,13.6,0,27.3,0,40.9
+		c-0.1,5.2,2,10.6,0.5,15.8c-2.2,5-8.4,3-12.6,3.4c-3.7-0.2-9,1-10.9-3.1c-1.4-5.1,0-10.7-2.4-15.6c-1.7-4.9-7.2-6.1-11.6-7.1
+		c-12.9-1.6-26-1.8-39.1-1.3c-0.6,17.7,0,35.4-0.3,53.1c-0.3,3.6,1.4,7.3,0.3,10.8c-3.8-4.4-5-10.3-5.4-15.9
+		c-0.5-10.6,0.3-21.3-0.5-31.9c0.1-6.3,0.8-12.7,0-19.1c-1-4.8,0.9-9.7-0.5-14.5c8.5-0.1,17,0,25.5,0c9,0,18.2-0.1,26.9,2.7
+		c4.6,1.5,8.6,4.8,10.3,9.4c2,4.6,1.2,9.9,2.8,14.5c4.2-0.4,8.4-0.6,12.6-0.4C1002.9,305.2,1003.6,295.6,1003.4,286z"/>
+	<path class="st1" d="M1481.9,286c-0.8-3.5,4.1-1.1,4.4,1C1484.8,286.7,1483.2,286.7,1481.9,286z"/>
+	<path class="st1" d="M1449.3,296.1c2.7-0.6,0.9,3.8-1,2.7C1446.5,298.2,1447.8,296.1,1449.3,296.1z"/>
+	<path class="st1" d="M1291.2,318.2c1.4-1.2,2.7,1.4,1.3,2.2C1291.1,321.5,1289.9,319,1291.2,318.2z"/>
+	<path class="st1" d="M45.2,330.2c1.5-1.2,3,1.4,1.6,2.4C45.3,333.8,43.8,331.2,45.2,330.2z"/>
+	<path class="st1" d="M1036.6,344.2c0.1-0.2,0.2-0.8,0.3-1c3.5,0.5,6.8,3,6.7,6.9c-0.6,7.1-3.5,13.8-5,20.7c-2.4,11-5.4,21.9-7.2,33
+		c-0.5,2.6-2.7,5.1-5.4,5.3c-5,0.4-10-0.9-15-0.9c-11,0-22,0.3-33-0.9c-17.4-0.3-34.7,0-52.1-0.1c-4.1-0.1-8.2,0-12.3,0.4
+		c-14.5,1.3-29.1,0-43.6,0.9c-4,0.5-9.6,2.1-11.7-2.7c-0.8-5.2-0.6-10.5-0.2-15.7c0.1-2.5,2.6-3.5,4.7-4.1c0.3,1.8,0.1,3.8,0.9,5.5
+		c11.5-1,23.1-0.7,34.6-1.1c17.9,0.4,35.7-0.8,53.6-0.4c12.7-0.3,25.4,0.9,38.1,0.1c2.3,0,4.7,0.4,7,0.5c0.7,0,2.1,0.1,2.8,0.1
+		c7-0.1,13.9,0.8,20.8,0.8c1.5,0,3.1,0.1,4.6,0.1c0.4-1.3,0.8-2.7,1.1-4c0.8-2.7,1.3-5.5,1.8-8.3
+		C1030.5,367.3,1033.4,355.6,1036.6,344.2z"/>
+	<path class="st1" d="M1049.3,379.4c0.7,0,2.1-0.2,2.8-0.2l-0.7,0.1C1051,379.3,1049.9,379.4,1049.3,379.4c0.1,4,0.1,8,0.2,12
+		c9.1-1.4,18.3-0.5,27.5-1.3c4.6-0.5,9.3,0.4,13.9,0.2c8-0.1,16,0.5,24,0.4c1.3-0.7,2.7-1,4.2-1.3c0.1-3.3,0.1-6.6,0.2-9.9l0-0.3
+		c0.2,2.1,0.4,4.3,0.6,6.4c1.7,0.9,4.1,1.5,4.6,3.7c0.7,3.8,0.1,7.8,0.1,11.6c-0.2,2.2-0.1,4.6-1.4,6.5c-2.1,2.3-5.4,1.5-8.1,1.2
+		c-6.7-1.1-13.5-0.2-20.2-0.7c-6.7-0.6-13.3,0.2-20,0.1c-8.3,0.2-16.7-0.5-25,0.9c-2.6,0.5-5.7-1.1-5.8-4c-0.4-5-0.4-10,0-14.9
+		c0.1-2.6,2.7-3.5,4.8-4.3C1049.1,383.6,1049.2,381.5,1049.3,379.4z"/>
+	<path class="st1" d="M688.9,389c0.4-1.9,2.3-2.5,3.9-3.1c0.3,1.9,0.3,3.8,1,5.6c4.1,0.1,8.1-1,12.1-0.9c4,0,8,0,12-0.5
+		c5.6-0.4,11.2-0.1,16.8-0.4c15.8-0.1,31.6,1.1,47.4,1.8c0.6-1.8,0.7-3.7,1-5.6c1.9,0.6,3.9,1.7,4.2,3.9c0.6,4.6,0.4,9.4,0.2,14
+		c0,2.5-1.7,5.3-4.5,5.2c-4.7,0.1-9.3-1.2-14-0.9c-6.7,0.5-13.3-1.3-20-1c-10.3,0.2-20.6-0.5-30.9,0.8c-6.1,0.6-12.3-0.3-18.5,0.7
+		c-2.9,0.3-6.1,1.1-8.9-0.2c-2.9-1.7-2.4-5.5-2.5-8.4C688.4,396.3,687.9,392.5,688.9,389z"/>
+	<path class="st1" d="M147.5,426.2c0.8-1,3-0.8,3.1,0.6C150.5,428.7,146.6,428.1,147.5,426.2z"/>
+	<path class="st1" d="M161.2,437.5c2-1,2.8,3.2,0.7,3.4C160.4,440.7,160.2,438.4,161.2,437.5z"/>
+	<path class="st1" d="M1053.5,475.6l0-0.5c0.1,2,0.1,4,0.2,6c1.8,1,4.7,1.4,5,3.9c0.6,5.7,0.3,11.4,0.2,17.1
+		c0.1,2.9-2.3,5.5-5.3,5.5c-6.7,0.5-14.7-1-20,4c-3.8,4.9-4.5,11.4-5,17.4c-1.6,11.3-0.7,22.7-0.9,34c0,45.7-0.1,91.3,0,137
+		c-0.1,6.7,1.7,13.2,1.3,19.8c-0.6-0.1-1.8-0.4-2.4-0.5c-4.5-13.1-4.2-27.2-4.3-40.8c0.1-3.2,0.1-6.4,0.1-9.5c0-2.6,0-5.1,0-7.6
+		c0-3.2-0.1-6.5,0-9.7c0.1-13.4,0.1-26.8-0.1-40.1c0.1-29.8,0.1-59.7,0.1-89.5c0.1-8.5,0.7-17.5,5.5-24.9l0.5-0.9
+		c2.8-3.1,6.5-5.5,10.7-5.8c4.5-0.4,9-0.4,13.6-0.9C1052.6,484.9,1053.1,480.2,1053.5,475.6z"/>
+	<path class="st1" d="M1236.2,476.2c0.9-2.4,2.6,0.2,3,1.5c4,10.9,6.7,22.3,10.8,33.2c16.8,52.6,35.3,104.6,53,156.9
+		c2.7,8.1,5.4,16.2,8.6,24.2c0.6,1.8,1.7,3.9,0.1,5.6c-1.4-3.6-3-7.2-4.2-10.9c-1.2-4.2-2.8-8.3-4.6-12.2c-0.7-1.9-1.3-3.7-1.9-5.6
+		c-2-6.2-4.2-12.4-6.3-18.6c-1.1-3.1-2.1-6.3-3.1-9.4c-2.6-7-5-14-7.3-21.1c-1.1-3.4-2.3-6.8-3.6-10.2c-3.2-6.1-4.1-13-6.6-19.5
+		c-4.4-13-9.1-25.9-13.2-38.9c-0.8-2.7-1.7-5.5-2.7-8.1c-2.5-6.7-4.6-13.5-6.8-20.2c-0.4-1.2-0.8-2.5-1.2-3.7
+		c-1.6-4.8-3.2-9.5-4.6-14.3c-0.5-1.5-1-3.1-1.5-4.6C1241.2,492.3,1238.8,484.2,1236.2,476.2z"/>
+	<path class="st1" d="M1524.7,474.7c1.5,0.5,3.2,1.3,3.5,3.1c2.2,8.8,5.8,17.2,8,26c3.6,10.7,7.3,21.4,10.6,32.3
+		c6.8,19.4,12.8,39,19.9,58.3c8.1,24.2,16.5,48.2,24.8,72.3c1.7,6.2,3.9,12.3,6.2,18.3c0.5,1.9,1.9,4.2-0.1,5.7
+		c-0.4-1.2-0.8-2.4-1.2-3.6c-0.8-2.8-1.9-5.5-3-8.1c-0.5-1.3-1-2.6-1.5-3.8c-1.2-3.6-2.5-7.1-3.9-10.7c-1.1-3.3-2-6.7-3.2-10
+		c-0.8-2.4-1.7-4.8-2.6-7.1c-1.4-4.2-2.4-8.4-4.2-12.4c-0.7-1.7-1.2-3.5-1.7-5.2c-1.1-4-2.3-7.9-3.9-11.6c-1.3-3.1-2.3-6.2-3.3-9.4
+		c-0.4-1.3-0.9-2.7-1.3-4c-3.5-9.4-6.5-19-9.9-28.5l-0.2-0.6c-2.7-7.6-4.8-15.4-7.9-22.9c-1.4-3.9-2.6-7.9-3.9-11.9
+		c-3.4-10-6.7-19.9-9.9-29.9c-1.2-4-2.4-8-3.9-12c-0.9-2.5-1.8-5-2.5-7.5l0-0.2C1528.4,485.7,1526.5,480.2,1524.7,474.7z"/>
+	<path class="st1" d="M432,480.8c2.1,0.7,4.4,2,4.5,4.5c0.4,5.2,0.2,10.5,0.2,15.7c-0.1,2.4-0.6,5.9-3.6,6.2
+		c-8.5,1-18.1,0.1-25.4,5.4c-4.7,5.2-4.1,12.9-4.6,19.4c1.3,17.3,0.4,34.6,0.7,51.9c-0.3,9.7,0.9,19.3,1.2,29
+		c0.7,11.9-0.5,23.9,0.5,35.8c1.1,7,0.3,14.1,1,21.1c0.6,6.7-0.3,13.5,0.9,20.2c1,6.6-0.5,13.3,1.1,19.8c0.6,3.3,1.6,7.1-0.6,10
+		c-1.5-2.6-2.5-5.4-3.2-8.3c-0.2-1-0.5-2-0.7-2.9c-1.7-6.1-1.5-12.4-1.7-18.6c-2.2-11.5-1.2-23.3-1.7-35c0.1-5.5-0.2-10.9-1-16.3
+		c-0.1-6.9,0.1-13.8-0.7-20.7c0.8-8.8-0.8-17.6-0.4-26.5c0-4.2-0.1-8.4-0.1-12.6c0.1-12.9-1.4-25.7-1.2-38.5
+		c0.1-1.8,0.2-3.6,0.2-5.3c0-6.7-0.2-13.4-0.1-20.1c0.1-3.8,0.7-7.6,1.5-11.3c0.2-0.6,0.7-1.7,0.9-2.2c2.6-5.3,7.8-8.9,13.5-10
+		c1.7-0.4,3.5-0.7,5.2-1c4.3-0.2,8.5-0.2,12.8-0.5l0.5,0C431.7,486.9,431.8,483.8,432,480.8z"/>
+	<path class="st1" d="M755.5,485.3c0.1-2.5,2.3-3.9,4.5-4.5c0.2,2.8,0.4,5.6,0.4,8.4l1.1,0.1c4.8,0.5,9.7,0.4,14.5,1.3
+		c2.9,0.8,5.7,2,7.9,4c0.6,0.6,1.1,1.3,1.7,2c0.9,1.3,1.7,2.7,2.5,4.1c2.6,5.7,2.6,12,3.3,18.2c0.5,15,0,30.1,0.2,45.1
+		c0,0.8,0,2.5,0,3.4c0,6.5-0.1,12.9,0,19.4c0,2.8,0,5.6,0,8.4c-0.1,3.9,0,7.8,0,11.8c0.2,7.5-0.2,15,0,22.5c0.1,22.1,0,44.2,0,66.3
+		c-0.5,3.7-0.9,7.5-1.1,11.3c-0.3,4.8-2.8,9-4.2,13.6c-3-4.2-0.7-9.8-0.5-14.6c0.9-42,0.4-84,0.5-126c-1-17.3,0.7-34.7-1.2-52
+		c0.2-5.3-1.3-10.7-3.9-15.3c-4.6-5.6-12.6-5.1-19.1-5.1c-3.3,0.2-6.7-2.1-6.6-5.6C755.4,496.5,755.2,490.9,755.5,485.3z"/>
+	<path class="st1" d="M100.4,485.4c0.9-2.1,2.3-3.8,4.8-3.7c0.2,2.6-0.2,5.4,1.2,7.7c0,0.1,0.2,0.4,0.2,0.5
+		c4.9,0.5,9.9,0.2,14.7,1.4c8.7,2.5,14.2,11.1,15.3,19.8c1.2,9.1,0.8,18.4,0.2,27.5c-0.2,2.3-0.2,4.7-0.3,7
+		c-0.7,7.1-0.8,14.3-1.2,21.4c-1.2,8.6-0.8,17.3-1.7,26c0,7.9-1.7,15.9-0.3,23.8c0.6,2.9-1.5,5.4-1.5,8.2
+		c-0.2,14.7-1.4,29.3-2.1,43.9c-0.8,8.5-0.8,17-1.9,25.5c-0.2,1.7-0.4,3.5-0.5,5.2c-0.4,1.9-0.8,3.7-1.1,5.6
+		c-0.3,1.8-0.7,3.7-0.8,5.6c0.1,1.4,0.2,2.8,0.3,4.2c-1.4,1-2.9,2-4,3.4l-0.6,0.8c-1.5-3.7,0.6-7.6,0.7-11.3
+		c0.3-6.7,2.2-13.2,1.7-20c-0.2-3.4,0.1-6.7,0.8-10c1.8-8.1-0.1-16.5,1.4-24.6c1.7-9,0-18.3,1.4-27.3c0.9-6,0.3-12.1,0.5-18.1
+		c0.1-6.4,2.2-12.6,1.4-19c-0.4-3.2-0.2-6.4,0.1-9.5c-0.8-0.2-2.4-0.7-3.2-0.9c1.1-1,2.1-2,3.2-2.9c2.2-8.6,1-17.5,1.6-26.3
+		c1.3-7.7,2.3-15.7,0.3-23.3c-1.1-4.5-1.6-9.5-5-12.9c-4.9-5.5-13-5.3-19.8-5.6c-3,0-5.6-2.6-5.6-5.6c-0.2-4.3,0.1-8.5-0.2-12.8
+		c-0.8-0.9-1.5-1.7-2.3-2.5C98.5,486.3,99.8,485.7,100.4,485.4z"/>
+	<path class="st1" d="M874,481.7c1.9,0.3,4.1,0.9,4.2,3.2c0.9,5.6,0.4,11.3,0.4,16.9c0,3.4-3.3,6-6.6,5.8c-6.5-0.1-13.8-0.4-19,4.2
+		c-5.2,8.4-5.3,18.6-4.9,28.2c0,5.9-0.8,11.9-0.3,17.8c0.6,7.4,0.1,14.8,0.2,22.2c0,5.3,0.5,10.8-0.8,16c-1.6,0.1-3.4,0.6-4.9-0.3
+		c-0.2-0.4-0.5-1.1-0.6-1.5c0.1-8.4-0.4-16.9,0.5-25.3c-0.2-12.2-0.4-24.5-0.6-36.8c0-5-0.2-10,0.8-15c0.7-4.1,1.2-8.2,1.8-12.4
+		c0.1-0.4,0.4-1.2,0.5-1.6c0.7-2.2,1.5-4.4,2.2-6.5c2.8-2.2,5.8-4.5,9.3-5.6c5.4-1.7,11.1-1.6,16.7-1.5l1,0
+		C873.9,487,874,484.4,874,481.7z"/>
+	<path class="st1" d="M936,484.1c0.4-1.9,2.5-2,4-2.4c0.2,2.7,0.2,5.4,0.3,8.2l0.7,0c4.3-0.1,8.6-0.3,12.9,0.3
+		c4.5,1,9.3,2.6,11.9,6.7c0.8,1.2,1.6,2.4,2.4,3.6c0.2,0.4,0.6,1.1,0.8,1.4c2.3,8.9,2.4,18.1,2.6,27.1c0.9,11.6,0.7,23.3,0.3,34.9
+		c-0.9,8.4,0.2,16.8,0.5,25.3c0,2.4,0,4.9,0,7.3c-0.8-0.1-2.3-0.2-3.1-0.3c-1.1-0.5-2.2-1-3.3-1.6c-0.3-12.9-0.2-25.8,0.2-38.6
+		c-0.4-8.3-0.5-16.7-0.4-25c0.2-4.4-1.1-8.7-2.1-12.9c-1-3.8-3.1-7.8-7.1-8.9c-5.4-2.5-11.4-1.1-17-1.9c-3.8-0.8-4.8-5-4.5-8.3
+		C935.6,494,934.6,488.9,936,484.1z"/>
+	<path class="st1" d="M41.9,486.7c2.5,1.6,4.8,4.4,4.2,7.5C43.2,493.9,41.9,489.4,41.9,486.7z"/>
+	<path class="st1" d="M572.9,493.3c4.4-0.9,8.8-2,13.2-3.3c13.2-1.5,26.9,0.3,39.2,5.5c3,1.3,6,2.7,8.9,4.2
+		c6.5,3.5,12.3,8.1,17.7,13.1c0.8,0.7,1.5,1.4,2.3,2c3,4.5,6.9,8.3,9.7,12.9c0.2,0.4,0.6,1.1,0.9,1.5c1.2,2.2,2.5,4.4,3.9,6.5
+		c1.3,2,2.5,4.1,3.5,6.2c0.9,2,1.8,4,2.7,6.1c2.1,5.7,4,11.5,5.9,17.3c0.5,2.1,1.1,4.2,1.7,6.3c0.1,0.5,0.3,1.6,0.4,2.1
+		c0.9,5.1,1.7,10.1,2,15.3c0.2-0.7,0.5-1.3,0.7-2c-0.1,3.7-0.1,7.3,0.6,10.9l0.2,1.1c0,15-0.8,30.1-2.6,45.1
+		c-1.4,5-2.7,10.1-3.8,15.2c-1.4,5.3-3.3,10.4-5.5,15.5c-0.1,0.3-0.4,1-0.6,1.4c-0.6,1.3-1.2,2.6-1.8,3.9c-0.5-4.6,1.8-8.9,2.8-13.3
+		c2.8-9,3.7-18.4,5-27.7c0.2-13.5,1.6-27.1-1-40.4c-2.9-24.1-11.7-48-27.9-66.3c-11.9-13-28.4-21.8-45.9-24.2
+		c-12.3-1.6-25.2,0.2-36.5,5.3c-15.7,6.7-28.4,19.2-37,33.7c1.1,1.4,2.2,2.7,3.3,4.1c-1.6-0.4-3.2-0.7-4.8-1.1
+		c-11.7,19.9-16,43.2-17.3,65.9c-0.6,8.9,1.4,17.7,1.7,26.6c0.8,0.7,1.5,1.4,2.3,2.1c-1.7,3-0.1,6.3,0.2,9.4
+		c0.5,4.5,2.3,8.6,3.3,12.9c0.5,2.7,2.1,4.9,3.7,7.1c-0.6,0.9-1.2,1.9-1.8,2.8c-3.1-4.5-3.8-10.2-6.3-15c-1.2-3.6-2.3-7.3-3.5-11
+		c-0.5,0.4-1.4,1.2-1.9,1.6c-0.6,0-1.7,0.1-2.2,0.1c0.1-0.5,0.4-1.5,0.5-2c0.8-0.1,2.3-0.2,3.1-0.3c-0.2-1.6-0.3-3.3-0.6-4.9
+		c-1.7-8.9-3.4-17.8-3.8-26.8c0-0.7,0-2,0-2.7l0-1.7c-1.4,0-2.8,0-4.3,0c1.4-0.2,2.8-0.4,4.2-0.6c0-0.9,0-2.7,0-3.6
+		c0.3-8.4-0.8-16.8,1.2-25c2.2-13.7,5.4-27.4,11.1-40.2c2.2-5,4.8-9.8,7.6-14.5c1-1.7,2.1-3.3,3.3-4.9c1-1.4,2-2.7,3.1-4.1
+		c1.6-2.1,3.4-4.1,5.2-6c0.5-0.5,1.4-1.5,1.9-2c3.1-3.2,6.3-6.4,10.1-8.8c2.6-1.5,5-3.4,7.3-5.3C562.4,495.8,567.9,495,572.9,493.3z
+		"/>
+	<path class="st1" d="M32.1,507.3c1.8,0.2,1.6,3.4-0.1,3.6C30.1,510.7,30.5,507.6,32.1,507.3z"/>
+	<path class="st1" d="M201.9,513c1.5-0.2,3.9-0.3,2.8,1.8C203.4,517,200.6,515.2,201.9,513z"/>
+	<path class="st1" d="M208.4,521.2c2-0.8,2.8,2.6,0.7,2.9C207.2,524.6,206.5,521.6,208.4,521.2z"/>
+	<path class="st1" d="M407.9,525.2c1-0.3,2-0.6,3.1-0.9c1.3,1.4-0.1,3.3-0.3,4.9C409.5,528.1,408.4,526.8,407.9,525.2z"/>
+	<path class="st1" d="M424.1,525.2c1.6-0.5,2.2,0,1.7,1.7C424.2,527.4,423.6,526.8,424.1,525.2z"/>
+	<path class="st1" d="M1204.5,534.5c0.9-2.2,1.7-4.3,2.3-6.6c3.4,5.7,3,12.8,5.4,19c1.7,10.2,5.4,19.8,8.2,29.7
+		c3.3,10.5,6.4,21.1,9.8,31.6c1.4,4.5,3.1,8.8,4.7,13.1c-2.9,0-5.8-0.1-8.7-0.1c-0.5,0-1.6,0-2.2,0c-3.9-12-7.5-24.1-11.2-36.1
+		c-2.2-7.3-3.9-14.9-6.8-22c-3.7,8.9-6.2,18.2-9.8,27c-3.4,9-6.8,17.9-10.3,26.8c-0.6,1-0.8,2.6-2.1,2.9c-3.5,0.8-7.2,1.1-10.5-0.2
+		c8-20.6,16.6-41,23.5-62C1199.7,550.1,1201.9,542.3,1204.5,534.5z"/>
+	<path class="st1" d="M465.2,529.3c1.4-1.2,3,1.4,1.7,2.5C465.4,532.9,463.8,530.4,465.2,529.3z"/>
+	<path class="st1" d="M1494.7,529.1c0.6,0.1,1.7,0.3,2.3,0.4c0.1,0.9,0.3,1.8,0.4,2.8c0.2,2,0.6,4,1.1,5.9c2,9,4.5,17.9,7.1,26.8
+		c1.3,4.4,2.1,9,3.8,13.3c0.4,1.4,0.9,2.7,1.3,4.1c0.6,2,1.2,3.9,1.8,5.9c1.2,3.9,2.6,7.7,3.7,11.6c2,6.5,4.1,13.1,6.7,19.4
+		c-3.4,1.1-7.1,1.8-10.5,0.5c-3.7-10.1-6.3-20.5-9.7-30.7c-3-8.7-4.7-17.7-8-26.3c-6.9,19.5-13.7,39.1-21.8,58.1
+		c-3.9-0.1-7.8,0.3-11.6,0.6c1.6-4.2,3.5-8.2,5-12.4c4.3-10.7,8.5-21.4,12.6-32.1c0.4-0.9,0.8-1.9,1.1-2.9c1.7-4.4,2.8-9,4.8-13.3
+		c1.7-3.5,2.8-7.3,3.5-11.1C1490.5,542.9,1492.8,536,1494.7,529.1z"/>
+	<path class="st1" d="M348.7,550.5c1.4-3.2,2.5-6.5,3.5-9.8c2.4,1.7,1.2,4.8,1.1,7.3c-1.3,7.9-0.5,15.9-1.5,23.9
+		c-1.3,10.1,0,20.3-0.4,30.5c0,1.8,0,3.5,0,5.3c0.2,19.4-0.3,38.8-0.3,58.2c0.4,9.4-0.7,18.8,0.1,28.3c0.1,4.3,0.2,8.6-0.1,12.9
+		c-0.1,0.7-0.5,2.1-0.6,2.8c-1,4.3-2.5,8.6-5.4,12c-0.9-1.9-0.5-3.9-0.2-5.9c1.5-12.6,0.9-25.3,1-38c0.1-27,0-54,0-81
+		c0-3,0-6.1-0.2-9.1c-5.7,11.1-9.8,23-15.5,34.1c-3,7.5-6.7,14.7-10.2,22c-4.1,10.3-9.7,19.8-14.1,30c-4.4,9.9-9.6,19.4-13.8,29.4
+		c-6.4,13.5-11.8,27.4-18,41c-2.5,5.3-3.9,11.5-8.4,15.5c-3.7,3-8.5,1.1-12.7,1.5c-3.1,0.3-6.8-1.2-7.8-4.4
+		c-2.9-7-6.6-13.7-9.6-20.7c-3.6-9-8.9-17.2-12.3-26.3c-6-12.1-11.3-24.6-17.4-36.7c-4.2-10-9.6-19.5-13.7-29.5
+		c-7.1-14.7-13.9-29.5-20.6-44.4c-2.1-4.9-3.7-10.1-6.6-14.6c-0.9,15.3,0,30.7-0.7,46c-2.4,11-0.6,22.3-1.9,33.4
+		c-0.3,2.8-0.4,5.7-0.5,8.6c1.1,0.5,2.2,0.9,3.2,1.4c-1,0.8-2,1.6-3.1,2.5c-0.5,10.8-0.2,21.7-0.3,32.5c-0.2,3.9,0.8,7.8,0.2,11.7
+		c-2.7-3.3-4.2-7.4-5.3-11.4c-1.1-11-0.3-22-0.6-33c0.8-5.5,0.8-11,0.5-16.6c-0.3-6.2,0.5-12.5,0.7-18.7c0.4-6.9,0.1-13.7,0.8-20.6
+		c1.7-10.4,1.3-21,1.4-31.4c-0.1-15.4,0.7-30.9-1-46.3c0.9,0.7,1.8,1.3,2.7,2c0.8,2.6,1.5,5.4,3.5,7.4c0.4,2.7,1,5.4,2.1,8
+		c0.8,2.5,2.4,4.7,4.6,6.1c-0.3,0.7-1,2.1-1.3,2.8c1,1.6,2,3.2,2.9,4.8c0.6,3.1,1.8,6,3.2,8.8c11.9,26.2,24.1,52.3,36.4,78.4
+		c0.2,0.4,0.7,1.3,0.9,1.8c3.2,6.7,5.8,13.5,9.2,20.1c0.2,0.3,0.4,0.9,0.6,1.2c1.1,2.2,2.2,4.5,3.3,6.7c0.9,2,1.9,4,2.9,6.1
+		c0.5,1.1,0.9,2.1,1.4,3.2c1,2.3,2,4.5,3.1,6.7c1.3,2.5,2.6,5,3.7,7.6c0.4,1,0.9,2.1,1.4,3.1c0.9,1.5,1.9,2.9,3,4.3
+		c0.4,2.1,1.1,4.2,2.1,6.1c2.2,4.4,3.8,9.1,6,13.5l0.4,1c3.8,1.5,8.1,0.7,12.1,0.6c0.2-0.4,0.5-1.2,0.7-1.7c0.3-0.8,0.6-1.6,1-2.4
+		c2.5-5.3,4.7-10.8,7.4-16c0.6-1.3,1.1-2.6,1.6-3.9c1.9-5.3,4.2-10.4,6.6-15.4c1.1-2.4,2.2-4.8,3.2-7.3c1.9-4.9,4.3-9.7,6.5-14.5
+		c9.1-18.9,17.9-37.9,27-56.8c1.2-2.5,2.4-5,3.5-7.6C330.4,595.5,340.1,573.2,348.7,550.5z"/>
+	<path class="st1" d="M255.3,546.3c1.8-1.2,4.2,0,5.2,1.7C259.7,551.4,253.1,549.5,255.3,546.3z"/>
+	<path class="st1" d="M639.2,551.1c1-0.9,3.6,0,2.5,1.5C640.5,554.4,636.5,552.5,639.2,551.1z"/>
+	<path class="st1" d="M618.2,552.2c0.8-1.2,3.5-0.2,2.3,1.3C619.6,554.7,617,553.6,618.2,552.2z"/>
+	<path class="st1" d="M1661.7,552.7c1.2,0.2,3-1.3,3.7,0.3c0,1.9-1.8,2.7-3.2,3.3C1662.1,555.4,1661.8,553.6,1661.7,552.7z"/>
+	<path class="st1" d="M419.1,553c2.8-0.3,2.7,5,0,4C417,556.9,418.2,554,419.1,553z"/>
+	<path class="st1" d="M543,552.7c1.6,0.6,2.8,1.7,3.5,3.2c-0.6,0.2-1.8,0.7-2.5,0.9C543.6,555.4,543.3,554,543,552.7z"/>
+	<path class="st1" d="M550.3,554c2-0.8,2.6,2.6,0.7,3C549.2,557.4,548.5,554.4,550.3,554z"/>
+	<path class="st1" d="M630.3,557.2c2.1,0.2,0.9,4.5-1,3.5C628.3,559.7,628.9,557.6,630.3,557.2z"/>
+	<path class="st1" d="M447.5,600.8c1.9-14.8,5.3-29.6,12.3-42.9c0,0.5,0,1.5,0,2c-0.1,0.4-0.2,1.1-0.3,1.5c-1,5.2-3.6,10.2-3.5,15.6
+		c-0.6,1.4-1.2,2.7-1.8,4.1c0.7,0.2,2.1,0.5,2.9,0.7c0.2,0.9,0.4,1.8,0.6,2.7c-1.1-0.5-2.1-1-3.2-1.5c-0.3,1.1-0.6,2.3-0.8,3.5
+		l-0.2,1.1c-1.1,4.7-2.1,9.5-1.3,14.4c-0.1,5.6-0.3,11.2-0.1,16.8c0,2.8,0.1,5.6,0.5,8.4c0.5,3.2,0.9,6.4,1,9.6
+		c0.2-0.3,0.7-1,0.9-1.3c0.1,3.9,0.7,7.7,1.5,11.5c0.7,3.1,1.6,6.1,2.6,9.2c1.1,3.3,2.7,6.5,3.4,9.9c0.9,4.7,3.3,9,5.8,13
+		c2.4,4,5.2,7.8,7.5,11.8c1,1.8,2.4,3.1,4,4.4c0.3-1.3,0.7-2.6,1-3.9c1.3,0.1,2.7,0.2,4,0.3c-0.8,0.7-1.6,1.4-2.4,2.1l-1.3-0.1
+		c0,0.9,0,2.6,0.1,3.5c0.4,0.5,1.2,1.3,1.6,1.8c0.6,1.2,1.1,2.4,1.7,3.5c1,1.3,2,2.4,3.1,3.6c1.6,1.6,3.2,3.1,4.8,4.6
+		c0.5,0.4,1.4,1.3,1.9,1.8c1.6,1.5,3.3,3,5,4.4c3.5,2.9,7.1,5.6,10.9,8.1c2.4,1.5,4.7,3.1,7.1,4.7c2.4,1.6,4.9,3.1,7.5,4.4
+		c1.4,0.7,2.8,1.4,4.3,2c0.6,0.3,1.9,0.8,2.5,1.1c5.8,2.5,11.6,4.8,17.6,6.6c2.6,1,5.2,2,8,2.7c8.4,1.9,16.8,3.9,25.5,3.4
+		c7-0.5,14,0.9,21,0.3c17.3-1.2,34.4-5,50.8-10.7c1.8-0.8,3.5-1.7,5.3-2.5c2.9-1,5.8-2.2,8.6-3.5l0.6-0.3c3.3-2.1,6.8-4,10.2-5.9
+		c3.4-1.9,6.5-4.3,9.6-6.7c6.4-4.4,12.3-9.5,17.4-15.4c0.2-0.2,0.6-0.7,0.8-0.9c2.5-3.1,5.1-6.1,7.5-9.3c1.4-1.9,2.9-3.9,4.1-6
+		c0.4-0.6,0.8-1.3,1.2-1.9c2.2-3.6,4.3-7.2,6.3-10.9c0.8-1.5,1.5-3.1,2.2-4.7c0.5-1.3,1-2.6,1.5-3.9c4.8-10.8,7.4-22.4,9.7-33.9
+		l0.1-0.5c0.9-3.9,0.8-7.9,1-11.9c0.5-3.5,0.9-7,1-10.5c0.1-4.2,0.2-8.4,0.1-12.6c-0.1-3.2-0.3-6.3-0.8-9.5
+		c-0.5-3.6-1.1-7.2-1.9-10.8c-0.8-3.5-1.6-7-2.5-10.5c0.2-0.9,0.5-2.8,0.7-3.7c4.3,7.5,5.7,16.3,7.6,24.6c3.4,14,2.2,28.4,2.4,42.7
+		c0,4-1.3,7.9-1.4,12c-3.6,31.2-17.5,61.6-40.3,83.3c-23,22.9-54.4,35.8-86.2,39.8c-2.3,0.7-4.6,1.6-7.1,1.5
+		c-13.6-0.1-27.3,0.2-40.9-0.2c-8.2-2.7-16.8-3.7-25-6.5c-25.9-8.5-50-23.5-67.3-44.8c-2.8-3.2-5-6.8-7.8-9.9c-1,0.1-2,0.1-3,0.1
+		c0-1.6,1.2-3.2,0.2-4.7c-2.6-4.4-5.3-8.9-7.5-13.5c-0.7-0.2-2-0.5-2.7-0.6c0.4-0.9,0.8-1.9,1.2-2.8c-5.3-11.7-8.5-24.2-10.2-36.9
+		c-0.3-3.6-1-7.1-1.9-10.6c-0.9,0.4-2.4,2.2-2.9,0.5c-1.1-2.2-3.8-4.2-3.1-6.9c2.4,0,3.7,3.1,5.9,4.1
+		C447.3,623.7,445,612,447.5,600.8z"/>
+	<path class="st1" d="M533.5,561.3c0.6,0,1.9-0.1,2.6-0.1c0.4,2.4-1.6,4-3,5.7c-0.4-0.2-1.2-0.7-1.6-0.9
+		C532.3,564.5,532.9,562.9,533.5,561.3z"/>
+	<path class="st1" d="M54.2,565c3.8-0.6,0,4.7-1,1.2C53.5,565.9,54,565.3,54.2,565z"/>
+	<path class="st1" d="M441.9,566c0.9-0.1,2.7-0.2,3.6-0.2c-0.7,1.1-1.3,3.9-3.2,3C442.2,568.1,442,566.7,441.9,566z"/>
+	<path class="st1" d="M523.3,571.5c-1.7-1.4,0.7-2.9,1.6-3.8c0.4,1.4,0.8,2.8,1.1,4.3C525.3,571.9,524,571.6,523.3,571.5z"/>
+	<path class="st1" d="M1620.2,570.1c4-0.6-0.2,4.4-1.1,1.1C1619.4,570.9,1619.9,570.4,1620.2,570.1z"/>
+	<path class="st1" d="M99.3,576.1c1-1.5,3.5,0.3,2.3,1.7C100.6,579.3,98.1,577.6,99.3,576.1z"/>
+	<path class="st1" d="M1329.4,586.2c1.8,0,3.4,0.9,2.7,3C1330.2,590,1327.6,587.8,1329.4,586.2z"/>
+	<path class="st1" d="M101.1,587.2c3.4-1.2,1.6,4.8-1.1,3.8C97.8,591,100,587.7,101.1,587.2z"/>
+	<path class="st1" d="M619.2,587.1c1.6-0.5,2.2,0.1,1.6,1.7C619.2,589.3,618.7,588.8,619.2,587.1z"/>
+	<path class="st1" d="M1616.3,587.8c1.3,0.6,2.7,1.3,4.1,2c-1.4,0.5-2.8,0.9-4.2,1.3C1616.2,590.3,1616.2,588.7,1616.3,587.8z"/>
+	<path class="st1" d="M444.2,591.3c1.3-1.4,3.6,0.8,2.1,2.1C445,595,442.6,592.7,444.2,591.3z"/>
+	<path class="st1" d="M1111.1,591.2c1.6-0.6,2.2,0,1.7,1.6C1111.2,593.4,1110.6,592.8,1111.1,591.2z"/>
+	<path class="st1" d="M118.2,593.3c1.5-1.2,2.9,1.5,1.5,2.5C118.2,597,116.8,594.2,118.2,593.3z"/>
+	<path class="st1" d="M1314.3,602.3c1.9-0.9,4.3,0.4,5.5,1.9C1319,608.4,1310.4,605.6,1314.3,602.3z"/>
+	<path class="st1" d="M777,610.3c-2.4-0.1-4.1-4.2-0.9-4.6C777.7,606.8,776.8,608.8,777,610.3z"/>
+	<path class="st1" d="M1676.7,611.4c-0.4-2,0.6-4.8,3-4.2C1681.1,609.5,1678.2,610.3,1676.7,611.4z"/>
+	<path class="st1" d="M644.2,608.2c1.5-1.2,2.9,1.5,1.6,2.5C644.4,611.9,643,609.2,644.2,608.2z"/>
+	<path class="st1" d="M69.1,610c2.2,0.4,1.7,2.5,1,4c-0.6-0.3-1.8-0.8-2.4-1.1C68.1,611.8,68.6,610.9,69.1,610z"/>
+	<path class="st1" d="M1680.8,610.2c2-0.3,4.2-1,6.3-0.4c1.6,0.6,0.3,2.2,0.1,3.2C1685,612.2,1682.9,611.2,1680.8,610.2z"/>
+	<path class="st1" d="M56.1,610.8c1.3,0.6,2.5,1.2,3.8,1.9c-0.7,1.4-0.8,3.7-2.9,3.5C55.2,614.9,56,612.6,56.1,610.8z"/>
+	<path class="st1" d="M562.9,615.7c1.4,1.4,2.6,2.9,3.9,4.4C563.8,623.3,562.1,618.1,562.9,615.7z"/>
+	<path class="st1" d="M841.5,616.7c13.1,0.9,26.3,0.4,39.5,0.5c30.5-0.2,61,0.5,91.5-0.6c0,2.9,0,5.7-0.1,8.6c-0.1,10,0.1,20-0.1,30
+		c0,2.2-0.1,4.4,0,6.6c0.1,10,0.1,20.1,0,30.1c-1,6.2-0.6,12.4-1.9,18.6c-0.9,2.9-1.9,5.8-3.2,8.6c-0.5,0.3-1.6,0.8-2.2,1
+		c1.3-6.3,0.8-12.7,0.9-19.1c0-13.3,0.1-26.7,0-40c0-8.7-0.3-17.4,0.7-26.1c-10.9-0.7-21.8-0.1-32.7-0.3c-29,0.1-58-0.2-86.9,0.2
+		c2,20.3,0.3,40.8,1,61.1c0.3,7.4-0.6,15,0.6,22.3c0.3,1.2,0.1,2.2-0.6,3.2c-2.6-3.5-3.9-7.8-4.9-12c-0.3-4.3-0.5-8.6-1.4-12.9
+		c-0.5-23.8,0-47.6-0.2-71.3c-0.9-0.1-1.7-0.3-2.6-0.4c0.6,0,1.9-0.1,2.6-0.2C841.5,622.1,841.5,619.4,841.5,616.7z"/>
+	<path class="st1" d="M1678.1,617.2c0.7,0,2.1-0.1,2.8-0.1c-0.4,2.1-0.8,4.1-1.3,6.2C1678.1,621.5,1677.7,619.3,1678.1,617.2z"/>
+	<path class="st1" d="M38.2,620.2c1.5-1.2,2.8,1.6,1.5,2.6C38.1,624,36.8,621.2,38.2,620.2z"/>
+	<path class="st1" d="M753.1,620.4c0.9-1.2,3.3,0.1,2.4,1.5C754.6,623.1,752.1,621.8,753.1,620.4z"/>
+	<path class="st1" d="M546.2,624.4c1.3-0.8,4,0.7,3.4,2.3C548.3,627.5,545.4,626,546.2,624.4z"/>
+	<path class="st1" d="M1637.2,629.3c1.4-1.2,2.6,1.4,1.3,2.2C1637.1,632.7,1635.9,630.1,1637.2,629.3z"/>
+	<path class="st1" d="M86.2,631.2c1.9-2,3.2,0.8,2.7,2.5C87.3,635,84.3,632.9,86.2,631.2z"/>
+	<path class="st1" d="M50.2,632.4c1.5-1.2,3,1.5,1.5,2.5C50.3,636.1,48.8,633.4,50.2,632.4z"/>
+	<path class="st1" d="M104.7,632.6c2.7-1.3,2.4,3.2,1.3,4.6C104.1,636.3,102.9,634.4,104.7,632.6z"/>
+	<path class="st1" d="M32.3,634.1c2.1,0.9,3.9,2.3,4.7,4.4c-2.3,1.2-4.7,2.4-7.1,3.6C30.4,639.3,31.2,636.6,32.3,634.1z"/>
+	<path class="st1" d="M61.6,634.6c1.3-2.5,2.6,0.4,3.2,1.7c1.3,2.3,2.1,6.1-1.3,6.8C63.2,640.3,61.1,637.4,61.6,634.6z"/>
+	<path class="st1" d="M592,637.8c2.9-0.3,6.5,0.7,8.3-2.2c1,0,4.4,0.4,2.5,1.9c-2.8,2.2-6.1,4-9.7,2.7
+		C592.7,639.6,592.2,638.4,592,637.8z"/>
+	<path class="st1" d="M540.2,641.1c0.7-2.2,2.4-6.2,5-3.4C543.6,638.9,541.9,640.1,540.2,641.1z"/>
+	<path class="st1" d="M87.1,644.2c-4.3,0.1-2.7-5.2,0-6.5C87.3,639.9,87.3,642.1,87.1,644.2z"/>
+	<path class="st1" d="M618.2,638c4-0.7-0.2,4.5-1.1,1.2C617.3,638.9,617.9,638.3,618.2,638z"/>
+	<path class="st1" d="M1321.1,641c3.1-2.2,3.1,5.3-0.1,4.3C1318.5,645.2,1319.6,641.8,1321.1,641z"/>
+	<path class="st1" d="M1520.6,642.6c1.5-0.1,3-0.2,4.5-0.4c1.4,0,2.9,0.1,4.4,0.2c2.1,2.5,2.4,5.8,3.3,8.9c0.9,3.3,2.1,6.6,3,9.9
+		c0.9,3.7,2.1,7.4,3.4,11c3.4,8.9,6,18.1,7.7,27.5c1.1,6.5,2.2,13.2,0.8,19.8c-0.7,1-1.3,2-2.1,2.9c-0.6,0.2-1.9,0.5-2.5,0.7
+		c-1.8-5.6-1.9-11.5-3.8-17c-3.4-12.8-7.6-25.3-11.4-38c-0.9-2.4-1.2-5.1-2.8-7.1c-9.6-0.6-19.3-0.1-29-0.3c-12,0.1-24-0.2-35.9,0.1
+		c-1.9-0.2-2.4,2-3,3.3c-3.3,9-7,17.9-10.2,26.9c-3.6,9.9-7.8,19.6-9.9,30c-0.3,0.7-0.8,2.2-1.1,2.9c-1.6-1.6-2.9-3.4-4-5.4
+		c-2.2-10.1,1.7-20,4.8-29.5c3.1-8.7,6.3-17.3,9.8-25.8c1.3-3.2,2.6-6.5,3.8-9.7c1.4-3.6,1.8-7.8,4.4-10.9c3.1-0.2,6.3,0,9.4,0
+		l1.3,0c10.5,0,21,0,31.5,0.1l1.5,0C1505.8,642.5,1513.2,642.5,1520.6,642.6z"/>
+	<path class="st1" d="M1166.1,642.9c8.9-1,18,0,26.9-0.3c16,0,32.1,0,48.1,0c1,3.2,2.1,6.4,3.1,9.6c0.2,0.5,0.5,1.6,0.7,2.1
+		c2.4,7.8,5,15.5,7.3,23.3c1.2,4.4,3.2,8.7,3.8,13.3c1.7,8.7,4.2,17.5,3.5,26.4c-0.4,1.2-0.9,2.3-1.4,3.5c-0.7,0.7-1.5,1.5-2.2,2.2
+		c-0.4-0.1-1.2-0.3-1.6-0.4c-1.6-2.8-1.1-6.3-1.8-9.3c-2.1-9.7-5.3-19.2-8.1-28.7c-2.7-7.5-4.4-15.2-7.3-22.7
+		c-0.5-1.8-2.8-1.1-4.1-1.4c-18,0-36,0-53.9,0c-3.1,0.2-6.6-0.6-9.5,0.7c-3.6,8.1-6.3,16.5-9.5,24.8c-3.8,10.9-9.1,21.4-11.3,32.9
+		c-0.6,1.5-0.3,4.2-2.6,4c-0.7-1-1.5-2-2.2-3c-1.5-4.8-1.3-9.8-1.6-14.7c0.6-1.4,1.2-2.8,1.7-4.2c0.2-0.6,0.6-1.7,0.7-2.3
+		c1.6-6.3,4.5-12.1,6.5-18.3c0.7-2.4,1.6-4.8,2.5-7.1c0.5-1.3,0.9-2.5,1.4-3.8c1.1-3,2.2-6,3.5-9
+		C1161.5,654.8,1162.3,648.1,1166.1,642.9z"/>
+	<path class="st1" d="M1653.2,646.7c-1.4-2.4,2.5-2.5,3.9-2.8C1657.5,646.3,1655,646.5,1653.2,646.7z"/>
+	<path class="st1" d="M628.3,645.1c0.9-1.4,3.8,0,2.5,1.5C629.9,647.9,627.1,646.7,628.3,645.1z"/>
+	<path class="st1" d="M1663.5,647.2c0.6-0.9,3.1-0.9,3,0.5C1665.8,648.7,1663.3,648.7,1663.5,647.2z"/>
+	<path class="st1" d="M61.4,653.3c1.9-2,4-3.8,5.8-6c2,3.7-1.6,7.3-2,11.1C62.3,659.4,59.8,655.9,61.4,653.3z"/>
+	<path class="st1" d="M533,647.8c2.1,0.7,3.8,2.1,4.3,4.3C534.6,652.3,532.2,650.8,533,647.8z"/>
+	<path class="st1" d="M574.1,649.8c2.2,0.2,2.9,2.1,3.1,4.1c-0.8,0-2.3,0-3.1,0C574.1,652.5,574.1,651.2,574.1,649.8z"/>
+	<path class="st1" d="M524.7,655.2c0.7-1.8,1.4-3.5,2.3-5.2C529.5,652,527.7,655.8,524.7,655.2z"/>
+	<path class="st1" d="M32.8,663.2c-2.8-2-1.5-6.9,1.1-8.5C36.6,657,33.7,660.6,32.8,663.2z"/>
+	<path class="st1" d="M56.4,659.2c1.3-1.5,3.8,0.7,2.2,2.1C57.3,662.7,55,660.6,56.4,659.2z"/>
+	<path class="st1" d="M559.2,659.3c2.2-2.5,3.9,3.8,1,3.4C559.7,661.6,559.2,660.5,559.2,659.3z"/>
+	<path class="st1" d="M582.9,663.2c0.4-2.9,2.4-5,5.5-4.3C587.4,661.3,585.9,663.8,582.9,663.2z"/>
+	<path class="st1" d="M601.2,659.4c0.8-1,3.2-1.2,3.5,0.4C604.5,661.7,600,661.6,601.2,659.4z"/>
+	<path class="st1" d="M528,664c-2,0-1.7-2.3-1.4-3.6c1.5,0.6,3,1.3,4.5,2C530.2,663,529.4,664.5,528,664z"/>
+	<path class="st1" d="M650.5,661.3c2.5-0.9,1.6,3.6-0.4,3.3C648.7,664.1,649.4,661.9,650.5,661.3z"/>
+	<path class="st1" d="M1692.8,664.8c1.1-2.3,3.7-3.1,5.7-4.2C1699.5,664.1,1695.5,664.9,1692.8,664.8z"/>
+	<path class="st1" d="M64.4,661.8c0.7,0.9,1.7,1.8,1.6,3.1c-1,1.1-3.3,1-3.2-0.8C63.2,663.5,64,662.3,64.4,661.8z"/>
+	<path class="st1" d="M604.2,667.2c0.9-1.8,1.7-3.5,2.8-5.1c0.5,0.2,1.6,0.7,2.1,1C608,665.1,607,667.7,604.2,667.2z"/>
+	<path class="st1" d="M1663.2,664.2c1.6-1.6,4.4,0.2,3.2,2.1C1664.8,668.6,1660.9,666.6,1663.2,664.2z"/>
+	<path class="st1" d="M1605.2,665.3c0.9-1.3,3.8-0.1,2.6,1.4C1606.9,668.1,1604,666.9,1605.2,665.3z"/>
+	<path class="st1" d="M1675,665.2c2.7,0.2,6.4-1.1,8.2,1.7C1680.3,667.7,1677.6,666.5,1675,665.2z"/>
+	<path class="st1" d="M1629.9,665.4c2.5,0.4,4.9,1.5,6.5,3.7c-2.2,0.1-4.3,0.1-6.4,0.1C1630,668.2,1629.9,666.4,1629.9,665.4z"/>
+	<path class="st1" d="M641.2,666.9c1.9,1.8,2.6,4.3,3.3,6.7C640.7,674.1,640.5,669.5,641.2,666.9z"/>
+	<path class="st1" d="M551,667.8c3.1-0.7,4.5,2.8,3.9,5.3l-1.1,0.3C552.8,671.6,551.9,669.7,551,667.8z"/>
+	<path class="st1" d="M167.4,669.4c1.8-1.2,2.2,1.5,1.8,2.7c-0.8,0-2.5,0-3.3,0.1C165.8,670.8,166.3,669.9,167.4,669.4z"/>
+	<path class="st1" d="M441.2,672.2c2.2-0.9,1,3.4,0.5,4.6C439,677.5,439.2,672.9,441.2,672.2z"/>
+	<path class="st1" d="M1345.4,672.4c1-1,4-0.1,2.4,1.5C1346.8,676.1,1343.2,674,1345.4,672.4z"/>
+	<path class="st1" d="M58.3,673.1c1.9-0.7,2.8,2.6,0.8,2.9C57.2,676.5,56.4,673.5,58.3,673.1z"/>
+	<path class="st1" d="M598.1,674.1c1.6-0.5,2.2,0.1,1.7,1.7C598.1,676.3,597.6,675.7,598.1,674.1z"/>
+	<path class="st1" d="M632.8,676c1.3-1.9,3.5-2.8,5.5-1.4C636.6,675.8,634.8,676.5,632.8,676z"/>
+	<path class="st1" d="M546.8,679.9c2.1-1.3,2.9-4,5.2-5c-0.8,2.5-1.2,6.1-4,7.1C546.8,682.9,545.7,680.5,546.8,679.9z"/>
+	<path class="st1" d="M1100.2,677.7c-0.5-2.8,2-2.8,3.8-1.7c-0.3,0.6-0.8,1.7-1.1,2.3C1102.2,678.1,1100.9,677.8,1100.2,677.7z"/>
+	<path class="st1" d="M1639.2,675.3c0.8-1.4,3.4-0.3,2.2,1.2C1640.7,677.9,1638.1,676.8,1639.2,675.3z"/>
+	<path class="st1" d="M1678.7,677.8c1.6-1.8,5.8-2,5.4,1.3C1682.3,678.7,1680.5,678.3,1678.7,677.8z"/>
+	<path class="st1" d="M560.5,681.3c-0.2-1.8,2.4-4.7,3.8-2.4C565.1,681.6,562.1,681.1,560.5,681.3z"/>
+	<path class="st1" d="M49.3,683.4c1-0.9,3.1-0.6,3.4,0.8C52.5,686.3,48.1,685.4,49.3,683.4z"/>
+	<path class="st1" d="M1353.3,684.3c1.5-1.2,2.5,1.5,1.2,2.3C1353,687.7,1352,685,1353.3,684.3z"/>
+	<path class="st1" d="M555.4,684.6c1.7,1.3,2.1,3.3,1.8,5.4c-1.1,0.3-2.2,0.6-3.3,0.9C554.3,688.8,554.8,686.7,555.4,684.6z"/>
+	<path class="st1" d="M177.8,688c0.3-2.4,3.2-3.4,4.4-1C181.3,688.7,179.3,687.9,177.8,688z"/>
+	<path class="st1" d="M569.3,687.4c1.3-1.6,3.8,0.7,1.9,1.9C569.9,690.9,567.5,688.7,569.3,687.4z"/>
+	<path class="st1" d="M537.1,688c1.4,0,2.8,0,4.2,0.1c-1,2.1-3.1,2.4-5.2,2.1C536.3,689.6,536.8,688.5,537.1,688z"/>
+	<path class="st1" d="M55,697.4c-0.2-2.8-1.5-8.1,3.1-7.6C57.7,692.5,58.1,696.4,55,697.4z"/>
+	<path class="st1" d="M561.3,690.2c1.4-1,2.7,1.4,1.5,2.4C561.4,693.5,560.2,691.1,561.3,690.2z"/>
+	<path class="st1" d="M549.2,694.8c1.6-0.7,3.4-1.1,5.2-1.1C554.3,696.6,550.5,697.1,549.2,694.8z"/>
+	<path class="st1" d="M109.1,696.2c2.4-0.3,5-0.2,7.4,0.4c1.4,1.1,1.1,3,1.5,4.5c-3.1-1.1-6.3-1.8-9.4-2.8
+		C107.8,697.4,108,696.7,109.1,696.2z"/>
+	<path class="st1" d="M1676.5,696.8c1.1,3.2,1,6.7,2.1,10c-0.9,0.5-1.7,1.1-2.6,1.6c0.3,2.5,3.3,4.5,2.1,7.1c-1.8-2-3.7-4-4.6-6.6
+		c0.7-1.3,1.6-2.6,2.3-3.9C1675.5,702.2,1674.4,699.2,1676.5,696.8z"/>
+	<path class="st1" d="M90.5,704.7c1.6-1.7,3.3-3.3,4.6-5.2c1.1,1.1,2.1,2.2,3.2,3.3c-1.5,1.5-2.9,3.1-4.4,4.8
+		C92.9,706.6,89.4,706.6,90.5,704.7z"/>
+	<path class="st1" d="M73.3,704.3c1.5-0.6,3.5,0,3.8,1.7C76.6,709.4,69.6,705.9,73.3,704.3z"/>
+	<path class="st1" d="M1191.9,707c-0.2-1.7,0.8-4.5,3-2.8C1196.5,706.4,1193.9,707.5,1191.9,707z"/>
+	<path class="st1" d="M53.3,705.3c0.8-1,3.1-1,3.4,0.5C56.5,707.9,52.1,707.5,53.3,705.3z"/>
+	<path class="st1" d="M1343.8,711.5c0.6-2.2-0.1-7,3.3-6.6C1348,707.7,1345.8,710.1,1343.8,711.5z"/>
+	<path class="st1" d="M456,706.7c1.2,1.5,2.8,3.2,2,5.4C454.5,713.2,455.8,708.6,456,706.7z"/>
+	<path class="st1" d="M1680.4,707.3c2-1.1,2.9,3.2,0.8,3.5C1679.8,710.5,1679.5,708.3,1680.4,707.3z"/>
+	<path class="st1" d="M218.9,712.8c-3-0.1-1-4.1,0.1-5.4C220.2,708.9,220.8,711.4,218.9,712.8z"/>
+	<path class="st1" d="M98.3,709.2c1.3-1.6,3.8-0.3,3.1,1.8C100.5,713,97,711,98.3,709.2z"/>
+	<path class="st1" d="M1335.2,709.4c2-0.5,0.8,6.2-1.4,3.9C1333,712,1333.7,709.7,1335.2,709.4z"/>
+	<path class="st1" d="M1189.2,711.6c1.7-0.3,2.9,3.4,1.1,4C1188.8,715.1,1188.2,712.8,1189.2,711.6z"/>
+	<path class="st1" d="M1329.2,712.3c1.8,0.2,1.4,3.4-0.2,3.5C1327.2,715.6,1327.5,712.5,1329.2,712.3z"/>
+	<path class="st1" d="M1628.9,716c0.7-1.2,1.3-2.7,3.1-2.1c0.5,1.1,0.9,2.2,1.3,3.4C1631.7,716.9,1630.3,716.5,1628.9,716z"/>
+	<path class="st1" d="M73.1,715.2c3-1.6,3,4.3,0,2.7C71.2,718.3,72.2,715.6,73.1,715.2z"/>
+	<path class="st1" d="M1652.1,717.2c2.5,0.5,5.4,0.3,7.3,2.3c-1.9,0-3.8,0.4-5.6,1.1C1653.2,719.5,1652.7,718.3,1652.1,717.2z"/>
+	<path class="st1" d="M61.2,721.2c1.8-0.9,3.9-1.2,5.6,0.1c0.6,2.7-3.4,2.1-5.1,2.3C61.5,723,61.3,721.8,61.2,721.2z"/>
+	<path class="st1" d="M1375.2,720.3c1.4-1.2,3.5,1.1,2.4,2.5C1376.2,724,1374,721.6,1375.2,720.3z"/>
+	<path class="st1" d="M459.2,721.2c1.6-0.5,2.2,0,1.7,1.6C459.2,723.4,458.7,722.8,459.2,721.2z"/>
+	<path class="st1" d="M1678.3,721.2c1.5-1.3,2.9,1.5,1.5,2.5C1678.2,724.9,1676.9,722.2,1678.3,721.2z"/>
+	<path class="st1" d="M86.2,722.2c2.8-0.9,4.6,4.5,1.5,5.6C84.4,730,84.1,723.2,86.2,722.2z"/>
+	<path class="st1" d="M208.1,726.6c1.8,0.3,4.6-0.7,5.4,1.4c-1.1,2.9-3.7,4.9-5.6,7.3l-1.1,0.1C205.7,732.6,208.4,729.7,208.1,726.6
+		z"/>
+	<path class="st1" d="M218.6,727.2c1.5,0.2,2.9,1.1,3.2,2.7c-1.1,1.2-2.6,0.8-3.9,0.3C218.1,729.4,218.4,727.9,218.6,727.2z"/>
+	<path class="st1" d="M939.8,733.7c0.3-2,0.5-4,0.8-6c0,5,0,9.9,0.2,14.9c5.7,0.1,11.5-0.4,17.2-0.8c6.3,1.1,12.6-0.4,19-0.3
+		c12.3-0.2,24.5-0.2,36.8-0.1c13.1,0.9,26.2,1.5,39.3,1.8l0.7,0c-0.1-3.1-0.1-6.1,0.2-9.2c1.8,1,4.4,1.7,4.7,4
+		c0.6,5.6,0.2,11.3,0.2,17c0.2,2.3-0.8,4.9-3.2,5.7c-3.3,1.6-6.8,0.2-10.1-0.5c-0.3,1.8,0.1,4.8-2.8,3.9c0-1.4,0.3-2.7,0.5-4.1
+		c-7.3-0.3-14.8,0.5-22.1-0.6c-9.4-1.5-18.9-0.6-28.3-0.9c-8-0.2-16,0.6-24,1.3c-9.7,0.1-19.4,0.2-29.1,0c-3,0-4.7-3.2-4.6-5.9
+		c0-5.1-0.3-10.3,0.2-15.4C935.7,736.1,938.1,735,939.8,733.7z"/>
+	<path class="st1" d="M30.1,731.1c2.1-2.8,6.3-3.3,9.2-1.5c0.6,0.9,0.5,1.6-0.6,2C36,732.3,32.5,733.5,30.1,731.1z"/>
+	<path class="st1" d="M1687.4,730.3c2-1.2,2.9,3.2,0.7,3.4C1686.7,733.4,1686.4,731.2,1687.4,730.3z"/>
+	<path class="st1" d="M94.2,738.1c0.2-2.3,2.3-3.5,4.2-4.3c0,3,0.1,5.9,0.2,8.9c7.9-0.2,15.8-0.1,23.7-0.4
+		c10.6-1.2,21.2-0.3,31.8-0.7c10.6,0.7,21.2,1,31.9,1.6h0.8c0-3.1,0.1-6.2,0.3-9.2c2.1,0.9,4.9,2.1,4.8,4.9c0.2,6,0.4,12.1-0.1,18.1
+		c-0.2,3-3.4,3.7-5.6,4.8c0.6,1.1,2.3,2.3,0.9,3.6c-1.8,0-3.2-1-4.5-2.2c0.7-0.6,1.3-1.2,2-1.8c-6-1.9-12.4-1.2-18.6-1.3
+		c-3.3,0-6.7-1-9.8,0.5c-5-2.9-10.8-1.6-16.3-1.8c-5.7-0.2-11.3,0.6-17,1.3c-9.4,0.5-18.9-0.4-28.3,0.6
+		C93.5,753.1,93.1,745.5,94.2,738.1z"/>
+	<path class="st1" d="M320.3,734.1c2,2.1,0.2,5.8,2,8.2c0.1,0.2,0.3,0.7,0.4,1c3-0.5,5.9-0.7,8.9-0.8c11.4,1.2,22.9-1.3,34.3-0.8
+		c10.3-0.1,20.6-0.1,31-0.1c8.8-0.5,17.6,2.2,26.4,0.8c2.9,0.1,5.9,0.5,8.8,0.6c0.8-3.1,0.4-6.3,0.5-9.4c2.1,0.7,4.7,1.8,5.1,4.3
+		c0.6,5,0.2,10,0.3,14.9c-0.1,2.6,0.1,6-2.4,7.7c-3.7,2.2-7.8-0.4-11.7-0.5c-6.2-0.4-12.5,0.3-18.7-0.6c-10.7-1.5-21.5-0.5-32.2-0.9
+		c-9-0.3-18,0.7-26.9,1.6c-2.2,2.6-5.2,0.9-7.7-0.4c0.1,1.4,1.1,3.1-0.6,4c-1.1,1.5-2.3,0.2-3.3-0.7c0.7-1,1.4-2,2.1-3.1
+		c-4.1-0.5-8.4-0.1-12,2.2c-5.3-0.5-8.3-5-11.6-8.7c-0.9-0.9-1-2.1-0.6-3.2c1.2,1.4,2.5,2.8,4.1,3.6c0.4-5-0.1-10.1,0.3-15.2
+		C317,736.8,318.8,735.3,320.3,734.1z"/>
+	<path class="st1" d="M756,737.1c0.4-1.9,2.5-2.3,4-3.1c0.2,3,0.3,6,0.3,9l1,0.1c12.5,0.4,25.1-1.3,37.6-1.5
+		c12.2-0.1,24.5,0.1,36.7-0.2c1.3,0.1,2.6,0.3,3.9,0.4c11.2,1.4,22.6,1.3,33.9,1.8c0.1-3.3,0.2-6.5,0.3-9.8c1.8,1,4.2,1.8,4.5,4.1
+		c0.9,4.3,0.3,8.8,0.5,13.1c-0.1,3.1,0.5,7.1-2.3,9.3c-3.2,2.4-7.1,0.5-10.6,0.1c-9.3-1.1-18.8,0.4-28.1-1
+		c-7.8-1.2-15.8-0.6-23.7-0.8c-8,0-16.1-0.3-24,0.9c-7.9,1.2-16-0.5-23.9,1.3c-3.1,0.8-7,1-9.4-1.5c-1.9-3.1-1.2-6.9-1.3-10.3
+		C755.5,745.1,754.8,741,756,737.1z"/>
+	<path class="st1" d="M1069.7,737.9c0.3-2.2,2.4-3,4.1-3.9c0.3,2.2,0.7,4.4,1.4,6.5c0.2,0.9,0.5,1.8,0.9,2.6c1.6,0.4,3.3,0,5-0.1
+		c6.5-0.9,13.1-0.3,19.5-1.6c2.1,0,4.2-0.1,6.3-0.2c3.6,0,7.2,0,10.9-0.1c2,0,4.1,0,6.1,0.1c3.9,0,7.8,0,11.8,0
+		c1.3,0,2.6-0.1,3.8-0.2c0.8-0.2,1.6-0.3,2.5-0.5c2.2,0.5,4.5,1,6.8,1.3c5.3,0.6,10.6,0.9,15.8,1.2c2,0,4,0,6-0.1l1.1-0.1
+		c0-3,0.1-6,0.3-9c1.4,0.9,3.5,1.3,3.9,3.1c1.6,4.5,0.7,9.3,0.8,13.9c-0.1,3.2,0.5,7.1-2.3,9.4c-2.9,2.2-6.3,0.5-9.4,0
+		c-4.1-0.5-8.5-0.8-12.3,1c-8.8-3.2-18.4-2.5-27.7-2.6c-8.8,0.2-17.6-0.5-26.3,0.9c-6.5,1.1-13.2-0.4-19.6,1.6c-3,1-6.7-0.1-8.4-2.9
+		C1067.8,751.9,1068.8,744.7,1069.7,737.9z"/>
+	<path class="st1" d="M1228.2,738c0.4-2.3,2.6-3.4,4.6-4.1c0.3,3.1-0.7,6.6,0.8,9.5c4.8-0.3,9.6-0.4,14.3-1.4
+		c2.1-0.6,4.1,0.5,6.2,0.3c1.1-0.6,2.2-1.2,3.2-1.9l0.2,1.4c3.7-0.1,7.3-0.2,11-0.2c0.5,0,1.5,0,2,0c7.7-0.1,15.4,0.1,23-0.7
+		c7.2,1.8,14.8,0.4,22.2,1.2c0.3-0.3,1-0.9,1.3-1.2c1.9,1.1,4,1.8,6.3,1.7c2.8,0,5.7-0.1,8.6-0.1c0,0.5-0.1,1.5-0.1,2
+		c4.3-0.3,8.7,0.1,12.9-0.7c2-2.4,0.6-6.2,1.2-9.1c1.7-0.1,3.3-0.3,5-0.5c-1,2.7-0.8,5.7,1.7,7.6c-0.6,0.8-1.3,1.6-1.9,2.4
+		c-0.1,4.1,0.2,8.2-0.2,12.2c-0.2,1.9-1.2,4.2-3.4,4.4c-6.9,0.7-14.2,2-20.8-0.8c-1.2,2-4.4,3.7-4.7,0.2c-5.9,0.2-11.7-0.7-17.5-1.4
+		c-4.4-0.9-7.4,3.5-11.8,3.3c0.9-1,1.9-2,2.9-3c-11.4-0.9-22.8-0.2-34.1,1.2c-7.6,0.2-15.4-0.9-22.9,0.8c-2.3,0.3-4.8,1.1-6.9-0.1
+		c-1.7-1.2-3.1-2.7-5.1-3.2c0.7-0.8,2-1.3,1.8-2.7C1228.2,749.3,1227.4,743.7,1228.2,738z"/>
+	<path class="st1" d="M1358.1,738.9c-0.1-3,2.9-4.1,5.2-5c0.3,1,0.6,2,0.8,3c-0.2,2.3-0.2,4.5,0.1,6.8c8.3-1.2,16.8-0.9,25-2.2
+		c2-0.1,4-0.2,6-0.4c0.4,0,1.2-0.1,1.7-0.2c0.5,0,1.5,0.1,2,0.2c8.9,0.4,17.7,0,26.6,0.2c11.3,0.8,22.6,1.9,34,1.3
+		c0.1-0.3,0.2-0.9,0.3-1.2c0.7-2.4,1-4.9,1.2-7.4c1.7,1,3.9,1.7,4.2,3.9c0.8,5,0.3,10,0.4,15c-0.1,2.7-0.1,6.3-3,7.7
+		c-2.7,1.6-5.9,0.6-8.7,0c-6.6-1.3-13.3,0-19.9-1.1c-7-1.2-14-0.9-21.1-0.9c-8.7,0.1-17.4-0.4-26.1,1c-6,1-12.1-0.4-18,1.2
+		c-2.6,0.5-3.6,3.3-6,4.2c0.4-1.3,1-2.4,1.6-3.6c-3.4-0.6-5.9-3.1-6.3-6.5C1357.7,749.6,1357.9,744.2,1358.1,738.9z"/>
+	<path class="st1" d="M1517.3,737.2c0.3-1.9,2.2-2.5,3.6-3.3c0.2,2.7,0.3,5.5,0.4,8.2l1.1,0.2c3.5,0.5,7.1,0.4,10.7,0.3
+		c2.5-0.1,4.9-0.2,7.4-0.5c4.3-0.7,8.7-0.7,13.1-0.7c-0.1-0.5-0.3-1.6-0.4-2.1c1-0.3,2.1-0.7,3.1-1.1c0,1.1,0,2.2,0.1,3.3
+		c2.3,0,4.6,0,6.9,0c1.6,0,3.2-0.1,4.9-0.1c0.6,0,1.8,0,2.4,0c0.5,0,1.6,0,2.1-0.1c3.7-0.1,7.4,0,11.1,0c1.5,0,3,0,4.6,0
+		c5.9,0,11.8,0.2,17.7,0.1c6.4-0.3,12.8,1.4,19.3,1c2.5,0,4.9,0.2,7.4,0.3c0-1.9,0.1-3.8,0.1-5.7c0.1-1.2,0.3-2.5,0.5-3.7
+		c2.1,1.3,5,2.4,5.2,5.3c0.5,5.7,0.2,11.5,0.2,17.2c0.1,3.1-3.1,4.7-5.2,6.4c-9.3-4.1-19.8-1.1-29.6-2.5c-10.3-1.5-20.6-1.1-31-1.1
+		c-6.3,0.1-12.7,0.1-19,0.9c-8.6,1.2-17.4-0.5-25.9,1.2c-3.1,0.5-6.6,1.4-9.3-0.7c-2.2-2.1-1.8-5.4-1.9-8.2
+		C1517,747.1,1516.5,742.1,1517.3,737.2z"/>
+	<path class="st1" d="M81.8,741.4c-3.3-1.7-2.9-7.3,1.4-7.2c1,1.8,2.5,3.5,2.8,5.6C85.6,741.7,83.2,741.2,81.8,741.4z"/>
+	<path class="st1" d="M73.3,737.4c1.3-1.4,4,0.6,2.3,2C74.4,740.7,71.8,738.8,73.3,737.4z"/>
+	<path class="st1" d="M193.2,738.2c3.2-1.9,4.9,2.5,3.7,5C194.6,742.6,193,740.6,193.2,738.2z"/>
+	<path class="st1" d="M1666.2,743c2.1-0.9,2.5,2.5,0.5,2.8C1664.7,746.5,1664.3,743.3,1666.2,743z"/>
+	<path class="st1" d="M1639.9,748.1c-0.4-2.1,1.7-2.4,3.1-3.1c0.5,0.9,0.8,1.8,0.8,2.8C1642.5,748.3,1641.2,748.4,1639.9,748.1z"/>
+	<path class="st1" d="M1683.4,745.4c1.2-1.3,3.7-0.5,4.9,0.5C1687.7,748.2,1681.3,748.1,1683.4,745.4z"/>
+	<path class="st1" d="M1647.9,748.2c1.4-0.8,2.8-1.6,4.3-2.4c0.1,1.3,1.2,3.1-0.3,4.1C1650.5,751.5,1648.5,749.6,1647.9,748.2z"/>
+	<path class="st1" d="M1694.9,749.2c1-0.8,2-1.6,3.1-2.4c0.3,1.7,0.7,3.5,1,5.2C1696.8,752.3,1695.5,751.1,1694.9,749.2z"/>
+	<path class="st1" d="M54.2,748.3c1.6-0.2,2.3,1.5,2.2,2.8C54.8,754.2,50.7,749.2,54.2,748.3z"/>
+	<path class="st1" d="M59.8,753c2.1-0.6,4.2-0.8,6.3-1c0.1,1.3-0.1,3.9-2.1,3.4C62.4,755.4,58.5,755.8,59.8,753z"/>
+	<path class="st1" d="M84.7,755.3c-2.4-2.1,1.8-3.1,3.4-3.2C87.7,753.5,86.5,756.8,84.7,755.3z"/>
+	<path class="st1" d="M1661.5,757.7c2.6-1.7,2.8,2.8,2.3,4.4C1662.3,761.2,1661.2,759.6,1661.5,757.7z"/>
+	<path class="st1" d="M1692.2,757.1c2.7-1,1.4,2.6,1.8,4.1C1691.5,761.4,1691.4,758.8,1692.2,757.1z"/>
+	<path class="st1" d="M82.8,760.7c3.6-1.6,4.3,3.1,4.7,5.6c-1.4-0.4-3.8,0.5-4.2-1.5C83,763.4,82.8,762.1,82.8,760.7z"/>
+	<path class="st1" d="M231.5,762.5c2.1-1.7,3.5,0.8,3.7,2.6C233.4,765,230.3,765.1,231.5,762.5z"/>
+	<path class="st1" d="M1174.2,762.2c2.9-1,2.3,3.7-0.1,3.8C1172.8,765,1173.6,763.4,1174.2,762.2z"/>
+	<path class="st1" d="M133.9,769.5c2-4.1,6.4-6.5,10.9-6.3c-2,1.2-3.8,2.6-5.1,4.5C137.8,768.3,135.8,768.9,133.9,769.5z"/>
+	<path class="st1" d="M192.7,764.5c1-0.8,2.2-1.5,3.4-2c0.8,1.5,0.5,2.9-0.9,3.9C194.5,766,193.3,765,192.7,764.5z"/>
+	<path class="st1" d="M72.2,764.2c1.9-1.7,4.6,1.7,2.2,3.1C72.4,769.6,70,765.4,72.2,764.2z"/>
+	<path class="st1" d="M1340.6,767.3c0.3-2.2,2.3-3.5,4.5-3.4C1346.4,766.4,1342.1,766.9,1340.6,767.3z"/>
+	<path class="st1" d="M1675.8,764c3,0.4,6.5,1.9,6.6,5.5C1680,767.9,1676.2,767.2,1675.8,764z"/>
+	<path class="st1" d="M1360.8,765.8c3.6,0.5,5.3,4.2,3.9,7.4C1363,770.9,1361.6,768.4,1360.8,765.8z"/>
+	<path class="st1" d="M237,766.9c4-1.6,2.8,9.5-0.3,5.5C235.7,770.7,236.2,768.5,237,766.9z"/>
+	<path class="st1" d="M1593.8,767.1c2.6-0.2,5.2,0.3,7.7,0.9c-0.4,1.3-0.4,3.4-2.4,3C1597,770.3,1595.4,768.6,1593.8,767.1z"/>
+	<path class="st1" d="M211.3,770.1c1.6-2.4,3.6-0.1,4,1.9C213.5,772.2,211.1,772.6,211.3,770.1z"/>
+	<path class="st1" d="M1344.9,768.8c0.7,0.1,2.2,0.4,2.9,0.5c1,2.3-2,3.6-3.8,3.8C1343.4,771.6,1344.4,770.2,1344.9,768.8z"/>
+	<path class="st1" d="M1589.3,769.3c0.4,0,1.2-0.1,1.7-0.2c0.5,2.6-3,3-4.8,3.7C1584.5,771.2,1587.9,769.7,1589.3,769.3z"/>
+	<path class="st1" d="M1621.8,770.9c1.2-2.4,4.8-2.8,5.7,0.1C1625.5,771.1,1623.6,771,1621.8,770.9z"/>
+	<path class="st1" d="M1684.8,769.9c3.5-2.3,2.1,3,3.3,4.8c1.7,2.7,1.6,5.8,0.8,8.7c-2.1-1.5-1.6-4.3-2.2-6.5
+		C1686.6,774.5,1684.8,772.4,1684.8,769.9z"/>
+	<path class="st1" d="M1694.6,771.3c0.2-2,2.7-2.6,4.4-2c0,2.2-1.2,4.2-1.5,6.4c0.1,1.5,0.6,3,1,4.6c1.2-1.9,2.3-3.8,3.3-5.8
+		c0.3,0.1,0.9,0.2,1.1,0.3c0,3.1-0.1,6.2-0.2,9.3c-2.5-1.1-5.1-2-7.4-3.3C1694.8,777.6,1694.5,774.4,1694.6,771.3z"/>
+	<path class="st1" d="M1256.5,770.3c2,1.5-0.1,4.1-0.7,5.8c-0.8-0.6-1.7-1.3-2.5-1.9C1254.4,772.9,1255.4,771.5,1256.5,770.3z"/>
+	<path class="st1" d="M135.2,770.8c1,0.7,2.8,0.7,3.1,2.2c0.1,1.9-1.8,1.8-3.1,2.1C135.2,773.6,135.2,772.2,135.2,770.8z"/>
+	<path class="st1" d="M354.9,774.2c-0.5-2.2,1.5-2.9,3.1-3.2C358,772.8,357.3,775.2,354.9,774.2z"/>
+	<path class="st1" d="M47.2,777.2c0.8-1.9,2.2-6.6,4.8-4.1c0.6,4.3-4.6,8.9-8.9,7.9c0.1-0.6,0.4-1.8,0.5-2.4
+		C44.8,778.1,46,777.7,47.2,777.2z"/>
+	<path class="st1" d="M252.8,779.1c-3.2-0.2-4-4.7-1.8-6.5C253.5,773.8,253,776.7,252.8,779.1z"/>
+	<path class="st1" d="M193.2,774.3c2.9-1.3,2.4,4.7-0.2,4C190.9,778,192,775,193.2,774.3z"/>
+	<path class="st1" d="M1355.4,778.5c-3.4,0.4-4.4-4-1.2-5.2C1355.5,774.7,1355.1,776.7,1355.4,778.5z"/>
+	<path class="st1" d="M60,774.9c3.2-1.4,3,4.2,0,3.5C58.3,777.8,59.5,775.9,60,774.9z"/>
+	<path class="st1" d="M1064.5,775.1c0.9-1.2,3.4,0.1,2.3,1.5C1065.9,777.8,1063.5,776.5,1064.5,775.1z"/>
+	<path class="st1" d="M1153.1,774.8c2.8,0,4.7,2.1,6.3,4.2C1156.7,782.9,1153.9,777.3,1153.1,774.8z"/>
+	<path class="st1" d="M204.2,776.2c3.2-0.5,3.5,3.5,3.9,5.8c-1.6,0.4-3.5,1.4-5,0C202.4,780.1,202,777.1,204.2,776.2z"/>
+	<path class="st1" d="M1206,776c1.3-1.1,4.1-0.1,3,1.9C1207.4,779.7,1203.8,778.3,1206,776z"/>
+	<path class="st1" d="M1649.1,776.9c2.7,0.2,3,3.3,3.1,5.4C1648.9,783.1,1649.6,778.8,1649.1,776.9z"/>
+	<path class="st1" d="M242,777.9c1.1,0.5,2.7,0.7,2.9,2.1c-0.3,1.1-0.7,2.2-1.1,3.2C242.1,782,241.6,780,242,777.9z"/>
+	<path class="st1" d="M351.1,778.1c1.6-0.6,2.2-0.1,1.7,1.6C351.1,780.3,350.6,779.8,351.1,778.1z"/>
+	<path class="st1" d="M93.8,781.8c0.3-2.8,2.8-3.5,5.2-2.9c-0.7,1.3-1.3,2.7-2,4C96,782.5,94.9,782.2,93.8,781.8z"/>
+	<path class="st1" d="M1310.3,779c0.8,0.3,1.7,0.7,2.6,1.1c-0.7,1.8-0.7,6.1-3.6,4.8C1309.4,782.8,1309.8,780.9,1310.3,779z"/>
+	<path class="st1" d="M340.3,780.1c2-0.8,2.8,2.5,0.7,2.9C339.2,783.5,338.5,780.5,340.3,780.1z"/>
+	<path class="st1" d="M231.2,781.2c4.6-2.4,3.2,7.3-0.2,6.8C230.4,785.8,230.6,783.4,231.2,781.2z"/>
+	<path class="st1" d="M69.1,782.3c1.8-0.6,2.8,2.5,0.8,2.9C68,785.8,67.1,782.7,69.1,782.3z"/>
+	<path class="st1" d="M220.2,782.3c0.9-1.2,3.3,0.2,2.3,1.6C221.5,785.1,219.1,783.7,220.2,782.3z"/>
+	<path class="st1" d="M128,786c2.8-0.8,5.4-2.1,8-3.4c2.7-0.6,3.7,2.1,4.6,4.1c3,1.5,6.3,0.5,9.4,0.1c2,1,3.6,2.6,5.2,4.2
+		c-5.6-0.1-11.1-1.3-16.7,0c-0.2-1.3-0.5-2.6-0.8-3.9c-3.5-1-6.4,1.6-9.7,2.2C126.7,788.6,125.9,786.2,128,786z"/>
+	<path class="st1" d="M30,786.6c3.9-0.1,7.5-2.3,11.4-2c1.4,1.1,0.7,2.8,0.3,4.3c-2-0.2-3.9-0.7-5.8-1.1c-2,0.8-4.1,1.7-6.1,2.5
+		C29.9,789,30,787.8,30,786.6z"/>
+	<path class="st1" d="M199.2,784.7c2.2,1.5,1.3,4.1,0.5,6.1C195.9,791.2,197.6,786.3,199.2,784.7z"/>
+	<path class="st1" d="M1643.2,785.8c1.5-0.3,3.1-1.2,4.7-0.6c0.1,1.3-0.4,2.7-1.9,2.9C1644.9,787.5,1644,786.8,1643.2,785.8z"/>
+	<path class="st1" d="M113.2,786.2c1.2-1.3,2.8,0.4,4,0.9C118.8,791.1,111.4,789.2,113.2,786.2z"/>
+	<path class="st1" d="M1162.2,791.2c-1.7-2.1-1.4-5.4,1.8-5.3C1164,787.9,1163.8,790,1162.2,791.2z"/>
+	<path class="st1" d="M1374,789.6c2-1.2,3.5-3.9,6-3.8c0.5,2-1.1,3.3-2.3,4.6c-0.6,1.1-0.9,4-2.7,2.6
+		C1374.4,792,1374.3,790.8,1374,789.6z"/>
+	<path class="st1" d="M75.4,795.5c0.2-3-0.1-6.4,2.2-8.7c3.2,2.2,1.9,5.9,1.1,9C77.6,795.7,76.5,795.6,75.4,795.5z"/>
+	<path class="st1" d="M1139.9,786.9c0.5,0,1.5,0,2,0c0.4,2,1.6,4.3,0.1,6.2C1139.1,792.7,1138.4,789.1,1139.9,786.9z"/>
+	<path class="st1" d="M1234,786.9c1.8-0.3,4.4-1.1,5.5,1.1C1239.7,791.8,1232.1,790.5,1234,786.9z"/>
+	<path class="st1" d="M1603.1,787.5c1.1-0.3,2.6-0.1,3.4,0.8C1606.5,790.4,1600.8,789.1,1603.1,787.5z"/>
+	<path class="st1" d="M1695.9,787.2c1.5,0.4,6-1,5.2,1.8C1698.9,790.2,1696.9,789,1695.9,787.2z"/>
+	<path class="st1" d="M280.2,788c1.7-0.3,3.8,2.2,1.7,3.1C279.5,792.1,279.7,789.6,280.2,788z"/>
+	<path class="st1" d="M1591.1,788.2c1.9,2.2,4.2,4,6.4,5.9c-0.6,0.3-1.8,0.9-2.5,1.2c-2-1.5-3.9-3.2-5.9-4.6
+		C1589.8,789.8,1590.4,789,1591.1,788.2z"/>
+	<path class="st1" d="M1677.1,788.2c0.6,0,1.9,0,2.6,0c0.2,1.1,0.5,2.3,0.8,3.5c1.5,0.5,3.3,0.7,4.1,2.4
+		C1680.2,795.4,1678.3,791.5,1677.1,788.2z"/>
+	<path class="st1" d="M309.4,789.3c2.3-2.1,3.4,6-0.2,4.7C308.7,792.5,308.2,790.6,309.4,789.3z"/>
+	<path class="st1" d="M49,790.1c1.3-0.1,2.6-0.1,3.9-0.2c0,0.8,0,2.3-0.1,3.1c-1.2,0-2.4-0.1-3.5-0.3
+		C49.2,792.1,49.1,790.8,49,790.1z"/>
+	<path class="st1" d="M1216,791.4c1.9-2.4,4.6-0.9,6.3,0.9c2-0.3,4-0.4,6.1-0.2c-0.9,3.3-5.2,3.8-7.7,2.1
+		C1219.1,793.3,1217.6,792.3,1216,791.4z"/>
+	<path class="st1" d="M1349.9,791.3c1.7-0.5,3.5-1,5.2-1.5c-0.2,1.4-0.1,3-1.3,4.1C1352,794.7,1350.9,792.5,1349.9,791.3z"/>
+	<path class="st1" d="M1650.6,789.9c0.8,0,2.5,0.1,3.3,0.2c0.8,1.4,1.3,2.9,1.9,4.4c2.6,1.1,7.6,0.4,8,4.2c-2.5-0.2-5.1-0.2-7.5-1
+		C1654.2,795.2,1652.1,792.7,1650.6,789.9z"/>
+	<path class="st1" d="M1660.1,789.9c1.8-0.2,3.4,0,4,1.9c-1.3,0.4-2.6,0.8-3.9,1.2C1660.2,792.3,1660.1,790.7,1660.1,789.9z"/>
+	<path class="st1" d="M61.3,792c1.8-0.7,2.4,2.4,0.6,2.7C60.2,795.3,59.6,792.4,61.3,792z"/>
+	<path class="st1" d="M131.3,793.2c2.2-0.6,4.5-0.8,6.7-0.9c-0.4,1.2-0.1,3.8-2,3.5C134.3,795.5,130.6,795.7,131.3,793.2z"/>
+	<path class="st1" d="M1153,792.1c1.5-0.1,3.3-0.1,3.5,1.9C1155.2,796.5,1151.7,794.6,1153,792.1z"/>
+	<path class="st1" d="M1696.9,795.7c1.9-1.4,3.8-2.7,5.8-4l0,1c-0.5,0.8-1,1.6-1.5,2.5c0.1,1.9,0.3,3.9,0.5,5.8
+		C1700.1,799.2,1698.5,797.5,1696.9,795.7z"/>
+	<path class="st1" d="M106.5,793.2c1.4-1.6,3.7,0.9,2.1,2.2C107.2,796.7,105.2,794.5,106.5,793.2z"/>
+	<path class="st1" d="M1200.5,793.1c0.8-1,3,0.1,2.4,1.3C1202,795.4,1199.8,794.4,1200.5,793.1z"/>
+	<path class="st1" d="M1192.2,796.8c-1.2-2.5,2.5-2.8,4.1-3.1C1195.5,795,1194,798.8,1192.2,796.8z"/>
+	<path class="st1" d="M1339.8,798.1c0.2-1.2-0.9-4,1-4c1.7,1.5,3.3,3.1,4.9,4.7C1344.1,800.1,1341.7,798.2,1339.8,798.1z"/>
+	<path class="st1" d="M1669.4,796.2c0.3-2.4,3.9-3.5,5.2-1.2C1673.1,796.4,1671.1,796,1669.4,796.2z"/>
+	<path class="st1" d="M1225,796.1c1.4,1.1,4,1.6,3.8,3.8C1226.3,800.8,1225.7,797.8,1225,796.1z"/>
+	<path class="st1" d="M95.7,799c1.2-3.5,5.3-1.2,6.7,1C100.4,801.2,95.7,802.7,95.7,799z"/>
+	<path class="st1" d="M1158.9,797c2.6-1.5,3.4,1.1,3,3.2C1160.3,799.7,1158.4,799,1158.9,797z"/>
+	<path class="st1" d="M1306.3,797.4c2.4,1-1.3,4.2-2.7,2.5C1303.4,798.5,1305.2,797.6,1306.3,797.4z"/>
+	<path class="st1" d="M1590.3,797.4c0.6,0,1.9-0.1,2.6-0.2c-0.7,2.4-4.4,4.1-6.7,3.6C1586,798.6,1588.9,798.3,1590.3,797.4z"/>
+	<path class="st1" d="M1606.1,800.1c2.3-1.3,4.8-2.6,7.3-3.5c-0.8,2.7-2.4,4.9-4.2,7C1608.1,802.5,1607.1,801.3,1606.1,800.1z"/>
+	<path class="st1" d="M1643.2,797.3c1.2-0.5,4-1.4,4.1,0.8c-2,1.4-4.1,2.6-6.5,3.1C1640.4,799.4,1641.3,797.7,1643.2,797.3z"/>
+	<path class="st1" d="M29.9,799.3c2.5-0.4,4.9-0.8,7.4-1.3c0.8,1.1,1.6,2.2,2.3,3.4c1.5,2-0.1,5.1-2.5,5.4c-2.2-1.9-4.4-3.9-7.1-5.1
+		C29.9,801.1,29.9,799.9,29.9,799.3z"/>
+	<path class="st1" d="M52.9,799.3c0.5-0.4,1.6-1.3,2.1-1.7c1.3,0.9,5.1,1,4.1,3.4C56.8,801.9,54.2,801.5,52.9,799.3z"/>
+	<path class="st1" d="M118.2,798.4c1.8,0.2,1.6,3.4-0.2,3.6C116.2,801.7,116.5,798.6,118.2,798.4z"/>
+	<path class="st1" d="M198.4,804.4c0.3-2.6,1.7-4.8,3.5-6.6c-0.1,3.1,0.3,6.8-2.1,9.2C198.6,806.8,198,805.5,198.4,804.4z"/>
+	<path class="st1" d="M182.3,799.3l0.7-0.9c2.4,2.1,1.2,8-2.2,7.7C180.4,803.7,180.8,801.1,182.3,799.3z"/>
+	<path class="st1" d="M1189.1,799.4c0.9-1.1,3.4,0.1,2.4,1.5C1190.6,802,1188.1,800.8,1189.1,799.4z"/>
+	<path class="st1" d="M1242.3,799.3c1.2-1.3,3.3,0.8,2.1,2.1C1243.2,802.6,1241,800.5,1242.3,799.3z"/>
+	<path class="st1" d="M1621.2,800.1c1.9-0.7,2.8,2.6,0.8,3C1620.3,803.5,1619.4,800.5,1621.2,800.1z"/>
+	<path class="st1" d="M227.6,801.8c2.2-1.2,4.2,0.6,3.1,2.9C228.4,806.7,227.8,803.5,227.6,801.8z"/>
+	<path class="st1" d="M1632.3,801.3c1.1-0.5,2.3-0.6,3.7-0.2c0.3,2.2-2,3.6-3.9,4C1631.8,803.8,1631.8,802.5,1632.3,801.3z"/>
+	<path class="st1" d="M374.3,802.3c3.4-0.8,3.2,3.3,2.4,5.5c-1.9,1.4-3.9-1.4-4.8-2.8C370.5,803.3,373.1,802.5,374.3,802.3z"/>
+	<path class="st1" d="M1282.5,806.1c1.1-1.5,3.5-5.5,4.8-2.1C1286.7,806.2,1284.5,806.4,1282.5,806.1z"/>
+	<path class="st1" d="M1330.9,802.9c1.6-0.8,3,0.9,4.1,1.9C1333.7,806.8,1329.6,805.5,1330.9,802.9z"/>
+	<path class="st1" d="M1694.1,807.5c1.7-1.5,3-4.8,5.8-3.9c-0.7,1.3-1.3,2.5-2,3.8c1.7,0.1,3.4,0.1,5.1,0.3c0,0.6,0,1.8,0,2.4
+		c-2.6,0.4-5.2,0.6-7.8,0.8C1694.9,809.7,1694.5,808.6,1694.1,807.5z"/>
+	<path class="st1" d="M1051.3,804.1c1.9-0.8,2.8,2.6,0.7,2.9C1050.1,807.5,1049.3,804.5,1051.3,804.1z"/>
+	<path class="st1" d="M1224.2,804.2c0.9-1.3,3.7,0,2.6,1.5C1225.7,807.1,1223,805.7,1224.2,804.2z"/>
+	<path class="st1" d="M65.6,810.3c-0.6-3.2,2.4-4.4,4.6-5.7c1.2,1.9,2.2,3.9,3.1,6C70.7,810.5,68.1,810.5,65.6,810.3z"/>
+	<path class="st1" d="M1130.1,805c2.2-1.8,3.2,3.4,0.7,3.7C1128.5,809,1128.7,806,1130.1,805z"/>
+	<path class="st1" d="M1244,804.8c2.5-1,2,2.1,2.2,3.5c-0.8-0.1-2.4-0.2-3.2-0.3C1243,806.9,1243.3,805.8,1244,804.8z"/>
+	<path class="st1" d="M1292.2,804.9c2.2,0,2.3,2.6,2.9,4.2C1293.3,811.4,1290.6,806.6,1292.2,804.9z"/>
+	<path class="st1" d="M413,810.1c0.4-1.7,1-3.3,1.9-4.9c0.6,0.5,1.7,1.5,2.2,2.1C416.1,808.8,414.7,809.8,413,810.1z"/>
+	<path class="st1" d="M1101.3,807.3l0.7-0.9c2.4,1.4,1.1,4.3-1.1,5.1C1099.2,810.6,1100.4,808.3,1101.3,807.3z"/>
+	<path class="st1" d="M1223.9,808c1.4-0.8,3.7-1.6,4.2,0.6c-2.8,0.1-6.4,2.5-8.4-0.3C1221.1,808.1,1222.4,808,1223.9,808z"/>
+	<path class="st1" d="M1619.2,807.4c2-0.2,2.6,3.1,0.8,4C1618.6,810.8,1617.2,808,1619.2,807.4z"/>
+	<path class="st1" d="M1189.1,810.8c-1-1.4-0.8-2.4,0.8-3c1.4,0.6,2.2,1.9,3.2,3.1C1191.9,811.4,1190,812.6,1189.1,810.8z"/>
+	<path class="st1" d="M1363.4,808.1c0.9-1,3-0.6,3.4,0.8C1366.6,810.8,1362.9,809.8,1363.4,808.1z"/>
+	<path class="st1" d="M1327.2,809.1c1.6-0.5,2.2,0,1.6,1.6C1327.2,811.3,1326.6,810.8,1327.2,809.1z"/>
+	<path class="st1" d="M78.8,811.8c1.1-2.9,5.6-2.7,6.4,0.3C84.2,814.7,80.7,812.2,78.8,811.8z"/>
+	<path class="st1" d="M1686.2,810.2c1.6,0,3.6,0.2,4.5,1.8C1689.4,815,1682.3,812.7,1686.2,810.2z"/>
+	<path class="st1" d="M266.4,812c2.2-1.2,5-0.5,7.4-0.3c2.3,0.3,1,3,0.3,4.3C271.6,814.7,268.3,814.4,266.4,812z"/>
+	<path class="st1" d="M283.9,811.8c2.3-1.6,4.7,0.4,6.2,2.1c0.6,1.7-1.3,2.5-2.2,3.5C286.4,815.8,285,813.8,283.9,811.8z"/>
+	<path class="st1" d="M1312.2,811.2c0.4-0.1,1.4-0.4,1.8-0.5c1.5,1.6,3.5,3.3,3.7,5.7C1314.5,818.3,1312.2,813.8,1312.2,811.2z"/>
+	<path class="st1" d="M1629.2,811.2c1.6-0.6,2.1,0,1.6,1.6C1629.2,813.4,1628.7,812.8,1629.2,811.2z"/>
+	<path class="st1" d="M1674.3,812.3c1.6,0.5,5.3,0,4.4,2.6C1676.9,815.7,1672,815.1,1674.3,812.3z"/>
+	<path class="st1" d="M263.4,813.3c2.8-0.8,2.1,3.6-0.4,2.9C261.1,816,261.9,813.4,263.4,813.3z"/>
+	<path class="st1" d="M1216.1,813.6c1-0.9,3.4,0.4,2.7,1.8C1217.8,816.2,1215.4,815,1216.1,813.6z"/>
+	<path class="st1" d="M1259.3,813.4c1.7-1.2,1.3,2.8,0.6,3.6C1257.4,817.8,1257.7,814.1,1259.3,813.4z"/>
+	<path class="st1" d="M1644.5,813.1c0.9-1.2,3.4,0.1,2.4,1.5C1645.9,815.7,1643.5,814.4,1644.5,813.1z"/>
+	<path class="st1" d="M1231.7,813.8c3.3-1,5.5,1.7,6.9,4.4C1235.3,819.8,1233.3,816.1,1231.7,813.8z"/>
+	<path class="st1" d="M29.7,814.7c1.8,0.1,3.7,0.2,5.5,0.3c0.2,2.1,0.6,4.2,1.4,6.3C33.5,820.2,28.9,819.1,29.7,814.7z"/>
+	<path class="st1" d="M41.7,820.1c-0.3-2.1,0.3-4,2-5.3c0.7,1.7,1.2,3.5,1.7,5.3C44.4,820.1,42.6,820.1,41.7,820.1z"/>
+	<path class="st1" d="M115,819.9c-1.8-1.3-6.8-2.8-4.2-5.5C113.8,814.5,114.8,817.5,115,819.9z"/>
+	<path class="st1" d="M1169.8,820.3c-0.7-1.7-3.9-4.4-0.9-5.3C1170.4,816.4,1171.3,818.4,1169.8,820.3z"/>
+	<path class="st1" d="M1288.8,817.9c1.1-1.8,3.1-3,5.2-2.1c-0.2,0.6-0.7,1.9-0.9,2.5C1291.6,818.2,1290.2,818,1288.8,817.9z"/>
+	<path class="st1" d="M59.6,821c0.2-2.2,0.9-4.3,2.5-6c0.6,2,0.6,4,0.1,6.1C61.6,821.1,60.3,821,59.6,821z"/>
+	<path class="st1" d="M1301.4,816.5c2.3-0.6,1.2,4.1-0.7,3.3C1299.9,818.8,1300.5,817.3,1301.4,816.5z"/>
+	<path class="st1" d="M1340.5,821c0.6-2,0.8-4.5,2.7-5.8c1.2,2-0.3,4-1.2,5.9L1340.5,821z"/>
+	<path class="st1" d="M1350.9,816.6c0.9,0.1,2.3-0.7,3,0.4c1.1,1.9-1.7,2.3-2.8,3.1C1351.1,819.2,1350.9,817.5,1350.9,816.6z"/>
+	<path class="st1" d="M1229.2,816.9c1.6,0.9,2.5,2.4,3,4.1c-1.5-0.3-2.9-0.7-4.4-1C1228.3,818.9,1228.7,817.9,1229.2,816.9z"/>
+</g>
+<g id="Text_Full">
+	<path class="st2" d="M600,76.2c46.6,0,93.3-0.1,139.9,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.1-0.1-13.7,0c3.5,3,7.4,5.5,11.1,8.2
+		c-1.3,4.5-2.8,8.9-4.5,13.2c4.2-2.1,7.3-5.8,11.6-7.7c4,2,7.2,5.3,10.9,7.7c-0.6-4.6-2.7-8.7-3.9-13.1c3.7-2.9,7.6-5.5,11.4-8.3
+		c-4.7-0.2-9.4-0.1-14.1-0.1c-1.3-3.6-2.5-7.3-3.6-11c83.1-0.1,166.2-0.1,249.2,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.3-0.1-13.9,0.1
+		c3.7,2.8,7.6,5.5,11.3,8.2c-1.3,4.5-2.8,8.8-4.5,13.2c4.2-2,7.4-6,11.7-7.7c4,2.1,7.2,5.3,11,7.7c-1-4.5-2.8-8.8-4.1-13.1
+		c3.7-2.9,7.6-5.5,11.4-8.3c-4.7-0.2-9.3-0.1-14,0c-1.4-3.6-2.5-7.2-3.5-11c46.2-0.1,92.5,0,138.7,0c0,14.1,0,28.3,0,42.4
+		c-10.8,0-21.7-0.1-32.5,0.1c-2.3,0-4.7,0.4-6.7-0.8c4-2.1,7.4-5.1,11.1-7.7c3.8,2.7,7.4,5.6,11.3,8c-1.3-4.3-2.8-8.6-4.3-12.9
+		c3.7-2.9,7.6-5.6,11.4-8.3c-4.6-0.1-9.3,0-13.9,0c-1.9-4.1-2.1-8.9-4.8-12.6c-1.3,4.2-2.6,8.4-4.1,12.6c-4.6,0.1-9.3,0-13.9,0.1
+		c3.8,2.8,7.7,5.4,11.4,8.3c-1.6,4.6-3.2,9.1-4.8,13.7c-12.2-0.8-24.5-0.1-36.8-0.3c-52.7,0-105.3,0-158,0
+		c-6.6-0.2-13.2,0.4-19.7-0.2c-1.5-4.5-3-8.9-4.2-13.5c3.8-2.6,7.5-5.2,11.1-8c-4.6-0.1-9.1,0-13.6,0c-1.9-4.3-3-9-4.6-13.4
+		c-1.5,4.5-2.8,9-4.5,13.4c-4.6-0.1-9.2-0.1-13.8,0c3.6,3,8.1,4.9,11.1,8.5c-1.1,4.5-2.9,8.7-4.1,13.2c-78,0-156-0.1-234,0.1
+		c-0.8-0.2-1.5-0.5-2.2-0.8c3.9-2.2,7.4-5.1,11-7.7c3.8,2.7,7.4,5.6,11.4,8c-1.4-4.3-2.9-8.6-4.4-12.8c3.6-2.9,7.6-5.5,11.3-8.3
+		c-4.6-0.2-9.2-0.1-13.7-0.1c-1.3-3.3-2.3-6.8-3.3-10.2c-0.2-1-0.8-1.7-1.6-2.3c-1.2,4.2-2.4,8.5-4.2,12.6c-4.5-0.1-9.1-0.1-13.6,0
+		c3.6,2.7,7.3,5.3,11,7.9c-0.8,4.9-3,9.4-4.3,14.2c-5.9-0.7-11.8-0.2-17.7-0.4C600,104.5,600,90.4,600,76.2z"/>
+	<path class="st2" d="M854.8,118.5c3.6-3,7.5-5.6,11.2-8.4c3.2,3,7.5,4.7,10.1,8.2C869,119,861.9,118.6,854.8,118.5z"/>
+	<path class="st2" d="M555.6,174.7c17.6-1.9,35.8-0.4,52.5,5.7c29.2,10.3,53.1,34,63.7,63c7.6,20.8,8.4,43.6,4.3,65.3
+		c-3.7,20-12.9,39.3-27.1,54c-19.9,21-48.7,31.4-77.1,33.4c-7,0-14,0.1-21,0c-31.2-2.9-61.7-18.6-80-44.4
+		c-12.9-17.9-19.4-40-19.3-62c0-4.7-0.1-9.4,0.2-14c1.7-27.8,14.7-55,35.9-73.2C506.6,186.1,531,177.1,555.6,174.7 M555.6,191.5
+		c-16.2,2.6-30.8,12.2-40.6,25.2c-13.6,17.6-19.3,40-20.4,61.9c-0.4,14.9,1.4,29.8,5.5,44.1c5.4,18.2,15.8,35.4,31.4,46.4
+		c12.4,9,28.3,12.4,43.4,10.6c15-2,28.8-10.1,38.5-21.6c13.1-15.6,19.5-35.8,21.6-55.7c1.8-20.6,0.7-41.8-6.6-61.3
+		c-6.2-17.8-18.2-34.2-35.1-43.2C581.9,191.8,568.5,189.7,555.6,191.5z"/>
+	<path class="st2" d="M770.9,179.3c10-0.1,20-0.3,30-0.1c13.4,0.9,27.5,4.7,36.9,14.8c10.9,11.6,15.2,28.1,14.6,43.7
+		c-0.4,9.6-2.2,19.3-6.8,27.9c-13.2,25-41.8,40.4-69.8,38.4c-0.4-0.1-1.1-0.3-1.5-0.4c-0.4-4-0.2-8.1-0.1-12.1
+		c10.6-1.4,21.6-5.6,28.4-14.3c7.7-9,9.3-21.2,9.7-32.6c0.3-12-1-24.9-8.2-35c-5.7-8.3-15.5-12.8-25.1-14.3
+		c-7-0.9-14.2-0.6-21.2-0.1c0,52.5-0.1,104.9,0,157.4c0.8,7.3,0.3,15.8,5.6,21.7c4.7,5,12.1,4.7,18.4,4.7c0,4,0,8,0,12.1
+		c-19.5-1.8-39.1-2.1-58.7-1.6c-9.5,0.8-19.1,0.5-28.6,1.7c-1.1-3.9-0.6-8-0.6-12c6.5-0.1,14.2,0.4,19.1-4.7
+		c5.4-6.2,4.8-15,5.6-22.7c0.1-42.7,0-85.4,0-128.1c0.2-6-0.6-12-1.2-18c-0.9-4.9-2.9-10.3-7.7-12.6c-4.9-2.6-10.5-1.9-15.8-2.1
+		c-0.1-3.9-0.1-7.8,0-11.8c5.8-0.3,11.5,1.1,17.3,1C731,180.4,751,180.8,770.9,179.3z"/>
+	<path class="st2" d="M1262.9,180.2c5.8,0,11.6-1.2,17.4-1.1c0,4,0,7.9,0,11.9c-5.8,0-12.5-0.3-17.1,4c-5.1,4.8-5.4,12.2-5.7,18.7
+		c-0.4,15-1,30-0.9,45.1c-0.9,44.8-1.4,89.7-1.3,134.5c-5.4,0.1-10.8,0.2-16.2-0.1c-10.5-13.6-20.9-27.4-32.2-40.3
+		c-25.5-30.1-51.5-59.8-77.2-89.8c-8.5-9.8-16.9-19.8-24.9-30.1c-4.3-5.3-7.9-11.1-12.6-16.1c0.8,19,2.1,37.9,2.2,56.9
+		c0.2,12,0,24,0.6,36c0.3,17,0.1,34.1,1.5,51.1c0.6,5.1,1.8,10.9,6.1,14.2c4.7,3.7,11,3.3,16.6,4.2c-0.5,3.9,0.9,8.3-1,11.8
+		c-14.1-1.4-28.2-1.1-42.3-1c-8.8,0.3-17.7-0.2-26.5,1.1c-0.1-4-0.1-7.9,0-11.9c5.8-0.6,12.2-0.4,17.3-3.7c4.1-3.2,5.7-8.6,6.3-13.6
+		c2-28.4,1-56.8,1.3-85.2c0-19.7,0-39.3-0.1-59c-0.6-8-0.9-17.2-7.2-23.1c-4.9-3.8-11.6-3.4-17.5-3.7c-0.2-3.9-0.2-7.9,0.1-11.8
+		c3.8-0.1,7.5,0.4,11.3,0.8c16.3,0.7,32.7,0.5,48.9-0.9c36.7,44.8,75,88.1,112.2,132.5c5.4,6.4,10.2,13.3,15.6,19.7
+		c0.2-10.9-0.2-21.8-0.9-32.6c-0.3-26-0.1-52-0.2-78.1c-0.1-8.2-0.9-17.3-6.6-23.8c-4.6-5.1-12-6-18.5-5.9c-0.1-4-0.1-8,0-12
+		c4.5,0,9,0.7,13.5,1C1237.6,180.5,1250.3,180.4,1262.9,180.2z"/>
+	<path class="st2" d="M863.7,179.1c16.7,1.7,33.6,1.2,50.4,1.4c24.7-0.1,49.4-0.3,74-0.4c9.5-0.8,19-0.6,28.5-0.9
+		c0.6,17.1,2.3,34.1,4.3,51.1c-4.5,1-9.2,1.3-13.8,1.2c-1.4-9.1-3.1-18.6-8.8-26.1c-4-5.5-10.9-8-17.3-9.3c-13.9-2.5-28-2-42-1.9
+		c-3.5,0.1-7.8,0.2-10,3.5c-1.6,3.4-1.5,7.3-1.6,11c-0.2,21.5,0.1,43-0.2,64.5c12.6-0.2,25.3,0.1,37.9-0.3
+		c7.1-0.7,14.9-0.7,20.8-5.3c5.5-5.2,4.9-13.3,5.7-20.2c4.3,0,8.6,0,12.9,0c-1.8,18.1-0.9,36.3-0.9,54.4c-0.3,4.4,0.9,8.7,0.7,13.1
+		c-4.2,0.3-8.4,0.1-12.6,0.2c-0.9-6.9-0.6-14.8-5.9-20.1c-5.8-5.4-14.2-5.8-21.6-6.6c-12.5-0.4-25.1-0.1-37.7-0.2
+		c1.4,6.4,0.7,13,0.9,19.5c0.1,15.3-0.2,30.6,0.2,46c0.6,6.6,2.1,14.8,8.7,18.1c7.7,3.9,16.5,2.1,24.8,2.9c5,0.6,10-0.5,15.1-0.3
+		c11.3,0.3,22.8-3,31.9-9.7c9.7-7.9,13.7-20.2,17.9-31.5c3.9,1.3,7.8,2.5,11.8,3.4c0.4,4.2-1.4,8.1-2.3,12.1
+		c-3.7,14-6.7,28.3-9.9,42.5c-15.1-1.1-30.3-0.8-45.4-1.6c-21-0.2-42-0.2-63,0c-17.6,0.8-35.2,0.6-52.8,1.1c0-3.8,0-7.6,0-11.4
+		c4.8,0,9.9,0.1,14.4-2c3.5-1.6,6-4.9,7.1-8.6c2.2-7.1,2-14.6,2-21.9c0-43.3,0.1-86.7-0.1-130c-0.2-7.3-0.3-15.5-5.4-21.2
+		c-4.9-5-12.3-4.5-18.7-4.4C863.4,187,863.5,183,863.7,179.1z"/>
+	<path class="st2" d="M586.6,468.7c16.1-1.3,32.4-0.8,48.2,2.8c32.1,7,61.2,26.3,80.2,53c17.7,24.5,26.3,55.1,25.4,85.3
+		c-0.8,29.9-8.9,60.2-26.8,84.5c-18.5,25.6-47.1,42.8-77.6,50.2c-9.9,2.6-20,3.9-30.2,4.8c-9.7,0.2-19.4,0.1-29.1,0
+		c-32.6-3.4-64.1-17.8-87.4-41.1c-10.9-11.3-19.9-24.5-26.1-39c-8.3-19.3-11.8-40.6-11.3-61.5c-0.1-33.3,11.7-66.8,34-91.8
+		c12.3-13.8,27.6-24.7,44.3-32.6C548,474.9,567.3,470.5,586.6,468.7 M587.6,489.7c-17.4,1.9-33.6,10.3-46.1,22.4
+		c-12.6,12.2-21.2,28-26.8,44.5c-5.1,15.5-7.8,31.8-7.5,48.1c-0.8,27.2,4.8,55,18.2,78.8c8.1,14.2,19.6,26.7,33.6,35.2
+		c17.8,10.2,39.6,13.3,59.5,7.9c14-3.5,26.5-11.6,36.4-22c14.6-15.7,23.3-36.1,27.7-57c3-15.1,4.3-30.5,3.8-46
+		c-0.5-3.7-1.1-7.3-1.1-11c-1.9-19.9-7.3-39.6-17.4-57c-6.9-11.7-15.7-22.4-26.9-30.1C625.6,493,606.4,487.5,587.6,489.7z"/>
+	<path class="st2" d="M1213,475.7c6.7-2.9,13.4-6,20.2-8.7c5.5,15.8,10.1,31.9,15.4,47.8c14.1,43,29.1,85.8,43.7,128.7
+		c7.1,20.5,13.4,41.4,22.7,61c3.5,7.3,7.8,14.6,14.5,19.5c4.4,3.1,9.8,3.4,15,4.3c0,4.7,0,9.4,0,14.2c-4.3-0.3-9.1,1.2-13.1-0.9
+		c-25.5-0.4-51-0.8-76.5,0c-7.1,1-14.4,0.8-21.5,1c0-4.8,0-9.6,0-14.5c7.4-0.4,15.9,0.2,22.1-4.7c5.1-4.3,4.4-11.8,3.7-17.8
+		c-3.7-21.6-11.8-42.2-18-63.2c-25.4,0.1-50.8-0.2-76.2,0.1c-3.3,10.6-7.7,20.8-11.5,31.2c-3.8,10.6-8.6,20.9-10.8,32
+		c-0.7,5.7-1.2,12.5,3.5,16.8c6.5,6.2,16.2,4.8,24.4,5.6c0,4.8,0,9.6,0,14.4c-8.6,0.2-17-1.4-25.6-1.3c-15.4-0.2-30.7-0.3-46.1,0
+		c-7.8-0.1-15.5,1.7-23.3,1.2c-0.3-4.7-0.3-9.5-0.3-14.2c4.8-0.8,9.9-0.7,14.4-2.8c8.5-3.4,13-12.1,17.5-19.5
+		c10.6-20.3,19-41.7,27.9-62.7c21.9-53.6,45.4-106.5,64.6-161.1C1203.7,479.1,1208.7,477.9,1213,475.7 M1206.8,527.4
+		c-1.1,2.7-2,5.4-2.8,8.2c-6.1,20.8-13.6,41.1-21.6,61.2c-2.9,8.2-6.9,16-9.4,24.3c5.3-0.2,10.7-0.1,16-0.3
+		c15.3-1.2,30.6,0.2,45.9,0.3c-3-8.1-5.9-16.2-8.3-24.4c-5.9-19.8-12.8-39.3-16.8-59.6C1209.1,533.8,1208.6,530.4,1206.8,527.4z"/>
+	<path class="st2" d="M1499.6,476.6c7.5-3.2,14.8-6.9,22.6-9.5c19.2,62,40.9,123.2,61.8,184.6c6.5,18.9,12.5,38,21.4,55.9
+		c3.7,7,8.3,14.4,15.8,17.9c3.6,1.8,7.7,1.8,11.6,2.6c-0.1,4.8,0,9.6,0,14.4c-6.2-0.1-12.5-0.1-18.7-1c-15.7-0.5-31.4-0.5-47.1-0.4
+		c-9.3,0.2-18.6-0.3-27.8,1c-5.6,0.4-11.3,0.3-16.9,0.4c0-4.8,0-9.6,0-14.5c7.7-0.4,16.6,0.1,22.8-5.3c4-4.5,3.8-11.1,3-16.6
+		c-3.6-21.9-12-42.5-18-63.8c-25.4-0.1-50.8-0.2-76.2,0c-4.4,12.5-9.3,24.9-13.9,37.3c-3.1,8.5-6.9,16.9-8.5,26
+		c-0.3,5.2-1.2,11.1,2.2,15.5c2.3,3.2,6.2,4.7,9.9,5.8c5.3,1.1,10.8-0.3,16,1.3c-0.1,4.8-0.1,9.5,0,14.3c-7.2,0-14.4-0.2-21.5-1.1
+		c-19-0.4-38.1-0.4-57.1,0.1l-0.8,0.6c-5.2,0.2-10.4,0.4-15.6,0.5c-0.2-4.8-0.3-9.5-0.2-14.3c7.4-0.7,15.5-1.7,21-7.2
+		c8.1-8.6,13.1-19.6,18.1-30.2c8.4-18.5,16.2-37.2,23.9-56c15.3-37.2,31.2-74.2,45.9-111.8c5.1-13.5,10.6-26.8,14.6-40.6
+		C1491.2,479.6,1495.6,478.6,1499.6,476.6 M1494.9,527.8c-8.9,31.9-21.2,62.7-33.6,93.4c5.6-0.2,11.2,0,16.8-0.4
+		c15-1.2,30.1,0.3,45.2,0.3c-2.5-8.3-5.7-16.4-8.1-24.7c-6.5-21.9-14.3-43.6-17.9-66.3C1497.2,528.7,1495.9,528.3,1494.9,527.8z"/>
+	<path class="st2" d="M392,476.2c13,0.4,26-0.8,39-2c0.5,5,0.2,10,0.4,15c-8.2,1.1-17.1,0.1-24.6,4.4c-5.6,2.9-8.3,9.1-9.1,15
+		c-0.5,4.7-0.4,9.4-0.4,14.1c0.3,15.7-0.3,31.4,1,47c0.2,12.7,0.1,25.4,0.5,38.1l0.7,0.8c0.1,11,0,22,0.4,32.9
+		c1.3,10.9,0.4,22,1.5,32.9c0.3,4,0,8,0.6,11.9c1.1,6.1,0,12.3,1.5,18.3c1.2,6.4,2.1,13.9,7.9,18c6.2,4.4,14.2,4.2,21.5,5.1
+		c0,4.9,0,9.8,0,14.7c-9.2,0.3-18.4-1.4-27.6-1.3c-20.7-0.3-41.3-0.3-62,0.2c-6.9,1-13.8,0.9-20.7,1c0-5-0.1-10.1,0.2-15.1
+		c7.5,0.1,15.8-0.3,21.9-5.2c6.5-6.7,6.8-16.7,6.9-25.5c0.2-39.7-0.1-79.3,0.2-119c0.1-5.3,1.3-10.6,1-16
+		c-0.1-6.9,1.6-13.7,1.2-20.6c-0.5,0-1.5,0-1.9,0c-13.7,38.9-31.6,76.1-49.3,113.4c-8,17-16.4,33.8-23.6,51.2
+		c-5.5,12.5-10.5,25.2-16.7,37.3c-3.4-0.1-6.7,0.2-10.1-0.2c-1.3-0.3-1.8-1.8-2.4-2.9c-18.2-39.6-37-78.9-55.4-118.4
+		c-12.4-26-24.3-52.4-34.1-79.5c-0.5,0-1.6-0.1-2.1-0.1c0.1,10.3,1.5,20.5,1.1,30.8c0.4,13.1-0.6,26.2-0.9,39.3
+		c-1.2,9.9-0.1,19.9-1.6,29.8c-0.4,11.4-0.2,22.9-0.4,34.4c-0.8,9.1-1.4,18.4-0.1,27.5c0.4,6.4,2.1,13.3,6.8,18
+		c6.2,5.1,14.6,6.1,22.4,5.8c0.3,5,0.2,10,0.2,15.1c-7.9,0.3-15.7-1.4-23.6-1.2c-12.8-0.3-25.6-0.4-38.4,0.1
+		c-8.3,1.1-16.6,0.8-25,0.8c0.4-4.9-1-10.1,1-14.7c6.6,0.3,14.1-0.1,19-5.1c5.4-5.9,7-14,8.3-21.6c0.8-3.9,0.8-8,0.4-11.9
+		c0.3,1.7,0.6,3.4,0.9,5.1c0.4-9.1,1.1-18.1,2-27.2c0.2-4.4,0-8.8,0.6-13.1c1-6.6,0.4-13.3,0.9-20c0.9-7.6,0.7-15.3,1.5-22.9
+		c-0.3-9,1.4-17.9,1.2-27c-0.2-5.4,1-10.7,1-16c-0.1-17.7,2.7-35.4,1.6-53.1c-0.6-8.3-3.8-17.1-11.2-21.6
+		c-5.7-3.6-12.7-3.2-19.2-3.1c-0.2-4.9-0.1-9.9-0.1-14.8c14.5,0.2,29,1.7,43.5,1c9.8-0.7,19.7-0.7,29.4-1.9
+		c15.6,37.3,32.4,74,49.9,110.4c13.4,28.9,28,57.3,39.5,87c0.3-0.2,0.9-0.5,1.3-0.7c7.5-18.6,15.2-37.2,23.9-55.3
+		c18.6-40.6,38.1-80.9,55.6-122c2.8-6,4.7-12.4,7.8-18.3C368.9,474.7,380.4,476.3,392,476.2z"/>
+	<path class="st2" d="M761.4,489.3c-0.1-5.1-0.1-10.1,0-15.1c26.2,2,52.5,2.5,78.7,1.7c9.6-1,19.3-0.1,28.8-1.3
+		c1.5-0.3,3,0.2,4.4,0.7c-0.2,4.7-0.1,9.3-0.1,14c-8.3,0-18.2-0.4-24.5,6c-6.9,8.1-5.9,19.5-7,29.4c-0.3,23.8,0.1,47.6-0.3,71.4
+		c31.5-0.4,63.1,0,94.6-0.2c12.2,0.1,24.4-0.2,36.6,0.2c-0.3-17.8-0.2-35.6-0.1-53.4c-0.2-8.3,0.3-16.7-0.9-25
+		c-0.2-8.1-1.2-17.2-7.3-23.2c-6.4-5.7-15.5-5-23.5-5.2c0-4.6,0-9.3,0-13.9c8.1-0.2,16.2-0.1,24.2,0.7c19.3,0.8,38.7,0.2,58,0
+		c9.9-0.8,19.8-0.5,29.7-0.8c0.1,4.7,0.1,9.5,0,14.2c-6.5-0.1-13.3-0.3-19.2,2.6c-4.3,2.1-7.2,6.2-8.5,10.8
+		c-3.6,10.6-2.4,21.9-2.6,32.9c0,47,0,94,0,141.1c0.2,12.3-0.9,25,2.3,37c1.3,5,4.6,9.8,9.6,11.8c3.9,2.1,8.5,1.6,12.8,2.3
+		c1.8-0.2,3.6-0.4,5.5-0.6c0.4,5.1,0.2,10.2,0.2,15.2c-7.2-0.2-14.5-0.3-21.7-0.6c-8.3-1.1-16.7-0.8-25-0.9c-13.8,0-27.7,0-41.5,0.4
+		c-7.7,1.1-15.4,0.5-23.1,0.9c-0.8-4.8,0.2-9.6-0.1-14.5c6.9-1.2,14.6,0.8,20.7-3.5c7.6-4.9,9.2-14.6,9.6-22.9
+		c1.4-9.9,0.7-19.9,0.9-29.9c0-18.5,0-36.9,0.1-55.4c-43.7,0.2-87.3,0.3-131,0c0.2,26.8,0,53.6,0.2,80.4c1,8.4,1.2,17.8,6.7,24.7
+		c6.2,7.1,16.4,6.1,24.9,6.9c-0.1,4.7-0.1,9.4,0,14.2c-7.5,0-14.9,0-22.3-1c-23-0.5-46-0.6-69,0c-6.8,1-13.7,1.1-20.6,1.1
+		c0-4.8,0-9.7,0-14.5c7.9-0.3,17,0,23.2-5.8c5.5-6.4,6.5-15.4,7-23.5c0.2-57.3,0.1-114.6,0.1-172c-0.1-10.3,0.1-21.7-6.1-30.5
+		C779.8,489.1,769.7,489.2,761.4,489.3z"/>
+</g>
+<g>
+	<g id="_x23_57626eff">
+		<path class="st3" d="M316.5,0h0.6c-0.1,0.8-0.2,2.3-0.3,3c-0.1,0.7-0.2,2-0.3,2.6l1.4,0c2.6,0.3,1.7,2.2,0.1,3.2
+			c-1.1,0.7-1.5,1.7-1.4,2.9c0,1,0,2.9,0.1,3.9c0.1,2.6,0.4,5.1,0.8,7.6c0.3-1.6,0.7-3.3,1-4.9c1.2-0.3,2.4-0.6,3.5-0.9
+			c-0.2,1.2-0.4,2.4-0.6,3.6c-0.2,3-5.4,3.8-4.2,7l0.1,0.5c1.4,1.1,3.3,1.3,5,1.9c1.4,0,2.8,0,4.2,0c0,1.2,0.1,2.3,0.1,3.5
+			c-2.2-0.3-4.3-1.1-6.1-2.4c-1.7,1.6-3.1,3.4-4.1,5.5C316.4,24.6,316.3,12.3,316.5,0z"/>
+		<path class="st3" d="M349.3,0h0.5c-0.3,1.5-0.5,2.9-0.7,4.4c-0.5,0.6-1.1,1.1-1.6,1.7c-0.4,0.6-1.3,1.7-1.7,2.2
+			c-0.5-0.2-1.6-0.5-2.2-0.6c0.2-1.9,1.2-3.6,2.5-5C347.1,1.8,348.2,0.9,349.3,0z"/>
+		<path class="st3" d="M363.7,0h12.2c0.3,0.6,0.9,1.8,1.1,2.4c-2.8-0.1-5.5-0.3-8.2-1C367.2,0.7,365.5,0.3,363.7,0z"/>
+		<path class="st3" d="M456.9,0h2.7C461.1,3,455.7,3,456.9,0z"/>
+		<path class="st3" d="M1402.7,0h5.5c2.3,2.7,3.8,6,5.7,9l1.3-0.3c0.2-0.4,0.6-1.1,0.8-1.5c0,0.5,0,1.6,0,2.2
+			c-3.2-0.3-6.4,0.4-9.3,1.8c-0.8,0.3-1.6,0.6-2.3,0.9c-0.4-0.4-1.1-1.1-1.5-1.5c-1,0-2.1,0-3.1,0c0.9-1,1.8-2.1,2.9-2.9
+			c2.5-0.6,5.1-0.9,7.2-2.6C1407.4,3.5,1405,1.8,1402.7,0z"/>
+		<path class="st3" d="M338.2,5.3c0.8-0.2,2.5-0.7,3.4-0.9c-0.2,1-0.3,2.1-0.5,3.1c-0.6,0.1-1.8,0.3-2.4,0.3
+			C338.5,7,338.4,6.2,338.2,5.3z"/>
+		<path class="st3" d="M391.5,5.4c0.8,0,2.4,0,3.2,0c-0.6,2.5-1.4,4.9-2.3,7.3c-0.6,0.4-1.9,1.2-2.6,1.7c-0.7-0.3-2.2-1-2.9-1.3
+			c1.5-1.5,3-3.1,4.4-4.7C391.4,7.3,391.4,6.3,391.5,5.4z"/>
+		<path class="st3" d="M1254.3,6.3c1.8-0.6,3.8-0.8,5.7-0.9c-1.3,2.2-2.8,4.6-5.7,4.5C1254.3,8.7,1254.3,7.5,1254.3,6.3z"/>
+		<path class="st3" d="M376.1,13.1c1.6-2.6,4.8-3.5,7.6-2.4c0.1,2.2-1.9,3-3.5,3.8C378.8,14,377.5,13.6,376.1,13.1z"/>
+		<path class="st3" d="M443.8,11.5c0.5,0,1.5-0.1,2-0.2c0.1,0.4,0.4,1.1,0.5,1.5c0.4,1.5,0,2.7-1.1,3.7c-1.5-0.3-3-0.8-4.4-1.3
+			c-0.3-0.1-0.9-0.4-1.2-0.6c0.6-0.1,1.8-0.2,2.4-0.2C442.6,13.4,443.2,12.4,443.8,11.5z"/>
+		<path class="st3" d="M367.3,14.3c1.2-1.2,3.6-0.2,2.5,1.5C369.2,18.7,364,15.7,367.3,14.3z"/>
+		<path class="st3" d="M1254.6,15.6c0.7-1.5,1.8-2,3.3-1.5C1258.7,16.2,1255.9,17,1254.6,15.6z"/>
+		<path class="st3" d="M358.6,15.6c1.7,0,3.4,0,5,0c-0.1,0.5-0.4,1.5-0.5,1.9l-1.1,0.4c-0.9,0.3-1.7,0.5-2.6,0.8
+			C359.2,17.9,358.8,16.3,358.6,15.6z"/>
+		<path class="st3" d="M397.2,18.2c1.1-2.3,3-3.5,5.5-2.8l-1.1,1.6C400.4,18.1,398.8,18.5,397.2,18.2z"/>
+		<path class="st3" d="M1383.2,15.1c1.3,0.7,2.7,1.4,4,2.2c-1,1.6-2.6,2-4.2,0.9C1383.1,17.4,1383.1,15.8,1383.2,15.1z"/>
+		<path class="st3" d="M346.9,16.5c0.8-0.1,2.4-0.3,3.2-0.4c0.3,0.2,0.9,0.5,1.1,0.7c1.1,0.7,2.2,1.3,3.3,2c0,1-0.1,2-0.1,2.9
+			c-2-1.6-4.4-2.8-6.9-3.4C347.4,17.9,347,17,346.9,16.5z"/>
+		<path class="st3" d="M380.2,21.2c1.7-2.7,4.2-4.7,7.2-5.8c0.6,2.5-1.5,3.7-3.1,4.9c0.5,0.9,1.1,1.8,1.6,2.8
+			C384,22.6,382.1,22,380.2,21.2z"/>
+		<path class="st3" d="M387.2,21.4c1.8-1.4,3.6-2.8,5.6-4c1.4,0.8,2.8,1.5,4.2,2.1l0,0.1c-2.3,0.6-4.3,2-6,3.5
+			c-0.5,0-1.4,0.2-1.8,0.2C388.7,22.8,387.7,21.9,387.2,21.4z"/>
+		<path class="st3" d="M325.4,17.9c1.5,0.1,3,0.2,4.6,0.2c-0.3,1.3-0.6,2.5-0.9,3.8l-1.1-0.5C327.1,20.3,326.2,19.1,325.4,17.9z"/>
+		<path class="st3" d="M409.7,19.8c3-1.3,3.2,2,2.2,3.9C409.5,24.9,408.7,21.4,409.7,19.8z"/>
+		<path class="st3" d="M334.7,26c0.5-0.2,1.5-0.7,2-0.9c1.3,1.3,2.7,2.4,4.1,3.5c0.5,1.8,0.4,3.8-1.7,4.3
+			C337.7,30.6,336.2,28.3,334.7,26z"/>
+		<path class="st3" d="M1411.6,34.1c0.9-1.4,3.2,0.2,2.1,1.5C1412.8,36.9,1410.5,35.4,1411.6,34.1z"/>
+		<path class="st3" d="M1390.6,97.6c-0.8-4.6-0.5-9.3,0-13.9c0,3.9,0,7.8,0.5,11.7c2.3-2.6,0.7-6.5,2.8-9.3c0.6,1.9,1.2,3.8,1.9,5.7
+			c0.3,0.8,1,2.4,1.3,3.2c-0.9,0.7-1.7,1.3-2.5,2c0.2,0.6,0.6,1.7,0.8,2.3c-0.6,0.9-1.2,1.8-1.8,2.7
+			C1392.5,100.7,1391.5,99.2,1390.6,97.6z"/>
+		<path class="st3" d="M971.9,87.2c0.8,0.5,1.7,1,2.6,1.5c3.5,2.3,6.8,4.8,10.1,7.4c-1.2,4-2.4,7.9-3.4,12c3.9-2.2,7.4-5,11.4-6.9
+			c1.7,1.4,3.3,2.8,5,4.2c1.8,1.5,3.8,2.8,5.9,3.8c-0.7-2.1-1.4-4.2-2.2-6.3c-0.7-2-1.3-3.9-1.8-5.9c0.6-0.8,1.1-1.7,1.7-2.5
+			c3.1-2.3,6.2-4.5,9.2-7c0.4,0.2,1.1,0.5,1.5,0.7c-0.2,1.1-0.4,2.2-0.5,3.4c-3.2,2.4-6.8,4.4-9.8,6.9c0.1,1.3,0.5,2.5,0.8,3.8
+			c1.1,3.4,2.2,6.8,2.8,10.3c-2.8,0.2-5.1-1.2-7.1-2.9c-2.1-1.6-4.1-3.2-6.1-4.9c-2.9,2.4-5.6,5-8.7,7.2c-1.3,0.4-2.7,0.7-4,1.1
+			c0-5,2.1-9.6,3.7-14.2c-3.4-3-7.7-4.9-10.6-8.4C972.2,89.5,972,87.9,971.9,87.2z"/>
+		<path class="st3" d="M1049.8,92.2c0.5-1.5-0.6-4.1,1.2-4.9c1.9,1.4,1.6,3.6,1.2,5.6C1051.6,92.8,1050.4,92.4,1049.8,92.2z"/>
+		<path class="st3" d="M333.5,95.2c0.2-1.6,1-2.9,1.8-4.2c1.2,2.5,1.7,5.2,2.1,7.9c-2.1,1.6-4.5,6.4-7.4,3.4
+			c0.7-0.4,1.5-0.8,2.2-1.2c1.9-0.5,2.6-1.6,2-3.3C333.9,96.9,333.7,96,333.5,95.2z"/>
+		<path class="st3" d="M316.6,113.4c-0.2-5.6-0.5-11.3-0.1-16.9c1.5,1.3,2.9,2.6,4.4,3.8c-1.4-0.1-2.7-0.2-4.1-0.3
+			c0.1,2.4,0.1,4.8,0,7.3c0.8,0.7,1.6,1.4,2.4,2.1C318.5,110.8,317.6,112.1,316.6,113.4z"/>
+		<path class="st3" d="M846.5,96.7c1.8,1.2,3.5,2.3,5.3,3.6c2.4,1.8,4.7,3.6,7.1,5.3c-1.4,4.3-3,8.6-4.2,13c2.5-1.7,4.8-3.7,7.3-5.5
+			c1.3-0.8,2.6-1.6,4.1-2c2.5,1.1,4.7,2.7,7.1,4.1c1.3,1.1,2.7,2.3,4,3.4c-1-4.5-2.7-8.8-4-13.3c4-2.7,7.8-5.6,11.6-8.5
+			c1.9,4.5-3.3,6.7-6.3,8.8c-1.1,0.7-2.3,1.4-3.4,2.1c1,3.6,2,7.1,3.5,10.5l0.3,0.7c-2.4,0-4.9,0-7.3,0c-1.8-1.6-3.7-3-5.6-4.3
+			c-1.8,1.4-3.6,2.8-5.4,4.3c-2.4,0-4.8,0.1-7.2,0c0.3-0.9,0.6-1.7,0.8-2.6c0.9-2.8,1.6-5.7,2.4-8.6c-3.3-2.8-7.6-4.3-10.2-7.8
+			C846.4,99.2,846.4,97.6,846.5,96.7z"/>
+		<path class="st3" d="M1082.7,97.8c0.5-0.1,1.5-0.4,2-0.6c3.9,2.7,8,5.4,11.6,8.5c-0.6,1.8-1.1,3.7-1.7,5.5c-1,2.3-1.9,4.6-2.8,6.9
+			l-0.7,0.3c0.5-1.7,1.1-3.4,1.6-5.1c0.3-1.9,1.7-4.3-0.1-5.9c-3.1-3-7.2-4.9-10.3-8C1082.5,99,1082.6,98.2,1082.7,97.8z"/>
+		<path class="st3" d="M330.3,110.4c1.2-0.8,2.4-1.7,3.7-2.4c0.3,0.6,0.8,1.8,1.1,2.4C334.1,112.4,331.3,112.6,330.3,110.4z"/>
+		<path class="st3" d="M330.5,131.2c2.5-0.6,5-1.3,7.4-2.1c0.4,0.9,0.8,1.7,1.2,2.6c-2.3,0.8-4.6,1.7-6.9,2.5
+			c-1.3-0.1-2.6-0.1-3.8-0.2c0.1-0.6,0.3-1.7,0.5-2.3C329.2,131.6,330.1,131.4,330.5,131.2z"/>
+		<path class="st3" d="M1410.5,130.1c1-1,3.3-0.8,3.6,0.8C1413.8,132.9,1409.7,132.1,1410.5,130.1z"/>
+		<path class="st3" d="M1410.3,141c0.4-1.8,0.9-3.6,2.1-5.1c1.2,0.5,2.3,1,3.5,1.5c0,1,0,2,0,3.1c-0.8,0.1-2.5,0.2-3.3,0.3
+			C1412.1,140.8,1410.9,140.9,1410.3,141z"/>
+		<path class="st3" d="M338.8,138.7c1.1-0.1,2.1-0.2,3.2-0.3c0,0.4,0,1.2,0,1.6c-2,1.9-3.4,4.3-4.7,6.6c-0.8-0.4-1.5-1-2.2-1.5
+			c0.1-0.7,0.2-2.1,0.2-2.8c0.8-0.1,2.4-0.2,3.1-0.2C338.6,141.1,338.7,139.9,338.8,138.7z"/>
+		<path class="st3" d="M1396,139c2.3-1.7,4.9-1.5,6.3,1c-1.4,0-2.8,0-4.1-0.1C1397.7,139.7,1396.6,139.2,1396,139z"/>
+		<path class="st3" d="M321,146.4c1.8-2,3.5-4,5.2-6.1c0.7,1,1.5,1.9,2.2,2.9c-0.7,0.6-1.4,1.3-2.1,1.9c-1.1,1-2.1,2-3.1,3
+			C322.5,147.5,321.7,146.9,321,146.4z"/>
+		<path class="st3" d="M1398.6,143.3c1,0,2,0,3,0.1c0,1.4,0,2.8,0,4.3c-1.5,0-3,0-4.4,0C1397.7,146.2,1398.1,144.8,1398.6,143.3z"/>
+		<path class="st3" d="M1409.2,143.4c1.3-1.3,3.5,0.9,2.2,2.2C1410.1,147.1,1407.7,144.7,1409.2,143.4z"/>
+		<path class="st3" d="M1407.4,173.4c0.9,0.1,1.9,0.2,2.9,0.4c0.1,1,0.2,2,0.3,3c0,0.5,0.1,1.5,0.1,2c-1.1-0.2-2.2-0.3-3.3-0.5
+			C1407.4,176.6,1407.4,175,1407.4,173.4z"/>
+		<path class="st3" d="M1397.2,205c4.3-0.9,4.8,4,3.3,6.9c-1.3-0.5-2.5-1-3.7-1.6c0.4-0.6,1.2-1.8,1.6-2.4
+			C1398,207,1397.6,206,1397.2,205z"/>
+		<path class="st3" d="M1406.4,230.8c0.8-0.8,1.7-1.5,2.6-2.3c0.6,0.3,1.7,1,2.3,1.3c0.1,0.3,0.2,0.9,0.2,1.3
+			c-0.9,0.5-1.8,1-2.7,1.5c-1,1.7-2,3.4-3,5c-1.2-0.8-2.4-1.7-3.5-2.6c1.8-0.2,3.5-0.4,5.3-0.5c0-0.8,0.1-2.5,0.1-3.3
+			c-1.7,0.2-3.3,0.4-5,0.6c0-0.5,0.1-1.5,0.2-2c0.7,0.1,2,0.4,2.7,0.6L1406.4,230.8z"/>
+		<path class="st3" d="M1399.3,236.1c3.9-0.7-0.2,4.6-1,1.2C1398.5,237,1399,236.4,1399.3,236.1z"/>
+		<path class="st3" d="M1471.2,242.1c0.7-0.2,2.2-0.6,2.9-0.7c0.5,2,0.9,4-0.2,5.9C1472.3,246.1,1469.6,244.5,1471.2,242.1z"/>
+		<path class="st3" d="M1509.2,243.1c1.5-0.3,2.1,0.3,2,1.8c-0.5,2.2-3,0.5-2.6-1.1L1509.2,243.1z"/>
+		<path class="st3" d="M1482.8,253c0.7-2.2-0.3-6.4,3.2-6.3c-0.1,1.6-0.2,3.3-0.6,4.9c-0.1,0.5-0.4,1.6-0.5,2.2
+			C1484.4,253.6,1483.3,253.2,1482.8,253z"/>
+		<path class="st3" d="M1461.2,248.3c1,0,2.1-0.1,3.2-0.1c0.2,2.2,1,4.6,3.7,4.7c-1.1,1.4-2.9,2.2-4.6,1.6
+			C1461.5,253,1461.4,250.5,1461.2,248.3z"/>
+		<path class="st3" d="M1411.7,255.1c0.6-0.5,1.8-1.4,2.4-1.9c1.8,1.9,3.3,4.1,4.9,6.2c-1.8-0.1-3.5-0.1-5.2-0.2
+			C1412.8,258,1411.7,256.8,1411.7,255.1z"/>
+		<path class="st3" d="M1520.2,253.8c1.7,2,3,4.9,6,4.9c0.2,0.2,0.6,0.5,0.7,0.7c-2.7-0.2-5.4-0.6-8.1-1c0.2-0.5,0.5-1.6,0.6-2.2
+			C1519.7,255.6,1520.1,254.4,1520.2,253.8z"/>
+		<path class="st3" d="M1714.6,265.7c-1.9-1.7-2.7-4.1-1.2-6.4c0.7,0.7,1.4,1.5,2.2,2.2C1715.2,262.9,1714.9,264.3,1714.6,265.7z"/>
+		<path class="st3" d="M18.2,314.3c1.2,0,2.4,0,3.5,0c-0.3,1.8,0.9,4.6-1.5,5.2C17.9,318.7,18.2,316.2,18.2,314.3z"/>
+		<path class="st3" d="M1720.7,322.1c2.8,1.8,2.2,5.7,1.7,8.5l-1.7,0C1720.2,327.8,1720.4,324.9,1720.7,322.1z"/>
+		<path class="st3" d="M9.3,330.4c3.2-0.7,2.9,5.7-0.2,4.8C6.5,334.8,7.2,330.8,9.3,330.4z"/>
+		<path class="st3" d="M19.4,371.6c1.1-0.1,2.2-0.2,3.3-0.3c0.3,1.2,0.7,2.4,1,3.6c-0.8,1.5-2.4,2.4-4,2.9
+			C19.6,375.8,19.5,373.7,19.4,371.6z"/>
+		<path class="st3" d="M12.7,410.1c1.7,0.3,4.1-0.3,4.8,1.8c0,2.6-3,2.4-4.8,2.4C12.7,413,12.7,411.6,12.7,410.1z"/>
+		<path class="st3" d="M12,476.2c2.3-0.5,4.7-0.1,7,0.3c-0.3,1.8-0.8,4.2-3.1,4.1C13.2,481.3,12.9,477.9,12,476.2z"/>
+		<path class="st3" d="M20.3,484.6c0.6,0,1.7-0.1,2.3-0.1c0.7,0.6,1.3,1.2,2,1.8c-0.7,1.5-1.2,3-2.1,4.3c-0.9,1.3-2.6,0.6-4,0.8
+			C18.1,488.9,18.9,486.6,20.3,484.6z"/>
+		<path class="st3" d="M558,490.5c1.6-0.7,2.9,2.1,1.7,3.1C558,494.5,556.7,491.5,558,490.5z"/>
+		<path class="st3" d="M12.3,499c1-1.2,1.9-2.8,3.8-2.5c1.9,1.2,2,4,0,5.1C14.2,501.9,13.4,500,12.3,499z"/>
+		<path class="st3" d="M840.3,506.8c1.3-0.6,2.5-1.2,3.8-1.9c-0.6,4.1-1,8.2-1.8,12.4c0.1-1.7,0.1-3.3,0.1-5
+			C842,510.3,841.2,508.5,840.3,506.8z"/>
+		<path class="st3" d="M1717.8,514.1c0.5,2.1,1.2,5.1-1.2,6.3c-2.1,1.2-1.6-2.4-2-3.6c0.8-0.1,2.4-0.3,3.2-0.4
+			C1717.8,515.9,1717.8,514.7,1717.8,514.1z"/>
+		<path class="st3" d="M23,523.9c0.5-1.8,1.1-3.5,1.7-5.1c0.7,0.2,2.1,0.7,2.9,1c0.3,1.3,0.6,2.7,1,4
+			C26.7,523.7,24.8,523.8,23,523.9z"/>
+		<path class="st3" d="M1721.8,519.2c0.9,0.1,1.9,0.2,2.8,0.3c-0.2,1-0.6,2.9-0.8,3.8c1.3,0.5,2.7,1,4.1,1.6c-1.7,2-4.2,1.7-6.5,1.7
+			c-0.7-0.8-1.3-1.7-2-2.5C1720.5,522.6,1721.3,521,1721.8,519.2z"/>
+		<path class="st3" d="M662.8,523.3c-0.8-1.4-0.5-2.7,0.8-3.6c1.7,0.3,2.2,1.9,3,3.2C665.7,523.1,663.8,523.2,662.8,523.3z"/>
+		<path class="st3" d="M1707.9,520.5c0.5-0.1,1.5-0.2,1.9-0.2c0.5,2.3,0.6,4.8-0.5,6.9c-1.4-1.3-2.8-2.7-4.1-4.1
+			c0.5-0.6,1.5-1.8,1.9-2.4C1707.3,520.6,1707.7,520.5,1707.9,520.5z"/>
+		<path class="st3" d="M494.1,522.5c1.1,0.9,2.4,1.8,3.4,2.9c0.2,1.4,0.1,2.8,0.1,4.2c-0.4,0-1.2-0.1-1.6-0.2
+			c-0.7-1.9-1.4-3.8-2.2-5.6C493.8,523.5,494,522.9,494.1,522.5z"/>
+		<path class="st3" d="M664.7,529.2c2.2,0.2,4.3,0.7,6.3,1.6l0.4,0.8c-1.1,1.2-2.1,2.5-2.8,4.1C667.2,533.5,665.9,531.4,664.7,529.2
+			z"/>
+		<path class="st3" d="M500.7,531.9c0.8-0.9,1.8-1.7,2.8-2.3c0.1,2.2,0.1,4.4,0,6.6c-0.7-0.5-2.1-1.5-2.8-2
+			C500.7,533.6,500.7,532.5,500.7,531.9z"/>
+		<path class="st3" d="M21.8,542.9c1.6-1.4,3.5-2.2,5.5-2.8c0.9,1.6,2.6,4.5-0.2,5.4C25,545.6,23.4,544.1,21.8,542.9z"/>
+		<path class="st3" d="M158.4,554c-0.2-4.5-1.7-9.2,0.4-13.5c1,1.3,1.9,2.6,2.5,4.2c-0.9-0.7-1.8-1.4-2.7-2
+			c1.7,15.4,0.9,30.9,1,46.3c-0.1,10.5,0.3,21-1.4,31.4c-1.4-0.7-2.8-1.5-4.1-2.3c0.6-1.6,2.2-2.5,3.4-3.6c0.2-1.3,0.3-2.5,0.5-3.8
+			c0.3-2.7,0.3-5.4,0.4-8.1c0-1.2,0.1-2.5,0.1-3.7c0-1.2,0.1-2.4,0.1-3.6c0.2-2.5,0-4.9-0.8-7.2c0.7-2.4,1.1-4.8,1.3-7.2
+			c0.1-2.5,0-5-0.1-7.5C158.8,567,158.8,560.5,158.4,554z"/>
+		<path class="st3" d="M179.2,541.4c2.2,0.3,6-0.4,6.6,2.5C184.4,547.2,178.1,545.1,179.2,541.4z"/>
+		<path class="st3" d="M1729.3,542.5c1.2,0,2.4,0.1,3.7,0.1v3.4c-1.2-0.6-2.5-1.1-3.7-1.7C1729.3,543.8,1729.3,542.9,1729.3,542.5z"
+			/>
+		<path class="st3" d="M3,553.7c-2.8-0.6-1.7-3.6-1.5-5.5c1.5,0.3,2.9,0.8,4.2,1.6C5.8,551.6,4.5,552.8,3,553.7z"/>
+		<path class="st3" d="M472.2,551.3c1.2-2.7,3.1,0.1,3.8,1.6c0.3,0.5,0.8,1.5,1,2c0.1,0.9,0.2,2.7,0.3,3.6
+			C474.9,556.8,471.7,554.5,472.2,551.3z"/>
+		<path class="st3" d="M19.1,554.6c0.6-0.2,2-0.6,2.6-0.8l0.7-0.2c0.1,0.5,0.3,1.5,0.5,2c-0.2,1.3-0.4,2.6-0.7,3.9
+			c-0.8-0.2-2.4-0.7-3.3-1C19,557.2,19,555.9,19.1,554.6z"/>
+		<path class="st3" d="M176.9,556.1c0.5-2.4,3.2-1.6,4.9-1.6c-0.4,1.6-0.2,3.6-1.7,4.8C178.2,559.8,175.6,558.1,176.9,556.1z"/>
+		<path class="st3" d="M508.3,554.1c1.9-0.7,2.8,2.6,0.7,2.9C507.2,557.5,506.4,554.5,508.3,554.1z"/>
+		<path class="st3" d="M483.9,554.8c0.5-0.1,1.5-0.2,2-0.2c0.3,0.3,0.9,1,1.2,1.3c0.1,0.9,0.2,2.6,0.2,3.5c-1.2,0-2.5,0-3.8,0
+			C483.7,557.9,483.8,556.3,483.9,554.8z"/>
+		<path class="st3" d="M681.9,563c-0.5-2.6,3.5-2.3,2,0.1C683.3,563.1,682.4,563,681.9,563z"/>
+		<path class="st3" d="M456,577.1c-0.1-5.5,2.4-10.4,3.5-15.6c0,1.1,0.1,3.2,0.2,4.3c1.3,0.7,2.5,1.4,3.8,2.1
+			c-1.8,1-4.6,1.3-5.2,3.6c-1.6,5,0.4,10.2,0.3,15.2c1.1,1.4,2.3,2.8,3.2,4.3c-1,0.1-2.1,0-3.1,0c-0.4,0.7-0.8,1.5-1.2,2.2
+			c-1.5,0.4-3.4,0.2-4.4,1.5c0.1,1,0.2,2,0.4,3.1c-0.5,1.5-0.8,3-1.2,4.6l-0.1-0.4c-0.7-4.9,0.3-9.7,1.3-14.4
+			c0.2,1.6-0.6,4.1,0.6,5.3c2.3-1.1,1.8-4.4,2.7-6.5c-0.8,0-2.3,0-3.1,0.1c0.3-1.2,0.5-2.3,0.8-3.5c1.1,0.5,2.1,1,3.2,1.5
+			c-0.2-0.9-0.4-1.8-0.6-2.7c-0.7-0.2-2.1-0.5-2.9-0.7C454.8,579.8,455.4,578.5,456,577.1z"/>
+		<path class="st3" d="M705.2,567.2c1.6-0.5,2.2,0,1.6,1.7C705.2,569.4,704.7,568.8,705.2,567.2z"/>
+		<path class="st3" d="M1710.5,568.5c0.4,0,1.3,0.1,1.7,0.1c1.2,1,2.4,1.9,3.7,2.9c-1.4,0-2.7,0-4,0.1c-0.6,1.1-1.2,2.2-1.8,3.3
+			c-0.7-0.1-2.2-0.2-2.9-0.2C1707,572,1708.6,570.1,1710.5,568.5z"/>
+		<path class="st3" d="M1717.8,570.4c0.9-0.8,1.9-1.7,3-2.4c0.9-0.1,2.8-0.3,3.7-0.4c-0.2,0.8-0.6,2.3-0.7,3.1
+			C1721.8,570.6,1719.8,570.5,1717.8,570.4z"/>
+		<path class="st3" d="M5.8,570.6c1.2-0.1,2.3-0.2,3.5-0.2c-0.3,1.4-0.5,2.9-0.8,4.3c-1.6,0.2-3.2,0.5-4.8,0.6
+			C3,573.5,5.2,572.1,5.8,570.6z"/>
+		<path class="st3" d="M1729.8,582.8c-2.5-2.3-2.4-7.4,1.2-8.6c0.1,2.3,0.2,4.7,0.2,7C1730.9,581.6,1730.2,582.4,1729.8,582.8z"/>
+		<path class="st3" d="M1708,577.5c0.5,0,1.6,0,2.1,0c0.5,1.7,1.9,3.4,3.9,2.6c0.5-0.2,1.5-0.4,2-0.6c0.9-0.2,2.6-0.6,3.5-0.9
+			c-0.2,2.5-1.4,4.6-3.3,6.3c-0.8-1.3-1.6-2.6-2.4-3.8c-1,0.3-1.8,0.8-2.5,1.5c-0.4-0.8-0.8-1.6-1.1-2.4
+			C1709.4,579.2,1708.7,578.3,1708,577.5z"/>
+		<path class="st3" d="M469.6,577.6c1.5,1.3,2.3,3.1,0.8,4.8l-2-0.6C468.8,580.4,469.2,579,469.6,577.6z"/>
+		<path class="st3" d="M482,578.6c0.9-0.2,1.8-0.3,2.7-0.5c0.4,1.2,0.5,2.4,0.3,3.6c-0.6-0.2-1.7-0.5-2.2-0.7
+			C482.6,580.5,482.2,579.2,482,578.6z"/>
+		<path class="st3" d="M502.2,588.2c-2.1-1.9-0.6-4.6,2-4.8c-0.1,1.4-0.2,2.9-0.3,4.3C503.5,587.8,502.6,588.1,502.2,588.2z"/>
+		<path class="st3" d="M466.4,586.6c0.2-0.5,0.7-1.5,0.9-2c1.4,0.8,2.8,1.6,4.2,2.4c-0.8,0.8-1.5,1.7-2.3,2.5l-1.1-1.2
+			C467.5,587.8,467,587.2,466.4,586.6z"/>
+		<path class="st3" d="M491.2,591.2c1.1-0.8,2.1-0.3,2.9,1.3c0.7,1.1,1.3,2.2,2.1,3.4c-1.8-0.7-3.6-1.3-5.4-1.9
+			C490.9,593.3,491.1,591.9,491.2,591.2z"/>
+		<path class="st3" d="M22.5,594.5c1.4,0,2.8,0.3,4.2,0.5c0.1,1.2,0.2,2.4,0.3,3.6c-1.5,0.1-3,0.2-4.4,0.3
+			C22.5,597.4,22.4,596,22.5,594.5z"/>
+		<path class="st3" d="M13,596.4c0.9,0.1,1.8,0.3,2.7,0.4l0.2,0.7c-0.1,0.8-0.4,2.4-0.5,3.2c-1.1-0.2-2.1-0.4-3.2-0.5
+			C12.5,598.9,12.8,597.7,13,596.4z"/>
+		<path class="st3" d="M0,597.7c0.6,2.7,1.9,5.2,3.8,7.3c-1.3,1-2.5,2.1-3.8,3.2V597.7z"/>
+		<path class="st3" d="M220.1,605.9c0.9-3,2.1-6,4.8-7.8c0.7,0.4,2.1,1.2,2.8,1.6c-0.1,0.8-0.2,2.5-0.3,3.3
+			C225,604.2,222.6,605.2,220.1,605.9z"/>
+		<path class="st3" d="M494.6,603.7l1.4-0.3c0.5,0.4,1.6,1.3,2.2,1.8c0,0.8,0,2.4,0,3.1c-0.8,0-2.5-0.1-3.4-0.2
+			C494.8,606.6,494.7,605.2,494.6,603.7z"/>
+		<path class="st3" d="M198.1,609.9c-0.3-1.5-0.5-5,1.9-4C202.9,607,200.8,610.9,198.1,609.9z"/>
+		<path class="st3" d="M454.8,607.4c1.9-0.3,2.7,1,3.2,2.6c0.8,0.8,1.7,1.6,2.5,2.5c-1.2,1.7-2.3,3.4-3.3,5.3c1.3,1.2,2.7,2.4,4,3.6
+			c-2.2,0-4.4-0.3-6.5,0.2c-2.3,0.9-1.7,3.8-2.2,5.7c-0.4-2.8-0.5-5.6-0.5-8.4c0.6-0.1,1.7-0.2,2.3-0.3c0.2-2.5,0.5-4.9,0.9-7.3
+			C455,609.9,454.8,608.6,454.8,607.4z"/>
+		<path class="st3" d="M0,616c1.2,0.3,2.5,0.6,3.7,0.8c-0.5,0.7-0.9,1.5-1.4,2.2C1.6,620,0.8,621,0,622V616z"/>
+		<path class="st3" d="M1158.7,616.3c1.4,0,2.8,0,4.3,0.1l0.9,0l-0.1,0.5c-0.2,1.4-0.6,4.4-2.8,3.5
+			C1158.8,620.3,1158.7,617.9,1158.7,616.3z"/>
+		<path class="st3" d="M12,618.8c0.5-0.1,1.6-0.4,2.1-0.5l1-0.2c0.2,1.3,0.5,2.6,0.8,4c-1.2,0.2-2.3,0.5-3.5,0.8
+			C12.3,621.5,12.1,620.2,12,618.8z"/>
+		<path class="st3" d="M1709.3,618.5c1.4,0.1,2.9,0.2,4.2,0.8c-0.9,0.5-1.8,1-2.7,1.4c-1.1,0.2-2.1,0.5-3.2,0.8
+			c-1.1,0.3-2.1,0.6-3.2,0.9c-0.1-0.1-0.2-0.2-0.3-0.3C1706.3,621.5,1708.2,620.4,1709.3,618.5z"/>
+		<path class="st3" d="M142.8,620.9c0.5,0.3,1.4,0.8,1.9,1.1c0.9,1.8-0.1,3.5-1.1,5c-0.9-1.3-1.8-2.5-2.7-3.8
+			C141.4,622.6,142.4,621.4,142.8,620.9z"/>
+		<path class="st3" d="M0,623c1.6,0.6,3.1,1.3,4.7,2c-0.9,2-2.8,3-4.7,3.9V623z"/>
+		<path class="st3" d="M480.4,623.6c1.2-0.1,2.5-0.1,3.7-0.2c0.2,0.9,0.5,1.9,0.7,2.9c-0.2,0-0.6,0.2-0.8,0.2
+			c-0.5,0.1-1.3,0.4-1.8,0.6c-0.4-0.2-1.1-0.5-1.5-0.7C480.6,625.4,480.5,624.5,480.4,623.6z"/>
+		<path class="st3" d="M17.7,629.1c0.6-1,2.4-3.2,3.3-1.3c2.1,3.6,4.3,9.2,0.1,12.2c-0.2-0.5-0.7-1.5-0.9-2.1
+			C19.4,635,17.7,632.1,17.7,629.1z"/>
+		<path class="st3" d="M464.2,627.2c1.8,0.3,3.6,0.5,5.5,0.9c0.2,0.5,0.6,1.6,0.8,2.2l-1.2-0.2c-0.6-0.1-1.9-0.2-2.6-0.3
+			c-1.3,0.5-2.5,1-3.8,1.5C463.4,629.9,463.8,628.5,464.2,627.2z"/>
+		<path class="st3" d="M710.7,626.6c1.2,0.4,2.4,0.8,3.6,1.3c-0.8,0.9-1.8,1.7-2.7,2.4C711.4,629.5,711,627.6,710.7,626.6z"/>
+		<path class="st3" d="M1548.6,628.5c1.6,0.5,3.4,0.8,4.7,1.9c0.6,1.4,1.1,2.9,1.6,4.3c-0.4-0.4-1.2-1.2-1.6-1.6
+			c-1.4,0.2-2.6,0.4-3.9,0.6c1.1-1.2,1.6-2.6,1.3-4.3c-0.6,0-1.7-0.1-2.3-0.1C1548.5,629.1,1548.5,628.7,1548.6,628.5z"/>
+		<path class="st3" d="M1278,628.8c2-0.2,4.2,0.1,5.2,2.1c-1.8,1.9-4.1,1.4-6,0.1C1277.4,630.5,1277.8,629.4,1278,628.8z"/>
+		<path class="st3" d="M477.9,638.3c0.8-1.8,1.6-3.6,2.3-5.4c0.2,3.3,0.4,6.6,0.7,9.9l0.9,0.3c0.6,0.2,1.8,0.6,2.4,0.8
+			c0.1,0.4,0.5,1.2,0.6,1.6c-0.8,0-2.2-0.1-3-0.2c-0.8-0.1-1.6-0.2-2.3-0.2c-0.6,0-1.8,0.1-2.3,0.1c-1.3-0.2-2.6-0.4-3.9-0.6
+			c0.9-0.9,1.9-1.7,2.8-2.6C476.7,640.8,477.3,639.5,477.9,638.3z"/>
+		<path class="st3" d="M9.8,635.1c1.1,0.2,2.1,0.4,3.1,0.8c0.1,0.9,0.4,2.5,0.6,3.4c-1.9,0-3.9,0-5.8-0.1c0.3-1.3,0.7-2.5,1-3.8
+			L9.8,635.1z"/>
+		<path class="st3" d="M464.9,635.2c1.8,0.2,3.7,0.5,5.5,0.7c0.1,0.9,0.3,1.8,0.4,2.7c-1.5,0.7-3.1,1.4-4.6,2.1
+			c-0.4-0.4-1.1-1.3-1.5-1.8C464.8,637.7,464.8,636.4,464.9,635.2z"/>
+		<path class="st3" d="M485.7,634.5c0.8,0.1,2.4,0.4,3.2,0.5c0.1,0.6,0.4,1.7,0.6,2.3c-1.2,0.4-2.3,0.8-3.5,1.2
+			C485.9,637.4,485.8,635.4,485.7,634.5z"/>
+		<path class="st3" d="M1708.3,639.3c1.5-1.1,2.7,1.7,1.5,2.6C1708.2,643.1,1707,640.2,1708.3,639.3z"/>
+		<path class="st3" d="M11.6,646.1c0.9-1.8,0.1-6.5,3.3-5.2c0.3,2.2,0.3,4.5,0.7,6.7c1.1,1.3,4.1,2.3,2.3,4.3
+			c-0.5,0.2-1.5,0.5-2,0.7C14.2,650.7,13.2,648.2,11.6,646.1z"/>
+		<path class="st3" d="M242,644.1c0.6-1.2,1.3-2.4,1.9-3.6c1,0.7,2.7,0.9,2.9,2.4C245.7,644.6,243.8,644.4,242,644.1z"/>
+		<path class="st3" d="M1722,644.1c-1.3-2.3,0.7-4,3-3.6c0.6,1.3,1.2,2.6,1.8,3.9C1725.2,644.4,1723.6,644.2,1722,644.1z"/>
+		<path class="st3" d="M706,643.2c0.5,0,1.4,0,1.9,0C709.4,645.7,705.1,645.8,706,643.2z"/>
+		<path class="st3" d="M1726.5,645.1c1.5-1.4,3.5-1.9,5.4-2.5c-0.6,1.6-1.2,3.2-1.8,4.8C1728.8,646.9,1727.1,646.7,1726.5,645.1z"/>
+		<path class="st3" d="M142.6,645.8c1.9-1.6,4.4-1.5,6.8-1.4c-0.4,1.7-0.7,3.5-1.1,5.2c-1.9,0.4-4,1.1-5.6-0.4
+			C142.6,648.1,142.6,646.9,142.6,645.8z"/>
+		<path class="st3" d="M497.6,644.4c1.4-1,2.6-0.8,3.5,0.4c-0.6,1.2-1.6,1.6-2.9,1.1C498,645.5,497.7,644.8,497.6,644.4z"/>
+		<path class="st3" d="M713.2,644.1c0.8-1.3,3.4-0.1,2.3,1.3C714.6,646.7,712,645.6,713.2,644.1z"/>
+		<path class="st3" d="M284,648.2c0.7-0.7,1.5-1.5,2.2-2.2c0.4,2.9-1.1,6.7-4.6,5.6c-0.1-1-0.2-2-0.4-3.1
+			C282,648.4,283.4,648.2,284,648.2z"/>
+		<path class="st3" d="M717.2,647.2c1.6-0.5,2.2,0,1.7,1.7C717.2,649.3,716.7,648.8,717.2,647.2z"/>
+		<path class="st3" d="M0,648.8c1.1,0.3,2.2,0.7,3.3,1c0.2,0.3,0.5,0.9,0.7,1.2c-0.3,1.3-0.6,2.6-1,3.9c-1-0.7-2-1.4-3-2.2V648.8z"
+			/>
+		<path class="st3" d="M474.5,650.8c0.4-0.3,1.1-0.8,1.4-1.1c0.7-0.1,2.2-0.2,2.9-0.2c-0.3,0.5-0.9,1.5-1.2,2
+			c-0.9,1.5-2,2.9-3.1,4.4C474.5,654.2,474.5,652.5,474.5,650.8z"/>
+		<path class="st3" d="M150.3,651.3c1.5,0,2.9,0.1,4.4,0.1c0.1,1.8-0.2,4.6-2.7,4C149.6,655.9,150.6,652.7,150.3,651.3z"/>
+		<path class="st3" d="M1727.1,651.3c0.5,0,1.6,0.1,2.1,0.1c0.5,0,1.5-0.1,1.9-0.1c-1.1,1.3-2.3,2.5-3.4,3.7
+			c-0.1,0.6-0.4,1.8-0.5,2.4c-1.8,0-3.5,0-5.2,0.1c0.8-1.2,1.6-2.5,2.5-3.7C1725.3,653,1726.2,652.2,1727.1,651.3z"/>
+		<path class="st3" d="M1715.7,654.9c-0.5-1.8,0.4-2.7,2.5-2.7l1.2,0.9c-0.1,0.9-0.3,2.6-0.4,3.5
+			C1717.9,656,1716.8,655.5,1715.7,654.9z"/>
+		<path class="st3" d="M1286.3,655.2c1.9-1.3,2.7,0.8,3.4,2.2C1288.1,657.7,1284.7,657.6,1286.3,655.2z"/>
+		<path class="st3" d="M0,656.3c2.2,2.8,2,6.4,0,9.2V656.3z"/>
+		<path class="st3" d="M254.4,660.5c-1.4-1.3-0.6-3.1,0.2-4.4c1.6,0.8,3.2,1.6,4.9,2.4c0.1,0.6,0.2,1.8,0.3,2.4
+			C258,661.1,255.6,662.3,254.4,660.5z"/>
+		<path class="st3" d="M487.6,658c0.9-0.2,1.9-0.3,2.8-0.5c0.4,1.3,0.8,2.6,1.3,3.9c-0.9,1.5-1.8,3-2.7,4.5c1.6,0.9,3.2,1.9,4.9,2.9
+			c-0.2,1.1-0.3,2.2-0.4,3.4c-1,0.4-1.9,0.8-2.8,1.2c-0.4,0.3-1.1,0.9-1.5,1.2c-0.5-0.3-1.5-0.9-2-1.2c-1.1,0-2.3,0.1-3.4,0.1
+			c-0.1-0.8-0.4-2.5-0.5-3.4c-1.2,1.3-5.5,2.4-3.2,4.6c2.2,1.9,4.4,3.9,5.7,6.6c-1,1.2-2,2.4-2.8,3.7c-0.5,0.9-1.1,1.8-1.6,2.7
+			c-1.5-1.4-3.1-2.8-4.8-3.9c-0.1-0.7-0.3-2.2-0.4-2.9c1.7,0.1,3.2,0.6,4.5,1.7c1.1-0.6,2.2-1.3,3.2-1.9c-3.8-2-7.7-4.3-9.9-8.1
+			c0.2-0.3,0.6-1,0.9-1.4c0.7-0.2,2-0.7,2.6-0.9c-0.7-3.4-1.2-6.8-1.6-10.2c1.1,0.7,2.1,1.5,3.2,2.3l0.8,0.7
+			c0.8-0.4,2.5-1.2,3.3-1.5c0.5,1.2,0.9,2.4,1.4,3.7c0.9-0.2,1.8-0.4,2.7-0.5C487.5,662.2,487.6,660.1,487.6,658 M485.6,667.2
+			c-0.6,1.4-1.1,2.8-1.6,4.1c1.4,0.7,2.8,1.3,4.2,2c0.6-1.5,1.2-3.1,1.8-4.7C488.5,668.2,487.1,667.7,485.6,667.2z"/>
+		<path class="st3" d="M150,659.8c2.3-0.1,4.6-0.1,6.8-0.1c0.2,5.5,0.3,11.1-0.5,16.6l-0.3,1.1c-0.5-0.7-1.4-2.1-1.8-2.8
+			c-0.3-0.2-0.8-0.4-1-0.6c-1.3-0.8-2.6-1.5-3.9-2.2c1.8-2.1,4.4-2,6.9-1.4c0.1-2.2,0.3-4.3,0.1-6.4
+			C154.1,662.7,151.5,662,150,659.8z"/>
+		<path class="st3" d="M262.3,663.5c1.1-0.1,2.2-0.1,3.4-0.2c1,2.1,1.9,4.2,2.8,6.4c-1.9-0.1-3.9-0.2-5.8-0.3
+			C262.5,667.5,262.4,665.5,262.3,663.5z"/>
+		<path class="st3" d="M1707.4,663.1c1-1.2,3.3,0.3,2.3,1.7C1708.8,665.8,1706.5,664.4,1707.4,663.1z"/>
+		<path class="st3" d="M1720.8,668.1c0.7-0.3,2.2-0.9,2.9-1.3c1.4,0.1,2.8,0.2,4.3,0.4c0.8,0.5,1.5,1.1,2.3,1.7
+			C1727.1,669.3,1723.7,669.8,1720.8,668.1z"/>
+		<path class="st3" d="M1546.4,669.5c1,0,2-0.1,3.1-0.1c0.1,1.1,0.1,2.3,0.2,3.4c-1.1-0.1-2.2-0.2-3.3-0.3
+			C1546.4,671.5,1546.4,670.5,1546.4,669.5z"/>
+		<path class="st3" d="M506.8,675.8c1.7-1.5,3.9-1.9,6.1-2.3c1.1,0.9,2.2,1.9,3.3,2.9c-1.9,0-3.7,0-5.6,0c-0.1,1.3-0.1,2.6-0.2,4
+			c-0.5,1.4-2.5,2.8-1.5,4.4c2.8-1,5.5-2.2,8.5-2.6c-1.4,1.2-2.8,2.3-4.2,3.5c0.4,1.4,0.8,2.7,1.3,4.1c-1.6,2.1-3.1,4.3-4.5,6.5
+			c-0.5,0.1-1.4,0.4-1.8,0.6c0.2-1.5,0.4-3.1,0.6-4.6c1.2-1,2.4-2,3.6-3c-2.7-1.7-5.2-3.7-7.2-6.3
+			C505.5,680.6,504.4,677.4,506.8,675.8z"/>
+		<path class="st3" d="M1720.8,684.9c4.3-2.6-0.6-8.1,2.2-11c1.6,0.8,1.4,2.9,2.1,4.3c0.8,0.1,1.6,0.2,2.4,0.3
+			c0.3-0.5,0.9-1.6,1.2-2.2c0.7-0.1,2.1-0.3,2.8-0.5c0.4,0.2,1.1,0.6,1.5,0.8v4.3c-1.9,0.1-3.8,0.2-5.7,0.3
+			c-0.7,0.9-1.3,1.8-1.9,2.7c1.2,0.8,2.4,1.9,3.1,3.3c-0.4,0.5-1.1,1.4-1.5,1.9c-1.6,1.5-3.5,2.7-5.4,3.8c0.7-2.4,1.4-4.8,2.1-7.2
+			c-0.9,0.9-1.8,1.8-2.6,2.7c-0.8-0.4-2.3-1-3.1-1.4C1718.9,686.4,1719.9,685.7,1720.8,684.9z"/>
+		<path class="st3" d="M494.5,674.9c2.7,1.2,4.9,3.1,6.8,5.3c-0.5,0.6-1.6,1.8-2.1,2.4c-1.5-1.4-3.1-2.8-4.8-3.9
+			C494.4,677.8,494.5,675.8,494.5,674.9z"/>
+		<path class="st3" d="M1711.5,680.8c2.3-2,5.1-3.3,7.8-4.5c0.2,3.4-2.8,5.5-5.4,7.1C1712,683.8,1711.2,682.9,1711.5,680.8z"/>
+		<path class="st3" d="M1703.4,682.4c-0.6-2.2,0.6-3.8,2.3-5c0.7,0.4,2.1,1.2,2.8,1.7c-0.1,0.6-0.2,1.8-0.3,2.4
+			C1706.6,681.7,1705,682,1703.4,682.4z"/>
+		<path class="st3" d="M6.6,680c1.1-0.5,2.2-1.7,3.4-1c1.9,0.4,1.8,2.6,2.5,4c-4.2,0.9-8.4,1.5-12.5,2.8v-4.6
+			C2.3,681.4,4.9,682.1,6.6,680z"/>
+		<path class="st3" d="M700.2,683c1.7,0.2,3.4,0.8,3.9,2.6c-1.4,0.1-2.7,0.1-4,0.2C700.2,685.1,700.2,683.7,700.2,683z"/>
+		<path class="st3" d="M518.6,686c0.9-1.3,1.7-1.3,2.6,0.1c-0.1,0.5-0.4,1.6-0.5,2.1C519.3,688.1,518.6,687.3,518.6,686z"/>
+		<path class="st3" d="M1711.2,685.5c1.9-1.1,3.1,3.1,0.9,3.3C1710.5,688.7,1710.1,686.5,1711.2,685.5z"/>
+		<path class="st3" d="M1732.2,685.9l0.8-0.3v1.8c-0.3-0.2-0.9-0.5-1.2-0.7L1732.2,685.9z"/>
+		<path class="st3" d="M369.3,690.5c-1.2-3.2,4.2-4.5,5-1.5C374.1,691.8,371.1,690.3,369.3,690.5z"/>
+		<path class="st3" d="M498,692.3c0.2-1.4,0.4-2.8,0.7-4.2c0.4,0.5,1.3,1.5,1.8,2c0.7,1.1,1.3,2.3,2,3.5c-0.9,0.7-1.7,1.4-2.6,2
+			c-1.3,0.1-2.6,0.2-3.8,0.3c0.3-0.5,0.8-1.4,1.1-1.9c0.3-0.2,0.9-0.7,1.2-0.9L498,692.3z"/>
+		<path class="st3" d="M1134.3,690c0.6-0.4,1.9-1.3,2.6-1.7c1.2,2,2.7,3.9,3.7,6c-0.8,0.6-1.7,1.1-2.6,1.6
+			C1135.6,694.9,1135.3,692,1134.3,690z"/>
+		<path class="st3" d="M256.3,691.3c1.5-1,3.4-1.1,5.2-0.9c1,0.7,1,2,1.5,3c-0.8,0.2-2.4,0.7-3.2,0.9c-1.1,0.1-2.1,0.1-3.2,0.2
+			C256.5,693.5,256.4,692.4,256.3,691.3z"/>
+		<path class="st3" d="M516.8,692.8c1.7-1.2,3.5-2.5,5.3-3.6c0.4,0.3,1.2,1,1.6,1.3c-0.2,1-0.5,1.9-0.8,2.9l-0.1,0.3
+			c0.5,2,0.8,4.1,1.1,6.2c-0.3-0.1-0.9-0.3-1.2-0.4c-1.1-1.4-2.2-2.8-3.3-4.1C518.5,694.6,517.7,693.7,516.8,692.8z"/>
+		<path class="st3" d="M1709.3,691.6c0.9-0.9,1.9-1.7,2.9-2.5c0.4,1.5,0.8,3.3-0.8,4.2C1710.9,692.9,1709.9,692.1,1709.3,691.6z"/>
+		<path class="st3" d="M273.2,693.3c1.9-0.3,4.3,0.8,5,2.7c-1,1.3-2.7,2-4.3,1.3C272,696.9,270.6,693.9,273.2,693.3z"/>
+		<path class="st3" d="M527.5,693.9c0.7-1.7,2.8-0.5,3.9,0C530.7,695.9,527.9,696.5,527.5,693.9z"/>
+		<path class="st3" d="M1267.1,693.8c0.8,0,1.5,0,2.4,0c0.6,1.5,1.6,2.8,3.2,3.4c-0.4,3.2-1.2,6.4-3.2,9l0.5,0.9
+			c1.2,2,1,4.1-0.7,5.7c-0.8-1.1-1.6-2.1-2.4-3.2c0.8-2,1.6-4.1,1.8-6.3c0.1-2.2,0.1-4.3,0.2-6.5c-0.9-0.3-1.7-0.6-2.6-0.8
+			C1266.5,695.4,1266.9,694.3,1267.1,693.8z"/>
+		<path class="st3" d="M1295.1,693.8c0.6,0.1,1.8,0.4,2.4,0.6c-0.3,1.5-0.6,3-0.9,4.4c-0.2,0.6-0.6,1.8-0.7,2.3
+			c-0.7,0-2-0.1-2.7-0.1C1293.9,698.7,1294.5,696.3,1295.1,693.8z"/>
+		<path class="st3" d="M2.8,696.5c3.1-0.1,6.6-1.6,9.4,0.2c1.7,0.6,1.1,2.6,1.4,4c-1.7-0.3-3.3-0.6-5-0.9c-0.4,0.3-1.3,1-1.7,1.4
+			c-0.3-1.1-0.7-2.2-1-3.3C5,697.4,3.9,697,2.8,696.5z"/>
+		<path class="st3" d="M510.9,697.6c2.2-0.5,4.7-1.9,6.7-0.1c-1.5,1.2-3,2.2-4.6,3.2C512.3,699.7,511.6,698.6,510.9,697.6z"/>
+		<path class="st3" d="M132.8,698.3c2.7,0.1,5.3,0.2,8,0.2c-1.4,1.6-2.6,3.4-4.2,4.8c-1.3,0.2-2.5,0.2-3.8,0.2
+			c-0.1-0.7-0.3-2.1-0.4-2.8C132.5,699.9,132.6,699.1,132.8,698.3z"/>
+		<path class="st3" d="M503.5,699.2c0.8-0.1,2.5-0.3,3.3-0.4c0,1.3,0,3.6-1.9,3.4C502.9,703.1,503.7,700.2,503.5,699.2z"/>
+		<path class="st3" d="M1136.2,699c1.7-0.5,2.2,0.1,1.7,1.7C1136.2,701.1,1135.7,700.6,1136.2,699z"/>
+		<path class="st3" d="M1597.4,700.2c0.4-0.6,1.2-1.8,1.7-2.4c0.6,1,1.2,2.1,1.9,3.2c-0.1-0.5-0.3-1.6-0.3-2.2c2.1,2.2,2,5.6,4,8
+			l-0.1,0.2c-0.6,0.7-1.1,1.3-1.6,2c-0.7,1.2-1.3,2.5-1.9,3.8c-0.4-0.5-1.3-1.4-1.7-1.9l-0.4-0.8c1-1.1,2-2.1,3-3.2
+			c-0.7-1-1.3-1.9-2-2.8c-1.1-0.9-2.2-1.8-3.3-2.7C1596.8,701,1597.2,700.5,1597.4,700.2z"/>
+		<path class="st3" d="M1716,700c1-0.2,2-0.4,3-0.6c0.4,0.7,0.8,1.4,1.3,2.2c-1,0.1-2.9,0.3-3.8,0.4
+			C1716.4,701.5,1716.1,700.5,1716,700z"/>
+		<path class="st3" d="M1275.7,703c1.1-0.8,2.1-1.5,3.2-2.3c0.3,0.6,0.8,1.8,1.1,2.4c-1.4,2.9-2.7,5.9-3.9,9c0.5,0.4,1.5,1.3,2,1.7
+			c-0.3,0.3-0.9,0.9-1.2,1.2c-0.2-0.4-0.7-1.1-0.9-1.5c-0.2-0.3-0.5-0.8-0.7-1.1c-0.4-0.4-1.3-1.3-1.7-1.7c0.1-0.3,0.2-0.8,0.2-1
+			c0.7-1.3,1.6-2.5,2.4-3.6C1276.2,705.3,1275.9,703.8,1275.7,703z"/>
+		<path class="st3" d="M1283.1,709.2c1.4-3.5,3-7.2,6.8-8.5c0.4,0.5,1.1,1.4,1.5,1.9c-2,2.2-3.8,4.5-5.4,7
+			C1285,709.5,1284,709.3,1283.1,709.2z"/>
+		<path class="st3" d="M1702.9,712.8c-0.3-4.1-1.3-8.3,0.3-12.3c-0.1,1.9-0.1,3.9-0.1,5.8c3.9,0.7,7.6,2.5,11.7,2.2
+			c0,0.5-0.1,1.4-0.1,1.9c0,0.4-0.1,1.2-0.1,1.7c-1,4.1-5.3,5.9-7.7,9c-0.8,0.8-1.6,1.5-2.4,2.2c-0.2-0.8-0.4-2.4-0.6-3.1
+			c1.1-1,2.2-2,3.3-3.1c0.6-1.5,1.1-3.1,1.7-4.6c1.6,0.1,3.1,0.2,4.7,0.2C1710.9,709,1705.8,710.5,1702.9,712.8z"/>
+		<path class="st3" d="M488.3,703.7c2-0.9,2.9,1.4,3.9,2.7c0,0.4-0.1,1.1-0.1,1.5c-0.1,0.7-0.2,2-0.3,2.7c-1.6-1.5-3.2-3.1-4.8-4.6
+			C487.3,705.4,488,704.3,488.3,703.7z"/>
+		<path class="st3" d="M1123.2,704.4c1.5,0,2.9-0.1,4.4,0.1c1.7,1.6,0.3,3.7-0.7,5.2c-1.1-0.1-2.2-0.1-3.3-0.2
+			C1123.4,707.8,1123.3,706.1,1123.2,704.4z"/>
+		<path class="st3" d="M1303.4,704.2c1.5-0.1,3.1-0.1,4.7-0.1c-0.6,1.6-1.1,3.3-1.7,4.9c-0.9-0.3-1.8-0.5-2.6-0.8
+			C1303.6,706.8,1303.5,705.5,1303.4,704.2z"/>
+		<path class="st3" d="M1310.3,708.4c0.7,0,2.2,0.2,2.9,0.2l0.6,0.6c-0.1,0.4-0.3,1.1-0.5,1.4c-1.1,0.8-2.3,1.5-3.4,2.3
+			c0.3,1.6,0.6,3.3,0.9,4.9c-0.8-0.4-1.6-0.7-2.3-1c-1.4-0.6-2.8-1.2-4.1-1.8c0.1-1,0.1-1.9,0.3-2.9c0.1-0.2,0.4-0.7,0.5-0.9
+			c1,0,3,0.1,4,0.1C1309.5,710.3,1309.9,709.3,1310.3,708.4z"/>
+		<path class="st3" d="M1563.4,711.9c1.6-1.6,3.3-3.5,5.8-3.6c1,1.5-0.2,2.8-0.9,4.1l-0.2,0.4c-1,1.6-1.9,3.1-2.9,4.7
+			C1564.5,715.7,1563.9,713.8,1563.4,711.9z"/>
+		<path class="st3" d="M1717.9,714.7c0.2-2.3,0.9-4.6,3.1-5.8c0.7,0,2,0.1,2.7,0.1c1,0.8,2,1.6,3.2,2.2c1.6,0.8,3.3,1.4,5,2
+			c-0.3,0.4-0.9,1.2-1.1,1.7c-2.2,2.5-4.4,5.1-4.2,8.7c-0.3,0.9-0.6,1.7-0.9,2.6c-0.9-1.8-1.9-3.8-1.6-5.9c0.1-3.1,2.2-8.3-2.4-8.9
+			c-0.4,0.2-1.1,0.6-1.5,0.8c-2.4,2.1,1.9,3.6,2.9,5.3c-2.4,0.4-4.7,0.4-7.1,0.2c0.3-0.5,0.7-1,1-1.5L1717.9,714.7z"/>
+		<path class="st3" d="M3.5,709.6c5.5-1.2,9.5,5.6,7.6,10.4c-0.9,1.7-3.5,2.1-4.8,0.7c-1.6-0.7,0-2.6,0.2-3.8
+			C5.3,714.6,3.1,712.4,3.5,709.6z"/>
+		<path class="st3" d="M1588.1,711.2c1.6-0.5,2.1,0.1,1.6,1.7C1588.2,713.5,1587.6,712.9,1588.1,711.2z"/>
+		<path class="st3" d="M241.1,715.6c0.6-1,1.2-2,1.8-2.9c2.1,0.3,3.6,1.8,4.2,3.8c-1.5,0.1-2.9,0.2-4.4,0.4
+			C242.3,716.5,241.5,715.9,241.1,715.6z"/>
+		<path class="st3" d="M358.6,713.2c1.1,0.5,2.3,0.9,3.4,1.4c1,0.4,2,0.9,3.1,1.3c-0.8,0.6-1.6,1.3-2.4,1.9
+			c-1.4-0.2-2.9-0.3-4.4-0.5C358.4,715.9,358.5,714.5,358.6,713.2z"/>
+		<path class="st3" d="M134.4,719.5c-0.1-2.7,1.2-6.6,4.7-6c1.5,1.1,1.3,3.2,1.8,4.9C138.8,719.1,136.6,719.5,134.4,719.5z"/>
+		<path class="st3" d="M1108.2,714.3c0.8,0.2,1.7,0.4,2.5,0.6c0.2,0.5,0.6,1.5,0.8,1.9c1.4,0.8,3.1,1,4.8,1.3
+			c-3,0.5-6.1,0.7-9.2,0.6C1107.5,717.2,1107.8,715.7,1108.2,714.3z"/>
+		<path class="st3" d="M1134.2,714.5c1.3,0.3,2.6,0.6,3.9,1c0.3,0.3,0.9,0.9,1.2,1.2c-0.6,0.6-1.9,1.8-2.5,2.3
+			C1135.6,717.7,1134.6,716.2,1134.2,714.5z"/>
+		<path class="st3" d="M1283.9,718.9c-1.5-1.2-0.2-4.8,1.9-3.7c1.4,0.4,1.5,2.1,2,3.2c0.5,0.5,1.5,1.4,2.1,1.9
+			C1287.9,722.7,1285.2,721,1283.9,718.9z"/>
+		<path class="st3" d="M1295.4,715.8c0.5-0.4,1.4-1.2,1.9-1.5c0.5,0.3,1.5,0.9,2,1.2c0.4,1.7,0.6,3.5,0.9,5.2
+			C1297.7,720.2,1296.5,717.9,1295.4,715.8z"/>
+		<path class="st3" d="M1397.2,715.4c0.5,0,1.6,0.1,2.1,0.2c0.1,0.5,0.4,1.6,0.6,2.1c-1.4,0.5-2.9,1-4.3,1.5c-0.3,0.1-1,0.2-1.3,0.3
+			c-0.5-0.1-1.6-0.4-2.1-0.6C1393.9,717.8,1395.5,716.6,1397.2,715.4z"/>
+		<path class="st3" d="M1583.3,716.1c0.5-0.3,1.4-0.8,1.9-1.1c0.9,0.6,1.7,1.2,2.6,1.9c-0.1,0.8-0.4,2.4-0.5,3.2
+			C1585.6,719,1583.5,718.3,1583.3,716.1z"/>
+		<path class="st3" d="M19.2,717.1c2.3-1.2,4.5,3.2,1.9,4.5C18.9,721.4,16.5,718.5,19.2,717.1z"/>
+		<path class="st3" d="M1.2,718c2.7-1.6,4.5,1.4,3.3,3.7c-0.9-0.1-2.7-0.3-3.6-0.4C0.9,720.5,1.1,718.8,1.2,718z"/>
+		<path class="st3" d="M1406.1,719.8c1.3-0.7,2.6-1.3,3.9-2c-0.2,1.9,0.4,5.2-2.2,5.5C1407.1,722.3,1406.5,721.1,1406.1,719.8z"/>
+		<path class="st3" d="M1274.1,719.1c1.4-1.7,2.5,1.3,3.4,2.1c-1.4,0.1-2.8,0.3-4.2,0.3C1273.5,720.9,1273.9,719.7,1274.1,719.1z"/>
+		<path class="st3" d="M1714.2,721.8c1.6-0.4,3.3-0.8,5-1.1l1-0.1c-0.3,0.5-0.9,1.7-1.2,2.2c-0.8,0.9-1.5,1.7-2.3,2.6
+			C1715,725,1714.7,723.3,1714.2,721.8z"/>
+		<path class="st3" d="M1285.7,727.2c-1.8-1.5-4.5-4.1-1.9-6.1c1.2,1.3,2.4,2.6,3.6,4C1287,725.6,1286.1,726.7,1285.7,727.2z"/>
+		<path class="st3" d="M1292.8,726.2c0.6-1.7,1.3-3.4,2.1-5c1.7,1.1,3.5,3,2.6,5.2C1296.1,727.8,1294.3,726.6,1292.8,726.2z"/>
+		<path class="st3" d="M1393,723.3c0.2-0.5,0.7-1.5,1-1.9c1.2,2.4,2.6,4.7,3.9,7c0.2,0.5,0.6,1.5,0.8,2c-0.8-0.2-2.5-0.5-3.3-0.6
+			C1394.5,727.6,1393.7,725.4,1393,723.3z"/>
+		<path class="st3" d="M1115.3,723.4c0.6,0,1.7,0.1,2.2,0.2c1,0.9,2.1,1.9,3.1,2.8c-0.9,0.3-1.7,0.7-2.6,1c-0.7,0.2-2.2,0.7-2.9,0.9
+			c-0.5,0.1-1.6,0.4-2.1,0.5C1113.8,727,1114.6,725.2,1115.3,723.4z"/>
+		<path class="st3" d="M1259.1,723.4c0.4,0.1,1.4,0.2,1.8,0.3c0,0.4,0.1,1.3,0.2,1.8c-0.2,0.4-0.7,1.3-0.9,1.7
+			c-0.8-0.7-1.6-1.4-2.4-2.1C1258.2,724.7,1258.8,723.9,1259.1,723.4z"/>
+		<path class="st3" d="M1266.6,723.6c1.2,1.3,3.8,2.5,2.7,4.6c-0.5,2.4-3.7,1.7-3.9-0.6C1265.8,726.4,1266.2,725,1266.6,723.6z"/>
+		<path class="st3" d="M1330.2,724.3c4.4,2.3,9.3,3.1,14.2,3.3c-2.5,0.1-4.9,0.2-7.4,0.2c-0.8,0.8-1.5,1.6-2.2,2.4
+			c-0.6-1.3-1.2-2.6-1.8-3.9c-1.1,0.7-2.2,1.3-3.3,2.1c-0.6,0.7-1.3,1.5-1.8,2.2c-0.8-0.2-2.4-0.6-3.2-0.9
+			C1324.4,726.6,1328.1,725.7,1330.2,724.3z"/>
+		<path class="st3" d="M1567.1,727.6c1.4-0.9,2.9-1.7,4.4-2.5c0,0.6-0.1,1.9-0.1,2.5c-0.8,0.8-1.7,1.5-2.5,2.3
+			c-0.3-0.1-1.1-0.3-1.4-0.4C1567.4,729,1567.2,728.1,1567.1,727.6z"/>
+		<path class="st3" d="M857.8,727.1c5.3-0.1,10.5-0.1,15.8,0.4c0.1,2.1,0.2,4.2,0.2,6.3c0,3.3-0.2,6.5-0.3,9.8
+			c-11.3-0.5-22.7-0.3-33.9-1.8c4.7-0.4,9.4-0.5,14.1-0.3c5.9,0.4,11.8,1.2,17.8,0.9c0.4-0.1,1.1-0.2,1.5-0.3
+			c0.1-4.6,0-9.2,0.2-13.8c-1.5,0-3.1,0-4.6,0c-1.3,0-2.6,0-3.9-0.1C862.3,728.1,860,727.6,857.8,727.1z"/>
+		<path class="st3" d="M1705.7,729c0.1-1.6,0.9-2.3,2.5-2c0,0.7-0.1,2-0.1,2.6c-0.4,0-1.3,0.1-1.7,0.1L1705.7,729z"/>
+		<path class="st3" d="M1727.2,727.2c1.4-1.1,2.6,1.4,1.3,2.2C1727,730.6,1725.8,728.1,1727.2,727.2z"/>
+		<path class="st3" d="M1733,729c-2.6,1.6-2.6-3.3,0-1.8V729z"/>
+		<path class="st3" d="M1.9,730.8c0.5-1.1,0.9-2.2,1.4-3.2c1.5,1.3,3,2.7,4.7,3.7c4.2-0.2,7.8-2.8,11.6-4.3c0,2,0.1,4.1,0.1,6.2
+			c-2.5,1.1-7.8,1-7.1,4.8c0,1.7,1.9,2.5,2.8,3.7l0.6,0.6c-0.7,0-1.9,0.1-2.6,0.1c0,1.3,0,2.6,0.1,3.9c1.3,0.3,2.6,0.5,3.9,0.8
+			c-1.6,1-3.1,2-4.7,2.9c-1.2-0.4-2.4-0.7-3.5-1.2c1-1.1,2-2.1,3.1-3.2c-0.8-0.5-1.5-1-2.3-1.5c-2.2,1.1-4.5,3.1-7,1.8
+			c0.1-0.7,0.2-2.2,0.2-3c0.3-3.7,1.4-7.7-0.3-11.3L1.9,730.8z"/>
+		<path class="st3" d="M1286.3,728c1,0.6,2.3,1,3.1,2c0.5,2-2.2,1.9-3.4,2.5C1286.1,731,1286.2,729.5,1286.3,728z"/>
+		<path class="st3" d="M1276.8,730.7c1.6-0.9,3.2-1.8,4.9-2.6c-0.2,2.4-0.8,5-3,6.5c-2.1-0.3-4.2-1.1-6.2-1.8
+			c0.1-0.5,0.3-1.3,0.5-1.8C1274.2,730.9,1275.5,730.8,1276.8,730.7z"/>
+		<path class="st3" d="M1294.3,733.3c0.5-1.3,0.9-3.1,2.6-3.3c0.5,1.1,0.7,2.3,0.9,3.6C1296.6,733.6,1295.4,733.5,1294.3,733.3z"/>
+		<path class="st3" d="M1314.3,730.3c1.1-1.4,3.1,0.2,2.8,1.7c0.7,1.9-2,2.6-3.3,2C1313.3,732.6,1313.5,731.4,1314.3,730.3z"/>
+		<path class="st3" d="M105.3,731.2c1.5,0.1,3,0.3,4.4,0.4c-0.5,2.1-1.6,4.4-4.2,4C105.5,734.2,105.4,732.7,105.3,731.2z"/>
+		<path class="st3" d="M357.2,731c3.5,0.9,4,4.3,4.3,7.4c-1.3,0-2.6,0.4-3.8,0C356.2,736.2,357.1,733.5,357.2,731z"/>
+		<path class="st3" d="M594.4,734.7c0-1.5,0-3,0.1-4.5c1.1,0.5,2.2,1.1,3.3,1.7c-0.1,0.7-0.3,2.2-0.4,2.9
+			C596.5,734.7,595.4,734.7,594.4,734.7z"/>
+		<path class="st3" d="M1137,732.2c0.3-0.6,0.8-1.8,1-2.4c1.2,1,2.5,1.9,3.5,3.1c-0.6,2.2-2.8,2.3-4.7,2.7
+			C1136.9,734.7,1136.9,733,1137,732.2z"/>
+		<path class="st3" d="M1398.4,730.7c2.9,2.2,0.2,6.8-3.2,5.5C1396.2,734.3,1397.2,732.5,1398.4,730.7z"/>
+		<path class="st3" d="M1721.5,730.9c0.9,0.2,2.6,0.7,3.4,1c-1,1-2.1,2.1-3.1,3.1c-0.2-0.5-0.7-1.4-0.9-1.9
+			C1721.1,732.5,1721.4,731.4,1721.5,730.9z"/>
+		<path class="st3" d="M1028.5,732.4c2.8-0.3,5.3,0.7,7.3,2.6c-2.1,2.9-5,0.9-7.2-0.5C1028.5,734,1028.5,732.9,1028.5,732.4z"/>
+		<path class="st3" d="M1162.8,733.5c1.2-0.6,2.3-1.3,3.5-2c0.4,0.4,1.2,1.3,1.6,1.8c-0.1,0.9-0.2,1.9-0.3,2.8
+			c-1.2,0-2.4,0.1-3.5,0.2c0.2,0.7,0.7,2,0.9,2.7c-0.2,1.4-0.3,2.7-0.5,4.1c-5.3-0.2-10.6-0.5-15.8-1.2c3.5-0.2,7.1-0.4,10.6-0.3
+			c0.4,0,1.2,0.1,1.6,0.2C1162.2,739.3,1164.6,736.5,1162.8,733.5z"/>
+		<path class="st3" d="M1545.7,733.1c0.4-0.3,1.1-1,1.5-1.4c2.9,0.4,1.3,3.5,0.9,5.2C1547.3,735.7,1546.5,734.4,1545.7,733.1z"/>
+		<path class="st3" d="M1335.3,733.2c1.4-0.4,2.1,0.2,2.1,1.9c-0.3,0.3-1.1,0.9-1.4,1.2C1334.8,735.4,1334.6,734.4,1335.3,733.2z"/>
+		<path class="st3" d="M1541.3,733.9c0.8,0.2,2.3,0.7,3.1,0.9c0.7,1.3,1.4,2.6,2.1,3.9c-1.4-0.2-2.7-0.5-4-1
+			C1542,736.4,1541.6,735.1,1541.3,733.9z"/>
+		<path class="st3" d="M122.2,741.2c-0.2-2.6-0.1-5.3,1.6-7.4c2.5,1.9,2.8,4.6,1.7,7.4c2.1,0,4.2,0.1,6.3-0.1
+			c0.4-1.1,0.8-2.3,1.1-3.4c0.7,0.1,2.1,0.2,2.8,0.2c0.3,0.6,0.8,1.7,1.1,2.2l0.4,0.7c2.8,0.2,5.7,0.2,8.5,0
+			c2.4-0.1,4.8-0.7,7.1-1.5c0.4,0.7,0.8,1.5,1.2,2.2c-10.6,0.4-21.2-0.5-31.8,0.7L122.2,741.2z"/>
+		<path class="st3" d="M1445,739.1c-2.6,2.1-3.1-2.6-0.6-3.1C1444.8,737,1445,738,1445,739.1z"/>
+		<path class="st3" d="M1722.2,738.4c2.4,0.7,1.8,3.3,2.1,5.3c-0.7-0.1-2.1-0.3-2.8-0.4l-0.3-0.9
+			C1721.4,741.5,1721.9,739.5,1722.2,738.4z"/>
+		<path class="st3" d="M332.4,742.5c3.4-0.7,6.8-1.1,10.2-1.1c5.5,0,11-0.3,16.5-0.1c0.9,0,2.6-0.1,3.4-0.1c1.5-0.1,3-0.2,4.5-0.2
+			c9.4-0.4,18.9,0.1,28.3,0c9.4,0.7,18.9-0.3,28.1,1.6c-8.8,1.4-17.6-1.3-26.4-0.8c-10.3,0-20.7,0-31,0.1c-11.5-0.5-22.9,2-34.3,0.8
+			L332.4,742.5z"/>
+		<path class="st3" d="M1716.3,741.2c1,0,1.9,0.2,2.9,0.3c0.1,0.5,0.3,1.6,0.4,2.1c0.1,1.4,0.2,2.8,0.3,4.3c-1,0.6-1.9,1.2-2.9,1.8
+			c-0.4,0.2-1.1,0.7-1.5,1c-0.1,1-0.2,2-0.2,3c0.4,0.2,1.1,0.6,1.4,0.8c1.5,0.6,3.4,1.7,5,0.5c2-1.3,4-2.7,6.6-2.6c0,0.7,0,2,0,2.7
+			l-0.3,0.9c-1.7,0.7-3.3,1.4-5,2.1c-3.9-0.7-8.6-0.1-10.9-4c0.4-0.6,1.2-1.8,1.5-2.3c-1.1-0.8-2.2-1.6-3.3-2.4
+			c0.1-0.2,0.3-0.7,0.4-0.9C1712.7,746.2,1714.5,743.7,1716.3,741.2z"/>
+		<path class="st3" d="M24.2,743c0.9-0.3,1.8-0.6,2.8-0.9c0.4,0.4,1.2,1.1,1.6,1.5c-0.5,1.7-0.6,3.7-2,4.9c-1.4,0.4-2.8,0.3-4.2,0.4
+			c0.3-0.9,0.6-1.8,0.9-2.7C23.6,745.1,23.9,744.1,24.2,743z"/>
+		<path class="st3" d="M1728.8,749.6c1.4,0,2.8,0,4.2,0.1v2.4c-1.4,0.2-2.8,0.3-4.2,0.5C1728.8,751.8,1728.8,750.3,1728.8,749.6z"/>
+		<path class="st3" d="M1708.1,755.6c0.5-0.2,1.4-0.5,1.9-0.6c0.1,1.5,0.2,3,0.4,4.6c-1-0.2-2.1-0.4-3.1-0.6
+			C1707.6,758.1,1707.9,756.4,1708.1,755.6z"/>
+		<path class="st3" d="M1721.2,760.3c4-0.4,7.8-4.4,11.8-1.9v6.1c-2.6,0.4-1.2-3.1-1.7-4.5c-2.8,1.3-5.7,2.8-7.6,5.4
+			c-2-0.8-4.1-1.6-6.1-2.2c-0.9,1.1-1.8,2.2-2.7,3.3c-0.5,0-1.4-0.1-1.9-0.1c-0.2-1.7-0.4-3.5-0.6-5.2c0.9-0.5,1.9-1,2.9-1.5
+			C1717.3,759.7,1719.3,760,1721.2,760.3z"/>
+		<path class="st3" d="M1725.2,766.3c0.8,0.4,1.7,0.9,2.6,1.3c0.9-1,1.8-1.9,2.7-2.9c0.6,3.9,0.7,7.9,1.1,11.8c0.3,0.5,1,1.5,1.4,2
+			v4.6c-0.6-0.2-1.8-0.6-2.3-0.7c-0.1,0.9-0.2,2.6-0.2,3.5c0.7,0.4,1.9,1.2,2.6,1.5v7.4c-0.7,0.1-2.2,0.4-2.9,0.5
+			c0.8,1.6,1.8,3.1,2.9,4.5v2.6c-0.6,1-1.2,1.9-1.8,2.9c-1.5,0-3.1,0.1-4.6,0.4c-0.1,0.9-0.2,1.8-0.2,2.8c0.7,1.2,1.5,2.4,2.3,3.6
+			c-1.7-0.7-3.3-1.4-4.9-2.1l0.2-1.7c0.2-2.3,0.5-4.6,1-6.9c1.3-0.3,2.7-0.6,4-0.8c-0.6-1.6-0.6-3.5-2-4.6c-1.4,0.9-2.6,2-3.7,3.3
+			c-0.4,0.6-1.4,1.9-1.8,2.5c-0.3,0.3-0.9,1.1-1.2,1.4c-1.1-1-2.1-1.9-3.1-2.8c-1.7-1.3-3.3-2.7-4.7-4.4c0.2-2.1,0.5-4.2,0.9-6.3
+			c0.8,0.8,1.6,1.6,2.4,2.4c4.3,1.1,8.7,3.4,13.2,1.6c-1.9-1.2-3.9-2-6.1-2.5c0.6-1.7,1.2-3.5,1.8-5.2c-2.4,0-3.2,1.8-3.7,3.7
+			c-1.6-0.4-3.2-0.7-4.7-1.1c0.2-0.7,0.6-2,0.8-2.7c-0.9-0.6-1.8-1.2-2.7-1.7c0-1.5,0-3.1,0.1-4.6c1.6-0.3,3.4-0.3,4.7-1.6
+			c0.2-2,0.4-4.1,0.5-6.1c-0.4-0.1-1.2-0.3-1.6-0.5c-0.4-0.1-1.3-0.4-1.7-0.6c0-1.4,0.1-2.8,0.2-4.1c0.6-0.1,1.8-0.2,2.3-0.3
+			c0.8,0.8,1.6,1.6,2.4,2.5C1722.8,768.1,1724,767.2,1725.2,766.3 M1727.2,775.3c-2,1.4-0.4,4.8-0.4,6.9
+			C1730.5,783.7,1730.9,774.7,1727.2,775.3 M1725.3,784.6c0.4,1.5,0.7,3.2,1.8,4.4c1.9,1.7,2.9-0.7,3.8-2.1
+			c-0.4-0.6-1.2-1.8-1.7-2.5C1728.2,784.5,1726.3,784.6,1725.3,784.6z"/>
+		<path class="st3" d="M13.1,769c1.1-0.5,2.1-1,3.2-1.6c-0.3,1.8,0.4,4.3-1.4,5.3c-1.8,0.3-3.7,0.3-5.5,0.5c-0.1,0.3-0.3,1-0.3,1.3
+			c-0.2,1.7-0.4,3.5-0.6,5.2c-0.8-0.3-2.5-1-3.3-1.3c0.4-2.5,0.3-5.4,2-7.5C8.8,769.8,11.1,769.7,13.1,769z"/>
+		<path class="st3" d="M1704.7,769.8c2-0.5,4.1-1.1,6.1-1.6c1.1,2.2,2.1,4.5,3.5,6.5c-1.1,0.5-2.3,0.9-3.4,1.4
+			c-0.5,1-0.9,2.1-1.3,3.1c-2.3,0.2-4.6,0.7-6.7,1.8c1.6,1,3.3,1.9,5,2.8c0,0.5-0.1,1.5-0.1,2.1c-2.5,0.6-5.4,1.1-5.1,4.3l0,0.9
+			c-0.1-2.4-0.1-4.7,0-7c0.1-3.1,0.1-6.2,0.2-9.3c0-0.3,0-0.8,0-1.1C1703.4,772.3,1704.1,771.1,1704.7,769.8 M1708.7,772.2
+			c-1.2,0.8-0.2,3.5,1.3,2.3C1711.2,773.7,1710.1,770.9,1708.7,772.2 M1704.4,776.1c-1.1,1.4,1.3,3.2,2.4,1.8
+			C1707.8,776.5,1705.4,774.6,1704.4,776.1z"/>
+		<path class="st3" d="M10.9,780.8c1.2-1.3,2.3-3,4-3.8c1.1,0.2,2,0.7,2.8,1.4c-0.1,1.7-0.7,3.2-1.2,4.8c4.2,1.9,8.9,1.1,13.4,1.8
+			l0.2,1.5c-2.9-0.1-5.8-0.1-8.6-0.1c0.2,0.8,0.4,1.6,0.6,2.4c-3.5-0.1-7.2-0.1-10-2.5c-1.4,0.5-2.7,1-4.1,1.5
+			C8.2,785.3,9.3,782.9,10.9,780.8z"/>
+		<path class="st3" d="M1705.2,796.4c0.8-1.3,1.7-2.6,2.5-3.9c0.2,1.8,0.5,3.6,0.8,5.4c1.1,0.6,2.2,1.3,3.4,1.9
+			c-0.9,1.1-1.8,2.3-2.7,3.5c-1.1-1.2-2.1-2.3-3.1-3.5c-0.2,0.6-0.6,1.9-0.8,2.5c-0.6,0.1-1.9,0.4-2.5,0.5c-0.1-1.9,0-3.9,0.1-5.8
+			c0.4-0.1,1.2-0.2,1.6-0.2L1705.2,796.4z"/>
+		<path class="st3" d="M7.6,804.2c-0.2-4.5,3.3-7.4,6.7-9.8c1.3,0.9,2.7,1.7,4,2.6c-1.7,0.8-3.4,1.6-5.1,2.5l-0.4,0.2
+			c-0.4,1.6-0.8,3.3-1.3,4.9C10.2,805.5,8.8,804.5,7.6,804.2z"/>
+		<path class="st3" d="M0,796.5c1.2,3.6,3.5,6.8,5.8,9.8c-1.8,2-4,0.8-5.8-0.5V796.5z"/>
+		<path class="st3" d="M20.6,797.5c3-0.8,6.2-0.6,9.2-0.2c0,0.5,0,1.5,0.1,2c0,0.6,0,1.8,0.1,2.4c0,4.3-0.5,8.6-0.2,13
+			c-0.8,4.4,3.8,5.5,7,6.6l2.1,0.1c-1.1,1.5-2.5,2.8-4.4,3.3c-0.2-1.2-0.5-2.3-0.7-3.4c-0.9-0.1-2.7-0.4-3.6-0.6l-0.9-1.5
+			c0.4-3-0.1-6-1.2-8.8c-3.6,0-7.1-0.2-10.6,0.3c-1.1,1.3-1.9,2.8-2.7,4.2c-0.5-0.2-1.4-0.5-1.9-0.7c0.5-2.2,0.8-4.5,1.9-6.5
+			c1.2-1.6,3.1-2.4,4.7-3.5C19.7,801.9,20.2,799.7,20.6,797.5z"/>
+		<path class="st3" d="M1711.6,805.1c1-0.9,1.9-2,2.9-2.9c1.2,3.4,0,7-0.3,10.5c-1.1-0.2-2.1-0.4-3.1-0.5c0.8-1.1,1.6-2.2,2.5-3.2
+			c-2.2-0.4-4.3-0.8-6.5-1.2c1-0.6,1.9-1.2,2.9-1.8C1710.5,805.7,1711.3,805.3,1711.6,805.1z"/>
+		<path class="st3" d="M1705.5,812.3c0.7-0.1,2.1-0.4,2.8-0.5c0,0.9,0,2.7,0.1,3.5c-0.5,0-1.6-0.1-2.1-0.1l-1.4-0.8
+			C1704.9,813.9,1705.3,812.9,1705.5,812.3z"/>
+		<path class="st3" d="M1721,812.1c1.4,0.1,3.4-0.1,3.3,2c-2.2,2.1-5.2,1.6-7.9,1c0.1-0.6,0.3-1.7,0.5-2.3
+			C1718.2,812.5,1719.6,812.3,1721,812.1z"/>
+		<path class="st3" d="M22.5,818.2c1.5,0,2.9,0,4.4,0c0,1.2,0,2.3-0.1,3.5c-0.8,0-2.3,0.1-3,0.1l-1.1-0.7c-0.2-0.1-0.7-0.4-1-0.6
+			C22,820,22.4,818.8,22.5,818.2z"/>
+		<path class="st3" d="M1728.3,823.7c-1.5-1.8-3.2-3.8-1.8-6.2c1,0,3,0.1,4.1,0.2c0,0.9-0.1,2.6-0.1,3.5c0.8-0.3,1.7-0.6,2.6-0.9v7
+			c-1.5,0.1-2.9,0.2-4.4,0.4C1728.5,826.3,1728.4,825,1728.3,823.7z"/>
+		<path class="st3" d="M79.8,820.7c11.3-0.1,22.8-1.2,34,0.4c-1.9,0-3.7,0-5.6,0c-3.1,0-6.2-0.1-9.3-0.1c-2,0-4,0-6.1,0
+			c-2.8,0-5.7,0.1-8.5,0.1l-0.8,0c1.3,4.4,4.5,7.6,8.7,9.3c-1.6,1.2-3.6,1.6-5.6,1.6c-0.2-1.4-0.5-2.9-0.7-4.3
+			c-1.8,0.5-3.5,1-5.3,1.6C78.8,826.7,78.1,823.5,79.8,820.7z"/>
+		<path class="st3" d="M1639.9,821c2.7-0.1,5.4-0.4,8.2-0.3c0.4,3.5,4.4,3.7,6.8,5.4c0.8,0.8,1.6,1.6,2.4,2.3c0.6,0.5,1.3,0.9,2,1.4
+			c-0.8,1.8-1.6,3.6-2.3,5.4c1.2-0.8,2.4-1.6,3.7-2.4c0.4,0.3,1.3,1,1.8,1.3c-0.6,1.2-1.2,2.4-1.8,3.6c-1.3,0-2.6,0.1-3.9,0.1
+			c-0.5-2-0.9-3.9-1.5-5.8c-0.4-0.5-1.2-1.5-1.6-1.9c-0.7,1.5-1.4,3-2.1,4.5c-0.9-0.1-2.7-0.2-3.6-0.2c-0.5,0-1.5-0.1-2-0.2
+			c0-0.7,0-2,0-2.6c1.5-0.5,3.1-1,4.8-1.4c0-0.8-0.1-1.6,0-2.3c-3-1.2-5.7-2.9-8.5-4.5c-1.1,1-2,2.1-2.9,3.2
+			c-1.7-0.4-3.4-0.8-5.1-0.8c-3.2,1.6-5,6.2-2.3,9.2c-0.2,1.2-0.3,2.5-0.4,3.7c-2.3,2.5-2.4,5.9-2.3,9.1c0.9-0.3,1.8-0.6,2.7-0.8
+			c0.6-0.2,1.8-0.6,2.4-0.8c0.3,0.5,0.8,1.6,1,2.1c-2,1.6-4.7,1.7-7.1,2.6h-5.1c2.9-1.3,6.3-3.6,4.8-7.3c0.3-0.5,0.8-1.5,1-2
+			c-1-1-1.9-2-2.9-2.9c-1.2-1-2.4-1.9-3.5-2.8c0.1-0.5,0.2-1.4,0.3-1.8c-2.8,0.4-5.7,1.1-8.5,0.9c-2.6-1-4.6-3-6.7-4.7
+			c1.1-0.6,2.3-1.1,3.5-1.6c0.3,0.5,1,1.4,1.3,1.8c0.7-0.4,1.5-0.8,2.3-1.2c0.5,0.9,1,1.8,1.5,2.8c1.3-1.3,2.5-2.6,3.8-4
+			c2,2.5,4.2,4.9,6.6,7c0.8-2.7-0.1-5-2.2-6.7c1.7,0,3.5,0,5.3,0c0.1-2,0.2-3.9,0.3-5.9c-1.3-0.6-2.6-1.2-3.9-1.8
+			c1.8,0.1,3.7,0.4,5.6,0.7c-0.4,2.1-0.8,4.2-1.1,6.4c1.4-2.4,2.8-4.8,4-7.3c-0.1,1.5,0.2,2.8,0.9,4.1
+			C1637.6,826.8,1638.7,822.4,1639.9,821z"/>
+		<path class="st3" d="M1658.8,820.7c11.2,0,22.5-0.7,33.7,0.1c-0.8,1.6-1.6,3.3-2.3,4.9c-0.1,2,0.7,3.7,1.9,5.2
+			c-0.1,2.7-2,4.9-4.8,4.7c0.2-2,0.8-3.8,1.5-5.7c-0.3-0.4-1-1.1-1.3-1.5c-0.5-2.6-1.5-5.1-2.7-7.5c-1.7,0-3.4,0-5.1,0
+			c1.2,0.6,2.5,1.3,3.8,1.9c-0.2,2.5,0.5,5.8-2.2,7.3c-1.3-0.1-2.7-0.2-4-0.2c0.5-1.3,1.1-2.6,1.7-3.8c-2.3,0.3-4.5,0.7-6.8,1.1
+			c0.7,1,1.3,2,2.1,3c-0.9,0.5-1.7,1-2.5,1.6c-1.4,1.1-2.7,2.2-4,3.4c-0.7-1-1.4-2.1-2-3.1c0.7-0.7,1.4-1.4,2.1-2.1
+			c-0.4-1.5-0.8-2.9-1.2-4.3c0.5-1.1,0.9-2.3,1.4-3.4c-0.8-0.3-2.3-0.8-3.1-1.1c-0.6,0.9-1.2,1.8-1.8,2.6c-0.5,0.5-1.6,1.4-2.1,1.9
+			c-1.3-0.8-2.6-1.6-3.8-2.5C1657.2,822.3,1658.2,821.6,1658.8,820.7 M1670,821.1c1.2,1.2,2.5,4,4.5,2.3
+			C1676.2,820.2,1671.8,821,1670,821.1z"/>
+		<path class="st3" d="M1716.5,821.1c0.6-0.2,1.9-0.7,2.5-0.9c1.3,1,2.7,2,4,3.1c-1.6,0.6-3.2,1.2-4.7,1.8c0.8,1,1.6,1.9,2.5,2.9
+			c1.1-0.5,2.3-1,3.5-1.4c0.3,0.8,0.8,2.3,1,3.1c-0.9,0.8-1.8,1.5-2.7,2.2c-1.6,0.5-3.2,1-4.8,1.5c-1.2-0.6-2.4-1.2-3.7-1.7
+			c1.2-1.4,2.8-2.6,3-4.5c-0.5-1.8-1.8-3.2-2.9-4.6C1714.8,822.1,1716,821.4,1716.5,821.1z"/>
+		<path class="st3" d="M0,820.6c1.6,1.3,3.4,2.6,5,3.9c-1.7,0.5-3.4,0.9-5,1.4V820.6z"/>
+		<path class="st3" d="M128.5,821c2.1,0,4.2-0.1,6.2-0.2c1,0.8,1.9,1.7,2.9,2.5c-2.5,2.7-6.1,1.4-9.2,1c-0.8,1-1.6,2-2.4,3
+			c-0.5,0-1.6-0.2-2.1-0.2c-0.6-0.2-1.8-0.8-2.4-1c0.5-1,1-2,1.5-3C124.8,822.5,126.7,821.8,128.5,821z"/>
+		<path class="st3" d="M157.7,820.8c0.2,0,0.6,0,0.9,0c1.9,2.5,1,8.4-3.2,6.6C155.5,825,156.5,822.8,157.7,820.8z"/>
+		<path class="st3" d="M238.4,820.6c1.6,0,3.2,0,4.8,0.1c0.1,1.3,0.2,2.6,0.3,3.9c-1.7-0.4-3.3-0.8-5-1.2
+			C238.5,822.8,238.4,821.3,238.4,820.6z"/>
+		<path class="st3" d="M318.1,820.9c1.5,0,3,0,4.5,0c1.2,1.8,2.4,3.6,3.6,5.5c-0.9,0.3-2.6,0.8-3.4,1.1c-0.6-0.7-1.3-1.5-1.8-2.3
+			C320.1,823.7,319.3,822.1,318.1,820.9z"/>
+		<path class="st3" d="M1245.5,821c1.3,0,2.6,0,3.9,0c1.2,1.1,2.4,2.3,3.5,3.6c0.8,1.8,1.5,3.8,2.3,5.7c2.9,0.2,5.9,0.4,8.8,0.9
+			c-1.6,0.5-3.1,0.9-4.7,1.4c0.1,1,0.4,3.1,0.6,4.1c-0.6-0.1-1.8-0.3-2.4-0.3c-2.4,0.1-2.4-2.7-3.3-4.3c-0.4,1.6-0.9,3.3-1.3,4.9
+			c-1.2-0.4-2.3-0.7-3.4-1c0.8-3.7,2.1-7.3,2.4-11.1c-2.1-0.9-4.1-1.9-6.4-2C1245.5,822.3,1245.5,821.4,1245.5,821z"/>
+		<path class="st3" d="M1335.2,821c1.7-0.1,3.5-0.1,5.3,0l1.5,0.1l1.4,0.1c0.1,1,0.2,2.1,0.3,3.1c0.6,0.3,1.8,1,2.5,1.3
+			c-1.2,4.3-5.4,6.7-8.8,9.1c0.1,0.3,0.4,1,0.6,1.3c0.2,0.5,0.6,1.4,0.8,1.8c-0.5,0.4-1.3,1.2-1.8,1.6c-0.9-1.5-1.8-3-2.8-4.5
+			c2.2-2.4,5.4-4,6.9-6.9C1339.8,825,1335.5,824.5,1335.2,821z"/>
+		<path class="st3" d="M1348,821.2c0.7-0.1,2.2-0.2,3-0.3c-0.9,1.9,1.7,3.9,3,2c0.1,0.5,0.2,1.5,0.2,2.1c0.8-1.2,1.6-2.5,2.5-3.7
+			c-0.6,3.1,1.3,7.6-2.1,9.4c-2.1,1.4-4.7,1.6-7.2,1.8c-0.1,1.2-0.2,2.5-0.2,3.8c-1.5-1.4-3-2.8-4.1-4.5c1.2-1.5,3.2-1.2,4.9-1.3
+			c0.1-1.1,0.1-2.2,0.2-3.2c0.9,0.7,1.8,1.4,2.8,2.1c1-1,2-2,2.7-3.3c-1.6-0.5-3.1-0.8-4.6-1.4
+			C1348.8,823.5,1348.4,822.3,1348,821.2z"/>
+		<path class="st3" d="M1562,820.8c0.6,0,1.8,0,2.4,0l0.1,1.4c0.1,1.5,0.2,3.1,0.5,4.6c2,1.4,4.2,2.4,6.3,3.5
+			c-1.8,0.3-3.5,0.5-5.2,0.8c-0.8-0.5-1.5-1-2.2-1.5c-1.9-0.1-3.7-0.6-5.1-1.8c1.1-0.7,2.2-1.3,3.4-1.9l0.5-0.2
+			c-0.1-0.4-0.2-1.3-0.2-1.7C1562.3,823.2,1562.1,821.6,1562,820.8z"/>
+		<path class="st3" d="M1582.1,821c0.4,0,1.2,0,1.6,0.1c0.1,1.1,0.1,2.3,0.2,3.4c2.8-0.1,5.5,0.2,8.2,1c-0.6,1.2-1.3,2.4-1.9,3.5
+			c-0.5-0.1-1.5-0.5-1.9-0.6c-1.7-0.7-3.3-1.5-4.9-2.2c-1.3,1.8-2.8,3.7-5.2,3.9C1578.4,826.7,1580.2,823.7,1582.1,821z"/>
+		<path class="st3" d="M1175.6,825.5c0.6-1.4,1.2-4.3,3.3-3.3c0.8,2.1,0.7,4.6-1.1,6.2l-1.1,1.3
+			C1176.2,828.3,1174.9,827,1175.6,825.5z"/>
+		<path class="st3" d="M1326.3,823.1c0.7-0.5,2.1-1.4,2.8-1.9c0.3,0.4,0.9,1.3,1.2,1.7c-0.4,1.3-0.8,2.6-1.2,3.9
+			C1328.1,825.6,1327.2,824.3,1326.3,823.1z"/>
+		<path class="st3" d="M1554,823c1.6-1.5,4.7-1.9,5.2,0.9C1557.4,823.9,1555.6,823.9,1554,823z"/>
+		<path class="st3" d="M1705.6,826c1.1-1.9,1.8-5.2,4.8-4.5c0,1.4-0.1,2.8-0.1,4.2c-0.4,1.8-0.9,3.6-1.4,5.4c-1.4-1.1-2.7-2.2-4-3.3
+			C1705,827.3,1705.4,826.4,1705.6,826z"/>
+		<path class="st3" d="M51.8,823c2.2,0.6,5.3,0,6.7,2c-0.8,2.6-4.7,1-6.8,1.1C51.8,825.3,51.8,823.8,51.8,823z"/>
+		<path class="st3" d="M1696.8,824.2c1.3-1.1,3-1,4.7-1.2c-0.3,1-0.6,2-0.9,3c1.3,1.3,2.6,2.5,4,3.7c-0.7,0.7-1.4,1.5-2,2.3
+			c-1.3-1.6-2.7-3.3-4.8-3.8c-1.6,1.7,0.4,3.4,1.1,5c-2.2,0.8-3.7-1.2-5.3-2.3l0.5-1.4c0.8-0.8,1.6-1.5,2.4-2.2
+			C1696.5,826.5,1696.7,824.9,1696.8,824.2z"/>
+		<path class="st3" d="M1313.1,829c0.3-1.6,0.7-3.1,1-4.7c0.7,1.1,1.4,2.3,2.2,3.4c2.9,0.8,6,0.6,9,1.1c0.6,1.2,0.8,2.6,1.2,3.9
+			c-1.6,1-3.1,2.1-4.6,3.2c1.2,1,2.5,2,3.8,3c-0.5,3.4-1.2,6.8-2.4,10.1c0.5,0.7,1.1,1.4,1.7,2.1h-4.6c-0.3-0.4-0.9-1.2-1.2-1.7l0-1
+			c1.3-0.9,3.3-1.2,4.1-2.8c0.4-2.2,0.2-4.5,0.1-6.7c-1.9,1.7-3.4,3.9-4.1,6.4c0-0.9,0-2.8,0-3.7c-1.5,0.4-2.9,0.8-4.3,1.2
+			c1.5-1.1,3-2.2,4.5-3.4c0.5-2.8-1.2-5.2-2.5-7.5c-1,2-1.9,4.1-3,6.1c-2.3,2.2-4.5,4.7-3.5,8.2c-0.7-1.7-1.4-3.3-2.2-5
+			c-0.7,0.6-1.4,1.3-2.1,2c0.2-1.2,0.4-2.4,0.3-3.7c-1.6-1.7-4-2-6.2-2.6c0.1,2.2,0.3,4.3,0.3,6.5c0,0.8-0.2,2.3-0.2,3.1
+			c1.1,0.4,2.2,0.8,3.2,1.2c-1.5,1.2-3.1,2.3-4.6,3.4h-3.4c1-0.6,2-1.2,3-1.8c-3-2.9-4-6.9-3-10.8c0-2.2-1.3-4-2.4-5.7
+			c0.6-0.1,1.9-0.4,2.5-0.6c0.7,1.1,1.4,2.3,2.1,3.4c1.6-1,3.2-1.9,4.9-2.8c1.6,3.3,4.7,5.4,7.7,7.3c1.4-1.8,0.2-3.4-0.9-4.9
+			c-0.2-1.6-0.3-3.2-0.4-4.7c-1.6,0.3-3.1,0.6-4.6,0.9c-0.5-0.2-1-0.4-1.4-0.5c1-0.7,2.1-1.4,3.2-2.1c0.6-0.2,1.8-0.6,2.4-0.8
+			C1310.2,828.2,1311.7,828.6,1313.1,829 M1310.3,834.3c1,0.9,2.1,1.7,3.2,2.6c0-1.5,0-2.9,0.1-4.4c3.5-2.6,7.3,0.7,10.9,1.3
+			c0.3-1.3,0.7-2.7,1.1-4c-3-0.1-5.9-0.4-8.7-1.3C1314.6,830.4,1312.3,832.2,1310.3,834.3z"/>
+		<path class="st3" d="M1567,826.9c0-1.8,0.6-3.1,2.7-2.9c0,0.7,0.1,2,0.1,2.7C1569,826.7,1567.7,826.8,1567,826.9z"/>
+		<path class="st3" d="M108.8,825.4c1.5,0,3.1,0,4.6,0c0.8,2.2,1.4,4.5,2.7,6.5c1.9,1.3,4,2,6.1,3.1c-0.1,0.4-0.2,1.2-0.3,1.6
+			c-0.8,1.8-1.7,3.5-2.6,5.3c-3.2-5.1-5.4-12.1-11.9-13.7C107.9,827.3,108.4,826.3,108.8,825.4z"/>
+		<path class="st3" d="M223.5,826.3c1.4-0.4,2.7-0.8,4.1-1.2c0,1.1,0.1,2.2,0.1,3.3c-1.3,0.4-2.7,0.8-4,1.3
+			c-0.6,1.3-1.2,2.7-1.8,4.1c-1.5-0.2-3-0.3-4.5-0.4c0.4-1.6,0.7-3.2,1.1-4.8c1.2-0.1,2.3-0.2,3.5-0.3
+			C222.4,827.8,223.1,826.8,223.5,826.3z"/>
+		<path class="st3" d="M142.6,826.6c1.4-0.1,2.9-0.3,4.4-0.4c0.1,0.7,0.3,2.1,0.5,2.9c-1.2,1.9-3.4,1-5.2,0.9
+			C142.3,828.8,142.5,827.7,142.6,826.6z"/>
+		<path class="st3" d="M186.9,828.1c0.7-1.1,1.5-2.2,2.3-3.2c0.7,2,1.2,4,1.3,6.1C189.2,830.1,188,829.2,186.9,828.1z"/>
+		<path class="st3" d="M1218.6,829.1c1.3-0.9,3-4.3,4.5-2.1c0.4,1.5-0.2,3-1.2,4C1220.3,831.5,1219.5,829.8,1218.6,829.1z"/>
+		<path class="st3" d="M1297.1,826.6c1-0.5,2-1,3-1.4c0.1,1.9,0.2,3.8,0.3,5.7c-1.2-0.2-2.3-0.4-3.4-0.6c-0.8-0.8-1.5-1.5-2.2-2.3
+			C1295.3,827.6,1296.5,827,1297.1,826.6z"/>
+		<path class="st3" d="M1376.8,829.8c0.1-1.6,0.4-3.2,0.8-4.8c0.8,0.4,2.3,1.3,3.1,1.7c-0.3,2-0.8,3.9-1.9,5.6
+			C1378.2,831.7,1377.3,830.5,1376.8,829.8z"/>
+		<path class="st3" d="M1541.4,828.2c0.4-0.8,1.2-2.4,1.6-3.1c0.7,1.1,1.9,2.2,1.8,3.8C1543.6,829.4,1542.4,829.2,1541.4,828.2z"/>
+		<path class="st3" d="M1660.1,829.1c-0.4-1.1-0.2-3.9,1.5-3c0.6,1.2,0.4,2.2-0.8,3L1660.1,829.1z"/>
+		<path class="st3" d="M13.1,827.2c1.9-0.5,3.1,2.4,1.8,3.7c-3,3.1-7.6,6.7-11.8,3.3c1.3-1.6,2.6-3.4,4.8-3.6
+			C10.2,830.3,11.5,828.4,13.1,827.2z"/>
+		<path class="st3" d="M97.4,830.4c0-1.3,0.1-2.6,0.1-3.8c1.5,0.4,3,0.8,4.5,1.2c-0.3,0.6-0.8,1.7-1.1,2.2
+			C100.1,830.1,98.3,830.3,97.4,830.4z"/>
+		<path class="st3" d="M349.2,827.2c1.6-0.2,3.5,0.1,4.2,1.9c-0.3,1.7-1.9,2.5-3.5,2.2C348.9,830.1,348.4,828.6,349.2,827.2z"/>
+		<path class="st3" d="M1181.7,827.8c3.5-0.4,6.5,2.3,10.1,1.9c-0.7,1.6-1.3,3.4-3.1,4.1c-1.9-2-4.6-2.8-7.1-3.8
+			C1181.7,829.4,1181.7,828.3,1181.7,827.8z"/>
+		<path class="st3" d="M39.2,829.6c3-0.8,6.2-0.9,9.1,0.4c0.3,2.3,0.3,4.7,0.1,7c-0.1,1.2-0.6,4.1-2.4,3.2c-1.7-2.6-1.6-6.5-5.1-7.6
+			C40.3,831.6,39.7,830.6,39.2,829.6z"/>
+		<path class="st3" d="M1267.4,829.7c0.4-0.1,1.3-0.2,1.8-0.3c0.8,0.8,1.5,1.6,2.3,2.5c0.4,0.4,1.1,1,1.4,1.4
+			c0.5,0.4,1.6,1.3,2.1,1.8c-1.1,2-3.4,3.5-5.1,1.4C1269.1,834.1,1268.2,831.9,1267.4,829.7z"/>
+		<path class="st3" d="M1385.3,833.6c-2.7-2.4,2.2-3,3.6-4.2C1388.3,831.3,1388.1,834.2,1385.3,833.6z"/>
+		<path class="st3" d="M1599,830.5c0.5-0.4,1.4-1.3,1.9-1.7c0.9,0.8,1.8,1.7,2.8,2.5c0.6,0.5,1.2,1,1.9,1.5c0.9,0.7,1.9,1.4,2.9,2.1
+			c-0.2,1.9,1.4,5.6-1.4,6c-1.8-1.6-2.8-3.9-4-6C1601.6,833.5,1600.2,832,1599,830.5z"/>
+		<path class="st3" d="M1633.8,832c-0.7-2.7,2.5-3.6,4.2-2C1641.1,832,1634.3,835.3,1633.8,832z"/>
+		<path class="st3" d="M64.4,830.8c0.7-0.4,2.1-1.2,2.8-1.6c2.5,1.8,4.2,4.3,4.6,7.5c1.9,0.5,3.8,1,5.6,1.5
+			c-0.3,1.4,0.2,3.4-1.7,3.6c-3.5,0.8-8.3,2.9-10.9-0.6c1.3-1.1,2.5-2.2,3.8-3.2c-3.2-0.6-4.7-3.1-4.4-6.3L64.4,830.8z"/>
+		<path class="st3" d="M378.1,838c-2.1-2.2-2.5-6.9,0.8-8.2C381,832.1,380.9,836.7,378.1,838z"/>
+		<path class="st3" d="M1359.3,830l0.6-0.9c2.6,0.7,0.8,3.8,0.8,5.7c-0.7,1.5-0.3,5-2.8,4.7C1355.2,836.6,1358.9,833.2,1359.3,830z"
+			/>
+		<path class="st3" d="M1593.1,830.5c1.3-1.1,2.6,1.4,1.4,2.3C1593.2,833.9,1591.9,831.4,1593.1,830.5z"/>
+		<path class="st3" d="M1200.4,831.3c1-1.2,2.9,0,2.9,1.4c-0.6,0.3-1.7,0.9-2.3,1.3C1200,833.3,1199.8,832.4,1200.4,831.3z"/>
+		<path class="st3" d="M1213.8,830.4c0.6,1,1.1,2.1,1.7,3.2c-0.3,0.3-1,0.8-1.4,1.1c-1.7,1.1-3.4,2.2-5.2,3.1c-1-0.5-1.4-1.5-2-2.3
+			c0.4-0.5,1.3-1.4,1.7-1.9c1,0,2.1,0,3.1,0l0.3-0.5C1212.5,832.5,1213.3,831.1,1213.8,830.4z"/>
+		<path class="st3" d="M1280.8,831.3c1.5-0.3,2.9-0.5,4.4-0.8c0.4,0.3,1.1,1,1.5,1.3c0.3,0.4,1,1.3,1.3,1.8c0.3,1.3,0.6,2.5,0.9,3.8
+			c-1.9-0.2-3.6-1-5.1-2.2c-1.2-0.9-2.5-1.8-3.8-2.6C1280.3,832.3,1280.7,831.6,1280.8,831.3z"/>
+		<path class="st3" d="M54,834.9c0.9-2.5,4-2.3,6.1-2.9c-1,1.9-2.2,3.8-3.3,5.7l-0.5,0.9c-1.2,1.9-2.3,4.1-1.1,6.3
+			c0.8,3.3,4.8,1.2,7.1,1.5c-0.8,1.8-1.9,3.4-3.5,4.6h-5.6c-0.8-1.6-1.6-3.2-2.4-4.8C52.6,842.7,52.9,838.7,54,834.9z"/>
+		<path class="st3" d="M135.8,834.1c0.7-1,1.4-1.9,2.2-2.8c2.9,1,2.9,3.8,2.3,6.4C138.7,836.8,135.7,836.6,135.8,834.1z"/>
+		<path class="st3" d="M1729.3,831.3c1.2,1.1,2.4,2.3,3.6,3.5l0.1,0.9v3.1c-1.6-0.1-3.2-0.3-4.8-0.4c-0.1,2.8,1.6,4.6,4.1,5.7
+			c0,0.7,0.1,2,0.2,2.7l-1,0.2c-0.6,0.1-1.8,0.4-2.4,0.5c-0.3-0.6-0.9-1.8-1.2-2.5c-1.5-2.1-2.9-4.3-3.6-6.8
+			c1.3-0.6,2.7-1.2,4.1-1.8C1728.6,834.6,1728.9,832.9,1729.3,831.3z"/>
+		<path class="st3" d="M1676,834.8c2.2-0.5,4.3-1,6.5-1.6c0.1,0.4,0.3,1.2,0.4,1.6c0,0.6-0.1,1.9-0.2,2.5c-1.6,0.2-3.2,0.5-4.7,0.7
+			c-1.8-0.1-4.6,1.1-5.4-1C1673.4,836,1674.8,835.5,1676,834.8z"/>
+		<path class="st3" d="M1705.7,833.9c1.1-0.3,2.2-0.6,3.3-0.8c-0.1,2.1-0.4,4.3-0.9,6.4c-0.6-0.3-1.8-1-2.3-1.4
+			C1705.7,836.7,1705.7,835.2,1705.7,833.9z"/>
+		<path class="st3" d="M31.6,836.3c1.1-1.1,2.3-2.2,3.4-3.2c2.4,0.8,3.9,2.6,3.8,5.2C36.2,838.5,33.6,838.2,31.6,836.3z"/>
+		<path class="st3" d="M1014,835.7c1.6-1.2,3.7-1.4,5.6-1.4c0,0.7,0,2.1,0,2.8C1017.6,837.5,1015.7,836.8,1014,835.7z"/>
+		<path class="st3" d="M1542.5,834.3c0.8,1.3,1.5,2.6,2.3,3.9c1.1-0.9,2.2-1.9,3.3-2.8c0.1,1.7,0.2,3.3,0.3,5
+			c-1.3,0.1-2.5,0.2-3.8,0.3c-0.3-0.7-1-2-1.4-2.7c-0.8-0.7-1.6-1.3-2.3-2C1541.3,835.7,1542.1,834.8,1542.5,834.3z"/>
+		<path class="st3" d="M1567,834.9c0.1-1.9,2.8-1.5,3.2,0.1l-0.3,0.8C1568.4,836.5,1567.5,836.2,1567,834.9z"/>
+		<path class="st3" d="M8.5,837.9c4.6-4.7,11.4-2.7,16.9-1.4c2,1.9,3.9,3.8,6.5,4.6c2.1,0.4,1.2,2.8,1.5,4.3
+			c-2.9,0.2-5.8-0.2-8.6-1.3c-0.1-0.6-0.2-1.9-0.3-2.5c-3.1,2.1-5.1-1.3-7.1-3.2c-1.3,0.1-2.5,0.1-3.8,0.2c-0.2,1.3-0.4,2.6-0.5,3.9
+			C10.4,842.9,7.6,841,8.5,837.9z"/>
+		<path class="st3" d="M170.2,835.4c4.1-1.8,6.4,3.4,4.9,6.6c-0.8,0.9-1.6,1-2.6,0.5C170.6,840.7,170.7,837.8,170.2,835.4z"/>
+		<path class="st3" d="M197.5,839.6c-2-1.5-0.3-3.8,0.3-5.5c1.4,1,3.5,1.9,3.4,4C200.5,839.4,198.9,840,197.5,839.6z"/>
+		<path class="st3" d="M1134.2,840.1c0.2-1.7-0.3-4,1.7-4.8c0.6,0,1.9-0.1,2.5-0.1c0.1,0.7,0.2,2.1,0.3,2.8l0.1,0.9
+			c-0.3,0.4-1,1.2-1.4,1.6C1136.4,840.4,1135.3,840.2,1134.2,840.1z"/>
+		<path class="st3" d="M1239.6,834.7c1.5,0,3,0.1,4.5,0.2c-0.3,1-0.6,2.1-0.8,3.2c-0.9,1-1.9,1.9-2.8,2.9
+			C1239.9,838.9,1239.6,836.8,1239.6,834.7z"/>
+		<path class="st3" d="M1348.1,838.2c1.4-1,2.7-2.1,4.1-3.1c1,1.2,4.2,4.7,1,5C1351.5,839.4,1349.8,838.7,1348.1,838.2z"/>
+		<path class="st3" d="M1235,835.6c0.7,0.1,2.1,0.3,2.8,0.4c-0.2,1.1-0.4,2.3-0.5,3.5c-0.6,0.2-1.7,0.5-2.2,0.7
+			c-0.2-0.7-0.5-2-0.6-2.6C1234.6,837,1234.9,836,1235,835.6z"/>
+		<path class="st3" d="M1490.5,836.3c1.2-1.5,3.8,0.9,2.2,2.2C1491.3,839.7,1489.2,837.7,1490.5,836.3z"/>
+		<path class="st3" d="M1562.3,836.2c0.7-0.1,2.1-0.2,2.8-0.3c-0.1,0.4-0.3,1.3-0.4,1.7l-0.7,0.6
+			C1562.5,838.3,1561.9,837.6,1562.3,836.2z"/>
+		<path class="st3" d="M1574,835.9c0.8,0,2.3,0.1,3.1,0.1c-1,1.7-2,3.3-3.1,4.9c-0.8,0.3-1.5,0.6-2.2,1c-0.5,0.5-1.5,1.5-2,2
+			c0-0.6,0-1.2,0.1-1.8c0.2-0.3,0.6-1,0.8-1.3C1571.7,839.1,1572.6,837.3,1574,835.9z"/>
+		<path class="st3" d="M1634.8,837c0.5-0.2,1.4-0.7,1.8-1c0.8,0.1,2.2,0.3,3,0.4c1.5,0.2,2.9,0.2,4.4,0.4c-0.5,2.5-2.5,3.6-4.9,4
+			C1637.6,839.5,1636.2,838.2,1634.8,837z"/>
+		<path class="st3" d="M1699.4,835.8c3,1,0.7,3.2-0.3,4.9c-0.5,0.1-1.3,0.2-1.8,0.2c-1.3-0.5-2.6-1-3.8-1.5c0-0.5-0.1-1.5-0.1-2
+			c0.7-0.2,2-0.6,2.7-0.8c0.5,0.3,1.4,1,1.9,1.3C1698.2,837.4,1699,836.3,1699.4,835.8z"/>
+		<path class="st3" d="M0,836.7c1,1.2,2,2.4,3.2,3.5c0.9,0.7,1.8,1.3,2.7,2c-2.4,1.2-4.9,2.4-5.9,5.1V836.7z"/>
+		<path class="st3" d="M1715.9,837.6c1.7-0.3,3.4-0.6,5.1-0.9l0.1,1.4c-1.8,2.9-5.4,2.3-8.3,2.3l-1.3-0.1c0.4-0.5,1.1-1.6,1.5-2.1
+			c0.6-0.1,1.7-0.4,2.2-0.5C1715.4,837.7,1715.7,837.6,1715.9,837.6z"/>
+		<path class="st3" d="M1483.6,838.9c0.6-0.3,1.7-0.9,2.3-1.2c0.8,0.8,1.5,1.7,2.3,2.5c1.1,1.2,2.2,2.5,3.2,3.8c-1,0-3-0.1-3.9-0.1
+			c-0.7,0-2,0.1-2.6,0.1C1484.4,842.3,1484,840.6,1483.6,838.9z"/>
+		<path class="st3" d="M91.5,839.3c0.8,0.1,1.7,0.2,2.6,0.4c0.9,2.4,2,4.7,3.1,7c0.9,1.5-0.9,2.8-1.3,4.2c-0.5-1.1-1.1-2.2-1.4-3.4
+			c-0.1-2.2-1.7-3.5-3.2-4.7C91.3,841.6,91.4,840.5,91.5,839.3z"/>
+		<path class="st3" d="M125.2,839.3c2.4,0.3,2.2,3,2.8,4.8c-1.8-0.4-3.5-0.8-5.2-1.4C123.6,841.5,124.4,840.4,125.2,839.3z"/>
+		<path class="st3" d="M1181.8,839.4l1.1,0c1.7,0,3.4,0,5.2,0.1c-0.6,1.4-1.2,2.7-1.7,4.1c-1.6-0.7-3.2-1.4-4.9-2.1
+			C1181.6,840.8,1181.7,840.1,1181.8,839.4z"/>
+		<path class="st3" d="M1287.3,839.5c0.6-0.2,1.8-0.6,2.4-0.8c0.1,0.7,0.3,2.1,0.4,2.7c-1.1,0-2.3,0.1-3.4,0.1
+			C1287,841.1,1287.2,840,1287.3,839.5z"/>
+		<path class="st3" d="M1594.2,841.3c1-0.8,2-1.6,3.1-2.3c1,0.3,1.9,0.6,2.9,1c0.1,0.5,0.2,1.5,0.3,2c-0.4,0.4-1.1,1.2-1.5,1.6
+			C1597.3,842.9,1595.7,842.2,1594.2,841.3z"/>
+		<path class="st3" d="M1611.1,839.3c0.7-0.1,2.1-0.3,2.8-0.4c1.2,1.1,2.9,2.2,2.3,4.1C1613.7,842.9,1612.3,841.1,1611.1,839.3z"/>
+		<path class="st3" d="M133.4,845.5c0.4-2,1-4,1.6-5.9c0.8,0.1,2.3,0.3,3.1,0.4c0,1,0.1,2,0.1,3c0,2.3,0.4,4.6,1.8,6.5
+			c-1-1.2-3.6,0-2.3,1.5h-1.6c0.2-0.8,0.7-2.5,1-3.4C135.9,846.9,134.6,846.2,133.4,845.5z"/>
+		<path class="st3" d="M1360.6,841c0.7-0.2,2-0.6,2.6-0.8C1364.8,842.8,1360.2,844.3,1360.6,841z"/>
+		<path class="st3" d="M1246.7,842.3c1.1-0.6,2.2-1.3,3.3-1.9c1.7,1.4,2.8,3.2,2.4,5.6C1250.4,845,1248.5,843.7,1246.7,842.3z"/>
+		<path class="st3" d="M1346.2,840.4c1.5,0.3,3,0.8,4.3,1.7c-0.8,2.1-2.3,3.6-4.3,4.6C1346.1,844.5,1346.1,842.4,1346.2,840.4z"/>
+		<path class="st3" d="M1500.3,841.1c2.2,0.5,4.3,1.3,6.5,2.2c0,0.6-0.1,1.8-0.1,2.5c-2.1-0.1-4.2-0.3-6.2-0.8
+			C1500.4,843.7,1500.4,842.4,1500.3,841.1z"/>
+		<path class="st3" d="M1677,840.8c0.7,0,2.2,0,3,0c0.4,0.3,1.3,1,1.7,1.4c0.3,1.3,0.7,2.6,0.5,4c-1.5-0.9-3.1-1.8-4.6-2.6
+			C1677.5,842.7,1677.2,841.4,1677,840.8z"/>
+		<path class="st3" d="M41.4,842.4c1.2-0.8,3.1-1.5,4,0.2c1,2.7,1.3,5.6,2,8.4h-2.6C44.1,847.9,39.3,845.6,41.4,842.4z"/>
+		<path class="st3" d="M151.6,844c1.5-0.7,3.1-1.4,4.7-2c0.2,0.7,0.7,1.9,1,2.6c2.1,0,5.6-1.4,6.4,1.5c-1.1,2.1-3.6,1.9-5.6,2.5
+			c-1-0.5-2-1.1-3-1.6l-1.1-0.6C153.1,845.5,152.4,844.7,151.6,844z"/>
+		<path class="st3" d="M1278.4,843.8c0.2-0.5,0.7-1.5,0.9-2c0.9,0.1,2.8,0.2,3.8,0.3c0.8,0.6,1.6,1.2,2.4,1.8
+			c-0.2,1.5,0.7,3.9-1.4,4.5c-1.4-0.7-2.6-1.8-3.8-2.8C1279.8,845.1,1278.9,844.2,1278.4,843.8z"/>
+		<path class="st3" d="M1660.1,847c-0.6-1.9-0.4-3.7,0.6-5.4c2.4,0.5,4.8,1.2,7,2.4C1665.2,845.2,1662.7,846.2,1660.1,847z"/>
+		<path class="st3" d="M1673.9,841.5c0.6,0.3,1.8,0.9,2.4,1.2c-0.1,1.2-0.1,2.5-0.1,3.7c1.2,0.5,2.5,1,3.8,1.6
+			c-0.9,0.9-1.9,1.8-2.8,2.7c-1.1-1.8-2.4-3.6-3.9-5C1673.4,844.2,1673.6,842.8,1673.9,841.5z"/>
+		<path class="st3" d="M206.2,844c1.6-0.3,3.2-0.5,4.8-0.8c-0.8,2.4-2.1,4.7-4.8,5.3c-0.4-0.7-1.3-2.2-1.8-2.9
+			C204.8,845.2,205.8,844.4,206.2,844z"/>
+		<path class="st3" d="M294.3,845.2c1.1-0.6,2.2-1.3,3.4-1.9c0.5,0.2,1,0.4,1.5,0.6c0.1,0.8,0.4,2.3,0.5,3c-0.9,1-1.7,2.1-2.6,3.2
+			C296.2,848.5,295.3,846.8,294.3,845.2z"/>
+		<path class="st3" d="M1353.3,845.1c0.2-2.3,2.8-1.8,4.4-2c-0.4,1.2-0.7,2.5-1.1,3.8C1355.4,846.4,1353.6,846.7,1353.3,845.1z"/>
+		<path class="st3" d="M1404.6,843.2c1-1.4,3.7,0.1,2.6,1.6C1406.1,846,1403.5,844.6,1404.6,843.2z"/>
+		<path class="st3" d="M405,847.3c-1.2-1-0.5-2.7-0.4-3.9c1.7,0.3,3.7,0.2,5.1,1.4C410.2,847.5,406.8,847.8,405,847.3z"/>
+		<path class="st3" d="M196,849.1c-2.8-1.2-0.2-3.6,1.1-4.8C198.9,845.8,198.8,849,196,849.1z"/>
+		<path class="st3" d="M1199.4,847c1.7-1.3,4.7-3,5.8,0C1205.6,851,1200.1,849.9,1199.4,847z"/>
+		<path class="st3" d="M112.1,849.2c0.8-1.1,1.6-2.1,2.4-3.2c0.7,1.7,1.3,3.3,2,5h-4.8C111.9,850.5,112,849.6,112.1,849.2z"/>
+		<path class="st3" d="M1648.2,845.9c0.7,0,2.1-0.1,2.9-0.1c0.1,1.3,0.2,2.7,0.3,4c0.4,0,1.2,0,1.6,0c0.5,0,1.4,0,1.9,0
+			c0-0.9,0-2.8,0-3.7c0.9,0,1.8,0.2,2.6,0.3c1.3,1.7-0.6,3.2-1.5,4.5h-8C1648,849.3,1648.1,847.6,1648.2,845.9z"/>
+		<path class="st3" d="M166,847.2c1.8,0.1,3.6,0.2,5.4,0.3c0.1,1.2,0.2,2.3,0.3,3.5h-6.1C165.8,849.7,165.9,848.4,166,847.2z"/>
+		<path class="st3" d="M286.1,851c1.1-1.4,2.1-2.9,3.1-4.3c0.6,0.2,1.9,0.5,2.5,0.7c0,1.2,0.1,2.4,0.1,3.7H286.1z"/>
+		<path class="st3" d="M1446.6,851c0.6-1.5,1.2-3.1,1.9-4.6c0.6,1.1,1.1,2.3,1.3,3.6l-0.4,1H1446.6z"/>
+		<path class="st3" d="M1616.4,848c1.5-0.5,2.9-1,4.4-1.6c-0.2,1.5-0.3,3-0.4,4.6h-2.4C1617.5,850,1616.9,849,1616.4,848z"/>
+		<path class="st3" d="M86.7,851c0.6-1.2,1.2-2.4,2.4-3.1c0.9,1,1.6,2,2.4,3.1H86.7z"/>
+		<path class="st3" d="M147.2,851c1-0.9,1.5-2.4,2.8-2.8c0.7,0.6,1.4,1.2,2.1,1.9l0.9,1H147.2z"/>
+		<path class="st3" d="M410.6,848.4c0.8,0,1.6,0,2.5,0.1c0.4,0.6,1.1,1.9,1.4,2.5H410C410.2,850.3,410.5,849,410.6,848.4z"/>
+		<path class="st3" d="M1371.4,847.9c1.2-0.2,2.5-0.3,3.8-0.5c0,1.2,0.1,2.4,0.2,3.6h-3.2c-0.4-0.5-1.2-1.5-1.7-1.9L1371.4,847.9z"
+			/>
+		<path class="st3" d="M1598.1,848.2C1601.5,848.4,1596.5,851.2,1598.1,848.2z"/>
+		<path class="st3" d="M1703.4,847.7c1.8,0,3.5,0.1,5.3,0.1C1708.3,851,1702.8,851.8,1703.4,847.7z"/>
+		<path class="st3" d="M1508.5,851c2.2-1.7,5.1-1.7,7.8-2.3c0.6,0.8,1.2,1.5,1.8,2.3H1508.5z"/>
+		<path class="st3" d="M1699.4,851c-1.4-2.8,2.9-2.6,2.8,0H1699.4z"/>
+	</g>
+	<g id="_x23_7f8e9fff">
+		<path class="st4" d="M317.2,0h3c-0.3,0.6-0.8,1.8-1.1,2.3c-0.5,0.2-1.7,0.5-2.2,0.7C316.9,2.3,317.1,0.8,317.2,0z"/>
+		<path class="st4" d="M419.1,0h1.1c1.1,1.5,2.2,3,3.3,4.6c-0.1,1.4-0.3,2.8-0.4,4.2c-0.5,0-1.6,0-2.2,0c-1.7-1.6-3.1-3.5-4.7-5.2
+			c-1,1.9-2.1,3.9-3.1,5.8c2,0.4,4,0.8,6,1.1c-1.1,2.9-3.1,5.3-5.9,6.6c-0.3-1.5-0.6-3.1-0.9-4.6c-2.1-2.1-1.9-4.8-1-7.5l-1.2,0
+			c-0.9,0-2.8,0-3.7,0c0.7-1.1,1.4-2.3,2.2-3.4c3-0.6,6,0.6,9.1,0.5C418.1,1.7,418.8,0.6,419.1,0z"/>
+		<path class="st4" d="M543.8,0h3.2c-0.2,1.2-0.3,2.5-0.4,3.7c1.2,0,2.4-0.1,3.6-0.1c-0.8,1.2-1,3.7-3,3.1c-1.5-0.5-2.9-1.5-3.9-2.8
+			C543.3,2.6,543.5,1.3,543.8,0z"/>
+		<path class="st4" d="M1364.1,0h2.7c1.5,1.4,3.8,2.6,3.7,5c-0.7,0.9-1.5,1.7-2.2,2.5C1366.7,5.1,1365.4,2.5,1364.1,0z"/>
+		<path class="st4" d="M1389.1,0h3.4c0.8,2.4,1.6,4.7,2.5,7.1c-1.8-2-4.2-3.2-6.7-4.1c0,1.1-0.1,2.2-0.1,3.3c1,0.4,1.9,0.7,2.9,1.1
+			l0.4,0.3c-0.9,0.6-1.8,1.1-2.7,1.7c-0.3,0.3-0.9,0.9-1.2,1.2c-0.5,1.7-0.9,3.4-1.4,5.1c-0.2-0.2-0.8-0.6-1-0.8
+			c1.6-4.3,1.2-8.9,1.1-13.3C1387.1,1.2,1388.4,0.4,1389.1,0z"/>
+		<path class="st4" d="M1397.2,0h5.5c2.4,1.8,4.8,3.5,7.3,5.2c-2.1,1.7-4.7,2-7.2,2.6c-1.1,0.8-2,1.9-2.9,2.9c1,0,2,0,3.1,0
+			c0.4,0.4,1.1,1.1,1.5,1.5c0,1.3,0,2.7,0.1,4c1.8,0.9,3.5,2.1,4.3,4.1c-4.3,0.8-7.7-4.9-11.7-2.4c-0.1,0.4-0.2,1.2-0.3,1.6
+			c-1.1,0.3-4.2-0.7-3.1,1.5c-0.1,2.2,2,3.1,3.4,4.4c-0.7,0.1-2,0.4-2.6,0.5c1,1.3,2,2.6,3,3.9c-0.7,0.1-2.1,0.1-2.7,0.2
+			c0,1.2,0,2.5,0,3.7c-1.4,0-2.8,0.1-4.1,0.1c0.6-0.7,1.2-1.4,1.9-2c-0.5-1-1.1-2-1.5-3c0.6-0.3,1.8-1,2.5-1.3
+			c-1.4-2.5-3.6-5-3.4-8.1c0.9-0.7,1.8-1.3,2.8-2c0.4-0.7,0.9-1.5,1.3-2.2c1.8,0.3,3.6,0.6,5.4,0.9c-1.1-2.2-2.7-4-4.5-5.6
+			c0.6-0.1,1.8-0.4,2.5-0.5c-0.7-0.9-1.4-1.9-2.1-2.8c1.1,0.4,2.3,0.8,3.5,1.2C1399.2,5.4,1399.3,2.3,1397.2,0z"/>
+		<path class="st4" d="M321.9,4.4c0.5-0.7,1.5-2.1,2-2.8c3.2,0.9,6.4,2,9.4,3.3c1.9,1,3.9-0.3,5.7-0.8c2.3-0.9,4.7-1.1,7.1-1.4
+			c-1.3,1.4-2.3,3.1-2.5,5c-0.8-0.1-1.7-0.1-2.5-0.2c0.2-1,0.4-2,0.5-3.1c-0.8,0.2-2.5,0.7-3.4,0.9c0.1,0.8,0.3,1.7,0.5,2.6
+			c-0.5,0.1-1.4,0.3-1.9,0.3c-1.8-1.5-3.8-2.5-5.7-0.7C328.3,5.8,325,5.3,321.9,4.4z"/>
+		<path class="st4" d="M455.2,3.3c1.6,0.6,3.1,1.3,4.7,1.9c-2.2,0.4-3.7,2.1-5,3.8c-1.4,1.8-3.8,1.7-5.9,1.9
+			c0.4-1.2,0.3-2.7,1.3-3.6c1.1,0.3,2.1,0.7,3.1,1.1C454.1,6.7,454.6,5,455.2,3.3z"/>
+		<path class="st4" d="M1264.1,5.2c2.1-0.7,4.2-1.2,6.4-1.8c0,2.3,0.1,4.5,0.1,6.8c-1.5,0.6-3,1.3-4.4,2c-0.2,0.1-0.7,0.4-1,0.5
+			c0.3-1.5,0.6-3.1,0.9-4.6c-0.1-0.2-0.4-0.7-0.5-0.9C1265.2,6.7,1264.5,5.7,1264.1,5.2z"/>
+		<path class="st4" d="M472.3,4c1.2-0.1,2.2,0.3,2.9,1c0.9,2.6-1.2,2.5-3.1,2.2C472.2,6.5,472.3,4.8,472.3,4z"/>
+		<path class="st4" d="M480,6c1.5-1.9,4.8-1.8,4.9,1C484.1,9.8,481.5,6.6,480,6z"/>
+		<path class="st4" d="M404.2,6.2c1.6-0.5,2.4,1.5,1.5,2.6c-0.4,0.1-1.1,0.4-1.5,0.5C403.1,8.6,402.6,6.6,404.2,6.2z"/>
+		<path class="st4" d="M1361.4,6c2.9,1.7,6.8,4.1,6.2,8c0.1,1.2-1.1,1.5-1.8,2c-0.7-2.5-2.4-4.3-4.2-6.1
+			C1361.4,8.6,1361.3,7.3,1361.4,6z"/>
+		<path class="st4" d="M1174.2,14.6c-0.4-2.9,1.8-4.7,4.2-5.7c0.1,2.4,0.1,4.9,0.1,7.3C1177.1,15.7,1175.7,15.2,1174.2,14.6z"/>
+		<path class="st4" d="M395.1,12.8c0.6-3,4.1-2.6,6.3-1.6C399.6,12.4,397,14.8,395.1,12.8z"/>
+		<path class="st4" d="M573,11.2c1.3,0.5,3.6,0,3.7,1.9c0.4,1.5-0.6,2.7-1.3,3.9C574.3,15.2,573.5,13.3,573,11.2z"/>
+		<path class="st4" d="M1151.2,11.2c1.3,0.1,2.7,0.2,4,0.5c0.3,1,0.6,2.1,0.8,3.1c-1.5-0.1-3-0.2-4.5-0.4
+			C1151.4,13.4,1151.3,12.3,1151.2,11.2z"/>
+		<path class="st4" d="M1250.3,11.5c2.4-0.2,4.8-0.1,7.2-0.6c0.1,0.5,0.2,1.5,0.2,2l0.1,1.1c-1.5-0.4-2.6,0.1-3.3,1.5
+			C1252.5,14.9,1249.1,14.6,1250.3,11.5z"/>
+		<path class="st4" d="M1194,15c1.7-0.4,3.5-1,5.2-0.2c1,2,0.5,4.3-1.2,5.8C1196.6,18.8,1195.2,17,1194,15z"/>
+		<path class="st4" d="M1233.1,15.3c0.5-0.4,1.6-1.2,2.2-1.6c0.6,0.2,1.9,0.6,2.5,0.7c-0.4,1.8-0.8,3.5-1.1,5.3
+			c-0.4-0.5-0.8-1.1-1.2-1.6C1234.6,17.2,1233.9,16.3,1233.1,15.3z"/>
+		<path class="st4" d="M357.1,20.8c0.2-1.8,0.9-3.5,1.5-5.2c0.2,0.8,0.6,2.3,0.8,3.1c0.9-0.3,1.7-0.5,2.6-0.8
+			c-0.3,0.6-1,1.9-1.3,2.6c1.8,0,3.7,0,5.5,0c-0.4,1.7-0.9,3.3-1.4,5c-0.2,0-0.8,0-1,0C361.6,23.9,359.3,22.4,357.1,20.8z"/>
+		<path class="st4" d="M482.6,16.1c1.4,0.1,2.7,0.2,4.1,0.3c-0.1,1-0.2,2-0.3,3.1c-2.2,0.1-4.5,0.1-6.7,0.1c0.5-0.2,1.5-0.6,2-0.8
+			C482,18,482.4,16.8,482.6,16.1z"/>
+		<path class="st4" d="M739,16c1.7,1.5,3.5,3.1,3.9,5.5c-1.2,0.4-2.3,0.9-3.4,1.3C738.7,20.6,738.2,18.3,739,16z"/>
+		<path class="st4" d="M1187.2,17.4c0.8-0.4,1.7-0.8,2.5-1.1c1.2,1.6,2.5,3.2,3.6,4.9c0,0.3-0.1,0.9-0.1,1.2c-2-0.4-4-0.8-6-1.2
+			C1187.2,19.9,1187.2,18.6,1187.2,17.4z"/>
+		<path class="st4" d="M409.7,19.1c1.5-0.5,2.9-1,4.4-1.3c1.4,2.3-1.3,4.9-1.7,7.3c5.1,0.2,10.2,0.1,15.3-0.1c0.6,0,1.8,0.1,2.4,0.1
+			c8.6,0.3,17.3,0.3,26,0c0.3-1.4,0.7-2.8,1.1-4.3c0.2,1.4,0.5,2.9,0.7,4.3c8.1,0.2,16.2,0.3,24.3-0.2c7.2-0.4,14.4,0.5,21.6,0.2
+			c0.2-0.7,0.6-2.2,0.8-3c0.8,1,1.6,2.1,2.4,3.1c2.3,0,4.6-0.1,6.9-0.1c-0.2-1.3-0.4-2.5-0.5-3.8c0.5,0,1.5-0.1,2-0.1
+			c0.1,1.4,0.3,2.7,0.5,4.1c2.4,0.2,4.5-0.9,5.8-2.8c0.9,0.6,1.7,1.2,2.6,1.8c11.2,1.7,22.5,0,33.8,0.9c17.6,0,35.3,0.2,52.9-0.1
+			c0.2-0.7,0.6-2.2,0.8-3c1.6,1.3,2.9,3.3,5.2,3.1c7.9,0.1,15.9,0.2,23.8-0.2c1.8,0,3.6,0,5.4,0c6.9,0.1,13.9,0.8,20.8-0.2
+			c4.6-0.8,9.2,0.9,13.8,0.4c0.5,0,1.4-0.1,1.9-0.1c149.1,0.2,298.2,0,447.3,0.1c11-0.3,22.1,0.4,33.1-0.4c1.9-0.1,3.7-0.1,5.6,0
+			c3.2,0.5,6.3,0.3,9.2-1.2c3.1,1.6,6.5,1.8,9.9,1.6c1.7,0,3.4-0.1,5.1-0.2c1.3,0,2.6-0.1,3.9-0.2c1.4-0.1,2.8-0.1,4.2-0.2
+			c3.4,0.5,6.9,0.5,10.4,0.3c1.1,0.1,2.2,0.1,3.4,0.2c4.8,0.1,9.6,0.1,14.4-0.2c2.7-0.3,5.5-0.5,8.2-0.4c2.3,0.4,4.7,0.7,7,0.5
+			c1.7-0.1,3.4-0.2,5.1-0.2c3.4,0.1,6.8,0.3,10.2,0.1c2-0.1,4-0.3,6-0.4c0.2,0.1,0.5,0.2,0.7,0.3c0.2-1.5,0.4-3,0.7-4.4
+			c1-0.1,2-0.2,3.1-0.2c0.3,1.6,0.6,3.2,0.9,4.8c3.3,0.2,6.5,0.2,9.8-0.1c1.4-1.5,2.9-2.9,4.5-4.2c-0.1,1.4-0.2,2.8-0.2,4.2
+			c5.4,0.3,10.7,0.2,16.1,0c-0.3-1.3-0.6-2.5-0.9-3.8c0.8-0.4,1.5-0.8,2.3-1.2c-0.2,1.6-0.3,3.3-0.4,4.9c3.9,0.5,7.9,0.4,11.7-1.1
+			c3.1,1.1,6.9,2.1,10,0.7c-1-1-2-1.9-3-2.8c2.6-0.5,5.3-1,7.9-1.6c-1.5,1.3-3.9,2.4-4.2,4.6c8.2,0.8,16.6,0.3,24.8,0.3
+			c0.5,0,1.6,0,2.2,0.1c3.5,0.2,7.1,0.3,10.6-0.4c-1.3-1.2-2.5-2.4-3.5-3.7c2.7,0.8,4.7,2.9,7.4,4c4.1,0.9,8.3,0.1,12.4,0l0.7,0.4
+			c-25,0.6-50.1,0.1-75.2,0.3c-293.7-0.1-587.3,0-881,0c-11.5-0.1-23,0.3-34.4-0.1c6.3-1.9,12.9-0.1,19.2-0.9
+			C408.6,23,409.1,21,409.7,19.1 M409.7,19.8c-1,1.6-0.2,5.1,2.2,3.9C412.9,21.8,412.7,18.5,409.7,19.8z"/>
+		<path class="st4" d="M328.6,26.9c0.9,0.8,1.9,1.7,2.8,2.5c0.9,1.3,2.6,2.8,1,4.3c-2.5,0-3.6-2.7-4.9-4.5
+			C327.9,28.6,328.4,27.5,328.6,26.9z"/>
+		<path class="st4" d="M1396.5,35.9c0.6-1.2,2-3,3.6-2c0.2,1.4,0.1,2.8-0.3,4.2C1398.6,37.4,1396.8,37.4,1396.5,35.9z"/>
+		<path class="st4" d="M331.3,45.2c1-1.5,2.6,0.4,3.8,0.6c0.3,0.3,0.8,1,1.1,1.3c1.9,0.9,3.8,1.7,5.8,2.4c0,0.8,0,1.6,0,2.5
+			c-3.5,2.5-4.3,7-6.3,10.6l0.5,0.4c1.9,0.5,3.9-0.2,5.8-0.6c0,1.1,0,2.2,0,3.3l-0.7-0.3c-2-2.1-3.7,0.2-5.2,1.7
+			c-0.1-0.7-0.3-2.1-0.4-2.8c-2.1-1.3-3.4,2.1-4.9,3.2c1.5,2.6,1.9,5.6,2,8.6c-1.5-0.8-3-1.5-4.4-2.3c-1.3-8,5.7-13.2,9.9-18.9
+			c-0.4-0.6-1.2-1.9-1.6-2.6c-1.7,2.4-3.1,5-5.1,7.2c-1.5,0.2-2.9-0.1-4.4-0.3c0.2,2.2,1.2,4.8-1.2,6.2c-0.3-0.2-0.9-0.5-1.2-0.6
+			c-0.4-2.5-0.8-5-1.5-7.4c2.4-0.5,4.8-1.1,7.1-1.9c1.7-1.2,3.9-2.4,4.5-4.5c0-1.7-2-1.5-3.2-1.9C331.7,47.8,329.7,46.1,331.3,45.2z
+			"/>
+		<path class="st4" d="M319.9,61.1c0.3-0.4,0.8-1.3,1.1-1.7c0.7,0.4,2.2,1.3,2.9,1.7c-1,0.9-2,1.9-2.9,2.8
+			C320.7,63.2,320.2,61.8,319.9,61.1z"/>
+		<path class="st4" d="M985.2,78.5c1.4-0.4,1.9,0.1,1.5,1.5C985.3,80.4,984.8,79.9,985.2,78.5z"/>
+		<path class="st4" d="M1406.8,86.2c1.7-1,3.6-1,5,0.4c-1.4,0.7-2.8,1.3-4.2,2c-0.8,1.3-1.5,2.7-2.2,4c-0.4-0.2-1.1-0.5-1.5-0.6
+			c0.1-1.5,0.3-3.1,0.5-4.6C1405.1,87,1405.9,86.6,1406.8,86.2z"/>
+		<path class="st4" d="M1411.2,90.4c0.7-2.7,1.7-5.4,4.7-6.2c0,3.8,0.1,7.6,0,11.4c-1.5-1.1-2.9-2.3-4.4-3.5
+			c-0.6-0.1-1.8-0.4-2.3-0.5C1409.9,91.2,1410.6,90.8,1411.2,90.4z"/>
+		<path class="st4" d="M325.6,97.4c2.6-0.7,5.2-1.4,7.8-2.2c0.2,0.8,0.4,1.7,0.7,2.6c-1.7-0.1-3.4-0.1-5.1-0.1
+			c0.6,1.5,1.6,2.6,3.1,3.4c-0.7,0.4-1.5,0.8-2.2,1.2c-1-0.6-2-1.2-3-1.9c-0.3,0.3-0.9,0.9-1.2,1.2c-1.7,1.8-3.4,3.6-5.1,5.4
+			c0-1.4-0.5-3,0.4-4.1c1.2-1,2.6-1.6,4-2.3C325.2,99.5,325.4,98.5,325.6,97.4z"/>
+		<path class="st4" d="M1390.6,97.6c0.9,1.5,1.9,3,3,4.4c0.9,0.7,1.8,1.4,2.7,2c-0.3,0.6-1,1.7-1.3,2.2c-1.6-1.1-2.9-2.6-4.1-4.1
+			c-0.5,8.7,0,17.3,0,26c1.9-0.1,3.8-0.2,5.7-0.4c-1.1,1.8-3,3.8-1.8,6c0.8,3.8,5.1,2.9,8,3.6c-1.2-1.6-2.9-3.2-2.7-5.4
+			c1.3-1.7,3.1-2.9,4.7-4.3c0.6,1.5,1.2,3.1,1.8,4.7c1,0.1,2,0.2,3,0.4c-0.5-1.2-1-2.3-1.5-3.4c2.4-0.5,6.9-2,7.3,1.6
+			c-0.8,1.8-2,3.2-3,4.8c-1.2,1.5-1.7,3.3-2.1,5.1c0.6-0.1,1.7-0.1,2.3-0.2c-0.1,1.9,0,3.8-0.3,5.7c-1.3,1.9-3.6,0.1-5.3,0
+			c1.3-3.7,3.1-7.2,3.1-11.2c-1.2,0.1-2.3,0.2-3.4,0.3c-1.4,3.9-4,7.4-4.2,11.6c2.3,2.5,6.2,2.1,9.2,3.4c1.5,0.3,1.6,0.9,0.3,1.7
+			c-2.6,1.3-5.4-0.6-7.9-1.4c-2.5-1.2-5.4-1.1-7.9-2.1c-1.1-2.3,0.2-5.7-3-6.6c-0.5,2.1-1,4.2-2.6,5.8c0-2.2-0.1-4.5-0.1-6.7
+			c2.7,0.9,5.5,1.3,8.3,1.2c-0.2-0.6-0.5-1.9-0.6-2.5c1.3,0.1,2.7,0.1,4.1,0.1c-1.5-2.5-4.1-2.6-6.3-1c-0.9-0.4-1.8-0.8-2.7-1.2
+			c-0.7-1.6-1.5-3.3-2.5-4.8c0.5-0.3,1-0.6,1.6-0.8c-1.8-1.6-2.3-3.9-2.1-6.2C1390.5,116.6,1390.1,107.1,1390.6,97.6 M1410.5,130.1
+			c-0.8,1.9,3.3,2.8,3.6,0.8C1413.8,129.4,1411.5,129.1,1410.5,130.1 M1398.6,143.3c-0.5,1.4-0.9,2.9-1.4,4.3c1.5,0,2.9,0,4.4,0
+			c0-1.4-0.1-2.9,0-4.3C1400.6,143.4,1399.6,143.4,1398.6,143.3 M1409.2,143.4c-1.5,1.3,0.9,3.7,2.2,2.2
+			C1412.7,144.3,1410.5,142.1,1409.2,143.4z"/>
+		<path class="st4" d="M336,106.9c1.6-0.3,3.2-0.6,4.8-0.8c0.4,1,0.8,2.1,1.2,3.2c0,0.6,0,1.8,0,2.4c-3.2,0.5-6.4,0.9-9.7,1.4
+			c0.1,1.2,0.2,2.3,0.2,3.4c-3,2-5.6,6.4-9.8,4.6c-2,1.1-4.1,2-6.2,2.7c0-1.6,0-3.2,0-4.9c1.8-0.1,3.7-0.1,5.6-0.2
+			c2.3-0.7,4.6-1.2,7-1.6c-0.6-1.3-1.3-2.5-1.9-3.8c1.1-1,2.1-2,3.2-3c1,2.2,3.7,2,4.8,0c-0.3-0.6-0.8-1.8-1.1-2.4
+			C334.6,107.6,335.3,107.2,336,106.9z"/>
+		<path class="st4" d="M841.7,113.3c-2.4,0.4-2.4-3.9,0-2.1C841.6,111.7,841.7,112.8,841.7,113.3z"/>
+		<path class="st4" d="M1402.9,113.1c1.2,1.3,2.5,2.6,3.7,3.9c-0.9,0.1-2.7,0.2-3.7,0.3C1400.3,117.4,1403,114.3,1402.9,113.1z"/>
+		<path class="st4" d="M1393.7,120.3c2.3-0.4,4.6,0.2,6.2,2c4.9-1.2,10-0.3,15-1c-0.7,1.1-1.4,2.2-2.2,3.1c-1.4,0.2-2.9,0.1-4.3,0.1
+			c-0.9-0.8-1.5-1.9-2.6-2.3c-1.1,0-2,0.8-2.9,1.2c-1.4,0.1-2.7,0.2-4,0.3c-0.2,1-0.3,2-0.4,3c-0.1-0.7-0.3-2.1-0.4-2.8
+			C1396.5,123,1394.9,121.9,1393.7,120.3z"/>
+		<path class="st4" d="M334.8,121.2c1.6,0.5,3.2,1,4.9,1.5c-0.6,1.1-1.3,2.2-1.9,3.4c0.5,1.9,2.7,1.9,4.2,2.6c0,0.5,0,1.6,0,2.1
+			c-1,0.3-1.9,0.7-2.9,1c-0.4-0.9-0.8-1.7-1.2-2.6c-2.4,0.8-4.9,1.4-7.4,2.1c1.4-0.9,2.8-1.9,4.1-2.9c0.1-0.5,0.2-1.4,0.3-1.8
+			c-1.9,0.3-4,0.7-5.7-0.5c1.5-0.9,3-1.7,4.5-2.5C333.9,122.9,334.5,121.8,334.8,121.2z"/>
+		<path class="st4" d="M316.5,131.8c3.3-0.1,6.6-0.4,9.6-1.6c0.9,0.5,1.8,1,2.7,1.6c-0.1,0.6-0.3,1.7-0.5,2.3
+			c1.3,0.1,2.6,0.2,3.8,0.2c-2.8,1.8-5.8,0.8-8.4-0.9c-2.4,0.5-4.9,1-7.3,1.5C316.5,134.2,316.5,132.6,316.5,131.8z"/>
+		<path class="st4" d="M334.2,135.4c2.1-1.1,2.7,2.3,0.6,2.7C333.1,140,331.1,134.6,334.2,135.4z"/>
+		<path class="st4" d="M319.3,138.1c1.9-1.8,4.3-2.8,6.9-2.6c-0.6,1.8-0.7,4.5-3.1,4.9C321.4,141.1,320.5,139,319.3,138.1z"/>
+		<path class="st4" d="M316.5,148.3c1.5-0.6,3-1.2,4.4-1.9c0.7,0.6,1.5,1.1,2.2,1.7c-0.5,0.6-1,1.2-1.5,1.8c0.8,0.8,1.5,1.5,2.3,2.3
+			c1.2,0.2,2.5,0.5,3.7,0.7c-0.8,0.3-1.7,0.6-2.5,0.9c-0.6-0.4-1.8-1.1-2.5-1.5c-0.8,1-1.6,2-2.4,3.1c-1.3,0.2-2.7,0.4-4,0.6
+			C316.4,153.4,316.5,150.9,316.5,148.3z"/>
+		<path class="st4" d="M1406.3,162.6c-1.2-1.8-2.6-4.2-0.5-6c0.5,0.1,1.6,0.2,2.2,0.3c0.3,2.8,1,5.6,0.2,8.4c-0.7-0.2-2-0.7-2.7-1
+			C1405.8,163.9,1406.2,163,1406.3,162.6z"/>
+		<path class="st4" d="M1409.5,156.5c0.7,0,2.2,0.1,2.9,0.1l1.2,0.4c-0.2,0.7-0.5,2.2-0.6,3c-0.5,0-1.5,0.1-2,0.1l-1.3-0.2
+			C1409.6,159,1409.5,157.3,1409.5,156.5z"/>
+		<path class="st4" d="M322.1,166.5c1.1-0.4,2.3-0.9,3.4-1.3c-0.1,3.2-0.1,6.4,0.9,9.4c-0.5,0-1.5,0-2,0
+			C324.6,171.7,323.2,169.1,322.1,166.5z"/>
+		<path class="st4" d="M1402,164.4c1.9,1.1,3.8,2.4,5.6,3.7c-0.4,1.1-0.6,4.8-2.4,2.9c-1.4-1-2.7-2.3-3.8-3.7
+			C1401.5,166.5,1401.8,165.1,1402,164.4z"/>
+		<path class="st4" d="M573.1,174.5c0.9,2.6,1,6.3,4.2,7.1c1.6,0.6,2.7-1.1,3.9-1.8c-1.5-1.1-3.1-2.1-4.6-3.2
+			c3.4,0,6.8-0.2,10.3-0.4c-2.7,2.5-5.3,4.9-8.2,7.2c-0.4,3.1-1.8,5.8-3.3,8.5c-4.9-0.5-9.9-0.2-14.9-0.5c3-0.6,6.1-0.6,9.2-1.2
+			c2.3-2.3,4.7-4.8,7.7-6.2c-1.7-1.4-3.6-2.7-5-4.4C572.4,177.8,572.9,176.2,573.1,174.5z"/>
+		<path class="st4" d="M321.2,186.6c-1-2.3-3-5.7-0.9-7.8c0.1,1.5,0.2,3.1,0.2,4.6c1.3,0.1,2.6,0.2,3.9,0.3
+			C325.1,185.9,323.4,187.5,321.2,186.6z"/>
+		<path class="st4" d="M693.7,179.5c7.5-0.6,14.9,1.1,22.3,1.1c12.7-0.1,25.3-0.1,38-0.2c14.3-1.4,28.6-1,42.9-1.1
+			c5.3-0.2,10.5,0.5,15.7,1.3l-0.1,0.7c-16.4-2.5-33-1.9-49.5-0.5c-12.7-0.4-25.4,1.1-38.1,0.5c-2.1,0.1-4.8-0.5-6.2,1.5
+			c-3,3.5-7.5,6.1-8.4,11c-2.3-1-4.7-1.7-7.1-2.2c0.6-1.3,1.2-2.5,1.8-3.8c0.2,0.9,0.7,2.7,1,3.6c3.7-2.6,6.4-6.3,8.3-10.4
+			C707.5,180.7,700.6,180.9,693.7,179.5z"/>
+		<path class="st4" d="M1096.7,180.4c4.2-1.5,8.7-0.8,13-0.9c2.3,2.5,4.9,4.8,6.5,7.9c-3.5-1-5.4-5.4-9.5-4.2
+			c-0.1,1.7-0.1,3.4-0.4,5c-1.2,1-2.5,1.6-3.8,2.3c-1.2-0.4-2.4-0.8-3.6-1.2c-0.2-0.5-0.6-1.5-0.8-2c1.5-2.5,3.3-4.9,6-6.2
+			C1101.5,180.9,1099.1,180.6,1096.7,180.4 M1102.3,183.4c-1.2,1.4-2.2,3.1-3.2,4.6c2.5,1.2,5.4,0.9,6.9-1.7
+			C1104.8,185.3,1103.7,184.2,1102.3,183.4z"/>
+		<path class="st4" d="M543.2,181.1c4.2-0.4,4.3,5.1,6.4,7.7c1.1-0.6,2.3-1.2,3.4-1.8c-0.9,2-2,3.9-2.9,5.9
+			c-1.9,0.5-3.7,1.2-5.6,1.8c1.7-3.6,2.8-7.6,1.4-11.6c-0.6,0-1.8-0.1-2.4-0.1c0,4.8-3.9,8.5-3.5,13.3c-7.7,3.3-14.4,8.6-20.1,14.6
+			c0.3-2.5,0.2-5.3,2-7.2c2.6-3.6,7.3-4.6,10.6-7.4c1.6-1.4,3.7-1.6,5.6-2.1C540.3,190.1,541.5,185.4,543.2,181.1z"/>
+		<path class="st4" d="M910.7,180.7c8.3-0.1,16.6-0.3,24.9-0.2c0,1.4-0.1,2.8-0.1,4.3c-1.6-1.6-3.4-3-5.6-3.6
+			c-0.2,1-0.5,2.9-0.7,3.8c-1.7-2.1-3.6-4.1-6.5-3.6c-0.1,0.9-0.3,2.6-0.4,3.4c-0.4-0.1-1.1-0.4-1.5-0.6c-0.2-1-0.5-1.9-0.7-2.9
+			c-1.9,0.4-4,0-5.7,1.1c-1.1,1.5-1.8,3.2-2.6,4.8c0.7,0.5,1.3,0.9,2,1.4l0.9,1.2c-1.3-0.1-2.5-0.2-3.7-0.3c0.8,1.8,1.6,3.5,1.9,5.4
+			c-3.3,0.8-6.2-1.8-9.5-2.1c0.1,0.6,0.2,1.8,0.3,2.3c-1.9-0.9-2.5-3-2.9-5c2.6,0.9,5.3,1.5,8,1.8c-0.1-0.5-0.4-1.5-0.5-2
+			c-1.5-0.9-3-1.8-4.6-2.6C906.6,185.8,909.5,183.9,910.7,180.7z"/>
+		<path class="st4" d="M943.4,180.6c5,0,10.2-1,15.1,0.5c0.9-0.1,1.9-1,2.7-0.5c3.9,3.2,8.8,4.5,12.8,7.5c-1.2,1.6-2.3,3.3-3.5,4.9
+			c0.5,0.4,1.6,1.4,2.2,1.8c-2.4-0.2-5.1,0-7.1-1.6c-0.4-2.4-0.1-4.9,0-7.3c-4.8-0.9-8.1,3.7-12.7,3.7c-2.9,0.2-5.7-1-8.4-2
+			C944.7,185.3,944.3,182.8,943.4,180.6 M947.1,183.1c-2,5.3,8.6,7.4,8.4,1.8C953.5,182.6,949.9,183.3,947.1,183.1z"/>
+		<path class="st4" d="M499.1,193.7c3.6-2.1,7.3-4.1,11.1-5.8c-0.4,1-0.8,2-1.1,3.1c-1.8,1.5-3.3,3.4-5.3,4.5
+			c-1.5-0.3-2.8-0.9-4.2-1.5L499.1,193.7z"/>
+		<path class="st4" d="M1117.5,188c0.2,0.3,0.6,1,0.8,1.4c-0.7,5.7-7.9,3.4-11.8,4c3.2,3,7.9,0.6,11.5,3c1.6-0.6,3.1-1.2,4.7-1.8
+			c0.4,0.6,1.3,1.7,1.7,2.3c-1.1,2.3-2.2,4.6-3.2,6.8c2-0.5,4-1,6-1.5c-2.2,1.5-4.4,3-6.7,4.3c-0.2,4.6-2.8,8.3-6.1,11.3
+			c0.6,1.5,1.1,2.9,1.7,4.4c1.6,0.4,3.1,0.7,4.7,1.2c-2.2,1.8-4.9,4.6-7.9,2.6c-2.7-0.8-1.3-3.8-0.8-5.6c1-4.5,5.4-7.1,6.7-11.4
+			c-3.2-1.8-6.4-3.6-9.3-5.8c-2.9,1.1-5.8,2.1-8.6,3.1c0.9-0.8,1.7-1.6,2.6-2.5c-0.9-1.1-1.8-2.1-2.7-3.2c0.8-1.2,1.5-2.4,2.4-3.6
+			c0.3,0,1,0.1,1.3,0.1c0.8,1.5,1.5,3.1,2.2,4.7c1.8-1.2,3.5-2.6,5.4-3.6c2-0.6,3.4,1.1,4.9,2.2c-1.1,1.5-2.2,3-3.2,4.5
+			c1.4,0.2,2.9,0.4,4.4,0.6c1.8-2.3,3.4-4.8,3.5-7.9c-5.2-0.2-10.3-1-15.4-2.1c0-1.1,0-2.3,0-3.4c2.9-0.3,5.9-0.4,8.9-0.9
+			C1116.9,191.2,1117.6,189.6,1117.5,188z"/>
+		<path class="st4" d="M833,189.6c2.3,1.7,4.3,3.7,6.2,5.9c-2.2,0.3-4.8,1.6-6.7-0.1C830.2,194.1,832.1,191.3,833,189.6z"/>
+		<path class="st4" d="M784.1,196.1c0.9-1.3,1.8-2.7,2.9-3.9c0.9,0.5,1.8,1.1,2.7,1.6c-0.4,1.4-0.9,2.9-1.3,4.4
+			c-9-3.2-18.6-3.2-28-3c4.2-1,8.5-1.4,12.8-1.3C776.9,194.4,780.5,195.5,784.1,196.1z"/>
+		<path class="st4" d="M520.5,194.4c0.9-1.5,2.9-0.8,4.4-1.1c-0.8,1.8-1.7,3.6-2.5,5.4c-1-0.1-2-0.2-3-0.4
+			C519.6,197,519.5,195.5,520.5,194.4z"/>
+		<path class="st4" d="M637.7,197c1.8,1.6,3.6,3.1,5.4,4.7c-0.1,3.9,2.1,7.1,4.5,9.9c-4.4,2.1-7.8-1.6-10.8-4.3
+			c-0.6,1.3-0.8,2.8-1.8,3.9c-2,0.2-4,0.2-5.9,0.2c-0.3,2.1-0.5,4.2-0.8,6.3c0.9,0.8,1.9,1.6,2.8,2.5c-1.6,2.1-3.2,4.1-4.9,6.1
+			c-1.1-0.6-2.2-1.2-3.2-1.9c-0.6,0.2-1.7,0.5-2.2,0.7c-0.2-0.3-0.5-0.9-0.7-1.2c2.7-1.8,5.6-3.8,6.8-7c0.8-2.3,0.9-4.8,1.2-7.2
+			c1.6-0.2,3.3-0.3,4.9-0.7C635.9,205.8,637.8,201.4,637.7,197z"/>
+		<path class="st4" d="M799.5,202.5c-1.1-3.2,2.4-4.4,4.5-5.8c0.5,0.6,1.4,1.8,1.8,2.3C804.2,201,802.4,203.7,799.5,202.5z"/>
+		<path class="st4" d="M506.2,203c0.5-0.1,1.4-0.4,1.9-0.5c2.3,1.4,5,2.5,6.8,4.5c-0.6,1.5-2.3,1.9-3.8,1.7
+			C509,207.2,507.8,204.9,506.2,203z"/>
+		<path class="st4" d="M467.3,227.3c2.9-6.4,8-11.3,12.6-16.4c-0.2,2.3-0.5,4.6-0.8,6.9c-0.4,0.3-1.2,0.8-1.6,1.1
+			c-0.7,0.5-1.5,1-2.2,1.5c0.1,2,1.5,4.4-0.2,6c-1.8-0.3-3.6-0.8-5.3-1.2c-0.6,2.1-1.1,4.2-1.7,6.3c1.4,0.5,2.7,1.1,4.1,1.6
+			c-0.2,1-0.4,2-0.6,3.1c-1.5,0.2-3.1,0.3-4.6,0.7c-1.4,2.2-2,4.8-2.9,7.2c-2.3,1-4.6,2.1-6.5,3.8
+			C460.8,241,463.2,233.7,467.3,227.3z"/>
+		<path class="st4" d="M1015.2,212.6c1.4,0.7,2.7,1.7,3.8,2.9c0-0.1,0.1-0.4,0.1-0.5c0.3,2.4,0.4,4.8,0.8,7.1
+			c-0.4-0.9-0.7-1.9-1.1-2.8c-1.2-0.3-2.4-0.5-3.5-0.8C1015.2,216.5,1015.2,214.6,1015.2,212.6z"/>
+		<path class="st4" d="M497.7,215.7c1.1-0.3,2.5-0.7,3.6,0c0.2,0.9,0.4,1.8,0.5,2.8c-0.9,0.4-1.8,0.8-2.7,1.3
+			C498.4,218.5,496.7,217.2,497.7,215.7z"/>
+		<path class="st4" d="M887.7,214.7c1.5,5.6,2,11.6,1.1,17.3c-0.2,17.6-0.1,35.3-0.1,53c-0.5,3.3,2.3,5.4,4.5,7.3
+			c-1.5,0.2-2.9,0.5-4.3,0.7c-0.1,3.4-0.2,6.7-0.1,10.1c1,0.7,2.1,1.4,3.1,2.1c-2.2,2.3-4.2,5.5-2.3,8.7c0.9,0.9,1.8,1.8,2.7,2.8
+			c1.2-1,2.6-1.7,3.5-3c0.2-1.6-0.1-3.1-0.2-4.7c2.8,2.4,1.5,6.5-1.5,7.9c-1.7,1.3-3.6-0.2-5.3-0.7c0.1,4.8,0.1,9.7,0.1,14.5
+			c2.7,0.7,4.8,2.4,6.2,4.7c-2.1,1.3-5.5,1.7-6,4.6c-0.8,4.5-0.4,9.1-0.3,13.7c1.5-0.2,3-0.4,4.5-0.6c-0.3,2.2-0.5,4.3-0.8,6.5
+			c-1.7-0.3-3.3-0.7-5-1c0.3-7.2,0-14.5,0.6-21.7c-0.7-12.3-0.3-24.7-0.4-37C887.7,271.5,887.5,243.1,887.7,214.7z"/>
+		<path class="st4" d="M1236.6,218.8c1.3,0.3,2.6,0.6,3.9,1c0,1.3,0.1,2.5,0,3.8c-1,1.2-2.6,1.8-3.9,2.7c0.1-1.4,0.2-2.8,0.4-4.2
+			C1236.8,221,1236.7,219.9,1236.6,218.8z"/>
+		<path class="st4" d="M1129.7,229.3c-1.4-1.4-0.6-3.8,1.3-4.2c3.4-0.7,7.1-0.4,10.4,0.5c1.2,1.8,0,4,0.2,6c0.7,1.4,1.7,2.6,2.7,3.8
+			c2.1-0.3,5-0.4,4.9,2.5c-0.8,2.3-3.6,0.8-5.2,0.3c-1.5,0.1-2.9,0.3-4.3,0.4c-0.4-1.6-0.6-3.3-1.3-4.9
+			C1135.6,232.1,1132.2,231.5,1129.7,229.3 M1131.9,228.1c1.8,2,6,4.7,7.6,1C1139.7,225,1133.6,224.8,1131.9,228.1z"/>
+		<path class="st4" d="M474.3,229.9c2.5-3.5,6.5,0.1,9.1,1.6c2.4,1.1,3.7-1.4,4.7-3.1c1.7,0.6,3.4,1.1,5,1.7
+			c-1.1,2.3-3.4,2.6-5.6,2.4c-0.8,1.2-1.6,2.5-2.5,3.7c-2.1,0.2-2.1-2.5-3-3.8C479.3,232.9,474.4,234.2,474.3,229.9z"/>
+		<path class="st4" d="M719.1,229.3c1.2,0.1,2.3,0.2,3.5,0.3c0,1.3-0.1,2.6-0.1,3.8c-1.1,0.1-2.2,0.2-3.3,0.3
+			C719.1,232.2,719.1,230.8,719.1,229.3z"/>
+		<path class="st4" d="M30.4,234c1.6,0,3.3,0,4.9,0c0,0.6-0.1,1.8-0.1,2.4c-1.4,0.5-2.8,1.1-4.3,1C30.4,236.3,30.5,235.1,30.4,234z"
+			/>
+		<path class="st4" d="M1415.7,234c4,0.1,8.1,0,12.1,0c-1,1.4-2.1,2.9-3.1,4.3c-1.9-1-3.7-2.1-5.6-3.1c-0.9,1.4-1.8,2.7-2.7,4.1
+			C1415.6,237.7,1415.5,235.8,1415.7,234z"/>
+		<path class="st4" d="M1441.8,234c2,0,4,0,6,0c-0.4,1.1-0.7,2.3-1,3.5c1.2,0,2.5,0.1,3.7,0c0.9-1.1,1.6-2.3,2.3-3.5
+			c1.5,0,3.1,0,4.7,0c-1.5,2.1-3.3,3.8-5.4,5.3c2.9,2.3,3.7,6,3.4,9.6c-1.3-1.5-2.4-3.1-3.6-4.7c-1.8-2.5-4.8-4-6.5-6.6
+			C1444.2,236.4,1443,235.2,1441.8,234z"/>
+		<path class="st4" d="M1394.5,237.9c2.3-1.5,4.9-2.9,7.8-2.9c1.1,0.9,2.3,1.8,3.5,2.6c-3.3,0.7-6.5,1.7-9.8,2.7
+			C1395.6,239.7,1394.9,238.5,1394.5,237.9 M1399.3,236.1c-0.3,0.3-0.8,0.9-1,1.2C1399.1,240.7,1403.1,235.4,1399.3,236.1z"/>
+		<path class="st4" d="M1458.2,242c0.2-2.2,0.6-4.3,1.3-6.4c2.2,1,4.6,0.9,6.9,0.1c0.9,1.2,1.4,2.6,1.8,4c-1.4,0-2.8-0.1-4.1-0.1
+			C1462.2,240.9,1460.2,241.7,1458.2,242z"/>
+		<path class="st4" d="M669.8,239c0.8,2.1,1.5,4.1,2.4,6.1c-6.2,4.3-8.8,11.7-13.7,17.2c-4.5,6.4-10.1,12.2-13.7,19.3
+			c-1.5,3.1-2.7,6.3-4.7,9.2c-1.5,2.6-3.9,4.9-4.1,8.1c-0.4,2.7-0.2,5.4,0.2,8.2c-1.2,2.3-1.9,4.8-2.3,7.4c2.9-0.6,5.8-1,8.7-1.2
+			c1.6-1.4,2.9-5.1,5.3-2.9c-0.1,1.7-0.7,3.3-1.2,4.9c1.8,3.6-0.5,7-2.3,10c0.1-1.9,0.2-3.8,0.3-5.6c-0.5-0.3-1.6-0.9-2.1-1.2
+			c0.1-1.2,0.1-2.4,0.2-3.6c-3.9-0.7-7.4,0.8-10.2,3.3c1.9-9.5,2.6-19.2,3.7-28.8c3.2-8.2,10.5-14.4,12.5-23.2
+			c3.7-6,10.3-9.4,14.1-15.4C665.3,246.9,668.1,243.3,669.8,239z"/>
+		<path class="st4" d="M1401.5,246.3c-0.8-4.2,3.5-7.2,7.4-6c-0.3,1.9-0.7,3.8-1.2,5.6c-0.9-0.4-1.8-0.7-2.7-1.1
+			C1403.8,245.3,1402.6,245.8,1401.5,246.3z"/>
+		<path class="st4" d="M1469.6,242.5c2-1.4,4.2-2.4,6.5-3.2c3.2,3.1-0.9,6.6-2.1,9.6c-1.8-1.5-3.3-3.2-5-4.7c-1.7,0.6-3.2,1.8-5,2.1
+			c-2-0.2-0.3-2.5,0.6-3C1466,242,1467.9,240.7,1469.6,242.5 M1471.2,242.1c-1.6,2.4,1,4,2.7,5.2c1.1-1.9,0.7-3.9,0.2-5.9
+			C1473.4,241.5,1472,241.9,1471.2,242.1z"/>
+		<path class="st4" d="M492.2,251.7c-1.9-2.3,0.3-6.8,3.5-6.6c0,1.5,0,3.1-0.2,4.6C494.8,250.7,493.4,251.1,492.2,251.7z"/>
+		<path class="st4" d="M1247.8,246.8c0.3-0.2,0.9-0.7,1.3-0.9c-0.2,1-0.5,2-0.7,3c2.5,1.6,5.6,2.8,7.5,5.3c1.3,2.6-1.1,5-1.4,7.6
+			c0.3,1.2,0.8,2.3,1.3,3.4c-2.6-0.4-5.1-0.9-7.4-2c-1.3-0.6-2.6-1.1-3.8-1.6c0,1.9,0,3.7-0.2,5.6c-0.9,0.3-1.8,0.5-2.7,0.8
+			c0-1.3,0-2.6,0-3.8c-0.9-0.4-1.7-0.8-2.6-1.2c-0.6,0.3-1.8,0.9-2.4,1.1c0.1-4.6-0.2-9.2-0.1-13.8c3.6-1.1,7.2-0.1,10.5,1.4
+			C1247.2,250,1247.5,248.4,1247.8,246.8 M1251.1,251.9c-0.9,1.3-1.7,2.6-2.5,3.9c-3.1,0.4-5.2-2.2-8.1-2.4c0.7,1.1,1.4,2.3,2.2,3.4
+			c-0.9,0.7-1.8,1.5-2.6,2.2c1.9,1.1,3.9,1.6,6.1,1.3c0.1-0.8,0.2-2.4,0.3-3.2c0.4,0.1,1.3,0.3,1.7,0.4c1.2,1.3,2,5,4.2,3.9
+			c1.5-1.8,2.7-4.2,2.1-6.5C1253.7,253.5,1252.3,252.8,1251.1,251.9z"/>
+		<path class="st4" d="M1486,246.7c1,3.8,4.9,4.4,8.2,5.1c0.3,1,0.6,2,0.9,3c1.4,1.1,3.1,2.1,4.3,3.5c0.1,1.4,0,2.7,0,4.1
+			c-0.2-0.6-0.7-1.9-0.9-2.5c-1.4-1-2.8-2-4.1-3.2c-0.5-0.4-1.3-1.3-1.8-1.7c-0.9,0.7-1.8,1.4-2.7,2.1c0.1-0.3,0.3-1,0.4-1.3
+			c-0.2-1.2,0.9-2.9-0.3-3.8c-1.6-0.2-3.1-0.3-4.7-0.3C1485.7,250,1485.9,248.4,1486,246.7z"/>
+		<path class="st4" d="M1475.8,248.9c1.7-1.4,2.8,1.1,3.8,2.1c-0.4,0.7-1.3,2.1-1.7,2.8C1476.3,252.5,1474.7,250.9,1475.8,248.9z"/>
+		<path class="st4" d="M634,255.1c2.7-1.9,5-4.5,8.1-5.9c1.8,1.4,1.6,3.8,1.4,5.8c-0.3,4.2-5.8,3.4-8.7,4.7c-0.2,1.5-0.3,3-0.4,4.6
+			c-0.8-4.6-1.9-9.1-2.9-13.6C632.2,252.2,633.1,253.7,634,255.1z"/>
+		<path class="st4" d="M1532.1,250.7c0.4-0.2,1.3-0.6,1.8-0.9c0.7,1.3,1.6,2.6,1.2,4.1c-0.4,3.1-0.7,7-4,8.5
+			C1530.9,258.4,1533.6,254.6,1532.1,250.7z"/>
+		<path class="st4" d="M1436.9,259.7c0.7-3.1,2.2-5.9,4.6-8c-0.1,2.3-0.2,4.7-0.4,7c3.3-0.2,6-1.9,8.4-4c2.2-2.1,5.5-0.7,8.1,0
+			c2.3,1.5,2.6,5.2,5.6,6c4.6,2.5,9.8,3.2,15,2.5l-0.1,0.6c-29.1,0.2-58.2,0.1-87.3,0.1l-0.2-0.7c2.5,0,5.1,0,7.7,0
+			c4.3,0.2,8.5-0.5,12.7-1.2c-0.3-0.6-0.9-1.7-1.2-2.3c0.5-0.1,1.4-0.2,1.9-0.3c1.5,1.2,3,2.3,4.5,3.5c11.4-0.2,22.8,1,34.1,0
+			c-0.2-2.1-0.2-4.4-1.9-5.9c-0.9,1-1.8,2-2.7,3C1442.6,260.3,1439.8,260.2,1436.9,259.7 M1450.2,261.3c3.3,2.9,8.7,2.6,11-1.4
+			c-1.4-0.9-3.2-1.5-4.1-2.9c-1.1-0.9-1.4-3-3.2-2.8C1452.8,256.7,1452.4,259.5,1450.2,261.3z"/>
+		<path class="st4" d="M1085.4,258.6c-0.6-2.2-1.9-5.9,1.6-6.1c3.2,0.5,2.4,4,2,6.3C1087.8,258.8,1086.6,258.7,1085.4,258.6z"/>
+		<path class="st4" d="M26.3,254.4c1.3,0.3,3.4-0.5,4.1,1c0.2,1,0.3,2.1,0.4,3.2c-0.8,0.2-2.3,0.7-3.1,1
+			C26.3,258.1,26.2,256.2,26.3,254.4z"/>
+		<path class="st4" d="M1431.3,258.6c-4.2,0.5-3.1-4.9,0-5.6C1431.9,254.8,1432.5,256.9,1431.3,258.6z"/>
+		<path class="st4" d="M1723.5,254.2c3.1,5,6,10.2,8.2,15.7c-2.8-1.4-3.6-4.3-3.6-7.2c-2.9-0.1-5.8-0.2-8.7-0.2
+			c-0.3-0.3-1-0.8-1.3-1c0.9,0.2,1.8,0.4,2.8,0.6C1722.5,259.7,1724.3,257.2,1723.5,254.2z"/>
+		<path class="st4" d="M1124.5,256.9c2-0.1,4.1-0.2,6.2-0.3c0.6,1.3,1.2,2.6,2,3.8c1.2,0.1,2.4,0,3.6,0c-1.1,2.2-3.6,3-5.6,4
+			C1128.4,262.1,1126.4,259.5,1124.5,256.9z"/>
+		<path class="st4" d="M719.1,264c1.1-2.9,3.8-5,6.9-5.3c-3,1.9-5.2,4.6-7.1,7.6c1.6,0,3.3,0.1,4.9,0.1c1.3-1.4,2.7-2.7,4.3-3.6
+			c-1.5,3.6-4.3,6.5-6.7,9.6c-0.7,0.1-2,0.4-2.7,0.5C718.7,270,718.5,267,719.1,264z"/>
+		<path class="st4" d="M1165.5,266.3c1.7-1,3.7-1,5.5-1.4c-0.3,1.5-0.5,3-0.8,4.6c-1.6,0-3.3,0-4.9-0.1
+			C1165.4,268.3,1165.4,267.3,1165.5,266.3z"/>
+		<path class="st4" d="M1183,265.9c2.1,2.4,4,4.9,6.1,7.3c-1.6,0-3.1,0.1-4.6,0.2C1183.5,271,1183.1,268.5,1183,265.9z"/>
+		<path class="st4" d="M1247.9,268.1c1-0.4,1.9-0.8,3-1.1c0,0.6-0.1,2-0.1,2.6c-0.2,2,0.1,4.5-1.6,6c-2.7,0.2-4.4-2.3-6.3-3.8
+			C1244.5,270.5,1246.1,269.3,1247.9,268.1z"/>
+		<path class="st4" d="M20.5,276.9c-0.8-2.8,3-2.8,4.5-1.6c2.2,0.9,1.3,3.6,1.6,5.4C23.8,280.9,20.7,280.2,20.5,276.9z"/>
+		<path class="st4" d="M918.5,277.3c0.5-1.5,2.5-1,3.7-0.6c0.8,1.2,0.4,2.8,0.6,4.1c-1.5,0.5-3.1,0.6-4.7,0.1
+			C918.2,279.7,918.3,278.5,918.5,277.3z"/>
+		<path class="st4" d="M1088.2,276.3c1.2,0,2.4,0,3.6,0c-0.2,1.8-0.4,3.6-0.8,5.4c-0.7,0-2.1,0-2.8,0
+			C1087.3,279.9,1087.4,278,1088.2,276.3z"/>
+		<path class="st4" d="M1725,280.8c0.5,0,1.5,0,2,0l1,0c0.1,2.1,0.2,4.2-0.3,6.3C1726.3,285.2,1724.4,283.4,1725,280.8z"/>
+		<path class="st4" d="M657.2,286.6c0.1-2.1,1.1-3.4,3.2-3.5c0.4,0.9,0.8,1.7,1.2,2.5c-0.7,1-1.3,2-2,3.1
+			C658.9,288,658,287.3,657.2,286.6z"/>
+		<path class="st4" d="M1187.1,283.9c0.7,0,2.1-0.1,2.8-0.2c-2.1,1.4-2.7,3.6-2.6,6c4,0.2,6.3-3.3,9.5-5.1c0.4,0.5,1.2,1.6,1.6,2.2
+			c-0.7,1.3-1.4,2.6-2.1,3.9c2.4-0.1,4.8-0.3,7.3-0.3c0.3,0.2,0.9,0.6,1.2,0.8c-2.3,0.5-4.5,0.9-6.8,1.3c0.5,3,1.6,6.4-0.5,9
+			c-2,4.5-7.6,4.6-11.8,5.3c2.2-2.7,4.5-6,8.5-5.8c0.9-2.1,2.2-4.8,0.2-6.7c-2.2-1.9-5.2,0.2-7.9-0.1c-0.1-1.8,0.1-3.5,0.3-5.2
+			c-2.1-0.5-4.3-0.9-6-2.2c1.2,0.2,2.4,0.3,3.7,0.5C1185.5,286.2,1186.3,285.1,1187.1,283.9z"/>
+		<path class="st4" d="M645.2,296.2c1.4,0.4,3.3-0.1,4.3,1.3c0.5,2.6-2.3,3.8-3.6,5.5C643.3,301.4,644.4,298.4,645.2,296.2z"/>
+		<path class="st4" d="M742.1,296.1l1-0.7c3.3,1.8-0.3,5.2-1.7,7.1c-0.7,1.5-3.2,1-3.1-0.6C737.7,299.2,740.4,297.6,742.1,296.1z"/>
+		<path class="st4" d="M638.1,309.9c0.8-3,2.3-7.7,6.1-7.3c0.2,1.9-0.2,3.8-1.1,5.4C641.7,309.2,639.8,309.4,638.1,309.9z"/>
+		<path class="st4" d="M648,306.6c2.6,0.2,5.3-0.2,7.3-2.2c0,0.6,0.1,1.8,0.2,2.4c1.5-0.7,2.9-2.4,4.7-2c1.9,3.3-1.9,5.5-4.7,6
+			c-0.6-0.8-1.3-1.5-1.9-2.2C651.5,308.4,649.5,308.1,648,306.6z"/>
+		<path class="st4" d="M1094.3,306.4l0.9,0.4c0.1,4.4,0.1,8.7,0.1,13c-0.5,0.4-1.4,1.2-1.9,1.6c0.2,1.9,0.5,3.8,0.7,5.8
+			c-1.3-0.5-2.6-1.1-3.9-1.6c-1.9,1.5-5.8,2.3-4.9,5.4c1.3,2.5,3.2,4.5,5,6.6c1.7-0.6,3.5-1.1,5.3-1.6c-1.6,2.2-4.2,2.7-6.7,2.9
+			c-1.5-3.5-5.7-6.2-5.3-10.3c2.2-2,4.8-3.7,6.6-6.1c-0.7-1.5-1.4-3-2.1-4.4c2.4-0.8,4.6-2,6.4-3.8
+			C1094.4,311.6,1094.4,309,1094.3,306.4z"/>
+		<path class="st4" d="M657.2,324.2c2.4-1.4,4.4-3.4,5.9-5.8c0.4,0.7,0.8,1.5,1.3,2.2c0.6,0,1.7-0.1,2.2-0.1
+			c0.7-0.7,1.4-1.4,2.1-2.1c0.9,1.1,1.8,2.2,2.7,3.4c0,1.5,0,3,0,4.5c-1.9,4.8-3.7,9.8-6.2,14.3c-0.2-0.6-0.6-1.9-0.8-2.5
+			c0.6-1.2,1.1-2.4,1.7-3.6c-1.8,0.1-3.9-0.2-5.4,1.1c-1.2,2.4-1.1,5.5-3.3,7.2c-0.1-1.3-0.3-2.6-0.4-3.8c-1.4,0.3-2.7,0.7-4.1,1
+			c2-2.9,5.2-4.1,8.3-5.6c2.6-0.7,2-3.8,2.4-5.8c1.1-0.3,2.2-0.5,3.4-0.8c0.4-2,0.7-4.1,1.1-6.1c-1.8,0.2-4-0.5-5.4,0.8
+			c-0.6,1.2-1,2.6-1.5,3.9c-1.2,0.9-2.3,1.7-3.5,2.6c0.7-1.5,1.3-3,2-4.5C659,324.4,657.8,324.2,657.2,324.2z"/>
+		<path class="st4" d="M20.8,326.8c1-0.3,2-0.5,3.1-0.6c-0.3,2.4-1,5.1-3.5,6C20.4,330.4,20,328.5,20.8,326.8z"/>
+		<path class="st4" d="M1037.6,336.9c1.2,2.1-0.1,4.2-0.7,6.3c-0.1,0.2-0.2,0.7-0.3,1c-1.5-0.3-2.9-0.5-4.3-0.8c0-1.3,0-2.6,0.1-4
+			c1.5,0.1,3,0.2,4.6,0.3C1037.1,339,1037.4,337.6,1037.6,336.9z"/>
+		<path class="st4" d="M1727.9,338c0.7-1.2,1.8-1.4,3.2-0.8c0,0.4,0,1.2,0,1.7C1729.6,339.5,1728.6,339.2,1727.9,338z"/>
+		<path class="st4" d="M631.1,349.7c3-4.4,7.6-7.4,11.4-11.1c1.4,0.5,2.7,1,4.1,1.6c-2.3,1.4-4.6,3-6.4,5c1.7,0.6,3.5,1.2,5.2,1.8
+			c-3.7,2-6.8,4.9-8.9,8.4c0.3,0.6,0.7,1.3,1.1,1.9c2.4-2.1,5.3-3.6,8.5-3.6c-5.2,2.9-9.7,7.1-12.7,12.3c0.6,0.4,1.9,1.1,2.5,1.5
+			c-2.9,3.1-5.7,6.2-8.2,9.6c-0.9,1.1-1.9,2.8-3.7,2.3c-1.9-0.9-3.5-2.1-5.2-3.3c-2.5,2.6-5.6,4.5-8.5,6.6c-2,1.7-0.2,5.3,2.5,4.8
+			c-2.4,0.9-4.9,1.8-7.3,2.7c-1.5-3.4,1.1-6.5,3.6-8.6c5.1-3.5,10.9-6.9,13.9-12.6c0.2,1.7,0.3,3.5,1.2,5c5.1-2.2,7.8-7.8,9.7-12.8
+			c-2.1,1.1-4.1,2.1-6.2,3.2c1.8-2.5,4.4-4.3,7.2-5.5c-0.2-1.3-0.4-2.7-0.8-4c-1-0.2-2.1-0.2-3.1-0.3c0.7-0.8,1.4-1.6,2.2-2.4
+			c0.1-0.4,0.3-1.2,0.4-1.6C633.1,350.3,631.8,349.9,631.1,349.7z"/>
+		<path class="st4" d="M506.4,339.3c0.8,1.7,1.7,3.4,2.5,5c-1.4,0.7-2.8,1.5-4.2,2.2c-0.6,0-1.7-0.1-2.2-0.1c0-1.5-0.1-3.1-0.1-4.6
+			C503.8,340.9,505.1,340.1,506.4,339.3z"/>
+		<path class="st4" d="M5.7,350.3c2.3-2,5.1-3.2,8.1-3.4c-0.3,0.9-0.5,1.7-0.8,2.6c-0.2,0.5-0.5,1.4-0.6,1.9
+			c-1.1,0.4-2.1,0.9-3.2,1.2C7.9,351.9,6.8,351.1,5.7,350.3z"/>
+		<path class="st4" d="M717.9,355.5l0.8-0.9c0,1.5,0,3.1,0,4.6c1.6,1.4,3,3.1,3.4,5.3c-1.4,0.2-2.9,0.3-4.3,0.5
+			c-0.3,2.9-0.6,5.8-1.1,8.7c-0.7,0.1-2.2,0.1-3,0.2C716.8,368.2,717.7,361.8,717.9,355.5z"/>
+		<path class="st4" d="M1020.3,357.5c1.3,0,2.6,0,4-0.1c0.6,2,1.3,3.9,2.1,5.8c-1.2,3-3.6,6.7-7.3,6.5c-1.5,0.1-2.1-1.5-1.8-2.7
+			c-0.2-2.9,3.5-3.8,4.2-6.1C1021.2,359.7,1020.7,358.6,1020.3,357.5 M1018.2,366.2c0.1,0.6,0.3,1.9,0.4,2.5
+			c3.6-0.1,6.1-3.5,6.5-6.8C1022,361.6,1020.1,364.3,1018.2,366.2z"/>
+		<path class="st4" d="M914.1,357.9c2.9,0,3.8,2.5,4.6,4.8c-1.4,0.4-2.9,0.7-4.3,1C913.7,361.9,913.3,359.9,914.1,357.9z"/>
+		<path class="st4" d="M478.9,361.8c1.1-0.5,2.2-1,3.3-1.5c1.4,0.8,2.8,1.6,4.1,2.7c0.7,1.7-0.6,3.5-1,5.1
+			C483.1,366.2,480.9,364.1,478.9,361.8z"/>
+		<path class="st4" d="M523.5,362.7c1.8,1.7,3.6,3.3,5.5,4.8c-1.4,2.1-5.1,4.4-2.6,7.1c1.5,0.4,2.6-0.9,3.7-1.7
+			c-0.1,0.5-0.3,1.6-0.4,2.2c-0.9,0.7-1.8,1.4-2.8,2.1c0.1,1.4,0.2,2.7,0.4,4.1c2.5-2.9,4.1-6.9,8.1-8c-2.6,3.1-5.1,6.3-7.4,9.6
+			c-2-2.1-1.7-5.2-3.1-7.5c-1.5,0-2.9,0.1-4.4,0.1c-0.1-2-0.5-4.1-0.9-6.1l1.3,0.5c0.4,0.1,1.2,0.5,1.6,0.6c0.8-1.9,0.7-3.9,0.3-5.8
+			C522.9,364.3,523.3,363.2,523.5,362.7z"/>
+		<path class="st4" d="M0,368.4c2.2,0.4,2.7,2.1,2.8,4c-0.9,0.6-1.9,1.1-2.8,1.8V368.4z"/>
+		<path class="st4" d="M1073.5,373.4c0.5,0,1.6,0,2.1,0c0.5,2.1,1,4.2,1.2,6.3c-0.8-0.3-2.5-0.8-3.4-1
+			C1073.4,376.9,1073.5,375.1,1073.5,373.4z"/>
+		<path class="st4" d="M1713.1,374.3c1.6,0.2,3.4,0,4.8,0.9c1.2,1.4,2,3,2.9,4.6c1-0.5,2-1,3.1-1.5c-0.5,1.9,0.3,5.8-2.1,6.3
+			c-1.8-2.2-2.9-4.7-4.5-7c-1.1-0.3-2.3-0.3-3.4-0.6C1713.6,376.1,1713.3,375.2,1713.1,374.3z"/>
+		<path class="st4" d="M549.1,377.9c4.1,0.9,8.2,1.8,12.3,2.5c-1.3,1-2.5,2.1-4,2.8c-3.1,0.7-6.4,0-9.6,0.4c-2.4,0.6-2.1,3.7-3,5.5
+			c-1.4,0.2-2.8,0.3-4.1,0.5c-0.6,1.3-1.3,2.6-1.9,3.9c6.2,2.1,12.9,2.9,19.5,2c2.9-4.1,4.9-8.9,8.1-12.9c-0.1-0.5-0.2-1.5-0.2-2
+			c2.7,0.2,5.5,0.4,8.2-0.2c-1.8,2.6-5.3,4.1-5.6,7.5c-0.2,1-0.5,2-0.7,3c-2.7,0.7-4.8,2.2-5.3,5.1c4.1,0.1,8.3,0.2,12.4,0.1
+			c0.5,0,1.4-0.1,1.9-0.1c-7.3,1.1-14.8,0.4-22.2,0.6c-9.3,0.4-18.2-2.3-27.1-4.6c3,0,5.9-1,8.3-2.7c3.5-1.9,2.5-6.6,4.6-9.5
+			c3-0.7,6.1,0.2,9.1,0.6C549.7,379.7,549.3,378.5,549.1,377.9 M540.2,387.8c3.4,0.7,5.4-2.2,5.3-5.3c-0.7-0.9-1.6-1.7-2.5-2.3
+			C539.5,381.2,540.3,385.1,540.2,387.8 M564.6,386.6c-0.7,1.4-0.4,3-0.5,4.5c2.5-0.7,3.8-2.6,3.7-5.1
+			C566.8,386.2,565.7,386.4,564.6,386.6z"/>
+		<path class="st4" d="M725.5,379c2.3-3.2,6.1,0.3,6.4,3.2c0.6,3,3.8,3.8,6.2,4.9c-0.8,0.6-1.7,1.2-2.5,1.9
+			C731.3,386.9,726.2,384.2,725.5,379z"/>
+		<path class="st4" d="M5.9,385.1c1.6,0,3.2,0,4.8,0.1c0,0.7,0.1,2.1,0.1,2.8C8.5,388.6,6.2,387.7,5.9,385.1z"/>
+		<path class="st4" d="M906.9,385.2c1.2,0.1,2.4,0.2,3.6,0.4c0,1.2-0.1,2.5-0.1,3.8c2.8,0,5.7,0,8.5-0.1c0.5-1,1-2,1.5-3
+			c0.6,1,1.2,1.9,1.8,2.9c20.6,0.6,41.2,0,61.8,0.3c4.5,0.5,6.9-5.5,11.5-4c0.8,1.5,1,3.3,1.5,5c-2.4-0.1-4.7-0.5-7-0.5
+			c-12.7,0.8-25.4-0.4-38.1-0.1c-17.9-0.3-35.7,0.8-53.6,0.4c3.4-0.7,6.8-0.9,10.3-0.9C908.1,388,907.5,386.6,906.9,385.2z"/>
+		<path class="st4" d="M16,397.9c0.2-1.7,0.5-3.3,0.9-5c1,0.3,1.9,0.6,2.9,0.9c-0.1,1.2-0.2,2.4-0.3,3.6
+			C18.3,397.6,17.1,397.7,16,397.9z"/>
+		<path class="st4" d="M24.1,406.1c1.1-3.2,3.6-5.7,5.8-8.2c0,2.3,0.1,4.7,0,7c-0.4-0.1-1.2-0.3-1.6-0.5c0.1,0.5,0.2,1.6,0.3,2.2
+			l-0.6,2C26.6,408,24.3,408.1,24.1,406.1z"/>
+		<path class="st4" d="M8.4,421.5c3.3-1.2,6.5-2.6,9.7-4.2c0.2,1.4,0.4,2.7,0.6,4.1c-3.1,1.9-6.6,4.5-10.4,2.4
+			C8.4,423.2,8.4,422,8.4,421.5z"/>
+		<path class="st4" d="M7.2,454.3c0.6-1.4,1.2-2.7,1.8-4.1c3.5,3.2-1.6,6.2-3,9.2c-1.3-0.4-2.5-0.8-3.8-1.2
+			C2.3,455.2,4.7,454.5,7.2,454.3z"/>
+		<path class="st4" d="M562.3,472.4c10.4-2.4,21.1-3.7,31.8-4.2c5,0.1,9.9,0.3,14.9,0.1c2.7,0.1,5.7-0.4,8.2,1
+			c-1.9,0.1-3.8,0.2-5.8,0.2c-0.6,1.7-1.1,3.5-1.9,5.1c-3,0.6-5.7-1.2-8.3-2.5c0.1,1.9,2.1,4.7,0,6c-2.4-0.4-4.7-1.2-6.9-2.2
+			c1-2.3,4.2-3.2,4.2-6.1c-1.6-2.4-3.8-0.3-4.7,1.5c-1.8-1-3.8-2.1-6-1.9c-7.7,0.3-15.3,1.8-22.7,3.5c-4.2,0.6-8.1,2.5-12.4,2.4
+			C555.6,473.5,559.1,473.2,562.3,472.4z"/>
+		<path class="st4" d="M1523.7,472c0.3,0.9,0.6,1.8,0.9,2.7c1.8,5.5,3.7,10.9,5,16.6c-2.6,0-5.2-0.3-7.7-0.9c0.6-2,1.3-4.1,3.6-4.8
+			c0.5,0.2,1.4,0.7,1.9,0.9c-0.9-2.6-1.7-5.2-2.4-7.9c-1.9,0.4-4.2,2.5-5.7,0.4C1520.3,476.5,1522.3,474.4,1523.7,472z"/>
+		<path class="st4" d="M998,484.9c2.4-2.6,5.4-4.7,7.3-7.8c4-1,8.1-0.2,12.2,0.1c0,0.5-0.1,1.5-0.2,2c1.2,0.2,2.5,0.4,3.7,0.7
+			c0.6,1.2,1.2,2.4,1.8,3.6c1.2-0.3,2.5-0.7,3.8-0.8c1.4,1.6,1.9,4.1,3.7,5.2c3,0.6,6.1,0.8,9.2,1.3c-3.4,0.1-6.9,0.8-10.2-0.2
+			c-1.8-1-2.3-3.2-3.4-4.8c-1.1,2.1-2.2,4.4-1.4,6.7c1.2,1.9,2.8,3.5,3.9,5.5l-0.5,0.9c-2.7-2.6-4.8-5.8-5.7-9.5
+			c-2.1-0.2-4.2-0.1-6.1-0.7c-2.7-2.1-4-5.3-5.9-8c-4.3,1.9-8,6.5-6.6,11.4c2.4,0.8,4.9,1,7.3,1.7c1.2,4.3-3.7,6.1-6.6,7.9
+			c-2,1.3-4.7,0.6-5.9-1.4C994.8,494.8,996.8,489.3,998,484.9 M1014,482.6c1.5,2.5,3.8,3.6,6.7,3.2c0-1.5,0-3,0-4.6
+			C1018.4,481.4,1016.2,481.9,1014,482.6 M997.7,493.7c0.4,2.3,1.8,4.5,3.7,6c3.1-1.2,6.9-2.6,8.4-5.8c-0.8-3.5-6,0.8-7.7-2.1
+			c-1.5-2.8,0.2-6,0.6-8.9C997.7,484,998.1,489.7,997.7,493.7z"/>
+		<path class="st4" d="M1706.2,478.1c1-1.4,3.6,0.2,2.4,1.6C1707.6,481.2,1705,479.6,1706.2,478.1z"/>
+		<path class="st4" d="M568.3,479.4c2.7-0.6,3.8,1.9,4.6,4C569.8,484.8,568.4,482,568.3,479.4z"/>
+		<path class="st4" d="M181.8,480.3l0.7-0.1c0.9,2.6,1.8,5.2,2.7,7.8c-2.4-0.3-4.7-1-6.4-2.8c1.2-0.7,2.4-1.4,3.7-2.1
+			C182.3,482.5,181.9,481,181.8,480.3z"/>
+		<path class="st4" d="M635.2,481.1c1.3-1.9,3-1,4,0.7c0.5,1.4,0.9,2.8,1.3,4.2c-3.3,1.5-5.1,4.6-7.2,7.3c-0.9,1.6-2.8,1.2-4.3,1.3
+			C629.9,489.5,635.6,486.4,635.2,481.1z"/>
+		<path class="st4" d="M582.4,481.3c4-1.1,5.6,3.1,8,5.2c0.1,0.5,0.4,1.7,0.6,2.2c-1.6,0.4-3.3,0.8-4.9,1.3
+			c-4.4,1.3-8.8,2.3-13.2,3.3c3.1-1.9,6.4-3.9,10.1-4.1c2,0.1,3.1-1.6,4-3.2c-1.6-0.6-3.2-1.1-4.8-1.7
+			C582.3,483.3,582.3,482.3,582.4,481.3z"/>
+		<path class="st4" d="M553.4,484c-0.1-1.9,2.2-1.4,3.3-1.9c0,2-0.2,4.1-1,6C554,487.4,552.8,486,553.4,484z"/>
+		<path class="st4" d="M661.4,482.4c0.7-0.2,2-0.7,2.7-1c1.8,1,3.6,1.9,5.5,2.9c-1.5,1.3-2.8,2.8-3.9,4.4c1.2,2.1,2.7,4.4,1.8,6.9
+			c-0.3,2.9-3.2,4.2-5.4,5.6c0.6-2.5,1.7-4.7,3.9-6.1c-0.4-4-0.6-8.1-0.7-12.1C664.3,482.8,662.4,482.5,661.4,482.4z"/>
+		<path class="st4" d="M1493.1,485.1c2.3-1.8,3.2,1.1,3.8,2.8C1495.4,487.2,1492.6,487.4,1493.1,485.1z"/>
+		<path class="st4" d="M1502.4,485.4c0.8-1.6,3.1-0.3,4.4,0C1507.7,488.1,1501.2,488,1502.4,485.4z"/>
+		<path class="st4" d="M1509.3,485.1c1.2,0,2.3,0,3.5,0c-0.1,1.1-0.2,2.3-0.3,3.4c-1.1,0.1-2.2,0.1-3.2,0.2
+			C1509.3,487.5,1509.3,486.3,1509.3,485.1z"/>
+		<path class="st4" d="M350.1,493c1.1-2.4,2.1-4.8,3-7.3c0.6,1.9,1.2,3.8,1.8,5.7C353.3,492,351.7,492.5,350.1,493z"/>
+		<path class="st4" d="M654.5,487.4c0.8-0.1,1.6-0.2,2.5-0.2c1.3,1.2,2.7,2.5,4,3.7c-1.7,3-1.4,6.6-1.3,9.9c-0.5,0-1.6,0-2.1,0
+			c-0.5-1.1-0.9-2.2-1.4-3.4c-3.7,0.5-7.7,0.9-10.4,3.9c-1.7-0.6-3.4-1.2-5.1-1.9c2.7-2.2,5.6-4,8.6-5.6c0.9,0.4,1.8,0.8,2.7,1.2
+			c1.1-1.3,2.3-2.5,3.3-4C655,489.8,654.8,488.5,654.5,487.4 M655.3,493.2c0,0.6,0.1,1.9,0.1,2.6c1.2,0,2.4,0.1,3.6,0.1
+			c0-0.6-0.1-1.9-0.1-2.5C657.6,493.3,656.5,493.2,655.3,493.2z"/>
+		<path class="st4" d="M136.4,491.3c2.6,0,5.5-0.1,7.2,2.1c0,0.6,0,1.7,0,2.3c-2.4,0-4.8-0.2-7.2-0.9
+			C136.4,493.6,136.4,492.4,136.4,491.3z"/>
+		<path class="st4" d="M541.1,491.3c1.5-1.2,3,1.4,1.6,2.4C541.3,494.9,539.7,492.3,541.1,491.3z"/>
+		<path class="st4" d="M786.4,491.3c1.1,0.3,2.1,0.6,3.2,0.9c0,1,0,2.1,0.1,3.1c-1.4,0.4-2.8,0.9-4.2,1.4c-0.5-0.7-1.1-1.3-1.7-2
+			C784.7,493.6,785.6,492.4,786.4,491.3z"/>
+		<path class="st4" d="M1728,495.5c0.5-1.5,1-3,1.6-4.4c1.1,0.9,2.2,1.9,3.4,2.9v2.1C1731.3,495.8,1729.7,495.6,1728,495.5z"/>
+		<path class="st4" d="M1496.3,492.4c1.2,0,2.3,0,3.5-0.1c-0.2,1.8-0.5,3.6-1,5.4c-0.6,0-1.9,0-2.5,0
+			C1496.3,495.9,1496.3,494.1,1496.3,492.4z"/>
+		<path class="st4" d="M684.5,493.7c1.2,0.9,2.4,1.8,3.6,2.7c-1.2,0.5-2.3,1.1-3.4,1.7c-0.5,2.1,1.7,2.7,3,3.8
+			c0,1.6-0.1,3.2-0.2,4.9c-1.1-0.6-2.3-1.1-3.4-1.7c-3.3,1.3-6.7,2.2-10.1,2.9c0.3-1.9,0.6-3.8,0.9-5.6c0.3,1.2,0.7,2.3,1,3.5
+			c2-0.3,4-0.7,6-1.1c-0.5-0.3-1.4-1-1.9-1.3c1.5-0.7,3-1.3,4.3-2.4c0.2-3.2-3.1-2.8-5.1-1.9C681.2,497.7,682.9,495.7,684.5,493.7z"
+			/>
+		<path class="st4" d="M1233.1,496.8c0.8-1,1.2-2.7,2.8-2.6c3.4,1.2,3.4,7.9,8,6.1c0.5,1.5,1,3.1,1.5,4.6c-1.8-0.2-3.6-0.3-5.3-0.9
+			C1237.3,502,1235.5,499.1,1233.1,496.8z"/>
+		<path class="st4" d="M534.6,494.7c2.4-0.1,4.9-0.4,7.2,0.5c1,2,0.2,4.2-0.1,6.3c-1.2,0-2.4-0.1-3.6-0.1c-0.1-0.6-0.4-1.8-0.6-2.4
+			C535.8,498,533.5,497.1,534.6,494.7z"/>
+		<path class="st4" d="M1222,498c0.2,1.3,0.5,2.6,0.8,3.9c-0.5,0.4-1.5,1.1-2,1.5c-1.8,1.2-2.6,3.2-3.3,5.1c-3.1,0-6.1,0.7-8.9,1.8
+			c0,1,0,2.1,0.1,3.1c-0.7-1-1.4-2.1-2-3.2c0.3-0.2,1-0.8,1.3-1c3-1.3,4.9-3.9,7.3-6C1217.7,501.8,1220.1,500.3,1222,498z"/>
+		<path class="st4" d="M1010.7,502.8c1.8-1.3,4-1.6,6.1-2.3c-0.1,0.4-0.2,1.3-0.2,1.8c-3.3,0.1-1.4,3.5-1.3,5.5
+			C1013.7,506.3,1009.5,505.6,1010.7,502.8z"/>
+		<path class="st4" d="M373.3,507.1c2.2-1.9,4.2-4,6.7-5.6c2-0.4,3.7,0.6,5.1,2C381.8,505.8,377.2,511,373.3,507.1z"/>
+		<path class="st4" d="M969.1,501.9c2.6,3.9,2.6,8.7,3.1,13.2l0,0.3c1.8,0.3,3.6,0.6,5.4,1.1c0.6,2.6-0.4,5.3-0.7,7.9
+			c-1.3-1.2-2.5-2.4-3.8-3.6c-0.7,7.7,0.5,15.5-0.3,23.2c-0.4,5.3-0.2,10.6,0,15.9c0.8,0.7,1.5,1.5,2.3,2.2c-0.7,1-1.4,2-2.1,3
+			c0,8-0.1,16.1-0.5,24.1c-0.3-8.4-1.4-16.8-0.5-25.3c0.4-11.6,0.6-23.3-0.3-34.9C971.5,520,971.4,510.8,969.1,501.9z"/>
+		<path class="st4" d="M1524.5,504.6c-0.7-2.5,2.5-2.2,4.1-2.4c0.4,1,0.8,2,1.2,3C1528,505.2,1525.6,506.4,1524.5,504.6z"/>
+		<path class="st4" d="M1708.3,502.3c0.5,0,1.5,0,2,0.1c0.4,2.4,2.4,5.6-0.9,6.7C1708.7,506.9,1708.4,504.6,1708.3,502.3z"/>
+		<path class="st4" d="M826.8,503.1c3.4,1.1,6.9,3.3,8.1,6.9c-0.6,2.3-3.4,0.2-4.9,0.4c-2-0.9-3.2,1.2-4.4,2.4
+			c-1.7-0.2-3.7,0-4.9-1.4c-0.7-1.1-0.2-2.4-0.3-3.6c1.5-0.3,3-0.2,4.4-0.9C825.9,505.9,826.1,504.3,826.8,503.1z"/>
+		<path class="st4" d="M664.6,507.6c0.8-0.9,2.1-1.2,3.2-1.7c0.4,1.9,0.5,3.8-0.2,5.6c-1.2,0.1-2.3,0.2-3.5,0.4
+			C664.3,510.5,664.3,509,664.6,507.6z"/>
+		<path class="st4" d="M528.3,512.5c0.4-0.1,1.2-0.4,1.6-0.5c1.4,1.3,2.7,2.9,4.5,3.7c1.5,0.2,3-0.2,4.5-0.4c-1.8,1.9-3.6,3.9-5.2,6
+			c-0.3-0.6-1.1-1.9-1.4-2.5c-2.1-0.5-4.1-0.9-6.2-1.6c-0.4-0.5-1.2-1.5-1.6-2c-0.6,0-1.9-0.2-2.6-0.2
+			C524,514,526.2,513.2,528.3,512.5z"/>
+		<path class="st4" d="M175.1,515.4c1.1,0,2.3,0,3.5,0c0.8,0.7,1.5,1.4,2.3,2.1c0.6-0.3,1.7-0.9,2.3-1.1c-1.2,1.4-2.4,3.8-4.7,3
+			C176.3,519.2,175.2,517.5,175.1,515.4z"/>
+		<path class="st4" d="M359.4,515.3c1.8,0.1,4.2,0.1,5.1,2.1c0.6,3-2.9,4.1-3.9,6.5c-0.9,2.1-3.4,2.5-5.2,3.5
+			c-1.7,3-2.4,7.7-6.4,8.4c-2.5-1.3-7.6-1.8-6.7-5.7c0.3-1.2,1.2-2,2-2.8c2.2-2.8,6-0.4,8.8-1.9c0.7-1.6,1.1-3.5,2.4-4.8
+			c1.2-0.2,2.5-0.2,3.8-0.4C359.6,518.6,359.5,517,359.4,515.3 M343,530.8c2,1.1,3.9,2.4,6.1,2.9c2.4-0.9,4.2-3.3,3.4-6
+			c-1.9-0.2-3.7-0.6-5.6-0.6C345.2,527.7,344.2,529.5,343,530.8z"/>
+		<path class="st4" d="M1480.6,521c0.1-2.1,0.9-5.8,3.8-4.5c2.2,2.4,1,6.2-1.3,8.2C1482.3,523.5,1480.2,522.7,1480.6,521z"/>
+		<path class="st4" d="M1725.2,517.7c1.9-1.7,4.9-0.5,3.9,2.3C1728.1,524,1726,519.3,1725.2,517.7z"/>
+		<path class="st4" d="M690,519.1c1.7,0.4,3.4,0.7,5.1,1.1c-0.7,0.9-1.5,1.9-2.2,2.8c0.3,1.6,0.6,3.2,0.9,4.9c0,1.9-0.5,3.9-1.5,5.6
+			c0.1-1.3,0.1-2.6,0.2-3.9c-2.3,1-4,3.1-5.2,5.3c-0.2-0.2-0.7-0.5-1-0.7c0-1.5,0-2.9,0-4.4c1.9-0.5,3.8-1.1,5.4-2.4
+			C690.4,524.9,690,522,690,519.1z"/>
+		<path class="st4" d="M1490,527.1c0.9-2,2.3-3.8,4.6-4.2c0.9,2.2,1.7,4.4,2.4,6.7c-0.6-0.1-1.7-0.3-2.3-0.4
+			C1493.1,528.5,1491.5,527.8,1490,527.1z"/>
+		<path class="st4" d="M387.2,523.5c1.2,1.4,2.3,3,3.3,4.6c-1.3,1.2-2.7,2.4-4.2,3.3C386.2,528.7,386.4,526,387.2,523.5z"/>
+		<path class="st4" d="M715.1,524.8c1.3,2.1,2.6,4.3,4,6.3c-0.8,1.2-1.5,2.4-2.2,3.7c-1.7-1.2-3.4-2.4-4.8-3.8
+			C712.8,528.8,714,526.8,715.1,524.8z"/>
+		<path class="st4" d="M1728.8,525.9c1.4-0.2,2.8-0.4,4.2-0.6v3.1c-1.7,1.3-2.5,3.4-3.5,5.3C1728.9,531.1,1728.7,528.5,1728.8,525.9
+			z"/>
+		<path class="st4" d="M378.9,531.3c0.8-1.9,0.3-5.4,3.1-5.5c3.4,1.7,3.2,6.7,2.5,10c-1.8-0.6-3.5-1.2-5.3-1.9
+			c-0.1-0.5-0.4-1.4-0.5-1.8L378.9,531.3z"/>
+		<path class="st4" d="M4.2,527.2c1.8,0.2,3.6,0.6,5.4,1.1c0,1.1,0,2.2,0,3.4c-1.5-0.2-3.2,0.1-4.6-0.6C4.3,530,4.5,528.5,4.2,527.2
+			z"/>
+		<path class="st4" d="M199.5,529c0.8-0.3,2.3-1,3.1-1.3c1.1,2.2,2.2,4.4,3.2,6.7c-0.6,1-1.2,2-1.8,3.1c-1.6-1-3.4-2.1-4.3-3.9
+			C199.4,532,199.5,530.5,199.5,529z"/>
+		<path class="st4" d="M513.4,528.7c0.5-0.1,1.6-0.3,2.2-0.3c0.5,0.9,1,1.8,1.4,2.8c1.1,0.1,2.1,0.2,3.2,0.4c-0.1,2.2,0.9,4,2.7,5.2
+			c0.2-2.1,0.4-4.2,0.5-6.3c1.3-0.1,2.5-0.1,3.8-0.2c-2.8,4.7-5.3,9.5-7.6,14.5l-0.5,0.4c-0.2-1.5-0.4-3-0.7-4.4
+			c-2.7,0.8-3.8,3.5-5.2,5.6c1.5,0,3-0.1,4.5-0.1c-1.7,1.3-3.1,2.8-4.6,4.3c0.7,0.2,2.1,0.6,2.8,0.7c-0.2,0.4-0.8,1.1-1,1.4
+			c-4.7-0.4-9.5,0.2-13.3,3.2c0.5,0.3,1.6,0.8,2.1,1c1.1,3,0.6,6-0.4,9c0.8,1.3,2,2.4,3,3.6c-0.2,0.4-0.6,1.1-0.8,1.4
+			c-2.7-2.1-4.6-4.8-5-8.3c-1,0.2-1.9,0.5-2.9,0.8c-1.4-0.6-2.7-1.2-4.1-1.8c-1.9,1.4-3.8,2.7-5.7,4.2c0.9,1,1.9,1.9,2.8,2.9
+			c0.6-0.3,1.3-0.6,1.9-0.9c1.9,0.3,3.7,0.5,5.6,0.7c-0.8,1.1-1,2.4-1.1,3.8c-0.5,0.9-0.9,1.7-1.4,2.5c-1.8-2.2-4.3-3.7-7-4.5
+			c-0.1-0.7-0.5-2-0.6-2.6c-2.9-0.1-6.8,0.6-8.6-2.4c-1.9-3.2-4.1-6.2-7-8.5c-2.8,0.8-5.2,2.4-7,4.7c2.2,2.4,5.4,3.4,8.4,4.6
+			c2.2,0.9,3.1,3.2,3.9,5.2c-1.5-1.5-3.2-2.8-4.8-4.2c0,1.7,0,3.4-0.2,5.1c-2.5-0.9-2.5-3.7-2.9-5.9c-1.4-0.6-2.8-1.2-4.3-1.6
+			c-0.5,1-1,1.9-1.5,2.8c-0.2,0.1-0.7,0.3-1,0.5c-1.3-0.7-2.5-1.4-3.8-2.1c1.9-1.2,4.6-2.2,4.7-4.8c-1.6,0.1-3.2,0.3-4.8,0.6
+			c0.1-0.4,0.2-1.1,0.3-1.5c1.1-0.1,2.2-0.2,3.2-0.3c1.5-0.2,2.9-0.5,4.4-0.8c-0.9-1.3-1.7-2.6-2.6-3.9c2-0.2,4-0.2,6-0.2
+			c0.2-1.4,0.5-2.8,0.7-4.2c0.9-0.8,1.8-1.6,2.7-2.4c-0.7-1-1.5-2.1-2.1-3.1c-0.7-1.2-1.4-2.4-2.1-3.6c1.3,0,2.7,0.1,4.1,0.1
+			c0.8,1.1,1.5,2.2,2.2,3.3c0.2,0.4,0.6,1.1,0.8,1.4c-0.6,2.2-1.1,4.4-1.1,6.7c-0.6-1.5-2.5-4.3-3.8-1.6c-0.5,3.2,2.7,5.6,5,7.2
+			c-0.1-0.9-0.2-2.7-0.3-3.6c0.7,0.7,1.3,1.4,2,2.2c-0.3,2.5,0.4,4.9,1.4,7.1c3.1-3.3,2.8-8.1,0.7-11.9c1.6,0.7,3.3,1.3,4.8,2.3
+			c-0.5,0-1.5,0.2-2,0.2c-0.1,1.5-0.2,3.1-0.3,4.7c1.2,0,2.5,0,3.8,0c-0.1-0.9-0.2-2.6-0.2-3.5c1.2,1,2,2.7,3.6,3.2
+			c0.2-0.8,0.5-2.3,0.7-3.1c-1.1-0.5-2.2-1-3.3-1.4c1.3-3.3,4.2-5.2,7.5-6.1c3-1.6,6.2,0.7,9.1,1.3c-0.7-1.4-1.4-2.8-2-4.2
+			c1.4-1.6,2.9-3.1,4.3-4.7c-0.1-1-0.2-2-0.3-3c1.1-0.3,2.3-0.7,3.4-1c0.1-0.5,0.2-1.6,0.3-2.2c1.3,0.3,2.6,0.6,4,0.9
+			C514.1,533.3,513.7,531,513.4,528.7 M515.6,531.6c-0.4,2.5,1.3,5.3,4.1,5.1C519.1,534.8,518.6,530.6,515.6,531.6 M507.8,537.9
+			c-1.2,1.5,0.4,3.2,0.8,4.7c1.8-0.1,4,0.4,5.2-1.4C512.5,539.3,510.6,536.2,507.8,537.9 M506.5,543.7c0.7,2.4,2,4.5,3.4,6.5
+			c1.1-0.5,2.2-1,3.3-1.6C511.5,546.4,508.9,545.1,506.5,543.7 M497.4,548.9c-0.2,1.4-0.4,2.9-0.5,4.3c-1.8-2.1-7.6-2.2-6,1.7
+			c2.5,1.3,5.1,2.6,7.1,4.6c1.4-0.8,2.7-1.6,4.1-2.5c-0.8-1.5-2.6-1.4-4-1.6c1.8-1.4,2.6-3.5,3.6-5.5
+			C500.2,549.6,498.8,549.3,497.4,548.9 M488,563.5c2.9,1.1,2.8-1.8,2.4-3.8C488,558.4,486,562.2,488,563.5z"/>
+		<path class="st4" d="M1717.3,531.2c1.8-1.9,4.3-2,6.7-1.9c-0.9,3-3.8,4.3-6.7,4.6C1717.3,533.2,1717.3,531.9,1717.3,531.2z"/>
+		<path class="st4" d="M179.5,532.5c-0.4-2.7,3.6-2.1,5.3-2.3c0.6,0,1.9,0.1,2.5,0.1c-0.7,1.1-1.3,2.3-2.1,3.4
+			C183.5,535.1,180.7,534.1,179.5,532.5z"/>
+		<path class="st4" d="M1237.1,530c1.3,2.3,3.1,4.1,5.3,5.4c0.6,2-0.3,3.9-1.6,5.4c-1.1-0.1-2.1-0.3-3.1-0.5
+			c-1.1-2.1,0.2-4.3,0.7-6.3C1238,532.7,1237.5,531.3,1237.1,530z"/>
+		<path class="st4" d="M471.7,535.8c0.8-1.6,1.7-3.1,2.6-4.6c1,1.6,2,3.3,3.1,4.9c0.3-1.8,0.6-3.5,0.9-5.3c1.2,1.5,2.4,3,3.6,4.6
+			c-1.4,0.9-2.7,1.9-4.2,2.6C475.5,539.3,473.6,536.7,471.7,535.8z"/>
+		<path class="st4" d="M671.3,531.6c2.1,3.1,1.7,6.8,0.7,10.3c-1-2.1-2.2-4.2-3.5-6.2C669.2,534.1,670.3,532.8,671.3,531.6z"/>
+		<path class="st4" d="M1220.2,533.2c1.2,0,2.4,0.1,3.6,0.1c-0.3,1.7-0.1,3.8-1.5,5.1c-1,0.2-2.1,0.3-3.1,0.4
+			C1219.4,536.9,1219.7,535,1220.2,533.2z"/>
+		<path class="st4" d="M1707.5,536.8c3.5-0.6,4.9,4,8.3,4.5c-1.5,1.1-3,2.2-4.4,3.4c-0.1-1.8-0.2-3.7-0.2-5.5c-0.7,0.3-2,1-2.7,1.3
+			c-2.2,2.3,0.6,5.1,1.4,7.5l-1,0.6c-1.1-0.7-2.1-1.4-3.1-2.2C1706.2,543.2,1706.2,539.8,1707.5,536.8z"/>
+		<path class="st4" d="M391.5,546.8c0.7-3.3,0.8-6.8,2.3-9.9c0.5,1.8,1.1,3.7,1.6,5.5c-0.3,0.7-0.6,1.3-0.9,2
+			c0.6,1.5,1.5,2.9,1.6,4.5c-0.5,1.4-1.2,2.8-1.9,4.1c0.7,1.7,1.4,3.5,2.1,5.2c-2.5,1-5,1.8-7.6,2.4c-0.9,1.9-1.7,3.8-3.1,5.4
+			c-0.1-2.1-0.2-4.2-0.2-6.2c-2.9,0-5.9,0.2-8.8,0.5c-0.3-1.5-0.6-2.9-0.9-4.4c0.9,0.1,1.7,0.3,2.6,0.4c1-2.1,1.3-5.7,4.5-5.5
+			c2.7-0.5,4.7,3.7,2.3,5.3c-1.7,0.6-3.5,0.9-5.2,1.3c2.1,0.4,4.2,0.8,6.4,1.1c0.3-2.8,0.3-5.7,1.1-8.3
+			C388.7,549.1,390.5,548.3,391.5,546.8 M389,550c-0.8,2.4-1.1,5-0.9,7.6c1.8,0.4,3.6,0.7,5.4,1.1C393.6,555.3,393.2,550.5,389,550
+			 M380.1,553.8c1,0.9,1.9,1.8,2.9,2.6c0.9-0.9,1.8-1.7,2.8-2.6c-0.9-0.8-1.8-1.4-2.8-2C382,552.5,381,553.1,380.1,553.8z"/>
+		<path class="st4" d="M1721.3,540.2c0.3-1.6,1.2-2.9,2.5-3.9c0.6,1.2,1.2,2.4,1.7,3.6C1724.4,540,1722.3,540.2,1721.3,540.2z"/>
+		<path class="st4" d="M340.7,555.2c1.8-5.7,5-11.1,9-15.6c0.7,0.2,2,0.6,2.6,0.8l-0.1,0.3c-1,3.3-2,6.6-3.5,9.8
+			C345.3,551.1,344.5,556.9,340.7,555.2z"/>
+		<path class="st4" d="M482,539.8c2.2,0.1,4.4,0.2,6.6,0.3c0.2,0.5,0.6,1.5,0.8,2.1c-0.2,0.4-0.6,1.1-0.7,1.4
+			c-2.8,0.2-5.6,0-8.2-1.1C480.9,541.9,481.6,540.5,482,539.8z"/>
+		<path class="st4" d="M1179.3,540.6c0.7-0.1,2-0.3,2.7-0.4c0.4,1.6,0.6,3.1,0.9,4.7c-1.1-0.2-2.1-0.4-3.1-0.7
+			C1179.3,543.1,1179.5,541.8,1179.3,540.6z"/>
+		<path class="st4" d="M324,550.8c1.4-3.4,3-6.7,4.6-10c1.3,3.5,3.7,8.3-0.3,11c-0.9-0.5-1.7-1-2.6-1.5
+			C325.4,550.5,324.5,550.7,324,550.8z"/>
+		<path class="st4" d="M1465.3,544c2.3-1.3,4.8-2.3,7.4-2.9c-0.2,1.4,0,2.8-0.5,4.2c-2.6,1.6-5.6,2.3-8.2,3.7c0.1-1.5,0.3-3,0.5-4.5
+			C1464.7,544.3,1465.1,544.1,1465.3,544z"/>
+		<path class="st4" d="M691.2,542c1.8,0.7,3.8,1.2,5.3,2.4c1.2,1,0.8,2.8,1.1,4.2c-2.5-0.3-5-0.8-7.5-1.1
+			C690.4,545.7,690.8,543.8,691.2,542z"/>
+		<path class="st4" d="M1725,542.3c0.4,0.1,1.3,0.3,1.7,0.5c-0.2,1.3-0.5,2.6-0.7,4c-1.2,0-2.3,0-3.5,0c-2.2-0.4-4.5-0.9-6.7-1.3
+			c0.4-0.9,0.8-1.8,1.3-2.6c1.8,0.3,3.4,1.2,5,2C1723.1,543.9,1724,543,1725,542.3z"/>
+		<path class="st4" d="M809.3,548.2c0.3-1.7,0.3-4,2.2-4.7c0.8,0.3,1.6,0.7,2.4,1.1c0.7,1.8,1.5,3.5,3,4.7c0.3-1,0.7-2,1-2.9
+			c1-1.1,2-2.2,3-3.3c0.5,0.7,0.9,1.3,1.4,2c-0.7,0.7-1.4,1.3-2.2,2c-1.8,1.9-3.7,3.7-5.8,5.3c0.5-1.2,0.9-2.4,1.4-3.6
+			C813.5,548.6,811.4,548.4,809.3,548.2z"/>
+		<path class="st4" d="M1258.1,543.1c1,2.7,1.9,5.4,2.7,8.1c-1.2-0.6-2.4-1.2-3.5-1.7C1257.6,547.4,1257.8,545.2,1258.1,543.1z"/>
+		<path class="st4" d="M170.1,544.4c1.7-0.5,3.5-0.9,5.3-1.2c0.2,1.6,0.6,3.4-0.3,4.8c-0.9,0.8-2.4,0.6-3.4,0.2
+			C171,547.1,170.3,545.8,170.1,544.4z"/>
+		<path class="st4" d="M713.8,552.1c-0.4-1.5-1.7-3.5,0-4.7c1.6-0.2,2.6,1.4,3.1,2.7c0.2,2.2,0.2,4.3,0.3,6.5
+			C714.9,556.2,714.5,553.9,713.8,552.1z"/>
+		<path class="st4" d="M830.1,548.2c1.1,0.5,2.2,1,3.3,1.5c0.9,1.1,1.8,2.2,2.7,3.4c-0.1,0.7-0.3,2-0.5,2.7
+			c-0.9-0.2-1.8-0.4-2.6-0.7c-1-1.4-2-2.9-3.1-4.2C830,550.2,830.1,548.9,830.1,548.2z"/>
+		<path class="st4" d="M1719.7,549.6c3-0.5,6-0.2,9-0.2c0,0.5,0,1.6,0,2.1c-1.9,0.2-3.9,0.1-5.5,1.3c0.4,2,2.3,3.3,3.6,4.8
+			c-1.8,1-3.7,1.4-5.6,0.6c0.3-1.1,0.7-2.2,1.1-3.3C1721.3,553.3,1717.8,551.7,1719.7,549.6z"/>
+		<path class="st4" d="M794.8,552.7c1.3-0.3,2.6-0.3,4-0.3c-0.3,1.3,0.3,3.6-1.8,3.7c-0.7,0-2.2-0.1-2.9-0.2
+			C794.2,554.8,794.5,553.7,794.8,552.7z"/>
+		<path class="st4" d="M149.1,563.2c1.3-1.7,2.6-3.5,4-5.1c0.9,1.6,1.7,3.3,2.5,5c-0.8,1-1.7,1.9-2.5,2.9
+			C151.7,565,150.4,564.1,149.1,563.2z"/>
+		<path class="st4" d="M356.9,561.8c1.4-0.5,2.8-1,4.3-1.3c1.1,1.4,0.6,3.2,0.6,4.8c-2.2,0.1-4.3,0.2-6.5,0.4c0-0.6,0-1.8,0-2.4
+			C355.7,562.9,356.5,562.2,356.9,561.8z"/>
+		<path class="st4" d="M135.3,567c2,0.7,3.9,1.4,5.9,2.1c-1.7,0.2-3.4,0.5-5.1,0.7c-0.1,1.6-0.1,3.3-0.2,5c1.6-0.1,3.3-0.3,4.9-0.4
+			c0.4,0.8,0.7,1.5,1,2.3c-2.4,1.6-5.2,2.8-6.7,5.3c-0.6,3.9-0.1,7.8,0.1,11.7c0.1,1,0.1,2.1,0.2,3.1c-1.9,3.1-1.6,6.8-1.6,10.4
+			c0,2.9-0.7,6.2,1.1,8.8c1,2.3,3.2,4.6,2.5,7.2c-1.3,0.6-2.7,1-4.1,1.4c-0.3,3-0.4,6-0.4,9c1.7-0.4,3.4-0.9,5.1-1.1
+			c2,0.1,2.8,2.3,4.1,3.5c-3,1.2-6.2,2.2-8.6,4.3c-1,1.8-1.5,3.7-1.6,5.8c-0.1,3.5-0.1,7-0.3,10.6c2.8,0,4.4-2.2,5.9-4.3
+			c0.5,0,1.4-0.1,1.9-0.1c0.5,1.3,1,2.7,1.6,4c1.2,0.1,2.3,0.1,3.5,0.2c3.5,2.3,7.7,2,11.7,2.2c-0.2-2.9-0.4-5.8-0.4-8.7
+			c0.1-4.1,0.2-8.2,0.5-12.3c0.1-1.3,0.2-2.5,0.4-3.8c0.1-0.9,0.3-2.6,0.4-3.5c0.1-2.2,0-4.5-0.2-6.7c0-3-3.3-1.3-5-1
+			c-0.6,0-1.9,0.1-2.5,0.2c-0.1-0.7-0.4-2-0.6-2.6c3.9-2.3,5-7.4,9.2-9.5c-0.2,1.2-0.3,2.5-0.5,3.8c-1.2,1.1-2.8,2-3.4,3.6
+			c1.3,0.8,2.7,1.6,4.1,2.3c-0.6,6.8-0.4,13.7-0.8,20.6c-0.1,6.2-1,12.5-0.7,18.7c-2.3,0-4.6,0-6.8,0.1c1.5,2.1,4.1,2.9,6.2,4.1
+			c0.2,2.1,0.1,4.3-0.1,6.4c-2.5-0.6-5-0.7-6.9,1.4c1.3,0.7,2.6,1.5,3.9,2.2c-2.4,0.1-4.9,0.4-7.2-0.7c1.3-1.4,2.6-2.8,4.2-4
+			c2.2-1,6.5-1.1,5.4-4.5c-1.6-0.9-3.3-1.4-5.1-1.9c-1.1,0.9-2.3,1.9-3.5,2.7c-3.8-1.4-7.1-4.3-8.8-8.1c-0.7-0.3-2-1-2.7-1.4
+			c-0.4,1.8-0.8,3.7-1.3,5.5c-1.1-0.1-2.2-0.2-3.3-0.3c-0.1,7.3-0.9,14.5-1.3,21.8c1.2-0.9,2.5-1.8,3.7-2.7c2.2-2.5,1.5-7.5,5.4-8.3
+			c1.8,2.1,1.7,5,1.2,7.5c-1.3-0.1-2.6-0.2-3.9-0.2c0.1,1.1,0.1,2.1,0.2,3.2c-4.4,2.8-5.2,8.2-8.7,11.7c1.1-8.5,1.1-17,1.9-25.5
+			c0.7-14.6,1.9-29.2,2.1-43.9c0-2.8,2.1-5.3,1.5-8.2c-1.4-7.9,0.3-15.9,0.3-23.8C134.5,584.3,134.1,575.6,135.3,567z"/>
+		<path class="st4" d="M1253.9,567.9c1.8-1.5,3.5,0.6,4.8,1.7c-1.1,2.2-3.2,3.4-5.6,2.2C1253.4,570.5,1253.4,569.2,1253.9,567.9z"/>
+		<path class="st4" d="M29.6,567.5c0.7,7.8,0.2,15.7,0.3,23.5c0,6,0.2,12-0.2,18c-0.4-0.8-0.8-1.7-1.2-2.5c0.5-2.7,0.8-5.4,0.7-8.1
+			c-0.6,0-1.7,0.1-2.2,0.2c-0.1-1.2-0.2-2.4-0.3-3.6c-1.4-0.2-2.8-0.5-4.2-0.5c-0.2,1.5-0.1,2.9,0,4.4l-0.7,0
+			c-2.5-2.2-3.3-5.6-5-8.4c-2.6-0.5-5.3-0.5-7.5-2c3.6-3.3,9.5-4.7,11.3-9.5c-1.2-1.6-2.7-2.9-4.2-4.2c0.8-1.4,1.6-2.8,2.3-4.2
+			c2.9,2.1,5.2,4.9,8.3,6.5c0.5,0.2,1.6,0.5,2.1,0.7c0.1-2.4,0.1-4.9,0.2-7.3C29.5,569.8,29.5,568.2,29.6,567.5 M22.4,582.5
+			c-2.6,2.3-2.5,6.5-1.6,9.7c2.4,0.9,5.1,1.1,7.6,1.5c1.7-4,0.9-8.3,0.8-12.5C27,581.6,24.6,581.8,22.4,582.5z"/>
+		<path class="st4" d="M0,568.9c0.3,0,0.9,0.1,1.3,0.2c0.7,0.7,1.4,1.4,2.2,2.1c0.8-0.2,1.6-0.4,2.4-0.6c-0.7,1.5-2.8,3-2.1,4.8
+			c1.6-0.1,3.2-0.4,4.8-0.6c0.3-1.5,0.5-2.9,0.8-4.3c0.2,0.3,0.5,0.8,0.7,1c0.9,3.1,2.4,6.1,2.7,9.3c-1.3,0.6-2.7,0.9-4,1.3
+			c-0.4-1.9-0.7-3.9-1.1-5.8c-1.7,0.5-3.3,0.9-4.9,1.4c-0.9-1.3-1.8-2.6-2.7-3.9V568.9z"/>
+		<path class="st4" d="M1727.4,575.3c1.9-1.1,3.7-2.2,5.6-3.4v7.6c-0.4,0.4-1.3,1.3-1.8,1.7c0-2.3-0.1-4.7-0.2-7
+			c-3.6,1.2-3.8,6.3-1.2,8.6c-0.3,0.4-0.9,1.1-1.2,1.5c-0.4-0.3-1.2-0.9-1.6-1.2c-1-0.8-2-1.7-2.9-2.6c0.8-0.6,1.7-1.2,2.5-1.8
+			C1726.8,577.6,1727.1,576.4,1727.4,575.3z"/>
+		<path class="st4" d="M358.2,573.6c1.9-0.1,3.8-0.1,5.7,0.1c-0.6,1.2-1.1,2.3-1.7,3.5c0.6,0.6,1.2,1.2,1.8,1.8
+			c-0.7,0.1-2.1,0.3-2.8,0.4c0,1,0.1,1.9,0.1,2.9c1.8,0.9,4.5,0.9,5.5,3c0.8,2.8,0.9,5.8,1,8.7c-0.1,0.2-0.3,0.5-0.4,0.6
+			c-1-0.8-1.6-2.6-3-2.1c-1.1,0.6-2.1,1.4-3.1,2.2c-0.3-0.4-0.9-1.2-1.2-1.5c-1.4-0.3-4.9,1.3-4.8-1.1c-0.2-3.1,3.5-3.2,5.5-4
+			c-0.3-2.4-1.5-4.4-3.6-5.5c0.9-0.4,1.8-0.8,2.8-1.1C359.6,578.7,359,576.1,358.2,573.6z"/>
+		<path class="st4" d="M1720.1,577.1c0.9-1.5,2-3,3.5-4c0.7,0.9,1.4,1.8,2.2,2.7c-0.9,0.8-1.8,1.7-2.6,2.6c-0.8-0.2-2.4-0.6-3.2-0.8
+			c-0.3,2.8,2.4,7.2-0.9,8.9c-1-0.5-1.9-1-2.8-1.6c1.9-1.6,3.1-3.8,3.3-6.3c-0.9,0.2-2.6,0.7-3.5,0.9
+			C1716.5,577.5,1718.5,577.5,1720.1,577.1z"/>
+		<path class="st4" d="M1702.7,579.6c2.6,2.1,5.5,4,8.7,5.2c-1.1,1.1-2.1,2.3-3.1,3.5c1.8,2,3.2,4.3,3.3,7c-1-1.6-2.1-3.2-3.2-4.6
+			c-1,3.1-1.6,6.7,1.2,9c-0.2,0.4-0.7,1.3-0.9,1.7c2,0.5,4,1,6,1.5c0.2,2-0.9,2.9-2.9,2.7c-0.9,0.6-1.9,1.3-2.8,2
+			c-0.8-0.6-1.7-1.2-2.5-1.9c-1.2,0.2-2.5,0.4-3.7,0.6c0.9-1.6,2-3.1,3-4.7c-0.6,0-1.7,0-2.2,0.1c1.4-0.9,2.8-2,4.3-3
+			c-1.4-1.5-3.4-1.2-5.2-1.1c0-0.5,0-1.5,0-1.9c2-0.9,3.9-2.1,5.3-3.8c-0.5-0.4-1.4-1.2-1.9-1.6c-1.1-0.7-2.3-1.3-3.4-1.8
+			c1.9-0.3,3.7-0.8,5.5-1.6c-1.9-0.7-3.7-1.2-5.6-1.7C1702.7,583.4,1702.7,581.5,1702.7,579.6z"/>
+		<path class="st4" d="M475.7,581.8c2.5,1.2,2.3,4,2.3,6.3c-1.2,0.8-2.3,1.7-3.4,2.7c-1.1,1-2.2,2.1-3.4,3.1
+			c-0.8-0.8-1.5-1.5-2.2-2.3c-0.1-0.4-0.2-1.2-0.2-1.6l0.5-0.5c0.8-0.8,1.6-1.7,2.3-2.5c0.3,0.2,0.9,0.5,1.2,0.7
+			C473.7,585.8,474.7,583.8,475.7,581.8z"/>
+		<path class="st4" d="M716.7,585.4c0.6,0,1.7-0.1,2.2-0.1c-0.5,1.6-1.3,3.2-2.3,4.7c0.8,1,1.6,2,2.4,3c0.1,1.7,0.2,3.4,0.2,5.1
+			c-1.6,0.4-3.2,0.8-4.8,0.2c-0.3-1.6,1.1-2.9,1.5-4.3c0-1.9-1.6-3.1-2.7-4.4C714.6,588.2,715.7,586.8,716.7,585.4z"/>
+		<path class="st4" d="M1529.9,589c-0.3-2.1,1.8-3.9,3.6-2.2C1533.3,588.9,1531.5,588.8,1529.9,589z"/>
+		<path class="st4" d="M485.9,590c0.6,0.9,1.2,1.9,1.8,2.8c0.2-0.5,0.7-1.4,0.9-1.9c0.1,0.5,0.3,1.5,0.3,1.9
+			c0.8-0.6,1.5-1.1,2.3-1.7c-0.1,0.7-0.3,2.1-0.4,2.8c1.8,0.6,3.6,1.2,5.4,1.9l0,0c-0.5,0.6-0.9,1.1-1.4,1.7
+			c-0.8,1.8-1.2,4.2-3.2,5.1c-3.4,1.6-7.2,1.7-10.9,2.4c-0.3-0.5-0.8-1.4-1.1-1.9c0.6-0.3,1.6-1,2.2-1.4c-0.8-1-1.6-2-2.4-3
+			c0.8-0.8,1.6-1.6,2.4-2.4c1,1.3,1.9,2.5,2.9,3.8c-0.2,0.9-0.3,1.9-0.5,2.8c2.9-0.5,8.3,0,8.7-3.9c-0.5-3-3.9-1.4-5.6-0.4
+			C487,595.7,486.6,592.8,485.9,590z"/>
+		<path class="st4" d="M1548.7,589.9c0.5,1.2,1,2.4,1.5,3.6c1-0.3,2-0.5,3-0.8c0.8,1.8,1.7,3.6,2.5,5.4c1.6,0.9,3.2,1.7,4.7,2.8
+			c-0.1,3.3-3.5,5-5.3,7.3c4,1.6,7.9-1.3,12-1.3c0.2-0.6,0.5-1.8,0.7-2.4c0.5,1.3,0.9,2.6,1.3,4c-1.1,0.5-2.2,1-3.2,1.6
+			c0,2.5,0.3,5,0.4,7.5c-2.5-0.8-5.3-3-7.7-1c-1,2.8-1.6,5.9-3.7,8.1c-0.3-1.2-0.5-2.5-0.8-3.7c-3.1-1.1-6.2-1.9-9.4-2.6
+			c0-3.9-2.4-6.7-4.7-9.5c-1.8-4.7-3.9-9.4-7.3-13.1c0.2-1,0.4-1.9,0.7-2.8c1.7,5.4,8.2,8.6,7.2,14.8c2.8,2.8,5.2,5.9,6.2,9.8
+			c2.6,0.7,5.2,1.4,7.9,2.1c2.1-3.3,5.3-5.3,9.2-6c-0.3-1.1-0.7-2.3-1-3.4c-3.2,0-6.7,0.4-9.3-1.8c0.3-1.4,0.6-2.7,0.9-4.1
+			c-0.5-0.8-1.1-1.7-1.6-2.5c0.3-1.5,0.6-3.1,0.9-4.6c-0.8-0.3-1.6-0.6-2.3-0.9c-1.4,1.3-2.4,3.1-4.3,3.8c-1-0.6-1.9-1.2-2.8-1.8
+			C1546,595.7,1547.5,592.8,1548.7,589.9z"/>
+		<path class="st4" d="M200.4,591.3c2.7-2.1,4.8,2.7,2,4.1C199.9,596.6,199.4,592.9,200.4,591.3z"/>
+		<path class="st4" d="M218.4,593.5c-0.6-1.5,0.8-2.4,1.5-3.5c1.1,1.1,2.2,2.1,3.2,3.2C221.7,594.2,219.8,595,218.4,593.5z"/>
+		<path class="st4" d="M707,591.3c1.2-0.1,2.5-0.1,3.7-0.1c1.2,2.6,2,5.5,1.8,8.4c0.5,1,0.9,1.9,1.4,2.9c-0.6,0.1-1.8,0.2-2.4,0.2
+			c-0.3-2.3-0.8-4.5-1.4-6.7C708.7,594.7,707.7,593.1,707,591.3z"/>
+		<path class="st4" d="M693,593.5c1.2-0.1,2.4-0.1,3.6-0.2c0.4,1.8,0.7,3.6,1.1,5.5c-0.4,1.1-0.8,2.2-1.2,3.2
+			c0.6,0.2,1.9,0.6,2.5,0.8c1.2,1.4,2.5,2.8,3.7,4.3c0.5,1.6-1.1,2.6-2,3.7c-2.5-3.3-3.1-7.9-6.4-10.9c0.8-1,1.5-2,2.3-3
+			C695.2,596.1,693.8,595,693,593.5z"/>
+		<path class="st4" d="M1449.3,593.2c1.4-1.2,2.4-1,3,0.8c1,1.9-1.8,2.8-3.1,1.8C1449.2,595.2,1449.2,593.9,1449.3,593.2z"/>
+		<path class="st4" d="M1259.8,598.2c-1.3-2,1.4-4.7,3.4-3.4c0.3,1.3,0.4,2.7,0.6,4.1C1262.4,598.6,1260.9,599,1259.8,598.2z"/>
+		<path class="st4" d="M15.9,597.5c0.6,2,2.2,4,1.5,6.2c-0.1,1.7-1.7,3.9,0.6,4.8c2.6-0.4,4.3-2.9,6-4.7c1.1-0.2,2.3-0.4,3.4-0.6
+			c0.1,0.3,0.3,0.9,0.4,1.2c-1.9,0.8-3.6,1.9-5.1,3.3c1.4,1.7,2.9,3.5,4.4,5.1c-1.7-0.9-3.4-1.8-5.1-2.8c-1.9,1.6-4.2,2.6-6.4,3.7
+			c-1.7,0.9-0.6,2.9-0.6,4.3l-1,0.2c-0.3-0.5-1-1.6-1.4-2.1c0.9-1.9,2.1-3.8,2.4-5.9c-0.3-2.2-1-4.4-2.4-6c-2.5-0.6-4,1.7-5.6,3.1
+			c1.2,1.2,2.8,2.1,3.6,3.7c0.8,2.5,0.9,5.1,1.3,7.7c0.1,1.3,0.3,2.7,0.4,4c1.2-0.3,2.3-0.5,3.5-0.8l0.1,0.8c-0.2,0.3-0.5,1-0.6,1.4
+			c-1.1,0.2-2.2,0.4-3.3,0.5c-0.9-3.2-1.6-6.5-2-9.8c0.1-3.2-2.3-5.8-5.3-6.5C3,609,1.5,610.2,0,611.3v-3.1c1.2-1.1,2.5-2.1,3.8-3.2
+			c3.2-0.9,6.5-1.6,9.9-2c-0.5-0.9-0.9-1.8-1.4-2.8c1.1,0.2,2.1,0.4,3.2,0.5C15.6,599.9,15.8,598.3,15.9,597.5z"/>
+		<path class="st4" d="M739.2,597.3c0.4,0.2,1.1,0.7,1.4,0.9c0.2,4.2,0,8.4-0.1,12.6c-0.9,0-2.6,0.1-3.5,0.2
+			c-0.6,2.3-1.2,4.5-1.3,6.9c1.2,1.3,2.5,2.3,3.9,3.4c-0.2,4-0.2,7.9-1,11.9c-0.5-2.4-1.8-4.4-3.3-6.2c0.7-1.8,1.3-3.6,1.9-5.4
+			c-1.4-0.2-2.8-0.5-4.2-0.7c0.7-3.8,1.7-7.5,3-11c1.5-1.1,4.5-1.4,4.1-3.8C740,603.1,739.6,600.2,739.2,597.3z"/>
+		<path class="st4" d="M1727.2,598c1.2,1,2.5,2,3.4,3.4c-0.2,1.7-0.7,3.4-1.2,5c-2.9,1.9-4.4,5.5-7.8,6.5c-0.1-1.1-0.2-2.2-0.3-3.2
+			c1.9-0.8,4.1-1.2,5.6-2.7C1726.5,604,1726.3,600.9,1727.2,598z"/>
+		<path class="st4" d="M1252.3,600.3c0.9-0.4,1.8-0.8,2.7-1.2c1.4,1.7,2,3.9,2.2,6l0,0.4c-1.2,0.1-2.4,0.3-3.6,0.5
+			C1253.5,604.1,1252.9,602.2,1252.3,600.3z"/>
+		<path class="st4" d="M885.3,607.2c2-3.1,5.2-5.8,9.1-4.4C892.9,606,888.7,609.5,885.3,607.2z"/>
+		<path class="st4" d="M874.4,605.1c2.2,0.8,5.5,1,6.1,3.8c-1,3.4-6.1-1.5-6.3,2.6c-0.5,0-1.6,0-2.2,0c0.5-1.1,1.2-2.1,2.1-2.9
+			C874.2,607.5,874.3,606.3,874.4,605.1z"/>
+		<path class="st4" d="M1702.7,609.5c1.3,0.2,2.6,0.4,3.9,0.7c1.1-0.5,2.2-1,3.4-1.5c0.4,0.9,0.8,1.8,1.2,2.7
+			c-1.1,0.5-2.3,1-3.4,1.4c0,1.3,0,2.7,0,4.1c-1.1,0.4-2.2,0.7-3.2,1.1c0-1.1,0-2.3,0-3.4c-0.5-0.5-1.4-1.4-1.8-1.9
+			C1702.7,611.9,1702.7,610.3,1702.7,609.5z"/>
+		<path class="st4" d="M294.6,614.2c0.7-1.5,1.5-2.9,2.4-4.3c-0.2,2.5,0.7,4.9,1.2,7.4c0,1.6-0.6,3.1-0.8,4.7c1.4,2.3,3.4,4.2,5,6.3
+			c-1.8,0.2-3.7-0.2-5.4-0.7c-1.7,1.4-3.6,2.7-5,4.5c-0.8,1.9-0.1,4.1-0.8,6.1c-1,1.6-3,2.1-4.5,3.1c-0.6-1.9-1.2-3.8-1.7-5.7
+			c0.9-3.1,2.5-5.9,3.8-8.8c0.4-0.1,1.3-0.2,1.8-0.3c0.5,0.9,0.9,1.7,1.4,2.6c0.6-0.2,1.8-0.5,2.4-0.6c-0.2-3.5,0.6-6.9,2.1-10.1
+			C295.8,616.9,295.2,615.6,294.6,614.2 M288,639.2c2-0.5,2.6-2.5,3.1-4.2c-0.7,0-2.2-0.1-2.9-0.1C286.3,635.5,286,638.5,288,639.2z
+			"/>
+		<path class="st4" d="M723.8,613.5c1.3-2.4,4.2-2.8,6.6-3.5c-1.3,0.9-2.6,1.8-3.8,2.8c-0.5,0.4-1.6,1.2-2.1,1.6
+			c1.1,1.3,2.3,2.6,3.6,3.8c-1,1.5-2,3.1-2.9,4.6c-1,0.5-1.9,1-2.9,1.5c-2.5,1.3-5,2.4-7.4,3.9l-0.5-0.2c-1.2-0.5-2.4-0.9-3.6-1.3
+			c-0.2-0.7-0.4-1.5-0.6-2.2c1.1,0.1,2.2,0.1,3.3,0.2c0.6-2,1.3-4,2-6c-0.3-0.5-1-1.4-1.3-1.8c1.9,0.1,3.9,0.2,5.9,0.1
+			C722.1,617.2,722.6,614.7,723.8,613.5z"/>
+		<path class="st4" d="M1728.7,611.7c1.2-1,2.8-1.3,4.3-1.8v15.1c-1.7-1.7-1.8-4.1-2.1-6.4c-1.8,0.3-3.6,0.7-5.4,1.1
+			c0.8,2.4,1.6,4.7,2.5,7.1c1.5,0.6,3.1,1.1,4.3,2.3c-1.1,1.5-3,1.5-4.6,1.9c-0.2-0.7-0.6-2.1-0.8-2.8c-0.9-0.5-1.8-1.1-2.7-1.6
+			c0.3-2.4,0.7-4.9,1.2-7.3c-2.8-0.9-5.1,0.9-7.2,2.5c0.4,0.7,1.3,2,1.8,2.6c-0.4-0.3-1.2-0.8-1.5-1.1c-0.4-0.5-1.1-1.4-1.5-1.9
+			c-0.4,0-1.3-0.2-1.7-0.2c0,0.6-0.1,1.7-0.1,2.2c-1.4-1-2.9-1.9-4.4-2.8c0.9-0.5,1.8-0.9,2.7-1.4c0.4,0.3,1.3,0.9,1.8,1.2
+			c4.2-0.9,6.5-4.9,10.3-6.6c1,0.8,2,1.5,3,2.3C1728.6,614.7,1728.5,613.2,1728.7,611.7z"/>
+		<path class="st4" d="M222.2,617.9c0.2-2.6,0.6-5.2,1.2-7.7c1,0.9,2.1,1.9,3.1,2.8c0.8,0.7,1.5,1.3,2.3,2c-0.2,0.6-0.5,1.7-0.7,2.2
+			C226.1,617.3,224.2,617.6,222.2,617.9z"/>
+		<path class="st4" d="M480.9,617c0.1-1.9,1.3-3.6,2-5.3c2.1,0.3,4.2,0.7,6.2,1c0.4,1.2,0.7,2.4,1.1,3.6c0.7-0.1,2.1-0.2,2.7-0.3
+			c-2.2,1.4-6.2,2.3-4.9,5.8C485.8,620,483.2,618.7,480.9,617z"/>
+		<path class="st4" d="M354.3,618.8c0.6-3,3.7-4.4,5.9-6.1c1.2,1.3,2.2,3,1.1,4.7C360.7,620.5,356,621.1,354.3,618.8z"/>
+		<path class="st4" d="M5,618.2c1.3,0,2.6,0,3.9,0.1c-0.3,1.3-0.7,2.6-1,3.9C6.6,621.1,5.7,619.7,5,618.2z"/>
+		<path class="st4" d="M1572.4,618c1.6,3.8,2.9,7.7,3.9,11.6c-1.8,0.2-3.5,0.5-5.2,0.7c0.6-1.6,1.8-2.9,3.1-3.9
+			c-0.5-1.5-0.9-3-1.3-4.6c-0.7,1-1.3,2-2,3.1c-1,0.3-2,0.5-3,0.8C1569.2,623,1570.7,620.4,1572.4,618z"/>
+		<path class="st4" d="M1702.8,618.6c0.4,0.9,1,2.6,1.4,3.5c0.1,0.1,0.2,0.2,0.3,0.3c1-0.3,2.1-0.6,3.2-0.9
+			c-0.1,1.6-0.1,3.3-0.1,4.9c1.9-0.4,3.8-0.8,5.7-1.1c-1.1,2.3-3,4-5,5.7c1.3,1.9,2.6,3.7,4,5.5c-0.3,1.6-0.6,3.2-0.9,4.8
+			c-0.4-1-0.7-2-1-2.9c-1.1,0-2.2,0-3.2,0c0.1,2,0.2,4,0.5,6.1c-1.5-1.5-3.2-2.8-4.8-4.1v-0.1c0.6-0.9,1.2-1.7,1.9-2.5
+			c1.6-0.2,3.2-0.3,4.9-0.5c-0.8-1.8-1.5-3.6-2.2-5.5c-1.7,1.2-3.4,2.7-4.7,4.3c-0.1-1.4,0-2.8,0-4.2c2.3-0.6,4.5-1.5,6.5-2.7
+			c-1.6-2-4-2.7-6.5-2.8C1702.8,623.7,1702.8,621.1,1702.8,618.6z"/>
+		<path class="st4" d="M1140.9,629.7c1-2.9,2.2-5.8,3.5-8.5c0.6,1,1.2,1.9,1.9,2.9c0.2,2.6,0.3,5.2,0.3,7.9
+			C1144.8,631.2,1142.8,630.4,1140.9,629.7z"/>
+		<path class="st4" d="M1538.2,621.1c1.4-0.2,2.8-0.4,4.2-0.5c-0.2,0.8-0.5,2.3-0.7,3.1c-1.2,0-2.3,0-3.4,0
+			C1538.3,623,1538.2,621.7,1538.2,621.1z"/>
+		<path class="st4" d="M1258.4,622.5c0.7,0,2.1,0,2.7,0c-2,1.9-5.5,2.2-5.9,5.4c2-0.3,4.1-0.4,6.1-0.5c0.3,0.7,0.8,2.2,1.1,2.9
+			c-1.2,0.9-2.5,1.9-3.6,2.8c-0.7-1.4-1.4-2.9-2.1-4.3c-0.6-0.1-1.8-0.3-2.5-0.3c0-0.5,0.1-1.4,0.2-1.8
+			C1255.8,625.2,1257.1,623.9,1258.4,622.5z"/>
+		<path class="st4" d="M390.7,628.6c1.3-2.5,3.7-4.1,6.5-4.6c1.1,3.8-3.1,6.3-4.8,9.2c-1.4,2.7-4.2,3.6-7.1,3.4
+			C385.6,633.1,389.1,631.5,390.7,628.6z"/>
+		<path class="st4" d="M1011.4,624.5c1.1-0.1,2.3-0.1,3.4-0.2c0.1,2.5-0.5,4.9-3.1,5.7C1010.6,628.3,1011.1,626.3,1011.4,624.5z"/>
+		<path class="st4" d="M1196.3,625.4c0.6,0,1.9-0.1,2.5-0.1c0.1,2,0,4.7-2.7,4.6C1195.2,628.5,1196.2,626.8,1196.3,625.4z"/>
+		<path class="st4" d="M1562.5,624.3c2,0.3,5.9,2.5,2.7,4.3C1562.5,628.7,1562.6,626.3,1562.5,624.3z"/>
+		<path class="st4" d="M1500.5,629.2c3.2-0.7,5.7-4.3,9.2-2.8c4.9,1.2,7.6,5.8,9.5,10.1c-0.8,0-2.5,0.1-3.4,0.1c-1.9-1-4-0.8-6-0.3
+			c-0.9-0.9-1.8-1.8-2.6-2.7c-1.5,1.3-2.9,2.6-4.4,3.9c0.1-1.5,0.2-3,0.4-4.4c0-0.3,0.1-0.9,0.1-1.2
+			C1502.3,631,1501.4,630.1,1500.5,629.2z"/>
+		<path class="st4" d="M1533.2,625.5c0.8,0.8,1.7,1.6,2.5,2.3c-1.2,2.4-1.9,4.9-2.4,7.5c-0.4,0.2-1.3,0.8-1.7,1
+			c0.2,0.8,0.5,1.6,0.7,2.5c-0.6,0.5-1.7,1.5-2.2,1.9c2.5,2.5,5.8,3.1,9.2,3.1c-0.5-2.9-1.8-5.5-2.9-8.1c2.9,1.4,5.7,3,8.5,4.7
+			c2.6-0.7,5.2-1.3,7.8-1.9c1,2,2,4,3,6c2.8,1.1,5.7,1.9,8.6,2.3c0.6,0.8,1.1,1.6,1.8,2.4c0.9-0.2,2-0.5,3-0.7
+			c0.5,0.5,1.5,1.5,2,1.9c3.3-0.7,6.1-3.1,8.9-4.9c0.8-3.7-3-6.9-1.8-10.8c1.8,4,2.8,8.3,4.2,12.4c-3.1,1.8-7.8,3.1-7.8,7.4
+			c-0.8-0.8-1.6-1.6-2.3-2.4c-0.4,0.6-1.1,1.9-1.4,2.6c-2.2-2.3-4.6-5.5-8.2-4.5c-2.2,2-1.7,5.2-2.1,7.8c-2.4,0.8-4.8,1.9-6.8,3.6
+			c1.2,0.3,2.5,0.7,3.8,1c-0.2,3.1,0.7,6.2,2.3,8.8c-1.8,0-3.7,0-5.5,0c0.4-1.5,0.9-3,1.4-4.5c-0.7-0.3-2-0.9-2.6-1.2
+			c-2.9,0.4-5.8,0.8-8.7,1c0.9-1.2,1.9-2.5,2.8-3.7c-0.7-3.6-0.5-7.3-1.1-10.9c-0.8-1.9-3.2-1.3-4.8-1.7c0.5,1.5,1.1,3,1.6,4.6
+			c-1.2,0.7-2.3,1.4-3.4,2.2c1.4,1.2,2.9,2.4,4.2,3.8c-2,2.5-3.7,5.3-2.4,8.5c-0.7,0.9-1.3,1.8-2,2.6c-1.3-3.6-2.5-7.3-3.4-11
+			c0.5-0.3,1.4-0.9,1.9-1.2c0-3.4,1.6-6.5,2.1-9.8c-1.2-2.5-3.9-3.8-6.6-3.8c-0.2,1.6-0.3,3.2-0.4,4.8c-0.9-3-1.2-6.4-3.3-8.9
+			c-0.7-1.1-1.5-2.2-2.1-3.3c0.8-0.3,2.2-1,3-1.3c0.1-2.3,0-4.6,0.6-6.9c0.9-0.7,1.8-1.3,2.8-1.8
+			C1533.5,627.9,1533.3,626.7,1533.2,625.5 M1541,640.1c0.3,2.8,0.4,5.7,0.2,8.5c2.1,0.5,4.7,0.1,6.1,2.1c1.6,1.8,0.2,4.3,0.2,6.4
+			c-0.8,2.7,1.1,5.3,3.4,6.6c1.8-3.3,4.7-5.9,8.6-6.3c-0.1-3.3,0.5-6.6,1.2-9.8c-1.9-0.5-3.8-0.8-5.5-1.7c-1.8-1.5-1.5-5.1-4.2-5.5
+			c-1.4,0.8-2.7,2-3.9,3C1545,642.2,1543,641.1,1541,640.1 M1538.1,661c-1.8,0.6-0.7,2.8-0.2,3.9c1.7-1.4,3.8-2.9,3.7-5.4
+			C1540.4,660,1539.2,660.5,1538.1,661z"/>
+		<path class="st4" d="M700.5,633.6c0-2.6-1.4-6.8,2.4-7c1,2.1,1.9,4.3,2.7,6.5C703.9,633.3,702.2,633.5,700.5,633.6z"/>
+		<path class="st4" d="M1225.8,628.6c0.8-0.5,1.6-1.1,2.4-1.6c1.8,1.4,2.3,3.6,2.7,5.8c-2.4-0.5-4.8-1-7.1-1.5c-0.4-1-0.8-2-1.3-2.9
+			C1223.6,628.5,1224.7,628.5,1225.8,628.6z"/>
+		<path class="st4" d="M1152.1,629.1c0.8-0.2,2.3-0.7,3-0.9c-0.1,1.4,1.2,4.4-1.2,4.5C1152,633,1150.8,630.6,1152.1,629.1z"/>
+		<path class="st4" d="M235.3,634.2c1.8-3.6,6.4-4.2,9.6-2.3c-1.4,1-2.8,2.1-4,3.4c-1.3,1.4-2.6,2.9-4.1,4.1
+			C235.8,637.9,233.6,636.2,235.3,634.2z"/>
+		<path class="st4" d="M1160.7,632c1.2-2.1,2.9,0,4.3,0.5c-1.4,0.6-2.7,1.2-4.1,1.8C1160.9,633.8,1160.8,632.6,1160.7,632z"/>
+		<path class="st4" d="M1720.7,636c1.9-1.6,4.1-3,6.6-3.3c-1.2,2-2.8,3.7-4.6,5.2C1722.2,637.5,1721.2,636.5,1720.7,636z"/>
+		<path class="st4" d="M1182.3,634.2c1.5,0.1,3.3,0.7,2.6,2.5c-1.3,0.5-2.5,0.8-3.8,1.2C1181.3,636.7,1181.3,635.2,1182.3,634.2z"/>
+		<path class="st4" d="M237.8,645.3c2.3-2,4.2-4.4,6.2-6.7c1.4,0.3,2.9,0.6,4.3,0.9c0.1,1.5,0.3,3,0.5,4.5c0.6,0.3,1.8,0.8,2.4,1
+			c0.4,2,1.4,4.9-1.2,5.9c-1.4-1.7-2.5-3.6-3.9-5.2c-2.3-0.7-4.3,0.7-4.9,2.9c-1.1-0.1-2.2-0.1-3.3-0.3
+			C237.8,647.6,237.8,646.1,237.8,645.3 M242,644.1c1.8,0.3,3.7,0.5,4.8-1.3c-0.2-1.5-1.9-1.7-2.9-2.4
+			C243.2,641.7,242.6,642.9,242,644.1z"/>
+		<path class="st4" d="M399.5,638.7c0.8,5.4,1.1,10.9,1,16.3c-1.4,0.6-2.7,1.1-4.1,1.7c-0.8-1.4-1.3-2.9-1.7-4.5
+			c1.5,0.1,3,0.2,4.5,0.2C399,647.9,399,643.2,399.5,638.7z"/>
+		<path class="st4" d="M354.6,640.5c1.9,0.3,4.6-0.8,5.5,1.5c-0.8,1.4-1.9,2.5-3,3.7c-0.6-0.4-1.9-1.2-2.5-1.6
+			C354.7,643.2,354.6,641.4,354.6,640.5z"/>
+		<path class="st4" d="M458.5,643.2c0.2-1.6,1.8-1.1,3-1.2c4.8,1.2,9.7,0.5,14.5,0c-0.9,0.9-1.9,1.8-2.8,2.6
+			c1.3,0.2,2.6,0.4,3.9,0.6c-1.7,0.2-3.3,0.3-5,0.5c-1.2,3-3.2,5.5-6.7,5.6c1.2-1.4,2.5-2.7,3.7-4.1c0.5-0.9,1.1-1.8,1.6-2.6
+			c-1.5,0.1-3,0.2-4.4,0.3c-2.2-0.6-4.3-1.2-6.5-1.8c0.1,2.5,1.4,4.7,3.1,6.6c-0.4-0.1-1.3-0.2-1.7-0.3c-1.2,2.1-2.2,4.3-2.7,6.7
+			c-1-3-1.9-6-2.6-9.2c0.9,1.3,2.3,2,3.8,2.5C459.3,647.4,458.6,645.3,458.5,643.2z"/>
+		<path class="st4" d="M232.2,645.4c2,0,3.1,2.6,2.5,4.3c-1.2,0.6-2.4,1-3.7,1.4C231,649.2,230.4,646.5,232.2,645.4z"/>
+		<path class="st4" d="M373.1,649.3c2.8-1.5,5.6-3.1,8.4-4.7c0.2,0.8,0.5,2.4,0.7,3.1c-1.8,1.4-3.6,2.8-5.4,4.3
+			c-1.2-0.1-2.5-0.2-3.7-0.2C373.2,651.2,373.1,649.9,373.1,649.3z"/>
+		<path class="st4" d="M360.4,648.9c0.7-1.2,1.2-2.6,2.6-3.3c1.3,0.7,2.7,1.6,2.5,3.4c-0.8,0.9-1.6,1.7-2.4,2.5
+			C362.1,650.7,361.3,649.8,360.4,648.9z"/>
+		<path class="st4" d="M218.8,648.2c2-0.1,3.9-0.2,5.9-0.3c-0.3,1.1-0.6,2.1-0.9,3.2c1,1,2.1,1.9,3.1,2.9c-0.2,0.6-0.5,1.7-0.7,2.2
+			c-0.5-0.1-1.4-0.2-1.8-0.3C221.9,653.8,218.8,651.7,218.8,648.2z"/>
+		<path class="st4" d="M1709.9,649.6c1.3-0.6,2.5-1.3,4-1.5c1.7,1.1,2.8,2.8,4.3,4.1c-2.2,0-3,0.9-2.5,2.7c1.1,0.6,2.2,1.1,3.3,1.6
+			c0.1-0.9,0.3-2.6,0.4-3.5c0.8,2.4,1.3,5,1.8,7.5c2.3,0,4.7,0,7-0.1c0.7,0,2.1-0.1,2.9-0.2c0.4,1.4,0.8,2.7,1.3,4.1
+			c-3.1,0.1-6.2,0.3-9.2,0.4c0.1,0.5,0.3,1.6,0.4,2.1c-0.7,0.3-2.1,1-2.9,1.3c2.9,1.8,6.2,1.3,9.4,0.8c-0.8-0.6-1.5-1.2-2.3-1.7
+			c0.7,0.1,2,0.2,2.6,0.3c0.5,0.4,1.5,1.1,1.9,1.5c-3.9,1.1-7.9,1.1-11.9,0.6c-0.4-1.3-0.8-2.7-1.1-4c-1.3-0.4-2.7-0.8-4-1.2
+			c-0.2-0.5-0.6-1.6-0.8-2.2c0.9-1.6,1.9-3.2,2.9-4.8c-1.4-0.9-2.8-1.9-3.9-3.1c0-0.5-0.1-1.6-0.2-2.1
+			C1712.4,651.3,1711.1,650.4,1709.9,649.6z"/>
+		<path class="st4" d="M809.2,650.4c0.8-0.3,2.3-0.8,3.1-1c0.8,2.3,1.9,5.8-0.8,7.2C808.2,656.9,809.5,652.4,809.2,650.4z"/>
+		<path class="st4" d="M1248.8,649.9l1-0.3c0.8,0.4,2.4,1.1,3.2,1.4c-1.5,1.3-2.9,2.9-5,3.1C1246.4,652.8,1248.1,651.2,1248.8,649.9
+			z"/>
+		<path class="st4" d="M1428.6,649.9c2.6,1.6,5.2,3.3,7.7,5.1c-0.4,1.1-0.7,2.2-1,3.4c2.8,0.6,5.4-0.6,7.7-2.3
+			c-0.3,2.7-3,3.9-5.3,4.5c-2.8-0.3-5.7-1.7-8.3,0.2c2.2,5,7.5,6.6,12.2,8.3l0,0.8c-2.2-0.5-4.5-1-6.7-1.5c-0.8,1.4-1.6,2.7-2.4,4.1
+			c-1.8,0.5-3.6,1-5.3,1.5c1.6-3.9,4-8.2,1.6-12.3c0.7-2.7,2-6-1.2-7.7C1427.8,652.6,1428.2,651.2,1428.6,649.9z"/>
+		<path class="st4" d="M1279,652.2c1.1,0.3,2.2,0.5,3.3,0.8c-0.3,1.4-0.6,2.8-0.9,4.2c-1.4-0.7-2.7-1.4-4.1-2
+			C1277.9,654.2,1278.4,653.2,1279,652.2z"/>
+		<path class="st4" d="M1133.2,661c-1.7-4,2.2-6.3,4.7-8.6c0.9,1.7,0.8,5,3.2,5.2c0.6-1.5,1-3.1,1.4-4.7c0.3,1.6,1,3.1,2.5,4
+			c-0.4,1.3-0.9,2.5-1.3,3.7c-1.3,0.1-2.5,0.2-3.8,0.3C1137.7,659.7,1135.2,658.5,1133.2,661z"/>
+		<path class="st4" d="M713.9,655.9c2.9-0.4,5,1,6.2,3.6c0.6-1.1,1.2-2.3,1.8-3.4c2.5,0.7,5,1.5,7.5,2.6c0.1,0.4,0.3,1.2,0.4,1.6
+			c-2.3-0.7-4.5-1.4-6.9-1.8c-0.3,3.4,0.8,6.8,1.3,10.2c-2.8,0.4-5.6,0.8-8.4,1.2c0.6-1.4,1.2-2.7,1.8-4c-1.1-1-2.2-2-3.1-3.2
+			C713.7,660.5,714,658.1,713.9,655.9 M715.2,657.4c0.1,1.4,0,2.8,0.3,4.2c0.4,1.4,2.2,0.7,3.2,1c-0.2-1.8-0.5-3.6-0.9-5.4
+			C717.1,657.3,715.8,657.4,715.2,657.4z"/>
+		<path class="st4" d="M464.5,657.5c1,0,2.8,0.1,3.8,0.1c0.3,1.3,0.5,2.7,0.8,4c-0.8-0.1-1.6-0.2-2.4-0.3c-0.5,0.5-1.4,1.4-1.9,1.9
+			C464.7,661.3,464.6,659.4,464.5,657.5z"/>
+		<path class="st4" d="M241.4,659.3c1.4,0.1,4.6-0.8,4.3,1.6c0,2.5-2.8,2.9-4.7,3C241,662.4,241.1,660.8,241.4,659.3z"/>
+		<path class="st4" d="M509,661.1c0.6,0.1,1.8,0.4,2.4,0.5c-0.3,1.8-1.6,3.1-3,4.3c-0.1,0.5-0.3,1.5-0.3,2c3.1-1.2,6.2-2.9,7.6-6
+			c2.5,4.8,3.2,10.5,6.3,15c1,1.6,0.8,3.4,0.9,5.2c0.5,0.2,1.6,0.6,2.1,0.7c0.2,0.4,0.7,1.3,0.9,1.7c-1.7,0.1-3.3,0.4-4.6,1.6
+			c-0.9-1.4-1.7-1.4-2.6-0.1c0,1.3,0.7,2,2.1,2.1c0.3,0.3,1,0.9,1.4,1.1c-1.8,1.1-3.5,2.3-5.3,3.6c0.8,0.8,1.7,1.7,2.5,2.6
+			c-0.6,0.7-1.2,1.4-1.7,2c-2-1.8-4.5-0.4-6.7,0.1c0.7,1,1.4,2.1,2.1,3.1c-0.7,0.4-1.3,0.8-2,1.3c-0.7-1.5-1.5-2.9-2.2-4.3
+			c-1,2.7-2,5.5-3.4,8c1,0.7,2.1,1.5,3.2,2.2c-0.6-0.1-1.7-0.2-2.3-0.3c-2.1,1.1-4.5,1.8-6.3,3.3c-0.3,1.5-0.2,3-0.3,4.5
+			c-0.2,0.3-0.7,1-0.9,1.4c-1.7-1.4-3.3-2.9-5-4.4c0.9,0,2.7-0.1,3.5-0.2c2-2.9,3.8-6,5.8-8.8c-0.5,0-1.6,0.1-2.1,0.1
+			c-0.2-1-0.5-1.9-0.7-2.9c-1.2,0.3-2.3,0.7-3.4,1c-0.1,0.5-0.4,1.4-0.6,1.9l-0.5,0c-0.3-0.6-1-1.7-1.3-2.3c-1.2,0.3-2.5,0.6-3.7,1
+			c1,2,2.9,3.2,5,3.8c-0.1,0.3-0.3,1-0.5,1.3c-1.1,0.2-2.2,0.5-3.2,0.7c0-0.4,0.1-1.1,0.1-1.5c-1-1.3-1.8-3.6-3.9-2.7
+			c-0.3,0.6-1,1.7-1.4,2.2c-1.1-1.1-2.1-2.3-3.1-3.6c1.6-0.4,3.3-0.8,4.9-1.1c-0.6-1.1-1.3-2.2-1.9-3.2c1.5-1.1,2.9-2.2,4.4-3.2
+			c-2-0.6-4-1.2-6.1-1.8c0,0.5,0.1,1.4,0.2,1.9c-1.2-0.4-2.4-0.8-3.6-1.1c0.8-0.7,1.6-1.4,2.4-2.1c-1.3-0.1-2.7-0.2-4-0.3
+			c0.1-0.5,0.4-1.4,0.5-1.9c-1.1-0.2-2.1-0.4-3.2-0.6c-0.4-1.7-0.7-3.5-0.9-5.2c1.7,1.2,3.3,2.5,4.8,3.9c0.5-0.9,1-1.8,1.6-2.7
+			c-0.1,1.6-0.2,3.3-0.4,5c2.9,1.7,6.1,2.5,9.4,2.8c-0.1,1.8-0.3,3.7-0.4,5.5c1.8-1.4,3.7-2.8,5.7-4.1c-0.3,0.5-0.8,1.4-1.1,1.9
+			c1.3-0.1,2.5-0.2,3.8-0.3c-1.8,1.2-3.8,2.3-4.6,4.5c2.8-0.2,5.5-0.6,8.3-0.9c0.2,1-0.6,3.9,1.4,3.1c1.9,0.2,1.9-2.1,1.9-3.4
+			c0.4-3.9-1.1-7.5-1.9-11.3c1.4,1.5,2.6,3,3.7,4.7c-0.2,1.5-0.4,3.1-0.6,4.6c0.4-0.1,1.3-0.4,1.8-0.6c1.4-2.2,2.9-4.4,4.5-6.5
+			c2.8-3.4,6.5-6.4,7.7-10.7c-0.7-1.8-3.1-0.6-4.5-1.1c0.4-1.8,0.7-3.5,1.1-5.3c-1-0.3-2.1-0.6-3.2-0.8c-0.9-0.9-1.4-2.2-2.6-2.6
+			c-0.4,0.6-1.1,1.9-1.5,2.5c-0.6,0.2-1.7,0.5-2.2,0.7c1.2,0.4,2.4,0.7,3.6,1.1c-2.1,0.4-4.4,0.8-6.1,2.3c-2.4,1.5-1.3,4.8-1.7,7.2
+			c-0.4-0.4-1.1-1.2-1.5-1.7c0.2-1.4,0.4-2.8,0.6-4.2c-2.4-0.8-5.1-1.9-3.9-4.9c1.9,0.9,3.8,1.9,5.8,2.9c-0.6-2.4-1.4-4.7-1.6-7.2
+			C505,665.2,507.3,663.2,509,661.1z"/>
+		<path class="st4" d="M1148.4,666.2c0-2.3-0.2-5,2.6-5.8c0.4,1,0.8,2.1,1.1,3.2c-2.1,2.8-4.1,5.6-5.9,8.6c-0.6,0.3-1.7,0.8-2.3,1.1
+			c-0.6-0.7-1.3-1.3-1.9-1.9c-1.1-1.1-2.3-2.2-3.3-3.4c0.3-1,0.7-2.1,1.1-3c0.3-0.2,1.1-0.8,1.4-1c0.8-0.6,1.7-1.2,2.5-1.8
+			C1144.4,664.5,1145.5,666.7,1148.4,666.2z"/>
+		<path class="st4" d="M379.3,665.9c0.8-2.2,2.6-3.5,4.7-4.4c1.4,1.3,1.7,3.2,1.9,5.1C383.6,666.6,381.4,666.7,379.3,665.9z"/>
+		<path class="st4" d="M685.1,662.2c1.9,0.4,5.2,0.5,5.5,2.8c0.2,2.4-3,1.5-4.2,0.6C685.1,665,685.4,663.3,685.1,662.2z"/>
+		<path class="st4" d="M498.2,665c0.9-0.5,1.7-1,2.6-1.4c0.2,0.6,0.5,1.9,0.7,2.5c-0.1,0.6-0.4,1.7-0.5,2.3
+			c-1.1-0.4-2.3-0.8-3.4-1.1C497.8,666.7,498.1,665.5,498.2,665z"/>
+		<path class="st4" d="M465.9,669.3c0.1-1.5-1.3-4.2,0.8-4.9c0.5,0.3,1.6,1,2.1,1.3c-0.1,0.9-0.2,1.9-0.3,2.8
+			C467.9,668.7,466.5,669.1,465.9,669.3z"/>
+		<path class="st4" d="M1128.6,668.2c1.1-1.2,2.3-2.5,3.5-3.6c0.3,0.7,1,2,1.3,2.6c-0.9,1.5-2.1,2.9-3.2,4.2
+			C1129.6,670.4,1129,669.3,1128.6,668.2z"/>
+		<path class="st4" d="M1293.7,669.8c1.3-0.1,2.6-1,3.9-0.5c0.7,0.9,1.4,1.9,2.1,2.9c-1.7,0.4-3.5,0.4-5.2,0.1
+			C1294.3,671.7,1293.9,670.4,1293.7,669.8z"/>
+		<path class="st4" d="M1568.2,675.6c-1.8-1.5-3.7-4.1-1.2-6C1570.8,668.7,1569.7,673.8,1568.2,675.6z"/>
+		<path class="st4" d="M229.5,677.9c0.4-3.7,3.4-5.6,6.6-6.9c0.3,1.1-0.1,2.9,1.4,3.3c3.4,0,6.9-0.9,10.2,0.3
+			c-1.2,1.2-2.2,2.6-3.7,3.5c-2.5,0.8-5.1,0.3-7.6,0.2c-0.2,2.8-0.2,5.7,0.2,8.5c-1.4-1.3-2.8-2.5-4.1-3.9c-0.4-1.3-0.9-2.5-1.3-3.8
+			c-3,0.9-7.5,0.9-7.7,4.9c-0.1-0.3-0.4-0.9-0.6-1.2c0-0.7,0.1-2,0.1-2.7C225.2,679.5,227.4,678.7,229.5,677.9z"/>
+		<path class="st4" d="M1702.7,671c3.3,0.4,6.7,0.4,10,1.1c0.9,1,1.7,2.2,2.6,3.4c3.1-0.3,5.7-2.1,8.7-2.8c2.7,0.4,5.1,2,7.5,3.2
+			c-0.7,0.1-2.1,0.4-2.8,0.5c-0.3,0.5-0.9,1.6-1.2,2.2c-0.8-0.1-1.6-0.2-2.4-0.3c-0.7-1.4-0.5-3.6-2.1-4.3c-2.8,2.9,2.1,8.4-2.2,11
+			c-0.1-1.6-0.1-3.2-0.1-4.8c-2.6,1.6-5,3.5-7.2,5.6c2.2,2,4.7,3.8,7.5,5.1c0-0.6,0.1-1.7,0.2-2.2c0.8-0.9,1.7-1.8,2.6-2.7
+			c-0.7,2.4-1.4,4.8-2.1,7.2c1.9-1.1,3.8-2.2,5.4-3.8c0,0.6-0.1,1.9-0.1,2.5c2.2-1.5,3.8-3.7,5.2-5.9l-0.4,0.9
+			c0.3,0.2,0.9,0.5,1.2,0.7v4.3c-2.5-0.3-6-0.6-7.2,2.2c1.1,2.2,3.4,0.7,4.9-0.1c0.7,0,1.5,0,2.3,0v2.4c-2.5,0.1-5-0.1-7.5-0.1
+			c1,3.5,4.2,5.6,6.7,7.9c-0.8,0.6-1.7,1.3-2.5,2c-0.1-0.6-0.4-1.9-0.5-2.5c-0.9,0-1.9,0-2.8,0c-0.1,2.7-0.2,5.5,1.3,7.8l-0.9-0.1
+			c-1.2-0.6-2.2-1.5-3.2-2.2c-0.7,0-2-0.1-2.7-0.1c0.8-0.7,1.7-1.4,2.5-2c-1.1-1.8-2.2-3.5-3.2-5.3c-0.5-0.7-0.9-1.5-1.3-2.2
+			c2.1-0.4,4.3-0.7,6.4-1.1c0-1.5,0-3,0-4.5c-2.4,0.1-4.9,0.2-7.3,0.4c0.8-0.9,1.6-1.8,2.4-2.7c-3.1-1.6-6,0.6-7,3.6
+			c-0.7-0.6-1.4-1.2-2-1.8c1.6-0.9,1.2-2.8,0.8-4.2c-1,0.8-2,1.6-2.9,2.5c-2.3-0.2-4.5-0.2-6.8-0.3c-0.2-1.2,0-2.2,0.6-3.1
+			c0.6,0.6,1.7,1.7,2.2,2.3c0.4-0.7,0.9-1.3,1.4-1.9c0.7-0.3,2-0.9,2.7-1.2c0.4-2,0.8-4.1,1.2-6.1c-0.7,0-2,0.1-2.6,0.1
+			c0.1-0.6,0.2-1.8,0.3-2.4c-0.7-0.4-2.1-1.2-2.8-1.7c1.7-0.8,3.5-1.5,5.3-2.2c-2.5-1.5-5.4-2-8.3-1.5
+			C1702.7,673,1702.7,671.7,1702.7,671 M1711.5,680.8c-0.3,2.1,0.5,2.9,2.5,2.6c2.6-1.5,5.6-3.7,5.4-7.1
+			C1716.6,677.6,1713.8,678.9,1711.5,680.8 M1711.2,685.5c-1.1,0.9-0.6,3.1,0.9,3.3C1714.2,688.7,1713.1,684.4,1711.2,685.5
+			 M1722.5,700.4c-2,2,1.2,3.5,2.5,4.7c0-0.8,0.1-2.4,0.1-3.2C1725.5,700.6,1723.1,698.8,1722.5,700.4z"/>
+		<path class="st4" d="M248.5,672.6c3.3-1.9,6.3,0.5,8.9,2.5c1.1,0.8,2.3,1.6,3.6,2.3c1.4-1.1,2.7-2.3,4-3.4
+			c-0.6,2.6-2.4,4.6-4.2,6.4c-2-0.5-4.1-1-6.1-1.5C252.7,676.7,250.6,674.6,248.5,672.6z"/>
+		<path class="st4" d="M1125.1,675.1c1.6-0.3,3.1-0.6,4.7-0.9c0,1.9,0.1,3.9,0.1,5.9C1127.3,679.7,1126.4,677,1125.1,675.1z"/>
+		<path class="st4" d="M1119.1,681.4c0.8-2.2,1.7-4.3,2.7-6.4c1.4,1.9,3,3.7,3.5,6.1C1123.2,681.3,1121.2,681.3,1119.1,681.4z"/>
+		<path class="st4" d="M1302.9,674.5c1.8,4,3.4,8,4.6,12.2c-1.4,1.7-2.5,3.7-3.2,5.8c1.1,1.4,2.4,2.8,2.3,4.7
+			c-1-1.3-2.1-2.5-3.2-3.7c0.1-2.4-0.1-4.8-0.3-7.1c-1.4,1.4-2.6,2.9-3.7,4.5c0.9,0.8,1.8,1.6,2.8,2.4c-2-0.1-4,0-6,0.1
+			c3.7-3,3.4-8.5,7.3-11.4c-1-0.6-1.9-1.1-2.9-1.6c-0.1-0.5-0.3-1.5-0.4-2c1.1,0.3,2.2,0.6,3.4,0.9
+			C1303.3,677.6,1303.2,676.1,1302.9,674.5z"/>
+		<path class="st4" d="M156,677.4l0.3-1.1c0.3,11-0.6,22,0.6,33l-0.2-0.7c-0.5-2-0.9-4-1.6-5.9c-0.7-2-3-2.8-3.7-4.7
+			c-0.6-2.5,1.8-3.9,3.3-5.4c0.1-2,0.3-3.9,0.4-5.8c0.1-1.7,0.1-3.3,0.2-4.9C155.4,680.4,155.7,678.9,156,677.4z"/>
+		<path class="st4" d="M1273.7,679.1c0-1.5,0.8-2.2,2.3-2l0.4,0.7C1276.7,679.3,1274.4,681.1,1273.7,679.1z"/>
+		<path class="st4" d="M1426.4,677.8c1.3,3.1,4.3,5.8,4,9.4c-2.2-1.2-4.8-2.2-6.5-4.2C1423.4,680.9,1425.4,679.4,1426.4,677.8z"/>
+		<path class="st4" d="M494.4,678.7c1.7,1.1,3.3,2.5,4.8,3.9c0.5-0.6,1.6-1.8,2.1-2.4c-0.2,2.2,0.2,4.5,1,6.6
+			c-0.6,1.1-1.2,2.2-1.9,3.3c-0.4-0.5-1.3-1.5-1.8-2c-0.3,1.4-0.5,2.8-0.7,4.2c-0.3-0.6-1-1.8-1.3-2.4c0.8-1.4,1.6-2.7,2.2-4.2
+			c-1.1-0.8-2.4-1.2-3.6-1.7C494.9,682.3,494.6,680.5,494.4,678.7z"/>
+		<path class="st4" d="M797.1,678.9c1.1,0.9,3,1.3,3.3,3c-0.2,1.2-0.5,2.4-0.8,3.6c-1.1,0-2.2,0-3.3,0.1
+			C795.5,683.3,795.6,681,797.1,678.9z"/>
+		<path class="st4" d="M836.5,679.2c1.6,0,3.8,0.5,3.2,2.7c-0.2,2.9-3.3,1.3-4.5,0C835.6,681,836,680.1,836.5,679.2z"/>
+		<path class="st4" d="M1727.3,681.4c1.9-0.1,3.8-0.2,5.7-0.3v0.8c-1.4,0.4-2.7,0.7-4,1.1c-0.2,1.5-0.3,2.9-0.5,4.4
+			c-0.7-1.4-1.8-2.4-3.1-3.3C1726.1,683.2,1726.7,682.3,1727.3,681.4z"/>
+		<path class="st4" d="M1274.6,682.9c1.2-0.4,2.4-0.8,3.6-1.2c0.2,1.5,0.3,3,0.2,4.5c-1,0.6-2,1.3-2.9,1.9
+			C1275.2,686.3,1274.9,684.6,1274.6,682.9z"/>
+		<path class="st4" d="M368.5,687.5c2.1-1.5,4.2-4.1,7-3.1c0.9,2.4-0.5,5-0.8,7.4c-2.1,0.3-4.3,0.1-6.4-0.3
+			C368.3,690.3,367,688.4,368.5,687.5 M369.3,690.5c1.8-0.2,4.8,1.2,5-1.5C373.6,686,368.1,687.4,369.3,690.5z"/>
+		<path class="st4" d="M138.1,689.5c1.6-1.5,3.1-3.1,4.9-4.3c3-0.1,5.3,2,7.4,3.8c-2.6,0.7-5.2,0.6-7.8,0.6c-0.2,0.4-0.7,1.1-1,1.5
+			c-0.8,1.2-1.5,2.3-2.2,3.5c-0.9-1-1.8-2.1-2.7-3.1C137.2,691,137.8,690,138.1,689.5z"/>
+		<path class="st4" d="M1113.6,693.6c1.1-2.9,2.4-5.7,3.8-8.4c1.8,0.3,3.7,0.5,5.5,1c0.1,2.2-2.4,2.8-3.7,4.2c1,2.2,2.2,4.2,2.9,6.6
+			c-0.7-0.1-2.1-0.3-2.8-0.5c-0.8-1-1.5-1.9-2.3-2.8C1116.2,693.6,1114.5,693.6,1113.6,693.6z"/>
+		<path class="st4" d="M2,685.8c1.5,0.1,3.4-0.6,4.3,1.1c0,0.8-0.1,2.4-0.2,3.2c-1.7-0.6-3.4-1.3-5.1-2.1
+			C1.3,687.4,1.8,686.3,2,685.8z"/>
+		<path class="st4" d="M485.5,685.9c2.1,0.5,4.6,0.3,6.2,2c-0.9,0.9-2.1,2.4-3.5,1.9C486.5,689.3,486.3,687.2,485.5,685.9z"/>
+		<path class="st4" d="M1258.9,687.1c1.1-0.4,2.3-0.7,3.5-1.1c0.5,0.3,1.6,1,2.1,1.3c-1.1,0.9-2.2,1.8-3.3,2.8
+			C1260.4,689.1,1259.7,688.1,1258.9,687.1z"/>
+		<path class="st4" d="M822.3,687.4c1.3-1,3.3-1.3,4.2,0.5c0,2-1.1,6-3.9,4.5C822,690.8,821.1,688.9,822.3,687.4z"/>
+		<path class="st4" d="M1432,687.5c1.5,0.5,3.1,1,4.6,1.5c-3.1,9.5-7,19.3-4.8,29.5c-0.6-0.2-1.8-0.6-2.4-0.8
+			c0.8-3.8,1.1-7.7,1.1-11.5c0-3.6,1.8-6.8,3-10.1c-1.1-0.6-2.1-1.1-3.2-1.7C1430.9,692,1431.5,689.8,1432,687.5z"/>
+		<path class="st4" d="M1021.8,696.2c-1.2-1.8-3.6-4.8-0.9-6.4C1023.2,691,1021.9,694.2,1021.8,696.2z"/>
+		<path class="st4" d="M798.7,697.8c3.1-2.1,5.7-5.5,9.4-6.5c3.3,0.4,6.3,2.6,9.6,3.3c0,0.6,0.1,1.7,0.1,2.2c-2.5,0-5.1-0.1-7.5,0.4
+			c-1.4,3.8-1.9,10,2.5,12c2.5,1.5,5.2,3.2,6.8,5.8c0.9,5.3-6.5,6.1-7,11c-0.2-1.6-0.4-3.2-0.9-4.8c-1.8-1.2-4.5-3.4-6.4-1.2
+			c-1,1.4-1.6,3.1-2.2,4.7c2.7,0.8,5.4,1.8,7.4,3.8c-2.1,1.7-4.3,3.3-6.2,5.2c0.1-0.8,0.2-2.3,0.3-3c-2.1-0.6-4.1-1.2-6.2-1.8
+			c-0.1-2.8,1.7-4.8,3.4-6.8c-1.1-1.1-2.3-2.1-3.3-3.3c0.7-2,2.7-3.2,4.7-3.5c2.8,0.6,5,2.9,7.8,3.5c1.5-0.7,2.9-1.8,4.3-2.7
+			c-1.4-1.8-2.7-3.5-4-5.3c-2.4,1.8-5.3,1.9-8.1,1.2c-1.9,0.6-3.8,1.2-5.6,1.8c0.1-1.9,0.2-3.8,0.3-5.7c-2.4,0.9-5.2,1.4-6.9,3.5
+			c-1.7,3.2-2.3,7-4.8,9.8l0.3-0.9c1.4-4.5,3.9-8.8,4.2-13.6c0.2-3.8,0.5-7.5,1.1-11.3c0.2,3,0.5,5.9,0.8,8.9c1.7-0.7,3.4-1.3,5.1-2
+			C797.8,701,798.3,699.4,798.7,697.8 M799,699.5c1.4,0.9,2.7,1.8,4.1,2.7c-0.5,2.3-1.4,4.5-2.7,6.5c2.8-0.7,5.3,0.4,7.5,2
+			c1.1-5.5-0.6-11.1-0.1-16.7C804.4,695.1,801.4,697,799,699.5z"/>
+		<path class="st4" d="M1583.9,694.5c1.7-1.5,3.6-2.8,5.7-3.4c1.2,1.9,0.8,3.9-0.6,5.5c-0.8-0.8-1.7-1.6-2.5-2.5
+			C1585.7,694.2,1584.8,694.3,1583.9,694.5z"/>
+		<path class="st4" d="M1555,693.6c1.6-0.3,3.2-0.6,4.8-0.8c0.1,0.7,0.2,2,0.3,2.7C1558.4,694.8,1556.7,694.2,1555,693.6z"/>
+		<path class="st4" d="M831.8,700.2c1.2-3.1,4.6-3.2,7.5-3.8c0.8,0.8,1.7,1.5,2.5,2.3c0-0.5,0-1.5,0-2c0.9,4.2,1.1,8.6,1.4,12.9
+			c-0.9-3-1.7-6-2.4-9.1C837.9,702,834.7,701,831.8,700.2z"/>
+		<path class="st4" d="M1548.7,700.8c1.4-1.7,2.7-3.4,3.8-5.2c1.1,1.8,2.1,3.6,3.1,5.4c-2,0.2-4,0.4-6,0.4
+			C1549.4,701.3,1548.9,701,1548.7,700.8z"/>
+		<path class="st4" d="M1577,696.3c2.5,0.5,5.1,1,7.7,1.5c-0.8,1.3-1.6,2.5-2.3,3.8c2.9-0.4,5.8,0.2,8.7,0.8c0.9-1,1.7-2,2.6-3.1
+			c1.2,0.2,2.4,0.5,3.7,0.8c-0.2,0.3-0.6,0.9-0.8,1.2c-2,2.7-4.5,4.8-6.9,7c3.7,0.6,8.8-0.1,10.2-4.2c0.7,0.9,1.3,1.8,2,2.8
+			c-1,1-2,2.1-3,3.2c-0.6-0.4-1.7-1.2-2.2-1.6c-0.4,0.9-0.9,1.8-1.3,2.7c-0.2-1.6-1-2.3-2.4-2.2c-0.9,3.2,0.7,6.6,3.9,7.6
+			c-1.4,2.1-3.2,4-4.2,6.3c1.4-0.1,2.8-0.2,4.2-0.3c-0.2,1.1-0.4,2.2-0.5,3.3c-2.6-0.3-4.5-2.3-6.3-4c0.7-1,1.4-1.9,2.1-2.9
+			c-0.1-2-0.2-4-0.3-6c-1.3,1.3-2.7,2.7-4,4c-0.9-0.6-1.7-1.3-2.6-1.9c0.5-3.3,0.8-6.7,1-10.1c-1.2-1-2.7-1.6-4.2-1.6
+			c-2.5,2.4-2.7,6.2-3.6,9.4c-1.6-0.9-3.2-1.7-4.8-2.6c0,1.7,0,3.5,0,5.2c1.7,0,3.5,0,5.3,0c-0.2,1-0.3,1.9-0.4,2.9
+			c-1.5,0.2-2.9,0.3-4.4,0.5c-0.7,1.4-1.4,2.7-2,4.1c-1.2-0.2-2.3-0.3-3.4-0.5c-1.9,2.7-4.9,4.1-7.5,5.9c0.7,0.8,1.6,1.6,2.5,2.3
+			c1.2-1,2.3-2.1,3.5-3.1c0.1,0.5,0.3,1.5,0.4,1.9c0.3,0.1,1.1,0.3,1.4,0.4c-1,0.9-2,1.8-2.9,2.7c-2.7-1.1-5.3-2.4-7.5-4.3
+			c3.4-1.7,5.6-4.8,7.4-8.1c-2-1.7-3.6-3.8-4.3-6.3c0.6-0.7,1.3-1.3,2-2c0.5,1.9,1.1,3.8,1.7,5.6c1-1.5,1.9-3.1,2.9-4.7l0.2-0.4
+			c1,2.4,1.2,5.5,3.7,7c0.9-0.6,1.7-1.2,2.6-1.8c-2.3-3.1-2.3-6.9-2.4-10.6c1.1-0.2,2.2-0.4,3.3-0.5c2.2-2.1,4.5-4.2,5.8-7
+			c-1.7-0.1-3.3-0.1-4.9-0.2C1576.6,698.3,1576.8,697.3,1577,696.3 M1588.1,711.2c-0.5,1.6,0,2.2,1.6,1.7
+			C1590.3,711.3,1589.7,710.8,1588.1,711.2z"/>
+		<path class="st4" d="M973.2,697.4c3,1.3,5.9,2.9,9.2,3.5c0.5,0.7,1.1,1.5,1.6,2.2c-0.6,2,0,4.9-2.2,6c-1-1.2-1.8-2.6-2.5-3.9
+			c-1.1-1.8-2.2-3.6-3.2-5.4c-1.4,0-2.7-0.4-3.9-1C972.5,698.5,973,697.8,973.2,697.4z"/>
+		<path class="st4" d="M1264.1,699c-2.4,0-0.9-3.1,0.8-2l0.5,0.7C1265.1,698.1,1264.4,698.7,1264.1,699z"/>
+		<path class="st4" d="M232.6,699.8c1.3-0.2,2.7-0.3,4.1-0.5c0.5,1.1,1,2.2,1.5,3.4c-1.3,1.4-2.7,2.8-4,4.2
+			c-1.2-2.2-2.2-4.4-3.1-6.7C231.4,700.1,232.2,699.9,232.6,699.8z"/>
+		<path class="st4" d="M0.7,700l1.5-0.4c0.2,0.7,0.8,2.1,1,2.8c0.1,0.3,0.4,1,0.5,1.3c0.5,0.2,1.5,0.5,2.1,0.7
+			c-0.6,0.4-1.1,0.9-1.7,1.4c2.9,2.1,6.1,4.1,7.9,7.3c0.9,2.8,2.5,6.4-0.3,8.7c-1.9,0.5-3.9,0.7-5.8,1.3c-1.3,1.2-1.8,3-2.6,4.6
+			c-0.5,1.1-1,2.2-1.4,3.2c-0.6-0.7-1.2-1.4-1.9-2.1V717c1.5-0.2,3.1-0.3,4.7-0.4c-0.5-0.9-1-1.9-1.5-2.8c-1.1-0.4-2.1-0.8-3.2-1.1
+			V704C2.1,703.6,2.9,700.8,0.7,700 M3.5,709.6c-0.4,2.8,1.7,5,3,7.2c-0.1,1.2-1.8,3-0.2,3.8c1.4,1.4,3.9,1.1,4.8-0.7
+			C13.1,715.2,9.1,708.4,3.5,709.6 M1.2,718c-0.1,0.8-0.2,2.5-0.3,3.3c0.9,0.1,2.7,0.3,3.6,0.4C5.7,719.3,3.8,716.3,1.2,718z"/>
+		<path class="st4" d="M1313.1,701.3l0.5-0.2c1.2,2.5,2.3,5,3.3,7.6c-0.9,0-2.7-0.1-3.6-0.1c-0.7,0-2.1-0.2-2.9-0.2
+			c-0.4,1-0.8,2-1.2,2.9c-1,0-3,0-4-0.1c0.3-0.6,0.9-1.7,1.2-2.3c0.6-1.6,1.2-3.3,1.7-4.9c-1.6,0-3.1,0.1-4.7,0.1
+			c0.1,1.3,0.2,2.6,0.3,4c-0.3,0.4-1.1,1.3-1.4,1.8c-0.6-1.3-1.1-2.6-1.7-3.9c0.7-1.2,1.4-2.4,2.1-3.5
+			C1306.2,703.2,1309.8,703.2,1313.1,701.3z"/>
+		<path class="st4" d="M1422.2,702c3.8-0.7,0,4.6-1,1.2C1421.5,702.9,1421.9,702.3,1422.2,702z"/>
+		<path class="st4" d="M517.8,704.1c0.6-0.5,1.9-1.4,2.5-1.9c0.3,2.3,0.5,4.7,0.1,7.1c-0.4,0.4-1.2,1.2-1.6,1.5
+			C516.2,709.4,517.7,706.3,517.8,704.1z"/>
+		<path class="st4" d="M1399,707.4c2.5-1.1,4.9-2.5,7.3-3.8c2.4,2.4,0.4,6-2,7.6c-0.4,0.2-1.2,0.6-1.6,0.8
+			C1402.4,709.7,1401.8,707.4,1399,707.4z"/>
+		<path class="st4" d="M828.1,708.4c1.4-0.3,3.4-1.8,4.5-0.2c0.2,1.7-0.6,3.3-1,4.9C829.6,712.1,828.7,710.3,828.1,708.4z"/>
+		<path class="st4" d="M1011.5,710c0.1-1.4,1.3-2.3,2-3.4c2.2,1.2,4.3,2.4,6.6,3.5c0.3,0.4,0.8,1.3,1.1,1.7c-0.4,2-0.7,3.9-0.9,5.9
+			c1.3-0.1,2.7-0.2,4-0.4c-1.4,3-2.2,6.2-2.1,9.5c-0.7-2.1-1.2-4.3-2-6.4c-2.4,0.8-4.6,2.3-7.1,2.4c-1.1-0.8-2-1.9-2.9-2.9
+			c0.8-1.8,2.7-2.3,4.4-2.8c0.7-1.1,1.5-2.2,2.1-3.3C1015.1,712.3,1013.2,711.3,1011.5,710z"/>
+		<path class="st4" d="M1552.8,708.2c2-1,4.3-1.2,5.6,1C1556.5,710.5,1554.3,709.8,1552.8,708.2z"/>
+		<path class="st4" d="M1131.5,708.5c1.1,0,2.2,0.3,3.3,0.4c-0.4,1-0.8,1.9-1.2,2.9c-0.9,2.3-0.9,4.8-1.7,7.1
+			c-0.8,1.5-2.5,1.5-4,1.6c0.5-1.5,1.1-3,1.6-4.6c-0.6-0.4-1.7-1.3-2.3-1.7c0.3-0.4,0.8-1.2,1.1-1.6
+			C1129.4,711.3,1130.3,709.8,1131.5,708.5z"/>
+		<path class="st4" d="M1288.5,710.2c0.4-0.8,1.1-2.4,1.5-3.3c0.8,1.2,2.8,3.2,1.1,4.5C1290.4,711.1,1289.2,710.5,1288.5,710.2z"/>
+		<path class="st4" d="M1116.3,710.3c1.3-1.4,3.6,0.9,2.1,2.2C1117.1,714,1114.8,711.6,1116.3,710.3z"/>
+		<path class="st4" d="M125.2,710.8c0.7,0.9,1.3,1.7,2,2.6c0,2.4,0,4.9,1.2,7c1,2.7,3.8,5.8,1.4,8.6c-1-1-1.9-2.1-2.8-3.2
+			c-0.3-0.9-0.5-1.8-0.8-2.7c0.5-0.7,1-1.5,1.5-2.2c-1.2-0.5-2.4-1-3.7-1.4c-0.7-0.3-2-0.8-2.7-1.1c1.1-1.4,2.6-2.4,4-3.4
+			C125.4,713.6,125.2,712.2,125.2,710.8z"/>
+		<path class="st4" d="M527.2,712.8c1.3,2.5,3.2,4.7,4.3,7.4c0.1,2.1-0.5,4.2-0.3,6.2c0.7,0.4,2.2,1.2,3,1.6c-1.7,2.2-3,4.6-4.3,7
+			c0.2,0.5,0.8,1.6,1,2.1c-0.6-0.3-1.9-0.8-2.5-1.1c0.6-2,1.2-4,1.8-6c-0.8-0.1-2.3-0.4-3.1-0.5c-1,1.5-2,3-2.9,4.5
+			c-2.6-1.3-5.1-2.8-7.5-4.4c2.9-4.5,5.2-9.7,10-12.4C526.8,715.7,527,714.2,527.2,712.8z"/>
+		<path class="st4" d="M1281,712.7c2.1,0.4,4.2,0.7,6.3,1.2c0.3,0.1,1,0.4,1.4,0.5c0.3,1.1,0.6,2.2,0.9,3.3c1.9-0.6,3.9-1.1,5.8-1.9
+			c1.1,2.1,2.4,4.3,4.9,4.9c-0.3-1.8-0.6-3.5-0.9-5.2c2.4,1.7,2,4.6,1.9,7.2c-1.4,1.8-2.6,3.8-3.8,5.7c0.7,1.5,2.1,2.8,2,4.6
+			c-0.6,2.4-3.5,2-5.4,2.6c1.3,0.1,2.6,0.3,4,0.5c-1.3,0.7-2.6,1.4-3.9,2.1c-1.4-0.3-2.7-0.7-4-1c1.2-2,2.5-4.1,3.8-6.1
+			c-3.9,0-6.6,2.5-8.3,5.8c-0.6-3-0.8-6.1-0.9-9.2c-2.1,2.7-3.4,5.9-5.3,8.7c-2.3,2.6-5.8,3.7-8.9,5c-0.5,0-1.5,0-2,0
+			c1.7-2.2,3.6-4.3,5.6-6.3c-0.4-0.6-1.2-1.8-1.6-2.4c2,0.6,4.1,1.4,6.2,1.8c2.2-1.5,2.7-4.1,3-6.5c-1.7,0.8-3.3,1.7-4.9,2.6
+			c-1.3,0.1-2.6,0.2-3.8,0.4c0.1-0.3,0.2-1,0.3-1.3c-1.4-1.7-2.4-3.7-3.6-5.5c-1.8-2.1-5.4-3.9-3.1-7l1.3,0.6c1.3,0.9,2.7,1.9,4,2.8
+			c0.7-0.5,1.5-1.1,2.3-1.6c-0.2,0.6-0.6,1.8-0.8,2.5c1.4-0.1,2.8-0.2,4.2-0.3c0.4,0.6,0.8,1.2,1.2,1.9c-0.6,1.6-1.1,3.2-1.6,4.8
+			c1.5-0.4,3-0.8,4.6-1.1c-0.2-1.2-0.5-2.4-0.6-3.6C1283.1,719.9,1282.6,716,1281,712.7 M1283.9,718.9c1.3,2.1,3.9,3.8,6,1.4
+			c-0.5-0.5-1.5-1.4-2.1-1.9c-0.5-1.2-0.6-2.8-2-3.2C1283.7,714.1,1282.5,717.6,1283.9,718.9 M1287.4,722.5c1.9,1.5,3.5,3.2,5,5.2
+			c0.1-0.4,0.3-1.2,0.4-1.6c1.5,0.4,3.3,1.6,4.7,0.2c0.9-2.2-0.9-4.1-2.6-5.2c0.3-0.7,0.7-1.4,1-2.1
+			C1293.2,720.6,1290.4,721.8,1287.4,722.5 M1285.7,727.2c0.4-0.5,1.3-1.6,1.7-2.2c-1.2-1.3-2.4-2.6-3.6-4
+			C1281.2,723.1,1283.9,725.7,1285.7,727.2 M1271.5,724.8c-0.2,1.8,1.5,2.9,2.5,4.1c1.2-1.4,2-3.1,2.2-4.9
+			C1274.7,724.1,1272.9,723.6,1271.5,724.8 M1286.3,728c-0.1,1.5-0.2,3-0.3,4.5c1.2-0.6,3.8-0.5,3.4-2.5
+			C1288.6,729,1287.4,728.6,1286.3,728 M1294.3,733.3c1.1,0.2,2.3,0.3,3.5,0.3c-0.2-1.2-0.4-2.4-0.9-3.6
+			C1295.2,730.3,1294.8,732,1294.3,733.3z"/>
+		<path class="st4" d="M1134.2,714.5c2.6-0.5,5.2-0.7,7.8-1c0,1.7,0,3.3,0,5c-0.9-0.6-1.8-1.2-2.7-1.8c-0.3-0.3-0.9-0.9-1.2-1.2
+			C1136.8,715.1,1135.4,714.8,1134.2,714.5z"/>
+		<path class="st4" d="M1410.2,714.1c0.5,0.2,1.3,0.6,1.8,0.8c0.1,1.3,0.2,2.6,0.3,3.9c1.5-1.1,3-2.3,4.7-3
+			c3.7-0.9,7.2,0.8,10.4,2.3c0.2,2.6-0.5,5.8,1.6,7.8c2.7,3.1,4.5,7,8.1,9.3c-0.3,1.5-0.7,3-1,4.5c-0.4-0.1-1.1-0.2-1.4-0.3
+			c-0.7-2-1.4-4-2.1-5.9c-1.1-0.4-2.1-0.7-3.1-1c-1.4-1.8-2.5-4.1-4.7-5.2c-2.3-0.7-4.7-0.7-7-0.9c-0.8-1.6-1.6-3.1-2.3-4.7
+			c-0.5,1.3-0.9,2.6-1.4,3.9c-1.5-0.4-3-0.8-4.6-1.1c-1.8-0.5-1.6,2.2-2.2,3c-3.1,1.2-6.4,0.8-9.6,0.7c-1.3-2.3-2.7-4.6-3.9-7
+			c-0.2,0.5-0.7,1.4-1,1.9c-1.6,0.2-3.2,0.2-4.7,0c0.6-2.1,1.4-4.3,4-4.4c0.5,0.1,1.6,0.4,2.1,0.6c0.3-0.1,1-0.2,1.3-0.3
+			c0.1,2.7,0.1,5.9,3.1,6.9c0.9,0.7,2.1,0.3,3.1,0.4c1.5,1.3,3.5,0.3,5.2,0c-0.7-2.2-1.6-4.4-2.5-6.5c-0.1-0.4-0.2-1.3-0.3-1.7
+			C1407.2,718.4,1408.9,716.4,1410.2,714.1 M1416.2,717.4c-0.2,0.2-0.7,0.6-1,0.8c0.6,2.7,2.9,4.8,4.1,7.3c3.8,1.2,8-3.5,6.1-7
+			C1422.4,717.7,1419.3,717.3,1416.2,717.4 M1406.1,719.8c0.4,1.3,1,2.5,1.8,3.6c2.6-0.3,1.9-3.7,2.2-5.5
+			C1408.7,718.5,1407.4,719.2,1406.1,719.8z"/>
+		<path class="st4" d="M553.5,715.3c1.6,1.2,3.2,2.4,4.9,3.4c-2,0.7-3.5,2.3-4.9,3.8c-0.9-0.7-1.8-1.4-2.7-2.1
+			C551.7,718.7,552.6,717,553.5,715.3z"/>
+		<path class="st4" d="M834.6,717c0.6-1.9,2.8-1.6,4.4-1.9c0.9,2.7,0.3,5.2-2,6.8C835.9,720.4,834.3,718.9,834.6,717z"/>
+		<path class="st4" d="M365,715.9c3,0.6,6.1,0.5,9,1.6c-2.1,2-4.2,3.8-6.4,5.7c-0.8-1.6-1.6-3.2-2.3-4.8c-0.7-0.1-2-0.4-2.7-0.5
+			C363.4,717.1,364.2,716.5,365,715.9z"/>
+		<path class="st4" d="M1702.7,718c1.4-0.3,2.9-0.7,4.3-1c-1.1,1.1-2.2,2.1-3.3,3.1c0.1,0.8,0.4,2.3,0.6,3.1
+			c0.8-0.8,1.6-1.5,2.4-2.2c0.6,1,1.2,1.9,1.9,2.9c-0.2,1-0.4,2-0.5,3c-1.6-0.2-2.4,0.5-2.5,2c-1-0.9-2-1.7-3-2.5
+			C1702.6,723.7,1702.6,720.8,1702.7,718z"/>
+		<path class="st4" d="M1726.5,723.6c1.8-2.4,4.1-4.4,6.5-6.3v3c-0.7,1-1.3,2-2,3c-1.5,1.6,1.2,2.8,2,3.8v0.1
+			c-2.6-1.5-2.6,3.4,0,1.8v0.3c-2.5,0.8-4.9,1.4-7.4,2.1c-0.4,1.1-0.7,2.3-1,3.4c-0.6,0.1-1.9,0.3-2.5,0.4l-0.2-0.3
+			c1-1,2-2.1,3.1-3.1c-0.9-0.2-2.6-0.7-3.4-1c-2.8,2.8-5.6,6.5-10,6.1l-0.3-1.1c1.3,0.8,2.2,0.6,2.8-0.8c-0.6-1.2-1.6-1.6-3-1.1
+			c-0.2-0.3-0.7-1-1-1.4c-0.5,0.3-1.6,0.9-2.1,1.2c1.2-1.7,2.5-3.4,3.8-5c-0.3-0.6-0.9-1.7-1.3-2.2c0.9-0.9,1.8-1.8,2.7-2.6
+			c0.4-1.3,0.8-2.5,1.2-3.8c1.6,0.2,3.3,0.4,4.9,0.5c-1.7,0.3-3.3,0.7-5,1.1c0.5,1.4,0.8,3.1,2.5,3.6c-1.1,1-1.5,2.3-1.4,3.8
+			c-0.5,1.1-1.1,2.2-1.6,3.4c1.7-0.5,3.2-1.2,4.7-2.2c0.7-0.2,2.1-0.5,2.8-0.7c-0.1-0.8-0.3-2.5-0.4-3.4c0.7,1.3,1.4,2.5,2.2,3.8
+			c1-0.3,2-0.6,3-0.9c-1.3-2.2-2.7-4.3-4-6.4c-0.8,0-2.3,0-3.1,0.1c0.3-0.6,0.9-1.7,1.2-2.2c1.2-0.1,2.5-0.2,3.8-0.3
+			c-0.3,2.1,0.6,4.1,1.6,5.9C1725.9,725.3,1726.2,724.5,1726.5,723.6 M1727.2,727.2c-1.4,0.8-0.1,3.3,1.3,2.2
+			C1729.8,728.6,1728.6,726.1,1727.2,727.2z"/>
+		<path class="st4" d="M1324.3,719.2c1.8,1.8,3.8,3.5,5.9,5.1c-2.1,1.4-5.8,2.3-5.5,5.5c0.8,0.2,2.4,0.6,3.2,0.9
+			c0.6-0.8,1.2-1.5,1.8-2.2c0.9,1.9,2.1,3.7,3.5,5.3c0.8-0.7,1.5-1.3,2.3-1.9c-0.2-0.4-0.5-1.1-0.7-1.5c0.7-0.8,1.4-1.6,2.2-2.4
+			c2.4-0.1,4.9-0.2,7.4-0.2c0.5,4.9,0.5,9.8-0.1,14.7l-0.3-1.1c-0.1-0.6-0.2-1.8-0.2-2.4c0-2.1-0.6-4-1.7-5.8
+			c-0.5,0.2-1.6,0.6-2.1,0.8c-0.9,0.4-1.8,0.8-2.7,1.2c0-1.7-0.7-2.3-2.1-1.9c-0.8,1.2-0.5,2.2,0.7,3.1c-2.1,2.2-4.6,0-6.5-1.1
+			c-3.1-2.1-6-4.5-7.5-8c-1.8,0.2-3.2,1.1-4.4,2.4c0.5,1.5,2.5,2.9,1.7,4.6c-4.2,1.4-9.9,1.8-11.2,6.9c-1.5,0-2.9-0.1-4.3-0.2
+			c1.6-2.4,5.3-4,4.6-7.3c-2.6,0-4.4,2-6.5,3.1c-0.9-0.9-1.4-2-1.6-3.4c2.2-1.2,4.4-2.6,6.8-3.6c1.9,0.3,3.2,1.9,4.7,2.9
+			c2-4.1,6.5-5.7,9.7-8.6c-0.1,0.5-0.1,1.4-0.2,1.8c1.4-0.4,2.8-0.8,4.2-1.2c0-0.5,0-1.4,0-1.8c-0.7-0.2-2.1-0.7-2.8-1
+			C1323.3,720.8,1323.8,720,1324.3,719.2 M1314.3,730.3c-0.9,1-1,2.3-0.5,3.7c1.3,0.6,4-0.1,3.3-2
+			C1317.4,730.6,1315.4,729,1314.3,730.3z"/>
+		<path class="st4" d="M1132,724c-1.1-1.5-0.7-2.6,1-3.2c1.6-0.2,2.6,1.4,3.9,2.1C1135.6,723.7,1133.5,725.8,1132,724z"/>
+		<path class="st4" d="M1577.3,721.5c0.6-0.1,1.9-0.2,2.5-0.2c0.4,1.1,0.9,2.3,1.4,3.4c0.7,0.3,2,0.9,2.6,1.2
+			c-0.7,2.4-3.5,2.6-5.4,3.1C1577.6,726.5,1577.2,724,1577.3,721.5z"/>
+		<path class="st4" d="M1139,725c-1.6-2.7,2.1-3.2,3.9-2.6C1142.2,723.7,1140.3,727.7,1139,725z"/>
+		<path class="st4" d="M829,729.1c2.2-2.2,3.9-4.8,6.2-6.9c3.7,3.8-1.4,7-4.2,9.1C830.3,730.6,829.6,729.8,829,729.1z"/>
+		<path class="st4" d="M166.5,724.1c2.2,0.8,4.5,1.6,6.6,2.6c-0.9,0.1-2.7,0.4-3.6,0.5c-1,0.6-1.9,1.3-2.8,1.9
+			c-1.3-0.9-2.5-1.8-3.8-2.6C164.1,725.7,165.3,724.9,166.5,724.1z"/>
+		<path class="st4" d="M965,725.2c1,0.3,2.1,0.6,3.1,0.9c1.5,0.6,2.9,1.1,4.4,1.7c0,0.6,0,1.2,0.1,1.8c-0.9,0.4-1.9,0.7-2.8,1.1
+			c-0.5,0.2-1.6,0.6-2.2,0.8C965.2,730.2,965.1,727.6,965,725.2z"/>
+		<path class="st4" d="M339.7,727c0-0.4-0.1-1.2-0.1-1.6c1.3,2.3,3.8,4.7,1.8,7.4c-3,0.2-6.3,0-9,1.6c-1.5,1.7-0.8,4.2-1,6.3
+			c-1.2-0.1-2.4-0.2-3.6-0.3c-0.8-2.3-2-4.3-3.4-6.3c0.8-1.4,1.6-2.8,2.4-4.2c-1.3-0.5-2.6-1-3.9-1.4c1.7-0.1,3.3-0.3,5-0.5
+			c0.3,1.5,0.5,3,0.8,4.5c0.9,0.1,1.9,0.2,2.8,0.4c1-1.6,2-3.2,3.1-4.8c1.7,1.7,3.5,3.6,6.1,3.3C340.4,729.8,340,728.4,339.7,727z"
+			/>
+		<path class="st4" d="M1260.2,727.2c0.2-0.4,0.6-1.3,0.9-1.7c0.4,4.9,1.1,9.9,2.2,14.7c-1.7-1.4-3.4-2.9-5.2-4.2
+			c-0.2-0.1-0.5-0.2-0.7-0.3c-0.1-1-0.2-2.1-0.3-3.1C1258.1,730.8,1259.2,729,1260.2,727.2z"/>
+		<path class="st4" d="M1539.3,725.4c0.2,0.2,0.7,0.6,1,0.8c1.5,1.6,2.8,3.4,4.2,5.2c1.5,0,3-0.2,4.5,0c1.2,1.4,2.1,3.1,3.3,4.5
+			c1.4,0.9,3.2,0.4,4.8,0.6c0.2-1.5,0.4-2.9,0.6-4.3l0.6-0.4c0,1.4,0,2.9,0,4.3c-0.7,0.7-1.3,1.4-2,2.1c-1,0.4-2.1,0.8-3.1,1.1
+			c-1.9-0.3-3.8-0.6-5.6-0.8c0.1-0.5,0.3-1.1,0.5-1.6c0.4-1.8,2.1-4.9-0.9-5.2c-0.4,0.3-1.1,1-1.5,1.4c-0.5,0.6-0.9,1.1-1.4,1.7
+			c-0.8-0.2-2.3-0.7-3.1-0.9l0,0.3c-0.3,2.3-0.5,4.7-0.6,7c-0.2-2.2-1.4-4.1-2.8-5.6c0.4-1,0.8-2,1.3-3c0.3-0.2,1-0.5,1.4-0.7
+			c-0.4-1.8-0.7-3.6-1-5.5L1539.3,725.4z"/>
+		<path class="st4" d="M1602.9,726.4c2,0.4,4.1,0.7,6.2,1.1c-0.2,0.3-0.5,0.9-0.6,1.2c0.4,0.2,1.4,0.5,1.8,0.7
+			c-2.5,0.1-6.1-0.7-6.2,2.9c1.8,0.1,3.6,0.1,5.5,0.2c1.6,2.6,4.2,4.6,7.4,4.9c1.7,0.7,2.5-1.2,3.3-2.3c0.7,0.6,1.4,1.2,2.2,1.8
+			c-0.2-3.4,0.6-7.1,3.7-9c1.9-1,4.3-0.1,6.4-0.2c-1,0.8-2,1.6-3,2.4c1.2,2.3,2.4,4.6,3.4,7c-0.1,1.9-0.1,3.8-0.1,5.7
+			c-2.5-0.1-4.9-0.3-7.4-0.3c-2.9-1.4-5.5-3.2-8.4-4.5c-2.8,0.1-5.6,0.6-8.4,0.9c0.2-1.3,0.5-2.7,0.7-4c-0.7-1.7-2.6-1.2-4-1.4
+			c-0.5,1.5-1,3-1.5,4.5c-1.4-0.4-2.9-0.8-4.3-1.2c0-1.4,0.1-2.8,0.1-4.1c0.5-0.3,1.5-0.8,2-1
+			C1601.8,729.9,1602.3,728.1,1602.9,726.4 M1625.9,737.2c1.2-1.4,2.4-2.7,3.6-4.1c-0.4-1.4-0.8-2.9-1.1-4.3
+			C1624.9,729.6,1621.3,735.3,1625.9,737.2z"/>
+		<path class="st4" d="M1383.1,729.9c3.3,0.5,6.4-0.6,8.8-2.9c0.1,0.7,0.4,2.1,0.6,2.9c-3.9,0.9-7.9,1.4-11.8,2
+			c1.6,1.5,3.4,2.8,4.9,4.5c0.2,1.6-0.8,3.1-1.2,4.6c-0.7-0.1-2.1-0.2-2.8-0.2c-0.3-2-0.6-4.1-0.8-6.1c-1.2-0.6-2.4-1.2-3.6-1.9
+			c2.1-2,4.5-3.7,7-5.2C1383.8,728.2,1383.3,729.4,1383.1,729.9z"/>
+		<path class="st4" d="M244.2,728c1.4,0.6,3.6,0.7,4.2,2.5c0.3,1.7,0,3.4,0,5.1c3.3,0.2,3.6-3.1,4.4-5.5c1.1,0.1,2.2,0.2,3.3,0.4
+			c-0.7,0.3-2.2,0.8-2.9,1.1c0.8,2.1,1.5,4.3,2.1,6.5c-0.6-0.3-1.9-1-2.6-1.3c-0.9,1.6-1.8,3.2-2.6,4.8
+			C248,737.1,246.4,732.5,244.2,728z"/>
+		<path class="st4" d="M353.6,728.6c0.3-0.3,1-1,1.3-1.4c2.6,0.7,4.3,3,6.3,4.6c1,3,1.8,6.1,1.2,9.3c-0.9,0-2.6,0.1-3.4,0.1
+			C355.4,738.1,355.5,732.8,353.6,728.6 M357.2,731c-0.1,2.4-1,5.2,0.5,7.4c1.2,0.5,2.6,0.1,3.8,0
+			C361.1,735.4,360.7,731.9,357.2,731z"/>
+		<path class="st4" d="M1075.8,728.8c1.8-0.4,3.7-0.7,5.5-0.9c-0.2,2.4,1.4,4.1,3.2,5.4l0.4,0.5c-2.5,1.3-5.6,2.2-6.8,5
+			c0.8,1.2,1.8,2.2,2.7,3.3c-1.3,0-2.6-0.1-3.9-0.1c-0.3-1.5-0.5-3.1-0.7-4.6c1-1.1,2.5-1.9,3-3.4c-0.2-1.5-0.4-2.9-0.7-4.4
+			C1077.9,729.5,1076.5,729.1,1075.8,728.8z"/>
+		<path class="st4" d="M540.2,733.7c0.4-1.4-0.5-4.4,1.8-4.3c2,0,1.3,2.9,1.9,4.2C542.6,733.6,541.4,733.6,540.2,733.7z"/>
+		<path class="st4" d="M947.7,732.3c0.8,0.3,1.6,0.6,2.4,0.9c-0.2,2.6-0.1,5.3,0.4,7.9c2.1-1,4-2.4,4.8-4.6c1.2-0.6,2.3-1.2,3.5-1.6
+			c2.1-1.3,4.8,0.8,5.6,2.8c-0.8,1.2-1.8,2.4-2.8,3.5c1.9,0,3.9,0,5.9,0c-0.1-1.1-0.3-2.2-0.4-3.2c3.1,0,6.2,0.2,9.3,0.4
+			c0.1,0.8,0.3,2.4,0.5,3.2c-6.4-0.1-12.7,1.4-19,0.3c-5.7,0.4-11.4,0.9-17.2,0.8C945.8,741.7,947.1,736.5,947.7,732.3z"/>
+		<path class="st4" d="M1243.9,732c1.5-0.6,3.1,1.2,2.5,2.7C1244.7,735.4,1243,733.5,1243.9,732z"/>
+		<path class="st4" d="M1367.5,731.3c0.9,0.2,2.6,0.5,3.5,0.7c1.3,1.4,0.3,4.3-1.8,3.8C1366.9,735.8,1367.8,732.7,1367.5,731.3z"/>
+		<path class="st4" d="M617.8,736.2c0.8-1.1,1.5-2.2,2.3-3.3c-0.3,1.8-0.5,3.7-0.7,5.5c2.3-1.2,4.4-2.8,6.6-4.1c2-0.2,2.2,2.3,2,3.7
+			c0.1,2.7-3.3,2.8-5.1,3.8c-1,1.9-2,3.8-3.3,5.5c-0.2-1.3-0.3-2.7-0.5-4c-1.6,0.1-3.3,0.3-4.9,0.4c-0.4-0.5-1.1-1.4-1.5-1.9
+			c-1.4-2-2.2-4.2-2.9-6.5c0.7-0.1,2.1-0.2,2.8-0.3C613.8,736.8,616.6,739.2,617.8,736.2z"/>
+		<path class="st4" d="M1114.9,735.3c0.8-1,1.5-1.9,2.3-2.8c0.9,1.2,1.8,2.5,2.5,3.9c-1.3,1-2.5,2-3.8,3.1c-0.9-0.7-1.7-1.6-2.8-1.9
+			c-2.2,1-4.2,2.5-6.2,3.8c-2.1,0.1-4.2,0.1-6.3,0.2l-1.7-0.2c0.2-2.4,0.5-4.7,0.7-7.1c0.5,0.4,1.1,0.8,1.6,1.2
+			c0.3,2.3,2.4,6.5,4.9,3.7c1.5-1.4,2.9-2.9,4.6-4C1112,735.3,1113.5,735.5,1114.9,735.3z"/>
+		<path class="st4" d="M546.3,734.3c1.1,0,2.2,0,3.4,0c-0.1,1-0.2,2.1-0.3,3.1c-1,0.1-2,0.2-3,0.3
+			C546.4,736.6,546.3,735.5,546.3,734.3z"/>
+		<path class="st4" d="M773.4,734.5c2.8-1.2,4.4,2.4,1.5,3.5C772.6,740.5,771,735,773.4,734.5z"/>
+		<path class="st4" d="M1440.1,733.7c1.5,0.7,2.9,1.4,4.3,2.3c-2.6,0.4-2,5.1,0.6,3.1c0,0.7,0,2.1,0,2.8c-2.1-0.2-4.1-0.4-6.1-0.6
+			c1-0.1,2.9-0.3,3.8-0.3C1441.8,738.5,1440.9,736.1,1440.1,733.7z"/>
+		<path class="st4" d="M1726.1,735.2c2.3-0.2,4.6-0.4,6.9-0.9v4.1c-0.4,1.8-0.9,3.6-1.3,5.5C1730.6,740.6,1729.6,736.8,1726.1,735.2
+			z"/>
+		<path class="st4" d="M1559.4,737.2c0.3-0.2,0.8-0.7,1.1-0.9c2,1.6,4.4,2.1,6.9,2.3c0.2,0.7,0.6,2.1,0.8,2.8
+			c-1.6,0-3.3,0.1-4.9,0.1C1562,740.1,1560.6,738.8,1559.4,737.2z"/>
+		<path class="st4" d="M0,743.4c1-0.1,2.1-0.2,3.1-0.3c0,0.7-0.2,2.2-0.2,3c2.6,1.2,4.9-0.8,7-1.8c0.8,0.5,1.5,1,2.3,1.5
+			c-1,1-2.1,2.1-3.1,3.2c1.2,0.4,2.4,0.8,3.5,1.2c-0.8,0.4-1.5,0.8-2.3,1.2c-0.5-0.4-1.5-1.1-2-1.4c-2.5-2.2-6.4-2.9-8.4,0.2V743.4z
+			"/>
+		<path class="st4" d="M4.5,755.2l0.9-0.4c0,2.9,0.1,5.8,0.2,8.7c1,0,1.9,0,2.9,0c0-3-0.1-5.9-0.3-8.9c2.5,2.5,2.6,6.1,2.8,9.4
+			c-0.9,1.1-1.8,2.3-2.6,3.4c1.6,0.5,3.2,0.9,4.9,1.4l-0.1,0.2c-2,0.7-4.3,0.9-6.1,2c-1.7,2.1-1.6,5-2,7.5c0.8,0.3,2.5,1,3.3,1.3
+			c-1.6-0.1-3.2-0.1-4.8-0.2c0.5-3,1-6.1-0.2-9c-1.7,3.1-3.4,7.3,0.1,10c-0.8,2-2,3.8-3.4,5.4v-20.5c1.1-1,2.4-1.8,3.2-3.1
+			C3.8,760,4,757.6,4.5,755.2z"/>
+		<path class="st4" d="M1727.2,775.3c3.6-0.6,3.2,8.3-0.4,6.9C1726.8,780.2,1725.2,776.7,1727.2,775.3z"/>
+		<path class="st4" d="M1707.9,783.8c2.3-1.8,4.4-3.7,6.3-5.9c1.6,0,3.3,0.1,5,0.2c-1.2,1.3-3.1,1.2-4.7,1.6c0,1.5-0.1,3.1-0.1,4.6
+			c0.9,0.6,1.8,1.2,2.7,1.7c-0.2,0.7-0.6,2-0.8,2.7c1.6,0.3,3.1,0.7,4.7,1.1c0.5-1.9,1.3-3.6,3.7-3.7c-0.6,1.7-1.2,3.5-1.8,5.2
+			c2.2,0.4,4.2,1.3,6.1,2.5c-4.5,1.8-8.9-0.5-13.2-1.6c-0.8-0.8-1.6-1.6-2.4-2.4c-0.4,2.1-0.7,4.2-0.9,6.3c-0.8-1.1-1.5-2.1-2.2-3.2
+			c-0.9,1.6-1.6,3.3-1.9,5.1c-0.2-1.8-0.5-3.6-0.8-5.4c-0.8,1.3-1.7,2.6-2.5,3.9l-0.7,0.4c0.6-1.1,0.7-2.2,0.5-3.4
+			c-0.6,0.2-1.6,0.6-2.2,0.8l-0.1-1.6l0-1l0-0.6l0-0.9c2.4,0.4,4.8,0.3,7.1-0.8c0.8,0.5,1.7,0.9,2.5,1.4c0.8-2.4-0.4-4.2-2.1-5.7
+			c-0.6,0.2-1.8,0.6-2.4,0.8C1707.8,785.4,1707.9,784.3,1707.9,783.8z"/>
+		<path class="st4" d="M6.4,785.1c0.2-2.4,2.8-3.3,4.5-4.3c-1.6,2-2.7,4.5-2.9,7.1c1.4-0.5,2.7-1,4.1-1.5c2.8,2.4,6.5,2.4,10,2.5
+			c2.6,0.2,5.3,0.7,7.8,1.4c0,0.4,0,1.2,0,1.6c-3.2-0.6-6.4-1.1-9.7-1.6c0.4,1.6-0.4,4.2,1.8,4.7c2.6,0.3,5.2-0.3,7.8-0.9
+			c0,0.8,0,2.4,0,3.1c-3.1-0.4-6.2-0.5-9.2,0.2c-0.3,0.2-1,0.5-1.3,0.7c-1.1,3.2-2.9,6.1-6,7.7c-0.1-2.1-0.1-4.2-0.2-6.3
+			c1.7-0.9,3.4-1.7,5.1-2.5c-1.3-0.9-2.7-1.7-4-2.6c-3.3,2.4-6.8,5.2-6.7,9.8c0,0.3-0.1,0.8-0.2,1.1c1.4,0.7,2.9,1.5,4.3,2.2
+			c0,2.3-0.1,4.6-0.1,7c1.2,1,2.4,2.1,3.7,3.1c1.2-2.2,1.6-5.1,3.7-6.6c1.3,0.1,2,0.8,2.1,2.1c0.4,2.5,0.4,5,0.8,7.5
+			c0.2,0.2,0.7,0.4,1,0.6c-3.4,2.8,0.9,6.8-1,10.4c-0.4-1.7-0.8-3.4-1.3-5.1c-1.2,0.2-2.4,0.6-3.6,1c-1.2-0.5-2.5-1.1-3.7-1.6
+			c-2.1,2.1-5,3-7.9,3.6c-1.6,1.3-2.1,3.5-3,5.3c1.8,1.4,5.1,2.2,4.6,5.1c-1.2,0.1-2.5,0.2-3.7,0.3C2,839.1,1,837.9,0,836.7v-10.9
+			c1.7-0.5,3.4-1,5-1.4c-1.7-1.3-3.4-2.5-5-3.9v-5c1.2,1.8,3.2,2.1,5.1,2.4c-1-3.1-2.7-5.8-5.1-7.9v-4.3c1.7,1.3,4,2.5,5.8,0.5
+			c-2.3-3.1-4.5-6.2-5.8-9.8v-2.2c1.5,2.6,2.2,6,5.1,7.5c2.2-1.5,2.6-4.4,3.2-6.8C9.1,791.5,6.8,788.4,6.4,785.1 M4.7,812
+			c-0.5,2.4,2,4,3.2,5.8c-1.6,0.7-3.1,1.4-4.7,2.2c1.2,1,2.2,2.4,3.8,2.9c1.9-1.3,3.7-2.8,5.7-4c-0.8-1.3-1.6-2.6-2.4-3.9
+			c0.2-2.6,0.6-5.5-1.3-7.6C7.3,808.6,5.6,810,4.7,812z"/>
+		<path class="st4" d="M1730.7,782.4c0.6,0.2,1.8,0.5,2.3,0.7v4.3c-0.7-0.4-1.9-1.2-2.6-1.5C1730.5,785,1730.6,783.3,1730.7,782.4z"
+			/>
+		<path class="st4" d="M1725.3,784.6c1,0,2.9-0.1,3.9-0.2c0.4,0.6,1.2,1.8,1.7,2.5c-0.9,1.4-1.8,3.8-3.8,2.1
+			C1726,787.8,1725.8,786.1,1725.3,784.6z"/>
+		<path class="st4" d="M1730.1,795.3c0.7-0.1,2.2-0.4,2.9-0.5v5C1731.8,798.4,1730.9,796.9,1730.1,795.3z"/>
+		<path class="st4" d="M1723.3,799.3c1.1-1.2,2.3-2.3,3.7-3.3c1.3,1.1,1.4,3,2,4.6c-1.4,0.3-2.7,0.5-4,0.8c-0.5,2.3-0.8,4.6-1,6.9
+			c-2.6-0.1-5,1.2-7.3,2.2c0.5-3.4,0.9-6.8,0.5-10.2c1.1,0.9,2.1,1.8,3.1,2.8c0.3-0.3,0.9-1.1,1.2-1.4c-0.5,1.5-1,3-1.4,4.5
+			C1723.8,806.2,1724.9,802.1,1723.3,799.3z"/>
+		<path class="st4" d="M1706.1,799.9c1,1.2,2,2.3,3.1,3.5c-0.2,0.3-0.7,0.9-0.9,1.2c0.5,0.3,1.5,1,1.9,1.4c-1,0.6-2,1.1-2.9,1.8
+			c-0.3-0.1-0.9-0.2-1.2-0.2c0.1,0.4,0.2,1.1,0.3,1.5c-1.1-0.7-2.2-1.4-3.3-2c-0.1-1.3-0.2-2.7-0.3-4c0.6-0.1,1.8-0.4,2.5-0.5
+			C1705.5,801.8,1705.9,800.5,1706.1,799.9z"/>
+		<path class="st4" d="M1731.2,805.4c0.6-1,1.2-2,1.8-2.9v9.6c-2.5,0.2-5.1,0.4-7.6,0.5c-0.7,1.3-1.4,2.6-2.1,4c2.4-0.1,4.9,0,7.2,1
+			c-1,0-3-0.1-4.1-0.2c-1.4,2.4,0.3,4.4,1.8,6.2c-1,2-1.9,4-2.9,5.9c-0.3-0.8-0.8-2.3-1-3.1c-1.2,0.5-2.4,0.9-3.5,1.4
+			c-0.8-1-1.7-1.9-2.5-2.9c1.5-0.6,3.1-1.2,4.7-1.8c-1.3-1-2.7-2-4-3.1c-0.6,0.2-1.9,0.7-2.5,0.9c0.3-0.4,1-1,1.4-1.4
+			c1-0.4,2-0.8,3-1.2c-0.6-0.5-1.3-1.1-1.9-1.6c-2.1,0.1-4.2,0.2-6.3,0.2c1-1.8,1.8-3.9,4-4.4c-0.1,0.6-0.3,1.8-0.5,2.3
+			c2.7,0.5,5.7,1.1,7.9-1c0.1-2.1-1.9-1.8-3.3-2c1-0.6,1.9-1.3,2.9-2c1.6,0.7,3.3,1.4,4.9,2.1c-0.8-1.2-1.6-2.4-2.3-3.6
+			c2,0.4,4.7,1.9,6.1-0.5C1732.3,807.4,1731.6,806,1731.2,805.4z"/>
+		<path class="st4" d="M1609.6,820.7c3.6-0.1,7.1,0.1,10.7,0.4c-0.8,2-1.5,4.1-2.2,6.1c-0.4-0.4-1.1-1.1-1.4-1.5c0-1.2,0-2.4,0-3.6
+			c-2.4-0.6-4.8-1-7.3-1.2c0.7,1.4,1.5,2.7,2.7,3.8c-0.3,0.3-0.8,0.9-1.1,1.2c-1.5-0.4-2.5-0.1-3.2,1.1c0.2,2,3,1.2,3.3-0.3
+			c0.1,0.4,0.3,1.3,0.4,1.7l-0.7,0.3c-1.2,0.5-2.3,1-3.5,1.6c-0.7,0.8-1.3,1.6-1.9,2.5c-0.7-0.5-1.3-1-1.9-1.5
+			c0.2-0.9,0.7-2.7,0.9-3.6c0.8,0.4,1.7,0.8,2.6,1.2c-1.4-2.2-4.4-3.9-4.1-6.8c0.5-0.5,1.5-1.5,1.9-2c0.8,0.9,1.6,1.8,2.5,2.7
+			C1608.1,822.1,1608.8,821.3,1609.6,820.7z"/>
+		<path class="st4" d="M64.5,821.1l0.4,0c0.1,1.4,0.3,2.9,0.4,4.3c2.2-1.1,4.1-2.7,5.9-4.3c-1.2,2.3-2.4,4.6-3.7,6.9
+			c-0.9,0.2-1.7,0.5-2.6,0.7c-1-1.6-3-1.4-4.6-1.5c0.4,1.5,0.7,2.9,1.1,4.4c0.6,0,1.8,0,2.3,0c-0.2,0.5-0.6,1.6-0.8,2.2
+			c1.6,3.2,2,6.8,2.1,10.3c2.2,0.2,4.4,0.4,6.6,0.5c-2.2,0.5-4.8,0.6-6.6,2.1c-0.4,1.4-0.6,2.8-0.8,4.2h-5.4
+			c1.6-1.2,2.7-2.8,3.5-4.6c-2.3-0.3-6.3,1.8-7.1-1.5c-1.2-2.2-0.1-4.4,1.1-6.3c0.8,2.4,1.6,6,4.8,5.9c2.8-1,3.3-5,1.5-7.1
+			c-1.8-1.3-3.9,0.1-5.8,0.3c1.1-1.9,2.3-3.8,3.3-5.7c-2.1,0.5-5.2,0.4-6.1,2.9c-1.1,3.8-1.4,7.7-3.3,11.3c0.8,1.6,1.6,3.2,2.4,4.8
+			h-4.9c-0.3-3.5-0.8-7,0.2-10.4c1.1-4.4,0.7-9,2.1-13.3c2.5-0.3,5-0.2,7.4-0.5C60.8,825.9,62.6,823.2,64.5,821.1 M51.6,828.1
+			c-0.9,4.2-1.4,8.6-1,12.9c1-2.6,1.2-5.4,2.5-7.9c1.1-2,4.4-2.3,4.6-4.7C55.8,827.6,53.6,827.6,51.6,828.1z"/>
+		<path class="st4" d="M83.5,821.1l0.8,0c1.1,1.6,2.2,3.3,3.4,4.8c3.5,2,6,5,8,8.4c2.1,2.1,5.1,0.4,7.5,1.2c0.5,1.3,0.9,2.6,1.4,3.9
+			c1.7,0.4,3.4,0.8,5.2,1.1c-0.3,3.5-0.9,7-1.7,10.4H106c-3.2-3.3-5.2-7.5-8.1-11c-1.5,3.6,1.4,7.2,1,11h-3l-0.1-0.1
+			c0.4-1.4,2.2-2.7,1.3-4.2c-1-2.3-2.2-4.6-3.1-7c-0.9-0.1-1.7-0.3-2.6-0.4c-0.1,1.2-0.2,2.3-0.3,3.5c-3.1-2.2-2.7-6.5-0.7-9.3
+			c0.5-1,1.1-2.1,1.6-3.1C88,828.7,84.7,825.5,83.5,821.1 M102.5,844c0.7,1.7,2.2,2.8,4.1,2.7c1.4-1.3,0.4-2.9,0-4.4
+			C105,842.5,102.7,841.7,102.5,844z"/>
+		<path class="st4" d="M142.3,820.7c3.3,0,6.6,0,9.9,0c-1.6,3.2-2.7,6.6-4.7,9.6c-1.7,0.7-3.5,1-5.3,1.5c0.9,2.4,1.7,4.7,2.6,7.1
+			c-2.4,1-4.9,2-6.6,4.1c-0.1-1-0.1-2-0.1-3c-0.8-0.1-2.3-0.3-3.1-0.4c0.3-1.3,1.3-3.5-0.9-3.6c-1.7,0.9-3.1,2.1-4.7,3.2
+			c-0.1,2.2-0.1,4.5-0.2,6.7c-2.1-0.3-4.3-0.7-6.4-1.1c-1.3-0.3-2.6-0.6-3.9-0.8c-3.2-4.5-5.9-9.4-9.3-13.7
+			c-1.3,0.5-2.5,1.1-3.8,1.7c-1-0.6-1.9-1.1-2.9-1.7c-1.4,0.3-2.8,0.6-4.2,0.8c-0.3-0.2-1-0.7-1.3-0.9c0.9-0.1,2.7-0.3,3.6-0.3
+			c0.3-0.6,0.8-1.7,1.1-2.2c-1.5-0.4-3-0.9-4.5-1.2c1.2-0.3,2.5-0.6,3.7-0.9c0.9-0.5,1.8-1,2.7-1.4c1.6,0.5,3.2,1,4.9,1.2
+			c-0.5,0.9-1,1.9-1.4,2.8c6.5,1.6,8.7,8.6,11.9,13.7c0.9-1.8,1.8-3.5,2.6-5.3c-0.4,2.1-0.5,4.3,0.9,6.1c1.7,0.6,3.4,1,5.2,1.4
+			c-0.6-1.8-0.3-4.5-2.8-4.8c0.6-3.7,0.7-7.6,0.1-11.3c-0.3-0.2-1-0.6-1.3-0.8c0.5,0.1,1.6,0.2,2.1,0.2c0.8-1,1.6-2,2.4-3
+			c3.1,0.4,6.7,1.7,9.2-1c0.2,0.2,0.6,0.6,0.8,0.8c-1.6,1.3-3.1,2.5-4.8,3.7c0.2,0.8,0.7,2.4,0.9,3.1
+			C139.4,830.2,143.6,825.7,142.3,820.7 M142.6,826.6c-0.1,1.1-0.3,2.3-0.4,3.4c1.8,0,4,1,5.2-0.9c-0.1-0.7-0.3-2.2-0.5-2.9
+			C145.5,826.3,144,826.5,142.6,826.6 M126.4,828.5c0.2,1.8,0.5,3.7,0.9,5.5c2.7-0.6,3.9-3,4.6-5.4
+			C130,828.5,128.2,828.4,126.4,828.5 M135.8,834.1c-0.1,2.5,2.9,2.7,4.5,3.6c0.5-2.5,0.6-5.4-2.3-6.4
+			C137.2,832.2,136.5,833.1,135.8,834.1z"/>
+		<path class="st4" d="M188.2,821c1.5,0.1,3,0.1,4.6,0.2c-1,3.3-1.7,6.6-2.3,10c-0.2-2.1-0.6-4.2-1.3-6.1c-0.8,1-1.6,2.1-2.3,3.2
+			c1.1,1.1,2.4,2,3.6,2.9c-2-0.6-4-1.3-6-1.9c-0.8,2.7,0.6,4.7,3,6c-0.7,1.4-0.3,3.8-2,4.5c-1.2-1.2-2.3-2.5-3.4-3.9
+			c-0.9-1.3-1.8-2.5-2.7-3.7c1.2,0.3,2.3,0.6,3.5,0.9c0.3-2.4,0.6-4.8,0.8-7.2c-1.3,1-2.6,2.1-3.8,3.3c0.4-2.3,1.4-4.5,2.5-6.5
+			c1.2,0.8,2.4,1.6,3.6,2.4C186.8,823.6,187.5,822.3,188.2,821z"/>
+		<path class="st4" d="M196,821c1.3-0.1,2.6-0.2,4-0.2c1.1,1,2.4,2,3.3,3.2c0,1.4-0.1,2.8-0.3,4.2c-1.2-1.3-1.3-3-1.8-4.6
+			c-0.6-0.1-1.6-0.2-2.2-0.3c-0.3,2.6,0.1,5.3,0.8,7.8c1.1,0.5,2.2,1,3.3,1.5c0.4-1,0.8-2,1.2-2.9c0.5,0.8,1,1.6,1.6,2.4
+			c-1.4,0.7-2.9,1.4-4.3,2.1c0.2,1.9,0.4,3.9,0.4,5.8c-1.5,2.6-1.7,5.6-2.7,8.3c-1.1,1.4-3,2-4.6,2.7H189c0-1.2,0.1-2.3,0.1-3.4
+			c1.8-0.1,3.7-0.1,5.3-1.1c0.5-5.2,0-10.5,1.7-15.4C197.2,827.8,196.6,824.3,196,821 M197.5,839.6c1.4,0.4,3-0.2,3.7-1.5
+			c0.1-2.1-2-3-3.4-4C197.2,835.8,195.5,838.1,197.5,839.6 M196,849.1c2.8-0.1,2.9-3.3,1.1-4.8C195.8,845.4,193.2,847.9,196,849.1z"
+			/>
+		<path class="st4" d="M350.2,820.8c0.8,0,2.4,0,3.3,0c-0.2,1.6-0.4,3.1-0.6,4.7c1,1.8,1.6,3.8,2.1,5.8c-2.2,0.5-4.4,0.7-6.6,0.8
+			c-0.7-2.2-1.6-4.3-1.9-6.6C347.5,823.8,348.9,822.3,350.2,820.8 M349.2,827.2c-0.8,1.4-0.3,2.9,0.6,4.1c1.6,0.2,3.2-0.5,3.5-2.2
+			C352.7,827.3,350.8,827,349.2,827.2z"/>
+		<path class="st4" d="M1169.5,820.7c2,0,3.9,0.2,5.9,0.3c-1.2,1.8-2.5,3.7-4.6,4.5C1169.6,824.2,1169.9,822.3,1169.5,820.7z"/>
+		<path class="st4" d="M1201.2,820.8c0.8,0,2.3,0,3.1,0c0.1,0.9,0.2,1.8,0.3,2.8c-1.1,0.4-2.1,0.7-3.1,1.1c0.2,0.8,0.5,1.6,0.8,2.4
+			c-0.4,1.1-0.7,2.1-1,3.2c2-0.2,4-0.7,6.1-0.5c1.8,0.9,3.2,2.3,4.7,3.5l-0.3,0.5c-1.1,0-2.1,0-3.1,0c-0.6-0.8-1.2-1.5-1.9-2.2
+			c-1.3-0.1-2.3,0.8-3.4,1.3c0.1-1.4-1.8-2.6-2.9-1.4c-0.6,1-0.4,1.9,0.6,2.7c1.3,1.2,2.7,2.5,4.1,3.7c0.6-0.7,1.2-1.5,1.8-2.2
+			c0.5,0.8,1,1.8,2,2.3c1.8-0.9,3.5-2,5.2-3.1c-2.7,3.4-5.2,6.9-8.1,10.2c0.2,1.3,0.4,2.6,0.6,3.8c-0.6,0.7-1.1,1.5-1.6,2.2h-4.1
+			c-1.4-1.1-3.7-2-3.7-4.1c1.3-1.3,2.8-2.4,4.3-3.5c0-1.3,0-2.7,0.1-4c-1.3-1-2.6-2.1-3.8-3.2c-0.8-1.2-1.5-2.5-2.2-3.7
+			c1.3-2.1,2.7-4.3,4.1-6.4c-0.1-0.5-0.4-1.6-0.5-2.1C1200,822.9,1200.6,821.8,1201.2,820.8 M1203.5,839.5c-1.6,1.7-0.4,3.5,1.1,4.6
+			c1-1.1,2-2.2,3.1-3.2C1206.4,840,1205.1,838,1203.5,839.5 M1199.4,847c0.7,3,6.2,4,5.8,0C1204.2,844,1201.1,845.7,1199.4,847z"/>
+		<path class="st4" d="M1234,820.8c0.6,0,1.9,0,2.6,0c0.9,1.7,1.9,3.4,2.9,5.1c2.3-0.6,4.9-0.9,6-3.2c2.3,0.2,4.3,1.1,6.4,2
+			c-0.2,3.8-1.6,7.4-2.4,11.1c-3.8-1.8-5.4,3.3-6,6.1c-1.3,0.2-2.5,0.5-3.8,0.8c-0.5,0.8-1,1.7-1.5,2.6c0.1-1.2,0.3-2.4,0.4-3.6
+			c1.3-0.3,2.7-0.7,4-1c0.2-0.7,0.5-2,0.7-2.7c0.3-1.1,0.5-2.1,0.8-3.2c-1.5-0.1-3-0.1-4.5-0.2c-0.5,2.2-1.2,4.4-2.1,6.5
+			c-0.1-0.5-0.2-1.3-0.2-1.8c0.1-1.2,0.3-2.3,0.5-3.5c-0.7-0.1-2.1-0.3-2.8-0.4c1.6-0.7,3.2-1.2,4.9-1.7c3.1-0.4,6.3-0.9,9.4-1.5
+			c-0.6-1.5-1.2-2.9-1.8-4.3c-0.6,0.2-1.2,0.5-1.7,0.7c-1.5-1.6-3.6-2-5.6-2c0.3,1.2,0.6,2.4,0.9,3.7c-2.2-0.8-4.6-1.1-6.8-1.8
+			c-1.9-1-2.3-3.2-3.3-4.9c0.6,0,1.8,0,2.4,0C1233.6,823,1233.9,821.5,1234,820.8z"/>
+		<path class="st4" d="M1268.6,821.5c0.6-0.1,1.7-0.3,2.2-0.4c1.3,2.3,4.7,4.9,2.5,7.6c-1.7-1.3-3.3-2.8-5.2-3.8
+			c0,1.8,1.4,3.1,2.4,4.4c0.3,0.6,0.8,1.9,1,2.5c-0.8-0.8-1.6-1.6-2.3-2.5c-0.5,0.1-1.4,0.2-1.8,0.3c0.9,2.2,1.7,4.5,2.6,6.7
+			c-0.5,0.4-1,0.8-1.5,1.2c-0.7-1.5-1.8-2.8-3.5-3.4c-0.1-0.2-0.2-0.6-0.3-0.8c-1.3-0.2-2.6-0.4-3.9-0.5c0,1.7,0,3.5,0.1,5.2
+			c-0.3-0.4-0.8-1.1-1.1-1.4c-0.2-1-0.4-3-0.6-4.1c1.5-0.5,3.1-0.9,4.7-1.4c-2.9-0.5-5.9-0.8-8.8-0.9c-0.7-1.9-1.4-3.8-2.3-5.7
+			c2-0.2,4-0.9,5.7-1.9c-0.1,0.5-0.2,1.6-0.3,2.1c0.8-0.2,1.7-0.3,2.5-0.5c1.2,0.9,2.4,1.6,3.6,2.5c0,0.5-0.1,1.6-0.1,2.1
+			c0.4-0.1,1.3-0.3,1.8-0.4c0.7-2,1.6-3.9,3.4-5.2C1269.2,822.8,1268.8,821.9,1268.6,821.5 M1256,826c0.6,2.4,3.4,4.7,5.4,2
+			C1260.2,826,1258.1,825.6,1256,826z"/>
+		<path class="st4" d="M1292.8,820.9c2.2,0.1,4.5,0.3,6.8,0.3c0,1.2-0.1,2.3,0,3.5c2.5,0.2,4.3-1.2,4.9-3.6c1.3,0,2.6-0.1,3.9-0.1
+			c-0.8,1.6-1.6,3.2-2.3,4.8c-0.4,0.4-1.3,1.3-1.8,1.7c-1.2-0.5-2.4-0.9-3.6-1.3c0.7,2.2,1.3,4.4,2.2,6.6c-1.6,0.9-3.3,1.9-4.9,2.8
+			c-0.7-1.2-1.4-2.3-2.1-3.4c0.3-0.5,0.8-1.4,1.1-1.8c1.1,0.2,2.2,0.4,3.4,0.6c-0.1-1.9-0.2-3.8-0.3-5.7c-1,0.4-2,0.9-3,1.4
+			C1295.7,824.7,1294.3,822.8,1292.8,820.9z"/>
+		<path class="st4" d="M1311.3,820.8c4.7-0.1,9.4-0.1,14.1,0c-2.7,1.6-5.5,2.8-8.1,4.5c0,0.4-0.1,1.1-0.2,1.5
+			c2.3,0.2,4.6-0.1,6.9-0.3c0.7-1.2,1.4-2.4,2.2-3.5c0.9,1.2,1.8,2.5,2.8,3.8c0.4-1.3,0.8-2.6,1.2-3.9c-0.3-0.4-0.9-1.3-1.2-1.7
+			l-0.2-0.2c2.1,0.1,4.2,0.1,6.3,0c0.3,3.5,4.7,4,5.8,7c-1.4,3-4.7,4.5-6.9,6.9c-1.1-0.6-2.2-1.2-3.3-1.9c-0.1-1.3-0.2-2.7-0.2-4
+			c-0.7-0.2-2-0.5-2.7-0.7c-0.5,1.4-1,2.8-1.4,4.2c-0.4-1.3-0.6-2.7-1.2-3.9c-3-0.5-6.1-0.3-9-1.1c-0.8-1.1-1.5-2.3-2.2-3.4
+			c-0.3,1.6-0.7,3.1-1,4.7c-1.4-0.4-2.8-0.7-4.2-1c1.2-0.8,2.4-1.7,3.3-2.9C1311.9,823.6,1311.6,822.2,1311.3,820.8z"/>
+		<path class="st4" d="M1465.2,820.8c1.2,0,2.4,0,3.7,0c0.7,1,1.5,2.1,2.3,3.1c-1.5,1-3,2.1-4.4,3.2
+			C1466.2,824.9,1465.8,822.8,1465.2,820.8z"/>
+		<path class="st4" d="M1492.6,820.8c2.1,0,4.2-0.1,6.4-0.1c0.8,1.3,1.6,2.6,2.4,3.9C1497.9,825.1,1495.1,823,1492.6,820.8z"/>
+		<path class="st4" d="M1580.9,821c0.3,0,0.9,0,1.2,0c-2,2.7-3.8,5.7-4,9.1c2.4-0.2,3.9-2.1,5.2-3.9c1.6,0.7,3.2,1.5,4.9,2.2
+			c-5.1-0.9-8.8,3.8-10.2,8.1c2.6-0.3,5.4-1.8,7.9-0.4c3,1.2,5.4,3.4,7.4,5.9c0.2-0.2,0.6-0.5,0.8-0.6c1.5,1,3.1,1.7,4.8,2.3
+			c-2.2,0.2-4.3,0.5-6.5,0.9c-0.1-2.7-2.1-4.6-4.2-6.1c-0.1,0.9-0.4,2.6-0.6,3.4c-0.8-0.6-1.7-1.2-2.4-1.8c-1.2,1.7-2.8,3.1-5,3.1
+			c0.4-1.8,0.7-3.7,1-5.5c-2.6-0.2-3.6,3.1-5.3,4.6c-0.1,0.5-0.3,1.6-0.4,2.2c-1.3-0.9-2.5-1.7-3.8-2.5c0.7-0.3,1.5-0.7,2.2-1
+			c1-1.6,2-3.3,3.1-4.9c-0.8,0-2.3-0.1-3.1-0.1c0.7-0.7,1.4-1.4,2.1-2.1c-0.9-2-1.9-3.9-2.8-5.9c-1,2.4-2.1,4.7-3.1,7
+			c-0.3-1.6-3.1-2-3.2-0.1c0.5,1.3,1.5,1.6,2.8,0.8c-1.1,1.8-1.3,3.9,0.9,5c-0.2,0.3-0.6,1-0.8,1.3c0,0.6-0.1,1.2-0.1,1.8
+			c-1.7,1.8-3.2,3.7-4.8,5.5c2.5,1.2,4.7-0.5,6.8-1.6c0,0.8,0,2.3,0,3.1h-8.8c0.4-1.8,0.9-3.6,1.4-5.4c1.3-0.2,2.7-0.5,4.1-0.7
+			c-0.2-0.7-0.5-2.1-0.6-2.8c-2-0.8-3.5,0.9-5.1,1.7c-1.6,1-3.7,0.7-5.5,1c0.1-1.7,0.3-3.5,0.4-5.2c1.5-1.1,2.9-2.3,4.5-3.3
+			c-0.3,1.3,0.2,2,1.7,2c-4.3,2.3,3.5,5.3,4,1.7c0.2-2-1.7-2.5-3.2-2.3c0.1-0.4,0.3-1.2,0.4-1.7c1.1-1.4,2.3-2.7,3.6-4
+			c-4.4,0.2-8.7,1.3-12.7,3.1c-0.6,0.8-1.2,1.7-1.8,2.5c-1-0.3-1.9-0.7-2.9-1c0-0.6,0-1.7,0-2.3c1.1-0.7,2.1-1.5,3.2-2.2
+			c-0.7-1.4-1.4-2.9-2.1-4.3c-2.7,0.7-5.3,2.1-8,2.5c-3.5-1.4-6.7-3.4-10.2-4.8c1-0.7,2-1.4,3-2.1c0.6,0.2,1.7,0.5,2.3,0.7
+			c1.3-1.2,2.7-2.1,4.6-2c1.6,1.7,3.3,3.3,5.5,4.1c4,2,8.4,0.1,12.5-0.5c-1.2,0.6-2.3,1.2-3.4,1.9c1.4,1.3,3.2,1.7,5.1,1.8
+			c0.7,0.5,1.5,1,2.2,1.5c1.7-0.3,3.5-0.5,5.2-0.8c-2.1-1.2-4.3-2.2-6.3-3.5c-0.3-1.5-0.4-3.1-0.5-4.6c2.7,1.7,5.7,0.5,8.6,0.3
+			C1575.8,822.1,1578.8,823.2,1580.9,821 M1567,826.9c0.7,0,2-0.1,2.7-0.2c0-0.7-0.1-2-0.1-2.7C1567.6,823.8,1566.9,825,1567,826.9
+			 M1541.4,828.2c1,1,2.1,1.2,3.4,0.6c0-1.5-1.1-2.6-1.8-3.8C1542.6,825.8,1541.8,827.4,1541.4,828.2 M1554.3,829.1
+			c0,0.6,0.1,1.9,0.2,2.5c1.2-0.1,2.4-0.1,3.7-0.2c-0.1-0.9-0.2-2.6-0.3-3.5C1556.6,826.6,1555.4,828.5,1554.3,829.1z"/>
+		<path class="st4" d="M1583.7,821.1l0.7,0c0.4,0.2,1.2,0.7,1.6,1c2.9,0.3,5.8,0.9,7.8,3.2c1,0,2-0.1,3-0.1c1.3,1.2,2.7,2.4,4,3.6
+			c-0.5,0.4-1.4,1.3-1.9,1.7c1.3,1.5,2.6,3,4,4.5c1.2,2.1,2.2,4.3,4,6c2.8-0.4,1.2-4,1.4-6c1.8,1.3,3.6,2.6,5.4,4
+			c-0.7,0.1-2.1,0.3-2.8,0.4c1.3,1.7,2.6,3.6,5,3.6c-0.9,1.1-1.8,2.2-2.7,3.3c-1.6,1.7-3.3,3.3-5,4.7h-4c1.9-2.4,4.4-4,6.6-6.1
+			c1.2-1.2,0.4-3,0.4-4.4c-1.8,0.6-3.5,1.2-5.3,1.8c-1.8-2.4-3.9-4.6-6.5-6.2c0.1,1,0.4,2.9,0.5,3.8c-1-0.3-2-0.7-2.9-1
+			c0.2-1.9,0-3.7-0.6-5.5c-1.1,0.3-3.2,0.9-4.3,1.1c-0.3-1.8-0.5-3.5-0.9-5.2c-0.3-0.1-0.9-0.3-1.2-0.4c0.6-1.2,1.2-2.4,1.9-3.5
+			c-2.7-0.7-5.4-1-8.2-1C1583.8,823.3,1583.7,822.2,1583.7,821.1 M1593.1,830.5c-1.2,0.9,0,3.4,1.4,2.3
+			C1595.7,831.9,1594.5,829.4,1593.1,830.5z"/>
+		<path class="st4" d="M938.2,823.4c2.9-0.5,5.8-1,8.7-1.2c-0.4,1.1-0.8,2.3-1.2,3.4c-1-0.1-2-0.1-3-0.2
+			C941.2,824.4,939.8,823.8,938.2,823.4z"/>
+		<path class="st4" d="M1285.1,824.5c2,0.4,4,0.8,6,1.2c0.7,3-2.5,4.4-4.3,6.1c-0.4-0.3-1.1-1-1.5-1.3c-1.5,0.2-3,0.5-4.4,0.8
+			c-0.5-1.2-1-2.3-1.5-3.5c-1.5,1.3-3,2.6-4.5,3.9c-0.1-0.5-0.4-1.6-0.6-2.1c1.6-1.3,3.2-2.7,3.9-4.8c1.4-0.1,2.8-0.3,4.2-0.4
+			c-0.7,0.8-1.5,1.6-2.2,2.5c0.8,2.8,3.2,3.2,5.8,2.9c-0.1-0.7-0.3-2-0.4-2.7C1285.4,826.5,1285.2,825.1,1285.1,824.5z"/>
+		<path class="st4" d="M1518,827.2c0.1-1.9,1.4-4.6,3.6-2.8c2,1.7-1.5,2.7-2.6,3.5c0.2,1,0.4,2.1,0.7,3.1c-2.1,0.7-4.1,0-3.6-2.4
+			C1516.7,828.2,1517.6,827.5,1518,827.2z"/>
+		<path class="st4" d="M1639.1,826.6c1-1.1,1.9-2.2,2.9-3.2c2.8,1.5,5.5,3.3,8.5,4.5c0,0.8,0,1.5,0,2.3c-1.6,0.4-3.2,0.8-4.8,1.4
+			c0,0.6,0,2,0,2.6c-0.1,1-0.6,1.6-1.5,1.8c-0.9-1.4-1.7-2.8-2.4-4.2c-0.8,1.6-1.5,3.2-2.4,4.7c-0.8-0.1-2.2-0.3-3-0.4
+			c1-0.6,2.1-1.1,3.2-1.7c-2.4,0-4.8-0.1-7.2-0.2c0.3-1.8,0.6-3.5,1-5.2C1635.4,828.3,1637.6,828.1,1639.1,826.6 M1633.8,832
+			c0.5,3.3,7.3,0.1,4.2-2C1636.3,828.3,1633.1,829.2,1633.8,832z"/>
+		<path class="st4" d="M244.8,826.5c3-1.8,7.2,1,6.5,4.4c-0.4,1.7-1.2,4.5-3.4,4.4c-2.1-0.6-1.1-2.8-1.3-4.3
+			C246.8,829.3,245.4,828,244.8,826.5z"/>
+		<path class="st4" d="M1144.4,826.2c1.2-0.8,3.1-0.7,3.8,0.7c-0.7,2-1.8,4.3-4,4.9C1142.7,830.3,1143.5,827.9,1144.4,826.2z"/>
+		<path class="st4" d="M1663.5,830.9c0.9-1.8,2.1-3.4,3.2-5.1c0.4,1.4,0.8,2.9,1.2,4.3c-0.7,0.7-1.4,1.4-2.1,2.1c0.7,1,1.3,2,2,3.1
+			c1.3-1.2,2.6-2.4,4-3.4c0.2,0.7,0.5,2.2,0.6,2.9c1.2,0,2.3,0,3.6,0c-1.2,0.6-2.6,1.1-3.4,2.2c0.9,2.1,3.7,0.9,5.4,1
+			c-0.1,0.3-0.3,1-0.5,1.3c0.8,0.4,1.6,0.9,2.5,1.4c-0.7,0-2.2,0-3,0c0.2,0.7,0.4,2,0.6,2.6c-0.3-0.2-1-0.5-1.3-0.7
+			c-0.6-0.3-1.8-0.9-2.4-1.2c0.1-0.5,0.2-1.1,0.4-1.6c-1.3-1.4-2.6-2.8-3.7-4.3c-1.5,0.1-3.1,0.1-4.6,0.3
+			C1665.1,834.2,1664.1,832.6,1663.5,830.9z"/>
+		<path class="st4" d="M388.4,832.3c2.6-2.1,5-4.7,8.4-5.4c0.2,1.2,0.5,2.4,0.7,3.6c1.1,0.9,2.5,1.5,3.2,2.8c1,1.3-1,2.1-1.9,2.5
+			c-1.6,0.6-3.4,0.7-5.1,0.9c-0.4-1-0.8-2-1.2-3C391,833.7,389.5,833.3,388.4,832.3z"/>
+		<path class="st4" d="M153.3,832.5c4.1-0.8,8.7-0.6,11.5-4.2c0.5,1.4,0.9,2.8,1.4,4.2c3-0.1,6.1,0.2,8.9,1c0.6,1.8,1.3,3.7,1.9,5.5
+			c0.1,0.4,0.4,1.3,0.6,1.8c-1.8,3.1-3.4,6.5-3.6,10.1h-2.2c-0.1-1.2-0.2-2.4-0.3-3.5c-1.8-0.1-3.6-0.2-5.4-0.3
+			c-0.1,1.3-0.2,2.6-0.3,3.8h-0.4c-0.6-0.9-1.2-1.8-1.8-2.7c-1.9,0.8-3.7,1.7-5.4,2.7H156c-0.3-1.4-0.6-2.7-1-4.1c1,0.5,2,1.1,3,1.6
+			c1.9-0.6,4.5-0.3,5.6-2.5c-0.8-2.9-4.3-1.5-6.4-1.5c-0.2-0.7-0.7-1.9-1-2.6c-1.6,0.6-3.1,1.3-4.7,2c0.7,0.8,1.5,1.6,2.3,2.3
+			c-0.4,0.3-1.1,0.9-1.5,1.2c-0.1,0.6-0.2,1.9-0.3,2.5c-0.7-0.7-1.4-1.3-2.1-1.9c-1.3,0.4-1.8,2-2.8,2.8H147
+			c0.2-1.5,0.4-2.9,0.6-4.3c2.7-2.4,5.8-4.6,7.8-7.7C156.1,836.6,154.2,834.6,153.3,832.5 M157.1,834.8c0.8,0.8,1,3.4,2.6,2.7
+			c2.4-0.8,5-1,7.5-1.2c0.1-0.2,0.4-0.7,0.6-0.9C164.8,832.7,160.4,832.8,157.1,834.8 M170.2,835.4c0.4,2.4,0.4,5.2,2.3,7.1
+			c1,0.5,1.9,0.4,2.6-0.5C176.6,838.8,174.3,833.6,170.2,835.4 M160,841.2c3.1,2.1,6.9,3.5,10.8,3.4c-0.4-2.4-0.4-6.3-3.7-6.4
+			C164.1,837.4,161.6,838.9,160,841.2z"/>
+		<path class="st4" d="M937.5,828.4c1.9-0.6,1.8,2.3,1.9,3.5c-0.4,4,1.5,7.8,1.3,11.9c-0.3-0.3-0.8-0.8-1.1-1.1
+			c-0.1-1.9-0.1-3.8-0.2-5.7c-1-0.8-2-1.7-3-2.5C936.7,832.5,937,830.4,937.5,828.4z"/>
+		<path class="st4" d="M375.4,829.4c1.8-1.2,4.1-0.8,5.8,0.5c0.3,3.2,0.1,6.3,0.1,9.5c1.6,0.5,3.2,1,4.9,1.6
+			c0.2,0.9,0.4,1.9,0.7,2.8c-2.8-0.2-5.5-0.3-8.3-0.5c-1.3-1.2-3.1-2.2-3-4.2C375.3,835.9,374.2,832.5,375.4,829.4 M378.1,838
+			c2.8-1.3,2.9-6,0.8-8.2C375.5,831.1,376,835.9,378.1,838z"/>
+		<path class="st4" d="M434.4,832.9c-0.4-2,2-4.3,3.9-3.2c0.6,2.4,0.2,4.9-0.3,7.3C436.5,835.9,434.4,835,434.4,832.9z"/>
+		<path class="st4" d="M1079.2,829.5c1.2,0.2,2.3,0.5,3.5,0.8c-0.1,1.4-0.1,2.8-0.1,4.2c-2.5-0.5-5-0.4-7.4,0.1
+			C1076.2,832.7,1076.8,830,1079.2,829.5z"/>
+		<path class="st4" d="M1226.5,830.3c0.7-0.6,2-1.7,2.7-2.2c1.7,3.7,3.2,7.5,3.5,11.6c0.6-0.7,1.1-1.5,1.7-2.2
+			c0.2,0.7,0.5,2,0.6,2.6c-1.9,0.4-3.9,0.7-5.9,1c-0.2-0.6-0.5-1.8-0.6-2.4c-1.2-0.4-2.3-0.8-3.4-1.3c-0.1-1.8,2.2-2.2,3.3-3.2
+			C1227.8,832.9,1227.2,831.6,1226.5,830.3z"/>
+		<path class="st4" d="M1441,829.2c1.9,1.2,3.9,2.4,5.1,4.4c-1.9,0.5-3.7,1-5.5,1.5C1440.6,833,1440.8,831.1,1441,829.2z"/>
+		<path class="st4" d="M1007,830.1c1.7,0,3.3,0,5,0.2c1,0.7,1.4,1.9,2.2,2.9c2.6,0.1,5.2,0.1,7.7,0.1c-0.5,1.8-0.4,4.3-2.6,5
+			c-2.9,0.8-5.7-1.2-7-3.7c-0.8-1.7-2.7-1.6-4.2-2C1007.7,831.8,1007.3,831,1007,830.1 M1014,835.7c1.7,1.1,3.6,1.8,5.7,1.4
+			c0-0.7,0-2.1,0-2.8C1017.6,834.3,1015.6,834.5,1014,835.7z"/>
+		<path class="st4" d="M1410,839.1c-3.1-1.9-5.2-5.9-2.8-9.2c0.2,0.8,0.4,2.3,0.6,3c1,0.5,2,1,3,1.5
+			C1410.5,836,1410.3,837.5,1410,839.1z"/>
+		<path class="st4" d="M1533.5,831.2c0.7-0.5,2.2-1.4,2.9-1.8c0.6,0.9,1.2,1.8,1.8,2.7c-0.5,1.8-1.5,3.4-2.3,5
+			c0.8,0.8,1.5,1.6,2.3,2.4c-0.2,0.4-0.7,1.1-0.9,1.5c-2.8-0.5-5.6-1-8.4-1.7c1.9-1.5,4.9-2.4,5-5.3
+			C1533.8,833.3,1533.6,831.9,1533.5,831.2z"/>
+		<path class="st4" d="M747.2,831.2c1.7,0.4,5.2-0.8,5.4,1.8c0,2.2-2.9,1.6-4.3,1.5C747.5,833.6,747.5,832.3,747.2,831.2z"/>
+		<path class="st4" d="M1363.2,840.2c3.9-1.4,4-7.1,8.6-7.4c-1.2,3.7-1.7,7.5-2.3,11.3c-0.3-0.3-1-1-1.4-1.3c0.5-1.5,1-3,1.5-4.5
+			c-1.5,0.4-3,0.9-4.3,1.8c-0.7,1.1-1.4,2.2-2,3.3c-1.4,0.1-2.8,0.2-4.2,0.3c-1.2,2.4-2.4,4.8-3.7,7.1h-1.9c0.7-2.3-0.7-4.2-2.2-5.9
+			c-1.4,0.8-2.8,1.7-4.2,2.5c-0.5-0.2-1.5-0.6-2-0.8c0-1.8,0.1-3.7,0.2-5.5l0.8-0.9c-0.1,2.1-0.1,4.2-0.1,6.3c2-1,3.6-2.5,4.3-4.6
+			c0.4,0.2,1.1,0.7,1.5,0.9c2.3-0.3,4.7-0.7,7.1-1c0.4-0.2,1.2-0.7,1.6-1C1360.2,844.3,1364.8,842.8,1363.2,840.2 M1353.3,845.1
+			c0.3,1.6,2.2,1.3,3.4,1.8c0.3-1.3,0.7-2.5,1.1-3.8C1356.1,843.3,1353.5,842.8,1353.3,845.1z"/>
+		<path class="st4" d="M1288.1,833.6c1.4,0,2.9,0,4.4,0l-0.5,0.7c-1.1,1.3-2,2.7-2.2,4.5c-0.6,0.2-1.8,0.6-2.4,0.8
+			c-0.1,0.5-0.4,1.6-0.5,2.1c-0.5,0-1.5,0-2,0c0.4,0.9,0.8,1.8,1.2,2.7l-0.6-0.5c-0.8-0.6-1.6-1.2-2.4-1.8c-0.9-0.1-2.8-0.2-3.8-0.3
+			c0.5-1.3,1.1-2.6,1.7-3.9c0.4,0.2,1.3,0.5,1.7,0.6c0.4-1.1,0.8-2.2,1.2-3.3c1.5,1.2,3.2,2,5.1,2.2
+			C1288.7,836.1,1288.4,834.8,1288.1,833.6z"/>
+		<path class="st4" d="M1662.3,834.1c1.1,0.8,2.2,1.7,3.4,2.6c-0.5,1.4-1,2.9-1.4,4.3c1,0.5,2.1,0.9,3.2,1.4
+			c1.1,1.6,2.3,3.2,3.6,4.8c0.7,0.9,1.5,1.9,2.3,2.8c-2-1.5-4.2-2.6-6.5-3.6c0,1.5,0,3.1,0,4.6H1656c0.8-1.4,2.8-2.8,1.5-4.5
+			c-0.9-0.2-1.8-0.3-2.6-0.3c-1.1,0.4-2.4,0.7-2.9,1.8c0.2,0.5,0.8,1.4,1,1.9c-0.4,0-1.2,0-1.6,0c-0.1-1.4-0.2-2.7-0.3-4
+			c-0.7,0-2.2,0.1-2.9,0.1c-0.1,1.7-0.1,3.4-0.2,5.1h-0.8c0-2,0-4,0-5.9c3.1-0.3,6.2-0.6,9.3-0.9c0.7,0.5,1.5,1.1,2.3,1.6
+			c0.8-2.7,1.5-5.4,1.9-8.2C1661.2,836.5,1661.7,835.3,1662.3,834.1 M1660.1,847c2.6-0.8,5.1-1.8,7.5-3c-2.2-1.2-4.6-1.9-7-2.4
+			C1659.7,843.3,1659.5,845.1,1660.1,847 M1661.9,848.8c1.2,0.4,2.5,0.8,3.8,1.2c0.1-1.4,0.2-2.9,0.3-4.3
+			C1664.4,846.4,1663.1,847.5,1661.9,848.8z"/>
+		<path class="st4" d="M1154.3,835.2c3,2.1,6.6,3.3,10.3,3.6c-0.1,1.4-0.2,2.9-0.3,4.3c-2,0-4-0.2-5.9-0.2c-1.8,0-3.5,0.4-5.2,0.7
+			c-2.8-1.4-5.9-2.1-8.9-2.4c0.2-1.9,1.4-4.1,3.7-3.8c1.5,0.7,2.8,1.7,4.1,2.6C1152.8,838.3,1153.5,836.7,1154.3,835.2
+			 M1157.1,839.3c1.5,2.5,4.7,4.4,6.8,1.4C1162.8,838,1159.2,839.5,1157.1,839.3z"/>
+		<path class="st4" d="M437,841.5c1.1-2,2.1-4.5,4.8-4.4c-0.6,2.9-1.3,5.8-2.1,8.7c-1.5-0.2-2.9-0.5-4.2-1.2
+			c-0.4-0.1-1.1-0.2-1.5-0.3C434.4,842.8,435,841.2,437,841.5z"/>
+		<path class="st4" d="M1421.5,838.9c0.9-0.7,2-1.1,3.2-1c-0.1,0.7-0.2,2.1-0.3,2.7C1423,840.8,1421.4,840.9,1421.5,838.9z"/>
+		<path class="st4" d="M1241.9,849c-0.6-4.3,3.8-7,6.2-9.9c0.6,0.4,1.3,0.9,1.9,1.3c-1.1,0.6-2.2,1.3-3.3,1.9
+			c1.8,1.5,3.7,2.7,5.8,3.7C1248.9,846.7,1245.7,849.8,1241.9,849z"/>
+		<path class="st4" d="M1328.3,841.9c2-0.8,4.2-1.3,6.3-1.5c-0.8,1.5-1.7,3-2.5,4.5C1330.5,844.3,1329.2,843.3,1328.3,841.9z"/>
+		<path class="st4" d="M339.5,851c-1.1-2.8-3.6-5.7-2.3-8.8c1.3,1.7,2.7,3.4,4.2,5c1,1.2,1.8,2.5,2.5,3.8H339.5z"/>
+		<path class="st4" d="M1717.1,843.4c0.3,0,1,0.1,1.3,0.1c2.6,2.3,5.1,5,8.4,6.4c0.7-0.9,1.4-1.7,2.2-2.6c0.6-0.1,1.8-0.4,2.4-0.5
+			c-1.4,1.1-0.3,3.8,1.6,3.2v0.9h-13.2c-0.7-1.8-1.2-3.6-1.5-5.4c-0.6,0-1.8,0-2.4,0c0.4-0.2,1.1-0.8,1.5-1
+			C1717.3,844.3,1717.2,843.7,1717.1,843.4z"/>
+		<path class="st4" d="M112.1,849.2c0.3-2.1,0.9-4.1,1.8-6c1,1.2,2,2.5,2.9,3.9l0.5,1c1.3,0.2,2.6,0.5,3.8,0.8
+			c0.4,0.6,1.3,1.7,1.8,2.2h-6.3c-0.7-1.7-1.4-3.3-2-5C113.7,847.1,112.9,848.1,112.1,849.2z"/>
+		<path class="st4" d="M1186.6,846.8c2.5-0.9,5-2.7,7.8-2.3c0.9,2.8-3,4.5-4.4,6.5h-4C1186.2,849.6,1186.4,848.2,1186.6,846.8z"/>
+		<path class="st4" d="M12.1,846.3c3.1,0,6.3,0,9.4,0.1c0.3,0.5,0.8,1.4,1.1,1.8c-0.6,0.9-1.1,1.8-1.6,2.8h-2
+			c-2-1.1-4.1-2.2-6.2-3.1C12.6,847.5,12.3,846.7,12.1,846.3z"/>
+		<path class="st4" d="M493,846.3c1.5,0.1,3.1,0.3,4.6,0.4c-0.3,1.4-0.6,2.8-1,4.2h-4C492.7,849.4,492.9,847.9,493,846.3z"/>
+		<path class="st4" d="M749.8,849c1.7-4.4,9-3.7,10.5,0.6C756.8,849.6,753.3,849.4,749.8,849z"/>
+		<path class="st4" d="M226.9,849.7c2.9-1.2,6-1.5,9-2.5c0.3,1.3,0.6,2.5,0.9,3.8h-10.5L226.9,849.7z"/>
+		<path class="st4" d="M1479.1,847.1c2.2,0.3,4.5,0.6,6.8,0.9c-0.6,1-1.2,2-1.7,3h-4.3C1479.6,849.7,1479.4,848.4,1479.1,847.1z"/>
+		<path class="st4" d="M1493.9,848c1.4-0.5,2.8-1,4.3-1.4c0.5,0.1,1.5,0.3,2.1,0.3c0.2,0.6,0.6,1.9,0.8,2.5
+			C1498.5,850.2,1496.1,849.4,1493.9,848z"/>
+		<path class="st4" d="M1596.3,851c0.3-1.6,0.3-3.3,1.7-4.4c2.4,0.1,2.6,2.8,3.5,4.4H1596.3 M1598.1,848.2
+			C1596.5,851.2,1601.5,848.4,1598.1,848.2z"/>
+		<path class="st4" d="M1277.1,851c0.9-1,1.5-2.4,2.8-3.1c1.1,0.3,2.1,0.6,3.2,1c-0.3,0.5-0.8,1.6-1.1,2.2H1277.1z"/>
+		<path class="st4" d="M1041.1,851c-1.5-2.6,3.3-2.6,1.8,0H1041.1z"/>
+	</g>
+	<g id="_x23_9cbadcff">
+		<path class="st2" d="M320.2,0h5c-0.3,0.4-1,1.2-1.3,1.6c-0.5,0.7-1.5,2.1-2,2.8c3.1,0.9,6.4,1.4,9.2,3.1c0.5,0.4,1.5,1.2,1.9,1.6
+			c0.6,0.5,1.1,1,1.7,1.4c-1.6,0.8-3.2,1.7-4.9,2.5c-0.7-1-1.3-2.1-2-3.1l-0.4-0.5c-1.8-0.4-3.6-0.6-5.4-0.9c-0.3-1-0.6-2.1-0.8-3.1
+			c-1.1,0.1-2.2,0.1-3.4,0.2l-1.4,0c0.1-0.7,0.2-2,0.3-2.6c0.6-0.2,1.7-0.5,2.2-0.7C319.4,1.8,319.9,0.6,320.2,0z"/>
+		<path class="st2" d="M335.3,0h14c-1.1,0.9-2.2,1.8-3.2,2.7c-2.4,0.3-4.8,0.6-7.1,1.4c-1.9,0.5-3.8,1.9-5.7,0.8
+			c0-1.2,0.1-2.3,0.1-3.5C333.9,1.1,334.8,0.4,335.3,0z"/>
+		<path class="st2" d="M359.5,0h4.2c1.8,0.3,3.5,0.7,5.1,1.3c0.7,0.9,1.4,1.8,2.1,2.8c-0.9,2.6-3.2,3.8-5.8,4.2c0,0.8,0,2.3,0,3
+			c2.2-0.8,4.4-1.9,6.8-1.8c-1.3,1.3-2.5,2.7-4.1,3.6c-2.3,1.4-3.7-2-5.9-1.9c-1.2,0.4-2.4,1-3.6,1.5c-1-1.3-2.3-2.6-1.5-4.3
+			c0.4-1.4,0.7-2.7,0.9-4.1c-0.1-0.3-0.2-0.9-0.3-1.2c-0.2-0.6-0.5-1.9-0.6-2.6C357.6,0.5,358.8,0.2,359.5,0 M363.1,3.3
+			c-1.9,0.2-1.3,3.4,0.6,2.6C365.4,5.6,364.9,2.8,363.1,3.3z"/>
+		<path class="st2" d="M384.5,0h6.7c1.3,1,2.7,2.1,4.1,3.1c-0.1,0.6-0.5,1.7-0.6,2.3c-0.8,0-2.4,0-3.2,0c0,1-0.1,2-0.1,3
+			c-4.2-0.1-4.4,4.8-7.1,6.9c-2,1.5-3.8,3.2-5.1,5.5c-1.9-1.1-3.7-2.6-6-2.5c0.4,2.4,1.2,4.6,2,6.9c-1.5,0.2-2.9,0.4-4.4,0.6
+			c-0.4-0.4-1.4-1.1-1.8-1.5c-0.5,0.3-1.6,0.8-2.1,1.1c-0.5,0-1.5,0.1-2,0.1c0.5-1.6,0.9-3.3,1.4-5c-1.9,0-3.7,0-5.5,0
+			c0.3-0.6,0.9-1.9,1.3-2.6l1.1-0.4c2.2,0.1,4.4,0.4,6.5,0.6c1.4-2.6,3.1-5,5.1-7.3c-0.5-2.7-0.6-5.5-0.1-8.3
+			c0.8,1.2,1.5,2.4,2.2,3.6c0.3,0.4,0.8,1.3,1,1.8c0.5-0.2,1.6-0.7,2.1-0.9l0.4-0.2c-0.2-1.6-0.5-3.1-0.8-4.6
+			C381.2,1.5,382.9,0.7,384.5,0 M386.2,1.3c-1.4,1.5-2,3.4-2.1,5.4c0.6,0,1.9,0,2.5,0c0.7-1.5,1.4-2.9,2.1-4.4
+			C387.8,2,387,1.6,386.2,1.3 M376.1,13.1c1.4,0.5,2.7,0.9,4.1,1.4c1.6-0.8,3.6-1.6,3.5-3.8C380.9,9.6,377.7,10.5,376.1,13.1z"/>
+		<path class="st2" d="M394.4,0h8.3c-1.2,0.9-2.4,2-3.8,2.8C397,2.8,395.8,0.9,394.4,0z"/>
+		<path class="st2" d="M403.4,0h15.7c-0.3,0.6-1,1.7-1.4,2.2c-3,0.1-6-1.1-9.1-0.5C406.5,2.5,404.8,1.6,403.4,0z"/>
+		<path class="st2" d="M428.3,0h8c-0.9,0.8-1.8,1.6-2.7,2.4c-1.5,0.2-3,0.4-4.5,0.5c1.4,1.5,2.7,3.1,4.1,4.6c1.3-2.2,2.4-4.8,5-5.8
+			c-0.8,2.4-2.1,4.7-3.6,6.8c-3.4-1-6.9-1.6-10.5-1.3C425.5,4.8,426.8,2.3,428.3,0z"/>
+		<path class="st2" d="M444,0h4.2c1.9,1.2,3.9,2.3,6,3.1c-0.8-1-1.6-2.1-2.4-3.1h5.1c-1.2,3,4.1,3,2.7,0h5.4c1.3,1,2.5,2.2,4,3
+			c2.1-0.2,3.7-2,5.5-3h60.3c-0.1,0.9-0.2,1.9-0.3,2.8c2.4-0.8,4.8-1.8,7.1-2.8h2.2c-0.2,1.3-0.5,2.6-0.5,3.9c1,1.3,2.4,2.3,3.9,2.8
+			c2,0.6,2.2-1.9,3-3.1c-1.2,0-2.4,0.1-3.6,0.1c0.1-1.2,0.3-2.5,0.4-3.7h87c-1.4,3,4,3,2.7,0h26.1c1.2,1.1,2.4,2.2,3.5,3.3
+			c0.3-0.8,0.8-2.5,1-3.3h510.4c0,0.7,0.1,2.2,0.2,2.9c2.8,0,5.3-1.2,7.5-2.9h12.4c1.3,2,2.6,4,4.2,5.8c1.8-1.5,3.2-3.4,4.7-5.2
+			c0.6,0.2,1.8,0.6,2.4,0.8c0.3-0.3,1-1.1,1.3-1.4h14.8c0.2,0.4,0.7,1.2,0.9,1.6c1.7-0.2,3.5-0.4,5.2-0.6c-0.6,1.1-2.4,2.4-0.6,3.3
+			c1.2-0.6,2.3-1.3,3.5-2c-0.4-0.6-1.2-1.8-1.6-2.4h27.5c0.4,0.6,1.2,1.7,1.6,2.2c3.5-0.6,7-1.4,10.4-2.2h24.9
+			c0.7,2.3,3.7,1.8,4.7,0h10.4c1.4,1.4,3,2.6,4.8,3.6c0.2-1.2,0.4-2.4,0.5-3.6h2.8c0,2.7,0,5.3,0,7.9c-1,0.8-2,1.7-3,2.5
+			c0.9,1.7,1.7,3.4,2.6,5.1c1.6-0.5,3.2-0.9,4.8-1.4c-1.3-1.3-2.6-2.7-3.9-4c0.4-0.4,1.3-1.2,1.8-1.6c-0.2-2.8-0.1-5.6,0.4-8.4h17.6
+			c-1.3,1.2-2.6,2.5-3.8,3.9c2.3,0.9,4.5,0.4,6.6-0.8c1,1.3,2,2.5,3,3.8c1.1-0.5,2.2-0.9,3.3-1.4c0.5,0.9,1.1,1.8,1.7,2.7
+			c0.9-0.6,1.9-1.3,2.8-1.9c-1-1.5-2-3-3-4.5c0.7-0.2,2.1-0.7,2.8-0.9c0.7,1.6,1.2,3.2,1.8,4.8c1.9-0.7,3.8-1.5,5.7-2.2
+			c0.2-1.1,0.4-2.2,0.6-3.4h2.1c1.4,2.5,2.7,5.1,4.1,7.5c0.8-0.8,1.5-1.7,2.2-2.5c0.1-2.4-2.2-3.6-3.7-5h8.6c0.2,0.8,0.6,2.2,0.8,3
+			c0.8-0.6,1.6-1.1,2.4-1.7c1.2,1.4,2.3,2.7,3.5,4.1c-1.3,0.2-2.6,0.4-3.8,0.6c-1.9-0.7-3.8-1.4-5.7-2c-0.1,2-0.4,4-0.8,6
+			c0.6,1.1,1.1,2.1,1.8,3.2c-1.1,3-3.4,5.2-6.6,5.8c-0.3,0.3-0.9,1-1.2,1.3l0.3,0.8c3.1,2.3,6.9,3,10.6,2.7c0.4,0.3,1.3,0.9,1.7,1.2
+			c-4.1,0.1-8.3,0.9-12.4,0c-2.6-1-4.6-3.2-7.4-4c1.1,1.3,2.3,2.5,3.5,3.7c-3.5,0.6-7,0.6-10.6,0.4c-0.6-2.3-1.1-4.7-1.3-7.1
+			c-2,0.1-4,0.3-6,0.5c1.7,2.2,3.4,4.3,5.1,6.5c-8.2,0-16.7,0.5-24.8-0.3c0.2-2.2,2.6-3.3,4.2-4.6c-2.6,0.6-5.3,1.1-7.9,1.6
+			c1,0.9,2,1.9,3,2.8c-3.1,1.4-6.9,0.4-10-0.7c-3.7,1.5-7.7,1.6-11.7,1.1c0.1-1.6,0.2-3.3,0.4-4.9c-0.8,0.4-1.5,0.8-2.3,1.2
+			c0.3,1.3,0.6,2.5,0.9,3.8c-5.4,0.2-10.8,0.3-16.1,0c0.1-1.4,0.2-2.8,0.2-4.2c0.1-3-0.1-8.6-4.5-6.8c0.9,1.6,2,3.1,3.1,4.6
+			c-1.8,0-3.6,0-5.3,0.1c-0.2-0.8-0.7-2.4-0.9-3.2c-1.4,0.7-2.7,1.3-4.1,2c1.5,3.3,4.3,5.6,7.3,7.6c-3.3,0.3-6.5,0.2-9.8,0.1
+			c-0.3-1.6-0.6-3.2-0.9-4.8c-1,0-2.1,0.1-3.1,0.2c-0.3,1.4-0.5,2.9-0.7,4.4c-0.2-0.1-0.5-0.2-0.7-0.3c-1.8-2-3.8-3.8-6.2-5.1
+			c0,1.8,0.1,3.6,0.2,5.5c-3.4,0.2-6.8,0-10.2-0.1l0.5-0.7c0.4-0.6,1.1-1.7,1.4-2.3c0.4-2-0.5-3.6-1.8-4.9c-1.8,2.6-3.6,5.3-5.2,8.1
+			c-2.4,0.1-4.7-0.2-7-0.5c1.7-0.3,3.4-0.7,5.1-1.1c1-3.3,2.4-6.5,4.5-9.2c-1.8-0.2-3.7-0.4-5.4-0.6c2.7-2.4,6.1-3.9,8.5-6.6
+			c-0.4-1.9-2.2-3-3.5-4.2c-0.1-0.5-0.3-1.4-0.4-1.9c-1.6,0.8-3.2,1.5-4.8,2.2c0.1,0.9,0.2,1.7,0.3,2.6c-2.4,0.6-4.7,1.6-6.4,3.3
+			c0,1.6,0,3.2-0.1,4.8c-0.6,0.4-1.6,1.2-2.2,1.6c0.8,1,1.5,1.9,2.3,2.9c-0.2,1.9-0.4,3.9-2,5.3c-1-1.9-1.4-4.2-2.8-5.9
+			c-1.7-1.2-3.7-1.8-5.6-2.5c-0.4,3.3,2,5.1,4.6,6.6c-0.1,1.1-0.3,2.2-0.3,3.4c-4.8,0.3-9.6,0.3-14.4,0.2c-0.1-0.7-0.2-2.1-0.3-2.8
+			c0.3-0.6,0.7-1.3,1-1.9c-1.1,0.2-2.2,0.4-3.3,0.5c-0.6,0.1-1.7,0.3-2.3,0.4c-4.1-2.5-8.6-1.2-12.5,0.9c-0.2,0.6-0.5,2-0.7,2.6
+			c-1.3,0.1-2.6,0.1-3.9,0.2c0.1-0.7,0.2-2.1,0.3-2.8c0-0.3,0.1-0.9,0.1-1.2c-1.1-1.7-2.4-3.3-3.6-4.9c-0.8,0.4-1.7,0.7-2.5,1.1
+			c0,1.2,0,2.5,0,3.7c0.1,1.4,0.3,2.8,0.6,4.2c-3.4,0.2-6.9,0-9.9-1.6c-2.9,1.5-6.1,1.7-9.2,1.2c-1.5-3-4.5-4.7-7.8-4.4
+			c0.7,1.5,1.4,2.9,2.2,4.4c-11,0.8-22.1,0.1-33.1,0.4c-149.1-0.1-298.2,0.1-447.3-0.1c0.5-1.4,1-2.8,1.5-4.1c-0.7-0.3-1.3-0.6-2-1
+			c-0.9-1.4-1.8-2.7-3-3.8c0.2,3,0.9,6,1.6,9c-4.6,0.5-9.2-1.2-13.8-0.4c-6.9,1-13.9,0.4-20.8,0.2c-0.1-0.9-0.2-2.8-0.2-3.7
+			c-2.1,0.7-3.7,2.1-5.1,3.7c-7.9,0.4-15.9,0.3-23.8,0.2c-2.3,0.2-3.6-1.8-5.2-3.1c-0.2,0.8-0.6,2.2-0.8,3
+			c-17.6,0.3-35.3,0.1-52.9,0.1c-11.3-0.8-22.6,0.9-33.8-0.9c-0.9-0.6-1.8-1.2-2.6-1.8c-1.4,2-3.4,3-5.8,2.8
+			c-0.2-1.4-0.3-2.7-0.5-4.1c-0.5,0-1.5,0.1-2,0.1c0.2,1.3,0.4,2.5,0.5,3.8c-2.3,0-4.6,0.1-6.9,0.1c-0.8-1-1.6-2.1-2.4-3.1
+			c-0.2,0.7-0.6,2.2-0.8,3c-7.2,0.4-14.4-0.6-21.6-0.2c-8.1,0.5-16.2,0.4-24.3,0.2c-0.2-1.4-0.5-2.9-0.7-4.3
+			c-0.4,1.4-0.7,2.8-1.1,4.3c-8.6,0.3-17.3,0.3-26,0c-1.8-2.7-3.7-5.4-5.6-8c-1,1.7-1.9,3.4-2.8,5.2c2.1,0.5,4.2,1.3,6,2.7
+			c-5.1,0.2-10.2,0.2-15.3,0.1c0.4-2.4,3.1-5,1.7-7.3c-1.5,0.3-2.9,0.8-4.4,1.3c-0.6,1.9-1,3.8-1.9,5.6c-6.4,0.7-12.9-1-19.2,0.9
+			c0.8-0.9,1.6-1.7,2.5-2.5c1.8-1.5,3.8-2.9,6-3.5c0.7,1.5,1.4,3,2.1,4.5c1.6-0.2,3.3-0.4,4.9-0.6c1.3-1.7,2.6-3.5,4-5.2
+			c-2.3,0.3-6.7,3.1-6.5-1.2c3.3-0.7,6.9-0.7,9.5-3.2c-1.8-1.3-3.7-2.8-6-2.9c-3.2-0.7-7.7,0.1-9.5-3.4c1.7-0.4,3.3-0.8,5-1.2
+			c0.2,0.6,0.7,1.9,0.9,2.6c0.7,0.1,2,0.3,2.7,0.4c0.4-0.1,1.1-0.4,1.5-0.5c1.3-1.4,2.7-2.8,4.5-3.6l1.2,0c-0.9,2.6-1.1,5.4,1,7.5
+			c0.3,1.5,0.6,3.1,0.9,4.6c2.8-1.3,4.7-3.8,5.9-6.6c-2-0.4-4-0.8-6-1.1c1-1.9,2-3.9,3.1-5.8c1.6,1.7,3,3.6,4.7,5.2
+			c1.9,1.1,3.9,2,5.9,2.9c-0.4,0.8-0.8,1.6-1.2,2.4c1.7,0.8,1.8,2.8,2.2,4.4c0.6,0,1.7,0.1,2.3,0.1c-0.5-2.1-1.6-3.9-3.1-5.4
+			c1.8-1.1,4.2-3.4,5.2-0.1c0.1,0.5,0.2,1.6,0.2,2.2c2,0.1,4.1-0.1,6.1-0.2c0.5,1.5,1,2.9,1.6,4.4c1.5,0.8,3.1,1.6,4.7,2.3
+			c0.8-3,3-6.2,1.4-9.3c-0.1-0.4-0.4-1.1-0.5-1.5c-0.5,0-1.5,0.1-2,0.2c-0.6,1-1.1,1.9-1.7,2.9c-0.6,0-1.8,0.1-2.4,0.2
+			c-2-1-3.8-2.3-5.7-3.4c2.7-1.5,4.9-3.8,6.7-6.3c0.3,0.7,1,2.1,1.3,2.8c0.4,0,1.2,0,1.6,0c0.6-1.3,1.1-2.7,1.7-4.1
+			C444.8,2.4,444.4,1.2,444,0 M498.8,5.1c1.4-0.4,2.8-0.7,4.1-1.1c0-0.7,0.1-2.2,0.1-3C500.9,1.6,498.4,2.3,498.8,5.1 M557,1.4
+			c0.3,1.3-0.5,4.3,1.8,3.7c0.5-0.3,1.6-0.9,2.2-1.2c-0.3-0.9-0.7-1.9-1-2.8C559.3,1.2,557.8,1.3,557,1.4 M577.7,2.7
+			c0.2,1.8,0.4,3.6,0.6,5.4c2.1-1.8,3.5-4.4,2.8-7.3C580,1.5,578.9,2.1,577.7,2.7 M611.3,1.2c-0.1,0.4-0.4,1.3-0.5,1.7
+			c1,1.9,2.8,0.3,3.4-1C613.4,0.9,612.4,0.7,611.3,1.2 M1288.6,5.7c1.3,0.7,2.6,1.4,4,2c-0.5-1.3-0.9-2.7-1.3-4
+			c-1-0.7-1.9-1.5-2.8-2.2C1288.5,2.9,1288.5,4.3,1288.6,5.7 M804.3,2.3c-0.6,1.6-0.1,2.2,1.6,1.7C806.5,2.4,805.9,1.8,804.3,2.3
+			 M1251,2.6c0.7,1.1,1.7,2.1,2.2,3.4c0,3.6-5.2,4.3-4.6,8.1c0.8,1.4,2.6,1.8,3.9,2.6c0.3,1.9,0.4,3.9,1.8,5.4
+			c1.5-2.8,3.9-5,6.6-6.6c-1.1-0.8-2.1-1.6-3.2-2.4c-0.1-0.5-0.2-1.5-0.2-2c1.6-1.3,3.1-2.7,4.8-4.1c-0.8-1.3-1.5-2.6-2.4-3.9
+			C1256.9,4.2,1254,2.6,1251,2.6 M1302.8,3.2c0.8,2,2.5,2.2,4.4,1.2c1.4,0.3,2.7,0.6,4.1,0.9c-0.3-1.2-0.6-2.5-0.9-3.7
+			C1307.8,2.1,1305.3,2.6,1302.8,3.2 M455.2,3.3c-0.6,1.7-1.1,3.4-1.7,5.1c-1-0.4-2.1-0.8-3.1-1.1c-1,0.9-0.9,2.4-1.3,3.6
+			c2-0.2,4.5-0.1,5.9-1.9c1.3-1.7,2.8-3.3,5-3.8C458.3,4.6,456.8,4,455.2,3.3 M490.4,6.3c0.1,2.7-0.4,5.8,1.9,7.8
+			c1.1-3.5,2.2-7.1,2.6-10.8C493.4,4.2,491.9,5.3,490.4,6.3 M503.3,7.3c-1,2.2-4.3,2-5.2,4.2c1.5,0.1,3.7,1,4.7-0.6
+			c1.9-2.7,4.3-5,7.4-6.1c-0.2,1.3-0.5,2.7-0.7,4.1c0.5-0.1,1.6-0.2,2.2-0.3c0.4-1,0.8-2.1,1.2-3.1c-1.6-1-3.1-2-4.8-2.7
+			C505.1,1.9,504.8,5.7,503.3,7.3 M1184.7,5.7c-1.7-0.4-3.3-0.8-5-1.2c0,1.5,0,3.1,0.1,4.6c1.9-0.2,3.9-0.3,5.9-0.7
+			c2.2-0.6,4.9-2.9,3.1-5.3C1186.9,3.1,1185.9,4.7,1184.7,5.7 M1264.1,5.2c0.3,0.5,1.1,1.5,1.4,2c-0.5,2.4-3.2,1.9-4.9,2.9
+			c-0.4,2.2,2.2,1.6,3.6,2.1c-0.3,0.9-0.6,1.8-0.8,2.7c2.5,2.1,5.7,2.1,8.5,0.7c-2-0.9-4-1.9-5.7-3.4c1.4-0.7,2.9-1.4,4.4-2
+			c-0.1-2.3-0.1-4.5-0.1-6.8C1268.3,3.9,1266.2,4.5,1264.1,5.2 M448.3,4.2c-1.8,0.4-1.1,3.2,0.7,2.7C450.8,6.5,450.1,3.5,448.3,4.2
+			 M472.3,4c0,0.8-0.1,2.4-0.1,3.3c1.9,0.3,4,0.4,3.1-2.2C474.5,4.3,473.5,3.9,472.3,4 M628.6,3.9c-0.5,2-0.9,3.9-1.3,5.9
+			c1.2,0.1,2.4,0.2,3.7,0.4C630.4,8,631.4,4.6,628.6,3.9 M1115.2,4.2c-2.2,0.5-1.7,4.9,0.8,4.1C1118.4,8.6,1117.6,2.9,1115.2,4.2
+			 M480,6c1.4,0.6,4.1,3.8,4.9,1C484.9,4.2,481.5,4.1,480,6 M465.2,5.8c-0.6,1-1.6,1.8-1.9,2.9c0.5,1.2,1.2,2.3,1.9,3.4
+			c0.9-0.4,1.8-0.8,2.7-1.2C467,9.2,466.1,7.5,465.2,5.8 M587.1,12.1c0.9,0.3,1.8,0.5,2.7,0.8c0.1-2.2,1.9-5,0-6.8
+			C587.8,7.4,587.8,10,587.1,12.1 M1124.8,5.7c-0.1,1.8-0.3,3.6,0.3,5.3c1.9,0.6,3.1-1.3,3.2-3C1129,5.6,1126.4,5.9,1124.8,5.7
+			 M1226.2,9c0.6,2.5,2.9,4,4.8,5.6c0.8-2.3,2.5-5.1,0.6-7.3C1230.1,5.1,1227,7.1,1226.2,9 M1297.2,8.1c-1.8,1.2-4.1,2.3-4.5,4.8
+			c0.5,0.2,1.6,0.5,2.1,0.7c-1.5,0.2-2.9,0.3-4.3,0.5c1,1.8,2.4,3.3,4,4.6c-0.3,0.7-0.9,2-1.2,2.7c1.2,0.4,2.4,0.8,3.6,1.1
+			c0.1-2.6,0.4-5.2,1.2-7.7l-0.1-0.5c0.3-2.7,1.5-5.2,1.5-8C1298.7,6.8,1297.9,7.5,1297.2,8.1 M1361.4,6c0,1.3,0,2.6,0.2,3.9
+			c1.8,1.7,3.5,3.6,4.2,6.1c0.7-0.5,1.9-0.9,1.8-2C1368.1,10.1,1364.2,7.7,1361.4,6 M600.2,7c-0.5,1.6,0,2.2,1.7,1.6
+			C602.4,7.1,601.8,6.5,600.2,7 M1305.3,7c-0.5,1.4-1,2.8-1.5,4.2c1.5,0,3.1,0,4.6,0C1307.4,9.8,1306.3,8.3,1305.3,7 M469.3,15.7
+			c1.1,0.5,2.2,0.9,3.3,1.4c-0.2,0.8-0.5,1.6-0.7,2.4c1.8,0.1,3.5,0.3,5.3,0.4c-1.5-1.9-3.1-3.6-4.9-5.3c0.3-1.2,0.6-2.4,0.8-3.7
+			c-0.2-1.6-1.9-2.4-3.2-3.1C467.6,9.7,469.8,13.2,469.3,15.7 M476.1,11c0.1,1.4,0.6,2.8,0.9,4.1c2.6-1.4,2.5-4.7,2.8-7.2
+			C478.4,8.6,476.3,9.1,476.1,11 M584.1,8.6c0.1,1.3,0.2,2.6,0.3,3.9c-0.4,1.1-0.9,2.2-1.3,3.4c1.4-0.3,2.8-0.5,4.1-0.8
+			C586.5,12.9,586.9,9.4,584.1,8.6 M619.9,13c1.7,0.3,3.4,0.6,5.2,0.8c-0.5-1.7-1.2-3.3-2-4.9C621,9.5,619.7,10.8,619.9,13
+			 M754.4,9.3c-1.2,1.4,1.3,3.3,2.5,2.2C758.2,10.1,755.7,7.9,754.4,9.3 M1174.2,14.6c1.4,0.5,2.8,1.1,4.3,1.6c0-2.4,0-4.9-0.1-7.3
+			C1176.1,10,1173.9,11.8,1174.2,14.6 M1168.2,10.1c-1.9,1.2-2.2,4-0.2,5.3C1170.4,14.5,1171,10.8,1168.2,10.1 M1341.4,10.4
+			l-0.7,0.4c2,2.8,5.2,4.8,8.4,5.9c1,0.7,2.4-1.4,1.2-2C1347.6,13,1344.9,9.3,1341.4,10.4 M573,11.2c0.4,2.1,1.3,4,2.4,5.9
+			c0.7-1.2,1.7-2.4,1.3-3.9C576.7,11.1,574.3,11.6,573,11.2 M1151.2,11.2c0.1,1.1,0.2,2.2,0.3,3.3c1.5,0.1,3,0.2,4.5,0.4
+			c-0.2-1.1-0.5-2.1-0.8-3.1C1153.9,11.4,1152.6,11.3,1151.2,11.2 M613.2,12.3c-1.8,0.3-1.3,3.4,0.6,2.7
+			C615.4,14.6,614.9,11.8,613.2,12.3 M793.2,12.4c-1.5,1.3,0.8,3.6,2.2,2.1C796.9,13.2,794.5,10.9,793.2,12.4 M1209.8,11.8
+			c1.2,1.5,1.8,4.9,4.2,4.4C1216.3,14.1,1212.2,10.8,1209.8,11.8 M1132.2,13.3c-2,0.5-2.4,5-0.1,4.9
+			C1135.2,19,1134.8,12.8,1132.2,13.3 M1215.3,15.9c1.1,0.8,2.2,1.6,3.2,2.3c-0.2,0.9-0.4,1.9-0.5,2.8c2.1,1,4.3,2,6.5,2.7
+			c-0.1-1.1,0.1-2.5-0.9-3.3c-2.2-2.5-4.1-5.2-5.7-8.1C1217.1,13.5,1216.2,14.7,1215.3,15.9 M967.3,14.2c-3.4,1.1,0.4,6,2.2,2.9
+			C969.2,16.1,969,12.9,967.3,14.2 M1194,15c1.1,2,2.5,3.8,4,5.5c1.7-1.4,2.2-3.8,1.2-5.8C1197.6,13.9,1195.7,14.6,1194,15
+			 M1288.2,14.1c-0.5,1.7,0,2.2,1.6,1.8C1290.3,14.2,1289.8,13.6,1288.2,14.1 M463,15.5c-1.1,3.5,3.4,3.1,5.5,2.7
+			c-0.2-0.8-0.6-2.2-0.8-3C466.2,15.2,464.6,15.2,463,15.5 M479.7,19.5c2.2,0,4.5,0,6.7-0.1c0.1-1,0.2-2,0.3-3.1
+			c-1.4-0.1-2.8-0.2-4.1-0.3C479.5,14.5,478.8,17.2,479.7,19.5 M519.2,16c-0.8,0.6-2.1,3.2-0.2,3C521.9,20.6,521.9,14.8,519.2,16
+			 M739,16c-0.8,2.3-0.3,4.6,0.4,6.8c1.1-0.4,2.3-0.9,3.4-1.3C742.5,19.1,740.8,17.5,739,16 M618,22c0.2-1.8,0.8-4.8-2.1-4.5
+			C613.1,18.9,615.1,23,618,22 M788.1,18.2c-2,0.4-1.3,3.6,0.7,3C790.6,20.9,789.9,17.8,788.1,18.2 M1352.9,17.9
+			c-0.8,2.4,1.9,4.5,4.1,3.2C1357.7,18.8,1354.8,17.2,1352.9,17.9 M461.6,22.7c0.9-0.2,2.6-0.6,3.5-0.8c0.7-2-1.3-3.5-3.1-3.1
+			C459.7,19.4,461.1,21.3,461.6,22.7 M543.1,20.3c1.3,1.5,2.7,2.9,4,4.3c0.8-0.9,2.2-1.8,1.3-3.2C547.4,19.4,544.9,19.3,543.1,20.3
+			 M608.4,19.2c-1.3,1.3,0.8,3.6,2.1,2.2C612.1,20.1,609.7,17.7,608.4,19.2 M1307.3,19.3c-2.2,0.9-0.7,4.2,1.4,3.4
+			C1311.1,22,1308.8,19.5,1307.3,19.3 M434,19.7c-0.2,0.6-0.7,1.7-0.9,2.2c1.9,1,3.7,2.9,6,2.1C440.4,20.8,436,20.6,434,19.7
+			 M590.5,20.9c0.3,1.3,0.7,2.6,1.2,3.8c1.2-0.9,2.5-1.8,3.6-2.8C595.4,19.1,592.1,21.2,590.5,20.9 M1340.6,20.1
+			c-0.7,1.3,0.1,3.4,1.5,3.8C1344.1,23.3,1342.3,19.7,1340.6,20.1 M647,21c-1.4,2.2,5.2,4.5,4.3,1.1C651.5,19.8,648.2,20.8,647,21z"
+			/>
+		<path class="st2" d="M1343.3,0h4.6C1346.9,1.7,1343.9,2.4,1343.3,0z"/>
+		<path class="st2" d="M1382.8,0h6.3c-0.7,0.4-1.9,1.2-2.6,1.6c0.1,4.5,0.4,9-1.1,13.3c-1.5-1.1-2.8-2.3-4.1-3.6
+			c-0.3-0.5-0.8-1.5-1.1-2c1.5-0.8,2.9-1.5,4.5-2.3C1384.1,4.7,1383.5,2.3,1382.8,0z"/>
+		<path class="st2" d="M1392.5,0h4.6c2.1,2.3,2.1,5.4,1.4,8.2c-1.2-0.4-2.3-0.8-3.5-1.2C1394.2,4.7,1393.3,2.4,1392.5,0z"/>
+		<path class="st2" d="M347.5,6.1c0.8,0.8,1.6,1.6,2.5,2.4c0.9-0.8,1.7-1.8,2.8-2.4c2,2,2,4.8,2,7.4c-2.8,0.6-5.6,1.1-8.4,1.5
+			c0.1,0.4,0.4,1.1,0.5,1.5c0.2,0.4,0.5,1.4,0.7,1.8c2.5,0.6,4.9,1.8,6.9,3.4c0-1,0.1-2,0.1-2.9c-1.1-0.7-2.2-1.3-3.3-2
+			c2.4-1.5,5.1-2,7.8-2.5c-0.1,0.3-0.3,0.9-0.4,1.2c-0.6,1.7-1.2,3.4-1.5,5.2c2.2,1.7,4.5,3.1,6.8,4.7c-4,0-8,0-12,0.1
+			c-0.5-0.3-1.4-0.9-1.8-1.2c-0.4,0.3-1.3,0.9-1.8,1.2c-2,0-4-0.1-6-0.1c-0.1,0.3-0.2,0.9-0.3,1.1c-1.7-0.6-3.5-1.2-5.3-1.6
+			c-0.5,0.2-1.5,0.7-2,0.9c-0.8,1.4-1.2,3.6-3.3,3.4c-0.9-0.8-1.9-1.7-2.8-2.5c-0.3,0.6-0.8,1.8-1,2.4c-0.5,0-1.6,0-2.1,0
+			c-0.4-2.3,0.9-6.7-2.6-6.7c-1.3,1.4-1.2,3.4-1.8,5.1c-1.3,0.1-2.6,0.3-4,0.4c-1.2-3.2,3.9-4,4.2-7c0.2-1.2,0.4-2.4,0.6-3.6
+			c-1.2,0.3-2.4,0.6-3.5,0.9c-0.3,1.6-0.7,3.3-1,4.9c-0.4-2.5-0.7-5.1-0.8-7.6c2.7-0.8,5.3-1.8,7.7-3.2c0.9,0.1,1.7,0.1,2.6,0.1
+			c-1.1,0.5-2.2,1.1-3.3,1.6c1.1,2.6,0.7,6.9,4.3,7.3l1.1,0.5c1.3,0.7,2.4,1.9,3.9,1.9c1.3-0.4,2.2-1.5,3.2-2.3
+			c-1.6-0.3-3.2-0.6-4.9-0.9c0.8-2.4,2.4-4.1,4.6-5.4c2.5,1.1,5.1,1.9,7.7,2.6c0-1-0.1-2.1-0.1-3.2c-2.2-1-4.5-2-6.8-2.9
+			c-0.1-0.5-0.4-1.6-0.5-2.2c2.7-0.6,5.4,0.1,7.9,1.1c0.6-0.8,1.1-1.6,1.7-2.3C346.2,7.7,347.1,6.6,347.5,6.1z"/>
+		<path class="st2" d="M1388.9,9.4c0.8-0.6,1.8-1.2,2.7-1.7c1,0.9,2.1,1.9,3.1,2.8c1.9,1.5,3.5,3.4,4.5,5.6
+			c-1.8-0.3-3.6-0.6-5.4-0.9c-0.5,0.7-0.9,1.5-1.3,2.2c-1,0.6-1.9,1.3-2.8,2c-0.2,3.1,2,5.6,3.4,8.1c-0.6,0.3-1.8,1-2.5,1.3
+			c-0.1-0.8-0.4-2.4-0.5-3.2c-0.5,0-1.4,0-1.9,0c-1.4-1.3-2.9-2.6-4.3-3.9c-2,0.1-4.1,0.2-6.1,0.4c0.2-1.2,0.4-2.4,0.7-3.5
+			c2.8,0.4,5.5,0.9,8.3,1.3C1388.2,16.3,1391.9,12.9,1388.9,9.4z"/>
+		<path class="st2" d="M1406.7,11.2c2.9-1.4,6.1-2.1,9.3-1.8c0,0.6,0,1.9,0,2.5c-0.8,0.5-1.7,1-2.5,1.5c-0.2,1.6,0.8,4.2-1.5,4.5
+			C1409.6,16.1,1408.1,13.6,1406.7,11.2z"/>
+		<path class="st2" d="M389.8,14.3c0.7-0.4,1.9-1.2,2.6-1.7c1.7,1.8,3.9,3.4,4.6,5.8l0,1c-1.4-0.6-2.8-1.3-4.2-2.1
+			c-2,1.2-3.8,2.6-5.6,4c-0.2-0.2-0.5-0.5-0.7-0.7C387.6,18.6,388.8,16.5,389.8,14.3z"/>
+		<path class="st2" d="M1393.6,20.9c-1.1-2.2,2-1.2,3.1-1.5c1.3,1.3,2.6,2.6,3.4,4.3c-0.6,0.5-1.9,1.5-2.5,2l-0.6-0.5
+			C1395.6,24.1,1393.5,23.1,1393.6,20.9z"/>
+		<path class="st2" d="M1407.7,22.8c0.5-0.2,1.6-0.5,2.1-0.6l1.3-0.4c1.2,1.7,1.8,3.7,1.2,5.8c-0.3,0.4-0.9,1.3-1.2,1.7
+			c-1.3-0.2-2.6-0.5-3.9-0.7C1407.4,26.6,1407.6,24.7,1407.7,22.8z"/>
+		<path class="st2" d="M1201.1,24.8c3-2.9,7-0.5,10.4,0.3C1208,25.3,1204.5,25.3,1201.1,24.8z"/>
+		<path class="st2" d="M334.3,30c0.6,0,1.8,0.1,2.4,0.1c0.2,1.7,0.4,3.4,0.7,5c1.5,1.3,3,2.5,4.6,3.8c-0.1,1.6-0.2,3.2-0.2,4.7
+			c-0.6,0-1.7,0-2.2-0.1c0.1,0.5,0.2,1,0.4,1.5c0.5-0.4,1.5-1,1.9-1.4c0.1,1.9,0.1,3.8,0.1,5.7c-2-0.7-3.9-1.5-5.8-2.4
+			c-0.3-0.3-0.8-1-1.1-1.3c-1.3-2.2-3.3-3.7-5.8-4.3c0.1,1,0.2,2,0.4,3.1c-1.1-0.4-2.2-0.8-3.3-1.1c0,1.1-0.1,2.2-0.1,3.4
+			c-1.1-0.8-2.2-1.7-3.4-2.4c-1.9,0.2-2.8,1.8-3.6,3.3c4.6,0,7,3.8,8.9,7.4c-1.6,0.2-3.3,0.4-4.9,0.7c-0.8-1.1-0.7-3.4-2.4-3.4
+			c-1.8,0.5-3.1,1.8-4.5,2.8c0.1-6.1,0.1-12.1,0-18.2c1.1,0.2,2.2,0.4,3.3,0.5c1.9-1.2,3.8-3.4,6.4-2.5c0.7,3-2.1,4.5-4.6,4.5
+			c1,1.1,2.1,2.3,3.1,3.4c2.4-2.2,4.7-4.6,7.9-5.6C333.1,34.9,333.7,32.5,334.3,30 M335.9,40c-0.6,1.5,1.2,2.2,1.8,3.2
+			c0.6-1.2,1.2-2.4,1.8-3.7C338.4,39.2,335.7,37.6,335.9,40z"/>
+		<path class="st2" d="M1394.6,29.9c0.7,0,2.1-0.1,2.7-0.2l0.6,0c1.6,1.9,2.8,4.4,5.3,5.1c3.6,1.2,7.3,1.8,11,2.6
+			c0.6-1.5,1.2-3.1,1.8-4.7c0,2.6,0.1,5.2,0,7.8c-2.4,0.2-4.8,0.6-7.2,0.6c-2.9-0.7-5.2-3.8-8.4-2.8c0.8,1.5,1.7,2.9,2.6,4.3
+			c-2.4-0.8-4.8-1.5-7.2-2.1c-1.8-0.1-3.5-0.1-5.2-0.1c0-2.2-0.1-4.5-0.1-6.7c1.4,0,2.7-0.1,4.1-0.1
+			C1394.6,32.4,1394.6,31.1,1394.6,29.9 M1396.5,35.9c0.3,1.5,2.1,1.6,3.2,2.2c0.4-1.4,0.5-2.8,0.3-4.2
+			C1398.5,32.9,1397.1,34.7,1396.5,35.9z"/>
+		<path class="st2" d="M1404.6,44.1c2.7-0.1,5.4-0.3,8.2-0.6c0.1,0.6,0.4,1.8,0.6,2.4c0.6,0.1,1.9,0.3,2.6,0.4c0,1.4,0,2.8,0.1,4.2
+			c-1.2-0.5-2.4-0.9-3.6-1.4c0.2,0.5,0.6,1.4,0.8,1.9c-0.2,0.6-0.5,1.7-0.7,2.3c-1,0-2.8,0.1-3.8,0.1c-2.4,0.7-4.7,1.6-7,2.5
+			c0.1-0.8,0.3-2.3,0.4-3c-0.3,1.2-0.5,2.5-0.7,3.7c0.9,0.7,1.9,1.4,2.9,2.1c1.7-1.1,3.4-2.1,5-3.2c0.8,1,1.9,2,2.4,3.3
+			c-0.7,0.6-1.5,1.2-2.2,1.8c2.2,0.4,4.4,1.2,6.4,2.2c0,0.9,0,2.6,0,3.4c-2.3-1.5-4.9-2.1-7.5-2.4c-0.2,1.6-0.5,3.2-0.7,4.7
+			c-3.1-0.2-3.8-3-4.5-5.6c-3.5,0.4-0.8,3.6-0.1,5.4c-2.8,1.8-6.8,2.8-7.5,6.4c3.5,0.8,7.1,0.3,10.6-0.2c0.2,1.4,0.5,2.7,0.5,4.1
+			c-0.9,0.7-1.8,1.3-2.8,2c-1.7-1-3.5-2.3-5.6-2.3c-3,1.4-3.4,4.9-4.5,7.7c-2.2,2.8-0.6,6.7-2.8,9.3c-0.5-3.9-0.5-7.8-0.5-11.7
+			c0-2.5,0-5-0.1-7.5c1.4,0.3,2.8,0.5,4.3,0.8c-0.5-3.7-1.1-7.3-1.8-10.9c-0.6,0.2-1.9,0.6-2.5,0.8c0-5.2,0-10.5,0.1-15.7
+			c0.5-0.4,1.5-1.4,2-1.8c1.6,0.7,3.2,1.5,4.9,2.2c-1.5,1.8-3.1,3.5-4.6,5.3c0.3,0.6,0.9,1.8,1.2,2.5c1.5-0.5,3.1-0.9,4.7-1.4
+			c-0.5-1.1-1-2.2-1.5-3.3c1.1-0.5,2.2-1,3.4-1.5c-2-1.9-4.3-3.6-6.1-5.7c-0.1-1.3,0-2.6,0.1-3.8c3.8,0.5,6.5,3.1,8.6,6
+			C1403.7,47.8,1404.1,46,1404.6,44.1 M1404.8,50c2.3,1.2,4.7-0.2,6.6-1.6c0.8-1-0.3-2.3-0.3-3.4C1408.8,46.3,1406.6,47.9,1404.8,50
+			 M1396,61.6c-1.1,1.8-1.5,4,1,4.8C1399.8,65.2,1397.5,62.8,1396,61.6z"/>
+		<path class="st2" d="M329.1,49.2c0.7,0,2-0.1,2.7-0.1c1.2,0.4,3.1,0.2,3.2,1.9c-0.6,2.2-2.8,3.3-4.5,4.5
+			C330,53.4,329.6,51.3,329.1,49.2z"/>
+		<path class="st2" d="M331.6,59.6c2-2.2,3.4-4.8,5.1-7.2c0.4,0.6,1.2,1.9,1.6,2.6c-4.2,5.7-11.1,10.9-9.9,18.9
+			c1.5,0.8,2.9,1.5,4.4,2.3c-0.1-3-0.5-6-2-8.6c1.5-1.1,2.7-4.4,4.9-3.2c0.1,0.7,0.3,2.1,0.4,2.8c-0.7,1.5-0.6,3.9,1.7,3.3
+			c1.3-1.5,2.4-3.3,3.5-4.9l0.7,0.3c0,2,0,4.1,0,6.1c-3.9,0.9-6.1,4.2-8.2,7.3c-1-0.5-2.1-0.9-3.1-1.4c-1.5,0.2-3.6,2.1-4.6,0.1
+			c-0.6-2.1,0-4.4,0-6.6c-2.8,0-3.8,2.3-4.7,4.6c1.1,0.5,2.1,0.9,3.2,1.4c-0.5,1.3-1,2.6-1.5,3.9c-1,0.5-2.1,1.1-3.1,1.7
+			c-1.1,1.5-2.3,2.9-3.5,4.2c0-4.2,0-8.4,0-12.6c0.6-0.4,1.7-1.2,2.3-1.6c-0.3-1.5-0.5-3.1-0.8-4.6c1.3,0.3,2.5,0.7,3.8,1
+			c1.4-1.2,2.8-2.4,4.2-3.7c2.4-1.3,1.4-4,1.2-6.2C328.7,59.4,330.2,59.7,331.6,59.6z"/>
+		<path class="st2" d="M335.6,62.5c2-3.6,2.8-8.1,6.3-10.6c0,3.5,0.1,6.9,0.1,10.4c-1.9,0.4-3.9,1.1-5.8,0.6L335.6,62.5z"/>
+		<path class="st2" d="M318.1,57.2c1.2,0.2,2.5,0.5,3.8,0.8c-0.2,0.4-0.6,1.1-0.9,1.4c-0.3,0.4-0.8,1.3-1.1,1.7
+			c-1.1,0.4-2.3,0.8-3.4,1.1c0-1.5,0-2.9,0-4.4C316.9,57.7,317.7,57.4,318.1,57.2z"/>
+		<path class="st2" d="M1408.6,70.5c0.8-0.9,1.6-1.7,2.5-2.6c1.6-0.1,3.3-0.2,4.9-0.2c0,5.5,0,11-0.1,16.5c-3,0.8-4,3.5-4.7,6.2
+			c-0.7,0.4-1.3,0.8-1.9,1.2c0.6,0.1,1.8,0.4,2.3,0.5c1.4,1.2,2.9,2.3,4.4,3.5c0,2.6,0,5.1,0.1,7.7c-0.6-0.1-1.9-0.4-2.6-0.5
+			c-0.9-2.4-1.2-5.2-2.9-7.2c-1.2-0.8-4.6-1.9-4.4,0.5c-0.3,2.8,3.2,2.8,5.1,3.6c0.1,1.8,0.9,3.8-0.2,5.5c-2-0.9-2.8-3.4-4.9-4.2
+			c-0.5,1.8,0.8,3.2,1.6,4.7c-1.8,1.8-3.6,3.6-5.4,5.4c0.2,0.7,0.3,1.3,0.5,2c0.1,1.2-2.6,4.3,0,4.2c2.7,0.5,5.5,0.9,8.3,1.2
+			c-1.8-1.8-3.7-3.4-5.8-4.8c0.5-1.6,1-3.3,1.7-4.9c2.4,0,3.9,2.1,5.8,3.3c1-1.4,2-2.7,3.1-4.1c0,9.8,0.1,19.6,0,29.4
+			c-1.2-0.5-2.4-1-3.5-1.5c1.1-1.5,2.3-3,3-4.8c-0.4-3.6-4.9-2.2-7.3-1.6c0.5,1.1,1,2.3,1.5,3.4c-1-0.1-2-0.2-3-0.4
+			c-0.6-1.6-1.2-3.1-1.8-4.7c-1.7,1.3-3.4,2.6-4.7,4.3c-0.2,2.2,1.5,3.8,2.7,5.4c-2.9-0.7-7.2,0.2-8-3.6c-1.3-2.2,0.7-4.2,1.8-6
+			c-1.9,0.1-3.8,0.2-5.7,0.4c0-8.7-0.5-17.3,0-26c1.2,1.5,2.5,2.9,4.1,4.1l0.3,0.2c-0.3,0.7-0.6,1.3-0.8,2c-0.1,1.8-0.1,3.5-0.1,5.3
+			c0.1,0,0.4-0.1,0.5-0.1c0.6-2.6,2.3-4.5,4.6-5.7c-0.4-0.7-0.8-1.4-1.2-2.1c-0.1-0.3-0.2-0.9-0.2-1.2c1.7-0.6,5.2-1.2,4.2-3.8
+			c-2.3-1-4.7-1.8-6.6-3.4c2.3-0.1,4.7-0.1,7-0.2c-0.4-2.1-0.7-4.2-1.1-6.3c0.5,0.2,1.6,0.7,2.1,0.9c0.4,0.2,1.1,0.5,1.5,0.6
+			c0.7-1.3,1.4-2.7,2.2-4c1.4-0.7,2.8-1.3,4.2-2c-1.5-1.5-3.3-1.5-5-0.4c-0.9-0.9-1.8-1.9-2.7-2.8c0.4-0.4,1.3-1.1,1.8-1.5
+			c1.7-0.6,3.4-1.1,5.1-1.6c-0.5-1.1-1.1-2.1-1.6-3.1c0.7-1.2,1.4-2.3,2.2-3.5c-0.6-0.1-1.8-0.3-2.4-0.5c-2.4-0.8-5.5-0.7-6.8-3.3
+			C1404.6,70,1406.6,70.3,1408.6,70.5 M1409.2,112.6c-1,1.3,1.2,3.3,2.5,2.2C1412.7,113.4,1410.4,111.6,1409.2,112.6 M1393.7,120.3
+			c1.2,1.6,2.8,2.7,4.4,3.8c0.1,0.7,0.3,2.1,0.4,2.8c0.1-1,0.2-2,0.4-3c1.3-0.1,2.7-0.2,4-0.3c0.9-0.4,1.8-1.2,2.9-1.2
+			c1.1,0.4,1.7,1.5,2.6,2.3c1.4,0,2.8,0,4.3-0.1c0.8-1,1.5-2.1,2.2-3.1c-5,0.7-10.1-0.2-15,1
+			C1398.3,120.6,1396.1,119.9,1393.7,120.3z"/>
+		<path class="st2" d="M600,76.7c23.8,0,47.6,0,71.5,0c-0.4,1.9-0.1,4-1.2,5.7c-2.1,1.8-4.7,3-7.1,4.4c-1.8-0.5-3.5-1-5.3-1.2
+			c-1.3,1.3-2.3,2.7-3.4,4.2c-2.7,0.1-5.5,0.4-8.2-0.3c-3.2-1.4-5.2-4.4-8.4-5.7c-2.1-0.3-5.8,1-4.4,3.7c1,4,5.8,3.4,9,4
+			c1,1.3,2.1,2.7,3.1,4c1.7-0.4,3.4-0.8,5.2-1.3c1.2,2.4,3,5.1,2.1,7.9c-0.9,2.5-3.6,0.5-5.4,0.3c1.5-1.6,1.5-3.7,1.3-5.8
+			c-4.3,2.7-8.6,5.5-12.5,8.9c0.6,4.4,2.7,8.5,3.8,12.8c-3.7-2.6-7.3-5.3-11-7.8c-3.6,2.8-7.2,5.5-10.9,7.9
+			c1.3-4.3,2.8-8.5,4.2-12.6c-4.1-3.4-8.4-6.5-12.9-9.3c0,0.9,0.1,2.7,0.1,3.6c2.5,3.7,7.2,4.9,10,8.2c-0.4,3.3-1.9,6.2-3.1,9.3
+			c-1.6,0.4-3.2,0.9-4.7,1.2c-3.9,0.1-7.9,0-11.8,0C600,104.8,600,90.7,600,76.7 M618.3,81.5c-1,1-0.9,3.3,0.7,3.6
+			C621,84.9,620.2,80.7,618.3,81.5 M626.7,85.9c-1.4,3.9-1.9,8.2-4.4,11.7c-1.1-0.7-1.7-2.5-3.2-2.4c-1.7,0.5-3.2,1.7-4.7,2.5
+			c3.5-0.1,7.1-0.1,10.6,0c1.7-3.9,3.2-7.8,4.6-11.8c1.2,3.7,2,7.5,3.7,11c0.5,0.2,1.6,0.6,2.2,0.8c-1.2-4.6-2.7-9-3.7-13.7
+			C629.9,84.3,627.2,83.6,626.7,85.9 M603.3,99c-1.8,0.5-1.1,3.4,0.8,2.9C606,101.6,605.2,98.2,603.3,99z"/>
+		<path class="st2" d="M674.4,76.6c2.4,0,4.8,0,7.2,0c0.1,0.6,0.2,1.7,0.2,2.2c0.2-0.7,0.3-1.5,0.5-2.2c7.5,0.1,15-0.1,22.4,0.1
+			c1.8,1.1,3.4,2.5,5,3.9c-2.1,1.8-4,3.7-5.9,5.7c-2-0.4-4-0.8-6-1.2c0.5,1.8,0.9,3.5,1.4,5.3c-1.4,0.8-2.8,1.6-4.2,2.4
+			c0.3,1.9,0.9,3.6,1.9,5.3c3.9-3.9,9.9-6,11.9-11.6c1.1-3.3,3.8-6.2,3.2-9.8c8.9,0.1,17.7,0,26.6,0.1c-1.1,3.4-1.2,7.4-3.6,10.2
+			c-1.2,0.1-2.5,0-3.7-0.1c1.3-1.8,2.6-3.5,3.7-5.4c-4.1,0.6-8.2,1.1-12.3,1.2c1.4,2.9,3.5,5.3,6,7.4c-0.1,0.5-0.4,1.5-0.5,2
+			c-2.5-1.2-4.7-5.3-7.6-3.9c-0.3,2,0.9,3.5,2.2,4.9c0.2,1.6,0.4,3.2,0.6,4.9c2.2,0,4.5,0.1,6.8,0.1l1,0.5c-0.7,2.7-2.1,5-5,5.6
+			c0.5,1.5,1,3,1.4,4.5c0.2,1.3,0.3,2.7,0.5,4c0.2,1.9,0.4,3.9,0.7,5.8c-12,0.6-24.1-0.5-36.1,0.5c-16.9,0-33.8,0-50.7,0.1
+			c-1.1-3.6-2.2-7.2-3.2-10.8c1.4-1.1,2.8-2.2,4.3-3.3c0.7,0,2,0,2.7,0c2.2,1.9,4.7,3.6,6.7,5.8c0.1,2.3-1,4.4-1.6,6.5
+			c2.2,0.8,4.6,1.7,6.9,0.8c2.6-2.3,2.4-6.1,2.8-9.2c2.5-1,5.7-1.3,7.2-3.8c0.6-2.4-0.3-4.9-0.5-7.3c3,0,6,0,9,0.1
+			c-0.4-3.7-1.4-7.2-1.7-10.9C674.8,83.3,675.7,79.9,674.4,76.6 M684.9,102c1.4,3.1,3.1,6.2,2.9,9.7c-3.3,0-6.6-0.8-9.9-1.1
+			c-2.7,1,0.4,3.6,1.1,5.1c1.7,3.2,5.8,2.4,8.8,2.5c2.9,0.4,4.7-2,6.5-3.8c3.5,0,8.4,0.7,9.9-3.5c1-2.2-2-2.1-3.2-2.6
+			c-3.4-0.5-3.5-4.9-6.2-6.3c-2.7-1.7-5.3-3.3-8-4.9C685.9,98.6,683.7,100,684.9,102 M710,105.1c-0.4,3.8,3.8,4.6,6.7,4.5
+			c1.6-0.7,1.9-2.8,0.6-3.9C715.1,104.2,712.3,104.9,710,105.1z"/>
+		<path class="st2" d="M739.7,76.9c0.6,0,1.9,0.1,2.5,0.1c1.2,3.4,1.8,7,3.5,10.2c-0.5-3.5-1.7-6.9-2.7-10.3c15-0.7,30-0.1,45-0.3
+			c20.2,0,40.4-0.1,60.5,0.1c1.6,3.4,3.7,6.6,6.7,9c1.2-0.3,2.2-0.9,3.4-1.3c-0.8-1.5-1.6-3-2.4-4.5c0.2-1.1,0.4-2.1,0.6-3.2
+			c3.6,0,7.2-0.1,10.9,0.1c-0.9,3.1-3.3,5.2-5.7,7.1c0.2,0.6,0.5,1.8,0.6,2.3c0.1,3.9-1.6,7.6-2.4,11.4c3.7,2.3,7.8,3.6,11.9,4.8
+			c0.8-1.7,1.8-3.3,2.3-5.2c-0.5-2.5-1.7-4.9-2.6-7.2c1.8-2.3,5.7-4.5,4.2-7.9c-2.7,0.4-4.9,2.2-7.2,3.6c0.5-3.5,2.2-6.6,4.5-9.2
+			l0.3,0.4c1.7,1.9,3.3,3.9,4.7,6c1.5-0.3,3.1-0.6,4.6-0.9c-0.3-1.8-0.5-3.5-0.8-5.3c5.1,0.1,10.3,0.1,15.4,0.1
+			c1.2,1.9,2.6,3.6,4,5.3c1.1-1.8,2.2-3.5,3.3-5.3c1.7,0,3.5,0,5.2,0c0.1,2.6,0.3,5.3,0.4,7.9c2.2,0,4.3,0.1,6.5,0.1
+			c0.5-2.2,1-4.3,1.6-6.5c4,2.1,7.5,4.8,11.7,6.5c3.2,1.2,3.7,5.1,5.3,7.7c0.7-1.3,1.5-2.5,2.2-3.8c0.8-1.2,1.6-2.3,2.4-3.5
+			c2.2,0.4,4.4,0.8,6.6,1.2c-0.4,2.1-0.8,4.2-1.1,6.3c-1.4,0.3-2.8,0.6-4.2,0.9c-1.7,3.3-3.4,6.5-5.1,9.8c2.9,1.3,6,2.4,9.1,3.3
+			c1.6,2.3,3.3,4.6,5.2,6.6c2.5,1.8,5.5,2.7,8.3,3.9c-2.2,0.9-4.5,1.5-6.9,1.3c-10.8-0.3-21.7,0.2-32.5-0.2
+			c-0.1-0.8-0.2-1.7-0.3-2.5c-1.4-0.5-2.8-0.9-4.3-1.3c-0.3,1.3-0.5,2.7-0.9,4c-11.8,0.1-23.7,0.1-35.5,0.1
+			c-1.5-3.4-2.5-6.9-3.5-10.5c1.1-0.7,2.2-1.4,3.4-2.1c3.2,1.3,6.7,2.6,10.2,1.8c1.6-1.1,0.8-3.4,1.2-5.1c-1.4-0.2-2.8-0.4-4.2-0.6
+			c0.2-2,0.4-4.1,0.6-6.1c-0.6,0.4-1.1,0.7-1.7,1.1c-3.8,2.9-7.6,5.8-11.6,8.5c1.3,4.4,3,8.8,4,13.3c-1.3-1.1-2.7-2.3-4-3.4
+			c-1.8-3.1-2.6-6.8-5.1-9.5c-3.4,1-6.7,3.5-6.1,7.4c-2.4,1.8-4.8,3.7-7.3,5.5c1.2-4.4,2.8-8.6,4.2-13c-2.4-1.8-4.7-3.6-7.1-5.3
+			c0.3-1.9,2.1-4.5-0.1-5.8c-3.2-1.6-7.1-1-10.2-2.8c-2.6-2-2.7-7-6.5-7.4c-3.2,1.1-6,3.2-9,4.6c-0.2,0.5-0.5,1.4-0.6,1.9
+			c3.5,1.2,7.1,0.6,10.2-1.4c1,1.4,2.3,2.7,2.2,4.6c-2,2.2-5,0.3-7.5,1c-3,0.7-6.7,1.7-7.8,4.9c0.7,3.9,5.2,5.1,8.1,7.2
+			c-0.8,3.3-3.7,4.7-6.5,5.9c-0.9,1.8-1.3,3.8-1.8,5.8c-11.2-0.1-22.3,0.2-33.5-0.2c-3.3-1.1-6.8-1.2-10.3-0.9
+			c0.4-0.3,1.2-0.9,1.6-1.2c-3.2-3.3-5-8-9-10.4c-1.7-1.2-3.6-2.4-4.6-4.3c-1.8-3.9-6.6-5.3-10.5-5.3c-0.2,1.5-0.2,3-0.2,4.5
+			c4.5,0.7,10.1,2.4,11.3,7.4c0.8,1.5-0.1,3.3-1.7,3.7c-2.9,1-4.9-1.8-7.2-2.8c-1.2,0-2.4,0.2-3.6,0.4c-1.3-3.7-2.7-7.4-4-11.2
+			c3.3-2.7,7.1-4.7,10.2-7.6c0-1.4-0.1-2.8-0.2-4.2c-2.6,1.8-5,3.7-7.5,5.5c-2.2-1-4.4-2.2-6.8-2.9c-1.6,0.5-2.1,2.3-3,3.5
+			c1.6,0.8,3.2,1.7,4.9,2.5c0.5,1.9,1.1,3.7,1.6,5.6c-0.3,0.6-1,1.9-1.3,2.6c-4.8-3.3-8-9.6-14.6-9.6c-0.1-1.9-0.2-3.7-0.2-5.5
+			c1-0.3,2-0.7,3-1l0.3-0.6C737.8,83.5,738.3,80.1,739.7,76.9 M817.1,78c0.7,3.6,3.6,6.2,4.4,9.7c0.7,0,2,0.1,2.6,0.1
+			C823.6,83.6,821.2,79.5,817.1,78 M812,88c0.5,2.7,0.1,5.5,0.7,8.2c3.3,1,6.3-2.5,9.9-1.9c-0.1-1.3-0.3-2.6-0.4-4
+			c-1.7,0.4-3.4,1.3-5.2,1c-3.6-1.6-1.4-6.5-4-9C812,84.1,811.5,86.1,812,88 M803.8,88.7c-0.8,2-0.3,4.2-0.3,6.3
+			c2.7-1.4,5.4-3.5,5.5-6.8C807.2,88.3,805.4,88.2,803.8,88.7 M919.5,92.6c-0.7,0.6-1.5,1.1-2.2,1.7c0,1.2,0,2.4,0,3.6
+			c2.2-0.7,4.5-1.3,6.8-1.7c-1.2-0.8-2.4-1.5-3.6-2.2c0.8-0.7,1.6-1.4,2.3-2.1c0.5-1.7-0.2-2.3-1.9-1.9
+			C920.5,90.8,920,91.7,919.5,92.6 M877.1,91c-0.7,1.6-0.9,3.6,0.9,4.5c0.9-0.9,1.7-1.8,2.5-2.7C879.5,92.1,878.5,90.9,877.1,91
+			 M792.5,96.7c1,2.9,1,6.3,3.1,8.8c3.6-3.2,9.3-0.4,12.2-4.5c-2.7-3.1-7.2-2.8-10-5.7C795.9,93.5,793.8,95.3,792.5,96.7
+			 M925.9,104.2c-4.8-2.4-10.6,1.1-11,6.4c1.8-1.1,3.7-2.7,6-1.9c1.8,0.1,4.1,1.6,5.5-0.2c2.1-2.4,5.1-3.4,8.1-4.1
+			c0-0.5,0-1.6,0-2.1C931.6,102.1,928.3,102,925.9,104.2 M899.2,107.9c2.4,1.7,4.7,3.6,6.8,5.6c1.1-1.2,2.3-2.3,3.5-3.5
+			c-2.1-2.3-4.6-4.1-7.6-5.1C900.3,105.1,899.9,106.8,899.2,107.9 M800.4,109.5c-2.1,0.8-3.6,2.5-5.3,3.9c-0.1,2.3,1,3.6,3.4,3.5
+			c0.8-1,1.6-2.1,2.4-3.1c2.3,0.7,4.7,1.3,6.9,0.2c-0.4-1.2-0.8-2.4-1.2-3.6C804.6,109.9,802.5,109,800.4,109.5 M932.6,114
+			c-0.1,2.4,4,3.7,4.7,1.1c1.2-2.3-0.8-4.3-2.3-5.8C933.9,110.6,931.8,111.8,932.6,114z"/>
+		<path class="st2" d="M924.5,76.7c2.4,0,4.9-0.1,7.3-0.1c1.6,1.9,3.2,3.9,4.7,5.9C931.9,82.5,927,80.9,924.5,76.7z"/>
+		<path class="st2" d="M953,76.6c3.6,0.1,7.3-0.1,10.9,0.1c5.7,2.3,6,8.8,8.4,13.6c2.9,3.4,7.2,5.4,10.6,8.4
+			c-1.7,4.6-3.7,9.2-3.7,14.2c1.3-0.3,2.7-0.7,4-1.1c3.8,0,6.5,3,9.7,4.5c1.7-2.3,3.3-4.6,5-6.9c2,1.7,4.4,3.1,7.1,2.9
+			c-0.6-3.5-1.6-6.9-2.8-10.3c1.7-0.6,3.4-1.4,5.2-1.6c2.4,1.3,3.3,5,6.2,5.2c3.4-3.6,6.1-7.9,10.1-10.9c1.2,0.3,2.5,0.5,3.7,0.8
+			c0.2-0.5,0.6-1.6,0.8-2.1c0.9-0.8,1.8-1.6,2.6-2.6c1.2-2,0.8-5,3.1-6.3c3.9,0.6,6.1,4.2,8.6,6.8c1.5-1.8,3.1-3.5,4.7-5.2
+			c0.8,2.5,1.2,5,1.4,7.6c1,1,2,1.9,3,2.9c-2.4,0.7-4-1.3-5.8-2.5c-0.5,1.3-2.3,2.7-1.2,4.2c2.1,4.5,6.6,7.1,10.9,9.3
+			c1.3-1.6,2.7-3.2,4.1-4.8c0.3,0.7,0.8,2,1.1,2.7c1.7,0.5,3.4,1,5.1,1.5c-0.9,0.8-1.8,1.5-2.6,2.3c-1-0.7-2-1.4-3-2.1
+			c-1,3.8,0.7,7.4,1.1,11.1c-2.5,0.1-5.1,0.1-7.6,0.2c0.6-0.8,1.3-1.7,1.9-2.5c0-0.7,0.1-2.1,0.1-2.8c-1.5,1.8-2.6,4.2-4.7,5.3
+			c-4.7,1-7.4-5.7-12.1-4.3c-4.7,0.6-8.1,4.7-12.9,4.4c-3.2,0-6.4-0.3-9.6-0.5c0.8-2.7,2.7-5.7,1.5-8.5c-0.9-0.7-1.8-1.3-2.7-1.9
+			c-0.6,0.3-1.9,0.9-2.5,1.2c-0.1,1.7-0.1,3.3-0.2,4.9c-1.9,0.3-3.7,0.7-5.5,1c-1.1,1.3-1.8,3.4-3.8,3.5c-5.9,0.7-12.1,0.8-17.8-1.1
+			c-3.4-1.4-6.6,3.1-10,0.9c-0.8-2.8-1.4-5.6-3-8.1c1.3-0.1,2.6-0.2,4-0.2c1.4-3.7-1.5-6.7-3.7-9.4c-1.5,2.1-3.3,4.1-6.2,3.7
+			c-0.2,1.5-0.4,3-0.6,4.5c-3.9-0.1-7.9-2.4-8.9-6.4c-1-2.3,1.2-4.3,3.1-5.1c2.2,0,4.3,0.5,6.5,0.5c1.8-0.7,3.3-2,4.9-3.1
+			c-0.2-0.8-0.6-2.5-0.8-3.4c-2,0.1-3.5,1.4-4.7,2.9c-2.8-1.3-6.6-4-9.3-1.1c-2.8,1.8-2,5.2-2.3,7.9c-3.6,1.2-3.6-3.8-4.9-6
+			c1.3-1.1,2.7-2,3.8-3.3c0.5-1.5,0.6-3.1,0.8-4.7c-1.7-0.3-3.4-0.6-5-1C948.8,82.1,951.3,79.4,953,76.6 M959.1,80.2
+			c-0.6,2-1.2,4-1.8,6c2.6,0.8,6.6,1.4,7.5-2.1C964,81.8,960.9,81.3,959.1,80.2 M1031,98.5c0.1,2.1-0.2,4.6,1.9,5.9
+			c0.3-1.5,1.8-3.3,0.5-4.7C1032.8,99.4,1031.6,98.8,1031,98.5 M1023.4,103.2c-2.7,2.5,3.8,4.8,4,1.7
+			C1027.4,103,1024.7,103.4,1023.4,103.2 M1017.1,104.1c0.3,1.4,0.6,2.8,0.9,4.2c0.7-0.2,2-0.5,2.7-0.7
+			C1021.7,105.1,1019.3,104.1,1017.1,104.1 M1050.5,108.9c-2.1,1.3-3.2,3.4-3.4,5.8c1.5-0.3,3.5,0.4,4.6-1
+			C1051.9,112,1051.4,110.4,1050.5,108.9z"/>
+		<path class="st2" d="M972.7,76.7c3,0,6.1,0,9.1,0c-0.9,1.4-1.2,3.5-3.1,4c-2.1,0.8-4.3,0.1-6.4,0C972.5,79.3,972.5,78,972.7,76.7z
+			"/>
+		<path class="st2" d="M990.8,77c0.6,0,1.8,0,2.4,0c0.8,3,2.5,6.1,2.4,9.2c-1.8,3.5-5.6,2-8.3,0.9C988.6,83.8,989.3,80.3,990.8,77z"
+			/>
+		<path class="st2" d="M994,76.9c3.1-0.3,6.2-0.3,9.3-0.2c-2.1,0.8-4,1.9-6,2.9c2,2.1,3.9,4.3,4.8,7.1c-1.8-0.1-3.5-0.3-5.2-0.7
+			C995.5,83.2,994.8,80,994,76.9z"/>
+		<path class="st2" d="M1008.3,76.6c2.6,0.1,5.2,0.1,7.8,0.1c-1.7,0.9-3.4,1.8-4.6,3.2c-0.1,1.9,0.7,3.6,1.2,5.3
+			c3.4-1.8,4.7-5.4,6.4-8.6c0.5,0,1.4,0,1.9,0.1c1,2.5,1.6,5.2,2.3,7.8c-1.4,0.6-2.9,1.1-4.2,1.8c-0.4,2.7,1.2,5.2,1.9,7.8
+			c-2.6-2.7-5.6-5.1-9.2-6.2c-0.4-0.2-1.1-0.5-1.5-0.7c-1-0.9-2-1.7-2.8-2.8C1007.3,81.8,1008,79.2,1008.3,76.6z"/>
+		<path class="st2" d="M1078.8,76.7c2.4,0,4.8,0,7.2,0c0.6,1.1,1.2,2.1,1.9,3.2c-1.1,0.2-2.2,0.5-3.3,0.8c-0.6,1.9,0.2,4.9-2.1,5.8
+			c-1.8,1.2-3.8-0.7-4.7-2.2C1077.4,81.7,1078.3,79.2,1078.8,76.7z"/>
+		<path class="st2" d="M1106.4,76.7c5.3,0,10.6,0,15.9,0c-0.8,2.2-1.5,4.4-2.3,6.6c-4.2-0.3-6.7,3.6-9.7,5.8
+			c0.4,0.4,1.3,1.1,1.7,1.5c-1.3,1-2.6,2-3.8,2.9c-0.5-1.5-1.1-3-1.5-4.6c-0.1-3.1,2.4-5.2,3.2-8
+			C1109.3,79.2,1107.5,78.1,1106.4,76.7z"/>
+		<path class="st2" d="M324.5,83.4c0.7-1.4,1.4-2.9,2.1-4.3c2.3,1.8,4.5,3.8,6.2,6.2c-4.3,1.3-8.5,3-11.9,6c1.6,0.6,3.3,1.6,5.1,1
+			c2.2-0.4,2.9-3.3,4.9-4c2-0.4,3.3,1.2,4.3,2.6c-0.8,1.3-1.5,2.7-1.8,4.2c-2.6,0.8-5.2,1.6-7.8,2.2c-0.2,1.1-0.5,2.1-0.7,3.2
+			c-1.4,0.7-2.8,1.3-4,2.3c-0.8,1.2-0.4,2.8-0.4,4.1c0.3,0.8,1,2.3,1.3,3c2.5-0.8,4.1-2.7,5.5-4.7c-0.6-1.2-1.2-2.4-1.7-3.7
+			c0.3-0.3,0.9-0.9,1.2-1.2c1,0.6,2,1.2,3,1.9c2.9,3,5.3-1.8,7.4-3.4c0.1-0.3,0.4-0.8,0.6-1c0.6-2,1.1-4,1.7-6
+			c-0.6-0.1-1.7-0.3-2.3-0.5c0.1-1,0.2-1.9,0.3-2.9c1.8-1.2,3.4-2.6,4.4-4.6c0,5.2-0.3,10.5-0.2,15.7c-1.9,2.5-3.4,5.4-5.9,7.4
+			c-0.7,0.3-1.3,0.7-2,1.1c-1.2,0.8-2.5,1.6-3.7,2.4c-1.1,1-2.2,2-3.2,3c0.6,1.3,1.3,2.5,1.9,3.8c-2.4,0.4-4.7,0.9-7,1.6
+			c-1.9,0.1-3.7,0.1-5.6,0.2c0-1.8,0.1-3.7,0.1-5.5c1-1.3,1.9-2.6,2.7-4c-0.8-0.7-1.6-1.4-2.4-2.1c0.1-2.4,0.1-4.8,0-7.3
+			c1.4,0.1,2.7,0.2,4.1,0.3c-1.5-1.3-2.9-2.6-4.4-3.8c0-2.2,0-4.4,0-6.7c2.9-1.3,5.3-3.5,7.6-5.7C324.2,84,324.4,83.6,324.5,83.4z"
+			/>
+		<path class="st2" d="M1122.4,87.4c1.8-3.4,5.3-5.4,9-6c0,12.5,0.1,25,0,37.5c-5.1,0-10.2,0-15.2-0.1c-1.1-3.6-2.1-7.1-3.2-10.7
+			c3.3-2.5,6.8-4.9,10.3-7.2c-0.2-1.4-0.3-2.8-0.4-4.2c-4.5,2.6-8.9,5.3-12.6,9c1.5,4.2,2.9,8.3,4.1,12.6c-3.7-2.5-7.2-5.1-10.6-7.8
+			c-4.1,2.4-7.5,5.9-11.9,7.7c0.9-2.3,1.8-4.6,2.8-6.9c2.3-2.2,3-5.2,3.3-8.3c2.3-1.8,5.1-3,7.6-4.5c0.2,0.6,0.6,1.9,0.8,2.5
+			c0.3-0.9,0.6-1.9,0.9-2.8c1.6-0.2,3.2-0.3,4.9-0.5c1.8-3.5,5.7-3.8,9.2-4.3C1121.6,91.3,1121.8,89.3,1122.4,87.4z"/>
+		<path class="st2" d="M1398.6,83.4c1.3,0.9,3.6,1.4,3.5,3.4c-0.6,2.3-1.7,4.5-2.7,6.6c-0.6,0.4-1.7,1.1-2.3,1.5
+			c-0.3-0.8-1-2.4-1.3-3.2C1396.6,89,1397.7,86.2,1398.6,83.4z"/>
+		<path class="st2" d="M1073.1,90.7c0.9,0.8,1.8,1.7,2.6,2.6c3.9,3.7,1.9,9.8,4,14.3c1.6,1.7,3.9,2.4,5.5,4.1c1,1.9,1.7,3.9,2.5,5.9
+			l0.3,1.2c-7.2-0.9-14.5-0.1-21.8-0.4c0.9-2.8,1.4-5.7,2.6-8.4c1.2-1.2,3.1-1.3,4.6-2c-0.9-2.2-2-4.4-2.3-6.8
+			C1070.8,97.5,1072,94,1073.1,90.7 M1073.6,102.3c0.7,1.9,1.9,5.3,4.5,3.6c1-1.8-1.8-2.6-2.7-3.7c-0.5-2.6,1.6-6.7-1.7-7.8
+			C1073.3,97,1073.1,99.8,1073.6,102.3 M1072.9,113.1c2.6,0.5,5.1-1.2,7.7-1.5c-0.8-0.8-1.7-1.5-2.5-2.3
+			C1076.1,110.1,1071.5,109.8,1072.9,113.1z"/>
+		<path class="st2" d="M733,99.2c0.2-0.7,0.7-2.1,0.9-2.8c2,1.5,4.3,2.3,6.6,3.1c0,0.4,0.1,1.1,0.2,1.5c-3,2.3-6.2,4.4-9.1,6.7
+			C731.6,104.8,732.2,101.9,733,99.2z"/>
+		<path class="st2" d="M841.7,99.5c1-0.8,2-1.6,2.9-2.3c0.6,1,1.2,1.9,1.8,2.9c2.6,3.5,6.9,5,10.2,7.8c-0.8,2.9-1.5,5.7-2.4,8.6
+			c-0.8-0.1-2.4-0.3-3.2-0.4c-0.6-1.7-1.2-3.3-1.8-4.9c-1.5,1.2-3,2.5-4.6,3.6c-1.2,1.3-2.2-0.7-3-1.4c0-0.5,0-1.6,0-2.1
+			c-0.3-0.7-0.6-1.4-0.9-2c0.2-1.2,0.5-2.3,0.5-3.5c-1-2.3-3.4-3.5-5.2-5.1c0.6-1.1,1.2-2.1,1.8-3.2
+			C839.1,98.1,840.4,98.8,841.7,99.5z"/>
+		<path class="st2" d="M329,97.6c1.7,0,3.4,0,5.1,0.1c0.5,1.7-0.1,2.8-2,3.3C330.7,100.3,329.6,99.1,329,97.6z"/>
+		<path class="st2" d="M734.8,110.1c2-1.7,4-3.3,6-4.8c2.5,1.7,5,3.5,7,5.8c1.6,3.2,4.8,4.8,7.6,6.8c-5.5,0.6-11,0.8-16.5-0.2
+			c-1.7-0.3-3.2-1.2-4.4-2.4C734.4,113.6,734.6,111.8,734.8,110.1z"/>
+		<path class="st2" d="M963.4,112.3c1.1-0.8,2.3-1.5,3.4-2.2c1.2,2.5,1.6,5.2,1.3,8c-3,0.2-6.1,0.8-8.8-0.8c0.7-1.4,1.4-2.8,2.1-4.1
+			c0.7,0.9,1.5,1.9,2.3,2.7C965.3,114.9,963.9,113.5,963.4,112.3z"/>
+		<path class="st2" d="M332.2,113c3.2-0.5,6.5-0.9,9.7-1.4c0.1,5.7,0.1,11.3,0,17c-1.5-0.7-3.7-0.7-4.2-2.6c0.5-1.2,1.2-2.3,1.9-3.4
+			c-1.6-0.5-3.2-1-4.9-1.5c-0.3,0.6-0.9,1.8-1.2,2.3c-1.5,0.8-3,1.7-4.5,2.5c1.8,1.1,3.8,0.8,5.7,0.5c-0.1,0.5-0.2,1.4-0.3,1.8
+			c-1.4,1-2.7,2-4.1,2.9c-0.4,0.1-1.2,0.4-1.7,0.5c-0.9-0.5-1.8-1-2.7-1.6c-3.1,1.2-6.4,1.5-9.6,1.6c0-2.7,0.1-5.3,0-8
+			c2.2-0.7,4.3-1.6,6.2-2.7c4.2,1.8,6.7-2.6,9.8-4.6C332.4,115.3,332.3,114.2,332.2,113z"/>
+		<path class="st2" d="M826.8,118c1.3-3.2,5.1-3.7,7.5-5.9c1.6,1.8,2.5,4.2,1.1,6.4C832.5,118.4,829.7,118.2,826.8,118z"/>
+		<path class="st2" d="M760.8,117.8c2.3-1.6,7.7-5.5,8.7-0.8C767.4,119.5,763.6,118,760.8,117.8z"/>
+		<path class="st2" d="M1098.4,118.8c1.5-1.2,3-2.5,4.7-3.5c2.1,0.5,3.7,2.2,5.5,3.5C1105.2,118.8,1101.8,118.8,1098.4,118.8z"/>
+		<path class="st2" d="M339.1,131.8c1-0.3,1.9-0.7,2.9-1c0,1,0,2.9,0.1,3.9c-0.6,0-1.1,0.1-1.7,0.1c1.4,0.8,2,2,1.7,3.7
+			c-1.1,0.1-2.1,0.2-3.2,0.3c-0.1,1.2-0.2,2.3-0.4,3.5c-0.8,0.1-2.4,0.2-3.1,0.2c-0.1,0.7-0.2,2.1-0.2,2.8c-0.1,2.2-0.1,4.3-0.1,6.5
+			c2.2-1.3,3.6-3.5,4.8-5.6c0.5,0.2,1.6,0.6,2.1,0.8c0,2.2,0,4.3,0,6.5c-1.4,0.2-2.7,0.5-4.1,0.8c-1.3,2.4-1,6-3.9,7.3
+			c-1.2-0.5-2.4-1.2-3.5-1.8c-1.2-2.1-2.1-4.3-2.7-6.7c-1.2-0.2-2.5-0.5-3.7-0.7c-0.8-0.8-1.5-1.5-2.3-2.3c0.5-0.6,1-1.2,1.5-1.8
+			c1-1,2-2,3.1-3c1.2,2.5,2.1,5.6,5.2,6.1c0.3-1.7,0.8-3.3,0.9-5.1c-0.1-1.7-2.2-1.5-3.3-2.1c-0.2-0.2-0.6-0.7-0.8-0.9
+			c-0.8-0.9-1.5-1.9-2.2-2.9c-1.7,2.1-3.4,4.1-5.2,6.1c-1.4,0.7-3,1.3-4.4,1.9c0-4.4-0.1-8.9-0.1-13.3c2.4-0.5,4.8-1.1,7.3-1.5
+			c2.6,1.6,5.6,2.7,8.4,0.9C334.5,133.4,336.8,132.6,339.1,131.8 M334.2,135.4c-3.2-0.8-1.2,4.6,0.6,2.7
+			C336.9,137.6,336.4,134.3,334.2,135.4 M319.3,138.1c1.2,0.8,2.1,2.9,3.8,2.2c2.4-0.4,2.5-3,3.1-4.9
+			C323.6,135.4,321.2,136.4,319.3,138.1 M333.3,152.2c-1.3,0.2-3.3,1-2.3,2.8c2.2,1.2,5.8-0.3,4-3.1
+			C334.5,152,333.7,152.2,333.3,152.2z"/>
+		<path class="st2" d="M1390.8,133.1c1,1.5,1.7,3.1,2.5,4.8c0.9,0.4,1.8,0.8,2.7,1.2c0.6,0.2,1.7,0.6,2.2,0.9
+			c0.2,0.6,0.5,1.9,0.6,2.5c-2.8,0.1-5.6-0.3-8.3-1.2C1390.6,138.5,1390.6,135.8,1390.8,133.1z"/>
+		<path class="st2" d="M1406.8,135.5c1.1-0.1,2.3-0.2,3.4-0.3c0,4-1.9,7.5-3.1,11.2c1.7,0.2,4,1.9,5.3,0c0.3-1.9,0.2-3.8,0.3-5.7
+			c0.8-0.1,2.5-0.2,3.3-0.3c0,5.2,0,10.3,0,15.5c-0.8,0.3-1.6,0.7-2.4,1l-1.2-0.4c-1.2-0.6-2.4-1.2-3.5-1.9c-1,0.6-2.1,1.2-3,1.9
+			c-2.1,1.8-0.7,4.1,0.5,6c-0.2,0.4-0.6,1.3-0.8,1.8c-1.5-0.4-3-0.5-4.5-0.3c0,1.1,0.1,2.1,0.3,3.2c1.1,1.4,2.3,2.7,3.8,3.7
+			c1.8,1.9,2-1.8,2.4-2.9l0.2-1c0.9,0.9,1.8,1.8,2.8,2.7c1.8,0.5,3.6,0.7,5.4,1c-0.1,3.2-0.2,6.4,0,9.6c-0.7-0.1-2.1-0.4-2.8-0.5
+			c-0.9-1-1.8-2-2.6-3.1c-0.1-1-0.2-2-0.3-3c-1-0.1-2-0.2-2.9-0.4c0,1.6,0,3.3,0,4.9c0,2.7,0.1,5.4,0.1,8c1.1-0.4,2.2-0.8,3.4-1.2
+			c1.3,1.9,3,3.5,5,4.7c0,5.1,0,10.2,0,15.4c-1.5-0.6-3-1.3-4.5-1.9c0.4,1.6,0.9,3.3,1.3,4.9c1,0.4,2.1,0.8,3.2,1.2
+			c0,1.9,0,3.8,0,5.6c-1.4,0.9-4.4,0.8-4.2,3c0.4,2.1,2.7,1.4,4.2,1.5c0,4.8,0.1,9.6-0.2,14.5c-0.3,1.8-0.1,3.7,0.8,5.4
+			c0.9-1.3,1.8-2.7,2.7-4.1c1.9,1,3.7,2.1,5.6,3.1c1-1.4,2-2.9,3.1-4.3c0.8,0,2.5,0,3.3,0c0.1,2.2,0.2,4.4,0.3,6.6
+			c0.7,0.4,1.3,0.8,2,1.1c0.4-1.1,0.9-2.2,1.4-3.2c1.6,1.2,3.2,2.4,4.9,3.6c0.6,1.7,1.2,3.4,1.9,5.2c0.1-2.2,0.1-4.4,0.1-6.7
+			c-0.5-0.3-1.6-0.8-2.1-1.1c-0.5-0.9-1-1.8-1.4-2.7c-2.3-0.9-4.5-1.8-6.7-2.8c3.4,0,6.9-0.1,10.3-0.1c1.2,1.2,2.4,2.4,3.7,3.6
+			c1.7,2.6,4.6,4.1,6.5,6.6c1.2,1.6,2.3,3.2,3.6,4.7c0.3-3.6-0.5-7.2-3.4-9.6c2-1.5,3.9-3.2,5.4-5.3c5.7,0.1,11.4-0.1,17.1,0
+			c1,1.2,2.1,2.5,3.2,3.7c3.8-1.3,8.4,1.5,11.5-1.7c0.7-0.7,1.5-1.3,2.2-2c0.7,0,2.1,0,2.8,0c0.4,0.5,1.2,1.4,1.6,1.9
+			c-0.5,1.1-0.9,2.1-1.4,3.2c1.7,0.6,3.5,1.3,5.1,2.2c-1.2,1-2.4,2.1-3.6,3.1c-0.6-0.9-1.1-1.8-1.7-2.6c-4.2-0.9-8.3-2.3-12.7-2.8
+			c0.3,2.2,0.6,4.4,1,6.6c-0.6,0.2-1.7,0.6-2.3,0.8c0.7,2.4,1.2,4.8,2.2,7.1c1.4,2.1,3.5,3.6,5.3,5.2c0.5-0.4,1.5-1.2,2.1-1.7
+			c0.9-0.7,1.8-1.4,2.7-2.1c0.5,0.4,1.3,1.3,1.8,1.7c-1.1,1.5-2.1,3-3.2,4.4c1.5,0.4,2.8,0.9,3.9,2.1c-5.9,1.4-11.6-1.4-16.1-5
+			c-0.3,1.7-0.5,3.4-0.8,5c-5.2,0.7-10.4,0-15-2.5c-2.9-0.8-3.3-4.5-5.6-6c-2.6-0.8-5.8-2.1-8.1,0c-2.4,2.1-5.1,3.8-8.4,4
+			c0.1-2.3,0.3-4.7,0.4-7c-2.4,2.1-3.9,4.9-4.6,8c2.8,0.5,5.7,0.6,8.6,0.4c0.9-1,1.8-2,2.7-3c1.7,1.5,1.8,3.8,1.9,5.9
+			c-11.4,1-22.8-0.2-34.1,0c-1.5-1.2-3-2.3-4.5-3.5c0.5,0,1.5-0.2,2-0.2c1.7,0,3.5,0.1,5.2,0.2c-1.6-2.1-3.1-4.3-4.9-6.2
+			c-0.6,0.5-1.8,1.4-2.4,1.9c-0.1-0.8-0.2-1.5-0.2-2.2c1.6-1.2,3.2-2.4,4.9-3.6c2.1,1.1,4.2,2.4,6.4,3.4c1.4-1.4,0.2-3.4,0.2-5.1
+			c1.2-0.7,2.5-1.4,3.8-2.1c2.2,2.3,4.5,4.5,7.2,6.2c0.3,0,0.8,0,1.1,0c1.4-1.6,2.5-4.1,0.2-5.5c-0.3-0.3-0.9-1-1.2-1.4
+			c-1.7,0.3-3.4,0.6-5.1,1c-0.1-1.2-0.3-2.4-0.4-3.5c-2.2,0.6-4.4,1.1-6.5,1.7c-0.7-1.1-1.3-2.3-1.9-3.4c-0.4-0.1-1.3-0.4-1.7-0.6
+			c-0.3,2.4,1.6,6.8-2.2,7c-3.3,0.7-5.9,3.1-8.5,5.1c-1.7,1-3.6,1.7-5.5,2.2c-2.1,0.2-4.4,1-3.3,3.6c-1.8,2.9-5.4,2.8-8.5,3
+			c0.2-9.4-0.1-18.9,0.1-28.3c0.9,0.8,1.8,1.6,2.7,2.4c2-0.9,3.9-2,5.1-3.9c0.8-0.5,1.7-0.9,2.5-1.4c0.6,0.7,1.2,1.4,1.9,2
+			c1.6-0.2,3.3-0.4,5-0.6c0,0.8-0.1,2.5-0.1,3.3c-1.8,0.2-3.6,0.3-5.3,0.5c-2.9,0-5.4,1.4-7.8,2.9c0.4,0.6,1.1,1.8,1.5,2.3
+			c3.2-1,6.5-1.9,9.8-2.7c1-1.6,2-3.3,3-5c0.9-0.5,1.8-1,2.7-1.5c-0.1-0.3-0.2-0.9-0.2-1.3c-0.6-0.3-1.7-1-2.3-1.3
+			c-0.9,0.8-1.7,1.5-2.6,2.3l-0.8-0.4c-2.1-1.2-4.1-2.4-6.1-3.6c0.5-0.9,1-1.8,1.6-2.6c1.6,0.5,3.2,1,4.9,1.6
+			c0.1-0.6,0.3-1.9,0.4-2.6c-0.7-0.2-2.1-0.7-2.8-0.9c-0.3-0.4-0.9-1.3-1.2-1.8c-1.8-0.6-3.6-1.2-5.3-1.7c2.2-0.9,4.4-1.7,6.6-2.6
+			c1.7-2.8,3.5-6.2,1.6-9.3c-1.1,1.7-2.1,3.4-3,5.2c0.4-2.7,0.8-5.5,1.2-8.2c2,0.9,4.2,2.3,6.1,0.4c-2-1.4-4-2.8-6-4.2
+			c1.2-0.9,2.5-1.8,3.7-2.7c1.9,2.2,4.3,3.8,7.2,4.4c0-0.5,0.1-1.6,0.2-2.1c-2.3-1.9-4.4-4.1-7-5.4c-0.5,0.4-1.4,1.1-1.9,1.5
+			c-0.9,0.7-1.8,1.4-2.7,2.1c-1.7-2.3-3.3-4.7-4.8-7.1c-0.9,0.8-1.8,1.6-2.7,2.5c0.8,1,1.5,2,2.3,3c-1.2,0.5-2.4,1-3.6,1.4
+			c1.2,2.7,3.4,4.6,6,5.9c-1.3,0.3-2.5,0.6-3.7,0.9c0,1,0,2,0,2.9c-1.6,0.8-3.4,1.5-4.6,2.9c2.5,1.8,6.4,1,7.7,4.4
+			c-2,1.3-4.4,1.1-6.6,0.8c0.5,0.9,0.9,1.9,1.4,2.8c-0.9,1.5-2.2,2.5-3.8,3.2c-0.2-5.9-0.2-11.7-0.1-17.6c0.1-5.6-0.5-11.3,0.4-16.9
+			c-0.6-4.4-0.8-9-0.2-13.4c1.4,0.6,2.8,1.3,4.2,1.9c0.9-0.2,1.9-0.5,2.9-0.7c-0.7-1.2-1.4-2.3-2.1-3.5c-1,0.4-2.1,0.8-3,1.3
+			c0.8-1.3,1.6-2.6,2.4-3.8c-0.4-0.6-1.3-1.8-1.7-2.4c2.7-1.5,5.4-3,8-4.6c0.2-2.5,0.3-4.9,0.1-7.4c-0.6,0-1.7-0.1-2.2-0.1
+			c-0.1,0.6-0.3,1.8-0.5,2.3c0.5,0.4,1.4,1.3,1.9,1.7c1,1.7-1.5,3.8-2.7,1.8c-1.5-2-1.2-4.6-1.6-6.8c-1.1-0.8-2.1-1.5-3.1-2.2
+			c-0.4,4.2,1.4,7.9,3.6,11.2c-2.2,0.4-4.3,0.8-6.4,1.2c-0.1-5.2-0.2-10.3,0.1-15.5c1.6-1.6,2.1-3.7,2.6-5.8c3.2,0.9,1.9,4.3,3,6.6
+			c2.5,1,5.4,0.9,7.9,2.1c2.5,0.8,5.3,2.6,7.9,1.4c1.3-0.8,1.2-1.4-0.3-1.7c-3-1.3-6.9-0.9-9.2-3.4
+			C1402.8,142.9,1405.4,139.4,1406.8,135.5 M1400.2,179.4c0.3,1.1,0.7,2.3,1.1,3.4c1.5,0.6,3.5-1,2.4-2.5
+			C1403.3,178.8,1401.2,179.8,1400.2,179.4 M1407.1,186.9c-0.1,1.4-0.1,2.9-0.1,4.3c1-0.4,2-0.8,2.9-1.2
+			C1410.1,188.3,1408,187.8,1407.1,186.9 M1406.9,214.1c2.4,0.8,4.8-0.6,3-3.1C1407.4,209.4,1407.4,212.7,1406.9,214.1
+			 M1408.2,219.4c-3.8,1.9,0.7,6,3.5,5.4C1412.1,222.8,1410.1,219.6,1408.2,219.4 M1458.2,242c2.1-0.3,4.1-1.1,5.9-2.3
+			c1.3,0,2.7,0,4.1,0.1c-0.4-1.4-1-2.8-1.8-4c-2.3,0.8-4.7,0.9-6.9-0.1C1458.8,237.7,1458.3,239.9,1458.2,242 M1409.5,237.1
+			c-1,1.4,1.5,2.6,2.4,1.4C1412.9,237.1,1410.3,235.9,1409.5,237.1 M1401.5,246.3c1.2-0.5,2.3-1,3.5-1.5c0.9,0.4,1.8,0.7,2.7,1.1
+			c0.5-1.9,0.9-3.7,1.2-5.6C1405,239.1,1400.7,242.1,1401.5,246.3 M1469.6,242.5c-1.8-1.8-3.6-0.4-5.1,0.9c-0.9,0.5-2.6,2.8-0.6,3
+			c1.8-0.4,3.3-1.5,5-2.1c1.7,1.5,3.2,3.2,5,4.7c1.2-3.1,5.3-6.5,2.1-9.6C1473.9,240.1,1471.6,241.1,1469.6,242.5 M1412,246.1
+			c1.8-0.4,5.3-2,2.9-4C1413,242.5,1412.2,244.3,1412,246.1 M1443.2,251.4c0.7,1.2,1.3,2.4,2,3.5c0.9-1,1.8-2,2.7-3
+			c0.7-0.1,2.2-0.3,2.9-0.4c-0.3-1.6,0.5-4.5-1.8-4.8C1447.1,248.3,1445.3,250,1443.2,251.4 M1391.8,247.8c-0.6,2.3,1.8,5.2,3.8,3
+			C1397.3,248.3,1393.2,248.5,1391.8,247.8 M1461.2,248.3c0.2,2.2,0.3,4.7,2.2,6.2c1.8,0.6,3.5-0.2,4.6-1.6
+			c-2.7-0.1-3.5-2.4-3.7-4.7C1463.3,248.2,1462.2,248.3,1461.2,248.3 M1475.8,248.9c-1.1,2.1,0.6,3.7,2,4.9c0.4-0.7,1.3-2.1,1.7-2.8
+			C1478.6,249.9,1477.5,247.4,1475.8,248.9 M1431.3,258.6c1.2-1.7,0.7-3.8,0-5.6C1428.2,253.7,1427.1,259,1431.3,258.6
+			 M1470.6,254.1c0.4,1.7,1,3.6,2.9,4.3c1.1,0.7,4.1,2.2,3.8-0.4c0-0.5,0.2-1.6,0.2-2.1C1475.2,255.4,1472.9,254.7,1470.6,254.1
+			 M1426.1,259.4c-2.2,0.3-1.3,3.5,0.7,2.8C1428.8,261.9,1427.9,258.7,1426.1,259.4z"/>
+		<path class="st2" d="M320.5,155.4c0.8-1,1.6-2.1,2.4-3.1c0.6,0.4,1.9,1.1,2.5,1.5c0.6,2.3,1.1,4.6,1.4,7l0.1,0.4
+			c0.8,0.6,1.7,1.2,2.5,1.7c-0.4,1.8-0.8,3.7-1.1,5.5c2.2-0.1,2.9-2.2,3.9-3.8c2.6-0.4,5.1-0.7,7.7-1c-0.5-2.5-0.9-5-1.2-7.5
+			c0.9-0.1,2.5-0.3,3.4-0.4c-0.3,5.8,0.8,11.7-0.8,17.4c0.6,2.3,0.8,4.6,0.8,6.9c-0.1,8.8-0.1,17.5,0,26.3c-1-0.3-2-0.5-3-0.8
+			c-1,1.3-2,2.6-2.9,3.9c1.8,1.6,3.8,3,5.9,4.2c0,11.5,0.1,23-0.2,34.5c0.3,5.2,0.4,10.5,0.2,15.8c-104.1-0.1-208.2,0-312.2,0
+			c-0.8,20.7,0,41.5-0.4,62.2c-0.8,0.7-1.6,1.4-2.4,2.1c0.6,1,1.3,2,2,3c0,2.3,0,4.6,0.2,7c-3-0.4-5.9-0.7-8.9-0.9
+			c0.4,0.8,0.9,1.6,1.3,2.4c2.1,0.1,4.3,0.1,6.4,0.7c1.8,2.2,1.4,5.2,1.5,7.8c-1.4,0.2-2.8,0.4-4.1,0.6c-0.4,1.4-0.7,2.7-1.1,4.1
+			c1.7-0.3,3.4-0.7,5.1-1c0.7,4.9-1.7,9.9,0.2,14.8c-2.2,1.7-4.5,3.3-6.8,4.9c-1.1,0.1-2.2,0.2-3.3,0.3c0.1,2.1,0.2,4.1,0.3,6.2
+			c1.6-0.5,3.1-1.4,4-2.9c1.3-2.4,2.8-4.7,5.6-5.4c0.7,3-0.7,5.3-2.9,7.2c1,0.9,2,1.8,3.1,2.6c-0.2,1.4,0.1,3.1-0.7,4.3
+			c-3,1.5-7.3-0.5-9.4,2.7c-1.3,1.3-0.2,3.2-0.2,4.7c-0.8,0.6-1.5,1.2-2.2,1.9c-0.4,1.6-0.6,3.3-0.9,5c1.2-0.1,2.3-0.3,3.5-0.4
+			c0.1-1.2,0.2-2.4,0.3-3.6c0.1-0.8,0.2-2.2,0.2-3c1.2,0.3,2.3,0.6,3.5,1c0,2.9,1.4,5.5,2.4,8.2c-0.8,2.4-2.6,4.2-4.1,6.2
+			c1.7,1.6,3.7,2.9,5.7,4c0.1-0.4,0.4-1.2,0.5-1.6l0.6-2c1.1,5.6,0.9,11.4,0.5,17.1c-0.7,0.2-2.2,0.6-2.9,0.8
+			c0.1,0.5,0.2,1.5,0.3,1.9c1.2,1.3,3.1,2.4,2.9,4.5c0.2,5.7,0,11.4-0.1,17c-4.8-0.4-9.4,1.3-14.2,1.9c-0.3-3.5,2.5-5.3,5.1-7.1
+			c0.8-2-0.4-3.9-1-5.8c-1.7,0.8-3.3,1.9-5.1,2.2c-2.1,0-5.1-1.8-6.3,0.8c0.5,4.8,6.2,7.9,4.9,13c-0.3,2-0.6,4-0.9,6
+			c0.2,0.3,0.6,1,0.8,1.3c1.6,0.2,3.3,0.3,4.9,0.5c-0.3-1.9-0.6-3.8-0.9-5.7c1.3-0.9,2.6-1.7,3.9-2.5c1.3-0.6,2.7-1.1,4-1.6
+			c0.6,4.2-3,7.1-4.1,10.9c1.5-0.1,3-0.2,4.6-0.3c1.1-2.2,2.4-4.3,3.9-6.2c0.4,5.9,0.7,11.8,0.3,17.6c-0.2,2.5-2.4,4.5-2.6,7
+			c0.7,1.2,1.6,2.3,2.5,3.3c0,3.2-0.5,6.4-1.2,9.6c-0.8,3.5,0.4,6.9,0.9,10.3c-2.5-2.5-4.1-5.6-5.6-8.7c-1.1,1.1-2.3,2.2-3.4,3.3
+			c-3.6-3.7-8.8-2.1-13.3-3.4c3-2.7,6-5.6,6.6-9.8l0.6-0.9c2.6-1.7,5.9-2.9,7.4-5.8c0.6-1.5-1.3-2.4-2.4-2.8
+			c-2.2-0.8-4.5-1.4-6.8-1.2c-2,1.4-1,3.8-0.7,5.8c-2.8,3.8-8.2,6.6-7.8,11.9c0.2,2.7-2,4.9-1.9,7.5c1.9,0.2,3.8,0,5.8,0.3
+			c2.4,0.8,4.3,2.6,6.6,3.7c1.8,0.1,3.3-0.8,5-1.2c0.1,0.6,0.3,1.8,0.4,2.3c0.4,0.3,1.3,1.1,1.8,1.4c1.2,1,2.3,2,3.4,3.1
+			c1.4-1.5,2.9-2.9,4.4-4.2c0.6,4.4,0.6,8.9,0.2,13.4c-1.4,0.1-2.8,0.2-4.2,0.4c-3,0.6-5.8-0.7-8.3-2.2c-0.7,3-1.9,5.9-2.7,8.9
+			c0.4,0.8,0.8,1.6,1.3,2.3c0.9-1.8,1.2-4,2.8-5.3c1.6,1.1,3.1,2.3,4.6,3.6c2.2-0.1,4.5-0.3,6.7-0.5c-2.1,1.7-3.8,3.8-3.6,6.7
+			c1.2,0.4,2.3,0.7,3.5,1.1c-0.1,2.1-0.3,4.2-0.5,6.4c-1.7,0-3.5,0.1-5.2-0.1c-1.3-0.7-2.1-2-3.1-3c-1.2,0.5-2.4,1.1-3.6,1.7
+			c1.7,2.6,3.2,5.6,6,7.2c2.1,1,4.4,1.3,6.7,1.8c-0.1,1.3-0.3,2.5-0.4,3.8c-0.9-0.6-1.8-1.3-2.7-1.9c-2.9,0.2-5.8-0.4-8.4-1.7
+			c-0.5,0.1-1.6,0.3-2.1,0.4c-0.5,1.5-0.9,3-1.4,4.5c-1.8,0.9-3.6,1.8-5,3.2c0.1,2.3,1.5,4.6,3.8,5.4c3.4,1.3,7.1,0.9,10.7,0.8
+			c-0.1-2-0.4-4-0.9-6c-0.1-0.5-0.4-1.5-0.5-2c0.7-0.2,2.2-0.7,2.9-1c1.4,1.7,3.1,3.3,4,5.4c0.2,2.8-1.9,5.2-2.4,8
+			c-0.1,1.9,1.5,3.2,2.5,4.5c-0.1,2.4-0.1,4.8-0.2,7.3c-0.5-0.2-1.6-0.5-2.1-0.7c-2-4.1-5.3-7.2-8.4-10.4c-2.3,2.1-4.3,5.2-2.2,8.2
+			c1.4,1.4,3,2.7,4.2,4.2c-1.8,4.8-7.7,6.2-11.3,9.5c-1.6,0.7-3.6,1.7-5.1,0.3c-0.7-1-1.4-2-2-3c1-0.9,2-1.8,3-2.8
+			C3.9,581.5,2,581,0,581.5v-7.7c0.9,1.3,1.8,2.6,2.7,3.9c1.6-0.5,3.3-1,4.9-1.4c0.4,1.9,0.7,3.8,1.1,5.8c1.4-0.4,2.7-0.7,4-1.3
+			c-0.3-3.2-1.7-6.2-2.7-9.3c-0.2-0.3-0.5-0.8-0.7-1c-1.2,0-2.3,0-3.5,0.2c-0.8,0.2-1.6,0.4-2.4,0.6c-0.7-0.7-1.4-1.4-2.2-2.1
+			c1.3-3.2,2.8-6.2,4.7-9.1c-2,0.5-4,1.1-5.9,1.8v-7.2c1.5-0.2,3.1-0.2,4.6-0.8c2.5-2.8,4.7-5.8,7.3-8.5c-1.6-3.3-0.7-6.8-1-10.3
+			c-3.7,0.7-7.2,1.9-10.8,2.8v-25.7c1.6,0.9,3.4,1.4,5.1,1.8c1.4-2.7,3.4-5,5.8-6.9c-3.6,1-7.2,1.9-10.9,2.3V481c3,1.2,3-4.3,0-2.7
+			v-35.5c1,0.8,2.1,1.6,3.2,2.3c0.3-1.3,1.5-2.6,1-4.1c-1.3-1.6-2.8-2.9-4.2-4.4v-36.2c0.6,0.3,1.8,1.1,2.3,1.4
+			c0.3,1.7,0.6,3.5,0.9,5.2c0.7-0.2,1.4-0.4,2.1-0.7c1.5-1.6,2.7-3.3,4-5c0.8,0.4,1.6,0.8,2.4,1.3c0-0.6-0.1-1.9-0.1-2.5
+			c-3.7-1.6-7.6-3.1-11.7-2.4v-11.3c3.4-1,5.8,2.1,8.9,2.6c4.8,0.2,5.8-5.4,7.7-8.7c-2-2.6-3.1-5.7-3.7-8.9c2.3-0.9,4.6-2.1,6.5-3.7
+			c-1.1,0.1-2.1,0.2-3.2,0.3c-0.6-1.4-1.2-2.7-1.7-4.1c-1.2,1.8-2,3.8-2.2,6c-3.6,1.1-7.1,2.8-9.9,5.3c0,1.5-0.1,3-0.1,4.4
+			c1.8-1.3,3.3-3.4,5.8-3.1c2.8-0.4,5,1.7,7,3.3c-1,1.4-1.8,2.9-3,4.1c-4,1.4-8.3-0.2-11.9-2v-7.8c0.9-0.6,1.9-1.2,2.8-1.8
+			c-0.1-1.9-0.6-3.6-2.8-4v-3.8c1.4-0.6,3.7,0.1,4.4-1.6c-0.1-1.8-1.2-3.2-2-4.8c-0.6,0.5-1.8,1.4-2.4,1.8v-12.5
+			c1-2.3,2.5-4.3,4.1-6.2c-0.3-1.4-0.5-2.8-0.8-4.1c-1.1,0.3-2.2,0.5-3.3,0.8v-52c1.6-2.5,4.2-3.9,6.7-5.3c-0.9-0.6-1.8-1.1-2.8-1.6
+			c-1.5,0.7-2.7,1.8-4,2.9v-6.6c1.3-0.2,2.6-0.5,4-0.7c-0.3-0.9-0.7-1.8-1-2.6c-0.7,0-2.2-0.1-3-0.2v-29c1.1,0.8,2.2,1.5,3.2,2.2
+			c0.8-2.2-0.1-5.9,2.7-6.6c2.6,0.1,3.5,2.9,4.9,4.6c0.5,0.1,1.5,0.5,2,0.6c-0.8-1.8-1.6-3.6-2.4-5.5c-3.6-0.1-7.2,0.5-10.5,1.7v-6
+			c4.3,0,8.5,0,12.8,0c-0.3,1-0.5,2-0.8,3c1.3,0.1,2.6,0.1,4,0.1c0.1-0.8,0.2-2.4,0.3-3.2c4.4,0,8.8,0,13.2,0
+			c-1.7,0.9-3.3,1.9-4.8,3.2c-0.3,2.2,1.9,3.5,3,5.1c1.7-2.5,4.2-4.3,7.4-3.9c0-0.5,0.1-1.4,0.1-1.9c0-0.6,0.1-1.8,0.1-2.4
+			c13.7,0,27.5,0,41.2,0c0.8,1.1,1.7,2.3,2.6,3.3c1.5-0.5,1.8-2.1,2.5-3.3c78.3-0.1,156.6,0.1,234.9-0.1c-0.1-26,0-52,0-78
+			C317.8,155.8,319.1,155.6,320.5,155.4 M322.1,166.5c1.1,2.6,2.5,5.2,2.4,8.1c0.5,0,1.5,0,2,0c-1-3-1.1-6.3-0.9-9.4
+			C324.4,165.6,323.2,166.1,322.1,166.5 M324.8,182.8c0.8,0,2.4,0,3.2,0c-0.1-1.7-0.4-3.4-1.2-5
+			C325.2,178.9,324.9,180.9,324.8,182.8 M321.2,186.6c2.1,0.9,3.8-0.7,3.3-2.8c-1.3-0.1-2.6-0.2-3.9-0.3c-0.1-1.5-0.1-3.1-0.2-4.6
+			C318.3,180.9,320.3,184.3,321.2,186.6 M320.8,193c0.8,0.1,2.3,0.2,3.1,0.3c0.1-0.7,0.4-2.2,0.5-2.9c1.2-0.1,2.5-0.3,3.7-0.4
+			c0.7-2,0-2.7-2-2.2C323.7,188.7,321.1,190.4,320.8,193 M317.8,205c1.7,2.3,3.1,5.8,6.1,6.4c3.3-1.6-1.1-3.5-2.3-5
+			c-0.8-1.9-0.6-4.8-2.7-5.7C316.9,200.8,317.8,203.7,317.8,205 M321.4,215.1c0.1,2.9,0.5,6,2.3,8.4c0.8,0.8,4.2,1.8,3.5-0.3
+			c-1.1-1.8-2.7-3.4-3.5-5.5C323,216.8,322.7,213.8,321.4,215.1 M336.4,216.3c-2.4,1.7,1.6,7.7,2.9,3.8
+			C340.4,218.3,338.1,214.2,336.4,216.3 M332.6,228.9c0.1,2.3,0.3,4.6,0.5,6.9c2.4,0.3,4.8,0.8,7.1,1.3c1.9-1.2-0.8-3.4-2.3-3.6
+			C335.1,233.3,334,230.8,332.6,228.9 M325.2,230.2c-1.6,2.1-2.7,4.4-3.5,6.9c0.3,0.2,0.9,0.6,1.1,0.8c1.5-1.9,2.9-3.8,3.8-6.1
+			C326.7,230.9,326.2,230.3,325.2,230.2 M336.5,240.2c-1.2,0.9,0,3.3,1.4,2.3C339.1,241.6,337.9,239.1,336.5,240.2 M50.8,250.2
+			c1.5,0.7,3.1,0.5,4.7,0.5c0.4-0.8,0.8-1.6,1.2-2.4c-1.6-0.4-3.2-0.9-4.8-1.3c0.3-1.7,0.6-3.5,0.9-5.2
+			C50,243.6,50.5,247.4,50.8,250.2 M19.1,244c-0.2,1.6-0.7,4.5,1.8,4.3C23.6,247.4,22.3,241.9,19.1,244 M324.3,249.3
+			c-3.8,2.3,5.4,4.4,4.7,0.8C328.5,248,325.7,248.4,324.3,249.3 M302.2,251.2c-0.5,1.6,0.1,2.2,1.7,1.6
+			C304.4,251.2,303.9,250.7,302.2,251.2 M62.4,260c3.2-1.7,1.9-5.1,1.2-7.9C59.1,252.5,61.4,257.3,62.4,260 M46.9,256.2
+			c0.1,2,2.5,1.6,3.8,2.1c0.2,0.6,0.5,1.9,0.7,2.6c1.9-0.4,3.8-0.8,5.7-1.2c-0.1-1.5-0.3-3.4-2.1-3.9c-1.8,0.1-3.8,1.2-5.2-0.4
+			c0.8-0.9,1.6-1.7,2.3-2.6C49.7,252.4,48.2,254.5,46.9,256.2 M26.3,254.4c-0.1,1.9,0,3.8,1.4,5.2c0.8-0.2,2.3-0.7,3.1-1
+			c-0.1-1.1-0.2-2.1-0.4-3.2C29.7,253.8,27.6,254.7,26.3,254.4 M191.6,256.8c0.2,0.8,0.5,2.3,0.7,3.1c1.2,0,2.5,0,3.7-0.1
+			c0-1.3-0.1-2.5-0.1-3.8C194.6,254.5,192.9,256.2,191.6,256.8 M95.3,256.2c-1.4,0.9,0,3.6,1.5,2.4
+			C98.2,257.6,96.8,254.9,95.3,256.2 M63.9,261.6c1.3,0.7,2.7,2,4.3,1.5c1.8-0.3,2.8-2,4-3.2C69.7,256.6,66.3,260,63.9,261.6
+			 M20.5,276.9c0.2,3.4,3.4,4.1,6.2,3.8c-0.4-1.8,0.6-4.6-1.6-5.4C23.5,274,19.7,274,20.5,276.9 M11.3,298.4c-1.6,1.4-1,3.8-1.3,5.7
+			c2-0.5,3.9-1.5,5.3-3C14.1,300,13.2,297.8,11.3,298.4 M1.2,309.3c2.6,2.8,5.4,5.6,6.6,9.3c0.5,0,1.6,0.1,2.1,0.1
+			c-0.4-3.3-2-6.2-3.4-9.2C4.9,308.4,2.8,308.1,1.2,309.3 M18.2,314.3c0.1,1.9-0.3,4.4,2,5.2c2.4-0.7,1.2-3.5,1.5-5.2
+			C20.5,314.3,19.4,314.3,18.2,314.3 M20.8,326.8c-0.8,1.7-0.4,3.6-0.5,5.4c2.6-1,3.3-3.6,3.5-6C22.8,326.3,21.8,326.5,20.8,326.8
+			 M5.1,336.6c3,0.1,6,0.8,8.7,2.2c-0.9-3.1-0.3-7.2-2.9-9.6C6.9,328.2,4.7,333.2,5.1,336.6 M9.1,346.1c-1.9,1.5-4.9,2.5-5.5,5
+			c1.9,2.7,7.5,4.6,8.8,0.3c0.2-0.5,0.5-1.4,0.6-1.9c1.7,0.3,3.3,0.7,5,1.3c0.3-0.5,1-1.4,1.4-1.8C17.2,345.7,12.4,343.4,9.1,346.1
+			 M11.3,358.9c-0.5,1.1-1,2.3-1.5,3.4c0.9,0.9,1.7,2,3.1,1.6C13.9,361.9,13,360,11.3,358.9 M1.7,391.7c0.2,0.8,0.7,2.3,0.9,3
+			c1.8,0,3.9-0.6,3.6-2.9C5,390.2,3.2,390.8,1.7,391.7 M9.1,408.9c-0.5,1.1-1,2.3-1.6,3.4c1.7,0.7,3.4,1.4,5.1,2.1
+			c1.8,0,4.8,0.1,4.8-2.4c-0.6-2.1-3.1-1.5-4.8-1.8C11.5,409.7,10.3,409.3,9.1,408.9 M8.4,421.5c0,0.6-0.1,1.7-0.1,2.3
+			c3.7,2.1,7.2-0.5,10.4-2.4c-0.2-1.4-0.4-2.7-0.6-4.1C15,418.9,11.7,420.2,8.4,421.5 M2.6,448c-0.1,1.7,0.7,2.5,2.5,2.4
+			c2-0.7,0.7-3.1,0.8-4.5C4.7,446.3,3.2,446.6,2.6,448 M7.2,454.3c-2.5,0.2-4.9,0.9-5,3.9c1.3,0.4,2.5,0.8,3.8,1.2
+			c1.3-3,6.4-6,3-9.2C8.4,451.5,7.8,452.9,7.2,454.3 M1,467.3c1.2,1.6,2.5,3.1,4,4.4c2.5-2.1,5.2-0.9,7.8,0.2
+			c4.7-1.3,9.3,0.3,14,0.8c0.6-1.6,1.1-3.1,1.5-4.8c-1.6,1-3.2,2-4.8,3c-0.2-0.8-0.6-2.5-0.7-3.3c-0.4,0.5-1.1,1.5-1.4,2
+			c-3.9-0.6-8.4-1.3-10.5-5.1C7.9,466.6,4.4,467.1,1,467.3 M20.3,484.6c-1.5,2-2.2,4.3-1.7,6.8c1.3-0.2,3.1,0.5,4-0.8
+			c0.9-1.3,1.5-2.8,2.1-4.3c-0.7-0.6-1.4-1.2-2-1.8C22.1,484.5,20.9,484.6,20.3,484.6 M12.4,511.3c-0.9,2,1.7,2.6,3,3.5
+			c1.1-2,3.7-3.7,3.1-6.3C16.1,508,13.8,509.5,12.4,511.3 M7.3,517.3c-1.9,1.2-0.5,3.7-0.1,5.4c0.6,0,1.9,0,2.5-0.1
+			C9.8,520.6,10.5,517,7.3,517.3 M4.2,527.2c0.3,1.3,0,2.7,0.7,3.9c1.4,0.7,3.1,0.4,4.6,0.6c0-1.1,0-2.3,0-3.4
+			C7.8,527.8,6,527.5,4.2,527.2z"/>
+		<path class="st2" d="M1410.2,166.1c-0.2-2.1-0.4-4.2-0.6-6.3l1.3,0.2c1.4,1.3,2.2,3.1,3,4.8
+			C1412.7,165.3,1411.4,165.7,1410.2,166.1z"/>
+		<path class="st2" d="M540.3,177.6c10.7-2.8,21.8-3.1,32.8-3.4l0,0.3c-0.2,1.7-0.7,3.3-0.6,5c1.4,1.7,3.2,3,5,4.4
+			c-3,1.4-5.4,3.9-7.7,6.2c-3,0.5-6.1,0.6-9.2,1.2c-0.6,0.1-1.8,0.2-2.4,0.3c-0.5-0.2-1.7-0.6-2.2-0.8c0.9-6.3,5.8-10.7,8.4-16.2
+			c-3.3,0.4-5.2,3.4-8,4.8c-1.3,2.4-2.3,5.1-3.3,7.6c-1.2,0.6-2.3,1.2-3.4,1.8c-2.1-2.5-2.2-8.1-6.4-7.7c-1.8,4.3-2.9,8.9-5.1,13.2
+			c-2,0.5-4.1,0.8-5.6,2.1c-3.3,2.8-8,3.8-10.6,7.4c-1.8,2-1.7,4.8-2,7.2c-3,3.4-5.9,6.9-8.4,10.7c-1.4-0.2-2.7-0.4-4.1-0.7
+			c-0.4,1.1-0.8,2.2-1.3,3.3c-1.5,0.4-3,0.9-4.5,1.2c-1.2,0-2.3-0.1-3.4-0.1c-0.6-1.1-1.2-2.2-1.9-3.3c-0.6-1.6-1.2-3.1-1.8-4.6
+			c-2.1,1.3-4.2,2.6-6.3,3.9c-0.8,3.2-1.9,6.3-3.3,9.3c-2.5-1.4-5.3-2.4-7.4-4.4c-0.8-2.5-0.2-5.1-0.1-7.6c0.4-0.3,1.2-0.8,1.6-1.1
+			c2.8-1.8,6.6-0.9,8.7-3.9c-1.9-0.8-3.8-1.4-5.7-2c-0.4-0.4-1.2-1.1-1.6-1.4c0.8-1.1,1.5-2.3,2.5-3.3c5.3-4.7,10.5-9.6,16.6-13.1
+			c1.4,0.6,2.7,1.2,4.2,1.5c2.1-1.1,3.6-3,5.3-4.5c0.4-1,0.7-2,1.1-3.1l0.1-0.3c7.5-3.4,15.1-6.7,23.1-8.5c-0.3,2-0.7,4.1-1.2,6.1
+			C536.6,185.3,538.1,180.5,540.3,177.6 M520.5,194.4c-0.9,1.1-0.9,2.6-1.1,3.9c1,0.1,2,0.2,3,0.4c0.8-1.8,1.7-3.6,2.5-5.4
+			C523.4,193.6,521.4,192.9,520.5,194.4 M492.5,204.1c-0.7,2.3,1.5,2.5,3.1,2.7c0.4-1.2,0.8-2.3,1.2-3.4
+			C495.3,203,492.5,201.4,492.5,204.1 M506.2,203c1.6,1.9,2.8,4.2,4.8,5.7c1.5,0.1,3.2-0.2,3.8-1.7c-1.8-2.1-4.5-3.1-6.8-4.5
+			C507.6,202.6,506.6,202.9,506.2,203 M506.4,213.4c-2.5,2.2,2.8,4,3.4,1.4C510.5,212.8,507.4,212.1,506.4,213.4 M497.7,215.7
+			c-1,1.6,0.7,2.8,1.5,4.1c0.9-0.4,1.8-0.8,2.7-1.3c-0.1-0.9-0.3-1.9-0.5-2.8C500.2,215,498.8,215.3,497.7,215.7z"/>
+		<path class="st2" d="M586.9,176.2c0.9,0,2.6-0.1,3.5-0.1c17.2,2.8,33.5,10.3,47.3,20.9c0.1,4.4-1.7,8.8-4.8,12
+			c-1.6,0.4-3.3,0.5-4.9,0.7c-0.3,2.4-0.4,4.9-1.2,7.2c-1.2,3.2-4.1,5.2-6.8,7c-8-13.1-20.1-24.1-34.8-29.1c-3.2-1.1-6.5-2.1-9.8-3
+			c1.5-2.6,2.9-5.4,3.3-8.5C581.6,181.1,584.2,178.6,586.9,176.2 M586.8,183.1c2.1,2.4,5.3,2.8,8.3,2.4c2.4-0.9,4-3.5,3.6-6.1
+			C594.3,178.9,589.7,179.4,586.8,183.1 M618.2,213.3c0,1.5-0.1,3-0.1,4.5c0.6,0,1.9-0.1,2.5-0.1c0-1.5,0-3,0.1-4.4
+			C620.1,213.3,618.9,213.3,618.2,213.3z"/>
+		<path class="st2" d="M693.7,179.5c6.8,1.4,13.8,1.2,20.8,1.5c-1.9,4.1-4.6,7.8-8.3,10.4c-0.2-0.9-0.7-2.7-1-3.6
+			c-0.6,1.3-1.2,2.5-1.8,3.8c-3.2-0.3-6.5-0.2-9.7-0.2C693.7,187.4,693.6,183.4,693.7,179.5z"/>
+		<path class="st2" d="M763.1,180.8c16.5-1.4,33.1-2,49.5,0.5c1.3,0.3,2.9,0.1,4.1,0.9c1,1.1,1.8,2.3,2.9,3.3c1.6,0,3.2-0.5,4.7-0.8
+			c2.9,1.6,5.8,3.3,8.7,5c-0.9,1.6-2.8,4.4-0.5,5.8c1.9,1.8,4.5,0.4,6.7,0.1c1.1,1.6,2.3,3.1,3.5,4.7c-0.7,1.1-1.3,2.2-2.1,3.2
+			c-2.1,0.3-4.1-0.1-6-0.8c-0.5-0.3-1.6-0.9-2.1-1.2c-0.4-0.2-1.1-0.6-1.5-0.8c-2.9,0.9-5.9,1.7-8.8,2.6c-1.1,0.2-2.3,1.2-1.6,2.4
+			c0.9,2.1,2.7,3.5,3.9,5.4c-1.9,4.9-4.6,9.6-5.8,14.8c-0.5,2.7-2.9,4-5,5.3c-0.8-1.4-1.7-2.8-2.4-4.3
+			c-2.4-12.4-10.3-24.4-22.7-28.5c0.4-1.5,0.8-2.9,1.3-4.4c-0.9-0.6-1.8-1.1-2.7-1.6c-1.1,1.2-2,2.6-2.9,3.9
+			c-3.6-0.6-7.1-1.7-10.8-2.1c-4.3-0.1-8.6,0.3-12.8,1.3c-0.9,0.2-1.8,0.3-2.7,0.5c0.3,10.4-0.5,20.9,0.1,31.3
+			c-0.3-2.4-1-4.7-1.6-6.9c-0.3,1.5-0.6,3-0.9,4.6c-4.3,4.2-9.3,8.3-15.4,9.2c-0.5,1.1-1,2.2-1.4,3.3c-0.5,0.3-1.1,0.5-1.6,0.8
+			c-0.6,2.3-1.2,4.6-1.8,7c-2.7,1.6-5.3,3.3-7.3,5.8c-2.7,3.3-6,5.9-9.4,8.5c0-14.1,0.2-28.2-0.1-42.3c-0.8-8.1-0.4-17.9-7.8-23.2
+			c0.8-4.9,5.4-7.4,8.4-11c1.4-2.1,4-1.4,6.2-1.5C737.7,181.9,750.4,180.4,763.1,180.8 M799.5,202.5c2.9,1.2,4.7-1.5,6.3-3.4
+			c-0.5-0.6-1.4-1.8-1.8-2.3C801.9,198.1,798.4,199.3,799.5,202.5 M742.3,209.6c-2.2,0.8-0.5,4.8,1.6,4.2c2.3,0.4,3.6-2.4,2.3-4.1
+			C745.1,208.9,743.6,209.3,742.3,209.6 M719.1,229.3c0,1.5,0,2.9,0,4.4c1.1-0.1,2.2-0.2,3.3-0.3c0-1.3,0.1-2.6,0.1-3.8
+			C721.4,229.5,720.3,229.4,719.1,229.3z"/>
+		<path class="st2" d="M863.4,185.6c0.5-1.8-1.1-7,2-5.8c0.5,0.3,1.5,0.8,2,1c3.5,0.2,7,0.2,10.4,0.5c-1.7,2.7-3.3,5.8-6.2,7.3
+			c-2.5,1.2-5.4,1.7-8.1,2.4C863.4,189.3,863.4,187.4,863.4,185.6z"/>
+		<path class="st2" d="M961.2,180.6c11.2-0.6,22.5,0.3,33.7-0.8c7.2-0.3,14.4-0.3,21.6-0.4c0.2,4.1-0.3,8.2,0.8,12.2
+			c0.1,2.1,0.2,4.1,0.3,6.2c-0.1,2-0.4,4.1-0.6,6.1c-3,1.6-5.5,4-8.4,5.7c-2.5,1.1-4.3-1.2-6-2.7c-1,0.4-1.9,0.7-2.8,1.1
+			c-3.9-7.1-12-10.5-19.7-11.7c-12.4-2.2-25.1-1.8-37.6-1.9c-3.1-2-6-4.2-9.4-5.6c-3.7,2.5-7.5,5.3-12,6.2c-2.4-2.2-4.4-4.7-7.2-6.4
+			c-0.7-0.5-1.3-0.9-2-1.4c0.8-1.6,1.6-3.3,2.6-4.8c1.7-1,3.8-0.7,5.7-1.1c0.2,0.9,0.5,1.9,0.7,2.9c0.4,0.1,1.1,0.4,1.5,0.6
+			c0.1-0.9,0.3-2.6,0.4-3.4c2.9-0.5,4.8,1.6,6.5,3.6c0.2-0.9,0.5-2.8,0.7-3.8c2.2,0.6,4,2,5.6,3.6c0-1.4,0-2.8,0.1-4.3
+			c2.6,0.1,5.1,0.1,7.7,0c1,2.3,1.3,4.7,1.2,7.1c2.7,1,5.4,2.1,8.4,2c4.6,0,7.9-4.7,12.7-3.7c-0.1,2.4-0.5,4.9,0,7.3
+			c2,1.6,4.7,1.5,7.1,1.6c-0.5-0.5-1.6-1.4-2.2-1.8c1.1-1.6,2.3-3.3,3.5-4.9C970,185.1,965.1,183.8,961.2,180.6 M992.6,183
+			c0,2.2,2.4,2.2,3.9,1.4c0.1-1,0-1.9-0.2-2.9C994.9,181.8,993.7,182.3,992.6,183 M998.3,190.3c0,1.5,0,3.1,0,4.6
+			c1.1-0.3,2.4-0.4,3.4-1.2c-0.2-1.1-0.6-2.2-0.9-3.3C1000.2,190.4,998.9,190.3,998.3,190.3z"/>
+		<path class="st2" d="M1050.6,180.6c3-0.9,6.1-1.2,9.1-0.1c-2,1.6-3.9,3.4-5.1,5.6c2.6,1.3,5.5-0.8,8.1-1.6
+			c1.8-0.6,0.6-2.9,0.8-4.2c1.3,0.1,2.6,0.2,3.9,0.3c0.4,1.8,0.8,3.7,1.3,5.5c-0.1,2.5-0.9,5.3-3.7,6c-5.2-0.4-10.3-1.9-15.5-1
+			C1049.4,187.6,1049.6,184,1050.6,180.6z"/>
+		<path class="st2" d="M1264.3,180.5c5.1-0.2,10.2-1,15.3-1.1c1.2,2.8,0.8,5.9,0.1,8.8c-1.1-0.8-2.2-1.6-3.3-2.4
+			c-2.6-2.3-5.9-3.9-9.5-3.3c-5.1-0.1-4.3,7.3-8.7,8.7c-3,0.5-6.1,0.3-9,1.3c-1.6-2.3-2.4-5.1-0.8-7.6c1.8,0.3,3.5,0.7,5.4,0.8
+			c0.8-1.5,1-3.2,1.5-4.8C1258.3,180.9,1261.3,180.7,1264.3,180.5 M1257.3,184.8c0.9,1,1.8,2,2.7,2.9c0.8-1,3.4-2,2.1-3.6
+			C1260.5,182.9,1258.8,184.3,1257.3,184.8z"/>
+		<path class="st2" d="M905.4,180.8c1.8-0.1,3.5-0.1,5.3-0.1c-1.2,3.2-4.1,5.1-7,6.7c1.5,0.9,3,1.8,4.6,2.6c0.1,0.5,0.4,1.5,0.5,2
+			c-2.7-0.4-5.4-1-8-1.8c0.5,1.9,1,4,2.9,5c2.1,1.3,4.2,2.6,6.3,4.1c1.8,1.1,3.8,2.1,6,2.2c2.4-0.1,4.4-1.8,6.8-1.9
+			c1.4,0.2,2.2,1.5,3.3,2.2c-2.6,1.2-6,1.4-7.5,4c-1.9,2.3,1.7,5,4,4.1c1.7-1.9,3-4.1,4.4-6.2c0.2,1.9,0.3,3.8,0.3,5.7
+			c0,1.2,0,2.4,0,3.6c-1.2,4.3-6,3.4-9.5,3.8c1,1.2,2.1,2.3,3.1,3.5c-0.4,0.9-0.7,1.9-1.1,2.8c-2.8,2.2-4.2,5.5-4.8,8.9
+			c-3.5,0-5.1-3.1-6.2-5.9c-0.4-0.1-1.2-0.4-1.6-0.5c-0.7,0.7-1.5,1.4-2.2,2.1c1.4,2.3,3.4,4.3,5.1,6.4c1.1,2.6-0.8,5.1-1.7,7.4
+			c0.6,2.1,1.3,4.2,2,6.3c-1.7,2-6.1,4.4-3.1,7.1c3.5,2,8.6,1.1,11-2.2c3-3.3,1.9-8,2.1-12c1.6-1.3,3.1-2.6,4.7-4
+			c0.5,0.4,1.5,1.3,2,1.8c-0.1,11.3,0.2,22.6-0.3,33.9c0.4,2.7,4,0.9,5.8,1.4c10.4-0.2,20.8,0.1,31.2-0.2c7.5-0.6,15.5-0.7,21.9-5.2
+			c3-3.2,4.4-7.4,4.9-11.7c0.5-2.9,0.7-5.8,0.8-8.7c3.5,0,7,0,10.5,0c0.6,0,1.8,0,2.4,0c0,0.6-0.1,1.7-0.2,2.3
+			c-0.1,1-0.2,2.1-0.3,3.1c-1,10.9-0.5,21.9-0.6,32.9c0.2,9.5-0.5,19.2,1.2,28.6c-4.2-0.3-8.4,0-12.6,0.4c-1.7-4.6-0.8-9.9-2.8-14.5
+			c-1.7-4.6-5.7-7.9-10.3-9.4c-8.7-2.9-17.9-2.7-26.9-2.7c-8.5,0-17-0.1-25.5,0c1.4,4.8-0.5,9.6,0.5,14.5c0.8,6.3,0.1,12.7,0,19.1
+			c0.8,10.6,0,21.3,0.5,31.9c0.5,5.6,1.7,11.5,5.4,15.9c2.5,2.4,5.9,3.5,9.1,4.3c2.6,0.6,5.3,0.8,8,0.9c4.1,1.8,6.4,6.5,11.2,6.8
+			c3.5,0.9-0.4-4.4,2-5.7c3.4-0.7,6.8-0.4,10.3-0.3c0,1.1,0.1,2.2,0.2,3.2c0.7,0.6,1.5,1.1,2.2,1.7c0.9,1.2,1.8,2.3,2.8,3.4
+			c0.5-1,0.9-2,1.4-3c-1.5-1.4-2.9-2.8-4.3-4.1c0.3-0.6,0.9-1.8,1.2-2.4c5.4,0.1,10.7-0.8,15.8-2.4c3,1.2,5,4.1,8.2,4.7
+			c4.2,1,8.6,1.8,12.7,3.3c0.1,1.3,0.2,2.7,0.3,4c-1.5-0.1-3.1-0.2-4.6-0.4c-1.2-0.8-2.5-1.7-3.7-2.6c-1.5,3.3-3.2,6.5-5.7,9.1
+			c-0.7,0-2.1-0.1-2.8-0.1c-0.5-1.7-0.7-3.4-1.5-5c-4.6-1.5-7,4.4-11.5,4c-20.6-0.3-41.2,0.3-61.8-0.3c-0.6-1-1.2-1.9-1.8-2.9
+			c-0.5,1-1,2-1.5,3c-2.8,0.1-5.7,0.1-8.5,0.1c0-1.3,0-2.5,0.1-3.8c-1.2-0.1-2.4-0.2-3.6-0.4c0.6,1.4,1.2,2.7,1.8,4.1
+			c-3.5-0.1-6.9,0.2-10.3,0.9c-11.5,0.4-23.1,0.1-34.6,1.1c0-3.9-0.1-7.8-0.1-11.7c6.1-0.2,13.1,0.2,18-4.1
+			c4.4-4.4,5.3-10.9,5.7-16.8c1.7,0.3,3.3,0.7,5,1c0.3-2.2,0.5-4.3,0.8-6.5c-1.5,0.2-3,0.4-4.5,0.6c-0.1-4.6-0.5-9.2,0.3-13.7
+			c0.5-2.9,3.9-3.3,6-4.6c-1.4-2.4-3.6-4-6.2-4.7c0-4.8,0-9.6-0.1-14.5c1.7,0.5,3.6,2,5.3,0.7c3.1-1.5,4.3-5.5,1.5-7.9
+			c-2.6,0.9-4.4,2.9-6,4.9c-1.8-3.2,0.1-6.4,2.3-8.7c-1.1-0.7-2.1-1.4-3.1-2.1c0-3.4,0-6.7,0.1-10.1c1.4-0.2,2.9-0.5,4.3-0.7
+			c-2.2-2-5-4-4.5-7.3c0-17.7-0.1-35.3,0.1-53c0.9-5.8,0.4-11.7-1.1-17.3c-0.1-4.9-0.9-9.9-2.4-14.6c0.8-1.8,1.7-3.6,2.6-5.3
+			c1.9,1.4,3.7,3.1,5.2,4.9c-1.6,2.1-3.2,4.2-4.7,6.4c3.3,1.8,6.7,4.2,10.7,3.7c2.5-0.3,5.3-1,7.2-2.8c-0.2-2.3-1-4.7-3-6
+			c-4-3-8.7-6.6-9.5-11.9c3.7-2,7.9-3.4,10.5-6.9C904.5,181.8,905.1,181.1,905.4,180.8 M890.3,246.1c0,0.7,0,2.1,0,2.8
+			c1.8,0.3,4.8,1.8,5.4-0.9C895.3,245.6,892.2,246,890.3,246.1 M896.1,270.2c-0.7,2,1.3,2.2,2.7,2.6c1-0.8,0.6-2.1,0.6-3.2
+			C898.6,269.8,896.9,270.1,896.1,270.2 M897.1,276.1c-0.3,1.3-0.3,2.6-0.1,3.9c1.1-0.6,3.7-0.1,3.7-1.9
+			C901.1,276,898.6,275.4,897.1,276.1 M918.5,277.3c-0.2,1.2-0.3,2.4-0.4,3.5c1.5,0.5,3.1,0.5,4.7-0.1c-0.3-1.3,0.2-2.9-0.6-4.1
+			C921.1,276.4,919,275.9,918.5,277.3 M975.3,278.9c-0.7,2.3-0.5,4.7,1.5,6.3C977.3,282.8,977.5,280.4,975.3,278.9 M909.3,344.2
+			c-1.7,1.3-4.6,2.7-4,5.3c2.9,2.9,5.6-1.3,7.1-3.6C913.7,344,910.5,342.3,909.3,344.2 M914.1,357.9c-0.8,2-0.4,4,0.3,5.9
+			c1.4-0.3,2.9-0.6,4.3-1C917.9,360.4,917,357.9,914.1,357.9 M919.2,364.1c0.3,0.9,0.7,1.7,1,2.6c1,0,2.1,0,3.2,0
+			c0.2-0.6,0.6-1.7,0.8-2.3c0.6-0.5,1.8-1.4,2.4-1.9C924.1,361.8,921.7,363.5,919.2,364.1 M910.3,367.3c-2.4,0.4-1.3,3.2-1.5,4.9
+			c1.1-0.6,2.5-1,3.4-2.1C912.3,368.9,911.8,367.2,910.3,367.3 M910.2,378c2.4,1.4,5,3.3,7.8,1.9c-0.1-2-0.9-3.8-2.7-4.7
+			C913.6,376.1,911.9,377.1,910.2,378 M983.6,379c0.9,1.9,2.5,2.2,4.5,1.9C987.8,378.4,985.6,377.5,983.6,379 M895.9,380.4
+			c1.7,1.4,5.7,5.3,6.8,1.6C901.9,379.2,898,378.7,895.9,380.4 M942.2,379.2c-0.5,0.2-1.6,0.7-2.1,1c-1.5,2.5,2.2,2.4,3.4,1.2
+			C944.9,380.5,943.8,378.1,942.2,379.2 M955.9,383.1c0.6,2,1.9,3.7,4.2,3.1c-0.8-1.4-1.6-2.8-2.4-4.2
+			C957.3,382.3,956.4,382.8,955.9,383.1 M983.2,382.2c-1.3,1,0,3.7,1.5,2.5C986.1,383.7,984.7,380.9,983.2,382.2z"/>
+		<path class="st2" d="M1070.8,180.6c2.4,0,4.7,0,7.1,0.1c0.4,0.4,1.1,1.2,1.5,1.6c-0.7,2.4-0.1,6.3-3.5,6.7c-1.2-1.9-2.7-3.6-4.4-5
+			C1071.2,182.9,1071,181.8,1070.8,180.6z"/>
+		<path class="st2" d="M1090.1,180.4c2.2,0.1,4.4,0,6.5,0c2.4,0.2,4.8,0.4,7.2,0.7c-2.7,1.3-4.5,3.7-6,6.2c-1.4,0.1-2.9,0.1-4.3,0.2
+			c-3.1,2.5-7.2,2.5-10.7,4.1c-0.3-0.7-0.5-1.4-0.8-2.1C1086.2,187.9,1088.4,184.2,1090.1,180.4z"/>
+		<path class="st2" d="M1227.4,181.9c4.9-2.2,10.6-0.7,15.8,0c-2.7,1.8-6,1.3-8.9,2.3c-3,1.8-5.3,4.5-8.6,5.8
+			c-0.4,1.2-0.7,2.3-1,3.5c-4.1-1.9-8.7-2.2-13.2-2.1c0.1-0.8,0.3-2.4,0.4-3.2c1,0.2,2,0.5,3,0.7c0.9-1.2,1.8-2.5,2.7-3.7
+			c1.9,0.8,3.8,1.7,5.8,2.6C1225,186,1226.4,184.1,1227.4,181.9z"/>
+		<path class="st2" d="M1106.6,183.1c4.1-1.1,6,3.2,9.5,4.2c0.3,0.2,1,0.5,1.4,0.6c0.1,1.6-0.6,3.2-2.4,3.3
+			c-2.9,0.6-5.9,0.6-8.9,0.9c0,1.1,0,2.3,0,3.4c5.1,1.1,10.2,1.9,15.4,2.1c0,3-1.7,5.6-3.5,7.9c-1.5-0.2-2.9-0.4-4.4-0.6
+			c1.1-1.5,2.1-3,3.2-4.5c-1.4-1.1-2.9-2.8-4.9-2.2c-2,1-3.7,2.4-5.4,3.6c-0.8-1.6-1.5-3.2-2.2-4.7c-0.3,0-1-0.1-1.3-0.1
+			c-1.6-0.1-3.2-0.2-4.8,0.1c-0.9,1.9-0.6,4-0.6,6c1-0.8,2-1.7,3-2.5c0.9,1.1,1.8,2.1,2.7,3.2c-0.9,0.8-1.7,1.6-2.6,2.5
+			c-5.2,4.5-12.5,0.2-18.2,3.5c-2.2,2.4-2.7,5.7-3.6,8.6c1.6-0.1,3.2-0.1,4.9-0.1c-1,1.5-1,4.3-3.2,4.2c-2.6,0.5-5-1.4-5.6-3.9
+			c-0.9-3.4-0.7-7.1-0.9-10.6c0-0.9,0-1.8,0-2.7c1.2,1.8,2.4,4.1,5,3.9c1-4.1-5.1-4.9-5.7-8.7c-1-2.2,2.5-2.3,3.7-3.3
+			c0.9-1.1,1.8-2.1,2.8-3.1c5.1,2.1-0.5,7.9,2.9,11c2.6-1.8,4.8-4.3,8-5.1c1.5-0.8,4.3-0.8,4.4-3c-1-1-2.1-1.8-3.1-2.7l-0.7-0.8
+			c2.3-3.7,7.2-2.1,10.8-3.1c1.3-0.7,2.7-1.3,3.8-2.3C1106.5,186.5,1106.5,184.8,1106.6,183.1z"/>
+		<path class="st2" d="M1237,194c2.1-1,4.2-2.2,6.1-3.5c1.3,0.8,2.7,1.5,4,2.3c-1.6,2.1-2.8,6-6.2,5.2
+			C1238.5,198.3,1237.9,195.8,1237,194z"/>
+		<path class="st2" d="M1249.4,196.6c0.8-0.9,1.6-2.6,3.2-2.1c2.3,2,5,5.2,4.4,8.4c-4.3,0.1-8.5,1.5-12.8,1.2
+			c0.2-1.4,0.5-2.8,0.9-4.1C1246.3,198.7,1248.3,198.2,1249.4,196.6z"/>
+		<path class="st2" d="M1127.2,202.4c0.3-0.1,1-0.3,1.4-0.4c1,1.2,1.9,2.3,3,3.4c-1.5,2-4.4,3.7-4.1,6.5c1.2,2.5,3.6,4.2,5.4,6.2
+			c-2.2,3.7-5.7,6.3-9.4,8.5c-0.9-1-1.8-2-2.6-3c-1.6-0.5-3.1-0.8-4.7-1.2c-0.6-1.5-1.2-2.9-1.7-4.4c3.3-3,5.9-6.7,6.1-11.3
+			C1122.8,205.3,1125,203.8,1127.2,202.4z"/>
+		<path class="st2" d="M1234.7,204c-0.5-2.4,2.7-1.2,2.5,0.1c0.1,2.4,0.2,5,1.7,7c0.4-2,1.2-3.9,2.7-5.4c0.9,1.7,1.7,3.5,2.8,5.1
+			c1.6-0.2,3-0.8,4.5-1.3c2.9-2,6.5-0.1,8,2.7c0.5,2.1,0.3,4.4,0.4,6.6c-4.1-1-8.3-2.6-12.5-1.8c-0.3,3.3-1,6.6-1,9.9
+			c0.4,0.4,1.1,1.3,1.5,1.7c1.7-1.9,3-4.2,4.9-5.9c2.4-0.3,4.9-0.1,7.3,0c0,8.8-0.8,17.6-0.5,26.5c-0.4,0.1-1.2,0.3-1.6,0.4
+			c-0.9-1.5-1.8-3-2.7-4.5c-1.2,0.3-2.3,0.5-3.4,0.8c-0.3,0.2-0.9,0.7-1.3,0.9c-0.3,1.6-0.6,3.1-0.8,4.7c-3.3-1.4-6.9-2.5-10.5-1.4
+			c0.2-8,0-15.9,0.1-23.9c1.2-0.9,2.9-1.4,3.9-2.7c0.1-1.3,0-2.5,0-3.8c-1.3-0.3-2.6-0.6-3.9-1c-0.3-4.6-0.9-9.2-2.2-13.7
+			L1234.7,204 M1249.1,230c0.9,2.1,1.9,4.7,4.7,4c-0.1-1.6-0.2-3.1-0.2-4.7C1252,229.2,1250.5,229.4,1249.1,230 M1240.6,234.6
+			c-0.1,2.1-0.1,4.2-0.2,6.4l0.4-0.1c2,3,6.1,1.3,9.1,1.7c-1.5-2.9-3.3-5.6-5.3-8.1C1243.3,233.3,1241.8,234.2,1240.6,234.6z"/>
+		<path class="st2" d="M844,206.4c0.6,0,1.8,0,2.3,0c1.6,3.9,3,7.8,4.2,11.9c0.2,0.6,0.5,1.8,0.6,2.4c0.1,2.9,0.7,5.9,0,8.8
+			c-3.1,3.4-5.3,7.4-7.4,11.4c-2.1-0.2-3.8-1.2-4.6-3.2c1.7-1.6,5-3.4,3.3-6.2c-0.5-1.8-3-0.9-3.3,0.6c-3.1,4.9-8,8.2-13,10.9
+			c-3.2,1.6-5.4,4.7-7.9,7.1c-0.7-0.6-1.4-1.1-2.1-1.7l0.2-1.2c0.9-3.3,2.5-6.4,4.2-9.3c-0.3-2-1-3.9-0.8-6c0.7-2.2,3.5-2.3,5.4-3
+			c3-1.1,6.1,0.2,9,1c2.3-1.8,6.5-3.8,5.2-7.3c-3.9-1.7-8,0.1-11.8,1.2c0-1.6-0.3-3.4,0.6-4.8c1.1-2.5,4-2.9,6.2-3.8
+			c0.9-1.3,1.8-2.6,2.8-3.9c3.3,0.1,5.2,3,7.1,5.3c1-1,3-1.7,2.4-3.5c-0.7-1.3-1.9-2.3-2.9-3.4C843.8,208.6,843.9,207.5,844,206.4z"
+			/>
+		<path class="st2" d="M1103.3,210c2.2,0.4,4.5,0.8,6.7,1.2c-0.4,5.2-5.9,6.8-9.5,9.3c-0.4,1-0.7,2-1,2.9c-0.4,0-1.3,0.1-1.8,0.1
+			c-1.2-1.6-2.4-3.3-3.7-4.9l-0.9-1.1c3.1-2.4,7.1-2.3,10.8-2.6C1103.7,213.4,1103.5,211.7,1103.3,210z"/>
+		<path class="st2" d="M644.1,219c1.3-3.9,5.4-5.6,8.7-7.4c7,8.2,12.8,17.4,17,27.4c-1.7,4.3-4.5,7.9-7,11.7
+			c-3.8,6-10.4,9.4-14.1,15.4c-1.9,8.8-9.2,14.9-12.5,23.2c-0.7-8.3-0.3-16.7-1.8-25c0.1-1.5,0.2-3.1,0.4-4.6
+			c2.9-1.4,8.4-0.5,8.7-4.7c0.2-2,0.4-4.5-1.4-5.8c-3.1,1.3-5.4,4-8.1,5.9c-0.9-1.5-1.8-2.9-2.5-4.4c-1.5-5.8-3.5-11.4-6-16.8
+			c1.5-1.3,3.7-2.1,4.5-4c0.8-1.4,0.8-3.7,2.8-4.1c2.1-0.6,4.4-0.4,6.6-0.4C641.5,223.8,643.1,221.6,644.1,219 M655.4,229.5
+			c-2.3,2-4.3,4.4-6.3,6.6c-0.8,0.7-1.1,1.6-0.9,2.7c2.8-0.1,4.9-2.6,7.8-2.2c1.7-0.3,4.4,0.6,4.9-1.7
+			C662.2,231.6,658.4,228.7,655.4,229.5 M654.3,243.3c-1.1,1.4-0.5,4.2,1.6,3.8c2-0.3,1.7-2.5,2.1-4
+			C656.8,243,655.5,243.1,654.3,243.3z"/>
+		<path class="st2" d="M1003.1,214.6c3.1,0.5,6.7,2.3,7.4,5.7c-0.7,2.8-1.7,5.5-2.1,8.3c-0.5-0.1-1.4-0.4-1.9-0.6
+			C1005.7,223.5,1004.6,219,1003.1,214.6z"/>
+		<path class="st2" d="M1017.7,225.6c0.5-0.1,1.5-0.2,2-0.3c0.2,1.8,0.5,3.6,0.8,5.3c-1.8,0.3-3.6,0.6-5.3,0.8
+			C1015.9,229.5,1016.8,227.6,1017.7,225.6z"/>
+		<path class="st2" d="M1131.9,228.1c1.6-3.3,7.7-3.1,7.6,1C1138,232.7,1133.8,230.1,1131.9,228.1z"/>
+		<path class="st2" d="M1079.5,227.6c2.1-0.5,2.8,2.2,3.2,3.8c-2.1,2-4.3,3.8-6.9,4.8c-0.2-1.4-0.4-2.9-0.5-4.3
+			C1076.7,230.4,1078,228.9,1079.5,227.6z"/>
+		<path class="st2" d="M491.6,233.4c2.1-1.1,2.9-3.5,4.5-5.1c2.6-0.9,2.7,2.5,3,4.2c-1.2-0.1-2.3-0.1-3.5-0.2
+			c1.1,1.8,2.2,3.5,3.4,5.2c-1.7,1.1-4,1.6-5.2,3.4c0.2,1.4,1.2,2.4,1.9,3.6c0.5-0.4,1.6-1.2,2.1-1.6c1.2-0.9,2.6-1.4,4-1.6
+			c-4.6,12.3-6.6,25.5-7.2,38.6c-0.2,19.1,2.5,38.5,10.4,56c0.5,1.1,1,2.2,1.5,3.3c-1.3,0.8-2.7,1.7-4,2.5c0,1.5,0.1,3,0.1,4.6
+			c0.6,0,1.7,0.1,2.2,0.1c1.4-0.7,2.8-1.5,4.2-2.2c3.8,6.9,8.8,13,14.5,18.4c-0.2,0.5-0.5,1.6-0.7,2.1c0.3,1.9,0.5,3.9-0.3,5.8
+			c-0.4-0.2-1.2-0.5-1.6-0.6c-1.1-2.8-4.2-3.9-6.5-1.7c-2.6,2.3-0.5,5.5-0.1,8.2c-0.9,3-2.7,5.6-4.3,8.2c-8.9-4.4-17.2-10-24.7-16.6
+			c0.3-1.7,1.7-3.4,1-5.1c-1.3-1-2.7-1.8-4.1-2.7c-1.1,0.5-2.2,1-3.3,1.5c-2.2-2.5-4.3-5.1-6.4-7.6c1.7-0.6,3.4-1.2,5.1-1.8
+			c-0.6-3.2-1.1-6.3-1.4-9.5c-0.5,0.9-1.1,1.8-1.6,2.7c-1.6,1.7-3.1,3.4-4.7,5.2c-13-19.2-19.3-42.6-18.3-65.8
+			c5.1-1.6,7.8-6.5,12.3-8.9c0.4-0.2,1.2-0.6,1.6-0.9c1.7-3.4,3.1-7,5.7-9.9c1.8-2.3,3.9-4.4,6-6.4c3.7,1.8,0,6.4,3.6,8.3
+			c2.3-2.2,5.5-4.6,4.7-8.2c-0.3-2.4-3.4-2.2-5.1-3.1c-0.7-3.7,2-6.5,3.8-9.4c-3.6-0.9-4.8,3-7.5,4c-0.4-3.7,0-7.7-2.7-10.7
+			c-1.6,1.6-3.1,3.3-4.1,5.3c-1.8,3.5-5.4,5.5-7.2,8.9c-1.5,1.9-3.9,2.7-5.9,4c-1,1.8-0.4,4-0.6,5.9c2-0.6,3.9-1.2,5.9-1.8
+			c-0.1,6-5.8,9.2-9.6,13c0.9-2.1,2-4.2,2.8-6.3c-0.2-2.2-1.7-4.2-1.1-6.5c0.9-3.9,2.5-7.6,2.8-11.6c0.1-0.7,0.4-2.2,0.5-2.9
+			c1.9-1.7,4.2-2.8,6.5-3.8c0.9-2.4,1.4-5,2.9-7.2c1.5-0.3,3.1-0.5,4.6-0.7c0.9-0.9,1.9-1.7,2.8-2.6c2.1,0.1,4.3,0.2,6.4,0.7
+			c1,0.9,1.8,2.1,2.6,3.2C486.3,236.4,489,234.9,491.6,233.4 M492.2,251.7c1.1-0.5,2.5-0.9,3.3-2c0.2-1.5,0.2-3,0.2-4.6
+			C492.5,244.9,490.4,249.4,492.2,251.7 M469.7,273.7c-0.3,1.7-0.3,3.4-0.4,5c1-0.1,1.9-0.2,2.9-0.4c0.5-1.1,1-2.2,1.5-3.2
+			C472.6,274.2,471.3,272.9,469.7,273.7 M481.1,288c1-0.3,1.9-0.7,2.9-1.1c0.6-1.6,0.4-4.3-2-3.1C480.2,284.1,481.5,286.8,481.1,288
+			 M487.3,295.4c1,2.6,1.7,5.5,3.4,7.8c1.5-2.9,1-6.1,0-9.1C489.5,294.5,488.4,294.9,487.3,295.4 M488,303.5c-0.3,0.7-1,2-1.3,2.6
+			c0.8,0.8,1.5,1.6,2.3,2.4c1.1-1.1,2.2-2.3,3.3-3.4C491,304.2,489.6,303.6,488,303.5 M481.9,311c-0.2,1.5,1.1,2.4,1.9,3.4
+			c0.9-2.1,1.3-4.3,1.2-6.6C483.9,308.7,482.4,309.5,481.9,311 M488.1,333.7c0.7,0,2.1,0.2,2.8,0.2c-0.4-1.4-0.7-2.7-1.1-4.1
+			C488.7,330.9,487.2,332,488.1,333.7 M475.3,332.3c-2.3,0.5-1.8,4.4,0.6,4.1C478.2,336.4,477.7,330.9,475.3,332.3 M478.7,336.5
+			c1.4,2.6,2.2,5.5,2.7,8.4c1-1.1,2.8-2.1,2.3-3.9C483.7,338.4,481.9,334.5,478.7,336.5 M465.5,337.2c-1.1,2,3.1,3,3.3,0.8
+			C468.7,336.5,466.4,336.2,465.5,337.2z"/>
+		<path class="st2" d="M748,236.1c2.3-3,6.3-4.1,9.3-6.2c-0.1,3.3,0.6,7.1-1.8,9.9c-2.8,3.5-3.6,8.1-6.5,11.5
+			c-1.6,2-4.1,2.8-6.4,3.8c-0.3-2.2-0.8-4.3-1.3-6.4c-2.2,1.8-4.2,3.8-6,6c1.6,3.8,0.3,7.7-1.4,11.2c-1.8,1.3-3.6,2.4-5.3,3.7
+			c-3.6,2.4-6.7,5.4-9.6,8.6c-0.1-1.7-0.3-3.5-0.3-5.2c0.7-0.1,2-0.4,2.7-0.5c2.3-3.1,5.1-6,6.7-9.6c-1.7,0.9-3,2.2-4.3,3.6
+			c-1.7,0-3.3,0-4.9-0.1c1.8-3,4.1-5.7,7.1-7.6c1.3-0.3,2.7-0.5,4.1-0.7c0.5-2.8,0.9-5.8,3.3-7.6c2.7-2.3,4.8-5.3,7.5-7.6
+			c2.5-0.6,4.9,0.6,7.4,1C748.3,241.3,747.6,238.6,748,236.1z"/>
+		<path class="st2" d="M1447.7,234c1.7,0,3.3,0,5,0c-0.8,1.2-1.5,2.4-2.3,3.5c-1.2,0.1-2.5,0-3.7,0
+			C1447.1,236.3,1447.4,235.1,1447.7,234z"/>
+		<path class="st2" d="M1496,234c6.1,0,12.1,0.1,18.2,0c-1.2,0.5-2.5,1.1-3.6,1.7c0.7,1.1,1.5,2.2,2.3,3.3c-1.3,1.3-2.5,2.6-3.7,4
+			l-0.6,0.7c-0.4,0.3-1.2,0.8-1.5,1.1c-2-2.1-4.1-4.1-6.2-6.2c-0.2-0.4-0.6-1.2-0.9-1.6C1498.7,236.1,1497.3,235.1,1496,234z"/>
+		<path class="st2" d="M1516.8,234c3,0,6.1,0,9.1,0c-0.7,2.3-1.3,4.6-1.8,7c-0.7,0.7-1.3,1.4-1.9,2.1c-0.6,3.6-2.3,7-1.9,10.7
+			c-0.2,0.6-0.5,1.9-0.7,2.5c-1.1,0.3-2.3,0.6-3.4,1c-0.3-1.4-0.5-2.9-0.8-4.3l-0.4,0.2c-2.5,0.9-5,1.8-7.5,2.8
+			c0.2,0.7,0.5,2.1,0.7,2.8c0.9-0.4,1.9-0.8,2.9-1.2c1.3,0.1,2.4,0.7,3.3,1.6c-1.9,1.8-4.3,2.8-6.5,4c-2-0.3-4.3-1.6-5.9,0.2
+			c-0.7,0.1-1.9,0.2-2.6,0.3l0-1.2c0-1.4,0.1-2.7,0-4.1c-1.2-1.4-2.8-2.4-4.3-3.5c-0.3-1-0.6-2-0.9-3c-3.3-0.7-7.2-1.4-8.2-5.1
+			c-0.3-0.5-0.8-1.5-1.1-2.1c1.8-1.2,4.3-3.4,5.9-0.7c0.2,0.6,0.6,1.9,0.8,2.5c2.5,0.8,4.8,2,6.9,3.5c0.3-1.9,0.7-3.8,1.1-5.8
+			c2.8-0.2,4.6,1.9,6.7,3.5c1.8,0,3.5-0.6,5.3-0.9c0.2-1.2,0.5-2.3,0.8-3.5c1.2-1.3,2.3-2.5,3.5-3.8c1.1-0.5,2.2-0.9,3.3-1.3
+			C1518.3,236.7,1517.6,235.4,1516.8,234 M1514.7,250c1.2,0.3,2.4,0.7,3.7,1c-0.1-2.1-0.6-4.2-2.3-5.4
+			C1514.6,246.7,1514.8,248.4,1514.7,250 M1499.1,255.6c2.5-0.7,5-1.4,7.5-2.1c-0.4-0.7-0.7-1.4-1.1-2.2
+			C1502.2,250.3,1500.5,253.2,1499.1,255.6z"/>
+		<path class="st2" d="M1528.3,234c62.8,0.1,125.6,0,188.4,0c0.2,1.8,0.5,3.5,0.8,5.2c1.1-1.6,2.1-3.4,2.9-5.2c4.2,0,8.4,0,12.6,0
+			v82.9c-1.1-0.4-2.2-0.7-3.3-1.1c0.2,3.5,1.7,6.7,3.3,9.7v45c-1.8,0.7-3.5,1.3-5.2,2c1.7,0.4,3.5,0.9,5.2,1.4V469
+			c-2.5,0.2-3,4.4,0,3.5v5.6c-1.5,1.9-2.9,3.9-4,6.1c1.3-0.4,2.6-0.8,4-1.2v10.9c-1.1-1-2.3-1.9-3.4-2.9c-0.6,1.5-1.1,3-1.6,4.4
+			c1.6,0.2,3.3,0.4,5,0.5v7.8c-2-0.8-4.1-1.4-6.1-1.9c1,2.3,2.1,4.6,3.2,6.9c-0.2,1.4-1.2,2.8-0.5,4.2c1.1-0.3,2.3-0.6,3.4-0.9v13.1
+			c-1.4,0.2-2.9,0.4-4.2,0.6c-0.1,2.6,0.1,5.2,0.7,7.8c1-1.8,1.8-3.9,3.5-5.3v14.2c-1.3,0-2.5-0.1-3.7-0.1c0,0.5,0,1.4,0,1.8
+			c1.2,0.5,2.4,1.1,3.7,1.7v14.8c-2.3,0-4.6,0-6.9,0.1c-0.2,1.6-0.3,3.2-0.4,4.9c-1.7,0.7-3.3,1.4-4.9,2.2c-1.1,0.7-2,1.6-3,2.4
+			c2,0.1,4,0.2,6,0.4c0.3,0.6,1,1.9,1.4,2.5c2.4-2.1,4.8-4.4,7.8-5.7v4.3c-1.8,1.2-3.7,2.3-5.6,3.4c-0.3,1.1-0.6,2.2-0.9,3.4
+			c-0.8,0.6-1.7,1.2-2.5,1.8c1,0.9,1.9,1.7,2.9,2.6c-0.8,1.1-1.6,2.2-2.4,3.3c-0.5,1.3-1,2.7-1.4,4c-0.6-0.5-1.9-1.5-2.5-2
+			c-2,1.1-5.3,1.8-5.3,4.6c1.6,3.4,4.2,0.2,5.9-1.3c0.6,1,1.2,2,1.9,3c-1.7,1-3.4,2.2-5.3,2.9c-1.8-0.3-3.4-1-5.1-1.5
+			c0.6,1.5,1.2,3,1.9,4.5c4.5-0.7,9-2,12.2-5.6c1.8,1,3.9,1.6,6,1.5v13.3c-1.5,0.5-3.1,0.8-4.3,1.8c-0.2,1.5-0.2,3-0.2,4.5
+			c-1-0.8-2-1.6-3-2.3c-3.8,1.7-6,5.8-10.3,6.6c-0.4-0.3-1.3-0.9-1.8-1.2c-1.4-0.5-2.8-0.7-4.2-0.8c-1.1,1.9-3,3-5.1,3.5
+			c-0.3-0.9-1-2.6-1.4-3.5c-0.1-2-0.1-3.9-0.1-5.8c0.5,0.5,1.4,1.4,1.8,1.9c0,1.1,0,2.3,0,3.4c1.1-0.4,2.1-0.8,3.2-1.1
+			c0-1.4,0-2.7,0-4.1c1.1-0.5,2.2-1,3.4-1.4c-0.4-0.9-0.8-1.8-1.2-2.7c-1.2,0.4-2.3,0.9-3.4,1.5c-1.3-0.2-2.6-0.5-3.9-0.7
+			c0-1.1,0.1-2.2,0.2-3.2c1.2-0.2,2.5-0.4,3.7-0.6c0.8,0.6,1.6,1.2,2.5,1.9c0.9-0.7,1.8-1.3,2.8-2c2,0.2,3.1-0.7,2.9-2.7
+			c-2-0.5-4-1-6-1.5c0.2-0.4,0.7-1.3,0.9-1.7c0.7-1.4,1.5-2.9,2-4.4c-0.2-2.7-1.6-5-3.3-7c1-1.2,2.1-2.3,3.1-3.5
+			c-3.2-1.2-6.1-3.1-8.7-5.2c0.1-3.8,0-7.5,0-11.2c2.9-0.8,5.4-2.5,6.9-5.2c2.4-0.1,4.8-0.2,7.3-0.3c0-1.3,0-2.6,0-3.9
+			c-2,0.5-4,1.1-6,1.7c0.2-1.8,0.6-3.5,0.6-5.3c-1.9-2.8-5.6-3.5-8.7-3.6c0-4.5,0-8.9,0-13.4c3.7,0.8,2.2,5.4,3.1,8.1
+			c1,0.8,2,1.5,3.1,2.2l1-0.6c1.9-2.1,4.5-0.5,6.9-0.4c1.9,0,3.8-0.6,5.7-0.8c1.1,0,2.3,0,3.5,0c0.2-1.3,0.5-2.7,0.7-4
+			c-0.4-0.1-1.3-0.3-1.7-0.5c-0.5-0.1-1.4-0.4-1.8-0.5c0.7-0.6,1.5-1.2,2.3-1.8c-0.6-1.2-1.1-2.4-1.7-3.6l-0.1,0
+			c-2.7-0.2-5.4-0.2-7.9-1.1c-0.5-1.7-0.7-3.4-0.9-5.1c-1.3-1.5-3.5-2.8-3.4-5c-0.1-3.2,0.4-6.4,0.7-9.6c-1.8,1.3-3.2,3-4.1,5
+			c-0.2,0-0.6,0.1-0.8,0.2c-0.6,0.1-1.7,0.4-2.3,0.6c0.3,3.7,0.8,7.4,1.6,11.1c1.1-0.3,2.2-0.6,3.3-0.9c1.2,1.8,2.2,3.7,3.8,5.1
+			c2.4,1.1,5.1,1.5,7.7,2.1c-0.5,1-0.9,2.1-1.5,3.1c-1.3,0-2.7-0.2-3.9-0.4c-3.4-0.5-4.8-5.1-8.3-4.5c-0.3,0-0.8,0-1.1,0
+			c-0.3-1.1-0.7-2.2-0.9-3.3c-0.7-0.1-2-0.3-2.7-0.4c0.1-39.7,0-79.4,0-119.1c0.1-10-0.3-20.1,0.3-30.1c-0.6-18.9-0.2-37.9-0.2-56.9
+			c1,1,2.1,2,3.2,3c0.7,0.1,1.4,0.1,2.2,0.2c0-0.8,0-1.7,0.1-2.5c-1.6-0.1-3.2-0.2-4.8-0.3c-0.7-3.2-0.9-6.5-0.7-9.7
+			c0.9,0.6,1.9,1.1,2.9,1.7c-0.1-0.4-0.4-1.2-0.5-1.6c-0.6,0-1.8-0.1-2.4-0.1c0-0.7,0-2,0-2.6c0.7,0.3,2,1,2.7,1.3
+			c0.9-2.9,0.2-5.8-2.6-7.2c-0.1-12.9-0.1-25.9,0-38.8c0.9,3.4,1.5,6.8,2.7,10.1c1.1,0.4,2.2,0.6,3.3,0.8c-1.3-3.8-3-7.8-2.2-11.9
+			c-0.7,0.6-1.3,1.2-2,1.8c0.3-2.3,0.7-4.6,1.2-6.8c1.6,0,3.2,0.1,4.7-0.3c-0.2-0.9-0.3-1.8-0.5-2.8c-2.3-0.3-4.5-0.6-6.7-1
+			c0.4,1.3,0.8,2.6,1.3,4c-0.4,0-1.2-0.1-1.5-0.2c-5-0.7-10.1-0.4-15.2-0.5c-57.4-0.1-114.8,0.2-172.2-0.2c1.5-0.4,2.9-0.9,4.3-1.4
+			c-1-0.5-2-1-3-1.4c0.6-0.8,1.2-1.5,1.9-2.2c2.7,0.4,5.4,0.8,8.1,1c-0.2-0.2-0.6-0.5-0.7-0.7c-1.1-1.1-2.1-2.2-3.1-3.3
+			c2.5-1.8,4.7,0.8,6.9,1.8c-0.1-0.8-0.4-2.3-0.5-3c-2.1-1.4-4.9-0.8-7.3-1.2c0.2-1.4,0.5-2.7,0.8-4.1c3.2-1.1,6.8-1.1,9.2,1.8
+			c1.5,3.9-1.2,7.7-1,11.7c3.3-1.5,3.6-5.3,4-8.5c0.4-1.5-0.6-2.8-1.2-4.1c-1.4-1.8-3-3.6-4.4-5.4c-1.1,0.8-2.2,1.6-3.2,2.5
+			c-0.5-1.2-0.9-2.5-1.3-3.7C1528.3,241.2,1528.4,237.4,1528.3,234 M1565,235c-0.2,2.4,0.1,4.9,0.3,7.3c1.4-0.4,2.1-1.8,2-3.3
+			C1567.2,237.3,1567.9,233.9,1565,235 M1689.2,235.2c-0.3,1.1-0.1,2.2,0.7,3.1c1.8,0.2,2.7-0.7,2.5-2.6
+			C1691.4,235,1690.4,234.8,1689.2,235.2 M1706.1,235c0,0.8,0.1,2.3,0.1,3c1.2,0,2.5-0.3,3.8-0.5c0.9,1.7,1.8,3.4,3,4.9
+			c1.7-0.8,1.3-3.4,0.3-4.7C1711.2,236.2,1708.6,235.6,1706.1,235 M1530.2,237.5c-1.5,1.3,0.9,3.8,2.3,2.4
+			C1533.6,238.6,1531.6,236.3,1530.2,237.5 M1676.3,239.1c-0.4,1.8-2.5,3.9-1.1,5.8c1.3-1.4,2.6-2.7,3.9-4.1
+			C1679.4,238.9,1677.5,239.3,1676.3,239.1 M1533.4,244.1c0.6,1.2,1.5,2.2,2.7,3.1c1.3-1.7,1.8-3.8,1.6-5.9
+			C1536.1,241.7,1532.4,241.3,1533.4,244.1 M1726.3,244.4c-1.6,0.4-1.2,4.2,0.8,4C1729.1,247.7,1728.3,244,1726.3,244.4
+			 M1692.7,246.5c-1,3.2,2.3,4.4,4.8,4.8C1697.3,248.6,1695,247.2,1692.7,246.5 M1701.6,246.6c0.3,3.6,1.6,7.6,5.6,8.5
+			C1706,252.2,1706,246.3,1701.6,246.6 M1685.2,249.1c-0.5,2.5,1.4,3.6,3.6,3.7C1688.7,250.7,1688.1,247.1,1685.2,249.1
+			 M1711.8,251.9c1.6,1.3,4.5,4.9,6.3,2.1C1717.2,251.4,1713.9,252,1711.8,251.9 M1606.1,253.9c-0.1,0.8-0.2,2.3-0.3,3.1
+			c0.5,0.2,1.6,0.7,2.1,0.9c0.4-1.4,0.9-2.8,1.3-4.2C1608.5,253.8,1606.9,253.9,1606.1,253.9 M1723.5,254.2c0.8,3-1,5.5-2.6,7.8
+			c-0.9-0.2-1.9-0.4-2.8-0.6c0.3,0.3,1,0.8,1.3,1c2.9,0,5.8,0.1,8.7,0.2c0,2.9,0.8,5.8,3.6,7.2
+			C1729.6,264.4,1726.6,259.2,1723.5,254.2 M1591.4,255.6c0.9,1.1,1.1,4.7,3.1,2.8C1594.7,256.3,1593.6,254.5,1591.4,255.6
+			 M1656.7,257c1.4,3.7,6.7,3.8,9.4,1.5c1.4,0.1,2.8,0.2,4.2,0.4c-1-2.2-3.8-2.3-5.7-3.3C1662.2,256.8,1659.3,256.8,1656.7,257
+			 M1714.6,265.7c0.3-1.4,0.6-2.8,0.9-4.2c-0.7-0.7-1.5-1.5-2.2-2.2C1712,261.6,1712.7,264,1714.6,265.7 M1721.4,266.8
+			c1.3,4.7,2.5,9.3,3.6,14.1c-0.6,2.5,1.3,4.4,2.7,6.2c0.5-2.1,0.4-4.2,0.3-6.3l-1,0c0.5-2.5-0.6-4.8-1.4-7.1
+			c-0.8-2.1,1.2-4.5,0.3-6.5C1724.4,266.9,1722.9,266.9,1721.4,266.8 M1729.2,291.2c-1.3,1.2-0.3,3.2-0.1,4.7
+			C1732.9,297.9,1731.4,289,1729.2,291.2 M1705.5,296.2c1.3,2.5,4.9,2.9,7.4,2.8c0.6-1.5,0-3-0.6-4.4
+			C1710.1,295.2,1707.8,295.7,1705.5,296.2 M1704.2,306.3c-1.5,0.9,0,3.7,1.5,2.4C1707.1,307.8,1705.7,305.1,1704.2,306.3
+			 M1720.2,316.2c-1.4,1,0,3.6,1.6,2.4C1723.2,317.7,1721.7,315,1720.2,316.2 M1709.5,320.2c2,0.8,4,1.2,6.2,1.5
+			c0-1.4-0.1-2.8-0.2-4.2C1713.4,318.3,1711.4,319.2,1709.5,320.2 M1720.7,322.1c-0.2,2.8-0.5,5.7,0,8.5l1.7,0
+			C1722.8,327.8,1723.4,323.9,1720.7,322.1 M1713.2,332.1c-1.9,0.5-0.9,3.3,0.9,2.9C1716.2,334.6,1715.1,331.4,1713.2,332.1
+			 M1725.4,335.2c-0.8,0.6-1.5,1.2-2.3,1.8c-1.4-0.3-2.8-0.6-4.2-0.8c0,2.1,3.2,2,4.6,3.2c2.4-0.2,5.6,1.7,7.5-0.5
+			c0-0.4,0-1.2,0-1.7C1729.7,335.4,1727.4,335.3,1725.4,335.2 M1715.8,340c1,1.4,3.4,5.2,4.6,1.9
+			C1720.4,339.2,1717.6,339.8,1715.8,340 M1709.1,341c-2.3,2,1,4.2,3.1,3.2C1712.9,342.3,1710.9,340.6,1709.1,341 M1717,344.4
+			c0.2,1.8,0.7,3.5,2.8,3.7c0-1.3-0.1-2.6-0.1-3.9C1719,344.2,1717.7,344.3,1717,344.4 M1723.4,352.3c-1,1-0.6,3.1,0.9,3.4
+			C1726.4,355.5,1725.3,351.3,1723.4,352.3 M1718.3,355.3c-1.2,1.6,2.3,4.4,3.7,2.5C1722.2,356,1719.7,353.2,1718.3,355.3
+			 M1707,364.9c0.3,1,0.8,1.9,1.2,2.9c1.6,0.5,3.5-1.1,2.6-2.8C1709.7,364,1708.2,364.6,1707,364.9 M1717.6,365.1
+			c0.1,2.3,0.2,4.5,0.5,6.8c0.7,0,2.1-0.1,2.8-0.2C1720.6,369.1,1719.2,367,1717.6,365.1 M1727.1,365.1c-1.5,3,1.9,3.1,3.9,2.9
+			C1730.7,366,1729.5,363.6,1727.1,365.1 M1713.1,374.3c0.2,0.9,0.5,1.9,0.8,2.8c1.1,0.2,2.2,0.3,3.4,0.6c1.6,2.3,2.7,4.8,4.5,7
+			c2.4-0.6,1.6-4.4,2.1-6.3c-1.1,0.5-2.1,1-3.1,1.5c-0.9-1.6-1.7-3.2-2.9-4.6C1716.5,374.3,1714.7,374.5,1713.1,374.3 M1708.3,420.1
+			c-1.4,0.9-0.1,3.7,1.5,2.5C1711.2,421.7,1709.8,418.9,1708.3,420.1 M1729.3,427.2c-0.6,1.6-0.1,2.2,1.6,1.7
+			C1731.4,427.3,1730.9,426.7,1729.3,427.2 M1715.8,446.2c0.7,2.4,2.8,4.9,5.6,4C1721.5,447.2,1717.8,447.3,1715.8,446.2
+			 M1714.9,457c1.7,0.8,2.8-1.4,4.1-2.2c1,0.3,2,0.6,3,0.9c-0.5-2.9-3.8-2.8-6.1-2.8C1714,453.4,1714.7,455.7,1714.9,457
+			 M1704.1,463c2-0.2,3.6-1.6,5.1-2.9C1706.7,459.4,1702,459.1,1704.1,463 M1716.9,473c1.2,0.3,2.5,0.6,3.9,0.8
+			c1.8-2.4-1.7-3.2-3.1-4.4C1717.4,470.6,1717.1,471.8,1716.9,473 M1724.3,474.1c0.1,3.6-1.4,7.1-1.1,10.7c0.1,1.3,2.3,3.4,2.9,1.2
+			c0.5-4.3,1.4-8.9-0.3-13.1C1725.4,473.3,1724.7,473.9,1724.3,474.1 M1706.2,478.1c-1.2,1.5,1.4,3,2.4,1.6
+			C1709.8,478.3,1707.2,476.8,1706.2,478.1 M1720.2,493.3c0.5,1.7,1.2,3.2,2,4.7c0.1,2,0.2,4.1,1.2,6c0.7-3.3,1.7-6.9,0.7-10.1
+			C1722.8,493.4,1721.5,493.5,1720.2,493.3 M1708.3,502.3c0.1,2.3,0.3,4.6,1.1,6.7c3.3-1.1,1.3-4.3,0.9-6.7
+			C1709.8,502.4,1708.8,502.3,1708.3,502.3 M1717.8,514.1c0,0.6,0,1.8,0,2.4c-0.8,0.1-2.4,0.3-3.2,0.4c0.3,1.2-0.1,4.8,2,3.6
+			C1719,519.2,1718.3,516.2,1717.8,514.1 M1725.2,517.7c0.7,1.5,2.9,6.3,3.9,2.3C1730.1,517.3,1727.2,516.1,1725.2,517.7
+			 M1721.8,519.2c-0.5,1.8-1.3,3.4-2.4,4.9c0.6,0.8,1.3,1.6,2,2.5c2.3,0,4.9,0.3,6.5-1.7c-1.4-0.5-2.7-1-4.1-1.6
+			c0.2-1,0.6-2.9,0.8-3.8C1723.7,519.4,1722.8,519.3,1721.8,519.2 M1717.3,531.2c0,0.7,0,2,0.1,2.7c2.9-0.3,5.7-1.6,6.7-4.6
+			C1721.6,529.2,1719.1,529.3,1717.3,531.2 M1712.8,548.9c-0.3,1.4-0.5,2.8-0.7,4.2c2.3,0,3.9-1.4,4-3.8
+			C1715.3,549.2,1713.6,549,1712.8,548.9 M1719.7,549.6c-1.9,2,1.6,3.7,2.6,5.3c-0.4,1.1-0.7,2.2-1.1,3.3c1.9,0.8,3.8,0.4,5.6-0.6
+			c-1.3-1.5-3.2-2.8-3.6-4.8c1.6-1.2,3.6-1.1,5.5-1.3c0-0.5,0-1.6,0-2.1C1725.7,549.4,1722.7,549.2,1719.7,549.6 M1714.7,553.8
+			c0,0.6,0.1,1.7,0.1,2.2c0,1.4,3.3,1.4,2.8-0.1C1718.2,554.1,1716.1,553.4,1714.7,553.8 M1710.5,568.5c-1.9,1.6-3.4,3.5-3.3,6.1
+			c0.7,0.1,2.2,0.2,2.9,0.2c0.6-1.1,1.2-2.2,1.8-3.3c1.3,0,2.7-0.1,4-0.1c-1.2-1-2.5-1.9-3.7-2.9
+			C1711.8,568.6,1710.9,568.6,1710.5,568.5 M1720.1,577.1c-1.6,0.4-3.6,0.5-4.1,2.4c-0.5,0.2-1.5,0.4-2,0.6c-2,0.8-3.4-0.9-3.9-2.6
+			c-0.5,0-1.6,0-2.1,0c0.7,0.9,1.4,1.7,2.2,2.6c0.3,0.8,0.8,1.6,1.1,2.4c0.7-0.7,1.6-1.1,2.5-1.5c0.8,1.2,1.6,2.5,2.4,3.8
+			c0.9,0.5,1.8,1.1,2.8,1.6c3.3-1.6,0.6-6,0.9-8.9c0.8,0.2,2.4,0.6,3.2,0.8c0.8-0.9,1.7-1.7,2.6-2.6c-0.7-0.9-1.5-1.8-2.2-2.7
+			C1722.1,574.1,1721,575.5,1720.1,577.1 M1727.2,598c-0.8,2.9-0.7,6-0.3,9c-1.5,1.5-3.7,1.9-5.6,2.7c0.1,1.1,0.2,2.1,0.3,3.2
+			c3.4-1,4.9-4.6,7.8-6.5c0.4-1.7,1-3.3,1.2-5C1729.7,600,1728.4,599,1727.2,598 M1720.6,602.5c-1.8,1.6-4.8,3.1-4.1,6
+			c2.9,0.9,4.8-1.7,6.2-3.7C1723.4,603.5,1721.9,601.5,1720.6,602.5 M1716.8,616.2c2.9,0.5,4-1.9,3.4-4.5
+			C1718.2,612.6,1717.3,614.4,1716.8,616.2z"/>
+		<path class="st2" d="M1155.4,241.6c-0.2-2.5,0.2-5,0.2-7.5c7,7.8,13.8,15.9,20.6,24c-0.1,0.5-0.3,1.5-0.4,2
+			c-2.8-0.6-5.4-1.9-8-3.2c-4.7,0.8-9.5,1.2-14.2,2.2c-1.2,0.3-2.5,0.6-3.7,0.9c-0.5,0.1-1.6,0.5-2.1,0.6c0.1,2.8,2.6,3.4,4.9,4
+			c-0.2,1.1-0.3,2.1-0.4,3.2c2.5-0.1,5.2,0.3,7.6-0.8c-0.1-1.6-0.4-3.1-0.6-4.7c1.3,0.4,2.7,0.7,4,1.3c0.5,1.6,0.8,3.3,1.2,4.9
+			c0.2,0.2,0.7,0.5,0.9,0.7c1.6,0.1,3.2,0.1,4.9,0.1c0.3-0.2,0.9-0.6,1.2-0.8c0.8-1.5,0.8-3.6,2.3-4.5c1.4,0.6,2.8,1.3,4.2,2
+			c1-0.8,2.1-1.6,3.1-2.4c0.6,0.8,1.2,1.5,1.8,2.2c0.1,2.5,0.5,5.1,1.5,7.5c1.5-0.1,3.1-0.2,4.6-0.2c5,5.6,9.9,11.4,14.6,17.2
+			c-2.4,0-4.9,0.2-7.3,0.3c0.7-1.3,1.3-2.6,2.1-3.9c-0.4-0.5-1.2-1.6-1.6-2.2c-3.2,1.7-5.5,5.3-9.5,5.1c-0.1-2.4,0.6-4.6,2.6-6
+			c1-0.9,2-1.8,3-2.7c-2-1.6-4.2-2.8-6.8-2.8c-0.9,1.7-1.1,4.4-3.5,4.6c-3,0.8-4.4-3.7-7.5-3.3c-3.1,0-6.5,1.8-9.4-0.1
+			c-2.7-1-3.7-3.9-4.9-6.2c-0.6-1.9-2.9-1.5-4.4-2.1c-3.7-2.5-10.4-1.2-10.6,4c1.8-0.2,3.6-0.5,5.4-0.8c-1.2,2.9-2.8,5.7-5.4,7.6
+			c-4.2-4.6-8.1-9.5-12.3-14.1c1.1-1,2.3-1.9,3.4-2.9c0.9,1.1,1.9,2.2,2.8,3.3c0.3,0.3,0.9,1,1.2,1.3c1.4,0.1,2.9,0.2,4.4-0.2
+			c0.5-1.4-0.6-2.4-1.3-3.4c-1.8-1.8-4.4-3.5-4.6-6.3c-0.5-2.6,0.8-5.1,1.8-7.5c-1-1.5-2-2.9-3-4.3c0.6-1.1,1.2-2.2,1.9-3.4
+			c1.6,0.5,3.1,1,4.7,1.6c2-1,3.9-2.5,6.2-2.7c3.5,1.2,4.7,5.1,4.8,8.5c1.8,0,3.9,0.6,5.6-0.4c1.1-1.3,2.3-4,0.3-5
+			C1159.6,244.7,1157.1,243.6,1155.4,241.6 M1149.3,250.3c-1.2,1.7,0.5,4.1,2.5,3.5C1153,251.9,1151.7,248.5,1149.3,250.3z"/>
+		<path class="st2" d="M1087,237c2-1.6,4.2-1.5,6.4-0.2c0.2,14,1.3,28,1.2,42c-0.6,8.1,0.8,16.6-3.1,24.1c-0.8,0.9-1.6,1.8-2.4,2.6
+			c-2.3-1.4-5.7-1.2-5.8,2.1c1.8,1.8,4.3,2.5,6.7,3.1l0.2-0.2c1.3-1.4,2.1-3.7,4.2-4.1c0.1,2.6,0.2,5.2,0.3,7.8
+			c-1.8,1.8-4,3-6.4,3.8c0.7,1.5,1.4,3,2.1,4.4c-1.9,2.4-4.4,4.1-6.6,6.1c-0.4,4,3.8,6.8,5.3,10.3c2.5-0.2,5.1-0.8,6.7-2.9
+			c0,8.1,0.4,16.2,1,24.3c0.4,5.2,1.7,10.7,5.4,14.7c4.8,4.1,11.6,3.8,17.5,4.8c-0.1,3.3-0.2,6.6-0.2,9.9c-1.5,0.2-2.9,0.5-4.2,1.3
+			c-8,0-16-0.6-24-0.4c-4.7,0.2-9.3-0.8-13.9-0.2c-9.2,0.9-18.4,0-27.5,1.3c-0.1-4-0.1-8-0.1-11.9c0.5,0,1.5-0.1,2-0.2
+			c0.8,0.2,2.4,0.5,3.1,0.7c0,1.5,0,3,0,4.5c0.9,0.1,1.8,0.1,2.8,0.1c0.6-2,1.2-4,1.8-5.9c1.5-0.4,2.9-0.8,4.4-1.2
+			c1.3,1.4,2.6,2.8,3.9,4.3c2.4-1.9,2.2-4.8,1.7-7.6l0.2-0.3c0.5-0.9,0.9-1.7,1.4-2.6c1.8-0.9,3.3-2.1,4.8-3.5
+			c0.9,0.2,1.8,0.3,2.7,0.5c1.7-1.8,3.1-3.9,3.6-6.4c-2.5,0.9-5.1,1.8-7.7,2.5c-0.4-6.2,0.6-12.3,1.3-18.4c0.2-1.8,1.2-3.3,1.9-4.9
+			c-0.8-0.1-2.4-0.2-3.2-0.3c0.5-10.9,0.3-21.9,0.2-32.8c0.1-17.2,0-34.5,0-51.7c0.4-1.9,0.8-3.7,1.3-5.6c4.8-0.5,9.7-0.9,14.5-1.6
+			c0.3-1.6,0.4-3.2,0.6-4.9c-2.2-0.4-4.5-1.5-6.6-0.3c-3.1,1.3-6.3,2-9.6,1.8c0.2-2.2,0.3-4.3,0.9-6.4
+			C1079,237.7,1083.6,239.5,1087,237 M1085.4,258.6c1.2,0.1,2.4,0.1,3.6,0.2c0.4-2.3,1.2-5.8-2-6.3
+			C1083.6,252.7,1084.9,256.4,1085.4,258.6 M1089.1,266.1c-2.4,1.5,0.5,5.8,2.3,3.2C1093,267.9,1090.8,265.2,1089.1,266.1
+			 M1076.9,272.1c2.9,0.3,5.7-2.1,5.1-5.1C1078.8,265.6,1077,269.6,1076.9,272.1 M1088.2,276.3c-0.7,1.8-0.8,3.6,0,5.4
+			c0.7,0,2.1,0,2.8,0c0.4-1.8,0.6-3.6,0.8-5.4C1090.6,276.3,1089.3,276.3,1088.2,276.3 M1079.7,291.8c-2.5,2.1-5.3,4.4-4.6,8.1
+			c4-0.5,7.9-1.1,11.9-1.6c1.1-2.6,2.2-5.2,2.8-8C1086.4,290.5,1083.1,291.6,1079.7,291.8 M1082.1,352.1c0.2,1.3-0.1,2.8,1,3.8
+			c2.1,0.2,1.5-2,1.7-3.4C1084.1,352.4,1082.7,352.2,1082.1,352.1 M1075.6,355.6c-0.1,1.8-0.2,3.6-0.3,5.4c1-0.2,2-0.5,3-0.8
+			c0.9-1.6-0.1-3.4-0.6-5C1077.2,355.3,1076.1,355.5,1075.6,355.6 M1090.1,364.2c-1.7,1.8-2.9,4.1-3.1,6.7c1.4-0.8,2.9-1.5,4.3-2.3
+			c0.8,0.5,1.6,0.9,2.4,1.3c0.9-1.1,1.2-2.7,0.5-4C1092.9,365.2,1091.5,364.8,1090.1,364.2 M1073.5,373.4c0,1.8-0.1,3.5-0.1,5.3
+			c0.8,0.3,2.5,0.8,3.4,1c-0.3-2.2-0.7-4.3-1.2-6.3C1075.1,373.4,1074,373.4,1073.5,373.4 M1088.5,375.5c-0.8,1.1-1.6,2.3-2.3,3.4
+			c-2.6-0.8-5.2-1.6-7.8-1.6c0.2,1.5-0.4,3.6,1.5,4.3c2,0.3,2.8-1.3,3.4-2.8c2.6,1,5.1,0.1,7.3-1.4c0-0.5,0-1.5,0-2
+			C1090.1,375.4,1089,375.4,1088.5,375.5 M1099.2,376.1c-0.8,0.9-2.6,2.7-0.8,3.6c2,1.2,4.9,3.5,7,1.4c0.1-2.1-1.9-2.4-3.4-3.1
+			C1101.2,377.3,1100.5,376.2,1099.2,376.1 M1092,379c-0.7,1.7-0.2,3.5,1.8,3.8C1095.6,381.5,1094.6,377.6,1092,379z"/>
+		<path class="st2" d="M1112.5,242.9c0.8-2.5,5-2.8,5.8-0.2c1.1,1.9-1.5,3-2.4,4.3C1114.7,245.6,1113.6,244.3,1112.5,242.9z"/>
+		<path class="st2" d="M1118.7,250.3c1.9-3.8,4.9-8.2,9.9-6.8c-0.6,2.1-1.6,4.5,0,6.5c0.8,1.8,1.7,3.6,2.5,5.4
+			c-2.5,0.1-5,0.2-7.5,0.4C1122,254,1120.3,252.2,1118.7,250.3z"/>
+		<path class="st2" d="M836,245c1.1-0.2,2.2-0.4,3.3-0.7c0.1,1.4,0.3,3-0.9,4c-2.2,2.4-3,5.7-4.6,8.4c-1.2,2.1-3.7,2-5.8,2.3
+			c1-3.1,1.9-6.2,3.1-9.2C832.6,248.1,834.4,246.7,836,245z"/>
+		<path class="st2" d="M658.5,262.4c4.8-5.5,7.5-12.9,13.7-17.2c0.5,1.1,0.9,2.2,1.3,3.3c4.4,14.4,5.9,29.6,4.8,44.6
+			c-0.7,0.1-2,0.3-2.7,0.3c0,2.2,0.2,4.5-0.1,6.7c-2.7,4-6.8,6.6-10.2,10c-3.8,3.3-6.7,7.6-11,10.4c-4.6,3.1-8.6,7.2-11.8,11.8
+			c-0.9-1.2-1.7-2.4-2.6-3.7c1.5-1.2,3-2.2,4.4-3.4c1.9-3,4.1-6.4,2.3-10c0.5-1.6,1.1-3.2,1.2-4.9c-2.4-2.2-3.7,1.6-5.3,2.9
+			c-2.9,0.2-5.8,0.7-8.7,1.2c0.4-2.6,1.1-5.1,2.3-7.4c-0.3-2.7-0.6-5.5-0.2-8.2c0.3-3.1,2.6-5.5,4.1-8.1c2-2.9,3.2-6.1,4.7-9.2
+			C648.3,274.6,654,268.8,658.5,262.4 M670.8,271.9c0.6,0.3,1.7,0.9,2.3,1.2c1.5,0.8,3-2,1.7-2.8
+			C673.4,267.9,671.6,270.6,670.8,271.9 M668.3,280.9c0.1,1.6,0.1,3.1,0.2,4.7c1.4,0,2.8,0,4.2,0c-0.2-1.6,0.6-4.3-1.8-4.7
+			C670.3,281,668.9,281,668.3,280.9 M657.2,286.6c0.8,0.7,1.7,1.4,2.5,2.1c0.6-1,1.3-2,2-3.1c-0.4-0.9-0.8-1.7-1.2-2.5
+			C658.3,283.2,657.3,284.6,657.2,286.6 M648.1,287c-2.4,1.3,0,5.4,2.2,3.3C652.8,289,650.3,285.1,648.1,287 M645.2,296.2
+			c-0.8,2.2-1.9,5.2,0.6,6.8c1.3-1.7,4.2-2.9,3.6-5.5C648.6,296.1,646.6,296.5,645.2,296.2 M648,306.6c1.5,1.5,3.5,1.8,5.6,2
+			c0.6,0.7,1.3,1.5,1.9,2.2c2.8-0.5,6.5-2.7,4.7-6c-1.8-0.4-3.2,1.4-4.7,2c0-0.6-0.1-1.8-0.2-2.4c2.5-2.1,4.9-4.7,5.5-8.1
+			C655.4,297.6,650.2,301.4,648,306.6 M638.1,309.9c1.7-0.4,3.6-0.6,5-1.9c0.9-1.6,1.4-3.6,1.1-5.4
+			C640.3,302.2,638.9,306.9,638.1,309.9z"/>
+		<path class="st2" d="M756.5,248.7c0.3,0,0.9,0,1.2,0c0.1,28.4,0,56.9,0.1,85.3c0.1,8.6-0.4,17.3,0.7,25.8c0,0.6,0,1.8,0,2.4
+			c-1.5,0.1-2.9,0.2-4.3,0.3c0.4,2.8,1.1,5.6,0.9,8.4c-1.5,3.1-3.2,6.1-5.3,8.9c-3,1.4-5.1-1.9-7.6-2.9c-1.4,0.2-2.7,0.5-4,0.8
+			c1.1,2.1,2.3,4.2,3.2,6.4c-0.3,1.1-1,1.6-2,1.5c-2.8-0.1-5.1-1.9-7.4-3.3c-0.3-2.9-4.1-6.4-6.4-3.2c0.8,5.3,5.8,8,10.2,10
+			l-0.9,0.7c-5.6,0.3-11.2-0.1-16.8,0.4c0.9-0.4,1.8-0.7,2.6-1.1c-0.7-1.5-1.3-3.1-2-4.6c1.2,0.6,2.5,1.1,3.8,1.7
+			c-0.5-2.2-2.4-3.6-3.8-5.3c0-0.6-0.1-1.7-0.2-2.3c-4.1-0.1-4.1,5.7-3.2,8.6c0.1,0.6,0.4,1.7,0.5,2.2c-1.1-0.1-2.2-0.1-3.2-0.1
+			c-0.3-1.4-0.5-2.9-0.8-4.3c-0.3-0.1-1.1-0.3-1.4-0.4L709,384c-0.3-0.5-1-1.5-1.3-2.1c0.8-1.5,1.6-3,2.5-4.5c0.8-1,1.8-1.8,2.6-2.7
+			l0.8-1c0.8,0,2.2-0.1,3-0.2c0.5-2.9,0.8-5.8,1.1-8.7c1.4-0.2,2.9-0.3,4.3-0.5c-0.4-2.2-1.8-3.9-3.4-5.3c0-1.5,0-3.1,0-4.6
+			c0-16.8,0-33.7,0-50.5c-0.2-2.2,0.8-4.1,2.1-5.8c4.3-3.5,8.1-7.5,11.9-11.6c1.4-1.7,3.5-3.6,2.8-6.1c-2.4-1.5-4.2,1.4-6,2.6
+			c-0.7-1.1-2-2.3-1-3.7c2.2-4,4.8-9.1,10-9.4c0.1,2,0.2,4,0.2,6c2.9,1.4,5.6,3.7,9,3.7c2.7-0.3,2.9-3.2,3.3-5.2
+			c-1.8,0-3.6,0.3-5.3-0.2c-1.7-1-3.1-2.6-3.9-4.4c0.1-1.3,1-2.2,1.6-3.3c2.3,0.9,4.6,2.7,7.2,1.9c1.5-1.1,2.4-2.7,3.6-4.1
+			c-2.2-0.2-5.7,1.4-6.6-1.4c0.8-3.1,3.9-4.7,5.8-7.1C755.3,254,755.8,251.2,756.5,248.7 M742.1,296.1c-1.7,1.5-4.5,3.1-3.9,5.8
+			c-0.1,1.6,2.4,2.1,3.1,0.6c1.5-1.9,5.1-5.3,1.7-7.1L742.1,296.1 M726.2,362.7c1.6,1.1,3.6,0.9,5.4,0.9c-0.2-1.1,0-2.5-1-3.2
+			C728.9,360,725.7,360.1,726.2,362.7 M728.9,370.7c-0.2,2.5,0.1,5.6,2.9,6.4C731.4,374.8,731.2,372,728.9,370.7z"/>
+		<path class="st2" d="M811.7,253c0.8-0.7,1.7-1.4,2.5-2.1c1.5,3.4,0.9,6.9-0.7,10.1c1.2,2.4,2,4.9,1.7,7.6c-2.5,0.3-5,0.7-7.5,1.2
+			C809.9,264.5,811.3,258.8,811.7,253z"/>
+		<path class="st2" d="M845.6,254.4c1.1-1.8,3.3-2,5.1-2.7c-1.7,8.4-5.6,16.4-10.9,23.2c-2-2.1-2-5.4-0.4-7.8
+			C841.9,263.1,842.4,258.1,845.6,254.4z"/>
+		<path class="st2" d="M1251.1,251.9c1.1,0.9,2.6,1.6,3.2,3c0.6,2.4-0.6,4.7-2.1,6.5c-2.2,1.1-3-2.6-4.2-3.9
+			c-0.4-0.1-1.2-0.3-1.7-0.4c-0.1,0.8-0.2,2.4-0.3,3.2c-2.2,0.3-4.3-0.2-6.1-1.3c0.9-0.8,1.7-1.5,2.6-2.2c-0.7-1.1-1.5-2.3-2.2-3.4
+			c2.9,0.2,5,2.8,8.1,2.4C1249.4,254.5,1250.3,253.2,1251.1,251.9z"/>
+		<path class="st2" d="M1450.2,261.3c2.3-1.8,2.7-4.6,3.7-7.1c1.7-0.2,2.1,1.9,3.2,2.8c1,1.5,2.7,2,4.1,2.9
+			C1458.8,263.9,1453.5,264.2,1450.2,261.3z"/>
+		<path class="st2" d="M1403.2,259.9c0.2-1.1,0.4-2.2,0.6-3.2c0.5,0.5,1.3,1.5,1.8,2c1.2,0.2,2.5,0.4,3.8,0.6
+			c0.1,0.1,0.2,0.4,0.3,0.6c0.3,0.6,0.9,1.7,1.2,2.3c-4.2,0.7-8.4,1.4-12.7,1.2C1399.8,261.9,1401.4,260.8,1403.2,259.9z"/>
+		<path class="st2" d="M825.6,261.6c1.3-0.7,2.5,0.9,3.1,1.8c-0.7,5-5,8.3-8.9,10.8c-0.4,2.5,0.7,5.1,0.7,7.6
+			c-0.8,1.4-2.3,2.2-3.4,3.4c-2.2,1.9-3.1,4.8-5.1,6.9c-1.5,1.2-3.4,1.9-4.8,3.2c-1.3,1.6-2.4,3.4-3.6,5.1c-1.2-1-2.3-2-3.5-3
+			c-0.8,1.4-1.6,2.8-2.4,4.2c-6.7,1.3-13.4,2.5-20.2,1.6c1.5-1.9,3.1-3.7,4.8-5.5c-2.3-2.8-5.1-0.6-7.3,1c-0.2-2.4-0.3-4.7-0.6-7
+			c2.4-0.2,4.8-0.6,7.2-1c0.7,0.9,1.3,1.8,2,2.6c1.5-1.1,2.9-2.3,4.5-3.2c2.1,0.4,4,1.5,5.9,2.5c3-0.9,7.2-0.8,8.2-4.5
+			c1.4-2.2,4.1-2.5,6.4-3c0.3-1.4,0.7-2.7,0.7-4.1c-1.3-1-2.8-1.7-4.3-2.4c-1.5,1.4-3,2.8-4.5,4.1c-0.6-0.1-1.7-0.2-2.3-0.3
+			c2.7-3.1,5.8-5.9,7.7-9.5c0.3-0.5,0.8-1.5,1-2c1.5,2.4,2.8,4.8,3.8,7.5c3.2-0.7,4.8-3.4,5.4-6.5c1.3-1.5,3-2.5,4.7-3.6
+			C822.2,265.8,822.8,262.6,825.6,261.6z"/>
+		<path class="st2" d="M1244.5,261.5c1.3,0.5,2.5,1.1,3.8,1.6c-0.1,1.6-0.3,3.3-0.5,4.9c-1.7,1.2-3.4,2.4-5,3.7
+			c1.9,1.5,3.5,4,6.3,3.8c1.7-1.5,1.4-4,1.6-6c1.9,1.2,3.7,2.4,5.6,3.6c-0.1,2.3-0.1,4.6,0,7c-0.5,0.2-1.5,0.5-2,0.6
+			c-0.4-1.1-0.8-2.2-1.1-3.2c-2.9-0.1-5.9,0-8.8-0.3c-1-1.4-1.6-3.1-2.3-4.6c-1.5,0.1-3,0.1-4.5,0.2c-0.2-0.2-0.8-0.7-1-0.9
+			c0-2.6,0-5.3,0-7.9c0.6-0.3,1.8-0.9,2.4-1.1c0.8,0.4,1.7,0.8,2.6,1.2c0,1.3,0,2.6,0,3.8c0.9-0.2,1.8-0.5,2.7-0.8
+			C1244.6,265.2,1244.5,263.4,1244.5,261.5z"/>
+		<path class="st2" d="M1156.5,278.9c3.4,1.4,6.7,3.2,10.2,4.7c0.3,1,0.7,2,1.1,3.1c3.4,1.9,6.4-0.6,9.3-2.2
+			c1.4,0.6,2.7,1.6,3.9,2.5c1.7,1.4,3.9,1.8,6,2.2c-0.2,1.7-0.5,3.5-0.3,5.2c2.6,0.3,5.6-1.8,7.9,0.1c2,1.8,0.7,4.6-0.2,6.7
+			c-4-0.2-6.2,3.1-8.5,5.8c-1-0.3-1.9-0.7-2.9-1c-0.7,0.2-2,0.5-2.7,0.6c0.3-1.4,0.2-2.9,0.9-4.2c1.9-1.3,4.2-1.7,6.2-2.8
+			c0.1-1,0.2-2,0.3-3c-0.6-0.2-1.8-0.5-2.5-0.7c-1.8-0.2-3.6-0.3-5.4-0.3c-1.7,2.5-3.2,5.2-5.7,7.1c-2.2-1.7-5-1.1-7.6-1
+			c-0.6-4.3-1.2-8.9-3.6-12.6c-2.1-2.7-5-4.8-7.5-7C1155.8,281.2,1156.3,279.7,1156.5,278.9 M1170.8,297.1c0.5,0.2,1.6,0.5,2.1,0.6
+			c1.3-1.4,4.6-2.6,4.1-4.7C1173.7,291.3,1171.9,294.5,1170.8,297.1z"/>
+		<path class="st2" d="M1247.3,282.5c0.7-0.7,1.5-1.4,2.2-2.1c1.7,1.2,3.5,2.2,5.5,3.1c0,1.4,0,2.9,0,4.3
+			C1252.1,286.5,1249.1,285.2,1247.3,282.5z"/>
+		<path class="st2" d="M718.5,287.5c0.3-1.5,0.7-3,1.1-4.5c1.8,0.2,3.5,0.4,5.3,0.6c-0.6,1.2-1.1,2.5-1.8,3.6
+			C721.6,287.6,720.1,287.5,718.5,287.5z"/>
+		<path class="st2" d="M1245.1,295.6c2.1-2.1,5.1-2.4,7.9-2.6c1,0.7,2,1.5,3.1,2.2c0.1,4,0.2,8,0,11.9c-0.4-0.1-1.3-0.4-1.7-0.6
+			c-2.1-0.6-5.1-2.5-6.6,0c-2.1,2.9,0.9,6,2,8.7c1.6,2.2,0.1,4.9-0.7,7.2c-1.7,2.8-3.4,5.6-4.8,8.5c-0.6-1.4-1.2-2.9-1.7-4.3
+			c-1.4,0.5-3.5,2-1.6,3.4c1.8,1.5,1.8,3.6,1.3,5.7c-1.2-0.7-2.3-1.3-3.4-2c-0.9,1.1-1.7,2.1-2.6,3.2c-0.9-0.6-1.8-1.2-2.6-1.7
+			c0.3-1.2,0.7-2.4,1.1-3.6c0.7-0.2,2.1-0.5,2.7-0.7l1.2-0.2c-0.2-2.7-0.4-5.4-0.8-8.1c2.7,0.2,4.9-1,6.1-3.4
+			c-0.5-0.5-1.5-1.5-1.9-2c1.8-5.1,0.7-10.4,0.4-15.6c3.3-0.7,6.7-1.3,10-2c-0.9-1.4-2.3-2.3-3.9-2.7
+			C1247.7,296.5,1245.9,295.9,1245.1,295.6z"/>
+		<path class="st2" d="M1207.6,300.5c1.4-0.1,2.9-0.3,4.3-0.4c3.6,3.5,6.5,7.7,9.9,11.5c-3.5,2.7-6.5-1.6-9.5-3.1
+			c-2.4-1.6-7.8-1.2-7.7,2.5c0.6,4.1,2.2,7.9,2.8,12c-1.5,0.1-3,0.2-4.4,0.2c-1.6-2.7-3.2-5.5-4.8-8.2c-0.6,0.3-1.1,0.6-1.6,0.9
+			c-1.6,1.3-3,2.8-4.4,4.2c-0.6-0.4-1.7-1-2.3-1.4c0.4-1.2,0.3-2.6,1.1-3.6c1.7-0.7,3.6-1.1,5.4-1.8c1.5-2.1,1.9-5,4.1-6.6
+			C1203,304.8,1205.5,302.9,1207.6,300.5z"/>
+		<path class="st2" d="M1209.8,321.9c-0.4-2.1,1.3-4.5,3.5-3.3c3.8,0.5,5.4,4.9,3.5,8c-1.2,0-2.3-0.1-3.5-0.1
+			C1212.1,325.1,1210.8,323.6,1209.8,321.9z"/>
+		<path class="st2" d="M1180.1,321.8c2.1-0.8,4.6-2.1,6.6-0.4c-0.2,1.9-2.3,2.7-3.5,3.9C1182.2,324.2,1181.2,323,1180.1,321.8z"/>
+		<path class="st2" d="M651.7,328.7c1.4-0.4,2.8-0.3,4.2-0.3c-0.8,1.7-1.3,3.7-2.8,4.9c-1.2,0.5-2.6,0.3-3.9,0.4
+			C650,332,650.5,330.1,651.7,328.7z"/>
+		<path class="st2" d="M1223.9,330.9c2.8-1.4,5.4,1.9,6.5,4.2c-0.3,2.4-3.2,1.8-4.9,1.5C1224.1,335.2,1222.4,332.6,1223.9,330.9z"/>
+		<path class="st2" d="M1020.2,348.8c1.9-5.1,3.5-10.3,5.6-15.4c3.9,1.3,7.8,2.6,11.8,3.4c-0.2,0.7-0.5,2.1-0.7,2.8
+			c-1.5-0.1-3-0.2-4.6-0.3c0,1.3-0.1,2.6-0.1,4c1.4,0.2,2.9,0.5,4.3,0.8c-3.3,11.5-6.1,23.1-8.4,34.9l-0.7,0.1
+			c-3.9-0.5-8.5,1.9-11.7-1c-3-2.4-2.1-7.7-6-9.2c-2.2,0-4.3,0.7-6.5,1.1c-0.5-0.2-1.5-0.6-2-0.7
+			C1009.9,364.9,1016,357.2,1020.2,348.8 M1020.3,357.5c0.4,1.1,0.9,2.2,1.2,3.4c-0.8,2.4-4.5,3.3-4.2,6.1c-0.2,1.2,0.3,2.9,1.8,2.7
+			c3.7,0.3,6.1-3.5,7.3-6.5c-0.8-1.9-1.4-3.9-2.1-5.8C1022.9,357.4,1021.6,357.4,1020.3,357.5z"/>
+		<path class="st2" d="M631.7,335c1.2,1.1,3.1,2,3,3.9c-0.8,1.5-1.9,2.7-3,4c-2.6,1.5-5,3.4-7.2,5.4c0,1.9,0,3.8,0,5.7
+			c2.6-0.8,5.2-1.8,6.6-4.2c0.7,0.2,2,0.5,2.7,0.7c-0.1,0.4-0.3,1.2-0.4,1.6c-0.8,0.8-1.5,1.6-2.2,2.4c-1.9,2.8-4.3,5.5-7.9,5.6
+			c0.1-2,0.2-4.1,0.3-6.1c-5,0.4-6.7,6.1-11,8.1c-0.2-0.5-0.5-1.4-0.7-1.9c4.9-5.5,9.4-11.5,12.9-18.1
+			C627.7,340.5,629.8,337.8,631.7,335z"/>
+		<path class="st2" d="M1205.6,337.8c2.2-0.9,4.3-2.4,6.8-2.3c1.1,2,0,4.2-0.8,6.1c-1.1,2.4-4.3,1.9-6.3,1.3
+			c-0.3-1.4-0.4-2.8-0.5-4.2C1204.9,338.5,1205.4,338,1205.6,337.8z"/>
+		<path class="st2" d="M652.9,340c1.3-0.4,2.7-0.7,4.1-1c0.1,1.3,0.2,2.6,0.4,3.8c-1.9,1-4.6,1.4-5.6,3.6c-1.4,2.7-2.9,5.6-5.6,7.2
+			c-3.3,0-6.1,1.6-8.5,3.6c-0.4-0.6-0.8-1.2-1.1-1.9c2.1-3.6,5.3-6.4,8.9-8.4C648.4,345.2,650.7,342.6,652.9,340z"/>
+		<path class="st2" d="M1240.8,339.8c3.1,2.1,3.2,6.1,4.7,9.2c-1.2,0.3-2.3,0.6-3.4,0.9c-1.4-1.1-2.8-2.3-4.2-3.4
+			c0.8-0.9,1.6-1.8,2.4-2.7C1240.4,342.6,1240.6,341.2,1240.8,339.8z"/>
+		<path class="st2" d="M1227.3,341.3c2.2-0.1,4.7-0.3,6.6,1.1c-1,1.4-2,2.9-3,4.3c-1.3-0.4-2.5-0.8-3.8-1.1
+			C1227.2,344.2,1227.3,342.7,1227.3,341.3z"/>
+		<path class="st2" d="M653.7,357.9c-1.4-6.9,5.5-10.8,9.1-15.5c0,0.5,0.2,1.6,0.2,2.1C660.4,349.2,657.1,353.6,653.7,357.9z"/>
+		<path class="st2" d="M1213.2,345.1c2.3-0.9,7-2.1,6.7,1.9c-1.3,2.6-4.5,1.6-6.7,0.9C1213.2,347.2,1213.2,345.8,1213.2,345.1z"/>
+		<path class="st2" d="M1246.9,355c2.6,1.7,5.3,3.4,8.5,3.6c0,0.6,0,1.7,0,2.3c-2.2-0.1-4.3-0.1-6.4-0.1
+			C1248.2,358.8,1247.5,356.9,1246.9,355z"/>
+		<path class="st2" d="M644.5,359.6c2.3-0.5,5.1-0.8,6.9,1c-10.6,11.7-24,20.6-38.5,26.7c-2.7,0.5-4.5-3-2.5-4.8
+			c2.9-2.1,6-4,8.5-6.6c1.7,1.1,3.3,2.4,5.2,3.3c1.7,0.6,2.7-1.2,3.7-2.3c2.5-3.4,5.4-6.5,8.2-9.6
+			C638.7,364.7,641.1,361.5,644.5,359.6z"/>
+		<path class="st2" d="M627.8,364.2c2-1.1,4.1-2.2,6.2-3.2c-1.9,5-4.6,10.6-9.7,12.8c-0.8-1.5-1-3.3-1.2-5
+			C624.1,366.8,626.1,365.6,627.8,364.2z"/>
+		<path class="st2" d="M1240.7,362.6c2.5-0.3,5.5,1.1,5.2,4.1c-2.2,0.5-4.5,0.8-6.8,0.1C1239.4,365.3,1239,363.3,1240.7,362.6z"/>
+		<path class="st2" d="M610.6,367.5c3.1-1.6,5.9-3.8,9.4-4.5c-1.1,3-2.4,6.1-4.7,8.4c-2,1.5-4.7,1.8-6.8,3.1c-2,3-2.8,6.8-5.7,9.2
+			c-3.1,2.5-6.2,5.1-8.5,8.4c1,0,2.9,0,3.8,0c-4.2,0.7-8.2,1.8-12.4,2.7c-0.1-1.1-0.2-2.2-0.4-3.3c-0.8-0.5-1.6-1-2.5-1.6
+			c0.6-0.9,1.2-1.7,1.8-2.6c1.4,0.4,2.9,0.9,4.3,1.3c0.1-1.6,1.1-4-1-4.8c-2.6-1.7-4,2-5.9,3.2c-3.3,2.1-5.1,5.6-7,9
+			c-4.1,0.1-8.3,0.1-12.4-0.1c0.5-2.9,2.6-4.4,5.3-5.1c0.2-1,0.4-2,0.7-3c0.3-3.4,3.8-4.9,5.6-7.5c2.1-0.6,4.2-1,6.3-1.4
+			c0.5,2,1,3.9,1.5,5.9c-0.2-2.1-0.3-4.3-0.4-6.4c8.2-1.4,15.5-5.8,22.1-10.6C606.1,368.1,608.5,368.8,610.6,367.5z"/>
+		<path class="st2" d="M526.4,374.6c-2.5-2.6,1.2-5,2.6-7.1c0.5,0.3,1.3,1,1.8,1.3c-0.2,1.3-0.5,2.7-0.7,4
+			C529,373.7,528,375.1,526.4,374.6z"/>
+		<path class="st2" d="M758.6,378.6c2.5-1.5,2.1-4.7,2.3-7.2c0.7,1.1,1.4,2.1,2.2,3.2c2.4,2.7,6.1,3.8,9.5,4.5
+			c2.9,0.6,5.8,0.7,8.7,0.8c0.1,3.6,0.1,7.3-0.2,10.9l-1.3-0.1c-0.2-2.5-0.7-5-2.7-6.7c-1.1,2-2.2,4.1-3.2,6.2
+			c-3.8-0.1-7.5-0.2-11.3-0.7c-0.5-1.2-1.1-2.3-1.6-3.5c-3.9,1.9-8,4.1-12.4,3C751.3,385.1,754.7,381.5,758.6,378.6z"/>
+		<path class="st2" d="M535.3,373.3c0.4-0.2,1.1-0.5,1.5-0.7c3.8,2.3,8,4.2,12.4,5.3c0.2,0.6,0.6,1.8,0.7,2.4
+			c-3-0.4-6.1-1.2-9.1-0.6c-2.1,2.9-1.1,7.6-4.6,9.5c-2.4,1.7-5.3,2.7-8.3,2.7c-1.8-0.5-3.6-1.2-5.4-1.8c0.4-0.5,1.3-1.5,1.7-2
+			c1.4-1.7,2.6-3.4,3.8-5.2C530.2,379.6,532.7,376.4,535.3,373.3z"/>
+		<path class="st2" d="M1230.5,382.1c0.6-3.4,2.6-6.6,6.3-7.1c-0.7,3.6-1.9,7.3-0.5,10.8c-0.3,0.4-1,1.3-1.4,1.8
+			C1233.3,385.7,1231.9,383.9,1230.5,382.1z"/>
+		<path class="st2" d="M522.4,376.3c2.9-0.4,3.5,4,1.2,5.2c-1.2,0.1-2.3,0.2-3.5,0.3C520.2,379.8,520.3,377.4,522.4,376.3z"/>
+		<path class="st2" d="M693.7,379.6c2.4-0.1,4.7-0.3,7.1-0.1c0.8,0.1,2.3,0.3,3,0.4c-0.5,0.8-1,1.5-1.5,2.3c0.1,2,0.8,4.2-0.3,6
+			c-1.1,3.1-5,1.9-7.5,2.3c0.7-2.4,1.5-4.7,2.3-7c-0.8-0.1-2.4-0.3-3.2-0.4C693.6,382.1,693.7,380.4,693.7,379.6z"/>
+		<path class="st2" d="M1247.3,380.4c0.9,0.5,1.8,1,2.7,1.5c0.8,3,2,6,3.9,8.5c0.3,0.6,1.1,1.7,1.4,2.2l0,1c-2.5,0-5,0-7.5,0
+			c1-4.3-1.4-8-2.8-11.9C1245.6,381.3,1246.8,380.7,1247.3,380.4z"/>
+		<path class="st2" d="M561.5,380.4c1.6,0.1,3.2,0.1,4.8,0.3c0.1,0.5,0.2,1.5,0.2,2c-3.2,4-5.2,8.7-8.1,12.9
+			c-6.5,0.9-13.3,0.2-19.5-2c0.6-1.3,1.2-2.6,1.9-3.9c1.4-0.2,2.8-0.4,4.1-0.5c0.9-1.8,0.5-4.9,3-5.5c3.2-0.4,6.4,0.2,9.6-0.4
+			C559,382.5,560.2,381.4,561.5,380.4z"/>
+		<path class="st2" d="M1020.5,384.7c1.9-0.5,3.8-0.8,5.8-1.2c0,1,0.1,2.9,0.2,3.8c-0.3,1.3-0.8,2.7-1.1,4c-1.5,0-3.1-0.1-4.6-0.1
+			C1020.5,389.1,1019.8,386.9,1020.5,384.7z"/>
+		<path class="st2" d="M24.9,387.1c1.5,0.3,2.9,0.6,4.4,0.9c0.3,3.1,0.2,6.2-0.3,9.3C26.7,394.4,23.7,391.1,24.9,387.1z"/>
+		<path class="st2" d="M1497.6,477.8c8.2-3.4,16.1-7.6,24.6-10.3c0.5,1.5,1.1,3,1.6,4.5c-1.5,2.3-3.4,4.4-4.4,7
+			c1.5,2.1,3.8,0,5.7-0.4c0.8,2.6,1.5,5.3,2.4,7.9c-0.5-0.2-1.4-0.7-1.9-0.9c-2.8-1.7-3.3,1.8-4.5,3.6c-0.8,2-3.2,2.4-4.9,3.4
+			c0.4,1.6,0.8,3.2,1.2,4.8c3.4-3.2,7.8-5.1,12.3-5.9c0.7,2.5,1.6,5,2.5,7.5c-0.7,1.3-1.3,2.5-1.9,3.8c0.9,0.7,1.7,1.4,2.6,2.1
+			c-0.6,1.5-1.5,2.9-1.4,4.6c1.3,1.2,2.8,2.1,4.2,3.2c0.1-0.4,0.2-1.3,0.3-1.7c3.1,10,6.5,20,9.9,29.9c-3.3-0.1-6.2,1.3-8.2,4
+			c0.4,2.3,2.6,6.2-1,6.8c-3.2,0.2-2.7-3.4-2.6-5.6c0.1-4.4,2.6-8.2,4.1-12.2c-0.3-0.3-1-0.8-1.3-1c-2.4,1.6-4,4-5.8,6.2
+			c-1.3,0.3-2.8,0.4-3.9,1.2c0.6,2.7,1.6,5.4,2.1,8.1c0.1,2.1,0.3,4.2,0,6.4c-0.9,1-2,1.9-3,2.9c0,1,0,2,0.1,3.1
+			c1.4,1.1,2.8,2.2,4.2,3.3c-0.4,1.6-0.8,3.2-1.2,4.9c-5,0.8-10.2-0.6-15.1,0.9c0.2,1.9,0.1,4,1.7,5.4c1.5,1.9,4.8,4.1,2.8,6.8
+			c-1.8,3.1-5.7,1.5-8.3,0.7c-0.5-1.4-0.9-2.7-1.3-4.1c0.6-3.4,3.1-6.7,2.3-10.2c-0.7-2.7-4-2.4-6.1-3.1c-2.6-8.9-5.1-17.8-7.1-26.8
+			c2.6-2.3,4.9-5,6.5-8.2c-2.6,0.7-5.1,1.4-7.6,2.2c-0.1-0.9-0.3-1.9-0.4-2.8c-0.7-2.3-1.6-4.5-2.4-6.7c-2.3,0.5-3.7,2.2-4.6,4.2
+			c1.6,0.7,3.1,1.4,4.7,2c-1.9,7-4.2,13.8-6.4,20.7c-1.8,3.5-3.2,7.1-4.5,10.8c-3.1-1.8-2.2-5.5-2.6-8.4c-2,0.9-3.7,2.2-4.9,4
+			c-1.3,0.6-2.7,2.4-4.2,1.7c-0.4-1.6-0.5-3.1-0.7-4.7c-0.3-0.2-1-0.7-1.3-0.9c-0.7,0.7-1.3,1.3-2,2c0.6,1.3,1.2,2.6,1.8,4
+			c-0.6,0.7-1.3,1.3-1.9,2c-1.8-2.9-3.6-5.8-6.2-8c0.4-1.3,1.1-2.4,2.1-3.2c2.7-1.3,5.7-2.1,8.2-3.7c0.5-1.3,0.3-2.8,0.5-4.2
+			c-2.6,0.7-5.1,1.6-7.4,2.9c7.8-20.2,16.1-40.3,22.7-61C1490.6,480.4,1494.4,479.4,1497.6,477.8 M1493.1,485.1
+			c-0.4,2.3,2.3,2.1,3.8,2.8C1496.3,486.2,1495.4,483.4,1493.1,485.1 M1502.4,485.4c-1.3,2.7,5.3,2.8,4.4,0
+			C1505.5,485,1503.2,483.8,1502.4,485.4 M1509.3,485.1c0,1.2,0,2.4,0,3.6c1-0.1,2.1-0.1,3.2-0.2c0.1-1.1,0.2-2.3,0.3-3.4
+			C1511.7,485.1,1510.5,485.1,1509.3,485.1 M1496.3,492.4c0,1.8,0,3.5,0,5.3c0.6,0,1.9,0,2.5,0c0.5-1.8,0.8-3.6,1-5.4
+			C1498.6,492.3,1497.4,492.3,1496.3,492.4 M1505.6,504.6c-1.8,1.4-3.6,2.9-5.2,4.4c0.9,0.8,1.8,1.7,2.8,2.5
+			c2.8-2.6,3.5-6.6,5.6-9.7c1.8-0.5,3.6-0.6,5.5-0.9c-1-2.8-4.7-2.3-6.7-4C1505.1,498.8,1505.2,501.9,1505.6,504.6 M1498.9,498.7
+			c0.2,2.1,0.4,4.1,0.6,6.2c1.5-0.9,3.3-1.9,3.3-4C1503.1,498.8,1500.3,498.8,1498.9,498.7 M1524.5,504.6c1.1,1.8,3.6,0.6,5.3,0.6
+			c-0.4-1-0.8-2-1.2-3C1527,502.4,1523.7,502.1,1524.5,504.6 M1516.2,505.2c0.1,3.1,0.2,6.3,0.2,9.4c0.6,0,1.7,0.1,2.2,0.1
+			c-0.1-0.8-0.2-1.6-0.3-2.4c0.8-0.7,1.6-1.4,2.4-2.1c-0.9-1.6-1.8-3.3-2.6-4.9C1517.7,505.3,1516.7,505.3,1516.2,505.2 M1498,517
+			c1.6,2.1,4,3.1,6.3,3.9c0.1,0.7,0.2,2,0.2,2.6c1.1,0,2.2,0.1,3.4,0.1c0.5-0.8,1.1-1.7,1.6-2.6c-0.8-2.9-1.9-5.8-2.3-8.8
+			C1503.5,512.4,1500.5,514.5,1498,517 M1480.6,521c-0.4,1.7,1.7,2.4,2.5,3.7c2.3-2,3.5-5.8,1.3-8.2
+			C1481.5,515.2,1480.7,518.9,1480.6,521 M1532.2,529.2c1.5-0.4,3.8-0.2,3.9-2.3c-1.9-2.5-4.1-4.8-5.4-7.7
+			C1529.2,522.6,1531,526,1532.2,529.2 M1513.1,521.9c-0.2,2.8,0.4,5.7,1.9,8.1c0.9,2.3,3.9,2.4,6.1,2.2c2.2-2.3,3.1-5.5,4.5-8.3
+			c-0.2-0.5-0.7-1.6-0.9-2.1c-1,1.6-1.8,3.3-2.7,4.9C1518.9,525.3,1516.6,522.4,1513.1,521.9 M1510.1,532.1c-0.1,2,0,4,0,6
+			c0.7,0,2.1,0,2.8,0c-0.2-1.8-0.1-3.7,0.3-5.5C1512.3,531.6,1511.1,530.8,1510.1,532.1 M1485.3,532.3c-0.4,0.4-1.3,1.3-1.8,1.7
+			c1.3,2.2,4.8,1.6,5.4-0.9C1488,532.3,1486.5,531.7,1485.3,532.3 M1514.4,544.1c0.8,1.8,1.6,3.5,2.4,5.3c0.9,0.1,1.9,0.2,2.9,0.3
+			c-0.1-1.4-0.1-2.7-0.2-4.1C1517.8,545.1,1516.1,544.6,1514.4,544.1z"/>
+		<path class="st2" d="M593.9,471.4c0.9-1.7,3.1-3.8,4.7-1.5c0,2.8-3.2,3.8-4.2,6.1c2.2,0.9,4.5,1.7,6.9,2.2c2.1-1.3,0.1-4.1,0-6
+			c2.6,1.3,5.3,3.1,8.3,2.5c0.8-1.7,1.3-3.4,1.9-5.1c1.9-0.1,3.8-0.2,5.8-0.2c0.8,0,2.3,0,3.1-0.1l-0.1,0.4c-0.9,3.9-5.2,4-7.6,6.2
+			c2,2.4,4.3,4.4,6.5,6.6c1.1-0.6,2.2-1.2,3.4-1.8c1.3,0.3,2.6,0.6,4,0.9c1.9-3.1,2.9-6.6,3-10.2c2.3,0.2,4.6,0.5,6.9,0.8
+			c1.2,0.2,2.4,0.4,3.5,1c1.2,0.6,2.5,1.3,3.7,2c-0.6,1-1.2,1.9-1.8,2.9c0.9,1.1,1.7,2.2,2.6,3.2c1,0.8,2.3,1.2,3.6,0.7
+			c1.8,0.3,3.5,0.8,5.3,1.4c-2.6,1.2-5.2,2.6-8.1,3.1c-2.7-0.2-4.1-3-5.8-4.8c-1-1.7-2.8-2.5-4-0.7c-1.6,1.4-3.5,2.5-5.4,3.4
+			c0.1,1,0.2,2,0.3,3.1c-1.7,2.6-3.3,5.2-4.9,7.9c-12.3-5.2-26-7-39.2-5.5c1.6-0.4,3.3-0.9,4.9-1.3c-0.1-0.6-0.4-1.7-0.6-2.2
+			c-2.5-2.2-4.1-6.3-8-5.2c-0.1,1-0.1,2-0.2,3c1.6,0.5,3.2,1.1,4.8,1.7c-0.9,1.5-2,3.2-4,3.2c-3.8,0.3-7,2.2-10.1,4.1
+			c-5,1.7-10.5,2.5-14.7,5.9c-2.4,1.9-4.7,3.8-7.3,5.3c-4-0.6-7,2.2-9.9,4.5c1.1-2.4,2.3-5,0.7-7.5c0.2-2.1,1.1-4.3,0.1-6.3
+			c-2.2-1-4.8-0.7-7.2-0.5c-1.1,2.4,1.2,3.3,2.9,4.3c0.1,0.6,0.4,1.8,0.6,2.4c-0.4,2.3-1.3,4.4-1.8,6.7c1.1,2,3,3.5,4.5,5.2
+			c-0.5,0.5-1.4,1.5-1.9,2c-1.5,0.2-3,0.6-4.5,0.4c-1.8-0.7-3.1-2.4-4.5-3.7c-0.4,0.1-1.2,0.4-1.6,0.5c-2,0.1-4-0.3-5.8-1.1
+			c-1.8,3.2-4.7,5.5-8.4,6.2c-0.7-1.2-1.4-2.4-2.1-3.7c-1.1-0.3-2.2-0.5-3.3-0.8c1.3,2.6,2.7,5.2,4.7,7.3c6.2-1.5,12.8-1.8,19-0.2
+			c-1.1,0.8-2.2,1.7-3.2,2.5c0.5,0.9,1,1.8,1.5,2.6c-1.2,1.6-2.3,3.2-3.3,4.9c-1.3,0-2.5,0.1-3.8,0.2c-0.2,2.1-0.3,4.2-0.5,6.3
+			c-1.9-1.2-2.9-3-2.7-5.2c-1.1-0.1-2.1-0.3-3.2-0.4c-0.5-0.9-1-1.9-1.4-2.8c-0.5,0.1-1.6,0.2-2.2,0.3c0.3,2.3,0.6,4.6,1,6.9
+			c-1.3-0.3-2.7-0.6-4-0.9c-0.1,0.5-0.2,1.6-0.3,2.2c-1.1,0.3-2.3,0.7-3.4,1c0.1,1,0.2,2,0.3,3c-1.4,1.6-2.9,3.1-4.3,4.7
+			c0.7,1.4,1.3,2.8,2,4.2c-3-0.6-6.1-2.9-9.1-1.3c-3.2,1-6.2,2.8-7.5,6.1c1.1,0.5,2.2,0.9,3.3,1.4c-0.2,0.8-0.5,2.3-0.7,3.1
+			c-1.6-0.4-2.4-2.2-3.6-3.2c-0.3-0.3-0.9-1-1.2-1.3c-1.5-1-3.1-1.6-4.8-2.3c2.1,3.7,2.4,8.6-0.7,11.9c-1-2.3-1.6-4.6-1.4-7.1
+			c-0.7-0.7-1.4-1.4-2-2.2c-0.3-0.5-0.8-1.5-1-2c0-2.3,0.5-4.5,1.1-6.7c-0.2-0.3-0.6-1.1-0.8-1.4c-0.1-1.1-0.1-2.2-0.1-3.3
+			c0.7-0.1,2.1-0.4,2.8-0.6c0.2-0.6,0.6-1.9,0.8-2.5c0.6-0.4,1.3-0.9,2-1.3c0.1,0.7,0.3,2,0.4,2.7c-0.4,0.7-1.2,2.1-1.6,2.8
+			c2.6,1.1,5.4,1.3,8.2,1.1c0.2-0.4,0.6-1.1,0.7-1.4c0.3-0.6,0.9-1.7,1.2-2.3c-2.3-1.5-4.6-3.1-6.7-4.9c1.9-0.2,4-1.2,5.8-0.3
+			c1.9,1,3.5,2.3,5.2,3.6c1.2-0.8,2.4-1.6,3.7-2.4c0.6,0.6,1.1,1.1,1.7,1.7c-1.2,1.3-2.1,2.9-3.7,3.7c-1.5,0.1-2.9,0-4.4,0
+			c0,0.6,0,1.9,0,2.5c2.2,0.6,4.4,1.6,6.8,1.6c1.3-0.6,2.5-1.5,3.6-2.3c1.3-2.3,2-4.9,2.6-7.5c0.6-0.1,1.8-0.2,2.4-0.2
+			c-1-2-2.1-4-3.5-5.7l-0.6-0.2c-1,0.7-2,1.4-2.8,2.3c-0.4,0.5-1.2,1.4-1.6,1.9c-2-1.4-4.5-2.5-5.5-4.9c-0.8-1.1-0.8-3.3-2.5-3.3
+			c-1.8,0.4-2.9,1.9-4.3,3c-0.7-0.2-1.4-0.5-2.2-0.7c1.2-3.4,0.8-6.9,0.9-10.4c1.2-2.1,3-3.9,4.6-5.7c1,0.3,2.1,0.6,3.1,0.9
+			c1.5,1.7,3,3.5,4.7,5c0.9,0.8,1.9,1.7,2.8,2.5c-0.1,1.5-0.2,3.1-0.3,4.6c3.3-0.5,6.8-0.9,9.8-2.8c1.4-0.9,0.5-3.7-1.2-3.5
+			c-1.5,0.5-2.9,1.4-4.2,2.2c0.3-1.6,0.6-3.3,1-4.9c-3-0.6-5.2-2.3-5.6-5.4c-1.5-0.8-3.1-1.6-4.6-2.4c0.8-1.1,1.5-2.2,2.3-3.3
+			c0.8-0.7,1.7-1.4,2.6-2c1.1,2.2,2.6,4.3,4.3,6.1c1.3-1.9,3.1-3.6,3.8-5.9c0.2-2-1.8-3-3-4.3c9.3-7.1,19.6-13.2,30.6-17.4
+			c-2,2.1-4.2,4-6.5,5.8c0.3,2.1,0.7,4.2,1.1,6.3c1,0.5,2,1,3.1,1.5c-0.1-1.7-0.2-3.4-0.3-5c3.3-3.4,6.7-6.7,8.7-11
+			c3.5-1.2,7-2.9,10.7-3.4c4.3,0.1,8.2-1.7,12.4-2.4c7.5-1.8,15-3.2,22.7-3.5C590.1,469.3,592.1,470.4,593.9,471.4 M560.5,475.4
+			c-1,0.8-1.2,3.1,0.3,3.3C562.9,478.6,562.8,474.1,560.5,475.4 M636.2,475.3c-2.9,1.6,2.9,4.2,3.4,1.8
+			C640.2,474.8,637.6,473.7,636.2,475.3 M568.3,479.4c0.1,2.6,1.6,5.4,4.6,4C572.1,481.4,571,478.8,568.3,479.4 M553.4,484
+			c-0.6,2,0.6,3.3,2.3,4.1c0.8-1.9,1-4,1-6C555.6,482.6,553.3,482.2,553.4,484 M564.2,484.9c0.6,1.4,2.5,0.4,3.6,0.6
+			c-0.3-0.7-1-2.2-1.4-3C565.1,480.5,562.6,483.5,564.2,484.9 M558,490.5c-1.4,1.1,0,4,1.7,3.1C561,492.6,559.6,489.8,558,490.5
+			 M541.1,491.3c-1.4,1,0.1,3.6,1.6,2.4C544.1,492.7,542.6,490.1,541.1,491.3 M518,497.1c0.8,1.3,1.7,2.7,2.6,4
+			c-1.1,2.3-2.1,4.7-3.1,7c1,0.8,2.3,2,3.6,1c2.1-0.7,1.4-3.1,1.4-4.8c0.7-1.5,3.3-3,2-4.8C522.8,497.8,520.5,495.6,518,497.1
+			 M531.3,500l-0.3,1c-1.3,0.3-2.6,0.5-3.9,1c-2.5,1.4-1.5,5.4,0.8,6.3c2.8-0.1,1.6-3.8,2.5-5.6c1,0.1,3,0.3,4,0.4
+			C535.3,500.9,533.2,500.2,531.3,500 M494.1,522.5c-0.1,0.3-0.3,1-0.4,1.3c0.8,1.8,1.5,3.7,2.2,5.6c0.4,0,1.2,0.1,1.6,0.2
+			c0-1.4,0.1-2.8-0.1-4.2C496.4,524.3,495.2,523.5,494.1,522.5 M510.4,529c0.9-2.1,2.6-3.9,2.8-6.2C510.6,522.2,508,527.2,510.4,529
+			 M515.4,526.1c1.6,2.8,4.7,3.4,7.7,3.1c-1.3-2-2.7-4-4.1-5.9C517.8,524.2,516.6,525.1,515.4,526.1z"/>
+		<path class="st2" d="M1231.7,471.9c1.1-0.2,2.2-0.3,3.3-0.4c0.3,1.6,0.8,3.2,1.2,4.8c2.6,8,5,16.1,7.7,24c-4.6,1.8-4.7-4.9-8-6.1
+			c-1.6-0.1-2,1.6-2.8,2.6c2.4,2.4,4.2,5.2,7,7.2c1.7,0.6,3.6,0.6,5.3,0.9c1.4,4.8,3,9.6,4.6,14.3c-3.5,1.8-6.4-0.6-9.2-2.4
+			c-1.2,4.2,3.4,6.3,4.4,9.9c2-1.3,4-2.6,6-3.9c2.2,6.8,4.3,13.6,6.8,20.2c-0.3,2.1-0.6,4.3-0.8,6.4c1.2,0.6,2.3,1.1,3.5,1.7
+			c4.1,13.1,8.8,25.9,13.2,38.9c2.5,6.4,3.4,13.3,6.6,19.5c-1.6,1-3.1,2-4.7,3.1c-0.8-1.9-1.7-3.6-2.7-5.4c-0.8,0.2-2.4,0.6-3.2,0.8
+			c0.1,2.1,0.2,4.2,0.3,6.3c-2,0.9-4,1.7-5.9,2.6c1.4,1.9,2.2,4.7,4.4,5.8c3.3-1.7,6-4.3,8.8-6.6c0,0.5,0.1,1.4,0.1,1.8
+			c0.1,1.7,0.4,3.4,0.7,5.1c1.4-1,2.8-2,4.2-2.8c0.4-0.1,1.3-0.3,1.7-0.4c2.2,7.1,4.7,14.1,7.3,21.1c-0.7,2.4-0.9,5.9-3.8,6.7
+			c-2.2-0.1-4.2-0.8-6.3-1.3c0,1.1,0,2.2,0,3.4c1.4,0.7,2.9,1.5,4.4,2.2c-0.2,1.7-0.5,3.5-0.7,5.2c0.3,0.2,0.9,0.7,1.2,0.9
+			c-1.3,2-3.7,4-3,6.7c0.9,1.3,2,2.4,3.1,3.6c-2.5,0.1-5.1,0.2-7.6,0.1c-0.9,2.1-1.5,4.3-1.8,6.6c1.3-1.2,2.5-2.4,3.9-3.4
+			c2.8-0.2,5.2,1.6,8,1.9c1.8-0.2,3.6-0.8,5.5-1.2c1.7,0.4,3.5,0.4,5.2-0.1c0.3-0.1,0.8-0.4,1-0.5c0.1-0.7,0.2-2.1,0.3-2.8
+			c0.6,1.9,1.3,3.8,1.9,5.6c0.2,1.6,0.4,3.1,0.6,4.7c-1.2-0.3-2.3-0.6-3.4-0.9c0.1,0.5,0.3,1.5,0.4,2c0.9,0.5,1.9,1.1,2.9,1.6
+			c-3.9,2.9-3.6,8.4-7.3,11.4c-0.2,0.1-0.8,0.3-1,0.4c-0.6,0.3-1.7,0.8-2.3,1c0-1.8,0-3.5,0.1-5.3c-1.7-0.7-3.7-1.4-4.6,0.7
+			c-2.7,3.1-1.8,7.2-0.3,10.6c-0.7,0-1.9-0.1-2.6-0.1c-0.3-1.2-0.5-2.4-0.7-3.6c-1-0.2-2.1-0.3-3.1-0.4c0.1-0.4,0.3-1.1,0.4-1.4
+			c1.3-3.6,1.6-7.7,4.3-10.7c0-0.4-0.1-1.3-0.1-1.7c1.2-0.6,2.7-3.1,3.8-1.2c-0.6,1.6-1.5,3.2-1.6,4.9c1.3-0.1,2.5-0.8,3.7-1.4
+			c0.2,1.2,0.5,2.4,0.8,3.6c3.4-0.6,2.8-4.4,2.2-6.9c-1.1-3-4.1-4.4-6.8-5.8c-1.9,1.6-3.9,3.2-5.8,4.9c-0.2,1.7-0.1,3.4-0.1,5.1
+			c-1.5,1.1-3,2.3-4.5,3.5c0.2-1.2,0.3-2.3,0.5-3.4c0-1.5,0-3-0.2-4.5c-0.5-1.3-1.2-2.6-1.8-3.8l-0.4-0.7c-0.5-0.3-1.5-1-2-1.3
+			c-1.8,3.2-4.9,7.1-2.4,10.8c0.4-0.5,1.3-1.6,1.8-2.1c0.5,2.2,1.2,4.4,2,6.6c-2,0.9-4,1.9-5.9,2.8c-0.8,0-1.6,0-2.4,0
+			c-0.2,0.5-0.7,1.6-0.9,2.1c-0.2,0.5-0.6,1.4-0.8,1.8l-0.5-0.7c-0.7-1-1.4-2-2.2-2.9c-1.7-0.3-3.4,0.2-5.1,0.5
+			c-0.3-1.4-0.7-2.7-1-4c0.3-0.2,1.1-0.6,1.4-0.8c2.1,0.6,4.2,0.9,6.3,1c1.6,0.5,3.5,2.5,4.9,0.7c1.6-1.5,0.2-3.8-0.3-5.5
+			c-1.5,0.5-3,1.2-4.6,1.4c-0.5-0.3-1.6-1-2.1-1.3c2.8-1.7,6.4-4.1,5.6-7.9c-0.3-2.6-3.5-1.9-5.3-2.4c-1.6-0.8-3.2-1.2-5-1.2
+			c-1.4,0-2.8,0.1-4.1,0.1c-1.6-5.1-5.7-9.7-5.3-15.3c1.9-0.8,3.9-1.2,6-1.7c-0.1-3.2-0.2-6.4-0.3-9.6c-1.4,0.5-2.8,1-4.2,1.5
+			l-1,0.3c-0.5,0.2-1.5,0.6-2.1,0.8c-0.6,1.3-1.3,2.5-1.9,3.8c-0.2-0.5-0.5-1.6-0.7-2.1c0.3-1.9,0.2-4.1,1.3-5.7
+			c2.9-2.3,7-0.2,10-1.9c1.1-2.7-3.5-2.7-5.1-3.9c0.2-1.1,0.4-2.2,0.6-3.4c0.7-1.7,0.3-2.9-1.1-3.5c-1.1,1-2,2.2-2.8,3.4
+			c0.6,1.5,1.2,3,1.9,4.5c-1.7,1.2-3.7,2-5.8,2.5c-0.6-1.3-1.2-2.5-1.8-3.8c-2.3-0.5-4.7-1.8-6.9-0.6c-5.1,2.7-11.1,1.4-16.6,1.6
+			c-6.9-0.3-13.8,0.6-20.7-0.6c-2.2-0.4-4.4-0.3-6.6-0.1c-0.3-0.8-0.6-1.7-0.8-2.5c-1.9,1.1-3.8,2.4-5.9,3.2
+			c-3.1,0.2-6.1-1.3-9.1-0.5c-4,0.8-8,1.4-12,1.9c1-3.3,3.5-5.7,5.8-8.2c-1-1-2.5-1.3-3.6-2c-1.4-0.5-3.2-2.6-4.3-0.5
+			c-0.7,0.6-1.3,1.3-1.9,2c2,0.5,4.2,0.9,5.8,2.5c-1.6,0.3-3.1,0.6-4.6,0.9c-0.7,2.5-1.3,4.9-1.8,7.5c-0.6-0.1-1.9-0.2-2.6-0.2
+			c-0.6-3.5-1-7-1.1-10.6c-1.7,0.4-3.4,0.9-5.1,1.3c-1.1-0.4-2.3-0.8-3.4-1.2c0.6,1.4,1.2,2.9,1.8,4.3c-3.2-0.5-6.4-0.9-9.6-1.2
+			c0.8-2.5,1.8-5,2.7-7.5c1.9,0.8,3.9,1.5,5.8,2.3c-0.1-2.6-0.2-5.3-0.3-7.9c-0.7-1-1.3-1.9-1.9-2.9c0.6-1.2,0.9-2.8,2-3.7
+			c3.1-0.8,6.2-1.8,9.1-3.2c-2.2-1.2-4.4-2.4-6.4-4.1c3.6-8.6,7.2-17.3,10.7-26c1.1,1.3,1.8,2.8,2.4,4.3l0.3-0.7
+			c1.8,1.8,4,3,6.6,3.3c0-3.2-1.4-6.1-3.1-8.8c-2,0.4-4,0.8-6,1.2c7.8-18.3,15.3-36.7,22.6-55.1c1.4-3.4,2.4-7,4.4-10.2
+			c3.6-2.4,8.5-2.5,11.4-5.9c2.3-1.9,1.9-5.2,3.4-7.6c2.7-1.3,5.8-0.4,8.4,0.7c-0.8,1.2-1.6,2.4-2.5,3.6c-0.3,0.2-0.9,0.8-1.3,1
+			c0.6,1,1.3,2.1,2,3.2c1.6,2.3,4.2,3.1,6.8,3.4c0.4-0.5,1.1-1.5,1.5-2c1-0.2,2-0.5,3-0.7c0.2,0.6,0.5,2,0.7,2.6
+			c1.5-1.1,2.9-2.3,4.4-3.4c-1.3-0.3-2.7-0.6-4-0.9c-0.7-1.9-1.3-3.9-2-5.8c1.6,0,3.3,0,4.9,0.3c1.6,1,3,2.4,4.6,3.5
+			c1.5,1.3,2.6-1.1,3.8-1.8c0.4-0.1,1.2-0.2,1.6-0.2c0-0.4,0-1.2,0-1.6c-4.3-1-8.7-1.3-13-1.6c0-0.4-0.1-1.3-0.1-1.7
+			c0.5-0.4,1.5-1.1,2-1.5c0.8-0.8,1.3-1.8,1.5-2.9c-1.1-0.9-2.4-1.7-3.6-2.5c0-2.9-0.3-5.8-1.2-8.5c3.3,1.8,6.4,4,9.6,6.1
+			c-0.3-2.4-0.9-4.8-1.6-7.2c-1.7-1.2-5.4-1.3-5.1-4c1.5-4,6.5-3.3,9.8-5C1232.1,475.9,1231.7,473.9,1231.7,471.9 M1230.9,482
+			c0.3,2.8,1.6,6.6,5.1,6.3C1238.5,485.2,1234,481.9,1230.9,482 M1227.1,502.9c2.3,1.4,3-1.4,4-2.9
+			C1228.9,499.5,1226.6,500.3,1227.1,502.9 M1230.6,520.2c1.4,1.4,3.1,2.7,5.2,1.6c1.1-2.3-1.7-3.6-2.8-5.2
+			C1232.1,517.9,1231.3,519,1230.6,520.2 M1190.3,520c-0.6,1.9-1,3.8-1.2,5.8c2,0.6,4.3,0.8,6.1,2c0.9,1.4,1.5,3.2,3.4,3.5
+			c0-2.1,1.2-4.7-0.1-6.5C1195.7,523.2,1192.9,521.7,1190.3,520 M1203.3,522.3c-0.4,2.5,0.2,4.8,2.2,6.5c-0.7,1.8-1.2,3.7-1,5.7
+			c-2.6,7.7-4.8,15.6-7.5,23.2c-6.9,21-15.5,41.4-23.5,62c-0.5-0.1-1.6-0.3-2.1-0.4c-0.2,1.1-0.4,2.2-0.6,3.3
+			c0.2-0.2,0.7-0.5,0.9-0.7c0.1,0.3,0.3,1,0.4,1.3c3.1-3.3,8-1.5,12-2c13.3-0.9,26.7-0.9,40-0.1c0.5,0,1.6,0,2.2,0
+			c0.5,0.4,1,0.9,1.5,1.3c-1,0.9-2,1.7-3,2.6c1.2,0.6,2.4,1.2,3.6,1.8c-0.8,0.5-1.6,1.1-2.4,1.6c-1.1-0.1-2.2-0.2-3.2-0.2
+			c-0.6-2.4-4.1-4.7-6.1-2.4c1,0.5,2,1.1,3.1,1.6c1.1,1.8,1.9,4,3.6,5.4c2.6,0.6,5.3,0.8,8,1.3c0.7-1,1.4-2,2.1-3
+			c2.2,0,4.5,0.2,6.7-0.3c0.5-1,0.9-2,1.3-3c-3.7-0.4-7.9,2.1-10.7-1.4c0.3-1.4,0.5-2.8,0.8-4.2c0.8,1.1,1.6,2.1,2.6,3.1
+			c1.3-2.8,1.4-5.8,0.5-8.7c1-0.8,2.2-1.5,2.8-2.7c-1.9-1.2-4.9-1.2-5.5-3.8c-1.4-2.4,1.1-4.2,2.1-6.1c-2.2-1.6-5,1.7-3.7,4.1
+			c-3.4-10.5-6.4-21.1-9.8-31.6c-2.7-9.9-6.5-19.6-8.2-29.7c-2.5-6.1-2-13.2-5.4-19c-0.1-1.8-0.3-3.6-0.4-5.4
+			C1205.3,522.5,1204.3,522.4,1203.3,522.3 M1230.3,526.3c-1.1,1.5-0.3,3.4,0.8,4.6C1234.2,530.3,1233.5,524.1,1230.3,526.3
+			 M1237.1,530c0.4,1.3,0.9,2.7,1.3,4c-0.6,2-1.9,4.2-0.7,6.3c1,0.2,2,0.4,3.1,0.5c1.3-1.5,2.3-3.4,1.6-5.4
+			C1240.2,534,1238.4,532.3,1237.1,530 M1220.2,533.2c-0.5,1.8-0.8,3.7-0.9,5.6c1-0.1,2.1-0.2,3.1-0.4c1.4-1.3,1.1-3.3,1.5-5.1
+			C1222.6,533.3,1221.4,533.3,1220.2,533.2 M1189.3,537.3c-0.8,1.8,0.6,6,3.1,4.1C1194.7,539.6,1191.6,535.2,1189.3,537.3
+			 M1231.3,537.2c-2,0.6-2,4.6,0.6,3.8C1234.2,541.4,1233.6,535.8,1231.3,537.2 M1179.3,540.6c0.1,1.2,0,2.5,0.5,3.6
+			c1,0.3,2,0.6,3.1,0.7c-0.2-1.6-0.5-3.2-0.9-4.7C1181.4,540.3,1180,540.5,1179.3,540.6 M1214,547.4c2,3,3.2,6.5,3.5,10.1
+			c1.4,1,2.8,2,4.2,2.9c2.5-2.1,8.5-1,8-5.5c-1.2-4.6-1.9-10.8-7.3-12.4C1218.5,541,1216.8,545.7,1214,547.4 M1235.1,545.2
+			c-1.8,0.3-1.2,3.4,0.6,2.7C1237.4,547.5,1236.9,544.7,1235.1,545.2 M1180.2,558.3c-0.1,1.6-1.8,4.2,0.1,5.2c2.7,0.9,2.4-3.3,2.4-5
+			C1182.1,558.5,1180.8,558.3,1180.2,558.3 M1232,576.1c1.4-1.5,3.4-3,3.6-5.2c-0.5-2.7-1.6-5.3-2.4-7.9
+			C1230.6,566.8,1231,571.8,1232,576.1 M1253.9,567.9c-0.5,1.2-0.5,2.6-0.7,3.9c2.4,1.2,4.4,0,5.6-2.2
+			C1257.4,568.5,1255.7,566.5,1253.9,567.9 M1260,573.2c0.3,1.7,1,3.3,2.1,4.6c0.8-0.4,1.7-0.8,2.5-1.2c0-1.1,0.1-2.3,0.1-3.4
+			C1263.2,573.3,1261.6,573.2,1260,573.2 M1238.2,575c-0.1,0.8-0.3,2.5-0.5,3.3c0.8-0.1,2.5-0.2,3.4-0.3
+			C1242.4,575.6,1240,575.2,1238.2,575 M1173.9,586.2c0.4-1.4,0.7-2.9,1.1-4.3c-1.6-0.1-3.1-0.1-4.7-0.2c-0.2-0.7-0.7-2-1-2.7
+			C1167.4,582.2,1171,585.3,1173.9,586.2 M1240.1,589.8c2.5,0.7,4-1.5,4-3.7C1242.8,587.1,1239,587.7,1240.1,589.8 M1177,587.2
+			c-0.1,2.4,1.4,3.7,3.7,3.9c0-1.3,0.1-2.6,0.2-3.9C1179.6,587.1,1178.3,587.1,1177,587.2 M1176.3,594.2c-0.2,2.4,2.7,2.2,4.2,1.5
+			c0.1-1.3,0.2-2.5,0.3-3.8C1179,591.8,1176.4,591.9,1176.3,594.2 M1248.1,595.8c1.4-0.1,2.9-0.1,4.3-0.5c1.2-1.6-0.5-3.6-2.3-2.9
+			C1248.2,592.3,1248.5,594.6,1248.1,595.8 M1166,598.7c1.5,0,3,0.1,4.5-0.1c1.1-1.4,3.3-3.8,1.1-5.4
+			C1168.7,593.3,1166,595.6,1166,598.7 M1259.8,598.2c1.2,0.8,2.7,0.4,4,0.6c-0.2-1.4-0.3-2.7-0.6-4.1
+			C1261.2,593.5,1258.5,596.2,1259.8,598.2 M1266.8,599.1c2.6,0.7,5.3,1.1,7.9,1.7c0-0.5-0.1-1.4-0.1-1.9c-2.1-1.2-3.7-3.4-5.8-4.4
+			C1266.2,593.9,1266.1,597.4,1266.8,599.1 M1242.1,598c-3.3,1.7-1.1,5.9,2.1,5.7c1.5-1.7,1.8-4.3,1.1-6.5
+			C1244.6,597.5,1242.9,597.9,1242.1,598 M1252.3,600.3c0.7,1.8,1.2,3.7,1.3,5.7c-1.3,0.2-2.9,0.4-3.5,1.7c-2.5,1-4.1,3.4-2.4,5.9
+			c3-2.2,6.7-3,10.4-2.8c0.4-1.5,0.9-2.9,1.3-4.4c1.5,3.9,5.8,2,8.5,0.6c-0.9-1.8-2.8-2.2-4.6-2.7c-1.1-1.2-2-2.5-3.3-3.5
+			c-2,0.3-2.6,2.5-2.9,4.2c-0.2-2.2-0.8-4.3-2.2-6C1254.1,599.5,1253.2,599.9,1252.3,600.3 M1171.3,600.2c-0.2,0.7-0.5,2.1-0.6,2.8
+			c-1.5,0.4-3.2,0.5-4.6,1.3c-0.5,2.3,1.8,2.5,3.5,2.7c0.5-0.8,1-1.7,1.6-2.5c0.7-0.1,2.1-0.3,2.8-0.4c-0.1-1.3-0.1-2.5-0.1-3.8
+			C1173.3,600.2,1172,600.2,1171.3,600.2 M1157,618c0.2,1.9,2,2.7,3.4,3.6c0.1,1.4,0.1,2.9,0.5,4.3c1.2,1.5,3.3,1.8,5,0.9
+			c0.1-1.8-1.5-3-2.4-4.3c1.2-0.9,2.4-1.7,3.4-2.7c-0.8-1.2-2.1-2-3.1-3l0.1-0.5l-0.9,0c-1-1.4-2-2.8-2.9-4.1
+			C1158.9,614.1,1157.6,615.9,1157,618 M1152.2,618.3c0,1.2,0,2.4,0,3.6c2.3,0.2,3.6-1.4,3.7-3.6
+			C1154.7,618.3,1153.5,618.3,1152.2,618.3 M1258.4,622.5c-1.3,1.4-2.6,2.7-4,4c0,0.5-0.1,1.4-0.2,1.8c0.6,0.1,1.8,0.2,2.5,0.3
+			c0.7,1.4,1.4,2.9,2.1,4.3c1.2-1,2.4-1.9,3.6-2.8c-0.3-0.7-0.8-2.2-1.1-2.9c-2.1,0.1-4.1,0.2-6.1,0.5c0.4-3.1,3.9-3.5,5.9-5.4
+			C1260.5,622.5,1259.1,622.5,1258.4,622.5 M1153.2,623c0.1,1.5,0.1,3.1,0.2,4.6c-0.3,0.4-1,1.2-1.4,1.5c-1.3,1.4-0.1,3.9,1.8,3.6
+			c2.4-0.1,1.2-3,1.2-4.5c2-0.3,2.9-2.2,2.9-4C1156.4,623.8,1154.8,623.3,1153.2,623 M1210.9,623c-2.1,2.8-3,6.2-2.7,9.8
+			c1-0.1,2.1-0.1,3.2-0.1c0.8-1.8,2-3.5,2.3-5.5C1213.5,625.3,1212.2,624,1210.9,623 M1175.6,624.6c-2.1,0.6-1.6,3.2-2.2,4.9
+			c-0.7,0.2-2.1,0.7-2.7,0.9c1.2,1,2.5,1.6,4,2.1c-0.4,0.2-1.3,0.7-1.7,1c1.2,2.9,4.7,0.9,5.6-1.3c-0.7-0.9-1.3-1.7-2-2.6
+			c0.8-1.4,1.6-2.8,2.2-4.4C1178.3,623.6,1176.8,624.1,1175.6,624.6 M1202.2,624c-0.2,3.7-1.9,7.1-1.4,10.8c-0.7,0.1-2,0.3-2.7,0.3
+			c0.3,0.3,1,1,1.3,1.4c0.2,1.2,0.4,2.3,0.6,3.5c3.3,0.3,5-3.1,7.1-5c-1.3-1.8-3.1-3.3-3.7-5.5
+			C1203.5,627.6,1205.7,623.8,1202.2,624 M1248.4,629.6c1.1,0.6,3.3,1.5,3.6-0.4c-0.3-2.3-1.4-4.4-3.1-5.9
+			C1247.9,625.1,1246.7,627.8,1248.4,629.6 M1196.3,625.4c-0.2,1.5-1.1,3.1-0.2,4.5c2.7,0.1,2.8-2.6,2.7-4.6
+			C1198.2,625.3,1197,625.3,1196.3,625.4 M1276.4,628.1l0,0.8c-4,1.9-7,5.4-11.6,6c-1.7,2.5-0.3,5.6,0.4,8.2c-0.8,0-2.4,0.1-3.2,0.1
+			c-0.1-1.8-0.2-3.6-0.3-5.4c-3,1.2-2.6,4.5-1.7,7c-0.3,1.3-0.6,2.7-0.9,4c1.1-0.4,3.6,0.1,3.5-1.8c2.7,0,4.7-1.7,6.2-3.9
+			c-0.9-1.7-2.6-3.7-1.2-5.6c2.1-2.5,5.3-0.2,7.9,0c1.4-0.7,1.8-2.5,2.7-3.7c1.2,0,2.5,0.1,3.8,0.2c-1.6,1.3-3.4,2.6-2.8,4.9
+			c0.8,3.1-2.8,3.9-4.5,5.5c1.5-0.3,3-0.7,4.5-1c2.3-3.4,3.9-7.2,4.6-11.2c-0.1-1.2-0.2-2.5-0.3-3.7
+			C1281.2,627.9,1278.8,627.6,1276.4,628.1 M1180.8,629.8c-0.1,0.4-0.2,1.3-0.3,1.8c1,0,2.1,0.1,3.2,0.2c-0.1-0.6-0.2-1.7-0.2-2.3
+			C1182.5,629.5,1181.7,629.6,1180.8,629.8 M1193.1,633.1c-1.7,1.8,1.1,4.7,2.7,2.8C1197.7,634,1194.9,631.4,1193.1,633.1
+			 M1182.3,634.2c-1,1-0.9,2.4-1.2,3.7c1.3-0.4,2.5-0.7,3.8-1.2C1185.6,634.9,1183.7,634.3,1182.3,634.2 M1254.3,636.4
+			c-1.6,0.6-2.6,3.7-0.2,4C1256.8,640.6,1256.7,635.9,1254.3,636.4 M1276.9,644.8l0.1,1.3c0,0.4,0.1,1.3,0.1,1.8
+			c0.2,2.5,0,4.9,0.2,7.4c1.3,0.6,2.7,1.3,4.1,2c0.3-1.4,0.6-2.8,0.9-4.2c-2.3-2.1-2.1-5.2-2.3-8
+			C1279.3,644.9,1277.7,644.8,1276.9,644.8 M1262.2,651.1c0.1,1.1,0.2,2.3,0.3,3.5c1.6,0,3.3-0.5,4.8,0.1c0.9,1,1.6,2.1,2.4,3.3
+			c-0.9,0.9-1.7,1.8-2.6,2.8c0.8,0.6,1.6,1.2,2.4,1.8c0.2,1.1,0.3,2.1,0.5,3.2c-1,0.9-2.7,1.4-2.8,3c1.4,1.9,3.3-0.1,4.7-0.8
+			c1.7-1.4,3.9-0.8,5.8-0.4c0.8-2,2.1-3.7,3.8-5c-0.5-0.3-1.5-0.8-1.9-1c-0.9,0.7-1.8,1.3-2.7,2c-2.1-0.9-3.2-2.5-2.8-4.8
+			c-1.7-1.6-2.3-3.8-3.1-5.9C1268.2,651.9,1265.2,651.6,1262.2,651.1 M1253.8,662.3c2.3,2,5.4,2.1,8.3,2.4c-0.9-1.6-1.7-3.5-3.5-4.3
+			C1256.7,659.7,1255.2,661.3,1253.8,662.3z"/>
+		<path class="st2" d="M1208.3,479.3c4-2.3,7.9-4.7,12.3-6.2c0.7,1.3,1.8,3.4,0.2,4.5c-5.1,4.6-10.8,8.6-16.8,11.8
+			c-2.9-1.8-2.1-5.7-2.6-8.6C1203.6,479.9,1205.9,479.4,1208.3,479.3z"/>
+		<path class="st2" d="M106.5,475.4c3.5,0,7.1,0.1,10.6,0.3c-1.4,0.3-2.8,0.6-4.2,1c2.9,0.1,5.8,0.2,8.6,0.3
+			c-0.2,1.1-0.3,2.1-0.5,3.2c0.7,0,2.2,0.1,2.9,0.1c0.2-0.8,0.5-2.4,0.6-3.3c3.8-0.1,7.5,0.1,11.3,0.4c-1.8,1.7-6.9,4-3.7,6.6
+			c3.6,1.3,6.4-2.7,7.8-5.5c4.9-1.1,10-1.8,15-1.5c6,0.2,12.3,0.8,18-1.6l1.1-0.4c1.8-0.2,3.6-0.3,5.3-0.4c0.9,1.9,1.9,3.8,2.3,5.9
+			c0.2,0.7,0.5,2.1,0.6,2.8c-1.2,0.7-2.4,1.4-3.7,2.1c1.7,1.8,4,2.5,6.4,2.8c3.8,9.6,8.1,18.9,12.2,28.4c1.4,3.9,3.4,7.5,5.3,11.2
+			c-0.8,0.3-2.3,1-3.1,1.3c0,1.5-0.1,3.1,0.2,4.6c0.9,1.8,2.7,2.9,4.3,3.9c1,0.1,2,0.2,3.1,0.3c1.3,3,2.7,6,4,9.1
+			c-0.9,1.1-1.5,2.8-2.9,3.2c-1.6-2.3-3-4.8-4.6-7.1c0.3,2.5,0.6,5,0.9,7.5c2,0.5,5.1-0.1,5.5,2.6c0.5,3.3,0.3,6.7,0.4,10.1
+			c1.8-1.9,3.7-3.7,5.8-5.2c1,1.8,1.9,3.7,2.7,5.6c-0.5,1.8-2.4,3.7-1.2,5.6c1.4,0.4,2.9,0.6,4.3,0.9c0.5,1,1,1.9,1.5,2.9
+			c-1.9,1.9-3.5,4.1-3.7,6.9c2-0.2,4.1-0.5,6.1-0.8c-0.2,2.1-0.3,4.2-0.5,6.3c1.6,0.5,3.1,1,4.7,1.5c1.2,3.1,2.8,6,4.2,9
+			c-1.1,0.6-2.1,1.2-3.2,1.8c0.4,1.5,0.9,2.9,1.3,4.4c-0.5,1-0.9,1.9-1.4,2.9c1,3.5-0.2,8.3-4.6,8c-1-1-2.1-1.9-3.1-2.8
+			c-0.6,2.5-1,5.1-1.2,7.7c1.9-0.3,3.9-0.5,5.9-0.6c2.6,0.1,5.9,2.1,8.1-0.1c0-2.3,0-4.7,0.1-7c2.3,0.2,4.4,1.2,6.1,2.9
+			c0.8,1.1,1.3,2.4,1.6,3.7c-1.1,2.2-2.3,4.5-2.7,6.9c2-0.3,3.9-0.7,5.9-1c1.3,3.6,3.1,7,4.8,10.4c-2,2.7-5,4.2-7.9,5.7
+			c-2,2.3-3.9,4.7-6.2,6.7c-0.4,0.4-1.3,1.1-1.7,1.5c-0.7-1.3-1.4-2.6-1.8-4c-0.4-1.7,1.6-2.4,2.5-3.4c1.5-1.2,2.8-2.7,4.1-4.1
+			c2.5-0.2,5-0.6,7-2.2c-1.9-1.7-3.9-4.4-6.8-4c-3,0.8-5.9,2.3-9,3c0.8-2.5,3.2-5.6,0.4-7.8c-2-2.4-5.2-0.7-7.2,0.7
+			c0.1,3,1.2,5.8,2.1,8.5c0.5,3,3.1,4.8,4.4,7.4c-0.5,3.4-2.1,6.5-3.2,9.7c-0.5,0.1-1.5,0.3-2,0.4c0-1.7,1.2-4.9-1.5-4.8
+			c-2.9,0.3-7.6-0.1-8.1,3.7c1.2,3,4.1,5.3,7.3,6c0.5,0.1,1.4,0.2,1.8,0.3c1.7,0,3.4-0.1,5-0.1c-0.1,2.6,0.1,5.3,0.6,7.9
+			c-3.2,0.9-6.3,2.3-9.5,3.2c-1.2,0.6-2.3-0.5-2.6-1.5c-0.1-2.1,0.4-4.1,0.6-6.2c-2.5,0.4-4.9,0.9-7.4,1.6
+			c-12.4-26-24.5-52.1-36.4-78.4c0.2-3.9,0.1-7.9-0.3-11.8c3.1,0,6.2-0.3,9.3-0.1c3.2,0.2,6,1.9,9.2,2.3c4.3-0.2,8.7-0.7,13-0.6
+			c0.6-3.8-2.4-6.4-3.8-9.6c-0.9-2.3,1.9-3.6,3.1-5.2c-0.3-0.8-0.6-1.6-0.9-2.4c-3.7,1.1-8.5,0.2-11.1,3.6c-1.1,1.3-1.7,2.9-2.3,4.5
+			c3.1-1.1,4.6-4.5,7.4-5.9c3.4,1.9,2.6,6.4,1.9,9.5c-0.4,2.7-3.8,3.1-6,2.9c-3.8-0.2-6.2-3.6-8.5-6.2c0.4-0.7,0.8-1.3,1.2-2
+			c-2-1.1-4-2.2-6-3.3c1.2-0.8,2.5-1.6,3.7-2.4c0.8,1.7,1.8,3.3,3.3,4.4c-0.3-1.6,0.6-4-1.2-5c-3.1-2-6.5-3.8-10.2-4.1
+			c-3.1,3.4-3.4,8.3-5,12.4c-2.1-1.2-4.3-2.4-6.4-3.7c-1.1-2.5-1.7-5.2-2.1-8c-2-2-2.7-4.8-3.5-7.4c-0.6-1.5-1.6-2.9-2.5-4.2
+			c-2.1,4.3-0.6,9-0.4,13.5c0.3,6.5,0.4,12.9,0.7,19.4c-1.5-0.7-3-1.5-4.5-2.2c0,1.4,0.1,2.8-0.1,4.1c-2.8,0.2-5.5-0.1-8.3,0.2
+			c-2.8,2.4-0.4,6.1,2.1,7.6c-0.2,0.5-0.7,1.6-0.9,2.2c-3.5,1.1-6.8,2.9-9.4,5.5c1,0.8,1.9,1.5,2.9,2.3c2.7-1.7,5.4-3.6,7-6.5
+			c0.9-0.5,1.8-0.9,2.8-1.4c-0.7-1.9-3.7-4.4-0.8-5.6c3.1,0.1,6.2,0.8,9.2,1.3c-0.2,2.4-0.6,4.9-1.3,7.2c-0.4,0.3-1.2,0.9-1.6,1.2
+			c-2-0.6-4.2-1.6-5.9,0.3c2.3,2.5,5,4.7,8.4,5.7c0,1.2-0.1,2.4-0.1,3.6c-2.1,0.6-4.1,1.1-6.2,1.7c-1,2.3-1.1,4.7-0.4,7
+			c1.5,0,3.1,0,4.6,0c-0.2-1.1-0.3-2.3-0.5-3.4c0.6-0.4,1.8-1.1,2.4-1.5c-0.1,2.7-0.2,5.4-0.4,8.1c-4.2,2.1-5.2,7.2-9.2,9.5
+			c-1,0.6-2,1.2-3.1,1.8c-0.2-2.4-0.1-4.9-0.7-7.2c-2.1-2.2-5.1-3.7-6.5-6.5c-1.4-2.6-2.5-5.2-3.9-7.8c1.1-0.5,2.2-0.9,3.3-1.4
+			c-0.4-2.1-1.4-3.9-2.9-5.5c-0.2-3.9-0.7-7.8-0.1-11.7c1.5-2.5,4.4-3.7,6.7-5.3c-0.3-0.8-0.7-1.5-1-2.3c-1.6,0.1-3.3,0.2-4.9,0.4
+			c0.1-1.7,0.1-3.3,0.2-5c1.7-0.2,3.4-0.5,5.1-0.7c-2-0.7-3.9-1.4-5.9-2.1c0.4-7.2,0.5-14.3,1.2-21.4c3.3,1.3,6.2,3.5,9,5.6
+			c-0.7-1.7-1.4-3.3-2.3-4.9c0.5-0.5,1-1,1.5-1.5c1.6-1,3.6-1.9,3.6-4.1l-0.1-0.9c-1.7,0-3.3,0-5,0c-0.3,1.2-0.6,2.4-1,3.6
+			c-1.3,0.1-2.6,0.3-3.8,0.4c-0.6-1.8-1.1-3.5-1.6-5.3c0.6-9.1,1.1-18.4-0.2-27.5c-1.1-8.7-6.6-17.3-15.3-19.8
+			c-0.7-1.1-1.4-2.2-2.1-3.4c-2.8,0.3-5.7,0.5-7.9-1.6c2.8-1.7,6.4-2.9,7.8-6.2c-2.6,0-5.4-0.1-7.9,0.7c-1.7,2.9-3.2,5.9-4.5,9
+			c-0.1-0.1-0.2-0.4-0.2-0.5C106.7,484.7,106.5,480,106.5,475.4 M173.3,481.2c1.6,0.8,3.3,1.4,5,1.9c-0.3-1.4,0.7-4-1.4-4.3
+			C175.4,479,174.4,480.3,173.3,481.2 M150.8,487c0.3,1.9,1.2,3.6,1.9,5.4c-0.6,1.5-2.1,2.4-3.3,3.4c0.1,1,0.2,2,0.4,3
+			c2.6-2.1,5.3-4.1,8.7-4.6c0.1-1.3,0.3-2.7,0.4-4c0.1-2-1.6-3.1-2.9-4.3c0.3-1.7,0.6-3.4,0.9-5.1
+			C153.4,480.3,151.9,484.3,150.8,487 M136.4,491.3c0,1.2,0,2.3,0.1,3.5c2.3,0.7,4.8,0.9,7.2,0.9c0-0.6,0-1.7,0-2.3
+			C141.9,491.1,139,491.3,136.4,491.3 M160.8,496c1.4,2.2,2.8,4.7,5.3,5.8c2.9-0.6,5.9-1.2,8.9-1.4c1.5,0.2,2.6-1.8,1.2-2.7
+			c-2.5-1.8-5.4,0.9-8,0.3C165.8,497.1,163.5,494.4,160.8,496 M136.1,497.1c-0.3,1.3-0.7,2.6-1,4c2.1,1,4.5,1.6,6.8,0.8
+			C142.3,498.8,138.1,498.6,136.1,497.1 M177.4,499.7c1.2,1,2,2.8,3.6,3.2c1.4-0.4,2.5-1.2,3.8-1.9
+			C182.6,499.4,179.9,498.3,177.4,499.7 M142.4,508.8c1.2,2,3.7,0.2,5.4,0c-0.3-1.6,0.6-4.6-2-4.5
+			C143.1,503.1,141.6,506.5,142.4,508.8 M155.5,507.1c1.8,1.9,4.1,1.8,5.7-0.3c-1-0.7-1.8-2.1-3.2-2
+			C157.2,505.5,156.3,506.2,155.5,507.1 M187.6,512.1c-0.3,1.8-0.9,3.5-2.4,4.7c1.1,0.7,2.2,1.6,3.5,1.8
+			C191.8,517.2,191.7,511.3,187.6,512.1 M175.1,515.4c0.1,2,1.2,3.7,3.4,4c2.3,0.8,3.4-1.6,4.7-3c-0.6,0.3-1.7,0.8-2.3,1.1
+			c-0.8-0.7-1.5-1.4-2.3-2.1C177.4,515.4,176.3,515.4,175.1,515.4 M148.1,520.9c0,0.8,0.1,2.4,0.1,3.2c1.4-0.4,4.2-1,2.9-3.2
+			C150.4,520.9,148.8,520.9,148.1,520.9 M138.1,524.1c-0.3,3.8,4,2.2,6.1,1.5c0.8,1.4,1.6,2.8,2.3,4.2c1.6-0.1,3.6-0.7,3.3-2.7
+			c-1.4-2-3.7-3.1-5.5-4.6c-0.4,0.3-1.1,0.9-1.4,1.2C141.4,522.9,138.4,521.2,138.1,524.1 M184.8,530.3c-1.7,0.2-5.7-0.5-5.3,2.3
+			c1.2,1.5,4,2.5,5.7,1.2c3.8,0.7,7.2,2.4,10.7,4c0.2-0.4,0.6-1.3,0.9-1.7c-0.6-1-1.1-2-1.6-3c0.3-1.3,0.5-2.6,0.8-3.9
+			c-2.3-0.4-4.5,0.3-6.5,1.3C188,530,185.8,528.2,184.8,530.3 M170.4,533c-0.5,3.1,3.3,2.6,5.2,3.6c1.2,2.5,1.6,5.5,2.9,8
+			c2,1.6,5,2.2,7.5,1.4c1.6-1.4,2.1-3.9,2.9-5.8c-2.9,0.1-6.9,2-9-1c-2.4-3.3-4.8-6.6-8-9.2C171,530.9,170.1,531.7,170.4,533
+			 M139,532c0.5,2.7,2.3,5.1,4,7.2l0.9-0.2C143.7,536.3,142.4,532.1,139,532 M146.1,532.3c-1.3,0.8-0.1,3.4,1.3,2.2
+			C148.8,533.6,147.6,531.1,146.1,532.3 M151.3,537.4c-1.8,1-0.2,3.2-0.2,4.7c1.6-0.8,4-1,4.7-3
+			C155.8,536.7,152.9,537.1,151.3,537.4 M158.4,537.3c-1.3,1.3,1,3.7,2.3,2.3C162,538.3,159.7,536,158.4,537.3 M166.1,541.3
+			c-0.2,1.3-0.4,2.6-0.7,3.9c2.1,1,4.2,2,6.3,3.1c1,0.4,2.5,0.6,3.4-0.2c0.9-1.5,0.5-3.3,0.3-4.8C172.2,543,168.9,542.9,166.1,541.3
+			 M187.1,548c-0.1,0.8-0.3,2.3-0.5,3.1c0.6,0.2,1.2,0.3,1.8,0.5c0.2,3.4,4.2,2.3,3.7-0.7C192.6,547.9,189,548.4,187.1,548
+			 M145.5,552.1c0.8,0.8,1.6,1.7,2.5,2.5c1.2-0.9,2.6-1.9,2.3-3.6C148.8,550.8,145.9,549.9,145.5,552.1 M137.8,555.5
+			c-2,1.7-2.1,6.1,1.2,6.1C143.2,561.8,141.9,554,137.8,555.5 M149.1,563.2c1.3,0.9,2.6,1.8,4,2.7c0.8-1,1.7-1.9,2.5-2.9
+			c-0.8-1.7-1.6-3.3-2.5-5C151.7,559.7,150.4,561.4,149.1,563.2 M214.2,565.2c-1.5,0.1-1.9,2.8-0.2,2.8
+			C215.5,568,215.9,565.3,214.2,565.2 M209.2,575.3c0,1.1,0.1,2.3,0.1,3.5c2.2,0,4.5,0.1,6.7,0c-0.7-1.2-1-2.7-2.3-3.3
+			C212.2,575.2,210.7,575.3,209.2,575.3 M194.8,580.3c-3.2-0.5-6.1,0.9-8.8,2.5c-1.3,0.7-1.7,1.7-1,3.2c3.9,0.3,6.9-3.2,10.8-2.7
+			c0.2,1-0.2,1.8-1.2,2.3c-2.6,1.6-3.9,5.5-3.4,8.2c2.6,0.7,5.3-1.4,7.9-2c-0.5,2-1.2,4-2.1,5.9c2.1-0.4,4.4-0.5,6.4-1.5
+			c1-1.3,1.4-3.1,2.8-4.1c0.9,2.2,1.9,4.7,4.8,4c-1.2-3.2,0.5-7.9-2.4-10.2c-0.8-0.5-1.7-1-2.5-1.6c-1.2,1.1-3.1,1.8-2.9,3.8
+			c-0.2,0.4-0.7,1.2-1,1.6c-0.3-3.6-0.1-7.2,0.6-10.8C200,577,197.7,581,194.8,580.3 M218.4,593.5c1.4,1.5,3.3,0.8,4.7-0.3
+			c-1.1-1.1-2.1-2.2-3.2-3.2C219.2,591,217.8,592,218.4,593.5 M145,597c-0.5,0.7-1.1,1.4-1.6,2.1c-1.6,0.2-4.2,0.8-4.1,2.9
+			c0.9,2.2,3.4,3,5.3,4.3c0.2,0.7,0.7,1.9,0.9,2.6c2.8,0.3,3.6-2,3.3-4.4c-0.8-0.2-2.2-0.7-3-0.9c2.2-1.9,5.6-3.9,4.7-7.3
+			C149.3,594.3,146.4,595.7,145,597 M202.6,598.5c-0.2,1.7-0.5,3.5-0.7,5.2c-1.4,0.3-2.8,0.6-4.2,0.9c-1.2,1.9-0.5,4.1-0.2,6.2
+			c-1.4,1-2.8,1.9-4.3,2.8c2.7,2.4,5.7,4.4,8.4,6.8c1.1,0.1,2.2,0.2,3.4,0.3c-0.7-5-2.3-10.1-1.4-15.1c1.1,0.6,2.1,1.4,3.2,1.9
+			c2-0.2,3.3-1.8,4.3-3.3c-1.3-0.5-2.6-0.9-3.9-1.4c-0.6-1.5-1.2-3-1.8-4.4C204.4,598.4,203.5,598.5,202.6,598.5 M220.1,605.9
+			c2.5-0.7,4.9-1.7,7.3-2.8c0.1-0.8,0.2-2.5,0.3-3.3c-0.7-0.4-2.1-1.2-2.8-1.6C222.1,599.9,220.9,602.9,220.1,605.9 M212.2,608.2
+			c0,0.6,0.1,1.9,0.1,2.6c1.4,0,2.9,0,4.3,0c0-0.6,0.1-1.8,0.1-2.4C215.2,608.3,213.7,608.3,212.2,608.2 M212.8,615.9
+			c-0.1,2.1-0.6,5.3,2.2,6c2.2-0.3,2.6-3,2.2-4.8C216.6,615.3,214.2,616.2,212.8,615.9 M203.4,625.9c0.5,3.7,0.5,8.5,4.6,10.1
+			c1.5-3.6,0.8-7.6-2.4-10.1c0.6-0.8,1.2-1.7,1.9-2.5c-0.2-0.3-0.5-0.9-0.6-1.2C205.7,623.4,203.1,623.9,203.4,625.9 M214.1,631
+			c1.8,1.3,3.7,3,6,2.5c2.3,0.2,1.3-2.7,1.6-4.1C218.9,627.8,216.1,628.9,214.1,631z"/>
+		<path class="st2" d="M427.4,475c1.7-0.7,3.4-0.7,4.1,1.3c-1.3,0.9-3.9,0.8-4.2,2.8c0.3,2,2.4,3.1,2.9,5c0.2,1.7,0.1,3.4,0.1,5.2
+			c-2.8,0-5.5-0.1-8.3-0.3c1.2-0.7,2.4-1.4,3.5-2.1c-3.1-2.9-6.1-6.1-8.4-9.8C420.7,476.6,424.1,475.9,427.4,475z"/>
+		<path class="st2" d="M1014,476.6c13.2-0.4,26.3-1.4,39.5-1c-0.4,4.7-0.8,9.3-0.8,14c-4.4-0.4-8.8-0.3-13.2-0.4
+			c-3.1-0.5-6.2-0.7-9.2-1.3c-1.9-1.1-2.4-3.6-3.7-5.2c-1.3,0.2-2.5,0.5-3.8,0.8c-0.6-1.2-1.2-2.4-1.8-3.6c-1.2-0.2-2.5-0.5-3.7-0.7
+			c0-0.5,0.1-1.5,0.2-2c-4-0.3-8.2-1.1-12.2-0.1c-1.9,3.1-4.9,5.1-7.3,7.8c-1.2,4.4-3.1,9.9,0.3,13.8c1.2,2,3.9,2.8,5.9,1.4
+			c2.9-1.8,7.8-3.6,6.6-7.9c-2.4-0.8-4.9-1-7.3-1.7c-1.4-4.9,2.3-9.5,6.6-11.4c1.9,2.7,3.2,5.9,5.9,8c2,0.5,4.1,0.5,6.1,0.7
+			c0.9,3.7,3,6.8,5.7,9.5c-4.7,7.3-5.4,16.4-5.5,24.9c0,29.8,0,59.7-0.1,89.5c-1.4,1-2.8,2.1-4.2,3.1c1.2,0.8,2.4,1.7,3.6,2.5
+			c-0.8,1.6-1.5,3.1-2.2,4.7c3.5,5.4,1.4,12.1,1.8,18.1c-0.3,3.9,1.6,9.1-2.7,11.3c0.6,1.2,1.2,2.4,1.7,3.6
+			c-1.4,1.4-2.9,2.5-4.4,3.7c-0.9-1.8-1.9-3.6-2.8-5.4c-0.8,0.6-1.6,1.2-2.4,1.8c-2.3-1.8-3.7-4.3-4.2-7.2c2.1-2.2,4.8,1.2,7.3,0.2
+			c-0.6-1.3-1.2-2.7-2.3-3.6c-2.9-0.7-6,1-8.9-0.2c-4.4-1.6-7.6-5.3-11.9-7c-0.8,2.6-1.8,5-2.4,7.6c0.8,2.2,2.3,4.1,3.5,6
+			c2.1-1.5,4.3-2.8,6.9-3.2c1.7,1.1,3,2.6,4.2,4.2c-3.1,1.3-4.4,4.1-4.3,7.3c3.1,0.4,5.7-1.2,8.4-2.5c2.7,1.1,5.1,3,7.6,4.6
+			c-0.8,2.9-2.5,5.3-4.4,7.7c-1.1,0.4-2.3,0.6-3.4,0.8c-0.5-1.9-1-3.8-1.6-5.7c-1.6,0.5-3.4,0.6-4.8,1.5c-0.9,1-1.1,2.5-1.5,3.7
+			c1.7,2.2,3.4,4.5,5.9,5.8c-1.8,1.9-3.6,3.8-5.6,5.4c-3.2-1.4-6.7-2.1-10-2.9c-1.2-3.4-1.5-7.1-3.1-10.3c-3.5,1.8-6.8,4.8-7.9,8.6
+			c0.4,2.4,2,4.4,3.2,6.4c0.9,0.3,1.8,0.6,2.8,0.8c0.8,1.6,1.6,3.2,2.4,4.9c-1.5,1.2-3,2.3-4.5,3.5c1.7,2.1,3.1,4.5,3.7,7.1
+			c0.3-0.1,0.9-0.4,1.2-0.5c0.3-1.1,0.6-2.2,1-3.2c1.6,1.3,2.3,3.1,2.6,5c-1.8,1.6-3.5,3.2-5.3,4.9c-0.3-0.5-1-1.4-1.3-1.9
+			c-0.5-0.8-1.1-1.5-1.6-2.2c-3.3-0.5-6.2-2.2-9.2-3.5c-0.2,0.4-0.7,1.1-1,1.4c1.2,0.6,2.5,0.9,3.9,1c1.1,1.8,2.2,3.6,3.2,5.4
+			c0.1,2.6-1.2,4.3-3.8,4.6c-1.4,1.4-2.7,2.9-4.1,4.4c-0.3-0.9-0.8-2.7-1.1-3.6c1.2-6.1,0.9-12.4,1.9-18.6c0.1-10,0.1-20.1,0-30.1
+			c0.1,2,0.4,4,0.6,6c4.3-0.6,7.5-3.7,10.8-6.2c0.7,0.3,2,0.8,2.7,1.1c0.8,1.4,1.6,2.7,2.4,4.1c1.1-0.2,2.2-0.4,3.3-0.7
+			c1.3-2.5,2.4-5.2,5.5-5.8c0-0.5-0.1-1.4-0.1-1.9c-3.9-2.1-6.8,1.5-9.8,3.4c-2.9-4.4,1.5-9.6-1.6-13.9c-1.6,1.6-3.6,2.9-4.5,5.1
+			c-0.5,2.1-0.3,4.3-0.3,6.5c-1,0-2,0.1-2.9,0.1c-0.7-2.5-1.4-5.1-2.2-7.6c-1.4,1.1-2.7,2.1-4.1,3.2c0.2-10,0-20,0.1-30
+			c0.5-2.4,1.5-4.8,2.1-7.2c-1-2.2-2.9-3.8-4.7-5.3c-1.9-0.2-2.4,2-3.4,3.1c-3.3,0.4-6.7,0.4-10,0.3c0.7-1.7,1.5-3.5,2.2-5.2
+			c-3.1-0.8-6.3-1.2-9.5-1.2c1.3,2.6,3.5,4.5,5.8,6.2c-5.6-0.1-11.2,0.5-16.8-0.1c-3.4-1.6-5.5-5.1-8.8-7.1
+			c-0.9,1.7-1.8,3.4-2.6,5.1c1.2,0.7,2.4,1.4,3.6,2.1c-1.9,0-3.7,0.1-5.6,0.1c-0.7-1.5-1.5-3-1.7-4.7c1-1,2.1-2,3.2-2.9
+			c-1.2-0.5-2.4-0.9-3.6-1.4c-0.7-1.9-1.6-3.7-2.8-5.3c-0.1-1.8-0.2-3.6-0.2-5.4c4.4,0.2,8.7,1.4,13.1,0.7c0.2,3.6-3,6.6-1.9,10.2
+			c1-0.9,2-1.8,3-2.7c3.7,2.4,8,3.1,12.4,2.9c2.2-3.4,5.2-7.1,3.7-11.4l0-0.4c6.5,0,13.1-0.3,19.6,0.5c0.8,0.1,2.3,0.2,3.1,0.3
+			c0-2.4,0-4.9,0-7.3c0.4-8,0.5-16.1,0.5-24.1c0.7-1,1.4-2,2.1-3c-0.8-0.8-1.6-1.5-2.3-2.2c-0.2-5.3-0.4-10.6,0-15.9
+			c0.8-7.7-0.5-15.5,0.3-23.2c1.2,1.2,2.5,2.4,3.8,3.6c0.2,1.9-1.1,6.2,2,5.8c2.6-2.1,5.4-3.9,8.7-4.9c1.5-0.5,0.7-2.2,0.6-3.3
+			c-0.9-4.1-1.4-8.2-1.6-12.4c-3.6-0.5-5.5,2.7-8,4.7c-2,0.8-4.2,0.6-6.3,0.8c-0.5-4.5-0.5-9.3-3.1-13.2c-0.2-0.4-0.6-1.1-0.8-1.4
+			c0.1-0.8,0.3-2.3,0.4-3.1c3.1,1.3,5.7,3.3,8.1,5.6c-1-3.3-2.3-6.5-4-9.5c-2.1,1.5-4.5,2.7-7,3.4c-2.5-4.1-7.4-5.8-11.9-6.7
+			c0.2-5.6,5.6-8.8,7.2-13.9C978.8,476.7,996.4,476.6,1014,476.6 M961.8,482.2c0.9,1.9,1.9,4.1,4.2,4.6c1.9,0,1.8-2.1,1.5-3.5
+			C966.5,481.1,963.7,482.3,961.8,482.2 M978.5,489.3c-0.4,1.1-0.8,2.2-1.2,3.3c0.9-0.2,1.8-0.4,2.8-0.6c1.1,3.4,3.1,8,7.5,7.6
+			c2.3-0.2,2.2-2.3,2-4.1c-1.9-0.1-4.2,1-5.7-0.6c-1.6-1.4-1.1-3.8-1.5-5.6C981.2,489.3,979.8,489.3,978.5,489.3 M1010.7,502.8
+			c-1.2,2.8,3,3.5,4.5,5c-0.1-2.1-2-5.4,1.3-5.5c0.1-0.4,0.2-1.3,0.2-1.8C1014.8,501.2,1012.5,501.5,1010.7,502.8 M979.3,505.4
+			c-2.2,1.9,5.7,6.1,3.6,1.8C982.1,506.4,980.4,504,979.3,505.4 M992.4,532.3c-1.8,0.8-0.9,3.1-1.2,4.7c2.5,0,3.9-1.9,4.7-4
+			C994.8,532.8,993.6,532.2,992.4,532.3 M986.5,571.3c2.4,2.5,1.4,6.3-0.1,9c-0.5,1.6-2.4,3.5-0.7,5c3.1,1.2,6.5,1.3,9.6,2.6
+			c-1.6,2.2-3.5,4.1-5.7,5.8c-1.6-0.2-3.1-0.4-4.6-0.6c-0.6,1.6-1.8,3.1-1.2,4.9c0.2,1.9,2.3,2.5,3.7,3.5c0,3,0.6,6.1,0.1,9.1
+			c-1.4,1.3-4.5,1.8-3.7,4.4c0.1,1.8,2.8,2,3.7,0.7c1.7-2.1,3.3-4.5,5-6.6c2.2,2.1,4.9,5.7,8.2,3.2c-2.2-2.5-4.5-5.1-5.3-8.4
+			c-0.3-0.4-1-1.1-1.3-1.5c-1.3-0.4-2.6-0.7-3.8-1c0.3-0.3,0.8-0.9,1.1-1.2c2.8,0.3,5.7,1.7,8.6,0.7c6.4-1.4,7.6-11,3-15
+			c-1.6-0.5-3.2-0.7-4.8-1.2c-1.2-1.3-1.3-3.4-1.9-5c-2.1-0.5-4.2-1.1-6-2.5c1.1-2.3,2.9-4.4,3.4-6.9
+			C991.9,567.5,988.5,569.9,986.5,571.3 M1011.9,570.2c1,2.1,2.4,4.1,4.4,5.3c2,0.7,4,0,5.5-1.4
+			C1019.5,571,1015.6,570.1,1011.9,570.2 M977.8,574c-0.9,2,0.8,3.4,2.2,4.4c0.2-1.5,0.4-2.9,0.5-4.4
+			C979.5,572.6,978.6,572.6,977.8,574 M977,599.2c-1.1,1.4,1.2,2.2,1.8,3.2c0.6-0.4,1.8-1.3,2.4-1.7
+			C980.3,599.6,978.5,597.8,977,599.2 M952.1,601c-1.1,1-1.3,3.6,0.8,3.3C955.7,604.7,954.5,600,952.1,601 M976.8,606.8
+			c-0.6,1.6,0.3,3.2,0.7,4.7c1,0,2.1,0,3.2,0.1c0-1.9,0-3.7,0-5.5C979.4,606.3,978,606.5,976.8,606.8 M937.8,610.9
+			c1.8,1.4,3.6,2.8,5.7,3.8c0.2-1.1,0.5-2.3,0.6-3.4C942.2,611,938.8,608.6,937.8,610.9 M1008.2,614.8c1.1,2.1,3.4,0.8,5,0.1
+			c-1.2-1.4-2.3-2.8-3.5-4.1C1008.8,612,1006.8,613.2,1008.2,614.8 M991.8,620.8c-1.4,1.2,0.3,1.9,1.2,2.7c0.9-0.2,1.9-0.2,2.9-0.3
+			c1,1.3,1.4,3,2,4.5c2.3,0.4,3.7-2,2.3-3.8C998,622,994.8,619.3,991.8,620.8 M1011.4,624.5c-0.3,1.9-0.8,3.8,0.3,5.5
+			c2.6-0.9,3.2-3.3,3.1-5.7C1013.7,624.3,1012.5,624.4,1011.4,624.5 M984.3,632.2c0,1.3-1.1,3.4,0.6,4c1.4,1.3,4.2-0.5,3.3-2.3
+			C987.9,632,985.8,632.5,984.3,632.2 M998.8,633.8c-0.4,1-0.8,2.5,0.1,3.4c1.3,0.3,2.5,0.3,3.9,0.5c1-1.3,1.8-2.8,2.2-4.3
+			C1002.9,633.4,1000.7,633,998.8,633.8 M1013.8,641.8c1.2,0.8,2.4,1.9,3.9,0.9c0-0.6,0-1.8,0-2.4
+			C1016.1,638.9,1015,640.7,1013.8,641.8 M972.9,683.1c-0.4,3.5-0.4,7,0.2,10.5c1.2-3.1,3.4-6,2.9-9.5
+			C975,683.7,974,683.4,972.9,683.1z"/>
+		<path class="st2" d="M356.9,475.5c8.1-0.8,15.9,1.6,24,0.9c8.8,0.4,17.5-0.4,26.2,0.2c-4.8,1.1-9.8-0.3-14.5,1.1
+			c-2.7,3.6,2.1,7.4,5.6,7.5c-1-2.5-2.6-4.8-4.3-6.9c2.5,0,4.9-0.1,7.4-0.1c0.7,1.8,0.6,4.2,2.6,5.2c2.9,0,3.6-3.4,5.2-5.2
+			c2.8,1.8,2.8,5.3,3.5,8.3c1.9-0.2,3.8-0.5,5.7-0.7c0,1.6,0,3.1,0.1,4.7c-1.8,0.2-3.5,0.6-5.2,1c-2.1-0.6-4.2-1.3-6.2-2
+			c-1.6,0.7-3.2,1.4-4.9,1.9c-2.3-0.2-4.3-1.4-6.4-2.1c1,2.9,0.4,5.8,0.1,8.7c1.2,1.4,2.6,2.5,4,3.6c-0.2,0.6-0.6,1.7-0.9,2.2
+			c-1.1,3.3-3.5,5.8-5.8,8.4c-1,1.8-1.8,3.6-2.6,5.4c-2-1.1-3.9-2.2-5.9-3.2c-4-0.8-6,4.1-9.7,5.1c0.4,1.6,1.4,2.9,2.7,4
+			c1.5-2.5,3.7-4.3,6.5-5c2,1.3,4.1,2.5,6.3,3.6c1.4-2.3,3.2-4.2,5.6-5.4c0.2,3.6,0.2,7.3,0.1,10.9l-0.5-0.1c-0.5-0.5-1.5-1.6-2-2.1
+			c-1.1,0.9-2.1,1.7-3.2,2.7c-1-1.6-2-3.2-3.3-4.6c-2.3,1.9-5.2,1.5-7.9,1.8c-1.5,1.7-0.6,4-0.4,5.9l-0.2,0.8
+			c-4.4,3.6-7.4,8.5-10.8,13c-0.9,1.7-1.9,4.7,0.3,5.8c1.8,0.6,3.6,0.7,5.4,0.9c0,1.9,0.8,4.4-1.1,5.7c-2.6,2.1-5.6,4.9-9.3,3.9
+			c1.1-2.7,2.8-5.6,1.1-8.4c-2.8,2.7-4.7,6.1-7.4,8.9c-0.4,0.4-1.2,1.1-1.7,1.5c0,0.6,0,1.8,0,2.4c2.1-0.2,4.3-0.3,6.5-0.4
+			c1.7,0.3,3.8,0.4,4.9,2c0.5,3.1,0.1,6.3-0.1,9.4c-0.2,0.3-0.7,0.9-1,1.2c-0.2-1.9-0.4-3.8-0.8-5.6c-2.4-0.5-4.8-0.6-7.2-1
+			c-1.6-0.7-3.2-1.5-4.8-2.3c0.1-9.3,2-18.5,1.8-27.8c-0.6-0.2-1.7-0.5-2.3-0.7c-0.7-0.2-2-0.6-2.6-0.8c-4,4.5-7.2,9.9-9,15.6
+			c3.8,1.6,4.6-4.1,8-4.7c-8.6,22.7-18.3,45-28.5,67.1c-2.2-0.6-4.2-1.4-5.9-3c-0.6-0.1-1.9-0.2-2.5-0.3c1.3,3.8,4.8,6.6,4.8,10.8
+			c-9.1,18.9-17.9,37.9-27,56.8c-2.2,4.8-4.6,9.6-6.5,14.5c-2.2-1.9-4.5-3.9-6.8-5.7c0.4-2.7,2-4.8,3.3-7c0.5-2.1,0.5-4.3,1-6.3
+			c0.8-2.1,2.3-3.8,3.6-5.6c-1.7-0.8-3.3-1.5-5-2.3c-2.6,1.7-5.8,1.9-8.7,2.9c-1.7,1.2-1.5,3.6-2.3,5.4c-0.7,2.8-4.4,4-4.2,7.1
+			c-0.1,3.5,4.3,2.9,6.6,3.7c-0.2,3.5-0.6,7.1-1.1,10.6c-4-1.7-3.5-6.6-6-9.5c-0.3-0.3-0.9-1-1.1-1.4c-2.1-0.5-4.3-0.7-6.3-1.4
+			c-2.6-1.8-1.9-5.4-1.4-8c2,0.5,4.1,1,6.1,1.5c1.9-1.8,3.6-3.8,4.2-6.4c-1.3,1.1-2.6,2.3-4,3.4c-1.3-0.7-2.4-1.5-3.6-2.3
+			c-1-2.1-2.2-4.3-4.6-4.9c-2.7-1.1-5.2,0.9-7.6,1.8c-2.3,1.1-4.8,0.8-7.3,0.9c0.2-3,0.7-5.9,1.5-8.8c1.5,0.9,3,1.8,4.5,2.7
+			c1.2-1.9,2.9-3.7,3.3-5.9c-1-3.9-1.7-9.3-6.5-10.1c-0.6,1.5-1.1,3-1.7,4.6c-2.1-0.8-4.1-1.6-6.1-2.5c1.8-2.4,4.7-2.7,7.5-2.7
+			c0.2-0.4,0.7-1.3,0.9-1.7c0.6-2.2,2.6-3.6,4.9-2.9c1.4,1.7,2.5,3.6,3.9,5.2c2.6-1,1.6-3.8,1.2-5.9c-0.3-2.1,0.3-4.2,0.8-6.3
+			c1.5,1.3,3.1,2.7,4.5,4.1c2.2,4.4,4.1,8.9,5.7,13.6c-3.9,0.4-7-2.2-10.6-3.3c0.3,2.8,0.4,5.7,1.9,8.2c1.9,0.7,4,1,6,1.3
+			c1,2.6,1.5,5.3,1.7,8c2.3,0.2,4.6,0.4,6.9,0.6c2,0.8,2.6-1.5,3.3-2.9c2.3-5.5,4.5-11.1,6.6-16.6c0.5-0.1,1.5-0.4,1.9-0.5
+			c0.6,1.2,1.3,2.4,1.8,3.7c-0.9,1.5-2.8,2.1-4.2,3.1c0.1,2.9,0.4,5.9,0.8,8.8c2.3-0.6,5-1,6.4-3.1c1.9-2.6,4.2-4.9,7.2-6.5
+			c-0.8-2.2-2.3-3.9-4.4-5c0-2.5,0.2-5-0.2-7.4c-0.8-2.3-2.2-4.3-3.4-6.5c0.3-0.8,0.8-2.3,1-3.1c0.5,1.9,1.1,3.8,1.7,5.7
+			c1.5-1,3.5-1.5,4.5-3.1c0.7-2,0-4.2,0.8-6.1c1.4-1.8,3.2-3.1,5-4.5c1.7,0.6,3.6,0.9,5.4,0.7c-1.6-2.2-3.6-4-5-6.3
+			c0.2-1.6,0.9-3.1,0.8-4.7c-0.5-2.4-1.4-4.8-1.2-7.4c0.6-1.9,1.6-3.6,2.7-5.3c0.7,0.3,2,0.8,2.7,1.1c1.4,3.9,2.6,8,2,12.1
+			c0.7,0,1.9-0.1,2.6-0.1c0.4-1.6,0.8-3.2,0.9-4.8c-1-2.9-3.2-5.1-3.9-8.1c-0.4-2.5,0-4.9,0.3-7.4c1.5,1.1,2.9,2.4,4.2,3.9
+			c1.5-2.5,3.8-4.2,5.6-6.4c1.6-1.9,0.9-5.5-2-5.4c-1.4,2.3-0.1,5.2-0.8,7.7c-2.4-1-4.6-2.4-6.8-3.8c6.4-14.3,13.4-28.3,19.6-42.7
+			c0.4-0.1,1.3-0.4,1.8-0.5c0.9,0.5,1.7,1,2.6,1.5c3.9-2.7,1.6-7.5,0.3-11c2.1-3.8,4.1-7.7,5.6-11.8c5.4-11.9,10.6-24,15.9-36
+			c1.6-0.5,3.2-1.1,4.8-1.6c-0.6-1.9-1.1-3.8-1.8-5.7C354.3,482.3,355.7,478.9,356.9,475.5 M371.7,477.7c-0.2,1.1-0.5,2.3-0.7,3.4
+			c-1.9,0.4-6.2,0.3-4.3,3.4c2.4,0.4,4.9,0,7.3,0.4c1.9,1.2,1.2,3.7,1.5,5.6c2.6,1,5.1,2.4,7.3,4.1c1.3-0.7,2.6-1.4,4-2.1
+			c1.4,1.1,3,2.1,4.8,2.2c-0.4-2.7-1.7-5.2-2.8-7.7c-1.9-1.1-3.7-2.3-5.5-3.6c0.6-1.5,3.6-3.2,1.6-4.7c-2.8,0.2-6.6,1.6-6.3,5
+			c-1,0.2-2,0.5-3,0.8c-0.3-0.6-0.8-1.8-1.1-2.4c0.3-1.8,0.6-3.5,0.9-5.2C374.3,477.1,373,477.4,371.7,477.7 M356.1,486
+			c0.1,1.4-0.1,3,0.6,4.3c1.1,0.2,2.1,0.4,3.2,0.6C360.8,488.1,358.9,486,356.1,486 M356.3,497.5c2.6,0.4,5.4,0.5,6.7,3.2
+			c-1.3,0.6-2.6,1.2-3.9,1.8c-2.8,4.1-6.3,7.8-10.6,10.3c-0.5,1.6-1.4,3.4,0,4.8c1,1.6,3.1,0.9,4.6,0.8c0.9-1.6,0.3-3.7,0.6-5.5
+			c3.8-3,8.4-4,13.1-3.2c0.5-1,1-1.9,1.4-2.9c1-1.2,3.5-2.3,2.2-4.2c-1.8-0.1-3.6,0.2-5.3,0.4c0.2-2.4,1.7-5.1,0.3-7.3
+			c-2.2-0.5-4.5-0.8-6.8-1.1C357,494.3,354.8,495.9,356.3,497.5 M375.9,497.9c0.2,1.6,0.5,3.1,0.6,4.7c-1.1,2-6.1,3-3.8,5.7
+			c2.9,2.3,8-1.1,9.8,3.2c1.1,0.1,2.3,0.2,3.5,0.3c1.8,0.3,2.4-0.4,1.7-2.2c1.2-0.3,2.3-0.7,3.5-1.1c-1.4-1.3-2.8-2.5-4.2-3.6
+			c-0.6-1.3-0.8-3-2.4-3.5c-2.7-1-4.7-3-6-5.6C377.6,496.3,375.1,496.1,375.9,497.9 M393.2,500.8c-0.8,1-1.7,2.1-2.4,3.2
+			c0.9,2.4,4.6,1.4,4.6-1C394.7,502.2,394,501.5,393.2,500.8 M359.4,515.3c0,1.6,0.2,3.3-0.1,5c-1.3,0.2-2.5,0.2-3.8,0.4
+			c-1.3,1.3-1.7,3.1-2.4,4.8c-2.8,1.5-6.7-1-8.8,1.9c-0.8,0.8-1.8,1.7-2,2.8c-0.9,3.9,4.2,4.4,6.7,5.7c4-0.7,4.7-5.4,6.4-8.4
+			c1.8-1,4.3-1.4,5.2-3.5c1-2.4,4.6-3.5,3.9-6.5C363.6,515.5,361.3,515.5,359.4,515.3 M368.6,518.7c-1.5,1.2-0.2,3.3,1.4,3.6
+			c1-0.7,1.9-1.4,2.7-2.2C371.5,519.2,370.1,517,368.6,518.7 M366.3,522.3c-0.1,0.4-0.4,1.2-0.6,1.6
+			C367.4,527,369.6,520.6,366.3,522.3 M327.7,557.4c-0.4,1.7-0.4,3.5-1.2,5.1c-1.4,1.7-3.4,3.1-3.6,5.4c3.4-0.2,5.7-2.9,8-5
+			c0.8-0.9,2.3-1.9,1.5-3.3C332,557.4,329.6,557.3,327.7,557.4 M316.5,573.6c-1.1,1.6-3.4,3.8-0.7,5.1c3.6-0.2,8.5-2.6,7.9-6.9
+			c-0.7-0.3-2-1-2.6-1.4C319.4,571.4,317.7,572.2,316.5,573.6 M323.4,579.6c-0.7,3.3,0.6,6.2,3.2,8.3c-1,2.2-1.9,7.1,2.1,5.8
+			c4.1-4.5-0.9-9.4-0.2-14.4C326.8,579.3,325.1,579.5,323.4,579.6 M304.3,629.6c1.1,0,2.3-0.1,3.4-0.1c0.1-1.5,0.5-4.2-1.8-4.2
+			C303.5,625,303.8,628.1,304.3,629.6 M297.3,640.3c0,1.2,0,2.4,0,3.6c2.4,0.1,3.7-1.1,3.6-3.6C299.7,640.3,298.5,640.3,297.3,640.3
+			 M289.6,643.5c0,2.1-0.4,5.4,2.4,5.9c1.4-0.1,5,1.2,4.6-1.4C294.6,646,291.9,644.9,289.6,643.5z"/>
+		<path class="st2" d="M775,475.4c1.3,0,2.6,0,3.9,0c1.9,2.6,3.4,5.6,5.9,7.6c2.3,0.5,4.7,0.4,7,0.6c-2.5-1.8-4.9-3.9-5.7-7
+			c2,0,4,0,6,0c0.6,1,1.1,2.1,1.7,3.1c2.9-2.1,6.2-3.4,9.8-2.9c-0.1,0.6-0.2,1.8-0.3,2.3c-3.2,2.7-7.7,4.1-10.2,7.6
+			c1.2,2.3,3.2,4.1,4.5,6.4c0.2,2.9-2.4,4.7-4.2,6.5c-1.2,1.1-2.4,2.2-3.5,3.2c-0.5-0.5-1.5-1.6-1.9-2.1c-0.8-1.4-1.6-2.8-2.5-4.1
+			c1.4-0.5,2.8-0.9,4.2-1.4c0-1.1-0.1-2.1-0.1-3.1c-1.1-0.3-2.2-0.6-3.2-0.9c-0.9,1.1-1.7,2.3-2.6,3.4c-2.2-2-5-3.3-7.9-4
+			c-0.2-0.6-0.6-1.9-0.8-2.5c0.6-1.9,1.2-3.8,1.9-5.7c-3.1-0.8-5.6,0.9-8,2.6C769.4,481,771.5,477.5,775,475.4z"/>
+		<path class="st2" d="M845.3,476.4l0.8-0.5c9.1-0.4,18.2-0.5,27.3-0.5c-0.1,4.8-0.8,9.5-0.6,14.3c-5.6-0.1-11.3-0.2-16.7,1.5
+			c-3.5,1.1-6.4,3.4-9.3,5.6c-0.7,2.2-1.5,4.3-2.2,6.5c-1.6,0.1-4.1,2-4.9-0.3c0.1-2.3,1.6-4.2,2.8-6c-1.5-0.6-2.9-1.3-4.4-1.6
+			c-1.9,0-2.4,2.2-3.3,3.4c-0.4,2.3-2.7,5.4,0.3,6.8c2.5,2.1,5,4.3,7.4,6.6c0,1.7,0,3.3-0.1,5c-1,4.9-0.7,10-0.8,15
+			c-2,1-4.1,1.9-5.4,3.8c-1.5,1.8-1.5,4.3-1.7,6.6c2.3-0.2,4.6-0.5,6.9-0.7c-0.9,7.2,0.2,14.4-0.2,21.6c-1.6-3.5-2.9-7.1-5-10.4
+			c-0.9-1.2-1.8-2.3-2.7-3.4c-1.7-2.8-4.5-4.5-7.8-5c-1.2-1-2.4-1.9-3.6-2.9c0.9-1.8,1.8-3.5,2.8-5.3c-2-0.9-4.5-1.6-6.1,0.3
+			c-1.2,2.3,0.9,4.4,2.2,6.2c-1,1.1-2,2.2-3,3.3c-0.3,1-0.7,2-1,2.9c-1.5-1.2-2.3-2.9-3-4.7c-0.8-0.4-1.6-0.8-2.4-1.1
+			c-2,0.7-1.9,3-2.2,4.7c2.1,0.2,4.2,0.3,6.3,0.5c-0.4,1.2-0.9,2.4-1.4,3.6c-0.8,0.6-1.6,1.3-2.4,1.9c-2.8-0.3-5.6-0.6-8.4-0.9
+			c0.1,2.5,0.2,5,0.5,7.6c-1.3-0.1-2.7-0.2-4-0.3c-1.5,1.3-2.9,2.7-4.4,4c-1.3-0.2-2.7-0.5-4-0.7c-0.2-15,0.3-30.1-0.2-45.1
+			c2.3,1,4.9,3.2,7.5,1.6c-1.6-2.9-3.5-5.6-6.2-7.7c-0.3-1.9-0.6-3.9-0.9-5.8c0.3-0.5,1-1.4,1.3-1.9c0.6-0.2,1.7-0.7,2.2-0.9
+			c0.7-1.3,1.3-2.6,2-3.9c6.4,3.6,11.2,9.5,17.1,13.8c-1.2,1.4-2.6,2.7-4.2,3.7c-4-2.8-6.5-7.5-11.3-9.1c0,6.5,8.2,8.4,9,14.7
+			c-1.6,1.1-3.1,2.2-4.7,3.3c1,0.9,2,1.8,3,2.6c1.3,1,2.5,2.4,4.2,2.7c1.1-3.3,2.2-6.6,3.9-9.7c1-0.4,1.9-0.8,2.9-1.3
+			c0.5-0.9,1.1-1.7,1.7-2.5c1.9-0.1,3.8-0.6,5.5-1.4c-2.5-0.6-5.2-0.9-7.7-1.9c-1.2-1.6-1-3.8-1.5-5.6c-1.5-1.2-2.9-2.4-4.4-3.5
+			c2.8-0.3,5.7-0.3,8.5-1c2.3-1.5,1-4.5,0.9-6.7c-1.8-0.1-3.5-0.2-5.2-0.4c-0.5-0.9-0.8-1.9-1-2.9c3.6-0.7,7.1,0.2,10.2,2.2
+			c2.3-1.7,5.2-3,6.6-5.6c1.4-2.8,3.6-5,5.7-7.1C839.2,481.8,842.5,479.3,845.3,476.4 M848.4,479.1c0,1.2-0.1,2.4-0.1,3.7
+			c1.6-0.2,3.2-0.3,4.8-0.7c0.7-1.3,1.2-3.3,0-4.4C851.3,476.8,849.8,478.3,848.4,479.1 M826.8,503.1c-0.7,1.2-0.9,2.8-2,3.8
+			c-1.4,0.6-3,0.6-4.4,0.9c0.1,1.2-0.4,2.5,0.3,3.6c1.2,1.4,3.2,1.2,4.9,1.4c1.2-1.2,2.3-3.2,4.4-2.4c1.6-0.2,4.4,1.9,4.9-0.4
+			C833.7,506.4,830.2,504.2,826.8,503.1 M827.7,515c1.2,1.6,3.5,1.7,5.3,1.8c2.2-0.2,0.9-2.7,1-4C831.8,513.3,829.4,513.4,827.7,515
+			 M794.7,528.6c-0.9,1.3-1.5,2.8-1.4,4.4c-0.3,3.8,4.3,4.9,6.8,6.5c1.6-1.9-0.4-3.9-1.4-5.5c-0.1-1.9-0.1-3.8-0.2-5.7
+			C797.3,528.4,796,528.3,794.7,528.6 M817,530.1c-2.4,1.2,1.5,5.9,2.7,2.8C821.4,530.8,819,528.5,817,530.1 M806.2,536
+			c0,1.6,0,3.2,0.1,4.8c0.6,0,1.9-0.1,2.5-0.1c0.4-1.5,0.8-3.1,1.2-4.7C808.7,536,807.5,536,806.2,536 M794.8,552.7
+			c-0.3,1-0.5,2.1-0.7,3.2c0.7,0,2.2,0.1,2.9,0.2c2-0.1,1.4-2.3,1.8-3.7C797.4,552.4,796,552.4,794.8,552.7z"/>
+		<path class="st2" d="M814.1,476.4c2.1,1.1,3.3,3.2,4.8,5c0.6,0.5,1.1,1,1.7,1.4c1-0.6,2.1-1.2,3.1-1.8c-0.2,1.4-0.4,2.9-0.7,4.3
+			c-0.2,0.3-0.6,0.9-0.9,1.2c-2.2,0.1-4.5,0.1-6.7,0.2c-0.8-2.6-1.7-5.2-2.8-7.7C813.1,478.4,813.8,477,814.1,476.4z"/>
+		<path class="st2" d="M831.8,476.6c2.2,0,4.5,0,6.7,0c0,1.7,0.1,3.3,0.2,5c-1.5,0.3-3,0.6-4.5,0.8
+			C833,480.7,832.5,478.6,831.8,476.6z"/>
+		<path class="st2" d="M661.4,482.4c1,0.1,2.9,0.3,3.9,0.5c0,4,0.2,8.1,0.7,12.1c-2.1,1.4-3.3,3.7-3.9,6.1c2.2-1.3,5.1-2.6,5.4-5.6
+			c0.9-2.5-0.7-4.8-1.8-6.9c1.1-1.6,2.4-3.1,3.9-4.4c1.1,0.9,2.4,1.5,3.3,2.7c-0.2,2.3-0.7,4.6-1,7c-1.2,1-2.3,2-3.5,3
+			c1.9,0.9,3.9,1.8,5.7,2.8c0.2,0.9,0.5,1.7,0.8,2.6c-0.3,1.9-0.6,3.7-0.9,5.6c3.5-0.7,6.9-1.7,10.1-2.9c1.1,0.6,2.3,1.1,3.4,1.7
+			c0-1.6,0.1-3.2,0.2-4.9c-1.3-1.1-3.5-1.7-3-3.8c1.1-0.6,2.2-1.2,3.4-1.7c3.1,2.7,6,5.6,9.2,8.2c5,4.1,9.1,9.2,13.3,14.2
+			c-2.5,2-4.3,4.7-4,8.1c1.3,0.2,2.7,0.4,4,0.6c0.3,2.6,0.6,5.2,0.9,7.9c-0.7-0.1-2.2-0.2-2.9-0.3c-0.4-1.8,0.3-4.3-1.7-5.1
+			c-3-1.7-6.5,0-9,2c-1.5,1-3.3,3-1.8,4.8c1.1,2.1,3.6,2.6,5.8,2.8c0.6-1.5,1.2-2.9,1.9-4.3c1.1,0.1,3.3,0.2,4.4,0.2
+			c-0.8,3.4-3.2,5.9-6,7.8c-0.4,1.9-0.6,3.7-0.9,5.6c1-0.6,2.1-1.2,3.1-1.9c0.4-0.3,1.3-0.8,1.8-1c1.4-2.9,2.7-6.1,6-7.2
+			c2.2-1.1,4.5-2.2,6.7-3.3c0.4-1,0.7-2,1.1-3.1c3.8,4.8,5.8,10.6,8.7,15.9c-0.3,0.3-1,0.9-1.3,1.2c0.4-0.1,1.3-0.2,1.7-0.3
+			c2.5,5.9,3.9,12.2,6.4,18.1c0.9,3.5,1.7,7,2.5,10.5c-1.1,0.2-2.1,0.4-3.2,0.6c-0.9,1.7-1.9,3.4-3,5c-0.5,1.6-0.9,3.2-1.2,4.9
+			c2.7-1.7,4.8-4.2,6.6-6.8c0.3,1.4,0.7,2.8,1,4.3c-0.6,0.5-1.8,1.4-2.5,1.8c1.1,0.6,2.1,1.2,3.2,1.7c0,0.7-0.1,2.1-0.1,2.8
+			c-1.4-0.2-2.8-0.4-4.2-0.6c-0.8-1.1-1.6-2.1-2.5-3.1c0.2,1.5,0.4,3,0.6,4.5c-1.3,0.3-2.5,0.6-3.8,0.9c-0.9,1.1-1.7,2.3-2.5,3.5
+			c0.4,1.4,0.9,2.8,1.2,4.3c-1.4,1.5-3.1,3.4-5.4,2.8c-4.3-0.6-8.8-0.5-12.9,0.9c-1.7,0.9-2.7,2.8-3.9,4.2c-2,2.8-4.9,4.8-6.2,8
+			c-5.4,2.9-7,9.4-6.7,15.1c0.7-0.3,2.2-0.9,3-1.2c1.2-3.4,1.9-7,3-10.5c2.7,0.1,6.3,1.6,7.6-1.6c-1.6,0.5-3.2,1.1-4.9,1.2
+			c0.1-3.4,3.3-5.8,6.4-6.3c0.2,0.9,0.5,2.7,0.6,3.6c1.1,0.1,2.3,0.2,3.5,0.4c-1.2,1.8-2.8,3.6-3.3,5.8c0.3,1.8,0.9,3.5,1.4,5.2
+			c-2.4-0.8-4.7-1.7-7-2.7c-3.8,0.2-2.3,4.4-2.4,7c1.7-0.1,3.4-0.3,5.1-0.5c0.2,0.6,0.5,1.3,0.8,1.9c3.7,1.3,3.6,5.3,3.8,8.6
+			c-0.6-0.1-1.7-0.3-2.3-0.5c-0.5,0-1.5,0-1.9,0c-3.2-3.9-8.6-3.4-12.7-5.4c0.5-1,1.1-2,1.6-3c-1.4-0.9-2.8-1.9-4.2-2.8
+			c0.1,1.4,0.2,2.8,0.2,4.3c-1.1-0.5-2.3-1-3.3-1.6c-0.5-4-0.7-8-1-11.9c0.5-7.9,1.5-16-0.4-23.8l-0.2-1.1
+			c-0.7-3.6-0.7-7.3-0.6-10.9c0.4-1.3,0.9-2.6,1.3-3.8c1.7,0.8,3.4,1.6,5,2.4c-0.3-1.1-0.7-2.3-1-3.4c1.1-1.5,2.1-3,3.2-4.5
+			c-0.9-1.6-2.3-3.2-1.5-5.1c1.3,0.8,2.6,1.7,3.9,2.6c0.6,2.8,1.7,5.3,2.8,7.9c4.8-2.2,6.8-7.6,11.5-9.9c0.6,0.7,1.2,1.4,1.9,2.2
+			c-0.2,1.3-0.4,2.5-0.5,3.8c0.9,0.1,2.6,0.2,3.5,0.2c0.3-4.3-0.8-8.6-1-12.9c1.4-2,4.7-3.5,3.7-6.4c-1.7-1.5-3.9-2.2-5.8-3.5
+			c-1.8-1.8-2.8-4.3-4-6.5c-2.8,0.6-4.9,2.4-7,4.2c0-1.1,0-2.2,0-3.2c-1.1-0.2-2.1-0.5-3.1-0.7c0,1.5,0.2,3.1,0.3,4.6
+			c-1.3,0.6-2.7,1.2-3.9,2c-1,2-1,4.2-1.3,6.4c-1.6,0.2-3.2,0.5-4.8,0.8c0.8,1.7,3.7,4.2,0.4,5c-2.4-0.6-4.7-1.4-7.1-1.8
+			c0.1-0.5,0.2-1.5,0.3-2c1.7-0.9,3.6-1.7,5.1-3c0.6-1.6,0.7-3.4,1-5.1c0.7,2,1.7,3.9,4.2,3.4c-0.4-3-0.5-6-1.3-8.8
+			c-1.6-1.4-3.6,0.4-5.3,0.8c-0.7-0.5-1.5-1-2.2-1.5c-1.6,0.5-3.3,1.1-4.9,1.6c1.8,1.1,3.8,2.3,3,4.7c-0.7,0.2-2.1,0.7-2.8,1
+			c-0.6-2.5-1.1-5-1.7-7.5c1-0.5,2-1.1,3-1.6c0.2-0.4,0.7-1.2,1-1.6c1.2-0.6,2.4-1.2,3.6-1.7c-0.3-0.5-1-1.6-1.3-2.1
+			c-0.3-0.4-0.8-1.3-1.1-1.7c0.2-1.2,0.4-2.4,0.6-3.5c0.9,0.1,1.9,0.3,2.8,0.5c-0.2-1-0.4-2-0.6-2.9c1.3,0,2.6,0,3.9,0
+			c0.4,0,1.2,0,1.5,0c0.5-0.9,1-1.7,1.5-2.6c1-1.7,1.5-3.6,1.5-5.6c1.6-1.1,3.3-2.1,4.9-3.1c-1-1.7-2.1-3.3-3.6-4.6
+			c-1.7-0.4-3.4-0.8-5.1-1.1l-0.8-0.2c-0.2,2.2-0.5,4.5-0.7,6.8c-1.9-0.2-3.8-0.3-5.6-0.7c-1.1-0.3-2.1-0.7-3.2-1.1
+			c-0.4-0.3-1.2-0.9-1.6-1.2c-0.8-0.6-1.5-1.2-2.3-1.7c-1.2,1.3-2.2,2.9-3.1,4.5c-0.6,0.3-1.9,0.8-2.5,1c-3.4-3.7-4.5-8.7-6.7-13
+			c-0.8,0.1-1.6,0.1-2.4,0.2c-3.1-0.3-6.2-0.7-9.2-0.9c-5.4-5-11.2-9.5-17.7-13.1c0.5-2.2,1-4.3,1.4-6.5c1.8-1.4,3.7-2.6,5.6-3.9
+			c0.6,1.9,1.2,3.9,1.7,5.8c0.3-1,0.7-2,1-2.9c4-0.6,6.6-4,10.5-4.8c0.3,1.2,0.6,2.4,0.8,3.6c-0.9,1.4-2.1,2.7-3.3,4
+			c-0.9-0.4-1.8-0.8-2.7-1.2c-3,1.6-6,3.4-8.6,5.6c1.7,0.6,3.4,1.2,5.1,1.9c2.7-3,6.7-3.4,10.4-3.9c0.4,1.1,0.9,2.2,1.4,3.4
+			c0.5,0,1.6,0,2.1,0c-0.1-3.4-0.4-6.9,1.3-9.9c0.1-0.3,0.3-0.8,0.4-1C661.3,487.3,661.2,484.9,661.4,482.4 M649.9,503
+			c0.5,1.7,0.9,3.9,3,4.4c2.3-0.9,2-4.2-0.1-5.1C651.8,502.5,650.8,502.7,649.9,503 M664.6,507.6c-0.3,1.4-0.4,2.8-0.5,4.2
+			c1.1-0.1,2.3-0.2,3.5-0.4c0.6-1.8,0.6-3.7,0.2-5.6C666.7,506.5,665.4,506.7,664.6,507.6 M693.9,512.3c-0.3-2.2-0.7-4.4-1.2-6.5
+			C688.8,506.5,691.1,511.6,693.9,512.3 M677.8,511.1c-0.2,1.5-0.4,4.4,2,3.7c2.7-1.5,4.6-4.1,6.2-6.7
+			C683.3,509.3,680.7,510.5,677.8,511.1 M662.2,512.7c0.5-1.1,2.4-4.5-0.4-3.9C658.5,508.2,660.4,512,662.2,512.7 M670.1,511.2
+			c-1.2,0.6-1.3,2,0.2,2.3c1.6,0.8,3.3,2.1,5.2,2C678,512.6,672.6,509.9,670.1,511.2 M688.2,513c0,0.8-0.1,2.3-0.1,3.1
+			c1.2-0.1,2.2-0.3,3.3-0.8C692.8,513.5,689.2,513.7,688.2,513 M669.8,517.7c-0.2,2.4,0.9,4.6,3.5,4.8
+			C673.4,520.1,672.7,517.7,669.8,517.7 M691.2,542c-0.4,1.8-0.8,3.7-1.1,5.5c2.5,0.3,5,0.8,7.5,1.1c-0.3-1.4,0.1-3.2-1.1-4.2
+			C695,543.2,693,542.7,691.2,542 M713.8,552.1c0.7,1.8,1.1,4.1,3.4,4.5c0.4-1.5,0.8-3,1.1-4.5c0.5,2.3,1.2,5,3.7,6
+			c1.2,0.5,3.9,1.4,2.9-0.9c-1.8-2.5-3.4-5-4.2-8c-1.3,0.3-2.5,0.6-3.8,0.9c-0.5-1.3-1.5-2.9-3.1-2.7
+			C712.1,548.6,713.4,550.5,713.8,552.1 M724.5,566.1c0.7-2,2.2-4,1.7-6.2C722.4,559,720.3,564.9,724.5,566.1 M722.2,568.2
+			c-1.5,0.3-1.3,2.2-0.1,2.7c1.5,1.3,3.7,0,3.2-2C724.4,567.7,723.3,567.5,722.2,568.2 M728.4,569c1.3,1.9,3.3,3.1,5.7,3.4
+			c0-0.8-0.1-2.5-0.1-3.3C732.1,568.7,729.6,566.6,728.4,569 M717.9,582.9c1.6,0.1,4.2-0.5,2.9-2.6
+			C718.7,579.1,717.6,581,717.9,582.9 M706.7,583.2c-0.7,2.6,1,4.8,3.7,4.7c0.5-2,1.2-4,2.3-5.7
+			C710.7,582.6,708.7,582.9,706.7,583.2 M716.7,585.4c-1.1,1.4-2.1,2.8-3.2,4.1c1.1,1.3,2.6,2.5,2.7,4.4c-0.5,1.4-1.9,2.7-1.5,4.3
+			c1.6,0.6,3.2,0.2,4.8-0.2c-0.1-1.7-0.2-3.4-0.2-5.1c-0.8-1-1.6-2-2.4-3c0.9-1.5,1.7-3,2.3-4.7
+			C718.4,585.3,717.3,585.4,716.7,585.4 M724.2,587.1c0.4,1.4,0.8,2.7,1.2,4.1c1-1.1,1.4-2.6,1.6-4.1
+			C726.3,587.2,724.9,587.1,724.2,587.1 M707,591.3c0.7,1.8,1.7,3.4,3.2,4.7c0.6,2.2,1,4.5,1.4,6.7c0.6-0.1,1.8-0.2,2.4-0.2
+			c-0.5-1-1-1.9-1.4-2.9c0.2-2.9-0.6-5.7-1.8-8.4C709.5,591.2,708.2,591.3,707,591.3 M693,593.5c0.8,1.5,2.3,2.6,3.7,3.5
+			c-0.8,1-1.5,2-2.3,3c3.2,2.9,3.9,7.5,6.4,10.9c0.9-1,2.5-2.1,2-3.7c-1.1-1.5-2.5-2.9-3.7-4.3c-0.6-0.2-1.9-0.6-2.5-0.8
+			c0.4-1.1,0.8-2.2,1.2-3.2c-0.4-1.8-0.8-3.7-1.1-5.5C695.3,593.4,694.1,593.4,693,593.5 M687.7,593.5c-0.2,4,0.7,8.2,4.1,10.7
+			c-0.2-1.7-0.4-3.3-0.6-4.9c0.4-0.3,1.2-0.8,1.6-1.1C691.3,596.2,690.6,593.1,687.7,593.5 M703.5,597.1c-0.4,1.7-0.8,3.4-1.2,5.1
+			c2.1,0.7,4.3,0.7,6.4,0.6c0-1.5-0.1-3-0.1-4.4C706.9,597.9,705.2,597.5,703.5,597.1 M690.3,607.3c0.7,3.7-0.7,7.3-0.7,11
+			c2.2-0.4,4.3-0.9,6.5-1.3c-0.7-1-1.4-1.9-2-2.9c1.5-2,1.3-4.5,0.7-6.8C693.3,607.2,691.8,607.3,690.3,607.3 M696.3,635.3
+			c-0.2,1.4,0.7,4,2.4,2.5c0.1-1.4,0.1-2.8,0.1-4.2C697.9,634.1,697.1,634.6,696.3,635.3z"/>
+		<path class="st2" d="M800.8,497.3c3.3-2.9,5.6-7.6,10.5-7.9c0.3,1.3,1.6,3.1,0.2,4.2c-2,2-4.2,3.8-6.6,5.2
+			C803.3,499.5,802.1,498.1,800.8,497.3z"/>
+		<path class="st2" d="M674.5,494.4c1.5-0.9,2.9-1.9,4.3-2.9c0.8,0.2,2.4,0.7,3.2,1c0.8,0.4,1.6,0.8,2.4,1.2c-1.5,2-3.2,4-5.3,5.5
+			c-0.3,0.1-0.8,0.3-1.1,0.4c-0.3-0.5-0.9-1.5-1.2-1.9C676.1,496.6,675.3,495.5,674.5,494.4z"/>
+		<path class="st2" d="M1193.9,501.7c1.2,0.4,2.5,0.9,3.7,1.3c-0.6,1.2-1.1,2.5-1.7,3.8c-1.2,2.4-3.6,2.5-5.8,1.7
+			c0.6-1.4,1.2-2.8,2-4.1C1192.7,503.4,1193.3,502.6,1193.9,501.7z"/>
+		<path class="st2" d="M515.6,531.6c3-1,3.5,3.2,4.1,5.1C517,536.9,515.2,534,515.6,531.6z"/>
+		<path class="st2" d="M395.5,535.2c0.5,0,1.4-0.1,1.8-0.1c0,1.8-0.1,3.5-0.2,5.3c-0.4,0.5-1.2,1.5-1.6,2c-0.6-1.8-1.1-3.7-1.6-5.5
+			C394.3,536.5,395.1,535.6,395.5,535.2z"/>
+		<path class="st2" d="M507.8,537.9c2.7-1.7,4.6,1.4,6,3.3c-1.2,1.7-3.4,1.2-5.2,1.4C508.2,541,506.6,539.3,507.8,537.9z"/>
+		<path class="st2" d="M0,542.3c0.5-0.3,1.6-1,2.1-1.3c1.3,0.3,2.6,0.7,3.9,1c0.8,0.8,1.5,1.7,2.3,2.5c-1.5,3.3-5.1,3.5-8.3,3.7
+			V542.3z"/>
+		<path class="st2" d="M468.6,544.3c1.2,0.2,2.3,0.4,3.5,0.6c0.7,1.1,1.4,2.1,2.1,3.1c-0.9,0.8-1.8,1.6-2.7,2.4
+			c-0.2,1.4-0.5,2.8-0.7,4.2c-2,0-4,0.1-6,0.2c0.9,1.3,1.7,2.6,2.6,3.9c-1.5,0.3-2.9,0.6-4.4,0.8c-1.5-2.6-0.4-5.4,0.7-7.8
+			c1.3-0.2,2.6-0.5,3.8-1.1C469.4,549.1,468.6,546.4,468.6,544.3z"/>
+		<path class="st2" d="M506.5,543.7c2.4,1.3,5.1,2.6,6.8,5c-1.1,0.5-2.2,1-3.3,1.6C508.5,548.2,507.2,546.1,506.5,543.7z"/>
+		<path class="st2" d="M822.6,548.3c2.8-0.2,5.7,0,7.4,2.6c1.1,1.4,2.1,2.8,3.1,4.2c1.3,2.1,3.5,4.4,2.2,7c-1,1.6-2.4,2.7-3.7,4
+			c1,2.2,1.7,4.6,1.7,7c-2.1-0.2-4.1-0.7-5.9-1.7c0.6-1.6,1.2-3.1,1.8-4.7c-2.4-1.6-4.7-3.5-7.4-4.5c-2.6,0.6-5,1.9-7.7,1.8
+			c-1.6,0.3-3.6-0.4-4.8,1.1c-2.5,2.7-4.3,5.8-6.3,8.8c0.8,1.5,1.6,3.1,2.1,4.8c-2.8,1.6-4.2-2-4.9-4.1c-1-2.1-0.5-4.3,0.5-6.2
+			c1.1-0.8,2.3-1.5,3.5-2.2c2.6-1.4,5.2-3.2,6.4-6.1C815.5,557.2,818.7,552.4,822.6,548.3 M822.3,555.1c-1,0.6-3.7,1.2-2.4,2.8
+			c0.6,2.6,3.6,0.8,4.9-0.1C826.3,556,824.1,553.5,822.3,555.1z"/>
+		<path class="st2" d="M389,550c4.1,0.6,4.6,5.3,4.5,8.6c-1.8-0.4-3.6-0.7-5.4-1.1C387.9,555,388.2,552.4,389,550z"/>
+		<path class="st2" d="M490.8,554.9c-1.6-3.9,4.2-3.8,6-1.7c0.3,0.6,0.9,1.7,1.2,2.2c1.4,0.3,3.2,0.1,4,1.6
+			c-1.4,0.8-2.7,1.6-4.1,2.5C495.9,557.5,493.3,556.2,490.8,554.9z"/>
+		<path class="st2" d="M503.9,556.8c0.5-0.1,1.6-0.4,2.1-0.5c0.3,0.4,0.9,1.1,1.3,1.5c-0.5,3.1,1,5.6,3.1,7.7
+			c-0.2,0.3-0.7,1-0.9,1.4c0.5,2.2,0.7,4.5,0.6,6.8c-1-0.4-1.9-0.8-2.9-1.2c-1,0.6-2.1,1.3-3.1,2c-1.2-1.2-2.4-2.3-3.5-3.5
+			c-0.5-0.6-1.5-2-1.9-2.6c-1.9-0.2-3.8-0.4-5.6-0.7c-0.6,0.3-1.3,0.6-1.9,0.9c-0.9-1-1.9-1.9-2.8-2.9c1.9-1.4,3.8-2.8,5.7-4.2
+			c1.4,0.6,2.7,1.2,4.1,1.8c0.9-0.3,1.9-0.5,2.9-0.8c0.3,3.4,2.3,6.2,5,8.3c0.2-0.4,0.6-1.1,0.8-1.4c-1.1-1.2-2.2-2.3-3-3.6
+			C504.4,562.9,504.9,559.8,503.9,556.8z"/>
+		<path class="st2" d="M1702.7,557.8c2.4,0.8,4.8,1.8,6.5,3.8c-2.2,1.4-4.4,2.8-6.5,4.4C1702.8,563.3,1702.7,560.5,1702.7,557.8z"/>
+		<path class="st2" d="M1465,565.7c0.3-1.9,0.1-5.5,3-5.1c4.3,4,5.3,10.7,10.5,14.1c0.1,0.6,0.3,1.7,0.4,2.3
+			c-4.1,10.8-8.3,21.5-12.6,32.1c-0.8,0.6-1.5,1.2-2.3,1.8c-2.3-2.1-4.6-4.3-6.7-6.5c-1.8,1-3.5,2-5.2,3.1c-0.7,0-2.1,0.1-2.8,0.2
+			c0.2,0.6,0.5,1.2,0.8,1.8c1-0.5,2-0.9,3-1.4c1.9,1.1,3.7,2.5,3.5,4.9c-0.7,0.2-2.2,0.7-2.9,0.9c-2.9,1.2-2.1,4.7-2.6,7.2
+			c0.2,2.2-1.9,3.2-3.2,4.4c-0.8-3-2.1-5.9-4.8-7.6c-1.5,2,0.6,4.2,1.1,6.1c-0.7,1-1.4,2-2.1,3c0.4,0.5,1.3,1.4,1.8,1.8
+			c-4.4-0.1-10.1,1.2-12.5-3.6c5.6-11.8,10.2-24.1,15.3-36.1c3.3,3.1,7.9,2.6,12,2.4c-0.3-2.7,1.3-6.7-1.9-8.3
+			c-2.4-2.2-5.4,2.1-7.6,0.1c2.6-7.2,5.9-14.1,8.6-21.2C1460.3,562.9,1462.8,564.1,1465,565.7 M1465.6,592.2
+			c-0.1,2.1-0.2,4.7,1.7,5.9c0.5-2.5,1.4-4.8,2.7-7C1468.5,591.5,1466.3,590.6,1465.6,592.2 M1449.3,593.2c0,0.7-0.1,1.9-0.1,2.6
+			c1.2,0.9,4.1,0.1,3.1-1.8C1451.6,592.3,1450.6,592,1449.3,593.2 M1459.9,598.6c0.7,0.1,2.2,0.2,2.9,0.2c0.1-0.8,0.3-2.3,0.4-3.1
+			C1461.3,595.6,1460.5,597,1459.9,598.6z"/>
+		<path class="st2" d="M1543.7,561.7c2.2-1.4,4.2,1.2,5.2,2.9c-1.7,1.9-3.7,3.5-6.4,3C1542.3,565.6,1541.5,562.9,1543.7,561.7z"/>
+		<path class="st2" d="M373.2,564.9c-0.7-2.1,1.8-2.5,3.3-2.9c0.4,1.6,0.8,3.2,1.2,4.8C376.2,566.5,373.6,567,373.2,564.9z"/>
+		<path class="st2" d="M466,564.6c1.5,0.5,2.9,1,4.3,1.6c0.3,2.2,0.3,5,2.9,5.9c0.2-1.7,0.2-3.4,0.2-5.1c1.6,1.4,3.2,2.7,4.8,4.2
+			c0.2,0.4,0.5,1.3,0.7,1.7c-1.4,2.8-3.1,5.5-4.7,8.1c-0.6-1.4-1.3-2.8-1.9-4.2c1.3-0.8,2.6-1.6,3.9-2.4c-1.2-0.2-2.4-0.4-3.5-0.6
+			c-1.3-0.5-2.6-1-3.8-1.6C467.6,569.8,466.7,567.2,466,564.6z"/>
+		<path class="st2" d="M683.3,568.8c3.5,2.3,5,6.4,7.5,9.7c-1.5,0.7-3,1.4-4.6,2.1c-1-2.4-2.2-4.8-3.5-7c-0.1-0.5-0.3-1.6-0.4-2.1
+			C682.6,570.9,683.1,569.5,683.3,568.8z"/>
+		<path class="st2" d="M461.1,570c1,0.9,2,1.9,3,2.8c-1.4,0.4-2.8,0.8-4.3,1.2C460.1,572.6,460.5,571.3,461.1,570z"/>
+		<path class="st2" d="M817.3,571.4c1.9-2.3,4.5,2.2,2.4,3.3C817.8,577,815.4,572.3,817.3,571.4z"/>
+		<path class="st2" d="M1533.9,573c1.2-0.8,2.5-1.4,3.8-2c0.4,2.7,1,5.4,2.6,7.7c-1.2,1.9-2.7,3.6-3.9,5.5c-0.8,2.3,0.9,4.5,1.7,6.6
+			c1.3-2.2,2.3-4.9,4.9-5.7c3.2-0.7,6.6,1.3,9.7-0.1c3.5-1.4,3.6-5.7,5.1-8.7c3.4,9.5,6.4,19,9.9,28.5c-0.2,0.6-0.6,1.8-0.7,2.4
+			c-4.1,0-8,2.9-12,1.3c1.8-2.4,5.2-4.1,5.3-7.3c-1.5-1.1-3.1-2-4.7-2.8c-0.9-1.8-1.7-3.6-2.5-5.4c-1,0.2-2,0.5-3,0.8
+			c-0.5-1.2-1-2.5-1.5-3.6c-0.4-0.2-1.3-0.5-1.8-0.6c-2,1.7-3.9,3.6-5.8,5.4c-2.5-1-5-2-7.5-2.8c-2.2-0.5-4.4-0.8-6.6-1
+			c-0.8-1.4-2.3-2.8-1.8-4.6c2.5-1.8,5.6-2.4,7.9-4.3C1535.4,579.4,1533.2,575.9,1533.9,573 M1529.9,589c1.5-0.2,3.4-0.1,3.6-2.2
+			C1531.7,585.1,1529.7,586.9,1529.9,589z"/>
+		<path class="st2" d="M501,574.8c1,1,1.9,2.1,2.8,3.2c0.4,0.4,1,1.1,1.4,1.5c0.6,0.6,1.2,1.2,1.9,1.7c0.2,0.2,0.7,0.7,1,0.9
+			c-0.2,1.2-0.5,2.4-0.8,3.6c-0.6-0.5-1.8-1.4-2.4-1.8C501.6,582.1,500.8,578.4,501,574.8z"/>
+		<path class="st2" d="M353.2,576.3c1.5,0.1,3.1-0.3,4.5,0.2c0.9,1.2,0.9,2.8,1.2,4.3c-2,0-3.9,0-5.9,0
+			C353.1,579.3,353.1,577.8,353.2,576.3z"/>
+		<path class="st2" d="M481.4,576.9c0.2,0.4,0.5,1.3,0.6,1.7c0.2,0.6,0.6,1.8,0.8,2.4c0.5,1.6-0.5,3.3-0.8,4.9
+			c-0.6-0.1-1.9-0.4-2.5-0.6C478.4,582.3,478.6,579,481.4,576.9z"/>
+		<path class="st2" d="M818,578.5c0.8,2.2-0.4,4.3-1.3,6.3c4.4,3.8,7.8,8.8,9.1,14.5c1.8,0.6,3.6,1.3,5.4,1.9
+			c3.2-0.7,7.1-1.8,9.8,0.7c-1.2,3.4-4.3,4.8-7.7,5.1c0,1.9,0.1,5,2.8,4.7c2.9,0.8,3.6-2.4,4.8-4.2c3.8,0.8,7.6,1.3,11.5,1.2
+			c-1.1-1.7-2.9-2.6-4.7-3.4c-0.5-1.7-1.2-3.3-1.8-4.9c1.3-1.7,2.5-4.3,5.1-3.8c4.6,0.5,9.6-0.9,13.8,1.5c5-2.7,10.9-1.1,16.3-1.6
+			c3.2-0.3,6.5,0.1,9.1,2.1c0.6-0.7,1.2-1.4,1.8-2.1c6.7-0.1,13.4-0.1,20.2,0c0.6,2.1,1.1,4.2,1.7,6.3c1,0.7,1.9,1.4,2.9,2.1
+			c-2,0.5-4,1-6,1.5c2,2.2,4.8,2.8,7.6,3.2c1.2,2.1,2.5,4.3,3.8,6.4c-3,0-5.9,0-8.9-0.1c-1.7-1.3-3.1-3.2-5.2-3.5
+			c-0.8,1.1-1.5,2.4-2.2,3.6c-7.1-0.3-14.8,1.5-21.5-1.6c-0.8,0.5-1.6,1.1-2.4,1.7c-13.5-0.2-27,0-40.5,0v0.6c0,2.7,0,5.4,0.1,8.1
+			c-0.6,0-1.9,0.1-2.6,0.2c0.8,0.1,1.7,0.2,2.6,0.4c0.2,23.8-0.3,47.5,0.2,71.3c0,0.5,0,1.5,0,2c-0.9-0.8-1.7-1.5-2.5-2.3
+			c-2.8,0.6-6.2,0.6-7.5,3.8c2.9,0.8,6.1,1.8,9,0.3c0.6,3.1,1.5,6.1,2.4,9.1c1.1,4.2,2.3,8.5,4.9,12c1.7,1.9,3.9,3.1,5.8,4.7
+			c0.8,0.7,1.7,1.4,2.5,2.1c-3.3,2.6,1,5.3,2.6,7.5c2.8-1.7,4.9-4.1,5.5-7.4c1.3,0.1,2.6,0.1,3.9,0.1c1,1.4,2,2.7,3,4.1
+			c-0.4,1-0.8,2.1-1.2,3.1c1.7,2,2.2,4.4,1.2,6.8c-5.9,0.3-11.8-0.6-17.8-0.9c-1.2-1-2-3-3.8-3.2c-2,0.6-3.6,2.3-5.8,2.4
+			c-3.2,0.2-6.5,0.2-9.7,0.5c-2.2-0.2-4.3-0.2-6.4-0.5c-1-1.7-0.4-3.8-0.5-5.6c-1.5,0.6-3,1.2-4.5,1.8c-0.3,1.2-0.6,2.4-0.9,3.6
+			c-5.6,0.3-11.3,0.3-17,0c0.7-2.8,2.5-5,4.8-6.6c2.5-1.7,2.4-5,2.7-7.7c0.5-4.9,7.9-5.7,7-11c-1.6-2.6-4.2-4.2-6.8-5.8
+			c-4.3-2.1-3.8-8.3-2.5-12c2.5-0.5,5-0.4,7.5-0.4c0-0.6-0.1-1.7-0.1-2.2c-3.3-0.7-6.3-2.9-9.6-3.3c-3.8,1-6.3,4.3-9.4,6.5
+			c-0.4,1.6-0.9,3.2-1.3,4.8c-1.7,0.6-3.4,1.3-5.1,2c-0.2-3-0.5-5.9-0.8-8.9c0-22.1,0.1-44.2,0-66.3c2.5-1.6,5.3-3.2,7-5.7
+			c1-2.3,0.4-4.9,0.4-7.3c1.9-3.7,6.2-4,9.7-4.9c1.8-2.3,2.8-5.1,4.4-7.5c1.3-1.6,3.2-2.5,4.6-3.9c-1.2-1.8-2.8-3.4-4.2-5
+			c-1.6,3.1-3.5,6-5.8,8.5c-1.5-0.2-3-0.4-4.4-0.6c-0.1,0.3-0.3,1-0.4,1.4c-0.2,0.7-0.6,2.1-0.7,2.8c-0.9,0.9-1.8,1.8-2.7,2.7
+			c-1.2,0.6-2.3,1.3-3.5,1.9c-0.6-0.8-1.2-1.6-1.7-2.3c1.2-0.6,2.4-1.2,3.6-1.8c0.1-0.7,0.4-2,0.5-2.6c1-4.8,6.5-6.1,8.7-10.2
+			c0.9-4,0.8-8.3,2.4-12.2c1.3-0.4,2.6-0.9,3.9-1.4C815,580.4,816.5,579.4,818,578.5 M815.4,591.3c-1.1,2,2.2,3.8,3.6,4.9
+			C821.3,595,817.8,588.5,815.4,591.3 M885.3,607.2c3.4,2.2,7.7-1.3,9.1-4.4C890.4,601.4,887.2,604.2,885.3,607.2 M874.4,605.1
+			c-0.1,1.2-0.2,2.3-0.3,3.5c-0.9,0.8-1.6,1.8-2.1,2.9c0.6,0,1.6,0,2.2,0c0.3-4.1,5.4,0.8,6.3-2.6
+			C879.9,606.1,876.6,606,874.4,605.1 M899.7,605c1,1.1,2.1,2.2,3.2,3.3c0.6-0.4,1.8-1.2,2.4-1.7C904.1,604.6,901.9,604.4,899.7,605
+			 M814.1,616c2.4,1.4,4.4,3.2,6.7,4.8c1.3-2.4,2.8-4.7,4.6-6.6c-1.5-1.3-3-2.7-4.5-4C818.2,611.6,815.9,613.6,814.1,616
+			 M831.8,617.3c0.4,1.4,1.4,2.5,2.9,2.7c0-0.7,0.1-2.1,0.1-2.8C834.1,617.3,832.6,617.3,831.8,617.3 M802.5,620.7
+			c0.2,1.5,0.5,3,0.8,4.4c-0.7,1-1.4,1.9-2.1,2.9c1.8,1.5,4,2.9,4.4,5.4c1,3.3-3.3,4.4-5.3,5.9c0.3,0.7,0.6,1.5,1,2.2
+			c0.9-0.1,1.8-0.2,2.7-0.2c-0.6,2-1.2,4.1-1.8,6.1c-1.6,2.4-5,5-2.6,8.1c1.2,2.6,3,0.1,3.3-1.5c1.3-5,5.4-8.5,7.8-12.9
+			c4.2-4.9,3.4-12.4,1.2-18.1c-1.3,0.5-2.5,1.1-3.6,1.8c-0.2-1.5-0.5-3-0.7-4.4C805.7,619.6,804.1,619.8,802.5,620.7 M794,632
+			c-0.5,1.6-0.2,3.3,0,5c3.2-1.3,6.6-2.3,9.8-3.4c0-0.4,0.1-1.2,0.1-1.6C800.7,631.8,797.2,630.9,794,632 M833.2,633.1
+			c-1.5,1.7,0.8,4.5,2.6,2.7C838.3,634.5,835,631.4,833.2,633.1 M820.2,650.1c0,1.2,0,2.3,0,3.5c0.7,0,2,0,2.7,0
+			c0.7-1.5,1.4-3,2.1-4.5C823.4,649.5,821.8,649.8,820.2,650.1 M809.2,650.4c0.2,2-1,6.5,2.3,6.2c2.7-1.4,1.6-4.9,0.8-7.2
+			C811.6,649.6,810,650.1,809.2,650.4 M815.3,659.6c1.8,1.6,4-0.5,5.8-1c-1.3-0.9-2.7-1.8-4.2-2.5
+			C815.4,656.1,814,658.4,815.3,659.6 M795.4,659.3c-0.2,1.2-0.3,2.4-0.3,3.6c1.3,0,2.5,0,3.8,0c0-1.3-0.1-2.6-0.1-4
+			C797.6,658.9,796.5,659,795.4,659.3 M817.3,666.3c-1.8,0.2-3,1.7-2.1,3.5c1.2,0.5,2.5,0.6,3.8,0
+			C819.3,668.3,819,666.5,817.3,666.3 M797.1,678.9c-1.5,2-1.5,4.4-0.7,6.7c1.1,0,2.2-0.1,3.3-0.1c0.3-1.2,0.5-2.4,0.8-3.6
+			C800.1,680.2,798.2,679.8,797.1,678.9 M836.5,679.2c-0.5,0.9-0.9,1.8-1.3,2.7c1.2,1.3,4.3,2.9,4.5,0
+			C840.3,679.7,838.1,679.2,836.5,679.2 M822.3,687.4c-1.3,1.5-0.3,3.4,0.4,5c2.7,1.5,3.9-2.5,3.9-4.5
+			C825.7,686.1,823.7,686.4,822.3,687.4 M828.1,708.4c0.6,1.9,1.5,3.7,3.4,4.7c0.5-1.6,1.2-3.2,1-4.9
+			C831.5,706.6,829.5,708.1,828.1,708.4 M834.6,717c-0.3,2,1.3,3.4,2.3,4.9c2.3-1.7,2.9-4.2,2-6.8C837.4,715.4,835.2,715,834.6,717
+			 M829,729.1c0.7,0.7,1.3,1.5,2,2.2c2.8-2.1,7.9-5.3,4.2-9.1C832.8,724.3,831.2,726.9,829,729.1 M855.9,734.9
+			c0,1.3,0.2,2.5,0.4,3.8c0.2,1.1,2.7,1.9,2.7,0.2C860.2,736.6,857.6,735.6,855.9,734.9z"/>
+		<path class="st2" d="M1731.2,581.2c0.4-0.4,1.3-1.3,1.8-1.7v8c-1.5-1.1-3-2.1-4.4-3.2c0.3-0.4,0.9-1.1,1.2-1.5
+			C1730.2,582.4,1730.9,581.6,1731.2,581.2z"/>
+		<path class="st2" d="M22.4,582.5c2.2-0.7,4.5-0.9,6.8-1.3c0.1,4.2,0.9,8.5-0.8,12.5c-2.6-0.4-5.2-0.6-7.6-1.5
+			C19.9,589,19.8,584.8,22.4,582.5z"/>
+		<path class="st2" d="M825.5,583.7c1.1-1.6,2.5-2.8,4.4-3.5c1.2,1.8,2.6,3.5,3.9,5.2c-1.2,1.8-2.6,3.6-2.3,5.9
+			c1.9-0.8,3.2-2.5,4.3-4.2c-0.2,2.6-0.5,5.1-1.3,7.6c-0.5,0-1.4-0.1-1.9-0.1C830.8,590.7,828.2,587.2,825.5,583.7z"/>
+		<path class="st2" d="M478,588.2c2.2,0.8,4.2-0.4,6-1.6c0.3,0.5,0.9,1.5,1.2,2.1c-0.2,1.2-0.3,2.5-0.5,3.8c-3.6,1.5-9,1.1-10.4,5.6
+			c1.4-0.1,2.9-0.2,4.4-0.4c0.2,0.3,0.6,0.8,0.8,1c0.8,1,1.6,2,2.4,3c-0.5,0.3-1.6,1-2.2,1.4c-0.5,0.3-1.4,0.9-1.9,1.2
+			c1.2,0.8,2.3,1.6,3.5,2.4c0.5,1.2,1,2.4,1.4,3.7c0.4-1.5,0.8-3.1,1.1-4.7c1.2,0.9,2.4,1.8,3.6,2.8c1,0,2,0,3,0
+			c0.8,0.5,1.6,0.9,2.5,1.4c1.2,0.7,2.5,1.2,3.8,1.8c-0.2,1.7,0,3.6-1.4,4.8c-0.3-0.2-0.9-0.5-1.3-0.7c-0.3,0-0.9,0.1-1.2,0.2
+			c-0.7,0.1-2.1,0.2-2.7,0.3c-0.4-1.2-0.7-2.4-1.1-3.6c-2.1-0.3-4.2-0.7-6.2-1c-0.7,1.7-1.9,3.4-2,5.3c2.3,1.7,4.9,2.9,7.2,4.8
+			c0,0.5,0.1,1.5,0.2,2c-0.4,0.9-0.9,1.8-1.3,2.8c-0.5-0.1-1.6-0.2-2.1-0.3c-0.2-1-0.5-1.9-0.7-2.9c-3-1.9-5.8-4.5-6.6-8.1
+			c0.4-0.8,0.9-1.5,1.3-2.2c1.3-1.2-0.3-2.5-0.8-3.6c-1.4-1.9-1.7-4.2-2.3-6.5c-1.2,0.5-2.4,1-3.7,1.5c-1.4-0.2-2.9-0.5-4.3-0.6
+			c0.5,1.8,1.9,3.1,3,4.5c-0.8,0.8-1.6,1.7-2.4,2.6c0,0.5,0.1,1.6,0.1,2.2l0,0.1c0.5,0.3,1.6,1,2.1,1.3c0.6,2.2,1.1,4.4,1.7,6.7
+			c1.6-0.1,3.3-0.2,4.9-0.3c0.5,1.4,1,2.7,1.5,4.1c-1.2,0.7-2.4,1.4-3.5,2.1c-2-1.3-4.1-2.6-6-4c-0.3-3.5-2.5-6.2-4.5-8.9
+			c-0.8,1-1.6,2-2.4,3c-1.7,0.2-3.4,0.3-5,0.5c0.9-1.8,2-3.6,3.3-5.3c1.4-1.6,2.1-3.7,1.7-5.9c-1.4,0.4-2.7,1-4,1.7
+			c-0.5-1.2-1-2.5-1.5-3.7c-1.5-0.7-3-1.4-4.4-2.1c0.4-1.5,0.8-3,1.2-4.6c1.4-0.8,3-1.1,4.6-1.2c0.6-0.9,1.2-1.8,1.7-2.6
+			c1,1,2,2.1,3,3.1c-0.1-1.5-0.3-2.9-0.4-4.4c2.2-0.7,4.4-1.4,6.4-2.7c0.1,0.4,0.2,1.2,0.2,1.6c-0.7,1.8-1.4,3.5-2.2,5.2
+			c1.7-0.3,3.4-0.6,5-1.2c2-0.7,2.1-3.2,2.8-4.9C475.6,589.9,476.8,589,478,588.2 M464.6,598.1c-1.2,1.6-2.4,3.1-3.6,4.7
+			c1.9-0.1,3.8-0.2,5.7-0.4C466.9,600.6,466.3,599,464.6,598.1 M464,605.2c-0.6,1.5-0.8,3.4,1,4.1c1.4-0.9,1.3-2.9,2-4.3
+			C466.2,605,464.7,605.1,464,605.2z"/>
+		<path class="st2" d="M495.9,588.8c2-0.3,4.2-0.9,5.6,0.9c-2.1,0.4-4.3,0.8-6.4,1.2C495.4,590.3,495.7,589.3,495.9,588.8z"/>
+		<path class="st2" d="M1730.8,588.8c0.6,0,1.7,0.1,2.2,0.1v5.8C1731.6,593,1729.4,591.3,1730.8,588.8z"/>
+		<path class="st2" d="M799.2,596c-1-2.5,0-4.8,1.5-6.8c0.8,0.4,2.3,1.3,3,1.8C802.9,593.2,802.2,596.1,799.2,596z"/>
+		<path class="st2" d="M10.9,592.7c1.5-1.7,3.7-2.1,5.9-2.2c1.7,2.7,2.5,6.2,5,8.4c1.4,0.8,2.8,1.6,4.2,2.4
+			c-0.7,0.9-1.4,1.8-2.1,2.6c-1.7,1.8-3.4,4.2-6,4.7c-2.2-1-0.7-3.1-0.6-4.8c0.6-2.2-1-4.2-1.5-6.2l-0.2-0.7
+			c-0.1-0.3-0.3-0.9-0.4-1.2C13.9,594.6,12.4,593.7,10.9,592.7z"/>
+		<path class="st2" d="M2.5,600.7c-0.4-3.1,0.1-6.4,1.1-9.3c2.8,0.1,5.6,0.8,8.1,2.1c-0.7,3,0.4,7.5-3.2,8.9
+			C6.6,603.7,3.2,603.1,2.5,600.7z"/>
+		<path class="st2" d="M391.5,598.8c-0.4-4.2,3.8-5.8,6.9-7.3c-0.4,8.8,1.2,17.6,0.4,26.5c0.9,6.9,0.6,13.8,0.7,20.7
+			c-0.5,4.6-0.5,9.2-0.3,13.8c-1.5-0.1-3-0.2-4.5-0.2c0.4,1.5,1,3,1.7,4.5c1.3-0.6,2.7-1.1,4.1-1.7c0.5,11.7-0.5,23.5,1.7,35
+			c0.2,6.2,0,12.5,1.7,18.6c-2.3,0.4-4.6,0.9-7,1.3c0.4-1.3,0.9-2.6,1.3-3.9c-0.6-1.4-1.1-2.7-1.7-4c0.5-0.9,1-1.8,1.5-2.6
+			c0.4-0.7,1.2-2,1.6-2.7c-1.6-1.6-3.3-3.1-5.1-4.5c0.2,1.3,0.5,2.5,0.7,3.8c-0.8,0.7-1.5,1.4-2.2,2.1c-2,0.5-4.6,0.3-5.6,2.5
+			c-1.1,2.4-0.8,5.2-2,7.6c-1.1-1.2-2.1-2.3-3.1-3.4c-0.5-0.1-1.5-0.2-2-0.3c1.8,4,3,8.4,6.2,11.6c-0.7-3-0.5-6.1,1.3-8.7
+			c2.8,2.3,5.3,6.4,9.5,5.1c1.5,0.8,3,1.6,4.5,2.4c1-1.1,1.9-2.2,2.9-3.2c0.7,2.9,1.7,5.7,3.2,8.3c5.8,7.3,16.1,7.6,24.6,7.9
+			c0.1,2,0.2,4,0.2,6c-0.1,3.1,0.4,6.3-0.5,9.4c-2.9-0.1-5.9-0.5-8.8-0.6c-9.2-1.9-18.8-0.9-28.1-1.6c-2.3-0.3-4.6-0.7-6.9-1.1
+			c-0.2-0.7-0.7-2.2-1-3c-0.9,1.1-1.7,2.1-2.6,3.2c-1.4-0.1-2.8-0.2-4.2-0.2c-0.4-1.4-0.7-2.8-1.1-4.1c-0.7,1.4-1.4,2.8-2.1,4.3
+			c-1.5,0-3,0-4.4,0c1.7-2.1,3.6-4.1,5.2-6.2c-0.3-2.5-1.9-4.6-3.5-6.5c-1.2-0.1-2.3,0.4-3.5,0.6c0.4,1.8,1.1,3.5,1.1,5.4
+			c-0.5,3-3.7,3.8-5.9,5c0.2,0.9,0.4,1.8,0.6,2.7c-1.5,0-3,0.1-4.5,0.2c0.5-3.2-0.2-6.3-1.2-9.3c-2-1.6-3.7-3.9-6.3-4.6
+			c-0.3,0.3-1,1-1.3,1.4c1.9,4.2,1.7,9.4,5.4,12.6c-5.5-0.2-11,0.1-16.5,0.1c-2.9-2.6-7-2.7-10.4-4.4c2.9-1.8,6.2-2.9,9.3-4.2
+			c2-2.7-0.5-5.1-1.8-7.4l0-0.4c2-0.6,4.2-1.4,5.5-3.1c2.9-3.4,4.5-7.7,5.4-12c2,0.5,3.9,1.1,5.9,1.6c0.3,2-0.3,4.7,1.9,5.8
+			c1.4,0.2,2.9,0.3,4.4,0.5c0.7,0.1,2,0.4,2.7,0.5c0.8,1.6,1.5,3.2,2.3,4.8c2.1-1.9,4.3-3.8,6.4-5.7c-2.9-1.1-6-1-9-1.6
+			c-1-0.4-2-0.9-3.1-1.3c-0.6-1.3-1.2-2.5-1.8-3.8c1.5-1.8,4.4-3,4.5-5.5c-1.4-2.4-3.9-3.7-6.2-5.1c0.8-1.6,1.5-3.1,2.3-4.6
+			c1,0.1,2.9,0.4,3.9,0.5c0.5,0.7,1,1.3,1.5,2c0.3,2.8,0.6,5.8,2.2,8.3c0.5,0.9,1.1,1.8,1.7,2.7c2.6,0.8,5.2,1.7,7.7,2.8
+			c0-2.2,0.1-4.3,0.1-6.4c-1.6-0.1-3.2-0.2-4.8-0.2c-0.8-1-1.6-2-2.4-2.9c-0.2-2.3-0.3-4.6-0.4-6.8c-3.1-2.2-6.1-4.5-9.1-6.7
+			c-0.3,1.4-0.6,2.8-0.9,4.2l0.1,0.8c-3.4,2-5.9,5.1-8.2,8.3c-0.3,1.7-0.6,3.4-1,5.1c0.3-4.3,0.2-8.6,0.1-12.9l1.2,0
+			c0.4,0,1.3-0.1,1.8-0.1c-0.1-2.3-0.5-4.7-0.1-7c1.3-1.8,2.9-3.3,4.3-4.9c-0.5-0.4-1.6-1.3-2.2-1.7c-1.4,0.8-2.9,1.7-4.3,2.5
+			c-0.1-6.4-0.7-12.8,0.8-19.1c-1.5-7.4-1-15-0.4-22.5c1,1.5,2,3,3,4.5c1.4,0.1,2.8,0.3,4.2,0.4c0.3,0.8,0.6,1.6,1,2.4
+			c0.9,0.9,1.7,1.8,2.7,2.6c0.4,0.1,1.3,0.4,1.7,0.6c0.7-0.5,1.4-1.1,2.1-1.6c0.5,0.5,1,1,1.5,1.5c-0.9,1.5-2.4,3.1-1.7,5
+			c1.1,2.4,4.2,2.6,6.3,3.5c0.2,0.2,0.7,0.5,1,0.6c1.8,1.5,3.5,3.2,5.3,4.7c2.1,0.8,4.4,0.7,6.6,0.7c-0.2-1.8-0.5-3.7-1.9-5.1
+			c-0.7-0.4-1.5-0.8-2.2-1.1c-0.3-1.8-0.5-3.6-0.8-5.5c-2.4-0.1-4.8-0.2-7.1-0.3c1-0.9,2-1.8,3-2.7c1.8-1.5,3.6-2.8,5.4-4.3
+			c1.3-1.1,2.6-2.2,3.9-3.3c1.5,0.9,3,2.6,4.8,1.3c-0.6-4.2-5.1-6.2-7.9-9c-4.8,1.1-5.4,6.3-6.4,10.3c-1.6-0.5-3.8-0.2-4.5-2
+			c-0.8-2.1-0.5-4.4-0.8-6.6c-2.5,2.2-3.8,5.5-6,8c-0.1-2-0.2-3.9-0.2-5.9c1.2-0.6,2.6-1.1,3.8-1.9c0.9-1.6,0.1-3.3-0.7-4.7
+			c-0.6-1.1-1.3-2.1-2-3.2c4.2-1.3,6.4-5.1,8.8-8.4c3.1-2.6,5.8-5.6,7.8-9.2c3.7,0.6,7.4,1.1,11.1,1.2c-0.3-3.6-3.9-3.7-6.4-4.9
+			c-1.9-1.3-2.5-3.9-2-6c1.4-0.7,2.9-1.2,4.4-1.8c1.2,1.2,2.4,2.6,4,3.3c1.7-0.9,1.8-2.9,2.1-4.6C394.5,600,393,599.4,391.5,598.8
+			 M390.7,628.6c-1.5,2.9-5,4.5-5.4,8c2.9,0.2,5.7-0.7,7.1-3.4c1.7-2.9,5.9-5.4,4.8-9.2C394.4,624.4,392,626.1,390.7,628.6
+			 M379.2,632.6c1.8,0,3.6,0,5.4-0.1c-0.1-1.8,1.8-4.7-0.5-5.5C381.3,627.2,379.1,629.9,379.2,632.6 M356,654.5
+			c0.6,0.8,1.2,1.6,1.9,2.5c-1.8,1.5-3.9,3-3,5.7c1.3,0.7,3.5,0.5,3.8,2.3c-0.6,1.6-1.6,3-2.4,4.5c1.3,0.2,2.8,1.1,3.8-0.2
+			c1.3-3.2,2.4-6.8,2.1-10.3c-1.3-2.1-3.1-3.9-4.3-6.1C357.3,653.4,356.7,653.9,356,654.5 M388.1,657.2c0.3,1.2,0,3.6,1.9,3.5
+			c2.1,0.4,1.8-2.4,2.1-3.6C390.7,657.1,389.4,657.1,388.1,657.2 M369.2,661.2c-0.8,1-0.8,2.2-1.1,3.4c1,0.4,2,0.9,2.9,1.3
+			c0.4-1,0.8-2,1.2-3C371.8,661.6,370.5,661.2,369.2,661.2 M365.6,669.2c-0.2,3.6-2.5,6.2-5.2,8.3c-0.2,2.9,3.5,4,5.5,5.4
+			c0.5-1.9,1-3.7,1.4-5.5c1.8-0.7,3.7-1.4,5.6-2.1C371.8,672.1,369.2,669.3,365.6,669.2 M377,676.9c0.8,0,2.5,0,3.3,0.1
+			c0-2.6-0.1-5.3-0.5-7.9C378.1,671.4,376.4,673.9,377,676.9 M395.4,669.4c0,1.2-0.1,2.3-0.1,3.5c3.2,1.1,5.3-2.2,3.1-4.7
+			C397.6,668.5,396.1,669.1,395.4,669.4 M368.5,687.5c-1.4,0.9-0.1,2.7-0.1,4c2.1,0.4,4.2,0.6,6.4,0.3c0.3-2.4,1.7-5,0.8-7.4
+			C372.7,683.4,370.5,686,368.5,687.5 M379.3,692.3c-2.6,1.7-0.8,5.1-0.8,7.6c1.1-1.3,2.5-2.4,3.3-4
+			C382.3,694.3,381.4,691.5,379.3,692.3 M379.3,719.2c-1.7,0.3-3.4,0.6-5.1,1c0.2,2,0.9,4,2.5,5.3c4,3.1,9.5,2.3,14.2,3.1
+			c-0.4-1.2-0.9-2.4-1.3-3.6c-1.6,0.4-3.3,0.9-4.9,1.3c-1.1-1.2-2.2-2.3-3.2-3.5c0.8-1.1,1.6-2.1,2.4-3.1c-0.1-0.7-0.1-2.2-0.2-2.9
+			C382.2,717.7,380.7,718.4,379.3,719.2 M395.4,727.4c-1,0.5-1.3,1.2-1,2.2c3.2,1.8,7,1.6,10.5,2.6c2,2.1,2.2,6.1,6,5.9
+			c0.6-3-1.1-5-3.7-6.1c0.7-1.4,2.5-3.3,0.6-4.6c-2.1-0.6-3.7,1.4-5.7,1.8C399.8,728.7,397.6,727.7,395.4,727.4 M347.3,733.4
+			c-1.5,1.4-0.6,4.4,1.7,4C353.1,737.8,349.2,731.6,347.3,733.4z"/>
+		<path class="st2" d="M1528.9,592.4c1.3,1.2,2.6,2.3,3.8,3.5c3.4,3.8,5.5,8.4,7.3,13.1c2.3,2.8,4.7,5.6,4.7,9.5
+			c3.2,0.7,6.3,1.5,9.4,2.6c0.2,1.2,0.5,2.5,0.8,3.7c2.1-2.3,2.8-5.3,3.7-8.1c2.4-2,5.2,0.2,7.7,1c-0.1-2.5-0.4-5-0.4-7.5
+			c1-0.6,2.1-1.1,3.2-1.6c1,3.2,2,6.3,3.3,9.4c-1.7,2.5-3.2,5.1-4.4,7.8c1-0.3,2-0.5,3-0.8c0.6-1,1.3-2.1,2-3.1
+			c0.4,1.5,0.9,3,1.3,4.6c-1.4,1-2.5,2.3-3.1,3.9c1.7-0.2,3.5-0.5,5.2-0.7c0.5,1.8,1.1,3.5,1.7,5.2c-1.3,3.9,2.6,7.1,1.8,10.8
+			c-2.8,1.8-5.6,4.2-8.9,4.9c-0.5-0.5-1.5-1.4-2-1.9c-1,0.2-2,0.4-3,0.7c-0.6-0.8-1.2-1.6-1.8-2.4c-3-0.5-5.8-1.3-8.6-2.3
+			c-1-2-2-4-3-6c-2.6,0.6-5.2,1.3-7.8,1.9c-2.8-1.7-5.6-3.3-8.5-4.7c1.1,2.6,2.4,5.2,2.9,8.1c-3.4,0-6.7-0.6-9.2-3.1
+			c0.6-0.5,1.7-1.5,2.2-1.9c-0.3-0.8-0.5-1.7-0.7-2.5c0.4-0.2,1.3-0.8,1.7-1c0.4-2.6,1.2-5.2,2.4-7.5c-0.8-0.8-1.7-1.6-2.5-2.3
+			c-0.3-0.3-1-0.9-1.4-1.2c-1.4,0.5-2.8,1-4.1,1.5c-0.5-1.1-0.9-2.2-1.4-3.2c-1.4,0.4-2.8,0.9-4.2,1.4c-1.4-1-3-1.8-4.5-2.5
+			c2.1,0,4.1,0.1,6.2,0.1c-0.3-0.8-0.6-1.5-0.9-2.2c-2.7-6.3-4.8-12.8-6.7-19.4C1520.5,597.5,1527,597.8,1528.9,592.4 M1529.2,597.9
+			c0.4,1,0.8,2.1,1.2,3.2c1.2-0.4,2.4-0.8,2.9-2.1C1532.2,597.7,1530.6,598,1529.2,597.9 M1531.2,607.8c1.5,0,2-1.7,2.9-2.7
+			c-0.8,0-2.3-0.2-3.1-0.2C1529.7,605.3,1530.1,607.2,1531.2,607.8 M1534.8,620c1.8,2.8,3.7-1.1,4.9-2.5
+			C1537.6,616.4,1535.3,617.8,1534.8,620 M1538.2,621.1c0,0.6,0.1,1.9,0.1,2.6c1.1,0,2.3,0,3.4,0c0.2-0.8,0.5-2.3,0.7-3.1
+			C1541,620.7,1539.6,620.9,1538.2,621.1 M1544.2,624.2c-2.4,2.4,3.9,3.2,3.8,0.7C1549,623,1544.9,623.3,1544.2,624.2 M1562.5,624.3
+			c0.2,1.9,0.1,4.4,2.7,4.3C1568.4,626.8,1564.5,624.7,1562.5,624.3 M1548.6,628.5c0,0.2-0.1,0.6-0.1,0.8c0.6,0,1.7,0.1,2.3,0.1
+			c0.2,1.7-0.2,3.2-1.3,4.3c1.3-0.2,2.6-0.4,3.9-0.6c0.4,0.4,1.2,1.2,1.6,1.6c-0.5-1.5-0.9-2.9-1.6-4.3
+			C1551.9,629.3,1550.2,629,1548.6,628.5 M1558.4,638c1.4,1.8,2.7,3.9,4.6,5.3c2.7,0.9,4.3-2.4,5.5-4.3c-0.3-2.7-1.6-5.2-2.2-7.9
+			C1562,630.7,1561.1,635.8,1558.4,638 M1570,637.1c0.6,0.4,1.8,1.2,2.3,1.6c2.5,0.2,1.7-2.9,2.1-4.4
+			C1572.4,634.3,1571,635.5,1570,637.1 M1571.1,643.2c2,1.4,5.3,1.8,5.5-1.5C1574.6,641.3,1572.2,640.9,1571.1,643.2z"/>
+		<path class="st2" d="M736.2,596.3c1,0.3,2.1,0.6,3,1c0.4,2.9,0.8,5.8,0.8,8.7c0.3,2.4-2.6,2.7-4.1,3.8c-0.3,0.2-1,0.6-1.3,0.8
+			c-0.9,1.4-1.6,2.9-2.7,4.2c-1.6,1.1-3.6,0.6-5.4,0.8c0-1,0-1.9,0-2.9c1.3-0.9,2.5-1.9,3.8-2.8l1-0.3c-0.2-0.9-0.4-1.8-0.6-2.6
+			C733,603.7,735.1,600.2,736.2,596.3z"/>
+		<path class="st2" d="M1702.8,597.6c1.8-0.1,3.8-0.4,5.2,1.1c-1.4,1-2.8,2-4.3,3l-1,0.1C1702.7,600.7,1702.8,598.6,1702.8,597.6z"
+			/>
+		<path class="st2" d="M0,611.3c1.5-1.1,3-2.3,4.7-2.8c3,0.8,5.4,3.3,5.3,6.5c-0.7,0.8-1.5,1.5-2.2,2.3c-1.3-1-2.6-1.9-3.9-2.9
+			c-1.3,0.2-2.6,0.5-3.9,0.8V611.3z"/>
+		<path class="st2" d="M133.8,607.2c3.3,4.4,4.1,10.5,9,13.7c-0.5,0.6-1.4,1.7-1.9,2.3c-0.2,0.3-0.8,1-1,1.3
+			c1.2,2.3,3.6,3.5,5.4,5.3c0.4,2.1-0.1,4.3,0.7,6.3c2.7,2.8,6.8,2.2,10.3,1.7c-0.2,4.1-0.4,8.2-0.5,12.3c-1.6-0.3-3.3-0.5-4.9-0.8
+			c-0.5-1.6-1-3.2-1.5-4.9c-2.4-0.1-4.8-0.2-6.8,1.4c-0.9,1.2-1.7,2.3-2.5,3.5c3,1.6,7.4,2.3,8.2,6.3c-0.9,0.2-2.9,0.7-3.8,0.9
+			c-1.2-0.1-2.3-0.1-3.5-0.2c-0.5-1.4-1-2.7-1.6-4c-0.5,0-1.4,0.1-1.9,0.1c-1.4,2.1-3.1,4.3-5.9,4.3c0.1-3.5,0.2-7,0.3-10.6
+			c1.5,0.8,3,1.6,4.6,2.4c-0.6-2.8-1.6-5.6-2.9-8.2c2.5-2.2,5.7-3.1,8.6-4.3c-1.3-1.2-2.1-3.4-4.1-3.5c-1.7,0.2-3.4,0.7-5.1,1.1
+			c0-3,0.1-6,0.4-9c1.4-0.5,2.8-0.9,4.1-1.4c0.7-2.6-1.5-4.9-2.5-7.2C133.1,613.4,133.8,610.2,133.8,607.2z"/>
+		<path class="st2" d="M23.3,615.8c1.7-2.4,4.1-1.3,6.2,0c-0.1,2.9-0.2,5.8-0.4,8.7C26.4,622.1,24.9,618.8,23.3,615.8z"/>
+		<path class="st2" d="M16,622.9c0.9-2.8,1.1-5.7,1.6-8.6c2.2,3.2,6,6.6,3.8,10.8c-1.4,0.7-2.7,1.5-4,2.3c-0.8-0.1-2.5-0.3-3.3-0.4
+			c0.4-0.9,0.9-1.8,1.3-2.7C15.5,623.9,15.8,623.2,16,622.9z"/>
+		<path class="st2" d="M499,615.6c2.8,0.2,5.5,0.3,8.3,0.4c0,0.7,0,2,0,2.7c0.3,3.2-0.2,6.7-3.5,8.2c-1.8,1.2-3.8,2.2-5.7,3.2
+			c0.2-1.4,0.4-2.9,0.6-4.3c0.9-0.1,2.6-0.2,3.4-0.3c0.4-2.5,0.3-5.2-2.5-6.2C499.5,618.1,499.3,616.8,499,615.6z"/>
+		<path class="st2" d="M1718.3,621.7c2.1-1.6,4.4-3.3,7.2-2.5c-0.5,2.4-0.9,4.9-1.2,7.3c0.9,0.5,1.8,1.1,2.7,1.6
+			c0.2,0.7,0.6,2.1,0.8,2.8c1.6-0.4,3.5-0.4,4.6-1.9c-1.1-1.3-2.8-1.7-4.3-2.3c-0.9-2.4-1.7-4.7-2.5-7.1c1.8-0.4,3.6-0.7,5.4-1.1
+			c0.3,2.2,0.4,4.6,2.1,6.4v14.9c-2.2-2.1-4.2-4.4-5.7-7c-2.6,0.3-4.7,1.7-6.6,3.3c-0.9-0.7-1.9-1.3-2.8-1.9c-0.7,1.4-1.4,2.9-2,4.4
+			c-1.4,2.8,0.6,5.2,2.2,7.3c0.5-0.1,1.6-0.4,2.1-0.5c0.5-0.1,1.4-0.3,1.8-0.5c-0.1,2.2-0.6,4.4-0.9,6.6c1.1,0.8,2.2,1.6,3.3,2.5
+			c-0.9,1.2-1.7,2.4-2.5,3.7c1.7,0,3.5,0,5.2-0.1c0.1-0.6,0.4-1.8,0.5-2.4c1.1-1.2,2.3-2.5,3.4-3.7c0.5-0.6,1.4-1.7,1.9-2.3v5.8
+			c-1.6,1.8-3.2,3.7-4.7,5.6c-2.3,0.1-4.7,0.1-7,0.1c-0.6-2.5-1.1-5-1.8-7.5l-1.2-0.9c-1.5-1.3-2.6-3-4.3-4.1c-1.4,0.3-2.7,1-4,1.5
+			c1.2,0.8,2.5,1.7,3.7,2.6c0.1,0.5,0.1,1.6,0.2,2.1c-2,0.4-4,0.8-5.9,1.2c-1.7-1.2-3.4-2.2-5.1-3.2c0-4,0-8.1,0.1-12.1
+			c1.6,1.3,3.3,2.6,4.8,4.1c1.1,1,2.2,2.8,4,2.3c1.1-0.9,1.6-2.4,2.3-3.6c-0.9-0.6-1.7-1.2-2.6-1.8c0.3-1.6,0.6-3.2,0.9-4.8
+			c-1.4-1.8-2.7-3.7-4-5.5c1.9-1.6,3.8-3.4,5-5.7c-1.9,0.3-3.8,0.7-5.7,1.1c0-1.6,0-3.3,0.1-4.9c1-0.3,2.1-0.5,3.2-0.8
+			c1.5,0.9,3,1.8,4.4,2.8c2.2,1.9,3.3,5.3,6.6,5.6c-0.2-1.7,0-3.7-1.7-4.7C1719.6,623.7,1718.7,622.4,1718.3,621.7 M1711.2,631.2
+			c1.2,0.9,2.4,1.6,3.9,2.1c-0.3-1.5,0.9-4.1-1.1-4.6C1713,629.5,1712.1,630.3,1711.2,631.2z"/>
+		<path class="st2" d="M0,622c0.8-1,1.6-1.9,2.3-2.9c2,1.7,4.5,3.1,6,5.3c0.8,2.9,1.4,6,1,9.1c-0.9,2.2-3.9,2.3-6,2.2
+			c-2.1-0.8-1.8-3.3-2.3-5.1c1.4-0.1,2.9-0.3,4.3-0.4c-0.2-1.7-0.5-3.4-0.7-5.1c-1.5-0.7-3.1-1.4-4.7-2V622z"/>
+		<path class="st2" d="M729.4,624.6c0.5-1.4,1-2.9,1.4-4.3c1.8,2.1,3.4,4.4,3.2,7.3c-3.5,2.8-8,4.5-10.5,8.2
+			c-0.5,1.2-0.8,2.5-1.1,3.8c-2.9,2.1-6.1,3.6-9.8,3.8c-0.3-1.7-1.4-3.5-0.8-5.3c1.9-1.8,4-3.5,5.5-5.8c-0.8-1.4-1.7-2.7-2.5-4.1
+			c2.4-1.5,4.9-2.6,7.4-3.9C724.6,624.5,727,624.9,729.4,624.6 M723.1,626.4c-1.5,1.3,0.9,3.6,2.2,2.2
+			C726.8,627.2,724.5,625.1,723.1,626.4 M718.7,627.4c-1.1,3.4,2.5,4.5,5.1,4C722.5,629.6,721,627.8,718.7,627.4z"/>
+		<path class="st2" d="M151.9,622.7c1.7-0.2,5-2,5,1c-0.3,1.2-0.6,2.4-1,3.6c-2.7,0.4-5.3,1.4-8,2c-0.3-0.3-0.9-1-1.2-1.3
+			C145.8,624.5,149.6,623.7,151.9,622.7z"/>
+		<path class="st2" d="M1466.3,622c2.4-0.3,4.9-0.3,7.4-0.5c-0.6,2.2-1.2,5,0.9,6.7c2.1,2.6,6.7,3.9,6.6,7.8
+			c-1.5,2.9-5.6,2.4-8.2,1.5c-5.3-2.5-10.6-5.2-14.9-9.1c2.1-0.6,4.2-1,6.2-1.9C1465.2,625,1465.7,623.5,1466.3,622z"/>
+		<path class="st2" d="M482.2,627c0.5-0.1,1.3-0.4,1.8-0.6c-0.2,0.6-0.5,1.7-0.6,2.2c-0.6,1.4-1.4,2.7-2.2,4.1
+			c-1.9-0.9-3.7-2.1-5.1-3.7c1.5-0.3,3-0.6,4.4-0.8C481,628,481.8,627.3,482.2,627z"/>
+		<path class="st2" d="M1702.8,626.3c2.5,0.1,4.9,0.8,6.5,2.8c-2.1,1.2-4.3,2.1-6.5,2.7C1702.7,630,1702.7,628.2,1702.8,626.3z"/>
+		<path class="st2" d="M151.6,630.6c1.7-1,3.7-0.2,5.6-0.1c-0.1,0.9-0.3,2.6-0.4,3.5c-1.7,1-3.5,1.9-5.2,2.9
+			C151.3,634.8,150.4,632.5,151.6,630.6z"/>
+		<path class="st2" d="M711.4,631c1.5-0.1,3,0,2.4,2c-0.8,1.8-3,2-4.6,2.4C709.9,633.9,710.7,632.5,711.4,631z"/>
+		<path class="st2" d="M1485.8,632.4c1.3-0.7,2.6-2,4.2-1.8c2.2,0.4,4,1.7,6.1,2.4c1.4-0.3,2.2-1.8,3.4-2.6c1.2,0.9,2.4,1.7,3.7,2.6
+			c-0.1,1.5-0.3,3-0.4,4.4c1.5-1.3,2.9-2.6,4.4-3.9c0.8,0.9,1.7,1.8,2.6,2.7c2-0.4,4.1-0.7,6,0.3c0.2,0.7,0.6,2.1,0.8,2.8
+			c1.2,0.3,2.4,0.1,3.6,0.2c0.1,0.7,0.3,2.2,0.4,2.9c-7.4,0-14.8-0.1-22.2,0c-0.9-2-1.4-4.4-3-6c-1.5-0.9-3.2-1.3-4.7-1.9
+			c-0.1-0.4-0.3-1.1-0.4-1.4C1488.8,633,1487.2,632.7,1485.8,632.4z"/>
+		<path class="st2" d="M1702.7,636c1.4-1.6,3-3.1,4.7-4.3c0.7,1.8,1.5,3.6,2.2,5.5c-1.7,0.2-3.3,0.3-4.9,0.5
+			c-0.7,0.8-1.3,1.7-1.9,2.5C1702.8,638.8,1702.7,637.4,1702.7,636z"/>
+		<path class="st2" d="M357,633.2c1.4,0.2,2.7,0.4,4.1,0.6c0.2,0.5,0.7,1.6,0.9,2.1c0.2,0.9,0.4,1.8,0.6,2.6c-2.3,0.4-4.6,1.3-7,0.8
+			C354.4,637.2,355.7,635,357,633.2z"/>
+		<path class="st2" d="M482.4,633.5c2,1.2,2.5,3.5,3.2,5.6c1.2,0.2,2.5,0.4,3.7,0.7c0.8,2.9,0.8,6.3,3.3,8.4
+			c0.4-0.7,1.3-2.1,1.7-2.8l1.1,0.2c4.4,2.5,4.8,7.7,5.6,12.1c-1.3-0.7-2.5-1.5-3.9-2.1c-3.1-0.6-6.5,0.7-9.2-1.3
+			c2.6-0.8,5.2-1.5,7.8-2.1c-0.2-0.8-0.5-2.3-0.7-3.1c-1.1,0.1-2.1,0.1-3.2,0.2c-1.2-1-2.1-2.5-3.6-2.7c-1.8,0-3.6,0.4-5.4,0.7
+			c-0.2-0.5-0.6-1.6-0.8-2.1c0.8,0,2.2,0.1,3,0.2c-0.1-0.4-0.5-1.2-0.6-1.6c-0.6-0.2-1.8-0.6-2.4-0.8
+			C481.9,639.9,482,636.7,482.4,633.5z"/>
+		<path class="st2" d="M1448.8,643c1.4-3.7,3.1-8.5,7.6-9.2c0.5,1.5,0.9,3,1.5,4.5c2,1.2,4.4,1.2,6.6,1.7c-0.1,0.7-0.3,2-0.5,2.6
+			c-3.2,0-6.3-0.2-9.4,0C1452.7,642.9,1450.8,643.1,1448.8,643z"/>
+		<path class="st2" d="M1421,650.9c2.2-5.5,4.6-11,6.8-16.5c0.4,0.5,1.3,1.3,1.7,1.8c2.7,0.8,5.2,2.2,7.3,4.1
+			c-1.3,1.7-2.7,3.3-4.1,4.9c0.2,0.7,0.8,2.1,1,2.8c1.7-0.5,3.3-1.1,4.9-1.8c-0.1-2.2,0-4.4,0.2-6.5c2,3.4,6.2,6.4,5.5,10.8
+			c-0.7,1.9-1.1,3.8-1.5,5.7c-2.3,1.6-4.8,2.9-7.7,2.3c0.3-1.1,0.7-2.3,1-3.4c-2.5-1.8-5-3.6-7.7-5.1c-0.4,1.4-0.7,2.7-1.1,4.1
+			c3.2,1.6,1.9,4.9,1.2,7.7c2.3,4.1,0,8.5-1.6,12.3c1.8-0.5,3.5-1,5.3-1.5c0.8-1.4,1.6-2.7,2.4-4.1c2.2,0.5,4.5,1,6.7,1.5l0-0.8
+			c0.5-2.9,2.2-5.4,3.8-7.9c0.3,0.5,0.8,1.4,1.1,1.9c-3.5,8.5-6.7,17.1-9.8,25.8c-1.6-0.5-3.1-1-4.6-1.5c-0.6,2.3-1.1,4.5-1.7,6.8
+			c1,0.5,2.1,1.1,3.2,1.7c-1.2,3.3-3,6.5-3,10.1c0,3.9-0.2,7.7-1.1,11.5c0.6,0.2,1.8,0.6,2.4,0.8c1.1,2,2.4,3.8,4,5.4
+			c0.8,0.5,1.6,0.9,2.5,1.3c0,0.8,0.1,2.3,0.2,3c0.7-0.6,1.5-1.2,2.2-1.8c1.3,0.3,2.8,0.7,4.2,1c-1.8,2.2,1,3.5,2.3,5
+			c-0.5,1.6-1.4,2.8-2.8,3.6c-1.4-0.8-2.8-1.6-4.3-2.3c0.8,2.4,1.7,4.8,2.5,7.2c-1,0.1-2.9,0.3-3.8,0.3c-3.6,0-7-0.8-10.1-2.5
+			c-1.2,0.7-2.2,1.7-3.2,2.6c-8.9-0.2-17.7,0.2-26.6-0.2c0.2-0.6,0.7-1.7,0.9-2.3c2.8-0.5,5.7-1.1,8.5-1.8c2.1-0.5,4.2-0.9,6.3-1.4
+			c1.7,0.7,3.8,2.5,5.1,0.2c-0.9-1.5-2-3.1-3.7-3.9c-2.3,0.7-4.5,1.9-6.7,2.9c-0.9-1.1-1.8-2.2-2.6-3.3c0.1-0.3,0.4-0.8,0.5-1.1
+			c0.8-0.1,2.6-0.4,3.4-0.5c-0.1-0.8-0.3-2.4-0.3-3.2c-0.7,0.2-2.2,0.6-2.9,0.8c0.6-0.9,0.4-3.6,2.2-3c1.5,0.2,3,0.7,4.6,1.1
+			c0.4-1.3,0.9-2.6,1.4-3.9c0.8,1.5,1.5,3.1,2.3,4.7c2.3,0.2,4.7,0.2,7,0.9c2.1,1.1,3.3,3.4,4.7,5.2c1,0.3,2,0.7,3.1,1
+			c0.7,2,1.4,4,2.1,5.9c0.4,0.1,1.1,0.2,1.4,0.3c0.3-1.5,0.6-3,1-4.5c-3.5-2.3-5.4-6.2-8.1-9.3c-2.2-2-1.4-5.2-1.6-7.8
+			c-3.2-1.6-6.8-3.2-10.4-2.3c-1.8,0.7-3.2,1.9-4.7,3c-0.1-1.3-0.2-2.6-0.3-3.9c-0.5-0.2-1.3-0.6-1.8-0.8c-1.3,2.3-3,4.3-6,4.2
+			c-0.1-2.4,0-4.7,0-7c2.4-1.6,4.4-5.2,2-7.6c-2.4,1.3-4.8,2.8-7.3,3.8c-0.3,1.3-0.6,2.7-0.8,4c-0.4-0.3-1.2-1-1.6-1.3
+			c-0.4-1-0.7-2.1-1-3.1c1.6-2.7,3.1-5.5,4.3-8.4c0.8,1.6,1,4.1,3.5,3.7c0.2-2.2-0.2-4.3-0.5-6.4c4.8-0.1,9.7,0.4,14.4-0.8
+			c1.4-2.4,1.2-5.3,1.5-8c-0.3,0.4-0.9,1.2-1.2,1.7c-2.5-4.9-2.5-10.8-5.7-15.4c0.5-3.6,2.9-7.1,4.2-10.6c1.7,1.3,3,3,4,4.9
+			c1.2-0.8,2.5-1.3,3.4-2.5c-0.6-1.4-1.9-2.6-2-4.1c0.6-2,1.7-3.9,2.6-5.8c-1.1-0.8-2.2-1.6-3.3-2.5
+			C1420.8,652.4,1420.9,651.4,1421,650.9 M1426.4,677.8c-1,1.6-3,3.1-2.5,5.2c1.7,2,4.2,2.9,6.5,4.2
+			C1430.7,683.6,1427.7,680.9,1426.4,677.8 M1422.2,702c-0.2,0.3-0.7,0.9-1,1.2C1422.2,706.6,1426,701.3,1422.2,702z"/>
+		<path class="st2" d="M460.5,636.2c0.6,0,1.8,0,2.4-0.1c0.6,1,1.2,1.9,1.9,2.9c0.4,0.4,1.1,1.3,1.5,1.8c1.5-0.7,3.1-1.4,4.6-2.1
+			c1.4-0.7,2.9-1.3,4.3-2c0.7,0.4,2.1,1.3,2.8,1.7c-0.6,1.2-1.2,2.5-1.9,3.7c-4.8,0.6-9.7,1.2-14.5,0
+			C460.9,640.1,460.7,638.1,460.5,636.2z"/>
+		<path class="st2" d="M1137.7,637.2c1.7,1.2,3.5,2.3,4.9,3.8c-1.3,2.1-5.7,3-4.6,5.9c2.8,0.2,5.4-1.8,8.1-2.6
+			c0.4-2.5,2.9-5.7,5.7-4c0.9,4.3,0.6,8.9,0,13.2c1.3,0.1,2.5,0.3,3.8,0.4c-0.4,1.8-0.8,3.5-0.8,5.4c1.3,0.5,2.6,1,4,1.4
+			c-1.2,3-2.4,6-3.5,9c-1.4-0.7-2.8-1.3-4.2-2c0.9-0.7,1.7-1.3,2.6-2c-0.5-0.7-1-1.3-1.5-2c-0.4-1.1-0.7-2.1-1.1-3.2
+			c-0.7-0.4-1.3-0.7-1.9-1c-1.8,0.6-3.5,1.1-5.4,1.3c0.4-1.3,1-2.5,1.3-3.7c0.8-3.5,1.4-7.1,2.8-10.5c-1.2,0-2.4,0-3.5-0.1
+			c0.5,1.5,0.9,3.1,1.4,4.6c-1.1,0.7-2.1,1.3-3.2,2c-0.4,1.6-0.9,3.2-1.4,4.7c-2.4-0.2-2.3-3.5-3.2-5.2c-0.1-1.1-0.2-2.2-0.2-3.3
+			c-0.6-0.2-1.9-0.6-2.5-0.8c-0.2-0.6-0.6-1.8-0.7-2.4C1135.4,643,1136.9,640.2,1137.7,637.2z"/>
+		<path class="st2" d="M17.5,639c2.9,3.2,5.3,6.8,8.3,9.8c-0.4,0.2-1.3,0.6-1.7,0.8c-1.5-0.5-3-1-4.4-1.5c-1-0.3-1.9-0.7-2.8-1
+			C17.1,644.3,17.3,641.6,17.5,639z"/>
+		<path class="st2" d="M691.2,643.1c1.8-0.8,3.7-1.4,5.5-2c1.1,1.6,2.2,3.2,3.4,4.9c0.6-1.5,1.3-3.1,2-4.6c1.3,1.5,2.7,3,4,4.5
+			c1.3-0.2,2.6-0.3,3.9-0.5c0.2,0.5,0.7,1.4,1,1.8c0.4,0.9,0.7,1.9,1.1,2.8c0.7,0.1,2.1,0.5,2.8,0.6c-3.8,0.5-6.2,3.4-8.4,6.3
+			c0.4,2.1,0.8,4.2,1.1,6.3c-3.5-0.4-6.6,0.8-8.5,3.8c-1.8,0.5-3.5,1-5.2,1.6c-1.5,0.7-2.9,1.7-4.2,2.8c1.2,1.7,3,3.3,3.3,5.4
+			c-0.7,2.3-3.4,2.3-5.1,1.3c-3-1.2-3.2-4.8-4.2-7.4c-1.3,0.3-2.7,0.6-4,1.1c-1.8,1.5-2.4,4-3.4,6.1c-0.7-1.1-1.5-2.2-2.2-3.3
+			c2.1-5,4.1-10.2,5.5-15.5c0.7-0.2,2-0.7,2.6-1c-0.2-1.3-0.3-2.7-0.4-4c2-0.5,4-1.1,6-1.6c2.2,3.5,5.5,8.3,10.3,7.3
+			c-0.7-2.9-4.1-3.6-6.2-5.1c-0.2-1.5-0.3-2.9-0.4-4.3c-1.8-0.1-3.7-0.3-5.5-0.4c0.3-1.2,0.5-2.4,0.8-3.5
+			C688.2,645.3,689.7,644.2,691.2,643.1 M702.3,645.9c0.1,1.1,0.3,2.1,0.5,3.2c-1,2.8-2.8,5.6-1.8,8.6c1.3,0,2.6-0.1,3.9-0.1
+			c-0.5-1.5-1.8-3-0.9-4.6C705.1,650.6,704.2,647.7,702.3,645.9 M695.2,647.1c-2.3,1.3,0,4,0.6,5.7c0.8-1.1,2.5-2,1.9-3.6
+			C697.6,648.2,696.6,645.5,695.2,647.1 M685.1,662.2c0.3,1.1,0,2.9,1.4,3.4c1.2,0.9,4.4,1.8,4.2-0.6
+			C690.3,662.7,686.9,662.5,685.1,662.2z"/>
+		<path class="st2" d="M0,645.9c1.1-0.6,2.2-1.3,3.3-1.8c0.8,1.3,1.6,2.7,2.4,4.1c-1.9,0-3.8-0.1-5.7-0.1V645.9z"/>
+		<path class="st2" d="M472.1,645.7c1.6-0.2,3.3-0.3,5-0.5c0.6,0,1.8-0.1,2.3-0.1c-0.9,1.7-1.9,3.4-3.5,4.6
+			c-0.4,0.3-1.1,0.8-1.4,1.1c0,1.7,0,3.3,0,5c-0.6,0.7-1.2,1.5-1.8,2.2c-0.2-1.8-0.4-3.6-0.5-5.3c-0.6-0.4-1.7-1.2-2.2-1.6
+			c-1.5,1.7-2.9,3.3-4.5,4.9c4.8,0.2,7.4,4.8,7.1,9.2c-0.6,0.1-1.8,0.3-2.4,0.4c-0.4-1-0.7-2.1-1.1-3.1l-0.2-0.9
+			c-0.3-1.4-0.6-2.7-0.8-4c-1,0-2.8-0.1-3.8-0.1c0.1,1.9,0.2,3.8,0.3,5.7c-1,0.9-1.9,1.8-2.9,2.8c-0.7-3.5-2.3-6.6-3.4-9.9
+			c0.5-2.4,1.5-4.6,2.7-6.7c0.4,0.1,1.3,0.2,1.7,0.3c0.4,0.5,1.1,1.4,1.5,1.9c0.3-0.1,0.8-0.2,1.1-0.3
+			C468.9,651.2,471,648.7,472.1,645.7z"/>
+		<path class="st2" d="M1155,647.2c1.8,1.2,3.7,2.3,5.7,3.3c-0.9,2.2,0.1,6.6-3.3,6.3c0-1.8,0-3.7,0-5.5c-1.2-0.5-2.3-0.9-3.4-1.4
+			C1154.4,649,1154.7,648,1155,647.2z"/>
+		<path class="st2" d="M1533.1,646.5c2.7,0,5.4,1.2,6.6,3.8c-0.5,3.3-2.1,6.4-2.1,9.8c-0.5,0.3-1.4,0.9-1.9,1.2
+			c-0.9-3.4-2.1-6.6-3-9.9C1532.8,649.7,1532.9,648.1,1533.1,646.5z"/>
+		<path class="st2" d="M1725.2,648.1c1.5,0,3.1,0,4.7,0c-0.3,1.1-0.5,2.2-0.7,3.3c-0.5,0-1.5-0.1-2.1-0.1c-0.5-0.1-1.4-0.2-1.8-0.3
+			C1725.2,650.3,1725.2,648.8,1725.2,648.1z"/>
+		<path class="st2" d="M4,650.8c1.4-1.1,3.2-2,4.9-0.8c2.3,0.6,1.7,3.5,2.2,5.2c-2.2-0.9-4.4-1.9-6.3-3.2L4,650.8z"/>
+		<path class="st2" d="M477.6,651.5c2.5-0.9,5-0.5,7.5,0l1,0.1c0.5,2.1,1.1,4.2,1.5,6.4c0,2.1-0.2,4.3-0.3,6.4
+			c-0.9,0.2-1.8,0.4-2.7,0.5c-0.5-1.2-1-2.5-1.4-3.7c-0.8,0.4-2.5,1.2-3.3,1.5l-0.8-0.7C477,659,477.3,655.1,477.6,651.5
+			 M480.1,655.3c-2,0.9,0,4.1,2.1,3C485.4,658.4,482.3,653.5,480.1,655.3z"/>
+		<path class="st2" d="M1562.4,650.3c3.6-1,6,2.2,8.2,4.5c0.5,0.4,1.4,1.3,1.9,1.7c-1.1,0.4-2.1,0.9-3.2,1.2
+			c-1.4-1.2-2.5-2.7-3.7-4.1c-2.5,3.1-0.1,6.3,1.9,8.9c-0.1,0.2-0.4,0.5-0.6,0.7c-1.7,0.1-3.5-0.1-5,0.8c0.2,1.7,0.6,3.4,1.1,5.1
+			c2.5-0.7,4.8-2,6.3-4.2c2,0.9,4,1.7,5.9,2.9c0,2-0.5,4-0.7,6c5.1-0.9,9.1-4.4,13.5-6.9c0.3,1.7,1.8,3.8,0.2,5.3
+			c-2.9,2.8-9,3-8.7,8.2c1.8-0.3,3.6-0.6,5.4-0.9c0.8,2.9,1.9,5.7,3.3,8.3c1-0.9,2-1.8,3-2.7c1.7,0.7,3.5,1.3,5.2,1.9
+			c0.4,1.2,0.8,2.4,1.2,3.6c0.8,2.8,2.3,5.3,3,8.1c0.1,0.5,0.2,1.6,0.3,2.2c-0.7-1.1-1.3-2.1-1.9-3.2c-0.4,0.6-1.3,1.8-1.7,2.4
+			c-1.3-0.3-2.5-0.5-3.7-0.8c-0.9,1-1.7,2.1-2.6,3.1c-2.9-0.6-5.8-1.2-8.7-0.8c0.8-1.3,1.5-2.5,2.3-3.8c-2.6-0.5-5.2-1-7.7-1.5
+			c-0.2,1-0.4,2-0.6,2.9c1.6,0,3.2,0.1,4.9,0.2c-1.3,2.8-3.7,4.9-5.8,7c-1.1,0.2-2.2,0.3-3.3,0.5c0.1,3.6,0.1,7.5,2.4,10.6
+			c-0.9,0.6-1.8,1.2-2.6,1.8c-2.4-1.4-2.7-4.6-3.7-7c0.7-1.3,1.9-2.6,0.9-4.1c-2.9-1.9-7.4-2.8-8.1-6.7c-0.4-0.2-1.3-0.6-1.7-0.8
+			c0.4-0.7,0.8-1.3,1.3-2c-0.2-1.2-0.4-2.3-0.6-3.5c-0.1-0.7-0.2-2-0.3-2.7c-1.9-0.8-3.9-1.5-5.8-2.2c-0.5,1.7-0.9,3.5-1.5,5.1
+			c-1.2,1.8-2.5,3.5-3.8,5.2c-0.5-0.3-1.4-0.9-1.9-1.2c-1.8-9.4-4.3-18.6-7.7-27.5c0.7-0.9,1.3-1.8,2-2.6c-1.3-3.3,0.4-6,2.4-8.5
+			c-1.3-1.4-2.8-2.6-4.2-3.8c1.1-0.7,2.3-1.5,3.4-2.2c-0.6-1.5-1.1-3.1-1.6-4.6c1.6,0.4,4-0.2,4.8,1.7c0.6,3.6,0.4,7.3,1.1,10.9
+			c-1,1.2-1.9,2.5-2.8,3.7c2.9-0.2,5.8-0.6,8.7-1c0.7,0.3,2,0.9,2.6,1.2c-0.5,1.5-0.9,3-1.4,4.5c1.8,0,3.7,0,5.5,0
+			c-1.6-2.7-2.5-5.7-2.3-8.8c-1.3-0.3-2.6-0.7-3.8-1c2-1.6,4.3-2.8,6.8-3.6C1560.8,655.5,1560.3,652.3,1562.4,650.3 M1546.4,669.5
+			c0,1,0,2,0,3c1.1,0.1,2.2,0.2,3.3,0.3c-0.1-1.1-0.2-2.3-0.2-3.4C1548.5,669.4,1547.4,669.5,1546.4,669.5 M1568.2,675.6
+			c1.6-1.8,2.6-6.9-1.2-6C1564.5,671.5,1566.3,674.1,1568.2,675.6 M1563.5,681.3c2.6,3.2,8.1,0.2,8.7-3.3
+			C1568.8,677.4,1566.3,679.9,1563.5,681.3 M1550.2,682.3c-1,1-2,1.9-3,2.9c1.4,0.5,2.8,1,4.3,1.5c0.3,0.4,0.9,1.2,1.2,1.6
+			c2.3,0.2,4.7,0.2,7,0.3c1.1-2,2.2-4,3-6.2c-2.9,1.5-6.1,2.4-9.3,2.6c0.2-1.6,0.8-3.7-0.6-4.9
+			C1551.2,679.6,1550.9,681.2,1550.2,682.3 M1576.8,685.9c-0.1,1.9-2.1,2.6-3.3,3.7c0,0.7,0,1.5,0.1,2.2c-1.2,0.9-2.4,1.8-3.6,2.8
+			c-0.4-0.6-1.2-1.7-1.6-2.3c-0.5,0-1.6,0-2.2,0c-0.4,1.4-0.8,2.9-1.2,4.4c1.4-0.5,2.9-1,4.4-1.4c1.1,1.1,2.2,3.1,4.1,2.3
+			c1.6-1.5,0.9-3.8,1.2-5.7c1.3-1,2.7-2,3.8-3.2c0-2.6-0.2-5.2,0-7.8C1576.5,681.8,1577.2,684.1,1576.8,685.9 M1565,689.9
+			c1.3-1.2,4.1-1.8,4.1-3.8C1566.2,684.9,1564.9,687.5,1565,689.9 M1583.9,694.5c0.9-0.1,1.8-0.2,2.7-0.4c0.8,0.8,1.6,1.6,2.5,2.5
+			c1.4-1.7,1.8-3.6,0.6-5.5C1587.5,691.7,1585.6,693,1583.9,694.5z"/>
+		<path class="st2" d="M503.1,652.2c2.4-1.6,3.2,1.6,4.5,2.9c-1.2,0.8-2.4,1.5-3.7,2.3C503.6,655.6,503.1,653.9,503.1,652.2z"/>
+		<path class="st2" d="M25.7,653.8c1-0.3,2.1-0.5,3.1-0.7c0.3,2.3,1,4.7,0.3,7c-1,1.2-2.7-0.3-4-0.3
+			C25.3,657.8,25.1,655.7,25.7,653.8z"/>
+		<path class="st2" d="M1702.8,655.8c1.9,1.6,3.9,3.1,6,4.4c0.6,0,1.8-0.1,2.4-0.1c0.7,0,2-0.1,2.7-0.2c0.2,0.6,0.7,1.7,0.9,2.3
+			c0.2,0.5,0.6,1.6,0.8,2.2c1.3,0.4,2.6,0.8,4,1.2c0.4,1.3,0.7,2.6,1.1,4c3.9,0.5,8,0.5,11.9-0.6l0.4-0.1v7.9
+			c-0.4-0.2-1.1-0.6-1.5-0.8c-2.4-1.2-4.8-2.8-7.5-3.2c-3,0.7-5.6,2.4-8.7,2.8c-0.8-1.2-1.6-2.3-2.6-3.4c-3.3-0.7-6.7-0.7-10-1.1
+			c0-1.8,0.1-3.6,0.2-5.4c2.1,0,4.1-0.1,6.2,0c0.1,0.6,0.4,1.9,0.5,2.5c2.3,0.8,4.3,2.1,5.9,3.9c1.2-0.6,2.5-1.1,3.8-1.7
+			c-3.6-2-7.9-3.5-9.3-7.8c-2.4-0.2-4.7-0.4-7-0.6C1702.9,659.8,1702.8,657.8,1702.8,655.8z"/>
+		<path class="st2" d="M134.3,661.7c0.4-1.8,0.8-3.7,1.3-5.5c0.7,0.4,2,1,2.7,1.4c1.6,3.8,5,6.6,8.8,8.1c1.2-0.8,2.4-1.8,3.5-2.7
+			c1.7,0.5,3.5,1,5.1,1.9c1.1,3.4-3.2,3.6-5.4,4.5c-5,0.5-10.4-2.3-15,0.7c-2.5,2.8-1.5,6.9-1.7,10.4c-1.2,0.9-2.5,1.8-3.7,2.7
+			c0.4-7.2,1.2-14.5,1.3-21.8C132.1,661.5,133.2,661.6,134.3,661.7z"/>
+		<path class="st2" d="M1130.2,656c1,1.9,1.8,3.9,2.4,6c-1.9,1.7-4,3.5-4.1,6.2c0.5,1.1,1,2.2,1.6,3.2c1.1-1.3,2.3-2.7,3.2-4.2
+			c0.5-1,0.9-2.1,1.4-3.1c1.8,1.8,2.6,4.2,3.5,6.5c1.2,0.3,2.5,0.6,3.8,0.8c0.6,0.6,1.3,1.2,1.9,1.9c0.7,0.8,1.3,1.6,2,2.4
+			c-0.5,0.1-1.5,0.3-2,0.4c-0.4,0.1-1.3,0.2-1.7,0.3c0.3,2.1,0.6,4.1,1,6.2c1,0,2,0,3,0c-1,1.9-2,3.8-3,5.8
+			c-1.5-1.7-2.4-3.9-2.9-6.1c-1-0.3-1.9-0.6-2.9-0.9c-2-0.6-4.1-0.9-6.1-1.6c0.7-2.3,1.6-4.5,2.3-6.8c-3.2,0.2-6.4,0.5-9.6,0.8
+			c0-0.7,0.1-2.1,0.2-2.9C1125.8,665.8,1128,660.9,1130.2,656z"/>
+		<path class="st2" d="M505.9,658c1,1,2.1,2.1,3.1,3.1c-1.7,2.1-4.1,4.1-4.6,6.9c0.2,2.5,1,4.8,1.6,7.2c-1.9-1-3.8-2-5.8-2.9
+			c0.2-1.3,0.5-2.6,0.7-3.8c0.1-0.6,0.4-1.7,0.5-2.3c-0.2-0.6-0.5-1.9-0.7-2.5c-0.3-1.1-0.6-2.1-0.8-3.2c1.1,0.7,2.2,1.4,3.4,2.2
+			c0.2-0.4,0.7-1.1,0.9-1.5C504.9,660,505.4,659,505.9,658z"/>
+		<path class="st2" d="M493.2,659c1.3,0.3,2.7,0.5,4.1,0.9c2,0.9,0.8,3.5,1,5.1c-0.1,0.6-0.4,1.7-0.6,2.3c-0.3,0.8-0.6,1.6-1,2.4
+			c-1-0.3-1.9-0.6-2.8-0.9c-1.6-0.9-3.2-1.9-4.9-2.9c0.9-1.5,1.8-3,2.7-4.5c1.1,1.7,2.3,3.9,4.7,4
+			C496.4,662.8,494.5,660.9,493.2,659z"/>
+		<path class="st2" d="M1133.2,661c2-2.5,4.5-1.3,6.7,0c0.4,1,0.8,2,1.3,3c-0.3,0.2-1.1,0.8-1.4,1
+			C1137.5,664,1135.2,662.6,1133.2,661z"/>
+		<path class="st2" d="M1286,661.3c0.5-0.5,1.6-1.4,2.2-1.9c1.7,1.3,3.4,2.7,5,4.3c0.6,0.8,1.3,1.5,1.9,2.3
+			c-0.5,1.2-0.9,2.5-1.4,3.8c-0.4,0.3-1.3,1-1.7,1.3c0.2-1.3,0.3-2.5,0.5-3.8c-1.8-0.5-3.6-1.1-5.4-1.6
+			C1286.7,664.2,1286.3,662.8,1286,661.3z"/>
+		<path class="st2" d="M1538.1,661c1.1-0.5,2.3-1,3.5-1.5c0.1,2.5-2,4-3.7,5.4C1537.4,663.9,1536.3,661.6,1538.1,661z"/>
+		<path class="st2" d="M1020,662.8c0.6-0.4,1.8-1.1,2.4-1.4c0,2.5,0,5.1,0,7.6c-1.6,0.9-3.2,1.7-4.7,2.6c-1.1-2-2-4-2.7-6.1
+			C1016.6,664.7,1018.4,663.8,1020,662.8z"/>
+		<path class="st2" d="M7.6,666.4c1.3-0.2,2.6-0.5,3.9-0.7c0.1,0.2,0.4,0.7,0.6,1c0.3,2.2,0.5,4.4,0.7,6.6c-2.9,0.2-5.6,0.8-8.2,2
+			c-0.4-1-0.8-2-1.2-3c0.4-0.2,1.3-0.8,1.7-1C7.6,670.8,7.5,668.4,7.6,666.4z"/>
+		<path class="st2" d="M705.1,670.8c1.3,0,2.5-0.1,3.8-0.1c-0.1,1-0.3,2-0.4,3c-0.7,0.6-1.4,1.1-2.1,1.7c-1.4,1-3,1.9-4.6,2.5
+			c-0.9-2,0.3-3.9,1.2-5.6C703.6,671.7,704.3,671.2,705.1,670.8z"/>
+		<path class="st2" d="M1149.7,670.8c1.3,0.8,2.7,1.7,4.1,2.6c-0.9,2.3-1.8,4.7-2.5,7.1l-0.7,0c-0.5-0.2-1.5-0.5-2-0.7
+			C1149.2,676.8,1149.7,673.8,1149.7,670.8z"/>
+		<path class="st2" d="M1015.6,681.2c-1.6-4.1,2.6-6.5,5-9.1c0.7,2.6,1,5.3,0.7,8c-0.2,0.3-0.6,0.9-0.8,1.2
+			C1018.8,681.3,1017.2,681.3,1015.6,681.2z"/>
+		<path class="st2" d="M1702.7,673.6c2.9-0.5,5.8,0.1,8.3,1.5c-1.8,0.7-3.5,1.4-5.3,2.2c-1.7,1.2-2.9,2.9-2.3,5
+			c1.5-0.4,3.1-0.7,4.7-1c0.7,0,2-0.1,2.6-0.1c-0.4,2-0.8,4.1-1.2,6.1c-0.7,0.3-2,0.9-2.7,1.2c-0.8-2.1-1.4-4.2-1.9-6.3
+			c-0.5,1.3-1,2.6-1.5,3.9C1703.2,682,1702.7,677.8,1702.7,673.6z"/>
+		<path class="st2" d="M17.9,674.7c2.6-0.8,5.3-1.1,8-0.8c1.3,0.9,2.5,1.7,3.5,2.9c0.1,1.5,0,3-0.2,4.5
+			C25.1,679.8,21.3,677.6,17.9,674.7z"/>
+		<path class="st2" d="M142.1,674.2c3.2,1.2,6.6,2.1,10,1.2c1.3,0.7,2.6,1.4,4,2.1c-0.4,1.5-0.6,2.9-0.8,4.4
+			c-3.5-1.5-7.2-0.7-10.8-0.4C141.5,680.3,142.3,676.7,142.1,674.2z"/>
+		<path class="st2" d="M489.1,674.5c0.4-0.3,1.1-0.9,1.5-1.2c1.2,1.8,2.5,3.6,3.8,5.4c0.2,1.8,0.5,3.6,0.8,5.3
+			c1.2,0.5,2.5,1,3.6,1.7c-0.6,1.4-1.4,2.8-2.2,4.2c0.3,0.6,1,1.8,1.3,2.4l0.4,0.8c-0.3,0.2-0.9,0.7-1.2,0.9
+			c-1.9,1.3-3.8,2.7-5.7,4.1c0.1-1.8,0.3-3.7,0.4-5.5c-3.3-0.3-6.5-1.1-9.4-2.8c0.1-1.7,0.2-3.3,0.4-5c0.9-1.3,1.8-2.5,2.8-3.7
+			c0.2-0.2,0.5-0.6,0.7-0.9c-0.7-1.8-1.4-3.7-1-5.7c1.2,1.1,2.4,2.2,3.6,3.3C489,677.2,489.1,675.4,489.1,674.5 M485.5,685.9
+			c0.8,1.3,1,3.4,2.7,3.8c1.5,0.6,2.7-0.9,3.5-1.9C490.1,686.3,487.6,686.4,485.5,685.9z"/>
+		<path class="st2" d="M236.9,680.3c5.2,1,9.9-1.3,13.8-4.5c-0.8,2.8-1.1,5.6-0.8,8.5c-0.2,0.3-0.5,0.9-0.7,1.2
+			c-3,2.6-4.5,6.7-8.2,8.4c-3.1,1.5-6.1,3.3-8.4,5.9c-0.4,0.1-1.2,0.3-1.6,0.4c-0.5-1.1-0.9-2.2-1.4-3.2c2.4-1.3,4.2-3.5,5.4-5.9
+			c1.4-0.7,2.8-1.3,4.2-2.1C238.8,686,237.7,683.2,236.9,680.3z"/>
+		<path class="st2" d="M1588.6,683c0.1-3,1-6,3.4-8c0.5,1.3,1,2.6,1.5,3.8c-0.3,2-0.8,3.9-1.7,5.7
+			C1590.6,684.2,1589.5,683.7,1588.6,683z"/>
+		<path class="st2" d="M223.5,684.2c0.2-4.1,4.8-4.1,7.7-4.9c0.4,1.3,0.8,2.5,1.3,3.8c-2.4,2.3-5.2,4.4-5.7,7.9
+			C225.7,688.6,224.6,686.4,223.5,684.2z"/>
+		<path class="st2" d="M501.3,680.2c0.8,0.4,1.5,0.7,2.3,1.1c0.4,0.4,1.1,1.2,1.5,1.7c1.9,2.6,4.5,4.6,7.2,6.3c-1.2,1-2.4,2-3.6,3
+			c-1.2-1.6-2.4-3.2-3.7-4.7c0.7,3.7,2.3,7.4,1.9,11.3c-0.8,0.1-2.5,0.3-3.3,0.4c-2.8,0.3-5.5,0.7-8.3,0.9c0.7-2.2,2.8-3.3,4.6-4.5
+			c0.9-0.7,1.7-1.4,2.6-2c-0.6-1.2-1.3-2.3-2-3.5c0.6-1.1,1.2-2.2,1.9-3.3C501.5,684.7,501.1,682.5,501.3,680.2z"/>
+		<path class="st2" d="M669.5,692.4c2.7-4.9,6.7-8.9,10.7-12.8c1.9,0.5,6.8,0.7,5.4,3.7c-2.6,1.1-5.8,1.6-6.8,4.6
+			c-1.3,2-2.6,4-4.1,5.9c-1,1.3-2.5,2.1-3.8,2.9C670.4,695.3,668.9,693.9,669.5,692.4z"/>
+		<path class="st2" d="M1713.5,685.7c2.2-2.1,4.7-4,7.2-5.6c0,1.6,0,3.2,0.1,4.8c-0.9,0.8-1.8,1.5-2.7,2.3c0.8,0.3,2.3,1,3.1,1.4
+			c0,0.5-0.1,1.6-0.2,2.2C1718.2,689.5,1715.7,687.7,1713.5,685.7z"/>
+		<path class="st2" d="M1407.8,681.3c0.2,0,0.5,0,0.7,0c-0.1,0.6-0.2,1.9-0.2,2.6c0.8-0.2,2.4-0.6,3.1-0.8c0,1.6,0.1,3.2,0.2,4.8
+			c-0.1,0.3-0.4,1-0.5,1.3c-1.9-0.6-3.7-1.3-5.4-2.4C1406.5,684.9,1407.2,683.1,1407.8,681.3z"/>
+		<path class="st2" d="M1729,683c1.3-0.4,2.7-0.7,4-1.1v3.7l-0.8,0.3c-1.5,2.2-3,4.4-5.2,5.9c0-0.6,0.1-1.9,0.1-2.5
+			c0.4-0.5,1.1-1.4,1.5-1.9C1728.7,685.9,1728.8,684.5,1729,683z"/>
+		<path class="st2" d="M136.4,682.6c0.9,0.8,1.7,1.5,2.5,2.4c1.4,1.4-0.3,3.1-0.7,4.5c-0.3,0.5-1,1.4-1.3,1.9
+			c-0.4,0.7-0.9,1.5-1.3,2.2c-0.5,0.2-1.6,0.8-2.1,1c-0.2,1.2-0.5,2.4-0.7,3.7c-0.2,0.8-0.3,1.6-0.4,2.4c-0.8,1-1.6,2-2.5,3
+			c-0.9-1.4-1.8-2.8-2.7-4.2c0.2-1.8,0.3-3.5,0.5-5.2C131.2,690.8,132,685.4,136.4,682.6z"/>
+		<path class="st2" d="M707,683.3c1.2,0,2.4,0.1,3.7,0.2c0.8,0.8,1.5,1.7,2.3,2.5c0.2,0.2,0.6,0.7,0.8,0.9c0,0.8-0.1,2.3-0.1,3.1
+			c-1.5-0.1-3-0.1-4.5-0.3C707.6,688,707.6,685.4,707,683.3z"/>
+		<path class="st2" d="M996.2,689.3c0.9-1.9,1.8-3.8,2.8-5.6c1.2,3.1,2.5,6.2,4.1,9.1c0.6,0,1.8-0.1,2.4-0.1
+			c0.3-0.5,0.8-1.4,1.1-1.9c-0.5-0.9-0.9-1.9-1.4-2.8c0.3-0.2,1-0.6,1.4-0.8c1.6-1.1,3.4-1.5,5.3-1.4c0.8,0.6,1.6,1.3,2.3,2
+			c-1.4,2.1-2.3,4.7-4.4,6.2c-1.7,0.3-3.5,0.5-5.2,0.7c4.9,3.5,10.9,7.4,17.1,5.5c-0.5,5.8,2.3,11.3,2.4,17.1
+			c-1.3,0.1-2.7,0.2-4,0.4c0.3-2,0.6-3.9,0.9-5.9c-0.3-0.4-0.8-1.3-1.1-1.7c-1.3-2.1-3.2-5.1-6.1-4.2c-2.3,0.9-4.5,2.2-6.8,3.2
+			c0.6-1.4,1.1-2.8,1.8-4.2c-3.1-0.2-6.2-0.6-9.3-0.8c-1.2-0.1-2.3,0-3.5,0.3c-0.6-0.3-1.9-1-2.5-1.3c-0.1-0.4-0.4-1.3-0.5-1.8
+			c0.4-0.1,1.2-0.3,1.7-0.4c2.6-0.1,5.2,0.1,7.8,0.6c-1.6-2.5-4.4-5.4-2.7-8.5c0.4-0.6,1.2-1.9,1.6-2.5
+			C999.8,690,998,689.7,996.2,689.3 M1010.3,700.3c-2.5,0.7-0.8,4.3,1.4,3.4C1014.1,703.1,1012.4,699,1010.3,700.3z"/>
+		<path class="st2" d="M24.2,693c-1-2.8-3.5-7.2,0.8-8.6c1.5,1.5,3.6,3.2,2.9,5.6C27.5,691.8,25.5,692.2,24.2,693z"/>
+		<path class="st2" d="M150.2,684.9c1.6,0.6,3.3,1.2,4.9,1.9c-0.1,1.9-0.2,3.9-0.4,5.8c-1.5,1.5-3.9,2.9-3.3,5.4
+			c0.7,1.9,3,2.7,3.7,4.7c0.7,1.9,1.1,3.9,1.6,5.9c-0.7,2.2-1.6,4.3-2.7,6.4c-2.2-2.4-2.1-5.4-1.8-8.4c-2.6-2.1-5.2-4.3-6.9-7.3
+			c0.5-1.7,0.9-3.5,1.1-5.2c-1.5,0.9-3,1.9-4.5,2.8c-0.8-0.8-1.7-1.6-2.5-2.4c0.7-1.2,1.4-2.3,2.2-3.5c3.3,0,7,0.6,9.9-1.6
+			C151.1,688,150.7,686.4,150.2,684.9z"/>
+		<path class="st2" d="M684.5,692.4c2.7-3.9,7.5-5.8,12.2-5c-0.2,0.9-0.4,1.7-0.6,2.6c-1,0.2-2,0.5-3,0.9c-2.3,2.3-4.5,4.8-7.9,5.4
+			C685,694.9,684.3,693.7,684.5,692.4z"/>
+		<path class="st2" d="M1120.8,691.3c1.8-1.9,3.5-4.3,6.2-4.7c0.2,0.5,0.7,1.6,0.9,2.1c0.2,0.5,0.5,1.6,0.6,2.2
+			c1,0.2,2.1,0.3,3.1,0.5c0,0.6-0.1,1.7-0.2,2.3C1128.1,692.5,1124.2,693,1120.8,691.3z"/>
+		<path class="st2" d="M1299.4,691c1.1-1.6,2.3-3.2,3.7-4.5c0.2,2.4,0.4,4.7,0.3,7.1l-1.3-0.2C1301.2,692.5,1300.3,691.8,1299.4,691
+			z"/>
+		<path class="st2" d="M1304.4,692.5c0.7-2.1,1.8-4,3.2-5.8c1.2,3.7,2.8,7.3,4.2,10.9c0.4,1.2,0.8,2.4,1.3,3.7
+			c-3.2,1.9-6.9,1.9-10.4,1.1c-0.7,1.2-1.4,2.4-2.1,3.5c-1.7-0.6-3.3-1.2-5-1.8c0.2,2.5,0.5,5,0.9,7.5c0.5-0.4,1.1-0.8,1.6-1.1
+			c1.2,0,2.3,0,3.6,0l0.5-0.6c0.4-0.4,1.1-1.3,1.4-1.8c0.9,0.3,1.8,0.5,2.6,0.8c-0.3,0.6-0.9,1.7-1.2,2.3c-0.1,0.2-0.4,0.7-0.5,0.9
+			c-0.2,1-0.2,1.9-0.3,2.9c1.4,0.6,2.8,1.2,4.1,1.8c-0.7,0.5-1.3,1-1.9,1.5c-1.3-0.2-2.6-0.4-3.9-0.5c0.9,1.4,1.8,2.7,2.8,4
+			c0.9,1,1.8,2.1,2.8,3.1c-0.2,0.5-0.6,1.5-0.8,2.1c0.6,0.3,1.2,0.5,1.8,0.8c0.2-2,0.5-4,1.1-5.8c-0.1-0.7-0.2-2-0.2-2.6
+			c1.8,0.3,3.6,0.7,5.4,1c-1.5,1.5-2.8,3.2-3.1,5.4c4.8-0.9,6.3-5.9,8.4-9.6c1.1,1,2.3,2.1,3.5,3.1c-0.5,0.8-1,1.6-1.5,2.4
+			c-0.5,0.7-0.9,1.5-1.3,2.2c-3.2,3-7.7,4.6-9.7,8.6c-1.5-1-2.8-2.6-4.7-2.9c-2.4,1-4.5,2.4-6.8,3.6c0.1,1.3,0.7,2.5,1.6,3.4
+			c2.1-1.1,3.9-3.1,6.5-3.1c0.7,3.3-3,4.9-4.6,7.3c-1.1,0-2.2-0.1-3.2-0.1c0-0.7,0-2.2-0.1-2.9c-0.6-0.4-1.8-1.2-2.5-1.7
+			c-1.3-0.2-2.7-0.4-4-0.5c1.9-0.5,4.7-0.2,5.4-2.6c0.1-1.8-1.3-3.1-2-4.6c1.1-2,2.4-3.9,3.8-5.7c0.2-2.6,0.6-5.5-1.9-7.2
+			c-0.5-0.3-1.5-0.9-2-1.2c-0.5,0.4-1.4,1.2-1.9,1.5c-1.9,0.8-3.9,1.3-5.8,1.9c-0.3-1.1-0.6-2.2-0.9-3.3c-0.3-0.1-1-0.4-1.4-0.5
+			c-3.4-1.6-7.2-4.4-6.9-8.6c0.9-1.3,2.2-2.4,3.3-3.5c-0.2,2.4-0.5,4.9-0.6,7.3c0.9,0.1,1.9,0.3,2.9,0.5c1.6-2.5,3.4-4.8,5.4-7
+			c1.2,0,2.4,0,3.7,0.1c0.2-0.4,0.6-1.1,0.9-1.5c0.2-0.6,0.5-1.8,0.7-2.3c2-0.8,4.1-1.6,6.2-2.4c1.3,0.9,2.7,1.9,4.1,2.8
+			c-0.1-0.5-0.2-1.5-0.3-2C1306.7,695.3,1305.5,693.9,1304.4,692.5 M1288.5,710.2c0.7,0.3,1.9,1,2.6,1.3c1.7-1.4-0.3-3.3-1.1-4.5
+			C1289.6,707.7,1288.9,709.4,1288.5,710.2z"/>
+		<path class="st2" d="M248.5,691.5c2-0.7,4.1-0.9,6.2-0.9c-0.8,1.4-1.5,2.8-2.3,4.1C250.6,694.4,249.8,692.5,248.5,691.5z"/>
+		<path class="st2" d="M1702.6,691.3c2.2,0.2,4.5,0.2,6.8,0.3c0.5,0.4,1.6,1.3,2.1,1.7c0.6,0.6,1.3,1.2,2,1.8
+			c1.6,0.2,3.2-0.1,4.7-0.9c2.4-0.2,4.8-0.3,7.3-0.4c0,1.5,0,3,0,4.5c-2.1,0.4-4.3,0.8-6.4,1.1c-1,0.2-2,0.4-3,0.6
+			c-1.5,0.3-2.9,0.6-4.4,0.8c-0.8-1.1-1.7-2.2-2.5-3.2c-1.6,0.5-3.2,1.3-4.7,2c-0.3-0.5-0.8-1.4-1.1-1.8
+			C1702.9,695.7,1702.7,693.5,1702.6,691.3z"/>
+		<path class="st2" d="M522.9,693.5c0.3-0.2,1-0.5,1.4-0.7c0.8,0.4,2.4,1.1,3.2,1.5c-0.2,2.2-0.2,4.4-0.6,6.6
+			c-0.4-0.1-1.2-0.4-1.6-0.5c-0.3-0.1-1-0.3-1.4-0.4c-0.3-2.1-0.6-4.1-1.1-6.2L522.9,693.5z"/>
+		<path class="st2" d="M706.4,695.3c1.7-2,5.5-3,7.2-0.5c-2.4,3.2-5,6.2-7.5,9.3c-3-1.8-6.4-3-9.8-3.6c-2.5-0.8-3-3.1-2.7-5.4
+			c1.4-0.5,2.8-1,4.2-1.5c1.2,0.3,2.3,0.7,3.5,1.1c0.6,1.7,1.1,3.5,2,5.1c1,0.2,2.1,0.4,3.1,0.6
+			C706.4,698.7,705.7,696.9,706.4,695.3z"/>
+		<path class="st2" d="M480.5,693.6l1.3,0.1c1.2,0.3,2.4,0.7,3.6,1.1c0.4,1.1,0.9,2.1,1.5,3.1c0.6,1.1,1.3,2.2,1.9,3.2
+			c-1.6,0.4-3.3,0.7-4.9,1.1c-0.6-1.2-1.2-2.4-1.7-3.5c-0.4-0.4-1.2-1.3-1.6-1.8C480.5,696.2,480.5,694.5,480.5,693.6z"/>
+		<path class="st2" d="M1113.6,693.6c0.9,0,2.6,0,3.4,0c0.7,0.9,1.5,1.9,2.3,2.8c0.7,0.1,2.1,0.3,2.8,0.5c0.4,2.5,0.7,5,1,7.5
+			c-1.7,0.7-3.4,1.4-5.1,2.1c-0.6-1.4-1.3-2.7-1.9-4c-1.4-0.1-2.5,0.4-3.2,1.5c-0.9,4.5-3.8,8-7.1,11c-0.4-0.3-1.1-0.8-1.4-1
+			c0.2-1,0.5-2,0.8-2.9C1107.8,705.1,1111.2,699.6,1113.6,693.6z"/>
+		<path class="st2" d="M238.1,702.7c1.6-3.1,3.8-5.9,6.9-7.5c0.5,0.2,1.6,0.5,2.1,0.7c1.4,1.2,2.9,2.5,4.1,3.9
+			c1.9,2.1,1.6,5.2,2,7.9c1.3,0.2,2.6,0.4,3.9,0.5c0.5-1.3,1.1-2.5,1.6-3.8c0.5-0.1,1.5-0.2,2-0.3c0.4,0.9,0.9,1.8,1.3,2.8
+			c-1.1,0.8-2.3,1.6-3.4,2.4c-1.4,4-3.8,7.6-5.4,11.6c-2-2.5-3.7-5.2-5.7-7.6c-2.2-1.9-5.1-2.8-7.7-3.9c-0.7,1.7-1.4,3.3-2.1,5
+			c-1.1-2.6-2.3-5.1-3.7-7.6C235.5,705.5,236.8,704.1,238.1,702.7 M244.2,700c-0.4,2.2-2,5.5,1.1,6.6c2.8,0.8,2.3-2.9,2.1-4.6
+			C247.6,700.1,245.4,700.5,244.2,700z"/>
+		<path class="st2" d="M517.6,697.5c0.6-0.7,1.2-1.4,1.7-2c1.1,1.3,2.2,2.8,3.3,4.1c-0.8,0.8-1.6,1.8-2.4,2.6
+			c-0.6,0.5-1.9,1.4-2.5,1.9c0,2.3-1.5,5.4,1.1,6.7c-0.2,0.2-0.7,0.7-0.9,1c-2.4,3.4-2.3,8-6,10.5c-0.8,0.8-1.6,1.7-2.4,2.6
+			c-3.8-2.5-7.4-5.2-10.9-8.1c0.2-0.4,0.7-1.1,0.9-1.4c2.3-0.9,4.4-2.1,6.8-2.8c2.3,0,4.5,0.7,6.8,1.1c0.8-1.5,1.7-3,2.2-4.7
+			c0.5-1.7-1.2-2.8-2.1-4c-0.8,1.2-1.6,2.3-2.4,3.5c-0.6-0.2-1.8-0.5-2.4-0.7c-1.1-0.7-2.1-1.5-3.2-2.2c1.4-2.6,2.4-5.3,3.4-8
+			c0.8,1.4,1.5,2.9,2.2,4.3c0.6-0.4,1.3-0.8,2-1.3C514.6,699.7,516.1,698.7,517.6,697.5z"/>
+		<path class="st2" d="M1725.5,696.2c2.5,0,5,0.1,7.5,0.1v7.2l-0.8,0.6C1729.6,701.8,1726.5,699.7,1725.5,696.2z"/>
+		<path class="st2" d="M1138.7,697c2.1,0.4,4.1,1,6.1,1.7c-0.2,0.6-0.6,1.7-0.7,2.3c-1.2,0.3-2.3,0.7-3.4,1
+			C1140,700.4,1139.3,698.7,1138.7,697z"/>
+		<path class="st2" d="M681.9,699.6c0.9,0.1,1.8,0.2,2.8,0.3c-0.1,1.5-0.2,3.1-0.4,4.6c-0.8-0.3-2.3-0.8-3.1-1.1
+			C681.4,702.1,681.7,700.9,681.9,699.6z"/>
+		<path class="st2" d="M1126.3,702.3c1.5-0.7,2.9-1.8,4.6-1.9c1.4,0.6,2.7,1.4,4,2.2c-0.8,1.2-0.8,3.4-2.7,3.3
+			C1130.2,704.7,1128.3,703.4,1126.3,702.3z"/>
+		<path class="st2" d="M490.8,702.1c1.2-0.3,2.4-0.7,3.7-1c0.3,0.6,1,1.7,1.3,2.3l0.5,0c1.6,0,3.1,0,4.7,0c0.5,0,1.6-0.1,2.1-0.1
+			c-2.1,2.8-3.9,5.9-5.8,8.8c-0.9,0-2.7,0.1-3.5,0.2c-0.5-0.4-1.4-1.3-1.9-1.8c0.1-0.7,0.2-2,0.3-2.7c1.1-0.2,2.1-0.5,3.2-0.7
+			c0.1-0.3,0.4-1,0.5-1.3C493.7,705.3,491.8,704.1,490.8,702.1z"/>
+		<path class="st2" d="M263.5,701.8c1.1,0.1,2.3,0.2,3.4,0.3c0.1,1.7,0.2,3.3,0.4,5c-0.8,0.8-1.7,1.6-2.6,2.3
+			C263,707.2,263.4,704.4,263.5,701.8z"/>
+		<path class="st2" d="M688.7,702.7c3-0.6,6.8,1.4,8.2,4.1c-0.5,0.9-1,1.9-1.5,2.9c-1.1,0-2.3,0-3.4,0
+			C688.7,709.6,688.1,705.3,688.7,702.7z"/>
+		<path class="st2" d="M1551.2,702.3c1.7-1.6,4.5,0.2,6.4,0.9c0.3,2.5-2.8,2.4-4.4,1.6C1552.3,704.5,1549.3,703.6,1551.2,702.3z"/>
+		<path class="st2" d="M1589.6,708.3c2.4-2.2,5-4.3,6.9-7c1.1,0.9,2.2,1.8,3.3,2.7C1598.5,708.2,1593.4,708.8,1589.6,708.3z"/>
+		<path class="st2" d="M1716.6,708.1c-1.4-2-1.5-4.1-0.1-6.2c1-0.1,2.9-0.3,3.8-0.4c1,1.8,2.1,3.5,3.2,5.3c-0.9,0.7-1.7,1.4-2.5,2
+			c-2.2,1.2-2.8,3.5-3.1,5.8l-0.9,1.5c-0.9-1.3-1.7-2.7-2.5-4c0-0.4,0.1-1.2,0.1-1.7C1715.3,709.6,1715.9,708.8,1716.6,708.1z"/>
+		<path class="st2" d="M271.8,705.8c2.6-1.2,5.3-3,8.2-2c-2.4,5.1-4.7,10.2-6.6,15.4c-0.6-0.2-1.7-0.5-2.2-0.7
+			c-0.7-0.8-1.3-1.6-2-2.4C270.4,712.8,271.2,709.3,271.8,705.8z"/>
+		<path class="st2" d="M1726.4,703.5c0.9,0,1.8,0,2.8,0c0.1,0.6,0.4,1.9,0.5,2.5c0.3,1.7,0.7,3.3,1.1,5c-0.8,0.1-2.3,0.2-3.1,0.3
+			C1726.2,709,1726.3,706.2,1726.4,703.5z"/>
+		<path class="st2" d="M655.5,706.4c0.8-2.2,3.1-2,5-1.9c0.2,2-0.2,3.9-1.7,5.3C657.7,708.8,654.7,708.4,655.5,706.4z"/>
+		<path class="st2" d="M1578.4,712.7c0.9-3.2,1.1-7,3.6-9.4c1.5,0,3,0.6,4.2,1.6c-0.2,3.4-0.5,6.7-1,10.1c-0.5,0.3-1.4,0.8-1.9,1.1
+			c0.2,2.2,2.3,3,4,3.9c0.1-0.8,0.4-2.4,0.5-3.2c1.3-1.3,2.6-2.7,4-4c0.1,2,0.2,4,0.3,6c-0.7,1-1.4,1.9-2.1,2.9
+			c1.8,1.7,3.7,3.7,6.3,4c0.2-1.1,0.3-2.2,0.5-3.3c-1.4,0.1-2.8,0.3-4.2,0.3c1.1-2.3,2.8-4.2,4.2-6.3l0.2-1.3
+			c-0.6-1.4-1.2-2.8-1.7-4.2c0.4-0.9,0.8-1.8,1.3-2.7c0.6,0.4,1.7,1.2,2.2,1.6l0.4,0.8c0.6,3,0.5,6.3,2,9c1.4,2.5,4.5,1.8,6.8,1.8
+			c0.9,0.7,1.8,1.5,2.8,2.2c-0.6,1.2-1.2,2.4-1.8,3.6c-2.1-0.4-4.1-0.7-6.2-1.1c-0.6,1.7-1.1,3.5-1.5,5.3c-0.5,0.3-1.5,0.8-2,1
+			c-0.1,1.4-0.1,2.7-0.1,4.1c1.4,0.4,2.8,0.8,4.3,1.2c0.5-1.5,1-3,1.5-4.5c1.4,0.2,3.3-0.3,4,1.4c-0.2,1.3-0.4,2.6-0.7,4
+			c2.8-0.3,5.6-0.8,8.4-0.9c2.9,1.3,5.6,3.1,8.4,4.5c-6.5,0.5-12.8-1.2-19.3-1c-5.9,0-11.8-0.2-17.7-0.1c-0.7-1.6-1.2-3.2-1.9-4.8
+			c-0.6,0.4-1.8,1.1-2.4,1.5c-0.1,0.8-0.2,2.5-0.3,3.4c-3.7,0-7.4-0.1-11.1,0c2.1-1.4,4.2-2.9,5.7-4.9c-0.1-2.8-3-4.5-4.6-6.5
+			c-3.4,2.9-2,7.7-3.3,11.5c-0.6,0-1.8,0-2.4,0c-0.2-0.7-0.6-2.1-0.8-2.8c-2.5-0.2-5-0.7-6.9-2.3l1.4-1.1c-0.7-1.6-1.8-3-3.6-3.4
+			l-0.6,0.4c-0.2,1.4-0.4,2.9-0.6,4.3c-1.6-0.2-3.4,0.2-4.8-0.6c-1.2-1.4-2.1-3.1-3.3-4.5c-1.5-0.2-3-0.1-4.5,0
+			c-1.3-1.8-2.7-3.6-4.2-5.2c1.8-1.2,4.1-2,5.3-3.9c0.7-0.9,1.3-1.9,2.1-2.9c2.1-1.9,3.2-4.6,4.3-7.1c2,1,2.4,4.1,4.1,5.8
+			c1.9,0.3,3.2-1.2,4.3-2.5c-1.4-0.3-2.8-0.6-4.2-0.9c1.3-2.5,2.5-5,3.7-7.6c1.6-0.1,3.2-0.2,4.9-0.3c-0.4,2.3-1.9,4.2-3.7,5.6
+			c0.1,0.4,0.4,1.2,0.6,1.6c0.7,2.5,2.4,4.6,4.3,6.3c-1.7,3.3-3.9,6.4-7.4,8.1c2.2,1.9,4.8,3.2,7.5,4.3c1-0.9,1.9-1.8,2.9-2.7
+			c0.8-0.8,1.7-1.5,2.5-2.3c0-0.6,0.1-1.9,0.1-2.5c-1.5,0.8-3,1.6-4.4,2.5c-1.2,1-2.3,2.1-3.5,3.1c-0.9-0.7-1.8-1.5-2.5-2.3
+			c2.6-1.8,5.6-3.2,7.5-5.9c1.1,0.2,2.2,0.3,3.4,0.5c0.7-1.4,1.3-2.8,2-4.1c1.4-0.2,2.9-0.4,4.4-0.5c0.1-1,0.3-1.9,0.4-2.9
+			c-1.8,0-3.6,0-5.3,0c0-1.8,0-3.5,0-5.2C1575.2,711,1576.8,711.9,1578.4,712.7 M1553.2,720.1c-0.5,2.6,2.2,4.1,3.7,5.7
+			c0.6-1,1.3-2,1.9-3C1557,721.7,1555.4,720.1,1553.2,720.1 M1577.3,721.5c-0.2,2.5,0.3,5,1.1,7.4c2-0.5,4.8-0.7,5.4-3.1
+			c-0.7-0.3-2-0.9-2.6-1.2c-0.5-1.2-0.9-2.3-1.4-3.4C1579.2,721.3,1578,721.4,1577.3,721.5 M1546.4,722.4c0.3,2.1,2.1,5.7,4.6,4.8
+			C1552.2,724.7,1548.4,723,1546.4,722.4 M1551.5,732c0.6,1.8,2.6,2.7,4.3,1.8c0.3-2.2-0.2-4.4-0.6-6.6
+			C1553.9,728.7,1551.7,729.8,1551.5,732 M1586.2,733.3c-1.8,0.5-1.1,3.6,0.8,2.9C1588.9,735.8,1588.1,732.6,1586.2,733.3
+			 M1580.8,737c0.4,3.1,2.9,0.2,3.9-0.9C1583.5,733.5,1580.5,734.1,1580.8,737z"/>
+		<path class="st2" d="M125.2,710.8c0.2-1.9,0.5-3.8,0.8-5.6c1.6,0.5,3.2,1,4.9,1.5c-1.1,2.3-2.3,4.5-3.7,6.7
+			C126.5,712.5,125.9,711.7,125.2,710.8z"/>
+		<path class="st2" d="M136.7,705.7c3.6,1.5,8.7,2.4,10.1,6.6c1.1,1.7-0.3,3-2,3.2c-1.2-1.2-2.2-2.6-3.4-3.9c-1.5-0.5-3.2-0.7-4.7-1
+			C136.8,709,136.8,707.3,136.7,705.7z"/>
+		<path class="st2" d="M1602.9,709c0.5-0.7,1-1.4,1.6-2c1.2,2,2.5,3.9,3.4,6c0.1,0.8,0.3,2.3,0.3,3.1c-1.6,0.3-3.2,0.7-4.8,1
+			C1603.4,714.4,1603.2,711.7,1602.9,709z"/>
+		<path class="st2" d="M671.3,708.4c1.4-0.3,2.9,0.1,4.3,0.4c-0.9,2.5-1.1,5.1-1,7.7c-1.9,0.4-3.8,0.9-5.8,1.3
+			C667.4,714.5,669.2,711,671.3,708.4z"/>
+		<path class="st2" d="M979.4,710.4c2.2-0.7,4.5-1.3,6.7-2c0.3,0.4,0.9,1.2,1.2,1.6c-1.8,4.2-4.7,8-8.2,10.9
+			c-1.4,0.3-2.8,0.5-4.3,0.7c-0.6,2.1-1.3,4.2-2.2,6.2c-1.5-0.6-2.9-1.1-4.4-1.7c-1.3-1-2.5-2.2-3.7-3.3c0.7-0.8,1.5-1.6,2.2-2.3
+			c2-0.1,4.1-0.1,6.2-0.2c0.8-2.6,2.5-4.8,4.5-6.7C978,712.5,978.7,711.4,979.4,710.4z"/>
+		<path class="st2" d="M12.4,709.5c0.5-0.3,1.5-0.8,2-1c0.8,0.6,1.5,1.2,2.1,1.9c0.2,1.3-0.8,2.5-1.2,3.7c-1.1-0.4-2.2-0.7-3.3-1.1
+			C12.1,711.8,12.2,710.7,12.4,709.5z"/>
+		<path class="st2" d="M544.1,709.7c0.3-0.2,0.9-0.5,1.2-0.7c2,1.7,4.2,3.3,6.3,4.9c0.3,4.5-3.4,7.7-5.5,11.3
+			c0.8,3.1,2.6,5.9,4.9,8.2c3.5-0.1,2.7-4,2.9-6.4c-0.2-3.5,3.2-5.5,5.3-7.8c10.3,5.7,21.7,9.2,33.4,10.1c0.7,0.3,1.3,0.6,2,0.9
+			c-0.1,1.5-0.1,3-0.1,4.5c0.3,0.8,0.6,1.5,1,2.3c-2,3.4-4.8,6.3-8.5,7.8c-0.2,0.6-0.6,1.8-0.8,2.4c-2.5,3.6-7.3,1.8-10.9,1.6
+			c-9-0.9-17.7-3.7-26.6-5c-6-1.9-11.8-4.2-17.6-6.6c-0.2-0.5-0.8-1.6-1-2.1c1.3-2.4,2.6-4.8,4.3-7c0.8-0.9,1.6-1.8,2.5-2.7
+			c-0.4-1.5-0.8-3-1.2-4.5C539.1,717.7,542.6,714.3,544.1,709.7 M570.2,726.4c-1,1-0.8,3.2,0.8,3.5
+			C572.9,729.7,572.2,725.5,570.2,726.4 M540.2,733.7c1.2,0,2.4,0,3.7-0.1c-0.5-1.3,0.2-4.3-1.9-4.2
+			C539.7,729.3,540.6,732.2,540.2,733.7 M546.3,734.3c0,1.1,0.1,2.3,0.1,3.4c1-0.1,2-0.2,3-0.3c0.1-1,0.2-2.1,0.3-3.1
+			C548.6,734.3,547.4,734.3,546.3,734.3 M579.5,737.5c0.2,1.3-0.6,3.1,0.9,3.9c1.7,0.5,3.5-0.2,5.1-0.8c0-1.1,0-2.2,0-3.2
+			C583.5,737.4,581.5,737.5,579.5,737.5 M567.1,741.1c0.3,1.2,0.1,2.7,1.2,3.5c1.1,0.1,3.8,0.3,3.4-1.6
+			C571.5,740.8,568.6,741.5,567.1,741.1z"/>
+		<path class="st2" d="M684.2,710.4c1.2-0.4,2.4-0.8,3.6-1.2c-0.3,1.8,0.4,4.1-1,5.5C684.1,715.1,684.2,712.1,684.2,710.4z"/>
+		<path class="st2" d="M790.8,711.7c1.7-2.1,4.5-2.6,6.9-3.5c-0.1,1.9-0.2,3.8-0.3,5.7c1.9-0.6,3.7-1.3,5.6-1.8
+			c2.8,0.6,5.7,0.5,8.1-1.2c1.3,1.8,2.7,3.5,4,5.3c-1.4,1-2.8,2-4.3,2.7c-2.8-0.6-5-2.9-7.8-3.5c-2,0.2-4,1.5-4.7,3.5
+			c1,1.2,2.2,2.2,3.3,3.3c-1.7,2-3.5,4-3.4,6.8c2.1,0.6,4.1,1.2,6.2,1.8c-0.1,0.8-0.2,2.3-0.3,3c-2,1.7-3,4.3-3.8,6.8
+			c-5.3,0.5-10.7,0-16,0.3c1-1.7,1.9-3.3,3-4.9c1.1,1.1,2.3,2.3,3.4,3.5c1.1-0.8,2.2-1.6,3.3-2.5c0.3-1.6,0.4-3.3,0.5-4.9
+			c-4,0.9-8.1,1.9-11.5,4.2c-1.3,1.4-1.8,3.2-2.6,4.9c-6.4,0.9-13,0.5-19.4,1.9c0.1-5.1-0.2-10.3,0.2-15.4
+			c8.4,0.3,18.2,0.4,24.5-6.2C788.5,718.7,789.2,714.9,790.8,711.7 M773.4,734.5c-2.4,0.5-0.8,5.9,1.5,3.5
+			C777.8,736.9,776.2,733.3,773.4,734.5z"/>
+		<path class="st2" d="M1133.6,711.8c2.9-0.3,6.1-0.5,8.3-2.5c-0.1,1.4,0,2.8,0,4.2c-2.6,0.2-5.2,0.5-7.8,1c0.4,1.8,1.4,3.2,2.6,4.6
+			c0.6-0.6,1.9-1.8,2.5-2.3c0.9,0.6,1.8,1.2,2.7,1.8c0.7,0.5,1.4,1,2.1,1.5c0.7,1,1.4,2,2.2,3c0.2,0.3,0.5,1,0.7,1.4
+			c1.5,0.5,3,1,4.5,1.6c-1.3,1.1-2.5,2.2-3.8,3.3c1.4,1.1,2.8,2.1,4.2,3.2c-0.3,3-0.7,6-1.1,9c-2.9-3.8-5.1-8.1-6.6-12.6
+			c-1.1-3.1-4.7-0.3-6.5,0.7c-1.3,1-2.5,2.1-3.8,3.2c-0.9-0.2-1.8-0.4-2.7-0.6c-2.4,1.2-5,1.6-7.6,1.9c-0.7-2.8-1.2-5.7-2.2-8.4
+			c-1.1-1.9-2.8-3.2-4.4-4.7c2.2-0.4,4.5-0.9,6.2-2.5c1.6-1.2,1.3-3.6,1.9-5.3c1.1-0.1,2.2-0.1,3.4-0.2c-0.3,0.4-0.8,1.2-1.1,1.6
+			c0.6,0.4,1.7,1.3,2.3,1.7c-0.6,1.5-1.1,3-1.6,4.6c1.4-0.1,3.2,0,4-1.6C1132.7,716.6,1132.7,714.1,1133.6,711.8 M1132,724
+			c1.5,1.8,3.6-0.2,4.9-1.1c-1.3-0.7-2.3-2.3-3.9-2.1C1131.3,721.4,1130.9,722.5,1132,724 M1139,725c1.3,2.7,3.2-1.4,3.9-2.6
+			C1141.1,721.8,1137.4,722.3,1139,725z"/>
+		<path class="st2" d="M27.5,710.3c0.4,0,1.3,0.1,1.8,0.1c0,1.7-0.1,3.3-0.2,5c-3.3-0.6-6.7-1-10-1.5
+			C21.4,711.9,24.5,711,27.5,710.3z"/>
+		<path class="st2" d="M650.1,709.8c1.7,0.2,3.4,0.4,5.1,0.7c-1,4.8-6.7,5.8-8.8,9.9c-3.9-0.6-6.2,2.9-9.1,4.9
+			c0.3-2.7,1-5.4,2.7-7.6C643.3,715.1,646.8,712.6,650.1,709.8z"/>
+		<path class="st2" d="M1702.9,712.8c2.9-2.3,8-3.8,10.5-0.2c-1.6-0.1-3.1-0.1-4.7-0.2c-0.6,1.5-1.1,3.1-1.7,4.6
+			c-1.5,0.3-2.9,0.7-4.3,1C1702.8,716.3,1702.8,714.5,1702.9,712.8z"/>
+		<path class="st2" d="M1269.1,713.9c1.6-1,3.2-2,4.6-3.2c0.4,0.4,1.3,1.3,1.7,1.7c0.2,0.3,0.5,0.8,0.7,1.1c-1.6,1.5-3.3,3-5,4.5
+			c-0.8,0-2.4-0.1-3.2-0.1l-1.3-0.6c-0.5-0.2-1.5-0.7-2-0.9c-0.5,1.2-1,2.4-1.4,3.6c0.8,1.5,2.2,2.5,3.4,3.6
+			c-0.4,1.3-0.8,2.7-1.2,4.1c-1.6,1.7-3.2,6.5,0.2,6.6c1.6-1.6,3.1-3.4,4.6-5c0.7,1.2,1.4,2.3,2.2,3.5c0.4,0.6,1.2,1.8,1.6,2.4
+			c-2,2-3.9,4-5.6,6.3c-3.7,0.1-7.3,0.1-11,0.2l-0.2-1.4c0-0.4-0.1-1.1-0.2-1.4c0.3-0.7,0.8-2.2,1-2.9c1.8,1.3,3.4,2.8,5.2,4.2
+			c-1.2-4.8-1.8-9.8-2.2-14.7c0-0.5-0.1-1.3-0.2-1.8c0-0.5-0.1-1.5-0.2-2.1c-0.9-0.3-1.8-0.5-2.7-0.8c0.4-1.2,1-2.3,1.4-3.5
+			c0.6-1.7,1-3.5,1.4-5.2C1263.7,712.4,1266.5,712.9,1269.1,713.9z"/>
+		<path class="st2" d="M128.7,717.9c1.1-1.3,2.3-2.5,3.9-3.2c-0.1,1.7-0.4,3.4-0.3,5.1c1.4,2.2,3.5,3.8,5.5,5.4
+			c3.9-2.4,8,0.8,9.9,4.2c0.9,2.3,1.5,4.7,2.2,7c-3,0-5.6-1.6-8.1-3c-0.1-1.9,0.1-4-1.3-5.4c-1.6,2.9-4.1,4.9-7.6,4.8
+			c-0.7,2.1-1.6,4.1-2.8,6c-2.2-2.4-4.2-5-6.1-7.7c0.3-0.5,0.9-1.4,1.2-1.9c2.1,0.9,4.4,1.6,6.7,1.8
+			C132.7,726.2,130.8,721.9,128.7,717.9z"/>
+		<path class="st2" d="M1091.5,724.9c4.7-2.2,7.9-6.4,10.7-10.7c1.7,1.7,3.3,3.6,5,5.2c2,0.6,4.1,0.8,6.1,1.3c0.6,1.6,0.1,3.2,0,4.8
+			c-2.3-0.6-4.5-1.3-6.6-2.3c-1.4,0.6-2.8,1.2-4.1,1.8c-0.2,1.3-0.4,2.6-0.6,3.9c-2-1.2-4-2.5-6-3.7c1.2,2.2,2.5,4.5,3.9,6.6
+			c2.3,0.7,4.6,1.5,6.9,2.2c-0.2,1.6-0.5,3.2-0.8,4.9c-2.5,2.8-4.6-1.4-4.9-3.7c-0.6-0.4-1.1-0.8-1.6-1.2c-0.2,2.3-0.5,4.7-0.7,7.1
+			c-1.3-0.2-2.7-0.3-4-0.4c-0.3-1.3-0.5-2.6-0.8-3.9c-0.1-0.5-0.4-1.4-0.5-1.8c-0.4-1.1-0.7-2.2-1.1-3.3c0.4-1,0.9-2,1.4-2.9
+			C1093,727.6,1092.2,726.2,1091.5,724.9z"/>
+		<path class="st2" d="M239.2,717.6c0.5-0.5,1.4-1.5,1.9-2c0.4,0.3,1.3,0.9,1.7,1.2c2.1,1.6,4.3,3.3,5.8,5.6c0.4,1.9-2,2.8-2.9,4.2
+			c2.4,0.4,5.1,1.1,7.3-0.3c0.9-0.8,1.9-1.6,2.8-2.4c1.8-1.6,3.9-3,6.1-4c-0.6,5-1.4,9.9-2,14.9c-1-0.6-2-1.2-3-1.8
+			c-0.2-0.6-0.5-1.8-0.6-2.5c-1.1-0.1-2.2-0.3-3.3-0.4c-0.8,2.4-1.1,5.7-4.4,5.5c0-1.7,0.3-3.4,0-5.1c-0.6-1.8-2.8-1.9-4.2-2.5
+			c-1-1.9-1.7-4-2.1-6.1C241.1,720.5,240.1,719.1,239.2,717.6z"/>
+		<path class="st2" d="M1002.3,717.8c1.1-0.6,2.2-1.4,3.5-1.6c1.7,0.8,3,2.3,4.3,3.7c0.9,1,1.8,2.1,2.9,2.9c2.5,0,4.7-1.6,7.1-2.4
+			c0.8,2.1,1.3,4.2,2,6.4c1.2,1.5,2.6,3,3.8,4.6c1.1,2,1.9,4,2.8,6c-1.9-0.4-4.1-0.2-5.5-1.7c-2.4-2.4-3.4-5.8-5.9-8
+			c-2.3-0.5-4.6-0.2-6.9-0.2c0.2,2.4,0.2,4.8,0.3,7.2c0,0.6,0.1,1.7,0.2,2.3c0.3,0.6,0.8,1.9,1.1,2.5c-0.9,0.2-1.8,0.4-2.8,0.5
+			c-1.4-2.2-1.5-5.1-2.8-7.4c-1.3-0.2-2.7-0.2-4.1-0.3c-0.3-1.8-0.7-3.5-1-5.2c-2.2,0-4.5,0.3-6.7,0.8c-0.2-0.8-0.3-1.7-0.5-2.5
+			c1.5-1.3,4.6-2.5,2.4-4.7l-0.3-0.6c-0.3-1.1-0.6-2.1-0.9-3.2c1,0.4,2,0.9,3,1.3c0.3,2,0.4,4.1,1,6.1c0.4,2.1,3,1.9,4.5,2.6
+			C1004.4,723.9,1003.6,720.8,1002.3,717.8z"/>
+		<path class="st2" d="M145.3,721.8c-0.8-2.1,1.9-2.5,3.1-3.6c0.7,0.9,1.4,1.8,2.2,2.7c-0.4,1.2-0.9,2.5-1.3,3.7
+			C147.9,723.8,146,723.4,145.3,721.8z"/>
+		<path class="st2" d="M1395.6,719.2c2.9,0.9,6,1.8,9,0.8c0.9,2.1,1.8,4.2,2.5,6.5c-1.8,0.3-3.7,1.3-5.2,0c0.3-1.4-1-4.2-2.4-2.2
+			c-0.2,0.5-0.5,1.4-0.7,1.8C1395.7,725,1395.7,721.8,1395.6,719.2z"/>
+		<path class="st2" d="M653.7,721.2c2.7-0.3,5.3-0.6,8-0.9c0.6,2,1.1,4.1,2,6.1c1.4,1.8,4,0.8,5.7,0c0.6-1.4,0.9-3,1.4-4.4
+			c3.3,0.2,5.4,2.9,7.5,5.2c-3.4,1.9-6.8,3.9-10.2,5.9c-2.3-1.4-4.3-3.2-6.4-4.8c-2.1-1.1-4.5-1.3-6.6-2.4
+			C654,724.6,654.2,722.8,653.7,721.2z"/>
+		<path class="st2" d="M158.7,730.2c-2-3.3-2.4-8,1.5-10c1.2,2.6,1.5,5.4,2.7,8c1.6,1.1,3.4,1.9,4.9,3.2c0,1.7-0.6,3.5-2,4.5
+			c-1.8,0.6-3.9,0.2-5.8,0.5c-1.2,1-2.1,2.2-3.1,3.4c-1.3-2.5-3.2-4.8-3.8-7.6c0-2.7,3.2-0.6,4.7-0.5
+			C158.1,731.2,158.5,730.5,158.7,730.2z"/>
+		<path class="st2" d="M265.1,725.6c1-1.8,1.9-3.6,2.9-5.3c1.3,0.9,2.5,1.9,3.8,2.9c-2.6,5.2-4.9,10.7-7.4,16
+			C262.6,734.7,265.2,730.1,265.1,725.6z"/>
+		<path class="st2" d="M985.7,724.6c1.5-0.8,2.6-2.1,3.8-3.3c1,0.9,1.9,1.9,2.9,2.8c-1.1,3.2-3,6.3-6.7,6.8
+			c-0.2,1.2-0.5,2.5-0.7,3.7c-1.2-0.1-2.4-0.3-3.5-0.4c-0.7,1.6-1.5,3.1-2.3,4.6c-1.1-1-2.1-2-3.1-3.1c0.5-1.2,1.1-2.5,1.6-3.7
+			c-2-0.8-4.5-1.6-4.4-4.2c1.8-1.2,3.7-2.4,5.5-3.6C981.1,724.6,983.4,725.3,985.7,724.6z"/>
+		<path class="st2" d="M1731,723.2c0.6-1,1.3-2,2-3v6.8C1732.2,726,1729.6,724.8,1731,723.2z"/>
+		<path class="st2" d="M6.2,724.3c1.6-2.2,4.1-0.4,5.2,1.3c1.1-1,2.2-2.1,3.5-3c1.7-0.5,2.5,1.3,3.3,2.3c-2.4,3.6-6.6,4.1-10.6,4.6
+			C6.5,728.1,4.1,725.9,6.2,724.3z"/>
+		<path class="st2" d="M1719,722.8c0.8,0,2.3-0.1,3.1-0.1c1.3,2.1,2.7,4.3,4,6.4c-1,0.3-2,0.6-3,0.9c-0.9-1.2-1.6-2.5-2.2-3.8
+			c-1.9,0.8-3.8,1.7-5.5,2.8c-0.1-1.4,0.4-2.8,1.4-3.8C1717.5,724.6,1718.3,723.7,1719,722.8z"/>
+		<path class="st2" d="M1027.3,724.5c1.1-0.2,2.2-0.4,3.4-0.5c1.7,1,3.4,1.8,5.2,2.5c0.6,1.1,1.3,2.3,1.9,3.5
+			c-1.6,0.5-3.2,0.9-4.8,1.4c-0.8-0.6-1.6-1.2-2.3-1.9c-1.1-0.9-2.1-1.9-3.1-2.8C1027.5,726.1,1027.4,725,1027.3,724.5z"/>
+		<path class="st2" d="M1615.3,723.8c1.1,0.3,2.2,0.6,3.3,0.9l0.6,0.1c-0.4,0.6-1.1,1.7-1.4,2.2c0.6,2,1.1,4,2,5.9l1,1.3l-0.5,0.9
+			c-0.8,1.1-1.6,3-3.3,2.3c-3.2-0.3-5.8-2.2-7.4-4.9c-1.8-0.1-3.7-0.1-5.5-0.2c0.1-3.5,3.7-2.8,6.2-2.9c0.6,0.2,1.8,0.7,2.4,0.9
+			c0.5,1,1.1,2.1,1.6,3.1c0.6,0,1.9,0,2.5,0c-0.1-0.5-0.3-1.5-0.4-1.9c-1.5-1.8-3-3.6-4.3-5.5
+			C1613.2,725.4,1614.2,724.6,1615.3,723.8z"/>
+		<path class="st2" d="M21.2,725.2c2.1,1.3,4.5,2.3,6.1,4.2c2.7,4.2,2.3,9.5,1.3,14.2c-0.4-0.4-1.2-1.1-1.6-1.5
+			c-0.7-2.8-0.7-5.8-1.7-8.5c-1.2-1.1-2.6-2-3.9-2.9C21.3,728.9,21.3,727,21.2,725.2z"/>
+		<path class="st2" d="M954.5,727.7c3-0.8,5.9-2,8.7-3.5c0.2,2.1,1.9,4.7,0.3,6.6c-1.2-0.8-2.3-1.7-3.5-2.4c-1.7,0.6-3.3,1.6-4.4,3
+			c-0.2,1.7-0.1,3.4-0.2,5.1c-0.8,2.2-2.8,3.6-4.8,4.6c-0.5-2.6-0.7-5.3-0.4-7.9C951.8,731.6,953.2,729.7,954.5,727.7z"/>
+		<path class="st2" d="M1380.2,725.5c1.5,0.5,3.1,1.1,4.6,1.7l-0.8,0.5c-2.5,1.5-4.8,3.2-7,5.2c1.2,0.6,2.4,1.2,3.6,1.9
+			c0.3,2,0.5,4,0.8,6.1c-4.3-0.5-8.5,0.5-12.6,1.6c0.5-1.7,1.1-3.4,1.6-5c-3.2-0.7-3.7,3.2-5.1,5.2c-0.8-3.5-0.1-7.1,0.8-10.6
+			c-0.4-1-0.8-2-1.2-3c2.1-0.3,4.3-0.5,6.4-0.8c0.5,1.1,1,2.2,1.5,3.3c0.6-0.2,1.9-0.7,2.5-1c0.2-1.2,0.4-2.4,0.7-3.6
+			c0.2,0.9,0.8,2.7,1,3.5C1378.2,728.9,1379.3,727.2,1380.2,725.5 M1367.5,731.3c0.4,1.4-0.5,4.4,1.7,4.5c2.1,0.5,3.1-2.4,1.8-3.8
+			C1370.1,731.8,1368.3,731.5,1367.5,731.3 M1372.8,739.7c3.2,0,2.4-3.8,2.4-5.9C1373,734.6,1369.2,738,1372.8,739.7z"/>
+		<path class="st2" d="M1709.5,726.5c0.2,0,0.7,0.1,0.9,0.1c0.3,0.6,0.9,1.7,1.3,2.2c-1.3,1.6-2.6,3.3-3.8,5
+			c-1.2,1.7-2.4,3.4-3.8,4.8l-1.2,0.2c0.2-4.2-0.1-8.3-0.2-12.5c1,0.8,2,1.6,3,2.5l0.7,0.7c0.4,0,1.3-0.1,1.7-0.1l0.5-0.2
+			C1708.9,728.4,1709.2,727.5,1709.5,726.5z"/>
+		<path class="st2" d="M169.5,727.2c0.9-0.1,2.7-0.4,3.6-0.5c1.9,0.4,3.9,0.8,5.8,1c0.5,2.7,1.3,5.4,3.1,7.6
+			c1.1-1.1,2.1-2.2,3.2-3.3c-0.1,2.8-0.1,5.6-0.1,8.5c-1.5-0.1-3-0.3-4.5-0.3c-2,0-4,0-5.9,0c-0.1-4.1,4.4-6.9,3.1-11
+			c-2.2,0.2-4.2,1.3-6.2,2.2C170.9,730,170.2,728.6,169.5,727.2z"/>
+		<path class="st2" d="M649.1,727.1c2.2-0.1,3.9,1.5,5.7,2.6c0.4,0.3,1.3,0.9,1.7,1.2c-0.2,2,0.8,5.2-1.6,6.1
+			c-2,1.1-3.2-1.4-4.4-2.6C649,732.4,646.5,729.3,649.1,727.1z"/>
+		<path class="st2" d="M1104.5,728.7c1.5-0.4,3.2-2.3,4.7-1c2.3,2.2,3.9,5,5.7,7.6c-1.4,0.1-2.8,0-4.2-0.3
+			C1108.6,733,1106.5,730.8,1104.5,728.7z"/>
+		<path class="st2" d="M1317.6,729.5c1.2-1.3,2.6-2.2,4.4-2.4c1.5,3.5,4.4,5.9,7.5,8c1.1,1.2,2.1,2.6,3.2,3.9
+			c-0.6,0.8-1.2,1.6-1.8,2.4c-1-1.4-2-2.9-2.8-4.5c-3,0.5-6.2,0.9-7.9,3.7l-0.3,0.3c-1.1-1.6-2.2-3.1-3.9-3.8
+			c-0.3,1.3-0.5,2.7-0.8,4c-2.4,0-4.8,0-7.1-0.1c1.4-5.1,7-5.5,11.2-6.9C1320.1,732.5,1318,731,1317.6,729.5z"/>
+		<path class="st2" d="M1329.7,728.4c1.1-0.7,2.2-1.4,3.3-2.1c0.6,1.3,1.2,2.6,1.8,3.9c0.2,0.4,0.5,1.1,0.7,1.5
+			c-0.8,0.6-1.6,1.3-2.3,1.9C1331.8,732.1,1330.6,730.3,1329.7,728.4z"/>
+		<path class="st2" d="M1522.3,728.3c5.7-1.3,11.7,0.2,17.2-1.9c0.3,1.8,0.7,3.6,1,5.5c-0.3,0.2-1,0.5-1.4,0.7
+			c-0.4,0.2-1.3,0.7-1.8,0.9c-0.6,3.4-1.9,6.6-4.2,9.2c-3.6,0.1-7.2,0.2-10.7-0.3C1522.3,737.6,1522.3,733,1522.3,728.3
+			 M1526.6,733.1c1.4,0.1,2.8,0.2,4.2,0.3c-1,0.8-2.3,1.4-2.8,2.6c0.2,1.4,1.2,2.5,1.9,3.7c1.4-2.2,2.8-4.5,4.1-6.7
+			c-1-0.8-1.9-1.5-2.8-2.3c-0.6-1.5-1.6-1.8-3.1-0.9C1527.1,730.5,1526.5,731.6,1526.6,733.1z"/>
+		<path class="st2" d="M609.9,728.8c2.6-0.4,5.1-1.1,7.7-1.6c1.2,0.4,2.5,0.9,3.7,1.4c-1.9,2.2-3.1,4.8-3.5,7.6
+			c-1.2,2.9-4,0.6-5.1-1.1c-1.2-1.7-2.2-3.4-3.2-5.2L609.9,728.8z"/>
+		<path class="st2" d="M1081.3,728c0.8,0,2.6,0,3.4,0c0.3,0.2,0.9,0.7,1.2,0.9c0.9,1.2,1.8,2.4,2.7,3.6c-0.6,1-1.1,2.1-1.7,3.1
+			c-0.8-0.8-1.7-1.5-2.5-2.2C1082.7,732.1,1081.1,730.4,1081.3,728z"/>
+		<path class="st2" d="M1233.6,728.6c3.7-0.5,7.6-0.6,11.3-1.2c-0.4,1.5-0.7,3-1.1,4.5c-0.9,1.5,0.9,3.4,2.5,2.7
+			c0,2.5-2.1,4-3.6,5.7c-2-2.3-2.8-5.3-4.2-8c-1.4-1.2-3.5-1.1-5.2-1.6C1233.4,730.2,1233.6,729.2,1233.6,728.6z"/>
+		<path class="st2" d="M1279.4,736.4c1.8-2.8,3.2-6,5.3-8.7c0.1,3.1,0.3,6.2,0.9,9.2c1.7-3.3,4.5-5.8,8.3-5.8
+			c-1.2,2-2.5,4.1-3.8,6.1c1.3,0.3,2.7,0.6,4,1c0.9,0.8,1.8,1.6,2.7,2.4c-0.8,0-2.5,0.1-3.3,0.1c-7.7,0.8-15.4,0.6-23,0.7
+			C1273.6,740.1,1277.1,739,1279.4,736.4z"/>
+		<path class="st2" d="M0,728.7c0.6,0.7,1.2,1.4,1.9,2.1l0.9,1C2,733.6,1,735.3,0,737V728.7z"/>
+		<path class="st2" d="M322.3,728.4l0.7,0c1.3,0.4,2.6,0.9,3.9,1.4c-0.8,1.4-1.6,2.8-2.4,4.2c1.4,2,2.6,4,3.4,6.3
+			c0.1,0.4,0.4,1.1,0.6,1.5c1.3,0.3,2.6,0.5,3.9,0.7l-0.8,0.1c-3,0-6,0.3-8.9,0.8c-0.1-0.2-0.3-0.7-0.4-1
+			C322.4,737.7,322.4,733,322.3,728.4z"/>
+		<path class="st2" d="M1047.8,728.7c1.6,0,3.2,0,4.8,0c-0.3,4.7-4.3,8.8-1.9,13.4c-1.2,0-2.4,0.1-3.6,0.2c-0.4-0.5-1.2-1.4-1.7-1.8
+			c-0.2,0.1-0.8,0.4-1,0.5c-0.9,0.2-2.7,0.5-3.6,0.6c-2.3-3.4-2.9-7.7-1.4-11.6c1.7,1,3.5,2,5.2,3.1c1,0.6,2.1,1.3,3.1,2
+			C1048,732.9,1048,730.8,1047.8,728.7z"/>
+		<path class="st2" d="M1075.8,728.8c0.7,0.2,2.1,0.7,2.8,0.9c0.3,1.5,0.5,2.9,0.7,4.4c-0.5,1.5-2,2.3-3,3.4
+			C1075.8,734.7,1075.7,731.7,1075.8,728.8z"/>
+		<path class="st2" d="M1250.3,729.1c2.8,0,5.4,0.9,6.9,3.5c0.1,1,0.2,2,0.3,3.1c-0.8-0.2-2.3-0.8-3.1-1c-1.5-0.5-2.9-1.2-4.3-1.7
+			C1250.1,731.6,1250.2,730.3,1250.3,729.1z"/>
+		<path class="st2" d="M1457.6,729l1-0.5c0.2,3.7,0.2,7.5,0,11.2c-2.9,1.6-6.1,3-9.6,2.5c-0.2-1.5-0.5-2.9-0.7-4.4
+			c0.9-0.6,1.8-1.1,2.7-1.6c-0.7-1.6-1.5-3.3-2.2-4.9c1.8-0.1,3.6-0.2,5.4-0.2c0,1.2,0,2.5,0,3.7
+			C1456.1,733.2,1456.7,731,1457.6,729z"/>
+		<path class="st2" d="M1625.9,737.2c-4.6-1.9-1.1-7.7,2.5-8.4c0.4,1.4,0.7,2.8,1.1,4.3C1628.3,734.5,1627.1,735.9,1625.9,737.2z"/>
+		<path class="st2" d="M99.6,729.6c1.3,0.4,2.7,0.8,4,1.2c1,4.1-1,7.8-3,11.1l-1,0.2C99.3,737.9,99.3,733.7,99.6,729.6z"/>
+		<path class="st2" d="M1380.7,731.9c3.9-0.6,7.9-1.1,11.8-2c1.5,2,1.8,5-0.3,6.8c-2.8,0.2-1.8-3.2-2.4-4.9
+			c-0.8,0.1-2.4,0.3-3.2,0.4c-0.2,1.6,0.9,2.8,1.6,4.1c0.4,1.2-0.1,3.3,1.6,3.5c1.2-1,2.3-2.3,3.5-3.5c0.7,1.6,1.3,3.2,2,4.7
+			c-2,0.2-4,0.3-6,0.4c-1.7-0.2-3.4-0.3-5-0.5c0.4-1.5,1.5-3,1.2-4.6C1384.1,734.7,1382.3,733.4,1380.7,731.9z"/>
+		<path class="st2" d="M1725.6,731.5c2.5-0.7,4.9-1.3,7.4-2.1v5c-2.3,0.5-4.6,0.7-6.9,0.9c-1.3,1.2-2.6,2.3-4.3,2.8
+			c-0.2-0.7-0.5-2-0.7-2.6l1-0.1c0.6-0.1,1.9-0.3,2.5-0.4C1724.9,733.8,1725.2,732.6,1725.6,731.5z"/>
+		<path class="st2" d="M967.6,731.4c0.5-0.2,1.6-0.6,2.2-0.8c0.9,0,2.6,0.1,3.5,0.1c0,2.2,0,4.4-0.1,6.7c-2.8-0.2-5.8-0.5-7.4-3.2
+			C966.4,733.3,967,732.3,967.6,731.4z"/>
+		<path class="st2" d="M941.8,736.3c0.3-1.5-0.8-4.2,1.2-4.9c1.8,0.2,3.1,1.9,3.5,3.6C945.8,737,943.4,736.2,941.8,736.3z"/>
+		<path class="st2" d="M138.9,733.1c0.6,0.2,1.7,0.6,2.2,0.8c0.1,2.2,0.3,4.3,0.4,6.5c-1.6-0.3-3.1-0.7-4.7-1c0-0.6,0.1-1.7,0.2-2.3
+			C137.7,735.7,138.3,734.4,138.9,733.1z"/>
+		<path class="st2" d="M1340.1,733.8c0.5-0.2,1.5-0.6,2.1-0.8c1,1.8,1.7,3.7,1.7,5.8c-0.6,0-1.9,0.1-2.6,0.2
+			c-1.6,1.1-3.1,2.3-4.7,3.4c0.3-1.5,0.7-3.1,1-4.6c1.3-0.5,2.7-1,4.1-1.4C1341.3,735.7,1340.5,734.5,1340.1,733.8z"/>
+		<path class="st2" d="M14.4,737.3c1.1-2.8,4.6-1.9,7-2.1c0.2,2.8,1,5.6,2.9,7.8c-0.3,1.1-0.6,2.1-1,3.2c-0.8,0.1-1.6,0.2-2.4,0.3
+			c-0.4-1.4-0.8-2.8-1.3-4.2c-0.5,0-1.5,0-1.9,0c-0.4,0-1.2,0-1.6,0l-0.6-0.6C15,740.3,14.4,738.9,14.4,737.3z"/>
+		<path class="st2" d="M603.7,735.8c1.6-2.6,5.8-0.6,5.7,2.2c0.6,1.7-1.6,2.3-2.4,3.4C605.7,739.6,604.5,737.8,603.7,735.8z"/>
+		<path class="st2" d="M998.8,737.9c1-0.6,1.9-1.8,3.2-1.8c2.4-0.6,2.3,2.4,3.1,3.9c-3.7,0.4-7.5,0.4-11.2-0.3
+			C995.3,738.6,997.1,738.3,998.8,737.9z"/>
+		<path class="st2" d="M250.2,741.6c0.8-1.6,1.7-3.2,2.6-4.8c0.6,0.3,1.9,1,2.6,1.3c0.4,1.4,0.8,2.7,1.2,4.1c-2,0.1-4,0.2-5.9,0.4
+			L250.2,741.6z"/>
+		<path class="st2" d="M1115.9,739.5c1.3-1,2.5-2.1,3.8-3.1c1.1,0.8,2.2,1.7,3.3,2.5c0.2,0.6,0.7,1.8,0.9,2.4c-2,0-4.1,0-6.1-0.1
+			C1117.3,740.8,1116.3,739.9,1115.9,739.5z"/>
+		<path class="st2" d="M1719.2,741.5c-0.3-1.6-0.5-3.2-0.7-4.8c0.9,1.9,1.9,3.8,2.6,5.8l0.3,0.9c0.3,1.5,1.2,2.3,2.8,2.5
+			c1.2-2.1,1.2-4.6,1.5-6.9c1.7,1.9,3,4.6,5.8,5c0.4-1.8,0.9-3.6,1.3-5.5v6.5c-1,0.9-2,1.9-3.1,2.5c-1.4-0.2-2.7-0.6-4-0.9
+			c-0.8,0.9-1.6,1.8-2.3,2.7c-1.7-1.6-3-3.6-3.9-5.7C1719.5,743.1,1719.3,742,1719.2,741.5z"/>
+		<path class="st2" d="M1708.5,742.4c1.3-1.9,3.7-5.4,5.9-2.4c0.1,2.1-1.7,3.3-3,4.7c-0.2,1.3-0.4,2.6-0.6,3.9
+			c-2.7-0.3-5.4-0.8-8.1-1.4c0-2,0-3.9,0.1-5.9C1704.5,742.2,1706.4,742.7,1708.5,742.4z"/>
+		<path class="st2" d="M598.4,741.8c3.7-0.4,7.3,0.2,10.7,1.8c1.3-0.6,2.5-1.2,3.8-1.8c0.4,0.5,1.1,1.4,1.5,1.9
+			c1.6-0.2,3.3-0.3,4.9-0.4c0.2,1.3,0.3,2.7,0.5,4c-6.7,0.8-13.5,1.6-20.2,1.9C599.6,746.7,599.2,744.2,598.4,741.8z"/>
+		<path class="st2" d="M21.5,755.7c0.8-4.1,4.8-5.7,8.1-7.4c-1.5,3.5-3.3,6.9-4.4,10.6c-1-0.7-2.1-1.3-3.1-2L21.5,755.7z"/>
+		<path class="st2" d="M3.6,749.2c1.6,0.2,3.2,0.4,4.8,0.6c0.5,0.4,1.5,1.1,2,1.4c5.7,4,3.2,11.7,2.8,17.5c-1.6-0.5-3.2-1-4.9-1.4
+			c0.9-1.2,1.8-2.3,2.6-3.4c-0.2-3.3-0.3-6.9-2.8-9.4C6.3,753.1,4.4,751.6,3.6,749.2z"/>
+		<path class="st2" d="M1715.6,750.7c0.4-0.2,1.1-0.7,1.5-1c1.5,0.4,4.6,0,4.5,2.4c0.6,2.6-3.1,2.4-4.8,2.5
+			c-0.4-0.2-1.1-0.6-1.4-0.8C1715.4,752.7,1715.4,751.7,1715.6,750.7z"/>
+		<path class="st2" d="M0,751.4c4.5,1.7,2.8,7.2,3.2,11c-0.8,1.3-2.2,2.1-3.2,3.1V751.4z"/>
+		<path class="st2" d="M1708.7,761.2c2.1,0.9,3.1,2.9,3.5,5l0.4,1c1.4-0.1,2.8-0.2,4.2-0.4c-0.2,1.4-0.2,2.7-0.2,4.1
+			c0.4,0.1,1.3,0.4,1.7,0.6c0,1.8,0,3.6-0.3,5.4c-1.8,0.9-2.7-1.2-3.6-2.2c-1.4-2.1-2.4-4.3-3.5-6.5c-0.8-0.8-1.5-1.5-2.3-2.3
+			C1708.6,764.3,1708.6,762.8,1708.7,761.2z"/>
+		<path class="st2" d="M20.3,770.6c-0.4-1.9-1.5-4.1,0.2-5.6c1.6,1.6,3.4,3.3,3.5,5.7C22.8,770.6,21.5,770.6,20.3,770.6z"/>
+		<path class="st2" d="M3.3,770.6c1.2,2.9,0.6,6,0.2,9c1.6,0.1,3.2,0.1,4.8,0.2c0.2-1.7,0.4-3.5,0.6-5.2c1.4-0.1,2.7-0.1,4.1-0.2
+			c-0.7,2.1-1.4,4.3-2.1,6.4c-1.8,1-4.4,1.9-4.5,4.3c0.4,3.3,2.7,6.4,1.8,9.9c-0.6,2.4-1,5.3-3.2,6.8c-2.8-1.5-3.6-4.9-5.1-7.5V786
+			c1.4-1.6,2.6-3.4,3.4-5.4C-0.1,777.9,1.6,773.7,3.3,770.6z"/>
+		<path class="st2" d="M21.4,780.5c-1.4-2.6,1.4-4.1,3.2-5.2c1.2,2,2.7,3.7,4.7,4.8c-0.1,1.2-0.2,2.4-0.3,3.6
+			C26.4,782.9,23.5,782.3,21.4,780.5z"/>
+		<path class="st2" d="M1707.8,785.9c0.6-0.2,1.8-0.6,2.4-0.8c1.7,1.5,2.9,3.4,2.1,5.7c-0.9-0.5-1.7-1-2.5-1.4
+			c-2.2,1.1-4.7,1.2-7.1,0.8C1702.4,787,1705.3,786.5,1707.8,785.9z"/>
+		<path class="st2" d="M1708.4,797.9c0.4-1.8,1-3.5,1.9-5.1c0.7,1,1.4,2.1,2.2,3.2c1.4,1.6,3,3,4.7,4.4c0.4,3.4,0,6.8-0.5,10.2
+			c2.3-1,4.7-2.3,7.3-2.2l-0.2,1.7c-0.9,0.7-1.9,1.4-2.9,2c-1.4,0.2-2.8,0.4-4.1,0.7c-2.2,0.5-3.1,2.6-4,4.4c2.1,0,4.2-0.1,6.3-0.2
+			c0.6,0.5,1.2,1,1.9,1.6c-1,0.3-2.1,0.7-3,1.2c-0.3,0.3-1,1-1.4,1.4c-0.6,0.3-1.7,1-2.2,1.3c-0.3-0.4-1-1.1-1.3-1.5
+			c-0.3-0.8-0.5-1.7-0.8-2.5c-1.8-1.9-2.9-4.3-4-6.6c-0.6-1-1.2-1.9-1.9-2.9c-0.1-0.4-0.2-1.1-0.3-1.5c0.3,0.1,0.9,0.2,1.2,0.2
+			c2.1,0.5,4.3,0.8,6.5,1.2c-0.9,1-1.7,2.1-2.5,3.2c1,0.2,2,0.3,3.1,0.5c0.3-3.5,1.4-7,0.3-10.5c-1,0.9-1.9,2-2.9,2.9
+			c-0.4,0.2-1.1,0.6-1.5,0.9c-0.5-0.3-1.5-1-1.9-1.4c0.2-0.3,0.7-0.9,0.9-1.2c0.9-1.2,1.8-2.3,2.7-3.5
+			C1710.7,799.2,1709.6,798.6,1708.4,797.9z"/>
+		<path class="st2" d="M4.7,812c0.9-2,2.7-3.4,4.4-4.7c1.9,2.1,1.5,5,1.3,7.6c0.8,1.3,1.6,2.6,2.4,3.9c-2,1.2-3.8,2.7-5.7,4
+			c-1.6-0.5-2.6-1.8-3.8-2.9c1.5-0.8,3.1-1.5,4.7-2.2C6.6,816,4.2,814.5,4.7,812z"/>
+		<path class="st2" d="M1725.4,812.6c2.5-0.1,5-0.3,7.6-0.5v8.1c-0.9,0.3-1.7,0.6-2.6,0.9c0-0.9,0.1-2.6,0.1-3.5
+			c-2.3-1-4.8-1.1-7.2-1C1724,815.3,1724.7,813.9,1725.4,812.6z"/>
+		<path class="st2" d="M1702.9,821c0.5-2.2,1.1-4.4,1.8-6.5l1.4,0.8c0.5,3.6,0.1,7.2-0.6,10.7c-0.2,0.5-0.6,1.3-0.7,1.8
+			c-0.5-0.5-1.5-1.3-2-1.8c-0.1-1.2-0.1-2.3-0.2-3.4c-1.7-0.4-3.4-0.7-5.1-1C1699.3,821.3,1701.1,821.1,1702.9,821z"/>
+		<path class="st2" d="M71.2,821.1c2.1-0.1,4.1-0.1,6.2-0.1c-0.2,2.2-0.8,4.7,0.5,6.8c1.2,1.8,3.1,3,4.8,4.3
+			c-0.8,1.5-1.5,3.1-2.2,4.7c-1.6-0.6-3.1-1.2-4.7-1.8c-0.2-1.4-0.4-2.7-0.7-4c-2.6-0.7-5.2-1.6-7.6-3
+			C68.8,825.8,70,823.5,71.2,821.1z"/>
+		<path class="st2" d="M92.8,821c2,0,4,0,6.1,0c0.9,1.1,1.7,2.1,2.6,3.2c-0.1,0.4-0.2,1.1-0.2,1.4c-1.2,0.3-2.5,0.6-3.7,0.9
+			c0,1.3-0.1,2.6-0.1,3.8c0.3,0.2,1,0.7,1.3,0.9c0.8,0.7,1.6,1.3,2.4,2c-1.8,0.4-3.7,0.7-5.5,1.1c-1.9-3.5-4.5-6.5-8-8.4
+			c0.3-0.5,1-1.5,1.4-2.1c1.2,0.3,2.3,0.5,3.5,0.8C92.7,823.5,92.8,822.2,92.8,821z"/>
+		<path class="st2" d="M117.1,821.2c1.1-0.1,2.2-0.1,3.3-0.1c-0.1,1.8-1.1,4.1,1.1,5c0.6,0.3,1.8,0.8,2.4,1c0.3,0.2,1,0.6,1.3,0.8
+			c-0.3,1.9-0.7,3.9-1,5.8c-2.4-0.6-5.1-1-6.6-3.1C116,827.7,116.9,824.3,117.1,821.2z"/>
+		<path class="st2" d="M152.1,820.8c1.8,0,3.7,0,5.5,0c-1.2,2-2.2,4.2-2.3,6.6c4.1,1.8,5.1-4.1,3.2-6.6c3.7,0,7.4,0,11.1,0
+			c-0.1,0.9-0.3,2.6-0.4,3.5c1.8,2,4.1,3.5,6.9,3.9c0.7-3-1.2-5.3-3.1-7.4c5.1,0.1,10.1-0.1,15.2,0.2c-0.7,1.3-1.5,2.6-2.2,3.9
+			c-1.2-0.8-2.4-1.6-3.6-2.4c-1.1,2-2.1,4.2-2.5,6.5c-0.1,0.8-0.4,2.3-0.5,3.1c0.9,1.2,1.8,2.4,2.7,3.7c0.3,1.4,0.5,2.9,0.8,4.3
+			c-2.1,1-4,0.2-5.8-1c-0.6-1.9-1.3-3.7-1.9-5.5c-2.9-0.9-5.9-1.1-8.9-1c-0.5-1.4-0.9-2.8-1.4-4.2c-2.9,3.6-7.4,3.4-11.5,4.2
+			c0.9,2,2.8,4,2.1,6.4c-2,3.1-5.1,5.3-7.8,7.7c-0.2,1.4-0.4,2.8-0.6,4.3h-6.2c-0.2-0.4-0.5-1.1-0.7-1.5c-1.4-1.9-1.9-4.2-1.8-6.5
+			c1.7-2.1,4.2-3.1,6.6-4.1c-0.9-2.4-1.7-4.8-2.6-7.1c1.8-0.5,3.6-0.8,5.3-1.5C149.4,827.4,150.6,824,152.1,820.8z"/>
+		<path class="st2" d="M192.8,821.1c0.8,0,2.4-0.1,3.2-0.2c0.6,3.3,1.2,6.8,0,10.1c-1.7,5-1.2,10.3-1.7,15.4c-2.3-1-4.7-2-7.1-2.9
+			c0.3-2.8,1.8-5.9,0.2-8.4c-2.3-1.3-3.8-3.3-3-6c2,0.7,4,1.3,6,1.9C191.1,827.7,191.8,824.4,192.8,821.1z"/>
+		<path class="st2" d="M206.1,820.7c3.8,0.1,7.6,0.1,11.3,0c0.2,4.5-0.5,9.1-3.4,12.7c2.3,0.8,4.6,1.5,6.9,2.3
+			c0.2-0.5,0.7-1.5,0.9-2c0.6-1.4,1.2-2.7,1.8-4.1c1.3-0.4,2.6-0.9,4-1.3c0-1.1-0.1-2.2-0.1-3.3c-1.4,0.4-2.7,0.8-4.1,1.2
+			c-1.2,0.1-2.5,0.2-3.7,0.3c0-1.9,0-3.9,0.1-5.8c5.4,0,10.8,0.7,16.2,0c-0.3,1.3-0.5,2.7-0.7,4c2.5,0.3,4.9,0.7,7.4,1.2
+			c0,1,0,2.1,0,3.2c-3.1,0.5-5.1,2.6-6.4,5.3c-0.5,0-1.5,0-2,0c-1.6-0.6-3.2-1.1-4.8-1.5c-0.1,1.1-0.2,2.2-0.2,3.4
+			c1.2,0.1,2.4,0.2,3.6,0.4c2.7,0.6,5.3,1.7,8.1,2.2c2.9-0.6,5.7-1.6,8.7-2.1c0.2,2.1,0.3,4.3,0.5,6.4c1.5-0.1,3.9,0.9,4.2-1.3
+			c0-2.4-2-4.1-2.9-6.2c0.1-2.9,1.8-5.8,0.4-8.5c-0.5-1.7-2.5-1.9-3.8-2.7c-1.8-0.6-2.7-2.4-3.8-3.8c5.3,0.1,10.6,0,16,0
+			c-1.7,1.2-4.2,2-4.7,4.2c0.7,2.4,1.9,4.8,3.6,6.7c1.8,0.5,3-0.8,3.9-2.1c-1.2-1.2-2.3-2.4-3.3-3.7c0.8-1.4,2.4-2,3.8-2.8
+			c-0.1-0.8-0.3-1.6-0.4-2.3c6.2,0.1,12.5-0.1,18.7,0.2c-0.8,0.6-1.6,1.3-2.5,2c-2.3,1.2-4.6,2.4-7.1,3.3c-2.3-0.1-4.5-1.2-6.9-1.1
+			c-0.6,0.8-1.2,1.6-1.7,2.4c2.5,0.3,5.2,0.2,7.7,1.1c0.5,1.5,1,3.9-0.7,4.8c-2.6,1.4-5.6,1.6-8.4,2.2c1.2,3,1.4,6.3,1.3,9.5
+			c-2.3,0.5-4.9,0.2-6.9,1.4c-0.8,1.4-1.3,2.9-2,4.3h-7c0-2.4,0.1-4.8-0.3-7.2c-2-1.7-5.5-2.1-6.9,0.6c-0.4,3.1,3.2,4.7,5.1,6.6
+			h-8.2c0.4-1.3,0.8-2.5,1.2-3.8c-2-1.7-3.4-4.5-6-5.3c-0.4,1.4-0.6,2.9-0.9,4.3c-1.8,0.7-4.2,1.1-4.6,3.4l-0.6,1.3h-18.2
+			c2.2-4.4,5.9-7.6,9.7-10.6c-1.8-1-3.6-2-5.4-3c-2,2.2-4,4.5-6.2,6.6c-0.5,0.4-1.4,1.2-1.8,1.7c-0.4,0.3-1.2,1-1.6,1.4
+			c-0.3,1.3-0.6,2.6-1,4h-7.1c1.6-0.7,3.4-1.3,4.6-2.7c1.1-2.7,1.2-5.7,2.7-8.3c2.1-1.5,4.1-3,6.1-4.5c-1.4-3.3-2.7-6.6-4.1-9.9
+			c1.9,0.1,3.9,0.5,5.8-0.4C208.9,823.4,207.5,822,206.1,820.7z"/>
+		<path class="st2" d="M298.9,820.8c1.2,0,2.4,0,3.6,0c1.4,2.1,3.3,4,5.4,5.5c-1.3,0.9-2.6,3-4.4,2.1
+			C300.4,827.1,299.9,823.5,298.9,820.8z"/>
+		<path class="st2" d="M308.9,820.8c2.4,0,4.8,0,7.2,0c-0.5,0.7-1.1,1.5-1.6,2.2c-1.3,1-2.7,2-4.1,3
+			C309.9,824.3,309.4,822.5,308.9,820.8z"/>
+		<path class="st2" d="M322.6,820.9c3-0.1,6-0.1,9.1-0.1c-0.3,1.7-0.6,3.5-0.7,5.2c0.9,1.7,2.3,3,3.5,4.5c0,1.3,0,2.6,0.1,3.9
+			c3.1,1.8,6.2,3.5,9.6,4.9c-0.3-1.5,0.1-3.2-0.8-4.5c-1.4-0.8-2.9-1.3-4.3-2c-1.4-3-1.4-6.4-1.9-9.6c1.3,0.2,2.5,0.4,3.8,0.7
+			c0.5-1.1,0.9-2.1,1.4-3.1c2.6,0,5.3,0,7.9,0c-1.3,1.5-2.7,3-3.7,4.8c0.2,2.3,1.2,4.4,1.9,6.6c2.2-0.1,4.4-0.3,6.6-0.8
+			c-0.5-2-1.1-4-2.1-5.8c0.2-1.6,0.4-3.2,0.6-4.7c6.3,0,12.6,0,18.9,0c-1.1,1.4-2.3,2.9-3.4,4.3c0.5,0.6,1,1.1,1.5,1.7
+			c1.2,0.7,2.4,1.4,3.6,2.1c0.2-0.8,0.6-2.4,0.8-3.2c2-0.9,4.2-1.1,6.4-1.6c0.1-1.1,0.1-2.2,0.2-3.3c6.6,0,13.2,0,19.7,0
+			c-5.9,3.5-11,8.3-16.7,12.1c1.4,2,4.1,2.2,6.1,3.4c0.5,2-0.5,3.9-1.1,5.7c-1.1-0.4-2.2-0.7-3.3-1.1c-1.6-0.5-3.2-1.1-4.9-1.6
+			c0-3.2,0.2-6.3-0.1-9.5c-1.7-1.3-4-1.7-5.8-0.5c-1.2,3.1-0.1,6.5,0.2,9.7c-0.1,2,1.7,3,3,4.2c0.6,0.7,1.2,1.3,1.8,2
+			c1.7-0.1,3.4-0.2,5.1-0.2c0.2,0.4,0.7,1.1,0.9,1.5c-1.7,0.5-3.4,1-5.2,1.5c0.6,1,1.3,2,2,2.9h-4c-1.3-1.3-2.4-2.9-4.2-3.7
+			c-1.1,1-1.5,2.2-1.4,3.7h-13.2c0.1-0.8,0.2-2.3,0.3-3.1c1-0.8,2-1.6,3-2.4c-0.2-2.7,0.9-6.5-2.1-8.1c-1.9-0.5-3.4,1.2-4.9,2.1
+			c-1.5-0.1-3-0.2-4.6-0.2c0.8,3.7,5.1,4.1,8.1,5.4c-2,2-3.8,4.1-5.6,6.3h-8.3c2.1-1,4.2-2.1,6.3-3.1c-1.1-2.1-2.2-4.2-3.4-6.2
+			c-2.7,1.8-5.4,3.6-7.9,5.5c-1.5-1.6-2.9-3.3-4.2-5c-1.3,3.1,1.2,6,2.3,8.8h-5.1c-1.1-1.1-2.1-2.2-3.1-3.2c0.1-3.9,2-9.6-2.9-11.1
+			c-0.4-2.7-1.1-5.4-3.3-7.2c-1.8,2.2-3.4,4.5-4.9,6.9c-0.5-0.4-1.6-1-2.1-1.4c-0.4-3.1-0.8-6.2-1.4-9.3c0.3-0.7,1-2,1.4-2.7
+			c1,0.7,2,1.5,3,2.2c0.6,0.8,1.2,1.5,1.8,2.3c0.8-0.3,2.5-0.8,3.4-1.1C325,824.5,323.8,822.7,322.6,820.9 M360.4,825.4
+			c0,1.1,0,2.2,0,3.4c1.6,0.6,3.1,1.2,4.8,1.7c2-1,1.3-3.2,1.4-5C364.5,825.4,362.4,825.4,360.4,825.4z"/>
+		<path class="st2" d="M404.3,820.8c196.8,0.1,393.5,0,590.3,0c0.6,2.7,2.2,4.8,5,5.4c0.1-1.8,0.2-3.6,0.4-5.4c2.2,0,4.4,0,6.7,0
+			c1.1,0.9,1.9,2.8,3.6,2.9c2,0.3,2.9-1.8,4.2-2.9c5.9,0,11.9,0,17.8,0c-2.6,1.8-5.2,3.6-7.7,5.5c1,0.7,1.9,2.6,3.4,2.1
+			c2.4-1.4,4.5-3.3,7.3-3.8c1.9,2,0.1,5.1,0.1,7.6c1.5-0.6,3.7-0.7,4.3-2.5c0.8-2.2-1.8-3.5-3-4.9c1.1-1.3,2.3-2.7,3.5-4
+			c20,0.2,40-0.2,60,0.2c0.1,0.6,0.4,1.8,0.6,2.4c0.9,0.6,1.7,1.3,2.6,2c-1.6,3.8-4.7,6.6-6.4,10.3c2.2,1.1,4.4,2.2,6.5,3.3
+			c-0.8-4-1.4-8.2-0.7-12.3c1.3,0.2,2.7,0.4,4.1,0.7c2-2.1,4-4.2,5.8-6.5c9.8,0.1,19.7-0.1,29.5,0.1c-0.1,0.9-0.2,1.8-0.3,2.7
+			c0.6,1.7,2.2,3.4,1.1,5.2c-1.2,3.1-4.4,4.7-7,6.6c-1.9,0.8-1.4,3.1-1.7,4.8c0.9,2.6,2.1,5,3.4,7.5c0.4,0,1.1,0.1,1.5,0.2
+			c0.5-1.5,1.1-3,1.7-4.4c4.5-0.7,3.2,4.8,3.3,7.6h-17.5c-0.6-1.1-1.2-2.1-1.8-3.2c-1.9,0.3-3.1,2-4.5,3.2h-17.6
+			c-1.3-1.6-2.8-3.1-4.3-4.5c-0.3-1.7-0.6-3.3-0.8-5c-1.1,0.2-2.2,0.5-3.2,0.9c-0.9,1.3-0.6,3-0.8,4.4c0,1.4,0,2.8,0,4.2h-50.7
+			c1.5-2.6-3.4-2.6-1.8,0H762.6c-0.7-1.6-1.1-3.2-1.9-4.6c-2.9-1.3-6.4-1.8-9.5-1.1c-2.3,0.9-2.2,3.7-2.7,5.7H496.6
+			c0.4-1.4,0.7-2.8,1-4.2c-1.5-0.2-3.1-0.3-4.6-0.4c-0.2,1.6-0.3,3.1-0.4,4.7h-1.9c-1.1-1.2-1.1-4.9-3.3-3.6
+			c-1.2,0.8-1.4,2.4-2.1,3.6h-62.4c-0.3-0.5-0.8-1.4-1.1-1.8c3-1.6,6.6-3,7.9-6.5c0.8-1.5-0.8-2.9-1.3-4.2
+			c-3.6,2.6-6.8,5.8-10.4,8.4c-1.9,0.4-3.9,0.4-5.8,0.4c-1.2-1.7-1.5-4.9-4.2-4.6c-1.7-0.1-3.3,0-5,0c0.1,1.6,0.2,3.2,0.3,4.8
+			c1.6,0.4,3.2,0.8,4.8,1.1c0.3,0.6,1,1.7,1.3,2.2h-9.7c-1.4-3.7,0.8-7.4,3.3-9.9c1.7-1.4,4.1-1.2,6.1-1.8c-0.5-1.6-1.1-3.1-1.6-4.7
+			c-3.7,2.4-7.6,4.9-10.4,8.3c-0.6,2.8-0.8,5.9-3,8.1h-5.4c2.4-3.7,3.6-7.9,5.9-11.5c2.5-2,5.6-2.9,8.3-4.3c-1.1-2.1-2.2-4.1-3.6-6
+			c0.7-0.5,1.4-0.9,2.1-1.3c0.1-1,0.1-2.1,0.2-3.1c1.1-0.1,2.3-0.2,3.4-0.2C404.8,823.2,404.5,822,404.3,820.8 M440.8,822.2
+			c2.2,1.8,4.8,3.1,7.1,4.7c2-0.9,4.1-1.7,6.1-2.5c-0.5-0.7-0.9-1.3-1.4-2C448.8,821.2,444.7,821.5,440.8,822.2 M938.2,823.4
+			c1.6,0.4,3.1,1,4.4,2c1,0.1,2,0.1,3,0.2c0.4-1.2,0.8-2.3,1.2-3.4C943.9,822.4,941,822.9,938.2,823.4 M1120.2,823.2
+			c-2.8,1.9-0.4,6.1,2.5,5.7C1125.6,827,1122.2,824,1120.2,823.2 M1130.5,829c2.7,3.7,6.1,0,8.4-2.1c-0.3-0.4-0.8-1.3-1-1.7
+			C1135.2,826.1,1132.6,827.1,1130.5,829 M466.3,826.3c1.5,3.9-0.7,8,1.2,11.8c-0.8,1-1.6,1.9-2.4,2.9c0.4,0.1,1.1,0.4,1.4,0.5
+			c2.9-4.2,5-9,5-14.2C470.4,825.6,468,826.6,466.3,826.3 M1000,826.8c0.2,1.5-0.1,3.2,0.7,4.5c2.3,1.1,4.9,1.4,7.4,1.4
+			c1.5,0.4,3.5,0.3,4.2,2c1.2,2.5,4.1,4.5,7,3.7c2.1-0.7,2.1-3.2,2.6-5c-2.6,0-5.2-0.1-7.7-0.1c-0.8-1-1.2-2.2-2.2-2.9
+			c-1.7-0.2-3.3-0.2-5-0.2c-0.8,0.1-1.7,0.2-2.5,0.3C1003.3,828.8,1002,827.2,1000,826.8 M1109,828.2c0.3,2.8,2.9,4.1,4.9,5.7
+			c0-2.3-0.1-4.6-0.2-6.9C1112.1,827.5,1110.5,827.8,1109,828.2 M730.2,828.2c-1.6,2,1.5,5.1,3.1,2.8
+			C733.8,829,731.9,828,730.2,828.2 M937.5,828.4c-0.6,2-0.8,4.1-1.2,6.2c1,0.8,2,1.6,3,2.5c0.1,1.9,0.1,3.8,0.2,5.7
+			c0.3,0.3,0.8,0.8,1.1,1.1c0.2-4.1-1.8-7.8-1.3-11.9C939.3,830.7,939.4,827.8,937.5,828.4 M434.4,832.9c0,2.1,2.1,3,3.6,4.1
+			c0.5-2.4,1-4.9,0.3-7.3C436.4,828.5,434,830.8,434.4,832.9 M489.8,828.7c-1.6,2.2,0.8,5.4,3.3,4.8
+			C495.2,831.3,492.8,827.1,489.8,828.7 M1079.2,829.5c-2.4,0.5-3,3.2-4,5.1c2.4-0.4,5-0.6,7.4-0.1c0-1.4,0-2.8,0.1-4.2
+			C1081.5,830,1080.3,829.6,1079.2,829.5 M1053.1,830.2c-0.4,2-0.6,4.3,0.6,6.1c2.6,0.4,5.3,0.5,8,0.4c1.8-1.2,2-3.5,2.2-5.4
+			C1060.3,831.2,1056.7,831,1053.1,830.2 M747.2,831.2c0.4,1,0.3,2.4,1.1,3.2c1.5,0.1,4.3,0.8,4.3-1.5
+			C752.3,830.5,748.9,831.6,747.2,831.2 M450.3,833.2c0,0.6,0,1.9,0,2.5c1.5,0.1,3,0.2,4.5,0.3c0-0.7,0-2.2,0-2.9
+			C453.2,833.1,451.8,833.2,450.3,833.2 M421.5,835.4c-1,1.1-1.9,2.3-2.6,3.7c1,2.5,3.8,0.7,4-1.3
+			C423.8,836.8,422.8,833.6,421.5,835.4 M771.9,839.8c2-0.1,3.9-0.4,5.8-1c0-0.7,0.1-2.1,0.1-2.8C775,835.6,772.8,837.1,771.9,839.8
+			 M984.3,836.3c-1.4,1.6-0.7,4.7,1.8,4.2C988.3,838.8,987.4,833.8,984.3,836.3 M1116.5,836.3c0,1.1,0,2.2,0,3.3
+			c1.7-0.1,3.4,0,5.1-0.3c0.7-0.7,1.4-1.6,0.5-2.4C1120.4,835.9,1118.3,836.5,1116.5,836.3 M437,841.5c-1.9-0.2-2.5,1.3-2.9,2.9
+			c0.4,0.1,1.1,0.2,1.5,0.3c1.3,0.8,2.7,1,4.2,1.2c0.8-2.9,1.5-5.8,2.1-8.7C439,837,438.1,839.5,437,841.5 M515.2,837.1
+			c-0.2,2.1,1.7,3.5,2.7,5c1.1-1.6,1.4-3.5,1.2-5.4C517.8,836.6,516.4,836.7,515.2,837.1 M1034.2,838.2c-1.4,1,0.1,3.6,1.6,2.5
+			C1037.1,839.7,1035.6,837,1034.2,838.2 M490.1,840.1c0.5,1.3,0.1,3.6,2,3.7c1.3,0.3,2.4-0.7,2.7-1.9
+			C494.3,839.8,491.8,840.3,490.1,840.1 M1110.1,840.2c0.5,2.4,1.7,4.5,2.4,6.9c2,0,4.9,0.7,5.6-2
+			C1116.4,842.6,1113.5,838.6,1110.1,840.2 M455.4,842.4c-0.5,2.7,2.6,3.4,4.4,4.5c1.6-1.4,2.3-3.3,1.8-5.5
+			C459.6,841.7,456.6,840.1,455.4,842.4 M1022.2,845.7c1.6,0,3.3-0.1,4.8-0.8c-0.4-1.7-0.6-4.3-3-3.7
+			C1021.7,841.3,1022.2,844.1,1022.2,845.7 M1058.5,840.8c1.1,2,3,4.8,5.7,4.4C1064.6,842.4,1061.1,840.1,1058.5,840.8 M1080,841
+			c-1.2,1.2-0.2,2.9-0.1,4.4c1.9,0.1,3.6-0.9,4.7-2.4C1083.3,841.8,1082,839.8,1080,841 M551.5,842.5c-0.7,1.2-0.2,3.4,1.5,3.2
+			c1.9,0.5,2.4-1.4,3.1-2.7C554.7,842.7,553.1,841.9,551.5,842.5 M1067.3,841.9c-1.7,1.9-2.8,4.2-3.3,6.8c1.8-0.3,4.2,0.6,5.7-0.9
+			C1069.7,845.5,1068.6,843.6,1067.3,841.9 M472.3,844.4c-2.6,2.3,3.7,4.6,3.9,1.5C477,843.6,473.4,842.8,472.3,844.4 M877.2,845.1
+			c-1,2.8,6.4,4.7,6.1,0.9C882.4,843.7,879,844.5,877.2,845.1 M1028.2,845.3c-1.7,0.2-2,3.3-0.2,3.6
+			C1029.6,848.7,1030,845.6,1028.2,845.3z"/>
+		<path class="st2" d="M1142.5,820.8c3.2,0,6.3-0.1,9.5-0.1c0.6,0.7,1.3,1.4,1.9,2.1c-2.7,0.6-5.4,1.3-8.1,1.5
+			C1144.6,823.3,1143.6,822,1142.5,820.8z"/>
+		<path class="st2" d="M1198.1,820.8c0.8,0,2.3,0,3.1,0c-0.7,1.1-1.3,2.1-1.9,3.2c0.1,0.5,0.4,1.6,0.5,2.1c-1.4,2.1-2.7,4.3-4.1,6.4
+			c-1.6-2.7-3.2-5.4-4.2-8.4c1.4-0.1,2.9-0.1,4.4-0.1C1196.7,823,1197.4,821.9,1198.1,820.8z"/>
+		<path class="st2" d="M1204.3,820.7c1.2,0,2.4,0,3.6,0c0.2,1.3,0.4,2.5,0.6,3.8c1.8,1.9,3.6,3.8,5.2,5.8c-0.4,0.7-1.3,2.2-1.8,2.9
+			c-1.5-1.2-3-2.6-4.7-3.5c-2-0.2-4.1,0.2-6.1,0.5c0.3-1.1,0.7-2.2,1-3.2c-0.3-0.8-0.5-1.6-0.8-2.4c1-0.4,2.1-0.7,3.1-1.1
+			C1204.5,822.6,1204.4,821.7,1204.3,820.7z"/>
+		<path class="st2" d="M1236.6,820.8c3,0,5.9,0.1,8.9,0.2c0,0.4,0,1.3,0,1.7c-1.2,2.4-3.8,2.7-6,3.2
+			C1238.5,824.2,1237.5,822.5,1236.6,820.8z"/>
+		<path class="st2" d="M1260.2,821.3c2.2-0.3,4.4-0.5,6.7-0.7c-0.9,2-1.8,4-2.5,6.1c-1.2-0.8-2.5-1.6-3.6-2.5
+			C1260.7,823.5,1260.4,822,1260.2,821.3z"/>
+		<path class="st2" d="M1270.8,821.1c3.9-0.6,8-0.4,11.8,1.1c-1,0.1-2.9,0.2-3.9,0.3c-0.1,0.6-0.4,1.7-0.5,2.3
+			c-0.7,2-2.3,3.4-3.9,4.8c0.1,0.5,0.4,1.6,0.6,2.1l-0.3,0.3c-0.4,0.3-1.1,0.9-1.5,1.2c-0.4-0.3-1.1-1-1.4-1.4
+			c-0.3-0.6-0.8-1.9-1-2.5c-1.1-1.3-2.4-2.6-2.4-4.4c1.9,1,3.5,2.5,5.2,3.8C1275.5,826,1272,823.4,1270.8,821.1z"/>
+		<path class="st2" d="M1284.1,820.9c2.9-0.1,5.8-0.2,8.7,0c1.4,1.9,2.9,3.8,4.3,5.7c-0.6,0.3-1.8,1-2.3,1.4
+			c0.7,0.8,1.4,1.5,2.2,2.3c-0.3,0.4-0.8,1.3-1.1,1.8c-0.6,0.1-1.9,0.4-2.5,0.6c1.1,1.8,2.4,3.6,2.4,5.7c-1.5-0.1-3-0.2-4.5-0.2
+			c0.2-1.3,0.4-2.6,0.7-3.8l0.5-0.7c-1.5,0-2.9,0-4.4,0c-0.3-0.5-1-1.4-1.3-1.8c1.8-1.8,5-3.1,4.3-6.1c-2-0.4-4-0.8-6-1.2
+			C1284.8,823.3,1284.5,822.1,1284.1,820.9z"/>
+		<path class="st2" d="M1299.6,821.1c1.6,0,3.2-0.1,4.9-0.1c-0.7,2.4-2.4,3.9-4.9,3.6C1299.6,823.5,1299.6,822.3,1299.6,821.1z"/>
+		<path class="st2" d="M1308.4,820.9c0.7,0,2.2-0.1,2.9-0.1c0.3,1.4,0.6,2.8,0.8,4.3c-0.9,1.2-2.1,2-3.3,2.9
+			c-0.6,0.2-1.8,0.6-2.4,0.8c-0.1-0.8-0.3-2.3-0.4-3C1306.8,824.1,1307.6,822.5,1308.4,820.9z"/>
+		<path class="st2" d="M1325.4,820.8c1.1,0,2.3,0.1,3.5,0.2l0.2,0.2c-0.7,0.5-2.1,1.4-2.8,1.9c-0.8,1.1-1.5,2.3-2.2,3.5
+			c-2.3,0.2-4.6,0.5-6.9,0.3c0-0.4,0.1-1.1,0.2-1.5C1319.9,823.6,1322.8,822.4,1325.4,820.8z"/>
+		<path class="st2" d="M1343.4,821.1c1.5,0.1,3.1,0.1,4.7,0.1c0.4,1.1,0.8,2.3,1.3,3.4c1.5,0.6,3.1,1,4.6,1.4
+			c-0.7,1.3-1.7,2.3-2.7,3.3c-1-0.7-1.8-1.4-2.8-2.1c-0.1,1.1-0.2,2.1-0.2,3.2c-1.7,0.2-3.7-0.2-4.9,1.3c1.1,1.7,2.6,3.1,4.1,4.5
+			c0-1.3,0.1-2.5,0.2-3.8c2.4-0.2,5-0.4,7.2-1.8c3.3-1.8,1.5-6.4,2.1-9.4c1.5-0.1,3-0.1,4.5-0.1c0.1,1.1,0.2,2.1,0.4,3.2
+			c1.1-0.8,1.7-1.9,2.2-3.1c3.5-0.5,7.1-0.5,10.7-0.4c1.3,0.9,2.6,1.8,3.9,2.8c-1,0.9-1.9,1.8-2.9,2.7c-1.2,0-2.3,0-3.4,0.1
+			c0.1,0.4,0.2,1.2,0.2,1.5c1,0.7,2.8,0.9,2.9,2.4c0.4,2.7-0.6,5.3-1.4,7.9c-1.1,3.2-1.7,6.5-2.8,9.7l-0.9,1.2
+			c-0.4,0.2-1.1,0.6-1.5,0.8c-0.9-0.8-1.8-1.7-2.7-2.5c0.2-1.1,0.4-2.1,0.7-3.2c-0.8,0-2.3,0.1-3.1,0.1c0.3,2.3,0.6,4.5,1.1,6.8
+			h-2.5c-0.8-1.4-1.4-2.8-2.1-4.3c-0.6,1.4-1.2,2.9-1.8,4.3h-3.4c1.3-2.3,2.5-4.8,3.7-7.1c1.4-0.1,2.8-0.2,4.2-0.3
+			c0.6-1.1,1.3-2.2,2-3.3c0.7,0.7,2.1,2,2.8,2.6c0.3,0.3,1,1,1.4,1.3c0.7-3.8,1.2-7.7,2.3-11.3c-4.6,0.3-4.6,6-8.6,7.4
+			c-0.6,0.2-2,0.6-2.6,0.8c-0.4,0.2-1.2,0.7-1.6,1c-2.4,0.3-4.7,0.6-7.1,1c-0.4-0.2-1.1-0.7-1.5-0.9c-1.3-0.8-2.8-1.4-4.3-1.7
+			l-0.8,0.9c-0.2,1.8-0.2,3.7-0.2,5.5c0.5,0.2,1.5,0.6,2,0.8c1.4-0.8,2.8-1.7,4.2-2.5c1.5,1.7,2.8,3.6,2.2,5.9h-10
+			c-1.1-1.3-2.2-2.7-3.3-4c1-1.4,2-2.8,3-4.1c0.1-0.8,0.4-2.4,0.6-3.2c0.3-1.3,0.6-2.5,0.9-3.8c-0.7-0.4-2-1.2-2.7-1.5
+			c-1.4,0.5-2.8,1-4.2,1.5c-0.1-0.3-0.4-1-0.6-1.3c3.4-2.4,7.7-4.8,8.8-9.1c-0.6-0.3-1.8-1-2.5-1.3
+			C1343.5,823.2,1343.4,822.1,1343.4,821.1 M1367.3,826.7c-0.7,2-2,4.4-0.3,6.2C1370.1,832.1,1369.2,828.3,1367.3,826.7 M1359.3,830
+			c-0.4,3.2-4.2,6.6-1.5,9.5c2.5,0.2,2.1-3.2,2.8-4.7c0.1-1.9,1.9-5-0.8-5.7L1359.3,830 M1348.1,838.2c1.7,0.5,3.4,1.2,5.1,1.9
+			c3.3-0.3,0.1-3.8-1-5C1350.8,836.1,1349.5,837.2,1348.1,838.2z"/>
+		<path class="st2" d="M1378.8,820.9c4.6,0,9.2-0.1,13.9-0.1c0.1,2,0.2,4.1,0.3,6.1c0.1-2,0.2-4.1,0.3-6.1c4.5,0,9,0,13.5,0
+			c0,1.2,0,2.4,0,3.6c0.6,0.4,1.1,0.8,1.8,1.3c-0.4-0.3-1-0.9-1.4-1.2c0-0.9,0-2.8,0-3.7c19.4,0,38.7,0.1,58.1,0
+			c0.5,2.1,1,4.2,1.5,6.3c1.5-1.1,2.9-2.1,4.4-3.2c-0.8-1-1.5-2.1-2.3-3.1c5.1,0.2,10.3,0.7,15.4-0.2c-0.6,1.3-1.2,2.6-1.8,3.9
+			l2.6-1c0.1,1.5,0.2,3,0.3,4.5c0.1-2.4,0.2-4.7,0.3-7.1c2.2,0,4.5,0,6.8,0c2.5,2.1,5.3,4.3,8.8,3.8c1.1,0,2.2,0.1,3.3,0.1
+			c0.1-1.3,0.2-2.7,0.3-4c8.3,0,16.7,0,25.1,0c0.2,0.6,0.7,1.7,0.9,2.3c-1,0.7-2,1.5-2.9,2.2c0.2,1.7,0.4,3.4,0.6,5.1
+			c-1.6,0.7-3.1,1.4-4.6,2.2c-0.8,1.4-1.6,4,1,3.9c0.4-0.3,1.2-1.1,1.7-1.4c0.9-1,1.7-2.1,2.6-3.2c1.6,0.7,3.2,1.5,4.8,2.2
+			c-0.1,2.9-3.1,3.8-5,5.3c2.8,0.6,5.6,1.2,8.4,1.7c-0.8,1.5-1.8,2.8-3,4c-1.6,1.5-3.1,3.1-4.5,4.8c1.5-0.7,3.1-1.5,4.6-2.2
+			c1,1.1,2,2.3,3.1,3.5h-12.4c0.4-1,0.8-2,1.2-3c-1.4-0.1-2.7-0.1-4-0.2c-0.1,0.8-0.4,2.4-0.6,3.2h-3.6c-0.6-0.8-1.2-1.5-1.8-2.3
+			c-2.7,0.6-5.5,0.6-7.8,2.3h-2.9c-1.8-1.4-3.5-2.8-5.3-4.1c-0.5-0.1-1.5-0.3-2.1-0.3c-1.3-1.2-2.6-2.5-3.9-3.7
+			c-0.2-2.5,0.3-5.2-0.6-7.5c-1.5-0.6-3.1-0.5-4.6-0.7c-0.3,1.9-0.6,3.7-0.9,5.6c-0.8-0.8-1.6-1.7-2.3-2.5c-0.3-0.4-0.9-1.2-1.2-1.6
+			c1.2-1.2,2.5-2.5,3.4-3.9c-2.9-2.5-6.2,0.6-8.9,1.9c0.3,0.9,0.6,1.7,0.9,2.6c3.3,1.4,3.3,4.8,3.2,7.9c0.4-0.1,1.2-0.4,1.5-0.6
+			c0.6,0,1.9-0.1,2.6-0.1c1.8,0.6,3.5,1.2,5.3,1.9c-1.1,1.5-2.3,3-3.3,4.5l-0.3,0.7h-4.9c0.6-1,1.2-2,1.7-3
+			c-2.3-0.3-4.5-0.7-6.8-0.9c0.2,1.3,0.5,2.6,0.8,3.9h-30.5l0.4-1c1.3-3.3,2.9-6.5,5-9.4c3.1,2.8,6.2,6,10.5,6.6
+			c-0.3-1.2-0.7-2.3-1.2-3.4c-1.8-0.8-3.7-1.2-5.5-1.7c-1.6-2-3-4.2-5.1-5.7c-2-0.8-4.3-1.1-6.4-1.6c0,0.7,0,2,0,2.7
+			c2.5-0.3,4.9,0.2,6.5,2.2c-1.6,2.3-3.4,4.4-5.2,6.6c-0.8,1.5-1.3,3.1-1.9,4.6h-16.1c-0.1-0.8-0.4-2.4-0.6-3.2
+			c-1.6,1.1-3.1,2.1-4.7,3.2h-0.9c0.9-2,1.3-4.3,2.7-6c1.9-0.8,3.9-1,5.9-1.3c0.5,0.4,1.4,1.3,1.9,1.7c2.8-1.8,5.8-3.2,8.6-5.1
+			c0.1-0.5,0.3-1.5,0.4-1.9c-3.4-0.7-6.5,1.2-9.5,2.3c-1.6-2.4-2.1-5.2-1.1-8c0.7-1.4-0.9-2.1-1.6-3c-0.1,2.4,0.1,4.8-0.3,7.2
+			c-0.6,2.1-2.5,3.4-4.2,4.6c-1.6,0.8-3.2,1.4-4.7,2.1c-0.6,2-1.2,3.9-1.8,5.9c-2.2,0.3-4.3,0.8-6.3,1.4h-6.4
+			c-1.9-1.4-3.9-2.7-6.1-3.5c0.3,1.2,0.7,2.3,1.2,3.5h-27.4c-0.1-1.2-0.2-2.4-0.2-3.6c0.7-2.5,2-4.8,3.1-7.1
+			c1.1-4.4,2.2-8.7,3.2-13.1c0.3-1.6,0.8-3.1,1-4.7C1381.3,821.9,1380,821.3,1378.8,820.9 M1399.1,822.1c-0.3,2.7-0.4,5.4-0.2,8.1
+			c0.8-0.7,1.6-1.3,2.5-2c-0.3-0.9-0.6-1.8-0.8-2.8c0.6-1.2,1.2-2.3,1.8-3.4C1401.6,822,1400,822.1,1399.1,822.1 M1430,821.9
+			c-1.8,1.8,0.9,3.9,2.7,3.8c1.3-0.9,1-2.5,1.4-3.8C1432.7,821.9,1431.3,821.9,1430,821.9 M1451,822.9c1.5,2.1,2.3,5.1,4.8,6.1
+			C1458.5,826.4,1454.3,820.5,1451,822.9 M1421.2,826.9c1.7,0,4,0.3,4.5-2c-1.3-0.8-2.6-1.3-4-1.6
+			C1421.5,824.5,1421.3,825.7,1421.2,826.9 M1435.4,824.4l-0.7,0.4c0.1,3.3,5.8,2.5,4.2-0.6C1437.6,823.8,1436.5,823.9,1435.4,824.4
+			 M1447.2,824.3c0.3,1.8,0.7,3.7,1,5.5c0.5-0.8,1-1.6,1.5-2.3c-0.1-0.7-0.4-2.2-0.5-2.9C1448.8,824.5,1447.8,824.4,1447.2,824.3
+			 M1472.8,824.1c0.7,1.7,2.2,2.8,3.6,4c-0.4,2.2-3.1,3.5-3.2,5.8c-0.3,1.5,0.3,3.3-0.6,4.6c-2,1.1-4.1,1.7-6.1,2.6
+			c0.5,0.9,1.1,1.8,1.8,2.6c-0.1,0.9-0.2,2.7-0.3,3.6c2.2,0.2,3.7-1.6,5.2-2.9c1.4,0.6,2.8,1.3,4.2,1.9c0.9-1.5,1.9-2.9,2.6-4.5
+			c-0.3-1.2-0.6-3.3-2.2-2.5c-1.1,1.9-2.3,3.8-4.4,4.8c-0.8-0.8-1.6-1.7-2.3-2.5c1-1.2,2.1-2.3,3.4-3.2c0.3-1.3,0.6-2.7,1-4
+			c1.2-0.5,2.5-1,3.7-1.5c-0.6-1.2-1.2-2.3-1.8-3.4c0.7-0.2,2.2-0.6,2.9-0.9C1480.3,824.6,1475.8,824,1472.8,824.1 M1518,827.2
+			c-0.5,0.3-1.4,1-1.8,1.4c-0.5,2.5,1.5,3.1,3.6,2.4c-0.2-1-0.5-2.1-0.7-3.1c1.1-0.8,4.5-1.8,2.6-3.5
+			C1519.4,822.6,1518.2,825.2,1518,827.2 M1385.3,833.6c2.8,0.6,3-2.4,3.6-4.2C1387.6,830.6,1382.7,831.2,1385.3,833.6
+			 M1392.3,830.8c1.2,0.4,2.5,0.5,3.8,0.2c0.4-2.3-2.2-2.1-3.6-2.7C1392.5,828.9,1392.4,830.2,1392.3,830.8 M1441,829.2
+			c-0.3,1.9-0.4,3.9-0.5,5.9c1.8-0.5,3.7-1,5.5-1.5C1444.9,831.5,1442.9,830.3,1441,829.2 M1465.6,835.1c0.9,1.1,2.7,1.4,3.9,0.5
+			c0.2-2.2,0.1-4.4,0.2-6.6C1467.3,830.1,1465.8,832.5,1465.6,835.1 M1490.7,832.6l1.9-0.7c0,0.4,0,1.2,0,1.6c0.8-0.6,1.6-1.3,2.4-2
+			l0.7-0.1c0-0.7-0.1-2-0.1-2.6C1493.5,829.5,1492.2,831.2,1490.7,832.6 M1410,839.1c0.3-1.5,0.5-3.1,0.8-4.6c-1-0.5-2-1-3-1.5
+			c-0.1-0.8-0.4-2.3-0.6-3C1404.8,833.1,1407,837.2,1410,839.1 M1422,831.2c0.2,2.8,2,4.9,4.5,6c-0.3-2.4-0.6-4.8-0.8-7.2
+			C1424.5,830.4,1423.2,830.8,1422,831.2 M1502.9,830.9c-1.3,2.3,2.2,4.4,3.7,2.2C1506.7,830.9,1504.6,830.7,1502.9,830.9
+			 M1510,830.9c-1.5,2.4,1.1,3.1,3,3.3c0-0.8,0-2.5,0-3.4C1512.2,830.9,1510.7,830.9,1510,830.9 M1436.1,833.4
+			c-1.5,1,0.1,3.5,1.6,2.4C1439.2,834.7,1437.5,832.2,1436.1,833.4 M1497.5,834.3c0.4,1.2-0.8,4.7,1.5,4.4c1.6,0.1,2.5-1.4,2.5-2.9
+			C1500.5,834.7,1499.2,834.1,1497.5,834.3 M1518.4,839.5c-1.7,1.5-3.6,6.6,0.4,5.6c1.2-3.3,3.2-7,1-10.4
+			C1518.3,836,1518.4,837.8,1518.4,839.5 M1395.8,836.1c-1.4,2.7,2.1,2.9,3.7,3.8c0.3-1.6,0.4-3.2,0.1-4.8
+			C1398.6,835.3,1396.7,835.8,1395.8,836.1 M1387.4,838.3c-1.6,1.2-3.3,2.5-4.9,3.7c0.1,0.8,0.4,2.4,0.5,3.2c2.3-1.8,4.3-3.8,6.1-6
+			C1388.7,838.9,1387.8,838.5,1387.4,838.3 M1414.9,839.2c1.5,1.3,3.2,2.5,5.2,3.2c-0.6-1.8-1.2-3.5-1.9-5.1
+			C1417.1,837.8,1416,838.5,1414.9,839.2 M1421.5,838.9c-0.1,2,1.5,1.9,3,1.7c0.1-0.7,0.2-2.1,0.3-2.7
+			C1423.5,837.8,1422.4,838.2,1421.5,838.9 M1500.3,841.1c0,1.3,0,2.5,0.1,3.8c2,0.5,4.1,0.7,6.2,0.8c0-0.6,0.1-1.8,0.1-2.5
+			C1504.7,842.4,1502.6,841.7,1500.3,841.1 M1508.6,843.1c1.5,1.8,3,3.9,5.6,4.1c-0.6-2.4-1.7-4.7-3.1-6.7
+			C1510.2,841.3,1509.4,842.2,1508.6,843.1 M1404.6,843.2c-1.1,1.5,1.5,2.9,2.6,1.6C1408.3,843.2,1405.6,841.8,1404.6,843.2
+			 M1436,848.8c2.2-0.4,4.4-0.9,6.7-1.3c0-0.5-0.1-1.6-0.1-2.2C1439.8,843.6,1437.7,847,1436,848.8z"/>
+		<path class="st2" d="M1532.8,820.8c6.9,0,13.8,0,20.7,0c0.1,1.1-0.4,2.5,0.3,3.4c2.7,1.5,5.8,0.3,8.6-0.1c0.1,0.4,0.2,1.3,0.2,1.7
+			l-0.5,0.2c-4.1,0.6-8.5,2.5-12.5,0.5c-2.2-0.9-3.9-2.5-5.5-4.1c-1.8-0.1-3.3,0.9-4.6,2c-0.6-0.2-1.7-0.5-2.3-0.7
+			C1535.8,822.7,1534.3,821.7,1532.8,820.8z"/>
+		<path class="st2" d="M1584.4,821.1c5.8-0.4,11.7-0.6,17.4,0.4c-0.7,0.3-2.1,0.9-2.7,1.2c1.6,1.9,3.4,3.5,5.4,4.9
+			c-0.2,0.9-0.7,2.7-0.9,3.6c-1-0.8-1.9-1.7-2.8-2.5c-1.3-1.2-2.7-2.4-4-3.6c-1,0-2,0.1-3,0.1c-2-2.3-4.9-2.9-7.8-3.2
+			C1585.6,821.8,1584.8,821.3,1584.4,821.1z"/>
+		<path class="st2" d="M1609.4,821c2.4,0.1,4.9,0.5,7.3,1.2c0,1.2,0,2.4,0,3.6c0.3,0.4,1.1,1.1,1.4,1.5c-0.2,0.6-0.7,1.9-0.9,2.5
+			c-1.9-1.4-3.3-3.4-5-5C1611,823.7,1610.1,822.3,1609.4,821z"/>
+		<path class="st2" d="M41.8,822.8c1.9-1.1,4.2-0.2,6,0.7c-1.4,3.5-5.9,3.1-9,3.4c-0.1,2-0.1,4.1-0.2,6.1c-1.8-0.6-3.6-1.3-5.4-1.6
+			c-1.9,0.5-3.2,2.1-4.7,3.2c-1.7-0.3-3.5-0.6-5.2-1c0-1.4,0-2.8,0.1-4.1c2.3-0.1,4.8,0.1,7-1.2c2.3-1.4,5.1-1,7.7-1.4
+			C39.4,825.6,40.2,823.8,41.8,822.8z"/>
+		<path class="st2" d="M1663.2,823.9c0.6-0.9,1.2-1.8,1.8-2.6c0.8,0.3,2.3,0.8,3.1,1.1c-0.5,1.1-0.9,2.3-1.4,3.4
+			c-1.1,1.7-2.3,3.3-3.2,5.1c0.7,1.7,1.6,3.3,2.5,4.9c1.5-0.1,3-0.2,4.6-0.3c1.2,1.5,2.4,2.9,3.7,4.3c-0.2,0.5-0.3,1-0.4,1.6
+			c-0.3,1.3-0.5,2.7-0.6,4.1c-0.6,0.4-1.7,1.1-2.2,1.5c-1.3-1.5-2.4-3.2-3.6-4.8c-1.1-0.5-2.1-1-3.2-1.4c0.5-1.4,0.9-2.9,1.4-4.3
+			c-1.2-0.9-2.3-1.7-3.4-2.6c-0.4-0.3-1.3-1-1.8-1.3c-0.2-1.2-0.3-2.5-0.4-3.7l0.7,0c0.6,0,1.9,0.1,2.5,0.1
+			C1663.3,827.5,1663.2,825.7,1663.2,823.9z"/>
+		<path class="st2" d="M1165.2,823.8c0.6,0,1.8-0.1,2.5-0.1c1.9,1.4,3.8,2.8,5.8,4.2c-1.9,2-3.7,4.1-4.6,6.8c2.5,0,5,0,7.6-0.1
+			c0.1-1.6,0.1-3.3,0.3-4.9l1.1-1.3c0.7,1.1,1.4,2.2,2.1,3.3c2.1,0.6,4.9,0.2,6.2,2.4c0.5,2.5-2,3.8-3.3,5.4l-1.1,0
+			c-1.1,0.4-2.1,0.9-3.2,1.4c-1-1.4-1.9-2.7-2.8-4c-0.8,1.3-1.5,2.6-2.2,3.9c-0.2,1.3-0.3,2.7-0.2,4.1c1.1,1.2,2.8,0.5,4.1,0.3
+			c1.2-0.7,2.3-1.4,3.5-2c1.9,0.5,3.6,1.5,5.4,2.4c1.2-1.5,2.5-3.1,3.7-4.6c1.2,0.1,2.4,0.4,3.6,0.1c1.5-1.4,2.8-3.2,4.1-4.8
+			c1.2,1.1,2.5,2.1,3.8,3.2c0,1.3,0,2.6-0.1,4c-1.5,1.1-3,2.2-4.3,3.5c-0.1,2.1,2.3,3,3.7,4.1h-11c1.4-2.1,5.3-3.7,4.4-6.5
+			c-2.8-0.4-5.3,1.4-7.8,2.3c-0.2,1.4-0.4,2.8-0.6,4.2h-8.3c-2.1-1-4.3-1.8-6.5-2.5c-1.5-1.5-2.6-3.5-4.7-4.3
+			c-1.2,2.2-1.9,4.5-2.9,6.8h-17.3c0.8-2.2,1.4-4.4,2.3-6.5c1.9-0.4,3.6,0.8,5.3,1.3c1.4-1,2.9-2,4.3-2.9c2,0.1,3.9,0.2,5.9,0.2
+			c0.3-0.1,1.1-0.3,1.4-0.4c0.4-1.7,0.7-3.4,1-5.1c-2.7-0.6-5.5-1-8.2-1.3c-2-2.2-4.2-4.3-7-5.4c0,1.9,0,3.9,0,5.8
+			c-1.7-0.3-3.6-1.8-5.2-0.5c-2.1,1.4-3.7,3.4-5.3,5.2c-0.7-0.8-1.4-1.7-2.1-2.5l-0.1-0.9c3.1-3,6.8-5.4,9.8-8.6
+			c1.3-1.2,2.5-2.9,4.5-2.9c4.2,1.9,7.1,6.2,12,6.4c-0.4-1.8-0.8-3.6-1.2-5.4c0.4-1,0.8-2,1.2-3C1165,824.3,1165.1,824,1165.2,823.8
+			z"/>
+		<path class="st2" d="M1225.5,823.4c1.8,0.2,3.7,0.3,5.5,0.4c0.9,1.7,1.4,3.9,3.3,4.9c2.2,0.7,4.6,1,6.8,1.8
+			c-0.4,1.1-0.8,2.3-1.2,3.5c-1.7,0.4-3.3,1-4.9,1.7c-0.1,0.5-0.4,1.5-0.6,2c-0.6,0.7-1.2,1.4-1.7,2.2c-0.3-4.1-1.8-8-3.5-11.6
+			c-0.7,0.6-2,1.7-2.7,2.2c-0.4,1.1-0.7,2.3-1,3.4c-1.1-0.1-2.2-0.2-3.2-0.3c-1.4,3.2-2.5,6.5-3.3,9.8c2.8-0.3,4.2-2.7,5.8-4.6
+			c0.2,3-0.9,5.8-2.8,8c-4.4-1-9.1,0.4-11.6,4.3h-5.3c0.5-0.8,1.1-1.5,1.6-2.2c-0.2-1.3-0.5-2.6-0.6-3.8c2.8-3.3,5.4-6.8,8.1-10.2
+			c0.3-0.3,1-0.8,1.4-1.1c0.2-1.1,0.5-2.2,0.8-3.2c0.4,0.1,1.3,0.4,1.7,0.5c1.5,0.4,3.1,1,4.8,0.6
+			C1224.2,829.1,1224.6,826.1,1225.5,823.4 M1216,842.2c3.2-0.3,1.9-3.3,1-5.2C1216,838.5,1215.9,840.4,1216,842.2z"/>
+		<path class="st2" d="M1690.1,825.8c2.2-0.8,4.4-1.3,6.7-1.6c-0.1,0.8-0.3,2.3-0.4,3.1c-0.8,0.7-1.7,1.5-2.4,2.2
+			c-0.5,0.4-1.4,1.2-1.9,1.5C1690.9,829.5,1690,827.8,1690.1,825.8z"/>
+		<path class="st2" d="M1711,824c2.5,0.1,5.3,1.5,5,4.5c-1.3,0.4-2.6,0.7-3.8,1.1C1711.6,827.8,1711.2,825.9,1711,824z"/>
+		<path class="st2" d="M1725.3,829.5c1.1-1.9,2-3.9,2.9-5.9c0.1,1.3,0.2,2.6,0.3,3.9c1.4-0.1,2.9-0.3,4.4-0.4v8.5l-0.1-0.9
+			c-0.6-1.4,0.1-3.8-1.7-4.3c-3-0.9-3.2,2.7-4.2,4.6c-1-0.4-1.9-0.8-2.9-1.2c-0.4-0.5-1.1-1.6-1.4-2.2
+			C1723.6,831.1,1724.5,830.3,1725.3,829.5z"/>
+		<path class="st2" d="M1282.4,824.4l1.1-0.2c0.7,0.9,1.4,1.9,2.1,2.9c0.1,0.7,0.3,2,0.4,2.7c-2.6,0.3-4.9-0.1-5.8-2.9
+			C1280.9,826,1281.6,825.2,1282.4,824.4z"/>
+		<path class="st2" d="M1533.1,825.2c0.3,0.1,0.9,0.4,1.2,0.5c3.5,1.4,6.7,3.4,10.2,4.8c2.8-0.4,5.3-1.8,8-2.5
+			c0.7,1.4,1.4,2.9,2.1,4.3c-1.1,0.7-2.2,1.4-3.2,2.2c0,0.6,0,1.7,0,2.3c0.9,0.3,1.9,0.6,2.9,1c0.6-0.9,1.2-1.7,1.8-2.5
+			c4-1.8,8.3-2.9,12.7-3.1c-1.2,1.3-2.5,2.6-3.6,4c-0.7,0.1-2.1,0.2-2.8,0.3c-1.5,1.1-3,2.2-4.5,3.3c-0.2,1.7-0.3,3.4-0.4,5.2
+			c1.8-0.2,3.8,0.1,5.5-1c1.6-0.8,3.1-2.5,5.1-1.7c0.2,0.7,0.5,2.1,0.6,2.8c-1.4,0.2-2.8,0.4-4.1,0.7c-0.5,1.8-1,3.6-1.4,5.4h-15.8
+			c-0.5-1.1-0.9-2.2-1.4-3.2c-0.8,0-2.4,0.1-3.3,0.1c0.4,1,0.8,2.1,1.2,3.1h-6.2c2.1-2.4,4.4-4.7,6.5-7.3c-0.1-2.4-3.2-0.6-4.6-1
+			c0-0.4,0-1.3,0.1-1.7c1.2-1,2.4-2,3.7-3c0.3,0.7,1,2,1.4,2.7c1.2-0.1,2.5-0.2,3.8-0.3c-0.1-1.7-0.2-3.4-0.3-5
+			c-1.1,0.9-2.2,1.9-3.3,2.8c-0.8-1.3-1.6-2.6-2.3-3.9c-0.4,0.4-1.2,1.3-1.6,1.8c-1,1.1-1.9,2.2-2.7,3.4c-0.8-0.8-1.6-1.6-2.3-2.4
+			c0.8-1.6,1.8-3.2,2.3-5c-0.6-0.9-1.2-1.9-1.8-2.7c-0.7,0.5-2.2,1.4-2.9,1.8c-0.1-0.4-0.1-1.2-0.2-1.6c0-0.7-0.1-2.1-0.2-2.8
+			C1533.2,826.4,1533.1,825.6,1533.1,825.2 M1549.8,846.8c1.7,0.5,3.3,1,5.1,1.2c1.2-1,2.5-2.4,0.2-3.1
+			C1553,844.3,1550.8,844.9,1549.8,846.8z"/>
+		<path class="st2" d="M1631.7,835.1c-2.7-3-0.9-7.7,2.3-9.2c1.7,0,3.4,0.4,5.1,0.8c-1.5,1.4-3.7,1.6-5.6,2.2
+			c-0.4,1.7-0.7,3.5-1,5.2c2.4,0.1,4.8,0.2,7.2,0.2c-1.1,0.6-2.2,1.1-3.2,1.7c-0.4,0.2-1.3,0.7-1.8,1c1.4,1.3,2.8,2.5,4.3,3.7
+			c2.7,0.3,5.3-0.7,7.8-1.8c0.6,0.5,1.3,1.1,2,1.6c1.7,0.1,3.4,0.1,5,0.5c-0.2,0.6-0.5,1.8-0.6,2.4c-3.2,0.2-6.4,0.2-9.6,0.2
+			c-1.6,2.2-3.6,4.4-3.3,7.3h-5.6c1.6-1.6,2.8-3.5,3.9-5.5c-1.1,0-2.1,0-3.1,0c-0.6-2.2,1-6.9-2.7-5.8c-0.7,2.4-0.9,4.9-1.2,7.4
+			c-0.9,0.3-1.8,0.5-2.7,0.8c-0.1-3.2,0-6.6,2.3-9.1C1631.4,837.5,1631.5,836.3,1631.7,835.1z"/>
+		<path class="st2" d="M60.3,827.2c1.7,0.1,3.6-0.1,4.6,1.5c-0.1,0.5-0.3,1.5-0.5,2l-0.2,0.8l-0.6,0c-0.6,0-1.8,0-2.3,0
+			C61,830.2,60.7,828.7,60.3,827.2z"/>
+		<path class="st2" d="M51.6,828.1c2-0.5,4.2-0.5,6.2,0.3c-0.3,2.5-3.5,2.7-4.6,4.7c-1.3,2.5-1.5,5.3-2.5,7.9
+			C50.2,836.7,50.7,832.4,51.6,828.1z"/>
+		<path class="st2" d="M1573.3,828c0.9,2,1.9,3.9,2.8,5.9c-0.7,0.7-1.4,1.4-2.1,2.1c-1.4,1.4-2.4,3.2-3.4,4.9c-2.2-1.1-2-3.2-0.9-5
+			l0.3-0.8C1571.2,832.7,1572.3,830.3,1573.3,828z"/>
+		<path class="st2" d="M1578.1,836.4c1.5-4.3,5.1-9,10.2-8.1c0.5,0.2,1.5,0.5,1.9,0.6c0.3,0.1,0.9,0.3,1.2,0.4
+			c0.3,1.7,0.6,3.5,0.9,5.2c1.1-0.3,3.2-0.9,4.3-1.1c0.6,1.8,0.9,3.6,0.6,5.5c-1,0.7-2.1,1.5-3.1,2.3c-0.2,0.2-0.6,0.5-0.8,0.6
+			c-2-2.5-4.4-4.7-7.4-5.9C1583.4,834.7,1580.6,836.1,1578.1,836.4z"/>
+		<path class="st2" d="M1326.5,832.7c0.4-1.4,0.9-2.8,1.4-4.2c0.7,0.2,2,0.5,2.7,0.7c0.1,1.3,0.1,2.6,0.2,4c1.1,0.6,2.2,1.2,3.3,1.9
+			c0.9,1.5,1.9,2.9,2.8,4.5l0.2,0.5c-0.2,2-0.4,4-0.6,6c-2.4,1.2-4.8,2.2-7.3,2.9c0.2,0.7,0.3,1.5,0.5,2.2h-4.7
+			c-0.6-0.7-1.1-1.4-1.7-2.1c1.2-3.2,2-6.7,2.4-10.1c-1.3-1-2.6-2-3.8-3C1323.5,834.8,1325,833.7,1326.5,832.7 M1328.3,841.9
+			c0.9,1.4,2.2,2.4,3.8,3c0.8-1.5,1.7-3,2.5-4.5C1332.5,840.5,1330.3,841.1,1328.3,841.9z"/>
+		<path class="st2" d="M277.3,830.7c5.3,0.8,10.7,1.1,16.1,1c0.1,1.7,0.6,4.4-1.7,4.9c-3.3,0.1-6.7-0.2-10,0c-0.5-0.4-1-0.8-1.5-1.2
+			C278.9,834.1,277.8,832.6,277.3,830.7z"/>
+		<path class="st2" d="M1605.5,832.8c0.6-0.8,1.3-1.7,1.9-2.5c2.1,1.7,4.1,3.7,6.7,4.7c2.9,0.1,5.7-0.5,8.5-0.9
+			c-0.1,0.5-0.2,1.4-0.3,1.8c-0.2,1-0.4,2-0.6,3c-0.7-1.2-1.4-2.4-2.1-3.5c-1.2,0.1-2.3,0.3-3.4,0.5c0.8,1.8,1.6,3.7,2.4,5.5
+			c1.8,0.2,3.6,0.5,5.4,0.7c0.6-1.2,1.2-2.3,1.9-3.5c1,0.9,1.9,1.9,2.9,2.9c-0.3,0.5-0.8,1.5-1,2c1.5,3.7-1.9,6-4.8,7.3h-2.5
+			c0.1-1.5,0.2-3.1,0.4-4.6c-1.5,0.5-3,1-4.4,1.6c-1-0.6-2-1.1-3-1.7c0.9-1.1,1.8-2.2,2.7-3.3c0.6-1.9-1-3-2.3-4.1
+			c-1.8-1.4-3.6-2.7-5.4-4C1607.4,834.2,1606.4,833.5,1605.5,832.8z"/>
+		<path class="st2" d="M1692.5,834.1c0.3-1.1,0.6-2.2,1-3.2c1.6,1.1,3.1,3.2,5.3,2.3c0.6-0.2,1.7-0.5,2.3-0.7
+			c-0.6,1.1-1.2,2.2-1.8,3.2c-0.4,0.5-1.2,1.6-1.6,2.1c-0.5-0.3-1.4-1-1.9-1.3C1694.8,835.8,1693.6,834.9,1692.5,834.1z"/>
+		<path class="st2" d="M1314.1,838c1.1-2,2-4.1,3-6.1c1.3,2.3,3,4.7,2.5,7.5C1317.7,838.9,1315.9,838.4,1314.1,838z"/>
+		<path class="st2" d="M1710.5,834.5c3.6-0.3,7.3-0.3,10.9-0.3c-2.1,1.2-4.2,2.3-6.2,3.5c-0.6,0.1-1.7,0.4-2.2,0.5
+			C1712,837.1,1711.2,835.8,1710.5,834.5z"/>
+		<path class="st2" d="M270.2,837.2c0.7-1.9,2.8-2,4.5-2.3c0.9,0.8,1.8,1.7,2.7,2.5c1.1,0.4,2.2,0.7,3.4,1c0.5,2.5,2.5,5.6-0.3,7.4
+			c-0.9-1.5-1.7-3-2.8-4.3c-1.2,0.1-2.5,0.2-3.7,0.4c0.2,2.5,0.7,5.1,1.9,7.4c-0.2,0.4-0.8,1.3-1,1.7h-5.9
+			C268.6,846.4,268.3,841.5,270.2,837.2z"/>
+		<path class="st2" d="M1688.3,842.1c0.5-2.5,1.3-5.1,2.9-7.1c0.6,2.3,1,4.7,1.3,7c1.6-0.4,3.2-0.8,4.8-1.1c0.4,0,1.3-0.2,1.8-0.2
+			c1,0.2,2.1,0.5,3.2,0.8c-1.1,1.9-1.1,4-1.3,6.1c-1.3-0.7-2.6-1.5-3.9-2c-1.4,0.6-2.7,1.4-4,2.2c0.3,0.8,0.8,2.4,1,3.2h-6.1
+			c1.4-1.3,2.6-2.8,4-4.2c-1.2-0.8-2.3-1.6-3.5-2.4c-0.8,1.6-0.5,4.6-2.8,5c-1.5,0-3-0.4-4.4-0.6c0.3-0.9,0.7-1.8,1-2.8
+			c0.1-1.4-0.2-2.7-0.5-4c0.1-0.6,0.3-1.7,0.5-2.2C1684.5,839.4,1686.4,841.1,1688.3,842.1z"/>
+		<path class="st2" d="M1702.8,836.2c0.7,0.4,1.4,0.9,2.1,1.3l0.8,0.5c0.6,0.3,1.8,1,2.3,1.4c1.1,0.4,2.2,0.7,3.4,0.9l1.3,0.1
+			c2,0.2,4.1,0.4,6.2,0.8c0.7,2.2,2,4.2,3.7,5.8c1.7-0.7,3.5-1.4,5.2-2.1c0.3,0.6,0.9,1.8,1.2,2.5c-0.8,0.8-1.5,1.7-2.2,2.6
+			c-3.3-1.4-5.8-4.1-8.4-6.4c-0.3,0-1-0.1-1.3-0.1c-2.7-0.1-5.5,0.2-8.2-0.3c-2.1-0.9-3.9-2.2-5.7-3.5
+			C1703.1,838.5,1702.9,837.4,1702.8,836.2z"/>
+		<path class="st2" d="M56.7,837.8c1.9-0.2,4-1.6,5.8-0.3c1.8,2.1,1.3,6-1.5,7.1c-3.2,0.2-4.1-3.5-4.8-5.9L56.7,837.8z"/>
+		<path class="st2" d="M1599.7,836.1c2.6,1.6,4.6,3.8,6.5,6.2c1.7-0.6,3.5-1.2,5.3-1.8c-0.1,1.4,0.7,3.2-0.4,4.4
+			c-2.2,2-4.7,3.7-6.6,6.1h-2.8c-0.9-1.7-1.1-4.4-3.5-4.4c-1.4,1.1-1.4,2.9-1.7,4.4h-2.7c-0.5-2.2-0.9-4.3-1.1-6.5
+			c2.1-0.3,4.3-0.7,6.5-0.9c0.4-0.4,1.1-1.2,1.5-1.6c-0.1-0.5-0.2-1.5-0.3-2C1600.1,839,1599.8,837.1,1599.7,836.1z"/>
+		<path class="st2" d="M160,841.2c1.6-2.3,4.2-3.8,7-3c3.3,0.1,3.3,4,3.7,6.4C166.9,844.7,163.1,843.3,160,841.2z"/>
+		<path class="st2" d="M1576,842.3c1.7-1.5,2.7-4.9,5.3-4.6c-0.3,1.8-0.7,3.6-1,5.5c2.2,0,3.8-1.4,5-3.1c0.8,0.6,1.6,1.2,2.4,1.8
+			c1.2,0.9,2.3,2.1,2.1,3.8c-0.6,0.2-1.7,0.6-2.3,0.8c-0.2,0.6-0.7,1.8-1,2.4c-3.1-0.3-6.2-0.7-9.3-0.6c-0.5,0.7-1.4,2-1.8,2.7h-3.7
+			c0-0.8,0-2.3,0-3.1c-2.1,1.1-4.3,2.8-6.8,1.6c1.6-1.9,3.1-3.8,4.8-5.5c0.5-0.5,1.5-1.5,2-2c1.2,0.8,2.5,1.7,3.8,2.5
+			C1575.7,843.9,1575.9,842.8,1576,842.3z"/>
+		<path class="st2" d="M279.1,851c3.9-3.5,6.3-8.1,8.7-12.6c1.1,0.6,2.2,1.2,3.3,1.9c1.5-0.4,2.9-1.1,4.5-0.9c1.2,0.9,1.3,2.6,2,3.9
+			c-1.1,0.6-2.2,1.3-3.4,1.9c-1.4,0.2-2.9,0.2-4.3,0.2c-0.2,0.3-0.6,1-0.8,1.3c-1,1.5-2,2.9-3.1,4.3H279.1z"/>
+		<path class="st2" d="M316.3,843.2c2.6-1.4,4.8-3.9,7.7-4.5c3-0.6,2.7,5.3,0.2,5.5c-4.5,0.6-8.7,2.9-13.2,2.5
+			c-2.5-0.2-2.1-4.1-0.2-4.9C312.7,840.6,314.6,842.3,316.3,843.2z"/>
+		<path class="st2" d="M1300.7,843.3c0.8-1.6,1.7-3.1,2.5-4.7c0.8,1.3,2.2,2.6,1.8,4.3c0,2.4-3,2.5-4.6,3.5
+			C1300.6,845.7,1300.7,844.1,1300.7,843.3z"/>
+		<path class="st2" d="M98.9,851c0.4-3.8-2.5-7.4-1-11c2.9,3.5,4.9,7.7,8.1,11H98.9z"/>
+		<path class="st2" d="M299.2,843.9c0.8-1.1,1.6-2.1,2.5-3.2c0.7,2,1.4,3.9,2.2,5.9c1.7,1.7,3.6,3.1,5.6,4.4h-9
+			c-0.3-1.4-0.5-2.7-0.8-4.1C299.6,846.2,299.4,844.7,299.2,843.9z"/>
+		<path class="st2" d="M117.4,844.4c0.4-0.1,1.1-0.2,1.5-0.3c1.3,0.2,2.6,0.5,3.9,0.8c1.9,1.2,3.8,2.5,5.7,3.9
+			c1.6-1.1,3.3-2.2,4.9-3.3c1.2,0.7,2.5,1.4,3.7,2.1c-0.2,0.8-0.7,2.5-1,3.4h-13.3c-0.4-0.5-1.3-1.7-1.8-2.2
+			c-1.3-0.3-2.5-0.5-3.8-0.8l-0.5-1C116.9,846.4,117.2,845,117.4,844.4z"/>
+		<path class="st2" d="M1312.7,851c1.6-2.3,3.2-4.7,4.9-7c0.1,1.2,0.3,2.4,0.5,3.7c0.3,0.4,0.9,1.3,1.2,1.7c0.3,0.4,0.9,1.2,1.2,1.7
+			H1312.7z"/>
+		<path class="st2" d="M1230.4,845.9c1.4,0.4,2.9,0.7,4.2,1.3c-0.5,1.2-1.1,2.5-1.7,3.7h-3.9C1229.5,849.3,1230,847.6,1230.4,845.9z
+			"/>
+		<path class="st2" d="M1712,848.3c1.3-0.9,2.5-1.8,3.9-2.7c0.6,0,1.8,0,2.4,0c0.4,1.8,0.8,3.6,1.5,5.4h-5.6
+			C1713.4,850.1,1712.7,849.2,1712,848.3z"/>
+		<path class="st2" d="M321.6,851c1.8-1.5,3.6-3,5.5-4.2c0.3,1.4,0.6,2.8,0.9,4.2H321.6z"/>
+		<path class="st2" d="M1334.2,851c0.6-1.3,1.1-2.6,1.7-3.9c1.7,0.9,3.7,1.7,4,3.9H1334.2z"/>
+	</g>
+	<g id="_x23_9eafc2ff">
+		<path class="st5" d="M325.2,0h10.1c-0.5,0.4-1.4,1.1-1.9,1.4c0,1.2-0.1,2.3-0.1,3.5c-3.1-1.3-6.2-2.4-9.4-3.3
+			C324.2,1.2,324.9,0.4,325.2,0z"/>
+		<path class="st5" d="M420.2,0h3c0.1,1,0.4,1.9,1.1,2.7c1.5,0.7,2.1-1.7,1.3-2.7h2.8c-1.5,2.3-2.9,4.8-4.2,7.2
+			c3.6-0.3,7.1,0.3,10.5,1.3c1.5-2.1,2.8-4.3,3.6-6.8c-2.5,1-3.6,3.6-5,5.8c-1.4-1.5-2.7-3.1-4.1-4.6c1.5-0.2,3-0.4,4.5-0.5
+			c0.9-0.8,1.8-1.6,2.7-2.4h7.6c0.4,1.2,0.8,2.4,1.2,3.6c-1.9-0.8-3.9-1.4-6-1.8c0.4,1,0.9,2,1.4,3c-1.8,2.5-4,4.8-6.7,6.3
+			c1.9,1.2,3.7,2.4,5.7,3.4c0.3,0.1,0.9,0.4,1.2,0.6c1.4,0.5,2.9,1,4.4,1.3c1.1-0.9,1.5-2.2,1.1-3.7c1.6,3.1-0.7,6.3-1.4,9.3
+			c-1.6-0.8-3.1-1.6-4.7-2.3c-0.5-1.5-1.1-2.9-1.6-4.4c-2.1,0.1-4.1,0.3-6.1,0.2c-0.1-0.5-0.2-1.6-0.2-2.2c0.2-1.4,0.5-2.9,0.8-4.3
+			c-3.3-0.3-6.6-0.3-9.9-0.2c0.1-1.4,0.3-2.8,0.4-4.2C422.4,3,421.3,1.5,420.2,0z"/>
+		<path class="st5" d="M534.8,0h6.8c-2.3,1-4.7,2-7.1,2.8C534.6,1.9,534.7,0.9,534.8,0z"/>
+		<path class="st5" d="M662.9,0h4.6c-0.3,0.8-0.8,2.5-1,3.3C665.2,2.2,664.1,1.1,662.9,0z"/>
+		<path class="st5" d="M1177.8,0h7.7c-2.2,1.7-4.7,2.9-7.5,2.9C1178,2.2,1177.9,0.7,1177.8,0z"/>
+		<path class="st5" d="M1225.4,0h7.4c0.4,0.6,1.2,1.8,1.6,2.4c-1.2,0.7-2.3,1.4-3.5,2c-1.8-0.9,0-2.2,0.6-3.3
+			c-1.8,0.2-3.5,0.4-5.2,0.6C1226.1,1.2,1225.6,0.4,1225.4,0z"/>
+		<path class="st5" d="M1312.3,0h5.3c-0.2,1.2-0.4,2.4-0.5,3.6C1315.3,2.6,1313.7,1.4,1312.3,0z"/>
+		<path class="st5" d="M1375.4,0h7.4c0.7,2.3,1.3,4.7,1.8,7c-1.5,0.8-3,1.5-4.5,2.3c0.3,0.5,0.8,1.5,1.1,2c-1.7-0.1-3.5,0.2-5.1-0.4
+			c-0.3-0.8-0.9-2.3-1.2-3.1c1-0.6,2.1-1.2,3.2-1.8c1.3-0.2,2.5-0.4,3.8-0.6c-1.2-1.4-2.4-2.7-3.5-4.1c-0.8,0.6-1.6,1.1-2.4,1.7
+			C1376,2.2,1375.6,0.8,1375.4,0z"/>
+		<path class="st5" d="M1408.1,0h4.7c0.6,1,1.8,2.3,3.1,1.6c0,1.8,0,3.7,0,5.5c-0.2,0.4-0.6,1.1-0.8,1.5l-1.3,0.3
+			C1411.9,6,1410.4,2.7,1408.1,0z"/>
+		<path class="st5" d="M498.8,5.1c-0.4-2.8,2.1-3.5,4.2-4.1c0,0.8-0.1,2.2-0.1,3C501.6,4.4,500.2,4.7,498.8,5.1z"/>
+		<path class="st5" d="M577.7,2.7c1.1-0.6,2.3-1.3,3.5-1.9c0.7,2.9-0.7,5.5-2.8,7.3C578.2,6.3,578,4.5,577.7,2.7z"/>
+		<path class="st5" d="M1251,2.6c3,0,5.8,1.6,8.9,0.5c0.9,1.2,1.6,2.5,2.4,3.9c-1.6,1.3-3.1,2.8-4.8,4.1c-2.4,0.4-4.8,0.4-7.2,0.6
+			c-1.2,3.1,2.2,3.4,4.3,4c1.3,1.4,4.1,0.7,3.3-1.5l-0.1-1.1c1,0.8,2.1,1.6,3.2,2.4c-2.7,1.6-5.1,3.8-6.6,6.6
+			c-1.4-1.5-1.5-3.5-1.8-5.4c-1.4-0.8-3.1-1.1-3.9-2.6c-0.6-3.8,4.6-4.5,4.6-8.1C1252.7,4.7,1251.8,3.7,1251,2.6 M1254.3,6.3
+			c0,1.2,0,2.4,0,3.6c2.9,0,4.4-2.3,5.7-4.5C1258.1,5.4,1256.1,5.7,1254.3,6.3z"/>
+		<path class="st5" d="M1302.8,3.2c2.5-0.5,5-1.1,7.5-1.6c0.3,1.2,0.6,2.5,0.9,3.7c-1.4-0.3-2.8-0.6-4.1-0.9
+			C1305.3,5.3,1303.6,5.2,1302.8,3.2z"/>
+		<path class="st5" d="M1184.7,5.7c1.2-1,2.2-2.6,4-2.5c1.8,2.4-0.9,4.7-3.1,5.3c-1.9,0.4-3.9,0.5-5.9,0.7c0-1.5-0.1-3.1-0.1-4.6
+			C1181.3,4.9,1183,5.3,1184.7,5.7z"/>
+		<path class="st5" d="M448.3,4.2c1.9-0.7,2.5,2.3,0.7,2.7C447.2,7.3,446.5,4.5,448.3,4.2z"/>
+		<path class="st5" d="M1115.2,4.2c2.3-1.3,3.2,4.4,0.8,4.1C1113.5,9.1,1113,4.7,1115.2,4.2z"/>
+		<path class="st5" d="M465.2,5.8c0.9,1.7,1.8,3.4,2.7,5.1c-0.9,0.4-1.8,0.8-2.7,1.2c-0.7-1.1-1.4-2.2-1.9-3.4
+			C463.6,7.6,464.6,6.8,465.2,5.8z"/>
+		<path class="st5" d="M1124.8,5.7c1.6,0.2,4.1-0.1,3.5,2.3c-0.1,1.6-1.3,3.6-3.2,3C1124.5,9.3,1124.8,7.5,1124.8,5.7z"/>
+		<path class="st5" d="M1305.3,7c1.1,1.4,2.1,2.8,3.1,4.2c-1.6,0-3.1,0-4.6,0C1304.2,9.8,1304.8,8.4,1305.3,7z"/>
+		<path class="st5" d="M469.3,15.7c0.5-2.6-1.7-6.1,0.7-7.9c1.3,0.7,2.9,1.5,3.2,3.1c-0.2,1.2-0.5,2.5-0.8,3.7
+			c1.8,1.6,3.4,3.4,4.9,5.3c-1.8-0.1-3.5-0.3-5.3-0.4c0.2-0.8,0.5-1.6,0.7-2.4C471.5,16.6,470.4,16.2,469.3,15.7z"/>
+		<path class="st5" d="M1292.7,12.9c0.4-2.5,2.7-3.5,4.5-4.8c0.3,2,0.6,4.1,0.9,6.1l0.1,0.5c-0.8,2.5-1.1,5.1-1.2,7.7
+			c-1.2-0.3-2.4-0.7-3.6-1.1c0.3-0.7,0.9-2,1.2-2.7c-1.6-1.3-2.9-2.8-4-4.6c1.4-0.2,2.8-0.3,4.3-0.5
+			C1294.3,13.4,1293.2,13.1,1292.7,12.9z"/>
+		<path class="st5" d="M316.6,11.8c-0.1-1.3,0.3-2.2,1.4-2.9C320.1,9.7,318.5,12.5,316.6,11.8z"/>
+		<path class="st5" d="M754.4,9.3c1.3-1.3,3.8,0.8,2.5,2.2C755.7,12.6,753.2,10.7,754.4,9.3z"/>
+		<path class="st5" d="M1168.2,10.1c2.8,0.7,2.2,4.4-0.2,5.3C1165.9,14.1,1166.3,11.3,1168.2,10.1z"/>
+		<path class="st5" d="M613.2,12.3c1.8-0.6,2.3,2.3,0.6,2.7C611.9,15.7,611.4,12.6,613.2,12.3z"/>
+		<path class="st5" d="M1209.8,11.8c2.4-1,6.5,2.3,4.2,4.4C1211.7,16.7,1211,13.2,1209.8,11.8z"/>
+		<path class="st5" d="M1132.2,13.3c2.6-0.5,3,5.7-0.1,4.9C1129.8,18.3,1130.2,13.8,1132.2,13.3z"/>
+		<path class="st5" d="M1215.3,15.9c0.9-1.2,1.7-2.4,2.6-3.6c1.6,2.9,3.5,5.6,5.7,8.1c1,0.8,0.8,2.2,0.9,3.3
+			c-2.2-0.7-4.4-1.6-6.5-2.7c0.1-0.9,0.3-1.9,0.5-2.8C1217.5,17.5,1216.4,16.7,1215.3,15.9z"/>
+		<path class="st5" d="M967.3,14.2c1.6-1.3,1.9,1.9,2.2,2.9C967.7,20.2,963.9,15.3,967.3,14.2z"/>
+		<path class="st5" d="M1280.9,14c4.4-1.7,4.7,3.8,4.5,6.8c-1.6,1.3-3.1,2.7-4.5,4.2c-3-2-5.8-4.3-7.3-7.6c1.3-0.7,2.7-1.3,4.1-2
+			c0.2,0.8,0.7,2.4,0.9,3.2c1.8,0,3.5,0,5.3-0.1C1282.9,17.2,1281.8,15.7,1280.9,14z"/>
+		<path class="st5" d="M463,15.5c1.6-0.3,3.2-0.4,4.8-0.3c0.2,0.8,0.6,2.2,0.8,3C466.4,18.7,461.9,19,463,15.5z"/>
+		<path class="st5" d="M679.1,16.3c1.2,1.1,2.2,2.4,3,3.8c0.6,0.3,1.3,0.6,2,1c-0.5,1.4-1,2.8-1.5,4.1c-0.5,0-1.4,0.1-1.9,0.1
+			C680,22.3,679.3,19.3,679.1,16.3z"/>
+		<path class="st5" d="M1352.9,17.9c1.9-0.7,4.8,0.9,4.1,3.2C1354.9,22.4,1352.1,20.3,1352.9,17.9z"/>
+		<path class="st5" d="M461.6,22.7c-0.5-1.4-1.9-3.3,0.4-3.9c1.9-0.4,3.9,1.1,3.1,3.1C464.3,22.1,462.5,22.5,461.6,22.7z"/>
+		<path class="st5" d="M590.5,20.9c1.5,0.3,4.9-1.8,4.8,1c-1.1,1-2.4,1.9-3.6,2.8C591.2,23.5,590.8,22.2,590.5,20.9z"/>
+		<path class="st5" d="M1160.9,20.5c3.3-0.3,6.3,1.4,7.8,4.4c-1.9-0.1-3.7-0.1-5.6,0C1162.3,23.4,1161.6,22,1160.9,20.5z"/>
+		<path class="st5" d="M1197.5,22.4c3.9-2.1,8.4-3.4,12.5-0.9c0.6-0.1,1.7-0.3,2.3-0.4c0.2,1,0.4,2,0.7,2.9c0.4-0.4,1.2-1.2,1.6-1.5
+			c0.1,0.7,0.2,2.1,0.3,2.8c-1.1-0.1-2.3-0.1-3.4-0.2c-3.4-0.8-7.4-3.2-10.4-0.3c-1.4,0.1-2.8,0.2-4.2,0.2
+			C1197,24.3,1197.3,23,1197.5,22.4z"/>
+		<path class="st5" d="M1259.8,25c-0.1-1.8-0.2-3.6-0.2-5.5c2.3,1.3,4.3,3.1,6.2,5.1C1263.8,24.7,1261.8,24.9,1259.8,25z"/>
+		<path class="st5" d="M1340.6,20.1c1.7-0.5,3.5,3.2,1.5,3.8C1340.7,23.5,1339.9,21.4,1340.6,20.1z"/>
+		<path class="st5" d="M647,21c1.2-0.2,4.6-1.2,4.3,1.1C652.1,25.5,645.6,23.2,647,21z"/>
+		<path class="st5" d="M1187.2,21.1c2,0.4,4,0.8,6,1.2c-0.1,0.7-0.2,2.1-0.3,2.8c-1.7,0.1-3.4,0.1-5.1,0.2
+			C1187.6,23.9,1187.4,22.5,1187.2,21.1z"/>
+		<path class="st5" d="M640.8,25.1c1.4-1.6,3-3,5.1-3.7c0.1,0.9,0.2,2.8,0.2,3.7C644.3,25,642.5,25,640.8,25.1z"/>
+		<path class="st5" d="M335.9,40c-0.2-2.4,2.5-0.8,3.6-0.4c-0.6,1.2-1.2,2.5-1.8,3.7C337.1,42.2,335.3,41.5,335.9,40z"/>
+		<path class="st5" d="M329.4,41.5c2.5,0.6,4.5,2.1,5.8,4.3c-1.2-0.2-2.9-2.1-3.8-0.6c-1.5,0.9,0.4,2.6,0.5,3.9
+			c-0.7,0-2,0.1-2.7,0.1c0.4,2.1,0.9,4.2,1.3,6.4c-2.3,0.8-4.7,1.3-7.1,1.9c0.7,2.4,1.1,4.9,1.5,7.4c0.3,0.2,0.9,0.5,1.2,0.6
+			c-1.4,1.3-2.8,2.5-4.2,3.7c-1.3-0.3-2.5-0.7-3.8-1c0.3,1.5,0.5,3.1,0.8,4.6c-0.6,0.4-1.7,1.2-2.3,1.6c0.1-4,0-8,0-12.1
+			c1.1-0.3,2.3-0.7,3.4-1.1c0.3,0.7,0.8,2.1,1,2.8c1-0.9,1.9-1.8,2.9-2.8c-0.7-0.4-2.2-1.3-2.9-1.7c0.2-0.4,0.7-1.1,0.9-1.4
+			c-1.2-0.3-2.5-0.5-3.8-0.8c1.7-0.7,3.5-1.2,5.3-1.5c1.6-0.2,3.3-0.4,4.9-0.7c-1.9-3.6-4.3-7.4-8.9-7.4c0.8-1.5,1.7-3.1,3.6-3.3
+			c1.2,0.7,2.2,1.6,3.4,2.4c0-1.1,0.1-2.2,0.1-3.4c1.1,0.4,2.2,0.8,3.3,1.1C329.6,43.5,329.5,42.5,329.4,41.5z"/>
+		<path class="st5" d="M1390.1,42.2c0.6,0.2,1.9,0.6,2.6,0.8c0.5,0.1,1.5,0.4,1.9,0.6c-0.1,1.3-0.2,2.6-0.1,3.8
+			c1.8,2.1,4.1,3.8,6.1,5.7c-1.2,0.5-2.3,1-3.4,1.5c0.5,1.1,1,2.2,1.5,3.3c-1.6,0.5-3.1,0.9-4.7,1.4c-0.3-0.6-0.9-1.8-1.2-2.5
+			c1.5-1.8,3-3.5,4.6-5.3c-1.6-0.8-3.2-1.5-4.9-2.2c-0.5,0.5-1.5,1.4-2,1.8c0-1.5,0-3.1,0-4.6c0.6-0.1,1.8-0.2,2.4-0.3
+			C1391.1,45.6,1390.2,44.2,1390.1,42.2z"/>
+		<path class="st5" d="M1396,61.6c1.4,1.2,3.8,3.6,1,4.8C1394.6,65.6,1394.9,63.5,1396,61.6z"/>
+		<path class="st5" d="M1390.5,66.9c0.6-0.2,1.9-0.6,2.5-0.8c0.7,3.6,1.3,7.2,1.8,10.9c-1.4-0.3-2.9-0.6-4.3-0.8
+			C1390.5,73.1,1390.4,70,1390.5,66.9z"/>
+		<path class="st5" d="M337.3,78.1c1.6-1.5,3.1-3.1,4.6-4.7c0,1.9,0,3.8,0,5.8c-0.5,0.4-1.5,1.2-2,1.7
+			C339.1,79.9,338.2,79,337.3,78.1z"/>
+		<path class="st5" d="M897.6,76.7c2.4-0.1,4.9-0.1,7.3,0c-1.1,1.8-2.2,3.5-3.3,5.3C900.2,80.3,898.8,78.5,897.6,76.7z"/>
+		<path class="st5" d="M950.3,76.7c0.7,0,2.1,0,2.7,0c-1.7,2.7-4.2,5.5-3.9,8.9c1.6,0.4,3.3,0.7,5,1c-0.2,1.6-0.3,3.2-0.8,4.7
+			c-1.1,1.3-2.5,2.2-3.8,3.3c-2.4,2.3-1,5.3-0.2,7.9c0.9,2,0.1,4.1-0.3,6.1c0.9-0.9,1.8-1.7,2.8-2.5c2.6,0.4,4.9,1.7,7.2,2.8
+			c-1.3,2.8-4,3-6.7,2.6c-0.4,0.4-1.3,1.2-1.7,1.5c-1.9-2.1-3.6-4.3-5.2-6.6c-3.1-0.9-6.1-2-9.1-3.3c1.7-3.3,3.4-6.5,5.1-9.8
+			c1.4-0.3,2.8-0.6,4.2-0.9c0.4-2.1,0.7-4.2,1.1-6.3c-2.2-0.4-4.4-0.8-6.6-1.2c-0.8,1.2-1.7,2.3-2.4,3.5c0-1.5,0.1-2.9,0.2-4.4
+			c3-1,6.2,0,9.2,0.2C948.4,81.8,949.4,79.3,950.3,76.7 M949,92.9c1.8-0.4,2.8-2,4.1-3.2c-1.2-0.9-2.4-2.6-4-1.7
+			C946.6,88.3,946.5,92.8,949,92.9z"/>
+		<path class="st5" d="M963.9,76.7c2.9,0,5.8-0.1,8.8-0.1c-0.1,1.3-0.2,2.7-0.3,4c2.1,0.1,4.3,0.8,6.4,0c1.8-0.5,2.2-2.6,3.1-4
+			c2.6-0.1,5.2,0,7.8,0c-0.6,3.5-1.4,7-3.1,10.2c0.2,0.1,0.5,0.2,0.7,0.3c2.7,1.2,6.5,2.6,8.3-0.9l0.5,0l0,0.7
+			c-1.5,2.8-2.8,5.9-1.1,9c1.9-1.3,3.8-2.6,5.7-3.9c0.1,0.5,0.3,1.6,0.4,2.2c-0.6,0.8-1.2,1.7-1.7,2.5c-0.3,0.4-0.8,1.1-1,1.4
+			c-1.9,1.1-3.9,2-5.8,2.9c-4,1.9-7.5,4.7-11.4,6.9c1-4,2.2-8,3.4-12c-3.3-2.5-6.7-5-10.1-7.4c0.7-1.6,1.2-3.9,3.5-3.7
+			c2.2-0.6,3.4,1.1,4.1,2.9c0.5,0.1,1.5,0.2,2,0.2c0.1-2.5-0.1-5-0.5-7.5c-3.9,1.3-8,1.7-12.1,1.9c0,1.5,0.2,3.1,0.4,4.6
+			c0.1,0.8,0.3,2.3,0.4,3.1C969.9,85.5,969.6,79,963.9,76.7 M985.2,78.5c-0.4,1.4,0.1,1.9,1.5,1.5C987,78.5,986.5,78,985.2,78.5z"/>
+		<path class="st5" d="M877.1,91c1.4-0.1,2.4,1.1,3.4,1.9c-0.8,0.9-1.7,1.8-2.5,2.7C876.2,94.7,876.4,92.6,877.1,91z"/>
+		<path class="st5" d="M1073.6,102.3c-0.5-2.6-0.3-5.3,0.2-7.9c3.2,1.1,1.2,5.2,1.7,7.8c0.9,1.1,3.6,1.9,2.7,3.7
+			C1075.5,107.7,1074.3,104.2,1073.6,102.3z"/>
+		<path class="st5" d="M997.5,105.3c1.2-0.9,2.5-1.7,3.7-2.6c0.8,2.1,1.5,4.2,2.2,6.3C1001.3,108,999.3,106.8,997.5,105.3z"/>
+		<path class="st5" d="M1409.2,112.6c1.2-0.9,3.4,0.9,2.5,2.2C1410.4,115.8,1408.2,113.9,1409.2,112.6z"/>
+		<path class="st5" d="M1089.1,113.6c0.9-0.1,2.8-0.2,3.7-0.3c-0.5,1.7-1.1,3.4-1.6,5.1c-0.4,0.1-1.2,0.3-1.6,0.4l-1.6,0.1
+			C1088.2,117.2,1088.4,115.3,1089.1,113.6z"/>
+		<path class="st5" d="M624.4,118.8c1.5-1.3,3.1-2.6,4.7-3.8c1.8,1.2,3.6,2.5,5.3,3.8C631.1,118.8,627.7,118.8,624.4,118.8z"/>
+		<path class="st5" d="M337.3,146.7c1.4-2.3,2.7-4.8,4.7-6.6c0,2.3,0,4.5,0,6.8c-0.5-0.2-1.6-0.6-2.1-0.8c-1.3,2.1-2.6,4.3-4.8,5.6
+			c-0.1-2.2-0.1-4.3,0.1-6.5C335.8,145.7,336.5,146.2,337.3,146.7z"/>
+		<path class="st5" d="M333.3,152.2c0.4-0.1,1.3-0.2,1.7-0.3c1.8,2.8-1.8,4.3-4,3.1C330,153.3,332,152.5,333.3,152.2z"/>
+		<path class="st5" d="M1405.9,156.6c1-0.7,2-1.3,3-1.9c1.1,0.6,2.3,1.3,3.5,1.9c-0.7,0-2.2-0.1-2.9-0.1c0,0.8,0.1,2.5,0.1,3.4
+			c0.1,2.1,0.3,4.2,0.6,6.3c1.2-0.4,2.5-0.8,3.8-1.3c-0.8-1.7-1.6-3.5-3-4.8c0.5,0,1.5-0.1,2-0.1c0.2-0.7,0.5-2.2,0.6-3
+			c0.8-0.3,1.6-0.7,2.4-1c0,1.7,0,3.5,0,5.2c-2.6-1.4-2.6,3.4,0,1.8c0,1.1,0,2.3,0,3.4c-2.5-0.1-5,0.6-5.4,3.4
+			c-1-0.9-1.9-1.8-2.8-2.7l-0.2,1c-1.8-1.3-3.7-2.6-5.6-3.7c-0.2,0.7-0.4,2.1-0.6,2.8c-0.2-1.1-0.3-2.1-0.3-3.2
+			c1.5-0.2,3-0.1,4.5,0.3c0.7,0.2,2,0.7,2.7,1c0.8-2.7,0.1-5.6-0.2-8.4C1407.5,156.9,1406.4,156.7,1405.9,156.6z"/>
+		<path class="st5" d="M1390.3,166.7c0.8-0.1,2.4-0.2,3.2-0.3c0.4,0.6,1.3,1.8,1.7,2.4c-0.8,1.3-1.6,2.6-2.4,3.8c1-0.4,2-0.8,3-1.3
+			c0.7,1.2,1.4,2.3,2.1,3.5c-1,0.2-1.9,0.4-2.9,0.7c-1.4-0.6-2.8-1.3-4.2-1.9c0.1-0.4,0.2-1.2,0.3-1.6
+			C1390.8,170.2,1390.5,168.5,1390.3,166.7z"/>
+		<path class="st5" d="M1067.3,180.6c0.9,0,2.6,0,3.4,0c0.2,1.1,0.5,2.2,0.7,3.4c1.7,1.4,3.2,3.1,4.4,5c3.3-0.4,2.7-4.3,3.5-6.7
+			c-0.4-0.4-1.1-1.2-1.5-1.6c1.7,0,3.4-0.1,5.2-0.1c-1.2,1.5-2.4,3.1-3.5,4.6c1.6,0.6,3.6,2.1,5.3,0.7c1.6-1.4,2.4-3.3,3.6-5
+			c0.4-0.1,1.3-0.3,1.7-0.4c-1.7,3.7-3.9,7.5-8,9.1c0.2,0.7,0.5,1.4,0.8,2.1c3.5-1.5,7.6-1.6,10.7-4.1c1.4-0.1,2.9-0.1,4.3-0.2
+			c0.2,0.5,0.6,1.5,0.8,2c1.2,0.4,2.4,0.8,3.6,1.2c-3.6,1-8.5-0.6-10.8,3.1c-0.6-0.7-1.1-1.4-1.6-2.1c-2.2-0.1-4.4,0.5-6.3,1.5
+			c-0.5-0.1-1.5-0.3-2-0.4c-0.3-1.2-0.5-2.3-0.7-3.5c-0.9,1.2-1.8,2.6-2.9,3.6c-1.9,0.1-3.7,0-5.5-0.1c0.3-2.1,0.6-4.2,1-6.2
+			c-1.6-0.1-3.1-0.2-4.7-0.2C1068.1,184.3,1067.7,182.4,1067.3,180.6z"/>
+		<path class="st5" d="M320.8,193c0.4-2.7,2.9-4.3,5.2-5.2c2-0.5,2.7,0.2,2,2.2c-1.2,0.2-2.5,0.3-3.7,0.4c-0.1,0.7-0.4,2.2-0.5,2.9
+			C323.1,193.3,321.5,193.1,320.8,193z"/>
+		<path class="st5" d="M1098.4,197.3c1.6-0.4,3.2-0.2,4.8-0.1c-0.8,1.2-1.6,2.4-2.4,3.6c-1,0.9-2,1.7-3,2.5
+			C1097.8,201.3,1097.5,199.2,1098.4,197.3z"/>
+		<path class="st5" d="M317.8,205c0-1.3-0.9-4.2,1.1-4.4c2.1,1,1.9,3.8,2.7,5.7c1.2,1.4,5.6,3.4,2.3,5
+			C320.9,210.8,319.5,207.3,317.8,205z"/>
+		<path class="st5" d="M321.4,215.1c1.4-1.2,1.7,1.8,2.3,2.6c0.8,2.1,2.4,3.6,3.5,5.5c0.6,2.2-2.7,1.1-3.5,0.3
+			C321.8,221.1,321.5,217.9,321.4,215.1z"/>
+		<path class="st5" d="M488.3,221.6c2.1-1.3,4.2-2.6,6.3-3.9c0.6,1.6,1.2,3.1,1.8,4.6c-0.8-0.8-1.6-1.6-2.4-2.4
+			c-1.9,1.2-3.9,2.4-5.4,4.1c2,3.5,6.5,1.3,9.7,1.6c1.1,0,2.3,0.1,3.4,0.1c-1.6,4.1-2.9,8.6-1.4,12.9c-1.8,0.9-3.6,1.8-5.4,2.7
+			c1,0.6,1.9,1.1,2.9,1.7c-0.5,0.4-1.6,1.2-2.1,1.6c-0.7-1.2-1.7-2.2-1.9-3.6c1.1-1.8,3.5-2.3,5.2-3.4c-1.1-1.7-2.2-3.5-3.4-5.2
+			c1.2,0.1,2.3,0.1,3.5,0.2c-0.3-1.7-0.4-5.1-3-4.2c-1.6,1.6-2.5,3.9-4.5,5.1c-2.6,1.5-5.2,3.1-8.1,4.1c-0.9-1.1-1.6-2.2-2.6-3.2
+			c-2.1-0.5-4.3-0.5-6.4-0.7c-0.9,0.9-1.9,1.8-2.8,2.6c0.2-1,0.4-2,0.6-3.1c-1.4-0.5-2.8-1.1-4.1-1.6c0.5-2.1,1.1-4.2,1.7-6.3
+			c1.8,0.4,3.5,0.9,5.3,1.2c1.7-1.6,0.3-4,0.2-6c0.7-0.5,1.4-1,2.2-1.5c-0.1,2.5-0.7,5.2,0.1,7.6c2.1,2,4.9,3,7.4,4.4
+			C486.4,227.9,487.5,224.8,488.3,221.6 M474.3,229.9c0.1,4.3,5,3,7.7,2.5c0.8,1.3,0.9,4,3,3.8c0.9-1.2,1.7-2.4,2.5-3.7
+			c2.3,0.2,4.5-0.2,5.6-2.4c-1.7-0.6-3.4-1.2-5-1.7c-1.1,1.6-2.4,4.1-4.7,3.1C480.8,230,476.9,226.4,474.3,229.9z"/>
+		<path class="st5" d="M325.2,230.2c1,0.1,1.5,0.7,1.4,1.7c-0.8,2.2-2.3,4.2-3.8,6.1c-0.3-0.2-0.9-0.6-1.1-0.8
+			C322.5,234.6,323.6,232.2,325.2,230.2z"/>
+		<path class="st5" d="M12.8,234c0.9,0,2.6,0,3.4,0c-0.1,0.8-0.2,2.4-0.3,3.2c-1.3-0.1-2.6-0.1-4-0.1C12.3,236,12.6,235,12.8,234z"
+			/>
+		<path class="st5" d="M29.5,234c0.2,0,0.7,0,0.9,0c0.1,1.1,0,2.3,0.5,3.4c1.5,0.1,2.9-0.5,4.3-1c0,0.5-0.1,1.4-0.1,1.9
+			c-3.2-0.4-5.6,1.4-7.4,3.9c-1.2-1.6-3.3-2.9-3-5.1C26.1,235.9,27.8,234.9,29.5,234z"/>
+		<path class="st5" d="M1479.1,234c0.4,0,1.3,0,1.7,0C1480.2,235.6,1479.6,235.6,1479.1,234z"/>
+		<path class="st5" d="M1565,235c2.8-1.1,2.2,2.3,2.3,4c0.1,1.5-0.5,2.8-2,3.3C1565.2,239.9,1564.9,237.4,1565,235z"/>
+		<path class="st5" d="M1706.1,235c2.5,0.7,5.1,1.2,7.3,2.7c1,1.3,1.4,3.9-0.3,4.7c-1.3-1.5-2.1-3.2-3-4.9c-1.3,0.2-2.5,0.5-3.8,0.5
+			C1706.2,237.2,1706.1,235.7,1706.1,235z"/>
+		<path class="st5" d="M19.1,244c3.2-2.1,4.5,3.4,1.8,4.3C18.4,248.5,18.9,245.6,19.1,244z"/>
+		<path class="st5" d="M1514.7,250c0.1-1.6,0-3.3,1.3-4.4c1.7,1.3,2.2,3.4,2.3,5.4C1517.1,250.7,1515.8,250.3,1514.7,250z"/>
+		<path class="st5" d="M1692.7,246.5c2.3,0.7,4.7,2.1,4.8,4.8C1694.9,251,1691.7,249.8,1692.7,246.5z"/>
+		<path class="st5" d="M1701.6,246.6c4.4-0.3,4.4,5.5,5.6,8.5C1703.3,254.2,1701.9,250.3,1701.6,246.6z"/>
+		<path class="st5" d="M1391.8,247.8c1.3,0.8,5.5,0.5,3.8,3C1393.6,253,1391.2,250.1,1391.8,247.8z"/>
+		<path class="st5" d="M1128.6,250.1c3.3,2.8,7.5,5.6,7.6,10.4c-1.2,0-2.4,0.1-3.6,0c-0.8-1.2-1.4-2.6-2-3.8
+			c-2.1,0.1-4.1,0.2-6.2,0.3c-0.2-0.2-0.6-0.8-0.9-1c2.5-0.2,5-0.3,7.5-0.4C1130.2,253.6,1129.4,251.9,1128.6,250.1z"/>
+		<path class="st5" d="M469.4,260.8c-1.4-4.2,2.4-6.5,4.8-9.3c2.4,2.6,0.3,5.9-1.5,8.2C472,260.8,470.5,260.5,469.4,260.8z"/>
+		<path class="st5" d="M1485.4,251.6c1.5,0,3.1,0.1,4.7,0.3c1.2,0.9,0.1,2.6,0.3,3.8C1488.2,254.9,1485.3,254.5,1485.4,251.6z"/>
+		<path class="st5" d="M1711.8,251.9c2.1,0.1,5.4-0.5,6.3,2.1C1716.4,256.8,1713.4,253.2,1711.8,251.9z"/>
+		<path class="st5" d="M46.9,256.2c1.3-1.7,2.8-3.8,5.3-3.4c-0.8,0.9-1.6,1.7-2.3,2.6c1.5,1.6,3.5,0.5,5.2,0.4
+			c1.7,0.5,2,2.4,2.1,3.9c-1.9,0.4-3.8,0.8-5.7,1.2c-0.2-0.6-0.5-1.9-0.7-2.6C49.3,257.8,46.9,258.2,46.9,256.2z"/>
+		<path class="st5" d="M1606.1,253.9c0.8,0,2.4-0.1,3.2-0.2c-0.5,1.4-0.9,2.8-1.3,4.2c-0.5-0.2-1.6-0.7-2.1-0.9
+			C1605.8,256.2,1606,254.7,1606.1,253.9z"/>
+		<path class="st5" d="M191.6,256.8c1.3-0.6,3-2.3,4.3-0.7c0.1,1.2,0.1,2.5,0.1,3.8c-1.2,0-2.5,0-3.7,0.1
+			C192.1,259.1,191.7,257.6,191.6,256.8z"/>
+		<path class="st5" d="M1656.7,257c2.7-0.1,5.5-0.2,7.9-1.5c1.9,1,4.7,1.1,5.7,3.3c-1.4-0.1-2.8-0.2-4.2-0.4
+			C1663.3,260.8,1658.1,260.7,1656.7,257z"/>
+		<path class="st5" d="M1248.4,263.1c2.3,1.1,4.8,1.7,7.4,2c0.3,1.4,0.6,2.8,0.8,4.2c-0.1,1.3-0.2,2.5-0.3,3.8
+			c-1.9-1.2-3.8-2.4-5.6-3.6c0-0.6,0.1-2,0.1-2.6c-1,0.4-2,0.7-3,1.1C1248.1,266.4,1248.2,264.8,1248.4,263.1z"/>
+		<path class="st5" d="M1089.1,266.1c1.7-0.9,4,1.7,2.3,3.2C1089.6,272,1086.7,267.6,1089.1,266.1z"/>
+		<path class="st5" d="M1076.9,272.1c0.1-2.6,1.9-6.6,5.1-5.1C1082.6,270,1079.8,272.4,1076.9,272.1z"/>
+		<path class="st5" d="M1721.4,266.8c1.5,0.1,2.9,0.1,4.5,0.4c0.9,2.1-1.1,4.4-0.3,6.5c0.8,2.3,1.9,4.6,1.4,7.1c-0.5,0-1.5,0-2,0
+			C1724,276.1,1722.7,271.4,1721.4,266.8z"/>
+		<path class="st5" d="M670.8,271.9c0.8-1.3,2.7-4,4-1.6c1.4,0.8-0.2,3.6-1.7,2.8C672.5,272.8,671.3,272.2,670.8,271.9z"/>
+		<path class="st5" d="M896.1,270.2c0.8-0.2,2.5-0.5,3.3-0.6c0,1.1,0.5,2.4-0.6,3.2C897.4,272.5,895.4,272.2,896.1,270.2z"/>
+		<path class="st5" d="M0,282c1.2-1.1,2.5-2.1,4-2.9c1,0.5,1.9,1,2.8,1.6c-2.5,1.4-5.2,2.8-6.7,5.3V282z"/>
+		<path class="st5" d="M800.7,282.6c1.5-1.4,3-2.7,4.5-4.1c1.5,0.7,3,1.3,4.3,2.4c0,1.4-0.3,2.8-0.7,4.1c-0.5-1.5-0.9-3.1-1.7-4.6
+			c-3.2,0.5-5.7,3.1-8.8,4.2c-2.3,0.5-2.6,4.1-0.4,5c1.6,0,3-0.9,4.4-1.6c-1,3.7-5.2,3.6-8.2,4.5c-1.9-1-3.8-2.1-5.9-2.5
+			c-1.6,0.9-3,2.1-4.5,3.2c-0.7-0.9-1.4-1.8-2-2.6c6.2-0.9,11.4-4.8,16.5-8.3l0.3,0C798.9,282.4,800.1,282.5,800.7,282.6z"/>
+		<path class="st5" d="M1236.6,280.4c0.9,0.9,2.1,1.7,2.9,2.8c0.3,3,0.2,6.1,0.4,9.1c-1.1-0.4-2.2-0.7-3.3-1.1
+			C1236.5,287.6,1236.6,284,1236.6,280.4z"/>
+		<path class="st5" d="M648.1,287c2.2-1.9,4.6,1.9,2.2,3.3C648.1,292.5,645.7,288.4,648.1,287z"/>
+		<path class="st5" d="M1170.8,297.1c1-2.5,2.9-5.8,6.2-4.1c0.5,2.1-2.8,3.3-4.1,4.7C1172.4,297.5,1171.4,297.2,1170.8,297.1z"/>
+		<path class="st5" d="M1705.5,296.2c2.3-0.5,4.6-1,6.9-1.6c0.5,1.4,1.1,2.9,0.6,4.4C1710.4,299.1,1706.9,298.7,1705.5,296.2z"/>
+		<path class="st5" d="M488,303.5c1.6,0.1,3,0.8,4.4,1.6c-1.1,1.2-2.2,2.3-3.3,3.4c-0.8-0.8-1.6-1.6-2.3-2.4
+			C487,305.5,487.7,304.1,488,303.5z"/>
+		<path class="st5" d="M1247.7,306.6c1.5-2.5,4.5-0.6,6.6,0c-2.1,0.2-4.2,0.5-6.2,0.8c0.5,3.1,2,5.9,3.9,8.4
+			c1.3-0.5,2.5-1.1,3.8-1.6c-0.1,2.5-0.1,5-0.1,7.5c-0.1,0.5-0.3,1.7-0.4,2.2c-2-0.8-4.1-1.1-6.2-1.4c0.8-2.2,2.2-4.9,0.7-7.2
+			C1248.5,312.6,1245.6,309.5,1247.7,306.6z"/>
+		<path class="st5" d="M1169.3,309.1c0.4-0.6,1.3-1.9,1.7-2.5c1.8,0.9,3.9,1.5,5.2,3.1c1.4,2-0.5,4.2-1.2,6.1
+			C1173.2,313.5,1171.3,311.2,1169.3,309.1z"/>
+		<path class="st5" d="M481.9,311c0.5-1.5,2-2.2,3.2-3.1c0,2.3-0.4,4.5-1.2,6.6C483,313.4,481.6,312.4,481.9,311z"/>
+		<path class="st5" d="M1702.8,309.2c2.8,1.4,3.5,4.4,2.6,7.2c-0.7-0.3-2-1-2.7-1.3C1702.7,313.1,1702.8,311.1,1702.8,309.2z"/>
+		<path class="st5" d="M1720.2,316.2c1.5-1.2,2.9,1.5,1.6,2.4C1720.3,319.9,1718.8,317.2,1720.2,316.2z"/>
+		<path class="st5" d="M1729.7,315.8c1.1,0.3,2.2,0.7,3.3,1.1v8.7C1731.4,322.5,1729.9,319.3,1729.7,315.8z"/>
+		<path class="st5" d="M475.3,332.3c2.4-1.5,2.9,4.1,0.6,4.1C473.5,336.7,473,332.8,475.3,332.3z"/>
+		<path class="st5" d="M1725.4,335.2c2.1,0.1,4.3,0.3,5.7,2c-1.4-0.6-2.5-0.3-3.2,0.8c0.7,1.2,1.7,1.5,3.2,0.8
+			c-1.9,2.1-5.1,0.2-7.5,0.5c-1.4-1.2-4.5-1.2-4.6-3.2c1.4,0.2,2.8,0.5,4.2,0.8C1723.9,336.4,1724.6,335.8,1725.4,335.2z"/>
+		<path class="st5" d="M1715.8,340c1.8-0.2,4.6-0.8,4.6,1.9C1719.2,345.3,1716.8,341.5,1715.8,340z"/>
+		<path class="st5" d="M1070.6,371.2c4.1-9.6,2.3-20.3,3.5-30.4c0.8,0.1,2.4,0.2,3.2,0.3c-0.8,1.6-1.7,3.1-1.9,4.9
+			c-0.8,6.1-1.7,12.2-1.3,18.4c2.6-0.6,5.2-1.5,7.7-2.5c-0.5,2.5-1.8,4.6-3.6,6.4c-0.9-0.2-1.8-0.4-2.7-0.5
+			C1073.9,369,1072.4,370.3,1070.6,371.2z"/>
+		<path class="st5" d="M1709.1,341c1.8-0.4,3.8,1.3,3.1,3.2C1710.1,345.2,1706.8,343,1709.1,341z"/>
+		<path class="st5" d="M9.1,346.1c3.3-2.7,8.1-0.4,10.2,2.8c-0.3,0.5-1,1.4-1.4,1.8c-1.6-0.5-3.3-1-5-1.3c0.3-0.9,0.5-1.7,0.8-2.6
+			c-3,0.2-5.8,1.4-8.1,3.4c1.1,0.8,2.2,1.7,3.5,2.3c1.1-0.3,2.2-0.8,3.2-1.2c-1.2,4.3-6.9,2.4-8.8-0.3
+			C4.2,348.5,7.2,347.6,9.1,346.1z"/>
+		<path class="st5" d="M1205.9,351.9c0.2-0.5,0.7-1.4,0.9-1.9c0.7,0.1,2.1,0.3,2.8,0.3c0.7,0.1,1.9,0.2,2.6,0.3
+			c-0.9,1.7-2,3.4-3.1,5C1208,354.4,1206.9,353.1,1205.9,351.9z"/>
+		<path class="st5" d="M1723.4,352.3c2-1,3,3.2,0.9,3.4C1722.8,355.5,1722.3,353.3,1723.4,352.3z"/>
+		<path class="st5" d="M0,360.1c0.6-0.4,1.8-1.4,2.4-1.8c0.8,1.5,1.9,3,2,4.8c-0.7,1.6-3,1-4.4,1.6V360.1z"/>
+		<path class="st5" d="M11.3,358.9c1.8,1.1,2.6,3,1.6,5c-1.4,0.4-2.3-0.7-3.1-1.6C10.3,361.1,10.8,360,11.3,358.9z"/>
+		<path class="st5" d="M514.4,368.3c2.2-2.2,5.4-1.1,6.5,1.7l-1.3-0.5c-0.7-0.3-2.2-0.8-3-1.1c-0.7,0.9-1.5,1.8-2,2.8
+			c0.2,1.9,0.9,3.8,1,5.7c-0.7,2.4-2.2,4.4-3.4,6.6c0.7,0.2,2.2,0.6,3,0.9c2.8-2.2,4.1-5.6,5.3-8.8c1.4-0.1,2.9-0.2,4.4-0.1
+			c1.4,2.3,1.2,5.4,3.1,7.5c-1.2,1.8-2.4,3.5-3.8,5.2c0.4-1.6,0.9-3.2,0.5-4.8c-3.7-1-5.8,2-6.9,5.1c-2.6-1.1-5.2-2.4-7.8-3.6
+			c1.5-2.7,3.4-5.2,4.3-8.2C513.8,373.8,511.8,370.6,514.4,368.3 M522.4,376.3c-2.1,1.1-2.2,3.5-2.3,5.5c1.2,0,2.3-0.1,3.5-0.3
+			C525.9,380.3,525.3,375.9,522.4,376.3z"/>
+		<path class="st5" d="M910.3,367.3c1.5-0.1,2,1.6,1.9,2.8c-0.9,1-2.3,1.4-3.4,2.1C909,370.5,907.9,367.7,910.3,367.3z"/>
+		<path class="st5" d="M1727.8,372.5c1.7-0.7,3.4-1.3,5.2-2v3.4C1731.3,373.5,1729.5,373,1727.8,372.5z"/>
+		<path class="st5" d="M1239,374.2c2.2-0.8,4.6-1.1,7-1c-1.8,1.5-3.5,3-5,4.6C1239.6,377,1239.2,375.6,1239,374.2z"/>
+		<path class="st5" d="M1099.2,376.1c1.2,0.1,2,1.2,2.8,1.9c1.4,0.7,3.5,1,3.4,3.1c-2.1,2.1-5-0.2-7-1.4
+			C1096.7,378.8,1098.4,377,1099.2,376.1z"/>
+		<path class="st5" d="M983.6,379c2-1.5,4.2-0.6,4.5,1.9C986.2,381.2,984.5,380.9,983.6,379z"/>
+		<path class="st5" d="M942.2,379.2c1.6-1.1,2.8,1.3,1.3,2.2c-1.1,1.2-4.9,1.2-3.4-1.2C940.6,379.9,941.6,379.5,942.2,379.2z"/>
+		<path class="st5" d="M955.9,383.1c0.5-0.3,1.4-0.8,1.9-1.1c0.8,1.4,1.6,2.8,2.4,4.2C957.8,386.8,956.5,385.1,955.9,383.1z"/>
+		<path class="st5" d="M983.2,382.2c1.5-1.2,2.9,1.5,1.5,2.5C983.2,385.9,981.8,383.1,983.2,382.2z"/>
+		<path class="st5" d="M1011.8,387.6c1.6-0.3,3.3-0.5,5-0.4c0.6,0.9,1.2,1.8,1.7,2.8c-3.1,0.2-6.3,0.4-9.2-0.8
+			C1009.9,388.8,1011.2,388,1011.8,387.6z"/>
+		<path class="st5" d="M9.1,408.9c1.2,0.4,2.4,0.9,3.6,1.3c0,1.4,0,2.8,0,4.2c-1.7-0.7-3.4-1.4-5.1-2.1C8.1,411.1,8.6,410,9.1,408.9
+			z"/>
+		<path class="st5" d="M0,436.8c1.4,1.5,3,2.8,4.2,4.4c0.5,1.4-0.7,2.7-1,4.1c-1.1-0.8-2.2-1.5-3.2-2.3V436.8z"/>
+		<path class="st5" d="M14.1,439.2c1.8-0.3,3.4-1.5,5.1-2.2c0.6,1.9,1.8,3.8,1,5.8c-2.6,1.8-5.4,3.5-5.1,7.1
+			c4.7-0.5,9.3-2.2,14.2-1.9c-1.4,2.2-3,4.2-3.6,6.8c1.1-0.1,2.2-0.2,3.4-0.3c0,0.2,0,0.7,0,0.9c-1.5,2-2.8,4-3.9,6.2
+			c-1.5,0.1-3,0.2-4.6,0.3c1.1-3.8,4.7-6.7,4.1-10.9c-1.3,0.5-2.7,1-4,1.6c-1.5-1.3-4.1-2.6-5.8-0.8c-1.2,2.7-1.6,5.6-2.2,8.4
+			c-0.2-0.3-0.6-1-0.8-1.3c0.2-2,0.6-4,0.9-6c1.3-5.1-4.4-8.2-4.9-13C9,437.4,12.1,439.2,14.1,439.2 M14.1,441.3
+			c-1.4-0.4-2.7-0.8-4.1-1.2c0.1,2.8,1.2,5.3,3.6,6.9c0.8-1,1.5-2.1,2.2-3.1c1.3-0.9,3.5-1.1,3.6-2.9
+			C19.1,437.4,15.8,440.6,14.1,441.3z"/>
+		<path class="st5" d="M1715.8,446.2c2,1,5.7,1,5.6,4C1718.5,451.2,1716.5,448.7,1715.8,446.2z"/>
+		<path class="st5" d="M1704.1,463c-2.1-3.9,2.6-3.6,5.1-2.9C1707.7,461.4,1706.1,462.8,1704.1,463z"/>
+		<path class="st5" d="M1,467.3c3.4-0.2,6.9-0.8,9.8-2.6c2.1,3.8,6.6,4.5,10.5,5.1c0.4-0.5,1.1-1.5,1.4-2c0.2,0.8,0.6,2.5,0.7,3.3
+			c1.6-1,3.2-2,4.8-3c-0.4,1.6-0.9,3.2-1.5,4.8c-4.6-0.5-9.3-2.1-14-0.8c-2.6-1.1-5.3-2.3-7.8-0.2C3.5,470.5,2.2,469,1,467.3z"/>
+		<path class="st5" d="M1733,472.5c-3,0.9-2.5-3.3,0-3.5V472.5z"/>
+		<path class="st5" d="M612.5,475.9c2.4-2.3,6.7-2.3,7.6-6.2c0.9,3.8,2.9,7.3,5,10.6c2.6-2.4,2.4-5.8,2.3-9c0.5,0,1.4,0.1,1.9,0.2
+			c-0.1,3.6-1.2,7.1-3,10.2c-1.3-0.3-2.7-0.6-4-0.9c-1.1,0.6-2.3,1.2-3.4,1.8C616.8,480.3,614.5,478.2,612.5,475.9z"/>
+		<path class="st5" d="M639.9,473.1c6.9,1.4,13.8,3.7,20,7.1c-5.1,1.5-9.5-1.8-14-3.7c-0.5,1.6-1,3.2-1.5,4.8
+			c-0.9-1.1-1.8-2.1-2.6-3.2c0.6-1,1.2-1.9,1.8-2.9C642.3,474.5,641.1,473.8,639.9,473.1z"/>
+		<path class="st5" d="M1724.3,474.1c0.4-0.3,1.1-0.9,1.5-1.2c1.7,4.2,0.8,8.7,0.3,13.1c-0.5,2.2-2.8,0-2.9-1.2
+			C1723,481.2,1724.4,477.8,1724.3,474.1z"/>
+		<path class="st5" d="M155,476c6-0.6,12-0.4,18-0.7c-5.7,2.4-12,1.8-18,1.6c-5.1-0.2-10.1,0.4-15,1.5c-1.5,2.8-4.2,6.8-7.8,5.5
+			c-3.2-2.6,1.8-4.9,3.7-6.6c-3.8-0.3-7.5-0.4-11.3-0.4c-0.2,0.8-0.5,2.5-0.6,3.3c-0.7,0-2.2-0.1-2.9-0.1c0.2-1.1,0.3-2.1,0.5-3.2
+			c-2.9-0.1-5.8-0.2-8.6-0.3c1.4-0.4,2.8-0.7,4.2-1C129.7,476.3,142.4,477,155,476z"/>
+		<path class="st5" d="M761.5,489.4c-0.1-4.9-0.3-9.9,0-14.8c2.3,0.1,4.7,0.1,7,0.2c0.1,0.9,0.2,1.9,0.3,2.8c-1.5,0.7-2.9,1.3-4.4,2
+			c0.5,1.9,1,3.7,1.4,5.6c2.9,1.5,6.1,2.5,9.3,3c0.2,0.6,0.6,1.9,0.8,2.5C771.2,489.7,766.3,489.8,761.5,489.4z"/>
+		<path class="st5" d="M173.3,481.2c1.2-0.8,2.1-2.2,3.7-2.4c2.1,0.2,1.1,2.9,1.4,4.3C176.6,482.6,174.9,481.9,173.3,481.2z"/>
+		<path class="st5" d="M378.8,483.7c-0.3-3.4,3.5-4.8,6.3-5c2.1,1.5-0.9,3.2-1.6,4.7C381.9,483.5,380.3,483.6,378.8,483.7z"/>
+		<path class="st5" d="M150.8,487c1.1-2.7,2.5-6.7,6.1-6.1c-0.3,1.7-0.6,3.4-0.9,5.1c1.3,1.2,2.9,2.3,2.9,4.3
+			c-1.8-1.3-3.5-2.6-5.1-4c-0.2,2.1-0.4,4.2-1.1,6.1C152,490.6,151.2,488.9,150.8,487z"/>
+		<path class="st5" d="M648,482c1.8-0.4,3.7-0.6,5.6-0.8c0,1.3-0.1,2.6-0.1,3.9c-3.7,1.7-7.7,3-11.9,2.5c-0.1,0.4-0.3,1.2-0.5,1.6
+			c-1.9,1.2-3.8,2.5-5.6,3.9c-0.4,2.2-0.9,4.3-1.4,6.5c-2.9-1.5-5.9-2.9-8.9-4.2c1.6-2.7,3.2-5.3,4.9-7.9c-0.1-1-0.2-2-0.3-3.1
+			c1.9-1,3.7-2,5.4-3.4c0.3,5.3-5.3,8.4-6.2,13.5c1.5-0.1,3.4,0.2,4.3-1.3c2.1-2.8,3.9-5.9,7.2-7.3c-0.4-1.4-0.8-2.8-1.3-4.2
+			c1.7,1.7,3.1,4.6,5.8,4.8c2.9-0.5,5.5-2,8.1-3.1C651.5,482.8,649.7,482.3,648,482z"/>
+		<path class="st5" d="M805.1,482c1.4-0.2,3.7-0.7,4.3,1c-1,2.2-3.6,2.2-5.6,2.9C804,484.6,803.6,482.8,805.1,482z"/>
+		<path class="st5" d="M1521.1,489.2c1.1-1.8,1.7-5.2,4.5-3.6c-2.2,0.6-3,2.8-3.6,4.8c2.5,0.6,5.1,0.9,7.7,0.9l0,0.2
+			c-4.6,0.8-8.9,2.7-12.3,5.9c-0.4-1.6-0.8-3.2-1.2-4.8C1517.9,491.6,1520.3,491.2,1521.1,489.2z"/>
+		<path class="st5" d="M375.9,497.9c-0.8-1.8,1.7-1.7,2.8-2c1.3,2.6,3.2,4.6,6,5.6c1.6,0.4,1.8,2.2,2.4,3.5c1.4,1.2,2.9,2.4,4.2,3.6
+			c-1.2,0.4-2.3,0.8-3.5,1.1c-1.5,0.1-2,0.9-1.7,2.2c-1.2-0.1-2.3-0.2-3.5-0.3c-1.8-4.4-6.9-0.9-9.8-3.2c-2.2-2.8,2.7-3.8,3.8-5.7
+			C376.4,501,376.1,499.5,375.9,497.9 M373.3,507.1c3.9,3.9,8.5-1.4,11.8-3.6c-1.4-1.3-3.1-2.4-5.1-2
+			C377.5,503.1,375.5,505.2,373.3,507.1z"/>
+		<path class="st5" d="M136.1,497.1c2,1.5,6.2,1.7,5.8,4.8c-2.3,0.8-4.7,0.2-6.8-0.8C135.4,499.8,135.8,498.4,136.1,497.1z"/>
+		<path class="st5" d="M1505.6,504.6c-0.4-2.8-0.6-5.9,1.9-7.8c2,1.7,5.7,1.2,6.7,4c-1.8,0.3-3.7,0.4-5.5,0.9
+			c-2.1,3.1-2.8,7.1-5.6,9.7c-0.9-0.8-1.9-1.7-2.8-2.5C1502.1,507.5,1503.8,506,1505.6,504.6z"/>
+		<path class="st5" d="M177.4,499.7c2.6-1.5,5.3-0.4,7.4,1.3c-1.2,0.7-2.4,1.5-3.8,1.9C179.3,502.6,178.5,500.8,177.4,499.7z"/>
+		<path class="st5" d="M155.5,507.1c0.8-0.8,1.7-1.6,2.5-2.4c1.4,0,2.2,1.3,3.2,2C159.6,508.8,157.3,509,155.5,507.1z"/>
+		<path class="st5" d="M979.3,505.4c1.1-1.4,2.8,1,3.6,1.8C985,511.5,977.1,507.2,979.3,505.4z"/>
+		<path class="st5" d="M693.9,512.3c-2.8-0.7-5.1-5.8-1.2-6.5C693.2,507.9,693.7,510.1,693.9,512.3z"/>
+		<path class="st5" d="M978.5,514.3c2.5-2,4.3-5.2,8-4.7c0.2,4.2,0.7,8.3,1.6,12.4c0.1,1.1,0.9,2.8-0.6,3.3c-3.2,1.1-6,2.8-8.7,4.9
+			c-3.1,0.4-1.7-4-2-5.8c0.3-2.6,1.3-5.3,0.7-7.9c-1.8-0.5-3.6-0.7-5.4-1.1l0-0.3C974.3,514.8,976.5,515.1,978.5,514.3 M980.7,514.9
+			c0,4-0.1,8-1.7,11.8c2.7-1.8,6.8-0.2,8.6-3.4c-0.9-1.1-1.8-2.2-2.7-3.3c0.2-2,0.9-4.1,0.4-6.2
+			C983.9,512.1,980.8,512.3,980.7,514.9z"/>
+		<path class="st5" d="M651.8,512.7c3.1,0.2,6.2,0.6,9.2,0.9c-1.1,0.8-2.3,1.5-3.4,2.4c1.5,1.9,3.7,3,5.9,3.8
+			c-1.3,0.9-1.6,2.2-0.8,3.6c0.6,0.6,1.2,1.2,1.8,1.8c-0.2,0.6-0.5,1.9-0.7,2.5c-2.8-4.6-6.7-8.4-9.7-12.9
+			C653.4,514.1,652.6,513.4,651.8,512.7z"/>
+		<path class="st5" d="M374.7,519.5c3.7-1,5.6-5.8,9.7-5.1c-0.8,0.9-1.5,1.9-2.2,2.9c0.5,0.3,1.4,0.9,1.8,1.2c-2.9,0.7-5,2.5-6.5,5
+			C376.1,522.4,375.1,521.1,374.7,519.5z"/>
+		<path class="st5" d="M16.5,516.1c2.5,1.5,5.3,2.8,8.3,2.2l-0.2,0.5c-0.7,1.7-1.2,3.4-1.7,5.1c1.9-0.1,3.7-0.1,5.6-0.2
+			c0.1,0.4,0.5,1.1,0.6,1.4c-2.2,0.2-4.5,0.4-6.7,0.5c-1.5-1.3-2.9-2.6-4.6-3.6c-1.6,1.4-1.9,3.5-2.8,5.3c-0.5-0.8-0.9-1.5-1.3-2.3
+			C14.6,522,15.8,519.1,16.5,516.1z"/>
+		<path class="st5" d="M1707.9,520.5c0.9-2,2.3-3.7,4.1-5c-0.3,3.2-0.8,6.4-0.7,9.6c-0.1,2.3,2.1,3.5,3.4,5c0.3,1.7,0.5,3.5,0.9,5.1
+			c2.5,0.9,5.3,0.9,7.9,1.1l0.1,0c-1.2,1-2.1,2.3-2.5,3.9c1.1-0.1,3.2-0.2,4.2-0.3c-0.8,0.6-1.5,1.2-2.3,1.8
+			c0.5,0.1,1.4,0.4,1.8,0.5c-1,0.8-2,1.6-2.9,2.4c-1.6-0.8-3.2-1.7-5-2c-0.5,0.9-0.9,1.7-1.3,2.6c2.2,0.5,4.4,0.9,6.7,1.3
+			c-1.9,0.3-3.8,0.8-5.7,0.8c-2.4-0.1-5-1.7-6.9,0.4c-0.9-2.3-3.7-5.1-1.4-7.5c0.7-0.3,2-1,2.7-1.3c0,1.8,0.1,3.7,0.2,5.5
+			c1.5-1.1,2.9-2.3,4.4-3.4c1.3,0.2,2.6,0.4,3.9,0.4c0.6-1,1-2.1,1.5-3.1c-2.6-0.6-5.3-0.9-7.7-2.1c-1.6-1.4-2.6-3.3-3.8-5.1
+			c-1.1,0.3-2.2,0.6-3.3,0.9c-0.8-3.7-1.3-7.4-1.6-11.1c0.6-0.2,1.7-0.4,2.3-0.6c-0.5,0.6-1.5,1.8-1.9,2.4c1.3,1.4,2.7,2.7,4.1,4.1
+			c1.2-2.2,1-4.6,0.5-6.9C1709.3,520.3,1708.4,520.4,1707.9,520.5z"/>
+		<path class="st5" d="M1230.6,520.2c0.8-1.2,1.5-2.4,2.3-3.6c1.2,1.5,3.9,2.8,2.8,5.2C1233.7,523,1232,521.6,1230.6,520.2z"/>
+		<path class="st5" d="M1240.9,516.8c2.8,1.8,5.7,4.1,9.2,2.4c0.4,1.2,0.8,2.4,1.2,3.7c-2,1.3-4,2.6-6,3.9
+			C1244.3,523.1,1239.7,521,1240.9,516.8z"/>
+		<path class="st5" d="M368.6,518.7c1.5-1.6,2.9,0.5,4.1,1.4c-0.9,0.8-1.8,1.5-2.7,2.2C368.4,521.9,367.1,519.9,368.6,518.7z"/>
+		<path class="st5" d="M483,519.7c0.8-0.7,1.7-1.5,2.5-2.2c-0.1,3.5,0.2,7.1-0.9,10.4c0.7,0.2,1.4,0.5,2.2,0.7
+			c1.4-1.1,2.5-2.6,4.3-3c1.8,0,1.8,2.2,2.5,3.3c1,2.4,3.5,3.5,5.5,4.9c0.4-0.5,1.2-1.4,1.6-1.9c0,0.5,0,1.7,0,2.2
+			c0.7,0.5,2.1,1.5,2.8,2c0.1-2.2,0.1-4.4,0-6.6l0.6,0.2c1.4,1.7,2.5,3.7,3.5,5.7c-0.6,0.1-1.8,0.2-2.4,0.2
+			c-0.6,2.6-1.3,5.2-2.6,7.5c-0.1-2-0.2-4-0.3-6c-0.5,0.1-1.5,0.3-2,0.5c-0.6-0.6-1.1-1.2-1.7-1.7c-1.9-2.2-4.3-4-7.1-4.8
+			c0.2-1.5,0.8-3,0.6-4.4c-2.9,1.2-5.4,3.7-8.7,4.2c0.1,1.4,0,2.8,0.6,4.1c2.1,1.8,4.4,3.4,6.7,4.9c-0.3,0.6-0.9,1.7-1.2,2.3
+			c-0.2-0.5-0.6-1.5-0.8-2.1c-2.2-0.2-4.4-0.2-6.6-0.3c-0.1-0.7-0.3-2-0.4-2.7c-0.7,0.4-1.3,0.9-2,1.3c-0.2,0.6-0.6,1.9-0.8,2.5
+			c-0.7,0.1-2.1,0.4-2.8,0.6c0,1.1,0,2.2,0.1,3.3c-0.7-1.1-1.5-2.2-2.2-3.3c-1.4,0-2.7-0.1-4.1-0.1c0.7,1.2,1.3,2.4,2.1,3.6
+			c-1.2-0.2-2.3-0.4-3.5-0.6c0,2.1,0.8,4.7-1,6.3c-0.6,0-1.8,0.1-2.5,0.2c0.2-5.8,4.8-9.9,6.7-15c1.9,0.9,3.7,3.5,6,2.2
+			c1.5-0.7,2.8-1.7,4.2-2.6c-1.2-1.5-2.4-3-3.6-4.6c-0.3,1.8-0.6,3.5-0.9,5.3c-1-1.6-2.1-3.2-3.1-4.9c0.9-1.2,1.7-2.4,2.6-3.5
+			c2.3-1.5,5.7-0.5,7.5-2.7C484.4,523.2,483.6,521.4,483,519.7z"/>
+		<path class="st5" d="M669.8,517.7c2.9,0,3.7,2.4,3.5,4.8C670.7,522.3,669.6,520.1,669.8,517.7z"/>
+		<path class="st5" d="M689.2,519l0.8,0.2c0,2.9,0.4,5.8,1.8,8.3c-1.6,1.3-3.5,1.9-5.4,2.4c0,1.4-0.1,2.9,0,4.4
+			c0.2,0.2,0.7,0.5,1,0.7c0.5,0.3,1.5,0.9,2,1.2c-1.3,0-2.6,0-3.9,0c0.2,1,0.4,1.9,0.6,2.9c-0.9-0.2-1.9-0.3-2.8-0.5
+			c-0.2,1.2-0.4,2.3-0.6,3.5c0.3,0.4,0.8,1.3,1.1,1.7c-3.6-0.4-6.1,2.5-8.9,4.1c-0.9-2-1.8-4.1-2.7-6.1c1-3.4,1.4-7.2-0.7-10.3
+			l-0.4-0.8c-0.3-1.5-0.5-2.9-0.7-4.3c0.6-0.3,1.9-0.8,2.5-1c1.1,0.9,2.2,1.9,3.4,2.9c0.7-1.9,1.4-3.7,2.1-5.6
+			c0.4,0.3,1.2,0.9,1.6,1.2c1.2,2.7,0.9,5.6-1.4,7.7c2-0.5,4-1,6-1.4c0.1-0.8,0.2-1.6,0.3-2.4c-0.7-0.1-2.1-0.4-2.8-0.5
+			c0.3-0.6,0.8-1.7,1.1-2.2c1.8,0.4,3.7,0.6,5.6,0.7C688.7,523.5,689,521.2,689.2,519 M682,535.1c-0.5,1.6,0,2.2,1.7,1.8
+			C684.1,535.2,683.6,534.6,682,535.1 M676.2,541.3c-1.2,1.4,1.4,2.6,2.2,1.2C679.6,541.1,677,540,676.2,541.3z"/>
+		<path class="st5" d="M710.6,518.9c1.5,2,3,3.9,4.5,5.9c-1.1,2-2.3,4-3,6.3c1.5,1.4,3.2,2.5,4.8,3.8c0.7-1.2,1.5-2.5,2.2-3.7
+			c0.2,0.3,0.6,1,0.8,1.3c-0.3,1-0.7,2.1-1.1,3.1c-2.2,1.1-4.5,2.2-6.7,3.3c0.2-0.5,0.6-1.5,0.8-2c-0.5-0.5-1-1-1.4-1.5
+			c-0.3-2.6-0.6-5.3-0.9-7.9c-1.3-0.2-2.7-0.4-4-0.6C706.3,523.6,708,520.9,710.6,518.9z"/>
+		<path class="st5" d="M366.3,522.3c3.3-1.7,1.1,4.8-0.6,1.6C365.9,523.5,366.1,522.7,366.3,522.3z"/>
+		<path class="st5" d="M379.3,525.3c2.7-0.3,5.6,0,7.9-1.8c-0.8,2.5-1,5.2-1,7.9c1.5-0.9,2.9-2.1,4.2-3.3c1-0.9,2.1-1.8,3.2-2.7
+			c0.5,0.5,1.5,1.6,2,2.1c-0.6-0.1-1.8-0.2-2.4-0.3c-0.5,1.4-0.9,2.8-1.5,4.1c-0.5,1.1-1,2.2-1.6,3.3c-0.2,0.4-0.7,1.1-0.9,1.4
+			c-4.5,1-7,5-10.1,8.1c-1.1,1-2.2,2-3.3,2.9c-1.1-3,0.6-5.3,2.7-7.2c-0.5-1.7-1-3.4-1.5-5c-2.5,2.7-4.2,6-6.5,8.8
+			c-1.3,1.5-2.3,3.4-2.2,5.4c1.3,2,3.6,0.7,5.5,0.5c0.3,0.3,1,0.8,1.3,1.1c0.2,1.8,0.4,3.6,0.7,5.4c0.2,1.5,0.6,2.9,0.9,4.4
+			c2.9-0.3,5.9-0.5,8.8-0.5c0,2.1,0.1,4.2,0.2,6.2c-1.2,0.3-2.4,0.7-3.5,1c0,0.9,0.1,1.7,0.1,2.6c-1.1-0.8-2.2-1.5-3.3-2.3
+			c-1.2,0.8-2.5,1.6-3.8,2.5c0.8,2.2,2.3,4.4,2.3,6.8c-1,2-2.3,3.9-3.4,5.8c-1.1,0-2.2,0-3.2,0c0.7-2.5,2.7-4.1,4.6-5.6
+			c-1.4-1.1-2.7-2.2-4.1-3.4c0.1-4.5,0.3-9-0.8-13.4c-1.9,1.3-3.7,2.6-5.5,4c1.1,1,2.3,2,3.4,2.9c-0.1,3.8-0.1,7.5,0,11.3
+			c-1.5,0.2-3.1,0.4-4.6,0.6c-0.6-0.6-1.2-1.2-1.8-1.8c0.6-1.2,1.1-2.3,1.7-3.5c-1.9-0.2-3.8-0.2-5.7-0.1c0.8,2.5,1.3,5.1,1.7,7.8
+			c-0.9,0.3-1.9,0.7-2.8,1.1c-1.7,1.8-3.2,3.7-4.7,5.7c-0.9-4.2-0.6-8.5,0-12.7c2.1-0.9,4.1-2.1,5.2-4.2c2.4,0.4,4.8,0.5,7.2,1
+			c0.4,1.8,0.6,3.7,0.8,5.6c0.2-0.3,0.7-0.9,1-1.2c0.2-3.1,0.6-6.3,0.1-9.4c-1.1-1.6-3.2-1.7-4.9-2c0-1.6,0.5-3.4-0.6-4.8
+			c-1.5,0.3-2.9,0.8-4.3,1.3c2.8-2.7,4.7-6.1,7.4-8.9c1.7,2.8,0,5.7-1.1,8.4c3.6,1.1,6.6-1.8,9.3-3.9c1.9-1.3,1.1-3.8,1.1-5.7
+			c-1.8-0.2-3.7-0.3-5.4-0.9c-2.2-1.2-1.2-4.1-0.3-5.8c3.4-4.5,6.4-9.4,10.8-13c0.1,0.5,0.4,1.4,0.5,1.8c1.7,0.7,3.5,1.2,5.3,1.9
+			c0.7-3.2,0.9-8.3-2.5-10c-2.8,0.1-2.3,3.6-3.1,5.5C378.7,529.3,377.8,527,379.3,525.3 M373.2,564.9c0.4,2.2,3,1.6,4.6,2
+			c-0.4-1.6-0.8-3.2-1.2-4.8C375.1,562.4,372.6,562.8,373.2,564.9 M353.2,576.3c-0.1,1.5-0.1,3-0.1,4.5c1.9,0,3.9,0,5.9,0
+			c-0.3-1.4-0.4-3-1.2-4.3C356.2,575.9,354.6,576.3,353.2,576.3z"/>
+		<path class="st5" d="M515.4,526.1c1.2-1,2.4-1.9,3.6-2.8c1.4,1.9,2.8,3.9,4.1,5.9C520.2,529.5,517.1,528.9,515.4,526.1z"/>
+		<path class="st5" d="M1510.1,532.1c1-1.3,2.3-0.5,3.1,0.5c-0.4,1.8-0.4,3.6-0.3,5.5c-0.7,0-2.1,0-2.8,0
+			C1510.1,536.1,1510,534.1,1510.1,532.1z"/>
+		<path class="st5" d="M139,532c3.4,0,4.6,4.3,4.8,7l-0.9,0.2C141.4,537.1,139.5,534.7,139,532z"/>
+		<path class="st5" d="M146.1,532.3c1.4-1.2,2.6,1.4,1.3,2.2C146.1,535.7,144.9,533.1,146.1,532.3z"/>
+		<path class="st5" d="M1485.3,532.3c1.2-0.6,2.6,0,3.6,0.8c-0.5,2.5-4.1,3.1-5.4,0.9C1484,533.6,1484.9,532.7,1485.3,532.3z"/>
+		<path class="st5" d="M1531.2,539c1.8-2.2,3.4-4.5,5.8-6.2c0.3,0.2,1,0.8,1.3,1c-1.5,4-4,7.8-4.1,12.2c-0.1,2.2-0.6,5.8,2.6,5.6
+			c3.6-0.6,1.4-4.5,1-6.8c1.9-2.7,4.8-4.1,8.2-4c1.3,3.9,2.5,7.9,3.9,11.9c-0.6,0.5-1.7,1.6-2.3,2.2c-1.5-0.3-2.9-0.5-4.3-0.8
+			c0.1-3.8,0.2-7.5,0.5-11.3c-5.1,0.2-2.3,6.4-4.6,9.4c-2.1,1.3-4.5,0.2-6.6-0.7c0.1-3.3,0.8-7-1.2-9.9c-0.8,2.2-1.5,4.4-1.9,6.7
+			c-0.6-2.8-1.5-5.4-2.1-8.1C1528.4,539.4,1529.8,539.3,1531.2,539z"/>
+		<path class="st5" d="M0,537.8c3.6-0.9,7.2-2.1,10.8-2.8c0.4,3.5-0.6,7,1,10.3C9.2,548,7,551,4.6,553.8c-1.5,0.6-3.1,0.5-4.6,0.8
+			v-6.5c3.2-0.2,6.8-0.3,8.3-3.7c-0.8-0.8-1.5-1.7-2.3-2.5c2.9-0.3,3.6-3,4-5.4c-2.5,0.8-5,1.5-7.6,2.2c-0.1,0.6-0.3,1.7-0.4,2.3
+			c-0.5,0.3-1.6,1-2.1,1.3V537.8 M3,553.7c1.5-0.8,2.8-2.1,2.7-4c-1.3-0.7-2.7-1.3-4.2-1.6C1.3,550.1,0.2,553,3,553.7z"/>
+		<path class="st5" d="M1189.3,537.3c2.3-2.1,5.4,2.3,3.1,4.1C1189.9,543.2,1188.4,539.1,1189.3,537.3z"/>
+		<path class="st5" d="M1231.3,537.2c2.2-1.4,2.9,4.2,0.6,3.8C1229.3,541.8,1229.3,537.8,1231.3,537.2z"/>
+		<path class="st5" d="M136.8,538.5c0.5,1.8,1.1,3.5,1.6,5.3c1.3-0.2,2.5-0.3,3.8-0.4c0.3-1.2,0.6-2.4,1-3.6c1.7,0,3.3-0.1,5,0
+			l0.1,0.9c-0.9,0-2.7,0-3.6,0c0,1.3,0,2.7,0,4c-0.5,0.5-1,1-1.5,1.5c0.9,1.6,1.6,3.2,2.3,4.9c-2.8-2.1-5.7-4.2-9-5.6
+			C136.5,543.2,136.6,540.9,136.8,538.5z"/>
+		<path class="st5" d="M166.1,541.3c2.8,1.6,6.1,1.7,9.3,2c-1.8,0.3-3.5,0.7-5.3,1.2c0.2,1.4,0.9,2.6,1.6,3.8
+			c-2.1-1.1-4.2-2.1-6.3-3.1C165.7,543.9,165.9,542.6,166.1,541.3z"/>
+		<path class="st5" d="M513.4,546.3c1.4-2.1,2.5-4.9,5.2-5.6c0.2,1.5,0.4,3,0.7,4.4c-0.4,0.3-1.1,0.8-1.4,1.1
+			C516.4,546.3,514.9,546.3,513.4,546.3z"/>
+		<path class="st5" d="M1235.1,545.2c1.8-0.6,2.2,2.3,0.6,2.7C1233.9,548.6,1233.3,545.5,1235.1,545.2z"/>
+		<path class="st5" d="M187.1,548c1.9,0.4,5.6-0.1,5,2.9c0.5,3-3.4,4.1-3.7,0.7c-0.6-0.2-1.2-0.3-1.8-0.5
+			C186.7,550.4,187,548.8,187.1,548z"/>
+		<path class="st5" d="M145.5,552.1c0.4-2.2,3.3-1.3,4.8-1.2c0.3,1.7-1.1,2.7-2.3,3.6C147.1,553.7,146.3,552.9,145.5,552.1z"/>
+		<path class="st5" d="M380.1,553.8c0.9-0.7,1.9-1.3,2.9-1.9c1,0.6,1.9,1.2,2.8,2c-0.9,0.8-1.9,1.7-2.8,2.6
+			C382,555.6,381.1,554.7,380.1,553.8z"/>
+		<path class="st5" d="M509.7,557.6c1.5-1,3.1-1.9,4.8-2.4c-0.7,3.7-1.8,7.4-4.2,10.4c-2.1-2.1-3.6-4.6-3.1-7.7
+			C507.9,557.8,509.1,557.7,509.7,557.6z"/>
+		<path class="st5" d="M822.3,555.1c1.9-1.7,4,0.9,2.5,2.7c-1.4,0.9-4.3,2.8-4.9,0.1C818.6,556.4,821.3,555.8,822.3,555.1z"/>
+		<path class="st5" d="M488,563.5c-1.9-1.3,0-5.1,2.4-3.8C490.8,561.7,490.9,564.6,488,563.5z"/>
+		<path class="st5" d="M459.5,561.5c1.6-0.2,3.2-0.5,4.8-0.6c-0.1,2.7-2.8,3.6-4.7,4.8C459.6,564.7,459.5,562.5,459.5,561.5z"/>
+		<path class="st5" d="M1726.1,560.9c2.3,0,4.6-0.1,6.9-0.1v2.6c-2.1-0.8-4.3-1.4-6.5-2c0.5,1.8,0.9,3.8,1.7,5.5
+			c1.4,0.9,3.2,0.3,4.8,0.3v0.4c-3,1.2-5.4,3.5-7.8,5.7c-0.3-0.6-1-1.9-1.4-2.5c0.2-0.8,0.5-2.4,0.7-3.1c-0.9,0.1-2.8,0.3-3.7,0.4
+			c1.6-0.8,3.2-1.5,4.9-2.2C1725.8,564.1,1725.9,562.5,1726.1,560.9z"/>
+		<path class="st5" d="M464.4,567.4c0.5-0.9,1-1.9,1.5-2.8c0.7,2.7,1.7,5.2,2.7,7.8c1.2,0.5,2.5,1,3.8,1.6c-0.8,0.1-2.3,0.2-3.1,0.3
+			c-0.6,2.2-1.1,4.4-1.7,6.6c-0.5,0.2-1.6,0.5-2.1,0.7c0.2,2.9-1.4,5.5-2.6,8c0.5,0.3,1.5,0.8,2,1.1c1-0.8,2-1.5,3-2.2l1.1,1.2
+			l-0.5,0.5c-1.9,1.3-4.2,2-6.4,2.7c0.1,1.5,0.3,2.9,0.4,4.4c-1-1-2-2.1-3-3.1c-0.6,0.9-1.2,1.8-1.7,2.6c-1.6,0.1-3.2,0.4-4.6,1.2
+			c-0.2-1-0.3-2-0.4-3.1c1-1.4,2.9-1.2,4.4-1.5c0.4-0.8,0.8-1.5,1.2-2.2c1,0,2.1,0,3.1,0c-1-1.5-2.1-3-3.2-4.3
+			c0-5.1-1.9-10.3-0.3-15.2c0.6-2.3,3.4-2.6,5.2-3.6C463.7,567.7,464.2,567.5,464.4,567.4 M461.1,570c-0.6,1.3-1,2.7-1.3,4.1
+			c1.4-0.4,2.8-0.8,4.3-1.2C463.1,571.8,462.1,570.9,461.1,570 M460.4,575.2c-1.2,1.4,1.4,3.1,2.4,1.7
+			C463.9,575.4,461.4,573.8,460.4,575.2z"/>
+		<path class="st5" d="M1548.8,566c2.4-0.6,3.7,1,4.3,3.1C1550.8,569.5,1549.2,568.2,1548.8,566z"/>
+		<path class="st5" d="M16.5,574.8c-2.1-3-0.1-6.1,2.2-8.2c3.1,3.2,6.4,6.4,8.4,10.4c-3.2-1.7-5.5-4.5-8.3-6.5
+			C18,571.9,17.2,573.3,16.5,574.8z"/>
+		<path class="st5" d="M722.2,568.2c1.2-0.8,2.2-0.5,3.1,0.8c0.5,1.9-1.7,3.3-3.2,2C720.9,570.4,720.6,568.5,722.2,568.2z"/>
+		<path class="st5" d="M834,573.2c0.6,0.4,1.1,0.8,1.7,1.1c0.7-0.1,1.9-0.4,2.6-0.5c0.4,2.6-1.6,4.3-3.4,5.8
+			c-0.7-0.8-1.4-1.7-2.1-2.6C833.1,575.7,833.6,574.4,834,573.2z"/>
+		<path class="st5" d="M977.8,574c0.8-1.4,1.7-1.4,2.7,0c-0.1,1.5-0.2,2.9-0.5,4.4C978.5,577.3,976.8,575.9,977.8,574z"/>
+		<path class="st5" d="M194.8,580.3c3,0.7,5.2-3.3,8.1-1.3c-0.7,3.6-0.8,7.2-0.6,10.8c0.2-0.4,0.7-1.2,1-1.6
+			c1.5,1.2,3.5,1.4,5.3,1.7c0-1.3,0.1-2.6,0.1-3.9c2.9,2.3,1.2,6.9,2.4,10.2c-2.9,0.8-3.9-1.8-4.8-4c-1.4,1-1.8,2.8-2.8,4.1
+			c-2,1-4.3,1-6.4,1.5c0.9-1.9,1.6-3.9,2.1-5.9c-2.6,0.6-5.3,2.7-7.9,2c-0.6-2.8,0.7-6.6,3.4-8.2c1-0.5,1.4-1.3,1.2-2.3
+			c-3.9-0.5-6.9,3-10.8,2.7c-0.7-1.4-0.3-2.5,1-3.2C188.6,581.2,191.6,579.8,194.8,580.3 M199.3,581c-0.9,2.4-1.7,5-4.2,6.2
+			c-2,0.8-1.7,3-1.9,4.8C198.6,592,202.9,585.6,199.3,581 M200.4,591.3c-1,1.6-0.5,5.3,2,4.1C205.2,594,203,589.2,200.4,591.3z"/>
+		<path class="st5" d="M1173.9,586.2c-2.9-0.9-6.5-4-4.5-7.2c0.2,0.7,0.7,2,1,2.7c1.5,0.1,3.1,0.1,4.7,0.2
+			C1174.6,583.3,1174.3,584.8,1173.9,586.2z"/>
+		<path class="st5" d="M373.5,586.3c2.4-3.3,7.2-2.8,9.3-6.4c-1.7,3.2-3.1,6.6-4.9,9.8c-1.6,1.7-3.1,0.1-4.4-1
+			C373.4,588.1,373.5,586.9,373.5,586.3z"/>
+		<path class="st5" d="M1160.1,583.7c2-0.4,4-0.8,6-1.2c1.8,2.6,3.2,5.5,3.1,8.8c-2.6-0.3-4.8-1.5-6.6-3.3l-0.8-0.8
+			c0.6-0.8,1.2-1.6,1.8-2.4C1162.4,584.4,1161.3,584,1160.1,583.7z"/>
+		<path class="st5" d="M1513.1,584.6c1.2,1,2.3,2.1,3.5,3.1c-0.4,1.1-0.8,2.2-1.2,3.4c2.3,1.3,4.4,2.8,6.3,4.6
+			c1.7-0.3,3.3-0.7,5-1.1c0.1-1.2,0.2-2.4,0.3-3.6c2.2,0.2,4.4,0.5,6.6,1l-0.2,1.1c-0.2,1-0.5,1.9-0.7,2.8c-1.2-1.2-2.6-2.3-3.8-3.5
+			c-1.9,5.4-8.4,5.2-12.7,7.5c-1.2-3.9-2.5-7.7-3.7-11.6C1512.6,587.4,1513,585.5,1513.1,584.6z"/>
+		<path class="st5" d="M1702.7,585.3c1.9,0.5,3.8,1,5.6,1.7c-1.8,0.7-3.7,1.2-5.5,1.6C1702.8,587.7,1702.7,586.1,1702.7,585.3z"/>
+		<path class="st5" d="M150.4,589.8c1.7-1.9,3.9-0.9,5.9-0.3c0.4-0.3,1.2-0.9,1.6-1.2c0.8,2.3,1,4.8,0.8,7.2
+			C155.4,594.4,152.7,592.3,150.4,589.8z"/>
+		<path class="st5" d="M485.1,588.7c0.2,0.3,0.6,1,0.8,1.3c0.7,2.9,1.1,5.8,1.5,8.7c-0.6,0.4-1.9,1.1-2.6,1.5
+			c-1-1.3-1.9-2.5-2.9-3.8c-0.8,0.8-1.6,1.6-2.4,2.4c-0.2-0.3-0.6-0.8-0.8-1c-1.5,0.1-2.9,0.2-4.4,0.4c1.4-4.5,6.7-4.1,10.4-5.6
+			C484.8,591.2,485,589.9,485.1,588.7z"/>
+		<path class="st5" d="M471.2,594c1.1-1,2.2-2.1,3.4-3.1c-0.7,1.7-0.8,4.2-2.8,4.9c-1.6,0.5-3.3,0.8-5,1.2c0.7-1.8,1.5-3.5,2.2-5.2
+			C469.7,592.5,470.4,593.2,471.2,594z"/>
+		<path class="st5" d="M815.4,591.3c2.4-2.8,5.9,3.6,3.6,4.9C817.5,595.1,814.3,593.3,815.4,591.3z"/>
+		<path class="st5" d="M1702.7,591.5c1.2-0.4,2.4-0.8,3.6-1.1c0.5,0.4,1.4,1.2,1.9,1.6c-1.4,1.7-3.3,2.9-5.3,3.8
+			C1702.8,594.6,1702.7,592.5,1702.7,591.5z"/>
+		<path class="st5" d="M364.4,592.5c1.5-0.5,2.1,1.3,3,2.1c-3.3,3.8-6.8,7.9-12,8.9c-0.8,2.6-1,5.4-2.1,7.9
+			c-0.7-1.2-1.3-2.4-1.9-3.6c0-1.8,0-3.6,0-5.3c1.1,0,2.2,0,3.4,0c1.1-3.4,3.9-5.6,6.5-7.7C362.2,593.9,363.2,593,364.4,592.5z"/>
+		<path class="st5" d="M1176.3,594.2c0.1-2.3,2.7-2.4,4.4-2.3c-0.1,1.3-0.2,2.5-0.3,3.8C1179,596.3,1176.1,596.5,1176.3,594.2z"/>
+		<path class="st5" d="M496.3,595.8c0.5-0.6,1.4-1.9,1.9-2.5c1.7,0.8,3.4,1.7,5,2.7c-1.2,0.8-2.5,1.6-3.7,2.4
+			c-0.1,1.4-0.2,2.7-0.3,4.1c2.3-1.2,4.7-3.9,7.5-2.6c-1.1,3.1-3.4,5.5-5.7,7.7c-0.9-0.8-1.9-1.6-2.8-2.4c-0.5-0.5-1.6-1.3-2.2-1.8
+			l-1.4,0.3c-1,1.5-1.8,3.1-2.2,4.9l0.6,1.4c-0.8-0.5-1.7-0.9-2.5-1.4c-1,0-2,0-3,0c-1.2-0.9-2.4-1.9-3.6-2.8
+			c-0.4,1.5-0.7,3.1-1.1,4.7c-0.5-1.2-1-2.5-1.4-3.7c-1.2-0.8-2.3-1.6-3.5-2.4c0.5-0.3,1.4-0.9,1.9-1.2c0.3,0.5,0.9,1.4,1.1,1.9
+			c3.6-0.7,7.5-0.8,10.9-2.4c2-0.9,2.4-3.3,3.2-5.1C495.4,597,495.8,596.4,496.3,595.8z"/>
+		<path class="st5" d="M234.5,595.9c1.3,2.7,2.6,5.4,4,8c-2,3.1-4.7,5.6-7,8.5c0,1.4,0.4,2.7,0.6,4.1c1.3,0.2,2.7,0.3,4,0.5
+			c-2.2,2.2-5.4,0.2-8.1,0.1c0.2-0.6,0.5-1.7,0.7-2.2c-0.8-0.7-1.5-1.3-2.3-2c4.4,0.3,5.6-4.5,4.6-8c0.4-1,0.9-1.9,1.4-2.9
+			c-0.4-1.5-0.9-3-1.3-4.4C232.3,597.1,233.4,596.5,234.5,595.9z"/>
+		<path class="st5" d="M932.6,597.1c1.4,1.1,2.7,2.4,4,3.7c-0.1,1.3-0.1,2.7-0.1,4c3,0.6,6,1.3,8.9,1.9c2-3.3,3-7,4.4-10.6
+			c1.5,4.4-1.4,8-3.7,11.4c-4.4,0.2-8.7-0.5-12.4-2.9c-1,0.9-2,1.8-3,2.7C929.7,603.7,932.8,600.7,932.6,597.1z"/>
+		<path class="st5" d="M977,599.2c1.5-1.4,3.2,0.4,4.2,1.5c-0.6,0.4-1.8,1.2-2.4,1.7C978.2,601.4,975.9,600.6,977,599.2z"/>
+		<path class="st5" d="M1257.2,605.2c0.4-1.7,0.9-3.9,2.9-4.2c1.3,0.9,2.2,2.3,3.3,3.5c1.7,0.5,3.7,0.8,4.6,2.7
+			c-2.7,1.4-7,3.3-8.5-0.6c-0.5,1.5-0.9,2.9-1.3,4.4c-3.7-0.3-7.4,0.5-10.4,2.8c-1.7-2.5-0.1-4.9,2.4-5.9c0.1,0.5,0.3,1.5,0.4,2
+			c2.4-0.1,4.8-0.3,7.2-0.7c-0.2-1.2-0.3-2.3-0.5-3.5L1257.2,605.2z"/>
+		<path class="st5" d="M452.1,602l0.1,0.4c1.5,0.8,3,1.4,4.4,2.1c0.5,1.2,1,2.5,1.5,3.7c1.3-0.7,2.6-1.3,4-1.7
+			c0.3,2.2-0.3,4.2-1.7,5.9c-0.8-0.9-1.7-1.7-2.5-2.5c-0.5-1.6-1.3-2.9-3.2-2.6c0.1,1.2,0.2,2.5,0.4,3.8c-0.4,2.4-0.7,4.9-0.9,7.3
+			c-0.6,0.1-1.7,0.2-2.3,0.3C451.7,613.2,452,607.6,452.1,602z"/>
+		<path class="st5" d="M1230.1,608.2c-1.3-2.4,1.4-5.7,3.7-4.1c-0.9,2-3.4,3.8-2.1,6.1c0.6,2.6,3.6,2.7,5.5,3.8
+			c-0.7,1.1-1.8,1.9-2.8,2.7c0.9,2.9,0.8,5.9-0.5,8.7c-0.9-1-1.8-2.1-2.6-3.1c-0.3,1.4-0.5,2.8-0.8,4.2c2.8,3.5,7,1,10.7,1.4
+			c-0.4,1-0.8,2-1.3,3c-2.2,0.5-4.5,0.3-6.7,0.3c-0.7,1-1.4,2-2.1,3c-2.7-0.4-5.4-0.7-8-1.3c-1.6-1.4-2.4-3.6-3.6-5.4
+			c-1.1-0.5-2.1-1-3.1-1.6c2-2.3,5.5,0,6.1,2.4c0.4,1,0.8,1.9,1.3,2.9c2.4,0.5,4.7,1,7.1,1.5c-0.4-2.1-0.9-4.4-2.7-5.8
+			c-1.2-0.7-2.4-1.2-3.6-1.8c1-0.9,2-1.8,3-2.6c-0.5-0.5-1-0.9-1.5-1.3c2.9,0,5.8,0.1,8.7,0.1C1233.2,617,1231.4,612.7,1230.1,608.2
+			z"/>
+		<path class="st5" d="M899.7,605c2.1-0.7,4.4-0.5,5.6,1.7c-0.6,0.4-1.8,1.2-2.4,1.7C901.8,607.3,900.8,606.2,899.7,605z"/>
+		<path class="st5" d="M916.8,605c1.3,1.1,2.6,2.4,3.8,3.6c0.5-0.4,1.5-1.2,2-1.5c1.2,0.5,2.4,0.9,3.6,1.4c-1.1,1-2.2,1.9-3.2,2.9
+			c0.2,1.7,1,3.2,1.7,4.7c-0.6,0-1.9,0-2.5,0c-1.3-2.1-2.5-4.2-3.8-6.4c-2.8-0.4-5.6-1-7.6-3.2C912.8,606,914.8,605.5,916.8,605z"/>
+		<path class="st5" d="M734.6,610.6c0.3-0.2,1-0.6,1.3-0.8c-1.3,3.6-2.3,7.3-3,11c1.4,0.2,2.8,0.5,4.2,0.7c-0.6,1.8-1.3,3.6-1.9,5.4
+			c1.5,1.8,2.8,3.9,3.3,6.2l-0.1,0.5c-2.9,1.3-4.1,4-4.3,7c-1-0.1-1.9-0.2-2.9-0.4c-0.2-2.9,1.2-5.3,2.8-7.6c1.1-1.5-1-2.5-1.8-3.5
+			c-1.8,3.6-5.6,4.9-9,6.5c2.6-3.8,7.1-5.4,10.5-8.2c0.2-2.9-1.3-5.2-3.2-7.3c-0.5,1.5-0.9,2.9-1.4,4.3c-2.4,0.4-4.8-0.1-7.2-0.3
+			c1-0.5,1.9-1,2.9-1.5c1-1.5,2-3.1,2.9-4.6c-1.3-1.2-2.5-2.5-3.6-3.8c0.5-0.4,1.6-1.2,2.1-1.6c0,1,0,1.9,0,2.9
+			c1.8-0.2,3.8,0.2,5.4-0.8C733,613.5,733.7,612,734.6,610.6z"/>
+		<path class="st5" d="M937.8,610.9c1-2.3,4.4,0.2,6.3,0.3c-0.2,1.1-0.4,2.3-0.6,3.4C941.4,613.7,939.6,612.3,937.8,610.9z"/>
+		<path class="st5" d="M1149.2,610.2c1.9,1.6,4.1,2.8,6.4,4.1c-2.9,1.4-6,2.4-9.1,3.2C1147,614.9,1148,612.5,1149.2,610.2z"/>
+		<path class="st5" d="M1008.2,614.8c-1.4-1.6,0.6-2.9,1.5-3.9c1.2,1.3,2.4,2.7,3.5,4.1C1011.7,615.6,1009.3,616.9,1008.2,614.8z"/>
+		<path class="st5" d="M1157,618c0.6-2.1,1.9-3.9,3-5.8c1,1.4,2,2.7,2.9,4.1c-1.4,0-2.8-0.1-4.3-0.1c0,1.6,0.1,4,2.3,4.1
+			c2.2,0.9,2.5-2.1,2.8-3.5c1.1,0.9,2.3,1.7,3.1,3c-1.1,1-2.3,1.9-3.4,2.7c1,1.3,2.6,2.4,2.4,4.3c-1.7,0.9-3.8,0.5-5-0.9
+			c-0.5-1.4-0.4-2.8-0.5-4.3C1159.1,620.7,1157.2,619.9,1157,618z"/>
+		<path class="st5" d="M212.8,615.9c1.4,0.3,3.7-0.6,4.4,1.2c0.4,1.8,0,4.5-2.2,4.8C212.2,621.2,212.8,618.1,212.8,615.9z"/>
+		<path class="st5" d="M457.2,617.8c1.7-0.2,3.4-0.3,5-0.5c1,4.5,0.7,9.1-0.1,13.6c-1.1-0.2-2.2-0.3-3.3-0.4c-2-1.3-4.1-2.3-6.3-3.1
+			c0.5-1.9,0-4.8,2.2-5.7c2.1-0.5,4.4-0.2,6.5-0.2C459.9,620.1,458.5,618.9,457.2,617.8z"/>
+		<path class="st5" d="M1534.8,620c0.5-2.2,2.8-3.7,4.9-2.5C1538.5,618.9,1536.6,622.9,1534.8,620z"/>
+		<path class="st5" d="M490.3,620.7c1-0.1,3-0.3,4-0.4c0.9,1.7,1.7,3.4,2.4,5.2C493.6,625.4,490.7,624.1,490.3,620.7z"/>
+		<path class="st5" d="M1506.8,621.1c3.6,0.2,7.2,0.2,10.7,0.3c1.5,0.7,3.1,1.5,4.5,2.5c1,1.4,2.4,2.4,4.2,2.9c0-1.1,0-3.2,0-4.3
+			c0.4,1.1,0.9,2.1,1.4,3.2c1.4-0.5,2.7-1,4.1-1.5c0.3,0.3,1,0.9,1.4,1.2c-4.9,0.8-8.4,4.7-12.9,6.6c0.2-2.7,0.3-5.4,0.6-8.1
+			c-4.2-0.6-8.4-0.6-12.6-0.4C1507.8,622.8,1507.3,621.9,1506.8,621.1z"/>
+		<path class="st5" d="M225.4,625.1c2.1-1.4,5.2-3.1,7.2-0.7c2.7,2.1,0.4,5.3-0.4,7.8c3.1-0.7,5.9-2.2,9-3c2.9-0.4,4.9,2.3,6.8,4
+			c-2,1.6-4.6,2-7,2.2c1.2-1.3,2.6-2.3,4-3.4c-3.3-1.9-7.8-1.3-9.6,2.3c-1.6,1.9,0.5,3.7,1.6,5.2c-1,1-2.9,1.7-2.5,3.4
+			c0.4,1.4,1.1,2.7,1.8,4c0.4-0.4,1.3-1.2,1.7-1.5c0,0.8,0,2.3,0.1,3c1.1,0.2,2.2,0.2,3.3,0.3c-0.2,0.4-0.7,1.3-0.9,1.7
+			c-2.8,0-5.7,0.3-7.5,2.7c2,0.8,4.1,1.6,6.1,2.5c0.6-1.5,1.1-3.1,1.7-4.6c4.8,0.8,5.6,6.1,6.5,10.1c-0.5,2.3-2.1,4-3.3,5.9
+			c-1.5-0.9-3-1.8-4.5-2.7c-0.8,2.9-1.2,5.8-1.5,8.8c2.4-0.1,5,0.1,7.3-0.9c2.4-0.9,4.9-2.9,7.6-1.8c2.4,0.5,3.7,2.8,4.6,4.9
+			c-2.6-2-5.6-4.5-8.9-2.5c2.1,2.1,4.2,4.1,6.1,6.3c-0.5,2.7-1.2,6.2,1.4,8c2,0.7,4.2,0.9,6.3,1.4c0.3,0.3,0.9,1,1.1,1.4
+			c-2.9-1.3-6,0-8.8,0.9c-2.1,0-4.2,0.2-6.2,0.9c-0.6,0.2-1.9,0.6-2.6,0.8c0.4,1.2,0.8,2.4,1.2,3.6c-0.5-0.2-1.6-0.5-2.1-0.7
+			c-3.1,1.7-5.3,4.4-6.9,7.5c-0.5-1.1-1-2.3-1.5-3.4c-1.4,0.1-2.7,0.3-4.1,0.5c2.4-2.5,5.3-4.4,8.4-5.9c3.7-1.7,5.2-5.8,8.2-8.4
+			c0,0.9,0,2.8,0.1,3.7c1.8-0.2,3.6-0.5,5.4-0.7c-0.9-2.2-1.8-4.4-2.7-6.6c-0.7,0.8-1.4,1.6-2,2.4c-0.4-2.9-0.1-5.8,0.8-8.5
+			c-3.9,3.3-8.6,5.6-13.8,4.5c0.8,2.8,1.9,5.6,2.3,8.6c-1.3,0.8-2.8,1.5-4.2,2.1c-1.2,2.5-2.9,4.6-5.4,5.9c-1-2-1.9-4.1-2.9-6.1
+			c0.5-3.5,3.4-5.6,5.7-7.9c1.3,1.4,2.7,2.6,4.1,3.9c-0.4-2.8-0.4-5.7-0.2-8.5c2.5,0,5.2,0.6,7.6-0.2c1.5-0.9,2.5-2.3,3.7-3.5
+			c-3.3-1.2-6.8-0.3-10.2-0.3c-1.5-0.4-1.2-2.1-1.4-3.3c0.8-3,1.6-6.1,2.3-9.1c-1-2.1-2-4.1-3-6.2c-1.3,0.8-2.6,1.6-3.8,2.6
+			c1.2,2.3,2.9,5.1,1.6,7.8c-3.7,1.8-7.9,2.6-12,2.4c-2.9-0.6-3.5-4-4.1-6.4c-1.1,0.2-2.2,0.5-3.3,0.7c-0.2-0.5-0.6-1.3-0.9-1.8
+			c2.4-0.7,4.9-1.2,7.4-1.6c-0.2,2-0.7,4.1-0.6,6.2c0.3,1,1.5,2.1,2.6,1.5c3.2-0.9,6.3-2.3,9.5-3.2c-0.5-2.6-0.7-5.3-0.6-7.9
+			c-1.7,0-3.4,0.1-5,0.1c0.2-0.6,0.5-1.7,0.7-2.2c-1-1-2-1.9-3.1-2.9c0.3-1.1,0.6-2.2,0.9-3.2c-2,0.1-3.9,0.2-5.9,0.3
+			c0.1,3.5,3.2,5.6,5.5,7.7c-3.2-0.7-6.1-2.9-7.3-6c0.5-3.8,5.2-3.4,8.1-3.7c2.7-0.1,1.5,3.1,1.5,4.8c0.5-0.1,1.5-0.3,2-0.4
+			c1.2-3.2,2.8-6.3,3.2-9.7c-1.3-2.6-4-4.4-4.4-7.4c3.3-1.3,4.2-4.7,4.2-8C229.6,625.5,227.5,625.3,225.4,625.1 M232.2,645.4
+			c-1.9,1.1-1.3,3.9-1.2,5.7c1.2-0.4,2.5-0.8,3.7-1.4C235.3,648,234.2,645.4,232.2,645.4 M241.4,659.3c-0.2,1.5-0.3,3.1-0.3,4.6
+			c1.9-0.1,4.7-0.5,4.7-3C245.9,658.5,242.8,659.5,241.4,659.3z"/>
+		<path class="st5" d="M488.2,623.8c2.3,1.1,4.3,2.6,6,4.5c1.5-0.8,3-1.7,4.6-2.4c-0.2,1.4-0.4,2.8-0.6,4.3c1.9-1,3.9-2,5.7-3.2
+			c-1.1,1.2-1.8,2.6-1.2,4.3c2.3,1,3.4-1.3,4.8-2.7c0.2,2,0.5,4,0.7,6.1c-0.7,0.8-1.4,1.5-2.1,2.3c-0.9,1.1-1.7,2.3-2.5,3.4
+			c-1.8,1.7-4,2.8-6.1,4c-0.4-1.4-0.9-2.8-1.3-4.1c1.3-0.8,2.7-1.6,4-2.3c-0.2-2.3-0.4-4.6-0.6-6.9c-1.1,0.1-2.3,0.3-3.4,0.5
+			c0.4,1.6,0.9,3.2,1.3,4.8c-0.8,0.1-1.6,0.1-2.4,0.1c-2.8-2.3-4-5.9-5-9.3c-2.3,0.4-4.6,1-6.8,1.5c0.1-0.6,0.5-1.7,0.6-2.2
+			c0.2,0,0.6-0.2,0.8-0.2c0.5,0.1,1.6,0.2,2.1,0.3C487.4,625.6,487.8,624.7,488.2,623.8z"/>
+		<path class="st5" d="M1175.6,624.6c1.1-0.5,2.7-1,3.1,0.6c-0.5,1.6-1.4,3-2.2,4.4c0.6,0.9,1.3,1.7,2,2.6c-0.9,2.2-4.3,4.1-5.6,1.3
+			c0.4-0.2,1.3-0.7,1.7-1c-1.5-0.5-2.8-1.2-4-2.1c0.7-0.2,2.1-0.7,2.7-0.9C1174.1,627.8,1173.6,625.2,1175.6,624.6z"/>
+		<path class="st5" d="M1202.2,624c3.6-0.2,1.3,3.5,1.3,5.6c0.6,2.2,2.4,3.7,3.7,5.5c-2.1,1.9-3.8,5.3-7.1,5
+			c-0.2-1.2-0.4-2.3-0.6-3.5c-0.3-0.4-1-1.1-1.3-1.4c0.7-0.1,2-0.3,2.7-0.3C1200.3,631.1,1202,627.7,1202.2,624z"/>
+		<path class="st5" d="M1248.4,629.6c-1.7-1.8-0.5-4.5,0.5-6.4c1.6,1.6,2.8,3.6,3.1,5.9C1251.7,631.1,1249.4,630.2,1248.4,629.6z"/>
+		<path class="st5" d="M1544.2,624.2c0.7-0.9,4.8-1.2,3.8,0.7C1548.2,627.4,1541.8,626.6,1544.2,624.2z"/>
+		<path class="st5" d="M718.7,627.4c2.3,0.4,3.8,2.2,5.1,4C721.1,632,717.6,630.9,718.7,627.4z"/>
+		<path class="st5" d="M1711.2,631.2c0.9-0.9,1.8-1.7,2.7-2.5c2,0.5,0.9,3.2,1.1,4.6C1713.7,632.8,1712.4,632.1,1711.2,631.2z"/>
+		<path class="st5" d="M356.4,629.9c1.8,1.1,3.6,2.1,4.8,3.9c-1.4-0.2-2.7-0.4-4.1-0.6c-1.3,1.8-2.7,4-1.4,6.2
+			c2.3,0.4,4.7-0.4,7-0.8c-0.2-0.9-0.4-1.8-0.6-2.6c1.6,1.4,3.6,2.3,5.6,3.1c0.2-1.7,0.4-3.3,0.6-5c0.8,1.4,1.6,3.1,0.7,4.7
+			c-1.2,0.7-2.5,1.3-3.8,1.9c0,2,0.1,3.9,0.2,5.9c2.2-2.6,3.5-5.8,6-8c0.2,2.2,0,4.5,0.8,6.6c0.7,1.8,3,1.6,4.5,2
+			c1-4,1.7-9.2,6.4-10.3c-1.3,1.7-2.6,3.4-3.9,5c2.4,0.6,5,1.2,7,2.7c-1.3,1.1-2.6,2.2-3.9,3.3c-0.2-0.8-0.5-2.4-0.7-3.1
+			c-2.8,1.6-5.6,3.1-8.4,4.7c0,0.6,0,1.9,0,2.5c1.2,0.1,2.4,0.1,3.7,0.2c-1,0.8-2,1.8-3,2.7c2.4,0.1,4.7,0.2,7.1,0.3
+			c0.3,1.8,0.5,3.6,0.8,5.5c0.7,0.3,1.5,0.7,2.2,1.1c-2.1,0.8-3.9,2.2-4.7,4.4c-1.8-1.6-3.4-3.2-5.3-4.7c1.5,0.1,3.5,1,4.7-0.4
+			c1.4-1,1.3-2.8,1.7-4.3c-4.1,0.3-7.8-1.7-11.7-2c-1,3.1,2.6,4.3,4.4,6c-2.2-1-5.2-1.1-6.3-3.5c-0.6-1.9,0.9-3.5,1.7-5
+			c-0.5-0.5-1-1-1.5-1.5c-0.7,0.5-1.4,1-2.1,1.6c-0.4-0.1-1.3-0.4-1.7-0.6c0.8-0.8,1.6-1.6,2.4-2.5c0.2-1.7-1.2-2.7-2.5-3.4
+			c-1.3,0.7-1.9,2.1-2.6,3.3c-0.4-0.8-0.7-1.6-1-2.4c-1.4-0.1-2.8-0.3-4.2-0.4c-1-1.5-2-3-3-4.5
+			C353.2,637.5,354.8,633.7,356.4,629.9 M354.6,640.5c0,0.9,0,2.6,0,3.5c0.6,0.4,1.9,1.2,2.5,1.6c1.1-1.2,2.2-2.3,3-3.7
+			C359.2,639.7,356.5,640.8,354.6,640.5z"/>
+		<path class="st5" d="M794,632c3.2-1.2,6.7-0.2,10,0c0,0.4-0.1,1.2-0.1,1.6c-3.3,1.1-6.6,2.1-9.8,3.4
+			C793.9,635.4,793.5,633.7,794,632z"/>
+		<path class="st5" d="M244.1,638.7c2.9-1.5,5.9-3,7.9-5.7c1.6,3.3,3.2,6.6,4.5,10c-1.4-1.5-2.9-2.8-4.5-4.1c-0.5,2-1,4.1-0.8,6.3
+			c-0.6-0.2-1.8-0.8-2.4-1c-0.2-1.5-0.3-3-0.5-4.5C246.9,639.3,245.5,639,244.1,638.7z"/>
+		<path class="st5" d="M454.4,635.5c0.9-1.2,2.3-2,3.6-2.9c1.5,0.9,2.9,1.8,4.4,2.7l0.5,0.8c-0.6,0-1.8,0-2.4,0.1c0.2,2,0.4,4,1,5.8
+			c-1.1,0-2.7-0.4-3,1.2c0.1,2.1,0.8,4.2,1.2,6.3c-1.5-0.5-2.9-1.2-3.8-2.5C455.1,643.2,454.5,639.3,454.4,635.5z"/>
+		<path class="st5" d="M833.2,633.1c1.8-1.7,5.1,1.4,2.6,2.7C834,637.6,831.7,634.8,833.2,633.1z"/>
+		<path class="st5" d="M1193.1,633.1c1.8-1.7,4.6,0.9,2.7,2.8C1194.2,637.8,1191.4,634.9,1193.1,633.1z"/>
+		<path class="st5" d="M1727.3,632.7c1.4,2.7,3.5,4.9,5.7,7v0.9c-2.7-0.1-5.3-0.2-8-0.1c-2.3-0.5-4.3,1.3-3,3.6l0.1,0.7
+			c-0.5,0.1-1.4,0.3-1.8,0.5c-0.6-2.8-1.5-5.6-4.3-6.8c0.6-1.5,1.3-2.9,2-4.4c0.9,0.6,1.8,1.3,2.8,1.9c0.5,0.5,1.5,1.4,2,1.9
+			C1724.5,636.5,1726.1,634.8,1727.3,632.7z"/>
+		<path class="st5" d="M988.4,644.9c0.6-2.6,1.7-5.1,2.4-7.6c0.1,4.9,4.1,8.3,8,10.5c-2.6,0.4-4.9,1.7-6.9,3.2
+			C990.6,649,989.2,647.1,988.4,644.9z"/>
+		<path class="st5" d="M131.9,646.2c0.1-2,0.6-4,1.6-5.8c1.4,2.6,2.4,5.3,2.9,8.2C134.9,647.8,133.4,647,131.9,646.2z"/>
+		<path class="st5" d="M727.8,641.7c1.2,2.1,2.1,4.2,3,6.5c-1.7,0.9-3.4,1.2-5.1,0.4c-0.3-0.7-0.8-2-1-2.7c0.6-0.3,1.7-1,2.2-1.3
+			C727,643.9,727.5,642.4,727.8,641.7z"/>
+		<path class="st5" d="M149.4,644.4c0.5,1.6,1,3.2,1.5,4.9c1.6,0.2,3.3,0.5,4.9,0.8c0,2.9,0.2,5.8,0.4,8.7c-4-0.2-8.2,0-11.7-2.2
+			c0.9-0.2,2.9-0.7,3.8-0.9c-0.8-4-5.2-4.6-8.2-6.3c0.8-1.2,1.6-2.4,2.5-3.5c0,1.1,0,2.3,0.1,3.5c1.6,1.4,3.7,0.8,5.6,0.4
+			C148.7,647.9,149,646.1,149.4,644.4 M150.3,651.3c0.3,1.3-0.7,4.6,1.7,4.2c2.5,0.5,2.9-2.2,2.7-4
+			C153.2,651.4,151.8,651.4,150.3,651.3z"/>
+		<path class="st5" d="M1276.9,644.8c0.8,0.1,2.3,0.2,3.1,0.2c0.2,2.8,0,6,2.3,8c-1.1-0.3-2.2-0.6-3.3-0.8c-0.6,1-1.1,2-1.6,3
+			c-0.2-2.5-0.1-4.9-0.2-7.4c2.6,1.2,2.3-3.2-0.1-1.8L1276.9,644.8z"/>
+		<path class="st5" d="M1130.2,656c1.2-3.4,2.6-6.8,4.2-10.1c0.2,0.6,0.5,1.8,0.7,2.4c0.6,0.2,1.9,0.6,2.5,0.8
+			c0,1.1,0.1,2.2,0.2,3.3c-2.6,2.3-6.5,4.6-4.7,8.6c2,1.6,4.3,2.9,6.6,4c-0.5,1-0.8,2-1.1,3c1,1.2,2.2,2.3,3.3,3.4
+			c-1.3-0.2-2.6-0.5-3.8-0.8c-0.9-2.3-1.7-4.7-3.5-6.5c-0.5,1-0.9,2.1-1.4,3.1c-0.3-0.7-1-2-1.3-2.6c-1.2,1.2-2.3,2.4-3.5,3.6
+			c0.1-2.8,2.1-4.6,4.1-6.2C1132,659.9,1131.2,657.9,1130.2,656z"/>
+		<path class="st5" d="M695.2,647.1c1.3-1.7,2.4,1,2.5,2.1c0.6,1.6-1.1,2.5-1.9,3.6C695.2,651.2,693,648.4,695.2,647.1z"/>
+		<path class="st5" d="M1249.8,649.5c1.4-0.5,2.8-1,4.2-1.5c0.1,3.2,0.2,6.4,0.3,9.6c-2,0.5-4.1,0.9-6,1.7
+			c-0.4,5.6,3.8,10.1,5.3,15.3c1.3,0,2.7-0.1,4.1-0.1c-0.3,0.7-0.9,2-1.2,2.7c2.4,1.3,4.8,2.7,7.4,3.6c1.7-1.5-0.9-3.5-1.3-5.1
+			c1.8,0.5,5-0.2,5.3,2.4c0.8,3.8-2.8,6.2-5.6,7.9c-1.2,0.3-2.3,0.7-3.5,1.1c0.7,1,1.5,2,2.2,3c1.1-0.9,2.2-1.9,3.3-2.8
+			c1.6-0.3,3.1-0.9,4.6-1.4c0.5,1.7,1.9,3.9,0.3,5.5c-1.4,1.9-3.3-0.2-4.9-0.7c-2.2-0.1-4.3-0.4-6.3-1c-0.3,0.2-1.1,0.6-1.4,0.8
+			l-0.7,0.4c-0.5-4.6-2.5-8.8-3.8-13.3c-2.2-7.8-4.9-15.5-7.3-23.3c0.6-1.3,1.2-2.6,1.9-3.8c0.5-0.2,1.5-0.6,2.1-0.8
+			c-0.7,1.3-2.4,2.9-0.8,4.2c2-0.3,3.5-1.8,5-3.1C1252.2,650.6,1250.6,649.9,1249.8,649.5z"/>
+		<path class="st5" d="M1574.4,654.7c0.1-4.3,4.7-5.7,7.8-7.4c0.9,2.4,1.8,4.7,2.6,7.1c-0.1,1-0.4,2.9-0.5,3.9
+			c-1.9,0.3-4.2,2.1-5.8,0.3C1577.1,657.4,1575.7,656,1574.4,654.7z"/>
+		<path class="st5" d="M1290.8,652.2c1.2-0.8,2.5-1.3,3.8-1.8c2.1,6.2,4.3,12.3,6.3,18.6c-0.1,0.7-0.2,2.1-0.3,2.8
+			c-0.2,0.1-0.8,0.4-1,0.5c-0.7-1-1.3-2-2.1-2.9c-1.3-0.5-2.6,0.3-3.9,0.5c0.4-1.3,0.9-2.5,1.4-3.8c-0.7-0.8-1.3-1.5-1.9-2.3
+			c0.7-0.1,1.9-0.2,2.6-0.3c-0.1-0.5-0.1-1.4-0.2-1.8C1293.4,658.8,1289.4,656.1,1290.8,652.2z"/>
+		<path class="st5" d="M510.4,652.6c0.5-0.4,1.4-1.2,1.9-1.6c1.1,3.6,2.2,7.3,3.5,11c-1.5,3.1-4.5,4.8-7.6,6c0.1-0.5,0.2-1.5,0.3-2
+			c1.4-1.2,2.7-2.5,3-4.3c-0.6-0.1-1.8-0.4-2.4-0.5c-1-1.1-2.1-2.1-3.1-3.1c-0.5,1-1.1,2-1.6,3.1c-0.1-1.2-0.2-2.4-0.4-3.6
+			c1.2-0.8,2.5-1.5,3.7-2.3C508.6,654.3,509.5,653.4,510.4,652.6z"/>
+		<path class="st5" d="M356,654.5c0.6-0.6,1.3-1.1,2-1.6c1.2,2.2,3,3.9,4.3,6.1c0.3,3.5-0.8,7.1-2.1,10.3c-1,1.3-2.6,0.4-3.8,0.2
+			c0.8-1.5,1.7-2.9,2.4-4.5c-0.4-1.8-2.6-1.6-3.8-2.3c-0.9-2.6,1.2-4.2,3-5.7C357.3,656.1,356.6,655.3,356,654.5z"/>
+		<path class="st5" d="M18.3,655.3c0.3-0.3,0.8-1,1.1-1.3c0.1,2.6,0.4,5.4,3,6.8c0.2,0.2,0.7,0.6,0.9,0.8c0,1.8,0.1,3.7,0.2,5.5
+			c1.8-1.3,3.6-2.6,5.4-3.8c0.2,1.6,0.4,3.2,0.5,4.7c-2.2,0.8-4.3,1.6-6.4,2.4c-1-1.7-2-3.5-3-5.2C17.8,662.5,18.2,658.7,18.3,655.3
+			z"/>
+		<path class="st5" d="M251.6,653.3c3.6,1,6.7,3.7,10.6,3.3h0.4c0.9,2.3,1.9,4.6,3.1,6.8c-1.1,0.1-2.2,0.1-3.4,0.2
+			c0.1,2,0.2,3.9,0.3,5.9c1.9,0.1,3.9,0.2,5.8,0.3l-0.4,1.7c-2.3-0.2-4.6-0.4-6.9-0.6c-0.2-2.7-0.7-5.5-1.7-8c-2-0.4-4.1-0.7-6-1.3
+			C252,659,251.9,656.1,251.6,653.3 M254.4,660.5c1.2,1.7,3.7,0.6,5.4,0.3c-0.1-0.6-0.2-1.8-0.3-2.4c-1.6-0.8-3.2-1.6-4.9-2.4
+			C253.7,657.4,253,659.3,254.4,660.5z"/>
+		<path class="st5" d="M815.3,659.6c-1.4-1.1,0.1-3.5,1.6-3.5c1.5,0.6,2.8,1.6,4.2,2.5C819.3,659.1,817.1,661.2,815.3,659.6z"/>
+		<path class="st5" d="M1728.3,660.5c1.5-2,3.1-3.8,4.7-5.6v14.1l-0.4,0.1c-0.5-0.4-1.5-1.1-1.9-1.5c-0.7-0.1-2-0.2-2.6-0.3
+			c-1.4-0.2-2.9-0.3-4.3-0.4c-0.1-0.5-0.3-1.6-0.4-2.1c3.1-0.1,6.1-0.2,9.2-0.4c-0.5-1.4-0.9-2.7-1.3-4.1
+			C1730.4,660.3,1729,660.4,1728.3,660.5z"/>
+		<path class="st5" d="M715.2,657.4c0.7,0,1.9-0.2,2.6-0.2c0.4,1.8,0.7,3.6,0.9,5.4c-1-0.3-2.9,0.5-3.2-1
+			C715.2,660.2,715.2,658.8,715.2,657.4z"/>
+		<path class="st5" d="M4,657.6c1.6,2.1,3.1,4.3,4.8,6.3c0.5,0.2,1.6,0.7,2.1,0.9l0.6,1c-1.3,0.2-2.6,0.4-3.9,0.7
+			c-0.1,2,0,4.4-2.5,4.9c0.2-1.2,0.4-2.5,0.6-3.7c-1-1.2-2.5-2.1-3-3.6C2.4,661.8,3.4,659.7,4,657.6z"/>
+		<path class="st5" d="M722.9,658.5c2.3,0.4,4.6,1.1,6.9,1.8c-0.2,2.4-0.6,4.8-1,7.3c-0.5,1.3-1,2.6-1.5,3.9
+			c-1.1-0.9-2.1-1.8-3.2-2.7C723.6,665.3,722.6,662,722.9,658.5z"/>
+		<path class="st5" d="M1143.7,660.7c1.8-0.2,3.6-0.7,5.4-1.3c0.6,0.3,1.2,0.6,1.9,1c-2.8,0.8-2.6,3.4-2.6,5.8
+			c-2.8,0.4-3.9-1.7-4.7-4c-0.8,0.6-1.7,1.2-2.5,1.8c-0.4-1-0.9-2-1.3-3C1141.2,660.9,1142.4,660.8,1143.7,660.7z"/>
+		<path class="st5" d="M1146.2,672.2c1.8-3,3.8-5.8,5.9-8.6c0.5,0.7,1,1.3,1.5,2c-0.9,0.7-1.8,1.3-2.6,2c1.4,0.7,2.8,1.3,4.2,2
+			c-0.5,1.2-1,2.5-1.4,3.8c-1.4-0.9-2.7-1.7-4.1-2.6c-0.1,3-0.6,6-1.2,8.9c0.5,0.2,1.5,0.5,2,0.7c-0.5,0.6-1.4,1.9-1.9,2.6
+			c-1.7-2.2-3.2-4.5-4.8-6.8c0.5-0.1,1.5-0.3,2-0.4c-0.7-0.8-1.3-1.6-2-2.4C1144.5,673.1,1145.6,672.5,1146.2,672.2z"/>
+		<path class="st5" d="M0,666.3c2.7,0.9,2.2,4.2,0,5.4V666.3z"/>
+		<path class="st5" d="M470.5,670.6c0.9-2.6,3-4,5.7-4.5c-0.4,1.7-0.7,3.3-1.2,5c-0.2,0.3-0.6,1-0.9,1.4c2.2,3.8,6.1,6.1,9.9,8.1
+			c-1.1,0.6-2.2,1.3-3.2,1.9c-1.3-1-2.9-1.6-4.5-1.7c0.1,0.7,0.3,2.2,0.4,2.9c0.2,1.7,0.6,3.5,0.9,5.2c1,0.2,2.1,0.4,3.2,0.6
+			c-0.1,0.5-0.4,1.4-0.5,1.9c-0.3,1.3-0.7,2.6-1,3.9c-1.6-1.2-3-2.6-4-4.4c-2.3-4.1-5-7.9-7.5-11.8l-0.7-1.6c0.9,0,2.8,0.1,3.7,0.2
+			c0.4-1.5,0.7-2.9,1.1-4.3c-1,0.9-2,1.8-2.9,2.6c-0.8-0.9-1.6-1.8-2.3-2.7c-0.1-0.6-0.3-1.7-0.4-2.3
+			C467.6,670.8,469,670.7,470.5,670.6 M473.4,676.4c0,0.7,0,2.2,0.1,2.9c-0.4,0.9-0.7,1.7-1.1,2.6c1.4-1.6,2.8-3.2,3.5-5.2
+			C475.3,676.5,474.1,676.4,473.4,676.4z"/>
+		<path class="st5" d="M817.3,666.3c1.8,0.2,2,2,1.6,3.5c-1.3,0.5-2.5,0.5-3.8,0C814.2,668,815.5,666.5,817.3,666.3z"/>
+		<path class="st5" d="M12.1,666.7c0.9,1.5,2,3,3,4.4c-0.2,2.9-0.2,5.8-0.5,8.7c-3.2-1.8-6.7-2.9-10-4.5c2.6-1.2,5.4-1.8,8.2-2
+			C12.5,671.1,12.3,668.9,12.1,666.7z"/>
+		<path class="st5" d="M497.7,667.3c1.1,0.4,2.2,0.7,3.4,1.1c-0.3,1.3-0.5,2.5-0.7,3.8c-1.2,3.1,1.5,4.2,3.9,4.9
+			c-0.2,1.4-0.4,2.8-0.6,4.2c-0.8-0.4-1.5-0.8-2.3-1.1c-1.9-2.2-4.1-4.1-6.8-5.3c0,1-0.1,2.9-0.1,3.8c-1.3-1.8-2.6-3.6-3.8-5.4
+			c0.9-0.4,1.9-0.8,2.8-1.2c0.1-1.1,0.3-2.3,0.4-3.4c0.9,0.3,1.8,0.7,2.8,0.9C497,668.9,497.4,668.1,497.7,667.3z"/>
+		<path class="st5" d="M135.1,670c4.6-3,10-0.3,15-0.7c-1.5,1.2-2.8,2.6-4.2,4c2.3,1,4.8,0.8,7.2,0.7c0.2,0.1,0.8,0.4,1,0.6
+			c0.4,0.7,1.4,2.1,1.8,2.8c-1.3-0.7-2.6-1.4-4-2.1c-3.4,1-6.8,0-10-1.2c0.3,2.5-0.6,6.1,2.4,7.3c3.6-0.3,7.3-1.1,10.8,0.4
+			c-0.1,1.6-0.1,3.3-0.2,4.9c-1.6-0.6-3.3-1.3-4.9-1.9c0.4,1.5,0.9,3,1.4,4.6c-2.9,2.2-6.5,1.5-9.9,1.6c0.2-0.4,0.7-1.1,1-1.5
+			c2.6,0.1,5.2,0.1,7.8-0.6c-2.1-1.9-4.4-3.9-7.4-3.8c-1.8,1.2-3.4,2.8-4.9,4.3c0.5-1.4,2.1-3.1,0.7-4.5c-0.8-0.9-1.6-1.6-2.5-2.4
+			c-0.1-1.1-0.1-2.2-0.2-3.2c1.3,0.1,2.6,0.1,3.9,0.2c0.5-2.6,0.6-5.4-1.2-7.5c-3.9,0.8-3.2,5.7-5.4,8.3
+			C133.6,677,132.6,672.8,135.1,670z"/>
+		<path class="st5" d="M377,676.9c-0.6-3,1.1-5.6,2.8-7.8c0.4,2.6,0.5,5.2,0.5,7.9C379.4,677,377.8,676.9,377,676.9z"/>
+		<path class="st5" d="M513,669.2c1.2,0.5,1.7,1.8,2.6,2.6c1,0.3,2.1,0.6,3.2,0.8c-0.4,1.8-0.7,3.5-1.1,5.3c1.4,0.4,3.8-0.7,4.5,1.1
+			c-1.2,4.3-5,7.3-7.7,10.7c-0.5-1.4-0.9-2.7-1.3-4.1c1.4-1.2,2.8-2.3,4.2-3.5c-3,0.4-5.7,1.6-8.5,2.6c-1-1.5,1-3,1.5-4.4
+			c0.1-1.3,0.1-2.6,0.2-4c1.9,0,3.7,0,5.6,0c-1.1-1-2.2-2-3.3-2.9c-1.2-0.4-2.4-0.8-3.6-1.1c0.5-0.2,1.7-0.5,2.2-0.7
+			C511.8,671.1,512.6,669.8,513,669.2z"/>
+		<path class="st5" d="M1121.8,675c0.7-1.4,1.5-2.8,2.3-4.1c0,0.7-0.1,2.2-0.2,2.9c3.2-0.3,6.4-0.6,9.6-0.8
+			c-0.7,2.3-1.5,4.5-2.3,6.8c2,0.6,4.1,1,6.1,1.6c-0.4,0.4-1.3,1.3-1.7,1.7c0.3,1.8,0.7,3.5,1.3,5.2c-0.7,0.4-1.9,1.3-2.6,1.7
+			c-0.5,1.4-0.9,2.8-1.3,4.2c-2.5,1.4-5.1,2.9-7,5.1c1.4-0.2,2.7-0.4,4.1-0.6c1.2,0.4,2.4,0.7,3.6,1.1c1.4-1.4,3-2.6,5.1-2.8
+			c0.6,1.7,1.3,3.4,2,5c-0.7,0.9-1.3,1.9-1.9,2.9c-0.7,0.3-2.1,0.9-2.8,1.2c0.6,1.1,1.2,2.1,1.9,3.1c1.3-0.1,2.7-0.4,4.1-0.6
+			l-0.1,0.7c-2.3,2.1-5.4,2.2-8.3,2.5c0.4-1,0.8-1.9,1.2-2.9c-1.1-0.2-2.2-0.4-3.3-0.4c-1.2,1.3-2.1,2.8-3.1,4.2
+			c-1.1,0.1-2.3,0.1-3.4,0.2c0.6-1.1,1.2-2.1,1.9-3.2c1-1.5,2.4-3.6,0.7-5.2c-1.5-0.1-3-0.1-4.4-0.1c-0.4-2.5-0.6-5-1-7.5
+			c-0.7-2.3-1.9-4.4-2.9-6.6c1.2-1.4,3.8-2,3.7-4.2c-1.8-0.4-3.7-0.7-5.5-1c0.5-1.3,1.2-2.5,1.7-3.8c2.1,0,4.1-0.1,6.2-0.3
+			C1124.8,678.7,1123.1,676.9,1121.8,675 M1125.1,675.1c1.3,1.9,2.2,4.6,4.8,5c0-2-0.1-3.9-0.1-5.9
+			C1128.2,674.5,1126.7,674.8,1125.1,675.1 M1125.9,684c0.4,0.9,0.7,1.8,1.1,2.7c-2.8,0.4-4.4,2.8-6.2,4.7c3.3,1.7,7.2,1.2,10.7,2.5
+			c0-0.6,0.1-1.7,0.2-2.3c-1.1-0.2-2.1-0.3-3.1-0.5c-0.2-0.5-0.5-1.6-0.6-2.2c0.7,1.5,2.4,2.7,3.7,1
+			C1132.6,686.6,1128.9,683.8,1125.9,684 M1136.2,699c-0.6,1.6,0,2.1,1.7,1.7C1138.4,699,1137.9,698.5,1136.2,699 M1126.3,702.3
+			c2,1.1,3.9,2.4,5.9,3.6c1.8,0.1,1.9-2.1,2.7-3.3c-1.3-0.8-2.6-1.6-4-2.2C1129.2,700.5,1127.8,701.6,1126.3,702.3z"/>
+		<path class="st5" d="M719.2,672.6c1.2,0.5,2.4,1,3.6,1.5c0.4-0.1,1.3-0.4,1.7-0.6c0.1,0.6,0.4,1.9,0.5,2.6
+			c-2,3.7-4.1,7.3-6.3,10.9c-0.6-2.7,0.3-5.4,1.4-7.8c-1.1-1.8-2.2-3.6-3.2-5.4C717.6,673.4,718.7,672.9,719.2,672.6z"/>
+		<path class="st5" d="M1006.5,676.5c1.2-0.5,2.5-1.2,3.9-1c0.7,2,0.3,4.1-0.7,6c-1.2,0-2.5,0.1-3.7,0.1
+			C1005.8,680,1006.1,678.2,1006.5,676.5z"/>
+		<path class="st5" d="M1271.7,686.5c-2.6-3.6,0.6-7.6,2.4-10.8c0.5,0.3,1.5,1,2,1.3c-1.6-0.1-2.3,0.5-2.3,2c0.7,2,3,0.2,2.7-1.3
+			c0.6,1.2,1.2,2.5,1.8,3.8c-1.2,0.4-2.4,0.8-3.6,1.2c0.3,1.7,0.6,3.5,0.9,5.2c1-0.7,1.9-1.3,2.9-1.9c-0.2,1.1-0.4,2.3-0.5,3.4
+			c1.5-1.2,3-2.3,4.5-3.5c0-1.7,0-3.4,0.1-5.1c0.6,1.2,1.2,2.3,1.8,3.5c0.5-0.4,1.5-1.3,2-1.7c0,0.4,0.1,1.3,0.1,1.7
+			c-2.7,3-2.9,7.1-4.3,10.7c0-2.4-0.1-4.8-0.1-7.2c-0.3,0.2-1,0.8-1.4,1c-0.1,1.9-0.3,3.8-1.3,5.4c-1.6,1.9-1.4,4.2-0.3,6.2
+			c-1.1,0.8-2.1,1.5-3.2,2.3c0.2,0.7,0.5,2.2,0.6,3c-0.9,1.2-1.7,2.4-2.4,3.6c-1.3-0.9-2.7-1.7-3.9-2.6l-0.5-0.9
+			c2-2.6,2.8-5.8,3.2-9c-1.6-0.6-2.5-1.9-3.2-3.4c2-0.9,4-1.9,5.9-2.8c-0.8-2.1-1.5-4.4-2-6.6C1273,684.9,1272.1,686,1271.7,686.5z"
+			/>
+		<path class="st5" d="M0,679.6c1.6-0.8,3.3-1.4,4.9-2.1c0.4,0.6,1.2,1.9,1.6,2.5c-1.7,2.1-4.3,1.4-6.6,1.2V679.6z"/>
+		<path class="st5" d="M1563.5,681.3c2.8-1.4,5.3-3.9,8.7-3.3C1571.6,681.5,1566.1,684.5,1563.5,681.3z"/>
+		<path class="st5" d="M1550.2,682.3c0.6-1,1-2.7,2.6-2.2c1.4,1.2,0.8,3.2,0.6,4.9c-0.2,1.1-0.4,2.2-0.6,3.3
+			c-0.3-0.4-0.9-1.2-1.2-1.6c-1.5-0.5-2.9-1-4.3-1.5C1548.2,684.2,1549.2,683.2,1550.2,682.3z"/>
+		<path class="st5" d="M351.8,683.1c1.4-0.8,2.9-1.7,4.3-2.5c0.6,0.4,1.7,1.2,2.2,1.7c-1.5,1.6-3,3.1-4.3,4.9c-0.4,2.3,0,4.7,0.1,7
+			c-0.4,0-1.3,0-1.8,0.1C352.3,690.5,352,686.8,351.8,683.1z"/>
+		<path class="st5" d="M13.9,681.4c0.6,0.4,2,1.2,2.6,1.6c-0.4,1.6,0.2,3.7-1.3,4.9c-1.3-0.6-2.6-1.2-3.8-1.9
+			C12.2,684.5,13.1,683,13.9,681.4z"/>
+		<path class="st5" d="M972.9,683.1c1,0.3,2.1,0.7,3.2,1c0.4,3.5-1.7,6.4-2.9,9.5C972.5,690.1,972.5,686.5,972.9,683.1z"/>
+		<path class="st5" d="M521.2,686.1c1.3-1.1,3-1.5,4.6-1.6c0.7,1.3,1.5,2.6,2.5,3.8c-1.3,1.5-2.6,3.1-4.1,4.4
+			c-0.3,0.2-1,0.5-1.4,0.7c0.3-1,0.6-1.9,0.8-2.9c-0.4-0.3-1.2-1-1.6-1.3c-0.3-0.3-1-0.8-1.4-1.1
+			C520.8,687.7,521.1,686.6,521.2,686.1z"/>
+		<path class="st5" d="M352.1,702c2.3-3.2,4.8-6.3,8.2-8.3c0.1,0.5,0.3,1.4,0.4,1.9c-0.8,1.5-1.5,3.1-2.3,4.6
+			c2.3,1.4,4.9,2.6,6.2,5.1c-0.1,2.5-3,3.8-4.5,5.5c0.6,1.3,1.2,2.5,1.8,3.8c-1.1-0.5-2.3-0.9-3.4-1.4c-0.1,1.4-0.2,2.7-0.3,4.1
+			c-2.2-1.1-1.6-3.8-1.9-5.8c-2-0.6-3.9-1.1-5.9-1.6c0.1-0.7,0.4-2.1,0.6-2.8C351.5,705.4,351.8,703.7,352.1,702 M353.3,709.6
+			c4,2.1,6.6-2.2,9.1-4.6c-0.8-0.9-1.6-1.9-2.5-2.7C356.6,703.1,352.9,705.8,353.3,709.6z"/>
+		<path class="st5" d="M1257.7,694.6c1.7-0.2,3.4-0.7,5.1-0.5c0.8,0.9,1.5,1.9,2.2,2.9c-1.7-1.1-3.2,2-0.8,2c0.3-0.3,1-0.9,1.3-1.2
+			c0.2-0.5,0.6-1.4,0.8-1.8c0.8,0.3,1.7,0.5,2.6,0.8c-0.1,2.1-0.1,4.3-0.2,6.5c-1.1-0.3-2.2-0.6-3.3-0.9c-1.1,2.1-2.4,4.2-4.2,5.7
+			l-0.9-0.2C1259.6,703.3,1258.8,699,1257.7,694.6z"/>
+		<path class="st5" d="M1703.2,697.8c0.3,0.5,0.9,1.4,1.1,1.8c1.5-0.7,3-1.5,4.7-2c0.9,1,1.7,2.1,2.5,3.2c1.4-0.3,2.9-0.6,4.4-0.8
+			c0.1,0.5,0.4,1.5,0.5,2c-1.4,2-1.2,4.2,0.1,6.2c-0.7,0.8-1.3,1.5-1.9,2.3c0-0.5,0.1-1.4,0.1-1.9c-4.1,0.3-7.8-1.6-11.7-2.2
+			c0-1.9,0-3.9,0.1-5.8C1703.2,699.8,1703.2,698.5,1703.2,697.8 M1704.3,700.8c-0.2,1.8,0.7,3.4,1.7,4.9c2.4-1.2,3.4-3.4,3.3-6
+			C1707.7,700,1706,700.4,1704.3,700.8 M1710.2,702.2c-2.7,2.8,5.1,4.2,4.4,0.8C1715,700.8,1711.3,701.4,1710.2,702.2z"/>
+		<path class="st5" d="M0,700.1l0.7-0.2c2.2,0.9,1.4,3.6-0.7,4V700.1z"/>
+		<path class="st5" d="M22.8,703.4c1-2,2.5-3.5,4.9-3.4c-0.1,1-0.3,2.1-0.4,3.2c-1,0.2-2.1,0.5-3.2,0.7c-1.6,1.4-2.9,3.7-5.2,3.5
+			c-1.7-1-2.9-2.5-4.3-3.9c-0.9,0.9-1.8,1.8-2.6,2.7c0.5,0.6,1.1,1.2,1.7,1.7l0.6,0.5c-0.5,0.3-1.5,0.8-2,1
+			c-0.2,1.2-0.3,2.3-0.4,3.5c-1.9-3.2-5-5.2-7.9-7.3c0.6-0.5,1.1-1,1.7-1.4C10.4,699.8,17.4,701.8,22.8,703.4z"/>
+		<path class="st5" d="M522.7,699.6c0.3,0.1,0.9,0.3,1.2,0.4c0.3,0.1,1,0.3,1.4,0.4c-0.4,0.2-1.2,0.7-1.6,1c-0.4,1.8-0.7,3.6-1,5.4
+			c1.9,1.6,3.5,3.6,4.6,6c-0.2,1.4-0.4,2.9-0.6,4.3c-4.8,2.7-7.1,8-10,12.4c-2.4-1.6-4.7-3.2-7.1-4.7c0.8-0.9,1.6-1.7,2.4-2.6
+			c0.3,0.7,0.8,2,1.1,2.7c5.8-1.7,8.8-7.9,8.7-13.5c-1,0.1-2.8,0.3-3.8,0.4c0.2-0.2,0.7-0.7,0.9-1c0.4-0.4,1.2-1.2,1.6-1.5
+			c0.3-2.3,0.2-4.7-0.1-7.1C521.1,701.3,521.8,700.4,522.7,699.6z"/>
+		<path class="st5" d="M999.6,704.1c3.1,0.2,6.2,0.6,9.3,0.8c-0.6,1.4-1.2,2.8-1.8,4.2c2.3-1,4.5-2.3,6.8-3.2c3-0.9,4.8,2.2,6.1,4.2
+			c-2.2-1.1-4.4-2.3-6.6-3.5c-0.7,1.1-1.9,2-2,3.4c1.7,1.3,3.6,2.3,5.2,3.8c-0.6,1.1-1.4,2.2-2.1,3.3c-1.7,0.6-3.6,1-4.4,2.8
+			c-1.3-1.4-2.5-2.9-4.3-3.7c-1.3,0.2-2.4,1-3.5,1.6c1.2,2.9,2.1,6,1.6,9.2c-1.6-0.7-4.1-0.5-4.5-2.6c-0.6-2-0.7-4.1-1-6.1
+			c-1-0.5-2-0.9-3-1.3c0.3,1.1,0.5,2.1,0.9,3.2c-1.6-1.9-5.1-3.1-4.9-5.9c1.8-3.1,5.2-5.2,8.6-6.1c1,3.2,3.2,5.5,6.6,5.8
+			c1.2,1.2,2.5,2.4,3.8,3.7c-0.2-2,0.8-4.5-0.9-6c-2.2-2.4-4.4-4.8-7.6-5.7C1001.1,705.3,1000.4,704.7,999.6,704.1 M996.1,715.1
+			c1.3,0.9,2.6,1.8,3.9,2.8c0.9-1,1.8-2,2.8-3c-0.9-1-1.8-1.9-2.6-2.8C998.7,713,997.4,714,996.1,715.1z"/>
+		<path class="st5" d="M1116,709.2c2.1-0.3,4.1-0.8,6.1-1.7c-1.8,2.8-3,6-2.8,9.4c-1.9-0.8-3.8-1.6-5.7-2.3
+			c-0.5,0.6-1.4,1.7-1.9,2.2c-0.2-0.5-0.6-1.5-0.8-1.9c1.4-1.6,3-3,4.4-4.6C1115.3,710,1115.8,709.5,1116,709.2 M1116.3,710.3
+			c-1.5,1.3,0.8,3.7,2.1,2.2C1119.9,711.2,1117.6,708.9,1116.3,710.3z"/>
+		<path class="st5" d="M1384.3,722.2c4.4-4.5,8.1-9.8,11.3-15.2c0.3,1,0.6,2.1,1,3.1c0.4,0.3,1.2,1,1.6,1.3c0.4,0.3,1.1,0.9,1.5,1.2
+			c1-0.2,2-0.4,3-0.5c0.4-0.2,1.2-0.6,1.6-0.8c-0.1,2.3-0.1,4.7,0,7c0.1,0.4,0.2,1.3,0.3,1.7c-3,1-6.1,0.1-9-0.8
+			c1.4-0.5,2.8-1,4.3-1.5c-0.2-0.5-0.4-1.6-0.6-2.1c-0.5-0.1-1.6-0.1-2.1-0.2c-1.6,1.2-3.2,2.4-5,3.4c-2.5,0.1-3.3,2.3-4,4.4
+			C1386.9,722.9,1385.6,722.6,1384.3,722.2z"/>
+		<path class="st5" d="M1309.9,712.9c1.1-0.8,2.3-1.5,3.4-2.3l0.6-0.4c1.4,0.2,2.7,0.3,4.1,0.4c1.1,1.7,2.1,3.5,2.8,5.4
+			c-2.1,3.8-3.6,8.7-8.4,9.6c0.3-2.2,1.7-3.9,3.1-5.4c-1.8-0.3-3.6-0.7-5.4-1c-2,0-3.6,1-4.8,2.5c-1-1.3-1.9-2.7-2.8-4
+			c1.3,0.2,2.6,0.3,3.9,0.5c0.6-0.5,1.3-1,1.9-1.5c0.8,0.3,1.5,0.7,2.3,1C1310.5,716.2,1310.2,714.6,1309.9,712.9 M1313.8,719.3
+			c2.8,1,5.2-0.8,4.7-3.9C1315.8,714.8,1314.4,717,1313.8,719.3z"/>
+		<path class="st5" d="M1706.8,721c2.5-3.1,6.8-4.9,7.7-9c0.8,1.4,1.6,2.7,2.5,4c-0.4,0.5-0.7,1-1,1.5c2.3,0.2,4.7,0.2,7.1-0.2
+			c-1-1.7-5.2-3.2-2.9-5.3c0.4-0.2,1.1-0.6,1.5-0.8c4.6,0.7,2.5,5.8,2.4,8.9c-1.3,0.1-2.6,0.2-3.8,0.3l-1,0.1
+			c-1.7-0.1-3.3-0.3-4.9-0.5c-0.4,1.2-0.8,2.5-1.2,3.8c-0.9,0.9-1.8,1.8-2.7,2.6c-0.2,0-0.7-0.1-0.9-0.1c-0.3,1-0.6,1.9-0.9,2.9
+			l-0.5,0.2c0-0.6,0.1-2,0.1-2.6c0.1-1,0.3-2,0.5-3C1708,723,1707.4,722,1706.8,721z"/>
+		<path class="st5" d="M0,712.6c1.1,0.4,2.1,0.8,3.2,1.1c0.5,0.9,1,1.8,1.5,2.8c-1.6,0.1-3.1,0.3-4.7,0.4V712.6z"/>
+		<path class="st5" d="M1278.1,713.8c2.2,1.5,3.2,3.9,3.9,6.4c-2.6-0.8-5-1.8-7.4-3c0.8-0.8,1.5-1.5,2.3-2.3
+			C1277.2,714.7,1277.8,714.1,1278.1,713.8z"/>
+		<path class="st5" d="M1726.5,723.6c-0.2-3.5,2-6.2,4.2-8.7c0.6,0,1.7-0.1,2.3-0.2v2.5C1730.6,719.2,1728.3,721.2,1726.5,723.6z"/>
+		<path class="st5" d="M1287.4,722.5c3-0.7,5.8-1.9,8.5-3.4c-0.4,0.7-0.7,1.4-1,2.1c-0.8,1.6-1.6,3.3-2.1,5
+			c-0.1,0.4-0.3,1.2-0.4,1.6C1291,725.7,1289.3,724,1287.4,722.5z"/>
+		<path class="st5" d="M1619.2,724.8c1.7,1.1,4.7,1,5.6,3c-1.3,0.9-2.7,1.5-4.2,2.1c-0.3,1-0.6,2-0.9,3c-0.9-1.9-1.4-3.9-2-5.9
+			C1618.1,726.5,1618.8,725.4,1619.2,724.8z"/>
+		<path class="st5" d="M371.2,727.9c1.1-0.2,2.3-0.7,3.5-0.6c1.6,1.9,3.2,4,3.5,6.5c-1.6,2.2-3.5,4.1-5.2,6.2c1.5,0,2.9,0,4.4,0
+			c0.7-1.5,1.4-2.9,2.1-4.3c0.4,1.4,0.7,2.8,1.1,4.1c1.4,0.1,2.8,0.1,4.2,0.2c0.8-1.1,1.7-2.2,2.6-3.2c0.2,0.7,0.7,2.2,1,3
+			c2.3,0.3,4.6,0.7,6.9,1.1c-9.4,0.1-18.9-0.4-28.3,0c-0.2-0.9-0.4-1.8-0.6-2.7c2.3-1.2,5.5-2,5.9-5
+			C372.3,731.4,371.6,729.7,371.2,727.9z"/>
+		<path class="st5" d="M853.9,726.2c1.3,0.2,2.6,0.5,3.9,0.8c2.2,0.5,4.5,1,6.8,1.3c-0.6,3.3-2.7,5.7-5.5,7.4
+			c-1.6-2.1-6-4.8-2.6-7.5C855.6,727.6,854.8,726.9,853.9,726.2z"/>
+		<path class="st5" d="M1453,727.2c0.2,1.8,1.7,3.1,3.5,2.1l1.1-0.4c-0.8,2-1.5,4.2-3.2,5.7c0-1.2,0-2.5,0-3.7
+			c-1.8,0.1-3.7,0.2-5.4,0.2c0.7,1.6,1.4,3.3,2.2,4.9c-0.9,0.5-1.8,1.1-2.7,1.6c0.2,1.4,0.4,2.9,0.7,4.4c-1.4-0.1-2.8-0.2-4.1-0.3
+			c0-0.7,0-2.1,0-2.8c0-1.1-0.2-2.1-0.6-3.1c1.4-0.8,2.3-2.1,2.8-3.6c-1.2-1.5-4-2.8-2.3-5c0.5,0.5,1.4,1.6,1.9,2.1
+			C1449,729.3,1452.8,730.5,1453,727.2z"/>
+		<path class="st5" d="M179,727.7c2.2-0.1,4.3-0.1,6.5-0.1c-0.1,1.5-0.1,2.9-0.2,4.4c-1.1,1.1-2.1,2.2-3.2,3.3
+			C180.3,733.1,179.4,730.4,179,727.7z"/>
+		<path class="st5" d="M1115.2,728.3c0.7-0.2,2.2-0.7,2.9-0.9c-0.3,1.6,1.3,6.4-1.8,4.5C1116,730.9,1115.5,729.2,1115.2,728.3z"/>
+		<path class="st5" d="M1159.9,735.8c-2.5-2-5.4-4.5-4.4-8.1c0.7,0,2-0.1,2.6-0.2c2.9-0.1,5.8,0,8.7,0.1c-0.1,0.7-0.4,2.1-0.5,2.8
+			c0,0.3-0.1,0.8-0.1,1.1c-1.2,0.6-2.3,1.3-3.5,2c1.8,2.9-0.6,5.7-1.9,8.3c-0.4,0-1.2-0.1-1.6-0.2c-1.7-0.4-3.3-0.8-4.9-1.2
+			c0-0.4,0.1-1.3,0.1-1.8C1156.2,737.7,1158,736.8,1159.9,735.8z"/>
+		<path class="st5" d="M598.7,729.8c1.6,0,3.2,0,4.8,0.1c-0.2,2.8-1.8,4.5-4.5,4.8C598.8,733,598.8,731.4,598.7,729.8z"/>
+		<path class="st5" d="M1526.6,733.1c-0.1-1.4,0.4-2.5,1.5-3.3c-0.8,2.2,2.3,2.8,3.1,0.9c0.9,0.8,1.9,1.5,2.8,2.3
+			c-1.3,2.3-2.6,4.6-4.1,6.7c-0.7-1.2-1.7-2.3-1.9-3.7c0.5-1.2,1.8-1.8,2.8-2.6C1529.4,733.3,1528,733.2,1526.6,733.1z"/>
+		<path class="st5" d="M2.8,731.9c1.7,3.5,0.7,7.5,0.3,11.3c-1,0.1-2.1,0.2-3.1,0.3V737C1,735.3,2,733.6,2.8,731.9z"/>
+		<path class="st5" d="M1406.3,733c0.1-0.3,0.4-0.9,0.5-1.2c0.8,1.1,1.7,2.2,2.6,3.3c2.2-1,4.4-2.2,6.7-2.9c1.6,0.8,2.7,2.3,3.7,3.9
+			c-1.3,2.3-3.4,0.5-5.1-0.2c-2.1,0.4-4.2,0.9-6.3,1.4C1407.6,735.8,1406.9,734.4,1406.3,733z"/>
+		<path class="st5" d="M332.4,734.4c2.7-1.6,6-1.4,9-1.6c-3.1,1.4-6.4,2.4-9.3,4.2c3.4,1.7,7.5,1.8,10.4,4.4
+			c-3.4,0-6.8,0.4-10.2,1.1c-1.3-0.2-2.6-0.4-3.9-0.7c-0.1-0.4-0.4-1.1-0.6-1.5c1.2,0.1,2.4,0.2,3.6,0.3
+			C331.7,738.6,331,736.1,332.4,734.4z"/>
+		<path class="st5" d="M347.3,733.4c2-1.8,5.9,4.5,1.7,4C346.6,737.8,345.8,734.8,347.3,733.4z"/>
+		<path class="st5" d="M1537.3,733.5c0.4-0.2,1.3-0.7,1.8-0.9c-0.5,1-0.9,2-1.3,3c1.4,1.6,2.6,3.4,2.8,5.6l0,1
+			c-2.5,0.3-4.9,0.4-7.4,0.5C1535.4,740.1,1536.8,736.9,1537.3,733.5z"/>
+		<path class="st5" d="M1337.4,735.1c0.8-0.5,1.7-0.9,2.7-1.2c0.4,0.6,1.2,1.8,1.6,2.5c-1.4,0.5-2.8,1-4.1,1.4
+			c-0.4,1.5-0.7,3.1-1,4.6c1.6-1.1,3.1-2.3,4.7-3.4c0.6,0,1.9-0.1,2.6-0.2c0.1,0.6,0.2,1.8,0.2,2.4c-3,1.2-6.2,2.1-9.5,2.5
+			c0.1-1.6,0-3.2-0.2-4.7c-0.8,1.1-1.7,2.3-2.5,3.4c-2.9,0-5.7,0-8.6,0.1c0-0.7,0-2.1,0-2.8c-0.8,0.3-2.4,0.8-3.2,1.1
+			c1.7-2.8,4.9-3.2,7.9-3.7c0.8,1.6,1.8,3.1,2.8,4.5c0.6-0.8,1.2-1.6,1.8-2.4c-1-1.3-2.1-2.6-3.2-3.9c2,1.1,4.5,3.3,6.5,1.1
+			C1336.3,736,1337,735.4,1337.4,735.1z"/>
+		<path class="st5" d="M1711,734c1.4-0.5,2.4-0.1,3,1.1c-0.6,1.4-1.5,1.6-2.8,0.8C1711.2,735.4,1711.1,734.4,1711,734z"/>
+		<path class="st5" d="M855.9,734.9c1.7,0.7,4.3,1.6,3.1,4c0,1.6-2.5,0.8-2.7-0.2C856.1,737.4,855.9,736.2,855.9,734.9z"/>
+		<path class="st5" d="M115.9,738.9c1.2-1.3,2.4-2.5,3.7-3.6c0.3,2,0.7,4,1,6c-2,0-4.1,0-6.1,0C114.8,740.7,115.5,739.5,115.9,738.9
+			z"/>
+		<path class="st5" d="M0,750.1c2-3.2,5.9-2.4,8.4-0.2c-1.6-0.3-3.2-0.5-4.8-0.6c0.8,2.4,2.7,3.9,4.6,5.4c-0.7,0.1-2.1,0.2-2.8,0.2
+			l-0.9,0.4c-0.4,2.4-0.7,4.8-1.2,7.2c-0.4-3.8,1.3-9.3-3.2-11V750.1z"/>
+		<path class="st5" d="M1709.4,751.9c0.3-0.8,0.6-1.6,1-2.5c1.1,0.8,2.2,1.6,3.3,2.4c-0.4,0.6-1.2,1.8-1.5,2.3c2.3,3.9,7,3.3,10.9,4
+			c1.7-0.7,3.3-1.4,5-2.1l0.3-0.9c0.9-1.9,2.7-2,4.6-1.6v4.8c-3.9-2.5-7.8,1.5-11.8,1.9c-2-0.3-4-0.6-5.9-0.7
+			c-1.3-0.1-2.6-0.2-3.9-0.4C1710.8,756.8,1710.2,754.3,1709.4,751.9z"/>
+		<path class="st5" d="M1702.7,758.6c1.1,1.1,2.2,2.2,3.3,3.3c-0.3,0.7-0.8,2-1.1,2.6c-0.5,0-1.6,0.1-2.2,0.1
+			C1702.7,762.6,1702.7,760.6,1702.7,758.6z"/>
+		<path class="st5" d="M1723.8,765.3c1.8-2.6,4.7-4.1,7.6-5.4c0.5,1.4-0.9,4.9,1.7,4.5v14.1c-0.3-0.5-1-1.5-1.4-2
+			c-0.4-3.9-0.5-7.9-1.1-11.8c-0.9,0.9-1.8,1.9-2.7,2.9c-0.9-0.4-1.8-0.9-2.6-1.3c-1.3,0.9-2.5,1.8-3.7,2.7
+			c-0.8-0.8-1.6-1.7-2.4-2.5c-0.6,0.1-1.8,0.2-2.3,0.3c-1.4,0.2-2.8,0.3-4.2,0.4l-0.4-1l0.8,0.1c0.5,0,1.4,0.1,1.9,0.1
+			c0.9-1.1,1.8-2.2,2.7-3.3C1719.7,763.8,1721.8,764.5,1723.8,765.3z"/>
+		<path class="st5" d="M18.9,761.8c4.7,2.9,7.3,7.8,9.6,12.6c-0.2,0.9-0.4,1.8-0.6,2.7c0.5,0.3,1.5,0.9,2,1.2c0,2.3-0.1,4.5,0,6.8
+			c-4.4-0.8-9.1,0-13.4-1.8c0.5-1.6,1.1-3.2,1.2-4.8c-0.8-0.7-1.7-1.2-2.8-1.4c-1.7,0.7-2.8,2.4-4,3.8c0.7-2.2,1.4-4.3,2.1-6.4
+			c1.4-0.2,3.2-0.1,3.8-1.6C18.4,769.3,18.1,765.4,18.9,761.8 M20.3,770.6c1.2,0,2.5,0,3.7,0.1c-0.2-2.4-1.9-4.1-3.5-5.7
+			C18.8,766.5,19.9,768.7,20.3,770.6 M21.4,780.5c2.1,1.9,5,2.4,7.6,3.2c0.1-1.2,0.2-2.4,0.3-3.6c-2-1.2-3.6-2.9-4.7-4.8
+			C22.8,776.4,20,777.8,21.4,780.5z"/>
+		<path class="st5" d="M1704.4,776.1c1-1.5,3.4,0.3,2.4,1.8C1705.7,779.3,1703.3,777.5,1704.4,776.1z"/>
+		<path class="st5" d="M20.2,790.3c3.2,0.4,6.5,1,9.7,1.6c0,0.6,0,1.7-0.1,2.3c-2.6,0.5-5.2,1.2-7.8,0.9
+			C19.8,794.5,20.6,791.9,20.2,790.3z"/>
+		<path class="st5" d="M1702.7,794.3c0.5-0.2,1.6-0.6,2.2-0.8c0.3,1.2,0.1,2.3-0.5,3.4c-0.4,0.1-1.2,0.2-1.6,0.2
+			C1702.8,796.4,1702.8,795,1702.7,794.3z"/>
+		<path class="st5" d="M1726.7,805.8c1.5-0.3,3-0.3,4.6-0.4c0.4,0.7,1.1,2,1.4,2.7c-1.4,2.4-4.1,1-6.1,0.5
+			C1726.5,807.6,1726.6,806.7,1726.7,805.8z"/>
+		<path class="st5" d="M25,817.2c-2.7-0.9-1.2-4.7,1-5.1c0.9,0.5,1.8,1.1,2.6,1.8C27.6,815,27,817.9,25,817.2z"/>
+		<path class="st5" d="M39.8,821.3c2.9-0.1,5.8-0.1,8.6-0.2c0.5,1.5,1.1,2.9,1.6,4.4c-3.1,1.5-6.5,2.1-9.9,2.6
+			c-0.2,0.4-0.6,1.1-0.9,1.5c0.5,1,1.1,2,1.6,3.1c0.9,1.9,2.4,4,1.7,6.2c-1.3,2.3-3.1,4.2-4.6,6.3c1.5,1.2,2.9,2.3,4.4,3.5
+			c0.3,0.6,0.8,1.8,1.1,2.3H34c1.7-1.2,3.3-2.5,4.9-3.8c-1.7-2-3.5-3.9-4.6-6.3c1-1.5,3-1.8,4.6-2.5c0.2-2.6-1.3-4.4-3.8-5.2
+			c-0.5-0.2-1.5-0.7-2-1c-1.1,1.2-2.2,2.4-3.4,3.6c0.3,1,0.7,2,1,3.1c-2.3-2.7-5.6-4.1-9.1-4.7c0.1-0.9,0.1-1.7,0.2-2.6
+			c1.8-3.6-2.4-7.6,1-10.4l1.1,0.7c0.7,0.6,1.3,1.1,2,1.8c0,1.7-2,5,1,4.9c3.4-1.4,6.8-2.4,10.3-3.4C38.8,824.7,39,822.6,39.8,821.3
+			 M41.8,822.8c-1.5,1-2.4,2.8-3.7,4.1c-2.6,0.4-5.4,0-7.7,1.4c-2.1,1.2-4.6,1-7,1.2c0,1.4-0.1,2.7-0.1,4.1c1.7,0.3,3.5,0.6,5.2,1
+			c1.5-1.1,2.8-2.8,4.7-3.2c1.8,0.3,3.6,1,5.4,1.6c0.1-2,0.1-4.1,0.2-6.1c3.1-0.2,7.6,0.1,9-3.4C46,822.6,43.7,821.7,41.8,822.8z"/>
+		<path class="st5" d="M108.3,821.1c1.9,0,3.7,0,5.6,0c-1.1,1.2-1.8,3.4-3.8,3.1C109.3,823.2,108.7,822.2,108.3,821.1z"/>
+		<path class="st5" d="M134.7,820.8c2.5-0.1,5-0.1,7.5-0.1c1.4,5-2.9,9.5-7.6,10.2c-0.2-0.8-0.7-2.3-0.9-3.1
+			c1.6-1.2,3.2-2.4,4.8-3.7c-0.2-0.2-0.6-0.6-0.8-0.8C136.7,822.5,135.7,821.7,134.7,820.8z"/>
+		<path class="st5" d="M200,820.7c2,0,4.1,0,6.2,0c1.4,1.3,2.8,2.7,3.7,4.4c-1.8,0.9-3.8,0.5-5.8,0.4c1.4,3.3,2.7,6.6,4.1,9.9
+			c-2,1.6-4.1,3.1-6.1,4.5c0-2-0.2-3.9-0.4-5.8c1.4-0.7,2.9-1.4,4.3-2.1c-0.5-0.8-1-1.6-1.6-2.4c-0.4-0.4-1.1-1.1-1.5-1.5
+			c0.2-1.4,0.3-2.8,0.3-4.2C202.3,822.7,201.1,821.7,200,820.7z"/>
+		<path class="st5" d="M236,820.8c0.6,0,1.8-0.1,2.4-0.2c0,0.7,0.1,2.1,0.1,2.8c1.7,0.4,3.3,0.8,5,1.2c-0.1-1.3-0.2-2.6-0.3-3.9
+			c0.3,0,0.8,0.1,1.1,0.1c1.1,1.4,1.9,3.2,3.8,3.8c1.3,0.8,3.3,1,3.8,2.7c1.4,2.8-0.3,5.7-0.4,8.5c0.9,2.1,2.9,3.8,2.9,6.2
+			c-0.3,2.2-2.7,1.2-4.2,1.3c-0.2-2.2-0.3-4.3-0.5-6.4c-2.9,0.5-5.8,1.5-8.7,2.1c-2.8-0.4-5.4-1.6-8.1-2.2c0.4-0.6,1.1-1.7,1.4-2.3
+			c0.5,0,1.5,0,2,0c1.3-2.7,3.3-4.9,6.4-5.3c0-1.1,0-2.1,0-3.2c-2.4-0.5-4.9-0.8-7.4-1.2C235.5,823.5,235.8,822.1,236,820.8
+			 M244.8,826.5c0.7,1.4,2,2.8,1.9,4.4c0.2,1.5-0.8,3.8,1.3,4.3c2.2,0.2,3-2.7,3.4-4.4C251.9,827.5,247.8,824.8,244.8,826.5z"/>
+		<path class="st5" d="M287,820.9c2.5-0.1,5-0.1,7.5-0.1c-1.1,0.8-2.3,1.7-3.5,2.4C289,824,288.1,821.9,287,820.9z"/>
+		<path class="st5" d="M331.6,820.8c3.6,0,7.1,0,10.7,0c-0.5,1-0.9,2-1.4,3.1c-1.3-0.2-2.5-0.4-3.8-0.7c0.5,3.2,0.5,6.6,1.9,9.6
+			c1.4,0.7,2.9,1.2,4.3,2c0.9,1.2,0.5,3,0.8,4.5c-3.3-1.4-6.5-3.1-9.6-4.9c0-1.3,0-2.6-0.1-3.9c-1.2-1.5-2.6-2.8-3.5-4.5
+			C331,824.2,331.4,822.5,331.6,820.8z"/>
+		<path class="st5" d="M401.2,820.8c0.8,0,2.3,0,3.1,0c0.2,1.2,0.5,2.5,0.8,3.7c-1.2,0.1-2.3,0.2-3.4,0.2c-0.1,1-0.1,2.1-0.2,3.1
+			c-0.7,0.4-1.4,0.9-2.1,1.3c1.4,1.9,2.5,3.9,3.6,6c-2.8,1.5-5.9,2.4-8.3,4.3c-2.3,3.7-3.6,7.9-5.9,11.5h-0.1
+			c-0.7-1.5-1.4-3-2.2-4.5c-0.2-0.4-0.7-1.1-0.9-1.5c-1.7,0-3.4,0.1-5.1,0.2c-0.6-0.7-1.2-1.4-1.8-2c2.8,0.2,5.5,0.4,8.3,0.5
+			c-0.2-1-0.4-1.9-0.7-2.8c1.1,0.4,2.2,0.7,3.3,1.1c0.6-1.8,1.6-3.8,1.1-5.7c-2-1.3-4.7-1.4-6.1-3.4
+			C390.2,829.1,395.2,824.3,401.2,820.8 M388.4,832.3c1.2,1,2.6,1.4,4.2,1.4c0.4,1,0.8,2,1.2,3c1.7-0.2,3.4-0.3,5.1-0.9
+			c0.9-0.4,2.9-1.2,1.9-2.5c-0.7-1.3-2.2-1.9-3.2-2.8c-0.2-1.2-0.5-2.4-0.7-3.6C393.4,827.6,390.9,830.1,388.4,832.3z"/>
+		<path class="st5" d="M1184.6,821.2c0.7-0.1,2.1-0.4,2.8-0.6c0,0.5,0,1.5,0,2c-1.8,1.3-3.5,2.7-5.2,4.1c-0.8-0.8-1.8-1.5-2.3-2.6
+			c0.9-0.9,2.3-0.9,3.5-1.3C1183.7,822.3,1184.3,821.5,1184.6,821.2z"/>
+		<path class="st5" d="M1530.1,820.8c0.7,0,2.1,0,2.8,0c1.5,0.9,3,1.9,4.5,2.8c-1,0.7-2.1,1.4-3,2.1c-0.3-0.1-0.9-0.4-1.2-0.5
+			c0,0.4,0.1,1.1,0.1,1.5c-1.3-0.5-2.6-1-3.9-1.5c0,1.6,0.2,3.1,0.9,4.6c1-0.1,2.1-0.1,3.2-0.2c0,0.4,0.1,1.2,0.2,1.6
+			c0.1,0.7,0.3,2.1,0.4,2.9c-1.6-0.8-3.2-1.5-4.8-2.2c-0.9,1.1-1.7,2.2-2.6,3.2c-0.3-1.4-1.2-2.2-2.6-2.5c1.5-0.8,3.1-1.5,4.6-2.2
+			c-0.2-1.7-0.4-3.4-0.6-5.1c0.9-0.8,1.9-1.5,2.9-2.2C1530.7,822.5,1530.3,821.3,1530.1,820.8z"/>
+		<path class="st5" d="M1564.4,820.8c5.5,0,11-0.1,16.5,0.2c-2.1,2.3-5.2,1.2-7.8,1.5c-2.9,0.3-5.9,1.5-8.6-0.3L1564.4,820.8z"/>
+		<path class="st5" d="M1623.2,821c0.7,0,2,0,2.7-0.1c1.3,0.5,2.6,1.1,3.9,1.8c-0.1,2-0.2,3.9-0.3,5.9c-1.8,0-3.5,0-5.3,0
+			c2.1,1.7,3.1,4,2.2,6.7c-2.5-2.1-4.6-4.5-6.6-7C1621.6,826.2,1622.5,823.5,1623.2,821z"/>
+		<path class="st5" d="M1634.4,820.7c1.8,0.1,3.7,0.2,5.6,0.3c-1.2,1.4-2.3,5.8-4.7,3.8C1634.5,823.5,1634.2,822.1,1634.4,820.7z"/>
+		<path class="st5" d="M1679.7,821.1c1.7,0,3.4,0,5.1,0c1.2,2.4,2.2,4.8,2.7,7.5c-0.8,1.4-1.7,2.8-2.1,4.4c0.5,2,1.4,3.8,2.2,5.7
+			c-2.8,0.6-3.9-1.6-4.8-3.9c-0.1-0.4-0.3-1.2-0.4-1.6c-2.2,0.6-4.3,1.1-6.5,1.6c-1.2,0-2.4,0-3.6,0c-0.2-0.7-0.5-2.2-0.6-2.9
+			c0.8-0.5,1.7-1.1,2.5-1.6c2.3,0.6,4.8,1.4,7,0c2.7-1.5,2-4.8,2.2-7.3C1682.2,822.4,1680.9,821.7,1679.7,821.1z"/>
+		<path class="st5" d="M440.8,822.2c3.9-0.6,8-1,11.9,0.2c0.5,0.6,0.9,1.3,1.4,2c-2.1,0.8-4.1,1.6-6.1,2.5
+			C445.6,825.2,443,824,440.8,822.2z"/>
+		<path class="st5" d="M1399.1,822.1c0.8,0,2.5,0,3.3-0.1c-0.6,1.1-1.2,2.3-1.8,3.4c0.3,0.9,0.5,1.8,0.8,2.8c-0.8,0.7-1.7,1.3-2.5,2
+			C1398.8,827.5,1398.8,824.8,1399.1,822.1z"/>
+		<path class="st5" d="M272.3,826.2c2.5-0.9,4.8-2.1,7.1-3.3c-2.5,2.8-7.4,4.8-6.8,9.2c0.6,1,1.3,1.9,2.1,2.8
+			c-1.7,0.4-3.8,0.4-4.5,2.3c-1.9,4.3-1.6,9.2-1.3,13.8h-8.6c2.1-0.6,4.2-1.2,6.4-1.8c0.8-3.8,1.4-7.8,0.9-11.7
+			c-1.1-0.6-2.8-0.1-2.5,1.4c-0.3,2.1-0.3,4.4-1.4,6.3c0.1-3.2-0.1-6.5-1.3-9.5c2.8-0.7,5.8-0.9,8.4-2.2c1.7-1,1.2-3.3,0.7-4.8
+			c-2.4-0.9-5.1-0.8-7.7-1.1c0.5-0.8,1.1-1.6,1.7-2.4C267.8,825,270,826.1,272.3,826.2z"/>
+		<path class="st5" d="M1120.2,823.2c2,0.9,5.4,3.9,2.5,5.7C1119.8,829.3,1117.4,825,1120.2,823.2z"/>
+		<path class="st5" d="M1655.3,823c1.4,0.9,2.8,1.9,4.2,3c-0.5,0.9-1.3,1.7-2.2,2.3c-0.8-0.7-1.7-1.5-2.4-2.3
+			C1655,825.3,1655.2,823.8,1655.3,823z"/>
+		<path class="st5" d="M1256,826c2.1-0.4,4.2,0,5.4,2C1259.4,830.7,1256.6,828.4,1256,826z"/>
+		<path class="st5" d="M1300.7,826.1c1.2,0.4,2.4,0.9,3.6,1.3c0.4-0.4,1.3-1.3,1.8-1.7c0.1,0.8,0.3,2.3,0.4,3
+			c-1.1,0.7-2.1,1.4-3.2,2.1c0.4,0.2,0.9,0.3,1.4,0.5c1.5-0.3,3-0.6,4.6-0.9c0.1,1.5,0.3,3.1,0.4,4.7c1.1,1.5,2.3,3.1,0.9,4.9
+			c-3-1.9-6.1-4-7.7-7.3C1302,830.5,1301.3,828.3,1300.7,826.1z"/>
+		<path class="st5" d="M1607.9,827.1c0.6-1.2,1.7-1.5,3.2-1.1l0.2,0.8C1610.9,828.3,1608.1,829,1607.9,827.1z"/>
+		<path class="st5" d="M1000,826.8c2,0.4,3.3,2,4.5,3.6c0.8-0.1,1.7-0.2,2.5-0.3c0.4,0.8,0.8,1.7,1.1,2.5c-2.5,0-5.1-0.3-7.4-1.4
+			C999.8,830,1000.1,828.2,1000,826.8z"/>
+		<path class="st5" d="M730.2,828.2c1.8-0.3,3.7,0.8,3.1,2.8C731.7,833.4,728.6,830.3,730.2,828.2z"/>
+		<path class="st5" d="M1245.8,828.7c0.5-0.2,1.1-0.5,1.7-0.7c0.6,1.4,1.2,2.9,1.8,4.3c-3.1,0.7-6.3,1.1-9.4,1.5
+			c0.4-1.2,0.8-2.4,1.2-3.5C1242.8,830,1244.3,829.4,1245.8,828.7z"/>
+		<path class="st5" d="M98.8,831.2c1.4-0.3,2.8-0.5,4.2-0.8c0.9,0.5,1.9,1.1,2.9,1.7c1.2-0.6,2.5-1.3,3.8-1.7
+			c3.4,4.3,6.1,9.2,9.3,13.7c-0.4,0.1-1.1,0.2-1.5,0.3c-0.2,0.7-0.5,2-0.6,2.7c-0.9-1.3-1.9-2.6-2.9-3.9c-0.9,1.9-1.5,3.9-1.8,6
+			c-0.1,0.5-0.2,1.4-0.3,1.8h-3.7c0.8-3.4,1.4-6.9,1.7-10.4c-1.7-0.4-3.4-0.8-5.2-1.1c-0.4-1.3-0.8-2.6-1.4-3.9
+			c-2.4-0.8-5.5,0.9-7.5-1.2c1.8-0.4,3.7-0.7,5.5-1.1C100.4,832.6,99.6,831.9,98.8,831.2z"/>
+		<path class="st5" d="M1651.4,834.6c0.7-1.5,1.4-3,2.1-4.5c0.4,0.5,1.2,1.5,1.6,1.9c0.1,2.2,0.2,4.3,0.3,6.5
+			c-2.2-0.4-4.5-0.7-6.7-1.1c-0.3-1.1-0.6-2.1-0.9-3.1C1648.7,834.4,1650.5,834.5,1651.4,834.6z"/>
+		<path class="st5" d="M1203.3,832.8c1.1-0.5,2.1-1.4,3.4-1.3c0.6,0.7,1.3,1.4,1.9,2.2c-0.4,0.5-1.3,1.4-1.7,1.9
+			c-0.6,0.7-1.2,1.4-1.8,2.2c-1.4-1.2-2.8-2.5-4.1-3.7C1201.6,833.7,1202.7,833.1,1203.3,832.8z"/>
+		<path class="st5" d="M1502.9,830.9c1.7-0.1,3.7,0,3.7,2.2C1505.2,835.3,1501.6,833.2,1502.9,830.9z"/>
+		<path class="st5" d="M1510,830.9c0.8,0,2.2-0.1,3-0.1c0,0.9,0,2.6,0,3.4C1511,834.1,1508.4,833.4,1510,830.9z"/>
+		<path class="st5" d="M1254.2,832c0.9,1.6,0.9,4.4,3.3,4.3c0.3,2.2,0.7,4.4,1.1,6.6c-1-0.3-1.9-0.7-2.9-1c-0.1,3.1-0.9,6.6,1.5,9.1
+			h-19.8l0.2-1.2c0.2-1.2,0.3-2.4,0.5-3.6l0.2-0.9c0.5-0.9,1-1.8,1.5-2.6c1.2-0.3,2.5-0.5,3.8-0.8c0.6-2.8,2.2-7.8,6-6.1
+			c1.1,0.3,2.2,0.7,3.4,1C1253.3,835.2,1253.8,833.6,1254.2,832 M1241.9,849c3.8,0.9,7-2.2,10.6-3c0.4-2.4-0.7-4.2-2.4-5.6
+			c-0.7-0.5-1.3-0.9-1.9-1.3C1245.7,842,1241.3,844.7,1241.9,849z"/>
+		<path class="st5" d="M1273,833.2c0.4-0.3,1.1-0.9,1.5-1.2c0.4,1.2,0.8,2.3,1.3,3.5c0.9,0.1,1.8,0.2,2.7,0.3
+			c0.5-1.1,1.1-2.1,1.7-3.1c1.2,0.8,2.5,1.7,3.8,2.6c-0.4,1.1-0.8,2.2-1.2,3.3c-0.4-0.1-1.3-0.5-1.7-0.6c-0.4-0.2-1.2-0.4-1.6-0.6
+			c-2.6,2.6-6.2,2.5-9.6,2.5c-0.1,2.2-0.3,4.4-0.4,6.6c-2,0.4-3.9,0.8-5.8,1.2c1.2-0.6,2.4-1.3,3.6-1.9c-0.6-1.1-1.1-2.1-1.7-3.2
+			c-0.7-2.3,1.3-3.7,2.9-4.9c0.5-0.4,1-0.8,1.5-1.2c1.8,2.2,4.1,0.6,5.1-1.4C1274.6,834.6,1273.5,833.7,1273,833.2z"/>
+		<path class="st5" d="M89.8,846.2c-2.6-4-5.8-8.9-3.3-13.7c1,0.3,3.1,0.8,4.1,1.1c-2,2.8-2.4,7,0.7,9.3c1.5,1.2,3.1,2.6,3.2,4.7
+			C92.9,847.3,90.7,847.9,89.8,846.2z"/>
+		<path class="st5" d="M1260.8,832.8c1.3,0.1,2.6,0.3,3.9,0.5c0.1,0.2,0.2,0.6,0.3,0.8c-0.4,2.2-1.2,4.3-2,6.4
+			c-0.7-0.8-1.4-1.7-2-2.5C1260.9,836.3,1260.8,834.5,1260.8,832.8z"/>
+		<path class="st5" d="M187.4,835.1c1.6,2.6,0.1,5.7-0.2,8.4c2.4,0.9,4.7,1.9,7.1,2.9c-1.6,1-3.5,1-5.3,1.1c0,1.1-0.1,2.3-0.1,3.4
+			h-5.6c0.9-2.2,0.9-4.6,0.1-6.8c-2.1,1.6-4.1,3.2-6.2,4.9c0.2-2.7,0.5-5.5,0.3-8.2c-0.1-0.4-0.4-1.3-0.6-1.8c1.8,1.2,3.7,1.9,5.8,1
+			c-0.2-1.4-0.5-2.9-0.8-4.3c1,1.4,2.1,2.7,3.4,3.9C187.1,839,186.7,836.6,187.4,835.1z"/>
+		<path class="st5" d="M421.5,835.4c1.3-1.8,2.4,1.4,1.4,2.4c-0.2,2-3,3.8-4,1.3C419.5,837.7,420.4,836.5,421.5,835.4z"/>
+		<path class="st5" d="M1289.8,838.8c0.2-1.7,1.1-3.2,2.2-4.5c-0.2,1.3-0.5,2.5-0.7,3.8c1.5,0.1,3,0.2,4.5,0.2c-1,4,0,8,3,10.8
+			c-1,0.6-2,1.2-3,1.8h-5.2c1.8-1.5,3.4-3.1,5.2-4.6c-2.7-2.2-5.3-0.1-7.6,1.5c0.6,1,1.1,2.1,1.7,3.2h-4.8c1.7-2,2.9-4.4,0.9-6.6
+			c-0.4-0.9-0.8-1.8-1.2-2.7c0.5,0,1.5,0,2,0c1.1,0,2.2-0.1,3.4-0.1C1290.1,840.8,1289.9,839.4,1289.8,838.8z"/>
+		<path class="st5" d="M1489.1,834.6c1.5,0.2,3.1,0.1,4.6,0.7c0.9,2.4,0.5,5,0.6,7.5c1.3,1.2,2.6,2.5,3.9,3.7
+			c-1.5,0.4-2.9,0.9-4.3,1.4c2.1,1.4,4.6,2.2,7.1,1.4c-0.2-0.6-0.6-1.9-0.8-2.5c1.8,1.2,3.5,2.7,5.3,4.1h-13.7
+			c-0.5-1.5-1.4-1.8-2.5-0.7c1.1-1.5,2.2-3,3.3-4.5c-1.8-0.6-3.5-1.3-5.3-1.9c1,0,3,0.1,3.9,0.1c-1-1.3-2.1-2.6-3.2-3.8
+			C1488.5,838.3,1488.8,836.5,1489.1,834.6 M1490.5,836.3c-1.3,1.4,0.8,3.4,2.2,2.2C1494.3,837.2,1491.7,834.8,1490.5,836.3z"/>
+		<path class="st5" d="M129.4,839.3c1.5-1.1,3-2.4,4.7-3.2c2.1,0.1,1.1,2.2,0.9,3.6c-0.6,1.9-1.1,3.9-1.6,5.9
+			c-1.6,1.1-3.3,2.2-4.9,3.3c-1.9-1.3-3.8-2.6-5.7-3.9c2.1,0.4,4.3,0.8,6.4,1.1C129.3,843.8,129.4,841.5,129.4,839.3z"/>
+		<path class="st5" d="M984.3,836.3c3.1-2.5,4,2.5,1.8,4.2C983.6,841,982.8,837.9,984.3,836.3z"/>
+		<path class="st5" d="M1538.2,839.5c0.8-1.2,1.8-2.3,2.7-3.4c0.8,0.6,1.5,1.3,2.3,2c-1.2,1-2.5,2-3.7,3c0,0.4,0,1.3-0.1,1.7
+			c-0.1,1.5-0.2,3-0.3,4.5c-0.8,0.1-2.5,0.2-3.3,0.2c-0.4-0.6-1.2-1.9-1.7-2.5c1.2-1.2,2.2-2.5,3-4
+			C1537.6,840.6,1538,839.9,1538.2,839.5z"/>
+		<path class="st5" d="M515.2,837.1c1.3-0.4,2.6-0.5,4-0.3c0.1,1.9-0.1,3.8-1.2,5.4C516.8,840.6,514.9,839.2,515.2,837.1z"/>
+		<path class="st5" d="M1387.4,838.3c0.4,0.2,1.3,0.6,1.8,0.8c-1.8,2.2-3.8,4.3-6.1,6c-0.1-0.8-0.4-2.4-0.5-3.2
+			C1384.1,840.8,1385.8,839.5,1387.4,838.3z"/>
+		<path class="st5" d="M1414.9,839.2c1.1-0.7,2.2-1.3,3.3-2c0.7,1.7,1.3,3.4,1.9,5.1C1418.1,841.7,1416.4,840.5,1414.9,839.2z"/>
+		<path class="st5" d="M1564,838.3l0.7-0.6c1.6-0.2,3.5,0.3,3.2,2.3C1567.4,843.6,1559.7,840.6,1564,838.3z"/>
+		<path class="st5" d="M1660.6,837.7c-0.4,2.8-1.1,5.5-1.9,8.2c-0.8-0.6-1.5-1.1-2.3-1.6c0-0.5,0.1-1.6,0.2-2.1
+			c0.1-0.8,0.2-2.3,0.3-3C1658.1,838.6,1659.3,838.1,1660.6,837.7z"/>
+		<path class="st5" d="M1110.1,840.2c3.4-1.6,6.3,2.5,8,4.9c-0.7,2.6-3.6,2-5.6,2C1111.9,844.7,1110.6,842.5,1110.1,840.2z"/>
+		<path class="st5" d="M1058.5,840.8c2.6-0.7,6.1,1.6,5.7,4.4C1061.5,845.6,1059.6,842.8,1058.5,840.8z"/>
+		<path class="st5" d="M1080,841c2-1.2,3.3,0.8,4.6,2c-1.1,1.5-2.8,2.5-4.7,2.4C1079.8,843.9,1078.8,842.2,1080,841z"/>
+		<path class="st5" d="M1508.6,843.1c0.8-0.9,1.6-1.7,2.5-2.6c1.5,2,2.5,4.3,3.1,6.7C1511.6,847,1510.1,844.9,1508.6,843.1z"/>
+		<path class="st5" d="M71.5,844.7c3-0.1,6.1-0.7,8.7-2.2c0.5,0,1.5,0.1,2,0.1c0.2,0.9,0.3,1.8,0.5,2.7c-4.1,0.8-8.2,1.2-12.2,2.3
+			c-0.4,1.1-0.8,2.2-1.1,3.4h-5.4c0.2-1.4,0.4-2.8,0.8-4.2C66.7,845.3,69.3,845.2,71.5,844.7z"/>
+		<path class="st5" d="M232.4,842c2.6,0.7,4.1,3.5,6,5.3c-0.4,1.2-0.8,2.5-1.2,3.8h-0.4c-0.3-1.3-0.6-2.5-0.9-3.8
+			c-2.9,1-6.1,1.3-9,2.5c0.4-2.3,2.7-2.7,4.6-3.4C231.7,844.8,232,843.4,232.4,842z"/>
+		<path class="st5" d="M341.4,847.2c2.6-1.9,5.2-3.8,7.9-5.5c1.2,2,2.3,4.1,3.4,6.2c-2.1,1-4.2,2.1-6.3,3.1h-2.5
+			C343.1,849.7,342.4,848.3,341.4,847.2z"/>
+		<path class="st5" d="M1094.4,842.4c1-0.4,2.1-0.7,3.2-0.9c0.2,1.6,0.5,3.3,0.8,5c1.5,1.4,2.9,2.9,4.3,4.5h-7.2
+			c0.2-0.7,0.5-2.2,0.7-3c-0.6-0.3-1.9-0.9-2.6-1.2C1093.8,845.4,1093.5,843.7,1094.4,842.4z"/>
+		<path class="st5" d="M1676.3,842.7c0.3,0.2,1,0.5,1.3,0.7c1.5,0.8,3.1,1.7,4.6,2.6c-0.3,0.9-0.7,1.8-1,2.8
+			c1.4,0.2,2.9,0.6,4.4,0.6c2.3-0.3,2-3.4,2.8-5c1.1,0.8,2.3,1.6,3.5,2.4c-1.3,1.4-2.6,2.8-4,4.2h-13.8l-0.9-1
+			c-0.8-0.9-1.5-1.9-2.3-2.8c0.5-0.4,1.6-1.1,2.2-1.5c1.6,1.5,2.8,3.2,3.9,5c0.9-0.9,1.8-1.8,2.8-2.7c-1.3-0.5-2.6-1-3.8-1.6
+			C1676.2,845.2,1676.2,843.9,1676.3,842.7z"/>
+		<path class="st5" d="M1703.7,845.1c-0.3-4.2,4-0.1,4.5,1.8C1706.8,846.6,1703.3,847.5,1703.7,845.1z"/>
+		<path class="st5" d="M472.3,844.4c1.1-1.5,4.8-0.8,3.9,1.5C476,849,469.7,846.7,472.3,844.4z"/>
+		<path class="st5" d="M290,845.4c1.4-0.1,2.9-0.1,4.3-0.2c0.9,1.6,1.9,3.3,2.8,4.9c0.9-1.1,1.7-2.1,2.6-3.2
+			c0.2,1.4,0.5,2.7,0.8,4.1h-8.7c-0.1-1.2-0.1-2.4-0.1-3.7c-0.6-0.2-1.9-0.5-2.5-0.7C289.4,846.3,289.8,845.7,290,845.4z"/>
+		<path class="st5" d="M751.2,845.3c3.1-0.8,6.6-0.3,9.5,1.1c0.8,1.5,1.3,3.1,1.9,4.6h-14.2C749,849,748.9,846.2,751.2,845.3
+			 M749.8,849c3.5,0.4,7,0.6,10.5,0.6C758.9,845.3,751.6,844.7,749.8,849z"/>
+		<path class="st5" d="M877.2,845.1c1.8-0.7,5.2-1.4,6.1,0.9C883.6,849.9,876.1,848,877.2,845.1z"/>
+		<path class="st5" d="M1028.2,845.3c1.8,0.2,1.4,3.4-0.2,3.6C1026.2,848.7,1026.5,845.5,1028.2,845.3z"/>
+		<path class="st5" d="M1549.8,846.8c1.1-1.9,3.2-2.4,5.3-1.9c2.3,0.6,1,2-0.2,3.1C1553.1,847.7,1551.4,847.2,1549.8,846.8z"/>
+		<path class="st5" d="M1210.4,851c2.5-3.9,7.2-5.3,11.6-4.3c-0.8,0.7-1.6,1.4-2.3,2.2c-0.3,0.5-0.8,1.6-1.1,2.1H1210.4z"/>
+		<path class="st5" d="M1587.5,846.4c0.6-0.2,1.7-0.6,2.3-0.8c0,1.8-0.1,3.6,0,5.3h-9c-1.2-0.9-2.4-1.8-3.5-2.7
+			c3.1-0.1,6.2,0.2,9.3,0.6C1586.8,848.3,1587.3,847,1587.5,846.4z"/>
+		<path class="st5" d="M1651.9,848c0.5-1.2,1.9-1.4,2.9-1.8c0,0.9,0,2.8,0,3.7c-0.5,0-1.4,0-1.9,0
+			C1652.6,849.4,1652.1,848.4,1651.9,848z"/>
+		<path class="st5" d="M1661.9,848.8c1.1-1.3,2.5-2.4,4.1-3.1c-0.1,1.4-0.2,2.9-0.3,4.3C1664.4,849.6,1663.2,849.2,1661.9,848.8z"/>
+		<path class="st5" d="M152.4,847.5c0.4-0.3,1.1-0.9,1.5-1.2l1.1,0.6c0.3,1.4,0.6,2.7,1,4.1h-3l-0.9-1
+			C152.1,849.4,152.3,848.1,152.4,847.5z"/>
+		<path class="st5" d="M487.4,847.4c2.2-1.3,2.2,2.4,3.3,3.6h-5.3C486,849.8,486.2,848.2,487.4,847.4z"/>
+		<path class="st5" d="M1608.4,851c1.8-1.5,3.5-3,5-4.7c1,0.6,2,1.1,3,1.7c0.5,1,1.1,2,1.6,3H1608.4z"/>
+		<path class="st5" d="M1731.4,846.9l1-0.2l0.6,0.7v2.7C1731.2,850.7,1730.1,848,1731.4,846.9z"/>
+		<path class="st5" d="M80.2,851c1.3-1.5,2.6-3.4,4.8-3.5c0.4,1.1,0.8,2.3,1.1,3.5H80.2z"/>
+		<path class="st5" d="M158.1,851c1.7-1,3.6-1.9,5.4-2.7c0.6,0.9,1.2,1.8,1.8,2.7H158.1z"/>
+		<path class="st5" d="M1120.4,851c1.4-1.2,2.6-2.9,4.5-3.2c0.6,1,1.2,2.1,1.8,3.2H1120.4z"/>
+		<path class="st5" d="M1401.7,847.5c2.2,0.8,4.2,2.1,6.1,3.5h-4.9C1402.4,849.8,1402.1,848.7,1401.7,847.5z"/>
+		<path class="st5" d="M1425.2,851c1.6-1,3.1-2.1,4.7-3.2c0.1,0.8,0.4,2.4,0.6,3.2H1425.2z"/>
+		<path class="st5" d="M1522.2,847.8c1.3,0,2.7,0.1,4,0.2c-0.4,1-0.8,2-1.2,3h-3.4C1521.8,850.2,1522.1,848.6,1522.2,847.8z"/>
+	</g>
+	<g id="_x23_8a9eb6ff">
+		<path class="st6" d="M349.8,0h9.6c-0.6,0.2-1.9,0.5-2.5,0.6c-0.7,0.2-2.2,0.4-2.9,0.6c-0.3,0.5-0.8,1.6-1.1,2.2
+			c1.6,0,3.1,0,4.7-0.2c0.1,0.3,0.2,0.9,0.3,1.2c-1.4,0.6-2.6,1.4-3.8,2.3c0.7,0.5,2.2,1.4,2.9,1.8c-0.8,1.7,0.6,3,1.5,4.3
+			c1.2-0.6,2.4-1.1,3.6-1.5c2.2-0.1,3.6,3.3,5.9,1.9c1.6-0.9,2.8-2.3,4.1-3.6c-2.4-0.1-4.6,1-6.8,1.8c0-0.8,0-2.3,0-3
+			c2.6-0.4,4.8-1.6,5.8-4.2c-0.7-0.9-1.4-1.9-2.1-2.8c2.7,0.8,5.4,1,8.2,1c-0.3-0.6-0.9-1.8-1.1-2.4h8.6c-1.7,0.7-3.3,1.5-5,2.2
+			c0.3,1.5,0.6,3.1,0.8,4.6l-0.4,0.2c-0.5-1.7-0.9-3.7-3-3.9c0,0.8-0.1,2.3-0.1,3c-0.7-1.2-1.5-2.4-2.2-3.6
+			c-0.5,2.8-0.3,5.6,0.1,8.3c-2,2.2-3.6,4.7-5.1,7.3c-2.2-0.2-4.3-0.5-6.5-0.6c0.1-0.5,0.4-1.5,0.5-1.9c-1.7-0.1-3.4,0-5,0
+			c0.1-0.3,0.3-0.9,0.4-1.2c-2.7,0.4-5.5,1-7.8,2.5c-0.3-0.2-0.9-0.5-1.1-0.7c-0.8,0.1-2.4,0.3-3.2,0.4c-0.1-0.4-0.4-1.2-0.5-1.5
+			c2.8-0.4,5.6-0.9,8.4-1.5c0-2.6,0-5.4-2-7.4c-1.1,0.6-1.9,1.6-2.8,2.4c-0.9-0.8-1.6-1.6-2.5-2.4c0.5-0.6,1.1-1.1,1.6-1.7
+			C349.3,2.9,349.6,1.5,349.8,0 M367.3,14.3c-3.3,1.4,1.9,4.4,2.5,1.5C370.9,14.2,368.5,13.2,367.3,14.3z"/>
+		<path class="st6" d="M391.2,0h3.1c1.5,0.9,2.6,2.8,4.5,2.8c1.4-0.7,2.5-1.8,3.8-2.8h0.7c1.4,1.6,3.2,2.5,5.3,1.8
+			c-0.8,1.1-1.5,2.2-2.2,3.4c0.9,0,2.8,0,3.7,0c-1.8,0.9-3.1,2.2-4.5,3.6c0.9-1.1,0.1-3.1-1.5-2.6c-1.6,0.4-1.1,2.4,0,3.1
+			c-0.7-0.1-2-0.3-2.7-0.4c-0.2-0.6-0.7-1.9-0.9-2.6c-1.7,0.4-3.3,0.8-5,1.2c1.8,3.5,6.2,2.7,9.5,3.4c2.3,0.1,4.2,1.6,6,2.9
+			c-2.6,2.4-6.2,2.5-9.5,3.2l1.1-1.6c-2.5-0.8-4.4,0.4-5.5,2.8l-0.2,0.3c-0.7-2.5-2.9-4.1-4.6-5.8c0.9-2.4,1.6-4.8,2.3-7.3
+			c0.1-0.6,0.5-1.7,0.6-2.3C394,2.1,392.6,1,391.2,0 M396.4,4.3c-1.3,2.2,3.1,2.6,3.3,0.5C399.6,3.2,397.2,3.3,396.4,4.3
+			 M395.1,12.8c1.9,1.9,4.5-0.5,6.3-1.6C399.2,10.2,395.8,9.9,395.1,12.8 M405.2,13.1c-1.1,1.5,1.5,3,2.5,1.7
+			C408.9,13.3,406.3,11.8,405.2,13.1z"/>
+		<path class="st6" d="M448.2,0h3.7c0.8,1,1.6,2,2.4,3.1C452.1,2.3,450.1,1.2,448.2,0z"/>
+		<path class="st6" d="M465.1,0h9.5c-1.8,1-3.4,2.7-5.5,3C467.6,2.2,466.4,1,465.1,0z"/>
+		<path class="st6" d="M634,0h2.7C638,3,632.6,3,634,0z"/>
+		<path class="st6" d="M1197.9,0h12.7c-0.3,0.4-1,1.1-1.3,1.4c-0.6-0.2-1.8-0.6-2.4-0.8c-1.5,1.8-2.9,3.7-4.7,5.2
+			C1200.5,4,1199.2,2,1197.9,0z"/>
+		<path class="st6" d="M1297.2,0h4.7C1300.9,1.8,1297.9,2.3,1297.2,0z"/>
+		<path class="st6" d="M1320.3,0h2.6c-0.5,2.8-0.5,5.6-0.4,8.4c-0.4,0.4-1.3,1.2-1.8,1.6c1.3,1.3,2.6,2.7,3.9,4
+			c-1.6,0.5-3.2,0.9-4.8,1.4c-0.9-1.7-1.7-3.4-2.6-5.1c1-0.8,2-1.7,3-2.5C1320.3,5.3,1320.3,2.7,1320.3,0z"/>
+		<path class="st6" d="M1340.5,0h2.8c0.5,2.4,3.6,1.7,4.6,0h11.4c-1.2,0.6-2.4,1.3-3.6,2c0,0.9-0.1,2.7-0.1,3.7
+			c-0.6-1.6-1.1-3.2-1.8-4.8c-0.7,0.2-2.1,0.7-2.8,0.9c1,1.5,2,3,3,4.5c-0.9,0.6-1.9,1.3-2.8,1.9c-0.6-0.9-1.2-1.8-1.7-2.7
+			c-1.1,0.5-2.2,0.9-3.3,1.4c-1-1.3-2-2.5-3-3.8c-2.1,1.2-4.3,1.7-6.6,0.8C1337.9,2.5,1339.2,1.2,1340.5,0z"/>
+		<path class="st6" d="M557,1.4c0.7-0.1,2.2-0.2,3-0.3c0.3,0.9,0.7,1.9,1,2.8c-0.5,0.3-1.6,0.9-2.2,1.2C556.5,5.6,557.3,2.7,557,1.4
+			z"/>
+		<path class="st6" d="M611.3,1.2c1.2-0.5,2.1-0.3,2.9,0.7c-0.6,1.3-2.3,2.9-3.4,1C610.9,2.5,611.1,1.7,611.3,1.2z"/>
+		<path class="st6" d="M1241.5,3.1c1.6-0.8,3.2-1.5,4.8-2.2c0.1,0.5,0.3,1.4,0.4,1.9c1.3,1.3,3,2.3,3.5,4.2
+			c-2.4,2.7-5.8,4.3-8.5,6.6c1.8,0.2,3.6,0.4,5.4,0.6c-2.1,2.7-3.5,5.9-4.5,9.2c-1.7,0.4-3.4,0.8-5.1,1.1c-2.8-0.1-5.5,0.1-8.2,0.4
+			c0.1-1.1,0.2-2.2,0.3-3.4c-2.6-1.4-5-3.3-4.6-6.6c1.9,0.7,3.9,1.4,5.6,2.5c1.4,1.7,1.8,3.9,2.8,5.9c1.6-1.3,1.8-3.3,2-5.3
+			c0.4,0.5,0.8,1.1,1.2,1.6c0.4-1.8,0.8-3.5,1.1-5.3c-0.6-0.2-1.9-0.6-2.5-0.7c0.1-1.6,0.1-3.2,0.1-4.8c1.8-1.8,4-2.7,6.4-3.3
+			C1241.7,4.8,1241.6,3.9,1241.5,3.1z"/>
+		<path class="st6" d="M804.3,2.3c1.6-0.4,2.2,0.1,1.6,1.7C804.2,4.5,803.7,3.9,804.3,2.3z"/>
+		<path class="st6" d="M363.1,3.3c1.8-0.6,2.3,2.2,0.6,2.6C361.8,6.8,361.2,3.6,363.1,3.3z"/>
+		<path class="st6" d="M490.4,6.3c1.5-1,3-2,4.5-3c-0.5,3.7-1.5,7.3-2.6,10.8C490.1,12.1,490.5,8.9,490.4,6.3z"/>
+		<path class="st6" d="M503.3,7.3c1.5-1.7,1.8-5.4,4.8-4.6c1.7,0.8,3.2,1.8,4.8,2.7c-0.4,1-0.8,2.1-1.2,3.1
+			c-0.6,0.1-1.6,0.2-2.2,0.3c0.2-1.3,0.5-2.7,0.7-4.1c-3.1,1.1-5.6,3.4-7.4,6.1c-1,1.6-3.2,0.7-4.7,0.6C499,9.4,502.3,9.5,503.3,7.3
+			z"/>
+		<path class="st6" d="M628.6,3.9c2.8,0.7,1.8,4.1,2.3,6.2c-1.2-0.1-2.5-0.2-3.7-0.4C627.7,7.8,628.1,5.9,628.6,3.9z"/>
+		<path class="st6" d="M587.1,12.1c0.7-2.1,0.7-4.7,2.7-6c1.8,1.8,0.1,4.6,0,6.8C588.9,12.6,588,12.4,587.1,12.1z"/>
+		<path class="st6" d="M1226.2,9c0.7-1.9,3.8-3.9,5.4-1.7c1.9,2.2,0.2,5-0.6,7.3C1229.2,13,1226.9,11.5,1226.2,9z"/>
+		<path class="st6" d="M341.1,7.5c0.8,0,1.7,0.1,2.5,0.2c0.5,0.2,1.6,0.5,2.2,0.6c-0.6,0.8-1.1,1.6-1.7,2.3c-2.5-1-5.2-1.7-7.9-1.1
+			c0.1,0.5,0.4,1.6,0.5,2.2c-1.5,0.2-2.9,0.6-4.3,0.9c1.1,0.9,2.3,1.8,3.5,2.6c-2.1,1.2-3.8,3-4.6,5.4l-0.4-0.1
+			c-0.1-1.3-0.2-2.6-0.3-3.8c-1.4,0.2-2.7,0.4-4.1,0.6c0.4-2.4,0.8-4.9,1.3-7.3c0.7,1,1.4,2.1,2,3.1c1.6-0.8,3.2-1.7,4.9-2.5
+			c-0.6-0.5-1.1-1-1.7-1.4c1.3-0.3,2.5-0.6,3.8-0.9c0.5-0.1,1.4-0.3,1.9-0.3C339.3,7.8,340.5,7.6,341.1,7.5z"/>
+		<path class="st6" d="M1265.5,7.2c0.1,0.2,0.4,0.7,0.5,0.9c-0.2,1.6-0.6,3.1-0.9,4.6c0.2-0.1,0.7-0.4,1-0.5
+			c1.7,1.5,3.7,2.5,5.7,3.4c-2.8,1.4-6,1.4-8.5-0.7c0.3-0.9,0.5-1.8,0.8-2.7c-1.4-0.5-4,0.1-3.6-2.1C1262.3,9.1,1265,9.6,1265.5,7.2
+			z"/>
+		<path class="st6" d="M476.1,11c0.2-1.9,2.3-2.4,3.8-3.1c-0.4,2.6-0.2,5.8-2.8,7.2C476.6,13.8,476.2,12.4,476.1,11z"/>
+		<path class="st6" d="M384.3,15.3c2.7-2.1,2.9-7,7.1-6.9c-1.5,1.6-2.9,3.1-4.4,4.7c0.7,0.3,2.2,1,2.9,1.3c-1.1,2.1-2.2,4.3-3.3,6.4
+			c0.2,0.2,0.5,0.5,0.7,0.7c0.5,0.5,1.5,1.4,2,1.9c0.4-0.1,1.3-0.2,1.8-0.2c-0.9,0.8-1.7,1.7-2.5,2.5c-4.4,0.2-8.8-0.9-13.2-0.5
+			c-0.8-2.3-1.6-4.5-2-6.9c2.3-0.1,4.1,1.5,6,2.5C380.5,18.5,382.3,16.8,384.3,15.3 M380.2,21.2c1.8,0.8,3.7,1.4,5.7,1.8
+			c-0.5-0.9-1.1-1.9-1.6-2.8c1.7-1.2,3.7-2.4,3.1-4.9C384.5,16.4,382,18.5,380.2,21.2z"/>
+		<path class="st6" d="M584.1,8.6c2.8,0.8,2.4,4.2,3.1,6.4c-1.4,0.3-2.8,0.6-4.1,0.8c0.4-1.1,0.9-2.2,1.3-3.4
+			C584.3,11.2,584.2,9.9,584.1,8.6z"/>
+		<path class="st6" d="M619.9,13c-0.2-2.2,1.1-3.5,3.1-4.1c0.8,1.6,1.5,3.2,2,4.9C623.3,13.5,621.6,13.2,619.9,13z"/>
+		<path class="st6" d="M1341.4,10.4c3.5-1.2,6.2,2.6,8.8,4.4c1.2,0.6-0.2,2.7-1.2,2c-3.2-1.2-6.3-3.2-8.4-5.9L1341.4,10.4z"/>
+		<path class="st6" d="M793.2,12.4c1.3-1.4,3.6,0.8,2.2,2.1C794.1,16,791.7,13.7,793.2,12.4z"/>
+		<path class="st6" d="M1373.5,13.2c1.4,0.8,2.9,1.5,4.4,2.2c0.2,1,0.5,2,0.7,3c-0.2,1.2-0.4,2.4-0.7,3.5c2-0.1,4-0.2,6.1-0.4
+			c1.4,1.3,2.9,2.6,4.3,3.9c-1.8,0-3.5-0.1-5.2-0.1c-1.1-0.8-2.1-1.7-3.2-2.5c-0.2,0.6-0.6,1.9-0.8,2.5l-0.7-0.4
+			c-0.4-0.3-1.3-0.9-1.7-1.2c-3.8,0.3-7.6-0.4-10.6-2.7c2.5,1.7,4.2-2.5,0.8-2.1C1370.1,18.3,1372.4,16.2,1373.5,13.2 M1373.6,16.5
+			c-0.8,2.1-1,4.2-1.4,6.4c0.7,0,2.1,0.1,2.7,0.2C1375.3,21.1,1377.2,15.8,1373.6,16.5z"/>
+		<path class="st6" d="M1288.2,14.1c1.6-0.5,2.1,0.1,1.6,1.8C1288.2,16.3,1287.7,15.8,1288.2,14.1z"/>
+		<path class="st6" d="M519.2,16c2.7-1.2,2.7,4.6-0.2,3C517.1,19.2,518.4,16.6,519.2,16z"/>
+		<path class="st6" d="M421.7,22.3c0.9-1.8,1.8-3.5,2.8-5.2c1.9,2.6,3.8,5.3,5.6,8c-0.6,0-1.8-0.1-2.4-0.1
+			C426,23.6,423.9,22.8,421.7,22.3z"/>
+		<path class="st6" d="M1249.8,17c1.3,1.4,2.2,3,1.8,4.9c-0.5-0.7-1.3-2.1-1.8-2.8c-1,1.5-2,3-2.9,4.5c0.8,0.1,2.4,0.4,3.3,0.6
+			l-0.5,0.7c-1.7,0.1-3.4,0.1-5.1,0.2C1246.2,22.3,1247.9,19.6,1249.8,17z"/>
+		<path class="st6" d="M618,22c-2.9,1-5-3.1-2.1-4.5C618.8,17.1,618.2,20.1,618,22z"/>
+		<path class="st6" d="M788.1,18.2c1.8-0.5,2.5,2.6,0.7,3C786.8,21.9,786.1,18.6,788.1,18.2z"/>
+		<path class="st6" d="M1344.3,18.6c2-0.3,4-0.4,6-0.5c0.2,2.4,0.7,4.8,1.3,7.1c-0.5,0-1.6,0-2.2-0.1
+			C1347.8,22.9,1346,20.8,1344.3,18.6z"/>
+		<path class="st6" d="M543.1,20.3c1.8-1,4.3-0.9,5.3,1.1c0.9,1.4-0.5,2.3-1.3,3.2C545.8,23.2,544.4,21.8,543.1,20.3z"/>
+		<path class="st6" d="M608.4,19.2c1.3-1.5,3.7,0.9,2.1,2.2C609.2,22.8,607.1,20.5,608.4,19.2z"/>
+		<path class="st6" d="M1307.3,19.3c1.5,0.2,3.8,2.7,1.4,3.4C1306.6,23.5,1305,20.2,1307.3,19.3z"/>
+		<path class="st6" d="M434,19.7c2,0.9,6.4,1.1,5.2,4.4c-2.3,0.7-4.1-1.2-6-2.1C433.3,21.4,433.8,20.3,434,19.7z"/>
+		<path class="st6" d="M1411.2,21.8c1.6-0.4,3.3-1,4.9-1.7c-0.1,4.2-0.1,8.4-0.1,12.6c-0.6,1.6-1.2,3.1-1.8,4.7
+			c-3.7-0.8-7.4-1.4-11-2.6c-2.5-0.7-3.7-3.3-5.3-5.1c0.8-0.1,2.5-0.2,3.3-0.2c-1.2-1.3-2.4-2.5-3.6-3.7c0.6-0.5,1.9-1.5,2.5-2
+			c0.2,0.6,0.6,1.8,0.8,2.4c2.2-1.2,4.4-2.4,6.8-3.4c-0.2,1.9-0.3,3.8-0.4,5.7c1.3,0.2,2.6,0.5,3.9,0.7c-0.2,0.2-0.7,0.7-0.9,1
+			c-2.8,0.2-5.5,0.5-8.2,1.1c0.1,0.5,0.3,1.4,0.4,1.9c2.3,0.4,4.5,0.8,6.8,1.3c0.4-1.3,0.9-2.6,1.4-3.9c0.8,0,2.5-0.2,3.3-0.2
+			c-0.6-1-1.2-1.9-1.7-2.9C1413,25.5,1412.4,23.5,1411.2,21.8 M1411.6,34.1c-1.1,1.3,1.2,2.8,2.1,1.5
+			C1414.8,34.3,1412.5,32.7,1411.6,34.1z"/>
+		<path class="st6" d="M321.2,27.6c0.5-1.7,0.5-3.7,1.8-5.1c3.5,0,2.1,4.4,2.6,6.7c0.5,0,1.6,0,2.1,0c1.2,1.7,2.4,4.5,4.9,4.5
+			c1.5-1.5-0.1-3-1-4.3c2.1,0.2,2.5-2,3.3-3.4c1.4,2.3,2.9,4.6,4.4,6.9c2.1-0.5,2.2-2.5,1.7-4.3c-1.5-1.1-2.8-2.3-4.1-3.5
+			c1.8,0.4,3.5,1,5.3,1.6c-0.3,4.1,0.1,8.3,0,12.4c-1.5-1.3-3-2.5-4.6-3.8c-0.2-1.7-0.5-3.4-0.7-5c-0.6,0-1.8-0.1-2.4-0.1
+			c-0.6,2.5-1.2,4.9-1.8,7.3c-3.2,1-5.5,3.4-7.9,5.6c-1-1.1-2.1-2.3-3.1-3.4c2.5,0,5.4-1.5,4.6-4.5c-2.5-0.9-4.4,1.2-6.4,2.5
+			c-1.1-0.2-2.2-0.4-3.3-0.5c1-2.1,2.4-3.9,4.1-5.5c1.8,1.3,3.9,2.1,6.1,2.4c0-1.2-0.1-2.3-0.1-3.5c-1.4,0-2.8,0-4.2,0
+			c-1.6-0.6-3.6-0.8-5-1.9l-0.1-0.5C318.5,27.9,319.9,27.7,321.2,27.6z"/>
+		<path class="st6" d="M1400.4,38.4c3.2-1,5.5,2.1,8.4,2.8c2.4,0,4.8-0.4,7.2-0.6c-0.1,1.9-0.1,3.8,0,5.7c-0.7-0.1-2-0.3-2.6-0.4
+			c-0.2-0.6-0.4-1.8-0.6-2.4c-2.7,0.3-5.5,0.5-8.2,0.6c-0.5,1.8-0.9,3.6-1.3,5.5c-2.1-3-4.9-5.6-8.6-6c-0.5-0.1-1.5-0.4-1.9-0.6
+			c0-0.4-0.1-1.2-0.1-1.6c0.9,0.5,1.9,1,2.9,1.5c0.1-0.6,0.2-1.8,0.3-2.4c2.4,0.6,4.8,1.4,7.2,2.1
+			C1402.1,41.2,1401.2,39.8,1400.4,38.4z"/>
+		<path class="st6" d="M1404.8,50c1.8-2,3.9-3.7,6.2-5c0,1.1,1.1,2.4,0.3,3.4C1409.6,49.8,1407.2,51.2,1404.8,50z"/>
+		<path class="st6" d="M1408.7,53.3c0.9,0,2.8-0.1,3.8-0.1c-0.2,1.1-0.4,2.2-0.5,3.3c1.3-0.7,2.6-1.3,4-2c0,2.7-0.1,5.5,0,8.2
+			c-2-1-4.2-1.8-6.4-2.2c0.7-0.6,1.5-1.2,2.2-1.8c-0.5-1.3-1.6-2.3-2.4-3.3C1409.2,54.9,1408.9,53.8,1408.7,53.3z"/>
+		<path class="st6" d="M1403.2,68.4c-0.7-1.8-3.4-5,0.1-5.4c0.7,2.5,1.3,5.3,4.5,5.6c0.2-1.6,0.5-3.2,0.7-4.7
+			c2.6,0.2,5.3,0.9,7.5,2.4c0,0.4,0,1.1,0,1.5c-1.7,0.1-3.3,0.2-4.9,0.2c-0.8,0.9-1.7,1.7-2.5,2.6c-2-0.2-4.1-0.5-6.1-0.6
+			c1.2,2.6,4.4,2.6,6.8,3.3c-2,0-4.1,0.1-6.1,0.1c1,0.4,2,0.9,3.1,1.3c-3.5,0.5-7.1,1-10.6,0.2C1396.5,71.2,1400.5,70.2,1403.2,68.4
+			z"/>
+		<path class="st6" d="M321.5,75.8c0.9-2.2,1.9-4.6,4.7-4.6c0,2.2-0.7,4.5,0,6.6c1,2,3.1,0.2,4.6-0.1c1,0.5,2.1,0.9,3.1,1.4
+			c-0.9,0.7-1.8,1.4-2.7,2c1.9,2.4,4.6,1.5,6.9,0.5c1.3,0.4,2.6,0.8,4,1.3l0,0.9c-0.9,2-2.5,3.4-4.4,4.6c0-0.8,0.1-2.3,0.2-3.1
+			c-1.7,0-3.4,0-5.1-0.1c-1.7-2.4-3.8-4.4-6.2-6.2c-0.7,1.4-1.4,2.8-2.1,4.3c-0.5-0.8-0.9-1.6-1.4-2.3c0.5-1.3,1-2.6,1.5-3.9
+			C323.6,76.7,322.5,76.2,321.5,75.8z"/>
+		<path class="st6" d="M671.5,76.7c0.7,0,2.2,0,2.9,0c1.3,3.3,0.4,6.7,0.3,10.1c0.3,3.7,1.3,7.2,1.7,10.9c-3-0.1-6-0.2-9-0.1
+			c0.2,2.4,1,4.9,0.5,7.3c-1.4,2.5-4.7,2.8-7.2,3.8c-0.4,3.2-0.1,6.9-2.8,9.2c-2.3,1-4.7,0-6.9-0.8c0.6-2.1,1.7-4.2,1.6-6.5
+			c-2-2.2-4.5-3.9-6.7-5.8c-0.7,0-2,0-2.7,0c1.4-0.9,3-1.7,4.4-2.5c1.8,0.2,4.5,2.2,5.4-0.3c0.9-2.8-0.9-5.5-2.1-7.9
+			c-1.7,0.4-3.5,0.8-5.2,1.3c-1-1.3-2.1-2.7-3.1-4c-3.2-0.6-8,0-9-4c-1.4-2.7,2.3-4,4.4-3.7c3.2,1.3,5.2,4.4,8.4,5.7
+			c2.6,0.8,5.5,0.4,8.2,0.3c1.1-1.4,2.1-2.9,3.4-4.2c1.8,0.2,3.5,0.8,5.3,1.2c2.4-1.4,4.9-2.6,7.1-4.4
+			C671.4,80.7,671.1,78.5,671.5,76.7z"/>
+		<path class="st6" d="M704.8,76.7c2.5,0,4.9-0.1,7.4-0.1c0.5,3.7-2.1,6.6-3.2,9.8c-2.1,5.5-8,7.7-11.9,11.6c-1-1.6-1.6-3.4-1.9-5.3
+			c1.4-0.8,2.8-1.6,4.2-2.4c-0.5-1.8-0.9-3.5-1.4-5.3c2,0.4,4,0.8,6,1.2c1.9-2,3.9-3.9,5.9-5.7C708.2,79.2,706.6,77.8,704.8,76.7z"
+			/>
+		<path class="st6" d="M848.6,76.7c2.8-0.1,5.5-0.1,8.3,0c-0.2,1.1-0.4,2.1-0.6,3.2c0.8,1.5,1.6,3,2.4,4.5c-1.1,0.5-2.2,1-3.4,1.3
+			C852.2,83.3,850.2,80.1,848.6,76.7z"/>
+		<path class="st6" d="M867.7,76.7c1.9-0.1,3.7-0.1,5.6-0.3c-2.3,2.6-4,5.7-4.5,9.2c2.3-1.4,4.5-3.1,7.2-3.6
+			c1.5,3.5-2.4,5.6-4.2,7.9c0.9,2.4,2.1,4.7,2.6,7.2c-0.4,1.8-1.5,3.5-2.3,5.2c-4.1-1.2-8.2-2.6-11.9-4.8c3.1-3.3,3.9-7.9,6-11.8
+			c1.6,3.9,1.5,8.8,4.6,11.9l0.8-0.5c-1-4.5-2.9-8.8-4.1-13.2c-1.8,0.3-3.6,1-5,2.3c-0.2-0.6-0.5-1.8-0.6-2.3
+			C864.5,81.9,866.8,79.8,867.7,76.7z"/>
+		<path class="st6" d="M873.7,76.8c2.8-0.3,5.7-0.3,8.5-0.2c0.3,1.8,0.5,3.5,0.8,5.3c-1.5,0.3-3.1,0.6-4.6,0.9
+			C876.9,80.7,875.4,78.7,873.7,76.8z"/>
+		<path class="st6" d="M910.2,76.6c4.8,0,9.5,0,14.3,0.1c2.5,4.3,7.3,5.8,12,5.9c-1.5-2-3.1-4-4.7-5.9c6.1,0,12.3,0,18.4,0
+			c-0.9,2.6-1.9,5.2-3,7.7c-3-0.2-6.3-1.2-9.2-0.2c-0.1,1.5-0.2,2.9-0.2,4.4c-0.7,1.3-1.5,2.5-2.2,3.8c-1.6-2.6-2.1-6.5-5.3-7.7
+			c-4.2-1.7-7.8-4.4-11.7-6.5c-0.5,2.2-1.1,4.3-1.6,6.5c-2.2,0-4.3,0-6.5-0.1C910.5,81.9,910.3,79.3,910.2,76.6z"/>
+		<path class="st6" d="M1003.3,76.7c1.7-0.2,3.3-0.1,5-0.1c-0.4,2.6-1,5.2-0.8,7.8c0.8,1.1,1.8,1.9,2.8,2.8c-2.9,2.5-6.1,4.7-9.2,7
+			c-0.1-0.5-0.3-1.6-0.4-2.2c-1.9,1.3-3.8,2.6-5.7,3.9c-1.8-3.1-0.5-6.1,1.1-9c0.2-0.2,0.7-0.7,0.9-0.9c1.7,0.4,3.4,0.5,5.2,0.7
+			c-1-2.8-2.8-5-4.8-7.1C999.2,78.6,1001.2,77.5,1003.3,76.7z"/>
+		<path class="st6" d="M1016.2,76.7c0.8,0,2.2-0.1,3-0.1c-1.6,3.2-3,6.8-6.4,8.6c-0.5-1.8-1.3-3.5-1.2-5.3
+			C1012.8,78.5,1014.5,77.6,1016.2,76.7z"/>
+		<path class="st6" d="M1021.1,76.7c19.2-0.1,38.5,0,57.7,0c-0.4,2.5-1.4,5-1.1,7.6c0.9,1.5,2.9,3.3,4.7,2.2
+			c2.3-0.9,1.5-3.9,2.1-5.8c1.1-0.2,2.2-0.5,3.3-0.8c-0.6-1.1-1.3-2.1-1.9-3.2c6.8,0,13.6-0.1,20.5,0c1.1,1.4,2.9,2.5,3.4,4.3
+			c-0.7,2.8-3.3,4.9-3.2,8c-0.4-1.6-0.8-3.2-1.1-4.9c-1.3,0.2-2.5,0.4-3.8,0.7c-2.1,4.3-3.4,9-3.7,13.7c2.9-3.7,3.4-8.5,5.3-12.7
+			c2.4,3.8,2.4,8.8,5.7,12c-0.3-1.4-0.5-2.8-0.9-4.2c1.2-1,2.5-1.9,3.8-2.9c-0.4-0.4-1.3-1.1-1.7-1.5c3-2.2,5.5-6.1,9.7-5.8
+			c0.8-2.2,1.6-4.4,2.3-6.6c3.1,0,6.1,0,9.2,0c0,1.6-0.1,3.1-0.1,4.7c-3.7,0.6-7.2,2.6-9,6c-0.7,1.9-0.8,3.9-1.1,5.9
+			c-3.4,0.6-7.4,0.8-9.2,4.3c-1.6,0.2-3.2,0.4-4.9,0.5c-0.3,0.9-0.6,1.8-0.9,2.8c-0.2-0.6-0.6-1.9-0.8-2.5c-2.5,1.5-5.3,2.7-7.6,4.5
+			c-0.3,3.1-1,6.1-3.3,8.3c0.6-1.8,1.1-3.7,1.7-5.5c-3.6-3.2-7.7-5.8-11.6-8.5c-0.5,0.1-1.5,0.4-2,0.6c-0.1,0.4-0.2,1.2-0.3,1.6
+			c3.1,3.1,7.2,5,10.3,8c1.8,1.6,0.3,4,0.1,5.9c-0.9,0.1-2.8,0.2-3.7,0.3c-0.5,0-1,0.1-1.5,0.1c0,1.3,0,2.6,0.1,3.8
+			c-0.8-2-1.4-4-2.5-5.9c-1.6-1.6-3.9-2.4-5.5-4.1c-2.1-4.5-0.1-10.6-4-14.3c-0.8-0.9-1.7-1.8-2.6-2.6c-1.2,3.3-2.3,6.8-2,10.4
+			c0.3,2.4,1.5,4.6,2.3,6.8c-1.5,0.7-3.4,0.8-4.6,2c-1.2,2.7-1.7,5.6-2.6,8.4c7.3,0.3,14.6-0.4,21.8,0.4c-18.3,0.5-36.7,0.1-55,0.2
+			c-51.4,0.1-102.8,0.1-154.1,0.1l-0.3-0.7c11.8,0.1,23.7,0,35.5-0.1c0.4-1.3,0.6-2.6,0.9-4c1.4,0.5,2.8,0.9,4.3,1.3
+			c0.1,0.8,0.2,1.7,0.3,2.5c10.8,0.4,21.7,0,32.5,0.2c2.4,0.1,4.7-0.5,6.9-1.3c-2.8-1.3-5.8-2.1-8.3-3.9c0.4-0.4,1.3-1.2,1.7-1.5
+			c2.7,0.4,5.4,0.2,6.7-2.6c-2.3-1.1-4.6-2.4-7.2-2.8c-1,0.7-1.9,1.6-2.8,2.5c0.4-2,1.2-4.2,0.3-6.1c-0.9-2.6-2.3-5.6,0.2-7.9
+			c1.3,2.2,1.3,7.1,4.9,6c0.3-2.8-0.5-6.2,2.3-7.9c2.7-2.9,6.5-0.2,9.3,1.1c1.2-1.6,2.7-2.8,4.7-2.9c0.2,0.8,0.6,2.5,0.8,3.4
+			c-1.6,1.1-3.1,2.5-4.9,3.1c-2.2,0.1-4.3-0.5-6.5-0.5c-1.9,0.9-4.1,2.8-3.1,5.1c1,4,4.9,6.3,8.9,6.4c0.2-1.5,0.4-3,0.6-4.5
+			c2.9,0.4,4.7-1.5,6.2-3.7c2.2,2.6,5,5.6,3.7,9.4c-1.4,0.1-2.7,0.2-4,0.2c1.6,2.5,2.2,5.3,3,8.1c3.4,2.2,6.5-2.3,10-0.9
+			c5.7,1.9,11.9,1.8,17.8,1.1c2,0,2.7-2.2,3.8-3.5c1.8-0.3,3.7-0.7,5.5-1c0-1.6,0.1-3.3,0.2-4.9c0.6-0.3,1.9-0.9,2.5-1.2
+			c0.9,0.6,1.8,1.2,2.7,1.9c1.2,2.9-0.7,5.8-1.5,8.5c3.2,0.2,6.4,0.5,9.6,0.5c4.8,0.3,8.3-3.9,12.9-4.4c4.7-1.3,7.4,5.3,12.1,4.3
+			c2.2-1.1,3.3-3.5,4.7-5.3c0,0.7-0.1,2.1-0.1,2.8c-0.6,0.8-1.3,1.7-1.9,2.5c2.5,0,5-0.1,7.6-0.2c-0.3-3.7-2-7.3-1.1-11.1
+			c1,0.7,2,1.4,3,2.1c0.9-0.8,1.7-1.5,2.6-2.3c-1.7-0.5-3.4-1-5.1-1.5c-0.3-0.7-0.8-2-1.1-2.7c-1.4,1.6-2.7,3.2-4.1,4.8
+			c-4.3-2.2-8.7-4.8-10.9-9.3c-1.1-1.5,0.7-2.8,1.2-4.2c1.8,1.2,3.4,3.3,5.8,2.5c-1-1-2-2-3-2.9c-0.2-2.6-0.7-5.1-1.4-7.6
+			c-1.6,1.7-3.2,3.5-4.7,5.2c-2.6-2.6-4.7-6.2-8.6-6.8c-2.3,1.3-1.8,4.3-3.1,6.3c-0.8,0.9-1.8,1.7-2.6,2.6c-0.2,0.5-0.6,1.6-0.8,2.1
+			c-1.2-0.3-2.5-0.6-3.7-0.8c-4,3-6.7,7.3-10.1,10.9c-2.9-0.2-3.8-3.9-6.2-5.2c-1.8,0.2-3.5,1-5.2,1.6c-0.4-1.2-0.7-2.5-0.8-3.8
+			c3.1-2.6,6.7-4.5,9.8-6.9c0.2-1.1,0.3-2.2,0.5-3.4c3.7,1.1,6.6,3.5,9.2,6.2c-0.7-2.6-2.3-5.1-1.9-7.8c1.3-0.7,2.8-1.2,4.2-1.8
+			C1022.7,81.9,1022,79.2,1021.1,76.7 M1075.4,78.4c-1,1-0.5,3.1,1,3.3C1078.5,81.5,1077.3,77.2,1075.4,78.4 M1085.1,81.3
+			c-0.2,1.3-0.3,2.6-0.3,3.9c2-0.1,2.4-2,3-3.6C1087.1,81.6,1085.8,81.4,1085.1,81.3 M1049.8,92.2c0.6,0.2,1.8,0.6,2.4,0.7
+			c0.4-2,0.7-4.2-1.2-5.6C1049.2,88.1,1050.3,90.7,1049.8,92.2 M963.4,112.3c0.4,1.2,1.9,2.6,0.2,3.6c-0.8-0.9-1.6-1.8-2.3-2.7
+			c-0.7,1.4-1.4,2.8-2.1,4.1c2.7,1.6,5.9,1,8.8,0.8c0.3-2.8,0-5.5-1.3-8C965.7,110.8,964.6,111.6,963.4,112.3z"/>
+		<path class="st6" d="M817.1,78c4.2,1.5,6.5,5.6,7,9.8c-0.6,0-2-0.1-2.6-0.1C820.7,84.2,817.8,81.6,817.1,78z"/>
+		<path class="st6" d="M1398.4,78.4c2.1,0,3.8,1.3,5.6,2.3c0.6,0.4,1.3,0.8,1.9,1.2c-0.4,0.4-1.3,1.1-1.8,1.5
+			c0.9,0.9,1.7,1.9,2.7,2.8c-0.8,0.4-1.6,0.8-2.4,1.2c-0.2,1.5-0.3,3-0.5,4.6c-0.5-0.2-1.6-0.7-2.1-0.9c0.3,2.1,0.7,4.2,1.1,6.3
+			c-2.4,0.1-4.7,0.1-7,0.2c1.9,1.7,4.3,2.5,6.6,3.4c1.1,2.6-2.4,3.2-4.2,3.8c0.1,0.3,0.2,0.9,0.2,1.2c-0.3,0.6-0.8,1.8-1.1,2.4
+			c-0.7,0.1-2.1,0.1-2.8,0.2c0.2-0.7,0.5-1.3,0.8-2l-0.3-0.2c0.3-0.6,1-1.7,1.3-2.2c-0.9-0.7-1.8-1.3-2.7-2c0.6-0.9,1.2-1.8,1.8-2.7
+			c-0.2-0.6-0.6-1.7-0.8-2.3c0.8-0.7,1.7-1.4,2.5-2c0.6-0.4,1.7-1.1,2.3-1.5c1-2.2,2-4.3,2.7-6.6c0.1-2-2.2-2.5-3.5-3.4
+			c-0.9,2.8-2,5.6-2.7,8.4c-0.7-1.9-1.3-3.8-1.9-5.7C1395,83.4,1395.4,79.9,1398.4,78.4z"/>
+		<path class="st6" d="M959.1,80.2c1.8,1.2,5,1.7,5.7,3.9c-0.9,3.5-4.8,2.9-7.5,2.1C957.8,84.1,958.4,82.1,959.1,80.2z"/>
+		<path class="st6" d="M618.3,81.5c1.9-0.8,2.7,3.3,0.7,3.6C617.4,84.8,617.3,82.5,618.3,81.5z"/>
+		<path class="st6" d="M722.9,82.5c4.1-0.1,8.2-0.5,12.3-1.2c-1.1,1.9-2.4,3.7-3.7,5.4c1.2,0.2,2.4,0.2,3.7,0.1c0.3,0,1-0.1,1.4-0.1
+			l-0.3,0.6c-1,0.3-2,0.7-3,1c0.1,1.8,0.2,3.7,0.2,5.5c6.5,0,9.8,6.3,14.6,9.6c0.3-0.7,1-2,1.3-2.6c0.8,2.5,1.7,5,2.5,7.5
+			c-4-2.2-7.6-4.8-11.3-7.4c0-0.4-0.1-1.1-0.2-1.5c-2.3-0.8-4.6-1.6-6.6-3.1c-1.9-1.5-3.7-3.1-5.5-4.6c0.1-0.5,0.4-1.5,0.5-2
+			C726.5,87.8,724.3,85.4,722.9,82.5z"/>
+		<path class="st6" d="M971.5,82.6c4.1-0.3,8.2-0.6,12.1-1.9c0.4,2.5,0.5,5,0.5,7.5c-0.5-0.1-1.5-0.2-2-0.2
+			c-0.7-1.7-1.9-3.5-4.1-2.9c-2.3-0.2-2.8,2-3.5,3.7c-0.8-0.5-1.7-1-2.6-1.5C971.7,85.6,971.5,84.1,971.5,82.6z"/>
+		<path class="st6" d="M812,88c-0.5-2,0-3.9,0.9-5.7c2.6,2.5,0.4,7.5,4,9c1.8,0.2,3.5-0.6,5.2-1c0.1,1.3,0.2,2.6,0.4,4
+			c-3.6-0.6-6.5,3-9.9,1.9C812.1,93.6,812.6,90.7,812,88z"/>
+		<path class="st6" d="M626.7,85.9c0.6-2.3,3.3-1.6,5.1-1.9c1,4.6,2.5,9.1,3.7,13.7c-0.5-0.2-1.6-0.6-2.2-0.8
+			c-1.7-3.5-2.5-7.3-3.7-11c-1.5,3.9-3,7.9-4.6,11.8c-3.5-0.1-7.1-0.1-10.6,0c1.6-0.9,3-2,4.7-2.5c1.5-0.1,2.1,1.7,3.2,2.4
+			C624.7,94.1,625.2,89.8,626.7,85.9z"/>
+		<path class="st6" d="M825.8,89c3.1-1.4,5.8-3.6,9-4.6c3.8,0.4,3.8,5.4,6.5,7.4c3.1,1.8,7,1.2,10.2,2.8c2.3,1.3,0.4,3.9,0.1,5.8
+			c-1.7-1.3-3.5-2.5-5.3-3.6c0,0.8-0.1,2.5-0.1,3.3c-0.6-1-1.2-1.9-1.8-2.9c-1,0.8-2,1.6-2.9,2.3c-1.3-0.7-2.6-1.4-3.8-2.1
+			c-0.6,1.1-1.2,2.1-1.8,3.2c1.8,1.6,4.2,2.8,5.2,5.1c0,1.2-0.3,2.3-0.5,3.5c0.3,0.7,0.6,1.3,0.9,2c-2.3-1.8-2.4,2.6,0,2.1
+			c0.8,0.6,1.8,2.7,3,1.4c1.6-1.1,3.1-2.4,4.6-3.6c0.6,1.6,1.2,3.3,1.8,4.9c0.8,0.1,2.4,0.3,3.2,0.4c-0.3,0.9-0.6,1.7-0.8,2.6
+			c-10.5-0.3-20.9,0.2-31.4-0.1c0.5-1.9,0.9-4,1.8-5.8c2.8-1.2,5.7-2.6,6.5-5.9c-2.9-2.1-7.4-3.3-8.1-7.2c1.1-3.2,4.8-4.2,7.8-4.9
+			c2.5-0.7,5.6,1.2,7.5-1c0.1-1.8-1.2-3.2-2.2-4.6c-3.1,2-6.7,2.6-10.2,1.4C825.3,90.4,825.6,89.5,825.8,89 M826.8,118
+			c2.8,0.3,5.7,0.4,8.5,0.5c1.4-2.2,0.5-4.6-1.1-6.4C832,114.3,828.1,114.8,826.8,118z"/>
+		<path class="st6" d="M803.8,88.7c1.6-0.5,3.4-0.4,5.1-0.4c-0.1,3.3-2.8,5.4-5.5,6.8C803.5,92.9,803,90.7,803.8,88.7z"/>
+		<path class="st6" d="M949,92.9c-2.5-0.1-2.4-4.7,0.1-4.9c1.7-0.9,2.9,0.8,4,1.7C951.9,90.9,950.8,92.5,949,92.9z"/>
+		<path class="st6" d="M742.9,92.8c0.9-1.2,1.4-3,3-3.5c2.4,0.7,4.6,1.9,6.8,2.9c-1.6,1.1-3.3,2.1-4.9,3
+			C746.2,94.4,744.5,93.6,742.9,92.8z"/>
+		<path class="st6" d="M919.5,92.6c0.5-0.9,1-1.8,1.5-2.7c-0.3,1.5,0.3,2.1,1.9,1.9c-0.8,0.7-1.6,1.4-2.3,2.1
+			c1.2,0.7,2.4,1.5,3.6,2.2c-2.3,0.4-4.6,1-6.8,1.7c0-1.2,0-2.4,0-3.6C918.1,93.7,918.8,93.2,919.5,92.6z"/>
+		<path class="st6" d="M723,92.7c2.5,1.6,5,3.3,7.4,5c-2.3-0.1-4.5-0.1-6.8-0.1C723.4,96,723.2,94.3,723,92.7z"/>
+		<path class="st6" d="M792.5,96.7c1.3-1.4,3.4-3.2,5.2-1.4c2.8,2.9,7.3,2.6,10,5.7c-2.9,4.1-8.5,1.3-12.2,4.5
+			C793.4,103,793.4,99.6,792.5,96.7z"/>
+		<path class="st6" d="M1406.2,96.1c-0.2-2.4,3.2-1.3,4.4-0.5c1.8,1.9,2,4.8,2.9,7.2c0.6,0.1,1.9,0.4,2.6,0.5c0,1.6,0,3.1-0.1,4.7
+			c-1,1.4-2.1,2.7-3.1,4.1c-1.9-1.2-3.4-3.3-5.8-3.3c-0.7,1.6-1.2,3.2-1.7,4.9c2.1,1.4,4,3,5.8,4.8c-2.8-0.3-5.6-0.7-8.3-1.2
+			c0.9-0.1,2.7-0.2,3.7-0.3c-1.2-1.3-2.5-2.6-3.7-3.9c-0.2-0.7-0.4-1.4-0.5-2c1.8-1.8,3.5-3.6,5.4-5.4c-0.8-1.5-2.1-2.9-1.6-4.7
+			c2.1,0.7,2.9,3.2,4.9,4.2c1.1-1.6,0.3-3.7,0.2-5.5C1409.4,98.9,1405.9,98.8,1406.2,96.1z"/>
+		<path class="st6" d="M755.6,96.6c4,0,8.8,1.4,10.5,5.3c1,1.9,2.9,3.1,4.6,4.3c4.1,2.4,5.9,7,9,10.4c-0.4,0.3-1.2,0.9-1.6,1.2
+			c3.5-0.3,6.9-0.1,10.3,0.9c-27.5,0.5-55,0-82.5,0.4c-4.4,0.1-8.9-0.1-13.3-0.3c12-1,24,0,36.1-0.5c-0.2-1.9-0.4-3.9-0.7-5.8
+			c2.5,0.6,4.8-0.4,6.6-2.3c-0.2,1.7-0.4,3.5-0.3,5.2c1.2,1.2,2.7,2.1,4.4,2.4c5.4,1,11,0.7,16.5,0.2c-2.8-2-6-3.7-7.6-6.8
+			c1.3,0.8,2.6,1.7,4.2,2.1c1.9,0,1.9-2,2.3-3.4c1.2-0.2,2.4-0.4,3.6-0.4c2.4,1,4.4,3.8,7.2,2.8c1.6-0.4,2.5-2.2,1.7-3.7
+			c-1.3-5.1-6.8-6.7-11.3-7.4C755.4,99.6,755.5,98.1,755.6,96.6 M760.8,117.8c2.8,0.2,6.6,1.7,8.7-0.8
+			C768.5,112.3,763.1,116.2,760.8,117.8z"/>
+		<path class="st6" d="M884.7,96.9c0.5-0.4,1.1-0.8,1.7-1.1c-0.2,2-0.4,4.1-0.6,6.1c1.4,0.2,2.8,0.4,4.2,0.6c-0.4,1.7,0.4,4-1.2,5.1
+			c-3.5,0.8-7-0.4-10.2-1.8C881.4,103.6,886.7,101.4,884.7,96.9z"/>
+		<path class="st6" d="M999.4,96.8c0.5,2,1.1,4,1.8,5.9c-1.2,0.8-2.5,1.7-3.7,2.6c-1.7-1.4-3.3-2.8-5-4.2c2-0.9,3.9-1.8,5.8-2.9
+			C998.6,97.8,999.2,97.1,999.4,96.8z"/>
+		<path class="st6" d="M684.9,102c-1.2-2,1-3.4,2-4.8c2.7,1.6,5.3,3.2,8,4.9c2.7,1.4,2.9,5.8,6.2,6.3c1.2,0.5,4.2,0.5,3.2,2.6
+			c-1.5,4.2-6.4,3.5-9.9,3.5c-1.8,1.7-3.6,4.2-6.5,3.8c-3-0.1-7.1,0.7-8.8-2.5c-0.8-1.5-3.8-4.1-1.1-5.1c3.3,0.3,6.5,1,9.9,1.1
+			C688,108.2,686.3,105.1,684.9,102z"/>
+		<path class="st6" d="M731.3,98.3c0.4,0.2,1.3,0.7,1.7,1c-0.9,2.7-1.4,5.5-1.5,8.4c-0.4,0.3-0.8,0.7-1.2,1c0-1.4-0.1-2.8-0.1-4.2
+			c-0.9,1.3-1.7,2.5-2.5,3.8c-0.4-1.5-0.9-3-1.4-4.5C729.2,103.3,730.6,100.9,731.3,98.3z"/>
+		<path class="st6" d="M603.3,99c2-0.8,2.8,2.6,0.8,2.9C602.2,102.5,601.5,99.5,603.3,99z"/>
+		<path class="st6" d="M1031,98.5c0.6,0.3,1.8,0.9,2.5,1.1c1.3,1.4-0.3,3.2-0.5,4.7C1030.8,103.1,1031.1,100.6,1031,98.5z"/>
+		<path class="st6" d="M336,106.9c2.5-2,4-4.8,5.9-7.4c0.1,3.2,0.1,6.5,0,9.7c-0.4-1.1-0.8-2.1-1.2-3.2
+			C339.1,106.3,337.5,106.6,336,106.9z"/>
+		<path class="st6" d="M925.9,104.2c2.4-2.2,5.7-2.2,8.8-1.9c0,0.5,0,1.6,0,2.1c-3,0.7-6,1.8-8.1,4.1c-1.4,1.8-3.7,0.3-5.5,0.2
+			c-2.3-0.9-4.2,0.7-6,1.9C915.3,105.3,921.1,101.8,925.9,104.2z"/>
+		<path class="st6" d="M1023.4,103.2c1.3,0.1,4-0.3,4,1.7C1027.1,108.1,1020.6,105.8,1023.4,103.2z"/>
+		<path class="st6" d="M1017.1,104.1c2.1,0,4.6,1,3.6,3.6c-0.7,0.2-2,0.5-2.7,0.7C1017.7,106.9,1017.4,105.5,1017.1,104.1z"/>
+		<path class="st6" d="M710,105.1c2.4-0.2,5.1-0.9,7.3,0.6c1.3,1.2,1,3.2-0.6,3.9C713.7,109.7,709.5,109,710,105.1z"/>
+		<path class="st6" d="M899.2,107.9c0.7-1.1,1-2.8,2.7-3c3,0.9,5.5,2.8,7.6,5.1c-1.2,1.2-2.3,2.3-3.5,3.5
+			C903.9,111.5,901.7,109.6,899.2,107.9z"/>
+		<path class="st6" d="M983.1,111.8c3.1-2.2,5.8-4.8,8.7-7.2c2,1.6,4,3.3,6.1,4.9c-1.7,2.3-3.4,4.6-5,6.9
+			C989.6,114.8,986.9,111.7,983.1,111.8z"/>
+		<path class="st6" d="M861.9,113.2c-0.6-3.9,2.7-6.4,6.1-7.4c2.5,2.7,3.3,6.4,5.1,9.5c-2.3-1.4-4.6-3-7.1-4.1
+			C864.6,111.6,863.2,112.4,861.9,113.2z"/>
+		<path class="st6" d="M800.4,109.5c2.1-0.4,4.2,0.5,6.2,1c0.4,1.2,0.8,2.4,1.2,3.6c-2.3,1.1-4.7,0.4-6.9-0.2c-0.8,1-1.6,2-2.4,3.1
+			c-2.3,0.1-3.5-1.2-3.4-3.5C796.8,112,798.3,110.3,800.4,109.5z"/>
+		<path class="st6" d="M1050.5,108.9c0.9,1.4,1.5,3.1,1.2,4.8c-1.1,1.3-3.1,0.7-4.6,1C1047.3,112.3,1048.4,110.2,1050.5,108.9z"/>
+		<path class="st6" d="M1072.9,113.1c-1.4-3.3,3.2-3,5.3-3.8c0.8,0.8,1.6,1.5,2.5,2.3C1078,111.8,1075.5,113.6,1072.9,113.1z"/>
+		<path class="st6" d="M932.6,114c-0.8-2.1,1.3-3.3,2.5-4.7c1.5,1.5,3.5,3.5,2.3,5.8C936.6,117.7,932.5,116.3,932.6,114z"/>
+		<path class="st6" d="M860.5,118.9c1.8-1.4,3.6-2.9,5.4-4.3c1.9,1.3,3.8,2.8,5.6,4.3C867.9,119,864.2,118.9,860.5,118.9z"/>
+		<path class="st6" d="M328.4,143.1c0.2,0.2,0.6,0.7,0.8,0.9c1.1,0.6,3.2,0.4,3.3,2.1c-0.1,1.7-0.6,3.4-0.9,5.1
+			c-3.1-0.5-4-3.7-5.2-6.1C327,144.4,327.7,143.8,328.4,143.1z"/>
+		<path class="st6" d="M334,161.4c2.9-1.3,2.6-4.9,3.9-7.3c1.4,0,2.7,0.1,4.1,0.2v1.3c-0.9,0.1-2.5,0.3-3.4,0.4
+			c0.3,2.5,0.7,5,1.2,7.5c-2.6,0.3-5.2,0.6-7.7,1c-1,1.6-1.7,3.8-3.9,3.8c0.4-1.8,0.7-3.7,1.1-5.5c-0.9-0.6-1.7-1.1-2.5-1.7
+			l-0.1-0.4c1.3-0.1,2.6-0.2,3.9-0.3c0-0.2,0-0.7,0-0.9C331.6,160.3,332.8,160.9,334,161.4z"/>
+		<path class="st6" d="M1410.6,176.8c0.8,1,1.7,2,2.6,3.1c0.7,0.1,2.1,0.4,2.8,0.5c0.1,3.1,0,6.3,0,9.4c-2-1.1-3.7-2.8-5-4.7
+			c-1.2,0.4-2.3,0.8-3.4,1.2c-0.1-2.7-0.1-5.4-0.1-8c1.1,0.2,2.2,0.3,3.3,0.5C1410.7,178.2,1410.7,177.2,1410.6,176.8z"/>
+		<path class="st6" d="M324.8,182.8c0.1-1.9,0.4-3.8,2-5c0.8,1.6,1.2,3.3,1.2,5C327.3,182.7,325.6,182.8,324.8,182.8z"/>
+		<path class="st6" d="M533.6,178.7c2.3-0.2,4.5-0.5,6.8-1.1c-2.2,2.9-3.8,7.6-8,7.6c0.5-2,0.9-4,1.2-6.1L533.6,178.7z"/>
+		<path class="st6" d="M1400.2,179.4c1,0.4,3.2-0.6,3.6,0.8c1,1.6-1,3.1-2.4,2.5C1400.8,181.6,1400.5,180.5,1400.2,179.4z"/>
+		<path class="st6" d="M865.4,179.8c5.2-0.5,10.4,0.2,15.6,0.7c-2.1,1.8-3.4,4.1-3.9,6.8c-1.2,1.4-2.4,2.7-3.5,4.1
+			c-3.4,0-6.7,0.1-10-0.3c2.7-0.7,5.5-1.2,8.1-2.4c2.9-1.6,4.5-4.6,6.2-7.3c-3.5-0.3-7-0.3-10.4-0.5
+			C866.9,180.6,865.9,180.1,865.4,179.8z"/>
+		<path class="st6" d="M1211.7,179.3c3.7,2.4,7.8,4.5,12.2,5c1.1-0.8,2.2-1.6,3.4-2.4c-1,2.2-2.4,4.1-4.1,5.8
+			c-1.9-0.9-3.8-1.7-5.8-2.6c-0.9,1.2-1.8,2.5-2.7,3.7c-1-0.2-2-0.5-3-0.7C1212,185.2,1211.8,182.2,1211.7,179.3z"/>
+		<path class="st6" d="M887.5,180.6c2,0,4,0,6,0.2c-2.3,0.9-4.6,1.9-6.6,3.3c-1,2,0,4.1,0.7,6c1.2-1.5,2.5-2.9,3.7-4.4
+			c4.5,0.1,8.9-1.3,12.8-3.6c-2.6,3.6-6.8,5-10.5,6.9c0.8,5.3,5.4,8.9,9.5,11.9c2,1.3,2.9,3.7,3,6c-1.9,1.9-4.6,2.5-7.2,2.8
+			c-4,0.5-7.4-1.9-10.7-3.7c1.5-2.2,3.1-4.3,4.7-6.4c-1.6-1.8-3.3-3.4-5.2-4.9c-0.9,1.7-1.8,3.5-2.6,5.3c-0.7-1.3-1.5-2.6-2.3-3.9
+			c1.2-1.8,2.4-3.6,3.6-5.3c-1.9-1.1-3.7-2.1-5.6-3.2C883.1,185.3,885.3,183,887.5,180.6 M890.3,194.6c1.5,2,4.3,3.5,4.1,6.4
+			c-0.7,1.8-3.5,4.1-1.2,5.8c2.9,3.2,7.5,1.8,10.7-0.1c0.1-4.9-5.1-6.5-7.7-9.9c-1.8-2.1-2.8-4.8-5.2-6.2
+			C889.3,191.2,888.9,193.4,890.3,194.6z"/>
+		<path class="st6" d="M1059.6,180.4c1.2-0.1,2.5-0.2,3.8-0.1c-0.2,1.3,1,3.6-0.8,4.2c-2.5,0.8-5.4,2.9-8.1,1.6
+			C1055.8,183.8,1057.7,182,1059.6,180.4z"/>
+		<path class="st6" d="M1246.8,180.9c2.8,0,5.7,0,8.5,0c-0.5,1.6-0.7,3.3-1.5,4.8c-1.8-0.1-3.6-0.5-5.4-0.8
+			c-1.6,2.6-0.7,5.3,0.8,7.6c2.9-0.9,6-0.8,9-1.3c4.4-1.4,3.6-8.8,8.7-8.7c3.6-0.6,6.8,1,9.5,3.3c-3.4-1-6.9-2.3-10.4-2.1
+			c-1.9,2-2.9,4.6-4.2,7c1,1.1,2,2.1,3,3.2c-3.5,3.1-6.2,7.3-6.4,12.1c-1.7-0.6-3.4-1.5-5.3-1.7c-3.1,0.2-5.9,1.6-8.7,2.8
+			c1.4,0.8,2.9,1.6,4.5,2.3c-1.5,0.5-3,1.1-4.5,1.3c-1.1-1.6-1.9-3.4-2.8-5.1c-1.5,1.5-2.3,3.4-2.7,5.4c-1.5-2.1-1.5-4.6-1.7-7
+			c0.1-1.3-3.1-2.5-2.5-0.1l-0.3,1.1c-1.1-2.6-2.5-5.1-4.1-7.4c4.2-5.3,11.1-6.9,16.1-11.2C1246.7,184.7,1246.7,182.8,1246.8,180.9
+			 M1237,194c0.8,1.8,1.4,4.2,3.9,4c3.4,0.8,4.6-3.1,6.2-5.2c-1.3-0.8-2.7-1.6-4-2.3C1241.2,191.9,1239.1,193,1237,194
+			 M1254.9,192.9c-1,1.7-0.1,3.2,1.7,3.6c2,0.9,3.3-1.7,3.3-3.4C1258.5,192.1,1256.5,192.7,1254.9,192.9 M1249.4,196.6
+			c-1.1,1.6-3,2.1-4.3,3.4c-0.4,1.3-0.6,2.7-0.9,4.1c4.3,0.3,8.5-1.1,12.8-1.2c0.6-3.1-2.1-6.3-4.4-8.4
+			C1251,194.1,1250.2,195.7,1249.4,196.6 M1234.8,199.3c1,2.5,3.7,3.5,6.2,3.9c1.7,0,3.5-1.8,2.2-3.4
+			C1240.7,198.4,1237.6,199.3,1234.8,199.3z"/>
+		<path class="st6" d="M992.6,183c1.1-0.7,2.3-1.2,3.7-1.5c0.3,1,0.3,1.9,0.2,2.9C995,185.2,992.6,185.2,992.6,183z"/>
+		<path class="st6" d="M1257.3,184.8c1.5-0.5,3.2-1.9,4.7-0.7c1.3,1.6-1.3,2.6-2.1,3.6C1259.1,186.8,1258.2,185.8,1257.3,184.8z"/>
+		<path class="st6" d="M1068.6,186.1c1.5,0.1,3.1,0.1,4.7,0.2c-0.4,2.1-0.7,4.2-1,6.2c1.8,0.1,3.7,0.2,5.5,0.1
+			c1.2-1.1,2-2.4,2.9-3.6c0.2,1.2,0.5,2.4,0.7,3.5c0.5,0.1,1.5,0.3,2,0.4c0.3,2.3,0.5,4.7,0.8,7c3.2-0.6,6.3-1.3,9.4-2.1
+			c-0.5-1.1-1.1-2.3-1.6-3.4c1,0.9,2.1,1.7,3.1,2.7c-0.1,2.1-2.9,2.2-4.4,3c-3.2,0.8-5.4,3.3-8,5.1c-3.4-3.1,2.1-8.9-2.9-11
+			c-1,1-1.9,2.1-2.8,3.1c-1.2,1.1-4.7,1.2-3.7,3.3c0.6,3.8,6.7,4.6,5.7,8.7c-2.6,0.3-3.8-2.1-5-3.9c0,0.9,0,1.8,0,2.7l-0.7,1.5
+			c-0.7-4.2-1.5-8.6-4.2-12c-4.2-6.6-13.1-5.4-19.9-6.4c5.2-0.9,10.3,0.6,15.5,1C1067.7,191.4,1068.6,188.6,1068.6,186.1z"/>
+		<path class="st6" d="M1407.1,186.9c1,0.9,3,1.4,2.9,3c-1,0.5-2,0.9-2.9,1.2C1407,189.8,1407,188.3,1407.1,186.9z"/>
+		<path class="st6" d="M913.9,188.6c2.8,1.6,4.8,4.2,7.2,6.4c4.5-0.9,8.3-3.7,12-6.2c3.4,1.4,6.3,3.7,9.4,5.6c-3.5,0-7,0-10.4,1
+			c-1.4-0.6-2.8-1.2-4.1-1.8c-2.5,1.1-4.9,2.2-7.3,3.4c1.9,0.8,3.9,1.5,5.6,2.7c0.4,1.2,0.6,2.5,0.8,3.8c-1.5,2.1-2.7,4.3-4.4,6.2
+			c-2.3,1-5.9-1.7-4-4.1c1.5-2.6,5-2.8,7.5-4c-1.1-0.8-1.9-2-3.3-2.2c-2.4,0.1-4.4,1.8-6.8,1.9c-2.2-0.1-4.2-1-6-2.2
+			c3.4,0.1,7.3-1.2,7.7-5.1c-0.9-1.5-2-2.8-3-4.2L913.9,188.6 M920.3,205.3c-2.1,1.6,1.1,4.8,2.6,2.5
+			C924.7,206.2,922,203.4,920.3,205.3z"/>
+		<path class="st6" d="M998.3,190.3c0.6,0,1.9,0.1,2.6,0.1c0.3,1.1,0.6,2.2,0.9,3.3c-1,0.8-2.3,0.9-3.4,1.2
+			C998.3,193.4,998.3,191.8,998.3,190.3z"/>
+		<path class="st6" d="M1395.4,193.3c0.9-0.8,1.8-1.6,2.7-2.5c1.5,2.4,3.1,4.8,4.8,7.1c0.9-0.7,1.8-1.4,2.7-2.1
+			c0.4,0.4,1.2,1.2,1.6,1.7c-1.3,0.9-2.5,1.8-3.7,2.7c2,1.4,4,2.8,6,4.2c-1.9,1.9-4.2,0.5-6.1-0.4c-0.4,2.7-0.8,5.5-1.2,8.2
+			c1-1.7,2-3.5,3-5.2c1.9,3.1,0.1,6.6-1.6,9.3c-0.1-0.8-0.2-2.4-0.3-3.1c-1.3,0.5-2.5,1.1-3.7,1.6c-1.3-3.5-5.2-2.6-7.7-4.4
+			c1.2-1.4,2.9-2.1,4.6-2.9c0-1,0-2,0-2.9c1.2-0.3,2.5-0.6,3.7-0.9c-2.6-1.3-4.8-3.2-6-5.9c1.2-0.5,2.4-1,3.6-1.4
+			C1396.9,195.2,1396.2,194.3,1395.4,193.3 M1397.2,205c0.4,1,0.9,2,1.3,2.9c-0.4,0.6-1.2,1.8-1.6,2.4c1.2,0.6,2.4,1.1,3.7,1.6
+			C1402,209.1,1401.4,204.2,1397.2,205z"/>
+		<path class="st6" d="M1017,203.9c0.2-2,0.5-4.1,0.6-6.1c0.2,2.6,0.5,5.2,0.7,7.8c-5.5,0.5-7.6,6.8-13.1,7.3c2.3,2,5.2,3.5,6.5,6.4
+			c0.2,3.9-1,7.7-1.1,11.6c-1.2,0.2-2.5,0.5-3.7,0.7c-0.1-0.9-0.3-2.7-0.5-3.6c0.5,0.1,1.4,0.4,1.9,0.6c0.4-2.8,1.4-5.5,2.1-8.3
+			c-0.7-3.4-4.2-5.2-7.4-5.7c-1-2.3-2.1-4.5-3.3-6.6c0.9-0.4,1.9-0.7,2.8-1.1c1.6,1.5,3.5,3.8,6,2.7
+			C1011.5,207.9,1014,205.5,1017,203.9z"/>
+		<path class="st6" d="M842.6,200.2c1.1,2.1,2.4,4.2,3.7,6.2c-0.6,0-1.8,0-2.3,0c-0.1,1.1-0.2,2.2-0.2,3.3c1,1.1,2.2,2.1,2.9,3.4
+			c0.6,1.8-1.4,2.5-2.4,3.5c-1.9-2.3-3.7-5.2-7.1-5.3c-0.9,1.3-1.8,2.6-2.8,3.9c-2.2,0.9-5.2,1.3-6.2,3.8c-0.9,1.4-0.6,3.2-0.6,4.8
+			c3.8-1,7.9-2.9,11.8-1.2c1.4,3.5-2.9,5.6-5.2,7.3c-2.9-0.8-6-2.1-9-1c-1.9,0.7-4.7,0.8-5.4,3c-0.2,2,0.4,4,0.8,6
+			c-1.7,3-3.4,6-4.2,9.3c0-1.6-0.1-3.2-0.5-4.8c-1-0.1-2-0.2-3-0.3c0-2.2,0.1-4.5,0.2-6.7c1.7,1.4,3.3,2.9,4.8,4.5
+			c1.8-2.8,0.4-6.1-0.2-9c-2,0.6-3.9,1.2-5.9,1.8c-0.2-2-0.4-4-0.6-6c0.8,1.4,1.6,2.9,2.4,4.3c2.1-1.3,4.5-2.6,5-5.3
+			c1.2-5.2,3.9-9.9,5.8-14.8c-1.2-1.9-3-3.3-3.9-5.4c-0.6-1.2,0.5-2.2,1.6-2.4c2.9-0.9,5.8-1.7,8.8-2.6c0.4,0.2,1.1,0.6,1.5,0.8
+			c-3.1,1.2-6.4,1.9-9.3,3.7c0.7,2.3,2.4,4.1,3.5,6.2c-0.7,5.7-6.8,9.8-5.8,15.9c1.3,0.8,2.9,0.2,4.4,0.2c0.4-3.2,0-6.8,2-9.4
+			c1.6-2.5,4.6-3.2,7.1-4.3c-2.2-2.4-4.9-4.7-5.2-8.2c2-0.1,4-0.2,6-0.2c-0.1-0.6-0.4-2-0.6-2.6c1.9,0.6,4,1.1,6,0.8
+			C841.3,202.4,841.9,201.3,842.6,200.2 M835.4,204.7c0.8,1.8,0.8,5.2,3.6,4.8c2.9,0.5,3.5-2.8,3.4-5
+			C840.1,204.6,837.7,204.6,835.4,204.7 M830.3,224.2c0,1.2,0,2.5-0.1,3.7c3.1-0.3,7-0.6,8.5-3.9C836.1,222.2,833,223.2,830.3,224.2
+			z"/>
+		<path class="st6" d="M339,205.4c1,0.3,2,0.5,3,0.8c0,2.4,0,4.8,0,7.2c-2.1-1.2-4-2.6-5.9-4.2C337.1,208,338.1,206.7,339,205.4z"/>
+		<path class="st6" d="M742.3,209.6c1.2-0.3,2.8-0.6,3.9,0.2c1.3,1.7,0,4.5-2.3,4.1C741.8,214.4,740.1,210.3,742.3,209.6z"/>
+		<path class="st6" d="M1101.7,209.5c3.3-0.4,6.7-0.3,10,0.1c-0.3,1.9-0.2,4.1-1.5,5.7c-2,2.4-4.9,3.8-7,6c-0.6,2.5-0.3,5.2-1.8,7.4
+			c-1.3-1.7-2.5-3.4-3.8-5.1c0.4,0,1.3-0.1,1.8-0.1c0.3-1,0.7-2,1-2.9c3.7-2.5,9.2-4.1,9.5-9.3c-2.2-0.5-4.5-0.9-6.7-1.2
+			c0.2,1.7,0.4,3.4,0.6,5.1c-3.7,0.3-7.7,0.2-10.8,2.6c-0.2-0.3-0.7-0.9-1-1.1c-0.6,1.5-1.2,3-1.9,4.5c-0.3-1.7-1.8-4.2,0.6-5.1
+			c3.2-1.2,6.7-1.4,10.1-2C1101.2,212.4,1101.5,210.9,1101.7,209.5z"/>
+		<path class="st6" d="M480,209.9l0.5,0.5c0.4,0.4,1.2,1.1,1.6,1.4c1.9,0.6,3.8,1.3,5.7,2c-2.1,3-5.9,2.2-8.7,3.9
+			c0.3-2.3,0.6-4.6,0.8-6.9L480,209.9z"/>
+		<path class="st6" d="M1406.9,214.1c0.5-1.5,0.6-4.8,3-3.1C1411.7,213.5,1409.3,214.9,1406.9,214.1z"/>
+		<path class="st6" d="M618.2,213.3c0.6,0,1.9,0,2.5,0c0,1.5,0,2.9-0.1,4.4c-0.6,0-1.9,0.1-2.5,0.1
+			C618.2,216.3,618.2,214.8,618.2,213.3z"/>
+		<path class="st6" d="M917.9,216.6c3.4-0.4,8.2,0.5,9.5-3.8c0,5.3,0.1,10.6-0.1,15.9c-1.9-1.7-3-4.1-4-6.4
+			c-1.1,0.2-2.3,0.4-3.4,0.6c0.4-0.9,0.7-1.9,1.1-2.8C920,218.9,918.9,217.8,917.9,216.6z"/>
+		<path class="st6" d="M1411.8,218c-0.2-2.2,2.8-2.2,4.2-3c0,1.5,0,3.1,0,4.6C1414.4,219.3,1412.2,220,1411.8,218z"/>
+		<path class="st6" d="M336.4,216.3c1.7-2,4,2,2.9,3.8C338,223.9,334,218,336.4,216.3z"/>
+		<path class="st6" d="M637.7,216.7c1.1-0.2,2.2-0.4,3.3-0.6c-0.2,1.4-0.3,2.8-0.6,4.2c-1,0.3-2,0.5-3.1,0.7
+			C637.3,219.6,637.4,218.1,637.7,216.7z"/>
+		<path class="st6" d="M1394.4,218.3c0.8,0.2,1.7,0.3,2.6,0.6c1.8,0.5,3.6,1.1,5.3,1.7c0.3,0.4,0.9,1.3,1.2,1.8
+			c0.7,0.2,2.1,0.7,2.8,0.9c-0.1,0.6-0.3,1.9-0.4,2.6c-1.6-0.5-3.2-1-4.9-1.6c-0.6,0.9-1.1,1.7-1.6,2.6c2,1.2,4,2.4,6.1,3.6
+			c-0.7-0.1-2-0.4-2.7-0.6c0,0.5-0.1,1.5-0.2,2c-0.6-0.7-1.3-1.4-1.9-2c-0.8,0.4-1.7,0.9-2.5,1.4c-1.2-3.9,1.2-7,3.3-9.9
+			c-3.7-0.8-6,2.2-8.4,4.5c0.8,1.3,1.6,2.5,2.3,3.9c-0.5,1.6-2.2,2-3.4,2.6c-0.2-1.4-0.4-2.9-0.7-4.3c-0.2,0.3-0.6,1-0.8,1.3
+			c0-2.6-0.1-5.2-0.1-7.8C1392.1,220.8,1393.5,219.8,1394.4,218.3z"/>
+		<path class="st6" d="M1408.2,219.4c1.9,0.2,3.8,3.4,3.5,5.4C1409,225.4,1404.5,221.3,1408.2,219.4z"/>
+		<path class="st6" d="M1084.7,229.3c-0.3-1.9-1.4-5.8,1.4-5.9c2.9-0.6,3.2,3.3,4.1,5.2c0.4,0,1.2,0,1.6-0.1c0,1.5,0,3,0,4.4
+			c-0.9-1-1.8-2-2.7-3C1087.7,229.8,1086.1,229.7,1084.7,229.3z"/>
+		<path class="st6" d="M332.6,228.9c1.4,2,2.6,4.5,5.3,4.7c1.4,0.2,4.2,2.3,2.3,3.6c-2.4-0.4-4.8-1-7.1-1.3
+			C332.8,233.5,332.6,231.2,332.6,228.9z"/>
+		<path class="st6" d="M655.4,229.5c3.1-0.8,6.9,2.1,5.5,5.5c-0.6,2.3-3.3,1.4-4.9,1.7c-2.9-0.3-5,2.2-7.8,2.2
+			c-0.2-1.1,0.1-2,0.9-2.7C651.1,233.9,653,231.5,655.4,229.5 M653,234.4c2,0.3,4.2,1.5,6.3,1c1.4-1.6,0-4.7-2.3-4.1
+			C654.9,230.8,654,232.9,653,234.4z"/>
+		<path class="st6" d="M1249.1,230c1.4-0.6,2.9-0.8,4.5-0.7c0.1,1.6,0.1,3.1,0.2,4.7C1251,234.6,1250,232.1,1249.1,230z"/>
+		<path class="st6" d="M843.7,241c2.1-4.1,4.4-8,7.4-11.4c-3.4,7.9-7.1,16-13.7,21.8c-0.8,2.7-1.7,5.3-2.9,7.8
+			c-1.7,0.5-3.3,1.1-5,1.6c0.3,2.2,0.6,4.4,0.9,6.5c-2.5,1.2-4.1,3.4-5.4,5.7c-1.5,0.6-3.1,1.2-4.5,1.9c0.4,1.1,0.9,2.2,1.5,3.3
+			c2-0.9,3.9-1.8,5.9-2.7c0.8,1.6,1.6,3.1,2.4,4.6c0.9-3.4,1.5-7.5,5.5-8.7c0.7-3.6,4.9-6.7,3.1-10.5c3.7-2.4,4.6-7.2,8.2-9.8
+			c2.4-1.5,2.7-4.5,3.5-7c0.3,0.8,0.9,2.4,1.2,3.2c-0.3,1.5-0.6,2.9-1,4.4c-1.8,0.7-4,0.9-5.1,2.7c-3.2,3.6-3.7,8.7-6.3,12.7
+			c-1.6,2.3-1.6,5.6,0.4,7.8c-3.2,3.6-5.9,7.6-9.6,10.7c-0.5-1.8-1-3.5-1.5-5.2c-1.3-0.7-2.6-1.3-3.8-2c-0.8,0.8-1.5,1.7-2.3,2.5
+			c0.4,1.1,0.8,2.3,1.2,3.5c-2.2,0.8-4.7,1.3-6.6,2.7c-1.4,2.2-1.6,5.4-4,6.8c-2.4,1.5-5,3-6.2,5.6c-10.2,4.3-21.6,5.8-32.6,4.7
+			c-0.1-4.2-0.6-8.4,0.2-12.5c0.2,2.3,0.4,4.7,0.6,7c2.2-1.6,5.1-3.8,7.3-1c-1.6,1.8-3.2,3.6-4.8,5.5c6.8,0.9,13.6-0.3,20.2-1.6
+			c0.8-1.4,1.6-2.8,2.4-4.2c1.1,1,2.3,2,3.5,3c1.3-1.6,2.3-3.4,3.6-5.1c1.5-1.3,3.3-2,4.8-3.2c1.9-2.1,2.9-5,5.1-6.9
+			c1.1-1.1,2.6-2,3.4-3.4c-0.1-2.5-1.1-5.1-0.7-7.6c3.9-2.6,8.2-5.9,8.9-10.8c-0.6-1-1.8-2.5-3.1-1.8c-2.9,1-3.4,4.2-4.7,6.6
+			c0.1-2.3,0-4.8,1.7-6.5c3.1-3.7,5.5-7.9,8.5-11.8c-1.2,3-2.1,6.1-3.1,9.2c2-0.3,4.6-0.2,5.8-2.3c1.6-2.8,2.4-6,4.6-8.4
+			c1.2-1.1,1-2.6,0.9-4c-1.1,0.2-2.2,0.4-3.3,0.7c1.6-2.5,2.3-5.4,2.3-8.3c-1.8,1-3.8,1.8-5.2,3.4c-1,1.6-1.3,3.6-1.9,5.3
+			c-2-0.1-4.1-0.3-6.1-0.1c-2.8,2.4-5.4,5-8,7.6c-1,2.5-1.2,5.2-1.6,7.9c1.5,2.8,1.4,5.9,0.5,8.8c-2,0.3-4,0.7-6,1
+			c0.5,1.9,1.6,3.5,2.9,4.9c1.1-1.3,2.2-2.5,3.4-3.7c-0.6,3-2.2,5.7-5.4,6.5c-0.9-2.7-2.2-5.2-3.8-7.5c0.1-0.2,0.3-0.7,0.4-0.9
+			c2.5-0.5,5-0.8,7.5-1.2c0.3-2.7-0.4-5.3-1.7-7.6c1.6-3.2,2.3-6.7,0.7-10.1c-0.8,0.7-1.7,1.4-2.5,2.1c0-0.7,0.1-2.2,0.1-2.9
+			c1.4-0.5,2.9-1.1,4.3-1.6c0.7,0.5,1.4,1.1,2.1,1.7c2.5-2.5,4.7-5.5,7.9-7.1c5-2.7,9.9-6,13-10.9c0.3-1.4,2.8-2.4,3.3-0.6
+			c1.7,2.8-1.6,4.6-3.3,6.2C839.9,239.8,841.5,240.8,843.7,241z"/>
+		<path class="st6" d="M1153.8,241.3c0.3-3-1.2-6.5,0.8-9.1c0.3,0.5,0.8,1.4,1,1.9c-0.1,2.5-0.5,5-0.2,7.5c1.7,2,4.2,3.1,6.3,4.7
+			c2,1,0.8,3.7-0.3,5c-1.7,1-3.7,0.4-5.6,0.4c-0.1-3.4-1.4-7.3-4.8-8.5c-2.3,0.2-4.2,1.7-6.2,2.7c-1.6-0.5-3.1-1-4.7-1.6
+			c-0.6,1.1-1.2,2.2-1.9,3.4c1,1.4,2,2.9,3,4.3c-0.9,2.4-2.3,4.9-1.8,7.5c0.2,2.8,2.8,4.5,4.6,6.3c-1.3-0.2-2.5-0.4-3.7-0.6
+			c-0.2,0.7-0.4,2.1-0.6,2.8c-1-1.1-1.9-2.2-2.8-3.3c-1.2,1-2.3,1.9-3.4,2.9c-0.2-0.3-0.8-0.9-1-1.2c2.1-2,5.9-3.1,5.8-6.6
+			c0.2-3,0.7-6.1,0.1-9.1c-1.4-1.3-3-2.4-4.5-3.5c2.3-1.6,4.5-3.2,6.6-5c1.2,0.8,2.5,1.5,3.7,2.2
+			C1147.1,243,1150.4,242,1153.8,241.3 M1156.1,245c0.5,2.1,0.1,5.5,2.9,5.9c1.3-0.4,2.6-1.4,2.5-2.9
+			C1160.4,246,1158.1,245.6,1156.1,245z"/>
+		<path class="st6" d="M76.5,234c1.7,0,3.4,0,5.1,0c-0.7,1.2-1,2.8-2.5,3.3C78.2,236.3,77.3,235.1,76.5,234z"/>
+		<path class="st6" d="M1240.6,234.6c1.3-0.4,2.8-1.3,4-0.2c2,2.5,3.8,5.3,5.3,8.1c-3-0.4-7.1,1.3-9.1-1.7c1.6-0.2,3.3-0.5,4.9-0.7
+			c-0.5-1.4-1-2.9-1.5-4.3C1243,235.4,1241.8,235,1240.6,234.6z"/>
+		<path class="st6" d="M1431.1,234l0.3,0c2.2,1,4.4,1.9,6.7,2.8c0.5,0.9,0.9,1.8,1.4,2.7c0.5,0.3,1.6,0.8,2.1,1.1
+			c0,2.2-0.1,4.4-0.1,6.7c-0.7-1.7-1.3-3.4-1.9-5.2c-1.6-1.2-3.2-2.4-4.9-3.6c-0.5,1.1-0.9,2.2-1.4,3.2c-0.7-0.4-1.4-0.8-2-1.1
+			C1431.3,238.4,1431.2,236.2,1431.1,234z"/>
+		<path class="st6" d="M1514.2,234c0.7,0,2,0,2.6,0c0.8,1.4,1.5,2.7,2.3,4.1c-1.1,0.4-2.2,0.9-3.3,1.3c-1.2,1.3-2.4,2.5-3.5,3.8
+			c-0.3,1.2-0.5,2.3-0.8,3.5c-1.8,0.4-3.5,0.9-5.3,0.9c-2-1.6-3.8-3.8-6.7-3.5c-0.4,1.9-0.7,3.8-1.1,5.8c-2.1-1.6-4.4-2.7-6.9-3.5
+			c-0.2-0.6-0.6-1.9-0.8-2.5c0.8,0.8,1.6,1.6,2.4,2.4c1.3-0.2,2.5-0.3,3.8-0.4c-0.2-0.4-0.7-1.1-0.9-1.5c1.2-1,2.4-2.1,3.6-3.1
+			c1,0.6,2,1.2,3,1.8c-0.6-1.5-1.1-3-1.7-4.4c2,2.1,4.1,4.1,6.2,6.2c0.4-0.3,1.2-0.8,1.5-1.1c-0.4,1.6,2,3.3,2.6,1.1
+			c0.1-1.5-0.5-2.1-2-1.8c1.1-1.4,2.4-2.7,3.7-4c-0.8-1.1-1.6-2.2-2.3-3.3C1511.7,235.2,1512.9,234.6,1514.2,234z"/>
+		<path class="st6" d="M1525.9,234c0.6,0,1.8,0,2.4,0c0.1,3.5-0.1,7.2-3.4,9.1c0.4,1.2,0.8,2.5,1.3,3.7c1-0.8,2.1-1.6,3.2-2.5
+			c1.5,1.8,3,3.6,4.4,5.4c-0.4,0.2-1.3,0.6-1.8,0.9c-2.4-2.8-5.9-2.8-9.2-1.8c-0.3,1.4-0.5,2.7-0.8,4.1c2.4,0.4,5.2-0.2,7.3,1.2
+			c0.1,0.8,0.4,2.3,0.5,3c-2.2-1-4.4-3.6-6.9-1.8c1,1.1,2,2.2,3.1,3.3c-3.1,0-4.3-3-6-4.9c-0.3-3.7,1.3-7.1,1.9-10.7
+			c0.6-0.7,1.3-1.4,1.9-2.1C1524.7,238.6,1525.2,236.3,1525.9,234 M1523.1,245.2c-1.4,1,0.2,3.6,1.7,2.5
+			C1526.1,246.7,1524.6,244.1,1523.1,245.2z"/>
+		<path class="st6" d="M1716.8,234c0.9,0,2.8,0,3.7,0c-0.8,1.8-1.8,3.6-2.9,5.2C1717.2,237.5,1717,235.8,1716.8,234z"/>
+		<path class="st6" d="M1689.2,235.2c1.2-0.4,2.2-0.2,3.2,0.5c0.2,2-0.7,2.8-2.5,2.6C1689.2,237.4,1688.9,236.4,1689.2,235.2z"/>
+		<path class="st6" d="M1409.5,237.1c0.9-1.2,3.4,0,2.4,1.4C1410.9,239.7,1408.4,238.5,1409.5,237.1z"/>
+		<path class="st6" d="M1530.2,237.5c1.4-1.1,3.4,1.1,2.3,2.4C1531.1,241.2,1528.7,238.8,1530.2,237.5z"/>
+		<path class="st6" d="M0,240c3.4-1.2,6.9-1.8,10.5-1.7c0.8,1.8,1.6,3.6,2.4,5.5c-0.5-0.2-1.5-0.5-2-0.6c-1.4-1.7-2.3-4.5-4.9-4.6
+			c-2.8,0.7-1.9,4.4-2.7,6.6c-1.1-0.7-2.2-1.5-3.2-2.2V240z"/>
+		<path class="st6" d="M1112.5,239.2c1.4,0,2.9,0,4.4,0.1c1.5,1,2.7,2.4,4.2,3.5c3.2,0.1,6.6-3.1,9.4-1c-0.3,2.8-1.2,5.5-2,8.2
+			c-1.5-2-0.5-4.4,0-6.5c-5-1.4-8,2.9-9.9,6.8c-0.9-1.1-1.8-2.2-2.8-3.3c0.9-1.3,3.5-2.4,2.4-4.3c-0.9-2.6-5.1-2.3-5.8,0.2
+			c-0.2-0.2-0.5-0.7-0.7-0.9C1112,241.3,1112.3,239.9,1112.5,239.2z"/>
+		<path class="st6" d="M1676.3,239.1c1.2,0.2,3.2-0.2,2.8,1.7c-1.2,1.4-2.6,2.7-3.9,4.1C1673.8,243,1675.9,240.9,1676.3,239.1z"/>
+		<path class="st6" d="M336.5,240.2c1.4-1.1,2.7,1.4,1.4,2.3C336.5,243.5,335.3,241.1,336.5,240.2z"/>
+		<path class="st6" d="M1418.4,240.2c0.4,0.1,1.3,0.4,1.7,0.6c0.6,1.1,1.3,2.3,1.9,3.4c2.2-0.6,4.3-1.1,6.5-1.7
+			c0.1,1.2,0.2,2.4,0.4,3.5c1.7-0.3,3.4-0.6,5.1-1c0.3,0.3,0.9,1,1.2,1.4c-0.6,0.2-1.8,0.5-2.5,0.7c-0.5,2,1.1,3.4,2.2,4.8
+			c-0.3,0-0.8,0-1.1,0c-2.7-1.7-5-4-7.2-6.2c-1.3,0.7-2.5,1.4-3.8,2.1c0,1.7,1.3,3.7-0.2,5.1c-2.2-1-4.3-2.3-6.4-3.4
+			c0-0.7-0.1-1.4-0.1-2.1C1419.9,246.9,1418.1,242.6,1418.4,240.2z"/>
+		<path class="st6" d="M50.8,250.2c-0.3-2.8-0.7-6.6,1.9-8.5c-0.2,1.8-0.5,3.5-0.9,5.2c1.6,0.4,3.2,0.9,4.8,1.3
+			c-0.4,0.8-0.8,1.6-1.2,2.4C53.9,250.7,52.2,250.9,50.8,250.2z"/>
+		<path class="st6" d="M1412,246.1c0.2-1.8,1-3.6,2.9-4C1417.3,244.1,1413.8,245.7,1412,246.1z"/>
+		<path class="st6" d="M654.3,243.3c1.2-0.2,2.5-0.3,3.8-0.3c-0.4,1.5-0.1,3.8-2.1,4C653.8,247.6,653.2,244.7,654.3,243.3z"/>
+		<path class="st6" d="M1726.3,244.4c2-0.4,2.8,3.3,0.8,4C1725.1,248.6,1724.7,244.8,1726.3,244.4z"/>
+		<path class="st6" d="M890.3,246.1c1.8-0.1,5-0.5,5.4,2c-0.6,2.7-3.6,1.2-5.4,0.9C890.3,248.2,890.3,246.8,890.3,246.1z"/>
+		<path class="st6" d="M1443.2,251.4c2-1.4,3.9-3.1,5.7-4.7c2.3,0.3,1.5,3.2,1.8,4.8c-0.7,0.1-2.1,0.3-2.9,0.4c-0.9,1-1.8,2-2.7,3
+			C1444.6,253.7,1443.9,252.5,1443.2,251.4z"/>
+		<path class="st6" d="M324.3,249.3c1.4-0.9,4.2-1.3,4.7,0.8C329.7,253.7,320.5,251.6,324.3,249.3z"/>
+		<path class="st6" d="M456.8,249.9l0.4,0.9c-0.3,4-1.8,7.7-2.8,11.6c-0.6,2.2,0.9,4.3,1.1,6.5c-0.8,2.1-1.9,4.2-2.8,6.3
+			c3.7-3.8,9.5-7,9.6-13c-2,0.6-4,1.2-5.9,1.8c0.1-1.9-0.4-4.1,0.6-5.9c1.9-1.3,4.3-2.1,5.9-4c2.4,4,4.4,8.5,8.4,11.3
+			c-2.5,2.9-3.9,6.5-5.7,9.9c-0.4,0.2-1.2,0.7-1.6,0.9c1-2.8,2.2-5.6,3.5-8.3c-0.9-1.3-1.9-2.6-2.8-3.9c-3.8,5-7.2,10.7-12.9,13.7
+			C452.2,268.1,453.8,258.8,456.8,249.9z"/>
+		<path class="st6" d="M1149.3,250.3c2.5-1.9,3.7,1.6,2.5,3.5C1149.8,254.4,1148.1,252,1149.3,250.3z"/>
+		<path class="st6" d="M302.2,251.2c1.6-0.6,2.2,0,1.7,1.6C302.3,253.4,301.7,252.9,302.2,251.2z"/>
+		<path class="st6" d="M62.4,260c-1-2.7-3.3-7.5,1.2-7.9C64.3,254.8,65.7,258.3,62.4,260z"/>
+		<path class="st6" d="M1402.2,254.5c1.9-0.5,3.8-1.2,5.5-2.2c0.5,2.3,1,4.7,1.7,7c-1.3-0.2-2.5-0.4-3.8-0.6c-0.4-0.5-1.3-1.5-1.8-2
+			c-0.2,1.1-0.4,2.2-0.6,3.2c-1.8,0.9-3.5,2-5,3.4c-2.6,0-5.1,0-7.7,0c0-0.5-0.1-1.6-0.1-2.2c3-0.2,6.6,0,8.5-3
+			c1,0.2,2.1,0.4,3.2,0.6C1402.1,257.3,1402.2,255.9,1402.2,254.5z"/>
+		<path class="st6" d="M1515,253.1l0.4-0.2c0.2,1.4,0.5,2.9,0.8,4.3c1.1-0.3,2.2-0.6,3.4-1c-0.2,0.5-0.5,1.6-0.6,2.2
+			c-0.7,0.7-1.3,1.5-1.9,2.2c1,0.5,2,1,3,1.4c-1.5,0.5-2.9,1-4.3,1.4c-4.6,0.6-9.2,0.5-13.8-0.2c1.7-1.8,4-0.5,5.9-0.2
+			c2.3-1.1,4.6-2.2,6.5-4c-0.9-0.9-2-1.4-3.3-1.6c1.2-0.4,2.3-0.8,3.6-1.2C1514.7,255.2,1514.8,254.2,1515,253.1z"/>
+		<path class="st6" d="M1591.4,255.6c2.2-1.1,3.3,0.7,3.1,2.8C1592.6,260.2,1592.3,256.7,1591.4,255.6z"/>
+		<path class="st6" d="M95.3,256.2c1.5-1.3,2.9,1.5,1.5,2.4C95.2,259.8,93.8,257.1,95.3,256.2z"/>
+		<path class="st6" d="M743.7,262.6c3.2-2.3,6.1-5,9.7-6.7c-1.9,2.4-5,4-5.8,7.1c0.9,2.8,4.4,1.2,6.6,1.4c-1.1,1.4-2.1,3-3.6,4.1
+			c-2.6,0.8-4.9-1.1-7.2-1.9c-0.6,1.1-1.5,2.1-1.6,3.3c0.8,1.8,2.1,3.4,3.9,4.4c1.7,0.5,3.5,0.1,5.3,0.2c-0.3,2.1-0.6,4.9-3.3,5.2
+			c-3.3,0-6.1-2.2-9-3.7c-0.1-2-0.2-4-0.2-6c-5.2,0.3-7.8,5.4-10,9.4c-1,1.4,0.3,2.6,1,3.7c1.8-1.2,3.5-4.1,6-2.6
+			c0.7,2.5-1.5,4.3-2.8,6.1c-3.8,4-7.7,8-11.9,11.6c2.9-5.2,8.2-8.4,11.2-13.5c-1.5-0.1-3.1-1-4.6-0.4c-1.9,1.5-3,3.9-5,5.1
+			c-1.6,0.8-2.8-0.8-3.8-1.8c1.5-0.1,3.1,0,4.6-0.3c0.7-1.2,1.2-2.4,1.8-3.6c-1.8-0.2-3.6-0.4-5.3-0.6c1.5-0.9,3-1.7,4.5-2.6
+			c4.2-2.3,6.4-6.8,9.1-10.6c-1.5-0.1-3-0.2-4.5-0.3c1.8-1.3,3.6-2.4,5.3-3.7c-0.4,1.2-0.8,2.5-1.1,3.7c2.1-0.3,4.2-0.6,6.4-1
+			c-0.4-2-0.6-4.1-0.4-6.1C740.5,262.5,742.1,262.8,743.7,262.6z"/>
+		<path class="st6" d="M1153.7,259.1c4.7-1,9.4-1.5,14.2-2.2c2.5,1.4,5.1,2.6,8,3.2c0.1-0.5,0.3-1.5,0.4-2c1.8,1.7,3.5,3.6,5,5.6
+			c-1.1,0.8-2.1,1.6-3.1,2.4c-1.4-0.7-2.8-1.4-4.2-2c-1.5,0.9-1.5,3-2.3,4.5c-0.3,0.2-0.9,0.6-1.2,0.8c0.2-1.5,0.5-3,0.8-4.6
+			c-1.9,0.4-3.9,0.4-5.5,1.4c-0.1,1-0.1,2-0.1,3c-0.2-0.2-0.7-0.5-0.9-0.7c-0.4-1.6-0.7-3.3-1.2-4.9c-1.3-0.6-2.7-0.9-4-1.3
+			c0.2,1.6,0.5,3.1,0.6,4.7c-2.4,1.1-5.1,0.7-7.6,0.8c0.1-1.1,0.3-2.1,0.4-3.2c-2.2-0.6-4.8-1.2-4.9-4c0.5-0.2,1.6-0.5,2.1-0.6
+			c-0.2,0.6-0.6,1.7-0.8,2.3c3.1,0.7,6-0.2,8.8-1.6C1156.6,260.2,1155.1,259.6,1153.7,259.1z"/>
+		<path class="st6" d="M63.9,261.6c2.4-1.6,5.8-5,8.3-1.7c-1.2,1.2-2.2,2.9-4,3.2C66.5,263.6,65.2,262.3,63.9,261.6z"/>
+		<path class="st6" d="M1703.4,260.4c2.2,0.4,4.5,0.7,6.7,1c0.2,0.9,0.3,1.8,0.5,2.8c-1.6,0.4-3.2,0.3-4.7,0.3
+			c-0.6,2.2-1,4.5-1.2,6.8c0.6-0.6,1.3-1.2,2-1.8c-0.8,4.1,0.9,8.1,2.2,11.9c-1.2-0.2-2.3-0.5-3.3-0.8c-1.2-3.3-1.8-6.7-2.7-10.1
+			c-0.1-2.1,0-4.2,0.3-6.2c0.4,0,1.2,0.1,1.5,0.2C1704.2,263,1703.8,261.7,1703.4,260.4z"/>
+		<path class="st6" d="M29.3,325.9c0.4-20.7-0.4-41.5,0.4-62.2c0.4,40.5,0,81.1,0.2,121.7c-0.7,0.1-2.2,0.4-3,0.5
+			c1,0.3,2,0.5,2.9,0.8c0,3.7,0,7.4,0,11.2c-2.2,2.5-4.6,5-5.8,8.2c0.2,2,2.5,1.9,3.9,2.5c-0.1,0.4-0.4,1.2-0.5,1.6
+			c-2.1-1.1-4-2.4-5.7-4c1.5-2,3.3-3.9,4.1-6.2c-1-2.7-2.4-5.2-2.4-8.2c-1.2-0.3-2.4-0.7-3.5-1c-0.1,0.8-0.2,2.2-0.2,3
+			c-1-0.3-1.9-0.6-2.9-0.9c0.8-0.6,1.5-1.2,2.2-1.9c0-1.6-1.1-3.4,0.2-4.7c2.1-3.2,6.4-1.2,9.4-2.7c0.9-1.2,0.5-2.9,0.7-4.3
+			c-1-0.9-2.1-1.7-3.1-2.6c2.2-1.9,3.6-4.2,2.9-7.2c-2.8,0.7-4.3,3-5.6,5.4c-0.3-1.2-0.7-2.4-1-3.6c2.3-1.6,4.6-3.2,6.8-4.9
+			c-1.9-4.8,0.5-9.8-0.2-14.8c-1.7,0.3-3.4,0.6-5.1,1c0.4-1.4,0.7-2.7,1.1-4.1c1.4-0.2,2.8-0.4,4.1-0.6c-0.1-2.7,0.2-5.6-1.5-7.8
+			c-2.1-0.6-4.2-0.6-6.4-0.7c-0.4-0.8-0.9-1.6-1.3-2.4c3,0.2,5.9,0.5,8.9,0.9c-0.1-2.3-0.2-4.6-0.2-7c-0.7-1-1.3-2-2-3
+			C27.7,327.3,28.5,326.6,29.3,325.9 M24.9,387.1c-1.2,4,1.8,7.3,4.1,10.2c0.5-3.1,0.5-6.2,0.3-9.3
+			C27.8,387.7,26.4,387.4,24.9,387.1z"/>
+		<path class="st6" d="M1145.7,275c0.2-5.2,6.8-6.5,10.6-4c-1.7,0.1-3.3,0.2-5,0.2c0.5,1.1,0.9,2.3,1.4,3.4
+			c-0.9,1.7-2.1,3.2-2.4,5.1c1.2,2.1,2.9,3.7,4.5,5.5c-1.6,0.5-3.3,0.9-4.9,1.4c-1.4-1.7-2.7-3.4-4.2-5c2.6-1.9,4.2-4.6,5.4-7.6
+			C1149.4,274.5,1147.5,274.8,1145.7,275z"/>
+		<path class="st6" d="M0,271.9c0.8,0,2.2,0.1,3,0.2c0.3,0.9,0.7,1.8,1,2.6c-1.3,0.2-2.6,0.5-4,0.7V271.9z"/>
+		<path class="st6" d="M1237.6,272.8c1.5-0.1,3-0.1,4.5-0.2c0.7,1.6,1.3,3.2,2.3,4.6c2.9,0.4,5.9,0.2,8.8,0.3
+			c0.4,1.1,0.8,2.1,1.1,3.2c0.5-0.2,1.5-0.5,2-0.6c0,3,0,5.9-0.1,8.9c-5.3-1-10.4,0.9-15.4,2.1c3.7,2.3,8.2,0.7,12.1,1.9
+			c-2.8,0.2-5.8,0.5-7.9,2.6c-1.5,1-2.6,2.2-3,4c2.1-0.2,7.1,0.9,6.5-2.7c1.6,0.5,3,1.3,3.9,2.7c-3.3,0.8-6.7,1.4-10,2
+			c0.2,5.2,1.4,10.6-0.4,15.6c-1.5-0.3-3-0.7-4.4-1c-0.1-8.4-1-16.7-0.9-25c1.1,0.4,2.2,0.7,3.3,1.1c-0.2-3-0.1-6.1-0.4-9.1
+			c-0.9-1.1-2-1.9-2.9-2.8c0-0.5,0-1.4,0-1.9c3.3,1.4,4.6,4.7,6.5,7.4c1.2-0.4,2.4-0.9,3.7-1.4c-0.4-1-0.7-1.9-1-2.9
+			c0.7-0.9,1.3-1.8,2.1-2.7c-1.6-0.2-3.2-0.5-4.8-0.7c-0.4-1-0.8-1.9-1.1-2.9C1240.3,274.6,1238.8,274,1237.6,272.8 M1247.3,282.5
+			c1.8,2.8,4.8,4.1,7.7,5.3c0-1.4,0-2.9,0-4.3c-1.9-0.9-3.8-1.9-5.5-3.1C1248.8,281.1,1248.1,281.8,1247.3,282.5z"/>
+		<path class="st6" d="M897.1,276.1c1.5-0.7,4-0.1,3.6,1.9c0.1,1.8-2.5,1.4-3.7,1.9C896.8,278.7,896.8,277.4,897.1,276.1z"/>
+		<path class="st6" d="M975.3,278.9c2.2,1.5,2,3.9,1.5,6.3C974.8,283.6,974.6,281.2,975.3,278.9z"/>
+		<path class="st6" d="M668.3,280.9c0.7,0,2,0.1,2.7,0.1c2.3,0.3,1.6,3,1.8,4.7c-1.4,0-2.8,0-4.2,0
+			C668.4,284.1,668.3,282.5,668.3,280.9z"/>
+		<path class="st6" d="M481.1,288c0.4-1.2-0.9-3.9,0.9-4.1c2.4-1.2,2.6,1.5,2,3.1C483,287.4,482.1,287.7,481.1,288z"/>
+		<path class="st6" d="M1729.2,291.2c2.2-2.2,3.6,6.7-0.1,4.7C1728.9,294.4,1727.9,292.4,1729.2,291.2z"/>
+		<path class="st6" d="M1156.1,291.5c2.4,0.9,5.3,1.8,5.8,4.7c-1,0-2.9,0-3.8,0c-0.7-0.8-1.3-1.5-2-2.3
+			C1156.1,293.4,1156.1,292.1,1156.1,291.5z"/>
+		<path class="st6" d="M1202.5,298.1c1-1.9,2-3.8,3-5.6c2.2,2.5,4.3,5,6.4,7.6c-1.5,0.1-2.9,0.2-4.3,0.4c-2.1,2.4-4.6,4.3-7.1,6.2
+			c-2.2,1.6-2.6,4.5-4.1,6.6c-1.8,0.7-3.7,1.1-5.4,1.8c-0.8,1-0.7,2.4-1.1,3.6c0.6,0.3,1.7,1,2.3,1.4c1.4-1.4,2.9-2.9,4.4-4.2
+			c-0.3,1.4,0.1,3.4-1.5,4.2c-1.9,0.7-4,0.7-6,1c-0.5,1.2-0.9,2.5-1.3,3.7c2.8,3.1,3.8,7.4,6.2,10.9c-0.4,0.1-1.2,0.3-1.6,0.4
+			c-3.1-3.5-6-7.1-9.1-10.7c1.2-1.2,3.3-2,3.5-3.9c-2.1-1.8-4.5-0.4-6.6,0.4c-0.5-0.5-1.4-1.6-1.9-2.1c3.4-0.3,6.9-0.2,10.3,0
+			c0.3-2,0.6-4.1,0.9-6.1c2-0.3,4.1-0.6,6.1-0.9c0.7-2.2,1.5-4.4,2.2-6.6c2.4-1.2,4.7-2.5,6.9-3.9
+			C1203.9,300.8,1203.2,299.4,1202.5,298.1z"/>
+		<path class="st6" d="M487.3,295.4c1.1-0.4,2.2-0.9,3.4-1.3c1,3,1.5,6.2,0,9.1C489,300.9,488.3,298,487.3,295.4z"/>
+		<path class="st6" d="M1174.2,302.6c2.5-1.9,4-4.6,5.7-7.1c-0.3,1.5-0.5,3.1-0.7,4.6c1.8-0.1,3.8,0.2,5.5-0.6
+			c1.8-0.5,0.6-2.5,0.7-3.8c0.6,0.2,1.8,0.5,2.5,0.7c-0.1,1-0.2,2-0.3,3c-2,1.1-4.3,1.5-6.2,2.8c-0.7,1.3-0.7,2.8-0.9,4.2
+			C1177.8,306.2,1176.1,304.1,1174.2,302.6z"/>
+		<path class="st6" d="M11.3,298.4c1.9-0.5,2.8,1.6,4,2.6c-1.5,1.5-3.3,2.5-5.3,3C10.3,302.1,9.7,299.7,11.3,298.4z"/>
+		<path class="st6" d="M1089,305.5c0.8-0.9,1.6-1.8,2.4-2.6c-0.8,2.4-2.5,5-1.4,7.6l-0.2,0.2c-2.4-0.5-5-1.2-6.7-3.1
+			C1083.3,304.3,1086.7,304.1,1089,305.5z"/>
+		<path class="st6" d="M1704.2,306.3c1.5-1.2,2.9,1.5,1.5,2.4C1704.1,310,1702.7,307.2,1704.2,306.3z"/>
+		<path class="st6" d="M1.2,309.3c1.6-1.1,3.7-0.9,5.3,0.2c1.4,2.9,3,5.9,3.4,9.2c-0.5,0-1.6-0.1-2.1-0.1
+			C6.5,314.9,3.8,312,1.2,309.3z"/>
+		<path class="st6" d="M1204.5,311c-0.1-3.7,5.3-4.1,7.7-2.5c2.9,1.5,6,5.8,9.5,3.1c1.6,1.9,3.2,3.8,4.6,5.9c-0.9,0-1.7,0.1-2.6,0.1
+			c-1.9-4.5-7.4-3.9-10.8-6.8c-2-1.8-5.3-2.2-6.8,0.4c0,2.7,1,5.2,1.8,7.8c1.3-0.9,2.6-1.8,4-2.6c2.1,0.9,4.3,1.8,6.4,2.6
+			c0.5,2.6,2.7,6.3-0.2,8.2c-1.3,0.9-3,1.9-4.5,1c-3.2-1.5-6.6-2.4-9.9-3.6c-0.2-0.3-0.6-1-0.8-1.3c1.4-0.1,2.9-0.2,4.4-0.2
+			C1206.8,318.9,1205.1,315.1,1204.5,311 M1209.8,321.9c1,1.7,2.3,3.1,3.5,4.6c1.1,0,2.3,0.1,3.5,0.1c2-3.1,0.3-7.5-3.5-8
+			C1211.1,317.5,1209.4,319.9,1209.8,321.9z"/>
+		<path class="st6" d="M663.1,318.4c1.8-3.4,5.1-5.6,9-5.1c-0.6,2-1.9,3.7-3.4,5.2c-0.7,0.7-1.4,1.4-2.1,2.1c-0.5,0-1.6,0.1-2.2,0.1
+			C663.9,319.9,663.5,319.1,663.1,318.4z"/>
+		<path class="st6" d="M1709.5,320.2c1.9-1,3.9-1.9,5.9-2.8c0.2,1.4,0.2,2.8,0.2,4.2C1713.5,321.4,1711.4,321,1709.5,320.2z"/>
+		<path class="st6" d="M631.4,323.7c2.5-0.8,5-1.3,7.6-0.9c-0.7,2-1.2,4.1-2.5,5.8c-1.5,1.1-3.6,0.9-5.3,1.5
+			c0.2,2.4,1.5,4.5,3.8,5.4c2.3-1.5,3-4.7,4.8-6.9c0.9,1.2,1.7,2.4,2.6,3.7c-1,1.7-1.9,3.5-2.8,5.3c-1.2-0.2-2.3-0.5-3.5-0.8
+			c-0.4,2.8-1.3,5.6-4.5,6c1.1-1.2,2.3-2.5,3-4c0.2-1.9-1.8-2.8-3-3.9c-1.9,2.8-4,5.5-7,7.2c0.8-2.1,1.5-4.2,2.2-6.3
+			C628.5,331.9,630.5,328,631.4,323.7z"/>
+		<path class="st6" d="M1195.2,323.2c1.2,0.2,2.7,0,3.9,0.7c1.8,2.5,1.9,5.9,0.7,8.7c-0.5,0-1.5,0-2,0
+			C1196.4,329.6,1195.3,326.5,1195.2,323.2z"/>
+		<path class="st6" d="M1249,322.5c2.1,0.2,4.2,0.5,6.2,1.4c-0.1,0.5-0.3,1.4-0.4,1.9c-1-0.7-2.1-1.5-3.1-2.2
+			c-1.4,1-3.1,1.7-3.8,3.4c-1.8,3.8-3.8,7.5-6.2,10.9c2.4,2,3,5,3.6,7.9c1.3,2.2,4.2,1.8,6.4,2c0,0.5-0.1,1.6-0.1,2.1
+			c-1.3-0.4-2.6-0.8-3.8-1.2c-1.1,1.2-2.2,2.3-3.3,3.5c-0.9-0.7-1.7-1.4-2.6-2c1.1-0.3,2.3-0.6,3.4-0.9c-1.6-3.1-1.6-7.1-4.7-9.2
+			c-0.2,1.4-0.4,2.8-0.6,4.1c-0.8,0.9-1.6,1.8-2.4,2.7c-1.1-0.8-2.3-1.7-3.4-2.5c-0.7,1.2-1.3,2.4-1.9,3.6c-1.8-0.2-3.8,0-5.5-0.8
+			c-1.5-1.8-2.1-4.1-3-6.2c4.2-0.6,8.4-0.6,12.7-1.1c-1.6-1.6-3.4-3-4.7-4.8c0.2-2.4,1.7-4.2,3.7-5.4c0.4,0.4,1.2,1.1,1.6,1.4
+			c-0.7,0.2-2,0.5-2.7,0.7c-0.4,1.2-0.7,2.4-1.1,3.6c0.8,0.6,1.8,1.2,2.6,1.7c0.8-1.1,1.7-2.1,2.6-3.2c1.1,0.7,2.3,1.3,3.4,2
+			c0.5-2.1,0.6-4.2-1.3-5.7c-1.9-1.4,0.2-2.8,1.6-3.4c0.6,1.4,1.1,2.9,1.7,4.3C1245.6,328.1,1247.3,325.3,1249,322.5 M1227.3,341.3
+			c-0.1,1.5-0.1,2.9-0.2,4.4c1.2,0.4,2.5,0.7,3.8,1.1c1-1.4,2-2.9,3-4.3C1232,341,1229.6,341.2,1227.3,341.3 M1236.3,342.2
+			c-1.2,1.5,1.5,2.9,2.5,1.6C1239.9,342.3,1237.2,340.8,1236.3,342.2z"/>
+		<path class="st6" d="M648.6,330.4c2-3,5.6-4.3,8.6-6.2c0.6,0.1,1.9,0.3,2.5,0.4c-0.6,1.5-1.3,3-2,4.5c-2.2,5.2-8.2,6.5-11.1,11.1
+			c-1.4-0.5-2.8-1-4.1-1.6C644.7,336,646.7,333.2,648.6,330.4 M651.7,328.7c-1.2,1.4-1.7,3.3-2.5,5c1.3-0.1,2.7,0.1,3.9-0.4
+			c1.5-1.2,2-3.2,2.8-4.9C654.6,328.4,653.1,328.3,651.7,328.7z"/>
+		<path class="st6" d="M5.1,336.6c-0.4-3.3,1.8-8.4,5.8-7.4c2.6,2.3,2,6.4,2.9,9.6C11.1,337.4,8.1,336.6,5.1,336.6 M9.3,330.4
+			c-2.1,0.4-2.8,4.4-0.2,4.8C12.3,336.1,12.6,329.6,9.3,330.4z"/>
+		<path class="st6" d="M488.1,333.7c-1-1.7,0.6-2.8,1.7-3.9c0.4,1.4,0.8,2.7,1.1,4.1C490.3,333.9,488.9,333.8,488.1,333.7z"/>
+		<path class="st6" d="M1254.3,332c1.3,1.2,1.9,4.4-0.2,4.9C1251.8,336.2,1253,333.2,1254.3,332z"/>
+		<path class="st6" d="M1713.2,332.1c1.9-0.7,3,2.5,0.9,2.9C1712.3,335.5,1711.3,332.6,1713.2,332.1z"/>
+		<path class="st6" d="M1205.6,337.8c1.7-1.5,2.7-4.4,5.3-4.4c2.3-0.1,4.9-0.5,6.9,0.9c0.1,3.4-5.3,5.3-3.9,8.6
+			c2.7,0.4,5.4,0.4,8.1,0.4c0.4,2.1,0.2,4.2-0.2,6.2c1.8,1.3,3.8,2.5,5.9,3.5c0.7,4-3.2,6.1-6.4,7.1c0.1-2.9,3-7.3-0.6-8.9
+			c-2.7-1.4-5.9-0.9-8.5,0.4c1.6,1.1,3.3,2.1,4.8,3.4c0.2,2.5-1.5,4.4-2.7,6.4c-1.7-1.9-3.4-3.9-5-5.9c1.1-1.6,2.1-3.3,3.1-5
+			c-0.6-0.1-1.9-0.2-2.6-0.3c0.5-1.7,1.1-3.5,1.6-5.2c-2.3-0.3-4.6-0.4-6.8,0.3c0.8,1.5,1.6,3.1,2.5,4.5c-0.2,0.5-0.7,1.4-0.9,1.9
+			c-2.1-2.4-4.2-4.8-6.2-7.2c1.4-2.2,3.1-4.3,5.1-6c0.1,1.4,0.3,2.8,0.5,4.2c2.1,0.6,5.2,1.1,6.3-1.3c0.8-1.9,1.9-4.1,0.8-6.1
+			C1209.9,335.4,1207.8,337,1205.6,337.8 M1213.2,345.1c0,0.7,0,2.1,0,2.8c2.2,0.7,5.4,1.7,6.7-0.9
+			C1220.2,343,1215.5,344.1,1213.2,345.1z"/>
+		<path class="st6" d="M478.7,336.5c3.1-2,5,1.9,5,4.6c0.5,1.8-1.3,2.7-2.3,3.9C480.9,342,480.1,339.2,478.7,336.5z"/>
+		<path class="st6" d="M0,338.1c1.1-0.3,2.2-0.6,3.3-0.8c0.3,1.4,0.5,2.7,0.8,4.1c-1.6,1.9-3.1,3.9-4.1,6.2V338.1z"/>
+		<path class="st6" d="M465.5,337.2c0.9-1,3.2-0.7,3.3,0.8C468.6,340.2,464.4,339.1,465.5,337.2z"/>
+		<path class="st6" d="M1717,344.4c0.7,0,2-0.1,2.7-0.2c0,1.3,0,2.6,0.1,3.9C1717.7,347.8,1717.2,346.1,1717,344.4z"/>
+		<path class="st6" d="M1235.2,351.9c1.5-1.1,3.2-1.8,4.9-2.3c0.1,0.8,0.4,2.3,0.6,3c1.4,1,2.7,2.1,4,3.3c-1.6,0.3-3.1,0.7-4.7,1
+			C1238.2,355.3,1236.6,353.6,1235.2,351.9z"/>
+		<path class="st6" d="M1082.1,352.1c0.7,0.1,2,0.3,2.6,0.4c-0.2,1.4,0.5,3.6-1.7,3.4C1081.9,354.9,1082.2,353.4,1082.1,352.1z"/>
+		<path class="st6" d="M1244.5,352.8c2.1,0.6,4.3,1.2,6.4,1.9c1.5-0.7,3-1.5,4.5-2.2c0,2,0,4,0,6c-3.2-0.2-5.9-1.9-8.5-3.6
+			c0.6,2,1.3,3.9,2,5.8c2.1,0,4.3,0.1,6.4,0.1v1.1c-2.7,0.2-5.4,0.5-8.2,0.8C1246.1,359.5,1245.2,356.2,1244.5,352.8z"/>
+		<path class="st6" d="M1075.6,355.6c0.5-0.1,1.6-0.3,2.1-0.4c0.4,1.6,1.4,3.4,0.6,5c-1,0.3-2,0.5-3,0.8
+			C1075.3,359.2,1075.4,357.4,1075.6,355.6z"/>
+		<path class="st6" d="M1718.3,355.3c1.4-2.1,3.9,0.7,3.7,2.5C1720.6,359.7,1717.1,356.8,1718.3,355.3z"/>
+		<path class="st6" d="M726.2,362.7c-0.6-2.6,2.7-2.7,4.4-2.3c1.1,0.7,0.8,2.1,1,3.2C729.8,363.6,727.9,363.8,726.2,362.7z"/>
+		<path class="st6" d="M754,362.5c1.4-0.1,2.9-0.2,4.3-0.3c-0.6,1.1-1.3,2.1-2,3.2c0.5,5.3-1.6,10.3-4.6,14.5
+			c-2.1,1.4-5,1.3-6.8,3.1c-2.1,1.7-3.7,4.5-6.8,4.2c-2.4-1.1-5.6-1.9-6.2-4.9c2.3,1.4,4.6,3.2,7.4,3.3c1,0.1,1.7-0.4,2-1.5
+			c-0.9-2.2-2.1-4.3-3.2-6.4c1.3-0.3,2.7-0.6,4-0.8c2.5,1,4.7,4.3,7.6,2.9c2.1-2.7,3.8-5.8,5.3-8.9C755.1,368,754.4,365.2,754,362.5
+			z"/>
+		<path class="st6" d="M919.2,364.1c2.4-0.6,4.8-2.3,7.4-1.5c-0.6,0.5-1.8,1.4-2.4,1.9c-0.2,0.6-0.6,1.7-0.8,2.3c-1.1,0-2.2,0-3.2,0
+			C919.9,365.9,919.6,365,919.2,364.1z"/>
+		<path class="st6" d="M12.2,370c0.2-2.2,1-4.2,2.2-6c0.6,1.3,1.2,2.7,1.7,4.1c1.1-0.1,2.1-0.2,3.2-0.3c-1.9,1.6-4.2,2.8-6.5,3.7
+			c0.6,3.2,1.8,6.3,3.7,8.9c-1.9,3.2-2.9,8.9-7.7,8.7c-3.1-0.5-5.5-3.6-8.9-2.6V382c3.7,1.7,7.9,3.4,11.9,2c1.2-1.2,2.1-2.7,3-4.1
+			c-2-1.6-4.2-3.7-7-3.3c-2.4-0.2-4,1.9-5.8,3.1c0-1.5,0.1-3,0.1-4.4C5.2,372.7,8.6,371,12.2,370 M5.9,385.1
+			c0.3,2.5,2.6,3.5,4.9,2.9c0-0.7-0.1-2.1-0.1-2.8C9.1,385.2,7.5,385.1,5.9,385.1z"/>
+		<path class="st6" d="M1090.1,364.2c1.4,0.5,2.8,1,4.2,1.7c0.7,1.2,0.4,2.9-0.5,4c-0.8-0.4-1.6-0.9-2.4-1.3
+			c-1.4,0.8-2.9,1.5-4.3,2.3C1087.2,368.3,1088.4,366,1090.1,364.2z"/>
+		<path class="st6" d="M1707,364.9c1.2-0.4,2.7-1,3.8,0.1c0.8,1.6-1.1,3.2-2.6,2.8C1707.7,366.9,1707.3,365.9,1707,364.9z"/>
+		<path class="st6" d="M1727.1,365.1c2.4-1.4,3.6,0.9,3.9,2.9C1729,368.1,1725.6,368.1,1727.1,365.1z"/>
+		<path class="st6" d="M999.2,370.3c0.6-0.3,1.7-0.8,2.2-1.1c0.5,0.2,1.5,0.6,2,0.7c2.2-0.3,4.3-1,6.5-1.1c3.8,1.6,3,6.8,6,9.2
+			c3.3,2.9,7.9,0.5,11.7,1c-3.5,1.5-7.1,2.8-11,2.6c-0.9,0.9-1.8,1.7-2.7,2.6c-0.1-1.3-0.2-2.7-0.3-4c-4.1-1.5-8.4-2.3-12.7-3.3
+			c-3.2-0.6-5.2-3.5-8.2-4.7l1.5-0.7c2.3,0.9,3.9,2.9,6.1,3.9c3.1,1,6.4,1.8,9.8,1.7c2.2-0.8,2.9-3.9,1.2-5.5
+			c-1.4-2.1-3.8-0.7-5.7-0.5C1003.3,372,1001.2,370.9,999.2,370.3z"/>
+		<path class="st6" d="M1234.2,373.6c3.9,0.2,7.6-1.4,10.9-3.3c1.9,0.9,3.8,1.7,5.7,2.6c1.5-1.2,3.1-2.4,4.7-3.6c0,2.1,0,4.2,0,6.3
+			c-1.5,1.1-3.1,2.2-4.2,3.7c0.3,3.8,2.2,7.3,2.5,11.1c-1.9-2.5-3-5.5-3.9-8.5c-0.9-0.5-1.8-1-2.7-1.5c-0.6,0.3-1.7,1-2.3,1.3
+			c1.4,3.9,3.8,7.6,2.8,11.9c-2.7,0-5.3-0.1-8-0.1c-1.7-1.9-3.4-3.9-5-5.9c0.3-0.4,1-1.3,1.4-1.8c-1.3-3.6-0.1-7.3,0.5-10.8
+			c-3.7,0.5-5.6,3.7-6.3,7.1c-0.6-0.8-1.2-1.6-1.8-2.3C1230.3,377.5,1232.1,375.5,1234.2,373.6 M1239,374.2c0.2,1.4,0.6,2.9,1.9,3.7
+			c1.6-1.6,3.3-3.2,5-4.6C1243.6,373.1,1241.2,373.4,1239,374.2 M1241,378.6c-1.1-0.1-2.2-0.2-3.3-0.4c-0.4,1.3-0.9,2.6-1.2,3.9
+			c1.5,2.4,3.1,6,6.5,5.3c2.3-1.5-0.6-4.5,1.4-6.3c0.7-1.2,3.1-2,2-3.6C1244.6,376,1243,379,1241,378.6z"/>
+		<path class="st6" d="M728.9,370.7c2.4,1.3,2.5,4.1,2.9,6.4C729,376.3,728.7,373.2,728.9,370.7z"/>
+		<path class="st6" d="M910.2,378c1.7-0.9,3.4-1.8,5.1-2.8c1.8,0.9,2.6,2.7,2.7,4.7C915.2,381.3,912.5,379.4,910.2,378z"/>
+		<path class="st6" d="M950,375c1.5,0.3,3.7-0.4,4.8,1.1c1.2,1.1,2,3.5,4.1,3.1c1.2-1.2,2.3-2.6,3.5-3.9l0.6-0.5
+			c4.6-0.3,9.3,0,14-0.1c-0.3,0.6-0.9,1.8-1.2,2.4c1.4,1.4,2.9,2.8,4.3,4.1c-0.5,1-0.9,2-1.4,3c-1-1.1-1.9-2.2-2.8-3.4
+			c-0.8-0.6-1.5-1.2-2.2-1.7c-0.1-1.1-0.2-2.2-0.2-3.2c-3.4-0.1-6.9-0.4-10.3,0.3c-2.4,1.3,1.5,6.6-2,5.7
+			C956.4,381.5,954,376.8,950,375z"/>
+		<path class="st6" d="M700.8,379.5c3.1-0.7,6.3-1.3,9.4-2c-0.9,1.4-1.7,3-2.5,4.5c0.3,0.5,1,1.5,1.3,2.1c-1.7-0.5-3.3-1-5-1.5
+			c0.7,1.5,1.2,3,2.1,4.4c1.5,0.5,3.1,0.7,4.7,1c-0.2-1.2-0.4-2.4-0.6-3.6c0.4,0.1,1.1,0.3,1.4,0.4c0.3,1.4,0.5,2.8,0.8,4.3
+			c1.1,0,2.1,0.1,3.2,0.1c-0.1-0.6-0.4-1.7-0.5-2.2c0.5-0.1,1.7-0.3,2.2-0.4c0.4-2,0.8-3.9,1.1-5.9c1.4,1.6,3.3,3,3.8,5.3
+			c-1.3-0.5-2.5-1.1-3.8-1.7c0.7,1.5,1.3,3.1,2,4.6c-0.9,0.4-1.8,0.7-2.6,1.1c-4,0.5-8,0.5-12,0.5c-4.1,0-8.1,1-12.1,0.9
+			c0-2.8-0.1-5.7-0.2-8.5c0.8,0.1,2.4,0.3,3.2,0.4c-0.8,2.3-1.6,4.7-2.3,7c2.5-0.4,6.4,0.8,7.5-2.3c1.2-1.8,0.5-4,0.3-6
+			c0.5-0.8,1-1.5,1.5-2.3C703.1,379.8,701.6,379.6,700.8,379.5z"/>
+		<path class="st6" d="M895.9,380.4c2.1-1.7,6-1.2,6.8,1.6C901.6,385.7,897.6,381.8,895.9,380.4z"/>
+		<path class="st6" d="M1052.2,379.1c2.3-0.3,4.6-0.5,6.9-0.5c-0.6,2-1.2,4-1.8,5.9c-0.9,0-1.8-0.1-2.8-0.1c0-1.5,0-3,0-4.5
+			c-0.8-0.2-2.3-0.5-3.1-0.7L1052.2,379.1z"/>
+		<path class="st6" d="M1092,379c2.6-1.4,3.5,2.5,1.8,3.8C1091.8,382.5,1091.3,380.7,1092,379z"/>
+		<path class="st6" d="M999.9,390.5c2.5-2.6,4.2-5.8,5.7-9.1c1.2,0.9,2.4,1.7,3.7,2.6c-0.9,0.1-2.7,0.3-3.5,0.4
+			c0.6,2,1.7,3.8,3.5,4.9c2.9,1.2,6.1,1.1,9.2,0.8c-0.5-1-1.1-1.9-1.7-2.8c-1.7-0.1-3.4,0.1-5,0.4c4.5-2.1,9.2-6.2,14.5-4.1
+			c-1.9,0.4-3.9,0.7-5.8,1.2c-0.7,2.1,0,4.4,0.2,6.5C1013.8,391.3,1006.8,390.4,999.9,390.5z"/>
+		<path class="st6" d="M582.2,387.1c1.9-1.1,3.3-4.9,5.9-3.2c2.1,0.8,1.1,3.1,1,4.8c-1.4-0.4-2.9-0.9-4.3-1.3
+			c-0.6,0.8-1.2,1.7-1.8,2.6c0.8,0.5,1.6,1,2.5,1.6c0.1,1.1,0.2,2.2,0.4,3.3c-2.9,0.5-5.8,0.8-8.6,1.2c-0.5,0-1.4,0.1-1.9,0.1
+			C577.1,392.8,578.9,389.2,582.2,387.1z"/>
+		<path class="st6" d="M773.9,390.3c1-2.1,2.1-4.1,3.2-6.2c2,1.6,2.5,4.2,2.7,6.7C777.9,390.6,775.9,390.4,773.9,390.3z"/>
+		<path class="st6" d="M1.7,391.7c1.5-0.9,3.3-1.5,4.5,0.2c0.3,2.3-1.8,2.8-3.6,2.9C2.4,394,1.9,392.5,1.7,391.7z"/>
+		<path class="st6" d="M0,397.8c4.1-0.7,8,0.8,11.7,2.4c0,0.6,0.1,1.9,0.1,2.5c-0.8-0.4-1.6-0.9-2.4-1.3c-2-1-4.1-1.7-6.2-2.4
+			c0.4,2.5,1,5.1,2.2,7.4c-0.7,0.2-1.4,0.5-2.1,0.7c-0.3-1.7-0.6-3.5-0.9-5.2c-0.6-0.4-1.8-1.1-2.3-1.4V397.8z"/>
+		<path class="st6" d="M28.3,404.4c0.4,0.1,1.2,0.3,1.6,0.5c-0.1,20.7-0.1,41.4-0.1,62.1c-0.1,4.1,0.8,8.6-1.5,12.3
+			c0.5,0.9,1,1.8,1.5,2.8c-0.5,15,0.4,30-0.1,45c0,13.5,0.4,27-0.1,40.4c-0.1,0.8-0.1,2.2-0.2,3c-1-1.4-2.6-2.6-2.5-4.5
+			c0.5-2.8,2.6-5.1,2.4-8c-0.9-2.1-2.6-3.7-4-5.4c-0.7,0.2-2.2,0.7-2.9,1l-0.7,0.2c-0.1-1.2-0.1-2.3-0.2-3.4
+			c-1.4-0.7-2.8-1.5-4.3-2.2c-0.2,0.4-0.6,1.2-0.9,1.6c1.7,3.1,2.1,6.5,0.5,9.7c-0.9-1.3-1.9-2.7-2.8-4.1c-0.5,0-1.6-0.1-2.2-0.1
+			c0.6,1.2,0.8,2.8,2,3.8c2.7,0.9,5.6,0.4,8.4,0.4c0.2-1.3,0.5-2.6,0.7-3.9c0.5,2,0.7,4,0.9,6c-3.6,0-7.3,0.5-10.7-0.8
+			c-2.2-0.8-3.7-3.1-3.8-5.4c1.4-1.4,3.3-2.2,5-3.2c0.5-1.5,0.9-3,1.4-4.5c0.5-0.1,1.6-0.3,2.1-0.4c2.6,1.3,5.5,1.9,8.4,1.7
+			c0.9,0.6,1.8,1.3,2.7,1.9c0.1-1.3,0.3-2.5,0.4-3.8c-2.2-0.5-4.6-0.8-6.7-1.8c-2.8-1.6-4.3-4.6-6-7.2c1.2-0.6,2.4-1.1,3.6-1.7
+			c1,1,1.8,2.3,3.1,3c1.7,0.2,3.5,0.1,5.2,0.1c0.2-2.1,0.3-4.3,0.5-6.4c-1.2-0.4-2.3-0.8-3.5-1.1c-0.2-2.9,1.5-5,3.6-6.7
+			c-0.1-0.3-0.5-1.1-0.6-1.4c-0.4-1.3-0.7-2.7-1-4c-0.7-0.2-2.1-0.7-2.9-1l0.2-0.5c1.4-0.1,2.8-0.2,4.2-0.4c0.4-4.5,0.4-9-0.2-13.4
+			c-1.5,1.4-3,2.8-4.4,4.2c-1.1-1.1-2.2-2.1-3.4-3.1c0.4-1.2,0.7-2.4,1.1-3.6c-0.8,0-2.4-0.1-3.2-0.1c-1.7,0.4-3.2,1.4-5,1.2
+			c-2.3-1.1-4.2-2.8-6.6-3.7c-1.9-0.3-3.8-0.1-5.8-0.3c-0.1-2.6,2.1-4.8,1.9-7.5c-0.4-5.3,5.1-8.1,7.8-11.9
+			c-0.2-1.9-1.2-4.4,0.7-5.8c2.3-0.2,4.7,0.4,6.8,1.2c1.1,0.4,3,1.3,2.4,2.8c-1.5,3-4.8,4.1-7.4,5.8c-1-0.6-1.9-2-3.3-1.4
+			c-2.3,2.6-4.3,5.5-6.7,8.1c0.6,0.6,1.7,1.6,2.3,2.2c3-2.1,5-5,7-7.9c-0.6,4.2-3.6,7.1-6.6,9.8c4.5,1.2,9.7-0.3,13.3,3.4
+			c1.1-1.1,2.3-2.2,3.4-3.3c1.6,3.1,3.2,6.2,5.6,8.7c-0.5-3.4-1.7-6.9-0.9-10.3c0.6-3.2,1.1-6.4,1.2-9.6c-0.9-1.1-1.8-2.1-2.5-3.3
+			c0.1-2.5,2.4-4.5,2.6-7c0.4-5.9,0.1-11.8-0.3-17.6c0-0.2,0-0.7,0-0.9c-1.1,0.1-2.3,0.2-3.4,0.3c0.5-2.6,2.2-4.7,3.6-6.8
+			c0.1-5.7,0.3-11.4,0.1-17c0.3-2.1-1.6-3.2-2.9-4.5c-0.1-0.5-0.2-1.5-0.3-1.9c0.7-0.2,2.2-0.6,2.9-0.8c0.4-5.7,0.6-11.5-0.5-17.1
+			C28.5,406,28.4,405,28.3,404.4 M12,476.2c0.9,1.7,1.2,5.1,3.9,4.4c2.3,0.1,2.9-2.3,3.1-4.1C16.7,476.1,14.3,475.7,12,476.2
+			 M12.3,499c1,1.1,1.9,2.9,3.7,2.6c2.1-1.1,1.9-3.9,0-5.1C14.3,496.1,13.3,497.8,12.3,499 M21,500.9c1,0.3,1.9,0.5,2.9,0.8
+			c1.6-1.2-0.1-3.3-0.1-4.9C21.7,497.2,21.2,499.1,21,500.9 M21.8,542.9c1.6,1.2,3.2,2.7,5.4,2.6c2.7-0.9,1.1-3.7,0.2-5.4
+			C25.3,540.7,23.4,541.5,21.8,542.9z"/>
+		<path class="st6" d="M1708.3,420.1c1.5-1.2,2.9,1.5,1.5,2.5C1708.3,423.8,1706.9,421.1,1708.3,420.1z"/>
+		<path class="st6" d="M1729.3,427.2c1.6-0.5,2.2,0.1,1.6,1.7C1729.2,429.4,1728.7,428.9,1729.3,427.2z"/>
+		<path class="st6" d="M2.6,448c0.5-1.4,2.1-1.6,3.3-2.2c-0.1,1.4,1.2,3.9-0.8,4.5C3.3,450.5,2.5,449.7,2.6,448z"/>
+		<path class="st6" d="M14.9,451.8c1.7-1.8,4.2-0.6,5.8,0.8c-1.3,0.8-2.6,1.6-3.9,2.5c0.3,1.9,0.6,3.8,0.9,5.7
+			c-1.7-0.1-3.3-0.3-4.9-0.5C13.3,457.4,13.6,454.5,14.9,451.8z"/>
+		<path class="st6" d="M1714.9,457c-0.2-1.3-0.9-3.6,1-4c2.3,0,5.6-0.1,6.1,2.8c-1-0.3-2-0.6-3-0.9
+			C1717.7,455.6,1716.7,457.9,1714.9,457z"/>
+		<path class="st6" d="M1231.2,468.2c0.5-0.3,1.4-0.8,1.9-1.1c0.6,1.4,1.2,2.9,1.8,4.3c-1.1,0.1-2.2,0.2-3.3,0.4c0,2,0.4,4,0.4,6.1
+			c-3.2,1.7-8.2,1-9.8,5c-0.4,2.6,3.4,2.8,5.1,4c0.8,2.3,1.3,4.7,1.6,7.2c-3.2-2.1-6.3-4.3-9.6-6.1c0.8,2.8,1.2,5.6,1.2,8.5
+			c1.2,0.8,2.5,1.5,3.6,2.5c-0.2,1.1-0.7,2.2-1.5,2.9c-0.3-1.3-0.5-2.6-0.8-3.9c-1.9,2.3-4.3,3.8-6.8,5.3c-2.4,2-4.3,4.7-7.3,6
+			c0.8-1.2,1.6-2.4,2.5-3.6c-2.6-1.1-5.7-2-8.4-0.7c-1.5,2.3-1.1,5.6-3.4,7.6c-3,3.4-7.8,3.5-11.4,5.9c0.2-0.7,0.7-2,0.9-2.7
+			c2.9-1.6,6.6-1.1,9.1-3.6c1.7-1.3,3.1-3.3,2.6-5.6c-1.2-0.5-2.4-0.1-3.6,0.3c0.6-1.2,1.1-2.5,1.7-3.8c-1.3-0.4-2.5-0.9-3.7-1.3
+			c0.5-0.2,1.5-0.6,2-0.8c5.2,1.1,10.7,3,16,1.2c0.8-1,1.5-2.2,2.2-3.3c1.4-0.6,4.3-0.3,3.6-2.7c-3.9-1.7-7.8,0.6-11.4,1.8
+			c0-0.7,0.1-2.1,0.1-2.9c1.5-0.1,3.1-0.2,4.6-0.4c0.3-1,0.5-2,0.8-3c1.4-0.2,2.7-0.4,4.2-0.7c0.3-1.3,0.6-2.5,0.9-3.8
+			c2.5-2,4-4.9,6-7.4c2-1.8,4.9-2,7.3-2.9C1229.6,474,1229.3,470.8,1231.2,468.2z"/>
+		<path class="st6" d="M1716.9,473c0.2-1.2,0.5-2.4,0.8-3.6c1.3,1.2,4.8,2,3.1,4.4C1719.4,473.6,1718.1,473.3,1716.9,473z"/>
+		<path class="st6" d="M407.2,476.6c6.8,0,13.4-2,20.2-1.6c-3.4,0.9-6.8,1.7-10.2,2.1c2.3,3.7,5.2,6.8,8.4,9.8
+			c-1.2,0.7-2.4,1.4-3.5,2.1c2.8,0.2,5.5,0.3,8.3,0.3c0-1.7,0.1-3.5-0.1-5.2c-0.5-1.9-2.6-3-2.9-5c0.3-2,2.9-1.9,4.2-2.8
+			c-0.4,4.6-0.2,9.1-0.3,13.7c-4.3,0.3-8.5,0.3-12.8,0.5c0-1.6,0-3.1-0.1-4.7c-1.9,0.2-3.8,0.5-5.7,0.7c-0.6-3-0.6-6.5-3.5-8.3
+			c-1.6,1.8-2.3,5.3-5.2,5.2c-1.9-1-1.8-3.5-2.6-5.2c-2.5,0-4.9,0.1-7.4,0.1c1.7,2.1,3.3,4.3,4.3,6.9c-3.5-0.1-8.3-3.9-5.6-7.5
+			C397.4,476.2,402.4,477.6,407.2,476.6 M412.7,477.4c-0.3,2.8-0.3,5.8,2.3,7.5c0.9-0.9,1.7-1.8,2.5-2.8
+			C417.8,479.3,414.7,478.2,412.7,477.4z"/>
+		<path class="st6" d="M560.5,475.4c2.3-1.2,2.4,3.3,0.3,3.3C559.2,478.4,559.5,476.1,560.5,475.4z"/>
+		<path class="st6" d="M812.3,477.4c0.5-0.2,1.4-0.8,1.8-1c-0.3,0.6-1,2-1.3,2.6c1.1,2.5,2,5.1,2.8,7.7c2.2-0.1,4.5-0.2,6.7-0.2
+			c-0.5,0.6-1,1.3-1.5,2c-1.6,0.1-3.3-0.1-4.9,0.5c-1.8,0.9-1.6,3.2-2.2,4.8c3.5-0.5,7.2-0.8,9.9,1.9c2.4-1.4,4.6-3.2,6.2-5.5
+			c-1.1-0.9-2.2-1.7-3.4-2.6c-0.1-0.9-0.2-1.9-0.2-2.8c1.7-0.8,4-0.8,5.1-2.5c0.4-1.4,0.3-2.9,0.4-4.3c-4.5-0.1-6.2,4.2-8.5,7.2
+			c0.2-1.4,0.4-2.9,0.7-4.3c-1.1,0.6-2.1,1.2-3.1,1.8c-0.6-0.5-1.2-1-1.7-1.4c2.4-1.4,4.5-3.3,7.1-4.5c1.9-0.3,3.9-0.2,5.8-0.3
+			c0.7,2,1.2,4,2.4,5.8c0.7,0.8,1.4,1.6,2.1,2.3c-2.1,2.2-4.3,4.4-5.7,7.1c-1.4,2.7-4.2,4-6.6,5.6c-3-2.1-6.5-3-10.2-2.2
+			c0.2,1,0.6,1.9,1,2.9c1.7,0.2,3.5,0.3,5.2,0.4c0.2,2.2,1.4,5.2-0.9,6.7c-2.8,0.7-5.6,0.7-8.5,1c1.5,1.2,2.9,2.3,4.4,3.5
+			c0.5,1.9,0.3,4,1.5,5.6c2.4,1,5.1,1.2,7.7,1.9c-1.8,0.8-3.6,1.2-5.5,1.4c-0.6,0.8-1.1,1.7-1.7,2.5c-1,0.4-1.9,0.8-2.9,1.3
+			c-1.8,3-2.9,6.3-3.9,9.7c-1.7-0.3-2.9-1.6-4.2-2.7c4.3-1.5,6.3-5.6,7.7-9.5c-1.2-0.7-2.4-1.3-3.5-2c1.6-1,3-2.2,4.2-3.7
+			c-5.9-4.4-10.7-10.2-17.1-13.8c-0.7,1.3-1.4,2.6-2,3.9c-0.6,0.2-1.7,0.7-2.2,0.9c1.4-1.8,2.8-3.9,0.4-5.6c1.7-1.9,4.4-3.7,4.2-6.5
+			c-1.3-2.3-3.2-4.1-4.5-6.4c2.5-3.5,7-4.9,10.2-7.6c-0.1,0.7-0.2,2-0.3,2.7c1.7-0.8,3.4-1.6,5.2-2.4c0.9,1.4,2.5,2.7,1.8,4.6
+			c-1.3,1.2-3,2-4.5,2.9c-0.2,1.1-0.3,2.2-0.5,3.3c3.4-1.2,6.6-3.1,8.8-5.9c-0.9-1.4-1.8-2.8-2.6-4.2
+			C811.6,479.3,812,478,812.3,477.4 M794.6,486.9c0.8,1,1.7,2,2.6,3.1c2.5-2,5.9-4.3,4.9-8C799.3,483.2,796.8,484.9,794.6,486.9
+			 M805.1,482c-1.5,0.8-1.1,2.5-1.3,3.9c2-0.7,4.6-0.8,5.6-2.9C808.8,481.3,806.5,481.8,805.1,482 M800.8,497.3
+			c1.2,0.8,2.4,2.2,4.1,1.6c2.4-1.4,4.6-3.2,6.6-5.2c1.4-1.2,0.1-2.9-0.2-4.2C806.4,489.7,804.1,494.3,800.8,497.3 M804.1,501.1
+			c0.5,2.6,2.1,5,4.5,6.1c0.2-4.2,2.8-7.4,4.3-11.1c-0.4-0.1-1.3-0.3-1.7-0.5C808.8,497.4,806.4,499.2,804.1,501.1 M811.9,503.9
+			c2.3,1.1,4.7,0.7,7-0.1c0-1.3,0-2.6,0-3.9C815.9,499,813.4,501.7,811.9,503.9z"/>
+		<path class="st6" d="M941.5,489.2c2.4-4.1,5.3-7.9,6.2-12.7c1.4,0.2,2.8,0.4,4.1,0.6c-0.2,2.1,0.3,4.6-1.4,6.1
+			C947.9,486,945.9,490.2,941.5,489.2z"/>
+		<path class="st6" d="M0,478.3c3-1.6,3,3.9,0,2.7V478.3z"/>
+		<path class="st6" d="M1729,484.3c1-2.2,2.4-4.2,4-6.1v4.9C1731.7,483.5,1730.3,483.9,1729,484.3z"/>
+		<path class="st6" d="M111.1,480.9c2.6-0.8,5.3-0.7,7.9-0.7c-1.3,3.3-4.9,4.5-7.8,6.2c2.2,2,5.1,1.9,7.9,1.6
+			c0.7,1.1,1.4,2.2,2.1,3.4c-4.8-1.2-9.8-0.9-14.7-1.4C107.9,486.8,109.4,483.8,111.1,480.9z"/>
+		<path class="st6" d="M564.2,484.9c-1.5-1.4,0.9-4.3,2.2-2.4c0.3,0.7,1,2.2,1.4,3C566.7,485.3,564.8,486.3,564.2,484.9z"/>
+		<path class="st6" d="M961.8,482.2c1.8,0,4.7-1.1,5.7,1.1c0.2,1.4,0.4,3.5-1.5,3.5C963.7,486.4,962.7,484.1,961.8,482.2z"/>
+		<path class="st6" d="M1230.9,482c3.1-0.1,7.5,3.2,5.1,6.3C1232.5,488.7,1231.3,484.9,1230.9,482z"/>
+		<path class="st6" d="M356.1,486c2.8,0,4.7,2.1,3.8,4.9c-1.1-0.2-2.1-0.4-3.2-0.6C356,489,356.2,487.4,356.1,486z"/>
+		<path class="st6" d="M672.9,487l1.3,0.2c-0.3,2.2-0.7,4.4-1,6.5c0.3,0.2,1,0.5,1.4,0.6c0.8,1,1.6,2.1,2.3,3.3
+			c-0.6,0.2-1.9,0.5-2.5,0.6c-0.1,0.4-0.2,1.1-0.3,1.4c-1.9-1-3.8-1.9-5.7-2.8c1.2-1,2.3-2,3.5-3C672.2,491.6,672.6,489.3,672.9,487
+			z"/>
+		<path class="st6" d="M978.5,489.3c1.3,0,2.6,0,4,0c0.4,1.9-0.2,4.3,1.5,5.6c1.5,1.5,3.8,0.5,5.7,0.6c0.2,1.7,0.2,3.9-2,4.1
+			c-4.3,0.5-6.4-4.1-7.5-7.6c-1,0.2-1.9,0.4-2.8,0.6C977.8,491.5,978.2,490.4,978.5,489.3z"/>
+		<path class="st6" d="M1195.9,492.9c0.4-1.2,0.8-2.4,1.3-3.6c1.3,0.9,2.6,1.7,3.9,2.6c-1.7,1.6-3.4,3.2-5.2,4.6
+			C1195.9,495.6,1195.9,493.8,1195.9,492.9z"/>
+		<path class="st6" d="M356.3,497.5c-1.4-1.6,0.8-3.2,2.3-2.8c2.3,0.2,4.6,0.5,6.8,1.1c1.5,2.2,0,4.9-0.3,7.3
+			c1.8-0.2,3.5-0.5,5.3-0.4c1.3,1.9-1.2,3-2.2,4.2c-2.1-3-6-3.3-9.2-4.3c1.3-0.6,2.6-1.2,3.9-1.8C361.7,498,358.8,497.9,356.3,497.5
+			z"/>
+		<path class="st6" d="M160.8,496c2.7-1.6,5,1,7.3,2c2.6,0.6,5.5-2,8-0.3c1.4,0.9,0.3,2.9-1.2,2.7c-3,0.2-5.9,0.9-8.9,1.4
+			C163.6,500.8,162.1,498.3,160.8,496z"/>
+		<path class="st6" d="M834.7,498.9c0.9-1.3,1.5-3.4,3.3-3.4c1.5,0.3,2.9,1,4.4,1.6c-1.2,1.8-2.6,3.7-2.8,6c0.8,2.3,3.3,0.5,4.9,0.3
+			c-0.1,0.4-0.4,1.2-0.5,1.6c-1.3,0.7-2.5,1.3-3.8,1.9c0.9,1.7,1.7,3.5,2.1,5.4c-2.4-2.3-4.9-4.5-7.4-6.6c3.3-1.2,4.6-4.8,4.6-8.1
+			C837.8,496.5,836.2,498.3,834.7,498.9z"/>
+		<path class="st6" d="M518,497.1c2.6-1.6,4.8,0.7,6.5,2.5c1.4,1.8-1.2,3.3-2,4.8c0,1.7,0.7,4.1-1.4,4.8c-1.4,1-2.6-0.2-3.6-1
+			c1-2.4,2-4.7,3.1-7C519.7,499.8,518.8,498.5,518,497.1z"/>
+		<path class="st6" d="M1498.9,498.7c1.4,0.1,4.1,0.1,3.8,2.2c0.1,2-1.8,3-3.3,4C1499.3,502.9,1499.1,500.8,1498.9,498.7z"/>
+		<path class="st6" d="M1532.2,498.9c1.5,3.9,2.7,7.9,3.9,12c-0.1,0.4-0.2,1.3-0.3,1.7c-1.4-1-2.9-2-4.2-3.2
+			c-0.1-1.6,0.8-3.1,1.4-4.6c-0.9-0.7-1.8-1.4-2.6-2.1C1530.9,501.5,1531.5,500.2,1532.2,498.9z"/>
+		<path class="st6" d="M1227.1,502.9c-0.5-2.6,1.9-3.4,4-2.9C1230.1,501.5,1229.4,504.3,1227.1,502.9z"/>
+		<path class="st6" d="M393.2,500.8c0.7,0.7,1.5,1.4,2.1,2.2c0,2.4-3.7,3.4-4.6,1C391.5,502.9,392.4,501.8,393.2,500.8z"/>
+		<path class="st6" d="M527.1,502.1c1.2-0.6,2.5-0.8,3.9-1c-0.1,0.5-0.4,1.4-0.5,1.8c-0.9,1.8,0.3,5.4-2.5,5.6
+			C525.7,507.5,524.7,503.5,527.1,502.1z"/>
+		<path class="st6" d="M538,501.4c1.2,0,2.4,0.1,3.6,0.1c1.6,2.5,0.3,5.1-0.7,7.5c2.9-2.3,5.9-5.1,9.9-4.5c-3.8,2.4-7,5.6-10.1,8.8
+			c-1.6-1.7-3.4-3.2-4.5-5.2C536.8,505.8,537.6,503.6,538,501.4z"/>
+		<path class="st6" d="M649.9,503c1-0.3,1.9-0.5,2.9-0.7c2.1,0.9,2.5,4.2,0.1,5.1C650.8,506.9,650.4,504.7,649.9,503z"/>
+		<path class="st6" d="M1726.9,501.9c2.1,0.5,4.1,1.1,6.1,1.9v8.3c-1.2,0.3-2.3,0.6-3.4,0.9c-0.7-1.4,0.3-2.8,0.5-4.2
+			C1729,506.6,1727.9,504.3,1726.9,501.9z"/>
+		<path class="st6" d="M1217.4,508.5c0.8-1.9,1.5-3.9,3.3-5.1c0,0.4,0.1,1.3,0.1,1.7c4.4,0.2,8.8,0.6,13,1.6c0,0.4,0,1.2,0,1.6
+			c-0.4,0.1-1.2,0.2-1.6,0.2c-1.2,0.7-2.3,3-3.8,1.8c-1.6-1.1-3-2.5-4.6-3.5c-1.7-0.3-3.3-0.2-4.9-0.3c0.6,2,1.3,3.9,2,5.8
+			c1.3,0.3,2.6,0.6,4,0.9c-1.5,1.1-2.9,2.3-4.4,3.4c-0.2-0.7-0.5-2-0.7-2.6c-1,0.2-2,0.4-3,0.7c0.9-1.2,1.8-2.4,2.7-3.6
+			C1218.8,510.3,1218.1,509.4,1217.4,508.5z"/>
+		<path class="st6" d="M142.4,508.8c-0.8-2.2,0.6-5.6,3.4-4.5c2.5-0.1,1.7,2.9,2,4.5C146.1,509,143.6,510.8,142.4,508.8z"/>
+		<path class="st6" d="M1516.2,505.2c0.5,0,1.5,0.1,2,0.1c0.8,1.6,1.7,3.3,2.6,4.9c-0.8,0.7-1.6,1.4-2.4,2.1
+			c0.1,0.8,0.2,1.6,0.3,2.4c-0.6,0-1.7-0.1-2.2-0.1C1516.4,511.5,1516.3,508.4,1516.2,505.2z"/>
+		<path class="st6" d="M0,509.3c3.7-0.4,7.3-1.3,10.9-2.3c-2.3,1.9-4.4,4.2-5.8,6.9c-1.8-0.4-3.5-0.9-5.1-1.8V509.3z"/>
+		<path class="st6" d="M12.4,511.3c1.4-1.8,3.7-3.3,6.1-2.8c0.6,2.5-2,4.3-3.1,6.3C14.2,513.9,11.6,513.3,12.4,511.3z"/>
+		<path class="st6" d="M495.5,508.1c1.5,0.8,3.1,1.6,4.6,2.4c0.4,3.1,2.6,4.8,5.6,5.4c-0.3,1.6-0.7,3.3-1,4.9
+			c1.4-0.8,2.7-1.7,4.2-2.2c1.7-0.2,2.6,2.6,1.2,3.5c-2.9,1.8-6.4,2.3-9.8,2.8c0.1-1.5,0.2-3.1,0.3-4.6c-0.9-0.8-1.9-1.7-2.8-2.5
+			c0.5-0.3,1.4-1,1.8-1.3C499.7,513.1,497.2,510.7,495.5,508.1z"/>
+		<path class="st6" d="M677.8,511.1c2.9-0.6,5.5-1.9,8.2-3.1c-1.5,2.6-3.5,5.2-6.2,6.7C677.3,515.6,677.6,512.7,677.8,511.1z"/>
+		<path class="st6" d="M662.2,512.7c-1.8-0.7-3.7-4.5-0.4-3.9C664.7,508.3,662.8,511.6,662.2,512.7z"/>
+		<path class="st6" d="M514.1,517.5c3.7-0.6,6.6-2.9,8.4-6.2c1.8,0.8,3.8,1.2,5.8,1.1c-2.2,0.7-4.3,1.6-6.4,2.5
+			c-1.7,0.5-1.4,2.5-1.9,3.8c2-0.5,4-1,6-1.6c2,0.7,4.1,1.1,6.2,1.6c0.4,0.6,1.1,1.9,1.4,2.5c-1,1.3-2.1,2.7-3.1,4.1
+			c-0.5-0.9-1-1.8-1.5-2.6c1.1-0.8,2.2-1.7,3.2-2.5c-6.2-1.6-12.8-1.3-19,0.2c-2-2.1-3.4-4.8-4.7-7.3c1.1,0.2,2.2,0.5,3.3,0.8
+			C512.7,515.1,513.4,516.3,514.1,517.5z"/>
+		<path class="st6" d="M670.1,511.2c2.5-1.4,7.9,1.4,5.4,4.3c-1.9,0.1-3.5-1.2-5.2-2C668.8,513.3,668.8,511.8,670.1,511.2z"/>
+		<path class="st6" d="M187.6,512.1c4.1-0.8,4.2,5.1,1.1,6.5c-1.3-0.2-2.4-1.1-3.5-1.8C186.7,515.6,187.3,513.9,187.6,512.1z"/>
+		<path class="st6" d="M390.3,517.6c0.9-1.8,1.7-3.7,2.6-5.4c0.1,0.6,0.3,1.8,0.4,2.4c1.3,0.2,2.6,0.3,3.9,0.5
+			c-0.1,6.7,0.1,13.4,0.1,20.1c-0.5,0-1.4,0.1-1.8,0.1c-0.2-0.8-0.6-2.4-0.8-3.2c-0.7-0.2-2.2-0.5-2.9-0.7c0.5-1.4,1-2.7,1.5-4.1
+			c0.6,0.1,1.8,0.2,2.4,0.3l0.5,0.1c0.1-3.7,0-7.3-0.1-10.9c-2.4,1.1-4.3,3-5.6,5.4c-2.2-1.1-4.3-2.3-6.3-3.6
+			c-0.5-0.3-1.4-0.9-1.8-1.2c0.7-0.9,1.5-1.9,2.2-2.9C386.4,515.4,388.4,516.5,390.3,517.6z"/>
+		<path class="st6" d="M688.2,513c1,0.7,4.6,0.5,3.2,2.3c-1,0.4-2.1,0.7-3.3,0.8C688.2,515.3,688.2,513.8,688.2,513z"/>
+		<path class="st6" d="M827.7,515c1.7-1.6,4.2-1.7,6.4-2.2c-0.2,1.3,1.1,3.8-1,4C831.2,516.8,828.9,516.6,827.7,515z"/>
+		<path class="st6" d="M7.3,517.3c3.2-0.3,2.5,3.3,2.4,5.4c-0.6,0-1.9,0-2.5,0.1C6.8,521,5.4,518.5,7.3,517.3z"/>
+		<path class="st6" d="M695.1,520.3c1.5,1.3,2.6,2.9,3.6,4.6c-1.7,1-3.3,2.1-4.9,3.1c-0.3-1.6-0.6-3.3-0.9-4.9
+			C693.6,522.1,694.4,521.2,695.1,520.3z"/>
+		<path class="st6" d="M1190.3,520c2.6,1.8,5.4,3.3,8.2,4.7c1.3,1.8,0.1,4.4,0.1,6.5c-1.9-0.2-2.5-2.1-3.4-3.5
+			c-1.8-1.2-4.1-1.3-6.1-2C1189.3,523.8,1189.7,521.8,1190.3,520z"/>
+		<path class="st6" d="M1532.2,529.2c-1.3-3.2-3-6.6-1.4-9.9c1.3,2.9,3.5,5.2,5.4,7.7C1536,529,1533.8,528.7,1532.2,529.2z"/>
+		<path class="st6" d="M148.1,520.9c0.8,0,2.3,0,3,0c1.3,2.1-1.5,2.8-2.9,3.2C148.1,523.3,148.1,521.7,148.1,520.9z"/>
+		<path class="st6" d="M138.1,524.1c0.2-2.9,3.3-1.2,4.8-0.4c0.4-0.3,1.1-0.9,1.4-1.2c1.8,1.5,4.1,2.6,5.5,4.6
+			c0.3,2-1.7,2.6-3.3,2.7c-0.8-1.4-1.5-2.8-2.3-4.2C142.2,526.3,137.8,527.9,138.1,524.1z"/>
+		<path class="st6" d="M1513.1,521.9c3.5,0.5,5.8,3.4,8.9,4.9c0.8-1.7,1.7-3.3,2.7-4.9c0.2,0.5,0.7,1.6,0.9,2.1
+			c-1.4,2.8-2.4,6-4.5,8.3c-2.2,0.2-5.1,0.1-6.1-2.2C1513.5,527.6,1512.9,524.8,1513.1,521.9 M1515.1,524.9c0.4,1.8,0.4,3.8,1.7,5.4
+			c1.3,1.2,3.7,1.6,4.8-0.2C1520.7,527.1,1517.8,525.5,1515.1,524.9z"/>
+		<path class="st6" d="M510.4,529c-2.4-1.8,0.1-6.8,2.8-6.2C513,525.1,511.3,527,510.4,529z"/>
+		<path class="st6" d="M1230.3,526.3c3.1-2.2,3.8,4,0.8,4.6C1230,529.7,1229.3,527.8,1230.3,526.3z"/>
+		<path class="st6" d="M184.8,530.3c1-2.1,3.2-0.3,4.6,0.2c2-1,4.2-1.8,6.5-1.3c-0.3,1.3-0.5,2.6-0.8,3.9c0.5,1,1.1,2,1.6,3
+			c-0.2,0.4-0.6,1.3-0.9,1.7c-3.4-1.6-6.9-3.3-10.7-4c0.7-1.1,1.4-2.2,2.1-3.4C186.7,530.3,185.4,530.3,184.8,530.3z"/>
+		<path class="st6" d="M170.4,533c-0.3-1.3,0.7-2.2,1.4-3c3.2,2.5,5.6,5.9,8,9.2c2.1,3,6.1,1.2,9,1c-0.8,2-1.2,4.4-2.9,5.8
+			c-2.4,0.8-5.5,0.3-7.5-1.4c-1.3-2.5-1.6-5.4-2.9-8C173.7,535.6,169.9,536.1,170.4,533 M179.2,541.4c-1.1,3.7,5.2,5.8,6.6,2.5
+			C185.1,541,181.3,541.7,179.2,541.4z"/>
+		<path class="st6" d="M817,530.1c2-1.6,4.3,0.7,2.7,2.8C818.5,535.9,814.7,531.3,817,530.1z"/>
+		<path class="st6" d="M1497.4,532.3c2.5-0.8,5-1.5,7.6-2.2c-1.6,3.2-3.9,5.8-6.5,8.2C1498,536.2,1497.6,534.3,1497.4,532.3z"/>
+		<path class="st6" d="M992.4,532.3c1.2-0.1,2.4,0.4,3.6,0.7c-0.9,2.1-2.2,4-4.7,4C991.5,535.5,990.5,533.2,992.4,532.3z"/>
+		<path class="st6" d="M1702.7,533c0.7,0.1,2,0.3,2.7,0.4c0.3,1.1,0.6,2.2,0.9,3.3c0.3,0,0.8,0,1.1,0c-1.3,3-1.3,6.4-1.6,9.6
+			c-1-2.8,0.6-7.3-3.1-8.1C1702.7,536.5,1702.7,534.8,1702.7,533z"/>
+		<path class="st6" d="M390.2,534.6c0.2,1.2,0.4,2.3,0.6,3.5c-1.7,0.7-3.3,1.4-5,2.1c0.7,1.2,1.5,2.4,2,3.8c0.4,2.5-2.6,3.4-4.1,4.7
+			c-1.4-1.6-2.9-3.1-4.4-4.6c3.1-3,5.6-7.1,10.1-8.1C389.5,535.7,390,535,390.2,534.6z"/>
+		<path class="st6" d="M806.2,536c1.3,0,2.5,0,3.8,0c-0.4,1.5-0.8,3.1-1.2,4.7c-0.6,0-1.9,0.1-2.5,0.1
+			C806.2,539.2,806.2,537.6,806.2,536z"/>
+		<path class="st6" d="M151.3,537.4c1.6-0.2,4.4-0.7,4.5,1.7c-0.7,2-3.1,2.2-4.7,3C151.2,540.6,149.5,538.3,151.3,537.4z"/>
+		<path class="st6" d="M158.4,537.3c1.3-1.3,3.6,1,2.3,2.3C159.4,541,157.1,538.7,158.4,537.3z"/>
+		<path class="st6" d="M203.6,542.8c1.6,2.3,3,4.8,4.6,7.1c1.5-0.3,2-2.1,2.9-3.2l0.3-0.4c1.4,3.9,3.4,7.6,5.1,11.4l-0.2,0.2
+			c-2.1,1.5-4,3.3-5.8,5.2c-0.1-3.4,0.1-6.8-0.4-10.1c-0.4-2.7-3.5-2.2-5.5-2.6C204.2,547.8,203.9,545.3,203.6,542.8z"/>
+		<path class="st6" d="M1514.4,544.1c1.7,0.5,3.4,1,5.1,1.5c0,1.4,0.1,2.7,0.2,4.1c-1-0.1-2-0.2-2.9-0.3
+			C1516,547.7,1515.2,545.9,1514.4,544.1z"/>
+		<path class="st6" d="M825.7,544.7c3.3,0.4,6,2.2,7.8,5c-1.1-0.5-2.2-1-3.3-1.5c0,0.7-0.2,2-0.2,2.7c-1.7-2.5-4.6-2.8-7.4-2.6
+			C823.6,547.1,824.6,545.9,825.7,544.7z"/>
+		<path class="st6" d="M716.9,550.1c1.2-0.3,2.5-0.6,3.8-0.9c0.8,3,2.4,5.5,4.2,8c0.9,2.4-1.8,1.4-2.9,0.9c-2.4-1-3.1-3.7-3.7-6
+			c-0.4,1.5-0.8,3-1.1,4.5C717.2,554.4,717.1,552.2,716.9,550.1z"/>
+		<path class="st6" d="M1712.8,548.9c0.8,0.1,2.5,0.3,3.3,0.4c-0.1,2.4-1.7,3.8-4,3.8C1712.3,551.7,1712.5,550.3,1712.8,548.9z"/>
+		<path class="st6" d="M698.3,550.3c1,0.2,2.1,0.4,3.1,0.7c0,1.1,0,2.1,0,3.2c2.1-1.7,4.2-3.6,7-4.2c1.2,2.2,2.2,4.7,4,6.5
+			c1.8,1.3,4,2.1,5.8,3.5c1,2.9-2.3,4.4-3.7,6.4c0.1,4.3,1.2,8.6,1,12.9c-0.9-0.1-2.6-0.2-3.5-0.2c0.2-1.3,0.3-2.5,0.5-3.8
+			c-0.6-0.7-1.3-1.5-1.9-2.2c-4.7,2.3-6.7,7.7-11.5,9.9c-1.2-2.5-2.2-5.1-2.8-7.9c-1.3-0.9-2.6-1.8-3.9-2.6
+			c-0.8,1.9,0.6,3.5,1.5,5.1c-1,1.5-2.1,3-3.2,4.5c0.3,1.1,0.7,2.2,1,3.4c-1.7-0.8-3.3-1.6-5-2.4c-0.5,1.3-0.9,2.6-1.3,3.8
+			c-0.2,0.7-0.5,1.3-0.7,2c-0.3-5.1-1.1-10.2-2-15.3c1.4,2.2,2.5,4.6,3.5,7c1.5-0.7,3-1.4,4.6-2.1c-2.4-3.3-4-7.3-7.5-9.7
+			c-0.2,0.7-0.8,2.1-1,2.8c-0.5-2.1-1.1-4.2-1.7-6.3c0.3-0.6,0.9-1.7,1.2-2.2c0.5,0,1.5,0.1,2,0.1c1.2-0.3,2-1.1,2.5-2.2
+			c-2.4-0.9-5.5-0.2-7.3-2.4c0.7-0.2,2.1-0.7,2.8-1c0.8-2.5-1.2-3.6-3-4.7c1.6-0.5,3.2-1,4.9-1.6c0.7,0.5,1.4,1,2.2,1.5
+			c1.7-0.4,3.6-2.3,5.3-0.8c0.8,2.9,0.9,5.9,1.3,8.8c-2.5,0.5-3.5-1.4-4.2-3.4c-0.3,1.7-0.5,3.4-1,5.1c-1.5,1.3-3.3,2.1-5.1,3
+			c-0.1,0.5-0.2,1.5-0.3,2c2.4,0.4,4.7,1.1,7.1,1.8c3.3-0.8,0.4-3.3-0.4-5c1.6-0.3,3.2-0.5,4.8-0.8c0.4-2.1,0.4-4.4,1.3-6.4
+			c1.2-0.8,2.6-1.4,3.9-2C698.5,553.3,698.3,551.8,698.3,550.3 M696,557.9c-1.2,4.1-1.7,9.1-5.2,11.9c-0.7,1-3.1,1.8-1.8,3.3
+			c2.6-0.2,4.8-3,7.7-1.5c3,1.1,1.8,4.5,1.9,7c1.6,0,3.3,0.1,4.9-0.2c1.6-1.5,2.4-3.6,3.7-5.3c1.4-2.3,4.2-3.2,5.4-5.6
+			c1.4-2.5,3.3-4.6,5.2-6.6c-3.1-1.9-6.9-1-10.3-1.3c-0.1-2.1,0.7-4,1.7-5.8c-1-0.3-1.9-0.5-2.9-0.6
+			C702.7,554.7,699.4,556.4,696,557.9 M687.2,581.2c-0.5,1.6,0,2.2,1.7,1.7C689.4,581.2,688.9,580.7,687.2,581.2z"/>
+		<path class="st6" d="M178.4,551.4c3.7,0.3,7.1,2.1,10.2,4.1c1.7,1,0.8,3.4,1.2,5c-1.6-1.1-2.5-2.8-3.3-4.4
+			c-1.2,0.8-2.5,1.6-3.7,2.4c2,1.1,4,2.2,6,3.3c-0.4,0.6-0.8,1.3-1.2,2c2.4,2.6,4.7,6,8.5,6.2c2.2,0.2,5.6-0.2,6-2.9
+			c0.7-3.2,1.5-7.6-1.9-9.5c-2.8,1.5-4.3,4.8-7.4,5.9c0.6-1.6,1.1-3.2,2.3-4.5c2.6-3.4,7.4-2.4,11.1-3.6c0.3,0.8,0.6,1.6,0.9,2.4
+			c-1.2,1.6-3.9,2.9-3.1,5.2c1.4,3.2,4.4,5.8,3.8,9.6c-4.3-0.1-8.7,0.5-13,0.6c-3.1-0.5-6-2.1-9.2-2.3c-3.1-0.2-6.2,0-9.3,0.1
+			c0.4,3.9,0.4,7.9,0.3,11.8c-1.4-2.8-2.6-5.7-3.2-8.8c-1-1.6-1.9-3.2-2.9-4.8c0.3-0.7,1-2.1,1.3-2.8c-2.2-1.5-3.8-3.6-4.6-6.1
+			c2.1,1.3,4.3,2.5,6.4,3.7C175,559.7,175.2,554.8,178.4,551.4 M176.9,556.1c-1.3,2,1.3,3.8,3.2,3.2c1.5-1.2,1.3-3.2,1.7-4.8
+			C180,554.5,177.4,553.7,176.9,556.1 M176.2,563.7c0.6,2.2,1.7,4.3,3.1,6.1c1.4-0.3,3.1,0,4.2-1.1c0.2-2.4-1.4-4.3-2.8-6.2
+			C179.3,562.9,177.8,563.3,176.2,563.7z"/>
+		<path class="st6" d="M1461.5,551.8l0.5,0.4c2.6,2.2,4.4,5.1,6.2,8c0.6-0.7,1.2-1.4,1.9-2c-0.6-1.3-1.2-2.7-1.8-4
+			c0.6-0.7,1.3-1.3,2-2c0.3,0.2,0.9,0.7,1.3,0.9c0.2,1.6,0.3,3.2,0.7,4.7c1.5,0.7,2.9-1.2,4.2-1.7c-1.5,1.9-3.2,3.7-4.4,5.8
+			c0.5,4.6,4,7.9,8.3,9.2c-0.1,0.8-0.2,2.2-0.2,3c-0.4,1-0.8,1.9-1.1,2.9c-0.1-0.6-0.3-1.7-0.4-2.3c-5.2-3.4-6.2-10.1-10.5-14.1
+			c-2.9-0.3-2.7,3.2-3,5.1c-2.2-1.6-4.7-2.8-7.3-3.5l0.6-0.1c2.2-0.3,4.5-0.7,6.8-1.1C1463.4,558.1,1461.7,555.2,1461.5,551.8z"/>
+		<path class="st6" d="M1702.7,551.7c3.2,0.2,6.8,0.8,8.7,3.6c0,1.8-0.4,3.5-0.6,5.3c2-0.6,4-1.2,6-1.7c0,1.3,0,2.6,0,3.9
+			c-2.5,0.1-4.9,0.2-7.3,0.3c-1.5,2.7-4,4.4-6.9,5.2c0-0.6,0-1.7,0-2.3c2.1-1.6,4.3-3,6.5-4.4c-1.7-1.9-4.1-2.9-6.5-3.8
+			C1702.7,555.8,1702.7,553.7,1702.7,551.7 M1704.3,554.2c-1.4,0.9-0.1,3.8,1.5,2.6C1707.1,555.8,1705.8,553,1704.3,554.2z"/>
+		<path class="st6" d="M803.4,553.4c2.8,0.3,5.6,0.6,8.4,0.9c-2.7,2.4-6.5,4.7-6,8.8c1.6-0.9,3.2-1.9,4.8-2.9
+			c-1.2,2.9-3.8,4.7-6.4,6.1c0.2-1,0.4-2.1,0.7-3.2c-1.5-0.3-3-0.7-4.5-1c-2.3,2.6-5.3,4.6-8.7,5.3c0-0.8,0-2.5,0-3.4
+			c1.3,0.2,2.6,0.4,4,0.7c1.4-1.3,2.9-2.7,4.4-4c1.3,0.1,2.7,0.2,4,0.3C803.7,558.5,803.5,556,803.4,553.4z"/>
+		<path class="st6" d="M836.1,553.1c2,3.3,3.4,6.9,5,10.4c0,3,0,6-0.3,9c-3-3.8-2.1-8.9-2.9-13.4c-1.2,4.1-2.6,8.1-3.8,12.3
+			c1.8,0.5,3.6,1,5.4,1.6c-0.3,2,0.1,4.4-1.5,6c-1.5,1.9-4,1.3-6,1.5c-0.1-2.1-0.2-4.1-0.3-6.1c-1.6-0.1-3.2-0.1-4.8-0.1
+			c-0.1-2.3-0.2-4.7-0.2-7c-1.7-1.3-3.4-2.5-5.2-3.8c1.2,4,1.1,8.2,1,12.3c-0.9,0.7-1.9,1.5-2.8,2.2c-0.1,1.8-0.1,3.6-0.1,5.4
+			c4.1,3.9,5.5,9.6,7.5,14.7c1.7,0.3,3.4,0.7,5,1.1c2.2-0.6,4.4-1.4,6.5-2.2c0-3.4-0.8-7.4,2.2-9.8c0.3,2.9,0.5,5.8,0.4,8.7
+			c2,1.8,0.7,4-0.3,5.9c-2.7-2.5-6.6-1.3-9.8-0.7c-1.8-0.6-3.6-1.3-5.4-1.9c-1.2-5.8-4.7-10.7-9.1-14.5c0.9-2,2.1-4.1,1.3-6.3
+			c-1.5,1-3,2-4.6,2.9c0.8-1.7,2-3.2,2.2-5.1c-0.3-2.1-1.3-4.1-2.1-6.1c1.6-0.9,3.2-1.7,4.9-2.6c-2.5-0.9-5-1.6-7.5-2.2
+			c-2.2,2.9-6.1,5.8-5,9.9c0.8,3.6,0,7.2-1,10.6c-2.8-2-3.8-5.5-5.5-8.4c-1-2.9-2.5-7.4,1.3-8.9c-1,1.9-1.5,4.2-0.5,6.2
+			c0.7,2.1,2,5.6,4.9,4.1c-0.5-1.7-1.3-3.2-2.1-4.8c2-3,3.8-6.2,6.3-8.8c1.1-1.5,3.2-0.8,4.8-1.1c2.7,0.1,5.1-1.2,7.7-1.8
+			c2.7,1.1,5,2.9,7.4,4.5c-0.6,1.6-1.2,3.1-1.8,4.7c1.8,1,3.9,1.4,5.9,1.7c0-2.5-0.6-4.8-1.7-7c1.3-1.3,2.7-2.5,3.7-4
+			c1.2-2.6-0.9-5-2.2-7c0.9,0.2,1.7,0.4,2.6,0.7C835.8,555.1,836,553.8,836.1,553.1 M817.3,571.4c-1.9,0.9,0.5,5.6,2.4,3.3
+			C821.8,573.6,819.2,569.1,817.3,571.4 M834,573.2c-0.5,1.3-0.9,2.5-1.2,3.8c0.6,0.9,1.3,1.8,2.1,2.6c1.8-1.5,3.9-3.1,3.4-5.8
+			c-0.6,0.1-1.9,0.4-2.6,0.5C835.1,573.9,834.6,573.5,834,573.2z"/>
+		<path class="st6" d="M327.7,557.4c1.9-0.2,4.2-0.1,4.8,2.2c0.8,1.4-0.8,2.4-1.5,3.3c-2.4,2.1-4.6,4.9-8,5c0.2-2.4,2.2-3.7,3.6-5.4
+			C327.3,561,327.4,559.1,327.7,557.4z"/>
+		<path class="st6" d="M1180.2,558.3c0.6,0.1,1.9,0.2,2.5,0.3c0,1.7,0.3,5.9-2.4,5C1178.4,562.5,1180.1,559.9,1180.2,558.3z"/>
+		<path class="st6" d="M0,561.8c2-0.7,4-1.2,5.9-1.8c-1.9,2.8-3.4,5.9-4.7,9.1c-0.3,0-0.9-0.1-1.3-0.2V561.8z"/>
+		<path class="st6" d="M724.5,566.1c-4.2-1.2-2-7.1,1.7-6.2C726.7,562.2,725.1,564.1,724.5,566.1z"/>
+		<path class="st6" d="M1539.6,567.5c1.1-2.8,1.4-7.5,5.4-7.4c3.8,0.7,6.3,4.5,8.8,7.3c1.1,3-2.2,3.5-4.3,3.4
+			c-0.6-0.9-1.2-1.7-1.8-2.5c-2.1,0.9-5.4,0.9-5.9,3.6c-0.4,3.6-0.2,7.2-0.9,10.8c3.8-0.4,7.5,0.5,11.2,0.6c3.5-0.2,3.3-4.1,3.8-6.7
+			c0.5-0.3,1.4-0.8,1.9-1l0.2,0.6c-1.4,3-1.6,7.3-5.1,8.7c-3.1,1.4-6.5-0.5-9.7,0.1c-2.6,0.8-3.7,3.6-4.9,5.7
+			c-0.8-2.1-2.6-4.3-1.7-6.6c1.2-1.9,2.6-3.6,3.9-5.5c-1.6-2.3-2.2-5-2.6-7.7c-1.3,0.6-2.6,1.2-3.8,2c-0.8,3,1.4,6.4-0.8,9
+			c-2.4,1.9-5.5,2.6-7.9,4.3c-0.4,1.8,1,3.2,1.8,4.6c-0.1,1.2-0.2,2.4-0.3,3.6c-1.1-3.1-4.6-6.3-3-9.8c2.5-2,6.1-1.7,8.5-3.7
+			c1.3-2.9-0.4-6.4,0.6-9.3C1534.8,569.9,1537.4,569.1,1539.6,567.5 M1543.7,561.7c-2.2,1.2-1.4,3.9-1.3,5.9c2.7,0.5,4.7-1.2,6.4-3
+			C1547.9,562.9,1545.9,560.3,1543.7,561.7 M1548.8,566c0.4,2.2,2,3.5,4.3,3.1C1552.5,567,1551.2,565.4,1548.8,566z"/>
+		<path class="st6" d="M1232,576.1c-1-4.3-1.5-9.3,1.2-13.2c0.8,2.6,1.9,5.2,2.4,7.9C1235.5,573.2,1233.4,574.6,1232,576.1z"/>
+		<path class="st6" d="M219,563.5c1.2,2.1,2.3,4.2,3.1,6.5c-1.4-0.3-2.9-0.5-4.3-0.9C216.6,567.2,218.5,565.3,219,563.5z"/>
+		<path class="st6" d="M214.2,565.2c1.7,0,1.2,2.8-0.2,2.8C212.4,568,212.8,565.3,214.2,565.2z"/>
+		<path class="st6" d="M728.4,569c1.2-2.4,3.7-0.3,5.5,0c0,0.8,0.1,2.5,0.1,3.3C731.7,572.1,729.7,570.9,728.4,569z"/>
+		<path class="st6" d="M986.5,571.3c2-1.4,5.4-3.8,7.3-1c-0.4,2.5-2.3,4.6-3.4,6.9c1.7,1.4,3.8,2,6,2.5c0.6,1.6,0.6,3.7,1.9,5
+			c1.5,0.5,3.2,0.7,4.8,1.2c4.6,4,3.4,13.5-3,15c-2.8,1-5.7-0.4-8.6-0.7c-0.3,0.3-0.8,0.9-1.1,1.2c1.3,0.3,2.5,0.7,3.8,1
+			c-1.5,0.4-3,0.7-4.4,1.3c-0.4,1.9-0.5,3.9-0.7,5.8c1.8-1.1,3.5-2.3,5.3-3.4c0.3-0.6,0.8-1.7,1-2.3c0.8,3.3,3.1,5.9,5.3,8.4
+			c-3.3,2.5-6-1.1-8.2-3.2c-1.8,2.1-3.3,4.4-5,6.6c-0.8,1.3-3.5,1.2-3.7-0.7c-0.8-2.5,2.3-3,3.7-4.4c0.5-3,0-6.1-0.1-9.1
+			c-1.3-1-3.4-1.6-3.7-3.5c-0.5-1.8,0.6-3.3,1.2-4.9c1.5,0.2,3.1,0.4,4.6,0.6c2.1-1.7,4.1-3.5,5.7-5.8c-3.1-1.3-6.5-1.3-9.6-2.6
+			c-1.7-1.5,0.2-3.4,0.7-5C987.9,577.6,988.9,573.8,986.5,571.3 M989.3,579.2c-1.2,1-1.7,2.6-2.6,3.9c2.6,2,5.9,3,9.1,1.8
+			c0.1-1.2,0-2.4-0.1-3.6C993.7,580.2,991.5,579.3,989.3,579.2 M996.2,591.3c-3.3,2.2-6.8,3.9-10.8,4c-1.7,1.6-0.2,4.4,2,4.4
+			c3.3-0.3,6.5-0.8,9.8,0c2.9,0.8,6.8-1.2,6.3-4.6c-0.1-2.7,0.8-6.3-1.5-8.3C998.6,585.5,997,588.6,996.2,591.3z"/>
+		<path class="st6" d="M1011.9,570.2c3.7-0.1,7.6,0.8,9.9,3.9c-1.5,1.4-3.5,2.1-5.5,1.4C1014.3,574.3,1012.9,572.3,1011.9,570.2z"/>
+		<path class="st6" d="M154.6,571.2c1.5,0.7,3,1.5,4.5,2.2c0.1,2.5,0.1,5,0.1,7.5c-3.1-0.5-6.1-1.2-9.2-1.3
+			c-2.9,1.2,0.1,3.7,0.8,5.6c-0.9,0.5-1.9,0.9-2.8,1.4c-1.6,2.9-4.2,4.8-7,6.5c-1-0.8-1.9-1.5-2.9-2.3c2.7-2.6,5.9-4.4,9.4-5.5
+			c0.2-0.5,0.7-1.6,0.9-2.2c-2.5-1.5-4.9-5.2-2.1-7.6c2.8-0.3,5.5,0.1,8.3-0.2C154.7,574,154.7,572.6,154.6,571.2z"/>
+		<path class="st6" d="M500.5,571c1.1,1.2,2.3,2.4,3.5,3.5c1-0.7,2.1-1.3,3.1-2c1,0.4,1.9,0.8,2.9,1.2c-0.7,2.6-1.7,5.1-2.9,7.5
+			c-0.6-0.6-1.3-1.2-1.9-1.7c0.5-1.1,1-2.3,1.4-3.5c-0.9-0.6-1.9-1.1-2.8-1.6c0,0.9,0,2.7,0.1,3.6c-0.9-1.1-1.9-2.2-2.8-3.2
+			c-0.2,3.6,0.6,7.2,4,9.2l-0.8-0.6c-2.6,0.2-4.1,2.8-2,4.8c0.9,1.4,1.8,2.8,2.6,4.3c-2-0.5-3.9-1-5.9-1.5c-1.6,0.5-3.2,1-4.8,1.6
+			c-0.8-1.6-1.8-2.1-2.9-1.3c-0.8,0.6-1.5,1.1-2.3,1.7c-0.1-0.5-0.2-1.5-0.3-1.9c0.6-1.4,1.3-2.9,2-4.3c-2.1-1.2-4.2-2.2-6.5-3
+			c-0.1,0.7-0.2,2.2-0.2,2.9c-1.8,1.2-3.8,2.4-6,1.6c0.1-2.4,0.2-5.2-2.3-6.3c-1,2-1.9,4-2.9,6c-0.3-0.2-0.9-0.5-1.2-0.7
+			c-1.4-0.8-2.8-1.6-4.2-2.4c0.4-0.9,0.8-1.9,1.1-2.8l2,0.6c0.3,0.1,0.8,0.3,1.1,0.4c0.2-2,0.3-4,0.6-5.9c0.6,1.4,1.3,2.8,1.9,4.2
+			c1.6-2.7,3.3-5.3,4.7-8.1c3.7,2.4,8,3.6,12.2,4.8c0.6-0.6,1.3-1.1,2-1.7c1-0.4,2.1-0.8,3.1-1.3c0.5-0.8,1-1.7,1.4-2.5
+			C498.2,571.9,499.7,571.3,500.5,571 M481.4,576.9c-2.8,2.1-3,5.4-1.9,8.5c0.6,0.1,1.9,0.4,2.5,0.6c0.3-1.6,1.3-3.3,0.8-4.9
+			c0.6,0.2,1.7,0.5,2.2,0.7c0.2-1.2,0.1-2.5-0.3-3.6c-0.9,0.1-1.8,0.3-2.7,0.5C481.9,578.2,481.5,577.4,481.4,576.9 M495.9,588.8
+			c-0.2,0.5-0.6,1.6-0.8,2.1c2.1-0.4,4.2-0.8,6.4-1.2C500.1,587.8,497.9,588.5,495.9,588.8z"/>
+		<path class="st6" d="M223.6,573c1.8,3.5,4.1,7,4,11.1c1,0.8,2,1.7,2.6,2.9c-1.6-0.5-3.1-1-4.7-1.5c0.1-2.1,0.3-4.2,0.5-6.3
+			c-2,0.3-4.1,0.5-6.1,0.8C220.1,577,221.7,574.8,223.6,573z"/>
+		<path class="st6" d="M1260,573.2c1.6,0,3.2,0,4.8,0c-0.1,1.1-0.1,2.3-0.1,3.4c-0.8,0.4-1.7,0.8-2.5,1.2
+			C1261,576.5,1260.3,575,1260,573.2z"/>
+		<path class="st6" d="M1522,574.1c2-0.7,4.3-1.3,6.3-0.3c0.7,1.7,0.1,3.4-0.6,5C1525.8,577.2,1523.9,575.6,1522,574.1z"/>
+		<path class="st6" d="M209.2,575.3c1.5,0,3.1,0,4.6,0.2c1.3,0.6,1.6,2.2,2.3,3.3c-2.2,0-4.5,0-6.7,0
+			C209.3,577.6,209.2,576.4,209.2,575.3z"/>
+		<path class="st6" d="M393.6,576.5c2.1-0.7,3.3,1.3,4.7,2.4c0,4.2,0.1,8.4,0.1,12.6c-3.1,1.5-7.2,3.1-6.9,7.3
+			c1.5,0.6,3,1.2,4.5,1.8c-0.4,1.7-0.4,3.7-2.1,4.6c-1.6-0.7-2.8-2.1-4-3.3c-1.5,0.5-3,1-4.4,1.8c-0.5,2.1,0.1,4.7,2,6
+			c2.6,1.2,6.1,1.2,6.4,4.9c-3.7-0.1-7.4-0.6-11.1-1.2c-1.9,3.6-4.7,6.6-7.8,9.2c0.3-4.6,5.2-6.5,7-10.5c1-0.4,2.1-0.9,3.1-1.3
+			c-0.6-2.3-1.3-4.6-2-6.9c-3.2,3.3-6.4,7.9-11.5,8c0-2,0-3.9,0-5.8c3.6-0.5,7.5-1.4,10-4.3c0.7-2,1.1-4,1.8-5.9
+			c1,1.3,2,2.6,3.1,3.9c1.2-0.3,2.4-0.7,3.6-1c-0.9-2.6-2.8-5.3-1.5-8.1c2-0.3,3.7,1.2,5.6,1.8c1.1-1.3,2.2-2.8,2.5-4.5
+			C395.3,584.1,391.9,580.7,393.6,576.5z"/>
+		<path class="st6" d="M734.7,578.6c1.1-0.2,2.1-0.4,3.2-0.6c0.8,3.6,1.4,7.2,1.9,10.8l-0.8,0.7c-1.1-0.6-2.2-1.1-3.2-1.7
+			c0.6-0.5,1.8-1.4,2.5-1.8c-0.4-1.4-0.7-2.8-1-4.3c-1.8,2.6-3.9,5.1-6.6,6.8c0.3-1.6,0.7-3.3,1.2-4.9
+			C732.8,581.9,733.8,580.2,734.7,578.6z"/>
+		<path class="st6" d="M717.9,582.9c-0.3-1.9,0.8-3.8,2.9-2.6C722.1,582.4,719.5,583,717.9,582.9z"/>
+		<path class="st6" d="M706.7,583.2c2-0.3,4-0.6,6-1c-1.1,1.8-1.9,3.7-2.3,5.7C707.6,588,705.9,585.8,706.7,583.2z"/>
+		<path class="st6" d="M0,586.9c0.8-0.3,1.5-0.7,2.3-1c0.6,1,1.3,2,2,3c1.5,1.3,3.5,0.3,5.1-0.3c2.2,1.5,4.9,1.6,7.5,2
+			c-2.2,0.1-4.4,0.5-5.9,2.2c1.4,0.9,2.9,1.8,4.3,2.9c0.1,0.3,0.3,0.9,0.4,1.2c-0.9-0.1-1.8-0.3-2.7-0.4c-0.3,1.3-0.6,2.5-0.8,3.8
+			c0.4,0.9,0.9,1.8,1.4,2.8c-3.3,0.4-6.6,1.1-9.9,2c-1.9-2.1-3.2-4.5-3.8-7.3V586.9 M2.5,600.7c0.7,2.3,4.1,3,5.9,1.7
+			c3.6-1.4,2.6-5.9,3.2-8.9c-2.5-1.4-5.2-2-8.1-2.1C2.6,594.4,2.1,597.6,2.5,600.7z"/>
+		<path class="st6" d="M791.6,586.8c0.7-0.1,2-0.4,2.7-0.6c0.4,2.8,0.5,5.6,0.4,8.3c-0.8,0.1-2.4,0.5-3.1,0.6
+			C791.6,592.4,791.7,589.6,791.6,586.8z"/>
+		<path class="st6" d="M1240.1,589.8c-1.1-2.1,2.7-2.7,4-3.7C1244.1,588.4,1242.6,590.5,1240.1,589.8z"/>
+		<path class="st6" d="M1723.2,590.5c0.4-1.4,0.9-2.7,1.4-4c1.3,2.1,3.9,2.2,6.1,2.4c-1.4,2.4,0.8,4.2,2.2,5.9v1.9
+			c-2.1,0.1-4.2-0.5-6-1.5c0.9-1,1.8-2,2.6-3.1c-1.5-1.2-3.4-0.6-5.1-0.6C1724.1,591.2,1723.5,590.7,1723.2,590.5z"/>
+		<path class="st6" d="M453.6,586.5c0.8,0,2.3,0,3.1-0.1c-1,2-0.4,5.4-2.7,6.5c-1.2-1.2-0.4-3.7-0.6-5.3L453.6,586.5z"/>
+		<path class="st6" d="M724.2,587.1c0.7,0,2.1,0,2.8,0c-0.2,1.5-0.6,3-1.6,4.1C725,589.9,724.6,588.5,724.2,587.1z"/>
+		<path class="st6" d="M1177,587.2c1.3,0,2.6,0,3.9,0c-0.1,1.3-0.1,2.6-0.2,3.9C1178.4,590.9,1177,589.5,1177,587.2z"/>
+		<path class="st6" d="M732.2,588.5c0.8,1,1.6,2.1,2.5,3.1c1.4,0.2,2.8,0.4,4.2,0.6c0,0.3,0,0.9,0,1.2c-1.7,0.1-3.6-0.5-5.1,0.3
+			c-2,3.1-2.8,7-5.6,9.5c-3.1,2.8-6.6,5.1-10.2,7.2c-2.3-0.4-3.3-3.3-5.1-4.6c-2.7-0.1-5.1,1.8-6.2,4.2c-0.1,1.5,1.3,2.5,1.9,3.7
+			c1.9-0.6,3.8-1.1,5.7-1.6c0,1.6-0.1,3.1-0.1,4.7c0.3,0.5,1,1.4,1.3,1.8c-0.7,2-1.3,4-2,6c-1.1-0.1-2.2-0.2-3.3-0.2
+			c0.2,0.7,0.4,1.4,0.6,2.2c0.2,0.9,0.6,2.8,0.9,3.8c0.9-0.8,1.9-1.5,2.7-2.4l0.5,0.2c0.8,1.4,1.6,2.7,2.5,4.1
+			c-1.4,2.3-3.5,3.9-5.5,5.8c-0.6,1.8,0.5,3.6,0.8,5.3c-0.2,0-0.8,0.1-1,0.2c-0.2,1.2-0.4,2.5-0.5,3.8c-0.2-0.5-0.7-1.4-1-1.8
+			c-1.3,0.2-2.6,0.3-3.9,0.5c-1.3-1.5-2.7-3-4-4.5c-0.7,1.5-1.3,3-2,4.6c-1.1-1.6-2.2-3.2-3.4-4.9c-1.9,0.6-3.7,1.2-5.5,2
+			c-1.6-0.4-3.2-0.8-4.8-1.2c1.1-1.4,2.2-2.8,3.3-4.2c-1.4-0.9-2.8-1.7-4.2-2.6c0-4.1,0.4-8.3,1-12.3c0.4,4,0.6,7.9,1,11.9
+			c1,0.6,2.2,1.1,3.3,1.6c-0.1-1.5-0.2-2.9-0.2-4.3c1.4,0.9,2.8,1.9,4.2,2.8c-0.5,1-1.1,2-1.6,3c4.2,2,9.6,1.6,12.7,5.4
+			c-0.8,2.6,3.4,2.5,1.9,0c0.6,0.1,1.7,0.3,2.3,0.5c-0.2-3.3,0-7.3-3.8-8.6c-0.3-0.7-0.5-1.3-0.8-1.9c-0.9-2.2-1.7-4.4-2.7-6.5
+			c2.3,1,4.6,1.9,7,2.7c-0.5-1.7-1.2-3.5-1.4-5.2c0.5-2.2,2.1-3.9,3.3-5.8c-1.2-0.1-2.3-0.3-3.5-0.4c-0.1-0.9-0.5-2.7-0.6-3.6
+			c-3.1,0.5-6.3,3-6.4,6.3c1.7-0.1,3.3-0.7,4.9-1.2c-1.3,3.2-5,1.8-7.6,1.6c-1.2,3.5-1.8,7-3,10.5c-0.7,0.3-2.2,0.9-3,1.2
+			c-0.3-5.7,1.3-12.2,6.7-15.1c1.4-3.2,4.3-5.3,6.2-8c1.2-1.5,2.1-3.3,3.9-4.2c4.1-1.4,8.6-1.5,12.9-0.9c2.3,0.6,4-1.3,5.4-2.8
+			c-0.3-1.5-0.8-2.9-1.2-4.3c0.8-1.2,1.7-2.3,2.5-3.5c1.2-0.3,2.5-0.6,3.8-0.9C732.6,591.5,732.4,590,732.2,588.5 M707,629.6
+			c0,1.4,0.1,2.9,0.1,4.3c1-0.3,2-0.7,3-1C710.4,630.5,709.2,629.5,707,629.6 M711.4,631c-0.8,1.5-1.5,2.9-2.3,4.4
+			c1.7-0.4,3.8-0.6,4.6-2.4C714.5,631,713,631,711.4,631z"/>
+		<path class="st6" d="M311.2,597.3c0.6-2.6-0.6-5.4,0.8-7.7c2.9-0.1,3.6,3.5,2,5.4c-1.8,2.2-4.2,3.9-5.6,6.4
+			c-1.2-1.4-2.6-2.8-4.2-3.9c-0.2,2.4-0.7,4.9-0.3,7.4c0.8,2.9,3,5.2,3.9,8.1c-0.1,1.6-0.5,3.2-0.9,4.8c-0.7,0-1.9,0-2.6,0.1
+			c0.6-4.2-0.6-8.3-2-12.1c-0.7-0.3-2-0.8-2.7-1.1c2.3-3.3,2.7-7.6,4.8-11C306.6,594.9,308.8,596.3,311.2,597.3z"/>
+		<path class="st6" d="M1465.6,592.2c0.7-1.7,3-0.7,4.4-1.1c-1.2,2.2-2.1,4.5-2.7,7C1465.3,596.9,1465.4,594.3,1465.6,592.2z"/>
+		<path class="st6" d="M1248.1,595.8c0.4-1.2,0.2-3.5,2-3.4c1.8-0.7,3.5,1.3,2.3,2.9C1250.9,595.7,1249.5,595.7,1248.1,595.8z"/>
+		<path class="st6" d="M1166,598.7c0-3.1,2.7-5.4,5.7-5.5c2.1,1.5,0,4-1.1,5.4C1169,598.8,1167.5,598.7,1166,598.7z"/>
+		<path class="st6" d="M135.2,593.7c1.4,1.6,2.4,3.4,2.9,5.5c-1.1,0.5-2.2,0.9-3.3,1.4c1.4,2.5,2.5,5.2,3.9,7.8
+			c1.4,2.8,4.4,4.3,6.5,6.5c0.6,2.4,0.5,4.8,0.7,7.2c1-0.6,2.1-1.2,3.1-1.8c0.1,0.7,0.4,2,0.6,2.6c0.6,0,1.9-0.1,2.5-0.2
+			c-2.3,1-6.2,1.8-5.2,5.3c0.3,0.3,0.9,1,1.2,1.3c2.7-0.6,5.3-1.6,8-2c0.3-1.2,0.7-2.4,1-3.6c0.2,2.2,0.3,4.5,0.2,6.7
+			c-1.8-0.1-3.9-0.9-5.6,0.1c-1.2,1.9-0.2,4.2-0.1,6.3c1.7-1,3.5-1.9,5.2-2.9c-0.2,1.3-0.3,2.5-0.4,3.8c-3.4,0.5-7.6,1.1-10.3-1.7
+			c-0.7-2-0.3-4.2-0.7-6.3c-1.8-1.8-4.2-3-5.4-5.3c0.2-0.3,0.8-1,1-1.3c0.9,1.3,1.8,2.5,2.7,3.8c1-1.5,2-3.2,1.1-5
+			c-0.5-0.3-1.4-0.8-1.9-1.1c-4.9-3.2-5.7-9.3-9-13.7c-0.1-3.5-0.4-7.2,1.6-10.4C135.3,595.8,135.2,594.7,135.2,593.7 M143.9,617.9
+			c0.5-2.6-1.4-4.9-4.1-4.4C138,616.4,141.4,618.1,143.9,617.9 M147.5,631.4c-0.3,0.5-0.9,1.4-1.2,1.9c0.4,0.8,0.7,1.5,1.1,2.3
+			c0.6,0,1.8,0.1,2.3,0.1c0-1.5-0.1-3-0.1-4.4C149.1,631.3,148.1,631.4,147.5,631.4z"/>
+		<path class="st6" d="M687.7,593.5c2.9-0.4,3.7,2.8,5,4.7c-0.4,0.3-1.2,0.8-1.6,1.1c0.2,1.6,0.5,3.3,0.6,4.9
+			C688.4,601.6,687.5,597.4,687.7,593.5z"/>
+		<path class="st6" d="M145,597c1.4-1.3,4.3-2.7,5.6-0.6c0.9,3.4-2.5,5.4-4.7,7.3c0.7,0.2,2.2,0.7,3,0.9c0.2,2.3-0.5,4.6-3.3,4.4
+			c-0.2-0.7-0.7-1.9-0.9-2.6c-1.8-1.2-4.3-2.1-5.3-4.3c-0.1-2.1,2.5-2.7,4.1-2.9c-0.8,1.1-1.6,2.2-2.4,3.3c0.5,0.3,1.4,1,1.9,1.3
+			c2.4-1.7,5.4-3.2,6.3-6.3C147.8,597.3,146.4,597.2,145,597z"/>
+		<path class="st6" d="M807.8,603.7c2.3-2.6,4.2-5.5,5.8-8.5c1.5,1.6,3,3.2,4.2,5c-1.4,1.4-3.3,2.4-4.6,3.9
+			c-1.6,2.4-2.6,5.2-4.4,7.5c0-3.6,2.6-6.4,2.8-9.9c-1.3,1.3-2.5,2.6-3.6,3.9c-1.7-0.4-3.4-0.7-5.1-1.1c0.1-0.3,0.3-1,0.4-1.4
+			C804.8,603.2,806.3,603.4,807.8,603.7z"/>
+		<path class="st6" d="M937.9,595.5c1.5,0,2.9,0.1,4.4,0.1c0.4,1.3,0.9,2.5,1.3,3.8c-2.5,0.1-4.9-0.2-7.1-1.2
+			C936.8,597.6,937.5,596.2,937.9,595.5z"/>
+		<path class="st6" d="M1459.9,598.6c0.5-1.5,1.3-3,3.2-2.9c-0.1,0.8-0.3,2.3-0.4,3.1C1462.1,598.8,1460.7,598.7,1459.9,598.6z"/>
+		<path class="st6" d="M703.5,597.1c1.7,0.4,3.4,0.8,5.1,1.2c0,1.5,0,2.9,0.1,4.4c-2.2,0.1-4.4,0.1-6.4-0.6
+			C702.7,600.5,703.1,598.8,703.5,597.1z"/>
+		<path class="st6" d="M27,598.6c0.6,0,1.7-0.1,2.2-0.2c0.2,2.7-0.1,5.4-0.7,8.1l-0.7-2c-0.1-0.3-0.3-0.9-0.4-1.2
+			c-1.1,0.2-2.3,0.4-3.4,0.6c0.7-0.9,1.4-1.8,2.1-2.6c-1.4-0.8-2.8-1.6-4.2-2.4l0.7,0C24,598.8,25.5,598.7,27,598.6z"/>
+		<path class="st6" d="M202.6,598.5c0.9-0.1,1.8-0.1,2.7-0.2c0.6,1.5,1.2,3,1.8,4.4c1.3,0.4,2.6,0.9,3.9,1.4c-1,1.6-2.3,3.2-4.3,3.3
+			c-1.1-0.5-2.1-1.3-3.2-1.9c-0.9,5.1,0.7,10.1,1.4,15.1c-1.1-0.1-2.3-0.2-3.4-0.3c-2.7-2.4-5.6-4.5-8.4-6.8c1.4-1,2.9-1.9,4.3-2.8
+			c-0.3,1.4-0.8,2.7-1.2,4.1c1.5,0.7,3.1,1.4,4.6,2c0.8-3.8,1-7.7,0.9-11.5c-1.4-0.3-2.7-0.5-4.1-0.8c1.4-0.3,2.8-0.6,4.2-0.9
+			C202.1,602,202.4,600.3,202.6,598.5z"/>
+		<path class="st6" d="M464.6,598.1c1.7,0.9,2.3,2.5,2.1,4.4c-1.9,0.1-3.8,0.2-5.7,0.4C462.2,601.3,463.4,599.7,464.6,598.1z"/>
+		<path class="st6" d="M1529.2,597.9c1.4,0.1,3-0.2,4.1,1c-0.4,1.3-1.7,1.7-2.9,2.1C1529.9,600,1529.5,599,1529.2,597.9z"/>
+		<path class="st6" d="M152.4,600.7c2.1-0.5,4.1-1.1,6.2-1.7c0,1.2-0.1,2.5-0.1,3.7c-0.6,0.4-1.8,1.2-2.4,1.5
+			c0.2,1.1,0.3,2.3,0.5,3.4c-1.5,0-3,0-4.6,0C151.3,605.3,151.5,602.9,152.4,600.7z"/>
+		<path class="st6" d="M1171.3,600.2c0.7,0,2,0,2.7,0.1c0,1.3,0.1,2.5,0.1,3.8c-0.7,0.1-2.1,0.3-2.8,0.4c-0.6,0.8-1.1,1.6-1.6,2.5
+			c-1.7-0.2-4-0.4-3.5-2.7c1.4-0.8,3-0.9,4.6-1.3C1170.8,602.2,1171.2,600.9,1171.3,600.2z"/>
+		<path class="st6" d="M840.9,607.5c1.4-2.5,3.2-4.7,4.9-7.1c0.6,1.6,1.3,3.2,1.8,4.9c1.8,0.8,3.6,1.7,4.7,3.4
+			C848.5,608.8,844.7,608.3,840.9,607.5z"/>
+		<path class="st6" d="M472,604.6c1.2-0.5,2.4-1,3.7-1.5c0.5,2.2,0.9,4.5,2.3,6.5c-1.4,0-2.8,0.1-4.2,0.1c-0.6-0.8-1.2-1.5-1.8-2.3
+			c-0.3,0.3-0.9,0.9-1.2,1.2c-1.1-1.4-2.5-2.7-3-4.5C469.2,604.1,470.6,604.3,472,604.6z"/>
+		<path class="st6" d="M464,605.2c0.7-0.1,2.2-0.2,3-0.2c-0.6,1.4-0.5,3.4-2,4.3C463.2,608.5,463.4,606.6,464,605.2z"/>
+		<path class="st6" d="M791.6,606.9c2.2-0.6,4.5-1.2,6.7-1.8c-0.1,0.6-0.4,1.9-0.5,2.6c-1.2,0.6-2.4,1.2-3.6,1.8
+			c0.6,0.8,1.1,1.5,1.7,2.3c1.2-0.6,2.3-1.3,3.5-1.9c-1.2,1.7-2.5,3.3-3.8,4.8c0.1,1.9,0.2,3.8,0.4,5.7c-1.1,0-2.2,0-3.3,0
+			c1.3,1.4,2.8,2.7,4.4,3.8c0.7-2.6,1.3-5.2,2-7.8c0,2.4,0.6,5-0.4,7.3c-1.7,2.5-4.5,4.1-7,5.7C791.4,622,791.8,614.4,791.6,606.9z"
+			/>
+		<path class="st6" d="M1531.2,607.8c-1-0.5-1.5-2.4-0.2-2.9c0.8,0.1,2.3,0.2,3.1,0.2C1533.2,606,1532.7,607.8,1531.2,607.8z"/>
+		<path class="st6" d="M690.3,607.3c1.5,0,2.9,0,4.4,0c0.6,2.3,0.8,4.8-0.7,6.8c0.7,1,1.3,1.9,2,2.9c-2.2,0.5-4.3,0.9-6.5,1.3
+			C689.7,614.6,691,611,690.3,607.3 M691.2,614.2c-0.5,1.6,0,2.2,1.6,1.7C693.3,614.3,692.8,613.7,691.2,614.2z"/>
+		<path class="st6" d="M212.2,608.2c1.5,0,3,0.1,4.5,0.1c0,0.6-0.1,1.8-0.1,2.4c-1.4,0-2.9,0-4.3,0
+			C212.3,610.1,212.3,608.9,212.2,608.2z"/>
+		<path class="st6" d="M1270.1,608.1c0.8-0.2,2.4-0.6,3.2-0.8c1,1.7,1.9,3.5,2.7,5.4c1.6-1.1,3.1-2.1,4.7-3.1
+			c1.3,3.4,2.5,6.8,3.6,10.2c-0.4,0.1-1.3,0.3-1.7,0.4c-0.8-1.2-1.6-2.4-2.4-3.6c-0.6,0.3-1.8,1-2.5,1.4c0-0.5-0.1-1.4-0.1-1.8
+			c-2.8,2.4-5.5,5-8.8,6.6c-2.2-1-3-3.9-4.4-5.8c2-0.9,3.9-1.7,5.9-2.6C1270.3,612.3,1270.2,610.2,1270.1,608.1 M1268.4,616.4
+			c-0.1,1.5-0.2,3.1-0.3,4.6c2.5-0.8,4.7-2.2,6.4-4.2C1272.5,616.2,1270.4,616.2,1268.4,616.4z"/>
+		<path class="st6" d="M492.4,608.6c5.1-0.3,9.9,3.3,15,1.4c0,0.9,0,2.7,0,3.6c-1.4,0.2-2.8,0.4-4.2,0.6c1.4,0,2.8,0,4.3,0l0,1.7
+			c-2.8-0.1-5.5-0.2-8.3-0.4c0.2,1.2,0.5,2.5,0.8,3.7c-1.5-0.9-2.9-1.9-4.4-2.8c1.4-1.3,1.2-3.1,1.4-4.8c-1.3-0.6-2.6-1.1-3.8-1.8
+			L492.4,608.6z"/>
+		<path class="st6" d="M929.3,608.8c3.2,2,5.3,5.5,8.8,7.1c5.6,0.6,11.2,0,16.8,0.1c-2.3-1.8-4.5-3.7-5.8-6.2
+			c3.2-0.1,6.4,0.3,9.5,1.2c-0.8,1.7-1.5,3.5-2.2,5.2c3.3,0.1,6.7,0.1,10-0.3c1-1.1,1.5-3.3,3.4-3.1c1.8,1.4,3.7,3.1,4.7,5.3
+			c-0.6,2.4-1.6,4.7-2.1,7.2c0-2.9,0-5.7,0.1-8.6c-30.5,1.1-61,0.5-91.5,0.6c-13.2-0.2-26.4,0.4-39.5-0.5v-0.6c13.5,0,27-0.2,40.5,0
+			c0.8-0.6,1.6-1.1,2.4-1.7c6.8,3,14.4,1.2,21.5,1.6c0.7-1.2,1.4-2.4,2.2-3.6c2.2,0.4,3.6,2.2,5.2,3.5c2.9,0.1,5.9,0.1,8.9,0.1
+			c0.6,0,1.9,0,2.5,0c1.8,0,3.7-0.1,5.6-0.1c-1.2-0.7-2.4-1.4-3.6-2.1C927.6,612.2,928.4,610.5,929.3,608.8z"/>
+		<path class="st6" d="M15.7,613.8c2.2-1.2,4.5-2.1,6.4-3.7c1.7,1,3.4,1.9,5.1,2.8c0.9,0.4,1.7,0.9,2.6,1.3c0.2,8-0.2,15.9-0.3,23.8
+			c-0.6,0.5-1.7,1.5-2.3,2c-0.5-0.4-1.5-1.2-2-1.6c-0.9-3.5-1-7.1-2.7-10.4c1.4-0.8,2.8-1.6,4-2.5c0.2-1.8-1.1-3.2-1.9-4.7
+			c-0.7,1.2-1.4,2.4-2.2,3.5c-0.3,0.2-0.8,0.5-1,0.6c2.1-4.2-1.7-7.6-3.8-10.8c-0.5,2.8-0.7,5.8-1.6,8.6l-0.1-0.8
+			c-0.2-1.3-0.5-2.6-0.8-4C15.1,616.8,14,614.7,15.7,613.8 M23.3,615.8c1.6,3.1,3,6.4,5.8,8.7c0.2-2.9,0.3-5.8,0.4-8.7
+			C27.5,614.5,25.1,613.4,23.3,615.8z"/>
+		<path class="st6" d="M471.5,610.3c2.6,0,4.9,1.8,7.3,2.8c-0.5,0.7-1,1.5-1.3,2.2c0.8,3.6,3.6,6.2,6.6,8.1c-1.2,0-2.5,0.1-3.7,0.2
+			c0.1,0.9,0.2,1.8,0.3,2.8c0.4,0.2,1.1,0.5,1.5,0.7c-0.4,0.3-1.3,1-1.7,1.3c-1.5,0.3-3,0.5-4.4,0.8c1.4,1.6,3.2,2.7,5.1,3.7
+			c0.8-1.3,1.5-2.7,2.2-4.1c0.8,1.9,1.7,3.8,2.3,5.7c0.1,1,0.2,3,0.3,4c1.2-0.4,2.3-0.8,3.5-1.2c0.6-0.2,1.8-0.4,2.4-0.6
+			c1.5,1.2,3,2.5,4.5,3.7c0.4,1.4,0.9,2.7,1.3,4.1c0.1,0.4,0.4,1.1,0.5,1.5c0.8,1.3,2.1,3.7,3.9,2.1c2.7-1.9,6-2.5,9.2-2.5
+			c0.2,1.6,0.4,3.2,0.6,4.9c-0.8,0.1-2.3,0.2-3.1,0.3c-0.1,0.5-0.4,1.5-0.5,2c0.6,0,1.7-0.1,2.2-0.1c-0.9,0.8-1.8,1.7-2.8,2.5
+			c-1.3-1.4-2.1-4.6-4.5-2.9c0,1.8,0.5,3.5,0.8,5.2c0.2,1.2,0.3,2.4,0.4,3.6c-0.2,0.4-0.7,1.1-0.9,1.5c-1.1-0.7-2.2-1.4-3.4-2.2
+			c0.3,1.1,0.5,2.1,0.8,3.2c-0.9,0.5-1.8,0.9-2.6,1.4c-0.2-1.7,1-4.2-1-5.1c-1.3-0.4-2.7-0.6-4.1-0.9c1.3,2,3.2,3.8,3.2,6.4
+			c-2.4-0.1-3.5-2.3-4.7-4c-0.5-1.3-0.9-2.6-1.3-3.9c-1,0.2-1.9,0.3-2.8,0.5c-0.4-2.2-0.9-4.3-1.5-6.4c1.2,0,2.3-0.1,3.5-0.1
+			c-0.1-1.1-0.2-2.2-0.3-3.3c-2.1,0.5-4.2,1-6.3,1.6c0.7,0.6,1.4,1.1,2.1,1.8c-2.5-0.5-5.1-0.9-7.5,0c0.3-0.5,0.9-1.5,1.2-2
+			c-0.7,0.1-2.2,0.2-2.9,0.2c1.6-1.2,2.6-2.9,3.5-4.6c0.8,0,1.5,0.1,2.3,0.2c0.2,0.5,0.6,1.6,0.8,2.1c1.8-0.3,3.6-0.8,5.4-0.7
+			c1.6,0.3,2.5,1.8,3.6,2.7c-0.1,0.7-0.4,2.1-0.5,2.8c1.5,0,3,0.1,4.5,0.1c-2.6,0.6-5.2,1.3-7.8,2.1c2.7,2,6.2,0.7,9.2,1.3
+			c1.3,0.5,2.6,1.3,3.9,2.1c-0.8-4.4-1.2-9.6-5.6-12.1c0.1-1.2,0.2-2.3,0.3-3.4c-1.3-0.6-2.8-2.6-4-0.7c0.2,1.2,0.5,2.4,0.9,3.6
+			c0.4,0.1,1.3,0.3,1.7,0.4c-0.4,0.7-1.3,2.1-1.7,2.8c-2.5-2.2-2.5-5.5-3.3-8.4c-1.2-0.3-2.4-0.5-3.7-0.7c-0.7-2.1-1.2-4.4-3.2-5.6
+			c-0.4,3.2-0.5,6.4-0.6,9.6l-0.9-0.3c-0.3-3.3-0.4-6.6-0.7-9.9c-0.8,1.8-1.5,3.6-2.3,5.4c-0.7-0.4-2.1-1.2-2.8-1.7
+			c-1.4,0.7-2.8,1.4-4.3,2c-0.1-0.9-0.3-1.8-0.4-2.7c-0.3-2-0.7-3.9-1.1-5.9l1.2,0.2c1.7,1.4,3.5,1.5,5.3,0.1
+			c-1.6-1.8-3.2-3.6-5.1-5c-1.4,0.6-2.6,1.4-3.9,2.1c-0.1-1.2-0.2-2.4-0.1-3.6c0.3-0.4,1-1.2,1.3-1.5l1,0.9c2,1.4,4,2.7,6,4
+			c1.2-0.7,2.3-1.4,3.5-2.1c-0.5-1.4-1-2.8-1.5-4.1c-1.6,0.1-3.3,0.2-4.9,0.3c-0.5-2.2-1.1-4.5-1.7-6.7c-0.5-0.3-1.6-1-2.1-1.3
+			l0-0.1C469.4,612.2,470.4,611.2,471.5,610.3 M472.1,614.1c0.3,1.5-0.2,3.5,1.4,4.3c1.1,0.2,2.2,0.3,3.3,0.4
+			C476.8,616.1,475,613.9,472.1,614.1 M474.3,633.3c-1.5,1.3,0.8,3.7,2.2,2.2C477.8,634.2,475.6,631.9,474.3,633.3z"/>
+		<path class="st6" d="M1018.1,614.7c1.4-1.1,2.8-2.1,4.2-3.1c0.1,13.4,0.1,26.8,0.1,40.1c-0.7,2-1.1,4.5-2.9,5.9
+			c-1.8,1.5-3.6,2.9-4.7,5c1.7,0.1,3.5,0.2,5.2,0.2c-1.7,1-3.4,1.8-5.1,2.7c0.7,2.1,1.7,4.2,2.7,6.1c1.6-0.9,3.1-1.8,4.7-2.6
+			c0,3.2,0.1,6.4-0.1,9.5c-0.3,0.4-0.8,1.2-1.1,1.6c0.4-2.7,0.1-5.4-0.7-8c-2.4,2.5-6.5,5-5,9.1c1.6,0.1,3.2,0.1,4.8,0.2
+			c-0.3,1.6-0.5,3.2-0.7,4.8c-2.9,1.2-5.1,3.4-6.6,6.1c1.8,0.4,3.8,0.2,5.2,1.6c-0.5,1.9-1.3,3.7-2,5.5c2,0.2,3.9-0.2,5.7-0.9
+			c0,0.4-0.1,1.3-0.2,1.7c-6.2,1.9-12.3-2.1-17.1-5.5c1.7-0.2,3.5-0.4,5.2-0.7c2.1-1.5,3-4.1,4.4-6.2c-0.8-0.7-1.6-1.3-2.3-2
+			c3.2-5.5,2.8-12.2,2.2-18.3c-1.3,0.5-2.6,1-3.9,1.5c1.8-2.3,3.6-4.8,4.4-7.7c-2.5-1.5-4.9-3.4-7.6-4.6c-2.7,1.3-5.3,2.9-8.4,2.5
+			c-0.1-3.2,1.2-6,4.3-7.3c-1.2-1.5-2.5-3.1-4.2-4.2c-4-2.2-8-5.5-8-10.5c4.3,1.7,7.5,5.5,11.9,7c2.8,1.2,6-0.5,8.9,0.2
+			c1.1,0.9,1.7,2.3,2.3,3.6c-2.5,1-5.2-2.5-7.3-0.2c0.5,2.8,1.9,5.4,4.2,7.2c0.8-0.6,1.6-1.2,2.4-1.8c0.9,1.8,1.8,3.6,2.8,5.4
+			c1.5-1.2,3.1-2.3,4.4-3.7c-0.5-1.3-1.1-2.4-1.7-3.6c4.3-2.2,2.5-7.4,2.7-11.3c-0.5-6,1.6-12.7-1.8-18.1c0.7-1.6,1.4-3.1,2.2-4.7
+			C1020.5,616.3,1019.3,615.5,1018.1,614.7z"/>
+		<path class="st6" d="M1716.8,616.2c0.5-1.9,1.4-3.7,3.4-4.5C1720.8,614.4,1719.7,616.7,1716.8,616.2z"/>
+		<path class="st6" d="M0,615.2c1.3-0.3,2.6-0.5,3.9-0.8c1.3,1,2.6,1.9,3.9,2.9c0.7-0.8,1.5-1.5,2.2-2.3c0.4,3.3,1.1,6.6,2,9.8
+			c1.1-0.2,2.2-0.3,3.3-0.5c-0.4,0.9-0.9,1.8-1.3,2.7c0.8,0.1,2.5,0.3,3.3,0.4c-0.6,1-1.1,2.1-1.7,3.1c-1.1-0.3-2.1-0.6-3.2-0.9
+			c-0.9,1.8-1.9,3.7-2.8,5.5l-1.1,0.3c-1.5,0.8-2.8,2-3.9,3.3c2.4,0.8,4.8,1.5,7.2,2.3c-0.6,2.2-1.1,4.4-1.7,6.6
+			c2.7,2.8,5.4,8.6,1.2,11.3c-2.4-2.1-5.1-4-6.6-6.9c2,1.3,4.2,2.3,6.3,3.2c-0.6-1.8,0.1-4.7-2.2-5.2c-1.7-1.2-3.5-0.3-4.9,0.8
+			l0,0.2c-0.2-0.3-0.5-0.9-0.7-1.2c-1.1-0.4-2.2-0.7-3.3-1V648c1.9,0,3.8,0,5.7,0.1c-0.8-1.4-1.6-2.7-2.4-4.1
+			c-1.1,0.6-2.2,1.2-3.3,1.8v-17c1.9-0.9,3.7-2,4.7-3.9c0.2,1.7,0.4,3.4,0.7,5.1c-1.4,0.1-2.9,0.2-4.3,0.4c0.4,1.8,0.2,4.3,2.3,5.1
+			c2.1,0.1,5.1,0,6-2.2c0.4-3-0.2-6.2-1-9.1c-1.5-2.2-3.9-3.6-6-5.3c0.5-0.7,0.9-1.5,1.4-2.2c-1.2-0.3-2.5-0.6-3.7-0.8V615.2
+			 M5,618.2c0.7,1.5,1.6,2.9,2.8,4c0.3-1.3,0.7-2.6,1-3.9C7.6,618.2,6.3,618.2,5,618.2z"/>
+		<path class="st6" d="M311.8,614.3c0.6,0.1,1.9,0.2,2.5,0.3c1.6,1.5,3.7,2.4,5.9,3c-1.2,2.5-2.4,5.1-3.5,7.6
+			C316.6,620.9,313.2,618.1,311.8,614.3z"/>
+		<path class="st6" d="M1451.1,621c0.5-2.5-0.3-6,2.6-7.2c-0.9,3-1,6.2-1.5,9.3c-2,2.1-4.4,3.8-6,6.3c3.2-0.2,6.4,0.4,9.2,2.2
+			c0.5-1.6,1-3.3,1.5-4.9c3.8-0.1,7.1-1.8,9.4-4.8c-0.6,1.5-1.1,3-1.9,4.5c-2,0.9-4.1,1.4-6.2,1.9c4.3,4,9.6,6.7,14.9,9.1
+			c2.6,0.8,6.7,1.3,8.2-1.5c0-3.9-4.5-5.1-6.6-7.8c-2.1-1.7-1.5-4.5-0.9-6.7c1.3,3.3,1.9,8.3,6.2,8.8c4.1,0,8-1.4,12-2.2
+			c-1.2-1.6-2.9-3.2-2.2-5.5c1.2,1.2,2.4,2.4,3.7,3.7c2.7-0.2,5.2,0.8,7,2.9c0.9,0.9,1.9,1.7,2.7,2.7c0,0.3,0,0.9-0.1,1.2
+			c-1.2-0.9-2.4-1.7-3.7-2.6c-1.1,0.8-2,2.2-3.4,2.6c-2.1-0.7-4-2-6.1-2.4c-1.6-0.2-2.9,1.1-4.2,1.8c1.5,0.3,3,0.6,4.5,0.9
+			c0.1,0.3,0.3,1,0.4,1.4c1.6,0.6,3.3,1,4.7,1.9c1.6,1.6,2.1,4,3,6l-1.5,0c-0.9-1.8-1.7-3.6-2.4-5.4c-3.2-0.4-6.4-0.7-9.6-1
+			c-0.3,1-0.5,2-0.8,3.1c-3.2,0.5-6.5,1.7-9.7,1c-5.4-2.4-9.7-6.9-15.7-8c0.3,1.6,0.7,3.3,1.1,4.9c1.7,0.1,3.4,0.2,5.2,0.3
+			c0.3,1.6,0.5,3.3,0.4,5l-1.3,0c0.1-0.7,0.3-2,0.5-2.6c-2.2-0.5-4.7-0.5-6.6-1.7c-0.6-1.4-1-3-1.5-4.5c-4.5,0.7-6.2,5.5-7.6,9.2
+			c1.9,0.1,3.9-0.2,5.8-0.4c-2.6,3.1-3,7.2-4.4,10.9c-0.5,0.1-1.4,0.2-1.9,0.3c-0.4-1.5-0.7-2.9-1.1-4.4c-0.7,0.2-2.2,0.7-2.9,0.9
+			c0.7-4.4-3.5-7.4-5.5-10.8c-0.2,2.2-0.3,4.3-0.2,6.5c-1.6,0.7-3.3,1.3-4.9,1.8c-0.3-0.7-0.8-2.1-1-2.8c1.4-1.6,2.8-3.2,4.1-4.9
+			c0.9-1.4,1.8-2.8,2.7-4.2c1.2,0.5,2.8,0.5,3.6,1.7c0.2,2-0.8,4.2,0.9,5.8c4.5,0.6,4.8-4.9,6.7-7.8c-1-0.6-1.9-1.1-2.9-1.7
+			c-0.5-0.9-0.9-1.7-1.3-2.6c-3.8-0.6-7.9-1.7-11.5,0.3c-2.5,1.7-3.5-2-4.2-3.7c0.2-1,0.4-1.9,0.6-2.9c2.4,4.8,8.2,3.5,12.5,3.6
+			c-0.5-0.5-1.3-1.4-1.8-1.8c0.7-1,1.4-2,2.1-3c-0.5-2-2.5-4.2-1.1-6.1c2.7,1.7,4,4.6,4.8,7.6C1449.2,624.2,1451.3,623.2,1451.1,621
+			z"/>
+		<path class="st6" d="M831.8,617.3c0.7,0,2.2,0,3-0.1c0,0.7-0.1,2.1-0.1,2.8C833.2,619.8,832.3,618.8,831.8,617.3z"/>
+		<path class="st6" d="M1152.2,618.3c1.2,0,2.4,0,3.7,0c0,2.2-1.3,3.8-3.7,3.6C1152.3,620.7,1152.2,619.5,1152.2,618.3z"/>
+		<path class="st6" d="M802.5,620.7c1.6-0.9,3.2-1,4.9-0.3c0.2,1.5,0.5,3,0.7,4.4c1.2-0.7,2.4-1.3,3.6-1.8c2.2,5.7,3,13.2-1.2,18.1
+			c0.1-1.2,0.2-2.5,0.2-3.7c-3.9,2.4-6.3,6.3-8.6,10c0.5-2.1,1.1-4.1,1.8-6.1c-0.9,0.1-1.8,0.1-2.7,0.2c-0.3-0.8-0.6-1.5-1-2.2
+			c2-1.5,6.3-2.6,5.3-5.9c-0.4-2.5-2.6-3.9-4.4-5.4c0.7-1,1.4-1.9,2.1-2.9C803,623.6,802.7,622.1,802.5,620.7 M805.8,627.7
+			c-0.7,2.2-0.1,5,2.3,5.8C811.1,632.2,809.3,625.8,805.8,627.7z"/>
+		<path class="st6" d="M991.8,620.8c3-1.5,6.2,1.2,8.4,3.1c1.4,1.8,0,4.2-2.3,3.8c-0.6-1.5-1-3.2-2-4.5c-1,0.1-1.9,0.2-2.9,0.3
+			C992.2,622.7,990.4,622,991.8,620.8z"/>
+		<path class="st6" d="M203.4,625.9c-0.4-2,2.3-2.5,3.4-3.7c0.2,0.3,0.5,0.9,0.6,1.2c-0.6,0.8-1.2,1.6-1.9,2.5
+			c3.1,2.5,3.8,6.4,2.4,10.1C203.9,634.4,203.9,629.6,203.4,625.9z"/>
+		<path class="st6" d="M1153.2,623c1.6,0.4,3.2,0.8,4.8,1.3c-0.1,1.8-0.9,3.7-2.9,4c-0.8,0.2-2.3,0.6-3,0.9c0.3-0.4,1-1.2,1.4-1.5
+			C1153.4,626,1153.3,624.5,1153.2,623z"/>
+		<path class="st6" d="M1210.9,623c1.3,1.1,2.6,2.4,2.8,4.2c-0.3,2-1.5,3.7-2.3,5.5c-1.1,0-2.2,0.1-3.2,0.1
+			C1207.9,629.2,1208.8,625.8,1210.9,623z"/>
+		<path class="st6" d="M304.3,629.6c-0.5-1.5-0.8-4.7,1.6-4.3c2.3,0,1.9,2.7,1.8,4.2C306.6,629.5,305.5,629.6,304.3,629.6z"/>
+		<path class="st6" d="M723.1,626.4c1.3-1.3,3.7,0.8,2.2,2.2C724,629.9,721.6,627.7,723.1,626.4z"/>
+		<path class="st6" d="M379.2,632.6c0-2.7,2.1-5.4,4.9-5.6c2.3,0.9,0.4,3.7,0.5,5.5C382.7,632.6,380.9,632.6,379.2,632.6z"/>
+		<path class="st6" d="M1264.8,635c4.6-0.6,7.6-4.1,11.6-6c-0.1,0.8-0.2,2.2-0.2,3c-1.5,0.4-3,0.9-4.4,1.3c0.8,0.9,1.5,1.8,2.4,2.6
+			c1.6-0.2,2.3-1.9,3.2-3c2.1-0.3,4.3-0.5,6.4-0.8c-0.7,4.1-2.3,7.8-4.6,11.2c-1.5,0.3-3,0.7-4.5,1c1.8-1.6,5.3-2.4,4.5-5.5
+			c-0.6-2.3,1.3-3.6,2.8-4.9c-1.3-0.1-2.5-0.1-3.8-0.2c-0.9,1.2-1.3,3-2.7,3.7c-2.6-0.1-5.8-2.5-7.9,0c-1.4,1.9,0.3,3.9,1.2,5.6
+			c-1.5,2.1-3.5,3.8-6.2,3.9c0-0.7,0.1-2.1,0.1-2.8c-0.9,0.2-1.8,0.3-2.7,0.5c-0.9-2.5-1.3-5.8,1.7-7c0.1,1.8,0.2,3.6,0.3,5.4
+			c0.8,0,2.4-0.1,3.2-0.1C1264.5,640.5,1263.1,637.5,1264.8,635z"/>
+		<path class="st6" d="M984.3,632.2c1.5,0.2,3.5-0.2,3.9,1.8c0.9,1.7-1.9,3.5-3.3,2.3C983.2,635.7,984.4,633.5,984.3,632.2z"/>
+		<path class="st6" d="M1158.8,634c0.6-0.7,1.2-1.3,1.9-2c0.1,0.6,0.2,1.7,0.2,2.3c1.4-0.6,2.7-1.2,4.1-1.8c1.2,0.7,2.7,0.9,3.6,2
+			c-2.2,2.5-4.8,4.8-5.8,8.2c4-0.5,8-1.1,12-1.9c3-0.8,6,0.7,9.1,0.5c2.1-0.8,3.9-2,5.9-3.2c0.3,0.8,0.5,1.7,0.8,2.5
+			c2.2-0.2,4.4-0.3,6.6,0.1c6.8,1.2,13.8,0.4,20.7,0.6c5.5-0.2,11.5,1.1,16.6-1.6c2.2-1.2,4.7,0.1,6.9,0.6c0.6,1.3,1.2,2.5,1.8,3.8
+			c2-0.5,4-1.2,5.8-2.5c-0.7-1.5-1.3-3-1.9-4.5c1.2,0.3,2.6,0.5,3.9,0.2c-0.2,1.1-0.4,2.2-0.6,3.4c1.6,1.2,6.2,1.2,5.1,3.9
+			c-3,1.7-7.1-0.4-10,1.9c-1.2,1.6-1,3.8-1.3,5.7c-1.1-3.2-2.1-6.4-3.1-9.6c-16,0-32.1,0-48.1,0c-9,0.3-18-0.7-26.9,0.3
+			c-3.8,5.2-4.6,11.9-7.4,17.7c-1.4-0.5-2.7-0.9-4-1.4c0-1.8,0.5-3.6,0.8-5.4c-1.3-0.1-2.5-0.3-3.8-0.4c0.6-4.4,0.9-8.9,0-13.2
+			c-2.8-1.7-5.2,1.5-5.7,4c-2.7,0.8-5.3,2.9-8.1,2.6c-1.1-2.9,3.3-3.8,4.6-5.9c-1.5-1.5-3.2-2.6-4.9-3.8l0.5,0
+			c3.2,0.3,6.4,0.7,9.6,1.2c-0.6-1.4-1.2-2.9-1.8-4.3c1.1,0.4,2.3,0.8,3.4,1.2c1.7-0.4,3.4-0.9,5.1-1.3c0.1,3.5,0.5,7.1,1.1,10.6
+			c0.7,0,1.9,0.2,2.6,0.2c0.4,0.9,0.8,1.9,1.2,2.8c1.4-3.1,4.4-7.6,0.5-10.3c1.6-0.2,3.1-0.6,4.6-0.9
+			C1163.1,634.9,1160.8,634.6,1158.8,634 M1155,647.2c-0.3,0.9-0.7,1.8-1,2.7c1.1,0.5,2.2,0.9,3.4,1.4c0,1.8,0,3.7,0,5.5
+			c3.4,0.3,2.4-4.2,3.3-6.3C1158.8,649.5,1156.8,648.4,1155,647.2z"/>
+		<path class="st6" d="M696.3,635.3c0.7-0.7,1.6-1.2,2.5-1.7c0,1.4,0,2.8-0.1,4.2C697,639.3,696.1,636.7,696.3,635.3z"/>
+		<path class="st6" d="M14.1,637.3c2-1.5,4.4-1,6.1,0.6c0.2,0.5,0.7,1.5,0.9,2.1c1.7,3.2,4.3,8.7,8.8,6.3
+			c-0.2,7.9-0.1,15.8-0.1,23.7c-1.6,0.3-3.3,0.6-4.9,0.9c0.3,1,0.6,2,0.9,3c-2.7-0.3-5.4,0-8,0.8c3.4,2.9,7.2,5.1,11.4,6.6
+			c-1.1,0.5-2.1,1.1-3.2,1.6c1.8,2.6,4.5,5.7,2.8,9.1c-1.8,2.4-4.2,4.3-6.2,6.5c-1.1-0.4-2.1-0.8-3.1-1.3c-0.7-2.2,1.8-4.1,1.9-6.3
+			c0-3.8-0.6-7.7,0.7-11.4c-1.4-0.9-2.7-2-4.4-2.1c-3.1,3.5,0.4,8.1,0.6,12c-1.9,1.8-4,3.4-6,5.2c-1.1-1.9,0.1-3.7,0.9-5.4
+			c-0.6-1.1-1.3-2.1-1.9-3.1c1.3,0.6,2.5,1.3,3.8,1.9c1.4-1.2,0.9-3.3,1.3-4.9c-0.7-0.4-2-1.2-2.6-1.6c0.1-0.4,0.5-1.2,0.6-1.6
+			c0.3-2.9,0.4-5.8,0.5-8.7c1.7,0.2,3.3,0.5,4.9,0.8c0-2.2,0.1-4.4,0-6.6c1,1.7,2,3.4,3,5.2c2.1-0.8,4.3-1.7,6.4-2.4
+			c-0.2-1.6-0.4-3.2-0.5-4.7c-1.8,1.2-3.6,2.5-5.4,3.8c-0.2-1.8-0.2-3.7-0.2-5.5c-0.2-0.2-0.7-0.6-0.9-0.8c4.7-3.9-0.4-9.1-2.7-12.8
+			c1.5,0.5,2.9,1,4.4,1.5c0.4-0.2,1.3-0.6,1.7-0.8c-3-3.1-5.4-6.7-8.3-9.8c-0.2,2.7-0.5,5.4-0.7,8C16.2,643.7,15.7,640.3,14.1,637.3
+			 M25.7,653.8c-0.7,1.9-0.5,4-0.6,6c1.3,0,3,1.5,4,0.3c0.7-2.3,0-4.7-0.3-7C27.8,653.3,26.8,653.5,25.7,653.8 M24.2,693
+			c1.3-0.8,3.4-1.3,3.7-3c0.8-2.4-1.4-4.1-2.9-5.6C20.7,685.8,23.1,690.2,24.2,693z"/>
+		<path class="st6" d="M1254.3,636.4c2.4-0.5,2.6,4.2-0.2,4C1251.6,640.1,1252.7,637,1254.3,636.4z"/>
+		<path class="st6" d="M283.7,638.2l0.3,0.4c1.2,2.1,2.6,4.1,3.4,6.5c0.4,2.4,0.2,4.9,0.2,7.4c2.1,1,3.6,2.8,4.4,5
+			c-2.9,1.5-5.3,3.8-7.2,6.5c-1.4,2.2-4.1,2.5-6.4,3.1c-0.5-2.9-0.8-5.9-0.8-8.8c1.4-1,3.3-1.6,4.2-3.1c-0.5-1.3-1.2-2.5-1.8-3.7
+			c-0.5,0.1-1.5,0.4-1.9,0.5C279.2,647,282.7,643.1,283.7,638.2 M284,648.2c-0.7,0.1-2.1,0.3-2.7,0.4c0.1,1,0.2,2,0.4,3.1
+			c3.5,1.1,5-2.7,4.6-5.6C285.5,646.7,284.8,647.4,284,648.2 M278.5,658.8c0.8,2-0.2,5.7,2.5,6.2c3.6-1.9,5.5-5.8,8.1-8.7
+			C285.3,655.7,281.9,657.7,278.5,658.8z"/>
+		<path class="st6" d="M297.3,640.3c1.2,0,2.4,0,3.6,0c0.1,2.4-1.2,3.7-3.6,3.6C297.3,642.7,297.3,641.5,297.3,640.3z"/>
+		<path class="st6" d="M1013.8,641.8c1.1-1,2.2-2.9,3.9-1.5c0,0.6,0,1.8,0,2.4C1016.2,643.7,1015,642.6,1013.8,641.8z"/>
+		<path class="st6" d="M1725,640.5c2.7-0.1,5.3,0,8,0.1v8.4c-0.5,0.6-1.4,1.7-1.9,2.3c-0.5,0-1.5,0.1-1.9,0.1
+			c0.2-1.1,0.4-2.2,0.7-3.3c-1.6,0-3.2,0-4.7,0c0,0.7,0.1,2.2,0.1,2.9c0.5,0.1,1.4,0.3,1.8,0.3c-0.9,0.8-1.8,1.6-2.6,2.5
+			c-1.1-0.8-2.3-1.7-3.3-2.5c0.3-2.2,0.8-4.4,0.9-6.6l-0.1-0.7c1.6,0.1,3.2,0.2,4.8,0.4C1726.2,643.1,1725.6,641.8,1725,640.5
+			 M1726.5,645.1c0.6,1.5,2.3,1.8,3.7,2.4c0.6-1.6,1.2-3.2,1.8-4.8C1730,643.2,1728,643.7,1726.5,645.1z"/>
+		<path class="st6" d="M289.6,643.5c2.4,1.4,5,2.5,7,4.5c0.4,2.5-3.2,1.2-4.6,1.4C289.2,648.9,289.5,645.6,289.6,643.5z"/>
+		<path class="st6" d="M683.6,644.1c1.1,0.8,2.2,1.7,3.3,2.6c-0.3,1.2-0.6,2.3-0.8,3.5c1.8,0.1,3.7,0.3,5.5,0.4
+			c0.1,1.4,0.3,2.9,0.4,4.3c2.1,1.5,5.5,2.2,6.2,5.1c-4.7,1-8.1-3.8-10.3-7.3c-2,0.5-4,1.1-6,1.6c0.1,1.3,0.3,2.7,0.4,4
+			c-0.7,0.2-2,0.7-2.6,1C680.9,654.2,682.2,649.1,683.6,644.1z"/>
+		<path class="st6" d="M702.3,645.9c1.9,1.9,2.8,4.7,1.7,7.2c-0.8,1.6,0.4,3.1,0.9,4.6c-1.3,0-2.6,0-3.9,0.1c-1.1-3,0.8-5.9,1.8-8.6
+			C702.6,648,702.4,646.9,702.3,645.9z"/>
+		<path class="st6" d="M820.2,650.1c1.6-0.3,3.2-0.6,4.8-0.9c-0.7,1.5-1.4,3-2.1,4.5c-0.7,0-2,0-2.7,0
+			C820.2,652.5,820.2,651.3,820.2,650.1z"/>
+		<path class="st6" d="M1262.2,651.1c3,0.5,6,0.8,8.9,1.7c0.9,2,1.5,4.3,3.1,5.9c-0.4,2.3,0.6,3.9,2.8,4.8c0.9-0.7,1.8-1.4,2.7-2
+			c0.5,0.2,1.5,0.8,1.9,1c-1.7,1.3-2.9,3-3.8,5c-2-0.4-4.1-1-5.8,0.4c-1.5,0.7-3.4,2.7-4.7,0.8c0.1-1.6,1.8-2,2.8-3
+			c-0.2-1.1-0.4-2.2-0.5-3.2c1.2,0.9,2.3,1.9,3.4,2.9c0.5,0.1,1.6,0.2,2.1,0.3c-1.2-2.4-2.4-4.7-3.6-7c-0.4-0.2-1.3-0.6-1.8-0.8
+			c-0.8-1.1-1.5-2.3-2.4-3.3c-1.5-0.6-3.2-0.1-4.8-0.1C1262.4,653.4,1262.3,652.2,1262.2,651.1z"/>
+		<path class="st6" d="M1567.6,662.6c-2-2.6-4.4-5.8-1.9-8.9c1.2,1.4,2.3,2.8,3.7,4.1c1.1-0.3,2.1-0.8,3.2-1.2
+			c0.1,0.1,0.4,0.4,0.5,0.5c-0.1,2.6-0.9,5.3-0.2,7.9c1.5,0.5,3.1,0.7,4.7,0.9c-0.1,1.8-0.2,3.7-0.3,5.6c4.1-1.5,7.6-4.1,10.8-7
+			c1.4,3.5,2.7,7.1,3.9,10.7c-2.3,2-3.3,5-3.4,8c0.9,0.7,2,1.2,3.2,1.6l-0.6,0.5c-1,0.9-2,1.8-3,2.7c-1.4-2.6-2.5-5.5-3.3-8.3
+			c-1.8,0.3-3.6,0.6-5.4,0.9c-0.4-5.2,5.8-5.4,8.7-8.2c1.7-1.5,0.2-3.6-0.2-5.3c-4.4,2.5-8.4,6-13.5,6.9c0.2-2,0.7-4,0.7-6
+			c-1.8-1.2-3.9-2-5.9-2.9c-1.5,2.2-3.8,3.5-6.3,4.2c-0.5-1.7-0.9-3.4-1.1-5.1c1.5-0.9,3.3-0.7,5-0.8
+			C1567.1,663.1,1567.4,662.8,1567.6,662.6 M1564.2,665.3c-1.2,1.6,1.6,2.8,2.5,1.4C1567.9,665.1,1565,663.9,1564.2,665.3z"/>
+		<path class="st6" d="M1707.9,655.5c1.9-0.4,3.9-0.8,5.9-1.2c1.1,1.2,2.5,2.2,3.9,3.1c-1,1.6-2,3.2-2.9,4.8
+			c-0.2-0.6-0.7-1.7-0.9-2.3c-0.7,0-2,0.1-2.7,0.2c0.1-0.5,0.2-1.4,0.3-1.8C1710.2,657.3,1709.1,656.4,1707.9,655.5z"/>
+		<path class="st6" d="M388.1,657.2c1.3,0,2.7-0.1,4-0.1c-0.4,1.3,0,4-2.1,3.6C388.1,660.7,388.4,658.4,388.1,657.2z"/>
+		<path class="st6" d="M795.4,659.3c1.1-0.3,2.2-0.4,3.4-0.3c0,1.3,0.1,2.6,0.1,4c-1.3,0-2.5,0-3.8,0
+			C795.1,661.7,795.2,660.5,795.4,659.3z"/>
+		<path class="st6" d="M1283.4,664.7c-0.7-2.7,1.7-4.7,3-6.7c0.4,0.3,1.3,1,1.8,1.4c-0.5,0.5-1.6,1.4-2.2,1.9
+			c0.3,1.4,0.7,2.9,1.1,4.3c1.8,0.5,3.6,1.1,5.4,1.6c-0.2,1.3-0.3,2.5-0.5,3.8c0.4-0.3,1.3-1,1.7-1.3c0.2,0.6,0.6,1.9,0.8,2.5
+			c-1.8,0.4-3.6,1-5.5,1.2c-2.8-0.3-5.2-2.1-8-1.9c-1.4,1-2.6,2.3-3.9,3.4c0.3-2.3,0.9-4.5,1.8-6.6c2.5,0,5,0,7.6-0.1
+			C1285.4,667.1,1284.3,666,1283.4,664.7 M1285.1,670.5c1.3,0.8,2.5,1.7,3.9,2.2c2.2-0.3,2-3.5,1.2-5
+			C1288.1,666.6,1286.7,669.6,1285.1,670.5z"/>
+		<path class="st6" d="M1253.8,662.3c1.4-1.1,2.9-2.6,4.8-2c1.7,0.9,2.6,2.7,3.5,4.3C1259.2,664.5,1256.1,664.3,1253.8,662.3z"/>
+		<path class="st6" d="M369.2,661.2c1.3,0,2.6,0.3,3,1.7c-0.4,1-0.8,2-1.2,3c-1-0.5-2-0.9-2.9-1.3
+			C368.4,663.5,368.4,662.2,369.2,661.2z"/>
+		<path class="st6" d="M704,670.1c2.2-1.3,4.4-2.8,6.5-4.2c1.9,2,0.5,4.3-0.5,6.3c2.3,4.3,0.8,9.5,3,13.8c-0.8-0.8-1.6-1.7-2.3-2.5
+			c-1.2-0.1-2.5-0.1-3.7-0.2c0.6,2.1,0.6,4.7,2.2,6.4c1.5,0.2,3,0.2,4.5,0.3c0-0.8,0.1-2.3,0.1-3.1c1.4,0.5,2.7,1.2,3.9,2
+			c-1.3,2.1-2.7,4-4.1,6c-1.8-2.5-5.5-1.5-7.2,0.5c-0.6,1.6,0,3.3,0,5c-1.1-0.2-2.1-0.4-3.1-0.6c-1-1.6-1.4-3.4-2-5.1
+			c-1.2-0.4-2.3-0.7-3.5-1.1c2.6-1,5.2-2,7.5-3.6c0.2-2.2,0.1-4.5,0.2-6.7c1.1-1.4,2.6-2.5,3.2-4.3c-0.3-1.5-1.5-2.5-2.2-3.7
+			c0.7-0.5,1.4-1.1,2.1-1.7c0.1-1,0.3-2,0.4-3c-1.3,0-2.5,0-3.8,0.1c-0.7,0.4-1.5,0.9-2.2,1.4C703.2,671.6,703.7,670.6,704,670.1z"
+			/>
+		<path class="st6" d="M485.6,667.2c1.5,0.5,2.9,1,4.4,1.5c-0.6,1.5-1.2,3.1-1.8,4.7c-1.4-0.7-2.8-1.4-4.2-2
+			C484.5,670,485.1,668.6,485.6,667.2z"/>
+		<path class="st6" d="M978.2,676c1.2-3.8,4.4-6.8,7.9-8.6c1.7,3.2,2,6.9,3.1,10.3c3.4,0.9,6.8,1.5,10,2.9c-1.8,1.3-3.7,2.3-5.6,3.4
+			c-1.6,2.9-4.4,4.6-7,6.4c-0.3,1.3-0.4,2.7-0.5,4.1c1.9,0,3.8,0.1,5.8,0.1c-0.1,1.7-0.1,3.4-0.2,5.2c1.1-0.7,2.3-1.4,3.4-2.1
+			c-0.1,0.8-0.3,2.5-0.4,3.3c-0.4,0.1-1.2,0.3-1.7,0.4c0.1,0.4,0.4,1.3,0.5,1.8c0.6,0.3,1.8,0.9,2.5,1.3c-1.1,0.6-2.1,1.2-3.2,1.8
+			c-1.4-0.9-2.5-2.4-4.2-2.7c-1.8,2.1-0.4,4.7-0.4,7c-0.5,2-1.4,4-2.2,5.9c2.5,2,4.9,4.1,7.2,6.3c1.1-0.6,2.1-1.3,3.2-1.9
+			c2.2,2.2-0.9,3.3-2.4,4.7c0.2,0.8,0.3,1.7,0.5,2.5c2.2-0.5,4.4-0.8,6.7-0.8c0.3,1.7,0.6,3.5,1,5.2c1.3,0.1,2.7,0.1,4.1,0.3
+			c1.3,2.3,1.4,5.2,2.8,7.4c0.9-0.1,1.8-0.3,2.8-0.5c0.7-0.3,2.2-0.9,2.9-1.2c-0.2-1.6-0.4-3.2-0.7-4.8c-1.3-0.2-2.4,0.7-3.5,1.2
+			c-0.1-2.4-0.1-4.8-0.3-7.2c2.3,0,4.6-0.3,6.9,0.2c2.5,2.2,3.5,5.6,5.9,8c1.4,1.5,3.7,1.3,5.5,1.7c-0.9-2-1.8-4.1-2.8-6
+			c1.6-0.7,3.2-1.3,4.7-2c0.8,0.6,1.5,1.2,2.3,1.9c1.6-0.5,3.2-0.9,4.8-1.4c-0.6-1.2-1.3-2.3-1.9-3.5c0.9,0.3,1.9,0.7,2.8,1.1
+			c2.3,1.3,4.3,3.2,5.8,5.5c-1.7-1-3.5-2.1-5.2-3.1c-1.5,3.9-0.9,8.2,1.4,11.6c0.9-0.1,2.7-0.5,3.6-0.6c-1.6,0.9-3.4,1.6-5.3,1.3
+			c-5.9-0.6-11.9-1.3-17.9-1.2c0.2-1.4,0.4-2.7,0.6-4.1c-3.2,0.2-5.7,2.2-7.9,4.4c-12.3-0.1-24.5-0.1-36.8,0.1
+			c-0.1-0.8-0.3-2.4-0.5-3.2c-3.1-0.2-6.2-0.4-9.3-0.4c0.1,1.1,0.2,2.2,0.4,3.2c-2,0-3.9,0-5.9,0c0.9-1.2,1.9-2.3,2.8-3.5
+			c-0.8-1.9-3.5-4.1-5.6-2.8c-1.2,0.5-2.4,1.1-3.5,1.6c0-1.7-0.1-3.4,0.2-5.1c1.1-1.5,2.7-2.5,4.4-3c1.2,0.7,2.3,1.6,3.5,2.4
+			c1.6-1.9,0-4.5-0.3-6.6l-0.1-0.5c0.3-0.2,1-0.6,1.4-0.9c1.2,1.1,2.4,2.2,3.7,3.3c-1-0.3-2.1-0.6-3.1-0.9c0.1,2.4,0.2,5,2.6,6.2
+			c-0.6,0.9-1.2,1.9-1.8,2.8c1.6,2.7,4.6,3,7.4,3.2c0-2.2,0-4.5,0.1-6.7c-0.9,0-2.6-0.1-3.5-0.1c0.9-0.4,1.8-0.7,2.8-1.1
+			c0-0.6-0.1-1.2-0.1-1.8c0.9-2,1.6-4.1,2.2-6.2c1.4-0.2,2.8-0.3,4.3-0.7c3.6-2.9,6.4-6.7,8.2-10.9c-0.3-0.4-0.9-1.2-1.2-1.6
+			c-2.2,0.7-4.5,1.3-6.7,2c-0.7,1.1-1.4,2.2-2.1,3.2c-0.6-1.3-1.1-2.5-1.6-3.8c2.6-0.3,3.8-2,3.8-4.6c0.8,1.3,1.6,2.7,2.5,3.9
+			c2.2-1.1,1.6-4,2.2-6c0.3,0.5,1,1.4,1.3,1.9c1.8-1.6,3.5-3.3,5.3-4.9c-0.3-2-1.1-3.8-2.6-5c-0.4,1.1-0.7,2.1-1,3.2
+			c-0.3,0.1-0.9,0.4-1.2,0.5c-0.6-2.7-2-5-3.7-7.1c1.5-1.2,3-2.3,4.5-3.5c-0.8-1.6-1.6-3.2-2.4-4.9c-0.9-0.3-1.9-0.6-2.8-0.8
+			C980.2,680.3,978.6,678.4,978.2,676 M980.6,675.1c1.6,1.9,3.3,3.7,5.6,4.9c1.2-3.2,2-8.3-1.2-10.5
+			C982.4,670,981.9,673.1,980.6,675.1 M981.2,723.7c2,0.1,4-0.2,5.9-0.8c-0.5-2.2-2.4-3.4-4.2-4.4C981.7,720,981,721.7,981.2,723.7
+			 M985.7,724.6c-2.3,0.7-4.6,0-6.9-0.3c-1.8,1.2-3.7,2.4-5.5,3.6c-0.1,2.7,2.3,3.5,4.4,4.2c-0.6,1.2-1.1,2.5-1.6,3.7
+			c1,1,2.1,2,3.1,3.1c0.8-1.5,1.6-3,2.3-4.6c1.2,0.1,2.3,0.2,3.5,0.4c0.2-1.3,0.4-2.5,0.7-3.7c3.7-0.5,5.6-3.5,6.7-6.8
+			c-1-1-1.9-1.9-2.9-2.8C988.3,722.5,987.2,723.8,985.7,724.6 M996,730.4c-3.6-2.4-8.4,0.3-9.1,4.3c1.7-0.8,3.9-1.9,5.5-0.1
+			c1.4,1.8,3.6,4.1,5.7,1.6c0.3-2.9,4.1-6.2,1.1-8.7C998.1,728.4,997.1,729.4,996,730.4 M1028.5,732.4c0,0.5,0.1,1.6,0.1,2.1
+			c2.2,1.5,5.1,3.4,7.2,0.5C1033.8,733.1,1031.3,732.1,1028.5,732.4 M998.8,737.9c-1.7,0.4-3.5,0.7-4.9,1.8
+			c3.7,0.7,7.5,0.7,11.2,0.3c-0.8-1.5-0.7-4.5-3.1-3.9C1000.7,736.2,999.8,737.3,998.8,737.9z"/>
+		<path class="st6" d="M365.6,669.2c3.6,0.1,6.2,2.9,7.3,6.1c-1.9,0.7-3.7,1.4-5.6,2.1c-0.5,1.8-1,3.7-1.4,5.5
+			c-2-1.4-5.7-2.6-5.5-5.4C363.1,675.3,365.4,672.8,365.6,669.2z"/>
+		<path class="st6" d="M689.8,671.6c1.3-1,2.7-2.1,4.2-2.8c-0.7,1-1.3,2-2,3.1c1.6,2.3,4.2,4.9,2.8,8c-2,2.1-4.5,3.6-6.6,5.4
+			c3,1.2,6.1,0.3,9.2,0.4c1.8,0.3,2.1,2.3,2.8,3.7c-1.3,0.2-2.7,0.3-4,0.5c0.2-0.9,0.4-1.7,0.6-2.6c-4.7-0.8-9.4,1.1-12.2,5
+			c-0.3,1.3,0.5,2.5,0.7,3.8c3.4-0.6,5.6-3.1,7.9-5.4c-0.5,1.2-1,2.5-1.6,3.7c-2,2.1-5.1,2.9-6.8,5.4c-0.9-0.1-1.8-0.2-2.8-0.3
+			c-0.2,1.3-0.5,2.5-0.7,3.8c0.8,0.3,2.3,0.8,3.1,1.1c-6.7-0.5-13.4-1.1-19.5-4.1c-1-1.4-1.9-2.9-2.9-4.3c1.3-1.7,2.6-3.3,3.9-5
+			c4.6-1.4,7.4-5.4,9.8-9.3c-0.4-2-1.2-3.8-1.8-5.7c0.2-0.3,0.4-1,0.6-1.4c0.7,1.1,1.4,2.2,2.2,3.3c1-2.1,1.5-4.6,3.4-6.1
+			c1.3-0.5,2.6-0.8,4-1.1c1,2.6,1.2,6.2,4.2,7.4c1.8,1,4.5,1.1,5.1-1.3C692.7,674.8,691,673.3,689.8,671.6 M679.1,677.8
+			c1.5,0.3,3.1,0.7,4.6,1.1c-0.1-2.2-0.1-4.4-0.2-6.6C680.3,672.1,678.6,674.9,679.1,677.8 M669.5,692.4c-0.6,1.5,0.9,2.9,1.4,4.3
+			c1.4-0.8,2.8-1.6,3.8-2.9c0,0.9,0.1,2.6,0.2,3.5c2.9,0.1,5.8,0.4,8.7,0.2c0.2-2.1,0-4.1-0.1-6.2c1.5-1.2,2.9-2.4,4.3-3.6
+			c-2.7-1.9-6.4-2-8.9,0.2c1.1-3,4.2-3.5,6.8-4.6c1.4-3-3.5-3.2-5.4-3.7C676.1,683.5,672.2,687.5,669.5,692.4z"/>
+		<path class="st6" d="M270.6,672.5c2.9-0.9,6.1-1.1,8.7-2.9c1.7,0.7,3.3,1.5,5,2.3c-1.3,1.8-2.8,3.5-3.6,5.6
+			c-0.5,2.1-0.4,4.2-1,6.3c-1.3,2.3-3,4.3-3.3,7c2.3,1.8,4.5,3.7,6.8,5.7c-1,2.5-2,4.9-3.2,7.3c-3-1-5.6,0.8-8.2,2
+			c-0.6,3.5-1.4,7-2.6,10.4c0.6,0.8,1.3,1.6,2,2.4c-1.3-0.4-2.5-0.8-3.7-1.3c1.2-5,4.3-10.3,1.9-15.4c-0.7,1.7-1.4,3.5-2.1,5.3
+			c-0.1-1.7-0.2-3.4-0.4-5c-1.1-0.1-2.3-0.2-3.4-0.3c-0.1,2.6-0.5,5.4,1.2,7.7c-1.6,0.5-3.2,0.8-4.7,1.2c-1.4,3.6-3,7.1-4.2,10.8
+			c2.1-1.2,4.3-2.3,6.4-3.5c-0.1-1.4-0.3-2.8-0.4-4.2c0.4-0.5,1-1.4,1.4-1.8c0.5,0.2,1.4,0.7,1.9,1c-1,6.6-2.8,13-3.7,19.6
+			c0.2,0,0.7,0.1,0.9,0.1c0.4-2.6,1.2-5.1,2.8-7.2c0.1,4.5-2.5,9.1-0.7,13.5c-0.3,0.8-0.7,1.6-1,2.4c-1.9-3.1-5.5-5-6.7-8.6
+			c1,0.6,2,1.2,3,1.8c0.6-5,1.4-10,2-14.9c-2.2,1.1-4.3,2.4-6.1,4c-2.3-1.7-4.7-3.3-7.2-4.9c0.9,2,1.7,4,2.5,6.1
+			c0.5,0.3,1.4,0.9,1.9,1.2c-2.2,1.5-4.9,0.7-7.3,0.3c0.9-1.4,3.3-2.2,2.9-4.2c-1.4-2.3-3.7-4-5.8-5.6c1.5-0.1,2.9-0.2,4.4-0.4
+			c-0.7-2-2.1-3.4-4.2-3.8c-0.6,0.9-1.2,1.9-1.8,2.9c-0.5,0.5-1.4,1.5-1.9,2c-0.5-1-1-2.1-1.4-3.1c0.7-1.7,1.4-3.3,2.1-5
+			c2.6,1.2,5.5,2,7.7,3.9c2.1,2.4,3.7,5.1,5.7,7.6c1.5-4,4-7.6,5.4-11.6c1.1-0.8,2.2-1.6,3.4-2.4c-0.4-0.9-0.9-1.9-1.3-2.8
+			c-0.5,0.1-1.5,0.2-2,0.3c-0.5,1.2-1.1,2.5-1.6,3.8c-1.3-0.2-2.6-0.4-3.9-0.5c-0.4-2.7-0.1-5.8-2-7.9c-1.2-1.5-2.7-2.7-4.1-3.9
+			c-0.4-1.2-0.8-2.4-1.2-3.6c0.7-0.2,1.9-0.6,2.6-0.8c1.3,1,2.1,2.9,3.9,3.2c0.9-1.3,1.6-2.7,2.3-4.1c2.8-0.9,5.8-2.1,8.8-0.9
+			c2.5,2.9,2,7.8,6,9.5c0.5-3.5,1-7,1.1-10.6c-2.3-0.8-6.7-0.3-6.6-3.7c-0.2-3.1,3.5-4.3,4.2-7.1C269,676.1,268.9,673.8,270.6,672.5
+			 M277,673c-1.8,1-4.1,0.2-5.8,1.3c-1.1,1.4-0.5,3.5-0.7,5.2c-1.6,1.1-3.3,2.1-4.8,3.5c-0.7,1.3-0.6,3.1,1.1,3.5
+			c3.4-0.5,7-0.8,9.9-2.6c1.9-0.8,1.3-3.2,1.7-4.8c0.1-2.3,1.9-4,2.8-6C280.6,670.3,278.5,672.3,277,673 M256.3,691.3
+			c-1.6,2.2-2.9,4.8-3.2,7.5c0.4,2.5,3,5.8,5.8,4c2.4-1.7,5.2-2.9,8.2-3.2c-1.9-2.4-4.8-3.5-7.2-5.2c0.8-0.2,2.4-0.7,3.2-0.9
+			c-0.4-1-0.5-2.3-1.5-3C259.8,690.2,257.9,690.4,256.3,691.3 M271.3,693.3c-0.4,2,0,4.2,0,6.3c0.4,0,1.2-0.1,1.6-0.1
+			c0.2,1.1,0.4,2.3,0.6,3.4c0.5,0,1.5-0.1,2-0.1c0.5-1.5,0.6-3.2,1.9-4.2c0.9-1,3-2.1,1.8-3.7C277.4,692.8,273.4,690.3,271.3,693.3z
+			"/>
+		<path class="st6" d="M480,674.7c-2.2-2.3,2-3.3,3.2-4.6c0.1,0.8,0.4,2.5,0.5,3.4c1.1-0.1,2.3-0.1,3.4-0.1c0.5,0.3,1.5,0.9,2,1.2
+			c-0.1,0.9-0.1,2.6-0.2,3.5c-1.2-1.1-2.4-2.3-3.6-3.3c-0.4,2,0.3,3.8,1,5.7c-0.2,0.2-0.5,0.6-0.7,0.9
+			C484.4,678.5,482.2,676.6,480,674.7z"/>
+		<path class="st6" d="M1409.3,678c0.8-1.5,1.7-3.1,2.6-4.5c3.2,4.5,3.2,10.5,5.7,15.4c0.3-0.4,0.9-1.2,1.2-1.7
+			c-0.3,2.7-0.1,5.6-1.5,8c-4.7,1.2-9.6,0.7-14.4,0.8c0.3,2.1,0.7,4.3,0.5,6.4c-2.4,0.4-2.7-2.1-3.5-3.7c0.8-1.6,1.5-3.2,2.3-4.8
+			c4.9,0.4,9.7,1,14.6,0.3c-0.7-1.9-1.5-3.7-2.4-5.5c0.4-1.3,0.8-2.5,1.2-3.8c-0.7-0.6-1.4-1.2-2.2-1.8c-0.6,1.6-1.2,3.2-1.8,4.9
+			c-0.1-1.6-0.2-3.2-0.2-4.8c0-1.3,0-2.5,0.1-3.8C1411,679,1409.8,678.3,1409.3,678z"/>
+		<path class="st6" d="M1288.3,676.2c2.6,1.4,5.7,2.8,6.8,5.8c0.6,2.5,1.2,6.3-2.2,6.9c-0.3-1.2-0.5-2.4-0.8-3.6
+			c-1.2,0.6-2.3,1.3-3.7,1.4c0.1-1.8,1-3.3,1.6-4.9c-1.1-1.9-2.6,0.6-3.8,1.2c-0.5,0.4-1.5,1.3-2,1.7c-0.6-1.2-1.2-2.4-1.8-3.5
+			C1284.4,679.3,1286.4,677.8,1288.3,676.2z"/>
+		<path class="st6" d="M1576.8,685.9c0.4-1.7-0.3-4.1,1.7-5c-0.2,2.6,0,5.2,0,7.8c-1.2,1.2-2.5,2.2-3.8,3.2
+			c-0.3,1.9,0.4,4.2-1.2,5.7c-1.9,0.7-3-1.2-4.1-2.3c-1.5,0.5-2.9,0.9-4.4,1.4c0.4-1.5,0.8-2.9,1.2-4.4c0.5,0,1.6,0,2.2,0
+			c0.4,0.6,1.2,1.7,1.6,2.3c1.2-0.9,2.4-1.9,3.6-2.8c-0.1-0.7-0.1-1.5-0.1-2.2C1574.7,688.5,1576.7,687.8,1576.8,685.9z"/>
+		<path class="st6" d="M991.2,694.2c1.2-4.5,4.7-7.8,6.7-11.9c3.8-0.3,6.5,2.3,8.8,4.9c-0.3,0.2-1,0.6-1.4,0.8
+			c0.5,0.9,0.9,1.9,1.4,2.8c-0.3,0.5-0.8,1.4-1.1,1.9c-0.6,0-1.8,0.1-2.4,0.1c-1.6-3-2.9-6-4.1-9.1c-1,1.9-1.9,3.7-2.8,5.6
+			c1.8,0.3,3.5,0.7,5.3,1.2c-0.4,0.6-1.2,1.9-1.6,2.5c-0.2-0.4-0.5-1.3-0.7-1.7C996.6,692.4,994,693.4,991.2,694.2z"/>
+		<path class="st6" d="M1405.3,686.4l0.5,0.3c1.6,1.1,3.5,1.8,5.4,2.4l-0.4,0.8c-0.3,0.5-0.9,1.4-1.2,1.9c-1.9-0.2-3.8-0.5-5.7-1.1
+			C1404.4,689.2,1404.9,687.8,1405.3,686.4z"/>
+		<path class="st6" d="M1565,689.9c-0.1-2.4,1.2-5,4.1-3.8C1569.1,688.1,1566.3,688.7,1565,689.9z"/>
+		<path class="st6" d="M1280.6,689.1c0.3-0.2,1-0.8,1.4-1c0.1,2.4,0.2,4.8,0.1,7.2c-0.1,0.4-0.3,1.1-0.4,1.4c1,0.1,2,0.3,3.1,0.4
+			c0.2,1.2,0.5,2.4,0.7,3.6c0.7,0,1.9,0.1,2.6,0.1c-1.5-3.4-2.4-7.4,0.3-10.6c0.9-2.1,3-1.3,4.6-0.7c-0.1,1.8-0.1,3.5-0.1,5.3
+			c0.6-0.3,1.7-0.8,2.3-1c-0.6,2.4-1.2,4.8-1.9,7.3c0.7,0,2,0.1,2.7,0.1c-0.2,0.4-0.6,1.1-0.9,1.5c-1.2,0-2.5-0.1-3.7-0.1
+			c-0.4-0.5-1.1-1.4-1.5-1.9c-3.8,1.3-5.4,5-6.8,8.5c0.2-2.5,0.5-4.9,0.6-7.3c-1.2,1.1-2.4,2.2-3.3,3.5c-0.2,4.2,3.6,6.9,6.9,8.6
+			c-2.1-0.5-4.2-0.8-6.3-1.2c1.6,3.3,2.1,7.2-0.1,10.4c0.2,1.2,0.4,2.4,0.6,3.6c-1.5,0.4-3.1,0.7-4.6,1.1c0.5-1.6,1.1-3.2,1.6-4.8
+			c-0.4-0.6-0.8-1.3-1.2-1.9c-0.8-0.8-1.9-3.9-3.4-2.1c-0.8,0.5-1.5,1-2.3,1.6c-1.3-1-2.7-1.9-4-2.8c0.8,0,2.4,0.1,3.2,0.1
+			c1.7-1.5,3.4-2.9,5-4.5c0.2,0.4,0.6,1.1,0.9,1.5c-0.8,0.8-1.6,1.5-2.3,2.3c2.4,1.1,4.9,2.2,7.4,3c-0.6-2.5-1.7-5-3.9-6.4
+			c-0.5-0.4-1.5-1.3-2-1.7c1.2-3,2.5-6,3.9-9c2-1.2,3.9-2.6,4.6-5c-1.3-0.2-2.7-0.4-4-0.5c-0.5-1-0.9-2.1-1.3-3.1
+			C1280.2,692.8,1280.4,690.9,1280.6,689.1 M1287.5,696.5c0.8,0.7,1.7,1.3,2.6,1.9c2.1-2.1,1-4.8-1.1-6.3
+			C1288.4,693.4,1286.7,694.8,1287.5,696.5z"/>
+		<path class="st6" d="M361,688.7c3.1,2.2,6.1,4.5,9.1,6.7c0.1,2.3,0.2,4.5,0.4,6.8c-0.8-1-1.5-1.9-2.2-2.9c0,2.3,0,4.6-0.1,6.9
+			c-1.6-2.5-1.9-5.4-2.2-8.3c-0.5-0.7-1-1.3-1.5-2c0.2-2-0.8-3.7-2.2-5c-0.7,0.6-1.4,1.3-2.1,2C360.4,691.5,360.7,690.1,361,688.7z"
+			/>
+		<path class="st6" d="M1554,690.5c1.9,0.8,3.8,1.5,5.8,2.2c-1.6,0.3-3.2,0.6-4.8,0.8c1.7,0.6,3.4,1.2,5.1,1.8
+			c0.2,1.2,0.4,2.3,0.6,3.5c-0.5,0.6-0.9,1.3-1.3,2c0.4,0.2,1.3,0.6,1.7,0.8c0.7,3.9,5.2,4.8,8.1,6.7c-2.5,0.1-4.2,2-5.8,3.6
+			c-0.7,0.7-1.3,1.3-2,2c-0.1-0.4-0.4-1.2-0.6-1.6c1.8-1.5,3.3-3.3,3.7-5.6c-1.7,0.1-3.3,0.2-4.9,0.3c-1.1,2.6-2.4,5.1-3.7,7.6
+			c1.4,0.3,2.8,0.6,4.2,0.9c-1.1,1.3-2.4,2.8-4.3,2.5c-1.7-1.7-2.1-4.8-4.1-5.8c-1.1,2.6-2.2,5.2-4.3,7.1c1.4-6.6,0.3-13.2-0.8-19.8
+			c0.5,0.3,1.4,0.9,1.9,1.2c0.2,0.1,0.7,0.4,1,0.6c2,0,3.9-0.2,6-0.4c-1-1.8-2.1-3.6-3.1-5.4C1553.1,694,1553.5,692.2,1554,690.5
+			 M1551.2,702.3c-1.9,1.3,1,2.2,2.1,2.5c1.6,0.7,4.7,0.9,4.4-1.6C1555.8,702.4,1552.9,700.7,1551.2,702.3 M1552.8,708.2
+			c1.5,1.5,3.7,2.2,5.6,1C1557.1,707,1554.8,707.2,1552.8,708.2z"/>
+		<path class="st6" d="M135.6,693.7c0.4-0.8,0.9-1.5,1.3-2.2c0.9,1.1,1.7,2.1,2.7,3.1c0.8,0.8,1.6,1.6,2.5,2.4c1.5-1,3-1.9,4.5-2.8
+			c-0.3,1.8-0.6,3.5-1.1,5.2c1.6,3,4.3,5.2,6.9,7.3c-0.3,3-0.4,6,1.8,8.4c1.1-2.1,2-4.2,2.7-6.4l0.2,0.7c1.1,4.1,2.6,8.2,5.3,11.4
+			c1.2,1.4,2.8,2.3,4.3,3.3c-1.2,0.8-2.4,1.6-3.6,2.4c1.3,0.9,2.5,1.7,3.8,2.6c0.9-0.7,1.9-1.3,2.8-1.9c0.7,1.4,1.4,2.8,2.1,4.2
+			c2-0.9,4-2,6.2-2.2c1.3,4.1-3.2,7-3.1,11c2,0,3.9,0,5.9,0c-1.8,0.5-3.7,1.7-5.6,1.1c-1.6-0.6-2.7-1.8-4-2.8
+			c-3.6,0.3-7.2-0.5-10.7-1.4c0.2,1.4,0.5,2.8,0.8,4.3c-1.6,0-3.2,0-4.8-0.2c-1.1-1.7-1.9-3.5-2.8-5.3c-2.5,1.7-5,3.5-7.5,5.1
+			c-2.8,0.2-5.7,0.2-8.5,0l-0.4-0.7l0-0.8c1.6,0.3,3.1,0.7,4.7,1c-0.1-2.2-0.3-4.3-0.4-6.5c-0.6-0.2-1.7-0.6-2.2-0.8
+			c-0.6,1.3-1.2,2.6-1.8,4c-0.5-1.5-1.1-2.9-1.7-4.4c-1,1.6-1.9,3.2-2.4,5c-0.3,1.1-0.7,2.3-1.1,3.4c-2.1,0.3-4.2,0.1-6.3,0.1
+			c1-2.8,0.8-5.5-1.7-7.4c-1.7,2.1-1.8,4.8-1.6,7.4c-0.4,0-1.3,0-1.7,0c-0.3-2-0.6-4-1-6c-1.2,1.2-2.5,2.3-3.7,3.6
+			c0.7-2.2,1.2-4.5,1.1-6.8c-3.9-1.7-5.1,3.2-6.1,5.8c-1.2,0.2-2.3,0.5-3.5,0.7c-0.5,0.9-1,1.7-1.4,2.6c-1.8,0.2-3.6,0.4-5.3,0.7
+			c2-3.4,4-7.1,3-11.1c-1.3-0.4-2.7-0.8-4-1.2c4.2-1.4,8.5-1.8,12.9-2.1c0.4-0.4,1.2-1.1,1.5-1.5c2.4-2.1,5.5-3.7,6.9-6.7l0.6-0.8
+			c0.7,0.3,2,0.8,2.7,1.1c-2.6,3.4-5.1,6.9-6.6,11c4,0.5,6.9-2.1,9.5-4.6c0.8,1.1,1.7,2.2,2.8,3.2c2.4-2.8-0.4-5.9-1.4-8.6
+			c-1.2-2.2-1.2-4.7-1.2-7c1.4-2.1,2.6-4.4,3.7-6.7c-1.6-0.5-3.2-1-4.9-1.5c0.4-1.9,0.8-3.7,1.1-5.6c0.9,1.4,1.8,2.8,2.7,4.2
+			c0.8-1,1.7-2,2.5-3c0.1,0.7,0.3,2.1,0.4,2.8c1.3-0.1,2.6-0.1,3.8-0.2c1.6-1.4,2.9-3.1,4.2-4.8c-2.7-0.1-5.3-0.2-8-0.2
+			c0.2-1.2,0.5-2.5,0.7-3.7C134,694.4,135,693.9,135.6,693.7 M142.3,705.4c1.1,0.1,2.3,0.3,3.4,0.5c1.3-2.4,0.2-4.3-1.9-5.7
+			C142.8,701.7,142.6,703.6,142.3,705.4 M130,713.8c1.5-0.4,3-0.9,4.6-1.3c-0.5,3-2.5,6.9,0.9,9c2.1,2.8,5.5,1,7.7-0.6
+			c0.1-2.8-1.4-5.5-2.1-8.2c-2.1-0.2-4.2-0.3-6.3-0.4c0.6-2,1.1-4.2,0.2-6.2C132.1,707.5,129.3,710.3,130,713.8 M136.7,705.7
+			c0,1.6,0,3.3,0,5c1.6,0.3,3.2,0.5,4.7,1c1.2,1.2,2.2,2.6,3.4,3.9c1.7-0.2,3.1-1.6,2-3.2C145.4,708,140.4,707.2,136.7,705.7
+			 M148.4,718.2c-1.1,1-3.8,1.5-3.1,3.6c0.7,1.6,2.6,2,3.9,2.9c0.4-1.2,0.9-2.5,1.3-3.7c1.1,1.3,2.4,2.6,3.6,3.9
+			c1.1-2.3,2.3-4.6,3-7c-0.6-1.8-3.3-0.8-4.8-1.2c-0.8-1.1-1.6-2.2-2.5-3.3C148.9,714.7,146.8,716.4,148.4,718.2 M128.7,717.9
+			c2.1,4,4,8.3,3.1,13c-2.3-0.2-4.6-0.9-6.7-1.8c-0.3,0.5-0.9,1.4-1.2,1.9c1.9,2.7,3.9,5.3,6.1,7.7c1.2-1.9,2.1-3.9,2.8-6
+			c3.5,0.1,6-1.9,7.6-4.8c1.4,1.5,1.2,3.5,1.3,5.4c2.5,1.5,5.1,3,8.1,3c-0.7-2.3-1.3-4.7-2.2-7c-1.9-3.4-6-6.5-9.9-4.2
+			c-2-1.7-4.1-3.2-5.5-5.4c-0.1-1.7,0.2-3.4,0.3-5.1C131,715.4,129.8,716.6,128.7,717.9 M158.7,730.2c-0.2,0.3-0.6,1-0.9,1.3
+			c-1.5-0.1-4.7-2.1-4.7,0.5c0.6,2.8,2.6,5.1,3.8,7.6c1-1.2,1.9-2.4,3.1-3.4c1.9-0.3,3.9,0.2,5.8-0.5c1.4-1,2-2.9,2-4.5
+			c-1.5-1.2-3.3-2-4.9-3.2c-1.2-2.5-1.5-5.4-2.7-8C156.4,722.2,156.8,726.9,158.7,730.2 M105.3,731.2c0.1,1.5,0.2,2.9,0.3,4.4
+			c2.5,0.4,3.7-1.9,4.2-4C108.2,731.5,106.8,731.3,105.3,731.2z"/>
+		<path class="st6" d="M0,692.3c2.2,0.1,4.5,0.1,6.8,0.2c0,0.5,0,1.6-0.1,2.1c-2.2,0.4-4.5,0.8-6.7,1.3V692.3z"/>
+		<path class="st6" d="M379.3,692.3c2.2-0.9,3,2,2.5,3.6c-0.7,1.6-2.1,2.7-3.3,4C378.4,697.4,376.7,694,379.3,692.3z"/>
+		<path class="st6" d="M527.5,694.3l0.1-0.4c0.4,2.5,3.2,2,3.9,0l0.8-0.2c0.8,1.2,1.5,2.3,2.3,3.5c-1.9,2.7-5,5-4.5,8.6
+			c-1.7,0-3.4,0-5.1,0c0.6-1.6,1.2-3.3,1.8-5C527.2,698.7,527.3,696.5,527.5,694.3z"/>
+		<path class="st6" d="M393,698c0.8-0.7,1.5-1.4,2.2-2.1c0.1,0.7,0.2,2,0.3,2.7c0.6,0.2,1.9,0.5,2.5,0.7c-0.5,0.9-1,1.7-1.5,2.6
+			c0.5,1.3,1.1,2.7,1.7,4c-0.4,1.3-0.9,2.6-1.3,3.9c2.3-0.4,4.6-0.9,7-1.3c0.2,1,0.4,1.9,0.7,2.9c-1,1.1-1.9,2.2-2.9,3.2
+			c-1.5-0.8-3-1.6-4.5-2.4c-4.2,1.3-6.7-2.8-9.5-5.1c-1.8,2.6-2,5.7-1.3,8.7c-3.2-3.2-4.4-7.6-6.2-11.6c0.5,0.1,1.5,0.2,2,0.3
+			c1,1.1,2.1,2.3,3.1,3.4c1.3-2.4,1-5.2,2-7.6C388.5,698.3,391.1,698.5,393,698z"/>
+		<path class="st6" d="M244.2,700c1.1,0.5,3.4,0.1,3.3,1.9c0.2,1.7,0.7,5.5-2.1,4.6C242.3,705.6,243.9,702.2,244.2,700z"/>
+		<path class="st6" d="M688.3,700.3c3,0.5,5.5,2.3,8.3,3.2c-0.1-0.7-0.3-2.2-0.4-3c3.5,0.6,6.8,1.8,9.8,3.6
+			c-0.2,0.2-0.6,0.7-0.8,0.9c-2.1-0.5-4.2-1.1-6.3-1.6c-0.6,2.7-1.2,5.5-1.7,8.2c-2.5-0.1-5.3-1-7.7-0.2c-1.8,2.7-1.7,5.9-1.6,9
+			c-3.1,2.4-6.1,4.9-9.6,6.7c-2.1-2.3-4.2-5-7.5-5.2c-0.4,1.5-0.8,3-1.4,4.4c-1.7,0.8-4.4,1.7-5.7,0c-0.9-1.9-1.4-4-2-6.1
+			c-2.7,0.3-5.4,0.6-8,0.9c0.4,1.5,0.3,3.4,1.4,4.6c2.1,1.1,4.5,1.3,6.6,2.4c2.1,1.6,4.1,3.5,6.4,4.8l-0.6,0.3
+			c-4.4-0.8-7.1-5.1-11.6-5.9c-0.3,0.6-1,1.7-1.3,2.2c-1.8-1.1-3.4-2.7-5.7-2.6c-2.6,2.2-0.2,5.3,1.4,7.3c1.1,1.2,2.3,3.7,4.4,2.6
+			c2.5-0.9,1.4-4.1,1.6-6.1c0.4,0.3,1.3,0.9,1.7,1.2c-0.2,1.6-0.5,3.3-0.7,5c0.4,0,1.2-0.1,1.6-0.1c-1.8,0.8-3.5,1.7-5.3,2.5
+			c-1.8-1.2-3.3-2.6-4.8-4.1c-1.6,0.7-3.4,3.5-5.1,1.7c-1-2.3,1.2-4,2.1-5.9c1.7-2.5,3-6.8-0.3-8.6c-2.8-1.7-4.6,2.2-6.7,3.5
+			c-2.5,2.7-6.3,0.4-9.4,1.7c-3.4,1.3-7.1,2.5-9.5,5.4c-0.8,1.1-1.5,2.2-2.3,3.3c0.4-2.9,1.6-5.5,3.5-7.6c-1.2-0.5-2.5-0.9-3.7-1.4
+			c7.7-2.4,15.8-4.5,22.3-9.6c-1.7,2.2-2.4,4.9-2.7,7.6c2.9-2,5.2-5.4,9.1-4.9c2.2-4.1,7.8-5.1,8.8-9.9c-1.7-0.2-3.4-0.5-5.1-0.7
+			c2.5-2.2,4.8-4.5,6.9-7c1.8-0.2,3.6-0.5,5.5-0.7c-0.4,2.4-0.6,4.8-1.3,7.1c-1.2,1.2-3.1,1.5-4.7,2.2c-1,2.3-2,4.6-3,6.9
+			c1.5,1.2,3.3,1.3,5.2,1.1c-0.3-1.5-1.4-3.1-0.9-4.7c2.1-1,4,0.9,5.9,1.6c0.2,3.5,0.7,6.9,2,10.2c0.8-0.3,2.3-0.8,3.1-1
+			c-0.2-3.5-1.6-6.8-2.2-10.2c0.5-2.7,1.5-5.3,3.3-7.4c2.5-2.8,6.2-0.2,9.1,0.4c-0.9,1.5-2,2.9-2.5,4.6c0.2,2,0.9,4,1.5,6
+			c-0.8,1.2-1.6,2.4-2.3,3.6c1.5,0.7,3.4,3.1,4.6,0.9c1.1-4.8,2.4-9.6,2.3-14.6c1.6-0.4,3.3-0.8,4.9-1.3
+			C687.7,705.1,686.5,702.1,688.3,700.3 M688.7,702.7c-0.6,2.5,0,6.9,3.4,7c1.1,0,2.2,0,3.4,0c0.5-1,1-1.9,1.5-2.9
+			C695.5,704.1,691.6,702.1,688.7,702.7 M655.5,706.4c-0.8,2,2.1,2.4,3.3,3.4c1.5-1.4,1.9-3.3,1.7-5.3
+			C658.7,704.4,656.3,704.2,655.5,706.4 M671.3,708.4c-2.2,2.5-3.9,6.1-2.4,9.4c1.9-0.4,3.8-0.9,5.8-1.3c-0.1-2.6,0.1-5.2,1-7.7
+			C674.2,708.5,672.8,708.1,671.3,708.4 M684.2,710.4c0.1,1.7-0.1,4.7,2.5,4.3c1.5-1.4,0.8-3.7,1-5.5
+			C686.5,709.6,685.3,710,684.2,710.4z"/>
+		<path class="st6" d="M1010.3,700.3c2.1-1.3,3.9,2.8,1.4,3.4C1009.5,704.6,1007.8,701.1,1010.3,700.3z"/>
+		<path class="st6" d="M1265.3,702.3c1.1,0.3,2.2,0.6,3.3,0.9c-0.2,2.2-0.9,4.3-1.8,6.3c-1.9-0.6-3.8-1.2-5.8-1.6
+			C1262.9,706.5,1264.2,704.4,1265.3,702.3z"/>
+		<path class="st6" d="M1116.1,702.4c0.7,1.3,1.3,2.7,1.9,4c1.7-0.7,3.4-1.4,5.1-2.1c0.1,1.7,0.3,3.4,0.4,5.1
+			c1.1,0.1,2.2,0.1,3.3,0.2c-0.7,1-1.3,2.1-1.9,3.2c-0.6,1.8-0.2,4.1-1.9,5.3c-1.7,1.6-4,2.2-6.2,2.5c1.5,1.5,3.3,2.8,4.4,4.7
+			c1,2.7,1.5,5.6,2.2,8.4c2.6-0.2,5.2-0.7,7.6-1.9c0.9,0.2,1.8,0.4,2.7,0.6c1.2-1.1,2.5-2.1,3.8-3.2l0.4,0.4c-0.2,0.6-0.8,1.8-1,2.4
+			c-2,1.8-4.4,3.1-6.7,4.4c0.7,0.7,1.3,1.3,2,2c2.2-1,4.4-2.5,7-2c0.1,1.5,0.1,3,0.2,4.5c-1.3,0.1-2.6,0.1-3.8,0.2
+			c-1.7-1.5-3.9-2.1-6-2.7c-1.1-2.8-4.1-3.1-6.7-3.5c0,1.2,0,2.5,0,3.8c-1.1-0.9-2.2-1.7-3.3-2.5c-0.7-1.4-1.6-2.7-2.5-3.9
+			c-0.8,1-1.5,1.9-2.3,2.8c-1.8-2.6-3.4-5.4-5.7-7.6c-1.5-1.3-3.2,0.6-4.7,1c2,2.1,4.1,4.3,6.2,6.4c-1.7,1.1-3.1,2.6-4.6,4
+			c0.3-1.6,0.5-3.2,0.8-4.9c-2.3-0.8-4.6-1.6-6.9-2.2c-1.4-2.2-2.7-4.4-3.9-6.6c2,1.2,4,2.5,6,3.7c0.2-1.3,0.4-2.6,0.6-3.9
+			c1.4-0.6,2.7-1.2,4.1-1.8c2.1,1,4.3,1.7,6.6,2.3c0.1-1.6,0.5-3.3,0-4.8c-2-0.5-4.1-0.8-6.1-1.3c-1.8-1.7-3.3-3.6-5-5.2
+			c0.9-1.1,1.9-2.2,3-3.2c-0.3,1-0.5,2-0.8,2.9c0.4,0.3,1.1,0.8,1.4,1c3.3-3,6.2-6.5,7.1-11c-0.1,2.3,0.1,4.5,0.2,6.8
+			c0.5-0.1,1.5-0.3,2-0.4c-1.4,1.6-3,3-4.4,4.6c-0.9-0.2-1.7-0.4-2.5-0.6c-0.4,1.5-0.7,2.9-1,4.4c3,0.1,6.1-0.1,9.2-0.6
+			c-1.6-0.3-3.3-0.5-4.8-1.3c0.5-0.6,1.4-1.7,1.9-2.2c1.9,0.8,3.8,1.5,5.7,2.3c-0.2-3.4,1-6.6,2.8-9.4c-1.9,0.9-4,1.4-6.1,1.7
+			C1116.1,707,1116.1,704.7,1116.1,702.4 M1115.3,723.4c-0.8,1.8-1.5,3.6-2.2,5.4c0.5-0.1,1.6-0.4,2.1-0.5c0.3,0.9,0.8,2.7,1,3.5
+			c3.2,1.9,1.6-2.8,1.8-4.5c0.8-0.3,1.7-0.7,2.6-1c-1.1-0.9-2.1-1.9-3.1-2.8C1117,723.5,1115.9,723.4,1115.3,723.4 M1121.2,733.9
+			c1-1.9,0.3-3.9-1.1-5.3C1117,729.8,1119.6,732.5,1121.2,733.9z"/>
+		<path class="st6" d="M372.9,705.2c1.6,0.1,3.2,0.1,4.8,0.2c0,2.1-0.1,4.3-0.1,6.4c-2.5-1.1-5.1-2-7.7-2.8c0.5-0.2,1.7-0.7,2.2-1
+			C372.4,707.1,372.7,706.2,372.9,705.2z"/>
+		<path class="st6" d="M537.5,706.6c1.3-0.5,2.2,1,3.2,1.5c-1.8,2.2-3.1,6.4-6.7,5.4c-1.1,0.1-1.3-1.3-1.9-1.9
+			C534.2,710.3,535.8,708.4,537.5,706.6z"/>
+		<path class="st6" d="M13.8,708c4.4,1.3,9.1,1.9,13.7,2.3c-3,0.7-6,1.6-8.4,3.7c3.3,0.5,6.7,0.9,10,1.5c-0.1,0.3-0.4,1-0.5,1.3
+			c-3.2-0.1-6.4-0.6-9.6-0.6c-2.1-0.1-2.9,3.2-1.5,4.4c3.3,3.1,7.4,5.3,11.5,7.2c0.3,1.5,0.7,2.9,1,4.4c0.1,6.3,0.2,12.6,0.1,18.9
+			c0.1,1.8-1.2,3.2-2.1,4.6c-0.1,0.4-0.3,1.3-0.5,1.7c0.6,0.1,2,0.3,2.6,0.4c0,2.6,0,5.2-0.2,7.9c-2.6-2.8-6-5-7.6-8.7
+			c1,0.7,2.1,1.3,3.1,2c1.1-3.7,2.9-7.1,4.4-10.6c-3.3,1.8-7.3,3.3-8.1,7.4c-2.1-0.3-4.2-0.5-6.3-0.7c0.6,4.7,0.2,9.5-2,13.8
+			c0.4-5.8,3-13.5-2.8-17.5c0.8-0.4,1.5-0.8,2.3-1.2c1.6-0.9,3.1-1.9,4.7-2.9c0.1-1.6,0.2-3.2,0.3-4.9c0.5,0,1.5,0,1.9,0
+			c0.5,1.4,0.9,2.8,1.3,4.2c0.8-0.1,1.6-0.2,2.4-0.3c-0.3,0.9-0.6,1.8-0.9,2.7c1.4-0.1,2.9,0,4.2-0.4c1.4-1.2,1.6-3.2,2-4.9
+			c1-4.7,1.4-10-1.3-14.2c-1.6-1.9-4-2.9-6.1-4.2c0.1,1.8,0.1,3.6,0.2,5.5c1.3,0.9,2.7,1.8,3.9,2.9c1,2.7,1,5.7,1.7,8.5
+			c-0.9,0.3-1.9,0.6-2.8,0.9c-1.8-2.2-2.6-5-2.9-7.8c-2.4,0.2-5.9-0.7-7,2.1c0.1,1.5,0.6,3,1.1,4.4c-0.9-1.2-2.8-2.1-2.8-3.7
+			c-0.6-3.9,4.6-3.7,7.1-4.8c0-2.1-0.1-4.1-0.1-6.2c-3.8,1.5-7.4,4.1-11.6,4.3c-1.7-1.1-3.2-2.5-4.7-3.7c0.8-1.6,1.3-3.3,2.6-4.6
+			c1.9-0.6,3.9-0.8,5.8-1.3c2.8-2.2,1.1-5.9,0.3-8.7c1.1,0.3,2.2,0.7,3.3,1.1c0.4-1.2,1.4-2.4,1.2-3.7c-0.7-0.7-1.4-1.3-2.1-1.9
+			L13.8,708 M6.2,724.3c-2.1,1.6,0.2,3.8,1.4,5.2c4-0.5,8.2-1,10.6-4.6c-0.9-1-1.7-2.8-3.3-2.3c-1.2,0.9-2.3,1.9-3.5,3
+			C10.4,723.9,7.8,722.1,6.2,724.3z"/>
+		<path class="st6" d="M1600.9,712.7c0.6-1.3,1.2-2.5,1.9-3.8c0.4,2.7,0.6,5.4,0.5,8.1c1.6-0.4,3.2-0.7,4.8-1
+			c-0.1-0.8-0.2-2.3-0.3-3.1c3.4,4.1,6.7,8.2,10.7,11.7c-1.1-0.3-2.2-0.6-3.3-0.9c-2.1-1-4-2.2-6-3.4c-0.3,0.3-1,1-1.3,1.3
+			c-2.4,0-5.4,0.6-6.8-1.8c-1.5-2.8-1.3-6.1-2-9C1599.6,711.3,1600.5,712.3,1600.9,712.7z"/>
+		<path class="st6" d="M551.6,713.8c0.5,0.4,1.4,1.1,1.8,1.5c-0.9,1.7-1.8,3.4-2.6,5.1c0.9,0.7,1.8,1.4,2.7,2.1
+			c1.4-1.5,2.8-3.1,4.9-3.8l0.8,0.4c-2.1,2.3-5.5,4.3-5.3,7.8c-0.2,2.4,0.6,6.3-2.9,6.4c-2.2-2.3-4.1-5.1-4.9-8.2
+			C548.2,721.5,551.9,718.4,551.6,713.8 M548.1,724.1c0.4,2.3,0.8,4.7,2.3,6.6c0.4,1,1.1,1.2,2,0.7C554,728.4,552,723.5,548.1,724.1
+			z"/>
+		<path class="st6" d="M379.3,719.2c1.4-0.8,2.9-1.6,4.4-2.3c0,0.7,0.1,2.2,0.2,2.9c-0.8,1-1.6,2.1-2.4,3.1c1,1.2,2.1,2.3,3.2,3.5
+			c1.6-0.5,3.2-0.9,4.9-1.3c0.4,1.2,0.9,2.4,1.3,3.6c-4.8-0.8-10.2,0-14.2-3.1c3,0.1,4-2.1,3.8-4.7c-2.1-0.2-4.2-0.4-6.4-0.6
+			C375.9,719.9,377.6,719.5,379.3,719.2z"/>
+		<path class="st6" d="M1263.2,720c0.4-1.2,0.9-2.4,1.4-3.6c0.5,0.2,1.5,0.6,2,0.9c-2.3,3.1,1.4,4.9,3.1,7c1.2,1.8,2.2,3.8,3.6,5.5
+			c-0.1,0.3-0.2,1-0.3,1.3c-0.1,0.5-0.4,1.3-0.5,1.8c-0.8-1.2-1.5-2.3-2.2-3.5c-1.6,1.6-3.1,3.4-4.6,5c-3.4-0.1-1.8-4.9-0.2-6.6
+			c0.2,2.2,3.4,2.9,3.9,0.6c1.1-2.1-1.6-3.3-2.7-4.6C1265.4,722.5,1264,721.5,1263.2,720z"/>
+		<path class="st6" d="M1255.9,723.1c0.7-0.7,1.4-1.5,2.2-2.2c0.9,0.2,1.8,0.5,2.7,0.8c0,0.5,0.1,1.5,0.2,2.1
+			c-0.4-0.1-1.4-0.2-1.8-0.3c-0.3,0.4-1,1.3-1.3,1.7c0.8,0.7,1.6,1.4,2.4,2.1c-1,1.8-2.1,3.5-3.1,5.3c-1.4-2.6-4.1-3.5-6.9-3.5
+			c-0.1,1.3-0.2,2.5-0.2,3.8c1.4,0.6,2.9,1.2,4.3,1.7c0.7,1.5,1.7,3,2.7,4.3c0,0.4,0.1,1.1,0.2,1.4c-1,0.7-2.1,1.3-3.2,1.9
+			c-2.1,0.2-4.2-0.9-6.2-0.3c-4.7,1-9.5,1.2-14.3,1.4c-0.1-4.2,0.1-8.4-0.2-12.6c1.7,0.5,3.7,0.5,5.2,1.6c1.3,2.7,2.2,5.6,4.2,8
+			c1.5-1.7,3.6-3.2,3.6-5.7c0.6-1.5-1-3.3-2.5-2.7c0.3-1.5,0.7-3,1.1-4.5c2.5,0,4.9,0,7.4-0.1
+			C1253.4,725.9,1254.6,724.4,1255.9,723.1z"/>
+		<path class="st6" d="M1546.4,722.4c1.9,0.6,5.7,2.2,4.6,4.8C1548.5,728.1,1546.7,724.5,1546.4,722.4z"/>
+		<path class="st6" d="M1091.2,725.2l0.2-0.4c0.8,1.3,1.5,2.7,2.3,4.1c-0.5,1-0.9,1.9-1.4,2.9c0.4,1.1,0.7,2.1,1.1,3.3
+			c-1.1-0.7-2.2-1.4-3.3-2c-0.4,0.5-1.2,1.5-1.6,2.1c0.9,1.2,1.7,2.5,2.6,3.8c0.9-0.7,1.8-1.3,2.7-2c0.3,1.3,0.5,2.6,0.8,3.9
+			c-2.7,0.3-5.3,0.6-7.9,0.8c-0.5-2.6-1.1-5.3-1.9-7.8l-0.4-0.5c0.8,0.7,1.6,1.5,2.5,2.2c0.5-1.1,1.1-2.1,1.7-3.1
+			c-0.9-1.2-1.8-2.4-2.7-3.6c0.5,0.2,1.6,0.8,2.1,1C1089.1,728.4,1090.1,726.8,1091.2,725.2z"/>
+		<path class="st6" d="M570.2,726.4c2-1,2.7,3.2,0.8,3.5C569.4,729.7,569.2,727.4,570.2,726.4z"/>
+		<path class="st6" d="M395.4,727.4c2.3,0.3,4.4,1.3,6.7,1.7c2-0.4,3.6-2.3,5.7-1.8c1.9,1.3,0,3.2-0.6,4.6c2.6,1.2,4.3,3.1,3.7,6.1
+			c-3.8,0.3-4-3.8-6-5.9c-3.5-1-7.3-0.8-10.5-2.6C394.1,728.6,394.4,727.8,395.4,727.4z"/>
+		<path class="st6" d="M940.6,727.7c4.6-0.1,9.2-0.2,13.8-0.1c-1.2,2-2.6,3.9-4.3,5.5c-0.8-0.3-1.6-0.6-2.4-0.9
+			c-0.6,4.2-2,9.4-6.9,10.3C940.7,737.6,940.6,732.7,940.6,727.7 M941.8,736.3c1.6-0.2,3.9,0.6,4.7-1.3c-0.4-1.7-1.7-3.4-3.5-3.6
+			C941,732.1,942.2,734.8,941.8,736.3z"/>
+		<path class="st6" d="M1551.5,732c0.1-2.2,2.4-3.3,3.7-4.7c0.4,2.2,0.9,4.3,0.6,6.6C1554.2,734.7,1552.1,733.8,1551.5,732z"/>
+		<path class="st6" d="M868.5,728.5c1.5,0,3.1,0,4.6,0c-0.1,4.6-0.1,9.2-0.2,13.8c-0.4,0.1-1.1,0.2-1.5,0.3c1.1-2.5,0.5-4.8-1.2-6.8
+			c0.4-1,0.8-2.1,1.2-3.1C870.4,731.2,869.4,729.8,868.5,728.5z"/>
+		<path class="st6" d="M1167.9,730.6c0.9-0.5,1.8-1.1,2.7-1.6c0.2,4.7,0,9.4,0,14.1c-2,0.1-4,0.1-6,0.1c0.1-1.4,0.3-2.8,0.5-4.1
+			c-0.2-0.7-0.7-2-0.9-2.7c1.1-0.1,2.3-0.1,3.5-0.2c0.1-1,0.1-1.9,0.3-2.8c-0.4-0.4-1.2-1.3-1.6-1.8c0-0.3,0.1-0.8,0.1-1.1
+			C1166.7,730.5,1167.5,730.5,1167.9,730.6z"/>
+		<path class="st6" d="M597.9,731.8c0.2-0.5,0.6-1.5,0.8-2c0.1,1.6,0.2,3.3,0.2,4.9c2.8-0.3,4.4-2,4.5-4.8c0.6,1.3,1.1,2.6,1.7,3.9
+			c1-0.2,2-0.4,3.1-0.6c0.4-1.1,0.9-2.3,1.3-3.4c1,1.8,2,3.5,3.2,5.2c-0.7,0.1-2.1,0.2-2.8,0.3c0.7,2.3,1.5,4.6,2.9,6.5
+			c-1.3,0.6-2.5,1.2-3.8,1.8c-3.3-1.5-7-2.2-10.7-1.8c0.8,2.4,1.2,4.9,1.1,7.4c-2.6,0-5.2-0.2-7.7-0.5c1.9-1,3.8-1.9,5.8-2.8
+			c-0.2-1.5-0.5-3-0.7-4.5c2.3-0.5,4.7-0.9,7.1-1.3c-0.4-2.2-1.2-4.9-3.9-4.9c-3.5,1.6-5.1,5.4-7.8,7.8c-1.9,1.5-4.1,2.6-6.1,4.1
+			c0.2-0.6,0.6-1.8,0.8-2.4c3.7-1.5,6.5-4.4,8.5-7.8c-0.3-0.8-0.7-1.5-1-2.3c1,0,2,0,3,0C597.6,734,597.8,732.5,597.9,731.8
+			 M603.7,735.8c0.9,2,2.1,3.8,3.3,5.5c0.8-1,3-1.7,2.4-3.4C609.5,735.2,605.3,733.3,603.7,735.8z"/>
+		<path class="st6" d="M783.3,736.3c3.4-2.3,7.5-3.3,11.5-4.2c-0.1,1.6-0.2,3.3-0.5,4.9c-0.2-0.8-0.7-2.3-0.9-3
+			c-2,0.4-4.1,0.9-5.8,2c-1.1,1.6-2.1,3.2-3,4.9c-1.3,0.1-2.5,0.2-3.8,0.3C781.5,739.5,782,737.7,783.3,736.3z"/>
+		<path class="st6" d="M1586.2,733.3c1.9-0.7,2.7,2.5,0.8,2.9C1585.1,736.9,1584.3,733.8,1586.2,733.3z"/>
+		<path class="st6" d="M1580.8,737c-0.3-2.9,2.8-3.4,3.9-0.9C1583.7,737.2,1581.2,740.1,1580.8,737z"/>
+		<path class="st6" d="M1584.1,738c0.6-0.4,1.8-1.1,2.4-1.5c0.6,1.6,1.2,3.2,1.9,4.8c-1.5,0-3.1,0-4.6,0
+			C1583.9,740.5,1584,738.8,1584.1,738z"/>
+		<path class="st6" d="M633.1,738.2c2.7,0,5.4,0,8.1,0.2c-1.2,2.1-2.6,4.4-5.2,4.8C633.4,743.1,633.5,740,633.1,738.2z"/>
+		<path class="st6" d="M844.1,740.7c2.2-0.1,3.8-1.8,5.8-2.4c1.8,0.2,2.5,2.2,3.8,3.2c-4.7-0.2-9.4-0.1-14.1,0.3
+			c-1.3-0.1-2.6-0.3-3.9-0.4l-1.3-0.2C837.6,740.9,840.8,740.9,844.1,740.7z"/>
+		<path class="st6" d="M567.1,741.1c1.5,0.4,4.4-0.3,4.5,2c0.4,1.9-2.2,1.7-3.4,1.6C567.2,743.8,567.4,742.3,567.1,741.1z"/>
+		<path class="st6" d="M1702.7,754.6c0.8,0.1,2.4,0.2,3.2,0.2c0.5,0.2,1.6,0.5,2.2,0.7c-0.2,0.8-0.6,2.5-0.8,3.3c-0.5,1-0.9,2-1.3,3
+			c-1.1-1.1-2.2-2.2-3.3-3.3C1702.7,757.3,1702.7,755.9,1702.7,754.6z"/>
+		<path class="st6" d="M1708.7,772.2c1.4-1.2,2.5,1.5,1.3,2.3C1708.5,775.6,1707.4,773,1708.7,772.2z"/>
+		<path class="st6" d="M1718.2,771.5c0.4,0.1,1.2,0.3,1.6,0.5c-0.2,2-0.3,4.1-0.5,6.1c-1.7-0.1-3.3-0.1-5-0.2
+			c-1.9,2.2-4,4.1-6.3,5.9c-1.7-0.9-3.4-1.9-5-2.8c2.1-1.1,4.3-1.6,6.7-1.8c0.4-1,0.9-2.1,1.3-3.1c1.1-0.5,2.2-0.9,3.4-1.4
+			c0.9,1,1.8,3.2,3.6,2.2C1718.2,775.1,1718.2,773.3,1718.2,771.5z"/>
+		<path class="st6" d="M1721.5,801.8c0.5-0.6,1.4-1.9,1.8-2.5c1.6,2.8,0.4,6.9-3.2,7C1720.6,804.8,1721,803.3,1721.5,801.8z"/>
+		<path class="st6" d="M1708.2,811.8c1.1,2.4,2.2,4.7,4,6.6c0.2,0.8,0.5,1.6,0.8,2.5c0.3,0.4,1,1.1,1.3,1.5c1.1,1.4,2.4,2.8,2.9,4.6
+			c-0.2,1.9-1.8,3.2-3,4.5c1.2,0.6,2.4,1.1,3.7,1.7c1.6-0.5,3.2-1,4.8-1.5c0.4,0.5,1.1,1.6,1.4,2.2c-0.5,0.1-1.5,0.2-2,0.3
+			c1.7,2.4,2.4,5.2,1.6,8.2c-1.2-1.2-2.3-2.6-2.6-4.3l-0.1-1.4c-1.7,0.3-3.4,0.6-5.1,0.9c-0.2,0-0.5,0.1-0.7,0.1
+			c2-1.3,4.2-2.3,6.2-3.5c-3.7-0.1-7.3,0-10.9,0.3c0.7,1.3,1.5,2.6,2.5,3.8c-0.4,0.5-1.1,1.6-1.5,2.1c-1.2-0.3-2.3-0.6-3.4-0.9
+			c0.6,0,1.8-0.2,2.3-0.2c-0.1-4.5,0.4-9-0.2-13.5c0-1.4,0.1-2.8,0.1-4.2c-2.9-0.7-3.6,2.6-4.8,4.5c0.7-3.5,1.1-7.1,0.6-10.7
+			c0.5,0,1.6,0.1,2.1,0.1C1708.2,814.5,1708.2,812.7,1708.2,811.8 M1711,824c0.2,1.9,0.6,3.8,1.2,5.6c1.2-0.4,2.5-0.8,3.8-1.1
+			C1716.2,825.5,1713.5,824.1,1711,824z"/>
+		<path class="st6" d="M31.9,823.7c-2-0.8-4.2-2.1-2.8-4.5l0.9,1.5c0.9,0.1,2.7,0.4,3.6,0.6C33.2,821.9,32.3,823.1,31.9,823.7z"/>
+		<path class="st6" d="M113.8,821.1c4.9-0.3,9.8-0.6,14.6,0c-1.8,0.8-3.7,1.5-5.6,2.1c-0.5,1-1,2-1.5,3c-2.2-0.9-1.2-3.2-1.1-5
+			c-1.1,0-2.2,0.1-3.3,0.1c-0.2,3.1-1,6.5,0.5,9.4c1.5,2.1,4.3,2.5,6.6,3.1c0.3-1.9,0.6-3.9,1-5.8c0.7,3.7,0.5,7.6-0.1,11.3
+			c-0.8,1.1-1.6,2.2-2.4,3.4c-1.4-1.8-1.3-4-0.9-6.1c0.1-0.4,0.2-1.2,0.3-1.6c-2-1.1-4.2-1.8-6.1-3.1c-1.4-1.9-1.9-4.3-2.7-6.5
+			c-1.5,0-3.1,0-4.6,0c-1.7-0.2-3.3-0.6-4.9-1.2c-0.9,0.5-1.8,1-2.7,1.4c0.1-0.4,0.2-1.1,0.2-1.4c-0.9-1.1-1.7-2.1-2.6-3.2
+			c3.1,0,6.2,0,9.3,0.1c0.4,1.1,1,2.1,1.8,3C112.1,824.5,112.8,822.3,113.8,821.1z"/>
+		<path class="st6" d="M51.3,820.9c2.6-0.2,5.3-0.2,7.9,0.1c-0.3,0.5-1,1.7-1.3,2.2C55.7,822.7,53.5,821.9,51.3,820.9z"/>
+		<path class="st6" d="M84.3,821.1c2.8,0,5.7-0.1,8.5-0.1c-0.1,1.2-0.2,2.4-0.2,3.7c-1.2-0.3-2.3-0.6-3.5-0.8
+			c-0.4,0.5-1,1.6-1.4,2.1C86.5,824.4,85.4,822.7,84.3,821.1z"/>
+		<path class="st6" d="M217.4,820.8c0.6,0,1.8,0,2.4,0c0,1.9-0.1,3.8-0.1,5.8c1.2-0.1,2.5-0.2,3.7-0.3c-0.4,0.5-1.1,1.5-1.5,2
+			c-1.2,0.1-2.3,0.2-3.5,0.3c-0.4,1.6-0.8,3.2-1.1,4.8c1.5,0.1,3,0.2,4.5,0.4c-0.2,0.5-0.7,1.5-0.9,2c-2.3-0.8-4.6-1.5-6.9-2.3
+			C217,829.9,217.6,825.3,217.4,820.8z"/>
+		<path class="st6" d="M260.3,820.8c0.7,0,2.1,0,2.9,0c0.1,0.8,0.3,1.5,0.4,2.3c-1.3,0.8-2.9,1.4-3.8,2.8c1,1.3,2.2,2.5,3.3,3.7
+			c-1,1.2-2.2,2.6-3.9,2.1c-1.7-1.9-2.9-4.3-3.6-6.7C256.1,822.8,258.6,822,260.3,820.8z"/>
+		<path class="st6" d="M286.8,820.9l0.2,0c1.1,1.1,2,3.2,4,2.3c1.2-0.7,2.4-1.6,3.5-2.4c1.5,0,3,0,4.4,0c1,2.8,1.5,6.3,4.6,7.6
+			c1.8,1,3.1-1.1,4.4-2.1c-2.1-1.5-3.9-3.3-5.4-5.5c2.1,0,4.3,0,6.4,0c0.5,1.8,1,3.5,1.5,5.3c1.4-1,2.8-2,4.1-3
+			c-0.9,2.6-2.2,5.1-3.9,7.3c0.1,0.9,0.2,1.8,0.4,2.7c-0.9,1.3-1.8,2.6-2.5,4c0.2,1.2,0.9,2.3,1.4,3.5c2.1-2.1,4.4-4.3,5.2-7.3
+			c0.6-2.5,0.8-5.1,1.5-7.5c0.5,3.1,1,6.2,1.4,9.3c0.5,0.3,1.6,1,2.1,1.4c1.5-2.4,3.1-4.7,4.9-6.9c2.2,1.8,2.9,4.5,3.3,7.2
+			c4.9,1.6,3,7.3,2.9,11.1c1,1.1,2,2.2,3.1,3.2h-6.2c-0.3-1.4-0.6-2.8-0.9-4.2c-2,1.2-3.8,2.7-5.5,4.2h-12.2c-2-1.3-3.9-2.7-5.6-4.4
+			c1.1-0.1,2.2-0.2,3.4-0.4c0.4-1.3,0.6-2.7,0.8-4c-1.3-0.1-2.6-0.2-3.8-0.3c-0.1,1.5-0.2,3.1-0.3,4.7c-0.8-2-1.5-3.9-2.2-5.9
+			c-0.8,1.1-1.6,2.1-2.5,3.2c-0.5-0.2-1-0.4-1.5-0.6c-0.7-1.3-0.7-3.1-2-3.9c-1.5-0.2-3,0.5-4.5,0.9c-1.1-0.6-2.2-1.3-3.3-1.9
+			c-2.4,4.5-4.9,9.2-8.7,12.6h-4.3c0.3-0.4,0.8-1.3,1-1.7c-1.1-2.3-1.7-4.8-1.9-7.4c1.2-0.2,2.5-0.4,3.7-0.4
+			c1.1,1.3,1.9,2.9,2.8,4.3c2.8-1.8,0.8-5,0.3-7.4c-1.1-0.3-2.3-0.7-3.4-1c1-0.7,2-1.3,2.9-1.9c0.5,0.4,1,0.8,1.5,1.2
+			c3.3-0.2,6.7,0.1,10,0c2.3-0.5,1.8-3.2,1.7-4.9c-5.4,0.1-10.8-0.2-16.1-1c0.2-0.5,0.5-1.3,0.7-1.8c2.5,0.3,5.1,1.7,7.6,0.6
+			C287.1,826.9,286.5,823.7,286.8,820.9 M295.2,822.3c-2.1,1.6,0.2,5.5,2.7,4.4C300.9,825.6,297.6,819.7,295.2,822.3 M299,827.9
+			c0.9,2.3,1.8,4.8,3.3,6.8c1,0,2.1-0.1,3.2-0.2c0-1.3,0.1-2.5,0.1-3.8C303.4,829.7,301.2,828.7,299,827.9 M316.3,843.2
+			c-1.6-0.9-3.6-2.6-5.5-1.4c-1.9,0.9-2.2,4.8,0.2,4.9c4.6,0.4,8.8-1.9,13.2-2.5c2.5-0.2,2.8-6-0.2-5.5
+			C321.1,839.2,318.9,841.8,316.3,843.2z"/>
+		<path class="st6" d="M372.4,820.8c3,0,6,0,9,0c-0.1,1.1-0.1,2.2-0.2,3.3c-2.2,0.4-4.4,0.7-6.4,1.6c0.2-0.8,0.4-1.7,0.6-2.5
+			c-0.4-0.3-1.2-0.8-1.7-1.1c-1.5,1.2-2.8,2.7-3.3,4.7c-0.5-0.6-1-1.1-1.5-1.7C370.1,823.7,371.3,822.2,372.4,820.8z"/>
+		<path class="st6" d="M994.6,820.8c1.8,0,3.5,0,5.3,0c-0.1,1.8-0.2,3.6-0.4,5.4C996.8,825.6,995.2,823.5,994.6,820.8z"/>
+		<path class="st6" d="M1006.6,820.8c2.6,0,5.2,0,7.8,0c-1.3,1-2.3,3.2-4.2,2.9C1008.5,823.6,1007.7,821.8,1006.6,820.8z"/>
+		<path class="st6" d="M1032.2,820.8c2.6,0,5.2,0,7.9,0c-1.2,1.3-2.3,2.7-3.5,4c1.2,1.4,3.8,2.6,3,4.9c-0.6,1.9-2.8,1.9-4.3,2.5
+			c0-2.5,1.8-5.5-0.1-7.6c-2.8,0.5-4.9,2.4-7.3,3.8c-1.5,0.5-2.3-1.4-3.4-2.1C1027,824.4,1029.6,822.5,1032.2,820.8z"/>
+		<path class="st6" d="M1100,821c4.2,0.2,8.3-0.2,12.5-0.2c-1.8,2.3-3.8,4.4-5.8,6.5c-1.4-0.2-2.7-0.5-4.1-0.7
+			c-0.6,4.1-0.1,8.2,0.7,12.3c-2.2-1.1-4.4-2.2-6.5-3.3c1.7-3.7,4.8-6.5,6.4-10.3c-0.9-0.7-1.8-1.3-2.6-2
+			C1100.5,822.8,1100.2,821.5,1100,821z"/>
+		<path class="st6" d="M1142,820.8l0.5,0c1.1,1.2,2.1,2.4,3.4,3.5c2.7-0.2,5.4-0.9,8.1-1.5c-0.7-0.7-1.3-1.4-1.9-2.1
+			c3.2,0,6.5,0,9.8,0.1c-0.2,1.3-0.3,2.6-0.4,3.9c1.2-0.1,2.4-0.1,3.6-0.1c-0.4,1-0.8,2-1.2,3c0.4,1.8,0.9,3.6,1.2,5.4
+			c-4.9-0.3-7.8-4.6-12-6.4c-2,0-3.2,1.7-4.5,2.9c-3,3.2-6.6,5.5-9.8,8.6c-0.1-0.7-0.2-2.1-0.3-2.8c-0.6,0-1.9,0.1-2.5,0.1
+			c2.5-1.9,5.8-3.4,7-6.6c1.1-1.9-0.5-3.6-1.1-5.2C1141.8,822.6,1141.9,821.7,1142,820.8 M1144.4,826.2c-0.9,1.6-1.7,4.1-0.2,5.6
+			c2.2-0.6,3.3-2.9,4-4.9C1147.5,825.5,1145.5,825.4,1144.4,826.2z"/>
+		<path class="st6" d="M1165.5,820.7c1.4,0,2.7-0.1,4.1,0c0.3,1.6,0,3.6,1.3,4.9c2.1-0.8,3.5-2.7,4.6-4.5c3,0.2,6.1,0.3,9.1,0.1
+			c-0.3,0.4-0.9,1.2-1.2,1.6c-1.2,0.4-2.5,0.5-3.5,1.3c0.5,1.1,1.4,1.8,2.3,2.6c1.7-1.5,3.4-2.8,5.2-4.1c0,0.8,0,2.3,0,3.1
+			c0.9,0,1.8,0,2.7,0c0.8-1.7,1.7-3.3,2.6-5c1.8,0,3.6,0.1,5.5,0.1c-0.8,1.1-1.5,2.2-2.2,3.3c-1.5,0-2.9,0.1-4.4,0.1
+			c1,3,2.6,5.7,4.2,8.4c0.7,1.2,1.4,2.5,2.2,3.7c-1.4,1.6-2.6,3.3-4.1,4.8c-1.2,0.2-2.5-0.1-3.6-0.1c-1.2,1.5-2.5,3-3.7,4.6
+			c-1.8-0.9-3.4-2-5.4-2.4c-1.2,0.6-2.4,1.3-3.5,2c-0.1-1.6-0.3-3.3-0.4-4.9c-1.2,0.2-2.4,0.3-3.5,0.5c0.7-1.3,1.4-2.6,2.2-3.9
+			c0.9,1.3,1.9,2.7,2.8,4c1-0.5,2.1-1,3.2-1.4c-0.1,0.7-0.3,1.4-0.4,2.1c1.6,0.7,3.2,1.4,4.9,2.1c0.6-1.4,1.1-2.8,1.7-4.1
+			c-1.7-0.1-3.5-0.1-5.2-0.1c1.3-1.6,3.8-2.9,3.3-5.4c-1.3-2.1-4.2-1.8-6.2-2.4c-0.7-1.1-1.5-2.2-2.1-3.3c1.8-1.6,1.9-4.1,1.1-6.2
+			c-2.1-1-2.6,1.9-3.3,3.3c-0.7,1.5,0.5,2.9,1.1,4.2c-0.2,1.6-0.2,3.2-0.3,4.9c-2.5,0.1-5.1,0.1-7.6,0.1c0.9-2.6,2.7-4.8,4.6-6.8
+			c-2-1.4-3.9-2.8-5.8-4.2c-0.6,0-1.8,0.1-2.5,0.1C1165.3,823,1165.4,821.5,1165.5,820.7 M1181.7,827.8c0,0.5,0,1.6,0,2.1
+			c2.5,1,5.1,1.8,7.1,3.8c1.8-0.7,2.3-2.5,3.1-4.1C1188.2,830.1,1185.2,827.4,1181.7,827.8z"/>
+		<path class="st6" d="M1207.9,820.7c2.5-0.1,5,0.6,7.3,1.7c0.5-0.6,1.1-1.1,1.7-1.7c1.9,0.1,3.8,0.2,5.7,0.2
+			c-0.3,1.3-0.6,2.5-0.9,3.8c-1.2,1.2-3.1,0.9-4.6,1.1c0.2,1.7,0.5,3.4,0.8,5.1c-0.4-0.1-1.3-0.4-1.7-0.5c-0.3,1.1-0.5,2.1-0.8,3.2
+			c-0.5-1.1-1.1-2.2-1.7-3.2c-1.6-2.1-3.4-4-5.2-5.8C1208.3,823.2,1208.1,822,1207.9,820.7z"/>
+		<path class="st6" d="M1249.4,821c3.5-0.2,6.9-0.2,10.4-0.2c-0.3,0.5-0.9,1.4-1.2,1.9c-1.7,1.1-3.7,1.7-5.7,1.9
+			C1251.8,823.3,1250.6,822.1,1249.4,821z"/>
+		<path class="st6" d="M1351,820.9c0.7,0.1,2,0.3,2.6,0.3c0.1,0.4,0.3,1.2,0.4,1.6C1352.7,824.8,1350.2,822.8,1351,820.9z"/>
+		<path class="st6" d="M1374.7,820.8c1.4,0,2.8,0,4.1,0c1.2,0.5,2.4,1,3.6,1.7c-0.2,1.6-0.6,3.1-1,4.7l-0.8-0.5
+			c-0.8-0.4-2.3-1.3-3.1-1.7c-0.4,1.6-0.7,3.2-0.8,4.8c-0.1,4.7-1.8,9.2-2.9,13.7c1.5-1,2.9-2.1,4.4-3.2c-1.1,2.3-2.4,4.6-3.1,7.1
+			c-1.3,0.1-2.6,0.3-3.8,0.5c1-3.2,1.7-6.5,2.8-9.7c0.8-2.6,1.8-5.2,1.4-7.9c-0.1-1.5-1.9-1.8-2.9-2.4c-0.1-0.4-0.2-1.2-0.2-1.5
+			c1.1,0,2.3-0.1,3.4-0.1c0.9-0.9,1.9-1.8,2.9-2.7C1377.3,822.7,1376,821.8,1374.7,820.8z"/>
+		<path class="st6" d="M1499,820.7c2,0,4,0,6,0c-0.1,1.3-0.2,2.6-0.3,4c-1.1,0-2.2-0.1-3.3-0.1C1500.6,823.3,1499.8,822,1499,820.7z
+			"/>
+		<path class="st6" d="M1553.5,820.8c2.8,0,5.6,0,8.5,0c0.1,0.8,0.3,2.5,0.4,3.3c-2.8,0.5-5.9,1.6-8.6,0.1
+			C1553.1,823.2,1553.6,821.9,1553.5,820.8 M1554,823c1.6,0.9,3.4,0.9,5.2,0.9C1558.8,821.2,1555.6,821.5,1554,823z"/>
+		<path class="st6" d="M1648.1,820.7c3.5,0.1,7.1,0.1,10.7,0c-0.6,0.8-1.6,1.5-1.5,2.7c1.2,0.9,2.5,1.6,3.8,2.5
+			c0.5-0.5,1.6-1.4,2.1-1.9c0.1,1.8,0.1,3.5,0.1,5.3c-0.6,0-1.9-0.1-2.5-0.1c1.2-0.8,1.4-1.9,0.8-3c-1.7-0.9-1.9,1.9-1.5,3
+			c0.1,1.2,0.3,2.4,0.4,3.7c-1.2,0.8-2.5,1.6-3.7,2.4c0.7-1.8,1.5-3.6,2.3-5.4c-0.7-0.5-1.3-0.9-2-1.4c0.9-0.6,1.6-1.4,2.2-2.3
+			c-1.3-1.1-2.8-2-4.2-3c-0.1,0.8-0.3,2.3-0.4,3C1652.5,824.3,1648.5,824.2,1648.1,820.7z"/>
+		<path class="st6" d="M1670,821.1c1.8-0.1,6.2-0.9,4.5,2.3C1672.5,825.2,1671.2,822.3,1670,821.1z"/>
+		<path class="st6" d="M1430,821.9c1.3-0.1,2.7-0.1,4.1,0c-0.3,1.3-0.1,3-1.4,3.8C1430.8,825.8,1428.2,823.7,1430,821.9z"/>
+		<path class="st6" d="M1451,822.9c3.2-2.4,7.5,3.5,4.8,6.1C1453.3,828,1452.5,825,1451,822.9z"/>
+		<path class="st6" d="M1435.4,824.4c1.1-0.6,2.2-0.6,3.5-0.2c1.6,3.1-4.1,3.9-4.2,0.6L1435.4,824.4z"/>
+		<path class="st6" d="M1472.8,824.1c3.1-0.1,7.6,0.5,7.2,4.6c-0.7,0.2-2.1,0.6-2.9,0.9c0.6,1.1,1.2,2.3,1.8,3.4
+			c-1.2,0.5-2.5,1-3.7,1.5c-0.3,1.3-0.6,2.6-1,4c-1.3,0.9-2.4,2-3.4,3.2c0.8,0.8,1.6,1.6,2.3,2.5c2-1,3.3-2.8,4.4-4.8
+			c1.7-0.8,2,1.4,2.2,2.5c-0.7,1.6-1.7,3-2.6,4.5c-1.4-0.7-2.8-1.3-4.2-1.9c-1.5,1.3-2.9,3.1-5.2,2.9c0.1-0.9,0.2-2.7,0.3-3.6
+			c-0.6-0.9-1.2-1.8-1.8-2.6c2-1,4.2-1.6,6.1-2.6c0.9-1.3,0.2-3.1,0.6-4.6c0.1-2.3,2.8-3.6,3.2-5.8
+			C1475,826.9,1473.4,825.8,1472.8,824.1z"/>
+		<path class="st6" d="M1130.5,829c2.1-1.9,4.7-3,7.3-3.8c0.3,0.4,0.8,1.3,1,1.7C1136.6,829,1133.2,832.7,1130.5,829z"/>
+		<path class="st6" d="M466.3,826.3c1.7,0.3,4.1-0.7,5.1,1.1c0,5.2-2,10-5,14.2c-0.4-0.1-1.1-0.4-1.4-0.5c0.8-1,1.6-2,2.4-2.9
+			C465.6,834.3,467.9,830.1,466.3,826.3z"/>
+		<path class="st6" d="M1109,828.2c1.6-0.4,3.1-0.8,4.7-1.2c0.1,2.3,0.2,4.6,0.2,6.9C1111.9,832.4,1109.2,831,1109,828.2z"/>
+		<path class="st6" d="M1367.3,826.7c1.9,1.6,2.8,5.4-0.3,6.2C1365.4,831.1,1366.6,828.7,1367.3,826.7z"/>
+		<path class="st6" d="M489.8,828.7c3-1.6,5.4,2.6,3.3,4.8C490.6,834.1,488.1,830.9,489.8,828.7z"/>
+		<path class="st6" d="M1392.3,830.8c0.1-0.6,0.2-1.9,0.2-2.5c1.4,0.6,4,0.5,3.6,2.7C1394.8,831.3,1393.6,831.2,1392.3,830.8z"/>
+		<path class="st6" d="M1465.6,835.1c0.2-2.6,1.7-5,4-6.2c0,2.2,0.1,4.4-0.2,6.6C1468.3,836.4,1466.4,836.2,1465.6,835.1z"/>
+		<path class="st6" d="M1687.5,828.6c0.3,0.4,1,1.1,1.3,1.5c-0.7,1.8-1.3,3.7-1.5,5.7c2.8,0.2,4.7-2,4.8-4.7
+			c0.5-0.4,1.4-1.1,1.9-1.5l-0.5,1.4c-0.4,1.1-0.7,2.2-1,3.2c1.1,0.8,2.3,1.7,3.5,2.5c-0.7,0.2-2,0.6-2.7,0.8c0,0.5,0.1,1.5,0.1,2
+			c1.2,0.5,2.5,1,3.8,1.5c-1.6,0.3-3.2,0.7-4.8,1.1c-0.3-2.4-0.7-4.7-1.3-7c-1.6,2.1-2.4,4.6-2.9,7.1c-1.9-1-3.8-2.7-6.2-2.3
+			c-0.1,0.6-0.3,1.7-0.5,2.2c-0.4-0.3-1.3-1-1.7-1.4c-0.8-0.5-1.7-0.9-2.5-1.4c0.1-0.3,0.3-1,0.5-1.3c1.5-0.2,3.1-0.4,4.7-0.7
+			c0-0.6,0.1-1.9,0.2-2.5c0.8,2.2,1.9,4.5,4.8,3.9c-0.8-1.9-1.8-3.7-2.2-5.7C1685.7,831.4,1686.7,830,1687.5,828.6z"/>
+		<path class="st6" d="M1698.8,833.2c-0.7-1.6-2.7-3.3-1.1-5c2.1,0.5,3.5,2.2,4.8,3.8c0.7-0.8,1.3-1.5,2-2.3c0.4,0.3,1.2,1,1.6,1.4
+			c-0.5,2.1-1,4.3-1.2,6.5c-0.7-0.5-1.4-0.9-2.1-1.3c0.1,1.1,0.3,2.3,0.5,3.5c-0.3,0.5-0.8,1.3-1,1.8c-1.1-0.3-2.1-0.5-3.2-0.8
+			c1-1.7,3.3-4,0.3-4.9c0.6-1.1,1.2-2.2,1.8-3.2C1700.6,832.7,1699.4,833,1698.8,833.2z"/>
+		<path class="st6" d="M1053.1,830.2c3.6,0.8,7.2,1.1,10.8,1.1c-0.3,1.9-0.4,4.2-2.2,5.4c-2.7,0.1-5.3,0-8-0.4
+			C1052.5,834.4,1052.7,832.2,1053.1,830.2z"/>
+		<path class="st6" d="M1225.5,833.7c0.3-1.2,0.6-2.3,1-3.4c0.6,1.3,1.3,2.6,1.9,3.9c-1.1,1-3.4,1.4-3.3,3.2
+			c1.1,0.5,2.2,0.9,3.4,1.3c0.2,0.6,0.5,1.8,0.6,2.4c-2.2,1.7-5,3-5.7,5.9c2.1,3.4,5.2-0.2,6.8-2.2c1.7-0.5,3.4-0.9,5.2-1.3
+			c0,1.1,0.1,2.2,0.2,3.3c0.8-0.2,1.6-0.4,2.4-0.6c-0.2,1.2-0.4,2.4-0.5,3.6c-0.9-0.9-1.9-1.7-2.9-2.5c-1.3-0.6-2.8-1-4.2-1.3
+			c-0.5,1.7-0.9,3.4-1.4,5.1h-10.5c0.3-0.5,0.8-1.6,1.1-2.1c0.8-0.7,1.5-1.4,2.3-2.2c1.9-2.2,3-5,2.8-8c-1.7,1.9-3.1,4.3-5.8,4.6
+			c0.8-3.4,2-6.7,3.3-9.8C1223.3,833.5,1224.4,833.6,1225.5,833.7z"/>
+		<path class="st6" d="M1422,831.2c1.2-0.4,2.5-0.8,3.7-1.2c0.3,2.4,0.6,4.8,0.8,7.2C1424,836.1,1422.3,834,1422,831.2z"/>
+		<path class="st6" d="M1151.5,830.9c2.8,1.1,5,3.2,7,5.4c2.8,0.3,5.5,0.8,8.2,1.3c-0.3,1.7-0.6,3.4-1,5.1c-0.3,0.1-1.1,0.3-1.4,0.4
+			c0.1-1.4,0.2-2.9,0.3-4.3c-3.7-0.3-7.2-1.5-10.3-3.6c-0.8,1.6-1.5,3.2-2.3,4.8c-1.4-0.9-2.7-1.9-4.1-2.6c-2.2-0.2-3.5,1.9-3.7,3.8
+			c3.1,0.3,6.1,1,8.9,2.4c1.7-0.3,3.5-0.7,5.2-0.7c-1.4,1-2.9,2-4.3,2.9c-1.8-0.5-3.5-1.6-5.3-1.3c-0.9,2.1-1.5,4.4-2.3,6.5h-2.3
+			c0-2.8,1.2-8.3-3.3-7.6c-0.7,1.4-1.2,2.9-1.7,4.4c-0.4,0-1.1-0.1-1.5-0.2c-1.3-2.4-2.5-4.9-3.4-7.5c1.1,0.1,2.1,0.2,3.2,0.4
+			c0.4-0.4,1-1.2,1.4-1.6c0.7,0.8,1.4,1.7,2.1,2.5c1.7-1.8,3.2-3.8,5.3-5.2c1.6-1.2,3.5,0.2,5.2,0.5
+			C1151.5,834.8,1151.5,832.8,1151.5,830.9z"/>
+		<path class="st6" d="M1479.2,834.1c2.7-1.3,6-4.4,8.9-1.9c-0.9,1.5-2.2,2.7-3.4,3.9c0.3,0.4,0.9,1.2,1.2,1.6
+			c-0.6,0.3-1.7,0.9-2.3,1.2c0.4,1.7,0.8,3.4,1.3,5.1c-0.4,0.1-1.2,0.4-1.5,0.6c0.1-3.1,0.1-6.5-3.2-7.9
+			C1479.8,835.8,1479.5,834.9,1479.2,834.1z"/>
+		<path class="st6" d="M450.3,833.2c1.5,0,3,0,4.5,0c0,0.7,0,2.2,0,2.9c-1.5-0.1-3-0.2-4.5-0.3C450.3,835.1,450.3,833.8,450.3,833.2
+			z"/>
+		<path class="st6" d="M1436.1,833.4c1.4-1.2,3.1,1.3,1.6,2.4C1436.2,836.9,1434.6,834.3,1436.1,833.4z"/>
+		<path class="st6" d="M397,842.9c2.9-3.4,6.7-5.9,10.4-8.3c0.6,1.5,1.1,3.1,1.6,4.7c-2,0.5-4.4,0.4-6.1,1.8
+			c-2.6,2.5-4.7,6.2-3.3,9.9h-5.6C396.3,848.8,396.4,845.8,397,842.9z"/>
+		<path class="st6" d="M1447.2,834.9c2.1,0.4,4.4,0.7,6.4,1.6c2.1,1.5,3.5,3.7,5.1,5.7c1.8,0.5,3.8,0.8,5.5,1.7
+			c0.5,1.1,0.9,2.2,1.2,3.4c-4.3-0.7-7.4-3.8-10.5-6.6c-2.1,2.9-3.7,6-5,9.4c-0.2-1.3-0.7-2.5-1.3-3.6c1.8-2.2,3.6-4.3,5.2-6.6
+			c-1.7-2-4.1-2.5-6.5-2.2C1447.2,836.9,1447.2,835.6,1447.2,834.9z"/>
+		<path class="st6" d="M1518.4,839.5c0-1.7,0-3.5,1.4-4.7c2.2,3.3,0.2,7.1-1,10.4C1514.8,846.2,1516.7,841,1518.4,839.5z"/>
+		<path class="st6" d="M1616.2,836c1.1-0.2,2.3-0.4,3.4-0.5c0.8,1.1,1.4,2.3,2.1,3.5c0.2-1,0.4-2,0.6-3c1.1,0.9,2.3,1.8,3.5,2.8
+			c-0.7,1.1-1.3,2.3-1.9,3.5c-1.8-0.3-3.6-0.5-5.4-0.7C1617.8,839.7,1617,837.9,1616.2,836z"/>
+		<path class="st6" d="M771.9,839.8c0.9-2.7,3.1-4.1,5.9-3.8c0,0.7-0.1,2.1-0.1,2.8C775.8,839.4,773.9,839.7,771.9,839.8z"/>
+		<path class="st6" d="M356.7,839.5c1.5-0.8,3-2.6,4.9-2.1c3,1.6,1.9,5.4,2.1,8.1c-1,0.8-2,1.6-3,2.4c-0.1,0.8-0.2,2.3-0.3,3.1h-5.8
+			c1.8-2.2,3.6-4.3,5.6-6.3c-2.9-1.4-7.2-1.7-8.1-5.4C353.7,839.3,355.2,839.4,356.7,839.5z"/>
+		<path class="st6" d="M1300.4,836.9c2.1,0.6,4.6,0.9,6.2,2.6c0.1,1.2-0.2,2.4-0.3,3.7c-0.2,1-0.5,2.1-0.6,3.1
+			c0,1.5,0.1,3.1,0.2,4.7h-6.7c1.6-1.1,3.1-2.2,4.6-3.4c-1.1-0.4-2.2-0.8-3.2-1.2c1.5-1,4.6-1.1,4.6-3.5c0.4-1.7-1-3-1.8-4.3
+			c-0.9,1.5-1.8,3.1-2.5,4.7C1300.7,841.2,1300.5,839,1300.4,836.9z"/>
+		<path class="st6" d="M1034.2,838.2c1.5-1.1,3,1.5,1.6,2.5C1034.2,841.8,1032.7,839.1,1034.2,838.2z"/>
+		<path class="st6" d="M1216,842.2c-0.1-1.8-0.1-3.6,1-5.2C1217.9,838.9,1219.2,841.9,1216,842.2z"/>
+		<path class="st6" d="M1310.6,846.2c-1-3.5,1.2-6,3.5-8.2c1.8,0.5,3.6,0.9,5.5,1.4c-1.5,1.2-3,2.2-4.5,3.4c1.4-0.4,2.8-0.8,4.3-1.2
+			c0,0.9,0,2.8,0,3.7c0,0.8-0.1,2.3-0.1,3.1l0,1c-0.3-0.4-0.9-1.3-1.2-1.7c-0.2-1.2-0.4-2.5-0.5-3.7c-1.7,2.3-3.3,4.7-4.9,7h-0.8
+			C1311.4,849.4,1311,847.8,1310.6,846.2z"/>
+		<path class="st6" d="M1728.2,838.4c1.6,0.1,3.2,0.2,4.8,0.4v8.6l-0.6-0.7c0-0.7-0.1-2-0.2-2.7
+			C1729.8,843,1728.1,841.2,1728.2,838.4z"/>
+		<path class="st6" d="M418,847c3.6-2.6,6.8-5.8,10.4-8.4c0.5,1.3,2.1,2.7,1.3,4.2c-1.3,3.4-4.9,4.9-7.9,6.5
+			c0.3,0.5,0.8,1.4,1.1,1.8h-8.4c-0.4-0.6-1.1-1.9-1.4-2.5c-0.8,0-1.6-0.1-2.5-0.1c-0.2,0.6-0.5,2-0.6,2.6h-0.6
+			c-0.3-0.5-1-1.7-1.3-2.2c-1.6-0.4-3.2-0.8-4.8-1.1c-0.1-1.6-0.2-3.2-0.3-4.8c1.7-0.1,3.3-0.2,5,0c2.6-0.3,3,2.9,4.2,4.6
+			C414.1,847.3,416.1,847.4,418,847 M405,847.3c1.8,0.5,5.2,0.2,4.7-2.5c-1.4-1.2-3.4-1.1-5.1-1.4
+			C404.5,844.7,403.7,846.3,405,847.3z"/>
+		<path class="st6" d="M490.1,840.1c1.7,0.1,4.2-0.4,4.7,1.8c-0.3,1.2-1.4,2.2-2.7,1.9C490.2,843.7,490.6,841.5,490.1,840.1z"/>
+		<path class="st6" d="M1337.1,839.9c0.4,1,0.8,2,1.2,3.1c1.8-1.1,3.6-2.2,5.5-3.2c-0.1,0.8-0.4,2.4-0.6,3.2c-1,1.4-2,2.7-3,4.1
+			c-1.1-0.9-2.3-1.8-3.8-1.2C1336.7,843.9,1336.9,841.9,1337.1,839.9z"/>
+		<path class="st6" d="M1632.9,839.7c3.7-1.1,2.1,3.6,2.7,5.8c1,0,2.1,0,3.1,0c-1.1,2-2.2,3.9-3.9,5.5h-6.8c2.3-0.8,5.1-1,7.1-2.6
+			c-0.3-0.5-0.8-1.6-1-2.1c-0.6,0.2-1.8,0.6-2.4,0.8C1632,844.6,1632.2,842.1,1632.9,839.7z"/>
+		<path class="st6" d="M177.6,840.9c0.2,2.7-0.1,5.5-0.3,8.2c2-1.7,4.1-3.3,6.2-4.9c0.8,2.2,0.8,4.6-0.1,6.8H174
+			C174.3,847.3,175.8,844,177.6,840.9z"/>
+		<path class="st6" d="M455.4,842.4c1.2-2.2,4.2-0.7,6.2-0.9c0.5,2.1-0.2,4-1.8,5.5C458,845.8,454.9,845,455.4,842.4z"/>
+		<path class="st6" d="M1022.2,845.7c-0.1-1.6-0.6-4.4,1.8-4.5c2.4-0.6,2.7,2,3,3.7C1025.6,845.6,1023.9,845.7,1022.2,845.7z"/>
+		<path class="st6" d="M1422.3,843.7c1.6-0.7,3.2-1.4,4.7-2.1c0.2,0.4,0.6,1.1,0.8,1.5c1.3-0.1,2.7-0.2,4-0.2
+			c0.3,0.2,0.8,0.6,1.1,0.9c-2,0.3-4.1,0.5-5.9,1.3c-1.4,1.7-1.8,4-2.7,6h-10.1c2.1-0.6,4.2-1.1,6.3-1.4
+			C1421.1,847.6,1421.7,845.6,1422.3,843.7 M1422.4,847.2c-1.4,0.9-0.3,3.7,1.3,2.4C1425.2,848.8,1424,845.9,1422.4,847.2z"/>
+		<path class="st6" d="M1653.9,841c0.6,0.5,1.3,0.9,2,1.4c0.2-0.1,0.5-0.2,0.6-0.3c0,0.5-0.1,1.6-0.2,2.1c-3.1,0.3-6.2,0.6-9.3,0.9
+			c0,2,0,3.9,0,5.9h-6.8c-0.2-2.9,1.7-5.2,3.3-7.3c3.2,0,6.4-0.1,9.6-0.2C1653.5,842.8,1653.8,841.6,1653.9,841z"/>
+		<path class="st6" d="M240.4,844.4c1.4-2.7,4.9-2.3,6.9-0.6c0.4,2.3,0.3,4.8,0.3,7.2h-2.2C243.6,849.1,240,847.5,240.4,844.4z"/>
+		<path class="st6" d="M551.5,842.5c1.5-0.6,3.1,0.1,4.6,0.5c-0.6,1.3-1.2,3.3-3.1,2.7C551.3,845.9,550.8,843.8,551.5,842.5z"/>
+		<path class="st6" d="M1067.3,841.9c1.3,1.7,2.4,3.7,2.4,5.9c-1.5,1.5-3.8,0.6-5.7,0.9C1064.5,846.1,1065.6,843.8,1067.3,841.9z"/>
+		<path class="st6" d="M1273.9,843.2c1.5,0.2,3,0.3,4.5,0.6c0.5,0.4,1.4,1.3,1.9,1.7c-1.7,0.7-3.6,1.6-5.4,0.8
+			C1274.5,845.3,1274.2,844.2,1273.9,843.2z"/>
+		<path class="st6" d="M2.1,847.7c-0.5-3.8,4.2-4.7,6.8-2.8c-0.4,0.9-0.8,1.9-1.2,2.9C5.8,847.8,3.9,847.7,2.1,847.7z"/>
+		<path class="st6" d="M1166.6,844.2c2,0.8,3.2,2.8,4.7,4.3c2.2,0.7,4.4,1.5,6.5,2.5h-14C1164.6,848.7,1165.4,846.4,1166.6,844.2z"
+			/>
+		<path class="st6" d="M1363.9,844.2c0.8,0,2.3-0.1,3.1-0.1c-0.2,1-0.5,2.1-0.7,3.2c0.9,0.8,1.8,1.7,2.7,2.5
+			c0.4-0.2,1.1-0.6,1.5-0.8c0.4,0.5,1.2,1.5,1.7,1.9h-7.1C1364.6,848.8,1364.2,846.5,1363.9,844.2z"/>
+		<path class="st6" d="M1436,848.8c1.7-1.8,3.7-5.1,6.6-3.6c0,0.6,0,1.7,0.1,2.2C1440.5,847.9,1438.2,848.3,1436,848.8z"/>
+		<path class="st6" d="M381.2,848.1c1.7-0.5,3.4-1,5.2-1.5c0.8,1.5,1.5,2.9,2.2,4.5h-5.4C382.5,850,381.9,849,381.2,848.1z"/>
+		<path class="st6" d="M1360.5,846.7c0.7,1.4,1.3,2.9,2.1,4.3h-3.9C1359.3,849.6,1359.9,848.1,1360.5,846.7z"/>
+		<path class="st6" d="M1542.6,847.9c0.8,0,2.4-0.1,3.3-0.1c0.4,1.1,0.9,2.2,1.4,3.2h-3.4C1543.4,850,1543,848.9,1542.6,847.9z"/>
+		<path class="st6" d="M137.7,851c-1.4-1.4,1.2-2.7,2.3-1.5c0.2,0.4,0.5,1.1,0.7,1.5H137.7z"/>
+	</g>
+	<g id="_x23_6d7e92ff">
+		<path class="st7" d="M423.2,0h2.4c0.8,0.9,0.2,3.4-1.3,2.7C423.6,1.9,423.2,1,423.2,0z"/>
+		<path class="st7" d="M1260.4,0h12c-3.4,0.9-6.9,1.7-10.4,2.2C1261.6,1.7,1260.8,0.6,1260.4,0z"/>
+		<path class="st7" d="M1359.3,0h2.7c-0.2,1.1-0.4,2.2-0.6,3.4c-1.9,0.8-3.8,1.6-5.7,2.2c0-0.9,0.1-2.7,0.1-3.7
+			C1356.9,1.3,1358.1,0.6,1359.3,0z"/>
+		<path class="st7" d="M1412.8,0h2.7c0.1,0.4,0.3,1.2,0.4,1.6C1414.6,2.3,1413.5,1,1412.8,0z"/>
+		<path class="st7" d="M354,1.2c0.7-0.1,2.2-0.4,2.9-0.6c0.2,0.6,0.5,1.9,0.6,2.6c-1.6,0.2-3.1,0.2-4.7,0.2
+			C353.2,2.9,353.7,1.8,354,1.2z"/>
+		<path class="st7" d="M386.2,1.3c0.8,0.4,1.6,0.7,2.5,1c-0.7,1.5-1.4,2.9-2.1,4.4c-0.6,0-1.9,0-2.5,0
+			C384.2,4.7,384.8,2.8,386.2,1.3z"/>
+		<path class="st7" d="M1288.6,5.7c-0.1-1.4-0.1-2.8-0.1-4.2c0.9,0.7,1.8,1.5,2.8,2.2c0.4,1.3,0.9,2.7,1.3,4
+			C1291.2,7,1289.9,6.3,1288.6,5.7z"/>
+		<path class="st7" d="M439.3,1.8c2,0.4,4.1,0.9,6,1.8c-0.6,1.3-1.2,2.7-1.7,4.1c-0.4,0-1.2,0-1.6,0c-0.3-0.7-1-2.1-1.3-2.8
+			C440.2,3.8,439.7,2.8,439.3,1.8z"/>
+		<path class="st7" d="M1388.4,2.9c2.5,0.9,4.8,2.2,6.7,4.1c0.7,0.9,1.4,1.8,2.1,2.8c-0.6,0.1-1.8,0.4-2.5,0.5
+			c-1.1-0.9-2.1-1.8-3.1-2.8l-0.4-0.3c-1-0.4-1.9-0.8-2.9-1.1C1388.3,5.1,1388.3,4,1388.4,2.9z"/>
+		<path class="st7" d="M376.9,3.2c2.1,0.2,2.5,2.2,3,3.9c-0.5,0.2-1.6,0.7-2.1,0.9c-0.3-0.4-0.8-1.3-1-1.8
+			C376.8,5.4,376.9,3.9,376.9,3.2z"/>
+		<path class="st7" d="M396.4,4.3c0.8-1,3.2-1.1,3.3,0.5C399.5,6.9,395.1,6.6,396.4,4.3z"/>
+		<path class="st7" d="M1372.6,4c1.9,0.6,3.8,1.3,5.7,2c-1.1,0.6-2.2,1.2-3.2,1.8c0.3,0.8,0.9,2.3,1.2,3.1c1.6,0.6,3.4,0.3,5.1,0.4
+			c1.2,1.3,2.6,2.5,4.1,3.6c0.2,0.2,0.8,0.6,1,0.8c0.5-1.7,0.8-3.4,1.4-5.1c0.3-0.3,0.9-0.9,1.2-1.2c3,3.6-0.8,6.9-2,10.3
+			c-2.8-0.4-5.5-0.9-8.3-1.3c-0.2-1-0.5-2-0.7-3c-1.5-0.7-3-1.4-4.4-2.2c-0.7-1-1.2-2.1-1.8-3.2C1372.2,8,1372.4,6,1372.6,4
+			 M1383.2,15.1c-0.1,0.8-0.1,2.3-0.2,3.1c1.6,1.1,3.2,0.7,4.2-0.9C1385.8,16.5,1384.5,15.8,1383.2,15.1z"/>
+		<path class="st7" d="M317.9,5.7c1.1,0,2.2-0.1,3.4-0.2c0.3,1,0.5,2.1,0.8,3.1c1.8,0.3,3.6,0.5,5.4,0.9l0.4,0.5
+			c-0.4,2.4-0.9,4.9-1.3,7.3c1.3-0.2,2.7-0.4,4.1-0.6c0.1,1.3,0.2,2.6,0.3,3.8l0.4,0.1c1.6,0.3,3.2,0.6,4.9,0.9
+			c-1,0.8-2,1.9-3.2,2.3c-1.5,0-2.6-1.3-3.9-1.9c0.3-1.3,0.6-2.5,0.9-3.8c-1.5-0.1-3-0.2-4.6-0.2c0.9,1.2,1.7,2.4,2.6,3.6
+			c-3.6-0.4-3.2-4.7-4.3-7.3c1.1-0.5,2.2-1.1,3.3-1.6c-0.9-0.1-1.7-0.1-2.6-0.1c-2.4,1.4-5,2.5-7.7,3.2c0-1,0-2.9-0.1-3.9
+			c1.9,0.7,3.5-2.1,1.4-2.9C319.7,7.8,320.6,6,317.9,5.7z"/>
+		<path class="st7" d="M354,6.7c1.2-0.9,2.4-1.7,3.8-2.3c-0.3,1.4-0.6,2.8-0.9,4.1C356.2,8.1,354.8,7.2,354,6.7z"/>
+		<path class="st7" d="M331.1,7.5c1.9-1.8,4-0.8,5.7,0.7c-1.3,0.3-2.5,0.6-3.8,0.9C332.6,8.7,331.6,7.9,331.1,7.5z"/>
+		<path class="st7" d="M600.2,7c1.7-0.5,2.2,0,1.7,1.6C600.2,9.2,599.6,8.6,600.2,7z"/>
+		<path class="st7" d="M421,8.9c0.5,0,1.6,0,2.2,0c3.3-0.2,6.6-0.1,9.9,0.2c-0.3,1.4-0.6,2.9-0.8,4.3c-1-3.3-3.4-1-5.2,0.1
+			c1.5,1.5,2.6,3.3,3.1,5.4c-0.6,0-1.7-0.1-2.3-0.1c-0.4-1.6-0.4-3.6-2.2-4.4c0.4-0.8,0.8-1.6,1.2-2.4C424.9,10.8,422.9,9.9,421,8.9
+			z"/>
+		<path class="st7" d="M1404.3,12.1c0.8-0.3,1.5-0.6,2.3-0.9c1.5,2.4,3,5,5.3,6.7c2.3-0.3,1.2-3,1.5-4.5c0.8-0.5,1.7-1,2.5-1.5
+			c0,2.8,0.1,5.5,0.1,8.3c-1.6,0.7-3.2,1.2-4.9,1.7l-1.3,0.4c-0.5,0.2-1.6,0.5-2.1,0.6c-2.4,0.9-4.6,2.1-6.8,3.4
+			c-0.2-0.6-0.6-1.8-0.8-2.4c-0.8-1.7-2.2-3-3.4-4.3c0.1-0.4,0.2-1.2,0.3-1.6c4-2.5,7.4,3.2,11.7,2.4c-0.8-2-2.5-3.2-4.3-4.1
+			C1404.3,14.8,1404.3,13.4,1404.3,12.1z"/>
+		<path class="st7" d="M332.4,12.7c1.4-0.3,2.8-0.7,4.3-0.9c2.3,0.9,4.5,2,6.8,2.9c0,1.1,0.1,2.1,0.1,3.2c-2.6-0.7-5.2-1.5-7.7-2.6
+			C334.7,14.4,333.5,13.5,332.4,12.7z"/>
+		<path class="st7" d="M405.2,13.1c1-1.3,3.7,0.2,2.5,1.7C406.7,16.1,404.1,14.6,405.2,13.1z"/>
+		<path class="st7" d="M479.7,19.5c-0.9-2.3-0.2-5.1,2.9-3.4c-0.2,0.6-0.7,1.9-0.9,2.6C481.2,18.9,480.2,19.3,479.7,19.5z"/>
+		<path class="st7" d="M1373.6,16.5c3.6-0.7,1.8,4.6,1.3,6.5c-0.7,0-2.1-0.1-2.7-0.2C1372.5,20.7,1372.8,18.5,1373.6,16.5z"/>
+		<path class="st7" d="M397.2,18.2c1.6,0.2,3.1-0.1,4.4-1.1c-0.2,4.2,4.3,1.5,6.5,1.2c-1.3,1.7-2.6,3.5-4,5.2
+			c-1.7,0.2-3.3,0.4-4.9,0.6c-0.7-1.5-1.4-3-2.1-4.5l0-0.1l0-1L397.2,18.2z"/>
+		<path class="st7" d="M1365.7,20.2c0.3-0.3,0.9-1,1.2-1.3c3.4-0.4,1.7,3.8-0.8,2.1L1365.7,20.2z"/>
+		<path class="st7" d="M1246.9,23.6c1-1.5,1.9-3,2.9-4.5c0.4,0.7,1.3,2.1,1.8,2.8c-0.4,0.6-1.1,1.7-1.4,2.3
+			C1249.3,24.1,1247.7,23.8,1246.9,23.6z"/>
+		<path class="st7" d="M1412.4,49c1.2,0.5,2.4,0.9,3.6,1.4c0,1.4,0,2.7,0,4.1c-1.4,0.7-2.7,1.4-4,2c0.1-1.1,0.3-2.2,0.5-3.3
+			c0.2-0.6,0.5-1.7,0.7-2.3C1413.1,50.5,1412.7,49.5,1412.4,49z"/>
+		<path class="st7" d="M316.5,55.1c1.5-1,2.8-2.4,4.5-2.8c1.7,0,1.6,2.3,2.4,3.4c-1.8,0.2-3.6,0.8-5.3,1.5c-0.4,0.2-1.2,0.5-1.6,0.6
+			C316.5,57.2,316.5,55.8,316.5,55.1z"/>
+		<path class="st7" d="M1401.4,56.5c0.2-1.2,0.5-2.5,0.7-3.7c-0.1,0.8-0.3,2.3-0.4,3c2.3-0.8,4.6-1.8,7-2.5c0.2,0.5,0.5,1.6,0.6,2.1
+			c-1.7,1.1-3.4,2.1-5,3.2C1403.3,57.9,1402.4,57.2,1401.4,56.5z"/>
+		<path class="st7" d="M336.1,67c1.5-1.5,3.2-3.7,5.2-1.7c-1.1,1.7-2.2,3.4-3.5,4.9C335.5,71,335.5,68.5,336.1,67z"/>
+		<path class="st7" d="M333.8,79.1c2.1-3.1,4.3-6.4,8.2-7.3c0,0.4,0,1.2,0,1.6c-1.5,1.6-3.1,3.1-4.6,4.7c0.9,0.9,1.8,1.8,2.6,2.8
+			c0.5-0.4,1.5-1.2,2-1.7c0,1.3,0,2.5,0,3.8c-1.3-0.4-2.6-0.9-4-1.3c-2.4,1-5.1,1.9-6.9-0.5C332,80.5,332.9,79.8,333.8,79.1z"/>
+		<path class="st7" d="M1403.2,73.3c2-0.1,4-0.1,6.1-0.1c0.6,0.1,1.8,0.3,2.4,0.5c-0.8,1.2-1.5,2.3-2.2,3.5c0.5,1,1,2.1,1.6,3.1
+			c-1.7,0.5-3.5,1-5.1,1.6c-0.6-0.4-1.3-0.8-1.9-1.2c0.9-0.6,1.9-1.3,2.8-2c0-1.4-0.2-2.8-0.5-4.1
+			C1405.3,74.2,1404.3,73.8,1403.2,73.3z"/>
+		<path class="st7" d="M1075.4,78.4c2-1.2,3.1,3.1,1,3.3C1074.9,81.5,1074.3,79.4,1075.4,78.4z"/>
+		<path class="st7" d="M323.1,81c0.5,0.8,0.9,1.6,1.4,2.3c-0.1,0.2-0.3,0.6-0.4,0.8c-2.3,2.2-4.7,4.3-7.6,5.7c0-0.7,0-2.2,0-3
+			c1.2-1.3,2.4-2.7,3.5-4.2C321,82.1,322.1,81.6,323.1,81z"/>
+		<path class="st7" d="M1085.1,81.3c0.7,0.1,2,0.2,2.7,0.3c-0.6,1.6-1,3.5-3,3.6C1084.8,83.9,1084.9,82.6,1085.1,81.3z"/>
+		<path class="st7" d="M862.6,86.1c1.4-1.2,3.2-1.9,5-2.3c1.2,4.5,3.1,8.7,4.1,13.2l-0.8,0.5c-3.1-3.1-3-8-4.6-11.9
+			c-2.1,3.9-2.9,8.5-6,11.8C861,93.7,862.7,90.1,862.6,86.1z"/>
+		<path class="st7" d="M1101.8,84.7c1.2-0.3,2.5-0.5,3.8-0.7c0.4,1.6,0.7,3.3,1.1,4.9c0.4,1.5,1,3.1,1.5,4.6
+			c0.4,1.4,0.6,2.8,0.9,4.2c-3.3-3.2-3.3-8.2-5.7-12c-1.8,4.2-2.4,9-5.3,12.7C1098.4,93.7,1099.7,89,1101.8,84.7z"/>
+		<path class="st7" d="M332.8,85.3c1.7,0.1,3.4,0.1,5.1,0.1c-0.1,0.8-0.1,2.3-0.2,3.1c-0.1,1-0.2,1.9-0.3,2.9
+			c0.6,0.1,1.7,0.3,2.3,0.5c-0.6,2-1.1,4-1.7,6c-0.1,0.3-0.4,0.8-0.6,1c-0.4-2.7-1-5.4-2.1-7.9c-1.1-1.4-2.4-3-4.3-2.6
+			c-2,0.7-2.7,3.5-4.9,4c-1.8,0.6-3.5-0.4-5.1-1C324.3,88.3,328.5,86.6,332.8,85.3z"/>
+		<path class="st7" d="M720.8,87.9c2.9-1.3,5.2,2.8,7.6,3.9c1.9,1.5,3.7,3.1,5.5,4.6c-0.2,0.7-0.7,2.1-0.9,2.8
+			c-0.4-0.2-1.3-0.7-1.7-1l-1-0.5c-2.5-1.7-4.9-3.4-7.4-5C721.7,91.4,720.5,89.8,720.8,87.9z"/>
+		<path class="st7" d="M752.7,92.2c2.5-1.8,5-3.7,7.5-5.5c0.1,1.4,0.2,2.8,0.2,4.2c-3.1,2.9-6.9,4.9-10.2,7.6
+			c1.3,3.7,2.7,7.4,4,11.2c-0.4,1.4-0.4,3.4-2.3,3.4c-1.5-0.4-2.8-1.3-4.2-2.1c-2-2.3-4.5-4.1-7-5.8c-2,1.6-4.1,3.2-6,4.8
+			c-1.8,1.8-4.1,2.8-6.6,2.3c-0.2-1.3-0.3-2.7-0.5-4c0.8-1.3,1.7-2.6,2.5-3.8c0,1.4,0.1,2.8,0.1,4.2c0.4-0.3,0.8-0.7,1.2-1
+			c3-2.3,6.1-4.4,9.1-6.7c3.7,2.6,7.3,5.2,11.3,7.4c-0.8-2.5-1.7-5-2.5-7.5c-0.5-1.9-1.1-3.7-1.6-5.6
+			C749.4,94.3,751.1,93.3,752.7,92.2z"/>
+		<path class="st7" d="M921,89.9c1.7-0.4,2.3,0.2,1.9,1.9C921.3,92.1,920.7,91.4,921,89.9z"/>
+		<path class="st7" d="M609.5,96.4c4.5,2.7,8.8,5.9,12.9,9.3c-1.5,4.2-2.9,8.4-4.2,12.6c3.8-2.5,7.4-5.2,10.9-7.9
+			c3.7,2.5,7.3,5.3,11,7.8c-1.1-4.3-3.1-8.4-3.8-12.8c3.8-3.4,8.1-6.2,12.5-8.9c0.2,2,0.2,4.2-1.3,5.8c-1.5,0.8-3,1.6-4.4,2.5
+			c-1.5,1-2.9,2.2-4.3,3.3c1,3.6,2.1,7.2,3.2,10.8c-2.6,0-5.1-0.1-7.7,0c-1.8-1.3-3.5-2.6-5.3-3.8c-1.6,1.3-3.1,2.5-4.7,3.8
+			c-4.2,0-8.4,0.1-12.6,0c1.6-0.3,3.2-0.8,4.7-1.2c1.2-3,2.6-6,3.1-9.3c-2.9-3.3-7.6-4.6-10-8.2C609.6,99.1,609.5,97.3,609.5,96.4z"
+			/>
+		<path class="st7" d="M1110.3,105.7c3.7-3.7,8.1-6.4,12.6-9c0.1,1.4,0.3,2.8,0.4,4.2c-3.5,2.3-7,4.7-10.3,7.2
+			c1.1,3.6,2.2,7.1,3.2,10.7c-2.5,0-5.1,0-7.6,0c-1.8-1.3-3.4-2.9-5.5-3.5c-1.7,0.9-3.2,2.2-4.7,3.5c-2.9,0-5.9,0-8.8,0.1
+			c0.4-0.1,1.2-0.3,1.6-0.4l0.7-0.3c4.4-1.8,7.8-5.3,11.9-7.7c3.4,2.8,6.9,5.4,10.6,7.8C1113.1,114.1,1111.7,109.9,1110.3,105.7z"/>
+		<path class="st7" d="M320.6,107c1.7-1.8,3.4-3.6,5.1-5.4c0.5,1.2,1.1,2.5,1.7,3.7c-1.4,2-3.1,4-5.5,4.7
+			C321.5,109.3,320.9,107.8,320.6,107z"/>
+		<path class="st7" d="M1393.4,151c1,0.7,2.1,1.5,3.1,2.2c0.3,2.3,0.1,4.9,1.6,6.8c1.2,2.1,3.6,0,2.7-1.8c-0.5-0.4-1.4-1.3-1.9-1.7
+			c0.1-0.6,0.3-1.8,0.5-2.3c0.5,0,1.7,0.1,2.2,0.1c0.2,2.4,0.1,4.9-0.1,7.4c-2.6,1.6-5.3,3.2-8,4.6c-0.8,0.1-2.4,0.2-3.2,0.3
+			l0.5-1.1c1-0.3,2-0.6,3-0.8c-1,0-2.1,0-3.1,0l-0.1-1.4c2.1-0.4,4.3-0.8,6.4-1.2C1394.8,158.9,1393,155.1,1393.4,151z"/>
+		<path class="st7" d="M325.3,153.8c0.8-0.3,1.7-0.6,2.5-0.9c0.6,2.3,1.5,4.6,2.7,6.7c0,0.2,0,0.7,0,0.9c-1.3,0.1-2.6,0.2-3.9,0.3
+			C326.4,158.4,325.9,156.1,325.3,153.8z"/>
+		<path class="st7" d="M1416,163c-2.6,1.5-2.7-3.2,0-1.8C1416,161.6,1416,162.5,1416,163z"/>
+		<path class="st7" d="M1410.6,169.8c0.4-2.8,2.9-3.5,5.4-3.4c0,1.4,0,2.9,0,4.4C1414.2,170.5,1412.3,170.3,1410.6,169.8z"/>
+		<path class="st7" d="M573.1,174.2c5.7,0.4,11.7,0.2,17.2,1.9c-0.9,0-2.6,0.1-3.5,0.1c-3.4,0.3-6.8,0.4-10.3,0.4
+			c1.5,1.1,3,2.2,4.6,3.2c-1.2,0.7-2.3,2.4-3.9,1.8c-3.2-0.7-3.3-4.5-4.2-7.1L573.1,174.2z"/>
+		<path class="st7" d="M556.4,179.4c2.8-1.4,4.7-4.4,8-4.8c-2.6,5.5-7.5,9.9-8.4,16.2c0.5,0.2,1.7,0.6,2.2,0.8
+			c-2.7,0.4-5.4,0.8-8.1,1.3c1-2,2-3.9,2.9-5.9C554.1,184.5,555,181.9,556.4,179.4z"/>
+		<path class="st7" d="M1211.2,179.1c4,0.2,7.8,1.1,11.8,1.3c13.8,0,27.6-0.2,41.3,0.1c-3,0.2-6,0.3-9,0.3c-2.8,0-5.7,0-8.5,0
+			c-0.1,1.9-0.1,3.8-0.4,5.7c-5,4.3-11.9,5.9-16.1,11.2c-1.7-1.7-3.6-3.1-5.6-4.3c0.3-1.2,0.7-2.3,1-3.5c3.3-1.3,5.6-4.1,8.6-5.8
+			c2.9-0.9,6.2-0.5,8.9-2.3c-5.1-0.8-10.8-2.3-15.8,0c-1.2,0.8-2.3,1.6-3.4,2.4c-4.5-0.5-8.5-2.5-12.2-5c0.1,2.9,0.3,5.9,0.1,8.9
+			c-0.1,0.8-0.3,2.4-0.4,3.2c-0.2-1.9-0.3-3.7-0.3-5.6C1211.1,183.5,1211.2,181.3,1211.2,179.1z"/>
+		<path class="st7" d="M586.8,183.1c2.9-3.7,7.5-4.2,11.9-3.7c0.4,2.6-1.2,5.2-3.6,6.1C592.1,185.9,588.9,185.5,586.8,183.1z"/>
+		<path class="st7" d="M881,180.5c2.1,0.1,4.3,0.1,6.5,0.1c-2.2,2.3-4.4,4.7-6.5,7c1.9,1.1,3.7,2.2,5.6,3.2
+			c-1.2,1.8-2.4,3.6-3.6,5.3c-2.6-2.4-5.8-4.2-9.4-4.8c1.2-1.4,2.3-2.7,3.5-4.1C877.6,184.6,878.9,182.3,881,180.5z"/>
+		<path class="st7" d="M893.5,180.8c3.9-0.4,7.9,0.1,11.9,0c-0.3,0.3-0.9,1-1.2,1.3c-3.9,2.3-8.3,3.6-12.8,3.6
+			c-1.2,1.5-2.5,3-3.7,4.4c-0.7-1.9-1.7-4-0.7-6C888.9,182.7,891.2,181.7,893.5,180.8z"/>
+		<path class="st7" d="M1083.1,180.6c1.8,0.1,3.6,0.2,5.4,0.3c-1.2,1.6-2.1,3.6-3.6,5c-1.7,1.4-3.7-0.1-5.3-0.7
+			C1080.7,183.6,1081.9,182.1,1083.1,180.6z"/>
+		<path class="st7" d="M816.7,182.1c2.7,0.4,5.2,1.2,7.6,2.5c-1.6,0.3-3.1,0.8-4.7,0.8C818.5,184.4,817.6,183.2,816.7,182.1z"/>
+		<path class="st7" d="M543.5,183.2c0.6,0,1.8,0.1,2.4,0.1c1.4,4,0.3,7.9-1.4,11.6c-1.5,0.6-3,1.1-4.5,1.7
+			C539.7,191.6,543.5,188,543.5,183.2z"/>
+		<path class="st7" d="M947.1,183.1c2.8,0.1,6.4-0.5,8.4,1.8C955.7,190.5,945.1,188.4,947.1,183.1z"/>
+		<path class="st7" d="M1102.3,183.4c1.3,0.8,2.5,1.9,3.7,3c-1.5,2.6-4.3,2.8-6.9,1.7C1100.1,186.5,1101.1,184.9,1102.3,183.4z"/>
+		<path class="st7" d="M1261.7,190.8c1.3-2.4,2.3-5,4.2-7c3.6-0.2,7,1.1,10.4,2.1c1.1,0.8,2.2,1.6,3.3,2.4c0.2,0.6,0.6,1.7,0.8,2.3
+			c-5.2,1.4-11,0.4-15.8,3.5C1263.7,192.9,1262.7,191.9,1261.7,190.8z"/>
+		<path class="st7" d="M911,189.5c1.2,0.1,2.5,0.2,3.7,0.3c1,1.4,2.1,2.8,3,4.2c-0.4,4-4.3,5.2-7.7,5.1c-2.1-1.4-4.2-2.8-6.3-4.1
+			c-0.1-0.6-0.2-1.8-0.3-2.3c3.2,0.3,6.2,2.9,9.5,2.1C912.6,193,911.8,191.2,911,189.5z"/>
+		<path class="st7" d="M1118.4,189.4c1.4,1.8,2.9,3.6,4.4,5.3c-1.6,0.6-3.2,1.2-4.7,1.8c-3.6-2.4-8.3-0.1-11.5-3
+			C1110.5,192.8,1117.6,195.1,1118.4,189.4z"/>
+		<path class="st7" d="M890.3,194.6c-1.4-1.2-1-3.4,0.7-4c2.4,1.4,3.4,4.1,5.2,6.2c2.5,3.4,7.7,4.9,7.7,9.9
+			c-3.2,1.9-7.8,3.3-10.7,0.1c-2.3-1.7,0.5-4,1.2-5.8C894.7,198.1,891.8,196.6,890.3,194.6z"/>
+		<path class="st7" d="M1083.5,192.9c2-1,4.1-1.5,6.3-1.5c0.5,0.7,1.1,1.4,1.6,2.1l0.7,0.8c0.5,1.1,1.1,2.3,1.6,3.4
+			c-3.1,0.8-6.3,1.5-9.4,2.1C1084.1,197.6,1083.8,195.3,1083.5,192.9z"/>
+		<path class="st7" d="M1254.9,192.9c1.6-0.2,3.6-0.8,5.1,0.2c0,1.7-1.4,4.2-3.3,3.4C1254.8,196.1,1253.9,194.6,1254.9,192.9z"/>
+		<path class="st7" d="M920.6,197c2.4-1.2,4.9-2.4,7.3-3.4c1.4,0.6,2.7,1.2,4.1,1.8c-5.1,2.6-4,9.1-4.7,13.8
+			c-0.1-1.9-0.2-3.8-0.3-5.7c-0.2-1.3-0.4-2.6-0.8-3.8C924.5,198.5,922.5,197.9,920.6,197z"/>
+		<path class="st7" d="M1405.6,195.8c0.5-0.4,1.4-1.1,1.9-1.5c2.7,1.3,4.8,3.5,7,5.4c0,0.5-0.1,1.6-0.2,2.1
+			c-2.8-0.7-5.3-2.3-7.2-4.4C1406.8,197.1,1406,196.2,1405.6,195.8z"/>
+		<path class="st7" d="M1124.5,197c1.3,1.7,2.7,3.3,4.1,4.9c-0.3,0.1-1,0.3-1.4,0.4c-2,0.5-4,1-6,1.5
+			C1122.3,201.6,1123.4,199.3,1124.5,197z"/>
+		<path class="st7" d="M1234.8,199.3c2.8-0.1,5.8-0.9,8.4,0.4c1.3,1.6-0.6,3.4-2.2,3.4C1238.5,202.8,1235.8,201.9,1234.8,199.3z"/>
+		<path class="st7" d="M492.5,204.1c0.1-2.7,2.9-1.1,4.4-0.8c-0.4,1.1-0.8,2.3-1.2,3.4C493.9,206.6,491.8,206.4,492.5,204.1z"/>
+		<path class="st7" d="M643,201.6c3.5,3.1,6.5,6.6,9.8,9.9c-3.3,1.8-7.4,3.5-8.7,7.4c-1,2.6-2.7,4.8-4.8,6.5c-2.2,0-4.4-0.2-6.6,0.4
+			c-1.9,0.4-2,2.7-2.8,4.1c-0.8,2-3,2.8-4.5,4c-1.4-3-3-6-4.7-8.9c0.6-0.2,1.7-0.5,2.2-0.7c1.1,0.6,2.1,1.2,3.2,1.9
+			c1.7-2,3.3-4.1,4.9-6.1c-1-0.8-1.9-1.7-2.8-2.5c0.2-2.1,0.5-4.2,0.8-6.3c2,0,4,0.1,5.9-0.2c0.9-1.1,1.2-2.6,1.8-3.9
+			c2.9,2.7,6.4,6.4,10.8,4.3C645.1,208.7,642.9,205.5,643,201.6 M637.7,216.7c-0.3,1.4-0.3,2.9-0.4,4.3c1-0.2,2.1-0.4,3.1-0.7
+			c0.3-1.4,0.4-2.8,0.6-4.2C639.8,216.2,638.7,216.5,637.7,216.7z"/>
+		<path class="st7" d="M823,205.1c2.9-1.7,6.2-2.5,9.3-3.7c0.5,0.3,1.6,0.9,2.1,1.2c0.1,0.6,0.4,2,0.6,2.6c-2,0.1-4,0.2-6,0.2
+			c0.3,3.5,3,5.8,5.2,8.2c-2.5,1.1-5.5,1.8-7.1,4.3c-2,2.7-1.6,6.3-2,9.4c-1.5,0-3,0.5-4.4-0.2c-1-6,5.2-10.1,5.8-15.9
+			C825.4,209.2,823.8,207.4,823,205.1z"/>
+		<path class="st7" d="M1100.9,206.4c2.9-1,5.8-2,8.6-3.1c2.9,2.2,6.2,4,9.3,5.8c-1.3,4.4-5.7,6.9-6.7,11.4
+			c-0.5,1.8-1.9,4.8,0.8,5.6c3,2,5.7-0.7,7.9-2.6c0.9,1,1.8,2,2.6,3c3.7-2.2,7.1-4.8,9.4-8.5c-1.8-2-4.2-3.7-5.4-6.2
+			c-0.3-2.8,2.6-4.5,4.1-6.5c7.4,9.2,14.9,18.4,23,26.9c-2,2.6-0.5,6.1-0.8,9.1c-3.4,0.7-6.7,1.7-9.7,3.3c-1.2-0.8-2.5-1.5-3.7-2.2
+			c-2.1,1.8-4.3,3.4-6.6,5c1.5,1.1,3.2,2.1,4.5,3.5c0.6,3,0.2,6.1-0.1,9.1c0.2,3.5-3.7,4.6-5.8,6.6c-0.6-0.7-1.3-1.4-1.9-2.1
+			c2-1.1,4.5-1.8,5.6-4c-0.1-4.8-4.3-7.6-7.6-10.4c0.8-2.7,1.6-5.4,2-8.2c-2.9-2.1-6.3,1.1-9.4,1c-1.5-1.1-2.7-2.5-4.2-3.5
+			c-1.5-0.2-2.9-0.1-4.4-0.1c-0.2,0.7-0.6,2.1-0.8,2.7c-3.4-4.4-7-8.8-10.3-13.3c1.5-2.2,1.2-4.9,1.8-7.4c2.1-2.2,5-3.6,7-6
+			c1.3-1.6,1.2-3.8,1.5-5.7c-3.3-0.4-6.7-0.5-10-0.1c-0.3,1.5-0.6,2.9-0.8,4.4c-3.4,0.6-6.9,0.9-10.1,2c-2.3,1-0.9,3.4-0.6,5.1
+			c0.6-1.5,1.2-3,1.9-4.5c0.2,0.3,0.7,0.9,1,1.1l0.9,1.1l-1.6-0.5c0.1,6.2,0.8,12.3,1,18.5c-2.1-1.2-4.4-1.4-6.4,0.2
+			c-3.4,2.6-8,0.8-11.6,2.4c-0.6,2.1-0.7,4.2-0.9,6.4c3.3,0.1,6.6-0.6,9.6-1.8c2.1-1.1,4.4-0.1,6.6,0.3c-0.2,1.6-0.3,3.2-0.6,4.9
+			c-4.8,0.7-9.7,1.1-14.5,1.6c-0.5,1.8-1,3.7-1.3,5.6c-0.3-8.8-0.5-17.5-0.1-26.3c0.4-6.8-0.8-13.6-0.7-20.4l0.7-1.5
+			c0.3,3.5,0,7.1,0.9,10.6c0.6,2.4,3,4.4,5.6,3.9c2.2,0.1,2.3-2.8,3.2-4.2c-1.6,0-3.3,0.1-4.9,0.1c0.9-3,1.5-6.3,3.6-8.6
+			C1088.5,206.6,1095.7,210.9,1100.9,206.4 M1084.7,229.3c1.5,0.4,3,0.5,4.5,0.6c0.9,1,1.8,2,2.7,3c0-1.5,0-3,0-4.4
+			c-0.4,0-1.2,0.1-1.6,0.1c-0.9-1.9-1.2-5.8-4.1-5.2C1083.3,223.6,1084.4,227.4,1084.7,229.3 M1129.7,229.3c2.4,2.2,5.9,2.8,8.6,4.5
+			c0.6,1.5,0.9,3.2,1.3,4.9c1.4-0.1,2.8-0.3,4.3-0.4c1.6,0.5,4.4,2,5.2-0.3c0.1-2.9-2.8-2.8-4.9-2.5c-0.9-1.2-2-2.4-2.7-3.8
+			c-0.2-2,1.1-4.2-0.2-6c-3.3-1-7-1.2-10.4-0.5C1129.1,225.4,1128.3,227.9,1129.7,229.3 M1079.5,227.6c-1.6,1.3-2.9,2.8-4.2,4.3
+			c0.2,1.4,0.3,2.9,0.5,4.3c2.6-1.1,4.8-2.9,6.9-4.8C1082.4,229.8,1081.7,227.1,1079.5,227.6z"/>
+		<path class="st7" d="M1411.5,203.2c1.5,0.6,3,1.3,4.5,1.9c0,1.4,0,2.8,0,4.2c-1.1-0.4-2.1-0.8-3.2-1.2
+			C1412.3,206.5,1411.9,204.9,1411.5,203.2z"/>
+		<path class="st7" d="M1244.4,207.2c2.8-1.2,5.6-2.6,8.7-2.8c1.8,0.2,3.5,1,5.3,1.7c-0.3,5.6-0.7,11.1-1,16.6
+			c-2.4-0.1-4.9-0.3-7.3,0c-1.9,1.7-3.1,4-4.9,5.9c-0.4-0.4-1.1-1.3-1.5-1.7c0-3.3,0.8-6.6,1-9.9c4.3-0.9,8.4,0.8,12.5,1.8
+			c-0.1-2.2,0.2-4.4-0.4-6.6c-1.5-2.8-5.1-4.7-8-2.7C1247.3,208.8,1245.8,208,1244.4,207.2z"/>
+		<path class="st7" d="M835.4,204.7c2.3-0.1,4.7-0.1,7.1-0.1c0.1,2.2-0.5,5.5-3.4,5C836.2,209.9,836.2,206.5,835.4,204.7z"/>
+		<path class="st7" d="M920.3,205.3c1.7-1.9,4.5,0.9,2.6,2.5C921.4,210.1,918.1,207,920.3,205.3z"/>
+		<path class="st7" d="M1005.2,212.9c5.5-0.5,7.7-6.8,13.1-7.3c0.2,3.1,0.4,6.3,0.8,9.4c0,0.1-0.1,0.4-0.1,0.5
+			c-1.1-1.2-2.4-2.2-3.8-2.9c0,2,0,4,0.1,5.9c1.2,0.3,2.3,0.5,3.5,0.8c0.4,0.9,0.7,1.9,1.1,2.8c0.6,2.8,0.9,5.6,1.3,8.4l-0.7,0.1
+			c-0.3-1.8-0.5-3.6-0.8-5.3c-0.5,0.1-1.5,0.2-2,0.3c-0.9,1.9-1.8,3.9-2.6,5.8c-2.7,0.4-5.4,0.3-8.2,0.2c1.2-0.2,2.4-0.5,3.7-0.7
+			c0.1-3.9,1.3-7.7,1.1-11.6C1010.4,216.4,1007.5,214.9,1005.2,212.9z"/>
+		<path class="st7" d="M506.4,213.4c1-1.3,4.2-0.6,3.4,1.4C509.1,217.4,503.8,215.6,506.4,213.4z"/>
+		<path class="st7" d="M1399.5,214.7c1.2-0.5,2.4-1.1,3.7-1.6c0.1,0.8,0.2,2.4,0.3,3.1c-2.2,0.9-4.4,1.7-6.6,2.6
+			c-0.9-0.2-1.8-0.4-2.6-0.6c-0.5-0.9-1-1.9-1.4-2.8C1395.2,215.8,1397.5,216,1399.5,214.7z"/>
+		<path class="st7" d="M488.6,224c1.5-1.7,3.5-2.9,5.4-4.1c0.8,0.8,1.6,1.6,2.4,2.4c0.6,1.1,1.2,2.2,1.9,3.3
+			C495.1,225.4,490.6,227.5,488.6,224z"/>
+		<path class="st7" d="M507.5,221.2c1.4,0.2,2.7,0.4,4.1,0.7c-4.1,6.1-7.1,12.8-9.7,19.6c-1.4,0.2-2.8,0.7-4,1.6
+			c-1-0.6-1.9-1.1-2.9-1.7c1.8-0.9,3.6-1.8,5.4-2.7c-1.5-4.3-0.2-8.8,1.4-12.9c1.5-0.3,3-0.8,4.5-1.2
+			C506.6,223.4,507.1,222.3,507.5,221.2z"/>
+		<path class="st7" d="M756.2,220.1c0.7,2.3,1.3,4.6,1.6,6.9c0.7,7.2-0.4,14.4-0.2,21.6c-0.3,0-0.9,0-1.2,0
+			c-0.7,2.5-1.2,5.4-3.2,7.2c-3.6,1.7-6.5,4.4-9.7,6.7c-1.6,0.1-3.2-0.1-4.7-0.2c-0.2,2.1,0.1,4.1,0.4,6.1c-2.1,0.3-4.2,0.7-6.4,1
+			c0.3-1.3,0.7-2.5,1.1-3.7c1.7-3.5,3-7.4,1.4-11.2c1.8-2.2,3.8-4.2,6-6c0.5,2.1,1,4.2,1.3,6.4c2.2-1,4.8-1.8,6.4-3.8
+			c2.9-3.4,3.7-8,6.5-11.5c2.4-2.7,1.7-6.6,1.8-9.9c-3.1,2.1-7,3.2-9.3,6.2c-0.4,2.5,0.3,5.2,0.3,7.7c-2.4-0.4-4.9-1.6-7.4-1
+			c-2.7,2.4-4.8,5.3-7.5,7.6c-2.4,1.8-2.8,4.9-3.3,7.6c-1.4,0.2-2.7,0.4-4.1,0.7c-3.1,0.3-5.8,2.4-6.9,5.3c-0.6,2.9-0.4,5.9-0.3,8.9
+			c0.1,1.7,0.2,3.5,0.3,5.2c2.9-3.2,6-6.2,9.6-8.6c1.5,0.1,3,0.2,4.5,0.3c-2.6,3.8-4.9,8.3-9.1,10.6c-1.5,0.9-3,1.7-4.5,2.6
+			c-0.5,1.5-0.8,3-1.1,4.5c0.9,1.1,2.1,2.6,3.8,1.8c2.1-1.2,3.2-3.6,5-5.1c1.5-0.6,3.1,0.3,4.6,0.4c-3,5.1-8.3,8.3-11.2,13.5
+			c-1.3,1.7-2.2,3.7-2.1,5.8c0.1,16.9,0,33.7,0,50.5l-0.8,0.9c0.8-17.5,0.1-35,0.4-52.4c0.4-14.6-0.4-29.2,0.1-43.8
+			c3.4-2.6,6.7-5.2,9.4-8.5c1.9-2.5,4.6-4.2,7.3-5.8c0.6-2.3,1.2-4.6,1.8-7c0.5-0.3,1.1-0.5,1.6-0.8c0.5-1.1,0.9-2.2,1.4-3.3
+			c6.1-1,11.1-5,15.4-9.2C755.6,223.2,755.9,221.6,756.2,220.1z"/>
+		<path class="st7" d="M851.1,220.8c1.9,5.6,1.3,11.5,1.4,17.3c0,3.1-0.1,6.2-0.8,9.3c-0.3-0.8-0.9-2.4-1.2-3.2
+			c-0.8,2.5-1.1,5.5-3.5,7c-3.6,2.6-4.5,7.4-8.2,9.8c1.7,3.9-2.4,6.9-3.1,10.5c-4,1.2-4.5,5.2-5.5,8.7c-0.8-1.6-1.6-3.1-2.4-4.6
+			c-2,0.9-3.9,1.8-5.9,2.7c-0.5-1.1-1-2.2-1.5-3.3c1.5-0.7,3-1.3,4.5-1.9c1.3-2.3,3-4.5,5.4-5.7c-0.3-2.2-0.6-4.4-0.9-6.5
+			c1.6-0.5,3.3-1.1,5-1.6c1.2-2.5,2.2-5.1,2.9-7.8c6.6-5.8,10.4-13.9,13.7-21.8C851.8,226.7,851.2,223.7,851.1,220.8z"/>
+		<path class="st7" d="M919.9,222.9c1.1-0.2,2.2-0.4,3.4-0.6c1,2.3,2.1,4.7,4,6.4c0,3.2,0,6.3,0,9.5c-0.5-0.4-1.5-1.3-2-1.8
+			c-1.6,1.3-3.2,2.6-4.7,4c-0.2,4,0.8,8.7-2.1,12c-2.5,3.3-7.6,4.2-11,2.2c-3-2.7,1.4-5.2,3.1-7.1c-0.7-2.1-1.3-4.2-2-6.3
+			c0.9-2.3,2.8-4.8,1.7-7.4c-1.8-2.1-3.7-4-5.1-6.4c0.7-0.7,1.4-1.4,2.2-2.1c0.4,0.1,1.2,0.4,1.6,0.5c1.1,2.9,2.7,5.9,6.2,5.9
+			C915.7,228.4,917.2,225.1,919.9,222.9z"/>
+		<path class="st7" d="M1393.3,225.9c2.3-2.3,4.7-5.3,8.4-4.5c-2.2,2.9-4.6,6-3.3,9.9c-1.2,1.9-3.1,3-5.1,3.9
+			c-0.9-0.8-1.8-1.6-2.7-2.4c0-1.1,0.1-2.3,0.2-3.4c0.2-0.3,0.6-1,0.8-1.3c0.2,1.4,0.4,2.9,0.7,4.3c1.3-0.6,3-1.1,3.4-2.6
+			C1394.9,228.4,1394.1,227.1,1393.3,225.9z"/>
+		<path class="st7" d="M830.3,224.2c2.7-0.9,5.8-2,8.4-0.2c-1.5,3.3-5.3,3.6-8.5,3.9C830.3,226.6,830.3,225.4,830.3,224.2z"/>
+		<path class="st7" d="M653,234.4c1-1.4,1.8-3.6,4-3.2c2.3-0.6,3.7,2.5,2.3,4.1C657.2,235.8,655.1,234.7,653,234.4z"/>
+		<path class="st7" d="M811.8,232.8c2-0.6,3.9-1.2,5.9-1.8c0.5,2.9,1.9,6.2,0.2,9c-1.5-1.6-3.2-3.1-4.8-4.5
+			c-0.1,2.2-0.2,4.5-0.2,6.7c1,0.1,2,0.1,3,0.3c0.5,1.5,0.5,3.2,0.5,4.8l-0.2,1.2c-1.4,0.5-2.9,1.1-4.3,1.6
+			C811.9,244.4,812.3,238.6,811.8,232.8z"/>
+		<path class="st7" d="M1474.6,234.1c1.5,0,3,0,4.5-0.1c0.6,1.6,1.1,1.6,1.7,0c3.5,0.1,7,0,10.6,0c-0.7,0.7-1.5,1.4-2.2,2
+			c-3,3.2-7.7,0.4-11.5,1.7C1476.6,236.5,1475.6,235.3,1474.6,234.1z"/>
+		<path class="st7" d="M1494.2,234c0.5,0,1.3,0,1.8,0c1.3,1,2.7,2.1,4,3.1c0.2,0.4,0.6,1.2,0.9,1.6c0.6,1.5,1.1,3,1.7,4.4
+			c-1-0.6-2-1.2-3-1.8c-1.7-0.9-3.4-1.6-5.1-2.2c0.5-1.1,0.9-2.1,1.4-3.2C1495.4,235.4,1494.6,234.5,1494.2,234z"/>
+		<path class="st7" d="M1240.4,240.9c0-2.1,0.1-4.2,0.2-6.4c1.2,0.4,2.5,0.8,3.7,1.2c0.5,1.4,1,2.9,1.5,4.3
+			c-1.6,0.2-3.3,0.5-4.9,0.7L1240.4,240.9z"/>
+		<path class="st7" d="M833.2,240.1c1.4-1.6,3.4-2.4,5.2-3.4c0,2.9-0.7,5.8-2.3,8.3c-1.6,1.7-3.4,3.1-4.9,4.9
+			c-2.9,3.9-5.4,8.1-8.5,11.8c-1.7,1.8-1.6,4.2-1.7,6.5c-1.6,1.1-3.4,2.1-4.7,3.6c-1.2,1.2-2.3,2.5-3.4,3.7c-1.3-1.4-2.4-3-2.9-4.9
+			c2-0.4,4-0.7,6-1c0.9-2.9,1-6-0.5-8.8c0.4-2.6,0.6-5.4,1.6-7.9c2.6-2.6,5.3-5.2,8-7.6c2-0.2,4.1,0,6.1,0.1
+			C831.8,243.7,832.2,241.8,833.2,240.1z"/>
+		<path class="st7" d="M1481.7,239c4.3,0.4,8.4,1.9,12.7,2.8c0.5,0.9,1.1,1.7,1.7,2.6c0.2,0.4,0.7,1.1,0.9,1.5
+			c-1.3,0.1-2.6,0.3-3.8,0.4c-0.8-0.8-1.6-1.6-2.4-2.4c-1.6-2.7-4.1-0.4-5.9,0.7c0.3,0.5,0.8,1.5,1.1,2.1c-3.5-0.2-2.5,4-3.2,6.3
+			c0.5,0.2,1.6,0.6,2.2,0.8c0.1-0.5,0.4-1.6,0.5-2.2c-0.1,2.9,2.8,3.3,5,4.1c-0.1,0.3-0.3,1-0.4,1.3c-0.5,0.4-1.5,1.2-2.1,1.7
+			c-1.8-1.7-3.9-3.2-5.3-5.2c-1-2.3-1.5-4.8-2.2-7.1c0.6-0.2,1.7-0.6,2.3-0.8C1482.3,243.4,1482,241.2,1481.7,239z"/>
+		<path class="st7" d="M470,245.1c1-2,2.5-3.7,4.1-5.3c2.6,3,2.3,7,2.7,10.7c2.7-1,3.9-4.9,7.5-4c-1.9,2.9-4.6,5.7-3.8,9.4
+			c1.7,0.9,4.8,0.7,5.1,3.1c0.8,3.6-2.4,6.1-4.7,8.2c-3.6-2,0-6.5-3.6-8.3c-2.1,2-4.1,4.1-6,6.4c-4-2.7-6-7.3-8.4-11.3
+			C464.6,250.6,468.2,248.6,470,245.1 M469.4,260.8c1.1-0.3,2.6,0,3.3-1.1c1.8-2.3,3.9-5.5,1.5-8.2
+			C471.9,254.3,468,256.6,469.4,260.8z"/>
+		<path class="st7" d="M1533.4,244.1c-1-2.8,2.7-2.4,4.3-2.8c0.2,2.1-0.3,4.2-1.6,5.9C1534.9,246.3,1534,245.3,1533.4,244.1z"/>
+		<path class="st7" d="M1156.1,245c2,0.5,4.3,1,5.5,2.9c0,1.5-1.2,2.6-2.5,2.9C1156.2,250.6,1156.6,247.1,1156.1,245z"/>
+		<path class="st7" d="M1249.1,245.9c1.1-0.3,2.3-0.6,3.4-0.8c0.9,1.5,1.8,3,2.7,4.5c0.4-0.1,1.2-0.3,1.6-0.4
+			c-0.2,6.7,0.2,13.4-0.2,20.1c-0.2-1.4-0.5-2.8-0.8-4.2c-0.4-1.1-0.9-2.3-1.3-3.4c0.2-2.6,2.7-5,1.4-7.6c-1.9-2.5-4.9-3.6-7.5-5.3
+			C1248.6,247.9,1248.8,246.9,1249.1,245.9z"/>
+		<path class="st7" d="M1523.1,245.2c1.5-1.2,3,1.5,1.7,2.5C1523.3,248.8,1521.8,246.2,1523.1,245.2z"/>
+		<path class="st7" d="M1407.7,252.3c2.6-2,5.2-4.4,8.5-5.1c0,0.7,0.1,1.4,0.1,2.1c-1.6,1.2-3.2,2.4-4.9,3.6c0,0.7,0.1,1.5,0.2,2.2
+			c0,1.6,1.1,2.9,2,4.2c-0.5,0.1-1.5,0.2-2,0.2c-0.5,0.1-1.4,0.2-1.9,0.3c-0.1-0.1-0.2-0.4-0.3-0.6
+			C1408.7,256.9,1408.2,254.6,1407.7,252.3z"/>
+		<path class="st7" d="M1432.8,247.1c0.6-0.2,1.8-0.5,2.5-0.7c2.3,1.4,1.2,3.9-0.2,5.5C1433.9,250.4,1432.2,249.1,1432.8,247.1z"/>
+		<path class="st7" d="M1685.2,249.1c2.9-2.1,3.5,1.5,3.6,3.7C1686.7,252.7,1684.7,251.7,1685.2,249.1z"/>
+		<path class="st7" d="M1499.1,255.6c1.4-2.4,3.1-5.3,6.5-4.3c0.3,0.7,0.7,1.4,1.1,2.2C1504.1,254.2,1501.6,254.9,1499.1,255.6z"/>
+		<path class="st7" d="M1507.5,255.9c2.5-1,5-1.9,7.5-2.8c-0.2,1.1-0.3,2.1-0.3,3.2c-1.2,0.4-2.4,0.8-3.6,1.2c-1,0.4-2,0.8-2.9,1.2
+			C1508,258,1507.7,256.6,1507.5,255.9z"/>
+		<path class="st7" d="M1470.6,254.1c2.3,0.6,4.6,1.2,6.9,1.8c-0.1,0.5-0.2,1.6-0.2,2.1c0.3,2.6-2.7,1.1-3.8,0.4
+			C1471.7,257.8,1471.1,255.9,1470.6,254.1z"/>
+		<path class="st7" d="M1398.9,258.1c-1.1-2.6,1.1-3.4,3.3-3.6c0,1.4-0.1,2.8-0.1,4.2C1401,258.5,1400,258.3,1398.9,258.1z"/>
+		<path class="st7" d="M1494.4,256.7c1.3,1.1,2.7,2.2,4.1,3.2c0.2,0.6,0.7,1.9,0.9,2.5l0,1.2c0.7-0.1,1.9-0.2,2.6-0.3
+			c-7.9,1.6-15.9,0-23.9,0.5l0.1-0.6c0.2-1.7,0.5-3.4,0.8-5c4.5,3.6,10.2,6.4,16.1,5c-1.1-1.2-2.4-1.7-3.9-2.1
+			C1492.3,259.7,1493.3,258.2,1494.4,256.7z"/>
+		<path class="st7" d="M1150,260c1.2-0.3,2.5-0.7,3.7-0.9c1.4,0.5,2.9,1.1,4.3,1.7c-2.7,1.3-5.7,2.3-8.8,1.6
+			C1149.4,261.7,1149.8,260.6,1150,260z"/>
+		<path class="st7" d="M1426.1,259.4c1.8-0.6,2.7,2.5,0.7,2.8C1424.8,262.8,1423.9,259.6,1426.1,259.4z"/>
+		<path class="st7" d="M451.8,277.5c5.7-3,9.1-8.7,12.9-13.7c0.9,1.3,1.8,2.6,2.8,3.9c-1.3,2.7-2.4,5.5-3.5,8.3
+			c-4.5,2.4-7.2,7.3-12.3,8.9C451.7,282.5,451.7,280,451.8,277.5z"/>
+		<path class="st7" d="M1140.4,265.3c1.2,0.2,2.4,0.4,3.7,0.6c0.8,0.9,1.8,2,1.3,3.4c-1.5,0.3-2.9,0.3-4.4,0.2
+			c-0.3-0.3-0.9-1-1.2-1.3C1139.9,267.4,1140.2,266,1140.4,265.3z"/>
+		<path class="st7" d="M1151.3,271.3c1.7-0.1,3.3-0.2,5-0.2c1.5,0.6,3.8,0.2,4.4,2.1c1.2,2.3,2.2,5.1,4.9,6.2
+			c2.9,1.9,6.3,0.1,9.4,0.1c3.1-0.4,4.5,4.1,7.5,3.3c2.4-0.1,2.6-2.9,3.5-4.6c2.6,0,4.9,1.2,6.8,2.8c-1,0.9-2,1.8-3,2.7
+			c-0.7,0-2.1,0.1-2.8,0.2c-0.8,1.1-1.6,2.3-2.4,3.4c-1.2-0.2-2.5-0.3-3.7-0.5c-1.3-0.9-2.5-1.9-3.9-2.5c-2.9,1.6-5.9,4.1-9.3,2.2
+			c-0.4-1-0.8-2-1.1-3.1c-3.4-1.4-6.7-3.2-10.2-4.7c-0.2,0.8-0.7,2.3-1,3.1c2.6,2.2,5.4,4.3,7.5,7c2.4,3.7,3,8.3,3.6,12.6
+			c2.5-0.1,5.4-0.7,7.6,1c1.9,1.5,3.6,3.6,6.1,3.9c0.7-0.2,2-0.5,2.7-0.6c0.9,0.3,1.9,0.7,2.9,1c4.2-0.7,9.8-0.8,11.8-5.3
+			c2.1-2.7,0.9-6,0.5-9c2.2-0.4,4.5-0.8,6.8-1.3c0.2,0.2,0.6,0.7,0.8,0.9l-0.2,0.4c-1.1,1.9-2.1,3.7-3,5.6c0.7,1.3,1.4,2.6,2.2,4
+			c-2.2,1.4-4.5,2.7-6.9,3.9c-0.8,2.2-1.5,4.4-2.2,6.6c-2,0.3-4.1,0.6-6.1,0.9c-0.3,2-0.6,4.1-0.9,6.1c-3.4-0.3-6.9-0.3-10.3,0
+			c-1.1-1.3-2.2-2.6-3.2-3.9c0.7-1.9,2.6-4.1,1.2-6.1c-1.4-1.6-3.5-2.2-5.2-3.1c-0.4,0.6-1.3,1.8-1.7,2.5
+			c-3.8-4.2-7.4-8.6-11.3-12.8c1,0,2.9,0,3.8,0c-0.5-3-3.4-3.8-5.8-4.7c0,0.6,0,1.9,0,2.5c-2.1-2.4-4.1-4.8-6.1-7.2
+			c1.6-0.5,3.2-0.9,4.9-1.4c-1.5-1.8-3.3-3.5-4.5-5.5c0.3-1.9,1.5-3.4,2.4-5.1C1152.3,273.6,1151.8,272.5,1151.3,271.3z"/>
+		<path class="st7" d="M1236.6,271.9c0.2,0.2,0.8,0.7,1,0.9c1.2,1.2,2.7,1.9,4.2,2.6c0.4,1,0.8,1.9,1.1,2.9c1.6,0.2,3.2,0.5,4.8,0.7
+			c-0.7,0.9-1.4,1.8-2.1,2.7c0.3,1,0.7,1.9,1,2.9c-1.2,0.5-2.4,1-3.7,1.4c-1.9-2.7-3.2-6.1-6.5-7.4
+			C1236.6,276.3,1236.6,274.1,1236.6,271.9z"/>
+		<path class="st7" d="M469.7,273.7c1.6-0.8,2.9,0.5,4.1,1.4c-0.5,1.1-1,2.2-1.5,3.2c-1,0.1-1.9,0.2-2.9,0.4
+			C469.4,277,469.4,275.3,469.7,273.7z"/>
+		<path class="st7" d="M822.5,280.9c0.8-0.8,1.5-1.7,2.3-2.5c1.3,0.7,2.5,1.3,3.8,2c0.5,1.8,1,3.5,1.5,5.2
+			c-6.9,5.9-14.8,10.7-23.3,13.8c1.3-2.7,3.8-4.1,6.2-5.6c2.4-1.4,2.6-4.6,4-6.8c2-1.4,4.4-1.9,6.6-2.7
+			C823.3,283.2,822.9,282,822.5,280.9z"/>
+		<path class="st7" d="M1094.6,278.7c1,9.3,0.5,18.7,0.6,28l-0.9-0.4c-2.1,0.4-2.9,2.7-4.2,4.1c-1.2-2.6,0.6-5.2,1.4-7.6
+			C1095.3,295.4,1093.9,286.8,1094.6,278.7z"/>
+		<path class="st7" d="M798.3,284.6c3.1-1.1,5.5-3.6,8.8-4.2c0.8,1.4,1.2,3,1.7,4.6c-2.3,0.6-5,0.8-6.4,3c-1.4,0.7-2.8,1.5-4.4,1.6
+			C795.7,288.6,796,285.1,798.3,284.6z"/>
+		<path class="st7" d="M1240.8,291.1c5-1.2,10.2-3.1,15.4-2.1c-0.1,2.1-0.2,4.1-0.2,6.2c-1-0.7-2-1.5-3.1-2.2
+			C1249,291.8,1244.5,293.4,1240.8,291.1z"/>
+		<path class="st7" d="M1079.7,291.8c3.4-0.2,6.7-1.3,10.1-1.5c-0.5,2.8-1.7,5.4-2.8,8c-4,0.5-7.9,1.1-11.9,1.6
+			C1074.4,296.1,1077.2,293.9,1079.7,291.8z"/>
+		<path class="st7" d="M675.5,293.4c0.7-0.1,2-0.3,2.7-0.3c-1,11.3-2.7,22.6-6.8,33.2c0-1.5,0-3,0-4.5c-0.9-1.1-1.8-2.2-2.7-3.4
+			c1.5-1.5,2.8-3.2,3.4-5.2c-3.9-0.4-7.2,1.8-9,5.1c-1.5,2.3-3.5,4.3-5.9,5.8c-2.9,1.9-6.5,3.2-8.6,6.2c-1.9,2.8-3.9,5.7-6.1,8.2
+			c-3.8,3.7-8.3,6.7-11.4,11.1c-1.4,2.5-4,3.5-6.6,4.2c0-1.9,0-3.8,0-5.7c2.3-2,4.6-3.9,7.2-5.4c3.2-0.4,4.2-3.2,4.5-6
+			c1.1,0.2,2.3,0.5,3.5,0.8c0.9-1.8,1.8-3.6,2.8-5.3c3.2-4.6,7.1-8.7,11.8-11.8c4.3-2.7,7.2-7,11-10.4c3.4-3.3,7.5-6,10.2-10
+			C675.7,297.9,675.5,295.7,675.5,293.4z"/>
+		<path class="st7" d="M1179.9,295.5c1.8,0,3.6,0.1,5.4,0.3c-0.1,1.3,1.1,3.3-0.7,3.8c-1.7,0.8-3.7,0.4-5.5,0.6
+			C1179.4,298.6,1179.7,297.1,1179.9,295.5z"/>
+		<path class="st7" d="M1242,299.5c0.4-1.7,1.6-3,3-4c0.9,0.3,2.6,0.9,3.4,1.3C1249.1,300.5,1244.2,299.4,1242,299.5z"/>
+		<path class="st7" d="M648,306.6c2.2-5.2,7.4-9,12.8-10.2c-0.6,3.4-3,5.9-5.5,8.1C653.3,306.3,650.7,306.8,648,306.6z"/>
+		<path class="st7" d="M1248,307.4c2.1-0.3,4.1-0.6,6.2-0.8c0.4,0.1,1.3,0.4,1.7,0.6c-0.1,2.3-0.2,4.7-0.2,7
+			c-1.3,0.5-2.6,1.1-3.8,1.6C1250,313.3,1248.6,310.5,1248,307.4z"/>
+		<path class="st7" d="M1206.2,311.2c1.5-2.6,4.9-2.2,6.8-0.4c3.3,2.9,8.9,2.2,10.8,6.8c0.8-0.1,1.7-0.1,2.6-0.1l0.2,0
+			c1.7,2.3,3.5,4.5,5.2,6.8c1.3,1.8,2.6,3.6,4,5.2c-1.9,1.2-3.5,3.1-3.7,5.4c1.3,1.9,3,3.3,4.7,4.8c-4.2,0.6-8.5,0.5-12.7,1.1
+			c0.9,2.1,1.4,4.4,3,6.2c1.7,0.8,3.6,0.6,5.5,0.8c0.6-1.2,1.3-2.4,1.9-3.6c1.1,0.8,2.3,1.6,3.4,2.5c1.4,1.1,2.8,2.2,4.2,3.4
+			c0.8,0.7,1.7,1.3,2.6,2c1.1-1.2,2.2-2.3,3.3-3.5c1.2,0.4,2.5,0.8,3.8,1.2c0-0.5,0.1-1.6,0.1-2.1c-2.2-0.2-5.1,0.3-6.4-2
+			c-0.6-2.9-1.2-5.9-3.6-7.9c2.4-3.5,4.4-7.1,6.2-10.9c0.7-1.6,2.4-2.4,3.8-3.4c1,0.7,2,1.5,3.1,2.2c0.1-0.5,0.3-1.4,0.4-1.9
+			c0.1-0.6,0.3-1.7,0.4-2.2c0.3,10.3-0.2,20.6-0.3,30.9c-1.5,0.7-3,1.4-4.5,2.2c-2.2-0.6-4.3-1.3-6.4-1.9c0.7,3.4,1.7,6.7,2.7,9.9
+			c2.7-0.3,5.4-0.5,8.2-0.8c0,2.5,0.1,4.9,0.2,7.4c-1.6,1.2-3.2,2.4-4.7,3.6c-1.9-0.9-3.8-1.7-5.7-2.6c-3.4,1.9-7,3.5-10.9,3.3
+			c-2.1,1.8-3.9,3.9-5.5,6.1c-4.9-6.1-9.6-12.3-14.6-18.2c1.2-2,3-3.9,2.7-6.4c-1.5-1.3-3.2-2.3-4.8-3.4c2.6-1.3,5.8-1.8,8.5-0.4
+			c3.6,1.6,0.7,6,0.6,8.9c3.2-0.9,7.1-3.1,6.4-7.1c-2.1-1-4-2.2-5.9-3.5c0.5-2.1,0.6-4.2,0.2-6.2c-2.7,0-5.4,0-8.1-0.4
+			c-1.4-3.3,4-5.2,3.9-8.6c-2-1.4-4.6-1-6.9-0.9c-2.6,0-3.6,2.9-5.3,4.4c-0.2,0.2-0.7,0.7-0.9,0.9c-2,1.7-3.7,3.8-5.1,6
+			c-2.4-2.9-4.8-5.8-7.3-8.7c0.4-0.1,1.2-0.3,1.6-0.4c-2.3-3.5-3.3-7.7-6.2-10.9c0.4-1.2,0.9-2.5,1.3-3.7c2-0.3,4.1-0.3,6-1
+			c1.6-0.8,1.2-2.8,1.5-4.2c0.5-0.3,1-0.6,1.6-0.9c1.6,2.8,3.1,5.5,4.8,8.2c0.2,0.3,0.6,1,0.8,1.3c3.3,1.2,6.7,2.2,9.9,3.6
+			c1.5,0.9,3.3-0.1,4.5-1c3-1.9,0.7-5.6,0.2-8.2c-2.2-0.9-4.3-1.7-6.4-2.6c-1.3,0.9-2.7,1.7-4,2.6
+			C1207.2,316.4,1206.2,313.9,1206.2,311.2 M1195.2,323.2c0.1,3.3,1.2,6.4,2.5,9.4c0.5,0,1.5,0,2,0c1.2-2.8,1.1-6.1-0.7-8.7
+			C1197.8,323.3,1196.4,323.5,1195.2,323.2 M1223.9,330.9c-1.5,1.8,0.2,4.4,1.7,5.7c1.7,0.3,4.5,0.9,4.9-1.5
+			C1229.3,332.7,1226.7,329.4,1223.9,330.9 M1254.3,332c-1.3,1.2-2.5,4.2-0.2,4.9C1256.2,336.4,1255.6,333.2,1254.3,332
+			 M1235.2,351.9c1.4,1.8,3,3.5,4.8,5c1.6-0.3,3.1-0.7,4.7-1c-1.3-1.2-2.6-2.3-4-3.3c-0.1-0.8-0.4-2.3-0.6-3
+			C1238.3,350,1236.7,350.8,1235.2,351.9 M1240.7,362.6c-1.7,0.7-1.2,2.7-1.6,4.2c2.2,0.7,4.5,0.4,6.8-0.1
+			C1246.2,363.7,1243.2,362.3,1240.7,362.6z"/>
+		<path class="st7" d="M889.4,313.9c1.7-2,3.5-4.1,6-4.9c0.1,1.5,0.4,3.1,0.2,4.7c-0.9,1.3-2.3,2-3.5,3
+			C891.2,315.7,890.3,314.8,889.4,313.9z"/>
+		<path class="st7" d="M632.5,318.1c2.8-2.5,6.3-4,10.2-3.3c-0.1,1.2-0.2,2.4-0.2,3.6c0.5,0.3,1.6,0.9,2.1,1.2
+			c-0.1,1.9-0.2,3.7-0.3,5.6c-1.5,1.2-3,2.2-4.4,3.4c-1.7,2.2-2.4,5.3-4.8,6.9c-2.3-0.9-3.6-3-3.8-5.4c1.7-0.6,3.8-0.4,5.3-1.5
+			c1.2-1.7,1.7-3.9,2.5-5.8c-2.6-0.4-5.1,0.2-7.6,0.9C631.8,321.9,632.2,320,632.5,318.1z"/>
+		<path class="st7" d="M1237.5,316.2c1.5,0.3,2.9,0.7,4.4,1c0.5,0.5,1.5,1.5,1.9,2c-1.2,2.4-3.4,3.6-6.1,3.4
+			C1237.5,320.5,1237.4,318.4,1237.5,316.2z"/>
+		<path class="st7" d="M1093.4,321.3c0.5-0.4,1.4-1.2,1.9-1.6c0,5.4,0.1,10.7,0.3,16.1c-1.8,0.5-3.5,1-5.3,1.6
+			c-1.7-2.2-3.7-4.2-5-6.6c-0.9-3.1,3-3.9,4.9-5.4c1.3,0.5,2.6,1.1,3.9,1.6C1093.8,325.2,1093.6,323.2,1093.4,321.3z"/>
+		<path class="st7" d="M662.7,322.6c1.5-1.4,3.6-0.6,5.4-0.8c-0.4,2-0.8,4.1-1.1,6.1c-1.1,0.3-2.3,0.5-3.4,0.8
+			c-0.5,2,0.2,5.1-2.4,5.8c-3,1.4-6.3,2.7-8.3,5.6c-2.3,2.5-4.5,5.2-7.5,6.9c-1.8-0.6-3.5-1.2-5.2-1.8c1.8-2,4.1-3.6,6.4-5
+			c3-4.6,8.9-5.9,11.1-11.1c1.1-0.9,2.3-1.8,3.5-2.6C661.6,325.1,662,323.8,662.7,322.6z"/>
+		<path class="st7" d="M660.7,335.6c1.5-1.3,3.6-1,5.4-1.1c-0.6,1.2-1.2,2.4-1.7,3.6c0.2,0.6,0.6,1.9,0.8,2.5
+			c-0.7,1.3-1.5,2.5-2.2,3.8c-0.1-0.5-0.2-1.6-0.2-2.1c-3.6,4.8-10.5,8.6-9.1,15.5c-0.8,0.9-1.5,1.9-2.3,2.8c-1.8-1.8-4.6-1.5-6.9-1
+			c-3.4,1.8-5.8,5-8.5,7.7c-0.6-0.4-1.9-1.1-2.5-1.5c3-5.1,7.5-9.4,12.7-12.3c2.7-1.6,4.2-4.5,5.6-7.2c1-2.2,3.6-2.6,5.6-3.6
+			C659.5,341.1,659.5,338,660.7,335.6z"/>
+		<path class="st7" d="M1236.3,342.2c0.9-1.4,3.6,0.1,2.5,1.6C1237.8,345.2,1235.1,343.7,1236.3,342.2z"/>
+		<path class="st7" d="M474.7,345.6c0.5-0.9,1.1-1.8,1.6-2.7c0.3,3.2,0.8,6.3,1.4,9.5c-1.7,0.6-3.4,1.2-5.1,1.8
+			c-0.9-1.1-1.7-2.2-2.5-3.4C471.6,349,473.1,347.3,474.7,345.6z"/>
+		<path class="st7" d="M909.3,344.2c1.2-2,4.3-0.2,3.1,1.7c-1.4,2.3-4.2,6.5-7.1,3.6C904.7,346.9,907.6,345.6,909.3,344.2z"/>
+		<path class="st7" d="M1204.2,345.5c2.2-0.7,4.5-0.6,6.8-0.3c-0.5,1.7-1,3.5-1.6,5.2c-0.7-0.1-2.1-0.2-2.8-0.3
+			C1205.8,348.6,1205,347,1204.2,345.5z"/>
+		<path class="st7" d="M612.6,362.1c4.2-2,6-7.7,11-8.1c-0.1,2-0.2,4.1-0.3,6.1c3.6-0.1,6-2.8,7.9-5.6c1,0.1,2.1,0.1,3.1,0.3
+			c0.4,1.3,0.5,2.6,0.8,4c-2.9,1.2-5.4,3-7.2,5.5c-1.7,1.4-3.7,2.5-4.7,4.6c-3,5.7-8.8,9-13.9,12.6c-2.5,2.1-5.2,5.2-3.6,8.6
+			c-2.5,0.9-4.9,1.7-7.5,2.1c-1,0-2.9,0-3.8,0c2.4-3.2,5.5-5.8,8.5-8.4c2.9-2.4,3.7-6.2,5.7-9.2c2.1-1.3,4.8-1.6,6.8-3.1
+			c2.2-2.4,3.5-5.4,4.7-8.4c-3.5,0.7-6.3,2.9-9.4,4.5c-2.1,1.2-4.5,0.6-6.7,0.3c2.9-2.3,5.6-4.8,8.1-7.6
+			C612.1,360.7,612.4,361.6,612.6,362.1z"/>
+		<path class="st7" d="M758.4,359.8c0.5,4,1.2,7.9,2.5,11.7c-0.2,2.5,0.2,5.7-2.3,7.2c-3.9,2.9-7.3,6.5-10,10.5
+			c4.5,1.1,8.5-1.1,12.4-3c0.5,1.2,1,2.3,1.6,3.5c3.8,0.4,7.5,0.6,11.3,0.7c2,0.1,4,0.3,6,0.5l1.3,0.1c0.3-3.6,0.3-7.3,0.2-10.9
+			c-2.9-0.1-5.8-0.3-8.7-0.8c3.1-0.4,6.3-0.3,9.4,0c0.2,4.1,0,8.2,0,12.3c-15.8-0.7-31.6-1.9-47.4-1.8l0.9-0.7
+			c0.8-0.6,1.6-1.2,2.5-1.9c3,0.3,4.7-2.5,6.8-4.2c1.9-1.8,4.8-1.6,6.8-3.1c3-4.2,5.1-9.2,4.6-14.5c0.7-1.1,1.4-2.1,2-3.2
+			C758.4,361.5,758.4,360.4,758.4,359.8z"/>
+		<path class="st7" d="M1018.2,366.2c1.9-2,3.8-4.6,6.9-4.3c-0.4,3.3-2.9,6.7-6.5,6.8C1018.5,368.1,1018.3,366.9,1018.2,366.2z"/>
+		<path class="st7" d="M1717.6,365.1c1.6,1.9,3.1,4,3.3,6.6c-0.7,0-2.1,0.1-2.8,0.2C1717.8,369.6,1717.6,367.3,1717.6,365.1z"/>
+		<path class="st7" d="M514.6,371.2c0.5-1,1.3-1.9,2-2.8c0.7,0.3,2.2,0.8,3,1.1c0.3,2,0.7,4,0.9,6.1c-1.2,3.2-2.5,6.6-5.3,8.8
+			c-0.7-0.2-2.2-0.6-3-0.9c1.2-2.2,2.7-4.2,3.4-6.6C515.5,375,514.8,373.1,514.6,371.2z"/>
+		<path class="st7" d="M530.8,368.9c1.9,1.3,4,2.6,6,3.8c-0.4,0.2-1.1,0.5-1.5,0.7c-4,1.1-5.6,5.1-8.1,8c-0.1-1.4-0.2-2.7-0.4-4.1
+			c0.9-0.7,1.8-1.4,2.8-2.1c0.1-0.5,0.3-1.6,0.4-2.2C530.3,371.6,530.6,370.2,530.8,368.9z"/>
+		<path class="st7" d="M994.2,371.6c1.6-0.5,3.2-1.3,4.9-1.3c2,0.6,4.1,1.7,6.3,1c1.9-0.2,4.4-1.6,5.7,0.5c1.8,1.6,1,4.7-1.2,5.5
+			c-3.3,0.1-6.7-0.6-9.8-1.7C998.1,374.5,996.5,372.5,994.2,371.6z"/>
+		<path class="st7" d="M942,374.1c6.8-0.2,13.5,1,20.3,1.2c-1.2,1.3-2.3,2.7-3.5,3.9c-2.1,0.4-2.8-1.9-4.1-3.1
+			c-1.1-1.5-3.3-0.8-4.8-1.1C947.3,374.9,944.6,374.8,942,374.1z"/>
+		<path class="st7" d="M1063.5,377.4c1.9-1,3.8-2.1,5.6-3.3c0.5,2.8,0.8,5.7-1.7,7.6C1066.1,380.2,1064.8,378.8,1063.5,377.4z"/>
+		<path class="st7" d="M1088.5,375.5c0.5,0,1.6-0.1,2.2-0.1c0,0.5,0,1.5,0,2c-2.2,1.5-4.7,2.3-7.3,1.4c-0.7,1.5-1.4,3.2-3.4,2.8
+			c-1.9-0.7-1.4-2.7-1.5-4.3c2.7-0.1,5.3,0.8,7.8,1.6C1086.9,377.7,1087.7,376.6,1088.5,375.5z"/>
+		<path class="st7" d="M1251.3,379.3c1.1-1.5,2.7-2.5,4.2-3.7c-0.1,5.6-0.2,11.3-0.3,17c-0.4-0.5-1.1-1.7-1.4-2.2
+			C1253.5,386.6,1251.6,383.1,1251.3,379.3z"/>
+		<path class="st7" d="M1241,378.6c2,0.5,3.6-2.5,5.4-1c1.1,1.6-1.4,2.4-2,3.6c-2,1.8,0.9,4.8-1.4,6.3c-3.5,0.7-5.1-3-6.5-5.3
+			c0.4-1.3,0.8-2.6,1.2-3.9C1238.8,378.3,1239.9,378.5,1241,378.6z"/>
+		<path class="st7" d="M715.1,386.9c-0.9-2.9-0.9-8.7,3.2-8.6c0.1,0.6,0.2,1.7,0.2,2.3c-0.4,2-0.8,3.9-1.1,5.9
+			C716.8,386.6,715.7,386.8,715.1,386.9z"/>
+		<path class="st7" d="M1027.6,379.1l0.7-0.1c-0.5,2.8-1,5.6-1.8,8.3c0-1-0.1-2.9-0.2-3.8c-5.3-2.1-10,2-14.5,4.1
+			c-0.6,0.4-1.9,1.2-2.5,1.6c-1.8-1.1-2.9-2.9-3.5-4.9c0.9-0.1,2.7-0.3,3.5-0.4c1.5,0.1,3,0.3,4.6,0.4c0.9-0.8,1.8-1.7,2.7-2.6
+			C1020.4,381.9,1024.1,380.6,1027.6,379.1z"/>
+		<path class="st7" d="M540.2,387.8c0.1-2.7-0.7-6.6,2.8-7.6c1,0.6,1.8,1.4,2.5,2.3C545.6,385.6,543.6,388.5,540.2,387.8z"/>
+		<path class="st7" d="M704,382.5c1.7,0.5,3.3,1,5,1.5l1.2,0.3c0.2,1.2,0.4,2.4,0.6,3.6c-1.6-0.3-3.2-0.5-4.7-1
+			C705.2,385.5,704.6,384,704,382.5z"/>
+		<path class="st7" d="M517.8,388.4c1.1-3,3.2-6.1,6.9-5.1c0.4,1.6-0.1,3.3-0.5,4.8c-0.4,0.5-1.3,1.5-1.7,2
+			C520.9,389.6,519.3,389,517.8,388.4z"/>
+		<path class="st7" d="M564.6,386.6c1.1-0.2,2.2-0.5,3.3-0.6c0,2.5-1.3,4.5-3.7,5.1C564.2,389.6,563.9,388,564.6,386.6z"/>
+		<path class="st7" d="M3.2,399.1c2.1,0.7,4.2,1.4,6.2,2.4c-1.3,1.7-2.5,3.4-4,5C4.2,404.2,3.6,401.6,3.2,399.1z"/>
+		<path class="st7" d="M14.1,441.3c1.7-0.7,5-3.8,5.4-0.3c-0.2,1.8-2.4,2.1-3.6,2.9c-0.8,1-1.5,2.1-2.2,3.1
+			c-2.4-1.6-3.5-4.1-3.6-6.9C11.4,440.5,12.7,440.9,14.1,441.3z"/>
+		<path class="st7" d="M1220.3,472.5c3.7-1.3,7.3-2.9,11-4.3c-2,2.6-1.7,5.8-1,8.8c-2.5,0.9-5.3,1.1-7.3,2.9c-2,2.4-3.5,5.4-6,7.4
+			c-0.3,1.3-0.6,2.5-0.9,3.8c-1.4,0.2-2.8,0.4-4.2,0.7c-0.3,1-0.6,2-0.8,3c-1.6,0.1-3.1,0.2-4.6,0.4c0,0.7-0.1,2.1-0.1,2.9
+			c3.7-1.1,7.5-3.5,11.4-1.8c0.7,2.4-2.2,2-3.6,2.7c-0.7,1.1-1.4,2.2-2.2,3.3c-5.3,1.8-10.8-0.1-16-1.2c-0.5,0.2-1.5,0.6-2,0.8
+			c-0.6,0.8-1.2,1.7-1.8,2.6c1.1-3.8,2.5-7.6,3.7-11.4c0,0.9,0,2.7,0,3.6c1.8-1.4,3.6-3,5.2-4.6c-1.3-0.9-2.6-1.8-3.9-2.6
+			c0.9-2.5,1.8-5,2.7-7.6c0.4-0.2,1.1-0.7,1.5-1c0.5,2.9-0.2,6.9,2.6,8.6c6-3.2,11.8-7.2,16.8-11.8c1.6-1.1,0.5-3.2-0.2-4.5
+			C1220.5,473,1220.4,472.7,1220.3,472.5z"/>
+		<path class="st7" d="M620.3,469.2c5.3,1.5,11.2,0.1,16,3c-2.3-0.3-4.6-0.6-6.9-0.8c-0.5,0-1.4-0.1-1.9-0.2c0.1,3.2,0.3,6.7-2.3,9
+			c-2.2-3.3-4.2-6.7-5-10.6L620.3,469.2z"/>
+		<path class="st7" d="M636.2,475.3c1.4-1.6,4-0.5,3.4,1.8C639.1,479.4,633.3,476.9,636.2,475.3z"/>
+		<path class="st7" d="M768.4,474.7c2.2,0.3,4.4,0.5,6.6,0.7c-3.5,2.1-5.6,5.6-6,9.6c2.4-1.7,4.9-3.4,8-2.6
+			c-0.6,1.9-1.2,3.8-1.9,5.7c-3.3-0.5-6.4-1.5-9.3-3c-0.5-1.9-1-3.7-1.4-5.6c1.5-0.7,2.9-1.4,4.4-2
+			C768.6,476.6,768.5,475.6,768.4,474.7z"/>
+		<path class="st7" d="M940.6,475.9c0.3-0.2,1-0.7,1.3-0.9c6.4,0.8,12.9,0,19.3,1.2c-1.6,5.1-7,8.3-7.2,13.9
+			c-4.3-0.6-8.6-0.4-12.9-0.3C941.8,485.1,940.5,480.5,940.6,475.9 M941.5,489.2c4.4,1,6.4-3.2,8.9-5.9c1.8-1.5,1.2-4.1,1.4-6.1
+			c-1.4-0.2-2.8-0.4-4.1-0.6C946.9,481.4,943.9,485.1,941.5,489.2z"/>
+		<path class="st7" d="M778.9,475.4c1.4,0.3,2.8,0.6,4.1,0.9c6.2-1.6,12.7,0.2,19-0.2c14.4,1,28.8-1.2,43.3,0.2
+			c-2.8,3-6.1,5.5-9,8.4c-0.7-0.8-1.4-1.5-2.1-2.3c1.5-0.2,3-0.5,4.5-0.8c-0.1-1.7-0.1-3.3-0.2-5c-2.2,0-4.5,0-6.7,0
+			c-2,0-3.9-0.1-5.8,0.3c-2.5,1.2-4.7,3-7.1,4.5c-1.5-1.8-2.8-3.9-4.8-5c-0.5,0.2-1.4,0.8-1.8,1c-0.2,0.6-0.7,1.9-1,2.6
+			c0.9,1.4,1.8,2.8,2.6,4.2c-2.3,2.9-5.4,4.7-8.8,5.9c0.1-1.1,0.3-2.2,0.5-3.3c1.5-0.9,3.2-1.6,4.5-2.9c0.7-1.9-1-3.2-1.8-4.6
+			c-1.7,0.8-3.4,1.6-5.2,2.4c0.1-0.7,0.2-2,0.3-2.7c0.1-0.6,0.2-1.8,0.3-2.3c-3.6-0.5-6.9,0.8-9.8,2.9c-0.6-1.1-1.2-2.1-1.7-3.1
+			c-2,0-4,0-6,0c0.8,3.1,3.2,5.3,5.7,7c-2.3-0.2-4.7-0.1-7-0.6C782.3,481,780.8,478,778.9,475.4z"/>
+		<path class="st7" d="M371.7,477.7c1.3-0.2,2.6-0.5,3.9-0.8c-0.3,1.7-0.6,3.5-0.9,5.2c0.3,0.6,0.8,1.8,1.1,2.4c1-0.3,2-0.6,3-0.8
+			c1.6-0.2,3.2-0.2,4.7-0.3c1.7,1.3,3.6,2.5,5.5,3.6c1.1,2.5,2.4,4.9,2.8,7.7c-1.9-0.1-3.4-1.1-4.8-2.2c-1.3,0.7-2.7,1.4-4,2.1
+			c-2.2-1.7-4.7-3.1-7.3-4.1c-0.3-1.9,0.3-4.4-1.5-5.6c-2.4-0.4-4.9,0-7.3-0.4c-1.9-3.2,2.4-3,4.3-3.4
+			C371.3,479.9,371.5,478.8,371.7,477.7z"/>
+		<path class="st7" d="M644.4,481.3c0.5-1.6,1-3.2,1.5-4.8c4.5,1.9,8.9,5.1,14,3.7c1.5,0,2.8,0.8,4.2,1.2c-0.7,0.2-2,0.7-2.7,1
+			c-0.2,2.4-0.1,4.9-0.1,7.4c-0.1,0.3-0.3,0.8-0.4,1c-1.3-1.2-2.7-2.5-4-3.7c-0.8,0.1-1.6,0.1-2.5,0.2c-3.9,0.7-6.6,4.2-10.5,4.8
+			c-0.4,1-0.7,2-1,2.9c-0.6-1.9-1.2-3.9-1.7-5.8c0.1-0.4,0.3-1.2,0.5-1.6c4.2,0.5,8.1-0.8,11.9-2.5c0-1.3,0.1-2.6,0.1-3.9
+			c-1.9,0.1-3.8,0.3-5.6,0.8C646.7,482.5,645.4,482.1,644.4,481.3z"/>
+		<path class="st7" d="M412.7,477.4c2.1,0.8,5.2,1.9,4.8,4.7c-0.8,1-1.6,1.9-2.5,2.8C412.4,483.1,412.3,480.1,412.7,477.4z"/>
+		<path class="st7" d="M823.2,485.3c2.3-3,4-7.4,8.5-7.2c-0.1,1.4,0,2.9-0.4,4.3c-1.1,1.7-3.4,1.7-5.1,2.5c0.1,0.9,0.1,1.9,0.2,2.8
+			c1.1,0.9,2.2,1.7,3.4,2.6c-1.6,2.3-3.7,4.1-6.2,5.5c-2.7-2.7-6.4-2.4-9.9-1.9c0.6-1.6,0.4-3.9,2.2-4.8c1.5-0.6,3.2-0.4,4.9-0.5
+			c0.5-0.7,1-1.3,1.5-2C822.5,486.2,823,485.6,823.2,485.3z"/>
+		<path class="st7" d="M848.4,479.1c1.4-0.9,2.9-2.3,4.7-1.4c1.2,1.1,0.7,3.1,0,4.4c-1.6,0.4-3.2,0.5-4.8,0.7
+			C848.3,481.6,848.3,480.4,848.4,479.1z"/>
+		<path class="st7" d="M536.1,481.3c1.6-1.6,4-1.8,6.1-2.5c-2,4.3-5.4,7.7-8.7,11c0.1,1.7,0.2,3.4,0.3,5c-1-0.5-2.1-1-3.1-1.5
+			c-0.4-2.1-0.7-4.2-1.1-6.3C531.9,485.3,534,483.4,536.1,481.3z"/>
+		<path class="st7" d="M1014,482.6c2.2-0.7,4.4-1.1,6.7-1.4c0,1.5,0,3,0,4.6C1017.8,486.2,1015.5,485,1014,482.6z"/>
+		<path class="st7" d="M10.5,482.4c1.3-0.5,2.3,0.8,3.3,1.4l-0.6,0.9c-2,2.9-4,5.9-7,7.9c-0.6-0.5-1.7-1.6-2.3-2.2
+			C6.2,487.8,8.2,485,10.5,482.4z"/>
+		<path class="st7" d="M794.6,486.9c2.3-2,4.8-3.7,7.5-5c1,3.8-2.4,6-4.9,8C796.3,489,795.4,487.9,794.6,486.9z"/>
+		<path class="st7" d="M997.7,493.7c0.3-4,0-9.8,5-10.8c-0.4,2.9-2.2,6.1-0.6,8.9c1.8,2.9,6.9-1.4,7.7,2.1c-1.5,3.1-5.4,4.5-8.4,5.8
+			C999.5,498.3,998.1,496,997.7,493.7z"/>
+		<path class="st7" d="M1024.5,490.9c-0.8-2.4,0.3-4.7,1.4-6.7c1.1,1.6,1.6,3.8,3.4,4.8c3.3,1,6.8,0.3,10.2,0.2
+			c4.4,0.1,8.8,0,13.2,0.4c-4.5,0.5-9.1,0.5-13.6,0.9c-4.2,0.3-8,2.7-10.7,5.8C1027.2,494.4,1025.7,492.8,1024.5,490.9z"/>
+		<path class="st7" d="M153.8,486.2c1.7,1.4,3.4,2.7,5.1,4c-0.2,1.3-0.3,2.7-0.4,4c-3.4,0.5-6.1,2.6-8.7,4.6c-0.1-1-0.2-2-0.4-3
+			c1.2-1,2.6-1.9,3.3-3.4C153.4,490.4,153.6,488.3,153.8,486.2z"/>
+		<path class="st7" d="M674.2,487.2c2.6,1.7,5.8,2.8,7.9,5.3c-0.8-0.2-2.4-0.7-3.2-1c-1.4,1-2.9,2-4.3,2.9c-0.3-0.2-1-0.5-1.4-0.6
+			C673.5,491.6,673.8,489.4,674.2,487.2z"/>
+		<path class="st7" d="M395.7,489.2c2.1,0.7,4.1,1.9,6.4,2.1c1.7-0.5,3.3-1.2,4.9-1.9c2.1,0.7,4.1,1.5,6.2,2
+			c-5.7,1.1-10.9,4.7-13.5,10c-1.4-1.2-2.8-2.3-4-3.6C396.1,495,396.6,492,395.7,489.2z"/>
+		<path class="st7" d="M655.3,493.2c1.2,0,2.3,0.1,3.5,0.1c0,0.6,0.1,1.9,0.1,2.5c-1.2,0-2.4-0.1-3.6-0.1
+			C655.3,495.1,655.3,493.8,655.3,493.2z"/>
+		<path class="st7" d="M965.9,496.8c2.5-0.7,4.8-1.9,7-3.4c1.6,3,3,6.2,4,9.5c-2.4-2.3-5.1-4.3-8.1-5.6c-0.1,0.8-0.3,2.3-0.4,3.1
+			C967.5,499.2,966.7,498,965.9,496.8z"/>
+		<path class="st7" d="M1720.2,493.3c1.3,0.2,2.7,0.1,3.9,0.6c1,3.3,0,6.9-0.7,10.1c-1-1.9-1.1-4-1.2-6
+			C1721.4,496.5,1720.7,495,1720.2,493.3z"/>
+		<path class="st7" d="M804.1,501.1c2.3-1.9,4.7-3.7,7-5.4c0.4,0.1,1.3,0.3,1.7,0.5c-1.5,3.7-4.1,6.9-4.3,11.1
+			C806.2,506,804.6,503.6,804.1,501.1z"/>
+		<path class="st7" d="M21,500.9c0.2-1.9,0.7-3.8,2.8-4.1c0,1.5,1.7,3.7,0.1,4.9C22.9,501.5,22,501.2,21,500.9z"/>
+		<path class="st7" d="M834.7,498.9c1.6-0.6,3.1-2.4,4.9-1.3c0,3.3-1.2,6.9-4.6,8.1C832,504.2,834.3,501.1,834.7,498.9z"/>
+		<path class="st7" d="M674.3,498.3c0.6-0.2,1.9-0.5,2.5-0.6c0.3,0.5,0.9,1.4,1.2,1.9c0.3-0.1,0.8-0.3,1.1-0.4
+			c2-0.8,5.3-1.3,5.1,1.9c-1.3,1-2.8,1.7-4.3,2.4c0.5,0.3,1.5,1,1.9,1.3c-2,0.4-4,0.7-6,1.1c-0.4-1.2-0.7-2.4-1-3.5
+			c-0.3-0.9-0.5-1.8-0.8-2.6C674.1,499.4,674.2,498.7,674.3,498.3z"/>
+		<path class="st7" d="M500.2,502.3c1.7-1.3,3.3-2.8,5.3-3.6c1.2,1.2,3.2,2.2,3,4.3c-0.6,2.3-2.4,4-3.8,5.9
+			c-1.7-1.8-3.2-3.9-4.3-6.1L500.2,502.3z"/>
+		<path class="st7" d="M531.3,500c1.9,0.1,4,0.8,3.1,3.2c-1-0.1-3-0.3-4-0.4c0.1-0.4,0.4-1.3,0.5-1.8L531.3,500z"/>
+		<path class="st7" d="M793.5,499.6c2.4,1.7,0.9,3.8-0.4,5.6c-0.3,0.5-1,1.4-1.3,1.9c0.3,1.9,0.6,3.9,0.9,5.8c2.6,2,4.5,4.8,6.2,7.7
+			c-2.6,1.6-5.1-0.7-7.5-1.6c-0.7-6.1-0.8-12.4-3.3-18.2c0.5,0.5,1.5,1.6,1.9,2.1C791.1,501.8,792.3,500.7,793.5,499.6z"/>
+		<path class="st7" d="M811.9,503.9c1.5-2.2,4.1-4.9,7-4c0,1.3,0,2.6,0,3.9C816.6,504.6,814.1,505,811.9,503.9z"/>
+		<path class="st7" d="M19,501.9c0.8,0,2.4,0.1,3.2,0.1c-0.4,1.2-0.7,2.4-1.1,3.6c-0.4-0.3-1.3-1.1-1.8-1.4
+			C19.2,503.6,19,502.5,19,501.9z"/>
+		<path class="st7" d="M348.5,512.7c4.2-2.5,7.8-6.2,10.6-10.3c3.2,1.1,7.1,1.3,9.2,4.3c-0.5,1-1,1.9-1.4,2.9
+			c-4.7-0.8-9.4,0.1-13.1,3.2c-0.2,1.8,0.3,3.8-0.6,5.5c-1.5,0.2-3.6,0.8-4.6-0.8C347.1,516.1,348,514.3,348.5,512.7z"/>
+		<path class="st7" d="M393,512.2c2.3-2.5,4.7-5.1,5.8-8.4c-0.8,3.7-1.4,7.5-1.5,11.3c-1.3-0.2-2.6-0.3-3.9-0.5
+			C393.3,513.9,393.1,512.8,393,512.2z"/>
+		<path class="st7" d="M490.2,511.8c2.6-2.3,4.7-5.2,7.7-7c-0.8,1.1-1.6,2.2-2.3,3.3c1.6,2.6,4.1,5,4.3,8.3c-0.5,0.3-1.4,1-1.8,1.3
+			c-1.7-1.5-3.2-3.3-4.7-5C492.2,512.4,491.2,512.1,490.2,511.8z"/>
+		<path class="st7" d="M1196,506.8c1.1-0.4,2.4-0.8,3.6-0.3c0.5,2.3-0.8,4.2-2.6,5.6c-2.4,2.4-6.2,2-9.1,3.6
+			c0.6-2.4,1.4-4.8,2.2-7.2C1192.4,509.2,1194.8,509.2,1196,506.8z"/>
+		<path class="st7" d="M1208.5,510.3c2.8-1.1,5.8-1.9,8.9-1.8c0.7,0.9,1.4,1.8,2.1,2.8c-0.9,1.2-1.8,2.4-2.7,3.6
+			c-0.4,0.5-1.1,1.5-1.5,2c-2.6-0.4-5.3-1.2-6.8-3.4C1208.6,512.4,1208.6,511.3,1208.5,510.3z"/>
+		<path class="st7" d="M798.9,508.7c4.8,1.6,7.3,6.3,11.3,9.1c1.2,0.7,2.3,1.3,3.5,2c-1.4,4-3.4,8.1-7.7,9.5c-1-0.9-2-1.8-3-2.6
+			c1.6-1.1,3.1-2.2,4.7-3.3C807.1,517.2,798.9,515.2,798.9,508.7z"/>
+		<path class="st7" d="M386,511.9c-0.3-1.4,0.3-2.1,1.7-2.2C388.3,511.5,387.7,512.2,386,511.9z"/>
+		<path class="st7" d="M661.1,513.6c0.8-0.1,1.6-0.2,2.4-0.2c2.2,4.3,3.3,9.4,6.7,13c0.2,1.4,0.4,2.9,0.7,4.3c-2-1-4.1-1.4-6.3-1.6
+			c-0.2-0.4-0.6-1.1-0.9-1.5c0.2-0.6,0.5-1.9,0.7-2.5c-0.6-0.6-1.2-1.2-1.8-1.8c1-0.1,2.9-0.3,3.8-0.4c-0.7-1.3-1.3-2.9-3-3.2
+			c-2.2-0.8-4.4-1.9-5.9-3.8C658.8,515.2,660,514.4,661.1,513.6z"/>
+		<path class="st7" d="M980.7,514.9c0.1-2.6,3.2-2.8,4.6-1c0.5,2-0.1,4.1-0.4,6.2c0.9,1.1,1.8,2.2,2.7,3.3c-1.8,3.1-5.9,1.5-8.6,3.4
+			C980.6,523,980.7,518.9,980.7,514.9z"/>
+		<path class="st7" d="M1498,517c2.5-2.5,5.6-4.6,9.2-4.7c0.4,3,1.5,5.9,2.3,8.8c-0.5,0.9-1,1.7-1.6,2.6c-1.2-0.1-2.3-0.1-3.4-0.1
+			c-0.1-0.7-0.2-2-0.2-2.6C1501.9,520,1499.6,519,1498,517z"/>
+		<path class="st7" d="M520.1,518.8c0.4-1.3,0.1-3.3,1.9-3.8c0.6,0.1,1.9,0.2,2.6,0.2c0.4,0.5,1.2,1.5,1.6,2
+			C524.1,517.8,522.1,518.3,520.1,518.8z"/>
+		<path class="st7" d="M477,527.7c1.9-2.8,3.9-5.5,6.1-8.1c0.6,1.8,1.4,3.5,1.5,5.4C482.7,527.2,479.3,526.2,477,527.7z"/>
+		<path class="st7" d="M672.7,525.4c0.9-1.5,1.8-3.1,3.1-4.5c0.8,0.5,1.6,1.1,2.3,1.7c-0.7,1.8-1.4,3.7-2.1,5.6
+			C675,527.3,673.8,526.4,672.7,525.4z"/>
+		<path class="st7" d="M1203.3,522.3c1,0.1,2,0.2,3.1,0.2c0.1,1.8,0.3,3.6,0.4,5.4c-0.6,2.3-1.4,4.4-2.3,6.6c-0.2-2,0.3-3.9,1-5.7
+			C1203.5,527.2,1202.9,524.8,1203.3,522.3z"/>
+		<path class="st7" d="M679.7,523.9c1,0.4,2.1,0.8,3.2,1.1c-0.3,0.6-0.8,1.7-1.1,2.2c0.7,0.1,2.1,0.4,2.8,0.5
+			c-0.1,0.8-0.2,1.6-0.3,2.4c-2,0.4-4,0.9-6,1.4C680.6,529.5,681,526.6,679.7,523.9z"/>
+		<path class="st7" d="M1515.1,524.9c2.8,0.6,5.6,2.2,6.4,5.2c-1.1,1.8-3.5,1.4-4.8,0.2C1515.5,528.7,1515.4,526.7,1515.1,524.9z"/>
+		<path class="st7" d="M343,530.8c1.2-1.3,2.2-3.1,4-3.7c1.9,0,3.8,0.3,5.6,0.6c0.8,2.7-1,5.1-3.4,6
+			C346.9,533.2,345,531.9,343,530.8z"/>
+		<path class="st7" d="M483.3,530.9c3.3-0.5,5.8-3,8.7-4.2c0.2,1.5-0.4,3-0.6,4.4c2.9,0.8,5.2,2.6,7.1,4.8c-1.2,0.8-2.5,1.6-3.7,2.4
+			c-1.7-1.3-3.3-2.6-5.2-3.6c-1.9-0.9-3.9,0-5.8,0.3C483.3,533.7,483.4,532.3,483.3,530.9z"/>
+		<path class="st7" d="M794.7,528.6c1.3-0.3,2.6-0.2,3.9-0.3c0,1.9,0.1,3.8,0.2,5.7c1,1.6,3,3.6,1.4,5.5c-2.6-1.7-7.1-2.7-6.8-6.5
+			C793.2,531.4,793.8,529.8,794.7,528.6z"/>
+		<path class="st7" d="M687.4,534.9c1.2-2.2,2.8-4.2,5.2-5.3c0,1.3-0.1,2.6-0.2,3.9c-0.5,0.9-0.9,1.8-1.5,2.6c-0.4,0-1.2,0-1.5,0
+			C688.9,535.8,687.9,535.2,687.4,534.9z"/>
+		<path class="st7" d="M697.9,532c2.4-2,5.9-3.7,9-2c2.1,0.8,1.3,3.4,1.7,5.1c0.7,0.1,2.1,0.2,2.9,0.3c0.5,0.5,1,1,1.4,1.5
+			c-0.2,0.5-0.6,1.5-0.8,2c-3.3,1.1-4.6,4.3-6,7.2c-0.4,0.3-1.3,0.8-1.8,1c-0.7-1.3-1.4-2.6-2.3-3.8c2.8-1.9,5.2-4.4,6-7.8
+			c-1.1,0-3.3-0.2-4.4-0.2c-0.6,1.4-1.3,2.9-1.9,4.3c-2.2-0.2-4.7-0.6-5.8-2.8C694.6,535,696.4,533,697.9,532z"/>
+		<path class="st7" d="M390.2,534.6c0.5-1.1,1.1-2.2,1.6-3.3c0.7,0.2,2.2,0.5,2.9,0.7c0.2,0.8,0.6,2.4,0.8,3.2
+			c-0.4,0.4-1.2,1.3-1.7,1.7c-1.6,3.1-1.6,6.6-2.3,9.9c-1.1,1.5-2.8,2.3-4.1,3.6c-0.8,2.7-0.8,5.5-1.1,8.3c-2.1-0.3-4.2-0.7-6.4-1.1
+			c1.7-0.4,3.5-0.7,5.2-1.3c2.4-1.7,0.4-5.9-2.3-5.3c-3.1-0.1-3.4,3.4-4.5,5.5c-0.9-0.2-1.8-0.3-2.6-0.4c-0.3-1.8-0.5-3.6-0.7-5.4
+			c-0.3-0.3-1-0.8-1.3-1.1c-1.9,0.2-4.1,1.4-5.5-0.5c-0.1-2.1,0.9-3.9,2.2-5.4c2.3-2.9,4.1-6.1,6.5-8.8c0.5,1.7,1,3.3,1.5,5
+			c-2.1,1.9-3.9,4.3-2.7,7.2c1.1-1,2.2-1.9,3.3-2.9c1.5,1.5,3,3,4.4,4.6c1.6-1.3,4.5-2.2,4.1-4.7c-0.4-1.4-1.3-2.5-2-3.8
+			c1.7-0.7,3.3-1.4,5-2.1C390.6,537,390.4,535.8,390.2,534.6z"/>
+		<path class="st7" d="M836.1,536c1.3-1.8,3.5-2.8,5.4-3.8c0.2,12.2,0.3,24.5,0.6,36.8c-0.9,8.4-0.3,16.9-0.5,25.3
+			c0.2,0.4,0.5,1.1,0.6,1.5c1.5,0.9,3.3,0.4,4.9,0.3c2.2-0.3,4.5-0.6,6.8-0.6c28,0.2,55.9,0,83.9,0.2c-0.4,0.7-1.1,2.1-1.4,2.8
+			c2.3,0.9,4.7,1.3,7.1,1.2c-0.4-1.3-0.9-2.6-1.3-3.8c2.5,0,5,0,7.6,0l0,0.4c-1.4,3.6-2.4,7.3-4.4,10.6c-3-0.7-6-1.3-8.9-1.9
+			c0-1.3,0.1-2.7,0.1-4c-1.3-1.3-2.6-2.5-4-3.7c-4.4,0.7-8.7-0.5-13.1-0.7c0,1.8,0.1,3.6,0.2,5.4c1.2,1.6,2.1,3.4,2.8,5.3
+			c-0.5,0.4-1.5,1.2-2,1.5c-1.3-1.2-2.5-2.5-3.8-3.6c-1-0.7-1.9-1.4-2.9-2.1c-0.6-2.1-1.2-4.2-1.7-6.3c-6.7-0.1-13.4-0.1-20.2,0
+			c-0.6,0.7-1.2,1.4-1.8,2.1c-2.6-2-5.9-2.4-9.1-2.1c-5.5,0.4-11.3-1.2-16.3,1.6c-4.1-2.5-9.2-1-13.8-1.5c-2.6-0.4-3.8,2.1-5.1,3.8
+			c-1.7,2.3-3.5,4.6-4.9,7.1c-1.2,1.8-1.9,5-4.8,4.2c-2.7,0.3-2.8-2.8-2.8-4.7c3.3-0.3,6.5-1.7,7.7-5.1c1.1-1.9,2.3-4.1,0.3-5.9
+			c0-2.9-0.1-5.8-0.4-8.7c-3.1,2.4-2.3,6.4-2.2,9.8c-2.1,0.9-4.3,1.6-6.5,2.2c-1.7-0.4-3.4-0.8-5-1.1c-2-5.1-3.4-10.8-7.5-14.7
+			c0-1.8,0.1-3.6,0.1-5.4c0.9-0.8,1.8-1.5,2.8-2.2c0.1-4.1,0.2-8.3-1-12.3c1.7,1.2,3.5,2.5,5.2,3.8c0,2.3,0.1,4.6,0.2,7
+			c1.6,0,3.2,0.1,4.8,0.1c0.1,2,0.2,4.1,0.3,6.1c2-0.2,4.6,0.3,6-1.5c1.6-1.6,1.2-4,1.5-6c-1.8-0.5-3.6-1-5.4-1.6
+			c1.2-4.1,2.6-8.1,3.8-12.3c0.8,4.5-0.1,9.6,2.9,13.4c0.3-3,0.4-6,0.3-9c0.4-7.2-0.7-14.4,0.2-21.6c-2.3,0.2-4.6,0.5-6.9,0.7
+			C834.6,540.3,834.6,537.8,836.1,536 M825.5,583.7c2.7,3.4,5.3,7,7.2,10.9c0.5,0,1.4,0.1,1.9,0.1c0.7-2.5,1.1-5,1.3-7.6
+			c-1.2,1.6-2.4,3.4-4.3,4.2c-0.3-2.3,1.1-4.1,2.3-5.9c-1.4-1.7-2.7-3.4-3.9-5.2C828.1,580.9,826.7,582.2,825.5,583.7z"/>
+		<path class="st7" d="M682,535.1c1.6-0.5,2.1,0.1,1.7,1.8C682,537.3,681.5,536.7,682,535.1z"/>
+		<path class="st7" d="M2.5,538.7c2.5-0.6,5.1-1.3,7.6-2.2c-0.4,2.4-1.1,5.1-4,5.4c-1.3-0.3-2.6-0.6-3.9-1
+			C2.2,540.4,2.4,539.3,2.5,538.7z"/>
+		<path class="st7" d="M818.7,536.8c1.7-1.9,4.1-1.2,6.1-0.3c-0.9,1.8-1.8,3.5-2.8,5.3c1.2,1,2.4,2,3.6,2.9c-1,1.2-2,2.4-3.1,3.6
+			c-3.8,4.1-7.1,8.9-12,11.9c-1.6,1-3.2,1.9-4.8,2.9c-0.5-4.1,3.3-6.4,6-8.8c0.8-0.6,1.6-1.3,2.4-1.9c2.1-1.5,4-3.3,5.8-5.3
+			c0.7-0.7,1.5-1.3,2.2-2c-0.4-0.7-0.9-1.4-1.4-2C819.6,541.3,817.5,539.2,818.7,536.8z"/>
+		<path class="st7" d="M500.3,537.7c0.5-0.1,1.5-0.3,2-0.5c0.1,2,0.2,4,0.3,6c-1.2,0.8-2.4,1.6-3.6,2.3c-2.4,0-4.6-0.9-6.8-1.6
+			c0-0.6,0-1.9,0-2.5c1.5,0,2.9,0.2,4.4,0C498.2,540.5,499.1,539,500.3,537.7z"/>
+		<path class="st7" d="M144.7,540.8c0.9,0,2.7,0,3.6,0c0,2.2-2,3.1-3.6,4.1C144.7,543.5,144.7,542.1,144.7,540.8z"/>
+		<path class="st7" d="M352.3,540.5c0.6,0.2,1.7,0.5,2.3,0.7c0.2,9.3-1.7,18.5-1.8,27.8c1.6,0.8,3.2,1.6,4.8,2.3
+			c-1.1,2.1-3.1,3.3-5.2,4.2c-0.6,4.2-0.9,8.5,0,12.7c1.5-2,3-3.9,4.7-5.7c2.1,1.1,3.4,3.2,3.6,5.5c-2.1,0.9-5.7,1-5.5,4
+			c-0.1,2.4,3.4,0.8,4.8,1.1c0.3,0.4,0.9,1.2,1.2,1.5c-2.6,2.2-5.4,4.4-6.5,7.7c-1.1,0-2.3,0-3.4,0c0.4-10.2-0.9-20.4,0.4-30.5
+			c1-7.9,0.2-16,1.5-23.9c0.1-2.4,1.3-5.5-1.1-7.3L352.3,540.5z"/>
+		<path class="st7" d="M395.5,542.4c0.4-0.5,1.2-1.5,1.6-2c-0.2,12.9,1.3,25.7,1.2,38.5c-1.4-1.2-2.6-3.2-4.7-2.4
+			c-1.7,4.1,1.7,7.5,3,11.2c-0.2,1.8-1.3,3.2-2.5,4.5c-1.9-0.5-3.6-2-5.6-1.8c-1.3,2.8,0.6,5.5,1.5,8.1c-1.2,0.3-2.4,0.7-3.6,1
+			c-1-1.3-2-2.6-3.1-3.9c-0.6,2-1.1,4-1.8,5.9c-2.5,2.8-6.4,3.8-10,4.3c0,1.9,0,3.9,0,5.8c5.2-0.1,8.3-4.6,11.5-8
+			c0.7,2.3,1.4,4.6,2,6.9c-1,0.4-2.1,0.8-3.1,1.3c-1.7,4-6.7,5.9-7,10.5c-2.4,3.3-4.6,7.1-8.8,8.4c0.7,1,1.3,2.1,2,3.2
+			c-0.2,1.7-0.4,3.3-0.6,5c-2-0.8-4-1.7-5.6-3.1c-0.2-0.5-0.7-1.6-0.9-2.1c-1.1-1.8-3-2.9-4.8-3.9c-1.6,3.8-3.2,7.6-4.1,11.7
+			c-0.6,7.5-1.1,15.1,0.4,22.5c-1.4,6.3-0.9,12.7-0.8,19.1c0.2,3.7,0.5,7.4,0.5,11.1l-1.2,0c-0.8-9.4,0.3-18.8-0.1-28.3
+			c0-19.4,0.5-38.8,0.3-58.2c0.6,1.2,1.2,2.4,1.9,3.6c1.1-2.5,1.4-5.3,2.1-7.9c5.2-1,8.7-5.1,12-8.9c0.1-0.2,0.3-0.5,0.4-0.6
+			c-0.1-2.9-0.2-5.9-1-8.7c-1-2-3.7-2.1-5.5-3c0-1-0.1-1.9-0.1-2.9c0.7-0.1,2.1-0.3,2.8-0.4c1.5-0.2,3-0.4,4.6-0.6
+			c-0.1-3.8-0.1-7.5,0-11.3c-1.1-1-2.3-2-3.4-2.9c1.8-1.3,3.7-2.7,5.5-4c1,4.4,0.8,8.9,0.8,13.4c1.4,1.1,2.7,2.2,4.1,3.4
+			c-1.9,1.5-3.9,3.1-4.6,5.6c1.1,0,2.1,0,3.2,0c1.1-2,2.4-3.8,3.4-5.8c0.1-2.4-1.5-4.6-2.3-6.8c1.2-0.8,2.5-1.6,3.8-2.5
+			c1.1,0.8,2.2,1.5,3.3,2.3c0-0.9-0.1-1.8-0.1-2.6c1.2-0.3,2.3-0.6,3.5-1c1.4-1.6,2.2-3.5,3.1-5.4c2.6-0.6,5.1-1.4,7.6-2.4
+			c-0.7-1.8-1.4-3.5-2.1-5.2c0.7-1.4,1.4-2.7,1.9-4.1c-0.1-1.6-1-3.1-1.6-4.5C394.9,543.8,395.2,543.1,395.5,542.4 M373.5,586.3
+			c0,0.6,0,1.8,0,2.4c1.3,1.1,2.8,2.7,4.4,1c1.8-3.2,3.2-6.6,4.9-9.8C380.6,583.6,375.9,583.1,373.5,586.3 M354.3,618.8
+			c1.7,2.3,6.5,1.7,7.1-1.4c1.1-1.7,0-3.4-1.1-4.7C358,614.4,354.9,615.8,354.3,618.8z"/>
+		<path class="st7" d="M676.2,541.3c0.8-1.3,3.4-0.2,2.2,1.2C677.6,543.9,675,542.7,676.2,541.3z"/>
+		<path class="st7" d="M1214,547.4c2.7-1.8,4.5-6.4,8.3-4.8c5.4,1.5,6.1,7.8,7.3,12.4c0.5,4.5-5.5,3.4-8,5.5
+			c-1.4-0.9-2.8-1.9-4.2-2.9C1217.3,553.9,1216,550.5,1214,547.4z"/>
+		<path class="st7" d="M1531.3,541.5c2,2.9,1.3,6.6,1.2,9.9c2,0.9,4.4,1.9,6.6,0.7c2.2-2.9-0.5-9.1,4.6-9.4
+			c-0.2,3.8-0.4,7.5-0.5,11.3c1.4,0.3,2.9,0.5,4.3,0.8c0.6-0.5,1.7-1.6,2.3-2.2c3,7.5,5.2,15.3,7.9,22.9c-0.5,0.2-1.4,0.8-1.9,1
+			c-0.5,2.5-0.3,6.5-3.8,6.7c-3.8-0.2-7.5-1-11.2-0.6c0.7-3.5,0.5-7.2,0.9-10.8c0.5-2.8,3.8-2.8,5.9-3.6c0.6,0.8,1.2,1.7,1.8,2.5
+			c2.1,0.1,5.4-0.5,4.3-3.4c-2.4-2.8-4.9-6.6-8.8-7.3c-4-0.1-4.3,4.7-5.4,7.4c-2.1,1.6-4.8,2.4-6.8,4.2c-1,3,0.7,6.4-0.6,9.3
+			c-2.4,2-6,1.7-8.5,3.7c-1.6,3.5,1.9,6.7,3,9.8c-1.7,0.4-3.3,0.8-5,1.1c-1.9-1.8-4-3.3-6.3-4.6c0.4-1.1,0.7-2.2,1.2-3.4
+			c-1.2-1-2.3-2.1-3.5-3.1c-0.2,0.9-0.5,2.8-0.7,3.7c-0.6-2-1.2-3.9-1.8-5.9c2.6,0.9,6.5,2.5,8.3-0.7c2-2.7-1.4-4.8-2.8-6.8
+			c-1.6-1.3-1.5-3.5-1.7-5.4c5-1.4,10.1,0,15.1-0.9c0.4-1.6,0.8-3.2,1.2-4.9c-1.4-1.1-2.8-2.2-4.2-3.3c-0.1-1-0.1-2.1-0.1-3.1
+			c1-0.9,2.1-1.8,3-2.9c0.3-2.1,0-4.3,0-6.4C1529.8,545.9,1530.5,543.7,1531.3,541.5 M1522,574.1c1.9,1.6,3.8,3.1,5.8,4.6
+			c0.7-1.5,1.3-3.3,0.6-5C1526.3,572.8,1524,573.3,1522,574.1z"/>
+		<path class="st7" d="M674.8,547.9c2.9-1.6,5.4-4.5,8.9-4.1c0.3,0.5,1,1.6,1.3,2.1c-1.2,0.6-2.4,1.2-3.6,1.7
+			c-0.2,0.4-0.7,1.2-1,1.6c-1,0.5-2,1.1-3,1.6c0.5,2.5,1.1,5,1.7,7.5c1.7,2.2,4.9,1.5,7.3,2.4c-0.5,1.2-1.3,1.9-2.5,2.2
+			c1.5-2.5-2.5-2.7-2-0.1c-0.3,0.5-0.9,1.7-1.2,2.2C678.8,559.4,676.9,553.7,674.8,547.9z"/>
+		<path class="st7" d="M519.3,545.2l0.5-0.4c-5.7,12.7-8.9,26.5-11.1,40.2c-2,8.2-0.9,16.7-1.2,25c-5.1,1.9-9.9-1.7-15-1.4
+			c0.4-1.8,1.2-3.4,2.2-4.9c0.1,1.5,0.2,3,0.3,4.4c0.8,0,2.5,0.1,3.4,0.2c0-0.8,0-2.4,0-3.1c0.9,0.8,1.9,1.6,2.8,2.4
+			c2.3-2.2,4.6-4.6,5.7-7.7c-2.8-1.3-5.2,1.4-7.5,2.6c0.1-1.4,0.2-2.8,0.3-4.1c1.2-0.8,2.5-1.6,3.7-2.4c-1.6-1-3.3-1.9-5-2.7
+			c-0.5,0.6-1.4,1.9-1.9,2.5l0,0c-0.7-1.1-1.4-2.2-2.1-3.4c1.6-0.5,3.2-1,4.8-1.6c2,0.5,3.9,1,5.9,1.5c-0.9-1.5-1.7-2.9-2.6-4.3
+			c0.4-0.1,1.3-0.3,1.7-0.4c0.1-1.4,0.2-2.9,0.3-4.3l0.8,0.6c0.6,0.5,1.8,1.4,2.4,1.8c0.3-1.2,0.5-2.4,0.8-3.6
+			c-0.2-0.2-0.7-0.7-1-0.9c1.2-2.4,2.2-4.9,2.9-7.5c0.2-2.3-0.1-4.6-0.6-6.8c0.2-0.3,0.7-1,0.9-1.4c2.3-3,3.5-6.7,4.2-10.4
+			c-1.7,0.6-3.3,1.4-4.8,2.4c-0.6,0.1-1.8,0.2-2.4,0.3c-0.3-0.4-1-1.1-1.3-1.5c-0.5,0.1-1.6,0.4-2.1,0.5c-0.5-0.3-1.6-0.8-2.1-1
+			c3.8-3,8.7-3.6,13.3-3.2c0.3-0.4,0.8-1.1,1-1.4c-0.7-0.2-2.1-0.6-2.8-0.7c1.5-1.5,3-3,4.6-4.3C518.2,546,518.9,545.4,519.3,545.2
+			 M508.3,554.1c-1.9,0.4-1.1,3.4,0.7,2.9C511.1,556.7,510.2,553.4,508.3,554.1z"/>
+		<path class="st7" d="M17.3,548.2c1.4,0.7,2.9,1.4,4.3,2.2c0.1,1.1,0.1,2.3,0.2,3.4c-0.7,0.2-2,0.6-2.6,0.8c0,1.3-0.1,2.6-0.1,4
+			c0.8,0.2,2.4,0.7,3.3,1c-2.8,0-5.7,0.5-8.4-0.4c-1.1-0.9-1.3-2.5-2-3.8c0.5,0,1.6,0.1,2.2,0.1c0.9,1.4,1.8,2.7,2.8,4.1
+			c1.6-3.2,1.2-6.6-0.5-9.7C16.6,549.4,17,548.6,17.3,548.2z"/>
+		<path class="st7" d="M497.4,548.9c1.4,0.3,2.8,0.7,4.2,1c-1,1.9-1.8,4.1-3.6,5.5c-0.3-0.5-0.9-1.7-1.2-2.2
+			C497,551.8,497.1,550.3,497.4,548.9z"/>
+		<path class="st7" d="M1483.9,560.6c1.3-3.7,2.6-7.4,4.5-10.8c-0.8,3.8-1.9,7.6-3.5,11.1c-2,4.3-3.2,8.9-4.8,13.3
+			c0.1-0.8,0.2-2.2,0.2-3c-4.3-1.3-7.7-4.6-8.3-9.2c1.3-2.1,3-3.9,4.4-5.8c1.2-1.8,2.9-3.1,4.9-4
+			C1481.7,555,1480.8,558.8,1483.9,560.6z"/>
+		<path class="st7" d="M1458.3,562.1c1.2-3.4,2.4-6.8,3.2-10.3c0.2,3.4,2,6.3,3.6,9.2C1462.8,561.4,1460.5,561.7,1458.3,562.1z"/>
+		<path class="st7" d="M696,557.9c3.4-1.5,6.7-3.2,10.1-4.8c1,0.1,2,0.3,2.9,0.6c-1,1.8-1.8,3.7-1.7,5.8c3.4,0.2,7.2-0.6,10.3,1.3
+			c-2,2-3.9,4.1-5.2,6.6c-1.2,2.4-4,3.4-5.4,5.6c-1.3,1.7-2,3.9-3.7,5.3c-1.6,0.3-3.3,0.2-4.9,0.2c0-2.4,1.1-5.9-1.9-7
+			c-2.8-1.4-5.1,1.4-7.7,1.5c-1.4-1.5,1-2.3,1.8-3.3C694.3,566.9,694.8,562,696,557.9 M705.2,567.2c-0.6,1.6,0,2.2,1.6,1.7
+			C707.4,567.2,706.8,566.6,705.2,567.2z"/>
+		<path class="st7" d="M1704.3,554.2c1.5-1.2,2.8,1.6,1.5,2.6C1704.2,558,1702.9,555.1,1704.3,554.2z"/>
+		<path class="st7" d="M1714.7,553.8c1.4-0.4,3.4,0.3,3,2.1c0.5,1.5-2.8,1.5-2.8,0.1C1714.8,555.5,1714.8,554.4,1714.7,553.8z"/>
+		<path class="st7" d="M137.8,555.5c4.1-1.6,5.3,6.2,1.2,6.1C135.7,561.7,135.9,557.2,137.8,555.5z"/>
+		<path class="st7" d="M465.8,561.4c1.8-2.3,4.2-3.9,7-4.7c2.9,2.3,5.1,5.3,7,8.5c1.7,3,5.6,2.3,8.6,2.4c0.2,0.7,0.5,2,0.6,2.6
+			c-3.2-0.6-6.4,0.3-9.6-0.5c0,0.5,0,1.4,0,1.9c2.1-0.4,4.3-0.9,6.4-1.3c-0.8,1.2-1.5,2.5-2.3,3.8c0.6,0.2,1.3,0.5,1.9,0.7
+			c0-0.9,0.1-2.8,0.1-3.8c3.1,0.5,5.2,2.9,7.4,5c-0.7,0.6-1.3,1.1-2,1.7c-4.2-1.2-8.5-2.4-12.2-4.8c-0.2-0.4-0.5-1.3-0.7-1.7
+			c-0.9-2-1.7-4.3-3.9-5.2C471.2,564.8,468.1,563.8,465.8,561.4z"/>
+		<path class="st7" d="M176.2,563.7c1.5-0.4,3.1-0.8,4.6-1.2c1.3,1.8,2.9,3.7,2.8,6.2c-1.1,1.2-2.8,0.8-4.2,1.1
+			C177.9,568,176.8,565.9,176.2,563.7z"/>
+		<path class="st7" d="M800.4,562.2c1.5,0.3,3,0.7,4.5,1c-0.2,1.1-0.5,2.1-0.7,3.2c-1.2,0.7-2.4,1.4-3.5,2.2c-3.8,1.5-2.3,6-1.3,8.9
+			c1.7,2.9,2.7,6.4,5.5,8.4c1-3.5,1.8-7,1-10.6c-1-4.1,2.9-7,5-9.9c2.5,0.6,5,1.3,7.5,2.2c-1.6,0.9-3.2,1.7-4.9,2.6
+			c0.8,2,1.8,3.9,2.1,6.1c-0.2,1.9-1.4,3.4-2.2,5.1c-1.3,0.5-2.6,0.9-3.9,1.4c-1.6,3.9-1.6,8.2-2.4,12.2c-2.1,4-7.7,5.4-8.7,10.2
+			c-2.2,0.6-4.5,1.2-6.7,1.8c-0.1-3.9-0.1-7.8,0-11.8c0.8-0.1,2.4-0.5,3.1-0.6c0.1-2.8,0-5.6-0.4-8.3c-0.7,0.2-2,0.5-2.7,0.6
+			c-0.1-6.5,0-12.9,0-19.4C795.1,566.7,798,564.7,800.4,562.2 M799.2,596c3,0.1,3.7-2.7,4.5-5c-0.8-0.5-2.3-1.3-3-1.8
+			C799.2,591.2,798.2,593.5,799.2,596z"/>
+		<path class="st7" d="M1726.5,561.4c2.2,0.6,4.4,1.2,6.5,2v3.8c-1.6,0-3.4,0.6-4.8-0.3C1727.4,565.1,1726.9,563.2,1726.5,561.4z"/>
+		<path class="st7" d="M1505.5,565c2,0.7,5.4,0.4,6.1,3.1c0.8,3.6-1.7,6.8-2.3,10.2C1507.6,574,1506.8,569.4,1505.5,565z"/>
+		<path class="st7" d="M497.4,572.2c0-1.3,0.3-2.7,1.1-3.8c0.5,0.6,1.5,2,1.9,2.6C499.7,571.3,498.2,571.9,497.4,572.2z"/>
+		<path class="st7" d="M316.5,573.6c1.2-1.4,3-2.2,4.6-3.2c0.7,0.3,2,1,2.6,1.4c0.6,4.3-4.2,6.7-7.9,6.9
+			C313,577.4,315.3,575.2,316.5,573.6z"/>
+		<path class="st7" d="M469.4,574.2c0.8-0.1,2.3-0.2,3.1-0.3c1.2,0.2,2.4,0.4,3.5,0.6c-1.3,0.8-2.6,1.5-3.9,2.4
+			c-0.3,2-0.5,3.9-0.6,5.9c-0.3-0.1-0.8-0.3-1.1-0.4c1.4-1.7,0.6-3.5-0.8-4.8c-0.4,1.4-0.7,2.8-1.1,4.2c-0.4,1-0.7,1.9-1.1,2.8
+			c-0.2,0.5-0.7,1.5-0.9,2c0.5,0.6,1.1,1.2,1.6,1.8c-1,0.7-2,1.5-3,2.2c-0.5-0.3-1.5-0.8-2-1.1c1.2-2.5,2.8-5.1,2.6-8
+			c0.5-0.2,1.6-0.5,2.1-0.7C468.3,578.7,468.8,576.5,469.4,574.2z"/>
+		<path class="st7" d="M460.4,575.2c1-1.5,3.5,0.2,2.4,1.7C461.7,578.3,459.2,576.7,460.4,575.2z"/>
+		<path class="st7" d="M503.8,574.5c1,0.5,1.9,1,2.8,1.6c-0.4,1.2-0.9,2.3-1.4,3.5c-0.4-0.4-1-1.1-1.4-1.5
+			C503.9,577.1,503.8,575.3,503.8,574.5z"/>
+		<path class="st7" d="M1238.2,575c1.8,0.1,4.3,0.5,2.9,3c-0.8,0.1-2.5,0.2-3.4,0.3C1237.8,577.5,1238,575.9,1238.2,575z"/>
+		<path class="st7" d="M323.4,579.6c1.7-0.1,3.4-0.2,5.1-0.4c-0.7,5,4.3,10,0.2,14.4c-4,1.3-3.1-3.6-2.1-5.8
+			C324.1,585.8,322.7,582.9,323.4,579.6z"/>
+		<path class="st7" d="M989.3,579.2c2.3,0.1,4.5,1,6.4,2.1c0.1,1.2,0.2,2.4,0.1,3.6c-3.2,1.2-6.5,0.3-9.1-1.8
+			C987.5,581.8,988.1,580.3,989.3,579.2z"/>
+		<path class="st7" d="M0,581.5c2-0.5,3.9,0,5.2,1.6c-1,0.9-1.9,1.9-3,2.8c-0.8,0.4-1.5,0.7-2.3,1V581.5z"/>
+		<path class="st7" d="M199.3,581c3.6,4.7-0.7,11.1-6.1,11c0.3-1.8-0.1-4,1.9-4.8C197.6,586,198.4,583.3,199.3,581z"/>
+		<path class="st7" d="M687.2,581.2c1.6-0.5,2.2,0.1,1.7,1.7C687.3,583.4,686.7,582.8,687.2,581.2z"/>
+		<path class="st7" d="M1448.7,583.1l0.4,0.3c2.2,2,5.2-2.3,7.6-0.1c3.1,1.5,1.5,5.5,1.9,8.3c-4.2,0.2-8.7,0.7-12-2.4
+			C1447.2,587.1,1447.9,585.1,1448.7,583.1z"/>
+		<path class="st7" d="M206.2,584.4c0.8,0.5,1.7,1,2.5,1.6c-0.1,1.3-0.1,2.6-0.1,3.9c-1.8-0.3-3.8-0.5-5.3-1.7
+			C203,586.2,205,585.5,206.2,584.4z"/>
+		<path class="st7" d="M484.2,583.7c2.2,0.8,4.4,1.7,6.5,3c-0.7,1.4-1.4,2.8-2,4.3c-0.2,0.5-0.7,1.4-0.9,1.9c-0.6-1-1.2-1.9-1.8-2.8
+			c-0.2-0.3-0.6-1-0.8-1.3c-0.3-0.5-0.9-1.5-1.2-2.1C484,585.9,484.1,584.4,484.2,583.7z"/>
+		<path class="st7" d="M1724.6,586.4c0.8-1.1,1.5-2.2,2.4-3.3c0.4,0.3,1.2,0.9,1.6,1.2c1.5,1.1,3,2.1,4.4,3.2v1.5
+			c-0.6,0-1.7-0.1-2.2-0.1C1728.5,588.6,1726,588.5,1724.6,586.4z"/>
+		<path class="st7" d="M996.2,591.3c0.8-2.7,2.4-5.8,5.8-4.6c2.3,2,1.4,5.5,1.5,8.3c0.5,3.5-3.4,5.4-6.3,4.6c-3.2-0.8-6.5-0.3-9.8,0
+			c-2.2,0-3.6-2.7-2-4.4C989.4,595.2,993,593.4,996.2,591.3z"/>
+		<path class="st7" d="M739,589.4l0.8-0.7c0.5,3.1,0.7,6.3,0.8,9.5c-0.3-0.2-1-0.7-1.4-0.9c-1-0.5-2-0.8-3-1
+			c-1,3.9-3.2,7.4-5.4,10.8c0.2,0.9,0.4,1.7,0.6,2.6l-1,0.3c-2.4,0.7-5.3,1.1-6.6,3.5c-1.2,1.2-1.7,3.7-3.8,3.4
+			c-2,0.1-3.9,0-5.9-0.1c0-1.6,0.1-3.1,0.1-4.7c-1.9,0.5-3.8,1-5.7,1.6c-0.6-1.2-2-2.2-1.9-3.7c1.1-2.4,3.4-4.3,6.2-4.2
+			c1.8,1.3,2.9,4.2,5.1,4.6c3.6-2,7.1-4.4,10.2-7.2c2.9-2.5,3.6-6.5,5.6-9.5c1.5-0.8,3.4-0.2,5.1-0.3c0-0.3,0-0.9,0-1.2
+			C739,591.5,739,590.1,739,589.4z"/>
+		<path class="st7" d="M1541.2,594.7c1.9-1.9,3.7-3.7,5.8-5.4c0.4,0.1,1.3,0.4,1.8,0.6c-1.1,3-2.6,5.8-4.4,8.5
+			c0.9,0.6,1.8,1.2,2.8,1.8c1.8-0.7,2.9-2.5,4.3-3.8c0.8,0.3,1.5,0.6,2.3,0.9c-0.3,1.5-0.6,3-0.9,4.6c0.5,0.8,1.1,1.6,1.6,2.5
+			c-0.3,1.4-0.7,2.7-0.9,4.1c2.6,2.3,6.1,1.8,9.3,1.8c0.3,1.1,0.6,2.3,1,3.4c-3.8,0.7-7.1,2.7-9.2,6c-2.6-0.7-5.3-1.4-7.9-2.1
+			c-0.9-3.9-3.4-7-6.2-9.8c1-6.2-5.5-9.4-7.2-14.8l0.2-1.1C1536.2,592.7,1538.7,593.7,1541.2,594.7z"/>
+		<path class="st7" d="M1715.4,593c0-2.9,3.3-3.6,5.3-4.6c0.6,0.5,1.9,1.5,2.5,2c0.3,0.2,0.9,0.7,1.2,1c1.7-0.1,3.6-0.6,5.1,0.6
+			c-0.8,1.1-1.6,2.2-2.6,3.1c-3.2,3.5-7.7,4.9-12.2,5.6c-0.6-1.5-1.3-3-1.9-4.5c1.7,0.5,3.3,1.2,5.1,1.5c1.9-0.6,3.5-1.9,5.3-2.9
+			c-0.7-1-1.3-2-1.9-3C1719.6,593.2,1717,596.5,1715.4,593z"/>
+		<path class="st7" d="M1708.4,590.6c1.1,1.5,2.2,3,3.2,4.6c-0.5,1.5-1.3,3-2,4.4C1706.8,597.3,1707.4,593.7,1708.4,590.6z"/>
+		<path class="st7" d="M1266.8,599.1c-0.7-1.7-0.6-5.2,2-4.6c2.2,1,3.7,3.1,5.8,4.4c0,0.5,0.1,1.4,0.1,1.9
+			C1272.1,600.2,1269.4,599.8,1266.8,599.1z"/>
+		<path class="st7" d="M145,597c1.4,0.2,2.8,0.3,4.2,0.5c-0.9,3.1-3.8,4.5-6.3,6.3c-0.5-0.3-1.4-1-1.9-1.3c0.8-1.1,1.6-2.2,2.4-3.3
+			C143.9,598.4,144.5,597.7,145,597z"/>
+		<path class="st7" d="M487.4,598.7c1.7-1,5.1-2.6,5.6,0.4c-0.4,3.8-5.8,3.4-8.7,3.9c0.2-0.9,0.3-1.9,0.5-2.8
+			C485.5,599.8,486.8,599,487.4,598.7z"/>
+		<path class="st7" d="M1242.1,598c0.8-0.2,2.4-0.6,3.2-0.8c0.7,2.1,0.5,4.7-1.1,6.5C1241.1,604,1238.9,599.8,1242.1,598z"/>
+		<path class="st7" d="M686.2,599c1.8,7.8,0.9,15.9,0.4,23.8c-0.6,4.1-1,8.2-1,12.3c1.4,0.8,2.8,1.7,4.2,2.6
+			c-1.1,1.4-2.2,2.8-3.3,4.2c1.6,0.4,3.2,0.8,4.8,1.2c-1.5,1-3,2.2-4.2,3.5c-1.1-0.8-2.2-1.7-3.3-2.6
+			C685.3,629.1,686.2,614,686.2,599z"/>
+		<path class="st7" d="M952.1,601c2.5-1,3.6,3.7,0.8,3.3C950.7,604.6,950.9,602,952.1,601z"/>
+		<path class="st7" d="M808,605.5c1.2-1.3,2.4-2.7,3.6-3.9c-0.3,3.5-2.9,6.3-2.8,9.9c-3.6,0.9-7.8,1.3-9.7,4.9
+			c-0.7,2.6-1.3,5.2-2,7.8c-1.6-1.1-3.1-2.4-4.4-3.8c1.1,0,2.2,0,3.3,0c-0.1-1.9-0.3-3.8-0.4-5.7c1.4-1.5,2.7-3.1,3.8-4.8
+			c0.9-0.9,1.8-1.8,2.7-2.7c0.2-0.7,0.6-2.1,0.7-2.8C804.6,604.8,806.3,605.2,808,605.5z"/>
+		<path class="st7" d="M1720.6,602.5c1.3-1,2.8,1,2.1,2.2c-1.5,2-3.4,4.7-6.2,3.7C1715.8,605.6,1718.8,604.1,1720.6,602.5z"/>
+		<path class="st7" d="M989.7,603.7c1.4-0.6,2.9-1,4.4-1.3c0.3,0.4,1,1.1,1.3,1.5c-0.3,0.6-0.8,1.7-1,2.3c-1.8,1.1-3.6,2.2-5.3,3.4
+			C989.2,607.6,989.3,605.6,989.7,603.7z"/>
+		<path class="st7" d="M7.1,607.4c1.6-1.4,3.1-3.7,5.6-3.1c1.5,1.6,2.2,3.9,2.4,6c-0.3,2.1-1.5,4-2.4,5.9c0.3,0.5,1,1.6,1.4,2.1
+			c-0.5,0.1-1.6,0.4-2.1,0.5c-0.3-2.6-0.5-5.2-1.3-7.7C9.9,609.6,8.4,608.6,7.1,607.4z"/>
+		<path class="st7" d="M238.5,604c1.5,2.9,2.8,5.9,3.9,9c-1.7-1.6-3.8-2.7-6.1-2.9c-0.1,2.3-0.1,4.7-0.1,7c-1.3-0.2-2.7-0.4-4-0.5
+			c-0.2-1.4-0.6-2.7-0.6-4.1C233.8,609.6,236.5,607.1,238.5,604z"/>
+		<path class="st7" d="M1452.1,607.4c1.7-1,3.5-2.1,5.2-3.1c2.2,2.3,4.4,4.4,6.7,6.5c0.7-0.6,1.5-1.2,2.3-1.8
+			c-1.5,4.2-3.4,8.2-5,12.4c3.9-0.3,7.7-0.8,11.6-0.6c11.3,0.1,22.6-0.7,33.9,0.2c0.5,0.8,0.9,1.7,1.4,2.5c4.2-0.3,8.4-0.2,12.6,0.4
+			c-0.2,2.7-0.4,5.4-0.6,8.1c4.5-1.9,8-5.8,12.9-6.6c0.1,1.2,0.3,2.4,0.4,3.6c-1,0.6-1.9,1.2-2.8,1.8c-0.6,2.2-0.4,4.6-0.6,6.9
+			c-0.8,0.3-2.2,1-3,1.3c0.7,1.1,1.4,2.2,2.1,3.3c-1.5-0.1-2.9-0.1-4.4-0.2c-1.5,0.2-3,0.3-4.5,0.4c-0.1-0.7-0.3-2.2-0.4-2.9
+			c-1.2,0-2.5,0.1-3.6-0.2c-0.2-0.7-0.6-2.1-0.8-2.8c0.8,0,2.5-0.1,3.4-0.1c-1.9-4.3-4.6-8.9-9.5-10.1c-3.5-1.5-6,2.1-9.2,2.8
+			c-1.8-2.1-4.3-3.1-7-2.9c-1.2-1.2-2.4-2.5-3.7-3.7c-0.6,2.2,1,3.8,2.2,5.5c-4,0.8-7.9,2.1-12,2.2c-4.4-0.5-4.9-5.5-6.2-8.8
+			c-2.5,0.1-5,0.2-7.4,0.5c-2.3,3-5.6,4.7-9.4,4.8c-0.5,1.6-1,3.2-1.5,4.9c-2.8-1.8-6-2.4-9.2-2.2c1.6-2.5,3.9-4.2,6-6.3
+			c0.5-3.1,0.6-6.3,1.5-9.3c0.7-0.2,2.2-0.7,2.9-0.9c0.2-2.4-1.6-3.9-3.5-4.9c-1,0.4-2,0.9-3,1.4c-0.3-0.6-0.5-1.2-0.8-1.8
+			C1450,607.6,1451.4,607.5,1452.1,607.4z"/>
+		<path class="st7" d="M22.8,607.8c1.5-1.4,3.2-2.5,5.1-3.3l0.7,2c0.4,0.8,0.7,1.7,1.2,2.5c0.1,1.7,0.1,3.5,0.1,5.2
+			c-0.9-0.4-1.8-0.9-2.6-1.3C25.6,611.3,24.2,609.5,22.8,607.8z"/>
+		<path class="st7" d="M197.4,610.8c-0.3-2.1-1-4.2,0.2-6.2c1.4,0.2,2.7,0.5,4.1,0.8c0.1,3.9-0.1,7.8-0.9,11.5
+			c-1.6-0.7-3.1-1.4-4.6-2C196.6,613.5,197.1,612.2,197.4,610.8 M198.1,609.9c2.7,1,4.9-2.9,1.9-4
+			C197.5,605,197.7,608.5,198.1,609.9z"/>
+		<path class="st7" d="M1253.6,606c1.2-0.2,2.4-0.3,3.6-0.5c0.2,1.2,0.3,2.3,0.5,3.5c-2.4,0.4-4.8,0.7-7.2,0.7
+			c-0.1-0.5-0.3-1.5-0.4-2C1250.7,606.4,1252.2,606.2,1253.6,606z"/>
+		<path class="st7" d="M976.8,606.8c1.3-0.3,2.6-0.5,3.9-0.7c0,1.8,0,3.7,0,5.5c-1.1,0-2.2-0.1-3.2-0.1
+			C977.1,610,976.2,608.4,976.8,606.8z"/>
+		<path class="st7" d="M737.1,611c0.9,0,2.6-0.1,3.5-0.2c0,3.5-0.5,7-1,10.5c-1.3-1.1-2.7-2.2-3.9-3.4
+			C735.8,615.6,736.5,613.3,737.1,611z"/>
+		<path class="st7" d="M814.1,616c1.8-2.5,4.1-4.4,6.8-5.9c1.5,1.3,3,2.7,4.5,4c-1.9,2-3.3,4.3-4.6,6.6
+			C818.5,619.3,816.5,617.4,814.1,616z"/>
+		<path class="st7" d="M143.9,617.9c-2.5,0.2-6-1.5-4.1-4.4C142.5,613,144.4,615.3,143.9,617.9z"/>
+		<path class="st7" d="M288.8,626.7c2.1-4.1,3.9-8.4,5.8-12.6c0.6,1.4,1.2,2.8,1.9,4.2c-1.4,3.2-2.2,6.6-2.1,10.1
+			c-0.6,0.2-1.8,0.5-2.4,0.6c-0.5-0.9-0.9-1.8-1.4-2.6C290.1,626.5,289.3,626.6,288.8,626.7z"/>
+		<path class="st7" d="M464.6,614.3c2,2.7,4.2,5.4,4.5,8.9l-1-0.9c-0.7-1.7-1.8-3.1-3.2-4.3c-0.1,1.9-0.2,3.8-0.3,5.6
+			c0.5,0.1,1.6,0.2,2.2,0.2c0,1.2,0,2.4,0.1,3.6c1.3-0.7,2.5-1.5,3.9-2.1c1.9,1.4,3.5,3.2,5.1,5c-1.7,1.4-3.6,1.2-5.3-0.1
+			c-0.2-0.5-0.6-1.6-0.8-2.2c-1.8-0.4-3.6-0.7-5.5-0.9c-0.4,1.4-0.8,2.7-1.2,4.1c1.2-0.5,2.5-1,3.8-1.5c0.7,0.1,1.9,0.2,2.6,0.3
+			c0.4,1.9,0.8,3.9,1.1,5.9c-1.8-0.2-3.7-0.5-5.5-0.7c-0.1,1.3-0.1,2.5-0.2,3.8c-0.7-0.9-1.3-1.9-1.9-2.9l-0.5-0.8
+			c-1.4-1-2.9-1.9-4.4-2.7c-1.2,0.9-2.7,1.6-3.6,2.9c-0.2,0.3-0.7,1-0.9,1.3c-0.2-3.2-0.5-6.4-1-9.6c2.2,0.9,4.3,1.9,6.3,3.1
+			c1.1,0.2,2.2,0.3,3.3,0.4c0.9-4.5,1.1-9.1,0.1-13.6C463,616.2,463.8,615.3,464.6,614.3z"/>
+		<path class="st7" d="M691.2,614.2c1.6-0.5,2.2,0.1,1.6,1.7C691.2,616.4,690.6,615.8,691.2,614.2z"/>
+		<path class="st7" d="M493,616c0.3,0,0.9-0.1,1.2-0.2c0.3,0.2,0.9,0.5,1.3,0.7c1.5,0.9,2.9,1.9,4.4,2.8c2.8,0.9,2.9,3.7,2.5,6.2
+			c-0.9,0.1-2.6,0.3-3.4,0.3c-1.6,0.7-3.1,1.6-4.6,2.4c-1.7-1.9-3.7-3.4-6-4.5c0-0.5-0.1-1.5-0.2-2C486.7,618.3,490.8,617.4,493,616
+			 M490.3,620.7c0.4,3.4,3.3,4.7,6.4,4.8c-0.7-1.8-1.5-3.5-2.4-5.2C493.3,620.4,491.3,620.6,490.3,620.7z"/>
+		<path class="st7" d="M244,616.6l0.3-0.6c1,2.2,2,4.3,2.9,6.5c-2,0.3-3.9,0.7-5.9,1C241.7,621.1,242.9,618.8,244,616.6z"/>
+		<path class="st7" d="M1268.4,616.4c2-0.2,4.1-0.2,6.1,0.4c-1.7,2-3.9,3.4-6.4,4.2C1268.2,619.5,1268.3,618,1268.4,616.4z"/>
+		<path class="st7" d="M1277.7,618c0.6-0.4,1.8-1,2.5-1.4c0.8,1.2,1.6,2.4,2.4,3.6c-1.4,0.9-2.8,1.9-4.2,2.8
+			C1278.1,621.3,1277.9,619.7,1277.7,618z"/>
+		<path class="st7" d="M507.4,618.7c0.5,9,2.2,17.9,3.8,26.8c-3.3-0.1-6.5,0.6-9.2,2.5c-1.7,1.6-3.1-0.8-3.9-2.1
+			c1.4,0.5,2.4,0.1,2.9-1.1c-0.9-1.2-2.1-1.4-3.5-0.4c2.1-1.2,4.4-2.3,6.1-4c0.5,1.2,1,2.4,1.6,3.6c2.2-1.6,1.9-4.9,2.7-7.3
+			c-0.4,0.1-1.3,0.2-1.8,0.2c0.7-0.8,1.4-1.6,2.1-2.3c-0.2-2-0.5-4-0.7-6.1c-1.4,1.3-2.5,3.7-4.8,2.7c-0.6-1.7,0.1-3.1,1.2-4.3
+			C507.2,625.4,507.7,622,507.4,618.7z"/>
+		<path class="st7" d="M24.6,620.9c0.8,1.5,2.2,2.9,1.9,4.7c-1.3,1-2.7,1.7-4,2.5c1.7,3.2,1.8,6.9,2.7,10.4c0.5,0.4,1.5,1.2,2,1.6
+			c-0.8,1.2-2.4,2.5-1.6,4.2c1,1.5,2.9,0.9,4.4,1.1l-0.1,0.8c-4.5,2.5-7.1-3-8.8-6.3c4.2-3,2-8.6-0.1-12.2c-0.9-1.9-2.7,0.3-3.3,1.3
+			c0,3.1,1.7,5.9,2.5,8.8c-1.8-1.6-4.1-2-6.1-0.6c1.6,3,2.1,6.4,2.8,9.7c0.9,0.4,1.9,0.7,2.8,1c2.3,3.7,7.3,8.9,2.7,12.8
+			c-2.6-1.4-2.9-4.2-3-6.8c-0.3,0.3-0.8,1-1.1,1.3c0,3.4-0.5,7.1,1.7,10c0,2.2,0,4.4,0,6.6c-1.6-0.3-3.3-0.5-4.9-0.8
+			c-1-1.5-2-2.9-3-4.4c-0.1-0.2-0.4-0.7-0.6-1l-0.6-1c3.3,0.8,4.5,4.6,7.9,5.3c-0.2-2.7-1.4-5-3.1-7.1c-0.1-1.6-0.1-3.2-0.2-4.9
+			c-2.6,1.4-6,2.5-6.7,5.8c-1.7-2-3.2-4.2-4.8-6.3c-0.6,2.1-1.6,4.2-1.4,6.4c0.5,1.5,2,2.4,3,3.6c-0.2,1.2-0.3,2.4-0.6,3.7
+			c-0.4,0.3-1.3,0.8-1.7,1c0.4,1,0.7,2,1.2,3c3.3,1.7,6.8,2.7,10,4.5c-0.1,0.4-0.5,1.2-0.6,1.6c-0.8,1.6-1.6,3.1-2.5,4.7
+			c0.6,1,1.3,2.1,1.9,3.1c-0.8,1.7-2,3.5-0.9,5.4c2-1.7,4.1-3.3,6-5.2c-0.2-3.9-3.7-8.5-0.6-12c1.7,0.1,3.1,1.1,4.4,2.1
+			c-1.3,3.7-0.7,7.6-0.7,11.4c-0.1,2.2-2.6,4-1.9,6.3c1,0.5,2.1,0.9,3.1,1.3c2-2.2,4.4-4.2,6.2-6.5c1.7-3.4-1-6.5-2.8-9.1
+			c1.1-0.5,2.1-1,3.2-1.6c0.2-1.5,0.2-3,0.2-4.5c-1-1.2-2.3-2-3.5-2.9c-0.3-1-0.6-2-0.9-3c1.6-0.3,3.2-0.6,4.9-0.9
+			c0.1,10.4,0.3,20.7-0.2,31.1c0.6,10.4,0.1,20.8,0.1,31.1c-0.3-1.5-0.6-3-1-4.4c-4.1-1.9-8.1-4.1-11.5-7.2
+			c-1.4-1.3-0.6-4.5,1.5-4.4c3.2,0,6.4,0.5,9.6,0.6c0.1-0.3,0.4-1,0.5-1.3c0.1-1.7,0.2-3.4,0.2-5c-0.4,0-1.3-0.1-1.8-0.1
+			c-4.6-0.4-9.2-1-13.7-2.3c-0.6-0.5-1.2-1.1-1.7-1.7c0.8-1,1.7-1.8,2.6-2.7c1.3,1.4,2.6,2.9,4.3,3.9c2.4,0.2,3.7-2.1,5.2-3.5
+			c1.1-0.2,2.1-0.5,3.2-0.7c0.1-1.1,0.3-2.1,0.4-3.2c-2.4-0.1-3.9,1.4-4.9,3.4c-5.5-1.6-12.4-3.7-17.1,0.9c-0.5-0.2-1.5-0.6-2.1-0.7
+			c-0.1-0.3-0.4-1-0.5-1.3c0.8,0,1.5,0.1,2.3,0.2c0.4-0.3,1.2-1,1.6-1.3c0.4-0.4,1.3-1.1,1.7-1.4c1.7,0.3,3.3,0.6,5,0.9
+			c-0.3-1.4,0.3-3.4-1.4-4c-2.9-1.8-6.3-0.3-9.4-0.2c-0.4,0-1.2,0.1-1.6,0.1c0.3,1,0.7,2,1,3L0.7,700L0,700.1v-4.2
+			c2.2-0.5,4.5-0.9,6.7-1.3c0-0.5,0-1.6,0.1-2.1c-2.2,0-4.5-0.1-6.8-0.2v-6.5c4.1-1.3,8.3-1.9,12.5-2.8c-0.7-1.4-0.6-3.7-2.5-4
+			c-1.2-0.8-2.4,0.5-3.4,1c-0.4-0.6-1.2-1.9-1.6-2.5c-1.7,0.7-3.3,1.3-4.9,2.1v-7.9c2.2-1.2,2.7-4.5,0-5.4v-0.7c2-2.9,2.2-6.4,0-9.2
+			v-3.5c1,0.7,2,1.4,3,2.2c0.3-1.3,0.7-2.6,1-3.9l0-0.2l0.8,1.2c1.5,2.9,4.3,4.7,6.6,6.9c4.2-2.7,1.5-8.5-1.2-11.3
+			c0.5-2.2,1.1-4.4,1.7-6.6c-2.4-0.8-4.8-1.5-7.2-2.3c1.2-1.3,2.4-2.5,3.9-3.3c-0.3,1.3-0.7,2.5-1,3.8c2,0,3.9,0,5.8,0.1
+			c-0.1-0.8-0.4-2.5-0.6-3.4c-1-0.4-2.1-0.6-3.1-0.8c0.9-1.8,1.9-3.7,2.8-5.5c1.1,0.3,2.1,0.6,3.2,0.9c0.6-1.1,1.1-2.1,1.7-3.1
+			c1.3-0.8,2.7-1.5,4-2.3c0.3-0.1,0.8-0.5,1-0.6C23.2,623.3,23.9,622.1,24.6,620.9 M11.6,646.1c1.6,2.1,2.5,4.6,4.3,6.5
+			c0.5-0.2,1.5-0.5,2-0.7c1.8-2-1.2-3-2.3-4.3c-0.4-2.2-0.3-4.5-0.7-6.7C11.8,639.5,12.6,644.3,11.6,646.1 M2,685.8
+			c-0.2,0.5-0.7,1.6-0.9,2.2c1.7,0.8,3.3,1.5,5.1,2.1c0-0.8,0.1-2.4,0.2-3.2C5.5,685.2,3.5,685.9,2,685.8 M19.2,717.1
+			c-2.7,1.3-0.3,4.3,1.9,4.5C23.7,720.3,21.5,715.9,19.2,717.1 M23.5,722.6c0.8,1.6,2.5,1.9,4.1,2.3c0-2.3,0-4.6-0.1-6.9
+			C25.8,719,23.5,720.3,23.5,722.6z"/>
+		<path class="st7" d="M1715.3,621.2c0.4,0.1,1.3,0.2,1.7,0.2c0.4,0.5,1.1,1.4,1.5,1.9c0.4,0.3,1.1,0.8,1.5,1.1c1.7,1,1.5,3,1.7,4.7
+			c-3.3-0.3-4.4-3.7-6.6-5.6C1715.2,622.9,1715.3,621.8,1715.3,621.2z"/>
+		<path class="st7" d="M1522.1,623.9c1.4-0.5,2.8-1,4.2-1.4c0,1.1,0,3.2,0,4.3C1524.5,626.3,1523.1,625.3,1522.1,623.9z"/>
+		<path class="st7" d="M225.4,625.1c2.1,0.2,4.2,0.4,6.3,0.6c0,3.2-0.9,6.6-4.2,8C226.5,630.8,225.5,628,225.4,625.1z"/>
+		<path class="st7" d="M483.4,628.7c2.3-0.6,4.5-1.1,6.8-1.5c1,3.4,2.2,7,5,9.3c0.8,0,1.6-0.1,2.4-0.1c-0.4-1.6-0.9-3.2-1.3-4.8
+			c1.1-0.2,2.3-0.3,3.4-0.5c0.2,2.3,0.4,4.6,0.6,6.9c-1.4,0.8-2.7,1.5-4,2.3c-1.5-1.2-3-2.4-4.5-3.7c-0.6,0.2-1.8,0.4-2.4,0.6
+			c-0.1-0.6-0.4-1.7-0.6-2.3c-0.8-0.1-2.4-0.4-3.2-0.5C485.1,632.5,484.2,630.6,483.4,628.7z"/>
+		<path class="st7" d="M805.8,627.7c3.6-1.9,5.3,4.5,2.3,5.8C805.7,632.7,805.1,629.9,805.8,627.7z"/>
+		<path class="st7" d="M1276.4,628.1c2.4-0.6,4.8-0.2,7.1,0.3c0.1,1.2,0.2,2.5,0.3,3.7c-2.2,0.2-4.3,0.5-6.4,0.8
+			c-1,1.1-1.6,2.8-3.2,3c-0.9-0.8-1.7-1.8-2.4-2.6c1.5-0.5,2.9-0.9,4.4-1.3c0-0.8,0.2-2.2,0.2-3L1276.4,628.1 M1278,628.8
+			c-0.2,0.6-0.6,1.7-0.8,2.2c1.9,1.3,4.3,1.8,6-0.1C1282.2,628.9,1280.1,628.6,1278,628.8z"/>
+		<path class="st7" d="M1427.8,634.4c1-2.1,1.9-4.1,2.9-6.2c0.7,1.7,1.8,5.4,4.2,3.7c3.6-2,7.7-0.9,11.5-0.3
+			c0.4,0.8,0.9,1.7,1.3,2.6c0.9,0.6,1.9,1.1,2.9,1.7c-1.9,2.8-2.2,8.4-6.7,7.8c-1.7-1.6-0.6-3.9-0.9-5.8c-0.8-1.2-2.4-1.2-3.6-1.7
+			c-0.9,1.4-1.7,2.8-2.7,4.2c-2.1-1.9-4.6-3.3-7.3-4.1C1429.1,635.7,1428.2,634.8,1427.8,634.4z"/>
+		<path class="st7" d="M214.1,631c2.1-2.1,4.9-3.2,7.7-1.6c-0.3,1.4,0.7,4.3-1.6,4.1C217.7,634,215.8,632.3,214.1,631z"/>
+		<path class="st7" d="M707,629.6c2.3-0.1,3.5,0.9,3.1,3.3c-1,0.3-2,0.7-3,1C707,632.5,707,631,707,629.6z"/>
+		<path class="st7" d="M723.4,635.8c3.4-1.6,7.2-2.9,9-6.5c0.8,1,2.8,2,1.8,3.5c-1.6,2.3-3,4.7-2.8,7.6c0.9,0.1,1.9,0.2,2.9,0.4
+			c0.1-3,1.3-5.8,4.3-7c-2.2,11.5-4.9,23.1-9.7,33.9c0.3-2.4,0.7-4.8,1-7.3c-0.1-0.4-0.3-1.2-0.4-1.6c-2.4-1.1-4.9-1.9-7.5-2.6
+			c-0.6,1.1-1.2,2.2-1.8,3.4c-1.2-2.6-3.3-4-6.2-3.6c0.1,2.3-0.3,4.6,0.5,6.8c0.9,1.2,2,2.1,3.1,3.2c-0.6,1.3-1.2,2.7-1.8,4
+			c2.8-0.4,5.6-0.8,8.4-1.2c1.1,0.9,2.1,1.8,3.2,2.7c-0.7,1.6-1.4,3.1-2.2,4.7c-0.1-0.6-0.4-1.9-0.5-2.6c-0.4,0.1-1.3,0.4-1.7,0.6
+			c-1.2-0.5-2.4-1-3.6-1.5c-0.5,0.3-1.6,0.8-2.2,1.1c1,1.8,2.1,3.6,3.2,5.4c-1.1,2.5-2,5.1-1.4,7.8c-0.4,0.6-0.8,1.3-1.2,1.9
+			c-1.2-0.8-2.6-1.4-3.9-2c-0.2-0.2-0.6-0.7-0.8-0.9c-2.2-4.3-0.7-9.5-3-13.8c1-2,2.5-4.3,0.5-6.3c-2.1,1.5-4.3,2.9-6.5,4.2
+			c-0.3,0.5-0.8,1.5-1.1,2.1c-0.9,1.7-2.1,3.6-1.2,5.6c1.6-0.6,3.2-1.4,4.6-2.5c0.8,1.2,1.9,2.3,2.2,3.7c-0.5,1.7-2.1,2.9-3.2,4.3
+			c0,2.2,0.1,4.5-0.2,6.7c-2.2,1.6-4.9,2.6-7.5,3.6c-1.4,0.5-2.8,1-4.2,1.5c-0.3,2.3,0.2,4.6,2.7,5.4c0.1,0.7,0.3,2.2,0.4,3
+			c-2.8-1-5.4-2.7-8.3-3.2c-1.8,1.8-0.6,4.8-1,7.2c-1.6,0.4-3.3,0.8-4.9,1.3c0.1,5-1.2,9.8-2.3,14.6c-1.2,2.2-3.2-0.2-4.6-0.9
+			c0.8-1.2,1.5-2.4,2.3-3.6c-0.6-2-1.3-3.9-1.5-6c0.5-1.7,1.6-3.1,2.5-4.6c-2.9-0.7-6.6-3.2-9.1-0.4c-1.7,2.1-2.8,4.7-3.3,7.4
+			c0.6,3.4,2,6.7,2.2,10.2c-0.8,0.2-2.3,0.8-3.1,1c-1.2-3.3-1.7-6.8-2-10.2c-1.9-0.6-3.9-2.5-5.9-1.6c-0.5,1.6,0.6,3.2,0.9,4.7
+			c-1.8,0.2-3.7,0.1-5.2-1.1c1-2.3,2-4.6,3-6.9c1.5-0.7,3.4-1,4.7-2.2c0.7-2.3,0.9-4.8,1.3-7.1c-1.8,0.2-3.6,0.4-5.5,0.7
+			c1.7-2.2,3.2-4.5,4.9-6.7c1,1.4,1.9,2.9,2.9,4.3c6.1,3,12.8,3.6,19.5,4.1c0.2-1.5,0.2-3.1,0.4-4.6c1.7-2.5,4.8-3.3,6.8-5.4
+			c0.7-1.2,1.1-2.5,1.6-3.7c1-0.3,2-0.6,3-0.9c1.3-0.2,2.7-0.4,4-0.5c-0.6-1.4-0.9-3.4-2.8-3.7c-3.1-0.1-6.2,0.7-9.2-0.4
+			c2.2-1.9,4.7-3.3,6.6-5.4c1.5-3-1.2-5.6-2.8-8c0.7-1,1.3-2.1,2-3.1c1.7-0.6,3.5-1.1,5.2-1.6c1.9-3,5-4.2,8.5-3.8
+			c-0.3-2.1-0.7-4.2-1.1-6.3c2.2-2.9,4.6-5.8,8.4-6.3c-0.7-0.2-2.1-0.5-2.8-0.6c-0.4-1-0.7-1.9-1.1-2.8c0.1-1.3,0.3-2.5,0.5-3.8
+			c0.3,0,0.8-0.1,1-0.2c3.6-0.1,6.9-1.7,9.8-3.8C722.6,638.3,722.9,637,723.4,635.8 M727.8,641.7c-0.2,0.7-0.7,2.2-1,2.9
+			c-0.6,0.3-1.7,1-2.2,1.3c0.3,0.7,0.8,2,1,2.7c1.7,0.8,3.5,0.5,5.1-0.4C729.9,646,729,643.8,727.8,641.7 M713.2,644.1
+			c-1.2,1.4,1.4,2.5,2.3,1.3C716.6,644,714,642.9,713.2,644.1 M717.2,647.2c-0.5,1.6,0,2.2,1.7,1.7
+			C719.4,647.2,718.8,646.6,717.2,647.2 M700.2,683c0,0.7-0.1,2.1-0.1,2.8c1.3-0.1,2.7-0.1,4-0.2C703.6,683.8,702,683.2,700.2,683z"
+			/>
+		<path class="st7" d="M147.5,631.4c0.5,0,1.6-0.1,2.2-0.1c0,1.5,0.1,3,0.1,4.4c-0.6,0-1.8-0.1-2.3-0.1c-0.4-0.8-0.7-1.5-1.1-2.3
+			C146.6,632.9,147.2,631.9,147.5,631.4z"/>
+		<path class="st7" d="M1558.4,638c2.7-2.3,3.6-7.4,7.9-6.9c0.5,2.7,1.9,5.2,2.2,7.9c-1.2,1.9-2.8,5.2-5.5,4.3
+			C1561,641.9,1559.8,639.9,1558.4,638z"/>
+		<path class="st7" d="M474.3,633.3c1.3-1.4,3.5,0.9,2.2,2.2C475.1,637,472.8,634.6,474.3,633.3z"/>
+		<path class="st7" d="M998.8,633.8c2-0.8,4.2-0.4,6.2-0.4c-0.5,1.6-1.3,3-2.2,4.3c-1.3-0.2-2.6-0.2-3.9-0.5
+			C998,636.3,998.4,634.8,998.8,633.8z"/>
+		<path class="st7" d="M1458.7,632.3c6,1.1,10.3,5.6,15.7,8c3.2,0.7,6.5-0.5,9.7-1c0.2-1,0.5-2.1,0.8-3.1c3.2,0.3,6.4,0.6,9.6,1
+			c0.8,1.8,1.5,3.6,2.4,5.4c-10.5-0.1-21,0-31.5-0.1c0.1-1.7-0.2-3.3-0.4-5c-1.7-0.1-3.5-0.2-5.2-0.3
+			C1459.4,635.6,1459,633.9,1458.7,632.3z"/>
+		<path class="st7" d="M1247.2,637.2c0.8-1.2,1.7-2.4,2.8-3.4c1.4,0.7,1.8,1.9,1.1,3.5C1249.7,637.7,1248.4,637.6,1247.2,637.2z"/>
+		<path class="st7" d="M288,639.2c-2-0.7-1.7-3.6,0.2-4.3c0.7,0,2.2,0.1,2.9,0.1C290.5,636.7,290,638.7,288,639.2z"/>
+		<path class="st7" d="M1570,637.1c1-1.6,2.4-2.9,4.5-2.9c-0.5,1.5,0.4,4.7-2.1,4.4C1571.8,638.3,1570.6,637.5,1570,637.1z"/>
+		<path class="st7" d="M383,636.8c2.7,2.8,7.3,4.8,7.9,9c-1.8,1.3-3.3-0.4-4.8-1.3c-2.1-1.5-4.6-2.1-7-2.7
+			C380.4,640.2,381.7,638.5,383,636.8z"/>
+		<path class="st7" d="M802.1,647.4c2.3-3.8,4.7-7.6,8.6-10c-0.1,1.2-0.1,2.5-0.2,3.7c-2.4,4.4-6.5,7.9-7.8,12.9
+			c-0.3,1.6-2.1,4.1-3.3,1.5C797.2,652.5,800.5,649.8,802.1,647.4z"/>
+		<path class="st7" d="M1158.2,644.8c0.5-2.5,1-5,1.8-7.5c3.9,2.6,0.9,7.1-0.5,10.3C1159,646.7,1158.6,645.7,1158.2,644.8z"/>
+		<path class="st7" d="M1707.2,638.3c1,0,2.1,0,3.2,0c0.3,1,0.7,2,1,2.9c0.8,0.6,1.7,1.2,2.6,1.8c-0.8,1.2-1.2,2.7-2.3,3.6
+			c-1.8,0.5-2.8-1.3-4-2.3C1707.4,642.4,1707.3,640.3,1707.2,638.3 M1708.3,639.3c-1.3,0.9-0.1,3.8,1.5,2.6
+			C1711,640.9,1709.8,638.1,1708.3,639.3z"/>
+		<path class="st7" d="M1715.9,638.5c2.8,1.2,3.8,4,4.3,6.8c-0.5,0.1-1.6,0.4-2.1,0.5C1716.5,643.7,1714.5,641.3,1715.9,638.5z"/>
+		<path class="st7" d="M1541,640.1c2,1.1,4,2.1,6.1,3.2c1.3-1.1,2.5-2.2,3.9-3c2.7,0.4,2.4,4.1,4.2,5.5c1.7,0.9,3.6,1.2,5.5,1.7
+			c-0.7,3.2-1.3,6.5-1.2,9.8c-3.9,0.4-6.8,3-8.6,6.3c-2.2-1.4-4.1-3.9-3.4-6.6c0-2.1,1.4-4.6-0.2-6.4c-1.4-2-4.1-1.6-6.1-2.1
+			C1541.4,645.7,1541.3,642.9,1541,640.1z"/>
+		<path class="st7" d="M1287.8,647.6c2.9-0.8,3.1-4.3,3.8-6.7c1,3.1,2,6.3,3.1,9.4c-1.3,0.6-2.6,1.1-3.8,1.8
+			c-1.4,3.9,2.6,6.7,4.6,9.5c0.1,0.5,0.1,1.4,0.2,1.8c-0.6,0.1-1.9,0.2-2.6,0.3c-1.5-1.6-3.2-3-5-4.3c-0.4-0.3-1.3-1-1.8-1.4
+			c-0.3-0.2-0.9-0.7-1.2-0.9c0.2-1.7,0.5-3.5,0.7-5.2c-1.5-0.8-2.9-1.5-4.4-2.2c0-1.1,0-2.2,0-3.4
+			C1283.6,646.8,1285.6,647.5,1287.8,647.6 M1286.3,655.2c-1.6,2.4,1.8,2.5,3.4,2.2C1289,656,1288.2,654,1286.3,655.2z"/>
+		<path class="st7" d="M1571.1,643.2c1.1-2.3,3.5-1.9,5.5-1.5C1576.5,645,1573.1,644.6,1571.1,643.2z"/>
+		<path class="st7" d="M459.8,643.1c2.2,0.6,4.3,1.2,6.5,1.8c0.8,0.8,1.7,1.8,2.8,2.3c-1.2,1.4-2.5,2.7-3.7,4.1
+			c-0.3,0.1-0.8,0.2-1.1,0.3c-0.4-0.5-1.1-1.4-1.5-1.9C461.2,647.8,459.9,645.7,459.8,643.1z"/>
+		<path class="st7" d="M1260.1,644.8c0.9-0.2,1.8-0.3,2.7-0.5c0,0.7-0.1,2.1-0.1,2.8c0.2,1.8-2.4,1.3-3.5,1.8
+			C1259.4,647.5,1259.7,646.2,1260.1,644.8z"/>
+		<path class="st7" d="M1144.2,646.4c1.2,0,2.3,0,3.5,0.1c-1.3,3.4-1.9,7-2.8,10.5c-1.5-0.9-2.2-2.4-2.5-4c1-0.7,2.1-1.3,3.2-2
+			C1145.2,649.5,1144.7,647.9,1144.2,646.4z"/>
+		<path class="st7" d="M1277,646.1c2.5-1.5,2.7,3,0.1,1.8C1277.1,647.4,1277.1,646.5,1277,646.1z"/>
+		<path class="st7" d="M491.6,649.5c1.1-0.1,2.1-0.1,3.2-0.2c0.2,0.8,0.5,2.3,0.7,3.1c-1.5,0-3-0.1-4.5-0.1
+			C491.2,651.5,491.5,650.2,491.6,649.5z"/>
+		<path class="st7" d="M981.8,653c0.9-2.2,2.9-3.5,4.5-5.1c3.1,4.3-1.3,9.4,1.6,13.9c3-1.9,5.9-5.6,9.8-3.4c0,0.5,0.1,1.4,0.1,1.9
+			c-3.1,0.6-4.2,3.4-5.5,5.8c-1.1,0.3-2.2,0.5-3.3,0.7c-0.8-1.4-1.6-2.8-2.4-4.1c-0.7-0.3-2-0.8-2.7-1.1c-3.3,2.5-6.5,5.6-10.8,6.2
+			c-0.2-2-0.5-4-0.6-6c-0.1-2.2-0.1-4.4,0-6.6c1.3-1.1,2.7-2.1,4.1-3.2c0.8,2.5,1.5,5,2.2,7.6c1,0,1.9-0.1,2.9-0.1
+			C981.5,657.3,981.3,655.2,981.8,653z"/>
+		<path class="st7" d="M1444.4,650.4c0.7-0.2,2.2-0.7,2.9-0.9c0.3,1.5,0.7,2.9,1.1,4.4c0.5-0.1,1.4-0.2,1.9-0.3
+			c-1.2,3.3-2.5,6.5-3.8,9.7c-0.3-0.5-0.8-1.4-1.1-1.9c-1.6,2.4-3.4,4.9-3.8,7.9c-4.7-1.7-9.9-3.4-12.2-8.3c2.6-1.9,5.5-0.5,8.3-0.2
+			c2.2-0.6,5-1.8,5.3-4.5C1443.3,654.2,1443.7,652.2,1444.4,650.4z"/>
+		<path class="st7" d="M1416,662.9c1.5-4,3.1-8.1,4.9-12c-0.1,0.5-0.2,1.5-0.3,2.1c1.1,0.8,2.2,1.6,3.3,2.5c-0.9,1.9-2,3.7-2.6,5.8
+			c0.1,1.5,1.4,2.7,2,4.1c-0.9,1.1-2.2,1.7-3.4,2.5C1419,665.9,1417.7,664.2,1416,662.9z"/>
+		<path class="st7" d="M465.6,656.1c1.5-1.6,3-3.3,4.5-4.9c0.6,0.4,1.7,1.2,2.2,1.6c0.1,1.8,0.3,3.5,0.5,5.3
+			c0.6-0.8,1.2-1.5,1.8-2.2c1.1-1.4,2.2-2.8,3.1-4.4c-0.3,3.6-0.6,7.5,1.5,10.6c-1-0.8-2.1-1.5-3.2-2.3c0.3,3.4,0.9,6.9,1.6,10.2
+			c-0.6,0.2-2,0.7-2.6,0.9c0.5-1.6,0.8-3.3,1.2-5c-2.6,0.5-4.7,1.9-5.7,4.5c-1.4,0.1-2.9,0.2-4.3,0.4c-0.1-0.4-0.2-1.2-0.2-1.6
+			c0.6-0.2,2-0.5,2.6-0.7c0.1-1,0.2-1.9,0.3-2.8c0.1-1,0.3-2.1,0.5-3.1c0.3,1,0.7,2.1,1.1,3.1c0.6-0.1,1.8-0.3,2.4-0.4
+			C473,660.9,470.4,656.3,465.6,656.1z"/>
+		<path class="st7" d="M1019.5,657.5c1.8-1.4,2.2-3.8,2.9-5.9c0,3.2,0,6.5,0,9.7c-0.6,0.3-1.8,1-2.4,1.4c-1.8,0-3.5-0.1-5.2-0.2
+			C1015.9,660.5,1017.7,659,1019.5,657.5z"/>
+		<path class="st7" d="M1570.7,654.8c0.4-0.6,1.1-1.9,1.4-2.6c0.7,0.8,1.5,1.6,2.3,2.4c1.3,1.3,2.7,2.7,4.2,3.9
+			c1.6,1.8,3.8,0,5.8-0.3c0.1-1,0.4-2.9,0.5-3.9c1.3,3.3,2.2,6.7,3.2,10c-3.2,2.9-6.7,5.6-10.8,7c0.1-1.9,0.2-3.7,0.3-5.6
+			c-1.6-0.2-3.2-0.4-4.7-0.9c-0.7-2.6,0.1-5.3,0.2-7.9c-0.1-0.1-0.4-0.4-0.5-0.5C1572.1,656.1,1571.1,655.3,1570.7,654.8z"/>
+		<path class="st7" d="M1702.8,652.3c1.7,1,3.5,2,5.1,3.2c1.2,0.9,2.4,1.8,3.6,2.8c-0.1,0.5-0.2,1.4-0.3,1.8c-0.6,0-1.8,0.1-2.4,0.1
+			c-2.1-1.3-4.1-2.9-6-4.4C1702.8,654.9,1702.8,653.2,1702.8,652.3z"/>
+		<path class="st7" d="M368.6,654.6c4,0.3,7.7,2.3,11.7,2c-0.4,1.5-0.3,3.3-1.7,4.3c-1.2,1.3-3.2,0.5-4.7,0.4
+			c-0.2-0.2-0.7-0.5-1-0.6C371.2,658.9,367.6,657.7,368.6,654.6z"/>
+		<path class="st7" d="M480.1,655.3c2.2-1.8,5.3,3,2.1,3C480.1,659.4,478.1,656.3,480.1,655.3z"/>
+		<path class="st7" d="M231.6,658.3c1.2-1,2.5-1.8,3.8-2.6c1,2.1,2,4.1,3,6.2c-0.7,3-1.5,6.1-2.3,9.1c-3.2,1.2-6.2,3.1-6.6,6.9
+			c-2.1,0.8-4.3,1.6-6.5,2.4c0,0.7-0.1,2-0.1,2.7c-3.4-6.6-6-13.5-9.2-20.1c1.1-0.2,2.2-0.5,3.3-0.7c0.6,2.4,1.2,5.8,4.1,6.4
+			c4.1,0.1,8.3-0.7,12-2.4C234.4,663.5,232.8,660.7,231.6,658.3z"/>
+		<path class="st7" d="M278.5,658.8c3.5-1.1,6.9-3.1,10.7-2.6c-2.7,2.9-4.5,6.9-8.1,8.7C278.3,664.5,279.3,660.8,278.5,658.8z"/>
+		<path class="st7" d="M1269.7,657.9c0.4,0.2,1.3,0.6,1.8,0.8c1.3,2.3,2.5,4.6,3.6,7c-0.5-0.1-1.6-0.2-2.1-0.3c-1.1-1-2.3-2-3.4-2.9
+			c-0.8-0.6-1.6-1.2-2.4-1.8C1267.9,659.7,1268.8,658.8,1269.7,657.9z"/>
+		<path class="st7" d="M1703,661.9c2.3,0.2,4.7,0.4,7,0.6c1.4,4.3,5.7,5.8,9.3,7.8c-1.3,0.6-2.6,1.1-3.8,1.7
+			c-1.6-1.8-3.6-3.1-5.9-3.9c-0.1-0.6-0.4-1.9-0.5-2.5c-2.1-0.1-4.2,0-6.2,0C1702.9,664.3,1703,663.1,1703,661.9 M1707.4,663.1
+			c-0.9,1.3,1.3,2.8,2.3,1.7C1710.7,663.4,1708.4,661.9,1707.4,663.1z"/>
+		<path class="st7" d="M1000.6,665.6c1.4-1,3.2-1,4.8-1.5c0.5,1.9,1,3.8,1.6,5.7c1.1-0.3,2.3-0.5,3.4-0.8c1.3-0.5,2.6-1,3.9-1.5
+			c0.5,6.1,1,12.8-2.2,18.3c-1.9-0.1-3.7,0.4-5.3,1.4c-2.3-2.6-5-5.2-8.8-4.9c-2,4.1-5.5,7.4-6.7,11.9c2.7-0.8,5.3-1.8,8-2.9
+			c0.2,0.4,0.5,1.3,0.7,1.7c-1.7,3.1,1.1,6,2.7,8.5c-2.6-0.4-5.2-0.7-7.8-0.6c0.1-0.8,0.3-2.4,0.4-3.3c-1.2,0.7-2.3,1.4-3.4,2.1
+			c0.1-1.7,0.1-3.5,0.2-5.2c-1.9,0-3.9-0.1-5.8-0.1c0.1-1.4,0.2-2.8,0.5-4.1c2.6-1.8,5.4-3.6,7-6.4c1.9-1.1,3.9-2.1,5.6-3.4
+			c2-1.6,3.8-3.6,5.6-5.4c-2.5-1.3-4.2-3.7-5.9-5.8C999.5,668.1,999.7,666.7,1000.6,665.6 M1006.5,676.5c-0.4,1.7-0.7,3.4-0.4,5.2
+			c1.2,0,2.4-0.1,3.7-0.1c0.9-1.9,1.3-4,0.7-6C1008.9,675.3,1007.7,676.1,1006.5,676.5z"/>
+		<path class="st7" d="M1564.2,665.3c0.9-1.4,3.7-0.2,2.5,1.4C1565.8,668.1,1562.9,666.8,1564.2,665.3z"/>
+		<path class="st7" d="M1285.1,670.5c1.6-0.9,3-4,5.1-2.8c0.8,1.5,1.1,4.7-1.2,5C1287.6,672.3,1286.4,671.3,1285.1,670.5z"/>
+		<path class="st7" d="M395.4,669.4c0.8-0.3,2.2-0.9,3-1.2c2.2,2.5,0.1,5.8-3.1,4.7C395.3,671.7,395.3,670.6,395.4,669.4z"/>
+		<path class="st7" d="M980.6,675.1c1.2-2,1.8-5.1,4.4-5.6c3.2,2.2,2.4,7.3,1.2,10.5C984,678.8,982.2,677,980.6,675.1z"/>
+		<path class="st7" d="M277,673c1.5-0.6,3.5-2.6,4.3,0c-0.9,2-2.6,3.7-2.8,6c-0.4,1.6,0.2,4-1.7,4.8c-3,1.8-6.6,2.1-9.9,2.6
+			c-1.8-0.3-1.9-2.2-1.1-3.5c1.4-1.4,3.1-2.4,4.8-3.5c0.2-1.7-0.4-3.8,0.7-5.2C273,673.2,275.2,673.9,277,673z"/>
+		<path class="st7" d="M679.1,677.8c-0.5-2.9,1.2-5.8,4.4-5.5c0.1,2.2,0.2,4.4,0.2,6.6C682.2,678.5,680.6,678.2,679.1,677.8z"/>
+		<path class="st7" d="M1257.7,674.5c1.7,0,3.4,0.5,5,1.2c0.4,1.6,3,3.6,1.3,5.1c-2.6-0.9-5-2.3-7.4-3.6
+			C1256.8,676.5,1257.4,675.2,1257.7,674.5z"/>
+		<path class="st7" d="M671.9,680c0.6-1.3,1.2-2.6,1.8-3.9c0.6,1.9,1.4,3.7,1.8,5.7c-2.4,3.9-5.2,7.9-9.8,9.3
+			C668.2,687.6,670.2,683.9,671.9,680z"/>
+		<path class="st7" d="M1142.2,676.4c0.4-0.1,1.3-0.2,1.7-0.3c1.5,2.3,3.1,4.6,4.8,6.8c0.5-0.6,1.4-1.9,1.9-2.6l0.7,0
+			c-2,6.2-4.9,12-6.5,18.3c-2-0.7-4-1.3-6.1-1.7c-2,0.2-3.7,1.4-5.1,2.8c-1.2-0.4-2.4-0.7-3.6-1.1c-1.4,0.2-2.8,0.4-4.1,0.6
+			c1.9-2.2,4.5-3.7,7-5.1c0.4-1.4,0.8-2.8,1.3-4.2c1,2,1.4,4.9,3.7,6c0.9-0.5,1.8-1,2.6-1.6c-1-2.2-2.5-4-3.7-6
+			c-0.5-1.7-0.9-3.5-1.3-5.2c0.4-0.4,1.3-1.3,1.7-1.7c1,0.3,1.9,0.6,2.9,0.9c0.5,2.2,1.3,4.4,2.9,6.1c1-1.9,2-3.8,3-5.8
+			c-1,0-2,0-3,0C1142.8,680.6,1142.5,678.5,1142.2,676.4z"/>
+		<path class="st7" d="M1022.3,678.6c0.1,13.6-0.2,27.8,4.3,40.8c1,1.8,2.6,3.1,4.1,4.5c-1.1,0.2-2.3,0.3-3.4,0.5
+			c0,0.5,0.1,1.6,0.2,2.2c1,0.9,2.1,1.9,3.1,2.8c-1.6,0.7-3.2,1.3-4.7,2c-1.2-1.6-2.6-3-3.8-4.6c-0.1-3.3,0.7-6.5,2.1-9.5
+			c-0.1-5.8-2.9-11.2-2.4-17.1c0-0.4,0.1-1.3,0.2-1.7c-1.8,0.7-3.8,1.2-5.7,0.9c0.7-1.8,1.5-3.6,2-5.5c-1.4-1.4-3.4-1.2-5.2-1.6
+			c1.5-2.7,3.7-4.9,6.6-6.1c0.2-1.6,0.5-3.2,0.7-4.8c0.2-0.3,0.6-0.9,0.8-1.2C1021.5,679.8,1022,679,1022.3,678.6 M1021.8,696.2
+			c0.1-2,1.4-5.2-0.9-6.4C1018.2,691.3,1020.6,694.4,1021.8,696.2z"/>
+		<path class="st7" d="M1593.4,678.9c1.1,2.7,2.2,5.4,3,8.1c-1.8-0.6-3.5-1.3-5.2-1.9l0.6-0.5
+			C1592.6,682.8,1593.2,680.9,1593.4,678.9z"/>
+		<path class="st7" d="M249.9,684.3c0.7-0.8,1.3-1.6,2-2.4c0.9,2.2,1.8,4.4,2.7,6.6c-1.8,0.2-3.6,0.5-5.4,0.7c0-0.9,0-2.8-0.1-3.7
+			C249.4,685.2,249.7,684.6,249.9,684.3z"/>
+		<path class="st7" d="M1553.4,684.9c3.3-0.2,6.4-1.1,9.3-2.6c-0.8,2.2-1.8,4.2-3,6.2c-2.3-0.1-4.7-0.1-7-0.3
+			C1553,687.1,1553.2,686,1553.4,684.9z"/>
+		<path class="st7" d="M1413.4,683c0.7,0.6,1.4,1.2,2.2,1.8c-0.4,1.2-0.8,2.5-1.2,3.8c0.9,1.8,1.7,3.6,2.4,5.5
+			c-4.9,0.6-9.7,0-14.6-0.3c0.4-1.1,0.8-2.3,1.2-3.4l0.5,0.2c1.8,0.6,3.7,0.9,5.7,1.1c0.3-0.5,0.9-1.4,1.2-1.9
+			c0.3,1.9,3.7,0.9,2.3-0.8c-0.5,0-1.4,0-1.8,0c0.1-0.3,0.4-1,0.5-1.3C1412.3,686.3,1412.8,684.6,1413.4,683z"/>
+		<path class="st7" d="M1125.9,684c3-0.2,6.7,2.7,5.7,5.8c-1.3,1.7-3,0.5-3.7-1c-0.2-0.5-0.7-1.6-0.9-2.1
+			C1126.7,685.8,1126.3,684.9,1125.9,684z"/>
+		<path class="st7" d="M678.8,687.9c2.5-2.2,6.2-2.2,8.9-0.2c-1.4,1.2-2.9,2.4-4.3,3.6c0.1,2,0.3,4.1,0.1,6.2
+			c-2.9,0.2-5.8-0.1-8.7-0.2c0-0.9-0.1-2.6-0.2-3.5C676.1,691.9,677.4,689.9,678.8,687.9z"/>
+		<path class="st7" d="M528.3,688.4c1.4,1.7,2.7,3.5,4,5.3l-0.8,0.2c-1.1-0.5-3.2-1.7-3.9,0l-0.1,0.4c-0.8-0.4-2.4-1.1-3.2-1.5
+			C525.7,691.4,527,689.9,528.3,688.4z"/>
+		<path class="st7" d="M360.2,693c0.7-0.7,1.4-1.3,2.1-2c1.4,1.3,2.4,3,2.2,5c-1-0.1-2.9-0.4-3.9-0.5c-0.1-0.5-0.3-1.4-0.4-1.9
+			L360.2,693z"/>
+		<path class="st7" d="M1255.9,691l0.7-0.4c0.3,1.3,0.7,2.7,1,4c1.1,4.3,1.9,8.7,2.5,13.2l0.9,0.2c1.9,0.4,3.8,1,5.8,1.6
+			c0.8,1.1,1.6,2.1,2.4,3.2c1.7-1.7,1.9-3.7,0.7-5.7c1.2,1,2.6,1.8,3.9,2.6c-0.1,0.3-0.2,0.8-0.2,1c-1.4,1.2-3,2.2-4.6,3.2
+			c-2.7-1-5.4-1.5-8.3-1.7c-0.4,1.8-0.8,3.5-1.4,5.2C1260.1,708.5,1257.7,699.7,1255.9,691z"/>
+		<path class="st7" d="M1713.4,695.1c1-3,3.9-5.2,7-3.6c-0.8,0.9-1.6,1.8-2.4,2.7C1716.7,695,1715,695.3,1713.4,695.1z"/>
+		<path class="st7" d="M1725.8,694c1.2-2.8,4.7-2.5,7.2-2.2v2.1c-0.8,0-1.5,0-2.3,0C1729.2,694.7,1726.9,696.2,1725.8,694z"/>
+		<path class="st7" d="M253.1,698.9c0.3-2.8,1.6-5.3,3.2-7.5c0.1,1.1,0.2,2.1,0.3,3.2c1.1,0,2.1-0.1,3.2-0.2
+			c2.4,1.7,5.4,2.8,7.2,5.2c-3,0.4-5.7,1.5-8.2,3.2C256.2,704.7,253.5,701.3,253.1,698.9z"/>
+		<path class="st7" d="M271.3,693.3c2.1-2.9,6.1-0.5,8,1.5c1.2,1.6-0.9,2.7-1.8,3.7c-1.4,1-1.4,2.8-1.9,4.2c-0.5,0-1.5,0.1-2,0.1
+			c-0.2-1.2-0.4-2.3-0.6-3.4c-0.4,0-1.2,0.1-1.6,0.1C271.2,697.5,270.8,695.3,271.3,693.3 M273.2,693.3c-2.6,0.6-1.2,3.6,0.7,4
+			c1.5,0.7,3.3,0,4.3-1.3C277.6,694.1,275.1,692.9,273.2,693.3z"/>
+		<path class="st7" d="M394.6,692.1c1.8,1.4,3.5,2.9,5.1,4.5c-0.4,0.7-1.2,2-1.6,2.7c-0.6-0.2-1.9-0.5-2.5-0.7
+			c-0.1-0.7-0.2-2-0.3-2.7C395.1,694.6,394.9,693.4,394.6,692.1z"/>
+		<path class="st7" d="M1287.5,696.5c-0.8-1.6,0.9-3.1,1.5-4.5c2.1,1.6,3.2,4.3,1.1,6.3C1289.2,697.8,1288.3,697.1,1287.5,696.5z"/>
+		<path class="st7" d="M1295.1,693.8c0.2-0.1,0.8-0.3,1-0.4c2-0.1,4-0.2,6-0.1l1.3,0.2c1.1,1.2,2.2,2.4,3.2,3.7
+			c0.1,0.5,0.2,1.5,0.3,2c-1.4-0.9-2.7-1.8-4.1-2.8c-2.1,0.8-4.1,1.6-6.2,2.4c0.3-1.5,0.6-3,0.9-4.4
+			C1296.9,694.3,1295.7,694,1295.1,693.8z"/>
+		<path class="st7" d="M799,699.5c2.5-2.5,5.5-4.5,8.8-5.5c-0.5,5.6,1.2,11.2,0.1,16.7c-2.2-1.7-4.8-2.8-7.5-2
+			c1.3-2,2.2-4.2,2.7-6.5C801.7,701.3,800.3,700.4,799,699.5z"/>
+		<path class="st7" d="M1278.9,700.7c-1.1-2.1-1.3-4.4,0.3-6.2c0.4,1,0.9,2,1.3,3.1c1.3,0.1,2.6,0.3,4,0.5c-0.6,2.4-2.6,3.8-4.6,5
+			C1279.7,702.5,1279.2,701.3,1278.9,700.7z"/>
+		<path class="st7" d="M534.6,697.2c3.2,4.3,7.3,7.6,10.7,11.8c-0.3,0.2-0.9,0.6-1.2,0.7c-1.5,4.6-5,8-8.6,11c0.4,1.5,0.8,3,1.2,4.5
+			c-0.8,0.9-1.7,1.8-2.5,2.7c-0.7-0.4-2.2-1.2-3-1.6c-0.3-2.1,0.3-4.2,0.3-6.2c-1.1-2.6-3-4.8-4.3-7.4c-1-2.4-2.6-4.3-4.6-6
+			c0.3-1.8,0.6-3.6,1-5.4c0.4-0.2,1.2-0.7,1.6-1c0.4,0.1,1.2,0.4,1.6,0.5c-0.5,1.7-1.2,3.3-1.8,5c1.7,0,3.4,0,5.1,0
+			C529.6,702.1,532.8,699.9,534.6,697.2 M537.5,706.6c-1.7,1.8-3.3,3.7-5.4,5c0.6,0.6,0.8,2,1.9,1.9c3.6,0.9,5-3.2,6.7-5.4
+			C539.7,707.6,538.9,706.1,537.5,706.6z"/>
+		<path class="st7" d="M368.4,699.4c0.7,1,1.4,1.9,2.2,2.9c0.8,1,1.6,2,2.4,2.9c-0.3,0.9-0.5,1.9-0.8,2.9c-0.6,0.2-1.7,0.7-2.2,1
+			c-0.6-0.9-1.2-1.8-1.7-2.7C368.3,704,368.4,701.7,368.4,699.4z"/>
+		<path class="st7" d="M1704.3,700.8c1.6-0.4,3.3-0.8,5-1.1c0.1,2.6-1,4.8-3.3,6C1705,704.2,1704.2,702.7,1704.3,700.8z"/>
+		<path class="st7" d="M1722.5,700.4c0.7-1.6,3,0.2,2.6,1.6c0,0.8-0.1,2.4-0.1,3.2C1723.7,703.9,1720.5,702.5,1722.5,700.4z"/>
+		<path class="st7" d="M142.3,705.4c0.3-1.8,0.6-3.7,1.6-5.2c2.1,1.4,3.2,3.3,1.9,5.7C144.6,705.7,143.4,705.5,142.3,705.4z"/>
+		<path class="st7" d="M1140.7,702.1c1.1-0.4,2.3-0.7,3.4-1c-0.5,1.4-1.1,2.8-1.7,4.2c0.3,4.9,0.1,10,1.6,14.7
+			c-0.7-0.5-1.4-1-2.1-1.5c0-1.7,0-3.3,0-5c0-1.4-0.1-2.8,0-4.2l0.1-0.7c-1.4,0.2-2.7,0.5-4.1,0.6c-0.7-1-1.3-2.1-1.9-3.1
+			c0.7-0.3,2.1-0.9,2.8-1.2C1139.4,704,1140,703,1140.7,702.1z"/>
+		<path class="st7" d="M269.4,701.9c2.4,5.1-0.7,10.4-1.9,15.4c1.2,0.5,2.4,1,3.7,1.3c0.6,0.2,1.7,0.5,2.2,0.7
+			c-0.5,1.3-1,2.6-1.6,3.9c-1.3-1-2.6-1.9-3.8-2.9c-0.9,1.8-1.9,3.6-2.9,5.3c-1.6,2.1-2.4,4.6-2.8,7.2c-0.2,0-0.7-0.1-0.9-0.1
+			c0.8-6.6,2.7-13,3.7-19.6c-0.5-0.2-1.4-0.7-1.9-1c-0.4,0.5-1,1.4-1.4,1.8c0.1,1.4,0.3,2.8,0.4,4.2c-2.1,1.1-4.3,2.3-6.4,3.5
+			c1.2-3.7,2.7-7.2,4.2-10.8c1.6-0.4,3.2-0.8,4.7-1.2c0.9-0.7,1.7-1.5,2.6-2.3C268,705.4,268.7,703.7,269.4,701.9z"/>
+		<path class="st7" d="M353.3,709.6c-0.4-3.8,3.3-6.5,6.6-7.3c0.9,0.8,1.7,1.8,2.5,2.7C359.9,707.4,357.3,711.7,353.3,709.6z"/>
+		<path class="st7" d="M1710.2,702.2c1.1-0.9,4.8-1.4,4.4,0.8C1715.3,706.4,1707.5,705,1710.2,702.2z"/>
+		<path class="st7" d="M988.7,703.5c1.7,0.2,2.9,1.8,4.2,2.7c1-0.6,2.1-1.2,3.2-1.8c1.1-0.3,2.3-0.4,3.5-0.3
+			c0.7,0.6,1.5,1.2,2.2,1.8c3.2,0.9,5.4,3.3,7.6,5.7c1.7,1.5,0.6,4,0.9,6c-1.3-1.2-2.5-2.4-3.8-3.7c-3.4-0.3-5.6-2.6-6.6-5.8
+			c-3.4,1-6.8,3-8.6,6.1c-0.2,2.8,3.3,4,4.9,5.9l0.3,0.6c-1.1,0.6-2.2,1.3-3.2,1.9c-2.3-2.2-4.7-4.3-7.2-6.3c0.8-2,1.7-3.9,2.2-5.9
+			C988.3,708.2,987,705.6,988.7,703.5z"/>
+		<path class="st7" d="M1112.9,703.9c0.7-1.1,1.8-1.6,3.2-1.5c0,2.3,0,4.5-0.2,6.8c-0.2,0.3-0.7,0.8-0.9,1c-0.5,0.1-1.5,0.3-2,0.4
+			C1113,708.4,1112.9,706.2,1112.9,703.9z"/>
+		<path class="st7" d="M699,703.4c2.1,0.5,4.2,1.1,6.3,1.6c-5.1,5.9-11,11.1-17.4,15.4c-0.1-3.1-0.2-6.3,1.6-9
+			c2.5-0.8,5.2,0.1,7.7,0.2C697.8,708.9,698.4,706.2,699,703.4z"/>
+		<path class="st7" d="M1295.6,704.2c1.6,0.6,3.3,1.2,5,1.8c0.6,1.3,1.1,2.6,1.7,3.9l-0.5,0.6c-1.2,0-2.4,0-3.6,0
+			c-0.6,0.4-1.1,0.7-1.6,1.1C1296.1,709.2,1295.8,706.7,1295.6,704.2z"/>
+		<path class="st7" d="M1729.8,706c0.8-0.7,1.6-1.3,2.5-2l0.8-0.6v11.3c-0.6,0-1.7,0.1-2.3,0.2c0.3-0.4,0.8-1.2,1.1-1.7
+			c-1.7-0.7-3.4-1.3-5-2l0.9,0.1c0.8-0.1,2.3-0.2,3.1-0.3C1730.5,709.4,1730.1,707.7,1729.8,706z"/>
+		<path class="st7" d="M130,713.8c-0.7-3.5,2.2-6.3,5-7.9c0.9,2,0.4,4.2-0.2,6.2c2.1,0.1,4.2,0.3,6.3,0.4c0.7,2.7,2.2,5.4,2.1,8.2
+			c-2.2,1.6-5.6,3.5-7.7,0.6c-3.4-2.1-1.4-6-0.9-9C133,712.9,131.5,713.4,130,713.8 M134.4,719.5c2.2-0.1,4.4-0.4,6.5-1.1
+			c-0.5-1.6-0.3-3.8-1.8-4.9C135.7,712.9,134.4,716.8,134.4,719.5z"/>
+		<path class="st7" d="M511,708.5c0.8-1.2,1.6-2.4,2.4-3.5c0.8,1.2,2.6,2.3,2.1,4c-0.5,1.7-1.4,3.1-2.2,4.7
+			c-2.3-0.4-4.5-1.1-6.8-1.1c-2.4,0.6-4.6,1.8-6.8,2.8c0.1-1.5,0-3,0.3-4.5c1.8-1.6,4.2-2.2,6.3-3.3c0.6,0.1,1.7,0.2,2.3,0.3
+			C509.1,708,510.4,708.3,511,708.5z"/>
+		<path class="st7" d="M1592.9,708.9c1.4-0.2,2.2,0.5,2.4,2.2c0.5,1.4,1.1,2.8,1.7,4.2l-0.2,1.3
+			C1593.6,715.5,1592,712.1,1592.9,708.9z"/>
+		<path class="st7" d="M975.6,709.8c0.5,1.3,1.1,2.5,1.6,3.8c-1.9,1.9-3.6,4.1-4.5,6.7c-2.1,0.1-4.1,0.1-6.2,0.2
+			c0.2-0.3,0.5-1,0.6-1.4c1.3-2.8,2.3-5.7,3.2-8.6c0.3,0.9,0.8,2.7,1.1,3.6C972.9,712.7,974.2,711.2,975.6,709.8z"/>
+		<path class="st7" d="M517.9,711.8c0.9-0.1,2.8-0.3,3.8-0.4c0,5.7-2.9,11.8-8.7,13.5c-0.3-0.7-0.8-2-1.1-2.7
+			C515.6,719.8,515.5,715.1,517.9,711.8z"/>
+		<path class="st7" d="M996.1,715.1c1.3-1.1,2.7-2.1,4-3.1c0.9,0.9,1.8,1.9,2.6,2.8c-0.9,1-1.9,2-2.8,3
+			C998.6,716.9,997.3,716,996.1,715.1z"/>
+		<path class="st7" d="M148.4,718.2c-1.6-1.8,0.5-3.5,1.5-4.9c0.8,1.1,1.6,2.2,2.5,3.3c1.5,0.5,4.2-0.5,4.8,1.2
+			c-0.7,2.4-1.9,4.7-3,7c-1.2-1.3-2.4-2.6-3.6-3.9C149.8,720,149.1,719.1,148.4,718.2z"/>
+		<path class="st7" d="M1313.8,719.3c0.6-2.3,1.9-4.4,4.7-3.9C1319,718.5,1316.6,720.2,1313.8,719.3z"/>
+		<path class="st7" d="M1416.2,717.4c3.1-0.1,6.2,0.3,9.2,1.2c1.9,3.5-2.3,8.1-6.1,7c-1.2-2.5-3.4-4.7-4.1-7.3
+			C1415.5,718,1416,717.6,1416.2,717.4z"/>
+		<path class="st7" d="M248.5,719c2.4,1.5,4.9,3.1,7.2,4.9c-0.9,0.8-1.8,1.6-2.8,2.4c-0.5-0.3-1.4-0.9-1.9-1.2
+			C250.2,723.1,249.4,721,248.5,719z"/>
+		<path class="st7" d="M805.3,720.2c1.8-2.2,4.6,0,6.4,1.2c0.5,1.5,0.7,3.2,0.9,4.8c-0.3,2.7-0.2,6-2.7,7.7
+			c-2.3,1.6-4.2,3.8-4.8,6.6c5.6,0.2,11.3,0.3,17,0c0.3-1.2,0.6-2.4,0.9-3.6c1.5-0.6,3-1.2,4.5-1.8c0.2,1.8-0.4,3.9,0.5,5.6
+			c2.1,0.3,4.3,0.3,6.4,0.5l1.3,0.2c-12.2,0.3-24.5,0.1-36.7,0.2c-12.6,0.2-25.1,1.9-37.6,1.5c6.4-1.4,12.9-1,19.4-1.9
+			c1.2-0.1,2.5-0.2,3.8-0.3c5.3-0.3,10.7,0.2,16-0.3c0.8-2.5,1.8-5,3.8-6.8c2-1.9,4.1-3.5,6.2-5.2c-2.1-2-4.8-3-7.4-3.8
+			C803.7,723.3,804.3,721.6,805.3,720.2z"/>
+		<path class="st7" d="M981.2,723.7c-0.2-1.9,0.5-3.6,1.6-5.2c1.8,1,3.8,2.2,4.2,4.4C985.2,723.5,983.2,723.7,981.2,723.7z"/>
+		<path class="st7" d="M1305.4,721.8c1.2-1.5,2.8-2.5,4.8-2.5c0,0.7,0.2,2,0.2,2.6c-0.6,1.9-1,3.9-1.1,5.8c-0.6-0.3-1.2-0.5-1.8-0.8
+			c0.2-0.5,0.6-1.5,0.8-2.1C1307.3,723.9,1306.3,722.9,1305.4,721.8z"/>
+		<path class="st7" d="M117.6,730.5c1.5-4,4-7.6,6.6-11c1.2,0.5,2.4,1,3.7,1.4c-0.5,0.7-1,1.5-1.5,2.2c0.2,0.9,0.5,1.8,0.8,2.7
+			C124.4,728.3,121.5,731,117.6,730.5z"/>
+		<path class="st7" d="M1553.2,720.1c2.2,0.1,3.8,1.6,5.6,2.7c-0.7,1-1.3,2-1.9,3C1555.3,724.1,1552.6,722.7,1553.2,720.1z"/>
+		<path class="st7" d="M1609.3,720.4c1.9,1.2,3.9,2.4,6,3.4c-1.1,0.8-2.1,1.6-3.2,2.4c1.3,1.9,2.7,3.7,4.3,5.5
+			c0.1,0.5,0.3,1.5,0.4,1.9c-0.6,0-1.9,0-2.5,0c-0.6-1-1.1-2.1-1.6-3.1c-0.6-0.2-1.8-0.7-2.4-0.9c-0.5-0.2-1.4-0.6-1.8-0.7
+			c0.2-0.3,0.4-0.9,0.6-1.2c0.6-1.2,1.2-2.4,1.8-3.6c-1-0.7-1.9-1.5-2.8-2.2C1608.3,721.4,1609,720.7,1609.3,720.4z"/>
+		<path class="st7" d="M376.7,725.6c-1.6-1.3-2.4-3.3-2.5-5.3c2.1,0.2,4.2,0.4,6.4,0.6C380.7,723.5,379.7,725.7,376.7,725.6z"/>
+		<path class="st7" d="M639,725.9c2.1-1.3,3.9-5.2,6.7-3.5c3.3,1.8,2,6.1,0.3,8.6c-0.9,1.9-3.1,3.6-2.1,5.9c1.7,1.8,3.5-1,5.1-1.7
+			c1.4,1.6,3,3,4.8,4.1c-16.4,5.7-33.5,9.6-50.8,10.7c-7,0.6-14-0.8-21-0.3c-8.6,0.5-17.1-1.5-25.5-3.4c-2.8-0.6-5.4-1.6-8-2.7
+			c8.9,1.4,17.6,4.2,26.6,5c3.6,0.2,8.4,2,10.9-1.6c1.9-1.5,4.1-2.6,6.1-4.1c2.7-2.5,4.3-6.2,7.8-7.8c2.7,0,3.5,2.7,3.9,4.9
+			c-2.4,0.3-4.8,0.8-7.1,1.3c0.2,1.5,0.5,3,0.7,4.5c-2,0.9-3.9,1.8-5.8,2.8c2.6,0.2,5.1,0.5,7.7,0.5c6.8-0.3,13.5-1.1,20.2-1.9
+			c1.2-1.8,2.2-3.6,3.3-5.5c1.8-1,5.1-1.1,5.1-3.8c0.2-1.4,0-3.9-2-3.7c-2.2,1.3-4.3,2.9-6.6,4.1c0.2-1.9,0.4-3.7,0.7-5.5
+			c2.4-2.9,6.1-4.1,9.5-5.4C632.6,726.3,636.5,728.6,639,725.9 M633.1,738.2c0.4,1.8,0.3,4.9,2.9,5c2.6-0.3,4-2.7,5.2-4.8
+			C638.5,738.2,635.8,738.2,633.1,738.2z"/>
+		<path class="st7" d="M1364.1,727.5c7.1,0.6,14-1.4,19.8-5.4l0.3,0.1c1.3,0.3,2.6,0.7,4,1c1.5,0.3,3.2,0.3,4.7,0
+			c0.7,2.2,1.5,4.3,2.3,6.4c0.8,0.2,2.5,0.5,3.3,0.6c-0.2-0.5-0.6-1.5-0.8-2c3.2,0,6.5,0.4,9.6-0.7c0.7-0.2,2.2-0.6,2.9-0.8
+			c0.1,0.8,0.2,2.4,0.3,3.2c-0.9,0.1-2.6,0.4-3.4,0.5c-0.1,0.3-0.4,0.8-0.5,1.1c-0.1,0.3-0.4,0.9-0.5,1.2c0.6,1.4,1.3,2.8,2.1,4.2
+			c-2.8,0.6-5.7,1.3-8.5,1.8c-0.2,0.6-0.7,1.7-0.9,2.3c-0.5,0-1.5-0.1-2-0.2c-0.4,0-1.3,0.1-1.7,0.2c-0.7-1.6-1.3-3.2-2-4.7
+			c-1.1,1.2-2.2,2.4-3.5,3.5c-1.7-0.2-1.2-2.3-1.6-3.5c-0.7-1.3-1.7-2.6-1.6-4.1c0.8-0.1,2.4-0.3,3.2-0.4c0.6,1.7-0.4,5,2.4,4.9
+			c2-1.8,1.7-4.8,0.3-6.8c-0.1-0.7-0.4-2.1-0.6-2.9c-2.4,2.3-5.5,3.3-8.8,2.9c0.2-0.6,0.7-1.7,1-2.3l0.8-0.5
+			c-1.6-0.6-3.1-1.1-4.6-1.7c-0.9,1.7-1.9,3.4-3.1,5c-0.3-0.9-0.8-2.7-1-3.5c-0.2,1.2-0.5,2.4-0.7,3.6c-0.6,0.2-1.9,0.7-2.5,1
+			c-0.5-1.1-1-2.2-1.5-3.3c-2.2,0.2-4.3,0.5-6.4,0.8c0.4,1,0.8,2,1.2,3c-0.8,3.5-1.6,7-0.8,10.6c1.4-2,1.9-5.8,5.1-5.2
+			c-0.6,1.7-1.1,3.4-1.6,5c4.1-1.1,8.3-2.1,12.6-1.6c0.7,0.1,2.1,0.2,2.8,0.2c1.7,0.1,3.3,0.3,5,0.5c-8.3,1.3-16.7,0.9-25,2.2
+			c-0.3-2.3-0.3-4.5-0.1-6.8c-0.3-1-0.6-2-0.8-3C1363.5,731.8,1363.8,729.6,1364.1,727.5 M1398.4,730.7c-1.1,1.8-2.2,3.6-3.2,5.5
+			C1398.6,737.5,1401.3,732.9,1398.4,730.7z"/>
+		<path class="st7" d="M548.1,724.1c3.9-0.6,5.9,4.3,4.3,7.3c-0.9,0.5-1.6,0.3-2-0.7C548.9,728.8,548.5,726.4,548.1,724.1z"/>
+		<path class="st7" d="M1271.5,724.8c1.3-1.2,3.1-0.7,4.8-0.8c-0.3,1.8-1,3.5-2.2,4.9C1273,727.7,1271.4,726.6,1271.5,724.8z"/>
+		<path class="st7" d="M1399.4,724.2c1.5-2,2.7,0.8,2.4,2.2c-1.1,0-2.3,0.3-3.1-0.4C1398.9,725.6,1399.2,724.7,1399.4,724.2z"/>
+		<path class="st7" d="M330.8,729.6c2.6-2,5.7-3.5,8.8-4.6l0,0.4c0,0.4,0.1,1.2,0.1,1.6c0.3,1.4,0.7,2.8,1,4.2
+			c-2.6,0.3-4.5-1.5-6.1-3.3c-1,1.6-2,3.2-3.1,4.8c-1-0.1-1.9-0.2-2.8-0.4c-0.3-1.5-0.5-3-0.8-4.5c-1.6,0.2-3.3,0.3-5,0.5l-0.7,0
+			c0-0.2,0.1-0.7,0.1-1c2.3,0,4.6-0.1,6.9,0C329.7,727.9,330.5,729,330.8,729.6z"/>
+		<path class="st7" d="M1075.3,727.5c5.4,0.4,10.7-1,16-2.3c-1.1,1.5-2.2,3.1-3.2,4.7c-0.5-0.3-1.6-0.8-2.1-1
+			c-0.3-0.2-0.9-0.7-1.2-0.9c-0.8,0-2.6,0-3.4,0c-1.9,0.2-3.7,0.5-5.5,0.9c-0.1,2.9,0.1,5.8,0.5,8.7c0.2,1.5,0.4,3.1,0.7,4.6
+			c1.3,0,2.6,0,3.9,0.1c-0.9-1.1-1.9-2.1-2.7-3.3c1.1-2.8,4.3-3.7,6.8-5c0.9,2.5,1.4,5.2,1.9,7.8c2.6-0.2,5.3-0.6,7.9-0.8
+			c1.3,0.1,2.6,0.2,4,0.4l1.7,0.2c-6.4,1.3-13,0.7-19.5,1.6c-1.7,0.1-3.4,0.5-5,0.1c-0.4-0.9-0.7-1.8-0.9-2.6
+			C1075.1,736.2,1074.2,731.8,1075.3,727.5z"/>
+		<path class="st7" d="M98.7,727.6c5.2,0,10.3-0.6,15.4-1.6c-0.4,0.4-1.2,1.1-1.5,1.5c-4.3,0.4-8.7,0.7-12.9,2.1
+			c-0.3,4.2-0.3,8.3,0,12.5l1-0.2c1.8-0.3,3.5-0.5,5.3-0.7c0.5-0.9,1-1.7,1.4-2.6c1.2-0.2,2.3-0.5,3.5-0.7c1-2.7,2.2-7.5,6.1-5.8
+			c0.2,2.3-0.3,4.6-1.1,6.8c-0.4,0.6-1.1,1.8-1.4,2.4c2,0,4.1,0,6.1,0c0.4,0,1.3,0,1.7,0l0,1.1c-7.9,0.3-15.8,0.2-23.7,0.4
+			c-0.1-3-0.2-5.9-0.2-8.9C98.4,731.7,98.5,729.7,98.7,727.6z"/>
+		<path class="st7" d="M1151.4,725.9l0.3-0.3c2.1,0.7,4.2,1.3,6.4,2c-0.6,0-2,0.1-2.6,0.2c-1.1,3.6,1.9,6.1,4.4,8.1
+			c-1.8,0.9-3.6,1.9-5.4,2.8c0,0.4-0.1,1.3-0.1,1.8c1.6,0.4,3.3,0.9,4.9,1.2c-3.5-0.1-7.1,0.2-10.6,0.3c-2.3-0.3-4.5-0.8-6.8-1.3
+			c-0.8,0.2-1.7,0.3-2.5,0.5c0-1.5,0-3-0.2-4.5c-2.5-0.6-4.8,1-7,2c-0.7-0.7-1.4-1.3-2-2c2.3-1.3,4.7-2.6,6.7-4.4
+			c0,0.9-0.1,2.6-0.2,3.4c1.8-0.3,4.1-0.5,4.7-2.7c-1-1.2-2.3-2.1-3.5-3.1l-0.4-0.4c1.8-1,5.3-3.8,6.5-0.7c1.6,4.5,3.7,8.8,6.6,12.6
+			c0.5-3,0.8-6,1.1-9c-1.4-1.1-2.8-2.1-4.2-3.2C1148.9,728.1,1150.1,727,1151.4,725.9z"/>
+		<path class="st7" d="M1456.3,727.3c1.1,0.1,2.2,0.2,3.2,0.2c0.6,4.6,0.2,9.2,0.3,13.8c-0.1,0.3-0.2,0.9-0.3,1.2
+			c-11.4,0.6-22.7-0.5-34-1.3c1-0.9,2-1.9,3.2-2.6c3.1,1.7,6.5,2.5,10.1,2.5c2,0.2,4.1,0.4,6.1,0.6c1.3,0.1,2.7,0.2,4.1,0.3
+			c3.4,0.6,6.6-0.8,9.6-2.5c0.2-3.7,0.2-7.5,0-11.2l-1,0.5l-1.1,0.4C1456.4,728.9,1456.3,727.8,1456.3,727.3z"/>
+		<path class="st7" d="M1715.3,729.2c1.7-1.1,3.6-2,5.5-2.8c0.1,0.8,0.3,2.5,0.4,3.4c-0.7,0.2-2.1,0.5-2.8,0.7
+			c-1.5,0.9-3,1.7-4.7,2.2C1714.2,731.4,1714.8,730.3,1715.3,729.2z"/>
+		<path class="st7" d="M185.5,727.6c1.9,5,0,10.5,0.5,15.7c-10.6-0.6-21.2-0.9-31.9-1.6c-0.4-0.8-0.8-1.5-1.2-2.2
+			c-2.3,0.8-4.7,1.4-7.1,1.5c2.6-1.6,5-3.4,7.5-5.1c0.9,1.8,1.7,3.6,2.8,5.3c1.6,0.2,3.2,0.2,4.8,0.2c-0.2-1.4-0.5-2.9-0.8-4.3
+			c3.5,1,7.1,1.7,10.7,1.4c1.3,1,2.5,2.2,4,2.8c2,0.6,3.8-0.6,5.6-1.1c1.5,0,3,0.1,4.5,0.3c0-2.8,0.1-5.6,0.1-8.5
+			C185.3,730.5,185.4,729,185.5,727.6z"/>
+		<path class="st7" d="M654.8,729.7c0.3-0.6,1-1.7,1.3-2.2c4.5,0.8,7.2,5.1,11.6,5.9c-2.8,1.3-5.6,2.5-8.6,3.5
+			c-0.4,0-1.2,0.1-1.6,0.1c0.2-1.7,0.5-3.3,0.7-5c-0.4-0.3-1.3-0.9-1.7-1.2C656.1,730.6,655.2,730,654.8,729.7z"/>
+		<path class="st7" d="M996,730.4c1.1-1,2.1-2,3.2-2.9c3,2.5-0.8,5.8-1.1,8.7c-2.1,2.4-4.3,0.2-5.7-1.6c-1.5-1.8-3.8-0.6-5.5,0.1
+			C987.6,730.7,992.5,728,996,730.4z"/>
+		<path class="st7" d="M1038.8,727.6c4.7,0.2,9.7-0.7,14.2,0.5c1.1,4.9-1.4,10.1,0.1,15.2c-13.1-0.2-26.2-0.9-39.3-1.8
+			c2.2-2.2,4.7-4.2,7.9-4.4c-0.2,1.3-0.4,2.7-0.6,4.1c6-0.1,11.9,0.6,17.9,1.2c1.9,0.3,3.7-0.4,5.3-1.3c0.2-0.1,0.8-0.3,1-0.5
+			c0.4,0.5,1.2,1.4,1.7,1.8c1.2-0.1,2.4-0.1,3.6-0.2c-2.4-4.7,1.7-8.8,1.9-13.4c-1.6,0-3.2,0-4.8,0c0.2,2.1,0.3,4.2-0.2,6.3
+			c-1-0.7-2.1-1.3-3.1-2C1043.1,730.7,1041.1,728.9,1038.8,727.6z"/>
+		<path class="st7" d="M1632.5,727.7c1,1.7,1.1,3.7,0.8,5.7c-0.2,1.2-0.3,2.5-0.5,3.7c-0.9-2.4-2.1-4.7-3.4-7
+			C1630.4,729.3,1631.5,728.5,1632.5,727.7z"/>
+		<path class="st7" d="M592.6,729.2c5.7-1,11.5,0.2,17.3-0.4l-0.3,1c-0.4,1.1-0.9,2.3-1.3,3.4c-1,0.2-2,0.4-3.1,0.6
+			c-0.6-1.3-1.2-2.6-1.7-3.9c-1.6-0.1-3.2-0.1-4.8-0.1c-0.2,0.5-0.6,1.5-0.8,2c-1.1-0.6-2.2-1.1-3.3-1.7
+			C593.9,729.8,593.2,729.5,592.6,729.2z"/>
+		<path class="st7" d="M1121.2,733.9c-1.6-1.3-4.2-4-1.1-5.3C1121.5,729.9,1122.2,732,1121.2,733.9z"/>
+		<path class="st7" d="M524.2,734c1-1.5,1.9-3,2.9-4.5c0.8,0.1,2.3,0.4,3.1,0.5c-0.6,2-1.2,4-1.8,6C527,735.3,525.5,734.7,524.2,734
+			z"/>
+		<path class="st7" d="M1528.1,729.8c1.4-0.9,2.4-0.5,3.1,0.9C1530.4,732.7,1527.3,732,1528.1,729.8z"/>
+		<path class="st7" d="M253.2,731.6c0.7-0.3,2.2-0.8,2.9-1.1c0.1,0.6,0.5,1.8,0.6,2.5c1.2,3.6,4.8,5.4,6.7,8.6
+			c-0.2,0.4-0.5,1.2-0.7,1.7c-4,0.1-8.3,0.9-12.1-0.6c2-0.2,4-0.3,5.9-0.4c-0.4-1.4-0.8-2.7-1.2-4.1
+			C254.7,735.9,253.9,733.8,253.2,731.6z"/>
+		<path class="st7" d="M1570.6,741.4c1.3-3.8-0.2-8.6,3.3-11.5c1.6,2,4.5,3.7,4.6,6.5c-1.5,2-3.6,3.5-5.7,4.9
+			C1572.2,741.4,1571.1,741.4,1570.6,741.4z"/>
+		<path class="st7" d="M1711.5,737c4.4,0.4,7.2-3.3,10-6.1c-0.1,0.5-0.4,1.6-0.5,2.1c0.2,0.5,0.7,1.5,0.9,1.9l0.2,0.3l-1,0.1
+			c0.2,0.6,0.5,1.9,0.7,2.6c1.7-0.5,3-1.5,4.3-2.8c3.5,1.5,4.5,5.4,5.6,8.7c-2.8-0.4-4.2-3.1-5.8-5c-0.3,2.3-0.3,4.8-1.5,6.9
+			c-1.6-0.2-2.5-1-2.8-2.5c0.7,0.1,2.1,0.3,2.8,0.4c-0.3-2,0.3-4.6-2.1-5.3c-0.3,1-0.8,3-1,4.1c-0.7-2-1.7-3.9-2.6-5.8
+			c0.2,1.6,0.4,3.2,0.7,4.8c-1-0.1-1.9-0.2-2.9-0.3c-1.9,2.4-3.6,5-5.6,7.3c0.2-1.3,0.4-2.6,0.6-3.9c1.3-1.3,3-2.6,3-4.7
+			c-2.2-3-4.6,0.5-5.9,2.4c-0.1-1.3-0.1-2.5-0.2-3.8c-1.4-0.2-2.8-0.1-4.1,0c1.4-1.5,2.7-3.1,3.8-4.8c0.5-0.3,1.6-0.9,2.1-1.2
+			c0.2,0.3,0.7,1,1,1.4c0.1,0.5,0.2,1.4,0.2,1.8L1711.5,737z"/>
+		<path class="st7" d="M1558.3,731.8c1.8,0.3,2.9,1.8,3.6,3.4l-1.4,1.1c-0.3,0.2-0.8,0.7-1.1,0.9c1.2,1.5,2.6,2.9,3.9,4.3
+			c-2.3,0-4.6,0-6.9,0c0-1.1-0.1-2.2-0.1-3.3c0.7-0.7,1.3-1.4,2-2.1C1558.3,734.7,1558.3,733.3,1558.3,731.8z"/>
+		<path class="st7" d="M135.4,732.7c0.6,1.4,1.2,2.9,1.7,4.4c-0.1,0.6-0.1,1.7-0.2,2.3l0,0.8c-0.3-0.6-0.9-1.7-1.1-2.2
+			c-0.7-0.1-2.1-0.2-2.8-0.2C133.5,735.9,134.5,734.2,135.4,732.7z"/>
+		<path class="st7" d="M1010.7,734.8c1.1-0.5,2.2-1.4,3.5-1.2c0.3,1.6,0.5,3.2,0.7,4.8c-0.7,0.3-2.2,0.9-2.9,1.2
+			c-0.3-0.6-0.8-1.9-1.1-2.5C1010.8,736.5,1010.8,735.3,1010.7,734.8z"/>
+		<path class="st7" d="M1090.2,733.1c1.1,0.7,2.2,1.3,3.3,2c0.1,0.4,0.4,1.4,0.5,1.8c-0.9,0.7-1.8,1.3-2.7,2
+			c-0.9-1.3-1.8-2.5-2.6-3.8C1089,734.7,1089.8,733.7,1090.2,733.1z"/>
+		<path class="st7" d="M1544.3,734.8c0.5-0.6,0.9-1.1,1.4-1.7c0.7,1.3,1.5,2.6,2.3,3.9c-0.2,0.5-0.3,1-0.5,1.6
+			c1.9,0.3,3.7,0.5,5.6,0.8c0.1,0.5,0.3,1.6,0.4,2.1c-4.4,0-8.8,0-13.1,0.7l0-1c0.1-2.3,0.4-4.7,0.6-7l0-0.3
+			c0.3,1.2,0.7,2.5,1.2,3.7c1.2,0.5,2.6,0.9,4,1C1545.7,737.3,1545.1,736,1544.3,734.8z"/>
+		<path class="st7" d="M787.5,736c1.8-1.1,3.8-1.6,5.8-2c0.2,0.8,0.7,2.3,0.9,3c-1.1,0.8-2.2,1.7-3.3,2.5
+			C789.8,738.4,788.6,737.2,787.5,736z"/>
+		<path class="st7" d="M1372.8,739.7c-3.7-1.7,0.1-5.1,2.4-5.9C1375.3,735.9,1376,739.7,1372.8,739.7z"/>
+		<path class="st7" d="M1122.9,735.1c2.6,0.4,5.5,0.7,6.7,3.5c2.1,0.6,4.3,1.2,6,2.7c-3.9,0.1-7.8,0-11.8,0
+			c-0.2-0.6-0.6-1.8-0.9-2.4C1122.9,737.6,1122.9,736.4,1122.9,735.1z"/>
+		<path class="st7" d="M1254.4,734.6c0.8,0.3,2.3,0.8,3.1,1c0.2,0.1,0.5,0.2,0.7,0.3c-0.3,0.7-0.8,2.2-1,2.9
+			C1256.1,737.6,1255.1,736.2,1254.4,734.6z"/>
+		<path class="st7" d="M579.5,737.5c2,0,4-0.1,6-0.1c0,1.1,0,2.1,0,3.2c-1.6,0.5-3.4,1.3-5.1,0.8C579,740.6,579.7,738.8,579.5,737.5
+			z"/>
+		<path class="st7" d="M1294.2,738.2c1.3-0.7,2.6-1.4,3.9-2.1c0.6,0.4,1.8,1.2,2.5,1.7c0,0.7,0,2.2,0.1,2.9c1,0,2.1,0.1,3.2,0.1
+			c1.4,0,2.8,0.1,4.3,0.2c2.3,0.1,4.7,0.1,7.1,0.1c0.2-1.3,0.5-2.7,0.8-4c1.7,0.8,2.9,2.3,3.9,3.8l0.3-0.3c0.8-0.3,2.4-0.8,3.2-1.1
+			c0,0.7,0,2.1,0,2.8c-2.3,0.1-4.4-0.6-6.3-1.7c-0.3,0.3-1,0.9-1.3,1.2c-7.4-0.8-15,0.7-22.2-1.2c0.8,0,2.5-0.1,3.3-0.1
+			C1295.9,739.8,1295,739,1294.2,738.2z"/>
+		<path class="st7" d="M1106.8,741.3c2.1-1.3,4-2.8,6.2-3.8c1.1,0.3,1.9,1.2,2.8,1.9c0.5,0.5,1.4,1.4,1.9,1.8
+			C1114.1,741.3,1110.5,741.4,1106.8,741.3z"/>
+		<path class="st7" d="M1719.6,743.6c0.9,2.1,2.2,4.1,3.9,5.7c0.8-0.9,1.5-1.8,2.3-2.7c1.3,0.3,2.6,0.7,4,0.9
+			c1.2-0.6,2.1-1.6,3.1-2.5v4.7c-1.4,0-2.8-0.1-4.2-0.1c0,0.7,0,2.2,0,2.9c1.4-0.1,2.8-0.3,4.2-0.5v1.6c-1.8-0.4-3.7-0.3-4.6,1.6
+			c0-0.7,0-2.1,0-2.7c-2.5-0.1-4.6,1.3-6.6,2.6c-1.6,1.2-3.5,0.1-5-0.5c1.6,0,5.4,0.2,4.8-2.5c0.2-2.4-3-1.9-4.5-2.4
+			c0.9-0.6,1.9-1.2,2.9-1.8C1719.8,746.5,1719.7,745,1719.6,743.6z"/>
+		<path class="st7" d="M1702.7,747.2c2.6,0.6,5.3,1.1,8.1,1.4c-0.1,0.2-0.3,0.7-0.4,0.9c-0.3,0.8-0.7,1.6-1,2.5
+			c0.8,2.4,1.4,4.9,2,7.3c1.3,0.2,2.6,0.3,3.9,0.4c-1,0.5-1.9,1-2.9,1.5c0.2,1.7,0.4,3.5,0.6,5.2l-0.8-0.1c-0.4-2.2-1.4-4.1-3.5-5
+			c-0.1,1.5-0.1,3.1-0.1,4.6c0.8,0.7,1.5,1.5,2.3,2.3c-2,0.6-4.1,1.1-6.1,1.6c-0.7,1.3-1.3,2.6-1.9,3.9c-0.1-2.5-0.1-5-0.2-7.4
+			c1.5,0,3,0,4.6,0.1c0.1-0.5,0.3-1.5,0.4-1.9c-0.7,0-2.1,0.1-2.8,0.1c0.3-0.7,0.8-2,1.1-2.6c0.4-1,0.8-2,1.3-3c1,0.2,2,0.4,3.1,0.6
+			c-0.1-1.5-0.3-3.1-0.4-4.6c-0.5,0.2-1.5,0.5-1.9,0.6c-0.5-0.2-1.6-0.5-2.2-0.7c0.2-0.4,0.6-1.1,0.8-1.4c-1.3-0.1-2.7-0.2-4-0.2
+			C1702.7,751.2,1702.6,749.2,1702.7,747.2z"/>
+		<path class="st7" d="M15.2,755c2.1,0.2,4.2,0.4,6.3,0.7l0.6,1.2c1.6,3.6,5,5.8,7.6,8.7c-0.5,4.2,0.1,8.5,0.1,12.8
+			c-0.5-0.3-1.5-0.9-2-1.2c0.2-0.9,0.4-1.8,0.6-2.7c-2.3-4.9-4.9-9.7-9.6-12.6c-0.7,3.7-0.5,7.6-2,11c-0.6,1.6-2.4,1.4-3.8,1.6
+			c-1.4,0.1-2.7,0.1-4.1,0.2c0.1-0.3,0.3-1,0.3-1.3c1.8-0.2,3.7-0.2,5.5-0.5c1.9-1.1,1.2-3.6,1.4-5.3c-1.1,0.5-2.1,1.1-3.2,1.6
+			l0.1-0.2C15.4,764.5,15.8,759.7,15.2,755 M16.3,756.4c0.1,1.4,0.3,2.8,0.4,4.2c1.3-0.3,2.6-0.7,3.9-1c-0.1-1-0.2-1.9-0.3-2.8
+			C18.9,756.6,17.6,756.5,16.3,756.4z"/>
+		<path class="st7" d="M19.3,798.2c0.3-0.2,1-0.5,1.3-0.7c-0.4,2.2-0.9,4.4-1.3,6.6c-1.6,1.1-3.5,1.9-4.7,3.5
+			c-1.1,2-1.4,4.3-1.9,6.5c0.5,0.2,1.5,0.5,1.9,0.7c0.8-1.4,1.6-3,2.7-4.2c3.5-0.5,7.1-0.2,10.6-0.3c1.1,2.8,1.6,5.8,1.2,8.8
+			c-1.4,2.4,0.8,3.7,2.8,4.5c0.4-0.6,1.3-1.8,1.7-2.4c0.2,1.1,0.5,2.2,0.7,3.4c1.9-0.5,3.3-1.8,4.4-3.3l1-0.1
+			c-0.8,1.3-0.9,3.4-2.6,3.8c-3.5,1-7,2-10.3,3.4c-3,0-0.9-3.2-1-4.9c-0.7-0.6-1.3-1.2-2-1.8c0.8,0,2.3-0.1,3-0.1
+			c0-1.2,0-2.4,0.1-3.5c-1.5,0-2.9,0-4.4,0c-0.2,0.6-0.6,1.8-0.8,2.4c-0.4-2.5-0.4-5-0.8-7.5c-0.1-1.3-0.8-2-2.1-2.1
+			c-2.1,1.6-2.6,4.4-3.7,6.6c-1.2-1-2.4-2.1-3.7-3.1c0.1-2.3,0.1-4.6,0.1-7c-1.4-0.7-2.9-1.5-4.3-2.2c0-0.3,0.1-0.8,0.2-1.1
+			c1.3,0.3,2.6,1.3,3.9,0.5c0.5-1.6,0.9-3.3,1.3-4.9l0.4-0.2c0,2.1,0.1,4.2,0.2,6.3C16.4,804.3,18.2,801.4,19.3,798.2 M25,817.2
+			c2,0.8,2.6-2.2,3.6-3.2c-0.8-0.7-1.7-1.3-2.6-1.8C23.8,812.5,22.3,816.2,25,817.2z"/>
+		<path class="st7" d="M1703.1,806.9c1.1,0.7,2.2,1.3,3.3,2c0.6,0.9,1.2,1.9,1.9,2.9c-0.7,0.1-2.1,0.4-2.8,0.5
+			c-0.2,0.5-0.5,1.6-0.7,2.1c-0.7,2.1-1.3,4.3-1.8,6.5c-1.8,0.2-3.6,0.4-5.3,0.6c1.7,0.3,3.4,0.7,5.1,1c0,1.1,0.1,2.2,0.2,3.4
+			c0.5,0.4,1.5,1.3,2,1.8c1.3,1.1,2.6,2.2,4,3.3c0.4-1.8,0.9-3.6,1.4-5.4c0.6,4.5,0.1,9,0.2,13.5c-0.6,0.1-1.8,0.2-2.3,0.2
+			c0.5-2.1,0.8-4.2,0.9-6.4c-1.1,0.3-2.2,0.5-3.3,0.8c0,1.4,0,2.8,0,4.2l-0.8-0.5c0.3-2.2,0.7-4.3,1.2-6.5c-0.4-0.3-1.2-1-1.6-1.4
+			c-1.4-1.2-2.7-2.4-4-3.7c0.3-1,0.6-2,0.9-3c-1.6,0.2-3.3,0.1-4.7,1.2c-2.3,0.3-4.5,0.8-6.7,1.6c0.7-1.7,1.5-3.3,2.3-4.9
+			c3.3-0.2,6.7-0.3,10-0.4c0.2-3.4,0.4-6.9,0.6-10.3c0-0.6,0-1.8,0-2.4L1703.1,806.9z"/>
+		<path class="st7" d="M0,810.1c2.4,2.1,4.1,4.9,5.1,7.9c-1.9-0.3-4-0.7-5.1-2.4V810.1z"/>
+		<path class="st7" d="M64.9,821.1c5-0.7,10-0.5,14.9-0.4c-1.7,2.9-1.1,6,0.7,8.6c1.8-0.5,3.5-1.1,5.3-1.6c0.2,1.4,0.5,2.8,0.7,4.3
+			c2,0,4-0.3,5.6-1.6c-0.5,1-1.1,2.1-1.6,3.1c-1-0.3-3.1-0.8-4.1-1.1c-2.4,4.8,0.7,9.8,3.3,13.7c0.9,1.7,3.1,1.1,4.7,1.4
+			c0.4,1.2,0.9,2.2,1.4,3.4l0.1,0.1h-4.4c-0.8-1.1-1.5-2.1-2.4-3.1c-1.2,0.7-1.8,1.9-2.4,3.1h-0.5c-0.3-1.2-0.7-2.3-1.1-3.5
+			c-2.2,0-3.5,1.9-4.8,3.5h-1.5c0-0.7-0.1-2-0.1-2.7c-2.7,0.1-5.6,0-7,2.7h-2c0.3-1.2,0.6-2.3,1.1-3.4c4-1.2,8.2-1.5,12.2-2.3
+			c-0.2-0.9-0.3-1.8-0.5-2.7c-0.5,0-1.5-0.1-2-0.1c-2.7,1.5-5.7,2.1-8.7,2.2c-2.2-0.1-4.4-0.4-6.6-0.5c-0.1-3.5-0.5-7.1-2.1-10.3
+			c0.2-0.6,0.6-1.7,0.8-2.2l0.6,0c-0.3,3.1,1.2,5.7,4.4,6.3c-1.3,1-2.6,2.1-3.8,3.2c2.7,3.5,7.4,1.4,10.9,0.6
+			c1.9-0.2,1.4-2.2,1.7-3.6c-1.9-0.5-3.8-1-5.6-1.5c-0.3-3.2-2.1-5.7-4.6-7.5c-0.7,0.4-2.1,1.2-2.8,1.6c0.1-0.5,0.4-1.5,0.5-2
+			c0.9-0.3,1.7-0.5,2.6-0.7c2.4,1.3,5,2.3,7.6,3c0.2,1.3,0.4,2.7,0.7,4c1.6,0.6,3.1,1.2,4.7,1.8c0.8-1.5,1.5-3.1,2.2-4.7
+			c-1.7-1.4-3.5-2.5-4.8-4.3c-1.3-2-0.6-4.5-0.5-6.8c-2.1,0-4.2-0.1-6.2,0.1c-1.8,1.6-3.7,3.2-5.9,4.3
+			C65.2,824,65.1,822.5,64.9,821.1z"/>
+		<path class="st7" d="M48.4,821.1c1-0.1,2-0.1,2.9-0.2c2.1,1,4.4,1.7,6.6,2.3c0.3-0.6,1-1.7,1.3-2.2l0.4,0c0.7,0,2,0.1,2.6,0.1
+			c0.6,0,1.7,0,2.3,0c-2,2.1-3.7,4.8-6.6,5.7c-2.4,0.3-4.9,0.2-7.4,0.5c-1.4,4.3-1,8.9-2.1,13.3c-1,3.4-0.5,6.9-0.2,10.4h-0.9
+			c-0.7-2.8-1-5.7-2-8.4c-0.9-1.7-2.7-1-4-0.2c-2.1,3.2,2.7,5.5,3.3,8.6h-1.4c-0.3-0.6-0.8-1.8-1.1-2.3c-1.5-1.2-2.9-2.4-4.4-3.5
+			c1.5-2.1,3.4-4,4.6-6.3c0.7-2.2-0.8-4.3-1.7-6.2c3.5,1.1,3.5,5,5.1,7.6c1.8,0.9,2.3-2,2.4-3.2c0.2-2.3,0.2-4.7-0.1-7
+			c-2.9-1.3-6.1-1.1-9.1-0.4c0.2-0.4,0.6-1.1,0.9-1.5c3.4-0.5,6.8-1.1,9.9-2.6C49.5,824,49,822.5,48.4,821.1 M51.8,823
+			c0,0.8,0,2.4,0,3.2c2.1-0.2,5.9,1.5,6.8-1.1C57.1,822.9,54,823.6,51.8,823z"/>
+		<path class="st7" d="M169.6,820.8c0.8,0,2.6,0,3.4,0c1.8,2.1,3.8,4.4,3.1,7.4c-2.7-0.4-5-1.9-6.9-3.9
+			C169.3,823.4,169.5,821.6,169.6,820.8z"/>
+		<path class="st7" d="M281.8,821l1.1,0c-1.2,1.9-2.5,3.7-3.7,5.6c1.4,0.6,2.9,1,4.4,1.5c0.5-2.3,1-4.6,1.6-6.8
+			c0.4-0.1,1.1-0.3,1.5-0.4c-0.2,2.9,0.4,6-1.1,8.6c-2.4,1.2-5.1-0.2-7.6-0.6c-0.2,0.4-0.5,1.3-0.7,1.8c0.4,1.9,1.6,3.4,2.9,4.7
+			c-1,0.7-1.9,1.3-2.9,1.9c-0.9-0.8-1.8-1.6-2.7-2.5c-0.8-0.9-1.5-1.8-2.1-2.8c-0.6-4.4,4.3-6.4,6.8-9.2
+			C280.2,822.2,281,821.6,281.8,821z"/>
+		<path class="st7" d="M316.1,820.8c0.5,0,1.4,0,1.9,0c1.2,1.3,2.1,2.8,2.9,4.4c-1-0.8-2-1.5-3-2.2c-0.3,0.7-1,2-1.4,2.7
+			c-0.7,2.5-0.8,5.1-1.5,7.5c-0.9,3-3.1,5.2-5.2,7.3c-0.5-1.2-1.2-2.2-1.4-3.5c0.7-1.4,1.6-2.7,2.5-4c-0.1-0.9-0.2-1.8-0.4-2.7
+			c1.8-2.2,3-4.7,3.9-7.3C315.1,822.3,315.6,821.5,316.1,820.8z"/>
+		<path class="st7" d="M1222.6,820.9c1.5,0,2.9,0,4.4,0c2.3,1.4,4.8,1.7,7-0.1c-0.1,0.7-0.4,2.2-0.5,2.9c-0.6,0-1.8,0-2.4,0
+			c-1.9-0.1-3.7-0.2-5.5-0.4c-0.9,2.7-1.3,5.7-2.8,8.2c-1.6,0.4-3.2-0.2-4.8-0.6c-0.3-1.7-0.6-3.4-0.8-5.1c1.5-0.2,3.4,0.2,4.6-1.1
+			C1222,823.5,1222.3,822.2,1222.6,820.9 M1218.6,829.1c0.9,0.8,1.8,2.5,3.3,1.9c1.1-1,1.6-2.6,1.2-4
+			C1221.6,824.7,1219.9,828.2,1218.6,829.1z"/>
+		<path class="st7" d="M1620.3,821c1,0,1.9,0,2.9-0.1c-0.7,2.6-1.6,5.2-3.4,7.2c-1.2,1.4-2.5,2.7-3.8,4c-0.5-0.9-1-1.9-1.5-2.8
+			c-0.8,0.4-1.5,0.8-2.3,1.2c-0.3-0.5-1-1.4-1.3-1.8l0.7-0.3c-0.1-0.4-0.3-1.3-0.4-1.7l-0.2-0.8c0.3-0.3,0.8-0.9,1.1-1.2
+			c1.8,1.6,3.1,3.6,5,5c0.2-0.6,0.7-1.9,0.9-2.5C1618.8,825.1,1619.5,823,1620.3,821z"/>
+		<path class="st7" d="M295.2,822.3c2.4-2.6,5.7,3.3,2.7,4.4C295.4,827.8,293,823.9,295.2,822.3z"/>
+		<path class="st7" d="M370.5,826.8c0.5-2,1.8-3.5,3.3-4.7c0.4,0.3,1.2,0.8,1.7,1.1c-0.2,0.8-0.4,1.6-0.6,2.5
+			c-0.2,0.8-0.6,2.4-0.8,3.2C372.9,828.2,371.7,827.5,370.5,826.8z"/>
+		<path class="st7" d="M1421.2,826.9c0.1-1.2,0.3-2.4,0.5-3.6c1.4,0.3,2.8,0.8,4,1.6C1425.2,827.2,1422.9,826.9,1421.2,826.9z"/>
+		<path class="st7" d="M360.4,825.4c2.1,0,4.1,0,6.2,0c-0.1,1.8,0.6,4-1.4,5c-1.6-0.5-3.2-1.1-4.8-1.7
+			C360.4,827.7,360.4,826.5,360.4,825.4z"/>
+		<path class="st7" d="M5.3,829.4c2.9-0.6,5.7-1.5,7.9-3.6c1.2,0.5,2.5,1.1,3.7,1.6c1.2-0.4,2.3-0.7,3.6-1c0.6,1.7,0.9,3.4,1.3,5.1
+			c-0.1,0.8-0.2,1.7-0.2,2.6c3.5,0.6,6.8,2,9.1,4.7c-0.3-1-0.7-2.1-1-3.1c1.1-1.2,2.2-2.4,3.4-3.6c0.5,0.2,1.5,0.7,2,1
+			c-1.1,1-2.3,2.1-3.4,3.2c2,1.9,4.6,2.2,7.2,2c-1.5,0.7-3.5,1-4.6,2.5c1.1,2.4,2.9,4.3,4.6,6.3c-1.6,1.3-3.2,2.6-4.9,3.8H21
+			c0.6-0.9,1.1-1.8,1.6-2.8c-0.3-0.5-0.8-1.4-1.1-1.8c-3.1-0.1-6.3-0.1-9.4-0.1c0.2,0.4,0.5,1.2,0.7,1.6c2.1,0.9,4.2,2,6.2,3.1H0
+			v-3.8c1-2.7,3.5-3.9,5.9-5.1c-0.9-0.7-1.8-1.3-2.7-2c1.2-0.1,2.5-0.2,3.7-0.3c0.4-2.9-2.8-3.7-4.6-5.1
+			C3.2,832.9,3.7,830.8,5.3,829.4 M13.1,827.2c-1.6,1.2-2.9,3.1-5.1,3.4c-2.2,0.2-3.5,2-4.8,3.6c4.2,3.4,8.8-0.2,11.8-3.3
+			C16.2,829.6,15,826.7,13.1,827.2 M8.5,837.9c-0.9,3.1,1.9,5,4.7,4.7c0.2-1.3,0.4-2.6,0.5-3.9c1.3-0.1,2.5-0.2,3.8-0.2
+			c2,1.9,4.1,5.3,7.1,3.2c0.1,0.6,0.2,1.9,0.3,2.5c2.7,1.1,5.6,1.5,8.6,1.3c-0.3-1.5,0.7-3.9-1.5-4.3c-2.7-0.8-4.6-2.8-6.5-4.6
+			C19.9,835.2,13.1,833.2,8.5,837.9 M2.1,847.7c1.8,0,3.7,0.1,5.5,0.1c0.4-1,0.8-1.9,1.2-2.9C6.3,843,1.6,843.9,2.1,847.7z"/>
+		<path class="st7" d="M179.9,829c1.2-1.2,2.4-2.2,3.8-3.3c-0.2,2.4-0.4,4.8-0.8,7.2c-1.2-0.3-2.3-0.6-3.5-0.9
+			C179.5,831.3,179.8,829.8,179.9,829z"/>
+		<path class="st7" d="M1529.3,825.2c1.3,0.5,2.6,1,3.9,1.5c0,0.7,0.1,2.1,0.2,2.8c-1.1,0.1-2.1,0.2-3.2,0.2
+			C1529.5,828.3,1529.2,826.8,1529.3,825.2z"/>
+		<path class="st7" d="M1672.2,827.3c2.2-0.4,4.5-0.7,6.8-1.1c-0.6,1.3-1.1,2.5-1.7,3.8c1.3,0.1,2.6,0.2,4,0.2c-2.2,1.4-4.7,0.6-7,0
+			C1673.6,829.3,1672.9,828.3,1672.2,827.3z"/>
+		<path class="st7" d="M1240.2,826.7c2.1,0.1,4.2,0.4,5.6,2c-1.5,0.7-3.1,1.3-4.7,1.7C1240.8,829.2,1240.5,827.9,1240.2,826.7z"/>
+		<path class="st7" d="M1380.6,826.7l0.8,0.5c-1,4.4-2.1,8.8-3.2,13.1c-1.4,1.1-2.9,2.2-4.4,3.2c1.1-4.5,2.8-9,2.9-13.7
+			c0.5,0.6,1.5,1.9,1.9,2.5C1379.8,830.7,1380.3,828.7,1380.6,826.7z"/>
+		<path class="st7" d="M299,827.9c2.2,0.8,4.4,1.8,6.6,2.8c0,1.2-0.1,2.5-0.1,3.8c-1.1,0.1-2.1,0.1-3.2,0.2
+			C300.7,832.6,299.9,830.2,299,827.9z"/>
+		<path class="st7" d="M1554.3,829.1c1.1-0.6,2.3-2.5,3.6-1.1c0.1,0.9,0.2,2.6,0.3,3.5c-1.2,0.1-2.5,0.1-3.7,0.2
+			C1554.5,831,1554.4,829.7,1554.3,829.1z"/>
+		<path class="st7" d="M1431.6,829.8c0.8,0.9,2.3,1.6,1.6,3c-1,2.8-0.5,5.5,1.1,8c3-1.1,6.1-3,9.5-2.3c-0.1,0.5-0.3,1.5-0.4,1.9
+			c-2.8,1.9-5.8,3.3-8.6,5.1c-0.5-0.4-1.4-1.3-1.9-1.7c-0.3-0.2-0.8-0.7-1.1-0.9c-1.4,0-2.7,0.1-4,0.2c-0.2-0.4-0.6-1.1-0.8-1.5
+			c1.7-1.2,3.6-2.5,4.2-4.6C1431.7,834.6,1431.5,832.1,1431.6,829.8z"/>
+		<path class="st7" d="M1727,835.1c1.1-1.9,1.2-5.5,4.2-4.6c1.8,0.5,1.1,2.9,1.7,4.3c-1.1-1.2-2.4-2.4-3.6-3.5c-0.4,1.6-0.7,3.3-1,5
+			c-1.4,0.6-2.7,1.2-4.1,1.8c0.7,2.5,2.1,4.7,3.6,6.8c-1.8,0.7-3.5,1.4-5.2,2.1c-1.7-1.7-3.1-3.6-3.7-5.8c-2.1-0.3-4.1-0.6-6.2-0.8
+			c2.9-0.1,6.5,0.5,8.3-2.3c0.3,1.7,1.4,3.1,2.6,4.3c0.8-3,0.1-5.8-1.6-8.2c0.5-0.1,1.5-0.2,2-0.3C1725,834.3,1726,834.7,1727,835.1
+			z"/>
+		<path class="st7" d="M1639.6,836.3c0.9-1.5,1.6-3.1,2.4-4.7c0.7,1.4,1.5,2.9,2.4,4.2c0.9-0.2,1.4-0.8,1.5-1.8c0.5,0,1.5,0.1,2,0.2
+			c0.3,1,0.6,2.1,0.9,3.1c2.2,0.4,4.4,0.7,6.7,1.1c-0.1-2.2-0.2-4.3-0.3-6.5c0.6,1.9,1,3.8,1.5,5.8c1.3-0.1,2.6-0.1,3.9-0.1
+			c-1.3,0.5-2.5,0.9-3.8,1.4c-0.1,0.8-0.2,2.3-0.3,3c-0.1,0.1-0.5,0.2-0.6,0.3c-0.7-0.5-1.4-0.9-2-1.4c-1.7-0.3-3.4-0.4-5-0.5
+			c-0.7-0.6-1.4-1.1-2-1.6c-2.5,1.1-5.1,2.1-7.8,1.8c2.4-0.4,4.4-1.5,4.9-4C1642.5,836.6,1641,836.5,1639.6,836.3z"/>
+		<path class="st7" d="M229.5,833.1c1.6,0.3,3.2,0.8,4.8,1.5c-0.4,0.6-1.1,1.7-1.4,2.3c-1.2-0.1-2.4-0.3-3.6-0.4
+			C229.4,835.3,229.4,834.2,229.5,833.1z"/>
+		<path class="st7" d="M1524,832.5c1.4,0.2,2.3,1.1,2.6,2.5c-0.4,0.4-1.2,1.1-1.7,1.4C1522.4,836.5,1523.2,833.9,1524,832.5z"/>
+		<path class="st7" d="M1237.5,841.2c0.9-2.1,1.6-4.3,2.1-6.5c-0.1,2.1,0.3,4.2,0.9,6.2c0.9-0.9,1.9-1.9,2.8-2.9
+			c-0.2,0.7-0.5,2-0.7,2.7c-1.4,0.3-2.7,0.7-4,1c-0.2,1.2-0.3,2.4-0.4,3.6l-0.2,0.9c-0.8,0.2-1.6,0.4-2.4,0.6
+			c-0.1-1.1-0.2-2.2-0.2-3.3c-1.7,0.4-3.4,0.9-5.2,1.3c-1.6,2-4.6,5.6-6.8,2.2c0.7-2.9,3.5-4.3,5.7-5.9c2-0.3,3.9-0.5,5.9-1
+			c0.6-0.2,1.7-0.5,2.2-0.7C1237.4,839.9,1237.5,840.8,1237.5,841.2z"/>
+		<path class="st7" d="M1337.8,836c1.4-0.5,2.8-1,4.2-1.5c0.7,0.4,2,1.2,2.7,1.5c-0.3,1.2-0.6,2.5-0.9,3.8c-1.9,1-3.7,2.1-5.5,3.2
+			c-0.4-1-0.8-2.1-1.2-3.1l-0.2-0.5c0.4-0.4,1.3-1.2,1.8-1.6C1338.4,837.3,1338.1,836.4,1337.8,836z"/>
+		<path class="st7" d="M1497.5,834.3c1.6-0.2,2.9,0.3,4,1.5c0,1.4-0.9,3-2.5,2.9C1496.7,839,1497.9,835.5,1497.5,834.3z"/>
+		<path class="st7" d="M1116.5,836.3c1.8,0.2,3.9-0.4,5.5,0.6c1,0.8,0.2,1.7-0.5,2.4c-1.7,0.2-3.4,0.2-5.1,0.3
+			C1116.5,838.5,1116.5,837.4,1116.5,836.3z"/>
+		<path class="st7" d="M1257.4,836.3c0.6,0.1,1.8,0.3,2.4,0.3c0.3,0.4,0.8,1.1,1.1,1.4c0.6,0.8,1.3,1.7,2,2.5c-1.2,1-2.4,1.9-3.6,3
+			c-0.8,0.5-1.6,1-2.4,1.6c0.5,2,1,3.9,1.5,5.9h-1.3c-2.4-2.5-1.5-6-1.5-9.1c0.9,0.3,1.9,0.6,2.9,1
+			C1258.1,840.7,1257.7,838.5,1257.4,836.3z"/>
+		<path class="st7" d="M1395.8,836.1c0.9-0.2,2.9-0.8,3.8-1c0.3,1.6,0.2,3.2-0.1,4.8C1397.9,839,1394.4,838.8,1395.8,836.1z"/>
+		<path class="st7" d="M212.4,837.4c1.8,0.9,3.6,1.9,5.4,3c-3.8,3-7.4,6.2-9.7,10.6h-6.2c0.3-1.3,0.6-2.7,1-4c0.4-0.3,1.2-1,1.6-1.4
+			c0.4,0.7,1.3,2.1,1.8,2.9c2.7-0.6,4-2.9,4.8-5.3c-1.6,0.2-3.2,0.5-4.8,0.8C208.4,841.9,210.4,839.6,212.4,837.4z"/>
+		<path class="st7" d="M264.9,838.9c-0.3-1.6,1.5-2,2.5-1.4c0.6,3.9-0.1,7.9-0.9,11.7c-2.1,0.6-4.2,1.2-6.4,1.8h-5.6
+			c0.6-1.5,1.2-3,2-4.3c2.1-1.2,4.6-1,6.9-1.4C264.6,843.3,264.6,841,264.9,838.9z"/>
+		<path class="st7" d="M1279.4,837.3c0.4,0.1,1.2,0.4,1.6,0.6c-0.6,1.3-1.2,2.6-1.7,3.9c-0.2,0.5-0.7,1.5-0.9,2
+			c-1.5-0.3-3-0.4-4.5-0.6c0.3,1,0.6,2.1,1,3.1c1.8,0.9,3.7-0.1,5.4-0.8c1.1,1,2.4,2,3.8,2.8c2.1-0.5,1.1-2.9,1.4-4.5l0.6,0.5
+			c2,2.2,0.8,4.7-0.9,6.6h-3.1c0.3-0.5,0.8-1.6,1.1-2.2c-1.1-0.4-2.1-0.7-3.2-1c-1.2,0.7-1.9,2.1-2.8,3.1h-4.9
+			c0.8-1.4,2.2-2.8,1.2-4.5c-2.7-0.6-5.1,1.8-7.6,2.5c-0.2,0.5-0.7,1.5-0.9,2h-5c-0.8-1.6-1.3-3.3-1.8-5.1c1,0.4,2.2,1,3.2,1.4
+			c1.4-1.1,2.7-2.2,4.2-3.2c0-0.4,0-1.2-0.1-1.6c0.5,1.1,1.1,2.1,1.7,3.2c-1.2,0.6-2.4,1.3-3.6,1.9c1.9-0.4,3.9-0.8,5.8-1.2
+			c0.1-2.2,0.2-4.4,0.4-6.6C1273.2,839.8,1276.8,839.9,1279.4,837.3z"/>
+		<path class="st7" d="M1157.1,839.3c2.2,0.2,5.8-1.3,6.8,1.4C1161.7,843.7,1158.5,841.9,1157.1,839.3z"/>
+		<path class="st7" d="M1203.5,839.5c1.6-1.5,2.9,0.5,4.2,1.4c-1,1.1-2.1,2.2-3.1,3.2C1203.1,843,1201.9,841.1,1203.5,839.5z"/>
+		<path class="st7" d="M1365.3,840.2c1.3-0.9,2.8-1.4,4.3-1.8c-0.5,1.5-1,3-1.5,4.5C1367.3,842.2,1366,840.9,1365.3,840.2z"/>
+		<path class="st7" d="M1588.3,838.4c2.1,1.4,4.1,3.3,4.2,6.1c0.3,2.2,0.6,4.4,1.1,6.5h-3.9c-0.1-1.8,0-3.6,0-5.3
+			c0.2-1.7-0.8-2.9-2.1-3.8C1587.9,841,1588.2,839.3,1588.3,838.4z"/>
+		<path class="st7" d="M1173.6,840.6c1.2-0.2,2.3-0.3,3.5-0.5c0.1,1.6,0.3,3.2,0.4,4.9c-1.4,0.2-3.1,0.9-4.1-0.3
+			C1173.3,843.3,1173.4,842,1173.6,840.6z"/>
+		<path class="st7" d="M1703.3,839.7c1.8,1.2,3.6,2.6,5.7,3.5c2.7,0.5,5.4,0.2,8.2,0.3c0.1,0.3,0.2,0.9,0.2,1.2
+			c-0.4,0.2-1.1,0.8-1.5,1c-1.3,0.9-2.6,1.8-3.9,2.7c0.7,0.9,1.4,1.8,2.2,2.7h-12c0.1-2.6-4.2-2.8-2.8,0h-5.4
+			c-0.2-0.8-0.8-2.4-1-3.2c1.3-0.8,2.6-1.6,4-2.2c1.3,0.5,2.6,1.3,3.9,2c0.1-2.1,0.2-4.3,1.3-6.1
+			C1702.5,841,1703,840.2,1703.3,839.7 M1703.7,845.1c-0.3,2.4,3.1,1.5,4.5,1.8C1707.7,845,1703.4,840.9,1703.7,845.1 M1703.4,847.7
+			c-0.6,4.2,4.9,3.4,5.3,0.1C1706.9,847.7,1705.2,847.7,1703.4,847.7z"/>
+		<path class="st7" d="M304.2,841.9c1.3,0.1,2.5,0.2,3.8,0.3c-0.2,1.3-0.5,2.7-0.8,4c-1.1,0.2-2.2,0.2-3.4,0.4
+			C304,845,304.1,843.5,304.2,841.9z"/>
+		<path class="st7" d="M1539.5,842.7c1.4,0.4,4.5-1.4,4.6,1c-2,2.5-4.3,4.9-6.5,7.3h-0.2c-1-1.2-2-2.3-3.1-3.5
+			c-1.5,0.8-3.1,1.5-4.6,2.2c1.4-1.7,2.9-3.3,4.5-4.8c0.4,0.6,1.2,1.9,1.7,2.5c0.8,0,2.5-0.2,3.3-0.2
+			C1539.3,845.8,1539.5,844.2,1539.5,842.7z"/>
+		<path class="st7" d="M1288.2,847.8c2.3-1.6,4.9-3.6,7.6-1.5c-1.7,1.5-3.4,3.1-5.2,4.6h-0.7
+			C1289.3,849.9,1288.7,848.9,1288.2,847.8z"/>
+		<path class="st7" d="M1093.7,846.8c0.7,0.3,1.9,0.9,2.6,1.2c-0.2,0.7-0.5,2.2-0.7,3h-1.9C1093.6,849.6,1093.6,848.2,1093.7,846.8z
+			"/>
+		<path class="st7" d="M1305.7,846.3c2.2,0.9,3.7,2.7,5,4.7h-4.8C1305.8,849.4,1305.7,847.9,1305.7,846.3z"/>
+		<path class="st7" d="M1422.4,847.2c1.6-1.3,2.8,1.6,1.3,2.4C1422.1,850.9,1421,848.1,1422.4,847.2z"/>
+		<path class="st7" d="M1666.8,846.4c2.2,1,4.5,2.1,6.5,3.6l0.9,1h-7.4C1666.8,849.5,1666.8,847.9,1666.8,846.4z"/>
+		<path class="st7" d="M373.6,851c-0.2-1.5,0.3-2.7,1.4-3.7c1.8,0.8,2.9,2.3,4.2,3.7H373.6z"/>
+		<path class="st7" d="M1234.6,847.3c1,0.8,2,1.6,2.9,2.5l-0.2,1.2h-4.4C1233.5,849.8,1234.1,848.5,1234.6,847.3z"/>
+		<path class="st7" d="M1575.5,851c0.5-0.7,1.4-2,1.8-2.7c1.2,0.9,2.3,1.8,3.5,2.7H1575.5z"/>
+		<path class="st7" d="M1489.4,850.3c1.2-1.1,2-0.8,2.5,0.7h-2.8L1489.4,850.3z"/>
+	</g>
+</g>
+</svg>

From 5b3ce85695aa132a46b256ad4e94f3ab9a78973a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 19:52:49 +0200
Subject: [PATCH 1176/2040] Add a method to get the spread factor

---
 code/fgame/weapon.cpp | 28 +++++++++++++++++++++++-----
 code/fgame/weapon.h   |  1 +
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 8fca5cf6..67cf104b 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1870,11 +1870,7 @@ void Weapon::Shoot(Event *ev)
                     if (owner->client) {
                         Player *player = (Player *)owner.Pointer();
 
-                        fSpreadFactor = player->velocity.length() / sv_runspeed->integer;
-
-                        if (fSpreadFactor > 1.0f) {
-                            fSpreadFactor = 1.0f;
-                        }
+                        fSpreadFactor = GetSpreadFactor(mode);
 
                         vSpread       = bulletspreadmax[mode] * fSpreadFactor;
                         fSpreadFactor = 1.0f - fSpreadFactor;
@@ -4600,6 +4596,28 @@ float Weapon::GetBulletRange(firemode_t mode)
     return bulletrange[mode];
 }
 
+//======================
+//Weapon::GetSpreadFactor
+//======================
+float Weapon::GetSpreadFactor(firemode_t mode)
+{
+    float fSpreadFactor;
+
+    if (owner && owner->client) {
+        Player* player = (Player*)owner.Pointer();
+
+        fSpreadFactor = player->velocity.length() / sv_runspeed->integer;
+
+        if (fSpreadFactor > 1.0f) {
+            fSpreadFactor = 1.0f;
+        }
+    } else {
+        fSpreadFactor = 0.5f;
+    }
+
+    return fSpreadFactor;
+}
+
 //======================
 //Weapon::GetScriptOwner
 //======================
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index 9b2fcb9e..06f15a9a 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -453,6 +453,7 @@ public:
     //
     Listener  *GetScriptOwner(void) override;
     float      GetBulletRange(firemode_t firemode);
+    float      GetSpreadFactor(firemode_t firemode);
     firemode_t GetFireMode(void);
     qboolean   IsSemiAuto(void);
     void       DoneAnimating(Event *ev);

From bb9ccdd3b9cbd5a92270de0e94fc80922f163136 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:03:39 +0200
Subject: [PATCH 1177/2040] Make the bot move slowly when aiming with a
 semi-auto to improve the spread of their weapon

---
 code/fgame/playerbot.cpp | 25 +++++++++++++++++++++++--
 code/fgame/playerbot.h   |  8 ++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 28e3d525..98caa03a 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -668,6 +668,7 @@ bool BotController::CheckCondition_Attack(void)
 void BotController::State_EndAttack(void)
 {
     m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+    controlledEnt->ZoomOff();
 }
 
 void BotController::State_Attack(void)
@@ -696,6 +697,7 @@ void BotController::State_Attack(void)
         float fPrimaryBulletRangeSquared   = fPrimaryBulletRange * fPrimaryBulletRange;
         float fSecondaryBulletRange        = pWeap->GetBulletRange(FIRE_SECONDARY);
         float fSecondaryBulletRangeSquared = fSecondaryBulletRange * fSecondaryBulletRange;
+        float fSpreadFactor                = pWeap->GetSpreadFactor(FIRE_PRIMARY);
 
         //
         // check the fire movement speed if the weapon has a max fire movement
@@ -721,12 +723,30 @@ void BotController::State_Attack(void)
         if (controlledEnt->client->ps.stats[STAT_AMMO] > 0 || controlledEnt->client->ps.stats[STAT_CLIPAMMO] > 0) {
             if (fDistanceSquared <= fPrimaryBulletRangeSquared) {
                 if (pWeap->IsSemiAuto()) {
-                    m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
+                    if (controlledEnt->client->ps.iViewModelAnim == VM_ANIM_IDLE || controlledEnt->client->ps.iViewModelAnim >= VM_ANIM_IDLE_0 && controlledEnt->client->ps.iViewModelAnim <= VM_ANIM_IDLE_2) {
+                        if (fSpreadFactor < 0.25) {
+                            m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
+                            if (pWeap->GetZoom()) {
+                                if (!controlledEnt->IsZoomed()) {
+                                    m_botCmd.buttons |= BUTTON_ATTACKRIGHT;
+                                } else {
+                                    m_botCmd.buttons &= ~BUTTON_ATTACKRIGHT;
+                                }
+                            }
+                        } else {
+                            bNoMove = true;
+                            movement.ClearMove();
+                        }
+                    } else {
+                        m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+                        controlledEnt->ZoomOff();
+                    }
                 } else {
                     m_botCmd.buttons |= BUTTON_ATTACKLEFT;
                 }
             } else {
-                m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
+                m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+                controlledEnt->ZoomOff();
             }
         } else if (pWeap->GetFireType(FIRE_SECONDARY) == FT_MELEE) {
             bMelee = true;
@@ -738,6 +758,7 @@ void BotController::State_Attack(void)
             }
         } else {
             m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+            controlledEnt->ZoomOff();
         }
 
         m_iAttackTime   = level.inttime + 1000;
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 363ce60f..49a104be 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -110,6 +110,14 @@ private:
     float  m_fYawSpeedMult;
 };
 
+class BotState {
+public:
+    virtual bool CheckCondition() const = 0;
+    virtual void Begin() = 0;
+    virtual void End() = 0;
+    virtual void Think() = 0;
+};
+
 class BotController : public Listener
 {
 public:

From 6d69a8033ffc2b1fd113b88c3059f73b3a8ab24b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:12:47 +0200
Subject: [PATCH 1178/2040] Initialize the radar

---
 code/server/server.h  | 1 +
 code/server/sv_init.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/code/server/server.h b/code/server/server.h
index dba52237..aa073910 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -516,6 +516,7 @@ void SV_Heartbeat_f( void );
 //
 // sv_snapshot.c
 //
+void SV_InitRadar();
 void SV_AddServerCommand( client_t *client, const char *cmd );
 void SV_UpdateServerCommandsToClient( client_t *client, msg_t *msg );
 void SV_WriteFrameToClient (client_t *client, msg_t *msg);
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 62aac797..90ea2897 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -623,6 +623,8 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		SV_Startup();
 	}
 
+	SV_InitRadar();
+
 	sv.restarting = ( keep_scripts || !differentmap );
 	strncpy( last_mapname, mapname, sizeof( last_mapname ) );
 

From 6a107419e3733aa1f828ae0fae0c7a980b9dec19 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:26:27 +0200
Subject: [PATCH 1179/2040] Only change the maxclients when the map is
 different

It fixes an issue where on restart, only the number of snapshot entities was changed without the memory being reallocated for it
---
 code/server/sv_init.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 90ea2897..b3b858f1 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -613,7 +613,11 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 			differentmap = qfalse;
 		}
 
-		if( sv_maxclients->modified ) {
+		if( sv_maxclients->modified
+			&& differentmap // Fixed in OPM
+			//  OG  doesn't check for different map when changing the max clients
+			//  which means the snapshot entities memory isn't reallocated
+			) {
 			SV_ChangeMaxClients();
 		}
 	}
@@ -623,6 +627,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		SV_Startup();
 	}
 
+	// Added in 2.0
 	SV_InitRadar();
 
 	sv.restarting = ( keep_scripts || !differentmap );

From 3174ca5da93e80b692cb6c947b02601556ac43dc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 22:02:27 +0200
Subject: [PATCH 1180/2040] Explicitly mark overridden methods

---
 code/fgame/playerbot.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 49a104be..eb12bae5 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -284,9 +284,9 @@ public:
 
     void setController(BotController *controlledBy);
 
-    void Spawned(void);
+    void Spawned(void) override;
 
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void GotKill(Event *ev);
 
 private:

From 23d7db814cd0dd79238ee023df6391075bc4bb5d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 22:03:41 +0200
Subject: [PATCH 1181/2040] Use an unsigned integer for the column size

This fixes compile warnings
---
 code/server/sv_ccmds.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 36478d66..8592f2bf 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1103,16 +1103,16 @@ SV_Status_f
 ================
 */
 static void SV_Status_f(void) {
-    int			i;
-    size_t		j, l;
-    client_t* cl;
-    playerState_t* ps;
-    const char* s;
-	const char	*colName[8];
-	size_t		colSize[8];
-	size_t		len;
-    int			ping;
-    char		padding[64];
+    int				i;
+    size_t			j, l;
+    client_t		*cl;
+    playerState_t	*ps;
+    const char*		s;
+	const char		*colName[8];
+	size_t			len;
+	unsigned int	colSize[8];
+    int				ping;
+    char			padding[64];
 
     // make sure server is running
     if (!com_sv_running->integer) {
@@ -1208,11 +1208,11 @@ static void SV_Status_f(void) {
 			continue;
 		}
 
-        Com_Printf("%*i ", colSize[0], i);
+        Com_Printf("%*u ", colSize[0], i);
         ps = SV_GameClientNum(i);
         // su44: ps->persistant is not avaible in mohaa
         //Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
-        Com_Printf("%*i ", colSize[1], ps->stats[STAT_KILLS]);
+        Com_Printf("%*u ", colSize[1], ps->stats[STAT_KILLS]);
 
         if (cl->state == CS_CONNECTED)
             Com_Printf("CNCT ");
@@ -1221,7 +1221,7 @@ static void SV_Status_f(void) {
         else
         {
             ping = cl->ping < 9999 ? cl->ping : 9999;
-            Com_Printf("%*i ", colSize[2], ping);
+            Com_Printf("%*u ", colSize[2], ping);
         }
 
         Com_Printf("%s ", cl->name);
@@ -1233,7 +1233,7 @@ static void SV_Status_f(void) {
 			}
 		}
 
-        Com_Printf("%*i ", colSize[4], svs.time - cl->lastPacketTime);
+        Com_Printf("%*u ", colSize[4], svs.time - cl->lastPacketTime);
 
         s = NET_AdrToString(cl->netchan.remoteAddress);
         Com_Printf("%s ", s);
@@ -1246,9 +1246,9 @@ static void SV_Status_f(void) {
 			}
 		}
 
-        Com_Printf( "%*i", colSize[6], cl->netchan.qport );
+        Com_Printf( "%*u", colSize[6], cl->netchan.qport );
 
-        Com_Printf(" %*i", colSize[7], cl->rate);
+        Com_Printf(" %*u", colSize[7], cl->rate);
 
         Com_Printf("\n");
     }

From 1a3122bef3cc84989779b958f0f6f7fd5b32f2a6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 22:14:45 +0200
Subject: [PATCH 1182/2040] Fix pointer to integer warning

---
 code/sys/new/sys_main_new.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index bb77c4d2..cc03d144 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -143,7 +143,7 @@ const char* Sys_GetWholeClipboard(void)
     char *cliptext;
 
     if ((cliptext = SDL_GetClipboardText()) != NULL) {
-        if (cliptext[0] != NULL) {
+        if (cliptext[0] != 0) {
             // It's necessary to limit buffersize to 4096 as each character
             // is pasted via CharEvent, which is very-very slow and jams up the EventQueue.
             // A smaller buffer doesn't jam the EventQueue up as much and avoids dropping
@@ -178,7 +178,7 @@ Sys_SetClipboard
 void Sys_SetClipboard(const char *contents)
 {
 #ifndef DEDICATED
-    if (contents == NULL || contents[0] == NULL) {
+    if (!contents || !contents[0]) {
         return;
     }
 

From 5136aa488631112e776e85177db46460e0b4a20a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:01:27 +0200
Subject: [PATCH 1183/2040] Properly handle and delete unused non visible
 entity sounds to free up sound indexes

---
 code/fgame/g_public.h     |  6 +++
 code/server/server.h      |  3 ++
 code/server/sv_game.c     |  3 ++
 code/server/sv_init.c     | 92 +++++++++++++++++++++++++++++++++++++++
 code/server/sv_main.c     |  4 ++
 code/server/sv_snapshot.c | 62 --------------------------
 6 files changed, 108 insertions(+), 62 deletions(-)

diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 5798b55d..f3023b65 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -532,6 +532,12 @@ typedef struct gameExport_s {
     void (*SetFrameNumber)(int frameNumber);
     void (*SoundCallback)(int entNum, soundChannel_t channelNumber, const char *name);
 
+    //
+    // Added in OPM
+    //
+
+    int (*pvssoundindex)(const char* name, int streamed);
+
     //
     // global variables shared between game and server
     //
diff --git a/code/server/server.h b/code/server/server.h
index aa073910..554ab9c8 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -481,6 +481,9 @@ int SV_NumClients(void);
 void SV_ChangeMaxClients( void );
 void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qboolean bTransition );
 
+// Added in OPM
+int SV_PVSSoundIndex(const char* name, qboolean streamed);
+void SV_HandleNonPVSSound();
 
 
 //
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 5b3fee92..d6b50651 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -1802,6 +1802,9 @@ void SV_InitGameProgs( void ) {
 	import.SanitizeName					= Com_SanitizeName;
 	import.fsDebug						= fs_debug;
 
+	// Added in OPM
+	import.soundindex					= SV_PVSSoundIndex;
+
 	ge = Sys_GetGameAPI( &import );
 
 	if( !ge ) {
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index b3b858f1..5c114ef0 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -1172,3 +1172,95 @@ void SV_Shutdown( const char *finalmsg ) {
 		CL_Disconnect();
 }
 
+//
+// Added in OPM
+//
+
+/*
+===============
+SV_PVSSoundIndex
+===============
+*/
+int SV_PVSSoundIndex( const char *name, qboolean streamed )
+{
+	int index = SV_SoundIndex(name, streamed);
+
+	svs.nonpvs_sound_cache[index].inUse = qtrue;
+	svs.nonpvs_sound_cache[index].deleteTime = svs.time + 1000;
+
+	return index;
+}
+
+/*
+=======================
+SV_CacheNonPVSSound
+=======================
+*/
+void SV_CacheNonPVSSound(void)
+{
+	gentity_t* ent;
+	nonpvs_sound_t* npvs;
+	int i, j;
+
+	for (i = 0; i < sv.num_entities; i++) {
+		ent = SV_GentityNum(i);
+
+		for (j = 0; j < ent->r.num_nonpvs_sounds; j++) {
+			npvs = &ent->r.nonpvs_sounds[j];
+			if (npvs->index) {
+				svs.nonpvs_sound_cache[npvs->index].inUse = qtrue;
+				svs.nonpvs_sound_cache[npvs->index].deleteTime = svs.time + 1000;
+			}
+		}
+	}
+}
+
+/*
+=======================
+SV_CleanupNonPVSSound
+=======================
+*/
+void SV_CleanupNonPVSSound(void)
+{
+	nonpvs_sound_cache_t* cache;
+	int i, j, k, l;
+
+	for (i = 1; i < MAX_SOUNDS; i++) {
+		cache = &svs.nonpvs_sound_cache[i];
+
+		if (!sv.configstrings[CS_SOUNDS + i]) {
+			continue;
+		}
+
+		if (!cache->inUse) {
+			continue;
+		}
+
+		if (svs.time >= cache->deleteTime) {
+			SV_SetConfigstring(CS_SOUNDS + i, NULL);
+			cache->inUse = qfalse;
+		}
+	}
+}
+
+/*
+===============
+SV_HandleNonPVSSound
+===============
+*/
+void SV_HandleNonPVSSound()
+{
+	gentity_t *ent;
+	int i;
+
+	SV_CacheNonPVSSound();
+
+	for (i = 0; i < sv.num_entities; i++) {
+		ent = SV_GentityNum(i);
+		ent->r.num_nonpvs_sounds = 0;
+	}
+
+	// Free up sound indices
+	SV_CleanupNonPVSSound();
+}
+
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index b6cb8363..1368e4b6 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -1121,6 +1121,10 @@ void SV_Frame( int msec ) {
 	// process all gamespy queries
 	SV_ProcessGamespyQueries();
 
+	// Added in OPM
+	//  Handle non-pvs sounds
+	SV_HandleNonPVSSound();
+
 	svs.lastTime = svs.time;
 }
 
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index da69c863..3b979687 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1257,58 +1257,6 @@ void SV_SendClientSnapshot( client_t *client ) {
 	SV_SendMessageToClient( &msg, client );
 }
 
-/*
-=======================
-SV_CacheNonPVSSound
-=======================
-*/
-void SV_CacheNonPVSSound(void)
-{
-	gentity_t* ent;
-	nonpvs_sound_t* npvs;
-	int i, j;
-
-	for (i = 0; i < sv.num_entities; i++) {
-		ent = SV_GentityNum(i);
-
-		for (j = 0; j < ent->r.num_nonpvs_sounds; j++) {
-			npvs = &ent->r.nonpvs_sounds[j];
-			if (npvs->index) {
-				svs.nonpvs_sound_cache[npvs->index].inUse = qtrue;
-				svs.nonpvs_sound_cache[npvs->index].deleteTime = svs.time + 1000;
-			}
-		}
-	}
-}
-
-/*
-=======================
-SV_CleanupNonPVSSound
-=======================
-*/
-void SV_CleanupNonPVSSound(void)
-{
-	nonpvs_sound_cache_t* cache;
-	int i, j, k, l;
-
-	for (i = 1; i < MAX_SOUNDS; i++) {
-		cache = &svs.nonpvs_sound_cache[i];
-
-		if (!sv.configstrings[i]) {
-			continue;
-		}
-
-		if (!cache->inUse) {
-			continue;
-		}
-
-		if (svs.time >= cache->deleteTime) {
-			SV_SetConfigstring(CS_SOUNDS + i, NULL);
-			cache->inUse = qfalse;
-		}
-	}
-}
-
 /*
 =======================
 SV_SendClientMessages
@@ -1321,8 +1269,6 @@ void SV_SendClientMessages(void)
 	client_t		*c;
 	gentity_t		*ent;
 
-	SV_CacheNonPVSSound();
-
 	// send a message to each connected client
 	for(i=0; i < sv_maxclients->integer; i++)
 	{
@@ -1365,14 +1311,6 @@ void SV_SendClientMessages(void)
 		c->lastSnapshotTime = svs.time;
 		c->rateDelayed = qfalse;
     }
-
-    for (i = 0; i < sv.num_entities; i++) {
-        ent = SV_GentityNum(i);
-		ent->r.num_nonpvs_sounds = 0;
-    }
-
-	// Free up sound indices
-	SV_CleanupNonPVSSound();
 }
 
 qboolean SV_IsValidSnapshotClient(client_t* client) {

From 6136bbd0193f52ab2342d36075615fdbf02559b7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:05:53 +0200
Subject: [PATCH 1184/2040] Set g_netoptimize to 1 when spawning server

---
 code/server/sv_init.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 5c114ef0..6ec6ab6a 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -594,6 +594,9 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		strncpy( svs.rawServerName, server, sizeof( svs.rawServerName ) );
 	}
 
+	// Added in 2.30
+	Cvar_Set("g_netoptimize", "1");
+
 	// check for a spawn position
 	spawnpos = strchr( server, '$' );
 	if( spawnpos )

From ef09f136d4522698f1bdf3417bb30dda94bc7181 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:15:59 +0200
Subject: [PATCH 1185/2040] Fix sound indexes not erased correctly

---
 code/fgame/entity.cpp |  2 +-
 code/fgame/g_public.h | 12 ++++++------
 code/server/sv_game.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 37a950b9..49dc0024 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -6413,7 +6413,7 @@ void Entity::PlayNonPvsSound(const str& soundName, float volume)
     if (name.length() && ret) {
         nonpvs_sound_t* npvs = &edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds];
 
-        npvs->index = gi.soundindex(name.c_str(), ret->streamed);
+        npvs->index = gi.pvssoundindex(name.c_str(), ret->streamed);
         npvs->volume = G_Random() * ret->volumeMod + ret->volume * volume;
         npvs->minDist = ret->dist;
         npvs->maxDist = ret->maxDist;
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index f3023b65..33bcb542 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -461,6 +461,12 @@ typedef struct gameImport_s {
     void (*HudDrawFont)(int info, const char *fontName);
     qboolean (*SanitizeName)(const char *oldName, char *newName);
 
+    //
+    // Added in OPM
+    //
+
+    int (*pvssoundindex)(const char* name, int streamed);
+
     cvar_t *fsDebug;
 
     //
@@ -532,12 +538,6 @@ typedef struct gameExport_s {
     void (*SetFrameNumber)(int frameNumber);
     void (*SoundCallback)(int entNum, soundChannel_t channelNumber, const char *name);
 
-    //
-    // Added in OPM
-    //
-
-    int (*pvssoundindex)(const char* name, int streamed);
-
     //
     // global variables shared between game and server
     //
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index d6b50651..258722ff 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -1803,7 +1803,7 @@ void SV_InitGameProgs( void ) {
 	import.fsDebug						= fs_debug;
 
 	// Added in OPM
-	import.soundindex					= SV_PVSSoundIndex;
+	import.pvssoundindex				= SV_PVSSoundIndex;
 
 	ge = Sys_GetGameAPI( &import );
 

From fc1f795e83f399bbf5d353325702eda5cfc7fb90 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:19:04 +0200
Subject: [PATCH 1186/2040] Use ULightGreen color on SH/BT for dm messages

---
 code/client/cl_uidmbox.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 1d77899f..95fc1ec5 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -339,7 +339,11 @@ void UIDMBox::Print( const char *text )
 	}
 	else if (*text == MESSAGE_CHAT_GREEN)
 	{
-		m_items[m_numitems].color = UGreen;
+		if (com_target_game->integer >= TG_MOHTA) {
+			m_items[m_numitems].color = ULightGreen;
+		} else {
+			m_items[m_numitems].color = UGreen;
+		}
         m_items[m_numitems].font = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 

From 6d0b4f8cb789d990c5e06ab8cf089e202cedce55 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:50:52 +0200
Subject: [PATCH 1187/2040] Fix PVS sound overflow

---
 code/server/sv_init.c | 50 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 6ec6ab6a..a2a8f71e 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -1186,12 +1186,52 @@ SV_PVSSoundIndex
 */
 int SV_PVSSoundIndex( const char *name, qboolean streamed )
 {
-	int index = SV_SoundIndex(name, streamed);
+	int		i;
+	int		max = MAX_SOUNDS;
+	char	*s;
 
-	svs.nonpvs_sound_cache[index].inUse = qtrue;
-	svs.nonpvs_sound_cache[index].deleteTime = svs.time + 1000;
+	if( !name || !name[ 0 ] ) {
+		return 0;
+	}
 
-	return index;
+	for( i = 1; i<max; i++ ) {
+		s = sv.configstrings[CS_SOUNDS + i ];
+
+		if( !s || !s[ 0 ] ) {
+			SV_SetConfigstring(CS_SOUNDS + i, name);
+			break;
+		}
+		if( !strcmp( s, name ) ) {
+			break;
+		}
+	}
+
+	if( i == max ) {
+		int found = 0;
+
+		// Remove existing sound indexes
+		for (i = 1; i < max; i++) {
+			if (svs.nonpvs_sound_cache[i].inUse) {
+				if (!found) {
+					found = i;
+				}
+
+				svs.nonpvs_sound_cache[i].inUse = qfalse;
+				SV_SetConfigstring(CS_SOUNDS + i, NULL);
+			}
+		}
+
+		if (!found) {
+			return 0;
+		}
+
+		i = found;
+	}
+
+	svs.nonpvs_sound_cache[i].inUse = qtrue;
+	svs.nonpvs_sound_cache[i].deleteTime = svs.time + 200;
+
+	return i;
 }
 
 /*
@@ -1212,7 +1252,7 @@ void SV_CacheNonPVSSound(void)
 			npvs = &ent->r.nonpvs_sounds[j];
 			if (npvs->index) {
 				svs.nonpvs_sound_cache[npvs->index].inUse = qtrue;
-				svs.nonpvs_sound_cache[npvs->index].deleteTime = svs.time + 1000;
+				svs.nonpvs_sound_cache[npvs->index].deleteTime = svs.time + 200;
 			}
 		}
 	}

From 18abf3854dcfac11dcbf3145282492e20df48063 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:33:57 +0200
Subject: [PATCH 1188/2040] Use normals for deform vertexes

This fixes the issue where some ocean shaders would look inconsistent
---
 code/renderer/tr_shader.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index 623a5c93..ab41136c 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -1814,6 +1814,7 @@ static void ParseDeform( char **text ) {
 		ds->bulgeSpeed = atof( token );
 
 		ds->deformation = DEFORM_BULGE;
+		shader.needsNormal = qtrue;
 		return;
 	}
 
@@ -1838,6 +1839,7 @@ static void ParseDeform( char **text ) {
 
 		ParseWaveForm( text, &ds->deformationWave );
 		ds->deformation = DEFORM_WAVE;
+		shader.needsNormal = qtrue;
 		return;
 	}
 
@@ -1919,6 +1921,7 @@ static void ParseDeform( char **text ) {
 		ds->deformationWave.frequency = atof( token );
 
 		ds->deformation = DEFORM_NORMALS;
+		shader.needsNormal = qtrue;
 		return;
 	}
 

From 40834380cfda8b4a3161013a0908c70e2038cc89 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:39:57 +0200
Subject: [PATCH 1189/2040] Check if the snap is valid before getting the
 client number

---
 code/cgame/cg_parsemsg.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 5ef25bee..ae53d912 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -2064,10 +2064,10 @@ void CG_ParseCGMessage_ver_6()
                     current_entity_number = iInfo;
 
                     commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 0);
-                } else {
+                } else if (cg.snap) {
                     current_entity_number = cg.snap->ps.clientNum;
 
-                    commandManager.PlaySound(szTmp, vStart, CHAN_AUTO, -1, -1, -1, 1);
+                    commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 1);
                 }
 
                 current_entity_number = iOldEnt;

From 8898919fd3ef9ac110b6c3911b3165668c7e8546 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:45:24 +0200
Subject: [PATCH 1190/2040] Correctly parse lightingSpecular parameters

---
 code/renderer/tr_shader.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
index ab41136c..743da297 100644
--- a/code/renderer/tr_shader.c
+++ b/code/renderer/tr_shader.c
@@ -1323,7 +1323,18 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 			}
 			else if (!Q_stricmp(token, "lightingSpecular"))
 			{
+				shader.needsNormal = qtrue;
 				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+				stage->alphaMax = 255;
+				stage->specOrigin[0] = -960;
+				stage->specOrigin[1] = 1980;
+				stage->specOrigin[2] = 96;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0]) {
+					stage->alphaMax = atof(token) * 255.0;
+					ParseVector(text, 3, stage->specOrigin);
+				}
 			}
 			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
 				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))

From 3a68ca7f4bf24ab9207d093db9918a5b706773ea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:45:50 +0200
Subject: [PATCH 1191/2040] Handle static shader data and entity surface values
 for when deforming vertexes

---
 code/renderer/tr_shade_calc.c | 126 +++++++++++++++++++++++++++-------
 1 file changed, 101 insertions(+), 25 deletions(-)

diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index 21e5c306..0c3d034f 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -57,10 +57,54 @@ static float *TableForFunc( genFunc_t func )
 static float EvalWaveForm( const waveForm_t *wf ) 
 {
 	float	*table;
+	float	base;
+	float	amplitude;
+	float	phase;
+	float	frequency;
 
 	table = TableForFunc( wf->func );
 
-	return WAVEVALUE( table, wf->base, wf->amplitude, wf->phase, wf->frequency );
+    if (wf->base != 1234567.0f) {
+        base = wf->base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (wf->amplitude != 1234567.0f) {
+		amplitude = wf->amplitude;
+    } else if (backEnd.currentEntity) {
+		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+		amplitude = r_static_shaderdata1->value;
+    }
+
+    if (wf->phase != 1234567.0f) {
+		phase = wf->phase;
+    } else if (backEnd.currentEntity) {
+		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+		phase = r_static_shaderdata2->value;
+    }
+
+    if (wf->frequency != 1234567.0f) {
+		frequency = wf->frequency;
+    } else if (backEnd.currentEntity) {
+		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+		frequency = r_static_shaderdata1->value;
+    }
+
+	if (!backEnd.currentEntity)
+	{
+		base *= r_static_shadermultiplier0->value;
+		amplitude *= r_static_shadermultiplier1->value;
+		phase *= r_static_shadermultiplier2->value;
+		frequency *= r_static_shadermultiplier3->value;
+	}
+
+	return WAVEVALUE( table, base, amplitude, phase, frequency );
 }
 
 static float EvalWaveFormClamped( const waveForm_t *wf )
@@ -182,8 +226,52 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 	float	*xyz = ( float * ) tess.xyz;
 	float	*normal = ( float * ) tess.normal;
 	float	*table;
+	float	base;
+	float	amplitude;
+	float	phase;
+	float	frequency;
 
-	if ( ds->deformationWave.frequency == 0 )
+    if (ds->deformationWave.base != 1234567.0f) {
+        base = ds->deformationWave.base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (ds->deformationWave.amplitude != 1234567.0f) {
+		amplitude = ds->deformationWave.amplitude;
+    } else if (backEnd.currentEntity) {
+		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+		amplitude = r_static_shaderdata1->value;
+    }
+
+    if (ds->deformationWave.phase != 1234567.0f) {
+		phase = ds->deformationWave.phase;
+    } else if (backEnd.currentEntity) {
+		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+		phase = r_static_shaderdata2->value;
+    }
+
+    if (ds->deformationWave.frequency != 1234567.0f) {
+		frequency = ds->deformationWave.frequency;
+    } else if (backEnd.currentEntity) {
+		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+		frequency = r_static_shaderdata1->value;
+    }
+
+	if (!backEnd.currentEntity)
+	{
+		base *= r_static_shadermultiplier0->value;
+		amplitude *= r_static_shadermultiplier1->value;
+		phase *= r_static_shadermultiplier2->value;
+		frequency *= r_static_shadermultiplier3->value;
+	}
+
+	if ( frequency == 0 )
 	{
 		scale = EvalWaveForm( &ds->deformationWave );
 
@@ -204,10 +292,7 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 		{
 			float off = ( xyz[0] + xyz[1] + xyz[2] ) * ds->deformationSpread;
 
-			scale = WAVEVALUE( table, ds->deformationWave.base, 
-				ds->deformationWave.amplitude,
-				ds->deformationWave.phase + off,
-				ds->deformationWave.frequency );
+			scale = WAVEVALUE( table, base, amplitude, phase + off, frequency );
 
 			VectorScale( normal, scale, offset );
 			
@@ -241,41 +326,33 @@ void RB_CalcFlapVertexes(deformStage_t* ds, texDirection_t coordsToUse)
 
     if (ds->deformationWave.base != 1234567.0f) {
         base = ds->deformationWave.base;
-    }
-    else if (backEnd.currentEntity) {
+    } else if (backEnd.currentEntity) {
         base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
-    }
-    else {
+    } else {
         base = r_static_shaderdata0->value;
     }
 
     if (ds->deformationWave.amplitude != 1234567.0f) {
         amplitude = ds->deformationWave.amplitude;
-    }
-    else if (backEnd.currentEntity) {
+    } else if (backEnd.currentEntity) {
         amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
-    }
-    else {
+    } else {
         amplitude = r_static_shaderdata1->value;
     }
 
     if (ds->deformationWave.phase != 1234567.0f) {
         phase = ds->deformationWave.phase;
-    }
-    else if (backEnd.currentEntity) {
+    } else if (backEnd.currentEntity) {
         phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
-    }
-    else {
+    } else {
         phase = r_static_shaderdata2->value;
     }
 
     if (ds->deformationWave.frequency != 1234567.0f) {
         frequency = ds->deformationWave.frequency;
-    }
-    else if (backEnd.currentEntity) {
+    } else if (backEnd.currentEntity) {
         frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
-    }
-    else {
+    } else {
         frequency = r_static_shaderdata3->value;
     }
 
@@ -292,15 +369,14 @@ void RB_CalcFlapVertexes(deformStage_t* ds, texDirection_t coordsToUse)
 			float off;
 
 			off = ((*xyz)[0] + (*xyz)[1] + (*xyz)[2]) * ds->deformationSpread;
-            scale = table[(int)((phase + off + tess.shaderTime * frequency) * 1024.0) & FUNCTABLE_MASK] * amplitude + base;
+			scale = WAVEVALUE(table, base, amplitude, phase, frequency);
             vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
             offset[0] = scale * vertexScale * (*normal)[0];
             offset[1] = scale * vertexScale * (*normal)[1];
             offset[2] = scale * vertexScale * (*normal)[2];
 			VectorAdd(*xyz, offset, *xyz);
 		}
-	}
-	else {
+	} else {
         scale = EvalWaveForm(&ds->deformationWave);
         for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
             vertexScale = (max - min) * (*st)[0][coordsToUse] + min;

From 6efac1c0f7766f6c1654f07f3abc102377ba90d8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:27:03 +0200
Subject: [PATCH 1192/2040] Don't set animation

---
 code/fgame/player_util.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index a089dc70..c3200d87 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -396,10 +396,6 @@ void Player::SpawnEntity(Event *ev)
         e = new Event(EV_Model);
         e->AddString(name.c_str());
         ent->PostEvent(e, EV_PRIORITY_SPAWNARG);
-
-        e = new Event(EV_SetAnim);
-        e->AddString("idle");
-        ent->PostEvent(e, EV_SPAWNARG);
     }
 
     ent->ProcessPendingEvents();

From d83634f8a25b94e1eab6c473fa1719ec51b1417f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:40:23 +0200
Subject: [PATCH 1193/2040] Allow to specify a model when spawning an entity

---
 code/fgame/player_util.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index c3200d87..5789c6d3 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -337,6 +337,7 @@ void Player::SpawnEntity(Event *ev)
     int           n;
     int           i;
     Event        *e;
+    bool          bModelSet;
 
     if (ev->NumArgs() < 1) {
         ScriptError("Usage: spawn entityname [keyname] [value]...");
@@ -386,13 +387,19 @@ void Player::SpawnEntity(Event *ev)
     if (ev->NumArgs() > 2) {
         n = ev->NumArgs();
         for (i = 2; i <= n; i += 2) {
-            e = new Event(ev->GetString(i));
+            str name = ev->GetString(i);
+
+            if (!str::icmp(name, "model")) {
+                bModelSet = true;
+            }
+
+            e = new Event(name);
             e->AddToken(ev->GetString(i + 1));
             ent->PostEvent(e, EV_SPAWNARG);
         }
     }
 
-    if (ent->IsSubclassOfEntity()) {
+    if (ent->IsSubclassOfEntity() && !bModelSet) {
         e = new Event(EV_Model);
         e->AddString(name.c_str());
         ent->PostEvent(e, EV_PRIORITY_SPAWNARG);

From fd426926e93a818022f160a6d3d28f288bb3f8e6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:54:08 +0200
Subject: [PATCH 1194/2040] Set all alpha color channel in the current static
 model to prevent vertices from hiding randomly

---
 code/renderer/tr_shade.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
index d77c9daf..af653548 100644
--- a/code/renderer/tr_shade.c
+++ b/code/renderer/tr_shade.c
@@ -915,6 +915,9 @@ static void ComputeColors( shaderStage_t *pStage )
 					tess.svars.colors[i][0] = r;
 					tess.svars.colors[i][1] = g;
 					tess.svars.colors[i][2] = b;
+					// Fixed in OPM
+					//  This sets the alpha channel which will prevent vertices from hiding
+					tess.svars.colors[i][3] = tess.vertexColors[i][3];
 				}
 			}
 			else

From 00421a7666e5217f536a76e4e96f2bf9992e40e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 22:38:46 +0200
Subject: [PATCH 1195/2040] Process client events with the correct order

Effects that are using commanddelay were not working at all, this fixes the processing of delayed events so they get processed sequentially and at the correct time
---
 code/cgame/cg_commands.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index e14c2d18..8629ae2a 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -1403,8 +1403,10 @@ qboolean ClientGameCommandManager::PostEventForEntity(Event *ev, float fWait)
     int                    inttime;
 
     if (m_fEventWait < 0 || current_entity_number < 0) {
-        if (!str::icmp(ev->getName(), ")")) {
-            m_fEventWait = 0.0;
+        if (m_fEventWait != 0.0) {
+            if (!str::icmp(ev->getName(), ")")) {
+                m_fEventWait = 0.0;
+            }
         }
 
         delete ev;
@@ -1421,7 +1423,7 @@ qboolean ClientGameCommandManager::PostEventForEntity(Event *ev, float fWait)
     event   = EffectsEventQueue.next;
     inttime = EVENT_msec + (fWait * 1000.0f + 0.5f);
 
-    while (event != &EffectsEventQueue && inttime > event->inttime) {
+    while (event != &EffectsEventQueue && inttime >= event->inttime) {
         event = event->next;
     }
 
@@ -1560,7 +1562,6 @@ void ClientGameCommandManager::CommandDelay(Event *ev)
         ev1->AddValue(ev->GetValue(i));
     }
 
-    delay = ev->GetFloat(1) * 1000;
     if (current_entity_number != -1) {
         PostEventForEntity(ev1, fWait);
     } else {
@@ -1570,6 +1571,16 @@ void ClientGameCommandManager::CommandDelay(Event *ev)
             current_tiki->name
         );
     }
+
+    if (IsBlockCommand(eventName)) {
+        m_fEventWait = fWait;
+    } else {
+        m_fEventWait = 0;
+    }
+
+    if (current_entity_number == -1 && m_fEventWait > 0) {
+        m_fEventWait = -1;
+    }
 }
 
 void ClientGameCommandManager::StartSFX(Event *ev)

From dce2bcca7cf1ae2fbfbb7d5951eea1bb707adec3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 22:41:32 +0200
Subject: [PATCH 1196/2040] Initialize bModelSet

---
 code/fgame/player_util.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index 5789c6d3..1e0766da 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -384,6 +384,8 @@ void Player::SpawnEntity(Event *ev)
     e->AddVector(v);
     ent->PostEvent(e, EV_SPAWNARG);
 
+    bModelSet = false;
+
     if (ev->NumArgs() > 2) {
         n = ev->NumArgs();
         for (i = 2; i <= n; i += 2) {

From 87e41f0c213f735fbe9978459be7eb254b687fdc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Oct 2024 22:44:07 +0200
Subject: [PATCH 1197/2040] Set the model before anything else

---
 code/fgame/player_util.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index 1e0766da..f8a301a3 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -390,14 +390,16 @@ void Player::SpawnEntity(Event *ev)
         n = ev->NumArgs();
         for (i = 2; i <= n; i += 2) {
             str name = ev->GetString(i);
+            float priority = EV_SPAWNARG;
 
             if (!str::icmp(name, "model")) {
                 bModelSet = true;
+                priority = EV_PRIORITY_SPAWNARG;
             }
 
             e = new Event(name);
             e->AddToken(ev->GetString(i + 1));
-            ent->PostEvent(e, EV_SPAWNARG);
+            ent->PostEvent(e, priority);
         }
     }
 

From 405a4bfe2831faf0a4fdd9a97df202b0c7b5b9ab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 00:50:34 +0200
Subject: [PATCH 1198/2040] Fix debug line delay not working properly

---
 code/fgame/debuglines.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp
index 5dfe0262..cefedb92 100644
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
@@ -61,11 +61,11 @@ void G_InitDebugLines(void)
             iNumDelays = 99;
         }
 
-        iCount = g_iFrameLineCount[(g_iCurrFrameLineCounter - iNumDelays + 100) % 100];
+        iCount = g_iFrameLineCount[(g_iCurrFrameLineCounter - (iNumDelays - 100)) % 100];
         if (iCount) {
             g_iFirstLine += iCount;
             *gi.numDebugLines -= iCount;
-            g_iFrameLineCount[(g_iCurrFrameLineCounter - iNumDelays + 100) % 100] = 0;
+            g_iFrameLineCount[(g_iCurrFrameLineCounter - (iNumDelays - 100)) % 100] = 0;
         }
 
         g_iCurrFrameLineCounter = (g_iCurrFrameLineCounter + 1) % 100;
@@ -169,7 +169,7 @@ void G_DebugLine(Vector start, Vector end, float r, float g, float b, float alph
         G_ShiftDebugLines();
     }
 
-    line = &DebugLines[*gi.numDebugLines];
+    line = &DebugLines[g_iFirstLine  + *gi.numDebugLines];
     (*gi.numDebugLines)++;
     g_iFrameLineCount[g_iCurrFrameLineCounter]++;
 

From 29911380d191edb4f4c9eb84eb9443d3cd48b206 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 01:00:55 +0200
Subject: [PATCH 1199/2040] Use the weapon owner rather than the last
 successful hit entity

---
 code/fgame/weaputils.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index d1ed8bee..7c3107f2 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2281,10 +2281,10 @@ float BulletAttack(
                     ent = NULL;
                 }
 
-                if (ent && ent != world && ent != newowner) {
+                if (ent && ent != world && ent != owner) {
                     if (ent->takedamage) {
                         if (g_gametype->integer == GT_SINGLE_PLAYER && !iNumHit) {
-                            BulletAttack_Stat(newowner, ent, &trace, weap);
+                            BulletAttack_Stat(owner, ent, &trace, weap);
                         }
 
                         iNumHit++;
@@ -2295,7 +2295,7 @@ float BulletAttack(
 
                         ent->Damage(
                             world,
-                            newowner,
+                            owner,
                             newdamage,
                             trace.endpos,
                             dir,

From e2f5c80afc2a56fb32f9d26ce03b7f6da5090cbc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 18:46:23 +0200
Subject: [PATCH 1200/2040] Stop charging the weapon when using turret

---
 code/fgame/player.cpp | 1 +
 code/fgame/weapon.cpp | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 24f70e41..09c4e32b 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3507,6 +3507,7 @@ void Player::DoUse(Event *ev)
         //  to crouch with their weapon and become impossible to hit
         currentState_Legs = statemap_Legs->FindState("STAND");
         currentState_Torso = statemap_Torso->FindState("STAND");
+        charge_start_time = 0;
     }
 }
 
diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 67cf104b..767f2283 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -3098,6 +3098,12 @@ void Weapon::ForceIdle(void)
 
     // Force the weapon to the idle animation
     weaponstate = WEAPON_READY;
+
+    // Fixed in OPM
+    //  Stop the weapon from charging/cooking
+    CancelEventsOfType(EV_OverCooked);
+    CancelEventsOfType(EV_OverCooked_Warning);
+    charge_fraction = 0;
 }
 
 //======================

From 374b8b9ae7e9220cab00e85b7a3984ceda1ab57d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 18:52:50 +0200
Subject: [PATCH 1201/2040] Add fuse stopwatch

---
 code/cgame/cg_drawtools.cpp | 39 +++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index cfcfd6b4..bc829cef 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -953,43 +953,66 @@ void CG_UpdateCountdown()
     }
 }
 
+static void CG_RemoveStopwatch() {
+    cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+    cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse\n");
+    cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse_wet\n");
+}
+
 void CG_DrawStopwatch()
 {
     int iFraction;
 
     if (!cg_hud->integer) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (!cgi.stopWatch->iStartTime) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cgi.stopWatch->iStartTime >= cgi.stopWatch->iEndTime) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cgi.stopWatch->iEndTime <= cg.time) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cg.ObjectivesCurrentAlpha >= 0.02) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cg.snap && cg.snap->ps.stats[STAT_HEALTH] <= 0) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
+    if (cgi.stopWatch->eType >= SWT_FUSE_WET) {
+        iFraction = cgi.stopWatch->iEndTime - cgi.stopWatch->iStartTime;
+    } else {
+        iFraction = cgi.stopWatch->iEndTime - cg.time;
+    }
 
-    iFraction = cgi.stopWatch->iEndTime - cg.time;
     cgi.Cvar_Set("ui_stopwatch", va("%i", iFraction));
-    cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_stopwatch\n");
+
+    switch (cgi.stopWatch->eType) {
+    case SWT_NORMAL:
+    default:
+        cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_stopwatch\n");
+        break;
+    case SWT_FUSE:
+        cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_fuse\n");
+        break;
+    case SWT_FUSE_WET:
+        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse\n");
+        cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_fuse_wet\n");
+        break;
+    }
 }
 
 void CG_DrawInstantMessageMenu()

From c1433a6d9e949a29422120f748a5236030cd941d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 18:54:36 +0200
Subject: [PATCH 1202/2040] Use the correct stopwatch type for when the sticky
 bomb gets wet

---
 code/fgame/Entities.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 2f691792..23daab31 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -2047,7 +2047,7 @@ void ThrobbingBox_Stickybomb::OnStickyBombWet(Event *ev)
 
     player = static_cast<Player *>(G_FindTarget(this, "player"));
     player->SetStopwatch(0, SWT_NORMAL);
-    player->SetStopwatch(m_fStopwatchDuration - (level.svsFloatTime - m_fStopwatchStartTime), SWT_FUSE);
+    player->SetStopwatch(m_fStopwatchDuration - (level.svsFloatTime - m_fStopwatchStartTime), SWT_FUSE_WET);
 }
 
 void ThrobbingBox_Stickybomb::OnStickyBombUse(Event *ev)

From 863a6293e74205d5674ac731e7772fffa4a51be9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 19:12:42 +0200
Subject: [PATCH 1203/2040] Don't draw the lensflare in UI

---
 code/renderer/tr_backend.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index d3e5761b..905ad9ae 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -887,8 +887,11 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	}
 
 	RB_ShadowFinish();
-	RB_RenderFlares();
-	R_DrawLensFlares();
+	if (!(backEnd.refdef.rdflags & RDF_HUD)) {
+		RB_RenderFlares();
+		R_DrawLensFlares();
+	}
+
 	if (g_bInfoworldtris)
 	{
 		g_bInfoworldtris = 0;

From 909dc96c2f4b24561503c0080159241b7096cf76 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 22:18:40 +0200
Subject: [PATCH 1204/2040] Use a separate CG_InterpolateAnimParms function for
 animation

---
 code/cgame/cg_modelanim.c | 214 ++++++++++++++++++++------------------
 1 file changed, 112 insertions(+), 102 deletions(-)

diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index a654afcb..1155a50a 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -180,6 +180,117 @@ void CG_PlayerTeamIcon(refEntity_t *pModel, entityState_t *pPlayerState)
     }
 }
 
+/*
+===============
+CG_InterpolateAnimParms
+
+Interpolate between current and next entity
+===============
+*/
+void CG_InterpolateAnimParms(entityState_t* state, entityState_t* sNext, refEntity_t* model)
+{
+    static cvar_t *vmEntity = NULL;
+    int i;
+    float t;
+    float animLength;
+    float t1, t2;
+
+    if (!vmEntity) {
+        vmEntity = cgi.Cvar_Get("viewmodelanim", "1", 0);
+    }
+
+    if (sNext && sNext->usageIndex == state->usageIndex) {
+        t1 = cg.time - cg.snap->serverTime;
+        t2 = cg.nextSnap->serverTime - cg.snap->serverTime;
+        t = t1 / t2;
+
+        model->actionWeight = (sNext->actionWeight - state->actionWeight) * t + state->actionWeight;
+
+        for (i = 0; i < MAX_FRAMEINFOS; i++) {
+            if (sNext->frameInfo[i].weight) {
+                model->frameInfo[i].index = sNext->frameInfo[i].index;
+                if (sNext->frameInfo[i].index == state->frameInfo[i].index && state->frameInfo[i].weight) {
+                    model->frameInfo[i].weight =
+                        (sNext->frameInfo[i].weight - state->frameInfo[i].weight) * t + state->frameInfo[i].weight;
+
+                    if (sNext->frameInfo[i].time >= state->frameInfo[i].time) {
+                        model->frameInfo[i].time = (sNext->frameInfo[i].time - state->frameInfo[i].time) * t + state->frameInfo[i].time;
+                    } else {
+                        animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
+                        if (!animLength) {
+                            t1 = 0.0;
+                        } else {
+                            t1 = (animLength + sNext->frameInfo[i].time - state->frameInfo[i].time) * t
+                               + state->frameInfo[i].time;
+                        }
+
+                        t2 = t1;
+                        while (t2 > animLength) {
+                            t2 -= animLength;
+
+                            if (t2 == t1) {
+                                t2 = 1.0;
+                                break;
+                            }
+
+                            t1 = t2;
+                        }
+
+                        model->frameInfo[i].time = t2;
+                    }
+                } else {
+                    animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
+                    if (!animLength) {
+                        t1 = 0.0;
+                    } else {
+                        t1 = sNext->frameInfo[i].time - (cg.nextSnap->serverTime - cg.time) / 1000.0;
+                    }
+
+                    model->frameInfo[i].time   = Q_max(0, t1);
+                    model->frameInfo[i].weight = sNext->frameInfo[i].weight;
+                }
+            } else if (sNext->frameInfo[i].index == state->frameInfo[i].index) {
+                animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
+                if (!animLength) {
+                    t1 = 0.0;
+                } else {
+                    t1 = (cg.time - cg.snap->serverTime) / 1000.0 + state->frameInfo[i].time;
+                }
+
+                model->frameInfo[i].index  = Q_clamp_int(state->frameInfo[i].index, 0, model->tiki->a->num_anims - 1);
+                model->frameInfo[i].time   = Q_min(animLength, t1);
+                model->frameInfo[i].weight = (1.0 - t) * state->frameInfo[i].weight;
+            } else {
+                model->frameInfo[i].index  = -1;
+                model->frameInfo[i].weight = 0.0;
+            }
+        }
+    } else {
+        // no next state, don't blend anims
+
+        model->actionWeight = state->actionWeight;
+        for (i = 0; i < MAX_FRAMEINFOS; i++) {
+            if (state->frameInfo[i].weight) {
+                model->frameInfo[i].index  = Q_clamp_int(state->frameInfo[i].index, 0, model->tiki->a->num_anims - 1);
+                model->frameInfo[i].time   = state->frameInfo[i].time;
+                model->frameInfo[i].weight = state->frameInfo[i].weight;
+            } else {
+                model->frameInfo[i].index  = -1;
+                model->frameInfo[i].weight = 0.0;
+            }
+        }
+    }
+
+    if (vmEntity->integer == state->number) {
+        static cvar_t *curanim;
+        if (!curanim) {
+            curanim = cgi.Cvar_Get("viewmodelanimslot", "1", 0);
+        }
+
+        cgi.Cvar_Set("viewmodelanimclienttime", va("%0.2f", model->frameInfo[curanim->integer].time));
+    }
+}
+
 /*
 ===============
 CG_CastFootShadow
@@ -697,7 +808,6 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
     int            i;
     vec3_t         vMins, vMaxs, vTmp;
     const char    *szTagName;
-    static cvar_t *vmEntity = NULL;
     int            iAnimFlags;
 
     s1 = &cent->currentState;
@@ -709,10 +819,6 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
 
     memset(&model, 0, sizeof(model));
 
-    if (!vmEntity) {
-        vmEntity = cgi.Cvar_Get("viewmodelanim", "1", 0);
-    }
-
     if (cent->interpolate) {
         sNext = &cent->nextState;
     }
@@ -880,103 +986,7 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
     model.renderfx |= s1->renderfx;
     cgi.TIKI_SetEyeTargetPos(model.tiki, model.entityNumber, s1->eyeVector);
 
-    if (sNext && sNext->usageIndex == s1->usageIndex) {
-        float t;
-        float animLength;
-        float t1, t2;
-
-        t1                 = cg.time - cg.snap->serverTime;
-        t2                 = cg.nextSnap->serverTime - cg.snap->serverTime;
-        t                  = t1 / t2;
-        model.actionWeight = (sNext->actionWeight - s1->actionWeight) * t + s1->actionWeight;
-
-        for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            if (sNext->frameInfo[i].weight) {
-                model.frameInfo[i].index = sNext->frameInfo[i].index;
-                if (sNext->frameInfo[i].index == s1->frameInfo[i].index && s1->frameInfo[i].weight) {
-                    model.frameInfo[i].weight =
-                        (sNext->frameInfo[i].weight - s1->frameInfo[i].weight) * t + s1->frameInfo[i].weight;
-
-                    if (sNext->frameInfo[i].time >= s1->frameInfo[i].time) {
-                        model.frameInfo[i].time =
-                            (sNext->frameInfo[i].time - s1->frameInfo[i].time) * t + s1->frameInfo[i].time;
-                    } else {
-                        animLength = cgi.Anim_Time(model.tiki, sNext->frameInfo[i].index);
-                        if (!animLength) {
-                            t1 = 0.0;
-                        } else {
-                            t1 = (animLength + sNext->frameInfo[i].time - s1->frameInfo[i].time) * t
-                               + s1->frameInfo[i].time;
-                        }
-
-                        t2 = t1;
-                        while (t2 > animLength) {
-                            t2 -= animLength;
-                        }
-
-                        model.frameInfo[i].time = t2;
-                    }
-                } else {
-                    animLength = cgi.Anim_Time(model.tiki, sNext->frameInfo[i].index);
-                    if (!animLength) {
-                        t1 = 0.0;
-                    } else {
-                        t1 = sNext->frameInfo[i].time - (cg.nextSnap->serverTime - cg.time) / 1000.0;
-                    }
-
-                    t2 = t1;
-                    if (t2 < 0.0) {
-                        t2 = 0.0;
-                    }
-
-                    model.frameInfo[i].time   = t2;
-                    model.frameInfo[i].weight = sNext->frameInfo[i].weight;
-                }
-            } else if (sNext->frameInfo[i].index == s1->frameInfo[i].index) {
-                animLength = cgi.Anim_Time(model.tiki, sNext->frameInfo[i].index);
-                if (!animLength) {
-                    t1 = 0.0;
-                } else {
-                    t1 = (cg.time - cg.snap->serverTime) / 1000.0 + s1->frameInfo[i].time;
-                }
-
-                t2 = t1;
-                if (t2 < animLength) {
-                    t2 = animLength;
-                }
-
-                model.frameInfo[i].index  = s1->frameInfo[i].index;
-                model.frameInfo[i].time   = t2;
-                model.frameInfo[i].weight = (1.0 - t) * s1->frameInfo[i].weight;
-            } else {
-                model.frameInfo[i].index  = -1;
-                model.frameInfo[i].weight = 0.0;
-            }
-        }
-    } else {
-        // no next state, don't blend anims
-
-        model.actionWeight = s1->actionWeight;
-        for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            if (s1->frameInfo[i].weight) {
-                model.frameInfo[i].index  = s1->frameInfo[i].index;
-                model.frameInfo[i].time   = s1->frameInfo[i].time;
-                model.frameInfo[i].weight = s1->frameInfo[i].weight;
-            } else {
-                model.frameInfo[i].index  = -1;
-                model.frameInfo[i].weight = 0.0;
-            }
-        }
-    }
-
-    if (vmEntity->integer == s1->number) {
-        static cvar_t *curanim;
-        if (!curanim) {
-            curanim = cgi.Cvar_Get("viewmodelanimslot", "1", 0);
-        }
-
-        cgi.Cvar_Set("viewmodelanimclienttime", va("%0.2f", model.frameInfo[curanim->integer].time));
-    }
+    CG_InterpolateAnimParms(s1, sNext, &model);
 
     if (cent->currentState.parent != ENTITYNUM_NONE) {
         int          iTagNum;

From ed05983a57666bb3d8cc411bbebe12268268ce00 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 22:19:57 +0200
Subject: [PATCH 1205/2040] Use ceiling for the packed anim time

This is an attempt to fix an issue where the animation time would deviate from 1 bit and would go back and forth
---
 code/qcommon/msg.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index a1b601a3..db6e7f3e 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2263,7 +2263,7 @@ float MSG_ReadPackedAnimTime_ver_15(msg_t* msg, int bits, float fromValue, float
 {
 	int packed;
 	if (!MSG_ReadBits(msg, 1)) {
-		return fromValue + frameTime;
+		return ceil((fromValue + frameTime) * 100) / 100;
 	}
 
 	packed = MSG_ReadBits(msg, bits);
@@ -2869,6 +2869,10 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 		if ( ! MSG_ReadBits( msg, 1 ) ) {
 			// no change
 			*toF = *fromF;
+
+			if (number == 1 && field->offset == (size_t) & ((entityState_t*)0)->frameInfo[3].time) {
+				Com_Printf("NO DELTA from: %.12f / to: %.12f\n", *(float*)fromF, *(float*)toF);
+			}
 		} else {
 			switch (field->type) {
 				case netFieldType_e::regular:
@@ -2879,6 +2883,10 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 					break;
 				case netFieldType_e::animTime: // time
 					*(float*)toF = MSG_ReadPackedAnimTime(msg, field->bits, *(float*)fromF, frameTime);
+
+					if (number == 1 && field->offset == (size_t) & ((entityState_t*)0)->frameInfo[3].time) {
+						Com_Printf("from: %.12f / to: %.12f\n", *(float*)fromF, *(float*)toF);
+					}
 					break;
 				case netFieldType_e::animWeight: // nasty!
 					*(float*)toF = MSG_ReadPackedAnimWeight(msg, field->bits);

From 0bb11d76bdfd4283a540840b994b54e68048b213 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 22:22:36 +0200
Subject: [PATCH 1206/2040] Remove accidental print

---
 code/qcommon/msg.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index db6e7f3e..be9cedd9 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2869,10 +2869,6 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 		if ( ! MSG_ReadBits( msg, 1 ) ) {
 			// no change
 			*toF = *fromF;
-
-			if (number == 1 && field->offset == (size_t) & ((entityState_t*)0)->frameInfo[3].time) {
-				Com_Printf("NO DELTA from: %.12f / to: %.12f\n", *(float*)fromF, *(float*)toF);
-			}
 		} else {
 			switch (field->type) {
 				case netFieldType_e::regular:
@@ -2883,10 +2879,6 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 					break;
 				case netFieldType_e::animTime: // time
 					*(float*)toF = MSG_ReadPackedAnimTime(msg, field->bits, *(float*)fromF, frameTime);
-
-					if (number == 1 && field->offset == (size_t) & ((entityState_t*)0)->frameInfo[3].time) {
-						Com_Printf("from: %.12f / to: %.12f\n", *(float*)fromF, *(float*)toF);
-					}
 					break;
 				case netFieldType_e::animWeight: // nasty!
 					*(float*)toF = MSG_ReadPackedAnimWeight(msg, field->bits);

From 4da099d15cb0d41817378c6b1bc518cf71a9b38f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 22:41:21 +0200
Subject: [PATCH 1207/2040] Add GetChargeFraction()

---
 code/fgame/weapon.cpp | 8 ++++++++
 code/fgame/weapon.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 767f2283..e895370b 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -4624,6 +4624,14 @@ float Weapon::GetSpreadFactor(firemode_t mode)
     return fSpreadFactor;
 }
 
+//======================
+//Weapon::GetChargeFraction
+//======================
+float Weapon::GetChargeFraction(void) const
+{
+    return charge_fraction;
+}
+
 //======================
 //Weapon::GetScriptOwner
 //======================
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index 06f15a9a..e9666afb 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -454,6 +454,7 @@ public:
     Listener  *GetScriptOwner(void) override;
     float      GetBulletRange(firemode_t firemode);
     float      GetSpreadFactor(firemode_t firemode);
+    float      GetChargeFraction(void) const;
     firemode_t GetFireMode(void);
     qboolean   IsSemiAuto(void);
     void       DoneAnimating(Event *ev);

From aa0c70465561bfedae5c9cc8b1c3017c21752c70 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 22:42:05 +0200
Subject: [PATCH 1208/2040] Instead of resetting the state, prevent using the
 turret if the player is charging

---
 code/fgame/player.cpp     | 12 +-----------
 code/fgame/weapturret.cpp |  4 ++++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 09c4e32b..850ed5b3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3498,17 +3498,6 @@ void Player::DoUse(Event *ev)
             m_pVehicle->flags &= ~FL_GODMODE;
         }
     }
-
-    if (!bWasInTurretOrVehicle && (m_pVehicle || m_pTurret)) {
-        //
-        // Added in OPM
-        //  Reset the legs and torso state.
-        //  This prevents players from using a turret and hold the weapon fire
-        //  to crouch with their weapon and become impossible to hit
-        currentState_Legs = statemap_Legs->FindState("STAND");
-        currentState_Torso = statemap_Torso->FindState("STAND");
-        charge_start_time = 0;
-    }
 }
 
 void Player::TouchStuff(pmove_t *pm)
@@ -5851,6 +5840,7 @@ void Player::NoclipCheat(Event *ev)
 
         // reset the state machine so that his animations are correct
         ResetState(NULL);
+        charge_start_time = 0;
     } else {
         client->ps.feetfalling = false;
         movecontrol            = MOVECONTROL_LEGS;
diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 8ebd0586..e156edf1 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1500,6 +1500,10 @@ void TurretGun::P_TurretUsed(Player *player)
         m_vUserViewAng = player->GetViewAngles();
 
         if (fabs(AngleSubtract(m_vUserViewAng[1], angles[1])) <= m_fMaxUseAngle) {
+            if (player->charge_start_time) {
+                return;
+            }
+
             P_TurretBeginUsed(player);
 
             flags &= ~FL_THINK;

From 78b2637c669063f8acb8c86e55d8529ae8794c07 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:18:00 +0200
Subject: [PATCH 1209/2040] Don't replay animation for new snapshot entities

This prevent cannons effects from replaying due to it being shown when the player exits the cannon
---
 code/cgame/cg_snapshot.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_snapshot.c b/code/cgame/cg_snapshot.c
index 051d1fb9..d2b83cea 100644
--- a/code/cgame/cg_snapshot.c
+++ b/code/cgame/cg_snapshot.c
@@ -73,10 +73,10 @@ static void CG_ResetEntity(centity_t *cent)
     CG_RemoveClientEntity(cent->currentState.number, tiki, cent);
 
     // reset the animation for the entities
-    if (tiki && tiki->a->bIsCharacter) {
+    if (tiki) {
         for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            cent->animLast[i]      = cent->currentState.frameInfo[i].index;
-            cent->animLastTimes[i] = cent->currentState.frameInfo[i].time;
+            cent->animLast[i]      = -1;
+            cent->animLastTimes[i] = -1;
             if (cent->currentState.frameInfo[i].weight) {
                 cent->animLastWeight |= 1 << i;
             } else {
@@ -87,7 +87,8 @@ static void CG_ResetEntity(centity_t *cent)
     } else {
         // clear all the last animations
         for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            cent->animLast[i] = -1;
+            cent->animLast[i]      = -1;
+            cent->animLastTimes[i] = 0.0;
         }
 
         cent->animLastWeight = 0;

From 8f54f4b806378e5cc0336d8a951044b621332420 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:25:42 +0200
Subject: [PATCH 1210/2040] When loading from save, set the edict model
 directly rather than loading and resetting animations

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 49dc0024..77623542 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5819,7 +5819,7 @@ void Entity::Archive(Archiver& arc)
             // set the brush model
             edict->s.modelindex = atoi(model.c_str() + 1);
         } else {
-            setModel(model);
+            setModel();
         }
     }
 

From a218106c8b393d5c1a889602d081793fb1b7e462 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 18:40:42 +0200
Subject: [PATCH 1211/2040] Reset the number of songs when freeing all songs

This fixes an issue where songs from previous maps get played on maps without a music file
---
 code/client/snd_openal_new.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 00d2f797..976818dd 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3348,6 +3348,8 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
         Com_sprintf(path, sizeof(path), "%s.mus", filename);
     }
 
+    music_numsongs = 0;
+
     FS_ReadFile(path, (void **)&data);
     if (!data) {
         Com_DPrintf("Couldn't load %s\n", path);
@@ -3356,7 +3358,6 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
     Com_DPrintf("SOUNDTRACK: Loading %s\n", path);
 
     MUSIC_StopAllSongs();
-    music_numsongs = 0;
 
     buffer       = (char *)data;
     load_path[0] = 0;
@@ -3715,6 +3716,11 @@ void MUSIC_FreeAllSongs()
     MUSIC_UpdateMood(mood_none, mood_none);
     current_soundtrack[0] = 0;
     music_loaded          = false;
+
+    // Added in OPM
+    //  Clear the list of songs so the songs from previous maps
+    //  won't get played
+    music_numsongs = 0;
 }
 
 /*

From f5391bbfa0b6748e1bfc131aff99b394b5c04e8b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:03:19 +0200
Subject: [PATCH 1212/2040] Use BUTTON_ANY to check for input rather than
 BUTTON_MOUSE

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 850ed5b3..b5df7a0f 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4258,7 +4258,7 @@ void Player::ClientInactivityTimer(void)
         );
     }
 
-    if (current_ucmd->buttons & BUTTON_MOUSE || (!g_inactivespectate->integer && !g_inactivekick->integer)
+    if (current_ucmd->buttons & BUTTON_ANY || (!g_inactivespectate->integer && !g_inactivekick->integer)
         || current_ucmd->forwardmove || current_ucmd->rightmove || current_ucmd->upmove
         || (m_bTempSpectator && client->lastActiveTime >= level.inttime - 5000)) {
         client->lastActiveTime = level.inttime;

From d52bf52e6a31eea0e7fc5552508133eadde4448c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:22:54 +0200
Subject: [PATCH 1213/2040] Add BUTTON_ANY flag when moving mouse

---
 code/client/cl_input.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index 8259067e..53934b0d 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -597,6 +597,8 @@ void CL_MouseMove( usercmd_t *cmd ) {
 	mx *= cgameSensitivity;
 	my *= cgameSensitivity;
 
+	cmd->buttons |= BUTTON_ANY;
+
 	// add mouse X/Y movement to cmd
 	if(in_strafe.active)
 		cmd->rightmove = ClampChar(cmd->rightmove + m_side->value * mx);

From 267e2f4b15671d80868537f011c32e941493b28b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:25:52 +0200
Subject: [PATCH 1214/2040] Add a workaround against inactivity timer for mods
 that handle spectating

---
 code/cgame/cg_servercmds.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index a802adc1..79a6bb31 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -483,6 +483,8 @@ static const char *whiteListedCommands[] = {
     "tmstop",
     "tmvolume",
     "`stufftext",
+    "+moveup", // workaround for mods that want to prevent inactivity when handling the spectate
+    "-moveup"
 };
 
 //

From a3e5d62c9616c784f1a002cd8dcf047228795193 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:54:22 +0200
Subject: [PATCH 1215/2040] Increase the precision of the delta animation time

---
 code/qcommon/msg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index be9cedd9..622412bc 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2263,7 +2263,7 @@ float MSG_ReadPackedAnimTime_ver_15(msg_t* msg, int bits, float fromValue, float
 {
 	int packed;
 	if (!MSG_ReadBits(msg, 1)) {
-		return ceil((fromValue + frameTime) * 100) / 100;
+		return ceil((fromValue + frameTime) * 1000) / 1000;
 	}
 
 	packed = MSG_ReadBits(msg, bits);

From ff0dcbd7864dc3ba308c0e7d915e1c35adc15bd0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 20:24:33 +0200
Subject: [PATCH 1216/2040] Add G_GetAngle

---
 code/fgame/g_utils.cpp | 28 ++++++++++++++++++++++++++++
 code/fgame/g_utils.h   |  1 +
 2 files changed, 29 insertions(+)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 1659993d..d5e7ea1f 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -902,6 +902,34 @@ void G_SetMovedir(vec3_t angles, vec3_t movedir)
     VectorClear(angles);
 }
 
+/*
+=================
+G_GetAngle
+
+Return the yaw angle
+=================
+*/
+float G_GetAngle(Vector movedir)
+{
+    float angle;
+
+    if (movedir == Vector(0, 0, 1)) {
+        return -1;
+    }
+
+    if (movedir == Vector(0, 0, -1)) {
+        return -2;
+    }
+
+    angle = RAD2DEG(atan(1.0) * 2 + atan(movedir[0] / sqrt(-movedir[0] * movedir[0] + 1.0)));
+
+    if (movedir[1] < 0) {
+        return 360 - angle;
+    }
+
+    return angle;
+}
+
 /*
 =================
 KillBox
diff --git a/code/fgame/g_utils.h b/code/fgame/g_utils.h
index caaf1174..81c87d56 100644
--- a/code/fgame/g_utils.h
+++ b/code/fgame/g_utils.h
@@ -124,6 +124,7 @@ Entity       *G_NextEntity(Entity *ent);
 qboolean M_CheckBottom(Entity *ent);
 
 Vector   G_GetMovedir(float angle);
+float    G_GetAngle(Vector movedir);
 qboolean KillBox(Entity *ent);
 qboolean IsNumeric(const char *str);
 

From 64696c764503788a3e9512efd539df07f1765073 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 20:24:47 +0200
Subject: [PATCH 1217/2040] Return the angle using the forward vector

---
 code/fgame/simpleentity.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index a4120e92..809d81b4 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -491,7 +491,10 @@ void SimpleEntity::SetAngleEvent(Event *ev)
 
 void SimpleEntity::GetAngleEvent(Event *ev)
 {
-    ev->AddFloat(angles[1]);
+    Vector forward;
+
+    angles.AngleVectorsLeft(&forward);
+    ev->AddFloat(G_GetAngle(forward));
 }
 
 void SimpleEntity::setAngles(Vector angles)

From 8ecbe1dd790e130e79e8b8620b2a2bc66a0a2d42 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 20:27:52 +0200
Subject: [PATCH 1218/2040] Set the script origin local angles and angles when
 setting the angle

This fixes the issue where a ScriptOrigin would rotate in the wrong direction
---
 code/fgame/scriptslave.cpp | 56 +++++++++++++++++++++++++++++++++++++-
 code/fgame/scriptslave.h   |  3 ++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 847017e8..2af19455 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -2104,9 +2104,39 @@ Used as an alternate origin for objects.  Bind the object to the script_origin
 in order to simulate changing that object's origin.
 ******************************************************************************/
 
+// Added in 2.30
+Event EV_ScriptOrigin_SetAngle
+(
+    "angle",
+    EV_DEFAULT,
+    "f",
+    "newAngle",
+    "set the angles of the entity using just one value.\n"
+    "Sets the yaw of the entity or an up and down\n"
+    "direction if newAngle is [0-359] or -1 or -2"
+);
+
+// Added in 2.30
+Event EV_ScriptOrigin_GetAngle
+(
+    "angle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "get the angles of the entity using just one value.\n"
+    "Gets the yaw of the entity or an up and down\n"
+    "direction if newAngle is [0-359] or -1 or -2"
+);
+
 CLASS_DECLARATION(ScriptSlave, ScriptOrigin, "script_origin") {
     {&EV_Model, &ScriptOrigin::SetModelEvent},
-    {NULL,      NULL                        }
+
+    //
+    // Added in 2.30
+    //
+    {&EV_ScriptOrigin_SetAngle, &ScriptOrigin::SetAngleEvent},
+    {&EV_ScriptOrigin_GetAngle, &ScriptOrigin::GetAngleEvent},
+    {NULL,                      NULL                        }
 };
 
 ScriptOrigin::ScriptOrigin()
@@ -2115,6 +2145,30 @@ ScriptOrigin::ScriptOrigin()
     setSolidType(SOLID_NOT);
 }
 
+void ScriptOrigin::SetAngleEvent(Event* ev)
+{
+    float angle;
+
+    angle = ev->GetFloat(1);
+    if (angle == -1) {
+        ForwardDir = Vector(0, 0, 90);
+        localangles = Vector(-90, 0, 0);
+    } else if (angle == -2) {
+        ForwardDir = Vector(0, 0, -90);
+        localangles = Vector(90, 0, 0);
+    } else {
+        ForwardDir = Vector(0, angle, 0);
+        localangles = Vector(0, angle, 0);
+    }
+
+    setAngles(localangles);
+}
+
+void ScriptOrigin::GetAngleEvent(Event* ev)
+{
+    ev->AddFloat(G_GetAngle(angles));
+}
+
 /*****************************************************************************/
 /*QUAKED script_skyorigin (1.0 0 0) ?
 
diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h
index 277ddfba..891fcb56 100644
--- a/code/fgame/scriptslave.h
+++ b/code/fgame/scriptslave.h
@@ -285,6 +285,9 @@ class ScriptOrigin : public ScriptSlave
 public:
     CLASS_PROTOTYPE(ScriptOrigin);
     ScriptOrigin();
+
+    void SetAngleEvent(Event *ev); // Added in 2.30
+    void GetAngleEvent(Event *ev); // Added in 2.30
 };
 
 class ScriptSkyOrigin : public ScriptSlave

From c580ccdee1d62cc7b850e08ea1fb6a5aa2e4e000 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 21:26:07 +0200
Subject: [PATCH 1219/2040] Only print a warning instead of dropping when the
 next snapshot is out of range

---
 code/cgame/cg_snapshot.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_snapshot.c b/code/cgame/cg_snapshot.c
index d2b83cea..06b6d67d 100644
--- a/code/cgame/cg_snapshot.c
+++ b/code/cgame/cg_snapshot.c
@@ -347,8 +347,10 @@ static snapshot_t *CG_ReadNextSnapshot(void)
     snapshot_t *dest;
 
     if (cg.latestSnapshotNum > cgs.processedSnapshotNum + 1000) {
-        cgi.Error(
-            ERR_DROP, "CG_ReadNextSnapshot: way out of range, %i > %i", cg.latestSnapshotNum, cgs.processedSnapshotNum
+        cgi.Printf(
+            "WARNING: CG_ReadNextSnapshot: way out of range, %i > %i\n",
+            cg.latestSnapshotNum,
+            cgs.processedSnapshotNum
         );
     }
 

From d2ed2f5e957f6b8367519da9937706060ab0453b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 21:37:08 +0200
Subject: [PATCH 1220/2040] Correct the gamma with the proper destination
 resolution when resampling

---
 code/renderer/tr_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 656c1898..71c1eaf1 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -750,7 +750,7 @@ void R_ResampledScreenShot(const char* filename, int destwidth, int destheight)
 
 	// gamma correct
 	if ( glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, 128 * 128 * 3 );
+		R_GammaCorrect( buffer + 18, destheight * destwidth * 3 );
 	}
 
 	ri.FS_WriteFile( filename, buffer, destheight * destwidth * 3 + 18 );

From 901e81cdf5dc4a4b91d86f0ee7c467e29c8180ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 21:59:12 +0200
Subject: [PATCH 1221/2040] Format barrels source file

---
 code/fgame/barrels.cpp | 765 +++++++++++++++++------------------------
 code/fgame/barrels.h   |  92 +++--
 2 files changed, 367 insertions(+), 490 deletions(-)

diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp
index 647ecf5d..3a059c2f 100644
--- a/code/fgame/barrels.cpp
+++ b/code/fgame/barrels.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -45,562 +45,443 @@ Does nothing special at all. It's just a poor empty barrel. aww :(
 ******************************************************************************/
 
 Event EV_Barrel_Think
-	(
+(
 	"_barrel_think",
 	EV_DEFAULT,
 	NULL,
 	NULL,
 	"think function for a barrel."
-	);
+);
 
 Event EV_Barrel_Setup
-	(
+(
 	"_barrel_setup",
 	EV_DEFAULT,
 	NULL,
 	NULL,
 	"Does the post spawn setup of the barrel"
-	);
+);
 
 Event EV_Barrel_SetType
-	(
+(
 	"barreltype",
 	EV_DEFAULT,
 	"s",
 	"type",
 	"Sets the barrel's type"
-	);
+);
 
-CLASS_DECLARATION( Entity, BarrelObject, "func_barrel" )
-{
-	{ &EV_Barrel_Setup,					&BarrelObject::BarrelSetup },
-	{ &EV_Barrel_Think,					&BarrelObject::BarrelThink },
-	{ &EV_Barrel_SetType,				&BarrelObject::BarrelSetType },
-	{ &EV_Damage,						&BarrelObject::BarrelDamaged },
-	{ &EV_Killed,						&BarrelObject::BarrelKilled },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, BarrelObject, "func_barrel") {
+    {&EV_Barrel_Setup,   &BarrelObject::BarrelSetup  },
+    {&EV_Barrel_Think,   &BarrelObject::BarrelThink  },
+    {&EV_Barrel_SetType, &BarrelObject::BarrelSetType},
+    {&EV_Damage,         &BarrelObject::BarrelDamaged},
+    {&EV_Killed,         &BarrelObject::BarrelKilled },
+    {NULL,               NULL                        }
 };
 
 BarrelObject::BarrelObject()
 {
+    AddWaitTill(STRING_DEATH);
 
-	AddWaitTill(STRING_DEATH);
+    if (LoadingSavegame) {
+        return;
+    }
 
-	if (LoadingSavegame)
-	{
-		return;
-	}
+    edict->s.eType = ET_GENERAL;
 
-	edict->s.eType = ET_GENERAL;
+    m_iBarrelType  = 0;
+    m_fFluidAmount = 0;
+    m_fHeightFluid = 0;
 
-	m_iBarrelType = 0;
-	m_fFluidAmount = 0;
-	m_fHeightFluid = 0;
+    for (int i = 0; i < MAX_BARREL_LEAKS; i++) {
+        m_bLeaksActive[i] = 0;
+    }
 
-	for( int i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		m_bLeaksActive[ i ] = 0;
-	}
+    m_fDamageSoundTime = 0;
+    mass               = 500;
+    max_health         = 75;
+    health             = 75;
+    deadflag           = DEAD_NO;
+    takedamage         = DAMAGE_YES;
+    m_vJitterAngles    = vec_zero;
 
-	m_fDamageSoundTime = 0;
-	mass = 500;
-	max_health = 75;
-	health = 75;
-	deadflag = DEAD_NO;
-	takedamage = DAMAGE_YES;
-	m_vJitterAngles = vec_zero;
-
-	PostEvent( EV_Barrel_Setup, EV_POSTSPAWN );
+    PostEvent(EV_Barrel_Setup, EV_POSTSPAWN);
 }
 
-int BarrelObject::PickBarrelLeak
-	(
-	void
-	)
+int BarrelObject::PickBarrelLeak(void)
 {
-	int iHighest;
-	float fHighestHeight;
+    int   iHighest;
+    float fHighestHeight;
 
-	for( int i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( !m_bLeaksActive[ i ] ) {
-			return i;
-		}
-	}
+    for (int i = 0; i < MAX_BARREL_LEAKS; i++) {
+        if (!m_bLeaksActive[i]) {
+            return i;
+        }
+    }
 
-	fHighestHeight = m_vLeaks[ 0 ][ 2 ];
-	iHighest = 0;
+    fHighestHeight = m_vLeaks[0][2];
+    iHighest       = 0;
 
-	for( int i = 1; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( m_vLeaks[ 0 ][ 2 ] > fHighestHeight )
-		{
-			fHighestHeight = m_vLeaks[ 0 ][ 2 ];
-			iHighest = i;
-		}
-	}
+    for (int i = 1; i < MAX_BARREL_LEAKS; i++) {
+        if (m_vLeaks[0][2] > fHighestHeight) {
+            fHighestHeight = m_vLeaks[0][2];
+            iHighest       = i;
+        }
+    }
 
-	return iHighest;
+    return iHighest;
 }
 
-void BarrelObject::BarrelSetup
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelSetup(Event *ev)
 {
-	setMoveType( MOVETYPE_PUSH );
-	setSolidType( SOLID_BSP );
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_BSP);
 
-	m_vStartAngles = angles;
-	m_fJitterScale = 64.0f / size[ 2 ];
+    m_vStartAngles = angles;
+    m_fJitterScale = 64.0f / size[2];
 
-	m_fFluidAmount = size[ 0 ] * size[ 1 ] * size[ 2 ] / 150.0f;
-	m_fHeightFluid = m_fFluidAmount / size[ 2 ];
+    m_fFluidAmount = size[0] * size[1] * size[2] / 150.0f;
+    m_fHeightFluid = m_fFluidAmount / size[2];
 
-	// Position the barrel correctly
-	CheckGround();
+    // Position the barrel correctly
+    CheckGround();
 }
 
-void BarrelObject::BarrelSetType
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelSetType(Event *ev)
 {
-	str sType = ev->GetString( 1 );
+    str sType = ev->GetString(1);
 
-	if( !sType.icmp( "oil" ) )
-	{
-		health = 75;
-		m_iBarrelType = BARREL_OIL;
+    if (!sType.icmp("oil")) {
+        health        = 75;
+        m_iBarrelType = BARREL_OIL;
 
-		CacheResource( "models/fx/barrel_empty_destroyed.tik" );
-		CacheResource( "models/fx/barrel_oil_destroyed.tik" );
-	}
-	else if( !sType.icmp( "water" ) )
-	{
-		health = 75;
-		m_iBarrelType = BARREL_WATER;
+        CacheResource("models/fx/barrel_empty_destroyed.tik");
+        CacheResource("models/fx/barrel_oil_destroyed.tik");
+    } else if (!sType.icmp("water")) {
+        health        = 75;
+        m_iBarrelType = BARREL_WATER;
 
-		CacheResource( "models/fx/barrel_empty_destroyed.tik" );
-		CacheResource( "models/fx/barrel_water_destroyed.tik" );
-	}
-	else if( !sType.icmp( "gas" ) )
-	{
-		spawnflags &= ~BARREL_INDESTRUCTABLE;
-		health = 75;
-		m_iBarrelType = BARREL_GAS;
+        CacheResource("models/fx/barrel_empty_destroyed.tik");
+        CacheResource("models/fx/barrel_water_destroyed.tik");
+    } else if (!sType.icmp("gas")) {
+        spawnflags &= ~BARREL_INDESTRUCTABLE;
+        health        = 75;
+        m_iBarrelType = BARREL_GAS;
 
-		CacheResource( "models/fx/barrel_gas_destroyed.tik" );
-	}
-	else
-	{
-		health = 75;
-		m_iBarrelType = BARREL_EMPTY;
+        CacheResource("models/fx/barrel_gas_destroyed.tik");
+    } else {
+        health        = 75;
+        m_iBarrelType = BARREL_EMPTY;
 
-		CacheResource( "models/fx/barrel_empty_destroyed.tik" );
-	}
+        CacheResource("models/fx/barrel_empty_destroyed.tik");
+    }
 
-	max_health = health;
+    max_health = health;
 }
 
-void BarrelObject::BarrelThink
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelThink(Event *ev)
 {
-	int i;
-	int iBiggestLeak;
-	float fFluidTop;
+    int   i;
+    int   iBiggestLeak;
+    float fFluidTop;
 
-	iBiggestLeak = 0;
+    iBiggestLeak = 0;
 
-	fFluidTop = m_fFluidAmount / m_fHeightFluid + ( mins[ 2 ] + origin[ 2 ] );
-	for( i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( !m_bLeaksActive[ i ] ) {
-			continue;
-		}
+    fFluidTop = m_fFluidAmount / m_fHeightFluid + (mins[2] + origin[2]);
+    for (i = 0; i < MAX_BARREL_LEAKS; i++) {
+        if (!m_bLeaksActive[i]) {
+            continue;
+        }
 
-		// Send infos to clients
-		if( m_vLeaks[ i ][ 2 ] <= fFluidTop )
-		{
-			gi.SetBroadcastVisible( m_vLeaks[ i ], m_vLeaks[ i ] );
+        // Send infos to clients
+        if (m_vLeaks[i][2] <= fFluidTop) {
+            gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
 
-			if( m_vLeaks[ i ][ 2 ] <= fFluidTop - 1.3f )
-			{
-				if( m_vLeaks[ i ][ 2 ] <= fFluidTop - 3.0f )
-				{
-					// big leak
+            if (m_vLeaks[i][2] <= fFluidTop - 1.3f) {
+                if (m_vLeaks[i][2] <= fFluidTop - 3.0f) {
+                    // big leak
 
-					if( m_iBarrelType == BARREL_OIL )
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_1));
-					}
-					else
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_5));
-					}
+                    if (m_iBarrelType == BARREL_OIL) {
+                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_1));
+                    } else {
+                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_5));
+                    }
 
-					m_fFluidAmount -= 1.0f;
-					iBiggestLeak |= 4;
-				}
-				else
-				{
-					// medium leak
+                    m_fFluidAmount -= 1.0f;
+                    iBiggestLeak |= 4;
+                } else {
+                    // medium leak
 
-					if( m_iBarrelType == BARREL_OIL )
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_2));
-					}
-					else
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_6));
-					}
+                    if (m_iBarrelType == BARREL_OIL) {
+                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_2));
+                    } else {
+                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_6));
+                    }
 
-					m_fFluidAmount -= 0.75f;
-					iBiggestLeak |= 2;
-				}
-			}
-			else
-			{
-				// small leak
+                    m_fFluidAmount -= 0.75f;
+                    iBiggestLeak |= 2;
+                }
+            } else {
+                // small leak
 
-				if( m_iBarrelType == BARREL_OIL )
-				{
-					gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-				}
-				else
-				{
-					gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-				}
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+                }
 
-				m_fFluidAmount -= 0.5f;
-				iBiggestLeak |= 1;
-			}
+                m_fFluidAmount -= 0.5f;
+                iBiggestLeak |= 1;
+            }
 
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 0 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 1 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 2 ] );
-			gi.MSG_WriteDir( m_vLeakNorms[ i ] );
-			gi.MSG_EndCGM();
-		}
-		else
-		{
-			gi.SetBroadcastVisible( m_vLeaks[ i ], m_vLeaks[ i ] );
+            gi.MSG_WriteCoord(m_vLeaks[i][0]);
+            gi.MSG_WriteCoord(m_vLeaks[i][1]);
+            gi.MSG_WriteCoord(m_vLeaks[i][2]);
+            gi.MSG_WriteDir(m_vLeakNorms[i]);
+            gi.MSG_EndCGM();
+        } else {
+            gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
 
-			if( m_iBarrelType == BARREL_OIL )
-			{
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-			}
-			else
-			{
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-			}
+            if (m_iBarrelType == BARREL_OIL) {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+            } else {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+            }
 
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 0 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 1 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 2 ] );
-			gi.MSG_WriteDir( m_vLeakNorms[ i ] );
-			gi.MSG_EndCGM();
+            gi.MSG_WriteCoord(m_vLeaks[i][0]);
+            gi.MSG_WriteCoord(m_vLeaks[i][1]);
+            gi.MSG_WriteCoord(m_vLeaks[i][2]);
+            gi.MSG_WriteDir(m_vLeakNorms[i]);
+            gi.MSG_EndCGM();
 
-			m_bLeaksActive[ i ] = qfalse;
-		}
-	}
+            m_bLeaksActive[i] = qfalse;
+        }
+    }
 
-	if( m_vJitterAngles[ 0 ] == 0.0f && m_vJitterAngles[ 2 ] == 0.0f )
-	{
-		if( !VectorCompare( angles, m_vStartAngles ) )
-		{
-			setAngles( m_vStartAngles );
-		}
-	}
+    if (m_vJitterAngles[0] == 0.0f && m_vJitterAngles[2] == 0.0f) {
+        if (!VectorCompare(angles, m_vStartAngles)) {
+            setAngles(m_vStartAngles);
+        }
+    }
 
-	setAngles( Vector( m_vStartAngles[ 0 ] + m_vJitterAngles[ 0 ], m_vStartAngles[ 1 ], m_vStartAngles[ 2 ] + m_vJitterAngles[ 2 ] ) );
+    setAngles(Vector(m_vStartAngles[0] + m_vJitterAngles[0], m_vStartAngles[1], m_vStartAngles[2] + m_vJitterAngles[2])
+    );
 
-	if( m_vJitterAngles[ 0 ] > 0.0f )
-	{
-		m_vJitterAngles[ 0 ] -= 1.f / 3.f * m_fJitterScale;
+    if (m_vJitterAngles[0] > 0.0f) {
+        m_vJitterAngles[0] -= 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 0 ] > 0.0f )
-		{
-			m_vJitterAngles[ 0 ] = 0.0f;
-		}
-	}
-	else if( m_vJitterAngles[ 0 ] < 0.0f )
-	{
-		m_vJitterAngles[ 0 ] += 1.f / 3.f * m_fJitterScale;
+        if (m_vJitterAngles[0] > 0.0f) {
+            m_vJitterAngles[0] = 0.0f;
+        }
+    } else if (m_vJitterAngles[0] < 0.0f) {
+        m_vJitterAngles[0] += 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 0 ] < 0.0f )
-		{
-			m_vJitterAngles[ 0 ] = 0.0f;
-		}
-	}
+        if (m_vJitterAngles[0] < 0.0f) {
+            m_vJitterAngles[0] = 0.0f;
+        }
+    }
 
-	m_vJitterAngles[ 0 ] = -m_vJitterAngles[ 0 ];
+    m_vJitterAngles[0] = -m_vJitterAngles[0];
 
-	if( m_vJitterAngles[ 2 ] > 0.0f )
-	{
-		m_vJitterAngles[ 2 ] -= 1.f / 3.f * m_fJitterScale;
+    if (m_vJitterAngles[2] > 0.0f) {
+        m_vJitterAngles[2] -= 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 2 ] > 0.0f )
-		{
-			m_vJitterAngles[ 2 ] = 0.0f;
-		}
-	}
-	else if( m_vJitterAngles[ 2 ] < 0.0f )
-	{
-		m_vJitterAngles[ 2 ] += 1.f / 3.f * m_fJitterScale;
+        if (m_vJitterAngles[2] > 0.0f) {
+            m_vJitterAngles[2] = 0.0f;
+        }
+    } else if (m_vJitterAngles[2] < 0.0f) {
+        m_vJitterAngles[2] += 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 2 ] < 0.0f )
-		{
-			m_vJitterAngles[ 2 ] = 0.0f;
-		}
-	}
+        if (m_vJitterAngles[2] < 0.0f) {
+            m_vJitterAngles[2] = 0.0f;
+        }
+    }
 
-	m_vJitterAngles[ 2 ] = -m_vJitterAngles[ 2 ];
+    m_vJitterAngles[2] = -m_vJitterAngles[2];
 
-	// Check for at least one active leak to play a sound
-	for( i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( m_bLeaksActive[ i ] ) {
-			break;
-		}
-	}
+    // Check for at least one active leak to play a sound
+    for (i = 0; i < MAX_BARREL_LEAKS; i++) {
+        if (m_bLeaksActive[i]) {
+            break;
+        }
+    }
 
-	// Play a leak sound
-	if( i != MAX_BARREL_LEAKS && iBiggestLeak )
-	{
-		if( !( iBiggestLeak & 4 ) )
-		{
-			if( iBiggestLeak & 2 )
-			{
-				// medium leak
-				LoopSound( "liquid_leak", 0.60f, -1.0f, -1.0f, 0.90f );
-			}
-			else
-			{
-				// small leak
-				LoopSound( "liquid_leak", 0.30f, -1.0f, -1.0f, 0.80f );
-			}
-		}
-		else
-		{
-			// big leak
-			LoopSound( "liquid_leak", 1.0f, -1.0f, -1.0f, 1.0f );
-		}
-	}
+    // Play a leak sound
+    if (i != MAX_BARREL_LEAKS && iBiggestLeak) {
+        if (!(iBiggestLeak & 4)) {
+            if (iBiggestLeak & 2) {
+                // medium leak
+                LoopSound("liquid_leak", 0.60f, -1.0f, -1.0f, 0.90f);
+            } else {
+                // small leak
+                LoopSound("liquid_leak", 0.30f, -1.0f, -1.0f, 0.80f);
+            }
+        } else {
+            // big leak
+            LoopSound("liquid_leak", 1.0f, -1.0f, -1.0f, 1.0f);
+        }
+    }
 
-	if( i == MAX_BARREL_LEAKS ) {
-		StopLoopSound();
-	}
+    if (i == MAX_BARREL_LEAKS) {
+        StopLoopSound();
+    }
 
-	if( m_vJitterAngles[ 0 ] || m_vJitterAngles[ 2 ] || i < MAX_BARREL_LEAKS )
-	{
-		m_fLastEffectTime += 0.075f;
+    if (m_vJitterAngles[0] || m_vJitterAngles[2] || i < MAX_BARREL_LEAKS) {
+        m_fLastEffectTime += 0.075f;
 
-		if( level.time >= m_fLastEffectTime )
-		{
-			m_fLastEffectTime = level.time + 0.075f;
-		}
+        if (level.time >= m_fLastEffectTime) {
+            m_fLastEffectTime = level.time + 0.075f;
+        }
 
-		PostEvent( EV_Barrel_Think, m_fLastEffectTime - level.time );
-	}
+        PostEvent(EV_Barrel_Think, m_fLastEffectTime - level.time);
+    }
 }
 
-void BarrelObject::BarrelDamaged
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelDamaged(Event *ev)
 {
-	Vector vDir;
-	Vector vForward;
-	Vector vRight;
-	int iDamage;
-	int iMeansOfDeath;
-	Vector vHitPos;
-	Vector vHitDirection;
-	Vector vHitNormal;
+    Vector vDir;
+    Vector vForward;
+    Vector vRight;
+    int    iDamage;
+    int    iMeansOfDeath;
+    Vector vHitPos;
+    Vector vHitDirection;
+    Vector vHitNormal;
 
-	if( !takedamage )
-	{
-		return;
-	}
+    if (!takedamage) {
+        return;
+    }
 
-	iDamage = ev->GetInteger( 2 );
-	iMeansOfDeath = ev->GetInteger( 9 );
-	vHitPos = ev->GetVector( 4 );
-	vHitDirection = ev->GetVector( 5 );
-	vHitNormal = ev->GetVector( 6 );
+    iDamage       = ev->GetInteger(2);
+    iMeansOfDeath = ev->GetInteger(9);
+    vHitPos       = ev->GetVector(4);
+    vHitDirection = ev->GetVector(5);
+    vHitNormal    = ev->GetVector(6);
 
-	vDir = ( vHitDirection - vHitNormal ) * 0.5f;
-	AngleVectors( angles, vForward, vRight, NULL );
+    vDir = (vHitDirection - vHitNormal) * 0.5f;
+    AngleVectors(angles, vForward, vRight, NULL);
 
-	m_vJitterAngles[ 0 ] += DotProduct( vDir, vForward ) * m_fJitterScale * 0.0275f * ( float )iDamage;
-	m_vJitterAngles[ 2 ] += DotProduct( vDir, vRight ) * m_fJitterScale * 0.0275f * ( float )iDamage;
+    m_vJitterAngles[0] += DotProduct(vDir, vForward) * m_fJitterScale * 0.0275f * (float)iDamage;
+    m_vJitterAngles[2] += DotProduct(vDir, vRight) * m_fJitterScale * 0.0275f * (float)iDamage;
 
-	if( m_vJitterAngles[ 0 ] > m_fJitterScale * 1.5f )
-	{
-		m_vJitterAngles[ 0 ] = m_fJitterScale * 1.5f;
-	}
-	else if( m_vJitterAngles[ 0 ]  < -( m_fJitterScale * 1.5f ) )
-	{
-		m_vJitterAngles[ 0 ] = -( m_fJitterScale * 1.5f );
-	}
+    if (m_vJitterAngles[0] > m_fJitterScale * 1.5f) {
+        m_vJitterAngles[0] = m_fJitterScale * 1.5f;
+    } else if (m_vJitterAngles[0] < -(m_fJitterScale * 1.5f)) {
+        m_vJitterAngles[0] = -(m_fJitterScale * 1.5f);
+    }
 
-	if( m_vJitterAngles[ 2 ] > m_fJitterScale * 1.5f )
-	{
-		m_vJitterAngles[ 2 ] = m_fJitterScale * 1.5f;
-	}
-	else if( m_vJitterAngles[ 2 ] < -( m_fJitterScale * 1.5f ) )
-	{
-		m_vJitterAngles[ 2 ] = -( m_fJitterScale * 1.5f );
-	}
+    if (m_vJitterAngles[2] > m_fJitterScale * 1.5f) {
+        m_vJitterAngles[2] = m_fJitterScale * 1.5f;
+    } else if (m_vJitterAngles[2] < -(m_fJitterScale * 1.5f)) {
+        m_vJitterAngles[2] = -(m_fJitterScale * 1.5f);
+    }
 
-	if( !( spawnflags & BARREL_INDESTRUCTABLE ) )
-	{
-		if( ( iMeansOfDeath == MOD_VEHICLE || iMeansOfDeath == MOD_ROCKET ||
-			iMeansOfDeath == MOD_GRENADE || iMeansOfDeath == MOD_EXPLODEWALL ||
-			iMeansOfDeath == MOD_EXPLOSION || m_iBarrelType == BARREL_GAS ) &&
-			iMeansOfDeath != MOD_BASH
-			)
-		{
-			if( iDamage >= health )
-			{
-				PostEvent( EV_Killed, 0.01f );
-				takedamage = DAMAGE_NO;
-				return;
-			}
+    if (!(spawnflags & BARREL_INDESTRUCTABLE)) {
+        if ((iMeansOfDeath == MOD_VEHICLE || iMeansOfDeath == MOD_ROCKET || iMeansOfDeath == MOD_GRENADE
+             || iMeansOfDeath == MOD_EXPLODEWALL || iMeansOfDeath == MOD_EXPLOSION || m_iBarrelType == BARREL_GAS)
+            && iMeansOfDeath != MOD_BASH) {
+            if (iDamage >= health) {
+                PostEvent(EV_Killed, 0.01f);
+                takedamage = DAMAGE_NO;
+                return;
+            }
 
-			if( m_iBarrelType == BARREL_GAS )
-			{
-				iDamage /= 2;
+            if (m_iBarrelType == BARREL_GAS) {
+                iDamage /= 2;
 
-				health -= iDamage;
-				if( health < 1.0f )
-					health = 1.0f;
-			}
-		}
-	}
+                health -= iDamage;
+                if (health < 1.0f) {
+                    health = 1.0f;
+                }
+            }
+        }
+    }
 
-	if( !EventPending( EV_Barrel_Think ) )
-	{
-		m_fLastEffectTime = level.time - 0.075f;
-		ProcessEvent( EV_Barrel_Think );
-	}
+    if (!EventPending(EV_Barrel_Think)) {
+        m_fLastEffectTime = level.time - 0.075f;
+        ProcessEvent(EV_Barrel_Think);
+    }
 
-	if( m_iBarrelType <= BARREL_WATER )
-	{
-		int index = PickBarrelLeak();
+    if (m_iBarrelType <= BARREL_WATER) {
+        int index = PickBarrelLeak();
 
-		if( vHitPos[ 2 ] <= m_fFluidAmount / m_fHeightFluid + origin[ 2 ] + mins[ 2 ] )
-		{
-			m_bLeaksActive[ index ] = qtrue;
-			m_vLeaks[ index ] = vHitPos;
-			m_vLeakNorms[ index ] = vHitNormal;
+        if (vHitPos[2] <= m_fFluidAmount / m_fHeightFluid + origin[2] + mins[2]) {
+            m_bLeaksActive[index] = qtrue;
+            m_vLeaks[index]       = vHitPos;
+            m_vLeakNorms[index]   = vHitNormal;
 
-			gi.SetBroadcastVisible( vHitPos, vHitPos );
+            gi.SetBroadcastVisible(vHitPos, vHitPos);
 
-			if( m_iBarrelType == BARREL_OIL )
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_4));
-			else
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_8));
-		}
-		else
-		{
-			gi.SetBroadcastVisible( vHitPos, vHitPos );
+            if (m_iBarrelType == BARREL_OIL) {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_4));
+            } else {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_8));
+            }
+        } else {
+            gi.SetBroadcastVisible(vHitPos, vHitPos);
 
-			if( m_iBarrelType == BARREL_OIL )
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-			else
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-		}
+            if (m_iBarrelType == BARREL_OIL) {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+            } else {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+            }
+        }
 
-		gi.MSG_WriteCoord( vHitPos[ 0 ] );
-		gi.MSG_WriteCoord( vHitPos[ 1 ] );
-		gi.MSG_WriteCoord( vHitPos[ 2 ] );
-		gi.MSG_WriteDir( vHitNormal );
-		gi.MSG_EndCGM();
-	}
+        gi.MSG_WriteCoord(vHitPos[0]);
+        gi.MSG_WriteCoord(vHitPos[1]);
+        gi.MSG_WriteCoord(vHitPos[2]);
+        gi.MSG_WriteDir(vHitNormal);
+        gi.MSG_EndCGM();
+    }
 }
 
-void BarrelObject::BarrelKilled
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelKilled(Event *ev)
 {
-	float fFluidTop;
-	Vector vPos;
-	str sModel;
+    float  fFluidTop;
+    Vector vPos;
+    str    sModel;
 
-	setSolidType( SOLID_NOT );
-	PostEvent( EV_Remove, 0.05f );
+    setSolidType(SOLID_NOT);
+    PostEvent(EV_Remove, 0.05f);
 
-	vPos[ 2 ] = ( mins[ 2 ] + origin[ 2 ] );
-	fFluidTop = m_fFluidAmount / m_fHeightFluid + vPos[ 2 ];
+    vPos[2]   = (mins[2] + origin[2]);
+    fFluidTop = m_fFluidAmount / m_fHeightFluid + vPos[2];
 
-	if( m_iBarrelType == BARREL_GAS )
-	{
-		RadiusDamage(
-			centroid,
-			this,
-			this,
-			200,
-			this,
-			MOD_EXPLOSION,
-			350,
-			24 );
+    if (m_iBarrelType == BARREL_GAS) {
+        RadiusDamage(centroid, this, this, 200, this, MOD_EXPLOSION, 350, 24);
 
-		sModel = "models/fx/barrel_gas_destroyed.tik";
-	}
-	else if( m_iBarrelType == BARREL_WATER )
-	{
-		if( vPos[ 2 ] + 0.25f * maxs[ 2 ] <= fFluidTop )
-		{
-			sModel = "models/fx/barrel_water_destroyed.tik";
-		}
-		else
-		{
-			sModel = "models/fx/barrel_empty_destroyed.tik";
-		}
-	}
-	else if( m_iBarrelType == BARREL_OIL )
-	{
-		if( vPos[ 2 ] + 0.25f * maxs[ 2 ] > fFluidTop )
-		{
-			sModel = "models/fx/barrel_empty_destroyed.tik";
-		}
-		else
-		{
-			RadiusDamage(
-				centroid,
-				this,
-				this,
-				200,
-				this,
-				MOD_EXPLOSION,
-				350,
-				24 );
+        sModel = "models/fx/barrel_gas_destroyed.tik";
+    } else if (m_iBarrelType == BARREL_WATER) {
+        if (vPos[2] + 0.25f * maxs[2] <= fFluidTop) {
+            sModel = "models/fx/barrel_water_destroyed.tik";
+        } else {
+            sModel = "models/fx/barrel_empty_destroyed.tik";
+        }
+    } else if (m_iBarrelType == BARREL_OIL) {
+        if (vPos[2] + 0.25f * maxs[2] > fFluidTop) {
+            sModel = "models/fx/barrel_empty_destroyed.tik";
+        } else {
+            RadiusDamage(centroid, this, this, 200, this, MOD_EXPLOSION, 350, 24);
 
-			sModel = "models/fx/barrel_oil_destroyed.tik";
-		}
-	}
-	else
-	{
-		sModel = "models/fx/barrel_empty_destroyed.tik";
-	}
+            sModel = "models/fx/barrel_oil_destroyed.tik";
+        }
+    } else {
+        sModel = "models/fx/barrel_empty_destroyed.tik";
+    }
 
-	Animate *exp = new Animate;
+    Animate *exp = new Animate;
 
-	// Spawn an explosion effect
-	exp->edict->s.renderfx |= RF_DONTDRAW;
-	exp->setModel( sModel );
+    // Spawn an explosion effect
+    exp->edict->s.renderfx |= RF_DONTDRAW;
+    exp->setModel(sModel);
 
-	vPos = origin + ( maxs + mins ) * 0.5f;
+    vPos = origin + (maxs + mins) * 0.5f;
 
-	exp->setAngles( Vector( -90, 0, 0 ) );
-	exp->setOrigin( vPos );
-	exp->NewAnim( "idle" );
+    exp->setAngles(Vector(-90, 0, 0));
+    exp->setOrigin(vPos);
+    exp->NewAnim("idle");
 
-	exp->PostEvent( EV_Remove, 0.1f );
-	exp->Unregister( STRING_DEATH );
+    exp->PostEvent(EV_Remove, 0.1f);
+    exp->Unregister(STRING_DEATH);
 }
diff --git a/code/fgame/barrels.h b/code/fgame/barrels.h
index e8330feb..18f67451 100644
--- a/code/fgame/barrels.h
+++ b/code/fgame/barrels.h
@@ -26,66 +26,62 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "entity.h"
 
-#define BARREL_INDESTRUCTABLE		1
-#define MAX_BARREL_LEAKS			4
+#define BARREL_INDESTRUCTABLE 1
+#define MAX_BARREL_LEAKS      4
 
-enum
-{
-	BARREL_EMPTY,
-	BARREL_OIL,
-	BARREL_WATER,
-	BARREL_GAS
+enum {
+    BARREL_EMPTY,
+    BARREL_OIL,
+    BARREL_WATER,
+    BARREL_GAS
 };
 
-class BarrelObject : public Entity {
-	int m_iBarrelType;
-	float m_fFluidAmount;
-	float m_fHeightFluid;
-	qboolean m_bLeaksActive[ MAX_BARREL_LEAKS ];
-	Vector m_vLeaks[ MAX_BARREL_LEAKS ];
-	Vector m_vLeakNorms[ MAX_BARREL_LEAKS ];
-	Vector m_vJitterAngles;
-	Vector m_vStartAngles;
-	float m_fJitterScale;
-	float m_fLastEffectTime;
-	float m_fDamageSoundTime;
+class BarrelObject : public Entity
+{
+    int      m_iBarrelType;
+    float    m_fFluidAmount;
+    float    m_fHeightFluid;
+    qboolean m_bLeaksActive[MAX_BARREL_LEAKS];
+    Vector   m_vLeaks[MAX_BARREL_LEAKS];
+    Vector   m_vLeakNorms[MAX_BARREL_LEAKS];
+    Vector   m_vJitterAngles;
+    Vector   m_vStartAngles;
+    float    m_fJitterScale;
+    float    m_fLastEffectTime;
+    float    m_fDamageSoundTime;
 
 public:
-	CLASS_PROTOTYPE( BarrelObject );
+    CLASS_PROTOTYPE(BarrelObject);
 
-	BarrelObject();
+    BarrelObject();
 
-	int				PickBarrelLeak( void );
+    int PickBarrelLeak(void);
 
-	void			BarrelSetup( Event *ev );
-	void			BarrelSetType( Event *ev );
-	void			BarrelThink( Event *ev );
-	void			BarrelDamaged( Event *ev );
-	void			BarrelKilled( Event *ev );
+    void BarrelSetup(Event *ev);
+    void BarrelSetType(Event *ev);
+    void BarrelThink(Event *ev);
+    void BarrelDamaged(Event *ev);
+    void BarrelKilled(Event *ev);
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 };
 
-inline void BarrelObject::Archive
-	(
-	Archiver& arc
-	)
+inline void BarrelObject::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveInteger( &m_iBarrelType );
-	arc.ArchiveFloat( &m_fFluidAmount );
-	arc.ArchiveFloat( &m_fHeightFluid );
-	arc.ArchiveVector( &m_vJitterAngles );
-	arc.ArchiveVector( &m_vStartAngles );
-	arc.ArchiveFloat( &m_fJitterScale );
-	arc.ArchiveFloat( &m_fLastEffectTime );
-	arc.ArchiveFloat( &m_fDamageSoundTime );
+    arc.ArchiveInteger(&m_iBarrelType);
+    arc.ArchiveFloat(&m_fFluidAmount);
+    arc.ArchiveFloat(&m_fHeightFluid);
+    arc.ArchiveVector(&m_vJitterAngles);
+    arc.ArchiveVector(&m_vStartAngles);
+    arc.ArchiveFloat(&m_fJitterScale);
+    arc.ArchiveFloat(&m_fLastEffectTime);
+    arc.ArchiveFloat(&m_fDamageSoundTime);
 
-	for( int i = MAX_BARREL_LEAKS - 1; i >= 0; i-- )
-	{
-		arc.ArchiveBoolean( &m_bLeaksActive[ i ] );
-		arc.ArchiveVector( &m_vLeaks[ i ] );
-		arc.ArchiveVector( &m_vLeakNorms[ i ] );
-	}
+    for (int i = MAX_BARREL_LEAKS - 1; i >= 0; i--) {
+        arc.ArchiveBoolean(&m_bLeaksActive[i]);
+        arc.ArchiveVector(&m_vLeaks[i]);
+        arc.ArchiveVector(&m_vLeakNorms[i]);
+    }
 }

From f87e6d5938eb790441a88606a641f92f0fcf7762 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Oct 2024 22:12:13 +0200
Subject: [PATCH 1222/2040] Fix barrel jitter

This fixes barrel objects improperly jittering back and forth, sometimes forever
---
 code/fgame/barrels.cpp | 81 ++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp
index 3a059c2f..c0482c64 100644
--- a/code/fgame/barrels.cpp
+++ b/code/fgame/barrels.cpp
@@ -264,42 +264,47 @@ void BarrelObject::BarrelThink(Event *ev)
             setAngles(m_vStartAngles);
         }
     }
+    else {
+        Vector ang;
 
-    setAngles(Vector(m_vStartAngles[0] + m_vJitterAngles[0], m_vStartAngles[1], m_vStartAngles[2] + m_vJitterAngles[2])
-    );
+        ang = m_vStartAngles;
+        ang[0] += m_vJitterAngles[0];
+        ang[2] += m_vJitterAngles[2];
+        setAngles(ang);
 
-    if (m_vJitterAngles[0] > 0.0f) {
-        m_vJitterAngles[0] -= 1.f / 3.f * m_fJitterScale;
+        if (m_vJitterAngles[0] < 0) {
+            m_vJitterAngles[0] += 1.f / 3.f * m_fJitterScale;
 
-        if (m_vJitterAngles[0] > 0.0f) {
-            m_vJitterAngles[0] = 0.0f;
+            if (m_vJitterAngles[0] > 0) {
+                m_vJitterAngles[0] = 0;
+            }
+        } else if (m_vJitterAngles[0] > 0) {
+            m_vJitterAngles[0] -= 1.f / 3.f * m_fJitterScale;
+
+            if (m_vJitterAngles[0] < 0) {
+                m_vJitterAngles[0] = 0;
+            }
         }
-    } else if (m_vJitterAngles[0] < 0.0f) {
-        m_vJitterAngles[0] += 1.f / 3.f * m_fJitterScale;
 
-        if (m_vJitterAngles[0] < 0.0f) {
-            m_vJitterAngles[0] = 0.0f;
+        m_vJitterAngles[0] = -m_vJitterAngles[0];
+
+        if (m_vJitterAngles[2] < 0) {
+            m_vJitterAngles[2] += 1.f / 3.f * m_fJitterScale;
+
+            if (m_vJitterAngles[2] > 0) {
+                m_vJitterAngles[2] = 0;
+            }
+        } else if (m_vJitterAngles[2] > 0) {
+            m_vJitterAngles[2] -= 1.f / 3.f * m_fJitterScale;
+
+            if (m_vJitterAngles[2] < 0) {
+                m_vJitterAngles[2] = 0;
+            }
         }
+
+        m_vJitterAngles[2] = -m_vJitterAngles[2];
     }
 
-    m_vJitterAngles[0] = -m_vJitterAngles[0];
-
-    if (m_vJitterAngles[2] > 0.0f) {
-        m_vJitterAngles[2] -= 1.f / 3.f * m_fJitterScale;
-
-        if (m_vJitterAngles[2] > 0.0f) {
-            m_vJitterAngles[2] = 0.0f;
-        }
-    } else if (m_vJitterAngles[2] < 0.0f) {
-        m_vJitterAngles[2] += 1.f / 3.f * m_fJitterScale;
-
-        if (m_vJitterAngles[2] < 0.0f) {
-            m_vJitterAngles[2] = 0.0f;
-        }
-    }
-
-    m_vJitterAngles[2] = -m_vJitterAngles[2];
-
     // Check for at least one active leak to play a sound
     for (i = 0; i < MAX_BARREL_LEAKS; i++) {
         if (m_bLeaksActive[i]) {
@@ -309,17 +314,15 @@ void BarrelObject::BarrelThink(Event *ev)
 
     // Play a leak sound
     if (i != MAX_BARREL_LEAKS && iBiggestLeak) {
-        if (!(iBiggestLeak & 4)) {
-            if (iBiggestLeak & 2) {
-                // medium leak
-                LoopSound("liquid_leak", 0.60f, -1.0f, -1.0f, 0.90f);
-            } else {
-                // small leak
-                LoopSound("liquid_leak", 0.30f, -1.0f, -1.0f, 0.80f);
-            }
-        } else {
+        if (iBiggestLeak & 4) {
             // big leak
-            LoopSound("liquid_leak", 1.0f, -1.0f, -1.0f, 1.0f);
+            LoopSound("liquid_leak", 1, -1, -1, 1);
+        } else if (iBiggestLeak & 2) {
+            // medium leak
+            LoopSound("liquid_leak", 0.6, -1, -1, 0.9);
+        } else {
+            // small leak
+            LoopSound("liquid_leak", 0.3, -1, -1, 0.8);
         }
     }
 
@@ -330,7 +333,7 @@ void BarrelObject::BarrelThink(Event *ev)
     if (m_vJitterAngles[0] || m_vJitterAngles[2] || i < MAX_BARREL_LEAKS) {
         m_fLastEffectTime += 0.075f;
 
-        if (level.time >= m_fLastEffectTime) {
+        if (m_fLastEffectTime <= level.time) {
             m_fLastEffectTime = level.time + 0.075f;
         }
 

From 590b3f5cbb1d8d8236a68b198e366ef3371f55cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 00:48:11 +0200
Subject: [PATCH 1223/2040] Fix class ID for throbbing box classes

---
 code/fgame/Entities.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 23daab31..74dee99a 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1980,7 +1980,7 @@ ThrobbingBox_ExplodeNebelwerfer::ThrobbingBox_ExplodeNebelwerfer()
  ---------------------------------------------------------------------------------------------
 */
 
-CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer, "ThrobbingBox_ExplodeNebelwerfer") {
+CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer, "ThrobbingBox_ExplodePlayerNebelwerfer") {
     {NULL, NULL}
 };
 
@@ -2009,7 +2009,7 @@ ThrobbingBox_ExplodePlayerNebelwerfer::ThrobbingBox_ExplodePlayerNebelwerfer()
 
 Event EV_StickyBombWet("stickybombwet", EV_DEFAULT, NULL, NULL, NULL);
 
-CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_Stickybomb, "ThrobbingBox_ExplodeNebelwerfer") {
+CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_Stickybomb, "ThrobbingBox_Stickybomb") {
     {&EV_Damage,        &ThrobbingBox_Stickybomb::OnBlowUp       },
     {&EV_Use,           &ThrobbingBox_Stickybomb::OnStickyBombUse},
     {&EV_StickyBombWet, &ThrobbingBox_Stickybomb::OnStickyBombWet},

From 3d454c90cb046bc66c1e327c8cd2e11e02065bfe Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:05:53 +0200
Subject: [PATCH 1224/2040] Rework the target list, use a container instead of
 an hash set so the target list gets archived correctly

This fixes an issue when loading from a save. A variable referencing target list container would have random entities in it, which would cause errors and crashes when trying to do an action on the array of entities
---
 code/fgame/entity.cpp       |  48 ++-------
 code/fgame/sentient.cpp     |  33 ++----
 code/fgame/simpleentity.cpp |  10 +-
 code/fgame/worldspawn.cpp   | 195 +++++++++++++++++++++---------------
 code/fgame/worldspawn.h     |  17 ++--
 code/script/scriptvm.cpp    |  14 +--
 6 files changed, 155 insertions(+), 162 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 77623542..5986a973 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -2131,49 +2131,21 @@ void Entity::SetTeamEvent(Event *ev)
 
 void Entity::TriggerEvent(Event *ev)
 {
-    const char *name;
-    Event      *event;
-    Entity     *ent;
-    ConSimple  *tlist;
-    int         i;
-    int         num;
+    SimpleEntity *ent;
+    ScriptVariable arrayVar;
+    int i;
 
-    name = ev->GetString(1);
-
-    // Check for object commands
-    if (name && name[0] == '$') {
-        str sName = str(name + 1);
-
-        tlist = world->GetTargetList(sName);
-        num   = tlist->NumObjects();
-        for (i = 1; i <= num; i++) {
-            ent = (Entity *)tlist->ObjectAt(i).Pointer();
-
-            assert(ent);
-
-            event = new Event(EV_Activate);
+    arrayVar = ev->GetValue(1);
+    arrayVar.CastConstArrayValue();
 
+    for (i = arrayVar.arraysize(); i > 0; i--) {
+        const ScriptVariable *variable = arrayVar[i];
+        ent = variable->simpleEntityValue();
+        if (ent) {
+            Event* event = new Event(EV_Activate);
             event->AddEntity(this);
             ent->ProcessEvent(event);
         }
-    } else if (name[0] == '*') // Check for entnum commands
-    {
-        if (!IsNumeric(&name[1])) {
-            gi.Printf("Expecting numeric value for * command, but found '%s'\n", &name[1]);
-        } else {
-            ent = G_GetEntity(atoi(&name[1]));
-            if (ent) {
-                event = new Event(EV_Activate);
-
-                event->AddEntity(this);
-                ent->ProcessEvent(event);
-            } else {
-                gi.Printf("Entity not found for * command\n");
-            }
-        }
-        return;
-    } else {
-        gi.Printf("Invalid entity reference '%s'.\n", name);
     }
 }
 
diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index cbe578ed..da0e8c24 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1121,30 +1121,19 @@ qboolean Sentient::HasSecondaryWeapon(void)
 
 void Sentient::EventGiveTargetname(Event *ev)
 {
-    int         i;
-    ConSimple  *tlist;
-    str         name;
-    const char *ptr;
-    qboolean    found;
+    int i;
+    str name;
+    qboolean found;
+    ScriptVariable var;
+    SimpleEntity *ent;
 
-    name = ev->GetString(1);
+    var = ev->GetValue(1);
+    var.CastConstArrayValue();
 
-    ptr = name.c_str();
-
-    // skip over the $
-    ptr++;
-
-    found = qfalse;
-
-    str sName = ptr;
-    tlist     = world->GetTargetList(sName);
-    for (i = 1; i <= tlist->NumObjects(); i++) {
-        Entity *ent;
-
-        ent = (Entity *)tlist->ObjectAt(i).Pointer();
-        assert(ent);
-
-        if (ent->isSubclassOf(Item)) {
+    for (i = var.arraysize(); i > 0; i--) {
+        const ScriptVariable *variable = var[i];
+        ent = variable->simpleEntityValue();
+        if (ent && ent->IsSubclassOfItem()) {
             Item *item;
 
             item = (Item *)ent;
diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index 809d81b4..dc0224ab 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -536,12 +536,18 @@ void SimpleEntity::GetUpVector(Event *ev)
 
 SimpleEntity *SimpleEntity::Next(void)
 {
-    SimpleEntity *ent = world->GetTarget(target, true);
+    Listener* ent;
+    
+    if (!target.length()) {
+        return NULL;
+    }
+
+    ent = world->GetTarget(target, true);
 
     if (!ent || !ent->isSubclassOf(SimpleEntity)) {
         return NULL;
     } else {
-        return ent;
+        return static_cast<SimpleEntity*>(ent);
     }
 }
 
diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index 07b68725..8e523deb 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -994,24 +994,23 @@ void World::SetNorthYaw(Event *ev)
     m_fNorth = anglemod(ev->GetFloat(1));
 }
 
-SimpleEntity *World::GetTarget(str targetname, bool quiet)
+Listener *World::GetTarget(str targetname, bool quiet)
 {
-    return GetTarget(Director.AddString(targetname), quiet);
-}
+    TargetList* targetList = GetTargetList(targetname);
 
-SimpleEntity *World::GetTarget(const_str targetname, bool quiet)
-{
-    ConSimple *list = GetTargetList(targetname);
+    if (!targetList) {
+        return NULL;
+    }
 
-    if (list->NumObjects() == 1) {
-        return list->ObjectAt(1);
-    } else if (list->NumObjects() > 1) {
+    if (targetList->list.NumObjects() == 1) {
+        return targetList->list.ObjectAt(1);
+    } else if (targetList->list.NumObjects() > 1) {
         if (!quiet) {
             warning(
                 "World::GetTarget",
                 "There are %d entities with targetname '%s'. You are using a command that requires exactly one.",
-                list->NumObjects(),
-                Director.GetString(targetname).c_str()
+                targetList->list.NumObjects(),
+                targetname.c_str()
             );
         }
     }
@@ -1019,79 +1018,83 @@ SimpleEntity *World::GetTarget(const_str targetname, bool quiet)
     return NULL;
 }
 
-SimpleEntity *World::GetScriptTarget(str targetname)
+Listener *World::GetScriptTarget(str targetname)
 {
-    return GetScriptTarget(Director.AddString(targetname));
-}
+    TargetList *targetList = GetTargetList(targetname);
 
-SimpleEntity *World::GetScriptTarget(const_str targetname)
-{
-    ConSimple *list = GetTargetList(targetname);
-
-    if (list->NumObjects() == 1) {
-        return list->ObjectAt(1);
-    } else if (list->NumObjects() > 1) {
+    if (targetList->list.NumObjects() == 1) {
+        return targetList->list.ObjectAt(1);
+    } else if (targetList->list.NumObjects() > 1) {
         ScriptError(
             "There are %d entities with targetname '%s'. You are using a command that requires exactly one.",
-            list->NumObjects(),
-            Director.GetString(targetname).c_str()
+            targetList->list.NumObjects(),
+            targetname.c_str()
         );
     }
 
     return NULL;
 }
 
-ConSimple *World::GetExistingTargetList(const str& targetname)
+TargetList*World::GetExistingTargetList(const str& targetname)
 {
-    return GetExistingTargetList(Director.AddString(targetname));
+    TargetList* targetList;
+    int i;
+
+    if (!targetname.length()) {
+        return NULL;
+    }
+
+    for (i = m_targetListContainer.NumObjects(); i > 0; i--) {
+        targetList = m_targetListContainer.ObjectAt(i);
+        if (targetname == targetList->targetname) {
+            return targetList;
+        }
+    }
+
+    return NULL;
 }
 
-ConSimple *World::GetExistingTargetList(const_str targetname)
+TargetList *World::GetTargetList(str& targetname)
 {
-    return m_targetList.findKeyValue(targetname);
-}
+    TargetList* targetList;
+    int i;
 
-ConSimple *World::GetTargetList(str& targetname)
-{
-    return GetTargetList(Director.AddString(targetname));
-}
+    if (!targetname.length()) {
+        return NULL;
+    }
 
-ConSimple *World::GetTargetList(const_str targetname)
-{
-    return &m_targetList.addKeyValue(targetname);
+    for (i = m_targetListContainer.NumObjects(); i > 0; i--) {
+        targetList = m_targetListContainer.ObjectAt(i);
+        if (targetname == targetList->targetname) {
+            return targetList;
+        }
+    }
+
+    targetList = new TargetList(targetname);
+    m_targetListContainer.AddObject(targetList);
+
+    return targetList;
 }
 
 void World::AddTargetEntity(SimpleEntity *ent)
 {
-    str targetname = ent->TargetName();
+    TargetList *list = GetTargetList(ent->TargetName());
 
-    if (!targetname.length()) {
-        return;
-    }
-
-    ConSimple *list = GetTargetList(targetname);
-
-    list->AddObject(ent);
+    list->AddEntity(ent);
 }
 
 void World::AddTargetEntityAt(SimpleEntity *ent, int index)
 {
-    str targetname = ent->TargetName();
+    TargetList *list = GetTargetList(ent->TargetName());
 
-    if (!targetname.length()) {
-        return;
-    }
-
-    ConSimple *list = GetTargetList(targetname);
-
-    list->AddObjectAt(index, ent);
+    list->AddEntityAt(ent, index);
 }
 
 int World::GetTargetnameIndex(SimpleEntity *ent)
 {
-    ConSimple *list = GetTargetList(ent->TargetName());
+    TargetList *targetList = GetTargetList(ent->TargetName());
 
-    return list->IndexOfObject(ent);
+    return targetList->GetEntityIndex(ent);
 }
 
 void World::RemoveTargetEntity(SimpleEntity *ent)
@@ -1100,55 +1103,75 @@ void World::RemoveTargetEntity(SimpleEntity *ent)
         return;
     }
 
-    const str targetname = ent->TargetName();
+    str targetname = ent->TargetName();
 
     if (!targetname.length()) {
         return;
     }
 
-    ConSimple *list = GetExistingTargetList(targetname);
-
+    TargetList *list = GetExistingTargetList(targetname);
     if (list) {
-        list->RemoveObject(ent);
-
-        if (list->NumObjects() <= 0) {
-            m_targetList.remove(Director.AddString(targetname));
-        }
+        list->RemoveEntity(ent);
     }
 }
 
 SimpleEntity *World::GetNextEntity(str targetname, SimpleEntity *ent)
 {
-    return GetNextEntity(Director.AddString(targetname), ent);
-}
-
-SimpleEntity *World::GetNextEntity(const_str targetname, SimpleEntity *ent)
-{
-    ConSimple *list = GetTargetList(targetname);
-    int        index;
-
-    if (ent) {
-        index = list->IndexOfObject(ent) + 1;
-    } else {
-        index = 1;
-    }
-
-    if (list->NumObjects() >= index) {
-        return list->ObjectAt(index);
-    } else {
+    TargetList* targetList = GetExistingTargetList(targetname);
+    if (!targetList) {
         return NULL;
     }
+
+    return targetList->GetNextEntity(ent);
 }
 
 void World::FreeTargetList()
 {
-    m_targetList.clear();
+    int i;
+
+    for (i = 1; i <= m_targetListContainer.NumObjects(); i++) {
+        delete m_targetListContainer.ObjectAt(i);
+    }
+
+    m_targetListContainer.FreeObjectList();
 }
 
 void World::Archive(Archiver& arc)
 {
-    // FIXME: this is not the original way of archiving target list
-    m_targetList.Archive(arc);
+    int num;
+    int num2;
+    int i;
+    TargetList *targetList;
+
+    if (arc.Loading()) {
+        str targetname;
+
+        arc.ArchiveInteger(&num);
+        for (i = 1; i <= num; i++) {
+            arc.ArchiveString(&targetname);
+
+            targetList = new TargetList(targetname);
+            m_targetListContainer.AddObject(targetList);
+
+            arc.ArchiveObjectPosition((LightClass*)&targetList->list);
+            arc.ArchiveInteger(&num2);
+
+            targetList->list.Resize(num2);
+        }
+    } else {
+        num = m_targetListContainer.NumObjects();
+        arc.ArchiveInteger(&num);
+
+        for (i = 1; i <= num; i++) {
+            targetList = m_targetListContainer.ObjectAt(i);
+
+            arc.ArchiveString(&targetList->targetname);
+            arc.ArchiveObjectPosition((LightClass*)&targetList->list);
+
+            num2 = targetList->list.NumObjects();
+            arc.ArchiveInteger(&num2);
+        }
+    }
 
     Entity::Archive(arc);
 
@@ -1236,7 +1259,15 @@ SimpleEntity *TargetList::GetNextEntity(SimpleEntity *ent)
 {
     int index;
 
-    for (index = list.IndexOfObject(ent); index <= list.NumObjects(); index++) {
+    if (ent) {
+        index = list.IndexOfObject(ent);
+    } else {
+        index = 0;
+    }
+
+    index++;
+
+    for (; index <= list.NumObjects(); index++) {
         Listener *objptr;
 
         objptr = list.ObjectAt(index);
diff --git a/code/fgame/worldspawn.h b/code/fgame/worldspawn.h
index ce260537..67fb0797 100644
--- a/code/fgame/worldspawn.h
+++ b/code/fgame/worldspawn.h
@@ -97,8 +97,8 @@ public:
 
 class World : public Entity
 {
-    con_set<const_str, ConSimple> m_targetList; // moh could have used con_set instead of TargetList
-    qboolean                      world_dying;
+    Container<TargetList*> m_targetListContainer;
+    qboolean world_dying;
 
 public:
     // farplane variables
@@ -144,17 +144,12 @@ public:
     void FreeTargetList();
 
     SimpleEntity *GetNextEntity(str targetname, SimpleEntity *ent);
-    SimpleEntity *GetNextEntity(const_str targetname, SimpleEntity *ent);
-    SimpleEntity *GetScriptTarget(str targetname);
-    SimpleEntity *GetScriptTarget(const_str targetname);
-    SimpleEntity *GetTarget(str targetname, bool quiet);
-    SimpleEntity *GetTarget(const_str targetname, bool quiet);
+    Listener     *GetScriptTarget(str targetname);
+    Listener     *GetTarget(str targetname, bool quiet);
     int           GetTargetnameIndex(SimpleEntity *ent);
 
-    ConSimple *GetExistingTargetList(const str& targetname);
-    ConSimple *GetExistingTargetList(const_str targetname);
-    ConSimple *GetTargetList(str& targetname);
-    ConSimple *GetTargetList(const_str targetname);
+    TargetList *GetExistingTargetList(const str& targetname);
+    TargetList *GetTargetList(str& targetname);
 
     void SetFarClipOverride(Event *ev);
     void SetFarPlaneColorOverride(Event *ev);
diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index c46826fd..481a7bb6 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1007,7 +1007,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
     Event           ev;
     ScriptVariable *var = NULL;
 
-    ConSimple *targetList;
+    TargetList *targetList;
 
     if (Director.stackCount >= MAX_STACK_DEPTH) {
         state = STATE_EXECUTION;
@@ -1769,9 +1769,9 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_UN_TARGETNAME:
                 // retrieve the target name
-                targetList = world->GetExistingTargetList(m_VMStack.GetTop().constStringValue());
+                targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
 
-                if (!targetList || !targetList->NumObjects()) {
+                if (!targetList || !targetList->list.NumObjects()) {
                     str targetname = m_VMStack.GetTop().stringValue();
                     // the target name was not found
                     m_VMStack.GetTop().setListenerValue(NULL);
@@ -1780,12 +1780,12 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                         || (*m_PrevCodePos >= OP_BOOL_UN_NOT && *m_PrevCodePos <= OP_UN_CAST_BOOLEAN)) {
                         ScriptError("Targetname '%s' does not exist.", targetname.c_str());
                     }
-                } else if (targetList->NumObjects() == 1) {
+                } else if (targetList->list.NumObjects() == 1) {
                     // single listener
-                    m_VMStack.GetTop().setListenerValue(targetList->ObjectAt(1));
-                } else if (targetList->NumObjects() > 1) {
+                    m_VMStack.GetTop().setListenerValue(targetList->list.ObjectAt(1));
+                } else if (targetList->list.NumObjects() > 1) {
                     // multiple listeners
-                    m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)targetList);
+                    m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)&targetList->list);
                 }
                 break;
 

From b7a643aa5932a520d791ee00f4ba2c2606d91be6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:51:03 +0200
Subject: [PATCH 1225/2040] Fix AI wrongly aiming at the wrong direction

---
 code/fgame/actor.cpp       | 2 +-
 code/fgame/simpleactor.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 2924d23d..0175f3d5 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -10573,7 +10573,7 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     dir.normalize();
 
     if (g_target_game > target_game_e::TG_MOH) {
-        if (DotProduct2D(forward, dir) < aiMaxDeviation->value) {
+        if (DotProduct(forward, dir) < aiMaxDeviation->value) {
             Vector vOut;
 
             VectorMA(position, 2048, forward, vOut);
diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp
index dc5a16c5..317aba3d 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -814,7 +814,6 @@ void SimpleActor::StartAimAnimSlot(int slot, int anim)
 
     m_weightType[slot]       = ANIM_WEIGHT_AIM;
     m_weightCrossBlend[slot] = 0.0;
-    m_weightBase[slot]       = 1.0;
     NewAnim(anim, slot, 1.0);
 
     RestartAnimSlot(slot);

From aa2d73a1c8100a885e3c39e13c2d518ac7423bc8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:56:35 +0200
Subject: [PATCH 1226/2040] Correctly copy frame bounds

---
 code/skeletor/skeletor_loadanimation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index 46f6a3d2..6edc2381 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -246,7 +246,7 @@ skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLe
 
         newFrame->bounds[0][0] = LittleFloat(pFileFrame->bounds[0][0]);
         newFrame->bounds[0][1] = LittleFloat(pFileFrame->bounds[0][1]);
-        newFrame->bounds[1][2] = LittleFloat(pFileFrame->bounds[0][2]);
+        newFrame->bounds[0][2] = LittleFloat(pFileFrame->bounds[0][2]);
         newFrame->bounds[1][0] = LittleFloat(pFileFrame->bounds[1][0]);
         newFrame->bounds[1][1] = LittleFloat(pFileFrame->bounds[1][1]);
         newFrame->bounds[1][2] = LittleFloat(pFileFrame->bounds[1][2]);

From 83acdeb16e9d4397a85e21c9d4aa53ccc8102380 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:06:19 +0200
Subject: [PATCH 1227/2040] Allow activation of the game menu so it can be
 focused

---
 code/client/cl_uiloadsave.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uiloadsave.cpp b/code/client/cl_uiloadsave.cpp
index a48e0f72..ac682170 100644
--- a/code/client/cl_uiloadsave.cpp
+++ b/code/client/cl_uiloadsave.cpp
@@ -95,7 +95,7 @@ UIFAKKLoadGameClass::UIFAKKLoadGameClass()
 {
     Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
     Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
-    AllowActivate(false);
+    AllowActivate(true);
     m_bRemovePending = false;
 
     setHeaderFont("facfont-20");
@@ -287,7 +287,7 @@ qboolean UIFAKKLoadGameClass::KeyEvent(int key, unsigned int time)
         }
         break;
     default:
-        return UIListBase::KeyEvent(key, time);
+        return UIListCtrl::KeyEvent(key, time);
     }
 
     return qfalse;

From b641a1040ceb4e5c454def02a3e7976a5fde1ca9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:25:59 +0200
Subject: [PATCH 1228/2040] Fix incorrect cull point height (should be squared)

---
 code/renderer/tr_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 44f48321..67742444 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -177,11 +177,11 @@ int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
 
 		VectorSubtract(pt, tr.viewParms.ori.origin, vDelta);
 		fLengthSquared = VectorLengthSquared(vDelta);
-		fTotalDistSquared = (fDist + radius) * (fDist + radius);
+		fTotalDistSquared = Square(fDist + radius);
 
-		if ((fDist + radius) * (fDist + radius) < vDelta[2] + fLengthSquared) {
+		if (Square(fDist + radius) < Square(vDelta[2]) + fLengthSquared) {
 			return CULL_OUT;
-		} else if ((fDist - radius) * (fDist - radius) > vDelta[2] + fLengthSquared) {
+		} else if (Square(fDist - radius) > Square(vDelta[2]) + fLengthSquared) {
 			return CULL_IN;
 		}
 	}

From 29f8ff8d71681c1da0589910582c6ceedb0d4af4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:26:55 +0200
Subject: [PATCH 1229/2040] Set the new frame radius

This fixes an issue when culling static models as it uses the radius and the radius wasn't initialized
---
 code/skeletor/skeletor_loadanimation.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index 6edc2381..d2bdfe59 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -250,6 +250,7 @@ skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLe
         newFrame->bounds[1][0] = LittleFloat(pFileFrame->bounds[1][0]);
         newFrame->bounds[1][1] = LittleFloat(pFileFrame->bounds[1][1]);
         newFrame->bounds[1][2] = LittleFloat(pFileFrame->bounds[1][2]);
+        newFrame->radius = LittleFloat(pFileFrame->radius);
         newFrame->delta[0] = LittleFloat(pFileFrame->delta[0]);
         newFrame->delta[1] = LittleFloat(pFileFrame->delta[1]);
         newFrame->delta[2] = LittleFloat(pFileFrame->delta[2]);

From de1d3b6ef4dbc3a06ad8dad1f6b6c836f4565e01 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:36:46 +0200
Subject: [PATCH 1230/2040] Don't reset the client structure on single-player

---
 code/fgame/g_client.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 4c20f06e..83d97da0 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -878,11 +878,6 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     char       userinfo[MAX_INFO_STRING];
 
     gi.DPrintf("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\n");
-    // Removed in OPM
-    //  Accepts remote clients
-    //if (g_gametype->integer == GT_SINGLE_PLAYER) {
-    //    return NULL;
-    //}
 
     // Added in OPM
     G_BotShift(clientNum);
@@ -921,7 +916,12 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
 
     // read or initialize the session data
     if (firstTime) {
-        memset(client, 0, sizeof(*client));
+        if (g_gametype->integer != GT_SINGLE_PLAYER || !cl_running->integer || clientNum != 0) {
+            // Added in OPM
+            //  Accept remote clients but ignore the listen server
+            //  so the client flags that were put during prespawn stay
+            memset(client, 0, sizeof(*client));
+        }
         if (!game.autosaved) {
             G_InitClientPersistant(client, userinfo);
         }

From 848cf7ac0159c135a21c66a0c6ea5144369955f6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:03:00 +0200
Subject: [PATCH 1231/2040] Fix AddPointToBounds not properly setting the max
 bounds

---
 code/skeletor/skeletor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index c155285a..35873124 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -343,7 +343,7 @@ void AddToBounds(SkelVec3 *bounds, SkelVec3 *newBounds)
             bounds[0][i] = newBounds[0][i];
         }
 
-        if (bounds[1][i] > newBounds[1][i]) {
+        if (bounds[1][i] < newBounds[1][i]) {
             bounds[1][i] = newBounds[1][i];
         }
     }

From aef9dc17040c5ff95b942d303f401f2ba1e23a98 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:07:17 +0200
Subject: [PATCH 1232/2040] Add feature to show static models culling with
 r_showcull

---
 code/renderer/tr_staticmodels.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
index 2f8287b9..63b46ca4 100644
--- a/code/renderer/tr_staticmodels.cpp
+++ b/code/renderer/tr_staticmodels.cpp
@@ -338,7 +338,17 @@ void R_AddStaticModelSurfaces(void)
 
         iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, SM->cull_radius);
 
-        // FIXME: r_showcull
+        if (r_showcull->integer & 8) {
+            switch (iRadiusCull)
+            {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.2, 0.0, 1.0, 0.0, 0.5, 0);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.4 + 16.0, 1.0, 0.2, 0.2, 0.5, 0);
+                break;
+            }
+        }
 
         if (iRadiusCull != CULL_OUT
             && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT)) {

From 991c8869d11175a334e5f5f043d060cf3ae1295c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:10:34 +0200
Subject: [PATCH 1233/2040] Properly draw circles

---
 code/renderer/tr_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 67742444..8b74a47f 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1720,7 +1720,7 @@ void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, fl
 	for (i = 0; i < CIRCLE_LENGTH; i++) {
 		VectorCopy(pos, lastpos);
 
-		ang = (float)i * 0.0174532925199433f;
+		ang = DEG2RAD((float)(i * 15));
 		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
 			cos(ang) * radius * right[0];
 		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +

From fcd2d2e6689c58363ab042932f131b7fa46eb4aa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:15:29 +0200
Subject: [PATCH 1234/2040] Use the correct weapon selection menu

---
 code/fgame/player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index b5df7a0f..55e67983 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4692,7 +4692,8 @@ void Player::Think(void)
         } else if (!client->pers.dm_primary[0]) {
             Spectator();
             if (m_fWeapSelectTime < level.time) {
-                gi.SendServerCommand(edict - g_entities, "stufftext \"pushmenu_weaponselect\"");
+                m_fWeapSelectTime = level.time + 1.0;
+                UserSelectWeapon(false);
             }
         }
 

From e6a9968d23cd7436e56ecf9b1e5a58a8018dd04f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:25:17 +0200
Subject: [PATCH 1235/2040] Remove useless assertion

---
 code/qcommon/str.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/qcommon/str.cpp b/code/qcommon/str.cpp
index f978cea9..8751d224 100644
--- a/code/qcommon/str.cpp
+++ b/code/qcommon/str.cpp
@@ -539,8 +539,6 @@ void str::snprintf(char *dst, int size, const char *fmt, ...)
     len = vsnprintf(buffer, sizeof(buffer), fmt, argptr);
     va_end(argptr);
 
-    assert(len < size);
-
     strncpy(dst, buffer, size - 1);
 }
 

From 8758ba6cb19b1789101a978127b36caae9dcfbce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:42:03 +0200
Subject: [PATCH 1236/2040] Fix the map not starting after applying the
 rotation list

---
 code/client/cl_uimaprotationsetup.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_uimaprotationsetup.cpp b/code/client/cl_uimaprotationsetup.cpp
index ec92da8c..29e1ed3e 100644
--- a/code/client/cl_uimaprotationsetup.cpp
+++ b/code/client/cl_uimaprotationsetup.cpp
@@ -387,11 +387,12 @@ void UIRotationApplyButton::Released(Event *ev)
             }
 
             maplistStr += text;
-            maplistStr += " ";
 
             if (i == 1) {
                 Cvar_Set("ui_dmmap", maplistStr);
             }
+
+            maplistStr += " ";
         }
     }
 

From afb08e0ea9da43a078602f327e03db698c3bcedd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:49:00 +0200
Subject: [PATCH 1237/2040] Prevent adding duplicate maps in the rotation list

---
 code/client/cl_uimaprotationsetup.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/code/client/cl_uimaprotationsetup.cpp b/code/client/cl_uimaprotationsetup.cpp
index 29e1ed3e..c482feaf 100644
--- a/code/client/cl_uimaprotationsetup.cpp
+++ b/code/client/cl_uimaprotationsetup.cpp
@@ -277,20 +277,27 @@ void UIAddToRotationButton::Released(Event *ev)
 
     if (mapList && rotationList) {
         size_t mapLength = 0;
-        int    item      = mapList->getCurrentItem();
+        int item = mapList->getCurrentItem();
+        str currentItemText;
+        
+        if (item) {
+            currentItemText = mapList->getItemText(item);
+        }
 
         for (i = 1; i <= rotationList->getNumItems(); i++) {
             str text = rotationList->getItemText(i);
+            if (text == currentItemText) {
+                // Added in OPM
+                //  Prevent adding duplicates
+                item = 0;
+                break;
+            }
 
             mapLength += text.length();
         }
 
-        if (item) {
-            str text = mapList->getItemText(item);
-
-            if (prefixLength + mapLength + text.length() < 256) {
-                rotationList->AddItem(text, NULL);
-            }
+        if (item && prefixLength + mapLength + currentItemText.length() < 256) {
+            rotationList->AddItem(currentItemText, NULL);
         }
     }
 

From edb52a8448fae52b2aebe4fd4069cfd43a2790ab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:52:22 +0200
Subject: [PATCH 1238/2040] Properly move items in the map rotation list

---
 code/client/cl_uimaprotationsetup.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_uimaprotationsetup.cpp b/code/client/cl_uimaprotationsetup.cpp
index c482feaf..3189d19f 100644
--- a/code/client/cl_uimaprotationsetup.cpp
+++ b/code/client/cl_uimaprotationsetup.cpp
@@ -421,10 +421,10 @@ void UIRotationMoveItemUpButton::Released(Event *ev)
     list = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
     item = list->getCurrentItem();
 
-    if (item < list->getNumItems() && list->getNumItems() > 1) {
-        str text = list->getItemText(item + 1);
+    if (item > 1 && list->getNumItems() > 1) {
+        str text = list->getItemText(item - 1);
 
-        list->DeleteItem(list->getCurrentItem() - 1);
+        list->DeleteItem(item - 1);
         list->InsertItem(text, item);
         list->setCurrentItem(item - 1);
     }
@@ -448,7 +448,7 @@ void UIRotationMoveItemDownButton::Released(Event *ev)
     if (item < list->getNumItems() && list->getNumItems() > 1) {
         str text = list->getItemText(item + 1);
 
-        list->DeleteItem(list->getCurrentItem() + 1);
+        list->DeleteItem(item + 1);
         list->InsertItem(text, item);
         list->setCurrentItem(item + 1);
     }

From 9e0c11a970e8485345fb317aad0b130b04110189 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 21:04:23 +0200
Subject: [PATCH 1239/2040] Reset scoreboard values like the objective and the
 picture when initializing a new game

---
 code/fgame/gamecvars.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index b1993d83..bc18c413 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -300,6 +300,8 @@ cvar_t *g_teambalance;
 
 void CVAR_Init(void)
 {
+    int i;
+
     developer      = gi.Cvar_Get("developer", "0", 0);
 
     precache = gi.Cvar_Get("sv_precache", "1", 0);
@@ -598,16 +600,12 @@ void CVAR_Init(void)
     g_voiceChatTime = gi.Cvar_Get("g_voiceChatTime", "2.5", 0);
     g_textChatTime  = gi.Cvar_Get("g_textChatTime", "1", 0);
     g_debugsmoke    = gi.Cvar_Get("g_debugsmoke", "0", CVAR_CHEAT);
-    gi.Cvar_Get("g_obj_alliedtext1", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext2", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext3", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext4", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext5", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext1", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext2", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext3", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext4", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext5", "", CVAR_SERVERINFO);
+
+    for (i = 1; i <= 5; i++) {
+        gi.Cvar_Get(va("g_obj_alliedtext%d", i), "", CVAR_SERVERINFO);
+        gi.Cvar_Get(va("g_obj_axistext%d", i), "", CVAR_SERVERINFO);
+    }
+
     gi.Cvar_Get("g_scoreboardpic", "", CVAR_SERVERINFO);
     gi.Cvar_Get("g_scoreboardpicover", "", CVAR_SERVERINFO);
 
@@ -634,7 +632,13 @@ void CVAR_Init(void)
 
     //
     // Added in OPM
+    //  Clear the text objectives and the scoreboard pic
     //
+    for (i = 1; i <= 5; i++) {
+        gi.cvar_set(va("g_obj_alliedtext%d", i), "");
+        gi.cvar_set(va("g_obj_axistext%d", i), "");
+    }
+    gi.cvar_set("g_scoreboardpic", "");
 
     sv_netoptimize = gi.Cvar_Get("sv_netoptimize", "0", 0);
 

From ed22a51a7226c826911a705cb3727b452db79de6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 22:22:09 +0200
Subject: [PATCH 1240/2040] Only allow breakthrough clients when targeting
 mohaab

---
 code/server/sv_client.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 8f7a99f6..b849f90d 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -323,6 +323,19 @@ void SV_DirectConnect( netadr_t from ) {
 
 	Q_strncpyz( userinfo, Cmd_Argv(1), sizeof(userinfo) );
 
+	if (com_target_game->integer >= TG_MOHTT) {
+		const char* clientType;
+
+		clientType = Info_ValueForKey(userinfo, "clientType");
+		// Added in 2.30
+		//  Only allow breakthrough clients when targeting mohaab
+		if (strcmp(clientType, "Breakthrough")) {
+			NET_OutOfBandPrint(NS_SERVER, from, "droperror\nRequires Medal of Honor Allied Assault Breakthrough\n");
+			Com_DPrintf("    rejected connect - only Breakthrough clients allowed.\n");
+			return;
+		}
+	}
+
 	version = atoi(Info_ValueForKey(userinfo, "protocol"));
 	
 #ifdef LEGACY_PROTOCOL

From ff3c25cc076902295412e221a36e85c2fcc6a3f3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 23:09:39 +0200
Subject: [PATCH 1241/2040] Add cg_allowvote

---
 code/cgame/cg_servercmds.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 79a6bb31..2ef604d1 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -151,6 +151,7 @@ void CG_ParseServerinfo(void)
     cgi.Cvar_Set("cg_fraglimit", Info_ValueForKey(info, "fraglimit"));
     cgi.Cvar_Set("cg_timelimit", Info_ValueForKey(info, "timelimit"));
     cgi.Cvar_Set("cg_maxclients", Info_ValueForKey(info, "sv_gametype"));
+    cgi.Cvar_Set("cg_allowvote", Info_ValueForKey(info, "g_allowvote"));
     cgi.Cvar_Set("cg_obj_alliedtext1", Info_ValueForKey(info, "g_obj_alliedtext1"));
     cgi.Cvar_Set("cg_obj_alliedtext2", Info_ValueForKey(info, "g_obj_alliedtext2"));
     cgi.Cvar_Set("cg_obj_alliedtext3", Info_ValueForKey(info, "g_obj_alliedtext3"));

From 090f362bb65362548995373eb5c709217fb85843 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Oct 2024 23:10:22 +0200
Subject: [PATCH 1242/2040] Declare g_allowvote as a serverinfo variable

---
 code/fgame/gamecvars.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index bc18c413..f69cb855 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -472,7 +472,7 @@ void CVAR_Init(void)
         //
         g_healrate = gi.Cvar_Get("g_healrate", "0", 0);
     }
-    g_allowvote          = gi.Cvar_Get("g_allowvote", "1", 0);
+    g_allowvote          = gi.Cvar_Get("g_allowvote", "1", CVAR_SERVERINFO);
     g_maprotation_filter = gi.Cvar_Get("g_maprotation_filter", "ffa", 0);
     g_warmup             = gi.Cvar_Get("g_warmup", "20", CVAR_ARCHIVE);
     g_doWarmup           = gi.Cvar_Get("g_doWarmup", "1", 0);

From d142ded9ad006708a84e44aac9c31dc355e8a601 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:08:04 +0200
Subject: [PATCH 1243/2040] Add RF_FRAMELERP flag to ref entity

---
 code/cgame/cg_modelanim.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index 1155a50a..2c1145e6 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -1237,6 +1237,7 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
             memset(model.surfaces, 0, sizeof(model.surfaces));
 
             CG_ViewModelAnimation(&model);
+            model.renderfx |= RF_FRAMELERP;
             cgi.ForceUpdatePose(&model);
 
             if ((cent->currentState.eFlags & EF_UNARMED) || cg_drawviewmodel->integer <= 1

From 8fe87e106723dc14585ce1a159f65269673b3c69 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:08:26 +0200
Subject: [PATCH 1244/2040] Handle turret camera flags which has no
 interpolation

---
 code/cgame/cg_predict.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index 165bffcc..a7b09e56 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -350,6 +350,13 @@ static void CG_InterpolatePlayerStateCamera(void)
         return;
     }
 
+    // Added in 2.0
+    if (cg.predicted_player_state.camera_flags & CF_CAMERA_ANGLES_TURRETMODE) {
+        VectorCopy(cg.nextSnap->ps.camera_origin, cg.camera_origin);
+        VectorCopy(cg.nextSnap->ps.camera_angles, cg.camera_angles);
+        return;
+    }
+
     for (i = 0; i < 3; i++) {
         cg.camera_origin[i] = prev->ps.camera_origin[i] + f * (next->ps.camera_origin[i] - prev->ps.camera_origin[i]);
         cg.camera_angles[i] = LerpAngle(prev->ps.camera_angles[i], next->ps.camera_angles[i], f);

From 976e2ae0222ce10c31cb67e43b7e8e461aeccadc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:08:44 +0200
Subject: [PATCH 1245/2040] Remove useless GetSentientOwner()

---
 code/fgame/vehicleturret.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 4deaf09b..3174b4c3 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -340,7 +340,6 @@ void VehicleTurretGun::Think(void)
     UpdateSound();
     UpdateFireControl();
 
-    sentOwner = GetSentientOwner();
     if (sentOwner) {
         G_TouchTriggers(sentOwner);
         UpdateOwner(sentOwner);

From 005a278210da6cb17c7893becc2ef2bd2d6fb809 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:08:52 +0200
Subject: [PATCH 1246/2040] Use CF_CAMERA_ANGLES_TURRETMODE

---
 code/fgame/weapturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index e156edf1..d249c23d 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -888,7 +888,7 @@ void TurretGun::P_ThinkActive(void)
         m_pUserCamera->setAngles(vAngles);
         m_pUserCamera->SetPositionOffset(m_vViewOffset);
 
-        owner->client->ps.camera_flags |= CF_CAMERA_ANGLES_ALLOWOFFSET;
+        owner->client->ps.camera_flags |= CF_CAMERA_ANGLES_TURRETMODE;
 
         Player *player = (Player *)owner.Pointer();
 

From b2287f3d83dd1933be797acefd1c8d59f1aa67c5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:56:44 +0200
Subject: [PATCH 1247/2040] Avoid using nextSnap if the prediction is disabled
 in the next snap

This prevent blinking issues like flashing arms
---
 code/cgame/cg_predict.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index a7b09e56..dc2f0c37 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -523,7 +523,11 @@ void CG_PredictPlayerState(void)
     // the server time is beyond our current cg.time,
     // because predicted player positions are going to
     // be ahead of everything else anyway
-    if (cg.nextSnap && !cg.nextFrameTeleport && !cg.thisFrameTeleport) {
+    // Added in OPM: prediction check
+    //  Don't use the next snapshot if the prediction is about to be disabled
+    //  this prevent "blinking" issues like when entering a vehicle turret gun
+    //  where arms would be seen shortly
+    if (cg.nextSnap && !cg.nextFrameTeleport && !cg.thisFrameTeleport && !(cg.nextSnap->ps.pm_flags & PMF_NO_PREDICTION)) {
         cg.predicted_player_state = cg.nextSnap->ps;
         cg.physicsTime            = cg.nextSnap->serverTime;
     } else {

From 3c1500002bce7197c7360af88f5449b20c25b67b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:44:00 +0200
Subject: [PATCH 1248/2040] Implement the destructor for the World class to
 free up the target list

---
 code/fgame/worldspawn.cpp | 10 ++++++++--
 code/fgame/worldspawn.h   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index 8e523deb..bc76ea74 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -627,6 +627,12 @@ World::World()
     m_fNorth = 0;
 }
 
+World::~World()
+{
+    world_dying = false;
+    FreeTargetList();
+}
+
 void World::UpdateConfigStrings(void)
 {
     //
@@ -1034,8 +1040,8 @@ Listener *World::GetScriptTarget(str targetname)
 
     return NULL;
 }
-
-TargetList*World::GetExistingTargetList(const str& targetname)
+ 
+TargetList *World::GetExistingTargetList(const str& targetname)
 {
     TargetList* targetList;
     int i;
diff --git a/code/fgame/worldspawn.h b/code/fgame/worldspawn.h
index 67fb0797..b7ced3c8 100644
--- a/code/fgame/worldspawn.h
+++ b/code/fgame/worldspawn.h
@@ -136,6 +136,7 @@ public:
     CLASS_PROTOTYPE(World);
 
     World();
+    ~World();
 
     void AddTargetEntity(SimpleEntity *ent);
     void AddTargetEntityAt(SimpleEntity *ent, int index);

From 69cc87212a6dd597dad60e6a55c20da43f97ea9a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:49:23 +0200
Subject: [PATCH 1249/2040] Bumped the version number to 0.80.0 due to the
 number of changes and the completeness

---
 code/qcommon/q_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 7110b2d2..17ce641d 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			71
+#define PRODUCT_VERSION_MINOR			8
 #define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 

From e75f5bbbfc6a83b7d2b17a700f3631a21aa55a38 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:01:01 +0200
Subject: [PATCH 1250/2040] Version number typo

---
 code/qcommon/q_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 17ce641d..4814408b 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			8
+#define PRODUCT_VERSION_MINOR			80
 #define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 

From 31cb6216c962549d33b9ca58eb446f4e3df4c0eb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:06:30 +0200
Subject: [PATCH 1251/2040] Use a volatile variable to prevent the function
 from being entirely optimized

---
 code/qcommon/common.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index c3f62e2e..2f0c4d21 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1333,12 +1333,13 @@ static void Com_Freeze_f (void) {
 =================
 Com_Crash_f
 
-A way to force a bus error for development reasons
+A way to force a segmentation fault for development purposes,
+like testing the backtrace
 =================
 */
 static void Com_Crash_f(void) {
-	void* invalid_ptr = NULL;
-	*(int*)invalid_ptr = 0x12345678;
+	volatile void* invalid_ptr = NULL;
+	*(volatile int*)invalid_ptr = 0x12345678;
 }
 
 /*

From e2d6156b5afe705c519f1ccf299a36ba18b4086c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:01:49 +0200
Subject: [PATCH 1252/2040] Apply the hidden visibility for all functions only
 on macOS

The backtrace still prints the name of functions regardless of the visibility on macOS
---
 CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0459605d..70f3cfe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,9 +39,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
 	add_compile_options(-Wno-comment)
 	# Treat no return type as error
 	add_compile_options(-Werror=return-type)
-	# Don't export symbols, there are some OSes that can resolve symbols
-	# globally
-	add_compile_options(-fvisibility=hidden)
 endif()
 
 #
@@ -102,6 +99,13 @@ if(APPLE)
 	# so, locate libraries like SDL in the executable path
 	set(CMAKE_INSTALL_RPATH "@executable_path")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+
+	if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
+		# Set the visibility to hidden on macOS to prevent shared libraries from
+		# using functions in the executable
+		# it's ok to hide them because the backtrace on macOS will still print the name of the functions
+		add_compile_options(-fvisibility=hidden)
+	endif()
 endif()
 
 # Common stuff

From e7499cca04cf27918df2379bf689336d6ac93df9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:07:23 +0200
Subject: [PATCH 1253/2040] Also halt the secondary server list if it exists,
 when canceling refresh

---
 code/client/cl_uiserverlist.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index c6bd8278..7376f417 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -651,6 +651,9 @@ static void AddFilter(char* filter, const char* value) {
 void UIFAKKServerList::CancelRefresh( Event *ev )
 {
 	ServerListHalt(m_serverList[0]);
+    if (m_serverList[1]) {
+        ServerListHalt(m_serverList[1]);
+    }
 }
 
 void UIFAKKServerList::NewServerList( void )

From 9bd25e9734f6777f12c89fcd7aed8acfd4363819 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:08:24 +0200
Subject: [PATCH 1254/2040] Combine mouse movement events in event queue

---
 code/qcommon/common.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 2f0c4d21..912b533f 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -958,6 +958,19 @@ void Com_QueueEvent( int time, sysEventType_t type, int value, int value2, size_
 {
 	sysEvent_t  *ev;
 
+	// combine mouse movement with previous mouse event
+	if ( type == SE_MOUSE && eventHead != eventTail )
+	{
+		ev = &eventQueue[ ( eventHead + MAX_QUEUED_EVENTS - 1 ) & MASK_QUEUED_EVENTS ];
+
+		if ( ev->evType == SE_MOUSE )
+		{
+			ev->evValue += value;
+			ev->evValue2 += value2;
+			return;
+		}
+	}
+
 	ev = &eventQueue[ eventHead & MASK_QUEUED_EVENTS ];
 
 	if ( eventHead - eventTail >= MAX_QUEUED_EVENTS )

From bf978256e924ec8b8e0810e964b05eeb114e910c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:33:02 +0200
Subject: [PATCH 1255/2040] Add changes from upstream, like pipefile, random
 number seed

---
 code/qcommon/common.c  | 254 +++++++++++++++++++++++++----------------
 code/qcommon/qcommon.h |   5 +-
 2 files changed, 156 insertions(+), 103 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 912b533f..ccc3a757 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -65,6 +65,7 @@ jmp_buf abortframe;		// an ERR_DROP occured, exit the entire frame
 
 
 FILE *debuglogfile;
+static fileHandle_t pipefile;
 static fileHandle_t logfile;
 fileHandle_t	com_journalFile;			// events are written here
 fileHandle_t	com_journalDataFile;		// config files are written here
@@ -86,6 +87,7 @@ cvar_t	*com_sv_running;
 cvar_t	*com_cl_running;
 cvar_t	*com_viewlog;
 cvar_t	*com_logfile;		// 1 = buffer log, 2 = flush after each print
+cvar_t	*com_pipefile;
 cvar_t	*com_showtrace;
 cvar_t	*com_shortversion;
 cvar_t	*com_version;
@@ -253,7 +255,7 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 
 			time( &aclock );
 			newtime = localtime( &aclock );
-
+			
 			logfile = FS_FOpenTextFileWrite( "qconsole.log" );
 
 			if(logfile)
@@ -943,7 +945,6 @@ EVENT LOOP
 static sysEvent_t  eventQueue[ MAX_QUEUED_EVENTS ];
 static int         eventHead = 0;
 static int         eventTail = 0;
-static byte        sys_packetReceived[ MAX_MSGLEN ];
 
 /*
 ================
@@ -1007,41 +1008,41 @@ Com_GetSystemEvent
 */
 sysEvent_t Com_GetSystemEvent(void)
 {
-    sysEvent_t  ev;
-    char* s;
+	sysEvent_t  ev;
+	char        *s;
 
-    // return if we have data
-    if (eventHead > eventTail)
-    {
-        eventTail++;
-        return eventQueue[(eventTail - 1) & MASK_QUEUED_EVENTS];
-    }
+	// return if we have data
+	if ( eventHead > eventTail )
+	{
+		eventTail++;
+		return eventQueue[ ( eventTail - 1 ) & MASK_QUEUED_EVENTS ];
+	}
 
-    // check for console commands
-    s = Sys_ConsoleInput();
-    if (s)
-    {
-        char* b;
-        int   len;
+	// check for console commands
+	s = Sys_ConsoleInput();
+	if ( s )
+	{
+		char  *b;
+		int   len;
 
-        len = strlen(s) + 1;
-        b = (char*)Z_Malloc(len);
-        strcpy(b, s);
-        Com_QueueEvent(0, SE_CONSOLE, 0, 0, len, b);
-    }
+		len = strlen( s ) + 1;
+		b = Z_Malloc( len );
+		strcpy( b, s );
+		Com_QueueEvent( 0, SE_CONSOLE, 0, 0, len, b );
+	}
 
-    // return if we have data
-    if (eventHead > eventTail)
-    {
-        eventTail++;
-        return eventQueue[(eventTail - 1) & MASK_QUEUED_EVENTS];
-    }
+	// return if we have data
+	if ( eventHead > eventTail )
+	{
+		eventTail++;
+		return eventQueue[ ( eventTail - 1 ) & MASK_QUEUED_EVENTS ];
+	}
 
-    // create an empty event to return
-    memset(&ev, 0, sizeof(ev));
-    ev.evTime = Sys_Milliseconds();
+	// create an empty event to return
+	memset( &ev, 0, sizeof( ev ) );
+	ev.evTime = Sys_Milliseconds();
 
-    return ev;
+	return ev;
 }
 
 /*
@@ -1050,7 +1051,7 @@ Com_GetRealEvent
 =================
 */
 sysEvent_t	Com_GetRealEvent( void ) {
-	size_t		r;
+	int			r;
 	sysEvent_t	ev;
 
 	// either get an event from the system or the journal file
@@ -1189,7 +1190,6 @@ int Com_EventLoop( void ) {
 	MSG_Init( &buf, bufData, sizeof( bufData ) );
 
 	while ( 1 ) {
-		NET_FlushPacketQueue();
 		ev = Com_GetEvent();
 
 		// if no more events are available
@@ -1210,57 +1210,26 @@ int Com_EventLoop( void ) {
 		}
 
 
-		switch ( ev.evType ) {
-		default:
-			Com_Error( ERR_FATAL, "Com_EventLoop: bad event type %i", ev.evType );
+		switch(ev.evType)
+		{
+			case SE_KEY:
+				CL_KeyEvent( ev.evValue, ev.evValue2, ev.evTime );
 			break;
-        case SE_NONE:
-            break;
-		case SE_KEY:
-			CL_KeyEvent( ev.evValue, ev.evValue2, ev.evTime );
+			case SE_CHAR:
+				CL_CharEvent( ev.evValue );
 			break;
-		case SE_CHAR:
-			CL_CharEvent( ev.evValue );
+			case SE_MOUSE:
+				CL_MouseEvent( ev.evValue, ev.evValue2, ev.evTime );
 			break;
-		case SE_MOUSE:
-			CL_MouseEvent( ev.evValue, ev.evValue2, ev.evTime );
+			case SE_JOYSTICK_AXIS:
+				CL_JoystickEvent( ev.evValue, ev.evValue2, ev.evTime );
 			break;
-		case SE_JOYSTICK_AXIS:
-			CL_JoystickEvent( ev.evValue, ev.evValue2, ev.evTime );
+			case SE_CONSOLE:
+				Cbuf_AddText( (char *)ev.evPtr );
+				Cbuf_AddText( "\n" );
 			break;
-		case SE_CONSOLE:
-			Cbuf_AddText( (char *)ev.evPtr );
-			Cbuf_AddText( "\n" );
-			break;
-		case SE_PACKET:
-			// this cvar allows simulation of connections that
-			// drop a lot of packets.  Note that loopback connections
-			// don't go through here at all.
-			if ( com_dropsim->value > 0 ) {
-				static int seed;
-
-				if ( Q_random( &seed ) < com_dropsim->value ) {
-					break;		// drop this packet
-				}
-			}
-
-			evFrom = *(netadr_t *)ev.evPtr;
-			buf.cursize = ev.evPtrLength - sizeof( evFrom );
-
-			// we must copy the contents of the message out, because
-			// the event buffers are only large enough to hold the
-			// exact payload, but channel messages need to be large
-			// enough to hold fragment reassembly
-			if ( (unsigned)buf.cursize > buf.maxsize ) {
-				Com_Printf("Com_EventLoop: oversize packet\n");
-				continue;
-			}
-			Com_Memcpy( buf.data, (byte *)((netadr_t *)ev.evPtr + 1), buf.cursize );
-			if ( com_sv_running->integer ) {
-				Com_RunAndTimeServerPacket( &evFrom, &buf );
-			} else {
-				CL_PacketEvent( evFrom, &buf );
-			}
+			default:
+				Com_Error( ERR_FATAL, "Com_EventLoop: bad event type %i", ev.evType );
 			break;
 		}
 
@@ -1346,13 +1315,11 @@ static void Com_Freeze_f (void) {
 =================
 Com_Crash_f
 
-A way to force a segmentation fault for development purposes,
-like testing the backtrace
+A way to force a bus error for development reasons
 =================
 */
-static void Com_Crash_f(void) {
-	volatile void* invalid_ptr = NULL;
-	*(volatile int*)invalid_ptr = 0x12345678;
+static void Com_Crash_f( void ) {
+	* ( volatile int * ) 0 = 0x12345678;
 }
 
 /*
@@ -1615,6 +1582,22 @@ static void Com_DetectAltivec(void)
 	}
 }
 
+/*
+=================
+Com_InitRand
+Seed the random number generator, if possible with an OS supplied random seed.
+=================
+*/
+static void Com_InitRand(void)
+{
+	unsigned int seed;
+
+	if(Sys_RandomBytes((byte *) &seed, sizeof(seed)))
+		srand(seed);
+	else
+		srand(time(NULL));
+}
+
 /*
 =================
 Com_Init
@@ -1625,6 +1608,7 @@ void Com_Init( char *commandLine ) {
 	int			iEnd;
 	const char	*s;
 	char		configname[ 128 ];
+	int			qport;
 
 	Com_Printf( "--- Common Initialization ---\n" );
 
@@ -1636,6 +1620,15 @@ void Com_Init( char *commandLine ) {
 		Sys_Error("Error during initialization");
 	}
 
+	// Clear queues
+	Com_Memset( &eventQueue[ 0 ], 0, MAX_QUEUED_EVENTS * sizeof( sysEvent_t ) );
+
+	// initialize the weak pseudo-random number generator for use later.
+	Com_InitRand();
+
+	// do this before anything else decides to push events
+	Com_InitPushEvent();
+
 	// prepare enough of the subsystems to handle
 	// cvar and command buffer management
 	Com_ParseCommandLine( commandLine );
@@ -1830,7 +1823,12 @@ void Com_Init( char *commandLine ) {
 	demo_protocols[0] = com_protocol->integer;
 
 	Sys_Init();
-	Netchan_Init( Com_Milliseconds() & 0xffff );	// pick a port value that should be nice and random
+
+	//Sys_InitPIDFile(FS_GetCurrentGameDir());
+
+	// Pick a random port value
+	Com_RandomBytes((byte*)&qport, sizeof(int));
+	Netchan_Init(qport & 0xffff);
 	SV_Init();
 
 	com_dedicated->modified = qfalse;
@@ -1859,12 +1857,75 @@ void Com_Init( char *commandLine ) {
 
 	com_fullyInitialized = qtrue;
 
+	// always set the cvar, but only print the info if it makes sense.
+	Com_DetectAltivec();
+#if idppc
+	Com_Printf ("Altivec support is %s\n", com_altivec->integer ? "enabled" : "disabled");
+#endif
+
+	com_pipefile = Cvar_Get( "com_pipefile", "", CVAR_ARCHIVE|CVAR_LATCH );
+	if( com_pipefile->string[0] )
+	{
+		pipefile = FS_FCreateOpenPipeFile( com_pipefile->string );
+	}
+
 	RecoverLostAutodialData();
 
 	iEnd = Sys_Milliseconds();
 	Com_Printf( "--- Common Initialization Complete --- %i ms\n", iEnd - iStart );
 }
 
+/*
+===============
+Com_ReadFromPipe
+
+Read whatever is in com_pipefile, if anything, and execute it
+===============
+*/
+void Com_ReadFromPipe( void )
+{
+	static char buf[MAX_STRING_CHARS];
+	static int accu = 0;
+	int read;
+
+	if( !pipefile )
+		return;
+
+	while( ( read = FS_Read( buf + accu, sizeof( buf ) - accu - 1, pipefile ) ) > 0 )
+	{
+		char *brk = NULL;
+		int i;
+
+		for( i = accu; i < accu + read; ++i )
+		{
+			if( buf[ i ] == '\0' )
+				buf[ i ] = '\n';
+			if( buf[ i ] == '\n' || buf[ i ] == '\r' )
+				brk = &buf[ i + 1 ];
+		}
+		buf[ accu + read ] = '\0';
+
+		accu += read;
+
+		if( brk )
+		{
+			char tmp = *brk;
+			*brk = '\0';
+			Cbuf_ExecuteText( EXEC_APPEND, buf );
+			*brk = tmp;
+
+			accu -= brk - buf;
+			memmove( buf, brk, accu + 1 );
+		}
+		else if( accu >= sizeof( buf ) - 1 ) // full
+		{
+			Cbuf_ExecuteText( EXEC_APPEND, buf );
+			accu = 0;
+		}
+	}
+}
+
+
 //==================================================================
 
 void Com_WriteConfigToFile( const char *filename ) {
@@ -2031,17 +2092,13 @@ void Com_Frame( void ) {
 	int		msec, minMsec;
 	int		timeVal, timeValSV;
 	static int	lastTime = 0, bias = 0;
-	int key;
-
+ 
 	int		timeBeforeFirstEvents;
-	int           timeBeforeServer;
-	int           timeBeforeEvents;
-	int           timeBeforeClient;
-	int           timeAfter;
-
-
-
-
+	int		timeBeforeServer;
+	int		timeBeforeEvents;
+	int		timeBeforeClient;
+	int		timeAfter;
+  
 
 	if ( setjmp (abortframe) ) {
 		return;			// an ERR_DROP was thrown
@@ -2067,10 +2124,6 @@ void Com_Frame( void ) {
 	timeBeforeClient = 0;
 	timeAfter = 0;
 
-
-	// old net chan encryption key
-	key = 0x87243987;
-
 #ifndef DEDICATED
 	// write config file if anything changed
 	Com_WriteConfiguration();
@@ -2289,8 +2342,7 @@ void Com_Frame( void ) {
 		c_pointcontents = 0;
 	}
 
-	// old net chan encryption key
-	key = lastTime * 0x87243987;
+	Com_ReadFromPipe();
 
 	com_frameNumber++;
 }
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index be1abeb0..60dc4a32 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -722,9 +722,10 @@ int		FS_GetModList(  char *listbuf, int bufsize );
 
 void	FS_GetModDescription(const char* modDir, char* description, int descriptionLen);
 
-fileHandle_t	FS_FOpenFileAppend( const char *filename );
 fileHandle_t	FS_FOpenFileWrite( const char *qpath );
-fileHandle_t	FS_FOpenTextFileWrite( const char *qpath );
+fileHandle_t	FS_FOpenFileAppend( const char *filename );
+fileHandle_t	FS_FCreateOpenPipeFile( const char *filename );
+fileHandle_t	FS_FOpenTextFileWrite(const char* qpath);
 // will properly create any needed paths and deal with seperater character issues
 
 void	FS_DeleteFile( const char *filename );

From b7403347bb3922072ff47424d80577f57a183d45 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:30:42 +0200
Subject: [PATCH 1256/2040] Ignore the first responder if it's disabled so the
 UI doesn't get blocked by it

---
 code/uilib/uiwinman.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index 6adf321c..cda5081c 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -194,7 +194,13 @@ UIWidget *UIWindowManager::getResponder(UIPoint2D& pos)
 
     responder = m_firstResponder;
 
-    if (responder != this) {
+    if (responder != this &&
+        // Added in OPM
+        //  Ignore the first responder if it's disabled
+        //  this prevents the UI system from being blocked
+        //  trying to activate the control
+        responder->CanActivate() && responder->isEnabled()
+        ) {
         return responder;
     }
 

From a993b8d352a23074a44e5221078ea52d90f4089f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:34:50 +0200
Subject: [PATCH 1257/2040] Specify "Fixed" instead of "Added" as it's a bug
 that was fixed

---
 code/uilib/uiwinman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index cda5081c..41c528ef 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -195,7 +195,7 @@ UIWidget *UIWindowManager::getResponder(UIPoint2D& pos)
     responder = m_firstResponder;
 
     if (responder != this &&
-        // Added in OPM
+        // Fixed in OPM
         //  Ignore the first responder if it's disabled
         //  this prevents the UI system from being blocked
         //  trying to activate the control

From 679cf4b7ec71133cc9da085c9c6fc99077fed49e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:27:32 +0200
Subject: [PATCH 1258/2040] Correctly remove "prespawn"/"spawn" waittill when
 loading from save

---
 code/fgame/level.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 2111ee6f..f7259270 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -2488,19 +2488,19 @@ void Level::Archive(Archiver& arc)
     Listener::Archive(arc);
 
     if (arc.Saving()) {
-        prespawn = classinfo()->WaitTillDefined("prespawn");
-        spawn    = classinfo()->WaitTillDefined("spawn");
+        prespawn = WaitTillDefined(STRING_PRESPAWN);
+        spawn    = WaitTillDefined(STRING_SPAWN);
     }
 
     arc.ArchiveBool(&prespawn);
     arc.ArchiveBool(&spawn);
 
     if (arc.Loading()) {
-        if (prespawn) {
+        if (!prespawn) {
             RemoveWaitTill(STRING_PRESPAWN);
         }
 
-        if (spawn) {
+        if (!spawn) {
             RemoveWaitTill(STRING_SPAWN);
         }
     }

From 2b4aef4ea69c73bc27fb30b44958b97269e7c2f4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:28:49 +0200
Subject: [PATCH 1259/2040] Add a newline to Cmd_Stuff

Next commands weren't correctly appended
---
 code/uilib/uilabel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uilabel.cpp b/code/uilib/uilabel.cpp
index ecc7bc32..cb39cba3 100644
--- a/code/uilib/uilabel.cpp
+++ b/code/uilib/uilabel.cpp
@@ -374,7 +374,7 @@ void UILabel::ProcessSounds()
             m_bOneShotTriggered = true;
             m_iNextOneShotTime  = Sys_Milliseconds() + m_fOneShotSoundTime * 1000.0f;
         } else if (m_sLoopingSoundName.length()) {
-            uii.Cmd_Stuff("tmstartloop " + m_sLoopingSoundName);
+            uii.Cmd_Stuff("tmstartloop " + m_sLoopingSoundName + '\n');
 
             m_iNextOneShotTime = 0;
             m_iSoundState      = 0;

From 0ad5222946c2df3c5c02073b3f65bdfe632c095b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:34:33 +0200
Subject: [PATCH 1260/2040] Use the correct stopwatch for explosives

---
 code/fgame/Entities.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 74dee99a..c12d8f5e 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1843,7 +1843,7 @@ void ThrobbingBox_Explosive::OnUse(Event *ev)
 
     if (m_fStopwatchDuration > 0) {
         Player *player = static_cast<Player *>(G_FindTarget(this, "player"));
-        player->SetStopwatch(m_fStopwatchDuration, SWT_FUSE);
+        player->SetStopwatch(m_fStopwatchDuration, SWT_NORMAL);
         LoopSound(m_sTickSound);
     }
 

From 2ee531511bf31a56ab835ba3fb7168515568c25c Mon Sep 17 00:00:00 2001
From: KevDoy <KevDoy@users.noreply.github.com>
Date: Sat, 26 Oct 2024 05:58:34 -0700
Subject: [PATCH 1261/2040] Add: Instructions for installing GOG binaries on
 *nix

---
 docs/getting_started_installation.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 8720ec5c..04f4b382 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -4,7 +4,8 @@ Ensure that you download the binaries compatible with your platform in the relea
 
 ## Requirements
 
-- A valid MOH:AA installation, a MOH:AA Warchest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest)
+- A valid MOH:AA installation, a MOH:AA Warchest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
+  - [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos)
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 may be required.
 
 ## System requirements
@@ -34,3 +35,14 @@ Extract the archive to your MOHAA server installation directory. Then proceed li
 - `./omohaaded +exec server.cfg` on Linux
 
 Only `omohaaded*` and `game*` binaries are required for the server version, other binaries can be omitted.
+
+
+## Extracting GOG setup file on Linux and macOS
+
+The MOH:AA Warchest installer files on GOG are Windows binaries. To attain the game files, you can quickly extract them using [Innoextract](https://github.com/dscharrer/innoextract). 
+
+- Install Innoextract using your preferred Package Manager (e.g. [Brew](https://brew.sh/)). 
+
+- Once installed run the command `innoextract setup_medal_of_honor_2.0.0.21.exe`. The MoH:AA game files will be extracted into a folder called 'app'.
+
+Alternatively, you can use [WINE](https://www.winehq.org/) as well, but this process may take longer if you do not already have WINE installed and configured. 

From 16bedf7e8688a53ba8973d862d27c75718287320 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:07:09 +0200
Subject: [PATCH 1262/2040] Warp the sample offset for small streams so it
 doesn't get past the stream size

---
 code/client/snd_openal_new.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 976818dd..ec79300a 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4565,7 +4565,12 @@ U32 openal_channel_two_d_stream::sample_offset()
         // it probably means the sound is looped and will restart from the beginning
         if (streamNextOffset + playerByteOffset <= totalQueueLength) {
             // near the end of the stream
-            offset = stream->info.size + streamNextOffset - totalQueueLength + playerByteOffset;
+            if (stream->info.size > totalQueueLength) {
+                offset = stream->info.size + streamNextOffset - totalQueueLength + playerByteOffset;
+            } else {
+                // the buffer is really small
+                offset = (streamNextOffset - totalQueueLength + playerByteOffset) % stream->info.size;
+            }
         } else {
             // it is past end of stream
             // so, start from the beginning of the stream

From 3d46bae1d01fd14aa14c8dc24483675584478b4e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:07:35 +0200
Subject: [PATCH 1263/2040] Stop the triggered music when the server is
 restarted

---
 code/client/cl_main.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 830ad675..95c993d1 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -4387,7 +4387,10 @@ CL_ServerRestarted
 ==================
 */
 void CL_ServerRestarted( void ) {
-	S_StopAllSounds2( qfalse );
+	//S_StopAllSounds2( qfalse );
+	// Fixed in OPM
+	//  Also stop the music
+	S_StopAllSounds2( qtrue );
 
 	UI_ServerLoaded();
 	UI_ClearState();

From 940ac789b93d645d1e5ebcdec2a04a71001fb43f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 22:29:27 +0200
Subject: [PATCH 1264/2040] Change the current fov only if the fov is currently
 the selected fov

This prevents the player from modifying the fov while zooming
---
 code/fgame/player.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 55e67983..00ebe5bb 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5871,13 +5871,18 @@ void Player::SetFov(float newFov)
 
 void Player::EventSetSelectedFov(Event *ev)
 {
+    float fOldSelectedFov;
+
     if (ev->NumArgs() < 1) {
         gi.SendServerCommand(edict - g_entities, "print \"Fov = %d\n\"", (unsigned int)fov);
         return;
     }
 
+    fOldSelectedFov = selectedfov;
     SetSelectedFov(ev->GetFloat(1));
-    SetFov(selectedfov);
+    if (fov == fOldSelectedFov) {
+        SetFov(selectedfov);
+    }
 }
 
 void Player::SetSelectedFov(float newFov)

From c7cdde7bc2e1da0d7eb94f23d2af358669e3054d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Oct 2024 22:42:21 +0200
Subject: [PATCH 1265/2040] Check if the target list is valid before adding the
 entity

---
 code/fgame/worldspawn.cpp | 56 +++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index bc76ea74..68dfa571 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -1002,7 +1002,7 @@ void World::SetNorthYaw(Event *ev)
 
 Listener *World::GetTarget(str targetname, bool quiet)
 {
-    TargetList* targetList = GetTargetList(targetname);
+    TargetList *targetList = GetTargetList(targetname);
 
     if (!targetList) {
         return NULL;
@@ -1040,11 +1040,11 @@ Listener *World::GetScriptTarget(str targetname)
 
     return NULL;
 }
- 
+
 TargetList *World::GetExistingTargetList(const str& targetname)
 {
-    TargetList* targetList;
-    int i;
+    TargetList *targetList;
+    int         i;
 
     if (!targetname.length()) {
         return NULL;
@@ -1062,10 +1062,12 @@ TargetList *World::GetExistingTargetList(const str& targetname)
 
 TargetList *World::GetTargetList(str& targetname)
 {
-    TargetList* targetList;
-    int i;
+    TargetList *targetList;
+    int         i;
 
     if (!targetname.length()) {
+        // Fixed in OPM
+        //  Don't create a targetlist for the empty target name
         return NULL;
     }
 
@@ -1084,22 +1086,34 @@ TargetList *World::GetTargetList(str& targetname)
 
 void World::AddTargetEntity(SimpleEntity *ent)
 {
-    TargetList *list = GetTargetList(ent->TargetName());
+    TargetList *targetList = GetTargetList(ent->TargetName());
 
-    list->AddEntity(ent);
+    if (!targetList) {
+        return;
+    }
+
+    targetList->AddEntity(ent);
 }
 
 void World::AddTargetEntityAt(SimpleEntity *ent, int index)
 {
-    TargetList *list = GetTargetList(ent->TargetName());
+    TargetList *targetList = GetTargetList(ent->TargetName());
 
-    list->AddEntityAt(ent, index);
+    if (!targetList || !index) {
+        return;
+    }
+
+    targetList->AddEntityAt(ent, index);
 }
 
 int World::GetTargetnameIndex(SimpleEntity *ent)
 {
     TargetList *targetList = GetTargetList(ent->TargetName());
 
+    if (!targetList) {
+        return 0;
+    }
+
     return targetList->GetEntityIndex(ent);
 }
 
@@ -1109,21 +1123,17 @@ void World::RemoveTargetEntity(SimpleEntity *ent)
         return;
     }
 
-    str targetname = ent->TargetName();
-
-    if (!targetname.length()) {
+    TargetList *targetList = GetExistingTargetList(ent->TargetName());
+    if (!targetList) {
         return;
     }
 
-    TargetList *list = GetExistingTargetList(targetname);
-    if (list) {
-        list->RemoveEntity(ent);
-    }
+    targetList->RemoveEntity(ent);
 }
 
 SimpleEntity *World::GetNextEntity(str targetname, SimpleEntity *ent)
 {
-    TargetList* targetList = GetExistingTargetList(targetname);
+    TargetList *targetList = GetExistingTargetList(targetname);
     if (!targetList) {
         return NULL;
     }
@@ -1144,9 +1154,9 @@ void World::FreeTargetList()
 
 void World::Archive(Archiver& arc)
 {
-    int num;
-    int num2;
-    int i;
+    int         num;
+    int         num2;
+    int         i;
     TargetList *targetList;
 
     if (arc.Loading()) {
@@ -1159,7 +1169,7 @@ void World::Archive(Archiver& arc)
             targetList = new TargetList(targetname);
             m_targetListContainer.AddObject(targetList);
 
-            arc.ArchiveObjectPosition((LightClass*)&targetList->list);
+            arc.ArchiveObjectPosition((LightClass *)&targetList->list);
             arc.ArchiveInteger(&num2);
 
             targetList->list.Resize(num2);
@@ -1172,7 +1182,7 @@ void World::Archive(Archiver& arc)
             targetList = m_targetListContainer.ObjectAt(i);
 
             arc.ArchiveString(&targetList->targetname);
-            arc.ArchiveObjectPosition((LightClass*)&targetList->list);
+            arc.ArchiveObjectPosition((LightClass *)&targetList->list);
 
             num2 = targetList->list.NumObjects();
             arc.ArchiveInteger(&num2);

From 6934e5cff8d7f0fe706d7d473ebc771147b80cd5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 12:16:19 +0100
Subject: [PATCH 1266/2040] Check for valid target list in GetScriptTarget()

---
 code/fgame/worldspawn.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
index 68dfa571..cbe476fc 100644
--- a/code/fgame/worldspawn.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -1028,6 +1028,10 @@ Listener *World::GetScriptTarget(str targetname)
 {
     TargetList *targetList = GetTargetList(targetname);
 
+    if (!targetList) {
+        return NULL;
+    }
+
     if (targetList->list.NumObjects() == 1) {
         return targetList->list.ObjectAt(1);
     } else if (targetList->list.NumObjects() > 1) {

From da7cd03f09abc15bde0fbd4f9adc28aa3bd5f07e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 13:42:42 +0100
Subject: [PATCH 1267/2040] Increase packed animation time precision

This tries to fix some client commands replaying
---
 code/qcommon/msg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 622412bc..2c39f67a 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2263,7 +2263,7 @@ float MSG_ReadPackedAnimTime_ver_15(msg_t* msg, int bits, float fromValue, float
 {
 	int packed;
 	if (!MSG_ReadBits(msg, 1)) {
-		return ceil((fromValue + frameTime) * 1000) / 1000;
+		return ceil((fromValue + frameTime) * 10000) / 10000;
 	}
 
 	packed = MSG_ReadBits(msg, bits);

From 558e69dba8c8cc9f135a9ac39c8057660e0ee0d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 14:27:44 +0100
Subject: [PATCH 1268/2040] Archive the vehicle name

This was missing and this allows the torso state to the modheight to set the bounding box height. Before that, it did not recognize the turret so the modheight was still set to stand. It caused issues when trying to get out a vehicle turret, like the flak88 in e1l1 (the player wasn't able to get out of the turret)
---
 code/fgame/vehicle.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 7e819af9..109f4e21 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6511,6 +6511,7 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveFloat(&conesize);
     arc.ArchiveFloat(&maxtracedist);
     arc.ArchiveString(&weaponName);
+    arc.ArchiveString(&vehicleName);
     arc.ArchiveVector(&last_origin);
     arc.ArchiveVector(&seatangles);
     arc.ArchiveVector(&seatoffset);

From 7c96b68623c95d8a5728f91be5ee2f38e907a62a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 15:16:01 +0100
Subject: [PATCH 1269/2040] Specify the home directory location for macOS

---
 docs/configuration/server.md    | 8 ++++++++
 docs/getting_started_running.md | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 2c2fad63..00445aa9 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -5,19 +5,23 @@ This documentation currently only lists new changes that were introduced in Open
 ## Home directory
 
 In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:
+
 - `set fs_homepath Z:\openmohaa_data`: User data will be read and written in the directory located in `Z:\openmohaa_data`
 - `set fs_homepath homedata`: The subdirectory `homedata` in the game directory will be used to read and store user data
 - `set fs_homepath .`: Not recommended, the game directory will be used for storing user data, just like the original MOH:AA
 
 The variable defaults to the following value depending on the OS:
+
 - `%APPDATA%\openmohaa` on Windows
 - `~/.openmohaa` on Linux
+- `~/Library/Application Support/openmohaa` on macOS
 
 ## Networking
 
 ### Configure the network components
 
 The network settings can be adjusted to use either IPv4, IPv6, or both. By default, IPv6 is disabled on dedicated servers. The following commands adjust network settings:
+
 - `set net_enabled 1`: This enables IPv4 only (the default setting for dedicated servers).
 - `set net_enabled 2`: This enables IPv6 only.
 - `set net_enabled 3`: This enables both IPv4 and IPv6 (the default setting when running the standalone game).
@@ -27,6 +31,7 @@ The network settings can be adjusted to use either IPv4, IPv6, or both. By defau
 ### Optimization / Antichams
 
 A new variable, `sv_netoptimize`, enables a feature that optimizes network bandwidth by not sending players information about others they can't see. For each client, the server optimizes by only transmitting data about players within their view. Clients will not receive information about players they can't see. This feature also helps protect against cheaters:
+
 - `set sv_netoptimize 0`: This disables the optimization - the default
 - `set sv_netoptimize 1`: This enables the optimization for entities that are moving
 - `set sv_netoptimize 2`: This enables the optimization, always
@@ -48,6 +53,7 @@ A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https
 |flushbans  |                                       |Removes all bans
 
 Examples:
+
 - `banaddr 192.168.5.2` will ban the IP address **192.168.5.2**.
 - `banaddr 192.168.1.0/24` will ban all **192.168.1.x** IP addresses (in the range **192.168.1.0**-**192.168.1.255**).
 - `banaddr 2` will ban the IP address of the client **#2**.
@@ -95,11 +101,13 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 ### Bots
 
 Bots are supported and can be used for testing or for entertainment. The [mp-navigation](https://github.com/openmoh/mp-navigation) pk3 will be needed so bots can navigate and move on MP maps. The following variables are used to configure bots:
+
 - `set sv_maxbots x`: **Required**, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
 - `set sv_numbots x`: Set the number of bots to spawn. It will be capped to the value of `sv_maxbots`.
 - `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected, the game will spawn 3 bots to make sure there are always 8 players in the game.
 
 Commands:
+
 - `addbot x`: x is the number of bots to add. It only changes the `sv_numbots` variable.
 - `removebot x`: x is the number of bots to remove. It only changes the `sv_numbots` variable.
 
diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 5dc524be..4a599b41 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -21,8 +21,11 @@ You can now start a local OpenMOHAA server or play on a server.
 
 The location of user-writable data, like the console logfile, saves and configuration files can be found in different locations depending on the platform:
 
-- `%APPDATA%\openmohaa\<game_name>` on Windows
-- `~/.openmohaa/<game_name>` on Linux
+- `%APPDATA%\openmohaa` on Windows
+- `~/.openmohaa` on Linux
+- `~/Library/Application Support/openmohaa` on macOS
+
+There will be one or more subdirectories like in the game installation folder, they match the game being used: either base game `main` or expansions `mainta`/`maintt`.
 
 This is by design since ioquake3 and has two advantages:
 - On a multi-user system, each user will have their own configuration file

From dae7795478c9b229e2dcade0dc6556bb847f375a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 15:24:22 +0100
Subject: [PATCH 1270/2040] Add NDEBUG compile definition on non-debug builds

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70f3cfe8..1eeff650 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ ELSE()
 ENDIF()
 
 IF(CMAKE_BUILD_TYPE MATCHES Debug)
-	add_definitions(-D_DEBUG)
+	add_compile_definitions(_DEBUG)
 
 	# NOTE: The following may mess up function importation
 	#if(UNIX)
@@ -92,6 +92,9 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug)
 	#	set(CMAKE_ENABLE_EXPORTS ON)
 	#	message(STATUS "Enabling exports on Unix for backtrace")
 	#endif()
+ELSE()
+	# Non-debug builds
+	add_compile_definitions(NDEBUG)
 ENDIF()
 
 if(APPLE)

From ef32200c8dc34ad01c25a7adf528e9228ecc45ef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 17:45:23 +0100
Subject: [PATCH 1271/2040] Target older macOS versions

---
 .github/workflows/shared-build.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 899f5974..fa75431b 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -16,6 +16,7 @@ jobs:
   ##########################
   #
   # Linux
+  # Ubuntu 24.04
   #
   ##########################
   build-platform-linux:
@@ -155,6 +156,7 @@ jobs:
   ##########################
   #
   # Microsoft Windows
+  # Windows Server 2022
   #
   ##########################
   build-platform-windows:
@@ -329,14 +331,17 @@ jobs:
   ##########################
   #
   # Apple macOS
+  # macOS 14
   #
+  # It uses this version because older versions are slower,
+  # at least in Actions.
   ##########################
   build-platform-macos:
     strategy:
       matrix:
         architecture: [
-          {name: 'x86_64',   triple: 'x86_64-apple-macos13'},
-          {name: 'arm64',    triple: 'arm64-apple-macos14'}
+          {name: 'x86_64',   triple: 'x86_64-apple-macos10.8'},
+          {name: 'arm64',    triple: 'arm64-apple-macos11'}
         ]
 
     name: "Building for platform macos-${{matrix.architecture.name}}"
@@ -360,6 +365,7 @@ jobs:
         echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
         echo "CC=clang" >> $GITHUB_ENV
         echo "CXX=clang++" >> $GITHUB_ENV
+        echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV
 
     ###
     # SDL

From 2afa9adceb67040e201a9f900c344a7c022228ed Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 18:19:58 +0100
Subject: [PATCH 1272/2040] Add a link to mp-navigation for bots

---
 docs/getting_started_running.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 4a599b41..b0dd8a73 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -46,4 +46,4 @@ OpenMoHAA has a basic bot system that emulates real players. The maximum number
 
 This feature is a great way to test the gameplay and mods.
 
-Note that maps must have path built for bots to move, multiplayer maps don't have path built by default. Mods like [eagleAR bots](https://www.moddb.com/mods/medal-of-honor-world-war-1/downloads/moh-eaglear-bots) exist that do introduce paths in multiplayer maps.
+Note that maps must have path built for bots to move, multiplayer maps don't have path built by default. The [mp-navigation](https://github.com/openmoh/mp-navigation) PK3 file can be downloaded and installed in the `main` directory, it adds navigation for all multiplayer maps, including multiplayer maps from Spearhead and Breakthrough.

From afe1ba47cf6a425eef2e45eb4665ed98cdfd4c2c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 19:37:56 +0100
Subject: [PATCH 1273/2040] Decrease the time tolerance between frames to make
 animations smoother

---
 code/skeletor/skeletor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 35873124..f828de7f 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -453,7 +453,7 @@ void skeletor_c::SetPose(
         afterFrame   = 0.0;
 
         numFramesAdded =
-            animData->GetFrameNums(currentFrame.time, 0.01f, &beforeFrame, &afterFrame, &beforeWeight, &afterWeight);
+            animData->GetFrameNums(currentFrame.time, 0.001f, &beforeFrame, &afterFrame, &beforeWeight, &afterWeight);
 
         frame1                 = &m_frameList.m_blendInfo[blendFrame];
         frame1->frame          = beforeFrame;

From e8dfa0206b79809b8906a85083b27f3ac304af8d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 21:39:16 +0100
Subject: [PATCH 1274/2040] Use a macro constant for movement/action skan blend
 frames

---
 code/skeletor/skeletor.cpp      | 25 +++++++++++++++----------
 code/skeletor/skeletor.h        |  6 +++++-
 code/skeletor/skeletorbones.cpp |  4 ++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index f828de7f..c2dea715 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -401,7 +401,7 @@ void skeletor_c::SetPose(
     m_frameRadius      = 2.0f;
     animWeight         = 0.0f;
     movementBlendFrame = 0;
-    actionBlendFrame   = 32;
+    actionBlendFrame   = MAX_SKEL_BLEND_MOVEMENT_FRAMES;
     aliases            = m_Tiki->a->m_aliases;
 
     for (blendNum = 0; blendNum < MAX_FRAMEINFOS; blendNum++) {
@@ -491,8 +491,11 @@ void skeletor_c::SetPose(
     }
 
     m_frameList.numMovementFrames = movementBlendFrame;
-    m_frameList.numActionFrames   = actionBlendFrame - 32;
+    m_frameList.numActionFrames   = actionBlendFrame - MAX_SKEL_BLEND_MOVEMENT_FRAMES;
     m_frameList.actionWeight      = actionWeight;
+
+    assert(m_frameList.numMovementFrames < MAX_SKEL_BLEND_MOVEMENT_FRAMES);
+    assert(m_frameList.numActionFrames < MAX_SKEL_BLEND_ACTION_FRAMES);
 }
 
 static SkelMat4 GetGlobalDefaultPosition(skelBone_Base *bone)
@@ -692,9 +695,10 @@ void SkeletorGetAnimFrame(
         if (!animData->bHasDelta) {
             frameList.numMovementFrames              = 0;
             frameList.numActionFrames                = 1;
-            frameList.m_blendInfo[32].weight         = 1.0;
-            frameList.m_blendInfo[32].pAnimationData = animData;
-            frameList.m_blendInfo[32].frame          = frame;
+
+            frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].weight         = 1.0;
+            frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].pAnimationData = animData;
+            frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].frame          = frame;
         } else {
             frameList.numMovementFrames             = 1;
             frameList.numActionFrames               = 0;
@@ -907,9 +911,10 @@ void TIKI_GetSkelAnimFrameInternal(
     if (!animData || !animData->bHasDelta) {
         frameList.numMovementFrames              = 0;
         frameList.numActionFrames                = 1;
-        frameList.m_blendInfo[32].weight         = 1.0;
-        frameList.m_blendInfo[32].pAnimationData = animData;
-        frameList.m_blendInfo[32].frame          = frame;
+
+        frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].weight         = 1.0;
+        frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].pAnimationData = animData;
+        frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].frame          = frame;
     } else {
         frameList.numMovementFrames             = 1;
         frameList.numActionFrames               = 0;
@@ -1117,8 +1122,8 @@ int skeletor_c::GetMorphWeightFrame(int *data)
         }
     }
 
-    for (blendNum = 32; blendNum < m_frameList.numActionFrames + 32; blendNum++) {
-        const skanBlendInfo& blendInfo = m_frameList.m_blendInfo[blendNum];
+    for (blendNum = 0; blendNum < m_frameList.numActionFrames; blendNum++) {
+        const skanBlendInfo& blendInfo = m_frameList.m_blendInfo[blendNum + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
         weight                         = blendInfo.weight;
 
         if (weight > 0.001) {
diff --git a/code/skeletor/skeletor.h b/code/skeletor/skeletor.h
index 3f7e23e6..a126df25 100644
--- a/code/skeletor/skeletor.h
+++ b/code/skeletor/skeletor.h
@@ -35,6 +35,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "skeletor_name_lists.h"
 #include "skeletor_internal.h"
 
+#define MAX_SKEL_BLEND_MOVEMENT_FRAMES 32
+#define MAX_SKEL_BLEND_ACTION_FRAMES 32
+#define MAX_SKEL_BLEND_FRAMES (MAX_SKEL_BLEND_MOVEMENT_FRAMES + MAX_SKEL_BLEND_ACTION_FRAMES)
+
 typedef struct skelAnimFrame_s {
     float    radius;
     SkelVec3 bounds[2];
@@ -70,7 +74,7 @@ public:
     short int     numMovementFrames;
     short int     numActionFrames;
     float         actionWeight;
-    skanBlendInfo m_blendInfo[64];
+    skanBlendInfo m_blendInfo[MAX_SKEL_BLEND_FRAMES];
 
 public:
     SkelQuat GetSlerpValue(int globalChannelNum) const;
diff --git a/code/skeletor/skeletorbones.cpp b/code/skeletor/skeletorbones.cpp
index 92ca3a19..a3b8d25d 100644
--- a/code/skeletor/skeletorbones.cpp
+++ b/code/skeletor/skeletorbones.cpp
@@ -232,7 +232,7 @@ SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
 
     if (actionWeight > 0.001) {
         for (i = 0; i < numActionFrames; i++) {
-            pFrame = &m_blendInfo[i + 32];
+            pFrame = &m_blendInfo[i + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
 
             localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
             if (localChannelNum >= 0) {
@@ -381,7 +381,7 @@ void skelAnimStoreFrameList_c::GetLerpValue3(int globalChannelNum, SkelVec3 *out
         VectorClear(result);
 
         for (i = 0; i < numActionFrames; i++) {
-            pFrame = &m_blendInfo[i + 32];
+            pFrame = &m_blendInfo[i + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
 
             localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
             if (localChannelNum >= 0) {

From a8cdf0b5ad067110f193e40d32edecd5f2138328 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 21:46:12 +0100
Subject: [PATCH 1275/2040] Don't update the upper animation if the think state
 is attack/grenade/killed/pain

---
 code/fgame/actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 0175f3d5..8b10cc67 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -7320,6 +7320,8 @@ void Actor::UpdateUpperAnim(void)
         if (!m_bActionAnimSet) {
             Unregister(STRING_UPPERANIMDONE);
         }
+
+        return;
     }
 
     gi.Anim_FlagsSkel(edict->tiki, anim);

From 92b4ae2702d052e4fc1cc5047d94958f82b57208 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Oct 2024 22:16:04 +0100
Subject: [PATCH 1276/2040] Use ANIM_WEIGHT_NONE instead of 0

---
 code/fgame/simpleactor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp
index 317aba3d..d4d407db 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -85,7 +85,7 @@ SimpleActor::SimpleActor()
     m_csNextAnimString        = STRING_NULL;
 
     for (int i = 0; i < MAX_FRAMEINFOS; i++) {
-        m_weightType[i] = 0.0f;
+        m_weightType[i] = ANIM_WEIGHT_NONE;
     }
 
     m_ChangeActionAnimIndex = -1;
@@ -665,7 +665,7 @@ void SimpleActor::StopAnimating(int slot)
 {
     int index = 0;
 
-    m_weightType[slot] = 0;
+    m_weightType[slot] = ANIM_WEIGHT_NONE;
     DoExitCommands(slot);
 
     if (edict->s.frameInfo[slot].index || gi.TIKI_NumAnims(edict->tiki) <= 1) {

From 5cbd2dd988396d0c0213cf04d34b19fc238b8caf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 00:45:21 +0100
Subject: [PATCH 1277/2040] Use true/false rather than qtrue/qfalse

---
 code/fgame/actor.cpp | 143 +++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 80 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 8b10cc67..820bf2fc 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -3212,7 +3212,7 @@ void Actor::GetMoveInfo(mmove_t *mm)
                 m_Dest - Vector(0, 0, 16384),
                 (Entity *)NULL,
                 MASK_MOVEINFO,
-                qfalse,
+                false,
                 "Actor::GetMoveInfo"
             );
 
@@ -3744,7 +3744,7 @@ void Actor::DoMove(void)
     case ANIM_MODE_SCRIPTED:
         setAngles(angles + Vector(0, angular_delta, 0));
         trace = G_Trace(
-            origin, mins, maxs, origin + frame_delta, this, edict->clipmask & ~MASK_SCRIPT_SLAVE, qtrue, "Actor"
+            origin, mins, maxs, origin + frame_delta, this, edict->clipmask & ~MASK_SCRIPT_SLAVE, true, "Actor"
         );
         SafeSetOrigin(trace.endpos);
         velocity = frame_delta / level.frametime;
@@ -3956,7 +3956,7 @@ bool Actor::CanShoot(Entity *ent)
     Vector vGunPos;
 
     if (FriendlyInLineOfFire(ent)) {
-		// Added in 2.0
+        // Added in 2.0
         //  Check if a friend is in sight
         bCanShoot = false;
     } else if (ent->IsSubclassOfSentient()) {
@@ -3974,7 +3974,7 @@ bool Actor::CanShoot(Entity *ent)
                     this,
                     sen,
                     MASK_CANSEE,
-                    qfalse,
+                    false,
                     "Actor::CanShoot centroid"
                 )) {
                 bCanShoot = true;
@@ -3986,7 +3986,7 @@ bool Actor::CanShoot(Entity *ent)
                            this,
                            sen,
                            MASK_CANSEE,
-                           qfalse,
+                           false,
                            "Actor::CanShoot eyes"
                        )) {
                 bCanShoot = true;
@@ -4027,7 +4027,7 @@ bool Actor::CanSeeFrom(vec3_t pos, Entity *ent)
         return false;
     }
 
-    return G_SightTrace(pos, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, qfalse, "Actor::CanSeeFrom");
+    return G_SightTrace(pos, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, false, "Actor::CanSeeFrom");
 }
 
 /*
@@ -4300,14 +4300,14 @@ void Actor::ShowInfo(float fDot, float fDist)
 
         G_DebugLine(centroid, a, 0.0, 1.0, 0.0, 1.0);
 
-        G_DebugCircle(a, m_fLeash, 0.0, 1.0, 0.0, 1.0, qtrue);
+        G_DebugCircle(a, m_fLeash, 0.0, 1.0, 0.0, 1.0, true);
 
-        G_DebugCircle(centroid, m_fMinDistance, 1.0, 0.0, 0.0, 1.0, qtrue);
+        G_DebugCircle(centroid, m_fMinDistance, 1.0, 0.0, 0.0, 1.0, true);
 
-        G_DebugCircle(centroid, m_fMaxDistance, 0.0, 0.0, 1.0, 1.0, qtrue);
+        G_DebugCircle(centroid, m_fMaxDistance, 0.0, 0.0, 1.0, 1.0, true);
     } else if (g_entinfo->integer == 2) {
-        G_DebugCircle(centroid, m_fHearing, 1.0, 0.0, 0.0, 1.0, qtrue);
-        G_DebugCircle(centroid, m_fSight, 0.0, 0.0, 1.0, 1.0, qtrue);
+        G_DebugCircle(centroid, m_fHearing, 1.0, 0.0, 0.0, 1.0, true);
+        G_DebugCircle(centroid, m_fSight, 0.0, 0.0, 1.0, 1.0, true);
     }
 }
 
@@ -5057,7 +5057,7 @@ void Actor::HandlePain(Event *ev)
         //FIXME: macro
         SetCuriousAnimHint(7);
 
-		// Added in 2.30 the m_bIsCurous check
+        // Added in 2.30 the m_bIsCurous check
         if (m_bEnableEnemy && m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_IDLE && m_bIsCurious) {
             SetEnemyPos(attacker->origin);
             m_pszDebugState = "from_pain";
@@ -5394,7 +5394,8 @@ void Actor::MovePath(float fMoveSpeed)
         if (m_WallDir) {
             if (level.inttime >= m_iWallDodgeTimeout) {
                 m_WallDir = 0;
-            } else if (DotProduct2D(mm.desired_dir, m_PrevObstacleNormal) > 0 && CrossProduct2D(mm.desired_dir, m_PrevObstacleNormal) < 0) {
+            } else if (DotProduct2D(mm.desired_dir, m_PrevObstacleNormal) > 0
+                       && CrossProduct2D(mm.desired_dir, m_PrevObstacleNormal) < 0) {
                 m_iWallDodgeTimeout = level.inttime + 1000;
                 m_WallDir           = -m_WallDir;
             }
@@ -5653,7 +5654,7 @@ void Actor::EventDamagePuff(Event *ev)
 {
     Vector pos = ev->GetVector(1);
     Vector dir = ev->GetVector(2);
-    int      bulletbits;
+    int    bulletbits;
 
     // Fixed in OPM
     //  Large bullet flag normally take 2 bits since 2.0.
@@ -6213,7 +6214,7 @@ bool Actor::MoveToPatrolCurrentNode(void)
             IdleLook();
             Anim_Idle();
             // tell scripts the move has failed
-            parm.movefail = qtrue;
+            parm.movefail = true;
             return false;
         }
 
@@ -6603,15 +6604,7 @@ void Actor::DetectSmokeGrenades(void)
 
     if (fDistSquared > Square(256) || InFOV(sprite->origin)) {
         if (G_SightTrace(
-                eyePos,
-                vec_zero,
-                vec_zero,
-                sprite->origin,
-                this,
-                NULL,
-                MASK_CANSEE,
-                qfalse,
-                "Actor::DetectSmokeGrenades"
+                eyePos, vec_zero, vec_zero, sprite->origin, this, NULL, MASK_CANSEE, false, "Actor::DetectSmokeGrenades"
             )) {
             m_PotentialEnemies.ConfirmEnemy(this, sprite->owner);
         }
@@ -6703,12 +6696,12 @@ void Actor::EventSetAnim(Event *ev)
     int       slot   = 0;
     int       anim;
     const_str flagVal;
-    qboolean  flagged = qfalse;
+    qboolean  flagged = false;
 
     switch (ev->NumArgs()) {
     case 4:
         flagVal = ev->GetConstString(4);
-        flagged = qtrue;
+        flagged = true;
         if (flagVal != STRING_FLAGGED) {
             ScriptError("unknown keyword '%s', expected 'flagged'", Director.GetString(flagVal).c_str());
         }
@@ -6739,11 +6732,11 @@ void Actor::EventSetAnim(Event *ev)
     }
 
     if (!slot) {
-        flagged = qtrue;
+        flagged = true;
     }
 
     if (flagged) {
-        parm.motionfail = qtrue;
+        parm.motionfail = true;
     }
 
     if (!m_bLevelMotionAnim) {
@@ -6757,7 +6750,7 @@ void Actor::EventSetAnim(Event *ev)
         StartMotionAnimSlot(slot, anim, weight);
         if (flagged) {
             m_iMotionSlot   = GetMotionSlot(slot);
-            parm.motionfail = qfalse;
+            parm.motionfail = false;
         }
     }
 }
@@ -6771,10 +6764,10 @@ End action animation.
 */
 void Actor::EventEndActionAnim(Event *ev)
 {
-    parm.upperfail = qtrue;
+    parm.upperfail = true;
     if (!m_bLevelActionAnim) {
         ChangeActionAnim();
-        parm.upperfail = qfalse;
+        parm.upperfail = false;
     }
 }
 
@@ -6801,7 +6794,7 @@ void Actor::EventSetMotionAnim(Event *ev)
         UnknownAnim(Director.GetString(name), edict->tiki);
     }
 
-    parm.motionfail = qtrue;
+    parm.motionfail = true;
 
     if (!m_bLevelMotionAnim) {
         ChangeMotionAnim();
@@ -6812,7 +6805,7 @@ void Actor::EventSetMotionAnim(Event *ev)
         // set the slot
         m_iMotionSlot = GetMotionSlot(0);
 
-        parm.motionfail = qfalse;
+        parm.motionfail = false;
     }
 }
 
@@ -6850,7 +6843,7 @@ void Actor::EventSetAimMotionAnim(Event *ev)
         UnknownAnim(Director.GetString(name), edict->tiki);
     }
 
-    parm.motionfail = qtrue;
+    parm.motionfail = true;
 
     if (!m_bLevelMotionAnim) {
         ChangeMotionAnim();
@@ -6863,7 +6856,7 @@ void Actor::EventSetAimMotionAnim(Event *ev)
         StartAimMotionAnimSlot(2, anim_high);
 
         m_iMotionSlot   = GetMotionSlot(1);
-        parm.motionfail = qfalse;
+        parm.motionfail = false;
     }
 }
 
@@ -6914,7 +6907,7 @@ void Actor::EventSetActionAnim(Event *ev)
         UnknownAnim(derivedName, edict->tiki);
     }
 
-    parm.upperfail = qtrue;
+    parm.upperfail = true;
     if (!m_bLevelActionAnim) {
         ChangeActionAnim();
         m_bAimAnimSet    = true;
@@ -6925,7 +6918,7 @@ void Actor::EventSetActionAnim(Event *ev)
         StartAimAnimSlot(1, anim_forward);
         StartAimAnimSlot(2, anim_down);
         m_iActionSlot  = GetActionSlot(0);
-        parm.upperfail = qfalse;
+        parm.upperfail = false;
     }
 }
 
@@ -6980,13 +6973,16 @@ void Actor::EventSetUpperAnim(Event *ev)
         UnknownAnim(Director.GetString(name), edict->tiki);
     }
 
-    parm.upperfail = qtrue;
+    parm.upperfail = true;
+
     if (!m_bLevelActionAnim) {
         ChangeActionAnim();
         m_bActionAnimSet = true;
+
         StartActionAnimSlot(anim);
-        m_iActionSlot  = SimpleActor::GetActionSlot(0);
-        parm.upperfail = qfalse;
+        m_iActionSlot = GetActionSlot(0);
+
+        parm.upperfail = false;
     }
 }
 
@@ -7098,7 +7094,7 @@ void Actor::EventSetSayAnim(Event *ev)
     }
 
     name         = ev->GetConstString(1);
-    parm.sayfail = qtrue;
+    parm.sayfail = true;
     anim         = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
 
     if (anim == -1) {
@@ -7154,7 +7150,7 @@ void Actor::EventSetSayAnim(Event *ev)
         m_iSaySlot = GetSaySlot();
     }
 
-    parm.sayfail = qfalse;
+    parm.sayfail = false;
 }
 
 /*
@@ -7708,10 +7704,7 @@ void Actor::SetThinkState(eThinkState state, eThinkLevel level)
         m_csIdleMood = STRING_NERVOUS;
         map          = m_ThinkMap[THINKSTATE_ATTACK];
 
-        if (map != THINK_ALARM
-            && map != THINK_WEAPONLESS
-            && map != THINK_DOG_ATTACK
-            && !GetWeapon(WEAPON_MAIN)) {
+        if (map != THINK_ALARM && map != THINK_WEAPONLESS && map != THINK_DOG_ATTACK && !GetWeapon(WEAPON_MAIN)) {
             Com_Printf(
                 "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    forcing weaponless attack state.\n"
                 "^~^~^ Level designers should specify 'type_attack weaponless' for this guy.\n",
@@ -8144,8 +8137,8 @@ void Actor::EndState(int level)
 {
     GlobalFuncs_t *think;
 
-    think                 = &GlobalFuncs[m_Think[level]];
-    m_Think[level]        = THINK_VOID;
+    think          = &GlobalFuncs[m_Think[level]];
+    m_Think[level] = THINK_VOID;
 
     if (think->EndState) {
         (this->*think->EndState)();
@@ -8273,8 +8266,8 @@ void Actor::FixAIParameters(void)
     if (m_pTetherEnt) {
         fMinLeash = 64;
         if (m_pTetherEnt->IsSubclassOfEntity()) {
-            Entity* pEnt = static_cast<Entity*>(m_pTetherEnt.Pointer());
-            fMinLeash = pEnt->maxs[0] - pEnt->mins[1] + pEnt->maxs[1] - pEnt->mins[1];
+            Entity *pEnt = static_cast<Entity *>(m_pTetherEnt.Pointer());
+            fMinLeash    = pEnt->maxs[0] - pEnt->mins[1] + pEnt->maxs[1] - pEnt->mins[1];
         }
 
         if (m_fLeash < fMinLeash) {
@@ -8606,7 +8599,7 @@ bool Actor::PassesTransitionConditions_Disguise(void)
         this,
         player,
         MASK_TRANSITION,
-        qfalse,
+        false,
         "Actor::PassesTransitionConditions_Disguise"
     );
 }
@@ -9240,8 +9233,7 @@ void Actor::WeaponSound(int iType, vec3_t sound_origin, float fDistSquared, floa
         pEnemy = pOwner->m_Enemy;
     }
 
-    if (pOwner->m_Team == m_Team && !pEnemy && pOwner->IsSubclassOfActor()
-        && originator->IsSubclassOfWeapon()) {
+    if (pOwner->m_Team == m_Team && !pEnemy && pOwner->IsSubclassOfActor() && originator->IsSubclassOfWeapon()) {
         Actor  *pActor  = static_cast<Actor *>(pOwner);
         Weapon *pWeapon = static_cast<Weapon *>(originator);
 
@@ -9464,7 +9456,7 @@ void Actor::NotifySquadmateKilled(Sentient *pSquadMate, Sentient *pAttacker)
             this,
             pSquadMate,
             MASK_AI_CANSEE,
-            qfalse,
+            false,
             "Actor::NotifySquadmateKilled"
         );
     }
@@ -9647,7 +9639,7 @@ bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVe
         G_DebugLine(vFrom, vPoint1, 1.0, 0.5, 0.5, 1.0);
     }
 
-    if (!G_SightTrace(vFrom, mins, maxs, vPoint1, this, NULL, MASK_GRENADEPATH, qfalse, "Actor::ValidGrenadePath 1")) {
+    if (!G_SightTrace(vFrom, mins, maxs, vPoint1, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 1")) {
         return false;
     }
 
@@ -9660,9 +9652,7 @@ bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVe
         G_DebugLine(vPoint1, vPoint2, 1.0, 0.5, 0.5, 1.0);
     }
 
-    if (!G_SightTrace(
-            vPoint1, mins, maxs, vPoint2, this, NULL, MASK_GRENADEPATH, qfalse, "Actor::ValidGrenadePath 2"
-        )) {
+    if (!G_SightTrace(vPoint1, mins, maxs, vPoint2, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 2")) {
         return false;
     }
 
@@ -9682,16 +9672,14 @@ bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVe
     if (ai_debug_grenades->integer) {
         G_DebugLine(vPoint2, vPoint3, 1.0, 0.5, 0.5, 1.0);
     }
-    if (!G_SightTrace(
-            vPoint2, mins, maxs, vPoint3, this, NULL, MASK_GRENADEPATH, qfalse, "Actor::ValidGrenadePath 3"
-        )) {
+    if (!G_SightTrace(vPoint2, mins, maxs, vPoint3, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 3")) {
         return false;
     }
     if (ai_debug_grenades->integer) {
         G_DebugLine(vPoint3, vTo, 1.0, 0.5, 0.5, 1.0);
     }
 
-    trace = G_Trace(vPoint3, mins, maxs, vTo, this, MASK_GRENADEPATH, qfalse, "Actor::ValidGrenadePath 4");
+    trace = G_Trace(vPoint3, mins, maxs, vTo, this, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 4");
     if (!trace.allsolid) {
         if (!trace.ent) {
             return true;
@@ -10499,8 +10487,7 @@ bool Actor::CanMovePathWithLeash(void) const
     }
 
     VectorSub2D(origin, m_vHome, delta);
-    if (VectorLength2DSquared(delta) >= m_fLeashSquared
-        && DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
+    if (VectorLength2DSquared(delta) >= m_fLeashSquared && DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
         return false;
     }
 
@@ -10539,7 +10526,7 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
     static cvar_t  *aiScatterWide     = gi.Cvar_Get("g_aiScatterWide", "16.0", 0);
     static cvar_t  *aiScatterHeight   = gi.Cvar_Get("g_aiScatterHeight", "45.0", 0);
     static cvar_t  *aiRanges[4];
-    static qboolean doInit = qtrue;
+    static qboolean doInit = true;
     float           fAccuracy, fCoverFactor;
     Vector          aimDir;
 
@@ -10623,7 +10610,7 @@ Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t f
             vPos   = player->centroid;
 
             if (!G_SightTrace(
-                    GunPosition(), vec_zero, vec_zero, vPos, m_Enemy, this, MASK_CANSEE, qfalse, "Actor::GunTarget 1"
+                    GunPosition(), vec_zero, vec_zero, vPos, m_Enemy, this, MASK_CANSEE, false, "Actor::GunTarget 1"
                 )) {
                 fCoverFactor *= aifCoverFactor->value;
                 vPos = m_Enemy->EyePosition();
@@ -11157,9 +11144,9 @@ Actor::EventSound
 void Actor::EventSound(Event *ev)
 {
     if (g_gametype->integer == GT_SINGLE_PLAYER || m_Team == TEAM_AMERICAN) {
-        ProcessSoundEvent(ev, qtrue);
+        ProcessSoundEvent(ev, true);
     } else {
-        ProcessSoundEvent(ev, qfalse);
+        ProcessSoundEvent(ev, false);
     }
 }
 
@@ -11396,7 +11383,7 @@ void Actor::StrafeToAttack(float fDist, vec3_t vDir)
         return;
     }
 
-    if (!G_SightTrace(origin, mins, maxs, vSpot, this, NULL, MASK_TARGETPATH, qtrue, "Actor::StrafeToAttack 1")) {
+    if (!G_SightTrace(origin, mins, maxs, vSpot, this, NULL, MASK_TARGETPATH, true, "Actor::StrafeToAttack 1")) {
         ClearPath();
         return;
     }
@@ -11412,7 +11399,7 @@ void Actor::StrafeToAttack(float fDist, vec3_t vDir)
             this,
             m_Enemy,
             MASK_CANSEE,
-            qfalse,
+            false,
             "Actor::StrafeToAttack 1"
         )) {
         ClearPath();
@@ -11597,8 +11584,8 @@ void Actor::DontFaceWall(void)
 
     VectorSub2D(m_vDfwPos, origin, vDelta);
 
-    if (Square(fErrorLerp * -14.0 + 16.0) > VectorLength2DSquared(vDelta) &&
-        (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0
+    if (Square(fErrorLerp * -14.0 + 16.0) > VectorLength2DSquared(vDelta)
+        && (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0
             || fabs(AngleNormalize180(m_fDfwDerivedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0)) {
         if (AvoidingFacingWall()) {
             SetDesiredYaw(m_fDfwDerivedYaw);
@@ -11624,7 +11611,7 @@ void Actor::DontFaceWall(void)
     end.y      = start.y + fSinAngle * 64;
     end.z      = start.z;
 
-    trace = G_Trace(start, vec_zero, vec_zero, end, this, MASK_CANSEE, qfalse, "Actor::DontFaceWall");
+    trace = G_Trace(start, vec_zero, vec_zero, end, this, MASK_CANSEE, false, "Actor::DontFaceWall");
 
     if (trace.entityNum == ENTITYNUM_NONE || trace.fraction > 0.999f || trace.startsolid) {
         m_eDontFaceWallMode = 3;
@@ -12130,9 +12117,7 @@ void Actor::SetPathToNotBlockSentient(Sentient *pOther)
 
     vDest = origin + vPerp * 48;
 
-    if (G_SightTrace(
-            vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, qfalse, "Actor::SetPathToNotBlockSentient 1"
-        )) {
+    if (G_SightTrace(vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, false, "Actor::SetPathToNotBlockSentient 1")) {
         SetPathWithinDistance(vDest, NULL, 96, 0);
     }
 
@@ -12142,9 +12127,7 @@ void Actor::SetPathToNotBlockSentient(Sentient *pOther)
 
     vDest = origin - vPerp * 48;
 
-    if (G_SightTrace(
-            vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, qfalse, "Actor::SetPathToNotBlockSentient 2"
-        )) {
+    if (G_SightTrace(vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, false, "Actor::SetPathToNotBlockSentient 2")) {
         SetPathWithinDistance(vDest, NULL, 96, 0);
     }
 
@@ -12181,7 +12164,7 @@ void Actor::LookAround(float fFovAdd)
 
         VectorMA(vEyePos, 1024, vDest, vDest);
 
-        trace = G_Trace(EyePosition(), vec_zero, vec_zero, vDest, this, MASK_LOOK, qfalse, "Actor::LookAround");
+        trace = G_Trace(EyePosition(), vec_zero, vec_zero, vDest, this, MASK_LOOK, false, "Actor::LookAround");
         if (trace.fraction > 0.125) {
             m_bHasDesiredLookDest = true;
             VectorCopy(trace.endpos, m_vDesiredLookDest);

From bf68808eae125e3eb11eb25238ad64ee76fcca42 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 00:50:22 +0100
Subject: [PATCH 1278/2040] Set the skel index for each updated entity so poses
 only update when needed

This fixes poses being updated even if they don't need update (no frame changed), which resulted in some performance loss and some rare accuracy issues when AI fire weapons
---
 code/fgame/g_main.cpp | 78 +++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index e725ec3c..8de638c9 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -63,12 +63,12 @@ gentity_t free_edicts;
 int sv_numtraces   = 0;
 int sv_numpmtraces = 0;
 
-int             g_protocol = 0;
-target_game_e   g_target_game = target_game_e::TG_INVALID;
-gentity_t      *g_entities;
-qboolean        g_iInThinks     = 0;
-qboolean        g_bBeforeThinks = qfalse;
-static float    g_fMsecPerClock = 0;
+int           g_protocol    = 0;
+target_game_e g_target_game = target_game_e::TG_INVALID;
+gentity_t    *g_entities;
+qboolean      g_iInThinks     = 0;
+qboolean      g_bBeforeThinks = qfalse;
+static float  g_fMsecPerClock = 0;
 
 usercmd_t  *current_ucmd;
 usereyes_t *current_eyeinfo;
@@ -255,7 +255,7 @@ void G_InitGame(int levelTime, int randomSeed)
     G_Printf("gamename: %s\n", GAMEVERSION);
     G_Printf("gamedate: %s\n", __DATE__);
 
-    g_protocol = gi.Cvar_Get("com_protocol", "", 0)->integer;
+    g_protocol    = gi.Cvar_Get("com_protocol", "", 0)->integer;
     g_target_game = (target_game_e)gi.Cvar_Get("com_target_game", "0", 0)->integer;
 
     srand(randomSeed);
@@ -507,7 +507,7 @@ void G_RunFrame(int levelTime, int frameTime)
             assert(edict->inuse);
             assert(edict->entity);
 
-            Actor *actor = static_cast<Actor*>(edict->entity);
+            Actor *actor = static_cast<Actor *>(edict->entity);
             if (actor->IsSubclassOfActor()) {
                 actor->m_bUpdateAnimDoneFlags = false;
                 if (actor->m_bAnimating) {
@@ -750,13 +750,13 @@ for entities in a radius of 1000 units.
 */
 void G_ClientDrawTags(void)
 {
-    Entity* player;
-    Entity* ent;
-    const char* tagName;
-    Vector origin;
+    Entity       *player;
+    Entity       *ent;
+    const char   *tagName;
+    Vector        origin;
     orientation_t ori;
-    int numTags;
-    int i;
+    int           numTags;
+    int           i;
 
     if (!sv_showtags->string || !sv_showtags->string[0]) {
         return;
@@ -812,16 +812,18 @@ void G_ClientDrawTags(void)
 // so that G_Trace with tracedeep will set the location
 void G_UpdatePoseInternal(gentity_t *edict)
 {
-    if (edict->s.number == ENTITYNUM_NONE || level.frame_skel_index != level.skel_index[edict->s.number]) {
-        gi.TIKI_SetPoseInternal(
-            edict->tiki,
-            edict->s.number,
-            edict->s.frameInfo,
-            edict->s.bone_tag,
-            edict->s.bone_quat,
-            edict->s.actionWeight
-        );
+    if (edict->s.number != ENTITYNUM_NONE) {
+        if (level.skel_index[edict->s.number] == level.frame_skel_index) {
+            // no need to update
+            return;
+        }
+
+        level.skel_index[edict->s.number] = level.frame_skel_index;
     }
+
+    gi.TIKI_SetPoseInternal(
+        edict->tiki, edict->s.number, edict->s.frameInfo, edict->s.bone_tag, edict->s.bone_quat, edict->s.actionWeight
+    );
 }
 
 orientation_t G_TIKI_Orientation(gentity_t *edict, int num)
@@ -1279,7 +1281,9 @@ G_ArchiveLevel
 
 =================
 */
-qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, size_t *savedCgameStateSize, qboolean autosave, qboolean loading)
+qboolean G_ArchiveLevel(
+    const char *filename, byte **savedCgameState, size_t *savedCgameStateSize, qboolean autosave, qboolean loading
+)
 {
     try {
         int         i;
@@ -1328,7 +1332,7 @@ qboolean G_ArchiveLevel(const char *filename, byte** savedCgameState, size_t *sa
             *savedCgameStateSize = num;
 
             if (*savedCgameStateSize) {
-                *savedCgameState = (byte*)gi.Malloc(*savedCgameStateSize);
+                *savedCgameState = (byte *)gi.Malloc(*savedCgameStateSize);
             } else {
                 *savedCgameState = NULL;
             }
@@ -1506,7 +1510,7 @@ G_WriteLevel
 
 =================
 */
-void G_WriteLevel(const char *filename, qboolean autosave, byte** savedCgameState, size_t* savedCgameStateSize)
+void G_WriteLevel(const char *filename, qboolean autosave, byte **savedCgameState, size_t *savedCgameStateSize)
 {
     game.autosaved = autosave;
     G_ArchiveLevel(filename, savedCgameState, savedCgameStateSize, autosave, qfalse);
@@ -1528,7 +1532,7 @@ calling ReadLevel.
 No clients are connected yet.
 =================
 */
-qboolean G_ReadLevel(const char *filename, byte** savedCgameState, size_t* savedCgameStateSize)
+qboolean G_ReadLevel(const char *filename, byte **savedCgameState, size_t *savedCgameStateSize)
 {
     qboolean status;
 
@@ -1646,8 +1650,8 @@ G_ClientDoBlends
 */
 void G_ClientDoBlends(void)
 {
-    gentity_t* edict;
-    int i;
+    gentity_t *edict;
+    int        i;
 
     for (i = 0, edict = g_entities; i < game.maxclients; i++, edict++) {
         if (!edict->inuse || !edict->client || !edict->entity) {
@@ -1665,25 +1669,25 @@ FindIntermissionPoint
 */
 void FindIntermissionPoint(void)
 {
-    SimpleEntity* sent;
-    SimpleEntity* starget;
-    vec3_t dir;
+    SimpleEntity *sent;
+    SimpleEntity *starget;
+    vec3_t        dir;
 
-    sent = static_cast<SimpleEntity*>(G_FindClass(NULL, "info_player_intermission"));
+    sent = static_cast<SimpleEntity *>(G_FindClass(NULL, "info_player_intermission"));
     if (!sent) {
         level.m_intermission_origin = vec_zero;
-        level.m_intermission_angle = vec_zero;
+        level.m_intermission_angle  = vec_zero;
         return;
     }
 
     level.m_intermission_origin = sent->origin;
-    level.m_intermission_angle = sent->angles;
+    level.m_intermission_angle  = sent->angles;
 
     if (!sent->target.length()) {
         return;
     }
 
-    starget = static_cast<SimpleEntity*>(G_FindTarget(NULL, sent->Target()));
+    starget = static_cast<SimpleEntity *>(G_FindTarget(NULL, sent->Target()));
     if (!starget) {
         return;
     }

From 568efd4742d4a510ffd339787f110f08cff64126 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 19:05:16 +0100
Subject: [PATCH 1279/2040] Fix the link to the build branch

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8c834ae1..6c9627c5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # OpenMoHAA
 
-![Build](https://github.com/openmoh/openmohaa/actions/workflows/branches-build.yml/badge.svg?branch=main) [![Release](https://img.shields.io/github/v/release/openmoh/openmohaa)](https://github.com/openmoh/openmohaa/releases) [![Downloads](https://img.shields.io/github/downloads/openmoh/openmohaa/total)](https://github.com/openmoh/openmohaa/releases)
+[![Build](https://github.com/openmoh/openmohaa/actions/workflows/branches-build.yml/badge.svg?branch=main)](https://github.com/openmoh/openmohaa/actions/workflows/branches-build.yml) [![Release](https://img.shields.io/github/v/release/openmoh/openmohaa)](https://github.com/openmoh/openmohaa/releases) [![Downloads](https://img.shields.io/github/downloads/openmoh/openmohaa/total)](https://github.com/openmoh/openmohaa/releases)
 
 ![License](https://img.shields.io/github/license/openmoh/openmohaa) ![Commits](https://img.shields.io/github/commit-activity/t/openmoh/openmohaa)
 

From b6f8997a01a54c34abad6a32d02e35a4e5ceb032 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 20:17:07 +0100
Subject: [PATCH 1280/2040] Make the mark object local to the entity

---
 code/cgame/cg_marks.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 678da02d..716ca1e9 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -787,7 +787,23 @@ void CG_AssembleFinalMarks(
         iFirstNewGroup = 0;
 
         if (mf->iIndex < 0) {
-            VectorSubtract(pMark->pos, cg_entities[-mf->iIndex].lerpOrigin, pMark->pos);
+            centity_t *cent;
+            vec3_t pos;
+
+            cent = &cg_entities[-mf->iIndex];
+
+            VectorSubtract(pMark->pos, cent->lerpOrigin, pos);
+
+            if (cent->lerpAngles[0] || cent->lerpAngles[1] || cent->lerpAngles[2]) {
+                vec3_t axis[3];
+
+                // Fixed in OPM
+                //  Make the position completely local to the entity
+                AngleVectorsLeft(cent->lerpAngles, &axis[0], &axis[1], &axis[2]);
+                MatrixTransformVectorRight(axis, pos, pMark->pos);
+            } else {
+                VectorCopy(pos, pMark->pos);
+            }
         }
 
         pPoly = pMark->markPolys;

From 4d27a6daa3c08833561ba4e08624265a06273e86 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 20:55:03 +0100
Subject: [PATCH 1281/2040] Fix incorrect vert dist

---
 code/renderer/tr_marks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_marks.c b/code/renderer/tr_marks.c
index 8c15f000..6fdb7b74 100644
--- a/code/renderer/tr_marks.c
+++ b/code/renderer/tr_marks.c
@@ -924,7 +924,7 @@ int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, con
 
 	VectorCopy(vTransProjDir, normals[numPoints + 1]);
 	VectorInverse(normals[numPoints + 1]);
-	dists[numPoints + 1] = DotProduct(normals[numPoints + 1], vTransPoints[i]) - 20.f;
+	dists[numPoints + 1] = DotProduct(normals[numPoints + 1], vTransPoints[0]) - 20.f;
 
 	returnedPoints = 0;
 	returnedFragments = 0;

From aa118bceb31afe53daf7fed4860adecbed8d99f8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 20:59:58 +0100
Subject: [PATCH 1282/2040] Set the door speed based on the door type

---
 code/fgame/doors.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index ccbadb63..dd07741c 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -344,9 +344,6 @@ Door::Door()
 
     SetDoorType("wood");
 
-    traveltime = 1.0f;
-    speed      = 1.0f / traveltime;
-
     wait = (spawnflags & DOOR_TOGGLE) ? 0 : 3;
     dmg  = 0;
 
@@ -394,6 +391,14 @@ void Door::SetDoorType(str s)
     SetCloseEndSound("door_" + s + "_close_stop");
 
     SetLockedSound("door_" + s + "_locked");
+
+    if (s == "wood") {
+        traveltime = 1.0;
+    } else if (s == "metal") {
+        traveltime = 1.5;
+    }
+
+    speed = 1.0 / traveltime;
 }
 
 void Door::EventDoorType(Event *ev)

From 8fdfffab36f426886241a5c42e476b25cf763488 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:13:47 +0100
Subject: [PATCH 1283/2040] Keep the mouse cursor position when the client
 disconnects

---
 code/client/cl_main.cpp | 50 ++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 95c993d1..5e759a1e 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -910,6 +910,8 @@ This is also called on Com_Error and Com_Quit, so it shouldn't cause any errors
 =====================
 */
 void CL_Disconnect() {
+	int mouseX, mouseY;
+
 	if ( !com_cl_running || !com_cl_running->integer ) {
 		return;
 	}
@@ -945,8 +947,16 @@ void CL_Disconnect() {
 		CL_WritePacket();
 	}
 
+	// Fixed in OPM
+	//  Don't reset the mouse every time the client disconnects
+	mouseX = cl.mousex;
+	mouseY = cl.mousey;
+
 	CL_ClearState ();
 
+	cl.mousex = mouseX;
+	cl.mousey = mouseY;
+
 	// wipe the client connection
 	Com_Memset( &clc, 0, sizeof( clientConnection_t ) );
 
@@ -1199,28 +1209,32 @@ CL_Disconnect_f
 ==================
 */
 void CL_Disconnect_f( void ) {
-	if ( clc.state != CA_DISCONNECTED ) {
-		qboolean bConsoleState = UI_ConsoleIsOpen();
+	qboolean bConsoleState;
 
-        Com_Printf("\nDisconnected from server\n");
-        SV_Shutdown("Disconnected from server\n");
+	if ( clc.state == CA_DISCONNECTED ) {
+		return;
+	}
 
-        if (com_cl_running && com_cl_running->integer)
-        {
-            CL_AbnormalDisconnect();
-            CL_FlushMemory();
-            CL_StartHunkUsers(qfalse);
-			S_StopAllSounds2(1);
-            S_TriggeredMusic_PlayIntroMusic();
-        }
+	bConsoleState = UI_ConsoleIsOpen();
 
-        UI_FocusMenuIfExists();
+	Com_Printf("\nDisconnected from server\n");
+	SV_Shutdown("Disconnected from server\n");
 
-		if (bConsoleState) {
-			UI_OpenConsole();
-		} else {
-			UI_CloseConsole();
-		}
+	if (com_cl_running && com_cl_running->integer)
+	{
+		CL_AbnormalDisconnect();
+		CL_FlushMemory();
+		CL_StartHunkUsers(qfalse);
+		S_StopAllSounds2(1);
+		S_TriggeredMusic_PlayIntroMusic();
+	}
+
+	UI_FocusMenuIfExists();
+
+	if (bConsoleState) {
+		UI_OpenConsole();
+	} else {
+		UI_CloseConsole();
 	}
 }
 

From a509dd4692eab788e507126ec4fc1aa29bbea0f9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 22:25:49 +0100
Subject: [PATCH 1284/2040] Fix vehicle exit position when targeting the base
 game

The base game always uses, when specified, the exit position
---
 code/fgame/vehicle.cpp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 109f4e21..e5246f68 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -2038,7 +2038,7 @@ bool Vehicle::FindExitPosition(Entity *pEnt, const Vector& vOrigin, const Vector
         return false;
     }
 
-    if (!pEnt->IsSubclassOfPlayer() && vOrigin != vec_zero) {
+    if (g_target_game < target_game_e::TG_MOHTA || (!pEnt->IsSubclassOfPlayer() && vOrigin != vec_zero)) {
         if (vAngles) {
             pEnt->setAngles(*vAngles);
         }
@@ -4127,23 +4127,21 @@ void Vehicle::SlidePush(Vector vPush)
             if (j == i && other->entity) {
                 other->entity->CheckGround();
 
-                if (other->entity->groundentity) {
-                    if (other->entity->groundentity == edict
-                        || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity) {
-                        // save the entity
-                        pSkippedEntities[iNumSkipped]  = other->entity;
-                        iContentsEntities[iNumSkipped] = other->r.contents;
-                        solidEntities[iNumSkipped]     = other->solid;
-                        iNumSkipped++;
+                if (other->entity->groundentity && (other->entity->groundentity == edict
+                    || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity)) {
+                    // save the entity
+                    pSkippedEntities[iNumSkipped] = other->entity;
+                    iContentsEntities[iNumSkipped] = other->r.contents;
+                    solidEntities[iNumSkipped] = other->solid;
+                    iNumSkipped++;
 
-                        if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
-                            gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
-                            return;
-                        }
-
-                        other->entity->setSolidType(SOLID_NOT);
-                        iNumSkippedEntities++;
+                    if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
+                        gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                        return;
                     }
+
+                    other->entity->setSolidType(SOLID_NOT);
+                    iNumSkippedEntities++;
                 }
 
                 if (g_showvehiclemovedebug->integer) {

From 497058d7f46c84640524805729d19dd19cd42f45 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 22:28:19 +0100
Subject: [PATCH 1285/2040] Make the driver nonsolid while moving

---
 code/fgame/vehicle.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index e5246f68..7614b886 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4233,6 +4233,9 @@ void Vehicle::MoveVehicle(void)
     int          iNumSkippedEntities = 0;
     Event       *event               = nullptr;
     Entity      *chain;
+    Entity      *driverEnt = NULL;
+    solid_t     solidDriver = SOLID_NOT;
+    int         contentsDriver = 0;
 
     if (m_bMovementLocked) {
         return;
@@ -4252,6 +4255,19 @@ void Vehicle::MoveVehicle(void)
     if (velocity.length() > 0.5f) {
         Vector vVel;
 
+        if (driver.ent && driver.ent->edict->solid != SOLID_NOT) {
+            //
+            // Added in OPM
+            //  Make the driver nonsolid while moving.
+            //  Scripts usually set the player to nonsolid.
+            //  However some scripts still rely on the old 1.11 behavior
+            //  where the player is set to nonsolid when driving some type of vehicles
+            solidDriver = driver.ent->edict->solid;
+            contentsDriver = driver.ent->getContents();
+
+            driver.ent->setSolidType(SOLID_NOT);
+        }
+
         fSpeed   = orientation[0] * velocity;
         vecDelta = velocity * level.frametime;
 
@@ -4552,6 +4568,11 @@ void Vehicle::MoveVehicle(void)
         } else if (!bHitPerson) {
             velocity *= 0.5;
         }
+
+        if (solidDriver != SOLID_NOT) {
+            driver.ent->setSolidType(solidDriver);
+            driver.ent->setContents(contentsDriver);
+        }
     }
 
     if (bDoGravity) {

From c9b844b9ea8a00caf69c1527a80b52714aac4272 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 22:57:52 +0100
Subject: [PATCH 1286/2040] Count the number of loaded anims and don't return a
 valid animation definition if there are no loaded animations

---
 code/tiki/tiki_files.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index fc74a739..be83ddf6 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -876,6 +876,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
     byte       *max_ptr;
     dtikicmd_t *pcmds;
     int         i, k;
+    int         numLoadedAnims;
     size_t      j;
     size_t      size;
     //int anim_index;
@@ -963,6 +964,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
     assert(ptr <= max_ptr);
 
     // Process anim commands
+    numLoadedAnims = 0;
     for (i = 0; i < ld->numanims; i++) {
         anim = ld->loadanims[order[i]];
         if (!SkeletorCacheFindFilename(anim->name, &index)) {
@@ -973,6 +975,14 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
             }
 
             if (!SkeletorCacheLoadData(anim->name, bPrecache, index)) {
+                if (ld->hasSkel) {
+                    TIKI_DPrintf("^~^~^ TIKI_InitTiki: Couldn't load %s\n", ld->path);
+                    // Fixed in OPM
+                    //  The original game doesn't free the animation on error
+                    TIKI_Free(panim);
+                    return NULL;
+                }
+
                 TIKI_Error("TIKI_InitTiki: Failed to load animation '%s' at %s\n", anim->name, anim->location);
                 panim->m_aliases[i] = -1;
                 continue;
@@ -1067,10 +1077,12 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         }
 
         assert(ptr <= max_ptr);
+
+        numLoadedAnims++;
     }
 
     panim->m_aliases = NULL;
-    if (i) {
+    if (numLoadedAnims) {
         if (!bModelBoundsSet) {
             TIKI_DPrintf("TIKI_InitTiki: no 'idle' animation found, model bounds not set for %s\n", ld->path);
         }
@@ -1101,6 +1113,9 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         }
     } else {
         TIKI_Error("TIKI_InitTiki: No valid animations found in %s.\n", ld->path);
+        // Fixed in OPM
+        //  The original game doesn't free the animation on error
+        TIKI_Free(panim);
         panim = NULL;
     }
 

From 9e04f94625695b40f9ebf615c06b2d0cb7fc7e9f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 23:14:46 +0100
Subject: [PATCH 1287/2040] Check if the entity is valid after processing
 pending events during spawn

---
 code/fgame/g_spawn.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/fgame/g_spawn.cpp b/code/fgame/g_spawn.cpp
index 4eeda6de..6875eb29 100644
--- a/code/fgame/g_spawn.cpp
+++ b/code/fgame/g_spawn.cpp
@@ -316,12 +316,20 @@ Returns pointer to Entity
 
 Listener *SpawnArgs::Spawn(void)
 {
-    Listener *ent = (Listener *)SpawnInternal();
+    SafePtr<Listener> ent = (Listener *)SpawnInternal();
+	if (!ent) {
+		return NULL;
+	}
 
-    if (ent) {
-        ent->ProcessPendingEvents();
-        ent->ProcessEvent(EV_Entity_Start);
-    }
+	ent->ProcessPendingEvents();
+	if (!ent) {
+		// Fixed in OPM
+		//  Make sure to check the entity after processing events,
+		//  the ent could be deleted due to a posted remove event
+		return NULL;
+	}
+
+	ent->ProcessEvent(EV_Entity_Start);
 
     return ent;
 }

From 6fc71997197a9d58872dceb6a2767b950dbf59eb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 23:28:05 +0100
Subject: [PATCH 1288/2040] Register server sounds in multiplayer

---
 code/server/sv_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index a2a8f71e..5e773850 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -901,7 +901,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 
 		Hunk_SetMark();
 
-		if( com_dedicated->integer ) {
+		if( g_gametype->integer != GT_SINGLE_PLAYER ) {
 			ge->RegisterSounds();
 		}
 	}

From 48fa5c0ce65d1ffbe4260f74f5532b77dc7702f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 28 Oct 2024 23:29:04 +0100
Subject: [PATCH 1289/2040] Parse all scr files inside the ubersound folder

---
 code/fgame/g_main.cpp | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 8de638c9..31213065 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -851,35 +851,49 @@ qboolean G_TIKI_IsOnGround(gentity_t *edict, int num, float threshold)
 
 void G_PrepFrame(void) {}
 
-void G_RegisterSounds(void)
+void G_RegisterSoundsForFile(const char *name)
 {
     int startTime;
     int endTime;
 
-    Com_Printf("\n\n-----------PARSING UBERSOUND (SERVER)------------\n");
+    Com_Printf("\n\n-----------PARSING '%s' (SERVER)------------\n", name);
     Com_Printf(
         "Any SetCurrentTiki errors means that tiki wasn't prefetched and tiki-specific sounds for it won't work. To "
         "fix prefetch the tiki. Ignore if you don't use that tiki on this level.\n"
     );
 
     startTime = gi.Milliseconds();
-    G_Command_ProcessFile("ubersound/ubersound.scr", qfalse);
+    G_Command_ProcessFile(name, qfalse);
     endTime = gi.Milliseconds();
 
     Com_Printf("Parse/Load time: %f seconds.\n", (float)(endTime - startTime) / 1000.0);
-    Com_Printf("-------------UBERSOUND DONE (SERVER)---------------\n\n");
-    Com_Printf("\n\n-----------PARSING UBERDIALOG (SERVER)------------\n");
-    Com_Printf(
-        "Any SetCurrentTiki errors means that tiki wasn't prefetched and tiki-specific sounds for it won't work. To "
-        "fix prefetch the tiki. Ignore if you don't use that tiki on this level.\n"
-    );
+    Com_Printf("-------------PARSING '%s' DONE (SERVER)---------------\n\n", name);
+}
 
-    startTime = gi.Milliseconds();
-    G_Command_ProcessFile("ubersound/uberdialog.scr", qfalse);
-    endTime = gi.Milliseconds();
+int qsort_compare_strings(const void *s1, const void *s2)
+{
+    return Q_stricmp(*(const char **)s1, *(const char **)s2);
+}
 
-    Com_Printf("Parse/Load time: %f seconds.\n", (float)(endTime - startTime) / 1000.0);
-    Com_Printf("-------------UBERDIALOG DONE (SERVER)---------------\n\n");
+void G_RegisterSounds(void)
+{
+    char **fileList;
+    int    numFiles;
+    int    i;
+
+    fileList = gi.FS_ListFiles("ubersound/", "scr", qfalse, &numFiles);
+    qsort(fileList, numFiles, sizeof(char *), &qsort_compare_strings);
+
+    gi.GlobalAlias_Clear();
+
+    for (i = 0; i < numFiles; i++) {
+        // Added in 2.0
+        //  Since 2.0, all files in the ubersound folder
+        //  are parsed
+        G_RegisterSoundsForFile(va("ubersound/%s", fileList[i]));
+    }
+
+    gi.FS_FreeFileList(fileList);
 }
 
 void G_Restart(void)

From 9cd81330685901f0078a6e153f707a13feb8134b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 20:25:25 +0100
Subject: [PATCH 1290/2040] Fix the directory prefix when using filters for
 FS_ListFilteredFiles

---
 code/qcommon/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 7df3ebe8..515c5f8d 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -2418,7 +2418,7 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 					//
 					if (filter) {
 						if (zpathLen) {
-							strcpy(zpath, name + pathLength + 1);
+							strcpy(zpath, name + zpathLen + 1);
 						}
 						else {
 							strcpy(zpath, name);

From becf9f5d8ce1b1d9050c2aa47f31379df0781010 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 20:26:51 +0100
Subject: [PATCH 1291/2040] Cache the source position to improve the source
 search time

This greatly reduces the time to compile big scripts
---
 code/fgame/gamescript.cpp | 56 ++++++++++++++++++++++++++++++---------
 code/fgame/gamescript.h   | 29 +++++++++++++-------
 2 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 1ae83ab2..22a5bdc7 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -45,18 +45,44 @@ const_str AbstractScript::ConstFilename(void)
 
 bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column, int& line)
 {
+    size_t        posLine;
+    size_t        i;
+    size_t        start;
+    char         *p;
+    char          old_token;
+    sourceinfo_t *minCachedInfo = NULL;
+
     if (!m_SourceBuffer || sourcePos >= m_SourceLength) {
         return false;
     }
 
-    line        = 1;
-    column      = 0;
-    int posLine = 0;
+    line    = 1;
+    column  = 0;
+    posLine = 0;
+    start   = 0;
 
-    char *p = m_SourceBuffer;
-    char  old_token;
+    p = m_SourceBuffer;
 
-    for (int i = 0; i < sourcePos; i++, p++) {
+    if (sourcePos > 128) {
+        // Start caching above certain values
+
+        for (i = 0; i < ARRAY_LEN(cachedInfo); i++) {
+            sourceinfo_t *info = &cachedInfo[i];
+
+            if (sourcePos > info->sourcePos && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
+                minCachedInfo = info;
+            }
+        }
+
+        if (minCachedInfo) {
+            start  = minCachedInfo->sourcePos;
+            line   = minCachedInfo->line;
+            column = minCachedInfo->column;
+        }
+    }
+
+    for (i = start; i < sourcePos; i++) {
+        p = m_SourceBuffer + i;
         column++;
 
         if (*p == '\n') {
@@ -81,6 +107,11 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
 
     *p = old_token;
 
+    cachedInfo[cachedInfoIndex].sourcePos = sourcePos;
+    cachedInfo[cachedInfoIndex].line      = line;
+    cachedInfo[cachedInfoIndex].column    = column;
+    cachedInfoIndex                       = (cachedInfoIndex + 1) % ARRAY_LEN(cachedInfo);
+
     return true;
 }
 
@@ -158,9 +189,10 @@ void AbstractScript::PrintSourcePos(str sourceLine, int column, int line, bool d
 
 AbstractScript::AbstractScript()
 {
-    m_ProgToSource = NULL;
-    m_SourceBuffer = NULL;
-    m_SourceLength = 0;
+    m_ProgToSource  = NULL;
+    m_SourceBuffer  = NULL;
+    m_SourceLength  = 0;
+    cachedInfoIndex = 0;
 }
 
 StateScript::StateScript()
@@ -702,7 +734,7 @@ void GameScript::Load(const void *sourceBuffer, size_t sourceLength)
     if (nodeLength == 0) {
         // No code, assume success
         requiredStackSize = 0;
-        successCompile = true;
+        successCompile    = true;
         return;
     }
 
@@ -890,7 +922,7 @@ void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
     }
 }
 
-void ScriptThreadLabel::Execute(Listener* pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
+void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
 {
     if (!m_Script) {
         return;
diff --git a/code/fgame/gamescript.h b/code/fgame/gamescript.h
index f4fc1f6b..c1d6dfad 100644
--- a/code/fgame/gamescript.h
+++ b/code/fgame/gamescript.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -39,11 +39,17 @@ typedef struct {
     bool      isprivate; // new script engine implementation
 } script_label_t;
 
-typedef struct {
+struct sourceinfo_t {
     unsigned int sourcePos;
     int          column;
     int          line;
-} sourceinfo_t;
+
+    sourceinfo_t()
+        : sourcePos(0)
+        , column(0)
+        , line(0)
+    {}
+};
 
 class AbstractScript
 {
@@ -56,13 +62,16 @@ public:
     // Developper variable
     con_set<const uchar *, sourceinfo_t> *m_ProgToSource;
 
+    sourceinfo_t cachedInfo[16];
+    size_t       cachedInfoIndex;
+
 public:
     AbstractScript();
 
-    str     & Filename(void);
+    str&      Filename(void);
     const_str ConstFilename(void);
-    bool      GetSourceAt(size_t sourcePos, str *sourceLine, int     &column, int     &line);
-    bool      GetSourceAt(const unsigned char *sourcePos, str *sourceLine, int     &column, int     &line);
+    bool      GetSourceAt(size_t sourcePos, str *sourceLine, int& column, int& line);
+    bool      GetSourceAt(const unsigned char *sourcePos, str *sourceLine, int& column, int& line);
     void      PrintSourcePos(sourceinfo_t *sourcePos, bool dev);
     void      PrintSourcePos(size_t sourcePos, bool dev);
     void      PrintSourcePos(unsigned char *m_pCodePos, bool dev);
@@ -128,9 +137,9 @@ public:
     GameScript(const char *filename);
     ~GameScript();
 
-    void        Archive(Archiver       &arc);
+    void        Archive(Archiver& arc);
     static void Archive(Archiver& arc, GameScript *& scr);
-    void        ArchiveCodePos(Archiver       &arc, unsigned char **codePos);
+    void        ArchiveCodePos(Archiver& arc, unsigned char **codePos);
 
     void Close(void);
     void Load(const void *sourceBuffer, size_t sourceLength);
@@ -161,9 +170,9 @@ public:
 
     ScriptThread *Create(Listener *listener);
     void          Execute(Listener *listener = NULL);
-    void          Execute(Listener *listener, Event         &ev);
+    void          Execute(Listener *listener, Event& ev);
     void          Execute(Listener *listener, Event *ev);
-    void          Execute(Listener* pSelf, const SafePtr<Listener>         &listener, const SafePtr<Listener>         &param);
+    void          Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param);
 
     void Clear();
     void Set(const char *label);

From d3212c55a07c2decd13cca17ae04247af5dc61db Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 21:02:16 +0100
Subject: [PATCH 1292/2040] Properly parse and cache ubersounds, and don't
 cache resources that must be always loaded to avoid filling up sound indexes

---
 code/cgame/cg_commands.cpp  |  79 +++++++++++++++----------
 code/cgame/cg_main.c        |  86 +++++++++++++++++----------
 code/fgame/g_main.cpp       |   7 +++
 code/fgame/scriptmaster.cpp | 114 +++++++++++++++++++++++++++---------
 code/fgame/scriptmaster.h   |   1 -
 5 files changed, 196 insertions(+), 91 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 8629ae2a..6007e52f 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -4189,15 +4189,16 @@ void ClientGameCommandManager::CacheFont(Event *ev)
 //===============
 void AliasResource(dtiki_t *pmdl, const char *alias, const char *realname, const char *parameters)
 {
-    if (pmdl) {
-        if (!pmdl->a->alias_list) {
-            pmdl->a->alias_list = cgi.AliasList_New(pmdl->a->name);
-        }
-
-        cgi.Alias_ListAdd((AliasList_t *)pmdl->a->alias_list, alias, realname, parameters);
-    } else {
+    if (!pmdl) {
         cgi.Alias_Add(alias, realname, parameters);
+        return;
     }
+
+    if (!pmdl->a->alias_list) {
+        pmdl->a->alias_list = cgi.AliasList_New(pmdl->a->name);
+    }
+
+    cgi.Alias_ListAdd((AliasList_t*)pmdl->a->alias_list, alias, realname, parameters);
 }
 
 qboolean bLoadForMap(const char *psMapsBuffer, const char *name)
@@ -4258,19 +4259,32 @@ void ClientGameCommandManager::AliasCache(Event *ev)
     psMapsBuffer  = NULL;
 
     for (i = 3; i <= ev->NumArgs(); i++) {
-        if (!strcmp(ev->GetToken(i).c_str(), "maps")) {
+        str s = ev->GetString(i);
+
+        if (!s.icmp("maps")) {
             i++;
-            psMapsBuffer = ev->GetToken(i);
-        } else if (!strcmp(ev->GetToken(i).c_str(), "always")) {
-            bAlwaysLoaded = true;
-        } else {
-            strcat(parmbuffer, ev->GetToken(i));
-            strcat(parmbuffer, " ");
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
         }
+
+        if (!s.icmp("always")) {
+            bAlwaysLoaded = true;
+            continue;
+        }
+
+        strcat(parmbuffer, s);
+        strcat(parmbuffer, " ");
     }
 
-    if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1))) {
+    if (bAlwaysLoaded) {
         AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer);
+    }
+
+    if (bLoadForMap(psMapsBuffer, ev->GetString(1))) {
+        if (!bAlwaysLoaded) {
+            AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer);
+        }
+
         CacheResource(ev->GetString(2));
     }
 }
@@ -4300,28 +4314,33 @@ void ClientGameCommandManager::Alias(Event *ev)
     psMapsBuffer  = NULL;
 
     for (i = 3; i <= ev->NumArgs(); i++) {
-        if (!strcmp(ev->GetToken(i).c_str(), "maps")) {
+        str s = ev->GetString(i);
+
+        if (!s.icmp("maps")) {
             i++;
-            psMapsBuffer = ev->GetToken(i);
-        } else if (!strcmp(ev->GetToken(i).c_str(), "always")) {
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
+        }
+
+        if (!s.icmp("always")) {
             bAlwaysLoaded = true;
+        } else if (subtitle) {
+            strcat(parmbuffer, "\"");
+            strcat(parmbuffer, s);
+            strcat(parmbuffer, "\" ");
+
+            subtitle = 0;
         } else {
+            subtitle = s.icmp("subtitle") == 0;
+
             if (!subtitle) {
-                if (!Q_stricmp(ev->GetToken(i), "subtitle") || !Q_stricmp(ev->GetToken(i), "forcesubtitle")) {
-                    subtitle = qtrue;
-                    strcat(parmbuffer, ev->GetToken(i));
-                } else {
-                    strcat(parmbuffer, ev->GetToken(i));
-                }
-            } else {
-                strcat(parmbuffer, "\"");
-                strcat(parmbuffer, ev->GetToken(i));
-                strcat(parmbuffer, "\"");
-                subtitle = qfalse;
+                subtitle = s.icmp("forcesubtitle") == 0;
             }
 
-            strcat(parmbuffer, " ");
+            strcat(parmbuffer, s);
         }
+
+        strcat(parmbuffer, " ");
     }
 
     if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1))) {
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 30fdfd18..9fcc2c10 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -205,48 +205,72 @@ void CG_RegisterCvars(void)
     cgs.localServer = temp->integer;
 }
 
+/*
+================
+CG_RegisterSoundsForFile
+
+Register the specified ubersound source file
+================
+*/
+void CG_RegisterSoundsForFile(const char *name)
+{
+    int startTime;
+    int endTime;
+
+    Com_Printf("\n\n-----------PARSING '%s'------------\n", name);
+    Com_Printf(
+        "Any SetCurrentTiki errors means that tiki wasn't prefetched and tiki-specific sounds for it won't work. To "
+        "fix prefetch the tiki. Ignore if you don't use that tiki on this level.\n"
+    );
+
+    startTime = cgi.Milliseconds();
+    CG_Command_ProcessFile(name, qfalse, NULL);
+    endTime = cgi.Milliseconds();
+
+    Com_Printf("Parse/Load time: %f seconds.\n", (float)(endTime - startTime) / 1000.0);
+    Com_Printf("-------------PARSING '%s' DONE---------------\n\n", name);
+}
+
+/*
+=================
+qsort_compare_strings
+
+perform case-insensitive sorting
+=================
+*/
+int qsort_compare_strings(const void *s1, const void *s2)
+{
+    return Q_stricmp(*(const char **)s1, *(const char **)s2);
+}
+
 /*
 =================
 CG_RegisterSounds
 
-called during a precache command
+Called during a precache command
 =================
 */
 void CG_RegisterSounds(void)
 {
-    int  startTime;
-    int  endTime;
-    char filename[MAX_QPATH];
+    char **fileList;
+    int    numFiles;
+    int    i;
 
-    Com_Printf("\n\n-----------PARSING UBERSOUND------------\n");
-    Com_Printf(
-        "Any SetCurrentTiki errors means that tiki wasn't prefetched and "
-        "tiki-specific sounds for it won't work. To fix prefe"
-        "tch the tiki. Ignore if you don't use that tiki on this level.\n"
-    );
-    Com_sprintf(filename, sizeof(filename), "ubersound/ubersound.scr");
+    fileList = cgi.FS_ListFilteredFiles("ubersound/", "scr", "*.scr", qfalse, &numFiles, qtrue);
+    if (cgs.gametype != GT_SINGLE_PLAYER) {
+        cgi.Alias_Clear();
+    }
+    
+    qsort(fileList, numFiles, sizeof(char *), &qsort_compare_strings);
 
-    startTime = cgi.Milliseconds();
-    CG_Command_ProcessFile(filename, 0, 0);
-    endTime = cgi.Milliseconds();
+    for (i = 0; i < numFiles; i++) {
+        // Added in 2.0
+        //  Since 2.0, all files in the ubersound folder
+        //  are parsed
+        CG_RegisterSoundsForFile(va("ubersound/%s", fileList[i]));
+    }
 
-    Com_Printf("Parse/Load time: %f seconds.\n", (endTime - startTime) / 1000.0f);
-
-    Com_Printf("-------------UBERSOUND DONE---------------\n\n");
-    Com_Printf("\n\n-----------PARSING UBERDIALOG------------\n");
-    Com_Printf(
-        "Any SetCurrentTiki errors means that tiki wasn't prefetched and "
-        "tiki-specific sounds for it won't work. To fix prefe"
-        "tch the tiki. Ignore if you don't use that tiki on this level.\n"
-    );
-    Com_sprintf(filename, sizeof(filename), "ubersound/uberdialog.scr");
-
-    startTime = cgi.Milliseconds();
-    CG_Command_ProcessFile(filename, 0, 0);
-    endTime = cgi.Milliseconds() - startTime;
-
-    Com_Printf("Parse/Load time: %f seconds.\n", endTime / 1000.0f);
-    Com_Printf("-------------UBERDIALOG DONE---------------\n\n");
+    cgi.FS_FreeFileList(fileList);
 }
 
 /*
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 31213065..5ce64c2c 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -977,6 +977,7 @@ qboolean G_Command_ProcessFile(const char *filename, qboolean quiet)
     const char *bufstart;
     const char *token;
     int         numTokens = 0;
+    char        tempName[65];
 
     if (gi.FS_ReadFile(filename, (void **)&buffer, quiet) == -1) {
         return qfalse;
@@ -988,6 +989,9 @@ qboolean G_Command_ProcessFile(const char *filename, qboolean quiet)
 
     bufstart = buffer;
 
+    Com_sprintf(tempName, sizeof(tempName), "m%s", filename);
+    gi.LoadResource(tempName);
+
     while (1) {
         // grab each line as we go
         token = COM_ParseExt(&buffer, qtrue);
@@ -1024,6 +1028,9 @@ qboolean G_Command_ProcessFile(const char *filename, qboolean quiet)
 
     gi.FS_FreeFile((void *)bufstart);
 
+    Com_sprintf(tempName, sizeof(tempName), "o%s", filename);
+    gi.LoadResource(tempName);
+
     return qtrue;
 }
 
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index ce3fa48e..154e9d4a 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -440,24 +440,27 @@ static int bLoadForMap(char *psMapsBuffer, const char *name)
     return false;
 }
 
-void ScriptMaster::RegisterAliasInternal(Event *ev, bool bCache)
+void ScriptMaster::RegisterAliasAndCache(Event *ev)
 {
-    int   i;
-    char  parameters[MAX_STRING_CHARS];
-    char *psMapsBuffer;
-    int   subtitle;
-    bool  bAlwaysLoaded = false;
+    int      i;
+    char     parameters[MAX_STRING_CHARS];
+    char    *psMapsBuffer;
+    bool     bAlwaysLoaded = false;
+
+    if (ev->NumArgs() < 2) {
+        return;
+    }
 
     // Get the parameters for this alias command
 
     parameters[0] = 0;
-    subtitle      = 0;
     psMapsBuffer  = NULL;
 
     for (i = 3; i <= ev->NumArgs(); i++) {
         str s;
 
-        // MOHAA doesn't check that
+        // Added in OPM
+        //  MOHAA doesn't check that
         if (ev->IsListenerAt(i)) {
             Listener *l = ev->GetListener(i);
 
@@ -470,44 +473,97 @@ void ScriptMaster::RegisterAliasInternal(Event *ev, bool bCache)
             s = ev->GetString(i);
         }
 
-        if (subtitle) {
+        if (!s.icmp("maps")) {
+            i++;
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
+        }
+
+        if (!s.icmp("always")) {
+            bAlwaysLoaded = true;
+            continue;
+        }
+
+        strcat(parameters, s);
+        strcat(parameters, " ");
+    }
+
+    if (bAlwaysLoaded) {
+        gi.GlobalAlias_Add(ev->GetString(1), ev->GetString(2), parameters);
+    }
+
+    if (bLoadForMap(psMapsBuffer, ev->GetString(1))) {
+        if (!bAlwaysLoaded) {
+            gi.GlobalAlias_Add(ev->GetString(1), ev->GetString(2), parameters);
+        }
+
+        CacheResource(ev->GetString(2));
+    }
+}
+
+void ScriptMaster::RegisterAlias(Event *ev)
+{
+    int      i;
+    char     parameters[MAX_STRING_CHARS];
+    char    *psMapsBuffer;
+    qboolean subtitle;
+    bool     bAlwaysLoaded = false;
+
+    if (ev->NumArgs() < 2) {
+        return;
+    }
+
+    // Get the parameters for this alias command
+
+    parameters[0] = 0;
+    subtitle      = 0;
+    psMapsBuffer  = NULL;
+
+    for (i = 3; i <= ev->NumArgs(); i++) {
+        str s;
+
+        // Added in OPM
+        //  MOHAA doesn't check that
+        if (ev->IsListenerAt(i)) {
+            Listener *l = ev->GetListener(i);
+
+            if (l && l == Director.CurrentThread()) {
+                s = "local";
+            } else {
+                s = ev->GetString(i);
+            }
+        } else {
+            s = ev->GetString(i);
+        }
+
+        if (!s.icmp("maps")) {
+            i++;
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
+        }
+
+        if (!s.icmp("always")) {
+            bAlwaysLoaded = true;
+        } else if (subtitle) {
             strcat(parameters, "\"");
             strcat(parameters, s);
             strcat(parameters, "\" ");
 
             subtitle = 0;
-        } else if (!s.icmp("maps")) {
-            i++;
-            psMapsBuffer = (char *)ev->GetToken(i).c_str();
-        } else if (!s.icmp("always")) {
-            bAlwaysLoaded = true;
         } else {
             subtitle = s.icmp("subtitle") == 0;
 
             strcat(parameters, s);
-            strcat(parameters, " ");
         }
+
+        strcat(parameters, " ");
     }
 
     if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1))) {
         gi.GlobalAlias_Add(ev->GetString(1), ev->GetString(2), parameters);
-
-        if (bCache) {
-            CacheResource(ev->GetString(2));
-        }
     }
 }
 
-void ScriptMaster::RegisterAliasAndCache(Event *ev)
-{
-    RegisterAliasInternal(ev, true);
-}
-
-void ScriptMaster::RegisterAlias(Event *ev)
-{
-    RegisterAliasInternal(ev);
-}
-
 void ScriptMaster::Cache(Event *ev)
 {
 #ifdef GAME_DLL
diff --git a/code/fgame/scriptmaster.h b/code/fgame/scriptmaster.h
index 12a7708b..37fde801 100644
--- a/code/fgame/scriptmaster.h
+++ b/code/fgame/scriptmaster.h
@@ -82,7 +82,6 @@ protected:
     void        Cache(Event *ev);
     void        RegisterAliasAndCache(Event *ev);
     void        RegisterAlias(Event *ev);
-    void        RegisterAliasInternal(Event *ev, bool bCache = false);
 
 public:
     CLASS_PROTOTYPE(ScriptMaster);

From 2ce5e498aba1cf78a3228a6e29e5a38206d12b3a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 21:11:44 +0100
Subject: [PATCH 1293/2040] Use CurrentScriptThread() when getting the current
 script class

So if the current thread is NULL, it will properly throw an exception
---
 code/fgame/scriptmaster.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 154e9d4a..67ccfcce 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -835,7 +835,7 @@ void ScriptMaster::RemoveTiming(ScriptThread *thread)
 
 ScriptClass *ScriptMaster::CurrentScriptClass(void)
 {
-    return CurrentThread()->GetScriptClass();
+    return CurrentScriptThread()->GetScriptClass();
 }
 
 void ScriptMaster::CloseGameScript(void)
@@ -1099,7 +1099,6 @@ ScriptThread *ScriptMaster::CurrentThread(void)
 
 ScriptThread *ScriptMaster::CurrentScriptThread(void)
 {
-    assert(m_CurrentThread);
     if (!m_CurrentThread) {
         ScriptError("current thread is NULL");
     }

From c650af7b557d923cacc4af36367dc6b63e761b35 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 21:37:31 +0100
Subject: [PATCH 1294/2040] Fix stack corruption due to an improper assignment
 to the alias

---
 code/client/snd_openal_new.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index ec79300a..a0540e4c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3431,11 +3431,17 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
                 Q_strncpyz(file, load_path, sizeof(file));
                 Q_strcat(file, sizeof(file), args[1]);
             } else {
+                size_t len;
+
                 Q_strncpyz(file, load_path, sizeof(file));
                 Q_strcat(file, sizeof(file), args[1]);
 
-                Q_strncpyz(alias, args[0], strlen(args[0]) - 4);
-                file[strlen(args[0]) + MAX_RES_NAME * 2 - 4] = 0;
+                len = strlen(args[0]);
+                if (len >= 4) {
+                    Q_strncpyz(alias, args[0], len - 4);
+                } else {
+                    alias[0] = 0;
+                }
             }
 
             if (music_numsongs >= MAX_MUSIC_SONGS) {

From 22e7d1e2e48ebe707d92f2bd474cc52182b49594 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 22:27:22 +0100
Subject: [PATCH 1295/2040] Only put animation definitions that exist, rather
 than setting a NULL animation definition

This fixes issues when searching animations by name
---
 code/tiki/tiki_anim.cpp  | 6 +-----
 code/tiki/tiki_files.cpp | 7 +++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/code/tiki/tiki_anim.cpp b/code/tiki/tiki_anim.cpp
index 774336a9..11da77ec 100644
--- a/code/tiki/tiki_anim.cpp
+++ b/code/tiki/tiki_anim.cpp
@@ -108,11 +108,7 @@ int TIKI_Anim_NumForName(dtiki_t *pmdl, const char *name)
         iMiddle = (iBottom + iTop) / 2;
 
         panimdef = pmdl->a->animdefs[iMiddle];
-        if (!panimdef) {
-            iComp = -1;
-        } else {
-            iComp = stricmp(panimdef->alias, name);
-        }
+        iComp = stricmp(panimdef->alias, name);
 
         if (!iComp) {
             if (!(panimdef->flags & TAF_RANDOM)) {
diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index be83ddf6..b80a34c3 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -984,7 +984,6 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
                 }
 
                 TIKI_Error("TIKI_InitTiki: Failed to load animation '%s' at %s\n", anim->name, anim->location);
-                panim->m_aliases[i] = -1;
                 continue;
             }
         }
@@ -993,8 +992,8 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
         m_cachedData[alias_index].numusers++;
         panimdef = (dtikianimdef_t *)ptr;
         ptr += sizeof(dtikianimdef_t);
-        panim->animdefs[i]  = panimdef;
-        panim->m_aliases[i] = alias_index;
+        panim->animdefs[numLoadedAnims]  = panimdef;
+        panim->m_aliases[numLoadedAnims] = alias_index;
         Q_strncpyz(panimdef->alias, anim->alias, sizeof(panimdef->alias));
         panimdef->weight = anim->weight;
         panimdef->flags  = anim->flags;
@@ -1087,7 +1086,7 @@ dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
             TIKI_DPrintf("TIKI_InitTiki: no 'idle' animation found, model bounds not set for %s\n", ld->path);
         }
 
-        panim->num_anims = i;
+        panim->num_anims = numLoadedAnims;
         panim->m_aliases = (short *)TIKI_Alloc(panim->num_anims * sizeof(short));
         memcpy(panim->m_aliases, temp_aliases, panim->num_anims * sizeof(short));
         panim->modelData     = ptr;

From 5ba6c006c2fd5060e4f5ff6268c4f9a81ee64cf0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 30 Oct 2024 00:23:42 +0100
Subject: [PATCH 1296/2040] Fix compile error

---
 code/cgame/cg_marks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 716ca1e9..61bbd3cd 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -799,7 +799,7 @@ void CG_AssembleFinalMarks(
 
                 // Fixed in OPM
                 //  Make the position completely local to the entity
-                AngleVectorsLeft(cent->lerpAngles, &axis[0], &axis[1], &axis[2]);
+                AngleVectorsLeft(cent->lerpAngles, axis[0], axis[1], axis[2]);
                 MatrixTransformVectorRight(axis, pos, pMark->pos);
             } else {
                 VectorCopy(pos, pMark->pos);

From 0d01ea939da485c2382eb00c0aced87999831cf6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:25:15 +0100
Subject: [PATCH 1297/2040] Fix whole script file being printed sometimes on
 error

---
 code/fgame/gamescript.cpp | 10 ++++++----
 code/fgame/gamescript.h   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 22a5bdc7..1003def1 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -69,7 +69,7 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
         for (i = 0; i < ARRAY_LEN(cachedInfo); i++) {
             sourceinfo_t *info = &cachedInfo[i];
 
-            if (sourcePos > info->sourcePos && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
+            if (info->line && sourcePos > info->sourcePos && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
                 minCachedInfo = info;
             }
         }
@@ -78,6 +78,7 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
             start  = minCachedInfo->sourcePos;
             line   = minCachedInfo->line;
             column = minCachedInfo->column;
+            posLine = minCachedInfo->startLinePos;
         }
     }
 
@@ -107,9 +108,10 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
 
     *p = old_token;
 
-    cachedInfo[cachedInfoIndex].sourcePos = sourcePos;
-    cachedInfo[cachedInfoIndex].line      = line;
-    cachedInfo[cachedInfoIndex].column    = column;
+    cachedInfo[cachedInfoIndex].sourcePos    = sourcePos;
+    cachedInfo[cachedInfoIndex].line         = line;
+    cachedInfo[cachedInfoIndex].column       = column;
+    cachedInfo[cachedInfoIndex].startLinePos = posLine;
     cachedInfoIndex                       = (cachedInfoIndex + 1) % ARRAY_LEN(cachedInfo);
 
     return true;
diff --git a/code/fgame/gamescript.h b/code/fgame/gamescript.h
index c1d6dfad..a153fcfa 100644
--- a/code/fgame/gamescript.h
+++ b/code/fgame/gamescript.h
@@ -41,6 +41,7 @@ typedef struct {
 
 struct sourceinfo_t {
     unsigned int sourcePos;
+    unsigned int startLinePos;
     int          column;
     int          line;
 

From 4853235d86d71dd7679ce5723ef3673535676a8c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:42:15 +0100
Subject: [PATCH 1298/2040] Don't parse the token as a variable if the
 identifier only contains number

This fixes an issue where floats would be parsed as a variable after brackets
---
 code/parser/lex_source.txt | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 5596593a..8ce4dc17 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -204,23 +204,23 @@ varname		[a-zA-Z0-9_\"\$]+
 \\[\r\n]+						{ ; }
 "//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
 
-<VARIABLES>"size"				{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>[ ]*"."				{ YYLEX(TOKEN_PERIOD); }
-<VARIABLES>\"{string}\"			{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
-<VARIABLES>{varname}			{
-									TextValue(yytext, strlen(yytext));
-									YYLEX(TOKEN_IDENTIFIER);
-								}
-<VARIABLES>[ \t\r\n]			{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-								}
-<VARIABLES>.					{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-								}
+<VARIABLES>"size"					{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
+<VARIABLES>[ ]*\./([0-9]?[^0-9])	{ YYLEX(TOKEN_PERIOD); }
+<VARIABLES>\"{string}\"				{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
+<VARIABLES>{varname}				{
+										TextValue(yytext, strlen(yytext));
+										YYLEX(TOKEN_IDENTIFIER);
+									}
+<VARIABLES>[ \t\r\n]				{
+										BEGIN(INITIAL);
+										unput(yytext[yyleng - 1]);
+										yyreducepos(1);
+									}
+<VARIABLES>.						{
+										BEGIN(INITIAL);
+										unput(yytext[yyleng - 1]);
+										yyreducepos(1);
+									}
 								
 \"{string}\"					{ TextEscapeValue( yytext + 1, yyleng - 2 ); YYLEX( TOKEN_STRING ); }
 

From 74c8aa95f5bae8b92323b9e7c950804d14f4701a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 30 Oct 2024 23:21:05 +0100
Subject: [PATCH 1299/2040] Properly ignore single-digits

---
 code/parser/lex_source.txt | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 8ce4dc17..655de23f 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -204,23 +204,23 @@ varname		[a-zA-Z0-9_\"\$]+
 \\[\r\n]+						{ ; }
 "//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
 
-<VARIABLES>"size"					{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>[ ]*\./([0-9]?[^0-9])	{ YYLEX(TOKEN_PERIOD); }
-<VARIABLES>\"{string}\"				{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
-<VARIABLES>{varname}				{
-										TextValue(yytext, strlen(yytext));
-										YYLEX(TOKEN_IDENTIFIER);
-									}
-<VARIABLES>[ \t\r\n]				{
-										BEGIN(INITIAL);
-										unput(yytext[yyleng - 1]);
-										yyreducepos(1);
-									}
-<VARIABLES>.						{
-										BEGIN(INITIAL);
-										unput(yytext[yyleng - 1]);
-										yyreducepos(1);
-									}
+<VARIABLES>"size"							{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
+<VARIABLES>[ ]*\./([0-9]?[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
+<VARIABLES>\"{string}\"						{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
+<VARIABLES>{varname}						{
+												TextValue(yytext, strlen(yytext));
+												YYLEX(TOKEN_IDENTIFIER);
+											}
+<VARIABLES>[ \t\r\n]						{
+												BEGIN(INITIAL);
+												unput(yytext[yyleng - 1]);
+												yyreducepos(1);
+											}
+<VARIABLES>.								{
+												BEGIN(INITIAL);
+												unput(yytext[yyleng - 1]);
+												yyreducepos(1);
+											}
 								
 \"{string}\"					{ TextEscapeValue( yytext + 1, yyleng - 2 ); YYLEX( TOKEN_STRING ); }
 

From 0f3ffa267a51eb22a3f9304cbe8af1cbda8c7f3f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 01:22:38 +0100
Subject: [PATCH 1300/2040] Parse const array elements properly

---
 code/parser/bison_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index a4e1d4ce..c2e1cc36 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -281,7 +281,7 @@ const_array
 prim_expr
 	: nonident_prim_expr
 	| identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	| prim_expr TOKEN_DOUBLE_COLON const_array_list { $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2)); }
+	| const_array TOKEN_DOUBLE_COLON const_array_list { $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2)); }
 	;
 
 identifier_prim:

From 9ffb407d1130df8293204a0e43abb4531f8e9964 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 01:31:41 +0100
Subject: [PATCH 1301/2040] Fix incorrect/uninitialized token returned when
 there is a macro

---
 code/qcommon/tiki_script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/tiki_script.cpp b/code/qcommon/tiki_script.cpp
index e6954421..ad865b9b 100644
--- a/code/qcommon/tiki_script.cpp
+++ b/code/qcommon/tiki_script.cpp
@@ -802,7 +802,7 @@ const char *TikiScript::GetToken( qboolean crossline )
 				if( macro_start - i->token != 0 )
 					memcpy( temptoken, i->token, macro_start - i->token );
 
-				temptoken[ macro_start - i->token + 1 ] = 0;
+				temptoken[ macro_start - i->token ] = 0;
 				strcat( temptoken, subst );
 				if( *( macro_end + 1 ) )
 				{

From 4565b6a9a808a6eaacda2487d0f1d12c7c0280d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 01:45:37 +0100
Subject: [PATCH 1302/2040] Add cg_addhud and cg_removehud as whitelisted stuff
 commands

---
 code/cgame/cg_servercmds.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 2ef604d1..06fe5ac8 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -479,6 +479,8 @@ static const char *whiteListedCommands[] = {
     "popmenu",
     "wait",
     "globalwidgetcommand", // used for mods adding custom HUDs
+    "ui_addhud",
+    "ui_removehud",
     "tmstart",
     "tmstartloop",
     "tmstop",

From b4841a878b63bd19b4cb3b22f8268342cb3c62cd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:37:42 +0100
Subject: [PATCH 1303/2040] Only set the first found mark time and alpha fade

---
 code/cgame/cg_marks.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 61bbd3cd..961fbf58 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -425,7 +425,6 @@ void CG_FreeMarkObj(markObj_t *pMark)
     markPoly_t *pPoly;
     markPoly_t *pNextPoly;
 
-    pPoly = pMark->markPolys;
     for (pPoly = pMark->markPolys; pPoly; pPoly = pNextPoly) {
         pNextPoly = pPoly->nextPoly;
         CG_FreeMarkPoly(pPoly);
@@ -461,10 +460,12 @@ void CG_FreeBestMarkObj(qboolean bAllowFade)
 
     for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark) {
         if (!pMark->alphaFade || pMark->time > cg.time - 9000) {
-            pMark->time      = cg.time - 9000;
-            pMark->alphaFade = 1;
+            break;
         }
     }
+
+    pMark->time = cg.time - 9000;
+    pMark->alphaFade = qtrue;
 }
 
 /*
@@ -516,7 +517,10 @@ markObj_t *CG_AllocMark(int iNumPolys)
     pMark->prevMark                      = &cg_activeMarkObjs;
     cg_activeMarkObjs.nextMark->prevMark = pMark;
     cg_activeMarkObjs.nextMark           = pMark;
+
     cg_iNumFreeMarkObjs--;
+    assert(cg_iNumFreeMarkObjs >= 0);
+
     return pMark;
 }
 

From 858b27b809eb48a7a4074e6615022783db383b89 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:48:15 +0100
Subject: [PATCH 1304/2040] Handle the case where the legs or the torso state
 is NULL

---
 code/fgame/player.cpp | 56 ++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 00ebe5bb..7f09e0c6 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5319,15 +5319,31 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
 
         laststate_Torso = currentState_Torso;
 
-        if (forceTorso) {
-            currentState_Torso = forceTorso;
+        if (currentState_Torso) {
+            laststate_Torso = currentState_Torso;
+
+            if (forceTorso) {
+                currentState_Torso = forceTorso;
+            } else {
+                currentState_Torso = currentState_Torso->Evaluate(*this, &torso_conditionals);
+            }
         } else {
-            currentState_Torso = currentState_Torso->Evaluate(*this, &torso_conditionals);
+            // Added in 2.0
+            //  Switch to the default torso state if it's NULL
+            if (forceTorso) {
+                currentState_Torso = forceTorso;
+            } else {
+                currentState_Torso = statemap_Torso->FindState("STAND");
+            }
+
+            laststate_Torso = NULL;
         }
 
         if (currentState_Torso) {
-            // Process exit commands of the last state
-            laststate_Torso->ProcessExitCommands(this);
+            if (laststate_Torso) {
+                // Process exit commands of the last state
+                laststate_Torso->ProcessExitCommands(this);
+            }
 
             // Process entry commands of the new state
             currentState_Torso->ProcessEntryCommands(this);
@@ -5431,26 +5447,34 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                 }
             }
 
-            if (!laststate_Legs) {
-                if ((m_iMovePosFlags & MPF_POSITION_CROUCHING)) {
+            if (currentState_Legs) {
+                laststate_Legs = currentState_Legs;
+
+                if (forceLegs) {
+                    currentState_Legs = forceLegs;
+                } else {
+                    currentState_Legs = currentState_Legs->Evaluate(*this, &legs_conditionals);
+                }
+            } else {
+                // Added in 2.0
+                //  Switch to the default legs state if it's NULL
+                if (forceLegs) {
+                    currentState_Legs = forceLegs;
+                } else if ((m_iMovePosFlags & MPF_POSITION_CROUCHING)) {
                     currentState_Legs = statemap_Legs->FindState("CROUCH_IDLE");
                 } else {
                     currentState_Legs = statemap_Legs->FindState("STAND");
                 }
-            }
 
-            laststate_Legs = currentState_Legs;
-
-            if (forceLegs) {
-                currentState_Legs = forceLegs;
-            } else {
-                currentState_Legs = currentState_Legs->Evaluate(*this, &legs_conditionals);
+                laststate_Legs = NULL;
             }
 
             animdone_Legs = false;
             if (currentState_Legs) {
-                // Process exit commands of the last state
-                laststate_Legs->ProcessExitCommands(this);
+                if (laststate_Legs) {
+                    // Process exit commands of the last state
+                    laststate_Legs->ProcessExitCommands(this);
+                }
 
                 // Process entry commands of the new state
                 currentState_Legs->ProcessEntryCommands(this);

From 1e036a768944098a1a9e713532708290cc15862e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 19:49:05 +0100
Subject: [PATCH 1305/2040] Clear the torso and legs state when the movement
 type is set to portable turret

---
 code/fgame/player.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 7f09e0c6..e0d8920d 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5298,6 +5298,14 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
         return;
     }
 
+    if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
+        // Added in 2.0
+        //  Animations are handled hardcodedly
+        currentState_Torso = NULL;
+        currentState_Legs = NULL;
+        return;
+    }
+
     // Evaluate the current state.
     // When the state changes, we reevaluate the state so that if the
     // conditions aren't met in the new state, we don't play one frame of

From 1a18878f26a8ccb30acc68598c01c5191034cbc3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 22:16:20 +0100
Subject: [PATCH 1306/2040] Parse unary operators last when calling events

---
 code/parser/bison_source.txt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index c2e1cc36..b586ff46 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -125,6 +125,7 @@ int success_pos;
 %type <s.val> prim_expr
 %type <s.val> listener_identifier
 %type <s.val> nonident_prim_expr
+%type <s.val> nonident_prim_expr_base
 %type <s.val> const_array_list
 %type <s.val> const_array
 %type <s.val> identifier_prim
@@ -236,7 +237,7 @@ expr:
 
 func_prim_expr:
 	TOKEN_IDENTIFIER event_parameter_list_need { $$ = node3(ENUM_cmd_event_expr, $1, $2, TOKPOS(@1)); }
-	| nonident_prim_expr TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_expr, $1, $2, $3, TOKPOS(@2)); }
+	| nonident_prim_expr_base TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_expr, $1, $2, $3, TOKPOS(@2)); }
 	| TOKEN_NEG func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
 	| TOKEN_COMPLEMENT func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
 	| TOKEN_NOT func_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
@@ -299,6 +300,13 @@ listener_identifier
 	;
 
 nonident_prim_expr
+	: nonident_prim_expr_base
+	| TOKEN_NEG nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
+	| TOKEN_COMPLEMENT nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
+	| TOKEN_NOT nonident_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
+	;
+
+nonident_prim_expr_base
 	: TOKEN_DOLLAR listener_identifier { $$ = node3(ENUM_func1_expr, node1b(OP_UN_TARGETNAME), $2, TOKPOS(@1)); }
 	| nonident_prim_expr TOKEN_PERIOD identifier { $$ = node3(ENUM_field, $1, $3, TOKPOS(@3)); }
 	| nonident_prim_expr TOKEN_PERIOD TOKEN_SIZE { $$ = node3(ENUM_func1_expr, node1b(OP_UN_SIZE), $1, TOKPOS(@3)); }
@@ -310,9 +318,6 @@ nonident_prim_expr
 	| TOKEN_LISTENER { $$ = node2(ENUM_listener, $1, TOKPOS(@1)); }
 	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
 	| TOKEN_LEFT_BRACKET expr TOKEN_EOL TOKEN_RIGHT_BRACKET { $$ = $2; }
-	| TOKEN_NEG nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
-	| TOKEN_COMPLEMENT nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
-	| TOKEN_NOT nonident_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
 	| TOKEN_NULL { $$ = node1(ENUM_NULL, TOKPOS(@1)); }
 	| TOKEN_NIL { $$ = node1(ENUM_NIL, TOKPOS(@1)); }
 	;

From ce7005103c24b6e563d38c0e983d611a4ae58cba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 23:51:36 +0100
Subject: [PATCH 1307/2040] Handle the case where a vector is given for the
 face command

---
 code/fgame/player_util.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index f8a301a3..eda69045 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -608,7 +608,11 @@ void Player::EventJailEscape(Event* ev)
 
 void Player::EventFace(Event *ev)
 {
-    SetViewAngles(Vector(ev->GetFloat(1), ev->GetFloat(2), ev->GetFloat(3)));
+    if (ev->NumArgs() == 1) {
+        SetViewAngles(ev->GetVector(1));
+    } else {
+        SetViewAngles(Vector(ev->GetFloat(1), ev->GetFloat(2), ev->GetFloat(3)));
+    }
 }
 
 void Player::EventCoord(Event *ev)

From c795b2390e43d2b22519bb198746dd3599ed2b8d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 23:55:12 +0100
Subject: [PATCH 1308/2040] Add a ScriptMaster constructor

---
 code/fgame/scriptmaster.cpp | 4 ++++
 code/fgame/scriptmaster.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 67ccfcce..10e0ac26 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -734,6 +734,10 @@ ScriptThread *ScriptMaster::CreateScriptThread(ScriptClass *scriptClass, str lab
     }
 }
 
+ScriptMaster::ScriptMaster()
+{
+}
+
 void ScriptMaster::Reset(qboolean samemap)
 {
     ScriptClass_allocator.FreeAll();
diff --git a/code/fgame/scriptmaster.h b/code/fgame/scriptmaster.h
index 37fde801..28faef7f 100644
--- a/code/fgame/scriptmaster.h
+++ b/code/fgame/scriptmaster.h
@@ -86,6 +86,7 @@ protected:
 public:
     CLASS_PROTOTYPE(ScriptMaster);
 
+    ScriptMaster();
     virtual ~ScriptMaster();
 
     //

From 6ff92f0a7ef3b5326b06b91af861afd8771214b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 31 Oct 2024 23:57:18 +0100
Subject: [PATCH 1309/2040] Process the ubersound folder differently depending
 on the target version

- On 1.11 and below, the ubersound folder is parsed either only in dedicated server mode or in client-only mode
- On 2.0 and above, alias are cleared and the ubersound folder is always parsed in multiplayer on both client and server
---
 code/cgame/cg_main.c  | 12 ++++++++++--
 code/fgame/g_main.cpp | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 9fcc2c10..6b00d8e1 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -257,8 +257,16 @@ void CG_RegisterSounds(void)
     int    i;
 
     fileList = cgi.FS_ListFilteredFiles("ubersound/", "scr", "*.scr", qfalse, &numFiles, qtrue);
-    if (cgs.gametype != GT_SINGLE_PLAYER) {
-        cgi.Alias_Clear();
+    if (cg_target_game >= TG_MOHTA) {
+        // Fixed in 2.0
+        //  The behavior has changed, all aliases get cleared
+        if (cgs.gametype != GT_SINGLE_PLAYER) {
+            cgi.Alias_Clear();
+        }
+    } else {
+        if (!cgs.localServer) {
+            cgi.Alias_Clear();
+        }
     }
     
     qsort(fileList, numFiles, sizeof(char *), &qsort_compare_strings);
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 5ce64c2c..22bff8b4 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -291,6 +291,12 @@ void G_InitGame(int levelTime, int randomSeed)
     L_InitEvents();
 
     G_AllocGameData();
+
+    if (g_target_game < TG_MOHTA) {
+        // Added in OPM
+        //  This frees alias list to avoid filling up memory
+        gi.GlobalAlias_Clear();
+    }
 }
 
 /*
@@ -881,11 +887,17 @@ void G_RegisterSounds(void)
     int    numFiles;
     int    i;
 
+    if (g_target_game >= TG_MOHTA) {
+        gi.GlobalAlias_Clear();
+    } else if (!dedicated->integer) {
+        // In 1.11 and below, the entire ubersound folder is parsed
+        // only in dedicated mode
+        return;
+    }
+
     fileList = gi.FS_ListFiles("ubersound/", "scr", qfalse, &numFiles);
     qsort(fileList, numFiles, sizeof(char *), &qsort_compare_strings);
 
-    gi.GlobalAlias_Clear();
-
     for (i = 0; i < numFiles; i++) {
         // Added in 2.0
         //  Since 2.0, all files in the ubersound folder

From 32c39644747982a5bcc33e8967839b8d12ec224f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 1 Nov 2024 00:11:09 +0100
Subject: [PATCH 1310/2040] Fix the source line having the entire file

---
 code/fgame/gamescript.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 1003def1..ab115d79 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -89,7 +89,9 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
         if (*p == '\n') {
             line++;
             column  = 0;
-            posLine = i + 1;
+            if (i + 1 != sourcePos) {
+                posLine = i + 1;
+            }
         } else if (*p == '\0') {
             break;
         }

From f23dfa091e66697541690e749007fa5664f26bf7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:48:03 +0100
Subject: [PATCH 1311/2040] Fix wrong flag used for checking for PMF_NO_HUD

---
 code/cgame/cg_drawtools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index bc829cef..a1177a07 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -1217,7 +1217,7 @@ void CG_DrawCrosshair()
         return;
     }
 
-    if ((cg.snap->ps.pm_flags & PMF_NO_LEAN) || (cg.snap->ps.pm_flags & PMF_INTERMISSION)) {
+    if ((cg.snap->ps.pm_flags & PMF_NO_HUD) || (cg.snap->ps.pm_flags & PMF_INTERMISSION)) {
         return;
     }
 

From 5269fbb1fabeb91d0b0275858792ce3006f10a8f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 17:26:08 +0100
Subject: [PATCH 1312/2040] Don't set the accel flag for swarm FX

---
 code/cgame/cg_commands.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 6007e52f..ebc8bdbc 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -2846,7 +2846,9 @@ void ClientGameCommandManager::SetAccel(Event *ev)
     m_spawnthing->cgd.accel[1] = ev->GetFloat(2);
     m_spawnthing->cgd.accel[2] = ev->GetFloat(3);
 
-    m_spawnthing->cgd.flags2 |= T2_ACCEL;
+    if (!(m_spawnthing->cgd.flags & T_SWARM)) {
+        m_spawnthing->cgd.flags2 |= T2_ACCEL;
+    }
 }
 
 void ClientGameCommandManager::SetFriction(Event *ev)

From 84a2b4be766517c1ad6105b553f0eb378ae05314 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 17:51:44 +0100
Subject: [PATCH 1313/2040] Use cg_effect_physicsrate instead of a constant
 value

---
 code/cgame/cg_commands.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index ebc8bdbc..5d30e8e2 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -3077,7 +3077,7 @@ spawnthing_t *ClientGameCommandManager::InitializeSpawnthing(spawnthing_t *sp)
     sp->cgd.parent             = -1;
     sp->cgd.tiki               = nullptr;
     sp->cgd.lightstyle         = -1;
-    sp->cgd.physicsRate        = 10;
+    sp->cgd.physicsRate        = cg_effect_physicsrate->integer;
     sp->cgd.shadername         = "beamshader";
     sp->cgd.decal_orientation  = 0;
     sp->cgd.decal_radius       = 10;

From 0fda31b430838cddd4496589924c3dace7cdb4ce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 17:52:33 +0100
Subject: [PATCH 1314/2040] Fix radial velocity/circle effects not properly
 applying

---
 code/cgame/cg_tempmodels.cpp | 38 +++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index 2ae12c5d..e6b79d1e 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -936,7 +936,12 @@ void ClientGameCommandManager::AddTempModels(void)
         // time of this tempmodel
         lerpfrac = (float)(cg.time - p->lastPhysicsTime) / (float)physics_rate;
         // Clamp
-        lerpfrac = Q_clamp_float(lerpfrac, 0, 1);
+        if (lerpfrac > 1 || (p->cgd.flags2 & T2_PHYSICS_EVERYFRAME)) {
+            lerpfrac = 1;
+        }
+        if (lerpfrac < 0) {
+            lerpfrac = 0;
+        }
 
         // Increment the time this tempmodel has been alive
         p->aliveTime += frameTime;
@@ -1160,7 +1165,13 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             {
                 Vector dst;
                 // Create a circular shaped burst around the up vector
-                float angle = ((float)count / (float)m_spawnthing->count) * 360; // * M_PI * 2;
+                float angle;
+                
+                if (mcount == 1) {
+                    angle = random() * 360;
+                } else {
+                    angle = ((float)count / (float)m_spawnthing->count) * 360; // * M_PI * 2;
+                }
 
                 Vector end = Vector(vLeft) * m_spawnthing->sphereRadius * current_entity_scale;
                 RotatePointAroundVector(dst, Vector(vForward), end, angle);
@@ -1447,18 +1458,15 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             }
         }
 
-        // Calculate one tick of velocity based on time alive ( passed in )
-        p->cgd.origin = p->cgd.origin + (p->cgd.velocity * ((float)p->aliveTime / 1000.0f) * current_entity_scale);
-
-        if (p->cgd.flags2 & T2_ACCEL) {
+        if (m_spawnthing->cgd.flags2 & T2_RADIALVELOCITY) {
             float fLength;
 
             p->cgd.velocity = p->cgd.origin - start;
 
             fLength = p->cgd.velocity.length();
             if (fLength) {
-                float fVel = m_spawnthing->cgd.velocity.x
-                           + (m_spawnthing->cgd.velocity.y + m_spawnthing->cgd.velocity.z * crandom()) / fLength;
+                float fVel = m_spawnthing->cgd.velocity[0]
+                           + (m_spawnthing->cgd.velocity[1] + m_spawnthing->cgd.velocity[2] * random()) / fLength;
 
                 p->cgd.velocity *= fVel;
             }
@@ -1469,20 +1477,22 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
                 (m_spawnthing->randvel_base[i] + m_spawnthing->randvel_amplitude[i] * random()) * current_entity_scale;
 
             if (m_spawnthing->cgd.flags & T_RANDVELAXIS) {
-                p->cgd.velocity += fVel * Vector(m_spawnthing->tag_axis[i]);
+                if (p->cgd.flags2 & T2_NOTAGAXIS) {
+                    p->cgd.velocity += fVel * Vector(m_spawnthing->axis[i]);
+                } else {
+                    p->cgd.velocity += fVel * Vector(m_spawnthing->tag_axis[i]);
+                }
             } else {
                 p->cgd.velocity[i] += fVel;
             }
         }
 
         if (p->cgd.flags & (T_ALIGN | T_DETAIL)) {
-            if (p->cgd.velocity.x && p->cgd.velocity.y) {
-                p->cgd.angles = p->cgd.velocity.toAngles();
-            }
-
-            p->cgd.origin += p->cgd.velocity * (p->aliveTime / 1000.0) * current_entity_scale;
+            p->cgd.angles = p->cgd.velocity.toAngles();
         }
 
+        p->cgd.origin += p->cgd.velocity * (p->aliveTime / 1000.0) * current_entity_scale;
+
         if (p->cgd.flags & T_AUTOCALCLIFE) {
             Vector  end, delta;
             float   length, speed;

From 0796fab24bfc2054c763dfbc8d7375ceccd4e0d0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 18:06:56 +0100
Subject: [PATCH 1315/2040] Fix VSS sources not lerping at all

---
 code/cgame/cg_volumetricsmoke.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index b873e0d0..b4f900bc 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -748,7 +748,6 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
         pSource->newDensity = 0.0;
         if (m_spawnthing->cgd.flags & 1) {
             pSource->newRadius = RandomizeRange(m_spawnthing->cgd.scalemin, m_spawnthing->cgd.scalemax);
-            ;
             if (pSource->newRadius > 32.0) {
                 pSource->newRadius = 32.0;
             }
@@ -1241,7 +1240,7 @@ void ClientGameCommandManager::AddVSSSources()
             }
 
             if (mstime >= physics_rate || (pCurrent->flags2 & 0x10) != 0) {
-                if (!VSS_SourcePhysics(pCurrent, (float)mstime * 0.001)) {
+                if (!VSS_SourcePhysics(pCurrent, (float)mstime / 1000.0)) {
                     FreeVSSSource(pCurrent);
                     continue;
                 }
@@ -1265,26 +1264,18 @@ void ClientGameCommandManager::AddVSSSources()
             }
         }
 
-        fLerpFrac = (cg.time - pCurrent->lastPhysicsTime) / physics_rate;
-        if (fLerpFrac > 1.0) {
-            fLerpFrac = 1.0;
-        } else if (fLerpFrac < 0.0) {
-            fLerpFrac = 0.0;
-        }
+        fLerpFrac = (float)(cg.time - pCurrent->lastPhysicsTime) / (float)physics_rate;
+        fLerpFrac = Q_clamp_float(fLerpFrac, 0, 1);
 
-        fLightingFrac = (cg.time - pCurrent->lastLightingTime) / lighting_rate;
-        if (fLightingFrac > 1.0) {
-            fLightingFrac = 1.0;
-        } else if (fLightingFrac < 0.0) {
-            fLightingFrac = 0.0;
-        }
+        fLightingFrac = (float)(cg.time - pCurrent->lastLightingTime) / (float)lighting_rate;
+        fLightingFrac = Q_clamp_float(fLightingFrac, 0, 1);
 
         if (lastVSSFrameTime) {
             pCurrent->lifeTime += frameTime;
         }
 
         if (!pCurrent->lastValid) {
-            if (!VSS_SourcePhysics(pCurrent, (float)physics_rate * 0.001)) {
+            if (!VSS_SourcePhysics(pCurrent, (float)physics_rate / 1000)) {
                 ClientGameCommandManager::FreeVSSSource(pCurrent);
                 continue;
             }

From f3ecfd04dabe6d887418b07cb45348683a685a69 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 18:41:56 +0100
Subject: [PATCH 1316/2040] Use macro flags rather than constant values

---
 code/cgame/cg_volumetricsmoke.cpp | 44 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index b4f900bc..deaf7063 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -289,13 +289,13 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
 
     fWind = 0.0;
 
-    if ((pSource->flags2 & 5) != 0) {
+    if ((pSource->flags2 & (T2_ACCEL | T2_MOVE)) != 0) {
         VectorMA(pSource->velocity, ftime, pSource->repulsion, pSource->velocity);
     }
 
     pSource->lastOrigin = pSource->newOrigin;
 
-    if (pSource->flags & 0x800) {
+    if (pSource->flags & T_COLLISION) {
         trace.allsolid = qfalse;
         CG_ClipMoveToEntities(
             pSource->newOrigin, vec3_origin, vec3_origin, pSource->newOrigin, -1, MASK_VOLUMETRIC_SMOKE, &trace, qfalse
@@ -315,11 +315,11 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
         }
     }
 
-    if (pSource->flags2 & 5) {
+    if (pSource->flags2 & (T2_ACCEL | T2_MOVE)) {
         VectorMA(pSource->newOrigin, ftime, pSource->velocity, pSource->newOrigin);
     }
 
-    if (pSource->flags & 0x800) {
+    if (pSource->flags & T_COLLISION) {
         CG_Trace(
             &trace,
             pSource->lastOrigin,
@@ -363,7 +363,7 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
     }
 
     iSmokeType = abs(pSource->smokeType);
-    if (pSource->flags2 & 5) {
+    if (pSource->flags2 & (T2_ACCEL | T2_MOVE)) {
         VectorCopy(pSource->velocity, vVel);
 
         for (i = 0; i < 3; i++) {
@@ -624,7 +624,7 @@ qboolean VSS_LerpSource(cvssource_t *pCurrent, cvssourcestate_t *pState, float f
 {
     int i;
 
-    if (pCurrent->flags & 0xA0000) {
+    if (pCurrent->flags & (T_HARDLINK | T_PARENTLINK)) {
         Vector parentOrigin;
 
         for (i = 0; i < 3; i++) {
@@ -643,7 +643,7 @@ qboolean VSS_LerpSource(cvssource_t *pCurrent, cvssourcestate_t *pState, float f
 
         parentOrigin = e->origin;
         VectorAdd(pState->origin, parentOrigin, pState->origin);
-    } else if (pCurrent->flags2 & 5) {
+    } else if (pCurrent->flags2 & (T2_ACCEL | T2_MOVE)) {
         for (i = 0; i < 3; i++) {
             pState->origin[i] =
                 (pCurrent->newOrigin[i] - pCurrent->lastOrigin[i]) * fLerpFrac + pCurrent->lastOrigin[i];
@@ -746,7 +746,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
 
         pSource->startAlpha = (random() * 0.15 + 0.85) * fDensity;
         pSource->newDensity = 0.0;
-        if (m_spawnthing->cgd.flags & 1) {
+        if (m_spawnthing->cgd.flags & T_RANDSCALE) {
             pSource->newRadius = RandomizeRange(m_spawnthing->cgd.scalemin, m_spawnthing->cgd.scalemax);
             if (pSource->newRadius > 32.0) {
                 pSource->newRadius = 32.0;
@@ -776,16 +776,16 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
         pSource->roll      = anglemod(fAngle);
 
         if (random() < 0.5) {
-            pSource->flags |= 0x40000;
+            pSource->flags |= T_RANDOMROLL;
         }
 
         VectorCopy(m_spawnthing->axis[0], vNewForward);
-        if (m_spawnthing->cgd.flags & 4) {
+        if (m_spawnthing->cgd.flags & T_SPHERE) {
             VectorCopy(m_spawnthing->cgd.origin, pSource->newOrigin);
             do {
                 vNewForward = Vector(crandom(), crandom(), crandom());
             } while (Vector::Dot(vNewForward, vNewForward) < 1.0);
-        } else if (m_spawnthing->cgd.flags & 0x10) {
+        } else if (m_spawnthing->cgd.flags & T_CIRCLE) {
             if (m_spawnthing->sphereRadius != 0.0) {
                 Vector dst, end;
 
@@ -798,7 +798,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
 
                 fAngle += fAngleStep;
             }
-        } else if (m_spawnthing->cgd.flags & 8) {
+        } else if (m_spawnthing->cgd.flags & T_INWARDSPHERE) {
             Vector dir, end;
             do {
                 dir = Vector(crandom(), crandom(), crandom());
@@ -807,7 +807,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             end = m_spawnthing->cgd.origin + dir * m_spawnthing->sphereRadius;
             VectorCopy(end, pSource->newOrigin);
             vNewForward = dir * -1.0;
-        } else if (m_spawnthing->cgd.flags2 & 0x20000) {
+        } else if (m_spawnthing->cgd.flags2 & T2_CONE) {
             float fHeight, fRadius;
             float fAngle;
             float sina, cosa;
@@ -829,8 +829,6 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             VectorMA(m_spawnthing->cgd.origin, fRadius * cosa, m_spawnthing->axis[1], pSource->newOrigin);
             VectorMA(m_spawnthing->cgd.origin, fRadius * sina, m_spawnthing->axis[2], pSource->newOrigin);
         } else if (m_spawnthing->sphereRadius) {
-            VectorCopy(m_spawnthing->cgd.origin, pSource->newOrigin);
-        } else {
             Vector dir, end;
             do {
                 dir = Vector(crandom(), crandom(), crandom());
@@ -840,6 +838,8 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             end = m_spawnthing->cgd.origin + dir * m_spawnthing->sphereRadius;
             VectorCopy(end, pSource->newOrigin);
             vNewForward = dir;
+        } else {
+            VectorCopy(m_spawnthing->cgd.origin, pSource->newOrigin);
         }
 
         for (i = 0; i < 3; i++) {
@@ -873,7 +873,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
         for (i = 0; i < 3; ++i) {
             float fDist = m_spawnthing->axis_offset_base[i] + random() * m_spawnthing->axis_offset_amplitude[i];
 
-            if (pSource->flags2 & 0x80) {
+            if (pSource->flags2 & T2_PARALLEL) {
                 pSource->newOrigin += Vector(m_spawnthing->axis[i]) * fDist;
             } else {
                 pSource->newOrigin += Vector(m_spawnthing->tag_axis[i]) * fDist;
@@ -1224,13 +1224,13 @@ void ClientGameCommandManager::AddVSSSources()
         pComp = pCurrent->prev;
 
         newEnt.renderfx = 0;
-        if (pCurrent->flags < 0 && !cg_detail->integer) {
+        if ((pCurrent->flags & T_DETAIL) && !cg_detail->integer) {
             FreeVSSSource(pCurrent);
             continue;
         }
 
-        if ((pCurrent->flags2 & 0x4000) != 0) {
-            newEnt.renderfx = 0x4000000;
+        if ((pCurrent->flags2 & T2_ALWAYSDRAW) != 0) {
+            newEnt.renderfx = RF_ALWAYSDRAW;
         }
 
         if (pCurrent->lastPhysicsTime) {
@@ -1239,7 +1239,7 @@ void ClientGameCommandManager::AddVSSSources()
                 mstime = physics_rate;
             }
 
-            if (mstime >= physics_rate || (pCurrent->flags2 & 0x10) != 0) {
+            if (mstime >= physics_rate || (pCurrent->flags2 & T2_PHYSICS_EVERYFRAME) != 0) {
                 if (!VSS_SourcePhysics(pCurrent, (float)mstime / 1000.0)) {
                     FreeVSSSource(pCurrent);
                     continue;
@@ -1329,12 +1329,12 @@ void ClientGameCommandManager::AddVSSSources()
                         pCurrent->roll -= j;
                     }
 
-                    if ((pCurrent->flags & 0x40000) != 0) {
+                    if ((pCurrent->flags & T_RANDOMROLL) != 0) {
                         newEnt.hModel = hModel;
                     } else {
                         newEnt.hModel = hModel2;
                     }
-                } else if ((pCurrent->flags & 0x40000) != 0) {
+                } else if ((pCurrent->flags & T_RANDOMROLL) != 0) {
                     newEnt.hModel = hModel;
                 } else {
                     newEnt.hModel = hModel2;

From 3098fc98d3bed67ac10ebd228c5d5c90fde241b7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 19:01:05 +0100
Subject: [PATCH 1317/2040] Don't change the velocity for VSS, this was a
 mistake

---
 code/cgame/cg_volumetricsmoke.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index deaf7063..eeb6a3ce 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -880,8 +880,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             }
         }
 
-        pSource->velocity *= pSource->lifeTime / 1000.0;
-        pSource->newOrigin += pSource->velocity;
+        pSource->newOrigin += pSource->velocity * (pSource->lifeTime / 1000.0);
         if (vss_lighting_fps->integer) {
             cgi.R_GetLightingForSmoke(pSource->newLighting, pSource->newOrigin);
         }

From b8b17bb0c96e0c759dd46419d5ab3339dc06b5dd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 19:01:15 +0100
Subject: [PATCH 1318/2040] Implement VSS wind

---
 code/cgame/cg_tempmodels.cpp | 49 ++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index e6b79d1e..1a22c806 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -541,6 +541,7 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
     Vector  tempangles;
     trace_t trace;
     float   dot;
+    int     i;
 
     VectorCopy(p->ent.origin, p->lastEnt.origin);
     AxisCopy(p->ent.axis, p->lastEnt.axis);
@@ -656,9 +657,7 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
             p->cgd.velocity.x = Q_clamp_float(p->cgd.velocity.x, p->cgd.minVel.x, p->cgd.maxVel.x);
             p->cgd.velocity.y = Q_clamp_float(p->cgd.velocity.y, p->cgd.minVel.y, p->cgd.maxVel.y);
             p->cgd.velocity.z = Q_clamp_float(p->cgd.velocity.z, p->cgd.minVel.z, p->cgd.maxVel.z);
-        }
-
-        if (p->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
+        } else if (p->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
             Vector localVelocity;
             localVelocity.x = DotProduct(p->cgd.velocity, p->ent.axis[0]);
             localVelocity.y = DotProduct(p->cgd.velocity, p->ent.axis[1]);
@@ -673,8 +672,48 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
             p->cgd.velocity.z = DotProduct(localVelocity, p->ent.axis[2]);
         }
 
-        if (p->cgd.flags2 & T_ALIGN) {
-            // FIXME: vss wind
+        if (p->cgd.flags2 & T2_WIND_AFFECT) {
+            for (i = 0; i < 3; i++) {
+                float fWind;
+
+                switch (i) {
+                case 0:
+                    fWind = vss_wind_x->value;
+                    break;
+                case 1:
+                    fWind = vss_wind_y->value;
+                    break;
+                case 2:
+                    fWind = vss_wind_z->value;
+                    break;
+                }
+
+                if (fWind < 0) {
+                    if (p->cgd.velocity[i] > fWind) {
+                        p->cgd.velocity[i] -= ftime * vss_wind_strength->value;
+                        if (p->cgd.velocity[i] > fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    } else if (p->cgd.velocity[i] < fWind) {
+                        p->cgd.velocity[i] += ftime * vss_movement_dampen->value;
+                        if (p->cgd.velocity[i] < fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    }
+                } else {
+                    if (p->cgd.velocity[i] < fWind) {
+                        p->cgd.velocity[i] += ftime * vss_wind_strength->value;
+                        if (p->cgd.velocity[i] > fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    } else if (p->cgd.velocity[i] > fWind) {
+                        p->cgd.velocity[i] -= ftime * vss_wind_strength->value;
+                        if (p->cgd.velocity[i] < fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    }
+                }
+            }
         }
     } else {
         Vector normal;

From ae16994289f54a9b950b969ce8181135804af6b6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 19:46:32 +0100
Subject: [PATCH 1319/2040] Fix amplitude mistakenly being set instead of the
 base

---
 code/cgame/cg_commands.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 5d30e8e2..5889b026 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -1459,8 +1459,8 @@ void ClientGameCommandManager::SetBaseAndAmplitude(Event *ev, Vector& base, Vect
             base[j]      = ev->GetFloat(i++);
             amplitude[j] = ev->GetFloat(i++);
         } else {
-            base[j]      = 0.0;
-            amplitude[j] = atof(org.c_str());
+            base[j]      = atof(org.c_str());
+            amplitude[j] = 0.0;
         }
     }
 }

From e4b2c863d8d1a25d5cad10c84e8ba4a9851ee89c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 20:11:29 +0100
Subject: [PATCH 1320/2040] Fix angles not being set correctly from the base

---
 code/cgame/cg_tempmodels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index 1a22c806..af75f3ba 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -1463,7 +1463,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             p->cgd.avelocity[i] = m_spawnthing->avelocity_amplitude[i] * random() + m_spawnthing->avelocity_base[i];
 
             // Randomize angles or set absolute
-            p->cgd.angles[i] += random() * m_spawnthing->angles_amplitude[i];
+            p->cgd.angles[i] = m_spawnthing->angles_amplitude[i] * random() + m_spawnthing->cgd.angles[i];
         }
 
         // If forward velocity is set, just use that otherwise use random

From 23f9c1a1e676c53b7350e574891c0ab90540bb26 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 20:14:30 +0100
Subject: [PATCH 1321/2040] Only set the effect angles from the supplied angles
 if the spawnthing doesn't have angle set

---
 code/cgame/cg_specialfx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_specialfx.cpp b/code/cgame/cg_specialfx.cpp
index 48a0f6e6..48042803 100644
--- a/code/cgame/cg_specialfx.cpp
+++ b/code/cgame/cg_specialfx.cpp
@@ -512,7 +512,7 @@ void ClientSpecialEffectsManager::ExecuteEffect(
                 current_tiki   = NULL;
 
                 pCommand->emitter->cgd.origin = vPos;
-                if (pCommand->emitter->cgd.flags & T_ANGLES) {
+                if (!(pCommand->emitter->cgd.flags & T_ANGLES)) {
                     pCommand->emitter->cgd.angles = vAngles;
                 }
 

From 6e6dac0b7411339417b94b963b906d747e6009e5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 20:46:04 +0100
Subject: [PATCH 1322/2040] Proper formatting

---
 code/server/sv_ccmds.c | 815 +++++++++++++++++++----------------------
 1 file changed, 381 insertions(+), 434 deletions(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 8592f2bf..c8ccee36 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -23,9 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "server.h"
 
 #ifndef DEDICATED
-#  include "../client/client.h"
-#  include "../client/snd_local.h"
-#  include "../uilib/ui_public.h"
+#    include "../client/client.h"
+#    include "../client/snd_local.h"
+#    include "../uilib/ui_public.h"
 #endif
 
 /*
@@ -235,9 +235,9 @@ static void SV_Map_f( void ) {
 
 	Cvar_SaveGameRestart_f();
 
-    //
-    // in 2.0 and above, ignore training / mohaa mission maps
-    //
+	//
+	// in 2.0 and above, ignore training / mohaa mission maps
+	//
 	// FIXME: is this really necessary?
 	/*
 	if (com_target_game->integer != TG_MOH && g_gametype->integer == GT_SINGLE_PLAYER) {
@@ -677,7 +677,7 @@ static void SV_WriteBans(void)
 			curban = &serverBans[index];
 			
 			Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d\n",
-				    curban->isexception, NET_AdrToString(curban->ip), curban->subnet);
+					curban->isexception, NET_AdrToString(curban->ip), curban->subnet);
 			FS_Write(writebuf, strlen(writebuf), writeto);
 		}
 
@@ -1017,7 +1017,7 @@ static void SV_ListBans_f(void)
 			count++;
 
 			Com_Printf("Ban #%d: %s/%d\n", count,
-				    NET_AdrToString(ban->ip), ban->subnet);
+					NET_AdrToString(ban->ip), ban->subnet);
 		}
 	}
 	// List all exceptions
@@ -1029,7 +1029,7 @@ static void SV_ListBans_f(void)
 			count++;
 
 			Com_Printf("Except #%d: %s/%d\n", count,
-				    NET_AdrToString(ban->ip), ban->subnet);
+					NET_AdrToString(ban->ip), ban->subnet);
 		}
 	}
 }
@@ -1103,22 +1103,22 @@ SV_Status_f
 ================
 */
 static void SV_Status_f(void) {
-    int				i;
-    size_t			j, l;
-    client_t		*cl;
-    playerState_t	*ps;
-    const char*		s;
+	int				i;
+	size_t			j, l;
+	client_t		*cl;
+	playerState_t	*ps;
+	const char*		s;
 	const char		*colName[8];
 	size_t			len;
 	unsigned int	colSize[8];
-    int				ping;
-    char			padding[64];
+	int				ping;
+	char			padding[64];
 
-    // make sure server is running
-    if (!com_sv_running->integer) {
-        Com_Printf("Server is not running.\n");
-        return;
-    }
+	// make sure server is running
+	if (!com_sv_running->integer) {
+		Com_Printf("Server is not running.\n");
+		return;
+	}
 
 	//
 	// Added in OPM
@@ -1134,34 +1134,34 @@ static void SV_Status_f(void) {
 	colSize[1] = strlen(colName[1]);
 	colName[2] = "ping";
 	colSize[2] = strlen(colName[2]);
-    colName[3] = "name";
+	colName[3] = "name";
 	colSize[3] = 15;
 	colName[4] = "lastmsg";
 	colSize[4] = 7;
 	colName[5] = "address";
 	colSize[5] = 21;
-    colName[6] = "qport";
-    colSize[6] = 5;
-    colName[7] = "rate";
-    colSize[7] = 5;
+	colName[6] = "qport";
+	colSize[6] = 5;
+	colName[7] = "rate";
+	colSize[7] = 5;
 
 	//
 	// Find IPv6 clients and adjust the IP address column size
 	//
 
 	for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
-    {
+	{
 		if (cl->state == CS_FREE) {
 			continue;
 		}
 
-        if (cl->netchan.remoteAddress.type == NA_IP6) {
-            colSize[5] = 38;
+		if (cl->netchan.remoteAddress.type == NA_IP6) {
+			colSize[5] = 38;
 			break;
 		}
 	}
 
-    Com_Printf("map: %s\n", sv_mapname->string);
+	Com_Printf("map: %s\n", sv_mapname->string);
 
 	//
 	// Print column header name
@@ -1169,7 +1169,7 @@ static void SV_Status_f(void) {
 
 	for (i = 0; i < 8; i++) {
 		// Column name
-        len = strlen(colName[i]);
+		len = strlen(colName[i]);
 		Com_Printf("%s", colName[i]);
 
 		// Padding
@@ -1188,44 +1188,44 @@ static void SV_Status_f(void) {
 	// Print column header padding
 	//
 
-    for (i = 0; i < 8; i++) {
-        for (j = 0; j < (ARRAY_LEN(padding) - 1) && (j < colSize[i]); j++) {
-            padding[j] = '-';
-        }
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < (ARRAY_LEN(padding) - 1) && (j < colSize[i]); j++) {
+			padding[j] = '-';
+		}
 		padding[j] = 0;
 
 		Com_Printf("%s ", padding);
-    }
-    Com_Printf("\n");
+	}
+	Com_Printf("\n");
 
 	//
 	// Print values
 	//
 
-    for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
-    {
+	for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
+	{
 		if (cl->state == CS_FREE) {
 			continue;
 		}
 
-        Com_Printf("%*u ", colSize[0], i);
-        ps = SV_GameClientNum(i);
-        // su44: ps->persistant is not avaible in mohaa
-        //Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
-        Com_Printf("%*u ", colSize[1], ps->stats[STAT_KILLS]);
+		Com_Printf("%*u ", colSize[0], i);
+		ps = SV_GameClientNum(i);
+		// su44: ps->persistant is not avaible in mohaa
+		//Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
+		Com_Printf("%*u ", colSize[1], ps->stats[STAT_KILLS]);
 
-        if (cl->state == CS_CONNECTED)
-            Com_Printf("CNCT ");
-        else if (cl->state == CS_ZOMBIE)
-            Com_Printf("ZMBI ");
-        else
-        {
-            ping = cl->ping < 9999 ? cl->ping : 9999;
-            Com_Printf("%*u ", colSize[2], ping);
-        }
+		if (cl->state == CS_CONNECTED)
+			Com_Printf("CNCT ");
+		else if (cl->state == CS_ZOMBIE)
+			Com_Printf("ZMBI ");
+		else
+		{
+			ping = cl->ping < 9999 ? cl->ping : 9999;
+			Com_Printf("%*u ", colSize[2], ping);
+		}
 
-        Com_Printf("%s ", cl->name);
-        l = SV_Strlen(cl->name);
+		Com_Printf("%s ", cl->name);
+		l = SV_Strlen(cl->name);
 		if (l < colSize[3]) {
 			l = colSize[3] - l;
 			for (j = 0; j < l; j++) {
@@ -1233,10 +1233,10 @@ static void SV_Status_f(void) {
 			}
 		}
 
-        Com_Printf("%*u ", colSize[4], svs.time - cl->lastPacketTime);
+		Com_Printf("%*u ", colSize[4], svs.time - cl->lastPacketTime);
 
-        s = NET_AdrToString(cl->netchan.remoteAddress);
-        Com_Printf("%s ", s);
+		s = NET_AdrToString(cl->netchan.remoteAddress);
+		Com_Printf("%s ", s);
 
 		len = strlen(s);
 		if (len < colSize[5]) {
@@ -1246,13 +1246,13 @@ static void SV_Status_f(void) {
 			}
 		}
 
-        Com_Printf( "%*u", colSize[6], cl->netchan.qport );
+		Com_Printf( "%*u", colSize[6], cl->netchan.qport );
 
-        Com_Printf(" %*u", colSize[7], cl->rate);
+		Com_Printf(" %*u", colSize[7], cl->rate);
 
-        Com_Printf("\n");
-    }
-    Com_Printf("\n");
+		Com_Printf("\n");
+	}
+	Com_Printf("\n");
 }
 
 /*
@@ -1390,8 +1390,8 @@ static void SV_ConSayto_f(void) {
 
 	strcat(text, p);
 
-    Com_Printf("%s\n", text);
-    SV_SendServerCommand(saytocl, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
+	Com_Printf("%s\n", text);
+	SV_SendServerCommand(saytocl, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
 }
 
 
@@ -1637,51 +1637,51 @@ SV_AddOperatorCommands
 ==================
 */
 void SV_AddOperatorCommands(void) {
-    static qboolean	initialized;
+	static qboolean	initialized;
 
-    if (initialized) {
-        return;
-    }
-    initialized = qtrue;
+	if (initialized) {
+		return;
+	}
+	initialized = qtrue;
 
-    Cmd_AddCommand("heartbeat", SV_Heartbeat_f);
-    Cmd_AddCommand("kick", SV_Kick_f);
+	Cmd_AddCommand("heartbeat", SV_Heartbeat_f);
+	Cmd_AddCommand("kick", SV_Kick_f);
 #ifndef STANDALONE
-    if (!com_standalone->integer)
-    {
-        Cmd_AddCommand("banUser", SV_Ban_f);
-        Cmd_AddCommand("banClient", SV_BanNum_f);
-    }
+	if (!com_standalone->integer)
+	{
+		Cmd_AddCommand("banUser", SV_Ban_f);
+		Cmd_AddCommand("banClient", SV_BanNum_f);
+	}
 #endif
-    Cmd_AddCommand("kickall", SV_KickAll_f);
-    Cmd_AddCommand("kicknum", SV_KickNum_f);
-    Cmd_AddCommand("clientkick", SV_KickNum_f); // Legacy command
-    Cmd_AddCommand("status", SV_Status_f);
-    Cmd_AddCommand("serverinfo", SV_Serverinfo_f);
-    Cmd_AddCommand("systeminfo", SV_Systeminfo_f);
-    Cmd_AddCommand("dumpuser", SV_DumpUser_f);
-    Cmd_AddCommand("restart", SV_MapRestart_f);
-    Cmd_AddCommand("sectorlist", SV_SectorList_f);
-    Cmd_AddCommand("spmap", SV_Map_f);
-    Cmd_AddCommand("spdevmap", SV_Map_f);
-    Cmd_AddCommand("map", SV_Map_f);
-    Cmd_AddCommand("devmap", SV_Map_f);
-    Cmd_AddCommand("gamemap", SV_GameMap_f);
+	Cmd_AddCommand("kickall", SV_KickAll_f);
+	Cmd_AddCommand("kicknum", SV_KickNum_f);
+	Cmd_AddCommand("clientkick", SV_KickNum_f); // Legacy command
+	Cmd_AddCommand("status", SV_Status_f);
+	Cmd_AddCommand("serverinfo", SV_Serverinfo_f);
+	Cmd_AddCommand("systeminfo", SV_Systeminfo_f);
+	Cmd_AddCommand("dumpuser", SV_DumpUser_f);
+	Cmd_AddCommand("restart", SV_MapRestart_f);
+	Cmd_AddCommand("sectorlist", SV_SectorList_f);
+	Cmd_AddCommand("spmap", SV_Map_f);
+	Cmd_AddCommand("spdevmap", SV_Map_f);
+	Cmd_AddCommand("map", SV_Map_f);
+	Cmd_AddCommand("devmap", SV_Map_f);
+	Cmd_AddCommand("gamemap", SV_GameMap_f);
 
-    Cmd_AddCommand("killserver", SV_KillServer_f);
+	Cmd_AddCommand("killserver", SV_KillServer_f);
 #ifndef DEDICATED
-    Cmd_AddCommand("savegame", SV_Savegame_f);
-    Cmd_AddCommand("autosavegame", SV_Autosavegame_f);
-    Cmd_AddCommand("loadgame", SV_Loadgame_f);
-    Cmd_AddCommand("loadlastgame", SV_LoadLastGame_f);
+	Cmd_AddCommand("savegame", SV_Savegame_f);
+	Cmd_AddCommand("autosavegame", SV_Autosavegame_f);
+	Cmd_AddCommand("loadgame", SV_Loadgame_f);
+	Cmd_AddCommand("loadlastgame", SV_LoadLastGame_f);
 #endif
 
-    if (com_dedicated->integer) {
+	if (com_dedicated->integer) {
 		Cmd_AddCommand("say", SV_ConSay_f);
 		Cmd_AddCommand("tell", SV_ConTell_f);
 		Cmd_AddCommand("sayto", SV_ConSayto_f);
 		Cmd_SetCommandCompletionFunc("sayto", (completionFunc_t)SV_CompletePlayerName);
-    }
+	}
 
 	Cmd_AddCommand("rehashbans", SV_RehashBans_f);
 	Cmd_AddCommand("listbans", SV_ListBans_f);
@@ -1691,15 +1691,15 @@ void SV_AddOperatorCommands(void) {
 	Cmd_AddCommand("exceptdel", SV_ExceptDel_f);
 	Cmd_AddCommand("flushbans", SV_FlushBans_f);
 	
-    Cmd_AddCommand("difficultyEasy", SV_EasyMode_f);
-    Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
-    Cmd_AddCommand("difficultyHard", SV_HardMode_f);
+	Cmd_AddCommand("difficultyEasy", SV_EasyMode_f);
+	Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
+	Cmd_AddCommand("difficultyHard", SV_HardMode_f);
 
-    if (developer->integer) {
-        SV_MediumMode_f();
-    } else {
-        SV_EasyMode_f();
-    }
+	if (developer->integer) {
+		SV_MediumMode_f();
+	} else {
+		SV_EasyMode_f();
+	}
 }
 
 /*
@@ -1707,20 +1707,20 @@ void SV_AddOperatorCommands(void) {
 SV_RemoveOperatorCommands
 ==================
 */
-void SV_RemoveOperatorCommands( void ) {
+void SV_RemoveOperatorCommands(void) {
 #if 0
 	// removing these won't let the server start again
-	Cmd_RemoveCommand ("heartbeat");
-	Cmd_RemoveCommand ("kick");
-	Cmd_RemoveCommand ("banUser");
-	Cmd_RemoveCommand ("banClient");
-	Cmd_RemoveCommand ("status");
-	Cmd_RemoveCommand ("serverinfo");
-	Cmd_RemoveCommand ("systeminfo");
-	Cmd_RemoveCommand ("dumpuser");
-	Cmd_RemoveCommand ("map_restart");
-	Cmd_RemoveCommand ("sectorlist");
-	Cmd_RemoveCommand ("say");
+	Cmd_RemoveCommand("heartbeat");
+	Cmd_RemoveCommand("kick");
+	Cmd_RemoveCommand("banUser");
+	Cmd_RemoveCommand("banClient");
+	Cmd_RemoveCommand("status");
+	Cmd_RemoveCommand("serverinfo");
+	Cmd_RemoveCommand("systeminfo");
+	Cmd_RemoveCommand("dumpuser");
+	Cmd_RemoveCommand("map_restart");
+	Cmd_RemoveCommand("sectorlist");
+	Cmd_RemoveCommand("say");
 #endif
 }
 
@@ -1729,34 +1729,33 @@ void SV_RemoveOperatorCommands( void ) {
 SV_ArchiveHudDrawElements
 ==================
 */
-void SV_ArchiveHudDrawElements( qboolean loading )
+void SV_ArchiveHudDrawElements(qboolean loading)
 {
 #ifndef DEDICATED
 	int i;
 
-	for( i = 0; i < MAX_HUDDRAW_ELEMENTS; i++ )
-	{
-		ge->ArchiveString( cls.HudDrawElements[ i ].shaderName );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iX );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iY );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iWidth );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iHeight );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 0 ] );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 1 ] );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 2 ] );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 3 ] );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iHorizontalAlign );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iVerticalAlign );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].bVirtualScreen );
-		ge->ArchiveString( cls.HudDrawElements[ i ].fontName );
-		ge->ArchiveString( cls.HudDrawElements[ i ].string );
+	for (i = 0; i < MAX_HUDDRAW_ELEMENTS; i++) {
+		ge->ArchiveString(cls.HudDrawElements[i].shaderName);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iX);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iY);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iWidth);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iHeight);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[0]);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[1]);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[2]);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[3]);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iHorizontalAlign);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iVerticalAlign);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].bVirtualScreen);
+		ge->ArchiveString(cls.HudDrawElements[i].fontName);
+		ge->ArchiveString(cls.HudDrawElements[i].string);
 	}
 
-	if( loading ) {
-		if( cge ) {
+	if (loading) {
+		if (cge) {
 			cge->CG_RefreshHudDrawElements();
 		}
-    }
+	}
 #endif
 }
 
@@ -1765,16 +1764,16 @@ void SV_ArchiveHudDrawElements( qboolean loading )
 SV_HudDrawShader
 ==================
 */
-void SV_HudDrawShader( int iInfo, char *name )
+void SV_HudDrawShader(int iInfo, char *name)
 {
 #ifndef DEDICATED
-	Q_strncpyz( cls.HudDrawElements[ iInfo ].shaderName, name, sizeof(cls.HudDrawElements[ iInfo ].shaderName) );
-	cls.HudDrawElements[ iInfo ].string[ 0 ] = 0;
-	cls.HudDrawElements[ iInfo ].pFont = NULL;
-	cls.HudDrawElements[ iInfo ].fontName[ 0 ] = 0;
+	Q_strncpyz(cls.HudDrawElements[iInfo].shaderName, name, sizeof(cls.HudDrawElements[iInfo].shaderName));
+	cls.HudDrawElements[iInfo].string[0]   = 0;
+	cls.HudDrawElements[iInfo].pFont       = NULL;
+	cls.HudDrawElements[iInfo].fontName[0] = 0;
 
-	if( cge ) {
-		cge->CG_HudDrawShader( iInfo );
+	if (cge) {
+		cge->CG_HudDrawShader(iInfo);
 	}
 #endif
 }
@@ -1784,11 +1783,11 @@ void SV_HudDrawShader( int iInfo, char *name )
 SV_HudDrawAlign
 ==================
 */
-void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign )
+void SV_HudDrawAlign(int iInfo, int iHorizontalAlign, int iVerticalAlign)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].iHorizontalAlign = iHorizontalAlign;
-	cls.HudDrawElements[ iInfo ].iVerticalAlign = iVerticalAlign;
+	cls.HudDrawElements[iInfo].iHorizontalAlign = iHorizontalAlign;
+	cls.HudDrawElements[iInfo].iVerticalAlign   = iVerticalAlign;
 #endif
 }
 
@@ -1797,13 +1796,13 @@ void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign )
 SV_HudDrawRect
 ==================
 */
-void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight )
+void SV_HudDrawRect(int iInfo, int iX, int iY, int iWidth, int iHeight)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].iX = iX;
-	cls.HudDrawElements[ iInfo ].iY = iY;
-	cls.HudDrawElements[ iInfo ].iWidth = iWidth;
-	cls.HudDrawElements[ iInfo ].iHeight = iHeight;
+	cls.HudDrawElements[iInfo].iX      = iX;
+	cls.HudDrawElements[iInfo].iY      = iY;
+	cls.HudDrawElements[iInfo].iWidth  = iWidth;
+	cls.HudDrawElements[iInfo].iHeight = iHeight;
 #endif
 }
 
@@ -1812,10 +1811,10 @@ void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight )
 SV_HudDrawVirtualSize
 ==================
 */
-void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen )
+void SV_HudDrawVirtualSize(int iInfo, qboolean bVirtualScreen)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].bVirtualScreen = bVirtualScreen;
+	cls.HudDrawElements[iInfo].bVirtualScreen = bVirtualScreen;
 #endif
 }
 
@@ -1824,10 +1823,10 @@ void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen )
 SV_HudDrawColor
 ==================
 */
-void SV_HudDrawColor( int iInfo, vec3_t vColor )
+void SV_HudDrawColor(int iInfo, vec3_t vColor)
 {
 #ifndef DEDICATED
-	VectorCopy( vColor, cls.HudDrawElements[ iInfo ].vColor );
+	VectorCopy(vColor, cls.HudDrawElements[iInfo].vColor);
 #endif
 }
 
@@ -1836,10 +1835,10 @@ void SV_HudDrawColor( int iInfo, vec3_t vColor )
 SV_HudDrawAlpha
 ==================
 */
-void SV_HudDrawAlpha( int iInfo, float alpha )
+void SV_HudDrawAlpha(int iInfo, float alpha)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].vColor[ 3 ] = alpha;
+	cls.HudDrawElements[iInfo].vColor[3] = alpha;
 #endif
 }
 
@@ -1848,11 +1847,11 @@ void SV_HudDrawAlpha( int iInfo, float alpha )
 SV_HudDrawString
 ==================
 */
-void SV_HudDrawString( int iInfo, const char *string )
+void SV_HudDrawString(int iInfo, const char *string)
 {
 #ifndef DEDICATED
-	cls.HudDrawElements[ iInfo ].hShader = 0;
-	Q_strncpyz( cls.HudDrawElements[ iInfo ].string, string, sizeof(cls.HudDrawElements[iInfo].string) );
+	cls.HudDrawElements[iInfo].hShader = 0;
+	Q_strncpyz(cls.HudDrawElements[iInfo].string, string, sizeof(cls.HudDrawElements[iInfo].string));
 #endif
 }
 
@@ -1861,15 +1860,15 @@ void SV_HudDrawString( int iInfo, const char *string )
 SV_HudDrawFont
 ==================
 */
-void SV_HudDrawFont( int iInfo, const char *name )
+void SV_HudDrawFont(int iInfo, const char *name)
 {
 #ifndef DEDICATED
-	Q_strncpyz( cls.HudDrawElements[ iInfo ].fontName, name, sizeof(cls.HudDrawElements[iInfo].fontName) );
-	cls.HudDrawElements[ iInfo ].hShader = 0;
-	cls.HudDrawElements[ iInfo ].shaderName[ 0 ] = 0;
+	Q_strncpyz(cls.HudDrawElements[iInfo].fontName, name, sizeof(cls.HudDrawElements[iInfo].fontName));
+	cls.HudDrawElements[iInfo].hShader       = 0;
+	cls.HudDrawElements[iInfo].shaderName[0] = 0;
 
-	if( cge ) {
-		cge->CG_HudDrawFont( iInfo );
+	if (cge) {
+		cge->CG_HudDrawFont(iInfo);
 	}
 #endif
 }
@@ -1879,29 +1878,28 @@ void SV_HudDrawFont( int iInfo, const char *name )
 SV_ArchiveViewModelAnimation
 ==================
 */
-void SV_ArchiveViewModelAnimation( qboolean loading )
+void SV_ArchiveViewModelAnimation(qboolean loading)
 {
 #ifndef DEDICATED
-    int i;
+	int i;
 
-    for (i = 0; i < MAX_FRAMEINFOS; i++)
-    {
-        ge->ArchiveInteger(&cls.anim.g_VMFrameInfo[i].index);
-        ge->ArchiveFloat(&cls.anim.g_VMFrameInfo[i].time);
-        ge->ArchiveFloat(&cls.anim.g_VMFrameInfo[i].weight);
-    }
+	for (i = 0; i < MAX_FRAMEINFOS; i++) {
+		ge->ArchiveInteger(&cls.anim.g_VMFrameInfo[i].index);
+		ge->ArchiveFloat(&cls.anim.g_VMFrameInfo[i].time);
+		ge->ArchiveFloat(&cls.anim.g_VMFrameInfo[i].weight);
+	}
 
-    ge->ArchiveInteger(&cls.anim.g_iLastVMAnim);
-    ge->ArchiveInteger(&cls.anim.g_iLastVMAnimChanged);
-    ge->ArchiveInteger(&cls.anim.g_iCurrentVMAnimSlot);
-    ge->ArchiveInteger(&cls.anim.g_iCurrentVMDuration);
-    ge->ArchiveInteger(&cls.anim.g_bCrossblending);
-    ge->ArchiveInteger(&cls.anim.g_iLastEquippedWeaponStat);
-    ge->ArchiveString(cls.anim.g_szLastActiveItem);
-    ge->ArchiveInteger(&cls.anim.g_iLastAnimPrefixIndex);
-    ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[0]);
-    ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[1]);
-    ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[2]);
+	ge->ArchiveInteger(&cls.anim.g_iLastVMAnim);
+	ge->ArchiveInteger(&cls.anim.g_iLastVMAnimChanged);
+	ge->ArchiveInteger(&cls.anim.g_iCurrentVMAnimSlot);
+	ge->ArchiveInteger(&cls.anim.g_iCurrentVMDuration);
+	ge->ArchiveInteger(&cls.anim.g_bCrossblending);
+	ge->ArchiveInteger(&cls.anim.g_iLastEquippedWeaponStat);
+	ge->ArchiveString(cls.anim.g_szLastActiveItem);
+	ge->ArchiveInteger(&cls.anim.g_iLastAnimPrefixIndex);
+	ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[0]);
+	ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[1]);
+	ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[2]);
 #endif
 }
 
@@ -1910,11 +1908,11 @@ void SV_ArchiveViewModelAnimation( qboolean loading )
 SV_ArchiveStopwatch
 ==================
 */
-void SV_ArchiveStopwatch( qboolean loading )
+void SV_ArchiveStopwatch(qboolean loading)
 {
 #ifndef DEDICATED
-	ge->ArchiveSvsTime( &cls.stopwatch.iStartTime );
-	ge->ArchiveSvsTime( &cls.stopwatch.iEndTime );
+	ge->ArchiveSvsTime(&cls.stopwatch.iStartTime);
+	ge->ArchiveSvsTime(&cls.stopwatch.iEndTime);
 #endif
 }
 
@@ -1923,14 +1921,14 @@ void SV_ArchiveStopwatch( qboolean loading )
 SV_ArchivePersistantFile
 ==================
 */
-void SV_ArchivePersistantFile( qboolean loading )
+void SV_ArchivePersistantFile(qboolean loading)
 {
 #ifndef DEDICATED
 	const char *name;
 
-	Com_DPrintf( "SV_ArchivePersistantFile()\n" );
-	name = Com_GetArchiveFileName( svs.gameName, "spv" );
-	ge->ArchivePersistant( name, loading );
+	Com_DPrintf("SV_ArchivePersistantFile()\n");
+	name = Com_GetArchiveFileName(svs.gameName, "spv");
+	ge->ArchivePersistant(name, loading);
 #endif
 }
 
@@ -1939,12 +1937,12 @@ void SV_ArchivePersistantFile( qboolean loading )
 SV_ArchiveLevel
 ==================
 */
-void SV_ArchiveLevel( qboolean loading )
+void SV_ArchiveLevel(qboolean loading)
 {
 #ifndef DEDICATED
-	SV_ArchiveHudDrawElements( loading );
-	SV_ArchiveViewModelAnimation( loading );
-	SV_ArchiveStopwatch( loading );
+	SV_ArchiveHudDrawElements(loading);
+	SV_ArchiveViewModelAnimation(loading);
+	SV_ArchiveStopwatch(loading);
 #endif
 }
 
@@ -1956,45 +1954,40 @@ SV_ArchiveLevelFile
 qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
 {
 #ifndef DEDICATED
-    const char* name;
-    fileHandle_t f;
-    savegamestruct_t save;
-    soundsystemsavegame_t SSsave;
+	const char           *name;
+	fileHandle_t          f;
+	savegamestruct_t      save;
+	soundsystemsavegame_t SSsave;
 
-    Com_DPrintf("SV_ArchiveLevelFile()\n");
-    name = Com_GetArchiveFileName(svs.gameName, "sav");
-    if (loading)
-    {
-		if (!ge->ReadLevel(name, (byte**)&cls.savedCgameState, &cls.savedCgameStateSize)) {
+	Com_DPrintf("SV_ArchiveLevelFile()\n");
+	name = Com_GetArchiveFileName(svs.gameName, "sav");
+	if (loading) {
+		if (!ge->ReadLevel(name, (byte **)&cls.savedCgameState, &cls.savedCgameStateSize)) {
 			return qfalse;
-        }
+		}
 
-        name = Com_GetArchiveFileName(svs.gameName, "ssv");
-        FS_FOpenFileRead(name, &f, qfalse, qtrue);
-        if (f)
-        {
-            FS_Read(&save, sizeof(savegamestruct_t), f);
+		name = Com_GetArchiveFileName(svs.gameName, "ssv");
+		FS_FOpenFileRead(name, &f, qfalse, qtrue);
+		if (f) {
+			FS_Read(&save, sizeof(savegamestruct_t), f);
 			Com_SwapSaveStruct(&save);
-            if (save.version != SAVEGAME_STRUCT_VERSION)
-            {
-                FS_FCloseFile(f);
-                return qfalse;
-            }
+			if (save.version != SAVEGAME_STRUCT_VERSION) {
+				FS_FCloseFile(f);
+				return qfalse;
+			}
 
-            FS_Read(&SSsave, sizeof(soundsystemsavegame_t), f);
-            CM_ReadPortalState(f);
-            FS_FCloseFile(f);
-        }
-    }
-    else
-    {
+			FS_Read(&SSsave, sizeof(soundsystemsavegame_t), f);
+			CM_ReadPortalState(f);
+			FS_FCloseFile(f);
+		}
+	} else {
 		cls.savedCgameStateSize = cge->CG_SaveStateToBuffer(&cls.savedCgameState, svs.time);
-        ge->WriteLevel(name, autosave, (byte**)&cls.savedCgameState, &cls.savedCgameStateSize);
+		ge->WriteLevel(name, autosave, (byte **)&cls.savedCgameState, &cls.savedCgameStateSize);
 		Z_Free(cls.savedCgameState);
 		cls.savedCgameState = NULL;
-    }
+	}
 
-    return qtrue;
+	return qtrue;
 #else
 	return qfalse;
 #endif
@@ -2005,12 +1998,12 @@ qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
 S_Save
 ==================
 */
-void S_Save( fileHandle_t f )
+void S_Save(fileHandle_t f)
 {
 #ifndef DEDICATED
 	soundsystemsavegame_t save;
-	S_SaveData( &save );
-	FS_Write( &save, sizeof( soundsystemsavegame_t ), f );
+	S_SaveData(&save);
+	FS_Write(&save, sizeof(soundsystemsavegame_t), f);
 #endif
 }
 
@@ -2019,10 +2012,10 @@ void S_Save( fileHandle_t f )
 S_Load
 ==================
 */
-void S_Load( fileHandle_t f )
+void S_Load(fileHandle_t f)
 {
 #ifndef DEDICATED
-	FS_Read( &svs.soundSystem, sizeof( svs.soundSystem ), f );
+	FS_Read(&svs.soundSystem, sizeof(svs.soundSystem), f);
 	S_LoadData(&svs.soundSystem);
 #endif
 }
@@ -2032,108 +2025,99 @@ void S_Load( fileHandle_t f )
 SV_ArchiveServerFile
 ==================
 */
-qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
+qboolean SV_ArchiveServerFile(qboolean loading, qboolean autosave)
 {
 #ifndef DEDICATED
-	fileHandle_t f;
-	const char *name;
-	char comment[ 64 ];
+	fileHandle_t     f;
+	const char      *name;
+	char             comment[64];
 	savegamestruct_t save;
-	char cmdString[ 256 ];
-	time_t aclock;
+	char             cmdString[256];
+	time_t           aclock;
 
-	Com_DPrintf( "SV_ArchiveServerFile(%s)\n", autosave ? "true" : "false" );
+	Com_DPrintf("SV_ArchiveServerFile(%s)\n", autosave ? "true" : "false");
 	memset(&save, 0, sizeof(save));
-	name = Com_GetArchiveFileName( svs.gameName, "ssv" );
+	name = Com_GetArchiveFileName(svs.gameName, "ssv");
 
-	if( !loading )
-	{
-		f = FS_FOpenFileWrite( name );
-		if( !f )
-		{
-			Com_Printf( "Couldn't write %s\n", name );
+	if (!loading) {
+		f = FS_FOpenFileWrite(name);
+		if (!f) {
+			Com_Printf("Couldn't write %s\n", name);
 			return qfalse;
 		}
 
-		time( &aclock );
+		time(&aclock);
 
-		if( autosave )
-		{
-			Com_sprintf( comment, sizeof( comment ), "%s - Starting", sv.configstrings[ CS_MESSAGE ] );
-		}
-		else if( sv.configstrings[ CS_SAVENAME ] && *sv.configstrings[ CS_SAVENAME ] )
-		{
-			Com_sprintf( comment, sizeof( comment ), "%s - %s", sv.configstrings[ CS_MESSAGE ], sv.configstrings[ CS_SAVENAME ] );
-		}
-		else
-		{
-			Com_sprintf( comment, sizeof( comment ), "%s", sv.configstrings[ CS_MESSAGE ] );
-		}
-
-		if( strstr( name, "quick.ssv" ) ) {
-			Com_sprintf( save.comment, sizeof( save.comment ), "QuickSave - %s", comment );
+		if (autosave) {
+			Com_sprintf(comment, sizeof(comment), "%s - Starting", sv.configstrings[CS_MESSAGE]);
+		} else if (sv.configstrings[CS_SAVENAME] && *sv.configstrings[CS_SAVENAME]) {
+			Com_sprintf(
+				comment, sizeof(comment), "%s - %s", sv.configstrings[CS_MESSAGE], sv.configstrings[CS_SAVENAME]
+			);
 		} else {
-			Q_strncpyz( save.comment, comment, sizeof( save.comment ) );
+			Com_sprintf(comment, sizeof(comment), "%s", sv.configstrings[CS_MESSAGE]);
 		}
 
-		SV_SetConfigstring( CS_SAVENAME, "" );
+		if (strstr(name, "quick.ssv")) {
+			Com_sprintf(save.comment, sizeof(save.comment), "QuickSave - %s", comment);
+		} else {
+			Q_strncpyz(save.comment, comment, sizeof(save.comment));
+		}
+
+		SV_SetConfigstring(CS_SAVENAME, "");
 
 		save.version = SAVEGAME_STRUCT_VERSION;
-		save.type = com_target_game->integer;
-		save.flags = 0;
+		save.type    = com_target_game->integer;
+		save.flags   = 0;
 
 		save.time = aclock;
-		Q_strncpyz( save.mapName, svs.mapName, sizeof( save.mapName ) );
-		Q_strncpyz( save.saveName, svs.gameName, sizeof( save.saveName ) );
+		Q_strncpyz(save.mapName, svs.mapName, sizeof(save.mapName));
+		Q_strncpyz(save.saveName, svs.gameName, sizeof(save.saveName));
 		save.mapTime = svs.time - svs.startTime;
 
 		name = S_GetMusicFilename();
 		if (name) {
 			Q_strncpyz(save.tm_filename, name, sizeof(save.tm_filename));
-			save.tm_offset = S_GetMusicOffset();
+			save.tm_offset    = S_GetMusicOffset();
 			save.tm_loopcount = S_GetMusicLoopCount();
 		} else {
 			save.tm_filename[0] = 0;
-			save.tm_offset = 0;
-			save.tm_loopcount = 0;
+			save.tm_offset      = 0;
+			save.tm_loopcount   = 0;
 		}
 
 		Com_SwapSaveStruct(&save);
-		FS_Write( &save, sizeof( savegamestruct_t ), f );
-		S_Save( f );
-		CM_WritePortalState( f );
-		FS_FCloseFile( f );
+		FS_Write(&save, sizeof(savegamestruct_t), f);
+		S_Save(f);
+		CM_WritePortalState(f);
+		FS_FCloseFile(f);
 
-		name = Com_GetArchiveFileName( svs.gameName, "tga" );
-		Com_sprintf( cmdString, sizeof( cmdString ), "saveshot %s 256 256\n", name );
-		Cbuf_ExecuteText( svs.autosave ? EXEC_INSERT : EXEC_NOW, cmdString );
-	}
-	else
-	{
-		FS_FOpenFileRead( name, &f, qfalse, qtrue );
-		if( !f )
-		{
-			Com_Printf( "Couldn't read %s\n", name );
+		name = Com_GetArchiveFileName(svs.gameName, "tga");
+		Com_sprintf(cmdString, sizeof(cmdString), "saveshot %s 256 256\n", name);
+		Cbuf_ExecuteText(svs.autosave ? EXEC_INSERT : EXEC_NOW, cmdString);
+	} else {
+		FS_FOpenFileRead(name, &f, qfalse, qtrue);
+		if (!f) {
+			Com_Printf("Couldn't read %s\n", name);
 			return qfalse;
 		}
 
-        FS_Read(&save, sizeof(savegamestruct_t), f);
+		FS_Read(&save, sizeof(savegamestruct_t), f);
 		Com_SwapSaveStruct(&save);
-        if (save.version != SAVEGAME_STRUCT_VERSION)
-		{
+		if (save.version != SAVEGAME_STRUCT_VERSION) {
 			Com_Printf("Invalid or Old Server SaveGame Version\n");
 			return qfalse;
 		}
 
-		S_StopAllSounds2( qtrue );
-		S_Load( f );
-		Q_strncpyz( svs.mapName, save.mapName, sizeof( svs.mapName ) );
-		svs.mapTime = save.mapTime;
+		S_StopAllSounds2(qtrue);
+		S_Load(f);
+		Q_strncpyz(svs.mapName, save.mapName, sizeof(svs.mapName));
+		svs.mapTime               = save.mapTime;
 		svs.areabits_warning_time = 0;
-		Q_strncpyz( svs.tm_filename, save.tm_filename, sizeof( svs.tm_filename ) );
+		Q_strncpyz(svs.tm_filename, save.tm_filename, sizeof(svs.tm_filename));
 		svs.tm_loopcount = save.tm_loopcount;
-		svs.tm_offset = save.tm_offset;
-		FS_FCloseFile( f );
+		svs.tm_offset    = save.tm_offset;
+		FS_FCloseFile(f);
 	}
 
 	return qtrue;
@@ -2147,83 +2131,70 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 SV_Loadgame_f
 ==================
 */
-void SV_Loadgame_f( void )
+void SV_Loadgame_f(void)
 {
 #ifndef DEDICATED
-	int length;
+	int         length;
 	const char *name;
 	const char *archive_name;
-	qboolean bStartedGame;
+	qboolean    bStartedGame;
 
-	if( com_cl_running && com_cl_running->integer &&
-		clc.state != CA_DISCONNECTED && cg_gametype->integer ||
-		com_sv_running && com_sv_running->integer && g_gametype->integer )
-	{
-		Com_Printf( "Can't loadgame in a multiplayer game\n" );
+	if (com_cl_running && com_cl_running->integer && clc.state != CA_DISCONNECTED && cg_gametype->integer
+		|| com_sv_running && com_sv_running->integer && g_gametype->integer) {
+		Com_Printf("Can't loadgame in a multiplayer game\n");
 		return;
 	}
 
-	Cvar_Set( "g_gametype", "0" );
-	Cvar_Set( "sv_maxclients", "1" );
-	Cvar_Get( "g_gametype", "0", CVAR_LATCH | CVAR_SERVERINFO );
-	Cvar_Get( "sv_maxclients", "0", CVAR_LATCH | CVAR_SERVERINFO );
+	Cvar_Set("g_gametype", "0");
+	Cvar_Set("sv_maxclients", "1");
+	Cvar_Get("g_gametype", "0", CVAR_LATCH | CVAR_SERVERINFO);
+	Cvar_Get("sv_maxclients", "0", CVAR_LATCH | CVAR_SERVERINFO);
 
-	if( developer->integer )
-	{
-		if( svs.iNumClients == 1 )
-		{
-			Cvar_Set( "cheats", "1" );
-		}
-		else
-		{
-			Cvar_Set( "cheats", "0" );
+	if (developer->integer) {
+		if (svs.iNumClients == 1) {
+			Cvar_Set("cheats", "1");
+		} else {
+			Cvar_Set("cheats", "0");
 		}
 	}
 
-	if( sv.state == SS_LOADING || sv.state == SS_LOADING2 )
-	{
-		Com_Printf( "Can't load game when loading\n" );
+	if (sv.state == SS_LOADING || sv.state == SS_LOADING2) {
+		Com_Printf("Can't load game when loading\n");
 		return;
 	}
 
-	if( Cmd_Argc() != 2 )
-	{
-		Com_Printf( "USAGE: loadgame <name>\n" );
+	if (Cmd_Argc() != 2) {
+		Com_Printf("USAGE: loadgame <name>\n");
 		return;
 	}
 
-	name = Cmd_Argv( 1 );
-	Com_Printf( "Loading game...%s\n", name );
-	if( strstr( name, ".." ) || strchr( name, '/' ) || strchr( name, '\\' ) ) {
-		Com_Printf( "Bad savedir.\n" );
+	name = Cmd_Argv(1);
+	Com_Printf("Loading game...%s\n", name);
+	if (strstr(name, "..") || strchr(name, '/') || strchr(name, '\\')) {
+		Com_Printf("Bad savedir.\n");
 	}
 
-	Q_strncpyz( svs.gameName, name, sizeof( svs.gameName ) );
-	archive_name = Com_GetArchiveFileName( name, "sav" );
+	Q_strncpyz(svs.gameName, name, sizeof(svs.gameName));
+	archive_name = Com_GetArchiveFileName(name, "sav");
 	Cvar_SaveGameRestart_f();
 
-	length = FS_ReadFileEx( archive_name, NULL, qtrue );
-	if( length == -1 )
-	{
-		Com_Printf( "Savegame not found.\n" );
+	length = FS_ReadFileEx(archive_name, NULL, qtrue);
+	if (length == -1) {
+		Com_Printf("Savegame not found.\n");
 		return;
 	}
 
-    bStartedGame = qfalse;
+	bStartedGame = qfalse;
 
-	if( !ge )
-	{
+	if (!ge) {
 		SV_InitGameProgs();
 		bStartedGame = qtrue;
 	}
 
-	if( ge->LevelArchiveValid( archive_name ) && SV_ArchiveServerFile( qtrue, qfalse ) )
-	{
-		SV_SpawnServer( svs.mapName, qtrue, qfalse, qfalse );
+	if (ge->LevelArchiveValid(archive_name) && SV_ArchiveServerFile(qtrue, qfalse)) {
+		SV_SpawnServer(svs.mapName, qtrue, qfalse, qfalse);
 		svs.soundsNeedLoad = qtrue;
-	}
-	else if( bStartedGame )
-	{
+	} else if (bStartedGame) {
 		SV_ShutdownGameProgs();
 	}
 #endif
@@ -2234,27 +2205,26 @@ void SV_Loadgame_f( void )
 SV_SavegameFilename
 ==================
 */
-void SV_SavegameFilename( const char *name, char *fileName, int length )
+void SV_SavegameFilename(const char *name, char *fileName, int length)
 {
 #ifndef DEDICATED
-	int num;
+	int         num;
 	const char *fname;
-	int lastNumber;
-	int len;
-	int a;
-	int b;
-	int c;
+	int         lastNumber;
+	int         len;
+	int         a;
+	int         b;
+	int         c;
 
-	for( num = 0; num < 10000; num++ )
-	{
-		a = num / 1000;
-		b = num % 1000 / 100;
-		c = num % 1000 % 100 / 10;
+	for (num = 0; num < 10000; num++) {
+		a          = num / 1000;
+		b          = num % 1000 / 100;
+		c          = num % 1000 % 100 / 10;
 		lastNumber = num % 1000 % 100 % 10;
-		Com_sprintf( fileName, length, "%s%i%i%i%i", name, a, b, c, lastNumber );
-		fname = Com_GetArchiveFileName( fileName, "ssv" );
-		len = FS_ReadFileEx( fname, NULL, qtrue );
-		if( len <= 0 ) {
+		Com_sprintf(fileName, length, "%s%i%i%i%i", name, a, b, c, lastNumber);
+		fname = Com_GetArchiveFileName(fileName, "ssv");
+		len   = FS_ReadFileEx(fname, NULL, qtrue);
+		if (len <= 0) {
 			break;
 		}
 	}
@@ -2266,42 +2236,30 @@ void SV_SavegameFilename( const char *name, char *fileName, int length )
 SV_AllowSaveGame
 ==================
 */
-qboolean SV_AllowSaveGame( void )
+qboolean SV_AllowSaveGame(void)
 {
 #ifndef DEDICATED
-	if( !com_sv_running || !com_sv_running->integer )
-	{
-		Com_DPrintf( "You must be in a game with a server to save.\n" );
+	if (!com_sv_running || !com_sv_running->integer) {
+		Com_DPrintf("You must be in a game with a server to save.\n");
 		return qfalse;
-	}
-	else if( !com_cl_running || !com_cl_running->integer )
-	{
-		Com_DPrintf( "You must be in a game with a client to save.\n" );
+	} else if (!com_cl_running || !com_cl_running->integer) {
+		Com_DPrintf("You must be in a game with a client to save.\n");
 		return qfalse;
-	}
-	else if( sv.state != SS_GAME )
-	{
-		Com_DPrintf( "You must be in game to save.\n" );
+	} else if (sv.state != SS_GAME) {
+		Com_DPrintf("You must be in game to save.\n");
 		return qfalse;
-	}
-	else if( clc.state != CA_DISCONNECTED && cg_gametype->integer )
-	{
-		Com_DPrintf( "Can't savegame in a multiplayer game\n" );
+	} else if (clc.state != CA_DISCONNECTED && cg_gametype->integer) {
+		Com_DPrintf("Can't savegame in a multiplayer game\n");
 		return qfalse;
-	}
-	else if( g_gametype->integer )
-	{
-		Com_DPrintf( "Can't savegame in a multiplayer game\n" );
+	} else if (g_gametype->integer) {
+		Com_DPrintf("Can't savegame in a multiplayer game\n");
 		return qfalse;
-	}
-	else if( !svs.clients || svs.clients->gentity == NULL || svs.clients->gentity->client == NULL || !svs.clients->gentity->client->ps.stats[ 0 ] )
-	{
-		Com_DPrintf( "Can't savegame when dead\n" );
+	} else if (!svs.clients || svs.clients->gentity == NULL || svs.clients->gentity->client == NULL
+			   || !svs.clients->gentity->client->ps.stats[0]) {
+		Com_DPrintf("Can't savegame when dead\n");
 		return qfalse;
-	}
-	else if( sv.state == SS_LOADING || sv.state == SS_LOADING2 )
-	{
-		Com_DPrintf( "Can't save game when loading\n" );
+	} else if (sv.state == SS_LOADING || sv.state == SS_LOADING2) {
+		Com_DPrintf("Can't save game when loading\n");
 		return qfalse;
 	}
 
@@ -2321,9 +2279,8 @@ static qboolean bSavegame;
 qboolean SV_DoSaveGame()
 {
 #ifndef DEDICATED
-	if( bSavegame )
-	{
-		if( SV_AllowSaveGame() ) {
+	if (bSavegame) {
+		if (SV_AllowSaveGame()) {
 			return qtrue;
 		}
 		bSavegame = qfalse;
@@ -2339,45 +2296,40 @@ qboolean SV_DoSaveGame()
 SV_SaveGame
 ==================
 */
-void SV_SaveGame( const char *gamename, qboolean autosave )
+void SV_SaveGame(const char *gamename, qboolean autosave)
 {
 #ifndef DEDICATED
 	char *ptr;
-	char name[ 64 ];
-	char mname[ 64 ];
+	char  name[64];
+	char  mname[64];
 
-	if( !SV_AllowSaveGame() ) {
+	if (!SV_AllowSaveGame()) {
 		return;
 	}
 
-	if( gamename )
-	{
-		Q_strncpyz( name, gamename, sizeof( name ) );
-	}
-	else
-	{
-		Q_strncpyz( mname, svs.mapName, sizeof( mname ) );
-		for( ptr = strchr( mname, '/' ); ptr != NULL; ptr = strchr( mname, '/' ) )
-		{
+	if (gamename) {
+		Q_strncpyz(name, gamename, sizeof(name));
+	} else {
+		Q_strncpyz(mname, svs.mapName, sizeof(mname));
+		for (ptr = strchr(mname, '/'); ptr != NULL; ptr = strchr(mname, '/')) {
 			*ptr = '_';
 		}
-		SV_SavegameFilename( mname, name, sizeof( name ) );
+		SV_SavegameFilename(mname, name, sizeof(name));
 	}
 
-	if( strstr( name, ".." ) || strchr( name, '/' ) || strchr( name, '\\' ) )
-	{
-		Com_DPrintf( "Bad savedir.\n" );
+	if (strstr(name, "..") || strchr(name, '/') || strchr(name, '\\')) {
+		Com_DPrintf("Bad savedir.\n");
 		return;
 	}
 
-	Com_Printf( "Saving to %s", name );
-	if( autosave ) {
-		Com_Printf( " (autosave)...\n" );
+	Com_Printf("Saving to %s", name);
+	if (autosave) {
+		Com_Printf(" (autosave)...\n");
 	} else {
-		Com_Printf( "...\n" );
+		Com_Printf("...\n");
 	}
 
-	Q_strncpyz( svs.gameName, name, sizeof( svs.gameName ) );
+	Q_strncpyz(svs.gameName, name, sizeof(svs.gameName));
 
 	if (!SV_ArchiveLevelFile(qfalse, autosave)) {
 		if (cls.savedCgameState) {
@@ -2386,11 +2338,11 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 		}
 	}
 
-	SV_ArchiveServerFile( qfalse, autosave );
+	SV_ArchiveServerFile(qfalse, autosave);
 
-	Com_Printf( "Done.\n" );
+	Com_Printf("Done.\n");
 
-	Q_strncpyz( svs.gameName, "current", sizeof( svs.gameName ) );
+	Q_strncpyz(svs.gameName, "current", sizeof(svs.gameName));
 #endif
 }
 
@@ -2399,30 +2351,26 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 SV_Savegame_f
 ==================
 */
-static char savegame_name[ 64 ];
+static char savegame_name[64];
 
-void SV_Savegame_f( void )
+void SV_Savegame_f(void)
 {
 #ifndef DEDICATED
 	char *s;
 
-	if( !SV_AllowSaveGame() ) {
+	if (!SV_AllowSaveGame()) {
 		return;
 	}
 
-	if( Cmd_Argc() == 2 )
-	{
-
-		s = Cmd_Argv( 1 );
-		if( strlen( s ) >= sizeof( savegame_name ) ) {
+	if (Cmd_Argc() == 2) {
+		s = Cmd_Argv(1);
+		if (strlen(s) >= sizeof(savegame_name)) {
 			return;
 		}
 
-		Q_strncpyz( savegame_name, s, sizeof( savegame_name ) );
-	}
-	else
-	{
-		savegame_name[ 0 ] = 0;
+		Q_strncpyz(savegame_name, s, sizeof(savegame_name));
+	} else {
+		savegame_name[0] = 0;
 	}
 
 	bSavegame = qtrue;
@@ -2434,25 +2382,24 @@ void SV_Savegame_f( void )
 SV_CheckSaveGame
 ==================
 */
-void SV_CheckSaveGame( void )
+void SV_CheckSaveGame(void)
 {
 #ifndef DEDICATED
-	if( !SV_DoSaveGame() ) {
+	if (!SV_DoSaveGame()) {
 		return;
 	}
 
-	if( cl.serverTime >= svs.time )
-	{
+	if (cl.serverTime >= svs.time) {
 		bSavegame = qfalse;
-		SV_SaveGame( savegame_name[ 0 ] ? savegame_name : NULL, qfalse );
+		SV_SaveGame(savegame_name[0] ? savegame_name : NULL, qfalse);
 		UI_SetupFiles();
 	}
 #endif
 }
 
-void SV_Autosavegame_f( void )
+void SV_Autosavegame_f(void)
 {
 #ifndef DEDICATED
-	SV_SaveGame( NULL, qtrue );
+	SV_SaveGame(NULL, qtrue);
 #endif
 }

From 6991c9f9f7c02e65cea1b82a69b81a7f8ccddf4e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 21:00:14 +0100
Subject: [PATCH 1323/2040] Fix save comment not having the proper string

---
 code/fgame/trigger.cpp |  2 +-
 code/server/sv_ccmds.c | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 5cbe0cba..3fc8017f 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -1233,7 +1233,7 @@ void TriggerSave::SaveGame(Event *ev)
 
 void TriggerSave::EventSaveName(Event *ev)
 {
-    m_sSaveName = ev->GetConstString(1);
+    m_sSaveName = ev->GetString(1);
 }
 
 void TriggerSave::Archive(Archiver& arc)
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index c8ccee36..b6358f41 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    include "../uilib/ui_public.h"
 #endif
 
+#include "../sys/win_localization.h"
+
 /*
 ===============================================================================
 
@@ -2049,17 +2051,21 @@ qboolean SV_ArchiveServerFile(qboolean loading, qboolean autosave)
 		time(&aclock);
 
 		if (autosave) {
-			Com_sprintf(comment, sizeof(comment), "%s - Starting", sv.configstrings[CS_MESSAGE]);
+			Com_sprintf(comment, sizeof(comment), "%s - %s", sv.configstrings[CS_MESSAGE], Sys_LV_CL_ConvertString("Starting"));
 		} else if (sv.configstrings[CS_SAVENAME] && *sv.configstrings[CS_SAVENAME]) {
-			Com_sprintf(
-				comment, sizeof(comment), "%s - %s", sv.configstrings[CS_MESSAGE], sv.configstrings[CS_SAVENAME]
-			);
+			if (com_target_game->integer >= TG_MOHTA) {
+				// Fixed in 2.0
+				//  In 2.0 and above, the full save name is set by the level
+				Com_sprintf(comment, sizeof(comment), "%s", Sys_LV_CL_ConvertString(sv.configstrings[CS_SAVENAME]));
+			} else {
+				Com_sprintf(comment, sizeof(comment), "%s - %s", Sys_LV_CL_ConvertString(sv.configstrings[CS_MESSAGE]), Sys_LV_CL_ConvertString(sv.configstrings[CS_SAVENAME]));
+			}
 		} else {
-			Com_sprintf(comment, sizeof(comment), "%s", sv.configstrings[CS_MESSAGE]);
+			Com_sprintf(comment, sizeof(comment), "%s", Sys_LV_CL_ConvertString(sv.configstrings[CS_MESSAGE]));
 		}
 
 		if (strstr(name, "quick.ssv")) {
-			Com_sprintf(save.comment, sizeof(save.comment), "QuickSave - %s", comment);
+			Com_sprintf(save.comment, sizeof(save.comment), "%s - %s", Sys_LV_CL_ConvertString("QuickSave"), comment);
 		} else {
 			Q_strncpyz(save.comment, comment, sizeof(save.comment));
 		}

From 4f16179c0948356a3e23790551551c0ec447cf34 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 21:46:55 +0100
Subject: [PATCH 1324/2040] getmins/getmaxs are getters instead of returns

---
 code/fgame/entity.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 5986a973..394fe3cb 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -677,7 +677,7 @@ Event EV_GetMins
     NULL,
     NULL,
     "Get the mins of the bounding box of the entity to mins.",
-    EV_RETURN
+    EV_GETTER
 );
 Event EV_GetMaxs
 (
@@ -686,7 +686,7 @@ Event EV_GetMaxs
     NULL,
     NULL,
     "Get the maxs of the bounding box of the entity to maxs.",
-    EV_RETURN
+    EV_GETTER
 );
 Event EV_SetAlpha
 (

From 4c057faf73e8dda72ab3147f506ed0e9ff0cc692 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 21:51:19 +0100
Subject: [PATCH 1325/2040] Add a newline for warnings

---
 code/renderer/tr_shade_calc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
index 0c3d034f..8fa2abd1 100644
--- a/code/renderer/tr_shade_calc.c
+++ b/code/renderer/tr_shade_calc.c
@@ -585,10 +585,10 @@ static void AutospriteDeform(void) {
     vec3_t	leftDir, upDir;
 
     if (tess.numVertexes & 3) {
-        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd vertex count", tess.shader->name);
+        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd vertex count\n", tess.shader->name);
     }
     if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
-        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd index count", tess.shader->name);
+        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd index count\n", tess.shader->name);
     }
 
     oldVerts = tess.numVertexes;
@@ -669,10 +669,10 @@ static void Autosprite2Deform( void ) {
 	vec3_t	forward;
 
 	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count\n", tess.shader->name );
 	}
 	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count\n", tess.shader->name );
 	}
 
 	if ( backEnd.currentStaticModel || backEnd.currentEntity != &tr.worldEntity ) {
@@ -816,10 +816,10 @@ static void LightGlowDeform() {
 	vec3_t leftDir, upDir;
 
     if (tess.numVertexes & 3) {
-        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd vertex count", tess.shader->name);
+        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd vertex count\n", tess.shader->name);
     }
     if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
-        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd index count", tess.shader->name);
+        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd index count\n", tess.shader->name);
     }
 
 	oldVerts = tess.numVertexes;

From f9ce111784985bc79e429ae8f164b6f1f7bf9fb7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 2 Nov 2024 22:38:38 +0100
Subject: [PATCH 1326/2040] Set the targetname for projectiles

---
 code/fgame/weaputils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 7c3107f2..b9dd30ed 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1870,6 +1870,11 @@ Projectile *ProjectileAttack(
     }
 
     args.setArg("model", projectileModel);
+    // Added in 2.0
+    //  Set the projectile targetname
+    //  so they can be managed from scripts
+    args.setArg("targetname", "projectile");
+
     obj = (Entity *)args.Spawn();
 
     if (!obj) {

From 1016bfa1adf074f4257a07857feb8746d6160678 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:19:31 +0100
Subject: [PATCH 1327/2040] Fix calcgrenadetoss2 not pointing to the correct
 method

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 820bf2fc..06a7243c 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2628,7 +2628,7 @@ CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
     //{&EV_Actor_SetBreathSteam2,               &Actor::EventSetBreathSteam                     },
     //====
     {&EV_Actor_CalcGrenadeToss,               &Actor::EventCalcGrenadeToss              },
-    {&EV_Actor_CalcGrenadeToss2,              &Actor::EventCalcGrenadeToss              },
+    {&EV_Actor_CalcGrenadeToss2,              &Actor::EventCalcGrenadeToss2             },
     {&EV_Actor_GetNoSurprise,                 &Actor::EventGetNoSurprise                },
     {&EV_Actor_SetNoSurprise,                 &Actor::EventSetNoSurprise                },
     {&EV_Actor_SetNoSurprise2,                &Actor::EventSetNoSurprise                },

From 1235f42143369ea853853834c526a2b222ae3f5f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:20:47 +0100
Subject: [PATCH 1328/2040] Set the grenade mode when tossing a grenade with
 the specified speed

---
 code/fgame/actor.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 06a7243c..cfbae72e 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -9712,7 +9712,7 @@ Vector Actor::CalcThrowVelocity(const Vector& vFrom, const Vector& vTo)
 
     vDelta           = vTo - vFrom;
     fHorzDistSquared = vDelta.lengthXYSquared();
-    fDistance        = sqrt(fHorzDistSquared + vDelta.z * vDelta.z);
+    fDistance        = sqrt(fHorzDistSquared + Square(vDelta.z));
 
     // original irl equation: v10 = sqrt(fGravity * 0.5 * fHorzDistSquared / (fDistance * trigMult ))
     // trigMult = (cos(th)/ tan(al) - sin(th)/tanSquared(al))
@@ -11912,8 +11912,10 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     }
 
     if (fDistSquared < Square(1024)) {
+        // See if it can roll
         vPoint = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETOSS_SCR);
         vVel   = CanRollGrenade(vPoint, vTargetPos);
+
         if (vVel != vPointTarget) {
             m_vGrenadeVel  = vVel;
             m_eGrenadeMode = AI_GREN_TOSS_ROLL;
@@ -11926,6 +11928,7 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     if (!speed) {
         vPoint = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETHROW_SCR);
         vVel   = CanThrowGrenade(vPoint, vTargetPos);
+
         if (vVel != vec_zero) {
             m_vGrenadeVel  = vVel;
             m_eGrenadeMode = AI_GREN_TOSS_THROW;
@@ -11942,7 +11945,9 @@ void Actor::EventCalcGrenadeToss2(Event *ev)
     vVel = vTargetPos - vPoint;
     vVel.normalize();
     vVel *= speed;
-    m_vGrenadeVel = vVel;
+
+    m_vGrenadeVel  = vVel;
+    m_eGrenadeMode = AI_GREN_TOSS_THROW;
 
     ev->AddConstString(STRING_ANIM_GRENADETOSS_SCR);
     SetDesiredYawDir(m_vGrenadeVel);

From f40f20616175bd936769b2a89aba4fd8b95da426 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:21:27 +0100
Subject: [PATCH 1329/2040] Don't add the owner velocity by default

This fixes an issue where AI would throw grenades incorrectly
---
 code/fgame/weaputils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index b9dd30ed..81cd8988 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -624,7 +624,7 @@ Projectile::Projectile()
     fDrunk               = 0;
     fDrunkRate           = 0;
     m_iSmashThroughGlass = 0;
-    addownervelocity     = qtrue;
+    addownervelocity     = false;
     can_hit_owner        = false;
     remove_when_stopped  = false;
     m_bExplodeOnTouch    = false;

From 62bcf58d83f066ded0130829096d54323dcc5677 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:33:33 +0100
Subject: [PATCH 1330/2040] Call G_RestartLevelWithDelay instead in
 G_MissionFailed

---
 code/fgame/g_utils.cpp | 30 ++----------------------------
 code/fgame/g_utils.h   |  1 -
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index d5e7ea1f..bea9935c 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1980,29 +1980,10 @@ void G_RestartLevelWithDelay(float delaytime)
 {
     int i;
 
-    if (level.died_already) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
-    level.died_already = true;
-
-    // Restart the level soon
-    for (i = 0; i < game.maxclients; i++) {
-        if (g_entities[i].inuse) {
-            if (g_entities[i].entity) {
-                g_entities[i].entity->PostEvent(EV_Player_Respawn, delaytime);
-            }
-        }
-    }
-}
-
-//
-// restarts the game after delaytime
-//
-void G_PlayerDied(float delaytime)
-{
-    int i;
-
     if (level.died_already) {
         return;
     }
@@ -2010,7 +1991,6 @@ void G_PlayerDied(float delaytime)
     level.died_already = true;
 
     // Restart the level soon
-
     for (i = 0; i < game.maxclients; i++) {
         if (g_entities[i].inuse) {
             if (g_entities[i].entity) {
@@ -2025,13 +2005,7 @@ void G_PlayerDied(float delaytime)
 
 void G_MissionFailed(void)
 {
-    // Make the music system play the failure music for this level
-    ChangeMusic("failure", "normal", true);
-
-    G_PlayerDied(3);
-
-    // tell the player they f'd up
-    gi.centerprintf(&g_entities[0], "@textures/menu/mission.tga");
+    G_RestartLevelWithDelay(0);
 
     level.mission_failed = true;
 }
diff --git a/code/fgame/g_utils.h b/code/fgame/g_utils.h
index 81c87d56..41663ea8 100644
--- a/code/fgame/g_utils.h
+++ b/code/fgame/g_utils.h
@@ -144,7 +144,6 @@ void G_MissionFailed(void);
 void G_FadeOut(float delaytime);
 void G_FadeSound(float delaytime);
 void G_RestartLevelWithDelay(float delaytime);
-void G_PlayerDied(float delaytime);
 void G_AutoFadeIn(void);
 void G_ClearFade(void);
 void G_StartCinematic(void);

From 6f51427c7c5a2cb264201ca05e86f40945135cae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:34:33 +0100
Subject: [PATCH 1331/2040] Add a function to count the number of valid clients

---
 code/fgame/g_local.h   |  1 +
 code/fgame/g_utils.cpp | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index 55c25869..ecd759e8 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -211,6 +211,7 @@ void G_PrintDeathMessage(
 );
 void G_PrintDeathMessage_Old(const char *pszString);
 void G_WarnPlayer(class Player *player, const char *format, ...);
+int G_NumClients(void);
 
 int G_WeaponIndex(const char *name);
 
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index bea9935c..2e741b49 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -2023,6 +2023,23 @@ void G_StopCinematic(void)
     gi.cvar_set("sv_cinematic", "0");
 }
 
+int G_NumClients(void)
+{
+    gentity_t *ent;
+    int        i;
+    int        count = 0;
+
+    for (i = 0, ent = g_entities; i < game.maxclients; ent++, i++) {
+        if (!ent->inuse || !ent->entity) {
+            continue;
+        }
+
+        count++;
+    }
+
+    return count;
+}
+
 void G_PrintToAllClients(const char *pszString, int iType)
 {
     if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {

From a644e8a09c2e442de0a4e4bf6759f920a34214d5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:40:59 +0100
Subject: [PATCH 1332/2040] Check for GT_SINGLE_PLAYER instead of 0

---
 code/fgame/g_main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 22bff8b4..d0ab3647 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -276,7 +276,7 @@ void G_InitGame(int levelTime, int randomSeed)
     sv_numtraces   = 0;
     sv_numpmtraces = 0;
 
-    if (developer->integer && !g_gametype->integer) {
+    if (developer->integer && g_gametype->integer == GT_SINGLE_PLAYER) {
         Viewmodel.Init();
         LODModel.Init();
     }
@@ -726,7 +726,7 @@ void G_ClientDrawBoundingBoxes(void)
     Vector     eye;
 
     // don't show bboxes during deathmatch
-    if ((!sv_showbboxes->integer) || (g_gametype->integer && !sv_cheats->integer)) {
+    if ((!sv_showbboxes->integer) || (g_gametype->integer != GT_SINGLE_PLAYER && !sv_cheats->integer)) {
         return;
     }
 
@@ -1813,7 +1813,7 @@ void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade
     gentity_t *client;
     int        i;
 
-    if (level.intermissiontime || g_gametype->integer) {
+    if (level.intermissiontime || g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1877,7 +1877,7 @@ void G_ExitLevel(void)
     Com_sprintf(command, sizeof(command), "stopsound\n");
     gi.SendConsoleCommand(command);
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         if (strlen(sv_nextmap->string)) {
             // The nextmap cvar was set (possibly by a vote - so go ahead and use it)
             level.nextmap = sv_nextmap->string;
@@ -2009,7 +2009,7 @@ G_CheckExitRules
 */
 void G_CheckExitRules(void)
 {
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         if (level.intermissiontime == 0.0f) {
             dmManager.CheckEndMatch();
         } else {

From 8a774c02dce9883db98dad583d3ed19fcf79ade1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:41:26 +0100
Subject: [PATCH 1333/2040] Call G_BeginIntermission() instead of
 G_MissionFailed() when calling missionfailed

---
 code/fgame/scriptthread.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 1f52e107..f7a46eeb 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -3469,7 +3469,15 @@ void ScriptThread::CameraCommand(Event *ev)
 
 void ScriptThread::MissionFailed(Event *ev)
 {
-    G_MissionFailed();
+    bool bNoFade;
+
+    if (level.intermissiontime) {
+        return;
+    }
+
+    bNoFade = ev->NumArgs() && ev->GetInteger(1);
+
+    G_BeginIntermission(level.current_map, TRANS_MISSION_FAILED, bNoFade);
 }
 
 void ScriptThread::Archive(Archiver& arc) {}

From 3d42197f5094a22c1a821432a9019dd958f678ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 01:26:30 +0100
Subject: [PATCH 1334/2040] Initialize the minlife field

---
 code/fgame/weaputils.cpp | 9 +++++++--
 code/fgame/weaputils.h   | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 81cd8988..76c2a0d7 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -602,6 +602,7 @@ Projectile::Projectile()
         return;
     }
 
+    minlife              = 0;
     m_beam               = NULL;
     speed                = 0;
     minspeed             = 0;
@@ -621,18 +622,20 @@ Projectile::Projectile()
     impactmarkradius     = 10;
     charge_fraction      = 1.0;
     target               = NULL;
+    addownervelocity     = false;
     fDrunk               = 0;
     fDrunkRate           = 0;
-    m_iSmashThroughGlass = 0;
-    addownervelocity     = false;
     can_hit_owner        = false;
     remove_when_stopped  = false;
     m_bExplodeOnTouch    = false;
     m_bHurtOwnerOnly     = false;
+    m_iSmashThroughGlass = 0;
     takedamage           = DAMAGE_NO;
     owner                = ENTITYNUM_NONE;
     edict->r.ownerNum    = ENTITYNUM_NONE;
+    // Added in 2.0
     m_bArcToTarget       = false;
+    // Added in 2.30
     m_bDieInWater        = false;
 
     // make this shootable but non-solid on the client
@@ -644,6 +647,8 @@ Projectile::Projectile()
     flags |= FL_TOUCH_TRIGGERS;
 
     m_iTeam           = 0;
+
+    // Added in OPM
     m_bHadPlayerOwner = false;
 }
 
diff --git a/code/fgame/weaputils.h b/code/fgame/weaputils.h
index 2e3269f1..744139c8 100644
--- a/code/fgame/weaputils.h
+++ b/code/fgame/weaputils.h
@@ -81,8 +81,11 @@ public:
 	bool m_bExplodeOnTouch;
 	bool m_bHurtOwnerOnly;
 	int m_iSmashThroughGlass;
+	// Added in 2.0
 	bool m_bArcToTarget;
+	// Added in 2.30
 	bool m_bDieInWater;
+	// Added in 2.0
 	int m_iTeam;
 	bool m_bHadPlayerOwner;
 	SafePtr<Entity> m_pOwnerPtr;

From 7d1d92980a64b6d91df77a6aed2e966ab25867ab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 01:40:34 +0100
Subject: [PATCH 1335/2040] Disable the charge life when set to 0

---
 code/fgame/weaputils.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 76c2a0d7..d0da7da2 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1015,7 +1015,13 @@ void Projectile::SetBounceSoundWater(Event *ev)
 
 void Projectile::SetChargeLife(Event *ev)
 {
-    projFlags |= P_CHARGE_LIFE;
+    if (ev->NumArgs() <= 0 || ev->GetInteger(1)) {
+        projFlags |= P_CHARGE_LIFE;
+    } else {
+        // Added in 2.0
+        //  Allow disabling the charge life when set to 0
+        projFlags &= ~P_CHARGE_LIFE;
+    }
 }
 
 void Projectile::SetFuse(Event *ev)
@@ -1030,7 +1036,13 @@ void Projectile::SetFuse(Event *ev)
 void Projectile::SetMinLife(Event *ev)
 {
     minlife = ev->GetFloat(1);
-    projFlags |= P_CHARGE_LIFE;
+    if (minlife > 0) {
+        projFlags |= P_CHARGE_LIFE;
+    } else {
+        // Added in 2.0
+        //  Allow disabling the charge life when set to 0
+        projFlags &= ~P_CHARGE_LIFE;
+    }
 }
 
 void Projectile::SetLife(Event *ev)

From 51324aa8e9664ebd33c758a2ac2052413d882321 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 01:51:17 +0100
Subject: [PATCH 1336/2040] Archive the ProjectileTarget ID

The ID was missing during save, this caused issues with projectile generators when looking for a local target
---
 code/fgame/Entities.cpp | 17 ++++++++++++-----
 code/fgame/Entities.h   |  6 ++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index c12d8f5e..2b608544 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -327,7 +327,7 @@ void ClearProjectileTargets()
 
 ProjectileTarget::ProjectileTarget()
 {
-    m_iTarget = -1;
+    m_iID = -1;
     setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_NOT);
     hideModel();
@@ -337,12 +337,19 @@ ProjectileTarget::ProjectileTarget()
 
 void ProjectileTarget::EventSetId(Event *ev)
 {
-    m_iTarget = ev->GetInteger(1);
+    m_iID = ev->GetInteger(1);
 }
 
-int ProjectileTarget::GetTarget() const
+int ProjectileTarget::GetId() const
 {
-    return m_iTarget;
+    return m_iID;
+}
+
+void ProjectileTarget::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveInteger(&m_iID);
 }
 
 CLASS_DECLARATION(Animate, ProjectileGenerator, "ProjectileGenerator") {
@@ -583,7 +590,7 @@ void ProjectileGenerator::GetLocalTargets()
     m_projectileTargets.ClearObjectList();
     for (i = 1; i <= g_projectileTargets.NumObjects(); i++) {
         ProjectileTarget *target = g_projectileTargets.ObjectAt(i);
-        if (m_iId == target->GetTarget()) {
+        if (m_iId == target->GetId()) {
             m_projectileTargets.AddObject(target);
         }
     }
diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index bbb454a3..16ed9600 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -45,7 +45,7 @@ void ClearProjectileTargets();
 class ProjectileTarget : public Entity
 {
 private:
-    int m_iTarget;
+    int m_iID;
 
 public:
     CLASS_PROTOTYPE(ProjectileTarget);
@@ -53,7 +53,9 @@ public:
     ProjectileTarget();
 
     void EventSetId(Event *ev);
-    int  GetTarget() const;
+    int  GetId() const;
+
+    void Archive(Archiver& arc) override;
 };
 
 #define MAX_PROJECTILE_GENERATOR_TARGETS 16

From 6bac4bd57abf6d8dddc16227a1f2b1477100835e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 15:08:54 +0100
Subject: [PATCH 1337/2040] Add assertions to check for valid squad mates

---
 code/fgame/sentient.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index da0e8c24..0f0614a5 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -2793,7 +2793,10 @@ void Sentient::RemovedItem(Item *item) {}
 
 void Sentient::AssertValidSquad()
 {
-    for (Sentient *pSquadMate = this; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {}
+    for (Sentient *pSquadMate = this; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        assert(pSquadMate->m_pNextSquadMate);
+        assert(pSquadMate->m_pPrevSquadMate);
+    }
 }
 
 bool Sentient::IsTeamMate(Sentient *pOther)

From bc834b021c46b1b1e62bdb94a26d097b8e2031df Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 15:09:31 +0100
Subject: [PATCH 1338/2040] Use and draw the marker material when specified

This is used by the fuse stopwatch hud
---
 code/client/cl_uistd.cpp | 84 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 7 deletions(-)

diff --git a/code/client/cl_uistd.cpp b/code/client/cl_uistd.cpp
index 260535c5..639881f8 100644
--- a/code/client/cl_uistd.cpp
+++ b/code/client/cl_uistd.cpp
@@ -439,8 +439,10 @@ void UIFakkLabel::LayoutRenderModelAnim(Event *ev)
 
 void UIFakkLabel::DrawStatbar(float frac)
 {
-    vec4_t col;
-    float  alpha;
+    vec4_t    col;
+    float     alpha;
+    qhandle_t hMat;
+    float     w, h;
 
     col[0] = col[1] = col[2] = col[3] = 1.0;
 
@@ -475,11 +477,7 @@ void UIFakkLabel::DrawStatbar(float frac)
     m_lastfrac = frac;
 
     alpha = 1.0 - ((float)uid.time - m_flashtime) / 1500.0;
-    if (alpha < 0.0) {
-        alpha = 0.0;
-    } else if (alpha > 1.0) {
-        alpha = 1.0;
-    }
+    alpha = Q_clamp_float(alpha, 0, 1);
 
     col[3] = alpha;
 
@@ -496,6 +494,24 @@ void UIFakkLabel::DrawStatbar(float frac)
                         re.SetColor(col);
                         re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
                     }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
                     break;
                 }
             case L_STATBAR_VERTICAL:
@@ -513,6 +529,24 @@ void UIFakkLabel::DrawStatbar(float frac)
                             0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial()
                         );
                     }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
                     break;
                 }
             default:
@@ -542,6 +576,24 @@ void UIFakkLabel::DrawStatbar(float frac)
                             m_statbar_material_flash->GetMaterial()
                         );
                     }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
                     break;
                 }
             case L_STATBAR_VERTICAL:
@@ -569,6 +621,24 @@ void UIFakkLabel::DrawStatbar(float frac)
                             m_statbar_material_flash->GetMaterial()
                         );
                     }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
                     break;
                 }
             case L_STATBAR_VERTICAL_REVERSE:

From 8addeedf5e4672e26d619c4d8d65ad1de81f0169 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 15:33:14 +0100
Subject: [PATCH 1339/2040] Fix event parameters being incorrectly archived

---
 code/qcommon/listener.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 8d744950..9611ee28 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -451,7 +451,7 @@ void Event::Archive(Archiver& arc)
     }
 
     for (int i = dataSize; i > 0; i--) {
-        data[i].ArchiveInternal(arc);
+        data[i - 1].ArchiveInternal(arc);
     }
 }
 

From 00dbc74269494aaf7f341ecfa3d5264b992fb001 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 15:36:55 +0100
Subject: [PATCH 1340/2040] Use MAX_WEAPON_ANIM_SLOTS instead of a constant

---
 code/fgame/weapon.cpp | 4 ++--
 code/fgame/weapon.h   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index e895370b..262355c4 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -3168,7 +3168,7 @@ qboolean Weapon::SetWeaponAnim(const char *anim, Event *ev)
     int idleanim = gi.Anim_NumForName(edict->tiki, "idle");
 
     edict->s.frameInfo[m_iAnimSlot].index = idleanim;
-    m_iAnimSlot                           = (m_iAnimSlot + 1) & 3;
+    m_iAnimSlot                           = (m_iAnimSlot + 1) % MAX_WEAPON_ANIM_SLOTS;
     edict->s.frameInfo[m_iAnimSlot].index = idleanim;
 
     if (ev) {
@@ -3206,7 +3206,7 @@ void Weapon::StopWeaponAnim(void)
     animnum = gi.Anim_NumForName(edict->tiki, "idle");
     StartAnimSlot(m_iAnimSlot, animnum, 1.f);
 
-    m_iAnimSlot = (m_iAnimSlot + 1) & 3;
+    m_iAnimSlot = (m_iAnimSlot + 1) % MAX_WEAPON_ANIM_SLOTS;
 }
 
 //======================
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index e9666afb..520b7ceb 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -91,6 +91,8 @@ typedef enum {
         }                                           \
     }
 
+static const unsigned int MAX_WEAPON_ANIM_SLOTS = 4;
+
 class Player;
 
 class Weapon : public Item

From 05b2d3529e2cb81883e7fa5d03ef3814f6a7baca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:27:41 +0100
Subject: [PATCH 1341/2040] Implement UI_EndLoadResource

---
 code/client/cl_ui.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 5911451e..a786a6bd 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -5417,7 +5417,17 @@ void UI_BeginLoadResource(void)
 UI_EndLoadResource
 ====================
 */
-void UI_EndLoadResource(void) {}
+void UI_EndLoadResource(void)
+{
+    clock_t time;
+    int i;
+
+    time = clock() - ((startCountHigh << 32) | startCountLow) + ((loadCountHigh << 32) | loadCountLow);
+
+    loadCountHigh = time >> 32;
+    loadCountLow = time;
+    loadCount = time >> 25;
+}
 
 /*
 ====================

From 98e725ef7bdaf0300f5190f7ade9e41786cca57c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:28:00 +0100
Subject: [PATCH 1342/2040] Fix EV_StatsUpdater_UpdateStats missing parameter
 declaration

---
 code/client/cl_ui.cpp | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index a786a6bd..f2f673dd 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -136,7 +136,7 @@ static unsigned int  startCountHigh;
 static unsigned int  loadCountLow;
 static unsigned int  loadCountHigh;
 static unsigned int  loadCount;
-static unsigned int  lastTime = 0;
+static unsigned int  lastTime   = 0;
 static unsigned int  updateTime = 0;
 static unsigned int  loadNumber;
 static unsigned int  totalLoadTime;
@@ -1002,9 +1002,9 @@ static UIRect2D getQuickMessageDMConsoleRectangle(void)
         rect.size.width  = f[2] + 50.0;
         rect.size.height = f[3] + 50.0;
     } else {
-        rect.pos.x       = 0;
-        rect.pos.y       = cls.glconfig.vidHeight * 0.66;
-        rect.size.width  = cls.glconfig.vidWidth;
+        rect.pos.x      = 0;
+        rect.pos.y      = cls.glconfig.vidHeight * 0.66;
+        rect.size.width = cls.glconfig.vidWidth;
         // Fixed in 2.0
         //  Was 38.0 in 1.11 and below
         //  This prevents characters to be seen from the DM console
@@ -1714,19 +1714,20 @@ void UI_DrawIntro(void)
     }
 
     if (intro_stage.material->GetMaterial()) {
-        float swidth;
-        float sheight;
+        float  swidth;
+        float  sheight;
         vec4_t color;
 
         VectorSet4(color, 1, 1, 1, 1);
         if (intro_stage.fadetime) {
             float frac;
 
-            frac = Q_clamp_float((cls.realtime - intro_stage.starttime) / intro_stage.fadetime, 0, 1);
-            color[0] = color[1] = color[2] = intro_stage.alpha_start + frac * (intro_stage.alpha_end - intro_stage.alpha_start);
+            frac     = Q_clamp_float((cls.realtime - intro_stage.starttime) / intro_stage.fadetime, 0, 1);
+            color[0] = color[1] = color[2] =
+                intro_stage.alpha_start + frac * (intro_stage.alpha_end - intro_stage.alpha_start);
         }
 
-        swidth = view3d->getFrame().getMaxX();
+        swidth  = view3d->getFrame().getMaxX();
         sheight = view3d->getFrame().getMaxY();
 
         re.SetColor(color);
@@ -4258,7 +4259,7 @@ public:
     void UpdateStats(Event *ev);
 };
 
-Event EV_StatsUpdater_UpdateStats;
+Event EV_StatsUpdater_UpdateStats("updatestats", EV_DEFAULT, NULL, NULL, "Update the stats on the missionLog");
 
 CLASS_DECLARATION(Listener, StatsUpdater, NULL) {
     {NULL, NULL}
@@ -4700,7 +4701,7 @@ void CL_FinishedStartStage(void)
         intro_stage.alpha_start = 1.0;
         intro_stage.alpha_end   = 1.0;
 
-        wait = ui_legalscreen_stay->value * 1000.0;
+        wait                  = ui_legalscreen_stay->value * 1000.0;
         intro_stage.fadetime  = 0.0;
         intro_stage.starttime = cls.realtime;
         intro_stage.endtime   = cls.realtime + wait;
@@ -5420,13 +5421,13 @@ UI_EndLoadResource
 void UI_EndLoadResource(void)
 {
     clock_t time;
-    int i;
+    int     i;
 
     time = clock() - ((startCountHigh << 32) | startCountLow) + ((loadCountHigh << 32) | loadCountLow);
 
     loadCountHigh = time >> 32;
-    loadCountLow = time;
-    loadCount = time >> 25;
+    loadCountLow  = time;
+    loadCount     = time >> 25;
 }
 
 /*
@@ -5530,7 +5531,7 @@ void UI_TestUpdateScreen(unsigned int timeout)
     endRenderTime = Sys_Milliseconds();
 
     updateTime = Q_min(endRenderTime - startRenderTime, 1000);
-    lastTime = endRenderTime;
+    lastTime   = endRenderTime;
 }
 
 /*

From 9042ea320c31eb1088463b17b4a813a4ef1a9e06 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:30:35 +0100
Subject: [PATCH 1343/2040] Refactor UI_RegisterLoadResource

---
 code/client/cl_ui.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index f2f673dd..16e5dde7 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -5494,19 +5494,17 @@ void UI_RegisterLoadResource(const char *name)
     high = loadNumber - 1;
 
     while (low <= high) {
-        i = (high + low) / 2;
+        i = (low + high) / 2;
         j = strcmp(name, loadStrings[i]);
 
-        if (j >= 0) {
-            if (j <= 0) {
-                currentLoadTime += loadTimes[i];
-                loadTimes[i] = 0;
-                return;
-            }
-
+        if (j < 0) {
+            high = i - 1;
+        } else if (j > 0) {
             low = i + 1;
         } else {
-            high = i - 1;
+            currentLoadTime += loadTimes[i];
+            loadTimes[i] = 0;
+            break;
         }
     }
 }

From b97c47ab32a1b21b39ef166c76cffbd718e0a921 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:40:18 +0100
Subject: [PATCH 1344/2040] Cast to clock_t before left-shift

---
 code/client/cl_ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 16e5dde7..4997e31a 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -5423,7 +5423,7 @@ void UI_EndLoadResource(void)
     clock_t time;
     int     i;
 
-    time = clock() - ((startCountHigh << 32) | startCountLow) + ((loadCountHigh << 32) | loadCountLow);
+    time = clock() - (((clock_t)startCountHigh << 32) | startCountLow) + (((clock_t)loadCountHigh << 32) | loadCountLow);
 
     loadCountHigh = time >> 32;
     loadCountLow  = time;

From bb47ba468c495573a7188bfd5c9b2e5b308fd5d2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:51:27 +0100
Subject: [PATCH 1345/2040] Fix game.skill and game.detail missing getters

---
 code/fgame/game.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index b92d63ae..c323bce0 100644
--- a/code/fgame/game.cpp
+++ b/code/fgame/game.cpp
@@ -37,7 +37,8 @@ Event EV_Game_Detail
     EV_DEFAULT,
     NULL,
     NULL,
-    "game.skill"
+    "game.skill",   
+    EV_GETTER   
 );
 
 Event EV_Game_Skill
@@ -46,7 +47,8 @@ Event EV_Game_Skill
     EV_DEFAULT,
     NULL,
     NULL,
-    "game.detail"
+    "game.detail",
+    EV_GETTER
 );
 
 Game game;

From 8114003c84b38310306ba48c65bae4033fedad30 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:54:34 +0100
Subject: [PATCH 1346/2040] Add screenshot/levelshot allowed stuff commands

---
 code/cgame/cg_servercmds.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 06fe5ac8..d7e9d21a 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -487,7 +487,10 @@ static const char *whiteListedCommands[] = {
     "tmvolume",
     "`stufftext",
     "+moveup", // workaround for mods that want to prevent inactivity when handling the spectate
-    "-moveup"
+    "-moveup",
+    "screenshot",
+    "screenshotJPEG",
+    "levelshot"
 };
 
 //

From cf8f755f6c42f1685b632fa7c48fc082a1be2cdb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 19:23:11 +0100
Subject: [PATCH 1347/2040] Make comment more clear

---
 code/fgame/Entities.cpp | 58 ++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 2b608544..25a53961 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -2494,31 +2494,38 @@ CLASS_DECLARATION(SimpleArchivedEntity, AISpawnPoint, "info_aispawnpoint") {
 
 AISpawnPoint::AISpawnPoint()
 {
-    m_iHealth             = 100;
-    m_iAccuracy           = 20;
-    m_iAmmoGrenade        = 0;
-    m_iBalconyHeight      = 128;
-    m_iDisguiseLevel      = 1;
-    m_fDisguisePeriod     = 30000;
-    m_fDisguiseRange      = 256;
-    m_fEnemyShareRange    = 0;
-    m_fFixedLeash         = 0.0;
+    m_iHealth = 100;
+
+    m_iAccuracy      = 20;
+    m_iAmmoGrenade   = 0;
+    m_iBalconyHeight = 128;
+
+    m_iDisguiseLevel  = 1;
+    m_fDisguisePeriod = 30000;
+    m_fDisguiseRange  = 256;
+
+    m_fEnemyShareRange = 0;
+    m_fFixedLeash      = 0.0;
+
     m_fGrenadeAwareness   = 20.0;
     m_fMaxNoticeTimeScale = 1;
     m_fSoundAwareness     = 100;
-    m_bPatrolWaitTrigger  = 0;
-    m_fHearing            = 2048;
-    m_fSight              = world->m_fAIVisionDistance;
-    m_fFov                = 90;
-    m_fLeash              = 512;
-    m_fMinDist            = 128.0;
-    m_fMaxDist            = 1024;
-    m_fInterval           = 128.0;
-    m_bDontDropWeapons    = 0;
-    m_bDontDropHealth     = 0;
-    m_bNoSurprise         = 0;
-    m_bForceDropWeapon    = 0;
-    m_bForceDropHealth    = 0;
+
+    m_bPatrolWaitTrigger = false;
+
+    m_fHearing  = 2048;
+    m_fSight    = world->m_fAIVisionDistance;
+    m_fFov      = 90;
+    m_fLeash    = 512;
+    m_fMinDist  = 128.0;
+    m_fMaxDist  = 1024;
+    m_fInterval = 128.0;
+
+    m_bDontDropWeapons = false;
+    m_bDontDropHealth  = false;
+    m_bNoSurprise      = false;
+    m_bForceDropWeapon = false;
+    m_bForceDropHealth = false;
 }
 
 void AISpawnPoint::GetForceDropHealth(Event *ev)
@@ -2528,7 +2535,10 @@ void AISpawnPoint::GetForceDropHealth(Event *ev)
 
 void AISpawnPoint::SetForceDropHealth(Event *ev)
 {
-    // This is a bug on original mohaab (2.30 and 2.40), it should be m_bForceDropHealth
+    // Fixed in OPM
+    //  This does look like a mistake on original mohaab (2.30 and 2.40)
+    //  it should be m_bForceDropHealth.
+    //  That's the reason why AI often don't drop weapons
     //m_bForceDropWeapon = ev->GetBoolean(1);
     m_bForceDropHealth = ev->GetBoolean(1);
 }

From 2da379badeedce94e3637058de4232278b2956f0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 19:30:56 +0100
Subject: [PATCH 1348/2040] Fix typo for `nodropweapons`

---
 code/fgame/level.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index f7259270..5e1312d5 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -120,7 +120,7 @@ Event EV_Level_SetNoDropHealth
 
 Event EV_Level_SetNoDropWeapons
 (
-    "nodropweapon",
+    "nodropweapons",
     EV_DEFAULT,
     "i",
     "alarm_status",

From 2e6e20cf09237517d287b1d5bc0fd552e2ecc4dc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:01:21 +0100
Subject: [PATCH 1349/2040] Set the m_bHasJumped value when jumping

---
 code/fgame/player.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index e0d8920d..44f5d4ce 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7772,6 +7772,9 @@ void Player::Jump(Event *ev)
 
         // make sure the player leaves the ground
         client->ps.walking = qfalse;
+
+        // Added in 2.0
+        m_bHasJumped = true;
     }
 }
 

From dacaaa2cef842750c1813aea3b3221da7dd475e1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:02:55 +0100
Subject: [PATCH 1350/2040] Add missing variables from archive

---
 code/fgame/player.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/fgame/player.h b/code/fgame/player.h
index 9f1cfb80..06c9347c 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1132,8 +1132,21 @@ inline void Player::Archive(Archiver& arc)
     arc.ArchiveInteger(&m_iNumLeftArmShots);
     arc.ArchiveInteger(&m_iNumRightArmShots);
 
+    // Added in 2.30
+    //====
+    ArchiveEnum(m_jailstate, jailstate_t);
+    arc.ArchiveString(&m_sDmPrimary);
+    arc.ArchiveBool(&m_bIsInJail);
+    //====
+
     arc.ArchiveFloat(&m_fLastDeltaTime);
 
+    // Added in 2.0
+    //====
+    arc.ArchiveFloat(&m_fLastSprintTime);
+    arc.ArchiveBool(&m_bHasJumped);
+    //====
+
     // make sure we have the state machine loaded up
     if (arc.Loading()) {
         LoadStateTable();

From 5cb343730b7727fd76bf416d3e1d436e2e8e9b54 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:05:44 +0100
Subject: [PATCH 1351/2040] Rename Conditions to m_conditions

---
 code/fgame/player.cpp              |  4 ++--
 code/fgame/player.h                | 24 ++++++++++++------------
 code/fgame/player_conditionals.cpp |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 44f5d4ce..429bef99 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4991,9 +4991,9 @@ void Player::LoadStateTable(void)
     torso_conditionals.FreeObjectList();
 
     statemap_Legs =
-        GetStatemap(str(g_statefile->string) + "_Legs.st", (Condition<Class> *)Conditions, &legs_conditionals, false);
+        GetStatemap(str(g_statefile->string) + "_Legs.st", (Condition<Class> *)m_conditions, &legs_conditionals, false);
     statemap_Torso =
-        GetStatemap(str(g_statefile->string) + "_Torso.st", (Condition<Class> *)Conditions, &torso_conditionals, false);
+        GetStatemap(str(g_statefile->string) + "_Torso.st", (Condition<Class> *)m_conditions, &torso_conditionals, false);
 
     movecontrol = MOVECONTROL_LEGS;
 
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 06c9347c..0d3d83df 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -68,7 +68,7 @@ enum painDirection_t {
 };
 
 typedef enum {
-    ANIMSLOT_PAIN = 4,
+    ANIMSLOT_PAIN     = 4,
     ANIMSLOT_TESTANIM = 7
 } playerAnimSlot_t;
 
@@ -130,7 +130,7 @@ class Player : public Sentient
     friend class VehicleTurretGun;
 
 private:
-    static Condition<Player> Conditions[];
+    static Condition<Player> m_conditions[];
     static movecontrolfunc_t MoveStartFuncs[];
 
     StateMap *statemap_Legs;
@@ -350,7 +350,7 @@ public:
     //
     str                 m_sVision;    // current vision
     str                 m_sStateFile; // custom statefile
-    bool                m_bFrozen; // if player is frozen
+    bool                m_bFrozen;    // if player is frozen
     bool                animDoneVM;
     float               speed_multiplier[MAX_SPEED_MULTIPLIERS];
     ScriptThreadLabel   m_killedLabel;
@@ -363,8 +363,8 @@ public:
     str                 m_lastcommand;
 
 private:
-    int         m_iInstantMessageTime;
-    int         m_iTextChatTime;
+    int m_iInstantMessageTime;
+    int m_iTextChatTime;
 
 public:
     qboolean CondTrue(Conditional& condition);
@@ -807,7 +807,7 @@ public:
     void       SetPlayerSpectate(bool bNext);
     void       SetPlayerSpectateRandom(void); // Added in 2.0
     bool       IsValidSpectatePlayer(Player *pPlayer);
-    void       GetSpectateFollowOrientation(Player *pPlayer, Vector      &vPos, Vector      &vAng);
+    void       GetSpectateFollowOrientation(Player *pPlayer, Vector& vPos, Vector& vAng);
     void       UpdateStatus(const char *s);
     void       SetDM_Team(DM_Team *team);
     DM_Team   *GetDM_Team();
@@ -953,16 +953,16 @@ public:
     void SetKillHandler(Event *ev);
     void SetSpeed(Event *ev);
     void SetStateFile(Event *ev);
-    void HideEntity(Event* ev);
+    void HideEntity(Event *ev);
     void ShowEntity(Event *ev);
     void StopLocalSound(Event *ev);
     void Userinfo(Event *ev);
 #ifdef OPM_FEATURES
-    void EventEarthquake(Event* ev);
-    void SetClientFlag(Event* ev);
-    void SetEntityShader(Event* ev);
-    void SetLocalSoundRate(Event* ev);
-    void SetVMASpeed(Event* ev);
+    void EventEarthquake(Event *ev);
+    void SetClientFlag(Event *ev);
+    void SetEntityShader(Event *ev);
+    void SetLocalSoundRate(Event *ev);
+    void SetVMASpeed(Event *ev);
     void VisionGetNaked(Event *ev);
     void VisionSetBlur(Event *ev);
     void VisionSetNaked(Event *ev);
diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index f4a28bb8..c3d9f1c6 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -1913,7 +1913,7 @@ CLASS_DECLARATION(Class, Conditional, NULL) {
     {NULL, NULL}
 };
 
-Condition<Player> Player::Conditions[] = {
+Condition<Player> Player::m_conditions[] = {
     {"default",                         &Player::CondTrue                    },
     {"CHANCE",                          &Player::CondChance                  },
     {"HEALTH",                          &Player::CondHealth                  },

From ff4438bce98aed73dedb18278433380582a11d77 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:12:14 +0100
Subject: [PATCH 1352/2040] Properly load the statemap file and get the pain
 conditions when archiving

---
 code/fgame/player.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/code/fgame/player.h b/code/fgame/player.h
index 0d3d83df..c62a4efe 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1167,6 +1167,13 @@ inline void Player::Archive(Archiver& arc)
         }
         arc.ArchiveString(&tempStr);
     } else {
+        statemap_Legs = GetStatemap(
+            str(g_statefile->string) + "_Legs.st", (Condition<Class> *)m_conditions, &legs_conditionals, false
+        );
+        statemap_Torso = GetStatemap(
+            str(g_statefile->string) + "_Torso.st", (Condition<Class> *)m_conditions, &torso_conditionals, false
+        );
+
         arc.ArchiveString(&tempStr);
         if (tempStr != "NULL") {
             currentState_Legs = statemap_Legs->FindState(tempStr);
@@ -1179,6 +1186,24 @@ inline void Player::Archive(Archiver& arc)
         } else {
             currentState_Torso = NULL;
         }
+
+        for (int i = 1; i <= legs_conditionals.NumObjects(); i++) {
+            Conditional *c = legs_conditionals.ObjectAt(i);
+
+            if (Q_stricmp(c->getName(), "PAIN") && !c->parmList.NumObjects()) {
+                m_pLegsPainCond = c;
+                break;
+            }
+        }
+
+        for (int i = 1; i <= torso_conditionals.NumObjects(); i++) {
+            Conditional *c = torso_conditionals.ObjectAt(i);
+
+            if (Q_stricmp(c->getName(), "PAIN") && !c->parmList.NumObjects()) {
+                m_pTorsoPainCond = c;
+                break;
+            }
+        }
     }
 
     if (arc.Loading()) {

From 437f20dfb9a44b4f0a431e37ee10f77095c0f500 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:21:01 +0100
Subject: [PATCH 1353/2040] Set the view angles when archiving

---
 code/fgame/player.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/player.h b/code/fgame/player.h
index c62a4efe..9d85c67b 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1208,6 +1208,9 @@ inline void Player::Archive(Archiver& arc)
 
     if (arc.Loading()) {
         UpdateWeapons();
+        SetViewAngles(v_angle);
+
+        // Added in OPM
         InitModelFps();
     }
 

From 406f804ef85e4a2ebf1b720f2a7dcce69ad15f80 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:30:37 +0100
Subject: [PATCH 1354/2040] Don't jump when inside a vehicle or turret

---
 code/fgame/player.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 429bef99..aaeb41c8 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7764,6 +7764,11 @@ void Player::Jump(Event *ev)
 {
     float maxheight;
 
+    if (m_pTurret || m_pVehicle) {
+        // Don't jump when inside a vehicle or turret
+        return;
+    }
+
     maxheight = ev->GetFloat(1);
 
     if (maxheight > 16) {
@@ -7786,6 +7791,11 @@ void Player::JumpXY(Event *ev)
     float time;
     float speed;
 
+    if (m_pTurret || m_pVehicle) {
+        // Don't jump when inside a vehicle or turret
+        return;
+    }
+
     forwardmove = ev->GetFloat(1);
     sidemove    = ev->GetFloat(2);
     speed       = ev->GetFloat(3);

From 94e183089508bfe8aa7ea9b1ba90d6439c7aaebc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:32:17 +0100
Subject: [PATCH 1355/2040] Don't jump when on top of another sentient

---
 code/fgame/player.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index aaeb41c8..eb4a4488 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7769,6 +7769,14 @@ void Player::Jump(Event *ev)
         return;
     }
 
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        // Added in 2.0
+        //  Don't jump when on top of another sentient
+        if (groundentity && groundentity->entity && groundentity->entity->IsSubclassOfSentient()) {
+            return;
+        }
+    }
+
     maxheight = ev->GetFloat(1);
 
     if (maxheight > 16) {

From 1f232efdf3ba1a6307d871c1b8b4ed7b46d26018 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:32:45 +0100
Subject: [PATCH 1356/2040] Add the push velocity when jumping from a valid
 ground entity

---
 code/fgame/player.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index eb4a4488..81917d87 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7783,6 +7783,10 @@ void Player::Jump(Event *ev)
         // v^2 = 2ad
         velocity[2] += sqrt(2 * sv_gravity->integer * maxheight);
 
+        if (client->ps.groundEntityNum != ENTITYNUM_NONE) {
+            velocity += m_vPushVelocity;
+        }
+
         // make sure the player leaves the ground
         client->ps.walking = qfalse;
 
@@ -7814,6 +7818,10 @@ void Player::JumpXY(Event *ev)
     time        = distance / speed;
     velocity[2] = sv_gravity->integer * time * 0.5f;
 
+    if (client->ps.groundEntityNum != ENTITYNUM_NONE) {
+        velocity += G_GetEntity(client->ps.groundEntityNum)->velocity;
+    }
+
     airspeed = distance;
 
     // make sure the player leaves the ground

From 81e407a924ae54128775b721c27c31679d5df299 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 21:45:27 +0100
Subject: [PATCH 1357/2040] Add EXE_EXT

---
 code/qcommon/q_platform.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 392fb3e4..b4a4cd3b 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -126,6 +126,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 
 #define DLL_EXT ".dll"
+#define EXE_EXT ".exe"
 
 #elif defined(_WIN32) || defined(__WIN32__)
 
@@ -153,6 +154,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 
 #define DLL_EXT ".dll"
+#define EXE_EXT ".exe"
 
 #endif
 
@@ -178,6 +180,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".dylib"
+#define EXE_EXT ""
 
 #endif
 
@@ -251,6 +254,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -282,6 +286,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".dylib"
+#define EXE_EXT ""
 
 #endif
 
@@ -316,6 +321,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -343,6 +349,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -359,6 +366,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_BIG_ENDIAN // SGI's MIPS are always big endian
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 

From afc431c41385f27df62b0f228b03f5623810447b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 3 Nov 2024 23:47:57 +0100
Subject: [PATCH 1358/2040] Add a basic launcher

---
 CMakeLists.txt                 |  4 ++
 code/Launcher/CMakeLists.txt   | 34 +++++++++++++
 code/Launcher/launch.h         | 32 +++++++++++++
 code/Launcher/launch_linux.cpp | 80 +++++++++++++++++++++++++++++++
 code/Launcher/launch_main.cpp  | 67 ++++++++++++++++++++++++++
 code/Launcher/launch_win32.cpp | 87 ++++++++++++++++++++++++++++++++++
 code/sys/win_resource.rc       |  2 +
 7 files changed, 306 insertions(+)
 create mode 100644 code/Launcher/CMakeLists.txt
 create mode 100644 code/Launcher/launch.h
 create mode 100644 code/Launcher/launch_linux.cpp
 create mode 100644 code/Launcher/launch_main.cpp
 create mode 100644 code/Launcher/launch_win32.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eeff650..a3d823b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,3 +183,7 @@ if (NOT BUILD_NO_CLIENT)
 
 	INSTALL(TARGETS openmohaa DESTINATION "./")
 endif()
+
+# Launcher
+
+add_subdirectory(code/Launcher)
diff --git a/code/Launcher/CMakeLists.txt b/code/Launcher/CMakeLists.txt
new file mode 100644
index 00000000..5dc3f64a
--- /dev/null
+++ b/code/Launcher/CMakeLists.txt
@@ -0,0 +1,34 @@
+project(Launcher)
+
+set(LAUNCHER_SOURCES "${CMAKE_SOURCE_DIR}/code/Launcher/launch_main.cpp")
+
+if (WIN32)
+    set(LAUNCHER_SOURCES ${LAUNCHER_SOURCES}
+    "${CMAKE_SOURCE_DIR}/code/Launcher/launch_win32.cpp"
+    "${CMAKE_SOURCE_DIR}/code/sys/win_resource.rc")
+else()
+    set(LAUNCHER_SOURCES ${LAUNCHER_SOURCES}
+    "${CMAKE_SOURCE_DIR}/code/Launcher/launch_linux.cpp")
+endif()
+
+function (create_launcher name type)
+    add_executable(openmohaa_launcher_${name} ${LAUNCHER_SOURCES})
+    target_include_directories(openmohaa_launcher_${name} PUBLIC "../qcommon")
+    target_compile_definitions(openmohaa_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type})
+    target_compile_features(openmohaa_launcher_${name} PRIVATE cxx_std_17)
+    set_target_properties(openmohaa_launcher_${name} PROPERTIES OUTPUT_NAME "launch_openmohaa_${name}${TARGET_BIN_SUFFIX}")
+
+    INSTALL(TARGETS openmohaa_launcher_${name} DESTINATION "./")
+
+    add_executable(omohaaded_launcher_${name} ${LAUNCHER_SOURCES})
+    target_include_directories(omohaaded_launcher_${name} PUBLIC "../qcommon")
+    target_compile_definitions(omohaaded_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type} DEDICATED=1)
+    target_compile_features(omohaaded_launcher_${name} PRIVATE cxx_std_17)
+    set_target_properties(omohaaded_launcher_${name} PROPERTIES OUTPUT_NAME "launch_omohaaded_${name}${TARGET_BIN_SUFFIX}")
+
+    INSTALL(TARGETS omohaaded_launcher_${name} DESTINATION "./")
+endfunction()
+
+create_launcher(base 0)
+create_launcher(spearhead 1)
+create_launcher(breakthrough 2)
diff --git a/code/Launcher/launch.h b/code/Launcher/launch.h
new file mode 100644
index 00000000..3ac1ff8c
--- /dev/null
+++ b/code/Launcher/launch.h
@@ -0,0 +1,32 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// launch.h: Base interface for starting programs
+
+#include "q_platform.h"
+
+#include <filesystem>
+#include <string>
+#include <vector>
+
+std::filesystem::path GetProgramLocation();
+void LaunchProgram(const std::filesystem::path& path, const std::vector<std::string>& argumentList);
diff --git a/code/Launcher/launch_linux.cpp b/code/Launcher/launch_linux.cpp
new file mode 100644
index 00000000..ee7e7764
--- /dev/null
+++ b/code/Launcher/launch_linux.cpp
@@ -0,0 +1,80 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// main.cpp: Windows implementation of the launcher
+
+#include "launch.h"
+
+#include <unistd.h>
+#include <spawn.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+
+#include <string>
+#include <iostream>
+
+extern "C" char** environ;
+
+std::filesystem::path GetProgramLocation()
+{
+    char path[FILENAME_MAX];
+    ssize_t count = readlink("/proc/self/exe", path, FILENAME_MAX);
+
+    return std::filesystem::path(std::string(path, (count > 0) ? count : 0)).parent_path();
+}
+
+void LaunchProgram(const std::filesystem::path& path, const std::vector<std::string>& argumentList)
+{
+    pid_t pid;
+    std::string pathString = path.string();
+    size_t argCount = argumentList.size();
+    char** argv;
+    int status;
+
+    argv = new char*[argCount + 2];
+    argv[0] = (char*)pathString.c_str();
+
+    for (size_t i = 0; i < argCount; i++) {
+        argv[i + 1] = (char*)argumentList[i].c_str();
+    }
+    argv[argCount + 1] = NULL;
+
+    //status = posix_spawn(&pid, pathString.c_str(), NULL, NULL, argv, environ);
+    //delete[] argv;
+    //if (status != 0) {
+    //    std::cout << "posix_spawn returned error: " << status << std::endl;
+    //    return;
+    //}
+
+    //
+    // Using execve rather than posix_spawn
+    //  This replaces the current process that is not needed anyway
+    //
+    status = execve(pathString.c_str(), argv, environ);
+    delete[] argv;
+    if (status == -1) {
+        std::cout << "posix_spawn returned error: " << errno << std::endl;
+        return;
+    }
+
+    waitpid(pid, NULL, 0);
+}
diff --git a/code/Launcher/launch_main.cpp b/code/Launcher/launch_main.cpp
new file mode 100644
index 00000000..39e47430
--- /dev/null
+++ b/code/Launcher/launch_main.cpp
@@ -0,0 +1,67 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// main.cpp: The launcher
+
+#include "launch.h"
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+const char* targetGameList[] =
+{
+    "Base",
+    "Spearhead",
+    "Breakthrough"
+};
+
+int main(int argc, const char* argv[]) {
+    std::vector<std::string> argumentList;
+#if !defined(DEDICATED) || !DEDICATED
+    const char* programName = "openmohaa" "." ARCH_STRING DLL_SUFFIX EXE_EXT;
+#else
+    const char* programName = "omohaaded" "." ARCH_STRING DLL_SUFFIX EXE_EXT;
+#endif
+
+    argumentList.push_back("+set");
+    argumentList.push_back("com_target_game");
+    argumentList.push_back(std::to_string(TARGET_GAME));
+
+    for (size_t i = 1; i < argc; i++) {
+        argumentList.push_back(argv[i]);
+    }
+
+    std::cout << "Using the target game: " << targetGameList[TARGET_GAME] << std::endl;
+    std::cout << std::endl;
+    std::cout << "Expected program name: " << programName << std::endl;
+
+    const std::filesystem::path programLocation = GetProgramLocation();
+    const std::filesystem::path programPath = programLocation / programName;
+
+    std::cout << "Program location: " << programLocation << std::endl;
+    std::cout << "Expected path: " << programPath << std::endl;
+
+    LaunchProgram(programPath, argumentList);
+
+    return 0;
+}
diff --git a/code/Launcher/launch_win32.cpp b/code/Launcher/launch_win32.cpp
new file mode 100644
index 00000000..ed506df7
--- /dev/null
+++ b/code/Launcher/launch_win32.cpp
@@ -0,0 +1,87 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// main.cpp: Windows implementation of the launcher
+
+#include "launch.h"
+
+#include <Windows.h>
+#include <string>
+#include <iostream>
+
+std::filesystem::path GetProgramLocation()
+{
+    wchar_t path[FILENAME_MAX] = { 0 };
+    GetModuleFileNameW(nullptr, path, FILENAME_MAX);
+
+    return std::filesystem::path(path).parent_path();
+}
+
+void LaunchProgram(const std::filesystem::path& path, const std::vector<std::string>& argumentList)
+{
+    PROCESS_INFORMATION processInfo;
+    STARTUPINFOW startupInfo;
+    BOOL returnValue;
+    std::wstring osCommandLine;
+    std::wstring commandLine;
+    size_t argCount = argumentList.size();
+
+    memset(&processInfo, 0, sizeof(processInfo));
+    memset(&startupInfo, 0, sizeof(startupInfo));
+    startupInfo.cb = sizeof(startupInfo);
+
+    for (size_t i = 0; i < argCount; i++) {
+        commandLine += L"\"";
+        commandLine += std::wstring(argumentList[i].begin(), argumentList[i].end());
+        commandLine += L"\"";
+        if (i != argCount - 1) {
+            commandLine += L" ";
+        }
+    }
+
+    osCommandLine = path.wstring();
+    osCommandLine += L" ";
+    osCommandLine += commandLine;
+
+    returnValue = CreateProcessW(
+        path.wstring().c_str(),
+        (LPWSTR)osCommandLine.c_str(),
+        NULL,
+        NULL,
+        FALSE,
+        0,
+        NULL,
+        std::filesystem::current_path().wstring().c_str(),
+        &startupInfo,
+        &processInfo
+    );
+
+    if (!returnValue) {
+        std::cout << "Error in CreateProcess: " << GetLastError() << std::endl;
+        return;
+    }
+
+    WaitForSingleObject(processInfo.hProcess, INFINITE);
+
+    CloseHandle(processInfo.hProcess);
+    CloseHandle(processInfo.hThread);
+}
diff --git a/code/sys/win_resource.rc b/code/sys/win_resource.rc
index 455a6d7d..2b15dcea 100644
--- a/code/sys/win_resource.rc
+++ b/code/sys/win_resource.rc
@@ -70,11 +70,13 @@ BEGIN
     IDS_STRING1             "OpenMoHAA"
 END
 
+#ifndef NO_RC_MANIFEST
 /////////////////////////////////////////////////////////////////////////////
 //
 // Application Manifest
 //
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "win_manifest.xml"
+#endif
 
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////

From e833b08a8ee830a7f3a5db6cba23f4739a3b6ff5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Nov 2024 20:37:28 +0100
Subject: [PATCH 1359/2040] Fix G_GetAngle returning the wrong angle (was
 flipped)

---
 code/fgame/g_utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 2e741b49..5d49505e 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -921,7 +921,7 @@ float G_GetAngle(Vector movedir)
         return -2;
     }
 
-    angle = RAD2DEG(atan(1.0) * 2 + atan(movedir[0] / sqrt(-movedir[0] * movedir[0] + 1.0)));
+    angle = RAD2DEG(atan(1.0) * 2 + atan(-movedir[0] / sqrt(-movedir[0] * movedir[0] + 1.0)));
 
     if (movedir[1] < 0) {
         return 360 - angle;

From 059b0ba34fb1fc7fb925b76c83c67cce5a156580 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Nov 2024 21:21:12 +0100
Subject: [PATCH 1360/2040] Override respondTo method for TriggerEntity

This makes TriggerEntity respond to any object that is a subclass of Entity. This is useful for scripts wanting script_model to touch triggers for cinematic purposes (for example, the bike crash gag at the end of e2l2)
---
 code/fgame/trigger.cpp | 62 ++++++++++++------------------------------
 code/fgame/trigger.h   | 17 ++++++++++--
 2 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 3fc8017f..bc1f4d14 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -322,7 +322,6 @@ Trigger::Trigger()
 Trigger::~Trigger() {}
 
 void Trigger::SetTriggerDir(float angle)
-
 {
     triggerDirYaw = angle;
     triggerDir    = G_GetMovedir(angle);
@@ -330,13 +329,11 @@ void Trigger::SetTriggerDir(float angle)
 }
 
 Vector Trigger::GetTriggerDir(void)
-
 {
     return triggerDir;
 }
 
 void Trigger::SetTriggerCone(Event *ev)
-
 {
     triggerCone = cos(DEG2RAD(ev->GetFloat(1)));
 }
@@ -347,7 +344,6 @@ qboolean Trigger::UsingTriggerDir(void)
 }
 
 void Trigger::SetTriggerDir(Event *ev)
-
 {
     SetTriggerDir(ev->GetFloat(1));
 }
@@ -389,7 +385,6 @@ void Trigger::StartThread(Event *ev)
 }
 
 qboolean Trigger::respondTo(Entity *other)
-
 {
     return (
         ((respondto & TRIGGER_PLAYERS) && other->isClient())
@@ -399,7 +394,6 @@ qboolean Trigger::respondTo(Entity *other)
 }
 
 Entity *Trigger::getActivator(Entity *other)
-
 {
     return other;
 }
@@ -570,7 +564,6 @@ void Trigger::TriggerStuff(Event *ev)
 //==============================
 //
 void Trigger::ActivateTargets(Event *ev)
-
 {
     Entity     *other;
     Entity     *ent;
@@ -647,13 +640,11 @@ void Trigger::ActivateTargets(Event *ev)
 }
 
 void Trigger::EventSetWait(Event *ev)
-
 {
     wait = ev->GetFloat(1);
 }
 
 void Trigger::EventSetDelay(Event *ev)
-
 {
     delay = ev->GetFloat(1);
 }
@@ -668,19 +659,16 @@ void Trigger::EventSetThread(Event *ev)
 }
 
 void Trigger::EventSetCount(Event *ev)
-
 {
     count = ev->GetInteger(1);
 }
 
 void Trigger::EventSetMessage(Event *ev)
-
 {
     SetMessage(ev->GetString(1));
 }
 
 void Trigger::SetMessage(const char *text)
-
 {
     if (text) {
         message = Director.AddString(text);
@@ -690,19 +678,16 @@ void Trigger::SetMessage(const char *text)
 }
 
 str& Trigger::Message(void)
-
 {
     return Director.GetString(message);
 }
 
 void Trigger::EventSetNoise(Event *ev)
-
 {
     SetNoise(ev->GetString(1));
 }
 
 void Trigger::SetNoise(const char *text)
-
 {
     if (text) {
         noise = Director.AddString(text);
@@ -714,7 +699,6 @@ void Trigger::SetNoise(const char *text)
 }
 
 str& Trigger::Noise(void)
-
 {
     return Director.GetString(noise);
 }
@@ -1075,7 +1059,6 @@ TouchField::TouchField()
 }
 
 void TouchField::Setup(Entity *ownerentity, Event& touchevent, Vector min, Vector max, int respondto)
-
 {
     assert(ownerentity);
     if (!ownerentity) {
@@ -1098,7 +1081,6 @@ void TouchField::Setup(Entity *ownerentity, Event& touchevent, Vector min, Vecto
 }
 
 void TouchField::SendEvent(Event *ev)
-
 {
     Event *event;
 
@@ -1309,7 +1291,6 @@ TriggerSecret::TriggerSecret()
 }
 
 void TriggerSecret::FoundSecret(Event *ev)
-
 {
     //
     // anything that causes the trigger to fire increments the number
@@ -1395,7 +1376,6 @@ void TriggerPush::SetPushDir(Event *ev)
 }
 
 void TriggerPush::SetPushSpeed(Event *ev)
-
 {
     speed = ev->GetFloat(1);
 }
@@ -1530,7 +1510,6 @@ CLASS_DECLARATION(Trigger, TriggerPlaySound, "play_sound_triggered") {
 };
 
 void TriggerPlaySound::ToggleSound(Event *ev)
-
 {
     if (!state) {
         // noise should already be initialized
@@ -1556,7 +1535,6 @@ void TriggerPlaySound::ToggleSound(Event *ev)
 }
 
 void TriggerPlaySound::StartSound(void)
-
 {
     // turn the current one off
     state = 1;
@@ -1568,31 +1546,26 @@ void TriggerPlaySound::StartSound(void)
 }
 
 void TriggerPlaySound::SetVolume(float vol)
-
 {
     volume = vol;
 }
 
 void TriggerPlaySound::SetVolume(Event *ev)
-
 {
     volume = ev->GetFloat(1);
 }
 
 void TriggerPlaySound::SetMinDist(float dist)
-
 {
     min_dist = dist;
 }
 
 void TriggerPlaySound::SetMinDist(Event *ev)
-
 {
     min_dist = ev->GetFloat(1);
 }
 
 void TriggerPlaySound::SetChannel(Event *ev)
-
 {
     channel = ev->GetInteger(1);
 }
@@ -1726,7 +1699,6 @@ CLASS_DECLARATION(TriggerSpeaker, RandomSpeaker, "sound_randomspeaker") {
 };
 
 void RandomSpeaker::TriggerSound(Event *ev)
-
 {
     ScheduleSound();
     if (G_Random(1) <= chance) {
@@ -1735,44 +1707,37 @@ void RandomSpeaker::TriggerSound(Event *ev)
 }
 
 void RandomSpeaker::ScheduleSound(void)
-
 {
     CancelEventsOfType(EV_Trigger_Effect);
     PostEvent(EV_Trigger_Effect, mindelay + G_Random(maxdelay - mindelay));
 }
 
 void RandomSpeaker::SetMinDelay(Event *ev)
-
 {
     mindelay = ev->GetFloat(1);
 }
 
 void RandomSpeaker::SetMaxDelay(Event *ev)
-
 {
     maxdelay = ev->GetFloat(1);
 }
 
 void RandomSpeaker::SetChance(Event *ev)
-
 {
     chance = ev->GetFloat(1);
 }
 
 void RandomSpeaker::SetMinDelay(float newMinDelay)
-
 {
     mindelay = newMinDelay;
 }
 
 void RandomSpeaker::SetMaxDelay(float newMaxDelay)
-
 {
     maxdelay = newMaxDelay;
 }
 
 void RandomSpeaker::SetChance(float newChance)
-
 {
     chance = newChance;
 }
@@ -1850,7 +1815,6 @@ TriggerChangeLevel::TriggerChangeLevel()
 }
 
 void TriggerChangeLevel::SetMap(Event *ev)
-
 {
     map = ev->GetConstString(1);
 }
@@ -2137,13 +2101,11 @@ TriggerDamageTargets::TriggerDamageTargets()
 }
 
 void TriggerDamageTargets::SetDamage(Event *ev)
-
 {
     damage = ev->GetInteger(1);
 }
 
 void TriggerDamageTargets::PassDamage(Event *ev)
-
 {
     Entity     *attacker;
     int         dmg;
@@ -2179,7 +2141,6 @@ void TriggerDamageTargets::PassDamage(Event *ev)
 //
 
 void TriggerDamageTargets::DamageTargets(Event *ev)
-
 {
     Entity     *other;
     Entity     *ent;
@@ -2333,13 +2294,11 @@ TriggerExit::TriggerExit()
 }
 
 void TriggerExit::TurnExitSignOff(Event *ev)
-
 {
     level.near_exit = false;
 }
 
 void TriggerExit::DisplayExitSign(Event *ev)
-
 {
     level.near_exit = qtrue;
 
@@ -2856,7 +2815,6 @@ void TriggerByPushObject::setTriggerName(Event *event)
 }
 
 qboolean TriggerByPushObject::respondTo(Entity *other)
-
 {
     if (other->isSubclassOf(PushObject)) {
         if (triggername != STRING_EMPTY) {
@@ -2870,7 +2828,6 @@ qboolean TriggerByPushObject::respondTo(Entity *other)
 }
 
 Entity *TriggerByPushObject::getActivator(Entity *other)
-
 {
     Entity *owner;
 
@@ -3037,6 +2994,12 @@ void TriggerClickItem::SetClickItemModelEvent(Event *ev)
     link();
 }
 
+//===============
+//
+// Added in 2.0
+//
+//===============
+
 CLASS_DECLARATION(TriggerUse, TriggerNoDamage, "trigger_nodamage") {
     {&EV_Touch,          &TriggerNoDamage::TakeNoDamage},
     {&EV_Trigger_Effect, &TriggerNoDamage::TakeNoDamage},
@@ -3057,10 +3020,21 @@ void TriggerNoDamage::TakeNoDamage(Event *ev)
     ent->PostEvent(newev, level.frametime * 3);
 }
 
+//===============
+//
+// Added in 2.30
+//
+//===============
+
 CLASS_DECLARATION(Trigger, TriggerEntity, "trigger_entity") {
     {NULL, NULL}
 };
 
+qboolean TriggerEntity::respondTo(Entity* other)
+{
+    return other != NULL && other->IsSubclassOfEntity() != false;
+}
+
 Event EV_Trigger_IsAbandoned
 (
     "isabandoned",
diff --git a/code/fgame/trigger.h b/code/fgame/trigger.h
index aabcc2c1..1a4e56e9 100644
--- a/code/fgame/trigger.h
+++ b/code/fgame/trigger.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -172,7 +172,7 @@ public:
     TouchField();
     virtual void Setup(Entity *ownerentity, Event& ontouch, Vector min, Vector max, int respondto);
     void         SendEvent(Event *ev);
-    void         Archive(Archiver        &arc) override;
+    void         Archive(Archiver& arc) override;
 };
 
 inline void TouchField::Archive(Archiver& arc)
@@ -380,7 +380,7 @@ public:
     void        ChangeLevel(Event *ev);
     const char *Map(void);
     const char *SpawnSpot(void);
-    void        Archive(Archiver       &arc) override;
+    void        Archive(Archiver& arc) override;
 };
 
 class TriggerExit : public Trigger
@@ -604,6 +604,10 @@ inline void TriggerClickItem::Archive(Archiver& arc)
     Trigger::Archive(arc);
 }
 
+//
+// Added in 2.0
+//
+
 class TriggerNoDamage : public TriggerUse
 {
 public:
@@ -613,10 +617,17 @@ public:
     void TakeNoDamage(Event *ev);
 };
 
+//
+// Added in 2.30
+//
+
 class TriggerEntity : public Trigger
 {
 public:
     CLASS_PROTOTYPE(TriggerEntity);
+
+public:
+    qboolean respondTo(Entity *other) override;
 };
 
 class TriggerLandmine : public TriggerEntity

From fc0ca18632e328f16582bdd461f904b765eb3090 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Nov 2024 21:32:16 +0100
Subject: [PATCH 1361/2040] Add missing QUAKED comments

---
 code/fgame/trigger.cpp | 83 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 79 insertions(+), 4 deletions(-)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index bc1f4d14..fa17767d 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -865,6 +865,7 @@ If DAMAGE is set, the trigger will only respond to bullets
 set "message" to text string
 
 ******************************************************************************/
+
 CLASS_DECLARATION(Trigger, TriggerAll, "trigger_multipleall") {
     {&EV_Touch,    &TriggerAll::TriggerStuff},
     {&EV_Activate, &TriggerAll::TriggerStuff},
@@ -1189,7 +1190,8 @@ set "message" to text string
 
 ******************************************************************************/
 
-Event EV_TriggerSave_SaveName(
+Event EV_TriggerSave_SaveName
+(
     "savename",
     EV_DEFAULT,
     "s",
@@ -2849,10 +2851,30 @@ void TriggerByPushObject::Archive(Archiver& arc)
     Director.ArchiveString(arc, triggername);
 }
 
-Event EV_TriggerGivePowerup_OneShot("oneshot", EV_DEFAULT, NULL, NULL, "Make this a one time trigger.");
+/*****************************************************************************/
+/*QUAKED trigger_givepowerup (1 0 0) ? x x NOT_PLAYERS MONSTERS x x x DAMAGE
+Special trigger that can be triggered to give special items to sentients.
 
-Event EV_TriggerGivePowerup_PowerupName(
-    "powerupname", EV_DEFAULT, "s", "powerup_name", "Specifies the powerup to give to the sentient."
+"cnt" how many times it can be triggered (default 1, use -1 for infinite)
+"powerupname" the name of the powerup to give to sentients
+******************************************************************************/
+
+Event EV_TriggerGivePowerup_OneShot
+(
+    "oneshot",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make this a one time trigger."
+);
+
+Event EV_TriggerGivePowerup_PowerupName
+(
+    "powerupname",
+    EV_DEFAULT,
+    "s",
+    "powerup_name",
+    "Specifies the powerup to give to the sentient."
 );
 
 CLASS_DECLARATION(Trigger, TriggerGivePowerup, "trigger_givepowerup") {
@@ -3000,6 +3022,21 @@ void TriggerClickItem::SetClickItemModelEvent(Event *ev)
 //
 //===============
 
+/*****************************************************************************/
+/*QUAKED trigger_nodamage (1 0 0) ? x x NOT_PLAYERS MONSTERS
+
+Activates targets when 'used' by an entity. It cannot take damage.
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+If NOT_PLAYERS is set, the trigger does not respond to players
+If MONSTERS is set, the trigger will respond to monsters
+
+******************************************************************************/
+
 CLASS_DECLARATION(TriggerUse, TriggerNoDamage, "trigger_nodamage") {
     {&EV_Touch,          &TriggerNoDamage::TakeNoDamage},
     {&EV_Trigger_Effect, &TriggerNoDamage::TakeNoDamage},
@@ -3026,6 +3063,31 @@ void TriggerNoDamage::TakeNoDamage(Event *ev)
 //
 //===============
 
+/*****************************************************************************/
+/*QUAKED trigger_entity (1 0 0) ?
+
+Variable sized repeatable trigger that respond to entities.  Must be targeted at one or more entities.
+
+If "health" is set, the trigger must be killed to activate each time.
+If "delay" is set, the trigger waits some time after activating before firing.
+
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+if "angle" is set, the trigger will only fire when someone is facing the
+direction of the angle.
+"cone" the cone in which a directed trigger can be triggered (default 60 degrees)
+
+"wait" : Seconds between triggerings. (.2 default)
+"cnt" how many times it can be triggered (infinite default)
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+set "message" to text string
+
+******************************************************************************/
+
 CLASS_DECLARATION(Trigger, TriggerEntity, "trigger_entity") {
     {NULL, NULL}
 };
@@ -3035,6 +3097,19 @@ qboolean TriggerEntity::respondTo(Entity* other)
     return other != NULL && other->IsSubclassOfEntity() != false;
 }
 
+/*****************************************************************************/
+/*QUAKED trigger_landmine (1 0 0) ?
+
+Variable sized repeatable trigger for landmine. Must be handled by scripts.
+
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+******************************************************************************/
+
 Event EV_Trigger_IsAbandoned
 (
     "isabandoned",

From fba40370af1460dd1c88e2b23cc2e5eca74944f6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:52:49 +0100
Subject: [PATCH 1362/2040] Only create launchers for the standalone game

---
 code/Launcher/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/Launcher/CMakeLists.txt b/code/Launcher/CMakeLists.txt
index 5dc3f64a..68fa6abd 100644
--- a/code/Launcher/CMakeLists.txt
+++ b/code/Launcher/CMakeLists.txt
@@ -20,13 +20,13 @@ function (create_launcher name type)
 
     INSTALL(TARGETS openmohaa_launcher_${name} DESTINATION "./")
 
-    add_executable(omohaaded_launcher_${name} ${LAUNCHER_SOURCES})
-    target_include_directories(omohaaded_launcher_${name} PUBLIC "../qcommon")
-    target_compile_definitions(omohaaded_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type} DEDICATED=1)
-    target_compile_features(omohaaded_launcher_${name} PRIVATE cxx_std_17)
-    set_target_properties(omohaaded_launcher_${name} PROPERTIES OUTPUT_NAME "launch_omohaaded_${name}${TARGET_BIN_SUFFIX}")
-
-    INSTALL(TARGETS omohaaded_launcher_${name} DESTINATION "./")
+    #add_executable(omohaaded_launcher_${name} ${LAUNCHER_SOURCES})
+    #target_include_directories(omohaaded_launcher_${name} PUBLIC "../qcommon")
+    #target_compile_definitions(omohaaded_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type} DEDICATED=1)
+    #target_compile_features(omohaaded_launcher_${name} PRIVATE cxx_std_17)
+    #set_target_properties(omohaaded_launcher_${name} PROPERTIES OUTPUT_NAME "launch_omohaaded_${name}${TARGET_BIN_SUFFIX}")
+    #
+    #INSTALL(TARGETS omohaaded_launcher_${name} DESTINATION "./")
 endfunction()
 
 create_launcher(base 0)

From db802d1a4c1d350294efa146d918f0a709ec402a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:54:46 +0100
Subject: [PATCH 1363/2040] Update the running documentation

---
 docs/getting_started_running.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index b0dd8a73..44344c33 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -2,6 +2,8 @@
 
 ## Game selection
 
+### From command-line
+
 **Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
 
 **Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable.
@@ -13,10 +15,18 @@ To play an expansion, append the following command-line arguments to the executa
 
 With `com_target_game`, OpenMoHAA will support the network protocol accordingly. The default value of `com_target_game` is 0 for the base game (mohaa, main).
 
-On Windows, it's best to create a shortcut to the OpenMoHAA executable, and append the command-line arguments above to play an expansion.
+On Windows, a shortcut can be created to the `openmohaa` executable, with the command-line argument appended from above to play an expansion.
 
 You can now start a local OpenMOHAA server or play on a server.
 
+### From the launchers
+
+For simplicity, there are 3 launchers for the standalone game:
+
+- `launch_openmohaa_base`, this starts OpenMoHAA in **Medal of Honor: Allied Assault** mode which is the base game
+- `launch_openmohaa_spearhead`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Spearhead** mode
+- `launch_openmohaa_breakthrough`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Breakthrough** mode
+
 ## User data location
 
 The location of user-writable data, like the console logfile, saves and configuration files can be found in different locations depending on the platform:

From effbbd6c62886467c90422cf08ce2fe3bc916c75 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 01:14:21 +0100
Subject: [PATCH 1364/2040] Support long subtitles

---
 code/client/cl_uiview3d.cpp | 46 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index f7c529e3..6a74321b 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -291,53 +291,65 @@ void View3D::DrawSubtitleOverlay(void)
     line = 0;
 
     for (i = 0; i < MAX_SUBTITLES; i++) {
+        if (fadeTime[i] <= 0) {
+            continue;
+        }
+
         if (m_font->getWidth(subs[i]->string, sizeof(oldStrings[i])) > maxY) {
             char  buf[2048];
             char *c;
             char *end;
             char *start;
             float total;
+            float width;
             int   blockcount;
 
-            c = buf;
-            Q_strncpyz(buf, subs[i]->string, sizeof(buf));
+            c = subs[i]->string;
 
             total = 0;
             end   = NULL;
             start = buf;
+
             while (*c) {
                 blockcount = m_font->DBCSGetWordBlockCount(c, -1);
                 if (!blockcount) {
                     break;
                 }
 
-                total += m_font->getWidth(c, blockcount);
-                c += blockcount;
-
-                if (total > maxY) {
-                    total = 0;
-                    if (end < start) {
-                        Com_DPrintf("ERROR - word longer than possible line\n");
-                        break;
-                    }
+                width = m_font->getWidth(c, blockcount);
 
+                if (total + width > maxY) {
                     m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-                    m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, start, -1, false);
+                    m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, buf, -1, false);
 
                     m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-                    m_font->Print(20, m_font->getHeight(false) * line + minX, start, -1, false);
+                    m_font->Print(20, m_font->getHeight(false) * line + minX, buf, -1, false);
 
-                    start = end + 1;
-                    c     = end + 1;
                     line++;
+
+                    total = 0;
+                    start = buf;
                 }
+
+                end = start + blockcount + 1;
+                if (end > buf + MAX_STRING_CHARS) {
+                    Com_DPrintf("ERROR - word longer than possible line\n");
+                    break;
+                }
+
+                memcpy(start, c, blockcount);
+                start += blockcount;
+                total += width;
+                *start = 0;
+
+                c += blockcount;
             }
 
             m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-            m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, start, -1, qfalse);
+            m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, buf, -1, qfalse);
 
             m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-            m_font->Print(20, m_font->getHeight(false) * line + minX, start, -1, qfalse);
+            m_font->Print(20, m_font->getHeight(false) * line + minX, buf, -1, qfalse);
             line++;
         } else {
             m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));

From 67f822d492373f08116f85954fc0680e620c2e6a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:42:50 +0100
Subject: [PATCH 1365/2040] Process label of type 'none'

A none variable should be considered valid, it will just clear the label
---
 code/fgame/gamescript.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index ab115d79..964e90ca 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -1039,6 +1039,9 @@ void ScriptThreadLabel::SetScript(const ScriptVariable& label)
                 script->stringValue().c_str()
             );
         }
+    } else if (label.GetType() == VARIABLE_NONE) {
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
     } else {
         ScriptError("ScriptThreadLabel::SetScript: bad label type '%s'", label.GetTypeName());
     }
@@ -1129,6 +1132,9 @@ void ScriptThreadLabel::SetThread(const ScriptVariable& label)
                 script->stringValue().c_str()
             );
         }
+    } else if (label.GetType() == VARIABLE_NONE) {
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
     } else {
         ScriptError("ScriptThreadLabel::SetThread bad label type '%s'", label.GetTypeName());
     }

From 1e29fd7d2b2d61e2ded551e38b7aeb24888ccbd1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 19:52:13 +0100
Subject: [PATCH 1366/2040] Refactor SetScript/SetThread

---
 code/fgame/gamescript.cpp | 124 +++++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 49 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 964e90ca..8251e379 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -69,15 +69,16 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
         for (i = 0; i < ARRAY_LEN(cachedInfo); i++) {
             sourceinfo_t *info = &cachedInfo[i];
 
-            if (info->line && sourcePos > info->sourcePos && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
+            if (info->line && sourcePos > info->sourcePos
+                && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
                 minCachedInfo = info;
             }
         }
 
         if (minCachedInfo) {
-            start  = minCachedInfo->sourcePos;
-            line   = minCachedInfo->line;
-            column = minCachedInfo->column;
+            start   = minCachedInfo->sourcePos;
+            line    = minCachedInfo->line;
+            column  = minCachedInfo->column;
             posLine = minCachedInfo->startLinePos;
         }
     }
@@ -88,7 +89,7 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
 
         if (*p == '\n') {
             line++;
-            column  = 0;
+            column = 0;
             if (i + 1 != sourcePos) {
                 posLine = i + 1;
             }
@@ -114,7 +115,7 @@ bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column,
     cachedInfo[cachedInfoIndex].line         = line;
     cachedInfo[cachedInfoIndex].column       = column;
     cachedInfo[cachedInfoIndex].startLinePos = posLine;
-    cachedInfoIndex                       = (cachedInfoIndex + 1) % ARRAY_LEN(cachedInfo);
+    cachedInfoIndex                          = (cachedInfoIndex + 1) % ARRAY_LEN(cachedInfo);
 
     return true;
 }
@@ -1019,31 +1020,46 @@ void ScriptThreadLabel::Set(const_str label)
 
 void ScriptThreadLabel::SetScript(const ScriptVariable& label)
 {
-    if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
+    switch (label.GetType()) {
+    case VARIABLE_STRING:
         m_Script = Director.GetGameScript(label.stringValue());
         m_Label  = STRING_EMPTY;
-    } else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
-        ScriptVariable *script    = label[1];
-        ScriptVariable *labelname = label[2];
-
-        m_Script = Director.GetGameScript(script->stringValue());
-        m_Label  = labelname->constStringValue();
-
-        if (!m_Script->m_State.FindLabel(m_Label)) {
-            m_Script = NULL;
-            m_Label  = STRING_EMPTY;
-
-            ScriptError(
-                "^~^~^ Could not find label '%s' in '%s'",
-                labelname->stringValue().c_str(),
-                script->stringValue().c_str()
-            );
-        }
-    } else if (label.GetType() == VARIABLE_NONE) {
+        break;
+    case VARIABLE_CONSTSTRING:
+        m_Script = Director.GetGameScript(label.constStringValue());
+        m_Label  = STRING_EMPTY;
+        break;
+    case VARIABLE_NONE:
         m_Script = NULL;
         m_Label  = STRING_EMPTY;
-    } else {
+        break;
+    case VARIABLE_CONSTARRAY:
+        if (label.arraysize() > 1) {
+            ScriptVariable *script    = label[1];
+            ScriptVariable *labelname = label[2];
+
+            if (script->GetType() == VARIABLE_CONSTSTRING) {
+                m_Script = Director.GetGameScript(script->constStringValue());
+            } else {
+                m_Script = Director.GetGameScript(script->stringValue());
+            }
+
+            m_Label = labelname->constStringValue();
+            break;
+        }
+    default:
         ScriptError("ScriptThreadLabel::SetScript: bad label type '%s'", label.GetTypeName());
+        break;
+    }
+
+    if (m_Script && !m_Script->m_State.FindLabel(m_Label)) {
+        const str& scriptName = m_Script->Filename();
+        const str& labelName  = Director.GetString(m_Label);
+
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+
+        ScriptError("^~^~^ Could not find label '%s' in '%s'", scriptName.c_str(), labelName.c_str());
     }
 }
 
@@ -1110,33 +1126,43 @@ void ScriptThreadLabel::SetScript(const_str label)
 
 void ScriptThreadLabel::SetThread(const ScriptVariable& label)
 {
-    ScriptThread *thread = NULL;
-
-    if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
+    switch (label.GetType()) {
+    case VARIABLE_STRING:
+    case VARIABLE_CONSTSTRING:
         m_Script = Director.CurrentScriptClass()->GetScript();
         m_Label  = label.constStringValue();
-    } else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
-        ScriptVariable *script    = label[1];
-        ScriptVariable *labelname = label[2];
-
-        m_Script = Director.GetGameScript(script->stringValue());
-        m_Label  = labelname->constStringValue();
-
-        if (!m_Script->m_State.FindLabel(m_Label)) {
-            m_Script = NULL;
-            m_Label  = STRING_EMPTY;
-
-            ScriptError(
-                "^~^~^ Could not find label '%s' in '%s'",
-                labelname->stringValue().c_str(),
-                script->stringValue().c_str()
-            );
-        }
-    } else if (label.GetType() == VARIABLE_NONE) {
+        break;
+    case VARIABLE_NONE:
         m_Script = NULL;
         m_Label  = STRING_EMPTY;
-    } else {
-        ScriptError("ScriptThreadLabel::SetThread bad label type '%s'", label.GetTypeName());
+        break;
+    case VARIABLE_CONSTARRAY:
+        if (label.arraysize() > 1) {
+            ScriptVariable *script    = label[1];
+            ScriptVariable *labelname = label[2];
+
+            if (script->GetType() == VARIABLE_CONSTSTRING) {
+                m_Script = Director.GetGameScript(script->constStringValue());
+            } else {
+                m_Script = Director.GetGameScript(script->stringValue());
+            }
+
+            m_Label = labelname->constStringValue();
+            break;
+        }
+    default:
+        ScriptError("ScriptThreadLabel::SetThread: bad label type '%s'", label.GetTypeName());
+        break;
+    }
+
+    if (m_Script && !m_Script->m_State.FindLabel(m_Label)) {
+        const str& scriptName = m_Script->Filename();
+        const str& labelName  = Director.GetString(m_Label);
+
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+
+        ScriptError("^~^~^ Could not find label '%s' in '%s'", scriptName.c_str(), labelName.c_str());
     }
 }
 

From c25d0b668af6741fb949bc1f6b7ccf8c85eec2c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:30:30 +0100
Subject: [PATCH 1367/2040] Only check if m_bVisible is non-zero

---
 code/fgame/actorenemy.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index 34c828c2..86733706 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -142,7 +142,8 @@ int ActorEnemy::UpdateThreat(Actor *pSelf)
         Square(305),
         Square(254),
         Square(200),
-        Square(137)};
+        Square(137)
+    };
     static int iWeaponThreat[7][5] = {
         {5,  3,  1,  1, 1},
         {8,  6,  4,  2, 1},
@@ -165,7 +166,7 @@ int ActorEnemy::UpdateThreat(Actor *pSelf)
     }
 
     m_iThreat = 10000;
-    if (m_bVisible == true) {
+    if (m_bVisible) {
         m_iThreat = 10500;
     }
 
@@ -321,7 +322,7 @@ void ActorEnemySet::FlagBadEnemy(Sentient *pEnemy)
 
     // Added in 2.0.
     //  Set the reaction time
-    pActorEnemy->m_iNextEnemyTime       = level.inttime + 5000;
+    pActorEnemy->m_iNextEnemyTime = level.inttime + 5000;
 
     pActorEnemy->m_fLastLookTime        = level.time;
     pActorEnemy->m_fVisibility          = 0.0;

From 9f728580b646da9745ba4ba41a5c21240770fa7e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:31:56 +0100
Subject: [PATCH 1368/2040] Fix Y normal for the output color from cube being
 mistakenly used twice

This improves the overall lighting from cubemap
---
 code/renderer/tr_sphere_shade.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 22b7883c..6e00caf2 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -318,11 +318,11 @@ static void RB_Light_CubeMap(unsigned char *colors)
 
         cube = &backEnd.currentSphere->cubemap[cubeIndex];
         colorout[0] =
-            (*cube)[0][0] + (*cube)[0][1] * mapping[1] + (*cube)[0][2] * mapping[1] + (*cube)[0][3] * mapping[2];
+            (*cube)[0][0] + (*cube)[0][1] * mapping[0] + (*cube)[0][2] * mapping[1] + (*cube)[0][3] * mapping[2];
         colorout[1] =
-            (*cube)[1][0] + (*cube)[1][1] * mapping[1] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
+            (*cube)[1][0] + (*cube)[1][1] * mapping[0] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
         colorout[2] =
-            (*cube)[2][0] + (*cube)[2][1] * mapping[1] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[2];
+            (*cube)[2][0] + (*cube)[2][1] * mapping[0] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[2];
 
         for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
             float  fDistSquared;

From af084542c46e311c5cbfd97ab1817e4bb8d33b24 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:48:14 +0100
Subject: [PATCH 1369/2040] Don't set the leadside

---
 code/qcommon/cm_trace.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
index d7238063..8235e21c 100644
--- a/code/qcommon/cm_trace.c
+++ b/code/qcommon/cm_trace.c
@@ -1660,7 +1660,6 @@ qboolean CM_SightTraceThroughBrush( traceWork_t *tw, cbrush_t *brush )
 					}
 					if( f > enterFrac ) {
 						enterFrac = f;
-						leadside = side;
 					}
 				} else { // leave
 					f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );

From 6970e2d00c07398fdcebafeb1f3b7631eeb944d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:48:43 +0100
Subject: [PATCH 1370/2040] Properly check entity sight against passOwnerNum

---
 code/server/sv_world.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/server/sv_world.c b/code/server/sv_world.c
index 33b40ca1..d334f3b1 100644
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -669,9 +669,12 @@ qboolean SV_ClipSightToEntities( moveclip_t *clip, int passEntityNum2 )
 			if( touchlist[ i ] == clip->passEntityNum ) {
 				continue;	// don't clip against the pass entity
 			}
-			if( touch->r.ownerNum == clip->passEntityNum ) {
+			if( touchlist[ i ] == passOwnerNum ) {
 				continue;	// don't clip against own missiles
 			}
+			if( touch->r.ownerNum == clip->passEntityNum ) {
+				continue;	// don't clip against the pass entity
+			}
 			if( touch->r.ownerNum == passOwnerNum ) {
 				continue;	// don't clip against other missiles from our owner
 			}
@@ -681,11 +684,11 @@ qboolean SV_ClipSightToEntities( moveclip_t *clip, int passEntityNum2 )
 			if( touchlist[ i ] == passEntityNum2 ) {
 				continue;	// don't clip against the pass entity
 			}
-			if( touch->r.ownerNum == passEntityNum2 ) {
+			if( touchlist[ i ] == passOwnerNum2 ) {
 				continue;	// don't clip against own missiles
 			}
-			if( touch->r.ownerNum == passOwnerNum2 ) {
-				continue;	// don't clip against other missiles from our owner
+			if( touch->r.ownerNum == passEntityNum2 ) {
+				continue;	// don't clip against own missiles
 			}
 		}
 

From caea6e6bba0aa0e5572bb4b544a0edcb50c99817 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:58:19 +0100
Subject: [PATCH 1371/2040] Return a reference to a const str for the result of
 Target()

---
 code/fgame/simpleentity.cpp | 2 +-
 code/fgame/simpleentity.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index dc0224ab..6bcd7805 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -411,7 +411,7 @@ void SimpleEntity::GetCentroid(Event *ev)
     ev->AddVector(centroid);
 }
 
-str& SimpleEntity::Target()
+const str& SimpleEntity::Target()
 {
     return target;
 }
diff --git a/code/fgame/simpleentity.h b/code/fgame/simpleentity.h
index 235a4b6c..c29b91c5 100644
--- a/code/fgame/simpleentity.h
+++ b/code/fgame/simpleentity.h
@@ -64,7 +64,7 @@ public:
     virtual void setOrigin(Vector origin);
     virtual void setOriginEvent(Vector origin);
     virtual void setAngles(Vector angles);
-    str        & Target();
+    const str  & Target();
     qboolean     Targeted(void);
     str        & TargetName();
     virtual void SetTargetName(str targetname);

From d08f539e6d237a5cbfcf8c4d7a064aaedb40c673 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:02:08 +0100
Subject: [PATCH 1372/2040] Correctly initialize the window object

---
 code/fgame/windows.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/code/fgame/windows.cpp b/code/fgame/windows.cpp
index c0ce66e0..0976d638 100644
--- a/code/fgame/windows.cpp
+++ b/code/fgame/windows.cpp
@@ -55,6 +55,16 @@ CLASS_DECLARATION(Entity, WindowObject, "func_window") {
 
 WindowObject::WindowObject()
 {
+    if (LoadingSavegame) {
+        return;
+    }
+
+    edict->s.eType = ET_GENERAL;
+    health         = 250;
+    max_health     = health;
+    deadflag       = 0;
+    takedamage     = DAMAGE_YES;
+
     m_iDebrisType = WINDOW_GLASS;
 
     PostEvent(EV_Window_Setup, EV_POSTSPAWN);
@@ -72,24 +82,22 @@ void WindowObject::WindowSetup(Event *ev)
 {
     Entity *pEnt;
 
+    setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_BSP);
+    setContents(CONTENTS_TRIGGER);
 
     if (Target().length()) {
+        // If a target is defined,
+        // find it and set the model from it
         pEnt = (Entity *)G_FindTarget(NULL, Target());
 
         if (pEnt) {
-            // set the broken model to the target model
             m_sBrokenModel = pEnt->model;
 
+            // Don't keep the original entity
             pEnt->PostEvent(EV_Remove, 0);
         }
     }
-
-    takedamage = DAMAGE_YES;
-
-    if (health <= 0.1f) {
-        health = 100.0f;
-    }
 }
 
 void WindowObject::WindowDebrisType(Event *ev)

From a933c78d930ea4995721ac95df84b57d40527a6a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:02:30 +0100
Subject: [PATCH 1373/2040] Explosions must not kill the window immediately

---
 code/fgame/windows.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/windows.cpp b/code/fgame/windows.cpp
index 0976d638..4d51f629 100644
--- a/code/fgame/windows.cpp
+++ b/code/fgame/windows.cpp
@@ -126,7 +126,7 @@ void WindowObject::WindowDamaged(Event *ev)
         iDamage *= 2;
     } else if (iMeansOfDeath == MOD_EXPLOSION) {
         // instant break
-        iDamage = health;
+        iDamage *= 10;
     }
 
     health -= iDamage;

From ab037f1890682f8dcc57b2fc659636bac82c4127 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:03:43 +0100
Subject: [PATCH 1374/2040] Properly center the window

---
 code/fgame/windows.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/windows.cpp b/code/fgame/windows.cpp
index 4d51f629..b485987c 100644
--- a/code/fgame/windows.cpp
+++ b/code/fgame/windows.cpp
@@ -151,7 +151,8 @@ void WindowObject::WindowKilled(Event *ev)
     hideModel();
     takedamage = DAMAGE_NO;
 
-    vCenter = origin + mins + maxs;
+    vCenter = (mins + maxs) * 0.5;
+    vCenter += origin;
 
     gi.SetBroadcastVisible(vCenter, vCenter);
     gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_WINDOW_DEBRIS));

From f5d2fdbcad410efb890a9e989efb0799c9026189 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:16:15 +0100
Subject: [PATCH 1375/2040] Return an empty string if the channel is neither
 playing nor paused

It was only checking if the channel was playing. This was an issue because, in the main menu the music is paused, which means saving from main menu would not save the music filename
---
 code/client/snd_openal_new.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index a0540e4c..8e51ae43 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2571,9 +2571,14 @@ S_OPENAL_GetMusicFilename
 const char *S_OPENAL_GetMusicFilename()
 {
     // Don't call into the channel if QAL initialisation did not succeed.
-    if (!al_initialized || !openal.chan_trig_music.is_playing()) {
+    if (!al_initialized) {
         return "";
     }
+
+    if (!openal.chan_trig_music.is_playing() && !openal.chan_trig_music.is_paused()) {
+        return "";
+    }
+
     return openal.tm_filename;
 }
 

From f347102ecb2ebfbc47f3047f0e49167e8e2c33fd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:37:33 +0100
Subject: [PATCH 1376/2040] Add the skipFade parameter in bsptransition so the
 fade can be skipped

Useful for scripts that are using fadeout during cinematics and then transitioning to the nextmap, like in e2l2 where vehicles explode at the end of the mission
---
 code/fgame/scriptthread.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index f7a46eeb..92629b5e 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -1043,10 +1043,9 @@ Event EV_ScriptThread_BspTransition
 (
     "bsptransition",
     EV_DEFAULT,
-    "s",
-    "next_map",
-    "Transitions to the next BSP. Keeps player data,"
-    "and game data."
+    "sB",
+    "next_map skipFade", // Added in 2.30: skipFade
+    "Transitions to the next BSP. Keeps player data, and game data."
 );
 Event EV_ScriptThread_LevelTransition
 (
@@ -4090,9 +4089,15 @@ void ScriptThread::EventRadiusDamage(Event *ev)
 void ScriptThread::EventBspTransition(Event *ev)
 {
     str map = ev->GetString(1);
+    bool skipFade;
+
+    if (ev->NumArgs() >= 2) {
+        // Added in 2.30
+        skipFade = ev->GetBoolean(2);
+    }
 
     if (level.intermissiontime == 0.0f) {
-        G_BeginIntermission(map, TRANS_BSP);
+        G_BeginIntermission(map, TRANS_BSP, skipFade);
     }
 }
 

From 381f2b02f5d87b2d4373471b73d24c347622646f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:50:48 +0100
Subject: [PATCH 1377/2040] Add a paragraph about which release should be
 downloaded

---
 README.md                            |  2 +-
 docs/getting_started_installation.md | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6c9627c5..af2f8fdc 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 
 ## Getting started
 
-- [Installing OpenMoHAA](docs/getting_started_installation.md)
+- [Downloading and installing OpenMoHAA](docs/getting_started_installation.md)
 - [Running OpenMoHAA and using expansion assets](docs/getting_started_running.md)
 - [Dedicated server configuration](docs/configuration/server.md)
 
diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 04f4b382..2a45f8a4 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -1,6 +1,15 @@
 # Installation
 
-Ensure that you download the binaries compatible with your platform in the release section.
+Ensure that you download the binaries compatible with your platform in the [releases](https://github.com/openmoh/openmohaa/releases) section.
+
+## Which release should be downloaded?
+
+- If running Windows on AMD/Intel, CPU then `*-windows-x64.zip` is recommended
+- If running Windows on Qualcomm/Snapdragon (ARM-based) CPU, then `*-windows-arm64.zip` is the way to go
+- If running MacOS on Apple Silicon hardware, choose `*-macos-arm64.zip`
+- If running MacOS on AMD/Intel CPU, choose `*-macos-arm64.zip`
+- If running Linux on AMD/Intel CPU, then `*-linux-amd64` is generally fine. Choose the i686 version for CPUs that don't support 64-bit instructions.
+- If running Linux on a Raspberry Pi 4 or 5, then `*-linux-arm64` (if running ARM64) is the way to go
 
 ## Requirements
 

From 3e84dbe6ace8cc9c082f5f41a9a61766b3dda665 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 6 Nov 2024 18:53:43 +0100
Subject: [PATCH 1378/2040] Initialize skipFade

---
 code/fgame/scriptthread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 92629b5e..8b99f1ee 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -4089,7 +4089,7 @@ void ScriptThread::EventRadiusDamage(Event *ev)
 void ScriptThread::EventBspTransition(Event *ev)
 {
     str map = ev->GetString(1);
-    bool skipFade;
+    bool skipFade = false;
 
     if (ev->NumArgs() >= 2) {
         // Added in 2.30

From 772aad79d711c4ecd1d12485e4a9b85d53dd51ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 7 Nov 2024 19:37:12 +0100
Subject: [PATCH 1379/2040] Disable cubemap-based lighting due to rendering
 artifacts/bugs occurring

---
 code/renderer/tr_sphere_shade.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
index 6e00caf2..baf1bec2 100644
--- a/code/renderer/tr_sphere_shade.cpp
+++ b/code/renderer/tr_sphere_shade.cpp
@@ -106,13 +106,15 @@ static void RB_OptimizeLights()
     int    i, j;
     int    nCubeMapLights;
     float  fMaxIntensity;
-    vec3_t cubecolor[256];
+    vec3_t cubecolor[26];
     vec3_t colorout;
     float(*cube)[3][4];
     reallightinfo_t *pLight;
 
     nCubeMapLights = 0;
 
+    // FIXME: re-enable when cubemap light is fixed
+#if 0
     if (backEnd.currentSphere->numRealLights > 2) {
         qsort(
             backEnd.currentSphere->light,
@@ -135,6 +137,7 @@ static void RB_OptimizeLights()
             nCubeMapLights = 0;
         }
     }
+#endif
 
     backEnd.currentSphere->bUsesCubeMap = nCubeMapLights > 0;
     if (backEnd.currentSphere->bUsesCubeMap) {

From e6559c6ae65bc813c2dd503fea2f1907eddbc235 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 7 Nov 2024 20:02:49 +0100
Subject: [PATCH 1380/2040] Fire the turret only when attackleft is pressed

---
 code/fgame/weapturret.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index d249c23d..c9da66a5 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1328,7 +1328,7 @@ void TurretGun::P_UserAim(usercmd_t *ucmd)
 
     m_vUserLastCmdAng = vNewCmdAng;
 
-    if ((ucmd->buttons & BUTTON_ATTACKLEFT) || (ucmd->buttons & BUTTON_ATTACKRIGHT)) {
+    if (ucmd->buttons & BUTTON_ATTACKLEFT) {
         if (m_iFiring == 0) {
             m_iFiring = 1;
         }

From b38fedb18c461bd2595cd905c278a6f75e2839d5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 7 Nov 2024 20:23:24 +0100
Subject: [PATCH 1381/2040] Make the vehicle path drive from TurretMove

This fixes the issue where the AB41 can't be controlled
---
 code/fgame/player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 81917d87..90696410 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4198,6 +4198,11 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     client->ps.gravity = gravity * sv_gravity->value;
 
+    if (m_pVehicle) {
+        // Added in 2.30
+        m_pVehicle->PathDrive(current_ucmd);
+    }
+
     if (m_pTurret->IsSubclassOfTurretGun() && m_pTurret->UserAim(current_ucmd)) {
         client->ps.commandTime = ucmd->serverTime;
         // Added in OPM

From 66b882346f492a01d1fd72ae4b4f2135bddb5b28 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:13:56 +0100
Subject: [PATCH 1382/2040] Clear the animation delta when the animation is
 invalid

---
 code/tiki/tiki_anim.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/tiki/tiki_anim.cpp b/code/tiki/tiki_anim.cpp
index 11da77ec..468a9740 100644
--- a/code/tiki/tiki_anim.cpp
+++ b/code/tiki/tiki_anim.cpp
@@ -306,10 +306,12 @@ TIKI_Anim_Delta
 void TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta)
 {
     if (!pmdl) {
+        VectorClear(delta);
         return;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        VectorClear(delta);
         return;
     }
 

From d1fca3e4991f4ac0676ce00a7745732e3ff6c007 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:24:07 +0100
Subject: [PATCH 1383/2040] Check for valid skeletor

---
 code/tiki/tiki_tag.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/tiki/tiki_tag.cpp b/code/tiki/tiki_tag.cpp
index 4b6e2b40..a67bd0d7 100644
--- a/code/tiki/tiki_tag.cpp
+++ b/code/tiki/tiki_tag.cpp
@@ -62,6 +62,10 @@ SkelMat4 *TIKI_TransformInternal(dtiki_t *tiki, int entnum, int tagnum)
     }
 
     skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    if (!skeletor) {
+        return NULL;
+    }
+
     return &skeletor->GetBoneFrame(tagnum);
 }
 
@@ -94,6 +98,10 @@ orientation_t TIKI_OrientationInternal(dtiki_t *tiki, int entnum, int tagnum, fl
     }
 
     const skeletor_c *skeletor   = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    if (!skeletor) {
+        return orientation_t {};
+    }
+
     const SkelMat4  & pTransform = skeletor->GetBoneFrame(tagnum);
 
     orientation_t orient;

From b8cc3313b1899f10e5d2a744d214b523e5ff134d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:26:37 +0100
Subject: [PATCH 1384/2040] Check for valid tiki in PF functions

---
 code/server/sv_game.c | 124 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 107 insertions(+), 17 deletions(-)

diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 258722ff..22cc5c90 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -616,6 +616,10 @@ PF_NumAnims
 */
 int PF_NumAnims( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumAnims( tiki );
 }
 
@@ -626,6 +630,10 @@ PF_NumSurfaces
 */
 int PF_NumSurfaces( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumSurfaces( tiki );
 }
 
@@ -636,6 +644,10 @@ PF_NumTags
 */
 int PF_NumTags( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumTags( tiki );
 }
 
@@ -646,6 +658,10 @@ PF_Cross_Time
 */
 float PF_Cross_Time( dtiki_t *tiki, int anim )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_CrossblendTime( tiki, anim );
 }
 
@@ -656,6 +672,10 @@ PF_CalculateBounds
 */
 void PF_CalculateBounds( dtiki_t *tiki, float scale, vec3_t mins, vec3_t maxs )
 {
+    if (!tiki) {
+        return;
+    }
+
 	TIKI_CalculateBounds( tiki, scale, mins, maxs );
 }
 
@@ -666,6 +686,10 @@ PF_Anim_NameForNum
 */
 const char *PF_Anim_NameForNum( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_NameForNum( tiki, animnum );
 }
 
@@ -676,6 +700,10 @@ PF_Anim_NumForName
 */
 int PF_Anim_NumForName( dtiki_t *tiki, const char *name )
 {
+    if (!tiki) {
+        return -1;
+    }
+
 	return TIKI_Anim_NumForName( tiki, name );
 }
 
@@ -686,6 +714,10 @@ PF_Anim_Random
 */
 int PF_Anim_Random( dtiki_t *tiki, const char *name )
 {
+    if (!tiki) {
+        return -1;
+    }
+
 	return TIKI_Anim_Random( tiki, name );
 }
 
@@ -696,6 +728,10 @@ PF_Anim_NumFrames
 */
 int PF_Anim_NumFrames( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_NumFrames( tiki, animnum );
 }
 
@@ -706,6 +742,10 @@ PF_Anim_Time
 */
 float PF_Anim_Time( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_Time( tiki, animnum );
 }
 
@@ -716,6 +756,10 @@ PF_Anim_Frametime
 */
 float PF_Anim_Frametime( dtiki_t *tiki, int animnum )
 {
+	if (!tiki) {
+		return 0;
+	}
+
 	return TIKI_Anim_Frametime( tiki, animnum );
 }
 
@@ -726,6 +770,10 @@ PF_Anim_Delta
 */
 void PF_Anim_Delta( dtiki_t *tiki, int animnum, vec3_t delta )
 {
+	if (!tiki) {
+		return;
+	}
+
 	TIKI_Anim_Delta( tiki, animnum, delta );
 }
 
@@ -736,6 +784,10 @@ PF_Anim_HasDelta
 */
 qboolean PF_Anim_HasDelta( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
 	return TIKI_Anim_HasDelta( tiki, animnum );
 }
 
@@ -746,6 +798,10 @@ PF_Anim_DeltaOverTime
 */
 void PF_Anim_DeltaOverTime( dtiki_t *tiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta )
 {
+    if (!tiki) {
+        return;
+    }
+
 	TIKI_Anim_DeltaOverTime( tiki, iAnimnum, fTime1, fTime2, vDelta );
 }
 
@@ -756,6 +812,10 @@ PF_Anim_AngularDeltaOverTime
 */
 void PF_Anim_AngularDeltaOverTime(dtiki_t* tiki, int iAnimnum, float fTime1, float fTime2, float * fDelta)
 {
+    if (!tiki) {
+        return;
+    }
+
 	TIKI_Anim_AngularDeltaOverTime(tiki, iAnimnum, fTime1, fTime2, fDelta);
 }
 
@@ -766,6 +826,10 @@ PF_Anim_Flags
 */
 int PF_Anim_Flags( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_Flags( tiki, animnum );
 }
 
@@ -776,6 +840,10 @@ PF_Anim_FlagsSkel
 */
 int PF_Anim_FlagsSkel( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_FlagsSkel( tiki, animnum );
 }
 
@@ -786,6 +854,10 @@ PF_Anim_HasCommands
 */
 qboolean PF_Anim_HasCommands( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
 	return TIKI_Anim_HasServerCommands( tiki, animnum );
 }
 
@@ -796,6 +868,10 @@ PF_Anim_HasCommands
 */
 qboolean PF_Anim_HasCommands_Client(dtiki_t* tiki, int animnum)
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
     return TIKI_Anim_HasClientCommands(tiki, animnum);
 }
 
@@ -1038,15 +1114,15 @@ PF_Alias_FindRandom
 */
 const char *PF_Alias_FindRandom( dtiki_t *tiki, const char *alias, AliasListNode_t **ret )
 {
-	AliasList_t *alias_list = tiki->a->alias_list;
+	AliasList_t* alias_list = NULL;
 
-	alias_list = ( AliasList_t * )tiki->a->alias_list;
-	if( alias_list )
-	{
-		return Alias_ListFindRandom( alias_list, alias, ret );
+	if (tiki) {
+		alias_list = tiki->a->alias_list;
 	}
-	else
-	{
+
+	if (alias_list) {
+		return Alias_ListFindRandom(alias_list, alias, ret);
+	} else {
 		return NULL;
 	}
 }
@@ -1059,12 +1135,15 @@ PF_Alias_UpdateDialog
 */
 void PF_Alias_UpdateDialog( dtikianim_t *tiki, const char *alias )
 {
-	AliasList_t *alias_list = tiki->alias_list;
-
-	if( alias_list )
-	{
-		Alias_ListUpdateDialog( alias_list, alias );
+	AliasList_t* alias_list = NULL;
+	
+	if (tiki) {
+		alias_list = tiki->alias_list;
 	}
+
+    if (alias_list) {
+        Alias_ListUpdateDialog(alias_list, alias);
+    }
 }
 
 /*
@@ -1075,12 +1154,15 @@ PF_Alias_Dump
 */
 void PF_Alias_Dump( dtiki_t *tiki )
 {
-	AliasList_t *alias_list = tiki->a->alias_list;
+    AliasList_t* alias_list = NULL;
 
-	if( alias_list )
-	{
-		Alias_ListDump( tiki->a->alias_list );
-	}
+    if (tiki) {
+        alias_list = tiki->a->alias_list;
+    }
+
+    if (alias_list) {
+        Alias_ListDump(tiki->a->alias_list);
+    }
 }
 
 /*
@@ -1101,6 +1183,10 @@ PF_NameForNum
 */
 const char *PF_NameForNum( dtiki_t *tiki )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_Name( tiki );
 }
 
@@ -1205,6 +1291,10 @@ PF_GetSkeletor
 */
 void *PF_GetSkeletor( dtiki_t *tiki, int entnum )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_GetSkeletor( tiki, entnum );
 }
 

From c2291e92c48589490fd0ce0f0efe17428dfd4059 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:32:53 +0100
Subject: [PATCH 1385/2040] Add Anim_AngularDelta

---
 code/fgame/g_public.h   | 19 +++++++++++++++++++
 code/server/sv_game.c   | 15 +++++++++++++++
 code/tiki/tiki_anim.cpp | 23 +++++++++++++++++++++++
 code/tiki/tiki_anim.h   |  1 +
 4 files changed, 58 insertions(+)

diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 33bcb542..2729efaa 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -238,7 +238,10 @@ typedef struct gameImport_s {
     void (*Error)(int level, const char *format, ...);
     int (*Milliseconds)();
     const char *(*LV_ConvertString)(const char *string);
+
+    // Added in 2.0
     const char *(*CL_LV_ConvertString)(const char *string);
+
     void *(*Malloc)(size_t size);
     void (*Free)(void *ptr);
     cvar_t *(*Cvar_Get)(const char *varName, const char *varValue, int varFlags);
@@ -267,7 +270,10 @@ typedef struct gameImport_s {
     void (*FS_FreeFileList)(char **list);
     const char *(*GetArchiveFileName)(const char *fileName, const char *extension);
     void (*SendConsoleCommand)(const char *text);
+
+    // Added in 2.0
     void (*ExecuteConsoleCommand)(int exec_when, const char *text);
+
     void (*DebugGraph)(float value);
     void (*SendServerCommand)(int client, const char *format, ...);
     void (*DropClient)(int client, const char *reason);
@@ -325,7 +331,10 @@ typedef struct gameImport_s {
         qboolean     cylinder,
         qboolean     traceDeep
     );
+
+    // Added in 2.0
     float (*CM_VisualObfuscation)(const vec3_t start, const vec3_t end);
+
     baseshader_t *(*GetShader)(int shaderNum);
     int (*pointcontents)(const vec3_t p, int passEntityNum);
     int (*PointBrushnum)(const vec3_t p, clipHandle_t model);
@@ -345,7 +354,10 @@ typedef struct gameImport_s {
         int          entityNum,
         int          contentMask
     );
+
+    // Added in 2.0
     qboolean (*HitEntity)(gentity_t *pEnt, gentity_t *pOther);
+
     int (*imageindex)(const char *name);
     int (*itemindex)(const char *name);
     int (*soundindex)(const char *name, int streamed);
@@ -369,9 +381,16 @@ typedef struct gameImport_s {
     float (*Anim_Frametime)(dtiki_t *tiki, int animNum);
     float (*Anim_CrossTime)(dtiki_t *tiki, int animNum);
     void (*Anim_Delta)(dtiki_t *tiki, int animNum, float *delta);
+
+    // Added in 2.0
+    void (*Anim_AngularDelta)(dtiki_t *tiki, int animNum, float *delta);
+
     qboolean (*Anim_HasDelta)(dtiki_t *tiki, int animNum);
     void (*Anim_DeltaOverTime)(dtiki_t *tiki, int animNum, float time1, float time2, float *delta);
+
+    // Added in 2.0
     void (*Anim_AngularDeltaOverTime)(dtiki_t *tiki, int animNum, float time1, float time2, float *delta);
+
     int (*Anim_Flags)(dtiki_t *tiki, int animNum);
     int (*Anim_FlagsSkel)(dtiki_t *tiki, int animNum);
     qboolean (*Anim_HasCommands)(dtiki_t *tiki, int animNum);
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 22cc5c90..3934f9b0 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -777,6 +777,20 @@ void PF_Anim_Delta( dtiki_t *tiki, int animnum, vec3_t delta )
 	TIKI_Anim_Delta( tiki, animnum, delta );
 }
 
+/*
+===============
+PF_Anim_AngularDelta
+===============
+*/
+void PF_Anim_AngularDelta(dtiki_t* tiki, int animnum, vec3_t delta)
+{
+    if (!tiki) {
+        return;
+    }
+
+	TIKI_Anim_AngularDelta(tiki, animnum, delta);
+}
+
 /*
 ===============
 PF_Anim_HasDelta
@@ -1806,6 +1820,7 @@ void SV_InitGameProgs( void ) {
 	import.Anim_Frametime				= PF_Anim_Frametime;
 	import.Anim_CrossTime				= PF_Cross_Time;
 	import.Anim_Delta					= PF_Anim_Delta;
+	import.Anim_AngularDelta			= PF_Anim_AngularDelta;
 	import.Anim_HasDelta				= PF_Anim_HasDelta;
 	import.Anim_DeltaOverTime			= PF_Anim_DeltaOverTime;
 	import.Anim_AngularDeltaOverTime	= PF_Anim_AngularDeltaOverTime;
diff --git a/code/tiki/tiki_anim.cpp b/code/tiki/tiki_anim.cpp
index 468a9740..42f2c20a 100644
--- a/code/tiki/tiki_anim.cpp
+++ b/code/tiki/tiki_anim.cpp
@@ -319,6 +319,29 @@ void TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta)
     VectorScale(animData->totalDelta, pmdl->load_scale, delta);
 }
 
+/*
+===============
+TIKI_Anim_AngularDelta
+
+Added in 2.0
+===============
+*/
+void TIKI_Anim_AngularDelta(dtiki_t *pmdl, int animnum, float *delta)
+{
+    if (!pmdl) {
+        *delta = 0;
+        return;
+    }
+
+    if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        *delta = 0;
+        return;
+    }
+
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    *delta = animData->totalAngleDelta;
+}
+
 /*
 ===============
 TIKI_Anim_HasDelta
diff --git a/code/tiki/tiki_anim.h b/code/tiki/tiki_anim.h
index 368d5a40..7c10c0e5 100644
--- a/code/tiki/tiki_anim.h
+++ b/code/tiki/tiki_anim.h
@@ -36,6 +36,7 @@ extern "C" {
     float       TIKI_Anim_Time(dtiki_t *pmdl, int animnum);
     float       TIKI_Anim_Frametime(dtiki_t *pmdl, int animnum);
     void        TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta);
+    void        TIKI_Anim_AngularDelta(dtiki_t *pmdl, int animnum, float *delta);
     qboolean    TIKI_Anim_HasDelta(dtiki_t *pmdl, int animnum);
     void        TIKI_Anim_DeltaOverTime(dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta);
     void        TIKI_Anim_AngularDeltaOverTime(dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, float *fDelta);

From a51c250a3123eeb3d8f583583009803187522f99 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:33:15 +0100
Subject: [PATCH 1386/2040] Add ScriptDeprecated macros

---
 code/script/scriptexception.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/script/scriptexception.h b/code/script/scriptexception.h
index 3d67715f..5fb9ea78 100644
--- a/code/script/scriptexception.h
+++ b/code/script/scriptexception.h
@@ -48,4 +48,6 @@ public:
 void Error(const char *format, ...);
 
 #define ScriptDeprecated(function) throw ScriptException(function ": DEPRECATED. DON'T USE IT ANYMORE")
+#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: " __FUNCTION__ ": is deprecated and has been superseded by the " alternative_name " method")
+#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: " __FUNCTION__ ": is deprecated and has been superseded by the " alternative_name " variable")
 #define ScriptError                throw ScriptException

From 841a8d2b4a73052834b07fa6f193511685a09c60 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:37:22 +0100
Subject: [PATCH 1387/2040] Remove clientState_t from g_local.h (shouldn't be
 defined here)

---
 code/fgame/g_local.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index ecd759e8..ab4644ee 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -132,15 +132,6 @@ typedef struct {
 #define MAX_NETNAME    32
 #define MAX_VOTE_COUNT 3
 
-typedef enum {
-    CS_FREE,
-    CS_ZOMBIE,
-    CS_CONNECTED,
-    CS_PRIMED,
-    CS_ACTIVE
-
-} clientState_t;
-
 //
 // g_spawn.c
 //

From e6f83bc1d6237cac73beac4fa5ddc9c50a5db483 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:46:45 +0100
Subject: [PATCH 1388/2040] Fix the exit position for the base game

---
 code/fgame/vehicle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 7614b886..50a9868c 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -2038,7 +2038,7 @@ bool Vehicle::FindExitPosition(Entity *pEnt, const Vector& vOrigin, const Vector
         return false;
     }
 
-    if (g_target_game < target_game_e::TG_MOHTA || (!pEnt->IsSubclassOfPlayer() && vOrigin != vec_zero)) {
+    if ((g_target_game < target_game_e::TG_MOHTA || !pEnt->IsSubclassOfPlayer()) && vOrigin != vec_zero) {
         if (vAngles) {
             pEnt->setAngles(*vAngles);
         }

From a528e916c2981c941e314709f96bbc08bf368956 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:25:55 +0100
Subject: [PATCH 1389/2040] Add the owner when starting a thread from
 trigger_multipleall if the activator is a projectile

---
 code/fgame/trigger.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index fa17767d..949b61f9 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -522,10 +522,10 @@ void Trigger::TriggerStuff(Event *ev)
         event = new Event(EV_Trigger_StartThread);
         if (activator) {
             event->AddEntity(activator);
-        }
-        if (activator->IsSubclassOfProjectile()) {
-            Projectile *proj = static_cast<Projectile *>(activator);
-            event->AddEntity(G_GetEntity(proj->owner));
+            if (activator->IsSubclassOfProjectile()) {
+                Projectile* proj = static_cast<Projectile*>(activator);
+                event->AddEntity(G_GetEntity(proj->owner));
+            }
         }
         PostEvent(event, delay);
     }
@@ -980,10 +980,14 @@ void TriggerAll::TriggerStuff(Event *ev)
     PostEvent(event, delay);
 
     // don't trigger the thread if we were triggered by the world touching us
-    if ((activator != world) || (ev->eventnum != EV_Touch.eventnum)) {
+    if ((activator != world) || (*ev != EV_Touch)) {
         event = new Event(EV_Trigger_StartThread);
         if (activator) {
             event->AddEntity(activator);
+            if (activator->IsSubclassOfProjectile()) {
+                Projectile* proj = static_cast<Projectile*>(activator);
+                event->AddEntity(G_GetEntity(proj->owner));
+            }
         }
         PostEvent(event, delay);
     }

From 14f3e2faf91a034b66bd1f1f1e783e01cde9a0bf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:26:23 +0100
Subject: [PATCH 1390/2040] Add a comment about driver solidity

---
 code/fgame/VehicleTank.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/VehicleTank.cpp b/code/fgame/VehicleTank.cpp
index ac81ab43..bcc17fba 100644
--- a/code/fgame/VehicleTank.cpp
+++ b/code/fgame/VehicleTank.cpp
@@ -334,6 +334,9 @@ void VehicleTank::Postthink()
             //  the tank was non-solid with a player driver,
             //  instead of the driver being non-solid.
             //setSolidType(SOLID_NOT);
+
+            // Fixed in OPM
+            // Driver is made non-solid in Vehicle::MoveThink
             //driver.ent->setSolidType(SOLID_NOT);
         } else {
             driver.ent->takedamage = DAMAGE_NO;

From ac3eb58671453aa3083745d7cf36233560f7d59b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:46:25 +0100
Subject: [PATCH 1391/2040] Return 4 from getconnstate even if it's deprecated

---
 code/fgame/player.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 90696410..a5d5803e 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -1174,19 +1174,22 @@ Event EV_GetFireHeld
     EV_GETTER
 );
 Event EV_GetPrimaryFireHeld // Added in 2.30
-    ("primaryfireheld",
+(
+    "primaryfireheld",
      EV_DEFAULT,
      NULL,
      NULL,
      "returns 1 if this player is holding the primary fire, or 0 if not",
      EV_GETTER);
 Event EV_GetSecondaryFireHeld // Added in 2.30
-    ("secondaryfireheld",
+(
+    "secondaryfireheld",
      EV_DEFAULT,
      NULL,
      NULL,
      "returns 1 if this player is holding the secondary fire, or 0 if not",
-     EV_GETTER);
+     EV_GETTER
+);
 Event EV_Player_GetReady
 (
     "ready",
@@ -12160,7 +12163,10 @@ void Player::FreezeControls(Event *ev)
 
 void Player::GetConnState(Event *ev)
 {
-    ScriptDeprecated("Player::GetConnState");
+    // Assume CS_ACTIVE
+    ev->AddInteger(4);
+
+    gi.DPrintf("getconnstate is deprecated and will always return 4 (CS_ACTIVE).\nThe player is created only when the client begins (CS_ACTIVE state).\n");
 }
 
 void Player::GetDamageMultiplier(Event *ev)

From 1f69fce10e0818d72ff2ba4b2d5d3bfdba8a17a5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:06:51 +0100
Subject: [PATCH 1392/2040] Don't check for CONTENTS_BBOX on the base game for
 large bullets passing through entities

Some mods have tanks with mounted turrets and this would cause issues as the bullet would hit the tank instead
---
 code/fgame/weaputils.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index d0da7da2..f2a7072a 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2378,11 +2378,10 @@ float BulletAttack(
                     if (trace.surfaceFlags & (SURF_FOLIAGE | SURF_GLASS | SURF_PUDDLE | SURF_PAPER)
                         || trace.contents & (CONTENTS_CLAYPIDGEON | CONTENTS_WATER)
                         || (g_protocol < protocol_e::PROTOCOL_MOHTA && trace.startsolid)
-                        || (bulletlarge && trace.ent && trace.ent->r.contents & CONTENTS_BBOX && !trace.ent->r.bmodel
+                        || (bulletlarge && trace.ent && (g_protocol < protocol_e::PROTOCOL_MOHTA || (trace.ent->r.contents & CONTENTS_BBOX)) && !trace.ent->r.bmodel
                             && trace.ent->entity->takedamage)
                         || ((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
-                        || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal)
-                               && iContinueCount < 5) {
+                        || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal && iContinueCount < 5)) {
                         if (((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
                             || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal)) {
                             if (trace.contents & CONTENTS_FENCE) {
@@ -2406,7 +2405,7 @@ float BulletAttack(
                                         VectorAdd(tracethrough.endpos, vTmpEnd, tracethrough.endpos);
                                     }
                                 } else {
-                                    trace.fraction = 1.f;
+                                    trace.fraction = 1;
                                     bBulletDone    = qtrue;
 
                                     if (g_showbullettrace->integer) {
@@ -2439,7 +2438,7 @@ float BulletAttack(
                             iContinueCount++;
                         }
                     } else {
-                        trace.fraction = 1.f;
+                        trace.fraction = 1;
                         bBulletDone    = qtrue;
                     }
                 }
@@ -2447,7 +2446,7 @@ float BulletAttack(
                 if (oldfrac != trace.fraction) {
                     oldfrac = trace.fraction;
                 } else {
-                    trace.fraction = 1.f;
+                    trace.fraction = 1;
                 }
             }
         }

From 888e35466bba31b67a36eaacb97febbb4fe5f0d0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:28:33 +0100
Subject: [PATCH 1393/2040] Drop error if the Script cannot load the file

---
 code/qcommon/script.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/qcommon/script.cpp b/code/qcommon/script.cpp
index e223696d..6e98a496 100644
--- a/code/qcommon/script.cpp
+++ b/code/qcommon/script.cpp
@@ -1131,6 +1131,10 @@ void Script::LoadFile(const char *name)
     Close();
 
     length = FILE_FS_ReadFile(name, (void **)&tempbuf);
+    if (length == -1) {
+        error("LoadFile", "Couldn't load %s\n", name);
+        return;
+    }
 
     hasError = false;
 

From 332d209f62e22f6f22cdf58d9019fac819456fc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:31:49 +0100
Subject: [PATCH 1394/2040] Check if the turret's vehicle entity is valid

---
 code/fgame/weaputils.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index f2a7072a..e5d23952 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1296,15 +1296,19 @@ void Projectile::Touch(Event *ev)
     explEv->AddEntity(other);
     ProcessEvent(explEv);
 
+    //
+    // Added in 2.30
+    //  Check for projectile vulnerability
+    //
+
     Vehicle* pVehicle = NULL;
 
-    // Added in 2.30
     if (other->IsSubclassOfVehicle()) {
         pVehicle = static_cast<Vehicle*>(other);
     } else if (other->IsSubclassOfVehicleTurretGun()) {
         VehicleTurretGun* pTurret = static_cast<VehicleTurretGun*>(other);
         Entity* pEnt = pTurret->GetVehicle();
-        if (pEnt->IsSubclassOfVehicle()) {
+        if (pEnt && pEnt->IsSubclassOfVehicle()) {
             pVehicle = static_cast<Vehicle*>(pEnt);
         }
     } else if (other->isSubclassOf(VehicleCollisionEntity)) {

From f34aad03cd352e493988513265a8e3e6cf4cbd66 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 00:18:59 +0100
Subject: [PATCH 1395/2040] Add script owner implementation

---
 code/fgame/item.cpp       | 15 +++++++++++++++
 code/fgame/item.h         |  8 ++++++++
 code/qcommon/listener.cpp |  9 +++++++++
 code/qcommon/listener.h   |  1 +
 4 files changed, 33 insertions(+)

diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp
index 07cd43fa..63407d3e 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -903,6 +903,21 @@ void Item::Landed(Event *ev)
     setMoveType(MOVETYPE_NONE);
 }
 
+Listener *Item::GetScriptOwner()
+{
+    return owner;
+}
+
+void Item::SetScriptOwner(Listener *newOwner)
+{
+    if (!newOwner || !newOwner->isSubclassOf(Sentient)) {
+        owner = NULL;
+        return;
+    }
+
+    owner = static_cast<Sentient*>(newOwner);
+}
+
 #ifdef OPM_FEATURES
 void Item::EventViewModelPrefix(Event *ev)
 {
diff --git a/code/fgame/item.h b/code/fgame/item.h
index 2d0ba760..69516ca5 100644
--- a/code/fgame/item.h
+++ b/code/fgame/item.h
@@ -121,6 +121,14 @@ public:
 
     void Archive(Archiver& arc) override;
 
+public:
+    //
+    // Added in OPM
+    //
+
+    Listener *GetScriptOwner() override;
+    void SetScriptOwner(Listener *newOwner) override;
+
 #ifdef OPM_FEATURES
     //
     // Custom openmohaa stuff
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 9611ee28..2d141d4c 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -3054,6 +3054,15 @@ Listener *Listener::GetScriptOwner(void)
     return NULL;
 }
 
+/*
+=======================
+SetScriptOwner
+=======================
+*/
+void Listener::SetScriptOwner(Listener* newOwner)
+{
+}
+
 #ifdef WITH_SCRIPT_ENGINE
 
 /*
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 8bf343d5..7e6a7c29 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -481,6 +481,7 @@ public:
 #endif
 
     virtual Listener *GetScriptOwner(void);
+    virtual void SetScriptOwner(Listener *newOwner);
 
     Listener();
     virtual ~Listener();

From 2e0e5db260372c8e51d7fcdffd15b8f190671b0a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 00:19:12 +0100
Subject: [PATCH 1396/2040] Implement bindweap

---
 code/fgame/player.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index a5d5803e..7da1a731 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -12051,8 +12051,24 @@ void Player::IsAdmin(Event* ev)
 
 void Player::BindWeap(Event* ev)
 {
-    // FIXME: TODO
-    UNIMPLEMENTED();
+    Entity *ent = ev->GetEntity(1);
+    Listener *scriptOwner;
+
+    //
+    // FIXME: deprecate and use something else instead
+    //  like implement this in the Item class directly
+    //  this is dangerous to use especially if the weapon
+    //  is a VehicleTurretGun, could easily mess up the camera
+
+    if (ent) {
+        scriptOwner = ent->GetScriptOwner();
+
+        if (scriptOwner != this) {
+            ent->SetScriptOwner(this);
+        } else {
+            ent->SetScriptOwner(NULL);
+        }
+    }
 }
 
 void Player::AddDeaths(Event *ev)

From f646151ce2c2c44eebcf689373164c6cba29f5e1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 13:27:24 +0100
Subject: [PATCH 1397/2040] Set medium difficulty by default

---
 code/server/sv_ccmds.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index b6358f41..97b469ba 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1697,11 +1697,9 @@ void SV_AddOperatorCommands(void) {
 	Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
 	Cmd_AddCommand("difficultyHard", SV_HardMode_f);
 
-	if (developer->integer) {
-		SV_MediumMode_f();
-	} else {
-		SV_EasyMode_f();
-	}
+	// Changed in 2.0
+	//  Set medium mode regardless of if the developer mode is set
+	SV_MediumMode_f();
 }
 
 /*

From 0dca08a66a9fb6ceb38cc50aaf03035cb227bc02 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 14:35:52 +0100
Subject: [PATCH 1398/2040] Fix actor position on a turret

---
 code/fgame/actor_machinegunner.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/fgame/actor_machinegunner.cpp b/code/fgame/actor_machinegunner.cpp
index 5f42bcb6..f79690f3 100644
--- a/code/fgame/actor_machinegunner.cpp
+++ b/code/fgame/actor_machinegunner.cpp
@@ -145,31 +145,31 @@ void Actor::ThinkHoldGun_TurretGun(void)
         if (m_State == ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
             m_fCrouchWeight = 0;
 
-            temp = (origin[2] + 71.6f - m_pTurret->origin[2]) / 39.f;
+            temp = (origin[2] + 71.6f - m_pTurret->origin[2]) / 39.0f;
             if (temp >= -1.0 && temp <= 1.0) {
                 m_pTurret->angles[0] = RAD2DEG(atan(temp / sqrt(temp * -temp + 1)));
                 m_pTurret->setAngles(m_pTurret->angles);
             }
         } else {
             m_fCrouchWeight = machine_gunner_hands_up_stand / 17.1f;
-            if (m_fCrouchWeight < -1.0) {
-                m_fCrouchWeight = -1.0;
+            if (m_fCrouchWeight < -1.0f) {
+                m_fCrouchWeight = -1.0f;
             }
         }
 
-        VectorScale2D(orientation[0], -(m_fCrouchWeight * -9.3f + 23.4f), offset);
+        VectorScale2D(orientation[0], -(23.4 - m_fCrouchWeight * 9.3), offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
-        VectorScale2D(orientation[1], m_fCrouchWeight * 2.6f + 10.3f, offset);
+        VectorScale2D(orientation[1], 10.3 + m_fCrouchWeight * 2.6, offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
     } else {
-        m_fCrouchWeight = machine_gunner_hands_up_stand / (heightDiff - 38.7f);
+        m_fCrouchWeight = machine_gunner_hands_up_stand / (heightDiff - 38.7);
         if (m_fCrouchWeight > 1.0) {
             m_fCrouchWeight = 1.0;
         }
 
-        VectorScale2D(orientation[0], -(m_fCrouchWeight * -3.f + 23.4f), offset);
+        VectorScale2D(orientation[0], -(23.4 - m_fCrouchWeight * 3.0), offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
-        VectorScale2D(orientation[1], m_fCrouchWeight * -1.6f + 10.3f, offset);
+        VectorScale2D(orientation[1], 10.3 - m_fCrouchWeight * 1.6, offset);
         VectorAdd2D(newOrigin, offset, newOrigin);
     }
 
@@ -182,11 +182,11 @@ void Actor::ThinkHoldGun_TurretGun(void)
     UpdateAimMotion();
     UpdateAnim();
 
-    newOrigin[2] += 18;
+    newOrigin[2] = origin[2] + 18.0;
 
     end[0] = newOrigin[0];
     end[1] = newOrigin[1];
-    end[2] = newOrigin[2] - 94;
+    end[2] = origin[2] - 94.0;
     trace  = G_Trace(newOrigin, MINS, MAXS, end, this, MASK_PATHSOLID, qfalse, "Actor::ThinkHoldGun_TurretGun");
 
     if (trace.fraction != 1.0 && !trace.startsolid && !trace.allsolid && trace.ent) {

From f3bbcba4f09bd1838ca9f7a881c6a52bff9660b2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 15:16:46 +0100
Subject: [PATCH 1399/2040] Set blue horizontal lines for debug bbox

---
 code/fgame/debuglines.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp
index cefedb92..e75c6e09 100644
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
@@ -287,6 +287,8 @@ void G_DebugBBox(Vector org, Vector mins, Vector maxs, float r, float g, float b
     G_Vertex(points[4]);
     G_EndLine();
 
+    G_Color4f(0, 0, 1, alpha);
+
     for (i = 0; i < 4; i++) {
         G_BeginLine();
         G_Vertex(points[i]);
@@ -349,6 +351,8 @@ void G_DebugRotatedBBox(Vector org, Vector ang, Vector mins, Vector maxs, float
     G_Vertex(points[4]);
     G_EndLine();
 
+    G_Color4f(0, 0, 1, alpha);
+
     for (i = 0; i < 4; i++) {
         G_BeginLine();
         G_Vertex(points[i]);

From 7afc2427ac254e838b2ab71ba8ae5f356fb59fc9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 15:51:11 +0100
Subject: [PATCH 1400/2040] Finish DrawBoundingBox() entity implementation

---
 code/fgame/entity.cpp | 121 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 11 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 394fe3cb..2aa2bb8b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5998,20 +5998,119 @@ void Entity::DrawBoundingBox(int showbboxes)
         }
         break;
     default:
-        if (IsSubclassOfAnimate() && edict->tiki) {
-            Animate *anim;
-            vec3_t   mins, maxs;
-
-            anim = (Animate *)this;
-            // FIXME
-            G_DebugBBox(origin, mins, maxs, 0, 1, 0, 1);
-        } else {
-            G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
-        }
         break;
     }
 
-    // FIXME: not implemented (implement the rest...)
+    if ((showbboxes >= 9 && showbboxes <= 28) || (showbboxes >= -28 && showbboxes <= -9)) {
+        qboolean bDoPlayer = qfalse;
+        
+        if (showbboxes >= 0) {
+            bDoPlayer = qfalse;
+        } else {
+            showbboxes = -showbboxes;
+            bDoPlayer = qtrue;
+        }
+
+        if (edict->s.solid == SOLID_NOT) {
+            return;
+        }
+
+        if ((edict != g_entities && !bDoPlayer) || (edict == g_entities && bDoPlayer)) {
+            int i, j;
+            int iTagNum;
+            int iCap;
+            float fRadius;
+            const char *pszTagName;
+            vec3_t vOffset;
+            vec3_t vPos;
+            vec3_t vColor;
+            orientation_t orTag;
+            orientation_t orPosition;
+
+            if (!IsSubclassOfSentient() || !edict->tiki) {
+                G_DebugBBox(origin, mins, maxs, 1.0, 1.0, 0.0, 1.0);
+                return;
+            }
+
+            AnglesToAxis(angles, orientation);
+
+            if (showbboxes <= 9 && showbboxes >= -9) {
+                i = 0;
+                iCap = 19;
+            } else {
+                i = showbboxes - 10;
+                if (i >= 18) {
+                    return;
+                }
+
+                iCap = i + 1;
+            }
+
+            for (; i < iCap; i++) {
+                pszTagName = gi.CM_GetHitLocationInfo(i, &fRadius, vOffset);
+
+                if (sv_testloc_num->integer - 1 == i || (sv_testloc_num->integer && (showbboxes > 9 || showbboxes < -9))) {
+                    fRadius = sv_testloc_radius->value;
+                    vOffset[0] = sv_testloc_offset_x->value;
+                    vOffset[1] = sv_testloc_offset_y->value;
+                    vOffset[2] = sv_testloc_offset_z->value;
+                    vColor[0] = 1.0;
+                    vColor[1] = 0.5;
+                    vColor[2] = 0.0;
+                } else {
+                    vColor[0] = 0.0;
+                    vColor[1] = 0.5;
+                    vColor[2] = 1.0;
+                }
+
+                iTagNum = gi.Tag_NumForName(edict->tiki, pszTagName);
+                if (iTagNum < 0) {
+                    return;
+                }
+
+                orTag = G_TIKI_Orientation(edict, iTagNum & TAG_MASK);
+                VectorCopy(origin, orPosition.origin);
+
+                for (j = 0; j < 3; j++) {
+                    VectorMA(orPosition.origin, orTag.origin[j], orientation[j], orPosition.origin);
+                }
+
+                MatrixMultiply(orTag.axis, orientation, orPosition.axis);
+                MatrixTransformVector(vOffset, orPosition.axis, vPos);
+                VectorAdd(orPosition.origin, vPos, vPos);
+
+                G_DebugCircle(vPos, fRadius, vColor[0], vColor[1], vColor[2], 1.0);
+
+                pszTagName = gi.CM_GetHitLocationInfoSecondary(i, &fRadius, vOffset);
+                vColor[0] = 0.5;
+                vColor[1] = 0.0;
+                vColor[2] = 1.0;
+
+                if (!pszTagName || sv_testloc_num->integer - 1 == i || (sv_testloc_num->integer && (showbboxes > 9 || showbboxes < -9))) {
+                    if (!sv_testloc_secondary->integer) {
+                        continue;
+                    }
+
+                    if (sv_testloc_num->integer - 1 != i && (!sv_testloc_num->integer || (showbboxes <= 9 && showbboxes >= -9))) {
+                        continue;
+                    }
+
+                    fRadius = sv_testloc_radius2->value;
+                    vOffset[0] = sv_testloc_offset2_x->value;
+                    vOffset[1] = sv_testloc_offset2_y->value;
+                    vOffset[2] = sv_testloc_offset2_z->value;
+                    vColor[0] = 1.0;
+                    vColor[1] = 0.0;
+                    vColor[2] = 0.5;
+                }
+
+                MatrixTransformVector(vOffset, orPosition.axis, vPos);
+                VectorAdd(orPosition.origin, vPos, vPos);
+
+                G_DebugCircle(vPos, fRadius, vColor[0], vColor[1], vColor[2], 1.0);
+            }
+        }
+    }
 }
 
 qboolean Entity::IsDead(void) const

From 2b06cc690e8fe90bd9dabaf2455f4e0135b0e9d5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 16:02:57 +0100
Subject: [PATCH 1401/2040] Add reloadmap server command from Breakthrough

---
 code/server/sv_ccmds.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 97b469ba..984b1b03 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1573,6 +1573,39 @@ void SV_LoadLastGame_f( void )
 	Cbuf_AddText( va( "loadgame %s\n", Cvar_Get( "g_lastsave", "", 0 )->string ) );
 }
 
+/*
+=================
+SV_ReloadMap_f
+
+Added in 2.30
+Reload the whole map.
+=================
+*/
+void SV_ReloadMap_f(void)
+{
+	qboolean bTransition;
+
+	Com_DPrintf("SV_ReloadMap\n");
+
+	if (!svs.mapName[0]) {
+		return;
+	}
+
+    Q_strncpyz(svs.gameName, "current", sizeof(svs.gameName));
+	Cvar_SaveGameRestart_f();
+
+	bTransition = sv.state == SS_GAME;
+	if (bTransition) {
+		SV_ArchivePersistantFile(qfalse);
+	}
+
+	SV_SpawnServer(svs.mapName, qfalse, qfalse, bTransition);
+
+	if (g_gametype->integer == GT_SINGLE_PLAYER) {
+		svs.autosave = qtrue;
+	}
+}
+
 #if 0
 
 /*
@@ -1697,6 +1730,9 @@ void SV_AddOperatorCommands(void) {
 	Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
 	Cmd_AddCommand("difficultyHard", SV_HardMode_f);
 
+	// Added in 2.30
+    Cmd_AddCommand("reloadmap", SV_ReloadMap_f);
+
 	// Changed in 2.0
 	//  Set medium mode regardless of if the developer mode is set
 	SV_MediumMode_f();

From ec73268f946903e506760468f8928a65709dd530 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 19:21:24 +0100
Subject: [PATCH 1402/2040] Reorder methods

---
 code/client/cl_uiview3d.cpp | 559 ++++++++++++++++++------------------
 1 file changed, 283 insertions(+), 276 deletions(-)

diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 6a74321b..f42f3e7a 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -50,16 +50,6 @@ View3D::View3D()
     m_locationprint = qfalse;
 }
 
-void View3D::UpdateLocationPrint(int x, int y, const char *s, float alpha)
-{
-    m_printstring   = s;
-    m_printalpha    = alpha;
-    m_printfadetime = 4000.0;
-    m_x_coord       = x;
-    m_y_coord       = y;
-    m_locationprint = qtrue;
-}
-
 void View3D::UpdateCenterPrint(const char *s, float alpha)
 {
     m_printstring = s;
@@ -75,6 +65,140 @@ void View3D::UpdateCenterPrint(const char *s, float alpha)
     m_locationprint = qfalse;
 }
 
+void View3D::UpdateLocationPrint(int x, int y, const char *s, float alpha)
+{
+    m_printstring   = s;
+    m_printalpha    = alpha;
+    m_printfadetime = 4000.0;
+    m_x_coord       = x;
+    m_y_coord       = y;
+    m_locationprint = qtrue;
+}
+
+void View3D::FrameInitialized(void)
+{
+    Connect(this, W_Activated, W_Activated);
+    Connect(this, W_Deactivated, W_Deactivated);
+}
+
+void View3D::Pressed(Event *ev)
+{
+    IN_MouseOff();
+    OnActivate(ev);
+}
+
+void View3D::OnActivate(Event *ev)
+{
+    UIWidget         *wid;
+    UList<UIWidget *> widgets;
+
+    UI_CloseInventory();
+    Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_UI);
+
+    for (wid = getParent()->getFirstChild(); wid; wid = getParent()->getNextChild(wid)) {
+        if (wid->getAlwaysOnBottom() && wid != this) {
+            widgets.AddTail(wid);
+        }
+    }
+
+    widgets.IterateFromHead();
+    while (widgets.IsCurrentValid()) {
+        widgets.getCurrent()->BringToFrontPropogated();
+        widgets.IterateNext();
+    }
+}
+
+void View3D::OnDeactivate(Event *ev)
+{
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
+}
+
+void View3D::DrawFPS(void)
+{
+    char string[128];
+
+    setFont("verdana-14");
+    if (fps->integer == 2) {
+        re.SetColor(UBlack);
+        re.DrawBox(
+            0.0,
+            m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 4.0,
+            m_frame.pos.x + m_frame.size.width,
+            m_font->getHeight(qfalse) * 4.0
+        );
+    }
+
+    Com_sprintf(string, sizeof(string), "FPS %4.1f", currentfps);
+    if (currentfps > 23.94) {
+        if (cl_greenfps->integer) {
+            m_font->setColor(UGreen);
+        } else {
+            m_font->setColor(UWhite);
+        }
+    } else if (currentfps > 18.0) {
+        m_font->setColor(UYellow);
+    } else {
+        // low fps
+        m_font->setColor(URed);
+    }
+
+    m_font->Print(
+        m_font->getHeight(qfalse) * 10.0,
+        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 3.0,
+        string,
+        -1,
+        qfalse
+    );
+
+    // Draw elements count
+    if (cl_greenfps->integer) {
+        m_font->setColor(UGreen);
+    } else {
+        m_font->setColor(UWhite);
+    }
+
+    Com_sprintf(string, sizeof(string), "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
+
+    m_font->Print(
+        m_font->getHeight(qfalse) * 10.0,
+        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 2.0,
+        string,
+        -1,
+        qfalse
+    );
+
+    Com_sprintf(
+        string,
+        sizeof(string),
+        "t%5d v%5d Mtex%5.2f",
+        cls.total_tris,
+        cls.total_verts,
+        (float)cls.total_texels * 0.00000095367432
+    );
+
+    m_font->Print(
+        m_font->getHeight(qfalse) * 10.0,
+        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse),
+        string,
+        -1,
+        qfalse
+    );
+
+    m_font->setColor(UBlack);
+}
+
+/*
+void ProfPrint(UIFont* m_font, float minY, int line, char* label, prof_var_t* var, int level)
+{
+
+}
+*/
+
+void View3D::DrawProf(void)
+{
+    // FIXME: unimplemented
+}
+
 void View3D::PrintSound(int channel, const char *name, float vol, int rvol, float pitch, float base, int& line)
 {
     char  buf[255];
@@ -112,35 +236,114 @@ void View3D::PrintSound(int channel, const char *name, float vol, int rvol, floa
     line++;
 }
 
-void View3D::Pressed(Event *ev)
+void View3D::DrawSoundOverlay(void)
 {
-    IN_MouseOff();
-    OnActivate(ev);
+    setFont("verdana-14");
+    m_font->setColor(UWhite);
+
+    // FIXME: TODO
+    if (sound_overlay->integer) {
+        Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
+        Cvar_Set("sound_overlay", "0");
+    }
 }
 
-void View3D::OnDeactivate(Event *ev)
+void View3D::Draw2D(void)
 {
-    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
-}
+    if (!cls.no_menus) {
+        DrawFades();
+    }
 
-void View3D::OnActivate(Event *ev)
-{
-    UIWidget         *wid;
-    UList<UIWidget *> widgets;
+    DrawLetterbox();
 
-    UI_CloseInventory();
-    Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_UI);
+    if ((cl_debuggraph->integer || cl_timegraph->integer) && !cls.no_menus) {
+        SCR_DrawDebugGraph();
+    } else if (!cls.no_menus) {
+        if (cge) {
+            cge->CG_Draw2D();
+        }
 
-    for (wid = getParent()->getFirstChild(); wid; wid = getParent()->getNextChild(wid)) {
-        if (wid->getAlwaysOnBottom() && wid != this) {
-            widgets.AddTail(wid);
+        if (m_locationprint) {
+            LocationPrint();
+        } else {
+            CenterPrint();
+        }
+
+        if (!cls.no_menus) {
+            DrawSoundOverlay();
+            DrawSubtitleOverlay();
         }
     }
 
-    widgets.IterateFromHead();
-    while (widgets.IsCurrentValid()) {
-        widgets.getCurrent()->BringToFrontPropogated();
-        widgets.IterateNext();
+    if (fps->integer && !cls.no_menus) {
+        DrawFPS();
+        DrawProf();
+    }
+}
+
+void View3D::CenterPrint(void)
+{
+    float       alpha;
+    const char *p;
+    qhandle_t   mat;
+    float       x, y;
+    float       w, h;
+
+    if (!m_printfadetime) {
+        return;
+    }
+
+    p = Sys_LV_CL_ConvertString(m_printstring);
+    if (m_printfadetime > 3250) {
+        alpha = 1.f - (m_printfadetime - 3250.f) / 750.f * m_printalpha;
+    } else if (m_printfadetime >= 750) {
+        alpha = 1.f;
+    } else {
+        alpha = m_printfadetime / 750.f * m_printalpha;
+    }
+
+    alpha = Q_clamp_float(alpha, 0, 1);
+
+    if (!m_print_mat) {
+        UIRect2D frame;
+        m_font->setColor(UColor(0, 0, 0, alpha));
+
+        frame = getClientFrame();
+
+        m_font->PrintJustified(
+            UIRect2D(frame.pos.x + 1, frame.pos.y + 1, frame.size.width, frame.size.height),
+            m_iFontAlignmentHorizontal,
+            m_iFontAlignmentVertical,
+            p,
+            m_bVirtual ? m_vVirtualScale : NULL
+        );
+
+        m_font->setColor(UColor(1, 1, 1, alpha));
+
+        frame = getClientFrame();
+
+        m_font->PrintJustified(
+            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, m_bVirtual ? m_vVirtualScale : NULL
+        );
+
+        m_font->setColor(UBlack);
+    } else if ((mat = m_print_mat->GetMaterial())) {
+        vec4_t col {alpha, alpha, alpha, alpha};
+
+        re.SetColor(col);
+
+        w = re.GetShaderWidth(mat);
+        h = re.GetShaderHeight(mat);
+        x = (m_frame.pos.x + m_frame.size.width - w) * 0.5f;
+        y = (m_frame.pos.y + m_frame.size.height - h) * 0.5f;
+
+        re.DrawStretchPic(x, y, w, h, 0, 0, 1, 1, mat);
+    }
+
+    m_printfadetime -= cls.frametime;
+
+    if (m_printfadetime < 0) {
+        m_printfadetime = 0;
     }
 }
 
@@ -214,9 +417,55 @@ void View3D::LocationPrint(void)
     }
 }
 
-qboolean View3D::LetterboxActive(void)
+void View3D::DrawLetterbox(void)
 {
-    return m_letterbox_active;
+    float  frac;
+    vec4_t col;
+
+    col[0] = col[1] = col[2] = 0;
+    col[3]                   = 1;
+
+    frac = (float)cl.snap.ps.stats[STAT_LETTERBOX] / MAX_LETTERBOX_SIZE;
+    if (frac <= 0) {
+        m_letterbox_active = false;
+        return;
+    }
+
+    m_letterbox_active = true;
+    re.SetColor(col);
+
+    re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height * frac);
+    re.DrawBox(
+        0.0,
+        m_screenframe.size.height - m_screenframe.size.height * frac,
+        m_screenframe.size.width,
+        m_screenframe.size.height
+    );
+}
+
+void View3D::DrawFades(void)
+{
+    if (cl.snap.ps.blend[3] > 0) {
+        re.SetColor(cl.snap.ps.blend);
+        if (cl.snap.ps.stats[STAT_ADDFADE]) {
+            re.AddBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
+        } else {
+            re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
+        }
+    }
+}
+
+void View3D::Draw(void)
+{
+    if (clc.state != CA_DISCONNECTED) {
+        SCR_DrawScreenField();
+    }
+
+    set2D();
+
+    re.SavePerformanceCounters();
+
+    Draw2D();
 }
 
 float avWidth = 0.0;
@@ -241,12 +490,6 @@ void View3D::InitSubtitle(void)
     avWidth = totalWidth / 26.0;
 }
 
-void View3D::FrameInitialized(void)
-{
-    Connect(this, W_Activated, W_Activated);
-    Connect(this, W_Deactivated, W_Deactivated);
-}
-
 void View3D::DrawSubtitleOverlay(void)
 {
     cvar_t *subAlpha;
@@ -363,250 +606,14 @@ void View3D::DrawSubtitleOverlay(void)
     }
 }
 
-void View3D::DrawSoundOverlay(void)
-{
-    setFont("verdana-14");
-    m_font->setColor(UWhite);
-
-    // FIXME: TODO
-    if (sound_overlay->integer) {
-        Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
-        Cvar_Set("sound_overlay", "0");
-    }
-}
-
-void View3D::DrawProf(void)
-{
-    // Normal empty function
-}
-
-void View3D::DrawLetterbox(void)
-{
-    float  frac;
-    vec4_t col;
-
-    col[0] = col[1] = col[2] = 0;
-    col[3]                   = 1;
-
-    frac = (float)cl.snap.ps.stats[STAT_LETTERBOX] / MAX_LETTERBOX_SIZE;
-    if (frac <= 0) {
-        m_letterbox_active = false;
-        return;
-    }
-
-    m_letterbox_active = true;
-    re.SetColor(col);
-
-    re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height * frac);
-    re.DrawBox(
-        0.0,
-        m_screenframe.size.height - m_screenframe.size.height * frac,
-        m_screenframe.size.width,
-        m_screenframe.size.height
-    );
-}
-
-void View3D::DrawFades(void)
-{
-    if (cl.snap.ps.blend[3] > 0) {
-        re.SetColor(cl.snap.ps.blend);
-        if (cl.snap.ps.stats[STAT_ADDFADE]) {
-            re.AddBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
-        } else {
-            re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
-        }
-    }
-}
-
-void View3D::DrawFPS(void)
-{
-    char string[128];
-
-    setFont("verdana-14");
-    if (fps->integer == 2) {
-        re.SetColor(UBlack);
-        re.DrawBox(
-            0.0,
-            m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 4.0,
-            m_frame.pos.x + m_frame.size.width,
-            m_font->getHeight(qfalse) * 4.0
-        );
-    }
-
-    Com_sprintf(string, sizeof(string), "FPS %4.1f", currentfps);
-    if (currentfps > 23.94) {
-        if (cl_greenfps->integer) {
-            m_font->setColor(UGreen);
-        } else {
-            m_font->setColor(UWhite);
-        }
-    } else if (currentfps > 18.0) {
-        m_font->setColor(UYellow);
-    } else {
-        // low fps
-        m_font->setColor(URed);
-    }
-
-    m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 3.0,
-        string,
-        -1,
-        qfalse
-    );
-
-    // Draw elements count
-    if (cl_greenfps->integer) {
-        m_font->setColor(UGreen);
-    } else {
-        m_font->setColor(UWhite);
-    }
-
-    Com_sprintf(string, sizeof(string), "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
-
-    m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 2.0,
-        string,
-        -1,
-        qfalse
-    );
-
-    Com_sprintf(
-        string,
-        sizeof(string),
-        "t%5d v%5d Mtex%5.2f",
-        cls.total_tris,
-        cls.total_verts,
-        (float)cls.total_texels * 0.00000095367432
-    );
-
-    m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse),
-        string,
-        -1,
-        qfalse
-    );
-
-    m_font->setColor(UBlack);
-}
-
-void View3D::Draw2D(void)
-{
-    if (!cls.no_menus) {
-        DrawFades();
-    }
-
-    DrawLetterbox();
-
-    if ((cl_debuggraph->integer || cl_timegraph->integer) && !cls.no_menus) {
-        SCR_DrawDebugGraph();
-    } else if (!cls.no_menus) {
-        if (cge) {
-            cge->CG_Draw2D();
-        }
-
-        if (m_locationprint) {
-            LocationPrint();
-        } else {
-            CenterPrint();
-        }
-
-        if (!cls.no_menus) {
-            DrawSoundOverlay();
-            DrawSubtitleOverlay();
-        }
-    }
-
-    if (fps->integer && !cls.no_menus) {
-        DrawFPS();
-        DrawProf();
-    }
-}
-
-void View3D::Draw(void)
-{
-    if (clc.state != CA_DISCONNECTED) {
-        SCR_DrawScreenField();
-    }
-
-    set2D();
-
-    re.SavePerformanceCounters();
-
-    Draw2D();
-}
-
 void View3D::ClearCenterPrint(void)
 {
     m_printfadetime = 0.0;
 }
 
-void View3D::CenterPrint(void)
+qboolean View3D::LetterboxActive(void)
 {
-    float       alpha;
-    const char *p;
-    qhandle_t   mat;
-    float       x, y;
-    float       w, h;
-
-    if (!m_printfadetime) {
-        return;
-    }
-
-    p = Sys_LV_CL_ConvertString(m_printstring);
-    if (m_printfadetime > 3250) {
-        alpha = 1.f - (m_printfadetime - 3250.f) / 750.f * m_printalpha;
-    } else if (m_printfadetime >= 750) {
-        alpha = 1.f;
-    } else {
-        alpha = m_printfadetime / 750.f * m_printalpha;
-    }
-
-    alpha = Q_clamp_float(alpha, 0, 1);
-
-    if (!m_print_mat) {
-        UIRect2D frame;
-        m_font->setColor(UColor(0, 0, 0, alpha));
-
-        frame = getClientFrame();
-
-        m_font->PrintJustified(
-            UIRect2D(frame.pos.x + 1, frame.pos.y + 1, frame.size.width, frame.size.height),
-            m_iFontAlignmentHorizontal,
-            m_iFontAlignmentVertical,
-            p,
-            m_bVirtual ? m_vVirtualScale : NULL
-        );
-
-        m_font->setColor(UColor(1, 1, 1, alpha));
-
-        frame = getClientFrame();
-
-        m_font->PrintJustified(
-            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, m_bVirtual ? m_vVirtualScale : NULL
-        );
-
-        m_font->setColor(UBlack);
-    } else if ((mat = m_print_mat->GetMaterial())) {
-        vec4_t col {alpha, alpha, alpha, alpha};
-
-        re.SetColor(col);
-
-        w = re.GetShaderWidth(mat);
-        h = re.GetShaderHeight(mat);
-        x = (m_frame.pos.x + m_frame.size.width - w) * 0.5f;
-        y = (m_frame.pos.y + m_frame.size.height - h) * 0.5f;
-
-        re.DrawStretchPic(x, y, w, h, 0, 0, 1, 1, mat);
-    }
-
-    m_printfadetime -= cls.frametime;
-
-    if (m_printfadetime < 0) {
-        m_printfadetime = 0;
-    }
+    return m_letterbox_active;
 }
 
 CLASS_DECLARATION(UIWidget, ConsoleView, NULL) {

From 23a035e2ca10c834f65691652b5855578cf37f98 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 19:38:15 +0100
Subject: [PATCH 1403/2040] Use a default value for maxlen and bVirtualScale
 for Print

---
 code/uilib/uifont.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uifont.h b/code/uilib/uifont.h
index 85b2cffb..e22a0c0e 100644
--- a/code/uilib/uifont.h
+++ b/code/uilib/uifont.h
@@ -47,7 +47,7 @@ public:
     UIFont();
     UIFont(const char *fn);
 
-    void Print(float x, float y, const char *text, size_t maxlen, qboolean bVirtualScreen);
+    void Print(float x, float y, const char *text, size_t maxlen = -1, qboolean bVirtualScreen = qfalse);
     void PrintJustified(
         const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, float *vVirtualScale
     );

From 1ef1bad9ae17dc94e11e99108a54f27415bf51bb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 21:15:49 +0100
Subject: [PATCH 1404/2040] Add network profiling tool from Spearhead and
 Breakthrough

Profiling can be enabled with `cl_netprofile` and `sv_netprofile`, the overlay can be shown using `cl_netprofileoverlay` and `sv_netprofileoverlay` and the server can dump network profile using the `netprofiledump` command
---
 code/client/cl_main.cpp     |  75 +++++++++--
 code/client/cl_net_chan.cpp |  26 +++-
 code/client/cl_ui.cpp       |   6 +-
 code/client/cl_uiview3d.cpp | 254 +++++++++++++++++++++++++++++++++++-
 code/client/cl_uiview3d.h   |   3 +
 code/client/client.h        |   7 +-
 code/gamespy/sv_gamespy.c   |  10 +-
 code/qcommon/net_chan.c     | 140 +++++++++++++++++++-
 code/qcommon/qcommon.h      |  53 +++++++-
 code/server/server.h        |  10 +-
 code/server/sv_ccmds.c      | 120 ++++++++++++++++-
 code/server/sv_client.c     |  44 ++++---
 code/server/sv_main.c       |  14 +-
 code/server/sv_net_chan.c   | 175 ++++++++++++++++++++++++-
 14 files changed, 871 insertions(+), 66 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 5e759a1e..839761d0 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -56,6 +56,8 @@ cvar_t	*cl_showTimeDelta;
 cvar_t	*cl_freezeDemo;
 
 cvar_t	*cl_shownet;
+cvar_t	*cl_netprofile;
+cvar_t	*cl_netprofileoverlay;
 cvar_t	*cl_showSend;
 cvar_t	*cl_timedemo;
 cvar_t	*cl_timedemoLog;
@@ -118,6 +120,7 @@ cvar_t	*cl_r_fullscreen;
 
 cvar_t	*cl_consoleKeys;
 cvar_t	*name;
+cvar_t	*cl_rate;
 
 clientActive_t		cl;
 clientConnection_t	clc;
@@ -1057,7 +1060,7 @@ void CL_RequestMotd( void ) {
 	Info_SetValueForKey( info, "renderer", cls.glconfig.renderer_string );
 	Info_SetValueForKey( info, "version", com_version->string );
 
-	NET_OutOfBandPrint( NS_CLIENT, cls.updateServer, "getmotd \"%s\"\n", info );
+	CL_NET_OutOfBandPrint( cls.updateServer, "getmotd \"%s\"\n", info );
 }
 
 /*
@@ -1140,7 +1143,7 @@ void CL_RequestAuthorization( void ) {
 
 	fs = Cvar_Get ("cl_anonymous", "0", CVAR_INIT|CVAR_SYSTEMINFO );
 
-	NET_OutOfBandPrint(NS_CLIENT, cls.authorizeServer, "getKeyAuthorize %i %s", fs->integer, nums );
+	CL_NET_OutOfBandPrint(cls.authorizeServer, "getKeyAuthorize %i %s", fs->integer, nums );
 }
 
 /*
@@ -1476,7 +1479,11 @@ void CL_Rcon_f( void ) {
 		}
 	}
 
-	NET_SendPacket (NS_CLIENT, strlen(message)+1, message, to);
+	NET_SendPacket (NS_CLIENT, strlen(message) + 1, message, to);
+
+	if (cl_netprofile->integer) {
+		NetProfileAddPacket(&cls.netprofile.inPackets, strlen(message) + 1, NETPROF_PACKET_MESSAGE);
+	}
 }
 
 /*
@@ -1979,12 +1986,12 @@ void CL_CheckForResend( void ) {
 //		if ( !Sys_IsLANAddress( clc.serverAddress ) ) {
 //			CL_RequestAuthorization();
 //		}
-		NET_OutOfBandPrint(NS_CLIENT, clc.serverAddress, "getchallenge");
+		CL_NET_OutOfBandPrint(clc.serverAddress, "getchallenge");
 		break;
 	case CA_AUTHORIZING:
 		// resend the cd key authorization
 		gcd_compute_response(cl_cdkey, Cmd_Argv(1), cls.gcdResponse, CDResponseMethod_REAUTH);
-		NET_OutOfBandPrint(NS_CLIENT, clc.serverAddress, "authorizeThis %s", cls.gcdResponse);
+		CL_NET_OutOfBandPrint(clc.serverAddress, "authorizeThis %s", cls.gcdResponse);
 		break;
 	case CA_CHALLENGING:
 /*
@@ -2247,6 +2254,10 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	char	*s;
 	char	*c;
 	const char	*reason;
+	
+	if (cl_netprofile->integer) {
+		NetProfileAddPacket(&cls.netprofile.inPackets, msg->cursize, NETPROF_PACKET_MESSAGE);
+	}
 
 	MSG_BeginReadingOOB( msg );
 	MSG_ReadLong( msg );	// skip the -1
@@ -2331,7 +2342,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 
 	// echo request from server
 	if ( !Q_stricmp(c, "echo") ) {
-		NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv(1) );
+		CL_NET_OutOfBandPrint(from, "%s", Cmd_Argv(1) );
 		return;
 	}
 
@@ -2339,7 +2350,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	if ( !Q_stricmp(c, "getKey") ) {
 		clc.state = CA_AUTHORIZING;
 		gcd_compute_response(cl_cdkey, Cmd_Argv(1), cls.gcdResponse, CDResponseMethod_NEWAUTH);
-		NET_OutOfBandPrint(NS_CLIENT, from, "authorizeThis %s", cls.gcdResponse);
+		CL_NET_OutOfBandPrint(from, "authorizeThis %s", cls.gcdResponse);
 		return;
 	}
 
@@ -2666,6 +2677,31 @@ void CL_Frame ( int msec ) {
 
 	cls.timeScaled = com_timescale->integer != 1;
 
+	//
+	// Added in 2.0: network profiling
+	//
+	if (cl_netprofile->integer) {
+		if (!cls.netprofile.initialized) {
+			memset(&cls.netprofile, 0, sizeof(cls.netprofile));
+			cls.netprofile.initialized = qtrue;
+		}
+
+		if (cls.netprofile.rate != cl_rate->integer) {
+            cls.netprofile.rate = cl_rate->integer;
+
+            if (cls.netprofile.rate < 1000) {
+				cls.netprofile.rate = 1000;
+            } else if (cls.netprofile.rate > 90000) {
+				cls.netprofile.rate = 90000;
+			}
+		}
+
+		cls.netprofile.outPackets.updateTime = Com_Milliseconds();
+		cls.netprofile.inPackets.updateTime = cls.netprofile.outPackets.updateTime;
+	} else {
+		cls.netprofile.initialized = qfalse;
+	}
+
 	// see if we need to update any userinfo
 	CL_CheckUserinfo();
 
@@ -3330,6 +3366,8 @@ void CL_Init( void ) {
 	cl_master = Cvar_Get ("cl_master", MASTER_SERVER_NAME, CVAR_ARCHIVE);
 	cl_timeNudge = Cvar_Get ("cl_timeNudge", "0", CVAR_TEMP );
 	cl_shownet = Cvar_Get ("cl_shownet", "0", CVAR_TEMP );
+	cl_netprofile = Cvar_Get("cl_netprofile", "0", CVAR_TEMP);
+	cl_netprofileoverlay = Cvar_Get("cl_netprofileoverlay", "0", CVAR_TEMP);
 	cl_showSend = Cvar_Get ("cl_showSend", "0", CVAR_TEMP );
 	cl_showTimeDelta = Cvar_Get ("cl_showTimeDelta", "0", CVAR_TEMP );
 	cl_freezeDemo = Cvar_Get ("cl_freezeDemo", "0", CVAR_TEMP );
@@ -3445,7 +3483,7 @@ void CL_Init( void ) {
 
 	// userinfo
 	name = Cvar_Get ("name", "UnnamedSoldier", CVAR_USERINFO | CVAR_ARCHIVE );
-	Cvar_Get ("rate", "5000", CVAR_USERINFO | CVAR_ARCHIVE );
+	cl_rate = Cvar_Get ("rate", "5000", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("password", "", CVAR_USERINFO);
 	Cvar_Get ("dm_playermodel", "american_army", CVAR_USERINFO | CVAR_ARCHIVE );
@@ -3830,7 +3868,7 @@ int CL_ServerStatus( const char *serverAddress, char *serverStatusString, int ma
 			serverStatus->retrieved = qfalse;
 			serverStatus->time = 0;
 			serverStatus->startTime = Com_Milliseconds();
-			NET_OutOfBandPrint( NS_CLIENT, to, "getstatus" );
+			CL_NET_OutOfBandPrint(to, "getstatus" );
 			return qfalse;
 		}
 	}
@@ -3842,7 +3880,7 @@ int CL_ServerStatus( const char *serverAddress, char *serverStatusString, int ma
 		serverStatus->retrieved = qfalse;
 		serverStatus->startTime = Com_Milliseconds();
 		serverStatus->time = 0;
-		NET_OutOfBandPrint( NS_CLIENT, to, "getstatus" );
+		CL_NET_OutOfBandPrint(to, "getstatus" );
 		return qfalse;
 	}
 	return qfalse;
@@ -3981,9 +4019,18 @@ void CL_LocalServers_f( void ) {
 
 			to.type = NA_BROADCAST;
 			NET_SendPacket( NS_CLIENT, strlen( message ), message, to );
+
+			if (cl_netprofile->integer) {
+				NetProfileAddPacket(&cls.netprofile.inPackets, strlen( message ), NETPROF_PACKET_MESSAGE);
+			}
+			
 			// Added in OPM (from ioquake3)
 			to.type = NA_MULTICAST6;
 			NET_SendPacket( NS_CLIENT, strlen( message ), message, to );
+
+			if (cl_netprofile->integer) {
+				NetProfileAddPacket(&cls.netprofile.inPackets, strlen(message), NETPROF_PACKET_MESSAGE);
+			}
 		}
 	}
 }
@@ -4087,7 +4134,7 @@ void CL_GlobalServers_f( void ) {
 		Q_strcat(command, sizeof(command), Cmd_Argv(i));
 	}
 
-	NET_OutOfBandPrint( NS_SERVER, to, "%s", command );
+	CL_NET_OutOfBandPrint( to, "%s", command );
 }
 
 
@@ -4307,7 +4354,7 @@ void CL_Ping_f( void ) {
 
 	CL_SetServerInfoByAddress(pingptr->adr, NULL, 0);
 		
-	NET_OutOfBandPrint( NS_CLIENT, to, "\x02getinfo xxx" );
+	CL_NET_OutOfBandPrint( to, "\x02getinfo xxx" );
 }
 
 /*
@@ -4477,7 +4524,7 @@ qboolean CL_UpdateVisiblePings_f(int source) {
 						memcpy(&cl_pinglist[j].adr, &server[i].adr, sizeof(netadr_t));
 						cl_pinglist[j].start = Sys_Milliseconds();
 						cl_pinglist[j].time = 0;
-						NET_OutOfBandPrint( NS_CLIENT, cl_pinglist[j].adr, "getinfo xxx" );
+						CL_NET_OutOfBandPrint( cl_pinglist[j].adr, "getinfo xxx" );
 						slots++;
 					}
 				}
@@ -4565,7 +4612,7 @@ void CL_ServerStatus_f(void) {
 			return;
 	}
 
-	NET_OutOfBandPrint( NS_CLIENT, *toptr, "getstatus" );
+	CL_NET_OutOfBandPrint( *toptr, "getstatus" );
 
 	serverStatus = CL_GetServerStatus( *toptr );
 	serverStatus->address = *toptr;
diff --git a/code/client/cl_net_chan.cpp b/code/client/cl_net_chan.cpp
index 1433c434..102d5524 100644
--- a/code/client/cl_net_chan.cpp
+++ b/code/client/cl_net_chan.cpp
@@ -132,7 +132,7 @@ CL_Netchan_TransmitNextFragment
 =================
 */
 void CL_Netchan_TransmitNextFragment( netchan_t *chan ) {
-	Netchan_TransmitNextFragment( chan );
+	Netchan_TransmitNextFragment( chan, cl_netprofile->integer ? &cls.netprofile.inPackets : NULL );
 }
 
 /*
@@ -144,7 +144,7 @@ void CL_Netchan_Transmit( netchan_t *chan, msg_t* msg ) {
 	MSG_WriteByte( msg, clc_EOF );
 
 	CL_Netchan_Encode( msg );
-	Netchan_Transmit( chan, msg->cursize, msg->data );
+	Netchan_Transmit( chan, msg->cursize, msg->data, cl_netprofile->integer ? &cls.netprofile.inPackets : NULL );
 }
 
 extern 	int oldsize;
@@ -158,10 +158,30 @@ CL_Netchan_Process
 qboolean CL_Netchan_Process( netchan_t *chan, msg_t *msg ) {
 	int ret;
 
-	ret = Netchan_Process( chan, msg );
+	ret = Netchan_Process( chan, msg, cl_netprofile->integer ? &cls.netprofile.outPackets : NULL );
 	if (!ret)
 		return qfalse;
 	CL_Netchan_Decode( msg );
 	newsize += msg->cursize;
 	return qtrue;
 }
+
+/*
+=================
+CL_NET_OutOfBandPrint
+=================
+*/
+void CL_NET_OutOfBandPrint(netadr_t adr, const char* format, ...) {
+    va_list	argptr;
+    char	string[MAX_MSGLEN];
+
+    va_start(argptr, format);
+    Q_vsnprintf(string, sizeof(string), format, argptr);
+    va_end(argptr);
+
+	NET_OutOfBandPrint(NS_CLIENT, adr, "%s", string);
+
+	if (cl_netprofile->integer) {
+		NetProfileAddPacket(&cls.netprofile.inPackets, strlen(string), NETPROF_PACKET_MESSAGE);
+	}
+}
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 4997e31a..ba6bb837 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3041,14 +3041,14 @@ void CL_PingServers_f(void)
     if (!noudp->integer) {
         adr.type = NA_BROADCAST;
         adr.port = BigShort(12203);
-        NET_OutOfBandPrint(NS_SERVER, adr, "info %i", 8);
+        CL_NET_OutOfBandPrint(adr, "info %i", 8);
     }
 
     noipx = Cvar_Get("noipx", "0", CVAR_INIT);
     if (!noipx->integer) {
         adr.type = NA_BROADCAST_IPX;
         adr.port = BigShort(12203);
-        NET_OutOfBandPrint(NS_SERVER, adr, "info %i", 8);
+        CL_NET_OutOfBandPrint(adr, "info %i", 8);
     }
 
     for (i = 0; i < 16; i++) {
@@ -3063,7 +3063,7 @@ void CL_PingServers_f(void)
                     adr.port = BigShort(12203);
                 }
 
-                NET_OutOfBandPrint(NS_SERVER, adr, "info %i", 8);
+                CL_NET_OutOfBandPrint(adr, "info %i", 8);
             } else {
                 Com_Printf("Bad address: %s\n", adrstring);
             }
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index f42f3e7a..234e89a7 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_ui.h"
 #include "../qcommon/localization.h"
 
+#include "../server/server.h"
+
 CLASS_DECLARATION(UIWidget, View3D, NULL) {
     {&W_Activated,     &View3D::OnActivate  },
     {&W_Deactivated,   &View3D::OnDeactivate},
@@ -241,13 +243,262 @@ void View3D::DrawSoundOverlay(void)
     setFont("verdana-14");
     m_font->setColor(UWhite);
 
-    // FIXME: TODO
+    // FIXME: Unimplemented
     if (sound_overlay->integer) {
         Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
         Cvar_Set("sound_overlay", "0");
     }
 }
 
+void DisplayServerNetProfileInfo(UIFont *font, float y, netprofclient_t *netprofile)
+{
+    font->Print(104, y, va("%i", netprofile->inPackets.packetsPerSec));
+    font->Print(144, y, va("%i", netprofile->outPackets.packetsPerSec));
+    font->Print(184, y, va("%i", netprofile->inPackets.packetsPerSec + netprofile->outPackets.packetsPerSec));
+    font->Print(234, y, va("%i", netprofile->inPackets.percentFragmented));
+    font->Print(264, y, va("%i", netprofile->outPackets.percentFragmented));
+    font->Print(
+        294,
+        y,
+        va("%i",
+           (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented)
+                          / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
+           )),
+        -1,
+        qfalse
+    );
+    font->Print(334, y, va("%i", netprofile->inPackets.percentDropped));
+    font->Print(364, y, va("%i", netprofile->outPackets.percentDropped));
+    font->Print(
+        394,
+        y,
+        va("%i",
+           (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped)
+                          / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
+           )),
+        -1,
+        qfalse
+    );
+    font->Print(434, y, va("%i", netprofile->inPackets.percentDropped));
+    font->Print(464, y, va("%i", netprofile->outPackets.percentDropped));
+    font->Print(
+        494,
+        y,
+        va("%i",
+           (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess
+                                  + netprofile->inPackets.totalLengthConnectionLess)
+                          / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize))),
+        -1,
+        qfalse
+    );
+    font->Print(534, y, va("%i", netprofile->inPackets.bytesPerSec));
+    font->Print(594, y, va("%i", netprofile->outPackets.bytesPerSec));
+    font->Print(654, y, va("%i", netprofile->outPackets.bytesPerSec + netprofile->inPackets.bytesPerSec));
+    font->Print(714, y, va("%i", netprofile->rate));
+}
+
+void DisplayClientNetProfile(UIFont *font, float x, float y, netprofclient_t *netprofile)
+{
+    float columns[5];
+    float fontHeight;
+    float columnHeight;
+
+    fontHeight   = font->getHeight(qfalse);
+    columns[0]   = x + 120;
+    columns[1]   = x + 230;
+    columns[2]   = x + 330;
+    columns[3]   = x + 430;
+    columns[4]   = x + 530;
+    columnHeight = y;
+
+    font->Print(x, y, va("Rate: %i", netprofile->rate));
+
+    columnHeight += fontHeight * 1.5;
+    font->Print(x, columnHeight, "Data Type");
+    font->Print(columns[0], columnHeight, "Packets per Sec");
+    font->Print(columns[1], columnHeight, "% Fragmented");
+    font->Print(columns[2], columnHeight, "% Dropped");
+    font->Print(columns[3], columnHeight, "% OOB data");
+    font->Print(columns[4], columnHeight, "Data per Sec");
+
+    columnHeight += fontHeight * 0.5;
+    font->Print(x, columnHeight, "----------");
+    font->Print(columns[0], columnHeight, "----------");
+    font->Print(columns[1], columnHeight, "----------");
+    font->Print(columns[2], columnHeight, "----------");
+    font->Print(columns[3], columnHeight, "----------");
+    font->Print(columns[4], columnHeight, "----------");
+
+    columnHeight += fontHeight;
+    font->Print(x, columnHeight, "Data In");
+    font->Print(columns[0], columnHeight, va("%i", netprofile->outPackets.packetsPerSec));
+    font->Print(columns[1], columnHeight, va("%i%%", netprofile->outPackets.percentFragmented));
+    font->Print(columns[2], columnHeight, va("%i%%", netprofile->outPackets.percentDropped));
+    font->Print(columns[3], columnHeight, va("%i%%", netprofile->outPackets.percentConnectionLess));
+    font->Print(columns[4], columnHeight, va("%i", netprofile->outPackets.bytesPerSec));
+
+    columnHeight += fontHeight;
+    font->Print(x, columnHeight, "Data Out");
+    font->Print(columns[0], columnHeight, va("%i", netprofile->inPackets.packetsPerSec));
+    font->Print(columns[1], columnHeight, va("%i%%", netprofile->inPackets.percentFragmented));
+    font->Print(columns[2], columnHeight, va("%i%%", netprofile->inPackets.percentDropped));
+    font->Print(columns[3], columnHeight, va("%i%%", netprofile->inPackets.percentConnectionLess));
+    font->Print(columns[4], columnHeight, va("%i", netprofile->inPackets.bytesPerSec));
+
+    columnHeight += fontHeight;
+
+    font->Print(x, columnHeight, "Total Data");
+
+    font->Print(
+        columns[0],
+        columnHeight,
+        va("%i", netprofile->inPackets.packetsPerSec + netprofile->outPackets.packetsPerSec)
+    );
+    font->Print(
+        columns[1],
+        columnHeight,
+        va("%i%%",
+           (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented)
+                          / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
+           ))
+    );
+    font->Print(
+        columns[2],
+        columnHeight,
+        va("%i%%",
+           (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped)
+                          / (double)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed
+                          )))
+    );
+    font->Print(
+        columns[3],
+        columnHeight,
+        va("%i%%",
+           (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess
+                                  + netprofile->inPackets.totalLengthConnectionLess)
+                          / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize)))
+    );
+    font->Print(
+        columns[4],
+        columnHeight,
+        va("%i", netprofile->inPackets.bytesPerSec + netprofile->outPackets.bytesPerSec)
+    );
+}
+
+void View3D::DrawNetProfile(void)
+{
+    float fontHeight;
+    float yOffset;
+    int   i;
+
+    if (sv_netprofileoverlay->integer && sv_netprofile->integer && com_sv_running->integer) {
+        float           columnHeight;
+        float           valueHeight;
+        float           separatorHeight;
+        float           categoryHeight;
+        float           currentHeight;
+        netprofclient_t netproftotal;
+
+        setFont("verdana-14");
+        m_font->setColor(UWhite);
+
+        fontHeight = m_font->getHeight(qfalse);
+        yOffset    = sv_netprofileoverlay->integer + 8;
+
+        if (svs.netprofile.rate) {
+            m_font->Print(8, yOffset, va("Server Net Profile          Max Rate: %i", svs.netprofile.rate), -1, qfalse);
+        } else {
+            m_font->Print(8, yOffset, "Server Net Profile          Max Rate: none", -1, qfalse);
+        }
+
+        columnHeight    = fontHeight + fontHeight + yOffset;
+        valueHeight     = columnHeight + fontHeight;
+        separatorHeight = fontHeight * 1.5 + columnHeight;
+        categoryHeight  = fontHeight * 0.5 + columnHeight;
+
+        m_font->Print(8, categoryHeight, "Data Source");
+        m_font->Print(8, separatorHeight, "---------------");
+        m_font->Print(104, columnHeight, "Packets per Sec");
+        m_font->Print(104, valueHeight, "In");
+        m_font->Print(144, valueHeight, "Out");
+        m_font->Print(184, valueHeight, "Total");
+        m_font->Print(104, separatorHeight, "---");
+        m_font->Print(144, separatorHeight, "-----");
+        m_font->Print(184, separatorHeight, "------");
+        m_font->Print(234, columnHeight, "% Fragmented");
+        m_font->Print(234, valueHeight, "In");
+        m_font->Print(264, valueHeight, "Out");
+        m_font->Print(294, valueHeight, "Total");
+        m_font->Print(234, separatorHeight, "---");
+        m_font->Print(264, separatorHeight, "-----");
+        m_font->Print(294, separatorHeight, "------");
+        m_font->Print(334, columnHeight, "% Dropped");
+        m_font->Print(334, valueHeight, "In");
+        m_font->Print(364, valueHeight, "Out");
+        m_font->Print(394, valueHeight, "Total");
+        m_font->Print(334, separatorHeight, "---");
+        m_font->Print(364, separatorHeight, "-----");
+        m_font->Print(394, separatorHeight, "------");
+        m_font->Print(434, columnHeight, "% OOB Data");
+        m_font->Print(434, valueHeight, "In");
+        m_font->Print(464, valueHeight, "Out");
+        m_font->Print(494, valueHeight, "Total");
+        m_font->Print(434, separatorHeight, "---");
+        m_font->Print(464, separatorHeight, "-----");
+        m_font->Print(494, separatorHeight, "------");
+        m_font->Print(534, columnHeight, "Data per Sec");
+        m_font->Print(534, valueHeight, "In");
+        m_font->Print(594, valueHeight, "Out");
+        m_font->Print(654, valueHeight, "Total");
+        m_font->Print(534, separatorHeight, "---");
+        m_font->Print(594, separatorHeight, "-----");
+        m_font->Print(654, separatorHeight, "------");
+        m_font->Print(714, categoryHeight, "Rate");
+        m_font->Print(714, separatorHeight, "------");
+
+        currentHeight = fontHeight * 2.5 + columnHeight;
+        SV_NET_CalcTotalNetProfile(&netproftotal, qfalse);
+        m_font->Print(8, columnHeight + fontHeight * 2.5, "Total");
+        DisplayServerNetProfileInfo(m_font, currentHeight, &netproftotal);
+
+        currentHeight += fontHeight * 1.5;
+        m_font->Print(8, currentHeight, "Clientless");
+        DisplayServerNetProfileInfo(m_font, currentHeight, &svs.netprofile);
+
+        currentHeight += fontHeight;
+
+        for (i = 0; i < svs.iNumClients; i++) {
+            client_t *client = &svs.clients[i];
+            if (client->state != CS_ACTIVE || !client->gentity) {
+                continue;
+            }
+
+            if (client->netchan.remoteAddress.type == NA_LOOPBACK) {
+                m_font->Print(8.0, currentHeight, va("#%i-Loopback", i), -1, 0);
+
+            } else {
+                m_font->Print(8.0, currentHeight, va("Client #%i", i), -1, 0);
+            }
+
+            DisplayServerNetProfileInfo(m_font, currentHeight, &client->netprofile);
+            currentHeight = currentHeight + fontHeight;
+        }
+    } else if (cl_netprofileoverlay->integer && cl_netprofile->integer && com_cl_running->integer) {
+        setFont("verdana-14");
+        m_font->setColor(UWhite);
+
+        fontHeight = m_font->getHeight(qfalse);
+        yOffset    = cl_netprofileoverlay->integer + 16;
+
+        m_font->Print(16, yOffset, "Client Net Profile", -1, qfalse);
+
+        NetProfileCalcStats(&cls.netprofile.outPackets, 500);
+        NetProfileCalcStats(&cls.netprofile.inPackets, 500);
+
+        DisplayClientNetProfile(m_font, 16, yOffset + fontHeight * 2, &cls.netprofile);
+    }
+}
+
 void View3D::Draw2D(void)
 {
     if (!cls.no_menus) {
@@ -271,6 +522,7 @@ void View3D::Draw2D(void)
 
         if (!cls.no_menus) {
             DrawSoundOverlay();
+            DrawNetProfile();
             DrawSubtitleOverlay();
         }
     }
diff --git a/code/client/cl_uiview3d.h b/code/client/cl_uiview3d.h
index fc908a9f..ef11c986 100644
--- a/code/client/cl_uiview3d.h
+++ b/code/client/cl_uiview3d.h
@@ -51,6 +51,9 @@ protected:
     void OnDeactivate(Event *ev);
     void DrawSubtitleOverlay(void);
 
+    // Added in 2.0
+    void DrawNetProfile(void);
+
 public:
     View3D();
 
diff --git a/code/client/client.h b/code/client/client.h
index b33b123a..92509338 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -383,8 +383,8 @@ typedef struct {
 	void* savedCgameState;
 	size_t savedCgameStateSize;
 	char gcdResponse[73];
-	int unknown3_0;
-	int currentRate;
+	// Added in 2.0
+	netprofclient_t netprofile;
 	qhandle_t	charSetShader;
 	qhandle_t	whiteShader;
 	qhandle_t	consoleShader;
@@ -415,6 +415,8 @@ extern	cvar_t	*cl_connect_timeout;
 extern	cvar_t	*cl_maxpackets;
 extern	cvar_t	*cl_packetdup;
 extern	cvar_t	*cl_shownet;
+extern	cvar_t	*cl_netprofile;
+extern	cvar_t	*cl_netprofileoverlay;
 extern	cvar_t	*cl_showSend;
 extern	cvar_t	*cl_timeNudge;
 extern	cvar_t	*cl_showTimeDelta;
@@ -732,6 +734,7 @@ void LAN_SaveServersToCache( void );
 void CL_Netchan_Transmit( netchan_t *chan, msg_t* msg);	//int length, const byte *data );
 void CL_Netchan_TransmitNextFragment( netchan_t *chan );
 qboolean CL_Netchan_Process( netchan_t *chan, msg_t *msg );
+void CL_NET_OutOfBandPrint( netadr_t adr, const char* format, ... );
 
 //
 // cl_avi.c
diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 58a245a5..e72c26b7 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -382,7 +382,7 @@ void AuthenticateCallback(int gameid, int localid, int authenticated, char* errm
         challenge->cdkeyState = 2;
         challenge->pingTime = svs.time;
 
-        NET_OutOfBandPrint(NS_SERVER, challenge->adr, "challengeResponse %i", challenge->challenge);
+        SV_NET_OutOfBandPrint(&svs.netprofile, challenge->adr, "challengeResponse %i", challenge->challenge);
     }
     else
     {
@@ -396,7 +396,7 @@ void AuthenticateCallback(int gameid, int localid, int authenticated, char* errm
         Com_Printf("%s failed cdkey authorization\n", buf);
         challenge->cdkeyState = 3;
         // tell the client about the reason
-        NET_OutOfBandPrint(NS_SERVER, challenge->adr, "droperror\nServer rejected connection:\n%s", errmsg);
+        SV_NET_OutOfBandPrint(&svs.netprofile, challenge->adr, "droperror\nServer rejected connection:\n%s", errmsg);
     }
 }
 
@@ -437,18 +437,18 @@ void SV_GamespyAuthorize(netadr_t from, const char* response)
             Com_DPrintf("authorize server timed out\n");
             challenge->cdkeyState = CDKS_AUTHENTICATED;
             challenge->pingTime = svs.time;
-            NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+            SV_NET_OutOfBandPrint(&svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         }
         break;
     case CDKS_AUTHENTICATED:
-        NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+        SV_NET_OutOfBandPrint(&svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         break;
     case CDKS_FAILED:
         // authentication server told the cdkey was invalid
         Com_sprintf(buf, sizeof(buf), "%d.%d.%d.%d", challenge->adr.ip[0], challenge->adr.ip[1], challenge->adr.ip[2], challenge->adr.ip[3]);
         Com_Printf("%s failed cdkey authorization\n", buf);
         // reject the client
-        NET_OutOfBandPrint(NS_SERVER, from, "droperror\nServer rejected connection:\nInvalid CD Key");
+        SV_NET_OutOfBandPrint(&svs.netprofile, from, "droperror\nServer rejected connection:\nInvalid CD Key");
         break;
     default:
         break;
diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c
index 63a9ccf8..3824bc6e 100644
--- a/code/qcommon/net_chan.c
+++ b/code/qcommon/net_chan.c
@@ -99,6 +99,126 @@ void Netchan_Setup(netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, int
 #endif
 }
 
+/*
+==============
+NetProfileAddPacket
+==============
+*/
+void NetProfileAddPacket(netprofpacketlist_t* list, size_t size, int type)
+{
+    list->index = (list->index + 1) % 64;
+    list->packets[list->index].updateTime = Com_Milliseconds();
+    list->packets[list->index].size = size;
+    list->packets[list->index].flags = type;
+}
+
+/*
+==============
+NetProfileSetPacketFlags
+==============
+*/
+void NetProfileSetPacketFlags(netprofpacketlist_t* list, int flags)
+{
+	list->packets[list->index].flags |= flags;
+}
+
+/*
+==============
+NetProfileCalcStats
+==============
+*/
+void NetProfileCalcStats(netprofpacketlist_t* list, int time)
+{
+    netprofpacket_t* packet;
+    int i;
+    float frequency;
+
+	if (list->updateTime < time + list->lastCalcTime) {
+		return;
+	}
+
+    list->lastCalcTime = list->updateTime;
+    list->lowestUpdateTime = list->updateTime;
+    list->highestUpdateTime = 0;
+    list->totalProcessed = 0;
+    list->totalSize = 0;
+    list->numFragmented = 0;
+    list->numDropped = 0;
+    list->numConnectionLess = 0;
+    list->totalLengthConnectionLess = 0;
+
+	for (i = 0; i < ARRAY_LEN(list->packets); i++) {
+		packet = &list->packets[i];
+		if (!packet->size) {
+			continue;
+		}
+
+		if (list->updateTime > packet->updateTime + 1000) {
+			packet->size = 0;
+			continue;
+		}
+
+		if (list->lowestUpdateTime > packet->updateTime) {
+			list->lowestUpdateTime = packet->updateTime;
+		}
+		if (list->highestUpdateTime < packet->updateTime) {
+			list->highestUpdateTime = packet->updateTime;
+		}
+
+		list->totalProcessed++;
+		list->totalSize += packet->size;
+
+		if (packet->flags & NETPROF_PACKET_FRAGMENTED) {
+			list->numFragmented++;
+		}
+		if (packet->flags & NETPROF_PACKET_DROPPED) {
+			list->numDropped++;
+		}
+		if (packet->flags & NETPROF_PACKET_MESSAGE) {
+			list->numConnectionLess++;
+			list->totalLengthConnectionLess += packet->size;
+		}
+	}
+
+    if (!list->totalProcessed) {
+        list->packetsPerSec = 0;
+        list->highestUpdateTime = list->lowestUpdateTime;
+        list->bytesPerSec = 0;
+        list->percentFragmented = 0;
+        list->percentDropped = 0;
+        list->percentConnectionLess = 0;
+
+		return;
+	}
+
+	if (list->lowestUpdateTime == list->highestUpdateTime) {
+		list->latency = 0.0;
+		frequency = 1.0;
+	} else {
+		list->latency = (list->highestUpdateTime - list->lowestUpdateTime) / 1000.0;
+		frequency = 1.0 / list->latency;
+	}
+
+	list->packetsPerSec = list->totalProcessed * frequency;
+	list->bytesPerSec = list->totalSize * frequency;
+
+	if (list->numFragmented) {
+		list->percentFragmented = (float)list->numFragmented / list->totalProcessed * 100.0;
+	} else {
+		list->percentFragmented = 0;
+	}
+
+	if (list->numDropped) {
+		list->percentDropped = (float)list->numDropped / list->totalProcessed * 100.0;
+	} else {
+		list->percentDropped = 0;
+	}
+
+	if (list->totalLengthConnectionLess) {
+		list->percentConnectionLess = (float)list->totalLengthConnectionLess / list->totalSize * 100.0;
+	}
+}
+
 // TTimo: unused, commenting out to make gcc happy
 #if 0
 /*
@@ -192,7 +312,7 @@ Netchan_TransmitNextFragment
 Send one fragment of the current message
 =================
 */
-void Netchan_TransmitNextFragment( netchan_t *chan ) {
+void Netchan_TransmitNextFragment( netchan_t *chan, netprofpacketlist_t *packetlist ) {
 	msg_t		send;
 	byte		send_buf[MAX_PACKETLEN];
 	size_t		fragmentLength;
@@ -228,6 +348,10 @@ void Netchan_TransmitNextFragment( netchan_t *chan ) {
 			, chan->unsentFragmentStart, fragmentLength);
 	}
 
+	if (packetlist) {
+		NetProfileAddPacket(packetlist, send.cursize, NETPROF_PACKET_FRAGMENTED);
+	}
+
 	chan->unsentFragmentStart += fragmentLength;
 
 	// this exit condition is a little tricky, because a packet
@@ -249,7 +373,7 @@ Sends a message to a connection, fragmenting if necessary
 A 0 length will still generate a packet.
 ================
 */
-void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
+void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data, netprofpacketlist_t *packetlist ) {
 	msg_t			send;
 	byte			send_buf[MAX_PACKETLEN];
 
@@ -265,7 +389,7 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
 		Com_Memcpy( chan->unsentBuffer, data, length );
 
 		// only send the first fragment now
-		Netchan_TransmitNextFragment( chan );
+		Netchan_TransmitNextFragment( chan, packetlist );
 
 		return;
 	}
@@ -293,6 +417,10 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
 			, chan->outgoingSequence - 1
 			, chan->incomingSequence );
 	}
+
+	if (packetlist) {
+		NetProfileAddPacket(packetlist, send.cursize, 0);
+	}
 }
 
 /*
@@ -307,7 +435,7 @@ final fragment of a multi-part message, the entire thing will be
 copied out.
 =================
 */
-qboolean Netchan_Process( netchan_t *chan, msg_t *msg ) {
+qboolean Netchan_Process( netchan_t *chan, msg_t *msg, netprofpacketlist_t *packetlist ) {
 	int			sequence;
 	int			qport;
 	int			fragmentStart, fragmentLength;
@@ -357,6 +485,10 @@ qboolean Netchan_Process( netchan_t *chan, msg_t *msg ) {
 		}
 	}
 
+	if (packetlist) {
+		NetProfileAddPacket(packetlist, msg->cursize, fragmented ? NETPROF_PACKET_FRAGMENTED : 0);
+	}
+
 	//
 	// discard out of order or duplicated packets
 	//
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 60dc4a32..3d349e61 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -299,14 +299,61 @@ typedef struct {
 #endif
 } netchan_t;
 
+/*
+Packet profiling
+*/
+
+#define NETPROF_PACKET_FRAGMENTED 1
+#define NETPROF_PACKET_DROPPED    2
+#define NETPROF_PACKET_MESSAGE    4
+
+#define NETPROX_MAX_PACKETS       64
+
+typedef struct {
+	int updateTime;
+	int size;
+	int flags;
+} netprofpacket_t;
+
+typedef struct {
+	int updateTime;
+	int index;
+	netprofpacket_t packets[NETPROX_MAX_PACKETS];
+	int lastCalcTime;
+	int lowestUpdateTime;
+	int highestUpdateTime;
+	int totalProcessed;
+	int totalSize;
+	int numFragmented;
+	int numDropped;
+	int numConnectionLess;
+	int totalLengthConnectionLess;
+	int packetsPerSec;
+	int bytesPerSec;
+	int percentFragmented;
+	int percentDropped;
+	int percentConnectionLess;
+	float latency;
+} netprofpacketlist_t;
+
+typedef struct {
+	qboolean initialized;
+	int rate;
+	netprofpacketlist_t outPackets;
+	netprofpacketlist_t inPackets;
+} netprofclient_t;
+
 void Netchan_Init( int qport );
 void Netchan_Setup(netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, int challenge, qboolean compat);
 
-void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data );
-void Netchan_TransmitNextFragment( netchan_t *chan );
+void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data, netprofpacketlist_t *packetlist );
+void Netchan_TransmitNextFragment( netchan_t *chan, netprofpacketlist_t *packetlist );
 
-qboolean Netchan_Process( netchan_t *chan, msg_t *msg );
+qboolean Netchan_Process( netchan_t *chan, msg_t *msg, netprofpacketlist_t *packetlist );
 
+void NetProfileAddPacket(netprofpacketlist_t* list, size_t size, int flags);
+void NetProfileSetPacketFlags(netprofpacketlist_t* list, int flags);
+void NetProfileCalcStats(netprofpacketlist_t* list, int time);
 
 /*
 ==============================================================
diff --git a/code/server/server.h b/code/server/server.h
index 554ab9c8..d14b2ca2 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -192,7 +192,9 @@ typedef struct client_s {
 	int				snapshotMsec;		// requests a snapshot every snapshotMsec unless rate choked
 	int				pureAuthentic;
 	qboolean  gotCP; // TTimo - additional flag to distinguish between a bad pure checksum, and no cp command at all
-	netchan_t		netchan;
+    netchan_t		netchan;
+	// Added in 2.0
+    netprofclient_t netprofile;
 	// TTimo
 	// queuing outgoing fragmented messages to send them properly, without udp packet bursts
 	// in case large fragmented messages are stacking up
@@ -319,6 +321,8 @@ typedef struct {
 #ifndef DEDICATED
 	soundsystemsavegame_t	soundSystem;
 #endif
+	// Added in 2.0
+	netprofclient_t netprofile;
 } serverStatic_t;
 
 #define SERVER_MAXBANS	1024
@@ -621,6 +625,10 @@ void SV_Netchan_Transmit( client_t *client, msg_t *msg);
 int SV_Netchan_TransmitNextFragment( client_t *client );
 qboolean SV_Netchan_Process( client_t *client, msg_t *msg );
 void SV_Netchan_FreeQueue(client_t *client);
+void SV_NET_OutOfBandPrint(netprofclient_t* netprof, netadr_t adr, const char* format, ...);
+void SV_NET_UpdateClientNetProfileInfo(netprofclient_t* netprofile, int rate);
+void SV_NET_UpdateAllNetProfileInfo();
+void SV_NET_CalcTotalNetProfile(netprofclient_t* netprofile, qboolean server);
 
 //
 // sv_gamespy.c
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 984b1b03..c0a76e46 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -502,7 +502,7 @@ static void SV_Ban_f( void ) {
 
 	// otherwise send their ip to the authorize server
 	if ( svs.authorizeAddress.type != NA_BAD ) {
-		NET_OutOfBandPrint( NS_SERVER, svs.authorizeAddress,
+		SV_NET_OutOfBandPrint( &svs.netprofile, svs.authorizeAddress,
 			"banUser %i.%i.%i.%i", cl->netchan.remoteAddress.ip[0], cl->netchan.remoteAddress.ip[1], 
 								   cl->netchan.remoteAddress.ip[2], cl->netchan.remoteAddress.ip[3] );
 		Com_Printf("%s was banned from coming back\n", cl->name);
@@ -556,7 +556,7 @@ static void SV_BanNum_f( void ) {
 
 	// otherwise send their ip to the authorize server
 	if ( svs.authorizeAddress.type != NA_BAD ) {
-		NET_OutOfBandPrint( NS_SERVER, svs.authorizeAddress,
+		SV_NET_OutOfBandPrint( &svs.netprofile, svs.authorizeAddress,
 			"banUser %i.%i.%i.%i", cl->netchan.remoteAddress.ip[0], cl->netchan.remoteAddress.ip[1], 
 								   cl->netchan.remoteAddress.ip[2], cl->netchan.remoteAddress.ip[3] );
 		Com_Printf("%s was banned from coming back\n", cl->name);
@@ -1573,6 +1573,120 @@ void SV_LoadLastGame_f( void )
 	Cbuf_AddText( va( "loadgame %s\n", Cvar_Get( "g_lastsave", "", 0 )->string ) );
 }
 
+/*
+=================
+SV_NetProfileDump_PrintProf
+=================
+*/
+void SV_NetProfileDump_PrintProf(fileHandle_t file, netprofclient_t* netprofile)
+{
+    size_t totalProcessed;
+    char buffer[2048];
+
+	totalProcessed = netprofile->outPackets.totalProcessed + netprofile->inPackets.totalProcessed;
+
+    Com_sprintf(
+        buffer,
+        sizeof(buffer),
+        "%4i %4i %4i | %3i %3i %3i | %3i %3i %3i | %3i %3i %3i | %7i %7i %7i\n",
+        netprofile->inPackets.packetsPerSec,
+        netprofile->outPackets.packetsPerSec,
+        netprofile->outPackets.packetsPerSec + netprofile->inPackets.packetsPerSec,
+        netprofile->inPackets.percentFragmented,
+        netprofile->outPackets.percentFragmented,
+        (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented) / totalProcessed),
+        netprofile->inPackets.percentDropped,
+        netprofile->outPackets.percentDropped,
+        (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped) / totalProcessed),
+        netprofile->inPackets.percentDropped,
+        netprofile->outPackets.percentDropped,
+        (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess + netprofile->inPackets.totalLengthConnectionLess) / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize)),
+        netprofile->inPackets.bytesPerSec,
+        netprofile->outPackets.bytesPerSec,
+        netprofile->outPackets.bytesPerSec + netprofile->inPackets.bytesPerSec
+	);
+
+    FS_Write(buffer, strlen(buffer), file);
+}
+
+/*
+=================
+SV_NetProfileDump_f
+=================
+*/
+void SV_NetProfileDump_f(void)
+{
+	static fileHandle_t hFile = 0;
+	client_t *client;
+	int i;
+	char buffer[2048];
+	netprofclient_t netproftotal;
+
+	if (!hFile) {
+		hFile = FS_FOpenTextFileWrite("netprofile.log");
+        FS_ForceFlush(hFile);
+        
+		Com_sprintf(buffer, sizeof(buffer), "NetProfile.log\n\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+		
+		Com_sprintf(buffer, sizeof(buffer), "Log Format:\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+		
+		Com_sprintf(
+            buffer,
+			sizeof(buffer),
+            "Source: Packets per Second In/Out/Total | %%Fragments In/Out/Total | %%Dropped In/Out/Total | %%OOB Data In/Out/Total"
+            " | Data per Second In/Out/Total\n"
+            "\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+	}
+
+	if (!sv_netprofile->integer) {
+		return;
+	}
+
+#ifndef DEDICATED
+    if (!com_cl_running->integer || com_sv_running->integer) {
+#else
+    if (com_sv_running->integer) {
+#endif
+		Com_sprintf(buffer, sizeof(buffer), "------------------\nServer Net Profile\n");
+		FS_Write(buffer, strlen(buffer), hFile);
+		SV_NET_CalcTotalNetProfile(&netproftotal, 1);
+
+		Com_sprintf(buffer, sizeof(buffer), "Total:        ");
+		FS_Write(buffer, strlen(buffer), hFile);
+		SV_NetProfileDump_PrintProf(hFile, &netproftotal);
+
+		Com_sprintf(buffer, sizeof(buffer), "Clientless:   ");
+		FS_Write(buffer, strlen(buffer), hFile);
+		SV_NetProfileDump_PrintProf(hFile, &svs.netprofile);
+
+		for (i = 0; i < svs.iNumClients; i++) {
+            client = &svs.clients[i];
+            if (client->state != CS_ACTIVE || !client->gentity) {
+                continue;
+            }
+
+			if (client->netchan.remoteAddress.type == NA_LOOPBACK) {
+				Com_sprintf(buffer, sizeof(buffer), "#%2i-Loopback: ");
+			} else {
+				Com_sprintf(buffer, sizeof(buffer), "Client #%2i:   ");
+			}
+
+			FS_Write(buffer, strlen(buffer), hFile);
+			SV_NetProfileDump_PrintProf(hFile, &client->netprofile);
+		}
+	}
+#ifndef DEDICATED
+	else if (com_cl_running->integer && cl_netprofile->integer) {
+        Com_sprintf(buffer, sizeof(buffer), "------------------\nClient Net Profile\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+        SV_NetProfileDump_PrintProf(hFile, &cls.netprofile);
+	}
+#endif
+}
+
 /*
 =================
 SV_ReloadMap_f
@@ -1730,6 +1844,8 @@ void SV_AddOperatorCommands(void) {
 	Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
 	Cmd_AddCommand("difficultyHard", SV_HardMode_f);
 
+	// Added in 2.0
+    Cmd_AddCommand("netprofiledump", SV_NetProfileDump_f);
 	// Added in 2.30
     Cmd_AddCommand("reloadmap", SV_ReloadMap_f);
 
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index b849f90d..31c42697 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -89,7 +89,7 @@ void SV_GetChallenge(netadr_t from)
 	// it's also way more cool this way :)
 	if ( Sys_IsLANAddress( from ) ) {
 		challenge->pingTime = svs.time;
-		NET_OutOfBandPrint( NS_SERVER, from, "challengeResponse %i", challenge->challenge );
+		SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge );
 		return;
 	}
 
@@ -97,7 +97,7 @@ void SV_GetChallenge(netadr_t from)
 		// mohaa below 2.0 doesn't handle gamespy key
         // so send the challenge response directly
         challenge->pingTime = svs.time;
-        NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+        SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         return;
 	}
 
@@ -106,12 +106,12 @@ void SV_GetChallenge(netadr_t from)
 		// however, it could be an useful feature for a far future
 		// where players could be authenticated
         challenge->pingTime = svs.time;
-        NET_OutOfBandPrint(NS_SERVER, from, "challengeResponse %i", challenge->challenge);
+        SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         return;
 	}
 
 	// check client's cd key
-	NET_OutOfBandPrint(NS_SERVER, from, "getKey %s", challenge->gsChallenge);
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "getKey %s", challenge->gsChallenge);
 	challenge->pingTime = svs.time;
 }
 
@@ -158,21 +158,21 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 
 	if ( !Q_stricmp( s, "demo" ) ) {
 		// they are a demo client trying to connect to a real server
-		NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\nServer is not a demo server\n" );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\nServer is not a demo server\n" );
 		// clear the challenge record so it won't timeout and let them through
 		Com_Memset( challengeptr, 0, sizeof( *challengeptr ) );
 		return;
 	}
 	if ( !Q_stricmp( s, "accept" ) ) {
-		NET_OutOfBandPrint(NS_SERVER, challengeptr->adr,
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr,
 			"challengeResponse %d %d %d", challengeptr->challenge, challengeptr->clientChallenge, com_protocol->integer);
 		return;
 	}
 	if ( !Q_stricmp( s, "unknown" ) ) {
 		if (!r) {
-			NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\nAwaiting CD key authorization\n" );
+			SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\nAwaiting CD key authorization\n" );
 		} else {
-			NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\n%s\n", r);
+			SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\n%s\n", r);
 		}
 		// clear the challenge record so it won't timeout and let them through
 		Com_Memset( challengeptr, 0, sizeof( *challengeptr ) );
@@ -181,9 +181,9 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 
 	// authorization failed
 	if (!r) {
-		NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\nSomeone is using this CD Key\n" );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\nSomeone is using this CD Key\n" );
 	} else {
-		NET_OutOfBandPrint( NS_SERVER, challengeptr->adr, "print\n%s\n", r );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\n%s\n", r );
 	}
 
 	// clear the challenge record so it won't timeout and let them through
@@ -317,7 +317,7 @@ void SV_DirectConnect( netadr_t from ) {
 	// Check whether this client is banned.
 	if(SV_IsBanned(&from, qfalse))
 	{
-		NET_OutOfBandPrint(NS_SERVER, from, "droperror\nYou are banned from this server.\n");
+		SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nYou are banned from this server.\n");
 		return;
 	}
 
@@ -330,7 +330,7 @@ void SV_DirectConnect( netadr_t from ) {
 		// Added in 2.30
 		//  Only allow breakthrough clients when targeting mohaab
 		if (strcmp(clientType, "Breakthrough")) {
-			NET_OutOfBandPrint(NS_SERVER, from, "droperror\nRequires Medal of Honor Allied Assault Breakthrough\n");
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nRequires Medal of Honor Allied Assault Breakthrough\n");
 			Com_DPrintf("    rejected connect - only Breakthrough clients allowed.\n");
 			return;
 		}
@@ -346,7 +346,7 @@ void SV_DirectConnect( netadr_t from ) {
 	{
 		if(version != com_protocol->integer)
 		{
-			NET_OutOfBandPrint(NS_SERVER, from, "droperror\nServer uses protocol version %i "
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nServer uses protocol version %i "
 					   "(yours is %i).\n", com_protocol->integer, version);
 			Com_DPrintf("    rejected connect from version %i\n", version);
 			return;
@@ -379,7 +379,7 @@ void SV_DirectConnect( netadr_t from ) {
 	else
 		ip = (char *)NET_AdrToString( from );
 	if( ( strlen( ip ) + strlen( userinfo ) + 4 ) >= MAX_INFO_STRING ) {
-		NET_OutOfBandPrint( NS_SERVER, from,
+		SV_NET_OutOfBandPrint( &svs.netprofile, from,
 			"droperror\nUserinfo string length exceeded.  "
 			"Try removing setu cvars from your config.\n" );
 		return;
@@ -403,7 +403,7 @@ void SV_DirectConnect( netadr_t from ) {
 
 		if (i == MAX_CHALLENGES)
 		{
-			NET_OutOfBandPrint( NS_SERVER, from, "print\nNo or bad challenge for your address.\n" );
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "print\nNo or bad challenge for your address.\n" );
 			return;
 		}
 	
@@ -420,13 +420,13 @@ void SV_DirectConnect( netadr_t from ) {
 		// never reject a LAN client based on ping
 		if ( !Sys_IsLANAddress( from ) ) {
 			if ( sv_minPing->value && ping < sv_minPing->value ) {
-				NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for high pings only\n" );
+				SV_NET_OutOfBandPrint( &svs.netprofile, from, "print\nServer is for high pings only\n" );
 				Com_DPrintf ("Client %i rejected on a too low ping\n", i);
 				challengeptr->wasrefused = qtrue;
 				return;
 			}
 			if ( sv_maxPing->value && ping > sv_maxPing->value ) {
-				NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for low pings only\n" );
+				SV_NET_OutOfBandPrint( &svs.netprofile, from, "print\nServer is for low pings only\n" );
 				Com_DPrintf ("Client %i rejected on a too high ping\n", i);
 				challengeptr->wasrefused = qtrue;
 				return;
@@ -509,7 +509,7 @@ void SV_DirectConnect( netadr_t from ) {
 			}
 		}
 		else {
-			NET_OutOfBandPrint( NS_SERVER, from, "droperror\nServer is full.\n" );
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nServer is full.\n" );
 			Com_DPrintf ("Rejected a connection.\n");
 			return;
 		}
@@ -548,7 +548,7 @@ gotnewcl:
 	// get the game a chance to reject this connection or modify the userinfo
 	denied = ge->ClientConnect( clientNum, qtrue, qfalse );
 	if ( denied ) {
-		NET_OutOfBandPrint( NS_SERVER, from, "droperror\n%s\n", denied );
+		SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\n%s\n", denied );
 		Com_DPrintf ( "Game rejected a connection: %s.\n", denied );
 		return;
 	}
@@ -560,8 +560,12 @@ gotnewcl:
 
 	SV_UserinfoChanged( newcl );
 
+	if (sv_netprofile->integer) {
+		SV_NET_UpdateClientNetProfileInfo(&newcl->netprofile, newcl->rate);
+	}
+
 	// send the connect packet to the client
-	NET_OutOfBandPrint(NS_SERVER, from, "connectResponse %d", challenge);
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "connectResponse %d", challenge);
 
 	Com_DPrintf( "Going from CS_FREE to CS_CONNECTED for %s\n", newcl->name );
 
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 1368e4b6..bd3893a6 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -530,7 +530,7 @@ void SVC_Status( netadr_t from ) {
 		}
 	}
 
-	NET_OutOfBandPrint( NS_SERVER, from, "statusResponse\n%s\n%s", infostring, status );
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "statusResponse\n%s\n%s", infostring, status );
 }
 
 /*
@@ -618,7 +618,7 @@ void SVC_Info( netadr_t from ) {
 	Info_SetValueForKey(infostring, "gamever", com_target_version->string);
 	Info_SetValueForKey(infostring, "serverType", va("%i", com_target_game->integer));
 
-	NET_OutOfBandPrint( NS_SERVER, from, "infoResponse\n%s", infostring );
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "infoResponse\n%s", infostring );
 }
 
 /*
@@ -628,7 +628,7 @@ SVC_FlushRedirect
 ================
 */
 static void SV_FlushRedirect( char *outputbuf ) {
-	NET_OutOfBandPrint( NS_SERVER, svs.redirectAddress, "print\n%s", outputbuf );
+	SV_NET_OutOfBandPrint( &svs.netprofile, svs.redirectAddress, "print\n%s", outputbuf );
 }
 
 /*
@@ -720,6 +720,10 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	char	*s;
 	char	*c;
 
+	if (sv_netprofile->integer) {
+		NetProfileAddPacket(&svs.netprofile.inPackets, msg->cursize, NETPROF_PACKET_MESSAGE);
+	}
+
 	MSG_BeginReadingOOB( msg );
 	MSG_ReadLong( msg );		// skip the -1 marker
 
@@ -818,7 +822,7 @@ void SV_PacketEvent( netadr_t from, msg_t *msg ) {
 	
 	// if we received a sequenced packet from an address we don't recognize,
 	// send an out of band disconnect packet to it
-	NET_OutOfBandPrint( NS_SERVER, from, "disconnect" );
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "disconnect" );
 }
 
 
@@ -1023,6 +1027,8 @@ void SV_Frame( int msec ) {
 		return;
 	}
 
+	SV_NET_UpdateAllNetProfileInfo();
+
 	// allow pause if only the local client is connected
 	if ( SV_CheckPaused() ) {
 		return;
diff --git a/code/server/sv_net_chan.c b/code/server/sv_net_chan.c
index 66832630..6b93be9c 100644
--- a/code/server/sv_net_chan.c
+++ b/code/server/sv_net_chan.c
@@ -169,7 +169,7 @@ void SV_Netchan_TransmitNextInQueue(client_t *client)
 		SV_Netchan_Encode(client, &netbuf->msg, netbuf->clientCommandString);
 #endif
 
-	Netchan_Transmit(&client->netchan, netbuf->msg.cursize, netbuf->msg.data);
+    Netchan_Transmit(&client->netchan, netbuf->msg.cursize, netbuf->msg.data, sv_netprofile->integer ? &client->netprofile.outPackets : NULL);
 
 	// pop from queue
 	client->netchan_start_queue = netbuf->next;
@@ -197,7 +197,7 @@ int SV_Netchan_TransmitNextFragment(client_t *client)
 {
 	if(client->netchan.unsentFragments)
 	{
-		Netchan_TransmitNextFragment(&client->netchan);
+		Netchan_TransmitNextFragment(&client->netchan, sv_netprofile->integer ? &client->netprofile.outPackets : NULL);
 		return SV_RateMsec(client);
 	}
 	else if(client->netchan_start_queue)
@@ -250,7 +250,7 @@ void SV_Netchan_Transmit( client_t *client, msg_t *msg)
 		if(client->compat)
 			SV_Netchan_Encode(client, msg, client->lastClientCommandString);
 #endif
-		Netchan_Transmit( &client->netchan, msg->cursize, msg->data );
+        Netchan_Transmit(&client->netchan, msg->cursize, msg->data, sv_netprofile->integer ? &client->netprofile.outPackets : NULL);
 	}
 }
 
@@ -261,7 +261,7 @@ Netchan_SV_Process
 */
 qboolean SV_Netchan_Process( client_t *client, msg_t *msg ) {
 	int ret;
-	ret = Netchan_Process( &client->netchan, msg );
+	ret = Netchan_Process( &client->netchan, msg, sv_netprofile->integer ? &client->netprofile.inPackets : NULL );
 	if (!ret)
 		return qfalse;
 
@@ -273,3 +273,170 @@ qboolean SV_Netchan_Process( client_t *client, msg_t *msg ) {
 	return qtrue;
 }
 
+/*
+=================
+SV_NET_OutOfBandPrint
+=================
+*/
+void SV_NET_OutOfBandPrint(netprofclient_t* netprof, netadr_t adr, const char* format, ...) {
+    va_list	argptr;
+    char	string[MAX_MSGLEN];
+
+    va_start(argptr, format);
+    Q_vsnprintf(string, sizeof(string), format, argptr);
+    va_end(argptr);
+
+	NET_OutOfBandPrint(NS_SERVER, adr, "%s", string);
+
+	if (sv_netprofile->integer && netprof) {
+		NetProfileAddPacket(&netprof->outPackets, strlen(string), NETPROF_PACKET_MESSAGE);
+	}
+}
+
+/*
+=================
+SV_NET_UpdateClientNetProfileInfo
+=================
+*/
+void SV_NET_UpdateClientNetProfileInfo(netprofclient_t* netprofile, int rate) {
+	int time;
+
+	if (!netprofile->initialized) {
+		memset(netprofile, 0, sizeof(*netprofile));
+		netprofile->initialized = qtrue;
+	}
+
+	if (netprofile->rate != rate) {
+		netprofile->rate = rate;
+	}
+
+	// set the update time
+    time = Com_Milliseconds();
+
+    netprofile->outPackets.updateTime = time;
+    netprofile->inPackets.updateTime = time;
+}
+
+/*
+=================
+SV_NET_UpdateAllNetProfileInfo
+=================
+*/
+void SV_NET_UpdateAllNetProfileInfo() {
+	client_t *client;
+	int i;
+
+	if (!sv_netprofile->integer) {
+		//
+		// Clear all netprofile fields
+		//
+
+		svs.netprofile.initialized = qfalse;
+
+		for (i = 0; i < svs.iNumClients; i++) {
+			svs.clients[i].netprofile.initialized = qfalse;
+		}
+
+		return;
+	}
+
+	SV_NET_UpdateClientNetProfileInfo(&svs.netprofile, sv_maxRate->integer);
+
+    for (i = 0; i < svs.iNumClients; i++) {
+		client = &svs.clients[i];
+		if (client->state != CS_ACTIVE || !client->gentity) {
+			client->netprofile.initialized = qfalse;
+			continue;
+		}
+
+		SV_NET_UpdateClientNetProfileInfo(&client->netprofile, client->rate);
+    }
+}
+
+/*
+=================
+SV_NET_CalcTotalNetProfile
+=================
+*/
+void SV_NET_CalcTotalNetProfile(netprofclient_t* netprofile, qboolean server) {
+	client_t *client;
+	int i;
+	int numValidClients;
+
+	numValidClients = 0;
+	memset(netprofile, 0, sizeof(*netprofile));
+
+    if (server) {
+        NetProfileCalcStats(&svs.netprofile.outPackets, 0);
+        NetProfileCalcStats(&svs.netprofile.inPackets, 0);
+    } else {
+        NetProfileCalcStats(&svs.netprofile.outPackets, 500);
+        NetProfileCalcStats(&svs.netprofile.inPackets, 500);
+    }
+
+	for (i = 0; i < svs.iNumClients; i++) {
+		client = &svs.clients[i];
+		if (client->state != CS_ACTIVE || !client->gentity) {
+			client->netprofile.initialized = qfalse;
+			continue;
+		}
+
+		if (server) {
+			NetProfileCalcStats(&client->netprofile.outPackets, 0);
+			NetProfileCalcStats(&client->netprofile.inPackets, 0);
+		} else {
+			NetProfileCalcStats(&client->netprofile.outPackets, 500);
+			NetProfileCalcStats(&client->netprofile.inPackets, 500);
+		}
+
+		numValidClients++;
+
+		netprofile->rate += client->netprofile.rate;
+		netprofile->outPackets.totalSize += client->netprofile.outPackets.totalSize;
+		netprofile->outPackets.bytesPerSec += client->netprofile.outPackets.bytesPerSec;
+		netprofile->outPackets.numDropped += client->netprofile.outPackets.numDropped;
+		netprofile->outPackets.percentDropped += client->netprofile.outPackets.percentDropped;
+		netprofile->outPackets.percentFragmented += client->netprofile.outPackets.percentFragmented;
+		netprofile->outPackets.numFragmented += client->netprofile.outPackets.numFragmented;
+		netprofile->outPackets.totalLengthConnectionLess += client->netprofile.outPackets.totalLengthConnectionLess;
+		netprofile->outPackets.percentConnectionLess += client->netprofile.outPackets.percentConnectionLess;
+		netprofile->outPackets.totalProcessed += client->netprofile.outPackets.totalProcessed;
+		netprofile->outPackets.packetsPerSec += client->netprofile.outPackets.packetsPerSec;
+		netprofile->inPackets.totalSize += client->netprofile.inPackets.totalSize;
+		netprofile->inPackets.bytesPerSec += client->netprofile.inPackets.bytesPerSec;
+		netprofile->inPackets.numDropped += client->netprofile.inPackets.numDropped;
+		netprofile->inPackets.percentDropped += client->netprofile.inPackets.percentDropped;
+		netprofile->inPackets.percentFragmented += client->netprofile.inPackets.percentFragmented;
+		netprofile->inPackets.numFragmented += client->netprofile.inPackets.numFragmented;
+		netprofile->inPackets.totalLengthConnectionLess += client->netprofile.inPackets.totalLengthConnectionLess;
+		netprofile->inPackets.percentConnectionLess += client->netprofile.inPackets.percentConnectionLess;
+		netprofile->inPackets.totalProcessed += client->netprofile.inPackets.totalProcessed;
+		netprofile->inPackets.packetsPerSec += client->netprofile.inPackets.packetsPerSec;
+	}
+
+	if (numValidClients && netprofile->rate) {
+		netprofile->rate /= numValidClients;
+	}
+
+    netprofile->outPackets.totalSize += svs.netprofile.outPackets.totalSize;
+    netprofile->outPackets.bytesPerSec += svs.netprofile.outPackets.bytesPerSec;
+    netprofile->outPackets.numDropped += svs.netprofile.outPackets.numDropped;
+    netprofile->outPackets.percentDropped += svs.netprofile.outPackets.percentDropped;
+    netprofile->outPackets.percentFragmented += svs.netprofile.outPackets.percentFragmented;
+    netprofile->outPackets.numFragmented += svs.netprofile.outPackets.numFragmented;
+    netprofile->outPackets.totalLengthConnectionLess += svs.netprofile.outPackets.totalLengthConnectionLess;
+    netprofile->outPackets.percentConnectionLess += svs.netprofile.outPackets.percentConnectionLess;
+    netprofile->outPackets.totalProcessed += svs.netprofile.outPackets.totalProcessed;
+    netprofile->outPackets.packetsPerSec += svs.netprofile.outPackets.packetsPerSec;
+    netprofile->inPackets.totalSize += svs.netprofile.inPackets.totalSize;
+    netprofile->inPackets.bytesPerSec += svs.netprofile.inPackets.bytesPerSec;
+    netprofile->inPackets.numDropped += svs.netprofile.inPackets.numDropped;
+    netprofile->inPackets.percentDropped += svs.netprofile.inPackets.percentDropped;
+    netprofile->inPackets.percentFragmented += svs.netprofile.inPackets.percentFragmented;
+    netprofile->inPackets.numFragmented += svs.netprofile.inPackets.numFragmented;
+    netprofile->inPackets.totalLengthConnectionLess += svs.netprofile.inPackets.totalLengthConnectionLess;
+    netprofile->inPackets.percentConnectionLess += svs.netprofile.inPackets.percentConnectionLess;
+    netprofile->inPackets.totalProcessed += svs.netprofile.inPackets.totalProcessed;
+    netprofile->inPackets.packetsPerSec += svs.netprofile.inPackets.packetsPerSec;
+}
+

From de0e4954f8104aca7b42e6bd8d9ea35bf8059aaf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 15:53:06 +0100
Subject: [PATCH 1405/2040] Call G_MoveClientToIntermission() instead of
 setting the immobile flag

---
 code/fgame/g_main.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index d0ab3647..e91f81ea 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1793,10 +1793,7 @@ void G_BeginIntermission2(void)
             continue;
         }
 
-        ent = client->entity;
-
-        G_DisplayScores(ent);
-        ent->flags |= FL_IMMOBILE;
+        G_MoveClientToIntermission(client->entity);
     }
 }
 

From 923a6de394ad90f603a957d3e3d8fe5fa79b13f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 16:07:55 +0100
Subject: [PATCH 1406/2040] Clear the velocity when both walking and frozen

---
 code/cgame/cg_view.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index d10efdba..e31b1e72 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -242,6 +242,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
     float      mat[3][3];
     vec3_t     vOldOrigin;
     vec3_t     vStart, vEnd, vMins, vMaxs;
+    vec3_t     vVelocity;
     trace_t    trace;
 
     VectorSet(vMins, -6, -6, -6);
@@ -297,6 +298,15 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
 
     VectorCopy(origin, vOldOrigin);
 
+    if (!cg.predicted_player_state.walking || !(cg.predicted_player_state.pm_flags & PMF_FROZEN)) {
+        VectorCopy(cg.predicted_player_state.velocity, vVelocity);
+    } else {
+        //
+        // Added in OPM
+        //  When frozen, there must be no movement at all
+        VectorClear(vVelocity);
+    }
+
     if (bUseWorldPosition) {
         iMask = MASK_VIEWSOLID;
     } else {
@@ -367,7 +377,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
         }
 
         if (cg.predicted_player_state.walking) {
-            fVel   = VectorLength(cg.predicted_player_state.velocity);
+            fVel   = VectorLength(vVelocity);
             fPhase = fVel * 0.0015 + 0.9;
             cg.fCurrentViewBobPhase += (cg.frametime / 1000.0 + cg.frametime / 1000.0) * M_PI * fPhase;
 
@@ -446,7 +456,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
         AngleVectorsLeft(vDelta, mat[0], mat[1], mat[2]);
 
         CG_CalcViewModelMovement(
-            cg.fCurrentViewBobPhase, cg.fCurrentViewBobAmp, cg.predicted_player_state.velocity, vDelta
+            cg.fCurrentViewBobPhase, cg.fCurrentViewBobAmp, vVelocity, vDelta
         );
 
         VectorMA(pREnt->origin, vDelta[0], mat[0], pREnt->origin);

From 67486f1e49d48ad6e5e9bdb9b4c015bf2436cbf2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 16:17:03 +0100
Subject: [PATCH 1407/2040] Clear the player velocity on intermission

---
 code/fgame/player.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 7da1a731..5c7eeabd 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4494,6 +4494,7 @@ void Player::ClientThink(void)
         if (g_gametype->integer != GT_SINGLE_PLAYER) {
             client->ps.pm_flags |= PMF_FROZEN;
             client->ps.pm_flags |= PMF_INTERMISSION;
+            VectorClear(client->ps.velocity);
 
             if (level.time - level.intermissiontime > 5.0f
                 && (new_buttons & (BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT))) {
@@ -4521,6 +4522,7 @@ void Player::ClientThink(void)
             }
 
             client->ps.pm_flags |= PMF_FROZEN;
+            VectorClear(client->ps.velocity);
 
             if (level.time - level.intermissiontime > 4.0f) {
                 if (level.intermissiontype) {

From 48e9db8966752cf8923abb62f5e70243e57e4790 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 16:50:23 +0100
Subject: [PATCH 1408/2040] Don't reload the state table when archiving

This fixes multiple issues where the player could end on an incorrect move type after loading from save, like getting out of the ladder
---
 code/fgame/player.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/fgame/player.h b/code/fgame/player.h
index 9d85c67b..1435777c 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1147,11 +1147,6 @@ inline void Player::Archive(Archiver& arc)
     arc.ArchiveBool(&m_bHasJumped);
     //====
 
-    // make sure we have the state machine loaded up
-    if (arc.Loading()) {
-        LoadStateTable();
-    }
-
     if (arc.Saving()) {
         if (currentState_Legs) {
             tempStr = currentState_Legs->getName();

From d3f3b9b51cc6de1108c21eba4b99a8b7c5ba84fc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 17:00:20 +0100
Subject: [PATCH 1409/2040] Don't allow lean in single-player in the base game

---
 code/cgame/cg_predict.c | 7 ++++++-
 code/fgame/player.cpp   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index dc2f0c37..5d7e1a8a 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -501,8 +501,13 @@ void CG_PredictPlayerState(void)
         cg_pmove.leanSpeed = 2.f;
     } else {
         cg_pmove.alwaysAllowLean = qtrue;
+        if (cgs.gametype != GT_SINGLE_PLAYER) {
+            cg_pmove.leanMax = 40.f;
+        } else {
+            // Don't allow lean in single-player, like in the original game
+            cg_pmove.leanMax = 0;
+        }
 
-        cg_pmove.leanMax = 40.f;
         cg_pmove.leanAdd = 10.f;
         cg_pmove.leanRecoverSpeed = 15.f;
         cg_pmove.leanSpeed = 4.f;
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 5c7eeabd..94370443 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3690,8 +3690,13 @@ void Player::SetMoveInfo(pmove_t *pm, usercmd_t *ucmd)
         pm->leanSpeed        = 2.f;
     } else {
         pm->alwaysAllowLean = qtrue;
+        if (g_gametype->integer != GT_SINGLE_PLAYER) {
+            pm->leanMax = 40.f;
+        } else {
+            // Don't allow lean in single-player, like in the original game
+            pm->leanMax = 0;
+        }
 
-        pm->leanMax          = 40.f;
         pm->leanAdd          = 10.f;
         pm->leanRecoverSpeed = 15.f;
         pm->leanSpeed        = 4.f;

From e5acee55ea94736130b2019ee30994bdeb800ba5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 17:42:37 +0100
Subject: [PATCH 1410/2040] Restore old behavior of "angle" event of the
 ScriptOrigin class on previous versions (below 2.30)

---
 code/fgame/scriptslave.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 2af19455..7d30ee3a 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -2149,6 +2149,12 @@ void ScriptOrigin::SetAngleEvent(Event* ev)
 {
     float angle;
 
+    if (g_target_game < target_game_e::TG_MOHTT) {
+        // Restore the old behavior on previous versions (below 2.30).
+        // For example, higgins rangers in m3l1a would not face forward
+        return ScriptSlave::SetAngleEvent(ev);
+    }
+
     angle = ev->GetFloat(1);
     if (angle == -1) {
         ForwardDir = Vector(0, 0, 90);

From c5721f8a2c06e091f3ac4a73bb98e037777da747 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 17:55:54 +0100
Subject: [PATCH 1411/2040] Fix variable name starting with multiple
 consecutive numbers

---
 code/parser/lex_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 655de23f..a8a20cd1 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -205,7 +205,7 @@ varname		[a-zA-Z0-9_\"\$]+
 "//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
 
 <VARIABLES>"size"							{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>[ ]*\./([0-9]?[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
+<VARIABLES>[ ]*\./([0-9]*[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
 <VARIABLES>\"{string}\"						{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
 <VARIABLES>{varname}						{
 												TextValue(yytext, strlen(yytext));

From fcc4e94655c609bc97c97cad4c63d51660e86d9d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 18:34:33 +0100
Subject: [PATCH 1412/2040] Continue traveling if the bullet trace goes
 backwards

---
 code/fgame/weaputils.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index e5d23952..98f00421 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2207,6 +2207,8 @@ float BulletAttack(
             oldfrac = -1;
 
             while (trace.fraction < 1.0f) {
+                Vector vDeltaTrace;
+
                 trace = G_Trace(
                     vTraceStart, vec_zero, vec_zero, vTraceEnd, newowner, MASK_SHOT_TRIG, false, "BulletAttack", true
                 );
@@ -2452,6 +2454,13 @@ float BulletAttack(
                 } else {
                     trace.fraction = 1;
                 }
+
+                vDeltaTrace = vTmpEnd - vTraceStart;
+                if (!bBulletDone && DotProduct(vDeltaTrace, vDir) < 0) {
+                    // Fixed in OPM
+                    //  This can happen in rare circumstances if the trace is out of the world limit
+                    break;
+                }
             }
         }
 

From 079555e43a386fd1056cce379121eb7c3a4a388e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 19:29:33 +0100
Subject: [PATCH 1413/2040] Fix VehicleTurretGun sound

---
 code/fgame/vehicleturret.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 3174b4c3..5c1ff7e6 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -810,7 +810,8 @@ void VehicleTurretGun::UpdateSound(void)
 
     case STT_OFF_TRANS_MOVING:
         m_fNextSoundState = level.time;
-        m_eSoundState     = STT_OFF;
+        m_eSoundState     = STT_MOVING;
+        Sound(m_sSoundSet + "snd_move_start");
         break;
 
     case STT_MOVING:
@@ -824,6 +825,7 @@ void VehicleTurretGun::UpdateSound(void)
     case STT_MOVING_TRANS_OFF:
         m_fNextSoundState = level.time;
         m_eSoundState     = STT_OFF;
+        StopLoopSound();
         Sound(m_sSoundSet + "snd_move_stop");
         break;
 

From d27f928e2dfabf962a93bdac6e666f8b272c0e0b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:58:46 +0100
Subject: [PATCH 1414/2040] Update features.md

---
 docs/features.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/features.md b/docs/features.md
index d963da1f..07a51438 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -17,14 +17,16 @@ Overall, better compatibility on modern systems and bugfixes.
 
 ### Client-side and server-side
 
-- Features from ioquake3
-- IPv6 support (from ioquake3)
-- Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
 - Demo recording
+- Features from ioquake3
+- Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
+- IPv6 support (from ioquake3)
 
 ### Client-side
 
+- Fixed background ambient sounds being muted when restarting
 - OpenAL and SDL are used
+- Smoother animations
 - Stufftext protection: commands that the server want clients to execute are now filtered
 
 ### Server-side

From 661b08a7fa0dfb47c540b5e89881e0245bdbbec6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 21:45:04 +0100
Subject: [PATCH 1415/2040] Don't set g_shownpc to 1 when developer is set

---
 code/fgame/gamecvars.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index f69cb855..2ce8fe5c 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -490,11 +490,14 @@ void CVAR_Init(void)
     g_teamkillwarn     = gi.Cvar_Get("g_teamkillwarn", "3", CVAR_ARCHIVE);
     g_teamkillkick     = gi.Cvar_Get("g_teamkillkick", "5", CVAR_ARCHIVE);
     g_teamswitchdelay  = gi.Cvar_Get("g_teamswitchdelay", "15", CVAR_ARCHIVE);
-    if (developer->integer) {
-        g_shownpc = gi.Cvar_Get("g_shownpc", "1", 0);
-    } else {
-        g_shownpc = gi.Cvar_Get("g_shownpc", "0", 0);
-    }
+    g_shownpc          = gi.Cvar_Get("g_shownpc", "0", 0);
+
+    // Removed in OPM
+    //if (developer->integer) {
+    //    g_shownpc = gi.Cvar_Get("g_shownpc", "1", 0);
+    //} else {
+    //    g_shownpc = gi.Cvar_Get("g_shownpc", "0", 0);
+    //}
 
     s_debugmusic = gi.Cvar_Get("s_debugmusic", "0", 0);
 

From cd89d2c0b4272699a2f15bf4c4c6d7473edb01c7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 21:48:02 +0100
Subject: [PATCH 1416/2040] Don't execute reloadmap if the server is not
 running

---
 code/server/sv_ccmds.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index c0a76e46..48fcea36 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1699,6 +1699,12 @@ void SV_ReloadMap_f(void)
 {
 	qboolean bTransition;
 
+	if (!com_sv_running->integer) {
+		// Fixed in OPM
+		Com_Printf("Server is not running.\n");
+		return;
+	}
+
 	Com_DPrintf("SV_ReloadMap\n");
 
 	if (!svs.mapName[0]) {

From 9a55939b4208ebce1bc4ed520be9566647fc3cc6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 22:10:34 +0100
Subject: [PATCH 1417/2040] Fix weapon selection

---
 code/fgame/player.cpp          | 235 ++++++++++++++++++++-------------
 code/fgame/sentient_combat.cpp |  65 ++++++---
 2 files changed, 193 insertions(+), 107 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 94370443..2d7d6aeb 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -87,7 +87,7 @@ const char *pInstantMsgEng[6][9] = {
      "You mess with the best, you die like the rest.", "Watch that friendly fire!",
      "Hey!  I'm on your team!", "Come on out you cowards!",
      "Where are you hiding?", NULL},
- // Added in 2.30
+    // Added in 2.30
     {"Guard our jail!",
      "Capture the enemy jail!", "I'm defending our jail!",
      "I'm attacking the enemy jail!", "Rescue the Prisoners!",
@@ -2022,13 +2022,13 @@ Player::Player()
     // Added in OPM
     //====
 #ifdef OPM_FEATURES
-    m_bShowingHint      = false;
+    m_bShowingHint = false;
 #endif
-    m_fpsTiki           = NULL;
-    m_bConnected        = false;
+    m_fpsTiki    = NULL;
+    m_bConnected = false;
 
     m_iInstantMessageTime = 0;
-    m_iTextChatTime = 0;
+    m_iTextChatTime       = 0;
     //====
 
     if (LoadingSavegame) {
@@ -3111,7 +3111,7 @@ void Player::Killed(Event *ev)
     RemoveFromVehiclesAndTurrets();
 
     if (g_gametype->integer != GT_SINGLE_PLAYER && attacker && attacker->IsSubclassOfPlayer()) {
-        static_cast<Player*>(attacker)->KilledPlayerInDeathmatch(this, (meansOfDeath_t)meansofdeath);
+        static_cast<Player *>(attacker)->KilledPlayerInDeathmatch(this, (meansOfDeath_t)meansofdeath);
     }
 
     deadflag = DEAD_DYING;
@@ -3462,7 +3462,7 @@ void Player::DoUse(Event *ev)
                 continue;
             }
 
-            Event* event = new Event(EV_Use);
+            Event *event = new Event(EV_Use);
             event->AddListener(this);
 
             hit->entity->ProcessEvent(event);
@@ -3483,7 +3483,7 @@ void Player::DoUse(Event *ev)
                 continue;
             }
 
-            Event* event = new Event(EV_Use);
+            Event *event = new Event(EV_Use);
             event->AddListener(this);
 
             hit->entity->ProcessEvent(event);
@@ -3950,13 +3950,12 @@ void Player::ClientMove(usercmd_t *ucmd)
         m_bShowingHint = false;
 
         // FIXME: delete
-        if (sv_specialgame->integer)
-        {
+        if (sv_specialgame->integer) {
             gi.MSG_SetClient(edict - g_entities);
 
             // Send the hint string once
             gi.MSG_StartCGM(CGM_HINTSTRING);
-                gi.MSG_WriteString("");
+            gi.MSG_WriteString("");
             gi.MSG_EndCGM();
         }
     }
@@ -3967,8 +3966,8 @@ void Player::ClientMove(usercmd_t *ucmd)
     client->ps.pm_type = GetMovePlayerMoveType();
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE
-          | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE | PMF_VIEW_DUCK_RUN
+          | PMF_VIEW_JUMP_START);
 
     if (level.playerfrozen || m_bFrozen) {
         client->ps.pm_flags |= PMF_FROZEN;
@@ -3987,7 +3986,7 @@ void Player::ClientMove(usercmd_t *ucmd)
         client->ps.pm_flags |= PMF_NO_PREDICTION;
         client->ps.pm_flags |= PMF_NO_MOVE;
     }
-    
+
     if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
         if (maxs.z == 54.0f || maxs.z == 60.0f) {
             client->ps.pm_flags |= PMF_DUCKED;
@@ -4156,8 +4155,8 @@ void Player::VehicleMove(usercmd_t *ucmd)
 
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE
-          | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE | PMF_VIEW_DUCK_RUN
+          | PMF_VIEW_JUMP_START);
 
     // disable prediction
     client->ps.pm_flags |= PMF_TURRET | PMF_NO_PREDICTION;
@@ -4173,7 +4172,7 @@ void Player::VehicleMove(usercmd_t *ucmd)
         // Added in OPM
         //  The player can't walk while attached to a vehicle
         client->ps.groundEntityNum = ENTITYNUM_NONE;
-        client->ps.walking = false;
+        client->ps.walking         = false;
     } else {
         ClientMove(ucmd);
     }
@@ -4191,8 +4190,8 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE
-          | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE | PMF_VIEW_DUCK_RUN
+          | PMF_VIEW_JUMP_START);
 
     // disable prediction
     client->ps.pm_flags |= PMF_TURRET | PMF_NO_PREDICTION;
@@ -4216,7 +4215,7 @@ void Player::TurretMove(usercmd_t *ucmd)
         // Added in OPM
         //  The player can't walk while attached to a turret
         client->ps.groundEntityNum = ENTITYNUM_NONE;
-        client->ps.walking = false;
+        client->ps.walking         = false;
     } else {
         ClientMove(ucmd);
     }
@@ -4747,7 +4746,8 @@ void Player::Think(void)
                     if (!ent->inuse || !ent->entity) {
                         // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator() || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator()
+                               || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
                     }
                 }
@@ -4770,9 +4770,11 @@ void Player::Think(void)
                     if (!ent->inuse || !ent->entity) {
                         // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator() || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator()
+                               || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
-                    } else if (g_gametype->integer >= GT_TEAM && GetTeam() > TEAM_FREEFORALL && static_cast<Player*>(ent->entity)->GetTeam() != GetTeam()) {
+                    } else if (g_gametype->integer >= GT_TEAM && GetTeam() > TEAM_FREEFORALL
+                               && static_cast<Player *>(ent->entity)->GetTeam() != GetTeam()) {
                         SetPlayerSpectateRandom();
                     }
                 }
@@ -4984,8 +4986,8 @@ void Player::InitTorsoStateTable(void)
 
 void Player::LoadStateTable(void)
 {
-    int i;
-    Conditional* cond;
+    int          i;
+    Conditional *cond;
 
     statemap_Legs  = NULL;
     statemap_Torso = NULL;
@@ -5007,8 +5009,9 @@ void Player::LoadStateTable(void)
 
     statemap_Legs =
         GetStatemap(str(g_statefile->string) + "_Legs.st", (Condition<Class> *)m_conditions, &legs_conditionals, false);
-    statemap_Torso =
-        GetStatemap(str(g_statefile->string) + "_Torso.st", (Condition<Class> *)m_conditions, &torso_conditionals, false);
+    statemap_Torso = GetStatemap(
+        str(g_statefile->string) + "_Torso.st", (Condition<Class> *)m_conditions, &torso_conditionals, false
+    );
 
     movecontrol = MOVECONTROL_LEGS;
 
@@ -5317,7 +5320,7 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
         // Added in 2.0
         //  Animations are handled hardcodedly
         currentState_Torso = NULL;
-        currentState_Legs = NULL;
+        currentState_Legs  = NULL;
         return;
     }
 
@@ -5589,26 +5592,38 @@ void Player::SelectNextItem(Event *ev)
 
 void Player::SelectPreviousWeapon(Event *ev)
 {
+    Weapon *weapon;
+    Weapon *initialWeapon;
+    Weapon *activeWeapon;
+
     if (deadflag) {
         return;
     }
 
-    Weapon *weapon       = GetActiveWeapon(WEAPON_MAIN);
-    Weapon *activeWeapon = weapon;
+    activeWeapon = GetActiveWeapon(WEAPON_MAIN);
+    if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+        activeWeapon = NULL;
+    }
 
-    if (weapon) {
-        weapon = PreviousWeapon(weapon);
+    if (!activeWeapon) {
+        activeWeapon = newActiveWeapon.weapon;
+        if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+            activeWeapon = NULL;
+        }
+    }
 
-        if (g_gametype->integer != GT_SINGLE_PLAYER) {
-            while (weapon && weapon != activeWeapon && weapon->IsSubclassOfInventoryItem()) {
-                Weapon *prev = PreviousWeapon(weapon);
-                // Added in OPM
-                //  Fixes the bug that cause infinite loop when the last weapon has no ammo
-                //  and the only weapon is an inventory item
-                if (prev == weapon) {
-                    break;
-                }
-                weapon = prev;
+    if (activeWeapon) {
+        // Fixed in OPM
+        //  Fixes the bug that cause infinite loop when the last weapon has no ammo
+        //  and the only weapon is an inventory item
+        for (weapon = initialWeapon = PreviousWeapon(activeWeapon); weapon && weapon != activeWeapon; ) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER || !weapon->IsSubclassOfInventoryItem()) {
+                break;
+            }
+
+            weapon = PreviousWeapon(weapon);
+            if (weapon == initialWeapon) {
+                break;
             }
         }
     } else {
@@ -5618,30 +5633,46 @@ void Player::SelectPreviousWeapon(Event *ev)
     if (weapon && weapon != activeWeapon) {
         useWeapon(weapon);
     }
+
+    if (deadflag) {
+        return;
+    }
 }
 
 void Player::SelectNextWeapon(Event *ev)
 {
+    Weapon *weapon;
+    Weapon *initialWeapon;
+    Weapon *activeWeapon;
+
     if (deadflag) {
         return;
     }
 
-    Weapon *weapon       = GetActiveWeapon(WEAPON_MAIN);
-    Weapon *activeWeapon = weapon;
+    activeWeapon = GetActiveWeapon(WEAPON_MAIN);
+    if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+        activeWeapon = NULL;
+    }
 
-    if (weapon) {
-        weapon = NextWeapon(weapon);
+    if (!activeWeapon) {
+        activeWeapon = newActiveWeapon.weapon;
+        if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+            activeWeapon = NULL;
+        }
+    }
 
-        if (g_gametype->integer != GT_SINGLE_PLAYER) {
-            while (weapon && weapon != activeWeapon && weapon->IsSubclassOfInventoryItem()) {
-                Weapon *next = NextWeapon(weapon);
-                // Added in OPM
-                //  Fixes the bug that cause infinite loop when the last weapon has no ammo
-                //  and the only weapon is an inventory item
-                if (next == weapon) {
-                    break;
-                }
-                weapon = next;
+    if (activeWeapon) {
+        // Fixed in OPM
+        //  Fixes the bug that cause infinite loop when the last weapon has no ammo
+        //  and the only weapon is an inventory item
+        for (weapon = initialWeapon = NextWeapon(activeWeapon); weapon && weapon != activeWeapon; ) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER || !weapon->IsSubclassOfInventoryItem()) {
+                break;
+            }
+
+            weapon = NextWeapon(weapon);
+            if (weapon == initialWeapon) {
+                break;
             }
         }
     } else {
@@ -6423,9 +6454,9 @@ void Player::DamageFeedback(void)
         //
 
         if (IsSubclassOfPlayer()) {
-            damage_count = 0;
-            damage_blood = 0;
-            damage_alpha = 0;
+            damage_count  = 0;
+            damage_blood  = 0;
+            damage_alpha  = 0;
             damage_angles = vec_zero;
         }
     }
@@ -7055,7 +7086,7 @@ void Player::CopyStats(Player *player)
     VectorCopy(player->client->ps.origin, client->ps.origin);
     VectorCopy(player->client->ps.velocity, client->ps.velocity);
 
-    client->ps.iViewModelAnim = player->client->ps.iViewModelAnim;
+    client->ps.iViewModelAnim        = player->client->ps.iViewModelAnim;
     client->ps.iViewModelAnimChanged = player->client->ps.iViewModelAnimChanged;
 
     client->ps.gravity = player->client->ps.gravity;
@@ -8096,7 +8127,7 @@ void Player::ArchivePersistantData(Archiver& arc)
 
     arc.ArchiveString(&name);
     if (arc.Loading() && name != "none") {
-        holsteredWeapon = (Weapon*)FindItem(name);
+        holsteredWeapon = (Weapon *)FindItem(name);
     }
 
     UpdateWeapons();
@@ -9999,20 +10030,34 @@ void Player::EventPrimaryDMWeapon(Event *ev)
     } else if (!str::icmp(dm_weapon, "landmine")) {
         bIsBanned = (dmflags->integer & DF_WEAPON_NO_LANDMINE) || !QueryLandminesAllowed();
     } else if (!str::icmp(dm_weapon, "auto")) {
-        const char* primaryList[7];
-        size_t numPrimaries = 0;
+        const char *primaryList[7];
+        size_t      numPrimaries = 0;
 
         //
         // Added in OPM
         //  Choose a random allowed weapon
         //
-        if (!(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) { primaryList[numPrimaries++] = "shotgun"; }
-        if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) { primaryList[numPrimaries++] = "rifle"; }
-        if (!(dmflags->integer & DF_WEAPON_NO_SNIPER)) { primaryList[numPrimaries++] = "sniper"; }
-        if (!(dmflags->integer & DF_WEAPON_NO_SMG)) { primaryList[numPrimaries++] = "smg"; }
-        if (!(dmflags->integer & DF_WEAPON_NO_MG)) { primaryList[numPrimaries++] = "mg"; }
-        if (!(dmflags->integer & DF_WEAPON_NO_ROCKET)) { primaryList[numPrimaries++] = "heavy"; }
-        if (!(dmflags->integer & DF_WEAPON_NO_LANDMINE) && QueryLandminesAllowed()) { primaryList[numPrimaries++] = "landmine"; }
+        if (!(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) {
+            primaryList[numPrimaries++] = "shotgun";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            primaryList[numPrimaries++] = "rifle";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_SNIPER)) {
+            primaryList[numPrimaries++] = "sniper";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_SMG)) {
+            primaryList[numPrimaries++] = "smg";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_MG)) {
+            primaryList[numPrimaries++] = "mg";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_ROCKET)) {
+            primaryList[numPrimaries++] = "heavy";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_LANDMINE) && QueryLandminesAllowed()) {
+            primaryList[numPrimaries++] = "landmine";
+        }
 
         if (numPrimaries) {
             dm_weapon = primaryList[rand() % numPrimaries];
@@ -10487,7 +10532,7 @@ void Player::PlayInstantMessageSound(const char *name)
 
 void Player::EventDMMessage(Event *ev)
 {
-    int              i;
+    int i;
     //int              iStringLength;
     int              iMode = 0;
     str              sToken;
@@ -10539,7 +10584,7 @@ void Player::EventDMMessage(Event *ev)
         } else {
             sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
         }
-        
+
         sRandomAlias = GetRandomAlias(sAliasName, &pSoundAlias);
 
         // find a random alias
@@ -10588,7 +10633,7 @@ void Player::EventDMMessage(Event *ev)
         if (!g_textmsg_allowed->integer) {
             // Added in OPM
 
-            str errorString = gi.LV_ConvertString("Message Error");
+            str errorString  = gi.LV_ConvertString("Message Error");
             str reasonString = gi.LV_ConvertString("Text chat is disabled on this server");
 
             gi.SendServerCommand(
@@ -11412,7 +11457,8 @@ int Player::GetMoveResult(void)
     return moveresult;
 }
 
-qboolean Player::CheckCanSwitchTeam(teamtype_t team) {
+qboolean Player::CheckCanSwitchTeam(teamtype_t team)
+{
     float startTime;
 
     startTime = dmManager.GetMatchStartTime();
@@ -11434,12 +11480,12 @@ qboolean Player::CheckCanSwitchTeam(teamtype_t team) {
     // Added in OPM
     //  Check and prevent joining the team with the highest number of players
     if (g_teambalance->integer && g_gametype->integer >= GT_TEAM && !dmManager.WaitingForPlayers()) {
-        DM_Team* pNewTeam = dmManager.GetTeam(team);
-        int i;
+        DM_Team *pNewTeam = dmManager.GetTeam(team);
+        int      i;
 
         for (i = 0; i < 2; i++) {
-            DM_Team* pTeam = dmManager.GetTeam((teamtype_t)(TEAM_ALLIES + i));
-            int numTeamPlayers = pTeam->m_players.NumObjects();
+            DM_Team *pTeam          = dmManager.GetTeam((teamtype_t)(TEAM_ALLIES + i));
+            int      numTeamPlayers = pTeam->m_players.NumObjects();
 
             if (pTeam->m_players.IndexOfObject(this)) {
                 // Don't count the current player
@@ -11450,7 +11496,9 @@ qboolean Player::CheckCanSwitchTeam(teamtype_t team) {
                 gi.SendServerCommand(
                     edict - g_entities,
                     "print \"" HUD_MESSAGE_WHITE "%s\n\"",
-                    gi.LV_ConvertString("That team has enough players. Choose the team that has the lowest number of players.")
+                    gi.LV_ConvertString(
+                        "That team has enough players. Choose the team that has the lowest number of players."
+                    )
                 );
                 return qfalse;
             }
@@ -12042,23 +12090,23 @@ void Player::Postthink(void)
     }
 }
 
-void Player::AdminRights(Event* ev)
+void Player::AdminRights(Event *ev)
 {
     // FIXME: Admin manager ?
     ev->AddInteger(0);
     UNIMPLEMENTED();
 }
 
-void Player::IsAdmin(Event* ev)
+void Player::IsAdmin(Event *ev)
 {
     // FIXME: Admin manager ?
     ev->AddInteger(0);
     UNIMPLEMENTED();
 }
 
-void Player::BindWeap(Event* ev)
+void Player::BindWeap(Event *ev)
 {
-    Entity *ent = ev->GetEntity(1);
+    Entity   *ent = ev->GetEntity(1);
     Listener *scriptOwner;
 
     //
@@ -12189,7 +12237,10 @@ void Player::GetConnState(Event *ev)
     // Assume CS_ACTIVE
     ev->AddInteger(4);
 
-    gi.DPrintf("getconnstate is deprecated and will always return 4 (CS_ACTIVE).\nThe player is created only when the client begins (CS_ACTIVE state).\n");
+    gi.DPrintf(
+        "getconnstate is deprecated and will always return 4 (CS_ACTIVE).\nThe player is created only when the client "
+        "begins (CS_ACTIVE state).\n"
+    );
 }
 
 void Player::GetDamageMultiplier(Event *ev)
@@ -12396,16 +12447,16 @@ void Player::PlayLocalSound(Event *ev)
     }
 
 #ifdef OPM_FEATURES
-        gi.MSG_SetClient( client->ps.clientNum );
+    gi.MSG_SetClient(client->ps.clientNum);
 
-        gi.MSG_StartCGM( CGM_PLAYLOCALSOUND );
-        gi.MSG_WriteString( found );
-        gi.MSG_WriteBits( !!loop, 1 );
-        gi.MSG_WriteFloat( time );
-        gi.MSG_WriteFloat( alias->volume );
-        gi.MSG_EndCGM();
+    gi.MSG_StartCGM(CGM_PLAYLOCALSOUND);
+    gi.MSG_WriteString(found);
+    gi.MSG_WriteBits(!!loop, 1);
+    gi.MSG_WriteFloat(time);
+    gi.MSG_WriteFloat(alias->volume);
+    gi.MSG_EndCGM();
 
-        return;
+    return;
 #endif
 
     if (loop) {
diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index 0e957210..dd213c79 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -863,15 +863,32 @@ Weapon *Sentient::BestWeapon(Weapon *ignore, qboolean bGetItem, int iIgnoreClass
         next = (Weapon *)G_GetEntity(inventory.ObjectAt(j));
 
         assert(next);
-
-        if ((next != ignore)
-            && ((next->IsSubclassOfWeapon() && !(next->GetWeaponClass() & iIgnoreClass))
-                || (next->IsSubclassOfItem() && bGetItem))
-            && (next->GetRank() > bestrank)
-            && (next->HasAmmo(FIRE_PRIMARY) || next->GetFireType(FIRE_SECONDARY) == FT_MELEE)) {
-            bestweapon = (Weapon *)next;
-            bestrank   = bestweapon->GetRank();
+        if (next == ignore) {
+            continue;
         }
+
+        if (!next->IsSubclassOfWeapon() && (!bGetItem || !next->IsSubclassOfInventoryItem())) {
+            continue;
+        }
+
+        if (!bGetItem && next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetWeaponClass() & iIgnoreClass) {
+            continue;
+        }
+
+        if (next->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (!next->HasAmmo(FIRE_PRIMARY) && !next->GetUseNoAmmo()) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
     }
 
     return bestweapon;
@@ -895,14 +912,32 @@ Weapon *Sentient::WorstWeapon(Weapon *ignore, qboolean bGetItem, int iIgnoreClas
 
         assert(next);
 
-        if ((next != ignore)
-            && ((next->IsSubclassOfWeapon() && !(next->GetWeaponClass() & iIgnoreClass))
-                || (next->IsSubclassOfWeapon() && bGetItem))
-            && (next->GetRank() < iWorstRank)
-            && (next->HasAmmo(FIRE_PRIMARY) || next->GetFireType(FIRE_SECONDARY) == FT_MELEE)) {
-            worstweapon = (Weapon *)next;
-            iWorstRank  = worstweapon->GetRank();
+        if (next == ignore) {
+            continue;
         }
+
+        if (!next->IsSubclassOfWeapon()) {
+            continue;
+        }
+
+        if (!bGetItem && next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetWeaponClass() & iIgnoreClass) {
+            continue;
+        }
+
+        if (next->GetRank() >= iWorstRank) {
+            continue;
+        }
+
+        if (!next->HasAmmo(FIRE_PRIMARY) && !next->GetUseNoAmmo()) {
+            continue;
+        }
+
+        worstweapon = (Weapon*)next;
+        iWorstRank = worstweapon->GetRank();
     }
 
     return worstweapon;

From 7e4da514f697766558cbed4c4385027218ecdb80 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 10 Nov 2024 22:14:03 +0100
Subject: [PATCH 1418/2040] Update features.md

---
 docs/features.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/features.md b/docs/features.md
index 07a51438..5c8b96e4 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -24,7 +24,6 @@ Overall, better compatibility on modern systems and bugfixes.
 
 ### Client-side
 
-- Fixed background ambient sounds being muted when restarting
 - OpenAL and SDL are used
 - Smoother animations
 - Stufftext protection: commands that the server want clients to execute are now filtered
@@ -48,6 +47,7 @@ Enable this feature with `set sv_netoptimize 2`.
 
 ### Client-side and server-side
 
+- Fixed background ambient sounds being muted when restarting
 - Fixes from SH 2.15, BT 2.40 and ioquake3
 - Buffer overflow fixes
 - Directory traversal fix
@@ -63,6 +63,8 @@ Enable this feature with `set sv_netoptimize 2`.
 - Fix to prevent being able to spectate while still in the team
 - Fix to prevent throwing a projectile and going into spectator to kill anyone
 - Fix for `sv_fps` (tickrate), higher values won't cause animation issues anymore
+- Fix for ladders to prevent sharking
+- Prevent crashing when the last weapon has no ammo and other weapons are inventory items
 
 ## Planned features
 

From 8732e368b69520bf61ced1fe2097cf251278aab0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:49:33 +0100
Subject: [PATCH 1419/2040] Clear the last command angles when loading

---
 code/fgame/weapturret.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index c9da66a5..9857ac24 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1879,6 +1879,14 @@ void TurretGun::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_fAISuppressHeight);
     arc.ArchiveVec3(m_vMuzzlePosition);
     arc.ArchiveFloat(&m_fMaxUseAngle);
+
+    //
+    // Added in 2.30
+    //  Clear the last command angles when loading
+    //  otherwise it would cause the player to face (0,0,0) when loading
+    if (arc.Loading()) {
+        m_vUserLastCmdAng = vec_zero;
+    }
 }
 
 qboolean TurretGun::AI_SetWeaponAnim(const char *anim, Event *ev)

From f40019053199f00a273472eb27bfd4120f40f674 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:03:24 +0100
Subject: [PATCH 1420/2040] Fix the switch label called incorrectly for
 VehicleTurretGunTandem

---
 code/fgame/vehicleturret.cpp | 10 ++++++++--
 code/fgame/vehicleturret.h   |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 5c1ff7e6..49021dcd 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -1780,6 +1780,8 @@ Event EV_VTGP_LinkTurret
     "Sets the next turret in the link.",
     EV_NORMAL
 );
+
+// Added in 2.30
 Event EV_VTGP_SetSwitchThread
 (
     "setswitchthread",
@@ -1792,6 +1794,8 @@ Event EV_VTGP_SetSwitchThread
 
 CLASS_DECLARATION(VehicleTurretGun, VehicleTurretGunTandem, "VehicleTurretGunTandem") {
     {&EV_VTGP_LinkTurret,      &VehicleTurretGunTandem::EventLinkTurret     },
+
+    // Added in 2.30
     {&EV_VTGP_SetSwitchThread, &VehicleTurretGunTandem::EventSetSwitchThread},
     {NULL,                     NULL                                         }
 };
@@ -2121,10 +2125,12 @@ void VehicleTurretGunTandem::SwitchToLinkedTurret()
 
     if (m_Slot.ent) {
         pTurret = static_cast<VehicleTurretGunTandem*>(m_Slot.ent.Pointer());
-        m_SwitchLabel.Execute(pTurret, NULL);
+        // Added in 2.30
+        m_SwitchLabel.Execute(this, pTurret, NULL);
     } else {
         pTurret = m_PrimaryTurret;
-        m_PrimaryTurret->m_SwitchLabel.Execute(pTurret, NULL);
+        // Added in 2.30
+        m_PrimaryTurret->m_SwitchLabel.Execute(this, pTurret, NULL);
     }
 
     SetActiveTurret(pTurret);
diff --git a/code/fgame/vehicleturret.h b/code/fgame/vehicleturret.h
index 617cbb65..97244137 100644
--- a/code/fgame/vehicleturret.h
+++ b/code/fgame/vehicleturret.h
@@ -160,6 +160,9 @@ public:
     void Archive(Archiver& arc) override;
 };
 
+//
+// Added in 2.0
+//
 class VehicleTurretGunTandem : public VehicleTurretGun
 {
 private:
@@ -179,7 +182,7 @@ public:
     ~VehicleTurretGunTandem();
 
     virtual void EventLinkTurret(Event *ev);
-    virtual void EventSetSwitchThread(Event *ev);
+    virtual void EventSetSwitchThread(Event *ev); // Added in 2.30
     virtual void AttachLinkedTurret(Entity *ent);
     virtual void UpdateLinkedTurret();
     virtual void OpenSlotsByModel();

From 51c7e27bc1603258510a993e24b8bb2febe0a838 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:05:14 +0100
Subject: [PATCH 1421/2040] Fix the switch label not being archived

---
 code/fgame/vehicleturret.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 49021dcd..43ad5a4d 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -2167,6 +2167,8 @@ void VehicleTurretGunTandem::Archive(Archiver& arc)
     arc.ArchiveSafePointer(&m_ActiveTurret);
     arc.ArchiveFloat(&m_fSwitchTimeRemaining);
     arc.ArchiveFloat(&m_fSwitchDelay);
+    // Added in 2.30
+    m_SwitchLabel.Archive(arc);
 }
 
 VehicleTurretGunTandem *VehicleTurretGunTandem::GetPrimaryTurret()

From 5edee7d12e8664c48c51608ee98d116a38826e29 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:21:21 +0100
Subject: [PATCH 1422/2040] Add tmvolume from Spearhead and Breakthrough

---
 code/client/snd_openal_new.cpp | 36 +++++++++++++++++++++++++++++++---
 code/client/snd_public.h       |  1 +
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 8e51ae43..3cc70443 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -646,6 +646,8 @@ qboolean S_OPENAL_Init()
     Cmd_AddCommand("tmstart", S_TriggeredMusic_Start);
     Cmd_AddCommand("tmstartloop", S_TriggeredMusic_StartLoop);
     Cmd_AddCommand("tmstop", S_TriggeredMusic_Stop);
+    // Added in 2.0
+    Cmd_AddCommand("tmvolume", S_TriggeredMusic_Volume);
 
     S_OPENAL_ClearLoopingSounds();
     load_sfx_info();
@@ -3049,7 +3051,13 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
-            qalBufferData(pSfx->buffer, fmt, &pSfx->data[pSfx->info.dataofs], pSfx->info.datasize - pSfx->info.dataofs, pSfx->info.rate);
+            qalBufferData(
+                pSfx->buffer,
+                fmt,
+                &pSfx->data[pSfx->info.dataofs],
+                pSfx->info.datasize - pSfx->info.dataofs,
+                pSfx->info.rate
+            );
             alDieIfError();
         }
     }
@@ -4139,6 +4147,28 @@ void S_TriggeredMusic_Stop()
     openal.tm_loopcount   = 0;
 }
 
+/*
+==============
+S_TriggeredMusic_Volume
+
+Added in 2.0
+==============
+*/
+void S_TriggeredMusic_Volume()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmvolume <0-1>\n\n");
+        return;
+    }
+
+    openal.chan_trig_music.fVolume = atof(Cmd_Argv(1));
+    music_volume_changed           = true;
+}
+
 /*
 ==============
 S_TriggeredMusic_Pause
@@ -4565,7 +4595,7 @@ U32 openal_channel_two_d_stream::sample_offset()
     alDieIfError();
 
     totalQueueLength = getQueueLength();
-    bytesPerSample = getBytesPerSample();
+    bytesPerSample   = getBytesPerSample();
 
     assert(playerByteOffset < totalQueueLength);
     assert(streamNextOffset >= totalQueueLength || stream);
@@ -4878,7 +4908,7 @@ unsigned int openal_channel_two_d_stream::getCurrentStreamPosition() const
     if (streamNextOffset >= queueLength) {
         return streamNextOffset - queueLength;
     } else if (streamHandle) {
-        snd_stream_t* stream = (snd_stream_t*)streamHandle;
+        snd_stream_t *stream = (snd_stream_t *)streamHandle;
         return (stream->info.size + streamNextOffset - queueLength) % stream->info.size;
     } else {
         return queueLength - streamNextOffset;
diff --git a/code/client/snd_public.h b/code/client/snd_public.h
index 1ad7476d..9edf4768 100644
--- a/code/client/snd_public.h
+++ b/code/client/snd_public.h
@@ -150,6 +150,7 @@ void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffs
 void S_TriggeredMusic_Start();
 void S_TriggeredMusic_StartLoop();
 void S_TriggeredMusic_Stop();
+void S_TriggeredMusic_Volume();
 void S_TriggeredMusic_Pause();
 void S_TriggeredMusic_Unpause();
 void S_TriggeredMusic_PlayIntroMusic();

From 7bcb91bbb5108985539f2137c61a82bc4ac18d9a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 15:08:08 +0100
Subject: [PATCH 1423/2040] Don't allocate the mark if the number of allocated
 polys is insufficient

There was a very rare occurrence where it would hang trying to find a free mark poly, when the number of specified polys was more than the number of allocated polys. This bug also occurs in the original game
---
 code/cgame/cg_marks.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index 961fbf58..27e681ac 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -425,6 +425,8 @@ void CG_FreeMarkObj(markObj_t *pMark)
     markPoly_t *pPoly;
     markPoly_t *pNextPoly;
 
+    assert(pMark != &cg_activeMarkObjs);
+
     for (pPoly = pMark->markPolys; pPoly; pPoly = pNextPoly) {
         pNextPoly = pPoly->nextPoly;
         CG_FreeMarkPoly(pPoly);
@@ -489,6 +491,12 @@ markObj_t *CG_AllocMark(int iNumPolys)
         return NULL;
     }
 
+    if (iNumPolys > cg_iNumMarkPolys) {
+        // Added in OPM
+        //  Make sure to not over allocate polys
+        return NULL;
+    }
+
     if (cg_iNumFreeMarkObjs <= cg_iMinFreeMarkObjs) {
         CG_FreeBestMarkObj(1);
     }

From 4023c9d8637ba0c4b388934fcf6119bdc8ef73a2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 16:40:43 +0100
Subject: [PATCH 1424/2040] Fix isOpen event, must return true if it's not
 closed

---
 code/fgame/doors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index dd07741c..a5ff7775 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -569,7 +569,7 @@ qboolean Door::isCompletelyClosed(void)
 
 void Door::GetIsOpen(Event *ev)
 {
-    ev->AddInteger(isOpen());
+    ev->AddInteger(!isCompletelyClosed());
 }
 
 void Door::OpenEnd(Event *ev)

From fef30ff3d5d0aeb4ce59b68ad41ed241bd4bbb0b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 17:35:41 +0100
Subject: [PATCH 1425/2040] Clear the splinepath entity flag when destroying

---
 code/fgame/bspline.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/bspline.cpp b/code/fgame/bspline.cpp
index 91713ab4..6a40bd44 100644
--- a/code/fgame/bspline.cpp
+++ b/code/fgame/bspline.cpp
@@ -576,6 +576,8 @@ SplinePath::~SplinePath()
 
     assert(owner == this);
     assert(next == NULL);
+
+    entflags &= ~ECF_SPLINEPATH;
 }
 
 void SplinePath::SetLoop(Event *ev)

From d400d8927dee12d351dd1fea5c97edbd97eef870 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 17:52:24 +0100
Subject: [PATCH 1426/2040] Fix archive data between 64-bit and 32-bit
 architectures

---
 code/fgame/g_utils.cpp  | 36 +++++++++++++++++++++++++++++++++++-
 code/fgame/g_utils.h    |  2 ++
 code/fgame/game.cpp     |  2 +-
 code/fgame/movegrid.cpp | 15 ++++++++++++++-
 code/fgame/movegrid.h   |  2 +-
 code/fgame/player.h     |  3 +++
 code/fgame/vehicle.cpp  | 14 +++++++++++++-
 7 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 5d49505e..fe130f8d 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1143,6 +1143,40 @@ Vector G_PredictPosition(Vector start, Vector target, Vector targetvelocity, flo
     return projected;
 }
 
+/*
+==============
+G_ArchiveTrace
+==============
+*/
+void G_ArchiveTrace(Archiver& arc, trace_t *trace)
+{
+    arc.ArchiveBoolean(&trace->allsolid);
+    arc.ArchiveBoolean(&trace->startsolid);
+    arc.ArchiveFloat(&trace->fraction);
+    arc.ArchiveVec3(trace->endpos);
+    arc.ArchiveVec3(trace->plane.normal);
+    arc.ArchiveFloat(&trace->plane.dist);
+    arc.ArchiveByte(&trace->plane.type);
+    arc.ArchiveByte(&trace->plane.signbits);
+    arc.ArchiveInteger(&trace->surfaceFlags);
+    arc.ArchiveInteger(&trace->shaderNum);
+    arc.ArchiveInteger(&trace->contents);
+    arc.ArchiveInteger(&trace->entityNum);
+    arc.ArchiveInteger(&trace->location);
+}
+
+/*
+==============
+G_ArchiveClient
+==============
+*/
+void G_ArchiveClient(Archiver& arc, gclient_t* client)
+{
+    arc.ArchiveVec3(client->cmd_angles);
+    arc.ArchiveInteger(&client->lastActiveTime);
+    arc.ArchiveInteger(&client->activeWarning);
+}
+
 /*
 ==============
 G_ArchiveEdict
@@ -1160,7 +1194,7 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
     //
 
     if (edict->client) {
-        arc.ArchiveRaw(edict->client, sizeof(*edict->client));
+        G_ArchiveClient(arc, edict->client);
     }
 
     arc.ArchiveInteger(&edict->s.beam_entnum);
diff --git a/code/fgame/g_utils.h b/code/fgame/g_utils.h
index 41663ea8..ebc73138 100644
--- a/code/fgame/g_utils.h
+++ b/code/fgame/g_utils.h
@@ -30,6 +30,8 @@ class SimpleEntity;
 class SimpleArchivedEntity;
 class ScriptThread;
 
+void G_ArchiveTrace(Archiver& arc, trace_t* trace);
+void G_ArchiveClient(Archiver& arc, gclient_t* client);
 void G_ArchiveEdict(Archiver& arc, gentity_t *edict);
 
 void G_AllocDebugLines(void);
diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index c323bce0..29d5c47b 100644
--- a/code/fgame/game.cpp
+++ b/code/fgame/game.cpp
@@ -121,7 +121,7 @@ void Game::Archive(Archiver& arc)
     }
 
     for (i = 0; i < maxclients; i++) {
-        arc.ArchiveRaw(&clients[i], sizeof(gclient_t));
+        G_ArchiveClient(arc, &clients[i]);
     }
 }
 
diff --git a/code/fgame/movegrid.cpp b/code/fgame/movegrid.cpp
index 7adfdae5..feb60248 100644
--- a/code/fgame/movegrid.cpp
+++ b/code/fgame/movegrid.cpp
@@ -218,10 +218,23 @@ qboolean cMoveGrid::CheckStuck(void)
 
 void cMoveGrid::Archive(Archiver& arc)
 {
+    int i;
+
     arc.ArchiveInteger(&m_iXRes);
     arc.ArchiveInteger(&m_iYRes);
     arc.ArchiveInteger(&m_iZRes);
-    arc.ArchiveRaw(&v, sizeof(vmove_t));
+
+    arc.ArchiveFloat(&v.frametime);
+    arc.ArchiveFloat(&v.desired_speed);
+    arc.ArchiveInteger(&v.tracemask);
+    arc.ArchiveInteger(&v.numtouch);
+
+    for (i = 0; i < ARRAY_LEN(v.touchents); i++) {
+        arc.ArchiveInteger(&v.touchents[i]);
+    }
+    arc.ArchiveVec3(v.mins);
+    arc.ArchiveVec3(v.maxs);
+
     arc.ArchiveVec3(orientation[0]);
     arc.ArchiveVec3(orientation[1]);
     arc.ArchiveVec3(orientation[2]);
diff --git a/code/fgame/movegrid.h b/code/fgame/movegrid.h
index 4740aaab..6847d1b2 100644
--- a/code/fgame/movegrid.h
+++ b/code/fgame/movegrid.h
@@ -39,7 +39,7 @@ typedef struct vehicleState_s {
     int      entityNum;
     vec2_t   desired_dir;
     qboolean hit_obstacle;
-    float    hit_origin[3];
+    vec3_t   hit_origin;
     vec3_t   obstacle_normal;
     qboolean useGravity;
 } vehicleState_t;
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 1435777c..c43619c9 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1219,6 +1219,9 @@ inline void Player::Archive(Archiver& arc)
     for (int i = 0; i < MAX_SPEED_MULTIPLIERS; i++) {
         arc.ArchiveFloat(&speed_multiplier[i]);
     }
+
+    arc.ArchiveInteger(&client->ps.iViewModelAnim);
+    arc.ArchiveInteger(&client->ps.iViewModelAnimChanged);
 }
 
 inline Camera *Player::CurrentCamera(void)
diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 50a9868c..00f79357 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -6782,7 +6782,19 @@ void Vehicle::Archive(Archiver& arc)
     arc.ArchiveBoolean(&m_bRemoveOnDeath);
     arc.ArchiveBoolean(&m_bStopEnabled);
     arc.ArchiveBoolean(&m_bEnableSkidding);
-    arc.ArchiveRaw(&vs, sizeof(vehicleState_t));
+
+    arc.ArchiveVec3(vs.origin);
+    arc.ArchiveVec3(vs.velocity);
+    arc.ArchiveInteger(&vs.groundEntityNum);
+    arc.ArchiveBoolean(&vs.walking);
+    arc.ArchiveBoolean(&vs.groundPlane);
+    G_ArchiveTrace(arc, &vs.groundTrace);
+    arc.ArchiveInteger(&vs.entityNum);
+    arc.ArchiveVec2(vs.desired_dir);
+    arc.ArchiveBoolean(&vs.hit_obstacle);
+    arc.ArchiveVec3(vs.hit_origin);
+    arc.ArchiveVec3(vs.obstacle_normal);
+    arc.ArchiveBoolean(&vs.useGravity);
 
     if (!arc.Saving()) {
         m_sMoveGrid = new cMoveGrid(3, 3, 1);

From 2cf380c15d2bc3b670b93fb24454354ae15d13e7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:12:50 +0100
Subject: [PATCH 1427/2040] Add scale field for skel header

---
 code/tiki/tiki_shared.h |  1 +
 code/tiki/tiki_skel.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index 39f8df0b..ca9126db 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -267,6 +267,7 @@ typedef struct skelHeaderGame_s {
     struct lodControl_s *pLOD;
     int                  numMorphTargets;
     char                *pMorphTargets;
+    float                scale;
 } skelHeaderGame_t;
 
 typedef struct boneData_s {
diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 6fb825e9..babcab57 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -236,6 +236,16 @@ void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
     byte *ptr           = start_ptr + sizeof(skelHeaderGame_t);
 
     pSkel->version     = pHeader->version;
+
+    //
+    // Added in 2.0
+    //
+    if (pHeader->version >= TIKI_SKD_HEADER_VERSION) {
+        pSkel->scale = pHeader->scale * 0.52;
+    } else {
+        pSkel->scale = 0.52;
+    }
+
     pSkel->numSurfaces = pHeader->numSurfaces;
     pSkel->numBones    = pHeader->numBones;
     pSkel->pSurfaces   = (skelSurfaceGame_t *)ptr;

From 54b9a0c340c5e62a12ab251f6325f0d751403fe8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:28:42 +0100
Subject: [PATCH 1428/2040] Fix incorrect SKB offsets

---
 code/tiki/tiki_skel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index babcab57..c7fe9ed7 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -673,16 +673,16 @@ qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
         if (newSurf->ofsCollapseIndex > LongNoSwapPtr(&newSurf->ofsVerts)) {
             int newOffset =
                 LongNoSwapPtr(&newSurf->ofsCollapseIndex) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
-            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsCollapseIndex));
+            memcpy(&newSurf->ofsCollapseIndex, &newOffset, sizeof(newSurf->ofsCollapseIndex));
         }
         if (newSurf->ofsTriangles > LongNoSwapPtr(&newSurf->ofsVerts)) {
             int newOffset =
                 LongNoSwapPtr(&newSurf->ofsTriangles) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
-            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsTriangles));
+            memcpy(&newSurf->ofsTriangles, &newOffset, sizeof(newSurf->ofsTriangles));
         }
         if (newSurf->ofsEnd > LongNoSwapPtr(&newSurf->ofsVerts)) {
             int newOffset = LongNoSwapPtr(&newSurf->ofsEnd) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
-            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsEnd));
+            memcpy(&newSurf->ofsEnd, &newOffset, sizeof(newSurf->ofsEnd));
         }
 
         oldVerts = (skelVertex_t *)((byte *)oldSurf + oldSurf->ofsVerts);

From 9d83d58756a99d43be059de1bf06a432823ef812 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:28:56 +0100
Subject: [PATCH 1429/2040] Create path only if the target is a SplinePath

---
 code/fgame/bspline.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/bspline.cpp b/code/fgame/bspline.cpp
index 6a40bd44..aec823a8 100644
--- a/code/fgame/bspline.cpp
+++ b/code/fgame/bspline.cpp
@@ -604,9 +604,11 @@ void SplinePath::CreatePath(Event *ev)
     target = Target();
     if (target[0]) {
         ent = (Entity *)G_FindTarget(NULL, target);
-        if (ent) {
+        if (ent && ent->IsSubclassOfSplinePath()) {
             next        = (SplinePath *)ent;
             next->owner = this;
+        } else if (ent) {
+            ScriptError("SplinePath::CreatePath: target '%s' for '%s' not found (cannot connect to class '%s')\n", target, targetname.c_str(), ent->getClassname());
         } else {
             ScriptError("SplinePath::CreatePath: target %s not found\n", target);
         }

From 894e1d7d66eaf70ab6042aede2cb9a318d4edbf2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:37:29 +0100
Subject: [PATCH 1430/2040] Properly cleanup the existing owner from targets

---
 code/fgame/bspline.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/fgame/bspline.cpp b/code/fgame/bspline.cpp
index aec823a8..11e41355 100644
--- a/code/fgame/bspline.cpp
+++ b/code/fgame/bspline.cpp
@@ -605,7 +605,14 @@ void SplinePath::CreatePath(Event *ev)
     if (target[0]) {
         ent = (Entity *)G_FindTarget(NULL, target);
         if (ent && ent->IsSubclassOfSplinePath()) {
-            next        = (SplinePath *)ent;
+            next = (SplinePath *)ent;
+
+            if (next->owner != next) {
+                // Fixed in OPM
+                //  If the target already has an owner, make sure to properly remove the owner
+                next->owner->SetNext(NULL);
+            }
+
             next->owner = this;
         } else if (ent) {
             ScriptError("SplinePath::CreatePath: target '%s' for '%s' not found (cannot connect to class '%s')\n", target, targetname.c_str(), ent->getClassname());

From 81b49236a5da2d6f300a752defa8660d758bf914 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 19:00:36 +0100
Subject: [PATCH 1431/2040] Use proper types for playerState_t structure

---
 code/qcommon/msg.cpp    | 26 +++++++++++++-------------
 code/qcommon/q_shared.h | 35 +++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 2c39f67a..2da9f8c6 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -3398,13 +3398,13 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 		}
 	}
 	activeitemsbits = 0;
-	for (i=0 ; i<MAX_ACTIVEITEMS ; i++) {
+	for (i=0 ; i<MAX_ACTIVE_ITEMS ; i++) {
 		if (to->activeItems[i] != from->activeItems[i]) {
 			activeitemsbits |= 1<<i;
 		}
 	}
 	ammo_amountbits = 0;
-	for (i=0 ; i<MAX_AMMO_AMOUNT ; i++) {
+	for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 		if (to->ammo_amount[i] != from->ammo_amount[i]) {
 			ammo_amountbits |= 1<<i;
 		}
@@ -3416,7 +3416,7 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 		}
 	}
 	max_ammo_amountbits = 0;
-	for (i=0 ; i<MAX_MAX_AMMO_AMOUNT ; i++) {
+	for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 		if (to->max_ammo_amount[i] != from->max_ammo_amount[i]) {
 			max_ammo_amountbits |= 1<<i;
 		}
@@ -3443,8 +3443,8 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 	if ( activeitemsbits ) {
 		MSG_WriteBits( msg, 1, 1 );	// changed
-		MSG_WriteBits( msg, activeitemsbits, MAX_ACTIVEITEMS );
-		for (i=0 ; i<MAX_ACTIVEITEMS ; i++)
+		MSG_WriteBits( msg, activeitemsbits, MAX_ACTIVE_ITEMS );
+		for (i=0 ; i<MAX_ACTIVE_ITEMS ; i++)
 			if (activeitemsbits & (1<<i) )
 				MSG_WriteShort (msg, to->activeItems[i]);
 	} else {
@@ -3453,8 +3453,8 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 	if ( ammo_amountbits ) {
 		MSG_WriteBits( msg, 1, 1 );	// changed
-		MSG_WriteBits( msg, ammo_amountbits, MAX_AMMO_AMOUNT );
-		for (i=0 ; i<MAX_AMMO_AMOUNT ; i++)
+		MSG_WriteBits( msg, ammo_amountbits, MAX_AMMOCOUNT );
+		for (i=0 ; i<MAX_AMMOCOUNT ; i++)
 			if (ammo_amountbits & (1<<i) )
 				MSG_WriteShort (msg, to->ammo_amount[i]);
 	} else {
@@ -3475,8 +3475,8 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 	if ( max_ammo_amountbits ) {
 		MSG_WriteBits( msg, 1, 1 );	// changed
-		MSG_WriteBits( msg, max_ammo_amountbits, MAX_MAX_AMMO_AMOUNT );
-		for (i=0 ; i<MAX_MAX_AMMO_AMOUNT ; i++)
+		MSG_WriteBits( msg, max_ammo_amountbits, MAX_AMMOCOUNT );
+		for (i=0 ; i<MAX_AMMOCOUNT ; i++)
 			if (max_ammo_amountbits & (1<<i) )
 				MSG_WriteShort( msg, to->max_ammo_amount[i] );
 	} else {
@@ -3585,7 +3585,7 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 		if ( MSG_ReadBits( msg, 1 ) ) {
 			LOG("PS_ITEMS");
 			bits = MSG_ReadByte(msg);
-			for (i=0 ; i<MAX_ACTIVEITEMS ; i++) {
+			for (i=0 ; i<MAX_ACTIVE_ITEMS ; i++) {
 				if (bits & (1<<i) ) {
 					to->activeItems[i] = MSG_ReadShort(msg);
 				}
@@ -3596,7 +3596,7 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 		if ( MSG_ReadBits( msg, 1 ) ) {
 			LOG("PS_AMMO_AMOUNT");
 			bits = MSG_ReadShort(msg);
-			for (i=0 ; i<MAX_AMMO_AMOUNT ; i++) {
+			for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 				if (bits & (1<<i) ) {
 					to->ammo_amount[i] = MSG_ReadShort(msg);
 				}
@@ -3616,9 +3616,9 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 
 		// parse powerups
 		if ( MSG_ReadBits( msg, 1 ) ) {
-			LOG("PS_MAX_AMMO_AMOUNT");
+			LOG("PS_MAX_AMMOCOUNT");
 			bits = MSG_ReadShort(msg);
-			for (i=0 ; i<MAX_MAX_AMMO_AMOUNT ; i++) {
+			for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 				if (bits & (1<<i) ) {
 					to->max_ammo_amount[i] = MSG_ReadShort(msg);
 				}
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 90db5cbb..b115a978 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1712,10 +1712,9 @@ typedef struct usereyes_s {
 
 // bit field limits
 #define	MAX_STATS				32
-#define	MAX_ACTIVEITEMS			8
+#define	MAX_ACTIVE_ITEMS		8
 #define	MAX_AMMO				16
-#define	MAX_AMMO_AMOUNT			16
-#define MAX_MAX_AMMO_AMOUNT		16
+#define	MAX_AMMOCOUNT			16
 
 #define	MAX_PERSISTANT			16
 #define	MAX_POWERUPS			16
@@ -1769,27 +1768,31 @@ typedef struct playerState_s {
 	int			iViewModelAnim;
 	int			iViewModelAnimChanged;
 
-	int			stats[ MAX_STATS ];
-	int			activeItems[ 8 ];
-	int			ammo_name_index[ 16 ];
-	int			ammo_amount[ 16 ];
-	int			max_ammo_amount[ 16 ];
+	int			stats[MAX_STATS];
+	int			activeItems[MAX_ACTIVE_ITEMS];
+	int			ammo_name_index[MAX_AMMO];
+	int			ammo_amount[MAX_AMMOCOUNT];
+	int			max_ammo_amount[MAX_AMMOCOUNT];
 
 	int			current_music_mood;
 	int			fallback_music_mood;
 	float		music_volume;
 	float		music_volume_fade_time;
+
 	int			reverb_type;
 	float		reverb_level;
-	float		blend[4];
-	float		fov;
-	float		camera_origin[3];
-	float		camera_angles[3];
+
+	float		blend[4];			// rgba full screen effect
+	float		fov;				// fov of the player
+
+    vec3_t		camera_origin;	// origin for camera view
+    vec3_t		camera_angles;	// angles for camera view
 	float		camera_time;
-	float		camera_offset[3];
-	float		camera_posofs[3];
-	int			camera_flags;
-	float		damage_angles[3];
+
+	vec3_t		camera_offset;	// angular offset for camera
+	vec3_t		camera_posofs;
+	int			camera_flags;	// third-person camera flags
+	vec3_t		damage_angles;	// these angles are added directly to the view, without lerping
 	// --
 	// Team Assault
 	int			radarInfo;

From dd37ba2741e7ae5014cc06ab32bb205de068d95d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 19:06:05 +0100
Subject: [PATCH 1432/2040] Properly archive clients

---
 code/fgame/g_utils.cpp | 84 +++++++++++++++++++++++++++++++++++++++++-
 code/fgame/g_utils.h   |  1 +
 code/fgame/player.h    |  3 --
 3 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index fe130f8d..a2c61338 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1143,6 +1143,82 @@ Vector G_PredictPosition(Vector start, Vector target, Vector targetvelocity, flo
     return projected;
 }
 
+/*
+==============
+G_ArchiveTrace
+==============
+*/
+void G_ArchivePlayerState(Archiver& arc, playerState_t *ps)
+{
+    int i;
+
+    // Movement
+    arc.ArchiveInteger(&ps->commandTime);
+    arc.ArchiveInteger(&ps->pm_type);
+    arc.ArchiveInteger(&ps->pm_flags);
+    arc.ArchiveInteger(&ps->pm_time);
+    arc.ArchiveVec3(ps->origin);
+    arc.ArchiveVec3(ps->velocity);
+    arc.ArchiveInteger(&ps->gravity);
+    arc.ArchiveInteger(&ps->speed);
+    arc.ArchiveInteger(&ps->delta_angles[0]);
+    arc.ArchiveInteger(&ps->delta_angles[1]);
+    arc.ArchiveInteger(&ps->delta_angles[2]);
+
+    // Trace
+    arc.ArchiveInteger(&ps->groundEntityNum);
+    arc.ArchiveBoolean(&ps->walking);
+    arc.ArchiveBoolean(&ps->groundPlane);
+    arc.ArchiveInteger(&ps->feetfalling);
+    arc.ArchiveVec3(ps->falldir);
+    G_ArchiveTrace(arc, &ps->groundTrace);
+    arc.ArchiveVec3(ps->viewangles);
+    arc.ArchiveInteger(&ps->viewheight);
+
+    // View
+    arc.ArchiveFloat(&ps->fLeanAngle);
+    arc.ArchiveInteger(&ps->iViewModelAnim);
+    arc.ArchiveInteger(&ps->iViewModelAnimChanged);
+
+    // Stats
+    for (i = 0; i < ARRAY_LEN(ps->stats); i++) {
+        arc.ArchiveInteger(&ps->stats[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->activeItems); i++) {
+        arc.ArchiveInteger(&ps->activeItems[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->ammo_name_index); i++) {
+        arc.ArchiveInteger(&ps->ammo_name_index[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->ammo_amount); i++) {
+        arc.ArchiveInteger(&ps->ammo_amount[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->max_ammo_amount); i++) {
+        arc.ArchiveInteger(&ps->max_ammo_amount[i]);
+    }
+
+    // Music
+    arc.ArchiveInteger(&ps->current_music_mood);
+    arc.ArchiveInteger(&ps->fallback_music_mood);
+    arc.ArchiveFloat(&ps->music_volume);
+    arc.ArchiveFloat(&ps->music_volume_fade_time);
+    arc.ArchiveInteger(&ps->reverb_type);
+    arc.ArchiveFloat(&ps->reverb_level);
+
+    // View
+    arc.ArchiveVec4(ps->blend);
+    arc.ArchiveFloat(&ps->fov);
+
+    // Camera
+    arc.ArchiveVec3(ps->camera_origin);
+    arc.ArchiveFloat(&ps->camera_time);
+    arc.ArchiveVec3(ps->camera_angles);
+    arc.ArchiveVec3(ps->camera_offset);
+    arc.ArchiveVec3(ps->camera_posofs);
+    arc.ArchiveInteger(&ps->camera_flags);
+    arc.ArchiveVec3(ps->damage_angles);
+}
+
 /*
 ==============
 G_ArchiveTrace
@@ -1170,8 +1246,9 @@ void G_ArchiveTrace(Archiver& arc, trace_t *trace)
 G_ArchiveClient
 ==============
 */
-void G_ArchiveClient(Archiver& arc, gclient_t* client)
+void G_ArchiveClient(Archiver& arc, gclient_t *client)
 {
+    G_ArchivePlayerState(arc, &client->ps);
     arc.ArchiveVec3(client->cmd_angles);
     arc.ArchiveInteger(&client->lastActiveTime);
     arc.ArchiveInteger(&client->activeWarning);
@@ -1194,7 +1271,10 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
     //
 
     if (edict->client) {
-        G_ArchiveClient(arc, edict->client);
+        // Removed in OPM
+        //  Commented out because clients are already archived
+        //  by Game::Archive()
+        //G_ArchiveClient(arc, edict->client);
     }
 
     arc.ArchiveInteger(&edict->s.beam_entnum);
diff --git a/code/fgame/g_utils.h b/code/fgame/g_utils.h
index ebc73138..649713a6 100644
--- a/code/fgame/g_utils.h
+++ b/code/fgame/g_utils.h
@@ -30,6 +30,7 @@ class SimpleEntity;
 class SimpleArchivedEntity;
 class ScriptThread;
 
+void G_ArchivePlayerState(Archiver& arc, playerState_t* ps);
 void G_ArchiveTrace(Archiver& arc, trace_t* trace);
 void G_ArchiveClient(Archiver& arc, gclient_t* client);
 void G_ArchiveEdict(Archiver& arc, gentity_t *edict);
diff --git a/code/fgame/player.h b/code/fgame/player.h
index c43619c9..1435777c 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1219,9 +1219,6 @@ inline void Player::Archive(Archiver& arc)
     for (int i = 0; i < MAX_SPEED_MULTIPLIERS; i++) {
         arc.ArchiveFloat(&speed_multiplier[i]);
     }
-
-    arc.ArchiveInteger(&client->ps.iViewModelAnim);
-    arc.ArchiveInteger(&client->ps.iViewModelAnimChanged);
 }
 
 inline Camera *Player::CurrentCamera(void)

From ccca958ec53c396a756d4364dcf85fdfdda1f103 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 19:48:49 +0100
Subject: [PATCH 1433/2040] Get the grid1 on each iteration in case it has been
 reallocated

This fixes a very rare crash that would occur when loading a world map
---
 code/renderer/tr_bsp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 3c65b8e0..f450e8e4 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -1517,6 +1517,9 @@ int R_TryStitchingPatch( int grid1num ) {
         {
             numstitches++;
         }
+
+        // the grid1 could be reallocated again
+        grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
     }
     return numstitches;
 }

From 50fdbaf152b9a52ebcec38a7092d0890f2d9ae56 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 20:36:03 +0100
Subject: [PATCH 1434/2040] Use CVAR_RESETSTRING instead of CVAR_SERVER_CREATED

---
 code/cgame/cg_nature.cpp | 2 +-
 code/client/cl_ui.cpp    | 2 +-
 code/qcommon/q_shared.h  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_nature.cpp b/code/cgame/cg_nature.cpp
index 44f5e500..c7a623c8 100644
--- a/code/cgame/cg_nature.cpp
+++ b/code/cgame/cg_nature.cpp
@@ -60,7 +60,7 @@ void ClientGameCommandManager::InitializeRainCvars()
 
     cg_rain = cgi.Cvar_Get("cg_rain", "1", CVAR_ARCHIVE);
     cg_rain_drawcoverage =
-        cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_SERVER_CREATED | CVAR_SYSTEMINFO);
+        cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_RESETSTRING | CVAR_SYSTEMINFO);
 
     cg.rain.density    = 0.0;
     cg.rain.speed      = 2048.0f;
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index ba6bb837..256b4dd7 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1467,7 +1467,7 @@ void UI_FocusMenuIfExists(void)
         currentMenu->ActivateMenu();
 
         if (ui_newvidmode->integer == -1) {
-            Cvar_Get("ui_newvidmode", va("%d", r_mode), CVAR_SERVER_CREATED);
+            Cvar_Get("ui_newvidmode", va("%d", r_mode), CVAR_RESETSTRING);
             Cvar_SetValue("ui_newvidmode", r_mode);
         }
     } else {
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index b115a978..fc48d757 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1317,6 +1317,7 @@ default values.
 
 #define CVAR_VM_CREATED		0x8000	// cvar was created exclusively in one of the VMs.
 #define CVAR_PROTECTED		0x10000	// prevent modifying this var from VMs or the server
+#define CVAR_RESETSTRING	0x20000	// force the cvar's reset string to be set
 // These flags are only returned by the Cvar_Flags() function
 #define CVAR_MODIFIED		0x40000000	// Cvar was modified
 #define CVAR_NONEXISTENT	0x80000000	// Cvar doesn't exist.

From 9e060d11b681a1a6264502e5ee91ef8c53e2f2f7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 20:41:54 +0100
Subject: [PATCH 1435/2040] Allow user-created variables

---
 code/cgame/cg_public.h     |  1 +
 code/cgame/cg_servercmds.c | 41 +++++++++++++++++++++++++++++++++++++-
 code/client/cl_cgame.cpp   |  1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index 5257a165..d9bc097e 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -120,6 +120,7 @@ functions exported to the main executable
 
         // console variable interaction
         cvar_t *(*Cvar_Get)(const char *var_name, const char *value, int flags);
+        cvar_t *(*Cvar_Find)(const char *var_name);
         void (*Cvar_Set)(const char *var_name, const char *value);
 
         // ClientCommand and ConsoleCommand parameter access
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index d7e9d21a..bc978af1 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -514,6 +514,7 @@ Returns whether or not the variable should be filtered
 */
 static qboolean CG_IsVariableFiltered(const char *name)
 {
+    cvar_t *var;
     size_t i;
 
     for (i = 0; i < ARRAY_LEN(whiteListedVariables); i++) {
@@ -530,6 +531,42 @@ static qboolean CG_IsVariableFiltered(const char *name)
         }
     }
 
+    // Filtered
+    return qtrue;
+}
+
+/*
+====================
+CG_IsSetVariableFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsSetVariableFiltered(const char *name, char type)
+{
+    cvar_t *var;
+
+    if (!CG_IsVariableFiltered(name)) {
+        return qfalse;
+    }
+
+    if (type != 'u' && type != 's') {
+        // Don't allow custom info variables to avoid flooding
+        // the client with many serverinfo and userinfo variables
+
+        var = cgi.Cvar_Find(name);
+        if (!var) {
+            // Allow as it doesn't exist
+            return qfalse;
+        }
+
+        if (var->flags & CVAR_USER_CREATED) {
+            // Allow, it's user-created, wouldn't cause issues
+            return qfalse;
+        }
+    }
+
+    // Filtered
     return qtrue;
 }
 
@@ -609,6 +646,8 @@ static qboolean CG_IsStatementFiltered(char *cmd)
 
         if (!Q_stricmp(com_token, "set") || !Q_stricmp(com_token, "setu") || !Q_stricmp(com_token, "seta")
             || !Q_stricmp(com_token, "sets")) {
+            char type = com_token[3];
+
             //
             // variable
             //
@@ -618,7 +657,7 @@ static qboolean CG_IsStatementFiltered(char *cmd)
                 continue;
             }
 
-            if (CG_IsVariableFiltered(com_token)) {
+            if (CG_IsSetVariableFiltered(com_token, type)) {
                 return qtrue;
             }
         } else {
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 7c00aa89..9d68d1d0 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -627,6 +627,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->LV_ConvertString				= Sys_LV_CL_ConvertString;
 
 	cgi->Cvar_Get						= Cvar_Get;
+	cgi->Cvar_Find						= Cvar_FindVar;
 	cgi->Cvar_Set						= Cvar_Set;
 
 	cgi->Argc							= Cmd_Argc;

From c9ccb0efafc198e2ad639cf4d94bb175bdc91bb7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:48:19 +0100
Subject: [PATCH 1436/2040] Check for Sentient instead of Player

---
 code/fgame/g_phys.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 80c4fe96..af8de523 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -86,7 +86,7 @@ Entity *G_FixEntityPosition
 
 	start = ent->origin;
 	start.z += radius;
-	if( ent->IsSubclassOfPlayer() )
+	if( ent->IsSubclassOfSentient() )
 	{
 		trace = G_Trace( start, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_FixEntityPosition1" );
 	}

From 763a79cb74b3ffd8cf0ca490a927a9cf9b906b61 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:48:39 +0100
Subject: [PATCH 1437/2040] Fix angle when in turret

---
 code/fgame/bg_pmove.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/fgame/bg_pmove.cpp b/code/fgame/bg_pmove.cpp
index 69e4f1a7..79682f7f 100644
--- a/code/fgame/bg_pmove.cpp
+++ b/code/fgame/bg_pmove.cpp
@@ -1598,9 +1598,6 @@ void PmoveAdjustAngleSettings(vec_t *vViewAngles, vec_t *vAngles, playerState_t
 
         EulerToQuat(headAngles, pEntState->bone_quat[HEAD_TAG]);
     } else {
-        fTmp = AngleMod(vViewAngles[1]);
-        VectorSet(vAngles, 0, fTmp, 0);
-
         if (pPlayerState->pm_flags & PMF_TURRET) {
             vAngles[2] = 0;
             // Added in 2.0
@@ -1632,8 +1629,8 @@ void PmoveAdjustAngleSettings(vec_t *vViewAngles, vec_t *vAngles, playerState_t
                 headAngles[1] = -90;
             }
 
-            VectorSet(pEntState->bone_angles[HEAD_TAG], 0, 0, 0);
-            EulerToQuat(headAngles, pEntState->bone_quat[HEAD_TAG]);
+            VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
+            EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
             return;
         }
 

From 851a16e18cb526e1f11c00e1af08f68ba50b4003 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 00:09:29 +0100
Subject: [PATCH 1438/2040] Fix the bullet tracer scale

---
 code/cgame/cg_parsemsg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index ae53d912..614698ac 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -427,7 +427,7 @@ static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd, in
         0,
         1,
         1.0,
-        1.0,
+        scale,
         BEAM_INVERTED,
         1000.0,
         iLife,

From 1ad5964c2fc70f0ec7dbca61918d4d681c7a9a20 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:21:12 +0100
Subject: [PATCH 1439/2040] Implement stoploopsound from moh 2.0 and above

---
 code/cgame/cg_commands.cpp | 27 +++++++++++++++++++++++++++
 code/cgame/cg_commands.h   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 5889b026..1331d7df 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -566,6 +566,15 @@ Event EV_Client_LoopSound
     "soundName volume min_distance pitch",
     "Play the specified sound as a looping sound"
 );
+// Added in 2.0
+Event EV_Client_StopLoopSound
+(
+    "stoploopsound",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop the looping sound"
+);
 Event EV_Client_Cache
 (
     "cache",
@@ -1269,6 +1278,7 @@ CLASS_DECLARATION(Listener, ClientGameCommandManager, NULL) {
     {&EV_Client_StopSound,                  &ClientGameCommandManager::StopSound                 },
     {&EV_Client_StopAliasChannel,           &ClientGameCommandManager::StopAliasChannel          },
     {&EV_Client_LoopSound,                  &ClientGameCommandManager::LoopSound                 },
+    {&EV_Client_StopLoopSound,              &ClientGameCommandManager::StopLoopSound             },
     {&EV_Client_Cache,                      &ClientGameCommandManager::Cache                     },
     {&EV_Client_CacheImage,                 &ClientGameCommandManager::CacheImage                },
     {&EV_Client_CacheFont,                  &ClientGameCommandManager::CacheFont                 },
@@ -4010,6 +4020,9 @@ void ClientGameCommandManager::StopSound(Event *ev)
     cgi.S_StopSound(current_entity_number, channel);
 }
 
+//===============
+// StopAliasChannel
+//===============
 void ClientGameCommandManager::StopAliasChannel(Event *ev)
 {
     str              sound_name;
@@ -4105,6 +4118,20 @@ void ClientGameCommandManager::LoopSound(Event *ev)
     current_centity->tikiLoopSoundFlags   = 0;
 }
 
+//===============
+// StopLoopSound
+//===============
+void ClientGameCommandManager::StopLoopSound(Event* ev)
+{
+    if (!current_centity) {
+        cgi.DPrintf("CCM::StopLoopSound : StopLoopSound in %s without current_centity\n", cgi.TIKI_Name(current_tiki));
+        return;
+    }
+
+    Com_Printf("\n\nClientGameCommandManager::StopLoopSound\n\n");
+    current_centity->tikiLoopSound = NULL;
+}
+
 //===============
 // CacheImageResource
 //===============
diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h
index 27565d81..a0f1f3d0 100644
--- a/code/cgame/cg_commands.h
+++ b/code/cgame/cg_commands.h
@@ -851,6 +851,7 @@ private:
     void          StopSound(Event *ev);
     void          StopAliasChannel(Event *ev);
     void          LoopSound(Event *ev);
+    void          StopLoopSound(Event *ev); // Added in 2.0
     void          Cache(Event *ev);
     void          CacheImage(Event *ev);
     void          CacheFont(Event *ev);

From fe862badf65fdfd9d5a0ef79b47cde83aeaef219 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:37:17 +0100
Subject: [PATCH 1440/2040] Add printdeathmsg from moh 2.0 and above

---
 code/cgame/cg_commands.cpp | 17 +++++++++++++++++
 code/cgame/cg_commands.h   |  1 +
 2 files changed, 18 insertions(+)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 1331d7df..170f9f88 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -1094,6 +1094,15 @@ Event EV_Client_Print
     "string",
     "Prints a string."
 );
+// Added in 2.0
+Event EV_Client_PrintDeathMsg
+(
+    "printdeathmsg",
+    EV_DEFAULT,
+    "sssss",
+    "msg1, msg2, killer, victim, deathType",
+    "Prints a death message string.  Used to allow death messages to appear in their correct language on client machines.."
+);
 Event EV_Client_SetVolumetric
 (
     "volumetric",
@@ -1341,6 +1350,7 @@ CLASS_DECLARATION(Listener, ClientGameCommandManager, NULL) {
     {&EV_Client_SetClampVelocity,           &ClientGameCommandManager::SetClampVel               },
     {&EV_Client_SetClampVelocityAxis,       &ClientGameCommandManager::SetClampVelAxis           },
     {&EV_Client_Print,                      &ClientGameCommandManager::Print                     },
+    {&EV_Client_PrintDeathMsg,              &ClientGameCommandManager::PrintDeathMsg             },
     {&EV_Client_EyeLimits,                  &ClientGameCommandManager::SetEyeLimits              },
     {&EV_Client_EyeMovement,                &ClientGameCommandManager::SetEyeMovement            },
     {&EV_Client_SFXStart,                   &ClientGameCommandManager::StartSFX                  },
@@ -1493,6 +1503,13 @@ void ClientGameCommandManager::Print(Event *ev)
     }
 }
 
+void ClientGameCommandManager::PrintDeathMsg(Event* ev)
+{
+    if (current_entity) {
+        cgi.DPrintf("%d:%s\n", current_entity->entityNumber, ev->GetString(1).c_str());
+    }
+}
+
 qboolean ClientGameCommandManager::IsBlockCommand(const str& name)
 {
     if (!str::icmp(name, "originspawn")) {
diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h
index a0f1f3d0..60e39dec 100644
--- a/code/cgame/cg_commands.h
+++ b/code/cgame/cg_commands.h
@@ -764,6 +764,7 @@ private:
     void          SpawnVSSSource(int count, int timealive);
     void          EventViewKick(Event *ev);
     void          Print(Event *ev);
+    void          PrintDeathMsg(Event *ev); // Added in 2.0
     void          StartBlock(Event *ev);
     void          EndBlock(Event *ev);
     void          UpdateSpawnThing(spawnthing_t *ep);

From 132903a843ac0f5ff64909e522da8f0b92bfcb86 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 20:56:02 +0100
Subject: [PATCH 1441/2040] Use different fields for protocol version 6 and 8

---
 code/qcommon/msg.cpp | 169 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 166 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 2da9f8c6..f711bbb1 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -1479,6 +1479,9 @@ netField_t	entityStateFields_ver_15[] =
 };
 static constexpr unsigned long numEntityStateFields_ver_15 = sizeof(entityStateFields_ver_15) / sizeof(entityStateFields_ver_15[0]);
 
+//
+// Protocol version 6
+//
 netField_t	entityStateFields_ver_6[] = 
 {
 { NETF(netorigin[0]), 0, netFieldType_t::coord },
@@ -1535,6 +1538,160 @@ netField_t	entityStateFields_ver_6[] =
 { NETF(bone_angles[0][1]), -13, netFieldType_t::angle },
 { NETF(surfaces[4]), 8, netFieldType_t::regular },
 { NETF(surfaces[5]), 8, netFieldType_t::regular },
+{ NETF(loopSound), 16, netFieldType_t::regular },
+{ NETF(loopSoundVolume), 0, netFieldType_t::regular },
+{ NETF(loopSoundMinDist), 0, netFieldType_t::regular },
+{ NETF(loopSoundMaxDist), 0, netFieldType_t::regular },
+{ NETF(loopSoundPitch), 0, netFieldType_t::regular },
+{ NETF(loopSoundFlags), 8, netFieldType_t::regular },
+{ NETF(attach_offset[0]), 0, netFieldType_t::regular },
+{ NETF(attach_offset[1]), 0, netFieldType_t::regular },
+{ NETF(attach_offset[2]), 0, netFieldType_t::regular },
+{ NETF(beam_entnum), 16, netFieldType_t::regular },
+{ NETF(skinNum), 16, netFieldType_t::regular },
+{ NETF(wasframe), 10, netFieldType_t::regular },
+{ NETF(frameInfo[4].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[5].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[6].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[7].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[8].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[9].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[10].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[11].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[12].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[13].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[14].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[15].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[4].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[5].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[6].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[7].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[8].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[9].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[10].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[11].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[12].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[13].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[14].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[15].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[4].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[5].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[6].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[7].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[8].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[9].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[10].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[11].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[12].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[13].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[14].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[15].weight), 0, netFieldType_t::animWeight },
+{ NETF(bone_angles[1][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[2][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[3][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[4][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[4][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[4][2]), -13, netFieldType_t::angle },
+{ NETF(clientNum), 8, netFieldType_t::regular },
+{ NETF(groundEntityNum), GENTITYNUM_BITS, netFieldType_t::regular },
+{ NETF(shader_data[0]), 0, netFieldType_t::regular },
+{ NETF(shader_data[1]), 0, netFieldType_t::regular },
+{ NETF(shader_time), 0, netFieldType_t::regular },
+{ NETF(eyeVector[0]), 0, netFieldType_t::regular },
+{ NETF(eyeVector[1]), 0, netFieldType_t::regular },
+{ NETF(eyeVector[2]), 0, netFieldType_t::regular },
+{ NETF(surfaces[6]), 8, netFieldType_t::regular },
+{ NETF(surfaces[7]), 8, netFieldType_t::regular },
+{ NETF(surfaces[8]), 8, netFieldType_t::regular },
+{ NETF(surfaces[9]), 8, netFieldType_t::regular },
+{ NETF(surfaces[10]), 8, netFieldType_t::regular },
+{ NETF(surfaces[11]), 8, netFieldType_t::regular },
+{ NETF(surfaces[12]), 8, netFieldType_t::regular },
+{ NETF(surfaces[13]), 8, netFieldType_t::regular },
+{ NETF(surfaces[14]), 8, netFieldType_t::regular },
+{ NETF(surfaces[15]), 8, netFieldType_t::regular },
+{ NETF(surfaces[16]), 8, netFieldType_t::regular },
+{ NETF(surfaces[17]), 8, netFieldType_t::regular },
+{ NETF(surfaces[18]), 8, netFieldType_t::regular },
+{ NETF(surfaces[19]), 8, netFieldType_t::regular },
+{ NETF(surfaces[20]), 8, netFieldType_t::regular },
+{ NETF(surfaces[21]), 8, netFieldType_t::regular },
+{ NETF(surfaces[22]), 8, netFieldType_t::regular },
+{ NETF(surfaces[23]), 8, netFieldType_t::regular },
+{ NETF(surfaces[24]), 8, netFieldType_t::regular },
+{ NETF(surfaces[25]), 8, netFieldType_t::regular },
+{ NETF(surfaces[26]), 8, netFieldType_t::regular },
+{ NETF(surfaces[27]), 8, netFieldType_t::regular },
+{ NETF(surfaces[28]), 8, netFieldType_t::regular },
+{ NETF(surfaces[29]), 8, netFieldType_t::regular },
+{ NETF(surfaces[30]), 8, netFieldType_t::regular },
+{ NETF(surfaces[31]), 8, netFieldType_t::regular }
+};
+
+//
+// Protocol version 8
+// It adds the following fields:
+// - pos.trTime
+// - pos.trDelta[0]
+// - pos.trDelta[1]
+// - pos.trDelta[2]
+//
+netField_t	entityStateFields_ver_8[] = 
+{
+{ NETF(netorigin[0]), 0, netFieldType_t::coord },
+{ NETF(netorigin[1]), 0, netFieldType_t::coord },
+{ NETF(netangles[1]), 12, netFieldType_t::angle },
+{ NETF(frameInfo[0].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[1].time), 0, netFieldType_t::animTime },
+{ NETF(bone_angles[0][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[3][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[1][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[2][0]), -13, netFieldType_t::angle },
+{ NETF(netorigin[2]), 0, netFieldType_t::coord },
+{ NETF(frameInfo[0].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[1].weight), 0, netFieldType_t::animWeight},
+{ NETF(frameInfo[2].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[3].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[0].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[1].index), 12, netFieldType_t::regular },
+{ NETF(actionWeight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[2].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[3].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[2].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[3].index), 12, netFieldType_t::regular },
+{ NETF(eType), 8, netFieldType_t::regular },
+{ NETF(modelindex), 16, netFieldType_t::regular },
+{ NETF(parent), 16, netFieldType_t::regular },
+{ NETF(constantLight), 32, netFieldType_t::regular },
+{ NETF(renderfx), 32, netFieldType_t::regular },
+{ NETF(bone_tag[0]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[1]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[2]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[3]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[4]), -8, netFieldType_t::regular },
+{ NETF(scale), 0, netFieldType_t::scale },
+{ NETF(alpha), 0, netFieldType_t::alpha },
+{ NETF(usageIndex), 16, netFieldType_t::regular },
+{ NETF(eFlags), 16, netFieldType_t::regular },
+{ NETF(solid), 32, netFieldType_t::regular },
+{ NETF(netangles[2]), 12, netFieldType_t::angle },
+{ NETF(netangles[0]), 12, netFieldType_t::angle },
+{ NETF(tag_num), 10, netFieldType_t::regular },
+{ NETF(bone_angles[1][2]), -13, netFieldType_t::angle },
+{ NETF(attach_use_angles), 1, netFieldType_t::regular },
+{ NETF(origin2[1]), 0, netFieldType_t::coord },
+{ NETF(origin2[0]), 0, netFieldType_t::coord },
+{ NETF(origin2[2]), 0, netFieldType_t::coord },
+{ NETF(bone_angles[0][2]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[2][2]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[3][2]), -13, netFieldType_t::angle },
+{ NETF(surfaces[0]), 8, netFieldType_t::regular },
+{ NETF(surfaces[1]), 8, netFieldType_t::regular },
+{ NETF(surfaces[2]), 8, netFieldType_t::regular },
+{ NETF(surfaces[3]), 8, netFieldType_t::regular },
+{ NETF(bone_angles[0][1]), -13, netFieldType_t::angle },
+{ NETF(surfaces[4]), 8, netFieldType_t::regular },
+{ NETF(surfaces[5]), 8, netFieldType_t::regular },
 { NETF(pos.trTime), 32, netFieldType_t::regular },
 { NETF(pos.trDelta[0]), 0, netFieldType_t::velocity },
 { NETF(pos.trDelta[1]), 0, netFieldType_t::velocity },
@@ -1629,7 +1786,8 @@ netField_t	entityStateFields_ver_6[] =
 { NETF(surfaces[31]), 8, netFieldType_t::regular }
 };
 static constexpr unsigned long numEntityStateFields_ver_6 = sizeof(entityStateFields_ver_6) / sizeof(entityStateFields_ver_6[0]);
-static constexpr unsigned long numBiggestEntityStateFields = numEntityStateFields_ver_15 >= numEntityStateFields_ver_6 ? numEntityStateFields_ver_15 : numEntityStateFields_ver_6;
+static constexpr unsigned long numEntityStateFields_ver_8 = sizeof(entityStateFields_ver_8) / sizeof(entityStateFields_ver_8[0]);
+static constexpr unsigned long numBiggestEntityStateFields = numEntityStateFields_ver_15 >= numEntityStateFields_ver_8 ? numEntityStateFields_ver_15 : numEntityStateFields_ver_8;
 
 netField_t* MSG_GetEntityStateFields(size_t& outNumFields)
 {
@@ -1638,11 +1796,16 @@ netField_t* MSG_GetEntityStateFields(size_t& outNumFields)
         outNumFields = sizeof(entityStateFields_ver_15) / sizeof(entityStateFields_ver_15[0]);
         return entityStateFields_ver_15;
     }
-    else
+    else if (com_protocol->integer >= protocol_e::PROTOCOL_MOH)
+    {
+        outNumFields = sizeof(entityStateFields_ver_8) / sizeof(entityStateFields_ver_8[0]);
+        return entityStateFields_ver_8;
+    }
+	else
     {
         outNumFields = sizeof(entityStateFields_ver_6) / sizeof(entityStateFields_ver_6[0]);
         return entityStateFields_ver_6;
-    }
+	}
 }
 
 // if (int)f == f and (int)f + ( 1<<(FLOAT_INT_BITS-1) ) < ( 1 << FLOAT_INT_BITS )

From 02af9a763df674804a2ca9a0df79d77aba50d606 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 20:56:26 +0100
Subject: [PATCH 1442/2040] Better support for older BSP versions

---
 code/qcommon/cm_load.c | 34 +++++++++++++++++-----------------
 code/qcommon/qfiles.h  | 20 ++++++++++++++++----
 code/renderer/tr_bsp.c | 42 +++++++++++++++++++++---------------------
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index 932b5810..56b20b01 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -900,21 +900,21 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 
 	// load into heap
 	_R( 0 );
-	CM_LoadLump( h, &header.lumps[ LUMP_SHADERS ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_SHADERS ), &lump, 0);
 	_R( 1 );
 	CMod_LoadShaders( &lump, &shaderSubdivisions );
 	_R( 2 );
 	CM_FreeLump( &lump );
 	_R( 3 );
-	CM_LoadLump( h, &header.lumps[ LUMP_PLANES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_PLANES ), &lump, 0 );
 	_R( 4 );
 	CMod_LoadPlanes( &lump );
 	_R( 5 );
 	CM_FreeLump( &lump );
 	_R( 6 );
-	CM_LoadLump( h, &header.lumps[ LUMP_SURFACES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_SURFACES ), &lump, 0 );
 	_R( 7 );
-	CM_LoadLump( h, &header.lumps[ LUMP_DRAWVERTS ], &lump2, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_DRAWVERTS ), &lump2, 0 );
 	_R( 8 );
 	CMod_LoadPatches( &lump, &lump2, shaderSubdivisions );
 	_R( 9 );
@@ -922,21 +922,21 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 	_R( 10 );
 	CM_FreeLump( &lump );
 	_R( 11 );
-	cm.numLeafBrushes = CM_LoadLump( h, &header.lumps[ LUMP_LEAFBRUSHES ], &lump, sizeof( int ) );
+	cm.numLeafBrushes = CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_LEAFBRUSHES ), &lump, sizeof( int ) );
 	_R( 12 );
 	CMod_LoadLeafBrushes( &lump );
 	_R( 13 );
 	CM_FreeLump( &lump );
 	_R( 14 );
-	CM_LoadLump( h, &header.lumps[ LUMP_LEAFSURFACES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_LEAFSURFACES ), &lump, 0 );
 	_R( 15 );
 	CMod_LoadLeafSurfaces( &lump );
 	_R( 16 );
 	CM_FreeLump( &lump );
 	_R( 17 );
-	CM_LoadLump( h, &header.lumps[ LUMP_LEAFS ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_LEAFS ), &lump, 0 );
 	_R( 18 );
-	if( header.version > 18 ) {
+	if( header.version >= 18 ) {
 		CMod_LoadLeafs( &lump );
 	} else {
 		CMod_LoadLeafsOld( &lump );
@@ -944,55 +944,55 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 	_R( 19 );
 	CM_FreeLump( &lump );
 	_R( 20 );
-	CM_LoadLump( h, &header.lumps[ LUMP_NODES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_NODES ), &lump, 0 );
 	_R( 21 );
 	CMod_LoadNodes( &lump );
 	_R( 22 );
 	CM_FreeLump( &lump );
 	_R( 23 );
-	g_iNumSideEquations = CM_LoadLump( h, &header.lumps[ LUMP_SIDEEQUATIONS ], &lump, 32 );
+	g_iNumSideEquations = CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_SIDEEQUATIONS ), &lump, 32 );
 	_R( 24 );
 	CMod_LoadSideEquations( &lump );
 	_R( 25 );
 	CM_FreeLump( &lump );
 	_R( 26 );
-	CM_LoadLump( h, &header.lumps[ LUMP_BRUSHSIDES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_BRUSHSIDES ), &lump, 0 );
 	_R( 27 );
 	CMod_LoadBrushSides( &lump );
 	_R( 28 );
 	CM_FreeLump( &lump );
 	_R( 29 );
-	CM_LoadLump( h, &header.lumps[ LUMP_BRUSHES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_BRUSHES ), &lump, 0 );
 	_R( 30 );
 	CMod_LoadBrushes( &lump );
 	_R( 31 );
 	CM_FreeLump( &lump );
 	_R( 32 );
-	CM_LoadLump( h, &header.lumps[ LUMP_MODELS ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_MODELS ), &lump, 0 );
 	_R( 33 );
 	CMod_LoadSubmodels( &lump );
 	_R( 34 );
 	CM_FreeLump( &lump );
 	_R( 35 );
-	CM_LoadLump( h, &header.lumps[ LUMP_ENTITIES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_ENTITIES ), &lump, 0 );
 	_R( 36 );
 	CMod_LoadEntityString( &lump );
 	_R( 37 );
 	CM_FreeLump( &lump );
 	_R( 38 );
-	CM_LoadLump( h, &header.lumps[ LUMP_VISIBILITY ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_VISIBILITY ), &lump, 0 );
 	_R( 39 );
 	CMod_LoadVisibility( &lump );
 	_R( 40 );
 	CM_FreeLump( &lump );
 	_R( 41 );
-	CM_LoadLump( h, &header.lumps[ LUMP_TERRAIN ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_TERRAIN ), &lump, 0 );
 	_R( 42 );
 	CMod_LoadTerrain( &lump );
 	_R( 43 );
 	CM_FreeLump( &lump );
 	_R( 44 );
-	CM_LoadLump( h, &header.lumps[ LUMP_TERRAININDEXES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_TERRAININDEXES ), &lump, 0 );
 	_R( 45 );
 	CMod_LoadTerrainIndexes( &lump );
 	_R( 46 );
diff --git a/code/qcommon/qfiles.h b/code/qcommon/qfiles.h
index d43426d3..927cbc98 100644
--- a/code/qcommon/qfiles.h
+++ b/code/qcommon/qfiles.h
@@ -365,8 +365,8 @@ typedef struct {
 #define BSP_IDENT	(('5'<<24)+('1'<<16)+('0'<<8)+'2')
 		// little-endian "2015"
 
-#define BSP_BETA_VERSION	18	// Beta Allied Assault
-#define BSP_MIN_VERSION		18	// Beta Allied Assault
+#define BSP_BETA_VERSION	17	// Beta Allied Assault
+#define BSP_MIN_VERSION		17	// Beta Allied Assault
 #define BSP_VERSION			19	// Allied Assault
 #define BSP_MAX_VERSION		21	// Breakthrough
 
@@ -491,8 +491,8 @@ typedef struct {
 #define LUMP_BRUSHSIDES			11
 #define LUMP_BRUSHES			12
 /*
-// FOG seems to be handled differently in MOHAA - no fog lump found yet
-#define LUMP_FOGS				0
+#define LUMP_FOGS				13
+LUMP_FOGS was removed in BSP version 19, since moh version 1.10
 */
 #define LUMP_MODELS				13
 #define LUMP_ENTITIES			14
@@ -520,6 +520,18 @@ typedef struct {
 	lump_t		lumps[ HEADER_LUMPS ];
 } dheader_t;
 
+static lump_t *Q_GetLumpByVersion(dheader_t *header, int lump)
+{
+	if (header->version <= 18) {
+		if (lump > LUMP_BRUSHES) {
+			return &header->lumps[lump + 1];
+        }
+        return &header->lumps[lump];
+	}
+
+    return &header->lumps[lump];
+}
+
 typedef struct {
 	float		mins[3], maxs[3];
 	int			firstSurface, numSurfaces;
diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index f450e8e4..db59e309 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -2289,28 +2289,28 @@ void RE_LoadWorldMap( const char *name ) {
     // load into heap
     // load into heap
     _R(53);
-    numShaders = R_LoadLump(h, &header.lumps[LUMP_SHADERS], &lump, sizeof(dshader_t));
+    numShaders = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SHADERS), &lump, sizeof(dshader_t));
     _R(54);
     R_LoadShaders(&lump);
     _R(55);
     R_FreeLump(&lump);
     _R(56);
-    numplanes = R_LoadLump(h, &header.lumps[LUMP_PLANES], &lump, sizeof(dplane_t));
+    numplanes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_PLANES), &lump, sizeof(dplane_t));
     R_LoadPlanes(&lump);
     _R(57);
     R_FreeLump(&lump);
     _R(58);
-    numLightBytes = R_LoadLump(h, &header.lumps[LUMP_LIGHTMAPS], &lump, sizeof(byte));
+    numLightBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTMAPS), &lump, sizeof(byte));
     _R(59);
     R_LoadLightmaps(&lump);
     _R(60);
     R_FreeLump(&lump);
     _R(61);
-    numDrawSurfaces = R_LoadLump(h, &header.lumps[LUMP_SURFACES], &lump, sizeof(dsurface_t));
+    numDrawSurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SURFACES), &lump, sizeof(dsurface_t));
     _R(62);
-    numDrawVerts = R_LoadLump(h, &header.lumps[LUMP_DRAWVERTS], &lump2, sizeof(drawVert_t));
+    numDrawVerts = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWVERTS), &lump2, sizeof(drawVert_t));
     _R(63);
-    numDrawIndexes = R_LoadLump(h, &header.lumps[LUMP_DRAWINDEXES], &lump3, sizeof(int));
+    numDrawIndexes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWINDEXES), &lump3, sizeof(int));
     _R(64);
     R_LoadSurfaces(&lump, &lump2, &lump3);
     _R(65);
@@ -2320,15 +2320,15 @@ void RE_LoadWorldMap( const char *name ) {
     _R(67);
     R_FreeLump(&lump);
     _R(68);
-    numleafsurfaces = R_LoadLump(h, &header.lumps[LUMP_LEAFSURFACES], &lump, sizeof(int));
+    numleafsurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFSURFACES), &lump, sizeof(int));
     _R(69);
     R_LoadMarksurfaces(&lump);
     _R(70);
     R_FreeLump(&lump);
     _R(71);
-    numleafs = R_LoadLump(h, &header.lumps[LUMP_LEAFS], &lump2, sizeof(dleaf_t));
+    numleafs = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFS), &lump2, sizeof(dleaf_t));
     _R(72);
-    numnodes = R_LoadLump(h, &header.lumps[LUMP_NODES], &lump, sizeof(mnode_t));
+    numnodes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_NODES), &lump, sizeof(mnode_t));
     _R(73);
     if (header.version > BSP_BETA_VERSION) {
         R_LoadNodesAndLeafs(&lump, &lump2);
@@ -2342,23 +2342,23 @@ void RE_LoadWorldMap( const char *name ) {
     R_FreeLump(&lump2);
     _R(76);
     numFogs = 0;
-    nummodels = R_LoadLump(h, &header.lumps[LUMP_MODELS], &lump, sizeof(bmodel_t));
+    nummodels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_MODELS), &lump, sizeof(bmodel_t));
     _R(77);
     R_LoadSubmodels(&lump);
     _R(78);
     R_FreeLump(&lump);
     _R(79);
-    numVisBytes = R_LoadLump(h, &header.lumps[LUMP_VISIBILITY], &lump, sizeof(byte));
+    numVisBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_VISIBILITY), &lump, sizeof(byte));
     _R(80);
     R_LoadVisibility(&lump);
     _R(81);
     R_FreeLump(&lump);
     _R(82);
-    g_iGridPaletteBytes = R_LoadLump(h, &header.lumps[LUMP_LIGHTGRIDPALETTE], &lump, sizeof(byte));
+    g_iGridPaletteBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDPALETTE), &lump, sizeof(byte));
     _R(83);
-    g_iGridOffsets = R_LoadLump(h, &header.lumps[LUMP_LIGHTGRIDOFFSETS], &lump2, sizeof(short));
+    g_iGridOffsets = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDOFFSETS), &lump2, sizeof(short));
     _R(84);
-    g_iGridDataSize = R_LoadLump(h, &header.lumps[LUMP_LIGHTGRIDDATA], &lump3, sizeof(byte));
+    g_iGridDataSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDDATA), &lump3, sizeof(byte));
     _R(85);
     R_LoadLightGrid( &lump, &lump2, &lump3 );
     _R(86);
@@ -2368,25 +2368,25 @@ void RE_LoadWorldMap( const char *name ) {
     _R(88);
     R_FreeLump(&lump3);
     _R(89);
-    numSLights = R_LoadLump(h, &header.lumps[LUMP_SPHERELIGHTS], &lump, sizeof(mapspherel_t));
+    numSLights = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTS), &lump, sizeof(mapspherel_t));
     _R(90);
     R_LoadSphereLights(&lump);
     _R(91);
     R_FreeLump(&lump);
     _R(92);
-    entLightVisSize = R_LoadLump(h, &header.lumps[LUMP_SPHERELIGHTVIS], &lump, sizeof(byte));
+    entLightVisSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTVIS), &lump, sizeof(byte));
     _R(93);
     R_LoadSphereLightVis(&lump);
     _R(94);
     R_FreeLump(&lump);
     _R(95);
-    g_nTerraPatches = R_LoadLump(h, &header.lumps[LUMP_TERRAIN], &lump, sizeof(cTerraPatch_t));
+    g_nTerraPatches = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAIN), &lump, sizeof(cTerraPatch_t));
     _R(96);
     R_LoadTerrain(&lump);
     _R(97);
     R_FreeLump(&lump);
     _R(98);
-    g_nTerPatchIndices = R_LoadLump(h, &header.lumps[LUMP_TERRAININDEXES], &lump, sizeof(short));
+    g_nTerPatchIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAININDEXES), &lump, sizeof(short));
     _R(99);
     R_LoadTerrainIndexes(&lump);
     _R(100);
@@ -2394,19 +2394,19 @@ void RE_LoadWorldMap( const char *name ) {
     _R(101);
     if (header.version > BSP_BETA_VERSION)
     {
-        g_nStaticModelData = R_LoadLump(h, &header.lumps[LUMP_STATICMODELDATA], &lump, sizeof(byte));
+        g_nStaticModelData = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDATA), &lump, sizeof(byte));
         _R(102);
         R_LoadStaticModelData(&lump);
         _R(103);
         R_FreeLump(&lump);
         _R(104);
-        g_nStaticModels = R_LoadLump(h, &header.lumps[LUMP_STATICMODELDEF], &lump, sizeof(cStaticModel_t));
+        g_nStaticModels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDEF), &lump, sizeof(cStaticModel_t));
         _R(105);
         R_LoadStaticModelDefs(&lump);
         _R(106);
         R_FreeLump(&lump);
         _R(107);
-        g_nStaticModelIndices = R_LoadLump(h, &header.lumps[LUMP_STATICMODELINDEXES], &lump, sizeof(byte));
+        g_nStaticModelIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELINDEXES), &lump, sizeof(byte));
         _R(108);
         R_LoadStaticModelIndexes(&lump);
         _R(109);

From e5ef61c5d28c5f05fad5b00b96a76392e1f9dc77 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 22:25:05 +0100
Subject: [PATCH 1443/2040] Abort decal loading if a shader cannot be found
 while loading

---
 code/renderer/tr_marks_permanent.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
index fff5a90b..db920996 100644
--- a/code/renderer/tr_marks_permanent.c
+++ b/code/renderer/tr_marks_permanent.c
@@ -495,6 +495,10 @@ void R_LevelMarksLoad(const char *szBSPName)
             if (Q_stricmp(savePoly.shader, szLastShaderName)) {
                 hShader = RE_RegisterShader(savePoly.shader);
                 if (!hShader) {
+                    // Added in 2.30
+                    //  Don't mess with decal loading, so drop immediately
+                    Com_Error(ERR_DROP, "Decal file lists non-existant shader: %s", savePoly.shader);
+
                     pPoly->shader           = tr.defaultShader;
                     pPoly->surf.iIndex      = 0;
                     pPoly->surf.surfaceType = SF_SKIP;

From b0a683c188e436f9f40a5b7501a6420df792c0e9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 23:00:47 +0100
Subject: [PATCH 1444/2040] Don't localize if the localization hasn't been
 initialized

---
 code/sys/win_localization.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index ab094eaf..4cb6efd7 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -55,6 +55,10 @@ const char *Sys_LV_ConvertString( const char *var )
 
 const char *Sys_LV_CL_ConvertString( const char *var )
 {
+	if (!g_localization) {
+		return var;
+	}
+
 	return g_localization->ConvertString( var );
 }
 

From ab84a6ea5884d672f2753ae42fe9894bfd323405 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 12 Nov 2024 23:09:37 +0100
Subject: [PATCH 1445/2040] Add support for the demo version of the game

This allows the demo version of the game to be used, both for playing on demo servers, or for hosting a demo server
---
 code/client/cl_main.cpp              | 34 ++++++++++++++++
 code/client/cl_ui.cpp                | 15 +++++++
 code/client/cl_uiserverlist.cpp      |  9 +++-
 code/gamespy/sv_gamespy.c            | 20 +++++++--
 code/qcommon/common.c                | 61 +++++++++++++++++++++++-----
 code/qcommon/q_shared.h              | 36 +++++++++-------
 code/qcommon/qcommon.h               |  4 ++
 code/server/sv_client.c              | 37 ++++++++++++++++-
 code/server/sv_main.c                | 11 ++++-
 docs/getting_started_installation.md |  2 +-
 docs/getting_started_running.md      |  4 ++
 11 files changed, 198 insertions(+), 35 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 839761d0..5a6ec07b 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3689,6 +3689,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 	char	*infoString;
 	int		prot;
 	char	*gamename;
+	char	*pszVersion;
+	char	*pszServerType;
 	qboolean gameMismatch;
 
 	infoString = MSG_ReadString( msg );
@@ -3717,12 +3719,44 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 #ifdef LEGACY_PROTOCOL
 	   && prot != com_legacyprotocol->integer
 #endif
+		&& (com_target_demo->integer || prot != protocol_version_demo)
 	  )
 	{
 		Com_DPrintf( "Different protocol info packet: %s\n", infoString );
 		return;
 	}
 
+	if (!com_target_demo->integer && prot == protocol_version_demo) {
+		Com_DPrintf("Full version found compatible demo protocol version. %s\n", infoString);
+	}
+
+    pszVersion = Info_ValueForKey(infoString, "gamever");
+    pszServerType = Info_ValueForKey(infoString, "serverType");
+
+	if (!*pszVersion) {
+		return;
+	}
+
+	if (*pszVersion == 'd') {
+		pszVersion++;
+	}
+
+    if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+        if (atoi(pszServerType) == target_game_e::TG_MOHTT) {
+            if (fabs(atof(pszVersion)) < 2.3f) {
+				return;
+            }
+        } else {
+            if (fabs(atof(pszVersion)) < 2.1f) {
+				return;
+            }
+        }
+    } else {
+        if (fabs(atof(pszVersion) - com_target_version->value) > 0.1f) {
+			return;
+        }
+    }
+
 	// iterate servers waiting for ping response
 	for (i=0; i<MAX_PINGREQUESTS; i++)
 	{
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 256b4dd7..3f1226fa 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -4986,6 +4986,20 @@ void UI_HideStatistics_f()
     statsUpdater.CancelEventsOfType(EV_StatsUpdater_UpdateStats);
 }
 
+/*
+====================
+UI_SalesScreen_f
+====================
+*/
+void UI_SalesScreen_f()
+{
+    if (random() > 0.5) {
+        Cbuf_AddText("pushmenu sales_splash1\n");
+    } else {
+        Cbuf_AddText("pushmenu sales_splash2\n");
+    }
+}
+
 /*
 ====================
 CL_ShutdownUI
@@ -5256,6 +5270,7 @@ void CL_InitializeUI(void)
     Cmd_AddCommand("-statistics", UI_HideStatistics_f);
     Cmd_AddCommand("setreturnmenu", UI_SetReturnMenuToCurrent);
     Cmd_AddCommand("gotoreturnmenu", UI_PushReturnMenu_f);
+    Cmd_AddCommand("salesscreen", UI_SalesScreen_f);
 
     if (developer->integer) {
         UColor bgColor;
diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index 7376f417..8a4e88d2 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -1040,6 +1040,7 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
     {
         const char* pszHostName;
         bool bDiffVersion;
+        bool bIsDemo;
         str sServerName;
         str sPlayers;
         const char* pszGameVer;
@@ -1047,12 +1048,14 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
 
         pszHostName = ServerGetStringValue(server, "hostname", "(NONE)");
         bDiffVersion = false;
+        bIsDemo = false;
         pszGameVer = ServerGetStringValue(server, "gamever", "1.00");
         pszGameVerNumber = pszGameVer;
 
         if (pszGameVerNumber[0] == 'd') {
             // demo server
             pszGameVerNumber++;
+            bIsDemo = true;
         }
 
         if (com_target_game->integer >= target_game_e::TG_MOHTT) {
@@ -1077,7 +1080,11 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
             }
         }
         // always show the version
-        sServerName = va(" (%s) %s", pszGameVer, pszHostName);
+        if (!bIsDemo) {
+            sServerName = va(" (%s) %s", pszGameVerNumber, pszHostName);
+        } else {
+            sServerName = va(" (d%s) %s", pszGameVerNumber, pszHostName);
+        }
 
         iRealIP = inet_addr(ServerGetAddress(server));
         iPort = ServerGetIntValue(server, "hostport", PORT_SERVER);
diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index e72c26b7..8a7cbe63 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -55,6 +55,13 @@ static const char *GS_GAME_NAME[] =
     "mohaab"
 };
 
+static const char *GS_GAME_NAME_DEMO[] =
+{
+    "mohaa",
+    "mohaas",
+    "mohaabd"
+};
+
 static const char *GS_GAME_VERSION[] =
 {
     TARGET_GAME_VERSION_MOH,
@@ -98,7 +105,11 @@ unsigned int GS_GetCurrentGameID() {
 }
 
 const char* GS_GetGameName(unsigned int index) {
-    return GS_GAME_NAME[index];
+    if (!com_target_demo->integer) {
+        return GS_GAME_NAME[index];
+    } else {
+        return GS_GAME_NAME_DEMO[index];
+    }
 }
 
 const char* GS_GetCurrentGameName() {
@@ -110,7 +121,11 @@ const char* GS_GetGameVersion(unsigned int index) {
 }
 
 const char* GS_GetCurrentGameVersion() {
-    return GS_GetGameVersion(com_target_game->integer);
+    if (!com_target_demo->integer || com_target_game->integer <= TG_MOH) {
+        return GS_GetGameVersion(com_target_game->integer);
+    } else {
+        return va("d%s", GS_GetGameVersion(com_target_game->integer));
+    }
 }
 
 static const char *ConvertMapFilename(const char *mapname)
@@ -130,7 +145,6 @@ static void basic_callback(char *outbuf, int maxlen, void *userdata)
 {
     Info_SetValueForKey(outbuf, "gamename", GS_GetCurrentGameName());
     Info_SetValueForKey(outbuf, "gamever", GS_GetCurrentGameVersion());
-
     Info_SetValueForKey(outbuf, "location", va("%i", sv_location->integer));
 
     if (sv_debug_gamespy->integer) {
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index ccc3a757..937f7420 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -123,6 +123,10 @@ cvar_t  *con_autochat;
 cvar_t	*precache;
 cvar_t	*com_target_game;
 cvar_t	*com_target_version;
+cvar_t	*com_target_demo;
+
+int protocol_version_demo;
+int protocol_version_full;
 
 // com_speeds times
 int		time_game;
@@ -1652,6 +1656,7 @@ void Com_Init( char *commandLine ) {
 	CL_InitKeyCommands();
 
 	com_target_game = Cvar_Get("com_target_game", "0", CVAR_LATCH | CVAR_PROTECTED);
+	com_target_demo = Cvar_Get("com_target_demo", "0", CVAR_LATCH | CVAR_PROTECTED);
 	com_target_version = Cvar_Get("com_target_version", "0.00", CVAR_ROM);
 	com_standalone = Cvar_Get("com_standalone", "0", CVAR_ROM);
 	com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
@@ -2996,15 +3001,21 @@ int QDECL Com_strCompare( const void *a, const void *b )
     return strcmp( *pa, *pb );
 }
 
-void Com_InitTargetGameWithType(target_game_e target_game)
+void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 {
 	const char* protocol;
 
     switch (target_game)
     {
     case TG_MOH:
-        Cvar_Set("com_protocol", va("%i", PROTOCOL_MOH));
-        Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH));
+		if (!bIsDemo) {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOH));
+			Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH));
+		} else {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOH_DEMO));
+			Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH_DEMO));
+        }
+		protocol_version_demo = protocol_version_full = PROTOCOL_MOH;
 		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOH);
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOH);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOH);
@@ -3013,22 +3024,50 @@ void Com_InitTargetGameWithType(target_game_e target_game)
         break;
 
     case TG_MOHTA:
-        Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
-        Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
+		if (!bIsDemo) {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
+		} else {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA_DEMO));
+		}
+		protocol_version_demo = PROTOCOL_MOHTA_DEMO;
+		protocol_version_full = PROTOCOL_MOHTA;
 		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTA);
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTA);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTA);
-        Cvar_Set("fs_basegame", "mainta");
+		if (!bIsDemo) {
+			Cvar_Set("fs_basegame", "mainta");
+		} else {
+			// Targeting a demo
+			Cvar_Set("fs_basegame", "demota");
+		}
         break;
 
     case TG_MOHTT:
 		// mohta and mohtt use the same protocol version number
-        Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
-        Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT);
+		if (!bIsDemo) {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT);
+		} else {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT_DEMO);
+        }
+        protocol_version_demo = PROTOCOL_MOHTA_DEMO;
+        protocol_version_full = PROTOCOL_MOHTA;
+        Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTT);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTT);
-        Cvar_Set("fs_basegame", "maintt");
+		if (!bIsDemo) {
+			Cvar_Set("fs_basegame", "maintt");
+		} else {
+			// Targeting a demo
+			Cvar_Set("fs_basegame", "demott");
+		}
         break;
 
     default:
@@ -3045,7 +3084,7 @@ Com_InitTargetGame
 ===============
 */
 void Com_InitTargetGame() {
-	Com_InitTargetGameWithType((target_game_e)com_target_game->integer);
+	Com_InitTargetGameWithType((target_game_e)com_target_game->integer, com_target_demo->integer);
 }
 
 #ifdef __cplusplus
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index fc48d757..eaf3eb75 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -36,32 +36,36 @@ extern "C" {
 // We're always legacy
 #define LEGACY_PROTOCOL
 
-#define GAME_EXTENSION_MOH			"main"
-#define PRODUCT_EXTENSION_MOH		"Allied Assault"
-#define TARGET_GAME_VERSION_MOH		"1.12"
-#define TARGET_GAME_PROTOCOL_MOH	8
-#define TARGET_GAME_NAME_MOH		"mohaa"
+#define GAME_EXTENSION_MOH				"main"
+#define PRODUCT_EXTENSION_MOH			"Allied Assault"
+#define TARGET_GAME_VERSION_MOH			"1.12"
+#define TARGET_GAME_PROTOCOL_DEMO_MOH	6
+#define TARGET_GAME_PROTOCOL_MOH		8
+#define TARGET_GAME_NAME_MOH			"mohaa"
 
 #define HOMEPATH_NAME_UNIX_MOH		".moh"
 #define HOMEPATH_NAME_WIN_MOH		"moh"
 #define HOMEPATH_NAME_MACOSX_MOH	HOMEPATH_NAME_WIN_MOH
 
-#define GAME_EXTENSION_MOHTA		"mainta"
-#define PRODUCT_EXTENSION_MOHTA		"Spearhead"
-#define TARGET_GAME_VERSION_MOHTA	"2.16"
-#define TARGET_GAME_PROTOCOL_MOHTA	17
-#define TARGET_GAME_NAME_MOHTA		"mohaas"
+#define GAME_EXTENSION_MOHTA			"mainta"
+#define PRODUCT_EXTENSION_MOHTA			"Spearhead"
+#define TARGET_GAME_VERSION_MOHTA		"2.16"
+#define TARGET_GAME_PROTOCOL_MIN_MOHTA	16
+#define TARGET_GAME_PROTOCOL_MOHTA		17
+#define TARGET_GAME_NAME_MOHTA			"mohaas"
 
 #define HOMEPATH_NAME_UNIX_MOHTA	".mohta"
 #define HOMEPATH_NAME_WIN_MOHTA		"mohta"
 #define HOMEPATH_NAME_MACOSX_MOHTA	HOMEPATH_NAME_WIN_MOHTA
 
-#define GAME_EXTENSION_BASE_MOHTT	"maintt"
-#define PRODUCT_EXTENSION_MOHTT		"Breakthrough"
+#define GAME_EXTENSION_BASE_MOHTT		"maintt"
+#define PRODUCT_EXTENSION_MOHTT			"Breakthrough"
 // The version string must be equal or above 2.0 to be able to connect to breakthrough servers
-#define	TARGET_GAME_VERSION_MOHTT	"2.41"
-#define TARGET_GAME_PROTOCOL_MOHTT	17
-#define TARGET_GAME_NAME_MOHTT		"mohaab"
+#define	TARGET_GAME_VERSION_MOHTT		"2.41"
+#define	TARGET_GAME_VERSION_MOHTT_DEMO	"0.31"
+#define TARGET_GAME_PROTOCOL_MIN_MOHTT	16
+#define TARGET_GAME_PROTOCOL_MOHTT		17
+#define TARGET_GAME_NAME_MOHTT			"mohaab"
 
 #define HOMEPATH_NAME_UNIX_MOHTT	".mohtt"
 #define HOMEPATH_NAME_WIN_MOHTT		"mohtt"
@@ -264,8 +268,10 @@ typedef enum {
 
 typedef enum {
     PROTOCOL_MOH_MIN = 6,
+    PROTOCOL_MOH_DEMO = 6,
     PROTOCOL_MOH = 8,
     PROTOCOL_MOHTA_MIN = 15,
+    PROTOCOL_MOHTA_DEMO = 16,
     PROTOCOL_MOHTA = 17,
 } protocol_e;
 
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 3d349e61..5cc94fe0 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1056,6 +1056,10 @@ extern  cvar_t* con_autochat;
 #endif
 extern	cvar_t* com_target_version;
 extern	cvar_t* com_target_game;
+extern	cvar_t* com_target_demo;
+
+extern	int		protocol_version_demo;
+extern	int		protocol_version_full;
 
 // com_speeds times
 extern	int		time_game;
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 31c42697..dce9288e 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -284,6 +284,28 @@ challenge_t* FindChallenge(netadr_t from, qboolean connecting) {
 	return challenge;
 }
 
+/*
+==================
+SV_IsDemoClient
+
+Returns whether or not the client is using the demo version of the game
+==================
+*/
+
+qboolean SV_IsDemoClient(const char *userinfo)
+{
+	int version;
+
+	if (protocol_version_demo == protocol_version_full) {
+		// Older versions don't check for network demo
+		return qfalse;
+	}
+
+    version = atoi(Info_ValueForKey(userinfo, "protocol"));
+
+	return version == protocol_version_demo;
+}
+
 /*
 ==================
 SV_DirectConnect
@@ -334,9 +356,20 @@ void SV_DirectConnect( netadr_t from ) {
 			Com_DPrintf("    rejected connect - only Breakthrough clients allowed.\n");
 			return;
 		}
-	}
+    }
 
-	version = atoi(Info_ValueForKey(userinfo, "protocol"));
+    version = atoi(Info_ValueForKey(userinfo, "protocol"));
+
+	if (!com_target_demo->integer && SV_IsDemoClient(userinfo)) {
+        SV_NET_OutOfBandPrint(&svs.netprofile, from, "print\nThe Multiplayer Demo can not connect to full version games.\n");
+		Com_DPrintf("    rejected connect from version %i\n", version);
+		return;
+    }
+
+    if (com_target_demo->integer && version == protocol_version_full) {
+		// Make sure to make the full game compatible with the demo game protocol
+        version = com_protocol->integer;
+    }
 	
 #ifdef LEGACY_PROTOCOL
 	if(version > 0 && com_legacyprotocol->integer == version)
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index bd3893a6..a8fd9123 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -615,8 +615,15 @@ void SVC_Info( netadr_t from ) {
 		Info_SetValueForKey( infostring, "game", gamedir );
 	}
 
-	Info_SetValueForKey(infostring, "gamever", com_target_version->string);
-	Info_SetValueForKey(infostring, "serverType", va("%i", com_target_game->integer));
+    if (!com_target_demo->integer || com_target_game->integer <= TG_MOH) {
+        Info_SetValueForKey(infostring, "gamever", com_target_version->string);
+	} else {
+		Info_SetValueForKey(infostring, "gamever", va("d%s", com_target_version->string));
+	}
+
+	if (com_target_game->integer >= TG_MOHTT) {
+		Info_SetValueForKey(infostring, "serverType", va("%i", com_target_game->integer));
+	}
 
 	SV_NET_OutOfBandPrint( &svs.netprofile, from, "infoResponse\n%s", infostring );
 }
diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 2a45f8a4..1c28354f 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -14,7 +14,7 @@ Ensure that you download the binaries compatible with your platform in the [rele
 ## Requirements
 
 - A valid MOH:AA installation, a MOH:AA Warchest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
-  - [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos)
+  - [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos). The demo version can also be used.
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 may be required.
 
 ## System requirements
diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 44344c33..4e5d1c92 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -19,6 +19,10 @@ On Windows, a shortcut can be created to the `openmohaa` executable, with the co
 
 You can now start a local OpenMOHAA server or play on a server.
 
+### Playing with the downloadable demo
+
+The argument `+set com_target_demo 1` must be appended to command-line to play the game/host a server using demo assets: Allied Assault, Spearhead and Breakthrough demo are supported.
+
 ### From the launchers
 
 For simplicity, there are 3 launchers for the standalone game:

From d01fa33e46fe317a060893fb5de24e2a56bbe9a4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 13 Nov 2024 00:06:45 +0100
Subject: [PATCH 1446/2040] Use 0.31 for Breakthrough demo

This makes the Breakthrough demo client compatible with Breakthrough demo servers
---
 code/gamespy/sv_gamespy.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 8a7cbe63..472b2da7 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -69,6 +69,13 @@ static const char *GS_GAME_VERSION[] =
     TARGET_GAME_VERSION_MOHTT,
 };
 
+static const char* GS_GAME_VERSION_DEMO[] =
+{
+    TARGET_GAME_VERSION_MOH,
+    "d" TARGET_GAME_VERSION_MOHTA,
+    "d" TARGET_GAME_VERSION_MOHTT_DEMO,
+};
+
 static const unsigned int GAMESPY_DEFAULT_PORT = 12300;
 
 void qr_send_statechanged(qr_t qrec);
@@ -117,15 +124,15 @@ const char* GS_GetCurrentGameName() {
 }
 
 const char* GS_GetGameVersion(unsigned int index) {
-    return GS_GAME_VERSION[index];
+    if (!com_target_demo->integer) {
+        return GS_GAME_VERSION[index];
+    } else {
+        return GS_GAME_VERSION_DEMO[index];
+    }
 }
 
 const char* GS_GetCurrentGameVersion() {
-    if (!com_target_demo->integer || com_target_game->integer <= TG_MOH) {
-        return GS_GetGameVersion(com_target_game->integer);
-    } else {
-        return va("d%s", GS_GetGameVersion(com_target_game->integer));
-    }
+    return GS_GetGameVersion(com_target_game->integer);
 }
 
 static const char *ConvertMapFilename(const char *mapname)

From 96ca9c20e423e6114a6ec98b4449a7b8865fd1c2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 13 Nov 2024 19:40:31 +0100
Subject: [PATCH 1447/2040] Rework fade sequence and make it work

---
 code/uilib/uiwidget.cpp | 81 +++++++++++++++++++++--------------------
 code/uilib/uiwidget.h   | 10 +++--
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 4682c062..3d9d9416 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -428,6 +428,7 @@ Event EV_Layout_DontLocalize
 	"Disables localization for this widget"
 	);
 
+// Added in 2.0
 Event EV_Layout_FadeSequence
 	(
 	"fadesequence",
@@ -502,6 +503,11 @@ CLASS_DECLARATION( USignal, UIWidget, NULL )
 	{ &EV_Widget_Disable,				&UIWidget::DisableEvent },
 	{ &EV_Widget_EnabledCvar,			&UIWidget::SetEnabledCvar },
 	{ &EV_Widget_ScaleCvar,				&UIWidget::SetScaleCvar },
+
+	//
+	// Added in 2.0
+	//
+
 	{ &EV_Layout_DontLocalize,			&UIWidget::SetDontLocalize },
 	{ &EV_Layout_FadeSequence,			&UIWidget::EventFadeSequence },
 
@@ -706,12 +712,12 @@ UIWidget::UIWidget()
 	m_scaleCvar = NULL;
 	m_enabledCvar = "";
 
-	m_fadeSequenceDelayStart = 0;
+	m_fadeSequenceDelay = 0;
 	m_fadeSequenceFadeIn = 0;
 	m_fadeSequenceHold = 0;
 	m_fadeSequenceFadeOut = 0;
 	m_fadeSequenceState = fadesequence_t::SEQUENCE_NONE;
-	m_fadeSequenceAlpha = 0;
+	m_fadeSequenceLastTime = 0;
 
 	UIRect2D frame( 6.0f, 6.0f, 100.0f, 13.0f );
 	setFrame( frame );
@@ -904,9 +910,9 @@ void UIWidget::FrameInitialized
 	)
 
 {
-	if (m_fadeSequenceDelayStart || m_fadeSequenceFadeIn || m_fadeSequenceHold || m_fadeSequenceFadeOut) {
-		m_fadeSequenceDelayEnd = m_fadeSequenceDelayStart;
-		m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEIN;
+	if (m_fadeSequenceDelay || m_fadeSequenceFadeIn || m_fadeSequenceHold || m_fadeSequenceFadeOut) {
+		m_fadeSequenceRemainingTime = m_fadeSequenceDelay;
+		m_fadeSequenceState = fadesequence_t::SEQUENCE_STARTING;
 	}
 }
 
@@ -936,59 +942,54 @@ void UIWidget::Motion
 
 	if (m_fadeSequenceState != fadesequence_t::SEQUENCE_NONE)
 	{
+		// Added in 2.0
+		//  Process fade sequence
 		if (!paused->integer) {
 			switch (m_fadeSequenceState)
 			{
 			case fadesequence_t::SEQUENCE_STARTING:
-				m_alpha = 0.f;
-				m_fadeSequenceDelayEnd -= t - m_fadeSequenceAlpha;
-				if (m_fadeSequenceDelayEnd >= 0.f) {
-					m_fadeSequenceAlpha = t;
-				} else {
+				m_alpha = 0.0;
+
+				m_fadeSequenceRemainingTime -= t - m_fadeSequenceLastTime;
+				if (m_fadeSequenceRemainingTime < 0) {
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEIN;
-					m_fadeSequenceAlpha = t;
-					m_fadeSequenceDelayEnd = m_fadeSequenceFadeIn;
+					m_fadeSequenceRemainingTime = m_fadeSequenceFadeIn;
 				}
 				break;
 			case fadesequence_t::SEQUENCE_FADEIN:
-				m_alpha = 1.f - m_fadeSequenceDelayEnd / m_fadeSequenceFadeIn;
-				m_fadeSequenceDelayEnd -= t - m_fadeSequenceAlpha;
-				if (m_fadeSequenceDelayEnd >= 0.f) {
-					m_fadeSequenceAlpha = t;
-				} else {
+				m_alpha = 1.0 - m_fadeSequenceRemainingTime / m_fadeSequenceFadeIn;
+
+				m_fadeSequenceRemainingTime -= t - m_fadeSequenceLastTime;
+				if (m_fadeSequenceRemainingTime < 0) {
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_HOLD;
-					m_fadeSequenceAlpha = t;
-					m_fadeSequenceDelayEnd = m_fadeSequenceHold;
+					m_fadeSequenceRemainingTime = m_fadeSequenceHold;
 				}
 				break;
 			case fadesequence_t::SEQUENCE_HOLD:
-				m_alpha = 1.f;
-				m_fadeSequenceDelayEnd -= t - m_fadeSequenceAlpha;
-				if (m_fadeSequenceDelayEnd >= 0.f) {
-					m_fadeSequenceAlpha = t;
-				} else {
+				m_alpha = 1.0;
+
+				m_fadeSequenceRemainingTime -= t - m_fadeSequenceLastTime;
+				if (m_fadeSequenceRemainingTime < 0) {
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEOUT;
-					m_fadeSequenceAlpha = t;
-					m_fadeSequenceDelayEnd = m_fadeSequenceFadeOut;
+					m_fadeSequenceRemainingTime = m_fadeSequenceFadeOut;
 				}
 				break;
 			case fadesequence_t::SEQUENCE_FADEOUT:
-				m_alpha = m_fadeSequenceDelayEnd / m_fadeSequenceFadeOut;
-				m_fadeSequenceDelayEnd -= (t - m_fadeSequenceAlpha);
-                if (m_fadeSequenceDelayEnd >= 0.f) {
-                    m_fadeSequenceAlpha = t;
-				} else {
-					m_alpha = 0.f;
+				m_alpha = m_fadeSequenceRemainingTime / m_fadeSequenceFadeOut;
+
+				m_fadeSequenceRemainingTime -= (t - m_fadeSequenceLastTime);
+                if (m_fadeSequenceRemainingTime < 0) {
+					// Fade sequence has finished fading
+					m_alpha = 0;
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_NONE;
-				}
+                }
 				break;
             default:
-                m_fadeSequenceAlpha = t;
 				break;
 			}
-		} else {
-			m_fadeSequenceAlpha = t;
 		}
+
+        m_fadeSequenceLastTime = t;
 	} else if( m_fadetime >= 0.0 ) {
 		frac = ( t - m_starttime ) / m_fadetime;
 
@@ -2730,6 +2731,8 @@ void UIWidget::ResetMotion
 	}
 
 	m_starttime = uid.time / 1000.0;
+	// Added in 2.0
+	m_fadeSequenceLastTime = uid.time / 1000.0;
 }
 
 void UIWidget::Realign
@@ -3155,12 +3158,12 @@ void UIWidget::SetDontLocalize(Event* ev)
 
 void UIWidget::EventFadeSequence(Event* ev)
 {
-	m_fadeSequenceDelayStart = ev->GetFloat(1);
+	m_fadeSequenceDelay = ev->GetFloat(1);
 	m_fadeSequenceFadeIn = ev->GetFloat(2);
 	m_fadeSequenceHold = ev->GetFloat(3);
 	m_fadeSequenceFadeOut = ev->GetFloat(4);
-	m_fadeSequenceDelayEnd = m_fadeSequenceDelayStart;
-	m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEIN;
+	m_fadeSequenceRemainingTime = m_fadeSequenceDelay;
+	m_fadeSequenceState = fadesequence_t::SEQUENCE_STARTING;
 }
 
 void UIWidget::SetDontLocalize()
diff --git a/code/uilib/uiwidget.h b/code/uilib/uiwidget.h
index fc525ca4..602f8838 100644
--- a/code/uilib/uiwidget.h
+++ b/code/uilib/uiwidget.h
@@ -143,12 +143,12 @@ protected:
 	float m_alpha;
 	float m_local_alpha;
 	float m_motiontime;
-    float m_fadeSequenceDelayStart;
+    float m_fadeSequenceDelay;
     float m_fadeSequenceFadeIn;
     float m_fadeSequenceHold;
     float m_fadeSequenceFadeOut;
-    float m_fadeSequenceDelayEnd;
-    float m_fadeSequenceAlpha;
+    float m_fadeSequenceRemainingTime;
+    float m_fadeSequenceLastTime;
     int m_fadeSequenceState;
 	str m_stopsound;
 	str m_clicksound;
@@ -226,8 +226,12 @@ public:
 	void				LayoutAliasCache( Event *ev );
 	void				SetEnabledCvar( Event *ev );
 	void				SetScaleCvar( Event *ev );
+
+	// Added in 2.0
+	//====
 	void				SetDontLocalize( Event *ev );
 	void				EventFadeSequence( Event *ev );
+	//====
 
 	void				SetVirtualScale(vec2_t out);
 	void				SetDontLocalize();

From fb2f3bddaadeab7cfdcd38f94c291ed65d6a5532 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 13 Nov 2024 20:00:45 +0100
Subject: [PATCH 1448/2040] Fix the intermission screen (mission
 failed/success) not hiding immediately on the base game

---
 code/cgame/cg_view.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index e31b1e72..1bd6a4a2 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -911,13 +911,13 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
                     {
                     default:
                     case 0:
-                        cgi.UI_HideMenu("mission_success_1", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_success_1", qtrue);
                         break;
                     case 2:
-                        cgi.UI_HideMenu("mission_success_2", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_success_2", qtrue);
                         break;
                     case 3:
-                        cgi.UI_HideMenu("mission_success_3", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_success_3", qtrue);
                         break;
                     }
                 } else {
@@ -925,21 +925,21 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
                     {
                     default:
                     case 0:
-                        cgi.UI_HideMenu("mission_failed_1", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_failed_1", qtrue);
                         break;
                     case 2:
-                        cgi.UI_HideMenu("mission_failed_2", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_failed_2", qtrue);
                         break;
                     case 3:
-                        cgi.UI_HideMenu("mission_failed_3", CVAR_ARCHIVE);
+                        cgi.UI_HideMenu("mission_failed_3", qtrue);
                         break;
                     }
                 }
             } else {
                 if (cgi.Cvar_Get("g_success", "", 0)->integer) {
-                    cgi.UI_HideMenu("StatsScreen_Success", qfalse);
+                    cgi.UI_HideMenu("StatsScreen_Success", qtrue);
                 } else {
-                    cgi.UI_HideMenu("StatsScreen_Failed", qfalse);
+                    cgi.UI_HideMenu("StatsScreen_Failed", qtrue);
                 }
             }
         }

From 7576d1241d9a51fe7f69202c02bb893a31d3dc95 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 13 Nov 2024 21:49:43 +0100
Subject: [PATCH 1449/2040] Add hardware requirements for non-x86 architectures

---
 docs/getting_started_installation.md | 92 +++++++++++++++++++++++++---
 1 file changed, 85 insertions(+), 7 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 1c28354f..341471cc 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -19,14 +19,92 @@ Ensure that you download the binaries compatible with your platform in the [rele
 
 ## System requirements
 
-This matches the hardware requirements (x86) of the original game:
+This matches the hardware requirements (x86) of the original game.
 
-|Hardware|Minimum
-|--------|-------
-|CPU     |450 MHz
-|Memory  |128MB
-|Storage |1.2GB
-|GPU     |16MB
+### Medal of Honor: Allied Assault
+
+1.2 GB of free disk space is required for the full game installation + binaries.
+
+#### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+#### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+#### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 450 MHz                                          |G4 1 GHz
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### Spearhead expansion
+
+1.0 GB of free disk space is required to install Spearhead on top of the base game.
+
+#### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+#### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+#### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 500 MHz                                          |G4 1 GHz
+|Memory         |256MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### Breakthrough expansion
+
+800 MB of free disk space is required to install Spearhead on top of the base game.
+
+#### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                              |Recommended
+|---------------|-----------------------------------------------------|---------------
+|CPU            |733 MHz (Intel Pentium III), or 700 MHz (AMD Athlon) |1 GHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                                |256MB
+|GPU            |16MB                                                 |32MB
+
+#### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |800 MHz ARM Cortex-A9                               |1 GHz ARM Cortex-A15
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+
+#### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 800 MHz                                          |G4 1 GHz
+|Memory         |256MB                                               |256MB
+|GPU            |16MB                                                |32MB
 
 ## Client
 

From 9a6472210ccb245733941b024a27a2b4b8afbf1b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:15:31 +0100
Subject: [PATCH 1450/2040] Use a separate user-data location for the demo
 version

---
 code/qcommon/files.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 515c5f8d..6bf7b544 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -3425,6 +3425,10 @@ static void FS_Startup(const char* gameName)
 	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;
+	} else if (com_target_demo->integer) {
+		// As full and demo are different products,
+		// it's better for them to have separate location for configs and saves
+		homePath = va("%s-demo", homePath);
 	}
 	fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT|CVAR_PROTECTED );
 	fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );

From 0c206beb452aabd22bb0c53ceee3e06c7d8831ee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 14 Nov 2024 19:46:16 +0100
Subject: [PATCH 1451/2040] Expect a SimpleEntity rather than an Entity

The specified path in FollowPath can be a Waypoint which is a subclass of SimpleEntity
---
 code/fgame/scriptslave.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 7d30ee3a..174b3b2c 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1381,14 +1381,14 @@ void ScriptSlave::CreatePath(SplinePath *path, splinetype_t type)
 
 void ScriptSlave::FollowPath(Event *ev)
 {
-    int         i, argnum;
-    Entity     *ent;
-    str         token;
-    SplinePath *path;
-    qboolean    clamp;
-    float       starttime;
+    int               i, argnum;
+    SimpleEntity     *ent;
+    str               token;
+    SplinePath       *path;
+    qboolean          clamp;
+    float             starttime;
 
-    ent             = ev->GetEntity(1);
+    ent             = ev->GetSimpleEntity(1);
     argnum          = 2;
     starttime       = -2;
     clamp           = true;
@@ -1422,6 +1422,7 @@ void ScriptSlave::FollowPath(Event *ev)
             ScriptError("Unknown followpath command %s.", token.c_str());
         }
     }
+
     if (ent && ent->IsSubclassOfSplinePath()) {
         path = (SplinePath *)ent;
         if (clamp) {

From 67b285924c0cd494c2bde34ef73cb9f6fac3ce07 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 14 Nov 2024 19:49:22 +0100
Subject: [PATCH 1452/2040] Prefix OpenAL with debug prints

---
 code/client/snd_openal_new.cpp | 110 +++++++--------------------------
 1 file changed, 23 insertions(+), 87 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 3cc70443..4bab7eb6 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -895,70 +895,6 @@ static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
     chan->set_no_3d();
 
     return true;
-
-#if 0
-    char   path[MAX_QPATH];
-    FILE  *in;
-    size_t len;
-    size_t rc;
-    bool   failed;
-
-    chan->stop();
-
-    qalSourcei(chan->source, AL_BUFFER, 0);
-    alDieIfError();
-
-    S_OPENAL_NukeBuffer(&chan->buffer);
-    alDieIfError();
-
-    Q_strncpyz(path, _path, sizeof(path));
-    path[MAX_QPATH - 1] = 0;
-
-    FS_CorrectCase(path);
-
-    in = fopen(path, "rb");
-    if (!in) {
-        Com_DPrintf("Failed to open MP3 \"%s\" for playback\n", path);
-        return false;
-    }
-
-    fseek(in, 0, SEEK_END);
-    len = ftell(in);
-    fseek(in, 0, SEEK_SET);
-
-    chan->bufferdata = new ALubyte[len];
-    rc               = fread(chan->bufferdata, 1, len, in);
-    fclose(in);
-
-    if (rc != len) {
-        delete[] chan->bufferdata;
-        chan->bufferdata = NULL;
-        Com_DPrintf("Failed to read MP3 \"%s\" from disk\n", path);
-
-        return false;
-    }
-
-    qalGenBuffers(1, &chan->buffer);
-    alDieIfError();
-
-    failed = !_alutLoadMP3_LOKI(chan->buffer, chan->bufferdata, rc);
-    alDieIfError();
-
-    delete[] chan->bufferdata;
-    chan->bufferdata = NULL;
-
-    if (failed) {
-        Com_DPrintf("Failed to decode MP3 file \"%s\"\n", path);
-        return false;
-    }
-
-    qalSourcei(chan->source, AL_BUFFER, chan->buffer);
-    alDieIfError();
-
-    chan->set_no_3d();
-
-    return true;
-#endif
 }
 
 /*
@@ -1330,7 +1266,7 @@ static void S_OPENAL_Start2DSound(
 
     if (iFreeChannel < 0) {
         Com_DPrintf(
-            "Couldn't play %s sound '%s' for entity %i on channel %s\n",
+            "OpenAL: Couldn't play %s sound '%s' for entity %i on channel %s\n",
             (pSfx->iFlags & SFX_FLAG_STREAMED) ? "2Dstreamed" : "2D",
             pSfx->name,
             iRealEntNum,
@@ -1412,7 +1348,7 @@ static void S_OPENAL_Start2DSound(
     if (iFreeChannel > MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D) {
         // streamed
         if (!pChannel->set_sfx(pSfx)) {
-            Com_DPrintf("Set stream error - %s\n", pSfx->name);
+            Com_DPrintf("OpenAL: Set stream error - %s\n", pSfx->name);
             return;
         }
 
@@ -1431,7 +1367,7 @@ static void S_OPENAL_Start2DSound(
 
     if (s_show_sounds->integer > 0) {
         Com_DPrintf(
-            "2D - %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
+            "OpenAL: 2D - %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
             cl.serverTime,
             iFreeChannel,
             pSfx->name,
@@ -1474,7 +1410,7 @@ void S_OPENAL_StartSound(
     }
 
     if (!S_OPENAL_ShouldPlay(pSfx)) {
-        Com_DPrintf("^~^~^ Not playing sound '%s'\n", pSfx->name);
+        Com_DPrintf("OpenAL: ^~^~^ Not playing sound '%s'\n", pSfx->name);
         return;
     }
 
@@ -1489,14 +1425,14 @@ void S_OPENAL_StartSound(
 
     pSfxInfo = &sfx_infos[pSfx->sfx_info_index];
     if (pSfx->iFlags & SFX_FLAG_STREAMED) {
-        Com_DPrintf("3D sounds not supported - couldn't play '%s'\n", pSfx->name);
+        Com_DPrintf("OpenAL: 3D sounds not supported - couldn't play '%s'\n", pSfx->name);
         return;
     }
 
     iChannel = S_OPENAL_PickChannel3D(iEntNum, iEntChannel);
     if (iChannel < 0) {
         Com_DPrintf(
-            "Couldn't play %s sound '%s' for entity %i on channel %s\n",
+            "OpenAL: Couldn't play %s sound '%s' for entity %i on channel %s\n",
             (pSfx->iFlags & SFX_FLAG_STREAMED) ? "3Dstreamed" : "3D",
             pSfx->name,
             iEntNum,
@@ -1521,7 +1457,7 @@ void S_OPENAL_StartSound(
         pChannel->stop();
         pChannel->iFlags &= ~(CHANNEL_FLAG_LOOPING | CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
         if (!pChannel->set_sfx(pSfx)) {
-            Com_DPrintf("Set sample error - %s\n", pSfx->name);
+            Com_DPrintf("OpenAL: Set sample error - %s\n", pSfx->name);
             return;
         }
     }
@@ -1546,7 +1482,7 @@ void S_OPENAL_StartSound(
 
     if (s_show_sounds->integer > 0) {
         Com_DPrintf(
-            "%d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
+            "OpenAL: %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
             cl.serverTime,
             iChannel,
             pSfx->name,
@@ -1601,7 +1537,7 @@ void S_OPENAL_StartSound(
 
         pChannel->iFlags |= CHANNEL_FLAG_LOOPING;
         if (s_show_sounds->integer) {
-            Com_DPrintf("loopblock - %d to %d\n", pSfxInfo->loop_start, pSfxInfo->loop_end);
+            Com_DPrintf("OpenAL: loopblock - %d to %d\n", pSfxInfo->loop_start, pSfxInfo->loop_end);
         }
     } else {
         pChannel->set_sample_loop_count(1);
@@ -1668,7 +1604,7 @@ void S_OPENAL_AddLoopingSound(
 
     if (iFreeLoopSound < 0) {
         if (cls.realtime >= s_iNextLoopingWarning) {
-            Com_DPrintf("Too many looping sounds\n");
+            Com_DPrintf("OpenAL: Too many looping sounds\n");
             s_iNextLoopingWarning = cls.realtime + 1000;
         }
         return;
@@ -1728,7 +1664,7 @@ void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
     if (bMayStop) {
         if (s_show_sounds->integer > 0) {
             Com_DPrintf(
-                "%d (#%i) - stopped loop - %s\n",
+                "OpenAL: %d (#%i) - stopped loop - %s\n",
                 cl.serverTime,
                 pLoopSound->iChannel,
                 openal.channel[pLoopSound->iChannel]->pSfx->name
@@ -1844,7 +1780,7 @@ static int S_OPENAL_Start2DLoopSound(
     }
 
     if (iChannel < 0) {
-        Com_DPrintf("Could not find a free 2D sound channel\n");
+        Com_DPrintf("OpenAL: Could not find a free 2D sound channel\n");
         return iChannel;
     }
 
@@ -1860,7 +1796,7 @@ static int S_OPENAL_Start2DLoopSound(
     pChannel->fMinDist = fMinDistance;
 
     if (!pChannel->set_sfx(pLoopSound->pSfx)) {
-        Com_DPrintf("Set sample error\n");
+        Com_DPrintf("OpenAL: Set sample error (loopsound) - %s\n", pLoopSound->pSfx->name);
         pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
         return -1;
     }
@@ -1880,7 +1816,7 @@ static int S_OPENAL_Start2DLoopSound(
     pChannel->set_gain(fVolumeToPlay);
     pChannel->start_sample();
     if (s_show_sounds->integer > 0) {
-        Com_DPrintf("%d (#%i) - %s (vol %f)\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name, fVolume);
+        Com_DPrintf("OpenAL: %d (#%i) - %s (vol %f)\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name, fVolume);
     }
 
     return iChannel;
@@ -1915,7 +1851,7 @@ static int S_OPENAL_Start3DLoopSound(
 
     iChannel = S_OPENAL_PickChannel3D(0, 0);
     if (iChannel < 0) {
-        Com_DPrintf("Could not find a free channel\n");
+        Com_DPrintf("OpenAL: Could not find a free channel\n");
         return iChannel;
     }
 
@@ -1928,7 +1864,7 @@ static int S_OPENAL_Start3DLoopSound(
     pChan3D->set_3d();
 
     if (!pChan3D->set_sfx(pLoopSound->pSfx)) {
-        Com_DPrintf("Set sample error - %s\n", pLoopSound->pSfx->name);
+        Com_DPrintf("OpenAL: Set sample error - %s\n", pLoopSound->pSfx->name);
         return -1;
     }
 
@@ -2140,7 +2076,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
             if (pLoopSound->bPlaying) {
                 if (s_show_sounds->integer > 0) {
                     Com_DPrintf(
-                        "%d (#%i) - stopped loop - %s\n",
+                        "OpenAL: %d (#%i) - stopped loop - %s\n",
                         cl.serverTime,
                         pLoopSound->iChannel,
                         openal.channel[pLoopSound->iChannel]->pSfx->name
@@ -2200,7 +2136,7 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
         }
 
         if (s_show_sounds->integer > 0) {
-            Com_DPrintf("%d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
+            Com_DPrintf("OpenAL: %d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
         }
 
         if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET)
@@ -2549,7 +2485,7 @@ void S_OPENAL_Update()
                 ++num;
             }
         }
-        Com_DPrintf("Number of active sounds = %d\n", num);
+        Com_DPrintf("OpenAL: Number of active sounds = %d\n", num);
     }
 
     Music_Update();
@@ -2688,7 +2624,7 @@ static void
 S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx_t *pSfx, bool bStartUnpaused)
 {
     if (!pChannel->set_sfx(pSfx)) {
-        Com_DPrintf("Set sample error - %s\n", pSfx->name);
+        Com_DPrintf("OpenAL: Set sample error - %s\n", pSfx->name);
         pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
         return;
     }
@@ -2703,7 +2639,7 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
         pChannel->iFlags |= CHANNEL_FLAG_LOOPING;
         if (s_show_sounds->integer > 0) {
             Com_DPrintf(
-                "loopblock - %d to %d\n",
+                "OpenAL: loopblock - %d to %d\n",
                 sfx_infos[pSfx->sfx_info_index].loop_start,
                 sfx_infos[pSfx->sfx_info_index].loop_end
             );
@@ -3365,7 +3301,7 @@ qboolean MUSIC_LoadSoundtrackFile(const char *filename)
 
     FS_ReadFile(path, (void **)&data);
     if (!data) {
-        Com_DPrintf("Couldn't load %s\n", path);
+        Com_DPrintf("OpenAL: Couldn't load %s\n", path);
         return false;
     }
     Com_DPrintf("SOUNDTRACK: Loading %s\n", path);
@@ -4373,7 +4309,7 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t *pSfx)
 
     streamHandle = S_CodecLoad(pSfx->name, NULL);
     if (!streamHandle) {
-        Com_DPrintf("OpenAL: Failed to load MP3.\n");
+        Com_DPrintf("OpenAL: Failed to load sound file.\n");
         return false;
     }
 

From a598cbf0dc870e2389fbc301e9f30894de12a5db Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 14 Nov 2024 20:25:26 +0100
Subject: [PATCH 1453/2040] Update running documentation

---
 docs/getting_started_running.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index 4e5d1c92..d7bd1282 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -21,7 +21,7 @@ You can now start a local OpenMOHAA server or play on a server.
 
 ### Playing with the downloadable demo
 
-The argument `+set com_target_demo 1` must be appended to command-line to play the game/host a server using demo assets: Allied Assault, Spearhead and Breakthrough demo are supported.
+The argument `+set com_target_demo 1` must be appended to command-line to play the game/host a server using demo assets: Allied Assault, Spearhead and Breakthrough demo are supported as long as `com_target_game` is set (see above).
 
 ### From the launchers
 

From f6c9de42862920a12f40f89323c367db8c95b4d2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 15 Nov 2024 20:58:46 +0100
Subject: [PATCH 1454/2040] Use com_basegame instead of BASEGAME macro

---
 code/qcommon/files.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 6bf7b544..77f17585 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -3236,7 +3236,7 @@ qboolean FS_ComparePaks( char *neededpaks, int len, qboolean dlstring ) {
 		havepak = qfalse;
 
 		// never autodownload any of the id paks
-		if ( FS_idPak(fs_serverReferencedPakNames[i], BASEGAME) || FS_idPak(fs_serverReferencedPakNames[i], "missionpack") ) {
+		if ( FS_idPak(fs_serverReferencedPakNames[i], com_basegame->string) || FS_idPak(fs_serverReferencedPakNames[i], "missionpack") ) {
 			continue;
 		}
 
@@ -3520,7 +3520,7 @@ static void FS_Startup(const char* gameName)
 
 #ifndef STANDALONE
 	if (!com_standalone->integer) {
-		Com_ReadCDKey(BASEGAME);
+		Com_ReadCDKey(com_basegame->string);
 		if (fs_gamedirvar->string[0]) {
 			Com_AppendCDKey(fs_gamedirvar->string);
 		}
@@ -3716,7 +3716,7 @@ const char *FS_ReferencedPakChecksums( void ) {
 	for ( search = fs_searchpaths ; search ; search = search->next ) {
 		// is the element a pak file?
 		if ( search->pack ) {
-			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, strlen(BASEGAME))) {
+			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, com_basegame->string, strlen(com_basegame->string))) {
 				Q_strcat( info, sizeof( info ), va("%i ", search->pack->checksum ) );
 			}
 		}
@@ -3796,7 +3796,7 @@ const char *FS_ReferencedPakNames( void ) {
 			if (*info) {
 				Q_strcat(info, sizeof( info ), " " );
 			}
-			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, strlen(BASEGAME))) {
+			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, com_basegame->string, strlen(com_basegame->string))) {
 				Q_strcat( info, sizeof( info ), search->pack->pakGamename );
 				Q_strcat( info, sizeof( info ), "/" );
 				Q_strcat( info, sizeof( info ), search->pack->pakBasename );

From d85455e9ec9351c0ccc4abab9de0f3a342b5dbf3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 15 Nov 2024 21:00:20 +0100
Subject: [PATCH 1455/2040] Don't export referenced paks if download is
 disabled on the server

---
 code/server/sv_init.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 5e773850..fa8df088 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -875,12 +875,22 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 			Cvar_Set( "sv_paks", "" );
 			Cvar_Set( "sv_pakNames", "" );
 		}
-		// the server sends these to the clients so they can figure
-		// out which pk3s should be auto-downloaded
-		p = FS_ReferencedPakChecksums();
-		Cvar_Set( "sv_referencedPaks", p );
-		p = FS_ReferencedPakNames();
-		Cvar_Set( "sv_referencedPakNames", p );
+
+		if (sv_allowDownload->integer) {
+			// the server sends these to the clients so they can figure
+			// out which pk3s should be auto-downloaded
+			p = FS_ReferencedPakChecksums();
+			Cvar_Set("sv_referencedPaks", p);
+			p = FS_ReferencedPakNames();
+			Cvar_Set("sv_referencedPakNames", p);
+        }
+        else {
+            // Changed in OPM
+            //  Don't export the pak list if download is disabled
+
+			Cvar_Set("sv_referencedPaks", "");
+			Cvar_Set("sv_referencedPakNames", "");
+		}
 
 		// save systeminfo and serverinfo strings
 		Q_strncpyz( systemInfo, Cvar_InfoString_Big( CVAR_SYSTEMINFO ), sizeof( systemInfo ) );

From 5703161166e317bf3a62d597e30d1215150af8ad Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 00:18:55 +0100
Subject: [PATCH 1456/2040] Fix grenade dropping no ammo

This makes the weapon drop at least 1 ammo clip
---
 code/fgame/weapon.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 262355c4..62f6d822 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2372,23 +2372,27 @@ qboolean Weapon::Drop(void)
             int ammo;
 
             if (ammo_clip_size[FIRE_PRIMARY]) {
-                startammo[FIRE_PRIMARY] = g_dropclips->integer * ammo_in_clip[FIRE_PRIMARY];
+                // Fixed in OPM
+                //  Always drop at least 1 because of grenades
+                startammo[FIRE_PRIMARY] = g_dropclips->integer * Q_max(ammo_in_clip[FIRE_PRIMARY], 1);
             } else {
                 startammo[FIRE_PRIMARY] = g_dropclips->integer;
             }
 
-            ammo = AmmoAvailable(FIRE_PRIMARY);
+            // Fixed in OPM
+            //  Use the max between the available ammo and the ammo in clip
+            ammo = Q_max(AmmoAvailable(FIRE_PRIMARY), ammo_in_clip[FIRE_PRIMARY]);
             if (startammo[FIRE_PRIMARY] > ammo) {
                 startammo[FIRE_PRIMARY] = ammo;
             }
 
             if (ammo_clip_size[FIRE_SECONDARY]) {
-                startammo[FIRE_SECONDARY] = g_dropclips->integer * ammo_in_clip[FIRE_SECONDARY];
+                startammo[FIRE_SECONDARY] = g_dropclips->integer * Q_max(ammo_in_clip[FIRE_SECONDARY], 1);
             } else {
                 startammo[FIRE_SECONDARY] = g_dropclips->integer;
             }
 
-            ammo = AmmoAvailable(FIRE_SECONDARY);
+            ammo = Q_max(AmmoAvailable(FIRE_SECONDARY), ammo_in_clip[FIRE_SECONDARY]);
             if (startammo[FIRE_SECONDARY] > ammo) {
                 startammo[FIRE_SECONDARY] = ammo;
             }

From 735832829db005a9cfb164f985a71c7ff6fcd077 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 00:29:44 +0100
Subject: [PATCH 1457/2040] Don't drop the weapon if it has no ammo

---
 code/fgame/weapon.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 62f6d822..67cf8f9b 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2425,6 +2425,13 @@ qboolean Weapon::Drop(void)
         }
     }
 
+    if (!startammo[FIRE_PRIMARY] && !startammo[FIRE_SECONDARY]) {
+        // Fixed in OPM
+        //  Don't drop the weapon at all if it has no ammo
+        PostEvent(EV_Remove, 0);
+        return false;
+    }
+
     // Wait some time before the last owner can pickup this weapon
     last_owner              = owner;
     last_owner_trigger_time = level.time + 2.0f;

From 857d25825bca06e75edeb9d9ac0392860b4960af Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 16:57:59 +0100
Subject: [PATCH 1458/2040] Remove tmvolume like other commands when shutting
 down OpenAL

---
 code/client/snd_openal_new.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 4bab7eb6..ea764858 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -682,6 +682,8 @@ void S_OPENAL_Shutdown()
     Cmd_RemoveCommand("tmstart");
     Cmd_RemoveCommand("tmstartloop");
     Cmd_RemoveCommand("tmstop");
+    // Added in 2.0
+    Cmd_RemoveCommand("tmvolume");
 
     S_OPENAL_NukeContext();
 

From a0b80a9096c7c59f7aea5cfc6d44baa940c77583 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:17:19 +0100
Subject: [PATCH 1459/2040] Fix string not usable for targetname

---
 code/parser/bison_source.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index b586ff46..d583777d 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -295,7 +295,7 @@ identifier
 	;
 
 listener_identifier
-	: identifier_prim { $$ = node_listener($1, TOKPOS(@1)); }
+	: identifier { $$ = node_listener($1, TOKPOS(@1)); }
 	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
 	;
 

From 824cfd789cf9c50b045fd6bf804d11c80106626f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:19:45 +0100
Subject: [PATCH 1460/2040] Properly save and restore entity's children
 solidity

---
 code/fgame/VehicleSlot.cpp | 60 +++++++++++++++++++++++++++++++++-----
 code/fgame/VehicleSlot.h   | 11 +++++--
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/code/fgame/VehicleSlot.cpp b/code/fgame/VehicleSlot.cpp
index beed0f58..3454aa9f 100644
--- a/code/fgame/VehicleSlot.cpp
+++ b/code/fgame/VehicleSlot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,6 +31,8 @@ cVehicleSlot::cVehicleSlot()
     prev_takedamage = (damage_t)-1;
     prev_solid      = (solid_t)-1;
     prev_contents   = -1;
+
+    prev_num_children = 0;
 }
 
 void cVehicleSlot::NotSolid(void)
@@ -52,9 +54,19 @@ void cVehicleSlot::NotSolid(void)
 
     ent->takedamage = DAMAGE_NO;
 
+    prev_num_children = 0;
+
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
-        if (sub && !sub->IsSubclassOfWeapon()) {
+        // Fixed in OPM
+        //  Check for solidity
+        if (sub && !sub->IsSubclassOfWeapon() && sub->getSolidType() != SOLID_NOT) {
+            // Fixed in OPM
+            //  Save children solidity so it can properly be restored later
+            prev_children_ent[prev_num_children]   = sub;
+            prev_children_solid[prev_num_children] = (solid_t)sub->getSolidType();
+            prev_num_children++;
+
             sub->setSolidType(SOLID_NOT);
         }
     }
@@ -66,7 +78,7 @@ void cVehicleSlot::NotSolid(void)
 
 void cVehicleSlot::Solid(void)
 {
-    int i;
+    int i, j;
 
     if (!(flags & FL_SWIM)) {
         return;
@@ -86,12 +98,24 @@ void cVehicleSlot::Solid(void)
     prev_solid      = (solid_t)-1;
     prev_contents   = -1;
 
+    //
+    // Fixed in OPM
+    //  Restore children solidity
+    //
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
         if (sub && !sub->IsSubclassOfWeapon()) {
-            sub->setSolidType(SOLID_BBOX);
+            for (j = 0; j < prev_num_children; j++) {
+                if (prev_children_ent[j] == sub) {
+                    sub->setSolidType(prev_children_solid[j]);
+                }
+            }
+
+            //sub->setSolidType(SOLID_NOT);
         }
     }
+
+    prev_num_children = 0;
 }
 
 cTurretSlot::cTurretSlot()
@@ -135,9 +159,19 @@ void cTurretSlot::NotSolid(void)
         }
     }
 
+    prev_num_children = 0;
+
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
-        if (sub && !sub->IsSubclassOfWeapon()) {
+        // Fixed in OPM
+        //  Check for solidity
+        if (sub && !sub->IsSubclassOfWeapon() && sub->getSolidType() != SOLID_NOT) {
+            // Fixed in OPM
+            //  Save children solidity so it can properly be restored later
+            prev_children_ent[prev_num_children]   = sub;
+            prev_children_solid[prev_num_children] = (solid_t)sub->getSolidType();
+            prev_num_children++;
+
             sub->setSolidType(SOLID_NOT);
         }
     }
@@ -145,7 +179,7 @@ void cTurretSlot::NotSolid(void)
 
 void cTurretSlot::Solid(void)
 {
-    int i;
+    int i, j;
 
     if (!(flags & FL_SWIM)) {
         return;
@@ -176,10 +210,22 @@ void cTurretSlot::Solid(void)
         }
     }
 
+    //
+    // Fixed in OPM
+    //  Restore children solidity
+    //
     for (i = 0; i < ent->numchildren; i++) {
         Entity *sub = G_GetEntity(ent->children[i]);
         if (sub && !sub->IsSubclassOfWeapon()) {
-            sub->setSolidType(SOLID_BBOX);
+            for (j = 0; j < prev_num_children; j++) {
+                if (prev_children_ent[j] == sub) {
+                    sub->setSolidType(prev_children_solid[j]);
+                }
+            }
+
+            //sub->setSolidType(SOLID_NOT);
         }
     }
+
+    prev_num_children = 0;
 }
diff --git a/code/fgame/VehicleSlot.h b/code/fgame/VehicleSlot.h
index 48046321..509c3d31 100644
--- a/code/fgame/VehicleSlot.h
+++ b/code/fgame/VehicleSlot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -46,12 +46,19 @@ protected:
     solid_t  prev_solid;
     int      prev_contents;
 
+    //
+    // Added in OPM
+    //  Used for properly saving and restoring children solidity
+    Entity *prev_children_ent[MAX_MODEL_CHILDREN];
+    solid_t prev_children_solid[MAX_MODEL_CHILDREN];
+    int     prev_num_children;
+
 public:
     cVehicleSlot();
 
     virtual void NotSolid(void);
     virtual void Solid(void);
-    void         Archive(Archiver        &arc) override;
+    void         Archive(Archiver& arc) override;
 };
 
 inline void cVehicleSlot::Archive(Archiver& arc)

From b68bb4cee7cd888d2f6f6f0f2c99103729cec6f5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 19:09:46 +0100
Subject: [PATCH 1461/2040] Fix integer overflow in wait command that would
 cause infinite loop in stock scripts

It was causing a rare infinite loop in anim/stand.scr where it waits for 9999999 if the actor is unarmed and medic
---
 code/fgame/scriptthread.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 8b99f1ee..949620c8 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2711,12 +2711,17 @@ void ScriptThread::EventDelayThrow(Event *ev)
 
 void ScriptThread::EventWait(Event *ev)
 {
-    Wait((int)roundf(ev->GetFloat(1) * 1000.0f));
+    float timeSeconds;
+
+    // Fixed in OPM
+    //  Clamp to make sure to not overflow when converting to integer
+    timeSeconds = Q_clamp_float(ev->GetFloat(1), 0, 2000000);
+    Wait((int)roundf(timeSeconds * 1000));
 }
 
 void ScriptThread::EventWaitFrame(Event *ev)
 {
-    Wait((int)roundf(level.frametime * 1000.0f));
+    Wait((int)roundf(level.frametime * 1000));
 }
 
 void ScriptThread::EventResume(Event *ev)

From 8eded28efc91053534f51fbdd411083ad794eb05 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 19:22:01 +0100
Subject: [PATCH 1462/2040] Fix the typename in the error message for
 incompatible types

---
 code/script/scriptvariable.cpp | 63 +++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index b7d2c77a..ba90d573 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -1547,12 +1547,14 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
 
 void ScriptVariable::operator-=(const ScriptVariable& value)
 {
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '-' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '-' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
         );
 
         break;
@@ -1581,12 +1583,14 @@ void ScriptVariable::operator-=(const ScriptVariable& value)
 
 void ScriptVariable::operator*=(const ScriptVariable& value)
 {
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '*' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '*' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
         );
 
         break;
@@ -1631,12 +1635,14 @@ void ScriptVariable::operator*=(const ScriptVariable& value)
 
 void ScriptVariable::operator/=(const ScriptVariable& value)
 {
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '/' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '/' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
         );
 
         break;
@@ -1728,13 +1734,14 @@ void ScriptVariable::operator/=(const ScriptVariable& value)
 void ScriptVariable::operator%=(const ScriptVariable& value)
 {
     float mult = 0.0f;
+    int type = GetType();
 
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    switch (type + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '%%' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '%' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
         );
 
         break;
@@ -2245,15 +2252,13 @@ void ScriptVariable::complement(void)
 
 void ScriptVariable::greaterthan(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException(
-            "binary '>' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
-            typenames[variable.GetType()]
-        );
+        throw ScriptException("binary '>' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
 
         break;
 
@@ -2284,15 +2289,13 @@ void ScriptVariable::greaterthan(ScriptVariable& variable)
 
 void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException(
-            "binary '>=' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
-            typenames[variable.GetType()]
-        );
+        throw ScriptException("binary '>=' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
 
         break;
 
@@ -2323,15 +2326,13 @@ void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
 
 void ScriptVariable::lessthan(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException(
-            "binary '<' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
-            typenames[variable.GetType()]
-        );
+        throw ScriptException("binary '<' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
 
         break;
 
@@ -2362,15 +2363,13 @@ void ScriptVariable::lessthan(ScriptVariable& variable)
 
 void ScriptVariable::lessthanorequal(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int type = GetType();
+
+    switch (type + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException(
-            "binary '<=' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
-            typenames[variable.GetType()]
-        );
+        throw ScriptException("binary '<=' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
 
         break;
 

From e96a3f4f59fabbb5f46926fb7859c618a13cb584 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 19:27:48 +0100
Subject: [PATCH 1463/2040] Use c_str() instead of accessing m_data

c_str() will always return a valid string even if empty
---
 code/qcommon/str.h | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/code/qcommon/str.h b/code/qcommon/str.h
index 4eb80b15..1c367ec1 100644
--- a/code/qcommon/str.h
+++ b/code/qcommon/str.h
@@ -590,39 +590,30 @@ inline bool operator!=(const char *a, const str& b)
 
 inline int str::icmpn(const char *text, size_t n) const
 {
-    assert(m_data);
     assert(text);
 
-    return str::icmpn(m_data->data, text, n);
+    return str::icmpn(c_str(), text, n);
 }
 
 inline int str::icmpn(const str& text, size_t n) const
 {
-    assert(m_data);
-    assert(text.m_data);
-
-    return str::icmpn(m_data->data, text.m_data->data, n);
+    return str::icmpn(c_str(), text.c_str(), n);
 }
 
 inline int str::icmp(const char *text) const
 {
-    assert(m_data);
     assert(text);
 
-    return str::icmp(m_data->data, text);
+    return str::icmp(c_str(), text);
 }
 
 inline int str::icmp(const str& text) const
 {
-    assert(c_str());
-    assert(text.c_str());
-
     return str::icmp(c_str(), text.c_str());
 }
 
 inline int str::cmpn(const char *text, size_t n) const
 {
-    assert(c_str());
     assert(text);
 
     return str::cmpn(c_str(), text, n);
@@ -630,9 +621,6 @@ inline int str::cmpn(const char *text, size_t n) const
 
 inline int str::cmpn(const str& text, size_t n) const
 {
-    assert(c_str());
-    assert(text.c_str());
-
     return str::cmpn(c_str(), text.c_str(), n);
 }
 

From 2c4b5fc9bafc02dd30c7b6cf84e0f0fbc97db258 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 20:07:26 +0100
Subject: [PATCH 1464/2040] Rename the type variable to currentType so it
 doesn't take precedence over the type member

This fixes an issue where it was the type variable that was being set, rather than the type member
---
 code/script/scriptvariable.cpp | 157 +++++++++++++++++++--------------
 1 file changed, 91 insertions(+), 66 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index ba90d573..838f8ff1 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -289,7 +289,9 @@ void ScriptVariable::MakePrimitive()
     case VARIABLE_REF:
     case VARIABLE_CONTAINER:
     case VARIABLE_SAFECONTAINER:
-        Com_Error(ERR_DROP, "^~^~^ game.%s cannot be archived since it is of type '%s'.", getName().c_str(), GetTypeName());
+        Com_Error(
+            ERR_DROP, "^~^~^ game.%s cannot be archived since it is of type '%s'.", getName().c_str(), GetTypeName()
+        );
         Clear();
         break;
     }
@@ -594,7 +596,7 @@ void ScriptVariable::ClearPointerInternal() const
 
 const char *ScriptVariable::GetTypeName() const
 {
-    return typenames[type];
+    return typenames[GetType()];
 }
 
 variabletype ScriptVariable::GetType() const
@@ -900,23 +902,23 @@ void ScriptVariable::SetKey(const short3& key)
 
 #endif
 
-Entity* ScriptVariable::entityValue(void)
+Entity *ScriptVariable::entityValue(void)
 {
 #if defined(GAME_DLL)
-    Entity* ent;
+    Entity *ent;
 
     switch (type) {
     case VARIABLE_CONSTSTRING:
-        ent = static_cast<Entity*>(world->GetScriptTarget(Director.GetString(m_data.intValue)));
+        ent = static_cast<Entity *>(world->GetScriptTarget(Director.GetString(m_data.intValue)));
         break;
     case VARIABLE_STRING:
-        ent = static_cast<Entity*>(world->GetScriptTarget(stringValue()));
+        ent = static_cast<Entity *>(world->GetScriptTarget(stringValue()));
         break;
     case VARIABLE_LISTENER:
-        ent = static_cast<Entity*>(m_data.listenerValue->Pointer());
+        ent = static_cast<Entity *>(m_data.listenerValue->Pointer());
         break;
     default:
-        throw ScriptException("Cannot cast '%s' to entity", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to entity", typenames[GetType()]);
     }
 
     if (ent && !ent->isSubclassOf(Entity)) {
@@ -1040,7 +1042,7 @@ float ScriptVariable::floatValue(void) const
         return val;
 
     default:
-        throw ScriptException("Cannot cast '%s' to float", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to float", typenames[GetType()]);
     }
 }
 
@@ -1064,7 +1066,7 @@ int ScriptVariable::intValue(void) const
         return val;
 
     default:
-        throw ScriptException("Cannot cast '%s' to int", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to int", typenames[GetType()]);
     }
 }
 
@@ -1083,7 +1085,7 @@ Listener *ScriptVariable::listenerValue(void) const
         return (Listener *)m_data.listenerValue->Pointer();
 
     default:
-        throw ScriptException("Cannot cast '%s' to listener", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to listener", typenames[GetType()]);
     }
 
     return NULL;
@@ -1103,7 +1105,7 @@ Listener *ScriptVariable::listenerAt(uintptr_t index) const
         return (*m_data.safeContainerValue)->ObjectAt(index);
 
     default:
-        throw ScriptException("Cannot cast '%s' to listener", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to listener", typenames[GetType()]);
     }
 }
 
@@ -1472,14 +1474,14 @@ void ScriptVariable::setVectorValue(const Vector& newvector)
 
 void ScriptVariable::operator+=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '+' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '+' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1533,9 +1535,10 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
     case VARIABLE_STRING
         + VARIABLE_LISTENER *VARIABLE_MAX: // ( string )			+		( listener )
     case VARIABLE_CONSTSTRING
-        + VARIABLE_LISTENER                     *VARIABLE_MAX: // ( const string )		+		( listener )
-    case VARIABLE_STRING + VARIABLE_VECTOR      *VARIABLE_MAX: // ( string )			+		( vector )
-    case VARIABLE_CONSTSTRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		+		( vector )
+        + VARIABLE_LISTENER                *VARIABLE_MAX: // ( const string )		+		( listener )
+    case VARIABLE_STRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( string )			+		( vector )
+    case VARIABLE_CONSTSTRING
+        + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		+		( vector )
         setStringValue(stringValue() + value.stringValue());
         break;
 
@@ -1547,14 +1550,14 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
 
 void ScriptVariable::operator-=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '-' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '-' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1583,14 +1586,14 @@ void ScriptVariable::operator-=(const ScriptVariable& value)
 
 void ScriptVariable::operator*=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '*' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '*' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1635,14 +1638,14 @@ void ScriptVariable::operator*=(const ScriptVariable& value)
 
 void ScriptVariable::operator/=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '/' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '/' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1733,15 +1736,15 @@ void ScriptVariable::operator/=(const ScriptVariable& value)
 
 void ScriptVariable::operator%=(const ScriptVariable& value)
 {
-    float mult = 0.0f;
-    int type = GetType();
+    float mult        = 0.0f;
+    int   currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '%' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '%' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1847,14 +1850,14 @@ void ScriptVariable::operator%=(const ScriptVariable& value)
 
 void ScriptVariable::operator&=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '&' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '&' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1867,14 +1870,14 @@ void ScriptVariable::operator&=(const ScriptVariable& value)
 
 void ScriptVariable::operator^=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '^' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '^' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1887,14 +1890,14 @@ void ScriptVariable::operator^=(const ScriptVariable& value)
 
 void ScriptVariable::operator|=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '|' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '|' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1907,14 +1910,16 @@ void ScriptVariable::operator|=(const ScriptVariable& value)
 
 void ScriptVariable::operator<<=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '<<' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '<<' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[value.GetType()]
         );
 
         break;
@@ -1927,14 +1932,16 @@ void ScriptVariable::operator<<=(const ScriptVariable& value)
 
 void ScriptVariable::operator>>=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '>>' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '>>' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[value.GetType()]
         );
 
         break;
@@ -1952,9 +1959,9 @@ bool ScriptVariable::operator!=(const ScriptVariable& value)
 
 bool ScriptVariable::operator==(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default: // ( lval )	==	( nil )
              // ( nil )	==	( rval )
         Clear();
@@ -2000,8 +2007,9 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
         + VARIABLE_STRING                 *VARIABLE_MAX: // ( int )				==		( string )
     case VARIABLE_FLOAT + VARIABLE_STRING *VARIABLE_MAX: // ( float )			==		( string )
     case VARIABLE_CHAR
-        + VARIABLE_STRING                       *VARIABLE_MAX: // ( char )				==		( string )
-    case VARIABLE_CONSTSTRING + VARIABLE_STRING *VARIABLE_MAX: // ( const string )		==		( string )
+        + VARIABLE_STRING *VARIABLE_MAX: // ( char )				==		( string )
+    case VARIABLE_CONSTSTRING
+        + VARIABLE_STRING *VARIABLE_MAX: // ( const string )		==		( string )
     case VARIABLE_LISTENER
         + VARIABLE_STRING                  *VARIABLE_MAX: // ( listener )			==		( string )
     case VARIABLE_VECTOR + VARIABLE_STRING *VARIABLE_MAX: // ( vector )			==		( string )
@@ -2025,9 +2033,10 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
     case VARIABLE_CONSTSTRING + VARIABLE_CHAR    *VARIABLE_MAX: // ( const string )		==		( char )
     case VARIABLE_STRING + VARIABLE_LISTENER     *VARIABLE_MAX: // ( string )			==		( listener )
     case VARIABLE_CONSTSTRING
-        + VARIABLE_LISTENER                     *VARIABLE_MAX: // ( const string )		==		( listener )
-    case VARIABLE_STRING + VARIABLE_VECTOR      *VARIABLE_MAX: // ( string )			==		( vector )
-    case VARIABLE_CONSTSTRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		==		( vector )
+        + VARIABLE_LISTENER                *VARIABLE_MAX: // ( const string )		==		( listener )
+    case VARIABLE_STRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( string )			==		( vector )
+    case VARIABLE_CONSTSTRING
+        + VARIABLE_VECTOR *VARIABLE_MAX: // ( const string )		==		( vector )
         {
             str lval = stringValue();
             str rval = value.stringValue();
@@ -2252,13 +2261,17 @@ void ScriptVariable::complement(void)
 
 void ScriptVariable::greaterthan(ScriptVariable& variable)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + variable.GetType() * VARIABLE_MAX) {
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException("binary '>' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
+        throw ScriptException(
+            "binary '>' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[variable.GetType()]
+        );
 
         break;
 
@@ -2289,13 +2302,17 @@ void ScriptVariable::greaterthan(ScriptVariable& variable)
 
 void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + variable.GetType() * VARIABLE_MAX) {
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException("binary '>=' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
+        throw ScriptException(
+            "binary '>=' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[variable.GetType()]
+        );
 
         break;
 
@@ -2326,13 +2343,17 @@ void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
 
 void ScriptVariable::lessthan(ScriptVariable& variable)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + variable.GetType() * VARIABLE_MAX) {
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException("binary '<' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
+        throw ScriptException(
+            "binary '<' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[variable.GetType()]
+        );
 
         break;
 
@@ -2363,13 +2384,17 @@ void ScriptVariable::lessthan(ScriptVariable& variable)
 
 void ScriptVariable::lessthanorequal(ScriptVariable& variable)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + variable.GetType() * VARIABLE_MAX) {
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
-        throw ScriptException("binary '<=' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
+        throw ScriptException(
+            "binary '<=' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[variable.GetType()]
+        );
 
         break;
 

From b007842fb4a0c6b89890ada74ad98677017da39e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 21:32:53 +0100
Subject: [PATCH 1465/2040] Fix pure checksums not matching the server

---
 code/client/cl_main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 5a6ec07b..81f414a4 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1502,7 +1502,6 @@ void CL_SendPureChecksums( void ) {
 	// "cp"
 	// "Yf"
 	Com_sprintf(cMsg, sizeof(cMsg), "Yf ");
-	Q_strcat(cMsg, sizeof(cMsg), va("%d ", cl.serverId) );
 	Q_strcat(cMsg, sizeof(cMsg), pChecksums);
 	for (i = 0; i < 2; i++) {
 		cMsg[i] += '\n';

From 67d8cad64d297824b42a789d2d61777f6a6db14f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 21:34:19 +0100
Subject: [PATCH 1466/2040] Allow sound files from OS disk in pure mode

---
 code/qcommon/files.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 77f17585..57ff3a5e 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -1494,7 +1494,11 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_
 			   !FS_IsExt(filename, ".menu", len) &&		// menu files
 			   !FS_IsExt(filename, ".game", len) &&		// menu files
 			   !FS_IsExt(filename, ".dat", len) &&		// for journal files
-			   !FS_IsDemoExt(filename, len))			// demos
+			   !FS_IsExt(filename, ".wav", len) &&		// sound files
+			   !FS_IsExt(filename, ".mp3", len) &&		// sound files
+			   !FS_IsExt(filename, ".ogg", len) &&		// sound files
+			   !FS_IsDemoExt(filename, len)			// demos
+				)
 			{
 				*file = 0;
 				return -1;

From a7dc8b3493979a2193fe7dac4f4544052837eea9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 21:36:49 +0100
Subject: [PATCH 1467/2040] Don't archive r_fastsky variable

This prevents this setting to be altered by mods forever
---
 code/renderer/tr_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 71c1eaf1..c2c2498a 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -1332,7 +1332,7 @@ void R_Register( void )
 	r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT );
 	AssertCvarRange( r_znear, 0.001f, 200, qtrue );
 	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
-	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE );
+	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", 0 );
 	r_fastdlights = ri.Cvar_Get("r_fastdlights", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE );
 	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );

From ffdfbc3c7d5c1ca66676f0059012a27b2687598e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 21:57:12 +0100
Subject: [PATCH 1468/2040] Fix the bullet stopping after the first entity

---
 code/fgame/weaputils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 98f00421..aa9115d6 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2455,9 +2455,10 @@ float BulletAttack(
                     trace.fraction = 1;
                 }
 
-                vDeltaTrace = vTmpEnd - vTraceStart;
+                vDeltaTrace = vTraceStart - vTmpEnd;
                 if (!bBulletDone && DotProduct(vDeltaTrace, vDir) < 0) {
                     // Fixed in OPM
+                    //  Make sure the new trace doesn't start behind the end
                     //  This can happen in rare circumstances if the trace is out of the world limit
                     break;
                 }

From 598110477efae45c6cf67f77754842a38cd77151 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 16 Nov 2024 22:35:55 +0100
Subject: [PATCH 1469/2040] Archive the `m_bAlwaysAway` variable

---
 code/fgame/doors.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/fgame/doors.h b/code/fgame/doors.h
index 452b89d5..588028d5 100644
--- a/code/fgame/doors.h
+++ b/code/fgame/doors.h
@@ -150,8 +150,9 @@ inline void Door::Archive(Archiver& arc)
     arc.ArchiveInteger(&trigger);
     arc.ArchiveInteger(&nextdoor);
     arc.ArchiveSafePointer(&master);
-    arc.ArchiveBoolean(&locked);
     arc.ArchiveFloat(&next_locked_time);
+    arc.ArchiveBoolean(&locked);
+    arc.ArchiveBool(&m_bAlwaysAway);
 }
 
 class RotatingDoor : public Door

From 880acf9120a04826e978ef1812fe7a50a12d40c8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:28:00 +0100
Subject: [PATCH 1470/2040] Make com_target_game and com_target_demo
 write-protected (can only be set at startup)

---
 code/qcommon/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 937f7420..b125c4fa 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1655,8 +1655,8 @@ void Com_Init( char *commandLine ) {
 	// done early so bind command exists
 	CL_InitKeyCommands();
 
-	com_target_game = Cvar_Get("com_target_game", "0", CVAR_LATCH | CVAR_PROTECTED);
-	com_target_demo = Cvar_Get("com_target_demo", "0", CVAR_LATCH | CVAR_PROTECTED);
+	com_target_game = Cvar_Get("com_target_game", "0", CVAR_INIT|CVAR_PROTECTED);
+	com_target_demo = Cvar_Get("com_target_demo", "0", CVAR_INIT|CVAR_PROTECTED);
 	com_target_version = Cvar_Get("com_target_version", "0.00", CVAR_ROM);
 	com_standalone = Cvar_Get("com_standalone", "0", CVAR_ROM);
 	com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);

From 23f776d3c79ac56c9cf60010fcd0c15fbc31c37c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:32:44 +0100
Subject: [PATCH 1471/2040] Fix typo

---
 code/tiki/tiki_parse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 4e557ff7..1b977811 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -1044,7 +1044,7 @@ qboolean TIKI_ParseSetup(dloaddef_t *ld)
             if (*token != '/' && *token != '\\') {
                 Q_strcat(ld->tikiFile.currentScript->path, sizeof(ld->tikiFile.currentScript->path), "/");
             }
-        } else if (!Q_stricmp(token, "orgin")) {
+        } else if (!Q_stricmp(token, "origin")) {
             tmpVec[0] = ld->tikiFile.GetFloat(false);
             tmpVec[1] = ld->tikiFile.GetFloat(false);
             tmpVec[2] = ld->tikiFile.GetFloat(false);

From 80ddba1013365cdb131ff7373e163a6df2c7050b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:36:19 +0100
Subject: [PATCH 1472/2040] Fix constant string for "officer" disguise type

This fixes the officer think not working at all
---
 code/fgame/scriptmaster.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 10e0ac26..2ba03830 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -346,7 +346,7 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/fullbody.scr",
     "salute",
     "sentry",
-    "officier",
+    "officer",
     "rover",
     "none",
     "machinegunner",

From b0b82f0252f5922369263d1f6b32f4f66b95e182 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:36:45 +0100
Subject: [PATCH 1473/2040] Fix incorrect start trace for Actor::DontFaceWall()

This fixes AI not turning from wall
---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index cfbae72e..a73185d9 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -11606,7 +11606,7 @@ void Actor::DontFaceWall(void)
     start.y -= origin.y;
     fEyeRadius = VectorLength2D(start);
     start.x    = origin.x + fEyeRadius * fCosAngle;
-    start.y    = origin.x + fEyeRadius * fSinAngle;
+    start.y    = origin.y + fEyeRadius * fSinAngle;
     end.x      = start.x + fCosAngle * 64;
     end.y      = start.y + fSinAngle * 64;
     end.z      = start.z;

From 989ec9574c8499b02e74fae55d962414cc76d9b1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:46:21 +0100
Subject: [PATCH 1474/2040] Fix too high farVal for glDepthRange

---
 code/renderer/tr_backend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index 905ad9ae..e93f0731 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -802,7 +802,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 				if ( depthRange ) {
 					qglDepthRange (0, 0.3);
 				} else {
-					qglDepthRange (0, 1.875);
+					qglDepthRange (0, 1.0);
 				}
 				oldDepthRange = depthRange;
 			}

From cea0d95fee5177be80b4dd23f2b4e6c41c38a934 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:12:36 +0100
Subject: [PATCH 1475/2040] Set the pitch to default when setting a new SFX

This fixes channels having an incorrect pitch when starting the sound under some circumstances
---
 code/client/snd_openal_new.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index ea764858..5f704c68 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -3006,6 +3006,9 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
     qalSourcei(source, AL_BUFFER, pSfx->buffer);
     alDieIfError();
 
+    qalSourcef(source, AL_PITCH, 1.0);
+    alDieIfError();
+
     // Get the base frequency
     qalGetBufferi(pSfx->buffer, AL_FREQUENCY, &freq);
     alDieIfError();

From 16711a33ef34819753b5b61bc53e7a58eea43b52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:02:35 +0100
Subject: [PATCH 1476/2040] Fix bulletthroughwood and bulletthroughmetal not
 being archived correctly

This caused issues on some single-player maps where bullet would go through walls
---
 code/fgame/weapon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index 520b7ceb..47da68c6 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -535,8 +535,8 @@ inline void Weapon::Archive(Archiver& arc)
     arc.ArchiveFloat(&bulletknockback[0]);
     arc.ArchiveFloat(&bulletknockback[1]);
     arc.ArchiveFloat(&bulletthroughwood[0]);
-    arc.ArchiveFloat(&bulletthroughwood[0]);
-    arc.ArchiveFloat(&bulletthroughmetal[1]);
+    arc.ArchiveFloat(&bulletthroughwood[1]);
+    arc.ArchiveFloat(&bulletthroughmetal[0]);
     arc.ArchiveFloat(&bulletthroughmetal[1]);
     arc.ArchiveFloat(&projectilespeed[0]);
     arc.ArchiveFloat(&projectilespeed[1]);

From 2342f08a7994db01b732eea17af70a4a53027fe5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:02:57 +0100
Subject: [PATCH 1477/2040] Print the new damage when g_showbullettrace is
 turned on

---
 code/fgame/weaputils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index aa9115d6..e4cdfd1f 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2264,6 +2264,11 @@ float BulletAttack(
                     }
 
                     newdamage -= damage * bulletdist * throughThingFrac;
+
+                    if (g_showbullettrace->integer) {
+                        gi.Printf("%.2f\n", newdamage);
+                    }
+                    
                     if (newdamage < 1.f) {
                         vTmpEnd        = vTraceStart + vDir * -4;
                         trace.fraction = 1.f;

From 154464cda10603ad8faa3d27835813fdc061d915 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:26:00 +0100
Subject: [PATCH 1478/2040] Set the server huddraw elements on single-player
 mode

This fixes huddraw elements not being archived properly when the map starts
---
 code/fgame/g_public.h  |  2 +-
 code/fgame/huddraw.cpp | 53 +++++++++++++++++++++++++++---------------
 code/server/server.h   |  2 +-
 code/server/sv_ccmds.c |  2 +-
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 2729efaa..a821de17 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -470,7 +470,7 @@ typedef struct gameImport_s {
     void (*Key_GetKeysForCommand)(const char *command, int *key1, int *key2);
     void (*ArchiveLevel)(qboolean loading);
     void (*AddSvsTimeFixup)(int *piTime);
-    void (*HudDrawShader)(int info, char *name);
+    void (*HudDrawShader)(int info, const char *name);
     void (*HudDrawAlign)(int info, int horizontalAlign, int verticalAlign);
     void (*HudDrawRect)(int info, int x, int y, int width, int height);
     void (*HudDrawVirtualSize)(int info, qboolean virtualScreen);
diff --git a/code/fgame/huddraw.cpp b/code/fgame/huddraw.cpp
index 2340c8a3..79784439 100644
--- a/code/fgame/huddraw.cpp
+++ b/code/fgame/huddraw.cpp
@@ -45,7 +45,11 @@ void HudDrawShader( int info, const char *name )
 	gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_SHADER));
 	HudWriteNumber( info );		// c = info
 	gi.MSG_WriteString(name);		// s = name (shader_name)
-	gi.MSG_EndCGM();
+    gi.MSG_EndCGM();
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawShader(info, name);
+    }
 }
 
 void HudDrawAlign( int info, int horizontalAlign, int verticalAlign )
@@ -65,6 +69,10 @@ void HudDrawAlign( int info, int horizontalAlign, int verticalAlign )
 	
 	gi.MSG_EndCGM();
 	
+	if (g_gametype->integer == GT_SINGLE_PLAYER) {
+		gi.HudDrawAlign(info, horizontalAlign, verticalAlign);
+	}
+	
 }
 
 void HudDrawRect(int info, int x, int y, int width, int height)
@@ -77,7 +85,10 @@ void HudDrawRect(int info, int x, int y, int width, int height)
 	gi.MSG_WriteShort(width);		// c = probably "width"
 	gi.MSG_WriteShort(height);		// c = probably "height"
 	gi.MSG_EndCGM();
-	
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawRect(info, x, y, width, height);
+    }
 }
 
 void HudDrawVirtualSize(int info, int virtualScreen)
@@ -85,20 +96,7 @@ void HudDrawVirtualSize(int info, int virtualScreen)
 	gi.SetBroadcastAll();
 	gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_VIRTUALSIZE));
 	HudWriteNumber( info );					// c = info
-	
-	/*__asm
-	{
-		pushad
-		pushfd
-		mov eax, virtualScreen
-		NEG eax
-		SBB eax, eax
-		NEG eax
-		mov virtualScreen, eax
-		popfd
-		popad
-	}*/
-	
+
 	gi.MSG_WriteBits(!!virtualScreen, 1);	// value = ?	bits = 1
 											// value = esi
 											// esi = virtualScreen
@@ -108,7 +106,10 @@ void HudDrawVirtualSize(int info, int virtualScreen)
 											// call
 	
 	gi.MSG_EndCGM();
-	
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawVirtualSize(info, virtualScreen);
+    }
 }
 
 void HudDrawColor(int info, float *color)
@@ -125,7 +126,11 @@ void HudDrawColor(int info, float *color)
 	gi.MSG_WriteByte(temp[0]);		// c = color[2]		
 	gi.MSG_WriteByte(temp[1]);		// c = color[1]		 - Values can be messed up. To be tested.
 	gi.MSG_WriteByte(temp[2]);		// c = color[3]		/
-	gi.MSG_EndCGM();
+    gi.MSG_EndCGM();
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawColor(info, color);
+    }
 
 	// Note: Each float value is multiplied by 255.0 and converted to long using ftol function, thats why it's using WriteByte
 }
@@ -141,6 +146,10 @@ void HudDrawAlpha(int info, float alpha)
 	gi.MSG_WriteByte(temp);		// c = alpha
 	gi.MSG_EndCGM();
 	
+	if (g_gametype->integer == GT_SINGLE_PLAYER) {
+		gi.HudDrawAlpha(info, alpha);
+	}
+
 	// Note: alpha is multiplied by 255.0 and converted to long using ftol function
 	
 }
@@ -153,6 +162,9 @@ void HudDrawString(int info, const char *string)
 	gi.MSG_WriteString(string);	// s = string (to show)
 	gi.MSG_EndCGM();
 
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawString(info, string);
+    }
 }
 
 void HudDrawFont(int info, const char *fontName)
@@ -162,7 +174,10 @@ void HudDrawFont(int info, const char *fontName)
 	HudWriteNumber( info );			// c = info
 	gi.MSG_WriteString(fontName);	// s = fontName (to use)
 	gi.MSG_EndCGM();
-	
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawFont(info, fontName);
+    }
 }
 
 void HudDraw3d( int index, vec3_t vector, int ent_num, qboolean bAlwaysShow, qboolean depth )
diff --git a/code/server/server.h b/code/server/server.h
index d14b2ca2..9ef4134c 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -437,7 +437,7 @@ void SV_MasterShutdown (void);
 int SV_RateMsec(client_t *client);
 
 void SV_ArchiveHudDrawElements( qboolean loading );
-void SV_HudDrawShader( int iInfo, char *name );
+void SV_HudDrawShader( int iInfo, const char *name );
 void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign );
 void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight );
 void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen );
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 48fcea36..2427f692 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1922,7 +1922,7 @@ void SV_ArchiveHudDrawElements(qboolean loading)
 SV_HudDrawShader
 ==================
 */
-void SV_HudDrawShader(int iInfo, char *name)
+void SV_HudDrawShader(int iInfo, const char *name)
 {
 #ifndef DEDICATED
 	Q_strncpyz(cls.HudDrawElements[iInfo].shaderName, name, sizeof(cls.HudDrawElements[iInfo].shaderName));

From 5819145af8b7f521c82b10c39804679ce37a2d55 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:46:21 +0100
Subject: [PATCH 1479/2040] Synchronize the entity time with the channel time
 when loading

This prevents the channel from stopping immediately during respatialization, the entity time may be updated quite some time after loading
---
 code/client/snd_openal_new.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 5f704c68..0af35c97 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2659,6 +2659,10 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
     } else {
         pChannel->iFlags |= CHANNEL_FLAG_PLAY_DEFERRED;
     }
+
+    if (pChannel->iEntNum != ENTITYNUM_NONE) {
+        s_entity[pChannel->iEntNum].time = pChannel->iTime;
+    }
 }
 
 /*

From 953091cdc8e3f1a6f634f86045863dcfd5a6479c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:11:59 +0100
Subject: [PATCH 1480/2040] Move and rename macros to snd_local_new.h

---
 code/client/snd_local_new.h    |  18 ++++-
 code/client/snd_openal_new.cpp | 120 ++++++++++++++++-----------------
 code/client/snd_openal_new.h   |  28 ++------
 3 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index 02431e20..d20efcfb 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -36,6 +36,22 @@ extern cvar_t *s_separation;
 extern cvar_t *s_musicVolume;
 extern cvar_t *s_ambientVolume;
 
+#define MAX_SOUNDSYSTEM_CHANNELS_3D        32
+#define MAX_SOUNDSYSTEM_CHANNELS_2D        32
+#define MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM 32
+#define MAX_SOUNDSYSTEM_POSITION_CHANNELS  (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM)
+#define MAX_SOUNDSYSTEM_SONGS              2
+#define MAX_SOUNDSYSTEM_MISC_CHANNELS      3
+#define MAX_SOUNDSYSTEM_CHANNELS                                                                             \
+    (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + MAX_SOUNDSYSTEM_SONGS \
+     + MAX_SOUNDSYSTEM_MISC_CHANNELS)
+#define MAX_SOUNDSYSTEM_LOOP_SOUNDS 64
+
+#define SOUNDSYSTEM_CHANNEL_MP3_ID \
+    (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + MAX_SOUNDSYSTEM_SONGS)
+#define SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID (SOUNDSYSTEM_CHANNEL_MP3_ID + 1)
+#define SOUNDSYSTEM_CHANNEL_MOVIE_ID         (SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID + 1)
+
 typedef struct {
     int   format;
     float rate;
@@ -134,7 +150,7 @@ typedef struct {
 } channelbasesavegame_t;
 
 typedef struct {
-    channelbasesavegame_t Channels[96];
+    channelbasesavegame_t Channels[MAX_SOUNDSYSTEM_CHANNELS];
 } soundsystemsavegame_t;
 
 enum channel_flags_t {
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 0af35c97..121670f7 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -227,7 +227,7 @@ static void S_OPENAL_NukeContext()
 
     Com_Printf("OpenAL: Destroying channels...\n");
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS; ++i) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS; ++i) {
         S_OPENAL_NukeChannel(openal.channel[i]);
     }
 
@@ -541,11 +541,11 @@ qboolean S_OPENAL_Init()
         return qtrue;
     }
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS; i++) {
         openal.channel[i] = NULL;
     }
 
-    for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_LOOP_SOUNDS; i++) {
         openal.loop_sounds[i] = {};
     }
 
@@ -599,42 +599,42 @@ qboolean S_OPENAL_Init()
     qalListenerf(AL_GAIN, al_current_volume);
     alDieIfError();
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS_3D; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_3D; i++) {
         if (!S_OPENAL_InitChannel(i, &openal.chan_3D[i])) {
             return false;
         }
     }
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS_2D; i++) {
-        if (!S_OPENAL_InitChannel(i + MAX_OPENAL_CHANNELS_3D, &openal.chan_2D[i])) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D; i++) {
+        if (!S_OPENAL_InitChannel(i + MAX_SOUNDSYSTEM_CHANNELS_3D, &openal.chan_2D[i])) {
             return false;
         }
     }
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS_2D_STREAM; i++) {
-        if (!S_OPENAL_InitChannel(i + MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D, &openal.chan_2D_stream[i])) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM; i++) {
+        if (!S_OPENAL_InitChannel(i + MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D, &openal.chan_2D_stream[i])) {
             return false;
         }
     }
 
-    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
         if (!S_OPENAL_InitChannel(
-                i + MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM,
+                i + MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM,
                 &openal.chan_song[i]
             )) {
             return false;
         }
     }
 
-    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_MP3_ID, &openal.chan_mp3)) {
+    if (!S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_MP3_ID, &openal.chan_mp3)) {
         return false;
     }
 
-    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music)) {
+    if (!S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music)) {
         return false;
     }
 
-    if (!S_OPENAL_InitChannel(OPENAL_CHANNEL_MOVIE_ID, &openal.chan_movie)) {
+    if (!S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_MOVIE_ID, &openal.chan_movie)) {
         return false;
     }
 
@@ -811,23 +811,23 @@ void S_DumpInfo()
 {
     int i;
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS_3D; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_3D; i++) {
         S_DumpStatus("3D", i, openal.channel[i]);
     }
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS_2D; i++) {
-        S_DumpStatus("2D", i, openal.channel[MAX_OPENAL_CHANNELS_3D + i]);
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D; i++) {
+        S_DumpStatus("2D", i, openal.channel[MAX_SOUNDSYSTEM_CHANNELS_3D + i]);
     }
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS_2D_STREAM; i++) {
-        S_DumpStatus("2D stream", i, openal.channel[MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + i]);
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM; i++) {
+        S_DumpStatus("2D stream", i, openal.channel[MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + i]);
     }
 
-    for (i = 0; i < MAX_OPENAL_MISC_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_MISC_CHANNELS; i++) {
         S_DumpStatus(
             "Misc",
             i,
-            openal.channel[MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + i]
+            openal.channel[MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + i]
         );
     }
 }
@@ -942,7 +942,7 @@ void MUSIC_Pause()
 {
     int i;
 
-    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
         openal.chan_song[i].pause();
     }
 }
@@ -956,7 +956,7 @@ void MUSIC_Unpause()
 {
     int i;
 
-    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
         if (openal.chan_song[i].is_paused()) {
             openal.chan_song[i].play();
         }
@@ -978,7 +978,7 @@ void S_PauseSound()
 
     s_bSoundPaused = true;
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (!pChannel) {
             continue;
@@ -1016,7 +1016,7 @@ void S_UnpauseSound()
         return;
     }
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (!pChannel) {
             continue;
@@ -1054,7 +1054,7 @@ static qboolean S_OPENAL_ShouldPlay(sfx_t *pSfx)
 
     iRemainingTimesToPlay = sfx_infos[pSfx->sfx_info_index].max_number_playing;
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (!pChannel) {
             continue;
@@ -1142,7 +1142,7 @@ static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChan
             }
 
             if (!bStoppedChannel) {
-                for (i = iLastChannel + 1; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+                for (i = iLastChannel + 1; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
                     pChannel = openal.channel[i];
                     if (!pChannel || pChannel->is_free()) {
                         continue;
@@ -1192,7 +1192,7 @@ S_OPENAL_PickChannel3D
 */
 static int S_OPENAL_PickChannel3D(int iEntNum, int iEntChannel)
 {
-    return S_OPENAL_PickChannelBase(iEntNum, iEntChannel, 0, MAX_OPENAL_CHANNELS_3D - 1);
+    return S_OPENAL_PickChannelBase(iEntNum, iEntChannel, 0, MAX_SOUNDSYSTEM_CHANNELS_3D - 1);
 }
 
 /*
@@ -1203,7 +1203,7 @@ S_OPENAL_PickChannel2D
 static int S_OPENAL_PickChannel2D(int iEntNum, int iEntChannel)
 {
     return S_OPENAL_PickChannelBase(
-        iEntNum, iEntChannel, MAX_OPENAL_CHANNELS_3D, MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D - 1
+        iEntNum, iEntChannel, MAX_SOUNDSYSTEM_CHANNELS_3D, MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D - 1
     );
 }
 
@@ -1217,8 +1217,8 @@ static int S_OPENAL_PickChannel2DStreamed(int iEntNum, int iEntChannel)
     return S_OPENAL_PickChannelBase(
         iEntNum,
         iEntChannel,
-        MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D,
-        MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM - 1
+        MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D,
+        MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM - 1
     );
 }
 
@@ -1347,7 +1347,7 @@ static void S_OPENAL_Start2DSound(
     pChannel->iStartTime = cl.serverTime;
     pChannel->iEndTime   = (int)(cl.serverTime + pSfx->time_length + 250.f);
 
-    if (iFreeChannel > MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D) {
+    if (iFreeChannel > MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D) {
         // streamed
         if (!pChannel->set_sfx(pSfx)) {
             Com_DPrintf("OpenAL: Set stream error - %s\n", pSfx->name);
@@ -1585,7 +1585,7 @@ void S_OPENAL_AddLoopingSound(
         return;
     }
 
-    for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+    for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
         pLoopSound = &openal.loop_sounds[i];
         if (pLoopSound->pSfx == pSfx && !pLoopSound->bInUse) {
             iFreeLoopSound = i;
@@ -1594,7 +1594,7 @@ void S_OPENAL_AddLoopingSound(
     }
 
     if (iFreeLoopSound < 0) {
-        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
             pLoopSound = &openal.loop_sounds[i];
             if (!pLoopSound->pSfx && !pLoopSound->bInUse) {
                 iFreeLoopSound       = i;
@@ -1626,7 +1626,7 @@ void S_OPENAL_AddLoopingSound(
     pLoopSound->bCombine    = VectorCompare(vVelocity, vec_zero) == 0;
 
     if (pLoopSound->bCombine) {
-        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
             if (openal.loop_sounds[i].pSfx == pSfx && openal.loop_sounds[i].bInUse) {
                 pLoopSound->iStartTime = openal.loop_sounds[i].iStartTime;
                 if (openal.loop_sounds[i].bPlaying) {
@@ -1655,7 +1655,7 @@ void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
     bMayStop = true;
 
     if (pLoopSound->bCombine) {
-        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
             if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx && openal.loop_sounds[i].bInUse) {
                 bMayStop = false;
                 break;
@@ -1678,7 +1678,7 @@ void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
     pLoopSound->bPlaying = false;
 
     if (pLoopSound->bCombine) {
-        for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
             if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx) {
                 openal.loop_sounds[i].bPlaying = false;
                 openal.loop_sounds[i].pSfx     = NULL;
@@ -1696,7 +1696,7 @@ void S_OPENAL_ClearLoopingSounds()
 {
     int i;
 
-    for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+    for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
         openal.loop_sounds[i].bInUse = false;
     }
 }
@@ -1710,7 +1710,7 @@ void S_OPENAL_StopLoopingSounds()
 {
     int i;
 
-    for (i = 0; i < (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D); i++) {
+    for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
         openal.loop_sounds[i].bInUse = false;
         S_OPENAL_StopLoopingSound(&openal.loop_sounds[i]);
     }
@@ -1725,7 +1725,7 @@ void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
 {
     int i;
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (!pChannel->is_free() && pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
             pChannel->end_sample();
@@ -1749,7 +1749,7 @@ void S_OPENAL_StopAllSounds(qboolean bStopMusic)
 
     S_OPENAL_StopLoopingSounds();
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         openal_channel *pChannel = openal.channel[i];
         if (pChannel) {
             pChannel->force_free();
@@ -1987,13 +1987,13 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
     float                fPitch;
     float                fMaxVolume, fMaxFactor;
     openal_channel      *pChannel;
-    bool                 bAlreadyAdded[MAX_OPENAL_LOOP_SOUNDS] = {false};
+    bool                 bAlreadyAdded[MAX_SOUNDSYSTEM_LOOP_SOUNDS] = {false};
     vec3_t               alvec;
 
     qalGetListenerfv(AL_POSITION, alvec);
     VectorCopy(alvec, vListenerOrigin);
 
-    for (i = 0; i < MAX_OPENAL_LOOP_SOUNDS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_LOOP_SOUNDS; i++) {
         vec3_t vDir;
 
         if (bAlreadyAdded[i]) {
@@ -2241,7 +2241,7 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     fVolume = 1;
     iPan    = 64;
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         pChannel   = openal.channel[i];
         fMaxVolume = S_GetBaseVolume() * pChannel->fVolume;
 
@@ -2262,14 +2262,14 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
 
             if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
                 VectorCopy(vListenerOrigin, vOrigin);
-                if (i >= MAX_OPENAL_CHANNELS_3D) {
+                if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
                     fVolume = fMaxVolume;
                     iPan    = 64;
                 } else {
                     pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
                 }
             } else {
-                if (i >= MAX_OPENAL_CHANNELS_3D) {
+                if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
                     iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
                     VectorSubtract(vListenerOrigin, vOrigin, vDir);
 
@@ -2288,7 +2288,7 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
             }
         } else if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
             VectorCopy(vListenerOrigin, vOrigin);
-            if (i >= MAX_OPENAL_CHANNELS_3D) {
+            if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
                 fVolume = fMaxVolume;
                 iPan    = 64;
             } else {
@@ -2324,7 +2324,7 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
                 }
             }
 
-            if (i >= MAX_OPENAL_CHANNELS_3D) {
+            if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
                 iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
                 VectorSubtract(vListenerOrigin, vOrigin, vDir);
                 fDist = VectorLength(vDir);
@@ -2345,7 +2345,7 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
             }
         }
 
-        if (i >= MAX_OPENAL_CHANNELS_3D) {
+        if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
             pChannel->set_gain(fVolume);
             pChannel->set_sample_pan(iPan);
         }
@@ -2450,7 +2450,7 @@ void S_OPENAL_Update()
         alDieIfError();
     }
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         pChannel = openal.channel[i];
         if (!pChannel) {
             continue;
@@ -2481,7 +2481,7 @@ void S_OPENAL_Update()
     if (s_show_num_active_sounds->integer == 1) {
         int num = 0;
 
-        for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+        for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
             pChannel = openal.channel[i];
             if (pChannel && pChannel->is_playing()) {
                 ++num;
@@ -2498,7 +2498,7 @@ void S_OPENAL_Update()
         }
     }
 
-    for (i = 0; i < MAX_OPENAL_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS; i++) {
         openal.channel[i]->update();
     }
 }
@@ -2720,7 +2720,7 @@ void S_SaveData(soundsystemsavegame_t *pSave)
         S_PauseSound();
     }
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         S_StoreBase(&pSave->Channels[i], openal.channel[i]);
     }
 
@@ -2744,7 +2744,7 @@ void S_ReLoad(soundsystemsavegame_t *pSave)
         S_PauseSound();
     }
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         S_LoadBase(&pSave->Channels[i], openal.channel[i], bSoundWasUnpaused);
     }
 
@@ -2782,7 +2782,7 @@ void S_LoadData(soundsystemsavegame_t *pSave)
 {
     int i;
 
-    for (i = 0; i < MAX_OPENAL_POSITION_CHANNELS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
         S_InitBase(&pSave->Channels[i]);
     }
 }
@@ -3662,7 +3662,7 @@ MUSIC_StopAllSongs
 */
 void MUSIC_StopAllSongs()
 {
-    for (int i = 0; i < MAX_OPENAL_SONGS; i++) {
+    for (int i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
         MUSIC_StopChannel(i);
     }
 
@@ -3768,7 +3768,7 @@ int MUSIC_CurrentSongChannel()
     int channel_number = -1;
     int ch_idx         = 0;
 
-    for (ch_idx = 0; ch_idx < MAX_OPENAL_SONGS; ch_idx++) {
+    for (ch_idx = 0; ch_idx < MAX_SOUNDSYSTEM_SONGS; ch_idx++) {
         if (openal.chan_song[ch_idx].is_playing() && openal.chan_song[ch_idx].song_number == music_currentsong) {
             channel_number = ch_idx;
         }
@@ -3896,7 +3896,7 @@ void MUSIC_UpdateMusicVolumes()
     if (s_ambientVolume->modified || music_volume_changed) {
         s_ambientVolume->modified = false;
 
-        for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+        for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
             if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
                 continue;
             }
@@ -3912,7 +3912,7 @@ void MUSIC_UpdateMusicVolumes()
         }
     }
 
-    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
         if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
             continue;
         }
@@ -3967,7 +3967,7 @@ void MUSIC_CheckForStoppedSongs()
 {
     int i;
 
-    for (i = 0; i < MAX_OPENAL_SONGS; i++) {
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
         if (!openal.chan_song[i].is_playing()) {
             continue;
         }
@@ -4024,7 +4024,7 @@ void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffs
     pszFilename = FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), pszRealName);
 
     if (!openal.chan_trig_music.queue_stream(pszRealName)) {
-        S_OPENAL_InitChannel(OPENAL_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music);
+        S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music);
         Com_DPrintf("Could not start triggered music '%s'\n", pszName);
         return;
     }
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index 5a2078a6..d18e1299 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -29,22 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 typedef int          S32;
 typedef unsigned int U32;
 
-#define MAX_OPENAL_CHANNELS_3D        32
-#define MAX_OPENAL_CHANNELS_2D        32
-#define MAX_OPENAL_CHANNELS_2D_STREAM 32
-#define MAX_OPENAL_POSITION_CHANNELS  (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM)
-#define MAX_OPENAL_SONGS              2
-#define MAX_OPENAL_MISC_CHANNELS      3
-#define MAX_OPENAL_CHANNELS                                                                             \
-    (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + MAX_OPENAL_SONGS \
-     + MAX_OPENAL_MISC_CHANNELS)
-#define MAX_OPENAL_LOOP_SOUNDS 64
-
-#define OPENAL_CHANNEL_MP3_ID \
-    (MAX_OPENAL_CHANNELS_3D + MAX_OPENAL_CHANNELS_2D + MAX_OPENAL_CHANNELS_2D_STREAM + MAX_OPENAL_SONGS)
-#define OPENAL_CHANNEL_TRIGGER_MUSIC_ID (OPENAL_CHANNEL_MP3_ID + 1)
-#define OPENAL_CHANNEL_MOVIE_ID         (OPENAL_CHANNEL_TRIGGER_MUSIC_ID + 1)
-
 #define MAX_STREAM_BUFFERS              16
 #define MAX_BUFFER_SAMPLES              16384
 
@@ -189,18 +173,18 @@ struct openal_movie_channel : public openal_channel {
 };
 
 struct openal_internal_t {
-    openal_channel              chan_3D[MAX_OPENAL_CHANNELS_3D];
-    openal_channel              chan_2D[MAX_OPENAL_CHANNELS_2D];
-    openal_channel_two_d_stream chan_2D_stream[MAX_OPENAL_CHANNELS_2D_STREAM];
-    openal_channel_two_d_stream chan_song[MAX_OPENAL_SONGS];
+    openal_channel              chan_3D[MAX_SOUNDSYSTEM_CHANNELS_3D];
+    openal_channel              chan_2D[MAX_SOUNDSYSTEM_CHANNELS_2D];
+    openal_channel_two_d_stream chan_2D_stream[MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM];
+    openal_channel_two_d_stream chan_song[MAX_SOUNDSYSTEM_SONGS];
     openal_channel_two_d_stream chan_mp3;
     openal_channel_two_d_stream chan_trig_music;
     openal_channel_two_d_stream chan_movie;
 
     // Pointers to channels
-    openal_channel *channel[MAX_OPENAL_CHANNELS];
+    openal_channel *channel[MAX_SOUNDSYSTEM_CHANNELS];
 
-    openal_loop_sound_t loop_sounds[MAX_OPENAL_LOOP_SOUNDS];
+    openal_loop_sound_t loop_sounds[MAX_SOUNDSYSTEM_LOOP_SOUNDS];
 
     openal_channel movieChannel;
     sfx_t          movieSFX;

From e74e113199db947e8ac9e7ed3315e71e585a9602 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 20:26:40 +0100
Subject: [PATCH 1481/2040] Fix voice message always being sent to enemies in
 team message

---
 code/fgame/player.cpp | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 2d7d6aeb..9425f858 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10764,7 +10764,7 @@ void Player::EventDMMessage(Event *ev)
 
     if (iMode == 0) {
         //
-        // team message
+        // everyone
         //
         if (!IsSpectator() || g_spectate_allow_full_chat->integer) {
             for (i = 0; i < game.maxclients; i++) {
@@ -10826,35 +10826,26 @@ void Player::EventDMMessage(Event *ev)
             }
         } else {
             for (i = 0; i < game.maxclients; i++) {
+                bool bSameTeam;
+
                 ent = &g_entities[i];
 
                 if (!ent->inuse || !ent->entity) {
                     continue;
                 }
 
-                if (static_cast<Player *>(ent->entity)->GetTeam() != GetTeam()) {
-                    gi.MSG_SetClient(i);
-                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_VOICE_CHAT));
-                    gi.MSG_WriteCoord(m_vViewPos[0]);
-                    gi.MSG_WriteCoord(m_vViewPos[1]);
-                    gi.MSG_WriteCoord(m_vViewPos[2]);
-                    gi.MSG_WriteBits(qtrue, 1);
-                    gi.MSG_WriteBits(edict - g_entities, 6);
-                    gi.MSG_WriteString(sAliasName.c_str());
-                    gi.MSG_EndCGM();
-
-                    continue;
+                bSameTeam = static_cast<Player*>(ent->entity)->GetTeam() == GetTeam();
+                if (bSameTeam) {
+                    gi.SendServerCommand(i, "%s", szPrintString);
                 }
 
-                gi.SendServerCommand(i, "%s", szPrintString);
-
                 if (bInstaMessage) {
                     gi.MSG_SetClient(i);
                     gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_VOICE_CHAT));
                     gi.MSG_WriteCoord(m_vViewPos[0]);
                     gi.MSG_WriteCoord(m_vViewPos[1]);
                     gi.MSG_WriteCoord(m_vViewPos[2]);
-                    gi.MSG_WriteBits(qfalse, 1);
+                    gi.MSG_WriteBits(!bSameTeam, 1);
                     gi.MSG_WriteBits(edict - g_entities, 6);
                     gi.MSG_WriteString(sAliasName.c_str());
                     gi.MSG_EndCGM();

From aeb8aa8e55eb55c6d60b51439263c52282fb1fd6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 20:28:03 +0100
Subject: [PATCH 1482/2040] Don't send a voice chat message if the entity is
 not sent to clients

---
 code/fgame/player.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 9425f858..bc5ba856 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10566,6 +10566,12 @@ void Player::EventDMMessage(Event *ev)
             return;
         }
 
+        if (edict->r.svFlags & SVF_NOCLIENT) {
+            // Changed in OPM
+            //  Don't send a voice chat message if the entity is not sent to client
+            return;
+        }
+
         if (!g_instamsg_allowed->integer) {
             // Added in OPM
             return;

From 7b58fbec8a0527968eb3408be21df0064e15a69d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 21:25:54 +0100
Subject: [PATCH 1483/2040] Fix comparison operator for char

---
 code/script/scriptvariable.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index 838f8ff1..0dd34d75 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -2293,9 +2293,9 @@ void ScriptVariable::greaterthan(ScriptVariable& variable)
         m_data.intValue = m_data.floatValue > variable.m_data.intValue;
         break;
 
-    case VARIABLE_CHAR + VARIABLE_CHAR *VARIABLE_MAX: // ( char ) >= ( char )
+    case VARIABLE_CHAR + VARIABLE_CHAR *VARIABLE_MAX: // ( char ) > ( char )
         type            = VARIABLE_INTEGER;
-        m_data.intValue = m_data.charValue >= variable.m_data.charValue;
+        m_data.intValue = m_data.charValue > variable.m_data.charValue;
         break;
     }
 }

From 69621335db5e897d721824467f948d002ef04cf4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 21:31:45 +0100
Subject: [PATCH 1484/2040] Put the target extension version in the version
 string

---
 code/qcommon/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index b125c4fa..fe7b9328 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1806,7 +1806,7 @@ void Com_Init( char *commandLine ) {
 		}
 	}
 
-	s = va( "%s %s (Medal of Honor: %s) %s %s", PRODUCT_NAME, PRODUCT_VERSION_FULL, Cvar_VariableString("com_target_extension"), PLATFORM_STRING, PRODUCT_VERSION_DATE);
+	s = va( "%s %s (Medal of Honor: %s %s) %s %s", PRODUCT_NAME, PRODUCT_VERSION_FULL, Cvar_VariableString("com_target_extension"), Cvar_VariableString("com_target_version"), PLATFORM_STRING, PRODUCT_VERSION_DATE);
 	com_version = Cvar_Get( "version", s, CVAR_ROM | CVAR_SERVERINFO );
 	com_gamename = Cvar_Get("com_gamename", "", CVAR_SERVERINFO | CVAR_INIT);
 	com_shortversion = Cvar_Get( "shortversion", PRODUCT_VERSION, CVAR_ROM );

From 652df1a5af68c34bee5ac0c38b26f5cad0a482f2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 22:10:03 +0100
Subject: [PATCH 1485/2040] Prevent players with SVF_NOCLIENT to use objects

---
 code/fgame/player.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index bc5ba856..0d6bf492 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -3430,6 +3430,15 @@ void Player::DoUse(Event *ev)
         return;
     }
 
+    if (edict->r.svFlags & SVF_NOCLIENT) {
+        // Fixed in OPM
+        //  Clients that are not sent to other clients cannot use objects.
+        //  Some mods make players non-solid, hide them and turn physics off
+        //  as a way to spectate other players or for cinematics.
+        //  This prevent players to use objects such as doors
+        return;
+    }
+
     bWasInTurretOrVehicle = m_pVehicle || m_pTurret;
 
     if (bWasInTurretOrVehicle) {

From b237222761a8d9d109daab6f5cbbc75895af7583 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 22:27:20 +0100
Subject: [PATCH 1486/2040] Update features.md

---
 docs/features.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/features.md b/docs/features.md
index 5c8b96e4..5c1b3a5d 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -60,10 +60,12 @@ Enable this feature with `set sv_netoptimize 2`.
 - Fixed grenade crash bug
 - Fixed grenade spectator charge bug
 - Fixed `leave_team` bug
-- Fix to prevent being able to spectate while still in the team
+- Fixed memory leaks issues in long matches
+- Fixed sharking issues with ladders
+- Fix to prevent being able to spectate while still in the team with a NULL primary deathmatch weapon
 - Fix to prevent throwing a projectile and going into spectator to kill anyone
 - Fix for `sv_fps` (tickrate), higher values won't cause animation issues anymore
-- Fix for ladders to prevent sharking
+- Grenades with 1 ammo can now be picked up
 - Prevent crashing when the last weapon has no ammo and other weapons are inventory items
 
 ## Planned features

From ec5acb4d98e1923e78541f6e2a8f610da2527754 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 17 Nov 2024 22:59:49 +0100
Subject: [PATCH 1487/2040] Fix bad glDepthRange

---
 code/renderer/tr_backend.c | 2 +-
 code/renderer/tr_sky.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
index e93f0731..e8f6e2f7 100644
--- a/code/renderer/tr_backend.c
+++ b/code/renderer/tr_backend.c
@@ -883,7 +883,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	// go back to the world modelview matrix
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
 	if ( depthRange ) {
-		qglDepthRange (0, 1.875);
+		qglDepthRange (0, 1.0);
 	}
 
 	RB_ShadowFinish();
diff --git a/code/renderer/tr_sky.c b/code/renderer/tr_sky.c
index 58aab6b2..6da4a80d 100644
--- a/code/renderer/tr_sky.c
+++ b/code/renderer/tr_sky.c
@@ -811,7 +811,7 @@ void RB_StageIteratorSky( void ) {
 	if ( r_showsky->integer ) {
 		qglDepthRange( 0.0, 0.0 );
 	} else {
-		qglDepthRange( 1.875, 1.875 );
+		qglDepthRange( 1.0, 1.0 );
 	}
 
 	// draw the outer skybox

From 46e1aa979b2515d6bc5bd66beb62b6e405b4b281 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:37:15 +0100
Subject: [PATCH 1488/2040] Use ARRAY_LEN instead of sizeof

---
 code/renderer/tr_bsp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index db59e309..3eb73551 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -506,7 +506,7 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
     pUnpacked->iSouth = pPacked->iSouth;
     pUnpacked->iWest = pPacked->iWest;
 
-    for (i = 0; i < 63; i++)
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
     {
         flags.v = pPacked->varTree[0][i].flags;
         flags.b[1] &= 7;
@@ -519,14 +519,14 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
         pUnpacked->varTree[1][i].s.flags = pPacked->varTree[1][i].flags >> 12;
     }
 
-    for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++) {
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
         pUnpacked->heightmap[i] = pPacked->heightmap[i];
     }
 
     pUnpacked->zmax = 0;
     pUnpacked->flags = pPacked->flags;
 
-    for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++)
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++)
     {
         if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
             pUnpacked->zmax = pUnpacked->heightmap[i];

From eb938c872d5af289e489396681e8448dec0d1d4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 19:37:56 +0100
Subject: [PATCH 1489/2040] Make varnode endian-independant

This fixes terrain rendering incorrectly on big-endian architectures by using bit operation. The `flags` field in the union always matched the first byte of the variance float value instead of the least significant byte
---
 code/renderer/tr_bsp.c     | 22 ++++++++--------
 code/renderer/tr_local.h   | 14 ++++++++---
 code/renderer/tr_terrain.c | 51 ++++++++++++++++++++++----------------
 3 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index 3eb73551..e6a54a01 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -465,10 +465,6 @@ R_UnpackTerraPatch
 */
 void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
     int i, j;
-    union {
-        int16_t v;
-        uint8_t b[2];
-    } flags;
 
     pUnpacked->byDirty = qfalse;
     pUnpacked->visCountCheck = 0;
@@ -508,15 +504,17 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
 
     for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
     {
-        flags.v = pPacked->varTree[0][i].flags;
-        flags.b[1] &= 7;
-        pUnpacked->varTree[0][i].fVariance = flags.v;
-        pUnpacked->varTree[0][i].s.flags = pPacked->varTree[0][i].flags >> 12;
+        int flags;
 
-        flags.v = pPacked->varTree[1][i].flags;
-        flags.b[1] &= 7;
-        pUnpacked->varTree[1][i].fVariance = flags.v;
-        pUnpacked->varTree[1][i].s.flags = pPacked->varTree[1][i].flags >> 12;
+        flags = pPacked->varTree[0][i].flags;
+        pUnpacked->varTree[0][i].fVariance = flags & 0x7FF;
+        pUnpacked->varTree[0][i].flags &= ~0xFF;
+        pUnpacked->varTree[0][i].flags |= (flags >> 12) & 0xFF;
+
+        flags = pPacked->varTree[1][i].flags;
+        pUnpacked->varTree[1][i].fVariance = flags & 0x7FF;
+        pUnpacked->varTree[1][i].flags &= ~0xFF;
+        pUnpacked->varTree[1][i].flags |= (flags >> 12) & 0xFF;
     }
 
     for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index a0680686..fd014422 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -878,10 +878,18 @@ typedef struct {
 
 typedef union varnodeUnpacked_u {
     float fVariance;
-	struct {
+    int flags;
+	/*
+    struct {
+#if !Q3_BIG_ENDIAN
 		byte flags;
-		unsigned char unused[3];
-	} s;
+        unsigned char unused[3];
+#else
+        unsigned char unused[3];
+        byte flags;
+#endif
+    } s;
+	*/
 } varnodeUnpacked_t;
 
 typedef unsigned short terraInt;
diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 07b31b72..8aeee1aa 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015-2024 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -263,13 +263,14 @@ static int R_ConstChecksForTri(terraTri_t *pTri)
     }
 
     vn = *pTri->varnode;
-    vn.s.flags &= 0xF0u;
+    //vn.s.flags &= 0xF0;
+    vn.flags &= 0xFFFFFFF0;
 
-    if (vn.fVariance == 0.0 && !(pTri->varnode->s.flags & 8)) {
+    if (vn.fVariance == 0.0 && !(pTri->varnode->flags & 8)) {
         return 2;
-    } else if (pTri->varnode->s.flags & 8) {
+    } else if (pTri->varnode->flags & 8) {
         return 3;
-    } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->s.flags & 4) && pTri->lod < ter_maxlod->integer) {
+    } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->flags & 4) && pTri->lod < ter_maxlod->integer) {
         return 0;
     }
 
@@ -457,12 +458,20 @@ R_ForceSplit
 */
 static void R_ForceSplit(terraInt iTri)
 {
-    terraTri_t *pTri = &g_pTris[iTri];
+    terraTri_t    *pTri = &g_pTris[iTri];
+    terraTri_t    *pBase;
+    terrainVert_t *pVert;
+    terraInt       iBase;
+    terraInt       iTriLeft, iTriRight;
+    terraInt       iNewPt;
+    terraInt       iBaseLeft = 0, iBaseRight = 0;
+    terraInt       iNewBasePt;
+    uint32_t       flags, flags2;
 
     g_nSplit++;
 
-    terraInt    iBase = pTri->iBase;
-    terraTri_t *pBase = &g_pTris[iBase];
+    iBase = pTri->iBase;
+    pBase = &g_pTris[iBase];
     if (iBase && pBase->lod != pTri->lod) {
         assert(g_pTris[pTri->iBase].iBase != iTri);
         assert(g_tri.nFree >= 8);
@@ -475,30 +484,30 @@ static void R_ForceSplit(terraInt iTri)
         pBase = &g_pTris[iBase];
     }
 
-    uint8_t flags = pTri->varnode->s.flags;
+    flags = pTri->varnode->flags;
 
-    terraInt iTriLeft  = R_AllocateTri(pTri->patch, (flags & 2));
-    terraInt iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
+    iTriLeft  = R_AllocateTri(pTri->patch, (flags & 2));
+    iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
 
-    terraInt iNewPt = R_AllocateVert(pTri->patch);
+    iNewPt = R_AllocateVert(pTri->patch);
     R_InterpolateVert(pTri, &g_pVert[iNewPt]);
 
     g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
 
-    terraInt iBaseLeft  = 0;
-    terraInt iBaseRight = 0;
+    iBaseLeft  = 0;
+    iBaseRight = 0;
 
     if (iBase) {
-        uint8_t flags2 = pBase->varnode->s.flags;
+        flags2 = pBase->varnode->flags;
         flags |= flags2;
 
         iBaseLeft  = R_AllocateTri(pBase->patch, (flags2 & 2));
         iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
 
-        terraInt iNewBasePt = iNewPt;
+        iNewBasePt = iNewPt;
         if (pBase->patch != pTri->patch) {
-            iNewBasePt           = R_AllocateVert(pBase->patch);
-            terrainVert_t *pVert = &g_pVert[iNewBasePt];
+            iNewBasePt = R_AllocateVert(pBase->patch);
+            pVert      = &g_pVert[iNewBasePt];
             R_InterpolateVert(pBase, pVert);
 
             pVert->fVariance = g_pVert[iNewPt].fVariance;
@@ -520,7 +529,7 @@ static void R_ForceSplit(terraInt iTri)
     }
 
     if (flags & 8) {
-        terrainVert_t *pVert = &g_pVert[iNewPt];
+        pVert = &g_pVert[iNewPt];
         pVert->fHgtAvg += pVert->fHgtAdd;
         pVert->fHgtAdd   = 0.0;
         pVert->fVariance = 0.0;
@@ -1090,7 +1099,7 @@ static qboolean R_MergeInternalCautious()
         return qfalse;
     }
 
-    if (pTri->varnode->s.flags & 8) {
+    if (pTri->varnode->flags & 8) {
         return qfalse;
     }
 
@@ -1100,7 +1109,7 @@ static qboolean R_MergeInternalCautious()
 
     if (pTri->iBase) {
         pBase = &g_pTris[pTri->iBase];
-        if (pBase->nSplit || (pBase->varnode->s.flags & 8)) {
+        if (pBase->nSplit || (pBase->varnode->flags & 8)) {
             return qfalse;
         }
 

From 614ed6e63219a793bc0a69168f0dac1777519b2b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 19:47:54 +0100
Subject: [PATCH 1490/2040] Use the vartree for flags, rather than copying the
 flags to a signed int value

---
 code/renderer/tr_bsp.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
index e6a54a01..09386625 100644
--- a/code/renderer/tr_bsp.c
+++ b/code/renderer/tr_bsp.c
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -504,17 +505,17 @@ void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked
 
     for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
     {
-        int flags;
+        varnode_t *packedVarTree;
 
-        flags = pPacked->varTree[0][i].flags;
-        pUnpacked->varTree[0][i].fVariance = flags & 0x7FF;
+        packedVarTree = &pPacked->varTree[0][i];
+        pUnpacked->varTree[0][i].fVariance = packedVarTree->flags & 0x7FF;
         pUnpacked->varTree[0][i].flags &= ~0xFF;
-        pUnpacked->varTree[0][i].flags |= (flags >> 12) & 0xFF;
+        pUnpacked->varTree[0][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
 
-        flags = pPacked->varTree[1][i].flags;
-        pUnpacked->varTree[1][i].fVariance = flags & 0x7FF;
+        packedVarTree = &pPacked->varTree[1][i];
+        pUnpacked->varTree[1][i].fVariance = packedVarTree->flags & 0x7FF;
         pUnpacked->varTree[1][i].flags &= ~0xFF;
-        pUnpacked->varTree[1][i].flags |= (flags >> 12) & 0xFF;
+        pUnpacked->varTree[1][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
     }
 
     for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {

From 05d304dfc37867dfe66eaeee67c6aee84d9deb06 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 20:38:03 +0100
Subject: [PATCH 1491/2040] Set ignoredFiles only if ignore_files was specified

This fixes a crash that would occur due to a NULL string
---
 code/client/cl_uifilepicker.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uifilepicker.cpp b/code/client/cl_uifilepicker.cpp
index 4a368691..5b8d7937 100644
--- a/code/client/cl_uifilepicker.cpp
+++ b/code/client/cl_uifilepicker.cpp
@@ -104,8 +104,10 @@ void FilePickerClass::Initialize(
         currentDirectory += "/";
     }
 
-    extension    = ext;
-    ignoredFiles = ignore_files;
+    extension = ext;
+    if (ignore_files) {
+        ignoredFiles = ignore_files;
+    }
 
     SetupFiles();
 }

From 59d03ff6f031699564e090136e49098fd6f7fc39 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 21:13:34 +0100
Subject: [PATCH 1492/2040] Return a virtual scale with the correct ratio if
 scale variable is set

This prevents the widget from being stretched out on widescreen, currently only the compass uses scalecvar
---
 code/uilib/uiwidget.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 3d9d9416..77ba2361 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -3141,14 +3141,20 @@ void UIWidget::SetScaleCvar
 
 void UIWidget::SetVirtualScale(vec2_t out)
 {
-    out[0] = uid.vidWidth / 640.0;
-    out[1] = uid.vidHeight / 480.0;
-
     if (m_scaleCvar)
     {
-        out[0] *= m_scaleCvar->value;
-        out[1] *= m_scaleCvar->value;
+        const float vidRatio = (float)uid.vidWidth / (float)uid.vidHeight;
+        const float minHeight = 480;
+        const float minWidth = minHeight * vidRatio;
+
+        out[0] = uid.vidWidth / minWidth * m_scaleCvar->value;
+        out[1] = uid.vidHeight / minHeight * m_scaleCvar->value;
     }
+	else
+    {
+        out[0] = uid.vidWidth / 640.0;
+        out[1] = uid.vidHeight / 480.0;
+	}
 }
 
 void UIWidget::SetDontLocalize(Event* ev)

From 2662174eba47a24eb14771ff10e96e944e449176 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 21:22:50 +0100
Subject: [PATCH 1493/2040] Fix radar clients not blinking when talking

---
 code/client/cl_uiradar.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_uiradar.cpp b/code/client/cl_uiradar.cpp
index be2c80ce..8c947a82 100644
--- a/code/client/cl_uiradar.cpp
+++ b/code/client/cl_uiradar.cpp
@@ -128,10 +128,13 @@ void UIRadar::Draw(void)
 			// make the icon blink
 			if (delta >= 0 && delta < speakTime && ((delta / blinkTime) % 2) == 0) {
 				continue;
+            }
+
+			if (delta < 0 || delta >= speakTime) {
+				radar->lastSpeakTime = 0;
 			}
 		}
 
-		radar->lastSpeakTime = 0;
 		delta[0] = radar->origin[0] - origin[0];
 		delta[1] = radar->origin[1] - origin[1];
 		newOrg[0] = -(delta[0] * axis[0] + delta[1] * axis[1]) * inv;

From 2107523eda055ecf7ce97108976625bdf9538c44 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 21:57:02 +0100
Subject: [PATCH 1494/2040] Use MAX_CLIENTS - 1 instead of 63

---
 code/client/cl_parse.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 77037a36..68f8fc7b 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -223,13 +223,13 @@ qboolean CL_UnpackNonPVSClient(int* packed, radarUnpacked_t* unpacked) {
 		range = 0;
 	}
 
-	unpacked->x = x * range / 63.f;
-	unpacked->y = y * range / 63.f;
+	unpacked->x = x * range / (MAX_CLIENTS - 1);
+	unpacked->y = y * range / (MAX_CLIENTS - 1);
 
 	if (!bValid)
 	{
-		unpacked->x = x * range / 63.f * 1024;
-		unpacked->y = y * range / 63.f * 1024;
+		unpacked->x = x * range / (MAX_CLIENTS - 1) * 1024.0;
+		unpacked->y = y * range / (MAX_CLIENTS - 1) * 1024.0;
 	}
 
 	unpacked->yaw = yaw * 11.25f;

From acb08b89f71bafcc82740cea1cd3aafa9a66c0e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 18 Nov 2024 22:03:58 +0100
Subject: [PATCH 1495/2040] Fix constant for screenOrg

---
 code/client/cl_uiradar.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/client/cl_uiradar.cpp b/code/client/cl_uiradar.cpp
index 8c947a82..654ecc26 100644
--- a/code/client/cl_uiradar.cpp
+++ b/code/client/cl_uiradar.cpp
@@ -58,7 +58,7 @@ void UIRadar::Draw(void)
 	float inv;
 	float iconSize;
 	int blinkTime, speakTime;
-	float origin[2], axis[2];
+	vec2_t origin, axis;
 	float halfScale;
 	int i;
 
@@ -105,17 +105,17 @@ void UIRadar::Draw(void)
 	halfScale = iconSize * 0.5f;
 
 	for (i = 0; i < MAX_CLIENTS; i++) {
-		float delta[2];
-		float newOrg[2];
-		float screenOrg[2];
-		float length;
+		vec2_t delta;
+		vec2_t newOrg;
+		vec2_t screenOrg;
+		float  length;
 
 		radar = &g_radarClients[i];
 		if (i == g_radarClientNum) {
 			continue;
 		}
 
-		if (!g_radarClients[i].time) {
+		if (!radar->time) {
 			continue;
 		}
 
@@ -143,12 +143,12 @@ void UIRadar::Draw(void)
 
 		if (length > 1)
 		{
-			newOrg[0] = -(delta[0] * axis[0] + delta[1] * axis[1]) * inv * (1.f / length);
-			newOrg[1] = (delta[0] * axis[1] + delta[1] * -axis[0]) * inv * (1.f / length);
+			newOrg[0] *= 1.f / length;
+			newOrg[1] *= 1.f / length;
 		}
 
-		screenOrg[0] = -((halfScale * (1.141f * newOrg[1] + m_vVirtualScale[0])) - ((1.f + newOrg[1]) * 0.5f * m_frame.size.width));
-		screenOrg[1] = -((halfScale * (1.141f * newOrg[0] + m_vVirtualScale[1])) - ((1.f + newOrg[0]) * 0.5f * m_frame.size.height));
+		screenOrg[0] = -((halfScale * (1.414f * newOrg[1] + m_vVirtualScale[0])) - ((1.f + newOrg[1]) * 0.5f * m_frame.size.width));
+		screenOrg[1] = -((halfScale * (1.414f * newOrg[0] + m_vVirtualScale[1])) - ((1.f + newOrg[0]) * 0.5f * m_frame.size.height));
 
 		uii.Rend_DrawPicStretched2(
 			screenOrg[0],

From 6bc621462c5df3243f187cfddb4f9847db094e25 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:17:16 +0100
Subject: [PATCH 1496/2040] Use CL_FontStringWidth instead of
 uie.FontStringWidth

---
 code/client/cl_cgame.cpp | 2 +-
 code/client/cl_ui.h      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 9d68d1d0..8c15c56a 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -772,7 +772,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 
 	cgi->UI_ShowMenu				= UI_ShowMenu;
 	cgi->UI_HideMenu				= UI_HideMenu;
-	cgi->UI_FontStringWidth			= uie.FontStringWidth;
+	cgi->UI_FontStringWidth			= CL_FontStringWidth;
 	cgi->Key_StringToKeynum			= Key_StringToKeynum;
 	cgi->Key_KeynumToBindString		= Key_KeynumToBindString;
 	cgi->Key_GetKeysForCommand		= Key_GetKeysForCommand;
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 740e855c..30272ad3 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -112,6 +112,7 @@ void UI_DeleteScoreBoardItems(int iMaxIndex);
 void     UI_BeginLoad(const char *pszMapName);
 void     UI_EndLoad(void);
 void     UI_AbortLoad(void);
+int      CL_FontStringWidth(fontheader_t* pFont, const char* pszString, int iMaxLen);
 void     UI_BeginLoadResource(void);
 void     UI_EndLoadResource(void);
 void     UI_EndLoadResource(const char *name);

From 05e14f6364fc78a96aa44cb0f473f25a840b1f2e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:41:46 +0100
Subject: [PATCH 1497/2040] Adjust the objectives menu accordingly depending on
 the game message box which depends on the compass scale

---
 code/cgame/cg_drawtools.cpp | 49 +++++++++++++++++++++----------------
 code/cgame/cg_public.h      |  2 ++
 code/client/cl_cgame.cpp    |  1 +
 code/client/cl_ui.cpp       | 10 ++++++++
 code/client/cl_ui.h         |  1 +
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index a1177a07..ae02c14b 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -675,14 +675,17 @@ void CG_DrawObjectives()
 {
     float        vColor[4];
     float        fX, fY;
+    int          iNumObjectives;
+    float        fObjectivesTop;
     static float fWidth;
     float        fHeight;
     int          iNumLines[20];
     int          iTotalNumLines;
     int          i;
-    int          ii;
     int          iCurrentObjective;
     float        fTimeDelta;
+    const char   *pszLocalizedText;
+    const char   *pszLine;
 
     iTotalNumLines = 0;
     for (i = CS_OBJECTIVES; i < CS_OBJECTIVES + MAX_OBJECTIVES; ++i) {
@@ -702,26 +705,30 @@ void CG_DrawObjectives()
         return;
     }
 
-    for (i = 0; i < MAX_OBJECTIVES; i++) {
-        if ((cg.Objectives[i].flags & 0xFFFFFFFE)) {
-            iNumLines[i] = 0;
+    // Added in 2.0
+    //  Get the minimum Y value, it should be below the compass
+    fObjectivesTop = cgi.UI_GetObjectivesTop();
+    iNumObjectives = 0;
 
-            for (ii = 0; ii < MAX_STRING_CHARS; ii++) {
-                if (cg.Objectives[i].text[ii] == '\n') {
-                    iTotalNumLines++;
-                    iNumLines[i]++;
-                } else if (!cg.Objectives[i].text[ii]) {
-                    iTotalNumLines++;
-                    iNumLines[i]++;
-                    break;
-                }
-            }
+    for (i = 0; i < MAX_OBJECTIVES; i++) {
+        if ((cg.Objectives[i].flags == OBJ_FLAG_NONE) || (cg.Objectives[i].flags & OBJ_FLAG_HIDDEN)) {
+            continue;
         }
+
+        iNumObjectives++;
+        iNumLines[i] = 0;
+        pszLocalizedText = cgi.LV_ConvertString(cg.Objectives[i].text);
+        
+        for (pszLine = strchr(pszLocalizedText, '\n'); pszLine; pszLine = strchr(pszLine, '\n')) {
+            iNumLines[i]++;
+        }
+
+        iTotalNumLines += iNumLines[i];
     }
 
     fX        = 25.0;
-    fY        = 125.0;
-    fWidth    = (float)(25 * iTotalNumLines + 155) + 5.0 - 130.0;
+    fY        = fObjectivesTop + 5;
+    fWidth    = (float)(iTotalNumLines * 12 + fObjectivesTop + iNumObjectives * 25 + 32) - fY;
     vColor[2] = 0.2f;
     vColor[1] = 0.2f;
     vColor[0] = 0.2f;
@@ -730,7 +737,7 @@ void CG_DrawObjectives()
     cgi.R_DrawStretchPic(fX, fY, 450.0, fWidth, 0.0, 0.0, 1.0, 1.0, cgs.media.objectivesBackShader);
 
     fX        = 30.0;
-    fY        = 130.0;
+    fY        = fObjectivesTop + 10;
     vColor[0] = 1.0;
     vColor[1] = 1.0;
     vColor[2] = 1.0;
@@ -740,12 +747,12 @@ void CG_DrawObjectives()
     fY = fY + 5.0;
 
     cgi.R_DrawString(cgs.media.objectiveFont, "_______________________________________________________", fX, fY, -1, 0);
-    fHeight = 155.0;
+    fHeight = fObjectivesTop + 35;
 
     for (i = 0; i < MAX_OBJECTIVES; ++i) {
         qhandle_t hBoxShader;
-
-        if ((cg.Objectives[i].flags & OBJ_FLAG_HIDDEN) || !cg.Objectives[i].flags) {
+        
+        if ((cg.Objectives[i].flags == OBJ_FLAG_NONE) || (cg.Objectives[i].flags & OBJ_FLAG_HIDDEN)) {
             continue;
         }
 
@@ -789,7 +796,7 @@ void CG_DrawObjectives()
         cgi.R_SetColor(vColor);
         cgi.R_DrawStretchPic(fX, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, hBoxShader);
 
-        fHeight += 25 * iNumLines[i];
+        fHeight += iNumLines[i] * 12 + 25;
     }
 }
 
diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index d9bc097e..b1e76f85 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -361,6 +361,8 @@ functions exported to the main executable
         void (*UI_ShowMenu)(const char *name, qboolean bForce);
         void (*UI_HideMenu)(const char *name, qboolean bForce);
         int (*UI_FontStringWidth)(fontheader_t *font, const char *string, int maxLen);
+        // Added in 2.0
+        float (*UI_GetObjectivesTop)(void);
 
         int (*Key_StringToKeynum)(const char *str);
         const char *(*Key_KeynumToBindString)(int keyNum);
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 8c15c56a..89d6c093 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -773,6 +773,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->UI_ShowMenu				= UI_ShowMenu;
 	cgi->UI_HideMenu				= UI_HideMenu;
 	cgi->UI_FontStringWidth			= CL_FontStringWidth;
+	cgi->UI_GetObjectivesTop		= UI_GetObjectivesTop;
 	cgi->Key_StringToKeynum			= Key_StringToKeynum;
 	cgi->Key_KeynumToBindString		= Key_KeynumToBindString;
 	cgi->Key_GetKeysForCommand		= Key_GetKeysForCommand;
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 3f1226fa..8213cfaa 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1211,6 +1211,16 @@ static UIRect2D getDefaultDMBoxRectangle(void)
     return UIRect2D(width, 0, cls.glconfig.vidWidth - (width + 192.0f), 120.0f);
 }
 
+/*
+====================
+UI_GetObjectivesTop
+====================
+*/
+float UI_GetObjectivesTop(void)
+{
+    return getDefaultGMBoxRectangle().pos.y;
+}
+
 /*
 ====================
 UI_ShowHudList
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 30272ad3..fce7c3b7 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -56,6 +56,7 @@ const char *CvarGetForUI(const char *name, const char *defval);
 void        UI_ClearState(void);
 void        CL_BeginRegistration(void);
 void        CL_EndRegistration(void);
+float       UI_GetObjectivesTop(void);
 
 //
 // menu

From d83374d38c3656a8f7af5bd63f52ca0705d246ac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 19:44:55 +0100
Subject: [PATCH 1498/2040] Set the default compass scale to 0.5 for the base
 game

---
 code/client/cl_ui.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 8213cfaa..1134c3a6 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3832,7 +3832,13 @@ void UI_ResolutionChange(void)
 {
     UIRect2D frame;
 
-    ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
+    if (com_target_game->integer >= TG_MOHTA) {
+        ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
+    } else {
+        // Older version doesn't have an adjustable compass, so assume 0.5 by default
+        ui_compass_scale = Cvar_Get("ui_compass_scale", "0.5", CVAR_ARCHIVE | CVAR_LATCH);
+    }
+
     CL_FillUIImports();
     CL_FillUIDef();
 
@@ -5446,7 +5452,6 @@ UI_EndLoadResource
 void UI_EndLoadResource(void)
 {
     clock_t time;
-    int     i;
 
     time = clock() - (((clock_t)startCountHigh << 32) | startCountLow) + (((clock_t)loadCountHigh << 32) | loadCountLow);
 

From 862af012cb261227d92f0b33dda6a6e2a109ae67 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 20:26:23 +0100
Subject: [PATCH 1499/2040] Fix infinite loop while getting the number of lines
 in objectives

---
 code/cgame/cg_drawtools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index ae02c14b..c6dd9de8 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -719,7 +719,7 @@ void CG_DrawObjectives()
         iNumLines[i] = 0;
         pszLocalizedText = cgi.LV_ConvertString(cg.Objectives[i].text);
         
-        for (pszLine = strchr(pszLocalizedText, '\n'); pszLine; pszLine = strchr(pszLine, '\n')) {
+        for (pszLine = strchr(pszLocalizedText, '\n'); pszLine; pszLine = strchr(pszLine + 1, '\n')) {
             iNumLines[i]++;
         }
 

From 01dfbcdbfee5341169263e754fa3053839f79bc8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 21:45:49 +0100
Subject: [PATCH 1500/2040] Properly print the backtrace and generate a core
 dump on both Windows/Unix

---
 code/sys/CMakeLists.txt      |  1 +
 code/sys/new/sys_unix_new.c  | 16 ++++++++++------
 code/sys/new/sys_win32_new.c | 30 ++++++++++++++++++++++++++++++
 code/sys/sys_main.c          | 10 ++++++++--
 4 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index ed9f31d0..0ec654ed 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -44,6 +44,7 @@ target_link_libraries(syslib INTERFACE qcommon)
 if(WIN32)
 	target_link_libraries(syslib INTERFACE wsock32 ws2_32)
 	target_link_libraries(syslib INTERFACE winmm)
+	target_link_libraries(syslib INTERFACE dbghelp)
 elseif(UNIX)
 	find_package(Threads)
 	target_link_libraries(syslib INTERFACE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/code/sys/new/sys_unix_new.c b/code/sys/new/sys_unix_new.c
index 023e9429..3939fd30 100644
--- a/code/sys/new/sys_unix_new.c
+++ b/code/sys/new/sys_unix_new.c
@@ -49,14 +49,18 @@ Sys_PrintBackTrace
 ==================
 */
 void Sys_PrintBackTrace() {
-    void* backtrace_arr[64];
+    void* backtrace_arr[128];
+    char** backtrace_symbols_arr;
     size_t backtrace_size;
+    size_t i;
 
-    printf("----\nBacktrace:\n");
-    // get void*'s for all entries on the stack
-    backtrace_size = backtrace(backtrace_arr, sizeof(backtrace_arr) / sizeof(backtrace_arr[0]));
-    backtrace_symbols_fd(backtrace_arr, backtrace_size, STDERR_FILENO);
-    printf("----\n");
+    // Fetch the backtrace starting from the current function
+    backtrace_size = backtrace(backtrace_arr, ARRAY_LEN(backtrace_arr));
+    backtrace_symbols_arr = backtrace_symbols(backtrace_arr, ARRAY_LEN(backtrace_arr));
+
+    for (i = 0; i < backtrace_size; i++) {
+        fprintf(stderr, "=> %s\n", backtrace_symbols_arr[i]);
+    }
 }
 
 /*
diff --git a/code/sys/new/sys_win32_new.c b/code/sys/new/sys_win32_new.c
index afdc01dd..ea581328 100644
--- a/code/sys/new/sys_win32_new.c
+++ b/code/sys/new/sys_win32_new.c
@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../sys_local.h"
 
 #include <Windows.h>
+#include <dbghelp.h>
+
 #ifdef _MSC_VER
 #  ifdef _DEBUG_MEM
 #    include <crtdbg.h>
@@ -51,6 +53,34 @@ Sys_PrintBackTrace
 ==============
 */
 void Sys_PrintBackTrace() {
+    void* backtrace[128];
+    SYMBOL_INFO* symbol;
+    HANDLE hProcess;
+    unsigned int i;
+    unsigned short frames;
+
+    hProcess = GetCurrentProcess();
+
+    // Initialize the symbol handler
+    SymInitialize(hProcess, NULL, TRUE);
+
+    // Gather the list of frames
+    frames = CaptureStackBackTrace(0, ARRAY_LEN(backtrace), backtrace, NULL);
+    // Allocate a symbol structure to get the name of each symbol
+    // with a maximum of 127 characters per symbol
+    symbol = (SYMBOL_INFO*)malloc(sizeof(SYMBOL_INFO) + 128 * sizeof(char));
+    symbol->MaxNameLen = 127;
+    symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
+
+    for (i = 0; i < frames; i++)
+    {
+        // Try to translate the address to a symbol with a name
+        SymFromAddr(hProcess, (DWORD64)(backtrace[i]), 0, symbol);
+
+        fprintf(stderr, "=> %s[0x%p]\n", symbol->Name, (void*)symbol->Address);
+    }
+
+    free(symbol);
 }
 
 /*
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index db1fd2cc..74939be8 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -715,7 +715,7 @@ char *Sys_ParseProtocolUri( const char *uri )
 Sys_SigHandler
 =================
 */
-void Sys_SigHandler( int signal )
+void Sys_SigHandler( int signum )
 {
 	static qboolean signalcaught = qfalse;
 
@@ -727,7 +727,13 @@ void Sys_SigHandler( int signal )
 	else
 	{
 		signalcaught = qtrue;
-		Sys_PrintBackTrace();
+
+        printf("----\nBacktrace:\n");
+        Sys_PrintBackTrace();
+        printf("----\n");
+		// Call the default signal handler to generate a core dump
+		SIG_DFL(signum);
+
 		VM_Forced_Unload_Start();
 #ifndef DEDICATED
 		CL_Shutdown(va("Received signal %d", signal), qtrue, qtrue);

From a0e2162dd79b17547ea9f43faf89ee9698b6edc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 22:16:55 +0100
Subject: [PATCH 1501/2040] Fix 1.11 servers filtered out

---
 code/client/cl_main.cpp | 44 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 81f414a4..75642b44 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3725,36 +3725,34 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 		return;
 	}
 
-	if (!com_target_demo->integer && prot == protocol_version_demo) {
+	if (!com_target_demo->integer && protocol_version_demo != protocol_version_full && prot == protocol_version_demo) {
 		Com_DPrintf("Full version found compatible demo protocol version. %s\n", infoString);
 	}
 
     pszVersion = Info_ValueForKey(infoString, "gamever");
     pszServerType = Info_ValueForKey(infoString, "serverType");
 
-	if (!*pszVersion) {
-		return;
-	}
-
-	if (*pszVersion == 'd') {
-		pszVersion++;
-	}
-
-    if (com_target_game->integer >= target_game_e::TG_MOHTT) {
-        if (atoi(pszServerType) == target_game_e::TG_MOHTT) {
-            if (fabs(atof(pszVersion)) < 2.3f) {
-				return;
-            }
-        } else {
-            if (fabs(atof(pszVersion)) < 2.1f) {
-				return;
-            }
+    if (*pszVersion) {
+        if (*pszVersion == 'd') {
+            pszVersion++;
         }
-    } else {
-        if (fabs(atof(pszVersion) - com_target_version->value) > 0.1f) {
-			return;
-        }
-    }
+
+		if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+			if (atoi(pszServerType) == target_game_e::TG_MOHTT) {
+				if (fabs(atof(pszVersion)) < 2.3f) {
+					return;
+				}
+			} else {
+				if (fabs(atof(pszVersion)) < 2.1f) {
+					return;
+				}
+			}
+		} else {
+			if (fabs(atof(pszVersion) - com_target_version->value) > 0.1f) {
+				return;
+			}
+		}
+	}
 
 	// iterate servers waiting for ping response
 	for (i=0; i<MAX_PINGREQUESTS; i++)

From 1e609a4b2f28131038f5ce6b29f6434ef3460f87 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 22:24:50 +0100
Subject: [PATCH 1502/2040] Ignore bullet tracers in 1.11 and below

Before 2.0, the tracer frequency is set on almost all weapons. This has some artifacts on multiplayer, the tracer doesn't look adjusted in first-person view
---
 code/fgame/weapon.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 67cf8f9b..95382714 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1887,7 +1887,9 @@ void Weapon::Shoot(Event *ev)
                     vSpread = (bulletspreadmax[mode] + bulletspread[mode]) * 0.5f;
                 }
 
-                if (!g_gametype->integer && owner && owner->IsSubclassOfPlayer()) {
+                // Don't display tracers if the owner is a player for non-turret weapons
+                // It would have some artifacts for the first person model, as the tracer is created from the world model
+                if ((g_target_game == TG_MOH || g_gametype->integer == GT_SINGLE_PLAYER) && owner && owner->IsSubclassOfPlayer()) {
                     if (IsSubclassOfTurretGun()) {
                         tracerFrequency = 3;
                     } else {

From 50eda4156a2fa6c785a964461dcce0747f133833 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 22:44:04 +0100
Subject: [PATCH 1503/2040] Don't remove the weapon if it has no start ammo

Instead, prevent sentients from picking up weapons if they get no ammo from it and they already have that weapon. Instead, just let the weapon be picked up as a new weapon
---
 code/fgame/weapon.cpp | 46 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 95382714..e312a7b8 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -2427,13 +2427,6 @@ qboolean Weapon::Drop(void)
         }
     }
 
-    if (!startammo[FIRE_PRIMARY] && !startammo[FIRE_SECONDARY]) {
-        // Fixed in OPM
-        //  Don't drop the weapon at all if it has no ammo
-        PostEvent(EV_Remove, 0);
-        return false;
-    }
-
     // Wait some time before the last owner can pickup this weapon
     last_owner              = owner;
     last_owner_trigger_time = level.time + 2.0f;
@@ -3006,6 +2999,16 @@ void Weapon::PickupWeapon(Event *ev)
             startammo[FIRE_SECONDARY] = 0;
         }
 
+        iGiveAmmo = ammo_in_clip[FIRE_PRIMARY] + startammo[FIRE_PRIMARY];
+
+        if (!iGiveAmmo && !startammo[FIRE_SECONDARY]) {
+            // Fixed in OPM
+            //  Don't let the sentient pick the ammo up if it already has the weapon in inventory
+            //  and the player would get no ammo.
+            //  This can only be picked up as a new weapon.
+            return;
+        }
+
         setSolidType(SOLID_NOT);
         hideModel();
 
@@ -3017,13 +3020,10 @@ void Weapon::PickupWeapon(Event *ev)
 
         if (Respawnable()) {
             PostEvent(EV_Item_Respawn, 0);
-        }
-        else {
+        } else {
             PostEvent(EV_Remove, 0);
         }
 
-        iGiveAmmo = ammo_in_clip[FIRE_PRIMARY] + startammo[FIRE_PRIMARY];
-
         Sound(m_sAmmoPickupSound);
     }
 
@@ -3033,18 +3033,6 @@ void Weapon::PickupWeapon(Event *ev)
 
         sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
-        /*
-        if (!g_gametype->integer && other->IsSubclassOfPlayer()) {
-            if (!sAmmoType.icmp("agrenade")) {
-                if (iGiveAmmo == 1) {
-                    sMessage = gi.LV_ConvertString("Got 1 Grenade");
-                } else {
-                    sMessage = gi.LV_ConvertString(va("Got %i Grenades", iGiveAmmo));
-                }
-            }
-        }
-        */
-
         if (!sAmmoType.icmp("grenade") || !sAmmoType.icmp("agrenade")) {
             if (iGiveAmmo == 1) {
                 sMessage = gi.LV_ConvertString("Got 1 Grenade");
@@ -3067,18 +3055,6 @@ void Weapon::PickupWeapon(Event *ev)
 
             sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
-            /*
-            if (!g_gametype->integer && other->IsSubclassOfPlayer()) {
-                if (!sAmmoType.icmp("agrenade")) {
-                    if (iGiveAmmo == 1) {
-                        sMessage = gi.LV_ConvertString("Got 1 Grenade");
-                    } else {
-                        sMessage = gi.LV_ConvertString(va("Got %i Grenades", iGiveAmmo));
-                    }
-                }
-            }
-            */
-
             if (!sAmmoType.icmp("grenade") || !sAmmoType.icmp("agrenade")) {
                 if (iGiveAmmo == 1) {
                     sMessage = gi.LV_ConvertString("Got 1 Grenade");

From c788d57c5232e29ab3607a42ddcba4b23bff3347 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 19 Nov 2024 23:09:52 +0100
Subject: [PATCH 1504/2040] Use abort() rather than doing a segfault

---
 code/sys/sys_main.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 74939be8..cbf20b6a 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -722,7 +722,7 @@ void Sys_SigHandler( int signum )
 	if( signalcaught )
 	{
 		fprintf( stderr, "DOUBLE SIGNAL FAULT: Received signal %d, exiting...\n",
-			signal );
+			signum );
 	}
 	else
 	{
@@ -731,18 +731,22 @@ void Sys_SigHandler( int signum )
         printf("----\nBacktrace:\n");
         Sys_PrintBackTrace();
         printf("----\n");
-		// Call the default signal handler to generate a core dump
-		SIG_DFL(signum);
+
+		//
+		// Abort to generate a core dump and exit
+		//
+		signal(SIGABRT, SIG_DFL);
+		abort();
 
 		VM_Forced_Unload_Start();
 #ifndef DEDICATED
-		CL_Shutdown(va("Received signal %d", signal), qtrue, qtrue);
+		CL_Shutdown(va("Received signal %d", signum), qtrue, qtrue);
 #endif
-		SV_Shutdown(va("Received signal %d", signal) );
+		SV_Shutdown(va("Received signal %d", signum) );
 		VM_Forced_Unload_Done();
 	}
 
-	if( signal == SIGTERM || signal == SIGINT )
+	if( signum == SIGTERM || signum == SIGINT )
 		Sys_Exit( 1 );
 	else
 		Sys_Exit( 2 );

From 58d8a73269a56be7192c5622c1d20081852fa6af Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:46:04 +0100
Subject: [PATCH 1505/2040] Don't abort() on interrupt or on program
 termination

---
 code/sys/sys_main.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index cbf20b6a..15518c49 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -732,11 +732,13 @@ void Sys_SigHandler( int signum )
         Sys_PrintBackTrace();
         printf("----\n");
 
-		//
-		// Abort to generate a core dump and exit
-		//
-		signal(SIGABRT, SIG_DFL);
-		abort();
+		if (signum != SIGTERM && signum != SIGINT) {
+			//
+			// Abort to generate a core dump and exit
+			//
+			signal(SIGABRT, SIG_DFL);
+			abort();
+		}
 
 		VM_Forced_Unload_Start();
 #ifndef DEDICATED

From f1c12e06498b8afd54a7d4cce51abfd154b26999 Mon Sep 17 00:00:00 2001
From: Joey Riches <josephriches@gmail.com>
Date: Wed, 20 Nov 2024 15:40:01 +0000
Subject: [PATCH 1506/2040] misc: Add linux assets

Add a .desktop file, this is used by application launchers in order to
find and execute applications, this should be installed to
`/usr/share/applications/org.openmoh.openmohaa.desktop`.

Add appstream metainfo, this provides metainfo that is used by Software
Centers for discoverability, this should be installed to
`/usr/share/metainfo/org.openmoh.openmohaa.metainfo.xml`.

This will open the door to getting OpenMoHAA packaged up by various
linux distros.
---
 CMakeLists.txt                                | 36 +++++++++++++++++-
 misc/linux/org.openmoh.openmohaa.desktop.in   | 11 ++++++
 misc/linux/org.openmoh.openmohaa.metainfo.xml | 38 +++++++++++++++++++
 misc/linux/org.openmoh.openmohaab.desktop.in  | 11 ++++++
 misc/linux/org.openmoh.openmohaas.desktop.in  | 11 ++++++
 5 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 misc/linux/org.openmoh.openmohaa.desktop.in
 create mode 100644 misc/linux/org.openmoh.openmohaa.metainfo.xml
 create mode 100644 misc/linux/org.openmoh.openmohaab.desktop.in
 create mode 100644 misc/linux/org.openmoh.openmohaas.desktop.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3d823b7..eb113f8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ INSTALL(TARGETS omohaaded DESTINATION "./")
 
 if (NOT BUILD_NO_CLIENT)
 	## Client app
-	
+
 	add_subdirectory("code/client")
 	add_subdirectory("code/renderer")
 	add_subdirectory("code/sdl")
@@ -167,6 +167,40 @@ if (NOT BUILD_NO_CLIENT)
 	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BIN_SUFFIX}")
 	set_target_properties(openmohaa PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
+	if(UNIX AND NOT APPLE)
+
+		set(TARGET_ARCH ${TARGET_BIN_SUFFIX})
+
+		# Configure the .desktop entries with the arch suffix
+		configure_file(
+			misc/linux/org.openmoh.openmohaa.desktop.in
+			${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaa.desktop
+			@ONLY
+		)
+		configure_file(
+			misc/linux/org.openmoh.openmohaab.desktop.in
+			${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaab.desktop
+			@ONLY
+		)
+		configure_file(
+			misc/linux/org.openmoh.openmohaas.desktop.in
+			${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaas.desktop
+			@ONLY
+		)
+
+		# Set destination directory for .desktop files
+		set(DESKTOP_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
+
+		# Install .desktop entries
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaa.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaab.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaas.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
+
+		install(FILES misc/linux/org.openmoh.openmohaa.metainfo.xml DESTINATION share/metainfo)
+
+		install(FILES misc/openmohaa.svg DESTINATION share/icons/hicolor/symbolic/apps/ RENAME org.openmoh.openmohaa.svg)
+	endif()
+
 	if(USE_INTERNAL_JPEG)
 		target_include_directories(openmohaa PUBLIC "code/jpeg-8c")
 		target_link_libraries(openmohaa PRIVATE jpeg8)
diff --git a/misc/linux/org.openmoh.openmohaa.desktop.in b/misc/linux/org.openmoh.openmohaa.desktop.in
new file mode 100644
index 00000000..f9657705
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaa.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenMoHAA
+Comment=An open-source game engine compatible with Medal of Honor: Allied Assault
+Categories=Game;Shooter;
+
+Icon=org.openmoh.openmohaa
+Exec=launch_openmohaa_base@TARGET_ARCH@
+Terminal=false
diff --git a/misc/linux/org.openmoh.openmohaa.metainfo.xml b/misc/linux/org.openmoh.openmohaa.metainfo.xml
new file mode 100644
index 00000000..b1229586
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaa.metainfo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.openmoh.openmohaa</id>
+
+  <name>OpenMoHAA</name>
+  <summary>An open-source game engine compatible with Medal of Honor: Allied Assault and its expansions (Spearhead and Breakthrough)</summary>
+
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-2.0-or-later</project_license>
+
+  <description>
+    <p>
+      The main goal of OpenMoHAA is to ensure the future and continuity of Medal of Honor: Allied Assault. It has always been a dream in the community to provide patches and security fixes for the game. Thanks to the ioquake3 project, F.A.K.K SDK and other quality tools, OpenMoHAA has already reached more than half of its goal: to create an open-source version of MoH:AA (based on version 2.40) that is fully compatible with the original game (in terms of protocol, assets, and scripts).
+    </p>
+  </description>
+
+  <launchable type="desktop-id">org.openmoh.openmohaa.desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://github.com/openmoh/openmohaa/blob/main/docs/images/v0.60.0-x86_64/mohdm1_1.png?raw=true</image>
+      <caption>Shows a smoke being deployed during multiplayer gameplay</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://github.com/openmoh/openmohaa/blob/main/docs/images/v0.60.0-x86_64/flughafen_1.png?raw=true</image>
+      <caption>Shows a turret firing during multiplayer gameplay</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://github.com/openmoh/openmohaa/blob/main/docs/images/v0.60.0-x86_64/flughafen_3.png?raw=true</image>
+      <caption>Shows a mortar firing during multiplayer gameplay</caption>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.0">
+    <content_attribute id="violence-realistic">moderate</content_attribute>
+    <content_attribute id="social-chat">moderate</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+  </content_rating>
+</component>
diff --git a/misc/linux/org.openmoh.openmohaab.desktop.in b/misc/linux/org.openmoh.openmohaab.desktop.in
new file mode 100644
index 00000000..5b2ecf3d
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaab.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenMoHAA Breakthrough
+Comment=An open-source game engine compatible with Medal of Honor: Allied Assault Breakthrough
+Categories=Game;Shooter;
+
+Icon=org.openmoh.openmohaa
+Exec=launch_openmohaa_breakthrough@TARGET_ARCH@
+Terminal=false
diff --git a/misc/linux/org.openmoh.openmohaas.desktop.in b/misc/linux/org.openmoh.openmohaas.desktop.in
new file mode 100644
index 00000000..66633291
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaas.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenMoHAA Spearhead
+Comment=An open-source game engine compatible with Medal of Honor: Allied Assault Spearhead
+Categories=Game;Shooter;
+
+Icon=org.openmoh.openmohaa
+Exec=launch_openmohaa_spearhead@TARGET_ARCH@
+Terminal=false

From 864cdf1fc653013356a56d04c4238323acdf39aa Mon Sep 17 00:00:00 2001
From: Joey Riches <josephriches@gmail.com>
Date: Wed, 20 Nov 2024 17:01:30 +0000
Subject: [PATCH 1507/2040] CMake: Add uninstall target

https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake

Useful when for testing system-wide installation with linux
---
 CMakeLists.txt           | 12 ++++++++++++
 cmake_uninstall.cmake.in | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 cmake_uninstall.cmake.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb113f8d..b68c0e40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,3 +221,15 @@ endif()
 # Launcher
 
 add_subdirectory(code/Launcher)
+
+# uninstall target
+if(NOT TARGET uninstall)
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+  add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+endif()
+
diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
new file mode 100644
index 00000000..7db7869a
--- /dev/null
+++ b/cmake_uninstall.cmake.in
@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
+endif()
+
+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    execute_process(
+      COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_VARIABLE rm_out
+      RESULT_VARIABLE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif()
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif()
+endforeach()

From 120a486aeace96a278b6e44e98fffc0eccea59e4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:06:14 +0100
Subject: [PATCH 1508/2040] Use CMake installation directory

This removes the use of the DESTINATION parameter from install() command and instead rely on default values.
The shared build action file was modified to package installed files in a single folder
---
 .github/workflows/shared-build.yml | 31 +++++++++++++++++++-----------
 CMakeLists.txt                     | 12 ++++++++----
 code/Launcher/CMakeLists.txt       |  4 ++--
 code/cgame/CMakeLists.txt          | 11 +++--------
 code/fgame/CMakeLists.txt          | 11 +++--------
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index fa75431b..c1778b2a 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -139,8 +139,11 @@ jobs:
       run: |
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         # Copy libraries
-        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/install/'
-        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/install/'
+        mkdir ${{github.workspace}}/package
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/. '${{github.workspace}}/package'; fi
 
     ###
     # Artifacts
@@ -151,7 +154,7 @@ jobs:
         name: out-linux-${{matrix.architecture.name}}
         if-no-files-found: error
         path:
-          ${{github.workspace}}/install
+          ${{github.workspace}}/package
 
   ##########################
   #
@@ -306,8 +309,11 @@ jobs:
       # Install to the directory defined in CMAKE_INSTALL_PREFIX
       run: |
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/install'
-        Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/install'
+        New-Item -ItemType Directory '${{github.workspace}}/package'
+        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe' -Destination '${{github.workspace}}/package' }
+        if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe' -Destination '${{github.workspace}}/package' }
 
     ###
     # Artifact
@@ -318,15 +324,15 @@ jobs:
         name: out-windows-${{matrix.architecture.name}}
         if-no-files-found: error
         path: |
-          ${{github.workspace}}/install
-          !${{github.workspace}}/install/**/*.pdb
+          ${{github.workspace}}/package
+          !${{github.workspace}}/package/**/*.pdb
 
     - uses: actions/upload-artifact@v4
       with:
         name: out-windows-${{matrix.architecture.name}}-pdb
         if-no-files-found: error
         path: |
-          ${{github.workspace}}/install
+          ${{github.workspace}}/package
 
   ##########################
   #
@@ -447,8 +453,11 @@ jobs:
       run: |
         cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         # Create hard-link and copy symbolic links
-        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/install/'
-        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/install/'
+        mkdir ${{github.workspace}}/package
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/package/'
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/. '${{github.workspace}}/package'; fi
 
     ###
     # Artifacts
@@ -459,4 +468,4 @@ jobs:
         name: out-macos-${{matrix.architecture.name}}
         if-no-files-found: error
         path:
-          ${{github.workspace}}/install
+          ${{github.workspace}}/package
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b68c0e40..58551cc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,10 @@ option(USE_INTERNAL_JPEG "If set, use bundled libjpeg." ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_MAD  "If set, use bundled libmad."  ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_ZLIB "If set, use bundled zlib."    ${USE_INTERNAL_LIBS})
 
+# Installation directory
+set(CMAKE_INSTALL_BINDIR bin CACHE PATH "Binary dir")
+set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Library dir")
+include(GNUInstallDirs)
 
 if(TARGET_GAME_TYPE)
 	message(SEND_ERROR "TARGET_GAME_TYPE is now unsupported, it is now done at runtime.")
@@ -138,10 +142,10 @@ set_target_properties(omohaaded PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 if (MSVC)
 	target_link_options(omohaaded PRIVATE "/MANIFEST:NO")
-	INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION "./" OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION bin OPTIONAL)
 endif()
 
-INSTALL(TARGETS omohaaded DESTINATION "./")
+INSTALL(TARGETS omohaaded)
 
 if (NOT BUILD_NO_CLIENT)
 	## Client app
@@ -212,10 +216,10 @@ if (NOT BUILD_NO_CLIENT)
 
 	if (MSVC)
 		target_link_options(openmohaa PRIVATE "/MANIFEST:NO")
-		INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION "./" OPTIONAL)
+		INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION bin OPTIONAL)
 	endif()
 
-	INSTALL(TARGETS openmohaa DESTINATION "./")
+	INSTALL(TARGETS openmohaa)
 endif()
 
 # Launcher
diff --git a/code/Launcher/CMakeLists.txt b/code/Launcher/CMakeLists.txt
index 68fa6abd..6dd6f509 100644
--- a/code/Launcher/CMakeLists.txt
+++ b/code/Launcher/CMakeLists.txt
@@ -18,7 +18,7 @@ function (create_launcher name type)
     target_compile_features(openmohaa_launcher_${name} PRIVATE cxx_std_17)
     set_target_properties(openmohaa_launcher_${name} PROPERTIES OUTPUT_NAME "launch_openmohaa_${name}${TARGET_BIN_SUFFIX}")
 
-    INSTALL(TARGETS openmohaa_launcher_${name} DESTINATION "./")
+    INSTALL(TARGETS openmohaa_launcher_${name})
 
     #add_executable(omohaaded_launcher_${name} ${LAUNCHER_SOURCES})
     #target_include_directories(omohaaded_launcher_${name} PUBLIC "../qcommon")
@@ -26,7 +26,7 @@ function (create_launcher name type)
     #target_compile_features(omohaaded_launcher_${name} PRIVATE cxx_std_17)
     #set_target_properties(omohaaded_launcher_${name} PROPERTIES OUTPUT_NAME "launch_omohaaded_${name}${TARGET_BIN_SUFFIX}")
     #
-    #INSTALL(TARGETS omohaaded_launcher_${name} DESTINATION "./")
+    #INSTALL(TARGETS omohaaded_launcher_${name})
 endfunction()
 
 create_launcher(base 0)
diff --git a/code/cgame/CMakeLists.txt b/code/cgame/CMakeLists.txt
index fd6974b8..1f6ef8ed 100644
--- a/code/cgame/CMakeLists.txt
+++ b/code/cgame/CMakeLists.txt
@@ -27,16 +27,11 @@ target_compile_features(cgame PUBLIC cxx_nullptr)
 target_compile_features(cgame PUBLIC c_variadic_macros)
 target_link_libraries(cgame PUBLIC qcommon)
 
-set_target_properties(cgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
+set_target_properties(cgame PROPERTIES PREFIX "")
 set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_BIN_SUFFIX}")
-set_target_properties(cgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
 
-INSTALL(
-	TARGETS cgame
-	LIBRARY DESTINATION "${TARGET_BASE_GAME}"
-	RUNTIME DESTINATION "${TARGET_BASE_GAME}"
-)
+INSTALL(TARGETS cgame)
 
 if(MSVC)
-	INSTALL(FILES $<TARGET_PDB_FILE:cgame> DESTINATION "${TARGET_BASE_GAME}" OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:cgame> DESTINATION bin OPTIONAL)
 endif()
\ No newline at end of file
diff --git a/code/fgame/CMakeLists.txt b/code/fgame/CMakeLists.txt
index 35524cd6..950ac59e 100644
--- a/code/fgame/CMakeLists.txt
+++ b/code/fgame/CMakeLists.txt
@@ -66,16 +66,11 @@ target_compile_features(fgame PUBLIC cxx_nullptr)
 target_compile_features(fgame PUBLIC c_variadic_macros)
 target_link_libraries(fgame PUBLIC qcommon)
 
-set_target_properties(fgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
+set_target_properties(fgame PROPERTIES PREFIX "")
 set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_BIN_SUFFIX}")
-set_target_properties(fgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
 
-INSTALL(
-	TARGETS fgame
-	LIBRARY DESTINATION "${TARGET_BASE_GAME}"
-	RUNTIME DESTINATION "${TARGET_BASE_GAME}"
-)
+INSTALL(TARGETS fgame)
 
 if(MSVC)
-	INSTALL(FILES $<TARGET_PDB_FILE:fgame> DESTINATION "${TARGET_BASE_GAME}" OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:fgame> DESTINATION bin OPTIONAL)
 endif()

From ad825f51147b781840040846e72f10dd18116fe6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 20 Nov 2024 23:02:22 +0100
Subject: [PATCH 1509/2040] Reimplement noise functions

---
 code/qcommon/q_math.c   | 266 +++++++++++++++++++++++++++++++++-------
 code/qcommon/q_shared.h |   7 +-
 2 files changed, 230 insertions(+), 43 deletions(-)

diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index d5c102af..f8efe16b 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -948,58 +948,242 @@ float LerpAngle (float from, float to, float frac) {
 
 	return a;
 }
-static int p[514];
-static float g3[514][3];
-static float g2[514][2];
-static float g1[514];
-
-static void init(void)
+float bias(float a, float b)
 {
-	//This is an ugly func I wont bother variable naming.
-	int i;
-	for (i = 0; i < 256; i++)
-	{
-		p[i] = i;
-		g1[i] = (rand() % 512 - 256) * 0.00390625;
-	}
-	int v21, v22;
-	for (int j = i - 1; j; p[v22 % 256] = v21)
-	{
-		v21 = p[j];
-		v22 = rand();
-		p[j--] = p[v22 % 256];
-	}
-
-	for (size_t k = 0; k < 258; k++)
-	{
-		g1[k + 256] = g1[k];
-	}
-
+	return pow(a, log(b) / log(0.5));
 }
+
+float gain(float a, float b)
+{
+	float p = log(1. - b) / log(0.5);
+
+	if (a < .001)
+		return 0.;
+	else if (a > .999)
+		return 1.;
+	if (a < 0.5)
+		return pow(2 * a, p) / 2;
+	else
+		return 1. - pow(2 * (1. - a), p) / 2;
+}
+
+float noise(float vec[], int len)
+{
+	switch (len) {
+	case 0:
+		return 0.;
+	case 1:
+		return noise1(vec[0]);
+	case 2:
+		return noise2(vec);
+	default:
+		return noise3(vec);
+	}
+}
+
+float turbulence(float *v, float freq)
+{
+	float t, vec[3];
+
+	for (t = 0. ; freq >= 1. ; freq /= 2) {
+		vec[0] = freq * v[0];
+		vec[1] = freq * v[1];
+		vec[2] = freq * v[2];
+		t += fabs(noise3(vec)) / freq;
+	}
+	return t;
+}
+
+/* noise functions over 1, 2, and 3 dimensions */
+
+#define B 0x100
+#define BM 0xff
+
+#define N 0x1000
+#define NP 12   /* 2^N */
+#define NM 0xfff
+
+static int p[B + B + 2];
+static float g3[B + B + 2][3];
+static float g2[B + B + 2][2];
+static float g1[B + B + 2];
 static int start = 1;
 
+static void init(void);
+
+#define s_curve(t) ( t * t * (3. - 2. * t) )
+
+#define lerp(t, a, b) ( a + t * (b - a) )
+
+#define setup(i,b0,b1,r0,r1)\
+	t = vec[i] + N;\
+	b0 = ((int)t) & BM;\
+	b1 = (b0+1) & BM;\
+	r0 = t - (int)t;\
+	r1 = r0 - 1.;
+
 float noise1(float arg)
 {
-	float rx0;
-	float rx1;
-	float u;
-	float sx;
-	float t;
-	int bx0;
+	int bx0, bx1;
+	float rx0, rx1, sx, t, u, v, vec[1];
 
-	if (start)
-	{
+	vec[0] = arg;
+	if (start) {
 		start = 0;
 		init();
 	}
 
-	rx0 = arg + 4096.0;
-	bx0 = (int)rx0;
-	rx1 = rx0 - bx0;
-	sx = rx1 - 1.0;
-	t = rx1 * rx1 * (3.0 - (rx1 + rx1));
-	u = rx1 * g1[p[bx0]];
-	return u + t * (sx * g1[p[bx0 + 1]] - u);
+	setup(0, bx0,bx1, rx0,rx1);
+
+	sx = s_curve(rx0);
+
+	u = rx0 * g1[ p[ bx0 ] ];
+	v = rx1 * g1[ p[ bx1 ] ];
+
+	return lerp(sx, u, v);
+}
+
+float noise2(vec3_t vec)
+{
+	int bx0, bx1, by0, by1, b00, b10, b01, b11;
+	float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
+	register int i, j;
+
+	if (start) {
+		start = 0;
+		init();
+	}
+
+	setup(0, bx0,bx1, rx0,rx1);
+	setup(1, by0,by1, ry0,ry1);
+
+	i = p[ bx0 ];
+	j = p[ bx1 ];
+
+	b00 = p[ i + by0 ];
+	b10 = p[ j + by0 ];
+	b01 = p[ i + by1 ];
+	b11 = p[ j + by1 ];
+
+	sx = s_curve(rx0);
+	sy = s_curve(ry0);
+
+#define at2(rx,ry) ( rx * q[0] + ry * q[1] )
+
+	q = g2[ b00 ] ; u = at2(rx0,ry0);
+	q = g2[ b10 ] ; v = at2(rx1,ry0);
+	a = lerp(sx, u, v);
+
+	q = g2[ b01 ] ; u = at2(rx0,ry1);
+	q = g2[ b11 ] ; v = at2(rx1,ry1);
+	b = lerp(sx, u, v);
+
+	return lerp(sy, a, b);
+}
+
+float noise3(vec3_t vec)
+{
+	int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+	float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+	register int i, j;
+
+	if (start) {
+		start = 0;
+		init();
+	}
+
+	setup(0, bx0,bx1, rx0,rx1);
+	setup(1, by0,by1, ry0,ry1);
+	setup(2, bz0,bz1, rz0,rz1);
+
+	i = p[ bx0 ];
+	j = p[ bx1 ];
+
+	b00 = p[ i + by0 ];
+	b10 = p[ j + by0 ];
+	b01 = p[ i + by1 ];
+	b11 = p[ j + by1 ];
+
+	t  = s_curve(rx0);
+	sy = s_curve(ry0);
+	sz = s_curve(rz0);
+
+#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
+
+	q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
+	q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
+	a = lerp(t, u, v);
+
+	q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
+	q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
+	b = lerp(t, u, v);
+
+	c = lerp(sy, a, b);
+
+	q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
+	q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
+	a = lerp(t, u, v);
+
+	q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
+	q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
+	b = lerp(t, u, v);
+
+	d = lerp(sy, a, b);
+
+	return lerp(sz, c, d);
+}
+
+static void normalize2(vec2_t v)
+{
+	float s;
+
+	s = sqrt(v[0] * v[0] + v[1] * v[1]);
+	v[0] = v[0] / s;
+	v[1] = v[1] / s;
+}
+
+static void normalize3(vec3_t v)
+{
+	float s;
+
+	s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+	v[0] = v[0] / s;
+	v[1] = v[1] / s;
+	v[2] = v[2] / s;
+}
+
+static void init(void)
+{
+	int i, j, k;
+
+	for (i = 0 ; i < B ; i++) {
+		p[i] = i;
+
+		g1[i] = (float)((rand() % (B + B)) - B) / B;
+
+		for (j = 0 ; j < 2 ; j++)
+			g2[i][j] = (float)((rand() % (B + B)) - B) / B;
+		normalize2(g2[i]);
+
+		for (j = 0 ; j < 3 ; j++)
+			g3[i][j] = (float)((rand() % (B + B)) - B) / B;
+		normalize3(g3[i]);
+	}
+
+	while (--i) {
+		k = p[i];
+		p[i] = p[j = rand() % B];
+		p[j] = k;
+	}
+
+	for (i = 0 ; i < B + 2 ; i++) {
+		p[B + i] = p[i];
+		g1[B + i] = g1[i];
+		for (j = 0 ; j < 2 ; j++)
+			g2[B + i][j] = g2[i][j];
+		for (j = 0 ; j < 3 ; j++)
+			g3[B + i][j] = g3[i][j];
+	}
 }
 
 /*
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index eaf3eb75..46ceaba9 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -838,8 +838,11 @@ void vectoangles( const vec3_t value1, vec3_t angles );
 void VectorToAngles( const vec3_t vec, vec3_t angles );
 void AnglesToAxis(const vec3_t angles, vec3_t axis[3]);
 void YawToAxis(float yaw, float axis[2]);
-static  void init( void );
-float	noise1(float arg);
+
+float noise(float vec[], int len);
+float noise1(float arg);
+float noise2(vec3_t arg);
+float noise3(vec3_t arg);
 
 void	R_ConcatRotations( float in1[ 3 ][ 3 ], float in2[ 3 ][ 3 ], float out[ 3 ][ 3 ] );
 void	R_ConcatTransforms( float in1[ 3 ][ 4 ], float in2[ 3 ][ 4 ], float out[ 3 ][ 4 ] );

From 48c2d026e6fb383ea6c136d1b75e1f0f9d2d9e88 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 20 Nov 2024 23:32:37 +0100
Subject: [PATCH 1510/2040] Fix ActorPath not archiving path properly

It was mistakenly archiving the first path multiple times instead of the whole path array. This lead to AI strangely moving after loading from save
---
 code/fgame/actorpath.h | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/code/fgame/actorpath.h b/code/fgame/actorpath.h
index 0ecb0019..ced7fcc6 100644
--- a/code/fgame/actorpath.h
+++ b/code/fgame/actorpath.h
@@ -105,8 +105,8 @@ public:
 
 inline void ActorPath::Archive(Archiver& arc)
 {
-    int pos;
-    int startpathpos;
+    int index;
+    int i;
 
     arc.ArchiveInteger(&m_pathlen);
 
@@ -115,42 +115,40 @@ inline void ActorPath::Archive(Archiver& arc)
             m_path = new PathInfo[m_pathlen];
         }
 
-        if (m_pathlen > 0) {
-            for (int i = 0; i < m_pathlen; i++) {
-                m_path->Archive(arc);
-            }
+        for (i = 0; i < m_pathlen; i++) {
+            m_path[i].Archive(arc);
         }
 
         if (!arc.Saving()) {
-            arc.ArchiveInteger(&pos);
-            if (pos == -1) {
+            arc.ArchiveInteger(&index);
+            if (index == -1) {
                 m_pathpos = NULL;
             } else {
-                m_pathpos = &m_path[pos];
+                m_pathpos = &m_path[index];
             }
 
-            arc.ArchiveInteger(&startpathpos);
-            if (startpathpos == -1) {
+            arc.ArchiveInteger(&index);
+            if (index == -1) {
                 m_startpathpos = NULL;
             } else {
-                m_startpathpos = &m_path[pos];
+                m_startpathpos = &m_path[index];
             }
         } else {
             if (m_pathpos) {
-                pos = m_pathpos - m_path;
+                index = m_pathpos - m_path;
             } else {
-                pos = -1;
+                index = -1;
             }
 
-            arc.ArchiveInteger(&pos);
+            arc.ArchiveInteger(&index);
 
             if (m_startpathpos) {
-                pos = m_startpathpos - m_path;
+                index = m_startpathpos - m_path;
             } else {
-                pos = -1;
+                index = -1;
             }
 
-            arc.ArchiveInteger(&pos);
+            arc.ArchiveInteger(&index);
         }
     } else if (arc.Loading()) {
         m_pathpos = 0;

From 7e7b3ab280040dc908e684dac63643cc5901069d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 21 Nov 2024 00:13:37 +0100
Subject: [PATCH 1511/2040] Fix PDB files mistakenly not included

---
 .github/workflows/shared-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index c1778b2a..7acef3ce 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -312,8 +312,8 @@ jobs:
         New-Item -ItemType Directory '${{github.workspace}}/package'
         Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
         Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
-        if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe' -Destination '${{github.workspace}}/package' }
-        if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe' -Destination '${{github.workspace}}/package' }
+        if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
+        if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
 
     ###
     # Artifact

From 2ce8450a7e945f21ec5dcace188b7e8e8cab5ee3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 21 Nov 2024 01:14:08 +0100
Subject: [PATCH 1512/2040] Use fprintf to stderr

---
 code/sys/sys_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 15518c49..4a87a5d2 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -728,9 +728,9 @@ void Sys_SigHandler( int signum )
 	{
 		signalcaught = qtrue;
 
-        printf("----\nBacktrace:\n");
+        fprintf(stderr, "----\nBacktrace:\n");
         Sys_PrintBackTrace();
-        printf("----\n");
+		fprintf(stderr, "----\n");
 
 		if (signum != SIGTERM && signum != SIGINT) {
 			//

From 64f877ae80952d8a34ee1cb67c109d10e0ecd4dd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 21 Nov 2024 19:23:38 +0100
Subject: [PATCH 1513/2040] Use the correct convention for installing the
 project

On Win32:
- Binaries and libraries will be installed by default in <PREFIX>/bin
- The prefix is set to `Program Files/openmohaa` by default

On Unix:
- Binaries and libraries will be installed by default in <PREFIX>/lib/openmohaa
- Shared data will be installed in <PREFIX>/share/applications, <PREFIX>/share/metainfo and <PREFIX>/share/icons
- The prefix is set to `/usr/local` by default
---
 .github/workflows/shared-build.yml |   8 +--
 CMakeLists.txt                     | 102 ++++++++++++++++++-----------
 code/Launcher/CMakeLists.txt       |  16 +++--
 code/cgame/CMakeLists.txt          |   4 +-
 code/fgame/CMakeLists.txt          |   4 +-
 5 files changed, 80 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 7acef3ce..7495287f 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -142,8 +142,8 @@ jobs:
         mkdir ${{github.workspace}}/package
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
-        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/. '${{github.workspace}}/package'; fi
-        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
 
     ###
     # Artifacts
@@ -456,8 +456,8 @@ jobs:
         mkdir ${{github.workspace}}/package
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/package/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/package/'
-        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/. '${{github.workspace}}/package'; fi
-        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
 
     ###
     # Artifacts
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58551cc1..d6e57b5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,11 +14,6 @@ option(USE_INTERNAL_JPEG "If set, use bundled libjpeg." ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_MAD  "If set, use bundled libmad."  ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_ZLIB "If set, use bundled zlib."    ${USE_INTERNAL_LIBS})
 
-# Installation directory
-set(CMAKE_INSTALL_BINDIR bin CACHE PATH "Binary dir")
-set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Library dir")
-include(GNUInstallDirs)
-
 if(TARGET_GAME_TYPE)
 	message(SEND_ERROR "TARGET_GAME_TYPE is now unsupported, it is now done at runtime.")
 endif()
@@ -115,16 +110,41 @@ if(APPLE)
 	endif()
 endif()
 
-# Common stuff
+#
+# Setup the installation directory
+#
+if(WIN32)
+	# By default, both DLLs and EXEs are in the same directory
+	set(CMAKE_DEFAULT_INSTALL_RUNTIME_DIR bin)
+	set(BIN_INSTALL_SUBDIR ".")
+	set(LIB_INSTALL_SUBDIR ".")
+else()
+	# Unix
+	set(CMAKE_DEFAULT_INSTALL_RUNTIME_DIR lib)
+	set(BIN_INSTALL_SUBDIR ${CMAKE_PROJECT_NAME})
+	set(LIB_INSTALL_SUBDIR ${CMAKE_PROJECT_NAME})
+endif()
 
+# By default, put both binaries and shared libraries in the same directory
+# the game uses internal shared libraries that must be in the same folder as the binaries
+set(CMAKE_INSTALL_BINDIR ${CMAKE_DEFAULT_INSTALL_RUNTIME_DIR} CACHE PATH "Binary dir")
+set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Library dir")
+include(GNUInstallDirs)
+
+#
+# Common stuff
+#
 add_subdirectory("code/qcommon")
 add_subdirectory("code/gamespy")
 
+#
 # Application
-
+#
 add_subdirectory("code/sys")
 
+##
 ## Server app
+##
 add_subdirectory("code/server")
 
 add_executable(omohaaded "code/null/null_client.c" "code/null/null_input.c" "code/null/null_snddma.c")
@@ -135,20 +155,22 @@ target_link_libraries(omohaaded PRIVATE omohserver)
 target_link_libraries(omohaaded PRIVATE syslib)
 target_link_libraries(omohaaded PRIVATE qcommon qcommon_standalone)
 
-# Gamespy dependency
+# Add the gamespy dependency
 target_include_directories(omohaaded PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server")
 set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BIN_SUFFIX}")
 set_target_properties(omohaaded PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
+INSTALL(TARGETS omohaaded DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR})
+
 if (MSVC)
 	target_link_options(omohaaded PRIVATE "/MANIFEST:NO")
-	INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION bin OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR} OPTIONAL)
 endif()
 
-INSTALL(TARGETS omohaaded)
-
 if (NOT BUILD_NO_CLIENT)
+	##
 	## Client app
+	##
 
 	add_subdirectory("code/client")
 	add_subdirectory("code/renderer")
@@ -165,14 +187,32 @@ if (NOT BUILD_NO_CLIENT)
 	target_link_libraries(openmohaa PRIVATE omohclient)
 	target_link_libraries(openmohaa PRIVATE omohrenderer omohsdl)
 	target_link_libraries(openmohaa PRIVATE qcommon qcommon_standalone)
-
-	### Gamespy dependency
+	
+	# Add the gamespy dependency
 	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib")
 	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BIN_SUFFIX}")
 	set_target_properties(openmohaa PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
-	if(UNIX AND NOT APPLE)
+	if(USE_INTERNAL_JPEG)
+		target_include_directories(openmohaa PUBLIC "code/jpeg-8c")
+		target_link_libraries(openmohaa PRIVATE jpeg8)
+	else()
+		find_package(JPEG REQUIRED)
+		target_include_directories(openmohaa PUBLIC ${JPEG_INCLUDE_DIRS})
+		target_link_libraries(openmohaa PRIVATE ${JPEG_LIBRARIES})
+	endif()
 
+	INSTALL(TARGETS openmohaa DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR})
+
+	if (MSVC)
+		target_link_options(openmohaa PRIVATE "/MANIFEST:NO")
+		INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR} OPTIONAL)
+	endif()
+
+	if(UNIX AND NOT APPLE)
+		#
+		# Desktop entries installation on Unix
+		#
 		set(TARGET_ARCH ${TARGET_BIN_SUFFIX})
 
 		# Configure the .desktop entries with the arch suffix
@@ -192,41 +232,25 @@ if (NOT BUILD_NO_CLIENT)
 			@ONLY
 		)
 
-		# Set destination directory for .desktop files
-		set(DESKTOP_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
-
 		# Install .desktop entries
-		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaa.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
-		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaab.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
-		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaas.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaa.desktop  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaab.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaas.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 
-		install(FILES misc/linux/org.openmoh.openmohaa.metainfo.xml DESTINATION share/metainfo)
+		install(FILES misc/linux/org.openmoh.openmohaa.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
 
-		install(FILES misc/openmohaa.svg DESTINATION share/icons/hicolor/symbolic/apps/ RENAME org.openmoh.openmohaa.svg)
+		install(FILES misc/openmohaa.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/symbolic/apps/ RENAME org.openmoh.openmohaa.svg)
 	endif()
-
-	if(USE_INTERNAL_JPEG)
-		target_include_directories(openmohaa PUBLIC "code/jpeg-8c")
-		target_link_libraries(openmohaa PRIVATE jpeg8)
-	else()
-		find_package(JPEG REQUIRED)
-		target_include_directories(openmohaa PUBLIC ${JPEG_INCLUDE_DIRS})
-		target_link_libraries(openmohaa PRIVATE ${JPEG_LIBRARIES})
-	endif()
-
-	if (MSVC)
-		target_link_options(openmohaa PRIVATE "/MANIFEST:NO")
-		INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION bin OPTIONAL)
-	endif()
-
-	INSTALL(TARGETS openmohaa)
 endif()
 
+#
 # Launcher
-
+#
 add_subdirectory(code/Launcher)
 
+#
 # uninstall target
+#
 if(NOT TARGET uninstall)
   configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
diff --git a/code/Launcher/CMakeLists.txt b/code/Launcher/CMakeLists.txt
index 6dd6f509..d35e8ec1 100644
--- a/code/Launcher/CMakeLists.txt
+++ b/code/Launcher/CMakeLists.txt
@@ -12,13 +12,15 @@ else()
 endif()
 
 function (create_launcher name type)
-    add_executable(openmohaa_launcher_${name} ${LAUNCHER_SOURCES})
-    target_include_directories(openmohaa_launcher_${name} PUBLIC "../qcommon")
-    target_compile_definitions(openmohaa_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type})
-    target_compile_features(openmohaa_launcher_${name} PRIVATE cxx_std_17)
-    set_target_properties(openmohaa_launcher_${name} PROPERTIES OUTPUT_NAME "launch_openmohaa_${name}${TARGET_BIN_SUFFIX}")
+    if (NOT BUILD_NO_CLIENT)
+        add_executable(openmohaa_launcher_${name} ${LAUNCHER_SOURCES})
+        target_include_directories(openmohaa_launcher_${name} PUBLIC "../qcommon")
+        target_compile_definitions(openmohaa_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type})
+        target_compile_features(openmohaa_launcher_${name} PRIVATE cxx_std_17)
+        set_target_properties(openmohaa_launcher_${name} PROPERTIES OUTPUT_NAME "launch_openmohaa_${name}${TARGET_BIN_SUFFIX}")
 
-    INSTALL(TARGETS openmohaa_launcher_${name})
+        INSTALL(TARGETS openmohaa_launcher_${name} DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR})
+    endif()
 
     #add_executable(omohaaded_launcher_${name} ${LAUNCHER_SOURCES})
     #target_include_directories(omohaaded_launcher_${name} PUBLIC "../qcommon")
@@ -26,7 +28,7 @@ function (create_launcher name type)
     #target_compile_features(omohaaded_launcher_${name} PRIVATE cxx_std_17)
     #set_target_properties(omohaaded_launcher_${name} PROPERTIES OUTPUT_NAME "launch_omohaaded_${name}${TARGET_BIN_SUFFIX}")
     #
-    #INSTALL(TARGETS omohaaded_launcher_${name})
+    #INSTALL(TARGETS omohaaded_launcher_${name} DESTINATION ${CMAKE_INSTALL_BINDIR}/${PROJECT_INSTALL_SUBDIR})
 endfunction()
 
 create_launcher(base 0)
diff --git a/code/cgame/CMakeLists.txt b/code/cgame/CMakeLists.txt
index 1f6ef8ed..8806106b 100644
--- a/code/cgame/CMakeLists.txt
+++ b/code/cgame/CMakeLists.txt
@@ -30,8 +30,8 @@ target_link_libraries(cgame PUBLIC qcommon)
 set_target_properties(cgame PROPERTIES PREFIX "")
 set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_BIN_SUFFIX}")
 
-INSTALL(TARGETS cgame)
+INSTALL(TARGETS cgame DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
 
 if(MSVC)
-	INSTALL(FILES $<TARGET_PDB_FILE:cgame> DESTINATION bin OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:cgame> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
 endif()
\ No newline at end of file
diff --git a/code/fgame/CMakeLists.txt b/code/fgame/CMakeLists.txt
index 950ac59e..8f6f2490 100644
--- a/code/fgame/CMakeLists.txt
+++ b/code/fgame/CMakeLists.txt
@@ -69,8 +69,8 @@ target_link_libraries(fgame PUBLIC qcommon)
 set_target_properties(fgame PROPERTIES PREFIX "")
 set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_BIN_SUFFIX}")
 
-INSTALL(TARGETS fgame)
+INSTALL(TARGETS fgame DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
 
 if(MSVC)
-	INSTALL(FILES $<TARGET_PDB_FILE:fgame> DESTINATION bin OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:fgame> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
 endif()

From 44d8adcfb09a4f7413fd2671588cb0a46dab44d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:26:12 +0100
Subject: [PATCH 1514/2040] Set the eyePos when loading from save

Server uses the playerState's vEyePos as the position, to add entities to snapshots, so make sure it's initialized before the next snapshot is sent
---
 code/fgame/g_utils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index a2c61338..6204835d 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -1217,6 +1217,11 @@ void G_ArchivePlayerState(Archiver& arc, playerState_t *ps)
     arc.ArchiveVec3(ps->camera_posofs);
     arc.ArchiveInteger(&ps->camera_flags);
     arc.ArchiveVec3(ps->damage_angles);
+
+    if (arc.Loading()) {
+        VectorCopy(ps->origin, ps->vEyePos);
+        ps->vEyePos[2] += ps->viewheight;
+    }
 }
 
 /*

From 3790f057e145508c72bce364409eb4e2f002b370 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:41:57 +0100
Subject: [PATCH 1515/2040] Fix an infinite loop in BulletAttack

This would be caused by an entity that is inside another entity, like 2 actors at the same location
---
 code/fgame/weaputils.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index e4cdfd1f..3d6934cf 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -2140,6 +2140,7 @@ float BulletAttack(
 {
     Vector  vDir;
     Vector  vTmpEnd;
+    Vector  vOldTmpEnd;
     Vector  vTraceStart;
     Vector  vTraceEnd;
     int     i;
@@ -2201,6 +2202,7 @@ float BulletAttack(
             iTravelDist += MAX_TRAVEL_DIST;
             vTraceStart = start;
             vTraceEnd   = start + vDir * iTravelDist;
+            vOldTmpEnd  = vTraceStart;
 
             memset(&trace, 0, sizeof(trace_t));
 
@@ -2460,13 +2462,16 @@ float BulletAttack(
                     trace.fraction = 1;
                 }
 
-                vDeltaTrace = vTraceStart - vTmpEnd;
+                vDeltaTrace = vTmpEnd - vOldTmpEnd;
                 if (!bBulletDone && DotProduct(vDeltaTrace, vDir) < 0) {
                     // Fixed in OPM
-                    //  Make sure the new trace doesn't start behind the end
+                    //  Make sure the new trace doesn't start behind the last one
                     //  This can happen in rare circumstances if the trace is out of the world limit
+                    //  Or if entities being shot are almost at the same origin
                     break;
                 }
+
+                vOldTmpEnd = vTmpEnd;
             }
         }
 

From ecfdcca4d54883d0c523ce42955dc1285786df2e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 21 Nov 2024 22:01:40 +0100
Subject: [PATCH 1516/2040] Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index af2f8fdc..1647149a 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 ## Intro
 
-The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of Honor: Allied Assault**. It has always been a dream in the community to provide patches and security fixes for the game. Thanks to the ioquake3 project, F.A.K.K SDK and other quality tools, OpenMoHAA has already reached more than half of its goal: to create an open-source version of MoH:AA (based on version 2.40) that is fully compatible with the original game (in terms of protocol, assets, and scripts).
+The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of Honor: Allied Assault** on all platforms/architectures by providing new patches/features. Thanks to the ioquake3 project and the F.A.K.K SDK, OpenMoHAA has already reached more than half of its goal: an open-source version of MoH:AA (based on version 2.40) that is fully compatible with the original game (in terms of protocol, assets, and scripts).
 
 ## Getting started
 
@@ -22,7 +22,7 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 
 ### Single-player
 
-The entire single-player campaign can be played from start to end. There may be occasional bugs though; if you encounter any, please create a new [GitHub issue](https://github.com/openmoh/openmohaa/issues) describing them.
+The entire single-player campaign should work (Allied Assault, Spearhead and Breakthrough). If you encounter any bug, please create a new [GitHub issue](https://github.com/openmoh/openmohaa/issues) describing them.
 
 ### Multiplayer
 

From 90639cee3647620ac5cbdfaff7ea017c82ab2803 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 22 Nov 2024 18:18:27 +0100
Subject: [PATCH 1517/2040] Fix incorrect effect being spawned for MakeEffect
 CGM

---
 code/cgame/cg_parsemsg.cpp |  4 +-
 code/fgame/barrels.cpp     | 90 +++++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 614698ac..551fc595 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1492,7 +1492,7 @@ void CG_ParseCGMessage_ver_15()
             vStart[2] = cgi.MSG_ReadCoord();
             cgi.MSG_ReadDir(vEnd);
 
-            sfxManager.MakeEffect_Normal(SFX_EXP_GREN_PUDDLE + iType, vStart, vEnd);
+            sfxManager.MakeEffect_Normal((iType - CGM_MAKE_EFFECT_1) + SFX_OIL_LEAK_BIG, vStart, vEnd);
             break;
 
         case CGM_MAKE_CRATE_DEBRIS:
@@ -1903,7 +1903,7 @@ void CG_ParseCGMessage_ver_6()
             vStart[2] = cgi.MSG_ReadCoord();
             cgi.MSG_ReadDir(vEnd);
 
-            sfxManager.MakeEffect_Normal(SFX_EXP_GREN_PUDDLE + iType, vStart, vEnd);
+            sfxManager.MakeEffect_Normal((iType - CGM6_MAKE_EFFECT_1) + SFX_OIL_LEAK_BIG, vStart, vEnd);
             break;
 
         case CGM6_MAKE_CRATE_DEBRIS:
diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp
index c0482c64..7d85a04b 100644
--- a/code/fgame/barrels.cpp
+++ b/code/fgame/barrels.cpp
@@ -195,52 +195,7 @@ void BarrelObject::BarrelThink(Event *ev)
         }
 
         // Send infos to clients
-        if (m_vLeaks[i][2] <= fFluidTop) {
-            gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
-
-            if (m_vLeaks[i][2] <= fFluidTop - 1.3f) {
-                if (m_vLeaks[i][2] <= fFluidTop - 3.0f) {
-                    // big leak
-
-                    if (m_iBarrelType == BARREL_OIL) {
-                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_1));
-                    } else {
-                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_5));
-                    }
-
-                    m_fFluidAmount -= 1.0f;
-                    iBiggestLeak |= 4;
-                } else {
-                    // medium leak
-
-                    if (m_iBarrelType == BARREL_OIL) {
-                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_2));
-                    } else {
-                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_6));
-                    }
-
-                    m_fFluidAmount -= 0.75f;
-                    iBiggestLeak |= 2;
-                }
-            } else {
-                // small leak
-
-                if (m_iBarrelType == BARREL_OIL) {
-                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-                } else {
-                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-                }
-
-                m_fFluidAmount -= 0.5f;
-                iBiggestLeak |= 1;
-            }
-
-            gi.MSG_WriteCoord(m_vLeaks[i][0]);
-            gi.MSG_WriteCoord(m_vLeaks[i][1]);
-            gi.MSG_WriteCoord(m_vLeaks[i][2]);
-            gi.MSG_WriteDir(m_vLeakNorms[i]);
-            gi.MSG_EndCGM();
-        } else {
+        if (m_vLeaks[i][2] > fFluidTop) {
             gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
 
             if (m_iBarrelType == BARREL_OIL) {
@@ -256,6 +211,49 @@ void BarrelObject::BarrelThink(Event *ev)
             gi.MSG_EndCGM();
 
             m_bLeaksActive[i] = qfalse;
+        } else {
+            gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
+
+            if (m_vLeaks[i][2] > fFluidTop - 1.3f) {
+                // small leak
+
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+                }
+
+                m_fFluidAmount -= 0.5f;
+                iBiggestLeak |= 1;
+            } else if (m_vLeaks[i][2] > fFluidTop - 3.0f) {
+                // medium leak
+
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_2));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_6));
+                }
+
+                m_fFluidAmount -= 0.75f;
+                iBiggestLeak |= 2;
+            } else {
+                // big leak
+
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_1));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_5));
+                }
+
+                m_fFluidAmount -= 1.0f;
+                iBiggestLeak |= 4;
+            }
+
+            gi.MSG_WriteCoord(m_vLeaks[i][0]);
+            gi.MSG_WriteCoord(m_vLeaks[i][1]);
+            gi.MSG_WriteCoord(m_vLeaks[i][2]);
+            gi.MSG_WriteDir(m_vLeakNorms[i]);
+            gi.MSG_EndCGM();
         }
     }
 

From 04da76167c9045d24f0b1abf40c5a732d5db82ba Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 22 Nov 2024 18:52:36 +0100
Subject: [PATCH 1518/2040] Set the correct face mode for when the AI is facing
 a entity that allows AI to face

This fixes a mistake where AI would turn away from the player if the player approaches too much
---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index a73185d9..4d2fefc2 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -11619,7 +11619,7 @@ void Actor::DontFaceWall(void)
         return;
     }
 
-    if (trace.entityNum != ENTITYNUM_WORLD && trace.ent->entity->AIDontFace()) {
+    if (trace.entityNum != ENTITYNUM_WORLD && !trace.ent->entity->AIDontFace()) {
         m_eDontFaceWallMode = 4;
         m_fDfwDerivedYaw    = m_fDfwRequestedYaw;
         return;

From e2f4d8cd6b51d234082758e1114e5e84965b0ee2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:44:53 +0100
Subject: [PATCH 1519/2040] Use explicit constants when checking g_gametype

---
 code/client/cl_ui.cpp       |  4 +--
 code/fgame/entity.cpp       |  6 ++---
 code/fgame/gibs.cpp         |  2 +-
 code/fgame/item.cpp         |  4 +--
 code/fgame/scriptthread.cpp |  4 +--
 code/fgame/trigger.cpp      |  2 +-
 code/fgame/weapon.cpp       | 50 ++++++++++++++++++-------------------
 code/fgame/weaputils.cpp    | 12 ++++-----
 code/server/sv_ccmds.c      |  2 +-
 9 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 1134c3a6..2eb66397 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -2676,7 +2676,7 @@ void UI_PushMenuSP_f(void)
     }
 
     if ((!com_cl_running || !com_cl_running->integer || clc.state == CA_DISCONNECTED || !cg_gametype->integer)
-        && (!com_sv_running || !com_sv_running->integer || !g_gametype->integer)) {
+        && (!com_sv_running || !com_sv_running->integer || g_gametype->integer == GT_SINGLE_PLAYER)) {
         UI_PushMenu(Cmd_Argv(1));
     }
 }
@@ -2697,7 +2697,7 @@ void UI_PushMenuMP_f(void)
     }
 
     if (com_cl_running && com_cl_running->integer && clc.state != CA_DISCONNECTED && cg_gametype->integer
-        && com_sv_running && com_sv_running->integer && g_gametype->integer) {
+        && com_sv_running && com_sv_running->integer && g_gametype->integer != GT_SINGLE_PLAYER) {
         cmd = Cmd_Argv(1);
 
         //
diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 2aa2bb8b..12d63a78 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3596,7 +3596,7 @@ void Entity::Sound(
         _tmp       = true;
     }
 
-    if (doCallback && g_gametype->integer) {
+    if (doCallback && g_gametype->integer != GT_SINGLE_PLAYER) {
         Com_Printf("^~^~^ Callback of sound '%s' ignored.\n", sound_name.c_str());
         doCallback = 0;
     }
@@ -5078,7 +5078,7 @@ void Entity::TouchTriggersEvent(Event *ev)
 
 void Entity::DeathSinkStart(Event *ev)
 {
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         PostEvent(EV_Remove, 5.0f);
     } else {
         // Start the sinking
@@ -5090,7 +5090,7 @@ void Entity::DeathSink(Event *ev)
 {
     // Sink just a little
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         origin[2] -= 0.2f;
         setOrigin(origin);
 
diff --git a/code/fgame/gibs.cpp b/code/fgame/gibs.cpp
index e53b3546..6ee01738 100644
--- a/code/fgame/gibs.cpp
+++ b/code/fgame/gibs.cpp
@@ -147,7 +147,7 @@ void Gib::Splat
 	)
 
    {
-   if ( g_gametype->integer )
+   if ( g_gametype->integer != GT_SINGLE_PLAYER )
       return;
 
    if ( sprayed > 3 )
diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp
index 63407d3e..0f72820b 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -812,7 +812,7 @@ void Item::SetMaxAmount(Event *ev)
 
 void Item::SetDMAmountEvent(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
     setAmount(ev->GetInteger(1));
@@ -820,7 +820,7 @@ void Item::SetDMAmountEvent(Event *ev)
 
 void Item::SetDMMaxAmount(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
     setAmount(ev->GetInteger(1));
diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 949620c8..b916a3ed 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -5311,13 +5311,13 @@ void ScriptThread::TeamSetScore(Event *ev)
     if (bAdd) {
         team->m_iKills += score;
 
-        if (g_gametype->integer < 3) {
+        if (g_gametype->integer < GT_TEAM_ROUNDS) {
             team->m_teamwins += score;
         }
     } else {
         team->m_iKills = score;
 
-        if (g_gametype->integer < 3) {
+        if (g_gametype->integer < GT_TEAM_ROUNDS) {
             team->m_teamwins = score;
         }
     }
diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 949b61f9..1383c5b4 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -1864,7 +1864,7 @@ void TriggerChangeLevel::ChangeLevel(Event *ev)
     //
     m_Thread.Execute();
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         G_BeginIntermission2();
         return;
     }
diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index e312a7b8..7fc74da9 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1318,7 +1318,7 @@ void Weapon::SetUseNoAmmo(Event *ev)
 //======================
 void Weapon::SetStartAmmo(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1331,7 +1331,7 @@ void Weapon::SetStartAmmo(Event *ev)
 //======================
 void Weapon::SetDMStartAmmo(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1380,7 +1380,7 @@ float Weapon::GetMaxChargeTime(firemode_t mode)
 //======================
 void Weapon::SetAmmoRequired(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1393,7 +1393,7 @@ void Weapon::SetAmmoRequired(Event *ev)
 //======================
 void Weapon::SetDMAmmoRequired(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -2775,7 +2775,7 @@ void Weapon::AttachToHand(Event *ev)
 //======================
 void Weapon::SetCantPartialReload(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -2787,7 +2787,7 @@ void Weapon::SetCantPartialReload(Event *ev)
 //======================
 void Weapon::SetDMCantPartialReload(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3594,7 +3594,7 @@ int Weapon::ClipAmmo(firemode_t mode)
 //======================
 void Weapon::SetFireDelay(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3606,7 +3606,7 @@ void Weapon::SetFireDelay(Event *ev)
 //======================
 void Weapon::SetDMFireDelay(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3687,7 +3687,7 @@ firemode_t Weapon::GetFireMode()
 //======================
 void Weapon::SetProjectile(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3701,7 +3701,7 @@ void Weapon::SetProjectile(Event *ev)
 //======================
 void Weapon::SetDMProjectile(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3740,7 +3740,7 @@ void Weapon::SetTracerSpeed(Event *ev)
 //======================
 void Weapon::SetDMBulletDamage(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3762,7 +3762,7 @@ void Weapon::SetBulletKnockback(Event *ev)
 //======================
 void Weapon::SetDMBulletKnockback(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3791,7 +3791,7 @@ void Weapon::SetBulletThroughMetal(Event *ev)
 //======================
 void Weapon::SetBulletRange(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3804,7 +3804,7 @@ void Weapon::SetBulletRange(Event *ev)
 //======================
 void Weapon::SetDMBulletRange(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3825,7 +3825,7 @@ void Weapon::SetRange(Event *ev)
 //======================
 void Weapon::SetBulletCount(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3838,7 +3838,7 @@ void Weapon::SetBulletCount(Event *ev)
 //======================
 void Weapon::SetDMBulletCount(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3851,7 +3851,7 @@ void Weapon::SetDMBulletCount(Event *ev)
 //======================
 void Weapon::SetBulletSpread(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3870,7 +3870,7 @@ void Weapon::SetBulletSpread(Event *ev)
 //======================
 void Weapon::SetDMBulletSpread(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3889,7 +3889,7 @@ void Weapon::SetDMBulletSpread(Event *ev)
 //======================
 void Weapon::SetZoomSpreadMult(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3901,7 +3901,7 @@ void Weapon::SetZoomSpreadMult(Event *ev)
 //======================
 void Weapon::SetDMZoomSpreadMult(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3914,7 +3914,7 @@ void Weapon::SetDMZoomSpreadMult(Event *ev)
 //======================
 void Weapon::SetFireSpreadMult(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3930,7 +3930,7 @@ void Weapon::SetFireSpreadMult(Event *ev)
 //======================
 void Weapon::SetDMFireSpreadMult(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3990,7 +3990,7 @@ void Weapon::Crosshair(Event *ev)
 //====================
 void Weapon::DMCrosshair(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4295,7 +4295,7 @@ void Weapon::SetViewKick(Event *ev)
 //======================
 void Weapon::SetMovementSpeed(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4307,7 +4307,7 @@ void Weapon::SetMovementSpeed(Event *ev)
 //======================
 void Weapon::SetDMMovementSpeed(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 3d6934cf..32bc86b4 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1255,7 +1255,7 @@ void Projectile::Touch(Event *ev)
         );
     }
 
-    if (!g_gametype->integer && weap) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
         if (other->IsSubclassOfPlayer() || other->IsSubclassOfVehicle() || other->IsSubclassOfVehicleTank()
             || other->isSubclassOf(VehicleCollisionEntity)) {
             weap->m_iNumHits++;
@@ -2795,7 +2795,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
 
     // Calc the life of the projectile
     if (proj->projFlags & P_CHARGE_LIFE) {
-        if (g_gametype->integer && proj->dmlife) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
         } else {
             newlife = proj->life;
@@ -2805,7 +2805,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
             newlife = proj->minlife;
         }
     } else {
-        if (g_gametype->integer && proj->dmlife) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
         } else {
             newlife = proj->life;
@@ -2818,7 +2818,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
 
     proj->NewAnim("idle");
 
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         if (weap) {
             weap->m_iNumShotsFired++;
             if (owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
@@ -2948,10 +2948,10 @@ void ExplosionAttack(
             }
 
             // Remove explosion after the life has expired
-            if (explosion->life || (g_gametype->integer && explosion->dmlife)) {
+            if (explosion->life || (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife)) {
                 ev = new Event(EV_Remove);
 
-                if (g_gametype->integer && explosion->dmlife) {
+                if (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife) {
                     explosion->PostEvent(ev, explosion->dmlife);
                 } else {
                     explosion->PostEvent(ev, explosion->life);
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 2427f692..f14e28f1 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -298,7 +298,7 @@ static void SV_GameMap_f( void ) {
 
 	SV_SpawnServer( map, qfalse, qfalse, bTransition );
 
-	if( !g_gametype->integer ) {
+	if( g_gametype->integer == GT_SINGLE_PLAYER ) {
 		svs.autosave = qtrue;
 	}
 }

From 5c094f9c8a421b7d19a5b2a6d07aa9224c610a08 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 22 Nov 2024 20:57:26 +0100
Subject: [PATCH 1520/2040] More clarity

---
 docs/getting_started_running.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index d7bd1282..bbea4be1 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -19,9 +19,9 @@ On Windows, a shortcut can be created to the `openmohaa` executable, with the co
 
 You can now start a local OpenMOHAA server or play on a server.
 
-### Playing with the downloadable demo
+### Playing with a demo version
 
-The argument `+set com_target_demo 1` must be appended to command-line to play the game/host a server using demo assets: Allied Assault, Spearhead and Breakthrough demo are supported as long as `com_target_game` is set (see above).
+The argument `+set com_target_demo 1` must be appended to command-line to play the game or host a server using demo assets. Allied Assault, Spearhead and Breakthrough demos are supported as long as `com_target_game` is set (see above).
 
 ### From the launchers
 

From de6718b511b9f1cbd69481377035334c1aa38504 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 22 Nov 2024 21:03:54 +0100
Subject: [PATCH 1521/2040] Include a new section on how to obtain demos online

---
 docs/getting_started_installation.md | 29 +++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 341471cc..6f78e0d5 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -13,9 +13,9 @@ Ensure that you download the binaries compatible with your platform in the [rele
 
 ## Requirements
 
-- A valid MOH:AA installation, a MOH:AA Warchest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
-  - [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos). The demo version can also be used.
-- On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 may be required.
+- A valid MOH:AA installation. A fully patched MOH:AA War Chest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest). Demo versions are also valid, see [obtaining a demo version](#obtaining-a-demo-version).
+  - [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos).
+- On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 is required.
 
 ## System requirements
 
@@ -133,3 +133,26 @@ The MOH:AA Warchest installer files on GOG are Windows binaries. To attain the g
 - Once installed run the command `innoextract setup_medal_of_honor_2.0.0.21.exe`. The MoH:AA game files will be extracted into a folder called 'app'.
 
 Alternatively, you can use [WINE](https://www.winehq.org/) as well, but this process may take longer if you do not already have WINE installed and configured. 
+
+## Obtaining a demo version
+
+Alternatively, free demo versions are available online. Here are the links to the demos:
+
+|Game                |Type                               |Link                                                                                                    |
+|--------------------|-----------------------------------|--------------------------------------------------------------------------------------------------------|
+|MOH:AA              | Single-player (0.05)              |https://www.fileplanet.com/archive/p-54011/Medal-of-Honor-Single-Player-Demo                            |
+|MOH:AA              | Multiplayer<sup>1</sup> (1.00)    |https://www.fileplanet.com/archive/p-8725/Medal-of-Honor-Allied-Assault-Multiplayer-Demo                |
+|MOH:AA Spearhead    | Multiplayer<sup>2</sup> (2.11)    |https://www.fileplanet.com/archive/p-68997/Medal-of-Honor-Allied-Assault-Spearhead-Demo                 |
+|MOH:AA Breakthrough | Multiplayer<sup>2</sup> (0.30)    |https://www.fileplanet.com/archive/p-50953/Medal-of-Honor-Allied-Assault-Breakthrough-Multiplayer-Demo  |
+
+- MOH:AA singleplayer demo ships with **Mission 3: Level 3**
+- MOH:AA multiplayer demo ships with **Stalingrad**
+- MOH:AA Spearhead multiplayer demo ships with **Malta** and **Druckkammern**
+- MOH:AA Breakthrough multiplayer demo ships with **Anzio** and **Palermo**
+
+--------
+
+**Notes:**
+
+1. Can play on MOH:AA 1.00 servers only.
+2. Only compatible with demo servers. These servers can be identified by having the letter `d` at the start of their version number (e.g: `(d2.11)`).

From 89140f775e7d00f71782311981f380c313ade7e4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 15:19:05 +0100
Subject: [PATCH 1522/2040] Archive entities at the order they were created

This fixes an issue where turrets would Think() before the base they are mounted on (like tanks), which means the turret would set its origin before the base (tank) does. This issue also occurs on the original game
---
 code/fgame/g_main.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index e91f81ea..54b8ef25 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1438,11 +1438,12 @@ qboolean G_ArchiveLevel(
         if (arc.Saving()) {
             // count the entities
             num = 0;
-            for (i = 0; i < globals.num_entities; i++) {
-                edict = &g_entities[i];
-                if (edict->inuse && edict->entity && !(edict->entity->flags & FL_DONTSAVE)) {
-                    num++;
+            for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
+                if (edict == world->edict || !edict->entity || (edict->entity->flags & FL_DONTSAVE)) {
+                    continue;
                 }
+
+                num++;
             }
         }
 
@@ -1454,11 +1455,12 @@ qboolean G_ArchiveLevel(
             // write out the world
             arc.ArchiveObject(world);
 
-            for (i = 0; i < globals.num_entities; i++) {
-                edict = &g_entities[i];
-                if (edict->inuse && edict->entity && !(edict->entity->flags & FL_DONTSAVE)) {
-                    arc.ArchiveObject(edict->entity);
+            for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
+                if (edict == world->edict || !edict->entity || (edict->entity->flags & FL_DONTSAVE)) {
+                    continue;
                 }
+
+                arc.ArchiveObject(edict->entity);
             }
         } else {
             // Tell the server about our data

From 0d24c620fbefc731da39098a0b5bb3752a874771 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 16:08:25 +0100
Subject: [PATCH 1523/2040] Update GCC to version 14

---
 .github/workflows/shared-build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 7495287f..16487ada 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -51,7 +51,7 @@ jobs:
       name: Install required cross-platform packages (${{ matrix.architecture.triple }})
       if: matrix.architecture.name != 'amd64'
       with:
-        packages: gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
+        packages: gcc-14-${{ matrix.architecture.triple }} g++-14-${{ matrix.architecture.triple }}
         version: "0.1"
 
     - name: Settings
@@ -339,8 +339,7 @@ jobs:
   # Apple macOS
   # macOS 14
   #
-  # It uses this version because older versions are slower,
-  # at least in Actions.
+  # This version is used as the OS, as older versions are slower.
   ##########################
   build-platform-macos:
     strategy:

From fc9be911247512e1685cbafe85da471da886942d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 16:22:45 +0100
Subject: [PATCH 1524/2040] Update OpenAL to 1.24.0

PowerPC will remain on 1.23.1 until the compile issue is resolved
---
 .github/workflows/shared-build.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 16487ada..1ef5057c 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -62,6 +62,13 @@ jobs:
         echo "CXX=clang++" >> $GITHUB_ENV
         echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
         echo "CXXFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+        # Temporary workaround for PowerPC as the 1.24.0 version doesn't check for altivec
+        # Will use older versions until a new tag is created with this issue resolved
+        if [ ${{ matrix.architecture.name }} != 'powerpc' ] && [ ${{ matrix.architecture.name }} != 'ppc64' ] &&  [ ${{ matrix.architecture.name }} != 'ppc64el' ]; then
+            echo "OPENAL_REF=1.24.0" >> $GITHUB_ENV
+        else
+            echo "OPENAL_REF=1.23.1" >> $GITHUB_ENV
+        fi
 
     ###
     # SDL
@@ -81,14 +88,12 @@ jobs:
     ###
 
     # soft-oal setup
-    # Use GCC instead of Clang because of missing SSE intrinsics
-    # It also doesn't enable altivec support on PowerPC by default
     - name: Checkout soft-oal
       uses: actions/checkout@v4
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.23.1'
+        ref: ${{ env.OPENAL_REF }}
 
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
@@ -242,7 +247,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.23.1'
+        ref: '1.24.0'
 
     # soft-oal build
     # Statically link the CRT runtime into OAL as a workaround to prevent crashes
@@ -397,7 +402,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.23.1'
+        ref: '1.24.0'
 
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal

From 4d4b9288c6c86e8fbffcb7ee51e1bd7e59dc2540 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 18:33:09 +0100
Subject: [PATCH 1525/2040] Don't update the streamed channel if the source
 status AL_INITIAL

This can occur when starting a new sound without playing it, which can happen when reloading the sound system while all sounds are paused (game paused)
---
 code/client/snd_openal_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 121670f7..9da9e11b 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4428,7 +4428,7 @@ void openal_channel_two_d_stream::update()
     // 2 channels with a width of 2
     char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
 
-    if (!streaming || is_paused()) {
+    if (!streaming || is_paused() || state == AL_INITIAL) {
         return;
     }
 

From be34870a18415a8d0bb668dee9d7666e791c0226 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 21:12:58 +0100
Subject: [PATCH 1526/2040] Copy the channel origin to the sound entity origin
 when loading

If the channel had a valid entity at the time of saving, make sure to restore the origin
---
 code/client/snd_openal_new.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 9da9e11b..9f185e32 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2662,6 +2662,7 @@ S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx
 
     if (pChannel->iEntNum != ENTITYNUM_NONE) {
         s_entity[pChannel->iEntNum].time = pChannel->iTime;
+        VectorCopy(pChannel->vOrigin, s_entity[pChannel->iEntNum].position);
     }
 }
 

From dddedba721ecfe398f72172df5b926ef7e02e64d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 21:14:42 +0100
Subject: [PATCH 1527/2040] Update getting_started_running.md

---
 docs/getting_started_running.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index bbea4be1..dbff196b 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -2,6 +2,14 @@
 
 ## Game selection
 
+### From the launchers
+
+For simplicity, base game and expansions can be started from one of the 3 launchers:
+
+- `launch_openmohaa_base`, this starts OpenMoHAA in **Medal of Honor: Allied Assault** mode which is the base game
+- `launch_openmohaa_spearhead`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Spearhead** mode
+- `launch_openmohaa_breakthrough`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Breakthrough** mode
+
 ### From command-line
 
 **Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
@@ -23,14 +31,6 @@ You can now start a local OpenMOHAA server or play on a server.
 
 The argument `+set com_target_demo 1` must be appended to command-line to play the game or host a server using demo assets. Allied Assault, Spearhead and Breakthrough demos are supported as long as `com_target_game` is set (see above).
 
-### From the launchers
-
-For simplicity, there are 3 launchers for the standalone game:
-
-- `launch_openmohaa_base`, this starts OpenMoHAA in **Medal of Honor: Allied Assault** mode which is the base game
-- `launch_openmohaa_spearhead`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Spearhead** mode
-- `launch_openmohaa_breakthrough`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Breakthrough** mode
-
 ## User data location
 
 The location of user-writable data, like the console logfile, saves and configuration files can be found in different locations depending on the platform:

From 8b6b1597d78aaf64eef88c4bfb56a6c84e107dda Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 23 Nov 2024 22:56:26 +0100
Subject: [PATCH 1528/2040] Check for bHitPerson in MV0, MV1 and MV2

This checks if the sentient being hit is dead, and skip it when moving the vehicle so the vehicle doesn't get stuck for when a sentient is dying
---
 code/fgame/vehicle.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 00f79357..1d691345 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -4328,7 +4328,15 @@ void Vehicle::MoveVehicle(void)
                             );
                         }
 
-                        break;
+                        // Added in OPM
+                        //  Skip the entity if the sentient is dead.
+                        //  This is a workaround against sentients getting in path of vehicles
+                        //  and thus blocking them temporarily while dying.
+                        //  For example in e1l1, the first tank would get stuck, because sometimes
+                        //  there are too many actors moving in the path of the vehicle
+                        if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                            break;
+                        }
                     }
 
                     pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;
@@ -4411,11 +4419,7 @@ void Vehicle::MoveVehicle(void)
                     }
 
                     // Added in OPM
-                    //  Skip the entity if the sentient is dead.
-                    //  This is a workaround against sentients getting in path of vehicles
-                    //  and thus blocking them temporarily while dying.
-                    //  For example in e1l1, the first tank would get stuck, because sometimes
-                    //  there are too many actors moving in the path of the vehicle
+                    //  (see the comment above)
                     if (!bHitPerson || !tr.ent->entity->IsDead()) {
                         break;
                     }
@@ -4503,7 +4507,11 @@ void Vehicle::MoveVehicle(void)
                         );
                     }
 
-                    break;
+                    // Added in OPM
+                    //  (see the comment above)
+                    if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                        break;
+                    }
                 }
 
                 pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;

From 4493b2c42e1141582184d21dd4c878046e85b179 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 24 Nov 2024 15:53:05 +0100
Subject: [PATCH 1529/2040] Prevent integer overflow when interpolating verts

---
 code/renderer/tr_terrain.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
index 8aeee1aa..3265c47a 100644
--- a/code/renderer/tr_terrain.c
+++ b/code/renderer/tr_terrain.c
@@ -126,6 +126,7 @@ static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
     const terrainVert_t         *pVert0 = &g_pVert[pTri->iPt[0]];
     const terrainVert_t         *pVert1 = &g_pVert[pTri->iPt[1]];
     const cTerraPatchUnpacked_t *pPatch = pTri->patch;
+    const byte                  *pMinHeight, *pMaxHeight;
 
     // Interpolate texture coordinates
     pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
@@ -133,10 +134,20 @@ static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
     pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
     pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
 
-    pVert->pHgt    = (uint8_t *)(((size_t)pVert0->pHgt + (size_t)pVert1->pHgt) >> 1);
+    // Fixed in OPM
+    //  Use the delta of the two pointers instead of adding them + divide to get the average height,
+    //  otherwise the resulting integer would overflow/warp and cause a segmentation fault.
+    //  Although rare, the overflow issue can occur in the original game
+    pMinHeight  = (byte *)Q_min((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pMaxHeight  = (byte *)Q_max((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
+    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight);
+
+    // Calculate the average Z 
     pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
     pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
     pVert->fHgtAvg += pPatch->z0;
+    // Calculate the average position
     pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
     pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
     pVert->xyz[2] = pVert->fHgtAvg;

From 23ad99174348c7df74c3ac09e2ccae64faacfe0a Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Sat, 19 Oct 2024 01:50:36 +0300
Subject: [PATCH 1530/2040] Use nullptr instead

---
 code/qcommon/str.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/str.cpp b/code/qcommon/str.cpp
index 8751d224..166c685b 100644
--- a/code/qcommon/str.cpp
+++ b/code/qcommon/str.cpp
@@ -631,7 +631,7 @@ void TestStringClass(void)
     str  b;         // b.len == 0, b.data == "\0"
     str  c("test"); // c.len == 4, c.data == "test\0"
     str  d(c);      // d.len == 4, d.data == "test\0"
-    str  e(reinterpret_cast<const char *>(NULL));
+    str e(nullptr);
     // e.len == 0, e.data == "\0"					ASSERT!
     size_t i; // i == ?
 
@@ -653,14 +653,14 @@ void TestStringClass(void)
     a = NULL;      // a.len == 0, a.data == "\0"					ASSERT!
     a = c + d;     // a.len == 8, a.data == "testtest\0"
     a = c + "wow"; // a.len == 7, a.data == "testwow\0"
-    a = c + reinterpret_cast<const char *>(NULL);
+    a = c + nullptr;
     // a.len == 4, a.data == "test\0"			ASSERT!
     a = "this" + d; // a.len == 8, a.data == "thistest\0"
-    a = reinterpret_cast<const char *>(NULL) + d;
+    a = nullptr + d;
     // a.len == 4, a.data == "test\0"			ASSERT!
     a += c;     // a.len == 8, a.data == "testtest\0"
     a += "wow"; // a.len == 11, a.data == "testtestwow\0"
-    a += reinterpret_cast<const char *>(NULL);
+    a += nullptr;
     // a.len == 11, a.data == "testtestwow\0"	ASSERT!
 
     a  = "test";  // a.len == 4, a.data == "test\0"

From 8d0b7b77c601df5025035000d156670743e162ee Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Sat, 19 Oct 2024 01:51:04 +0300
Subject: [PATCH 1531/2040] Check for libc and link against `execinfo` lib for
 musl libc

---
 code/sys/CMakeLists.txt | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 0ec654ed..3fcdf5be 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -48,7 +48,19 @@ if(WIN32)
 elseif(UNIX)
 	find_package(Threads)
 	target_link_libraries(syslib INTERFACE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-	target_link_libraries(syslib INTERFACE m)
+	# Check for libc
+	if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+		execute_process(COMMAND ${CMAKE_C_COMPILER} -v
+						OUTPUT_VARIABLE COMPILER_OUTPUT
+						ERROR_VARIABLE COMPILER_OUTPUT
+						OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		if(COMPILER_OUTPUT MATCHES "musl")
+			target_link_libraries(syslib INTERFACE execinfo m)
+		else()
+			target_link_libraries(syslib INTERFACE m)
+		endif()
+	endif()
 	target_link_libraries(syslib INTERFACE stdc++)
 endif()
 

From 3956e035571030161722ee0eb923e51011400c73 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 24 Nov 2024 16:06:22 +0100
Subject: [PATCH 1532/2040] Use Ubuntu 22.04 as the runner OS for linux, to use
 a lower GLIBC version

---
 .github/workflows/shared-build.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 1ef5057c..6daac83e 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -16,8 +16,9 @@ jobs:
   ##########################
   #
   # Linux
-  # Ubuntu 24.04
+  # Ubuntu 22.04
   #
+  # Using this version instead of 24.04 to use a lower GLIBC version (2.34)
   ##########################
   build-platform-linux:
     strategy:
@@ -33,7 +34,7 @@ jobs:
         ]
 
     name: "Building for platform linux-${{matrix.architecture.name}}"
-    runs-on: "ubuntu-24.04"
+    runs-on: "ubuntu-22.04"
     environment: ${{ inputs.environment }}
 
     steps:
@@ -51,7 +52,7 @@ jobs:
       name: Install required cross-platform packages (${{ matrix.architecture.triple }})
       if: matrix.architecture.name != 'amd64'
       with:
-        packages: gcc-14-${{ matrix.architecture.triple }} g++-14-${{ matrix.architecture.triple }}
+        packages: gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
         version: "0.1"
 
     - name: Settings
@@ -81,7 +82,8 @@ jobs:
       with:
         version: 2-latest
         build-type: Release
-        cmake-arguments: ""
+        # Workaround for when changing the runner OS version
+        cmake-arguments: "-DCACHE_OS_VERSION=Ubuntu_22.04"
 
     ###
     # OpenAL

From 586da44c309e16657fa15f8623257b30db1d4e52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 24 Nov 2024 18:03:15 +0100
Subject: [PATCH 1533/2040] Remove what's Working documentation as everything
 is implemented

---
 README.md                       |  1 -
 docs/features_implementation.md | 27 ---------------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 docs/features_implementation.md

diff --git a/README.md b/README.md
index 1647149a..8bf64177 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,6 @@ All game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liber
 
 ## Features
 
-- [What's working](docs/features_implementation.md)
 - [List of new features](docs/features.md)
 - [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html)
 
diff --git a/docs/features_implementation.md b/docs/features_implementation.md
deleted file mode 100644
index ae1ed270..00000000
--- a/docs/features_implementation.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Implementation
-
-## Server
-
-The server version can be built successfully. The server and the fgame components are fully implemented, the single-player campaign can be played from start to end in MOH:AA, MOH:SH and MOH:BT. However there could be some minor bugs (and rare crashes), but overall, the game should be playable.
-
-## Client
-
-The client version of OpenMoHAA is also fully implemented with a few bugs remaining. Credits to the SDK of **Heavy Metal: F.A.K.K. 2** both the cgame and fgame modules.
-
-OpenMoHAA is using OpenAL for the audio.
-
-The current operational status for each component is as follow:
-
-| Component               | Full | Almost | Half | Early | Bad | Not working | Comment                                                             |
-|-------------------------|------|--------|------|-------|-----|-------------|---------------------------------------------------------------------|
-| Audio                   | x    |        |      |       |     |             | Full implementation using OpenAL                                    |
-| CG Module               | x    |        |      |       |     |             | Some effects can be inaccurate compared to the original game        |
-| Client                  | x    |        |      |       |     |             |                                                                     |
-| Collision               | x    |        |      |       |     |             |                                                                     |
-| Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                     |
-| Renderer                | x    |        |      |       |     |             |                                                                     |
-| Server                  | x    |        |      |       |     |             |                                                                     |
-| Server module (fgame)   | x    |        |      |       |     |             | There might still be some AI-related bugs remaining                 |
-| UI                      | x    |        |      |       |     |             |                                                                     |
-
-Full = code is fully working, however it doesn't mean it's bug-free.

From abdaecb28d9211906f1d42777fbb7610295211d9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:08:03 +0100
Subject: [PATCH 1534/2040] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8bf64177..7973f2f3 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 ## Intro
 
-The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of Honor: Allied Assault** on all platforms/architectures by providing new patches/features. Thanks to the ioquake3 project and the F.A.K.K SDK, OpenMoHAA has already reached more than half of its goal: an open-source version of MoH:AA (based on version 2.40) that is fully compatible with the original game (in terms of protocol, assets, and scripts).
+The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of Honor: Allied Assault** (including Spearhead and Breakthrough expansions) on all platforms/architectures by providing new patches/features. Thanks to the ioquake3 project and the F.A.K.K SDK, OpenMoHAA has already reached more than half of its goal: an open-source version of MoH:AA (based on version 2.40) that is fully compatible with both the original game and expansions, in terms of network protocol, assets, and scripts. OpenMoHAA is compatible with both MOH:AA servers and clients (Spearhead and Breakthrough included).
 
 ## Getting started
 

From db16c8bea4d7f561e11ff81ad034306011545283 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:08:15 +0100
Subject: [PATCH 1535/2040] Localize player IPrint string

---
 code/fgame/player.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0d6bf492..76403685 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -11195,17 +11195,18 @@ str Player::TranslateBattleLanguageTokens(const char *string)
 
 void Player::EventIPrint(Event *ev)
 {
-    str      sString = ev->GetString(1);
-    qboolean iBold   = qfalse;
+    str         sString = ev->GetString(1);
+    const char *pszLocalized;
+    qboolean    iBold   = qfalse;
 
     if (ev->NumArgs() > 1) {
         iBold = ev->GetInteger(2);
     }
 
     if (iBold) {
-        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", sString.c_str());
+        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(sString.c_str()));
     } else {
-        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", sString.c_str());
+        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", gi.LV_ConvertString(sString.c_str()));
     }
 }
 

From b719455b7889008e9b63e2a80ad23a069510d60b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:18:09 +0100
Subject: [PATCH 1536/2040] Add the missing newline for iprintln functions

---
 code/fgame/scriptthread.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index b916a3ed..b3abdec0 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2797,7 +2797,7 @@ void ScriptThread::IPrintln(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(gi.LV_ConvertString(sString), false);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", gi.LV_ConvertString(sString.c_str()));
 }
 
 void ScriptThread::IPrintlnBold(Event *ev)
@@ -2810,7 +2810,7 @@ void ScriptThread::IPrintlnBold(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(gi.LV_ConvertString(sString), true);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(sString.c_str()));
 }
 
 void ScriptThread::IPrintln_NoLoc(Event *ev)
@@ -2823,7 +2823,7 @@ void ScriptThread::IPrintln_NoLoc(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(sString, false);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", sString.c_str());
 }
 
 void ScriptThread::IPrintlnBold_NoLoc(Event *ev)
@@ -2836,7 +2836,7 @@ void ScriptThread::IPrintlnBold_NoLoc(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(sString, true);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\n\"", sString.c_str());
 }
 
 void ScriptThread::MPrint(Event *ev)

From 6c9d6940cc153d96e1d8ec2103f24b2aca57ef08 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:35:37 +0100
Subject: [PATCH 1537/2040] Disable sv_floodProtect by default

---
 code/server/sv_init.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index fa8df088..f8f2b61e 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -1039,7 +1039,10 @@ void SV_Init (void)
 	sv_dlRate = Cvar_Get("sv_dlRate", "100", CVAR_ARCHIVE | CVAR_SERVERINFO);
 	sv_minPing = Cvar_Get( "sv_minPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maxPing = Cvar_Get( "sv_maxPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
-	sv_floodProtect = Cvar_Get( "sv_floodProtect", "1", CVAR_ARCHIVE | CVAR_SERVERINFO );
+	// Flood protect causes some annoyance like when trying to reload the weapon while checking scores
+	// so it's disabled by default.
+	// Since 2.0, flood protect only protect against "dmmessage" flood.
+	sv_floodProtect = Cvar_Get( "sv_floodProtect", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maplist = Cvar_Get( "sv_maplist", "", CVAR_ARCHIVE | CVAR_SERVERINFO );
 
 	// systeminfo

From 1c2be68253a91feff307b181212ed766c7c91ec3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 20:36:27 +0100
Subject: [PATCH 1538/2040] Update getting started (installation)

---
 docs/getting_started_installation.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 6f78e0d5..3a4eebe9 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -13,8 +13,11 @@ Ensure that you download the binaries compatible with your platform in the [rele
 
 ## Requirements
 
-- A valid MOH:AA installation. A fully patched MOH:AA War Chest copy can be acquired from GOG [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest). Demo versions are also valid, see [obtaining a demo version](#obtaining-a-demo-version).
-  - [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos).
+- A MOH:AA installation. Common installations include:
+  - GOG copy (recommended). A fully patched MOH:AA War Chest copy can be acquired [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
+    - For Linux/macOS, see [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos).
+  - From a CD
+  - Demo. See [obtaining a demo version](#obtaining-a-demo-version)
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 is required.
 
 ## System requirements
@@ -126,6 +129,8 @@ Only `omohaaded*` and `game*` binaries are required for the server version, othe
 
 ## Extracting GOG setup file on Linux and macOS
 
+If your MOH:AA copy was acquired from GOG then this section will be relevant.
+
 The MOH:AA Warchest installer files on GOG are Windows binaries. To attain the game files, you can quickly extract them using [Innoextract](https://github.com/dscharrer/innoextract). 
 
 - Install Innoextract using your preferred Package Manager (e.g. [Brew](https://brew.sh/)). 

From 4f76d7291f21b51d055067609b794fc101842f77 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 21:02:52 +0100
Subject: [PATCH 1539/2040] Fix typo

---
 docs/getting_started_installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 3a4eebe9..3f3c4842 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -7,7 +7,7 @@ Ensure that you download the binaries compatible with your platform in the [rele
 - If running Windows on AMD/Intel, CPU then `*-windows-x64.zip` is recommended
 - If running Windows on Qualcomm/Snapdragon (ARM-based) CPU, then `*-windows-arm64.zip` is the way to go
 - If running MacOS on Apple Silicon hardware, choose `*-macos-arm64.zip`
-- If running MacOS on AMD/Intel CPU, choose `*-macos-arm64.zip`
+- If running MacOS on AMD/Intel CPU, choose `*-macos-x86_64.zip`
 - If running Linux on AMD/Intel CPU, then `*-linux-amd64` is generally fine. Choose the i686 version for CPUs that don't support 64-bit instructions.
 - If running Linux on a Raspberry Pi 4 or 5, then `*-linux-arm64` (if running ARM64) is the way to go
 

From 10b7651eff588125ad03f4f02f8a1d5a7fca2e96 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:12:29 +0100
Subject: [PATCH 1540/2040] Use getters for max fire movement and zoom movement

---
 code/fgame/player.cpp    |  4 ++--
 code/fgame/playerbot.cpp |  2 +-
 code/fgame/weapon.cpp    | 14 ++++++++++++++
 code/fgame/weapon.h      |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 76403685..12da5d0f 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4057,9 +4057,9 @@ void Player::ClientMove(usercmd_t *ucmd)
             // Also use the weapon movement speed
             //
             if (!IsZoomed()) {
-                client->ps.speed = (float)client->ps.speed * pWeap->m_fMovementSpeed;
+                client->ps.speed = (float)client->ps.speed * pWeap->GetMovementSpeed();
             } else {
-                client->ps.speed = (float)client->ps.speed * pWeap->m_fZoomMovement * pWeap->m_fMovementSpeed;
+                client->ps.speed = (float)client->ps.speed * pWeap->GetZoomMovement();
             }
         }
     }
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 98caa03a..16e8ba4f 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -706,7 +706,7 @@ void BotController::State_Attack(void)
             float length;
 
             length = controlledEnt->velocity.length();
-            if ((length / sv_runspeed->value) > (pWeap->GetMaxFireMovement() * pWeap->GetMovementSpeed())) {
+            if ((length / sv_runspeed->value) > (pWeap->GetMaxFireMovementMult())) {
                 bNoMove = true;
                 movement.ClearMove();
             }
diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 7fc74da9..62dd04c0 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -4635,6 +4635,20 @@ void Weapon::DoneAnimating(Event* ev) {
     SetWeaponIdleAnim();
 }
 
+//======================
+//Weapon::GetMaxFireMovementMult
+//======================
+float Weapon::GetMaxFireMovementMult() const {
+    return m_fMaxFireMovement * m_fMovementSpeed;
+}
+
+//======================
+//Weapon::GetMaxFireMovementMult
+//======================
+float Weapon::GetZoomMovement() const {
+    return m_fZoomMovement * m_fMovementSpeed;
+}
+
 //======================
 //Weapon::GetMaxFireMovement
 //======================
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index 47da68c6..cc4dd494 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -461,6 +461,8 @@ public:
     qboolean   IsSemiAuto(void);
     void       DoneAnimating(Event *ev);
 
+    float GetMaxFireMovementMult() const;
+    float GetZoomMovement() const;
     float GetMaxFireMovement() const;
 };
 

From 04baf673dc8c382098c4b863dd049e692b7ce55f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:12:47 +0100
Subject: [PATCH 1541/2040] Set MAX_MAP_BOUNDS to 8192

---
 code/qcommon/q_shared.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 46ceaba9..277f25dd 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1657,7 +1657,7 @@ typedef enum
 #define	MAX_CLIENTS			64		// absolute limit
 #define MAX_LOCATIONS		64
 
-#define MAX_MAP_BOUNDS          16384
+#define MAX_MAP_BOUNDS          8192
 #define MIN_MAP_BOUNDS          ( -MAX_MAP_BOUNDS )
 #define MAP_SIZE                ( MAX_MAP_BOUNDS - MIN_MAP_BOUNDS )
 

From 6b402e521553a42c9213a2460c8b3694fa5f6432 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:21:51 +0100
Subject: [PATCH 1542/2040] Format g_phys source file

---
 code/fgame/g_phys.cpp | 2089 ++++++++++++++++++-----------------------
 code/fgame/g_phys.h   |   77 +-
 2 files changed, 960 insertions(+), 1206 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index af8de523..4ba7795e 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -48,7 +48,7 @@ solid_edge items only clip against bsp models.
 
 */
 
-pushed_t pushed[ MAX_GENTITIES ];
+pushed_t  pushed[MAX_GENTITIES];
 pushed_t *pushed_p;
 
 Entity *obstacle;
@@ -59,128 +59,101 @@ G_FixEntityPosition
 
 ============
 */
-Entity *G_FixEntityPosition
-	(
-	Entity *ent
-	)
+Entity *G_FixEntityPosition(Entity *ent)
 {
-	int mask;
-	trace_t trace;
-	Vector start;
-	float radius;
+    int     mask;
+    trace_t trace;
+    Vector  start;
+    float   radius;
 
-	if( ent->size.x > ent->size.z )
-	{
-		radius = ent->size.z * 0.5f;
-	}
-	else
-	{
-		radius = ent->size.x * 0.5f;
-	}
+    if (ent->size.x > ent->size.z) {
+        radius = ent->size.z * 0.5f;
+    } else {
+        radius = ent->size.x * 0.5f;
+    }
 
-	mask = ent->edict->clipmask;
-	if( !mask )
-	{
-		mask = MASK_SOLID;
-	}
+    mask = ent->edict->clipmask;
+    if (!mask) {
+        mask = MASK_SOLID;
+    }
 
-	start = ent->origin;
-	start.z += radius;
-	if( ent->IsSubclassOfSentient() )
-	{
-		trace = G_Trace( start, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_FixEntityPosition1" );
-	}
-	else
-	{
-		trace = G_Trace( start, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_FixEntityPosition2" );
-	}
+    start = ent->origin;
+    start.z += radius;
+    if (ent->IsSubclassOfSentient()) {
+        trace = G_Trace(start, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_FixEntityPosition1");
+    } else {
+        trace = G_Trace(start, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_FixEntityPosition2");
+    }
 
-	if( trace.startsolid )
-	{
-		if (!trace.ent) {
-			// Fixed in OPM
-			//  I don't understand why they just prefer the game crashing
-			//  rather than ignoring the entity
-			return NULL;
-		}
-		//assert( trace.ent );
-		//assert( trace.ent->entity );
-		return trace.ent->entity;
-	}
+    if (trace.startsolid) {
+        if (!trace.ent) {
+            // Fixed in OPM
+            //  I don't understand why they just prefer the game crashing
+            //  rather than ignoring the entity
+            return NULL;
+        }
+        //assert( trace.ent );
+        //assert( trace.ent->entity );
+        return trace.ent->entity;
+    }
 
-	ent->setOrigin( trace.endpos );
+    ent->setOrigin(trace.endpos);
 
-	return NULL;
+    return NULL;
 }
 
-
 /*
 ============
 G_TestEntityPosition
 
 ============
 */
-Entity *G_TestEntityPosition
-	(
-	Entity *ent
-	)
+Entity *G_TestEntityPosition(Entity *ent)
 {
-	int mask;
-	trace_t trace;
+    int     mask;
+    trace_t trace;
 
-	mask = ent->edict->clipmask;
-	if( !mask )
-		mask = MASK_SOLID;
+    mask = ent->edict->clipmask;
+    if (!mask) {
+        mask = MASK_SOLID;
+    }
 
-	if( ent->IsSubclassOfPlayer() )
-	{
-		trace = G_Trace( ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_TestEntityPosition1" );
-	}
-	else
-	{
-		trace = G_Trace( ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_TestEntityPosition2" );
-	}
+    if (ent->IsSubclassOfPlayer()) {
+        trace = G_Trace(ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_TestEntityPosition1");
+    } else {
+        trace = G_Trace(ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_TestEntityPosition2");
+    }
 
-	if( trace.startsolid )
-	{
-		//return g_entities->entity;
-		assert( trace.ent );
-		assert( trace.ent->entity );
-		return trace.ent->entity;
-	}
+    if (trace.startsolid) {
+        //return g_entities->entity;
+        assert(trace.ent);
+        assert(trace.ent->entity);
+        return trace.ent->entity;
+    }
 
-	return NULL;
+    return NULL;
 }
 
-
 /*
 ================
 G_CheckVelocity
 ================
 */
-void G_CheckVelocity
-	(
-	Entity *ent
-	)
+void G_CheckVelocity(Entity *ent)
+{
+    int i;
 
-	{
-	int i;
-
-	//
-	// bound velocity
-	//
-	for( i = 0; i < 3; i++ )
-		{
-		if ( ent->velocity[ i ] > sv_maxvelocity->value )
-			{
-			ent->velocity[ i ] = sv_maxvelocity->value;
-			}
-		else if ( ent->velocity[ i ] < -sv_maxvelocity->value )
-			{
-			ent->velocity[ i ] = -sv_maxvelocity->value;
-			}
-		}
-	}
+    //
+    // bound velocity
+    //
+    for (i = 0; i < 3; i++) {
+        if (ent->velocity[i] > sv_maxvelocity->value) {
+            ent->velocity[i] = sv_maxvelocity->value;
+        } else if (ent->velocity[i] < -sv_maxvelocity->value) {
+            ent->velocity[i] = -sv_maxvelocity->value;
+        }
+    }
+}
 
 /*
 ==================
@@ -189,41 +162,30 @@ G_Impact
 Two entities have touched, so run their touch functions
 ==================
 */
-void G_Impact
-	(
-	Entity *e1,
-	trace_t *trace
-	)
+void G_Impact(Entity *e1, trace_t *trace)
 {
-	gentity_t *e2;
-	Event *ev;
+    gentity_t *e2;
+    Event     *ev;
 
-	e2 = trace->ent;
+    e2 = trace->ent;
 
-	level.impact_trace = *trace;
+    level.impact_trace = *trace;
 
-	// touch anything, including the world
-	if( e1->edict->solid != SOLID_NOT )
-	{
-		ev = new Event( EV_Touch );
-		ev->AddEntity( e2->entity );
-		e1->ProcessEvent( ev );
-	}
+    // touch anything, including the world
+    if (e1->edict->solid != SOLID_NOT) {
+        ev = new Event(EV_Touch);
+        ev->AddEntity(e2->entity);
+        e1->ProcessEvent(ev);
+    }
 
-	// entity could have been removed, so check if he's in use before sending the event
-	if(
-		e2->entity &&
-		( e2->solid != SOLID_NOT ) &&
-		( !( e2->r.contents & CONTENTS_SHOOTONLY ) ) &&
-		( e2->entity != world )
-		)
-	{
-		ev = new Event( EV_Touch );
-		ev->AddEntity( e1 );
-		e2->entity->ProcessEvent( ev );
-	}
+    // entity could have been removed, so check if he's in use before sending the event
+    if (e2->entity && (e2->solid != SOLID_NOT) && (!(e2->r.contents & CONTENTS_SHOOTONLY)) && (e2->entity != world)) {
+        ev = new Event(EV_Touch);
+        ev->AddEntity(e1);
+        e2->entity->ProcessEvent(ev);
+    }
 
-	memset( &level.impact_trace, 0, sizeof( level.impact_trace ) );
+    memset(&level.impact_trace, 0, sizeof(level.impact_trace));
 }
 
 /*
@@ -232,36 +194,29 @@ G_TestEntityPosition
 
 ============
 */
-Entity *G_TestEntityPosition
-	(
-	Entity *ent,
-	Vector vOrg
-	)
+Entity *G_TestEntityPosition(Entity *ent, Vector vOrg)
 {
-	int mask;
-	trace_t trace;
+    int     mask;
+    trace_t trace;
 
-	mask = ent->edict->clipmask;
-	if( !mask )
-		mask = MASK_SOLID;
+    mask = ent->edict->clipmask;
+    if (!mask) {
+        mask = MASK_SOLID;
+    }
 
-	if( ent->IsSubclassOfSentient() )
-	{
-		trace = G_Trace( vOrg, ent->mins, ent->maxs, vOrg, ent, mask, true, "G_TestEntityPosition1" );
-	}
-	else
-	{
-		trace = G_Trace( vOrg, ent->mins, ent->maxs, vOrg, ent, mask, false, "G_TestEntityPosition2" );
-	}
+    if (ent->IsSubclassOfSentient()) {
+        trace = G_Trace(vOrg, ent->mins, ent->maxs, vOrg, ent, mask, true, "G_TestEntityPosition1");
+    } else {
+        trace = G_Trace(vOrg, ent->mins, ent->maxs, vOrg, ent, mask, false, "G_TestEntityPosition2");
+    }
 
-	if( trace.startsolid )
-	{
-		assert( trace.ent );
-		assert( trace.ent->entity );
-		return trace.ent->entity;
-	}
+    if (trace.startsolid) {
+        assert(trace.ent);
+        assert(trace.ent->entity);
+        return trace.ent->entity;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /*
@@ -274,46 +229,34 @@ returns the blocked flags (1 = floor, 2 = step / wall)
 */
 #define STOP_EPSILON 0.1
 
-int G_ClipVelocity
-	(
-	Vector& in,
-	Vector& normal,
-	Vector& out,
-	float overbounce
-	)
+int G_ClipVelocity(Vector& in, Vector& normal, Vector& out, float overbounce)
+{
+    int   i;
+    int   blocked;
+    float backoff;
 
-	{
-	int	i;
-	int	blocked;
-	float	backoff;
+    blocked = 0;
 
-	blocked = 0;
+    if (normal[2] > 0) {
+        // floor
+        blocked |= 1;
+    }
+    if (!normal[2]) {
+        // step
+        blocked |= 2;
+    }
 
-   if ( normal[ 2 ] > 0 )
-		{
-		// floor
-		blocked |= 1;
-		}
-	if ( !normal[ 2 ] )
-		{
-		// step
-		blocked |= 2;
-		}
+    backoff = (in * normal) * overbounce;
 
-	backoff = ( in * normal ) * overbounce;
-
-	out = in - normal * backoff;
-	for( i = 0; i < 3; i++ )
-		{
-		if ( out[ i ] > -STOP_EPSILON && out[ i ] < STOP_EPSILON )
-			{
-			out[ i ] = 0;
-			}
-		}
-
-	return blocked;
-	}
+    out = in - normal * backoff;
+    for (i = 0; i < 3; i++) {
+        if (out[i] > -STOP_EPSILON && out[i] < STOP_EPSILON) {
+            out[i] = 0;
+        }
+    }
 
+    return blocked;
+}
 
 /*
 ============
@@ -328,218 +271,179 @@ Returns the clipflags if the velocity was modified (hit something solid)
 */
 #define MAX_CLIP_PLANES 5
 
-int G_FlyMove
-	(
-	Entity *ent,
-	Vector basevel,
-	float time,
-	int mask
-	)
+int G_FlyMove(Entity *ent, Vector basevel, float time, int mask)
 {
-	Entity	*hit;
-	gentity_t  *edict;
-	int		bumpcount, numbumps;
-	Vector	dir;
-	float		d;
-	int		numplanes;
-	vec3_t	planes[ MAX_CLIP_PLANES ];
-	Vector	primal_velocity, original_velocity, new_velocity;
-	int		i, j;
-	trace_t	trace;
-	Vector	end;
-	float		time_left;
-	int		blocked;
+    Entity    *hit;
+    gentity_t *edict;
+    int        bumpcount, numbumps;
+    Vector     dir;
+    float      d;
+    int        numplanes;
+    vec3_t     planes[MAX_CLIP_PLANES];
+    Vector     primal_velocity, original_velocity, new_velocity;
+    int        i, j;
+    trace_t    trace;
+    Vector     end;
+    float      time_left;
+    int        blocked;
 #if 0
 	Vector   move;
 	Vector	v;
 #endif
 
-	edict = ent->edict;
+    edict = ent->edict;
 
-	numbumps = 4;
+    numbumps = 4;
 
-	blocked = 0;
-	original_velocity = ent->velocity;
-	primal_velocity = ent->velocity;
-	numplanes = 0;
+    blocked           = 0;
+    original_velocity = ent->velocity;
+    primal_velocity   = ent->velocity;
+    numplanes         = 0;
 
 #if 1
-	time_left = time;
+    time_left = time;
 #else
-	time_left = 1.0;//time;
+    time_left = 1.0; //time;
 
-	v = ent->total_delta;
-	v[ 1 ] = -v[ 1 ];  // sigh...
-	MatrixTransformVector( v, ent->orientation, move );
-	move += ent->velocity * time;
-	ent->total_delta = vec_zero;
+    v    = ent->total_delta;
+    v[1] = -v[1]; // sigh...
+    MatrixTransformVector(v, ent->orientation, move);
+    move += ent->velocity * time;
+    ent->total_delta = vec_zero;
 #endif
 
-	ent->groundentity = NULL;
-	for( bumpcount = 0; bumpcount < numbumps; bumpcount++ )
-	{
+    ent->groundentity = NULL;
+    for (bumpcount = 0; bumpcount < numbumps; bumpcount++) {
 #if 1
-		end = ent->origin + time_left * ( ent->velocity + basevel );
+        end = ent->origin + time_left * (ent->velocity + basevel);
 #else
-		end = ent->origin + time_left * move;
+        end = ent->origin + time_left * move;
 #endif
 
-		trace = G_Trace( ent->origin, ent->mins, ent->maxs, end, ent, mask, false, "G_FlyMove" );
+        trace = G_Trace(ent->origin, ent->mins, ent->maxs, end, ent, mask, false, "G_FlyMove");
 
-		if(
-			( trace.allsolid ) ||
-			(
-			( trace.startsolid ) &&
-			( ent->movetype == MOVETYPE_VEHICLE )
-			)
-			)
-		{
-			// entity is trapped in another solid
-			ent->velocity = vec_zero;
-			return 3;
-		}
+        if ((trace.allsolid) || ((trace.startsolid) && (ent->movetype == MOVETYPE_VEHICLE))) {
+            // entity is trapped in another solid
+            ent->velocity = vec_zero;
+            return 3;
+        }
 
-		if( trace.fraction > 0 )
-		{
-			// actually covered some distance
-			ent->setOrigin( trace.endpos );
-			original_velocity = ent->velocity;
-			numplanes = 0;
-		}
+        if (trace.fraction > 0) {
+            // actually covered some distance
+            ent->setOrigin(trace.endpos);
+            original_velocity = ent->velocity;
+            numplanes         = 0;
+        }
 
-		if( trace.fraction == 1 )
-		{
-			// moved the entire distance
-			break;
-		}
+        if (trace.fraction == 1) {
+            // moved the entire distance
+            break;
+        }
 
-		assert( trace.ent );
-		hit = trace.ent->entity;
+        assert(trace.ent);
+        hit = trace.ent->entity;
 
-		if( trace.plane.normal[ 2 ] > 0.7 )
-		{
-			// floor
-			blocked |= 1;
-			if( hit->getSolidType() == SOLID_BSP )
-			{
-				ent->groundentity = hit->edict;
-				ent->groundplane = trace.plane;
-				ent->groundcontents = trace.contents;
-			}
-		}
+        if (trace.plane.normal[2] > 0.7) {
+            // floor
+            blocked |= 1;
+            if (hit->getSolidType() == SOLID_BSP) {
+                ent->groundentity   = hit->edict;
+                ent->groundplane    = trace.plane;
+                ent->groundcontents = trace.contents;
+            }
+        }
 
-		if( !trace.plane.normal[ 2 ] )
-		{
-			// step
-			blocked |= 2;
-		}
+        if (!trace.plane.normal[2]) {
+            // step
+            blocked |= 2;
+        }
 
-		//
-		// run the impact function
-		//
-		G_Impact( ent, &trace );
-		if( !edict->inuse )
-		{
-			break;		// removed by the impact function
-		}
+        //
+        // run the impact function
+        //
+        G_Impact(ent, &trace);
+        if (!edict->inuse) {
+            break; // removed by the impact function
+        }
 
-		time_left -= time_left * trace.fraction;
+        time_left -= time_left * trace.fraction;
 
-		// cliped to another plane
-		if( numplanes >= MAX_CLIP_PLANES )
-		{
-			// this shouldn't really happen
-			ent->velocity = vec_zero;
-			return 3;
-		}
+        // cliped to another plane
+        if (numplanes >= MAX_CLIP_PLANES) {
+            // this shouldn't really happen
+            ent->velocity = vec_zero;
+            return 3;
+        }
 
-		VectorCopy( trace.plane.normal, planes[ numplanes ] );
-		numplanes++;
+        VectorCopy(trace.plane.normal, planes[numplanes]);
+        numplanes++;
 
-		//
-		// modify original_velocity so it parallels all of the clip planes
-		//
-		for( i = 0; i < numplanes; i++ )
-		{
-			Vector normal = planes[ i ];
+        //
+        // modify original_velocity so it parallels all of the clip planes
+        //
+        for (i = 0; i < numplanes; i++) {
+            Vector normal = planes[i];
 
-			G_ClipVelocity( original_velocity, normal, new_velocity, 1.01f );
-			for( j = 0; j < numplanes; j++ )
-			{
-				if( j != i )
-				{
-					if( ( new_velocity * planes[ j ] ) < 0 )
-					{
-						// not ok
-						break;
-					}
-				}
-			}
+            G_ClipVelocity(original_velocity, normal, new_velocity, 1.01f);
+            for (j = 0; j < numplanes; j++) {
+                if (j != i) {
+                    if ((new_velocity * planes[j]) < 0) {
+                        // not ok
+                        break;
+                    }
+                }
+            }
 
-			if( j == numplanes )
-			{
-				break;
-			}
-		}
+            if (j == numplanes) {
+                break;
+            }
+        }
 
-		if( i != numplanes )
-		{
-			// go along this plane
-			ent->velocity = new_velocity;
-		}
-		else
-		{
-			// go along the crease
-			if( numplanes != 2 )
-			{
-				ent->velocity = vec_zero;
-				return 7;
-			}
-			CrossProduct( planes[ 0 ], planes[ 1 ], dir );
-			d = dir * ent->velocity;
-			ent->velocity = dir * d;
-		}
+        if (i != numplanes) {
+            // go along this plane
+            ent->velocity = new_velocity;
+        } else {
+            // go along the crease
+            if (numplanes != 2) {
+                ent->velocity = vec_zero;
+                return 7;
+            }
+            CrossProduct(planes[0], planes[1], dir);
+            d             = dir * ent->velocity;
+            ent->velocity = dir * d;
+        }
 
-		//
-		// if original velocity is against the original velocity, stop dead
-		// to avoid tiny occilations in sloping corners
-		//
-		if( ( ent->velocity * primal_velocity ) <= 0 )
-		{
-			ent->velocity = vec_zero;
-			return blocked;
-		}
-	}
+        //
+        // if original velocity is against the original velocity, stop dead
+        // to avoid tiny occilations in sloping corners
+        //
+        if ((ent->velocity * primal_velocity) <= 0) {
+            ent->velocity = vec_zero;
+            return blocked;
+        }
+    }
 
-	return blocked;
+    return blocked;
 }
 
-
 /*
 ============
 G_AddGravity
 
 ============
 */
-void G_AddGravity
-	(
-	Entity *ent
-	)
+void G_AddGravity(Entity *ent)
+{
+    float grav;
 
-	{
-   float grav;
+    if (ent->waterlevel > 2) {
+        grav = ent->gravity * 60 * level.frametime;
+    } else {
+        grav = ent->gravity * sv_gravity->value * level.frametime;
+    }
 
-   if ( ent->waterlevel > 2 )
-      {
-	   grav = ent->gravity * 60 * level.frametime;
-      }
-   else
-      {
-	   grav = ent->gravity * sv_gravity->value * level.frametime;
-      }
-
-	ent->velocity[ 2 ] -= grav;
-	}
+    ent->velocity[2] -= grav;
+}
 
 /*
 ===============================================================================
@@ -556,59 +460,48 @@ G_PushEntity
 Does not change the entities velocity at all
 ============
 */
-trace_t G_PushEntity
-	(
-	Entity *ent,
-	Vector push
-	)
+trace_t G_PushEntity(Entity *ent, Vector push)
 {
-	trace_t	trace;
-	Vector	start;
-	Vector	end;
-	int		mask;
-	gentity_t  *edict;
+    trace_t    trace;
+    Vector     start;
+    Vector     end;
+    int        mask;
+    gentity_t *edict;
 
-	start = ent->origin;
-	end = start + push;
+    start = ent->origin;
+    end   = start + push;
 
 retry:
-	if( ent->edict->clipmask )
-	{
-		mask = ent->edict->clipmask;
-	}
-	else
-	{
-		mask = MASK_SOLID;
-	}
+    if (ent->edict->clipmask) {
+        mask = ent->edict->clipmask;
+    } else {
+        mask = MASK_SOLID;
+    }
 
-	trace = G_Trace( start, ent->mins, ent->maxs, end, ent, mask, true, "G_PushEntity" );
+    trace = G_Trace(start, ent->mins, ent->maxs, end, ent, mask, true, "G_PushEntity");
 
-	edict = ent->edict;
+    edict = ent->edict;
 
-	ent->setOrigin( trace.endpos );
+    ent->setOrigin(trace.endpos);
 
-	if( trace.fraction != 1.0 )
-	{
-		G_Impact( ent, &trace );
+    if (trace.fraction != 1.0) {
+        G_Impact(ent, &trace);
 
-		// if the pushed entity went away and the pusher is still there
-		if( ( !trace.ent || !trace.ent->inuse ) && edict->inuse )
-		{
-			// move the pusher back and try again
-			ent->setOrigin( start );
-			goto retry;
-		}
-	}
+        // if the pushed entity went away and the pusher is still there
+        if ((!trace.ent || !trace.ent->inuse) && edict->inuse) {
+            // move the pusher back and try again
+            ent->setOrigin(start);
+            goto retry;
+        }
+    }
 
-	if( edict && ( edict != ent->edict ) )
-	{
-		if( ent->flags & FL_TOUCH_TRIGGERS )
-		{
-			G_TouchTriggers( ent );
-		}
-	}
+    if (edict && (edict != ent->edict)) {
+        if (ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(ent);
+        }
+    }
 
-	return trace;
+    return trace;
 }
 
 /*
@@ -616,37 +509,28 @@ retry:
 G_SlideEntity
 ============
 */
-trace_t G_SlideEntity
-	(
-	Entity *ent,
-	Vector push
-	)
+trace_t G_SlideEntity(Entity *ent, Vector push)
+{
+    trace_t trace;
+    Vector  start;
+    Vector  end;
+    int     mask;
 
-	{
-	trace_t	trace;
-	Vector	start;
-	Vector	end;
-	int		mask;
+    start = ent->origin;
+    end   = start + push;
 
-   start = ent->origin;
-	end = start + push;
+    if (ent->edict->clipmask) {
+        mask = ent->edict->clipmask;
+    } else {
+        mask = MASK_SOLID;
+    }
 
-	if ( ent->edict->clipmask )
-		{
-		mask = ent->edict->clipmask;
-		}
-	else
-		{
-		mask = MASK_SOLID;
-		}
+    trace = G_Trace(start, ent->mins, ent->maxs, end, ent, mask, false, "G_SlideEntity");
 
-	trace = G_Trace( start, ent->mins, ent->maxs, end, ent, mask, false, "G_SlideEntity" );
-
-	ent->setOrigin( trace.endpos );
-
-	return trace;
-	}
+    ent->setOrigin(trace.endpos);
 
+    return trace;
+}
 
 /*
 ================
@@ -702,186 +586,157 @@ Objects need to be moved back on a failed push,
 otherwise riders would continue to slide.
 ============
 */
-qboolean G_Push
-	(
-	Entity  *pusher,
-	Vector pushermove,
-	Vector pusheramove
-	)
+qboolean G_Push(Entity *pusher, Vector pushermove, Vector pusheramove)
+{
+    Entity    *check, *block;
+    gentity_t *edict;
+    Vector     move, amove;
+    Vector     mins, maxs;
+    Vector     save;
+    pushed_t  *p;
+    Vector     org, org2, move2, neworg;
+    Vector     norm;
+    float      mat[3][3];
+    pushed_t  *pusher_p;
+    float      radius;
+    int        i, num;
+    int        j;
+    int        touch[MAX_GENTITIES];
+    Event     *ev;
 
-	{
-	Entity		*check, *block;
-	gentity_t   *edict;
-	Vector		move, amove;
-	Vector		mins, maxs;
-	Vector		save;
-	pushed_t	*p;
-	Vector		org, org2, move2, neworg;
-	Vector		norm;
-	float		mat[ 3 ][ 3 ];
-	pushed_t	*pusher_p;
-	float       radius;
-	int         i, num;
-	int			j;
-	int         touch[ MAX_GENTITIES ];
-	Event		*ev;
+    // save the pusher's original position
+    pusher_p              = pushed_p;
+    pushed_p->ent         = pusher;
+    pushed_p->localorigin = pusher->localorigin;
+    pushed_p->origin      = pusher->origin;
+    pushed_p->localangles = pusher->localangles;
+    pushed_p->angles      = pusher->angles;
 
-	// save the pusher's original position
-	pusher_p = pushed_p;
-	pushed_p->ent = pusher;
-	pushed_p->localorigin = pusher->localorigin;
-	pushed_p->origin = pusher->origin;
-	pushed_p->localangles = pusher->localangles;
-	pushed_p->angles = pusher->angles;
+    if (pusher->client) {
+        pushed_p->deltayaw = pusher->client->ps.delta_angles[YAW];
+    }
 
-	if( pusher->client )
-	{
-		pushed_p->deltayaw = pusher->client->ps.delta_angles[ YAW ];
-	}
+    pushed_p++;
 
-	pushed_p++;
+    if (pushed_p >= &pushed[MAX_GENTITIES]) {
+        gi.Error(ERR_FATAL, "Pushed too many entities.");
+    }
 
-	if( pushed_p >= &pushed[ MAX_GENTITIES ] )
-	{
-		gi.Error( ERR_FATAL, "Pushed too many entities." );
-	}
+    if (pusher->IsSubclassOfPlayer()) {
+        pusher->setAngles();
+        pusher->setOrigin();
+    } else {
+        // move the pusher to it's final position
+        pusher->addAngles(pusheramove);
+        pusher->addOrigin(pushermove);
+    }
 
-	if( pusher->IsSubclassOfPlayer() )
-	{
-		pusher->setAngles();
-		pusher->setOrigin();
-	}
-	else
-	{
-		// move the pusher to it's final position
-		pusher->addAngles( pusheramove );
-		pusher->addOrigin( pushermove );
-	}
+    if (pusher->edict->solid == SOLID_NOT) {
+        // Doesn't push anything
+        return true;
+    }
 
+    // change the move to worldspace
+    move  = pusher->origin - pusher_p->origin;
+    amove = pusher->angles - pusher_p->angles;
 
-	if( pusher->edict->solid == SOLID_NOT )
-	{
-		// Doesn't push anything
-		return true;
-	}
+    // we need this for pushing things later
+    AnglesToAxis(amove, mat);
 
-	// change the move to worldspace
-	move = pusher->origin - pusher_p->origin;
-	amove = pusher->angles - pusher_p->angles;
+    // find the bounding box
+    mins = pusher->absmin;
+    maxs = pusher->absmax;
 
-	// we need this for pushing things later
-	AnglesToAxis( amove, mat );
+    // Add in entities that are within the pusher
 
-	// find the bounding box
-	mins = pusher->absmin;
-	maxs = pusher->absmax;
+    num = gi.AreaEntities(mins, maxs, touch, MAX_GENTITIES);
 
-	// Add in entities that are within the pusher
+    for (i = 0; i < num; i++) {
+        edict = &g_entities[touch[i]];
+        assert(edict);
+        assert(edict->inuse);
+        assert(edict->entity);
+        check = edict->entity;
 
-	num = gi.AreaEntities( mins, maxs, touch, MAX_GENTITIES );
+        if ((check->movetype == MOVETYPE_PUSH) || (check->movetype == MOVETYPE_STOP)
+            || (check->movetype == MOVETYPE_NONE) || (check->movetype == MOVETYPE_NOCLIP)) {
+            continue;
+        }
 
-	for( i = 0; i < num; i++ )
-	{
-		edict = &g_entities[ touch[ i ] ];
-		assert( edict );
-		assert( edict->inuse );
-		assert( edict->entity );
-		check = edict->entity;
+        if (check->edict->r.contents == CONTENTS_SHOOTONLY) {
+            continue;
+        }
 
-		if( ( check->movetype == MOVETYPE_PUSH ) ||
-			( check->movetype == MOVETYPE_STOP ) ||
-			( check->movetype == MOVETYPE_NONE ) ||
-			( check->movetype == MOVETYPE_NOCLIP ) )
-		{
-			continue;
-		}
+        // if the entity is standing on the pusher, it will definitely be moved
+        if (check->groundentity != pusher->edict) {
+            // Only move triggers and non-solid objects if they're sitting on a moving object
+            if ((check->edict->solid == SOLID_TRIGGER) || (check->edict->solid == SOLID_NOT)) {
+                continue;
+            }
 
-		if( check->edict->r.contents == CONTENTS_SHOOTONLY )
-			continue;
+            // see if the ent needs to be tested
+            if ((check->absmin[0] >= maxs[0]) || (check->absmin[1] >= maxs[1]) || (check->absmin[2] >= maxs[2])
+                || (check->absmax[0] <= mins[0]) || (check->absmax[1] <= mins[1]) || (check->absmax[2] <= mins[2])) {
+                continue;
+            }
 
-		// if the entity is standing on the pusher, it will definitely be moved
-		if( check->groundentity != pusher->edict )
-		{
-			// Only move triggers and non-solid objects if they're sitting on a moving object
-			if( ( check->edict->solid == SOLID_TRIGGER ) || ( check->edict->solid == SOLID_NOT ) )
-			{
-				continue;
-			}
+            // see if the ent's bbox is inside the pusher's final position
+            if (!G_TestEntityPosition(check, check->origin)) {
+                continue;
+            }
 
-			// see if the ent needs to be tested
-			if( ( check->absmin[ 0 ] >= maxs[ 0 ] ) ||
-				( check->absmin[ 1 ] >= maxs[ 1 ] ) ||
-				( check->absmin[ 2 ] >= maxs[ 2 ] ) ||
-				( check->absmax[ 0 ] <= mins[ 0 ] ) ||
-				( check->absmax[ 1 ] <= mins[ 1 ] ) ||
-				( check->absmax[ 2 ] <= mins[ 2 ] ) )
-			{
-				continue;
-			}
+            ev = new Event(EV_Touch);
+            ev->AddEntity(pusher);
+            check->ProcessEvent(ev);
 
-			// see if the ent's bbox is inside the pusher's final position
-			if( !G_TestEntityPosition( check, check->origin ) )
-			{
-				continue;
-			}
+            ev = new Event(EV_Touch);
+            ev->AddEntity(check);
+            pusher->ProcessEvent(ev);
+        }
 
-			ev = new Event( EV_Touch );
-			ev->AddEntity( pusher );
-			check->ProcessEvent( ev );
+        pushed_p->localorigin = check->localorigin;
+        pushed_p->localangles = check->localangles;
+        // move this entity
+        pushed_p->ent    = check;
+        pushed_p->origin = check->origin;
+        pushed_p->angles = check->angles;
+        pushed_p++;
 
-			ev = new Event( EV_Touch );
-			ev->AddEntity( check );
-			pusher->ProcessEvent( ev );
-		}
+        if (pushed_p >= &pushed[MAX_GENTITIES]) {
+            gi.Error(ERR_FATAL, "Pushed too many entities.");
+        }
 
-		pushed_p->localorigin = check->localorigin;
-		pushed_p->localangles = check->localangles;
-		// move this entity
-		pushed_p->ent = check;
-		pushed_p->origin = check->origin;
-		pushed_p->angles = check->angles;
-		pushed_p++;
+        // save off the origin
+        save = check->localorigin;
 
-		if( pushed_p >= &pushed[ MAX_GENTITIES ] )
-		{
-			gi.Error( ERR_FATAL, "Pushed too many entities." );
-		}
+        // try moving the contacted entity
+        move2 = move;
 
-		// save off the origin
-		save = check->localorigin;
+        // FIXME: doesn't rotate monsters?
+        if (check->client && amove[YAW]) {
+            Sentient *sent = (Sentient *)check;
+            Vector    a    = sent->GetViewAngles() + Vector(0, amove[YAW], 0);
+            sent->SetViewAngles(a);
+        }
 
-		// try moving the contacted entity
-		move2 = move;
+        // get the radius of the entity
+        if (check->size.x > check->size.z) {
+            radius = check->size.z * 0.5f;
+        } else {
+            radius = check->size.x * 0.5f;
+        }
 
-		// FIXME: doesn't rotate monsters?
-		if( check->client && amove[ YAW ] )
-		{
-			Sentient *sent = ( Sentient * )check;
-			Vector a = sent->GetViewAngles() + Vector( 0, amove[ YAW ], 0 );
-			sent->SetViewAngles( a );
-		}
+        // figure movement due to the pusher's amove
+        org = check->origin - pusher->origin;
+        org.z += radius;
 
-		// get the radius of the entity
-		if( check->size.x > check->size.z )
-		{
-			radius = check->size.z * 0.5f;
-		}
-		else
-		{
-			radius = check->size.x * 0.5f;
-		}
+        MatrixTransformVector(org, mat, org2);
 
-		// figure movement due to the pusher's amove
-		org = check->origin - pusher->origin;
-		org.z += radius;
+        move2 += org2 - org;
 
-		MatrixTransformVector( org, mat, org2 );
+        neworg = move2 + check->origin;
 
-		move2 += org2 - org;
-
-		neworg = move2 + check->origin;
-
-		/*
+        /*
 		// This one seems to be better for the bind command
 		if( G_TestEntityPosition( check, check->origin ) )
 		{
@@ -900,86 +755,96 @@ qboolean G_Push
 		}
 		*/
 
-		if( G_TestEntityPosition( check, neworg ) )
-		{
-			trace_t trace;
-			Vector end;
-			Vector fwd;
-			float length;
+        if (G_TestEntityPosition(check, neworg)) {
+            trace_t trace;
+            Vector  end;
+            Vector  fwd;
+            float   length;
 
-			length = VectorNormalize2( move2, fwd );
+            length = VectorNormalize2(move2, fwd);
 
-			end = check->origin + fwd * ( length + 64.0f );
+            end = check->origin + fwd * (length + 64.0f);
 
-			if( check->IsSubclassOfSentient() )
-			{
-				trace = G_Trace( check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, true, "G_Push" );
-			}
-			else
-			{
-				trace = G_Trace( check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, false, "G_Push" );
-			}
+            if (check->IsSubclassOfSentient()) {
+                trace = G_Trace(
+                    check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, true, "G_Push"
+                );
+            } else {
+                trace = G_Trace(
+                    check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, false, "G_Push"
+                );
+            }
 
-			if( !trace.allsolid )
-			{
-				if( check->IsSubclassOfSentient() )
-				{
-					trace = G_Trace( Vector( trace.endpos ), check->mins, check->maxs, neworg, check, check->edict->clipmask, true, "G_Push" );
-				}
-				else
-				{
-					trace = G_Trace( Vector( trace.endpos ), check->mins, check->maxs, neworg, check, check->edict->clipmask, false, "G_Push" );
-				}
+            if (!trace.allsolid) {
+                if (check->IsSubclassOfSentient()) {
+                    trace = G_Trace(
+                        Vector(trace.endpos),
+                        check->mins,
+                        check->maxs,
+                        neworg,
+                        check,
+                        check->edict->clipmask,
+                        true,
+                        "G_Push"
+                    );
+                } else {
+                    trace = G_Trace(
+                        Vector(trace.endpos),
+                        check->mins,
+                        check->maxs,
+                        neworg,
+                        check,
+                        check->edict->clipmask,
+                        false,
+                        "G_Push"
+                    );
+                }
 
-				move2 = trace.endpos - check->origin;
-			}
-		}
+                move2 = trace.endpos - check->origin;
+            }
+        }
 
-		check->addOrigin( check->getParentVector( move2 ) );
+        check->addOrigin(check->getParentVector(move2));
 
-		// may have pushed them off an edge
-		if( check->groundentity )
-		{
-			if( check->groundentity != pusher->edict )
-				check->groundentity = NULL;
-		}
-		else
-		{
-			move2 *= 1.f / level.frametime;
+        // may have pushed them off an edge
+        if (check->groundentity) {
+            if (check->groundentity != pusher->edict) {
+                check->groundentity = NULL;
+            }
+        } else {
+            move2 *= 1.f / level.frametime;
 
-			for (j = 0; j < 3; j++) {
-				if (!move2[j]) {
-					continue;
-				}
+            for (j = 0; j < 3; j++) {
+                if (!move2[j]) {
+                    continue;
+                }
 
-				if (move2[j] < 0) {
+                if (move2[j] < 0) {
                     if (check->velocity[j] > move2[j]) {
                         check->velocity[j] = move2[j];
                     }
-				} else {
-					if (check->velocity[j] < move2[j]) {
-						check->velocity[j] = move2[j];
-					}
-				}
-			}
-		}
+                } else {
+                    if (check->velocity[j] < move2[j]) {
+                        check->velocity[j] = move2[j];
+                    }
+                }
+            }
+        }
 
-		block = G_TestEntityPosition( check, check->origin );
-		if( block )
-		{
-			block = G_FixEntityPosition( check );
-		}
-		if( !block )
-		{
-			// pushed ok
-			check->link();
+        block = G_TestEntityPosition(check, check->origin);
+        if (block) {
+            block = G_FixEntityPosition(check);
+        }
+        if (!block) {
+            // pushed ok
+            check->link();
 
-			// impact?
-			continue;
-		}
+            // impact?
+            continue;
+        }
 
-		// try to snap it to a good position
-		/*
+        // try to snap it to a good position
+        /*
 		if ( G_SnapPosition( check ) )
 		{
 		// snapped ok.  we don't have to link since G_SnapPosition does it for us.
@@ -987,67 +852,61 @@ qboolean G_Push
 		}
 		*/
 
-		// if it is ok to leave in the old position, do it
-		// this is only relevent for riding entities, not pushed
-		check->setLocalOrigin( save );
-		block = G_TestEntityPosition( check, check->origin );
-		if( !block )
-		{
-			pushed_p--;
-			continue;
-		}
+        // if it is ok to leave in the old position, do it
+        // this is only relevent for riding entities, not pushed
+        check->setLocalOrigin(save);
+        block = G_TestEntityPosition(check, check->origin);
+        if (!block) {
+            pushed_p--;
+            continue;
+        }
 
-		if( check->edict->solid == SOLID_NOT )
-			continue;
+        if (check->edict->solid == SOLID_NOT) {
+            continue;
+        }
 
-		// L: don't make the pusher teleport through anything that block
-		if( block != pusher )
-		{
-			pusher_p->ent->setOrigin( pusher_p->origin );
-			continue;
-		}
+        // L: don't make the pusher teleport through anything that block
+        if (block != pusher) {
+            pusher_p->ent->setOrigin(pusher_p->origin);
+            continue;
+        }
 
-		// save off the obstacle so we can call the block function
-		obstacle = check;
+        // save off the obstacle so we can call the block function
+        obstacle = check;
 
-		// move back any entities we already moved
-		// go backwards, so if the same entity was pushed
-		// twice, it goes back to the original position
-		for( p = pushed_p - 1; p >= pushed; p-- )
-		{
-			p->ent->angles = p->angles;
-			p->ent->origin = p->origin;
+        // move back any entities we already moved
+        // go backwards, so if the same entity was pushed
+        // twice, it goes back to the original position
+        for (p = pushed_p - 1; p >= pushed; p--) {
+            p->ent->angles = p->angles;
+            p->ent->origin = p->origin;
 
-			p->ent->localangles = p->localangles;
-			p->ent->localorigin = p->localorigin;
+            p->ent->localangles = p->localangles;
+            p->ent->localorigin = p->localorigin;
 
-			if( p->ent->client )
-			{
-				p->ent->client->ps.delta_angles[ YAW ] = ( int )p->deltayaw;
-			}
-		}
+            if (p->ent->client) {
+                p->ent->client->ps.delta_angles[YAW] = (int)p->deltayaw;
+            }
+        }
 
-		// Only "really" move it in order so that the bound coordinate system is correct
-		for( p = pushed; p < pushed_p; p++ )
-		{
-			p->ent->setAngles();
-			p->ent->setOrigin();
-		}
+        // Only "really" move it in order so that the bound coordinate system is correct
+        for (p = pushed; p < pushed_p; p++) {
+            p->ent->setAngles();
+            p->ent->setOrigin();
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	//FIXME: is there a better way to handle this?
-	// see if anything we moved has touched a trigger
-	for( p = pushed_p - 1; p >= pushed; p-- )
-	{
-		if( p->ent->flags & FL_TOUCH_TRIGGERS )
-		{
-			G_TouchTriggers( p->ent );
-		}
-	}
+    //FIXME: is there a better way to handle this?
+    // see if anything we moved has touched a trigger
+    for (p = pushed_p - 1; p >= pushed; p--) {
+        if (p->ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(p->ent);
+        }
+    }
 
-	return true;
+    return true;
 }
 
 /*
@@ -1055,39 +914,37 @@ qboolean G_Push
 G_PushMove
 ================
 */
-qboolean G_PushMove( Entity  *ent, Vector move, Vector amove )
+qboolean G_PushMove(Entity *ent, Vector move, Vector amove)
 {
-	Entity *part;
-	Vector m, a;
-	Event	 *ev;
+    Entity *part;
+    Vector  m, a;
+    Event  *ev;
 
-	m = move;
-	a = amove;
+    m = move;
+    a = amove;
 
-	pushed_p = pushed;
+    pushed_p = pushed;
 
-	part = ent;
+    part = ent;
 
-	while( part )
-	{
-		if( !G_Push( part, m, a ) )
-		{
-			// move was blocked
-			// call the pusher's "blocked" function
-			// otherwise, just stay in place until the obstacle is gone
-			ev = new Event( EV_Blocked );
-			ev->AddEntity( obstacle );
-			part->ProcessEvent( ev );
-			return false;
-		}
+    while (part) {
+        if (!G_Push(part, m, a)) {
+            // move was blocked
+            // call the pusher's "blocked" function
+            // otherwise, just stay in place until the obstacle is gone
+            ev = new Event(EV_Blocked);
+            ev->AddEntity(obstacle);
+            part->ProcessEvent(ev);
+            return false;
+        }
 
-		m = vec_zero;
-		a = vec_zero;
+        m = vec_zero;
+        a = vec_zero;
 
-		part = part->teamchain;
-	}
+        part = part->teamchain;
+    }
 
-	return true;
+    return true;
 }
 
 /*
@@ -1098,65 +955,55 @@ Bmodel objects don't interact with each other, but
 push all box objects
 ================
 */
-void G_Physics_Pusher
-	(
-	Entity *ent
-	)
+void G_Physics_Pusher(Entity *ent)
 {
-	Vector	move, amove;
-	Entity   *part, *mv;
-	Event		*ev;
+    Vector  move, amove;
+    Entity *part, *mv;
+    Event  *ev;
 
-	// team slaves are only moved by their captains
-	if( ent->flags & FL_TEAMSLAVE )
-	{
-		return;
-	}
+    // team slaves are only moved by their captains
+    if (ent->flags & FL_TEAMSLAVE) {
+        return;
+    }
 
-	// Check if anyone on the team is moving
-	for( part = ent; part; part = part->teamchain )
-	{
-		if( part->velocity != vec_zero || part->avelocity != vec_zero )
-		{
-			break;
-		}
-	}
+    // Check if anyone on the team is moving
+    for (part = ent; part; part = part->teamchain) {
+        if (part->velocity != vec_zero || part->avelocity != vec_zero) {
+            break;
+        }
+    }
 
-	// make sure all team slaves can move before commiting
-	// any moves or calling any think functions
-	// if the move is blocked, all moved objects will be backed out
-	pushed_p = pushed;
-	while( part )
-	{
-		move = part->velocity	* level.frametime;
-		amove = part->avelocity	* level.frametime;
+    // make sure all team slaves can move before commiting
+    // any moves or calling any think functions
+    // if the move is blocked, all moved objects will be backed out
+    pushed_p = pushed;
+    while (part) {
+        move  = part->velocity * level.frametime;
+        amove = part->avelocity * level.frametime;
 
-		if( !G_Push( part, move, amove ) )
-		{
-			// move was blocked
-			break;
-		}
+        if (!G_Push(part, move, amove)) {
+            // move was blocked
+            break;
+        }
 
-		part = part->teamchain;
-	}
+        part = part->teamchain;
+    }
 
-	if( part )
-	{
-		// the move failed, bump all movedone times
-		for( mv = ent; mv; mv = mv->teamchain )
-		{
-			mv->PostponeEvent( EV_MoveDone, FRAMETIME );
-		}
+    if (part) {
+        // the move failed, bump all movedone times
+        for (mv = ent; mv; mv = mv->teamchain) {
+            mv->PostponeEvent(EV_MoveDone, FRAMETIME);
+        }
 
-		// if the pusher has a "blocked" function, call it
-		// otherwise, just stay in place until the obstacle is gone
-		ev = new Event( EV_Blocked );
-		ev->AddEntity( obstacle );
-		part->ProcessEvent( ev );
-	}
+        // if the pusher has a "blocked" function, call it
+        // otherwise, just stay in place until the obstacle is gone
+        ev = new Event(EV_Blocked);
+        ev->AddEntity(obstacle);
+        part->ProcessEvent(ev);
+    }
 
-	ent->velocity += ent->accel;
-	ent->avelocity += ent->aaccel;
+    ent->velocity += ent->accel;
+    ent->avelocity += ent->aaccel;
 }
 
 //==================================================================
@@ -1168,16 +1015,12 @@ G_Physics_Noclip
 A moving object that doesn't obey physics
 =============
 */
-void G_Physics_Noclip
-	(
-	Entity *ent
-	)
-
-	{
-	ent->angles += ent->avelocity * level.frametime;
-   ent->origin += ent->velocity * level.frametime;
-	ent->link();
-	}
+void G_Physics_Noclip(Entity *ent)
+{
+    ent->angles += ent->avelocity * level.frametime;
+    ent->origin += ent->velocity * level.frametime;
+    ent->link();
+}
 
 /*
 ==============================================================================
@@ -1194,208 +1037,172 @@ G_Physics_Toss
 Toss, bounce, and fly movement.  When onground, do nothing.
 =============
 */
-void G_Physics_Toss
-	(
-	Entity *ent
-	)
+void G_Physics_Toss(Entity *ent)
 {
-	trace_t	trace;
-	Vector	move;
-	float		backoff;
-	Entity	*slave;
-	qboolean	wasinwater;
-	qboolean	isinwater;
-	Vector   origin2;
-	Vector	basevel;
-	gentity_t  *edict;
-	qboolean onconveyor;
+    trace_t    trace;
+    Vector     move;
+    float      backoff;
+    Entity    *slave;
+    qboolean   wasinwater;
+    qboolean   isinwater;
+    Vector     origin2;
+    Vector     basevel;
+    gentity_t *edict;
+    qboolean   onconveyor;
 
-	// if not a team captain, so movement will be handled elsewhere
-	if( ent->flags & FL_TEAMSLAVE )
-	{
-		return;
-	}
+    // if not a team captain, so movement will be handled elsewhere
+    if (ent->flags & FL_TEAMSLAVE) {
+        return;
+    }
 
-	if( ent->velocity[ 2 ] > 0 )
-	{
-		ent->groundentity = NULL;
-	}
+    if (ent->velocity[2] > 0) {
+        ent->groundentity = NULL;
+    }
 
-	// check for the groundentity going away
-	if( ent->groundentity && !ent->groundentity->inuse )
-	{
-		ent->groundentity = NULL;
-	}
+    // check for the groundentity going away
+    if (ent->groundentity && !ent->groundentity->inuse) {
+        ent->groundentity = NULL;
+    }
 
-	onconveyor = ( basevel != vec_zero );
+    onconveyor = (basevel != vec_zero);
 
-	// if onground, return without moving
-	if( ent->groundentity && ent->groundentity->entity->movetype == MOVETYPE_NONE && !onconveyor && ( ent->movetype != MOVETYPE_VEHICLE ) )
-	{
-		if( ent->avelocity.length() )
-		{
-			// move angles
-			ent->setAngles( ent->angles + ent->avelocity * level.frametime );
-		}
-		ent->velocity = vec_zero;
-		return;
-	}
+    // if onground, return without moving
+    if (ent->groundentity && ent->groundentity->entity->movetype == MOVETYPE_NONE && !onconveyor
+        && (ent->movetype != MOVETYPE_VEHICLE)) {
+        if (ent->avelocity.length()) {
+            // move angles
+            ent->setAngles(ent->angles + ent->avelocity * level.frametime);
+        }
+        ent->velocity = vec_zero;
+        return;
+    }
 
-	origin2 = ent->origin;
+    origin2 = ent->origin;
 
-	G_CheckVelocity( ent );
+    G_CheckVelocity(ent);
 
-	// add gravity
-	if( !onconveyor && ent->movetype != MOVETYPE_FLY && ent->movetype != MOVETYPE_FLYMISSILE )
-	{
-		G_AddGravity( ent );
-	}
+    // add gravity
+    if (!onconveyor && ent->movetype != MOVETYPE_FLY && ent->movetype != MOVETYPE_FLYMISSILE) {
+        G_AddGravity(ent);
+    }
 
-	if (ent->avelocity.lengthSquared()) {
-		// move angles
-		ent->setAngles(ent->angles + ent->avelocity * level.frametime);
-	}
+    if (ent->avelocity.lengthSquared()) {
+        // move angles
+        ent->setAngles(ent->angles + ent->avelocity * level.frametime);
+    }
 
-	// move origin
-	move = ( ent->velocity + basevel ) * level.frametime;
+    // move origin
+    move = (ent->velocity + basevel) * level.frametime;
 
-	edict = ent->edict;
-	if( ent->movetype == MOVETYPE_VEHICLE )
-	{
-		int mask;
+    edict = ent->edict;
+    if (ent->movetype == MOVETYPE_VEHICLE) {
+        int mask;
 
-		if( ent->edict->clipmask )
-		{
-			mask = ent->edict->clipmask;
-		}
-		else
-		{
-			mask = MASK_MONSTERSOLID;
-		}
-		G_FlyMove( ent, basevel, FRAMETIME, mask );
-		if( ent->flags & FL_TOUCH_TRIGGERS )
-		{
-			G_TouchTriggers( ent );
-		}
-		return;
-	}
-	else
-	{
-		trace = G_PushEntity( ent, move );
-	}
+        if (ent->edict->clipmask) {
+            mask = ent->edict->clipmask;
+        } else {
+            mask = MASK_MONSTERSOLID;
+        }
+        G_FlyMove(ent, basevel, FRAMETIME, mask);
+        if (ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(ent);
+        }
+        return;
+    } else {
+        trace = G_PushEntity(ent, move);
+    }
 
-	if( ( trace.fraction == 0 ) && ( ent->movetype == MOVETYPE_SLIDE || ent->movetype == MOVETYPE_BOUNCE ) )
-	{
-		// Check for slide by removing the downward velocity
-		Vector slide;
+    if ((trace.fraction == 0) && (ent->movetype == MOVETYPE_SLIDE || ent->movetype == MOVETYPE_BOUNCE)) {
+        // Check for slide by removing the downward velocity
+        Vector slide;
 
-		slide[ 0 ] = move[ 0 ] * level.frametime * 15;
-		slide[ 1 ] = move[ 1 ] * level.frametime * 15;
-		slide[ 2 ] = 0;
-		G_PushEntity( ent, slide );
-	}
+        slide[0] = move[0] * level.frametime * 15;
+        slide[1] = move[1] * level.frametime * 15;
+        slide[2] = 0;
+        G_PushEntity(ent, slide);
+    }
 
-	if( !edict->inuse )
-	{
-		return;
-	}
+    if (!edict->inuse) {
+        return;
+    }
 
-	if( trace.fraction < 1 )
-	{
-		if( ent->movetype == MOVETYPE_BOUNCE )
-		{
-			backoff = 1.4f;
-		}
-		else if ( ent->movetype == MOVETYPE_GIB )
-		{
-			backoff = 1.6f;
-		}
-		else
-		{
-			backoff = 1;
-		}
+    if (trace.fraction < 1) {
+        if (ent->movetype == MOVETYPE_BOUNCE) {
+            backoff = 1.4f;
+        } else if (ent->movetype == MOVETYPE_GIB) {
+            backoff = 1.6f;
+        } else {
+            backoff = 1;
+        }
 
-		Vector normal = trace.plane.normal;
+        Vector normal = trace.plane.normal;
 
-		G_ClipVelocity( ent->velocity, normal, ent->velocity, backoff );
+        G_ClipVelocity(ent->velocity, normal, ent->velocity, backoff);
 
-		if (ent->movetype == MOVETYPE_BOUNCE) {
-			// Reduce the velocity when bouncing
-			ent->velocity[0] -= ent->velocity[0] * level.frametime * 1.75f;
-			ent->velocity[1] -= ent->velocity[1] * level.frametime * 1.75f;
-		}
+        if (ent->movetype == MOVETYPE_BOUNCE) {
+            // Reduce the velocity when bouncing
+            ent->velocity[0] -= ent->velocity[0] * level.frametime * 1.75f;
+            ent->velocity[1] -= ent->velocity[1] * level.frametime * 1.75f;
+        }
 
-		// stop if on ground
-		if( trace.plane.normal[ 2 ] > 0.7 )
-		{
-			ent->groundentity = trace.ent;
-			ent->groundplane = trace.plane;
-			ent->groundcontents = trace.contents;
+        // stop if on ground
+        if (trace.plane.normal[2] > 0.7) {
+            ent->groundentity   = trace.ent;
+            ent->groundplane    = trace.plane;
+            ent->groundcontents = trace.contents;
 
-			if( ( ( ent->movetype == MOVETYPE_GIB && ent->velocity[ 2 ] < 60 ) || ( ent->movetype == MOVETYPE_BOUNCE && ent->velocity.length() < 40 ) ) &&
-				( ent->movetype != MOVETYPE_SLIDE ) )
-			{
-				ent->velocity = vec_zero;
-				ent->avelocity = vec_zero;
-				ent->ProcessEvent( EV_Stop );
-			}
-			else if( ent->movetype == MOVETYPE_TOSS || ent->movetype == MOVETYPE_GIB )
-			{
-				// Stop spinning after we bounce on the ground
-				ent->avelocity = vec_zero;
-				ent->ProcessEvent( EV_Stop );
-			}
-		}
-	}
+            if (((ent->movetype == MOVETYPE_GIB && ent->velocity[2] < 60)
+                 || (ent->movetype == MOVETYPE_BOUNCE && ent->velocity.length() < 40))
+                && (ent->movetype != MOVETYPE_SLIDE)) {
+                ent->velocity  = vec_zero;
+                ent->avelocity = vec_zero;
+                ent->ProcessEvent(EV_Stop);
+            } else if (ent->movetype == MOVETYPE_TOSS || ent->movetype == MOVETYPE_GIB) {
+                // Stop spinning after we bounce on the ground
+                ent->avelocity = vec_zero;
+                ent->ProcessEvent(EV_Stop);
+            }
+        }
+    }
 
-	if( ( move[ 2 ] == 0 ) && onconveyor )
-	{
-		// Check if we still have a ground
-		ent->CheckGround();
-	}
+    if ((move[2] == 0) && onconveyor) {
+        // Check if we still have a ground
+        ent->CheckGround();
+    }
 
-	// check for water transition
-	wasinwater = ( ent->watertype & MASK_WATER );
-	ent->watertype = gi.pointcontents( ent->origin, 0 );
-	isinwater = ent->watertype & MASK_WATER;
+    // check for water transition
+    wasinwater     = (ent->watertype & MASK_WATER);
+    ent->watertype = gi.pointcontents(ent->origin, 0);
+    isinwater      = ent->watertype & MASK_WATER;
 
-	if( isinwater )
-	{
-		ent->waterlevel = 1;
-	}
-	else
-	{
-		ent->waterlevel = 0;
-	}
+    if (isinwater) {
+        ent->waterlevel = 1;
+    } else {
+        ent->waterlevel = 0;
+    }
 
-	if( ( edict->spawntime < ( level.time - FRAMETIME ) ) && ( ent->mass > 0 ) )
-	{
-		if( !wasinwater && isinwater )
-		{
-			ent->Sound( "impact_watersplash", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2 );
-		}
-		else if( wasinwater && !isinwater )
-		{
-			ent->Sound( "impact_leavewater", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2 );
-		}
-	}
+    if ((edict->spawntime < (level.time - FRAMETIME)) && (ent->mass > 0)) {
+        if (!wasinwater && isinwater) {
+            ent->Sound("impact_watersplash", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2);
+        } else if (wasinwater && !isinwater) {
+            ent->Sound("impact_leavewater", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2);
+        }
+    }
 
-	// GAMEFIX - Is this necessary?
-	// move teamslaves
-	for( slave = ent->teamchain; slave; slave = slave->teamchain )
-	{
-		slave->setLocalOrigin( slave->localorigin );
-		slave->setAngles( slave->localangles );
-	}
+    // GAMEFIX - Is this necessary?
+    // move teamslaves
+    for (slave = ent->teamchain; slave; slave = slave->teamchain) {
+        slave->setLocalOrigin(slave->localorigin);
+        slave->setAngles(slave->localangles);
+    }
 
-	if( ent->flags & FL_TOUCH_TRIGGERS )
-	{
-		G_TouchTriggers( ent );
-	}
+    if (ent->flags & FL_TOUCH_TRIGGERS) {
+        G_TouchTriggers(ent);
+    }
 
-	if (ai_debug_grenades->integer && ent->movetype == MOVETYPE_BOUNCE) {
-		G_DebugLine(origin2, ent->origin, 1, 1, 0, 1);
-	}
+    if (ai_debug_grenades->integer && ent->movetype == MOVETYPE_BOUNCE) {
+        G_DebugLine(origin2, ent->origin, 1, 1, 0, 1);
+    }
 }
 
 /*
@@ -1406,37 +1213,27 @@ STEPPING MOVEMENT
 ===============================================================================
 */
 
-void G_AddRotationalFriction
-	(
-	Entity *ent
-	)
+void G_AddRotationalFriction(Entity *ent)
+{
+    int   n;
+    float adjustment;
 
-	{
-	int	n;
-	float	adjustment;
-
-	ent->angles += level.frametime * ent->avelocity;
-	adjustment = level.frametime * sv_stopspeed->value * sv_friction->value;
-	for( n = 0; n < 3; n++ )
-		{
-		if ( ent->avelocity[ n ] > 0)
-			{
-			ent->avelocity[ n ] -= adjustment;
-			if ( ent->avelocity[ n ] < 0 )
-				{
-				ent->avelocity[ n ] = 0;
-				}
-			}
-		else
-			{
-			ent->avelocity[ n ] += adjustment;
-			if ( ent->avelocity[ n ] > 0 )
-				{
-				ent->avelocity[ n ] = 0;
-				}
-			}
-		}
-	}
+    ent->angles += level.frametime * ent->avelocity;
+    adjustment = level.frametime * sv_stopspeed->value * sv_friction->value;
+    for (n = 0; n < 3; n++) {
+        if (ent->avelocity[n] > 0) {
+            ent->avelocity[n] -= adjustment;
+            if (ent->avelocity[n] < 0) {
+                ent->avelocity[n] = 0;
+            }
+        } else {
+            ent->avelocity[n] += adjustment;
+            if (ent->avelocity[n] > 0) {
+                ent->avelocity[n] = 0;
+            }
+        }
+    }
+}
 
 /*
 =============
@@ -1445,21 +1242,14 @@ G_CheckWater
 =============
 */
 
-void G_CheckWater
-	(
-	Entity *ent
-	)
+void G_CheckWater(Entity *ent)
 {
-	ent->watertype = gi.pointcontents( ent->origin, 0 );
-	if( ent->watertype & MASK_WATER )
-	{
-		ent->waterlevel = 1;
-	}
-	else
-	{
-		ent->waterlevel = 0;
-	}
-	
+    ent->watertype = gi.pointcontents(ent->origin, 0);
+    if (ent->watertype & MASK_WATER) {
+        ent->waterlevel = 1;
+    } else {
+        ent->waterlevel = 0;
+    }
 }
 
 /*
@@ -1475,146 +1265,121 @@ FIXME: is this true?
 =============
 */
 
-void G_Physics_Step
-	(
-	Entity *ent
-	)
+void G_Physics_Step(Entity *ent)
+{
+    qboolean wasonground;
+    qboolean hitsound = false;
+    Vector   vel;
+    float    speed, newspeed, control;
+    float    friction;
+    int      mask;
+    Vector   basevel;
 
-	{
-	qboolean	wasonground;
-	qboolean	hitsound = false;
-	Vector	vel;
-	float		speed, newspeed, control;
-	float		friction;
-	int		mask;
-	Vector	basevel;
+    // airborn monsters should always check for ground
+    if (!ent->groundentity) {
+        ent->CheckGround();
+    }
 
-	// airborn monsters should always check for ground
-	if ( !ent->groundentity )
-		{
-		ent->CheckGround();
-		}
+    if (ent->groundentity) {
+        wasonground = true;
+    } else {
+        wasonground = false;
+    }
 
-	if ( ent->groundentity )
-		{
-		wasonground = true;
-		}
-	else
-		{
-		wasonground = false;
-		}
+    G_CheckVelocity(ent);
 
-	G_CheckVelocity( ent );
+    if (ent->avelocity != vec_zero) {
+        G_AddRotationalFriction(ent);
+    }
 
-	if ( ent->avelocity != vec_zero )
-		{
-		G_AddRotationalFriction( ent );
-		}
+    // add gravity except:
+    //   flying monsters
+    //   swimming monsters who are in the water
+    if (!wasonground) {
+        if (!(ent->flags & FL_FLY)) {
+            if (!((ent->flags & FL_SWIM) && (ent->waterlevel > 2))) {
+                if (ent->velocity[2] < sv_gravity->value * ent->gravity * -0.1f) {
+                    hitsound = true;
+                }
 
-	// add gravity except:
-	//   flying monsters
-	//   swimming monsters who are in the water
-	if ( !wasonground )
-		{
-		if( !( ent->flags & FL_FLY ) )
-			{
-			if( !( ( ent->flags & FL_SWIM ) && ( ent->waterlevel > 2 ) ) )
-				{
-				if ( ent->velocity[ 2 ] < sv_gravity->value * ent->gravity * -0.1f )
-					{
-					hitsound = true;
-					}
+                // Testing water gravity.  If this doesn't work, just restore the uncommented lines
+                //if ( ent->waterlevel == 0 )
+                //{
+                G_AddGravity(ent);
+                //}
+            }
+        }
+    }
 
-            // Testing water gravity.  If this doesn't work, just restore the uncommented lines
-				//if ( ent->waterlevel == 0 )
-					//{
-					G_AddGravity( ent );
-					//}
-				}
-			}
-		}
+    // friction for flying monsters that have been given vertical velocity
+    if ((ent->flags & FL_FLY) && (ent->velocity.z != 0)) {
+        speed    = fabs(ent->velocity.z);
+        control  = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
+        friction = sv_friction->value / 3;
+        newspeed = speed - (level.frametime * control * friction);
+        if (newspeed < 0) {
+            newspeed = 0;
+        }
+        newspeed /= speed;
+        ent->velocity.z *= newspeed;
+    }
 
-	// friction for flying monsters that have been given vertical velocity
-	if( ( ent->flags & FL_FLY ) && ( ent->velocity.z != 0 ) )
-		{
-		speed = fabs( ent->velocity.z );
-		control = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
-		friction = sv_friction->value / 3;
-		newspeed = speed - ( level.frametime * control * friction );
-		if ( newspeed < 0 )
-			{
-			newspeed = 0;
-			}
-		newspeed /= speed;
-		ent->velocity.z *= newspeed;
-		}
+    // friction for flying monsters that have been given vertical velocity
+    if ((ent->flags & FL_SWIM) && (ent->velocity.z != 0)) {
+        speed    = fabs(ent->velocity.z);
+        control  = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
+        newspeed = speed - (level.frametime * control * sv_waterfriction->value * ent->waterlevel);
+        if (newspeed < 0) {
+            newspeed = 0;
+        }
+        newspeed /= speed;
+        ent->velocity.z *= newspeed;
+    }
 
-	// friction for flying monsters that have been given vertical velocity
-	if( ( ent->flags & FL_SWIM ) && ( ent->velocity.z != 0 ) )
-		{
-		speed = fabs( ent->velocity.z );
-		control = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
-		newspeed = speed - ( level.frametime * control * sv_waterfriction->value * ent->waterlevel );
-		if ( newspeed < 0 )
-			{
-			newspeed = 0;
-			}
-		newspeed /= speed;
-		ent->velocity.z *= newspeed;
-		}
+    if (ent->velocity != vec_zero) {
+        // apply friction
+        // let dead monsters who aren't completely onground slide
+        if ((wasonground) || (ent->flags & (FL_SWIM | FL_FLY))) {
+            if (!(ent->health <= 0.0 && !M_CheckBottom(ent))) {
+                vel   = ent->velocity;
+                vel.z = 0;
+                speed = vel.length();
+                if (speed) {
+                    friction = sv_friction->value;
 
-	if ( ent->velocity != vec_zero )
-		{
-		// apply friction
-		// let dead monsters who aren't completely onground slide
-		if( ( wasonground ) || ( ent->flags & ( FL_SWIM | FL_FLY ) ) )
-			{
-			if ( !( ent->health <= 0.0 && !M_CheckBottom( ent ) ) )
-				{
-				vel = ent->velocity;
-				vel.z = 0;
-				speed = vel.length();
-				if ( speed )
-					{
-					friction = sv_friction->value;
+                    control  = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
+                    newspeed = speed - level.frametime * control * friction;
 
-					control = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
-					newspeed = speed - level.frametime * control * friction;
+                    if (newspeed < 0) {
+                        newspeed = 0;
+                    }
 
-					if ( newspeed < 0 )
-						{
-						newspeed = 0;
-						}
+                    newspeed /= speed;
 
-					newspeed /= speed;
+                    ent->velocity.x *= newspeed;
+                    ent->velocity.y *= newspeed;
+                }
+            }
+        }
+    }
 
-					ent->velocity.x *= newspeed;
-					ent->velocity.y *= newspeed;
-					}
-				}
-			}
-		}
+    if ((basevel != vec_zero) || (ent->velocity != vec_zero)) {
+        mask = MASK_SOLID;
 
-	if ( ( basevel != vec_zero ) || ( ent->velocity != vec_zero ) )
-		{
-			mask = MASK_SOLID;
+        G_FlyMove(ent, basevel, level.frametime, mask);
 
-			G_FlyMove( ent, basevel, level.frametime, mask );
+        ent->link();
 
-		ent->link();
+        G_CheckWater(ent);
+        if (ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(ent);
+        }
 
-      G_CheckWater( ent );
-	  if( ent->flags & FL_TOUCH_TRIGGERS )
-         {
-   		G_TouchTriggers( ent );
-         }
-
-		if ( ent->groundentity && !wasonground && hitsound )
-			{
-			ent->Sound( "impact_softland", CHAN_BODY, 0.5f );
-			}
-		}
-	}
+        if (ent->groundentity && !wasonground && hitsound) {
+            ent->Sound("impact_softland", CHAN_BODY, 0.5f);
+        }
+    }
+}
 
 //============================================================================
 
@@ -1624,68 +1389,60 @@ G_RunEntity
 
 ================
 */
-void G_RunEntity( Entity *ent )
+void G_RunEntity(Entity *ent)
 {
-	gentity_t *edict;
+    gentity_t *edict;
 
-	edict = ent->edict;
+    edict = ent->edict;
 
-	if( !edict->inuse )
-	{
-		return;
-	}
+    if (!edict->inuse) {
+        return;
+    }
 
-	if( ent->flags & FL_ANIMATE )
-	{
-		ent->PreAnimate();
-	}
+    if (ent->flags & FL_ANIMATE) {
+        ent->PreAnimate();
+    }
 
-	if( ent->flags & FL_THINK )
-	{
-		ent->Think();
-	}
+    if (ent->flags & FL_THINK) {
+        ent->Think();
+    }
 
-	if( ent->flags & FL_ANIMATE )
-	{
-		ent->PostAnimate();
-	}
+    if (ent->flags & FL_ANIMATE) {
+        ent->PostAnimate();
+    }
 
-	// only run physics if in use and not bound and not immobilized
-	if( ( edict->s.parent == ENTITYNUM_NONE ) && !( ent->flags & FL_IMMOBILE ) && !( ent->flags & FL_PARTIAL_IMMOBILE ) )
-	{
-		switch( ent->movetype )
-		{
-		case MOVETYPE_NONE:
-		case MOVETYPE_STATIONARY:
-		case MOVETYPE_WALK:
-		case MOVETYPE_FLYMISSILE:
-		case MOVETYPE_SLIDE:
-		case MOVETYPE_GIB:
-		case MOVETYPE_VEHICLE:
-		case MOVETYPE_TURRET:
-			break;
-		case MOVETYPE_PUSH:
-		case MOVETYPE_STOP:
-			G_Physics_Pusher( ent );
-			break;
-		case MOVETYPE_NOCLIP:
-			G_Physics_Noclip( ent );
-			break;
-		case MOVETYPE_FLY:
-			G_FlyMove( ent, ent->velocity, level.frametime, MASK_LINE );
-			break;
-		case MOVETYPE_TOSS:
-		case MOVETYPE_BOUNCE:
-			G_Physics_Toss( ent );
-			break;
-		default:
-			gi.Error( ERR_DROP, "G_Physics: bad movetype %i", ent->movetype );
-		}
-	}
+    // only run physics if in use and not bound and not immobilized
+    if ((edict->s.parent == ENTITYNUM_NONE) && !(ent->flags & FL_IMMOBILE) && !(ent->flags & FL_PARTIAL_IMMOBILE)) {
+        switch (ent->movetype) {
+        case MOVETYPE_NONE:
+        case MOVETYPE_STATIONARY:
+        case MOVETYPE_WALK:
+        case MOVETYPE_FLYMISSILE:
+        case MOVETYPE_SLIDE:
+        case MOVETYPE_GIB:
+        case MOVETYPE_VEHICLE:
+        case MOVETYPE_TURRET:
+            break;
+        case MOVETYPE_PUSH:
+        case MOVETYPE_STOP:
+            G_Physics_Pusher(ent);
+            break;
+        case MOVETYPE_NOCLIP:
+            G_Physics_Noclip(ent);
+            break;
+        case MOVETYPE_FLY:
+            G_FlyMove(ent, ent->velocity, level.frametime, MASK_LINE);
+            break;
+        case MOVETYPE_TOSS:
+        case MOVETYPE_BOUNCE:
+            G_Physics_Toss(ent);
+            break;
+        default:
+            gi.Error(ERR_DROP, "G_Physics: bad movetype %i", ent->movetype);
+        }
+    }
 
-	if( ent->flags & FL_POSTTHINK )
-	{
-		ent->Postthink();
-	}
+    if (ent->flags & FL_POSTTHINK) {
+        ent->Postthink();
+    }
 }
-
diff --git a/code/fgame/g_phys.h b/code/fgame/g_phys.h
index 3f37b76f..64dc5f2f 100644
--- a/code/fgame/g_phys.h
+++ b/code/fgame/g_phys.h
@@ -29,52 +29,49 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class Entity;
 
-typedef enum
-{
-	STEPMOVE_OK,
-	STEPMOVE_BLOCKED_BY_ENTITY,
-	STEPMOVE_BLOCKED_BY_WORLD,
-	STEPMOVE_BLOCKED_BY_WATER,
-	STEPMOVE_BLOCKED_BY_FALL,
-	STEPMOVE_BLOCKED_BY_DOOR,
-	STEPMOVE_STUCK
+typedef enum {
+    STEPMOVE_OK,
+    STEPMOVE_BLOCKED_BY_ENTITY,
+    STEPMOVE_BLOCKED_BY_WORLD,
+    STEPMOVE_BLOCKED_BY_WATER,
+    STEPMOVE_BLOCKED_BY_FALL,
+    STEPMOVE_BLOCKED_BY_DOOR,
+    STEPMOVE_STUCK
 } stepmoveresult_t;
 
 // movetype values
-typedef enum
-{
-	MOVETYPE_NONE,			// never moves
-	MOVETYPE_STATIONARY, // never moves but does collide agains push objects
-	MOVETYPE_NOCLIP,		// origin and angles change with no interaction
-	MOVETYPE_PUSH,			// no clip to world, push on box contact
-	MOVETYPE_STOP,			// no clip to world, stops on box contact
-	MOVETYPE_WALK,			// gravity
-	MOVETYPE_FLY,
-	MOVETYPE_TOSS,			// gravity
-	MOVETYPE_FLYMISSILE,	// extra size to monsters
-	MOVETYPE_BOUNCE,
-	MOVETYPE_SLIDE,
-	MOVETYPE_GIB,
-	MOVETYPE_VEHICLE,
-	MOVETYPE_TURRET,
-	MOVETYPE_PORTABLE_TURRET
+typedef enum {
+    MOVETYPE_NONE,       // never moves
+    MOVETYPE_STATIONARY, // never moves but does collide agains push objects
+    MOVETYPE_NOCLIP,     // origin and angles change with no interaction
+    MOVETYPE_PUSH,       // no clip to world, push on box contact
+    MOVETYPE_STOP,       // no clip to world, stops on box contact
+    MOVETYPE_WALK,       // gravity
+    MOVETYPE_FLY,
+    MOVETYPE_TOSS,       // gravity
+    MOVETYPE_FLYMISSILE, // extra size to monsters
+    MOVETYPE_BOUNCE,
+    MOVETYPE_SLIDE,
+    MOVETYPE_GIB,
+    MOVETYPE_VEHICLE,
+    MOVETYPE_TURRET,
+    MOVETYPE_PORTABLE_TURRET
 } movetype_t;
 
-typedef struct
-{
-	Entity  	*ent;
-	Vector   localorigin;
-	Vector   origin;
-	Vector   localangles;
-	Vector	angles;
-	float		deltayaw;
+typedef struct {
+    Entity *ent;
+    Vector  localorigin;
+    Vector  origin;
+    Vector  localangles;
+    Vector  angles;
+    float   deltayaw;
 } pushed_t;
 
-extern pushed_t pushed[];
+extern pushed_t  pushed[];
 extern pushed_t *pushed_p;
 
-void		G_RunEntity( Entity *ent );
-void		G_Impact( Entity *e1, trace_t *trace );
-qboolean	G_PushMove( Entity *pusher, Vector move, Vector amove );
-void		G_CheckWater( Entity *ent );
-Entity		*G_TestEntityPosition( Entity *ent, Vector vOrg );
+void     G_RunEntity(Entity *ent);
+void     G_Impact(Entity *e1, trace_t *trace);
+qboolean G_PushMove(Entity *pusher, Vector move, Vector amove);
+void     G_CheckWater(Entity *ent);
+Entity  *G_TestEntityPosition(Entity *ent, Vector vOrg);

From b2e6e1b56f26ecbc93ee828cbaa13e935ddf23b3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:30:44 +0100
Subject: [PATCH 1543/2040] Comment out the Illegal XYZ coordinates message to
 avoid spamming the console

---
 code/qcommon/msg.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index f711bbb1..4d1ee4bc 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -2391,27 +2391,35 @@ int MSG_PackAlpha(float alpha, int bits)
 
 int MSG_PackCoord(float coord)
 {
-	unsigned int packed = (unsigned int)round(coord * 4.0 + MAX_PACKED_COORD_HALF);
-	if (packed >= MAX_PACKED_COORD) {
-		Com_DPrintf("Illegal XYZ coordinates for an entity, small information lost in transmission\n");
-	} else {
+	unsigned int packed;
+
+	packed = (unsigned int)round(coord * 4.0 + MAX_PACKED_COORD_HALF);
+
+	if (packed < MAX_PACKED_COORD) {
 		coordstats[packed]++;
 	}
+// 	else {
+// 		Com_DPrintf("Illegal XYZ coordinates for an entity, small information lost in transmission\n");
+// 	}
 
 	return packed;
 }
 
 int MSG_PackCoordExtra(float coord)
 {
-	unsigned int packed = (unsigned int)round(coord * 16.0 + MAX_PACKED_COORD_EXTRA_HALF);
-	if (packed >= MAX_PACKED_COORD_EXTRA) {
-		Com_DPrintf("Illegal XYZ coordinates for an entity, information lost in transmission\n");
-	}
-	else {
-		// This check wasn't added in >= 2.0
-		// which means a player could crash a server when out of bounds
+	unsigned int packed;
+
+	packed = (unsigned int)round(coord * 16.0 + MAX_PACKED_COORD_EXTRA_HALF);
+
+	// Fixed in OPM
+	//  This check wasn't added in >= 2.0
+	//  which means a player could crash a server when out of bounds
+	if (packed < MAX_PACKED_COORD_EXTRA) {
 		++coordextrastats[packed];
 	}
+//	else {
+//		Com_DPrintf("Illegal XYZ coordinates for an entity, information lost in transmission\n");
+//	}
 
 	return packed;
 }

From 6bb09256c525b47f16e9665a18193d3b68ab1bd6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:32:08 +0100
Subject: [PATCH 1544/2040] Teleport the player back to (0,0,0) origin if out
 of map bounds

---
 code/fgame/bg_pmove.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/bg_pmove.cpp b/code/fgame/bg_pmove.cpp
index 79682f7f..613bc78b 100644
--- a/code/fgame/bg_pmove.cpp
+++ b/code/fgame/bg_pmove.cpp
@@ -717,6 +717,16 @@ static void PM_NoclipMove(void)
 
     // move
     VectorMA(pm->ps->origin, pml.frametime, pm->ps->velocity, pm->ps->origin);
+
+    // Added in 2.0
+    //  If the player is out of bounds in noclip mode,
+    //  teleport it back to the (0,0,0) coordinates
+    for (i = 0; i < 3; i++) {
+        if (fabs(pm->ps->origin[i]) >= MAX_MAP_BOUNDS - 512) {
+            VectorClear(pm->ps->origin);
+            break;
+        }
+    }
 }
 
 //============================================================================

From 8843a8ee15b0ef4672e7b819ea8b4a1843920731 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 26 Nov 2024 00:36:47 +0100
Subject: [PATCH 1545/2040] Remove owner assert

The owner can be NULL so there is no reason to assert on this
---
 code/fgame/weapon.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 62dd04c0..2816fa53 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1640,7 +1640,6 @@ void Weapon::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t forwar
     int           i;
 
     owner = (Player *)this->owner.Pointer();
-    assert(owner);
 
     // We should always have an owner
     if (!owner) {

From 8213bf41a81c94a2ae5422cfcde782d591709811 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 26 Nov 2024 00:53:04 +0100
Subject: [PATCH 1546/2040] Fix player having no inventory or dying when
 respawning immediately after getting killed

---
 code/fgame/player.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 12da5d0f..44c89721 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2413,6 +2413,12 @@ void Player::InitHealth(void)
     //
     m_fHealRate = 0;
     edict->s.eFlags &= ~EF_DEAD;
+
+    // Fixed in OPM
+    //  This avoid losing weapons when dying and then immediately respawning
+    CancelEventsOfType(EV_Player_DMDeathDrop);
+    //  And this prevents the player from dying when respawning immediately after getting killed
+    CancelEventsOfType(EV_Player_Dead);
 }
 
 void Player::InitModel(void)
@@ -11196,7 +11202,6 @@ str Player::TranslateBattleLanguageTokens(const char *string)
 void Player::EventIPrint(Event *ev)
 {
     str         sString = ev->GetString(1);
-    const char *pszLocalized;
     qboolean    iBold   = qfalse;
 
     if (ev->NumArgs() > 1) {

From 766258e84b7059bd1a957cfd9ebcffd40a0fd315 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 26 Nov 2024 18:38:34 +0100
Subject: [PATCH 1547/2040] Archive instances of SmokeGrenade

This was mistakenly missing and fixes smoke grenade explosions disappearing after loading from save
---
 code/fgame/smokegrenade.cpp | 140 ++++++++++++++++++++----------------
 code/fgame/smokegrenade.h   |  61 ++++++++--------
 2 files changed, 110 insertions(+), 91 deletions(-)

diff --git a/code/fgame/smokegrenade.cpp b/code/fgame/smokegrenade.cpp
index 93e39a1c..0ec353c8 100644
--- a/code/fgame/smokegrenade.cpp
+++ b/code/fgame/smokegrenade.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -122,106 +122,107 @@ Event EV_SmokeGrenade_SetMaxAlpha
     "sets maximum opacity of an individual smoke particle, in 0-1 range"
 );
 
-CLASS_DECLARATION(EffectEntity, SmokeGrenade, "smokegrenade")
-{
-    { &EV_SmokeGrenade_SetSpawnRate,        &SmokeGrenade::EventSetSpawnrate },
-    { &EV_SmokeGrenade_SetBouncefactor,     &SmokeGrenade::EventSetBouncefactor },
-    { &EV_SmokeGrenade_SetLife,             &SmokeGrenade::EventSetLife },
-    { &EV_SmokeGrenade_SetSpawnLife,        &SmokeGrenade::EventSetSpawnLife },
-    { &EV_SmokeGrenade_SetScalerate,        &SmokeGrenade::EventSetScalerate },
-    { &EV_SmokeGrenade_SetVelocity,         &SmokeGrenade::EventSetVelocity },
-    { &EV_SmokeGrenade_SetSpin,             &SmokeGrenade::EventSetSpin },
-    { &EV_SmokeGrenade_SetOffset,           &SmokeGrenade::EventSetOffset },
-    { &EV_SmokeGrenade_SetScale,            &SmokeGrenade::EventSetScale },
-    { &EV_SmokeGrenade_SetFadein,           &SmokeGrenade::EventSetFadein },
-    { &EV_SmokeGrenade_SetFadedelay,        &SmokeGrenade::EventSetFadedelay },
-    { &EV_SmokeGrenade_SetMaxAlpha,         &SmokeGrenade::EventSetMaxAlpha },
-    { NULL, NULL }
+CLASS_DECLARATION(EffectEntity, SmokeGrenade, "smokegrenade") {
+    {&EV_SmokeGrenade_SetSpawnRate,    &SmokeGrenade::EventSetSpawnrate   },
+    {&EV_SmokeGrenade_SetBouncefactor, &SmokeGrenade::EventSetBouncefactor},
+    {&EV_SmokeGrenade_SetLife,         &SmokeGrenade::EventSetLife        },
+    {&EV_SmokeGrenade_SetSpawnLife,    &SmokeGrenade::EventSetSpawnLife   },
+    {&EV_SmokeGrenade_SetScalerate,    &SmokeGrenade::EventSetScalerate   },
+    {&EV_SmokeGrenade_SetVelocity,     &SmokeGrenade::EventSetVelocity    },
+    {&EV_SmokeGrenade_SetSpin,         &SmokeGrenade::EventSetSpin        },
+    {&EV_SmokeGrenade_SetOffset,       &SmokeGrenade::EventSetOffset      },
+    {&EV_SmokeGrenade_SetScale,        &SmokeGrenade::EventSetScale       },
+    {&EV_SmokeGrenade_SetFadein,       &SmokeGrenade::EventSetFadein      },
+    {&EV_SmokeGrenade_SetFadedelay,    &SmokeGrenade::EventSetFadedelay   },
+    {&EV_SmokeGrenade_SetMaxAlpha,     &SmokeGrenade::EventSetMaxAlpha    },
+    {NULL,                             NULL                               }
 };
 
-void SmokeGrenade::EventSetSpawnrate(Event* ev)
+void SmokeGrenade::EventSetSpawnrate(Event *ev)
 {
     float rate = ev->GetFloat(1);
-    if (rate < 0.001f) rate = 0.001f;
+    if (rate < 0.001f) {
+        rate = 0.001f;
+    }
 
     spawnRate = 1000.0f / rate;
 }
 
-void SmokeGrenade::EventSetBouncefactor(Event* ev)
+void SmokeGrenade::EventSetBouncefactor(Event *ev)
 {
     bounceFactor = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetLife(Event* ev)
+void SmokeGrenade::EventSetLife(Event *ev)
 {
     nextRemoveTime = level.time + ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetSpawnLife(Event* ev)
+void SmokeGrenade::EventSetSpawnLife(Event *ev)
 {
     spawnLife = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetScalerate(Event* ev)
+void SmokeGrenade::EventSetScalerate(Event *ev)
 {
     scaleRate = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetVelocity(Event* ev)
+void SmokeGrenade::EventSetVelocity(Event *ev)
 {
     velocity[0] = ev->GetFloat(1);
     velocity[1] = ev->GetFloat(2);
     velocity[2] = ev->GetFloat(3);
 }
 
-void SmokeGrenade::EventSetSpin(Event* ev)
+void SmokeGrenade::EventSetSpin(Event *ev)
 {
     spinRate = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetOffset(Event* ev)
+void SmokeGrenade::EventSetOffset(Event *ev)
 {
     offset[0] = ev->GetFloat(1);
     offset[1] = ev->GetFloat(2);
     offset[2] = ev->GetFloat(3);
 }
 
-void SmokeGrenade::EventSetScale(Event* ev)
+void SmokeGrenade::EventSetScale(Event *ev)
 {
     scale = ev->GetFloat(1) * 0.5;
 }
 
-void SmokeGrenade::EventSetFadein(Event* ev)
+void SmokeGrenade::EventSetFadein(Event *ev)
 {
     fadeIn = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetFadedelay(Event* ev)
+void SmokeGrenade::EventSetFadedelay(Event *ev)
 {
     fadeDelay = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetMaxAlpha(Event* ev)
+void SmokeGrenade::EventSetMaxAlpha(Event *ev)
 {
     maxAlpha = ev->GetFloat(1);
 }
 
 SmokeGrenade::SmokeGrenade()
 {
-    flags           |= FL_THINK;
-    nextRemoveTime  = level.time + 1.0;
-    spawnRate       = 1000;
-    bounceFactor    = 0.0;
-    spawnLife       = 1.0;
-    scaleRate       = 1.0;
-    velocity        = vec_zero;
-    offset          = vec_zero;
-    spinRate        = 0.0;
-    scale           = 1.0;
-    fadeIn          = 0.0;
-    fadeDelay       = spawnLife;
-    maxAlpha        = 1.0;
-    lastSpawnTime   = level.inttime + 150;
+    flags |= FL_THINK;
+    nextRemoveTime = level.time + 1.0;
+    spawnRate      = 1000;
+    bounceFactor   = 0.0;
+    spawnLife      = 1.0;
+    scaleRate      = 1.0;
+    velocity       = vec_zero;
+    offset         = vec_zero;
+    spinRate       = 0.0;
+    scale          = 1.0;
+    fadeIn         = 0.0;
+    fadeDelay      = spawnLife;
+    maxAlpha       = 1.0;
+    lastSpawnTime  = level.inttime + 150;
 }
 
 void SmokeGrenade::Think()
@@ -233,42 +234,57 @@ void SmokeGrenade::Think()
 
     if (level.inttime >= lastSpawnTime + spawnRate) {
         SmokeSprite sp;
-        float degrees;
+        float       degrees;
 
         lastSpawnTime += spawnRate;
 
-        sp.origin = origin;
+        sp.origin    = origin;
         sp.spawnTime = level.time;
-        sp.scale = scale;
+        sp.scale     = scale;
 
         degrees = angles.y + (((level.inttime / 1000.0 - 176.0) * spinRate) * -0.36);
-        
-        RotatePointAroundAxis(
-            sp.velocity,
-            2,
-            velocity,
-            degrees
-        );
 
-        sp.spawnLife = spawnLife;
+        RotatePointAroundAxis(sp.velocity, 2, velocity, degrees);
+
+        sp.spawnLife    = spawnLife;
         sp.bounceFactor = bounceFactor;
-        sp.scaleStart = scale;
-        sp.scaleRate = scaleRate;
-        sp.fadeIn = fadeIn;
-        sp.fadeDelay = fadeDelay;
-        sp.maxAlpha = maxAlpha;
-        sp.owner = owner;
+        sp.scaleStart   = scale;
+        sp.scaleRate    = scaleRate;
+        sp.fadeIn       = fadeIn;
+        sp.fadeDelay    = fadeDelay;
+        sp.maxAlpha     = maxAlpha;
+        sp.owner        = owner;
 
         G_AddSmokeSprite(&sp);
     }
 }
 
-void SmokeGrenade::setOwner(Sentient* other)
+void SmokeGrenade::Archive(Archiver& arc)
+{
+    EffectEntity::Archive(arc);
+
+    arc.ArchiveFloat(&nextRemoveTime);
+    arc.ArchiveInteger(&spawnRate);
+    arc.ArchiveFloat(&bounceFactor);
+    arc.ArchiveFloat(&spawnLife);
+    arc.ArchiveFloat(&scaleRate);
+    arc.ArchiveVector(&velocity);
+    arc.ArchiveFloat(&spinRate);
+    arc.ArchiveVector(&offset);
+    arc.ArchiveFloat(&scale);
+    arc.ArchiveFloat(&fadeIn);
+    arc.ArchiveFloat(&fadeDelay);
+    arc.ArchiveFloat(&maxAlpha);
+    arc.ArchiveInteger(&lastSpawnTime);
+    arc.ArchiveSafePointer(&owner);
+}
+
+void SmokeGrenade::setOwner(Sentient *other)
 {
     owner = other;
 }
 
-Sentient* SmokeGrenade::getOwner() const
+Sentient *SmokeGrenade::getOwner() const
 {
     return owner;
 }
diff --git a/code/fgame/smokegrenade.h b/code/fgame/smokegrenade.h
index d77754d6..6f20491e 100644
--- a/code/fgame/smokegrenade.h
+++ b/code/fgame/smokegrenade.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,43 +26,46 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class Sentient;
 
-class SmokeGrenade : public EffectEntity {
+class SmokeGrenade : public EffectEntity
+{
     CLASS_PROTOTYPE(SmokeGrenade);
 
 public:
     SmokeGrenade();
 
-    void EventSetSpawnrate(Event* ev);
-    void EventSetBouncefactor(Event* ev);
-    void EventSetLife(Event* ev);
-    void EventSetSpawnLife(Event* ev);
-    void EventSetScalerate(Event* ev);
-    void EventSetVelocity(Event* ev);
-    void EventSetSpin(Event* ev);
-    void EventSetOffset(Event* ev);
-    void EventSetScale(Event* ev);
-    void EventSetFadein(Event* ev);
-    void EventSetFadedelay(Event* ev);
-    void EventSetMaxAlpha(Event* ev);
+    void EventSetSpawnrate(Event *ev);
+    void EventSetBouncefactor(Event *ev);
+    void EventSetLife(Event *ev);
+    void EventSetSpawnLife(Event *ev);
+    void EventSetScalerate(Event *ev);
+    void EventSetVelocity(Event *ev);
+    void EventSetSpin(Event *ev);
+    void EventSetOffset(Event *ev);
+    void EventSetScale(Event *ev);
+    void EventSetFadein(Event *ev);
+    void EventSetFadedelay(Event *ev);
+    void EventSetMaxAlpha(Event *ev);
 
     void Think() override;
 
-    void setOwner(Sentient* other);
-    Sentient* getOwner() const;
+    void Archive(Archiver& arc);
+
+    void      setOwner(Sentient *other);
+    Sentient *getOwner() const;
 
 private:
-    float nextRemoveTime;
-    int spawnRate;
-    float bounceFactor;
-    float spawnLife;
-    float scaleRate;
-    Vector velocity;
-    float spinRate;
-    Vector offset;
-    float scale;
-    float fadeIn;
-    float fadeDelay;
-    float maxAlpha;
-    int lastSpawnTime;
+    float             nextRemoveTime;
+    int               spawnRate;
+    float             bounceFactor;
+    float             spawnLife;
+    float             scaleRate;
+    Vector            velocity;
+    float             spinRate;
+    Vector            offset;
+    float             scale;
+    float             fadeIn;
+    float             fadeDelay;
+    float             maxAlpha;
+    int               lastSpawnTime;
     SafePtr<Sentient> owner;
 };

From d3fdaa060a11411adfe2f7fa4d425d6f9c1f2935 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 26 Nov 2024 19:21:18 +0100
Subject: [PATCH 1548/2040] Fix bad parameters passed to
 CG_AnimationDebugMessage

---
 code/cgame/cg_commands.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 170f9f88..ddabbb0e 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -5298,7 +5298,7 @@ qboolean CG_ProcessEntityCommands(int frame, int anim, int entnum, refEntity_t *
         current_centity       = cent;
         current_entity_number = entnum;
         current_tiki          = ent->tiki;
-        CG_AnimationDebugMessage(entnum, "Processing Ent Commands: Entity: %3d Anim:#(%i) Frame:#(%i)\n", anim, frame);
+        CG_AnimationDebugMessage(entnum, "Processing Ent Commands: Entity: %3d Anim:#(%i) Frame:#(%i)\n", entnum, anim, frame);
 
         for (i = 0; i < tikicmds.num_cmds; i++) {
             Event *ev;

From 486b6f40e5d89b9344441dc2fe5a4b47cdfd6ae9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 26 Nov 2024 22:47:55 +0100
Subject: [PATCH 1549/2040] Don't play sound if the parameter is not specified

---
 code/client/snd_dma_new.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index 80ded1dc..242e9276 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -552,7 +552,7 @@ void S_StartLocalSound(const char *sound_name, qboolean force_load)
     }
 
     S_StartSound(
-        0,
+        NULL,
         s_iListenerNumber,
         CHAN_MENU,
         sfxHandle,
@@ -749,6 +749,10 @@ void S_Play()
     int  i;
     char name[MAX_QPATH];
 
+    if (Cmd_Argc() < 2) {
+        return;
+    }
+
     for (i = 1; i < Cmd_Argc(); i++) {
         if (strrchr(Cmd_Argv(i), '.')) {
             Q_strncpyz(name, Cmd_Argv(i), sizeof(name));

From eeb9139024da3f37b579deac41bd9db8ac11af1b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:57:05 +0100
Subject: [PATCH 1550/2040] Fix incorrect delta for FaceEnemyOrMotion

The AI would not consistently aim at the enemy while covering
---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 4d2fefc2..d0036e93 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8701,7 +8701,7 @@ void Actor::FaceEnemyOrMotion(int iTimeIntoMove)
 {
     vec2_t vDelta;
 
-    VectorCopy2D(origin, vDelta);
+    VectorSub2D(origin, m_vLastEnemyPos, vDelta);
 
     if (iTimeIntoMove <= 999) {
         m_bFaceEnemy = true;

From 94e3d95d6cea94a1cb2a880d7cc3e98477a663a5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:35:07 +0100
Subject: [PATCH 1551/2040] Update getting_started_installation.md

---
 docs/getting_started_installation.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 3f3c4842..37797c0b 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -119,13 +119,12 @@ b) extract archive somewhere on your hard drive, create a shortcut to openmohaa
 
 ## Server
 
-Extract the archive to your MOHAA server installation directory. Then proceed like you would do with mohaa server:
+Extract `omohaaded.*` and `game.*` binaries from the archive to your MOHAA server installation directory. Then proceed like you would do with mohaa server:
 
-- `.\omohaaded.exe +exec server.cfg` on Windows
-- `./omohaaded +exec server.cfg` on Linux
-
-Only `omohaaded*` and `game*` binaries are required for the server version, other binaries can be omitted.
+- `.\omohaaded.*.exe +exec server.cfg` on Windows
+- `./omohaaded.* +exec server.cfg` on Linux
 
+Make sure to replace '*' with the correct name in the binary.
 
 ## Extracting GOG setup file on Linux and macOS
 

From 459e13dc76b378b06fbe2f6f2af2dbeb4ee96391 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:36:16 +0100
Subject: [PATCH 1552/2040] Allow pusher to teleport

This fixes an issue where teamslaves (bind elements) would not be in sync with the pusher
---
 code/fgame/g_phys.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 4ba7795e..3ca3115c 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -865,12 +865,6 @@ qboolean G_Push(Entity *pusher, Vector pushermove, Vector pusheramove)
             continue;
         }
 
-        // L: don't make the pusher teleport through anything that block
-        if (block != pusher) {
-            pusher_p->ent->setOrigin(pusher_p->origin);
-            continue;
-        }
-
         // save off the obstacle so we can call the block function
         obstacle = check;
 

From 1e9decf19320eafd01f7221a91f8e41a1756cef5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 20:37:56 +0100
Subject: [PATCH 1553/2040] Add support for IMA-ADPCM sounds (4-bit)

Sounds such as sea waves (mohaa m3l1a) and subpen (mohaas flughafen) will be played accordingly. This uses OpenAL extensions such as AL_EXT_IMA4 and SOFT features such as AL_SOFT_block_alignment
---
 code/client/qal.c              |   2 +
 code/client/qal.h              |   2 +-
 code/client/snd_codec.h        |   3 +-
 code/client/snd_codec_mp3.c    |   2 +-
 code/client/snd_codec_wav.c    |  20 ++++--
 code/client/snd_local_new.h    |   1 +
 code/client/snd_mem_new.cpp    | 124 +++++++++++++++++----------------
 code/client/snd_openal_new.cpp |  59 ++++++++++++++--
 8 files changed, 135 insertions(+), 78 deletions(-)

diff --git a/code/client/qal.c b/code/client/qal.c
index 4e33a292..78e0b80e 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -81,6 +81,7 @@ LPALGENBUFFERS qalGenBuffers;
 LPALDELETEBUFFERS qalDeleteBuffers;
 LPALISBUFFER qalIsBuffer;
 LPALBUFFERDATA qalBufferData;
+LPALBUFFERI qalBufferi;
 LPALGETBUFFERF qalGetBufferf;
 LPALGETBUFFERFV qalGetBufferfv;
 LPALGETBUFFERI qalGetBufferi;
@@ -201,6 +202,7 @@ qboolean QAL_Init(const char *libname)
 	qalDeleteBuffers = GPA("alDeleteBuffers");
 	qalIsBuffer = GPA("alIsBuffer");
 	qalBufferData = GPA("alBufferData");
+	qalBufferi = GPA("alBufferi");
 	qalGetBufferf = GPA("alGetBufferf");
 	qalGetBufferfv = GPA("alGetBufferfv");
 	qalGetBufferi = GPA("alGetBufferi");
diff --git a/code/client/qal.h b/code/client/qal.h
index c72285b3..3495cc85 100644
--- a/code/client/qal.h
+++ b/code/client/qal.h
@@ -120,7 +120,7 @@ extern LPALBUFFERDATA qalBufferData;
 extern LPALBUFFERF qalBufferf;
 extern LPALBUFFER3F qalBuffer3f;
 extern LPALBUFFERFV qalBufferfv;
-extern LPALBUFFERF qalBufferi;
+extern LPALBUFFERI qalBufferi;
 extern LPALBUFFER3F qalBuffer3i;
 extern LPALBUFFERFV qalBufferiv;
 extern LPALGETBUFFERF qalGetBufferf;
diff --git a/code/client/snd_codec.h b/code/client/snd_codec.h
index 1ec4b110..8551827d 100644
--- a/code/client/snd_codec.h
+++ b/code/client/snd_codec.h
@@ -34,11 +34,12 @@ extern "C" {
 typedef struct snd_info_s
 {
 	int rate;
-	int width;
+	float width;
 	int channels;
 	int samples;
 	int size;
 	int dataofs;
+	int dataalign;
 } snd_info_t;
 
 typedef struct snd_codec_s snd_codec_t;
diff --git a/code/client/snd_codec_mp3.c b/code/client/snd_codec_mp3.c
index 47c1ac86..bcb60e60 100644
--- a/code/client/snd_codec_mp3.c
+++ b/code/client/snd_codec_mp3.c
@@ -622,7 +622,7 @@ int S_MP3_CodecReadStream(snd_stream_t* stream, int bytes, void* buffer)
     mp3info = stream->ptr;
 
     // Make sure we get complete frames all the way through.
-    bytes -= bytes % (stream->info.channels * stream->info.width);
+    bytes -= fmod(bytes, (stream->info.channels * stream->info.width));
 
     if (mp3info->buflen)
     {
diff --git a/code/client/snd_codec_wav.c b/code/client/snd_codec_wav.c
index 7fcdea59..7fed9bf3 100644
--- a/code/client/snd_codec_wav.c
+++ b/code/client/snd_codec_wav.c
@@ -133,6 +133,7 @@ static qboolean S_ReadRIFFHeader(fileHandle_t file, snd_info_t *info)
 	char dump[16];
 	int bits;
 	int fmtlen = 0;
+	int bytealign;
 
 	// skip the riff wav header
 	FS_Read(dump, 12, file);
@@ -149,17 +150,22 @@ static qboolean S_ReadRIFFHeader(fileHandle_t file, snd_info_t *info)
 	info->channels = FGetLittleShort(file);
 	info->rate = FGetLittleLong(file);
 	FGetLittleLong(file);
-	FGetLittleShort(file);
+	bytealign = FGetLittleShort(file);
 	bits = FGetLittleShort(file);
 
-	if( bits < 8 )
-	{
-	  Com_Printf( S_COLOR_RED "ERROR: Less than 8 bit sound is not supported\n");
-	  return qfalse;
-	}
+	//if( bits < 8 )
+	//{
+	//  Com_Printf( S_COLOR_RED "ERROR: Less than 8 bit sound is not supported\n");
+	//  return qfalse;
+	//}
 
-	info->width = bits / 8;
+	info->width = bits / 8.0;
 	info->dataofs = 0;
+	if (bits == 16) {
+		info->dataalign = 1;
+	} else {
+		info->dataalign = (bytealign / info->channels - 4) / 4 * 8 + 1;
+	}
 
 	// Skip the rest of the format chunk if required
 	if(fmtlen > 16)
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
index d20efcfb..877df120 100644
--- a/code/client/snd_local_new.h
+++ b/code/client/snd_local_new.h
@@ -62,6 +62,7 @@ typedef struct {
 
     int dataofs;
     int datasize;
+    int dataalign;
 } wavinfo_t;
 
 typedef struct sfx_s {
diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
index 264e6b22..0bf2dd63 100644
--- a/code/client/snd_mem_new.cpp
+++ b/code/client/snd_mem_new.cpp
@@ -43,13 +43,13 @@ short int GetLittleShort()
         byte  bytes[2];
     } val;
 
-#    ifdef Q3_LITTLE_ENDIAN
+#ifdef Q3_LITTLE_ENDIAN
     val.bytes[0] = data_p[0];
     val.bytes[1] = data_p[1];
-#    else
+#else
     val.bytes[0] = data_p[1];
     val.bytes[1] = data_p[0];
-#    endif
+#endif
 
     data_p += sizeof(short);
     return val.value;
@@ -67,17 +67,17 @@ int GetLittleLong()
         byte bytes[4];
     } val;
 
-#    ifdef Q3_LITTLE_ENDIAN
+#ifdef Q3_LITTLE_ENDIAN
     val.bytes[0] = data_p[0];
     val.bytes[1] = data_p[1];
     val.bytes[2] = data_p[2];
     val.bytes[3] = data_p[3];
-#    else
+#else
     val.bytes[0] = data_p[3];
     val.bytes[1] = data_p[2];
     val.bytes[2] = data_p[1];
     val.bytes[3] = data_p[0];
-#    endif
+#endif
 
     data_p += sizeof(int);
     return val.value;
@@ -97,13 +97,13 @@ void SetLittleShort(int i)
 
     val.value = i;
 
-#    ifdef Q3_LITTLE_ENDIAN
+#ifdef Q3_LITTLE_ENDIAN
     data_p[0] = val.bytes[0];
     data_p[1] = val.bytes[1];
-#    else
+#else
     data_p[0] = val.bytes[1];
     data_p[1] = val.bytes[0];
-#    endif
+#endif
 
     data_p += sizeof(short);
 }
@@ -122,17 +122,17 @@ void SetLittleLong(int i)
 
     val.value = i;
 
-#    ifdef Q3_LITTLE_ENDIAN
+#ifdef Q3_LITTLE_ENDIAN
     data_p[0] = val.bytes[0];
     data_p[1] = val.bytes[1];
     data_p[2] = val.bytes[2];
     data_p[3] = val.bytes[3];
-#    else
+#else
     data_p[0] = val.bytes[3];
     data_p[1] = val.bytes[2];
     data_p[2] = val.bytes[1];
     data_p[3] = val.bytes[0];
-#    endif
+#endif
 
     data_p += sizeof(int);
 }
@@ -218,6 +218,7 @@ wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
 {
     wavinfo_t info;
     int       samples;
+    short     bytealign;
 
     memset(&info, 0, sizeof(wavinfo_t));
 
@@ -247,7 +248,9 @@ wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
     if (info.format == 17) {
         info.channels = GetLittleShort();
         info.rate     = (float)GetLittleLong();
-        data_p += 6;
+        data_p += 4;
+
+        bytealign  = GetLittleShort();
         info.width = (float)GetLittleShort() / 8.f;
         data_p += 2;
 
@@ -270,12 +273,16 @@ wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
             Com_Error(ERR_DROP, "Sound %s has a bad loop length", name);
         }
 
-        info.dataofs = 0;
+        info.dataofs   = data_p - wav;
+        info.datasize  = iff_chunk_len - bytealign + info.dataofs;
+        info.dataalign = (bytealign / info.channels - 4) / 4 * 8 + 1;
     } else if (info.format == 1) {
         info.channels = GetLittleShort();
         info.rate     = (float)GetLittleLong();
-        data_p += 6;
-        info.width = (float)(GetLittleShort() / 8);
+        data_p += 4;
+
+        bytealign  = GetLittleShort();
+        info.width = (float)GetLittleShort() / 8.f;
 
         FindChunk("data");
         if (!data_p) {
@@ -292,14 +299,16 @@ wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
             Com_Error(ERR_DROP, "Sound %s has a bad loop length", name);
         }
 
-        info.dataofs = data_p - wav;
+        info.dataofs   = data_p - wav;
+        info.datasize  = iff_chunk_len;
+        info.dataalign = (bytealign / info.channels - 4) / 4 * 8 + 1;
+        // dataalign should always be 1
+        assert(info.dataalign == 1);
     } else {
         Com_Printf("Microsoft PCM format only\n");
         return info;
     }
 
-    info.datasize = iff_chunk_len;
-
     return info;
 }
 
@@ -310,26 +319,24 @@ DownSampleWav
 */
 qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
 {
-    int newdatasize;
-    byte* datap;
-    int i;
-    int ii;
-    int error;
-    int width;
-    int oldsamples;
-    int oldrate;
+    int   newdatasize;
+    byte *datap;
+    int   i;
+    int   ii;
+    int   error;
+    int   width;
+    int   oldsamples;
+    int   oldrate;
 
     newdatasize = 0;
-    datap = &wav[info->dataofs];
+    datap       = &wav[info->dataofs];
 
-    if (info->channels > 1)
-    {
+    if (info->channels > 1) {
         Com_DPrintf("Could not downsample WAV file. Stereo WAVs not supported!\n");
         return 0;
     }
 
-    if (info->format != 1 || !info->dataofs)
-    {
+    if (info->format != 1 || !info->dataofs) {
         Com_DPrintf("Could not downsample WAV file. Not PCM format!\n");
         return 0;
     }
@@ -348,29 +355,27 @@ qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, by
         }
     }
 
-    oldsamples = info->samples;
-    oldrate = info->rate;
+    oldsamples    = info->samples;
+    oldrate       = info->rate;
     info->samples = newdatasize / width;
-    info->rate = (float)newkhz;
+    info->rate    = (float)newkhz;
     newdatasize += info->dataofs;
 
-    *newdata = (byte*)Z_TagMalloc(newdatasize, TAG_SOUND);
+    *newdata = (byte *)Z_TagMalloc(newdatasize, TAG_SOUND);
     memcpy(*newdata, wav, info->dataofs);
 
     iff_data = *newdata;
-    iff_end = *newdata + newdatasize;
+    iff_end  = *newdata + newdatasize;
     FindChunk("RIFF");
 
-    if (!data_p || strncmp((const char*)data_p + 8, "WAVE", 4u))
-    {
+    if (!data_p || strncmp((const char *)data_p + 8, "WAVE", 4u)) {
         Com_DPrintf("Missing RIFF/WAVE chunks\n");
         return 0;
     }
 
     iff_data = data_p + 12;
     FindChunk("fmt ");
-    if (!data_p)
-    {
+    if (!data_p) {
         Com_DPrintf("Missing fmt chunk\n");
         return 0;
     }
@@ -380,8 +385,7 @@ qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, by
     data_p += 8;
 
     FindChunk("data");
-    if (!data_p)
-    {
+    if (!data_p) {
         Com_DPrintf("Missing data chunk\n");
         return 0;
     }
@@ -427,10 +431,10 @@ S_LoadSound
 */
 qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean force_load)
 {
-    int size;
+    int          size;
     fileHandle_t file_handle;
-    char tempName[MAX_RES_NAME + 1];
-    int realKhz;
+    char         tempName[MAX_RES_NAME + 1];
+    int          realKhz;
 
     sfx->buffer = 0;
 
@@ -440,10 +444,10 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
 
     if (streamed) {
         sfx->length = 5000;
-        sfx->width = 1;
+        sfx->width  = 1;
         sfx->iFlags |= SFX_FLAG_STREAMED;
         sfx->time_length = 5000.0;
-        sfx->data = NULL;
+        sfx->data        = NULL;
         return qtrue;
     }
 
@@ -456,22 +460,20 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
     }
 
     size = FS_FOpenFileRead(fileName, &file_handle, qfalse, qtrue);
-    if (size <= 0)
-    {
+    if (size <= 0) {
         if (file_handle) {
             FS_FCloseFile(file_handle);
         }
         return qfalse;
     }
 
-    sfx->data = (byte*)Z_TagMalloc(size, TAG_SOUND);
+    sfx->data = (byte *)Z_TagMalloc(size, TAG_SOUND);
 
     FS_Read(sfx->data, size, file_handle);
     FS_FCloseFile(file_handle);
     sfx->info = GetWavinfo(fileName, sfx->data, size);
 
-    if (sfx->info.channels != 1 && !streamed)
-    {
+    if (sfx->info.channels != 1 && !streamed) {
         Com_Printf("%s is a stereo wav file\n", fileName);
         Z_Free(sfx->data);
         sfx->data = NULL;
@@ -496,8 +498,8 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
     }
 
     if (!(sfx->iFlags & SFX_FLAG_STREAMED) && realKhz < sfx->info.rate) {
-        byte* newdata;
-        int newdatasize;
+        byte *newdata;
+        int   newdatasize;
 
         newdata = NULL;
         if (sfx->iFlags & SFX_FLAG_NO_OFFSET) {
@@ -508,13 +510,13 @@ qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean fo
 
         if (newdatasize) {
             Z_Free(sfx->data);
-            sfx->data = newdata;
+            sfx->data          = newdata;
             sfx->info.datasize = newdatasize;
         }
     }
 
-    sfx->length = sfx->info.samples;
-    sfx->width = sfx->info.width;
+    sfx->length      = sfx->info.samples;
+    sfx->width       = sfx->info.width;
     sfx->time_length = sfx->info.samples / sfx->info.rate * 1000.f;
 
     if (sfx->iFlags & SFX_FLAG_STREAMED) {
@@ -540,7 +542,7 @@ S_LoadMP3
 */
 qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
 {
-    int length;
+    int          length;
     fileHandle_t file_handle;
 
     length = FS_FOpenFileRead(fileName, &file_handle, 0, 1);
@@ -552,9 +554,9 @@ qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
     }
 
     memset(&sfx->info, 0, sizeof(sfx->info));
-    sfx->data = (byte*)Z_TagMalloc(length, TAG_SOUND);
+    sfx->data   = (byte *)Z_TagMalloc(length, TAG_SOUND);
     sfx->length = length;
-    sfx->width = 1;
+    sfx->width  = 1;
     FS_Read(sfx->data, length, file_handle);
     FS_FCloseFile(file_handle);
 
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 9f185e32..fc242f76 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -100,6 +100,9 @@ int             music_currentsong       = 0;
 static qboolean enumeration_ext     = qfalse;
 static qboolean enumeration_all_ext = qfalse;
 
+static qboolean ima4_ext         = qfalse;
+static qboolean soft_block_align = qfalse;
+
 song_t            music_songs[MAX_MUSIC_SONGS];
 openal_internal_t openal;
 static float      s_fFadeStartTime;
@@ -113,7 +116,7 @@ static int
 S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
 static void   S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
 static bool   S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t *pSfx);
-static ALuint S_OPENAL_Format(int width, int channels);
+static ALuint S_OPENAL_Format(float width, int channels);
 
 #define alDieIfError() __alDieIfError(__FILE__, __LINE__)
 
@@ -449,7 +452,9 @@ S_OPENAL_InitExtensions
 */
 static bool S_OPENAL_InitExtensions()
 {
-    Com_Printf("AL extensions ignored\n");
+    ima4_ext         = qalIsExtensionPresent("AL_EXT_IMA4");
+    soft_block_align = qalIsExtensionPresent("AL_SOFT_block_alignment");
+
     return true;
 
     extensions_table_t extensions_table[4] = {
@@ -612,7 +617,9 @@ qboolean S_OPENAL_Init()
     }
 
     for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM; i++) {
-        if (!S_OPENAL_InitChannel(i + MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D, &openal.chan_2D_stream[i])) {
+        if (!S_OPENAL_InitChannel(
+                i + MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D, &openal.chan_2D_stream[i]
+            )) {
             return false;
         }
     }
@@ -827,7 +834,8 @@ void S_DumpInfo()
         S_DumpStatus(
             "Misc",
             i,
-            openal.channel[MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + i]
+            openal.channel
+                [MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + i]
         );
     }
 }
@@ -1818,7 +1826,9 @@ static int S_OPENAL_Start2DLoopSound(
     pChannel->set_gain(fVolumeToPlay);
     pChannel->start_sample();
     if (s_show_sounds->integer > 0) {
-        Com_DPrintf("OpenAL: %d (#%i) - %s (vol %f)\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name, fVolume);
+        Com_DPrintf(
+            "OpenAL: %d (#%i) - %s (vol %f)\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name, fVolume
+        );
     }
 
     return iChannel;
@@ -2138,7 +2148,9 @@ void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
         }
 
         if (s_show_sounds->integer > 0) {
-            Com_DPrintf("OpenAL: %d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name);
+            Com_DPrintf(
+                "OpenAL: %d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name
+            );
         }
 
         if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET)
@@ -2991,9 +3003,21 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
                 return false;
             }
 
+            if (pSfx->info.dataalign > 1 && !soft_block_align) {
+                Com_DPrintf(
+                    "OpenAL: Alignment specified but AL doesn't support block alignment (%d).", pSfx->info.dataalign
+                );
+                return false;
+            }
+
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
+            if (pSfx->info.dataalign > 1) {
+                qalBufferi(pSfx->buffer, AL_UNPACK_BLOCK_ALIGNMENT_SOFT, pSfx->info.dataalign);
+                alDieIfError();
+            }
+
             qalBufferData(
                 pSfx->buffer,
                 fmt,
@@ -4216,7 +4240,7 @@ int S_CurrentMoviePosition()
 S_AL_Format
 =================
 */
-static ALuint S_OPENAL_Format(int width, int channels)
+static ALuint S_OPENAL_Format(float width, int channels)
 {
     ALuint format = AL_FORMAT_MONO16;
 
@@ -4233,6 +4257,17 @@ static ALuint S_OPENAL_Format(int width, int channels)
         } else if (channels == 2) {
             format = AL_FORMAT_STEREO16;
         }
+    } else if (width == 0.5) {
+        if (ima4_ext && soft_block_align) {
+            if (channels == 1) {
+                format = AL_FORMAT_MONO_IMA4;
+            } else if (channels == 2) {
+                format = AL_FORMAT_STEREO_IMA4;
+            }
+        } else {
+            // unsupported
+            format = 0;
+        }
     }
 
     return format;
@@ -4360,6 +4395,11 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t *pSfx)
         return true;
     }
 
+    if (stream->info.dataalign > 1 && soft_block_align) {
+        qalBufferi(buffers[currentBuf], AL_UNPACK_BLOCK_ALIGNMENT_SOFT, stream->info.dataalign);
+        alDieIfError();
+    }
+
     qalBufferData(buffers[currentBuf], pSfx->info.format, rawData, bytesRead, stream->info.rate);
     alDieIfError();
 
@@ -4499,6 +4539,11 @@ void openal_channel_two_d_stream::update()
         }
     }
 
+    if (stream->info.dataalign > 1 && soft_block_align) {
+        qalBufferi(buffers[currentBuf], AL_UNPACK_BLOCK_ALIGNMENT_SOFT, stream->info.dataalign);
+        alDieIfError();
+    }
+
     qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
     alDieIfError();
 

From 167bd45a6acec8f68e92bc49a039644542ce16b0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 21:14:51 +0100
Subject: [PATCH 1554/2040] Make the AI rarely play the standidentify animation
 (pointing finger to the player)

---
 code/fgame/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index d0036e93..2b064af6 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -8389,7 +8389,7 @@ bool Actor::AttackEntryAnimation(void)
                 m_bNewEnemy   = true;
                 return true;
             }
-        } else if (fDistSquared > Square(1024)) {
+        } else if (fDistSquared > Square(1024) && (rand() % 4) == 0) {
             Sentient *pSquadMate;
 
             for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {

From 2f8382f1000f61a88f63f67c4392d467d0f7e37b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 21:15:49 +0100
Subject: [PATCH 1555/2040] Initialize m_bMumble

---
 code/fgame/actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 2b064af6..9f3b9794 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2993,6 +2993,7 @@ Actor::Actor()
     //  The variable isn't set in original
     //
     m_bSilent = false;
+    m_bMumble = true;
 }
 
 /*

From 58f0245e83d3c42ae260199dfe86d3c4d12394c4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:08:31 +0100
Subject: [PATCH 1556/2040] Only add entries for servers that were queried
 successfully

---
 code/client/cl_uiserverlist.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index 8a4e88d2..c40716c7 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -1181,6 +1181,11 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         }
 
         iServerTotalCount += ServerListCount(serverlist);
+
+        // Removed in 2.0
+        //  Only add entries for servers that are queried successfully
+        //  it avoids unnecessary entries
+#if 0
         for (j = 0; j < ServerListCount(serverlist); j++) {
             GServer arrayServer = ServerListGetServer(serverlist, j);
         
@@ -1208,6 +1213,7 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
 
             uiServerList->AddItem(pNewServerItem);
         }
+#endif
 
         /*
         for (i = 1; i <= uiServerList->getNumItems(); i++)

From d944b4a21e7d0666df8d78dbd90a4bb461e9c435 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:40:40 +0100
Subject: [PATCH 1557/2040] Fix wrong command name for ForceDropHealth

---
 code/fgame/sentient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 0f0614a5..93a00bb9 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -531,7 +531,7 @@ Event EV_Sentient_ForceDropWeapon2
 );
 Event EV_Sentient_ForceDropHealth
 (
-    "forcedropweapon",
+    "forcedrophealth",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -540,7 +540,7 @@ Event EV_Sentient_ForceDropHealth
 );
 Event EV_Sentient_ForceDropHealth2
 (
-    "forcedropweapon",
+    "forcedrophealth",
     EV_DEFAULT,
     NULL,
     NULL,

From 6eab2ddd578a3e685e1efafd68f79b7215a1cec7 Mon Sep 17 00:00:00 2001
From: Joey Riches <josephriches@gmail.com>
Date: Wed, 27 Nov 2024 23:49:00 +0000
Subject: [PATCH 1558/2040] CMake: Support lib extension on unix

Some distros install to lib64 instead of lib, respect the lib extension
otherwise some {f,c}game gets installed to lib64 and other libs get
installed to lib.
---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6e57b5e..6d197e67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ if(WIN32)
 	set(LIB_INSTALL_SUBDIR ".")
 else()
 	# Unix
-	set(CMAKE_DEFAULT_INSTALL_RUNTIME_DIR lib)
+	set(CMAKE_DEFAULT_INSTALL_RUNTIME_DIR lib${CMAKE_LIB_SUFFIX})
 	set(BIN_INSTALL_SUBDIR ${CMAKE_PROJECT_NAME})
 	set(LIB_INSTALL_SUBDIR ${CMAKE_PROJECT_NAME})
 endif()
@@ -187,7 +187,7 @@ if (NOT BUILD_NO_CLIENT)
 	target_link_libraries(openmohaa PRIVATE omohclient)
 	target_link_libraries(openmohaa PRIVATE omohrenderer omohsdl)
 	target_link_libraries(openmohaa PRIVATE qcommon qcommon_standalone)
-	
+
 	# Add the gamespy dependency
 	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib")
 	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BIN_SUFFIX}")
@@ -260,4 +260,3 @@ if(NOT TARGET uninstall)
   add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 endif()
-

From 83a874e4fd561ecd6f1d515a843e1ae519aa4249 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:59:47 +0100
Subject: [PATCH 1559/2040] Add an option for CMake to specify when targeting
 the local system

---
 CMakeLists.txt                | 14 +++++++++++---
 code/Launcher/launch_main.cpp |  4 ++--
 code/qcommon/q_platform.h     |  6 ++++++
 code/sys/new/sys_main_new.c   |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d197e67..b87eb7f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,12 @@ endif()
 option(USE_INTERNAL_JPEG "If set, use bundled libjpeg." ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_MAD  "If set, use bundled libmad."  ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_ZLIB "If set, use bundled zlib."    ${USE_INTERNAL_LIBS})
+option(TARGET_LOCAL_SYSTEM "Indicate that the project will be compiled and installed for the local system" OFF)
 
 if(TARGET_GAME_TYPE)
 	message(SEND_ERROR "TARGET_GAME_TYPE is now unsupported, it is now done at runtime.")
 endif()
 
-
 set(TARGET_BASE_GAME "./")
 set(CMAKE_DEBUG_POSTFIX "-dbg")
 
@@ -68,9 +68,17 @@ ELSE()
 	set(TARGET_ARCH_SUFFIX ${TARGET_ARCH})
 ENDIF()
 
-set(TARGET_BIN_SUFFIX ".${TARGET_ARCH}")
+message(STATUS "Architecture detected: ${TARGET_ARCH}")
 
-message(STATUS "Architecture detected: ${TARGET_ARCH}, suffix set to ${TARGET_ARCH_SUFFIX}.")
+if(TARGET_LOCAL_SYSTEM)
+	add_definitions(-DTARGET_LOCAL_SYSTEM)
+	# As it targets the local system, no need to know about the architecture used
+	set(TARGET_BIN_SUFFIX "")
+	message(STATUS "Suffix will not be used as the local system is the target")
+else()
+	set(TARGET_BIN_SUFFIX ".${TARGET_ARCH}")
+	message(STATUS "Suffix set to ${TARGET_ARCH_SUFFIX}.")
+endif()
 
 IF(WIN32)
 	set(TARGET_PLATFORM_PREFIX "")
diff --git a/code/Launcher/launch_main.cpp b/code/Launcher/launch_main.cpp
index 39e47430..afefd20a 100644
--- a/code/Launcher/launch_main.cpp
+++ b/code/Launcher/launch_main.cpp
@@ -38,9 +38,9 @@ const char* targetGameList[] =
 int main(int argc, const char* argv[]) {
     std::vector<std::string> argumentList;
 #if !defined(DEDICATED) || !DEDICATED
-    const char* programName = "openmohaa" "." ARCH_STRING DLL_SUFFIX EXE_EXT;
+    const char* programName = "openmohaa" ARCH_SUFFIX DLL_SUFFIX EXE_EXT;
 #else
-    const char* programName = "omohaaded" "." ARCH_STRING DLL_SUFFIX EXE_EXT;
+    const char* programName = "omohaaded" ARCH_SUFFIX DLL_SUFFIX EXE_EXT;
 #endif
 
     argumentList.push_back("+set");
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index b4a4cd3b..0846c2df 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -86,6 +86,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define DLL_SUFFIX
 #endif
 
+#if !defined(TARGET_LOCAL_SYSTEM)
+#  define ARCH_SUFFIX "." ARCH_STRING
+#else
+#  define ARCH_SUFFIX
+#endif
+
 // alloca
 #ifdef _MSC_VER
 #  include <malloc.h>
diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index cc03d144..61159776 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -236,7 +236,7 @@ Sys_GetGameAPI
 void* Sys_GetGameAPI(void* parms)
 {
     void* (*GetGameAPI) (void*);
-    const char* gamename = "game" "." ARCH_STRING DLL_SUFFIX DLL_EXT;
+    const char* gamename = "game" ARCH_SUFFIX DLL_SUFFIX DLL_EXT;
 
     if (game_library)
         Com_Error(ERR_FATAL, "Sys_GetGameAPI without calling Sys_UnloadGame");
@@ -285,7 +285,7 @@ Sys_GetCGameAPI
 void* Sys_GetCGameAPI(void* parms)
 {
     void* (*GetCGameAPI) (void*);
-    const char* gamename = "cgame" "." ARCH_STRING DLL_SUFFIX DLL_EXT;
+    const char* gamename = "cgame" ARCH_SUFFIX DLL_SUFFIX DLL_EXT;
 
     if (cgame_library)
         Com_Error(ERR_FATAL, "Sys_GetCGameAPI without calling Sys_UnloadCGame");

From 7cad7a4bd0868b6718ac0d24b92cd28b05899184 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:34:41 +0100
Subject: [PATCH 1560/2040] Fix printf format specifiers

---
 code/script/scriptvariable.cpp | 2 +-
 code/server/sv_ccmds.c         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index 0dd34d75..248ecbe2 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -1744,7 +1744,7 @@ void ScriptVariable::operator%=(const ScriptVariable& value)
         Clear();
 
         throw ScriptException(
-            "binary '%' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
+            "binary '%%' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index f14e28f1..1727a193 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1669,9 +1669,9 @@ void SV_NetProfileDump_f(void)
             }
 
 			if (client->netchan.remoteAddress.type == NA_LOOPBACK) {
-				Com_sprintf(buffer, sizeof(buffer), "#%2i-Loopback: ");
+				Com_sprintf(buffer, sizeof(buffer), "#%2i-Loopback: ", i);
 			} else {
-				Com_sprintf(buffer, sizeof(buffer), "Client #%2i:   ");
+				Com_sprintf(buffer, sizeof(buffer), "Client #%2i:   ", i);
 			}
 
 			FS_Write(buffer, strlen(buffer), hFile);

From f1e5d02169dfe82d4521f9761760c72348292e40 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:48:56 +0100
Subject: [PATCH 1561/2040] Fix insecure printf format

---
 code/gamespy/common/gsAssert.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/gamespy/common/gsAssert.c b/code/gamespy/common/gsAssert.c
index c4c56861..d8a9b658 100644
--- a/code/gamespy/common/gsAssert.c
+++ b/code/gamespy/common/gsAssert.c
@@ -96,7 +96,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 	// continues rendering
 	void  _gsDebugAssert			(const char *string)
 	{
-		printf(string);
+		printf("%s", string);
 		
 		while(1)
 		{
@@ -118,7 +118,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 	void  _gsDebugAssert			(const char *string)
 	{
 
-		scePrintf(string);
+		scePrintf("%s", string);
 		while(1);;
 	}
 
@@ -127,7 +127,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 #elif defined _MACOSX
 	void  _gsDebugAssert			(const char *string)
 	{
-		printf(string);
+		printf("%s", string);
 		
 		while(1)
 		{
@@ -139,7 +139,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 #elif defined _LINUX
 	void  _gsDebugAssert			(const char *string)
 	{
-		printf(string);
+		printf("%s", string);
 		
 		while(1)
 		{
@@ -170,7 +170,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 	void  _gsDebugAssert			(const char *string)
 	{
 
-		printf(string);
+		printf("%s", string);
 		while(1);;
 
 	}

From b3da62f77e7f7fd2eb2722d14e13968a00ce3dea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:57:24 +0100
Subject: [PATCH 1562/2040] Don't use an offset for constArrayValue

This is risky and a bad practice to offset a pointer. This also fixes the compiler warning
---
 code/script/scriptvariable.cpp | 44 ++++++++++++++++------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index 248ecbe2..d1537eb6 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -114,10 +114,10 @@ void ScriptConstArrayHolder::Archive(Archiver& arc)
     arc.ArchiveUnsigned(&size);
 
     if (arc.Loading()) {
-        constArrayValue = new ScriptVariable[size + 1] - 1;
+        constArrayValue = new ScriptVariable[size + 1];
     }
 
-    for (unsigned int i = 1; i <= size; i++) {
+    for (unsigned int i = 0; i < size; i++) {
         constArrayValue[i].ArchiveInternal(arc);
     }
 }
@@ -307,9 +307,9 @@ ScriptConstArrayHolder::ScriptConstArrayHolder(ScriptVariable *pVar, unsigned in
     refCount   = 0;
     this->size = size;
 
-    constArrayValue = new ScriptVariable[size + 1] - 1;
+    constArrayValue = new ScriptVariable[size + 1];
 
-    for (unsigned int i = 1; i <= size; i++) {
+    for (unsigned int i = 0; i < size; i++) {
         constArrayValue[i] = pVar[i];
     }
 }
@@ -319,7 +319,7 @@ ScriptConstArrayHolder::ScriptConstArrayHolder(unsigned int size)
     refCount   = 0;
     this->size = size;
 
-    constArrayValue = new ScriptVariable[size + 1] - 1;
+    constArrayValue = new ScriptVariable[size + 1];
 }
 
 ScriptConstArrayHolder::ScriptConstArrayHolder()
@@ -332,8 +332,7 @@ ScriptConstArrayHolder::ScriptConstArrayHolder()
 ScriptConstArrayHolder::~ScriptConstArrayHolder()
 {
     if (constArrayValue) {
-        ScriptVariable *const offset = constArrayValue + 1;
-        delete[] offset;
+        delete[] constArrayValue;
     }
 }
 
@@ -451,11 +450,10 @@ void ScriptVariable::CastConstArrayValue(void)
 
         en = m_data.arrayValue->arrayValue;
 
-        i = 0;
+        i = 1;
 
-        for (value = en.NextValue(); value != NULL; value = en.NextValue()) {
-            i++;
-            constArrayValue->constArrayValue[i] = *value;
+        for (value = en.NextValue(); value != NULL; value = en.NextValue(), i++) {
+            constArrayValue->constArrayValue[i - 1] = *value;
         }
 
         break;
@@ -464,7 +462,7 @@ void ScriptVariable::CastConstArrayValue(void)
         constArrayValue = new ScriptConstArrayHolder(m_data.containerValue->NumObjects());
 
         for (int i = m_data.containerValue->NumObjects(); i > 0; i--) {
-            constArrayValue->constArrayValue[i].setListenerValue(m_data.containerValue->ObjectAt(i));
+            constArrayValue->constArrayValue[i - 1].setListenerValue(m_data.containerValue->ObjectAt(i));
         }
         break;
 
@@ -475,7 +473,7 @@ void ScriptVariable::CastConstArrayValue(void)
             constArrayValue = new ScriptConstArrayHolder(listeners->NumObjects());
 
             for (int i = listeners->NumObjects(); i > 0; i--) {
-                constArrayValue->constArrayValue[i].setListenerValue(listeners->ObjectAt(i));
+                constArrayValue->constArrayValue[i - 1].setListenerValue(listeners->ObjectAt(i));
             }
         } else {
             constArrayValue = new ScriptConstArrayHolder(0);
@@ -484,7 +482,7 @@ void ScriptVariable::CastConstArrayValue(void)
 
     default:
         constArrayValue                     = new ScriptConstArrayHolder(1);
-        constArrayValue->constArrayValue[1] = *this;
+        constArrayValue->constArrayValue[0] = *this;
 
         break;
     }
@@ -987,11 +985,11 @@ void ScriptVariable::evalArrayAt(ScriptVariable& var)
     case VARIABLE_CONSTARRAY:
         index = var.intValue();
 
-        if (!index || index > m_data.constArrayValue->size) {
+        if (index == 0 || index > m_data.constArrayValue->size) {
             throw ScriptException("array index %d out of range", index);
         }
 
-        *this = m_data.constArrayValue->constArrayValue[index];
+        *this = m_data.constArrayValue->constArrayValue[index - 1];
         break;
 
     case VARIABLE_CONTAINER:
@@ -1095,7 +1093,7 @@ Listener *ScriptVariable::listenerAt(uintptr_t index) const
 {
     switch (type) {
     case VARIABLE_CONSTARRAY:
-        return m_data.constArrayValue->constArrayValue[index].listenerValue();
+        return m_data.constArrayValue->constArrayValue[index - 1].listenerValue();
 
     case VARIABLE_CONTAINER:
         return m_data.containerValue->ObjectAt(index);
@@ -1332,14 +1330,14 @@ void ScriptVariable::setArrayAtRef(ScriptVariable& index, ScriptVariable& value)
     case VARIABLE_CONSTARRAY:
         intValue = index.intValue();
 
-        if (!intValue || intValue > m_data.constArrayValue->size) {
+        if (intValue == 0 || intValue > m_data.constArrayValue->size) {
             throw ScriptException("array index %d out of range", intValue);
         }
 
         if (value.GetType()) {
-            m_data.constArrayValue->constArrayValue[intValue] = value;
+            m_data.constArrayValue->constArrayValue[intValue - 1] = value;
         } else {
-            m_data.constArrayValue->constArrayValue[intValue].Clear();
+            m_data.constArrayValue->constArrayValue[intValue - 1].Clear();
         }
 
         break;
@@ -1385,7 +1383,7 @@ void ScriptVariable::setSafeContainerValue(ConList *newvalue)
 
 void ScriptVariable::setConstArrayValue(ScriptVariable *pVar, unsigned int size)
 {
-    ScriptConstArrayHolder *constArray = new ScriptConstArrayHolder(pVar - 1, size);
+    ScriptConstArrayHolder *constArray = new ScriptConstArrayHolder(pVar, size);
 
     ClearInternal();
     type = VARIABLE_CONSTARRAY;
@@ -2230,7 +2228,7 @@ ScriptVariable& ScriptVariable::operator[](ScriptVariable& index)
             throw ScriptException("array index %d out of range", i);
         }
 
-        return m_data.constArrayValue->constArrayValue[i];
+        return m_data.constArrayValue->constArrayValue[i - 1];
 
     default:
         throw ScriptException("[] applied to invalid type '%s'", typenames[GetType()]);
@@ -2239,7 +2237,7 @@ ScriptVariable& ScriptVariable::operator[](ScriptVariable& index)
 
 ScriptVariable *ScriptVariable::operator[](unsigned index) const
 {
-    return &m_data.constArrayValue->constArrayValue[index];
+    return &m_data.constArrayValue->constArrayValue[index - 1];
 }
 
 ScriptVariable *ScriptVariable::operator*()

From 5f33a617abf950f8444d1946626614333fc2d3ec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 22:03:39 +0100
Subject: [PATCH 1563/2040] Allow linking directly against system OpenAL
 library

---
 code/client/CMakeLists.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index 059cfeb3..2c73fbdf 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -11,7 +11,6 @@ file(GLOB_RECURSE SOURCES_UILIB "../uilib/*.c*")
 # Made as an interface and not static, as static only links used methods
 add_library(omohclient INTERFACE)
 target_compile_definitions(omohclient INTERFACE APP_MODULE)
-target_compile_definitions(omohclient INTERFACE USE_OPENAL_DLOPEN=1)
 target_compile_features(omohclient INTERFACE cxx_nullptr)
 target_compile_features(omohclient INTERFACE c_variadic_macros)
 target_link_libraries(omohclient INTERFACE omohsdl)
@@ -31,7 +30,13 @@ if (NOT NO_OPENAL)
 		else()
 			target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR})
 		endif()
-		target_link_libraries(omohclient INTERFACE ${OPENAL_LIBRARY})
+
+		if(NOT USE_SYSTEM_LIBS)
+			target_compile_definitions(omohclient INTERFACE USE_OPENAL_DLOPEN=1)
+		else()
+			# Link against system OpenAL
+			target_link_libraries(omohclient INTERFACE OpenAL::OpenAL)
+		endif()
 	endif()
 
 	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")

From 56cc3fff53ebe8c863cd6fed74fca0793a3bfa33 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 22:53:04 +0100
Subject: [PATCH 1564/2040] Use a single variable to disable modern DMA

---
 CMakeLists.txt             | 1 +
 code/client/CMakeLists.txt | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b87eb7f7..7b29e56d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,7 @@ if (NOT BUILD_NO_CLIENT)
 	##
 	## Client app
 	##
+	option(NO_MODERN_DMA "Use older sound-system" FALSE)
 
 	add_subdirectory("code/client")
 	add_subdirectory("code/renderer")
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index 2c73fbdf..c7136da2 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(omohclient)
 
-option(NO_OPENAL "Use older sound-system" FALSE)
-
 add_subdirectory("../cgame" "./cgame")
 
 file(GLOB SOURCES_CLIENT "./*.c*")
@@ -19,7 +17,7 @@ target_link_libraries(omohclient INTERFACE gcd)
 # Sound stuff
 target_compile_definitions(omohclient INTERFACE USE_CODEC_MP3)
 
-if (NOT NO_OPENAL)
+if (NOT NO_MODERN_DMA)
 	# Use OpenAL
 	find_package(OpenAL REQUIRED)
 

From f31ea39331efedbaaddee4ce70995dbdf7d40cde Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 23:00:57 +0100
Subject: [PATCH 1565/2040] Add about tweaking the build

---
 docs/compiling.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/compiling.md b/docs/compiling.md
index f29b9912..f5f6eb27 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -8,11 +8,7 @@ The following tools are required for all platforms:
 - A C++11 compiler
 - OpenAL SDK (can be found [here](https://github.com/kcat/openal-soft))
 
-The installation directory can be set to the MOHAA directory.
-
-By default, the build will produce both the client and dedicated server versions. The client can be omitted from the build by appending `-DBUILD_NO_CLIENT=1` to the CMake command-line arguments. Using this parameter will result in only the server portion being built.
-
-OpenAL can be disabled by appending `-DNO_OPENAL=1` to the CMake command-line arguments. The old SDL-based sound system will be used instead, it lacks some features such as ambient sounds.
+The installation directory can be set to the MOHAA directory with `-DCMAKE_INSTALL_PREFIX=/path/to/mohaa`.
 
 ## Compiling for Linux
 
@@ -46,3 +42,11 @@ Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexb
 OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.23.1 rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
 
 Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.
+
+## Tweaking the build
+
+- `-DBUILD_NO_CLIENT=1` Don't build client binaries. This will only build the dedicated server binaries.
+- `-DCMAKE_LIB_SUFFIX=suffix` Default suffix to use for the default `lib` directory. For example `-DCMAKE_LIB_SUFFIX=64`
+- `-DNO_MODERN_DMA=1` Use the basic DMA sound system from quake3. This lacks many features such as soundtracks and movie audio from the modern OpenAL-based DMA sound system. This option is not recommended, unless openal is not available.
+- `-DTARGET_LOCAL_SYSTEM=1` for compiling and installing on the local system. This will remove the architecture suffix at the end of each binary. This option can be useful for packaging builds.
+- `-DUSE_SYSTEM_LIBS=1` for third-party libraries, this will make use of system libraries instead of libraries that are embedded within the project.
\ No newline at end of file

From 0fb775cd6056ac8f3fb55b3f3b4e3eac400bdf36 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 29 Nov 2024 23:45:52 +0100
Subject: [PATCH 1566/2040] Only set the infoclient if it's a teammate player
 that can be sent to other clients

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 44c89721..cfb4542c 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -7285,7 +7285,7 @@ void Player::UpdateStats(void)
 
                 trace = G_Trace(m_vViewPos, vec_zero, vec_zero, vEnd, this, MASK_BEAM, qfalse, "infoclientcheck");
 
-                if (trace.ent && trace.ent->entity->IsSubclassOfPlayer()) {
+                if (trace.ent && trace.ent->entity->IsSubclassOfPlayer() && !(trace.ent->r.svFlags & SVF_NOCLIENT)) {
                     Player *p = static_cast<Player *>(trace.ent->entity);
 
                     if (IsSpectator() || p->GetTeam() == GetTeam()) {

From 387ccd5cc326b73f5f0e264295fc0c2e5a26f14b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 00:36:33 +0100
Subject: [PATCH 1567/2040] Bump the minimum CMake version to 3.12

---
 CMakeLists.txt               | 2 +-
 code/Launcher/CMakeLists.txt | 2 ++
 code/cgame/CMakeLists.txt    | 2 +-
 code/client/CMakeLists.txt   | 3 ++-
 code/fgame/CMakeLists.txt    | 2 +-
 code/gamespy/CMakeLists.txt  | 2 +-
 code/qcommon/CMakeLists.txt  | 3 ++-
 code/renderer/CMakeLists.txt | 3 ++-
 code/sdl/CMakeLists.txt      | 3 ++-
 code/server/CMakeLists.txt   | 3 ++-
 code/skeletor/CMakeLists.txt | 3 ++-
 code/sys/CMakeLists.txt      | 2 +-
 code/tiki/CMakeLists.txt     | 3 ++-
 13 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b29e56d..93789e19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(openmohaa)
 
 include(TargetArch.cmake)
diff --git a/code/Launcher/CMakeLists.txt b/code/Launcher/CMakeLists.txt
index d35e8ec1..133435ff 100644
--- a/code/Launcher/CMakeLists.txt
+++ b/code/Launcher/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.12)
+
 project(Launcher)
 
 set(LAUNCHER_SOURCES "${CMAKE_SOURCE_DIR}/code/Launcher/launch_main.cpp")
diff --git a/code/cgame/CMakeLists.txt b/code/cgame/CMakeLists.txt
index 8806106b..a0423773 100644
--- a/code/cgame/CMakeLists.txt
+++ b/code/cgame/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(cgame)
 
 # Shared source files for modules
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index c7136da2..baaf74bc 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohclient)
 
 add_subdirectory("../cgame" "./cgame")
diff --git a/code/fgame/CMakeLists.txt b/code/fgame/CMakeLists.txt
index 8f6f2490..ed8fdc31 100644
--- a/code/fgame/CMakeLists.txt
+++ b/code/fgame/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(fgame)
 
 # Shared source files for modules
diff --git a/code/gamespy/CMakeLists.txt b/code/gamespy/CMakeLists.txt
index fedbf2b8..91533d3d 100644
--- a/code/gamespy/CMakeLists.txt
+++ b/code/gamespy/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
 include_directories("./common")
 include_directories("./gcdkey")
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index ca02ff6a..0b306b15 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(qcommon)
 
 if(${CMAKE_VERSION} VERSION_GREATER "3.12")
diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
index c91ddfcb..926262de 100644
--- a/code/renderer/CMakeLists.txt
+++ b/code/renderer/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohrenderer)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
diff --git a/code/sdl/CMakeLists.txt b/code/sdl/CMakeLists.txt
index db79ee2f..636a1ba6 100644
--- a/code/sdl/CMakeLists.txt
+++ b/code/sdl/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohsdl)
 
 file(GLOB SOURCES_SDL
diff --git a/code/server/CMakeLists.txt b/code/server/CMakeLists.txt
index 1e00e964..a171be65 100644
--- a/code/server/CMakeLists.txt
+++ b/code/server/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohserver)
 
 add_subdirectory("../fgame" "./fgame")
diff --git a/code/skeletor/CMakeLists.txt b/code/skeletor/CMakeLists.txt
index 1c1da0c3..313afc44 100644
--- a/code/skeletor/CMakeLists.txt
+++ b/code/skeletor/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohskeletor)
 
 file(GLOB_RECURSE SOURCES_SKEL "./*.c" "./*.cpp")
diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 3fcdf5be..8311c2f1 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(platform)
 
 ### Platform-specific code
diff --git a/code/tiki/CMakeLists.txt b/code/tiki/CMakeLists.txt
index 9eeaba4c..7a02e3f4 100644
--- a/code/tiki/CMakeLists.txt
+++ b/code/tiki/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohtiki)
 
 file(GLOB_RECURSE SOURCES_TIKI "./*.c" "./*.cpp")

From d834f08cadead50ed08446b0069832770264240f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 00:39:05 +0100
Subject: [PATCH 1568/2040] Update compiling.md with current version of tools
 to use

---
 docs/compiling.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/compiling.md b/docs/compiling.md
index f5f6eb27..df4930d5 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -3,23 +3,23 @@
 OpenMoHAA supports any architecture, thanks to the CMake build system and cross-platform code/libraries. While the most common little-Endian architectures (arm, aarch64, x86, x86_64) have been tested and confirmed to work, big-Endian architectures should be supported as well; however, they remain untested.
 
 The following tools are required for all platforms:
-- CMake >= 3.5
+- CMake >= 3.12
 - Flex (>= 2.6.4) and Bison (>= 3.5.1)
 - A C++11 compiler
 - OpenAL SDK (can be found [here](https://github.com/kcat/openal-soft))
 
 The installation directory can be set to the MOHAA directory with `-DCMAKE_INSTALL_PREFIX=/path/to/mohaa`.
 
+Compiling debug binaries will result in a `-dbg` suffix appended to the name of the binaries to avoid mixing debug/release code.
+
 ## Compiling for Linux
 
 These are the tools required on Linux :
-- Clang >= 3.3 or GCC >= 4.8.5
+- Clang >= 7.0.1 or GCC >= 9.4.0
 - libsdl2-dev
 - libopenal-dev
 
-**clang-3.5** and **gcc-4.8.5** should work (tested on Ubuntu 16.04), but the latest version should be used.
-
-Ubuntu 20.04 is the minimum version required to fully compile the project successfully.
+**clang-7** and **gcc-9** has been tested to work on Ubuntu 20.04. Although it's best to use the latest versions.
 
 1 line install command with clang:
 ```sh
@@ -39,7 +39,7 @@ Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compi
 Visual Studio (2019 or 2022) is generally preferred.
 
 Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
-OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.23.1 rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
+OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.24.1 rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
 
 Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.
 

From 383bc60ddbf2bb9cce4f913afaa07992ac067b76 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 00:40:41 +0100
Subject: [PATCH 1569/2040] Update OpenAL to 1.24.1

---
 .github/workflows/shared-build.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 6daac83e..eb1a6d7e 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -63,13 +63,6 @@ jobs:
         echo "CXX=clang++" >> $GITHUB_ENV
         echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
         echo "CXXFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
-        # Temporary workaround for PowerPC as the 1.24.0 version doesn't check for altivec
-        # Will use older versions until a new tag is created with this issue resolved
-        if [ ${{ matrix.architecture.name }} != 'powerpc' ] && [ ${{ matrix.architecture.name }} != 'ppc64' ] &&  [ ${{ matrix.architecture.name }} != 'ppc64el' ]; then
-            echo "OPENAL_REF=1.24.0" >> $GITHUB_ENV
-        else
-            echo "OPENAL_REF=1.23.1" >> $GITHUB_ENV
-        fi
 
     ###
     # SDL
@@ -95,7 +88,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: ${{ env.OPENAL_REF }}
+        ref: '1.24.1'
 
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
@@ -249,7 +242,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.0'
+        ref: '1.24.1'
 
     # soft-oal build
     # Statically link the CRT runtime into OAL as a workaround to prevent crashes
@@ -404,7 +397,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.0'
+        ref: '1.24.1'
 
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal

From 47983481c91abe8b86187aa892414dbbf3576454 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 13:51:07 +0100
Subject: [PATCH 1570/2040] Use UI definitions instead of cls.glconfig for UI
 code to get the resolution

---
 code/client/cl_invrender.cpp           |  2 +-
 code/client/cl_ui.cpp                  | 54 +++++++++++++-------------
 code/client/cl_uifilepicker.cpp        |  2 +-
 code/client/cl_uimpmappicker.cpp       |  2 +-
 code/client/cl_uiplayermodelpicker.cpp |  2 +-
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/code/client/cl_invrender.cpp b/code/client/cl_invrender.cpp
index 491b0f3b..cfbdb3f1 100644
--- a/code/client/cl_invrender.cpp
+++ b/code/client/cl_invrender.cpp
@@ -295,7 +295,7 @@ void UI_DoInventory(qboolean activate_mouse)
     if (client_inv.align == INV_ALIGN_RIGHT) {
         s_main_inv->InitFrame(
             NULL,
-            client_inv.horizoffset + cls.glconfig.vidWidth - client_inv.typewidth,
+            client_inv.horizoffset + uid.vidWidth - client_inv.typewidth,
             client_inv.vertoffset,
             client_inv.typewidth,
             client_inv.typeheight * client_inv.types.NumObjects(),
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 2eb66397..f66a1d18 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -212,15 +212,15 @@ static UIRect2D getDefaultConsoleRectangle(void)
             f[i] = floor(f[i]);
         }
 
-        rect.pos.x       = f[0] - cls.glconfig.vidWidth;
-        rect.pos.y       = f[1] - cls.glconfig.vidHeight;
+        rect.pos.x       = f[0] - uid.vidWidth;
+        rect.pos.y       = f[1] - uid.vidHeight;
         rect.size.width  = f[2] + 50.0;
         rect.size.height = f[3] + 50.0;
     } else {
         rect.pos.x       = 25.0;
         rect.pos.y       = 25.0;
-        rect.size.width  = (cls.glconfig.vidWidth - 50);
-        rect.size.height = (cls.glconfig.vidHeight / 2);
+        rect.size.width  = (uid.vidWidth - 50);
+        rect.size.height = (uid.vidHeight / 2);
     }
 
     return rect;
@@ -967,15 +967,15 @@ static UIRect2D getDefaultDMConsoleRectangle(void)
             f[i] = floor(f[i]);
         }
 
-        rect.pos.x       = f[0] - cls.glconfig.vidWidth;
-        rect.pos.y       = f[1] - cls.glconfig.vidHeight;
+        rect.pos.x       = f[0] - uid.vidWidth;
+        rect.pos.y       = f[1] - uid.vidHeight;
         rect.size.width  = f[2] + 50.0;
         rect.size.height = f[3] + 50.0;
     } else {
         rect.pos.x       = 0;
-        rect.pos.y       = cls.glconfig.vidHeight * 0.58;
-        rect.size.width  = cls.glconfig.vidWidth;
-        rect.size.height = cls.glconfig.vidHeight * 0.415;
+        rect.pos.y       = uid.vidHeight * 0.58;
+        rect.size.width  = uid.vidWidth;
+        rect.size.height = uid.vidHeight * 0.415;
     }
 
     return rect;
@@ -997,14 +997,14 @@ static UIRect2D getQuickMessageDMConsoleRectangle(void)
             f[i] = floor(f[i]);
         }
 
-        rect.pos.x       = f[0] - cls.glconfig.vidWidth;
-        rect.pos.y       = f[1] - cls.glconfig.vidHeight;
+        rect.pos.x       = f[0] - uid.vidWidth;
+        rect.pos.y       = f[1] - uid.vidHeight;
         rect.size.width  = f[2] + 50.0;
         rect.size.height = f[3] + 50.0;
     } else {
         rect.pos.x      = 0;
-        rect.pos.y      = cls.glconfig.vidHeight * 0.66;
-        rect.size.width = cls.glconfig.vidWidth;
+        rect.pos.y      = uid.vidHeight * 0.66;
+        rect.size.width = uid.vidWidth;
         // Fixed in 2.0
         //  Was 38.0 in 1.11 and below
         //  This prevents characters to be seen from the DM console
@@ -1189,14 +1189,14 @@ getDefaultGMBoxRectangle
 static UIRect2D getDefaultGMBoxRectangle(void)
 {
     UIRect2D dmRect = getDefaultDMBoxRectangle();
-    float    height = cls.glconfig.vidHeight * ui_compass_scale->value * 0.25f;
+    float    height = uid.vidHeight * ui_compass_scale->value * 0.25f;
     float    y      = dmRect.size.height + dmRect.pos.y;
 
     if (height < y) {
         height = y;
     }
 
-    return UIRect2D(20.0f, height, cls.glconfig.vidWidth - 20, 128.0f);
+    return UIRect2D(20.0f, height, uid.vidWidth - 20, 128.0f);
 }
 
 /*
@@ -1206,9 +1206,9 @@ getDefaultDMBoxRectangle
 */
 static UIRect2D getDefaultDMBoxRectangle(void)
 {
-    float width = cls.glconfig.vidWidth * ui_compass_scale->value * 0.2f;
+    float width = uid.vidWidth * ui_compass_scale->value * 0.2f;
 
-    return UIRect2D(width, 0, cls.glconfig.vidWidth - (width + 192.0f), 120.0f);
+    return UIRect2D(width, 0, uid.vidWidth - (width + 192.0f), 120.0f);
 }
 
 /*
@@ -1681,11 +1681,11 @@ UI_ClearBackground
 void UI_ClearBackground(void)
 {
     re.Set2DWindow(
-        0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, -1, 1
+        0, 0, uid.vidWidth, uid.vidHeight, 0, uid.vidWidth, uid.vidHeight, 0, -1, 1
     );
-    re.Scissor(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
+    re.Scissor(0, 0, uid.vidWidth, uid.vidHeight);
     re.SetColor(g_color_table[0]);
-    re.DrawBox(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
+    re.DrawBox(0, 0, uid.vidWidth, uid.vidHeight);
     re.SetColor(NULL);
 }
 
@@ -3098,7 +3098,7 @@ void UI_MapList_f(void)
     MapRunnerClass *map = new MapRunnerClass;
     map->Setup("maps", mappath, ".bsp", "_sml");
 
-    CL_SetMousePos(cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2);
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3138,7 +3138,7 @@ void UI_DMMapSelect_f(void)
     MpMapPickerClass *map = new MpMapPickerClass;
     map->Setup(basepath, mappath, gametype);
 
-    CL_SetMousePos(cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2);
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3322,7 +3322,7 @@ void UI_PlayerModel_f(void)
     PlayerModelPickerClass *picker = new PlayerModelPickerClass;
     picker->Setup("models/player", modelpath, bGermanModel);
 
-    CL_SetMousePos(cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2);
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3806,7 +3806,7 @@ void UI_CreateDialog(
 {
     UIDialog *dlg = new UIDialog;
     UIRect2D  rect =
-        UIRect2D((cls.glconfig.vidWidth - width) >> 1, (cls.glconfig.vidHeight - height) >> 1, width, height);
+        UIRect2D((uid.vidWidth - width) / 2, (uid.vidHeight - height) / 2, width, height);
     UColor bgColor = UWindowColor;
 
     dlg->Create(NULL, rect, title, bgColor, UHudColor);
@@ -3876,7 +3876,7 @@ void UI_ResolutionChange(void)
     menuManager.RealignMenus();
 
     if (view3d) {
-        frame = UIRect2D(0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight);
+        frame = UIRect2D(0, 0, uid.vidWidth, uid.vidHeight);
         view3d->setFrame(frame);
     }
 
@@ -4462,7 +4462,7 @@ void UI_CreateScoreboard(void)
     scoreboard_h = h;
 
     SCR_AdjustFrom640(&x, &y, &w, &h);
-    fColumnScale = cls.glconfig.vidWidth / 640.0;
+    fColumnScale = uid.vidWidth / 640.0;
     cge->CG_GetScoreBoardColor(&fR, &fG, &fB, &fA);
     cge->CG_GetScoreBoardFontColor(&fFontR, &fFontG, &fFontB, &fFontA);
 
@@ -5308,7 +5308,7 @@ void CL_InitializeUI(void)
     // Create the 3D view
     view3d = new View3D;
     view3d->setAlwaysOnBottom(true);
-    view3d->InitFrame(NULL, 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, -1, "facfont-20");
+    view3d->InitFrame(NULL, 0, 0, uid.vidWidth, uid.vidHeight, -1, "facfont-20");
     view3d->setName("view3d");
     view3d->InitSubtitle();
 
diff --git a/code/client/cl_uifilepicker.cpp b/code/client/cl_uifilepicker.cpp
index 5b8d7937..ad8914c9 100644
--- a/code/client/cl_uifilepicker.cpp
+++ b/code/client/cl_uifilepicker.cpp
@@ -47,7 +47,7 @@ FilePickerClass::FilePickerClass()
     window = new UIFloatingWindow();
     window->Create(
         NULL,
-        UIRect2D((cls.glconfig.vidWidth - 400) / 2, (cls.glconfig.vidHeight - 300) / 2, 400, 300),
+        UIRect2D((uid.vidWidth - 400) / 2, (uid.vidHeight - 300) / 2, 400, 300),
         "File Picker",
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor
diff --git a/code/client/cl_uimpmappicker.cpp b/code/client/cl_uimpmappicker.cpp
index 453dbfca..8146459f 100644
--- a/code/client/cl_uimpmappicker.cpp
+++ b/code/client/cl_uimpmappicker.cpp
@@ -51,7 +51,7 @@ MpMapPickerClass::MpMapPickerClass()
     window = new UIFloatingWindow();
     window->Create(
         NULL,
-        UIRect2D((cls.glconfig.vidWidth - 300) / 2, (cls.glconfig.vidHeight - 200) / 2, 300, 200),
+        UIRect2D((uid.vidWidth - 300) / 2, (uid.vidHeight - 200) / 2, 300, 200),
         "Select a Map",
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor
diff --git a/code/client/cl_uiplayermodelpicker.cpp b/code/client/cl_uiplayermodelpicker.cpp
index e7af68a1..ca89a42d 100644
--- a/code/client/cl_uiplayermodelpicker.cpp
+++ b/code/client/cl_uiplayermodelpicker.cpp
@@ -155,7 +155,7 @@ PlayerModelPickerClass::PlayerModelPickerClass()
     window = new UIFloatingWindow();
     window->Create(
         NULL,
-        UIRect2D((cls.glconfig.vidWidth - 400) / 2, (cls.glconfig.vidHeight - 300) / 2, 400, 300),
+        UIRect2D((uid.vidWidth - 400) / 2, (uid.vidHeight - 300) / 2, 400, 300),
         "Player Model Select...",
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor

From 6fe1e86b3149139d346b55905e41a1209e1d65b5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 19:59:54 +0100
Subject: [PATCH 1571/2040] Automatically scale UI elements for high
 resolutions

This fixes UI elements being tiny on high resolutions like 4K. Now most UI elements will scale automatically with resolutions above 1920x1080.
---
 code/cgame/cg_drawtools.cpp     | 135 +++++++++++++++++++++++---------
 code/cgame/cg_local.h           |   1 +
 code/cgame/cg_main.c            |   1 +
 code/cgame/cg_public.h          |   3 +-
 code/client/cl_cgame.cpp        |   1 +
 code/client/cl_ui.cpp           |  43 ++++++++--
 code/client/cl_ui.h             |   1 +
 code/client/cl_uidmbox.cpp      |   8 +-
 code/client/cl_uigmbox.cpp      |   8 +-
 code/client/cl_uiminicon.cpp    |  10 +--
 code/client/cl_uiserverlist.cpp |   7 +-
 code/client/cl_uistd.cpp        |  47 +++++++----
 code/client/cl_uiview3d.cpp     |  89 ++++++++++-----------
 code/renderer/tr_font.cpp       |  29 ++++---
 code/renderer/tr_local.h        |   2 +-
 code/renderercommon/tr_public.h |   2 +-
 code/uilib/ui_public.h          |   6 +-
 code/uilib/uibutton.cpp         |   4 +-
 code/uilib/uiconsole.cpp        |  37 ++++-----
 code/uilib/uifield.cpp          |  16 ++--
 code/uilib/uifloatwnd.cpp       |  32 ++++----
 code/uilib/uifont.cpp           |  62 +++++++--------
 code/uilib/uifont.h             |  10 +--
 code/uilib/uilabel.cpp          |   4 +-
 code/uilib/uilist.cpp           |   4 +-
 code/uilib/uilistbox.cpp        |  16 ++--
 code/uilib/uilistctrl.cpp       |  30 +++----
 code/uilib/uimledit.cpp         |  40 +++++-----
 code/uilib/uipopupmenu.cpp      |  30 +++----
 code/uilib/uipulldownmenu.cpp   |   6 +-
 code/uilib/uistatus.cpp         |  23 +++---
 code/uilib/uivertscroll.cpp     |  25 +++---
 code/uilib/uivertscroll.h       |   1 +
 code/uilib/uiwidget.cpp         | 101 ++++++++++++++++--------
 code/uilib/uiwidget.h           |   1 +
 code/uilib/uiwinman.cpp         |   2 +-
 docs/features.md                |   1 +
 37 files changed, 504 insertions(+), 334 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index c6dd9de8..27ea8d6b 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -191,8 +191,8 @@ void CG_DrawDisconnect(void)
     }
 
     handle = cgi.R_RegisterShader("gfx/2d/net.tga");
-    w      = cgi.R_GetShaderWidth(handle);
-    h      = cgi.R_GetShaderHeight(handle);
+    w      = cgi.R_GetShaderWidth(handle) * cgs.uiHiResScale[0];
+    h      = cgi.R_GetShaderHeight(handle) * cgs.uiHiResScale[1];
     x      = ((float)cgs.glconfig.vidWidth - w) * 0.5;
     y      = (float)cgs.glconfig.vidHeight - h;
 
@@ -331,7 +331,7 @@ static void CG_DrawPauseIcon()
     x = (cgs.glconfig.vidWidth - w) / 2.f;
 
     cgi.R_SetColor(colorWhite);
-    cgi.R_DrawStretchPic(x, y, w, h, 0, 0, 1, 1, handle);
+    cgi.R_DrawStretchPic(x, y, w * cgs.uiHiResScale[0], h * cgs.uiHiResScale[1], 0, 0, 1, 1, handle);
 }
 
 static void CG_DrawServerLag()
@@ -362,8 +362,8 @@ static void CG_DrawServerLag()
     }
 
     handle = cgi.R_RegisterShader("gfx/2d/slowserver");
-    w      = (float)cgi.R_GetShaderWidth(handle) / 4;
-    h      = (float)cgi.R_GetShaderHeight(handle) / 4;
+    w      = (float)cgi.R_GetShaderWidth(handle) * cgs.uiHiResScale[0] / 4;
+    h      = (float)cgi.R_GetShaderHeight(handle) * cgs.uiHiResScale[1] / 4;
     x      = ((float)cgs.glconfig.vidWidth - w) / 2;
     y      = (float)cgs.glconfig.vidHeight - h;
     cgi.R_DrawStretchPic(x, y, w, h, 0.0, 0.0, 1.0, 1.0, handle);
@@ -580,11 +580,15 @@ void CG_HudDrawElements()
     int   i;
     float fX, fY;
     float fWidth, fHeight;
+    vec2_t virtualScale;
 
     if (!cg_huddraw_force->integer && !cg_hud->integer) {
         return;
     }
 
+    virtualScale[0] = cgs.glconfig.vidWidth / 640.0;
+    virtualScale[1] = cgs.glconfig.vidWidth / 480.0;
+
     for (i = 0; i < MAX_HUDDRAW_ELEMENTS; i++) {
         if ((!cgi.HudDrawElements[i].hShader && !cgi.HudDrawElements[i].string[0])
             || !cgi.HudDrawElements[i].vColor[3]) {
@@ -634,7 +638,7 @@ void CG_HudDrawElements()
                     fX,
                     fY,
                     -1,
-                    cgi.HudDrawElements[i].bVirtualScreen
+                    cgi.HudDrawElements[i].bVirtualScreen ? virtualScale : cgs.uiHiResScale
                 );
             } else {
                 cgi.R_DrawString(
@@ -643,7 +647,7 @@ void CG_HudDrawElements()
                     fX,
                     fY,
                     -1,
-                    cgi.HudDrawElements[i].bVirtualScreen
+                    cgi.HudDrawElements[i].bVirtualScreen ? virtualScale : cgs.uiHiResScale
                 );
             }
         } else {
@@ -734,7 +738,7 @@ void CG_DrawObjectives()
     vColor[0] = 0.2f;
     vColor[3] = cg.ObjectivesCurrentAlpha * 0.75;
     cgi.R_SetColor(vColor);
-    cgi.R_DrawStretchPic(fX, fY, 450.0, fWidth, 0.0, 0.0, 1.0, 1.0, cgs.media.objectivesBackShader);
+    cgi.R_DrawStretchPic(fX, fY, 450.0 * cgs.uiHiResScale[0], fWidth * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, cgs.media.objectivesBackShader);
 
     fX        = 30.0;
     fY        = fObjectivesTop + 10;
@@ -743,11 +747,11 @@ void CG_DrawObjectives()
     vColor[2] = 1.0;
     vColor[3] = cg.ObjectivesCurrentAlpha;
     cgi.R_SetColor(vColor);
-    cgi.R_DrawString(cgs.media.objectiveFont, cgi.LV_ConvertString("Mission Objectives:"), fX, fY, -1, 0);
+    cgi.R_DrawString(cgs.media.objectiveFont, cgi.LV_ConvertString("Mission Objectives:"), fX, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
     fY = fY + 5.0;
 
-    cgi.R_DrawString(cgs.media.objectiveFont, "_______________________________________________________", fX, fY, -1, 0);
-    fHeight = fObjectivesTop + 35;
+    cgi.R_DrawString(cgs.media.objectiveFont, "_______________________________________________________", fX, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+    fHeight = fObjectivesTop + 35 * cgs.uiHiResScale[1];
 
     for (i = 0; i < MAX_OBJECTIVES; ++i) {
         qhandle_t hBoxShader;
@@ -785,7 +789,14 @@ void CG_DrawObjectives()
         cgi.R_SetColor(vColor);
         fX = 55.0;
         fY = fHeight;
-        cgi.R_DrawString(cgs.media.objectiveFont, cgi.LV_ConvertString(cg.Objectives[i].text), 55.0, fHeight, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.objectiveFont,
+            cgi.LV_ConvertString(cg.Objectives[i].text),
+            55.0,
+            fY / cgs.uiHiResScale[1],
+            -1,
+            cgs.uiHiResScale
+        );
 
         fX        = 30.0;
         fY        = fHeight;
@@ -794,9 +805,19 @@ void CG_DrawObjectives()
         vColor[2] = 1.0;
         vColor[3] = cg.ObjectivesCurrentAlpha;
         cgi.R_SetColor(vColor);
-        cgi.R_DrawStretchPic(fX, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, hBoxShader);
+        cgi.R_DrawStretchPic(
+            fX * cgs.uiHiResScale[0],
+            fY,
+            16.0 * cgs.uiHiResScale[0],
+            16.0 * cgs.uiHiResScale[1],
+            0.0,
+            0.0,
+            1.0,
+            1.0,
+            hBoxShader
+        );
 
-        fHeight += iNumLines[i] * 12 + 25;
+        fHeight += iNumLines[i] * 12 + 25 * cgs.uiHiResScale[1];
     }
 }
 
@@ -820,7 +841,17 @@ void CG_DrawPlayerTeam()
 
     if (handle) {
         cgi.R_SetColor(NULL);
-        cgi.R_DrawStretchPic(96.0, cgs.glconfig.vidHeight - 46, 24.0, 24.0, 0.0, 0.0, 1.0, 1.0, handle);
+        cgi.R_DrawStretchPic(
+            96.0 * cgs.uiHiResScale[0],
+            cgs.glconfig.vidHeight - 46 * cgs.uiHiResScale[1],
+            24.0 * cgs.uiHiResScale[0],
+            24.0 * cgs.uiHiResScale[1],
+            0.0,
+            0.0,
+            1.0,
+            1.0,
+            handle
+        );
     }
 }
 
@@ -862,13 +893,12 @@ void CG_DrawPlayerEntInfo()
 
     if (handle) {
         cgi.R_SetColor(0);
-        cgi.R_DrawStretchPic(56.0, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, handle);
-        fX = 56.0 + 24.0;
+        cgi.R_DrawStretchPic(fX, fY, 16.0 * cgs.uiHiResScale[0], 16.0 * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle);
     }
 
     cgi.R_SetColor(color);
-    cgi.R_DrawString(cgs.media.hudDrawFont, (char *)pszName, fX, fY, -1, 0);
-    cgi.R_DrawString(cgs.media.hudDrawFont, va("%i", cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]), fX, fY + 20.0, -1, 0);
+    cgi.R_DrawString(cgs.media.hudDrawFont, (char *)pszName, fX / cgs.uiHiResScale[0] + 24.0, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+    cgi.R_DrawString(cgs.media.hudDrawFont, va("%i", cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]), fX / cgs.uiHiResScale[0] + 24.0, fY / cgs.uiHiResScale[1] + 20.0, -1, cgs.uiHiResScale);
 }
 
 void CG_UpdateAttackerDisplay()
@@ -907,7 +937,17 @@ void CG_UpdateAttackerDisplay()
 
         if (handle) {
             cgi.R_SetColor(0);
-            cgi.R_DrawStretchPic(56.0, fY, 24.0, 24.0, 0.0, 0.0, 1.0, 1.0, handle);
+            cgi.R_DrawStretchPic(
+                56.0 * cgs.uiHiResScale[0],
+                fY,
+                24.0 * cgs.uiHiResScale[0],
+                24.0 * cgs.uiHiResScale[1],
+                0.0,
+                0.0,
+                1.0,
+                1.0,
+                handle
+            );
         }
 
         if ((cg.snap->ps.stats[STAT_TEAM] == TEAM_ALLIES || cg.snap->ps.stats[STAT_TEAM] == TEAM_AXIS)
@@ -921,7 +961,7 @@ void CG_UpdateAttackerDisplay()
             color[2] = 0.5;
         }
 
-        fX = 56.0 + 32.0;
+        fX = 56.0;
     } else {
         color[0] = 1.0;
         color[1] = 0.5;
@@ -929,7 +969,7 @@ void CG_UpdateAttackerDisplay()
     }
 
     cgi.R_SetColor(color);
-    cgi.R_DrawString(cgs.media.attackerFont, pszName, fX, fY, -1, 0);
+    cgi.R_DrawString(cgs.media.attackerFont, pszName, fX / cgs.uiHiResScale[0] + 32.0, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
 }
 
 void CG_UpdateCountdown()
@@ -1043,7 +1083,7 @@ void CG_DrawInstantMessageMenu()
     x = 8.0;
     y = ((float)cgs.glconfig.vidHeight - h) * 0.5;
     cgi.R_SetColor(0);
-    cgi.R_DrawStretchPic(x, y, w, h, 0.0, 0.0, 1.0, 1.0, handle);
+    cgi.R_DrawStretchPic(x * cgs.uiHiResScale[0], y, w * cgs.uiHiResScale[0], h * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle);
 }
 
 void CG_DrawSpectatorView_ver_15()
@@ -1069,7 +1109,7 @@ void CG_DrawSpectatorView_ver_15()
         fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
         fY = cgs.glconfig.vidHeight - 64.0;
         cgi.R_SetColor(NULL);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, qfalse);
+        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
     }
 
     if (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) {
@@ -1085,7 +1125,7 @@ void CG_DrawSpectatorView_ver_15()
         fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
         fY = (float)cgs.glconfig.vidHeight - 40.0;
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
     }
 
     if (!bOnTeam && (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
@@ -1096,7 +1136,7 @@ void CG_DrawSpectatorView_ver_15()
         fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
         fY = (float)cgs.glconfig.vidHeight - 24.0;
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
     }
 
     if (!(cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
@@ -1109,10 +1149,10 @@ void CG_DrawSpectatorView_ver_15()
         fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
         fY = (float)cgs.glconfig.vidHeight - 24.0;
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
     }
 
-    if ((cg.predicted_player_state.pm_flags & 0x80) != 0 && cg.snap && cg.snap->ps.stats[STAT_INFOCLIENT] != -1) {
+    if ((cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) != 0 && cg.snap && cg.snap->ps.stats[STAT_INFOCLIENT] != -1) {
         int       iClientNum;
         qhandle_t hShader;
         vec4_t    color;
@@ -1130,7 +1170,7 @@ void CG_DrawSpectatorView_ver_15()
         fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) - 16) * 0.5;
         fY = (float)cgs.glconfig.vidHeight - 80.0;
         cgi.R_SetColor(color);
-        cgi.R_DrawString(cgs.media.attackerFont, buf, fX, fY, -1, 0);
+        cgi.R_DrawString(cgs.media.attackerFont, buf, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
 
         if (cg.clientinfo[iClientNum].team == TEAM_ALLIES) {
             hShader = cgi.R_RegisterShader("textures/hud/allies");
@@ -1139,9 +1179,18 @@ void CG_DrawSpectatorView_ver_15()
         }
 
         if (hShader) {
-            fX -= 20.0;
             cgi.R_SetColor(NULL);
-            cgi.R_DrawStretchPic(fX, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, hShader);
+            cgi.R_DrawStretchPic(
+                fX - 20.0 * cgs.uiHiResScale[0],
+                fY,
+                16.0 * cgs.uiHiResScale[0],
+                16.0 * cgs.uiHiResScale[1],
+                0.0,
+                0.0,
+                1.0,
+                1.0,
+                hShader
+            );
         }
     }
 }
@@ -1176,7 +1225,7 @@ void CG_DrawSpectatorView_ver_6()
     fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
     fY = (float)cgs.glconfig.vidHeight - 40.0;
     cgi.R_SetColor(0);
-    cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+    cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
 
     if (!bOnTeam && (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
         cgi.Key_GetKeysForCommand("+moveup", &iKey1, &iKey2);
@@ -1190,7 +1239,7 @@ void CG_DrawSpectatorView_ver_6()
         fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
         fY = (float)cgs.glconfig.vidHeight - 24.0;
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
     }
 }
 
@@ -1287,7 +1336,17 @@ void CG_DrawCrosshair()
         y      = (cgs.glconfig.vidHeight - height) * 0.5f;
 
         cgi.R_SetColor(NULL);
-        cgi.R_DrawStretchPic(x, y, width, height, 0, 0, 1, 1, shader);
+        cgi.R_DrawStretchPic(
+            x,
+            y,
+            width * cgs.uiHiResScale[0],
+            height * cgs.uiHiResScale[1],
+            0,
+            0,
+            1,
+            1,
+            shader
+        );
     }
 }
 
@@ -1324,7 +1383,7 @@ void CG_DrawVote()
     cgi.R_SetColor(NULL);
 
     text = va("%s: %s", cgi.LV_ConvertString("Vote Running"), cgs.voteString);
-    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, qfalse);
+    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
 
     y += 12;
 
@@ -1338,7 +1397,7 @@ void CG_DrawVote()
            percentNo,
            cgi.LV_ConvertString("Undecided"),
            percentUndecided);
-    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, qfalse);
+    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
 
     if (cg.snap && !cg.snap->ps.voted) {
         col[0] = 0.5;
@@ -1350,12 +1409,12 @@ void CG_DrawVote()
         y += 12;
 
         text = cgi.LV_ConvertString("Vote now, it's your patriotic duty!");
-        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, qfalse);
+        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
 
         y += 12;
 
         text = cgi.LV_ConvertString("To vote Yes, press F1. To vote No, press F2.");
-        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, qfalse);
+        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
         cgi.R_SetColor(NULL);
     }
 }
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 05a3ef61..313c0c1a 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -380,6 +380,7 @@ extern "C" {
         float       screenXScale; // derived from glconfig
         float       screenYScale;
         float       screenXBias;
+        vec2_t      uiHiResScale;
 
         int serverCommandSequence; // reliable command stream counter
         int processedSnapshotNum;  // the number of snapshots cgame has requested
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 6b00d8e1..17468f3b 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -570,6 +570,7 @@ void CG_GetRendererConfig(void)
     cgi.GetGlconfig(&cgs.glconfig);
     cgs.screenXScale = cgs.glconfig.vidWidth / 640.0;
     cgs.screenYScale = cgs.glconfig.vidHeight / 480.0;
+    cgi.UI_GetHighResolutionScale(&cgs.uiHiResScale);
 }
 
 /*
diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index b1e76f85..7d01c86c 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -312,7 +312,7 @@ functions exported to the main executable
         ); // 0 = white
         fontheader_t *(*R_LoadFont)(const char *name);
         void (*R_DrawString)(
-            fontheader_t *font, const char *text, float x, float y, int maxLen, qboolean virtualScreen
+            fontheader_t *font, const char *text, float x, float y, int maxLen, const float *pvVirtualScreen
         );
         refEntity_t *(*R_GetRenderEntity)(int entityNumber);
         void (*R_ModelBounds)(clipHandle_t model, vec3_t mins, vec3_t maxs);
@@ -363,6 +363,7 @@ functions exported to the main executable
         int (*UI_FontStringWidth)(fontheader_t *font, const char *string, int maxLen);
         // Added in 2.0
         float (*UI_GetObjectivesTop)(void);
+        void (*UI_GetHighResolutionScale)(vec2_t scale);
 
         int (*Key_StringToKeynum)(const char *str);
         const char *(*Key_KeynumToBindString)(int keyNum);
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 89d6c093..16454809 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -774,6 +774,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->UI_HideMenu				= UI_HideMenu;
 	cgi->UI_FontStringWidth			= CL_FontStringWidth;
 	cgi->UI_GetObjectivesTop		= UI_GetObjectivesTop;
+	cgi->UI_GetHighResolutionScale  = UI_GetHighResolutionScale;
 	cgi->Key_StringToKeynum			= Key_StringToKeynum;
 	cgi->Key_KeynumToBindString		= Key_KeynumToBindString;
 	cgi->Key_GetKeysForCommand		= Key_GetKeysForCommand;
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index f66a1d18..abfdcf22 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1009,7 +1009,7 @@ static UIRect2D getQuickMessageDMConsoleRectangle(void)
         //  Was 38.0 in 1.11 and below
         //  This prevents characters to be seen from the DM console
         //  in the quick message console
-        rect.size.height = 36.0;
+        rect.size.height = 36.0 * uid.scaleRes[1];
     }
 
     return rect;
@@ -1196,7 +1196,7 @@ static UIRect2D getDefaultGMBoxRectangle(void)
         height = y;
     }
 
-    return UIRect2D(20.0f, height, uid.vidWidth - 20, 128.0f);
+    return UIRect2D(20.0f, height, (uid.vidWidth - 20) * uid.scaleRes[0], 128.0f * uid.scaleRes[1]);
 }
 
 /*
@@ -1206,9 +1206,9 @@ getDefaultDMBoxRectangle
 */
 static UIRect2D getDefaultDMBoxRectangle(void)
 {
-    float width = uid.vidWidth * ui_compass_scale->value * 0.2f;
+    float width = uid.vidWidth * uid.scaleRes[0] * ui_compass_scale->value * 0.2f;
 
-    return UIRect2D(width, 0, uid.vidWidth - (width + 192.0f), 120.0f);
+    return UIRect2D(width, 0, (uid.vidWidth - (width + 192.0f)) * uid.scaleRes[0], 120.0f * uid.scaleRes[1]);
 }
 
 /*
@@ -1221,6 +1221,21 @@ float UI_GetObjectivesTop(void)
     return getDefaultGMBoxRectangle().pos.y;
 }
 
+/*
+====================
+UI_GetObjectivesTop
+====================
+*/
+void UI_GetHighResolutionScale(vec2_t scale)
+{
+    if (uid.bHighResScaling) {
+        scale[0] = uid.scaleRes[0];
+        scale[1] = uid.scaleRes[1];
+    } else {
+        scale[0] = scale[1] = 1.0;
+    }
+}
+
 /*
 ====================
 UI_ShowHudList
@@ -3831,6 +3846,8 @@ UI_ResolutionChange
 void UI_ResolutionChange(void)
 {
     UIRect2D frame;
+    const float maxWidthRes = 1920;
+    const float maxHeightRes = 1080;
 
     if (com_target_game->integer >= TG_MOHTA) {
         ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
@@ -3842,6 +3859,22 @@ void UI_ResolutionChange(void)
     CL_FillUIImports();
     CL_FillUIDef();
 
+    // Added in OPM
+    //  Scaling for high resolutions
+    if (uid.vidWidth > maxWidthRes && uid.vidHeight > maxHeightRes) {
+        const float vidRatio = (float)uid.vidWidth / (float)uid.vidHeight;
+
+        uid.scaleRes[0] = (float)uid.vidWidth / (maxHeightRes * vidRatio);
+        uid.scaleRes[1] = (float)uid.vidHeight / maxHeightRes;
+        //uid.scaleRes[0] = (float)uid.vidWidth / maxWidthRes;
+        //uid.scaleRes[1] = (float)uid.vidHeight / maxHeightRes;
+        uid.bHighResScaling = qtrue;
+    } else {
+        uid.scaleRes[0] = 1;
+        uid.scaleRes[1] = 1;
+        uid.bHighResScaling = qfalse;
+    }
+
     if (!uie.ResolutionChange) {
         return;
     }
@@ -4409,7 +4442,7 @@ void ScoreboardListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
 {
     DrawBox(drawRect, backColor, 1.0);
     pFont->setColor(textColor);
-    pFont->Print(drawRect.pos.x + 1, drawRect.pos.y, Sys_LV_CL_ConvertString(getListItemString(iColumn)), -1, qfalse);
+    pFont->Print((drawRect.pos.x + 1) / uid.scaleRes[0], drawRect.pos.y / uid.scaleRes[1], Sys_LV_CL_ConvertString(getListItemString(iColumn)), -1, uid.scaleRes);
 
     if (bTitleItem) {
         UIRect2D lineRect;
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index fce7c3b7..60da029e 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -57,6 +57,7 @@ void        UI_ClearState(void);
 void        CL_BeginRegistration(void);
 void        CL_EndRegistration(void);
 float       UI_GetObjectivesTop(void);
+void        UI_GetHighResolutionScale(vec2_t scale);
 
 //
 // menu
diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 95fc1ec5..98e49fb6 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -266,15 +266,15 @@ float UIDMBox::PrintWrap( UIFont *font, float x, float y, str text )
 			break;
 		}
 
-		font->Print(x, fY, p1, p2 - p1, qfalse);
+		font->Print(x, fY, p1, p2 - p1, getHighResScale());
 		p1 = p2 + 1;
 		l -= n;
-		fY += font->getHeight(qfalse);
+		fY += font->getHeight();
 	}
 
-	font->Print(x, fY, p1, l, qfalse);
+	font->Print(x, fY, p1, l, getHighResScale());
 
-	return font->getHeight(qfalse) + (fY - y);
+	return font->getHeight() + (fY - y);
 }
 
 float UIDMBox::DrawItem( item_t *in, float x, float y, float alpha )
diff --git a/code/client/cl_uigmbox.cpp b/code/client/cl_uigmbox.cpp
index 5266a01f..8823fa56 100644
--- a/code/client/cl_uigmbox.cpp
+++ b/code/client/cl_uigmbox.cpp
@@ -260,15 +260,15 @@ float UIGMBox::PrintWrap( UIFont *font, float x, float y, str text )
 			break;
 		}
 
-		font->Print(x, fY, p1, p2 - p1, qfalse);
+		font->Print(x, fY, p1, p2 - p1, getHighResScale());
 		p1 = p2 + 1;
 		l -= n;
-		fY += font->getHeight(qfalse);
+		fY += font->getHeight();
 	}
 
-	font->Print(x, fY, p1, l, qfalse);
+	font->Print(x, fY, p1, l, getHighResScale());
 
-	return font->getHeight(qfalse) + (fY - y);
+	return font->getHeight() + (fY - y);
 }
 
 float UIGMBox::DrawItem( item_t *in, float x, float y, float alpha )
diff --git a/code/client/cl_uiminicon.cpp b/code/client/cl_uiminicon.cpp
index d0d02723..c1c8e6db 100644
--- a/code/client/cl_uiminicon.cpp
+++ b/code/client/cl_uiminicon.cpp
@@ -112,7 +112,7 @@ void FakkMiniconsole::PostMoveinEvent(void)
 
 void FakkMiniconsole::OnSizeChanged(Event *ev)
 {
-    m_maxlines = m_frame.size.height / m_font->getHeight(false);
+    m_maxlines = m_frame.size.height / m_font->getHeight(getHighResScale());
 }
 
 void FakkMiniconsole::MoveInEvent(Event *ev)
@@ -163,14 +163,14 @@ void FakkMiniconsole::Draw(void)
     HandleBoxMoving();
 
     m_font->setColor(m_foreground_color);
-    aty = m_frame.size.height - m_font->getHeight(false);
+    aty = m_frame.size.height - m_font->getHeight(getHighResScale());
     for (i = m_lines.NumObjects(); i > 0; i--) {
-        if (-m_font->getHeight(false) >= aty) {
+        if (-m_font->getHeight(getHighResScale()) >= aty) {
             break;
         }
 
-        m_font->Print(0, aty, m_lines.ObjectAt(i), -1, false);
-        aty -= m_font->getHeight(false);
+        m_font->Print(0, aty / getHighResScale()[1], m_lines.ObjectAt(i), -1, getHighResScale());
+        aty -= m_font->getHeight(getHighResScale());
     }
 }
 
diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index c40716c7..eca7fde8 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -177,6 +177,9 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
         newRect.size.height *= uid.vidHeight / 768;
     }
     */
+
+    virtualScale[0] = m_parent->getHighResScale()[0];
+    virtualScale[1] = m_parent->getHighResScale()[1];
     
     if (!pColoringType->integer) {
         if (IfQueryFailed() || (IsDifferentVersion() && IsQueried())) {
@@ -210,7 +213,7 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
             newRect.pos.y / virtualScale[1],
             getListItemString(iColumn).c_str(),
             -1,
-            false //m_parent->isVirtual()
+            virtualScale
         );
     } else {
         if (IsDifferentVersion()) {
@@ -266,7 +269,7 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
                 newRect.pos.y / virtualScale[1],
                 getListItemString(iColumn).c_str(),
                 -1,
-                false //m_parent->isVirtual()
+                virtualScale
             );
 
             if (IsDifferentVersion()) {
diff --git a/code/client/cl_uistd.cpp b/code/client/cl_uistd.cpp
index 639881f8..4fd41c6e 100644
--- a/code/client/cl_uistd.cpp
+++ b/code/client/cl_uistd.cpp
@@ -443,6 +443,7 @@ void UIFakkLabel::DrawStatbar(float frac)
     float     alpha;
     qhandle_t hMat;
     float     w, h;
+    float     fvWidth, fvHeight;
 
     col[0] = col[1] = col[2] = col[3] = 1.0;
 
@@ -488,11 +489,20 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     float width = frac * m_frame.size.width;
 
-                    re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material->GetMaterial());
+                    fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material->GetMaterial());
+                    fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material->GetMaterial());
+
+                    re.DrawStretchPic(0.0, 0.0, width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material->GetMaterial());
+                    //re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material->GetMaterial());
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
+
+                        fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material_flash->GetMaterial());
+                        fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material_flash->GetMaterial());
+
+                        re.DrawStretchPic(0.0, 0.0, width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material_flash->GetMaterial());
+                        //re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
                     }
 
                     if (m_statbar_material_marker) {
@@ -521,13 +531,22 @@ void UIFakkLabel::DrawStatbar(float frac)
                 {
                     float y = m_frame.size.height * (1.0 - frac);
 
-                    re.DrawTilePic(0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material->GetMaterial());
+                    fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material->GetMaterial());
+                    fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material->GetMaterial());
+
+                    re.DrawStretchPic(0.0, y, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material->GetMaterial());
+                    //re.DrawTilePic(0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material->GetMaterial());
 
                     if (alpha != 0.0 && m_statbar_material_flash) {
                         re.SetColor(col);
-                        re.DrawTilePic(
-                            0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial()
-                        );
+
+                        fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material_flash->GetMaterial());
+                        fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material_flash->GetMaterial());
+
+                        re.DrawStretchPic(0.0, y, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material_flash->GetMaterial());
+                        //re.DrawTilePic(
+                        //    0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial()
+                        //);
                     }
 
                     if (m_statbar_material_marker) {
@@ -961,8 +980,8 @@ void UIFakkLabel::DrawStatRotator(float frac)
     vNeedleDir[0] = fSinVal;
     vNeedleDir[1] = -fCosVal;
 
-    vSize[0] = (m_frame.size.width + m_frame.size.height) / m_frame.size.width * m_angles[2] * m_vVirtualScale[0];
-    vSize[1] = (m_frame.size.width + m_frame.size.height) / m_frame.size.height * m_scale * m_vVirtualScale[1];
+    vSize[0] = (m_frame.size.width + m_frame.size.height) / m_frame.size.width * m_angles[2] * getVirtualScale()[0];
+    vSize[1] = (m_frame.size.width + m_frame.size.height) / m_frame.size.height * m_scale * getVirtualScale()[1];
 
     vCenter[0] = (m_frame.size.width * 0.5f - vSize[0]) * vNeedleDir[0] + m_frame.size.width * 0.5f;
     vCenter[1] = (m_frame.size.height * 0.5f - vSize[1]) * vNeedleDir[1] + m_frame.size.height * 0.5f;
@@ -1357,7 +1376,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(cl.snap.ps.stats[m_stat_configstring]))),
                 UBlack,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         } else {
             m_font->PrintJustified(
@@ -1365,7 +1384,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentHorizontal,
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(cl.snap.ps.stats[m_stat_configstring]))),
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         }
         return;
@@ -1384,7 +1403,7 @@ void UIFakkLabel::Draw(void)
                     m_iFontAlignmentVertical,
                     va("%d", delta),
                     UBlack,
-                    m_bVirtual ? m_vVirtualScale : NULL
+                    getVirtualScale()
                 );
             } else {
                 m_font->PrintJustified(
@@ -1392,7 +1411,7 @@ void UIFakkLabel::Draw(void)
                     m_iFontAlignmentHorizontal,
                     m_iFontAlignmentVertical,
                     va("%d", delta),
-                    m_bVirtual ? m_vVirtualScale : NULL
+                    getVirtualScale()
                 );
             }
             return;
@@ -1478,7 +1497,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[m_itemindex]))),
                 UBlack,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         } else {
             m_font->PrintJustified(
@@ -1486,7 +1505,7 @@ void UIFakkLabel::Draw(void)
                 m_iFontAlignmentHorizontal,
                 m_iFontAlignmentVertical,
                 Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[m_itemindex]))),
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         }
 
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 234e89a7..98440439 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -124,9 +124,9 @@ void View3D::DrawFPS(void)
         re.SetColor(UBlack);
         re.DrawBox(
             0.0,
-            m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 4.0,
+            m_frame.pos.y + m_frame.size.height - m_font->getHeight() * 4.0,
             m_frame.pos.x + m_frame.size.width,
-            m_font->getHeight(qfalse) * 4.0
+            m_font->getHeight() * 4.0
         );
     }
 
@@ -145,11 +145,11 @@ void View3D::DrawFPS(void)
     }
 
     m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 3.0,
+        m_font->getHeight(getHighResScale()) * 10.0 / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale()) * 3.0) / getHighResScale()[1],
         string,
         -1,
-        qfalse
+        getHighResScale()
     );
 
     // Draw elements count
@@ -162,11 +162,11 @@ void View3D::DrawFPS(void)
     Com_sprintf(string, sizeof(string), "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
 
     m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 2.0,
+        (m_font->getHeight(getHighResScale()) * 10.0) / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale()) * 2.0) / getHighResScale()[1],
         string,
         -1,
-        qfalse
+        getHighResScale()
     );
 
     Com_sprintf(
@@ -179,11 +179,11 @@ void View3D::DrawFPS(void)
     );
 
     m_font->Print(
-        m_font->getHeight(qfalse) * 10.0,
-        m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse),
+        (m_font->getHeight(getHighResScale()) * 10.0) / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale())) / getHighResScale()[1],
         string,
         -1,
-        qfalse
+        getHighResScale()
     );
 
     m_font->setColor(UBlack);
@@ -208,32 +208,32 @@ void View3D::PrintSound(int channel, const char *name, float vol, int rvol, floa
     float xStep;
     float height;
 
-    height = m_font->getHeight(false);
+    height = m_font->getHeight(getHighResScale());
     xStep  = height;
 
     x = 0;
     Com_sprintf(buf, sizeof(buf), "%d", channel);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
 
     x += xStep + xStep;
     Com_sprintf(buf, sizeof(buf), "%s", name);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
 
     x += xStep * 30.0;
     Com_sprintf(buf, sizeof(buf), "vol:%.2f", vol);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
 
     x += xStep * 8;
     Com_sprintf(buf, sizeof(buf), "rvol:%.2f", (float)(rvol / 128.f));
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
 
     x += xStep * 5;
     Com_sprintf(buf, sizeof(buf), "pit:%.2f", pitch);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
 
     x += xStep * 5;
     Com_sprintf(buf, sizeof(buf), "base:%d", (int)base);
-    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, false);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
 
     line++;
 }
@@ -264,8 +264,7 @@ void DisplayServerNetProfileInfo(UIFont *font, float y, netprofclient_t *netprof
            (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented)
                           / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
            )),
-        -1,
-        qfalse
+        -1
     );
     font->Print(334, y, va("%i", netprofile->inPackets.percentDropped));
     font->Print(364, y, va("%i", netprofile->outPackets.percentDropped));
@@ -276,8 +275,7 @@ void DisplayServerNetProfileInfo(UIFont *font, float y, netprofclient_t *netprof
            (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped)
                           / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
            )),
-        -1,
-        qfalse
+        -1
     );
     font->Print(434, y, va("%i", netprofile->inPackets.percentDropped));
     font->Print(464, y, va("%i", netprofile->outPackets.percentDropped));
@@ -288,8 +286,7 @@ void DisplayServerNetProfileInfo(UIFont *font, float y, netprofclient_t *netprof
            (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess
                                   + netprofile->inPackets.totalLengthConnectionLess)
                           / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize))),
-        -1,
-        qfalse
+        -1
     );
     font->Print(534, y, va("%i", netprofile->inPackets.bytesPerSec));
     font->Print(594, y, va("%i", netprofile->outPackets.bytesPerSec));
@@ -303,7 +300,7 @@ void DisplayClientNetProfile(UIFont *font, float x, float y, netprofclient_t *ne
     float fontHeight;
     float columnHeight;
 
-    fontHeight   = font->getHeight(qfalse);
+    fontHeight   = font->getHeight();
     columns[0]   = x + 120;
     columns[1]   = x + 230;
     columns[2]   = x + 330;
@@ -402,13 +399,13 @@ void View3D::DrawNetProfile(void)
         setFont("verdana-14");
         m_font->setColor(UWhite);
 
-        fontHeight = m_font->getHeight(qfalse);
+        fontHeight = m_font->getHeight();
         yOffset    = sv_netprofileoverlay->integer + 8;
 
         if (svs.netprofile.rate) {
-            m_font->Print(8, yOffset, va("Server Net Profile          Max Rate: %i", svs.netprofile.rate), -1, qfalse);
+            m_font->Print(8, yOffset, va("Server Net Profile          Max Rate: %i", svs.netprofile.rate), -1);
         } else {
-            m_font->Print(8, yOffset, "Server Net Profile          Max Rate: none", -1, qfalse);
+            m_font->Print(8, yOffset, "Server Net Profile          Max Rate: none", -1);
         }
 
         columnHeight    = fontHeight + fontHeight + yOffset;
@@ -487,10 +484,10 @@ void View3D::DrawNetProfile(void)
         setFont("verdana-14");
         m_font->setColor(UWhite);
 
-        fontHeight = m_font->getHeight(qfalse);
+        fontHeight = m_font->getHeight();
         yOffset    = cl_netprofileoverlay->integer + 16;
 
-        m_font->Print(16, yOffset, "Client Net Profile", -1, qfalse);
+        m_font->Print(16, yOffset, "Client Net Profile", -1);
 
         NetProfileCalcStats(&cls.netprofile.outPackets, 500);
         NetProfileCalcStats(&cls.netprofile.inPackets, 500);
@@ -567,7 +564,7 @@ void View3D::CenterPrint(void)
             m_iFontAlignmentHorizontal,
             m_iFontAlignmentVertical,
             p,
-            m_bVirtual ? m_vVirtualScale : NULL
+            getVirtualScale()
         );
 
         m_font->setColor(UColor(1, 1, 1, alpha));
@@ -575,7 +572,7 @@ void View3D::CenterPrint(void)
         frame = getClientFrame();
 
         m_font->PrintJustified(
-            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, m_bVirtual ? m_vVirtualScale : NULL
+            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, getVirtualScale()
         );
 
         m_font->setColor(UBlack);
@@ -628,7 +625,7 @@ void View3D::LocationPrint(void)
     alpha = Q_clamp_float(alpha, 0, 1);
 
     x = m_x_coord / 640.f * m_screenframe.size.width;
-    y = (480 - m_font->getHeight(false) - m_y_coord) / 480.f * m_screenframe.size.height;
+    y = (480 - m_font->getHeight(getHighResScale()) - m_y_coord) / 480.f * m_screenframe.size.height;
 
     if (m_x_coord == -1) {
         horiz = FONT_JUSTHORZ_CENTER;
@@ -647,7 +644,7 @@ void View3D::LocationPrint(void)
         horiz,
         vert,
         p,
-        m_bVirtual ? m_vVirtualScale : NULL
+        getVirtualScale()
     );
 
     m_font->setColor(UColor(1, 1, 1, alpha));
@@ -658,7 +655,7 @@ void View3D::LocationPrint(void)
         horiz,
         vert,
         p,
-        m_bVirtual ? m_vVirtualScale : NULL
+        getVirtualScale()
     );
 
     m_font->setColor(UBlack);
@@ -746,7 +743,7 @@ void View3D::DrawSubtitleOverlay(void)
 {
     cvar_t *subAlpha;
     int     i;
-    float   minX, maxY;
+    float   minX, maxX;
     int     line;
 
     subAlpha = Cvar_Get("subAlpha", "0.5", 0);
@@ -781,8 +778,8 @@ void View3D::DrawSubtitleOverlay(void)
         }
     }
 
-    minX = m_screenframe.size.height - m_font->getHeight(false) * 10;
-    maxY = (m_frame.pos.x + m_frame.size.width) - (m_frame.pos.x + m_frame.size.width) * 0.2f;
+    minX = m_screenframe.size.height - m_font->getHeight(getHighResScale()) * 10;
+    maxX = ((m_frame.pos.x + m_frame.size.width) - (m_frame.pos.x + m_frame.size.width) * 0.2f) / getHighResScale()[0];
     line = 0;
 
     for (i = 0; i < MAX_SUBTITLES; i++) {
@@ -790,7 +787,7 @@ void View3D::DrawSubtitleOverlay(void)
             continue;
         }
 
-        if (m_font->getWidth(subs[i]->string, sizeof(oldStrings[i])) > maxY) {
+        if (m_font->getWidth(subs[i]->string, sizeof(oldStrings[i])) > maxX) {
             char  buf[2048];
             char *c;
             char *end;
@@ -813,12 +810,12 @@ void View3D::DrawSubtitleOverlay(void)
 
                 width = m_font->getWidth(c, blockcount);
 
-                if (total + width > maxY) {
+                if (total + width > maxX) {
                     m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-                    m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, buf, -1, false);
+                    m_font->Print(18, (m_font->getHeight(getHighResScale()) * line + minX + 1.f) / getHighResScale()[1], buf, -1, getHighResScale());
 
                     m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-                    m_font->Print(20, m_font->getHeight(false) * line + minX, buf, -1, false);
+                    m_font->Print(20, (m_font->getHeight(getHighResScale()) * line + minX) / getHighResScale()[1], buf, -1, getHighResScale());
 
                     line++;
 
@@ -841,17 +838,17 @@ void View3D::DrawSubtitleOverlay(void)
             }
 
             m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-            m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, buf, -1, qfalse);
+            m_font->Print(18, (m_font->getHeight(getHighResScale()) * line + minX + 1.f) / getHighResScale()[1], buf, -1, getHighResScale());
 
             m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-            m_font->Print(20, m_font->getHeight(false) * line + minX, buf, -1, qfalse);
+            m_font->Print(20, (m_font->getHeight(getHighResScale()) * line + minX) / getHighResScale()[1], buf, -1, getHighResScale());
             line++;
         } else {
             m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
-            m_font->Print(18, m_font->getHeight(false) * line + minX + 1.f, subs[i]->string, -1, qfalse);
+            m_font->Print(18, (m_font->getHeight(getHighResScale()) * line + minX + 1.f) / getHighResScale()[1], subs[i]->string, -1, getHighResScale());
 
             m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
-            m_font->Print(20, m_font->getHeight(false) * line + minX, subs[i]->string, -1, qfalse);
+            m_font->Print(20, (m_font->getHeight(getHighResScale()) * line + minX) / getHighResScale()[1], subs[i]->string, -1, getHighResScale());
 
             line++;
         }
diff --git a/code/renderer/tr_font.cpp b/code/renderer/tr_font.cpp
index 3f6e8d26..ecc1d1aa 100644
--- a/code/renderer/tr_font.cpp
+++ b/code/renderer/tr_font.cpp
@@ -525,7 +525,7 @@ void R_LoadFontShader(fontheader_sgl_t* font)
     }
 }
 
-void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen) {
+void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
     float charHeight;
     float startx, starty;
     int i;
@@ -534,8 +534,19 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
     i = 0;
     startx = x;
     starty = y;
-    fWidthScale = (double)glConfig.vidWidth / 640.0;
-    fHeightScale = (double)glConfig.vidHeight / 480.0;
+    if (pvVirtualScreen) {
+        if (pvVirtualScreen[0]) {
+            fWidthScale = pvVirtualScreen[0];
+        } else {
+            fWidthScale = (double)glConfig.vidWidth / 640.0;
+        }
+
+        if (pvVirtualScreen[1]) {
+            fHeightScale = pvVirtualScreen[1];
+        } else {
+            fHeightScale = (double)glConfig.vidHeight / 480.0;
+        }
+    }
 
     if (!font) {
         return;
@@ -636,7 +647,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
             tess.indexes[tess.numIndexes + 4] = tess.numVertexes + 3;
             tess.indexes[tess.numIndexes + 5] = tess.numVertexes + 2;
 
-            if (bVirtualScreen)
+            if (pvVirtualScreen)
             {
                 // scale the string properly if virtual screen
                 tess.xyz[tess.numVertexes][0] *= fWidthScale;
@@ -659,7 +670,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
     RB_EndSurface();
 }
 
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen) {
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
     int i;
     int code;
     unsigned short uch;
@@ -671,7 +682,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     
     if (!font->numPages) {
         if (font->sgl[0]) {
-            R_DrawString_sgl(font->sgl[0], text, x, y, maxlen, bVirtualScreen);
+            R_DrawString_sgl(font->sgl[0], text, x, y, maxlen, pvVirtualScreen);
         }
         return;
     }
@@ -704,7 +715,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
 
         if (uch == '\n' || uch == '\r') {
             buffer[buflen] = 0;
-            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, bVirtualScreen);
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
             
             curX = x;
             curHeight = 0.f;
@@ -728,7 +739,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
         ct = &font->charTable[code];
         if (cursgl != ct->index || buflen >= ARRAY_LEN(buffer) - 2) {
             buffer[buflen] = 0;
-            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, bVirtualScreen);
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
 
             curX += curHeight;
             curHeight = 0.f;
@@ -744,7 +755,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     if (buflen)
     {
         buffer[buflen] = 0;
-        R_DrawString_sgl(font->sgl[cursgl], buffer, curX, y, buflen, bVirtualScreen);
+        R_DrawString_sgl(font->sgl[cursgl], buffer, curX, y, buflen, pvVirtualScreen);
     }
 }
 
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index fd014422..c7a44adf 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -2084,7 +2084,7 @@ FONT
 */
 fontheader_t* R_LoadFont(const char* name);
 void R_LoadFontShader(fontheader_sgl_t* font);
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen);
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
 void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
 float R_GetFontHeight(const fontheader_t* font);
 float R_GetFontStringWidth(const fontheader_t* font, const char* s);
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index 507b2075..31d01f69 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -152,7 +152,7 @@ typedef struct {
     float   (*ModelRadius)(qhandle_t handle);
 
     dtiki_t*        (*R_Model_GetHandle)(qhandle_t handle);
-    void            (*DrawString)(fontheader_t* font, const char* text, float x, float y, int maxLen, qboolean virtualScreen);
+    void            (*DrawString)(fontheader_t* font, const char* text, float x, float y, int maxLen, const float *pvVirtualScreen);
     float           (*GetFontHeight)(const fontheader_t* font);
     float           (*GetFontStringWidth)(const fontheader_t* font, const char* string);
     fontheader_t*   (*LoadFont)(const char* name);
diff --git a/code/uilib/ui_public.h b/code/uilib/ui_public.h
index a30b5bcb..9547e57b 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -80,7 +80,7 @@ typedef struct uiimport_s {
 	void( *Rend_DrawPicStretched2 )( float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader );
 	void( *Rend_DrawPicTiled )( float x, float y, float w, float h, qhandle_t hShader );
 	fontheader_t *( *Rend_LoadFont )( const char *name );
-	void( *Rend_DrawString )( fontheader_t *font, const char *text, float x, float y, int maxlen, qboolean bVirtualScreen );
+	void( *Rend_DrawString )( fontheader_t *font, const char *text, float x, float y, int maxlen, const float *pvVirtualScreen );
 	void( *Rend_DrawBox )( float x, float y, float w, float h );
 	int( *Rend_GetShaderWidth )( qhandle_t hShader );
 	int( *Rend_GetShaderHeight )( qhandle_t hShader );
@@ -162,7 +162,9 @@ typedef struct uidef_s {
 	int mouseX;
 	int mouseY;
 	unsigned int mouseFlags;
-	int uiHasMouse;
+    qboolean uiHasMouse;
+    qboolean bHighResScaling;
+    vec2_t scaleRes;
 } uidef_t;
 
 extern uidef_t uid;
diff --git a/code/uilib/uibutton.cpp b/code/uilib/uibutton.cpp
index 9d8877fa..eeb29f45 100644
--- a/code/uilib/uibutton.cpp
+++ b/code/uilib/uibutton.cpp
@@ -258,7 +258,7 @@ void UIButton::DrawPressed
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(m_title.c_str()),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 }
 
@@ -278,7 +278,7 @@ void UIButton::DrawUnpressed
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(m_title.c_str()),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 }
 
diff --git a/code/uilib/uiconsole.cpp b/code/uilib/uiconsole.cpp
index 00aaa915..24cfb5c1 100644
--- a/code/uilib/uiconsole.cpp
+++ b/code/uilib/uiconsole.cpp
@@ -155,13 +155,15 @@ void UIConsole::DrawBottomLine
 	int promptwidth;
 	static str prompt = ">";
 	int top;
+	float topScaled;
 	int iXPos;
 	int iMaxStringWidth;
 	int widthbeforecaret;
 
 	promptwidth = m_font->getWidth(prompt.c_str(), -1);
-	top = m_frame.size.height - m_font->getHeight(qfalse);
-	m_font->Print(0.0, top, prompt.c_str(), -1, qfalse);
+	top = m_frame.size.height - m_font->getHeight(getHighResScale());
+	topScaled = top / getHighResScale()[1];
+	m_font->Print(0.0, topScaled, prompt.c_str(), -1, getHighResScale());
 
 	iXPos = promptwidth + 1;
 	iMaxStringWidth = m_frame.size.width - iXPos - m_scroll->getSize().width;
@@ -187,12 +189,12 @@ void UIConsole::DrawBottomLine
 
 		if (widthbeforecaret < iMaxStringWidth)
 		{
-			m_font->Print(iXPos, top, m_currentline.c_str(), -1, qfalse);
+			m_font->Print(iXPos, topScaled, m_currentline.c_str(), -1, getHighResScale());
 		}
 		else
 		{
 			indicatorwidth = m_font->getWidth(indicator.c_str(), -1);
-			m_font->Print(iXPos, top, indicator.c_str(), -1, 0);
+			m_font->Print(iXPos, topScaled, indicator.c_str(), -1, getHighResScale());
 
 			iXPos += indicatorwidth;
 			iMaxStringWidth -= indicatorwidth;
@@ -207,7 +209,7 @@ void UIConsole::DrawBottomLine
 				iCharLength = m_font->getCharWidth(pString[iChar - 1]);
 			}
 
-			m_font->Print(iXPos, top, pString + 1, -1, qfalse);
+			m_font->Print(iXPos, topScaled, pString + 1, -1, getHighResScale());
 			widthbeforecaret = iXPos + m_font->getWidth(pString + 1, m_caret - iChar);
 		}
 	}
@@ -218,19 +220,19 @@ void UIConsole::DrawBottomLine
 
 		completewidth = m_font->getWidth(m_completionbuffer.c_str(), -1);
 		linewidth = m_font->getWidth(&m_currentline[m_completionbuffer.length()], -1);
-		m_font->Print(iXPos, top, m_completionbuffer.c_str(), -1, qfalse);
+		m_font->Print(iXPos, topScaled, m_completionbuffer.c_str(), -1, getHighResScale());
 
 		iXPos += completewidth;
-		m_font->Print(iXPos, top, &m_currentline[m_completionbuffer.length()], -1, 0);
+		m_font->Print(iXPos, topScaled, &m_currentline[m_completionbuffer.length()], -1, getHighResScale());
 
-		DrawBoxWithSolidBorder(UIRect2D(iXPos, top, linewidth, m_font->getHeight(qfalse)), UBlack, URed, 1, 2, 1.0);
+		DrawBoxWithSolidBorder(UIRect2D(iXPos * getHighResScale()[0], top, linewidth * getHighResScale()[0], m_font->getHeight(getHighResScale())), UBlack, URed, 1, 2, 1.0);
 	}
 
 	//
 	// Make the caret blink
 	//
 	if ((uid.time % 750) > 375 && IsActive()) {
-		DrawBox(UIRect2D(widthbeforecaret, top, 1.0, m_font->getHeight(qfalse)), m_foreground_color, 1.0);
+		DrawBox(UIRect2D(widthbeforecaret * getHighResScale()[0], top, 1.0, m_font->getHeight(getHighResScale())), m_foreground_color, 1.0);
 	}
 }
 
@@ -503,7 +505,7 @@ void UIConsole::Draw
 		int lines_drawn, at_line;
 		int topitem;
 
-		top = (int)(m_frame.size.height - m_font->getHeight(false) * (m_scroll->getPageHeight() + 2));
+		top = (int)(m_frame.size.height - m_font->getHeight(getHighResScale()) * (m_scroll->getPageHeight() + 2));
 		item = m_firstitem;
 		topitem = m_scroll->getTopItem() - 1;
 
@@ -553,10 +555,10 @@ void UIConsole::Draw
 				}
 
 				m_font->setAlpha(m_alpha);
-				m_font->Print(0.0, top, &theItem->string.c_str()[theItem->begins[at_line]], theItem->breaks[at_line], 0);
+				m_font->Print(0.0, top / getHighResScale()[1], &theItem->string.c_str()[theItem->begins[at_line]], theItem->breaks[at_line], getHighResScale());
 			}
 
-			top += m_font->getHeight(false);
+			top += m_font->getHeight(getHighResScale());
 			lines_drawn++;
 			at_line++;
 		}
@@ -813,7 +815,7 @@ void UIConsole::OnSizeChanged
 	attop = false;
 	atbottom = false;
 
-	linesperpage = (m_frame.size.height / (float)m_font->getHeight(qfalse));
+	linesperpage = (m_frame.size.height / (float)m_font->getHeight(getHighResScale()));
 	m_scroll->InitFrameAlignRight(this, 0, 0);
 
 	if (ev)
@@ -906,13 +908,13 @@ void UIFloatingConsole::FrameInitialized
 	// call the parent initialisation
 	UIFloatingWindow::FrameInitialized();
 
-	m_status = new UIStatusBar(alignment_t::WND_ALIGN_BOTTOM, 20.0);
-	m_status->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "verdana-12");
+	m_status = new UIStatusBar(alignment_t::WND_ALIGN_BOTTOM, 20.0 * getHighResScale()[1]);
+	m_status->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0 * getHighResScale()[0], 20.0 * getHighResScale()[1]), 0, "verdana-12");
 	m_status->EnableSizeBox(this);
 	m_status->setTitle(str());
 
 	m_console = new UIConsole();
-	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "verdana-14");
+	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0 * getHighResScale()[0], 20.0 * getHighResScale()[1]), 0, "verdana-14");
 	setConsoleColor(m_consoleColor);
 	setConsoleBackground(m_consoleBackground, m_consoleAlpha);
 	m_console->setConsoleHandler(m_handler);
@@ -1423,7 +1425,7 @@ void UIFloatingDMConsole::FrameInitialized
 	UIFloatingWindow::FrameInitialized();
 
 	m_console = new UIDMConsole();
-	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "facfont-20");
+	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0 * getHighResScale()[0], 20.0 * getHighResScale()[1]), 0, "facfont-20");
 
 	m_console->Connect(this, W_Deactivated, W_Deactivated);
 	setConsoleColor(m_consoleColor);
@@ -1456,7 +1458,6 @@ void UIFloatingDMConsole::OnChildSizeChanged
 	}
 	else
 	{
-
 		m_console->setFrame(UIRect2D(UIPoint2D(0, 0), childSpaceSize));
 	}
 }
diff --git a/code/uilib/uifield.cpp b/code/uilib/uifield.cpp
index 952e3f7f..51a4a744 100644
--- a/code/uilib/uifield.cpp
+++ b/code/uilib/uifield.cpp
@@ -38,7 +38,7 @@ void UIField::Draw(void)
     UpdateData();
 
     // the width of the widget that can be filled with valid text
-    float fVirtualWidth = m_frame.size.width / m_vVirtualScale[0] - m_font->getWidth(" ..", -1);
+    float fVirtualWidth = m_frame.size.width / getVirtualScale()[0] - m_font->getWidth(" ..", -1);
     float indentLength  = m_indent;
     float cursorSize    = m_font->getCharWidth('_');
 
@@ -125,7 +125,7 @@ void UIField::Draw(void)
     cursorPos = Q_min(cursorPos, fVirtualWidth);
 
     // Calculate text height
-    float y = m_frame.size.height / m_vVirtualScale[1] - m_font->getHeight(qfalse);
+    float y = m_frame.size.height / getVirtualScale()[1] - m_font->getHeight();
     if (m_bottomindent * 2 <= y) // upper and lower margin
     {
         y -= m_bottomindent;
@@ -135,27 +135,27 @@ void UIField::Draw(void)
 
     // Show text
     m_font->setColor(m_foreground_color);
-    m_font->Print(m_indent, y, temptext, -1, m_bVirtual);
+    m_font->Print(m_indent, y, temptext, -1, getVirtualScale());
 
     // Display blinking cursor if field is in focus
     if (IsActive()) {
         const char *cursorChar = (uid.time / 250) & 1 ? "|" : "_";
-        m_font->Print(cursorPos, y, cursorChar, -1, m_bVirtual);
+        m_font->Print(cursorPos, y, cursorChar, -1, getVirtualScale());
     }
 
     Q_strncpyz(temptext, "..", EDITFIELD_BUFSIZE);
 
     if (m_iPreStep) {
         // Display leading dots if not starting from the beginning
-        m_font->Print(2.0f, y, temptext, -1, m_bVirtual);
+        m_font->Print(2.0f, y, temptext, -1, getVirtualScale());
     }
 
     // Added in OPM
     // new iLastChar < EDITFIELD_BUFSIZE check for extra safety
     if (iLastChar < EDITFIELD_BUFSIZE && m_edit.m_buffer[iLastChar]) {
         // Display trailing dots if not ending at the end
-        fVirtualWidth = m_frame.size.width / m_vVirtualScale[0] - m_font->getWidth(temptext, -1) - 2.0f;
-        m_font->Print(fVirtualWidth, y, temptext, -1, m_bVirtual);
+        fVirtualWidth = m_frame.size.width / getVirtualScale()[0] - m_font->getWidth(temptext, -1) - 2.0f;
+        m_font->Print(fVirtualWidth, y, temptext, -1, getVirtualScale());
     }
 }
 
@@ -306,7 +306,7 @@ void UIField::UpdateData(void)
 void UIField::Pressed(Event *ev)
 {
     float xpos  = ev->GetFloat(1);
-    float point = (xpos - m_frame.pos.x) / m_vVirtualScale[0];
+    float point = (xpos - m_frame.pos.x) / getVirtualScale()[0];
     point       = Q_max(point, 0.0f); // added in 2.15
 
     int   iStep        = m_iPreStep;
diff --git a/code/uilib/uifloatwnd.cpp b/code/uilib/uifloatwnd.cpp
index d4805684..21f698ac 100644
--- a/code/uilib/uifloatwnd.cpp
+++ b/code/uilib/uifloatwnd.cpp
@@ -115,10 +115,10 @@ void UIFloatingWindow::FrameInitialized
 	//
 	m_closeButton->InitFrame(
 		this,
-		m_frame.size.width - 18.0,
+		m_frame.size.width - 18.0 * getHighResScale()[0],
 		2.0,
-		16.0,
-		16.0,
+		16.0 * getHighResScale()[0],
+		16.0 * getHighResScale()[1],
 		-1,
 		"marlett"
 	);
@@ -131,10 +131,10 @@ void UIFloatingWindow::FrameInitialized
 	//
 	m_minimizeButton->InitFrame(
 		this,
-		m_frame.size.width - 36.0,
+		m_frame.size.width - 36.0 * getHighResScale()[0],
 		2.0,
-		16.0,
-		16.0,
+		16.0 * getHighResScale()[0],
+		16.0 * getHighResScale()[1],
 		-1,
 		"marlett"
 	);
@@ -156,7 +156,7 @@ void UIFloatingWindow::FrameInitialized
 	{
 		m_childspace->InitFrame(
 			this,
-			UIRect2D(2.0, 20.0, m_frame.size.width - 4.0, m_frame.size.height - 22.0),
+			UIRect2D(2.0, 20.0 * getHighResScale()[1], m_frame.size.width - 4.0, m_frame.size.height - 22.0 * getHighResScale()[1]),
 			0,
 			"verdana-12"
 		);
@@ -198,7 +198,7 @@ void UIFloatingWindow::MinimizePressed
 		// save the hold height
 		// so the window can be restored later
 		m_restoredHeight = size.height;
-		size.height = 20.0;
+		size.height = 20.0 * getHighResScale()[1];
 		m_minimizeButton->setTitle("1");
 	}
 	else
@@ -288,17 +288,17 @@ void UIFloatingWindow::SizeChanged
 {
 	UIRect2D childRect;
 	childRect.pos.x = 2.0;
-	childRect.pos.y = 20.0;
-	childRect.size.width = m_frame.size.width - 4.0;
-	childRect.size.height = m_frame.size.height - 22.0;
+	childRect.pos.y = 20.0 * getHighResScale()[1];
+	childRect.size.width = m_frame.size.width - 4.0 * getHighResScale()[0];
+	childRect.size.height = m_frame.size.height - 22.0 * getHighResScale()[1];
 
 	if (childRect.size.width <= 0.0 || childRect.size.height <= 0.0) {
 		return;
 	}
 
 	m_childspace->setFrame(childRect);
-	m_closeButton->setFrame(UIRect2D(m_frame.size.width - 18.0, 2.0, 16.0, 16.0));
-	m_minimizeButton->setFrame(UIRect2D(m_frame.size.width - 36.0, 2.0, 16.0, 16.0));
+	m_closeButton->setFrame(UIRect2D(m_frame.size.width - 18.0 * getHighResScale()[0], 2.0, 16.0 * getHighResScale()[0], 16.0 * getHighResScale()[1]));
+	m_minimizeButton->setFrame(UIRect2D(m_frame.size.width - 36.0 * getHighResScale()[0], 2.0, 16.0 * getHighResScale()[0], 16.0 * getHighResScale()[1]));
 }
 
 void UIFloatingWindow::OnActivated
@@ -414,11 +414,13 @@ void UIFloatingWindow::Draw
 		);
 	}
 
+	const float maxTitleBarHeight = 20 * getHighResScale()[1];
+
 	DrawBox(
 		0.0,
 		0.0,
 		m_frame.size.width,
-		m_frame.size.height > 20.0 ? 20.0 : m_frame.size.height,
+		m_frame.size.height > maxTitleBarHeight ? maxTitleBarHeight : m_frame.size.height,
 		titleBar,
 		1.0
 	);
@@ -427,7 +429,7 @@ void UIFloatingWindow::Draw
 		0.0,
 		0.0,
 		m_frame.size.width,
-		m_frame.size.height > 20.0 ? 20.0 : m_frame.size.height,
+		m_frame.size.height > maxTitleBarHeight ? maxTitleBarHeight : m_frame.size.height,
 		false,
 		titleBorder,
 		1.0
diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 9f2fc2ad..48cb298e 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -274,14 +274,14 @@ void UIFont::setFont(const char *fontname)
     }
 }
 
-void UIFont::Print(float x, float y, const char *text, size_t maxlen, qboolean bVirtualScreen)
+void UIFont::Print(float x, float y, const char *text, size_t maxlen, const float *virtualScreen)
 {
     uii.Rend_SetColor(color);
-    uii.Rend_DrawString(m_font, text, x, y, maxlen, bVirtualScreen);
+    uii.Rend_DrawString(m_font, text, x, y, maxlen, virtualScreen);
 }
 
 void UIFont::PrintJustified(
-    const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, float *vVirtualScale
+    const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, const float *vVirtualScale
 )
 {
     float       newx, newy;
@@ -302,11 +302,11 @@ void UIFont::PrintJustified(
 
     if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP) {
         // no need to justify
-        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale != NULL);
+        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale);
         return;
     }
 
-    textheight = getHeight(text, -1, qfalse);
+    textheight = getHeight(text, -1);
 
     switch (vert) {
     case FONT_JUSTVERT_TOP:
@@ -360,10 +360,10 @@ void UIFont::PrintJustified(
             break;
         }
 
-        Print(newx, newy, string, -1, vVirtualScale != NULL);
+        Print(newx, newy, string, -1, vVirtualScale);
 
         // expand for newline
-        newy += getHeight(" ", -1, qfalse);
+        newy += getHeight(" ", -1);
     }
 }
 
@@ -373,7 +373,7 @@ void UIFont::PrintOutlinedJustified(
     fontvertjustify_t vert,
     const char       *text,
     const UColor    & outlineColor,
-    float            *vVirtualScale
+    const float      *vVirtualScale
 )
 {
     float       newx, newy;
@@ -398,11 +398,11 @@ void UIFont::PrintOutlinedJustified(
 
     if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP) {
         // no need to justify
-        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale != NULL);
+        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale);
         return;
     }
 
-    textheight = getHeight(text, -1, qfalse);
+    textheight = getHeight(text, -1);
 
     switch (vert) {
     case FONT_JUSTVERT_TOP:
@@ -464,26 +464,26 @@ void UIFont::PrintOutlinedJustified(
         // draw the outline
         //
         setColor(outlineColor);
-        Print(newx + 1, newy + 2, string, -1, bVirtual);
-        Print(newx + 2, newy + 1, string, -1, bVirtual);
-        Print(newx - 1, newy + 2, string, -1, bVirtual);
-        Print(newx - 2, newy + 1, string, -1, bVirtual);
-        Print(newx - 1, newy - 2, string, -1, bVirtual);
-        Print(newx - 2, newy - 1, string, -1, bVirtual);
-        Print(newx + 1, newy - 2, string, -1, bVirtual);
-        Print(newx + 2, newy - 1, string, -1, bVirtual);
-        Print(newx + 2, newy, string, -1, bVirtual);
-        Print(newx - 2, newy, string, -1, bVirtual);
-        Print(newx, newy + 2, string, -1, bVirtual);
-        Print(newx, newy - 2, string, -1, bVirtual);
+        Print(newx + 1, newy + 2, string, -1, vVirtualScale);
+        Print(newx + 2, newy + 1, string, -1, vVirtualScale);
+        Print(newx - 1, newy + 2, string, -1, vVirtualScale);
+        Print(newx - 2, newy + 1, string, -1, vVirtualScale);
+        Print(newx - 1, newy - 2, string, -1, vVirtualScale);
+        Print(newx - 2, newy - 1, string, -1, vVirtualScale);
+        Print(newx + 1, newy - 2, string, -1, vVirtualScale);
+        Print(newx + 2, newy - 1, string, -1, vVirtualScale);
+        Print(newx + 2, newy, string, -1, vVirtualScale);
+        Print(newx - 2, newy, string, -1, vVirtualScale);
+        Print(newx, newy + 2, string, -1, vVirtualScale);
+        Print(newx, newy - 2, string, -1, vVirtualScale);
         //
         // draw the text
         //
         setColor(originalColor);
-        Print(newx, newy, string, -1, bVirtual);
+        Print(newx, newy, string, -1, vVirtualScale);
 
         // expand for newline
-        newy += getHeight(" ", -1, qfalse);
+        newy += getHeight(" ", -1);
     }
 }
 
@@ -532,7 +532,7 @@ int UIFont::getCharWidth(unsigned short ch)
     return m_font->sgl[index]->locations[indirected].size[0] * 256.0 * widthMul;
 }
 
-int UIFont::getHeight(const char *text, int maxlen, qboolean bVirtual)
+int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
 {
     float height;
     int   i;
@@ -541,7 +541,7 @@ int UIFont::getHeight(const char *text, int maxlen, qboolean bVirtual)
         return 0;
     }
 
-    height = getHeight(bVirtual);
+    height = getHeight(virtualScale);
 
     for (i = 0; text[i]; i++) {
         if (maxlen != -1 && i > maxlen) {
@@ -549,20 +549,20 @@ int UIFont::getHeight(const char *text, int maxlen, qboolean bVirtual)
         }
 
         if (text[i] == '\n') {
-            height += getHeight(bVirtual);
+            height += getHeight(virtualScale);
         }
     }
 
     return height;
 }
 
-int UIFont::getHeight(qboolean bVirtual)
+int UIFont::getHeight(const float* virtualScale)
 {
-    if (bVirtual) {
+    if (virtualScale) {
         if (m_font) {
-            return (m_font->sgl[0]->height * uid.vidHeight / 480.0);
+            return (m_font->sgl[0]->height * virtualScale[0]);
         } else {
-            return (16.0 * uid.vidHeight / 480.0);
+            return (16.0 * uid.vidHeight * virtualScale[1]);
         }
     } else {
         if (m_font) {
diff --git a/code/uilib/uifont.h b/code/uilib/uifont.h
index e22a0c0e..93a61349 100644
--- a/code/uilib/uifont.h
+++ b/code/uilib/uifont.h
@@ -47,12 +47,12 @@ public:
     UIFont();
     UIFont(const char *fn);
 
-    void Print(float x, float y, const char *text, size_t maxlen = -1, qboolean bVirtualScreen = qfalse);
+    void Print(float x, float y, const char *text, size_t maxlen = -1, const float *virtualScreen = NULL);
     void PrintJustified(
-        const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, float *vVirtualScale
+        const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, const float *vVirtualScale
     );
     void PrintOutlinedJustified(
-        const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char* text, const UColor& outlineColor, float* vVirtualScale
+        const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char* text, const UColor& outlineColor, const float* vVirtualScale
     );
     void setColor(UColor col);
     void setAlpha(float alpha);
@@ -60,8 +60,8 @@ public:
     int  getMaxWidthIndex(const char* text, int maxlen);
     int  getWidth(const char *text, int maxlen);
     int  getCharWidth(unsigned short ch);
-    int  getHeight(const char *text, int maxlen, qboolean bVirtual);
-    int  getHeight(qboolean bVirtual);
+    int  getHeight(const char *text, int maxlen, const float* virtualScale = NULL);
+    int  getHeight(const float* virtualScale = NULL);
     int  CodeSearch(unsigned short uch);
     bool DBCSIsLeadByte(unsigned short uch);
     bool DBCSIsMaekin(unsigned short uch);
diff --git a/code/uilib/uilabel.cpp b/code/uilib/uilabel.cpp
index cb39cba3..642dc49d 100644
--- a/code/uilib/uilabel.cpp
+++ b/code/uilib/uilabel.cpp
@@ -318,7 +318,7 @@ void UILabel::Draw(void)
                 m_iFontAlignmentVertical,
                 string,
                 UBlack,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         } else {
             // print the text
@@ -327,7 +327,7 @@ void UILabel::Draw(void)
                 m_iFontAlignmentHorizontal,
                 m_iFontAlignmentVertical,
                 string,
-                m_bVirtual ? m_vVirtualScale : NULL
+                getVirtualScale()
             );
         }
     }
diff --git a/code/uilib/uilist.cpp b/code/uilib/uilist.cpp
index fdc6f782..107571e1 100644
--- a/code/uilib/uilist.cpp
+++ b/code/uilib/uilist.cpp
@@ -92,10 +92,10 @@ void UIList::Draw
 		}
 
 		float textX = 0.5f * m_frame.size.width - 0.5f * m_font->getWidth(itemText, -1);
-		float textY = 0.5f * (m_frame.size.height - m_font->getHeight(m_bVirtual)) - 1.0f;
+		float textY = 0.5f * (m_frame.size.height - m_font->getHeight(m_bVirtual ? m_vVirtualScale : uid.scaleRes)) - 1.0f;
 		m_font->setColor(m_foreground_color);
 		const char *text = Sys_LV_CL_ConvertString(itemText);
-		m_font->Print(textX, textY, text, -1, m_bVirtual);
+		m_font->Print(textX, textY, text, -1, m_bVirtual ? m_vVirtualScale : NULL);
 	}
 
 	// draw the previous arrow
diff --git a/code/uilib/uilistbox.cpp b/code/uilib/uilistbox.cpp
index 228b04a5..ab18e695 100644
--- a/code/uilib/uilistbox.cpp
+++ b/code/uilib/uilistbox.cpp
@@ -303,7 +303,7 @@ void UIListBox::Draw(void)
                 0,
                 aty * m_vVirtualScale[1],
                 m_frame.size.width - m_vVirtualScale[0] * 16,
-                m_font->getHeight(m_bVirtual),
+                m_font->getHeight(getVirtualScale()),
                 selectedBG,
                 1.f
             );
@@ -318,7 +318,7 @@ void UIListBox::Draw(void)
         } else {
             str = li->string;
         }
-        m_font->Print(m_indent, aty, str, -1, m_bVirtual);
+        m_font->Print(m_indent, aty, str, -1, m_bVirtual ? m_vVirtualScale : NULL);
 
         if (i == m_currentItem) {
             DrawBoxWithSolidBorder(
@@ -326,7 +326,7 @@ void UIListBox::Draw(void)
                     0,
                     aty * m_vVirtualScale[1],
                     m_frame.size.width - m_vVirtualScale[0] * 16,
-                    m_font->getHeight(m_bVirtual)
+                    m_font->getHeight(getVirtualScale())
                 ),
                 UWhite,
                 selectedBorder,
@@ -336,7 +336,7 @@ void UIListBox::Draw(void)
             );
         }
 
-        aty += m_font->getHeight(false);
+        aty += m_font->getHeight(getHighResScale());
         i++;
     }
 }
@@ -349,9 +349,9 @@ void UIListBox::MousePressed(Event *ev)
     p.y = ev->GetFloat(2) - m_screenframe.pos.y;
 
     if (m_vertscroll) {
-        TrySelectItem((m_vertscroll->getTopItem() + 1) + p.y / m_font->getHeight(m_bVirtual));
+        TrySelectItem((m_vertscroll->getTopItem() + 1) + p.y / m_font->getHeight(getVirtualScale()));
     } else {
-        TrySelectItem(p.y / m_font->getHeight(m_bVirtual) + 1);
+        TrySelectItem(p.y / m_font->getHeight(getVirtualScale()) + 1);
     }
 
     if (m_clickState.time + 500 > uid.time && m_currentItem == m_clickState.selected) {
@@ -409,7 +409,7 @@ void UIListBox::SetListFont(Event *ev)
     LayoutFont(ev);
 
     if (m_vertscroll) {
-        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
+        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
     }
 
     FrameInitialized();
@@ -483,7 +483,7 @@ void UIListBox::FrameInitialized(void)
     UIListBase::FrameInitialized();
 
     if (m_vertscroll) {
-        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
+        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
         m_vertscroll->setNumItems(m_itemlist.NumObjects());
     }
 }
diff --git a/code/uilib/uilistctrl.cpp b/code/uilib/uilistctrl.cpp
index 8d56a818..fd470fce 100644
--- a/code/uilib/uilistctrl.cpp
+++ b/code/uilib/uilistctrl.cpp
@@ -155,14 +155,14 @@ int UIListCtrl::getHeaderHeight
 	}
 
 	if (m_headerfont) {
-		return (int)(m_headerfont->getHeight(m_bVirtual) + (s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1]);
+		return (int)(m_headerfont->getHeight(getVirtualScale()) + (s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1]);
 	}
 
 	if (m_font) {
-		return (int)(m_font->getHeight(m_bVirtual) + (s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1]);
+		return (int)(m_font->getHeight(getVirtualScale()) + (s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1]);
 	}
 
-	return (int)((s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1]);
+	return (int)((s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1]);
 }
 
 void UIListCtrl::MousePressed
@@ -215,9 +215,9 @@ void UIListCtrl::MousePressed
 	else
 	{
 		if (m_vertscroll) {
-			TrySelectItem((m_vertscroll->getTopItem() + 1) + (p.y - getHeaderHeight()) / m_font->getHeight(m_bVirtual));
+			TrySelectItem((m_vertscroll->getTopItem() + 1) + (p.y - getHeaderHeight()) / m_font->getHeight(getVirtualScale()));
 		} else {
-			TrySelectItem(1.0 + (p.y - getHeaderHeight()) / m_font->getHeight(m_bVirtual));
+			TrySelectItem(1.0 + (p.y - getHeaderHeight()) / m_font->getHeight(getVirtualScale()));
 		}
 
 		if (m_clickState.time + 500 > uid.time
@@ -298,7 +298,7 @@ void UIListCtrl::OnSizeChanged
 	}
 
 	m_vertscroll->InitFrame(this, m_frame.size.width - 16.0, 0.0, 16.0, m_frame.size.height, -1);
-	m_vertscroll->setPageHeight((m_frame.size.height - getHeaderHeight()) / m_font->getHeight(m_bVirtual));
+	m_vertscroll->setPageHeight((m_frame.size.height - getHeaderHeight()) / m_font->getHeight(getVirtualScale()));
 	m_vertscroll->setNumItems(m_itemlist.NumObjects());
 }
 
@@ -321,7 +321,7 @@ void UIListCtrl::DrawColumns
 	pFont = m_headerfont;
 	if (!pFont) pFont = m_font;
 
-	height = (s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1] + pFont->getHeight(m_bVirtual);
+	height = (s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1] + pFont->getHeight(getVirtualScale());
 	pFont->setColor(textColor);
 
 	for (i = 1; i <= m_columnlist.NumObjects(); i++)
@@ -329,7 +329,7 @@ void UIListCtrl::DrawColumns
 		const columndef_t& column = m_columnlist.ObjectAt(i);
 
 		DrawBoxWithSolidBorder(
-			UIRect2D(atleft, 0, column.width + m_vVirtualScale[1], height),
+			UIRect2D(atleft, 0, column.width + getVirtualScale()[1], height),
 			columnColor,
 			textColor,
 			1,
@@ -338,11 +338,11 @@ void UIListCtrl::DrawColumns
 		);
 
 		pFont->Print(
-			atleft / m_vVirtualScale[0] + s_columnpadding.width,
+			atleft / getVirtualScale()[0] + s_columnpadding.width,
 			s_columnpadding.height,
 			Sys_LV_CL_ConvertString(column.title.c_str()),
 			-1,
-			m_bVirtual
+			getVirtualScale()
 		);
 
 		atleft += column.width;
@@ -374,14 +374,14 @@ void UIListCtrl::DrawContent
 	UColor selColor, selText;
 	UColor backColor, textColor;
 
-	height = m_font->getHeight(m_bVirtual);
+	height = m_font->getHeight(getVirtualScale());
 	selColor = UColor(0.21f, 0.18f, 0.015f, 1.0f);
 	selText = UColor(0.9f, 0.8f, 0.6f, 1.0f);
 	backColor = m_background_color;
 	textColor = m_foreground_color;
 
 	if (m_headerfont) {
-		headerheight = m_headerfont->getHeight(m_bVirtual);
+		headerheight = m_headerfont->getHeight(getVirtualScale());
 	} else {
 		headerheight = 0;
 	}
@@ -439,11 +439,11 @@ void UIListCtrl::DrawContent
 			case TYPE_STRING:
 				DrawBox(drawRect, *itemBg, m_local_alpha);
 				pFont->Print(
-					drawRect.pos.x / m_vVirtualScale[0] + 1.0,
-					drawRect.pos.y / m_vVirtualScale[1],
+					drawRect.pos.x / getVirtualScale()[0] + 1.0,
+					drawRect.pos.y / getVirtualScale()[1],
 					Sys_LV_CL_ConvertString(theitem->getListItemString(column.name)),
 					-1,
-					m_bVirtual
+					getVirtualScale()
 				);
 				break;
 			case TYPE_OWNERDRAW:
diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index cac86015..c8fbedb7 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -146,7 +146,7 @@ void UIMultiLineEdit::FrameInitialized(void)
 {
     delete m_vertscroll;
     m_vertscroll = new UIVertScroll();
-    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(false));
+    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getHighResScale()));
     m_vertscroll->setTopItem(0);
     m_vertscroll->setNumItems(m_lines.getCount());
     m_vertscroll->InitFrameAlignRight(this, 0, 0);
@@ -157,7 +157,7 @@ void UIMultiLineEdit::FrameInitialized(void)
 
 void UIMultiLineEdit::SizeChanged(Event *ev)
 {
-    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
+    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
     m_vertscroll->InitFrameAlignRight(this, 0, 0);
 }
 
@@ -209,7 +209,7 @@ void UIMultiLineEdit::Draw(void)
         if (i < topsel->line || i > botsel->line) {
             // Print regular line without any selection or cursor present
             m_font->setColor(m_foreground_color);
-            m_font->Print(0, aty, cur, -1, m_bVirtual);
+            m_font->Print(0, aty / getVirtualScale()[1], cur, -1, getVirtualScale());
         } else {
             // Current line contains cursor and/or selected text
             float linewidth = m_font->getWidth(cur, -1);
@@ -217,13 +217,13 @@ void UIMultiLineEdit::Draw(void)
             if (i > topsel->line && i < botsel->line) {
                 // all text in current line is selected, it's part of a larger selection,
                 // print entire line with the selection highlight box around it
-                DrawBox(0.0f, aty, linewidth, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
+                DrawBox(0.0f, aty, linewidth * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
                 m_font->setColor(selectionColor);
                 // Fixed in OPM:
                 // don't spam LOCALIZATION ERROR messages to console
                 // for clicking lines in the opened text document
                 //m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
-                m_font->Print(0, aty, cur, -1, m_bVirtual);
+                m_font->Print(0, aty / getVirtualScale()[1], cur, -1, getVirtualScale());
             } else if (i != topsel->line) {
                 // part of this line is selected, and selection continues/began above
                 if (i == botsel->line) { // sanity check, should always be true
@@ -232,13 +232,13 @@ void UIMultiLineEdit::Draw(void)
                         // selection contains text from the beginning of the line,
                         // print it with the selection highlight box around it
                         m_font->setColor(selectionColor);
-                        DrawBox(0, aty, toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
-                        m_font->Print(0, aty, cur, botsel->column, m_bVirtual);
+                        DrawBox(0, aty, toplen * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
+                        m_font->Print(0, aty / getVirtualScale()[1], cur, botsel->column, getVirtualScale());
                     }
 
                     if (toplen < linewidth) { // is there still text on this line after the selection?
                         m_font->setColor(m_foreground_color);
-                        m_font->Print(toplen, aty, &cur[botsel->column], -1, m_bVirtual);
+                        m_font->Print(toplen, aty / getVirtualScale()[1], &cur[botsel->column], -1, getVirtualScale());
                     }
 
                     if (botsel == &m_selection.end) {
@@ -251,14 +251,14 @@ void UIMultiLineEdit::Draw(void)
                 int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start
                 if (topsel->column) { // is there any text on this line before the selection?
                     m_font->setColor(m_foreground_color);
-                    m_font->Print(0, aty, cur, topsel->column, m_bVirtual);
+                    m_font->Print(0, aty / getVirtualScale()[1], cur, topsel->column, getVirtualScale());
                 }
 
                 if (toplen < linewidth) { // is there any selected text before the end of the line?
                     // print the selected text with the selection highlight box around it
                     m_font->setColor(selectionColor);
-                    DrawBox(toplen, aty, linewidth - toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
-                    m_font->Print(toplen, aty, &cur[topsel->column], -1, m_bVirtual);
+                    DrawBox(toplen * getVirtualScale()[0], aty, (linewidth - toplen) * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
+                    m_font->Print(toplen, aty / getVirtualScale()[1], &cur[topsel->column], -1, getVirtualScale());
                 }
 
                 if (topsel == &m_selection.end) {
@@ -275,7 +275,7 @@ void UIMultiLineEdit::Draw(void)
                     // don't spam LOCALIZATION ERROR messages to console
                     // for clicking lines in the opened text document
                     //m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
-                    m_font->Print(0, aty, cur, -1, m_bVirtual);
+                    m_font->Print(0, aty / getVirtualScale()[1], cur, -1, getVirtualScale());
                 } else {
                     // selection starts and ends on this line
                     int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start
@@ -283,14 +283,14 @@ void UIMultiLineEdit::Draw(void)
 
                     if (toplen) { // is there any text on this line before the selection?
                         m_font->setColor(m_foreground_color);
-                        m_font->Print(0, aty, cur, topsel->column, m_bVirtual);
+                        m_font->Print(0, aty / getVirtualScale()[1], cur, topsel->column, getVirtualScale());
                     }
 
                     if (botlen != toplen) { // is the selection wider than 0 pixels? (sanity check, always true)
                         // print the selected text with the selection highlight box around it
-                        DrawBox(toplen, aty, botlen - toplen, m_font->getHeight(m_bVirtual), selectionBG, 1.f);
+                        DrawBox(toplen * getVirtualScale()[0], aty, (botlen - toplen) * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
                         m_font->setColor(selectionColor);
-                        m_font->Print(toplen, aty, &cur[topsel->column], botsel->column - topsel->column, m_bVirtual);
+                        m_font->Print(toplen, aty / getVirtualScale()[1], &cur[topsel->column], botsel->column - topsel->column, getVirtualScale());
                     }
 
                     if (cur.length() != botsel->column) { // is there still text on this line after the selection?
@@ -302,7 +302,7 @@ void UIMultiLineEdit::Draw(void)
                         // Cause: the last two arguments were incorrectly passed in originally,
                         // always specifying maxlen as m_bVirtual (which is usually zero).
                         // m_font->Print(botlen, aty, &cur[botsel->column], m_bVirtual, false);
-                        m_font->Print(botlen, aty, &cur[botsel->column], -1, m_bVirtual);
+                        m_font->Print(botlen, aty / getVirtualScale()[1], &cur[botsel->column], -1, getVirtualScale());
                     }
 
                     // Place the cursor at the end of the selection...
@@ -320,10 +320,10 @@ void UIMultiLineEdit::Draw(void)
 
         if (m_selection.end.line == i && (uid.time % 750) >= 375 && IsActive()) {
             // draw cursor caret
-            DrawBox(caret, aty, 2.f, m_font->getHeight(m_bVirtual), UBlack, 1.f);
+            DrawBox(caret * getVirtualScale()[0], aty, 2.f, m_font->getHeight(getVirtualScale()), UBlack, 1.f);
         }
 
-        aty += m_font->getHeight(m_bVirtual);
+        aty += m_font->getHeight(getVirtualScale());
     }
 }
 
@@ -363,7 +363,7 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
     float totalWidth = 0;
     float lastWidth  = 0;
 
-    clickedLine = m_vertscroll->getTopItem() + p.y / m_font->getHeight(m_bVirtual);
+    clickedLine = m_vertscroll->getTopItem() + p.y / m_font->getHeight(getVirtualScale());
     clickedLine = Q_min(clickedLine, m_lines.getCount() - 1);
 
     if (clickedLine < 0) {
@@ -374,7 +374,7 @@ void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t
 
     const char *line = LineFromLineNumber(clickedLine, true).c_str();
     for (i = 0; line[i] && totalWidth < p.x; i++) {
-        lastWidth = m_font->getCharWidth(line[i]);
+        lastWidth = m_font->getCharWidth(line[i]) * getVirtualScale()[0];
         totalWidth += lastWidth;
     }
 
diff --git a/code/uilib/uipopupmenu.cpp b/code/uilib/uipopupmenu.cpp
index afcefc63..b119100b 100644
--- a/code/uilib/uipopupmenu.cpp
+++ b/code/uilib/uipopupmenu.cpp
@@ -100,7 +100,7 @@ uipopup_describe *UIPopupMenu::getDescribeFromPoint
 		return NULL;
 	}
 
-	float top = m_vVirtualScale[1] * 4.0f;
+	float top = getVirtualScale()[1] * 4.0f;
 	for (int i = 1; i <= m_describe->NumObjects(); i++)
 	{
 		uipopup_describe* desc = m_describe->ObjectAt(i);
@@ -163,10 +163,10 @@ float UIPopupMenu::getDescribeHeight
 {
 	if (d->type == UIP_SEPARATOR)
 	{
-		return 8.0f;
+		return 8.0f * getVirtualScale()[0];
 	}
 	
-	return m_font->getHeight(m_bVirtual);
+	return m_font->getHeight(getVirtualScale());
 }
 
 float UIPopupMenu::getDescribeWidth
@@ -175,7 +175,7 @@ float UIPopupMenu::getDescribeWidth
 	)
 
 {
-	return m_font->getWidth(d->title, -1);
+	return m_font->getWidth(d->title, -1) * getVirtualScale()[0];
 }
 
 bool UIPopupMenu::MouseInSubmenus
@@ -251,7 +251,7 @@ void UIPopupMenu::Create
 		}
 	}
 
-	totalSize.height /= m_vVirtualScale[1];
+	totalSize.height /= getVirtualScale()[1];
 
 	if (width != -1.0f)
 	{
@@ -266,11 +266,11 @@ void UIPopupMenu::Create
 	totalSize.width += 24.0f;
 	totalSize.height += 8.0f;
 
-	if (m_bVirtual)
-	{
-		totalSize.width *= m_vVirtualScale[0];
-		totalSize.height *= m_vVirtualScale[1];
-	}
+	//if (m_bVirtual)
+	//{
+		totalSize.width *= getVirtualScale()[0];
+		totalSize.height *= getVirtualScale()[1];
+	//}
 
 	UIPoint2D place;
 	place.x = (where) ? createRect.pos.x : createRect.size.width + createRect.pos.x;
@@ -326,10 +326,10 @@ void UIPopupMenu::Draw
 	)
 
 {
-	const float originX = m_vVirtualScale[0] * 4.0f;
-	const float originY = m_vVirtualScale[1] * 4.0f;
+	const float originX = getVirtualScale()[0] * 4.0f;
+	const float originY = getVirtualScale()[1] * 4.0f;
 
-	float fFontHeight = m_font->getHeight(m_bVirtual);
+	float fFontHeight = m_font->getHeight(getVirtualScale());
 	float top = originY;
 	for (int i = 1; i <= m_describe->NumObjects(); i++)
 	{
@@ -369,7 +369,7 @@ void UIPopupMenu::Draw
 			m_font->setColor(textColor);
 			m_marlett.setColor(textColor);
 			const char *text = Sys_LV_CL_ConvertString(desc->title);
-			m_font->Print(4.0f, top / m_vVirtualScale[1], text, -1, m_bVirtual);
+			m_font->Print(4.0f, top / getVirtualScale()[1], text, -1, getVirtualScale());
 
 			if (desc->type == UIP_SUBMENU)
 			{
@@ -378,7 +378,7 @@ void UIPopupMenu::Draw
 					m_iFontAlignmentHorizontal,
 					m_iFontAlignmentVertical,
 					"4",
-					m_bVirtual ? m_vVirtualScale : NULL
+					getVirtualScale()
 				);
 			}
 		}
diff --git a/code/uilib/uipulldownmenu.cpp b/code/uilib/uipulldownmenu.cpp
index 780ad481..e062e4bc 100644
--- a/code/uilib/uipulldownmenu.cpp
+++ b/code/uilib/uipulldownmenu.cpp
@@ -115,7 +115,7 @@ UIRect2D UIPulldownMenu::getAlignmentRect
 		m_vVirtualScale[1] = (float)uid.vidHeight / SCREEN_HEIGHT;
 	}
 
-	int maxheight = m_font->getHeight(m_bVirtual);
+	int maxheight = m_font->getHeight(m_bVirtual ? m_vVirtualScale : NULL);
 	for (int i = 1; i <= m_desc.NumObjects(); i++)
 	{
 		uipull_describe *uipd = m_desc.ObjectAt(i);
@@ -164,7 +164,7 @@ float UIPulldownMenu::getDescHeight
 		return uii.Rend_GetShaderHeight(mat->GetMaterial());
 	}
 
-	return m_font->getHeight(m_bVirtual);
+	return m_font->getHeight(m_bVirtual ? m_vVirtualScale : NULL);
 }
 
 uipull_describe *UIPulldownMenu::getPulldown
@@ -590,7 +590,7 @@ void UIPulldownMenu::Draw
 			const char *text = Sys_LV_CL_ConvertString(desc->title);
 			float text_xpos = m_vVirtualScale[0] * 4.0f + atx;
 			float text_ypos = m_vVirtualScale[1] * 2.0f;
-			m_font->Print(text_xpos, text_ypos, text, -1, m_bVirtual);
+			m_font->Print(text_xpos, text_ypos, text, -1, m_bVirtual ? m_vVirtualScale : NULL);
 		}
 
 		atx += width;
diff --git a/code/uilib/uistatus.cpp b/code/uilib/uistatus.cpp
index 19d6d2a5..ff05d122 100644
--- a/code/uilib/uistatus.cpp
+++ b/code/uilib/uistatus.cpp
@@ -51,10 +51,10 @@ void UIWindowSizer::Draw
 
 {
 	m_font->setColor(UWhite);
-	m_font->Print(0, 0, "o", -1, m_bVirtual);
+	m_font->Print(0, 0, "o", -1, getVirtualScale());
 
 	m_font->setColor(UBlack);
-	m_font->Print(0, 0, "p", -1, m_bVirtual);
+	m_font->Print(0, 0, "p", -1, getVirtualScale());
 }
 
 void UIWindowSizer::FrameInitialized
@@ -202,7 +202,7 @@ void UIStatusBar::Draw
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(m_title.c_str()),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 
 	if (m_sizer)
@@ -267,16 +267,13 @@ void UIStatusBar::SelfSized
 {
 	if (m_sizeenabled)
 	{
-		if (m_sizer) {
-			if (m_sizer->getDraggingWidget() != m_sizeenabled) {
-				m_sizer->setDraggingWidget(m_sizeenabled);
-			}
-		}
-		else {
-			m_sizer = new UIWindowSizer(m_sizeenabled);
-			m_sizer->InitFrame(this, 0, 0, 16.0, 16.0, 0);
-		}
-
+        if (!m_sizer) {
+            m_sizer = new UIWindowSizer(m_sizeenabled);
+            m_sizer->InitFrame(this, 0, 0, 16.0 * getHighResScale()[0], 16.0 * getHighResScale()[1], 0);
+			
+		} else if (m_sizer->getDraggingWidget() != m_sizeenabled) {
+            m_sizer->setDraggingWidget(m_sizeenabled);
+        }
 
 		UISize2D sizerFrame = m_sizer->getSize();
 
diff --git a/code/uilib/uivertscroll.cpp b/code/uilib/uivertscroll.cpp
index 28cc252d..0c196b7b 100644
--- a/code/uilib/uivertscroll.cpp
+++ b/code/uilib/uivertscroll.cpp
@@ -74,7 +74,7 @@ int UIVertScroll::getItemFromHeight
 	)
 
 {
-	return (int)((height - 16.0) * (float)this->m_numitems / (m_frame.size.height - 32.0));
+	return (int)((height - 16.0 * uid.scaleRes[1]) * (float)this->m_numitems / (m_frame.size.height - 32.0 * uid.scaleRes[1]));
 }
 
 bool UIVertScroll::isEnoughItems
@@ -102,7 +102,7 @@ void UIVertScroll::Draw
 	);
 
 	DrawArrow(0.0, "5", m_pressed == VS_UP_ARROW);
-	DrawArrow(m_frame.size.height - m_vVirtualScale[1] * 16.0, "6", m_pressed == VS_DOWN_ARROW);
+	DrawArrow(m_frame.size.height - getVirtualScale()[1] * 16.0, "6", m_pressed == VS_DOWN_ARROW);
 
 	if (m_numitems > m_pageheight) {
 		DrawThumb();
@@ -123,7 +123,7 @@ void UIVertScroll::DrawArrow
 	arrowRect.pos.x = 0.0;
 	arrowRect.pos.y = top;
 	arrowRect.size.width = m_frame.size.width;
-	arrowRect.size.height = m_vVirtualScale[1] * 16.0;
+	arrowRect.size.height = getVirtualScale()[1] * 16.0;
 
 	innerColor = getBackgroundColor();
 	m_marlett.setColor(getForegroundColor());
@@ -150,7 +150,7 @@ void UIVertScroll::DrawArrow
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(text),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 }
 
@@ -164,10 +164,10 @@ void UIVertScroll::DrawThumb
 	float thumbHeight, thumbdiff;
 	UColor thumbInside;
 
-	thumbdiff = m_frame.size.height - m_vVirtualScale[1] * 32.0;
+	thumbdiff = m_frame.size.height - getVirtualScale()[1] * 32.0;
 
 	inbarrect.pos.x = 0.0;
-	inbarrect.pos.y = m_vVirtualScale[1] * 16.0;
+	inbarrect.pos.y = getVirtualScale()[1] * 16.0;
 	inbarrect.size.width = m_frame.size.width;
 	inbarrect.size.height = m_frame.size.height - thumbdiff;
 
@@ -500,10 +500,10 @@ void UIVertScroll::InitFrameAlignRight
 	UIRect2D frame, frameOut;
 
 	frame = parent->getClientFrame();
-	frameOut.pos.x = frame.pos.x + frame.size.width - (fWidthPadding + 16.0) * m_vVirtualScale[0];
-	frameOut.pos.y = fHeightPadding * m_vVirtualScale[1];
-	frameOut.size.width = m_vVirtualScale[0] * 16.0;
-	frameOut.size.height = frame.size.height - (fHeightPadding * 2) * m_vVirtualScale[1];
+	frameOut.pos.x = frame.pos.x + frame.size.width - (fWidthPadding + 16.0) * getVirtualScale()[0];
+	frameOut.pos.y = fHeightPadding * getVirtualScale()[1];
+	frameOut.size.width = getVirtualScale()[0] * 16.0;
+	frameOut.size.height = frame.size.height - (fHeightPadding * 2) * getVirtualScale()[1];
 
 	if (!m_frameinitted)
 	{
@@ -514,3 +514,8 @@ void UIVertScroll::InitFrameAlignRight
 		setFrame(frameOut);
 	}
 }
+
+void UIVertScroll::FrameInitialized()
+{
+	UIWidget::FrameInitialized();
+}
diff --git a/code/uilib/uivertscroll.h b/code/uilib/uivertscroll.h
index f1f3232a..dd245167 100644
--- a/code/uilib/uivertscroll.h
+++ b/code/uilib/uivertscroll.h
@@ -70,5 +70,6 @@ public:
 	void			setThumbColor( const UColor& thumb );
 	void			setSolidBorderColor( const UColor& col );
 	void			InitFrameAlignRight( UIWidget *parent, float fWidthPadding, float fHeightPadding );
+	void			FrameInitialized() override;
 };
 
diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 77ba2361..0082c4c9 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -607,6 +607,23 @@ void DrawBoxWithSolidBorder( const UIRect2D& rect, const UColor& inside, const U
 	}
 }
 
+static bool scaleFrameVirtualRes(UIRect2D& frame, vec3_t outScale, const vec3_t newScale)
+{
+	if (!VectorCompare2D(outScale, newScale))
+	{
+        frame.pos.x = frame.pos.x / outScale[0] * newScale[0];
+        frame.pos.y = frame.pos.y / outScale[1] * newScale[1];
+        frame.size.width = frame.size.width / outScale[0] * newScale[0];
+        frame.size.height = frame.size.height / outScale[1] * newScale[1];
+		outScale[0] = newScale[0];
+		outScale[1] = newScale[1];
+
+		return true;
+	}
+
+	return false;
+}
+
 UIReggedMaterial::UIReggedMaterial()
 {
 	hMat = 0;
@@ -924,7 +941,7 @@ void UIWidget::DrawTitle
 
 {
 	m_font->setColor( m_foreground_color );
-	m_font->Print( x, y, Sys_LV_CL_ConvertString( m_title ), -1, m_bVirtual );
+	m_font->Print( x, y, Sys_LV_CL_ConvertString( m_title ), -1, getVirtualScale() );
 }
 
 void UIWidget::Motion
@@ -1108,16 +1125,17 @@ void UIWidget::AlignPosition
 
         SetVirtualScale(vNewVirtualScale);
 
-		if (!VectorCompare2D(m_vVirtualScale, vNewVirtualScale))
-		{
-			m_frame.pos.x = m_frame.pos.x / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.pos.y = m_frame.pos.y / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_frame.size.width = m_frame.size.width / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.size.height = m_frame.size.height / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_vVirtualScale[0] = vNewVirtualScale[0];
-			m_vVirtualScale[1] = vNewVirtualScale[1];
-		}
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
 	}
+	else if (uid.bHighResScaling)
+    {
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, uid.scaleRes);
+	}
+    else
+    {
+		vec2_t vNewVirtualScale = { 1.0, 1.0 };
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+    }
 
 	if (m_flags & WF_STRETCH_VERTICAL)
 	{
@@ -1330,7 +1348,7 @@ void UIWidget::InitFrame
 		setParent( parentview );
 	}
 	else if( this != &uWinMan )
-	{
+    {
 		setParent( &uWinMan );
 	}
 
@@ -2473,7 +2491,7 @@ void UIWidget::Display
 
 		if( m_flags & WF_TILESHADER )
 		{
-               if (m_bVirtual) {
+            if (m_bVirtual) {
 				float fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_material->GetMaterial());
 				float fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_material->GetMaterial());
                    
@@ -2555,7 +2573,7 @@ float UIWidget::getTitleHeight
 	)
 
 {
-	return m_font->getHeight( m_bVirtual );
+	return m_font->getHeight(getVirtualScale());
 }
 
 bool UIWidget::CanActivate
@@ -2741,22 +2759,27 @@ void UIWidget::Realign
 	)
 
 {
+	bool bScaled = false;
+
 	if (m_bVirtual)
 	{
 		vec2_t vNewVirtualScale;
 
-		SetVirtualScale(vNewVirtualScale);
+        SetVirtualScale(vNewVirtualScale);
 
-		if (!VectorCompare2D(m_vVirtualScale, vNewVirtualScale))
-		{
-			m_frame.pos.x = m_frame.pos.x / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.pos.y = m_frame.pos.y / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_frame.size.width = m_frame.size.width / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.size.height = m_frame.size.height / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_vVirtualScale[0] = vNewVirtualScale[0];
-			m_vVirtualScale[1] = vNewVirtualScale[1];
-		}
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+		bScaled = true;
 	}
+	else if (uid.bHighResScaling)
+    {
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, uid.scaleRes);
+        bScaled = true;
+    }
+    else
+    {
+		vec2_t vNewVirtualScale = { 1.0, 1.0 };
+		bScaled = scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+    }
 
 	if (m_flags & WF_STRETCH_VERTICAL)
 	{
@@ -2797,7 +2820,7 @@ void UIWidget::Realign
 		m_frame.pos.y = 0;
 	}
 
-	if ((m_align & WA_FULL) || (m_flags & (WF_STRETCH_HORIZONTAL | WF_STRETCH_VERTICAL)) || (m_bVirtual))
+	if ((m_align & WA_FULL) || (m_flags & (WF_STRETCH_HORIZONTAL | WF_STRETCH_VERTICAL)) || bScaled)
 	{
 		setFrame(m_frame);
 		m_startingpos = m_frame.pos;
@@ -3119,7 +3142,16 @@ bool UIWidget::isVirtual() const
 
 const vec2_t& UIWidget::getVirtualScale() const
 {
-	return m_vVirtualScale;
+	if (m_bVirtual) {
+		return m_vVirtualScale;
+	} else {
+		return uid.scaleRes;
+	}
+}
+
+const vec2_t& UIWidget::getHighResScale() const
+{
+	return uid.scaleRes;
 }
 
 void UIWidget::SetEnabledCvar
@@ -3208,16 +3240,17 @@ void UIWidgetContainer::AlignPosition
 
         SetVirtualScale(vNewVirtualScale);
 
-		if (!VectorCompare2D(m_vVirtualScale, vNewVirtualScale))
-		{
-			m_frame.pos.x = m_frame.pos.x / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.pos.y = m_frame.pos.y / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_frame.size.width = m_frame.size.width / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.size.height = m_frame.size.height / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_vVirtualScale[0] = vNewVirtualScale[0];
-			m_vVirtualScale[1] = vNewVirtualScale[1];
-		}
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
 	}
+	else if (uid.bHighResScaling)
+    {
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, uid.scaleRes);
+    }
+    else
+    {
+		vec2_t vNewVirtualScale = { 1.0, 1.0 };
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+    }
 
 	if (m_align & WA_LEFT)
 	{
diff --git a/code/uilib/uiwidget.h b/code/uilib/uiwidget.h
index 602f8838..53dff224 100644
--- a/code/uilib/uiwidget.h
+++ b/code/uilib/uiwidget.h
@@ -333,6 +333,7 @@ public:
 	// Added in OPM
 	bool				isVirtual() const;
 	const vec2_t&		getVirtualScale() const;
+	const vec2_t&		getHighResScale() const;
 };
 
 class UIWidgetContainer : public UIWidget {
diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index 41c528ef..90631334 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -269,7 +269,7 @@ void UIWindowManager::UpdateViews(void)
         if (UI_GetCvarInt("ui_drawcoords", 0)) {
             x = uid.mouseX + 10;
             y = uid.mouseY - 10;
-            m_font->Print(x, y, va("%d:%d", uid.mouseX, uid.mouseY), -1, m_bVirtual);
+            m_font->Print(x, y, va("%d:%d", uid.mouseX, uid.mouseY), -1, m_bVirtual ? m_vVirtualScale : NULL);
         }
     }
 }
diff --git a/docs/features.md b/docs/features.md
index 5c1b3a5d..483b31ff 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -10,6 +10,7 @@ A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, gre
 - Cross-platform support
 - Multiuser support on OS (On Windows, user game data is stored in "%APPDATA%\openmohaa")
 - Many bug fixes and additions from ioquake3
+- Automatic scaling of UI elements on high resolutions like 4K
 
 Overall, better compatibility on modern systems and bugfixes.
 

From 0534482c22f99dd20f4a391db1eaf0f6b020a680 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:07:32 +0100
Subject: [PATCH 1572/2040] Fix a small mistake where it uses vidWidth rather
 than vidHeight

---
 code/cgame/cg_drawtools.cpp | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index 27ea8d6b..4f798039 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -587,7 +587,7 @@ void CG_HudDrawElements()
     }
 
     virtualScale[0] = cgs.glconfig.vidWidth / 640.0;
-    virtualScale[1] = cgs.glconfig.vidWidth / 480.0;
+    virtualScale[1] = cgs.glconfig.vidHeight / 480.0;
 
     for (i = 0; i < MAX_HUDDRAW_ELEMENTS; i++) {
         if ((!cgi.HudDrawElements[i].hShader && !cgi.HudDrawElements[i].string[0])
@@ -631,25 +631,19 @@ void CG_HudDrawElements()
 
         cgi.R_SetColor(cgi.HudDrawElements[i].vColor);
         if (cgi.HudDrawElements[i].string[0]) {
-            if (cgi.HudDrawElements[i].pFont) {
-                cgi.R_DrawString(
-                    cgi.HudDrawElements[i].pFont,
-                    cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
-                    fX,
-                    fY,
-                    -1,
-                    cgi.HudDrawElements[i].bVirtualScreen ? virtualScale : cgs.uiHiResScale
-                );
-            } else {
-                cgi.R_DrawString(
-                    cgs.media.hudDrawFont,
-                    cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
-                    fX,
-                    fY,
-                    -1,
-                    cgi.HudDrawElements[i].bVirtualScreen ? virtualScale : cgs.uiHiResScale
-                );
+            fontheader_t* pFont = cgi.HudDrawElements[i].pFont;
+            if (!pFont) {
+                pFont = cgs.media.hudDrawFont;
             }
+
+            cgi.R_DrawString(
+                pFont,
+                cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
+                fX,
+                fY,
+                -1,
+                cgi.HudDrawElements[i].bVirtualScreen ? virtualScale : cgs.uiHiResScale
+            );
         } else {
             if (cgi.HudDrawElements[i].bVirtualScreen) {
                 CG_AdjustFrom640(&fX, &fY, &fWidth, &fHeight);

From aa74934ae059f19e5a9e27db53a6a0bbb97d0559 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:21:20 +0100
Subject: [PATCH 1573/2040] Fix huddraw scaling with high resolutions

---
 code/cgame/cg_drawtools.cpp | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index 4f798039..e4708a54 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -601,6 +601,13 @@ void CG_HudDrawElements()
         fWidth  = cgi.HudDrawElements[i].iWidth;
         fHeight = cgi.HudDrawElements[i].iHeight;
 
+        if (!cgi.HudDrawElements[i].bVirtualScreen) {
+            fWidth *= cgs.uiHiResScale[0];
+            fHeight *= cgs.uiHiResScale[1];
+            fX *= cgs.uiHiResScale[0];
+            fY *= cgs.uiHiResScale[1];
+        }
+
         if (cgi.HudDrawElements[i].iHorizontalAlign == HUD_ALIGN_X_CENTER) {
             if (cgi.HudDrawElements[i].bVirtualScreen) {
                 fX += 320.0 - fWidth * 0.5;
@@ -636,14 +643,25 @@ void CG_HudDrawElements()
                 pFont = cgs.media.hudDrawFont;
             }
 
-            cgi.R_DrawString(
-                pFont,
-                cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
-                fX,
-                fY,
-                -1,
-                cgi.HudDrawElements[i].bVirtualScreen ? virtualScale : cgs.uiHiResScale
-            );
+            if (cgi.HudDrawElements[i].bVirtualScreen) {
+                cgi.R_DrawString(
+                    pFont,
+                    cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
+                    fX,
+                    fY,
+                    -1,
+                    virtualScale
+                );
+            } else {
+                cgi.R_DrawString(
+                    pFont,
+                    cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
+                    fX / cgs.uiHiResScale[0],
+                    fY / cgs.uiHiResScale[1],
+                    -1,
+                    cgs.uiHiResScale
+                );
+            }
         } else {
             if (cgi.HudDrawElements[i].bVirtualScreen) {
                 CG_AdjustFrom640(&fX, &fY, &fWidth, &fHeight);

From d5d5c7a55df7fe05ce10464fa02299fa7d069bdc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:23:49 +0100
Subject: [PATCH 1574/2040] Use bits per sample rather than bytes as there are
 4-bit sounds

---
 code/client/snd_openal_new.cpp | 18 +++++++++---------
 code/client/snd_openal_new.h   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index fc242f76..11324874 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -4572,7 +4572,7 @@ U32 openal_channel_two_d_stream::sample_offset()
     ALint         numProcessedBuffers = 0;
     ALint         numQueuedBuffers    = 0;
     unsigned int  totalQueueLength    = 0;
-    unsigned int  bytesPerSample      = 0;
+    unsigned int  bitsPerSample       = 0;
     unsigned int  offset              = 0;
     ALint         bits = 0, channels = 0;
 
@@ -4586,7 +4586,7 @@ U32 openal_channel_two_d_stream::sample_offset()
     alDieIfError();
 
     totalQueueLength = getQueueLength();
-    bytesPerSample   = getBytesPerSample();
+    bitsPerSample    = getBitsPerSample();
 
     assert(playerByteOffset < totalQueueLength);
     assert(streamNextOffset >= totalQueueLength || stream);
@@ -4614,7 +4614,7 @@ U32 openal_channel_two_d_stream::sample_offset()
         offset = totalQueueLength - streamNextOffset + playerByteOffset;
     }
 
-    return offset / bytesPerSample;
+    return offset * 8 / bitsPerSample;
 }
 
 /*
@@ -4644,7 +4644,7 @@ void openal_channel_two_d_stream::set_sample_offset(U32 offset)
     snd_stream_t *stream;
     unsigned int  bytesToRead, bytesRead;
     unsigned int  byteOffset;
-    unsigned int  bytesPerSample;
+    unsigned int  bitsPerSample;
     unsigned int  streamPosition;
     ALuint        format;
     ALint         numQueuedBuffers;
@@ -4657,8 +4657,8 @@ void openal_channel_two_d_stream::set_sample_offset(U32 offset)
 
     stream         = (snd_stream_t *)streamHandle;
     streamPosition = getCurrentStreamPosition();
-    bytesPerSample = getBytesPerSample();
-    byteOffset     = offset * bytesPerSample;
+    bitsPerSample  = getBitsPerSample();
+    byteOffset     = offset * bitsPerSample / 8;
 
     if (byteOffset >= streamPosition && byteOffset < streamNextOffset) {
         //
@@ -4908,13 +4908,13 @@ unsigned int openal_channel_two_d_stream::getCurrentStreamPosition() const
 
 /*
 ==============
-openal_channel_two_d_stream::getBytesPerSample
+openal_channel_two_d_stream::getBitsPerSample
 
 Return the number of bytes per sample.
 It assumes that all pending buffers have the same channels and bits.
 ==============
 */
-unsigned int openal_channel_two_d_stream::getBytesPerSample() const
+unsigned int openal_channel_two_d_stream::getBitsPerSample() const
 {
     unsigned int bufferId;
     ALint        bits = 0, channels = 0;
@@ -4925,5 +4925,5 @@ unsigned int openal_channel_two_d_stream::getBytesPerSample() const
     qalGetBufferi(buffers[bufferId], AL_CHANNELS, &channels);
     alDieIfError();
 
-    return bits * channels / 8;
+    return bits * channels;
 }
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index d18e1299..27ef2a75 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -165,7 +165,7 @@ private:
 
     unsigned int getQueueLength() const;
     unsigned int getCurrentStreamPosition() const;
-    unsigned int getBytesPerSample() const;
+    unsigned int getBitsPerSample() const;
 };
 
 struct openal_movie_channel : public openal_channel {

From 4775f29194d0e9dd5e99d09b81dc5ed117bb014d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:36:37 +0100
Subject: [PATCH 1575/2040] Fix build warnings and errors

---
 code/cgame/cg_commands.cpp | 2 +-
 code/cgame/cg_main.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index ddabbb0e..a8395aa7 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -4146,7 +4146,7 @@ void ClientGameCommandManager::StopLoopSound(Event* ev)
     }
 
     Com_Printf("\n\nClientGameCommandManager::StopLoopSound\n\n");
-    current_centity->tikiLoopSound = NULL;
+    current_centity->tikiLoopSound = (sfxHandle_t)0;
 }
 
 //===============
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 17468f3b..256708a2 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -570,7 +570,7 @@ void CG_GetRendererConfig(void)
     cgi.GetGlconfig(&cgs.glconfig);
     cgs.screenXScale = cgs.glconfig.vidWidth / 640.0;
     cgs.screenYScale = cgs.glconfig.vidHeight / 480.0;
-    cgi.UI_GetHighResolutionScale(&cgs.uiHiResScale);
+    cgi.UI_GetHighResolutionScale(cgs.uiHiResScale);
 }
 
 /*

From 71450fb36e8186997b02a50d302a7e34713a2c16 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 15:26:01 +0100
Subject: [PATCH 1576/2040] Move renderer to renderergl1

---
 CMakeLists.txt                                |    2 +-
 code/renderer/tr_backend.c                    | 1461 -------
 code/renderer/tr_bsp.c                        | 2497 -----------
 code/renderer/tr_cmds.c                       |  491 ---
 code/renderer/tr_curve.c                      |  624 ---
 code/renderer/tr_flares.c                     |  428 --
 code/renderer/tr_image.c                      | 3266 --------------
 code/renderer/tr_init.c                       | 1876 --------
 code/renderer/tr_light.c                      | 1608 -------
 code/renderer/tr_local.h                      | 2469 -----------
 code/renderer/tr_main.c                       | 1953 ---------
 code/renderer/tr_marks.c                      |  955 ----
 code/renderer/tr_scene.c                      |  657 ---
 code/renderer/tr_shade.c                      | 1876 --------
 code/renderer/tr_shade_calc.c                 | 1908 --------
 code/renderer/tr_shader.c                     | 3832 -----------------
 code/renderer/tr_shadows.c                    |  391 --
 code/renderer/tr_sky.c                        |  845 ----
 code/renderer/tr_surface.c                    |  901 ----
 code/renderer/tr_world.c                      |  914 ----
 code/{renderer => renderergl1}/CMakeLists.txt |    0
 code/{renderer => renderergl1}/qgl.h          |    0
 code/{renderer => renderergl1}/qgl_linked.h   |    0
 code/{renderer => renderergl1}/ref_trin.def   |    0
 .../{renderer => renderergl1}/renderer.vcproj |    0
 code/renderergl1/tr_altivec.c                 |  414 --
 code/renderergl1/tr_animation.c               |  521 ---
 code/renderergl1/tr_backend.c                 |  818 ++--
 code/renderergl1/tr_bsp.c                     | 3423 +++++++++------
 code/renderergl1/tr_cmds.c                    |  345 +-
 code/renderergl1/tr_curve.c                   |   29 +-
 code/{renderer => renderergl1}/tr_draw.c      |    0
 code/renderergl1/tr_flares.c                  |  151 +-
 code/{renderer => renderergl1}/tr_font.cpp    |    0
 code/{renderer => renderergl1}/tr_ghost.cpp   |    0
 code/{renderer => renderergl1}/tr_ghost.h     |    0
 code/renderergl1/tr_image.c                   | 2725 +++++++++---
 code/renderergl1/tr_init.c                    | 1104 +++--
 code/renderergl1/tr_light.c                   | 1782 ++++++--
 code/renderergl1/tr_local.h                   | 1497 +++++--
 code/renderergl1/tr_main.c                    | 1335 ++++--
 code/renderergl1/tr_marks.c                   |  669 ++-
 .../tr_marks_permanent.c                      |    0
 code/renderergl1/tr_mesh.c                    |  412 --
 code/renderergl1/tr_model.c                   | 1120 -----
 code/{renderer => renderergl1}/tr_model.cpp   |    0
 code/renderergl1/tr_model_iqm.c               | 1495 -------
 code/{renderer => renderergl1}/tr_public.h    |    0
 code/renderergl1/tr_scene.c                   |  472 +-
 code/renderergl1/tr_shade.c                   | 1255 ++++--
 code/renderergl1/tr_shade_calc.c              | 1400 ++++--
 code/renderergl1/tr_shader.c                  | 2919 ++++++++-----
 code/renderergl1/tr_shadows.c                 |  224 +-
 code/renderergl1/tr_sky.c                     |   90 +-
 .../tr_sky_portal.cpp                         |    0
 .../tr_sphere_shade.cpp                       |    0
 code/{renderer => renderergl1}/tr_sprite.c    |    0
 .../tr_staticmodels.cpp                       |    0
 code/renderergl1/tr_subs.c                    |   48 -
 .../tr_sun_flare.cpp                          |    0
 code/renderergl1/tr_surface.c                 |  845 ++--
 code/{renderer => renderergl1}/tr_swipe.cpp   |    0
 code/{renderer => renderergl1}/tr_terrain.c   |    0
 code/{renderer => renderergl1}/tr_util.cpp    |    0
 code/{renderer => renderergl1}/tr_vis.cpp     |    0
 code/{renderer => renderergl1}/tr_vis.h       |    0
 code/renderergl1/tr_world.c                   |  424 +-
 67 files changed, 14944 insertions(+), 39527 deletions(-)
 delete mode 100644 code/renderer/tr_backend.c
 delete mode 100644 code/renderer/tr_bsp.c
 delete mode 100644 code/renderer/tr_cmds.c
 delete mode 100644 code/renderer/tr_curve.c
 delete mode 100644 code/renderer/tr_flares.c
 delete mode 100644 code/renderer/tr_image.c
 delete mode 100644 code/renderer/tr_init.c
 delete mode 100644 code/renderer/tr_light.c
 delete mode 100644 code/renderer/tr_local.h
 delete mode 100644 code/renderer/tr_main.c
 delete mode 100644 code/renderer/tr_marks.c
 delete mode 100644 code/renderer/tr_scene.c
 delete mode 100644 code/renderer/tr_shade.c
 delete mode 100644 code/renderer/tr_shade_calc.c
 delete mode 100644 code/renderer/tr_shader.c
 delete mode 100644 code/renderer/tr_shadows.c
 delete mode 100644 code/renderer/tr_sky.c
 delete mode 100644 code/renderer/tr_surface.c
 delete mode 100644 code/renderer/tr_world.c
 rename code/{renderer => renderergl1}/CMakeLists.txt (100%)
 rename code/{renderer => renderergl1}/qgl.h (100%)
 rename code/{renderer => renderergl1}/qgl_linked.h (100%)
 rename code/{renderer => renderergl1}/ref_trin.def (100%)
 rename code/{renderer => renderergl1}/renderer.vcproj (100%)
 delete mode 100644 code/renderergl1/tr_altivec.c
 delete mode 100644 code/renderergl1/tr_animation.c
 rename code/{renderer => renderergl1}/tr_draw.c (100%)
 rename code/{renderer => renderergl1}/tr_font.cpp (100%)
 rename code/{renderer => renderergl1}/tr_ghost.cpp (100%)
 rename code/{renderer => renderergl1}/tr_ghost.h (100%)
 rename code/{renderer => renderergl1}/tr_marks_permanent.c (100%)
 delete mode 100644 code/renderergl1/tr_mesh.c
 delete mode 100644 code/renderergl1/tr_model.c
 rename code/{renderer => renderergl1}/tr_model.cpp (100%)
 delete mode 100644 code/renderergl1/tr_model_iqm.c
 rename code/{renderer => renderergl1}/tr_public.h (100%)
 rename code/{renderer => renderergl1}/tr_sky_portal.cpp (100%)
 rename code/{renderer => renderergl1}/tr_sphere_shade.cpp (100%)
 rename code/{renderer => renderergl1}/tr_sprite.c (100%)
 rename code/{renderer => renderergl1}/tr_staticmodels.cpp (100%)
 delete mode 100644 code/renderergl1/tr_subs.c
 rename code/{renderer => renderergl1}/tr_sun_flare.cpp (100%)
 rename code/{renderer => renderergl1}/tr_swipe.cpp (100%)
 rename code/{renderer => renderergl1}/tr_terrain.c (100%)
 rename code/{renderer => renderergl1}/tr_util.cpp (100%)
 rename code/{renderer => renderergl1}/tr_vis.cpp (100%)
 rename code/{renderer => renderergl1}/tr_vis.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93789e19..695730cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,7 @@ if (NOT BUILD_NO_CLIENT)
 	option(NO_MODERN_DMA "Use older sound-system" FALSE)
 
 	add_subdirectory("code/client")
-	add_subdirectory("code/renderer")
+	add_subdirectory("code/renderergl1")
 	add_subdirectory("code/sdl")
 
 	#include("code/renderergl2/glsl/shaders.cmake")
diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
deleted file mode 100644
index e8f6e2f7..00000000
--- a/code/renderer/tr_backend.c
+++ /dev/null
@@ -1,1461 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-backEndData_t	*backEndData[SMP_FRAMES];
-backEndState_t	backEnd;
-
-
-static float	s_flipMatrix[16] = {
-	// convert from our coordinate system (looking down X)
-	// to OpenGL's coordinate system (looking down -Z)
-	0, 0, -1, 0,
-	-1, 0, 0, 0,
-	0, 1, 0, 0,
-	0, 0, 0, 1
-};
-
-void GL_SetFogColor(const vec4_t fColor) {
-	glState.fFogColor[0] = fColor[0];
-	glState.fFogColor[1] = fColor[1];
-	glState.fFogColor[2] = fColor[2];
-	glState.fFogColor[3] = fColor[3];
-
-	if (!(glState.glStateBits & GLS_FOG_COLOR)) {
-		qglFogfv(GL_FOG_COLOR, glState.fFogColor);
-	}
-}
-
-/*
-** GL_Bind
-*/
-void GL_Bind( image_t *image ) {
-	int texnum;
-
-	if ( !image ) {
-		ri.Printf( PRINT_WARNING, "GL_Bind: NULL image\n" );
-		texnum = tr.defaultImage->texnum;
-	} else {
-		texnum = image->texnum;
-		image->UseCount++;
-	}
-
-	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
-		texnum = tr.dlightImage->texnum;
-	}
-
-	if ( glState.currenttextures[glState.currenttmu] != texnum ) {
-		if (image) {
-			image->frameUsed = tr.frameCount;
-		}
-		glState.currenttextures[glState.currenttmu] = texnum;
-		qglBindTexture (GL_TEXTURE_2D, texnum);
-	}
-}
-
-/*
-** GL_SelectTexture
-*/
-void GL_SelectTexture( int unit )
-{
-	if ( glState.currenttmu == unit )
-	{
-		return;
-	}
-
-	if ( unit == 0 )
-	{
-		qglActiveTextureARB( GL_TEXTURE0_ARB );
-		GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE0_ARB )\n" );
-		qglClientActiveTextureARB( GL_TEXTURE0_ARB );
-		GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE0_ARB )\n" );
-	}
-	else if ( unit == 1 )
-	{
-		qglActiveTextureARB( GL_TEXTURE1_ARB );
-		GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE1_ARB )\n" );
-		qglClientActiveTextureARB( GL_TEXTURE1_ARB );
-		GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE1_ARB )\n" );
-	} else {
-		ri.Error( ERR_DROP, "GL_SelectTexture: unit = %i", unit );
-	}
-
-	glState.currenttmu = unit;
-}
-
-
-/*
-** GL_BindMultitexture
-*/
-void GL_BindMultitexture( image_t *image0, GLuint env0, image_t *image1, GLuint env1 ) {
-	int		texnum0, texnum1;
-
-	texnum0 = image0->texnum;
-	texnum1 = image1->texnum;
-
-	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
-		texnum0 = texnum1 = tr.dlightImage->texnum;
-	}
-
-	if ( glState.currenttextures[1] != texnum1 ) {
-		GL_SelectTexture( 1 );
-		image1->frameUsed = tr.frameCount;
-		glState.currenttextures[1] = texnum1;
-		qglBindTexture( GL_TEXTURE_2D, texnum1 );
-	}
-	if ( glState.currenttextures[0] != texnum0 ) {
-		GL_SelectTexture( 0 );
-		image0->frameUsed = tr.frameCount;
-		glState.currenttextures[0] = texnum0;
-		qglBindTexture( GL_TEXTURE_2D, texnum0 );
-	}
-}
-
-
-/*
-** GL_Cull
-*/
-void GL_Cull( int cullType ) {
-	if ( glState.faceCulling == cullType ) {
-		return;
-	}
-
-	glState.faceCulling = cullType;
-
-	if ( cullType == CT_TWO_SIDED ) 
-	{
-		qglDisable( GL_CULL_FACE );
-	} 
-	else 
-	{
-		qglEnable( GL_CULL_FACE );
-
-		if ( cullType == CT_BACK_SIDED )
-		{
-			if ( backEnd.viewParms.isMirror )
-			{
-				qglCullFace( GL_FRONT );
-			}
-			else
-			{
-				qglCullFace( GL_BACK );
-			}
-		}
-		else
-		{
-			if ( backEnd.viewParms.isMirror )
-			{
-				qglCullFace( GL_BACK );
-			}
-			else
-			{
-				qglCullFace( GL_FRONT );
-			}
-		}
-	}
-}
-
-/*
-** GL_TexEnv
-*/
-void GL_TexEnv( int env )
-{
-	if ( env == glState.texEnv[glState.currenttmu] )
-	{
-		return;
-	}
-
-	glState.texEnv[glState.currenttmu] = env;
-
-
-	switch ( env )
-	{
-	case GL_MODULATE:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-		break;
-	case GL_REPLACE:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
-		break;
-	case GL_DECAL:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL );
-		break;
-	case GL_ADD:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD );
-		break;
-	case GL_COMBINE4_NV:
-	case GL_COMBINE:
-		qglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env);
-		break;
-	default:
-		ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed\n", env );
-		break;
-	}
-}
-
-/*
-** GL_State
-**
-** This routine is responsible for setting the most commonly changed state
-** in Q3.
-*/
-void GL_State( unsigned long stateBits )
-{
-	unsigned long diff = glState.glStateBits ^ (glState.externalSetState | stateBits);
-
-	if ( !diff )
-	{
-		return;
-	}
-
-	//
-	// check depthFunc bits
-	//
-	if ( diff & GLS_DEPTHFUNC_EQUAL )
-	{
-		if ( stateBits & GLS_DEPTHFUNC_EQUAL )
-		{
-			qglDepthFunc( GL_EQUAL );
-		}
-		else
-		{
-			qglDepthFunc( GL_LEQUAL );
-		}
-	}
-
-	//
-	// check blend bits
-	//
-	if ( diff & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
-	{
-		GLenum srcFactor, dstFactor;
-
-		if ( stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
-		{
-			switch ( stateBits & GLS_SRCBLEND_BITS )
-			{
-			case GLS_SRCBLEND_ZERO:
-				srcFactor = GL_ZERO;
-				break;
-			case GLS_SRCBLEND_ONE:
-				srcFactor = GL_ONE;
-				break;
-			case GLS_SRCBLEND_DST_COLOR:
-				srcFactor = GL_DST_COLOR;
-				break;
-			case GLS_SRCBLEND_ONE_MINUS_DST_COLOR:
-				srcFactor = GL_ONE_MINUS_DST_COLOR;
-				break;
-			case GLS_SRCBLEND_SRC_ALPHA:
-				srcFactor = GL_SRC_ALPHA;
-				break;
-			case GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA:
-				srcFactor = GL_ONE_MINUS_SRC_ALPHA;
-				break;
-			case GLS_SRCBLEND_DST_ALPHA:
-				srcFactor = GL_DST_ALPHA;
-				break;
-			case GLS_SRCBLEND_ONE_MINUS_DST_ALPHA:
-				srcFactor = GL_ONE_MINUS_DST_ALPHA;
-				break;
-			case GLS_SRCBLEND_ALPHA_SATURATE:
-				srcFactor = GL_SRC_ALPHA_SATURATE;
-				break;
-			default:
-				srcFactor = GL_ONE;		// to get warning to shut up
-				ri.Error( ERR_DROP, "GL_State: invalid src blend state bits\n" );
-				break;
-			}
-
-			switch ( stateBits & GLS_DSTBLEND_BITS )
-			{
-			case GLS_DSTBLEND_ZERO:
-				dstFactor = GL_ZERO;
-				break;
-			case GLS_DSTBLEND_ONE:
-				dstFactor = GL_ONE;
-				break;
-			case GLS_DSTBLEND_SRC_COLOR:
-				dstFactor = GL_SRC_COLOR;
-				break;
-			case GLS_DSTBLEND_ONE_MINUS_SRC_COLOR:
-				dstFactor = GL_ONE_MINUS_SRC_COLOR;
-				break;
-			case GLS_DSTBLEND_SRC_ALPHA:
-				dstFactor = GL_SRC_ALPHA;
-				break;
-			case GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA:
-				dstFactor = GL_ONE_MINUS_SRC_ALPHA;
-				break;
-			case GLS_DSTBLEND_DST_ALPHA:
-				dstFactor = GL_DST_ALPHA;
-				break;
-			case GLS_DSTBLEND_ONE_MINUS_DST_ALPHA:
-				dstFactor = GL_ONE_MINUS_DST_ALPHA;
-				break;
-			default:
-				dstFactor = GL_ONE;		// to get warning to shut up
-				ri.Error( ERR_DROP, "GL_State: invalid dst blend state bits\n" );
-				break;
-			}
-
-			qglEnable( GL_BLEND );
-			qglBlendFunc( srcFactor, dstFactor );
-		}
-		else
-		{
-			qglDisable( GL_BLEND );
-		}
-	}
-
-	//
-	// check depthmask
-	//
-	if ( diff & GLS_DEPTHMASK_TRUE )
-	{
-		if ( stateBits & GLS_DEPTHMASK_TRUE )
-		{
-			qglDepthMask( GL_TRUE );
-		}
-		else
-		{
-			qglDepthMask( GL_FALSE );
-		}
-	}
-
-	//
-	// fill/line mode
-	//
-	if ( diff & GLS_POLYMODE_LINE )
-	{
-		if ( stateBits & GLS_POLYMODE_LINE )
-		{
-			qglPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
-		}
-		else
-		{
-			qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
-		}
-	}
-
-	//
-	// depthtest
-	//
-	if ( diff & GLS_DEPTHTEST_DISABLE )
-	{
-		if ( stateBits & GLS_DEPTHTEST_DISABLE )
-		{
-			qglDisable( GL_DEPTH_TEST );
-		}
-		else
-		{
-			qglEnable( GL_DEPTH_TEST );
-		}
-	}
-
-	if ((diff & GLS_MULTITEXTURE_ENV) || (diff & GLS_MULTITEXTURE))
-	{
-		if (stateBits & GLS_MULTITEXTURE_ENV)
-		{
-			GL_TexEnv(GL_COMBINE4_NV);
-		}
-		else if (stateBits & GLS_MULTITEXTURE)
-		{
-			if (glState.cntTexEnvExt != GLS_MULTITEXTURE)
-			{
-				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_PRIMARY_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-				glState.cntTexEnvExt = GLS_MULTITEXTURE;
-			}
-
-			GL_TexEnv(GL_COMBINE);
-		}
-		else
-		{
-			GL_TexEnv(GL_MODULATE);
-		}
-	}
-
-	//
-	// alpha test
-	//
-	if ( diff & GLS_ATEST_BITS )
-	{
-		switch (stateBits & GLS_ATEST_BITS)
-		{
-		case 0:
-			qglDisable(GL_ALPHA_TEST);
-			break;
-		case GLS_ATEST_GT_0:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_GREATER, 0.05f);
-			break;
-		case GLS_ATEST_LT_80:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_LESS, 0.5f);
-			break;
-		case GLS_ATEST_GE_80:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_GEQUAL, 0.5f);
-			break;
-		case GLS_ATEST_LT_FOLIAGE1:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_LESS, r_alpha_foliage1->value);
-			break;
-		case GLS_ATEST_GE_FOLIAGE1:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_GEQUAL, r_alpha_foliage1->value);
-			break;
-		case GLS_ATEST_LT_FOLIAGE2:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_LESS, r_alpha_foliage2->value);
-			break;
-		case GLS_ATEST_GE_FOLIAGE2:
-			qglEnable(GL_ALPHA_TEST);
-			qglAlphaFunc(GL_GEQUAL, r_alpha_foliage2->value);
-			break;
-		default:
-			assert(0);
-			break;
-		}
-	}
-
-	if (diff & GLS_CLAMP_EDGE)
-	{
-		float clampValue;
-
-		if (haveClampToEdge)
-		{
-			if (stateBits & GLS_CLAMP_EDGE) {
-				clampValue = GL_CLAMP_TO_EDGE;
-			}
-			else {
-				clampValue = GL_REPEAT;
-			}
-		}
-		else
-		{
-			if (stateBits & GLS_CLAMP_EDGE) {
-				clampValue = GL_CLAMP;
-			}
-			else {
-				clampValue = GL_REPEAT;
-			}
-		}
-
-		if (qglActiveTextureARB)
-		{
-			int currenttmu = glState.currenttmu;
-
-			GL_SelectTexture(0);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
-
-			GL_SelectTexture(1);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
-
-			GL_SelectTexture(currenttmu);
-		}
-		else
-		{
-			GL_SelectTexture(0);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
-		}
-	}
-	
-	if (diff & GLS_FOG)
-	{
-		if (glState.externalSetState & GLS_FOG)
-		{
-			qglEnable(GL_FOG);
-
-			if (stateBits & GLS_FOG_BLACK)
-			{
-				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
-				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
-			}
-			else if (stateBits & GLS_FOG_WHITE)
-			{
-				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
-				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
-			}
-			else
-			{
-				//
-				// Use the global fog
-				qglFogfv(GL_FOG_COLOR, glState.fFogColor);
-			}
-		}
-		else
-		{
-			qglDisable(GL_FOG);
-		}
-	}
-	else if (glState.externalSetState & GLS_FOG)
-	{
-		if (diff & GLS_FOG_ENABLED)
-		{
-			if (stateBits & GLS_FOG_ENABLED) {
-				qglEnable(GL_FOG);
-			}
-			else {
-				qglDisable(GL_FOG);
-			}
-		}
-
-		if (diff & GLS_FOG_COLOR)
-		{
-			if (stateBits & GLS_FOG_BLACK)
-			{
-				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
-				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
-			}
-			else if (stateBits & GLS_FOG_WHITE)
-			{
-				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
-				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
-			}
-			else
-            {
-                //
-                // Use the global fog
-                qglFogfv(GL_FOG_COLOR, glState.fFogColor);
-            }
-		}
-	}
-
-	glState.glStateBits = stateBits | glState.externalSetState;
-}
-
-
-
-/*
-================
-RB_Hyperspace
-
-A player has predicted a teleport, but hasn't arrived yet
-================
-*/
-static void RB_Hyperspace( void ) {
-	float		c;
-
-	if ( !backEnd.isHyperspace ) {
-		// do initialization shit
-	}
-
-	c = ( backEnd.refdef.time & 255 ) / 255.0f;
-	qglClearColor( c, c, c, 1 );
-	qglClear( GL_COLOR_BUFFER_BIT );
-
-	backEnd.isHyperspace = qtrue;
-}
-
-
-static void SetViewportAndScissor( void ) {
-	qglMatrixMode(GL_PROJECTION);
-	qglLoadMatrixf( backEnd.viewParms.projectionMatrix );
-	qglMatrixMode(GL_MODELVIEW);
-
-	// set the window clipping
-	qglViewport( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, 
-		backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight );
-	qglScissor( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, 
-		backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight );
-}
-
-/*
-=================
-RB_BeginDrawingView
-
-Any mirrored or portaled views have already been drawn, so prepare
-to actually render the visible surfaces for this view
-=================
-*/
-void RB_BeginDrawingView (void) {
-	int clearBits = 0;
-
-	// sync with gl if needed
-	if ( r_finish->integer == 1 && !glState.finishCalled ) {
-		qglFinish ();
-		glState.finishCalled = qtrue;
-	}
-	if ( r_finish->integer == 0 ) {
-		glState.finishCalled = qtrue;
-	}
-
-	// we will need to change the projection matrix before drawing
-	// 2D images again
-	backEnd.in2D = qfalse;
-
-	//
-	// set the modelview matrix for the viewer
-	//
-	SetViewportAndScissor();
-
-	R_UploadDlights();
-
-	// ensures that depth writes are enabled for the depth clear
-	GL_State( GLS_DEFAULT );
-	// clear relevant buffers
-	clearBits = GL_DEPTH_BUFFER_BIT;
-
-	if ( r_measureOverdraw->integer || r_shadows->integer == 3 )
-	{
-		clearBits |= GL_STENCIL_BUFFER_BIT;
-	}
-
-	if (!( backEnd.refdef.rdflags & RDF_NOWORLDMODEL))
-	{
-		if ((backEnd.viewParms.farplane_distance && !tr.skyRendered && !tr.portalRendered) || tr.farclip)
-		{
-			clearBits |= GL_COLOR_BUFFER_BIT;
-			qglClearColor(glState.fFogColor[0], glState.fFogColor[1], glState.fFogColor[2], glState.fFogColor[3]);
-		}
-		else
-		{
-			if (r_fastsky->integer)
-			{
-				clearBits |= GL_COLOR_BUFFER_BIT;
-				qglClearColor(0.5, 0.5, 1.0, 1.0);
-			}
-		}
-	}
-	qglClear( clearBits );
-
-	if ( ( backEnd.refdef.rdflags & RDF_HYPERSPACE ) )
-	{
-		RB_Hyperspace();
-		return;
-	}
-	else
-	{
-		backEnd.isHyperspace = qfalse;
-	}
-
-	glState.faceCulling = -1;		// force face culling to set next time
-
-	// we will only draw a sun if there was sky rendered in this view
-	backEnd.skyRenderedThisView = qfalse;
-
-	// clip to the plane of the portal
-	if ( backEnd.viewParms.isPortal ) {
-		float	plane[4];
-		double	plane2[4];
-
-		plane[0] = backEnd.viewParms.portalPlane.normal[0];
-		plane[1] = backEnd.viewParms.portalPlane.normal[1];
-		plane[2] = backEnd.viewParms.portalPlane.normal[2];
-		plane[3] = backEnd.viewParms.portalPlane.dist;
-
-		plane2[0] = DotProduct (backEnd.viewParms.ori.axis[0], plane);
-		plane2[1] = DotProduct (backEnd.viewParms.ori.axis[1], plane);
-		plane2[2] = DotProduct (backEnd.viewParms.ori.axis[2], plane);
-		plane2[3] = DotProduct (plane, backEnd.viewParms.ori.origin) - plane[3];
-
-		qglLoadMatrixf( s_flipMatrix );
-		qglClipPlane (GL_CLIP_PLANE0, plane2);
-		qglEnable (GL_CLIP_PLANE0);
-	} else {
-		qglDisable (GL_CLIP_PLANE0);
-	}
-}
-
-/*
-==================
-RB_RenderDrawSurfList
-==================
-*/
-void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
-	shader_t		*shader, *oldShader;
-	int				entityNum, oldEntityNum;
-	int				dlightMap, oldDlightMap;
-	qboolean		depthRange, oldDepthRange;
-	qboolean		bStaticModel, oldbStaticModel;
-	int				i;
-	drawSurf_t		*drawSurf;
-	int				oldSort;
-	float			originalTime;
-
-	// save original time for entity shader offsets
-	originalTime = backEnd.refdef.floatTime;
-
-	// clear the z buffer, set the modelview, etc
-	RB_BeginDrawingView ();
-
-	// draw everything
-	oldEntityNum = -1;
-	backEnd.currentEntity = &tr.worldEntity;
-	oldShader = NULL;
-	oldDepthRange = qfalse;
-	oldDlightMap = 0;
-	oldSort = -1;
-	oldbStaticModel = -1;
-	depthRange = qfalse;
-
-	backEnd.pc.c_surfaces += numDrawSurfs;
-	backEnd.numSpheresUsed = 0;
-
-	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
-		if ( drawSurf->sort == oldSort ) {
-			// fast path, same as previous sort
-			rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
-			continue;
-		}
-		oldSort = drawSurf->sort;
-		if (*drawSurf->surface != SF_SPRITE) {
-			R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlightMap, &bStaticModel);
-		} else {
-			shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
-			entityNum = ENTITYNUM_WORLD;
-			dlightMap = 0;
-			bStaticModel = qfalse;
-		}
-
-		//
-		// change the tess parameters if needed
-		// a "entityMergable" shader is a shader that can have surfaces from seperate
-		// entities merged into a single batch, like smoke and blood puff sprites
-		if (shader != oldShader || dlightMap != oldDlightMap || (oldShader->flags & 1)
-			|| ( entityNum != oldEntityNum && !shader->entityMergable )
-			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )) {
-			if (oldShader != NULL) {
-				RB_EndSurface();
-			}
-			RB_BeginSurface( shader );
-			oldShader = shader;
-			oldDlightMap = dlightMap;
-		}
-
-		backEnd.currentSphere = &backEnd.spareSphere;
-		//
-		// change the modelview matrix if needed
-		//
-		if ( entityNum != oldEntityNum || bStaticModel != oldbStaticModel ) {
-			depthRange = qfalse;
-
-			if (bStaticModel) {
-				backEnd.shaderStartTime = 0.0;
-				backEnd.currentEntity = 0;
-				backEnd.spareSphere.TessFunction = 0;
-				backEnd.currentStaticModel = &backEnd.refdef.staticModels[entityNum];
-				R_RotateForStaticModel(backEnd.currentStaticModel, &backEnd.viewParms, &backEnd.ori );
-			}
-			else {
-				backEnd.currentStaticModel = NULL;
-				if (entityNum != ENTITYNUM_WORLD) {
-					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
-					backEnd.shaderStartTime = backEnd.currentEntity->e.shaderTime;
-
-					// set up the transformation matrix
-					R_RotateForEntity(backEnd.currentEntity, &backEnd.viewParms, &backEnd.ori);
-
-					// set up the dynamic lighting if needed
-					if (backEnd.currentEntity->needDlights) {
-						R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
-					}
-
-					if (backEnd.currentEntity->e.renderfx & RF_DEPTHHACK) {
-						// hack the depth range to prevent view model from poking into walls
-						depthRange = qtrue;
-					}
-				}
-				else {
-					backEnd.currentEntity = &tr.worldEntity;
-					backEnd.ori = backEnd.viewParms.world;
-					backEnd.shaderStartTime = 0.0;
-					R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
-				}
-			}
-
-			qglLoadMatrixf( backEnd.ori.modelMatrix );
-
-			//
-			// change depthrange if needed
-			//
-			if ( oldDepthRange != depthRange ) {
-				if ( depthRange ) {
-					qglDepthRange (0, 0.3);
-				} else {
-					qglDepthRange (0, 1.0);
-				}
-				oldDepthRange = depthRange;
-			}
-
-			oldEntityNum = entityNum;
-			oldbStaticModel = bStaticModel;
-		}
-
-		tess.dlightMap = dlightMap;
-		if (r_fastdlights->integer) {
-			tess.dlightMap = 0;
-		}
-
-		if (bStaticModel)
-		{
-			if (r_drawspherelights->integer) {
-				RB_Static_BuildDLights();
-			}
-
-			if (!backEnd.currentStaticModel->bLightGridCalculated) {
-				RB_Grid_SetupStaticModel();
-			}
-		}
-		else if (backEnd.currentEntity->e.tiki)
-		{
-			if (shader->needsLGrid
-				|| shader->needsLSpherical && r_fastentlight->integer
-				|| !r_drawspherelights->integer)
-			{
-				backEnd.currentSphere->TessFunction = RB_CalcLightGridColor;
-				RB_Grid_SetupEntity();
-			}
-			else if (shader->needsLSpherical)
-			{
-				if (tr.refdef.rdflags & RDF_HUD)
-				{
-					backEnd.currentSphere = &backEnd.hudSphere;
-					backEnd.hudSphere.TessFunction = 0;
-					RB_Sphere_SetupEntity();
-				}
-				else if (backEnd.currentEntity->sphereCalculated)
-				{
-					backEnd.currentSphere = &backEnd.spheres[backEnd.currentEntity->lightingSphere];
-				}
-				else
-				{
-					if (backEnd.numSpheresUsed == MAX_SPHERE_LIGHTS)
-					{
-						ri.Printf(PRINT_DEVELOPER, "Spherical lighting: Ran out of space in the sphere array!\n");
-						backEnd.currentSphere = &backEnd.spareSphere;
-					}
-					else
-					{
-						backEnd.currentSphere = &backEnd.spheres[backEnd.numSpheresUsed];
-						backEnd.currentEntity->lightingSphere = backEnd.numSpheresUsed++;
-						backEnd.currentEntity->sphereCalculated = 1;
-					}
-
-					backEnd.currentSphere->TessFunction = NULL;
-					RB_Sphere_SetupEntity();
-				}
-			}
-		}
-
-		if (*drawSurf->surface == SF_SPRITE) {
-			backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
-		}
-
-		// add the triangles for this surface
-		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
-	}
-
-	// draw the contents of the last shader batch
-	if (oldShader != NULL) {
-		RB_EndSurface();
-	}
-
-	// go back to the world modelview matrix
-	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
-	if ( depthRange ) {
-		qglDepthRange (0, 1.0);
-	}
-
-	RB_ShadowFinish();
-	if (!(backEnd.refdef.rdflags & RDF_HUD)) {
-		RB_RenderFlares();
-		R_DrawLensFlares();
-	}
-
-	if (g_bInfoworldtris)
-	{
-		g_bInfoworldtris = 0;
-		R_PrintInfoWorldtris();
-	}
-
-#if 0
-	RB_DrawSun();
-#endif
-	// darken down any stencil shadows
-	RB_ShadowFinish();		
-
-	// add light flares on lights that aren't obscured
-	RB_RenderFlares();
-}
-
-/*
-==================
-RB_RenderSpriteSurfList
-==================
-*/
-void RB_RenderSpriteSurfList(drawSurf_t* drawSurfs, int numDrawSurfs) {
-	shader_t	*shader;
-	shader_t	*oldShader;
-	qboolean	depthRange;
-	qboolean	oldDepthRange;
-	int			i;
-	drawSurf_t	*drawSurf;
-
-    backEnd.currentEntity = &tr.worldEntity;
-    backEnd.currentStaticModel = 0;
-
-	backEnd.pc.c_surfaces += numDrawSurfs;
-	backEnd.ori = backEnd.viewParms.world;
-
-	oldShader = NULL;
-    depthRange = qfalse;
-    oldDepthRange = qfalse;
-
-    for (i = 0, drawSurf = drawSurfs; i < numDrawSurfs; i++, drawSurf++) {
-		shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
-		depthRange = (((refSprite_t*)drawSurf->surface)->renderfx & RF_DEPTHHACK) != 0;
-
-        if ((shader != oldShader || (oldShader->flags & RF_THIRD_PERSON) != 0) && !shader->entityMergable)
-        {
-			if (oldShader) {
-				RB_EndSurface();
-			}
-
-            RB_BeginSurface(shader);
-            oldShader = shader;
-        }
-
-        qglLoadMatrixf(backEnd.ori.modelMatrix);
-
-        if (oldDepthRange != depthRange)
-        {
-			if (depthRange) {
-				qglDepthRange(0.0, 0.3);
-			} else {
-                qglDepthRange(0.0, 1.0);
-			}
-
-            oldDepthRange = depthRange;
-        }
-
-        backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
-
-        // add the triangles for this surface
-        rb_surfaceTable[*drawSurf->surface](drawSurf->surface);
-	}
-
-	if (oldShader) {
-		RB_EndSurface();
-	}
-
-    // go back to the world modelview matrix
-    qglLoadMatrixf(backEnd.viewParms.world.modelMatrix);
-	// go back to the previous depth range
-	if (depthRange) {
-		qglDepthRange(0.0, 1.0);
-	}
-}
-
-
-/*
-============================================================================
-
-RENDER BACK END THREAD FUNCTIONS
-
-============================================================================
-*/
-
-/*
-================
-RB_SetGL2D
-
-================
-*/
-void	RB_SetGL2D (void) {
-	Set2DWindow(0, 0, glConfig.vidWidth, glConfig.vidHeight, 0.0, glConfig.vidWidth, glConfig.vidHeight, 0.0, 0.0, 1.0);
-}
-
-
-/*
-=============
-RE_StretchRaw
-
-FIXME: not exactly backend
-Stretches a raw 32 bit power of 2 bitmap image over the given screen rectangle.
-Used for cinematics.
-=============
-*/
-void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
-	int			i, j;
-	int			start, end;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	R_SyncRenderThread();
-
-	// we definately want to sync every frame for the cinematics
-	qglFinish();
-
-	start = end = 0;
-	if ( r_speeds->integer ) {
-		start = ri.Milliseconds();
-	}
-
-	// make sure rows and cols are powers of 2
-	for ( i = 0 ; ( 1 << i ) < cols ; i++ ) {
-	}
-	for ( j = 0 ; ( 1 << j ) < rows ; j++ ) {
-	}
-	if ( ( 1 << i ) != cols || ( 1 << j ) != rows) {
-		ri.Error (ERR_DROP, "Draw_StretchRaw: size not a power of 2: %i by %i", cols, rows);
-	}
-
-	GL_Bind( tr.scratchImage );
-
-	// if the scratchImage isn't in the format we want, specify it as a new texture
-	if ( cols != tr.scratchImage->width || rows != tr.scratchImage->height ) {
-		tr.scratchImage->width = tr.scratchImage->uploadWidth = cols;
-		tr.scratchImage->height = tr.scratchImage->uploadHeight = rows;
-		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );	
-	} else {
-		// otherwise, just subimage upload it so that drivers can tell we are going to be changing
-		// it and don't try and do a texture compression
-		qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
-	}
-
-	if ( r_speeds->integer ) {
-		end = ri.Milliseconds();
-		ri.Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start );
-	}
-
-	RB_SetGL2D();
-
-	qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight );
-
-	qglBegin (GL_QUADS);
-	qglTexCoord2f ( 0.5f / cols,  0.5f / rows );
-	qglVertex2f (x, y);
-	qglTexCoord2f ( ( cols - 0.5f ) / cols ,  0.5f / rows );
-	qglVertex2f (x+w, y);
-	qglTexCoord2f ( ( cols - 0.5f ) / cols, ( rows - 0.5f ) / rows );
-	qglVertex2f (x+w, y+h);
-	qglTexCoord2f ( 0.5f / cols, ( rows - 0.5f ) / rows );
-	qglVertex2f (x, y+h);
-	qglEnd ();
-}
-
-/*
-=============
-RB_SetColor
-
-=============
-*/
-const void	*RB_SetColor( const void *data ) {
-	const setColorCommand_t	*cmd;
-
-	cmd = (const setColorCommand_t *)data;
-
-	backEnd.color2D[0] = cmd->color[0] * 255;
-	backEnd.color2D[1] = cmd->color[1] * 255;
-	backEnd.color2D[2] = cmd->color[2] * 255;
-	backEnd.color2D[3] = cmd->color[3] * 255;
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-=============
-RB_StretchPic
-=============
-*/
-const void *RB_StretchPic ( const void *data ) {
-	const stretchPicCommand_t	*cmd;
-	shader_t *shader;
-	int		numVerts, numIndexes;
-
-	cmd = (const stretchPicCommand_t *)data;
-
-	if ( !backEnd.in2D ) {
-		RB_SetGL2D();
-	}
-
-	shader = cmd->shader;
-	if ( shader != tess.shader ) {
-		if ( tess.numIndexes ) {
-			RB_EndSurface();
-		}
-		backEnd.currentEntity = &backEnd.entity2D;
-		RB_BeginSurface( shader );
-	}
-
-	RB_CHECKOVERFLOW( 4, 6 );
-	numVerts = tess.numVertexes;
-	numIndexes = tess.numIndexes;
-
-	tess.numVertexes += 4;
-	tess.numIndexes += 6;
-
-	tess.indexes[ numIndexes ] = numVerts + 3;
-	tess.indexes[ numIndexes + 1 ] = numVerts + 0;
-	tess.indexes[ numIndexes + 2 ] = numVerts + 2;
-	tess.indexes[ numIndexes + 3 ] = numVerts + 2;
-	tess.indexes[ numIndexes + 4 ] = numVerts + 0;
-	tess.indexes[ numIndexes + 5 ] = numVerts + 1;
-
-	*(int *)tess.vertexColors[ numVerts ] =
-		*(int *)tess.vertexColors[ numVerts + 1 ] =
-		*(int *)tess.vertexColors[ numVerts + 2 ] =
-		*(int *)tess.vertexColors[ numVerts + 3 ] = *(int *)backEnd.color2D;
-
-	tess.xyz[ numVerts ][0] = cmd->x;
-	tess.xyz[ numVerts ][1] = cmd->y;
-	tess.xyz[ numVerts ][2] = 0;
-
-	tess.texCoords[ numVerts ][0][0] = cmd->s1;
-	tess.texCoords[ numVerts ][0][1] = cmd->t1;
-
-	tess.xyz[ numVerts + 1 ][0] = cmd->x + cmd->w;
-	tess.xyz[ numVerts + 1 ][1] = cmd->y;
-	tess.xyz[ numVerts + 1 ][2] = 0;
-
-	tess.texCoords[ numVerts + 1 ][0][0] = cmd->s2;
-	tess.texCoords[ numVerts + 1 ][0][1] = cmd->t1;
-
-	tess.xyz[ numVerts + 2 ][0] = cmd->x + cmd->w;
-	tess.xyz[ numVerts + 2 ][1] = cmd->y + cmd->h;
-	tess.xyz[ numVerts + 2 ][2] = 0;
-
-	tess.texCoords[ numVerts + 2 ][0][0] = cmd->s2;
-	tess.texCoords[ numVerts + 2 ][0][1] = cmd->t2;
-
-	tess.xyz[ numVerts + 3 ][0] = cmd->x;
-	tess.xyz[ numVerts + 3 ][1] = cmd->y + cmd->h;
-	tess.xyz[ numVerts + 3 ][2] = 0;
-
-	tess.texCoords[ numVerts + 3 ][0][0] = cmd->s1;
-	tess.texCoords[ numVerts + 3 ][0][1] = cmd->t2;
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-=============
-RB_SetupFog
-=============
-*/
-void RB_SetupFog() {
-	if (!backEnd.viewParms.farplane_distance) {
-		glState.externalSetState &= ~GLS_FOG;
-	} else if (r_farplane_nofog->integer) {
-		glState.externalSetState &= ~GLS_FOG;
-	} else {
-		vec4_t vFogColor;
-
-		qglFogf(GL_FOG_START, backEnd.viewParms.farplane_bias);
-		qglFogf(GL_FOG_END, backEnd.viewParms.farplane_distance);
-
-        vFogColor[0] = backEnd.viewParms.farplane_color[0] * tr.identityLight;
-        vFogColor[1] = backEnd.viewParms.farplane_color[1] * tr.identityLight;
-        vFogColor[2] = backEnd.viewParms.farplane_color[2] * tr.identityLight;
-        vFogColor[3] = 1.0;
-        GL_SetFogColor(vFogColor);
-
-		glState.externalSetState |= GLS_FOG;
-	}
-}
-
-/*
-=============
-RB_DrawSurfs
-
-=============
-*/
-const void	*RB_DrawSurfs( const void *data ) {
-	const drawSurfsCommand_t	*cmd;
-
-	// finish any 2D drawing if needed
-	if ( tess.numIndexes ) {
-		RB_EndSurface();
-	}
-
-	cmd = (const drawSurfsCommand_t *)data;
-
-	backEnd.refdef = cmd->refdef;
-	backEnd.viewParms = cmd->viewParms;
-
-	RB_SetupFog();
-	RB_RenderDrawSurfList( cmd->drawSurfs, cmd->numDrawSurfs );
-
-	return (const void *)(cmd + 1);
-}
-
-
-/*
-=============
-RB_DrawSurfs
-
-=============
-*/
-const void* RB_SpriteSurfs(const void* data) {
-    const drawSurfsCommand_t* cmd;
-
-    // finish any 2D drawing if needed
-    if (tess.numIndexes) {
-        RB_EndSurface();
-    }
-
-    cmd = (const drawSurfsCommand_t*)data;
-
-    backEnd.refdef = cmd->refdef;
-    backEnd.viewParms = cmd->viewParms;
-	
-	RB_SetupFog();
-    RB_RenderSpriteSurfList(cmd->drawSurfs, cmd->numDrawSurfs);
-
-    return (const void*)(cmd + 1);
-}
-
-
-/*
-=============
-RB_DrawBuffer
-
-=============
-*/
-const void	*RB_DrawBuffer( const void *data ) {
-	const drawBufferCommand_t	*cmd;
-
-	cmd = (const drawBufferCommand_t *)data;
-
-	qglDrawBuffer( cmd->buffer );
-
-	// clear screen for debugging
-	if ( r_clear->integer ) {
-		qglClearColor( 1, 0, 0.5, 1 );
-		qglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-	}
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-===============
-RB_ShowImages
-
-Draw all the images to the screen, on top of whatever
-was there.  This is used to test for texture thrashing.
-
-Also called by RE_EndRegistration
-===============
-*/
-void RB_ShowImages( qboolean quiet ) {
-	int		i;
-	image_t	*image;
-	float	x, y, w, h;
-	int		start, end;
-
-	if ( !backEnd.in2D ) {
-		RB_SetGL2D();
-	}
-
-	qglClear( GL_COLOR_BUFFER_BIT );
-
-	qglFinish();
-
-	start = ri.Milliseconds();
-
-	for ( i=0 ; i<tr.numImages ; i++ ) {
-		image = &tr.images[i];
-
-		w = glConfig.vidWidth / 20;
-		h = glConfig.vidHeight / 15;
-		x = i % 20 * w;
-		y = i / 20 * h;
-
-		// show in proportional size in mode 2
-		if ( r_showImages->integer == 2 ) {
-			w *= image->uploadWidth / 512.0f;
-			h *= image->uploadHeight / 512.0f;
-		}
-
-		GL_Bind( image );
-		qglBegin (GL_QUADS);
-		qglTexCoord2f( 0, 0 );
-		qglVertex2f( x, y );
-		qglTexCoord2f( 1, 0 );
-		qglVertex2f( x + w, y );
-		qglTexCoord2f( 1, 1 );
-		qglVertex2f( x + w, y + h );
-		qglTexCoord2f( 0, 1 );
-		qglVertex2f( x, y + h );
-		qglEnd();
-	}
-
-	qglFinish();
-
-	end = ri.Milliseconds();
-
-    if (!quiet) {
-        ri.Printf(PRINT_ALL, "%i msec to draw all images\n", end - start);
-    }
-}
-
-
-/*
-=============
-RB_SwapBuffers
-
-=============
-*/
-const void	*RB_SwapBuffers( const void *data ) {
-	const swapBuffersCommand_t	*cmd;
-
-	// finish any 2D drawing if needed
-	if ( tess.numIndexes ) {
-		RB_EndSurface();
-	}
-
-	// texture swapping test
-	if ( r_showImages->integer ) {
-		RB_ShowImages(qfalse);
-	}
-
-	cmd = (const swapBuffersCommand_t *)data;
-
-	// we measure overdraw by reading back the stencil buffer and
-	// counting up the number of increments that have happened
-	if ( r_measureOverdraw->integer ) {
-		int i;
-		long sum = 0;
-		unsigned char *stencilReadback;
-
-		stencilReadback = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight );
-		qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, stencilReadback );
-
-		for ( i = 0; i < glConfig.vidWidth * glConfig.vidHeight; i++ ) {
-			sum += stencilReadback[i];
-		}
-
-		backEnd.pc.c_overDraw += sum;
-		ri.Hunk_FreeTempMemory( stencilReadback );
-	}
-
-
-	if ( !glState.finishCalled ) {
-		qglFinish();
-	}
-
-	GLimp_LogComment( "***************** RB_SwapBuffers *****************\n\n\n" );
-
-	GLimp_EndFrame();
-
-	backEnd.in2D = qfalse;
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-====================
-RB_ExecuteRenderCommands
-
-This function will be called synchronously if running without
-smp extensions, or asynchronously by another thread.
-====================
-*/
-void RB_ExecuteRenderCommands( const void *data ) {
-	int		t1, t2;
-
-	t1 = ri.Milliseconds ();
-
-	if ( !r_smp->integer || data == backEndData[0]->commands.cmds ) {
-		backEnd.smpFrame = 0;
-	} else {
-		backEnd.smpFrame = 1;
-	}
-
-	while ( 1 ) {
-		switch ( *(const int *)data ) {
-		case RC_SET_COLOR:
-			data = RB_SetColor( data );
-			break;
-		case RC_STRETCH_PIC:
-			data = RB_StretchPic( data );
-			break;
-		case RC_DRAW_SURFS:
-			data = RB_DrawSurfs( data );
-			break;
-		case RC_SPRITE_SURFS:
-			data = RB_SpriteSurfs( data );
-			break;
-		case RC_DRAW_BUFFER:
-			data = RB_DrawBuffer( data );
-			break;
-		case RC_SWAP_BUFFERS:
-			data = RB_SwapBuffers( data );
-			break;
-		case RC_SCREENSHOT:
-			data = RB_TakeScreenshotCmd( data );
-			break;
-
-		case RC_END_OF_LIST:
-		default:
-			// stop rendering on this thread
-			t2 = ri.Milliseconds ();
-			backEnd.pc.msec = t2 - t1;
-			return;
-		}
-	}
-
-}
-
-
-/*
-================
-RB_RenderThread
-================
-*/
-void RB_RenderThread( void ) {
-	const void	*data;
-
-	// wait for either a rendering command or a quit command
-	while ( 1 ) {
-		// sleep until we have work to do
-		data = GLimp_RendererSleep();
-
-		if ( !data ) {
-			return;	// all done, renderer is shutting down
-		}
-
-		renderThreadActive = qtrue;
-
-		RB_ExecuteRenderCommands( data );
-
-		renderThreadActive = qfalse;
-	}
-}
-
diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
deleted file mode 100644
index 09386625..00000000
--- a/code/renderer/tr_bsp.c
+++ /dev/null
@@ -1,2497 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-Copyright (C) 2024 the OpenMoHAA team
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_map.c
-
-#include "tr_local.h"
-#include "tr_vis.h"
-
-/*
-
-Loads and prepares a map file for scene rendering.
-
-A single entry point:
-
-void RE_LoadWorldMap( const char *name );
-
-*/
-
-static	world_t		s_worldData;
-static	byte		*fileBase;
-
-int			c_subdivisions;
-int			c_gridVerts;
-
-static int map_length;
-static int nummodels;
-static int numShaders;
-static int numbrushes;
-static int numbrushsides;
-static int numFogs;
-static int numplanes;
-static int num_entities;
-static int numnodes;
-static int numleafs;
-static int numleafsurfaces;
-static int numDrawVerts;
-static int numDrawIndexes;
-static int numDrawSurfaces;
-static int numLightDefs;
-static int numLightBytes;
-static int numVisBytes;
-static int numSLights;
-static int entLightVisSize;
-static int g_iGridArraySize;
-static int g_iGridDataSize;
-static int g_iGridPaletteBytes;
-static int g_iGridOffsets;
-static int g_nStaticModelData;
-static int map_version;
-static int g_nStaticModelIndices;
-static int g_nStaticModels;
-static int g_nTerPatchIndices;
-static int g_nTerraPatches;
-
-//===============================================================================
-
-static void HSVtoRGB( float h, float s, float v, float rgb[3] )
-{
-    int i;
-    float f;
-    float p, q, t;
-
-    h *= 5;
-
-    i = floor( h );
-    f = h - i;
-
-    p = v * ( 1 - s );
-    q = v * ( 1 - s * f );
-    t = v * ( 1 - s * ( 1 - f ) );
-
-    switch ( i )
-    {
-    case 0:
-        rgb[0] = v;
-        rgb[1] = t;
-        rgb[2] = p;
-        break;
-    case 1:
-        rgb[0] = q;
-        rgb[1] = v;
-        rgb[2] = p;
-        break;
-    case 2:
-        rgb[0] = p;
-        rgb[1] = v;
-        rgb[2] = t;
-        break;
-    case 3:
-        rgb[0] = p;
-        rgb[1] = q;
-        rgb[2] = v;
-        break;
-    case 4:
-        rgb[0] = t;
-        rgb[1] = p;
-        rgb[2] = v;
-        break;
-    case 5:
-        rgb[0] = v;
-        rgb[1] = p;
-        rgb[2] = q;
-        break;
-    }
-}
-
-/*
-===============
-R_ColorShiftLightingBytes
-
-===============
-*/
-static	void R_ColorShiftLightingBytes( byte in[3], byte out[3] ) {
-    int		r, g, b;
-
-    // shift the data based on overbright range
-    r = in[0] << tr.overbrightShift;
-    g = in[1] << tr.overbrightShift;
-    b = in[2] << tr.overbrightShift;
-    
-    // normalize by color instead of saturating to white
-    if ( ( r | g | b ) > 255 ) {
-        int		max;
-
-        max = r > g ? r : g;
-        max = max > b ? max : b;
-        r = r * 255 / max;
-        g = g * 255 / max;
-        b = b * 255 / max;
-    }
-
-    out[0] = r;
-    out[1] = g;
-    out[2] = b;
-}
-
-/*
-===============
-R_ColorShiftLightingBytesAlpha
-
-===============
-*/
-static	void R_ColorShiftLightingBytesAlpha( byte in[4], byte out[4] ) {
-    int		r, g, b;
-
-    // shift the data based on overbright range
-    r = in[0] << tr.overbrightShift;
-    g = in[1] << tr.overbrightShift;
-    b = in[2] << tr.overbrightShift;
-    
-    // normalize by color instead of saturating to white
-    if ( ( r | g | b ) > 255 ) {
-        int		max;
-        
-        max = r > g ? r : g;
-        max = max > b ? max : b;
-        r = r * 255 / max;
-        g = g * 255 / max;
-        b = b * 255 / max;
-    }
-
-    out[0] = r;
-    out[1] = g;
-    out[2] = b;
-    out[3] = in[3];
-}
-
-/*
-===============
-R_LoadLightmaps
-
-===============
-*/
-#define	LIGHTMAP_SIZE	128
-static	void R_LoadLightmaps(gamelump_t* l) {
-    byte		*buf, *buf_p;
-    int			len;
-    MAC_STATIC byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
-    int			i, j;
-    float maxIntensity = 0;
-    double sumIntensity = 0;
-
-    len = l->length;
-    if (!len) {
-        return;
-    }
-    buf = l->buffer;
-
-    // we are about to upload textures
-    R_SyncRenderThread();
-
-    // create all the lightmaps
-    tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
-
-    // if we are in r_vertexLight mode, we don't need the lightmaps at all
-    if ( r_vertexLight->integer ) {
-        return;
-    }
-
-    for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
-        // expand the 24 bit on-disk to 32 bit
-        buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
-
-        if ( r_lightmap->integer == 2 )
-        {	// color code by intensity as development tool	(FIXME: check range)
-            for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
-            {
-                float r = buf_p[j*3+0];
-                float g = buf_p[j*3+1];
-                float b = buf_p[j*3+2];
-                float intensity;
-                float out[3];
-
-                intensity = 0.33f * r + 0.685f * g + 0.063f * b;
-
-                if ( intensity > 255 )
-                    intensity = 1.0f;
-                else
-                    intensity /= 255.0f;
-
-                if ( intensity > maxIntensity )
-                    maxIntensity = intensity;
-
-                HSVtoRGB( intensity, 1.00, 0.50, out );
-
-                image[j*4+0] = out[0] * 255;
-                image[j*4+1] = out[1] * 255;
-                image[j*4+2] = out[2] * 255;
-                image[j*4+3] = 255;
-
-                sumIntensity += intensity;
-            }
-        } else {
-            for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
-                R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
-                image[j*4+3] = 255;
-            }
-        }
-        tr.lightmaps[i] = R_CreateImage(va("*lightmap%d", i), image,
-            LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-    }
-
-    if ( r_lightmap->integer == 2 )	{
-        ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
-    }
-
-    if (r_fastdlights->integer) {
-        s_worldData.lighting = NULL;
-    }
-    else {
-        s_worldData.lighting = ri.Hunk_Alloc(l->length, h_dontcare);
-        Com_Memcpy(s_worldData.lighting, l->buffer, l->length);
-    }
-}
-
-
-/*
-=================
-RE_SetWorldVisData
-
-This is called by the clipmodel subsystem so we can share the 1.8 megs of
-space in big maps...
-=================
-*/
-void		RE_SetWorldVisData( const byte *vis ) {
-    tr.externalVisData = vis;
-}
-
-
-/*
-=================
-R_LoadVisibility
-=================
-*/
-static	void R_LoadVisibility(gamelump_t* l) {
-    int		len;
-    byte	*buf;
-
-    len = ( s_worldData.numClusters + 63 ) & ~63;
-    s_worldData.novis = ri.Hunk_Alloc( len, h_dontcare );
-    Com_Memset( s_worldData.novis, 0xff, len );
-
-    len = l->length;
-    if (!len) {
-        return;
-    }
-    buf = l->buffer;
-
-    s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
-    s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
-
-    // CM_Load should have given us the vis data to share, so
-    // we don't need to allocate another copy
-    if ( tr.externalVisData ) {
-        s_worldData.vis = tr.externalVisData;
-    } else {
-        byte	*dest;
-
-        dest = ri.Hunk_Alloc( len - 8, h_dontcare );
-        Com_Memcpy( dest, buf + 8, len - 8 );
-        s_worldData.vis = dest;
-    }
-}
-
-/*
-================
-R_LoadSphereLights
-================
-*/
-void R_LoadSphereLights(gamelump_t* l) {
-    int				i, j;
-    mapspherel_t* at;
-    spherel_t* light;
-
-    if (l->length % sizeof(mapspherel_t)) {
-        Com_Error(ERR_DROP, "LoadMap: funny lump size in spherelight data for %s\n", s_worldData.name);
-    }
-
-    tr.numSLights = l->length / sizeof(mapspherel_t);
-
-    if (tr.numSLights >= MAX_MAP_SPHERE_L_SIZE) {
-        Com_Error(ERR_DROP, "LoadMap: Too many spherelights on map %s, limit is %d\n", s_worldData.name, MAX_MAP_SPHERE_L_SIZE);
-    }
-
-    at = l->buffer;
-    light = tr.sLights;
-
-    for (i = 0; i < tr.numSLights; at++, light++, i++) {
-        VectorCopy(at->origin, light->origin);
-        VectorCopy(at->color, light->color);
-        VectorCopy(at->spot_dir, light->spot_dir);
-
-        for (j = 0; j < 3; j++) {
-            light->origin[j] = LittleFloat(light->origin[j]);
-            light->color[j] = LittleFloat(light->color[j]);
-            light->spot_dir[j] = LittleFloat(light->spot_dir[j]);
-        }
-
-        light->spot_radiusbydistance = LittleFloat(at->spot_radiusbydistance);
-        light->intensity = LittleFloat(at->intensity);
-        light->spot_light = LittleLong(at->spot_light);
-        light->needs_trace = LittleLong(at->needs_trace);
-        light->leaf = &s_worldData.nodes[s_worldData.numDecisionNodes + LittleLong(at->leaf)];
-    }
-}
-
-/*
-================
-R_LoadSphereLightVis
-================
-*/
-void R_LoadSphereLightVis(gamelump_t* l) {
-    int i;
-    int j;
-    int h;
-    mnode_t* node;
-    int numentries;
-    int* entries;
-
-    memset(&tr.sSunLight, 0, sizeof(spherel_t));
-
-    if (l->length % 4) {
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in spherelight vis data for %s\n",
-            s_worldData.name);
-    }
-    else {
-        entries = l->buffer;
-        numentries = l->length / sizeof(int);
-
-        if (numentries) {
-            if (numentries != s_worldData.numnodes - s_worldData.numDecisionNodes) {
-                for (i = 0; i < numentries; ++i)
-                    entries[i] = LittleLong(entries[i]);
-
-                for (node = &s_worldData.nodes[s_worldData.numDecisionNodes]; numentries; node++) {
-                    j = 0;
-                    if (entries[0] != -1) {
-                        do
-                            ++j;
-                        while (entries[j] != -1);
-                    }
-                    if (j) {
-                        node->lights = ri.Hunk_Alloc(j * sizeof(spherel_t*), h_dontcare);
-                        node->numlights = j;
-                        h = 0;
-                        if (entries[0] == -2) {
-                            node->lights[0] = &tr.sSunLight;
-                            tr.sSunLight.leaf = (mnode_t*)-1;
-                            h = 1;
-                        }
-                        while (entries[h] != -1) {
-                            node->lights[h] = &tr.sLights[entries[h]];
-                            h++;
-                        }
-                        entries += h + 1;
-                        numentries = numentries - 1 - h;
-                    }
-                    else {
-                        numentries--;
-                        entries++;
-                    }
-                }
-            }
-        }
-    }
-}
-
-//===============================================================================
-
-
-/*
-===============
-ShaderForShaderNum
-===============
-*/
-static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
-    shader_t	*shader;
-    dshader_t	*dsh;
-
-    if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
-        ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
-    }
-    dsh = &s_worldData.shaders[ shaderNum ];
-
-    if ( r_vertexLight->integer ) {
-        lightmapNum = LIGHTMAP_BY_VERTEX;
-    }
-
-    if ( r_fullbright->integer || !tr.numLightmaps ) {
-        lightmapNum = LIGHTMAP_WHITEIMAGE;
-    }
-
-    shader = R_FindShader( dsh->shader, lightmapNum, qtrue, qtrue, qtrue, qtrue);
-
-    // if the shader had errors, just use default shader
-    if ( shader->defaultShader ) {
-        return tr.defaultShader;
-    }
-
-    return shader;
-}
-
-/*
-================
-R_UnpackTerraPatch
-================
-*/
-void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
-    int i, j;
-
-    pUnpacked->byDirty = qfalse;
-    pUnpacked->visCountCheck = 0;
-    pUnpacked->visCountDraw = 0;
-    pUnpacked->uiDistRecalc = 0;
-
-    if (pPacked->lmapScale <= 0) {
-        Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
-    }
-
-    pUnpacked->drawinfo.lmapStep = (float)(64 / pPacked->lmapScale);
-    pUnpacked->drawinfo.lmapSize = pPacked->lmapScale * 8 + 1;
-    pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
-    pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
-
-    if( s_worldData.lighting ) {
-        pUnpacked->drawinfo.lmData = &s_worldData.lighting[pPacked->iLightMap * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * pPacked->s + 3 * LIGHTMAP_SIZE * pPacked->t];
-    } else {
-        pUnpacked->drawinfo.lmData = NULL;
-    }
-
-    for (i = 0; i < 2; i++) {
-        for (j = 0; j < 2; j++) {
-            pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
-            pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
-        }
-    }
-
-    pUnpacked->x0 = ((int)pPacked->x << 6);
-    pUnpacked->y0 = ((int)pPacked->y << 6);
-    pUnpacked->z0 = pPacked->iBaseHeight;
-    pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
-    pUnpacked->iNorth = pPacked->iNorth;
-    pUnpacked->iEast = pPacked->iEast;
-    pUnpacked->iSouth = pPacked->iSouth;
-    pUnpacked->iWest = pPacked->iWest;
-
-    for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
-    {
-        varnode_t *packedVarTree;
-
-        packedVarTree = &pPacked->varTree[0][i];
-        pUnpacked->varTree[0][i].fVariance = packedVarTree->flags & 0x7FF;
-        pUnpacked->varTree[0][i].flags &= ~0xFF;
-        pUnpacked->varTree[0][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
-
-        packedVarTree = &pPacked->varTree[1][i];
-        pUnpacked->varTree[1][i].fVariance = packedVarTree->flags & 0x7FF;
-        pUnpacked->varTree[1][i].flags &= ~0xFF;
-        pUnpacked->varTree[1][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
-    }
-
-    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
-        pUnpacked->heightmap[i] = pPacked->heightmap[i];
-    }
-
-    pUnpacked->zmax = 0;
-    pUnpacked->flags = pPacked->flags;
-
-    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++)
-    {
-        if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
-            pUnpacked->zmax = pUnpacked->heightmap[i];
-        }
-    }
-
-    pUnpacked->frameCount = 0;
-    pUnpacked->zmax += pUnpacked->zmax;
-}
-
-/*
-================
-R_LoadTerrain
-================
-IneQuation was here
-*/
-void R_LoadTerrain(gamelump_t* lump) {
-    int		i;
-    cTerraPatch_t* in;
-    cTerraPatchUnpacked_t* out;
-
-    if (!lump->length) {
-        s_worldData.numTerraPatches = 0;
-        s_worldData.terraPatches = NULL;
-        return;
-    }
-
-    if (lump->length % sizeof(cTerraPatch_t)) {
-        Com_Error(ERR_DROP, "R_LoadTerrain: funny lump size");
-    }
-
-    s_worldData.numTerraPatches = lump->length / sizeof(cTerraPatch_t);
-    s_worldData.terraPatches = ri.Hunk_Alloc(s_worldData.numTerraPatches * sizeof(cTerraPatchUnpacked_t), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.terraPatches;
-
-    for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
-        R_SwapTerraPatch(in);
-        R_UnpackTerraPatch(in, out);
-    }
-}
-
-/*
-================
-R_LoadTerrainIndexes
-================
-*/
-void R_LoadTerrainIndexes(gamelump_t* lump) {
-    int		i;
-    short* in;
-    cTerraPatchUnpacked_t** out;
-
-    if (!lump->length) {
-        s_worldData.numVisTerraPatches = 0;
-        s_worldData.visTerraPatches = NULL;
-        return;
-    }
-
-    if (lump->length % sizeof(short)) {
-        Com_Error(ERR_DROP, "R_LoadTerrainIndexes: funny lump size");
-    }
-
-    s_worldData.numVisTerraPatches = lump->length / sizeof(short);
-    s_worldData.visTerraPatches = ri.Hunk_Alloc(s_worldData.numVisTerraPatches * sizeof(cTerraPatchUnpacked_t*), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.visTerraPatches;
-
-    for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
-        *out = &s_worldData.terraPatches[LittleShort(*in)];
-    }
-}
-
-/*
-===============
-ParseFace
-===============
-*/
-static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes  ) {
-    int			i, j;
-    srfSurfaceFace_t	*cv;
-    int			numPoints, numIndexes;
-    int			lightmapNum;
-    int			sfaceSize, ofsIndexes;
-    static surfaceType_t skipData = SF_SKIP;
-
-    lightmapNum = LittleLong( ds->lightmapNum );
-
-    // get shader value
-    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
-    if ( r_singleShader->integer && !surf->shader->isSky ) {
-        surf->shader = tr.defaultShader;
-    }
-
-    if (surf->shader->surfaceFlags & SURF_NODRAW) {
-        // Nodraw surface doesn't need any processing
-        surf->data = &skipData;
-        return;
-    }
-
-    numPoints = LittleLong( ds->numVerts );
-    if (numPoints > MAX_FACE_POINTS) {
-        ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
-    numPoints = MAX_FACE_POINTS;
-    surf->shader = tr.defaultShader;
-    }
-
-    numIndexes = LittleLong( ds->numIndexes );
-
-    // create the srfSurfaceFace_t
-    sfaceSize = ( int ) &((srfSurfaceFace_t *)0)->points[numPoints];
-    ofsIndexes = sfaceSize;
-    sfaceSize += sizeof( int ) * numIndexes;
-
-    cv = ri.Hunk_Alloc( sfaceSize, h_dontcare );
-    cv->surfaceType = SF_FACE;
-    cv->numPoints = numPoints;
-    cv->numIndices = numIndexes;
-    cv->ofsIndices = ofsIndexes;
-
-    verts += LittleLong( ds->firstVert );
-    for ( i = 0 ; i < numPoints ; i++ ) {
-        for ( j = 0 ; j < 3 ; j++ ) {
-            cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
-        }
-        for ( j = 0 ; j < 2 ; j++ ) {
-            cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
-            cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
-        }
-        R_ColorShiftLightingBytesAlpha( verts[i].color, (byte *)&cv->points[i][7] );
-    }
-
-    indexes += LittleLong( ds->firstIndex );
-    for ( i = 0 ; i < numIndexes ; i++ ) {
-        ((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
-    }
-
-    // take the plane information from the lightmap vector
-    for ( i = 0 ; i < 3 ; i++ ) {
-        cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-    }
-    cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
-    SetPlaneSignbits( &cv->plane );
-    cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
-
-    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
-    {
-        float inv;
-
-        cv->lmX = LittleLong(ds->lightmapX);
-        cv->lmY = LittleLong(ds->lightmapY);
-        cv->lmWidth = LittleLong(ds->lightmapWidth);
-        cv->lmHeight = LittleLong(ds->lightmapHeight);
-
-        if (s_worldData.lighting) {
-            cv->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * cv->lmX + 3 * LIGHTMAP_SIZE * cv->lmY];
-        } else {
-            cv->lmData = NULL;
-        }
-
-        for (i = 0; i < 3; i++)
-        {
-            cv->lmOrigin[i] = LittleFloat(ds->lightmapOrigin[i]);
-            cv->lmVecs[0][i] = LittleFloat(ds->lightmapVecs[0][i]);
-            cv->lmVecs[1][i] = LittleFloat(ds->lightmapVecs[1][i]);
-        }
-
-        inv = VectorNormalize2(cv->lmVecs[0], cv->lmInverseVecs[0]);
-        cv->lmInverseVecs[0][0] *= 1.0 / inv;
-        cv->lmInverseVecs[0][1] *= 1.0 / inv;
-        cv->lmInverseVecs[0][2] *= 1.0 / inv;
-
-        inv = VectorNormalize2(cv->lmVecs[1], cv->lmInverseVecs[1]);
-        cv->lmInverseVecs[1][0] *= 1.0 / inv;
-        cv->lmInverseVecs[1][1] *= 1.0 / inv;
-        cv->lmInverseVecs[1][2] *= 1.0 / inv;
-    }
-    else
-    {
-        cv->lmData = NULL;
-    }
-    surf->data = (surfaceType_t *)cv;
-}
-
-
-/*
-===============
-ParseMesh
-===============
-*/
-static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
-    srfGridMesh_t	*grid;
-    int				i, j;
-    int				width, height, numPoints;
-    MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
-    int				lightmapNum;
-    vec3_t			bounds[2];
-    vec3_t			tmpVec;
-    float           subdivisions;
-    static surfaceType_t	skipData = SF_SKIP;
-
-    lightmapNum = LittleLong( ds->lightmapNum );
-
-    // get fog volume
-    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-    // get shader value
-    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
-    if ( r_singleShader->integer && !surf->shader->isSky ) {
-        surf->shader = tr.defaultShader;
-    }
-
-    // we may have a nodraw surface, because they might still need to
-    // be around for movement clipping
-    if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
-        surf->data = &skipData;
-        return;
-    }
-
-    width = LittleLong( ds->patchWidth );
-    height = LittleLong( ds->patchHeight );
-
-    verts += LittleLong( ds->firstVert );
-    numPoints = width * height;
-    for ( i = 0 ; i < numPoints ; i++ ) {
-        for ( j = 0 ; j < 3 ; j++ ) {
-            points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-            points[i].normal[j] = LittleFloat( verts[i].normal[j] );
-        }
-        for ( j = 0 ; j < 2 ; j++ ) {
-            points[i].st[j] = LittleFloat( verts[i].st[j] );
-            points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-        }
-        R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
-    }
-
-    // pre-tesseleate
-    subdivisions = LittleFloat(ds->subdivisions);
-    if (subdivisions) {
-        grid = R_SubdividePatchToGrid(width, height, subdivisions * (r_subdivisions->value / 10.0), points);
-    } else if (surf->shader->subdivisions) {
-        grid = R_SubdividePatchToGrid(width, height, surf->shader->subdivisions * (r_subdivisions->value / 10.0), points);
-    } else {
-        grid = R_SubdividePatchToGrid(width, height, r_subdivisions->value, points);
-    }
-    surf->data = (surfaceType_t *)grid;
-
-    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
-    {
-        grid->lmX = LittleLong(ds->lightmapX);
-        grid->lmY = LittleLong(ds->lightmapY);
-        grid->lmWidth = LittleLong(ds->lightmapWidth);
-        grid->lmHeight = LittleLong(ds->lightmapHeight);
-        if (s_worldData.lighting) {
-            grid->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * grid->lmX + 3 * LIGHTMAP_SIZE * grid->lmY];
-        } else {
-            grid->lmData = NULL;
-        }
-    }
-
-    // copy the level of detail origin, which is the center
-    // of the group of all curves that must subdivide the same
-    // to avoid cracking
-    for ( i = 0 ; i < 3 ; i++ ) {
-        bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
-        bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
-    }
-    VectorAdd( bounds[0], bounds[1], bounds[1] );
-    VectorScale( bounds[1], 0.5f, grid->lodOrigin );
-    VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
-    grid->lodRadius = VectorLength( tmpVec );
-}
-
-/*
-===============
-ParseTriSurf
-===============
-*/
-static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-    srfTriangles_t	*tri;
-    int				i, j;
-    int				numVerts, numIndexes;
-
-    // get fog volume
-    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-    // get shader
-    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
-    if ( r_singleShader->integer && !surf->shader->isSky ) {
-        surf->shader = tr.defaultShader;
-    }
-
-    numVerts = LittleLong( ds->numVerts );
-    numIndexes = LittleLong( ds->numIndexes );
-
-    tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
-        + numIndexes * sizeof( tri->indexes[0] ), h_dontcare );
-    tri->surfaceType = SF_TRIANGLES;
-    tri->numVerts = numVerts;
-    tri->numIndexes = numIndexes;
-    tri->verts = (drawVert_t *)(tri + 1);
-    tri->indexes = (int *)(tri->verts + tri->numVerts );
-
-    surf->data = (surfaceType_t *)tri;
-
-    // copy vertexes
-    ClearBounds( tri->bounds[0], tri->bounds[1] );
-    verts += LittleLong( ds->firstVert );
-    for ( i = 0 ; i < numVerts ; i++ ) {
-        for ( j = 0 ; j < 3 ; j++ ) {
-            tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-            tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
-        }
-        AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
-        for ( j = 0 ; j < 2 ; j++ ) {
-            tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
-            tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-        }
-
-        R_ColorShiftLightingBytesAlpha( verts[i].color, tri->verts[i].color );
-    }
-
-    // copy indexes
-    indexes += LittleLong( ds->firstIndex );
-    for ( i = 0 ; i < numIndexes ; i++ ) {
-        tri->indexes[i] = LittleLong( indexes[i] );
-        if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
-            ri.Error( ERR_DROP, "Bad index in triangle surface" );
-        }
-    }
-}
-
-/*
-===============
-ParseFlare
-===============
-*/
-static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-    srfFlare_t		*flare;
-    int				i;
-
-    // get fog volume
-    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-    // get shader
-    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
-    if ( r_singleShader->integer && !surf->shader->isSky ) {
-        surf->shader = tr.defaultShader;
-    }
-
-    flare = ri.Hunk_Alloc( sizeof( *flare ), h_dontcare );
-    flare->surfaceType = SF_FLARE;
-
-    surf->data = (surfaceType_t *)flare;
-
-    for ( i = 0 ; i < 3 ; i++ ) {
-        flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
-        flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
-        flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-    }
-}
-
-
-/*
-=================
-R_MergedWidthPoints
-
-returns true if there are grid points merged on a width edge
-=================
-*/
-int R_MergedWidthPoints(srfGridMesh_t *grid, int offset) {
-    int i, j;
-
-    for (i = 1; i < grid->width-1; i++) {
-        for (j = i + 1; j < grid->width-1; j++) {
-            if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
-            if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
-            if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
-            return qtrue;
-        }
-    }
-    return qfalse;
-}
-
-/*
-=================
-R_MergedHeightPoints
-
-returns true if there are grid points merged on a height edge
-=================
-*/
-int R_MergedHeightPoints(srfGridMesh_t *grid, int offset) {
-    int i, j;
-
-    for (i = 1; i < grid->height-1; i++) {
-        for (j = i + 1; j < grid->height-1; j++) {
-            if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
-            if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
-            if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
-            return qtrue;
-        }
-    }
-    return qfalse;
-}
-
-/*
-=================
-R_FixSharedVertexLodError_r
-
-NOTE: never sync LoD through grid edges with merged points!
-
-FIXME: write generalized version that also avoids cracks between a patch and one that meets half way?
-=================
-*/
-void R_FixSharedVertexLodError_r( int start, srfGridMesh_t *grid1 ) {
-    int j, k, l, m, n, offset1, offset2, touch;
-    srfGridMesh_t *grid2;
-
-    for ( j = start; j < s_worldData.numsurfaces; j++ ) {
-        //
-        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-        // if this surface is not a grid
-        if ( grid2->surfaceType != SF_GRID ) continue;
-        // if the LOD errors are already fixed for this patch
-        if ( grid2->lodFixed == 2 ) continue;
-        // grids in the same LOD group should have the exact same lod radius
-        if ( grid1->lodRadius != grid2->lodRadius ) continue;
-        // grids in the same LOD group should have the exact same lod origin
-        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-        //
-        touch = qfalse;
-        for (n = 0; n < 2; n++) {
-            //
-            if (n) offset1 = (grid1->height-1) * grid1->width;
-            else offset1 = 0;
-            if (R_MergedWidthPoints(grid1, offset1)) continue;
-            for (k = 1; k < grid1->width-1; k++) {
-                for (m = 0; m < 2; m++) {
-
-                    if (m) offset2 = (grid2->height-1) * grid2->width;
-                    else offset2 = 0;
-                    if (R_MergedWidthPoints(grid2, offset2)) continue;
-                    for ( l = 1; l < grid2->width-1; l++) {
-                    //
-                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-                        // ok the points are equal and should have the same lod error
-                        grid2->widthLodError[l] = grid1->widthLodError[k];
-                        touch = qtrue;
-                    }
-                }
-                for (m = 0; m < 2; m++) {
-
-                    if (m) offset2 = grid2->width-1;
-                    else offset2 = 0;
-                    if (R_MergedHeightPoints(grid2, offset2)) continue;
-                    for ( l = 1; l < grid2->height-1; l++) {
-                    //
-                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-                        // ok the points are equal and should have the same lod error
-                        grid2->heightLodError[l] = grid1->widthLodError[k];
-                        touch = qtrue;
-                    }
-                }
-            }
-        }
-        for (n = 0; n < 2; n++) {
-            //
-            if (n) offset1 = grid1->width-1;
-            else offset1 = 0;
-            if (R_MergedHeightPoints(grid1, offset1)) continue;
-            for (k = 1; k < grid1->height-1; k++) {
-                for (m = 0; m < 2; m++) {
-
-                    if (m) offset2 = (grid2->height-1) * grid2->width;
-                    else offset2 = 0;
-                    if (R_MergedWidthPoints(grid2, offset2)) continue;
-                    for ( l = 1; l < grid2->width-1; l++) {
-                    //
-                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-                        // ok the points are equal and should have the same lod error
-                        grid2->widthLodError[l] = grid1->heightLodError[k];
-                        touch = qtrue;
-                    }
-                }
-                for (m = 0; m < 2; m++) {
-
-                    if (m) offset2 = grid2->width-1;
-                    else offset2 = 0;
-                    if (R_MergedHeightPoints(grid2, offset2)) continue;
-                    for ( l = 1; l < grid2->height-1; l++) {
-                    //
-                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-                        // ok the points are equal and should have the same lod error
-                        grid2->heightLodError[l] = grid1->heightLodError[k];
-                        touch = qtrue;
-                    }
-                }
-            }
-        }
-        if (touch) {
-            grid2->lodFixed = 2;
-            R_FixSharedVertexLodError_r ( start, grid2 );
-            //NOTE: this would be correct but makes things really slow
-            //grid2->lodFixed = 1;
-        }
-    }
-}
-
-/*
-=================
-R_FixSharedVertexLodError
-
-This function assumes that all patches in one group are nicely stitched together for the highest LoD.
-If this is not the case this function will still do its job but won't fix the highest LoD cracks.
-=================
-*/
-void R_FixSharedVertexLodError( void ) {
-    int i;
-    srfGridMesh_t *grid1;
-
-    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-        //
-        grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-        // if this surface is not a grid
-        if ( grid1->surfaceType != SF_GRID )
-            continue;
-        //
-        if ( grid1->lodFixed )
-            continue;
-        //
-        grid1->lodFixed = 2;
-        // recursively fix other patches in the same LOD group
-        R_FixSharedVertexLodError_r( i + 1, grid1);
-    }
-}
-
-
-/*
-===============
-R_StitchPatches
-===============
-*/
-int R_StitchPatches( int grid1num, int grid2num ) {
-    float *v1, *v2;
-    srfGridMesh_t *grid1, *grid2;
-    int k, l, m, n, offset1, offset2, row, column;
-
-    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-    grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
-    for (n = 0; n < 2; n++) {
-        //
-        if (n) offset1 = (grid1->height-1) * grid1->width;
-        else offset1 = 0;
-        if (R_MergedWidthPoints(grid1, offset1))
-            continue;
-        for (k = 0; k < grid1->width-2; k += 2) {
-
-            for (m = 0; m < 2; m++) {
-
-                if ( grid2->width >= MAX_GRID_SIZE )
-                    break;
-                if (m) offset2 = (grid2->height-1) * grid2->width;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->width-1; l++) {
-                //
-                    v1 = grid1->verts[k + offset1].xyz;
-                    v2 = grid2->verts[l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[k + 2 + offset1].xyz;
-                    v2 = grid2->verts[l + 1 + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[l + offset2].xyz;
-                    v2 = grid2->verts[l + 1 + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert column into grid2 right after after column l
-                    if (m) row = grid2->height-1;
-                    else row = 0;
-                    grid2 = R_GridInsertColumn( grid2, l+1, row,
-                                    grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-            for (m = 0; m < 2; m++) {
-
-                if (grid2->height >= MAX_GRID_SIZE)
-                    break;
-                if (m) offset2 = grid2->width-1;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->height-1; l++) {
-                    //
-                    v1 = grid1->verts[k + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[k + 2 + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert row into grid2 right after after row l
-                    if (m) column = grid2->width-1;
-                    else column = 0;
-                    grid2 = R_GridInsertRow( grid2, l+1, column,
-                                        grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-        }
-    }
-    for (n = 0; n < 2; n++) {
-        //
-        if (n) offset1 = grid1->width-1;
-        else offset1 = 0;
-        if (R_MergedHeightPoints(grid1, offset1))
-            continue;
-        for (k = 0; k < grid1->height-2; k += 2) {
-            for (m = 0; m < 2; m++) {
-
-                if ( grid2->width >= MAX_GRID_SIZE )
-                    break;
-                if (m) offset2 = (grid2->height-1) * grid2->width;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->width-1; l++) {
-                //
-                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
-                    v2 = grid2->verts[l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-                    v2 = grid2->verts[l + 1 + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[l + offset2].xyz;
-                    v2 = grid2->verts[(l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert column into grid2 right after after column l
-                    if (m) row = grid2->height-1;
-                    else row = 0;
-                    grid2 = R_GridInsertColumn( grid2, l+1, row,
-                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-            for (m = 0; m < 2; m++) {
-
-                if (grid2->height >= MAX_GRID_SIZE)
-                    break;
-                if (m) offset2 = grid2->width-1;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->height-1; l++) {
-                //
-                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert row into grid2 right after after row l
-                    if (m) column = grid2->width-1;
-                    else column = 0;
-                    grid2 = R_GridInsertRow( grid2, l+1, column,
-                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-        }
-    }
-    for (n = 0; n < 2; n++) {
-        //
-        if (n) offset1 = (grid1->height-1) * grid1->width;
-        else offset1 = 0;
-        if (R_MergedWidthPoints(grid1, offset1))
-            continue;
-        for (k = grid1->width-1; k > 1; k -= 2) {
-
-            for (m = 0; m < 2; m++) {
-
-                if ( grid2->width >= MAX_GRID_SIZE )
-                    break;
-                if (m) offset2 = (grid2->height-1) * grid2->width;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->width-1; l++) {
-                //
-                    v1 = grid1->verts[k + offset1].xyz;
-                    v2 = grid2->verts[l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[k - 2 + offset1].xyz;
-                    v2 = grid2->verts[l + 1 + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[l + offset2].xyz;
-                    v2 = grid2->verts[(l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert column into grid2 right after after column l
-                    if (m) row = grid2->height-1;
-                    else row = 0;
-                    grid2 = R_GridInsertColumn( grid2, l+1, row,
-                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-            for (m = 0; m < 2; m++) {
-
-                if (grid2->height >= MAX_GRID_SIZE)
-                    break;
-                if (m) offset2 = grid2->width-1;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->height-1; l++) {
-                //
-                    v1 = grid1->verts[k + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[k - 2 + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert row into grid2 right after after row l
-                    if (m) column = grid2->width-1;
-                    else column = 0;
-                    grid2 = R_GridInsertRow( grid2, l+1, column,
-                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-                    if (!grid2)
-                        break;
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-        }
-    }
-    for (n = 0; n < 2; n++) {
-        //
-        if (n) offset1 = grid1->width-1;
-        else offset1 = 0;
-        if (R_MergedHeightPoints(grid1, offset1))
-            continue;
-        for (k = grid1->height-1; k > 1; k -= 2) {
-            for (m = 0; m < 2; m++) {
-
-                if ( grid2->width >= MAX_GRID_SIZE )
-                    break;
-                if (m) offset2 = (grid2->height-1) * grid2->width;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->width-1; l++) {
-                //
-                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
-                    v2 = grid2->verts[l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-                    v2 = grid2->verts[l + 1 + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[l + offset2].xyz;
-                    v2 = grid2->verts[(l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert column into grid2 right after after column l
-                    if (m) row = grid2->height-1;
-                    else row = 0;
-                    grid2 = R_GridInsertColumn( grid2, l+1, row,
-                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-            for (m = 0; m < 2; m++) {
-
-                if (grid2->height >= MAX_GRID_SIZE)
-                    break;
-                if (m) offset2 = grid2->width-1;
-                else offset2 = 0;
-                for ( l = 0; l < grid2->height-1; l++) {
-                //
-                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-
-                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) > .1)
-                        continue;
-                    if ( fabs(v1[1] - v2[1]) > .1)
-                        continue;
-                    if ( fabs(v1[2] - v2[2]) > .1)
-                        continue;
-                    //
-                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
-                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-                    if ( fabs(v1[0] - v2[0]) < .01 &&
-                            fabs(v1[1] - v2[1]) < .01 &&
-                            fabs(v1[2] - v2[2]) < .01)
-                        continue;
-                    //
-                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-                    // insert row into grid2 right after after row l
-                    if (m) column = grid2->width-1;
-                    else column = 0;
-                    grid2 = R_GridInsertRow( grid2, l+1, column,
-                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-                    grid2->lodStitched = qfalse;
-                    s_worldData.surfaces[grid2num].data = (void *) grid2;
-                    return qtrue;
-                }
-            }
-        }
-    }
-    return qfalse;
-}
-
-/*
-===============
-R_TryStitchPatch
-
-This function will try to stitch patches in the same LoD group together for the highest LoD.
-
-Only single missing vertice cracks will be fixed.
-
-Vertices will be joined at the patch side a crack is first found, at the other side
-of the patch (on the same row or column) the vertices will not be joined and cracks
-might still appear at that side.
-===============
-*/
-int R_TryStitchingPatch( int grid1num ) {
-    int j, numstitches;
-    srfGridMesh_t *grid1, *grid2;
-
-    numstitches = 0;
-    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-    for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
-        //
-        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-        // if this surface is not a grid
-        if ( grid2->surfaceType != SF_GRID ) continue;
-        // grids in the same LOD group should have the exact same lod radius
-        if ( grid1->lodRadius != grid2->lodRadius ) continue;
-        // grids in the same LOD group should have the exact same lod origin
-        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-        //
-        while (R_StitchPatches(grid1num, j))
-        {
-            numstitches++;
-        }
-
-        // the grid1 could be reallocated again
-        grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-    }
-    return numstitches;
-}
-
-/*
-===============
-R_StitchAllPatches
-===============
-*/
-void R_StitchAllPatches( void ) {
-    int i, stitched, numstitches;
-    srfGridMesh_t *grid1;
-
-    numstitches = 0;
-    do
-    {
-        stitched = qfalse;
-        for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-            //
-            grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-            // if this surface is not a grid
-            if ( grid1->surfaceType != SF_GRID )
-                continue;
-            //
-            if ( grid1->lodStitched )
-                continue;
-            //
-            grid1->lodStitched = qtrue;
-            stitched = qtrue;
-            //
-            numstitches += R_TryStitchingPatch( i );
-        }
-    }
-    while (stitched);
-    ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
-}
-
-/*
-===============
-R_MovePatchSurfacesToHunk
-===============
-*/
-void R_MovePatchSurfacesToHunk(void) {
-    int i, size;
-    srfGridMesh_t *grid, *hunkgrid;
-
-    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-        //
-        grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-        // if this surface is not a grid
-        if ( grid->surfaceType != SF_GRID )
-            continue;
-        //
-        size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-        hunkgrid = ri.Hunk_Alloc( size, h_dontcare );
-        Com_Memcpy(hunkgrid, grid, size);
-
-        hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_dontcare );
-        Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
-
-        hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_dontcare );
-        Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 );
-
-        R_FreeSurfaceGridMesh( grid );
-
-        s_worldData.surfaces[i].data = (void *) hunkgrid;
-    }
-}
-
-/*
-===============
-R_LoadSurfaces
-===============
-*/
-static	void R_LoadSurfaces(gamelump_t* surfs, gamelump_t* verts, gamelump_t* indexLump) {
-    dsurface_t	*in;
-    msurface_t	*out;
-    drawVert_t	*dv;
-    int			*indexes;
-    int			count;
-    int			numFaces, numMeshes, numTriSurfs, numFlares;
-    int			i;
-
-    numFaces = 0;
-    numMeshes = 0;
-    numTriSurfs = 0;
-    numFlares = 0;
-
-    if (surfs->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = surfs->length / sizeof(*in);
-
-    dv = (void*)verts->buffer;
-    if (verts->length % sizeof(*dv))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-
-    indexes = (void*)indexLump->buffer;
-    if (indexLump->length % sizeof(*indexes))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-
-    in = (void*)surfs->buffer;
-    out = ri.Hunk_Alloc ( count * sizeof(*out), h_dontcare );	
-
-    s_worldData.surfaces = out;
-    s_worldData.numsurfaces = count;
-
-    for ( i = 0 ; i < count ; i++, in++, out++ ) {
-        switch ( LittleLong( in->surfaceType ) ) {
-        case MST_PATCH:
-            ParseMesh ( in, dv, out );
-            numMeshes++;
-            break;
-        case MST_TRIANGLE_SOUP:
-            ParseTriSurf( in, dv, out, indexes );
-            numTriSurfs++;
-            break;
-        case MST_PLANAR:
-            ParseFace( in, dv, out, indexes );
-            numFaces++;
-            break;
-        case MST_FLARE:
-            ParseFlare( in, dv, out, indexes );
-            numFlares++;
-            break;
-        default:
-            ri.Error( ERR_DROP, "Bad surfaceType" );
-        }
-    }
-
-#ifdef PATCH_STITCHING
-    R_StitchAllPatches();
-#endif
-
-    R_FixSharedVertexLodError();
-
-#ifdef PATCH_STITCHING
-    R_MovePatchSurfacesToHunk();
-#endif
-
-    ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
-        numFaces, numMeshes, numTriSurfs, numFlares );
-}
-
-
-
-/*
-=================
-R_LoadSubmodels
-=================
-*/
-static	void R_LoadSubmodels(gamelump_t* l) {
-    dmodel_t	*in;
-    bmodel_t	*out;
-    int			i, j, count;
-
-    in = (void*)l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-
-    s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
-    s_worldData.numBmodels = count;
-
-    for ( i=0 ; i<count ; i++, in++, out++ ) {
-        model_t *model;
-
-        model = R_AllocModel();
-
-        assert( model != NULL );			// this should never happen
-
-        model->type = MOD_BRUSH;
-        model->d.bmodel = out;
-        Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
-
-        for (j=0 ; j<3 ; j++) {
-            out->bounds[0][j] = LittleFloat (in->mins[j]);
-            out->bounds[1][j] = LittleFloat (in->maxs[j]);
-        }
-
-        out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
-        out->numSurfaces = LittleLong( in->numSurfaces );
-    }
-}
-
-
-
-//==================================================================
-
-/*
-=================
-R_SetParent
-=================
-*/
-static	void R_SetParent (mnode_t *node, mnode_t *parent)
-{
-    node->parent = parent;
-    if (node->contents != -1)
-        return;
-    R_SetParent (node->children[0], node);
-    R_SetParent (node->children[1], node);
-}
-
-/*
-=================
-R_LoadNodesAndLeafs
-=================
-*/
-static	void R_LoadNodesAndLeafs(gamelump_t* nodeLump, gamelump_t* leafLump) {
-    int			i, j, p;
-    dnode_t* in;
-    dleaf_t* inLeaf;
-    mnode_t* out;
-    int			numNodes, numLeafs;
-
-    in = (void*)nodeLump->buffer;
-    if (nodeLump->length % sizeof(dnode_t) ||
-        leafLump->length % sizeof(dleaf_t)) {
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    }
-    numNodes = nodeLump->length / sizeof(dnode_t);
-    numLeafs = leafLump->length / sizeof(dleaf_t);
-
-    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
-
-    s_worldData.nodes = out;
-    s_worldData.numnodes = numNodes + numLeafs;
-    s_worldData.numDecisionNodes = numNodes;
-
-    // load nodes
-    for (i = 0; i < numNodes; i++, in++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(in->mins[j]);
-            out->maxs[j] = LittleLong(in->maxs[j]);
-        }
-
-        p = LittleLong(in->planeNum);
-        out->plane = s_worldData.planes + p;
-
-        out->contents = CONTENTS_NODE;	// differentiate from leafs
-
-        for (j = 0; j < 2; j++)
-        {
-            p = LittleLong(in->children[j]);
-            if (p >= 0)
-                out->children[j] = s_worldData.nodes + p;
-            else
-                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
-        }
-    }
-
-    // load leafs
-    inLeaf = (void*)leafLump->buffer;
-    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(inLeaf->mins[j]);
-            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
-        }
-
-        out->cluster = LittleLong(inLeaf->cluster);
-        out->area = LittleLong(inLeaf->area);
-
-        if (out->cluster >= s_worldData.numClusters) {
-            s_worldData.numClusters = out->cluster + 1;
-        }
-
-        out->firstmarksurface = s_worldData.marksurfaces +
-            LittleLong(inLeaf->firstLeafSurface);
-        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
-
-        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
-        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
-
-        out->firstStaticModel = LittleLong(inLeaf->firstStaticModel);
-        out->numStaticModels = LittleLong(inLeaf->numStaticModels);
-    }
-
-    // chain decendants
-    R_SetParent(s_worldData.nodes, NULL);
-}
-
-/*
-=================
-R_LoadNodesAndLeafsOld
-=================
-*/
-static	void R_LoadNodesAndLeafsOld(gamelump_t* nodeLump, gamelump_t* leafLump) {
-    int			i, j, p;
-    dnode_t* in;
-    dleaf_t_ver17* inLeaf;
-    mnode_t* out;
-    int			numNodes, numLeafs;
-
-    in = nodeLump->buffer;
-    if (nodeLump->length % sizeof(dnode_t) ||
-        leafLump->length % sizeof(dleaf_t)) {
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    }
-    numNodes = nodeLump->length / sizeof(dnode_t);
-    numLeafs = leafLump->length / sizeof(dleaf_t);
-
-    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
-
-    s_worldData.nodes = out;
-    s_worldData.numnodes = numNodes + numLeafs;
-    s_worldData.numDecisionNodes = numNodes;
-
-    // load nodes
-    for (i = 0; i < numNodes; i++, in++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(in->mins[j]);
-            out->maxs[j] = LittleLong(in->maxs[j]);
-        }
-
-        p = LittleLong(in->planeNum);
-        out->plane = s_worldData.planes + p;
-
-        out->contents = CONTENTS_NODE;	// differentiate from leafs
-
-        for (j = 0; j < 2; j++)
-        {
-            p = LittleLong(in->children[j]);
-            if (p >= 0)
-                out->children[j] = s_worldData.nodes + p;
-            else
-                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
-        }
-    }
-
-    // load leafs
-    inLeaf = leafLump->buffer;
-    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(inLeaf->mins[j]);
-            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
-        }
-
-        out->cluster = LittleLong(inLeaf->cluster);
-        out->area = LittleLong(inLeaf->area);
-
-        if (out->cluster >= s_worldData.numClusters) {
-            s_worldData.numClusters = out->cluster + 1;
-        }
-
-        out->firstmarksurface = s_worldData.marksurfaces +
-            LittleLong(inLeaf->firstLeafSurface);
-        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
-
-        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
-        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
-    }
-
-    // chain decendants
-    R_SetParent(s_worldData.nodes, NULL);
-}
-
-//=============================================================================
-
-/*
-=================
-R_LoadShaders
-=================
-*/
-static	void R_LoadShaders(gamelump_t* l) {
-    int		i, count;
-    dshader_t* in, * out;
-
-    in = l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-    out = ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
-
-    s_worldData.shaders = out;
-    s_worldData.numShaders = count;
-
-    Com_Memcpy(out, in, count * sizeof(*out));
-
-    for (i = 0; i < count; i++) {
-        out[i].surfaceFlags = LittleLong(out[i].surfaceFlags);
-        out[i].contentFlags = LittleLong(out[i].contentFlags);
-    }
-}
-
-
-/*
-=================
-R_LoadMarksurfaces
-=================
-*/
-static	void R_LoadMarksurfaces(gamelump_t* l)
-{
-    int		i, j, count;
-    int* in;
-    msurface_t** out;
-
-    in = l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-    out = (msurface_t**)ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
-
-    s_worldData.marksurfaces = out;
-    s_worldData.nummarksurfaces = count;
-
-    for (i = 0; i < count; i++)
-    {
-        j = LittleLong(in[i]);
-        out[i] = &s_worldData.surfaces[j];
-    }
-}
-
-
-/*
-=================
-R_LoadPlanes
-=================
-*/
-static	void R_LoadPlanes(gamelump_t* l) {
-    int			i, j;
-    cplane_t* out;
-    dplane_t* in;
-    int			count;
-    int			bits;
-
-    in = l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-    out = ri.Hunk_Alloc(count * 2 * sizeof(*out), h_dontcare);
-
-    s_worldData.planes = out;
-    s_worldData.numplanes = count;
-
-    for (i = 0; i < count; i++, in++, out++) {
-        bits = 0;
-        for (j = 0; j < 3; j++) {
-            out->normal[j] = LittleFloat(in->normal[j]);
-            if (out->normal[j] < 0) {
-                bits |= 1 << j;
-            }
-        }
-
-        out->dist = LittleFloat(in->dist);
-        out->type = PlaneTypeForNormal(out->normal);
-        out->signbits = bits;
-    }
-}
-
-/*
-================
-R_LoadLightGrid
-
-================
-*/
-void R_LoadLightGrid(gamelump_t* plPal, gamelump_t* plOffsets, gamelump_t* plData) {
-    int		i;
-    vec3_t	maxs;
-    int		numGridPoints;
-    world_t	*w;
-    float	*wMins, *wMaxs;
-
-    w = &s_worldData;
-
-    if (!plPal->buffer || !plOffsets->buffer || !plData->buffer) {
-        ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
-        w->lightGridOffsets = 0;
-        w->lightGridData = 0;
-        return;
-    }
-
-    switch (map_version)
-    {
-    case 21:
-        w->lightGridSize[0] = 80.0;
-        w->lightGridSize[1] = 80.0;
-        w->lightGridSize[2] = 80.0;
-        break;
-    case 20:
-        w->lightGridSize[0] = 48.0;
-        w->lightGridSize[1] = 48.0;
-        w->lightGridSize[2] = 64.0;
-        break;
-    default:
-        w->lightGridSize[0] = 32.0;
-        w->lightGridSize[1] = 32.0;
-        w->lightGridSize[2] = 32.0;
-        break;
-    }
-
-    w->lightGridOOSize[0] = 1.0f / w->lightGridSize[0];
-    w->lightGridOOSize[1] = 1.0f / w->lightGridSize[1];
-    w->lightGridOOSize[2] = 1.0f / w->lightGridSize[2];
-
-    wMins = w->bmodels[0].bounds[0];
-    wMaxs = w->bmodels[0].bounds[1];
-
-    for ( i = 0 ; i < 3 ; i++ ) {
-        w->lightGridMins[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
-        maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
-        w->lightGridBounds[i] = (maxs[i] - w->lightGridMins[i])/w->lightGridSize[i] + 1;
-    }
-
-    numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
-
-    if (plOffsets->length != numGridPoints * 2) {
-        ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
-        w->lightGridOffsets = NULL;
-        w->lightGridData = NULL;
-        return;
-    }
-
-    if (plPal->length != 768) {
-        ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
-        w->lightGridOffsets = NULL;
-        w->lightGridData = NULL;
-        return;
-    }
-
-    w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
-    for (i = 0; i < plOffsets->length / 2; i++) {
-        w->lightGridOffsets[i] = LittleUnsignedShort(((short*)plOffsets->buffer)[i]);
-    }
-    Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
-
-    w->lightGridData = ri.Hunk_Alloc(plData->length, h_dontcare);
-    Com_Memcpy(w->lightGridData, plData->buffer, plData->length);
-}
-
-/*
-================
-R_LoadStaticModelData
-================
-*/
-void R_LoadStaticModelData(gamelump_t* lump) {
-    int		i;
-    byte* pDstColors;
-    byte* pSrcColors;
-
-    if (!lump->length) {
-        s_worldData.numStaticModelData = 0;
-        s_worldData.staticModelData = 0;
-        return;
-    }
-
-
-    if (lump->length % (sizeof(byte) * 3)) {
-        Com_Error(1, "R_LoadStaticModelData: funny lump size");
-    }
-
-    s_worldData.numStaticModelData = lump->length / (sizeof(byte) * 3);
-    s_worldData.staticModelData = (byte*)ri.Hunk_Alloc(s_worldData.numStaticModelData * sizeof(color4ub_t), h_dontcare);
-
-    pSrcColors = lump->buffer;
-    pDstColors = s_worldData.staticModelData;
-
-    for (i = 0; i < lump->length; i += sizeof(byte) * 3)
-    { 
-        // Colors are stored as integers
-        pDstColors[0] = pSrcColors[0];
-        pDstColors[1] = pSrcColors[1];
-        pDstColors[2] = pSrcColors[2];
-        pDstColors[3] = 0xFF;
-
-        pSrcColors += sizeof(byte) * 3;
-        pDstColors += sizeof(byte) * 4;
-    }
-}
-
-/*
-================
-R_CopyStaticModel
-================
-*/
-void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
-    pUnpackedSM->visCount = 0;
-    pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
-    pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
-    pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
-    pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
-    pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
-    pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
-    pUnpackedSM->scale = LittleFloat(pSM->scale);
-    pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
-    pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
-    memcpy(pUnpackedSM->model, pSM->model, sizeof(pUnpackedSM->model));
-}
-
-/*
-================
-R_LoadStaticModelDefs
-================
-*/
-void R_LoadStaticModelDefs(gamelump_t* lump) {
-    int		i;
-    cStaticModel_t* in;
-    cStaticModelUnpacked_t* out;
-
-    if (!lump->length) {
-        s_worldData.numStaticModels = 0;
-        s_worldData.staticModels = NULL;
-        return;
-    }
-
-    if (lump->length % sizeof(cStaticModel_t)) {
-        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
-    }
-
-    s_worldData.numStaticModels = lump->length / sizeof(cStaticModel_t);
-    s_worldData.staticModels = ri.Hunk_Alloc(s_worldData.numStaticModels * sizeof(cStaticModelUnpacked_t), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.staticModels;
-
-    for (i = 0; i < s_worldData.numStaticModels; in++, out++, i++) {
-        R_CopyStaticModel(in, out);
-    }
-}
-
-/*
-================
-R_LoadStaticModelIndexes
-================
-*/
-void R_LoadStaticModelIndexes(gamelump_t* lump) {
-    int i;
-    unsigned short* in;
-    cStaticModelUnpacked_t** out;
-
-    if (lump->length % sizeof(short)) {
-        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
-    }
-
-    s_worldData.numVisStaticModels = lump->length / sizeof(short);
-    s_worldData.visStaticModels = ri.Hunk_Alloc(s_worldData.numVisStaticModels * sizeof(cStaticModelUnpacked_t*), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.visStaticModels;
-
-    for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
-        unsigned short index = LittleUnsignedShort(*in);
-        if (index >= s_worldData.numStaticModels) {
-            // Added in OPM
-            Com_Error(ERR_DROP, "R_LoadStaticModelIndexes: bad static model index %d", index);
-        }
-
-        *out = &s_worldData.staticModels[index];
-    }
-}
-
-/*
-==================
-R_LoadLump
-
-Loads a lump from the BSP file
-==================
-*/
-int R_LoadLump(fileHandle_t handle, lump_t* lump, gamelump_t* glump, int size)
-{
-    glump->buffer = NULL;
-    glump->length = lump->filelen;
-
-    if (lump->filelen) {
-        glump->buffer = Hunk_AllocateTempMemory(lump->filelen);
-
-        if (FS_Seek(handle, lump->fileofs, FS_SEEK_SET) < 0) {
-            Com_Error(ERR_DROP, "R_LoadLump: Error seeking to lump.");
-        }
-
-        FS_Read(glump->buffer, lump->filelen, handle);
-
-        if (size) {
-            return lump->filelen / size;
-        }
-    }
-
-    return 0;
-}
-
-/*
-==================
-R_FreeLump
-
-Free a previously allocated lump
-==================
-*/
-void R_FreeLump(gamelump_t* lump)
-{
-    if (lump->buffer)
-    {
-        Hunk_FreeTempMemory(lump->buffer);
-        lump->buffer = NULL;
-        lump->length = 0;
-    }
-}
-
-#define _R( id ) UI_LoadResource( "*" #id )
-
-/*
-=================
-RE_LoadWorldMap
-
-Called directly from cgame
-=================
-*/
-void RE_LoadWorldMap( const char *name ) {
-    int			i;
-    dheader_t	header;
-    fileHandle_t	h;
-    int				length;
-    vec3_t			vDefSundir;
-    gamelump_t		lump, lump2, lump3;
-
-    vDefSundir[0] = 0.45f;
-    vDefSundir[1] = 0.3f;
-    vDefSundir[2] = 0.9f;
-
-    _R(52);
-
-    // set default sun direction to be used if it isn't
-    // overridden by a shader
-    VectorCopy(vDefSundir, tr.sunDirection);
-    VectorNormalize( tr.sunDirection );
-
-    tr.worldMapLoaded = qtrue;
-
-    // load it
-    length = ri.FS_OpenFile(name, &h, qtrue, qtrue);
-    if (length <= 0) {
-        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s not found", name);
-    }
-
-    ri.FS_Read(&header, sizeof(dheader_t), h);
-
-    for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
-        ((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
-    }
-
-    map_length = length;
-    map_version = header.version;
-
-    // clear tr.world so if the level fails to load, the next
-    // try will not look at the partially loaded version
-    tr.world = NULL;
-
-    Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
-    Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
-
-    Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
-    COM_StripExtension( s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
-
-    c_gridVerts = 0;
-
-    i = header.version;
-    if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
-        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
-            name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
-    }
-
-    // load into heap
-    // load into heap
-    _R(53);
-    numShaders = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SHADERS), &lump, sizeof(dshader_t));
-    _R(54);
-    R_LoadShaders(&lump);
-    _R(55);
-    R_FreeLump(&lump);
-    _R(56);
-    numplanes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_PLANES), &lump, sizeof(dplane_t));
-    R_LoadPlanes(&lump);
-    _R(57);
-    R_FreeLump(&lump);
-    _R(58);
-    numLightBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTMAPS), &lump, sizeof(byte));
-    _R(59);
-    R_LoadLightmaps(&lump);
-    _R(60);
-    R_FreeLump(&lump);
-    _R(61);
-    numDrawSurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SURFACES), &lump, sizeof(dsurface_t));
-    _R(62);
-    numDrawVerts = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWVERTS), &lump2, sizeof(drawVert_t));
-    _R(63);
-    numDrawIndexes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWINDEXES), &lump3, sizeof(int));
-    _R(64);
-    R_LoadSurfaces(&lump, &lump2, &lump3);
-    _R(65);
-    R_FreeLump(&lump3);
-    _R(66);
-    R_FreeLump(&lump2);
-    _R(67);
-    R_FreeLump(&lump);
-    _R(68);
-    numleafsurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFSURFACES), &lump, sizeof(int));
-    _R(69);
-    R_LoadMarksurfaces(&lump);
-    _R(70);
-    R_FreeLump(&lump);
-    _R(71);
-    numleafs = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFS), &lump2, sizeof(dleaf_t));
-    _R(72);
-    numnodes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_NODES), &lump, sizeof(mnode_t));
-    _R(73);
-    if (header.version > BSP_BETA_VERSION) {
-        R_LoadNodesAndLeafs(&lump, &lump2);
-    }
-    else {
-        R_LoadNodesAndLeafsOld(&lump, &lump2);
-    }
-    _R(74);
-    R_FreeLump(&lump);
-    _R(75);
-    R_FreeLump(&lump2);
-    _R(76);
-    numFogs = 0;
-    nummodels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_MODELS), &lump, sizeof(bmodel_t));
-    _R(77);
-    R_LoadSubmodels(&lump);
-    _R(78);
-    R_FreeLump(&lump);
-    _R(79);
-    numVisBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_VISIBILITY), &lump, sizeof(byte));
-    _R(80);
-    R_LoadVisibility(&lump);
-    _R(81);
-    R_FreeLump(&lump);
-    _R(82);
-    g_iGridPaletteBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDPALETTE), &lump, sizeof(byte));
-    _R(83);
-    g_iGridOffsets = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDOFFSETS), &lump2, sizeof(short));
-    _R(84);
-    g_iGridDataSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDDATA), &lump3, sizeof(byte));
-    _R(85);
-    R_LoadLightGrid( &lump, &lump2, &lump3 );
-    _R(86);
-    R_FreeLump(&lump);
-    _R(87);
-    R_FreeLump(&lump2);
-    _R(88);
-    R_FreeLump(&lump3);
-    _R(89);
-    numSLights = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTS), &lump, sizeof(mapspherel_t));
-    _R(90);
-    R_LoadSphereLights(&lump);
-    _R(91);
-    R_FreeLump(&lump);
-    _R(92);
-    entLightVisSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTVIS), &lump, sizeof(byte));
-    _R(93);
-    R_LoadSphereLightVis(&lump);
-    _R(94);
-    R_FreeLump(&lump);
-    _R(95);
-    g_nTerraPatches = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAIN), &lump, sizeof(cTerraPatch_t));
-    _R(96);
-    R_LoadTerrain(&lump);
-    _R(97);
-    R_FreeLump(&lump);
-    _R(98);
-    g_nTerPatchIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAININDEXES), &lump, sizeof(short));
-    _R(99);
-    R_LoadTerrainIndexes(&lump);
-    _R(100);
-    R_FreeLump(&lump);
-    _R(101);
-    if (header.version > BSP_BETA_VERSION)
-    {
-        g_nStaticModelData = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDATA), &lump, sizeof(byte));
-        _R(102);
-        R_LoadStaticModelData(&lump);
-        _R(103);
-        R_FreeLump(&lump);
-        _R(104);
-        g_nStaticModels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDEF), &lump, sizeof(cStaticModel_t));
-        _R(105);
-        R_LoadStaticModelDefs(&lump);
-        _R(106);
-        R_FreeLump(&lump);
-        _R(107);
-        g_nStaticModelIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELINDEXES), &lump, sizeof(byte));
-        _R(108);
-        R_LoadStaticModelIndexes(&lump);
-        _R(109);
-        R_FreeLump(&lump);
-        _R(110);
-    }
-    else
-    {
-        g_nStaticModelData = 0;
-        g_nStaticModels = 0;
-        g_nStaticModelIndices = 0;
-    }
-
-    // only set tr.world now that we know the entire level has loaded properly
-    tr.world = &s_worldData;
-
-    ri.FS_CloseFile(h);
-
-    UI_LoadResource("*111");
-    R_Sphere_InitLights();
-    UI_LoadResource("*112");
-    R_InitTerrain();
-    UI_LoadResource("*113");
-    R_InitStaticModels();
-    UI_LoadResource("*114");
-    R_LevelMarksLoad(name);
-    UI_LoadResource("*115");
-    R_VisDebugLoad(name);
-    UI_LoadResource("*116");
-}
-
-/*
-=================
-RE_MapVersion
-
-=================
-*/
-int RE_MapVersion(void)
-{
-	return map_version;
-}
-
-/*
-=================
-RE_PrintBSPFileSizes
-
-=================
-*/
-void RE_PrintBSPFileSizes(void)
-{
-  ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
-  ri.Printf(PRINT_ALL, "%6i   models                %7i\n", nummodels, 40 * nummodels);
-  ri.Printf(PRINT_ALL, "%6i   shaders               %7i\n", numShaders, 140 * numShaders);
-  ri.Printf(PRINT_ALL, "%6i   brushes               %7i\n", numbrushes, 12 * numbrushes);
-  ri.Printf(PRINT_ALL, "%6i   brushsides            %7i\n", numbrushsides, 12 * numbrushsides);
-  ri.Printf(PRINT_ALL, "%6i   fogs                  %7i\n", numFogs, 72 * numFogs);
-  ri.Printf(PRINT_ALL, "%6i   planes                %7i\n", numplanes, 16 * numplanes);
-  ri.Printf(PRINT_ALL, "%6i   nodes                 %7i\n", numnodes, 36 * numnodes);
-  ri.Printf(PRINT_ALL, "%6i   leafs                 %7i\n", numleafs, numleafs << 6);
-  ri.Printf(PRINT_ALL, "%6i   leafsurfaces          %7i\n", numleafsurfaces, 4 * numleafsurfaces);
-  ri.Printf(PRINT_ALL, "%6i   drawverts             %7i\n", numDrawVerts, 44 * numDrawVerts);
-  ri.Printf(PRINT_ALL, "%6i   drawindexes           %7i\n", numDrawIndexes, 4 * numDrawIndexes);
-  ri.Printf(PRINT_ALL, "%6i   drawsurfaces          %7i\n", numDrawSurfaces, 108 * numDrawSurfaces);
-  ri.Printf(PRINT_ALL, "%6i   lightdefs             %7i\n", numLightDefs, 52 * numLightDefs);
-  ri.Printf(PRINT_ALL, "%6i   lightmaps             %7i\n", numLightBytes / 49152, numLightBytes);
-  ri.Printf(PRINT_ALL, "         visibility            %7i\n", numVisBytes);
-  ri.Printf(PRINT_ALL, "%6i   entitylights          %7i\n", numSLights, 56 * numSLights);
-  ri.Printf(PRINT_ALL, "         entitylightvis        %7i\n", entLightVisSize);
-  ri.Printf(PRINT_ALL, "         light grid palette    %7i\n", g_iGridPaletteBytes);
-  ri.Printf(PRINT_ALL, "%6i   light grid offsets    %7i\n", g_iGridOffsets, 2 * g_iGridOffsets);
-  ri.Printf(PRINT_ALL, "         light grid data       %7i\n", g_iGridDataSize);
-  ri.Printf(PRINT_ALL, "%6i   terrain               %7i\n", g_nTerraPatches, 388 * g_nTerraPatches);
-  ri.Printf(PRINT_ALL, "%6i   terrain indexes       %7i\n", g_nTerPatchIndices, 2 * g_nTerPatchIndices);
-  ri.Printf(PRINT_ALL, "         static model data     %7i\n", g_nStaticModelData);
-  ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
-  ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
-}
-
-/*
-=================
-R_ClearWorld
-
-Set the world to NULL to prevent anyone from accessing
-freed world data
-=================
-*/
-void R_ClearWorld(void) {
-    tr.world = NULL;
-}
diff --git a/code/renderer/tr_cmds.c b/code/renderer/tr_cmds.c
deleted file mode 100644
index 466f909d..00000000
--- a/code/renderer/tr_cmds.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-volatile renderCommandList_t	*renderCommandList;
-
-volatile qboolean	renderThreadActive;
-
-static backEndCounters_t pc_save;
-
-/*
-=====================
-R_PerformanceCounters
-=====================
-*/
-void R_SavePerformanceCounters(void) {
-    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
-}
-
-/*
-=====================
-R_PerformanceCounters
-=====================
-*/
-void R_PerformanceCounters( void ) {
-	if (fps->integer) {
-		ri.SetPerformanceCounters(
-			backEnd.pc.c_totalIndexes / 3,
-			backEnd.pc.c_vertexes,
-			R_SumOfUsedImages(),
-			pc_save.c_totalIndexes / 3,
-			pc_save.c_vertexes,
-			backEnd.pc.c_characterlights
-			);
-	}
-	if ( !r_speeds->integer ) {
-		// clear the counters even if we aren't printing
-		Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
-		Com_Memset( &backEnd.pc, 0, sizeof( backEnd.pc ) );
-		return;
-	}
-
-	if (r_speeds->integer == 1) {
-		ri.Printf (PRINT_ALL, "%i/%i shaders/surfs %i leafs %i verts %i/%i tris %.2f mtex %.2f dc\n",
-			backEnd.pc.c_shaders, backEnd.pc.c_surfaces, tr.pc.c_leafs, backEnd.pc.c_vertexes, 
-			backEnd.pc.c_indexes/3, backEnd.pc.c_totalIndexes/3, 
-			R_SumOfUsedImages()/(1000000.0f), backEnd.pc.c_overDraw / (float)(glConfig.vidWidth * glConfig.vidHeight) ); 
-	} else if (r_speeds->integer == 2) {
-		ri.Printf (PRINT_ALL, "(patch) %i sin %i sclip  %i sout %i bin %i bclip %i bout\n",
-			tr.pc.c_sphere_cull_patch_in, tr.pc.c_sphere_cull_patch_clip, tr.pc.c_sphere_cull_patch_out, 
-			tr.pc.c_box_cull_patch_in, tr.pc.c_box_cull_patch_clip, tr.pc.c_box_cull_patch_out );
-		ri.Printf (PRINT_ALL, "(md3) %i sin %i sclip  %i sout %i bin %i bclip %i bout\n",
-			tr.pc.c_sphere_cull_md3_in, tr.pc.c_sphere_cull_md3_clip, tr.pc.c_sphere_cull_md3_out, 
-			tr.pc.c_box_cull_md3_in, tr.pc.c_box_cull_md3_clip, tr.pc.c_box_cull_md3_out );
-	} else if (r_speeds->integer == 3) {
-		ri.Printf (PRINT_ALL, "viewcluster: %i\n", tr.viewCluster );
-	} else if (r_speeds->integer == 4) {
-		if ( backEnd.pc.c_dlightVertexes ) {
-			ri.Printf (PRINT_ALL, "dlight srf:%i  culled:%i  verts:%i  tris:%i\n", 
-				tr.pc.c_dlightSurfaces, tr.pc.c_dlightSurfacesCulled,
-				backEnd.pc.c_dlightVertexes, backEnd.pc.c_dlightIndexes / 3 );
-		}
-	} 
-	else if (r_speeds->integer == 5 )
-	{
-		ri.Printf( PRINT_ALL, "zFar: %.0f\n", tr.viewParms.zFar );
-	}
-	else if (r_speeds->integer == 6 )
-	{
-		ri.Printf( PRINT_ALL, "flare adds:%i tests:%i renders:%i\n", 
-			backEnd.pc.c_flareAdds, backEnd.pc.c_flareTests, backEnd.pc.c_flareRenders );
-	}
-
-	Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
-	Com_Memset( &backEnd.pc, 0, sizeof( backEnd.pc ) );
-}
-
-
-/*
-====================
-R_InitCommandBuffers
-====================
-*/
-void R_InitCommandBuffers( void ) {
-	glConfig.smpActive = qfalse;
-	if ( r_smp->integer ) {
-		ri.Printf( PRINT_ALL, "Trying SMP acceleration...\n" );
-		if ( GLimp_SpawnRenderThread( RB_RenderThread ) ) {
-			ri.Printf( PRINT_ALL, "...succeeded.\n" );
-			glConfig.smpActive = qtrue;
-		} else {
-			ri.Printf( PRINT_ALL, "...failed.\n" );
-		}
-	}
-}
-
-/*
-====================
-R_ShutdownCommandBuffers
-====================
-*/
-void R_ShutdownCommandBuffers( void ) {
-	// kill the rendering thread
-	if ( glConfig.smpActive ) {
-		GLimp_WakeRenderer( NULL );
-		glConfig.smpActive = qfalse;
-	}
-}
-
-/*
-====================
-R_IssueRenderCommands
-====================
-*/
-int	c_blockedOnRender;
-int	c_blockedOnMain;
-
-void R_IssueRenderCommands( qboolean runPerformanceCounters ) {
-	renderCommandList_t	*cmdList;
-
-	cmdList = &backEndData[tr.smpFrame]->commands;
-	assert(cmdList); // bk001205
-	// add an end-of-list command
-	*(int *)(cmdList->cmds + cmdList->used) = RC_END_OF_LIST;
-
-	// clear it out, in case this is a sync and not a buffer flip
-	cmdList->used = 0;
-
-	if ( glConfig.smpActive ) {
-		// if the render thread is not idle, wait for it
-		if ( renderThreadActive ) {
-			c_blockedOnRender++;
-			if ( r_showSmp->integer ) {
-				ri.Printf( PRINT_ALL, "R" );
-			}
-		} else {
-			c_blockedOnMain++;
-			if ( r_showSmp->integer ) {
-				ri.Printf( PRINT_ALL, "." );
-			}
-		}
-
-		// sleep until the renderer has completed
-		GLimp_FrontEndSleep();
-	}
-
-	// at this point, the back end thread is idle, so it is ok
-	// to look at it's performance counters
-	if ( runPerformanceCounters ) {
-		R_PerformanceCounters();
-	}
-
-	// actually start the commands going
-	if ( !r_skipBackEnd->integer ) {
-		// let it start on the new batch
-		if ( !glConfig.smpActive ) {
-			RB_ExecuteRenderCommands( cmdList->cmds );
-		} else {
-			GLimp_WakeRenderer( cmdList );
-		}
-	}
-}
-
-
-/*
-====================
-R_SyncRenderThread
-
-Issue any pending commands and wait for them to complete.
-After exiting, the render thread will have completed its work
-and will remain idle and the main thread is free to issue
-OpenGL calls until R_IssueRenderCommands is called.
-====================
-*/
-void R_SyncRenderThread( void ) {
-	if ( !tr.registered ) {
-		return;
-	}
-	R_IssueRenderCommands( qfalse );
-
-	if ( !glConfig.smpActive ) {
-		return;
-	}
-	GLimp_FrontEndSleep();
-}
-
-/*
-============
-R_GetCommandBuffer
-
-make sure there is enough command space, waiting on the
-render thread if needed.
-============
-*/
-void *R_GetCommandBuffer( int bytes ) {
-	renderCommandList_t	*cmdList;
-
-	cmdList = &backEndData[tr.smpFrame]->commands;
-
-	// always leave room for the end of list command
-	if ( cmdList->used + bytes + 4 > MAX_RENDER_COMMANDS ) {
-		if ( bytes > MAX_RENDER_COMMANDS - 4 ) {
-			ri.Error( ERR_FATAL, "R_GetCommandBuffer: bad size %i", bytes );
-		}
-		// if we run out of room, just start dropping commands
-		return NULL;
-	}
-
-	cmdList->used += bytes;
-
-	return cmdList->cmds + cmdList->used - bytes;
-}
-
-
-/*
-=============
-R_AddDrawSurfCmd
-
-=============
-*/
-void	R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs ) {
-	drawSurfsCommand_t	*cmd;
-
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_DRAW_SURFS;
-
-	cmd->drawSurfs = drawSurfs;
-	cmd->numDrawSurfs = numDrawSurfs;
-
-	cmd->refdef = tr.refdef;
-	cmd->viewParms = tr.viewParms;
-}
-
-
-/*
-=============
-R_AddSpriteSurfCmd
-
-=============
-*/
-void	R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs) {
-    drawSurfsCommand_t* cmd;
-
-    cmd = R_GetCommandBuffer(sizeof(*cmd));
-    if (!cmd) {
-        return;
-    }
-    cmd->commandId = RC_SPRITE_SURFS;
-
-    cmd->drawSurfs = drawSurfs;
-    cmd->numDrawSurfs = numDrawSurfs;
-
-    cmd->refdef = tr.refdef;
-    cmd->viewParms = tr.viewParms;
-}
-
-
-/*
-=============
-RE_SetColor
-
-Passing NULL will set the color to white
-=============
-*/
-void	RE_SetColor( const float *rgba ) {
-	setColorCommand_t	*cmd;
-
-  if ( !tr.registered ) {
-    return;
-  }
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_SET_COLOR;
-	if ( !rgba ) {
-		static float colorWhite[4] = { 1, 1, 1, 1 };
-
-		rgba = colorWhite;
-	}
-
-	cmd->color[0] = rgba[0];
-	cmd->color[1] = rgba[1];
-	cmd->color[2] = rgba[2];
-	cmd->color[3] = rgba[3];
-}
-
-
-/*
-=============
-RE_StretchPic
-=============
-*/
-void RE_StretchPic ( float x, float y, float w, float h, 
-					  float s1, float t1, float s2, float t2, qhandle_t hShader ) {
-	stretchPicCommand_t	*cmd;
-
-  if (!tr.registered) {
-    return;
-  }
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_STRETCH_PIC;
-	cmd->shader = R_GetShaderByHandle( hShader );
-	cmd->x = x;
-	cmd->y = y;
-	cmd->w = w;
-	cmd->h = h;
-	cmd->s1 = s1;
-	cmd->t1 = t1;
-	cmd->s2 = s2;
-	cmd->t2 = t2;
-}
-
-
-/*
-====================
-RE_BeginFrame
-
-If running in stereo, RE_BeginFrame will be called twice
-for each RE_EndFrame
-====================
-*/
-void RE_BeginFrame( stereoFrame_t stereoFrame ) {
-	drawBufferCommand_t	*cmd;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	glState.finishCalled = qfalse;
-
-	tr.frameCount++;
-	tr.frameSceneNum = 0;
-	g_nStaticSurfaces = 0;
-
-	//
-	// do overdraw measurement
-	//
-	if ( r_measureOverdraw->integer )
-	{
-		if ( glConfig.stencilBits < 4 )
-		{
-			ri.Printf( PRINT_ALL, "Warning: not enough stencil bits to measure overdraw: %d\n", glConfig.stencilBits );
-			ri.Cvar_Set( "r_measureOverdraw", "0" );
-			r_measureOverdraw->modified = qfalse;
-		}
-		else if ( r_shadows->integer == 2 )
-		{
-			ri.Printf( PRINT_ALL, "Warning: stencil shadows and overdraw measurement are mutually exclusive\n" );
-			ri.Cvar_Set( "r_measureOverdraw", "0" );
-			r_measureOverdraw->modified = qfalse;
-		}
-		else
-		{
-			R_SyncRenderThread();
-			qglEnable( GL_STENCIL_TEST );
-			qglStencilMask( ~0U );
-			qglClearStencil( 0U );
-			qglStencilFunc( GL_ALWAYS, 0U, ~0U );
-			qglStencilOp( GL_KEEP, GL_INCR, GL_INCR );
-		}
-		r_measureOverdraw->modified = qfalse;
-	}
-	else
-	{
-		// this is only reached if it was on and is now off
-		if ( r_measureOverdraw->modified ) {
-			R_SyncRenderThread();
-			qglDisable( GL_STENCIL_TEST );
-		}
-		r_measureOverdraw->modified = qfalse;
-	}
-
-	//
-	// texturemode stuff
-	//
-	if ( r_textureMode->modified ) {
-		R_SyncRenderThread();
-		GL_TextureMode( r_textureMode->string );
-		r_textureMode->modified = qfalse;
-	}
-
-	//
-	// gamma stuff
-	//
-	if ( r_gamma->modified ) {
-		r_gamma->modified = qfalse;
-
-		R_SyncRenderThread();
-		R_SetColorMappings();
-	}
-
-    // check for errors
-    if ( !r_ignoreGLErrors->integer ) {
-        int	err;
-
-		R_SyncRenderThread();
-        if ( ( err = qglGetError() ) != GL_NO_ERROR ) {
-            ri.Error( ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!\n", err );
-        }
-    }
-
-	//
-	// draw buffer stuff
-	//
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_DRAW_BUFFER;
-
-	if ( glConfig.stereoEnabled ) {
-		if ( stereoFrame == STEREO_LEFT ) {
-			cmd->buffer = (int)GL_BACK_LEFT;
-		} else if ( stereoFrame == STEREO_RIGHT ) {
-			cmd->buffer = (int)GL_BACK_RIGHT;
-		} else {
-			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is enabled, but stereoFrame was %i", stereoFrame );
-		}
-	} else {
-		if ( stereoFrame != STEREO_CENTER ) {
-			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is disabled, but stereoFrame was %i", stereoFrame );
-		}
-		if ( !Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) ) {
-			cmd->buffer = (int)GL_FRONT;
-		} else {
-			cmd->buffer = (int)GL_BACK;
-		}
-	}
-}
-
-
-/*
-=============
-RE_EndFrame
-
-Returns the number of msec spent in the back end
-=============
-*/
-void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
-	swapBuffersCommand_t	*cmd;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_SWAP_BUFFERS;
-
-	R_IssueRenderCommands( qtrue );
-
-	// use the other buffers next frame, because another CPU
-	// may still be rendering into the current ones
-	R_ToggleSmpFrame();
-
-	if ( frontEndMsec ) {
-		*frontEndMsec = tr.frontEndMsec;
-	}
-	tr.frontEndMsec = 0;
-	if ( backEndMsec ) {
-		*backEndMsec = backEnd.pc.msec;
-	}
-	backEnd.pc.msec = 0;
-}
-
diff --git a/code/renderer/tr_curve.c b/code/renderer/tr_curve.c
deleted file mode 100644
index 446650f5..00000000
--- a/code/renderer/tr_curve.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-
-/*
-
-This file does all of the processing necessary to turn a raw grid of points
-read from the map file into a srfGridMesh_t ready for rendering.
-
-The level of detail solution is direction independent, based only on subdivided
-distance from the true curve.
-
-Only a single entry point:
-
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
-								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
-
-*/
-
-
-/*
-============
-LerpDrawVert
-============
-*/
-static void LerpDrawVert( drawVert_t *a, drawVert_t *b, drawVert_t *out ) {
-	out->xyz[0] = 0.5f * (a->xyz[0] + b->xyz[0]);
-	out->xyz[1] = 0.5f * (a->xyz[1] + b->xyz[1]);
-	out->xyz[2] = 0.5f * (a->xyz[2] + b->xyz[2]);
-
-	out->st[0] = 0.5f * (a->st[0] + b->st[0]);
-	out->st[1] = 0.5f * (a->st[1] + b->st[1]);
-
-	out->lightmap[0] = 0.5f * (a->lightmap[0] + b->lightmap[0]);
-	out->lightmap[1] = 0.5f * (a->lightmap[1] + b->lightmap[1]);
-
-	out->color[0] = (a->color[0] + b->color[0]) >> 1;
-	out->color[1] = (a->color[1] + b->color[1]) >> 1;
-	out->color[2] = (a->color[2] + b->color[2]) >> 1;
-	out->color[3] = (a->color[3] + b->color[3]) >> 1;
-}
-
-/*
-============
-Transpose
-============
-*/
-static void Transpose( int width, int height, drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE] ) {
-	int		i, j;
-	drawVert_t	temp;
-
-	if ( width > height ) {
-		for ( i = 0 ; i < height ; i++ ) {
-			for ( j = i + 1 ; j < width ; j++ ) {
-				if ( j < height ) {
-					// swap the value
-					temp = ctrl[j][i];
-					ctrl[j][i] = ctrl[i][j];
-					ctrl[i][j] = temp;
-				} else {
-					// just copy
-					ctrl[j][i] = ctrl[i][j];
-				}
-			}
-		}
-	} else {
-		for ( i = 0 ; i < width ; i++ ) {
-			for ( j = i + 1 ; j < height ; j++ ) {
-				if ( j < width ) {
-					// swap the value
-					temp = ctrl[i][j];
-					ctrl[i][j] = ctrl[j][i];
-					ctrl[j][i] = temp;
-				} else {
-					// just copy
-					ctrl[i][j] = ctrl[j][i];
-				}
-			}
-		}
-	}
-
-}
-
-
-/*
-=================
-MakeMeshNormals
-
-Handles all the complicated wrapping and degenerate cases
-=================
-*/
-static void MakeMeshNormals( int width, int height, drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE] ) {
-	int		i, j, k, dist;
-	vec3_t	normal;
-	vec3_t	sum;
-	int		count;
-	vec3_t	base;
-	vec3_t	delta;
-	int		x, y;
-	drawVert_t	*dv;
-	vec3_t		around[8], temp;
-	qboolean	good[8];
-	qboolean	wrapWidth, wrapHeight;
-	float		len;
-static	int	neighbors[8][2] = {
-	{0,1}, {1,1}, {1,0}, {1,-1}, {0,-1}, {-1,-1}, {-1,0}, {-1,1}
-	};
-
-	wrapWidth = qfalse;
-	for ( i = 0 ; i < height ; i++ ) {
-		VectorSubtract( ctrl[i][0].xyz, ctrl[i][width-1].xyz, delta );
-		len = VectorLengthSquared( delta );
-		if ( len > 1.0 ) {
-			break;
-		}
-	}
-	if ( i == height ) {
-		wrapWidth = qtrue;
-	}
-
-	wrapHeight = qfalse;
-	for ( i = 0 ; i < width ; i++ ) {
-		VectorSubtract( ctrl[0][i].xyz, ctrl[height-1][i].xyz, delta );
-		len = VectorLengthSquared( delta );
-		if ( len > 1.0 ) {
-			break;
-		}
-	}
-	if ( i == width) {
-		wrapHeight = qtrue;
-	}
-
-
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 0 ; j < height ; j++ ) {
-			count = 0;
-			dv = &ctrl[j][i];
-			VectorCopy( dv->xyz, base );
-			for ( k = 0 ; k < 8 ; k++ ) {
-				VectorClear( around[k] );
-				good[k] = qfalse;
-
-				for ( dist = 1 ; dist <= 3 ; dist++ ) {
-					x = i + neighbors[k][0] * dist;
-					y = j + neighbors[k][1] * dist;
-					if ( wrapWidth ) {
-						if ( x < 0 ) {
-							x = width - 1 + x;
-						} else if ( x >= width ) {
-							x = 1 + x - width;
-						}
-					}
-					if ( wrapHeight ) {
-						if ( y < 0 ) {
-							y = height - 1 + y;
-						} else if ( y >= height ) {
-							y = 1 + y - height;
-						}
-					}
-
-					if ( x < 0 || x >= width || y < 0 || y >= height ) {
-						break;					// edge of patch
-					}
-					VectorSubtract( ctrl[y][x].xyz, base, temp );
-					if ( VectorNormalize2( temp, temp ) == 0 ) {
-						continue;				// degenerate edge, get more dist
-					} else {
-						good[k] = qtrue;
-						VectorCopy( temp, around[k] );
-						break;					// good edge
-					}
-				}
-			}
-
-			VectorClear( sum );
-			for ( k = 0 ; k < 8 ; k++ ) {
-				if ( !good[k] || !good[(k+1)&7] ) {
-					continue;	// didn't get two points
-				}
-				CrossProduct( around[(k+1)&7], around[k], normal );
-				if ( VectorNormalize2( normal, normal ) == 0 ) {
-					continue;
-				}
-				VectorAdd( normal, sum, sum );
-				count++;
-			}
-			if ( count == 0 ) {
-//printf("bad normal\n");
-				count = 1;
-			}
-			VectorNormalize2( sum, dv->normal );
-		}
-	}
-}
-
-
-/*
-============
-InvertCtrl
-============
-*/
-static void InvertCtrl( int width, int height, drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE] ) {
-	int		i, j;
-	drawVert_t	temp;
-
-	for ( i = 0 ; i < height ; i++ ) {
-		for ( j = 0 ; j < width/2 ; j++ ) {
-			temp = ctrl[i][j];
-			ctrl[i][j] = ctrl[i][width-1-j];
-			ctrl[i][width-1-j] = temp;
-		}
-	}
-}
-
-
-/*
-=================
-InvertErrorTable
-=================
-*/
-static void InvertErrorTable( float errorTable[2][MAX_GRID_SIZE], int width, int height ) {
-	int		i;
-	float	copy[2][MAX_GRID_SIZE];
-
-	Com_Memcpy( copy, errorTable, sizeof( copy ) );
-
-	for ( i = 0 ; i < width ; i++ ) {
-		errorTable[1][i] = copy[0][i];	//[width-1-i];
-	}
-
-	for ( i = 0 ; i < height ; i++ ) {
-		errorTable[0][i] = copy[1][height-1-i];
-	}
-
-}
-
-/*
-==================
-PutPointsOnCurve
-==================
-*/
-static void PutPointsOnCurve( drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE], 
-							 int width, int height ) {
-	int			i, j;
-	drawVert_t	prev, next;
-
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 1 ; j < height ; j += 2 ) {
-			LerpDrawVert( &ctrl[j][i], &ctrl[j+1][i], &prev );
-			LerpDrawVert( &ctrl[j][i], &ctrl[j-1][i], &next );
-			LerpDrawVert( &prev, &next, &ctrl[j][i] );
-		}
-	}
-
-
-	for ( j = 0 ; j < height ; j++ ) {
-		for ( i = 1 ; i < width ; i += 2 ) {
-			LerpDrawVert( &ctrl[j][i], &ctrl[j][i+1], &prev );
-			LerpDrawVert( &ctrl[j][i], &ctrl[j][i-1], &next );
-			LerpDrawVert( &prev, &next, &ctrl[j][i] );
-		}
-	}
-}
-
-/*
-=================
-R_CreateSurfaceGridMesh
-=================
-*/
-srfGridMesh_t *R_CreateSurfaceGridMesh(int width, int height,
-								drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE], float errorTable[2][MAX_GRID_SIZE] ) {
-	int i, j, size;
-	drawVert_t	*vert;
-	vec3_t		tmpVec;
-	srfGridMesh_t *grid;
-
-	// copy the results out to a grid
-	size = (width * height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-
-#ifdef PATCH_STITCHING
-	grid = /*ri.Hunk_Alloc*/ ri.Malloc( size );
-	Com_Memset(grid, 0, size);
-
-	grid->widthLodError = /*ri.Hunk_Alloc*/ ri.Malloc( width * 4 );
-	Com_Memcpy( grid->widthLodError, errorTable[0], width * 4 );
-
-	grid->heightLodError = /*ri.Hunk_Alloc*/ ri.Malloc( height * 4 );
-	Com_Memcpy( grid->heightLodError, errorTable[1], height * 4 );
-#else
-	grid = ri.Hunk_Alloc( size );
-	Com_Memset(grid, 0, size);
-
-	grid->widthLodError = ri.Hunk_Alloc( width * 4 );
-	Com_Memcpy( grid->widthLodError, errorTable[0], width * 4 );
-
-	grid->heightLodError = ri.Hunk_Alloc( height * 4 );
-	Com_Memcpy( grid->heightLodError, errorTable[1], height * 4 );
-#endif
-
-	grid->width = width;
-	grid->height = height;
-	grid->surfaceType = SF_GRID;
-	ClearBounds( grid->meshBounds[0], grid->meshBounds[1] );
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 0 ; j < height ; j++ ) {
-			vert = &grid->verts[j*width+i];
-			*vert = ctrl[j][i];
-			AddPointToBounds( vert->xyz, grid->meshBounds[0], grid->meshBounds[1] );
-		}
-	}
-
-	// compute local origin and bounds
-	VectorAdd( grid->meshBounds[0], grid->meshBounds[1], grid->localOrigin );
-	VectorScale( grid->localOrigin, 0.5f, grid->localOrigin );
-	VectorSubtract( grid->meshBounds[0], grid->localOrigin, tmpVec );
-	grid->meshRadius = VectorLength( tmpVec );
-
-	VectorCopy( grid->localOrigin, grid->lodOrigin );
-	grid->lodRadius = grid->meshRadius;
-	//
-	return grid;
-}
-
-/*
-=================
-R_FreeSurfaceGridMesh
-=================
-*/
-void R_FreeSurfaceGridMesh( srfGridMesh_t *grid ) {
-	ri.Free(grid->widthLodError);
-	ri.Free(grid->heightLodError);
-	ri.Free(grid);
-}
-
-/*
-=================
-R_SubdividePatchToGrid
-=================
-*/
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
-								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
-	int			i, j, k, l;
-	drawVert_t	prev, next, mid;
-	float		len, maxLen;
-	int			dir;
-	int			t;
-	MAC_STATIC drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
-	float		errorTable[2][MAX_GRID_SIZE];
-
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 0 ; j < height ; j++ ) {
-			ctrl[j][i] = points[j*width+i];
-		}
-	}
-
-	for ( dir = 0 ; dir < 2 ; dir++ ) {
-
-		for ( j = 0 ; j < MAX_GRID_SIZE ; j++ ) {
-			errorTable[dir][j] = 0;
-		}
-
-		// horizontal subdivisions
-		for ( j = 0 ; j + 2 < width ; j += 2 ) {
-			// check subdivided midpoints against control points
-
-			// FIXME: also check midpoints of adjacent patches against the control points
-			// this would basically stitch all patches in the same LOD group together.
-
-			maxLen = 0;
-			for ( i = 0 ; i < height ; i++ ) {
-				vec3_t		midxyz;
-				vec3_t		midxyz2;
-				vec3_t		dir;
-				vec3_t		projected;
-				float		d;
-
-				// calculate the point on the curve
-				for ( l = 0 ; l < 3 ; l++ ) {
-					midxyz[l] = (ctrl[i][j].xyz[l] + ctrl[i][j+1].xyz[l] * 2
-							+ ctrl[i][j+2].xyz[l] ) * 0.25f;
-				}
-
-				// see how far off the line it is
-				// using dist-from-line will not account for internal
-				// texture warping, but it gives a lot less polygons than
-				// dist-from-midpoint
-				VectorSubtract( midxyz, ctrl[i][j].xyz, midxyz );
-				VectorSubtract( ctrl[i][j+2].xyz, ctrl[i][j].xyz, dir );
-				VectorNormalize( dir );
-
-				d = DotProduct( midxyz, dir );
-				VectorScale( dir, d, projected );
-				VectorSubtract( midxyz, projected, midxyz2);
-				len = VectorLengthSquared( midxyz2 );			// we will do the sqrt later
-				if ( len > maxLen ) {
-					maxLen = len;
-				}
-			}
-
-			maxLen = sqrt(maxLen);
-
-			// if all the points are on the lines, remove the entire columns
-			if ( maxLen < 0.1f ) {
-				errorTable[dir][j+1] = 999;
-				continue;
-			}
-
-			// see if we want to insert subdivided columns
-			if ( width + 2 > MAX_GRID_SIZE ) {
-				errorTable[dir][j+1] = 1.0f/maxLen;
-				continue;	// can't subdivide any more
-			}
-
-			if ( maxLen <= subdivide ) {
-				errorTable[dir][j+1] = 1.0f/maxLen;
-				continue;	// didn't need subdivision
-			}
-
-			errorTable[dir][j+2] = 1.0f/maxLen;
-
-			// insert two columns and replace the peak
-			width += 2;
-			for ( i = 0 ; i < height ; i++ ) {
-				LerpDrawVert( &ctrl[i][j], &ctrl[i][j+1], &prev );
-				LerpDrawVert( &ctrl[i][j+1], &ctrl[i][j+2], &next );
-				LerpDrawVert( &prev, &next, &mid );
-
-				for ( k = width - 1 ; k > j + 3 ; k-- ) {
-					ctrl[i][k] = ctrl[i][k-2];
-				}
-				ctrl[i][j + 1] = prev;
-				ctrl[i][j + 2] = mid;
-				ctrl[i][j + 3] = next;
-			}
-
-			// back up and recheck this set again, it may need more subdivision
-			j -= 2;
-
-		}
-
-		Transpose( width, height, ctrl );
-		t = width;
-		width = height;
-		height = t;
-	}
-
-
-	// put all the aproximating points on the curve
-	PutPointsOnCurve( ctrl, width, height );
-
-	// cull out any rows or columns that are colinear
-	for ( i = 1 ; i < width-1 ; i++ ) {
-		if ( errorTable[0][i] != 999 ) {
-			continue;
-		}
-		for ( j = i+1 ; j < width ; j++ ) {
-			for ( k = 0 ; k < height ; k++ ) {
-				ctrl[k][j-1] = ctrl[k][j];
-			}
-			errorTable[0][j-1] = errorTable[0][j];
-		}
-		width--;
-	}
-
-	for ( i = 1 ; i < height-1 ; i++ ) {
-		if ( errorTable[1][i] != 999 ) {
-			continue;
-		}
-		for ( j = i+1 ; j < height ; j++ ) {
-			for ( k = 0 ; k < width ; k++ ) {
-				ctrl[j-1][k] = ctrl[j][k];
-			}
-			errorTable[1][j-1] = errorTable[1][j];
-		}
-		height--;
-	}
-
-#if 1
-	// flip for longest tristrips as an optimization
-	// the results should be visually identical with or
-	// without this step
-	if ( height > width ) {
-		Transpose( width, height, ctrl );
-		InvertErrorTable( errorTable, width, height );
-		t = width;
-		width = height;
-		height = t;
-		InvertCtrl( width, height, ctrl );
-	}
-#endif
-
-	// calculate normals
-	MakeMeshNormals( width, height, ctrl );
-
-	return R_CreateSurfaceGridMesh( width, height, ctrl, errorTable );
-}
-
-/*
-===============
-R_GridInsertColumn
-===============
-*/
-srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror ) {
-	int i, j;
-	int width, height, oldwidth;
-	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
-	float errorTable[2][MAX_GRID_SIZE];
-	float lodRadius;
-	vec3_t lodOrigin;
-
-	oldwidth = 0;
-	width = grid->width + 1;
-	if (width > MAX_GRID_SIZE)
-		return NULL;
-	height = grid->height;
-	for (i = 0; i < width; i++) {
-		if (i == column) {
-			//insert new column
-			for (j = 0; j < grid->height; j++) {
-				LerpDrawVert( &grid->verts[j * grid->width + i-1], &grid->verts[j * grid->width + i], &ctrl[j][i] );
-				if (j == row)
-					VectorCopy(point, ctrl[j][i].xyz);
-			}
-			errorTable[0][i] = loderror;
-			continue;
-		}
-		errorTable[0][i] = grid->widthLodError[oldwidth];
-		for (j = 0; j < grid->height; j++) {
-			ctrl[j][i] = grid->verts[j * grid->width + oldwidth];
-		}
-		oldwidth++;
-	}
-	for (j = 0; j < grid->height; j++) {
-		errorTable[1][j] = grid->heightLodError[j];
-	}
-	// put all the aproximating points on the curve
-	//PutPointsOnCurve( ctrl, width, height );
-	// calculate normals
-	MakeMeshNormals( width, height, ctrl );
-
-	VectorCopy(grid->lodOrigin, lodOrigin);
-	lodRadius = grid->lodRadius;
-	// free the old grid
-	R_FreeSurfaceGridMesh(grid);
-	// create a new grid
-	grid = R_CreateSurfaceGridMesh( width, height, ctrl, errorTable );
-	grid->lodRadius = lodRadius;
-	VectorCopy(lodOrigin, grid->lodOrigin);
-	return grid;
-}
-
-/*
-===============
-R_GridInsertRow
-===============
-*/
-srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror ) {
-	int i, j;
-	int width, height, oldheight;
-	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
-	float errorTable[2][MAX_GRID_SIZE];
-	float lodRadius;
-	vec3_t lodOrigin;
-
-	oldheight = 0;
-	width = grid->width;
-	height = grid->height + 1;
-	if (height > MAX_GRID_SIZE)
-		return NULL;
-	for (i = 0; i < height; i++) {
-		if (i == row) {
-			//insert new row
-			for (j = 0; j < grid->width; j++) {
-				LerpDrawVert( &grid->verts[(i-1) * grid->width + j], &grid->verts[i * grid->width + j], &ctrl[i][j] );
-				if (j == column)
-					VectorCopy(point, ctrl[i][j].xyz);
-			}
-			errorTable[1][i] = loderror;
-			continue;
-		}
-		errorTable[1][i] = grid->heightLodError[oldheight];
-		for (j = 0; j < grid->width; j++) {
-			ctrl[i][j] = grid->verts[oldheight * grid->width + j];
-		}
-		oldheight++;
-	}
-	for (j = 0; j < grid->width; j++) {
-		errorTable[0][j] = grid->widthLodError[j];
-	}
-	// put all the aproximating points on the curve
-	//PutPointsOnCurve( ctrl, width, height );
-	// calculate normals
-	MakeMeshNormals( width, height, ctrl );
-
-	VectorCopy(grid->lodOrigin, lodOrigin);
-	lodRadius = grid->lodRadius;
-	// free the old grid
-	R_FreeSurfaceGridMesh(grid);
-	// create a new grid
-	grid = R_CreateSurfaceGridMesh( width, height, ctrl, errorTable );
-	grid->lodRadius = lodRadius;
-	VectorCopy(lodOrigin, grid->lodOrigin);
-	return grid;
-}
diff --git a/code/renderer/tr_flares.c b/code/renderer/tr_flares.c
deleted file mode 100644
index 2363cd89..00000000
--- a/code/renderer/tr_flares.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_flares.c
-
-#include "tr_local.h"
-
-/*
-=============================================================================
-
-LIGHT FLARES
-
-A light flare is an effect that takes place inside the eye when bright light
-sources are visible.  The size of the flare reletive to the screen is nearly
-constant, irrespective of distance, but the intensity should be proportional to the
-projected area of the light source.
-
-A surface that has been flagged as having a light flare will calculate the depth
-buffer value that it's midpoint should have when the surface is added.
-
-After all opaque surfaces have been rendered, the depth buffer is read back for
-each flare in view.  If the point has not been obscured by a closer surface, the
-flare should be drawn.
-
-Surfaces that have a repeated texture should never be flagged as flaring, because
-there will only be a single flare added at the midpoint of the polygon.
-
-To prevent abrupt popping, the intensity of the flare is interpolated up and
-down as it changes visibility.  This involves scene to scene state, unlike almost
-all other aspects of the renderer, and is complicated by the fact that a single
-frame may have multiple scenes.
-
-RB_RenderFlares() will be called once per view (twice in a mirrored scene, potentially
-up to five or more times in a frame with 3D status bar icons).
-
-=============================================================================
-*/
-
-
-// flare states maintain visibility over multiple frames for fading
-// layers: view, mirror, menu
-typedef struct flare_s {
-	struct		flare_s	*next;		// for active chain
-
-	int			addedFrame;
-
-	qboolean	inPortal;				// true if in a portal view of the scene
-	int			frameSceneNum;
-	void		*surface;
-	int			fogNum;
-
-	int			fadeTime;
-
-	qboolean	visible;			// state of last test
-	float		drawIntensity;		// may be non 0 even if !visible due to fading
-
-	int			windowX, windowY;
-	float		eyeZ;
-
-	vec3_t		color;
-} flare_t;
-
-#define		MAX_FLARES		128
-
-flare_t		r_flareStructs[MAX_FLARES];
-flare_t		*r_activeFlares, *r_inactiveFlares;
-
-/*
-==================
-R_ClearFlares
-==================
-*/
-void R_ClearFlares( void ) {
-	int		i;
-
-	Com_Memset( r_flareStructs, 0, sizeof( r_flareStructs ) );
-	r_activeFlares = NULL;
-	r_inactiveFlares = NULL;
-
-	for ( i = 0 ; i < MAX_FLARES ; i++ ) {
-		r_flareStructs[i].next = r_inactiveFlares;
-		r_inactiveFlares = &r_flareStructs[i];
-	}
-}
-
-
-/*
-==================
-RB_AddFlare
-
-This is called at surface tesselation time
-==================
-*/
-void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal ) {
-	int				i;
-	flare_t			*f, *oldest;
-	vec3_t			local;
-	float			d;
-	vec4_t			eye, clip, normalized, window;
-
-	backEnd.pc.c_flareAdds++;
-
-	// if the point is off the screen, don't bother adding it
-	// calculate screen coordinates and depth
-	R_TransformModelToClip( point, backEnd.ori.modelMatrix, 
-		backEnd.viewParms.projectionMatrix, eye, clip );
-
-	// check to see if the point is completely off screen
-	for ( i = 0 ; i < 3 ; i++ ) {
-		if ( clip[i] >= clip[3] || clip[i] <= -clip[3] ) {
-			return;
-		}
-	}
-
-	R_TransformClipToWindow( clip, &backEnd.viewParms, normalized, window );
-
-	if ( window[0] < 0 || window[0] >= backEnd.viewParms.viewportWidth
-		|| window[1] < 0 || window[1] >= backEnd.viewParms.viewportHeight ) {
-		return;	// shouldn't happen, since we check the clip[] above, except for FP rounding
-	}
-
-	// see if a flare with a matching surface, scene, and view exists
-	oldest = r_flareStructs;
-	for ( f = r_activeFlares ; f ; f = f->next ) {
-		if ( f->surface == surface && f->frameSceneNum == backEnd.viewParms.frameSceneNum
-			&& f->inPortal == backEnd.viewParms.isPortal ) {
-			break;
-		}
-	}
-
-	// allocate a new one
-	if (!f ) {
-		if ( !r_inactiveFlares ) {
-			// the list is completely full
-			return;
-		}
-		f = r_inactiveFlares;
-		r_inactiveFlares = r_inactiveFlares->next;
-		f->next = r_activeFlares;
-		r_activeFlares = f;
-
-		f->surface = surface;
-		f->frameSceneNum = backEnd.viewParms.frameSceneNum;
-		f->inPortal = backEnd.viewParms.isPortal;
-		f->addedFrame = -1;
-	}
-
-	if ( f->addedFrame != backEnd.viewParms.frameCount - 1 ) {
-		f->visible = qfalse;
-		f->fadeTime = backEnd.refdef.time - 2000;
-	}
-
-	f->addedFrame = backEnd.viewParms.frameCount;
-	f->fogNum = fogNum;
-
-	VectorCopy( color, f->color );
-
-	// fade the intensity of the flare down as the
-	// light surface turns away from the viewer
-	if ( normal ) {
-		VectorSubtract( backEnd.viewParms.ori.origin, point, local );
-		VectorNormalizeFast( local );
-		d = DotProduct( local, normal );
-		VectorScale( f->color, d, f->color ); 
-	}
-
-	// save info needed to test
-	f->windowX = backEnd.viewParms.viewportX + window[0];
-	f->windowY = backEnd.viewParms.viewportY + window[1];
-
-	f->eyeZ = eye[2];
-}
-
-/*
-==================
-RB_AddDlightFlares
-==================
-*/
-void RB_AddDlightFlares( void ) {
-	dlight_t		*l;
-	int				i, j, k;
-
-	if ( !r_flares->integer ) {
-		return;
-	}
-
-	l = backEnd.refdef.dlights;
-	for (i=0 ; i<backEnd.refdef.num_dlights ; i++, l++) {
-		RB_AddFlare( (void *)l, j, l->origin, l->color, NULL );
-	}
-}
-
-/*
-===============================================================================
-
-FLARE BACK END
-
-===============================================================================
-*/
-
-/*
-==================
-RB_TestFlare
-==================
-*/
-void RB_TestFlare( flare_t *f ) {
-	float			depth;
-	qboolean		visible;
-	float			fade;
-	float			screenZ;
-
-	backEnd.pc.c_flareTests++;
-
-	// doing a readpixels is as good as doing a glFinish(), so
-	// don't bother with another sync
-	glState.finishCalled = qfalse;
-
-	// read back the z buffer contents
-	qglReadPixels( f->windowX, f->windowY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth );
-
-	screenZ = backEnd.viewParms.projectionMatrix[14] / 
-		( ( 2*depth - 1 ) * backEnd.viewParms.projectionMatrix[11] - backEnd.viewParms.projectionMatrix[10] );
-
-	visible = ( -f->eyeZ - -screenZ ) < 24;
-
-	if ( visible ) {
-		if ( !f->visible ) {
-			f->visible = qtrue;
-			f->fadeTime = backEnd.refdef.time - 1;
-		}
-		fade = ( ( backEnd.refdef.time - f->fadeTime ) /1000.0f ) * r_flareFade->value;
-	} else {
-		if ( f->visible ) {
-			f->visible = qfalse;
-			f->fadeTime = backEnd.refdef.time - 1;
-		}
-		fade = 1.0f - ( ( backEnd.refdef.time - f->fadeTime ) / 1000.0f ) * r_flareFade->value;
-	}
-
-	if ( fade < 0 ) {
-		fade = 0;
-	}
-	if ( fade > 1 ) {
-		fade = 1;
-	}
-
-	f->drawIntensity = fade;
-}
-
-
-/*
-==================
-RB_RenderFlare
-==================
-*/
-void RB_RenderFlare( flare_t *f ) {
-	float			size;
-	vec3_t			color;
-	int				iColor[3];
-
-	backEnd.pc.c_flareRenders++;
-
-	VectorScale( f->color, f->drawIntensity*tr.identityLight, color );
-	iColor[0] = color[0] * 255;
-	iColor[1] = color[1] * 255;
-	iColor[2] = color[2] * 255;
-
-	size = backEnd.viewParms.viewportWidth * ( r_flareSize->value/640.0f + 8 / -f->eyeZ );
-
-	RB_BeginSurface( tr.flareShader );
-
-	// FIXME: use quadstamp?
-	tess.xyz[tess.numVertexes][0] = f->windowX - size;
-	tess.xyz[tess.numVertexes][1] = f->windowY - size;
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.xyz[tess.numVertexes][0] = f->windowX - size;
-	tess.xyz[tess.numVertexes][1] = f->windowY + size;
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.xyz[tess.numVertexes][0] = f->windowX + size;
-	tess.xyz[tess.numVertexes][1] = f->windowY + size;
-	tess.texCoords[tess.numVertexes][0][0] = 1;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.xyz[tess.numVertexes][0] = f->windowX + size;
-	tess.xyz[tess.numVertexes][1] = f->windowY - size;
-	tess.texCoords[tess.numVertexes][0][0] = 1;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.indexes[tess.numIndexes++] = 0;
-	tess.indexes[tess.numIndexes++] = 1;
-	tess.indexes[tess.numIndexes++] = 2;
-	tess.indexes[tess.numIndexes++] = 0;
-	tess.indexes[tess.numIndexes++] = 2;
-	tess.indexes[tess.numIndexes++] = 3;
-
-	RB_EndSurface();
-}
-
-/*
-==================
-RB_RenderFlares
-
-Because flares are simulating an occular effect, they should be drawn after
-everything (all views) in the entire frame has been drawn.
-
-Because of the way portals use the depth buffer to mark off areas, the
-needed information would be lost after each view, so we are forced to draw
-flares after each view.
-
-The resulting artifact is that flares in mirrors or portals don't dim properly
-when occluded by something in the main view, and portal flares that should
-extend past the portal edge will be overwritten.
-==================
-*/
-void RB_RenderFlares (void) {
-	flare_t		*f;
-	flare_t		**prev;
-	qboolean	draw;
-
-	if ( !r_flares->integer ) {
-		return;
-	}
-
-//	RB_AddDlightFlares();
-
-	// perform z buffer readback on each flare in this view
-	draw = qfalse;
-	prev = &r_activeFlares;
-	while ( ( f = *prev ) != NULL ) {
-		// throw out any flares that weren't added last frame
-		if ( f->addedFrame < backEnd.viewParms.frameCount - 1 ) {
-			*prev = f->next;
-			f->next = r_inactiveFlares;
-			r_inactiveFlares = f;
-			continue;
-		}
-
-		// don't draw any here that aren't from this scene / portal
-		f->drawIntensity = 0;
-		if ( f->frameSceneNum == backEnd.viewParms.frameSceneNum
-			&& f->inPortal == backEnd.viewParms.isPortal ) {
-			RB_TestFlare( f );
-			if ( f->drawIntensity ) {
-				draw = qtrue;
-			} else {
-				// this flare has completely faded out, so remove it from the chain
-				*prev = f->next;
-				f->next = r_inactiveFlares;
-				r_inactiveFlares = f;
-				continue;
-			}
-		}
-
-		prev = &f->next;
-	}
-
-	if ( !draw ) {
-		return;		// none visible
-	}
-
-	if ( backEnd.viewParms.isPortal ) {
-		qglDisable (GL_CLIP_PLANE0);
-	}
-
-	qglPushMatrix();
-    qglLoadIdentity();
-	qglMatrixMode( GL_PROJECTION );
-	qglPushMatrix();
-    qglLoadIdentity();
-	qglOrtho( backEnd.viewParms.viewportX, backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth,
-			  backEnd.viewParms.viewportY, backEnd.viewParms.viewportY + backEnd.viewParms.viewportHeight,
-			  -99999, 99999 );
-
-	for ( f = r_activeFlares ; f ; f = f->next ) {
-		if ( f->frameSceneNum == backEnd.viewParms.frameSceneNum
-			&& f->inPortal == backEnd.viewParms.isPortal
-			&& f->drawIntensity ) {
-			RB_RenderFlare( f );
-		}
-	}
-
-	qglPopMatrix();
-	qglMatrixMode( GL_MODELVIEW );
-	qglPopMatrix();
-}
-
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
deleted file mode 100644
index b52203ff..00000000
--- a/code/renderer/tr_image.c
+++ /dev/null
@@ -1,3266 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_image.c
-#include "tr_local.h"
-
-#include <setjmp.h>
-
-/*
- * Include file for users of JPEG library.
- * You will need to have included system headers that define at least
- * the typedefs FILE and size_t before you can include jpeglib.h.
- * (stdio.h is sufficient on ANSI-conforming systems.)
- * You may also wish to include "jerror.h".
- */
-
-#define JPEG_INTERNALS
-#include <jpeglib.h>
-
-
-static void LoadBMP( const char *name, byte **pic, int *width, int *height );
-static void LoadTGA( const char *name, byte **pic, int *width, int *height );
-static void LoadJPG( const char *name, byte **pic, int *width, int *height );
-
-static byte			 s_intensitytable[256];
-static unsigned char s_gammatable[256];
-
-int		gl_filter_min = GL_LINEAR_MIPMAP_NEAREST;
-int		gl_filter_max = GL_LINEAR;
-
-#define FILE_HASH_SIZE		1024
-static	image_t*		hashTable[FILE_HASH_SIZE];
-
-extern qboolean scr_initialized;
-
-/*
-** R_GammaCorrect
-*/
-void R_GammaCorrect( byte *buffer, int bufSize ) {
-	int i;
-
-	for ( i = 0; i < bufSize; i++ ) {
-		buffer[i] = s_gammatable[buffer[i]];
-	}
-}
-
-typedef struct {
-	char *name;
-	int	minimize, maximize;
-} textureMode_t;
-
-textureMode_t modes[] = {
-	{"GL_NEAREST", GL_NEAREST, GL_NEAREST},
-	{"GL_LINEAR", GL_LINEAR, GL_LINEAR},
-	{"GL_NEAREST_MIPMAP_NEAREST", GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST},
-	{"GL_LINEAR_MIPMAP_NEAREST", GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR},
-	{"GL_NEAREST_MIPMAP_LINEAR", GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST},
-	{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
-};
-
-/*
-================
-return a hash value for the filename
-================
-*/
-static long generateHashValue( const char *fname ) {
-	int		i;
-	long	hash;
-	char	letter;
-
-	hash = 0;
-	i = 0;
-	while (fname[i] != '\0') {
-		letter = tolower(fname[i]);
-		if (letter =='.') break;				// don't include extension
-		if (letter =='\\') letter = '/';		// damn path names
-		hash+=(long)(letter)*(i+119);
-		i++;
-	}
-	hash &= (FILE_HASH_SIZE-1);
-	return hash;
-}
-
-/*
-===============
-GL_TextureMode
-===============
-*/
-void GL_TextureMode( const char *string ) {
-	int		i;
-	image_t	*glt;
-
-	for ( i=0 ; i< 6 ; i++ ) {
-		if ( !Q_stricmp( modes[i].name, string ) ) {
-			break;
-		}
-	}
-
-	// hack to prevent trilinear from being set on voodoo,
-	// because their driver freaks...
-	if ( i == 5 && glConfig.hardwareType == GLHW_3DFX_2D3D ) {
-		ri.Printf( PRINT_ALL, "Refusing to set trilinear on a voodoo.\n" );
-		i = 3;
-	}
-
-
-	if ( i == 6 ) {
-		ri.Printf (PRINT_ALL, "bad filter name\n");
-		return;
-	}
-
-	gl_filter_min = modes[i].minimize;
-	gl_filter_max = modes[i].maximize;
-
-	// change all the existing mipmap texture objects
-	for ( i = 0 ; i < tr.numImages ; i++ ) {
-		glt = &tr.images[ i ];
-		if ( glt->numMipmaps && glt->texnum ) {
-			GL_Bind (glt);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-		}
-	}
-}
-
-/*
-===============
-R_SumOfUsedImages
-===============
-*/
-int R_SumOfUsedImages( void ) {
-	int	total;
-	int i;
-
-	total = 0;
-	for ( i = 0; i < tr.numImages; i++ ) {
-		if ( tr.images[i].frameUsed == tr.frameCount ) {
-			total += tr.images[i].uploadWidth * tr.images[i].uploadHeight;
-		}
-	}
-
-	return total;
-}
-
-/*
-===============
-R_ImageList_f
-===============
-*/
-void R_ImageList_f( void ) {
-	int		i;
-	image_t	*image;
-	int		texels;
-	const char *yesno[] = {
-		"no ", "yes"
-	};
-
-	ri.Printf (PRINT_ALL, "\n      -w-- -h-- -mm- -TMU- -if-- wrap --name-------\n");
-	texels = 0;
-
-	for ( i = 0 ; i < tr.numImages ; i++ ) {
-		image = &tr.images[ i ];
-
-		texels += image->uploadWidth*image->uploadHeight;
-		ri.Printf (PRINT_ALL,  "%4i: %4i %4i  %s   %d   ",
-			i, image->uploadWidth, image->uploadHeight, yesno[image->numMipmaps], image->TMU );
-		switch ( image->internalFormat ) {
-		case 1:
-			ri.Printf( PRINT_ALL, "I    " );
-			break;
-		case 2:
-			ri.Printf( PRINT_ALL, "IA   " );
-			break;
-		case 3:
-			ri.Printf( PRINT_ALL, "RGB  " );
-			break;
-		case 4:
-			ri.Printf( PRINT_ALL, "RGBA " );
-			break;
-		case GL_RGBA8:
-			ri.Printf( PRINT_ALL, "RGBA8" );
-			break;
-		case GL_RGB8:
-			ri.Printf( PRINT_ALL, "RGB8" );
-			break;
-		case GL_RGB4_S3TC:
-			ri.Printf( PRINT_ALL, "S3TC " );
-			break;
-		case GL_RGBA4:
-			ri.Printf( PRINT_ALL, "RGBA4" );
-			break;
-		case GL_RGB5:
-			ri.Printf( PRINT_ALL, "RGB5 " );
-			break;
-		default:
-			ri.Printf( PRINT_ALL, "???? " );
-		}
-
-		switch ( image->wrapClampModeX ) {
-		case GL_REPEAT:
-			ri.Printf( PRINT_ALL, "rept " );
-			break;
-		case GL_CLAMP:
-			ri.Printf( PRINT_ALL, "clmp " );
-			break;
-		default:
-			ri.Printf( PRINT_ALL, "%4i ", image->wrapClampModeX );
-			break;
-		}
-		
-		ri.Printf( PRINT_ALL, " %s\n", image->imgName );
-	}
-	ri.Printf (PRINT_ALL, " ---------\n");
-	ri.Printf (PRINT_ALL, " %i total texels (not including mipmaps)\n", texels);
-	ri.Printf (PRINT_ALL, " %i total images\n\n", tr.numImages );
-}
-
-//=======================================================================
-
-/*
-================
-ResampleTexture
-
-Used to resample images in a more general than quartering fashion.
-
-This will only be filtered properly if the resampled size
-is greater than half the original size.
-
-If a larger shrinking is needed, use the mipmap function 
-before or after.
-================
-*/
-static void ResampleTexture( unsigned *in, int inwidth, int inheight, unsigned *out,  
-							int outwidth, int outheight ) {
-	int		i, j;
-	unsigned	*inrow, *inrow2;
-	unsigned	frac, fracstep;
-	unsigned	p1[2048], p2[2048];
-	byte		*pix1, *pix2, *pix3, *pix4;
-
-	if (outwidth>2048)
-		ri.Error(ERR_DROP, "ResampleTexture: max width");
-								
-	fracstep = inwidth*0x10000/outwidth;
-
-	frac = fracstep>>2;
-	for ( i=0 ; i<outwidth ; i++ ) {
-		p1[i] = 4*(frac>>16);
-		frac += fracstep;
-	}
-	frac = 3*(fracstep>>2);
-	for ( i=0 ; i<outwidth ; i++ ) {
-		p2[i] = 4*(frac>>16);
-		frac += fracstep;
-	}
-
-	for (i=0 ; i<outheight ; i++, out += outwidth) {
-		inrow = in + inwidth*(int)((i+0.25)*inheight/outheight);
-		inrow2 = in + inwidth*(int)((i+0.75)*inheight/outheight);
-		frac = fracstep >> 1;
-		for (j=0 ; j<outwidth ; j++) {
-			pix1 = (byte *)inrow + p1[j];
-			pix2 = (byte *)inrow + p2[j];
-			pix3 = (byte *)inrow2 + p1[j];
-			pix4 = (byte *)inrow2 + p2[j];
-			((byte *)(out+j))[0] = (pix1[0] + pix2[0] + pix3[0] + pix4[0])>>2;
-			((byte *)(out+j))[1] = (pix1[1] + pix2[1] + pix3[1] + pix4[1])>>2;
-			((byte *)(out+j))[2] = (pix1[2] + pix2[2] + pix3[2] + pix4[2])>>2;
-			((byte *)(out+j))[3] = (pix1[3] + pix2[3] + pix3[3] + pix4[3])>>2;
-		}
-	}
-}
-
-/*
-================
-R_LightScaleTexture
-
-Scale up the pixel values in a texture to increase the
-lighting range
-================
-*/
-void R_LightScaleTexture (unsigned *in, int inwidth, int inheight, qboolean only_gamma )
-{
-	if (!tr.needsLightScale) {
-		return;
-	}
-
-	if ( only_gamma )
-	{
-		if ( !glConfig.deviceSupportsGamma )
-		{
-			int		i, c;
-			byte	*p;
-
-			p = (byte *)in;
-
-			c = inwidth*inheight;
-			for (i=0 ; i<c ; i++, p+=4)
-			{
-				p[0] = s_gammatable[p[0]];
-				p[1] = s_gammatable[p[1]];
-				p[2] = s_gammatable[p[2]];
-			}
-		}
-	}
-	else
-	{
-		int		i, c;
-		byte	*p;
-
-		p = (byte *)in;
-
-		c = inwidth*inheight;
-
-		if ( glConfig.deviceSupportsGamma )
-		{
-			for (i=0 ; i<c ; i++, p+=4)
-			{
-				p[0] = s_intensitytable[p[0]];
-				p[1] = s_intensitytable[p[1]];
-				p[2] = s_intensitytable[p[2]];
-			}
-		}
-		else
-		{
-			for (i=0 ; i<c ; i++, p+=4)
-			{
-				p[0] = s_gammatable[s_intensitytable[p[0]]];
-				p[1] = s_gammatable[s_intensitytable[p[1]]];
-				p[2] = s_gammatable[s_intensitytable[p[2]]];
-			}
-		}
-	}
-}
-
-/*
-================
-R_MipMap
-
-Operates in place, quartering the size of the texture
-================
-*/
-static void R_MipMap (byte *in, int width, int height) {
-	int		i, j;
-	byte	*out;
-	int		row;
-
-	if ( width == 1 && height == 1 ) {
-		return;
-	}
-
-	row = width * 4;
-	out = in;
-	width >>= 1;
-	height >>= 1;
-
-	if ( width == 0 || height == 0 ) {
-		width += height;	// get largest
-		for (i=0 ; i<width ; i++, out+=4, in+=8 ) {
-			out[0] = ( in[0] + in[4] )>>1;
-			out[1] = ( in[1] + in[5] )>>1;
-			out[2] = ( in[2] + in[6] )>>1;
-			out[3] = ( in[3] + in[7] )>>1;
-		}
-		return;
-	}
-
-	for (i=0 ; i<height ; i++, in+=row) {
-		for (j=0 ; j<width ; j++, out+=4, in+=8) {
-			out[0] = (in[0] + in[4] + in[row+0] + in[row+4])>>2;
-			out[1] = (in[1] + in[5] + in[row+1] + in[row+5])>>2;
-			out[2] = (in[2] + in[6] + in[row+2] + in[row+6])>>2;
-			out[3] = (in[3] + in[7] + in[row+3] + in[row+7])>>2;
-		}
-	}
-}
-
-
-/*
-==================
-R_BlendOverTexture
-
-Apply a color blend over a set of pixels
-==================
-*/
-static void R_BlendOverTexture( byte *data, int pixelCount, byte blend[4] ) {
-	int		i;
-	int		inverseAlpha;
-	int		premult[3];
-
-	inverseAlpha = 255 - blend[3];
-	premult[0] = blend[0] * blend[3];
-	premult[1] = blend[1] * blend[3];
-	premult[2] = blend[2] * blend[3];
-
-	for ( i = 0 ; i < pixelCount ; i++, data+=4 ) {
-		data[0] = ( data[0] * inverseAlpha + premult[0] ) >> 9;
-		data[1] = ( data[1] * inverseAlpha + premult[1] ) >> 9;
-		data[2] = ( data[2] * inverseAlpha + premult[2] ) >> 9;
-	}
-}
-
-byte	mipBlendColors[16][4] = {
-	{0,0,0,0},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-};
-
-
-/*
-===============
-Upload32
-
-===============
-*/
-extern qboolean charSet;
-static void Upload32(
-	unsigned int* data,
-	int width,
-	int height,
-	int numMipmaps,
-	qboolean picmip, 
-	qboolean dynamicallyUpdated,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int* format,
-	int* pUploadWidth,
-	int* pUploadHeight,
-	int* bytesUsed,
-	qboolean bIsLightmap
-)
-{
-	int			samples;
-	unsigned	*scaledBuffer = NULL;
-	unsigned	*resampledBuffer = NULL;
-	int			scaled_width, scaled_height;
-	int			i, c;
-	byte		*scan;
-	GLenum		internalFormat = GL_RGB;
-	float		rMax = 0, gMax = 0, bMax = 0;
-
-	//
-	// convert to exact power of 2 sizes
-	//
-	for (scaled_width = 1 ; scaled_width < width ; scaled_width<<=1)
-		;
-	for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
-		;
-	if ( r_roundImagesDown->integer && scaled_width > width )
-		scaled_width >>= 1;
-	if ( r_roundImagesDown->integer && scaled_height > height )
-		scaled_height >>= 1;
-
-	if ( scaled_width != width || scaled_height != height ) {
-		resampledBuffer = ri.Hunk_AllocateTempMemory( scaled_width * scaled_height * 4 );
-		ResampleTexture (data, width, height, resampledBuffer, scaled_width, scaled_height);
-		data = resampledBuffer;
-		width = scaled_width;
-		height = scaled_height;
-	}
-
-	//
-	// perform optional picmip operation
-	//
-	if ( picmip ) {
-		scaled_width >>= r_picmip->integer;
-		scaled_height >>= r_picmip->integer;
-	}
-
-	//
-	// clamp to minimum size
-	//
-	if (scaled_width < 1) {
-		scaled_width = 1;
-	}
-	if (scaled_height < 1) {
-		scaled_height = 1;
-	}
-
-	//
-	// clamp to the current upper OpenGL limit
-	// scale both axis down equally so we don't have to
-	// deal with a half mip resampling
-	//
-	while ( scaled_width > glConfig.maxTextureSize
-		|| scaled_height > glConfig.maxTextureSize ) {
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-	}
-
-	//scaledBuffer = ri.Hunk_AllocateTempMemory( 4 * scaled_width * scaled_height );
-	scaledBuffer = data;
-
-	//
-	// scan the texture for each channel's max values
-	// and verify if the alpha channel is being used or not
-	//
-	c = width*height;
-	scan = ((byte *)data);
-	samples = 3;
-	if (!bIsLightmap) {
-		for ( i = 0; i < c; i++ )
-		{
-			if ( scan[i*4+0] > rMax )
-			{
-				rMax = scan[i*4+0];
-			}
-			if ( scan[i*4+1] > gMax )
-			{
-				gMax = scan[i*4+1];
-			}
-			if ( scan[i*4+2] > bMax )
-			{
-				bMax = scan[i*4+2];
-			}
-			if ( scan[i*4 + 3] != 255 ) 
-			{
-				samples = 4;
-				break;
-			}
-		}
-		// select proper internal format
-		if ( samples == 3 )
-		{
-			if (!force32bit)
-			{
-				if (r_texturebits->integer == 16)
-				{
-					internalFormat = GL_RGB5;
-				}
-				else if (r_texturebits->integer == 32)
-				{
-					internalFormat = GL_RGB8;
-				}
-				else if (r_colorbits->integer == 16)
-				{
-					internalFormat = GL_RGBA4;
-				}
-				else if (r_colorbits->integer == 32)
-				{
-					internalFormat = GL_RGBA8;
-				}
-				else
-				{
-					internalFormat = 3;
-				}
-			}
-			else
-			{
-				internalFormat = GL_RGB8;
-			}
-		}
-		else if ( samples == 4 )
-		{
-			if (!force32bit)
-			{
-				if (r_texturebits->integer == 16)
-				{
-					internalFormat = GL_RGBA4;
-				}
-				else if (r_texturebits->integer == 32)
-				{
-					internalFormat = GL_RGBA8;
-				}
-				else if (r_colorbits->integer == 16)
-				{
-					internalFormat = GL_RGBA4;
-				}
-				else if (r_colorbits->integer == 32)
-				{
-					internalFormat = GL_RGBA8;
-				}
-				else
-				{
-					internalFormat = 4;
-				}
-			}
-			else
-			{
-				internalFormat = GL_RGBA8;
-			}
-		}
-	} else {
-		internalFormat = GL_RGB;
-	}
-	// copy or resample data as appropriate for first MIP level
-	if ( ( scaled_width == width ) && 
-		( scaled_height == height ) ) {
-		if (!numMipmaps)
-		{
-			qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-			*pUploadWidth = scaled_width;
-			*pUploadHeight = scaled_height;
-			*format = internalFormat;
-			*bytesUsed = samples * scaled_width * scaled_height;
-
-			goto done;
-		}
-		//Com_Memcpy (scaledBuffer, data, width*height*4);
-	}
-	else
-	{
-		// use the normal mip-mapping function to go down from here
-		while ( width > scaled_width || height > scaled_height ) {
-			R_MipMap( (byte *)data, width, height );
-			width >>= 1;
-			height >>= 1;
-			if ( width < 1 ) {
-				width = 1;
-			}
-			if ( height < 1 ) {
-				height = 1;
-			}
-		}
-		//Com_Memcpy( scaledBuffer, data, width * height * 4 );
-	}
-
-	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !numMipmaps);
-
-	*pUploadWidth = scaled_width;
-	*pUploadHeight = scaled_height;
-	*format = internalFormat;
-
-	qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
-
-	*bytesUsed = samples * scaled_width * scaled_height;
-
-	if (numMipmaps)
-	{
-		int		miplevel;
-
-		miplevel = 0;
-		while (scaled_width > 1 || scaled_height > 1)
-		{
-			R_MipMap( (byte *)scaledBuffer, scaled_width, scaled_height );
-			scaled_width >>= 1;
-			scaled_height >>= 1;
-			if (scaled_width < 1)
-				scaled_width = 1;
-			if (scaled_height < 1)
-				scaled_height = 1;
-			miplevel++;
-
-			if ( r_colorMipLevels->integer ) {
-				R_BlendOverTexture( (byte *)scaledBuffer, scaled_width * scaled_height, mipBlendColors[miplevel] );
-			}
-
-			qglTexImage2D (GL_TEXTURE_2D, miplevel, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
-		}
-	}
-done:
-
-	if (numMipmaps)
-	{
-		if ( textureFilterAnisotropic )
-			qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
-					(GLint)Com_Clamp( 1, maxAnisotropy, r_ext_max_anisotropy->integer ) );
-
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
-		if (textureFilterAnisotropic)
-			qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1);
-
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-	}
-
-	GL_CheckErrors();
-
-	//if ( scaledBuffer != 0 )
-	//	ri.Hunk_FreeTempMemory( scaledBuffer );
-	if ( resampledBuffer != 0 )
-		ri.Hunk_FreeTempMemory( resampledBuffer );
-}
-
-static void UploadCompressed(
-	byte* data,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean picmip,
-	int glCompressMode,
-	int* format,
-	int* pUploadWidth,
-	int* pUploadHeight,
-	int* pBytesUsed
-) {
-	byte* offset;
-	int i;
-	int iStartImage;
-	int size;
-	int blockSize;
-	int scaled_width, scaled_height;
-
-	offset = data;
-	iStartImage = 0;
-	if (picmip) {
-		iStartImage = r_picmip->integer;
-	}
-
-	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable) {
-		iStartImage = iMipmapsAvailable - 1;
-	}
-
-	scaled_width = width;
-	scaled_height = height;
-	if (iStartImage)
-	{
-		scaled_width = width >> iStartImage;
-		scaled_height = height >> iStartImage;
-	}
-	while (scaled_width > glConfig.maxTextureSize || scaled_height > glConfig.maxTextureSize)
-	{
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-		++iStartImage;
-	}
-	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable)
-	{
-		iStartImage = iMipmapsAvailable - 1;
-		scaled_width = width >> (iMipmapsAvailable - 1);
-		scaled_height = height >> (iMipmapsAvailable - 1);
-	}
-
-	*pUploadWidth = scaled_width;
-	*pUploadHeight = scaled_height;
-	*format = glCompressMode;
-	blockSize = 16;
-
-	if (glCompressMode == GL_COMPRESSED_RGB_S3TC_DXT1_EXT || glCompressMode == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
-		blockSize = 8;
-	}
-
-	scaled_width = width;
-	scaled_height = height;
-
-	for (i = 0; i < iStartImage; i++) {
-		int w, h;
-
-		w = (scaled_width + 3) / 4;
-		if (w > 1) {
-			h = (scaled_height + 3) / 4;
-			if (h > 1) {
-				offset += blockSize * w * h;
-			}
-		}
-
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-
-		if (!scaled_width) scaled_width = 1;
-		if (!scaled_height) scaled_height = 1;
-	}
-
-	*pBytesUsed = 0;
-
-	while (scaled_width || scaled_height) {
-		int w, h;
-
-		if (!scaled_width) scaled_width = 1;
-		if (!scaled_height) scaled_height = 1;
-
-		h = (scaled_height + 3) / 4;
-		w = (scaled_width + 3) / 4;
-		size = blockSize * w * h;
-
-		if (w > 1 && h > 1) {
-			*pBytesUsed += size;
-		}
-
-		qglCompressedTexImage2D(GL_TEXTURE_2D, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, offset);
-		GL_CheckErrors();
-
-		if (i < iMipmapsAvailable && w > 1 && h > 1) {
-			offset += size;
-		}
-
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-		i++;
-	}
-
-	if (numMipmaps > 1) {
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	} else {
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	}
-
-	GL_CheckErrors();
-}
-
-/*
-================
-R_CreateImage
-
-This is the only way any image_t are created
-================
-*/
-image_t* R_CreateImage(
-	const char* name,
-	byte* pic,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean allowPicmip,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int glCompressMode,
-	int glWrapClampModeX,
-	int glWrapClampModeY
-) {
-	image_t		*image;
-	qboolean	isLightmap = qfalse;
-	qboolean	dynamicallyUpdated = qfalse;
-	int i;
-	long		hash;
-
-	if (strlen(name) >= MAX_QPATH ) {
-		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long\n", name);
-	}
-	if (!strncmp(name, "*lightmap", 9)) {
-		isLightmap = qtrue;
-	}
-	else if (!strncmp(name, "*lightmapD", 10)) {
-		dynamicallyUpdated = qtrue;
-	}
-
-	for (i = 0; i < tr.numImages; i++)
-	{
-		if (!tr.images[i].imgName[0])
-		{
-			// found a free image
-			break;
-		}
-	}
-
-	if (i == tr.numImages)
-    {
-        if (tr.numImages == MAX_DRAWIMAGES) {
-            ri.Error(ERR_DROP, "R_CreateImage: MAX_DRAWIMAGES hit\n");
-		} else {
-			tr.numImages++;
-		}
-	}
-
-	image = &tr.images[i];
-	//image->texnum = 1024 + i;
-    // Fixed in OPM / ioquake3
-    //  Original mohaa uses a fixed texnum instead of generating one regardless of the platform.
-    //  Here, by using glGenTextures, it will guarantee the uniqueness of the texture
-    qglGenTextures(1, &image->texnum);
-
-	image->numMipmaps = numMipmaps;
-	image->allowPicmip = allowPicmip;
-	image->dynamicallyUpdated = dynamicallyUpdated;
-	image->force32bit = force32bit;
-
-	Q_strncpyz (image->imgName, name, sizeof(image->imgName));
-
-	image->width = width;
-	image->height = height;
-	image->wrapClampModeX = glWrapClampModeX;
-	image->wrapClampModeY = glWrapClampModeY;
-
-	// lightmaps are always allocated on TMU 1
-	if ( qglActiveTextureARB && isLightmap ) {
-		image->TMU = 1;
-	} else {
-		image->TMU = 0;
-	}
-
-	if ( qglActiveTextureARB ) {
-		GL_SelectTexture( image->TMU );
-	}
-
-	GL_Bind(image);
-
-	if (glCompressMode) {
-		UploadCompressed(
-			(byte*)pic,
-			image->width,
-			image->height,
-			image->numMipmaps,
-			iMipmapsAvailable,
-			allowPicmip,
-			glCompressMode,
-			&image->internalFormat,
-			&image->uploadWidth,
-			&image->uploadHeight,
-			&image->bytesUsed
-		);
-	}
-	else {
-		Upload32(
-			(unsigned int*)pic,
-			image->width,
-			image->height,
-			image->numMipmaps,
-			allowPicmip,
-			image->dynamicallyUpdated,
-			force32bit,
-			hasAlpha,
-			&image->internalFormat,
-			&image->uploadWidth,
-			&image->uploadHeight,
-			&image->bytesUsed,
-			isLightmap
-		);
-	}
-
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampModeX );
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampModeY );
-
-	qglBindTexture( GL_TEXTURE_2D, 0 );
-
-	glState.currenttextures[image->TMU] = -1;
-	if ( image->TMU == 1 ) {
-		GL_SelectTexture( 0 );
-	}
-
-	hash = generateHashValue(name);
-	image->next = hashTable[hash];
-	hashTable[hash] = image;
-	image->r_sequence = r_sequencenumber;
-
-	return image;
-}
-
-
-/*
-=========================================================
-
-BMP LOADING
-
-=========================================================
-*/
-typedef struct
-{
-	char id[2];
-	unsigned long fileSize;
-	unsigned long reserved0;
-	unsigned long bitmapDataOffset;
-	unsigned long bitmapHeaderSize;
-	unsigned long width;
-	unsigned long height;
-	unsigned short planes;
-	unsigned short bitsPerPixel;
-	unsigned long compression;
-	unsigned long bitmapDataSize;
-	unsigned long hRes;
-	unsigned long vRes;
-	unsigned long colors;
-	unsigned long importantColors;
-	unsigned char palette[256][4];
-} BMPHeader_t;
-
-static void LoadBMP( const char *name, byte **pic, int *width, int *height )
-{
-	int		columns, rows, numPixels;
-	byte	*pixbuf;
-	int		row, column;
-	byte	*buf_p;
-	byte	*buffer;
-	int		length;
-	BMPHeader_t bmpHeader;
-	byte		*bmpRGBA;
-
-	*pic = NULL;
-
-	//
-	// load the file
-	//
-	length = ri.FS_ReadFile( ( char * ) name, (void **)&buffer);
-	if (!buffer) {
-		return;
-	}
-
-	buf_p = buffer;
-
-	bmpHeader.id[0] = *buf_p++;
-	bmpHeader.id[1] = *buf_p++;
-	bmpHeader.fileSize = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.reserved0 = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.bitmapDataOffset = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.bitmapHeaderSize = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.width = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.height = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.planes = LittleShort( * ( short * ) buf_p );
-	buf_p += 2;
-	bmpHeader.bitsPerPixel = LittleShort( * ( short * ) buf_p );
-	buf_p += 2;
-	bmpHeader.compression = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.bitmapDataSize = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.hRes = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.vRes = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.colors = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.importantColors = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-
-	Com_Memcpy( bmpHeader.palette, buf_p, sizeof( bmpHeader.palette ) );
-
-	if ( bmpHeader.bitsPerPixel == 8 )
-		buf_p += 1024;
-
-	if ( bmpHeader.id[0] != 'B' && bmpHeader.id[1] != 'M' ) 
-	{
-		ri.Error( ERR_DROP, "LoadBMP: only Windows-style BMP files supported (%s)\n", name );
-	}
-	if ( bmpHeader.fileSize != length )
-	{
-		ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%lu vs. %d) (%s)\n", bmpHeader.fileSize, length, name );
-	}
-	if ( bmpHeader.compression != 0 )
-	{
-		ri.Error( ERR_DROP, "LoadBMP: only uncompressed BMP files supported (%s)\n", name );
-	}
-	if ( bmpHeader.bitsPerPixel < 8 )
-	{
-		ri.Error( ERR_DROP, "LoadBMP: monochrome and 4-bit BMP files not supported (%s)\n", name );
-	}
-
-	columns = bmpHeader.width;
-	rows = bmpHeader.height;
-	if ( rows < 0 )
-		rows = -rows;
-	numPixels = columns * rows;
-
-	if ( width ) 
-		*width = columns;
-	if ( height )
-		*height = rows;
-
-	bmpRGBA = ri.Malloc( numPixels * 4 );
-	*pic = bmpRGBA;
-
-
-	for ( row = rows-1; row >= 0; row-- )
-	{
-		pixbuf = bmpRGBA + row*columns*4;
-
-		for ( column = 0; column < columns; column++ )
-		{
-			unsigned char red, green, blue, alpha;
-			int palIndex;
-			unsigned short shortPixel;
-
-			switch ( bmpHeader.bitsPerPixel )
-			{
-			case 8:
-				palIndex = *buf_p++;
-				*pixbuf++ = bmpHeader.palette[palIndex][2];
-				*pixbuf++ = bmpHeader.palette[palIndex][1];
-				*pixbuf++ = bmpHeader.palette[palIndex][0];
-				*pixbuf++ = 0xff;
-				break;
-			case 16:
-				shortPixel = * ( unsigned short * ) pixbuf;
-				pixbuf += 2;
-				*pixbuf++ = ( shortPixel & ( 31 << 10 ) ) >> 7;
-				*pixbuf++ = ( shortPixel & ( 31 << 5 ) ) >> 2;
-				*pixbuf++ = ( shortPixel & ( 31 ) ) << 3;
-				*pixbuf++ = 0xff;
-				break;
-
-			case 24:
-				blue = *buf_p++;
-				green = *buf_p++;
-				red = *buf_p++;
-				*pixbuf++ = red;
-				*pixbuf++ = green;
-				*pixbuf++ = blue;
-				*pixbuf++ = 255;
-				break;
-			case 32:
-				blue = *buf_p++;
-				green = *buf_p++;
-				red = *buf_p++;
-				alpha = *buf_p++;
-				*pixbuf++ = red;
-				*pixbuf++ = green;
-				*pixbuf++ = blue;
-				*pixbuf++ = alpha;
-				break;
-			default:
-				ri.Error( ERR_DROP, "LoadBMP: illegal pixel_size '%d' in file '%s'\n", bmpHeader.bitsPerPixel, name );
-				break;
-			}
-		}
-	}
-
-	ri.FS_FreeFile( buffer );
-
-}
-
-
-/*
-=================================================================
-
-PCX LOADING
-
-=================================================================
-*/
-
-
-/*
-==============
-LoadPCX
-==============
-*/
-static void LoadPCX ( const char *filename, byte **pic, byte **palette, int *width, int *height)
-{
-	byte	*raw;
-	pcx_t	*pcx;
-	int		x, y;
-	int		len;
-	int		dataByte, runLength;
-	byte	*out, *pix;
-	int		xmax, ymax;
-
-	*pic = NULL;
-	*palette = NULL;
-
-	//
-	// load the file
-	//
-	len = ri.FS_ReadFile( ( char * ) filename, (void **)&raw);
-	if (!raw) {
-		return;
-	}
-
-	//
-	// parse the PCX file
-	//
-	pcx = (pcx_t *)raw;
-	raw = (byte*)pcx->data;
-
-  	xmax = LittleShort(pcx->xmax);
-    ymax = LittleShort(pcx->ymax);
-
-	if (pcx->manufacturer != 0x0a
-		|| pcx->version != 5
-		|| pcx->encoding != 1
-		|| pcx->bits_per_pixel != 8
-		|| xmax >= 1024
-		|| ymax >= 1024)
-	{
-		ri.Printf (PRINT_ALL, "Bad pcx file %s (%i x %i) (%i x %i)\n", filename, xmax+1, ymax+1, pcx->xmax, pcx->ymax);
-		return;
-	}
-
-	out = ri.Malloc ( (ymax+1) * (xmax+1) );
-
-	*pic = out;
-
-	pix = out;
-
-	if (palette)
-	{
-		*palette = ri.Malloc(768);
-		Com_Memcpy (*palette, (byte *)pcx + len - 768, 768);
-	}
-
-	if (width)
-		*width = xmax+1;
-	if (height)
-		*height = ymax+1;
-// FIXME: use bytes_per_line here?
-
-	for (y=0 ; y<=ymax ; y++, pix += xmax+1)
-	{
-		for (x=0 ; x<=xmax ; )
-		{
-			dataByte = *raw++;
-
-			if((dataByte & 0xC0) == 0xC0)
-			{
-				runLength = dataByte & 0x3F;
-				dataByte = *raw++;
-			}
-			else
-				runLength = 1;
-
-			while(runLength-- > 0)
-				pix[x++] = dataByte;
-		}
-
-	}
-
-	if ( raw - (byte *)pcx > len)
-	{
-		ri.Printf (PRINT_DEVELOPER, "PCX file %s was malformed", filename);
-		ri.Free (*pic);
-		*pic = NULL;
-	}
-
-	ri.FS_FreeFile (pcx);
-}
-
-
-/*
-==============
-LoadPCX32
-==============
-*/
-static void LoadPCX32 ( const char *filename, byte **pic, int *width, int *height) {
-	byte	*palette;
-	byte	*pic8;
-	int		i, c, p;
-	byte	*pic32;
-
-	LoadPCX (filename, &pic8, &palette, width, height);
-	if (!pic8) {
-		*pic = NULL;
-		return;
-	}
-
-	c = (*width) * (*height);
-	pic32 = *pic = ri.Malloc(4 * c );
-	for (i = 0 ; i < c ; i++) {
-		p = pic8[i];
-		pic32[0] = palette[p*3];
-		pic32[1] = palette[p*3 + 1];
-		pic32[2] = palette[p*3 + 2];
-		pic32[3] = 255;
-		pic32 += 4;
-	}
-
-	ri.Free (pic8);
-	ri.Free (palette);
-}
-
-//==========================
-//
-// DDS Loading
-//
-//==========================
-
-typedef unsigned int   ui32_t;
-
-typedef struct ddsHeader_s
-{
-	ui32_t headerSize;
-	ui32_t flags;
-	ui32_t height;
-	ui32_t width;
-	ui32_t pitchOrFirstMipSize;
-	ui32_t volumeDepth;
-	ui32_t numMips;
-	ui32_t reserved1[11];
-	ui32_t always_0x00000020;
-	ui32_t pixelFormatFlags;
-	ui32_t fourCC;
-	ui32_t rgbBitCount;
-	ui32_t rBitMask;
-	ui32_t gBitMask;
-	ui32_t bBitMask;
-	ui32_t aBitMask;
-	ui32_t caps;
-	ui32_t caps2;
-	ui32_t caps3;
-	ui32_t caps4;
-	ui32_t reserved2;
-}
-ddsHeader_t;
-
-// flags:
-#define _DDSFLAGS_REQUIRED     0x001007
-#define _DDSFLAGS_PITCH        0x8
-#define _DDSFLAGS_MIPMAPCOUNT  0x20000
-#define _DDSFLAGS_FIRSTMIPSIZE 0x80000
-#define _DDSFLAGS_VOLUMEDEPTH  0x800000
-
-// pixelFormatFlags:
-#define DDSPF_ALPHAPIXELS 0x1
-#define DDSPF_ALPHA       0x2
-#define DDSPF_FOURCC      0x4
-#define DDSPF_RGB         0x40
-#define DDSPF_YUV         0x200
-#define DDSPF_LUMINANCE   0x20000
-
-// caps:
-#define DDSCAPS_COMPLEX  0x8
-#define DDSCAPS_MIPMAP   0x400000
-#define DDSCAPS_REQUIRED 0x1000
-
-// caps2:
-#define DDSCAPS2_CUBEMAP 0xFE00
-#define DDSCAPS2_VOLUME  0x200000
-
-typedef struct ddsHeaderDxt10_s
-{
-	ui32_t dxgiFormat;
-	ui32_t dimensions;
-	ui32_t miscFlags;
-	ui32_t arraySize;
-	ui32_t miscFlags2;
-}
-ddsHeaderDxt10_t;
-
-// dxgiFormat
-// from http://msdn.microsoft.com/en-us/library/windows/desktop/bb173059%28v=vs.85%29.aspx
-typedef enum DXGI_FORMAT {
-	DXGI_FORMAT_UNKNOWN = 0,
-	DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
-	DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
-	DXGI_FORMAT_R32G32B32A32_UINT = 3,
-	DXGI_FORMAT_R32G32B32A32_SINT = 4,
-	DXGI_FORMAT_R32G32B32_TYPELESS = 5,
-	DXGI_FORMAT_R32G32B32_FLOAT = 6,
-	DXGI_FORMAT_R32G32B32_UINT = 7,
-	DXGI_FORMAT_R32G32B32_SINT = 8,
-	DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
-	DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
-	DXGI_FORMAT_R16G16B16A16_UNORM = 11,
-	DXGI_FORMAT_R16G16B16A16_UINT = 12,
-	DXGI_FORMAT_R16G16B16A16_SNORM = 13,
-	DXGI_FORMAT_R16G16B16A16_SINT = 14,
-	DXGI_FORMAT_R32G32_TYPELESS = 15,
-	DXGI_FORMAT_R32G32_FLOAT = 16,
-	DXGI_FORMAT_R32G32_UINT = 17,
-	DXGI_FORMAT_R32G32_SINT = 18,
-	DXGI_FORMAT_R32G8X24_TYPELESS = 19,
-	DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
-	DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
-	DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
-	DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
-	DXGI_FORMAT_R10G10B10A2_UNORM = 24,
-	DXGI_FORMAT_R10G10B10A2_UINT = 25,
-	DXGI_FORMAT_R11G11B10_FLOAT = 26,
-	DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
-	DXGI_FORMAT_R8G8B8A8_UNORM = 28,
-	DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
-	DXGI_FORMAT_R8G8B8A8_UINT = 30,
-	DXGI_FORMAT_R8G8B8A8_SNORM = 31,
-	DXGI_FORMAT_R8G8B8A8_SINT = 32,
-	DXGI_FORMAT_R16G16_TYPELESS = 33,
-	DXGI_FORMAT_R16G16_FLOAT = 34,
-	DXGI_FORMAT_R16G16_UNORM = 35,
-	DXGI_FORMAT_R16G16_UINT = 36,
-	DXGI_FORMAT_R16G16_SNORM = 37,
-	DXGI_FORMAT_R16G16_SINT = 38,
-	DXGI_FORMAT_R32_TYPELESS = 39,
-	DXGI_FORMAT_D32_FLOAT = 40,
-	DXGI_FORMAT_R32_FLOAT = 41,
-	DXGI_FORMAT_R32_UINT = 42,
-	DXGI_FORMAT_R32_SINT = 43,
-	DXGI_FORMAT_R24G8_TYPELESS = 44,
-	DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
-	DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
-	DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
-	DXGI_FORMAT_R8G8_TYPELESS = 48,
-	DXGI_FORMAT_R8G8_UNORM = 49,
-	DXGI_FORMAT_R8G8_UINT = 50,
-	DXGI_FORMAT_R8G8_SNORM = 51,
-	DXGI_FORMAT_R8G8_SINT = 52,
-	DXGI_FORMAT_R16_TYPELESS = 53,
-	DXGI_FORMAT_R16_FLOAT = 54,
-	DXGI_FORMAT_D16_UNORM = 55,
-	DXGI_FORMAT_R16_UNORM = 56,
-	DXGI_FORMAT_R16_UINT = 57,
-	DXGI_FORMAT_R16_SNORM = 58,
-	DXGI_FORMAT_R16_SINT = 59,
-	DXGI_FORMAT_R8_TYPELESS = 60,
-	DXGI_FORMAT_R8_UNORM = 61,
-	DXGI_FORMAT_R8_UINT = 62,
-	DXGI_FORMAT_R8_SNORM = 63,
-	DXGI_FORMAT_R8_SINT = 64,
-	DXGI_FORMAT_A8_UNORM = 65,
-	DXGI_FORMAT_R1_UNORM = 66,
-	DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
-	DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
-	DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
-	DXGI_FORMAT_BC1_TYPELESS = 70,
-	DXGI_FORMAT_BC1_UNORM = 71,
-	DXGI_FORMAT_BC1_UNORM_SRGB = 72,
-	DXGI_FORMAT_BC2_TYPELESS = 73,
-	DXGI_FORMAT_BC2_UNORM = 74,
-	DXGI_FORMAT_BC2_UNORM_SRGB = 75,
-	DXGI_FORMAT_BC3_TYPELESS = 76,
-	DXGI_FORMAT_BC3_UNORM = 77,
-	DXGI_FORMAT_BC3_UNORM_SRGB = 78,
-	DXGI_FORMAT_BC4_TYPELESS = 79,
-	DXGI_FORMAT_BC4_UNORM = 80,
-	DXGI_FORMAT_BC4_SNORM = 81,
-	DXGI_FORMAT_BC5_TYPELESS = 82,
-	DXGI_FORMAT_BC5_UNORM = 83,
-	DXGI_FORMAT_BC5_SNORM = 84,
-	DXGI_FORMAT_B5G6R5_UNORM = 85,
-	DXGI_FORMAT_B5G5R5A1_UNORM = 86,
-	DXGI_FORMAT_B8G8R8A8_UNORM = 87,
-	DXGI_FORMAT_B8G8R8X8_UNORM = 88,
-	DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
-	DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
-	DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
-	DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
-	DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
-	DXGI_FORMAT_BC6H_TYPELESS = 94,
-	DXGI_FORMAT_BC6H_UF16 = 95,
-	DXGI_FORMAT_BC6H_SF16 = 96,
-	DXGI_FORMAT_BC7_TYPELESS = 97,
-	DXGI_FORMAT_BC7_UNORM = 98,
-	DXGI_FORMAT_BC7_UNORM_SRGB = 99,
-	DXGI_FORMAT_AYUV = 100,
-	DXGI_FORMAT_Y410 = 101,
-	DXGI_FORMAT_Y416 = 102,
-	DXGI_FORMAT_NV12 = 103,
-	DXGI_FORMAT_P010 = 104,
-	DXGI_FORMAT_P016 = 105,
-	DXGI_FORMAT_420_OPAQUE = 106,
-	DXGI_FORMAT_YUY2 = 107,
-	DXGI_FORMAT_Y210 = 108,
-	DXGI_FORMAT_Y216 = 109,
-	DXGI_FORMAT_NV11 = 110,
-	DXGI_FORMAT_AI44 = 111,
-	DXGI_FORMAT_IA44 = 112,
-	DXGI_FORMAT_P8 = 113,
-	DXGI_FORMAT_A8P8 = 114,
-	DXGI_FORMAT_B4G4R4A4_UNORM = 115,
-	DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
-} DXGI_FORMAT;
-
-#define EncodeFourCC(x) ((((ui32_t)((x)[0]))      ) | \
-                         (((ui32_t)((x)[1])) << 8 ) | \
-                         (((ui32_t)((x)[2])) << 16) | \
-                         (((ui32_t)((x)[3])) << 24) )
-
-
-static void LoadDDS(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
-	int len;
-	unsigned int signature;
-	ddsHeader_t ddsHeader;
-	ddsHeaderDxt10_t* ddsHeaderDxt10 = NULL;
-	fileHandle_t handle;
-	byte* data;
-	int w, h;
-	int minWidth, minHeight;
-	int numMips = 0;
-	int size;
-	int intSize;
-
-	*pic = NULL;
-	*piMipmapsAvailable = 0;
-
-	if (width)
-		*width = 0;
-	if (height)
-		*height = 0;
-
-	//
-	// load the file
-	//
-	len = ri.FS_OpenFile((char*)name, &handle, qtrue, qtrue);
-	if (len < 0) {
-		return;
-	}
-
-	//
-	// reject files that are too small to hold even a header
-	//
-	if (len < 4 + sizeof(ddsHeader))
-	{
-		ri.Printf(PRINT_ALL, "File %s is too small to be a DDS file.\n", name);
-		ri.FS_CloseFile(handle);
-		return;
-	}
-
-	//
-	// reject files that don't start with "DDS "
-	//
-	ri.FS_Read(&signature, sizeof(signature), handle);
-	if (strncmp((const char*)&signature, "DDS ", 4))
-	{
-		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
-		ri.FS_CloseFile(handle);
-		return;
-	}
-
-	ri.FS_Read(&ddsHeader, sizeof(ddsHeader), handle);
-
-	ddsHeader.headerSize = LittleLong(ddsHeader.headerSize);
-	ddsHeader.flags = LittleLong(ddsHeader.flags);
-	ddsHeader.width = LittleLong(ddsHeader.width);
-	ddsHeader.height = LittleLong(ddsHeader.height);
-	ddsHeader.numMips = LittleLong(ddsHeader.numMips);
-	ddsHeader.pitchOrFirstMipSize = LittleLong(ddsHeader.pitchOrFirstMipSize);
-	ddsHeader.fourCC = LittleLong(ddsHeader.fourCC);
-
-	//
-	// Convert DXGI format/FourCC into OpenGL format
-	//
-	if (ddsHeader.fourCC == EncodeFourCC("DXT1")) {
-		intSize = 2;
-		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-	} else if (ddsHeader.fourCC == EncodeFourCC("DXT2")) {
-		intSize = 4;
-		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-	} else if (ddsHeader.fourCC == EncodeFourCC("DXT3")) {
-		intSize = 4;
-		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-	} else if (ddsHeader.fourCC == EncodeFourCC("DXT4")) {
-		intSize = 4;
-		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-	} else if (ddsHeader.fourCC == EncodeFourCC("DXT5")) {
-		intSize = 4;
-		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-	} else {
-		ri.FS_CloseFile(handle);
-		return;
-	}
-
-	minWidth = ddsHeader.width;
-	for (w = 1; w < ddsHeader.width; w *= 2) {}
-
-	minHeight = ddsHeader.height;
-	for (h = 1; h < ddsHeader.height; h *= 2) {}
-
-	if (w != ddsHeader.width || h != ddsHeader.height) {
-		ri.FS_CloseFile(handle);
-		if (w == ddsHeader.width) {
-			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - height not a power of 2\n", name);
-		} else if (h == ddsHeader.height) {
-			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width not a power of 2\n", name);
-		} else {
-			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width and height not a powers of 2\n", name);
-		}
-
-		return;
-	}
-
-	//
-	// Parse width and height
-	//
-	if (!minWidth) {
-		minWidth = 1;
-	}
-	*width = minWidth;
-
-	if (!minHeight) {
-		minHeight = 1;
-	}
-	*height = minHeight;
-
-	*hasAlpha = ddsHeader.fourCC != EncodeFourCC("DXT1");
-
-	numMips = ddsHeader.numMips;
-	if (!numMips) {
-		numMips = 1;
-	}
-
-	*piMipmapsAvailable = numMips;
-	if (*numMipmaps) {
-		*numMipmaps = numMips;
-	}
-
-	size = ddsHeader.pitchOrFirstMipSize;
-	if (*piMipmapsAvailable > 1) {
-		size = intSize * ddsHeader.pitchOrFirstMipSize;
-	}
-
-	*pic = ri.Malloc(size);
-	ri.FS_Read(*pic, size, handle);
-
-	ri.FS_CloseFile(handle);
-}
-
-/*
-=========================================================
-
-TARGA LOADING
-
-=========================================================
-*/
-
-/*
-=============
-LoadTGA
-=============
-*/
-static void LoadTGA ( const char *name, byte **pic, int *width, int *height)
-{
-	int		columns, rows, numPixels;
-	byte	*pixbuf;
-	int		row, column;
-	byte	*buf_p;
-	byte	*buffer;
-	TargaHeader	targa_header;
-	byte		*targa_rgba;
-
-	*pic = NULL;
-
-	//
-	// load the file
-	//
-	ri.FS_ReadFile ( ( char * ) name, (void **)&buffer);
-	if (!buffer) {
-		return;
-	}
-
-	buf_p = buffer;
-
-	targa_header.id_length = *buf_p++;
-	targa_header.colormap_type = *buf_p++;
-	targa_header.image_type = *buf_p++;
-	
-	targa_header.colormap_index = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.colormap_length = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.colormap_size = *buf_p++;
-	targa_header.x_origin = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.y_origin = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.width = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.height = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.pixel_size = *buf_p++;
-	targa_header.attributes = *buf_p++;
-
-	if (targa_header.image_type!=2 
-		&& targa_header.image_type!=10
-		&& targa_header.image_type != 3 ) 
-	{
-		ri.Error (ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
-	}
-
-	if ( targa_header.colormap_type != 0 )
-	{
-		ri.Error( ERR_DROP, "LoadTGA: colormaps not supported\n" );
-	}
-
-	if ( ( targa_header.pixel_size != 32 && targa_header.pixel_size != 24 ) && targa_header.image_type != 3 )
-	{
-		ri.Error (ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
-	}
-
-	columns = targa_header.width;
-	rows = targa_header.height;
-	numPixels = columns * rows;
-
-	if (width)
-		*width = columns;
-	if (height)
-		*height = rows;
-
-	targa_rgba = ri.Malloc (numPixels*4);
-	*pic = targa_rgba;
-
-	if (targa_header.id_length != 0)
-		buf_p += targa_header.id_length;  // skip TARGA image comment
-	
-	if ( targa_header.image_type==2 || targa_header.image_type == 3 )
-	{ 
-		// Uncompressed RGB or gray scale image
-		for(row=rows-1; row>=0; row--) 
-		{
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; column++) 
-			{
-				unsigned char red,green,blue,alphabyte;
-				switch (targa_header.pixel_size) 
-				{
-					
-				case 8:
-					blue = *buf_p++;
-					green = blue;
-					red = blue;
-					*pixbuf++ = red;
-					*pixbuf++ = green;
-					*pixbuf++ = blue;
-					*pixbuf++ = 255;
-					break;
-
-				case 24:
-					blue = *buf_p++;
-					green = *buf_p++;
-					red = *buf_p++;
-					*pixbuf++ = red;
-					*pixbuf++ = green;
-					*pixbuf++ = blue;
-					*pixbuf++ = 255;
-					break;
-				case 32:
-					blue = *buf_p++;
-					green = *buf_p++;
-					red = *buf_p++;
-					alphabyte = *buf_p++;
-					*pixbuf++ = red;
-					*pixbuf++ = green;
-					*pixbuf++ = blue;
-					*pixbuf++ = alphabyte;
-					break;
-				default:
-					ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
-					break;
-				}
-			}
-		}
-	}
-	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
-		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
-
-		red = 0;
-		green = 0;
-		blue = 0;
-		alphabyte = 0xff;
-
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; ) {
-				packetHeader= *buf_p++;
-				packetSize = 1 + (packetHeader & 0x7f);
-				if (packetHeader & 0x80) {        // run-length packet
-					switch (targa_header.pixel_size) {
-						case 24:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = 255;
-								break;
-						case 32:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = *buf_p++;
-								break;
-						default:
-							ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
-							break;
-					}
-	
-					for(j=0;j<packetSize;j++) {
-						*pixbuf++=red;
-						*pixbuf++=green;
-						*pixbuf++=blue;
-						*pixbuf++=alphabyte;
-						column++;
-						if (column==columns) { // run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}
-					}
-				}
-				else {                            // non run-length packet
-					for(j=0;j<packetSize;j++) {
-						switch (targa_header.pixel_size) {
-							case 24:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = 255;
-									break;
-							case 32:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									alphabyte = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = alphabyte;
-									break;
-							default:
-								ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
-								break;
-						}
-						column++;
-						if (column==columns) { // pixel packet run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}						
-					}
-				}
-			}
-			breakOut:;
-		}
-	}
-
-#if 0 
-  // TTimo: this is the chunk of code to ensure a behavior that meets TGA specs 
-  // bk0101024 - fix from Leonardo
-  // bit 5 set => top-down
-  if (targa_header.attributes & 0x20) {
-    unsigned char *flip = (unsigned char*)malloc (columns*4);
-    unsigned char *src, *dst;
-
-    for (row = 0; row < rows/2; row++) {
-      src = targa_rgba + row * 4 * columns;
-      dst = targa_rgba + (rows - row - 1) * 4 * columns;
-
-      memcpy (flip, src, columns*4);
-      memcpy (src, dst, columns*4);
-      memcpy (dst, flip, columns*4);
-    }
-    free (flip);
-  }
-#endif
-  // instead we just print a warning
-  if (targa_header.attributes & 0x20) {
-    ri.Printf( PRINT_WARNING, "WARNING: '%s' TGA file header declares top-down image, ignoring\n", name);
-  }
-
-  ri.FS_FreeFile (buffer);
-}
-
-/* Catching errors, as done in libjpeg's example.c */
-typedef struct q_jpeg_error_mgr_s
-{
-    struct jpeg_error_mgr pub;  /* "public" fields */
-
-    jmp_buf setjmp_buffer;  /* for return to caller */
-} q_jpeg_error_mgr_t;
-
-static void R_JPGErrorExit(j_common_ptr cinfo)
-{
-  char buffer[JMSG_LENGTH_MAX];
-
-  /* cinfo->err really points to a q_jpeg_error_mgr_s struct, so coerce pointer */
-  q_jpeg_error_mgr_t *jerr = (q_jpeg_error_mgr_t *)cinfo->err;
-  
-  (*cinfo->err->format_message) (cinfo, buffer);
-
-  ri.Printf(PRINT_ALL, "Error: %s", buffer);
-
-  /* Return control to the setjmp point */
-  longjmp(jerr->setjmp_buffer, 1);
-}
-
-static void R_JPGOutputMessage(j_common_ptr cinfo)
-{
-  char buffer[JMSG_LENGTH_MAX];
-  
-  /* Create the message */
-  (*cinfo->err->format_message) (cinfo, buffer);
-  
-  /* Send it to stderr, adding a newline */
-  ri.Printf(PRINT_ALL, "%s\n", buffer);
-}
-
-static void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
-  /* This struct contains the JPEG decompression parameters and pointers to
-   * working space (which is allocated as needed by the JPEG library).
-   */
-  struct jpeg_decompress_struct cinfo;
-  /* We use our private extension JPEG error handler.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  /* This struct represents a JPEG error handler.  It is declared separately
-   * because applications often want to supply a specialized error handler
-   * (see the second half of this file for an example).  But here we just
-   * take the easy way out and use the standard error handler, which will
-   * print a message on stderr and call exit() if compression fails.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  q_jpeg_error_mgr_t jerr;
-  /* More stuff */
-  JSAMPARRAY buffer;		/* Output row buffer */
-  int row_stride;		/* physical row width in output buffer */
-  unsigned int pixelcount, memcount;
-  unsigned int sindex, dindex;
-  unsigned char *out;
-  byte* fbuffer;
-  byte* buf;
-  int len;
-
-  /* In this example we want to open the input file before doing anything else,
-   * so that the setjmp() error recovery below can assume the file is open.
-   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
-   * requires it in order to read binary files.
-   */
-
-  len = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-  if (!fbuffer) {
-	return;
-  }
-
-  /* Step 1: allocate and initialize JPEG decompression object */
-
-  /* We have to set up the error handler first, in case the initialization
-   * step fails.  (Unlikely, but it could happen if you are out of memory.)
-   * This routine fills in the contents of struct jerr, and returns jerr's
-   * address which we place into the link field in cinfo.
-   */
-  cinfo.err = jpeg_std_error(&jerr.pub);
-  cinfo.err->error_exit = R_JPGErrorExit;
-  cinfo.err->output_message = R_JPGOutputMessage;
-
-  /* Establish the setjmp return context for R_JPGErrorExit to use. */
-  if (setjmp(jerr.setjmp_buffer))
-  {
-	  /* If we get here, the JPEG code has signaled an error.
-	   * We need to clean up the JPEG object, close the input file, and return.
-	   */
-	  jpeg_destroy_decompress(&cinfo);
-	  ri.FS_FreeFile(fbuffer);
-
-	  /* Append the filename to the error for easier debugging */
-	  ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
-	  return;
-  }
-
-  /* Now we can initialize the JPEG decompression object. */
-  jpeg_create_decompress(&cinfo);
-
-  /* Step 2: specify data source (eg, a file) */
-
-  jpeg_mem_src(&cinfo, fbuffer, len);
-
-  /* Step 3: read file parameters with jpeg_read_header() */
-
-  (void) jpeg_read_header(&cinfo, TRUE);
-  /* We can ignore the return value from jpeg_read_header since
-   *   (a) suspension is not possible with the stdio data source, and
-   *   (b) we passed TRUE to reject a tables-only JPEG file as an error.
-   * See libjpeg.doc for more info.
-   */
-
-  /* Step 4: set parameters for decompression */
-
-  /*
-   * Make sure it always converts images to RGB color space. This will
-   * automatically convert 8-bit greyscale images to RGB as well.
-   */
-  cinfo.out_color_space = JCS_RGB;
-
-  /* In this example, we don't need to change any of the defaults set by
-   * jpeg_read_header(), so we do nothing here.
-   */
-
-  /* Step 5: Start decompressor */
-
-  (void) jpeg_start_decompress(&cinfo);
-  /* We can ignore the return value since suspension is not possible
-   * with the stdio data source.
-   */
-
-  /* We may need to do some setup of our own at this point before reading
-   * the data.  After jpeg_start_decompress() we have the correct scaled
-   * output image dimensions available, as well as the output colormap
-   * if we asked for color quantization.
-   * In this example, we need to make an output work buffer of the right size.
-   */ 
-  /* JSAMPLEs per row in output buffer */
-  pixelcount = cinfo.output_width * cinfo.output_height;
-
-  if (!cinfo.output_width || !cinfo.output_height
-      || ((pixelcount * 4) / cinfo.output_width) / 4 != cinfo.output_height
-      || pixelcount > 0x1FFFFFFF || cinfo.output_components != 3
-      )
-  {
-      // Free the memory to make sure we don't leak memory
-      ri.FS_FreeFile(fbuffer);
-      jpeg_destroy_decompress(&cinfo);
-
-      ri.Error(ERR_DROP, "LoadJPG: %s has an invalid image format: %dx%d*4=%d, components: %d", filename,
-          cinfo.output_width, cinfo.output_height, pixelcount * 4, cinfo.output_components);
-  }
-
-  memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
-
-  out = ri.Malloc(memcount);
-
-  *width = cinfo.output_width;
-  *height = cinfo.output_height;
-
-  /* Step 6: while (scan lines remain to be read) */
-  /*           jpeg_read_scanlines(...); */
-
-  /* Here we use the library's state variable cinfo.output_scanline as the
-   * loop counter, so that we don't have to keep track ourselves.
-   */
-  while (cinfo.output_scanline < cinfo.output_height) {
-	  /* jpeg_read_scanlines expects an array of pointers to scanlines.
-	   * Here the array is only one element long, but you could ask for
-	   * more than one scanline at a time if that's more convenient.
-	   */
-	  buf = ((out + (row_stride * cinfo.output_scanline)));
-	  buffer = &buf;
-	  (void)jpeg_read_scanlines(&cinfo, buffer, 1);
-  }
-
-  buf = out;
-
-  // Expand from RGB to RGBA
-  sindex = pixelcount * cinfo.output_components;
-  dindex = memcount;
-
-  do
-  {
-      buf[--dindex] = 255;
-      buf[--dindex] = buf[--sindex];
-      buf[--dindex] = buf[--sindex];
-      buf[--dindex] = buf[--sindex];
-  } while (sindex);
-
-  *pic = out;
-
-  /* Step 7: Finish decompression */
-
-  (void) jpeg_finish_decompress(&cinfo);
-  /* We can ignore the return value since suspension is not possible
-   * with the stdio data source.
-   */
-
-  /* Step 8: Release JPEG decompression object */
-
-  /* This is an important step since it will release a good deal of memory. */
-  jpeg_destroy_decompress(&cinfo);
-
-  /* After finish_decompress, we can close the input file.
-   * Here we postpone it until after no more JPEG errors are possible,
-   * so as to simplify the setjmp error logic above.  (Actually, I don't
-   * think that jpeg_destroy can do an error exit, but why assume anything...)
-   */
-  ri.FS_FreeFile (fbuffer);
-
-  /* At this point you may want to check to see whether any corrupt-data
-   * warnings occurred (test whether jerr.pub.num_warnings is nonzero).
-   */
-
-  /* And we're done! */
-}
-
-
-/* Expanded data destination object for stdio output */
-
-typedef struct {
-  struct jpeg_destination_mgr pub; /* public fields */
-
-  byte* outfile;		/* target stream */
-  int	size;
-} my_destination_mgr;
-
-typedef my_destination_mgr * my_dest_ptr;
-
-
-/*
- * Initialize destination --- called by jpeg_start_compress
- * before any data is actually written.
- */
-
-void init_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-  dest->pub.next_output_byte = dest->outfile;
-  dest->pub.free_in_buffer = dest->size;
-}
-
-
-/*
- * Empty the output buffer --- called whenever buffer fills up.
- *
- * In typical applications, this should write the entire output buffer
- * (ignoring the current state of next_output_byte & free_in_buffer),
- * reset the pointer & count to the start of the buffer, and return TRUE
- * indicating that the buffer has been dumped.
- *
- * In applications that need to be able to suspend compression due to output
- * overrun, a FALSE return indicates that the buffer cannot be emptied now.
- * In this situation, the compressor will return to its caller (possibly with
- * an indication that it has not accepted all the supplied scanlines).  The
- * application should resume compression after it has made more room in the
- * output buffer.  Note that there are substantial restrictions on the use of
- * suspension --- see the documentation.
- *
- * When suspending, the compressor will back up to a convenient restart point
- * (typically the start of the current MCU). next_output_byte & free_in_buffer
- * indicate where the restart point will be if the current call returns FALSE.
- * Data beyond this point will be regenerated after resumption, so do not
- * write it out when emptying the buffer externally.
- */
-
-boolean empty_output_buffer (j_compress_ptr cinfo)
-{
-  return TRUE;
-}
-
-#if 0
-/*
- * Compression initialization.
- * Before calling this, all parameters and a data destination must be set up.
- *
- * We require a write_all_tables parameter as a failsafe check when writing
- * multiple datastreams from the same compression object.  Since prior runs
- * will have left all the tables marked sent_table=TRUE, a subsequent run
- * would emit an abbreviated stream (no tables) by default.  This may be what
- * is wanted, but for safety's sake it should not be the default behavior:
- * programmers should have to make a deliberate choice to emit abbreviated
- * images.  Therefore the documentation and examples should encourage people
- * to pass write_all_tables=TRUE; then it will take active thought to do the
- * wrong thing.
- */
-
-GLOBAL void
-jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (write_all_tables)
-    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
-
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Perform master selection of active modules */
-  jinit_compress_master(cinfo);
-  /* Set up for the first pass */
-  (*cinfo->master->prepare_for_pass) (cinfo);
-  /* Ready for application to drive first pass through jpeg_write_scanlines
-   * or jpeg_write_raw_data.
-   */
-  cinfo->next_scanline = 0;
-  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
-}
-
-/*
- * Write some scanlines of data to the JPEG compressor.
- *
- * The return value will be the number of lines actually written.
- * This should be less than the supplied num_lines only in case that
- * the data destination module has requested suspension of the compressor,
- * or if more than image_height scanlines are passed in.
- *
- * Note: we warn about excess calls to jpeg_write_scanlines() since
- * this likely signals an application programmer error.  However,
- * excess scanlines passed in the last valid call are *silently* ignored,
- * so that the application need not adjust num_lines for end-of-image
- * when using a multiple-scanline buffer.
- */
-
-GLOBAL JDIMENSION
-jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
-		      JDIMENSION num_lines)
-{
-  JDIMENSION row_ctr, rows_left;
-
-  if (cinfo->global_state != CSTATE_SCANNING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->next_scanline >= cinfo->image_height)
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->image_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Give master control module another chance if this is first call to
-   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
-   * delayed so that application can write COM, etc, markers between
-   * jpeg_start_compress and jpeg_write_scanlines.
-   */
-  if (cinfo->master->call_pass_startup)
-    (*cinfo->master->pass_startup) (cinfo);
-
-  /* Ignore any extra scanlines at bottom of image. */
-  rows_left = cinfo->image_height - cinfo->next_scanline;
-  if (num_lines > rows_left)
-    num_lines = rows_left;
-
-  row_ctr = 0;
-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
-  cinfo->next_scanline += row_ctr;
-  return row_ctr;
-}
-
-/*
- * Terminate destination --- called by jpeg_finish_compress
- * after all data has been written.  Usually needs to flush buffer.
- *
- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
- * application must deal with any cleanup that should happen even
- * for error exit.
- */
-
-static int hackSize;
-
-void term_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-  size_t datacount = dest->size - dest->pub.free_in_buffer;
-  hackSize = datacount;
-}
-
-
-/*
- * Prepare for output to a stdio stream.
- * The caller must have already opened the stream, and is responsible
- * for closing it after finishing compression.
- */
-
-void jpegDest (j_compress_ptr cinfo, byte* outfile, int size)
-{
-  my_dest_ptr dest;
-
-  /* The destination object is made permanent so that multiple JPEG images
-   * can be written to the same file without re-executing jpeg_stdio_dest.
-   * This makes it dangerous to use this manager and a different destination
-   * manager serially with the same JPEG object, because their private object
-   * sizes may be different.  Caveat programmer.
-   */
-  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
-    cinfo->dest = (struct jpeg_destination_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  sizeof(my_destination_mgr));
-  }
-
-  dest = (my_dest_ptr) cinfo->dest;
-  dest->pub.init_destination = init_destination;
-  dest->pub.empty_output_buffer = empty_output_buffer;
-  dest->pub.term_destination = term_destination;
-  dest->outfile = outfile;
-  dest->size = size;
-}
-
-void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer) {
-  /* This struct contains the JPEG compression parameters and pointers to
-   * working space (which is allocated as needed by the JPEG library).
-   * It is possible to have several such structures, representing multiple
-   * compression/decompression processes, in existence at once.  We refer
-   * to any one struct (and its associated working data) as a "JPEG object".
-   */
-  struct jpeg_compress_struct cinfo;
-  /* This struct represents a JPEG error handler.  It is declared separately
-   * because applications often want to supply a specialized error handler
-   * (see the second half of this file for an example).  But here we just
-   * take the easy way out and use the standard error handler, which will
-   * print a message on stderr and call exit() if compression fails.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  struct jpeg_error_mgr jerr;
-  /* More stuff */
-  JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */
-  int row_stride;		/* physical row width in image buffer */
-  unsigned char *out;
-
-  /* Step 1: allocate and initialize JPEG compression object */
-
-  /* We have to set up the error handler first, in case the initialization
-   * step fails.  (Unlikely, but it could happen if you are out of memory.)
-   * This routine fills in the contents of struct jerr, and returns jerr's
-   * address which we place into the link field in cinfo.
-   */
-  cinfo.err = jpeg_std_error(&jerr);
-  /* Now we can initialize the JPEG compression object. */
-  jpeg_CreateDecompress(&cinfo);
-
-  /* Step 2: specify data destination (eg, a file) */
-  /* Note: steps 2 and 3 can be done in either order. */
-
-  /* Here we use the library-supplied code to send compressed data to a
-   * stdio stream.  You can also write your own code to do something else.
-   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
-   * requires it in order to write binary files.
-   */
-  out = ri.Hunk_AllocateTempMemory(image_width*image_height*4);
-  jpegDest(&cinfo, out, image_width*image_height*4);
-
-  /* Step 3: set parameters for compression */
-
-  /* First we supply a description of the input image.
-   * Four fields of the cinfo struct must be filled in:
-   */
-  cinfo.image_width = image_width; 	/* image width and height, in pixels */
-  cinfo.image_height = image_height;
-  cinfo.input_components = 4;		/* # of color components per pixel */
-  cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */
-  /* Now use the library's routine to set default compression parameters.
-   * (You must set at least cinfo.in_color_space before calling this,
-   * since the defaults depend on the source color space.)
-   */
-  jpeg_set_defaults(&cinfo);
-  /* Now you can set any non-default parameters you wish to.
-   * Here we just illustrate the use of quality (quantization table) scaling:
-   */
-  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-
-  /* Step 4: Start compressor */
-
-  /* TRUE ensures that we will write a complete interchange-JPEG file.
-   * Pass TRUE unless you are very sure of what you're doing.
-   */
-  jpeg_start_compress(&cinfo, TRUE);
-
-  /* Step 5: while (scan lines remain to be written) */
-  /*           jpeg_write_scanlines(...); */
-
-  /* Here we use the library's state variable cinfo.next_scanline as the
-   * loop counter, so that we don't have to keep track ourselves.
-   * To keep things simple, we pass one scanline per call; you can pass
-   * more if you wish, though.
-   */
-  row_stride = image_width * 4;	/* JSAMPLEs per row in image_buffer */
-
-  while (cinfo.next_scanline < cinfo.image_height) {
-    /* jpeg_write_scanlines expects an array of pointers to scanlines.
-     * Here the array is only one element long, but you could pass
-     * more than one scanline at a time if that's more convenient.
-     */
-    row_pointer[0] = & image_buffer[((cinfo.image_height-1)*row_stride)-cinfo.next_scanline * row_stride];
-    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
-  }
-
-  /* Step 6: Finish compression */
-
-  jpeg_finish_compress(&cinfo);
-  /* After finish_compress, we can close the output file. */
-  ri.FS_WriteFile( filename, out, hackSize );
-
-  ri.Hunk_FreeTempMemory(out);
-
-  /* Step 7: release JPEG compression object */
-
-  /* This is an important step since it will release a good deal of memory. */
-  jpeg_destroy_compress(&cinfo);
-
-  /* And we're done! */
-}
-#endif
-
-//===================================================================
-
-/*
-=================
-R_LoadImage
-
-Loads any of the supported image types into a cannonical
-32 bit format.
-=================
-*/
-static void R_LoadImage(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
-	size_t	len;
-	char	tempName[MAX_STRING_TOKENS + 1];
-	char altname[MAX_QPATH];
-
-
-	*hasAlpha = qfalse;
-	*glCompressMode = 0;
-	*pic = NULL;
-	*width = 0;
-	*height = 0;
-
-	len = strlen(name);
-	if (len < 5) {
-		return;
-	}
-
-	strcpy(altname, name);
-	len = strlen(altname);
-	if (glConfig.textureCompression == TC_S3TC || glConfig.textureCompression == TC_S3TC_ARB)
-	{
-		len = strlen(altname);
-		altname[len - 3] = 'd';
-		altname[len - 2] = 'd';
-		altname[len - 1] = 's';
-		LoadDDS(altname, pic, width, height, hasAlpha, glCompressMode, numMipmaps, piMipmapsAvailable);
-	}
-
-	if (!*pic)
-	{
-		if (!Q_stricmp(name + len - 4, ".tga") || !Q_stricmp(name + len - 4, ".jpg")) {
-			if (r_loadjpg->integer) {
-				len = strlen(altname);
-				altname[len - 3] = 'j';
-				altname[len - 2] = 'p';
-				altname[len - 1] = 'g';
-				// try jpg first
-				LoadJPG(altname, pic, width, height);
-			}
-			if (!*pic) {
-				altname[len - 3] = 't';
-				altname[len - 2] = 'g';
-				altname[len - 1] = 'a';
-				LoadTGA(altname, pic, width, height);
-			}
-			*piMipmapsAvailable = 1;
-		}
-		else if (!Q_stricmp(name + len - 4, ".pcx")) {
-			LoadPCX32(name, pic, width, height);
-			*piMipmapsAvailable = 1;
-		}
-		else if (!Q_stricmp(name + len - 4, ".bmp")) {
-			LoadBMP(name, pic, width, height);
-			*piMipmapsAvailable = 1;
-		}
-		else if (!Q_stricmp(name + len - 4, ".jpg")) {
-			LoadJPG(name, pic, width, height);
-			*piMipmapsAvailable = 1;
-        }
-        else if (!Q_stricmp(name + len - 4, ".gst")) {
-            LoadGHOST(name, pic, width, height);
-            *piMipmapsAvailable = 0;
-        }
-	}
-
-	if (scr_initialized)
-	{
-		Com_sprintf(tempName, sizeof(tempName), "n%s", name);
-		UI_LoadResource(tempName);
-	}
-}
-
-
-/*
-===============
-R_FindImageFile
-
-Finds or loads the given image.
-Returns NULL if it fails, not a default image.
-==============
-*/
-image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
-	image_t	*image;
-	int		width, height;
-	byte	*pic;
-	int		len;
-	qboolean	hasAlpha;
-	int			glCompressMode;
-	int			numMipmaps;
-	int			iMipmapsAvailable;
-	long	hash;
-
-	if (!name) {
-		return NULL;
-	}
-
-	hash = generateHashValue(name);
-
-	//
-	// see if the image is already loaded
-	//
-	for (image = hashTable[hash]; image; image = image->next) {
-		if (!strcmp(name, image->imgName)) {
-			// the white image can be used with any set of parms, but other mismatches are errors
-			if (strcmp(name, "*white")) {
-				if ((image->numMipmaps && !mipmap) || (!image->numMipmaps && mipmap)) {
-					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed mipmap parm\n", name);
-				}
-				if (image->allowPicmip != allowPicmip) {
-					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed allowPicmip parm\n", name);
-				}
-				if (image->wrapClampModeX != glWrapClampModeX || image->wrapClampModeY != glWrapClampModeY) {
-					ri.Printf(PRINT_ALL, "WARNING: reused image %s with mixed glWrapClampMode parm\n", name);
-				}
-			}
-			if (image->r_sequence != -1) {
-				image->r_sequence = r_sequencenumber;
-			}
-			return image;
-		}
-	}
-
-	//
-	// load the pic from disk
-	//
-	numMipmaps = mipmap;
-	iMipmapsAvailable = 0;
-	R_LoadImage(name, &pic, &width, &height, &hasAlpha, &glCompressMode, &numMipmaps, &iMipmapsAvailable);
-	if (pic == NULL) {
-		return NULL;
-	}
-
-	image = R_CreateImage(
-		name,
-		pic,
-		width,
-		height,
-		numMipmaps,
-		iMipmapsAvailable,
-		allowPicmip,
-		force32bit,
-		hasAlpha,
-		glCompressMode,
-		glWrapClampModeX,
-		glWrapClampModeY);
-
-    len = strlen(name);
-    if (len > 4 && !strcmp(&name[len - 4], ".gst")) {
-        R_SetGhostImage(name, image);
-    }
-
-	ri.Free(pic);
-	return image;
-}
-
-/*
-================
-R_RefreshImageFile
-================
-*/
-image_t* R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
-	char imagename[64];
-	image_t* image;
-	long hash;
-	
-	if (!name) {
-		return NULL;
-	}
-
-	strncpy(imagename, name, ARRAY_LEN(imagename));
-	hash = generateHashValue(name);
-	image = hashTable[hash];
-
-    if (image)
-    {
-        while (strcmp(name, image->imgName))
-        {
-            image = image->next;
-			if (!image) {
-				return R_FindImageFile(
-					imagename,
-					mipmap,
-					allowPicmip,
-					force32bit,
-					glWrapClampModeX,
-					glWrapClampModeY
-				);
-			}
-        }
-
-        R_FreeImage(image);
-    }
-
-    return R_FindImageFile(
-		imagename,
-		mipmap,
-		allowPicmip,
-		force32bit,
-		glWrapClampModeX,
-		glWrapClampModeY
-	);
-}
-
-/*
-================
-R_ImageExists
-================
-*/
-qboolean R_ImageExists(const char* name) {
-    image_t* image;
-    long int hash;
-
-    if (name)
-    {
-        hash = generateHashValue(name);
-        image = hashTable[hash];
-
-        if (hash)
-        {
-            for (; image != NULL; image = image->next)
-            {
-                if (!strcmp(name, image->imgName)) {
-                    return qtrue;
-                }
-            }
-        }
-    }
-
-    return qfalse;
-}
-
-/*
-================
-R_CreateDlightImage
-================
-*/
-#define	DLIGHT_SIZE	32
-static void R_CreateDlightImage( void ) {
-	int		x,y;
-	byte	data[DLIGHT_SIZE][DLIGHT_SIZE][4];
-	int		b;
-
-	// make a centered inverse-square falloff blob for dynamic lighting
-	for (x=0 ; x<DLIGHT_SIZE ; x++) {
-		for (y=0 ; y<DLIGHT_SIZE ; y++) {
-			float	d;
-
-			d = ( DLIGHT_SIZE/2 - 0.5f - x ) * ( DLIGHT_SIZE/2 - 0.5f - x ) +
-				( DLIGHT_SIZE/2 - 0.5f - y ) * ( DLIGHT_SIZE/2 - 0.5f - y );
-			b = 16000 / d;
-			if (b > 255) {
-				b = 255;
-			} else if ( b < 75 ) {
-				b = 0;
-			}
-			data[y][x][0] = 
-			data[y][x][1] = 
-			data[y][x][2] = b;
-			data[y][x][3] = 255;			
-		}
-	}
-	tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-	tr.dlightImage->r_sequence = -1;
-}
-
-/*
-==================
-R_CreateDefaultImage
-==================
-*/
-#define	DEFAULT_SIZE	16
-static void R_CreateDefaultImage( void ) {
-	int		x;
-	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
-
-	// the default image will be a box, to allow you to see the mapping coordinates
-	Com_Memset( data, 32, sizeof( data ) );
-	for ( x = 0 ; x < DEFAULT_SIZE ; x++ ) {
-		data[0][x][0] =
-		data[0][x][1] =
-		data[0][x][2] =
-		data[0][x][3] = 255;
-
-		data[x][0][0] =
-		data[x][0][1] =
-		data[x][0][2] =
-		data[x][0][3] = 255;
-
-		data[DEFAULT_SIZE-1][x][0] =
-		data[DEFAULT_SIZE-1][x][1] =
-		data[DEFAULT_SIZE-1][x][2] =
-		data[DEFAULT_SIZE-1][x][3] = 255;
-
-		data[x][DEFAULT_SIZE-1][0] =
-		data[x][DEFAULT_SIZE-1][1] =
-		data[x][DEFAULT_SIZE-1][2] =
-		data[x][DEFAULT_SIZE-1][3] = 255;
-	}
-	tr.defaultImage = R_CreateImage("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, 1, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
-	tr.defaultImage->r_sequence = -1;
-}
-
-/*
-==================
-R_CreateBuiltinImages
-==================
-*/
-void R_CreateBuiltinImages(void) {
-	int		x, y;
-	int		i;
-	byte	lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
-	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
-
-	R_CreateDefaultImage();
-
-	// we use a solid white image instead of disabling texturing
-	Com_Memset( data, 255, sizeof( data ) );
-	tr.whiteImage = R_CreateImage("*white", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
-	tr.whiteImage->r_sequence = -1;
-
-	// with overbright bits active, we need an image which is some fraction of full color,
-	// for default lightmaps, etc
-	for (x=0 ; x<DEFAULT_SIZE ; x++) {
-		for (y=0 ; y<DEFAULT_SIZE ; y++) {
-			data[y][x][0] = 
-			data[y][x][1] = 
-			data[y][x][2] = tr.identityLightByte;
-			data[y][x][3] = 255;			
-		}
-	}
-
-	Com_Memset(lightmap_buffer, 0xFFFFFFFF, sizeof(lightmap_buffer));
-	for (i = 0; i < 15; i++) {
-		char filename[64];
-
-		Com_sprintf(filename, sizeof(filename), "*lightmapD%i", i);
-		tr.dlightImages[i] = R_CreateImage(filename, lightmap_buffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, 0, GL_CLAMP, GL_CLAMP);
-		tr.dlightImages[i]->r_sequence = -1;
-	}
-
-	tr.identityLightImage = R_CreateImage("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
-	tr.identityLightImage->r_sequence = -1;
-
-	tr.scratchImage = R_CreateImage("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, qtrue, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-	tr.scratchImage->r_sequence = -1;
-
-	R_CreateDlightImage();
-}
-
-
-/*
-===============
-R_SetColorMappings
-===============
-*/
-void R_SetColorMappings( void ) {
-	int		i, j;
-	float	g;
-	int		inf;
-	int		shift;
-
-	// setup the overbright lighting
-	tr.overbrightBits = r_overBrightBits->integer;
-	if ( !glConfig.deviceSupportsGamma ) {
-		tr.overbrightBits = 0;		// need hardware gamma for overbright
-	}
-
-	// never overbright in windowed mode
-	if ( !glConfig.isFullscreen ) 
-	{
-		tr.overbrightBits = 0;
-	}
-
-	// allow 2 overbright bits in 24 bit, but only 1 in 16 bit
-	if ( glConfig.colorBits > 16 ) {
-		if ( tr.overbrightBits > 2 ) {
-			tr.overbrightBits = 2;
-		}
-	} else {
-		if ( tr.overbrightBits > 1 ) {
-			tr.overbrightBits = 1;
-		}
-	}
-	if ( tr.overbrightBits < 0 ) {
-		tr.overbrightBits = 0;
-	}
-
-	tr.overbrightShift = r_mapOverBrightBits->integer - tr.overbrightBits;
-	tr.overbrightMult = (float)(1 << tr.overbrightShift);
-	tr.identityLight = 1.0f / (1 << tr.overbrightBits);
-	tr.identityLightByte = 255 * tr.identityLight;
-
-	if ( r_intensity->value <= 1 ) {
-		ri.Cvar_Set( "r_intensity", "1" );
-	}
-
-	if ( r_gamma->value < 0.5f ) {
-		ri.Cvar_Set( "r_gamma", "0.5" );
-	} else if ( r_gamma->value > 3.0f ) {
-		ri.Cvar_Set( "r_gamma", "3.0" );
-	}
-
-	g = r_gamma->value;
-	if (!glConfig.deviceSupportsGamma && g != 1.0) {
-		tr.needsLightScale = qtrue;
-	}
-	else if (r_intensity->value != 1.0) {
-		tr.needsLightScale = qtrue;
-	}
-	else {
-		tr.needsLightScale = qfalse;
-	}
-
-	shift = tr.overbrightBits;
-
-	for ( i = 0; i < 256; i++ ) {
-		if ( g == 1 ) {
-			inf = i;
-		} else {
-			inf = 255 * pow ( i/255.0f, 1.0f / g ) + 0.5f;
-		}
-		inf <<= shift;
-		if (inf < 0) {
-			inf = 0;
-		}
-		if (inf > 255) {
-			inf = 255;
-		}
-		s_gammatable[i] = inf;
-	}
-
-	for (i=0 ; i<256 ; i++) {
-		j = i * r_intensity->value;
-		if (j > 255) {
-			j = 255;
-		}
-		s_intensitytable[i] = j;
-	}
-
-	if ( glConfig.deviceSupportsGamma )
-	{
-		GLimp_SetGamma( s_gammatable, s_gammatable, s_gammatable );
-	}
-}
-
-/*
-===============
-R_InitImages
-===============
-*/
-void	R_InitImages( void ) {
-	Com_Memset(hashTable, 0, sizeof(hashTable));
-	// clear images
-	Com_Memset(tr.images, 0, sizeof(tr.images));
-	tr.numImages = 0;
-
-	// build brightness translation tables
-	R_SetColorMappings();
-
-	// create default texture and white texture
-	R_CreateBuiltinImages();
-}
-
-/*
-===============
-R_DeleteImageFromHash
-===============
-*/
-void R_DeleteImageFromHash(image_t* image) {
-	image_t* current;
-	image_t* prev;
-	int hash;
-
-    hash = generateHashValue(image->imgName);
-    current = hashTable[hash];
-    prev = NULL;
-
-    while (current)
-    {
-        if (image == current)
-        {
-			if (prev) {
-				prev->next = current->next;
-			} else {
-                hashTable[hash] = current->next;
-			}
-            return;
-        }
-
-        prev = current;
-        current = current->next;
-    }
-}
-
-/*
-===============
-R_FreeImage
-===============
-*/
-void R_FreeImage(image_t* image) {
-	if (image->texnum) {
-		qglDeleteTextures(1, &image->texnum);
-	}
-
-    R_DeleteImageFromHash(image);
-	memset(image, 0, sizeof(image_t));
-}
-
-/*
-===============
-R_DeleteTextures
-===============
-*/
-void R_DeleteTextures( void ) {
-	int		i;
-
-	for ( i=0; i<tr.numImages ; i++ ) {
-        R_FreeImage(&tr.images[i]);
-	}
-	Com_Memset( tr.images, 0, sizeof( tr.images ) );
-
-	tr.numImages = 0;
-
-	Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) );
-	if ( qglBindTexture ) {
-		if ( qglActiveTextureARB ) {
-			GL_SelectTexture( 1 );
-			qglBindTexture( GL_TEXTURE_2D, 0 );
-			GL_SelectTexture( 0 );
-			qglBindTexture( GL_TEXTURE_2D, 0 );
-		} else {
-			qglBindTexture( GL_TEXTURE_2D, 0 );
-		}
-	}
-}
-
-/*
-===============
-R_DumpTextureMemory
-===============
-*/
-void R_DumpTextureMemory() {
-    int i;
-    char str_buffer[32];
-    char* Label1, * Label2;
-    fileHandle_t stat_file;
-
-    stat_file = FS_SV_FOpenFileWrite("textureuse.csv");
-
-    Label1 = "Texture Name,";
-    FS_Write(Label1, strlen(Label1), stat_file);
-    Label2 = "Size (kb),";
-    FS_Write(Label2, strlen(Label2), stat_file);
-    Label1 = "Num Uses,";
-    FS_Write(Label1, strlen(Label1), stat_file);
-    Label2 = "Miplevels\n";
-    FS_Write(Label2, strlen(Label2), stat_file);
-
-    for (i = 0; i < tr.numImages; i++) {
-        image_t* image = &tr.images[i];
-
-        FS_Write(image->imgName, strlen(image->imgName), stat_file);
-        FS_Write(", ", 2, stat_file);
-
-        // Write the number of bytes (in KiB)
-        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
-        FS_Write(str_buffer, strlen(str_buffer), stat_file);
-        FS_Write(", ", 2, stat_file);
-
-        // Write the sequence
-        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
-        FS_Write(str_buffer, strlen(str_buffer), stat_file);
-        FS_Write(", ", 2, stat_file);
-    }
-}
-
-/*
-===============
-R_CountTextureMemory
-===============
-*/
-int R_CountTextureMemory() {
-    int total_bytes;
-    int i;
-
-    R_DumpTextureMemory();
-
-    total_bytes = 0;
-
-    for (i = 0; i < tr.numImages; i++) {
-        total_bytes = tr.images[i].bytesUsed;
-    }
-
-    return total_bytes;
-}
-
-/*
-===============
-R_FreeUnusedImages
-===============
-*/
-void R_FreeUnusedImages() {
-    int i;
-
-    for (i = 0; i < tr.numImages; i++) {
-        image_t* image = &tr.images[i];
-
-        if (image->imgName[0] && image->r_sequence != r_sequencenumber && image->r_sequence != -1) {
-            R_FreeImage(image);
-        }
-    }
-}
-
-/*
-============================================================================
-
-SKINS
-
-============================================================================
-*/
-
-/*
-==================
-CommaParse
-
-This is unfortunate, but the skin files aren't
-compatable with our normal parsing rules.
-==================
-*/
-static char *CommaParse( char **data_p ) {
-	int c = 0, len;
-	char *data;
-	static	char	com_token[MAX_TOKEN_CHARS];
-
-	data = *data_p;
-	len = 0;
-	com_token[0] = 0;
-
-	// make sure incoming data is valid
-	if ( !data ) {
-		*data_p = NULL;
-		return com_token;
-	}
-
-	while ( 1 ) {
-		// skip whitespace
-		while( (c = *data) <= ' ') {
-			if( !c ) {
-				break;
-			}
-			data++;
-		}
-
-
-		c = *data;
-
-		// skip double slash comments
-		if ( c == '/' && data[1] == '/' )
-		{
-			while (*data && *data != '\n')
-				data++;
-		}
-		// skip /* */ comments
-		else if ( c=='/' && data[1] == '*' ) 
-		{
-			while ( *data && ( *data != '*' || data[1] != '/' ) ) 
-			{
-				data++;
-			}
-			if ( *data ) 
-			{
-				data += 2;
-			}
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	if ( c == 0 ) {
-		return "";
-	}
-
-	// handle quoted strings
-	if (c == '\"')
-	{
-		data++;
-		while (1)
-		{
-			c = *data++;
-			if (c=='\"' || !c)
-			{
-				com_token[len] = 0;
-				*data_p = ( char * ) data;
-				return com_token;
-			}
-			if (len < MAX_TOKEN_CHARS)
-			{
-				com_token[len] = c;
-				len++;
-			}
-		}
-	}
-
-	// parse a regular word
-	do
-	{
-		if (len < MAX_TOKEN_CHARS)
-		{
-			com_token[len] = c;
-			len++;
-		}
-		data++;
-		c = *data;
-	} while (c>32 && c != ',' );
-
-	if (len == MAX_TOKEN_CHARS)
-	{
-//		Com_Printf ("Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
-		len = 0;
-	}
-	com_token[len] = 0;
-
-	*data_p = ( char * ) data;
-	return com_token;
-}
-
-
-/*
-===============
-RE_RegisterSkin
-
-===============
-*/
-qhandle_t RE_RegisterSkin( const char *name ) {
-	qhandle_t	hSkin;
-	skin_t		*skin;
-	skinSurface_t	*surf;
-	char		*text, *text_p;
-	char		*token;
-	char		surfName[MAX_QPATH];
-
-	if ( !name || !name[0] ) {
-		Com_Printf( "Empty name passed to RE_RegisterSkin\n" );
-		return 0;
-	}
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Skin name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-
-	// see if the skin is already loaded
-	for ( hSkin = 1; hSkin < tr.numSkins ; hSkin++ ) {
-		skin = tr.skins[hSkin];
-		if ( !Q_stricmp( skin->name, name ) ) {
-			if( skin->numSurfaces == 0 ) {
-				return 0;		// default skin
-			}
-			return hSkin;
-		}
-	}
-
-	// allocate a new skin
-	if ( tr.numSkins == MAX_SKINS ) {
-		ri.Printf( PRINT_WARNING, "WARNING: RE_RegisterSkin( '%s' ) MAX_SKINS hit\n", name );
-		return 0;
-	}
-	tr.numSkins++;
-	skin = ri.Hunk_Alloc( sizeof( skin_t ), h_dontcare );
-	tr.skins[hSkin] = skin;
-	Q_strncpyz( skin->name, name, sizeof( skin->name ) );
-	skin->numSurfaces = 0;
-
-	// make sure the render thread is stopped
-	R_SyncRenderThread();
-
-	// If not a .skin file, load as a single shader
-	if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
-		skin->numSurfaces = 1;
-		skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_dontcare);
-		skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
-		return hSkin;
-	}
-
-	// load and parse the skin file
-    ri.FS_ReadFile( name, (void **)&text );
-	if ( !text ) {
-		return 0;
-	}
-
-	text_p = text;
-	while ( text_p && *text_p ) {
-		// get surface name
-		token = CommaParse( &text_p );
-		Q_strncpyz( surfName, token, sizeof( surfName ) );
-
-		if ( !token[0] ) {
-			break;
-		}
-		// lowercase the surface name so skin compares are faster
-		Q_strlwr( surfName );
-
-		if ( *text_p == ',' ) {
-			text_p++;
-		}
-
-		if ( strstr( token, "tag_" ) ) {
-			continue;
-		}
-		
-		// parse the shader name
-		token = CommaParse( &text_p );
-
-		surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_dontcare );
-		Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-		surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
-		skin->numSurfaces++;
-	}
-
-	ri.FS_FreeFile( text );
-
-
-	// never let a skin have 0 shaders
-	if ( skin->numSurfaces == 0 ) {
-		return 0;		// use default skin
-	}
-
-	return hSkin;
-}
-
-/*
-===============
-R_GetSkinByHandle
-===============
-*/
-skin_t	*R_GetSkinByHandle( qhandle_t hSkin ) {
-	if ( hSkin < 1 || hSkin >= tr.numSkins ) {
-		return tr.skins[0];
-	}
-	return tr.skins[ hSkin ];
-}
-
-/*
-===============
-R_SkinList_f
-===============
-*/
-void	R_SkinList_f( void ) {
-	int			i, j;
-	skin_t		*skin;
-
-	ri.Printf (PRINT_ALL, "------------------\n");
-
-	for ( i = 0 ; i < tr.numSkins ; i++ ) {
-		skin = tr.skins[i];
-
-		ri.Printf( PRINT_ALL, "%3i:%s\n", i, skin->name );
-		for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
-			ri.Printf( PRINT_ALL, "       %s = %s\n", 
-				skin->surfaces[j]->name, skin->surfaces[j]->shader->name );
-		}
-	}
-	ri.Printf (PRINT_ALL, "------------------\n");
-}
-
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
deleted file mode 100644
index c2c2498a..00000000
--- a/code/renderer/tr_init.c
+++ /dev/null
@@ -1,1876 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_init.c -- functions that are not called every frame
-
-#include "tr_local.h"
-
-glconfig_t	glConfig;
-qboolean	textureFilterAnisotropic = qfalse;
-int		 maxAnisotropy = 0;
-float	   displayAspect = 0;
-qboolean	haveClampToEdge;
-glstate_t	glState;
-int r_sequencenumber;
-
-static void GfxInfo_f( void );
-
-cvar_t	*r_flareSize;
-cvar_t	*r_flareFade;
-
-cvar_t	*r_ignoreFastPath;
-
-cvar_t	*r_verbose;
-cvar_t	*r_ignore;
-
-cvar_t	*r_displayRefresh;
-
-cvar_t	*r_znear;
-
-cvar_t	*r_smp;
-cvar_t	*r_showSmp;
-cvar_t	*r_skipBackEnd;
-
-cvar_t	*r_ignorehwgamma;
-cvar_t	*r_measureOverdraw;
-
-cvar_t	*r_inGameVideo;
-cvar_t	*r_fastsky;
-cvar_t	*r_fastdlights;
-cvar_t	*r_drawSun;
-cvar_t	*r_dlightBacks;
-
-cvar_t	*r_lodscale;
-
-cvar_t	*r_norefresh;
-cvar_t	*r_drawentities;
-cvar_t	*r_drawentitypoly;
-cvar_t	*r_drawstaticmodels;
-cvar_t	*r_drawstaticmodelpoly;
-cvar_t	*r_drawbrushes;
-cvar_t	*r_drawbrushmodels;
-cvar_t	*r_drawstaticdecals;
-cvar_t	*r_drawterrain;
-cvar_t	*r_drawsprites;
-cvar_t	*r_drawspherelights;
-cvar_t	*r_drawworld;
-cvar_t	*r_speeds;
-cvar_t	*r_fullbright;
-cvar_t	*r_novis;
-cvar_t	*r_nocull;
-cvar_t	*r_showcull;
-cvar_t	*r_facePlaneCull;
-cvar_t	*r_showcluster;
-cvar_t	*r_nocurves;
-
-cvar_t	*r_allowExtensions;
-
-cvar_t	*r_ext_compressed_textures;
-cvar_t	*r_ext_gamma_control;
-cvar_t	*r_ext_multitexture;
-cvar_t	*r_ext_compiled_vertex_array;
-cvar_t	*r_ext_texture_env_add;
-
-cvar_t	*r_ext_texture_env_combine;
-cvar_t	*r_ext_aniso_filter;
-cvar_t	*r_ext_max_anisotropy;
-cvar_t	*r_forceClampToEdge;
-cvar_t	*r_geForce3WorkAround;
-cvar_t	*r_reset_tc_array;
-
-cvar_t	*r_ignoreGLErrors;
-cvar_t	*r_logFile;
-
-cvar_t	*r_stencilbits;
-cvar_t	*r_depthbits;
-cvar_t	*r_colorbits;
-cvar_t	*r_stereo;
-cvar_t	*r_primitives;
-cvar_t	*r_textureDetails;
-cvar_t	*r_texturebits;
-
-cvar_t	*r_drawBuffer;
-cvar_t  *r_glDriver;
-cvar_t	*r_lightmap;
-cvar_t	*r_vertexLight;
-cvar_t	*r_shadows;
-cvar_t	*r_entlight_scale;
-cvar_t	*r_entlight_errbound;
-cvar_t	*r_entlight_cubelevel;
-cvar_t	*r_entlight_cubefraction;
-cvar_t	*r_entlight_maxcalc;
-cvar_t	*r_flares;
-cvar_t	*r_mode;
-cvar_t	*r_maxmode;
-cvar_t	*r_vidmode1024;
-cvar_t	*r_vidmodemax;
-cvar_t	*r_nobind;
-cvar_t	*r_singleShader;
-cvar_t	*r_lerpmodels;
-cvar_t	*r_roundImagesDown;
-cvar_t	*r_colorMipLevels;
-cvar_t	*r_picmip;
-cvar_t	*r_showtris;
-cvar_t	*r_showsky;
-cvar_t	*r_shownormals;
-cvar_t	*r_showhbox;
-cvar_t	*r_showstaticbboxes;
-cvar_t	*r_finish;
-cvar_t	*r_clear;
-cvar_t	*r_swapInterval;
-cvar_t	*r_textureMode;
-cvar_t	*r_offsetFactor;
-cvar_t	*r_offsetUnits;
-cvar_t	*r_gamma;
-cvar_t	*r_intensity;
-cvar_t	*r_lockpvs;
-cvar_t	*r_noportals;
-cvar_t	*r_entlightmap;
-cvar_t	*r_fastentlight;
-cvar_t	*r_portalOnly;
-
-cvar_t	*r_subdivisions;
-cvar_t	*r_lodCurveError;
-
-cvar_t	*r_fullscreen;
-
-cvar_t	*r_customwidth;
-cvar_t	*r_customheight;
-cvar_t	*r_customaspect;
-
-cvar_t	*r_overBrightBits;
-cvar_t	*r_mapOverBrightBits;
-
-cvar_t	*r_debugSurface;
-
-cvar_t	*r_showImages;
-cvar_t	*r_showlod;
-cvar_t	*r_showstaticlod;
-
-cvar_t	*r_ambientScale;
-cvar_t	*r_directedScale;
-cvar_t	*r_debugSort;
-cvar_t	*r_printShaders;
-cvar_t	*r_saveFontData;
-
-cvar_t	*r_maxpolys;
-int		max_polys;
-cvar_t	*r_maxpolyverts;
-int		max_polyverts;
-cvar_t* r_maxtermarks;
-int		max_termarks;
-cvar_t* r_precacheimages;
-
-cvar_t* r_staticlod;
-cvar_t* r_lodscale;
-cvar_t* r_lodcap;
-cvar_t* r_lodviewmodelcap;
-
-cvar_t* r_uselod;
-cvar_t* lod_LOD;
-cvar_t* lod_minLOD;
-cvar_t* lod_maxLOD;
-cvar_t* lod_LOD_slider;
-cvar_t* lod_curve_0_val;
-cvar_t* lod_curve_1_val;
-cvar_t* lod_curve_2_val;
-cvar_t* lod_curve_3_val;
-cvar_t* lod_curve_4_val;
-cvar_t* lod_edit_0;
-cvar_t* lod_edit_1;
-cvar_t* lod_edit_2;
-cvar_t* lod_edit_3;
-cvar_t* lod_edit_4;
-cvar_t* lod_curve_0_slider;
-cvar_t* lod_curve_1_slider;
-cvar_t* lod_curve_2_slider;
-cvar_t* lod_curve_3_slider;
-cvar_t* lod_curve_4_slider;
-cvar_t* lod_pitch_val;
-cvar_t* lod_zee_val;
-cvar_t* lod_mesh;
-cvar_t* lod_meshname;
-cvar_t* lod_tikiname;
-cvar_t* lod_metric;
-cvar_t* lod_tris;
-cvar_t* lod_position;
-cvar_t* lod_save;
-cvar_t* lod_tool;
-
-cvar_t* sys_cpuid;
-cvar_t* r_sse;
-cvar_t* r_static_shaderdata0;
-cvar_t* r_static_shaderdata1;
-cvar_t* r_static_shaderdata2;
-cvar_t* r_static_shaderdata3;
-cvar_t* r_static_shadermultiplier0;
-cvar_t* r_static_shadermultiplier1;
-cvar_t* r_static_shadermultiplier2;
-cvar_t* r_static_shadermultiplier3;
-
-cvar_t* r_numdebuglines;
-
-
-cvar_t* r_stipplelines;
-cvar_t* r_light_lines;
-cvar_t* r_light_sun_line;
-cvar_t* r_light_int_scale;
-cvar_t* r_light_nolight;
-cvar_t* r_light_showgrid;
-cvar_t* r_skyportal;
-cvar_t* r_skyportal_origin;
-cvar_t* r_farplane;
-cvar_t* r_farplane_bias;
-cvar_t* r_farplane_color;
-cvar_t* r_farplane_nocull;
-cvar_t* r_farplane_nofog;
-cvar_t* r_skybox_farplane;
-cvar_t* r_farclip;
-cvar_t* r_lightcoronasize;
-cvar_t* r_useglfog;
-cvar_t* r_debuglines_depthmask;
-cvar_t* r_smoothsmokelight;
-cvar_t* r_showportal;
-cvar_t* ter_minMarkRadius;
-cvar_t* ter_fastMarks;
-cvar_t* r_alpha_foliage1;
-cvar_t* r_alpha_foliage2;
-cvar_t* r_blendtrees;
-cvar_t* r_blendbushes;
-cvar_t* r_bumpmap;
-cvar_t* r_loadjpg;
-cvar_t* r_loadftx;
-
-cvar_t* r_showSkeleton;
-
-cvar_t* r_ext_multisample;
-cvar_t* r_noborder;
-cvar_t* r_ext_texture_filter_anisotropic;
-cvar_t* r_stereoEnabled;
-
-cvar_t* r_screenshotJpegQuality;
-
-static char infostring[8192];
-
-static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
-{
-	if ( shouldBeIntegral )
-	{
-		if ( ( int ) cv->value != cv->integer )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' must be integral (%f)\n", cv->name, cv->value );
-			ri.Cvar_Set( cv->name, va( "%d", cv->integer ) );
-		}
-	}
-
-	if ( cv->value < minVal )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f < %f)\n", cv->name, cv->value, minVal );
-		ri.Cvar_Set( cv->name, va( "%f", minVal ) );
-	}
-	else if ( cv->value > maxVal )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f > %f)\n", cv->name, cv->value, maxVal );
-		ri.Cvar_Set( cv->name, va( "%f", maxVal ) );
-	}
-}
-
-
-/*
-** InitOpenGL
-**
-** This function is responsible for initializing a valid OpenGL subsystem.  This
-** is done by calling GLimp_Init (which gives us a working OGL subsystem) then
-** setting variables, checking GL constants, and reporting the gfx system config
-** to the user.
-*/
-static void InitOpenGL( void )
-{
-	char renderer_buffer[1024];
-
-	//
-	// initialize OS specific portions of the renderer
-	//
-	// GLimp_Init directly or indirectly references the following cvars:
-	//		- r_fullscreen
-	//		- r_glDriver
-	//		- r_mode
-	//		- r_(color|depth|stencil)bits
-	//		- r_ignorehwgamma
-	//		- r_gamma
-	//
-	
-	if ( glConfig.vidWidth == 0 )
-	{
-		GLint		temp;
-		
-		GLimp_Init(qtrue);
-
-		strcpy( renderer_buffer, glConfig.renderer_string );
-		Q_strlwr( renderer_buffer );
-
-		// OpenGL driver constants
-		qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp );
-		glConfig.maxTextureSize = temp;
-
-		// stubbed or broken drivers may have reported 0...
-		if ( glConfig.maxTextureSize <= 0 ) 
-		{
-			glConfig.maxTextureSize = 0;
-		}
-
-		if (haveClampToEdge) {
-			ri.Cvar_Set("r_forceClampToEdge", "1");
-		}
-	}
-
-	// init command buffers and SMP
-	R_InitCommandBuffers();
-
-	// print info
-	GfxInfo_f();
-
-	// set default state
-	GL_SetDefaultState();
-}
-
-/*
-==================
-GL_CheckErrors
-==================
-*/
-void GL_CheckErrors( void ) {
-	int		err;
-	char	s[64];
-
-	err = qglGetError();
-	if ( err == GL_NO_ERROR ) {
-		return;
-	}
-	if ( r_ignoreGLErrors->integer ) {
-		return;
-	}
-	switch( err ) {
-		case GL_INVALID_ENUM:
-			strcpy( s, "GL_INVALID_ENUM" );
-			break;
-		case GL_INVALID_VALUE:
-			strcpy( s, "GL_INVALID_VALUE" );
-			break;
-		case GL_INVALID_OPERATION:
-			strcpy( s, "GL_INVALID_OPERATION" );
-			break;
-		case GL_STACK_OVERFLOW:
-			strcpy( s, "GL_STACK_OVERFLOW" );
-			break;
-		case GL_STACK_UNDERFLOW:
-			strcpy( s, "GL_STACK_UNDERFLOW" );
-			break;
-		case GL_OUT_OF_MEMORY:
-			strcpy( s, "GL_OUT_OF_MEMORY" );
-			break;
-		default:
-			Com_sprintf( s, sizeof(s), "%i", err);
-			break;
-	}
-
-	ri.Error( ERR_FATAL, "GL_CheckErrors: %s", s );
-}
-
-
-/*
-** R_GetModeInfo
-*/
-typedef struct vidmode_s
-{
-	const char *description;
-	int		 width, height;
-	float		pixelAspect;		// pixel width / height
-} vidmode_t;
-
-vidmode_t r_vidModes[] =
-{
-	{ "Mode  0: 320x240",		320,	240,	1 },
-	{ "Mode  1: 400x300",		400,	300,	1 },
-	{ "Mode  2: 512x384",		512,	384,	1 },
-	{ "Mode  3: 640x480",		640,	480,	1 },
-	{ "Mode  4: 800x600",		800,	600,	1 },
-	{ "Mode  5: 960x720",		960,	720,	1 },
-	{ "Mode  6: 1024x768",		1024,	768,	1 },
-	{ "Mode  7: 1152x864",		1152,	864,	1 },
-	{ "Mode  8: 1280x1024",		1280,	1024,	1 },
-	{ "Mode  9: 1600x1200",		1600,	1200,	1 },
-	{ "Mode 10: 2048x1536",		2048,	1536,	1 },
-	{ "Mode 11: 856x480 (wide)",856,	480,	1 }
-};
-static int	s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
-
-qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) {
-	vidmode_t	*vm;
-
-	if ( mode < -1 ) {
-		return qfalse;
-	}
-	if ( mode >= s_numVidModes ) {
-		return qfalse;
-	}
-
-	if ( mode == -1 ) {
-		*width = r_customwidth->integer;
-		*height = r_customheight->integer;
-		*windowAspect = r_customaspect->value;
-		return qtrue;
-	}
-
-	vm = &r_vidModes[mode];
-
-	*width  = vm->width;
-	*height = vm->height;
-	*windowAspect = (float)vm->width / ( vm->height * vm->pixelAspect );
-
-	return qtrue;
-}
-
-/*
-** R_ModeList_f
-*/
-static void R_ModeList_f( void )
-{
-	int i;
-
-	ri.Printf( PRINT_ALL, "\n" );
-	for ( i = 0; i < s_numVidModes; i++ )
-	{
-		ri.Printf( PRINT_ALL, "%s\n", r_vidModes[i].description );
-	}
-	ri.Printf( PRINT_ALL, "\n" );
-}
-
-
-/* 
-============================================================================== 
- 
-						SCREEN SHOTS 
-
-NOTE TTimo
-some thoughts about the screenshots system:
-screenshots get written in fs_homepath + fs_gamedir
-vanilla q3 .. baseq3/screenshots/ *.tga
-team arena .. missionpack/screenshots/ *.tga
-
-two commands: "screenshot" and "screenshotJPEG"
-we use statics to store a count and start writing the first screenshot/screenshot????.tga (.jpg) available
-(with FS_FileExists / FS_FOpenFileWrite calls)
-FIXME: the statics don't get a reinit between fs_game changes
-
-============================================================================== 
-*/ 
-
-/* 
-================== 
-RB_ReadPixels
-
-Reads an image but takes care of alignment issues for reading RGB images.
-
-Reads a minimum offset for where the RGB data starts in the image from
-integer stored at pointer offset. When the function has returned the actual
-offset was written back to address offset. This address will always have an
-alignment of packAlign to ensure efficient copying.
-
-Stores the length of padding after a line of pixels to address padlen
-
-Return value must be freed with ri.Hunk_FreeTempMemory()
-================== 
-*/  
-
-byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *padlen)
-{
-	byte *buffer, *bufstart;
-	int padwidth, linelen;
-	GLint packAlign;
-	
-	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
-	
-	linelen = width * 3;
-	padwidth = PAD(linelen, packAlign);
-	
-	// Allocate a few more bytes so that we can choose an alignment we like
-	buffer = ri.Hunk_AllocateTempMemory(padwidth * height + *offset + packAlign - 1);
-	
-	bufstart = PADP((intptr_t) buffer + *offset, packAlign);
-	qglReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart);
-	
-	*offset = bufstart - buffer;
-	*padlen = padwidth - linelen;
-	
-	return buffer;
-}
-
-/*
-==================
-RB_TakeScreenshot
-==================
-*/
-void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
-	byte *allbuf, *buffer;
-	byte *srcptr, *destptr;
-	byte *endline, *endmem;
-	byte temp;
-	
-	int linelen, padlen;
-	size_t offset = 18, memcount;
-		
-	allbuf = RB_ReadPixels(x, y, width, height, &offset, &padlen);
-	buffer = allbuf + offset - 18;
-	
-	Com_Memset (buffer, 0, 18);
-	buffer[2] = 2;		// uncompressed type
-	buffer[12] = width & 255;
-	buffer[13] = width >> 8;
-	buffer[14] = height & 255;
-	buffer[15] = height >> 8;
-	buffer[16] = 24;	// pixel size
-
-	// swap rgb to bgr and remove padding from line endings
-	linelen = width * 3;
-	
-	srcptr = destptr = allbuf + offset;
-	endmem = srcptr + (linelen + padlen) * height;
-	
-	while(srcptr < endmem)
-	{
-		endline = srcptr + linelen;
-
-		while(srcptr < endline)
-		{
-			temp = srcptr[0];
-			*destptr++ = srcptr[2];
-			*destptr++ = srcptr[1];
-			*destptr++ = temp;
-			
-			srcptr += 3;
-		}
-		
-		// Skip the pad
-		srcptr += padlen;
-	}
-
-	memcount = linelen * height;
-
-	// gamma correct
-	if(glConfig.deviceSupportsGamma)
-		R_GammaCorrect(allbuf + offset, memcount);
-
-	ri.FS_WriteFile(fileName, buffer, memcount + 18);
-
-	ri.Hunk_FreeTempMemory(allbuf);
-}
-
-/* 
-================== 
-RB_TakeScreenshotJPEG
-================== 
-*/  
-void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName ) {
-	byte *buffer;
-	size_t offset = 0, memcount;
-	int padlen;
-
-	buffer = RB_ReadPixels(x, y, width, height, &offset, &padlen);
-	memcount = (width * 3 + padlen) * height;
-
-	// gamma correct
-	if(glConfig.deviceSupportsGamma)
-		R_GammaCorrect(buffer + offset, memcount);
-
-	RE_SaveJPG(fileName, r_screenshotJpegQuality->integer, width, height, buffer + offset, padlen);
-	ri.Hunk_FreeTempMemory(buffer);
-}
-
-/*
-==================
-RB_TakeScreenshotCmd
-==================
-*/
-const void *RB_TakeScreenshotCmd( const void *data ) {
-	const screenshotCommand_t	*cmd;
-	
-	cmd = (const screenshotCommand_t *)data;
-	
-	if (cmd->jpeg)
-		RB_TakeScreenshotJPEG( cmd->x, cmd->y, cmd->width, cmd->height, cmd->fileName);
-	else
-		RB_TakeScreenshot( cmd->x, cmd->y, cmd->width, cmd->height, cmd->fileName);
-	
-	return (const void *)(cmd + 1);	
-}
-
-/*
-==================
-R_TakeScreenshot
-==================
-*/
-void R_TakeScreenshot( int x, int y, int width, int height, char *name, qboolean jpeg ) {
-	static char	fileName[MAX_OSPATH]; // bad things if two screenshots per frame?
-	screenshotCommand_t	*cmd;
-
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_SCREENSHOT;
-
-	cmd->x = x;
-	cmd->y = y;
-	cmd->width = width;
-	cmd->height = height;
-	Q_strncpyz( fileName, name, sizeof(fileName) );
-	cmd->fileName = fileName;
-	cmd->jpeg = jpeg;
-}
-
-/* 
-================== 
-R_ScreenshotFilename
-================== 
-*/  
-void R_ScreenshotFilename( int lastNumber, char *fileName ) {
-	int		a,b,c,d;
-
-	if ( lastNumber < 0 || lastNumber > 9999 ) {
-		Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot9999.tga" );
-		return;
-	}
-
-	a = lastNumber / 1000;
-	lastNumber -= a*1000;
-	b = lastNumber / 100;
-	lastNumber -= b*100;
-	c = lastNumber / 10;
-	lastNumber -= c*10;
-	d = lastNumber;
-
-	Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot%i%i%i%i.tga"
-		, a, b, c, d );
-}
-
-/* 
-================== 
-R_ScreenshotFilename
-================== 
-*/  
-void R_ScreenshotFilenameJPEG( int lastNumber, char *fileName ) {
-	int		a,b,c,d;
-
-	if ( lastNumber < 0 || lastNumber > 9999 ) {
-		Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot9999.jpg" );
-		return;
-	}
-
-	a = lastNumber / 1000;
-	lastNumber -= a*1000;
-	b = lastNumber / 100;
-	lastNumber -= b*100;
-	c = lastNumber / 10;
-	lastNumber -= c*10;
-	d = lastNumber;
-
-	Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot%i%i%i%i.jpg"
-		, a, b, c, d );
-}
-
-/*
-====================
-R_ResampledScreenShot
-====================
-*/
-void R_ResampledScreenShot(const char* filename, int destwidth, int destheight) {
-	char		checkname[MAX_OSPATH];
-	byte		*buffer;
-	byte		*source, *allsource;
-	byte		*src, *dst;
-	size_t			offset = 0;
-	int			padlen;
-	int			x, y;
-	int			r, g, b;
-	float		xScale, yScale;
-	int			xx, yy;
-
-	allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
-	source = allsource + offset;
-
-	buffer = ri.Hunk_AllocateTempMemory(destheight * destwidth * 3 + 18);
-	Com_Memset (buffer, 0, 18);
-	buffer[2]  = 2;		// uncompressed type
-	buffer[12] = destwidth & 255;
-	buffer[13] = destwidth >> 8;
-	buffer[14] = destheight & 255;
-	buffer[15] = destheight >> 8;
-	buffer[16] = 24;	// pixel size
-
-	// resample from source
-	xScale = glConfig.vidWidth / (float)(destwidth * 4);
-	yScale = glConfig.vidHeight / (float)(destheight * 3);
-	for ( y = 0 ; y < destheight ; y++ ) {
-		for ( x = 0 ; x < destwidth ; x++ ) {
-			r = g = b = 0;
-			for ( yy = 0 ; yy < 3 ; yy++ ) {
-				for ( xx = 0 ; xx < 4 ; xx++ ) {
-					src = source + (3 * glConfig.vidWidth + padlen) * (int)((y*3 + yy) * yScale) +
-						3 * (int) ((x*4 + xx) * xScale);
-					r += src[0];
-					g += src[1];
-					b += src[2];
-				}
-			}
-			dst = buffer + 18 + 3 * ( y * destwidth + x );
-			dst[0] = b / 12;
-			dst[1] = g / 12;
-			dst[2] = r / 12;
-		}
-	}
-
-	// gamma correct
-	if ( glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, destheight * destwidth * 3 );
-	}
-
-	ri.FS_WriteFile( filename, buffer, destheight * destwidth * 3 + 18 );
-
-	ri.Hunk_FreeTempMemory( buffer );
-	ri.Hunk_FreeTempMemory( allsource );
-}
-
-/*
-====================
-R_LevelShot
-
-levelshots are specialized 128*128 thumbnails for
-the menu system, sampled down from full screen distorted images
-====================
-*/
-void R_LevelShot( void ) {
-	char		checkname[MAX_OSPATH];
-	byte		*buffer;
-	byte		*source, *allsource;
-	byte		*src, *dst;
-	size_t			offset = 0;
-	int			padlen;
-	int			x, y;
-	int			r, g, b;
-	float		xScale, yScale;
-	int			xx, yy;
-
-	Com_sprintf(checkname, sizeof(checkname), "levelshots/%s.tga", tr.world->baseName);
-
-	allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
-	source = allsource + offset;
-
-	buffer = ri.Hunk_AllocateTempMemory(128 * 128*3 + 18);
-	Com_Memset (buffer, 0, 18);
-	buffer[2] = 2;		// uncompressed type
-	buffer[12] = 128;
-	buffer[14] = 128;
-	buffer[16] = 24;	// pixel size
-
-	// resample from source
-	xScale = glConfig.vidWidth / 512.0f;
-	yScale = glConfig.vidHeight / 384.0f;
-	for ( y = 0 ; y < 128 ; y++ ) {
-		for ( x = 0 ; x < 128 ; x++ ) {
-			r = g = b = 0;
-			for ( yy = 0 ; yy < 3 ; yy++ ) {
-				for ( xx = 0 ; xx < 4 ; xx++ ) {
-					src = source + (3 * glConfig.vidWidth + padlen) * (int)((y*3 + yy) * yScale) +
-						3 * (int) ((x*4 + xx) * xScale);
-					r += src[0];
-					g += src[1];
-					b += src[2];
-				}
-			}
-			dst = buffer + 18 + 3 * ( y * 128 + x );
-			dst[0] = b / 12;
-			dst[1] = g / 12;
-			dst[2] = r / 12;
-		}
-	}
-
-	// gamma correct
-	if ( glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, 128 * 128 * 3 );
-	}
-
-	ri.FS_WriteFile( checkname, buffer, 128 * 128*3 + 18 );
-
-	ri.Hunk_FreeTempMemory(buffer);
-	ri.Hunk_FreeTempMemory(allsource);
-
-	ri.Printf( PRINT_ALL, "Wrote %s\n", checkname );
-}
-
-/* 
-================== 
-R_ScreenShot_f
-
-screenshot
-screenshot [silent]
-screenshot [levelshot]
-screenshot [filename]
-
-Doesn't print the pacifier message if there is a second arg
-================== 
-*/  
-void R_ScreenShot_f(void) {
-	char	checkname[MAX_OSPATH];
-	static int	lastNumber = -1;
-	int		width, height;
-	qboolean	silent;
-
-	if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
-		R_LevelShot();
-		return;
-	}
-
-	if (!strcmp(ri.Cmd_Argv(1), "silent")) {
-		silent = qtrue;
-	} else {
-		silent = qfalse;
-	}
-
-	width = 0;
-	height = 0;
-
-	if (ri.Cmd_Argc() >= 2 && !silent) {
-		// explicit filename
-		const char* name = ri.Cmd_Argv(1);
-		if (strchr(name, '/')) {
-			Q_strncpyz(checkname, name, sizeof(checkname));
-		} else {
-			Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
-		}
-
-		if (ri.Cmd_Argc() > 2) {
-			width = atoi(ri.Cmd_Argv(2));
-			height = atoi(ri.Cmd_Argv(3));
-		}
-	} else {
-		// scan for a free filename
-
-		// if we have saved a previous screenshot, don't scan
-		// again, because recording demo avis can involve
-		// thousands of shots
-		if (lastNumber == -1) {
-			lastNumber = 0;
-		}
-		// scan for a free number
-		for (; lastNumber <= 9999; lastNumber++) {
-			R_ScreenshotFilename(lastNumber, checkname);
-
-			if (!ri.FS_FileExists(checkname))
-			{
-				break; // file doesn't exist
-			}
-		}
-
-		if (lastNumber >= 9999) {
-			ri.Printf(PRINT_ALL, "ScreenShot: Couldn't create a file\n");
-			return;
-		}
-
-		lastNumber++;
-	}
-
-	if (!width || !height) {
-		R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
-
-		if (!silent) {
-			char message[64];
-
-			Com_sprintf(message, sizeof(message), "centerprint \"%s %s\"\n", ri.LV_ConvertString("Wrote"), checkname);
-			ri.Cmd_ExecuteText(EXEC_NOW, message);
-		}
-	} else {
-		R_ResampledScreenShot(checkname, width, height);
-	}
-}
-
-/*
-==================
-RB_TakeScreenshot
-==================
-*/
-void R_ScreenShotJPEG_f (void) {
-	char		checkname[MAX_OSPATH];
-	static	int	lastNumber = -1;
-	qboolean	silent;
-
-	if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
-		R_LevelShot();
-		return;
-	}
-
-	if ( !strcmp( ri.Cmd_Argv(1), "silent" ) ) {
-		silent = qtrue;
-	} else {
-		silent = qfalse;
-	}
-
-	if ( ri.Cmd_Argc() == 2 && !silent ) {
-		// explicit filename
-		Com_sprintf( checkname, MAX_OSPATH, "screenshots/%s.jpg", ri.Cmd_Argv( 1 ) );
-	} else {
-		// scan for a free filename
-
-		// if we have saved a previous screenshot, don't scan
-		// again, because recording demo avis can involve
-		// thousands of shots
-		if ( lastNumber == -1 ) {
-			lastNumber = 0;
-		}
-		// scan for a free number
-		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
-			R_ScreenshotFilenameJPEG( lastNumber, checkname );
-
-	  if (!ri.FS_FileExists( checkname ))
-	  {
-		break; // file doesn't exist
-	  }
-		}
-
-		if ( lastNumber == 10000 ) {
-			ri.Printf (PRINT_ALL, "ScreenShot: Couldn't create a file\n"); 
-			return;
- 		}
-
-		lastNumber++;
-	}
-
-	R_TakeScreenshot( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qtrue );
-
-	if ( !silent ) {
-		ri.Printf (PRINT_ALL, "Wrote %s\n", checkname);
-	}
-} 
-
-//============================================================================
-
-/*
-** GL_SetDefaultState
-*/
-void GL_SetDefaultState( void )
-{
-	qglClearDepth( 1.0f );
-
-	qglCullFace(GL_FRONT);
-
-	qglColor4f (1,1,1,1);
-
-	// initialize downstream texture unit if we're running
-	// in a multitexture environment
-	if ( qglActiveTextureARB ) {
-		GL_SelectTexture( 1 );
-		GL_TextureMode( r_textureMode->string );
-		GL_TexEnv( GL_MODULATE );
-		qglDisable( GL_TEXTURE_2D );
-		GL_SelectTexture( 0 );
-	}
-
-	qglEnable(GL_TEXTURE_2D);
-	GL_TextureMode( r_textureMode->string );
-	GL_TexEnv( GL_MODULATE );
-
-	qglShadeModel( GL_SMOOTH );
-	qglDepthFunc( GL_LEQUAL );
-
-	// the vertex array is always enabled, but the color and texture
-	// arrays are enabled and disabled around the compiled vertex array call
-	qglEnableClientState (GL_VERTEX_ARRAY);
-
-	//
-	// make sure our GL state vector is set correctly
-	//
-	glState.glStateBits = GLS_DEPTHTEST_DISABLE | GLS_DEPTHMASK_TRUE;
-
-	qglPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-	qglDepthMask( GL_TRUE );
-	qglDisable( GL_DEPTH_TEST );
-	qglEnable( GL_SCISSOR_TEST );
-	qglDisable( GL_CULL_FACE );
-	qglDisable( GL_BLEND );
-
-	qglFogi(GL_FOG_MODE, GL_LINEAR);
-
-	glState.fFogColor[0] = 0.0;
-	glState.fFogColor[1] = 0.0;
-	glState.fFogColor[2] = 0.0;
-	glState.fFogColor[3] = 1.0;
-}
-
-/*
-==================
-PrintAndAppendString
-==================
-*/
-void PrintAndAppendString(char* string, size_t maxlen, char* fmt, ...) {
-	char msg[1024];
-	size_t len;
-	va_list va;
-
-	va_start(va, fmt);
-	Q_vsnprintf(msg, sizeof(msg), fmt, va);
-	va_end(va);
-
-	ri.Printf(PRINT_ALL, "%s", msg);
-
-	Q_strcat(string, maxlen, msg);
-}
-
-/*
-==================
-RE_GetGraphicsInfo
-==================
-*/
-const char* RE_GetGraphicsInfo() {
-	return infostring;
-}
-
-/*
-================
-R_PrintLongString
-
-Workaround for ri.Printf's 1024 characters buffer limit.
-================
-*/
-void R_PrintLongString(char* dest, size_t destsize, const char *string) {
-	char buffer[1024];
-	const char *p;
-	int size = strlen(string);
-
-	p = string;
-	while(size > 0)
-	{
-		Q_strncpyz(buffer, p, sizeof (buffer) );
-		PrintAndAppendString( dest, destsize, "%s", buffer );
-		p += 1023;
-		size -= 1023;
-	}
-}
-
-/*
-==================
-BuildGfxInfo
-==================
-*/
-void BuildGfxInfo(char* dest, size_t destsize) {
-	cvar_t *sys_cpustring = ri.Cvar_Get( "sys_cpustring", "", 0 );
-	const char *enablestrings[] =
-	{
-		"disabled",
-		"enabled"
-	};
-	const char *fsstrings[] =
-	{
-		"windowed",
-		"fullscreen"
-	};
-
-	PrintAndAppendString( dest, destsize, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
-	PrintAndAppendString( dest, destsize, "GL_RENDERER: %s\n", glConfig.renderer_string );
-	PrintAndAppendString( dest, destsize, "GL_VERSION: %s\n", glConfig.version_string );
-	PrintAndAppendString( dest, destsize, "GL_EXTENSIONS: " );
-	// glConfig.extensions_string is a limited length so get the full list directly
-	if ( qglGetStringi )
-	{
-		GLint numExtensions;
-		int i;
-
-		qglGetIntegerv( GL_NUM_EXTENSIONS, &numExtensions );
-		for ( i = 0; i < numExtensions; i++ )
-		{
-			PrintAndAppendString( dest, destsize, "%s ", qglGetStringi( GL_EXTENSIONS, i ) );
-		}
-	}
-	else
-	{
-		R_PrintLongString( dest, destsize, (char *) qglGetString( GL_EXTENSIONS ) );
-	}
-	PrintAndAppendString( dest, destsize, "\n" );
-	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
-	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
-	PrintAndAppendString( dest, destsize, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
-	PrintAndAppendString( dest, destsize, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
-	if ( glConfig.displayFrequency )
-	{
-		PrintAndAppendString( dest, destsize, "%d\n", glConfig.displayFrequency );
-	}
-	else
-	{
-		PrintAndAppendString( dest, destsize, "N/A\n" );
-	}
-	if ( glConfig.deviceSupportsGamma )
-	{
-		PrintAndAppendString( dest, destsize, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
-	}
-	else
-	{
-		PrintAndAppendString( dest, destsize, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
-	}
-	PrintAndAppendString( dest, destsize, "CPU: %s\n", sys_cpustring->string );
-
-	// rendering primitives
-	{
-		int		primitives;
-
-		// default is to use triangles if compiled vertex arrays are present
-		PrintAndAppendString( dest, destsize, "rendering primitives: " );
-		primitives = r_primitives->integer;
-		if ( primitives == 0 ) {
-			if ( qglLockArraysEXT ) {
-				primitives = 2;
-			} else {
-				primitives = 1;
-			}
-		}
-		if ( primitives == -1 ) {
-			PrintAndAppendString( dest, destsize, "none\n" );
-		} else if ( primitives == 2 ) {
-			PrintAndAppendString( dest, destsize, "single glDrawElements\n" );
-		} else if ( primitives == 1 ) {
-			PrintAndAppendString( dest, destsize, "multiple glArrayElement\n" );
-		} else if ( primitives == 3 ) {
-			PrintAndAppendString( dest, destsize, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
-		}
-	}
-
-	PrintAndAppendString( dest, destsize, "texturemode: %s\n", r_textureMode->string );
-	PrintAndAppendString( dest, destsize, "picmip: %d\n", r_picmip->integer );
-	PrintAndAppendString( dest, destsize, "texture bits: %d\n", r_texturebits->integer );
-	PrintAndAppendString( dest, destsize, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
-	PrintAndAppendString( dest, destsize, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
-	PrintAndAppendString( dest, destsize, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
-	PrintAndAppendString( dest, destsize, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
-	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 )
-	{
-		PrintAndAppendString( dest, destsize, "HACK: using vertex lightmap approximation\n" );
-	}
-	if ( glConfig.hardwareType == GLHW_RAGEPRO )
-	{
-		PrintAndAppendString( dest, destsize, "HACK: ragePro approximations\n" );
-	}
-	if ( glConfig.hardwareType == GLHW_RIVA128 )
-	{
-		PrintAndAppendString( dest, destsize, "HACK: riva128 approximations\n" );
-	}
-	if ( glConfig.smpActive ) {
-		PrintAndAppendString( dest, destsize, "Using dual processor acceleration\n" );
-	}
-	if ( r_finish->integer ) {
-		PrintAndAppendString( dest, destsize, "Forcing glFinish\n" );
-	}
-}
-
-/*
-================
-GfxInfo_f
-================
-*/
-void GfxInfo_f( void ) 
-{
-	BuildGfxInfo(infostring, sizeof(infostring));
-	ri.Cvar_Set("r_gfxinfo", infostring);
-}
-
-/*
-==================
-FarPlaneInfo_f
-==================
-*/
-void FarPlaneInfo_f(void) {
-	Com_Printf("Current fog settings:\n");
-	Com_Printf("Distance: %i\n", (int)tr.viewParms.farplane_distance);
-	Com_Printf(
-		"Color: %f  %f  %f\n",
-		tr.viewParms.farplane_color[0],
-		tr.viewParms.farplane_color[1],
-		tr.viewParms.farplane_color[2]);
-	if (tr.viewParms.farplane_cull) {
-		Com_Printf("Cull: on\n");
-	} else {
-		Com_Printf("Cull: off\n");
-	}
-}
-
-/*
-==================
-R_SetMode
-==================
-*/
-qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
-    // FIXME: unimplemented
-	ri.Printf(PRINT_WARNING, "R_SetMode is unimplemented. To change the video mode, set the \"r_mode\" variable and execute the \"vid_restart\" command.\n");
-	return qfalse;
-}
-
-/*
-==================
-R_SetFullscreen
-==================
-*/
-void R_SetFullscreen(qboolean fullscreen) {
-    // FIXME: unimplemented
-    ri.Printf(PRINT_WARNING, "R_SetFullscreen is unimplemented. To change the fullscreen mode, set the \"r_fullscreen\" variable and execute the \"vid_restart\" command.\n");
-}
-
-/*
-===============
-R_Register
-===============
-*/
-void R_Register( void ) 
-{
-	//
-	// latched and archived variables
-	//
-	r_glDriver = ri.Cvar_Get( "r_glDriver", OPENGL_DRIVER_NAME, CVAR_ARCHIVE | CVAR_LATCH );
-	r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compressed_textures", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE | CVAR_LATCH);
-#ifdef __linux__ // broken on linux
-	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else
-	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE | CVAR_LATCH);
-#endif
-	r_ext_texture_env_combine = ri.Cvar_Get("r_ext_texture_env_combine", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_ext_max_anisotropy = ri.Cvar_Get("r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH);
-	r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ROM);
-	r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
-	r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
-
-	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
-	AssertCvarRange( r_picmip, 0, 16, qtrue );
-	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
-	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH );
-#ifdef __linux__
-	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-#else
-	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH );
-#endif
-	r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_maxmode = ri.Cvar_Get("r_maxmode", "6", CVAR_ARCHIVE | CVAR_LATCH);
-	r_vidmode1024 = ri.Cvar_Get("r_vidmode1024", "1", CVAR_ARCHIVE | CVAR_LATCH);
-	r_vidmodemax = ri.Cvar_Get("r_vidmodemax", "1", CVAR_ARCHIVE | CVAR_LATCH);
-	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
-	
-	// Added in 2.0
-	//  But removed because it's kind of annoying
-	//if (r_mode->integer > r_maxmode->integer)
-	//{
-	//	char buf[8];
-	//
-	//	Com_sprintf(buf, sizeof(buf), "%d", r_maxmode->integer);
-	//	ri.Cvar_Set("r_mode", buf);
-	//	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
-	//}
-	r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
-	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
-	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
-	r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#if (defined(MACOS_X) || defined(__linux__)) && defined(SMP)
-  // Default to using SMP on Mac OS X or Linux if we have multiple processors
-	r_smp = ri.Cvar_Get( "r_smp", Sys_ProcessorCount() > 1 ? "1" : "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else		
-	r_smp = ri.Cvar_Get( "r_smp", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#endif
-	r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
-
-	//
-	// temporary latched variables that can only change over a restart
-	//
-	r_displayRefresh = ri.Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH );
-	AssertCvarRange( r_displayRefresh, 0, 200, qtrue );
-	r_fullbright = ri.Cvar_Get ("r_fullbright", "0", CVAR_LATCH|CVAR_CHEAT );
-	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "1", CVAR_LATCH );
-	r_intensity = ri.Cvar_Get ("r_intensity", "1", CVAR_LATCH );
-	r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
-	r_singleShader = ri.Cvar_Get ("r_singleShader", "0", CVAR_CHEAT | CVAR_LATCH );
-
-	//
-	// archived variables that can change at any time
-	//
-	r_lerpmodels = ri.Cvar_Get("r_lerpmodels", "1", 0);
-	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE|CVAR_CHEAT );
-	r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE );
-	r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT );
-	AssertCvarRange( r_znear, 0.001f, 200, qtrue );
-	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
-	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", 0 );
-	r_fastdlights = ri.Cvar_Get("r_fastdlights", "1", CVAR_ARCHIVE | CVAR_LATCH);
-	r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE );
-	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
-	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
-	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE );
-	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE );
-	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
-	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
-
-	r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE );
-
-	r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT );
-	r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT );
-
-	//
-	// temporary variables that can change at any time
-	//
-	r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_TEMP );
-	r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
-	r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
-	r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
-	lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
-	lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
-	lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
-	lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
-	lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
-	lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
-	lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
-	lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
-	lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
-	lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
-	lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
-	lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
-	lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
-	lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
-	lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
-	lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
-	lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
-	lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
-	lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
-	lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
-	lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
-	lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
-	lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
-	lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
-	lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
-	lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
-	lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
-	lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
-	lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
-
-	r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT );
-	r_printShaders = ri.Cvar_Get( "r_printShaders", "0", 0 );
-
-	r_nocurves = ri.Cvar_Get ("r_nocurves", "0", CVAR_CHEAT );
-	r_drawworld = ri.Cvar_Get ("r_drawworld", "1", CVAR_CHEAT );
-	r_lightmap = ri.Cvar_Get ("r_lightmap", "0", 0 );
-	r_portalOnly = ri.Cvar_Get ("r_portalOnly", "0", CVAR_CHEAT );
-
-	r_flareSize = ri.Cvar_Get ("r_flareSize", "40", CVAR_CHEAT);
-	r_flareFade = ri.Cvar_Get ("r_flareFade", "7", CVAR_CHEAT);
-
-	r_showSmp = ri.Cvar_Get ("r_showSmp", "0", CVAR_CHEAT);
-	r_skipBackEnd = ri.Cvar_Get ("r_skipBackEnd", "0", CVAR_CHEAT);
-
-	r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT );
-	r_norefresh = ri.Cvar_Get("r_norefresh", "0", CVAR_CHEAT);
-	r_drawentities = ri.Cvar_Get("r_drawentities", "1", CVAR_CHEAT);
-	r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
-	r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
-	r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
-	r_drawbrushes = ri.Cvar_Get("r_drawbrushes", "1", CVAR_CHEAT);
-	r_drawbrushmodels = ri.Cvar_Get("r_drawbrushmodels", "1", CVAR_CHEAT);
-	r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
-	r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
-	r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
-	r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
-	r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
-	r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
-	r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
-	r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
-	r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT );
-	r_nocull = ri.Cvar_Get ("r_nocull", "0", CVAR_CHEAT);
-	r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
-	r_novis = ri.Cvar_Get ("r_novis", "0", CVAR_CHEAT);
-	r_showcluster = ri.Cvar_Get ("r_showcluster", "0", CVAR_CHEAT);
-	r_speeds = ri.Cvar_Get ("r_speeds", "0", CVAR_CHEAT);
-	r_verbose = ri.Cvar_Get( "r_verbose", "0", CVAR_CHEAT );
-	r_logFile = ri.Cvar_Get( "r_logFile", "0", CVAR_CHEAT );
-	r_debugSurface = ri.Cvar_Get ("r_debugSurface", "0", CVAR_CHEAT);
-	r_nobind = ri.Cvar_Get ("r_nobind", "0", CVAR_CHEAT);
-	r_showtris = ri.Cvar_Get ("r_showtris", "0", CVAR_CHEAT);
-	r_showsky = ri.Cvar_Get ("r_showsky", "0", CVAR_CHEAT);
-	r_shownormals = ri.Cvar_Get ("r_shownormals", "0", CVAR_CHEAT);
-	r_showhbox = ri.Cvar_Get("r_showhbox", "0", CVAR_CHEAT);
-	r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
-	r_clear = ri.Cvar_Get ("r_clear", "0", CVAR_CHEAT);
-	r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT );
-	r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT );
-	r_drawBuffer = ri.Cvar_Get( "r_drawBuffer", "GL_BACK", CVAR_CHEAT );
-	r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", CVAR_CHEAT);
-	r_noportals = ri.Cvar_Get ("r_noportals", "0", CVAR_CHEAT);
-	r_entlightmap = ri.Cvar_Get("r_entlightmap", "0", CVAR_CHEAT);
-	r_fastentlight = ri.Cvar_Get("r_fastentlight", "1", CVAR_ARCHIVE);
-	r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
-	r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
-	r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
-	r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
-	r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
-	r_shadows = ri.Cvar_Get( "cg_shadows", "1", 0 );
-
-	r_maxpolys = ri.Cvar_Get( "r_maxpolys", va("%d", MAX_POLYS), 0);
-	r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", va("%d", MAX_POLYVERTS), 0);
-	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
-
-	r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
-	r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
-	r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
-	r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
-	r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_CHEAT | CVAR_ARCHIVE);
-	r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
-	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
-	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
-	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
-	r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
-	r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
-	r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
-	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
-	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
-	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
-	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
-	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
-	r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
-	r_useglfog = ri.Cvar_Get("r_useglfog", "1", 64);
-	r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
-	r_smoothsmokelight = ri.Cvar_Get("vss_smoothsmokelight", "1", CVAR_ARCHIVE);
-	r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
-	sys_cpuid = ri.Cvar_Get("sys_cpuid", "0", 0);
-	r_sse = ri.Cvar_Get("r_sse", "0", CVAR_ARCHIVE);
-	r_static_shaderdata0 = ri.Cvar_Get("r_static_shaderdata0", "0", CVAR_SYSTEMINFO);
-	r_static_shaderdata1 = ri.Cvar_Get("r_static_shaderdata1", "0", CVAR_SYSTEMINFO);
-	r_static_shaderdata2 = ri.Cvar_Get("r_static_shaderdata2", "0", CVAR_SYSTEMINFO);
-	r_static_shaderdata3 = ri.Cvar_Get("r_static_shaderdata3", "0", CVAR_SYSTEMINFO);
-	r_static_shadermultiplier0 = ri.Cvar_Get("r_static_shadermultiplier0", "1", CVAR_SYSTEMINFO);
-	r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
-	r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
-	r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
-	r_precacheimages = (cvar_t*)Cvar_Get("r_precacheimages", "0", 0);
-	ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
-	ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
-	r_alpha_foliage1 = ri.Cvar_Get("r_alpha_foliage1", "0.75", CVAR_CHEAT);
-	r_alpha_foliage2 = ri.Cvar_Get("r_alpha_foliage2", "0.75", CVAR_CHEAT);
-	r_blendtrees = ri.Cvar_Get("r_blendtrees", "0", CVAR_LATCH);
-	r_blendbushes = ri.Cvar_Get("r_blendbushes", "0", CVAR_LATCH);
-	fps = ri.Cvar_Get("fps", "0", 0);
-	r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
-	r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
-
-	r_ext_multisample = ri.Cvar_Get("r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_ext_texture_filter_anisotropic = ri.Cvar_Get("r_ext_texture_filter_anisotropic",
-		"0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_stereoEnabled = ri.Cvar_Get("r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
-
-	// make sure all the commands added here are also
-	// removed in R_Shutdown
-	ri.Cmd_AddCommand( "imagelist", R_ImageList_f );
-	ri.Cmd_AddCommand( "shaderlist", R_ShaderList_f );
-	ri.Cmd_AddCommand( "skinlist", R_SkinList_f );
-	ri.Cmd_AddCommand( "modellist", R_Modellist_f );
-	ri.Cmd_AddCommand( "modelist", R_ModeList_f );
-	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
-	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
-	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
-	ri.Cmd_AddCommand( "farplane_info", FarPlaneInfo_f );
-	ri.Cmd_AddCommand( "r_infostaticmodels", R_InfoStaticModels_f );
-	ri.Cmd_AddCommand( "r_infoworldtris", R_InfoWorldTris_f );
-
-	//
-	// Added in OPM
-	//
-
-    r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
-    r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
-
-	ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
-}
-
-void R_InitExtensions() {
-	// FIXME: qglTextureEnvCombineExists
-	glState.cntTexEnvExt = 0;
-	glState.cntnvblendmode = 0;
-
-	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, 34165.0);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, 8448.0);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, 0x47057700);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, 0x44400000);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 5890.0);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, 0x44400000);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, 0x47057700);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, 770.0);
-}
-
-/*
-===============
-R_Init
-===============
-*/
-void R_Init( void ) {	
-	int	err;
-	int i;
-	byte *ptr;
-
-	ri.Printf( PRINT_ALL, "----- R_Init -----\n" );
-
-	// clear all our internal state
-	Com_Memset( &tr, 0, sizeof( tr ) );
-	Com_Memset( &backEnd, 0, sizeof( backEnd ) );
-	Com_Memset( &tess, 0, sizeof( tess ) );
-
-//	Swap_Init();
-
-	if ( (intptr_t)tess.xyz & 15 ) {
-		Com_Printf( "WARNING: tess.xyz not 16 byte aligned\n" );
-	}
-	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );
-
-	tr.worldEntity.e.shaderRGBA[0] = -1;
-	tr.worldEntity.e.shaderRGBA[1] = 0;
-	tr.worldEntity.e.shaderRGBA[2] = -1;
-	tr.worldEntity.e.shaderRGBA[3] = -1;
-
-	//
-	// init function tables
-	//
-	for ( i = 0; i < FUNCTABLE_SIZE; i++ )
-	{
-		tr.sinTable[i]		= sin( DEG2RAD( i * 360.0f / ( ( float ) ( FUNCTABLE_SIZE - 1 ) ) ) );
-		tr.squareTable[i]	= ( i < FUNCTABLE_SIZE/2 ) ? 1.0f : -1.0f;
-		tr.sawToothTable[i] = (float)i / FUNCTABLE_SIZE;
-		tr.inverseSawToothTable[i] = 1.0f - tr.sawToothTable[i];
-
-		if ( i < FUNCTABLE_SIZE / 2 )
-		{
-			if ( i < FUNCTABLE_SIZE / 4 )
-			{
-				tr.triangleTable[i] = ( float ) i / ( FUNCTABLE_SIZE / 4 );
-			}
-			else
-			{
-				tr.triangleTable[i] = 1.0f - tr.triangleTable[i-FUNCTABLE_SIZE / 4];
-			}
-		}
-		else
-		{
-			tr.triangleTable[i] = -tr.triangleTable[i-FUNCTABLE_SIZE/2];
-		}
-	}
-
-	tr.rendererhandle = ri.Milliseconds();
-
-	if (!tr.rendererhandle) {
-		tr.rendererhandle = -1;
-	}
-
-	R_NoiseInit();
-
-	R_Sky_Init();
-
-	R_Register();
-
-	max_polys = r_maxpolys->integer;
-	if (max_polys < MAX_POLYS)
-		max_polys = MAX_POLYS;
-
-	max_polyverts = r_maxpolyverts->integer;
-	if (max_polyverts < MAX_POLYVERTS)
-		max_polyverts = MAX_POLYVERTS;
-
-	max_termarks = r_maxtermarks->integer;
-	if (max_termarks < MAX_TERMARKS)
-		max_termarks = MAX_TERMARKS;
-
-	ptr = ri.Malloc(sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
-	backEndData[0] = (backEndData_t*)ptr;
-	backEndData[0]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[0]));
-	backEndData[0]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys);
-	backEndData[0]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-	backEndData[0]->staticModels = NULL;
-	backEndData[0]->staticModelData = NULL;
-	if (r_smp->integer) {
-		ptr = ri.Malloc(sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-		backEndData[1] = (backEndData_t*)ptr;
-		backEndData[1]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[1]));
-		backEndData[1]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys);
-		backEndData[1]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-		backEndData[1]->staticModels = NULL;
-		backEndData[1]->staticModelData = NULL;
-	}
-	else {
-		backEndData[1] = NULL;
-	}
-	R_ToggleSmpFrame();
-
-	InitOpenGL();
-
-	R_InitExtensions();
-
-	R_InitImages();
-
-	R_StartupShaders();
-
-	R_ModelInit();
-
-	R_LevelMarksInit();
-
-	tr.pFontDebugStrings = R_LoadFont("verdana-14");
-	g_bInfoworldtris = qfalse;
-
-	err = qglGetError();
-	if ( err != GL_NO_ERROR )
-		ri.Printf (PRINT_ALL, "glGetError() = 0x%x\n", err);
-
-	ri.Printf( PRINT_ALL, "----- finished R_Init -----\n" );
-}
-
-/*
-===============
-RE_Shutdown
-===============
-*/
-void RE_Shutdown( qboolean destroyWindow ) {	
-
-	ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
-
-	ri.Cmd_RemoveCommand ("modellist");
-	ri.Cmd_RemoveCommand ("screenshotJPEG");
-	ri.Cmd_RemoveCommand ("screenshot");
-	ri.Cmd_RemoveCommand ("imagelist");
-	ri.Cmd_RemoveCommand ("shaderlist");
-	ri.Cmd_RemoveCommand ("skinlist");
-	ri.Cmd_RemoveCommand ("gfxinfo");
-	ri.Cmd_RemoveCommand( "modelist" );
-	ri.Cmd_RemoveCommand( "shaderstate" );
-
-
-	if ( tr.registered ) {
-		R_SyncRenderThread();
-		R_ShutdownCommandBuffers();
-		R_DeleteTextures();
-	}
-
-	// shut down platform specific OpenGL stuff
-	if ( destroyWindow ) {
-		GLimp_Shutdown();
-
-		Com_Memset( &glConfig, 0, sizeof( glConfig ) );
-		textureFilterAnisotropic = qfalse;
-		maxAnisotropy = 0;
-		displayAspect = 0.0f;
-		haveClampToEdge = qfalse;
-
-		Com_Memset( &glState, 0, sizeof( glState ) );
-	}
-
-	tr.registered = qfalse;
-}
-
-extern qboolean scr_initialized;
-
-/*
-** RE_BeginRegistration
-*/
-void RE_BeginRegistration(glconfig_t* glconfigOut) {
-
-	UI_LoadResource("*123");
-	scr_initialized = 0;
-
-	R_SyncRenderThread();
-
-	R_LevelMarksFree();
-	ri.Hunk_Clear();
-
-	*glconfigOut = glConfig;
-
-	r_sequencenumber++;
-	tr.viewCluster = -1;		// force markleafs to regenerate
-	R_ClearFlares();
-	RE_ClearScene();
-
-	// Added in OPM
-	//  Clear the world because some components
-	//  like the mark system access the world object
-	//  to free allocated marks
-	R_ClearWorld();
-
-	R_SetupShaders();
-	R_InitLensFlare();
-	R_LevelMarksInit();
-
-	tr.registered = qtrue;
-
-	scr_initialized = 1;
-	UI_LoadResource("*124");
-}
-
-/*
-=============
-RE_EndRegistration
-
-Touch all images to make sure they are resident
-=============
-*/
-void RE_EndRegistration( void ) {
-	R_SyncRenderThread();
-	if (r_precacheimages->integer) {
-		int start, end;
-
-		start = Sys_Milliseconds();
-
-		RB_ShowImages(qtrue);
-
-		end = Sys_Milliseconds();
-
-		Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
-	}
-
-	R_FreeUnusedImages();
-}
-
-/*
-=============
-RE_SetRenderTime
-=============
-*/
-void RE_SetRenderTime(int t) {
-	backEnd.refdef.floatTime = (long double)t / 1000.0;
-	R_UpdateGhostTextures();
-}
-
-/*
-@@@@@@@@@@@@@@@@@@@@@
-GetRefAPI
-
-@@@@@@@@@@@@@@@@@@@@@
-*/
-refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
-	static refexport_t	re;
-
-	ri = *rimp;
-
-	Com_Memset( &re, 0, sizeof( re ) );
-
-	if ( apiVersion != REF_API_VERSION ) {
-		ri.Printf(PRINT_ALL, "Mismatched REF_API_VERSION: expected %i, got %i\n", 
-			REF_API_VERSION, apiVersion );
-		return NULL;
-	}
-
-	R_Init();
-
-	// the RE_ functions are Renderer Entry points
-
-	re.Shutdown = RE_Shutdown;
-
-	re.FreeModels = RE_FreeModels;
-	re.BeginRegistration = RE_BeginRegistration;
-	re.EndRegistration = RE_EndRegistration;
-	re.RegisterModel = RE_RegisterModel;
-	re.SpawnEffectModel = RE_SpawnEffectModel;
-	re.RegisterServerModel = RE_RegisterServerModel;
-	re.UnregisterServerModel = RE_UnregisterServerModel;
-	re.RegisterShader = RE_RegisterShader;
-	re.RegisterShaderNoMip = RE_RegisterShaderNoMip;
-	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
-	re.LoadWorld = RE_LoadWorldMap;
-	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
-	re.MapVersion = RE_MapVersion;
-	re.LoadFont = R_LoadFont;
-	re.SetWorldVisData = RE_SetWorldVisData;
-
-	re.BeginFrame = RE_BeginFrame;
-	re.EndFrame = RE_EndFrame;
-
-	re.MarkFragments = R_MarkFragments;
-	re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
-	re.GetInlineModelBounds = R_GetInlineModelBounds;
-	re.GetLightingForDecal = R_GetLightingForDecal;
-	re.GetLightingForSmoke = R_GetLightingForSmoke;
-	re.R_GatherLightSources = R_GatherLightSources;
-	re.ModelBounds = R_ModelBounds;
-	re.ModelRadius = R_ModelRadius;
-
-	re.ClearScene = RE_ClearScene;
-	re.AddRefEntityToScene = RE_AddRefEntityToScene;
-	re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
-	re.AddPolyToScene = RE_AddPolyToScene;
-	re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
-	re.AddLightToScene = RE_AddLightToScene;
-	re.RenderScene = RE_RenderScene;
-	re.GetRenderEntity = RE_GetRenderEntity;
-
-	re.SavePerformanceCounters = R_SavePerformanceCounters;
-
-	re.R_Model_GetHandle = R_Model_GetHandle;
-	re.SetColor = Draw_SetColor;
-	re.DrawStretchPic = Draw_StretchPic;
-	re.DrawStretchPic2 = Draw_StretchPic2;
-	re.DrawStretchRaw = RE_StretchRaw;
-	re.DebugLine = R_DebugLine;
-	re.DrawTilePic = Draw_TilePic;
-	re.DrawTilePicOffset = Draw_TilePicOffset;
-	re.DrawTrianglePic = Draw_TrianglePic;
-	re.DrawBox = DrawBox;
-	re.AddBox = AddBox;
-	re.Set2DWindow = Set2DWindow;
-	re.Scissor = RE_Scissor;
-	re.DrawLineLoop = DrawLineLoop;
-	re.DrawString = R_DrawString;
-	re.GetFontHeight = R_GetFontHeight;
-	re.GetFontStringWidth = R_GetFontStringWidth;
-	re.SwipeBegin = RE_SwipeBegin;
-	re.SwipeEnd = RE_SwipeEnd;
-	re.SetRenderTime = RE_SetRenderTime;
-	re.Noise = R_NoiseGet4f;
-
-	re.SetMode = R_SetMode;
-	re.SetFullscreen = R_SetFullscreen;
-
-	re.GetShaderHeight = RE_GetShaderHeight;
-	re.GetShaderWidth = RE_GetShaderWidth;
-	re.GetShaderName = RE_GetShaderName;
-	re.GetModelName = RE_GetModelName;
-	re.GetGraphicsInfo = RE_GetGraphicsInfo;
-	re.ForceUpdatePose = RE_ForceUpdatePose;
-	re.TIKI_Orientation = RE_TIKI_Orientation;
-	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
-	re.SetFrameNumber = RE_SetFrameNumber;
-
-	return &re;
-}
diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
deleted file mode 100644
index 7d076f34..00000000
--- a/code/renderer/tr_light.c
+++ /dev/null
@@ -1,1608 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2015-2024 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_light.c
-
-#include "tr_local.h"
-
-#define DLIGHT_AT_RADIUS 16
-// at the edge of a dlight's influence, this amount of light will be added
-
-#define DLIGHT_MINIMUM_RADIUS 16
-
-// never calculate a range less than this to prevent huge light numbers
-
-typedef struct {
-    dlight_t *dl;
-    float     power;
-    vec3_t    origin;
-} incidentLight_t;
-
-typedef struct {
-    int             dlightMap;
-    int             allocated[LIGHTMAP_SIZE];
-    byte            lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
-    byte           *srcBase;
-    byte           *dstBase;
-    incidentLight_t lights[32];
-    int             numLights;
-} dlightInfo_t;
-
-typedef struct {
-    vec3_t point;
-    int    s;
-    int    t;
-} patchLightBlock_t;
-
-dlightInfo_t dli;
-
-void     R_SetupEntityLightingGrid(trRefEntity_t *ent);
-qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst);
-qboolean R_AllocLMBlock(int w, int h, int *x, int *y);
-
-/*
-===============
-R_RecursiveDlightPatch
-===============
-*/
-static int R_RecursiveDlightPatch(patchLightBlock_t *plb)
-{
-    patchLightBlock_t cut[4];
-    qboolean          added;
-    int               index;
-
-    if (plb[0].s < plb[1].s - 1) {
-        cut[0] = plb[0];
-        cut[2] = plb[2];
-
-        VectorAdd(plb[0].point, plb[1].point, cut[1].point);
-        VectorScale(cut[1].point, 0.5f, cut[1].point);
-        VectorAdd(plb[2].point, plb[3].point, cut[3].point);
-        VectorScale(cut[3].point, 0.5f, cut[3].point);
-
-        cut[3].s = (plb[0].s + plb[1].s) >> 1;
-        cut[1].s = cut[3].s;
-        cut[1].t = plb[0].t;
-        cut[3].t = plb[2].t;
-
-        added = R_RecursiveDlightPatch(cut);
-
-        cut[0] = cut[1];
-        cut[2] = cut[3];
-
-        index = 1;
-    } else if (plb[0].t < plb[2].t - 1) {
-        cut[0] = plb[0];
-        cut[1] = plb[1];
-
-        VectorAdd(plb[0].point, plb[2].point, cut[2].point);
-        VectorScale(cut[2].point, 0.5f, cut[2].point);
-        VectorAdd(plb[1].point, plb[3].point, cut[3].point);
-        VectorScale(cut[3].point, 0.5f, cut[3].point);
-
-        cut[3].t = (plb[0].t + plb[2].t) >> 1;
-        cut[2].t = cut[3].t;
-        cut[2].s = plb[0].s;
-        cut[3].s = plb[1].s;
-
-        added  = R_RecursiveDlightPatch(cut);
-        cut[0] = cut[2];
-        cut[1] = cut[3];
-
-        index = 2;
-    } else {
-        return R_DlightSample(
-            &dli.srcBase[plb[0].t * (LIGHTMAP_SIZE * 3) + plb[0].s * 3],
-            plb[0].point,
-            &dli.dstBase[plb[0].t * (LIGHTMAP_SIZE * 4) + plb[0].s * 4]
-        );
-    }
-
-    cut[index] = plb[index];
-    cut[3]     = plb[3];
-
-    return R_RecursiveDlightPatch(cut) + added;
-}
-
-/*
-===============
-R_RealDlightPatch
-===============
-*/
-int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
-{
-    int         x, y;
-    int         i, j;
-    int         i2, j2;
-    int         steps[2][2];
-    dlight_t   *dl;
-    qboolean    added;
-    float      *origin;
-    drawVert_t *dv;
-
-    if (!srf->lmHeight || !srf->lmWidth) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    dli.numLights = 0;
-
-    for (i = 0; i < tr.refdef.num_dlights; i++) {
-        if (!(dlightBits & (1 << i))) {
-            continue;
-        }
-
-        dl = &tr.refdef.dlights[i];
-        if (dl->origin[0] + dl->radius < srf->meshBounds[0][0] || dl->origin[0] - dl->radius > srf->meshBounds[1][0]
-            || dl->origin[1] + dl->radius < srf->meshBounds[0][1] || dl->origin[1] - dl->radius > srf->meshBounds[1][1]
-            || dl->origin[2] + dl->radius < srf->meshBounds[0][2]
-            || dl->origin[2] - dl->radius > srf->meshBounds[1][2]) {
-            dlightBits &= ~(1 << i);
-            continue;
-        }
-
-        VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
-        dli.lights[dli.numLights].dl    = dl;
-        dli.lights[dli.numLights].power = 1.f / dl->radius;
-        dli.numLights++;
-    }
-
-    if (!dli.numLights) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    dli.srcBase = srf->lmData;
-    dli.dstBase = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
-    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
-
-    tr.pc.c_dlightSurfaces++;
-    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
-
-    added = qfalse;
-
-    if (srf->verts[srf->width - 1].lightmap[0] != srf->verts[0].lightmap[0]) {
-        if (srf->verts[srf->width - 1].lightmap[0] < srf->verts[0].lightmap[0]) {
-            steps[0][0] = 0;
-            steps[0][1] = -1;
-        } else {
-            steps[0][0] = 0;
-            steps[0][1] = 1;
-        }
-
-        if (srf->verts[srf->width * (srf->height - 1)].lightmap[1] < srf->verts[0].lightmap[1]) {
-            steps[1][0] = -1;
-            steps[1][1] = 0;
-        } else {
-            steps[1][0] = 1;
-            steps[1][1] = 0;
-        }
-    } else {
-        if (srf->verts[srf->width * (srf->height - 1)].lightmap[0] < srf->verts[0].lightmap[0]) {
-            steps[0][0] = -1;
-            steps[0][1] = 0;
-        } else {
-            steps[0][0] = 1;
-            steps[0][1] = 0;
-        }
-
-        if (srf->verts[srf->width - 1].lightmap[1] < srf->verts[0].lightmap[1]) {
-            steps[1][0] = 0;
-            steps[1][1] = -1;
-        } else {
-            steps[1][0] = 0;
-            steps[1][1] = 1;
-        }
-    }
-
-    for (i = 0; i < srf->height; i++) {
-        for (j = 0; j < srf->width; j++) {
-            patchLightBlock_t plb[4];
-
-            //
-            // Vert 1
-            //
-
-            dv = &srf->verts[i * srf->width + j];
-
-            VectorCopy(dv->xyz, plb[0].point);
-            plb[0].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
-            plb[0].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
-
-            //
-            // Vert 2
-            //
-
-            i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
-            dv = &srf->verts[i2 * srf->width + j2];
-
-            VectorCopy(dv->xyz, plb[1].point);
-            plb[1].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
-            plb[1].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
-
-            //
-            // Vert 3
-            //
-
-            i2 = Q_clamp_int(steps[1][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[1][1] + j, 0, srf->width - 1);
-            dv = &srf->verts[i2 * srf->width + j2];
-
-            VectorCopy(dv->xyz, plb[2].point);
-            plb[2].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
-            plb[2].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
-
-            //
-            // Vert 4
-            //
-
-            i2 = Q_clamp_int(steps[1][0] + steps[0][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[1][1] + steps[0][1] + j, 0, srf->width - 1);
-            dv = &srf->verts[i2 * srf->width + j2];
-
-            VectorCopy(dv->xyz, plb[3].point);
-            plb[3].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
-            plb[3].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
-
-            added |= R_RecursiveDlightPatch(plb);
-        }
-    }
-
-    if (!added) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    for (i = 0; i < srf->lmWidth; i++) {
-        dli.allocated[x + i] = srf->lmHeight + y;
-    }
-
-    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->dlightMap[tr.smpFrame];
-}
-
-/*
-===============
-R_RealDlightFace
-===============
-*/
-int R_RealDlightFace(srfSurfaceFace_t *srf, int dlightBits)
-{
-    int       x, y;
-    byte     *src, *dst;
-    int       i, j;
-    vec3_t    vec;
-    vec3_t    vecStepS, vecStepT;
-    dlight_t *dl;
-    float     d;
-    qboolean  added;
-    float    *origin;
-
-    if (!srf->lmHeight || !srf->lmWidth) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    dli.numLights = 0;
-
-    for (i = 0; i < tr.refdef.num_dlights; i++) {
-        if (!(dlightBits & (1 << i))) {
-            continue;
-        }
-
-        dl = &tr.refdef.dlights[i];
-
-        d = DotProduct(dl->transformed, srf->plane.normal) - srf->plane.dist;
-
-        if ((d < 0.f && !r_dlightBacks->integer) || (d > dl->radius || d < -dl->radius)) {
-            // dlight doesn't reach the plane
-            dlightBits &= ~(1 << i);
-        } else {
-            VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
-            dli.lights[dli.numLights].dl    = dl;
-            dli.lights[dli.numLights].power = 1.0 / dl->radius;
-            dli.numLights++;
-        }
-    }
-
-    if (!dli.numLights) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    src = srf->lmData;
-    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
-    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
-
-    tr.pc.c_dlightSurfaces++;
-    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
-
-    VectorCopy(srf->lmVecs[0], vecStepS);
-    VectorMA(srf->lmVecs[1], -srf->lmWidth, srf->lmVecs[0], vecStepT);
-
-    added = qfalse;
-    VectorCopy(srf->lmOrigin, vec);
-
-    for (i = 0; i < srf->lmHeight; i++) {
-        for (j = 0; j < srf->lmWidth; j++) {
-            added |= R_DlightSample(src, vec, dst);
-            VectorAdd(vec, vecStepS, vec);
-            src += 3;
-            dst += 4;
-        }
-
-        VectorAdd(vec, vecStepT, vec);
-        src += (LIGHTMAP_SIZE - j) * 3;
-        dst += (LIGHTMAP_SIZE - j) * 4;
-    }
-
-    if (!added) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    for (i = 0; i < srf->lmWidth; i++) {
-        dli.allocated[x + i] = srf->lmHeight + y;
-    }
-
-    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->dlightMap[tr.smpFrame];
-}
-
-/*
-===============
-R_RealDlightTerrain
-===============
-*/
-int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
-{
-    dlight_t *dl;
-    int       x, y;
-    byte     *dst, *src;
-    vec3_t    vec;
-    float     delta, dist;
-    float    *origin;
-    int       i, j, k;
-    int       di, dj;
-    qboolean  added;
-    float     lmScale;
-    int       lumelsPerHeight;
-    float     heightPerLumelSquared;
-    float     z00, z01;
-    float     z10, z11;
-
-    dli.numLights = 0;
-
-    for (i = 0; i < tr.refdef.num_dlights; i++) {
-        dl = &tr.refdef.dlights[i];
-
-        if (dl->radius < srf->x0 - dl->transformed[0] || -512.f - dl->radius > srf->x0 - dl->transformed[0]
-            || -512.f - dl->radius > srf->y0 - dl->transformed[1] || dl->radius < srf->y0 - dl->transformed[1]) {
-            continue;
-        }
-
-        if (dl->radius > 128.f) {
-            dist = 0.f;
-
-            delta = dl->transformed[0] - srf->x0;
-            if (delta <= 0.f) {
-                dist += delta * delta;
-            } else {
-                delta -= 512.f;
-                if (delta > 0.f) {
-                    dist += delta * delta;
-                }
-            }
-
-            delta = dl->transformed[1] - srf->y0;
-            if (delta <= 0.f) {
-                dist += delta * delta;
-            } else {
-                delta -= 512.f;
-                if (delta > 0.f) {
-                    dist += delta * delta;
-                }
-            }
-
-            delta = dl->transformed[2] - srf->z0;
-            if (delta <= 0.f) {
-                dist += delta * delta;
-            } else {
-                delta -= srf->zmax;
-                if (delta > 0.f) {
-                    dist += delta * delta;
-                }
-            }
-
-            if (dl->radius * dl->radius < dist) {
-                continue;
-            }
-        }
-
-        VectorCopy(dl->origin, dli.lights[dli.numLights].origin);
-        dli.lights[dli.numLights].dl    = dl;
-        dli.lights[dli.numLights].power = 1.f / dl->radius;
-        dli.numLights++;
-    }
-
-    if (!dli.numLights) {
-        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    if (!R_AllocLMBlock(srf->drawinfo.lmapSize, srf->drawinfo.lmapSize, &x, &y)) {
-        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    src = srf->drawinfo.lmData;
-    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-    srf->drawinfo.lmapX = x / (float)LIGHTMAP_SIZE;
-    srf->drawinfo.lmapY = y / (float)LIGHTMAP_SIZE;
-
-    tr.pc.c_dlightSurfaces++;
-    tr.pc.c_dlightTexels += srf->drawinfo.lmapSize * srf->drawinfo.lmapSize;
-
-    added = qfalse;
-
-    lumelsPerHeight = 64.f / srf->drawinfo.lmapStep;
-    if (lumelsPerHeight == 1) {
-        vec[1] = srf->y0;
-
-        for (i = 0; i < 9; i++) {
-            vec[0] = srf->x0;
-
-            for (j = 0; j < 9; j++) {
-                vec[2] = srf->z0 + (int)(srf->heightmap[0] << 1);
-                added |= R_DlightSample(src, vec, dst);
-                src += 3;
-                dst += 4;
-                vec[0] += srf->drawinfo.lmapStep;
-            }
-
-            src += (LIGHTMAP_SIZE - 9) * 3;
-            dst += (LIGHTMAP_SIZE - 9) * 4;
-            vec[1] += srf->drawinfo.lmapStep;
-        }
-    } else if (lumelsPerHeight == 2) {
-        vec[1] = srf->y0;
-
-        k = 0;
-
-        for (j = 0; j < 8; j++) {
-            vec[0] = srf->x0;
-
-            for (i = 0; i < 8; i++) {
-                z00    = (int)srf->heightmap[k];
-                vec[2] = srf->z0 + z00 + z00;
-                added |= R_DlightSample(src, vec, dst);
-                src += 3;
-                dst += 4;
-                // increase lightmap step
-                vec[0] += srf->drawinfo.lmapStep;
-                k++;
-
-                z01    = (int)srf->heightmap[k];
-                vec[2] = srf->z0 + z00 + z01;
-                added |= R_DlightSample(src, vec, dst);
-                src += 3;
-                dst += 4;
-                vec[0] += srf->drawinfo.lmapStep;
-            }
-
-            vec[2] = srf->z0 + z01 + z01;
-            added |= R_DlightSample(src, vec, dst);
-            src += (LIGHTMAP_SIZE - 16) * 3;
-            dst += (LIGHTMAP_SIZE - 16) * 4;
-            k -= 8;
-
-            vec[0] = srf->x0;
-            vec[1] += srf->drawinfo.lmapStep;
-
-            for (i = 0; i < 8; i++) {
-                z00    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
-                vec[2] = srf->z0 + z00;
-                added |= R_DlightSample(src, vec, dst);
-                src += 3;
-                dst += 4;
-                k++;
-                vec[0] += srf->drawinfo.lmapStep;
-
-                z01    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
-                vec[2] = srf->z0 + (z00 + z01) * 0.5f;
-                added |= R_DlightSample(src, vec, dst);
-                src += 3;
-                dst += 4;
-                vec[0] += srf->drawinfo.lmapStep;
-            }
-
-            vec[2] = srf->z0 + z01;
-            added |= R_DlightSample(src, vec, dst);
-            src += (LIGHTMAP_SIZE - 16) * 3;
-            dst += (LIGHTMAP_SIZE - 16) * 4;
-            k++;
-            vec[0] += srf->drawinfo.lmapStep;
-            vec[1] += srf->drawinfo.lmapStep;
-        }
-
-        vec[0] = srf->x0;
-
-        for (i = 0; i < 8; i++) {
-            z00    = (int)srf->heightmap[k];
-            vec[2] = srf->z0 + z00 + z00;
-            k++;
-            added |= R_DlightSample(src, vec, dst);
-            src += 3;
-            dst += 4;
-            vec[0] += srf->drawinfo.lmapStep;
-
-            z01    = (int)srf->heightmap[k];
-            vec[2] = srf->z0 + z00 + z01;
-            added |= R_DlightSample(src, vec, dst);
-            src += 3;
-            dst += 4;
-            vec[0] += srf->drawinfo.lmapStep;
-        }
-
-        vec[2] = srf->z0 + z01 + z01;
-        added |= R_DlightSample(src, vec, dst);
-        vec[0] += srf->drawinfo.lmapStep;
-        vec[1] += srf->drawinfo.lmapStep;
-    } else {
-        vec[1] = srf->y0;
-
-        for (j = 0; j < 8; j++) {
-            dj = 0;
-
-            for (;;) {
-                if (j == 7) {
-                    if (dj >= lumelsPerHeight + 1) {
-                        break;
-                    }
-                } else if (dj >= lumelsPerHeight) {
-                    break;
-                }
-
-                vec[0] = srf->x0;
-
-                for (i = 0; i < 8; i++) {
-                    for (;;) {
-                        if (i == 7) {
-                            if (di >= lumelsPerHeight + 1) {
-                                break;
-                            }
-                        } else if (dj >= lumelsPerHeight) {
-                            break;
-                        }
-
-                        di  = 0;
-                        z00 = (int)srf->heightmap[9 * j + i];
-                        z01 = (int)srf->heightmap[9 * (j + 1) + i];
-                        z10 = (int)srf->heightmap[9 * j + (i + 1)];
-                        z11 = (int)srf->heightmap[9 * (j + 1) + (i + 1)];
-
-                        heightPerLumelSquared = 2.f / (lumelsPerHeight * lumelsPerHeight);
-
-                        vec[2] =
-                            srf->z0
-                            + (dj * (di * z11) + (lumelsPerHeight - dj) * (z10 * di) + z01 * (lumelsPerHeight - di) * dj
-                               + z00 * (lumelsPerHeight - di) * (lumelsPerHeight - dj))
-                                  * heightPerLumelSquared;
-
-                        added |= R_DlightSample(src, vec, dst);
-                        src += 3;
-                        dst += 4;
-
-                        vec[0] += srf->drawinfo.lmapStep;
-                    }
-                }
-
-                src += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 3;
-                dst += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 4;
-                vec[1] += srf->drawinfo.lmapStep;
-            }
-        }
-    }
-
-    if (!added) {
-        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    for (i = 0; i < srf->drawinfo.lmapSize; i++) {
-        dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
-    }
-
-    lmScale = (1.0 / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
-    srf->drawinfo.lmapX -= (srf->x0 * lmScale - (0.5 / LIGHTMAP_SIZE));
-    srf->drawinfo.lmapY -= (srf->y0 * lmScale - (0.5 / LIGHTMAP_SIZE));
-
-    srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->drawinfo.dlightMap[tr.smpFrame];
-}
-
-/*
-===============
-R_TransformDlights
-
-Transforms the origins of an array of dlights.
-Used by both the front end (for DlightBmodel) and
-the back end (before doing the lighting calculation)
-===============
-*/
-void R_TransformDlights(int count, dlight_t *dl, orientationr_t *ori)
-{
-    int    i;
-    vec3_t temp;
-
-    for (i = 0; i < count; i++, dl++) {
-        VectorSubtract(dl->origin, ori->origin, temp);
-        dl->transformed[0] = DotProduct(temp, ori->axis[0]);
-        dl->transformed[1] = DotProduct(temp, ori->axis[1]);
-        dl->transformed[2] = DotProduct(temp, ori->axis[2]);
-    }
-}
-
-/*
-=============
-R_DlightBmodel
-
-Determine which dynamic lights may effect this bmodel
-=============
-*/
-void R_DlightBmodel(bmodel_t *bmodel)
-{
-    int         i, j;
-    dlight_t   *dl;
-    int         mask;
-    msurface_t *surf;
-
-    // transform all the lights
-    R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.ori);
-
-    mask = 0;
-    for (i = 0; i < tr.refdef.num_dlights; i++) {
-        dl = &tr.refdef.dlights[i];
-
-        // see if the point is close enough to the bounds to matter
-        for (j = 0; j < 3; j++) {
-            if (dl->transformed[j] - bmodel->bounds[1][j] > dl->radius) {
-                break;
-            }
-            if (bmodel->bounds[0][j] - dl->transformed[j] > dl->radius) {
-                break;
-            }
-        }
-        if (j < 3) {
-            continue;
-        }
-
-        // we need to check this light
-        mask |= 1 << i;
-    }
-
-    tr.currentEntity->needDlights = (mask != 0);
-
-    // set the dlight bits in all the surfaces
-    for (i = 0; i < bmodel->numSurfaces; i++) {
-        surf = bmodel->firstSurface + i;
-
-        if (*surf->data == SF_FACE) {
-            ((srfSurfaceFace_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
-        } else if (*surf->data == SF_GRID) {
-            ((srfGridMesh_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
-        } else if (*surf->data == SF_TRIANGLES) {
-            ((srfTriangles_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
-        }
-    }
-}
-
-/*
-===============
-R_GetLightGridPalettedColor
-===============
-*/
-static byte *R_GetLightGridPalettedColor(int iColor)
-{
-    return &tr.world->lightGridPalette[iColor * 3];
-}
-
-/*
-===============
-R_GetLightingGridValue
-===============
-*/
-void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
-{
-    byte  *pColor;
-    int    iBaseOffset;
-    int    i;
-    int    iOffset;
-    int    iRowPos;
-    int    iData;
-    int    iLen;
-    int    iGridPos[3];
-    int    iArrayXStep;
-    float  fV;
-    float  fFrac[3];
-    float  fOMFrac[3];
-    float  fWeight, fWeight2;
-    float  fTotalFactor;
-    int    iCurData;
-    vec3_t vLightOrigin;
-    byte  *pCurData;
-
-    if (!tr.world || !tr.world->lightGridData || !tr.world->lightGridOffsets) {
-        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-        return;
-    }
-
-    VectorSubtract(vPos, tr.world->lightGridMins, vLightOrigin);
-
-    for (i = 0; i < 3; i++) {
-        fV          = vLightOrigin[i] * tr.world->lightGridOOSize[i];
-        iGridPos[i] = floor(fV);
-        fFrac[i]    = fV - iGridPos[i];
-        fOMFrac[i]  = 1.0 - fFrac[i];
-
-        if (iGridPos[i] < 0) {
-            iGridPos[i] = 0;
-        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
-            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
-        }
-    }
-
-    fTotalFactor = 0;
-    iArrayXStep  = tr.world->lightGridBounds[1];
-    iBaseOffset  = tr.world->lightGridBounds[0] + iGridPos[1] + iArrayXStep * iGridPos[0];
-    VectorClear(vLight);
-
-    for (i = 0; i < 4; i++) {
-        qboolean bContinue = qfalse;
-
-        switch (i) {
-        case 0:
-            fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
-            fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
-            iOffset  = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
-            break;
-        case 1:
-            fWeight  = fOMFrac[0] * fFrac[1] * fOMFrac[2];
-            fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
-            iOffset  = tr.world->lightGridOffsets[iBaseOffset + 1] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
-            break;
-        case 2:
-            fWeight  = fFrac[0] * fOMFrac[1] * fOMFrac[2];
-            fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
-            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]
-                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
-            break;
-        case 3:
-            fWeight  = fFrac[0] * fFrac[1] * fOMFrac[2];
-            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
-            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]
-                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
-            break;
-        }
-
-        iRowPos  = iGridPos[2];
-        pCurData = &tr.world->lightGridData[iOffset];
-        iData    = 0;
-
-        while (1) {
-            while (1) {
-                iCurData = (char)pCurData[iData];
-                iData++;
-                if (iCurData >= 0) {
-                    break;
-                }
-
-                iLen = -iCurData;
-                if (iLen > iRowPos) {
-                    iData += iRowPos;
-
-                    if (pCurData[iData]) {
-                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-                        VectorMA(vLight, fWeight, pColor, vLight);
-                        fTotalFactor += fWeight;
-                    }
-
-                    iData++;
-                    if (iLen - 1 == iRowPos) {
-                        iData++;
-                    }
-
-                    if (pCurData[iData]) {
-                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-                        VectorMA(vLight, fWeight2, pColor, vLight);
-                        fTotalFactor += fWeight2;
-                    }
-
-                    bContinue = qtrue;
-                    break;
-                }
-
-                iRowPos -= iLen;
-                iData += iLen;
-            }
-
-            if (bContinue) {
-                break;
-            }
-
-            iLen = iCurData + 2;
-            if (iLen - 1 >= iRowPos) {
-                break;
-            }
-
-            iRowPos -= iLen;
-            iData++;
-        }
-
-        if (bContinue) {
-            continue;
-        }
-
-        if (iLen - 1 > iRowPos) {
-            if (!pCurData[iData]) {
-                continue;
-            }
-
-            pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-            VectorMA(vLight, fWeight + fWeight2, pColor, vLight);
-            fTotalFactor += fWeight + fWeight2;
-        } else {
-            if (pCurData[iData]) {
-                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-                VectorMA(vLight, fWeight, pColor, vLight);
-                fTotalFactor += fWeight;
-            }
-
-            iData += 2;
-            if (pCurData[iData]) {
-                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-                VectorMA(vLight, fWeight2, pColor, vLight);
-                fTotalFactor += fWeight2;
-            }
-        }
-    }
-
-    if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
-        VectorScale(vLight, 1.0 / fTotalFactor, vLight);
-    }
-
-    if (fTotalFactor) {
-        if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-            float t;
-            // normalize color values
-            t = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-            VectorScale(vLight, t, vLight);
-        }
-    } else {
-        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-    }
-}
-
-/*
-===============
-R_GetLightingGridValueFast
-===============
-*/
-void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
-{
-    byte      *pColor;
-    int        i;
-    int        iRowPos;
-    int        iGridPos[3];
-    int        iArrayXStep;
-    float      fV[3];
-    vec3_t     vLightOrigin;
-    int        iData;
-    int        iLen;
-    int        iBaseOffset;
-    byte      *pCurData;
-    int        iOrder;
-    int        iToggle;
-    int        iSample[8];
-    float      fDist[3];
-    int        j, k;
-    static int iSearch[8][8] = {
-        {0, 4, 2, 6, 1, 5, 3, 7},
-        {0, 2, 4, 6, 1, 3, 5, 7},
-        {0, 0, 0, 0, 0, 0, 0, 0},
-        {0, 2, 1, 3, 4, 6, 5, 7},
-        {0, 4, 1, 5, 2, 6, 3, 7},
-        {0, 0, 0, 0, 0, 0, 0, 0},
-        {0, 1, 4, 5, 2, 3, 6, 7},
-        {0, 1, 2, 3, 4, 5, 6, 7}
-    };
-
-    if (!tr.world->lightGridData || !tr.world->lightGridOffsets) {
-        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-        return;
-    }
-
-    iOrder  = 0;
-    iToggle = 0;
-
-    for (i = 0; i < 3; i++) {
-        fV[i] =
-            (tr.world->lightGridSize[i] * 0.5 + vPos[i] - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i];
-        iGridPos[i] = floor(fV[i]);
-        fV[i] -= iGridPos[i];
-
-        if (iGridPos[i] < 0) {
-            iGridPos[i] = 0;
-            fV[i]       = 0.0;
-        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
-            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
-            fV[i]       = 1.0;
-        }
-
-        fDist[i] = 0.5 - fV[i];
-        if (fDist[i] < 0) {
-            fDist[i] = -fDist[i];
-            iToggle |= 1 << i;
-        }
-    }
-
-    if (fDist[1] >= fDist[0]) {
-        iOrder = 1;
-    }
-    if (fDist[2] >= fDist[0]) {
-        iOrder |= 2;
-    }
-    if (fDist[2] >= fDist[1]) {
-        iOrder |= 4;
-    }
-
-    for (i = 0; i < 8; i++) {
-        iSample[i] = -1;
-    }
-
-    iArrayXStep = tr.world->lightGridBounds[1];
-    iBaseOffset = iGridPos[1] + tr.world->lightGridBounds[0] + iGridPos[0] * tr.world->lightGridBounds[1];
-
-    for (i = 0; i < 8; i++) {
-        j = iSearch[iOrder][i] ^ iToggle;
-
-        if (iSample[j] < 0) {
-            switch (j & 3) {
-            case 0:
-                pCurData =
-                    &tr.world->lightGridData
-                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset]];
-                break;
-            case 1:
-                pCurData =
-                    &tr.world->lightGridData
-                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset + 1]];
-                break;
-            case 2:
-                pCurData = &tr.world->lightGridData
-                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
-                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]];
-                break;
-            case 3:
-            default:
-                pCurData = &tr.world->lightGridData
-                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
-                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]];
-                break;
-            }
-
-            k = j & ~1;
-
-            iRowPos = iGridPos[2];
-            iData   = 0;
-
-            while (1) {
-                qboolean bShouldBreak = qfalse;
-
-                for (; (char)pCurData[iData] >= 0; iData += 2, iRowPos -= iLen) {
-                    iLen = (char)pCurData[iData] + 2;
-
-                    if (iLen - 1 < iRowPos) {
-                        continue;
-                    }
-
-                    if (iLen - 1 > iRowPos) {
-                        iSample[k + 1] = pCurData[iData + 1];
-                        iSample[k]     = pCurData[iData + 1];
-                    } else {
-                        iSample[k]     = pCurData[iData + 1];
-                        iSample[k + 1] = pCurData[iData + 3];
-                    }
-
-                    bShouldBreak = qtrue;
-                    break;
-                }
-
-                if (bShouldBreak) {
-                    break;
-                }
-
-                if (-(char)pCurData[iData] > iRowPos) {
-                    iSample[k] = pCurData[iRowPos + iData + 1];
-
-                    if ((-(char)pCurData[iData] - 1) == iRowPos) {
-                        iSample[k + 1] = pCurData[iRowPos + iData + 3];
-                    } else {
-                        iSample[k + 1] = pCurData[iRowPos + iData + 2];
-                    }
-                    break;
-                }
-
-                iRowPos -= -(char)pCurData[iData];
-                iData += -(char)pCurData[iData] + 1;
-            }
-        }
-
-        if (iSample[j] > 0) {
-            pColor    = R_GetLightGridPalettedColor(iSample[j]);
-            vLight[0] = pColor[0];
-            vLight[1] = pColor[1];
-            vLight[2] = pColor[2];
-            return;
-        }
-    }
-
-    vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-}
-
-/*
-===============
-R_GetLightingForDecal
-===============
-*/
-void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
-{
-    float fMax;
-
-    R_GetLightingGridValue(vOrigin, vLight);
-
-    if (!tr.overbrightShift) {
-        return;
-    }
-
-    VectorScale(vLight, tr.overbrightMult, vLight);
-
-    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-        VectorScale(vLight, scale, vLight);
-    }
-}
-
-/*
-===============
-R_GetLightingForSmoke
-===============
-*/
-void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
-{
-    int       i;
-    dlight_t *dl;
-    float     power;
-    vec3_t    dir;
-    float     d;
-
-    if (r_smoothsmokelight->integer) {
-        R_GetLightingGridValue(vOrigin, vLight);
-    } else {
-        R_GetLightingGridValueFast(vOrigin, vLight);
-    }
-
-    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
-        dl = &backEnd.refdef.dlights[i];
-        VectorSubtract(dl->origin, vOrigin, dir);
-        d = VectorLengthSquared(dir);
-
-        power = dl->radius * dl->radius;
-        if (power >= d) {
-            d = dl->radius * 7500.0 / d;
-            VectorMA(vLight, d, dl->color, vLight);
-        }
-    }
-
-    if (tr.overbrightShift) {
-        vLight[0] = tr.overbrightMult * vLight[0];
-        vLight[1] = tr.overbrightMult * vLight[1];
-        vLight[2] = tr.overbrightMult * vLight[2];
-    }
-
-    // normalize
-    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-        VectorScale(vLight, scale, vLight);
-    }
-
-    vLight[0] /= 255.0;
-    vLight[1] /= 255.0;
-    vLight[2] /= 255.0;
-}
-
-/*
-===============
-RB_GetEntityGridLighting
-===============
-*/
-static int RB_GetEntityGridLighting()
-{
-    int       iColor;
-    int       i;
-    dlight_t *dl;
-    float     power;
-    vec3_t    vLight;
-    vec3_t    dir;
-    float     d;
-    float    *lightOrigin;
-
-    lightOrigin = backEnd.currentSphere->traceOrigin;
-    if (!(backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-        R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
-    } else {
-        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
-    }
-
-    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
-        dl = &backEnd.refdef.dlights[i];
-        VectorSubtract(dl->origin, lightOrigin, dir);
-        d = VectorLengthSquared(dir);
-
-        power = dl->radius * dl->radius;
-        if (power >= d) {
-            d = dl->radius * 7500.0 / d;
-            VectorMA(vLight, d, dl->color, vLight);
-        }
-    }
-
-    if (tr.overbrightShift) {
-        vLight[0] = tr.overbrightMult * vLight[0];
-        vLight[1] = tr.overbrightMult * vLight[1];
-        vLight[2] = tr.overbrightMult * vLight[2];
-    }
-
-    // normalize
-    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-        VectorScale(vLight, scale, vLight);
-    }
-
-    // clamp ambient
-    for (i = 0; i < 3; i++) {
-        if (vLight[i] > tr.identityLightByte) {
-            vLight[i] = tr.identityLightByte;
-        }
-    }
-
-    // save out the byte packet version
-    ((byte *)&iColor)[0] = myftol(vLight[0]);
-    ((byte *)&iColor)[1] = myftol(vLight[1]);
-    ((byte *)&iColor)[2] = myftol(vLight[2]);
-    ((byte *)&iColor)[3] = 0xff;
-
-    return iColor;
-
-#if 0
-	int				i;
-	dlight_t* dl;
-	float			power;
-	vec3_t			dir;
-	float			d;
-	vec3_t			lightDir;
-	vec3_t			lightOrigin;
-	int				ambientlightInt = 0;
-	trRefEntity_t	*ent = backEnd.currentEntity;
-	trRefdef_t		*refdef = &backEnd.refdef;
-
-	//
-	// trace a sample point down to find ambient light
-	//
-	if (ent->e.renderfx & RF_LIGHTING_ORIGIN) {
-		// seperate lightOrigins are needed so an object that is
-		// sinking into the ground can still be lit, and so
-		// multi-part models can be lit identically
-		VectorCopy(ent->e.lightingOrigin, lightOrigin);
-	}
-	else {
-		VectorCopy(ent->e.origin, lightOrigin);
-	}
-
-	// if NOWORLDMODEL, only use dynamic lights (menu system, etc)
-	if (!(refdef->rdflags & RDF_NOWORLDMODEL)
-		&& tr.world->lightGridData) {
-		R_SetupEntityLightingGrid(ent);
-	}
-	else {
-		ent->ambientLight[0] = ent->ambientLight[1] =
-			ent->ambientLight[2] = tr.identityLight * 150;
-		ent->directedLight[0] = ent->directedLight[1] =
-			ent->directedLight[2] = tr.identityLight * 150;
-		VectorCopy(tr.sunDirection, ent->lightDir);
-	}
-
-	// bonus items and view weapons have a fixed minimum add
-	if (1 /* ent->e.renderfx & RF_MINLIGHT */) {
-		// give everything a minimum light add
-		ent->ambientLight[0] += tr.identityLight * 32;
-		ent->ambientLight[1] += tr.identityLight * 32;
-		ent->ambientLight[2] += tr.identityLight * 32;
-	}
-
-	//
-	// modify the light by dynamic lights
-	//
-	d = VectorLength(ent->directedLight);
-	VectorScale(ent->lightDir, d, lightDir);
-
-	for (i = 0; i < refdef->num_dlights; i++) {
-		dl = &refdef->dlights[i];
-		VectorSubtract(dl->origin, lightOrigin, dir);
-		d = VectorNormalize(dir);
-
-		power = DLIGHT_AT_RADIUS * (dl->radius * dl->radius);
-		if (d < DLIGHT_MINIMUM_RADIUS) {
-			d = DLIGHT_MINIMUM_RADIUS;
-		}
-		d = power / (d * d);
-
-		VectorMA(ent->directedLight, d, dl->color, ent->directedLight);
-		VectorMA(lightDir, d, dir, lightDir);
-	}
-
-	// clamp ambient
-	for (i = 0; i < 3; i++) {
-		if (ent->ambientLight[i] > tr.identityLightByte) {
-			ent->ambientLight[i] = tr.identityLightByte;
-		}
-	}
-
-	// save out the byte packet version
-	((byte*)&ambientlightInt)[0] = myftol(ent->ambientLight[0]);
-	((byte*)&ambientlightInt)[1] = myftol(ent->ambientLight[1]);
-	((byte*)&ambientlightInt)[2] = myftol(ent->ambientLight[2]);
-	((byte*)&ambientlightInt)[3] = 0xff;
-
-	// transform the direction to local space
-	VectorNormalize(lightDir);
-	ent->lightDir[0] = DotProduct(lightDir, ent->e.axis[0]);
-	ent->lightDir[1] = DotProduct(lightDir, ent->e.axis[1]);
-	ent->lightDir[2] = DotProduct(lightDir, ent->e.axis[2]);
-
-	return ambientlightInt;
-#endif
-}
-
-/*
-===============
-RB_SetupEntityGridLighting
-===============
-*/
-void RB_SetupEntityGridLighting()
-{
-    trRefEntity_t *ent;
-    int            iColor;
-
-    if (backEnd.currentEntity->bLightGridCalculated) {
-        return;
-    }
-
-    for (ent = backEnd.currentEntity; ent->e.parentEntity != ENTITYNUM_NONE;
-         ent = &backEnd.refdef.entities[ent->e.parentEntity]) {
-        trRefEntity_t *newref = &backEnd.refdef.entities[ent->e.parentEntity];
-        if (newref == ent) {
-            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
-            iColor = newref->iGridLighting;
-            break;
-        }
-
-        if (newref->bLightGridCalculated) {
-            iColor = newref->iGridLighting;
-            break;
-        }
-    }
-
-    if (ent->e.parentEntity == ENTITYNUM_NONE) {
-        iColor = RB_GetEntityGridLighting();
-    }
-
-    ent = backEnd.currentEntity;
-    for (;;) {
-        ent->bLightGridCalculated = qtrue;
-        ent->iGridLighting        = iColor;
-        if (ent->e.parentEntity == ENTITYNUM_NONE) {
-            break;
-        }
-
-        if (ent == &backEnd.refdef.entities[ent->e.parentEntity]) {
-            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
-            break;
-        }
-
-        ent = &backEnd.refdef.entities[ent->e.parentEntity];
-    }
-}
-
-/*
-===============
-RB_SetupStaticModelGridLighting
-===============
-*/
-void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t *ent, const vec3_t lightOrigin)
-{
-    int       iColor;
-    int       i;
-    dlight_t *dl;
-    float     power;
-    vec3_t    vLight;
-    vec3_t    dir;
-    float     d;
-
-    if (ent->bLightGridCalculated) {
-        return;
-    }
-    ent->bLightGridCalculated = qtrue;
-
-    if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-        R_GetLightingGridValue(lightOrigin, vLight);
-    } else {
-        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
-    }
-
-    for (i = 0; i < refdef->num_dlights; i++) {
-        dl = &refdef->dlights[i];
-        VectorSubtract(dl->origin, lightOrigin, dir);
-        d = VectorLengthSquared(dir);
-
-        power = dl->radius * dl->radius;
-        if (power >= d) {
-            d = dl->radius * 7500.0 / d;
-            VectorMA(vLight, d, dl->color, vLight);
-        }
-    }
-
-    if (tr.overbrightShift) {
-        vLight[0] = tr.overbrightMult * vLight[0];
-        vLight[1] = tr.overbrightMult * vLight[1];
-        vLight[2] = tr.overbrightMult * vLight[2];
-    }
-
-    // normalize
-    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-        VectorScale(vLight, scale, vLight);
-    }
-
-    // clamp ambient
-    for (i = 0; i < 3; i++) {
-        if (vLight[i] > tr.identityLightByte) {
-            vLight[i] = tr.identityLightByte;
-        }
-    }
-
-    // save out the byte packet version
-    ((byte *)&ent->iGridLighting)[0] = myftol(vLight[0]);
-    ((byte *)&ent->iGridLighting)[1] = myftol(vLight[1]);
-    ((byte *)&ent->iGridLighting)[2] = myftol(vLight[2]);
-    ((byte *)&ent->iGridLighting)[3] = 0xff;
-}
-
-/*
-=============================================================================
-
-LIGHT SAMPLING
-
-=============================================================================
-*/
-
-extern cvar_t *r_ambientScale;
-extern cvar_t *r_directedScale;
-
-/*
-===============
-LogLight
-===============
-*/
-static void LogLight(trRefEntity_t *ent)
-{
-    int max1, max2;
-
-    if (!(ent->e.renderfx & RF_FIRST_PERSON)) {
-        return;
-    }
-
-    max1 = ent->ambientLight[0];
-    if (ent->ambientLight[1] > max1) {
-        max1 = ent->ambientLight[1];
-    } else if (ent->ambientLight[2] > max1) {
-        max1 = ent->ambientLight[2];
-    }
-
-    max2 = ent->directedLight[0];
-    if (ent->directedLight[1] > max2) {
-        max2 = ent->directedLight[1];
-    } else if (ent->directedLight[2] > max2) {
-        max2 = ent->directedLight[2];
-    }
-
-    ri.Printf(PRINT_ALL, "amb:%i  dir:%i\n", max1, max2);
-}
-
-/*
-===============
-R_ClearRealDlights
-===============
-*/
-void R_ClearRealDlights()
-{
-    memset(dli.allocated, 0, sizeof(dli.allocated));
-    dli.dlightMap = 0;
-}
-
-/*
-===============
-R_UploadDlights
-===============
-*/
-void R_UploadDlights()
-{
-    int i, h;
-
-    if (!tr.pc.c_dlightSurfaces) {
-        return;
-    }
-
-    h = 0;
-    for (i = 0; i < LIGHTMAP_SIZE; i++) {
-        if (h < dli.allocated[i]) {
-            h = dli.allocated[i];
-        }
-    }
-
-    if (h) {
-        if (h > LIGHTMAP_SIZE) {
-            ri.Error(ERR_DROP, "R_UploadDlights: bad allocated height");
-        }
-
-        GL_Bind(tr.dlightImages[dli.dlightMap]);
-        qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LIGHTMAP_SIZE, h, GL_RGBA, GL_UNSIGNED_BYTE, dli.lightmap_buffer);
-
-        tr.pc.c_dlightMaps++;
-        memset(dli.allocated, 0, sizeof(dli.allocated));
-    }
-}
-
-/*
-===============
-R_AllocLMBlock
-===============
-*/
-qboolean R_AllocLMBlock(int w, int h, int *x, int *y)
-{
-    int i, j;
-    int best, best2;
-
-    for (;;) {
-        best = LIGHTMAP_SIZE;
-        for (i = 0; i < LIGHTMAP_SIZE - w; i++) {
-            best2 = 0;
-
-            for (j = 0; j < w && dli.allocated[i + j] < best; j++) {
-                if (best2 < dli.allocated[i + j]) {
-                    best2 = dli.allocated[i + j];
-                }
-            }
-
-            if (j == w) {
-                *x   = i;
-                *y   = best2;
-                best = best2;
-            }
-        }
-
-        if (h + best <= LIGHTMAP_SIZE) {
-            break;
-        }
-
-        if (dli.dlightMap == 14) {
-            return qfalse;
-        }
-
-        R_UploadDlights();
-        dli.dlightMap++;
-    }
-
-    return qtrue;
-}
-
-/*
-===============
-R_DlightSample
-===============
-*/
-qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst)
-{
-    int      r, g, b;
-    int      k;
-    qboolean added;
-    vec3_t   dir;
-    float    add;
-
-    added = qfalse;
-    r     = src[0];
-    g     = src[1];
-    b     = src[2];
-
-    for (k = 0; k < dli.numLights; k++) {
-        incidentLight_t *light = &dli.lights[k];
-
-        VectorSubtract(vec, light->origin, dir);
-        add = VectorLength(dir) * light->power;
-        if (add <= 1.f) {
-            float t = (1.0 - add) * (1.0 - add) * 375.0;
-
-            r = (int)(t * light->dl->color[0] + (float)r);
-            g = (int)(t * light->dl->color[1] + (float)g);
-            b = (int)(t * light->dl->color[2] + (float)b);
-            // light was added
-            added = qtrue;
-        }
-    }
-
-    if (tr.overbrightShift) {
-        r <<= tr.overbrightShift & 0xFF;
-        g <<= tr.overbrightShift & 0xFF;
-        b <<= tr.overbrightShift & 0xFF;
-    }
-
-    if (r > 0xFF || g > 0xFF || b > 0xFF) {
-        float t;
-        // normalize color values
-        t = 255.0 / (float)Q_max(r, Q_max(g, b));
-
-        r = (int)((float)r * t);
-        g = (int)((float)g * t);
-        b = (int)((float)b * t);
-    }
-
-    dst[0] = (byte)r;
-    dst[1] = (byte)g;
-    dst[2] = (byte)b;
-    dst[3] = -1;
-
-    return added;
-}
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
deleted file mode 100644
index c7a44adf..00000000
--- a/code/renderer/tr_local.h
+++ /dev/null
@@ -1,2469 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#pragma once
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "tr_public.h"
-#include "../renderercommon/qgl.h"
-#include "qgl.h"
-
-#ifdef __cplusplus
-#define GLE(ret, name, ...) extern "C" name##proc * qgl##name;
-#else
-#define GLE(ret, name, ...) extern name##proc * qgl##name;
-#endif
-
-QGL_1_1_PROCS;
-QGL_1_1_FIXED_FUNCTION_PROCS;
-QGL_1_3_PROCS;
-QGL_DESKTOP_1_1_PROCS;
-QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
-QGL_3_0_PROCS;
-
-#undef GLE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GL_INDEX_TYPE		GL_UNSIGNED_INT
-typedef unsigned int glIndex_t;
-
-// fast float to int conversion
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
-long myftol( float f );
-#else
-#define	myftol(x) ((int)(x))
-#endif
-
-
-// everything that is needed by the backend needs
-// to be double buffered to allow it to run in
-// parallel on a dual cpu machine
-#define	SMP_FRAMES		2
-
-// 12 bits
-// see QSORT_SHADERNUM_SHIFT
-#define	MAX_SHADERS				16384
-
-//#define MAX_SHADER_STATES 2048
-#define MAX_STATES_PER_SHADER 32
-#define MAX_STATE_NAME 32
-
-// can't be increased without changing bit packing for drawsurfs
-
-typedef struct skelSurfaceGame_s skelSurfaceGame_t;
-typedef struct staticSurface_s staticSurface_t;
-
-// any changes in surfaceType must be mirrored in rb_surfaceTable[]
-typedef enum {
-    SF_BAD,
-    SF_SKIP,				// ignore
-    SF_FACE,
-    SF_GRID,
-    SF_POLY,
-    SF_MARK_FRAG,
-    SF_FLARE,
-    SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
-    SF_DISPLAY_LIST,
-    SF_TIKI_SKEL,
-    SF_TIKI_STATIC,
-    SF_SWIPE,
-    SF_SPRITE,
-    SF_TERRAIN_PATCH,
-    SF_TRIANGLES,
-    SF_MD3,
-    SF_MD4,
-
-    SF_NUM_SURFACE_TYPES,
-    SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
-} surfaceType_t;
-
-typedef struct {
-    struct mnode_s* cntNode;
-    struct msurface_s* skySurfs[32];
-    int numSurfs;
-    vec3_t offset;
-    vec3_t mins;
-    vec3_t maxs;
-} portalsky_t;
-
-typedef struct {
-    vec3_t transformed;
-    int index;
-} sphere_dlight_t;
-
-typedef enum {
-    LIGHT_POINT,
-    LIGHT_DIRECTIONAL,
-    LIGHT_SPOT,
-    LIGHT_SPOT_FAST
-} lighttype_t;
-
-typedef struct reallightinfo_s {
-    vec3_t color;
-    lighttype_t eType;
-    float fIntensity;
-    float fDist;
-    float fSpotSlope;
-    float fSpotConst;
-    float fSpotScale;
-    vec3_t vOrigin;
-    vec3_t vDirection;
-} reallightinfo_t;
-
-typedef float cube_entry_t[3][4];
-
-typedef struct {
-    vec3_t origin;
-    vec3_t worldOrigin;
-    vec3_t traceOrigin;
-    float radius;
-    struct mnode_s* leaves[8];
-    void(*TessFunction) (unsigned char* dstColors);
-    union {
-        unsigned char level[4];
-        int value;
-    } ambient;
-    int numRealLights;
-    reallightinfo_t light[MAX_REAL_LIGHTS];
-    int bUsesCubeMap;
-    float cubemap[24][3][4];
-} sphereor_t;
-
-typedef struct spherel_s {
-    vec3_t origin;
-	vec3_t color;
-    float intensity;
-    struct mnode_s* leaf;
-    int needs_trace;
-    int spot_light;
-    float spot_radiusbydistance;
-	vec3_t spot_dir;
-    int reference_count;
-} spherel_t;
-
-typedef struct dlight_s {
-	vec3_t	origin;
-	vec3_t	color;				// range from 0.0 to 1.0, should be color normalized
-	float	radius;
-
-	dlighttype_t type;
-	vec3_t	transformed;		// origin in local coordinate system
-} dlight_t;
-
-
-// a trRefEntity_t has all the information passed in by
-// the client game, as well as some locally derived info
-typedef struct {
-	refEntity_t	e;
-
-	float		axisLength;		// compensate for non-normalized axis
-
-	qboolean	needDlights;	// true for bmodels that touch a dlight
-	qboolean	bLightGridCalculated;
-	int			iGridLighting;
-	float		lodpercentage[2];
-	qboolean	sphereCalculated;
-	int			lightingSphere;
-
-	//
-	// old lighting variables
-	//
-	vec3_t		lightDir;		// normalized direction towards light
-	vec3_t		ambientLight;	// color normalized to 0-255
-	int			ambientLightInt;	// 32 bit rgba packed
-	vec3_t		directedLight;
-} trRefEntity_t;
-
-typedef struct refSprite_s {
-    surfaceType_t surftype;
-    int hModel;
-    int shaderNum;
-    float origin[3];
-    float scale;
-    float axis[3][3];
-    unsigned char shaderRGBA[4];
-    int renderfx;
-    float shaderTime;
-} refSprite_t;
-
-typedef struct {
-	vec3_t		origin;			// in world coordinates
-	vec3_t		axis[3];		// orientation in world
-	vec3_t		viewOrigin;		// viewParms->or.origin in local coordinates
-	float		modelMatrix[16];
-} orientationr_t;
-
-typedef struct image_s {
-	char		imgName[MAX_QPATH];		// game path, including extension
-	int			width, height;				// source image
-	int			uploadWidth, uploadHeight;	// after power of two and picmip but not including clamp to MAX_TEXTURE_SIZE
-	GLuint		texnum;					// gl texture binding
-
-	int			frameUsed;			// for texture usage in frame statistics
-	int			bytesUsed;
-
-	int			internalFormat;
-	int			TMU;				// only needed for voodoo2
-	int			numMipmaps;
-
-	qboolean	dynamicallyUpdated;
-	qboolean	allowPicmip;
-	qboolean	force32bit;
-    int			wrapClampModeX;
-    int			wrapClampModeY;
-	int			r_sequence;
-	int			UseCount;
-
-	struct image_s*	next;
-} image_t;
-
-//===============================================================================
-
-typedef enum {
-	SS_BAD,
-	SS_PORTAL,			// mirrors, portals, viewscreens
-	SS_PORTALSKY,
-	SS_ENVIRONMENT,		// sky box
-	SS_OPAQUE,			// opaque
-
-	SS_DECAL,			// scorch marks, etc.
-	SS_SEE_THROUGH,		// ladders, grates, grills that may have small blended edges
-						// in addition to alpha test
-	SS_BANNER,
-
-	SS_UNDERWATER,		// for items that should be drawn in front of the water plane
-
-	SS_BLEND0,			// regular transparency and filters
-	SS_BLEND1,			// generally only used for additive type effects
-	SS_BLEND2,
-	SS_BLEND3,
-
-	SS_BLEND6,
-	SS_STENCIL_SHADOW,
-	SS_ALMOST_NEAREST,	// gun smoke puffs
-
-	SS_NEAREST			// blood blobs
-} shaderSort_t;
-
-
-#define MAX_SHADER_STAGES 8
-
-typedef enum {
-	GF_NONE,
-
-	GF_SIN,
-	GF_SQUARE,
-	GF_TRIANGLE,
-	GF_SAWTOOTH, 
-	GF_INVERSE_SAWTOOTH, 
-
-	GF_NOISE
-
-} genFunc_t;
-
-typedef enum {
-	USE_S_COORDS,
-	USE_T_COORDS
-} texDirection_t;
-
-typedef enum {
-	DEFORM_NONE,
-	DEFORM_WAVE,
-	DEFORM_NORMALS,
-	DEFORM_BULGE,
-	DEFORM_MOVE,
-	DEFORM_AUTOSPRITE,
-	DEFORM_AUTOSPRITE2,
-	DEFORM_LIGHTGLOW,
-	DEFORM_FLAP_S,
-	DEFORM_FLAP_T
-} deform_t;
-
-typedef enum {
-	AGEN_IDENTITY,
-	AGEN_SKIP,
-	AGEN_ENTITY,
-	AGEN_ONE_MINUS_ENTITY,
-	AGEN_VERTEX,
-	AGEN_ONE_MINUS_VERTEX,
-	AGEN_LIGHTING_SPECULAR,
-	AGEN_WAVEFORM,
-	AGEN_PORTAL,
-	AGEN_NOISE,
-	AGEN_DOT,
-	AGEN_ONE_MINUS_DOT,
-	AGEN_CONSTANT,
-	AGEN_GLOBAL_ALPHA,
-	AGEN_SKYALPHA,
-	AGEN_ONE_MINUS_SKYALPHA,
-	AGEN_SCOORD,
-	AGEN_TCOORD,
-	AGEN_DIST_FADE,
-    AGEN_ONE_MINUS_DIST_FADE,
-    AGEN_TIKI_DIST_FADE,
-    AGEN_ONE_MINUS_TIKI_DIST_FADE,
-	AGEN_DOT_VIEW,
-	AGEN_ONE_MINUS_DOT_VIEW,
-	AGEN_HEIGHT_FADE,
-} alphaGen_t;
-
-typedef enum {
-	CGEN_BAD,
-	CGEN_IDENTITY_LIGHTING,	// tr.identityLight
-	CGEN_IDENTITY,			// always (1,1,1,1)
-	CGEN_ENTITY,			// grabbed from entity's modulate field
-	CGEN_ONE_MINUS_ENTITY,	// grabbed from 1 - entity.modulate
-	CGEN_EXACT_VERTEX,		// tess.vertexColors
-	CGEN_VERTEX,			// tess.vertexColors * tr.identityLight
-	CGEN_ONE_MINUS_VERTEX,
-	CGEN_WAVEFORM,			// programmatically generated
-	CGEN_MULTIPLY_BY_WAVEFORM,
-	CGEN_LIGHTING_GRID,
-	CGEN_LIGHTING_SPHERICAL,
-	CGEN_CONSTANT,
-	CGEN_NOISE,
-	CGEN_GLOBAL_COLOR,
-	CGEN_STATIC,
-	CGEN_SCOORD,
-	CGEN_TCOORD,
-	CGEN_DOT,
-	CGEN_ONE_MINUS_DOT
-} colorGen_t;
-
-typedef enum {
-	TCGEN_BAD,
-	TCGEN_IDENTITY,			// clear to 0,0
-	TCGEN_LIGHTMAP,
-	TCGEN_TEXTURE,
-	TCGEN_ENVIRONMENT_MAPPED,
-	TCGEN_VECTOR,			// S and T from world coordinates
-	TCGEN_ENVIRONMENT_MAPPED2,
-	TCGEN_SUN_REFLECTION,
-	TCGEN_FOG
-} texCoordGen_t;
-
-typedef enum {
-	ACFF_NONE,
-	ACFF_MODULATE_RGB,
-	ACFF_MODULATE_RGBA,
-	ACFF_MODULATE_ALPHA
-} acff_t;
-
-typedef struct {
-	genFunc_t	func;
-
-	float base;
-	float amplitude;
-	float phase;
-	float frequency;
-} waveForm_t;
-
-#define TR_MAX_TEXMODS 4
-
-typedef enum {
-    TMOD_NONE,
-    TMOD_TRANSFORM,
-    TMOD_TURBULENT,
-    TMOD_SCROLL,
-    TMOD_SCALE,
-    TMOD_STRETCH,
-    TMOD_ROTATE,
-    TMOD_ENTITY_TRANSLATE,
-    TMOD_NOISE,
-    TMOD_OFFSET,
-    TMOD_PARALLAX,
-    TMOD_MACRO,
-    TMOD_WAVETRANS,
-    TMOD_WAVETRANT,
-    TMOD_BULGETRANS
-} texMod_t;
-
-#define	MAX_SHADER_DEFORMS	3
-typedef struct {
-	deform_t	deformation;			// vertex coordinate modification type
-
-	vec3_t		moveVector;
-	waveForm_t	deformationWave;
-	float		deformationSpread;
-
-	float		bulgeWidth;
-	float		bulgeHeight;
-	float		bulgeSpeed;
-} deformStage_t;
-
-
-typedef struct {
-	texMod_t		type;
-
-	// used for TMOD_TURBULENT and TMOD_STRETCH
-	waveForm_t		wave;
-
-	// used for TMOD_TRANSFORM
-	float			matrix[2][2];		// s' = s * m[0][0] + t * m[1][0] + trans[0]
-	float			translate[2];		// t' = s * m[0][1] + t * m[0][1] + trans[1]
-
-	// used for TMOD_SCALE
-	float			scale[2];			// s *= scale[0]
-	                                    // t *= scale[1]
-
-	// used for TMOD_PARALLAX
-	float			rate[2];
-
-	// used for TMOD_SCROLL
-	float			scroll[2];			// s' = s + scroll[0] * time
-										// t' = t + scroll[1] * time
-
-	// + = clockwise
-	// - = counterclockwise
-	float			rotateSpeed;
-    float			rotateStart;
-    float			rotateCoef;
-
-} texModInfo_t;
-
-
-#define	MAX_IMAGE_ANIMATIONS	64
-#define BUNDLE_ANIMATE_ONCE		1
-
-typedef struct {
-	image_t			*image[MAX_IMAGE_ANIMATIONS];
-	int				numImageAnimations;
-	float			imageAnimationSpeed;
-	float			imageAnimationPhase;
-
-	texCoordGen_t	tcGen;
-	vec3_t			tcGenVectors[2];
-
-	int				numTexMods;
-	texModInfo_t	*texMods;
-
-	int				videoMapHandle;
-	qboolean		isLightmap;
-	qboolean		vertexLightmap;
-	qboolean		isVideoMap;
-	int				flags;
-} textureBundle_t;
-
-#define NUM_TEXTURE_BUNDLES 2
-
-typedef struct {
-	qboolean		active;
-	qboolean		hasNormalMap;
-	
-	textureBundle_t	bundle[NUM_TEXTURE_BUNDLES];
-	image_t			*normalMap;
-	int				multitextureEnv;		// 0, GL_MODULATE, GL_ADD (FIXME: put in stage)
-
-	waveForm_t		rgbWave;
-	colorGen_t		rgbGen;
-
-	waveForm_t		alphaWave;
-    alphaGen_t		alphaGen;
-
-    unsigned		stateBits;					// GLS_xxxx mask
-
-
-	qboolean		noMipMaps;
-    qboolean		noPicMip;
-    qboolean		force32bit;
-
-	float			alphaMin;
-	float			alphaMax;
-	vec3_t			specOrigin;
-
-    byte			colorConst[4];			// for CGEN_CONST and AGEN_CONST
-	byte			alphaConst;
-	byte			alphaConstMin;
-} shaderStage_t;
-
-struct shaderCommands_s;
-
-#define LIGHTMAP_2D			-4		// shader is for 2D rendering
-#define LIGHTMAP_BY_VERTEX	-3		// pre-lit triangle models
-#define LIGHTMAP_WHITEIMAGE	-2
-#define	LIGHTMAP_NONE		-1
-
-typedef enum {
-	CT_FRONT_SIDED,
-	CT_BACK_SIDED,
-	CT_TWO_SIDED
-} cullType_t;
-
-typedef enum {
-	FP_NONE,		// surface is translucent and will just be adjusted properly
-	FP_EQUAL,		// surface is opaque but possibly alpha tested
-	FP_LE			// surface is trnaslucent, but still needs a fog pass (fog surface)
-} fogPass_t;
-
-typedef struct {
-	float		cloudHeight;
-	image_t		*outerbox[6], *innerbox[6];
-} skyParms_t;
-
-typedef enum {
-	SPRITE_PARALLEL,
-	SPRITE_PARALLEL_ORIENTED,
-	SPRITE_ORIENTED,
-	SPRITE_PARALLEL_UPRIGHT
-} spriteType_t;
-
-typedef struct {
-  spriteType_t type;
-  float scale;
-} spriteParms_t;
-
-typedef struct {
-	vec3_t	color;
-	float	depthForOpaque;
-} fogParms_t;
-
-
-typedef struct shader_s {
-	char		name[MAX_QPATH];		// game path, including extension
-	int			lightmapIndex;			// for a shader to match, both name and lightmapIndex must match
-
-	int			index;					// this shader == tr.shaders[index]
-	int			sortedIndex;			// this shader == tr.sortedShaders[sortedIndex]
-
-	float		sort;					// lower numbered shaders draw before higher numbered
-
-	qboolean	defaultShader;			// we want to return index 0 if the shader failed to
-										// load for some reason, but R_FindShader should
-										// still keep a name allocated for it, so if
-										// something calls RE_RegisterShader again with
-										// the same name, we don't try looking for it again
-
-	qboolean	explicitlyDefined;		// found in a .shader file
-
-	int			surfaceFlags;			// if explicitlyDefined, this will have SURF_* flags
-	int			contentFlags;
-
-	qboolean	entityMergable;			// merge across entites optimizable (smoke, blood)
-
-	qboolean	isSky;
-	skyParms_t	sky;
-	spriteParms_t sprite;
-	qboolean	isPortalSky;
-	float subdivisions;
-	float fDistRange;
-	float fDistNear;
-	fogParms_t	fogParms;
-
-	float		portalRange;			// distance to fog out at
-
-	cullType_t	cullType;				// CT_FRONT_SIDED, CT_BACK_SIDED, or CT_TWO_SIDED
-	qboolean	polygonOffset;			// set for decals and other items that must be offset 
-	qboolean	noMipMaps;				// for console fonts, 2D elements, etc.
-	qboolean	noPicMip;				// for images that must always be full resolution
-
-	fogPass_t	fogPass;				// draw a blended pass, possibly with depth test equals
-
-	qboolean	needsNormal;			// not all shaders will need all data to be gathered
-	qboolean	needsST1;
-	qboolean	needsST2;
-	qboolean	needsColor;
-
-	int			numDeforms;
-	deformStage_t	deforms[MAX_SHADER_DEFORMS];
-
-	int			numUnfoggedPasses;
-	shaderStage_t	* unfoggedStages[MAX_SHADER_STAGES];
-
-	int			needsLGrid;
-	int			needsLSpherical;
-	int			stagesWithAlphaFog;
-	int			flags;
-
-	void		(*optimalStageIteratorFunc)( void );
-
-  float clampTime;                                  // time this shader is clamped to
-  float timeOffset;                                 // current time offset for this shader
-
-  int numStates;                                    // if non-zero this is a state shader
-  struct shader_s *currentShader;                   // current state if this is a state shader
-  struct shader_s *parentShader;                    // current state if this is a state shader
-  int currentState;                                 // current state index for cycle purposes
-  long expireTime;                                  // time in milliseconds this expires
-
-  struct shader_s *remappedShader;                  // current shader this one is remapped too
-
-  int shaderStates[MAX_STATES_PER_SHADER];          // index to valid shader states
-
-	struct	shader_s	*next;
-} shader_t;
-
-typedef struct shaderState_s {
-  char shaderName[MAX_QPATH];     // name of shader this state belongs to
-  char name[MAX_STATE_NAME];      // name of this state
-  char stateShader[MAX_QPATH];    // shader this name invokes
-  int cycleTime;                  // time this cycle lasts, <= 0 is forever
-  shader_t *shader;
-} shaderState_t;
-
-
-// trRefdef_t holds everything that comes in refdef_t,
-// as well as the locally generated scene information
-typedef struct {
-	int			x, y, width, height;
-	float		fov_x, fov_y;
-	vec3_t		vieworg;
-	vec3_t		viewaxis[3];		// transformation matrix
-
-	int			time;				// time in milliseconds for shader effects and other time dependent rendering issues
-	int			rdflags;			// RDF_NOWORLDMODEL, etc
-
-	// 1 bits will prevent the associated area from rendering at all
-	byte		areamask[MAX_MAP_AREA_BYTES];
-	qboolean	areamaskModified;	// qtrue if areamask changed since last scene
-
-	float		floatTime;			// tr.refdef.time / 1000.0
-
-	// text messages for deform text shaders
-	char		text[MAX_RENDER_STRINGS][MAX_RENDER_STRING_LENGTH];
-
-	int			num_entities;
-	trRefEntity_t	*entities;
-
-    int			num_sprites;
-    refSprite_t	*sprites;
-
-	int			num_dlights;
-	struct dlight_s	*dlights;
-
-	int			numTerMarks;
-	struct srfMarkFragment_s *terMarks;
-
-	int			numPolys;
-	struct srfPoly_s	*polys;
-
-	int			numDrawSurfs;
-	struct drawSurf_s	*drawSurfs;
-
-	int			numSpriteSurfs;
-	struct drawSurf_s	*spriteSurfs;
-
-    int			numStaticModels;
-    struct cStaticModelUnpacked_s *staticModels;
-
-    int			numStaticModelData;
-    unsigned char		*staticModelData;
-    qboolean sky_portal;
-    float sky_alpha;
-    vec3_t sky_origin;
-    vec3_t sky_axis[3];
-	// added in 2.0
-	//==
-    qboolean skybox_farplane;
-    qboolean render_terrain;
-	//==
-
-} trRefdef_t;
-
-
-//=================================================================================
-
-// skins allow models to be retextured without modifying the model file
-typedef struct {
-	char		name[MAX_QPATH];
-	shader_t	*shader;
-} skinSurface_t;
-
-typedef struct skin_s {
-	char		name[MAX_QPATH];		// game path, including extension
-	int			numSurfaces;
-	skinSurface_t	*surfaces[MD3_MAX_SURFACES];
-} skin_t;
-
-
-typedef struct {
-	int			originalBrushNumber;
-	vec3_t		bounds[2];
-
-	unsigned	colorInt;				// in packed byte format
-	float		tcScale;				// texture coordinate vector scales
-	fogParms_t	parms;
-
-	// for clipping distance in fog when outside
-	qboolean	hasSurface;
-	float		surface[4];
-} fog_t;
-
-typedef struct depthfog_s {
-	float len;
-	float oolen;
-	int enabled;
-	int extrafrustums;
-} depthfog_t;
-
-typedef struct {
-	orientationr_t	ori;
-	orientationr_t	world;
-	vec3_t		pvsOrigin;			// may be different than or.origin for portals
-	qboolean	isPortal;			// true if this view is through a portal
-	qboolean	isMirror;			// the portal is a mirror, invert the face culling
-    qboolean	isPortalSky;		// since 2.0 whether or not this view is a portal sky
-	int			frameSceneNum;		// copied from tr.frameSceneNum
-	int			frameCount;			// copied from tr.frameCount
-	cplane_t	portalPlane;		// clip anything behind this if mirroring
-	int			viewportX, viewportY, viewportWidth, viewportHeight;
-	float		fovX, fovY;
-	float		projectionMatrix[16];
-	cplane_t	frustum[5];
-	vec3_t		visBounds[2];
-	float		zFar;
-	depthfog_t	fog;
-    float		farplane_distance;
-    float		farplane_bias; // added in 2.0
-	float		farplane_color[3];
-    qboolean	farplane_cull;
-    qboolean	renderTerrain; // added in 2.0
-} viewParms_t;
-
-
-/*
-==============================================================================
-
-SURFACES
-
-==============================================================================
-*/
-
-typedef struct drawSurf_s {
-	unsigned			sort;			// bit combination for fast compares
-	surfaceType_t		*surface;		// any of surface*_t
-} drawSurf_t;
-
-#define	MAX_FACE_POINTS		64
-
-#define	MAX_PATCH_SIZE		32			// max dimensions of a patch mesh in map file
-#define	MAX_GRID_SIZE		65			// max dimensions of a grid mesh in memory
-
-// when cgame directly specifies a polygon, it becomes a srfPoly_t
-// as soon as it is called
-typedef struct srfPoly_s {
-	surfaceType_t	surfaceType;
-	qhandle_t		hShader;
-	int				numVerts;
-	polyVert_t		*verts;
-	int				renderfx;
-} srfPoly_t;
-
-typedef struct srfMarkFragment_s {
-	surfaceType_t surfaceType;
-	int iIndex;
-	int numVerts;
-	polyVert_t* verts;
-} srfMarkFragment_t;
-
-typedef struct srfDisplayList_s {
-	surfaceType_t	surfaceType;
-	int				listNum;
-} srfDisplayList_t;
-
-
-typedef struct srfFlare_s {
-	surfaceType_t	surfaceType;
-	vec3_t			origin;
-	vec3_t			normal;
-	vec3_t			color;
-} srfFlare_t;
-
-typedef struct srfGridMesh_s {
-	surfaceType_t	surfaceType;
-
-	// dynamic lighting information
-    int				dlightBits[SMP_FRAMES];
-    int				dlightMap[SMP_FRAMES];
-
-	// culling information
-	vec3_t			meshBounds[2];
-	vec3_t			localOrigin;
-	float			meshRadius;
-
-	// lightmap data
-    float			lightmapOffset[2];
-    int				lmX;
-    int				lmY;
-    int				lmWidth;
-    int				lmHeight;
-    unsigned char	*lmData;
-
-	// lod information, which may be different
-	// than the culling information to allow for
-	// groups of curves that LOD as a unit
-	vec3_t			lodOrigin;
-	float			lodRadius;
-	int				lodFixed;
-	int				lodStitched;
-
-	// vertexes
-	int				width, height;
-	float			*widthLodError;
-	float			*heightLodError;
-	drawVert_t		verts[1];		// variable sized
-} srfGridMesh_t;
-
-
-
-#define	VERTEXSIZE	8
-typedef struct {
-	surfaceType_t	surfaceType;
-	cplane_t	plane;
-
-	// dynamic lighting information
-    int			dlightBits[SMP_FRAMES];
-    int			dlightMap[SMP_FRAMES];
-    float		lightmapOffset[2];
-    int			lmWidth;
-    int			lmHeight;
-    int			lmX;
-    int			lmY;
-    byte*		lmData;
-    vec3_t		lmOrigin;
-    vec3_t		lmVecs[2];
-    vec3_t		lmInverseVecs[2];
-
-	// triangle definitions (no normals at points)
-	int			numPoints;
-	int			numIndices;
-	int			ofsIndices;
-	float		points[1][VERTEXSIZE];	// variable sized
-										// there is a variable length list of indices here also
-} srfSurfaceFace_t;
-
-
-// misc_models in maps are turned into direct geometry by q3map
-typedef struct {
-	surfaceType_t	surfaceType;
-
-	// dynamic lighting information
-	int				dlightBits[SMP_FRAMES];
-
-	// culling information (FIXME: use this!)
-	vec3_t			bounds[2];
-	vec3_t			localOrigin;
-	float			radius;
-
-	// triangle definitions
-	int				numIndexes;
-	int				*indexes;
-
-	int				numVerts;
-	drawVert_t		*verts;
-} srfTriangles_t;
-
-typedef union varnodeUnpacked_u {
-    float fVariance;
-    int flags;
-	/*
-    struct {
-#if !Q3_BIG_ENDIAN
-		byte flags;
-        unsigned char unused[3];
-#else
-        unsigned char unused[3];
-        byte flags;
-#endif
-    } s;
-	*/
-} varnodeUnpacked_t;
-
-typedef unsigned short terraInt;
-
-typedef struct terrainVert_s {
-    vec3_t xyz;
-    vec2_t texCoords[2];
-    float fVariance;
-    float fHgtAvg;
-    float fHgtAdd;
-    unsigned int uiDistRecalc;
-    terraInt nRef;
-    terraInt iVertArray;
-    byte* pHgt;
-    terraInt iNext;
-    terraInt iPrev;
-} terrainVert_t;
-
-typedef struct terraTri_s {
-    unsigned short iPt[3];
-    terraInt nSplit;
-    unsigned int uiDistRecalc;
-    struct cTerraPatchUnpacked_s* patch;
-    varnodeUnpacked_t* varnode;
-    terraInt index;
-    byte lod;
-    byte byConstChecks;
-    terraInt iLeft;
-    terraInt iRight;
-    terraInt iBase;
-    terraInt iLeftChild;
-    terraInt iRightChild;
-    terraInt iParent;
-    terraInt iPrev;
-    terraInt iNext;
-} terraTri_t;
-
-typedef struct srfTerrain_s {
-    surfaceType_t surfaceType;
-    terraInt iVertHead;
-    terraInt iTriHead;
-    terraInt iTriTail;
-    terraInt iMergeHead;
-    int nVerts;
-    int nTris;
-    int lmapSize;
-    int dlightBits[2];
-    float lmapStep;
-    int dlightMap[2];
-    byte* lmData;
-    float lmapX;
-    float lmapY;
-} srfTerrain_t;
-
-typedef struct cTerraPatchUnpacked_s {
-    srfTerrain_t drawinfo;
-    int viewCount;
-    int visCountCheck;
-    int visCountDraw;
-    int frameCount;
-    unsigned int uiDistRecalc;
-    float s;
-    float t;
-    vec2_t texCoord[2][2];
-    float x0;
-    float y0;
-    float z0;
-    float zmax;
-    shader_t* shader;
-    short int iNorth;
-    short int iEast;
-    short int iSouth;
-    short int iWest;
-    struct cTerraPatchUnpacked_s* pNextActive;
-    varnodeUnpacked_t varTree[2][63];
-    unsigned char heightmap[81];
-    byte flags;
-    byte byDirty;
-} cTerraPatchUnpacked_t;
-
-typedef struct srfStaticModel_s {
-    surfaceType_t surfaceType;
-    struct cStaticModelUnpacked_s* parent;
-} srfStaticModel_t;
-
-typedef struct cStaticModelUnpacked_s {
-    qboolean useSpecialLighting;
-    qboolean bLightGridCalculated;
-    qboolean bRendered;
-    char model[128];
-    vec3_t origin;
-    vec3_t angles;
-    vec3_t axis[3];
-    float scale;
-    int firstVertexData;
-    int numVertexData;
-    int visCount;
-    dtiki_t* tiki;
-    sphere_dlight_t dlights[MAX_DLIGHTS];
-    int numdlights;
-    float radius;
-    float cull_radius;
-    int iGridLighting;
-    float lodpercentage[2];
-} cStaticModelUnpacked_t;
-
-extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
-
-/*
-==============================================================================
-
-BRUSH MODELS
-
-==============================================================================
-*/
-
-
-//
-// in memory representation
-//
-
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-
-typedef struct msurface_s {
-	int					viewCount;		// if == tr.viewCount, already added
-	int					frameCount;
-	struct shader_s		*shader;
-	int					fogIndex;
-
-	surfaceType_t		*data;			// any of srf*_t
-} msurface_t;
-
-
-
-#define	CONTENTS_NODE		-1
-typedef struct mnode_s {
-	// common with leaf and node
-	int			contents;		// -1 for nodes, to differentiate from leafs
-	int			visframe;		// node needs to be traversed if current
-	vec3_t		mins, maxs;		// for bounding box culling
-	struct mnode_s	*parent;
-
-	// node specific
-	cplane_t	*plane;
-	struct mnode_s	*children[2];	
-
-	// leaf specific
-	int			cluster;
-    int			area;
-    spherel_t**	lights;
-    int			numlights;
-
-	msurface_t	**firstmarksurface;
-    int			nummarksurfaces;
-
-    int			firstTerraPatch;
-    int			numTerraPatches;
-    int			firstStaticModel;
-    int			numStaticModels;
-    void**		pFirstMarkFragment;
-    int			iNumMarkFragment;
-} mnode_t;
-
-typedef struct {
-	vec3_t		bounds[2];		// for culling
-	msurface_t	*firstSurface;
-	int			numSurfaces;
-    void** pFirstMarkFragment;
-    int iNumMarkFragment;
-    int frameCount;
-    qboolean hasLightmap;
-} bmodel_t;
-
-typedef struct {
-    float width;
-    float height;
-    float origin_x;
-    float origin_y;
-    float scale;
-    shader_t* shader;
-} sprite_t;
-
-typedef struct {
-	char		name[MAX_QPATH];		// ie: maps/tim_dm2.bsp
-	char		baseName[MAX_QPATH];	// ie: tim_dm2
-
-	int			dataSize;
-
-	int			numShaders;
-	dshader_t	*shaders;
-
-	int			numBmodels;
-	bmodel_t	*bmodels;
-
-	int			numplanes;
-	cplane_t	*planes;
-
-	int			numnodes;		// includes leafs
-	int			numDecisionNodes;
-	mnode_t		*nodes;
-
-	int			numsurfaces;
-	msurface_t	*surfaces;
-
-	int			nummarksurfaces;
-	msurface_t	**marksurfaces;
-
-	vec3_t		lightGridMins;
-	vec3_t		lightGridSize;
-	vec3_t		lightGridOOSize;
-	int			lightGridBounds[3];
-	unsigned short* lightGridOffsets;
-	byte		*lightGridData;
-	byte        lightGridPalette[768];
-
-    int numTerraPatches;
-    cTerraPatchUnpacked_t* terraPatches;
-    cTerraPatchUnpacked_t* activeTerraPatches;
-
-    int numVisTerraPatches;
-    cTerraPatchUnpacked_t** visTerraPatches;
-
-    int numStaticModelData;
-    byte* staticModelData;
-
-    int numStaticModels;
-    cStaticModelUnpacked_t* staticModels;
-
-    int numVisStaticModels;
-    cStaticModelUnpacked_t** visStaticModels;
-
-	int			numClusters;
-	int			clusterBytes;
-	const byte	*vis;			// may be passed in by CM_LoadMap to save space
-
-	byte		*novis;			// clusterBytes of 0xff
-	byte		*lighting;
-} world_t;
-
-//======================================================================
-
-typedef enum {
-	MOD_BAD,
-	MOD_BRUSH,
-	MOD_TIKI,
-	MOD_SPRITE
-} modtype_t;
-
-typedef struct model_s {
-	char		name[MAX_QPATH];
-	modtype_t	type;
-	int			index;				// model = tr.models[model->index]
-
-    qboolean serveronly;
-    union {
-        bmodel_t* bmodel;
-        dtiki_t* tiki;
-        sprite_t* sprite;
-    } d;
-} model_t;
-
-
-#define	MAX_MOD_KNOWN	1024
-
-void		R_ModelInit (void);
-model_t		*R_GetModelByHandle( qhandle_t hModel );
-int			R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, 
-					 float frac, const char *tagName );
-
-void		R_Modellist_f (void);
-
-//====================================================
-extern	refimport_t		ri;
-
-#define	MAX_DRAWIMAGES			2048
-#define	MAX_LIGHTMAPS			256
-#define	MAX_SKINS				1024
-#define MAX_SPHERE_LIGHTS		512
-
-#define	MAX_DRAWSURFS			0x10000
-#define	MAX_SPRITESURFS			0x8000
-#define	DRAWSURF_MASK			(MAX_DRAWSURFS-1)
-
-#define MAX_SPRITE_DIST				16384.0f
-#define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
-
-/*
-
-the drawsurf sort data is packed into a single 32 bit value so it can be
-compared quickly during the qsorting process
-
-the bits are allocated as follows:
-
-21 - 31	: sorted shader index
-11 - 20	: entity index
-2 - 6	: fog index
-//2		: used to be clipped flag REMOVED - 03.21.00 rad
-0 - 1	: dlightmap index
-
-	TTimo - 1.32
-17-31 : sorted shader index
-7-16  : entity index
-2-6   : fog index
-0-1   : dlightmap index
-*/
-#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.30
-#define	QSORT_ENTITYNUM_SHIFT	8
-#define	QSORT_FOGNUM_SHIFT		2
-#define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.30
-
-extern	int			gl_filter_min, gl_filter_max;
-
-/*
-** performanceCounters_t
-*/
-typedef struct {
-	int		c_sphere_cull_patch_in, c_sphere_cull_patch_clip, c_sphere_cull_patch_out;
-	int		c_box_cull_patch_in, c_box_cull_patch_clip, c_box_cull_patch_out;
-	int		c_sphere_cull_md3_in, c_sphere_cull_md3_clip, c_sphere_cull_md3_out;
-	int		c_box_cull_md3_in, c_box_cull_md3_clip, c_box_cull_md3_out;
-
-	int		c_leafs;
-	int		c_dlightSurfaces;
-	int		c_dlightSurfacesCulled;
-	int		c_dlightMaps;
-	int		c_dlightTexels;
-} frontEndCounters_t;
-
-#define	FOG_TABLE_SIZE		256
-#define FUNCTABLE_SIZE		1024
-#define FUNCTABLE_SIZE2		10
-#define FUNCTABLE_MASK		(FUNCTABLE_SIZE-1)
-
-
-// the renderer front end should never modify glstate_t
-typedef struct {
-	int			currenttextures[2];
-	int			currenttmu;
-	qboolean	finishCalled;
-	int			texEnv[2];
-	int			faceCulling;
-	int			cntTexEnvExt;
-	int			cntnvblendmode;
-	long unsigned int glStateBits;
-	long unsigned int externalSetState;
-	vec4_t fFogColor;
-} glstate_t;
-
-
-typedef struct {
-	int		c_surfaces, c_shaders, c_vertexes, c_indexes, c_totalIndexes, c_characterlights;
-	float	c_overDraw;
-	
-	int		c_dlightVertexes;
-	int		c_dlightIndexes;
-
-	int		c_flareAdds;
-	int		c_flareTests;
-	int		c_flareRenders;
-
-	int		msec;			// total msec for backend run
-} backEndCounters_t;
-
-// all state modified by the back end is seperated
-// from the front end state
-typedef struct {
-	int			smpFrame;
-	trRefdef_t	refdef;
-	viewParms_t	viewParms;
-	orientationr_t	ori;
-	backEndCounters_t	pc;
-	qboolean	isHyperspace;
-	trRefEntity_t	*currentEntity;
-    qboolean skyRenderedThisView;	// flag for drawing sun
-    sphereor_t spheres[MAX_SPHERE_LIGHTS];
-    unsigned short numSpheresUsed;
-    sphereor_t* currentSphere;
-    sphereor_t spareSphere;
-    sphereor_t hudSphere;
-    cStaticModelUnpacked_t* currentStaticModel;
-    int dsStreamVert;
-	qboolean in2D;	// if qtrue, drawstretchpic doesn't need to change modes
-	byte color2D[4];
-	qboolean vertexes2D;		// shader needs to be finished
-	trRefEntity_t entity2D;	// currentEntity will point at this when doing 2D rendering
-    int backEndMsec;
-    float shaderStartTime;
-} backEndState_t;
-
-/*
-** trGlobals_t 
-**
-** Most renderer globals are defined here.
-** backend functions should never modify any of these fields,
-** but may read fields that aren't dynamically modified
-** by the frontend.
-*/
-typedef struct {
-	qboolean				registered;		// cleared at shutdown, set at beginRegistration
-
-	int						visCount;		// incremented every time a new vis cluster is entered
-	int						frameCount;		// incremented every frame
-	int						sceneCount;		// incremented every scene
-	int						viewCount;		// incremented every view (twice a scene if portaled)
-											// and every R_MarkFragments call
-
-	int						smpFrame;		// toggles from 0 to 1 every endFrame
-
-	int						frameSceneNum;	// zeroed at RE_BeginFrame
-
-	qboolean				worldMapLoaded;
-	world_t					*world;
-
-	const byte				*externalVisData;	// from RE_SetWorldVisData, shared with CM_Load
-
-	image_t					*defaultImage;
-	image_t					*scratchImage;
-	image_t					*fogImage;
-	image_t					*dlightImage;	// inverse-quare highlight for projective adding
-	image_t					*flareImage;
-	image_t					*whiteImage;			// full of 0xff
-	image_t					*identityLightImage;	// full of tr.identityLightByte
-	image_t					*dlightImages[15];
-
-	shader_t				*defaultShader;
-	shader_t				*shadowShader;
-	shader_t				*projectionShadowShader;
-
-	shader_t				*flareShader;
-	shader_t				*sunShader;
-
-	int						numLightmaps;
-	image_t					*lightmaps[MAX_LIGHTMAPS];
-
-	trRefEntity_t			*currentEntity;
-	trRefEntity_t			worldEntity;		// point currentEntity at this when rendering world
-	int						currentEntityNum;
-	int						currentSpriteNum;
-	int						shiftedEntityNum;	// currentEntityNum << QSORT_ENTITYNUM_SHIFT
-	int                     shiftedIsStatic;
-	model_t					*currentModel;
-
-	viewParms_t				viewParms;
-
-	float					identityLight;		// 1.0 / ( 1 << overbrightBits )
-	int						identityLightByte;	// identityLight * 255
-	int						overbrightBits;		// r_overbrightBits->integer, but set to 0 if no hw gamma
-    int						overbrightShift;
-    float					overbrightMult;
-    int						needsLightScale;
-
-	orientationr_t			ori;				// for current entity
-
-	portalsky_t				portalsky;
-	qboolean				skyRendered;
-	qboolean				portalRendered;
-	trRefdef_t				refdef;
-
-	int						viewCluster;
-
-	vec3_t					sunLight;			// from the sky shader for this level
-	vec3_t					sunDirection;
-
-	frontEndCounters_t		pc;
-	int						frontEndMsec;		// not in pc due to clearing issue
-
-	//
-	// put large tables at the end, so most elements will be
-	// within the +/32K indexed range on risc processors
-	//
-	model_t					models[MAX_MOD_KNOWN];
-	int						numModels;
-
-	int						numImages;
-	image_t					images[MAX_DRAWIMAGES];
-
-	// shader indexes from other modules will be looked up in tr.shaders[]
-	// shader indexes from drawsurfs will be looked up in sortedShaders[]
-	// lower indexed sortedShaders must be rendered first (opaque surfaces before translucent)
-	int						numShaders;
-	shader_t				*shaders[MAX_SHADERS];
-	shader_t				*sortedShaders[MAX_SHADERS];
-
-	int						numSkins;
-	skin_t					*skins[MAX_SKINS];
-
-	float					sinTable[FUNCTABLE_SIZE];
-	float					squareTable[FUNCTABLE_SIZE];
-	float					triangleTable[FUNCTABLE_SIZE];
-	float					sawToothTable[FUNCTABLE_SIZE];
-	float					inverseSawToothTable[FUNCTABLE_SIZE];
-
-    spherel_t sSunLight;
-    spherel_t sLights[1532];
-    int numSLights;
-    int rendererhandle;
-    qboolean shadersParsed;
-    int frame_skel_index;
-    int skel_index[1024];
-    fontheader_t* pFontDebugStrings;
-
-	int farclip;
-} trGlobals_t;
-
-extern backEndState_t	backEnd;
-extern trGlobals_t	tr;
-extern glconfig_t	glConfig;		// outside of TR since it shouldn't be cleared during ref re-init
-
-// These variables should live inside glConfig but can't because of
-// compatibility issues to the original ID vms.  If you release a stand-alone
-// game and your mod uses tr_types.h from this build you can safely move them
-// to the glconfig_t struct.
-extern qboolean  textureFilterAnisotropic;
-extern int       maxAnisotropy;
-extern float     displayAspect;
-extern qboolean  haveClampToEdge;
-
-extern glstate_t	glState;		// outside of TR since it shouldn't be cleared during ref re-init
-extern int r_sequencenumber;
-
-
-//
-// cvars
-//
-extern cvar_t	*r_flareSize;
-extern cvar_t	*r_flareFade;
-
-extern cvar_t	*r_ignore;				// used for debugging anything
-extern cvar_t	*r_verbose;				// used for verbose debug spew
-extern cvar_t	*r_ignoreFastPath;		// allows us to ignore our Tess fast paths
-
-extern cvar_t	*r_znear;				// near Z clip plane
-
-extern cvar_t	*r_stencilbits;			// number of desired stencil bits
-extern cvar_t	*r_depthbits;			// number of desired depth bits
-extern cvar_t	*r_colorbits;			// number of desired color bits, only relevant for fullscreen
-extern cvar_t	*r_stereo;				// desired pixelformat stereo flag
-extern cvar_t	*r_textureDetails;
-extern cvar_t	*r_texturebits;			// number of desired texture bits
-										// 0 = use framebuffer depth
-										// 16 = use 16-bit textures
-										// 32 = use 32-bit textures
-										// all else = error
-
-extern cvar_t	*r_measureOverdraw;		// enables stencil buffer overdraw measurement
-
-extern cvar_t	*r_lodscale;
-
-extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existance
-										// "1" = glDrawElemet tristrips
-										// "2" = glDrawElements triangles
-										// "-1" = no drawing
-
-extern cvar_t	*r_inGameVideo;				// controls whether in game video should be draw
-extern cvar_t	*r_fastsky;				// controls whether sky should be cleared or drawn
-extern cvar_t	*r_fastdlights;
-extern cvar_t	*r_drawSun;				// controls drawing of sun quad
-extern cvar_t	*r_dlightBacks;			// dlight non-facing surfaces for continuity
-
-extern	cvar_t	*r_norefresh;			// bypasses the ref rendering
-extern	cvar_t	*r_drawentities;		// disable/enable entity rendering
-extern	cvar_t	*r_drawentitypoly;
-extern	cvar_t	*r_drawstaticmodels;
-extern	cvar_t	*r_drawstaticmodelpoly;
-extern	cvar_t	*r_drawbrushes;
-extern	cvar_t	*r_drawbrushmodels;
-extern	cvar_t	*r_drawstaticdecals;
-extern	cvar_t	*r_drawterrain;
-extern	cvar_t	*r_drawsprites;
-extern	cvar_t	*r_drawspherelights;
-extern	cvar_t	*r_drawworld;			// disable/enable world rendering
-extern	cvar_t	*r_speeds;				// various levels of information display
-extern  cvar_t	*r_detailTextures;		// enables/disables detail texturing stages
-extern	cvar_t	*r_novis;				// disable/enable usage of PVS
-extern	cvar_t	*r_nocull;
-extern	cvar_t	*r_showcull;
-extern	cvar_t	*r_facePlaneCull;		// enables culling of planar surfaces with back side test
-extern	cvar_t	*r_nocurves;
-extern	cvar_t	*r_showcluster;
-
-extern cvar_t	*r_mode;				// video mode
-extern cvar_t	*r_maxmode;
-extern cvar_t	*r_vidmode1024;
-extern cvar_t	*r_vidmodemax;
-extern cvar_t	*r_fullscreen;
-extern cvar_t	*r_gamma;
-extern cvar_t	*r_displayRefresh;		// optional display refresh option
-extern cvar_t	*r_ignorehwgamma;		// overrides hardware gamma capabilities
-
-extern cvar_t	*r_allowExtensions;				// global enable/disable of OpenGL extensions
-extern cvar_t	*r_ext_compressed_textures;		// these control use of specific extensions
-extern cvar_t	*r_ext_gamma_control;
-extern cvar_t	*r_ext_texenv_op;
-extern cvar_t	*r_ext_multitexture;
-extern cvar_t	*r_ext_compiled_vertex_array;
-extern cvar_t	*r_ext_texture_env_add;
-extern cvar_t	*r_ext_texture_env_combine;
-extern cvar_t	*r_ext_aniso_filter;
-extern cvar_t	*r_ext_max_anisotropy;
-extern cvar_t	*r_forceClampToEdge;
-extern cvar_t	*r_geForce3WorkAround;
-extern cvar_t	*r_reset_tc_array;
-
-extern	cvar_t	*r_nobind;						// turns off binding to appropriate textures
-extern	cvar_t	*r_singleShader;				// make most world faces use default shader
-extern	cvar_t	*r_lerpmodels;
-extern	cvar_t	*r_roundImagesDown;
-extern	cvar_t	*r_colorMipLevels;				// development aid to see texture mip usage
-extern	cvar_t	*r_picmip;						// controls picmip values
-extern	cvar_t	*r_finish;
-extern	cvar_t	*r_drawBuffer;
-extern  cvar_t  *r_glDriver;
-extern	cvar_t	*r_swapInterval;
-extern	cvar_t	*r_textureMode;
-extern	cvar_t	*r_offsetFactor;
-extern	cvar_t	*r_offsetUnits;
-
-extern	cvar_t	*r_fullbright;					// avoid lightmap pass
-extern	cvar_t	*r_lightmap;					// render lightmaps only
-extern	cvar_t	*r_vertexLight;					// vertex lighting mode for better performance
-
-extern	cvar_t	*r_logFile;						// number of frames to emit GL logs
-extern	cvar_t	*r_showtris;					// enables wireframe rendering of the world
-extern	cvar_t	*r_showsky;						// forces sky in front of all surfaces
-extern	cvar_t	*r_shownormals;					// draws wireframe normals
-extern	cvar_t	*r_showhbox;
-extern	cvar_t	*r_showstaticbboxes;
-extern	cvar_t	*r_clear;						// force screen clear every frame
-
-extern	cvar_t	*r_shadows;						// controls shadows: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
-extern	cvar_t	*r_entlight_scale;
-extern	cvar_t	*r_entlight_errbound;
-extern	cvar_t	*r_entlight_cubelevel;
-extern	cvar_t	*r_entlight_cubefraction;
-extern	cvar_t	*r_entlight_maxcalc;
-extern	cvar_t	*r_flares;						// light flares
-
-extern	cvar_t	*r_intensity;
-
-extern	cvar_t	*r_lockpvs;
-extern	cvar_t	*r_noportals;
-extern	cvar_t	*r_entlightmap;
-extern	cvar_t	*r_fastentlight;
-extern	cvar_t	*r_portalOnly;
-
-extern	cvar_t	*r_subdivisions;
-extern	cvar_t	*r_lodCurveError;
-extern	cvar_t	*r_smp;
-extern	cvar_t	*r_showSmp;
-extern	cvar_t	*r_skipBackEnd;
-
-extern	cvar_t	*r_ignoreGLErrors;
-
-extern	cvar_t	*r_overBrightBits;
-extern	cvar_t	*r_mapOverBrightBits;
-
-extern	cvar_t	*r_debugSurface;
-
-extern	cvar_t	*r_showImages;
-extern	cvar_t	*r_showlod;
-extern	cvar_t	*r_showstaticlod;
-extern	cvar_t	*r_debugSort;
-
-extern	cvar_t	*r_printShaders;
-extern	cvar_t	*r_saveFontData;
-
-extern	cvar_t* r_staticlod;
-extern	cvar_t* r_lodscale;
-extern	cvar_t* r_lodcap;
-extern	cvar_t* r_lodviewmodelcap;
-
-extern  cvar_t* r_uselod;
-extern  cvar_t* lod_LOD;
-extern  cvar_t* lod_minLOD;
-extern  cvar_t* lod_maxLOD;
-extern  cvar_t* lod_LOD_slider;
-extern  cvar_t* lod_curve_0_val;
-extern  cvar_t* lod_curve_1_val;
-extern  cvar_t* lod_curve_2_val;
-extern  cvar_t* lod_curve_3_val;
-extern  cvar_t* lod_curve_4_val;
-extern  cvar_t* lod_edit_0;
-extern  cvar_t* lod_edit_1;
-extern  cvar_t* lod_edit_2;
-extern  cvar_t* lod_edit_3;
-extern  cvar_t* lod_edit_4;
-extern  cvar_t* lod_curve_0_slider;
-extern  cvar_t* lod_curve_1_slider;
-extern  cvar_t* lod_curve_2_slider;
-extern  cvar_t* lod_curve_3_slider;
-extern  cvar_t* lod_curve_4_slider;
-extern  cvar_t* lod_pitch_val;
-extern  cvar_t* lod_zee_val;
-extern  cvar_t* lod_mesh;
-extern  cvar_t* lod_meshname;
-extern  cvar_t* lod_tikiname;
-extern  cvar_t* lod_metric;
-extern  cvar_t* lod_tris;
-extern  cvar_t* lod_position;
-extern  cvar_t* lod_save;
-extern  cvar_t* lod_tool;
-extern	cvar_t* sys_cpuid;
-extern	cvar_t* r_sse;
-extern	cvar_t* r_static_shaderdata0;
-extern	cvar_t* r_static_shaderdata1;
-extern	cvar_t* r_static_shaderdata2;
-extern	cvar_t* r_static_shaderdata3;
-extern	cvar_t* r_static_shadermultiplier0;
-extern	cvar_t* r_static_shadermultiplier1;
-extern	cvar_t* r_static_shadermultiplier2;
-extern	cvar_t* r_static_shadermultiplier3;
-
-extern  cvar_t* r_numdebuglines;
-
-extern	cvar_t* r_stipplelines;
-extern	cvar_t* r_light_lines;
-extern	cvar_t* r_light_sun_line;
-extern	cvar_t* r_light_int_scale;
-extern	cvar_t* r_light_nolight;
-extern	cvar_t* r_light_showgrid;
-extern	cvar_t* r_skyportal;
-extern	cvar_t* r_skyportal_origin;
-extern	cvar_t* r_farplane;
-extern	cvar_t* r_farplane_bias;
-extern	cvar_t* r_farplane_color;
-extern	cvar_t* r_farplane_nocull;
-extern	cvar_t* r_farplane_nofog;
-extern	cvar_t* r_skybox_farplane;
-extern	cvar_t* r_farclip;
-extern	cvar_t* r_lightcoronasize;
-extern	cvar_t* r_useglfog;
-extern	cvar_t* r_debuglines_depthmask;
-extern	cvar_t* r_smoothsmokelight;
-extern	cvar_t* r_showportal;
-extern	cvar_t* ter_minMarkRadius;
-extern	cvar_t* ter_fastMarks;
-extern	cvar_t* r_alpha_foliage1;
-extern	cvar_t* r_alpha_foliage2;
-extern	cvar_t* r_blendtrees;
-extern	cvar_t* r_blendbushes;
-extern	cvar_t* r_bumpmap;
-extern	cvar_t* r_loadjpg;
-extern	cvar_t* r_loadftx;
-
-extern  cvar_t* r_showSkeleton;
-
-//====================================================================
-
-float R_NoiseGet4f( float x, float y, float z, float t );
-void  R_NoiseInit( void );
-
-void R_SwapBuffers( int );
-
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
-void R_RenderView( viewParms_t *parms );
-
-qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum);
-
-void R_AddMD3Surfaces( trRefEntity_t *e );
-void R_AddNullModelSurfaces( trRefEntity_t *e );
-void R_AddBeamSurfaces( trRefEntity_t *e );
-void R_AddRailSurfaces( trRefEntity_t *e, qboolean isUnderwater );
-void R_AddLightningBoltSurfaces( trRefEntity_t *e );
-
-void R_AddPolygonSurfaces( void );
-
-void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel);
-
-void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap);
-
-
-#define	CULL_IN		0		// completely unclipped
-#define	CULL_CLIP	1		// clipped by one or more planes
-#define	CULL_OUT	2		// completely outside the clipping planes
-void R_LocalNormalToWorld (const vec3_t local, vec3_t world);
-void R_LocalPointToWorld (const vec3_t local, vec3_t world);
-int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]);
-int R_CullLocalBox (vec3_t bounds[2]);
-int R_CullPointAndRadius( vec3_t origin, float radius );
-int R_CullLocalPointAndRadius( vec3_t origin, float radius );
-int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius);
-int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius);
-
-void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms, orientationr_t *ori );
-void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori );
-void R_RotateForViewer(void);
-void R_SetupFrustum(void);
-
-/*
-** GL wrapper/helper functions
-*/
-void	GL_SetFogColor(const vec4_t fColor);
-void	GL_Bind( image_t *image );
-void	GL_SetDefaultState (void);
-void	GL_SelectTexture( int unit );
-void	GL_TextureMode( const char *string );
-void	GL_CheckErrors( void );
-void	GL_State( unsigned long stateVector );
-void	GL_TexEnv( int env );
-void	GL_Cull( int cullType );
-
-#define GLS_SRCBLEND_ZERO						0x00000001
-#define GLS_SRCBLEND_ONE						0x00000002
-#define GLS_SRCBLEND_DST_COLOR					0x00000003
-#define GLS_SRCBLEND_ONE_MINUS_DST_COLOR		0x00000004
-#define GLS_SRCBLEND_SRC_ALPHA					0x00000005
-#define GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA		0x00000006
-#define GLS_SRCBLEND_DST_ALPHA					0x00000007
-#define GLS_SRCBLEND_ONE_MINUS_DST_ALPHA		0x00000008
-#define GLS_SRCBLEND_ALPHA_SATURATE				0x00000009
-#define		GLS_SRCBLEND_BITS					0x0000000f
-
-#define GLS_DSTBLEND_ZERO						0x00000010
-#define GLS_DSTBLEND_ONE						0x00000020
-#define GLS_DSTBLEND_SRC_COLOR					0x00000030
-#define GLS_DSTBLEND_ONE_MINUS_SRC_COLOR		0x00000040
-#define GLS_DSTBLEND_SRC_ALPHA					0x00000050
-#define GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA		0x00000060
-#define GLS_DSTBLEND_DST_ALPHA					0x00000070
-#define GLS_DSTBLEND_ONE_MINUS_DST_ALPHA		0x00000080
-#define		GLS_DSTBLEND_BITS					0x000000f0
-
-#define GLS_DEPTHMASK_TRUE						0x00000100
-#define GLS_COLOR_MASK							0x00000200
-#define GLS_POLYMODE_LINE						0x00000400
-#define GLS_DEPTHTEST_DISABLE					0x00000800
-#define GLS_DEPTHFUNC_EQUAL						0x00001000
-
-#define GLS_CLAMP_EDGE							0x00002000
-#define GLS_MULTITEXTURE						0x00004000
-#define GLS_MULTITEXTURE_ENV					0x00008000
-#define GLS_FOG									0x00010000
-
-#define GLS_FOG_ENABLED							0x00020000
-#define GLS_FOG_BLACK							0x00040000
-#define GLS_FOG_WHITE							0x00080000
-#define GLS_FOG_COLOR							(GLS_FOG_BLACK | GLS_FOG_WHITE)
-#define GLS_FOG_BITS							(GLS_FOG_WHITE|GLS_FOG_BLACK|GLS_FOG_ENABLED)
-#define GLS_COLOR_NOMASK						0x00100000
-
-#define GLS_ATEST_GT_0							0x10000000
-#define GLS_ATEST_LT_80							0x20000000
-#define GLS_ATEST_GE_80							0x30000000
-#define GLS_ATEST_LT_FOLIAGE1					0x40000000
-#define GLS_ATEST_GE_FOLIAGE1					0x50000000
-#define GLS_ATEST_LT_FOLIAGE2					0x60000000
-#define GLS_ATEST_GE_FOLIAGE2					0x70000000
-#define GLS_ATEST_BITS							0x70000000
-
-#define GLS_DEFAULT			GLS_DEPTHMASK_TRUE
-
-void Draw_SetColor(const vec4_t rgba);
-void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
-void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
-void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
-void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
-void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
-void DrawBox(float x, float y, float w, float h);
-void AddBox(float x, float y, float w, float h);
-void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
-void RE_Scissor(int x, int y, int width, int height);
-void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
-void RE_StretchRaw(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
-void	RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty);
-
-void		RE_BeginFrame( stereoFrame_t stereoFrame );
-void		RE_BeginRegistration( glconfig_t *glconfig );
-void		RE_LoadWorldMap( const char *mapname );
-void		RE_PrintBSPFileSizes(void);
-int			RE_MapVersion(void);
-void		RE_SetWorldVisData( const byte *vis );
-qhandle_t	RE_RegisterModel( const char *name );
-qhandle_t	RE_RegisterSkin( const char *name );
-void		RE_Shutdown( qboolean destroyWindow );
-void        R_ClearWorld(void);
-
-qboolean	R_GetEntityToken( char *buffer, int size );
-
-model_t		*R_AllocModel( void );
-
-void    	R_Init( void );
-image_t		*R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-image_t		*R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-
-image_t* R_CreateImage(
-	const char* name,
-	byte* pic,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean allowPicmip,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int glCompressMode,
-	int glWrapClampModeX,
-	int glWrapClampModeY
-);
-qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );
-
-void		R_SetColorMappings( void );
-void		R_GammaCorrect( byte *buffer, int bufSize );
-
-void	R_ImageList_f( void );
-void	R_SkinList_f( void );
-// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=516
-const void *RB_TakeScreenshotCmd( const void *data );
-void	R_ScreenShot_f( void );
-
-void	R_InitImages( void );
-void	R_FreeImage(image_t* image);
-void	R_DeleteTextures( void );
-void    R_FreeUnusedImages( void );
-int		R_SumOfUsedImages( void );
-skin_t	*R_GetSkinByHandle( qhandle_t hSkin );
-
-
-//
-// tr_shader.c
-//
-qhandle_t		 RE_RegisterShader( const char *name );
-qhandle_t		 RE_RegisterShaderNoMip( const char *name );
-qhandle_t		RE_RefreshShaderNoMip(const char* name);
-qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_t *image, qboolean mipRawImage);
-
-shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy);
-shader_t	*R_GetShaderByHandle( qhandle_t hShader );
-shader_t	*R_GetShaderByState( int index, long *cycleTime );
-void R_StartupShaders();
-void R_ShutdownShaders();
-void R_SetupShaders();
-void		R_ShaderList_f( void );
-void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
-
-/*
-====================================================================
-
-IMPLEMENTATION SPECIFIC FUNCTIONS
-
-====================================================================
-*/
-
-void		GLimp_Init( qboolean fixedFunction );
-void		GLimp_Shutdown( void );
-void		GLimp_EndFrame( void );
-
-qboolean	GLimp_SpawnRenderThread( void (*function)( void ) );
-void		*GLimp_RendererSleep( void );
-void		GLimp_FrontEndSleep( void );
-void		GLimp_WakeRenderer( void *data );
-
-void		GLimp_LogComment( char *comment );
-
-// NOTE TTimo linux works with float gamma value, not the gamma table
-//   the params won't be used, getting the r_gamma cvar directly
-void		GLimp_SetGamma( unsigned char red[256], 
-						    unsigned char green[256],
-							unsigned char blue[256] );
-
-
-/*
-====================================================================
-
-TESSELATOR/SHADER DECLARATIONS
-
-====================================================================
-*/
-typedef byte color4ub_t[4];
-
-typedef struct stageVars
-{
-	color4ub_t	colors[SHADER_MAX_VERTEXES];
-	vec2_t		texcoords[NUM_TEXTURE_BUNDLES][SHADER_MAX_VERTEXES];
-} stageVars_t;
-
-typedef struct shaderCommands_s 
-{
-	glIndex_t	indexes[SHADER_MAX_INDEXES] QALIGN(16);
-	vec4_t		xyz[SHADER_MAX_VERTEXES] QALIGN(16);
-	vec4_t		normal[SHADER_MAX_VERTEXES] QALIGN(16);
-	vec2_t		texCoords[SHADER_MAX_VERTEXES][2] QALIGN(16);
-	color4ub_t	vertexColors[SHADER_MAX_VERTEXES] QALIGN(16);
-	int			vertexDlightBits[SHADER_MAX_VERTEXES] QALIGN(16);
-
-	stageVars_t	svars QALIGN(16);
-
-	color4ub_t	constantColor255[SHADER_MAX_VERTEXES] QALIGN(16);
-
-	shader_t	*shader;
-	float		shaderTime;
-	int			fogNum;
-
-	int			dlightBits;	// or together of all vertexDlightBits
-	int			dlightMap;
-
-	int			numIndexes;
-	int			numVertexes;
-
-	// info extracted from current shader
-	int			numPasses;
-	void		(*currentStageIteratorFunc)( void );
-	shaderStage_t	**xstages;
-    qboolean no_global_fog;
-    qboolean vertexColorValid;
-} shaderCommands_t;
-
-extern	shaderCommands_t	tess;
-
-void RB_BeginSurface(shader_t *shader );
-void RB_EndSurface(void);
-void RB_CheckOverflow( int verts, int indexes );
-#define RB_CHECKOVERFLOW(v,i) if (tess.numVertexes + (v) >= SHADER_MAX_VERTEXES || tess.numIndexes + (i) >= SHADER_MAX_INDEXES ) {RB_CheckOverflow(v,i);}
-
-void RB_StageIteratorGeneric( void );
-void RB_StageIteratorSky( void );
-void RB_StageIteratorVertexLitTextureUnfogged( void );
-void RB_StageIteratorLightmappedMultitextureUnfogged( void );
-
-void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color );
-void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 );
-
-void RB_ShowImages( qboolean quiet );
-
-
-/*
-============================================================
-
-WORLD MAP
-
-============================================================
-*/
-
-extern terraTri_t* g_pTris;
-extern terrainVert_t* g_pVert;
-
-void R_AddBrushModelSurfaces( trRefEntity_t *e );
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
-int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes);
-mnode_t* R_PointInLeaf(const vec3_t p);
-int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
-int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
-void R_AddWorldSurfaces( void );
-qboolean R_inPVS( const vec3_t p1, const vec3_t p2 );
-
-
-/*
-============================================================
-
-FLARES
-
-============================================================
-*/
-
-void R_ClearFlares( void );
-
-void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal );
-void RB_AddDlightFlares( void );
-void RB_RenderFlares (void);
-
-/*
-============================================================
-
-LIGHTS
-
-============================================================
-*/
-
-void R_DlightBmodel( bmodel_t *bmodel );
-void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
-void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight);
-void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
-void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
-void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent );
-void RB_SetupEntityGridLighting();
-void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
-int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBit);
-int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits);
-int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits);
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *ori );
-void RB_Light_Real(unsigned char* colors);
-void RB_Sphere_BuildDLights();
-void RB_Sphere_SetupEntity();
-void RB_Grid_SetupEntity();
-void RB_Grid_SetupStaticModel();
-void RB_Light_Fullbright(unsigned char* colors);
-void R_Sphere_InitLights();
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
-void R_ClearRealDlights();
-void R_UploadDlights();
-
-
-/*
-============================================================
-
-SHADOWS
-
-============================================================
-*/
-
-void RB_ShadowTessEnd( void );
-void RB_ComputeShadowVolume();
-void RB_ShadowFinish( void );
-void RB_ProjectionShadowDeform( void );
-
-/*
-============================================================
-
-SKIES
-
-============================================================
-*/
-
-void R_BuildCloudData( shaderCommands_t *shader );
-void R_InitSkyTexCoords( float cloudLayerHeight );
-void R_DrawSkyBox( shaderCommands_t *shader );
-void RB_DrawSun( void );
-void RB_ClipSkyPolygons( shaderCommands_t *shader );
-
-/*
-============================================================
-
-CURVE TESSELATION
-
-============================================================
-*/
-
-#define PATCH_STITCHING
-
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
-								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] );
-srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror );
-srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror );
-void R_FreeSurfaceGridMesh( srfGridMesh_t *grid );
-
-/*
-============================================================
-
-MARKERS, POLYGON PROJECTION ON WORLD POLYGONS
-
-============================================================
-*/
-
-int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared);
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
-	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
-
-
-/*
-============================================================
-
-SCENE GENERATION
-
-============================================================
-*/
-
-void R_ToggleSmpFrame( void );
-
-void RE_ClearScene( void );
-void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber);
-void RE_AddRefSpriteToScene(const refEntity_t* ent);
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-refEntity_t* RE_GetRenderEntity(int entityNumber);
-qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type );
-void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
-void RE_RenderScene( const refdef_t *fd );
-
-/*
-=============================================================
-
-ANIMATED MODELS
-
-=============================================================
-*/
-
-void R_MakeAnimModel( model_t *model );
-void R_AddAnimSurfaces(trRefEntity_t* ent);
-
-/*
-=============================================================
-
-FONT
-
-=============================================================
-*/
-fontheader_t* R_LoadFont(const char* name);
-void R_LoadFontShader(fontheader_sgl_t* font);
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
-void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
-float R_GetFontHeight(const fontheader_t* font);
-float R_GetFontStringWidth(const fontheader_t* font, const char* s);
-
-/*
-=============================================================
-
-MARKS
-
-=============================================================
-*/
-void R_LevelMarksLoad(const char* szBSPName);
-void R_LevelMarksInit();
-void R_LevelMarksFree();
-void R_UpdateLevelMarksSystem();
-void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
-
-/*
-=============================================================
-
-SKY PORTALS
-
-=============================================================
-*/
-void R_Sky_Init();
-void R_Sky_Reset();
-void R_Sky_AddSurf(msurface_t* surf);
-void R_Sky_Render();
-
-/*
-=============================================================
-
-SPRITE
-
-=============================================================
-*/
-sprite_t* SPR_RegisterSprite(const char* name);
-void RB_DrawSprite(const refSprite_t* spr);
-
-
-/*
-=============================================================
-
-SUN FLARE
-
-=============================================================
-*/
-void R_InitLensFlare();
-void R_DrawLensFlares();
-
-/*
-=============================================================
-
-SWIPE
-
-=============================================================
-*/
-void RB_DrawSwipeSurface(surfaceType_t* pswipe);
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
-void RE_SwipeEnd();
-void R_AddSwipeSurfaces();
-
-/*
-=============================================================
-
-TERRAIN
-
-=============================================================
-*/
-void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
-void R_AddTerrainSurfaces();
-void R_AddTerrainMarkSurfaces();
-void R_InitTerrain();
-void R_TerrainPrepareFrame();
-qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
-void R_SwapTerraPatch(cTerraPatch_t* pPatch);
-
-void R_TerrainCrater_f(void);
-
-/*
-=============================================================
-
-TIKI
-
-=============================================================
-*/
-struct skelHeaderGame_s;
-struct skelAnimFrame_s;
-
-void R_InitStaticModels(void);
-void RE_FreeModels(void);
-qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
-qhandle_t RE_RegisterServerModel(const char* name);
-void RE_UnregisterServerModel(qhandle_t hModel);
-orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
-qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
-float R_ModelRadius(qhandle_t handle);
-void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
-dtiki_t* R_Model_GetHandle(qhandle_t handle);
-
-float R_GetRadius(refEntity_t* model);
-void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
-void RE_ForceUpdatePose(refEntity_t* model);
-void RE_SetFrameNumber(int frameNumber);
-void R_UpdatePoseInternal(refEntity_t* model);
-void RB_SkelMesh(skelSurfaceGame_t* sf);
-void RB_StaticMesh(staticSurface_t* staticSurf);
-void RB_Static_BuildDLights();
-void R_InfoStaticModels_f(void);
-void R_PrintInfoStaticModels();
-void R_AddSkelSurfaces(trRefEntity_t* ent);
-void R_AddStaticModelSurfaces(void);
-void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris);
-float R_CalcLod(const vec3_t origin, float radius);
-int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
-int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
-void R_InfoWorldTris_f(void);
-void R_PrintInfoWorldtris(void);
-void R_DebugSkeleton(void);
-
-extern int g_nStaticSurfaces;
-extern qboolean g_bInfostaticmodels;
-extern qboolean g_bInfoworldtris;
-
-/*
-=============================================================
-
-UTIL
-
-=============================================================
-*/
-void RB_StreamBegin(shader_t* shader);
-void RB_StreamEnd(void);
-void RB_StreamBeginDrawSurf(void);
-void RB_StreamEndDrawSurf(void);
-static void addTriangle(void);
-void RB_Vertex3fv(vec3_t v);
-void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
-void RB_Vertex2f(vec_t x, vec_t y);
-void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
-void RB_Color3f(vec_t r, vec_t g, vec_t b);
-void RB_Color3fv(vec3_t col);
-void RB_Color4bv(unsigned char* colors);
-void RB_Texcoord2f(float s, float t);
-void RB_Texcoord2fv(vec2_t st);
-void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
-void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
-int RE_GetShaderWidth(qhandle_t hShader);
-int RE_GetShaderHeight(qhandle_t hShader);
-const char* RE_GetShaderName(qhandle_t hShader);
-const char* RE_GetModelName(qhandle_t hModel);
-
-/*
-=============================================================
-
-GHOST
-
-=============================================================
-*/
-
-void R_UpdateGhostTextures();
-void R_SetGhostImage(const char* name, image_t* image);
-void LoadGHOST(const char* name, byte** pic, int* width, int* height);
-
-/*
-=============================================================
-=============================================================
-*/
-void	R_TransformModelToClip( const vec3_t src, const float *modelMatrix, const float *projectionMatrix,
-							vec4_t eye, vec4_t dst );
-void	R_TransformClipToWindow( const vec4_t clip, const viewParms_t *view, vec4_t normalized, vec4_t window );
-
-void	RB_DeformTessGeometry( void );
-
-void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
-void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
-void	RB_CalcSunReflectionTexCoords( float *dstTexCoords );
-void	RB_CalcOffsetTexCoords(const float* offset, float* st);
-void	RB_CalcParallaxTexCoords(const float* rate, float* st);
-void	RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv);
-void	RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2]);
-void	RB_CalcMacroTexCoords(const  float* rate, float* st);
-void	RB_CalcScrollTexCoords( const float scroll[2], float *dstTexCoords );
-void	RB_CalcRotateTexCoords( float degsPerSecond, float degsPerSecondCoef, float* st, float start );
-void	RB_CalcScaleTexCoords( const float scale[2], float *dstTexCoords );
-void	RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *dstTexCoords );
-void	RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *dstTexCoords );
-void	RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors );
-void	RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor);
-void	RB_CalcAlphaFromEntity( unsigned char *dstColors );
-void	RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors );
-void	RB_CalcStretchTexCoords( const waveForm_t *wf, float *texCoords );
-void	RB_CalcColorFromEntity( unsigned char *dstColors );
-void	RB_CalcColorFromOneMinusEntity( unsigned char *dstColors );
-void	RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor);
-void	RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha);
-void	RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-void	RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-void	RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin);
-void	RB_CalcLightGridColor(unsigned char* colors);
-void	RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcDiffuseColor( unsigned char *colors );
-
-void	RB_CalcStretchTexCoords(const waveForm_t* wf, float* st);
-void	RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st);
-void	RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st);
-void	RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st);
-
-/*
-=============================================================
-
-RENDERER BACK END FUNCTIONS
-
-=============================================================
-*/
-
-void RB_RenderThread( void );
-void RB_ExecuteRenderCommands( const void *data );
-
-/*
-=============================================================
-
-RENDERER BACK END COMMAND QUEUE
-
-=============================================================
-*/
-
-#define	MAX_RENDER_COMMANDS	0x40000
-
-typedef struct suninfo_s {
-	vec3_t color;
-	vec3_t direction;
-	vec3_t flaredirection;
-	char szFlareName[64];
-	qboolean exists;
-} suninfo_t;
-
-extern suninfo_t s_sun;
-
-typedef struct {
-	byte	cmds[MAX_RENDER_COMMANDS];
-	int		used;
-} renderCommandList_t;
-
-typedef struct {
-	int		commandId;
-	float	color[4];
-} setColorCommand_t;
-
-typedef struct {
-	int		commandId;
-	int		buffer;
-} drawBufferCommand_t;
-
-typedef struct {
-	int		commandId;
-	image_t	*image;
-	int		width;
-	int		height;
-	void	*data;
-} subImageCommand_t;
-
-typedef struct {
-	int		commandId;
-} swapBuffersCommand_t;
-
-typedef struct {
-	int		commandId;
-	int		buffer;
-} endFrameCommand_t;
-
-typedef struct {
-	int		commandId;
-	shader_t	*shader;
-	float	x, y;
-	float	w, h;
-	float	s1, t1;
-	float	s2, t2;
-} stretchPicCommand_t;
-
-typedef struct {
-	int		commandId;
-	trRefdef_t	refdef;
-	viewParms_t	viewParms;
-	drawSurf_t *drawSurfs;
-	int		numDrawSurfs;
-} drawSurfsCommand_t;
-
-typedef struct {
-	int commandId;
-	int x;
-	int y;
-	int width;
-	int height;
-	char *fileName;
-	qboolean jpeg;
-} screenshotCommand_t;
-
-typedef enum {
-	RC_END_OF_LIST,
-	RC_SET_COLOR,
-	RC_STRETCH_PIC,
-	RC_DRAW_SURFS,
-	RC_SPRITE_SURFS,
-	RC_DRAW_BUFFER,
-	RC_SWAP_BUFFERS,
-	RC_SCREENSHOT
-} renderCommand_t;
-
-
-// these are sort of arbitrary limits.
-// the limits apply to the sum of all scenes in a frame --
-// the main view, all the 3D icons, etc
-#define	MAX_POLYS		4096
-#define	MAX_POLYVERTS	16384
-#define	MAX_TERMARKS	1024
-
-// all of the information needed by the back end must be
-// contained in a backEndData_t.  This entire structure is
-// duplicated so the front and back end can run in parallel
-// on an SMP machine
-typedef struct {
-	drawSurf_t	drawSurfs[MAX_DRAWSURFS];
-	drawSurf_t  spriteSurfs[MAX_SPRITESURFS];
-	dlight_t	dlights[MAX_DLIGHTS];
-	trRefEntity_t	entities[MAX_ENTITIES];
-	srfMarkFragment_t* terMarks;
-	srfPoly_t	*polys;
-	polyVert_t	*polyVerts;
-	refSprite_t sprites[2048];
-	cStaticModelUnpacked_t* staticModels;
-	byte* staticModelData;
-	renderCommandList_t	commands;
-} backEndData_t;
-
-extern	int		max_polys;
-extern	int		max_polyverts;
-extern	int		max_termarks;
-
-extern	backEndData_t	*backEndData[SMP_FRAMES];	// the second one may not be allocated
-
-extern	volatile renderCommandList_t	*renderCommandList;
-
-extern	volatile qboolean	renderThreadActive;
-
-
-void *R_GetCommandBuffer( int bytes );
-void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
-void R_AddSpriteSurfCmd( drawSurf_t* drawSurfs, int numDrawSurfs );
-void RB_ExecuteRenderCommands( const void *data );
-
-void R_SavePerformanceCounters(void);
-void R_InitCommandBuffers( void );
-void R_ShutdownCommandBuffers( void );
-
-void R_SyncRenderThread( void );
-
-void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
-
-void RE_SetColor( const float *rgba );
-void RE_StretchPic ( float x, float y, float w, float h, 
-					  float s1, float t1, float s2, float t2, qhandle_t hShader );
-void RE_BeginFrame( stereoFrame_t stereoFrame );
-void RE_EndFrame( int *frontEndMsec, int *backEndMsec );
-void RE_SaveJPG(char* filename, int quality, int image_width, int image_height,
-    unsigned char* image_buffer, int padding);
-size_t RE_SaveJPGToBuffer(byte* buffer, size_t bufSize, int quality,
-    int image_width, int image_height, byte* image_buffer, int padding);
-
-void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer);
-
-void UI_LoadResource(const char* name);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
deleted file mode 100644
index 8b74a47f..00000000
--- a/code/renderer/tr_main.c
+++ /dev/null
@@ -1,1953 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_main.c -- main control flow for each frame
-
-#include "tr_local.h"
-#include "tiki.h"
-
-trGlobals_t		tr;
-
-static float	s_flipMatrix[16] = {
-	// convert from our coordinate system (looking down X)
-	// to OpenGL's coordinate system (looking down -Z)
-	0, 0, -1, 0,
-	-1, 0, 0, 0,
-	0, 1, 0, 0,
-	0, 0, 0, 1
-};
-
-
-refimport_t	ri;
-
-// entities that will have procedurally generated surfaces will just
-// point at this for their sorting surface
-surfaceType_t	entitySurface = SF_ENTITY;
-
-/*
-=================
-R_CullLocalBox
-
-Returns CULL_IN, CULL_CLIP, or CULL_OUT
-=================
-*/
-int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]) {
-	int		i, j;
-	vec3_t	transformed[8];
-	float	dists[8];
-	vec3_t	v;
-	cplane_t	*frust;
-	int			anyBack;
-	int			front, back;
-
-	if ( r_nocull->integer ) {
-		return CULL_CLIP;
-	}
-
-	// transform into world space
-	for (i = 0 ; i < 8 ; i++) {
-		v[0] = bounds[i&1][0];
-		v[1] = bounds[(i>>1)&1][1];
-		v[2] = bounds[(i>>2)&1][2];
-
-		VectorCopy( tr.ori.origin, transformed[i] );
-		VectorAdd(transformed[i], offset, transformed[i]);
-		VectorMA( transformed[i], v[0], tr.ori.axis[0], transformed[i] );
-		VectorMA( transformed[i], v[1], tr.ori.axis[1], transformed[i] );
-		VectorMA( transformed[i], v[2], tr.ori.axis[2], transformed[i] );
-	}
-
-	// check against frustum planes
-	anyBack = 0;
-	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4 ; i++) {
-		frust = &tr.viewParms.frustum[i];
-
-		front = back = 0;
-		for (j = 0 ; j < 8 ; j++) {
-			dists[j] = DotProduct(transformed[j], frust->normal);
-			if ( dists[j] > frust->dist ) {
-				front = 1;
-				if ( back ) {
-					break;		// a point is in front
-				}
-			} else {
-				back = 1;
-			}
-		}
-		if ( !front ) {
-			// all points were behind one of the planes
-			return CULL_OUT;
-		}
-		anyBack |= back;
-	}
-
-	if ( !anyBack ) {
-		return CULL_IN;		// completely inside frustum
-	}
-
-	return CULL_CLIP;		// partially clipped
-}
-
-int R_CullLocalBox(vec3_t bounds[2]) {
-	return R_CullLocalBoxOffset(vec3_origin, bounds);
-}
-
-/*
-** R_CullLocalPointAndRadius
-*/
-int R_CullLocalPointAndRadius( vec3_t pt, float radius )
-{
-	vec3_t transformed;
-
-	R_LocalPointToWorld( pt, transformed );
-
-	return R_CullPointAndRadius( transformed, radius );
-}
-
-/*
-** R_CullPointAndRadius
-*/
-int R_CullPointAndRadius( vec3_t pt, float radius )
-{
-	int		i;
-	float	dist;
-	cplane_t	*frust;
-	qboolean mightBeClipped = qfalse;
-
-	if ( r_nocull->integer ) {
-		return CULL_CLIP;
-	}
-
-	// check against frustum planes
-	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4; i++)
-	{
-		frust = &tr.viewParms.frustum[i];
-
-		dist = DotProduct( pt, frust->normal) - frust->dist;
-		if ( dist < -radius )
-		{
-			return CULL_OUT;
-		}
-		else if ( dist <= radius ) 
-		{
-			mightBeClipped = qtrue;
-		}
-	}
-
-	if ( mightBeClipped )
-	{
-		return CULL_CLIP;
-	}
-
-	return CULL_IN;		// completely inside frustum
-}
-
-int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius) {
-	vec3_t transformed;
-
-	R_LocalPointToWorld(pt, transformed);
-
-	return R_DistanceCullPointAndRadius(fDist, transformed, radius);
-}
-
-int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
-	if (!r_nocull->integer)
-	{
-		vec3_t vDelta;
-		float fLengthSquared;
-		float fTotalDistSquared;
-
-		VectorSubtract(pt, tr.viewParms.ori.origin, vDelta);
-		fLengthSquared = VectorLengthSquared(vDelta);
-		fTotalDistSquared = Square(fDist + radius);
-
-		if (Square(fDist + radius) < Square(vDelta[2]) + fLengthSquared) {
-			return CULL_OUT;
-		} else if (Square(fDist - radius) > Square(vDelta[2]) + fLengthSquared) {
-			return CULL_IN;
-		}
-	}
-
-	return CULL_CLIP;
-}
-
-/*
-=================
-R_LocalNormalToWorld
-
-=================
-*/
-void R_LocalNormalToWorld (const vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0];
-	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1];
-	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2];
-}
-
-/*
-=================
-R_LocalPointToWorld
-
-=================
-*/
-void R_LocalPointToWorld (const vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0] + tr.ori.origin[0];
-	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1] + tr.ori.origin[1];
-	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2] + tr.ori.origin[2];
-}
-
-/*
-=================
-R_WorldToLocal
-
-=================
-*/
-void R_WorldToLocal (vec3_t world, vec3_t local) {
-	local[0] = DotProduct(world, tr.ori.axis[0]);
-	local[1] = DotProduct(world, tr.ori.axis[1]);
-	local[2] = DotProduct(world, tr.ori.axis[2]);
-}
-
-/*
-==========================
-R_TransformModelToClip
-
-==========================
-*/
-void R_TransformModelToClip( const vec3_t src, const float *modelMatrix, const float *projectionMatrix,
-							vec4_t eye, vec4_t dst ) {
-	int i;
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		eye[i] = 
-			src[0] * modelMatrix[ i + 0 * 4 ] +
-			src[1] * modelMatrix[ i + 1 * 4 ] +
-			src[2] * modelMatrix[ i + 2 * 4 ] +
-			1 * modelMatrix[ i + 3 * 4 ];
-	}
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		dst[i] = 
-			eye[0] * projectionMatrix[ i + 0 * 4 ] +
-			eye[1] * projectionMatrix[ i + 1 * 4 ] +
-			eye[2] * projectionMatrix[ i + 2 * 4 ] +
-			eye[3] * projectionMatrix[ i + 3 * 4 ];
-	}
-}
-
-/*
-==========================
-R_TransformClipToWindow
-
-==========================
-*/
-void R_TransformClipToWindow( const vec4_t clip, const viewParms_t *view, vec4_t normalized, vec4_t window ) {
-	normalized[0] = clip[0] / clip[3];
-	normalized[1] = clip[1] / clip[3];
-	normalized[2] = ( clip[2] + clip[3] ) / ( 2 * clip[3] );
-
-	window[0] = 0.5f * ( 1.0f + normalized[0] ) * view->viewportWidth;
-	window[1] = 0.5f * ( 1.0f + normalized[1] ) * view->viewportHeight;
-	window[2] = normalized[2];
-
-	window[0] = (int) ( window[0] + 0.5 );
-	window[1] = (int) ( window[1] + 0.5 );
-}
-
-
-/*
-==========================
-myGlMultMatrix
-
-==========================
-*/
-void myGlMultMatrix( const float *a, const float *b, float *out ) {
-	int		i, j;
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		for ( j = 0 ; j < 4 ; j++ ) {
-			out[ i * 4 + j ] =
-				a [ i * 4 + 0 ] * b [ 0 * 4 + j ]
-				+ a [ i * 4 + 1 ] * b [ 1 * 4 + j ]
-				+ a [ i * 4 + 2 ] * b [ 2 * 4 + j ]
-				+ a [ i * 4 + 3 ] * b [ 3 * 4 + j ];
-		}
-	}
-}
-
-void R_AdjustVisBoundsForSprite(refSprite_t* ent, viewParms_t* viewParms, orientationr_t* or )
-{
-	if (tr.viewParms.visBounds[0][0] > ent->origin[0] - ent->scale) {
-		tr.viewParms.visBounds[0][0] = ent->origin[0] - ent->scale;
-    }
-    if (tr.viewParms.visBounds[0][1] > ent->origin[1] - ent->scale) {
-        tr.viewParms.visBounds[0][1] = ent->origin[1] - ent->scale;
-    }
-    if (tr.viewParms.visBounds[0][2] > ent->origin[2] - ent->scale) {
-        tr.viewParms.visBounds[0][2] = ent->origin[2] - ent->scale;
-    }
-
-	if (tr.viewParms.visBounds[1][0] < ent->origin[0] + ent->scale) {
-        tr.viewParms.visBounds[1][0] = ent->origin[0] + ent->scale;
-    }
-    if (tr.viewParms.visBounds[1][1] < ent->origin[1] + ent->scale) {
-        tr.viewParms.visBounds[1][1] = ent->origin[1] + ent->scale;
-    }
-    if (tr.viewParms.visBounds[1][2] < ent->origin[2] + ent->scale) {
-        tr.viewParms.visBounds[1][2] = ent->origin[2] + ent->scale;
-    }
-}
-
-/*
-=================
-R_RotateForEntity
-
-Generates an orientation for an entity and viewParms
-Does NOT produce any GL calls
-Called by both the front end and the back end
-=================
-*/
-void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms,
-					   orientationr_t *ori ) {
-	float	glMatrix[16];
-	vec3_t	delta;
-	float	axisLength;
-
-	if ( ent->e.reType != RT_MODEL ) {
-		*ori = viewParms->world;
-		return;
-	}
-
-	VectorCopy( ent->e.origin, ori->origin );
-
-	VectorCopy( ent->e.axis[0], ori->axis[0] );
-	VectorCopy( ent->e.axis[1], ori->axis[1] );
-	VectorCopy( ent->e.axis[2], ori->axis[2] );
-
-	glMatrix[0] = ori->axis[0][0];
-	glMatrix[4] = ori->axis[1][0];
-	glMatrix[8] = ori->axis[2][0];
-	glMatrix[12] = ori->origin[0];
-
-	glMatrix[1] = ori->axis[0][1];
-	glMatrix[5] = ori->axis[1][1];
-	glMatrix[9] = ori->axis[2][1];
-	glMatrix[13] = ori->origin[1];
-
-	glMatrix[2] = ori->axis[0][2];
-	glMatrix[6] = ori->axis[1][2];
-	glMatrix[10] = ori->axis[2][2];
-	glMatrix[14] = ori->origin[2];
-
-	glMatrix[3] = 0;
-	glMatrix[7] = 0;
-	glMatrix[11] = 0;
-	glMatrix[15] = 1;
-
-	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
-
-	// calculate the viewer origin in the model's space
-	// needed for fog, specular, and environment mapping
-	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
-
-	// compensate for scale in the axes if necessary
-	if ( ent->e.nonNormalizedAxes ) {
-		axisLength = VectorLength( ent->e.axis[0] );
-		if ( !axisLength ) {
-			axisLength = 0;
-		} else {
-			axisLength = 1.0f / axisLength;
-		}
-	} else {
-		axisLength = 1.0f;
-	}
-
-	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] ) * axisLength;
-	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] ) * axisLength;
-	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] ) * axisLength;
-}
-
-/*
-=================
-R_RotateForStaticModel
-
-Generates an orientation for a static model and viewParms
-=================
-*/
-void R_RotateForStaticModel( cStaticModelUnpacked_t *SM, const viewParms_t *viewParms,
-					   orientationr_t *ori ) {
-	float	glMatrix[16];
-	vec3_t	delta;
-	float	tiki_scale;
-
-	tiki_scale = SM->tiki->load_scale * SM->scale;
-
-	VectorCopy( SM->origin, ori->origin );
-
-	VectorCopy( SM->axis[0], ori->axis[0] );
-	VectorCopy( SM->axis[1], ori->axis[1] );
-	VectorCopy( SM->axis[2], ori->axis[2] );
-
-	glMatrix[0]  = ori->axis[0][0] * tiki_scale;
-	glMatrix[4]  = ori->axis[1][0] * tiki_scale;
-	glMatrix[8]  = ori->axis[2][0] * tiki_scale;
-	glMatrix[12] = ori->origin[0];
-
-	glMatrix[1]  = ori->axis[0][1] * tiki_scale;
-	glMatrix[5]  = ori->axis[1][1] * tiki_scale;
-	glMatrix[9]  = ori->axis[2][1] * tiki_scale;
-	glMatrix[13] = ori->origin[1];
-
-	glMatrix[2]  = ori->axis[0][2] * tiki_scale;
-	glMatrix[6]  = ori->axis[1][2] * tiki_scale;
-	glMatrix[10] = ori->axis[2][2] * tiki_scale;
-	glMatrix[14] = ori->origin[2];
-
-	glMatrix[3]  = 0;
-	glMatrix[7]  = 0;
-	glMatrix[11] = 0;
-	glMatrix[15] = 1;
-
-	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
-
-	// calculate the viewer origin in the model's space
-	// needed for fog, specular, and environment mapping
-	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
-
-	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] );
-	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] );
-	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] );
-}
-
-/*
-=================
-R_RotateForViewer
-
-Sets up the modelview matrix for a given viewParm
-=================
-*/
-void R_RotateForViewer (void) 
-{
-	float	viewerMatrix[16];
-	vec3_t	origin;
-
-	Com_Memset (&tr.ori, 0, sizeof(tr.ori));
-	tr.ori.axis[0][0] = 1;
-	tr.ori.axis[1][1] = 1;
-	tr.ori.axis[2][2] = 1;
-	VectorCopy (tr.viewParms.ori.origin, tr.ori.viewOrigin);
-
-	// transform by the camera placement
-	VectorCopy( tr.viewParms.ori.origin, origin );
-
-	viewerMatrix[0] = tr.viewParms.ori.axis[0][0];
-	viewerMatrix[4] = tr.viewParms.ori.axis[0][1];
-	viewerMatrix[8] = tr.viewParms.ori.axis[0][2];
-	viewerMatrix[12] = -origin[0] * viewerMatrix[0] + -origin[1] * viewerMatrix[4] + -origin[2] * viewerMatrix[8];
-
-	viewerMatrix[1] = tr.viewParms.ori.axis[1][0];
-	viewerMatrix[5] = tr.viewParms.ori.axis[1][1];
-	viewerMatrix[9] = tr.viewParms.ori.axis[1][2];
-	viewerMatrix[13] = -origin[0] * viewerMatrix[1] + -origin[1] * viewerMatrix[5] + -origin[2] * viewerMatrix[9];
-
-	viewerMatrix[2] = tr.viewParms.ori.axis[2][0];
-	viewerMatrix[6] = tr.viewParms.ori.axis[2][1];
-	viewerMatrix[10] = tr.viewParms.ori.axis[2][2];
-	viewerMatrix[14] = -origin[0] * viewerMatrix[2] + -origin[1] * viewerMatrix[6] + -origin[2] * viewerMatrix[10];
-
-	viewerMatrix[3] = 0;
-	viewerMatrix[7] = 0;
-	viewerMatrix[11] = 0;
-	viewerMatrix[15] = 1;
-
-	// convert from our coordinate system (looking down X)
-	// to OpenGL's coordinate system (looking down -Z)
-	myGlMultMatrix( viewerMatrix, s_flipMatrix, tr.ori.modelMatrix );
-
-	tr.viewParms.world = tr.ori;
-
-}
-
-/*
-** SetFarClip
-*/
-static void SetFarClip( void )
-{
-	float	farthestCornerDistance = 0;
-	int		i;
-
-	// if not rendering the world (icons, menus, etc)
-	// set a 2k far clip plane
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		tr.viewParms.zFar = 2048;
-		return;
-	}
-
-	//
-	// set far clipping planes dynamically
-	//
-	farthestCornerDistance = 0;
-	for ( i = 0; i < 8; i++ )
-	{
-		vec3_t v;
-		vec3_t vecTo;
-		float distance;
-
-		if ( i & 1 )
-		{
-			v[0] = tr.viewParms.visBounds[0][0];
-		}
-		else
-		{
-			v[0] = tr.viewParms.visBounds[1][0];
-		}
-
-		if ( i & 2 )
-		{
-			v[1] = tr.viewParms.visBounds[0][1];
-		}
-		else
-		{
-			v[1] = tr.viewParms.visBounds[1][1];
-		}
-
-		if ( i & 4 )
-		{
-			v[2] = tr.viewParms.visBounds[0][2];
-		}
-		else
-		{
-			v[2] = tr.viewParms.visBounds[1][2];
-		}
-
-		VectorSubtract( v, tr.viewParms.ori.origin, vecTo );
-
-		distance = vecTo[0] * vecTo[0] + vecTo[1] * vecTo[1] + vecTo[2] * vecTo[2];
-
-		if ( distance > farthestCornerDistance )
-		{
-			farthestCornerDistance = distance;
-		}
-	}
-	tr.viewParms.zFar = sqrt( farthestCornerDistance );
-}
-
-
-/*
-===============
-R_SetupProjection
-===============
-*/
-void R_SetupProjection( void ) {
-	float	xmin, xmax, ymin, ymax;
-	float	width, height, depth;
-	float	zNear, zFar;
-
-	// dynamically compute far clip plane distance
-	SetFarClip();
-
-	//
-	// set up projection matrix
-	//
-	zNear	= r_znear->value;
-	zFar	= tr.viewParms.zFar;
-
-	ymax = zNear * tan( tr.refdef.fov_y * M_PI / 360.0f );
-	ymin = -ymax;
-
-	xmax = zNear * tan( tr.refdef.fov_x * M_PI / 360.0f );
-	xmin = -xmax;
-
-	width = xmax - xmin;
-	height = ymax - ymin;
-	depth = zFar - zNear;
-
-	tr.viewParms.projectionMatrix[0] = 2 * zNear / width;
-	tr.viewParms.projectionMatrix[4] = 0;
-	tr.viewParms.projectionMatrix[8] = ( xmax + xmin ) / width;	// normally 0
-	tr.viewParms.projectionMatrix[12] = 0;
-
-	tr.viewParms.projectionMatrix[1] = 0;
-	tr.viewParms.projectionMatrix[5] = 2 * zNear / height;
-	tr.viewParms.projectionMatrix[9] = ( ymax + ymin ) / height;	// normally 0
-	tr.viewParms.projectionMatrix[13] = 0;
-
-	tr.viewParms.projectionMatrix[2] = 0;
-	tr.viewParms.projectionMatrix[6] = 0;
-	tr.viewParms.projectionMatrix[10] = -( zFar + zNear ) / depth;
-	tr.viewParms.projectionMatrix[14] = -2 * zFar * zNear / depth;
-
-	tr.viewParms.projectionMatrix[3] = 0;
-	tr.viewParms.projectionMatrix[7] = 0;
-	tr.viewParms.projectionMatrix[11] = -1;
-	tr.viewParms.projectionMatrix[15] = 0;
-}
-
-/*
-=================
-R_SetupFrustum
-
-Setup that culling frustum planes for the current view
-=================
-*/
-void R_SetupFrustum (void) {
-	int		i;
-	float	xs, xc;
-	float	ang;
-
-	ang = tr.viewParms.fovX / 180 * M_PI * 0.5f;
-	xs = sin( ang );
-	xc = cos( ang );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[0].normal );
-	VectorMA( tr.viewParms.frustum[0].normal, xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[0].normal );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[1].normal );
-	VectorMA( tr.viewParms.frustum[1].normal, -xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[1].normal );
-
-	ang = tr.viewParms.fovY / 180 * M_PI * 0.5f;
-	xs = sin( ang );
-	xc = cos( ang );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[2].normal );
-	VectorMA( tr.viewParms.frustum[2].normal, xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[2].normal );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[3].normal );
-	VectorMA( tr.viewParms.frustum[3].normal, -xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[3].normal );
-
-	for (i=0 ; i<4 ; i++) {
-		tr.viewParms.frustum[i].type = PLANE_NON_AXIAL;
-		tr.viewParms.frustum[i].dist = DotProduct (tr.viewParms.ori.origin, tr.viewParms.frustum[i].normal);
-		SetPlaneSignbits( &tr.viewParms.frustum[i] );
-	}
-
-	if (tr.viewParms.isPortalSky) {
-		// since 2.0: skybox farplane
-		if (r_skybox_farplane->integer) {
-			tr.viewParms.farplane_distance = r_skybox_farplane->value;
-
-            sscanf(
-                r_farplane_color->string,
-                "%f %f %f",
-                &tr.viewParms.farplane_color[0],
-                &tr.viewParms.farplane_color[1],
-                &tr.viewParms.farplane_color[2]
-			);
-
-			if (r_farplane_nocull->integer > 0) {
-				tr.viewParms.farplane_cull = 0;
-			} else if (r_farplane_nocull->integer == 0) {
-				tr.viewParms.farplane_cull = 1;
-            } else {
-                tr.viewParms.farplane_cull = 2;
-            }
-		}
-	}
-	else if (r_farplane->integer)
-	{
-		tr.viewParms.farplane_distance = r_farplane->value;
-		tr.viewParms.farplane_bias = r_farplane_bias->value;
-
-		sscanf(
-			r_farplane_color->string,
-			"%f %f %f",
-			&tr.viewParms.farplane_color[0],
-			&tr.viewParms.farplane_color[1],
-			&tr.viewParms.farplane_color[2]);
-
-			if (r_farplane_nocull->integer > 0) {
-				tr.viewParms.farplane_cull = 0;
-			} else if (r_farplane_nocull->integer == 0) {
-				tr.viewParms.farplane_cull = 1;
-            } else {
-                tr.viewParms.farplane_cull = 2;
-            }
-	}
-
-	if (tr.viewParms.farplane_distance)
-	{
-		vec3_t farPoint;
-		float realPlaneLen;
-		float tmp;
-		vec4_t fogColor;
-
-		tr.viewParms.fog.len = tr.viewParms.farplane_distance;
-		tr.viewParms.fog.oolen = 1.0 / tr.viewParms.farplane_distance;
-		VectorMA(tr.viewParms.ori.origin, tr.viewParms.farplane_distance, tr.viewParms.ori.axis[0], farPoint);
-
-		VectorNegate(tr.viewParms.ori.axis[0], tr.viewParms.frustum[4].normal);
-		tr.viewParms.frustum[4].type = PLANE_NON_AXIAL;
-		tr.viewParms.frustum[4].dist = DotProduct(farPoint, tr.viewParms.frustum[4].normal);
-		SetPlaneSignbits(&tr.viewParms.frustum[4]);
-
-		tr.viewParms.fog.enabled = r_farplane_nofog->integer == 0;
-		if (tr.viewParms.farplane_cull) {
-			// extra fustum for culling
-			tr.viewParms.fog.extrafrustums = 1;
-		} else {
-			tr.viewParms.fog.extrafrustums = 0;
-		}
-	}
-	else
-	{
-		tr.viewParms.fog.enabled = 0;
-		tr.viewParms.fog.extrafrustums = 0;
-	}
-}
-
-
-/*
-=================
-R_MirrorPoint
-=================
-*/
-void R_MirrorPoint (vec3_t in, orientation_t *surface, orientation_t *camera, vec3_t out) {
-	int		i;
-	vec3_t	local;
-	vec3_t	transformed;
-	float	d;
-
-	VectorSubtract( in, surface->origin, local );
-
-	VectorClear( transformed );
-	for ( i = 0 ; i < 3 ; i++ ) {
-		d = DotProduct(local, surface->axis[i]);
-		VectorMA( transformed, d, camera->axis[i], transformed );
-	}
-
-	VectorAdd( transformed, camera->origin, out );
-}
-
-void R_MirrorVector (vec3_t in, orientation_t *surface, orientation_t *camera, vec3_t out) {
-	int		i;
-	float	d;
-
-	VectorClear( out );
-	for ( i = 0 ; i < 3 ; i++ ) {
-		d = DotProduct(in, surface->axis[i]);
-		VectorMA( out, d, camera->axis[i], out );
-	}
-}
-
-
-/*
-=============
-R_PlaneForSurface
-=============
-*/
-void R_PlaneForSurface (surfaceType_t *surfType, cplane_t *plane) {
-	srfTriangles_t	*tri;
-	srfPoly_t		*poly;
-	drawVert_t		*v1, *v2, *v3;
-	vec4_t			plane4;
-
-	if (!surfType) {
-		Com_Memset (plane, 0, sizeof(*plane));
-		plane->normal[0] = 1;
-		return;
-	}
-	switch (*surfType) {
-	case SF_FACE:
-		*plane = ((srfSurfaceFace_t *)surfType)->plane;
-		return;
-	case SF_TRIANGLES:
-		tri = (srfTriangles_t *)surfType;
-		v1 = tri->verts + tri->indexes[0];
-		v2 = tri->verts + tri->indexes[1];
-		v3 = tri->verts + tri->indexes[2];
-		PlaneFromPoints( plane4, v1->xyz, v2->xyz, v3->xyz );
-		VectorCopy( plane4, plane->normal ); 
-		plane->dist = plane4[3];
-		return;
-	case SF_POLY:
-		poly = (srfPoly_t *)surfType;
-		PlaneFromPoints( plane4, poly->verts[0].xyz, poly->verts[1].xyz, poly->verts[2].xyz );
-		VectorCopy( plane4, plane->normal ); 
-		plane->dist = plane4[3];
-		return;
-	default:
-		Com_Memset (plane, 0, sizeof(*plane));
-		plane->normal[0] = 1;		
-		return;
-	}
-}
-
-/*
-=================
-R_GetPortalOrientation
-
-entityNum is the entity that the portal surface is a part of, which may
-be moving and rotating.
-
-Returns qtrue if it should be mirrored
-=================
-*/
-qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum, 
-							 orientation_t *surface, orientation_t *camera,
-							 vec3_t pvsOrigin, qboolean *mirror ) {
-	int			i;
-	cplane_t	originalPlane, plane;
-	trRefEntity_t	*e;
-	float		d;
-	vec3_t		transformed;
-
-	// create plane axis for the portal we are seeing
-	R_PlaneForSurface( drawSurf->surface, &originalPlane );
-
-	// rotate the plane if necessary
-	if ( entityNum != ENTITYNUM_WORLD ) {
-		tr.currentEntityNum = entityNum;
-		tr.currentEntity = &tr.refdef.entities[entityNum];
-
-		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
-
-		// rotate the plane, but keep the non-rotated version for matching
-		// against the portalSurface entities
-		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
-
-		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
-	} else {
-		plane = originalPlane;
-	}
-
-	VectorCopy( plane.normal, surface->axis[0] );
-	PerpendicularVector( surface->axis[1], surface->axis[0] );
-	CrossProduct( surface->axis[0], surface->axis[1], surface->axis[2] );
-
-	// locate the portal entity closest to this plane.
-	// origin will be the origin of the portal, origin2 will be
-	// the origin of the camera
-	for ( i = 0 ; i < tr.refdef.num_entities ; i++ ) {
-		e = &tr.refdef.entities[i];
-		if ( e->e.reType != RT_PORTALSURFACE ) {
-			continue;
-		}
-
-		d = DotProduct( e->e.origin, originalPlane.normal ) - originalPlane.dist;
-		if ( d > 64 || d < -64) {
-			continue;
-		}
-
-		// get the pvsOrigin from the entity
-		VectorCopy( e->e.oldorigin, pvsOrigin );
-
-		// if the entity is just a mirror, don't use as a camera point
-		if ( e->e.oldorigin[0] == e->e.origin[0] && 
-			e->e.oldorigin[1] == e->e.origin[1] && 
-			e->e.oldorigin[2] == e->e.origin[2] ) {
-			VectorScale( plane.normal, plane.dist, surface->origin );
-			VectorCopy( surface->origin, camera->origin );
-			VectorSubtract( vec3_origin, surface->axis[0], camera->axis[0] );
-			VectorCopy( surface->axis[1], camera->axis[1] );
-			VectorCopy( surface->axis[2], camera->axis[2] );
-
-			*mirror = qtrue;
-			return qtrue;
-		}
-
-		// project the origin onto the surface plane to get
-		// an origin point we can rotate around
-		d = DotProduct( e->e.origin, plane.normal ) - plane.dist;
-		VectorMA( e->e.origin, -d, surface->axis[0], surface->origin );
-			
-		// now get the camera origin and orientation
-		VectorCopy( e->e.oldorigin, camera->origin );
-		AxisCopy( e->e.axis, camera->axis );
-		VectorSubtract( vec3_origin, camera->axis[0], camera->axis[0] );
-		VectorSubtract( vec3_origin, camera->axis[1], camera->axis[1] );
-
-		// optionally rotate
-		if ( e->e.skinNum ) {
-			d = e->e.skinNum;
-			VectorCopy( camera->axis[1], transformed );
-			RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
-			CrossProduct( camera->axis[0], camera->axis[1], camera->axis[2] );
-		}
-		*mirror = qfalse;
-		return qtrue;
-	}
-
-	// if we didn't locate a portal entity, don't render anything.
-	// We don't want to just treat it as a mirror, because without a
-	// portal entity the server won't have communicated a proper entity set
-	// in the snapshot
-
-	// unfortunately, with local movement prediction it is easily possible
-	// to see a surface before the server has communicated the matching
-	// portal surface entity, so we don't want to print anything here...
-
-	//ri.Printf( PRINT_ALL, "Portal surface without a portal entity\n" );
-
-	return qfalse;
-}
-
-static qboolean IsMirror( const drawSurf_t *drawSurf, int entityNum )
-{
-	int			i;
-	cplane_t	originalPlane, plane;
-	trRefEntity_t	*e;
-	float		d;
-
-	// create plane axis for the portal we are seeing
-	R_PlaneForSurface( drawSurf->surface, &originalPlane );
-
-	// rotate the plane if necessary
-	if ( entityNum != ENTITYNUM_WORLD ) 
-	{
-		tr.currentEntityNum = entityNum;
-		tr.currentEntity = &tr.refdef.entities[entityNum];
-
-		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
-
-		// rotate the plane, but keep the non-rotated version for matching
-		// against the portalSurface entities
-		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
-
-		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
-	} 
-	else 
-	{
-		plane = originalPlane;
-	}
-
-	// locate the portal entity closest to this plane.
-	// origin will be the origin of the portal, origin2 will be
-	// the origin of the camera
-	for ( i = 0 ; i < tr.refdef.num_entities ; i++ ) 
-	{
-		e = &tr.refdef.entities[i];
-		if ( e->e.reType != RT_PORTALSURFACE ) {
-			continue;
-		}
-
-		d = DotProduct( e->e.origin, originalPlane.normal ) - originalPlane.dist;
-		if ( d > 64 || d < -64) {
-			continue;
-		}
-
-		// if the entity is just a mirror, don't use as a camera point
-		if ( e->e.oldorigin[0] == e->e.origin[0] && 
-			e->e.oldorigin[1] == e->e.origin[1] && 
-			e->e.oldorigin[2] == e->e.origin[2] ) 
-		{
-			return qtrue;
-		}
-
-		return qfalse;
-	}
-	return qfalse;
-}
-
-/*
-** SurfIsOffscreen
-**
-** Determines if a surface is completely offscreen.
-*/
-qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum) {
-	float shortest = 100000000;
-	int numTriangles;
-	qboolean doRange;
-	orientationr_t surfOr;
-	unsigned int* indices;
-	vec4_t clip, eye;
-	int i;
-	unsigned int pointOr = 0;
-	unsigned int pointAnd = (unsigned int)~0;
-
-	if (surface->surfaceType != SF_FACE) {
-		ri.Printf(PRINT_WARNING, "WARNING: SurfIsOffscreen called on non-bmodel!\n");
-		return qfalse;
-	}
-	
-	if ( glConfig.smpActive ) {		// FIXME!  we can't do RB_BeginSurface/RB_EndSurface stuff with smp!
-		return qfalse;
-	}
-
-	if (entityNum == ENTITYNUM_WORLD) {
-		surfOr = tr.viewParms.world;
-	} else {
-		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
-	}
-
-	for ( i = 0; i < surface->numPoints; i++ )
-	{
-		int j;
-		unsigned int pointFlags = 0;
-
-		R_TransformModelToClip( surface->points[i], surfOr.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
-
-		for ( j = 0; j < 3; j++ )
-		{
-			if ( clip[j] >= clip[3] )
-			{
-				pointFlags |= (1 << (j*2));
-			}
-			else if ( clip[j] <= -clip[3] )
-			{
-				pointFlags |= ( 1 << (j*2+1));
-			}
-		}
-		pointAnd &= pointFlags;
-		pointOr |= pointFlags;
-	}
-
-	// trivially reject
-	if ( pointAnd )
-	{
-		return qtrue;
-	}
-
-	// determine if this surface is backfaced and also determine the distance
-	// to the nearest vertex so we can cull based on portal range.  Culling
-	// based on vertex distance isn't 100% correct (we should be checking for
-	// range to the surface), but it's good enough for the types of portals
-	// we have in the game right now.
-	numTriangles = surface->numIndices / 3;
-
-	for ( i = 0; i < surface->numIndices; i += 3 )
-	{
-		vec3_t normal;
-		float dot;
-		float len;
-		unsigned* indices;
-
-		indices = (unsigned*)(((char*)surface) + surface->ofsIndices);
-
-		VectorSubtract( surface->points[indices[i]], surfOr.viewOrigin, normal);
-
-		if (shader->fDistRange > 0) {
-			len = VectorLengthSquared(normal);			// lose the sqrt
-			if (len < shortest)
-			{
-				shortest = len;
-			}
-		}
-
-		if ( ( dot = DotProduct( normal, surface->plane.normal ) ) >= 0 )
-		{
-			numTriangles--;
-		}
-	}
-	if ( !numTriangles )
-	{
-		return qtrue;
-	}
-
-	if (shader->fDistRange > 0.0)
-	{
-		if (shortest > Square(shader->fDistRange))
-		{
-			return qtrue;
-		}
-	}
-
-	return qfalse;
-}
-
-static qboolean DrawSurfIsOffscreen(drawSurf_t* drawSurf) {
-	int entityNum;
-	shader_t* shader;
-	int dlighted;
-	qboolean bStaticModel;
-
-	R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlighted, &bStaticModel);
-	return SurfIsOffscreen((srfSurfaceFace_t*)drawSurf->surface, shader, entityNum);
-}
-
-/*
-========================
-R_MirrorViewBySurface
-
-Returns qtrue if another view has been rendered
-========================
-*/
-qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
-	viewParms_t		newParms;
-	viewParms_t		oldParms;
-	orientation_t	surface, camera;
-
-	// don't recursively mirror
-	if (tr.viewParms.isPortal) {
-		ri.Printf( PRINT_DEVELOPER, "WARNING: recursive mirror/portal found\n" );
-		return qfalse;
-	}
-
-	if ( r_noportals->integer || (r_fastsky->integer == 1) ) {
-		return qfalse;
-	}
-
-	// trivially reject portal/mirror
-	if (DrawSurfIsOffscreen( drawSurf ) ) {
-		return qfalse;
-	}
-
-	// save old viewParms so we can return to it after the mirror view
-	oldParms = tr.viewParms;
-
-	newParms = tr.viewParms;
-	newParms.isPortal = qtrue;
-	if ( !R_GetPortalOrientations( drawSurf, entityNum, &surface, &camera, 
-		newParms.pvsOrigin, &newParms.isMirror ) ) {
-		return qfalse;		// bad portal, no portalentity
-	}
-
-	R_MirrorPoint (oldParms.ori.origin, &surface, &camera, newParms.ori.origin );
-
-	VectorSubtract( vec3_origin, camera.axis[0], newParms.portalPlane.normal );
-	newParms.portalPlane.dist = DotProduct( camera.origin, newParms.portalPlane.normal );
-	
-	R_MirrorVector (oldParms.ori.axis[0], &surface, &camera, newParms.ori.axis[0]);
-	R_MirrorVector (oldParms.ori.axis[1], &surface, &camera, newParms.ori.axis[1]);
-	R_MirrorVector (oldParms.ori.axis[2], &surface, &camera, newParms.ori.axis[2]);
-
-	// OPTIMIZE: restrict the viewport on the mirrored view
-
-	// render the mirror view
-	R_RenderView (&newParms);
-
-	tr.viewParms = oldParms;
-
-	return qtrue;
-}
-
-/*
-==========================================================================================
-
-DRAWSURF SORTING
-
-==========================================================================================
-*/
-
-static void SwapDrawSurf(drawSurf_t* a, drawSurf_t* b) {
-	drawSurf_t temp = *a;
-	*a = *b;
-	*b = temp;
-}
-
-/*
-=================
-qsort replacement
-
-=================
-*/
-//#define	SWAP_DRAW_SURF(a,b) temp=((int *)a)[0];((int *)a)[0]=((int *)b)[0];((int *)b)[0]=temp; temp=((int *)a)[1];((int *)a)[1]=((int *)b)[1];((int *)b)[1]=temp;
-
-/* this parameter defines the cutoff between using quick sort and
-   insertion sort for arrays; arrays with lengths shorter or equal to the
-   below value use insertion sort */
-
-#define CUTOFF 8            /* testing shows that this is good value */
-
-static void shortsort( drawSurf_t *lo, drawSurf_t *hi ) {
-    drawSurf_t	*p, *max;
-	int			temp;
-
-    while (hi > lo) {
-        max = lo;
-        for (p = lo + 1; p <= hi; p++ ) {
-            if ( p->sort > max->sort ) {
-                max = p;
-            }
-        }
-		SwapDrawSurf(max, hi);
-        hi--;
-    }
-}
-
-
-/* sort the array between lo and hi (inclusive)
-FIXME: this was lifted and modified from the microsoft lib source...
- */
-
-void qsortFast (
-    void *base,
-    unsigned num,
-    unsigned width
-    )
-{
-    char *lo, *hi;              /* ends of sub-array currently sorting */
-    char *mid;                  /* points to middle of subarray */
-    char *loguy, *higuy;        /* traveling pointers for partition step */
-    unsigned size;              /* size of the sub-array */
-    char *lostk[30], *histk[30];
-    int stkptr;                 /* stack for saving sub-array to be processed */
-	int	temp;
-
-    /* Note: the number of stack entries required is no more than
-       1 + log2(size), so 30 is sufficient for any array */
-
-    if (num < 2 || width == 0)
-        return;                 /* nothing to do */
-
-    stkptr = 0;                 /* initialize stack */
-
-    lo = base;
-    hi = (char *)base + width * (num-1);        /* initialize limits */
-
-    /* this entry point is for pseudo-recursion calling: setting
-       lo and hi and jumping to here is like recursion, but stkptr is
-       prserved, locals aren't, so we preserve stuff on the stack */
-recurse:
-
-    size = (hi - lo) / width + 1;        /* number of el's to sort */
-
-    /* below a certain size, it is faster to use a O(n^2) sorting method */
-    if (size <= CUTOFF) {
-         shortsort((drawSurf_t *)lo, (drawSurf_t *)hi);
-    }
-    else {
-        /* First we pick a partititioning element.  The efficiency of the
-           algorithm demands that we find one that is approximately the
-           median of the values, but also that we select one fast.  Using
-           the first one produces bad performace if the array is already
-           sorted, so we use the middle one, which would require a very
-           wierdly arranged array for worst case performance.  Testing shows
-           that a median-of-three algorithm does not, in general, increase
-           performance. */
-
-        mid = lo + (size / 2) * width;                   /* find middle element */
-		SwapDrawSurf((drawSurf_t*)mid, (drawSurf_t*)lo);  /* swap it to beginning of array */
-
-        /* We now wish to partition the array into three pieces, one
-           consisiting of elements <= partition element, one of elements
-           equal to the parition element, and one of element >= to it.  This
-           is done below; comments indicate conditions established at every
-           step. */
-
-        loguy = lo;
-        higuy = hi + width;
-
-        /* Note that higuy decreases and loguy increases on every iteration,
-           so loop must terminate. */
-        for (;;) {
-            /* lo <= loguy < hi, lo < higuy <= hi + 1,
-               A[i] <= A[lo] for lo <= i <= loguy,
-               A[i] >= A[lo] for higuy <= i <= hi */
-
-            do  {
-                loguy += width;
-            } while (loguy <= hi &&  
-				( ((drawSurf_t *)loguy)->sort <= ((drawSurf_t *)lo)->sort ) );
-
-            /* lo < loguy <= hi+1, A[i] <= A[lo] for lo <= i < loguy,
-               either loguy > hi or A[loguy] > A[lo] */
-
-            do  {
-                higuy -= width;
-            } while (higuy > lo && 
-				( ((drawSurf_t *)higuy)->sort >= ((drawSurf_t *)lo)->sort ) );
-
-            /* lo-1 <= higuy <= hi, A[i] >= A[lo] for higuy < i <= hi,
-               either higuy <= lo or A[higuy] < A[lo] */
-
-            if (higuy < loguy)
-                break;
-
-            /* if loguy > hi or higuy <= lo, then we would have exited, so
-               A[loguy] > A[lo], A[higuy] < A[lo],
-               loguy < hi, highy > lo */
-
-			SwapDrawSurf((drawSurf_t*)loguy, (drawSurf_t*)higuy);
-
-            /* A[loguy] < A[lo], A[higuy] > A[lo]; so condition at top
-               of loop is re-established */
-        }
-
-        /*     A[i] >= A[lo] for higuy < i <= hi,
-               A[i] <= A[lo] for lo <= i < loguy,
-               higuy < loguy, lo <= higuy <= hi
-           implying:
-               A[i] >= A[lo] for loguy <= i <= hi,
-               A[i] <= A[lo] for lo <= i <= higuy,
-               A[i] = A[lo] for higuy < i < loguy */
-
-		SwapDrawSurf((drawSurf_t*)lo, (drawSurf_t*)higuy);     /* put partition element in place */
-
-        /* OK, now we have the following:
-              A[i] >= A[higuy] for loguy <= i <= hi,
-              A[i] <= A[higuy] for lo <= i < higuy
-              A[i] = A[lo] for higuy <= i < loguy    */
-
-        /* We've finished the partition, now we want to sort the subarrays
-           [lo, higuy-1] and [loguy, hi].
-           We do the smaller one first to minimize stack usage.
-           We only sort arrays of length 2 or more.*/
-
-        if ( higuy - 1 - lo >= hi - loguy ) {
-            if (lo + width < higuy) {
-                lostk[stkptr] = lo;
-                histk[stkptr] = higuy - width;
-                ++stkptr;
-            }                           /* save big recursion for later */
-
-            if (loguy < hi) {
-                lo = loguy;
-                goto recurse;           /* do small recursion */
-            }
-        }
-        else {
-            if (loguy < hi) {
-                lostk[stkptr] = loguy;
-                histk[stkptr] = hi;
-                ++stkptr;               /* save big recursion for later */
-            }
-
-            if (lo + width < higuy) {
-                hi = higuy - width;
-                goto recurse;           /* do small recursion */
-            }
-        }
-    }
-
-    /* We have sorted the array, except for any pending sorts on the stack.
-       Check if there are any, and do them. */
-
-    --stkptr;
-    if (stkptr >= 0) {
-        lo = lostk[stkptr];
-        hi = histk[stkptr];
-        goto recurse;           /* pop subarray from stack */
-    }
-    else
-        return;                 /* all subarrays done */
-}
-
-
-//==========================================================================================
-
-/*
-=================
-R_AddDrawSurf
-=================
-*/
-void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap) {
-	int			index;
-
-	// instead of checking for overflow, we just mask the index
-	// so it wraps around
-	index = tr.refdef.numDrawSurfs & DRAWSURF_MASK;
-	// the sort data is packed into a single 32 bit value so it can be
-	// compared quickly during the qsorting process
-	tr.refdef.drawSurfs[index].sort = (shader->sortedIndex << QSORT_SHADERNUM_SHIFT) 
-		| tr.shiftedEntityNum | tr.shiftedIsStatic | (dlightMap & 15);
-	tr.refdef.drawSurfs[index].surface = surface;
-	tr.refdef.numDrawSurfs++;
-}
-
-/*
-=================
-R_AddSpriteSurf
-=================
-*/
-void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
-{
-	int index;
-
-	if (zDistance > MAX_SPRITE_DIST_SQUARED) {
-		zDistance = MAX_SPRITE_DIST_SQUARED;
-	}
-
-	index = tr.refdef.numSpriteSurfs % MAX_SPRITES;
-    tr.refdef.spriteSurfs[index].sort = (int)(MAX_SPRITE_DIST_SQUARED - zDistance) | (shader->sortedIndex << QSORT_SHADERNUM_SHIFT);
-    tr.refdef.spriteSurfs[index].surface = surface;
-    tr.refdef.numSpriteSurfs++;
-}
-
-/*
-=================
-R_DecomposeSort
-=================
-*/
-void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel) {
-	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
-	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 4095;
-	*dlightMap = sort & 15;
-	*bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
-}
-
-/*
-=================
-R_SortDrawSurfs
-=================
-*/
-void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs, drawSurf_t *spriteSurfs, int numSpriteSurfs ) {
-	shader_t		*shader;
-	int				entityNum;
-	int				dlighted;
-	int				i;
-	qboolean		bStaticModel;
-
-	// it is possible for some views to not have any surfaces
-	if ( numDrawSurfs < 1 ) {
-		// we still need to add it for hyperspace cases
-		R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
-		return;
-	}
-
-	// if we overflowed MAX_DRAWSURFS, the drawsurfs
-	// wrapped around in the buffer and we will be missing
-    // the first surfaces, not the last ones
-    if (numDrawSurfs > MAX_DRAWSURFS) {
-        numDrawSurfs = MAX_DRAWSURFS;
-    }
-    if (numSpriteSurfs > MAX_SPRITESURFS) {
-		numSpriteSurfs = MAX_SPRITESURFS;
-    }
-
-	// sort the drawsurfs by sort type, then orientation, then shader
-	qsortFast (drawSurfs, numDrawSurfs, sizeof(drawSurf_t) );
-	qsortFast (spriteSurfs, numSpriteSurfs, sizeof(drawSurf_t) );
-
-	R_Sky_Render();
-
-	if (!tr.viewParms.isPortal)
-	{
-		// check for any pass through drawing, which
-		// may cause another view to be rendered first
-		for (i = 0; i < numDrawSurfs; i++) {
-			R_DecomposeSort((drawSurfs + i)->sort, &entityNum, &shader, &dlighted, &bStaticModel);
-
-			if (shader->sort > SS_PORTAL) {
-				break;
-			}
-
-			// no shader should ever have this sort type
-			if (shader->sort == SS_BAD) {
-				ri.Error(ERR_DROP, "Shader '%s'with sort == SS_BAD", shader->name);
-			}
-
-			// if the mirror was completely clipped away, we may need to check another surface
-			if (R_MirrorViewBySurface((drawSurfs + i), entityNum)) {
-				// this is a debug option to see exactly what is being mirrored
-				if (r_portalOnly->integer) {
-					return;
-				}
-				break;		// only one mirror view at a time
-			}
-		}
-	}
-
-    R_AddDrawSurfCmd(drawSurfs, numDrawSurfs);
-    R_AddSpriteSurfCmd(spriteSurfs, numSpriteSurfs);
-}
-
-/*
-=============
-R_AddEntitySurfaces
-=============
-*/
-void R_AddEntitySurfaces (void) {
-	trRefEntity_t	*ent;
-	shader_t		*shader;
-
-	tr.shiftedIsStatic = 0;
-
-	for ( tr.currentEntityNum = 0; 
-	      tr.currentEntityNum < tr.refdef.num_entities; 
-		  tr.currentEntityNum++ ) {
-		ent = tr.currentEntity = &tr.refdef.entities[tr.currentEntityNum];
-
-		ent->needDlights = qfalse;
-
-		// preshift the value we are going to OR into the drawsurf sort
-		tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-
-		//
-		// the weapon model must be handled special --
-		// we don't want the hacked weapon position showing in 
-		// mirrors, because the true body position will already be drawn
-		//
-		if ( (ent->e.renderfx & RF_FIRST_PERSON) && tr.viewParms.isPortal) {
-			continue;
-		}
-
-		if (tr.viewParms.isPortalSky) {
-			// Expecting a sky entity in a sky portal
-			if (!(ent->e.renderfx & RF_SKYENTITY)) {
-				continue;
-			}
-		} else {
-			if (ent->e.renderfx & RF_SKYENTITY) {
-				continue;
-			}
-		}
-
-		if (tr.viewParms.isPortal) {
-			if (!(ent->e.renderfx & (RF_WRAP_FRAMES | RF_SHADOW_PLANE))) {
-				continue;
-			}
-		} else {
-			if (ent->e.renderfx & RF_SHADOW_PLANE) {
-				continue;
-			}
-		}
-
-		// simple generated models, like sprites and beams, are not culled
-		switch ( ent->e.reType ) {
-		case RT_PORTALSURFACE:
-			break;		// don't draw anything
-		case RT_SPRITE:
-		case RT_BEAM:
-			// self blood sprites, talk balloons, etc should not be drawn in the primary
-			// view.  We can't just do this check for all entities, because md3
-			// entities may still want to cast shadows from them
-			if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
-				continue;
-			}
-			shader = R_GetShaderByHandle( ent->e.customShader );
-			R_AddDrawSurf( &entitySurface, shader, 0 );
-			break;
-
-		case RT_MODEL:
-			// we must set up parts of tr.ori for model culling
-			R_RotateForEntity( ent, &tr.viewParms, &tr.ori );
-
-			tr.currentModel = R_GetModelByHandle( ent->e.hModel );
-			if (!tr.currentModel) {
-				R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
-			} else {
-				switch ( tr.currentModel->type ) {
-				case MOD_SPRITE:
-					Com_Printf("sprite model '%s' being added to renderer!\n", tr.currentModel->name);
-					break;
-				case MOD_TIKI:
-					R_AddSkelSurfaces( ent );
-					break;
-				case MOD_BRUSH:
-					R_AddBrushModelSurfaces( ent );
-					break;
-				case MOD_BAD:		// null model axis
-					if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
-						break;
-					}
-					shader = R_GetShaderByHandle( ent->e.customShader );
-					R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
-					break;
-				default:
-					ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad modeltype" );
-					break;
-				}
-			}
-			break;
-		default:
-			ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad reType" );
-		}
-	}
-}
-
-void R_AddSpriteSurfaces()
-{
-	refSprite_t* sprite;
-	vec3_t delta;
-
-	if (!r_drawsprites->integer) {
-		return;
-	}
-
-	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
-	{
-		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
-
-        if (tr.viewParms.isPortalSky) {
-			if (!(sprite->renderfx & RF_SKYENTITY)) {
-				continue;
-			}
-        } else {
-			if (sprite->renderfx & RF_SKYENTITY) {
-				continue;
-			}
-		}
-        
-		if (tr.viewParms.isPortal) {
-			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
-				continue;
-			}
-		} else {
-			if (sprite->renderfx & RF_SHADOW_PLANE) {
-				continue;
-			}
-		}
-
-		tr.currentEntityNum = ENTITYNUM_WORLD;
-        tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-		if (sprite->hModel && sprite->hModel < tr.numModels) {
-			tr.currentModel = &tr.models[sprite->hModel];
-		} else {
-			tr.currentModel = &tr.models[0];
-		}
-
-		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.ori );
-		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
-
-		VectorSubtract(sprite->origin, tr.refdef.vieworg, delta);
-		R_AddSpriteSurf(&sprite->surftype, tr.currentModel->d.sprite->shader, VectorLengthSquared(delta));
-	}
-}
-
-/*
-====================
-R_GenerateDrawSurfs
-====================
-*/
-void R_GenerateDrawSurfs( void ) {
-	R_AddWorldSurfaces ();
-	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL)) {
-		R_AddSwipeSurfaces();
-	}
-
-	R_AddPolygonSurfaces();
-
-    R_AddTerrainMarkSurfaces();
-
-    R_AddEntitySurfaces();
-
-	R_AddSpriteSurfaces();
-
-	// set the projection matrix with the minimum zfar
-	// now that we have the world bounded
-	// this needs to be done before entities are
-	// added, because they use the projection
-	// matrix for lod calculation
-	R_SetupProjection ();
-}
-
-/*
-================
-R_DebugPolygon
-================
-*/
-void R_DebugPolygon( int color, int numPoints, float *points ) {
-	int		i;
-
-	GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE );
-
-	// draw solid shade
-
-	qglColor3f( color&1, (color>>1)&1, (color>>2)&1 );
-	qglBegin( GL_POLYGON );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		qglVertex3fv( points + i * 3 );
-	}
-	qglEnd();
-
-	// draw wireframe outline
-	GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE );
-	qglDepthRange( 0, 0 );
-	qglColor3f( 1, 1, 1 );
-	qglBegin( GL_POLYGON );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		qglVertex3fv( points + i * 3 );
-	}
-	qglEnd();
-	qglDepthRange( 0, 1 );
-}
-
-/*
-====================
-R_DebugGraphics
-
-Visualization aid for movement clipping debugging
-====================
-*/
-void R_DebugGraphics( void ) {
-	if ( !r_debugSurface->integer ) {
-		return;
-	}
-
-	// the render thread can't make callbacks to the main thread
-	R_SyncRenderThread();
-
-	GL_Bind( tr.whiteImage);
-	GL_Cull( CT_FRONT_SIDED );
-	ri.CM_DrawDebugSurface( R_DebugPolygon );
-}
-
-#define CIRCLE_LENGTH		25
-
-/*
-================
-R_DebugCircle
-================
-*/
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
-    int				i;
-    float			ang;
-	debugline_t* line;
-	vec3_t			forward, right;
-	vec3_t			pos, lastpos;
-
-	if (!ri.DebugLines || !ri.numDebugLines) {
-		return;
-	}
-
-	if (horizontal)
-	{
-		VectorSet(forward, 1, 0, 0);
-		VectorSet(right, 0, 1, 0);
-	}
-	else
-	{
-		VectorCopy(tr.refdef.viewaxis[1], right);
-		VectorCopy(tr.refdef.viewaxis[2], forward);
-	}
-
-	VectorClear(pos);
-	VectorClear(lastpos);
-
-	for (i = 0; i < CIRCLE_LENGTH; i++) {
-		VectorCopy(pos, lastpos);
-
-		ang = DEG2RAD((float)(i * 15));
-		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
-			cos(ang) * radius * right[0];
-		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
-			cos(ang) * radius * right[1];
-		pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
-			cos(ang) * radius * right[2];
-
-		if (i > 0)
-		{
-			if (*ri.numDebugLines >= r_numdebuglines->integer) {
-				ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
-				return;
-			}
-
-			line = &(*ri.DebugLines)[*ri.numDebugLines];
-			(*ri.numDebugLines)++;
-			VectorCopy(lastpos, line->start);
-			VectorCopy(pos, line->end);
-			VectorSet(line->color, r, g, b);
-			line->alpha = alpha;
-			line->width = 1.0;
-			line->factor = 1;
-			line->pattern = -1;
-		}
-	}
-}
-
-/*
-================
-R_DebugLine
-================
-*/
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
-	debugline_t* line;
-
-	if (!ri.DebugLines || !ri.numDebugLines) {
-		return;
-	}
-
-	if (*ri.numDebugLines >= r_numdebuglines->integer) {
-		ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
-		return;
-	}
-
-	line = &(*ri.DebugLines)[*ri.numDebugLines];
-	(*ri.numDebugLines)++;
-	VectorCopy(start, line->start);
-	VectorCopy(end, line->end);
-	VectorSet(line->color, r, g, b);
-	line->alpha = alpha;
-	line->width = 1.0;
-	line->factor = 1;
-	line->pattern = -1;
-}
-
-/*
-================
-R_DrawDebugLines
-================
-*/
-void R_DrawDebugLines(void) {
-	debugline_t* line;
-	int i;
-	float width;
-	int factor;
-	unsigned short pattern;
-
-	if (!ri.DebugLines || !ri.numDebugLines) {
-		return;
-	}
-
-	if (!*ri.numDebugLines) {
-		return;
-	}
-
-	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
-		return;
-	}
-
-	if (tr.viewParms.isPortalSky) {
-		return;
-	}
-
-    R_SyncRenderThread();
-    GL_Bind(tr.whiteImage);
-	if (r_debuglines_depthmask->integer) {
-		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-	} else {
-		GL_State(GLS_POLYMODE_LINE);
-	}
-
-    qglDisableClientState(GL_COLOR_ARRAY);
-    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-    width = 1.0;
-    factor = 4;
-    pattern = -1;
-
-    if (r_stipplelines->integer)
-    {
-        qglEnable(GL_LINE_STIPPLE);
-        qglLineStipple(4, -1);
-        qglLineWidth(1.0f);
-    }
-
-	qglBegin(GL_LINES);
-
-	for (i = 0; i < *ri.numDebugLines; i++) {
-		line = &(*ri.DebugLines)[i];
-
-		if (r_stipplelines->integer) {
-			if (line->width != width || line->factor != factor || line->pattern != pattern) {
-				qglEnd();
-				qglLineStipple(line->factor, line->pattern);
-                qglLineWidth(line->width);
-                qglBegin(GL_LINES);
-                factor = line->factor;
-                width = line->width;
-                pattern = line->pattern;
-			}
-		}
-
-		qglColor4f(line->color[0], line->color[1], line->color[2], line->alpha);
-        qglVertex3fv(line->start);
-        qglVertex3fv(line->end);
-	}
-
-    qglEnd();
-
-    if (r_stipplelines->integer)
-    {
-        qglDisable(GL_LINE_STIPPLE);
-        qglLineStipple(1, -1);
-        qglLineWidth(1.0);
-    }
-
-    qglDepthRange(0.0, 1.0);
-}
-
-/*
-================
-R_DrawDebugLines
-================
-*/
-void R_DrawDebugStrings(void) {
-	int i;
-	debugstring_t* string;
-
-	if (!ri.DebugStrings || !ri.numDebugStrings) {
-		return;
-	}
-
-	if (!*ri.numDebugStrings) {
-		return;
-	}
-
-    if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
-        return;
-    }
-
-    if (tr.viewParms.isPortalSky) {
-        return;
-    }
-
-	for (i = 0; i < *ri.numDebugStrings; i++) {
-		string = &(*ri.DebugStrings)[i];
-
-		R_DrawFloatingString(
-			tr.pFontDebugStrings,
-			string->szText,
-			string->pos,
-			string->color,
-			string->scale,
-			64
-		);
-	}
-}
-
-/*
-================
-R_RenderView
-
-A view may be either the actual camera view,
-or a mirror / remote location
-================
-*/
-void R_RenderView (viewParms_t *parms) {
-	int		firstDrawSurf;
-	int		firstSpriteSurf;
-
-	if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
-		return;
-	}
-
-	tr.viewCount++;
-
-	tr.viewParms = *parms;
-	tr.viewParms.frameSceneNum = tr.frameSceneNum;
-	tr.viewParms.frameCount = tr.frameCount;
-
-	firstDrawSurf = tr.refdef.numDrawSurfs;
-	firstSpriteSurf = tr.refdef.numSpriteSurfs;
-
-	tr.viewCount++;
-
-	// set viewParms.world
-	R_RotateForViewer ();
-
-	R_SetupFrustum ();
-
-	R_Sky_Reset();
-
-	R_DrawDebugStrings();
-
-	R_GenerateDrawSurfs();
-
-    R_SortDrawSurfs(
-		tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
-		tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
-	);
-
-	R_DrawDebugLines();
-    R_DebugSkeleton();
-
-	// draw main system development information (surface outlines, etc)
-	R_DebugGraphics();
-}
-
-
-
diff --git a/code/renderer/tr_marks.c b/code/renderer/tr_marks.c
deleted file mode 100644
index 6fdb7b74..00000000
--- a/code/renderer/tr_marks.c
+++ /dev/null
@@ -1,955 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_marks.c -- polygon projection on the world polygons
-
-#include "tr_local.h"
-//#include "assert.h"
-
-#define MAX_VERTS_ON_POLY		64
-
-#define MARKER_OFFSET			0	// 1
-
-/*
-=============
-R_ChopPolyBehindPlane
-
-Out must have space for two more vertexes than in
-=============
-*/
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-static void R_ChopPolyBehindPlane( int numInPoints, const vec3_t inPoints[MAX_VERTS_ON_POLY],
-								   int *numOutPoints, vec3_t outPoints[MAX_VERTS_ON_POLY], 
-							const vec3_t normal, vec_t dist, vec_t epsilon) {
-	float		dists[MAX_VERTS_ON_POLY+4];
-	int			sides[MAX_VERTS_ON_POLY+4];
-	int			counts[3];
-	float		dot;
-	int			i, j;
-	const float* p1, * p2;
-	float		*clip;
-	float		d;
-
-	// don't clip if it might overflow
-	if ( numInPoints >= MAX_VERTS_ON_POLY - 2 ) {
-		*numOutPoints = 0;
-		return;
-	}
-
-	counts[0] = counts[1] = counts[2] = 0;
-
-	// determine sides for each point
-	for ( i = 0 ; i < numInPoints ; i++ ) {
-		dot = DotProduct( inPoints[i], normal );
-		dot -= dist;
-		dists[i] = dot;
-		if ( dot > epsilon ) {
-			sides[i] = SIDE_FRONT;
-		} else if ( dot < -epsilon ) {
-			sides[i] = SIDE_BACK;
-		} else {
-			sides[i] = SIDE_ON;
-		}
-		counts[sides[i]]++;
-	}
-	sides[i] = sides[0];
-	dists[i] = dists[0];
-
-	*numOutPoints = 0;
-
-	if ( !counts[0] ) {
-		return;
-	}
-	if ( !counts[1] ) {
-		*numOutPoints = numInPoints;
-		Com_Memcpy( outPoints, inPoints, numInPoints * sizeof(vec3_t) );
-		return;
-	}
-
-	for ( i = 0 ; i < numInPoints ; i++ ) {
-		p1 = inPoints[i];
-		clip = outPoints[ *numOutPoints ];
-		
-		if ( sides[i] == SIDE_ON ) {
-			VectorCopy( p1, clip );
-			(*numOutPoints)++;
-			continue;
-		}
-	
-		if ( sides[i] == SIDE_FRONT ) {
-			VectorCopy( p1, clip );
-			(*numOutPoints)++;
-			clip = outPoints[ *numOutPoints ];
-		}
-
-		if ( sides[i+1] == SIDE_ON || sides[i+1] == sides[i] ) {
-			continue;
-		}
-			
-		// generate a split point
-		p2 = inPoints[ (i+1) % numInPoints ];
-
-		d = dists[i] - dists[i+1];
-		if ( d == 0 ) {
-			dot = 0;
-		} else {
-			dot = dists[i] / d;
-		}
-
-		// clip xyz
-
-		for (j=0 ; j<3 ; j++) {
-			clip[j] = p1[j] + dot * ( p2[j] - p1[j] );
-		}
-
-		(*numOutPoints)++;
-	}
-}
-
-/*
-=================
-R_BoxSurfaces_r
-
-=================
-*/
-void R_BoxSurfaces_r(mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **list, int listsize, int *listlength, vec3_t dir) {
-
-	int			s, c;
-	msurface_t	*surf, **mark;
-
-	// do the tail recursion in a loop
-	while ( node->contents == -1 ) {
-		s = BoxOnPlaneSide( mins, maxs, node->plane );
-		if (s == 1) {
-			node = node->children[0];
-		} else if (s == 2) {
-			node = node->children[1];
-		} else {
-			R_BoxSurfaces_r(node->children[0], mins, maxs, list, listsize, listlength, dir);
-			node = node->children[1];
-		}
-	}
-
-	// add the individual surfaces
-	mark = node->firstmarksurface;
-	c = node->nummarksurfaces;
-	while (c--) {
-		//
-		if (*listlength >= listsize) break;
-		//
-		surf = *mark;
-		// check if the surface has NOIMPACT or NOMARKS set
-		if ( ( surf->shader->surfaceFlags & ( SURF_NOIMPACT | SURF_NOMARKS ) ) ) {
-			surf->viewCount = tr.viewCount;
-		}
-		// extra check for surfaces to avoid list overflows
-		else if (*(surf->data) == SF_FACE) {
-			// the face plane should go through the box
-			s = BoxOnPlaneSide( mins, maxs, &(( srfSurfaceFace_t * ) surf->data)->plane );
-			if (s == 1 || s == 2) {
-				surf->viewCount = tr.viewCount;
-			} else if (DotProduct((( srfSurfaceFace_t * ) surf->data)->plane.normal, dir) > -0.5) {
-			// don't add faces that make sharp angles with the projection direction
-				surf->viewCount = tr.viewCount;
-			}
-		}
-		else if (*(surfaceType_t *) (surf->data) != SF_GRID) surf->viewCount = tr.viewCount;
-		// check the viewCount because the surface may have
-		// already been added if it spans multiple leafs
-		if (surf->viewCount != tr.viewCount) {
-			surf->viewCount = tr.viewCount;
-			list[*listlength] = (surfaceType_t *) surf->data;
-			(*listlength)++;
-		}
-		mark++;
-	}
-}
-
-/*
-=================
-R_AddMarkFragments
-
-=================
-*/
-void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POLY],
-				   int numPlanes, const vec3_t *normals, const float *dists,
-				   int maxPoints, vec3_t pointBuffer,
-				   markFragment_t *fragmentBuffer,
-				   int *returnedPoints, int *returnedFragments,
-				   float fOnEpsilon) {
-	int pingPong, i;
-	markFragment_t	*mf;
-
-	// chop the surface by all the bounding planes of the to be projected polygon
-	pingPong = 0;
-
-	for ( i = 0 ; i < numPlanes ; i++ ) {
-
-		R_ChopPolyBehindPlane( numClipPoints, clipPoints[pingPong],
-						   &numClipPoints, clipPoints[!pingPong],
-							normals[i], dists[i], 0.5 );
-		pingPong ^= 1;
-		if ( numClipPoints == 0 ) {
-			break;
-		}
-	}
-	// completely clipped away?
-	if ( numClipPoints == 0 ) {
-		return;
-	}
-
-	// add this fragment to the returned list
-	if ( numClipPoints + (*returnedPoints) > maxPoints ) {
-		return;	// not enough space for this polygon
-	}
-
-	mf = fragmentBuffer + (*returnedFragments);
-	mf->firstPoint = (*returnedPoints);
-	mf->numPoints = numClipPoints;
-	mf->iIndex = 0;
-	Com_Memcpy( pointBuffer + (*returnedPoints) * 3, clipPoints[pingPong], numClipPoints * sizeof(vec3_t) );
-
-	(*returnedPoints) += numClipPoints;
-	(*returnedFragments)++;
-}
-
-void R_AddMarkFragmentsToTerrain(
-	cTerraPatchUnpacked_t* pTerPatch,
-	int numPlanes,
-    const vec3_t* normals,
-    float* dists,
-	int maxPoints,
-	vec3_t pointBuffer,
-	markFragment_t* fragmentBuffer,
-	int* returnedPoints,
-	int* returnedFragments
-)
-{
-	int i, j;
-	int iType;
-	int iFirstFragment;
-	unsigned char* pubHeight;
-	vec3_t v[8];
-	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
-
-	dists[numPlanes - 2] -= 96.f;
-	dists[numPlanes - 1] -= 108.f;
-
-	v[0][0] = pTerPatch->x0;
-	v[0][1] = pTerPatch->y0;
-	v[0][2] = pTerPatch->z0;
-	v[1][0] = pTerPatch->x0;
-	v[1][1] = pTerPatch->y0 + 512.f;
-    v[1][2] = pTerPatch->z0;
-    v[2][0] = pTerPatch->x0 + 512.f;
-    v[2][1] = pTerPatch->y0 + 512.f;
-    v[2][2] = pTerPatch->z0;
-    v[3][0] = pTerPatch->x0 + 512.f;
-    v[3][1] = pTerPatch->y0;
-    v[3][2] = pTerPatch->z0;
-    v[4][0] = pTerPatch->x0;
-    v[4][1] = pTerPatch->y0;
-    v[4][2] = pTerPatch->z0 + 510.f;
-    v[5][0] = pTerPatch->x0;
-    v[5][1] = pTerPatch->y0 + 512.f;
-    v[5][2] = pTerPatch->z0 + 510.f;
-    v[6][0] = pTerPatch->x0 + 512.f;
-    v[6][1] = pTerPatch->y0 + 512.f;
-    v[6][2] = pTerPatch->z0 + 510.f;
-    v[7][0] = pTerPatch->x0 + 512.f;
-    v[7][1] = pTerPatch->y0;
-    v[7][2] = pTerPatch->z0 + 510.f;
-
-	for (i = 0; i < numPlanes; i++) {
-		pubHeight = pTerPatch->heightmap;
-		iFirstFragment = *returnedFragments;
-
-		for (j = 0; j < 8; j++) {
-			if (DotProduct(v[i], normals[i]) - dists[i] > 0.f) {
-				break;
-			}
-		}
-
-		if (j == 8)
-		{
-			dists[numPlanes - 2] += 96.f;
-			dists[numPlanes - 1] += 108.f;
-			return;
-		}
-	}
-
-	pubHeight = pTerPatch->heightmap;
-	iFirstFragment = *returnedFragments;
-
-	for (i = 0; i < 8; i++) {
-		for (j = 0; j < 8; j++) {
-			iType = ri.CM_TerrainSquareType(pTerPatch - tr.world->terraPatches, i, j);
-			if (!iType) {
-				continue;
-			}
-
-			v[0][0] = (i << 6) + pTerPatch->x0;
-			v[0][1] = (j << 6) + pTerPatch->y0;
-            v[0][2] = (pubHeight[0] << 1) + pTerPatch->z0;
-            v[1][0] = (i << 6) + pTerPatch->x0 + 64.f;
-            v[1][1] = (j << 6) + pTerPatch->y0;
-            v[1][2] = (pubHeight[1] << 1) + pTerPatch->z0;
-            v[2][0] = (i << 6) + pTerPatch->x0 + 64.f;
-            v[2][1] = (j << 6) + pTerPatch->y0 + 64.f;
-            v[2][2] = (pubHeight[10] << 1) + pTerPatch->z0;
-            v[3][0] = (i << 6) + pTerPatch->x0;
-            v[3][1] = (j << 6) + pTerPatch->y0 + 64.f;
-            v[3][2] = (pubHeight[9] << 1) + pTerPatch->z0;
-
-			if (((j & 0xFF) + (i & 0xFF)) & 1) {
-				if (iType != 3) {
-					VectorCopy(v[0], clipPoints[0][0]);
-					VectorCopy(v[3], clipPoints[0][1]);
-					VectorCopy(v[1], clipPoints[0][2]);
-
-					R_AddMarkFragments(
-						3,
-						clipPoints,
-						numPlanes,
-						normals,
-						dists,
-						maxPoints,
-						pointBuffer,
-						fragmentBuffer,
-						returnedPoints,
-						returnedFragments,
-						0.f
-					);
-				}
-
-                if (iType != 6) {
-                    VectorCopy(v[2], clipPoints[0][0]);
-                    VectorCopy(v[1], clipPoints[0][1]);
-                    VectorCopy(v[3], clipPoints[0][2]);
-
-                    R_AddMarkFragments(
-                        3,
-                        clipPoints,
-                        numPlanes,
-                        normals,
-                        dists,
-                        maxPoints,
-                        pointBuffer,
-                        fragmentBuffer,
-                        returnedPoints,
-                        returnedFragments,
-                        0.f
-                    );
-				}
-			} else {
-                if (iType != 5) {
-                    VectorCopy(v[3], clipPoints[0][0]);
-                    VectorCopy(v[2], clipPoints[0][1]);
-                    VectorCopy(v[0], clipPoints[0][2]);
-
-                    R_AddMarkFragments(
-                        3,
-                        clipPoints,
-                        numPlanes,
-                        normals,
-                        dists,
-                        maxPoints,
-                        pointBuffer,
-                        fragmentBuffer,
-                        returnedPoints,
-                        returnedFragments,
-                        0.f
-                    );
-				}
-
-                if (iType != 4) {
-                    VectorCopy(v[1], clipPoints[0][0]);
-                    VectorCopy(v[0], clipPoints[0][1]);
-                    VectorCopy(v[2], clipPoints[0][2]);
-
-                    R_AddMarkFragments(
-                        3,
-                        clipPoints,
-                        numPlanes,
-                        normals,
-                        dists,
-                        maxPoints,
-                        pointBuffer,
-                        fragmentBuffer,
-                        returnedPoints,
-                        returnedFragments,
-                        0.f
-                    );
-				}
-			}
-		}
-	}
-
-	for (i = iFirstFragment; i < *returnedFragments; i++) {
-		fragmentBuffer[i].iIndex = pTerPatch - tr.world->terraPatches + 1;
-	}
-
-    dists[numPlanes - 2] += 96.f;
-    dists[numPlanes - 1] += 108.f;
-}
-
-void R_TessellateMarkFragments(
-	int* pReturnedPoints,
-	int* pReturnedFragments,
-	int numsurfaces,
-	surfaceType_t** surfaces,
-	const vec3_t projectionDir,
-	int numPlanes,
-    const vec3_t* normals,
-    float* dists,
-	int maxPoints,
-	vec3_t pointBuffer,
-	int maxFragments,
-	markFragment_t* fragmentBuffer,
-	float fRadiusSquared
-)
-{
-	int i, j, k, m, n;
-	int* indexes;
-	float* v;
-	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
-	vec3_t v1, v2;
-	vec3_t normal;
-	drawVert_t* dv;
-	qboolean bSkipTerrain;
-	srfGridMesh_t* cv;
-	srfSurfaceFace_t* surf;
-	cTerraPatchUnpacked_t* terraPatch;
-	int numClipPoints;
-
-    bSkipTerrain = ter_minMarkRadius->value * ter_minMarkRadius->value >= (long double)fRadiusSquared;
-
-	for (i = 0; i < numsurfaces; i++) {
-		if (*surfaces[i] == SF_GRID) {
-			cv = (srfGridMesh_t*)surfaces[i];
-
-			for (m = 0; m < cv->height - 1; m++) {
-				for (n = 0; n < cv->width - 1; n++) {
-					// We triangulate the grid and chop all triangles within
-					// the bounding planes of the to be projected polygon.
-					// LOD is not taken into account, not such a big deal though.
-					//
-					// It's probably much nicer to chop the grid itself and deal
-					// with this grid as a normal SF_GRID surface so LOD will
-					// be applied. However the LOD of that chopped grid must
-					// be synced with the LOD of the original curve.
-					// One way to do this; the chopped grid shares vertices with
-					// the original curve. When LOD is applied to the original
-					// curve the unused vertices are flagged. Now the chopped curve
-					// should skip the flagged vertices. This still leaves the
-					// problems with the vertices at the chopped grid edges.
-					//
-					// To avoid issues when LOD applied to "hollow curves" (like
-					// the ones around many jump pads) we now just add a 2 unit
-					// offset to the triangle vertices.
-					// The offset is added in the vertex normal vector direction
-					// so all triangles will still fit together.
-					// The 2 unit offset should avoid pretty much all LOD problems.
-
-                    numClipPoints = 3;
-
-                    dv = cv->verts + m * cv->width + n;
-
-                    VectorCopy(dv[0].xyz, clipPoints[0][0]);
-                    VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[0].normal, clipPoints[0][0]);
-                    VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-                    VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-                    VectorCopy(dv[1].xyz, clipPoints[0][2]);
-                    VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[1].normal, clipPoints[0][2]);
-                    // check the normal of this triangle
-					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-					CrossProduct(v1, v2, normal);
-					VectorNormalize(normal);
-                    if (DotProduct(normal, projectionDir) < -0.1) {
-                        // add the fragments of this triangle
-                        R_AddMarkFragments(numClipPoints, clipPoints,
-                            numPlanes, normals, dists,
-                            maxPoints, pointBuffer,
-                            fragmentBuffer,
-                            pReturnedPoints, pReturnedFragments, 0.f);
-
-                        if (*pReturnedFragments == maxFragments) {
-                            return;	// not enough space for more fragments
-                        }
-                    }
-
-					VectorCopy(dv[1].xyz, clipPoints[0][0]);
-					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[1].normal, clipPoints[0][0]);
-					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-					VectorCopy(dv[cv->width+1].xyz, clipPoints[0][2]);
-					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[cv->width+1].normal, clipPoints[0][2]);
-                    // check the normal of this triangle
-                    VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-                    VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-                    CrossProduct(v1, v2, normal);
-                    VectorNormalize(normal);
-                    if (DotProduct(normal, projectionDir) < -0.05) {
-                        // add the fragments of this triangle
-                        R_AddMarkFragments(numClipPoints, clipPoints,
-                            numPlanes, normals, dists,
-                            maxPoints, pointBuffer,
-                            fragmentBuffer,
-                            pReturnedPoints, pReturnedFragments, 0.f);
-
-                        if (*pReturnedFragments == maxFragments) {
-                            return;	// not enough space for more fragments
-                        }
-                    }
-				}
-			}
-		} else if (*surfaces[i] == SF_FACE) {
-            surf = (srfSurfaceFace_t*)surfaces[i];
-            // check the normal of this face
-            if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
-                continue;
-            }
-
-            indexes = (int*)((byte*)surf + surf->ofsIndices);
-
-            for (k = 0; k < surf->numIndices; k += 3) {
-                for (j = 0; j < 3; j++) {
-                    v = surf->points[indexes[k + j]];
-                    VectorMA(v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j]);
-                }
-
-                // add the fragments of this face
-                R_AddMarkFragments(3, clipPoints,
-                    numPlanes, normals, dists,
-                    maxPoints, pointBuffer,
-                    fragmentBuffer,
-                    pReturnedPoints, pReturnedFragments, 0.f);
-                if (*pReturnedFragments == maxFragments) {
-                    return;	// not enough space for more fragments
-                }
-            }
-		} else if (*surfaces[i] == SF_TERRAIN_PATCH) {
-			terraPatch = (cTerraPatchUnpacked_t*)surfaces[i];
-
-			if (!bSkipTerrain) {
-				R_AddMarkFragmentsToTerrain(
-					terraPatch,
-					numPlanes,
-					normals,
-					dists,
-					maxPoints,
-					pointBuffer,
-					fragmentBuffer,
-					pReturnedPoints,
-					pReturnedFragments
-				);
-
-				if (*pReturnedFragments == maxFragments) {
-					return;
-				}
-			}
-		}
-	}
-}
-
-/*
-=================
-R_MarkFragments
-
-=================
-*/
-int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared ) {
-    int numsurfaces;
-	int i;
-    surfaceType_t* surfaces[64];
-    vec3_t mins, maxs;
-	vec3_t boxsize;
-	float radius;
-	float backpush, frontpush;
-	int returnedFragments;
-	int returnedPoints;
-	vec3_t normals[MAX_VERTS_ON_POLY + 2];
-	float dists[MAX_VERTS_ON_POLY + 2];
-	vec3_t projectionDir;
-	vec3_t v1, v2;
-	float projdir;
-
-	//increment view count for double check prevention
-	tr.viewCount++;
-
-	//
-	VectorNormalize2( projection, projectionDir );
-	// find all the brushes that are to be considered
-	ClearBounds( mins, maxs );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		vec3_t	temp;
-
-		AddPointToBounds( points[i], mins, maxs );
-		VectorAdd( points[i], projection, temp );
-		AddPointToBounds( temp, mins, maxs );
-		// make sure we get all the leafs (also the one(s) in front of the hit surface)
-		VectorMA( points[i], -20, projectionDir, temp );
-		AddPointToBounds( temp, mins, maxs );
-	}
-
-	VectorSubtract(maxs, mins, v1);
-	projdir = -DotProduct(v1, projectionDir);
-	VectorMA(v1, projdir, projectionDir, boxsize);
-	radius = VectorLength(boxsize);
-
-    frontpush = radius;
-    if (radius >= 32.f) frontpush = 32.f;
-    backpush = radius;
-	if (radius >= 20.f) backpush = radius;
-
-	if (numPoints > MAX_VERTS_ON_POLY) numPoints = MAX_VERTS_ON_POLY;
-	// create the bounding planes for the to be projected polygon
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		VectorSubtract(points[(i+1)%numPoints], points[i], v1);
-		VectorAdd(points[i], projection, v2);
-		VectorSubtract(points[i], v2, v2);
-		CrossProduct(v1, v2, normals[i]);
-		VectorNormalizeFast(normals[i]);
-		dists[i] = DotProduct(normals[i], points[i]);
-	}
-	// add near and far clipping planes for projection
-	VectorCopy(projectionDir, normals[numPoints]);
-	dists[numPoints] = DotProduct(normals[numPoints], points[0]) - frontpush;
-	VectorCopy(projectionDir, normals[numPoints+1]);
-	VectorInverse(normals[numPoints+1]);
-	dists[numPoints+1] = DotProduct(normals[numPoints+1], points[0]) - backpush;
-
-	returnedPoints = 0;
-	returnedFragments = 0;
-	numsurfaces = 0;
-
-	R_BoxSurfaces_r(tr.world->nodes, mins, maxs, surfaces, 64, &numsurfaces, projectionDir);
-	if (!numsurfaces) return 0;
-
-    R_TessellateMarkFragments(
-        &returnedPoints,
-        &returnedFragments,
-        numsurfaces,
-        surfaces,
-        projectionDir,
-        numPoints + 2,
-        normals,
-        dists,
-        maxPoints,
-        pointBuffer,
-        maxFragments,
-        fragmentBuffer,
-        fRadiusSquared
-	);
-
-    return returnedFragments;
-
-	returnedPoints = 0;
-	returnedFragments = 0;
-
-#if 0
-	for ( i = 0 ; i < numsurfaces ; i++ ) {
-
-		if (*surfaces[i] == SF_GRID) {
-			cv = (srfGridMesh_t *) surfaces[i];
-			for ( m = 0 ; m < cv->height - 1 ; m++ ) {
-				for ( n = 0 ; n < cv->width - 1 ; n++ ) {
-					// We triangulate the grid and chop all triangles within
-					// the bounding planes of the to be projected polygon.
-					// LOD is not taken into account, not such a big deal though.
-					//
-					// It's probably much nicer to chop the grid itself and deal
-					// with this grid as a normal SF_GRID surface so LOD will
-					// be applied. However the LOD of that chopped grid must
-					// be synced with the LOD of the original curve.
-					// One way to do this; the chopped grid shares vertices with
-					// the original curve. When LOD is applied to the original
-					// curve the unused vertices are flagged. Now the chopped curve
-					// should skip the flagged vertices. This still leaves the
-					// problems with the vertices at the chopped grid edges.
-					//
-					// To avoid issues when LOD applied to "hollow curves" (like
-					// the ones around many jump pads) we now just add a 2 unit
-					// offset to the triangle vertices.
-					// The offset is added in the vertex normal vector direction
-					// so all triangles will still fit together.
-					// The 2 unit offset should avoid pretty much all LOD problems.
-
-					numClipPoints = 3;
-
-					dv = cv->verts + m * cv->width + n;
-
-					VectorCopy(dv[0].xyz, clipPoints[0][0]);
-					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[0].normal, clipPoints[0][0]);
-					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-					VectorCopy(dv[1].xyz, clipPoints[0][2]);
-					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[1].normal, clipPoints[0][2]);
-					// check the normal of this triangle
-					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-					CrossProduct(v1, v2, normal);
-					VectorNormalizeFast(normal);
-					if (DotProduct(normal, projectionDir) < -0.1) {
-						// add the fragments of this triangle
-						R_AddMarkFragments(numClipPoints, clipPoints,
-										   numPlanes, normals, dists,
-										   maxPoints, pointBuffer,
-										    fragmentBuffer,
-										   &returnedPoints, &returnedFragments, 0.f);
-
-						if ( returnedFragments == maxFragments ) {
-							return returnedFragments;	// not enough space for more fragments
-						}
-					}
-
-					VectorCopy(dv[1].xyz, clipPoints[0][0]);
-					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[1].normal, clipPoints[0][0]);
-					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-					VectorCopy(dv[cv->width+1].xyz, clipPoints[0][2]);
-					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[cv->width+1].normal, clipPoints[0][2]);
-					// check the normal of this triangle
-					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-					CrossProduct(v1, v2, normal);
-					VectorNormalizeFast(normal);
-					if (DotProduct(normal, projectionDir) < -0.05) {
-						// add the fragments of this triangle
-						R_AddMarkFragments(numClipPoints, clipPoints,
-										   numPlanes, normals, dists,
-										   maxPoints, pointBuffer,
-										    fragmentBuffer,
-										   &returnedPoints, &returnedFragments, 0.f);
-
-						if ( returnedFragments == maxFragments ) {
-							return returnedFragments;	// not enough space for more fragments
-						}
-					}
-				}
-			}
-		}
-		else if (*surfaces[i] == SF_FACE) {
-
-			surf = ( srfSurfaceFace_t * ) surfaces[i];
-			// check the normal of this face
-			if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
-				continue;
-			}
-
-			/*
-			VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-			VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-			CrossProduct(v1, v2, normal);
-			VectorNormalize(normal);
-			if (DotProduct(normal, projectionDir) > -0.5) continue;
-			*/
-			indexes = (int *)( (byte *)surf + surf->ofsIndices );
-			for ( k = 0 ; k < surf->numIndices ; k += 3 ) {
-				for ( j = 0 ; j < 3 ; j++ ) {
-					v = surf->points[0] + VERTEXSIZE * indexes[k+j];;
-					VectorMA( v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j] );
-				}
-				// add the fragments of this face
-				R_AddMarkFragments( 3 , clipPoints,
-								   numPlanes, normals, dists,
-								   maxPoints, pointBuffer,
-								   fragmentBuffer,
-								   &returnedPoints, &returnedFragments, 0.f);
-				if ( returnedFragments == maxFragments ) {
-					return returnedFragments;	// not enough space for more fragments
-				}
-			}
-			continue;
-		}
-		else {
-			// ignore all other world surfaces
-			// might be cool to also project polygons on a triangle soup
-			// however this will probably create huge amounts of extra polys
-			// even more than the projection onto curves
-			continue;
-		}
-	}
-	return returnedFragments;
-#endif
-}
-
-void R_BoxSurfacesForBModel_r(bmodel_t* pBmodel, const vec3_t mins, const vec3_t maxs, surfaceType_t** list, int listsize, int* listlength, const vec3_t dir)
-{
-	int s;
-	int c;
-	msurface_t* surf;
-	int i;
-
-	surf = pBmodel->firstSurface;
-
-	for (i = 0; i < listsize && i < pBmodel->numSurfaces; i++, surf++) {
-		s = surf->shader->surfaceFlags;
-		c = surf->shader->contentFlags;
-
-		if (!(s & SURF_NOIMPACT)
-			&& !(s & SURF_NOMARKS)
-			&& !(c & CONTENTS_FOG))
-		{
-			switch (*surf->data)
-			{
-			case SF_FACE:
-            {
-                int plane;
-                srfSurfaceFace_t* face;
-
-				face = (srfSurfaceFace_t*)surf->data;
-				plane = BoxOnPlaneSide(mins, maxs, &face->plane);
-				if (plane == PLANE_Y || plane == PLANE_Z) {
-					surf->viewCount = tr.viewCount;
-				}
-				else if (DotProduct(dir, face->plane.normal) > 0.5f) {
-					surf->viewCount = tr.viewCount;
-				}
-				break;
-			}
-            case SF_GRID:
-                surf->viewCount = tr.viewCount;
-				break;
-			default:
-				break;
-			}
-		}
-		else
-		{
-			surf->viewCount = tr.viewCount;
-		}
-
-		if (surf->viewCount != tr.viewCount)
-		{
-			surf->viewCount = tr.viewCount;
-			list[(*listlength)++] = surf->data;
-		}
-	}
-}
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
-    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-    int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared)
-{
-	int i;
-	int numsurfaces;
-	vec3_t vTmp;
-	vec3_t v1, v2;
-	vec3_t vMins, vMaxs;
-	vec3_t vTransPoints[64];
-	vec3_t vTransProj;
-	vec3_t vTransProjDir;
-	bmodel_t* pBmodel;
-	surfaceType_t* surfaces[64];
-	int returnedFragments;
-	int returnedPoints;
-	vec3_t normals[MAX_VERTS_ON_POLY+2];
-	float dists[MAX_VERTS_ON_POLY+2];
-
-    tr.viewCount++;
-
-    pBmodel = &tr.world->bmodels[bmodel];
-
-	if (numPoints > 64) {
-		numPoints = 64;
-	}
-
-	if (vAngles[0] || vAngles[1] || vAngles[2])
-	{
-		vec3_t axis[3];
-
-		AngleVectorsLeft(vAngles, axis[0], axis[1], axis[2]);
-	
-		for (i = 0; i < numPoints; i++) {
-			VectorSubtract(points[i], vOrigin, vTmp);
-			MatrixTransformVectorRight(axis, vTmp, vTransPoints[i]);
-		}
-
-		MatrixTransformVectorRight(axis, projection, vTransProj);
-	}
-	else
-	{
-        for (i = 0; i < numPoints; i++) {
-            VectorSubtract(points[i], vOrigin, vTransPoints[i]);
-		}
-
-		VectorCopy(projection, vTransProj);
-	}
-
-    VectorNormalize2(vTransProj, vTransProjDir);
-    ClearBounds(vMins, vMaxs);
-
-	for (i = 0; i < numPoints; i++) {
-		AddPointToBounds(vTransPoints[i], vMins, vMaxs);
-		VectorAdd(vTransPoints[i], vTransProj, vTmp);
-		AddPointToBounds(vTmp, vMins, vMaxs);
-		VectorMA(vTransPoints[i], -20.f, vTransProjDir, vTmp);
-		AddPointToBounds(vTmp, vMins, vMaxs);
-	}
-
-	for (i = 0; i < numPoints; i++) {
-		VectorSubtract(vTransPoints[(i + 1) % numPoints], vTransPoints[i], v1);
-		VectorAdd(vTransPoints[i], vTransProj, v2);
-		VectorSubtract(vTransPoints[i], v2, v2);
-		CrossProduct(v1, v2, normals[i]);
-		VectorNormalize(normals[i]);
-		dists[i] = DotProduct(normals[i], vTransPoints[i]);
-	}
-
-	VectorCopy(vTransProjDir, normals[numPoints]);
-	dists[numPoints] = DotProduct(normals[numPoints], vTransPoints[0]) - 32.f;
-
-	VectorCopy(vTransProjDir, normals[numPoints + 1]);
-	VectorInverse(normals[numPoints + 1]);
-	dists[numPoints + 1] = DotProduct(normals[numPoints + 1], vTransPoints[0]) - 20.f;
-
-	returnedPoints = 0;
-	returnedFragments = 0;
-	numsurfaces = 0;
-
-	R_BoxSurfacesForBModel_r(pBmodel, vMins, vMaxs, surfaces, ARRAY_LEN(surfaces), &numsurfaces, vTransProjDir);
-	if (!numsurfaces) {
-		return 0;
-	}
-
-    R_TessellateMarkFragments(
-        &returnedPoints,
-        &returnedFragments,
-        numsurfaces,
-        surfaces,
-        vTransProjDir,
-        numPoints + 2,
-        normals,
-        dists,
-        maxPoints,
-        pointBuffer,
-        maxFragments,
-        fragmentBuffer,
-        fRadiusSquared
-	);
-
-    return returnedFragments;
-}
\ No newline at end of file
diff --git a/code/renderer/tr_scene.c b/code/renderer/tr_scene.c
deleted file mode 100644
index 1a43b095..00000000
--- a/code/renderer/tr_scene.c
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-#include "tr_vis.h"
-#include "tiki.h"
-
-int			r_firstSceneDrawSurf;
-int			r_firstSceneSpriteSurf;
-
-int			r_numdlights;
-int			r_firstSceneDlight;
-
-int			r_numentities;
-int			r_firstSceneEntity;
-
-int			r_numsprites;
-int			r_firstSceneSprite;
-
-int			r_numtermarks;
-int			r_firstSceneTerMark;
-
-int			r_numpolys;
-int			r_firstScenePoly;
-
-int			r_numpolyverts;
-
-
-/*
-====================
-R_ToggleSmpFrame
-
-====================
-*/
-void R_ToggleSmpFrame( void ) {
-	if ( r_smp->integer ) {
-		// use the other buffers next frame, because another CPU
-		// may still be rendering into the current ones
-		tr.smpFrame ^= 1;
-	} else {
-		tr.smpFrame = 0;
-	}
-
-	backEndData[tr.smpFrame]->commands.used = 0;
-
-	r_firstSceneDrawSurf = 0;
-	r_firstSceneSpriteSurf = 0;
-
-	r_numdlights = 0;
-	r_firstSceneDlight = 0;
-
-	r_numentities = 0;
-	r_firstSceneEntity = 0;
-
-	r_numsprites = 0;
-	r_firstSceneSprite = 0;
-
-	r_numtermarks = 0;
-	r_firstSceneTerMark = 0;
-
-	r_numpolys = 0;
-	r_firstScenePoly = 0;
-
-	r_numpolyverts = 0;
-}
-
-
-/*
-====================
-RE_ClearScene
-
-====================
-*/
-void RE_ClearScene( void ) {
-	r_firstSceneDlight = r_numdlights;
-	r_firstSceneEntity = r_numentities;
-	r_firstSceneSprite = r_numsprites;
-	r_firstSceneTerMark = r_numtermarks;
-	r_firstScenePoly = r_numpolys;
-}
-
-/*
-===========================================================================
-
-DISCRETE POLYS
-
-===========================================================================
-*/
-
-/*
-=====================
-R_AddPolygonSurfaces
-
-Adds all the scene's polys into this view's drawsurf list
-=====================
-*/
-void R_AddPolygonSurfaces( void ) {
-	int			i;
-	shader_t	*sh;
-	srfPoly_t	*poly;
-
-	tr.currentEntityNum = ENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-
-	for ( i = 0, poly = tr.refdef.polys; i < tr.refdef.numPolys ; i++, poly++ ) {
-		sh = R_GetShaderByHandle( poly->hShader );
-		R_AddDrawSurf( ( void * )poly, sh, qfalse );
-	}
-}
-
-/*
-=====================
-RE_AddPolyToScene
-
-=====================
-*/
-qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-	srfPoly_t	*poly;
-
-	if ( !tr.registered ) {
-		return qfalse;
-	}
-
-	if (numVerts + r_numpolyverts > max_polyverts || r_numpolys >= max_polys) {
-		ri.Printf(PRINT_WARNING, "Exceeded MAX POLYS\n");
-		return qfalse;
-	}
-
-	poly = &backEndData[tr.smpFrame]->polys[r_numpolys];
-	poly->surfaceType = SF_POLY;
-	poly->hShader = hShader;
-	poly->numVerts = numVerts;
-	poly->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
-	poly->renderfx = renderfx;
-
-	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
-	++r_numpolys;
-	r_numpolyverts += numVerts;
-
-	return qtrue;
-}
-
-/*
-=====================
-R_AddTerrainMarkSurfaces
-=====================
-*/
-void R_AddTerrainMarkSurfaces(void) {
-    srfMarkFragment_t* terMark;
-    int j;
-    shader_t* shader;
-
-    for (j = 0; j < tr.refdef.numTerMarks; j++)
-    {
-        terMark = &tr.refdef.terMarks[j];
-
-        shader = R_GetShaderByHandle(terMark->surfaceType);
-        terMark->surfaceType = SF_MARK_FRAG;
-        R_AddDrawSurf(&terMark->surfaceType, shader, 0);
-    }
-}
-
-/*
-=====================
-RE_AddTerrainMarkToScene
-=====================
-*/
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-    srfMarkFragment_t* terMark;
-
-    if (!tr.registered) {
-        return;
-    }
-
-    if (numVerts + r_numpolyverts > max_polyverts || r_numtermarks >= max_termarks) {
-        ri.Printf(PRINT_WARNING, "Exceeded MAX TERRAIN MARKS\n");
-        return;
-    }
-
-    terMark = &backEndData[tr.smpFrame]->terMarks[r_numtermarks];
-    terMark->surfaceType = hShader;
-    terMark->iIndex = iTerrainIndex;
-    terMark->numVerts = numVerts;
-    terMark->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
-    memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
-
-    r_numtermarks++;
-    r_numpolyverts += numVerts;
-}
-
-//=================================================================================
-
-/*
-=====================
-RE_GetRenderEntity
-=====================
-*/
-refEntity_t* RE_GetRenderEntity(int entityNumber) {
-    int i;
-
-    for (i = 0; i < r_numentities; i++) {
-        if (backEndData[0]->entities[i].e.entityNumber == entityNumber) {
-            return &backEndData[0]->entities[i].e;
-        }
-    }
-
-    return NULL;
-}
-
-/*
-=====================
-RE_AddRefEntityToScene
-
-=====================
-*/
-void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber) {
-	if ( !tr.registered ) {
-		return;
-	}
-  // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=402
-	if ( r_numentities >= ENTITYNUM_WORLD ) {
-		return;
-	}
-	if ( ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
-		ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType );
-	}
-
-	backEndData[tr.smpFrame]->entities[r_numentities].e = *ent;
-	backEndData[tr.smpFrame]->entities[r_numentities].bLightGridCalculated = qfalse;
-	backEndData[tr.smpFrame]->entities[r_numentities].sphereCalculated = qfalse;
-
-	if (parentEntityNumber != ENTITYNUM_NONE)
-	{
-		int i;
-
-		//
-		// Find the parent entity to attach to
-		//
-		for (i = r_firstSceneEntity; i < r_numentities; i++)
-		{
-			if (backEndData[tr.smpFrame]->entities[i].e.entityNumber == parentEntityNumber)
-			{
-				backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = i - r_firstSceneEntity;
-				break;
-			}
-		}
-
-		if (i == r_numentities) {
-			backEndData[tr.smpFrame]->entities[i].e.parentEntity = ENTITYNUM_NONE;
-		}
-	}
-	else
-	{
-		backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = ENTITYNUM_NONE;
-	}
-
-	r_numentities++;
-}
-
-void RE_AddRefSpriteToScene(const refEntity_t* ent) {
-	refSprite_t* spr;
-	int i;
-
-	if (!tr.registered) {
-		return;
-	}
-
-	if (r_numsprites >= MAX_SPRITES) {
-		return;
-	}
-
-	spr = &backEndData[tr.smpFrame]->sprites[r_numsprites];
-	VectorCopy(ent->origin, spr->origin);
-	spr->surftype = SF_SPRITE;
-    spr->hModel = ent->hModel;
-    spr->scale = ent->scale;
-    spr->renderfx = ent->renderfx;
-    spr->shaderTime = ent->shaderTime;
-	AxisCopy(ent->axis, spr->axis);
-
-	for (i = 0; i < 4; ++i) {
-		spr->shaderRGBA[i] = ent->shaderRGBA[i];
-	}
-
-    ++r_numsprites;
-}
-
-/*
-=====================
-RE_AddDynamicLightToScene
-
-=====================
-*/
-void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
-	dlight_t	*dl;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	if ( r_numdlights >= MAX_DLIGHTS ) {
-		return;
-	}
-	if ( intensity <= 0 ) {
-		return;
-	}
-	dl = &backEndData[tr.smpFrame]->dlights[r_numdlights++];
-	VectorCopy (org, dl->origin);
-	dl->radius = intensity;
-	dl->color[0] = r;
-	dl->color[1] = g;
-	dl->color[2] = b;
-	dl->type = type;
-}
-
-/*
-=====================
-RE_AddLightToScene
-
-=====================
-*/
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
-	RE_AddDynamicLightToScene( org, intensity, r, g, b, type );
-}
-
-/*
-=====================
-R_AddLightGridSurfacesToScene
-
-Draw small dots to make a grid.
-A dot matches the calculated color of the light at its location
-=====================
-*/
-void R_AddLightGridSurfacesToScene() {
-    vec3_t vMin, vMax;
-    vec3_t vPos;
-    vec3_t vLight;
-    int i;
-    qhandle_t hShader;
-    polyVert_t verts[4];
-
-    if (!tr.world) {
-        return;
-    }
-    if (!tr.world->lightGridData) {
-        return;
-    }
-    if (!tr.world->lightGridOffsets) {
-        return;
-    }
-
-    hShader = RE_RegisterShader("showgrid");
-    R_GetShaderByHandle(hShader);
-
-    for (i = 0; i < 3; i++) {
-        vMin[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] - 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
-        vMax[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] + 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
-    }
-
-    for (vPos[2] = vMin[2]; vPos[2] < vMax[2]; vPos[2] += tr.world->lightGridSize[2]) {
-        for (vPos[1] = vMin[1]; vPos[1] < vMax[1]; vPos[1] += tr.world->lightGridSize[1]) {
-            for (vPos[0] = vMin[0]; vPos[0] < vMax[0]; vPos[0] += tr.world->lightGridSize[0]) {
-                R_GetLightingGridValueFast(vPos, vLight);
-
-                verts[0].xyz[0] = vPos[0] - 2.0;
-                verts[0].xyz[1] = vPos[1] - 2.0;
-                verts[0].xyz[2] = vPos[2];
-                verts[0].st[0] = 0.0;
-                verts[0].st[1] = 0.0;
-                verts[0].modulate[0] = vLight[0];
-                verts[0].modulate[1] = vLight[1];
-                verts[0].modulate[2] = vLight[2];
-                verts[0].modulate[3] = 0xff;
-
-                verts[1].xyz[0] = vPos[0] + 2.0;
-                verts[1].xyz[1] = vPos[1] - 2.0;
-                verts[1].xyz[2] = vPos[2];
-                verts[1].st[0] = 0.0;
-                verts[1].st[1] = 1.0;
-                verts[1].modulate[0] = vLight[0];
-                verts[1].modulate[1] = vLight[1];
-                verts[1].modulate[2] = vLight[2];
-                verts[1].modulate[3] = 0xff;
-
-                verts[2].xyz[0] = vPos[0] + 2.0;
-                verts[2].xyz[1] = vPos[1] + 2.0;
-                verts[2].xyz[2] = vPos[2];
-                verts[2].st[0] = 1.0;
-                verts[2].st[1] = 1.0;
-                verts[2].modulate[0] = vLight[0];
-                verts[2].modulate[1] = vLight[1];
-                verts[2].modulate[2] = vLight[2];
-                verts[2].modulate[3] = 0xff;
-
-                verts[3].xyz[0] = vPos[0] - 2.0;
-                verts[3].xyz[1] = vPos[1] + 2.0;
-                verts[3].xyz[2] = vPos[2];
-                verts[3].st[0] = 1.0;
-                verts[3].st[1] = 0.0;
-                verts[3].modulate[0] = vLight[0];
-                verts[3].modulate[1] = vLight[1];
-                verts[3].modulate[2] = vLight[2];
-                verts[3].modulate[3] = 0xff;
-
-                RE_AddPolyToScene(hShader, 4, verts, 0);
-            }
-        }
-    }
-}
-
-/*
-=====================
-RE_AddAdditiveLightToScene
-
-=====================
-*/
-void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b ) {
-	RE_AddDynamicLightToScene( org, intensity, r, g, b, qtrue );
-}
-
-/*
-@@@@@@@@@@@@@@@@@@@@@
-RE_RenderScene
-
-Draw a 3D view into a part of the window, then return
-to 2D drawing.
-
-Rendering a scene may require multiple views to be rendered
-to handle mirrors,
-@@@@@@@@@@@@@@@@@@@@@
-*/
-void RE_RenderScene( const refdef_t *fd ) {
-	viewParms_t		parms;
-	int				startTime;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	GLimp_LogComment( "====== RE_RenderScene =====\n" );
-
-	if ( r_norefresh->integer ) {
-		return;
-	}
-
-	startTime = ri.Milliseconds();
-
-	if (!tr.world && !( fd->rdflags & RDF_NOWORLDMODEL ) ) {
-		ri.Error (ERR_DROP, "R_RenderScene: NULL worldmodel");
-	}
-
-	if (r_light_showgrid->integer) {
-		R_AddLightGridSurfacesToScene();
-	}
-
-	R_VisDebug();
-	TIKI_Reset_Caches();
-
-	backEnd.in2D = qfalse;
-	tr.refdef.x = fd->x;
-	tr.refdef.y = fd->y;
-	tr.refdef.width = fd->width;
-	tr.refdef.height = fd->height;
-	tr.refdef.fov_x = fd->fov_x;
-	tr.refdef.fov_y = fd->fov_y;
-
-	VectorCopy( fd->vieworg, tr.refdef.vieworg );
-	VectorCopy( fd->viewaxis[0], tr.refdef.viewaxis[0] );
-	VectorCopy( fd->viewaxis[1], tr.refdef.viewaxis[1] );
-	VectorCopy( fd->viewaxis[2], tr.refdef.viewaxis[2] );
-
-	tr.refdef.time = fd->time;
-	tr.refdef.rdflags = fd->rdflags;
-
-	// copy the areamask data over and note if it has changed, which
-	// will force a reset of the visible leafs even if the view hasn't moved
-	tr.refdef.areamaskModified = qfalse;
-	if ( ! (tr.refdef.rdflags & RDF_NOWORLDMODEL) ) {
-		int		areaDiff;
-		int		i;
-
-		// compare the area bits
-		areaDiff = 0;
-		for (i = 0 ; i < MAX_MAP_AREA_BYTES/4 ; i++) {
-			areaDiff |= ((int *)tr.refdef.areamask)[i] ^ ((int *)fd->areamask)[i];
-			((int *)tr.refdef.areamask)[i] = ((int *)fd->areamask)[i];
-		}
-
-		if ( areaDiff ) {
-			// a door just opened or something
-			tr.refdef.areamaskModified = qtrue;
-		}
-	}
-
-	// copy the sky data
-	tr.refdef.sky_alpha = fd->sky_alpha;
-	tr.refdef.sky_portal = fd->sky_portal;
-
-	VectorCopy(fd->sky_origin, tr.refdef.sky_origin);
-	VectorCopy(fd->sky_axis[0], tr.refdef.sky_axis[0]);
-	VectorCopy(fd->sky_axis[1], tr.refdef.sky_axis[1]);
-	VectorCopy(fd->sky_axis[2], tr.refdef.sky_axis[2]);
-
-	// derived info
-
-	tr.refdef.floatTime = tr.refdef.time * 0.001f;
-
-	tr.refdef.numDrawSurfs = r_firstSceneDrawSurf;
-	tr.refdef.drawSurfs = backEndData[tr.smpFrame]->drawSurfs;
-
-    tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
-    tr.refdef.spriteSurfs = backEndData[tr.smpFrame]->spriteSurfs;
-
-	tr.refdef.num_entities = r_numentities - r_firstSceneEntity;
-	tr.refdef.entities = &backEndData[tr.smpFrame]->entities[r_firstSceneEntity];
-
-	tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
-	tr.refdef.sprites = &backEndData[tr.smpFrame]->sprites[r_firstSceneSprite];
-
-	tr.refdef.num_dlights = r_numdlights - r_firstSceneDlight;
-	tr.refdef.dlights = &backEndData[tr.smpFrame]->dlights[r_firstSceneDlight];
-
-	tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
-	tr.refdef.terMarks = &backEndData[tr.smpFrame]->terMarks[r_firstSceneTerMark];
-
-	tr.refdef.numPolys = r_numpolys - r_firstScenePoly;
-	tr.refdef.polys = &backEndData[tr.smpFrame]->polys[r_firstScenePoly];
-
-	backEndData[tr.smpFrame]->staticModelData = tr.refdef.staticModelData;
-
-	// turn off dynamic lighting globally by clearing all the
-	// dlights if it needs to be disabled or if vertex lighting is enabled
-	if (r_vertexLight->integer == 1 ) {
-		tr.refdef.num_dlights = 0;
-	}
-
-	// a single frame may have multiple scenes draw inside it --
-	// a 3D game view, 3D status bar renderings, 3D menus, etc.
-	// They need to be distinguished by the light flare code, because
-	// the visibility state for a given surface may be different in
-	// each scene / view.
-	tr.frameSceneNum++;
-	tr.sceneCount++;
-
-	// setup view parms for the initial view
-	//
-	// set up viewport
-	// The refdef takes 0-at-the-top y coordinates, so
-	// convert to GL's 0-at-the-bottom space
-	//
-	tr.skyRendered = qfalse;
-	tr.portalRendered = qfalse;
-	Com_Memset( &parms, 0, sizeof( parms ) );
-	parms.viewportX = tr.refdef.x;
-	parms.viewportY = glConfig.vidHeight - ( tr.refdef.y + tr.refdef.height );
-	parms.viewportWidth = tr.refdef.width;
-	parms.viewportHeight = tr.refdef.height;
-	parms.isPortal = qfalse;
-
-	parms.fovX = tr.refdef.fov_x;
-	parms.fovY = tr.refdef.fov_y;
-
-	VectorCopy( fd->vieworg, parms.ori.origin );
-	VectorCopy( fd->viewaxis[0], parms.ori.axis[0] );
-	VectorCopy( fd->viewaxis[1], parms.ori.axis[1] );
-	VectorCopy( fd->viewaxis[2], parms.ori.axis[2] );
-
-	VectorCopy( fd->vieworg, parms.pvsOrigin );
-
-	// copy the farplane data
-	parms.farplane_distance = fd->farplane_distance;
-	parms.farplane_bias = fd->farplane_bias;
-	parms.farplane_color[0] = fd->farplane_color[0];
-	parms.farplane_color[1] = fd->farplane_color[1];
-	parms.farplane_color[2] = fd->farplane_color[2];
-	parms.farplane_cull = fd->farplane_cull;
-	parms.renderTerrain = fd->renderTerrain;
-
-	tr.refdef.skybox_farplane = fd->skybox_farplane;
-	tr.refdef.render_terrain = parms.renderTerrain;
-
-	if (fd->farclipOverride >= 15900 || fd->farclipOverride <= -0.99) {
-		tr.farclip = 0;
-	} else {
-		tr.farclip = r_farclip->integer;
-		if (!tr.farclip && (r_picmip->integer > 1 || r_colorbits->integer == 16)) {
-			tr.farclip = 2800;
-		}
-	}
-
-	if (tr.farclip) {
-        if (fd->farclipOverride != 0) {
-            parms.farplane_distance = fd->farclipOverride;
-		} else {
-			parms.farplane_distance = tr.farclip;
-		}
-
-		if (fd->farplane_color[0] >= 0 && fd->farplane_color[1] >= 0 && fd->farplane_color[2] >= 0) {
-            parms.farplane_color[0] = fd->farplane_color[0];
-            parms.farplane_color[1] = fd->farplane_color[1];
-            parms.farplane_color[2] = fd->farplane_color[2];
-		}
-
-		if (fd->farplaneColorOverride[0] >= 0 && fd->farplaneColorOverride[1] >= 0 && fd->farplaneColorOverride[2] >= 0) {
-			parms.farplane_color[0] = fd->farplaneColorOverride[0];
-			parms.farplane_color[1] = fd->farplaneColorOverride[1];
-			parms.farplane_color[2] = fd->farplaneColorOverride[2];
-		}
-
-		parms.farplane_cull = qtrue;
-
-        if (fd->farplane_distance > 0 && fd->farplane_distance < parms.farplane_distance) {
-            parms.farplane_distance = fd->farplane_distance;
-		} else {
-			if (fd->farplane_bias == 0) {
-				parms.farplane_bias = parms.farplane_distance * 0.18f;
-			} else if (fd->farplane_distance <= 500.f) {
-				parms.farplane_bias = parms.farplane_distance * 0.18f;
-			} else {
-				parms.farplane_bias = parms.farplane_distance / fd->farplane_distance;
-			}
-		}
-	} else if (parms.farplane_bias == 0) {
-		parms.farplane_bias = parms.farplane_distance * 0.18f;
-	}
-
-	R_ClearRealDlights();
-	R_RenderView( &parms );
-
-	// the next scene rendered in this frame will tack on after this one
-	r_firstSceneDrawSurf = tr.refdef.numDrawSurfs;
-	r_firstSceneSpriteSurf = tr.refdef.numSpriteSurfs;
-	r_firstSceneEntity = r_numentities;
-	r_firstSceneSprite = r_numsprites;
-	r_firstSceneDlight = r_numdlights;
-	r_firstSceneTerMark = r_numtermarks;
-	r_firstScenePoly = r_numpolys;
-
-	tr.frontEndMsec += ri.Milliseconds() - startTime;
-}
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
deleted file mode 100644
index af653548..00000000
--- a/code/renderer/tr_shade.c
+++ /dev/null
@@ -1,1876 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_shade.c
-
-#include "tr_local.h"
-
-/*
-
-  THIS ENTIRE FILE IS BACK END
-
-  This file deals with applying shaders to surface data in the tess struct.
-*/
-
-/*
-================
-R_ArrayElementDiscrete
-
-This is just for OpenGL conformance testing, it should never be the fastest
-================
-*/
-static void APIENTRY R_ArrayElementDiscrete( GLint index ) {
-	qglColor4ubv( tess.svars.colors[ index ] );
-	if ( glState.currenttmu ) {
-		qglMultiTexCoord2fARB( 0, tess.svars.texcoords[ 0 ][ index ][0], tess.svars.texcoords[ 0 ][ index ][1] );
-		qglMultiTexCoord2fARB( 1, tess.svars.texcoords[ 1 ][ index ][0], tess.svars.texcoords[ 1 ][ index ][1] );
-	} else {
-		qglTexCoord2fv( tess.svars.texcoords[ 0 ][ index ] );
-	}
-	qglVertex3fv( tess.xyz[ index ] );
-}
-
-/*
-===================
-R_DrawStripElements
-
-===================
-*/
-static int		c_vertexes;		// for seeing how long our average strips are
-static int		c_begins;
-static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void ( APIENTRY *element )(GLint) ) {
-	int i;
-	int last[3] = { -1, -1, -1 };
-	qboolean even;
-
-	c_begins++;
-
-	if ( numIndexes <= 0 ) {
-		return;
-	}
-
-	qglBegin( GL_TRIANGLE_STRIP );
-
-	// prime the strip
-	element( indexes[0] );
-	element( indexes[1] );
-	element( indexes[2] );
-	c_vertexes += 3;
-
-	last[0] = indexes[0];
-	last[1] = indexes[1];
-	last[2] = indexes[2];
-
-	even = qfalse;
-
-	for ( i = 3; i < numIndexes; i += 3 )
-	{
-		// odd numbered triangle in potential strip
-		if ( !even )
-		{
-			// check previous triangle to see if we're continuing a strip
-			if ( ( indexes[i+0] == last[2] ) && ( indexes[i+1] == last[1] ) )
-			{
-				element( indexes[i+2] );
-				c_vertexes++;
-				assert( indexes[i+2] < tess.numVertexes );
-				even = qtrue;
-			}
-			// otherwise we're done with this strip so finish it and start
-			// a new one
-			else
-			{
-				qglEnd();
-
-				qglBegin( GL_TRIANGLE_STRIP );
-				c_begins++;
-
-				element( indexes[i+0] );
-				element( indexes[i+1] );
-				element( indexes[i+2] );
-
-				c_vertexes += 3;
-
-				even = qfalse;
-			}
-		}
-		else
-		{
-			// check previous triangle to see if we're continuing a strip
-			if ( ( last[2] == indexes[i+1] ) && ( last[0] == indexes[i+0] ) )
-			{
-				element( indexes[i+2] );
-				c_vertexes++;
-
-				even = qfalse;
-			}
-			// otherwise we're done with this strip so finish it and start
-			// a new one
-			else
-			{
-				qglEnd();
-
-				qglBegin( GL_TRIANGLE_STRIP );
-				c_begins++;
-
-				element( indexes[i+0] );
-				element( indexes[i+1] );
-				element( indexes[i+2] );
-				c_vertexes += 3;
-
-				even = qfalse;
-			}
-		}
-
-		// cache the last three vertices
-		last[0] = indexes[i+0];
-		last[1] = indexes[i+1];
-		last[2] = indexes[i+2];
-	}
-
-	qglEnd();
-}
-
-
-
-/*
-==================
-R_DrawElements
-
-Optionally performs our own glDrawElements that looks for strip conditions
-instead of using the single glDrawElements call that may be inefficient
-without compiled vertex arrays.
-==================
-*/
-static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) {
-	int		primitives;
-
-	primitives = r_primitives->integer;
-
-	// default is to use triangles if compiled vertex arrays are present
-	if ( primitives == 0 ) {
-		if ( qglLockArraysEXT ) {
-			primitives = 2;
-		} else {
-			primitives = 1;
-		}
-	}
-
-
-	if ( primitives == 2 ) {
-		qglDrawElements( GL_TRIANGLES, 
-						numIndexes,
-						GL_INDEX_TYPE,
-						indexes );
-		return;
-	}
-
-	if ( primitives == 1 ) {
-		R_DrawStripElements( numIndexes,  indexes, qglArrayElement );
-		return;
-	}
-	
-	if ( primitives == 3 ) {
-		R_DrawStripElements( numIndexes,  indexes, R_ArrayElementDiscrete );
-		return;
-	}
-
-	// anything else will cause no drawing
-}
-
-
-/*
-=============================================================
-
-SURFACE SHADERS
-
-=============================================================
-*/
-
-shaderCommands_t	tess;
-static qboolean	setArraysOnce;
-
-/*
-=================
-R_BindAnimatedImage
-
-=================
-*/
-static void R_BindAnimatedImage( textureBundle_t *bundle ) {
-	int index;
-
-	if (bundle->numImageAnimations <= 1) {
-		GL_Bind(bundle->image[0]);
-		return;
-	}
-
-	// it is necessary to do this messy calc to make sure animations line up
-	// exactly with waveforms of the same frequency
-	index = myftol((tess.shaderTime + bundle->imageAnimationPhase) * bundle->imageAnimationSpeed * FUNCTABLE_SIZE);
-	index >>= FUNCTABLE_SIZE2;
-
-	if (index < 0) {
-		index = 0;	// may happen with shader time offsets
-	}
-	if (!(bundle->flags & BUNDLE_ANIMATE_ONCE)) {
-		index %= bundle->numImageAnimations;
-	} else if (index >= bundle->numImageAnimations) {
-		index = bundle->numImageAnimations - 1;
-	}
-
-	GL_Bind(bundle->image[index]);
-}
-
-/*
-================
-DrawTris
-
-Draws triangle outlines for debugging
-================
-*/
-static void DrawTris (shaderCommands_t *input, int flags) {
-	GL_Bind( tr.whiteImage );
-	qglColor3f (1,1,1);
-
-	if (flags == 1) {
-		GL_State(GLS_POLYMODE_LINE);
-	} else {
-        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-        qglDepthRange(0, 0);
-	}
-
-	if (flags < 3) {
-		qglDisableClientState(GL_COLOR_ARRAY);
-		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-		qglVertexPointer(3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
-
-		if (qglLockArraysEXT) {
-			qglLockArraysEXT(0, input->numVertexes);
-			GLimp_LogComment("glLockArraysEXT\n");
-		}
-
-		R_DrawElements(input->numIndexes, input->indexes);
-
-		if (qglUnlockArraysEXT) {
-			qglUnlockArraysEXT();
-			GLimp_LogComment("glUnlockArraysEXT\n");
-		}
-		qglDepthRange(0, 1);
-	}
-
-	if (flags > 1) {
-		vec3_t start, end;
-
-        start[1] = start[0] = 0.0;
-		end[1] = end[0] = 0.0;
-
-        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-        qglDepthRange(0, 0);
-
-        qglDisable(GL_TEXTURE_2D);
-        qglBegin(GL_LINES);
-
-        qglColor4f(1.0, 0.0, 0.0, 1.0);
-
-        start[2] = 0.0 - 5.0;
-        end[2] = 0.0 + 5.0;
-        qglVertex3fv(start);
-        qglVertex3fv(end);
-
-        qglColor4f(0.0, 1.0, 0.0, 1.0);
-
-        start[2] = start[2] + 5.0;
-        end[2] = end[2] - 5.0;
-        start[1] = start[1] - 5.0;
-        end[1] = end[1] + 5.0;
-        qglVertex3fv(start);
-        qglVertex3fv(end);
-
-        qglColor4f(0.0, 0.0, 1.0, 1.0);
-
-        start[1] = start[1] + 5.0;
-        start[0] = start[0] - 5.0;
-        end[0] = end[0] + 5.0;
-        qglVertex3fv(start);
-        qglVertex3fv(end);
-
-        start[0] = start[0] + 5.0;
-        end[0] = end[0] - 5.0;
-
-        qglEnd();
-        qglEnable(GL_TEXTURE_2D);
-        qglDepthRange(0.0, 1.0);
-
-	}
-}
-
-/*
-================
-DrawNormals
-
-Draws vertex normals for debugging
-================
-*/
-static void DrawNormals (shaderCommands_t *input) {
-	int		i;
-	vec3_t	temp;
-
-	GL_Bind( tr.whiteImage );
-	qglColor3f (1,1,1);
-	qglDepthRange( 0, 0 );	// never occluded
-	GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE );
-
-	qglBegin (GL_LINES);
-	for (i = 0 ; i < input->numVertexes ; i++) {
-		qglVertex3fv (input->xyz[i]);
-		VectorMA (input->xyz[i], 2, input->normal[i], temp);
-		qglVertex3fv (temp);
-	}
-	qglEnd ();
-
-	qglDepthRange( 0, 1 );
-}
-
-/*
-==============
-RB_BeginSurface
-
-We must set some things up before beginning any tesselation,
-because a surface may be forced to perform a RB_End due
-to overflow.
-==============
-*/
-void RB_BeginSurface( shader_t *shader ) {
-	tess.numIndexes = 0;
-	tess.numVertexes = 0;
-	tess.shader = shader;
-	tess.dlightBits = 0;		// will be OR'd in by surface functions
-	tess.vertexColorValid = r_vertexLight->integer != 0;
-	tess.xstages = shader->unfoggedStages;
-	tess.numPasses = shader->numUnfoggedPasses;
-	tess.currentStageIteratorFunc = shader->optimalStageIteratorFunc;
-
-}
-
-/*
-===================
-DrawMultitextured
-
-output = t0 * t1 or t0 + t1
-
-t0 = most upstream according to spec
-t1 = most downstream according to spec
-===================
-*/
-static void DrawMultitextured( shaderCommands_t *input, int stage ) {
-	shaderStage_t	*pStage;
-
-	pStage = tess.xstages[stage];
-
-	GL_State( pStage->stateBits );
-
-	// this is an ugly hack to work around a GeForce driver
-	// bug with multitexture and clip planes
-	if ( backEnd.viewParms.isPortal ) {
-		qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
-	}
-
-	//
-	// base
-	//
-	GL_SelectTexture( 0 );
-	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] );
-	R_BindAnimatedImage( &pStage->bundle[0] );
-
-/*
-	// was removed since 2.0
-	if (pStage->stateBits & GLS_MULTITEXTURE_ENV)
-	{
-		glState.cntnvblendmode = pStage->multitextureEnv;
-		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
-
-		if (pStage->multitextureEnv == GL_ADD)
-		{
-			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_ADD);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_ONE_MINUS_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE1);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE3_RGB, 0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND3_RGB, GL_ONE_MINUS_SRC_COLOR);
-		}
-		else if (pStage->multitextureEnv == GL_MODULATE)
-		{
-			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE1);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-		}
-		else
-		{
-			ri.Printf(3, "Unknown MT mode for: %s\n", input->shader);
-		}
-	}
-*/
-
-	//
-	// lightmap/secondary pass
-	//
-	GL_SelectTexture( 1 );
-	qglEnable( GL_TEXTURE_2D );
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	if ( r_lightmap->integer && pStage->bundle[1].isLightmap ) {
-		GL_TexEnv( GL_REPLACE );
-/*
-	// was removed since 2.0
-	} else if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
-		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
-
-		GL_TexEnv(GL_COMBINE);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_SRC_ALPHA);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-*/
-	} else {
-		GL_TexEnv( pStage->multitextureEnv );
-	}
-
-	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[1] );
-
-	if (!input->dlightMap || !pStage->bundle[1].isLightmap) {
-		R_BindAnimatedImage(&pStage->bundle[1]);
-	} else {
-		GL_Bind(tr.dlightImages[input->dlightMap - 1]);
-	}
-
-	R_DrawElements( input->numIndexes, input->indexes );
-
-	qglDisable(GL_TEXTURE_2D);
-	//
-	// disable texturing on TEXTURE1, then select TEXTURE0
-	//
-	qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-	GL_SelectTexture( 0 );
-}
-
-
-
-/*
-===================
-ProjectDlightTexture
-
-Perform dynamic lighting with another rendering pass
-===================
-*/
-static void ProjectDlightTexture( void ) {
-	int		i, l;
-#if idppc_altivec
-	vec_t	origin0, origin1, origin2;
-	float   texCoords0, texCoords1;
-	vector float floatColorVec0, floatColorVec1;
-	vector float modulateVec, colorVec, zero;
-	vector short colorShort;
-	vector signed int colorInt;
-	vector unsigned char floatColorVecPerm, modulatePerm, colorChar;
-	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff);
-#else
-	vec3_t	origin;
-	vec3_t	normal;
-#endif
-	float	*texCoords;
-	byte	*colors;
-	byte	clipBits[SHADER_MAX_VERTEXES];
-	MAC_STATIC float	texCoordsArray[SHADER_MAX_VERTEXES][2];
-	byte	colorArray[SHADER_MAX_VERTEXES][4];
-	unsigned	hitIndexes[SHADER_MAX_INDEXES];
-	int		numIndexes;
-	int		planetype;
-	float	scale;
-	float	radius;
-	vec3_t	floatColor;
-	float	modulate;
-
-	if ( !backEnd.refdef.num_dlights ) {
-		return;
-	}
-
-#if idppc_altivec
-	// There has to be a better way to do this so that floatColor 
-	// and/or modulate are already 16-byte aligned.
-	floatColorVecPerm = vec_lvsl(0,(float *)floatColor);
-	modulatePerm = vec_lvsl(0,(float *)&modulate);
-	modulatePerm = (vector unsigned char)vec_splat((vector unsigned int)modulatePerm,0);
-	zero = (vector float)vec_splat_s8(0);
-#endif
-
-	for ( l = 0 ; l < backEnd.refdef.num_dlights ; l++ ) {
-		dlight_t	*dl;
-
-		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
-			continue;	// this surface definately doesn't have any of this light
-		}
-		texCoords = texCoordsArray[0];
-		colors = colorArray[0];
-
-		dl = &backEnd.refdef.dlights[l];
-#if idppc_altivec
-		origin0 = dl->transformed[0];
-		origin1 = dl->transformed[1];
-		origin2 = dl->transformed[2];
-#else
-		VectorCopy( dl->transformed, origin );
-#endif
-		radius = dl->radius * 1.75f;
-		scale = 1.75f / radius;
-
-		floatColor[0] = dl->color[0] * 255.0f;
-		floatColor[1] = dl->color[1] * 255.0f;
-		floatColor[2] = dl->color[2] * 255.0f;
-#if idppc_altivec
-		floatColorVec0 = vec_ld(0, floatColor);
-		floatColorVec1 = vec_ld(11, floatColor);
-		floatColorVec0 = vec_perm(floatColorVec0,floatColorVec0,floatColorVecPerm);
-#endif
-		for ( i = 0 ; i < tess.numVertexes ; i++, texCoords += 2, colors += 4 ) {
-#if idppc_altivec
-			vec_t dist0, dist1, dist2;
-#else
-			vec3_t	dist;
-#endif
-			float	vertdist;
-			int		clip;
-
-			backEnd.pc.c_dlightVertexes++;
-
-#if idppc_altivec
-			//VectorSubtract( origin, tess.xyz[i], dist );
-			dist0 = origin0 - tess.xyz[i][0];
-			dist1 = origin1 - tess.xyz[i][1];
-			dist2 = origin2 - tess.xyz[i][2];
-			texCoords0 = 0.5f + dist0 * scale;
-			texCoords1 = 0.5f + dist1 * scale;
-
-			clip = 0;
-			if ( texCoords0 < 0.0f ) {
-				clip |= 1;
-			} else if ( texCoords0 > 1.0f ) {
-				clip |= 2;
-			}
-			if ( texCoords1 < 0.0f ) {
-				clip |= 4;
-			} else if ( texCoords1 > 1.0f ) {
-				clip |= 8;
-			}
-			texCoords[0] = texCoords0;
-			texCoords[1] = texCoords1;
-			
-			// modulate the strength based on the height and color
-			if ( dist2 > radius ) {
-				clip |= 16;
-				modulate = 0.0f;
-			} else if ( dist2 < -radius ) {
-				clip |= 32;
-				modulate = 0.0f;
-			} else {
-				dist2 = Q_fabs(dist2);
-				if ( dist2 < radius * 0.5f ) {
-					modulate = 1.0f;
-				} else {
-					modulate = 2.0f * (radius - dist2) * scale;
-				}
-			}
-			clipBits[i] = clip;
-
-			modulateVec = vec_ld(0,(float *)&modulate);
-			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
-			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
-			colorInt = vec_cts(colorVec,0);	// RGBx
-			colorShort = vec_pack(colorInt,colorInt);		// RGBxRGBx
-			colorChar = vec_packsu(colorShort,colorShort);	// RGBxRGBxRGBxRGBx
-			colorChar = vec_sel(colorChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
-#else
-			VectorCopy(tess.normal[i], normal);
-
-			if (fabs(normal[0]) > fabs(normal[1])) {
-				if (fabs(normal[2]) < fabs(normal[0])) {
-					planetype = 0;
-				} else {
-					planetype = 1;
-				}
-			} else {
-				if (fabs(normal[2]) < fabs(normal[1])) {
-					planetype = 1;
-				}
-				else {
-					planetype = 2;
-				}
-			}
-
-			VectorSubtract( origin, tess.xyz[i], dist );
-			if (planetype == 0)
-			{
-				texCoords[0] = 0.5f + dist[1] * scale;
-				texCoords[1] = 0.5f + dist[2] * scale;
-			}
-			else if (planetype == 1)
-			{
-				texCoords[0] = 0.5f + dist[0] * scale;
-				texCoords[1] = 0.5f + dist[2] * scale;
-			}
-			else
-			{
-				texCoords[0] = 0.5f + dist[0] * scale;
-				texCoords[1] = 0.5f + dist[1] * scale;
-			}
-
-			vertdist = DotProduct(dist, normal);
-			clip = 0;
-			if ( texCoords[0] < 0.0f ) {
-				clip |= 1;
-			} else if ( texCoords[0] > 1.0f ) {
-				clip |= 2;
-			}
-			if ( texCoords[1] < 0.0f ) {
-				clip |= 4;
-			} else if ( texCoords[1] > 1.0f ) {
-				clip |= 8;
-			}
-			// modulate the strength based on the height and color
-			if (vertdist > radius) {
-				clip |= 16;
-				modulate = 0.0f;
-			}
-			else if (vertdist < -radius) {
-				clip |= 32;
-				modulate = 0.0f;
-			}
-			else {
-				dist[2] = Q_fabs(dist[2]);
-				if (dist[2] < radius * 0.5f) {
-					modulate = 1.0f;
-				}
-				else {
-					modulate = 2.0f * (radius - dist[2]) * scale;
-				}
-			}
-			clipBits[i] = clip;
-
-			colors[0] = myftol(floatColor[0] * modulate);
-			colors[1] = myftol(floatColor[1] * modulate);
-			colors[2] = myftol(floatColor[2] * modulate);
-			colors[3] = 255;
-#endif
-		}
-
-		// build a list of triangles that need light
-		numIndexes = 0;
-		for ( i = 0 ; i < tess.numIndexes ; i += 3 ) {
-			int		a, b, c;
-
-			a = tess.indexes[i];
-			b = tess.indexes[i+1];
-			c = tess.indexes[i+2];
-			if ( clipBits[a] & clipBits[b] & clipBits[c] ) {
-				continue;	// not lighted
-			}
-			hitIndexes[numIndexes] = a;
-			hitIndexes[numIndexes+1] = b;
-			hitIndexes[numIndexes+2] = c;
-			numIndexes += 3;
-		}
-
-		if ( !numIndexes ) {
-			continue;
-		}
-
-		qglEnableClientState(GL_COLOR_ARRAY);
-		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
-		qglTexCoordPointer(2, GL_FLOAT, 0, texCoordsArray[0]);
-
-		GL_Bind( tr.dlightImage );
-		// include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light
-		// where they aren't rendered
-		if ( dl->type & additive) {
-			GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		else {
-			GL_State( GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		R_DrawElements( numIndexes, hitIndexes );
-		backEnd.pc.c_totalIndexes += numIndexes;
-		backEnd.pc.c_dlightIndexes += numIndexes;
-	}
-}
-
-/*
-===============
-ComputeColors
-===============
-*/
-static void ComputeColors( shaderStage_t *pStage )
-{
-	int		i;
-
-	//
-	// rgbGen
-	//
-	switch ( pStage->rgbGen )
-	{
-		case CGEN_IDENTITY:
-			Com_Memset( tess.svars.colors, 0xff, tess.numVertexes * 4 );
-			break;
-		default:
-		case CGEN_IDENTITY_LIGHTING:
-			Com_Memset( tess.svars.colors, tr.identityLightByte, tess.numVertexes * 4 );
-			break;
-		case CGEN_ENTITY:
-			RB_CalcColorFromEntity((unsigned char*)tess.svars.colors);
-			break;
-		case CGEN_ONE_MINUS_ENTITY:
-			RB_CalcColorFromOneMinusEntity((unsigned char*)tess.svars.colors);
-			break;
-		case CGEN_EXACT_VERTEX:
-			if (!tess.vertexColorValid) {
-				static qboolean bWarned = qfalse;
-
-				if (!bWarned) {
-					// mohta and mohtt shows the warning once
-                    bWarned = qtrue;
-
-                    ri.Printf(
-                        PRINT_WARNING,
-                        "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
-                        tess.shader->name
-					);
-				}
-				break;
-			}
-			Com_Memcpy( tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof( tess.vertexColors[0] ) );
-			break;
-		case CGEN_VERTEX:
-            if (!tess.vertexColorValid) {
-                static qboolean bWarned = qfalse;
-
-				if (!bWarned) {
-					bWarned = qtrue;
-
-					ri.Printf(
-						PRINT_WARNING,
-						"Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
-						tess.shader->name);
-				}
-				break;
-			}
-			if (tr.identityLight == 1)
-			{
-				Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
-			}
-			else
-			{
-				for (i = 0; i < tess.numVertexes; i++)
-				{
-					tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
-					tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
-					tess.svars.colors[i][2] = tess.vertexColors[i][2] * tr.identityLight;
-					tess.svars.colors[i][3] = tess.vertexColors[i][3];
-				}
-			}
-			break;
-		case CGEN_ONE_MINUS_VERTEX:
-			if ( tr.identityLight == 1 )
-			{
-				for ( i = 0; i < tess.numVertexes; i++ )
-				{
-					tess.svars.colors[i][0] = 255 - tess.vertexColors[i][0];
-					tess.svars.colors[i][1] = 255 - tess.vertexColors[i][1];
-					tess.svars.colors[i][2] = 255 - tess.vertexColors[i][2];
-				}
-			}
-			else
-			{
-				for ( i = 0; i < tess.numVertexes; i++ )
-				{
-					tess.svars.colors[i][0] = ( 255 - tess.vertexColors[i][0] ) * tr.identityLight;
-					tess.svars.colors[i][1] = ( 255 - tess.vertexColors[i][1] ) * tr.identityLight;
-					tess.svars.colors[i][2] = ( 255 - tess.vertexColors[i][2] ) * tr.identityLight;
-				}
-			}
-			break;
-		case CGEN_WAVEFORM:
-			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, NULL);
-			break;
-		case CGEN_MULTIPLY_BY_WAVEFORM:
-			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, pStage->colorConst);
-			break;
-		case CGEN_LIGHTING_GRID:
-			RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
-			break;
-		case CGEN_LIGHTING_SPHERICAL:
-		case CGEN_STATIC:
-			if (!r_drawspherelights->integer) {
-				break;
-			}
-
-			if (!backEnd.currentStaticModel) {
-				if (backEnd.currentSphere->TessFunction) {
-					backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
-				}
-				break;
-			}
-
-			if (!tess.vertexColorValid) {
-				ri.Printf(PRINT_WARNING, "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n", tess.shader->name);
-			}
-
-			if (backEnd.currentStaticModel->useSpecialLighting)
-			{
-				for (i = 0; i < tess.numVertexes; i++)
-				{
-					int j;
-					vec3_t colorout;
-					int r, g, b;
-
-					colorout[0] = tess.vertexColors[i][0];
-					colorout[1] = tess.vertexColors[i][1];
-					colorout[2] = tess.vertexColors[i][2];
-
-					for (j = 0; j < backEnd.currentStaticModel->numdlights; j++)
-					{
-						float ooLightDistSquared;
-						float dot;
-						vec3_t diff;
-						dlight_t* dl;
-
-						dl = &backEnd.refdef.dlights[backEnd.currentStaticModel->dlights[j].index];
-						VectorSubtract(backEnd.currentStaticModel->dlights[j].transformed, tess.xyz[i], diff);
-
-						dot = DotProduct(diff, tess.normal[i]);
-						if (dot >= 0)
-						{
-							float ooLen;
-
-							ooLen = 1.0 / VectorLengthSquared(diff);
-							ooLightDistSquared = dot * (7500.0 * dl->radius * ooLen * sqrt(ooLen));
-							colorout[0] = dl->color[0] * ooLightDistSquared + colorout[0];
-							colorout[1] = dl->color[1] * ooLightDistSquared + colorout[1];
-							colorout[2] = dl->color[2] * ooLightDistSquared + colorout[2];
-						}
-					}
-
-					r = colorout[0];
-					g = colorout[1];
-					b = colorout[2];
-
-					if (tr.overbrightShift)
-					{
-						r = (int)((float)r * tr.overbrightMult);
-						g = (int)((float)g * tr.overbrightMult);
-						b = (int)((float)b * tr.overbrightMult);
-					}
-
-					if (r > 0xFF || g > 0xFF || b > 0xFF)
-					{
-						float t;
-
-						t = 255.0 / (float)Q_max(r, Q_max(g, b));
-
-						r = (int)((float)r * t);
-						g = (int)((float)g * t);
-						b = (int)((float)b * t);
-					}
-
-					tess.svars.colors[i][0] = r;
-					tess.svars.colors[i][1] = g;
-					tess.svars.colors[i][2] = b;
-					// Fixed in OPM
-					//  This sets the alpha channel which will prevent vertices from hiding
-					tess.svars.colors[i][3] = tess.vertexColors[i][3];
-				}
-			}
-			else
-			{
-				if (tr.identityLight == 1.0)
-				{
-					Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
-				}
-				else
-				{
-					for (i = 0; i < tess.numVertexes; i++) {
-						tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
-						tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
-						tess.svars.colors[i][2] = tess.vertexColors[i][2] * tr.identityLight;
-					}
-				}
-			}
-			break;
-		case CGEN_CONSTANT:
-			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst);
-			break;
-		case CGEN_GLOBAL_COLOR:
-			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D);
-			break;
-		case CGEN_SCOORD:
-			RB_CalcRGBFromTexCoords(
-				(unsigned char*)tess.svars.colors,
-				pStage->alphaMin,
-				pStage->alphaMax,
-				pStage->alphaConstMin,
-				pStage->alphaConst,
-				1.0,
-				0.0,
-				tess.svars.texcoords[0][0]
-			);
-			break;
-		case CGEN_TCOORD:
-			RB_CalcRGBFromTexCoords(
-				(unsigned char*)tess.svars.colors,
-				pStage->alphaMin,
-				pStage->alphaMax,
-				pStage->alphaConstMin,
-				pStage->alphaConst,
-				0.0,
-				1.0,
-				tess.svars.texcoords[0][0]
-			);
-			break;
-		case CGEN_DOT:
-			RB_CalcRGBFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-			break;
-		case CGEN_ONE_MINUS_DOT:
-			RB_CalcRGBFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-			break;
-	}
-
-	//
-	// alphaGen
-	//
-	switch ( pStage->alphaGen )
-	{
-	case AGEN_SKIP:
-		break;
-	case AGEN_IDENTITY:
-		if ( pStage->rgbGen != CGEN_IDENTITY
-			&& pStage->rgbGen != CGEN_LIGHTING_GRID
-			&& pStage->rgbGen != CGEN_LIGHTING_SPHERICAL)
-		{
-			if ( pStage->rgbGen != CGEN_VERTEX || tr.identityLight != 1 ) {
-				for ( i = 0; i < tess.numVertexes; i++ ) {
-					tess.svars.colors[i][3] = 0xff;
-				}
-			}
-		}
-		break;
-	case AGEN_ENTITY:
-		RB_CalcAlphaFromEntity((unsigned char*)tess.svars.colors);
-		break;
-	case AGEN_ONE_MINUS_ENTITY:
-		RB_CalcAlphaFromOneMinusEntity((unsigned char*)tess.svars.colors);
-		break;
-	case AGEN_VERTEX:
-		if (pStage->rgbGen != CGEN_VERTEX) {
-			for (i = 0; i < tess.numVertexes; i++) {
-				tess.svars.colors[i][3] = tess.vertexColors[i][3];
-			}
-		}
-		break;
-	case AGEN_ONE_MINUS_VERTEX:
-		for (i = 0; i < tess.numVertexes; i++)
-		{
-			tess.svars.colors[i][3] = 255 - tess.vertexColors[i][3];
-		}
-		break;
-	case AGEN_LIGHTING_SPECULAR:
-		RB_CalcSpecularAlpha((unsigned char*)tess.svars.colors, pStage->alphaMax, pStage->specOrigin);
-		break;
-	case AGEN_WAVEFORM:
-		RB_CalcWaveAlpha(&pStage->alphaWave, (unsigned char*)tess.svars.colors);
-		break;
-	case AGEN_PORTAL:
-		{
-			unsigned char alpha;
-
-			for ( i = 0; i < tess.numVertexes; i++ )
-			{
-				float len;
-				vec3_t v;
-
-				VectorSubtract( tess.xyz[i], backEnd.viewParms.ori.origin, v );
-				len = VectorLength( v );
-
-				len /= tess.shader->portalRange;
-
-				if ( len < 0 )
-				{
-					alpha = 0;
-				}
-				else if ( len > 1 )
-				{
-					alpha = 0xff;
-				}
-				else
-				{
-					alpha = len * 0xff;
-				}
-
-				tess.svars.colors[i][3] = alpha;
-			}
-		}
-		break;
-	case AGEN_DOT:
-		RB_CalcAlphaFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-		return;
-	case AGEN_ONE_MINUS_DOT:
-		RB_CalcAlphaFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-		return;
-	case AGEN_CONSTANT:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst[3]);
-		break;
-	case AGEN_GLOBAL_ALPHA:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D[3]);
-		break;
-	case AGEN_SKYALPHA:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, tr.refdef.sky_alpha * 255.0);
-		break;
-	case AGEN_ONE_MINUS_SKYALPHA:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, (1.0 - tr.refdef.sky_alpha) * 255.0);
-		break;
-	case AGEN_SCOORD:
-		RB_CalcAlphaFromTexCoords(
-			(unsigned char*)tess.svars.colors,
-			pStage->alphaMin,
-			pStage->alphaMax,
-			pStage->alphaConstMin,
-			pStage->alphaConst,
-			1.0,
-			0.0,
-			tess.svars.texcoords[0][0]
-		);
-		break;
-	case AGEN_TCOORD:
-		RB_CalcAlphaFromTexCoords(
-			(unsigned char*)tess.svars.colors,
-			pStage->alphaMin,
-			pStage->alphaMax,
-			pStage->alphaConstMin,
-			pStage->alphaConst,
-			0.0,
-			1.0,
-			tess.svars.texcoords[0][0]
-		);
-		break;
-	case AGEN_DIST_FADE:
-		if (backEnd.currentStaticModel)
-		{
-			unsigned char alpha;
-
-			for (i = 0; i < tess.numVertexes; i++) {
-				float len;
-				vec3_t org, v;
-
-				VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
-				org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
-				org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
-				org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
-			
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0xff;
-				} else if (len > 1) {
-					alpha = 0;
-				} else {
-					alpha = ((1.0 - len) * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		else
-        {
-            unsigned char alpha;
-
-            for (i = 0; i < tess.numVertexes; i++) {
-                float len;
-                vec3_t org, v;
-
-				if (backEnd.currentEntity) {
-					VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
-					org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
-					org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
-					org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
-				} else {
-					VectorCopy(backEnd.viewParms.ori.origin, org);
-				}
-
-				
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0xff;
-				} else if (len > 1) {
-					alpha = 0;
-				} else {
-					alpha = ((1.0 - len) * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		break;
-	case AGEN_ONE_MINUS_DIST_FADE:
-		if (backEnd.currentStaticModel)
-		{
-			unsigned char alpha;
-
-			for (i = 0; i < tess.numVertexes; i++) {
-				float len;
-				vec3_t org, v;
-
-                VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
-                org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
-                org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
-                org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
-			
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0;
-				} else if (len > 1) {
-					alpha = 0xff;
-				} else {
-					alpha = (len * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		else
-        {
-            unsigned char alpha;
-
-            for (i = 0; i < tess.numVertexes; i++) {
-                float len;
-                vec3_t org, v;
-
-				if (backEnd.currentEntity) {
-                    VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
-                    org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
-                    org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
-                    org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
-				} else {
-					VectorCopy(backEnd.viewParms.ori.origin, org);
-				}
-
-				
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0;
-				} else if (len > 1) {
-					alpha = 0xff;
-				} else {
-					alpha = (len * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		break;
-    case AGEN_TIKI_DIST_FADE:
-    case AGEN_ONE_MINUS_TIKI_DIST_FADE:
-		{
-			unsigned char alpha;
-
-			if (backEnd.currentStaticModel)
-			{
-				float lenSqr;
-				float fDistNearSqr;
-				float fDistFarSqr;
-				vec3_t org;
-
-				VectorSubtract(backEnd.currentStaticModel->origin, backEnd.viewParms.ori.origin, org);
-
-				lenSqr = VectorLengthSquared(org);
-                fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
-                fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
-				if (lenSqr <= fDistNearSqr) {
-					alpha = 0;
-				} else if (lenSqr >= fDistFarSqr) {
-					alpha = 0xff;
-				} else {
-					float len;
-
-					len = VectorLength(org);
-					alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
-				}
-
-				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
-					alpha = 0xff - alpha;
-				}
-			}
-			else if (backEnd.currentEntity)
-			{
-				float lenSqr;
-				float fDistNearSqr;
-				float fDistFarSqr;
-				vec3_t org;
-
-				VectorSubtract(backEnd.currentEntity->e.origin, backEnd.viewParms.ori.origin, org);
-
-				lenSqr = VectorLengthSquared(org);
-				fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
-				fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
-				if (lenSqr <= fDistNearSqr) {
-					alpha = 0;
-				} else if (lenSqr >= fDistFarSqr) {
-					alpha = 0xff;
-				} else {
-					float len;
-
-                    len = VectorLength(org);
-                    alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
-				}
-
-				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
-					alpha = 0xff - alpha;
-				}
-			}
-			else
-			{
-				const char* type;
-				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
-					type = "tikiDistFade";
-				} else {
-					type = "oneMinusTikiDistFade";
-				}
-
-				ri.Error(ERR_DROP, "ERROR: '%s' shader command used on a non-tiki\n", type);
-				alpha = 0xff;
-			}
-			RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, alpha);
-		}
-		break;
-	case AGEN_DOT_VIEW:
-		RB_CalcAlphaFromDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-		break;
-	case AGEN_ONE_MINUS_DOT_VIEW:
-		RB_CalcAlphaFromOneMinusDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-        break;
-    case AGEN_HEIGHT_FADE:
-        RB_CalcAlphaFromHeightFade((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-        break;
-	default:
-		break;
-	}
-}
-
-/*
-===============
-ComputeTexCoords
-===============
-*/
-static void ComputeTexCoords( shaderStage_t *pStage ) {
-	int		i;
-	int		b;
-
-	for ( b = 0; b < NUM_TEXTURE_BUNDLES && pStage->bundle[b].image[0]; b++ ) {
-		int tm;
-
-		//
-		// generate the texture coordinates
-		//
-		switch ( pStage->bundle[b].tcGen )
-		{
-		case TCGEN_IDENTITY:
-			Com_Memset( tess.svars.texcoords[b], 0, sizeof( float ) * 2 * tess.numVertexes );
-			break;
-		case TCGEN_TEXTURE:
-			for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-				tess.svars.texcoords[b][i][0] = tess.texCoords[i][0][0];
-				tess.svars.texcoords[b][i][1] = tess.texCoords[i][0][1];
-			}
-			break;
-		case TCGEN_LIGHTMAP:
-			for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-				tess.svars.texcoords[b][i][0] = tess.texCoords[i][1][0];
-				tess.svars.texcoords[b][i][1] = tess.texCoords[i][1][1];
-			}
-			break;
-		case TCGEN_ENVIRONMENT_MAPPED:
-			RB_CalcEnvironmentTexCoords( ( float * ) tess.svars.texcoords[b] );
-            break;
-		case TCGEN_VECTOR:
-			for (i = 0; i < tess.numVertexes; i++) {
-				tess.svars.texcoords[b][i][0] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[0]);
-				tess.svars.texcoords[b][i][1] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[1]);
-			}
-			break;
-        case TCGEN_ENVIRONMENT_MAPPED2:
-            RB_CalcEnvironmentTexCoords2((float*)tess.svars.texcoords[b]);
-            break;
-		case TCGEN_SUN_REFLECTION:
-			RB_CalcSunReflectionTexCoords(tess.svars.texcoords[b][0]);
-			break;
-        default:
-            ri.Printf(
-				PRINT_DEVELOPER,
-                "WARNING: invalid tcGen '%d' specified for shader '%s'\n",
-                pStage->bundle[b].tcGen,
-                tess.shader->name
-			);
-			break;
-		}
-
-		//
-		// alter texture coordinates
-		//
-		for ( tm = 0; tm < pStage->bundle[b].numTexMods ; tm++ ) {
-			switch ( pStage->bundle[b].texMods[tm].type )
-			{
-			case TMOD_NONE:
-				tm = TR_MAX_TEXMODS;		// break out of for loop
-				break;
-
-			case TMOD_TURBULENT:
-				RB_CalcTurbulentTexCoords( &pStage->bundle[b].texMods[tm].wave, 
-						                 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_ENTITY_TRANSLATE:
-				RB_CalcScrollTexCoords( backEnd.currentEntity->e.shaderTexCoord,
-									 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_SCROLL:
-				RB_CalcScrollTexCoords( pStage->bundle[b].texMods[tm].scroll,
-										 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_SCALE:
-				RB_CalcScaleTexCoords( pStage->bundle[b].texMods[tm].scale,
-									 ( float * ) tess.svars.texcoords[b] );
-				break;
-			
-			case TMOD_STRETCH:
-				RB_CalcStretchTexCoords( &pStage->bundle[b].texMods[tm].wave, 
-						               ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_TRANSFORM:
-				RB_CalcTransformTexCoords( &pStage->bundle[b].texMods[tm],
-						                 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_ROTATE:
-				RB_CalcRotateTexCoords( pStage->bundle[b].texMods[tm].rotateSpeed,
-										pStage->bundle[b].texMods[tm].rotateCoef,
-										( float * ) tess.svars.texcoords[b],
-										pStage->bundle[b].texMods[tm].rotateStart );
-				break;
-
-			case TMOD_OFFSET:
-				RB_CalcOffsetTexCoords(pStage->bundle[b].texMods[tm].scroll, tess.svars.texcoords[b][0]);
-				break;
-
-            case TMOD_PARALLAX:
-				RB_CalcParallaxTexCoords(pStage->bundle[b].texMods[tm].rate, tess.svars.texcoords[b][0]);
-                break;
-
-            case TMOD_MACRO:
-				RB_CalcMacroTexCoords(pStage->bundle[b].texMods[tm].scale, tess.svars.texcoords[b][0]);
-                break;
-
-            case TMOD_WAVETRANS:
-				RB_CalcTransWaveTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
-                break;
-
-            case TMOD_WAVETRANT:
-				RB_CalcTransWaveTexCoordsT(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
-                break;
-
-            case TMOD_BULGETRANS:
-				RB_CalcBulgeTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
-                break;
-
-			default:
-				ri.Printf(PRINT_WARNING, "WARNING: invalid tcMod '%d' specified for shader '%s'\n", pStage->bundle[b].texMods[tm].type, tess.shader->name );
-				break;
-			}
-		}
-	}
-}
-
-/*
-** RB_IterateStagesGeneric
-*/
-static void RB_IterateStagesGeneric( shaderCommands_t *input )
-{
-	int stage;
-
-	for (stage = 0; stage < MAX_SHADER_STAGES; stage++)
-	{
-		shaderStage_t* pStage = tess.xstages[stage];
-
-		if (!pStage)
-		{
-			break;
-		}
-
-		if (pStage->alphaGen == AGEN_SKYALPHA && tr.refdef.sky_alpha < 0.01) {
-			continue;
-		}
-		else if (pStage->alphaGen == AGEN_ONE_MINUS_SKYALPHA && tr.refdef.sky_alpha > 0.99) {
-			continue;
-		}
-
-		ComputeTexCoords(pStage);
-		ComputeColors(pStage);
-
-		if (!setArraysOnce)
-		{
-			qglEnableClientState(GL_COLOR_ARRAY);
-			qglColorPointer(4, GL_UNSIGNED_BYTE, 0, input->svars.colors);
-		}
-
-		//
-		// do multitexture
-		//
-		if (pStage->bundle[1].image[0] != 0)
-		{
-			DrawMultitextured(input, stage);
-		}
-		else
-		{
-			if (backEnd.in2D) {
-				GL_State(pStage->stateBits | GLS_DEPTHTEST_DISABLE);
-			}
-			else {
-				GL_State(pStage->stateBits);
-			}
-
-			if (!setArraysOnce)
-			{
-				qglTexCoordPointer(2, GL_FLOAT, 0, input->svars.texcoords[0]);
-			}
-
-			//
-			// set state
-			//
-			if (pStage->bundle[0].vertexLightmap && r_vertexLight->integer && r_lightmap->integer)
-			{
-				GL_Bind(tr.whiteImage);
-			}
-			else {
-				if (input->dlightMap && tess.xstages[stage]->bundle[0].isLightmap) {
-					GL_Bind(tr.dlightImages[input->dlightMap - 1]);
-				}
-				else {
-					R_BindAnimatedImage(&pStage->bundle[0]);
-				}
-			}
-
-			//
-			// draw
-			//
-			R_DrawElements(input->numIndexes, input->indexes);
-		}
-		// allow skipping out to show just lightmaps during development
-		if (r_lightmap->integer && (pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap))
-		{
-			break;
-		}
-	}
-}
-
-
-/*
-** RB_StageIteratorGeneric
-*/
-void RB_StageIteratorGeneric( void )
-{
-	shaderCommands_t *input;
-
-	input = &tess;
-
-	input->shaderTime = backEnd.refdef.floatTime;
-	if ((input->shader->flags & 1) != 0) {
-		input->shaderTime = backEnd.refdef.floatTime - backEnd.shaderStartTime;
-	}
-
-	RB_DeformTessGeometry();
-
-	//
-	// log this call
-	//
-	if ( r_logFile->integer ) 
-	{
-		// don't just call LogComment, or we will get
-		// a call to va() every frame!
-		GLimp_LogComment( va("--- RB_StageIteratorGeneric( %s ) ---\n", tess.shader->name) );
-	}
-
-	//
-	// set face culling appropriately
-	//
-	GL_Cull( input->shader->cullType );
-
-	// set polygon offset if necessary
-	if ( input->shader->polygonOffset )
-	{
-		qglEnable( GL_POLYGON_OFFSET_FILL );
-		qglPolygonOffset( r_offsetFactor->value, r_offsetUnits->value );
-	}
-
-	//
-	// if there is only a single pass then we can enable color
-	// and texture arrays before we compile, otherwise we need
-	// to avoid compiling those arrays since they will change
-	// during multipass rendering
-	//
-	if (tess.numPasses > 1 || (tess.xstages[0] && tess.xstages[0]->multitextureEnv))
-	{
-		setArraysOnce = qfalse;
-		qglDisableClientState(GL_COLOR_ARRAY);
-		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	}
-	else
-	{
-		setArraysOnce = qtrue;
-
-		qglEnableClientState(GL_COLOR_ARRAY);
-		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, tess.svars.colors);
-
-		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		qglTexCoordPointer(2, GL_FLOAT, 0, tess.svars.texcoords[0]);
-	}
-
-	//
-	// lock XYZ
-	//
-	qglVertexPointer (3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
-	if (qglLockArraysEXT)
-	{
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
-	}
-
-	//
-	// enable color and texcoord arrays after the lock if necessary
-	//
-	if ( !setArraysOnce )
-	{
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-		qglEnableClientState( GL_COLOR_ARRAY );
-	}
-
-	//
-	// call shader function
-	//
-	RB_IterateStagesGeneric( input );
-
-	// 
-	// now do any dynamic lighting needed
-	//
-	if (tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE) {
-		ProjectDlightTexture();
-	}
-
-	// 
-	// unlock arrays
-	//
-	if (qglUnlockArraysEXT) 
-	{
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
-	}
-
-	//
-	// reset polygon offset
-	//
-	if ( input->shader->polygonOffset )
-	{
-		qglDisable( GL_POLYGON_OFFSET_FILL );
-	}
-}
-
-
-/*
-** RB_StageIteratorVertexLitTexture
-*/
-void RB_StageIteratorVertexLitTextureUnfogged( void )
-{
-	shaderCommands_t *input;
-	shader_t		*shader;
-
-	input = &tess;
-
-	shader = input->shader;
-
-	if (backEnd.currentSphere->TessFunction && r_drawspherelights->integer)
-	{
-		//
-		// compute colors using the sphere function
-		//
-		backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
-	}
-	else if (backEnd.currentStaticModel)
-	{
-		//
-		// compute colors
-		//
-		ComputeColors(input->xstages[0]);
-	}
-	else
-	{
-		//
-		// calculate using previously calculated lighting grid
-		// for the entity
-		//
-		RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
-	}
-
-	//
-	// log this call
-	//
-	if ( r_logFile->integer ) 
-	{
-		// don't just call LogComment, or we will get
-		// a call to va() every frame!
-		GLimp_LogComment( va("--- RB_StageIteratorVertexLitTexturedUnfogged( %s ) ---\n", tess.shader->name) );
-	}
-
-	//
-	// set face culling appropriately
-	//
-	GL_Cull( input->shader->cullType );
-
-	//
-	// set arrays and lock
-	//
-	qglEnableClientState( GL_COLOR_ARRAY);
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY);
-
-	qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors );
-	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] );
-	qglVertexPointer (3, GL_FLOAT, 16, input->xyz);
-
-	if ( qglLockArraysEXT )
-	{
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
-	}
-
-	//
-	// call special shade routine
-	//
-	R_BindAnimatedImage( &tess.xstages[0]->bundle[0] );
-	GL_State( tess.xstages[0]->stateBits );
-	R_DrawElements( input->numIndexes, input->indexes );
-
-	// 
-	// now do any dynamic lighting needed
-	//
-	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
-		ProjectDlightTexture();
-	}
-
-	// 
-	// unlock arrays
-	//
-	if (qglUnlockArraysEXT) 
-	{
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
-	}
-}
-
-//define	REPLACE_MODE
-
-void RB_StageIteratorLightmappedMultitextureUnfogged( void ) {
-	shaderCommands_t *input;
-
-	input = &tess;
-
-	//
-	// log this call
-	//
-	if ( r_logFile->integer ) {
-		// don't just call LogComment, or we will get
-		// a call to va() every frame!
-		GLimp_LogComment( va("--- RB_StageIteratorLightmappedMultitexture( %s ) ---\n", tess.shader->name) );
-	}
-
-	//
-	// set face culling appropriately
-	//
-	GL_Cull( input->shader->cullType );
-
-	//
-	// set color, pointers, and lock
-	//
-	GL_State( GLS_DEFAULT | (tess.xstages[0]->stateBits & (GLS_ATEST_BITS | GLS_FOG_BITS)));
-	qglVertexPointer( 3, GL_FLOAT, 16, input->xyz );
-
-#ifdef REPLACE_MODE
-	qglDisableClientState( GL_COLOR_ARRAY );
-	qglColor3f( 1, 1, 1 );
-	qglShadeModel( GL_FLAT );
-#else
-	qglEnableClientState( GL_COLOR_ARRAY );
-	qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.constantColor255 );
-#endif
-
-	//
-	// select base stage
-	//
-	GL_SelectTexture( 0 );
-
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-	R_BindAnimatedImage( &tess.xstages[0]->bundle[0] );
-	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] );
-
-	//
-	// configure second stage
-	//
-	GL_SelectTexture( 1 );
-	qglEnable( GL_TEXTURE_2D );
-	if ( r_lightmap->integer ) {
-		GL_TexEnv( GL_REPLACE );
-	} else {
-		GL_TexEnv( GL_MODULATE );
-	}
-	if (tess.dlightMap && tess.xstages[0]->bundle[1].isLightmap) {
-		GL_Bind(tr.dlightImages[tess.dlightMap - 1]);
-	} else {
-		R_BindAnimatedImage(&tess.xstages[0]->bundle[1]);
-	}
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][1] );
-
-	//
-	// lock arrays
-	//
-	if ( qglLockArraysEXT ) {
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
-	}
-
-	R_DrawElements( input->numIndexes, input->indexes );
-
-	//
-	// disable texturing on TEXTURE1, then select TEXTURE0
-	//
-	qglDisable( GL_TEXTURE_2D );
-	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	GL_SelectTexture( 0 );
-#ifdef REPLACE_MODE
-	GL_TexEnv( GL_MODULATE );
-	qglShadeModel( GL_SMOOTH );
-#endif
-
-	// 
-	// now do any dynamic lighting needed
-	//
-	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
-		ProjectDlightTexture();
-	}
-
-	//
-	// unlock arrays
-	//
-	if ( qglUnlockArraysEXT ) {
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
-	}
-}
-
-/*
-** RB_EndSurface
-*/
-void RB_EndSurface( void ) {
-	shaderCommands_t *input;
-
-	input = &tess;
-
-	if (input->numIndexes == 0) {
-		return;
-	}
-	if (input->indexes[SHADER_MAX_INDEXES-1] != 0) {
-		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_INDEXES hit");
-	}	
-	if (input->xyz[SHADER_MAX_VERTEXES-1][0] != 0) {
-		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_VERTEXES hit");
-	}
-
-	if (tess.xyz[SHADER_MAX_VERTEXES - 1][0] && r_shadows->integer != 3) {
-		tess.xyz[SHADER_MAX_VERTEXES - 1][0] = 0;
-	}
-
-	if ( tess.shader == tr.shadowShader ) {
-		RB_ComputeShadowVolume();
-		return;
-	}
-
-	// for debugging of sort order issues, stop rendering after a given sort value
-	if ( r_debugSort->integer && r_debugSort->integer < tess.shader->sort ) {
-		return;
-	}
-
-	//
-	// update performance counters
-	//
-	backEnd.pc.c_shaders++;
-	backEnd.pc.c_vertexes += tess.numVertexes;
-	backEnd.pc.c_indexes += tess.numIndexes;
-	backEnd.pc.c_totalIndexes += tess.numIndexes * tess.numPasses;
-
-	//
-	// call off to shader specific tess end function
-	//
-	tess.currentStageIteratorFunc();
-
-	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL) && !backEnd.in2D)
-	{
-		//
-		// draw debugging stuff
-		//
-		if (r_showtris->integer && developer->integer) {
-			DrawTris(input, r_showtris->integer);
-		}
-		if (r_shownormals->integer && developer->integer) {
-			DrawNormals(input);
-		}
-	}
-
-	// clear shader so we can tell we don't have any unclosed surfaces
-	tess.numIndexes = 0;
-
-	GLimp_LogComment( "----------\n" );
-}
-
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
deleted file mode 100644
index 8fa2abd1..00000000
--- a/code/renderer/tr_shade_calc.c
+++ /dev/null
@@ -1,1908 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_shade_calc.c
-
-#include "tr_local.h"
-
-
-#define	WAVEVALUE( table, base, amplitude, phase, freq )  ((base) + table[ myftol( ( ( (phase) + tess.shaderTime * (freq) ) * FUNCTABLE_SIZE ) ) & FUNCTABLE_MASK ] * (amplitude))
-
-static float *TableForFunc( genFunc_t func ) 
-{
-	switch ( func )
-	{
-	case GF_SIN:
-		return tr.sinTable;
-	case GF_TRIANGLE:
-		return tr.triangleTable;
-	case GF_SQUARE:
-		return tr.squareTable;
-	case GF_SAWTOOTH:
-		return tr.sawToothTable;
-	case GF_INVERSE_SAWTOOTH:
-		return tr.inverseSawToothTable;
-	case GF_NONE:
-	default:
-		break;
-	}
-
-	ri.Error( ERR_DROP, "TableForFunc called with invalid function '%d' in shader '%s'\n", func, tess.shader->name );
-	return NULL;
-}
-
-/*
-** EvalWaveForm
-**
-** Evaluates a given waveForm_t, referencing backEnd.refdef.time directly
-*/
-static float EvalWaveForm( const waveForm_t *wf ) 
-{
-	float	*table;
-	float	base;
-	float	amplitude;
-	float	phase;
-	float	frequency;
-
-	table = TableForFunc( wf->func );
-
-    if (wf->base != 1234567.0f) {
-        base = wf->base;
-    } else if (backEnd.currentEntity) {
-        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
-    } else {
-        base = r_static_shaderdata0->value;
-    }
-
-    if (wf->amplitude != 1234567.0f) {
-		amplitude = wf->amplitude;
-    } else if (backEnd.currentEntity) {
-		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
-    } else {
-		amplitude = r_static_shaderdata1->value;
-    }
-
-    if (wf->phase != 1234567.0f) {
-		phase = wf->phase;
-    } else if (backEnd.currentEntity) {
-		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
-    } else {
-		phase = r_static_shaderdata2->value;
-    }
-
-    if (wf->frequency != 1234567.0f) {
-		frequency = wf->frequency;
-    } else if (backEnd.currentEntity) {
-		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
-    } else {
-		frequency = r_static_shaderdata1->value;
-    }
-
-	if (!backEnd.currentEntity)
-	{
-		base *= r_static_shadermultiplier0->value;
-		amplitude *= r_static_shadermultiplier1->value;
-		phase *= r_static_shadermultiplier2->value;
-		frequency *= r_static_shadermultiplier3->value;
-	}
-
-	return WAVEVALUE( table, base, amplitude, phase, frequency );
-}
-
-static float EvalWaveFormClamped( const waveForm_t *wf )
-{
-	float glow  = EvalWaveForm( wf );
-
-	if ( glow < 0 )
-	{
-		return 0;
-	}
-
-	if ( glow > 1 )
-	{
-		return 1;
-	}
-
-	return glow;
-}
-
-/*
-** RB_CalcStretchTexCoords
-*/
-void RB_CalcStretchTexCoords( const waveForm_t *wf, float *st )
-{
-	float p;
-	texModInfo_t tmi;
-
-	p = 1.0f / EvalWaveForm( wf );
-
-	tmi.matrix[0][0] = p;
-	tmi.matrix[1][0] = 0;
-	tmi.translate[0] = 0.5f - 0.5f * p;
-
-	tmi.matrix[0][1] = 0;
-	tmi.matrix[1][1] = p;
-	tmi.translate[1] = 0.5f - 0.5f * p;
-
-	RB_CalcTransformTexCoords( &tmi, st );
-}
-
-/*
-========================
-RB_CalcTransWaveTexCoords
-
-========================
-*/
-void RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st)
-{
-	float p;
-	int i;
-
-    p = EvalWaveForm(wf);
-    for (i = 0; i < tess.numVertexes; i++, st += 2) {
-        st[0] += p;
-    }
-}
-
-/*
-========================
-RB_CalcTransWaveTexCoordsT
-
-========================
-*/
-void RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st)
-{
-    float p;
-    int i;
-
-    p = EvalWaveForm(wf);
-    for (i = 0; i < tess.numVertexes; i++, st += 2) {
-        st[1] += p;
-    }
-}
-
-/*
-========================
-RB_CalcBulgeTexCoords
-
-========================
-*/
-void RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st)
-{
-	int i;
-	int off;
-	float offset;
-	float now;
-	float amplitude;
-	float width;
-
-    amplitude = wf->amplitude;
-    width = wf->base;
-    now = backEnd.refdef.time / 1000.0 * wf->frequency + wf->phase;
-
-	for (i = 0; i < tess.numVertexes; i++, st += 2) {
-		off = (now + st[0] * width) * FUNCTABLE_SIZE;
-		offset = tr.sinTable[off & FUNCTABLE_MASK] * amplitude;
-	}
-}
-
-/*
-====================================================================
-
-DEFORMATIONS
-
-====================================================================
-*/
-
-/*
-========================
-RB_CalcDeformVertexes
-
-========================
-*/
-void RB_CalcDeformVertexes( deformStage_t *ds )
-{
-	int i;
-	vec3_t	offset;
-	float	scale;
-	float	*xyz = ( float * ) tess.xyz;
-	float	*normal = ( float * ) tess.normal;
-	float	*table;
-	float	base;
-	float	amplitude;
-	float	phase;
-	float	frequency;
-
-    if (ds->deformationWave.base != 1234567.0f) {
-        base = ds->deformationWave.base;
-    } else if (backEnd.currentEntity) {
-        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
-    } else {
-        base = r_static_shaderdata0->value;
-    }
-
-    if (ds->deformationWave.amplitude != 1234567.0f) {
-		amplitude = ds->deformationWave.amplitude;
-    } else if (backEnd.currentEntity) {
-		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
-    } else {
-		amplitude = r_static_shaderdata1->value;
-    }
-
-    if (ds->deformationWave.phase != 1234567.0f) {
-		phase = ds->deformationWave.phase;
-    } else if (backEnd.currentEntity) {
-		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
-    } else {
-		phase = r_static_shaderdata2->value;
-    }
-
-    if (ds->deformationWave.frequency != 1234567.0f) {
-		frequency = ds->deformationWave.frequency;
-    } else if (backEnd.currentEntity) {
-		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
-    } else {
-		frequency = r_static_shaderdata1->value;
-    }
-
-	if (!backEnd.currentEntity)
-	{
-		base *= r_static_shadermultiplier0->value;
-		amplitude *= r_static_shadermultiplier1->value;
-		phase *= r_static_shadermultiplier2->value;
-		frequency *= r_static_shadermultiplier3->value;
-	}
-
-	if ( frequency == 0 )
-	{
-		scale = EvalWaveForm( &ds->deformationWave );
-
-		for ( i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4 )
-		{
-			VectorScale( normal, scale, offset );
-			
-			xyz[0] += offset[0];
-			xyz[1] += offset[1];
-			xyz[2] += offset[2];
-		}
-	}
-	else
-	{
-		table = TableForFunc( ds->deformationWave.func );
-
-		for ( i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4 )
-		{
-			float off = ( xyz[0] + xyz[1] + xyz[2] ) * ds->deformationSpread;
-
-			scale = WAVEVALUE( table, base, amplitude, phase + off, frequency );
-
-			VectorScale( normal, scale, offset );
-			
-			xyz[0] += offset[0];
-			xyz[1] += offset[1];
-			xyz[2] += offset[2];
-		}
-	}
-}
-
-void RB_CalcFlapVertexes(deformStage_t* ds, texDirection_t coordsToUse)
-{
-    int    i;
-    vec3_t offset;
-    float  scale;
-    vec4_t* xyz, * normal;
-	float* table;
-    float  base;
-    float  amplitude;
-    float  phase;
-    float  frequency;
-    float  min, max;
-    vec2_t (*st)[2];
-    float  vertexScale;
-
-    xyz = tess.xyz;
-    normal = tess.normal;
-    min = ds->bulgeWidth;
-    max = ds->bulgeHeight;
-    st = tess.texCoords;
-
-    if (ds->deformationWave.base != 1234567.0f) {
-        base = ds->deformationWave.base;
-    } else if (backEnd.currentEntity) {
-        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
-    } else {
-        base = r_static_shaderdata0->value;
-    }
-
-    if (ds->deformationWave.amplitude != 1234567.0f) {
-        amplitude = ds->deformationWave.amplitude;
-    } else if (backEnd.currentEntity) {
-        amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
-    } else {
-        amplitude = r_static_shaderdata1->value;
-    }
-
-    if (ds->deformationWave.phase != 1234567.0f) {
-        phase = ds->deformationWave.phase;
-    } else if (backEnd.currentEntity) {
-        phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
-    } else {
-        phase = r_static_shaderdata2->value;
-    }
-
-    if (ds->deformationWave.frequency != 1234567.0f) {
-        frequency = ds->deformationWave.frequency;
-    } else if (backEnd.currentEntity) {
-        frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
-    } else {
-        frequency = r_static_shaderdata3->value;
-    }
-
-    if (!backEnd.currentEntity) {
-        base = base * r_static_shadermultiplier0->value;
-        amplitude = amplitude * r_static_shadermultiplier1->value;
-        phase = phase * r_static_shadermultiplier2->value;
-        frequency = frequency * r_static_shadermultiplier3->value;
-    }
-
-	if (frequency) {
-		table = TableForFunc(ds->deformationWave.func);
-		for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
-			float off;
-
-			off = ((*xyz)[0] + (*xyz)[1] + (*xyz)[2]) * ds->deformationSpread;
-			scale = WAVEVALUE(table, base, amplitude, phase, frequency);
-            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
-            offset[0] = scale * vertexScale * (*normal)[0];
-            offset[1] = scale * vertexScale * (*normal)[1];
-            offset[2] = scale * vertexScale * (*normal)[2];
-			VectorAdd(*xyz, offset, *xyz);
-		}
-	} else {
-        scale = EvalWaveForm(&ds->deformationWave);
-        for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
-            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
-            offset[0] = vertexScale * scale * (*normal)[0];
-            offset[1] = vertexScale * scale * (*normal)[1];
-            offset[2] = vertexScale * scale * (*normal)[2];
-            VectorAdd(*xyz, offset, *xyz);
-		}
-	}
-}
-
-/*
-=========================
-RB_CalcDeformNormals
-
-Wiggle the normals for wavy environment mapping
-=========================
-*/
-void RB_CalcDeformNormals( deformStage_t *ds ) {
-	int i;
-	float	scale;
-	float	*xyz = ( float * ) tess.xyz;
-	float	*normal = ( float * ) tess.normal;
-
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4 ) {
-		scale = 0.98f;
-		scale = R_NoiseGet4f( xyz[0] * scale, xyz[1] * scale, xyz[2] * scale,
-			tess.shaderTime * ds->deformationWave.frequency );
-		normal[ 0 ] += ds->deformationWave.amplitude * scale;
-
-		scale = 0.98f;
-		scale = R_NoiseGet4f( 100 + xyz[0] * scale, xyz[1] * scale, xyz[2] * scale,
-			tess.shaderTime * ds->deformationWave.frequency );
-		normal[ 1 ] += ds->deformationWave.amplitude * scale;
-
-		scale = 0.98f;
-		scale = R_NoiseGet4f( 200 + xyz[0] * scale, xyz[1] * scale, xyz[2] * scale,
-			tess.shaderTime * ds->deformationWave.frequency );
-		normal[ 2 ] += ds->deformationWave.amplitude * scale;
-
-		VectorNormalizeFast( normal );
-	}
-}
-
-/*
-========================
-RB_CalcBulgeVertexes
-
-========================
-*/
-void RB_CalcBulgeVertexes( deformStage_t *ds ) {
-	int i;
-	const float *st = ( const float * ) tess.texCoords[0];
-	float		*xyz = ( float * ) tess.xyz;
-	float		*normal = ( float * ) tess.normal;
-	float		now;
-
-	now = backEnd.refdef.time * ds->bulgeSpeed * 0.001f;
-
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4, st += 4, normal += 4 ) {
-		int		off;
-		float scale;
-
-		off = (float)( FUNCTABLE_SIZE / (M_PI*2) ) * ( st[0] * ds->bulgeWidth + now );
-
-		scale = tr.sinTable[ off & FUNCTABLE_MASK ] * ds->bulgeHeight;
-			
-		xyz[0] += normal[0] * scale;
-		xyz[1] += normal[1] * scale;
-		xyz[2] += normal[2] * scale;
-	}
-}
-
-
-/*
-======================
-RB_CalcMoveVertexes
-
-A deformation that can move an entire surface along a wave path
-======================
-*/
-void RB_CalcMoveVertexes( deformStage_t *ds ) {
-	int			i;
-	float		*xyz;
-	float		*table;
-	float		scale;
-	vec3_t		offset;
-
-	table = TableForFunc( ds->deformationWave.func );
-
-	scale = WAVEVALUE( table, ds->deformationWave.base, 
-		ds->deformationWave.amplitude,
-		ds->deformationWave.phase,
-		ds->deformationWave.frequency );
-
-	VectorScale( ds->moveVector, scale, offset );
-
-	xyz = ( float * ) tess.xyz;
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4 ) {
-		VectorAdd( xyz, offset, xyz );
-	}
-}
-
-
-/*
-=============
-DeformText
-
-Change a polygon into a bunch of text polygons
-=============
-*/
-void DeformText( const char *text ) {
-	int		i;
-	vec3_t	origin, width, height;
-	size_t	len;
-	int		ch;
-	byte	color[4];
-	float	bottom, top;
-	vec3_t	mid;
-
-	height[0] = 0;
-	height[1] = 0;
-	height[2] = -1;
-	CrossProduct( tess.normal[0], height, width );
-
-	// find the midpoint of the box
-	VectorClear( mid );
-	bottom = 999999;
-	top = -999999;
-	for ( i = 0 ; i < 4 ; i++ ) {
-		VectorAdd( tess.xyz[i], mid, mid );
-		if ( tess.xyz[i][2] < bottom ) {
-			bottom = tess.xyz[i][2];
-		}
-		if ( tess.xyz[i][2] > top ) {
-			top = tess.xyz[i][2];
-		}
-	}
-	VectorScale( mid, 0.25f, origin );
-
-	// determine the individual character size
-	height[0] = 0;
-	height[1] = 0;
-	height[2] = ( top - bottom ) * 0.5f;
-
-	VectorScale( width, height[2] * -0.75f, width );
-
-	// determine the starting position
-	len = strlen( text );
-	VectorMA( origin, (len-1), width, origin );
-
-	// clear the shader indexes
-	tess.numIndexes = 0;
-	tess.numVertexes = 0;
-
-	color[0] = color[1] = color[2] = color[3] = 255;
-
-	// draw each character
-	for ( i = 0 ; i < len ; i++ ) {
-		ch = text[i];
-		ch &= 255;
-
-		if ( ch != ' ' ) {
-			int		row, col;
-			float	frow, fcol, size;
-
-			row = ch>>4;
-			col = ch&15;
-
-			frow = row*0.0625f;
-			fcol = col*0.0625f;
-			size = 0.0625f;
-
-			RB_AddQuadStampExt( origin, width, height, color, fcol, frow, fcol + size, frow + size );
-		}
-		VectorMA( origin, -2, width, origin );
-	}
-}
-
-/*
-==================
-GlobalVectorToLocal
-==================
-*/
-static void GlobalVectorToLocal( const vec3_t in, vec3_t out ) {
-	out[0] = DotProduct( in, backEnd.ori.axis[0] );
-	out[1] = DotProduct( in, backEnd.ori.axis[1] );
-	out[2] = DotProduct( in, backEnd.ori.axis[2] );
-}
-
-/*
-=====================
-AutospriteDeform
-
-Assuming all the triangles for this shader are independant
-quads, rebuild them as forward facing sprites
-=====================
-*/
-static void AutospriteDeform(void) {
-    int		i;
-    int		oldVerts;
-    float* xyz;
-    vec3_t	mid, delta;
-    float	radius;
-    vec3_t	left, up;
-    vec3_t	leftDir, upDir;
-
-    if (tess.numVertexes & 3) {
-        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd vertex count\n", tess.shader->name);
-    }
-    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
-        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd index count\n", tess.shader->name);
-    }
-
-    oldVerts = tess.numVertexes;
-    tess.numVertexes = 0;
-    tess.numIndexes = 0;
-
-    if (backEnd.currentEntity != &tr.worldEntity) {
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
-    } else {
-        VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
-        VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
-    }
-
-    for (i = 0; i < oldVerts; i += 4) {
-        // find the midpoint
-        xyz = tess.xyz[i];
-
-        mid[0] = 0.25f * (xyz[0] + xyz[4] + xyz[8] + xyz[12]);
-        mid[1] = 0.25f * (xyz[1] + xyz[5] + xyz[9] + xyz[13]);
-        mid[2] = 0.25f * (xyz[2] + xyz[6] + xyz[10] + xyz[14]);
-
-        VectorSubtract(xyz, mid, delta);
-        radius = VectorLength(delta) * 0.707f;		// / sqrt(2)
-
-        VectorScale(leftDir, radius, left);
-        VectorScale(upDir, radius, up);
-
-        if (backEnd.viewParms.isMirror) {
-            VectorSubtract(vec3_origin, left, left);
-        }
-
-        // compensate for scale in the axes if necessary
-        if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes) {
-            float axisLength;
-
-			if (backEnd.currentStaticModel) {
-				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
-			} else {
-				axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
-			}
-            
-            if (!axisLength) {
-                axisLength = 0;
-            }
-            else {
-                axisLength = 1.0f / axisLength;
-            }
-            VectorScale(left, axisLength, left);
-            VectorScale(up, axisLength, up);
-        }
-
-        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
-    }
-}
-
-
-/*
-=====================
-Autosprite2Deform
-
-Autosprite2 will pivot a rectangular quad along the center of its long axis
-=====================
-*/
-int edgeVerts[6][2] = {
-	{ 0, 1 },
-	{ 0, 3 },
-	{ 0, 2 },
-	{ 1, 3 },
-	{ 1, 2 },
-	{ 3, 2 }
-};
-
-static void Autosprite2Deform( void ) {
-	int		i, j;
-	int		indexes;
-	float	*xyz;
-	vec3_t	forward;
-
-	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count\n", tess.shader->name );
-	}
-	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count\n", tess.shader->name );
-	}
-
-	if ( backEnd.currentStaticModel || backEnd.currentEntity != &tr.worldEntity ) {
-		GlobalVectorToLocal( backEnd.viewParms.ori.axis[0], forward );
-	} else {
-		VectorCopy( backEnd.viewParms.ori.axis[0], forward );
-	}
-
-	// this is a lot of work for two triangles...
-	// we could precalculate a lot of it is an issue, but it would mess up
-	// the shader abstraction
-	for ( i = 0, indexes = 0 ; i < tess.numVertexes ; i+=4, indexes+=6 ) {
-		float shortLengths[2];
-		int shortNums[2];
-		float longLengths[2];
-		int longNums[2];
-		vec3_t	mid[2];
-		vec3_t	major, minor;
-		float	*v1, *v2, *v3, *v4;
-		qboolean firstOnLeft, secondOnLeft;
-		float edgeLength;
-
-		// find the midpoint
-		xyz = tess.xyz[i];
-
-		// identify the two shortest edges
-		shortNums[0] = shortNums[1] = 0;
-		shortLengths[0] = shortLengths[1] = 1000000000;
-		longNums[1] = longNums[0] = 0;
-		longLengths[1] = longLengths[0] = 0;
-
-		for ( j = 0 ; j < 6 ; j++ ) {
-			float	l;
-			vec3_t	temp;
-
-			v1 = xyz + 4 * edgeVerts[j][0];
-			v2 = xyz + 4 * edgeVerts[j][1];
-
-			VectorSubtract( v1, v2, temp );
-			
-			l = DotProduct( temp, temp );
-			if ( l < shortLengths[0] ) {
-				shortNums[1] = shortNums[0];
-				shortLengths[1] = shortLengths[0];
-				shortNums[0] = j;
-				shortLengths[0] = l;
-			} else if ( l < shortLengths[1] ) {
-				shortNums[1] = j;
-				shortLengths[1] = l;
-			}
-
-			if (l > longLengths[0]) {
-				longNums[1] = longNums[0];
-				longLengths[1] = longLengths[0];
-				longNums[0] = j;
-				longLengths[0] = l;
-			} else if (l > longLengths[1]) {
-				longNums[1] = j;
-				longLengths[1] = l;
-			}
-		}
-
-		for ( j = 0 ; j < 2 ; j++ ) {
-			v1 = xyz + 4 * edgeVerts[shortNums[j]][0];
-			v2 = xyz + 4 * edgeVerts[shortNums[j]][1];
-
-			mid[j][0] = 0.5f * (v1[0] + v2[0]);
-			mid[j][1] = 0.5f * (v1[1] + v2[1]);
-			mid[j][2] = 0.5f * (v1[2] + v2[2]);
-		}
-
-		// find the vector of the major axis
-		VectorSubtract( mid[1], mid[0], major );
-
-		// cross this with the view direction to get minor axis
-		CrossProduct( major, forward, minor );
-		VectorNormalize( minor );
-
-        v1 = xyz + 4 * edgeVerts[shortNums[0]][0];
-        v2 = xyz + 4 * edgeVerts[shortNums[0]][1];
-
-        // we need to see which direction this edge
-        // is used to determine direction of projection
-		if (edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][0]
-			|| edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][1])
-		{
-			firstOnLeft = qtrue;
-		}
-		else
-		{
-			firstOnLeft = qfalse;
-        }
-
-        if (edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][0]
-            || edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][1])
-        {
-            secondOnLeft = qtrue;
-        }
-        else
-        {
-			secondOnLeft = qfalse;
-        }
-
-		if (firstOnLeft == secondOnLeft)
-        {
-            v3 = xyz + 4 * edgeVerts[shortNums[1]][0];
-            v4 = xyz + 4 * edgeVerts[shortNums[1]][1];
-		}
-		else
-        {
-            v3 = xyz + 4 * edgeVerts[shortNums[1]][1];
-            v4 = xyz + 4 * edgeVerts[shortNums[1]][0];
-		}
-
-        // re-project the points
-		edgeLength = sqrt(shortLengths[0]) * 0.5;
-        v1[0] = -edgeLength * minor[0] + mid[0][0];
-        v1[1] = -edgeLength * minor[1] + mid[0][1];
-        v1[2] = -edgeLength * minor[2] + mid[0][2];
-		v2[0] = minor[0] * edgeLength + mid[0][0];
-        v2[1] = minor[1] * edgeLength + mid[0][1];
-        v2[2] = minor[2] * edgeLength + mid[0][2];
-
-        edgeLength = sqrt(shortLengths[1]) * 0.5;
-		v3[0] = -edgeLength * minor[0] + mid[1][0];
-        v3[1] = -edgeLength * minor[1] + mid[1][1];
-        v3[2] = -edgeLength * minor[2] + mid[1][2];
-		v4[0] = minor[0] * edgeLength + mid[1][0];
-        v4[1] = minor[1] * edgeLength + mid[1][1];
-        v4[2] = minor[2] * edgeLength + mid[1][2];
-	}
-}
-
-static void LightGlowDeform() {
-	int i;
-	int oldVerts;
-	float* xyz;
-	vec3_t mid, delta;
-	float radius, dist, ofs;
-	vec3_t forward, left, up;
-	vec3_t leftDir, upDir;
-
-    if (tess.numVertexes & 3) {
-        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd vertex count\n", tess.shader->name);
-    }
-    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
-        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd index count\n", tess.shader->name);
-    }
-
-	oldVerts = tess.numVertexes;
-	tess.numVertexes = 0;
-	tess.numIndexes = 0;
-
-    if (backEnd.currentEntity == &tr.worldEntity)
-    {
-		VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
-		VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
-    }
-    else
-    {
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
-    }
-
-	for (i = 0; i < oldVerts; i += 4)
-	{
-		xyz = tess.xyz[i];
-
-		mid[0] = (xyz[0] + xyz[4] + xyz[8] + xyz[12]) * 0.25f;
-		mid[1] = (xyz[1] + xyz[5] + xyz[9] + xyz[13]) * 0.25f;
-		mid[2] = (xyz[2] + xyz[6] + xyz[10] + xyz[14]) * 0.25f;
-
-		VectorSubtract(xyz, mid, delta);
-
-		radius = VectorLength(delta) * 0.707f;
-		VectorAdd(mid, backEnd.ori.origin, delta);
-		VectorSubtract(backEnd.viewParms.ori.origin, delta, forward);
-
-		dist = VectorNormalize(forward) - 4.0;
-
-		VectorScale(forward, radius, forward);
-		VectorScale(leftDir, radius, left);
-		VectorScale(upDir, radius, up);
-
-		if (backEnd.viewParms.isMirror)
-		{
-			VectorSubtract(vec3_origin, forward, forward);
-			VectorSubtract(vec3_origin, left, left);
-		}
-
-		if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes)
-		{
-			float axisLength;
-
-			if (backEnd.currentStaticModel) {
-				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
-			} else {
-                axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
-			}
-
-			if (axisLength != 0.0f) {
-				VectorScale(forward, axisLength, forward);
-				VectorScale(left, axisLength, left);
-				VectorScale(up, axisLength, up);
-			} else {
-				VectorClear(forward);
-				VectorClear(left);
-				VectorClear(up);
-			}
-		}
-
-		ofs = VectorLength(forward);
-        if (ofs > dist)
-        {
-            VectorNormalizeFast(forward);
-			VectorScale(forward, dist, forward);
-        }
-
-		VectorAdd(mid, forward, mid);
-        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
-	}
-}
-
-/*
-=====================
-RB_DeformTessGeometry
-
-=====================
-*/
-void RB_DeformTessGeometry( void ) {
-	int		i;
-	deformStage_t	*ds;
-
-	for ( i = 0 ; i < tess.shader->numDeforms ; i++ ) {
-		ds = &tess.shader->deforms[ i ];
-
-		switch ( ds->deformation ) {
-        case DEFORM_NONE:
-            break;
-		case DEFORM_NORMALS:
-			RB_CalcDeformNormals( ds );
-			break;
-		case DEFORM_WAVE:
-			RB_CalcDeformVertexes( ds );
-			break;
-		case DEFORM_BULGE:
-			RB_CalcBulgeVertexes( ds );
-			break;
-		case DEFORM_MOVE:
-			RB_CalcMoveVertexes( ds );
-			break;
-		case DEFORM_AUTOSPRITE:
-			AutospriteDeform();
-			break;
-		case DEFORM_AUTOSPRITE2:
-			Autosprite2Deform();
-			break;
-		case DEFORM_LIGHTGLOW:
-			LightGlowDeform();
-			break;
-		case DEFORM_FLAP_S:
-			RB_CalcFlapVertexes(ds, USE_S_COORDS);
-			break;
-		case DEFORM_FLAP_T:
-			RB_CalcFlapVertexes(ds, USE_T_COORDS);
-			break;
-		}
-	}
-}
-
-/*
-====================================================================
-
-COLORS
-
-====================================================================
-*/
-
-
-/*
-** RB_CalcColorFromEntity
-*/
-void RB_CalcColorFromEntity( unsigned char *dstColors )
-{
-	int	i;
-	int *pColors = ( int * ) dstColors;
-	int c;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	c = * ( int * ) backEnd.currentEntity->e.shaderRGBA;
-
-	for ( i = 0; i < tess.numVertexes; i++, pColors++ )
-	{
-		*pColors = c;
-	}
-}
-
-/*
-** RB_CalcColorFromOneMinusEntity
-*/
-void RB_CalcColorFromOneMinusEntity( unsigned char *dstColors )
-{
-	int	i;
-	int *pColors = ( int * ) dstColors;
-	unsigned char invModulate[4];
-	int c;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	invModulate[0] = 255 - backEnd.currentEntity->e.shaderRGBA[0];
-	invModulate[1] = 255 - backEnd.currentEntity->e.shaderRGBA[1];
-	invModulate[2] = 255 - backEnd.currentEntity->e.shaderRGBA[2];
-	invModulate[3] = 255 - backEnd.currentEntity->e.shaderRGBA[3];	// this trashes alpha, but the AGEN block fixes it
-
-	c = * ( int * ) invModulate;
-
-	for ( i = 0; i < tess.numVertexes; i++, pColors++ )
-	{
-		*pColors = * ( int * ) invModulate;
-	}
-}
-
-/*
-** RB_CalcColorFromConstant
-*/
-void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor)
-{
-	int i;
-
-	for (i = 0; i < tess.numVertexes; i++) {
-		dstColors[i * 4] = constantColor[0];
-		dstColors[i * 4 + 1] = constantColor[1];
-		dstColors[i * 4 + 2] = constantColor[2];
-		dstColors[i * 4 + 3] = constantColor[3];
-	}
-}
-
-/*
-** RB_CalcRGBFromDot
-*/
-void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	vec3_t viewInModel;
-
-	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		float f;
-
-		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
-		VectorNormalizeFast(viewInModel);
-
-        f = Square(DotProduct(tess.normal[i], viewInModel));
-        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-		f = f - Q_max((int)(f - 255), 0);
-
-		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
-	}
-}
-
-/*
-** RB_CalcRGBFromOneMinusDot
-*/
-void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	vec3_t viewInModel;
-
-	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		float f;
-
-		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
-		VectorNormalizeFast(viewInModel);
-
-        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
-        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-		f = f - Q_max((int)(f - 255), 0);
-
-		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
-	}
-}
-
-/*
-** RB_CalcAlphaFromConstant
-*/
-void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
-{
-	int i;
-
-	for (i = 0; i < tess.numVertexes; i++) {
-		dstColors[i * 4 + 3] = constantAlpha;
-	}
-}
-
-/*
-** RB_CalcAlphaFromDot
-*/
-void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	vec3_t viewInModel;
-
-	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		float f;
-
-		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
-		VectorNormalizeFast(viewInModel);
-
-        f = Square(DotProduct(tess.normal[i], viewInModel));
-        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-		f = f - Q_max((int)(f - 255), 0);
-
-		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
-	}
-}
-
-/*
-** RB_CalcAlphaFromHeightFade
-*/
-void RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	float dist;
-	float alpha;
-
-	for (i = 0; i < tess.numVertexes; i++) {
-		dist = fabs(backEnd.ori.viewOrigin[2] - tess.xyz[i][2]);
-		dist = Q_clamp_float(dist, alphaMin, alphaMax);
-		// Calculate the alpha height
-		alpha = (dist - alphaMin) / (alphaMax - alphaMin);
-		colors[i * 4 + 3] = (unsigned char)((1.f - alpha) * 255.0);
-	}
-}
-
-/*
-** RB_CalcAlphaFromOneMinusDot
-*/
-void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	vec3_t viewInModel;
-
-	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-		float f;
-
-		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
-		VectorNormalizeFast(viewInModel);
-
-        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
-        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-		f = f - Q_max((int)(f - 255), 0);
-
-		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
-	}
-}
-
-/*
-** RB_CalcAlphaFromTexCoords
-*/
-void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-	int i;
-
-	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
-		float f;
-
-        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
-        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-		f = f - Q_max((int)(f - alphaCap), 0);
-		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
-	
-		colors[3] = (unsigned char)f;
-	}
-}
-
-/*
-** RB_CalcRGBFromTexCoords
-*/
-void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-	int i;
-
-	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
-		float f;
-
-        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
-        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
-		f = f - Q_max((int)(f - alphaCap), 0);
-		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
-
-		colors[0] = colors[1] = colors[2] = (unsigned char)f;
-	}
-}
-
-/*
-** RB_CalcAlphaFromEntity
-*/
-void RB_CalcAlphaFromEntity( unsigned char *dstColors )
-{
-	int	i;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	dstColors += 3;
-
-	for ( i = 0; i < tess.numVertexes; i++, dstColors += 4 )
-	{
-		*dstColors = backEnd.currentEntity->e.shaderRGBA[3];
-	}
-}
-
-/*
-** RB_CalcAlphaFromOneMinusEntity
-*/
-void RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors )
-{
-	int	i;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	dstColors += 3;
-
-	for ( i = 0; i < tess.numVertexes; i++, dstColors += 4 )
-	{
-		*dstColors = 0xff - backEnd.currentEntity->e.shaderRGBA[3];
-	}
-}
-
-/*
-** RB_CalcWaveColor
-*/
-void RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor)
-{
-	int i;
-	int v;
-	float glow;
-	int *colors = ( int * ) dstColors;
-	byte	color[4];
-
-
-  if ( wf->func == GF_NOISE ) {
-		glow = wf->base + R_NoiseGet4f( 0, 0, 0, ( tess.shaderTime + wf->phase ) * wf->frequency ) * wf->amplitude;
-	} else {
-		glow = EvalWaveForm( wf ) * tr.identityLight;
-	}
-	
-	if ( glow < 0 ) {
-		glow = 0;
-	}
-	else if ( glow > 1 ) {
-		glow = 1;
-	}
-
-	if (constantColor)
-	{
-		color[0] = constantColor[0] * glow;
-		color[1] = constantColor[1] * glow;
-		color[2] = constantColor[2] * glow;
-	}
-	else
-	{
-		v = myftol(255 * glow);
-		color[0] = color[1] = color[2] = v;
-	}
-
-	color[3] = 255;
-	v = *(int*)color;
-	
-	for ( i = 0; i < tess.numVertexes; i++, colors++ ) {
-		*colors = v;
-	}
-}
-
-/*
-** RB_CalcWaveAlpha
-*/
-void RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors )
-{
-	int i;
-	int v;
-	float glow;
-
-	glow = EvalWaveFormClamped( wf );
-
-	v = 255 * glow;
-
-	for ( i = 0; i < tess.numVertexes; i++, dstColors += 4 )
-	{
-		dstColors[3] = v;
-	}
-}
-
-
-/*
-====================================================================
-
-TEX COORDS
-
-====================================================================
-*/
-
-/*
-** RB_CalcEnvironmentTexCoords
-*/
-void RB_CalcEnvironmentTexCoords( float *st ) 
-{
-	int			i;
-	float		*v, *normal;
-	vec3_t		viewer, reflected;
-	float		d;
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-	for (i = 0 ; i < tess.numVertexes ; i++, v += 4, normal += 4, st += 2 ) 
-	{
-		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
-		VectorNormalizeFast (viewer);
-
-		d = DotProduct (normal, viewer);
-
-		reflected[0] = normal[0]*2*d - viewer[0];
-		reflected[1] = normal[1]*2*d - viewer[1];
-		reflected[2] = normal[2]*2*d - viewer[2];
-
-		st[0] = 0.5 + reflected[1] * 0.5;
-		st[1] = 0.5 - reflected[2] * 0.5;
-	}
-}
-
-/*
-** RB_CalcEnvironmentTexCoords
-*/
-void RB_CalcEnvironmentTexCoords2(float* st)
-{
-    int			i;
-    float* v, * normal;
-    vec3_t		viewer, reflected, worldReflected;
-    float		d;
-
-    v = tess.xyz[0];
-    normal = tess.normal[0];
-
-    for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2)
-    {
-        VectorSubtract(backEnd.ori.viewOrigin, v, viewer);
-        VectorNormalizeFast(viewer);
-
-        d = DotProduct(normal, viewer);
-		if (d > 0.0f) {
-			VectorCopy(viewer, reflected);
-		} else {
-            d *= -2;
-            reflected[0] = normal[0] * d + viewer[0];
-            reflected[1] = normal[1] * d + viewer[1];
-            reflected[2] = normal[2] * d + viewer[2];
-		}
-
-		worldReflected[0] = reflected[0] * backEnd.ori.axis[0][0];
-		worldReflected[2] = reflected[0] * backEnd.ori.axis[0][2];
-		worldReflected[0] = backEnd.ori.axis[1][0] * reflected[1] + worldReflected[0];
-		worldReflected[2] = backEnd.ori.axis[1][2] * reflected[1] + worldReflected[2];
-		worldReflected[0] = backEnd.ori.axis[2][0] * reflected[2] + worldReflected[0];
-		worldReflected[2] = backEnd.ori.axis[2][2] * reflected[2] + worldReflected[2];
-
-        st[0] = 0.5 + reflected[1] * 0.5;
-        st[1] = 0.5 - reflected[2] * 0.5;
-    }
-}
-
-/*
-** RB_CalcSunReflectionTexCoords
-*/
-void RB_CalcSunReflectionTexCoords(float* st) {
-	int i;
-	vec3_t viewer;
-	vec3_t reflected;
-	vec3_t sunReflected;
-	float d;
-	float* v;
-	float* normal;
-	vec3_t sunAxis[3];
-
-    v = tess.xyz[0];
-    normal = tess.normal[0];
-    sunAxis[0][0] = tr.sunDirection[0];
-    sunAxis[0][1] = tr.sunDirection[1];
-    sunAxis[0][2] = tr.sunDirection[2];
-    sunAxis[1][0] = tr.sunDirection[1];
-    sunAxis[1][1] = -tr.sunDirection[0];
-    sunAxis[1][2] = 0.0;
-    VectorNormalizeFast(sunAxis[1]);
-    CrossProduct(sunAxis[0], sunAxis[1], sunAxis[2]);
-
-	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
-		VectorSubtract(v, backEnd.ori.viewOrigin, viewer);
-		VectorNormalizeFast(viewer);
-
-		d = DotProduct(viewer, normal);
-		if (d > 0) {
-			VectorCopy(viewer, reflected);
-		} else {
-			d *= -2;
-			VectorMA(viewer, d, normal, reflected);
-		}
-
-		VectorScale(sunAxis[0], reflected[0], sunReflected);
-		VectorMA(sunReflected, reflected[2], sunAxis[1], sunReflected);
-		VectorMA(sunReflected, -reflected[1], sunAxis[2], sunReflected);
-
-		st[0] = sunReflected[1] + 0.5;
-		st[1] = sunReflected[2] + 0.5;
-	}
-}
-
-/*
-** RB_CalcTurbulentTexCoords
-*/
-void RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *st )
-{
-	int i;
-	float now;
-
-	now = ( wf->phase + tess.shaderTime * wf->frequency );
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		float s = st[0];
-		float t = st[1];
-
-		st[0] = s + tr.sinTable[ ( ( int ) ( ( ( tess.xyz[i][0] + tess.xyz[i][2] )* 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
-		st[1] = t + tr.sinTable[ ( ( int ) ( ( tess.xyz[i][1] * 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
-	}
-}
-
-/*
-** RB_CalcScaleTexCoords
-*/
-void RB_CalcScaleTexCoords( const float scale[2], float *st )
-{
-	int i;
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		st[0] *= scale[0];
-		st[1] *= scale[1];
-	}
-}
-
-/*
-** RB_CalcOffsetTexCoords
-*/
-void RB_CalcOffsetTexCoords( const float *offset, float *st )
-{
-	int i;
-	float offsetS, offsetT;
-
-	if (offset[0] != 1234567) {
-		offsetS = offset[0];
-	} else if (backEnd.currentEntity) {
-        offsetS = backEnd.currentEntity->e.shader_data[0];
-    } else {
-        offsetS = r_static_shaderdata0->value;
-    }
-
-	if (offset[0] != 1234567) {
-		offsetT = offset[1];
-	} else if (backEnd.currentEntity) {
-		offsetT = backEnd.currentEntity->e.shader_data[1];
-    } else {
-		offsetT = r_static_shaderdata1->value;
-    }
-
-    if (!backEnd.currentEntity) {
-        offsetS = offsetS * r_static_shadermultiplier0->value;
-        offsetT = offsetT * r_static_shadermultiplier1->value;
-    }
-
-	for (i = 0; i < tess.numVertexes; i++, st += 2) {
-		float s, t;
-
-		s = st[0];
-		t = st[1];
-
-		st[0] = s + offsetS;
-		st[1] = t + offsetT;
-	}
-}
-
-/*
-** RB_CalcParallaxTexCoords
-*/
-void RB_CalcParallaxTexCoords( const float *rate, float *st )
-{
-	int i;
-	float offsetS, offsetT;
-
-    offsetS = tr.refdef.vieworg[0] * rate[0];
-    offsetT = tr.refdef.vieworg[1] * rate[1];
-    for (i = 0; i < tess.numVertexes; i++, st += 2) {
-		st[0] += offsetS;
-		st[1] += offsetT;
-    }
-}
-
-static vec3_t rb_baseaxis[18];
-
-
-void RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv)
-{
-	int bestaxis;
-	vec_t dot;
-	vec_t best;
-	int i;
-
-	if (normal[0] == 1) {
-		bestaxis = 2;
-	} else if (normal[0] == -1) {
-		bestaxis = 3;
-	} else if (normal[1] == 1) {
-		bestaxis = 4;
-	} else if (normal[1] == -1) {
-		bestaxis = 5;
-	} else if (normal[2] == 1) {
-		bestaxis = 0;
-	} else if (normal[2] == -1) {
-		bestaxis = 1;
-	} else {
-		best = 0;
-		bestaxis = 0;
-
-		for (i = 0; i < 6; i++) {
-			dot = DotProduct(rb_baseaxis[i * 3], normal);
-			if (dot > best) {
-				best = dot;
-				bestaxis = i;
-			}
-		}
-	}
-
-	VectorCopy(rb_baseaxis[bestaxis * 3 + 1], xv);
-	VectorCopy(rb_baseaxis[bestaxis * 3 + 2], yv);
-}
-
-void RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2])
-{
-	RB_TextureAxisFromPlane(normal, mappingVecs[0], mappingVecs[1]);
-
-	VectorScale(mappingVecs[0], scale[0], mappingVecs[0]);
-	VectorScale(mappingVecs[1], scale[1], mappingVecs[1]);
-}
-
-/*
-** RB_CalcMacroTexCoords
-*/
-void RB_CalcMacroTexCoords( const  float* rate, float *st )
-{
-	int i;
-	vec3_t vecs[2];
-	vec_t* v;
-	vec_t* normal;
-	float width, height;
-    v = tess.xyz[0];
-
-    normal = tess.normal[0];
-    width = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadWidth;
-    height = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadHeight;
-
-	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
-		RB_QuakeTextureVecs(normal, rate, vecs);
-		st[0] = DotProduct(vecs[0], v) / width;
-		st[1] = DotProduct(vecs[1], v) / height;
-	}
-}
-
-/*
-** RB_CalcScrollTexCoords
-*/
-void RB_CalcScrollTexCoords( const float scrollSpeed[2], float *st )
-{
-	int i;
-	float timeScale = tess.shaderTime;
-	float adjustedScrollS, adjustedScrollT;
-
-	adjustedScrollS = scrollSpeed[0] * timeScale;
-	adjustedScrollT = scrollSpeed[1] * timeScale;
-
-	// clamp so coordinates don't continuously get larger, causing problems
-	// with hardware limits
-	adjustedScrollS = adjustedScrollS - floor( adjustedScrollS );
-	adjustedScrollT = adjustedScrollT - floor( adjustedScrollT );
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		st[0] += adjustedScrollS;
-		st[1] += adjustedScrollT;
-	}
-}
-
-/*
-** RB_CalcTransformTexCoords
-*/
-void RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *st  )
-{
-	int i;
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		float s = st[0];
-		float t = st[1];
-
-		st[0] = s * tmi->matrix[0][0] + t * tmi->matrix[1][0] + tmi->translate[0];
-		st[1] = s * tmi->matrix[0][1] + t * tmi->matrix[1][1] + tmi->translate[1];
-	}
-}
-
-/*
-** RB_CalcRotateTexCoords
-*/
-void RB_CalcRotateTexCoords(float degsPerSecond, float degsPerSecondCoef, float* st, float start)
-{
-	float timeScale = tess.shaderTime;
-	float degs;
-	int index;
-	float sinValue, cosValue;
-	texModInfo_t tmi;
-
-    if (degsPerSecond != 1234567) {
-		degs = -degsPerSecond * degsPerSecondCoef * tess.shaderTime - start;
-	} else if (backEnd.currentEntity) {
-		degs = -backEnd.currentEntity->e.shader_data[0] * degsPerSecondCoef * tess.shaderTime - start;
-	} else {
-		degs = r_static_shaderdata0->value;
-	}
-	if (!backEnd.currentEntity) {
-		degs *= r_static_shadermultiplier0->value;
-	}
-	index = degs * ( FUNCTABLE_SIZE / 360.0f );
-
-	sinValue = tr.sinTable[ index & FUNCTABLE_MASK ];
-	cosValue = tr.sinTable[ ( index + FUNCTABLE_SIZE / 4 ) & FUNCTABLE_MASK ];
-
-	tmi.matrix[0][0] = cosValue;
-	tmi.matrix[1][0] = -sinValue;
-	tmi.translate[0] = 0.5 - 0.5 * cosValue + 0.5 * sinValue;
-
-	tmi.matrix[0][1] = sinValue;
-	tmi.matrix[1][1] = cosValue;
-	tmi.translate[1] = 0.5 - 0.5 * sinValue - 0.5 * cosValue;
-
-	RB_CalcTransformTexCoords( &tmi, st );
-}
-
-
-
-
-
-
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
-
-long myftol( float f ) {
-	static int tmp;
-	__asm fld f
-	__asm fistp tmp
-	__asm mov eax, tmp
-}
-
-#endif
-
-/*
-** RB_CalcSpecularAlpha
-**
-** Calculates specular coefficient and places it in the alpha channel
-*/
-vec3_t lightOrigin = { -960, 1980, 96 };		// FIXME: track dynamically
-
-void RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin) {
-	int			i;
-	float		*v, *normal;
-	vec3_t		viewer,  reflected;
-	float		l, d;
-	int			b;
-	vec3_t		lightDir;
-	int			numVertexes;
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-	alphas += 3;
-
-	numVertexes = tess.numVertexes;
-	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4, alphas += 4) {
-		float ilength;
-
-		VectorSubtract( lightOrigin, v, lightDir );
-//		ilength = Q_rsqrt( DotProduct( lightDir, lightDir ) );
-		VectorNormalizeFast( lightDir );
-
-		// calculate the specular color
-		d = DotProduct (normal, lightDir);
-//		d *= ilength;
-
-		// we don't optimize for the d < 0 case since this tends to
-		// cause visual artifacts such as faceted "snapping"
-		reflected[0] = normal[0]*2*d - lightDir[0];
-		reflected[1] = normal[1]*2*d - lightDir[1];
-		reflected[2] = normal[2]*2*d - lightDir[2];
-
-		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
-		ilength = Q_rsqrt( DotProduct( viewer, viewer ) );
-		l = DotProduct (reflected, viewer);
-		l *= ilength;
-
-		if (l < 0) {
-			b = 0;
-		} else {
-			l = l*l;
-			l = l*l;
-			b = l * 255;
-			if (b > 255) {
-				b = 255;
-			}
-		}
-
-		*alphas = b;
-	}
-}
-
-void RB_CalcLightGridColor(unsigned char* colors)
-{
-	int i;
-
-	if (!backEnd.currentEntity) {
-		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[0];
-			colors[i * 4 + 1] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[1];
-			colors[i * 4 + 2] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[2];
-			colors[i * 4 + 3] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[3];
-		}
-	}
-	else if (backEnd.currentEntity != &tr.worldEntity) {
-		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = ((byte*)&backEnd.currentEntity->iGridLighting)[0];
-			colors[i * 4 + 1] = ((byte*)&backEnd.currentEntity->iGridLighting)[1];
-			colors[i * 4 + 2] = ((byte*)&backEnd.currentEntity->iGridLighting)[2];
-			colors[i * 4 + 3] = ((byte*)&backEnd.currentEntity->iGridLighting)[3];
-		}
-	}
-	else {
-		Com_Printf(
-			"##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
-			tess.shader->name);
-
-		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = 0xFF;
-			colors[i * 4 + 1] = 0xFF;
-			colors[i * 4 + 2] = 0xFF;
-			colors[i * 4 + 3] = 0xFF;
-		}
-	}
-}
-
-void RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	vec3_t viewInModel;
-
-    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-        union {
-            float f;
-            int i;
-        } u;
-
-		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
-		VectorNormalizeFast(viewInModel);
-
-        u.f = DotProduct(viewInModel, tess.normal[i]);
-        u.f = fabs(u.f);
-        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
-
-		u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
-        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
-
-        u.i &= ~(u.i >> 31);
-		colors[3] = u.i;
-	}
-}
-
-void RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	vec3_t viewInModel;
-
-    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
-        union {
-            float f;
-            int i;
-        } u;
-
-		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
-		VectorNormalizeFast(viewInModel);
-
-        u.f = DotProduct(viewInModel, tess.normal[i]);
-        u.f = fabs(u.f);
-		u.f = 1.0 - u.f;
-        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
-        
-        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
-        u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
-
-        u.i &= ~(u.i >> 31);
-		colors[3] = u.i;
-	}
-}
-
-/*
-** RB_CalcDiffuseColor
-**
-** The basic vertex lighting calc
-*/
-void RB_CalcDiffuseColor( unsigned char *colors )
-{
-	int				i, j;
-	float			*v, *normal;
-	float			incoming;
-	trRefEntity_t	*ent;
-	int				ambientLightInt;
-	vec3_t			ambientLight;
-	vec3_t			lightDir;
-	vec3_t			directedLight;
-	int				numVertexes;
-#if idppc_altivec
-	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff);
-	vector float ambientLightVec;
-	vector float directedLightVec;
-	vector float lightDirVec;
-	vector float normalVec0, normalVec1;
-	vector float incomingVec0, incomingVec1, incomingVec2;
-	vector float zero, jVec;
-	vector signed int jVecInt;
-	vector signed short jVecShort;
-	vector unsigned char jVecChar, normalPerm;
-#endif
-	ent = backEnd.currentEntity;
-	ambientLightInt = ent->ambientLightInt;
-#if idppc_altivec
-	// A lot of this could be simplified if we made sure
-	// entities light info was 16-byte aligned.
-	jVecChar = vec_lvsl(0, ent->ambientLight);
-	ambientLightVec = vec_ld(0, (vector float *)ent->ambientLight);
-	jVec = vec_ld(11, (vector float *)ent->ambientLight);
-	ambientLightVec = vec_perm(ambientLightVec,jVec,jVecChar);
-
-	jVecChar = vec_lvsl(0, ent->directedLight);
-	directedLightVec = vec_ld(0,(vector float *)ent->directedLight);
-	jVec = vec_ld(11,(vector float *)ent->directedLight);
-	directedLightVec = vec_perm(directedLightVec,jVec,jVecChar);	 
-
-	jVecChar = vec_lvsl(0, ent->lightDir);
-	lightDirVec = vec_ld(0,(vector float *)ent->lightDir);
-	jVec = vec_ld(11,(vector float *)ent->lightDir);
-	lightDirVec = vec_perm(lightDirVec,jVec,jVecChar);	 
-
-	zero = (vector float)vec_splat_s8(0);
-	VectorCopy( ent->lightDir, lightDir );
-#else
-	VectorCopy( ent->ambientLight, ambientLight );
-	VectorCopy( ent->directedLight, directedLight );
-	VectorCopy( ent->lightDir, lightDir );
-#endif
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-#if idppc_altivec
-	normalPerm = vec_lvsl(0,normal);
-#endif
-	numVertexes = tess.numVertexes;
-	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
-#if idppc_altivec
-		normalVec0 = vec_ld(0,(vector float *)normal);
-		normalVec1 = vec_ld(11,(vector float *)normal);
-		normalVec0 = vec_perm(normalVec0,normalVec1,normalPerm);
-		incomingVec0 = vec_madd(normalVec0, lightDirVec, zero);
-		incomingVec1 = vec_sld(incomingVec0,incomingVec0,4);
-		incomingVec2 = vec_add(incomingVec0,incomingVec1);
-		incomingVec1 = vec_sld(incomingVec1,incomingVec1,4);
-		incomingVec2 = vec_add(incomingVec2,incomingVec1);
-		incomingVec0 = vec_splat(incomingVec2,0);
-		incomingVec0 = vec_max(incomingVec0,zero);
-		normalPerm = vec_lvsl(12,normal);
-		jVec = vec_madd(incomingVec0, directedLightVec, ambientLightVec);
-		jVecInt = vec_cts(jVec,0);	// RGBx
-		jVecShort = vec_pack(jVecInt,jVecInt);		// RGBxRGBx
-		jVecChar = vec_packsu(jVecShort,jVecShort);	// RGBxRGBxRGBxRGBx
-		jVecChar = vec_sel(jVecChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-		vec_ste((vector unsigned int)jVecChar,0,(unsigned int *)&colors[i*4]);	// store color
-#else
-		incoming = DotProduct (normal, lightDir);
-		if ( incoming <= 0 ) {
-			*(int *)&colors[i*4] = ambientLightInt;
-			continue;
-		} 
-		j = myftol( ambientLight[0] + incoming * directedLight[0] );
-		if ( j > 255 ) {
-			j = 255;
-		}
-		colors[i*4+0] = j;
-
-		j = myftol( ambientLight[1] + incoming * directedLight[1] );
-		if ( j > 255 ) {
-			j = 255;
-		}
-		colors[i*4+1] = j;
-
-		j = myftol( ambientLight[2] + incoming * directedLight[2] );
-		if ( j > 255 ) {
-			j = 255;
-		}
-		colors[i*4+2] = j;
-
-		colors[i*4+3] = 255;
-#endif
-	}
-}
-
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
deleted file mode 100644
index 743da297..00000000
--- a/code/renderer/tr_shader.c
+++ /dev/null
@@ -1,3832 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-// tr_shader.c -- this file deals with the parsing and definition of shaders
-
-
-typedef struct shadertext_s {
-    char name[64];
-    char* text;
-    shader_t* shader;
-    struct shadertext_s* next;
-} shadertext_t;
-
-static char *s_shaderText;
-
-// the shader is parsed into these global variables, then copied into
-// dynamically allocated memory if it is valid.
-static	shaderStage_t	unfoggedStages[MAX_SHADER_STAGES];		
-static	shader_t		shader;
-static	texModInfo_t	texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
-
-#define FILE_HASH_SIZE		8192
-
-static qboolean shader_noPicMip;
-static qboolean shader_noMipMaps;
-static qboolean shader_force32bit;
-static shadertext_t* currentShader = NULL;
-static shadertext_t* hashTable[FILE_HASH_SIZE];
-
-#define GL_CLAMP_TO_EDGE 0x812F
-
-/*
-================
-return a hash value for the filename
-================
-*/
-static long generateHashValue( const char *fname ) {
-	int		i;
-	long	hash;
-	char	letter;
-
-	hash = 0;
-	i = 0;
-	while (fname[i] != '\0') {
-		letter = tolower(fname[i]);
-		if (letter =='.') break;				// don't include extension
-		if (letter =='\\') letter = '/';		// damn path names
-		if (letter == PATH_SEP) letter = '/';		// damn path names
-		hash+=(long)(letter)*(i+119);
-		i++;
-	}
-	hash = (hash ^ (hash >> 10) ^ (hash >> 20));
-	hash &= (FILE_HASH_SIZE-1);
-	return hash;
-}
-
-static shadertext_t* AddShaderTextToHash(const char* name, int hash)
-{
-	shadertext_t* shader;
-
-    shader = (shadertext_t*)ri.Malloc(sizeof(shadertext_t));
-
-    Com_Memset(shader, 0, sizeof(shadertext_t));
-    strncpy(shader->name, name, sizeof(shader->name));
-    shader->next = hashTable[hash];
-
-    hashTable[hash] = shader;
-    return shader;
-}
-
-static shadertext_t* AllocShaderText(const char* name)
-{
-    int hash;
-
-    hash = generateHashValue(name);
-    return AddShaderTextToHash(name, hash);
-}
-
-/*
-====================
-FindShaderText
-
-Scans the combined text description of all the shader files for
-the given shader name.
-
-return NULL if not found
-
-If found, it will return a valid shader
-=====================
-*/
-static shadertext_t* FindShaderText(const char* name)
-{
-    shadertext_t* shader;
-    int hash;
-
-    hash = generateHashValue(name);
-    shader = hashTable[hash];
-    if (!shader) {
-        return AddShaderTextToHash(name, hash);
-    }
-
-    while (Q_stricmp(shader->name, name))
-    {
-        shader = shader->next;
-        if (!shader) {
-            return AddShaderTextToHash(name, hash);
-        }
-    }
-
-    return shader;
-}
-
-/*
-===============
-ParseVector
-===============
-*/
-static qboolean ParseVector( char **text, int count, float *v ) {
-	char	*token;
-	int		i;
-
-	for ( i = 0 ; i < count ; i++ ) {
-		token = COM_ParseExt( text, qfalse );
-		if ( !token[0] ) {
-			ri.Printf( PRINT_WARNING, "WARNING: missing vector element in shader '%s'\n", shader.name );
-			return qfalse;
-		}
-		v[i] = atof( token );
-	}
-
-	return qtrue;
-}
-
-void InitStaticShaders()
-{
-	char* text;
-	const char* token;
-	char* buf;
-	char shadername[64];
-
-    if (ri.FS_ReadFile("scripts/static_shaders.txt", (void**)&buf) == -1)
-    {
-        ri.Printf(3, "Couldn't find static shaders file: scripts/staticshaders.txt\n");
-		return;
-    }
-
-    text = buf;
-    while (1)
-    {
-        token = COM_ParseExt(&text, 1);
-		if (!*token) {
-			break;
-		}
-
-        strncpy(shadername, token, 0x40u);
-		if (!R_FindShader(shadername, -1, 1, 1, 1, 1)) {
-			ri.Printf(3, "InitStaticShaders: Couldn't find shader: %s\n", shadername);
-		}
-    }
-
-    ri.FS_FreeFile(buf);
-}
-
-/*
-===============
-NameToAFunc
-===============
-*/
-static unsigned NameToAFunc( const char *funcname )
-{	
-	if ( !Q_stricmp( funcname, "GT0" ) )
-	{
-		return GLS_ATEST_GT_0;
-	}
-	else if ( !Q_stricmp( funcname, "LT128" ) )
-	{
-		return GLS_ATEST_LT_80;
-	}
-	else if ( !Q_stricmp( funcname, "GE128" ) )
-	{
-		return GLS_ATEST_GE_80;
-	}
-	else if ( !Q_stricmp( funcname, "LT_FOLIAGE1" ) )
-	{
-		return GLS_ATEST_LT_FOLIAGE1;
-	}
-	else if ( !Q_stricmp( funcname, "GE_FOLIAGE1" ) )
-	{
-		return GLS_ATEST_GE_FOLIAGE1;
-	}
-	else if ( !Q_stricmp( funcname, "LT_FOLIAGE2" ) )
-	{
-		return GLS_ATEST_LT_FOLIAGE2;
-	}
-	else if ( !Q_stricmp( funcname, "GE_FOLIAGE2" ) )
-	{
-		return GLS_ATEST_GE_FOLIAGE2;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: invalid alphaFunc name '%s' in shader '%s'\n", funcname, shader.name );
-	return 0;
-}
-
-
-/*
-===============
-NameToSrcBlendMode
-===============
-*/
-static int NameToSrcBlendMode( const char *name )
-{
-	if ( !Q_stricmp( name, "GL_ONE" ) )
-	{
-		return GLS_SRCBLEND_ONE;
-	}
-	else if ( !Q_stricmp( name, "GL_ZERO" ) )
-	{
-		return GLS_SRCBLEND_ZERO;
-	}
-	else if ( !Q_stricmp( name, "GL_DST_COLOR" ) )
-	{
-		return GLS_SRCBLEND_DST_COLOR;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_DST_COLOR" ) )
-	{
-		return GLS_SRCBLEND_ONE_MINUS_DST_COLOR;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_SRC_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_DST_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_DST_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_ONE_MINUS_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_ALPHA_SATURATE" ) )
-	{
-		return GLS_SRCBLEND_ALPHA_SATURATE;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
-	return GLS_SRCBLEND_ONE;
-}
-
-/*
-===============
-NameToDstBlendMode
-===============
-*/
-static int NameToDstBlendMode( const char *name )
-{
-	if ( !Q_stricmp( name, "GL_ONE" ) )
-	{
-		return GLS_DSTBLEND_ONE;
-	}
-	else if ( !Q_stricmp( name, "GL_ZERO" ) )
-	{
-		return GLS_DSTBLEND_ZERO;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_SRC_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_DST_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_DST_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_ONE_MINUS_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_COLOR" ) )
-	{
-		return GLS_DSTBLEND_SRC_COLOR;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_SRC_COLOR" ) )
-	{
-		return GLS_DSTBLEND_ONE_MINUS_SRC_COLOR;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
-	return GLS_DSTBLEND_ONE;
-}
-
-/*
-===============
-NameToGenFunc
-===============
-*/
-static genFunc_t NameToGenFunc( const char *funcname )
-{
-	if ( !Q_stricmp( funcname, "sin" ) )
-	{
-		return GF_SIN;
-	}
-	else if ( !Q_stricmp( funcname, "square" ) )
-	{
-		return GF_SQUARE;
-	}
-	else if ( !Q_stricmp( funcname, "triangle" ) )
-	{
-		return GF_TRIANGLE;
-	}
-	else if ( !Q_stricmp( funcname, "sawtooth" ) )
-	{
-		return GF_SAWTOOTH;
-	}
-	else if ( !Q_stricmp( funcname, "inversesawtooth" ) )
-	{
-		return GF_INVERSE_SAWTOOTH;
-	}
-	else if ( !Q_stricmp( funcname, "noise" ) )
-	{
-		return GF_NOISE;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: invalid genfunc name '%s' in shader '%s'\n", funcname, shader.name );
-	return GF_SIN;
-}
-
-
-/*
-===================
-ParseWaveForm
-===================
-*/
-static void ParseWaveForm( char **text, waveForm_t *wave )
-{
-	char *token;
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->func = NameToGenFunc( token );
-
-	// BASE, AMP, PHASE, FREQ
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->base = atof( token );
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->amplitude = atof( token );
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->phase = atof( token );
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->frequency = atof( token );
-}
-
-
-/*
-===================
-ParseTexMod
-===================
-*/
-static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
-{
-	const char *token;
-	char **text = &_text;
-	texModInfo_t *tmi;
-
-	if ( stage->bundle[cntBundle].numTexMods == TR_MAX_TEXMODS ) {
-		ri.Error( ERR_DROP, "ERROR: too many tcMod unfoggedStages in shader '%s'\n", shader.name );
-		return;
-	}
-
-	tmi = &stage->bundle[cntBundle].texMods[stage->bundle[cntBundle].numTexMods];
-	stage->bundle[cntBundle].numTexMods++;
-
-	token = COM_ParseExt( text, qfalse );
-
-	//
-	// turb
-	//
-	if ( !Q_stricmp( token, "turb" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.base = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.amplitude = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.phase = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.frequency = atof( token );
-
-		tmi->type = TMOD_TURBULENT;
-
-		shader.flags |= 2;
-	}
-	//
-	// scale
-	//
-	else if ( !Q_stricmp( token, "scale" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->scale[0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->scale[1] = atof( token );
-		tmi->type = TMOD_SCALE;
-	}
-	//
-	// scroll
-	//
-	else if ( !Q_stricmp( token, "scroll" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
-			return;
-		}
-		if (!Q_stricmp(token, "fromEntity")) {
-			tmi->scroll[0] = 1234567;
-		} else {
-			tmi->scroll[0] = atof(token);
-		}
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
-			return;
-		}
-		if (!Q_stricmp(token, "fromEntity")) {
-			tmi->scroll[1] = 1234567;
-		} else {
-			tmi->scroll[1] = atof(token);
-		}
-
-        token = COM_ParseExt(text, qfalse);
-		if (token[0]) {
-			if (atof(token) < 0) {
-				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
-			} else if (atof(token) > 0) {
-				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
-			}
-		}
-
-        token = COM_ParseExt(text, qfalse);
-		if (token[0]) {
-			if (atof(token) < 0) {
-				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
-			} else if (atof(token) > 0) {
-				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
-			}
-		}
-
-		tmi->type = TMOD_SCROLL;
-
-		shader.flags |= 2;
-	}
-	//
-	// stretch
-	//
-	else if ( !Q_stricmp( token, "stretch" ) )
-	{
-		ParseWaveForm(text, &tmi->wave);
-		tmi->type = TMOD_STRETCH;
-		shader.flags |= 2;
-	}
-	else if ( !Q_stricmp( token, "wavetrans" ) )
-    {
-		ParseWaveForm(text, &tmi->wave);
-		tmi->type = TMOD_WAVETRANS;
-		shader.flags |= 2;
-	}
-	else if ( !Q_stricmp( token, "wavetrant" ) )
-    {
-        ParseWaveForm(text, &tmi->wave);
-        tmi->type = TMOD_WAVETRANT;
-        shader.flags |= 2;
-	}
-	else if ( !Q_stricmp( token, "bulge" ) )
-	{
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0) {
-			ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
-			return;
-		}
-
-        tmi->wave.base = atof(token);
-
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
-            return;
-        }
-
-		tmi->wave.amplitude = atof(token);
-
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
-            return;
-        }
-
-		tmi->wave.frequency = atof(token);
-
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
-            return;
-        }
-
-		tmi->wave.phase = atof(token);
-
-		tmi->type = TMOD_BULGETRANS;
-		shader.flags |= 2;
-	}
-	//
-	// transform
-	//
-	else if ( !Q_stricmp( token, "transform" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[0][0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[0][1] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[1][0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[1][1] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->translate[0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->translate[1] = atof( token );
-
-		tmi->type = TMOD_TRANSFORM;
-	}
-	//
-	// rotate
-	//
-	else if ( !Q_stricmp( token, "rotate" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
-			return;
-		}
-
-		if (!Q_stricmp(token, "fromEntity")) {
-			tmi->rotateSpeed = 1234567;
-		} else {
-			tmi->rotateSpeed = atof(token);
-		}
-
-        token = COM_ParseExt(text, qfalse);
-		if (token[0]) {
-			if (!Q_stricmp(token, "fromEntity")) {
-				tmi->rotateStart = 1234567;
-			} else {
-				tmi->rotateStart = atof(token);
-			}
-		} else {
-			tmi->rotateStart = 0;
-        }
-
-        token = COM_ParseExt(text, qfalse);
-		if (token[0]) {
-			tmi->rotateCoef = atof(token);
-		} else {
-			tmi->rotateCoef = 1;
-		}
-
-		tmi->type = TMOD_ROTATE;
-		shader.flags |= 2;
-	}
-    else if (!Q_stricmp(token, "offset")) {
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
-            return;
-		}
-
-		if (!Q_stricmp(token, "fromEntity")) {
-			tmi->scroll[0] = 1234567;
-		} else {
-			tmi->scroll[0] = atof(token);
-		}
-
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
-            return;
-		}
-
-		if (!Q_stricmp(token, "fromEntity")) {
-			tmi->scroll[1] = 1234567;
-		} else {
-			tmi->scroll[1] = atof(token);
-        }
-
-        token = COM_ParseExt(text, qfalse);
-		if (token[0]) {
-			if (atof(token) < 0) {
-				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
-			} else if (atof(token) > 0) {
-				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
-			}
-		}
-
-        token = COM_ParseExt(text, qfalse);
-		if (token[0]) {
-			if (atof(token) < 0) {
-				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
-			} else if (atof(token) > 0) {
-				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
-			}
-		}
-
-		tmi->type = TMOD_OFFSET;
-	}
-	//
-	// entityTranslate
-	//
-	else if ( !Q_stricmp( token, "entityTranslate" ) )
-	{
-		tmi->type = TMOD_ENTITY_TRANSLATE;
-	}
-	else if ( !Q_stricmp( token, "parallax" ) )
-    {
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
-            return;
-		}
-
-		tmi->rate[0] = atof(token);
-
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
-            return;
-		}
-
-		tmi->rate[1] = atof(token);
-		tmi->type = TMOD_PARALLAX;
-	}
-	else if ( !Q_stricmp( token, "macro" ) )
-    {
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
-            return;
-        }
-
-		tmi->scale[0] = 1.0 / atof(token);
-
-        token = COM_ParseExt(text, qfalse);
-        if (token[0] == 0) {
-            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
-            return;
-        }
-
-		tmi->scale[1] = 1.0 / atof(token);
-
-		tmi->type = TMOD_MACRO;
-		shader.needsNormal = qtrue;
-	}
-	else
-	{
-		ri.Printf(PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name);
-	}
-}
-
-
-/*
-===================
-ParseStage
-===================
-*/
-static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
-{
-	char* token;
-	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0, colorBits = 0;
-	qboolean depthMaskExplicit = qfalse;
-	int cntBundle = 0;
-	int depthTestBits = 0;
-	int fogBits = 0;
-	qboolean shouldProcess = qtrue;
-
-	stage->active = qtrue;
-	stage->noMipMaps = shader_noMipMaps;
-	stage->noPicMip = shader_noPicMip;
-	stage->force32bit = shader_force32bit;
-
-	while (1)
-	{
-		token = COM_ParseExt(text, qtrue);
-		if (!token[0])
-		{
-			ri.Printf(PRINT_WARNING, "WARNING: no matching '}' found\n");
-			return qfalse;
-		}
-
-		if (token[0] == '}')
-		{
-			break;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "nomipmaps"))
-		{
-			stage->noMipMaps = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "nopicmip"))
-		{
-			stage->noPicMip = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "nofog"))
-		{
-			fogBits = GLS_FOG;
-			continue;
-		}
-		//
-		// map <name>
-		//
-		else if (!Q_stricmp(token, "map"))
-		{
-			token = COM_ParseExt(text, qfalse);
-			if (!token[0])
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name);
-				return qfalse;
-			}
-
-			if (!Q_stricmp(token, "$whiteimage"))
-			{
-				stage->bundle[cntBundle].image[0] = tr.whiteImage;
-				continue;
-			}
-			else if (!Q_stricmp(token, "$lightmap"))
-			{
-				stage->bundle[cntBundle].isLightmap = qtrue;
-				if (shader.lightmapIndex < 0) {
-					stage->bundle[cntBundle].image[0] = tr.whiteImage;
-				}
-				else {
-					stage->bundle[cntBundle].image[0] = tr.lightmaps[shader.lightmapIndex];
-				}
-				continue;
-			}
-			else if (!Q_stricmp(token, "$bumpmap"))
-            {
-                token = COM_ParseExt(text, qfalse);
-                if (!token[0])
-                {
-                    ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'bumpmap' keyword in shader '%s'\n", shader.name);
-                    return qfalse;
-                }
-
-				// This is not implemented in mohaa
-			}
-			else
-			{
-				stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
-				if (!stage->bundle[cntBundle].image[0])
-				{
-					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
-					return qfalse;
-				}
-			}
-		}
-		//
-		// clampmap <name>
-		//
-		else if (!Q_stricmpn(token, "clampmap", 8))
-		{
-			int clampx, clampy;
-
-			if (!token[8]) {
-				if (!haveClampToEdge) {
-					clampx = GL_CLAMP;
-					clampy = GL_CLAMP;
-				}
-				else {
-					clampx = GL_CLAMP_TO_EDGE;
-					clampy = GL_CLAMP_TO_EDGE;
-				}
-			}
-			else {
-				if (token[8] == 'x')
-				{
-					if (!haveClampToEdge) {
-						clampx = GL_CLAMP;
-					}
-					else {
-						clampx = GL_CLAMP_TO_EDGE;
-					}
-					clampy = GL_CLAMP;
-				}
-				else if (token[8] == 'y')
-				{
-					clampx = GL_CLAMP;
-					if (!haveClampToEdge) {
-						clampy = GL_CLAMP;
-					}
-					else {
-						clampy = GL_CLAMP_TO_EDGE;
-					}
-				}
-				else {
-					ri.Printf(PRINT_WARNING, "WARNING: Converting unknown clampmap type to clampmap\n");
-					continue;
-				}
-			}
-
-			token = COM_ParseExt(text, qfalse);
-			if (!token[0])
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name);
-				return qfalse;
-			}
-
-			stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, clampx, clampy);
-			if (!stage->bundle[cntBundle].image[0])
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
-				return qfalse;
-			}
-		}
-		//
-		// animMap <frequency> <image1> .... <imageN>
-		//
-		else if ( !Q_stricmp( token, "animMap" ) || !Q_stricmp(token, "animMapOnce") || !Q_stricmp(token, "animMapPhase"))
-		{
-			qboolean phased;
-
-			shader.flags |= 3;
-
-			if (!Q_stricmp(token, "animMapOnce")) {
-				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
-			}
-
-			phased = !Q_stricmp(token, "animMapPhase");
-
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMmap' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
-			stage->bundle[cntBundle].imageAnimationPhase = 0;
-
-			if (phased)
-            {
-                token = COM_ParseExt(text, qfalse);
-                if (!token[0])
-                {
-                    ri.Printf(PRINT_WARNING, "WARNING: missing phase for 'animMapPhase' keyword in shader '%s'\n", shader.name);
-                    return qfalse;
-                }
-
-				stage->bundle[cntBundle].imageAnimationPhase = atof(token);
-			}
-			// parse up to MAX_IMAGE_ANIMATIONS animations
-			while ( 1 ) {
-				int		num;
-
-				token = COM_ParseExt( text, qfalse );
-				if ( !token[0] ) {
-					break;
-				}
-				num = stage->bundle[cntBundle].numImageAnimations;
-				if ( num < MAX_IMAGE_ANIMATIONS ) {
-                    stage->bundle[cntBundle].image[num] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT );
-					if ( !stage->bundle[cntBundle].image[num] )
-					{
-						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
-						return qfalse;
-					}
-					stage->bundle[cntBundle].numImageAnimations++;
-				}
-			}
-		}
-		else if (!Q_stricmp(token, "normalmap"))
-        {
-			//
-			// added in 2.30
-			//
-
-            token = COM_ParseExt(text, qfalse);
-            if (!token[0])
-            {
-                ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'normalmap' keyword in shader '%s'\n", shader.name);
-                return qfalse;
-            }
-
-			stage->normalMap = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
-			if (!stage->normalMap)
-            {
-                ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
-                return qfalse;
-			}
-
-			stage->hasNormalMap = qtrue;
-		}
-		//
-		// alphafunc <func>
-		//
-		else if ( !Q_stricmp( token, "alphaFunc" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'alphaFunc' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-
-			atestBits = NameToAFunc( token );
-		}
-		//
-		// depthFunc <func>
-		//
-		else if ( !Q_stricmp( token, "depthfunc" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'depthfunc' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-
-			if ( !Q_stricmp( token, "lequal" ) )
-			{
-				depthTestBits = 0;
-			}
-			else if ( !Q_stricmp( token, "equal" ) )
-			{
-				depthTestBits = GLS_DEPTHFUNC_EQUAL;
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown depthfunc '%s' in shader '%s'\n", token, shader.name );
-				continue;
-			}
-		}
-		//
-		// blendfunc <srcFactor> <dstFactor>
-		// or blendfunc <add|filter|blend>
-		//
-		else if ( !Q_stricmp( token, "blendfunc" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
-				continue;
-			}
-			// check for "simple" blends first
-			if ( !Q_stricmp( token, "add" ) ) {
-				blendSrcBits = GLS_SRCBLEND_ONE;
-				blendDstBits = GLS_DSTBLEND_ONE;
-			} else if ( !Q_stricmp( token, "filter" ) ) {
-				blendSrcBits = GLS_SRCBLEND_DST_COLOR;
-				blendDstBits = GLS_DSTBLEND_ZERO;
-			} else if ( !Q_stricmp( token, "blend" ) ) {
-				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
-				blendDstBits = GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-			} else if ( !Q_stricmp( token, "alphaadd" ) ) {
-				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
-				blendDstBits = GLS_DSTBLEND_ONE;
-			} else {
-				// complex double blends
-				blendSrcBits = NameToSrcBlendMode( token );
-
-				token = COM_ParseExt( text, qfalse );
-				if ( token[0] == 0 )
-				{
-					ri.Printf( PRINT_WARNING, "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
-					continue;
-				}
-				blendDstBits = NameToDstBlendMode( token );
-			}
-
-			// clear depth mask for blended surfaces
-			if ( !depthMaskExplicit )
-			{
-				depthMaskBits = 0;
-			}
-		}
-		//
-		// rgbGen
-		//
-		else if ( !Q_stricmp( token, "rgbGen" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameters for rgbGen in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "wave" ) )
-			{
-				ParseWaveForm( text, &stage->rgbWave );
-				stage->rgbGen = CGEN_WAVEFORM;
-			}
-			else if (!Q_stricmp(token, "colorwave"))
-			{
-				vec3_t v;
-
-				ParseVector(text, 3, v);
-				stage->colorConst[0] = v[0] * 255.0;
-				stage->colorConst[1] = v[1] * 255.0;
-				stage->colorConst[2] = v[2] * 255.0;
-				stage->rgbGen = CGEN_MULTIPLY_BY_WAVEFORM;
-				shader.flags |= 2;
-			}
-			else if (!Q_stricmp(token, "identity"))
-			{
-				stage->rgbGen = CGEN_IDENTITY;
-			}
-			else if (!Q_stricmp(token, "identityLighting"))
-			{
-				stage->rgbGen = CGEN_IDENTITY_LIGHTING;
-			}
-			else if (!Q_stricmp(token, "global"))
-			{
-				stage->rgbGen = CGEN_GLOBAL_COLOR;
-			}
-			else if (!Q_stricmp(token, "entity") || !Q_stricmp(token, "fromentity"))
-			{
-				stage->rgbGen = CGEN_ENTITY;
-			}
-			else if (!Q_stricmp(token, "oneMinusEntity"))
-			{
-				stage->rgbGen = CGEN_ONE_MINUS_ENTITY;
-			}
-			else if (!Q_stricmp(token, "vertex") || !Q_stricmp(token, "fromclient"))
-			{
-				stage->rgbGen = CGEN_VERTEX;
-				if (stage->alphaGen == 0) {
-					stage->alphaGen = AGEN_VERTEX;
-				}
-			}
-			else if (!Q_stricmp(token, "exactVertex"))
-			{
-				stage->rgbGen = CGEN_EXACT_VERTEX;
-			}
-			else if (!Q_stricmp(token, "lightingGrid"))
-			{
-				stage->rgbGen = CGEN_LIGHTING_GRID;
-			}
-			else if (!Q_stricmp(token, "lightingSpherical"))
-			{
-				stage->rgbGen = CGEN_LIGHTING_SPHERICAL;
-			}
-			else if (!Q_stricmp(token, "oneMinusVertex"))
-			{
-				stage->rgbGen = CGEN_ONE_MINUS_VERTEX;
-			}
-			else if ( !Q_stricmp( token, "const" ) || !Q_stricmp(token, "constant"))
-			{
-				vec3_t	color;
-
-				ParseVector( text, 3, color );
-				stage->colorConst[0] = 255 * color[0];
-				stage->colorConst[1] = 255 * color[1];
-				stage->colorConst[2] = 255 * color[2];
-
-				stage->rgbGen = CGEN_CONSTANT;
-			}
-			else if (!Q_stricmp(token, "static"))
-			{
-				stage->rgbGen = CGEN_STATIC;
-				if (stage->alphaGen == AGEN_IDENTITY) {
-					stage->alphaGen = AGEN_VERTEX;
-				}
-			}
-			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
-			{
-				if (!Q_stricmp(token, "sCoord")) {
-					stage->rgbGen = CGEN_SCOORD;
-				}
-				else {
-					stage->rgbGen = CGEN_TCOORD;
-				}
-
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaConstMin = 0;
-				stage->alphaConst = -1;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-
-				stage->alphaMax = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-
-				stage->alphaConstMin = atof(token) * 255.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					ri.Printf(PRINT_WARNING, "WARNING: missing rgbGen sCoord or tCoord parm 'max' in shader '%s'\n", shader.name);
-					continue;
-				}
-
-				stage->alphaConst = atof(token) * 255.0;
-			}
-			else if (!Q_stricmp(token, "dot"))
-			{
-				shader.needsNormal = qtrue;
-
-				stage->rgbGen = CGEN_DOT;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "oneminusdot"))
-			{
-				shader.needsNormal = qtrue;
-
-				stage->rgbGen = CGEN_ONE_MINUS_DOT;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
-				continue;
-			}
-		}
-		//
-		// alphaGen 
-		//
-		else if ( !Q_stricmp( token, "alphaGen" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameters for alphaGen in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "wave" ) )
-			{
-				ParseWaveForm( text, &stage->alphaWave );
-				stage->alphaGen = AGEN_WAVEFORM;
-			}
-			else if (!Q_stricmp(token, "global"))
-			{
-				stage->alphaGen = AGEN_GLOBAL_ALPHA;
-			}
-			else if ( !Q_stricmp( token, "entity" ) || !Q_stricmp(token, "fromentity"))
-			{
-				stage->alphaGen = AGEN_ENTITY;
-			}
-			else if ( !Q_stricmp( token, "oneMinusEntity" ) )
-			{
-				stage->alphaGen = AGEN_ONE_MINUS_ENTITY;
-			}
-			else if ( !Q_stricmp( token, "vertex" ) || !Q_stricmp(token, "fromclient"))
-			{
-				stage->alphaGen = AGEN_VERTEX;
-			}
-			else if ( !Q_stricmp( token, "oneMinusVertex" ) || !Q_stricmp(token, "oneMinusFromClient"))
-			{
-				stage->alphaGen = AGEN_ONE_MINUS_VERTEX;
-			}
-			else if (!Q_stricmp(token, "lightingSpecular"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
-				stage->alphaMax = 255;
-				stage->specOrigin[0] = -960;
-				stage->specOrigin[1] = 1980;
-				stage->specOrigin[2] = 96;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0]) {
-					stage->alphaMax = atof(token) * 255.0;
-					ParseVector(text, 3, stage->specOrigin);
-				}
-			}
-			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
-				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))
-			{
-				if (!Q_stricmp(token, "distFade")) {
-					stage->alphaGen = AGEN_DIST_FADE;
-				} else if (!Q_stricmp(token, "oneMinusDistFade")) {
-					stage->alphaGen = AGEN_ONE_MINUS_DIST_FADE;
-				} else if (!Q_stricmp(token, "tikiDistFade")) {
-                    stage->alphaGen = AGEN_TIKI_DIST_FADE;
-                } else {
-                    stage->alphaGen = AGEN_ONE_MINUS_TIKI_DIST_FADE;
-                }
-
-				shader.fDistNear = 256.0;
-				shader.fDistRange = 256.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				shader.fDistNear = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				shader.fDistRange = atof(token);
-			}
-			else if (!Q_stricmp(token, "dot"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_DOT;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "heightFade"))
-            {
-                shader.needsNormal = qtrue;
-                stage->alphaMin = 256.0f;
-                stage->alphaMax = 512.0f;
-                stage->alphaGen = AGEN_HEIGHT_FADE;
-
-                token = COM_ParseExt(text, qfalse);
-                if (token[0] == 0) {
-                    continue;
-                }
-                stage->alphaMin = atof(token);
-
-                token = COM_ParseExt(text, qfalse);
-                if (token[0] == 0) {
-                    continue;
-                }
-                stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "oneMinusDot"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_ONE_MINUS_DOT;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "dotView"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_DOT_VIEW;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "oneMinusDotView"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_ONE_MINUS_DOT_VIEW;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "const") || !Q_stricmp(token, "constant"))
-			{
-				token = COM_ParseExt(text, qfalse);
-				stage->colorConst[3] = 255 * atof(token);
-				stage->alphaGen = AGEN_CONSTANT;
-			}
-			else if (!Q_stricmp(token, "skyAlpha"))
-			{
-				stage->alphaGen = AGEN_SKYALPHA;
-			}
-			else if (!Q_stricmp(token, "oneMinusSkyAlpha"))
-			{
-				stage->alphaGen = AGEN_ONE_MINUS_SKYALPHA;
-			}
-			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
-			{
-				if (!Q_stricmp(token, "sCoord")) {
-					stage->alphaGen = AGEN_SCOORD;
-				} else {
-					stage->alphaGen = AGEN_TCOORD;
-				}
-
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaConstMin = 0;
-				stage->alphaConst = -1;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaConstMin = atof(token) * 255.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					ri.Printf(PRINT_WARNING, "WARNING: missing alphaGen s or tCoord parm 'max' in shader '%s'\n", shader.name);
-					continue;
-				}
-				stage->alphaConst = atof(token) * 255.0;
-			}
-			else if ( !Q_stricmp( token, "portal" ) )
-			{
-				stage->alphaGen = AGEN_PORTAL;
-				token = COM_ParseExt( text, qfalse );
-				if ( token[0] == 0 )
-				{
-					shader.portalRange = 256;
-					ri.Printf( PRINT_WARNING, "WARNING: missing range parameter for alphaGen portal in shader '%s', defaulting to 256\n", shader.name );
-				}
-				else
-				{
-					shader.portalRange = atof( token );
-				}
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown alphaGen parameter '%s' in shader '%s'\n", token, shader.name );
-				continue;
-			}
-		}
-		//
-		// tcGen <function>
-		//
-		else if ( !Q_stricmp(token, "texgen") || !Q_stricmp( token, "tcGen" ) ) 
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing texgen parm in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "environment" ) )
-			{
-				shader.needsNormal = qtrue;
-				stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED;
-            }
-            else if (!Q_stricmp(token, "environmentmodel"))
-            {
-                shader.needsNormal = qtrue;
-                stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED2;
-            }
-            else if (!Q_stricmp(token, "sunreflection"))
-            {
-                shader.needsNormal = qtrue;
-                stage->bundle[cntBundle].tcGen = TCGEN_SUN_REFLECTION;
-            }
-			else if ( !Q_stricmp( token, "lightmap" ) )
-			{
-				stage->bundle[cntBundle].tcGen = TCGEN_LIGHTMAP;
-			}
-			else if ( !Q_stricmp( token, "texture" ) || !Q_stricmp( token, "base" ) )
-			{
-				stage->bundle[cntBundle].tcGen = TCGEN_TEXTURE;
-			}
-			else if ( !Q_stricmp( token, "vector" ) )
-			{
-				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[0] );
-				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[1] );
-
-				stage->bundle[cntBundle].tcGen = TCGEN_VECTOR;
-			}
-			else 
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown texgen parm in shader '%s'\n", shader.name );
-			}
-		}
-		//
-		// tcMod <type> <...>
-		//
-		else if ( !Q_stricmp( token, "tcMod" ) )
-		{
-			char buffer[1024] = "";
-
-			while ( 1 )
-			{
-				token = COM_ParseExt( text, qfalse );
-				if ( token[0] == 0 )
-					break;
-				strcat( buffer, token );
-				strcat( buffer, " " );
-			}
-
-			ParseTexMod( buffer, stage, cntBundle );
-
-			continue;
-		}
-		//
-		// depthmask
-		//
-		else if ( !Q_stricmp( token, "depthwrite" ) || !Q_stricmp(token, "depthmask"))
-		{
-			depthMaskBits = GLS_DEPTHMASK_TRUE;
-			depthMaskExplicit = qtrue;
-
-			continue;
-        }
-        else if (!Q_stricmp(token, "nodepthwrite") || !Q_stricmp(token, "nodepthmask"))
-        {
-            depthMaskBits = 0;
-            depthMaskExplicit = qtrue;
-
-            continue;
-        }
-        else if (!Q_stricmp(token, "nocolorwrite") || !Q_stricmp(token, "nocolormask"))
-        {
-            colorBits = GLS_COLOR_NOMASK;
-
-            continue;
-        }
-		else if (!Q_stricmp(token, "noDepthTest"))
-		{
-			depthFuncBits = GLS_DEPTHTEST_DISABLE;
-			continue;
-        }
-        else if (!Q_stricmp(token, "nextBundle"))
-        {
-			if (!qglActiveTextureARB) {
-				ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
-				return qfalse;
-			}
-
-			token = COM_ParseExt(text, qfalse);
-			if (token[0] && !Q_stricmp(token, "add")) {
-				stage->multitextureEnv = GL_ADD;
-			} else {
-				stage->multitextureEnv = GL_MODULATE;
-			}
-
-			cntBundle++;
-			if (cntBundle > NUM_TEXTURE_BUNDLES) {
-				ri.Printf(PRINT_WARNING, "WARNING: too many nextBundle commands in shader '%s'\n", shader.name);
-				return qfalse;
-			}
-            continue;
-        }
-		//
-		// Added in 2.0
-		//
-		else if (!Q_stricmp(token, "ifCvar") || !Q_stricmp(token, "ifCvarnot"))
-		{
-			cvar_t* var;
-			qboolean isNot = token[6] != 0;
-			qboolean evaluatedValue;
-
-			token = COM_ParseExt(text, qfalse);
-			if (!token[0]) {
-				ri.Printf(PRINT_WARNING, "WARNING: missing cvar name in %s", isNot ? "ifCvarnot" : "ifCvar");
-				return qfalse;
-			}
-
-			var = ri.Cvar_Get(token, "0", 0);
-
-			token = COM_ParseExt(text, qfalse);
-			if (!token[0]) {
-				ri.Printf(PRINT_WARNING, "WARNING: missing cvar value in %s", isNot ? "ifCvarnot" : "ifCvar");
-				return qfalse;
-			}
-
-			if (atof(token) != var->value) {
-				evaluatedValue = qfalse;
-			} else if (var->value) {
-				evaluatedValue = qtrue;
-			} else if (token[0] == '0' || (token[0] == '.' && token[1] == '0')) {
-				evaluatedValue = qtrue;
-			} else if (!Q_stricmp(var->string, token)) {
-				evaluatedValue = qtrue;
-			} else {
-				return qfalse;
-			}
-
-			shouldProcess &= evaluatedValue ^ isNot;
-		}
-		else
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
-			return qfalse;
-		}
-	}
-
-	// Added in 2.0
-	//  Ignore vars that didn't met with 'ifCvar' / 'ifCvarnot'
-	if (!shouldProcess) {
-		stage->active = qfalse;
-		stage->rgbGen = CGEN_BAD;
-		return qtrue;
-	}
-
-	//
-	// if cgen isn't explicitly specified, use either identity or identitylighting
-	//
-	if ( stage->rgbGen == CGEN_BAD ) {
-		if (cntBundle || stage->bundle[0].isLightmap) {
-			stage->rgbGen = CGEN_IDENTITY;
-		} else if (blendSrcBits == 0 ||
-			blendSrcBits == GLS_SRCBLEND_ONE ||
-			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA) {
-			stage->rgbGen = CGEN_IDENTITY_LIGHTING;
-		} else {
-			stage->rgbGen = CGEN_IDENTITY;
-		}
-	}
-
-	//
-	// implicitly assume that a GL_ONE GL_ZERO blend mask disables blending
-	//
-	if ( ( blendSrcBits == GLS_SRCBLEND_ONE ) && 
-		 ( blendDstBits == GLS_DSTBLEND_ZERO ) )
-	{
-		blendDstBits = blendSrcBits = 0;
-		depthMaskBits = GLS_DEPTHMASK_TRUE;
-	}
-
-	if (depthFuncBits == GLS_DEPTHTEST_DISABLE) {
-		depthMaskBits = 0;
-	}
-
-	// decide which agens we can skip
-	if ( stage->alphaGen == AGEN_IDENTITY ) {
-		if ( stage->rgbGen == CGEN_IDENTITY
-			|| stage->rgbGen == CGEN_LIGHTING_GRID
-			|| stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) {
-			stage->alphaGen = AGEN_SKIP;
-		}
-	}
-
-	//
-	// compute state bits
-	//
-	stage->stateBits = depthMaskBits | 
-		               blendSrcBits | blendDstBits | 
-					   atestBits | 
-					   depthFuncBits |
-					   depthTestBits |
-					   colorBits |
-					   fogBits;
-
-	return qtrue;
-}
-
-/*
-===============
-ParseDeform
-
-deformVertexes wave <spread> <waveform> <base> <amplitude> <phase> <frequency>
-deformVertexes normal <frequency> <amplitude>
-deformVertexes move <vector> <waveform> <base> <amplitude> <phase> <frequency>
-deformVertexes bulge <bulgeWidth> <bulgeHeight> <bulgeSpeed>
-deformVertexes projectionShadow
-deformVertexes autoSprite
-deformVertexes autoSprite2
-deformVertexes text[0-7]
-===============
-*/
-static void ParseDeform( char **text ) {
-	char	*token;
-	deformStage_t	*ds;
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing deform parm in shader '%s'\n", shader.name );
-		return;
-	}
-
-	if ( shader.numDeforms == MAX_SHADER_DEFORMS ) {
-		ri.Printf( PRINT_WARNING, "WARNING: MAX_SHADER_DEFORMS in '%s'\n", shader.name );
-		return;
-	}
-
-	ds = &shader.deforms[ shader.numDeforms ];
-	shader.numDeforms++;
-
-	if ( !Q_stricmp( token, "autosprite" ) ) {
-		ds->deformation = DEFORM_AUTOSPRITE;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "autosprite2" ) ) {
-		ds->deformation = DEFORM_AUTOSPRITE2;
-		return;
-	}
-
-	if (!Q_stricmp(token, "lightglow")) {
-		ds->deformation = DEFORM_LIGHTGLOW;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "bulge" ) )	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->bulgeWidth = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->bulgeHeight = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->bulgeSpeed = atof( token );
-
-		ds->deformation = DEFORM_BULGE;
-		shader.needsNormal = qtrue;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "wave" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-			return;
-		}
-
-		if ( atof( token ) != 0 )
-		{
-			ds->deformationSpread = 1.0f / atof( token );
-		}
-		else
-		{
-			ds->deformationSpread = 100.0f;
-			ri.Printf( PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name );
-		}
-
-		ParseWaveForm( text, &ds->deformationWave );
-		ds->deformation = DEFORM_WAVE;
-		shader.needsNormal = qtrue;
-		return;
-	}
-
-	if (!Q_stricmp(token, "flap")) {
-		texDirection_t coordDirection;
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 's') {
-			coordDirection = USE_S_COORDS;
-		}
-		else if (token[0] == 't') {
-			coordDirection = USE_T_COORDS;
-		}
-		else {
-			ri.Printf(PRINT_WARNING, "WARNING: deformVertexes flap requires 's' or 't' in shader '%s'\n", shader.name);
-			return;
-		}
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0) {
-			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes flap parm in shader '%s'\n", shader.name);
-			return;
-		}
-
-		if (!atof(token)) {
-			ds->deformationSpread = 100.0;
-			ri.Printf(PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name);
-		}
-		else {
-			ds->deformationSpread = 1.0 / atof(token);
-		}
-
-		ParseWaveForm(text, &ds->deformationWave);
-
-		if (coordDirection == USE_T_COORDS) {
-			ds->deformation = DEFORM_FLAP_T;
-		}
-		else {
-			ds->deformation = DEFORM_FLAP_S;
-		}
-
-		shader.needsNormal = qtrue;
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0)
-		{
-			ds->bulgeWidth = 0.0;
-			ds->bulgeHeight = 1.0;
-			return;
-		}
-		ds->bulgeWidth = atof(token);
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0)
-		{
-			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes parm 'max' in shader '%s'\n\n", shader.name);
-			return;
-		}
-		ds->bulgeHeight = atof(token);
-		return;
-	}
-
-	if ( !Q_stricmp( token, "normal" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->deformationWave.amplitude = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->deformationWave.frequency = atof( token );
-
-		ds->deformation = DEFORM_NORMALS;
-		shader.needsNormal = qtrue;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "move" ) ) {
-		int		i;
-
-		for ( i = 0 ; i < 3 ; i++ ) {
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 ) {
-				ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-				return;
-			}
-			ds->moveVector[i] = atof( token );
-		}
-
-		ParseWaveForm( text, &ds->deformationWave );
-		ds->deformation = DEFORM_MOVE;
-		return;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: unknown deformVertexes subtype '%s' found in shader '%s'\n", token, shader.name );
-}
-
-
-/*
-===============
-ParseSkyParms
-
-skyParms <outerbox> <cloudheight> <innerbox>
-===============
-*/
-static void ParseSkyParms( char **text ) {
-	char		*token;
-	static char	*suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
-	char		pathname[MAX_QPATH];
-	int			i;
-
-	// outerbox
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
-		return;
-	}
-	if ( strcmp( token, "-" ) ) {
-		for (i=0 ; i<6 ; i++) {
-			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
-				, token, suf[i] );
-			if (!haveClampToEdge) {
-				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
-			}
-			else {
-				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
-			}
-			if ( !shader.sky.outerbox[i] ) {
-				shader.sky.outerbox[i] = tr.defaultImage;
-			}
-		}
-	}
-
-	// cloudheight
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
-		return;
-	}
-	shader.sky.cloudHeight = atof( token );
-	if ( !shader.sky.cloudHeight ) {
-		shader.sky.cloudHeight = 512;
-	}
-	R_InitSkyTexCoords( shader.sky.cloudHeight );
-
-
-	// innerbox
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
-		return;
-	}
-	if ( strcmp( token, "-" ) ) {
-		for (i=0 ; i<6 ; i++) {
-			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
-				, token, suf[i] );
-			shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, qtrue, qtrue, shader_force32bit, GL_REPEAT, GL_REPEAT );
-			if ( !shader.sky.innerbox[i] ) {
-				shader.sky.innerbox[i] = tr.defaultImage;
-			}
-		}
-	}
-
-	shader.isSky = qtrue;
-}
-
-
-/*
-=================
-ParseSort
-=================
-*/
-void ParseSort( char **text ) {
-	char	*token;
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: missing sort parameter in shader '%s'\n", shader.name );
-		return;
-	}
-
-	if ( !Q_stricmp( token, "portal" ) ) {
-		shader.sort = SS_PORTAL;
-	} else if ( !Q_stricmp( token, "sky" ) ) {
-		shader.sort = SS_ENVIRONMENT;
-	} else if ( !Q_stricmp( token, "opaque" ) ) {
-		shader.sort = SS_OPAQUE;
-	}else if ( !Q_stricmp( token, "decal" ) ) {
-		shader.sort = SS_DECAL;
-	} else if ( !Q_stricmp( token, "seeThrough" ) ) {
-		shader.sort = SS_SEE_THROUGH;
-	} else if ( !Q_stricmp( token, "banner" ) ) {
-		shader.sort = SS_BANNER;
-	} else if ( !Q_stricmp( token, "additive" ) ) {
-		shader.sort = SS_BLEND1;
-	} else if ( !Q_stricmp( token, "nearest" ) ) {
-		shader.sort = SS_NEAREST;
-	} else if ( !Q_stricmp( token, "underwater" ) ) {
-		shader.sort = SS_UNDERWATER;
-	} else {
-		shader.sort = atof( token );
-	}
-}
-
-
-
-// this table is also present in q3map
-
-typedef struct {
-	char	*name;
-	int		clearSolid, surfaceFlags, contents;
-} infoParm_t;
-
-infoParm_t	infoParms[] = {
-	// server relevant contents
-	{"water",		1,	0,	CONTENTS_WATER },
-	{"slime",		1,	0,	CONTENTS_SLIME },		// mildly damaging
-	{"lava",		1,	0,	CONTENTS_LAVA },		// very damaging
-	{"playerclip",	1,	0,	CONTENTS_PLAYERCLIP },
-	{"monsterclip",	1,	0,	CONTENTS_MONSTERCLIP },
-	{"fence",		1,	0,	CONTENTS_FENCE },
-	{"weaponclip",	1,	0,	CONTENTS_WEAPONCLIP },
-	{"vehicleclip",	1,	0,	CONTENTS_VEHICLECLIP },
-	{"nodrop",		1,	0,	CONTENTS_NODROP },		// don't drop items or leave bodies (death fog, lava, etc)
-	{"nonsolid",	1,	SURF_NONSOLID,	0 },		// clears the solid flag
-
-	// utility relevant attributes
-	{"origin",		1,	0,	CONTENTS_ORIGIN },		// center of rotating brushes
-	{"trans",		0,	0,	CONTENTS_TRANSLUCENT },	// don't eat contained surfaces
-	{"detail",		0,	0,	CONTENTS_DETAIL },		// don't include in structural bsp
-	{"structural",	0,	0,	CONTENTS_STRUCTURAL },	// force into structural bsp even if trnas
-	{"areaportal",	1,	0,	CONTENTS_AREAPORTAL },	// divides areas
-	{"fog",			1,	0,	CONTENTS_FOG},			// carves surfaces entering
-	{"sky",			0,	SURF_SKY,			0 },	// emit light from an environment map
-	{"alphashadow",	1,	SURF_ALPHASHADOW,	0 },	// carves surfaces entering
-
-	// server attributes
-	{"slick",		0,	SURF_SLICK,		0 },
-	{"noimpact",	0,	SURF_NOIMPACT,	0 },		// don't make impact explosions or marks
-	{"nomarks",		0,	SURF_NOMARKS,	0 },		// don't make impact marks, but still explode
-	{"ladder",		0,	SURF_LADDER,	0 },
-	{"nodamage",	0,	SURF_NODAMAGE,	0 },
-	{"nosteps",		0,	SURF_NOSTEPS,	0 },
-	{"paper",		0,	SURF_PAPER,		0 },
-	{"wood",		0,	SURF_WOOD,		0 },
-	{"metal",		0,	SURF_METAL,		0 },
-	{"rock",		0,	SURF_ROCK,		0 },
-	{"dirt",		0,	SURF_DIRT,		0 },
-	{"grill",		0,	SURF_GRILL,		0 },
-	{"grass",		0,	SURF_GRASS,		0 },
-	{"mud",			0,	SURF_MUD,		0 },
-	{"puddle",		0,	SURF_PUDDLE,	0 },
-	{"glass",		0,	SURF_GLASS,		0 },
-	{"gravel",		0,	SURF_GRAVEL,	0 },
-	{"sand",		0,	SURF_SAND,		0 },
-	{"foliage",		0,	SURF_FOLIAGE,	0 },
-	{"snow",		0,	SURF_SNOW,		0 },
-	{"carpet",		0,	SURF_CARPET,	0 },
-
-	// drawsurf attributes
-	{"nodraw",		0,	SURF_NODRAW,		0 },	// don't generate a drawsurface (or a lightmap)
-	{"castshadow",	0,	SURF_CASTSHADOW,	0 },	// sample lighting at vertexes
-	{"nolightmap",	0,	SURF_NOLIGHTMAP,	0 },	// don't generate a lightmap
-	{"nodlight",	0,	SURF_NODLIGHT,		0 },	// don't ever add dynamic lights
-	{"hint",		0,	SURF_HINT,		0}			// leave a dust trail when walking on this surface
-};
-
-
-/*
-===============
-ParseSurfaceParm
-
-surfaceparm <name>
-===============
-*/
-static void ParseSurfaceParm( char **text ) {
-	char	*token;
-	int		numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]);
-	int		i;
-
-	token = COM_ParseExt( text, qfalse );
-	for ( i = 0 ; i < numInfoParms ; i++ ) {
-		if ( !Q_stricmp( token, infoParms[i].name ) ) {
-			shader.surfaceFlags |= infoParms[i].surfaceFlags;
-			shader.contentFlags |= infoParms[i].contents;
-#if 0
-			if ( infoParms[i].clearSolid ) {
-				si->contents &= ~CONTENTS_SOLID;
-			}
-#endif
-			break;
-		}
-	}
-}
-
-/*
-=================
-ParseShader
-
-The current text pointer is at the explicit text definition of the
-shader.  Parse it into the global shader variable.  Later functions
-will optimize it.
-=================
-*/
-static qboolean ParseShader( char **text, qboolean picmip )
-{
-	char *token;
-	int s;
-	int matchingendifs;
-	qboolean bInElseBlock;
-
-	s = 0;
-	matchingendifs = 0;
-	bInElseBlock = qfalse;
-
-	token = COM_ParseExt( text, qtrue );
-	if ( token[0] != '{' )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: expecting '{', found '%s' instead in shader '%s'\n", token, shader.name );
-		return qfalse;
-	}
-
-	while ( 1 )
-	{
-		token = COM_ParseExt( text, qtrue );
-		if ( !token[0] )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: no concluding '}' in shader %s\n", shader.name );
-			return qfalse;
-		}
-
-		// end of shader definition
-		if ( token[0] == '}' )
-		{
-			break;
-		}
-		// stage definition
-		else if ( token[0] == '{' )
-		{
-			if ( !ParseStage( &unfoggedStages[s], text, picmip ) )
-			{
-				return qfalse;
-			}
-			if (unfoggedStages[s].rgbGen != CGEN_BAD) {
-				unfoggedStages[s].active = qtrue;
-				if (s > 0) {
-					if (!(unfoggedStages[s].stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))) {
-						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has opaque maps defined after stage 0!!!\n", shader.name);
-					}
-					if (unfoggedStages[s].stateBits & GLS_DEPTHMASK_TRUE) {
-						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has depthmask enabled after stage 0!!!\n", shader.name);
-					}
-				}
-			}
-			s++;
-			continue;
-		}
-		// skip stuff that only the QuakeEdRadient needs
-		else if ( !Q_stricmpn( token, "qer", 3 ) ) {
-			SkipRestOfLine( text );
-			continue;
-		}
-		// sun parms
-		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
-			float	a, b;
-
-			token = COM_ParseExt( text, qfalse );
-			tr.sunLight[0] = atof( token );
-			token = COM_ParseExt( text, qfalse );
-			tr.sunLight[1] = atof( token );
-			token = COM_ParseExt( text, qfalse );
-			tr.sunLight[2] = atof( token );
-			
-			VectorNormalize( tr.sunLight );
-
-			token = COM_ParseExt( text, qfalse );
-			a = atof( token );
-			VectorScale( tr.sunLight, a, tr.sunLight);
-
-			token = COM_ParseExt( text, qfalse );
-			a = atof( token );
-			a = a / 180 * M_PI;
-
-			token = COM_ParseExt( text, qfalse );
-			b = atof( token );
-			b = b / 180 * M_PI;
-
-			tr.sunDirection[0] = cos( a ) * cos( b );
-			tr.sunDirection[1] = sin( a ) * cos( b );
-			tr.sunDirection[2] = sin( b );
-		}
-		else if ( !Q_stricmp( token, "deformVertexes" ) ) {
-			ParseDeform( text );
-			continue;
-		}
-		else if ( !Q_stricmp( token, "tesssize" ) ) {
-			SkipRestOfLine( text );
-			continue;
-		}
-		else if ( !Q_stricmp( token, "clampTime" ) ) {
-			token = COM_ParseExt( text, qfalse );
-      if (token[0]) {
-        shader.clampTime = atof(token);
-      }
-    }
-		// skip stuff that only the q3map needs
-		else if ( !Q_stricmpn( token, "q3map", 5 ) ) {
-			SkipRestOfLine( text );
-			continue;
-		}
-		// skip stuff that only q3map or the server needs
-		else if ( !Q_stricmp( token, "surfaceParm" ) ) {
-			ParseSurfaceParm( text );
-			continue;
-		}
-		// no mip maps
-		else if ( !Q_stricmp( token, "nomipmaps" ) )
-		{
-			shader_noMipMaps = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if ( !Q_stricmp( token, "nopicmip" ) )
-		{
-			shader_noPicMip = qtrue;
-			continue;
-		}
-		// force 32 bit images
-		else if (!Q_stricmp(token, "force32bit"))
-		{
-			shader_force32bit = qtrue;
-			continue;
-		}
-		// polygonOffset
-		else if ( !Q_stricmp( token, "polygonOffset" ) )
-		{
-			shader.polygonOffset = qtrue;
-			continue;
-		}
-		// entityMergable, allowing sprite surfaces from multiple entities
-		// to be merged into one batch.  This is a savings for smoke
-		// puffs and blood, but can't be used for anything where the
-		// shader calcs (not the surface function) reference the entity color or scroll
-		else if ( !Q_stricmp( token, "entityMergable" ) )
-		{
-			shader.entityMergable = qtrue;
-			continue;
-			}
-		else if (!Q_stricmp(token, "noMerge"))
-		{
-			shader.flags |= 1;
-			continue;
-		}
-		// portal
-		else if ( !Q_stricmp(token, "portal") )
-		{
-			shader.sort = SS_PORTAL;
-			continue;
-		}
-		// skyparms <cloudheight> <outerbox> <innerbox>
-		else if ( !Q_stricmp( token, "skyparms" ) )
-		{
-			ParseSkyParms( text );
-			continue;
-		}
-		// portal
-		else if (!Q_stricmp(token, "portalsky"))
-		{
-			shader.sort = SS_PORTALSKY;
-			shader.isPortalSky = qtrue;
-			continue;
-		}
-		// light <value> determines flaring in q3map, not needed here
-		else if ( !Q_stricmp(token, "light") ) 
-		{
-			token = COM_ParseExt( text, qfalse );
-			continue;
-		}
-		else if (!Q_stricmp(token, "spritegen"))
-		{
-			token = COM_ParseExt(text, qfalse);
-			if (token[0] == 0) {
-				ri.Printf(PRINT_WARNING, "WARNING: missing spritegen parm in shader '%s'\n", shader.name);
-				continue;
-			}
-
-			if (!Q_stricmp(token, "parallel")) {
-				shader.sprite.type = SPRITE_PARALLEL;
-			} else if (!Q_stricmp(token, "parallel_oriented")) {
-				shader.sprite.type = SPRITE_PARALLEL_ORIENTED;
-			} else if (!Q_stricmp(token, "parallel_upright")) {
-				shader.sprite.type = SPRITE_PARALLEL_UPRIGHT;
-			} else if (!Q_stricmp(token, "oriented")) {
-				shader.sprite.type = SPRITE_ORIENTED;
-			}
-
-			shader.sprite.scale = 1.0;
-			continue;
-		}
-		else if (!Q_stricmp(token, "spritescale"))
-		{
-			token = COM_ParseExt(text, qfalse);
-			if (token[0] == 0) {
-				ri.Printf(PRINT_WARNING, "WARNING: missing spritescale parm in shader '%s'\n", shader.name);
-				continue;
-			}
-
-			shader.sprite.scale = atof(token);
-			continue;
-		}
-		// cull <face>
-		else if ( !Q_stricmp( token, "cull") ) 
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing cull parms in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "none" ) || !Q_stricmp( token, "twosided" ) || !Q_stricmp( token, "disable" ) )
-			{
-				shader.cullType = CT_TWO_SIDED;
-			}
-			else if ( !Q_stricmp( token, "back" ) || !Q_stricmp( token, "backside" ) || !Q_stricmp( token, "backsided" ) )
-			{
-				shader.cullType = CT_BACK_SIDED;
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: invalid cull parm '%s' in shader '%s'\n", token, shader.name );
-			}
-			continue;
-		}
-		// sort
-		else if ( !Q_stricmp( token, "sort" ) )
-		{
-			ParseSort( text );
-			continue;
-		}
-		else if (!Q_stricmp(token, "#if") || !Q_stricmp(token, "#if_not") || !Q_stricmp(token, "#else"))
-		{
-			qboolean conditionpassed;
-
-			conditionpassed = qfalse;
-			if (!Q_stricmp(token, "#else"))
-			{
-				if (bInElseBlock) {
-					ri.Printf(
-						PRINT_WARNING,
-						"WARNING: illegal #else after a previous #else in shader '%s'\n",
-						shader.name);
-				}
-
-				matchingendifs--;
-				if (matchingendifs < 0) {
-					ri.Printf(PRINT_WARNING, "WARNING: unmatched #else in shader '%s'\n", shader.name);
-				}
-
-				bInElseBlock = qtrue;
-			}
-			else
-			{
-				qboolean bInvertResult;
-
-				bInvertResult = !Q_stricmp(token, "#if_not");
-
-				token = COM_ParseExt(text, qfalse);
-				if (!Q_stricmp(token, "separate_env")) {
-					conditionpassed = r_textureDetails->integer != 0;
-				} else if (!Q_stricmp(token, "0") || !Q_stricmp(token, "false")) {
-					conditionpassed = qfalse;
-				} else if (!Q_stricmp(token, "1") || !Q_stricmp(token, "true")) {
-					conditionpassed = qtrue;
-				} else {
-					ri.Printf(
-						PRINT_WARNING,
-						"WARNING: invalid #if argument '%s' in shader '%s', not passing.\n",
-						token,
-						shader.name);
-				}
-
-				if (bInvertResult) {
-					conditionpassed = !conditionpassed;
-				}
-			}
-
-			if (!conditionpassed) {
-				int nestedifs = 0;
-
-				SkipRestOfLine(text);
-
-				while (1) {
-					token = COM_ParseExt(text, qtrue);
-					if (!token[0]) {
-						ri.Printf(PRINT_WARNING, "WARNING: no matching #endif in shader '%s'\n", shader.name);
-						break;
-					}
-
-					if (!Q_stricmp(token, "#if")) {
-						nestedifs++;
-						SkipRestOfLine(text);
-					} else if (!Q_stricmp(token, "#endif")) {
-						nestedifs--;
-					} else if (!Q_stricmp(token, "#else")) {
-						if (bInElseBlock) {
-							ri.Printf(
-								PRINT_WARNING,
-								"WARNING: illegal #else after a previous #else in shader '%s'\n",
-								shader.name);
-							break;
-						}
-
-						if (!nestedifs) {
-							matchingendifs++;
-							break;
-						}
-						nestedifs++;
-					} else {
-						SkipRestOfLine(text);
-					}
-
-					if (nestedifs == -1) {
-						break;
-					}
-				}
-			} else {
-				matchingendifs++;
-			}
-
-			continue;
-		}
-		else if (!Q_stricmp(token, "#endif"))
-		{
-			matchingendifs--;
-			if (matchingendifs < 0) {
-				ri.Printf(PRINT_WARNING, "WARNING: unmatched #endif in shader '%s'\n", shader.name);
-			}
-
-			bInElseBlock = qfalse;
-		}
-		else
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
-			return qfalse;
-		}
-	}
-
-	//
-	// ignore shaders that don't have any unfoggedStages, unless it is a sky or fog
-	//
-	if ( s == 0 && !shader.isSky && !(shader.contentFlags & CONTENTS_FOG) && !(shader.surfaceFlags & SURF_NODRAW)) {
-		return qfalse;
-	}
-
-	if (!(shader.flags & 2)) {
-		shader.flags &= ~1;
-	}
-
-	if ((shader.contentFlags & CONTENTS_FENCE) != 0 && shader.cullType == CT_TWO_SIDED) {
-		shader.cullType = CT_FRONT_SIDED;
-	}
-
-	shader.explicitlyDefined = qtrue;
-
-	return qtrue;
-}
-
-/*
-========================================================================================
-
-SHADER OPTIMIZATION AND FOGGING
-
-========================================================================================
-*/
-
-/*
-===================
-ComputeStageIteratorFunc
-
-See if we can use on of the simple fastpath stage functions,
-otherwise set to the generic stage function
-===================
-*/
-static void ComputeStageIteratorFunc( void )
-{
-	shader.optimalStageIteratorFunc = RB_StageIteratorGeneric;
-
-	//
-	// see if this should go into the sky path
-	//
-	if ( shader.isSky )
-	{
-		shader.optimalStageIteratorFunc = RB_StageIteratorSky;
-		goto done;
-	}
-
-	if ( r_ignoreFastPath->integer )
-	{
-		return;
-	}
-
-	//
-	// see if this can go into the vertex lit fast path
-	//
-	if ( shader.numUnfoggedPasses == 1 )
-	{
-		if ( unfoggedStages[0].rgbGen == CGEN_LIGHTING_GRID || unfoggedStages[0].rgbGen == CGEN_LIGHTING_SPHERICAL )
-		{
-			if ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP)
-			{
-				if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && !unfoggedStages[0].bundle[0].numTexMods)
-				{
-					if ( !shader.polygonOffset )
-					{
-						if ( !unfoggedStages[0].multitextureEnv )
-						{
-							if ( !shader.numDeforms )
-							{
-								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTextureUnfogged;
-								goto done;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	//
-	// see if this can go into an optimized LM, multitextured path
-	//
-	if ( shader.numUnfoggedPasses == 1 )
-	{
-		if ( ( unfoggedStages[0].rgbGen == CGEN_IDENTITY ) && ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP ) )
-		{
-			if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && 
-				unfoggedStages[0].bundle[1].tcGen == TCGEN_LIGHTMAP )
-			{
-				if ( !shader.polygonOffset )
-				{
-					if ( !shader.numDeforms )
-					{
-						if (unfoggedStages[0].multitextureEnv )
-						{
-							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitextureUnfogged;
-							goto done;
-						}
-					}
-				}
-			}
-		}
-	}
-
-done:
-	return;
-}
-
-typedef struct {
-	int		blendA;
-	int		blendB;
-
-	int		multitextureEnv;
-	int		multitextureBlend;
-} collapse_t;
-
-static collapse_t	collapse[] = {
-	{ 0, GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO,	
-		GL_MODULATE, 0 },
-
-	{ 0, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR,
-		GL_MODULATE, 0 },
-
-	{ GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR, GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO, GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ 0, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE,
-		GL_ADD, 0 },
-
-	{ GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE,
-		GL_ADD, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE },
-#if 0
-	{ 0, GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA,
-		GL_DECAL, 0 },
-#endif
-	{ -1 }
-};
-
-/*
-================
-CollapseMultitexture
-
-Attempt to combine two unfoggedStages into a single multitexture stage
-FIXME: I think modulated add + modulated add collapses incorrectly
-=================
-*/
-static void CollapseMultitexture(int *stagecounter) {
-	int iUseCollapse;
-	int stagenum;
-	int abits, bbits;
-	shaderStage_t* stage;
-	textureBundle_t tmpBundle;
-
-	for (stagenum = 0; stagenum < *stagecounter - 1; stagenum++) {
-		stage = &unfoggedStages[stagenum];
-
-		// make sure both unfoggedStages are active
-		if (!stage[0].active || !stage[1].active) {
-			continue;
-		}
-
-		if (stage->multitextureEnv) {
-			continue;
-		}
-
-		// on voodoo2, don't combine different tmus
-		if (glConfig.driverType == GLDRV_VOODOO) {
-			if (stage[1].bundle[0].image[0]->TMU ==
-				unfoggedStages[stagenum].bundle[0].image[0]->TMU) {
-				continue;
-			}
-		}
-
-		abits = stage[0].stateBits;
-		bbits = stage[1].stateBits;
-
-		// make sure that both unfoggedStages have identical state other than blend modes
-		if (
-			(abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)) !=
-			(bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE))
-            && (bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)
-					& abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)
-					& ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHFUNC_EQUAL | GLS_DEPTHMASK_TRUE)
-				|| !(abits & GLS_DEPTHMASK_TRUE)
-				|| !(bbits & GLS_DEPTHFUNC_EQUAL))
-			) {
-			continue;
-		}
-
-		abits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
-		bbits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
-
-		// search for a valid multitexture blend function
-		for (iUseCollapse = 0; collapse[iUseCollapse].blendA != -1; iUseCollapse++) {
-			if (abits == collapse[iUseCollapse].blendA
-				&& bbits == collapse[iUseCollapse].blendB) {
-				break;
-			}
-		}
-
-		// nothing found
-		if (collapse[iUseCollapse].blendA == -1) {
-			continue;
-		}
-
-		// GL_ADD is a separate extension
-		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && !glConfig.textureEnvAddAvailable) {
-			continue;
-		}
-
-		// make sure waveforms have identical parameters
-		if ((stage->rgbGen != unfoggedStages[stagenum + 1].rgbGen) ||
-			(stage->alphaGen != unfoggedStages[stagenum + 1].alphaGen)) {
-			continue;
-		}
-
-		// an add collapse can only have identity colors
-		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && stage->rgbGen != CGEN_IDENTITY) {
-			continue;
-		}
-
-		if (stage->rgbGen == CGEN_WAVEFORM)
-		{
-			if (memcmp(&stage->rgbWave,
-				&unfoggedStages[stagenum + 1].rgbWave,
-				sizeof(stage->rgbWave)))
-			{
-				continue;
-			}
-		}
-		if (stage->alphaGen == CGEN_WAVEFORM)
-		{
-			if (memcmp(&stage->alphaWave,
-				&unfoggedStages[stagenum + 1].alphaWave,
-				sizeof(stage->alphaWave)))
-			{
-				continue;
-			}
-		}
-
-
-		// make sure that lightmaps are in bundle 1 for 3dfx
-		if (stage->bundle[0].isLightmap)
-		{
-			tmpBundle = stage->bundle[0];
-			stage->bundle[0] = stage[1].bundle[0];
-			stage->bundle[1] = tmpBundle;
-		}
-		else
-		{
-			stage->bundle[1] = stage[1].bundle[0];
-		}
-
-		// set the new blend state bits
-		stage->multitextureEnv = collapse[iUseCollapse].multitextureEnv;
-		stage->stateBits &= ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
-		stage->stateBits |= collapse[iUseCollapse].multitextureBlend;
-
-		//
-		// move down subsequent shaders
-		//
-		if (stagenum + 2 < MAX_SHADER_STAGES) {
-			memmove(&unfoggedStages[stagenum + 1], &unfoggedStages[stagenum + 2], sizeof(unfoggedStages[0]) * (MAX_SHADER_STAGES - 2 - stagenum));
-		}
-
-		Com_Memset(&unfoggedStages[MAX_SHADER_STAGES - 1], 0, sizeof(unfoggedStages[0]));
-		(*stagecounter)--;
-	}
-}
-
-/*
-=============
-
-FixRenderCommandList
-https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=493
-Arnout: this is a nasty issue. Shaders can be registered after drawsurfaces are generated
-but before the frame is rendered. This will, for the duration of one frame, cause drawsurfaces
-to be rendered with bad shaders. To fix this, need to go through all render commands and fix
-sortedIndex.
-==============
-*/
-static void FixRenderCommandList( int newShader ) {
-	renderCommandList_t	*cmdList = &backEndData[tr.smpFrame]->commands;
-
-	if( cmdList ) {
-		const void *curCmd = cmdList->cmds;
-
-		while ( 1 ) {
-			switch ( *(const int *)curCmd ) {
-			case RC_SET_COLOR:
-				{
-				const setColorCommand_t *sc_cmd = (const setColorCommand_t *)curCmd;
-				curCmd = (const void *)(sc_cmd + 1);
-				break;
-				}
-			case RC_STRETCH_PIC:
-				{
-				const stretchPicCommand_t *sp_cmd = (const stretchPicCommand_t *)curCmd;
-				curCmd = (const void *)(sp_cmd + 1);
-				break;
-				}
-			case RC_DRAW_SURFS:
-				{
-				int i;
-				drawSurf_t	*drawSurf;
-				shader_t	*shader;
-				int			fogNum;
-				int			entityNum;
-				int			dlightMap;
-				int			sortedIndex;
-				const drawSurfsCommand_t *ds_cmd =  (const drawSurfsCommand_t *)curCmd;
-
-				for( i = 0, drawSurf = ds_cmd->drawSurfs; i < ds_cmd->numDrawSurfs; i++, drawSurf++ ) {
-					R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlightMap );
-                    sortedIndex = (( drawSurf->sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1));
-					if( sortedIndex >= newShader ) {
-						sortedIndex++;
-						drawSurf->sort = (sortedIndex << QSORT_SHADERNUM_SHIFT) | entityNum | ( fogNum << QSORT_FOGNUM_SHIFT ) | (int)dlightMap;
-					}
-				}
-				curCmd = (const void *)(ds_cmd + 1);
-				break;
-				}
-			case RC_DRAW_BUFFER:
-				{
-				const drawBufferCommand_t *db_cmd = (const drawBufferCommand_t *)curCmd;
-				curCmd = (const void *)(db_cmd + 1);
-				break;
-				}
-			case RC_SWAP_BUFFERS:
-				{
-				const swapBuffersCommand_t *sb_cmd = (const swapBuffersCommand_t *)curCmd;
-				curCmd = (const void *)(sb_cmd + 1);
-				break;
-				}
-			case RC_END_OF_LIST:
-			default:
-				return;
-			}
-		}
-	}
-}
-
-/*
-==============
-SortNewShader
-
-Positions the most recently created shader in the tr.sortedShaders[]
-array so that the shader->sort key is sorted reletive to the other
-shaders.
-
-Sets shader->sortedIndex
-==============
-*/
-static void SortNewShader( void ) {
-	int		i;
-	float	sort;
-	shader_t	*newShader;
-
-	newShader = tr.shaders[ tr.numShaders - 1 ];
-	sort = newShader->sort;
-
-	for ( i = tr.numShaders - 2 ; i >= 0 ; i-- ) {
-		if ( tr.sortedShaders[ i ]->sort <= sort ) {
-			break;
-		}
-		tr.sortedShaders[i+1] = tr.sortedShaders[i];
-		tr.sortedShaders[i+1]->sortedIndex++;
-	}
-
-	newShader->sortedIndex = i+1;
-	tr.sortedShaders[i+1] = newShader;
-}
-
-
-/*
-====================
-GeneratePermanentShader
-====================
-*/
-static shader_t *GeneratePermanentShader( void ) {
-	shader_t	*newShader;
-	int			i, b;
-	int			size;
-
-	if ( tr.numShaders == MAX_SHADERS ) {
-		ri.Printf( PRINT_WARNING, "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
-		return tr.defaultShader;
-	}
-
-	newShader = ri.Hunk_Alloc( sizeof( shader_t ), h_dontcare);
-
-	*newShader = shader;
-	newShader->next = currentShader->shader;
-	currentShader->shader = newShader;
-
-	tr.shaders[ tr.numShaders ] = newShader;
-	newShader->index = tr.numShaders;
-	
-	tr.sortedShaders[ tr.numShaders ] = newShader;
-	newShader->sortedIndex = tr.numShaders;
-
-	tr.numShaders++;
-
-	for ( i = 0 ; i < newShader->numUnfoggedPasses ; i++ ) {
-		if ( !unfoggedStages[i].active ) {
-			break;
-		}
-		newShader->unfoggedStages[i] = ri.Hunk_Alloc( sizeof( unfoggedStages[i] ), h_dontcare );
-		*newShader->unfoggedStages[i] = unfoggedStages[i];
-
-		for ( b = 0 ; b < NUM_TEXTURE_BUNDLES ; b++ ) {
-			size = newShader->unfoggedStages[i]->bundle[b].numTexMods * sizeof( texModInfo_t );
-			if (size) {
-				newShader->unfoggedStages[i]->bundle[b].texMods = ri.Hunk_Alloc(size, h_dontcare);
-				Com_Memcpy(newShader->unfoggedStages[i]->bundle[b].texMods, unfoggedStages[i].bundle[b].texMods, size);
-			}
-		}
-	}
-
-	SortNewShader();
-
-	currentShader = NULL;
-
-	return newShader;
-}
-
-/*
-=================
-VertexLightingCollapse
-
-If vertex lighting is enabled, only render a single
-pass, trying to guess which is the correct one to best aproximate
-what it is supposed to look like.
-=================
-*/
-static void VertexLightingCollapse( void ) {
-	int		stage;
-	shaderStage_t	*bestStage;
-	int		bestImageRank;
-	int		rank;
-
-	// if we aren't opaque, just use the first pass
-	if ( shader.sort == SS_OPAQUE ) {
-
-		// pick the best texture for the single pass
-		bestStage = &unfoggedStages[0];
-		bestImageRank = -999999;
-
-		for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
-			shaderStage_t *pStage = &unfoggedStages[stage];
-
-			if ( !pStage->active ) {
-				break;
-			}
-			rank = 0;
-
-			if ( pStage->bundle[0].isLightmap ) {
-				rank -= 100;
-			}
-			if ( pStage->bundle[0].tcGen != TCGEN_TEXTURE ) {
-				rank -= 5;
-			}
-			if ( pStage->bundle[0].numTexMods ) {
-				rank -= 5;
-			}
-			if ( pStage->rgbGen != CGEN_IDENTITY && pStage->rgbGen != CGEN_IDENTITY_LIGHTING ) {
-				rank -= 3;
-			}
-
-			if ( rank > bestImageRank  ) {
-				bestImageRank = rank;
-				bestStage = pStage;
-			}
-		}
-
-		unfoggedStages[0].bundle[0] = bestStage->bundle[0];
-		unfoggedStages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-		unfoggedStages[0].stateBits |= GLS_DEPTHMASK_TRUE;
-		if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-			unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
-		} else {
-			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
-		}
-		unfoggedStages[0].alphaGen = AGEN_SKIP;		
-	} else {
-		// don't use a lightmap (tesla coils)
-		if ( unfoggedStages[0].bundle[0].isLightmap ) {
-			unfoggedStages[0] = unfoggedStages[1];
-		}
-
-		// if we were in a cross-fade cgen, hack it to normal
-		if ( unfoggedStages[0].rgbGen == CGEN_ONE_MINUS_ENTITY || unfoggedStages[1].rgbGen == CGEN_ONE_MINUS_ENTITY ) {
-			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		}
-		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_SAWTOOTH )
-			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_INVERSE_SAWTOOTH ) ) {
-			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		}
-		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_INVERSE_SAWTOOTH )
-			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_SAWTOOTH ) ) {
-			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		}
-	}
-
-	for ( stage = 1; stage < MAX_SHADER_STAGES; stage++ ) {
-		shaderStage_t *pStage = &unfoggedStages[stage];
-
-		if ( !pStage->active ) {
-			break;
-		}
-
-		Com_Memset( pStage, 0, sizeof( *pStage ) );
-	}
-}
-
-/*
-=========================
-FinishShader
-
-Returns a freshly allocated shader with all the needed info
-from the current global working shader
-=========================
-*/
-static shader_t *FinishShader( void ) {
-	int stage;
-	int i;
-	int bundle;
-	qboolean hasLightmapStage;
-
-	if (!currentShader) {
-		currentShader = FindShaderText(shader.name);
-	}
-
-    if (shader.defaultShader)
-    {
-        currentShader->shader = tr.defaultShader;
-        currentShader = NULL;
-        return tr.defaultShader;
-    }
-
-	hasLightmapStage = qfalse;
-
-	//
-	// set sky stuff appropriate
-	//
-	if ( shader.isPortalSky ) {
-		shader.sort = SS_PORTALSKY;
-	}
-	if ( shader.isSky ) {
-		shader.sort = SS_ENVIRONMENT;
-	}
-
-	//
-	// set polygon offset
-	//
-	if ( shader.polygonOffset && !shader.sort ) {
-		shader.sort = SS_DECAL;
-	}
-
-	shader.needsLGrid = qfalse;
-	shader.needsLSpherical = qfalse;
-
-	//
-	// set appropriate stage information
-	//
-	stage = 0;
-	for (shaderStage_t* pStage = &unfoggedStages[0]; pStage->active; pStage++, stage++) {
-		// check for a missing texture
-		if ( !pStage->bundle[0].image[0] ) {
-			ri.Printf( PRINT_WARNING, "Shader %s has a stage with no image\n", shader.name );
-			pStage->active = qfalse;
-			continue;
-		}
-
-		if (pStage->rgbGen == CGEN_LIGHTING_GRID) {
-			shader.needsLGrid = qtrue;
-		} else if (pStage->rgbGen == CGEN_LIGHTING_SPHERICAL || pStage->rgbGen == CGEN_STATIC) {
-			shader.needsLSpherical = qtrue;
-		}
-
-		//
-		// default texture coordinate generation
-		//
-		for (bundle = 0; bundle < 2; bundle++) {
-			if (pStage->bundle[bundle].isLightmap) {
-				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
-					pStage->bundle[bundle].tcGen = TCGEN_LIGHTMAP;
-				}
-				hasLightmapStage = qtrue;
-			}
-			else {
-				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
-					pStage->bundle[bundle].tcGen = TCGEN_TEXTURE;
-				}
-			}
-		}
-
-		if (pStage->multitextureEnv && pStage->bundle[0].isLightmap) {
-			//
-			// exchange bundle
-			//
-			textureBundle_t tmpBundle = pStage->bundle[0];
-			pStage->bundle[0] = pStage->bundle[1];
-			pStage->bundle[1] = tmpBundle;
-		}
-	}
-
-	//
-	// if we are in r_vertexLight mode, never use a lightmap texture
-	//
-	if (stage > 1)
-	{
-		if (r_vertexLight->integer) {
-			VertexLightingCollapse();
-			stage = 1;
-			hasLightmapStage = qfalse;
-		}
-
-		//
-		// look for multitexture potential
-		//
-		if (qglActiveTextureARB) {
-			CollapseMultitexture(&stage);
-		}
-	}
-
-	for (i = 0; i < stage; i++) {
-		int blendSrcBits, blendDstBits;
-
-		shaderStage_t* pStage = &unfoggedStages[i];
-		if (pStage->stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))
-		{
-			blendSrcBits = pStage->stateBits & GLS_SRCBLEND_BITS;
-			blendDstBits = pStage->stateBits & GLS_DSTBLEND_BITS;
-			if (blendSrcBits == GLS_SRCBLEND_ONE && blendDstBits == GLS_DSTBLEND_ONE
-				|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_COLOR
-				|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE
-				|| blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE
-				|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE)
-			{
-				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_BLACK;
-			}
-			else if (blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ZERO
-					|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_SRC_COLOR)
-			{
-				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_WHITE;
-			}
-			else if (blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA
-					|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_SRC_ALPHA
-					|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE)
-			{
-				pStage->stateBits |= GLS_FOG_ENABLED;
-			}
-			else {
-				ri.Printf(PRINT_WARNING, "Shader '%s' stage# %i is unfoggable\n", shader.name, i + 1);
-			}
-
-			if (shader.sort == SS_BAD)
-			{
-				if (pStage->stateBits & GLS_DEPTHMASK_TRUE) {
-					shader.sort = SS_SEE_THROUGH;
-				}
-				else {
-					shader.sort = SS_BLEND0;
-				}
-			}
-		}
-		else {
-			pStage->stateBits |= GLS_FOG_ENABLED;
-
-			if (shader.sort == SS_BAD) {
-				shader.sort = SS_OPAQUE;
-			}
-		}
-
-		if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
-			pStage->stateBits &= ~GLS_FOG_ENABLED;
-		}
-	}
-
-	// fogonly shaders don't have any normal passes
-	if (shader.sort == SS_BAD) {
-		shader.sort = SS_OPAQUE;
-	}
-
-	if (shader.lightmapIndex >= 0 && !hasLightmapStage) {
-		ri.Printf(PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name);
-		shader.lightmapIndex = LIGHTMAP_NONE;
-	}
-
-	//
-	// compute number of passes
-	//
-	shader.numUnfoggedPasses = 0;
-	for (stage = 0; stage < MAX_SHADER_STAGES; stage++) {
-		shaderStage_t* pStage = &unfoggedStages[stage];
-		if (!pStage->active) {
-			break;
-		}
-
-		shader.numUnfoggedPasses++;
-	}
-
-	// determine which stage iterator function is appropriate
-	ComputeStageIteratorFunc();
-
-	return GeneratePermanentShader();
-}
-
-//========================================================================================
-
-/*
-===============
-R_FindShader
-
-Will always return a valid shader, but it might be the
-default shader if the real one can't be found.
-
-In the interest of not requiring an explicit shader text entry to
-be defined for every single image used in the game, three default
-shader behaviors can be auto-created for any image:
-
-If lightmapIndex == LIGHTMAP_NONE, then the image will have
-dynamic diffuse lighting applied to it, as apropriate for most
-entity skin surfaces.
-
-If lightmapIndex == LIGHTMAP_2D, then the image will be used
-for 2D rendering unless an explicit shader is found
-
-If lightmapIndex == LIGHTMAP_BY_VERTEX, then the image will use
-the vertex rgba modulate values, as apropriate for misc_model
-pre-lit surfaces.
-
-Other lightmapIndex values will have a lightmap stage created
-and src*dest blending applied with the texture, as apropriate for
-most world construction surfaces.
-
-===============
-*/
-shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy) {
-	char		strippedName[MAX_QPATH];
-	char		fileName[MAX_QPATH];
-	int			i, j, hash;
-	char		*shaderText;
-	image_t		*image;
-	shader_t	*sh;
-
-	if ( name[0] == 0 ) {
-		return tr.defaultShader;
-	}
-
-	// use (fullbright) vertex lighting if the bsp file doesn't have
-	// lightmaps
-	if ( lightmapIndex >= 0 && lightmapIndex >= tr.numLightmaps ) {
-		lightmapIndex = LIGHTMAP_BY_VERTEX;
-	}
-
-	COM_StripExtension( name, strippedName, sizeof(strippedName));
-
-	hash = generateHashValue(strippedName);
-
-	//
-	// see if the shader is already loaded
-	//
-	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
-		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
-		// have to check all default shaders otherwise for every call to R_FindShader
-		// with that same strippedName a new default shader is created.
-        if (!Q_stricmp(currentShader->name, strippedName))
-		{
-			// shader text found, but it has no shared assigned
-			break;
-		}
-	}
-
-	if (currentShader)
-	{
-		for (sh = currentShader->shader; sh; sh = sh->next)
-		{
-			if (sh->lightmapIndex == lightmapIndex || sh == tr.defaultShader) {
-				return sh;
-			}
-		}
-	}
-	else
-	{
-		// create a new shader text
-		currentShader = AddShaderTextToHash(strippedName, hash);
-	}
-
-	// make sure the render thread is stopped, because we are probably
-	// going to have to upload an image
-	if (r_smp->integer) {
-		R_SyncRenderThread();
-	}
-
-	// clear the global shader
-	Com_Memset( &shader, 0, sizeof( shader ) );
-    Com_Memset(&unfoggedStages, 0, sizeof(unfoggedStages));
-    Com_Memset(&texMods, 0, sizeof(texMods));
-
-    shader.sprite.scale = 1.0;
-    shader_noPicMip = qfalse;
-    shader_noMipMaps = qfalse;
-    shader_force32bit = qfalse;
-	Q_strncpyz(shader.name, strippedName, sizeof(shader.name));
-	shader.lightmapIndex = lightmapIndex;
-	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
-        for (j = 0; j < NUM_TEXTURE_BUNDLES; j++) {
-            unfoggedStages[i].bundle[j].texMods = texMods[i];
-		}
-	}
-
-	// FIXME: set these "need" values apropriately
-	shader.needsNormal = qfalse;
-	shader.needsST1 = qtrue;
-	shader.needsST2 = qtrue;
-	shader.needsColor = qtrue;
-
-	//
-	// attempt to define shader from an explicit parameter file
-	//
-	if ( currentShader->text ) {
-		shaderText = currentShader->text;
-		// enable this when building a pak file to get a global list
-		// of all explicit shaders
-		if ( r_printShaders->integer ) {
-			ri.Printf( PRINT_ALL, "*SHADER* %s\n", name );
-		}
-
-		if ( !ParseShader( &shaderText, picmip ) ) {
-			// had errors, so use default shader
-			shader.defaultShader = qtrue;
-		}
-
-		if (shader.lightmapIndex == LIGHTMAP_BY_VERTEX && !(shader.surfaceFlags & SURF_HINT)) {
-			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
-		}
-
-		sh = FinishShader();
-		return sh;
-	}
-
-	//
-	// if not defined in the in-memory shader descriptions,
-	// look for a single TGA, BMP, or PCX
-	//
-	Q_strncpyz( fileName, name, sizeof( fileName ) );
-	COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" );
-    if (!haveClampToEdge) {
-        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
-	}
-    else {
-        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP_TO_EDGE, wrapy ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-	}
-
-	if ( !image ) {
-		ri.Printf( PRINT_WARNING, "Couldn't find image for shader %s\n", name );
-		shader.defaultShader = qtrue;
-		return FinishShader();
-	}
-
-	//
-	// create the default shading commands
-	//
-	if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-		// dynamic colors at vertexes
-		unfoggedStages[0].bundle[0].image[0] = image;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_BY_VERTEX ) {
-		// explicit colors at vertexes
-		unfoggedStages[0].bundle[0].image[0] = image;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
-		unfoggedStages[0].alphaGen = AGEN_SKIP;
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_2D ) {
-		// GUI elements
-		unfoggedStages[0].bundle[0].image[0] = image;
-        unfoggedStages[0].active = qtrue;
-        unfoggedStages[0].force32bit = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_GLOBAL_COLOR;
-		unfoggedStages[0].alphaGen = AGEN_GLOBAL_ALPHA;
-		unfoggedStages[0].stateBits = GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-	} else if ( shader.lightmapIndex == LIGHTMAP_WHITEIMAGE ) {
-		// fullbright level
-		unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-
-		unfoggedStages[1].bundle[0].image[0] = image;
-		unfoggedStages[1].active = qtrue;
-		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
-		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	} else {
-		// two pass lightmap
-		unfoggedStages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
-		unfoggedStages[0].bundle[0].isLightmap = qtrue;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
-													// for identitylight
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-
-		unfoggedStages[1].bundle[0].image[0] = image;
-		unfoggedStages[1].active = qtrue;
-		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
-		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	}
-
-	return FinishShader();
-}
-
-/* 
-====================
-RE_RegisterShader
-
-This is the exported shader entry point for the rest of the system
-It will always return an index that will be valid.
-
-This should really only be used for explicit shaders, because there is no
-way to ask for different implicit lighting modes (vertex, lightmap, etc)
-====================
-*/
-qhandle_t RE_RegisterShader( const char *name ) {
-	shader_t	*sh;
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	sh = R_FindShader( name, LIGHTMAP_2D, qtrue, qtrue, qtrue, qtrue);
-
-	// we want to return 0 if the shader failed to
-	// load for some reason, but R_FindShader should
-	// still keep a name allocated for it, so if
-	// something calls RE_RegisterShader again with
-	// the same name, we don't try looking for it again
-	if ( sh->defaultShader ) {
-		return 0;
-	}
-
-	return sh->index;
-}
-
-
-/*
-====================
-RE_RegisterShaderNoMip
-
-For menu graphics that should never be picmiped
-====================
-*/
-qhandle_t RE_RegisterShaderNoMip( const char *name ) {
-	shader_t	*sh;
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	sh = R_FindShader( name, LIGHTMAP_2D, qfalse, qfalse, qfalse, qfalse );
-
-	// we want to return 0 if the shader failed to
-	// load for some reason, but R_FindShader should
-	// still keep a name allocated for it, so if
-	// something calls RE_RegisterShader again with
-	// the same name, we don't try looking for it again
-	if ( sh->defaultShader ) {
-		return 0;
-	}
-
-	return sh->index;
-}
-
-qhandle_t RE_RefreshShaderNoMip(const char* name) {
-	shader_t* sh;
-	char strippedName[64];
-	int hash;
-
-	if (!name || !*name) {
-		return 0;
-	}
-
-    COM_StripExtension(name, strippedName, sizeof(strippedName));
-
-	hash = generateHashValue(strippedName);
-
-	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
-		if (!Q_stricmp(currentShader->name, strippedName)) {
-			if (currentShader) {
-				image_t* image;
-
-				sh = currentShader->shader;
-				image = sh->unfoggedStages[0]->bundle[0].image[0];
-				currentShader = NULL;
-
-				if (image) {
-					sh->unfoggedStages[0]->bundle[0].image[0] = R_RefreshImageFile(
-						image->imgName,
-						image->numMipmaps,
-						image->allowPicmip,
-						image->force32bit,
-						image->wrapClampModeX,
-						image->wrapClampModeY
-					);
-				}
-
-				return sh->index;
-			}
-
-			break;
-		}
-	}
-
-    sh = R_FindShader(name, -4, 0, 0, 0, 0);
-	if (sh->defaultShader) {
-		return 0;
-	}
-
-    return sh->index;
-}
-
-/*
-====================
-R_GetShaderByHandle
-
-When a handle is passed in by another module, this range checks
-it and returns a valid (possibly default) shader_t to be used internally.
-====================
-*/
-shader_t *R_GetShaderByHandle( qhandle_t hShader ) {
-	if ( hShader < 0 ) {
-	  ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader ); // bk: FIXME name
-		return tr.defaultShader;
-	}
-	if ( hShader >= tr.numShaders ) {
-		ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
-		return tr.defaultShader;
-	}
-	return tr.shaders[hShader];
-}
-
-/*
-===============
-R_ShaderList_f
-
-Dump information on all valid shaders to the console
-A second parameter will cause it to print in sorted order
-===============
-*/
-void	R_ShaderList_f (void) {
-	int			i;
-	int			count;
-	shader_t	*shader;
-
-	ri.Printf (PRINT_ALL, "-----------------------\n");
-
-	count = 0;
-	for ( i = 0 ; i < tr.numShaders ; i++ ) {
-		int stage;
-
-		if ( ri.Cmd_Argc() > 1 ) {
-			shader = tr.sortedShaders[i];
-		} else {
-			shader = tr.shaders[i];
-		}
-
-		ri.Printf( PRINT_ALL, "%i ", shader->numUnfoggedPasses );
-
-		if (shader->lightmapIndex >= 0 ) {
-			ri.Printf (PRINT_ALL, "L ");
-		} else {
-			ri.Printf (PRINT_ALL, "  ");
-		}
-
-		for (stage = 0; shader->unfoggedStages[stage] && shader->unfoggedStages[stage]->active; stage++) {
-			if (shader->unfoggedStages[stage]->multitextureEnv == GL_ADD ) {
-				ri.Printf( PRINT_ALL, "MT(a) " );
-			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_MODULATE ) {
-				ri.Printf( PRINT_ALL, "MT(m) " );
-			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_DECAL ) {
-				ri.Printf( PRINT_ALL, "MT(d) " );
-			} else {
-				ri.Printf( PRINT_ALL, "      " );
-			}
-		}
-
-		if ( shader->explicitlyDefined ) {
-			ri.Printf( PRINT_ALL, "E " );
-		} else {
-			ri.Printf( PRINT_ALL, "  " );
-		}
-
-		if ( shader->optimalStageIteratorFunc == RB_StageIteratorGeneric ) {
-			ri.Printf( PRINT_ALL, "gen " );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorSky ) {
-			ri.Printf( PRINT_ALL, "sky " );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorLightmappedMultitextureUnfogged ) {
-			ri.Printf( PRINT_ALL, "lmmt" );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorVertexLitTextureUnfogged ) {
-			ri.Printf( PRINT_ALL, "vlt " );
-		} else {
-			ri.Printf( PRINT_ALL, "    " );
-		}
-
-		if ( shader->defaultShader ) {
-			ri.Printf (PRINT_ALL,  ": %s (DEFAULTED)\n", shader->name);
-		} else {
-			ri.Printf (PRINT_ALL,  ": %s\n", shader->name);
-		}
-		count++;
-	}
-	ri.Printf (PRINT_ALL, "%i total shaders\n", count);
-	ri.Printf (PRINT_ALL, "------------------\n");
-}
-
-
-/*
-====================
-ScanAndLoadShaderFiles
-
-Finds and loads all .shader files, combining them into
-a single large text block that can be scanned for shader names
-=====================
-*/
-#define	MAX_SHADER_FILES	4096
-static void ScanAndLoadShaderFiles( void )
-{
-    char** shaderFiles;
-    char* buffers[MAX_SHADER_FILES];
-    char* p;
-    int numShaders;
-    int i;
-
-    long sum = 0;
-    // scan for shader files
-    shaderFiles = ri.FS_ListFiles("scripts/", ".shader", &numShaders);
-
-    if (!shaderFiles || !numShaders)
-    {
-        ri.Printf(PRINT_WARNING, "WARNING: no shader files found\n");
-        return;
-    }
-
-    if (numShaders > MAX_SHADER_FILES) {
-        numShaders = MAX_SHADER_FILES;
-    }
-
-    // load and parse shader files
-    for (i = 0; i < numShaders; i++)
-    {
-        char filename[MAX_QPATH];
-
-        Com_sprintf(filename, sizeof(filename), "scripts/%s", shaderFiles[i]);
-        ri.Printf(PRINT_ALL, "...loading '%s'\n", filename);
-        sum += ri.FS_ReadFile(filename, (void**)&buffers[i]);
-        if (!buffers[i]) {
-            ri.Error(ERR_DROP, "Couldn't load %s", filename);
-        }
-    }
-
-    // build single large buffer
-    s_shaderText = ri.Malloc(sum + numShaders * 2);
-    s_shaderText[0] = 0;
-
-    // free in reverse order, so the temp files are all dumped
-    for (i = numShaders - 1; i >= 0; i--) {
-        strcat(s_shaderText, "\n");
-        p = &s_shaderText[strlen(s_shaderText)];
-        strcat(s_shaderText, buffers[i]);
-        ri.FS_FreeFile(buffers[i]);
-        buffers[i] = p;
-    }
-
-    COM_Compress(s_shaderText);
-    // free up memory
-    ri.FS_FreeFileList(shaderFiles);
-}
-
-static void FindShadersInShaderText()
-{
-	char* p;
-	char* oldp;
-	char* token;
-
-	if (!s_shaderText) {
-		return;
-	}
-
-	p = s_shaderText;
-    // look for label
-    while (1) {
-        oldp = p;
-        token = COM_ParseExt(&p, qtrue);
-        if (token[0] == 0) {
-            break;
-        }
-
-        if (*token == '{')
-        {
-            p = oldp;
-            SkipBracedSection(&p);
-        }
-        else
-        {
-            currentShader = AllocShaderText(token);
-            currentShader->text = p;
-        }
-    }
-}
-
-/*
-====================
-CreateInternalShaders
-====================
-*/
-static void CreateInternalShaders( void ) {
-	tr.numShaders = 0;
-
-	// init the default shader
-	Com_Memset( &shader, 0, sizeof( shader ) );
-	Com_Memset( &unfoggedStages, 0, sizeof( unfoggedStages ) );
-
-	Q_strncpyz( shader.name, "<default>", sizeof( shader.name ) );
-	shader.lightmapIndex = LIGHTMAP_NONE;
-	unfoggedStages[0].bundle[0].image[0] = tr.defaultImage;
-	unfoggedStages[0].active = qtrue;
-	unfoggedStages[0].stateBits = GLS_DEFAULT;
-	currentShader = FindShaderText(shader.name);
-    tr.defaultShader = FinishShader();
-
-    // white shader
-    Q_strncpyz(shader.name, "<white>", sizeof(shader.name));
-    shader.lightmapIndex = LIGHTMAP_NONE;
-    unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
-    unfoggedStages[0].active = qtrue;
-    unfoggedStages[0].stateBits = GLS_DEFAULT;
-    currentShader = FindShaderText(shader.name);
-	FinishShader();
-
-	// shadow shader is just a marker
-	Q_strncpyz( shader.name, "<stencil shadow>", sizeof( shader.name ) );
-    shader.sort = SS_STENCIL_SHADOW;
-    shader.lightmapIndex = LIGHTMAP_NONE;
-	currentShader = FindShaderText(shader.name);
-	tr.shadowShader = FinishShader();
-}
-
-static void CreateExternalShaders( void ) {
-	tr.flareShader = R_FindShader( "flareShader", LIGHTMAP_NONE, qtrue, qtrue, qtrue, qtrue);
-}
-
-void R_StartupShaders()
-{
-    ri.Printf(PRINT_ALL, "Initializing Shaders\n");
-
-    currentShader = NULL;
-    s_shaderText = NULL;
-
-    Com_Memset(hashTable, 0, sizeof(hashTable));
-
-    ScanAndLoadShaderFiles();
-
-    FindShadersInShaderText();
-
-    R_SetupShaders();
-}
-
-void R_ShutdownShaders()
-{
-	shadertext_t* shader, * next;
-	int hash;
-
-	if (s_shaderText) {
-		ri.Free(s_shaderText);
-	}
-
-    for (hash = 0; hash < FILE_HASH_SIZE; hash++) {
-        for (shader = hashTable[hash]; shader; shader = next) {
-            next = shader->next;
-            ri.Free(shader);
-        }
-        hashTable[hash] = NULL;
-	}
-}
-
-void R_SetupShaders()
-{
-	shadertext_t* shader;
-	int hash;
-
-    ri.Printf(0, "Setting up Shaders\n");
-    currentShader = NULL;
-    for (hash = 0; hash < FILE_HASH_SIZE; ++hash)
-    {
-		for (shader = hashTable[hash]; shader; shader = shader->next) {
-			shader->shader = NULL;
-		}
-    }
-
-    CreateInternalShaders();
-    InitStaticShaders();
-    CreateExternalShaders();
-}
diff --git a/code/renderer/tr_shadows.c b/code/renderer/tr_shadows.c
deleted file mode 100644
index 5db94a28..00000000
--- a/code/renderer/tr_shadows.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-
-/*
-
-  for a projection shadow:
-
-  point[x] += light vector * ( z - shadow plane )
-  point[y] +=
-  point[z] = shadow plane
-
-  1 0 light[x] / light[z]
-
-*/
-
-typedef struct {
-	int		i2;
-	int		facing;
-} edgeDef_t;
-
-#define	MAX_EDGE_DEFS	32
-
-static	edgeDef_t	edgeDefs[SHADER_MAX_VERTEXES][MAX_EDGE_DEFS];
-static	int			numEdgeDefs[SHADER_MAX_VERTEXES];
-static	int			facing[SHADER_MAX_INDEXES/3];
-
-void R_RenderShadowEdges( void ) {
-	int		i;
-
-#if 0
-	int		numTris;
-
-	// dumb way -- render every triangle's edges
-	numTris = tess.numIndexes / 3;
-
-	for ( i = 0 ; i < numTris ; i++ ) {
-		int		i1, i2, i3;
-
-		if ( !facing[i] ) {
-			continue;
-		}
-
-		i1 = tess.indexes[ i*3 + 0 ];
-		i2 = tess.indexes[ i*3 + 1 ];
-		i3 = tess.indexes[ i*3 + 2 ];
-
-		qglBegin( GL_TRIANGLE_STRIP );
-		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
-		qglVertex3fv( tess.xyz[ i2 ] );
-		qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
-		qglVertex3fv( tess.xyz[ i3 ] );
-		qglVertex3fv( tess.xyz[ i3 + tess.numVertexes ] );
-		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
-		qglEnd();
-	}
-#else
-	int		c, c2;
-	int		j, k;
-	int		i2;
-	int		c_edges, c_rejected;
-	int		hit[2];
-
-	// an edge is NOT a silhouette edge if its face doesn't face the light,
-	// or if it has a reverse paired edge that also faces the light.
-	// A well behaved polyhedron would have exactly two faces for each edge,
-	// but lots of models have dangling edges or overfanned edges
-	c_edges = 0;
-	c_rejected = 0;
-
-	for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-		c = numEdgeDefs[ i ];
-		for ( j = 0 ; j < c ; j++ ) {
-			if ( !edgeDefs[ i ][ j ].facing ) {
-				continue;
-			}
-
-			hit[0] = 0;
-			hit[1] = 0;
-
-			i2 = edgeDefs[ i ][ j ].i2;
-			c2 = numEdgeDefs[ i2 ];
-			for ( k = 0 ; k < c2 ; k++ ) {
-				if ( edgeDefs[ i2 ][ k ].i2 == i ) {
-					hit[ edgeDefs[ i2 ][ k ].facing ]++;
-				}
-			}
-
-			// if it doesn't share the edge with another front facing
-			// triangle, it is a sil edge
-			if ( hit[ 1 ] == 0 ) {
-				qglBegin( GL_TRIANGLE_STRIP );
-				qglVertex3fv( tess.xyz[ i ] );
-				qglVertex3fv( tess.xyz[ i + tess.numVertexes ] );
-				qglVertex3fv( tess.xyz[ i2 ] );
-				qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
-				qglEnd();
-				c_edges++;
-			} else {
-				c_rejected++;
-			}
-		}
-	}
-#endif
-}
-
-void R_AddEdgeDef(int i1, int i2, int facing) {
-	int		c;
-
-	c = numEdgeDefs[i1];
-	if (c == MAX_EDGE_DEFS) {
-		return;		// overflow
-	}
-	edgeDefs[i1][c].i2 = i2;
-	edgeDefs[i1][c].facing = facing;
-
-	numEdgeDefs[i1]++;
-}
-
-/*
-=================
-RB_ShadowTessEnd
-
-triangleFromEdge[ v1 ][ v2 ]
-
-
-  set triangle from edge( v1, v2, tri )
-  if ( facing[ triangleFromEdge[ v1 ][ v2 ] ] && !facing[ triangleFromEdge[ v2 ][ v1 ] ) {
-  }
-=================
-*/
-void RB_ShadowTessEnd( void ) {
-	int		i;
-	int		numTris;
-	vec3_t	lightDir;
-
-	// we can only do this if we have enough space in the vertex buffers
-	if ( tess.numVertexes >= SHADER_MAX_VERTEXES / 2 ) {
-		return;
-	}
-
-	if ( glConfig.stencilBits < 4 ) {
-		return;
-	}
-
-	VectorCopy( backEnd.currentEntity->lightDir, lightDir );
-
-	// project vertexes away from light direction
-	for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-		VectorMA( tess.xyz[i], -512, lightDir, tess.xyz[i+tess.numVertexes] );
-	}
-
-	// decide which triangles face the light
-	Com_Memset( numEdgeDefs, 0, 4 * tess.numVertexes );
-
-	numTris = tess.numIndexes / 3;
-	for ( i = 0 ; i < numTris ; i++ ) {
-		int		i1, i2, i3;
-		vec3_t	d1, d2, normal;
-		float	*v1, *v2, *v3;
-		float	d;
-
-		i1 = tess.indexes[ i*3 + 0 ];
-		i2 = tess.indexes[ i*3 + 1 ];
-		i3 = tess.indexes[ i*3 + 2 ];
-
-		v1 = tess.xyz[ i1 ];
-		v2 = tess.xyz[ i2 ];
-		v3 = tess.xyz[ i3 ];
-
-		VectorSubtract( v2, v1, d1 );
-		VectorSubtract( v3, v1, d2 );
-		CrossProduct( d1, d2, normal );
-
-		d = DotProduct( normal, lightDir );
-		if ( d > 0 ) {
-			facing[ i ] = 1;
-		} else {
-			facing[ i ] = 0;
-		}
-
-		// create the edges
-		R_AddEdgeDef( i1, i2, facing[ i ] );
-		R_AddEdgeDef( i2, i3, facing[ i ] );
-		R_AddEdgeDef( i3, i1, facing[ i ] );
-	}
-
-	// draw the silhouette edges
-
-	GL_Bind( tr.whiteImage );
-	qglEnable( GL_CULL_FACE );
-	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
-	qglColor3f( 0.2f, 0.2f, 0.2f );
-
-	// don't write to the color buffer
-	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
-
-	qglEnable( GL_STENCIL_TEST );
-	qglStencilFunc( GL_ALWAYS, 1, 255 );
-
-	// mirrors have the culling order reversed
-	if ( backEnd.viewParms.isMirror ) {
-		qglCullFace( GL_FRONT );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
-
-		R_RenderShadowEdges();
-
-		qglCullFace( GL_BACK );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
-
-		R_RenderShadowEdges();
-	} else {
-		qglCullFace( GL_BACK );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
-
-		R_RenderShadowEdges();
-
-		qglCullFace( GL_FRONT );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
-
-		R_RenderShadowEdges();
-	}
-
-
-	// reenable writing to the color buffer
-	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
-}
-
-/*
-=================
-RB_ComputeShadowVolume
-
-=================
-*/
-void RB_ComputeShadowVolume() {
-    int i;
-    int numTris;
-    vec3_t lightDir;
-
-    if (r_shadows->integer != 3 || glConfig.stencilBits < 8) {
-        return;
-    }
-
-    VectorSet(lightDir, -2.0, 1.5, 1.0);
-
-    // project vertexes away from light direction
-    for (i = 0; i < tess.numVertexes; i++) {
-        VectorMA(tess.xyz[i], -512, lightDir, tess.xyz[i + tess.numVertexes]);
-    }
-
-    // decide which triangles face the light
-    Com_Memset(numEdgeDefs, 0, 4 * tess.numVertexes);
-
-    numTris = tess.numIndexes / 3;
-    for (i = 0; i < numTris; i++) {
-        int		i1, i2, i3;
-        vec3_t	d1, d2, normal;
-        float* v1, * v2, * v3;
-        float	d;
-
-        i1 = tess.indexes[i * 3 + 0];
-        i2 = tess.indexes[i * 3 + 1];
-        i3 = tess.indexes[i * 3 + 2];
-
-        v1 = tess.xyz[i1];
-        v2 = tess.xyz[i2];
-        v3 = tess.xyz[i3];
-
-        VectorSubtract(v2, v1, d1);
-        VectorSubtract(v3, v1, d2);
-        CrossProduct(d1, d2, normal);
-
-        d = DotProduct(normal, lightDir);
-        if (d > 0) {
-            facing[i] = 1;
-        } else {
-            facing[i] = 0;
-        }
-
-        // create the edges
-        R_AddEdgeDef(i1, i2, facing[i]);
-        R_AddEdgeDef(i2, i3, facing[i]);
-        R_AddEdgeDef(i3, i1, facing[i]);
-    }
-
-	// draw the silhouette edges
-
-	GL_Bind( tr.whiteImage );
-	qglEnable( GL_CULL_FACE );
-	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
-	qglColor3f( 0.2f, 0.2f, 0.2f );
-
-	// don't write to the color buffer
-	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
-
-	qglEnable( GL_STENCIL_TEST );
-	qglStencilFunc( GL_ALWAYS, 1, 255 );
-
-	// mirrors have the culling order reversed
-	if ( backEnd.viewParms.isMirror ) {
-		qglCullFace( GL_FRONT );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
-
-		R_RenderShadowEdges();
-
-		qglCullFace( GL_BACK );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
-
-		R_RenderShadowEdges();
-	} else {
-		qglCullFace( GL_BACK );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
-
-		R_RenderShadowEdges();
-
-		qglCullFace( GL_FRONT );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
-
-		R_RenderShadowEdges();
-	}
-
-
-	// reenable writing to the color buffer
-	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
-}
-
-/*
-=================
-RB_ShadowFinish
-
-Darken everything that is is a shadow volume.
-We have to delay this until everything has been shadowed,
-because otherwise shadows from different body parts would
-overlap and double darken.
-=================
-*/
-void RB_ShadowFinish( void ) {
-	if ( r_shadows->integer != 2 ) {
-		return;
-	}
-	if ( glConfig.stencilBits < 4 ) {
-		return;
-	}
-	qglEnable( GL_STENCIL_TEST );
-	qglStencilFunc( GL_NOTEQUAL, 0, 255 );
-
-	qglDisable (GL_CLIP_PLANE0);
-	qglDisable (GL_CULL_FACE);
-
-	GL_Bind( tr.whiteImage );
-
-    qglLoadIdentity ();
-
-	qglColor3f( 0.6f, 0.6f, 0.6f );
-	GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO );
-
-//	qglColor3f( 1, 0, 0 );
-//	GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
-
-	qglBegin( GL_QUADS );
-	qglVertex3f( -100, 100, -10 );
-	qglVertex3f( 100, 100, -10 );
-	qglVertex3f( 100, -100, -10 );
-	qglVertex3f( -100, -100, -10 );
-	qglEnd ();
-
-	qglColor4f(1,1,1,1);
-	qglDisable( GL_STENCIL_TEST );
-}
diff --git a/code/renderer/tr_sky.c b/code/renderer/tr_sky.c
deleted file mode 100644
index 6da4a80d..00000000
--- a/code/renderer/tr_sky.c
+++ /dev/null
@@ -1,845 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_sky.c
-#include "tr_local.h"
-
-#define SKY_SUBDIVISIONS		8
-#define HALF_SKY_SUBDIVISIONS	(SKY_SUBDIVISIONS/2)
-
-static float s_cloudTexCoords[6][SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1][2];
-static float s_cloudTexP[6][SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1];
-
-/*
-===================================================================================
-
-POLYGON TO BOX SIDE PROJECTION
-
-===================================================================================
-*/
-
-static vec3_t sky_clip[6] = 
-{
-	{1,1,0},
-	{1,-1,0},
-	{0,-1,1},
-	{0,1,1},
-	{1,0,1},
-	{-1,0,1} 
-};
-
-static float	sky_mins[2][6], sky_maxs[2][6];
-static float	sky_min, sky_max;
-
-/*
-================
-AddSkyPolygon
-================
-*/
-static void AddSkyPolygon (int nump, vec3_t vecs) 
-{
-	int		i,j;
-	vec3_t	v, av;
-	float	s, t, dv;
-	int		axis;
-	float	*vp;
-	// s = [0]/[2], t = [1]/[2]
-	static int	vec_to_st[6][3] =
-	{
-		{-2,3,1},
-		{2,3,-1},
-
-		{1,3,2},
-		{-1,3,-2},
-
-		{-2,-1,3},
-		{-2,1,-3}
-
-	//	{-1,2,3},
-	//	{1,2,-3}
-	};
-
-	// decide which face it maps to
-	VectorCopy (vec3_origin, v);
-	for (i=0, vp=vecs ; i<nump ; i++, vp+=3)
-	{
-		VectorAdd (vp, v, v);
-	}
-	av[0] = fabs(v[0]);
-	av[1] = fabs(v[1]);
-	av[2] = fabs(v[2]);
-	if (av[0] > av[1] && av[0] > av[2])
-	{
-		if (v[0] < 0)
-			axis = 1;
-		else
-			axis = 0;
-	}
-	else if (av[1] > av[2] && av[1] > av[0])
-	{
-		if (v[1] < 0)
-			axis = 3;
-		else
-			axis = 2;
-	}
-	else
-	{
-		if (v[2] < 0)
-			axis = 5;
-		else
-			axis = 4;
-	}
-
-	// project new texture coords
-	for (i=0 ; i<nump ; i++, vecs+=3)
-	{
-		j = vec_to_st[axis][2];
-		if (j > 0)
-			dv = vecs[j - 1];
-		else
-			dv = -vecs[-j - 1];
-		if (dv < 0.001)
-			continue;	// don't divide by zero
-		j = vec_to_st[axis][0];
-		if (j < 0)
-			s = -vecs[-j -1] / dv;
-		else
-			s = vecs[j-1] / dv;
-		j = vec_to_st[axis][1];
-		if (j < 0)
-			t = -vecs[-j -1] / dv;
-		else
-			t = vecs[j-1] / dv;
-
-		if (s < sky_mins[0][axis])
-			sky_mins[0][axis] = s;
-		if (t < sky_mins[1][axis])
-			sky_mins[1][axis] = t;
-		if (s > sky_maxs[0][axis])
-			sky_maxs[0][axis] = s;
-		if (t > sky_maxs[1][axis])
-			sky_maxs[1][axis] = t;
-	}
-}
-
-#define	ON_EPSILON		0.1f			// point on plane side epsilon
-#define	MAX_CLIP_VERTS	64
-/*
-================
-ClipSkyPolygon
-================
-*/
-static void ClipSkyPolygon (int nump, vec3_t vecs, int stage) 
-{
-	float	*norm;
-	float	*v;
-	qboolean	front, back;
-	float	d, e;
-	float	dists[MAX_CLIP_VERTS];
-	int		sides[MAX_CLIP_VERTS];
-	vec3_t	newv[2][MAX_CLIP_VERTS];
-	int		newc[2];
-	int		i, j;
-
-	if (nump > MAX_CLIP_VERTS-2)
-		ri.Error (ERR_DROP, "ClipSkyPolygon: MAX_CLIP_VERTS");
-	if (stage == 6)
-	{	// fully clipped, so draw it
-		AddSkyPolygon (nump, vecs);
-		return;
-	}
-
-	front = back = qfalse;
-	norm = sky_clip[stage];
-	for (i=0, v = vecs ; i<nump ; i++, v+=3)
-	{
-		d = DotProduct (v, norm);
-		if (d > ON_EPSILON)
-		{
-			front = qtrue;
-			sides[i] = SIDE_FRONT;
-		}
-		else if (d < -ON_EPSILON)
-		{
-			back = qtrue;
-			sides[i] = SIDE_BACK;
-		}
-		else
-			sides[i] = SIDE_ON;
-		dists[i] = d;
-	}
-
-	if (!front || !back)
-	{	// not clipped
-		ClipSkyPolygon (nump, vecs, stage+1);
-		return;
-	}
-
-	// clip it
-	sides[i] = sides[0];
-	dists[i] = dists[0];
-	VectorCopy (vecs, (vecs+(i*3)) );
-	newc[0] = newc[1] = 0;
-
-	for (i=0, v = vecs ; i<nump ; i++, v+=3)
-	{
-		switch (sides[i])
-		{
-		case SIDE_FRONT:
-			VectorCopy (v, newv[0][newc[0]]);
-			newc[0]++;
-			break;
-		case SIDE_BACK:
-			VectorCopy (v, newv[1][newc[1]]);
-			newc[1]++;
-			break;
-		case SIDE_ON:
-			VectorCopy (v, newv[0][newc[0]]);
-			newc[0]++;
-			VectorCopy (v, newv[1][newc[1]]);
-			newc[1]++;
-			break;
-		}
-
-		if (sides[i] == SIDE_ON || sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-			continue;
-
-		d = dists[i] / (dists[i] - dists[i+1]);
-		for (j=0 ; j<3 ; j++)
-		{
-			e = v[j] + d*(v[j+3] - v[j]);
-			newv[0][newc[0]][j] = e;
-			newv[1][newc[1]][j] = e;
-		}
-		newc[0]++;
-		newc[1]++;
-	}
-
-	// continue
-	ClipSkyPolygon (newc[0], newv[0][0], stage+1);
-	ClipSkyPolygon (newc[1], newv[1][0], stage+1);
-}
-
-/*
-==============
-ClearSkyBox
-==============
-*/
-static void ClearSkyBox (void) {
-	int		i;
-
-	for (i=0 ; i<6 ; i++) {
-		sky_mins[0][i] = sky_mins[1][i] = 9999;
-		sky_maxs[0][i] = sky_maxs[1][i] = -9999;
-	}
-}
-
-/*
-================
-RB_ClipSkyPolygons
-================
-*/
-void RB_ClipSkyPolygons( shaderCommands_t *input )
-{
-	vec3_t		p[5];	// need one extra point for clipping
-	int			i, j;
-
-	ClearSkyBox();
-
-	for ( i = 0; i < input->numIndexes; i += 3 )
-	{
-		for (j = 0 ; j < 3 ; j++) 
-		{
-			VectorSubtract( input->xyz[input->indexes[i+j]],
-							backEnd.viewParms.ori.origin, 
-							p[j] );
-		}
-		ClipSkyPolygon( 3, p[0], 0 );
-	}
-}
-
-/*
-===================================================================================
-
-CLOUD VERTEX GENERATION
-
-===================================================================================
-*/
-
-/*
-** MakeSkyVec
-**
-** Parms: s, t range from -1 to 1
-*/
-static void MakeSkyVec( float s, float t, int axis, float outSt[2], vec3_t outXYZ )
-{
-	// 1 = s, 2 = t, 3 = 2048
-	static int	st_to_vec[6][3] =
-	{
-		{3,-1,2},
-		{-3,1,2},
-
-		{1,3,2},
-		{-1,-3,2},
-
-		{-2,-1,3},		// 0 degrees yaw, look straight up
-		{2,-1,-3}		// look straight down
-	};
-
-	vec3_t		b;
-	int			j, k;
-	float	boxSize;
-
-	boxSize = backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	b[0] = s*boxSize;
-	b[1] = t*boxSize;
-	b[2] = boxSize;
-
-	for (j=0 ; j<3 ; j++)
-	{
-		k = st_to_vec[axis][j];
-		if (k < 0)
-		{
-			outXYZ[j] = -b[-k - 1];
-		}
-		else
-		{
-			outXYZ[j] = b[k - 1];
-		}
-	}
-
-	// avoid bilerp seam
-	s = (s+1)*0.5;
-	t = (t+1)*0.5;
-	if (s < sky_min)
-	{
-		s = sky_min;
-	}
-	else if (s > sky_max)
-	{
-		s = sky_max;
-	}
-
-	if (t < sky_min)
-	{
-		t = sky_min;
-	}
-	else if (t > sky_max)
-	{
-		t = sky_max;
-	}
-
-	t = 1.0 - t;
-
-
-	if ( outSt )
-	{
-		outSt[0] = s;
-		outSt[1] = t;
-	}
-}
-
-static int	sky_texorder[6] = {0,2,1,3,4,5};
-static vec3_t	s_skyPoints[SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1];
-static float	s_skyTexCoords[SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1][2];
-
-static void DrawSkySide( struct image_s *image, const int mins[2], const int maxs[2] )
-{
-	int s, t;
-
-	GL_Bind( image );
-
-	for ( t = mins[1]+HALF_SKY_SUBDIVISIONS; t < maxs[1]+HALF_SKY_SUBDIVISIONS; t++ )
-	{
-		qglBegin( GL_TRIANGLE_STRIP );
-
-		for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ )
-		{
-			qglTexCoord2fv( s_skyTexCoords[t][s] );
-			qglVertex3fv( s_skyPoints[t][s] );
-
-			qglTexCoord2fv( s_skyTexCoords[t+1][s] );
-			qglVertex3fv( s_skyPoints[t+1][s] );
-		}
-
-		qglEnd();
-	}
-}
-
-static void DrawSkyBox( shader_t *shader )
-{
-	int		i;
-
-	sky_min = 0;
-	sky_max = 1;
-
-	Com_Memset( s_skyTexCoords, 0, sizeof( s_skyTexCoords ) );
-
-	for (i=0 ; i<6 ; i++)
-	{
-		int sky_mins_subd[2], sky_maxs_subd[2];
-		int s, t;
-
-		sky_mins[0][i] = floor( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_mins[1][i] = floor( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[0][i] = ceil( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[1][i] = ceil( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-
-		if ( ( sky_mins[0][i] >= sky_maxs[0][i] ) ||
-			 ( sky_mins[1][i] >= sky_maxs[1][i] ) )
-		{
-			continue;
-		}
-
-		sky_mins_subd[0] = sky_mins[0][i] * HALF_SKY_SUBDIVISIONS;
-		sky_mins_subd[1] = sky_mins[1][i] * HALF_SKY_SUBDIVISIONS;
-		sky_maxs_subd[0] = sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS;
-		sky_maxs_subd[1] = sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS;
-
-		if ( sky_mins_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_mins_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_mins_subd[1] < -HALF_SKY_SUBDIVISIONS )
-			sky_mins_subd[1] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_mins_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		if ( sky_maxs_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_maxs_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_maxs_subd[1] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[1] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_maxs_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		//
-		// iterate through the subdivisions
-		//
-		for ( t = sky_mins_subd[1]+HALF_SKY_SUBDIVISIONS; t <= sky_maxs_subd[1]+HALF_SKY_SUBDIVISIONS; t++ )
-		{
-			for ( s = sky_mins_subd[0]+HALF_SKY_SUBDIVISIONS; s <= sky_maxs_subd[0]+HALF_SKY_SUBDIVISIONS; s++ )
-			{
-				MakeSkyVec( ( s - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							( t - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							i, 
-							s_skyTexCoords[t][s], 
-							s_skyPoints[t][s] );
-			}
-		}
-
-		DrawSkySide( shader->sky.outerbox[sky_texorder[i]],
-			         sky_mins_subd,
-					 sky_maxs_subd );
-	}
-
-}
-
-static void FillCloudySkySide( const int mins[2], const int maxs[2], qboolean addIndexes )
-{
-	int s, t;
-	int vertexStart = tess.numVertexes;
-	int tHeight, sWidth;
-
-	tHeight = maxs[1] - mins[1] + 1;
-	sWidth = maxs[0] - mins[0] + 1;
-
-	for ( t = mins[1]+HALF_SKY_SUBDIVISIONS; t <= maxs[1]+HALF_SKY_SUBDIVISIONS; t++ )
-	{
-		for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ )
-		{
-			VectorAdd( s_skyPoints[t][s], backEnd.viewParms.ori.origin, tess.xyz[tess.numVertexes] );
-			tess.texCoords[tess.numVertexes][0][0] = s_skyTexCoords[t][s][0];
-			tess.texCoords[tess.numVertexes][0][1] = s_skyTexCoords[t][s][1];
-
-			tess.numVertexes++;
-
-			if ( tess.numVertexes >= SHADER_MAX_VERTEXES )
-			{
-				ri.Error( ERR_DROP, "SHADER_MAX_VERTEXES hit in FillCloudySkySide()\n" );
-			}
-		}
-	}
-
-	// only add indexes for one pass, otherwise it would draw multiple times for each pass
-	if ( addIndexes ) {
-		for ( t = 0; t < tHeight-1; t++ )
-		{	
-			for ( s = 0; s < sWidth-1; s++ )
-			{
-				tess.indexes[tess.numIndexes] = vertexStart + s + t * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + ( t + 1 ) * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + 1 + t * ( sWidth );
-				tess.numIndexes++;
-
-				tess.indexes[tess.numIndexes] = vertexStart + s + ( t + 1 ) * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + 1 + ( t + 1 ) * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + 1 + t * ( sWidth );
-				tess.numIndexes++;
-			}
-		}
-	}
-}
-
-static void FillCloudBox( const shader_t *shader, int stage )
-{
-	int i;
-
-	for ( i =0; i < 6; i++ )
-	{
-		int sky_mins_subd[2], sky_maxs_subd[2];
-		int s, t;
-		float MIN_T;
-
-		if ( 1 ) // FIXME? shader->sky.fullClouds )
-		{
-			MIN_T = -HALF_SKY_SUBDIVISIONS;
-
-			// still don't want to draw the bottom, even if fullClouds
-			if ( i == 5 )
-				continue;
-		}
-		else
-		{
-			switch( i )
-			{
-			case 0:
-			case 1:
-			case 2:
-			case 3:
-				MIN_T = -1;
-				break;
-			case 5:
-				// don't draw clouds beneath you
-				continue;
-			case 4:		// top
-			default:
-				MIN_T = -HALF_SKY_SUBDIVISIONS;
-				break;
-			}
-		}
-
-		sky_mins[0][i] = floor( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_mins[1][i] = floor( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[0][i] = ceil( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[1][i] = ceil( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-
-		if ( ( sky_mins[0][i] >= sky_maxs[0][i] ) ||
-			 ( sky_mins[1][i] >= sky_maxs[1][i] ) )
-		{
-			continue;
-		}
-
-		sky_mins_subd[0] = myftol( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS );
-		sky_mins_subd[1] = myftol( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS );
-		sky_maxs_subd[0] = myftol( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS );
-		sky_maxs_subd[1] = myftol( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS );
-
-		if ( sky_mins_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_mins_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_mins_subd[1] < MIN_T )
-			sky_mins_subd[1] = MIN_T;
-		else if ( sky_mins_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		if ( sky_maxs_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_maxs_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_maxs_subd[1] < MIN_T )
-			sky_maxs_subd[1] = MIN_T;
-		else if ( sky_maxs_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		//
-		// iterate through the subdivisions
-		//
-		for ( t = sky_mins_subd[1]+HALF_SKY_SUBDIVISIONS; t <= sky_maxs_subd[1]+HALF_SKY_SUBDIVISIONS; t++ )
-		{
-			for ( s = sky_mins_subd[0]+HALF_SKY_SUBDIVISIONS; s <= sky_maxs_subd[0]+HALF_SKY_SUBDIVISIONS; s++ )
-			{
-				MakeSkyVec( ( s - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							( t - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							i, 
-							NULL,
-							s_skyPoints[t][s] );
-
-				s_skyTexCoords[t][s][0] = s_cloudTexCoords[i][t][s][0];
-				s_skyTexCoords[t][s][1] = s_cloudTexCoords[i][t][s][1];
-			}
-		}
-
-		// only add indexes for first stage
-		FillCloudySkySide( sky_mins_subd, sky_maxs_subd, ( stage == 0 ) );
-	}
-}
-
-/*
-** R_BuildCloudData
-*/
-void R_BuildCloudData( shaderCommands_t *input )
-{
-	int			i;
-	shader_t	*shader;
-
-	shader = input->shader;
-
-	assert( shader->isSky );
-
-	sky_min = 1.0 / 256.0f;		// FIXME: not correct?
-	sky_max = 255.0 / 256.0f;
-
-	// set up for drawing
-	tess.numIndexes = 0;
-	tess.numVertexes = 0;
-
-	if ( input->shader->sky.cloudHeight )
-	{
-		for ( i = 0; i < MAX_SHADER_STAGES; i++ )
-		{
-			if ( !tess.xstages[i] ) {
-				break;
-			}
-			FillCloudBox( input->shader, i );
-		}
-	}
-}
-
-/*
-** R_InitSkyTexCoords
-** Called when a sky shader is parsed
-*/
-#define SQR( a ) ((a)*(a))
-void R_InitSkyTexCoords( float heightCloud )
-{
-	int i, s, t;
-	float radiusWorld = 4096;
-	float p;
-	float sRad, tRad;
-	vec3_t skyVec;
-	vec3_t v;
-
-	// init zfar so MakeSkyVec works even though
-	// a world hasn't been bounded
-	backEnd.viewParms.zFar = 1024;
-
-	for ( i = 0; i < 6; i++ )
-	{
-		for ( t = 0; t <= SKY_SUBDIVISIONS; t++ )
-		{
-			for ( s = 0; s <= SKY_SUBDIVISIONS; s++ )
-			{
-				// compute vector from view origin to sky side integral point
-				MakeSkyVec( ( s - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							( t - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							i, 
-							NULL,
-							skyVec );
-
-				// compute parametric value 'p' that intersects with cloud layer
-				p = ( 1.0f / ( 2 * DotProduct( skyVec, skyVec ) ) ) *
-					( -2 * skyVec[2] * radiusWorld + 
-					   2 * sqrt( SQR( skyVec[2] ) * SQR( radiusWorld ) + 
-					             2 * SQR( skyVec[0] ) * radiusWorld * heightCloud +
-								 SQR( skyVec[0] ) * SQR( heightCloud ) + 
-								 2 * SQR( skyVec[1] ) * radiusWorld * heightCloud +
-								 SQR( skyVec[1] ) * SQR( heightCloud ) + 
-								 2 * SQR( skyVec[2] ) * radiusWorld * heightCloud +
-								 SQR( skyVec[2] ) * SQR( heightCloud ) ) );
-
-				s_cloudTexP[i][t][s] = p;
-
-				// compute intersection point based on p
-				VectorScale( skyVec, p, v );
-				v[2] += radiusWorld;
-
-				// compute vector from world origin to intersection point 'v'
-				VectorNormalize( v );
-
-				sRad = Q_acos( v[0] );
-				tRad = Q_acos( v[1] );
-
-				s_cloudTexCoords[i][t][s][0] = sRad;
-				s_cloudTexCoords[i][t][s][1] = tRad;
-			}
-		}
-	}
-}
-
-//======================================================================================
-
-/*
-** RB_DrawSun
-*/
-void RB_DrawSun( void ) {
-	float		size;
-	float		dist;
-	vec3_t		origin, vec1, vec2;
-	vec3_t		temp;
-
-	if ( !backEnd.skyRenderedThisView ) {
-		return;
-	}
-	if ( !r_drawSun->integer ) {
-		return;
-	}
-	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
-	qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
-
-	dist = 	backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	size = dist * 0.4;
-
-	VectorScale( tr.sunDirection, dist, origin );
-	PerpendicularVector( vec1, tr.sunDirection );
-	CrossProduct( tr.sunDirection, vec1, vec2 );
-
-	VectorScale( vec1, size, vec1 );
-	VectorScale( vec2, size, vec2 );
-
-	// farthest depth range
-	qglDepthRange( 1.0, 1.0 );
-
-	// FIXME: use quad stamp
-	RB_BeginSurface( tr.sunShader );
-		VectorCopy( origin, temp );
-		VectorSubtract( temp, vec1, temp );
-		VectorSubtract( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 0;
-		tess.texCoords[tess.numVertexes][0][1] = 0;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorAdd( temp, vec1, temp );
-		VectorSubtract( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 0;
-		tess.texCoords[tess.numVertexes][0][1] = 1;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorAdd( temp, vec1, temp );
-		VectorAdd( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 1;
-		tess.texCoords[tess.numVertexes][0][1] = 1;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorSubtract( temp, vec1, temp );
-		VectorAdd( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 1;
-		tess.texCoords[tess.numVertexes][0][1] = 0;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		tess.indexes[tess.numIndexes++] = 0;
-		tess.indexes[tess.numIndexes++] = 1;
-		tess.indexes[tess.numIndexes++] = 2;
-		tess.indexes[tess.numIndexes++] = 0;
-		tess.indexes[tess.numIndexes++] = 2;
-		tess.indexes[tess.numIndexes++] = 3;
-
-	RB_EndSurface();
-
-	// back to normal depth range
-	qglDepthRange( 0.0, 1.0 );
-}
-
-
-
-
-/*
-================
-RB_StageIteratorSky
-
-All of the visible sky triangles are in tess
-
-Other things could be stuck in here, like birds in the sky, etc
-================
-*/
-void RB_StageIteratorSky( void ) {
-	if ( r_fastsky->integer || tr.farclip ) {
-		return;
-	}
-
-	// go through all the polygons and project them onto
-	// the sky box to see which blocks on each side need
-	// to be drawn
-	RB_ClipSkyPolygons( &tess );
-
-	// r_showsky will let all the sky blocks be drawn in
-	// front of everything to allow developers to see how
-	// much sky is getting sucked in
-	if ( r_showsky->integer ) {
-		qglDepthRange( 0.0, 0.0 );
-	} else {
-		qglDepthRange( 1.0, 1.0 );
-	}
-
-	// draw the outer skybox
-	if ( tess.shader->sky.outerbox[0] && tess.shader->sky.outerbox[0] != tr.defaultImage ) {
-		qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight );
-		
-		qglPushMatrix ();
-		GL_State( 0 );
-		qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
-
-		DrawSkyBox( tess.shader );
-
-		qglPopMatrix();
-	}
-
-	// generate the vertexes for all the clouds, which will be drawn
-	// by the generic shader routine
-	R_BuildCloudData( &tess );
-
-	RB_StageIteratorGeneric();
-
-	// draw the inner skybox
-
-
-	// back to normal depth range
-	qglDepthRange( 0.0, 1.0 );
-
-	// note that sky was drawn so we will draw a sun later
-	backEnd.skyRenderedThisView = qtrue;
-}
-
diff --git a/code/renderer/tr_surface.c b/code/renderer/tr_surface.c
deleted file mode 100644
index 1d5d83da..00000000
--- a/code/renderer/tr_surface.c
+++ /dev/null
@@ -1,901 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_surf.c
-#include "tr_local.h"
-
-/*
-
-  THIS ENTIRE FILE IS BACK END
-
-backEnd.currentEntity will be valid.
-
-Tess_Begin has already been called for the surface's shader.
-
-The modelview matrix will be set.
-
-It is safe to actually issue drawing commands here if you don't want to
-use the shader system.
-*/
-
-
-//============================================================================
-
-
-/*
-==============
-RB_CheckOverflow
-==============
-*/
-void RB_CheckOverflow( int verts, int indexes ) {
-	RB_EndSurface();
-
-	if ( verts >= SHADER_MAX_VERTEXES ) {
-		ri.Error(ERR_DROP, "RB_CheckOverflow: verts > MAX (%d > %d)", verts, SHADER_MAX_VERTEXES );
-	}
-	if ( indexes >= SHADER_MAX_INDEXES ) {
-		ri.Error(ERR_DROP, "RB_CheckOverflow: indices > MAX (%d > %d)", indexes, SHADER_MAX_INDEXES );
-	}
-
-	RB_BeginSurface(tess.shader);
-}
-
-
-/*
-==============
-RB_AddQuadStampExt
-==============
-*/
-void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 ) {
-	vec3_t		normal;
-	int			ndx;
-
-	RB_CHECKOVERFLOW( 4, 6 );
-
-	ndx = tess.numVertexes;
-
-	// triangle indexes for a simple quad
-	tess.indexes[ tess.numIndexes ] = ndx;
-	tess.indexes[ tess.numIndexes + 1 ] = ndx + 1;
-	tess.indexes[ tess.numIndexes + 2 ] = ndx + 3;
-
-	tess.indexes[ tess.numIndexes + 3 ] = ndx + 3;
-	tess.indexes[ tess.numIndexes + 4 ] = ndx + 1;
-	tess.indexes[ tess.numIndexes + 5 ] = ndx + 2;
-
-	tess.xyz[ndx][0] = origin[0] + left[0] + up[0];
-	tess.xyz[ndx][1] = origin[1] + left[1] + up[1];
-	tess.xyz[ndx][2] = origin[2] + left[2] + up[2];
-
-	tess.xyz[ndx+1][0] = origin[0] - left[0] + up[0];
-	tess.xyz[ndx+1][1] = origin[1] - left[1] + up[1];
-	tess.xyz[ndx+1][2] = origin[2] - left[2] + up[2];
-
-	tess.xyz[ndx+2][0] = origin[0] - left[0] - up[0];
-	tess.xyz[ndx+2][1] = origin[1] - left[1] - up[1];
-	tess.xyz[ndx+2][2] = origin[2] - left[2] - up[2];
-
-	tess.xyz[ndx+3][0] = origin[0] + left[0] - up[0];
-	tess.xyz[ndx+3][1] = origin[1] + left[1] - up[1];
-	tess.xyz[ndx+3][2] = origin[2] + left[2] - up[2];
-
-
-	// constant normal all the way around
-	VectorSubtract( vec3_origin, backEnd.viewParms.ori.axis[0], normal );
-
-	tess.normal[ndx][0] = tess.normal[ndx+1][0] = tess.normal[ndx+2][0] = tess.normal[ndx+3][0] = normal[0];
-	tess.normal[ndx][1] = tess.normal[ndx+1][1] = tess.normal[ndx+2][1] = tess.normal[ndx+3][1] = normal[1];
-	tess.normal[ndx][2] = tess.normal[ndx+1][2] = tess.normal[ndx+2][2] = tess.normal[ndx+3][2] = normal[2];
-	
-	// standard square texture coordinates
-	tess.texCoords[ndx][0][0] = tess.texCoords[ndx][1][0] = s1;
-	tess.texCoords[ndx][0][1] = tess.texCoords[ndx][1][1] = t1;
-
-	tess.texCoords[ndx+1][0][0] = tess.texCoords[ndx+1][1][0] = s2;
-	tess.texCoords[ndx+1][0][1] = tess.texCoords[ndx+1][1][1] = t1;
-
-	tess.texCoords[ndx+2][0][0] = tess.texCoords[ndx+2][1][0] = s2;
-	tess.texCoords[ndx+2][0][1] = tess.texCoords[ndx+2][1][1] = t2;
-
-	tess.texCoords[ndx+3][0][0] = tess.texCoords[ndx+3][1][0] = s1;
-	tess.texCoords[ndx+3][0][1] = tess.texCoords[ndx+3][1][1] = t2;
-
-	// constant color all the way around
-	// should this be identity and let the shader specify from entity?
-	* ( unsigned int * ) &tess.vertexColors[ndx] = 
-	* ( unsigned int * ) &tess.vertexColors[ndx+1] = 
-	* ( unsigned int * ) &tess.vertexColors[ndx+2] = 
-	* ( unsigned int * ) &tess.vertexColors[ndx+3] = 
-		* ( unsigned int * )color;
-
-
-	tess.numVertexes += 4;
-	tess.numIndexes += 6;
-	tess.dlightMap = 0;
-}
-
-/*
-==============
-RB_AddQuadStamp
-==============
-*/
-void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color ) {
-	RB_AddQuadStampExt( origin, left, up, color, 0, 0, 1, 1 );
-}
-
-/*
-==============
-RB_SurfaceSprite
-==============
-*/
-static void RB_SurfaceSprite( void ) {
-	vec3_t		left, up;
-	float		radius;
-
-	// calculate the xyz locations for the four corners
-	radius = backEnd.currentEntity->e.radius;
-	if ( backEnd.currentEntity->e.rotation == 0 ) {
-		VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
-		VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
-	} else {
-		float	s, c;
-		float	ang;
-		
-		ang = M_PI * backEnd.currentEntity->e.rotation / 180;
-		s = sin( ang );
-		c = cos( ang );
-
-		VectorScale( backEnd.viewParms.ori.axis[1], c * radius, left );
-		VectorMA( left, -s * radius, backEnd.viewParms.ori.axis[2], left );
-
-		VectorScale( backEnd.viewParms.ori.axis[2], c * radius, up );
-		VectorMA( up, s * radius, backEnd.viewParms.ori.axis[1], up );
-	}
-	if ( backEnd.viewParms.isMirror ) {
-		VectorSubtract( vec3_origin, left, left );
-	}
-
-	RB_AddQuadStamp( backEnd.currentEntity->e.origin, left, up, backEnd.currentEntity->e.shaderRGBA );
-}
-
-
-/*
-=============
-RB_SurfacePolychain
-=============
-*/
-void RB_SurfacePolychain( srfPoly_t *p ) {
-	int		i;
-	int		numv;
-
-	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
-
-	// fan triangles into the tess array
-	numv = tess.numVertexes;
-	for ( i = 0; i < p->numVerts; i++ ) {
-		VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
-		tess.texCoords[numv][0][0] = p->verts[i].st[0];
-		tess.texCoords[numv][0][1] = p->verts[i].st[1];
-		*(int *)&tess.vertexColors[numv] = *(int *)p->verts[ i ].modulate;
-
-		numv++;
-	}
-
-	// generate fan indexes into the tess array
-	for ( i = 0; i < p->numVerts-2; i++ ) {
-		tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
-		tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
-		tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
-		tess.numIndexes += 3;
-	}
-
-	tess.vertexColorValid = qtrue;
-	tess.numVertexes = numv;
-}
-
-/*
-=============
-RB_SurfaceMarkFragment
-=============
-*/
-void RB_SurfaceMarkFragment(srfMarkFragment_t* p) {
-	int i;
-	int numv;
-
-	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
-
-	if (p->iIndex <= 0 || R_TerrainHeightForPoly(&tr.world->terraPatches[p->iIndex - 1], p->verts, p->numVerts))
-	{
-		// FIXME: from here on out, it's mostly the same code as in RB_SurfacePolychain,
-		// common part could be extracted into an inline func
-
-		// fan triangles into the tess array
-		numv = tess.numVertexes;
-		for ( i = 0; i < p->numVerts; i++ )
-		{
-			VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
-			tess.texCoords[numv][0][0] = p->verts[i].st[0];
-			tess.texCoords[numv][0][1] = p->verts[i].st[1];
-			*(int *)&tess.vertexColors[numv] = *(int *)p->verts[ i ].modulate;
-
-			numv++;
-		}
-
-		// generate fan indexes into the tess array
-		for ( i = 0; i < p->numVerts - 2; i++ ) {
-			tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
-			tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
-			tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
-			tess.numIndexes += 3;
-		}
-
-		tess.vertexColorValid = qtrue;
-		tess.numVertexes = numv;
-	}
-}
-
-/*
-=============
-RB_SurfaceTriangles
-=============
-*/
-void RB_SurfaceTriangles( srfTriangles_t *srf ) {
-	int			i;
-	drawVert_t	*dv;
-	float		*xyz, *normal, *texCoords;
-	byte		*color;
-	int			dlightBits;
-	qboolean	needsNormal;
-
-	dlightBits = srf->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-
-	RB_CHECKOVERFLOW( srf->numVerts, srf->numIndexes );
-
-	for ( i = 0 ; i < srf->numIndexes ; i += 3 ) {
-		tess.indexes[ tess.numIndexes + i + 0 ] = tess.numVertexes + srf->indexes[ i + 0 ];
-		tess.indexes[ tess.numIndexes + i + 1 ] = tess.numVertexes + srf->indexes[ i + 1 ];
-		tess.indexes[ tess.numIndexes + i + 2 ] = tess.numVertexes + srf->indexes[ i + 2 ];
-	}
-	tess.numIndexes += srf->numIndexes;
-
-	dv = srf->verts;
-	xyz = tess.xyz[ tess.numVertexes ];
-	normal = tess.normal[ tess.numVertexes ];
-	texCoords = tess.texCoords[ tess.numVertexes ][0];
-	color = tess.vertexColors[ tess.numVertexes ];
-	needsNormal = tess.shader->needsNormal;
-
-	for ( i = 0 ; i < srf->numVerts ; i++, dv++, xyz += 4, normal += 4, texCoords += 4, color += 4 ) {
-		xyz[0] = dv->xyz[0];
-		xyz[1] = dv->xyz[1];
-		xyz[2] = dv->xyz[2];
-
-		if ( needsNormal ) {
-			normal[0] = dv->normal[0];
-			normal[1] = dv->normal[1];
-			normal[2] = dv->normal[2];
-		}
-
-		texCoords[0] = dv->st[0];
-		texCoords[1] = dv->st[1];
-
-		texCoords[2] = dv->lightmap[0];
-		texCoords[3] = dv->lightmap[1];
-
-		*(int *)color = *(int *)dv->color;
-	}
-
-	for ( i = 0 ; i < srf->numVerts ; i++ ) {
-		tess.vertexDlightBits[ tess.numVertexes + i] = dlightBits;
-	}
-
-	tess.numVertexes += srf->numVerts;
-}
-
-
-
-/*
-==============
-RB_SurfaceBeam
-==============
-*/
-void RB_SurfaceBeam( void ) 
-{
-#define NUM_BEAM_SEGS 6
-	refEntity_t *e;
-	int	i;
-	vec3_t perpvec;
-	vec3_t direction, normalized_direction;
-	vec3_t	start_points[NUM_BEAM_SEGS], end_points[NUM_BEAM_SEGS];
-	vec3_t oldorigin, origin;
-
-	e = &backEnd.currentEntity->e;
-
-	oldorigin[0] = e->oldorigin[0];
-	oldorigin[1] = e->oldorigin[1];
-	oldorigin[2] = e->oldorigin[2];
-
-	origin[0] = e->origin[0];
-	origin[1] = e->origin[1];
-	origin[2] = e->origin[2];
-
-	normalized_direction[0] = direction[0] = oldorigin[0] - origin[0];
-	normalized_direction[1] = direction[1] = oldorigin[1] - origin[1];
-	normalized_direction[2] = direction[2] = oldorigin[2] - origin[2];
-
-	if ( VectorNormalize( normalized_direction ) == 0 )
-		return;
-
-	PerpendicularVector( perpvec, normalized_direction );
-
-	VectorScale( perpvec, 4, perpvec );
-
-	for ( i = 0; i < NUM_BEAM_SEGS ; i++ )
-	{
-		RotatePointAroundVector( start_points[i], normalized_direction, perpvec, (360.0/NUM_BEAM_SEGS)*i );
-//		VectorAdd( start_points[i], origin, start_points[i] );
-		VectorAdd( start_points[i], direction, end_points[i] );
-	}
-
-	GL_Bind( tr.whiteImage );
-
-	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE );
-
-	qglColor3f( 1, 0, 0 );
-
-	qglBegin( GL_TRIANGLE_STRIP );
-	for ( i = 0; i <= NUM_BEAM_SEGS; i++ ) {
-		qglVertex3fv( start_points[ i % NUM_BEAM_SEGS] );
-		qglVertex3fv( end_points[ i % NUM_BEAM_SEGS] );
-	}
-	qglEnd();
-}
-
-/*
-==============
-RB_SurfaceFace
-==============
-*/
-void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
-	int			i;
-	qboolean	needsNormal;
-	unsigned	*indices, *tessIndexes;
-	float		*v;
-	float		*normal;
-	int			ndx;
-	int			Bob;
-	int			numPoints;
-	int			dlightBits;
-
-	RB_CHECKOVERFLOW( surf->numPoints, surf->numIndices );
-
-	dlightBits = surf->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-
-	if ((tess.shader->surfaceFlags & SURF_NODLIGHT) || (tess.shader->surfaceFlags & SURF_SKY)) {
-		tess.dlightBits = 0;
-	}
-
-	indices = ( unsigned * ) ( ( ( char  * ) surf ) + surf->ofsIndices );
-
-	Bob = tess.numVertexes;
-	tessIndexes = tess.indexes + tess.numIndexes;
-	for ( i = surf->numIndices-1 ; i >= 0  ; i-- ) {
-		tessIndexes[i] = indices[i] + Bob;
-	}
-
-	tess.numIndexes += surf->numIndices;
-
-	numPoints = surf->numPoints;
-
-	needsNormal = qfalse;
-	if (tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights) {
-		needsNormal = qtrue;
-	}
-
-	v = surf->points[0];
-
-	ndx = tess.numVertexes;
-
-	if (needsNormal) {
-		normal = surf->plane.normal;
-		for ( i = 0, ndx = tess.numVertexes; i < numPoints; i++, ndx++ ) {
-			VectorCopy( normal, tess.normal[ndx] );
-		}
-	}
-
-	if (tess.dlightMap)
-	{
-		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
-			VectorCopy(v, tess.xyz[ndx]);
-			tess.texCoords[ndx][0][0] = v[3];
-			tess.texCoords[ndx][0][1] = v[4];
-			tess.texCoords[ndx][1][0] = v[5] + surf->lightmapOffset[0];
-			tess.texCoords[ndx][1][1] = v[6] + surf->lightmapOffset[1];
-			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
-			tess.vertexDlightBits[ndx] = dlightBits;
-		}
-	}
-	else
-	{
-		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
-			VectorCopy(v, tess.xyz[ndx]);
-			tess.texCoords[ndx][0][0] = v[3];
-			tess.texCoords[ndx][0][1] = v[4];
-			tess.texCoords[ndx][1][0] = v[5];
-			tess.texCoords[ndx][1][1] = v[6];
-			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
-			tess.vertexDlightBits[ndx] = dlightBits;
-		}
-	}
-
-
-	tess.numVertexes += surf->numPoints;
-}
-
-
-static float	LodErrorForVolume( vec3_t local, float radius ) {
-	vec3_t		world;
-	float		d;
-
-	// never let it go negative
-	if ( r_lodCurveError->value < 0 ) {
-		return 0;
-	}
-
-	world[0] = local[0] * backEnd.ori.axis[0][0] + local[1] * backEnd.ori.axis[1][0] + 
-		local[2] * backEnd.ori.axis[2][0] + backEnd.ori.origin[0];
-	world[1] = local[0] * backEnd.ori.axis[0][1] + local[1] * backEnd.ori.axis[1][1] + 
-		local[2] * backEnd.ori.axis[2][1] + backEnd.ori.origin[1];
-	world[2] = local[0] * backEnd.ori.axis[0][2] + local[1] * backEnd.ori.axis[1][2] + 
-		local[2] * backEnd.ori.axis[2][2] + backEnd.ori.origin[2];
-
-	VectorSubtract( world, backEnd.viewParms.ori.origin, world );
-	d = DotProduct( world, backEnd.viewParms.ori.axis[0] );
-
-	if ( d < 0 ) {
-		d = -d;
-	}
-	d -= radius;
-	if ( d < 1 ) {
-		d = 1;
-	}
-
-	return r_lodCurveError->value / d;
-}
-
-/*
-=============
-RB_SurfaceGrid
-
-Just copy the grid of points and triangulate
-=============
-*/
-void RB_SurfaceGrid( srfGridMesh_t *cv ) {
-	int		i, j;
-	float	*xyz;
-	float	*texCoords;
-	float	*normal;
-	unsigned char *color;
-	drawVert_t	*dv;
-	int		rows, irows, vrows;
-	int		used;
-	int		widthTable[MAX_GRID_SIZE];
-	int		heightTable[MAX_GRID_SIZE];
-	float	lodError;
-	int		lodWidth, lodHeight;
-	int		numVertexes;
-	int		dlightBits;
-	int		*vDlightBits;
-	qboolean	needsNormal;
-
-	dlightBits = cv->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-
-	if (tess.shader->surfaceFlags & (SURF_NODLIGHT | SURF_SKY)) {
-		tess.dlightBits = 0;
-	}
-
-	// determine the allowable discrepance
-	lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );
-
-	// determine which rows and columns of the subdivision
-	// we are actually going to use
-	widthTable[0] = 0;
-	lodWidth = 1;
-	for ( i = 1 ; i < cv->width-1 ; i++ ) {
-		if ( cv->widthLodError[i] <= lodError ) {
-			widthTable[lodWidth] = i;
-			lodWidth++;
-		}
-	}
-	widthTable[lodWidth] = cv->width-1;
-	lodWidth++;
-
-	heightTable[0] = 0;
-	lodHeight = 1;
-	for ( i = 1 ; i < cv->height-1 ; i++ ) {
-		if ( cv->heightLodError[i] <= lodError ) {
-			heightTable[lodHeight] = i;
-			lodHeight++;
-		}
-	}
-	heightTable[lodHeight] = cv->height-1;
-	lodHeight++;
-
-
-	// very large grids may have more points or indexes than can be fit
-	// in the tess structure, so we may have to issue it in multiple passes
-
-	used = 0;
-	rows = 0;
-	while ( used < lodHeight - 1 ) {
-		// see how many rows of both verts and indexes we can add without overflowing
-		do {
-			vrows = ( SHADER_MAX_VERTEXES - tess.numVertexes ) / lodWidth;
-			irows = ( SHADER_MAX_INDEXES - tess.numIndexes ) / ( lodWidth * 6 );
-
-			// if we don't have enough space for at least one strip, flush the buffer
-			if ( vrows < 2 || irows < 1 ) {
-				RB_EndSurface();
-				RB_BeginSurface(tess.shader);
-			} else {
-				break;
-			}
-		} while ( 1 );
-		
-		rows = irows;
-		if ( vrows < irows + 1 ) {
-			rows = vrows - 1;
-		}
-		if ( used + rows > lodHeight ) {
-			rows = lodHeight - used;
-		}
-
-		numVertexes = tess.numVertexes;
-
-		xyz = tess.xyz[numVertexes];
-		normal = tess.normal[numVertexes];
-		texCoords = tess.texCoords[numVertexes][0];
-		color = ( unsigned char * ) &tess.vertexColors[numVertexes];
-		vDlightBits = &tess.vertexDlightBits[numVertexes];
-		needsNormal = tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights;
-
-		if ( tess.dlightMap ) {
-			for ( i = 0 ; i < rows ; i++ ) {
-				for ( j = 0 ; j < lodWidth ; j++ ) {
-					dv = cv->verts + heightTable[ used + i ] * cv->width
-						+ widthTable[ j ];
-
-					xyz[0] = dv->xyz[0];
-					xyz[1] = dv->xyz[1];
-					xyz[2] = dv->xyz[2];
-					texCoords[0] = dv->st[0];
-					texCoords[1] = dv->st[1];
-					texCoords[2] = dv->lightmap[0] + cv->lightmapOffset[0];
-					texCoords[3] = dv->lightmap[1] + cv->lightmapOffset[1];
-					if ( needsNormal ) {
-						normal[0] = dv->normal[0];
-						normal[1] = dv->normal[1];
-						normal[2] = dv->normal[2];
-					}
-					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
-					*vDlightBits++ = dlightBits;
-					xyz += 4;
-					normal += 4;
-					texCoords += 4;
-					color += 4;
-				}
-			}
-		} else {
-			for ( i = 0 ; i < rows ; i++ ) {
-				for ( j = 0 ; j < lodWidth ; j++ ) {
-					dv = cv->verts + heightTable[ used + i ] * cv->width
-						+ widthTable[ j ];
-
-					xyz[0] = dv->xyz[0];
-					xyz[1] = dv->xyz[1];
-					xyz[2] = dv->xyz[2];
-					texCoords[0] = dv->st[0];
-					texCoords[1] = dv->st[1];
-					texCoords[2] = dv->lightmap[0];
-					texCoords[3] = dv->lightmap[1];
-					if ( needsNormal ) {
-						normal[0] = dv->normal[0];
-						normal[1] = dv->normal[1];
-						normal[2] = dv->normal[2];
-					}
-					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
-					*vDlightBits++ = dlightBits;
-					xyz += 4;
-					normal += 4;
-					texCoords += 4;
-					color += 4;
-				}
-			}
-		}
-
-
-		// add the indexes
-		{
-			int		numIndexes;
-			int		w, h;
-
-			h = rows - 1;
-			w = lodWidth - 1;
-			numIndexes = tess.numIndexes;
-			for (i = 0 ; i < h ; i++) {
-				for (j = 0 ; j < w ; j++) {
-					int		v1, v2, v3, v4;
-			
-					// vertex order to be reckognized as tristrips
-					v1 = numVertexes + i*lodWidth + j + 1;
-					v2 = v1 - 1;
-					v3 = v2 + lodWidth;
-					v4 = v3 + 1;
-
-					tess.indexes[numIndexes] = v2;
-					tess.indexes[numIndexes+1] = v3;
-					tess.indexes[numIndexes+2] = v1;
-					
-					tess.indexes[numIndexes+3] = v1;
-					tess.indexes[numIndexes+4] = v3;
-					tess.indexes[numIndexes+5] = v4;
-					numIndexes += 6;
-				}
-			}
-
-			tess.numIndexes = numIndexes;
-		}
-
-		tess.numVertexes += rows * lodWidth;
-
-		used += rows - 1;
-	}
-}
-
-
-/*
-===========================================================================
-
-NULL MODEL
-
-===========================================================================
-*/
-
-/*
-===================
-RB_SurfaceAxis
-
-Draws x/y/z lines from the origin for orientation debugging
-===================
-*/
-void RB_SurfaceAxis( void ) {
-	GL_Bind( tr.whiteImage );
-	qglLineWidth( 3 );
-	qglBegin( GL_LINES );
-	qglColor3f( 1,0,0 );
-	qglVertex3f( 0,0,0 );
-	qglVertex3f( 16,0,0 );
-	qglColor3f( 0,1,0 );
-	qglVertex3f( 0,0,0 );
-	qglVertex3f( 0,16,0 );
-	qglColor3f( 0,0,1 );
-	qglVertex3f( 0,0,0 );
-	qglVertex3f( 0,0,16 );
-	qglEnd();
-	qglLineWidth( 1 );
-}
-
-//===========================================================================
-
-/*
-====================
-RB_SurfaceEntity
-
-Entities that have a single procedurally generated surface
-====================
-*/
-void RB_SurfaceEntity( surfaceType_t *surfType ) {
-	switch( backEnd.currentEntity->e.reType ) {
-	case RT_SPRITE:
-		RB_SurfaceSprite();
-		break;
-	case RT_BEAM:
-		RB_SurfaceBeam();
-		break;
-	default:
-		RB_SurfaceAxis();
-		break;
-	}
-	return;
-}
-
-void RB_SurfaceBad( surfaceType_t *surfType ) {
-	ri.Printf( PRINT_ALL, "Bad surface tesselated.\n" );
-}
-
-#if 0
-
-void RB_SurfaceFlare( srfFlare_t *surf ) {
-	vec3_t		left, up;
-	float		radius;
-	byte		color[4];
-	vec3_t		dir;
-	vec3_t		origin;
-	float		d;
-
-	// calculate the xyz locations for the four corners
-	radius = 30;
-	VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
-	VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
-	if ( backEnd.viewParms.isMirror ) {
-		VectorSubtract( vec3_origin, left, left );
-	}
-
-	color[0] = color[1] = color[2] = color[3] = 255;
-
-	VectorMA( surf->origin, 3, surf->normal, origin );
-	VectorSubtract( origin, backEnd.viewParms.ori.origin, dir );
-	VectorNormalize( dir );
-	VectorMA( origin, r_ignore->value, dir, origin );
-
-	d = -DotProduct( dir, surf->normal );
-	if ( d < 0 ) {
-		return;
-	}
-#if 0
-	color[0] *= d;
-	color[1] *= d;
-	color[2] *= d;
-#endif
-
-	RB_AddQuadStamp( origin, left, up, color );
-}
-
-#else
-
-void RB_SurfaceFlare( srfFlare_t *surf ) {
-#if 0
-	vec3_t		left, up;
-	byte		color[4];
-
-	color[0] = surf->color[0] * 255;
-	color[1] = surf->color[1] * 255;
-	color[2] = surf->color[2] * 255;
-	color[3] = 255;
-
-	VectorClear( left );
-	VectorClear( up );
-
-	left[0] = r_ignore->value;
-
-	up[1] = r_ignore->value;
-	
-	RB_AddQuadStampExt( surf->origin, left, up, color, 0, 0, 1, 1 );
-#endif
-}
-
-#endif
-
-
-
-void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
-	// all apropriate state must be set in RB_BeginSurface
-	// this isn't implemented yet...
-	qglCallList( surf->listNum );
-}
-
-void RB_SurfaceSkip( void *surf ) {
-}
-
-void RB_DrawTerrainTris(srfTerrain_t* p) {
-	int i;
-	terraInt numv;
-	int dlightBits;
-
-	RB_CHECKOVERFLOW(p->nVerts, p->nTris * 3);
-
-	dlightBits = p->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-	if (p->dlightMap[backEnd.smpFrame])
-	{
-		float lmScale = (1.0 / LIGHTMAP_SIZE) / p->lmapStep;
-
-		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
-			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
-
-			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
-			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
-			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
-			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].xyz[0] * lmScale + p->lmapX;
-			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].xyz[1] * lmScale + p->lmapY;
-			tess.normal[tess.numVertexes][0] = 0;
-			tess.normal[tess.numVertexes][1] = 0;
-			tess.normal[tess.numVertexes][2] = 1.0;
-			tess.vertexColors[tess.numVertexes][0] = -1;
-			tess.vertexColors[tess.numVertexes][1] = -1;
-			tess.vertexColors[tess.numVertexes][2] = -1;
-			tess.vertexColors[tess.numVertexes][3] = -1;
-
-			g_pVert[i].iVertArray = tess.numVertexes;
-			tess.numVertexes++;
-		}
-	}
-	else
-	{
-		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
-			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
-
-			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
-			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
-			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
-			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].texCoords[1][0];
-			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].texCoords[1][1];
-			tess.vertexDlightBits[tess.numVertexes] = dlightBits;
-			tess.normal[tess.numVertexes][0] = 0;
-			tess.normal[tess.numVertexes][1] = 0;
-			tess.normal[tess.numVertexes][2] = 1.0;
-			tess.vertexColors[tess.numVertexes][0] = -1;
-			tess.vertexColors[tess.numVertexes][1] = -1;
-			tess.vertexColors[tess.numVertexes][2] = -1;
-			tess.vertexColors[tess.numVertexes][3] = -1;
-
-			g_pVert[i].iVertArray = tess.numVertexes;
-			tess.numVertexes++;
-		}
-	}
-
-	for (i = p->iTriHead; i; i = g_pTris[i].iNext)
-	{
-		assert(tess.numVertexes < SHADER_MAX_INDEXES);
-
-		//
-		// Make sure these can be drawn
-		//
-		if (g_pTris[i].byConstChecks & 4)
-		{
-			tess.indexes[tess.numIndexes] = g_pVert[g_pTris[i].iPt[0]].iVertArray;
-			tess.indexes[tess.numIndexes + 1] = g_pVert[g_pTris[i].iPt[1]].iVertArray;
-			tess.indexes[tess.numIndexes + 2] = g_pVert[g_pTris[i].iPt[2]].iVertArray;
-			tess.numIndexes += 3;
-		}
-	}
-}
-
-void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
-	(void(*)(void*))RB_SurfaceBad,			// SF_BAD, 
-	(void(*)(void*))RB_SurfaceSkip,			// SF_SKIP, 
-	(void(*)(void*))RB_SurfaceFace,			// SF_FACE,
-    (void(*)(void*))RB_SurfaceGrid,			// SF_GRID,
-    (void(*)(void*))RB_SurfacePolychain,	// SF_POLY,
-	(void(*)(void*))RB_SurfaceMarkFragment, // SF_MARK_FRAG
-    (void(*)(void*))RB_SurfaceFlare,		// SF_FLARE
-    (void(*)(void*))RB_SurfaceEntity,		// SF_ENTITY
-    (void(*)(void*))RB_SurfaceDisplayList,	// SF_DISPLAY_LIST
-	(void(*)(void*))RB_SkelMesh,			// SF_TIKI_SKEL
-	(void(*)(void*))RB_StaticMesh,			// SF_TIKI_STATIC
-	(void(*)(void*))RB_DrawSwipeSurface,	// SF_SWIPE
-	(void(*)(void*))RB_DrawSprite,			// SF_SPRITE
-	(void(*)(void*))RB_DrawTerrainTris,		// SF_TERRAIN_PATCH
-	(void(*)(void*))RB_SurfaceTriangles,	// SF_TRIANGLES,
-};
diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
deleted file mode 100644
index 0d4dab98..00000000
--- a/code/renderer/tr_world.c
+++ /dev/null
@@ -1,914 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-
-
-/*
-=================
-R_CullTriSurf
-
-Returns true if the grid is completely culled away.
-Also sets the clipped hint bit in tess
-=================
-*/
-static qboolean	R_CullTriSurf( srfTriangles_t *cv ) {
-	int 	boxCull;
-
-	boxCull = R_CullLocalBox( cv->bounds );
-
-	if ( boxCull == CULL_OUT ) {
-		return qtrue;
-	}
-	return qfalse;
-}
-
-/*
-=================
-R_CullGrid
-
-Returns true if the grid is completely culled away.
-Also sets the clipped hint bit in tess
-=================
-*/
-static qboolean	R_CullGrid( srfGridMesh_t *cv ) {
-	int 	boxCull;
-	int 	sphereCull;
-
-	if ( r_nocurves->integer ) {
-		return qtrue;
-	}
-
-	if (!tr.refdef.render_terrain) {
-		return qtrue;
-	}
-
-	if ( tr.currentEntityNum != ENTITYNUM_WORLD ) {
-		sphereCull = R_CullLocalPointAndRadius( cv->localOrigin, cv->meshRadius );
-	} else {
-		sphereCull = R_CullPointAndRadius( cv->localOrigin, cv->meshRadius );
-	}
-	boxCull = CULL_OUT;
-	
-	// check for trivial reject
-	if ( sphereCull == CULL_OUT )
-	{
-		tr.pc.c_sphere_cull_patch_out++;
-		return qtrue;
-	}
-	// check bounding box if necessary
-	else if ( sphereCull == CULL_CLIP )
-	{
-		tr.pc.c_sphere_cull_patch_clip++;
-
-		boxCull = R_CullLocalBox( cv->meshBounds );
-
-		if ( boxCull == CULL_OUT ) 
-		{
-			tr.pc.c_box_cull_patch_out++;
-			return qtrue;
-		}
-		else if ( boxCull == CULL_IN )
-		{
-			tr.pc.c_box_cull_patch_in++;
-		}
-		else
-		{
-			tr.pc.c_box_cull_patch_clip++;
-		}
-	}
-	else
-	{
-		tr.pc.c_sphere_cull_patch_in++;
-	}
-
-	return qfalse;
-}
-
-
-/*
-================
-R_CullSurface
-
-Tries to back face cull surfaces before they are lighted or
-added to the sorting list.
-
-This will also allow mirrors on both sides of a model without recursion.
-================
-*/
-static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
-	srfSurfaceFace_t *sface;
-	float			d;
-
-	if ( r_nocull->integer ) {
-		return qfalse;
-	}
-
-	if ( *surface == SF_GRID ) {
-		return R_CullGrid( (srfGridMesh_t *)surface );
-	}
-
-	if ( *surface == SF_TRIANGLES ) {
-		return R_CullTriSurf( (srfTriangles_t *)surface );
-	}
-
-	if ( *surface != SF_FACE ) {
-		return qfalse;
-	}
-
-	if ( shader->cullType == CT_TWO_SIDED ) {
-		return qfalse;
-	}
-
-	// face culling
-	if ( !r_facePlaneCull->integer ) {
-		return qfalse;
-	}
-
-	sface = ( srfSurfaceFace_t * ) surface;
-	d = DotProduct (tr.ori.viewOrigin, sface->plane.normal);
-
-	// don't cull exactly on the plane, because there are levels of rounding
-	// through the BSP, ICD, and hardware that may cause pixel gaps if an
-	// epsilon isn't allowed here 
-	if ( shader->cullType == CT_FRONT_SIDED ) {
-		if ( d < sface->plane.dist - 8 ) {
-			return qtrue;
-		}
-	} else {
-		if ( d > sface->plane.dist + 8 ) {
-			return qtrue;
-		}
-	}
-
-	return qfalse;
-}
-
-/*
-======================
-R_FastDlightFace
-======================
-*/
-static int R_FastDlightFace( srfSurfaceFace_t *face, int dlightBits ) {
-	float		d;
-	int			i;
-	dlight_t	*dl;
-
-	for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-		if ( ! ( dlightBits & ( 1 << i ) ) ) {
-			continue;
-		}
-		dl = &tr.refdef.dlights[i];
-		d = DotProduct( dl->transformed, face->plane.normal ) - face->plane.dist;
-		if ( d < -dl->radius || d > dl->radius ) {
-			// dlight doesn't reach the plane
-			dlightBits &= ~( 1 << i );
-		}
-	}
-
-	if ( !dlightBits ) {
-		tr.pc.c_dlightSurfacesCulled++;
-	}
-
-	face->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-}
-
-/*
-======================
-R_FastDlightGrid
-======================
-*/
-static int R_FastDlightGrid( srfGridMesh_t *grid, int dlightBits ) {
-	int			i;
-	dlight_t	*dl;
-
-	for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-		if ( ! ( dlightBits & ( 1 << i ) ) ) {
-			continue;
-		}
-		dl = &tr.refdef.dlights[i];
-		if ( dl->origin[0] - dl->radius > grid->meshBounds[1][0]
-			|| dl->origin[0] + dl->radius < grid->meshBounds[0][0]
-			|| dl->origin[1] - dl->radius > grid->meshBounds[1][1]
-			|| dl->origin[1] + dl->radius < grid->meshBounds[0][1]
-			|| dl->origin[2] - dl->radius > grid->meshBounds[1][2]
-			|| dl->origin[2] + dl->radius < grid->meshBounds[0][2] ) {
-			// dlight doesn't reach the bounds
-			dlightBits &= ~( 1 << i );
-		}
-	}
-
-	if ( !dlightBits ) {
-		tr.pc.c_dlightSurfacesCulled++;
-	}
-
-	grid->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-}
-
-/*
-======================
-R_FastDlightTerrain
-======================
-*/
-static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
-    dlight_t* dl;
-    float* origin;
-    int i;
-
-    for (i = 0; i < tr.refdef.num_dlights; i++) {
-        dl = &tr.refdef.dlights[i];
-        origin = dl->transformed;
-
-        if (srf->x0 - origin[0] > dl->radius
-            || srf->x0 - origin[0] < -512.0 - dl->radius
-            || srf->y0 - origin[1] > dl->radius
-            || srf->y0 - origin[1] < -512.0 - dl->radius
-            || srf->z0 - origin[2] > dl->radius
-            || srf->z0 - origin[2] < -srf->zmax - dl->radius
-            ) {
-            // dlight doesn't reach the bounds
-            dlightBits &= ~(1 << i);
-        }
-    }
-
-    if (!dlightBits) {
-        tr.pc.c_dlightSurfacesCulled++;
-    }
-
-    srf->drawinfo.dlightBits[tr.smpFrame] = dlightBits;
-    return dlightBits;
-}
-
-/*
-======================
-R_DlightTrisurf
-======================
-*/
-static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
-	// FIXME: more dlight culling to trisurfs...
-	surf->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-#if 0
-	int			i;
-	dlight_t	*dl;
-
-	for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-		if ( ! ( dlightBits & ( 1 << i ) ) ) {
-			continue;
-		}
-		dl = &tr.refdef.dlights[i];
-		if ( dl->origin[0] - dl->radius > grid->meshBounds[1][0]
-			|| dl->origin[0] + dl->radius < grid->meshBounds[0][0]
-			|| dl->origin[1] - dl->radius > grid->meshBounds[1][1]
-			|| dl->origin[1] + dl->radius < grid->meshBounds[0][1]
-			|| dl->origin[2] - dl->radius > grid->meshBounds[1][2]
-			|| dl->origin[2] + dl->radius < grid->meshBounds[0][2] ) {
-			// dlight doesn't reach the bounds
-			dlightBits &= ~( 1 << i );
-		}
-	}
-
-	if ( !dlightBits ) {
-		tr.pc.c_dlightSurfacesCulled++;
-	}
-
-	grid->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-#endif
-}
-
-/*
-====================
-R_DlightSurface
-
-The given surface is going to be drawn, and it touches a leaf
-that is touched by one or more dlights, so try to throw out
-more dlights if possible.
-====================
-*/
-static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
-	int dlightMap;
-
-	dlightMap = 0;
-
-	if ( *surf->data == SF_FACE ) {
-		if (!r_fastdlights->integer) {
-			if (surf->shader->lightmapIndex >= 0) {
-				dlightMap = R_RealDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
-			} else {
-				((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-				dlightMap = 0;
-			}
-			return dlightMap;
-        } else {
-			dlightBits = R_FastDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
-		}
-	} else if ( *surf->data == SF_GRID ) {
-		if (!r_fastdlights->integer) {
-			if (surf->shader->lightmapIndex >= 0) {
-				dlightMap = R_RealDlightPatch((srfGridMesh_t*)surf->data, dlightBits);
-			} else {
-				((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0.f;
-				dlightMap = 0;
-            }
-            return dlightMap;
-        } else {
-            dlightBits = R_FastDlightGrid((srfGridMesh_t*)surf->data, dlightBits);
-		}
-	} else {
-		return dlightMap;
-	}
-
-	if (dlightBits) {
-		tr.pc.c_dlightSurfaces++;
-		return 1;
-	}
-
-	return dlightMap;
-}
-
-/*
-======================
-R_DlightTerrain
-======================
-*/
-int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
-{
-	int dlightMap;
-
-    dlightMap = 0;
-
-    if (r_fastdlights->integer)
-    {
-        if (R_FastDlightTerrain(surf, dlightBits)) {
-            ++tr.pc.c_dlightSurfaces;
-			dlightMap = 1;
-        }
-    } else if (surf->shader->lightmapIndex < 0) {
-        surf->drawinfo.dlightMap[tr.smpFrame] = 0;
-    } else {
-		dlightMap = R_RealDlightTerrain(surf, dlightBits);
-    }
-
-    return dlightMap;
-}
-
-/*
-======================
-R_CheckDlightSurface
-======================
-*/
-static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
-{
-    if (dlightBits && surf->frameCount != tr.frameCount)
-    {
-        surf->frameCount = tr.frameCount;
-        return R_DlightSurface(surf, dlightBits);
-    }
-
-	if (dlightBits)
-	{
-		//
-		// Added in 2.0
-		//  Return the existing dlight map
-		if (*surf->data == SF_FACE)
-		{
-			return ((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame];
-		}
-		else if (*surf->data == SF_GRID)
-		{
-			return ((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame];
-		}
-	}
-	else
-	{
-		if (*surf->data == SF_FACE)
-		{
-			((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-			((srfSurfaceFace_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
-		}
-		else if (*surf->data == SF_GRID)
-		{
-			((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-			((srfGridMesh_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
-		}
-	}
-
-    return 0;
-}
-
-/*
-======================
-R_CheckDlightTerrain
-======================
-*/
-int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
-{
-	if (surf->frameCount == tr.frameCount) {
-		return surf->drawinfo.dlightMap[tr.smpFrame];
-	}
-
-	surf->frameCount = tr.frameCount;
-	if (dlightBits) {
-		return R_DlightTerrain(surf, dlightBits);
-	}
-
-	surf->drawinfo.dlightMap[tr.smpFrame] = 0;
-	surf->drawinfo.dlightBits[tr.smpFrame] = 0;
-	return 0;
-}
-
-/*
-======================
-R_AddWorldSurface
-======================
-*/
-static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
-	//if ( surf->viewCount == tr.viewCount ) {
-	//	return;		// already in this view
-	//}
-
-	surf->viewCount = tr.viewCount;
-	// FIXME: bmodel fog?
-
-	// try to cull before dlighting or adding
-	if ( R_CullSurface( surf->data, surf->shader ) ) {
-		return;
-	}
-
-	// check for dlighting
-	dlightBits = R_CheckDlightSurface(surf, dlightBits);
-	if (surf->shader && surf->shader->isPortalSky) {
-		// Sky portal
-		R_Sky_AddSurf(surf);
-		return;
-	}
-
-	R_AddDrawSurf( surf->data, surf->shader, dlightBits );
-}
-
-/*
-=============================================================
-
-	BRUSH MODELS
-
-=============================================================
-*/
-
-/*
-=================
-R_AddBrushModelSurfaces
-=================
-*/
-void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
-	bmodel_t	*bmodel;
-	int			clip;
-	model_t		*pModel;
-	int			i;
-
-	pModel = R_GetModelByHandle( ent->e.hModel );
-
-	bmodel = pModel->d.bmodel;
-
-	clip = R_CullLocalBox( bmodel->bounds );
-	if ( clip == CULL_OUT ) {
-		return;
-	}
-	
-	R_DlightBmodel( bmodel );
-
-	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
-		R_AddWorldSurface( bmodel->firstSurface + i, tr.currentEntity->needDlights );
-	}
-}
-
-
-/*
-=============================================================
-
-	WORLD MODEL
-
-=============================================================
-*/
-
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
-{
-	bmodel_t* bmodel;
-
-	bmodel = &tr.world->bmodels[iIndex];
-	VectorCopy(bmodel->bounds[0], vMins);
-	VectorCopy(bmodel->bounds[1], vMaxs);
-}
-
-
-/*
-================
-R_RecursiveWorldNode
-================
-*/
-static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits ) {
-
-	do {
-		// if the node wasn't marked as potentially visible, exit
-		if (node->visframe != tr.visCount) {
-			return;
-		}
-
-		// if the bounding volume is outside the frustum, nothing
-		// inside can be visible OPTIMIZE: don't do this all the way to leafs?
-
-		if ( !r_nocull->integer ) {
-			int		r;
-
-			if (planeBits & 1) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[0]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~1;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 2) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[1]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~2;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 4) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[2]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~4;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 8) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[3]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~8;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 16) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[4]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~16;			// all descendants will also be in front
-				}
-			}
-
-		}
-
-		if ( node->contents != -1 ) {
-			break;
-		}
-
-		// recurse down the children, front side first
-		R_RecursiveWorldNode (node->children[0], planeBits, dlightBits);
-
-		// tail recurse
-		node = node->children[1];
-	} while ( 1 );
-
-	{
-		// leaf node, so add mark surfaces
-		int			c;
-		msurface_t	*surf, **mark;
-
-		tr.pc.c_leafs++;
-
-		// add to z buffer bounds
-		if ( node->mins[0] < tr.viewParms.visBounds[0][0] ) {
-			tr.viewParms.visBounds[0][0] = node->mins[0];
-		}
-		if ( node->mins[1] < tr.viewParms.visBounds[0][1] ) {
-			tr.viewParms.visBounds[0][1] = node->mins[1];
-		}
-		if ( node->mins[2] < tr.viewParms.visBounds[0][2] ) {
-			tr.viewParms.visBounds[0][2] = node->mins[2];
-		}
-
-		if ( node->maxs[0] > tr.viewParms.visBounds[1][0] ) {
-			tr.viewParms.visBounds[1][0] = node->maxs[0];
-		}
-		if ( node->maxs[1] > tr.viewParms.visBounds[1][1] ) {
-			tr.viewParms.visBounds[1][1] = node->maxs[1];
-		}
-		if ( node->maxs[2] > tr.viewParms.visBounds[1][2] ) {
-			tr.viewParms.visBounds[1][2] = node->maxs[2];
-		}
-
-		tr.portalsky.cntNode = node;
-
-		if (r_drawbrushes->integer) {
-			// add the individual surfaces
-			mark = node->firstmarksurface;
-			c = node->nummarksurfaces;
-			while (c--) {
-				// the surface may have already been added if it
-				// spans multiple leafs
-				surf = *mark;
-				if (surf->viewCount != tr.viewCount) {
-					R_AddWorldSurface(surf, dlightBits);
-				}
-				mark++;
-			}
-		}
-
-		if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky)
-		{
-			int i;
-
-			for (i = 0; i < node->numTerraPatches; i++) {
-				R_MarkTerrainPatch(tr.world->visTerraPatches[node->firstTerraPatch + i]);
-			}
-		}
-
-		if (r_drawstaticdecals->integer) {
-			if (node->pFirstMarkFragment) {
-				R_AddPermanentMarkFragmentSurfaces(node->pFirstMarkFragment, node->iNumMarkFragment);
-			}
-		}
-
-		if (r_drawstaticmodels->integer) {
-			int i;
-
-			for (i = 0; i < node->numStaticModels; i++) {
-				tr.world->visStaticModels[node->firstStaticModel + i]->visCount = tr.visCount;
-			}
-		}
-	}
-
-}
-
-int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes) {
-	mnode_t* nodestack[1024];
-	int iNodeStackPos;
-	mnode_t* pCurNode;
-	int nFoundNodes;
-
-	iNodeStackPos = 0;
-	pCurNode = tr.world->nodes;
-	nFoundNodes = 0;
-
-	while (1)
-    {
-        cplane_t* plane;
-		float d;
-
-		while (pCurNode->contents == -1)
-		{
-			plane = pCurNode->plane;
-			if (plane->type >= PLANE_NON_AXIAL) {
-				d = DotProduct(p, plane->normal) - plane->dist;
-			} else {
-				d = p[plane->type] - plane->dist;
-			}
-
-            if (d < r) {
-                if (d > -r) {
-                    nodestack[iNodeStackPos++] = pCurNode->children[0];
-                }
-                pCurNode = pCurNode->children[1];
-            } else {
-                pCurNode = pCurNode->children[0];
-			}
-		}
-
-		nodes[nFoundNodes++] = pCurNode;
-		if (!iNodeStackPos || nFoundNodes == nMaxNodes) {
-			break;
-		}
-
-		iNodeStackPos--;
-        pCurNode = nodestack[iNodeStackPos];
-	}
-
-	return nFoundNodes;
-}
-/*
-===============
-R_PointInLeaf
-===============
-*/
-mnode_t *R_PointInLeaf( const vec3_t p ) {
-	mnode_t		*node;
-	float		d;
-	cplane_t	*plane;
-	
-	if ( !tr.world ) {
-		ri.Error (ERR_DROP, "R_PointInLeaf: bad model");
-	}
-	
-	node = tr.world->nodes;
-	while( 1 ) {
-		if (node->contents != -1) {
-			break;
-		}
-		plane = node->plane;
-		d = DotProduct (p,plane->normal) - plane->dist;
-		if (d > 0) {
-			node = node->children[0];
-		} else {
-			node = node->children[1];
-		}
-	}
-	
-	return node;
-}
-
-/*
-==============
-R_ClusterPVS
-==============
-*/
-static const byte *R_ClusterPVS (int cluster) {
-	if (!tr.world || !tr.world->vis || cluster < 0 || cluster >= tr.world->numClusters ) {
-		return tr.world->novis;
-	}
-
-	return tr.world->vis + cluster * tr.world->clusterBytes;
-}
-
-/*
-=================
-R_inPVS
-=================
-*/
-qboolean R_inPVS( const vec3_t p1, const vec3_t p2 ) {
-	mnode_t *leaf;
-	byte	*vis;
-
-	leaf = R_PointInLeaf( p1 );
-	vis = CM_ClusterPVS( leaf->cluster );
-	leaf = R_PointInLeaf( p2 );
-
-	if ( !(vis[leaf->cluster>>3] & (1<<(leaf->cluster&7))) ) {
-		return qfalse;
-	}
-	return qtrue;
-}
-
-/*
-===============
-R_MarkLeaves
-
-Mark the leaves and nodes that are in the PVS for the current
-cluster
-===============
-*/
-static void R_MarkLeaves (void) {
-	const byte	*vis;
-	mnode_t	*leaf, *parent;
-	int		i;
-	int		cluster;
-
-	// lockpvs lets designers walk around to determine the
-	// extent of the current pvs
-	if ( r_lockpvs->integer ) {
-		return;
-	}
-
-	// current viewcluster
-	leaf = R_PointInLeaf( tr.viewParms.pvsOrigin );
-	cluster = leaf->cluster;
-
-	// if the cluster is the same and the area visibility matrix
-	// hasn't changed, we don't need to mark everything again
-
-	// if r_showcluster was just turned on, remark everything 
-	if ( tr.viewCluster == cluster && !tr.refdef.areamaskModified 
-		&& !r_showcluster->modified ) {
-		return;
-	}
-
-	if ( r_showcluster->modified || r_showcluster->integer ) {
-		r_showcluster->modified = qfalse;
-		if ( r_showcluster->integer ) {
-			ri.Printf( PRINT_ALL, "cluster:%i  area:%i\n", cluster, leaf->area );
-		}
-	}
-
-	tr.visCount++;
-	tr.viewCluster = cluster;
-
-	if ( r_novis->integer || tr.viewCluster == -1 ) {
-		for (i=0 ; i<tr.world->numnodes ; i++) {
-			if (tr.world->nodes[i].contents != CONTENTS_SOLID) {
-				tr.world->nodes[i].visframe = tr.visCount;
-			}
-		}
-		return;
-	}
-
-	vis = R_ClusterPVS (tr.viewCluster);
-	
-	for (i=0,leaf=tr.world->nodes ; i<tr.world->numnodes ; i++, leaf++) {
-		cluster = leaf->cluster;
-		if ( cluster < 0 || cluster >= tr.world->numClusters ) {
-			continue;
-		}
-
-		// check general pvs
-		if ( !(vis[cluster>>3] & (1<<(cluster&7))) ) {
-			continue;
-		}
-
-		// check for door connection
-		if ( (tr.refdef.areamask[leaf->area>>3] & (1<<(leaf->area&7)) ) ) {
-			continue;		// not visible
-		}
-
-		parent = leaf;
-		do {
-			if (parent->visframe == tr.visCount)
-				break;
-			parent->visframe = tr.visCount;
-			parent = parent->parent;
-		} while (parent);
-	}
-}
-
-
-/*
-=============
-R_AddWorldSurfaces
-=============
-*/
-void R_AddWorldSurfaces (void) {
-	if (!r_drawworld->integer) {
-		return;
-	}
-
-	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
-		return;
-	}
-
-	tr.currentEntityNum = ENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-
-	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
-		R_TerrainPrepareFrame();
-	}
-
-	// determine which leaves are in the PVS / areamask
-	R_MarkLeaves();
-
-	// clear out the visible min/max
-	ClearBounds(tr.viewParms.visBounds[0], tr.viewParms.visBounds[1]);
-
-	// perform frustum culling and add all the potentially visible surfaces
-	if (tr.refdef.num_dlights > 32) {
-		tr.refdef.num_dlights = 32;
-	}
-	R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.viewParms.world);
-	R_RecursiveWorldNode(tr.world->nodes, tr.viewParms.fog.extrafrustums ? 31 : 15, (1 << tr.refdef.num_dlights) - 1);
-
-	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
-		R_AddTerrainSurfaces();
-	}
-	if (r_drawstaticmodels->integer) {
-		R_AddStaticModelSurfaces();
-	}
-
-	if (g_bInfostaticmodels) {
-		g_bInfostaticmodels = 0;
-		R_PrintInfoStaticModels();
-	}
-
-	R_UpdateLevelMarksSystem();
-}
diff --git a/code/renderer/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
similarity index 100%
rename from code/renderer/CMakeLists.txt
rename to code/renderergl1/CMakeLists.txt
diff --git a/code/renderer/qgl.h b/code/renderergl1/qgl.h
similarity index 100%
rename from code/renderer/qgl.h
rename to code/renderergl1/qgl.h
diff --git a/code/renderer/qgl_linked.h b/code/renderergl1/qgl_linked.h
similarity index 100%
rename from code/renderer/qgl_linked.h
rename to code/renderergl1/qgl_linked.h
diff --git a/code/renderer/ref_trin.def b/code/renderergl1/ref_trin.def
similarity index 100%
rename from code/renderer/ref_trin.def
rename to code/renderergl1/ref_trin.def
diff --git a/code/renderer/renderer.vcproj b/code/renderergl1/renderer.vcproj
similarity index 100%
rename from code/renderer/renderer.vcproj
rename to code/renderergl1/renderer.vcproj
diff --git a/code/renderergl1/tr_altivec.c b/code/renderergl1/tr_altivec.c
deleted file mode 100644
index 914aa448..00000000
--- a/code/renderergl1/tr_altivec.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-/* This file is only compiled for PowerPC builds with Altivec support.
-   Altivec intrinsics need to be in a separate file, so GCC's -maltivec
-   command line can enable them, but give us the option to _not_ use that
-   on other files, where the compiler might then generate Altivec
-   instructions for normal floating point, crashing on G3 (etc) processors. */
-
-#include "tr_local.h" 
-
-#if idppc_altivec
-
-#if !defined(__APPLE__)
-#include <altivec.h>
-#endif
-
-void ProjectDlightTexture_altivec( void ) {
-	int		i, l;
-	vec_t	origin0, origin1, origin2;
-	float   texCoords0, texCoords1;
-	vector float floatColorVec0, floatColorVec1;
-	vector float modulateVec, colorVec, zero;
-	vector short colorShort;
-	vector signed int colorInt;
-	vector unsigned char floatColorVecPerm, modulatePerm, colorChar;
-	vector unsigned char vSel = VECCONST_UINT8(0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff);
-	float	*texCoords;
-	byte	*colors;
-	byte	clipBits[SHADER_MAX_VERTEXES];
-	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
-	byte	colorArray[SHADER_MAX_VERTEXES][4];
-	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
-	int		numIndexes;
-	float	scale;
-	float	radius;
-	vec3_t	floatColor;
-	float	modulate = 0.0f;
-
-	if ( !backEnd.refdef.num_dlights ) {
-		return;
-	}
-
-	// There has to be a better way to do this so that floatColor
-	// and/or modulate are already 16-byte aligned.
-	floatColorVecPerm = vec_lvsl(0,(float *)floatColor);
-	modulatePerm = vec_lvsl(0,(float *)&modulate);
-	modulatePerm = (vector unsigned char)vec_splat((vector unsigned int)modulatePerm,0);
-	zero = (vector float)vec_splat_s8(0);
-
-	for ( l = 0 ; l < backEnd.refdef.num_dlights ; l++ ) {
-		dlight_t	*dl;
-
-		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
-			continue;	// this surface definitely doesn't have any of this light
-		}
-		texCoords = texCoordsArray[0];
-		colors = colorArray[0];
-
-		dl = &backEnd.refdef.dlights[l];
-		origin0 = dl->transformed[0];
-		origin1 = dl->transformed[1];
-		origin2 = dl->transformed[2];
-		radius = dl->radius;
-		scale = 1.0f / radius;
-
-		if(r_greyscale->integer)
-		{
-			float luminance;
-			
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = floatColor[1] = floatColor[2] = luminance;
-		}
-		else if(r_greyscale->value)
-		{
-			float luminance;
-			
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = LERP(dl->color[0] * 255.0f, luminance, r_greyscale->value);
-			floatColor[1] = LERP(dl->color[1] * 255.0f, luminance, r_greyscale->value);
-			floatColor[2] = LERP(dl->color[2] * 255.0f, luminance, r_greyscale->value);
-		}
-		else
-		{
-			floatColor[0] = dl->color[0] * 255.0f;
-			floatColor[1] = dl->color[1] * 255.0f;
-			floatColor[2] = dl->color[2] * 255.0f;
-		}
-		floatColorVec0 = vec_ld(0, floatColor);
-		floatColorVec1 = vec_ld(11, floatColor);
-		floatColorVec0 = vec_perm(floatColorVec0,floatColorVec0,floatColorVecPerm);
-		for ( i = 0 ; i < tess.numVertexes ; i++, texCoords += 2, colors += 4 ) {
-			int		clip = 0;
-			vec_t dist0, dist1, dist2;
-			
-			dist0 = origin0 - tess.xyz[i][0];
-			dist1 = origin1 - tess.xyz[i][1];
-			dist2 = origin2 - tess.xyz[i][2];
-
-			backEnd.pc.c_dlightVertexes++;
-
-			texCoords0 = 0.5f + dist0 * scale;
-			texCoords1 = 0.5f + dist1 * scale;
-
-			if( !r_dlightBacks->integer &&
-					// dist . tess.normal[i]
-					( dist0 * tess.normal[i][0] +
-					dist1 * tess.normal[i][1] +
-					dist2 * tess.normal[i][2] ) < 0.0f ) {
-				clip = 63;
-			} else {
-				if ( texCoords0 < 0.0f ) {
-					clip |= 1;
-				} else if ( texCoords0 > 1.0f ) {
-					clip |= 2;
-				}
-				if ( texCoords1 < 0.0f ) {
-					clip |= 4;
-				} else if ( texCoords1 > 1.0f ) {
-					clip |= 8;
-				}
-				texCoords[0] = texCoords0;
-				texCoords[1] = texCoords1;
-
-				// modulate the strength based on the height and color
-				if ( dist2 > radius ) {
-					clip |= 16;
-					modulate = 0.0f;
-				} else if ( dist2 < -radius ) {
-					clip |= 32;
-					modulate = 0.0f;
-				} else {
-					dist2 = Q_fabs(dist2);
-					if ( dist2 < radius * 0.5f ) {
-						modulate = 1.0f;
-					} else {
-						modulate = 2.0f * (radius - dist2) * scale;
-					}
-				}
-			}
-			clipBits[i] = clip;
-
-			modulateVec = vec_ld(0,(float *)&modulate);
-			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
-			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
-			colorInt = vec_cts(colorVec,0);	// RGBx
-			colorShort = vec_pack(colorInt,colorInt);		// RGBxRGBx
-			colorChar = vec_packsu(colorShort,colorShort);	// RGBxRGBxRGBxRGBx
-			colorChar = vec_sel(colorChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
-		}
-
-		// build a list of triangles that need light
-		numIndexes = 0;
-		for ( i = 0 ; i < tess.numIndexes ; i += 3 ) {
-			int		a, b, c;
-
-			a = tess.indexes[i];
-			b = tess.indexes[i+1];
-			c = tess.indexes[i+2];
-			if ( clipBits[a] & clipBits[b] & clipBits[c] ) {
-				continue;	// not lighted
-			}
-			hitIndexes[numIndexes] = a;
-			hitIndexes[numIndexes+1] = b;
-			hitIndexes[numIndexes+2] = c;
-			numIndexes += 3;
-		}
-
-		if ( !numIndexes ) {
-			continue;
-		}
-
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-		qglTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] );
-
-		qglEnableClientState( GL_COLOR_ARRAY );
-		qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray );
-
-		GL_Bind( tr.dlightImage );
-		// include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light
-		// where they aren't rendered
-		if ( dl->additive ) {
-			GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		else {
-			GL_State( GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		R_DrawElements( numIndexes, hitIndexes );
-		backEnd.pc.c_totalIndexes += numIndexes;
-		backEnd.pc.c_dlightIndexes += numIndexes;
-	}
-}
-
-void RB_CalcDiffuseColor_altivec( unsigned char *colors )
-{
-	int				i;
-	float			*v, *normal;
-	trRefEntity_t	*ent;
-	int				ambientLightInt;
-	vec3_t			lightDir;
-	int				numVertexes;
-	vector unsigned char vSel = VECCONST_UINT8(0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff);
-	vector float ambientLightVec;
-	vector float directedLightVec;
-	vector float lightDirVec;
-	vector float normalVec0, normalVec1;
-	vector float incomingVec0, incomingVec1, incomingVec2;
-	vector float zero, jVec;
-	vector signed int jVecInt;
-	vector signed short jVecShort;
-	vector unsigned char jVecChar, normalPerm;
-	ent = backEnd.currentEntity;
-	ambientLightInt = ent->ambientLightInt;
-	// A lot of this could be simplified if we made sure
-	// entities light info was 16-byte aligned.
-	jVecChar = vec_lvsl(0, ent->ambientLight);
-	ambientLightVec = vec_ld(0, (vector float *)ent->ambientLight);
-	jVec = vec_ld(11, (vector float *)ent->ambientLight);
-	ambientLightVec = vec_perm(ambientLightVec,jVec,jVecChar);
-
-	jVecChar = vec_lvsl(0, ent->directedLight);
-	directedLightVec = vec_ld(0,(vector float *)ent->directedLight);
-	jVec = vec_ld(11,(vector float *)ent->directedLight);
-	directedLightVec = vec_perm(directedLightVec,jVec,jVecChar);	 
-
-	jVecChar = vec_lvsl(0, ent->lightDir);
-	lightDirVec = vec_ld(0,(vector float *)ent->lightDir);
-	jVec = vec_ld(11,(vector float *)ent->lightDir);
-	lightDirVec = vec_perm(lightDirVec,jVec,jVecChar);	 
-
-	zero = (vector float)vec_splat_s8(0);
-	VectorCopy( ent->lightDir, lightDir );
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-	normalPerm = vec_lvsl(0,normal);
-	numVertexes = tess.numVertexes;
-	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
-		normalVec0 = vec_ld(0,(vector float *)normal);
-		normalVec1 = vec_ld(11,(vector float *)normal);
-		normalVec0 = vec_perm(normalVec0,normalVec1,normalPerm);
-		incomingVec0 = vec_madd(normalVec0, lightDirVec, zero);
-		incomingVec1 = vec_sld(incomingVec0,incomingVec0,4);
-		incomingVec2 = vec_add(incomingVec0,incomingVec1);
-		incomingVec1 = vec_sld(incomingVec1,incomingVec1,4);
-		incomingVec2 = vec_add(incomingVec2,incomingVec1);
-		incomingVec0 = vec_splat(incomingVec2,0);
-		incomingVec0 = vec_max(incomingVec0,zero);
-		normalPerm = vec_lvsl(12,normal);
-		jVec = vec_madd(incomingVec0, directedLightVec, ambientLightVec);
-		jVecInt = vec_cts(jVec,0);	// RGBx
-		jVecShort = vec_pack(jVecInt,jVecInt);		// RGBxRGBx
-		jVecChar = vec_packsu(jVecShort,jVecShort);	// RGBxRGBxRGBxRGBx
-		jVecChar = vec_sel(jVecChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-		vec_ste((vector unsigned int)jVecChar,0,(unsigned int *)&colors[i*4]);	// store color
-	}
-}
-
-void LerpMeshVertexes_altivec(md3Surface_t *surf, float backlerp)
-{
-	short	*oldXyz, *newXyz, *oldNormals, *newNormals;
-	float	*outXyz, *outNormal;
-	float	oldXyzScale QALIGN(16);
-	float   newXyzScale QALIGN(16);
-	float	oldNormalScale QALIGN(16);
-	float newNormalScale QALIGN(16);
-	int		vertNum;
-	unsigned lat, lng;
-	int		numVerts;
-
-	outXyz = tess.xyz[tess.numVertexes];
-	outNormal = tess.normal[tess.numVertexes];
-
-	newXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-		+ (backEnd.currentEntity->e.frame * surf->numVerts * 4);
-	newNormals = newXyz + 3;
-
-	newXyzScale = MD3_XYZ_SCALE * (1.0 - backlerp);
-	newNormalScale = 1.0 - backlerp;
-
-	numVerts = surf->numVerts;
-
-	if ( backlerp == 0 ) {
-		vector signed short newNormalsVec0;
-		vector signed short newNormalsVec1;
-		vector signed int newNormalsIntVec;
-		vector float newNormalsFloatVec;
-		vector float newXyzScaleVec;
-		vector unsigned char newNormalsLoadPermute;
-		vector unsigned char newNormalsStorePermute;
-		vector float zero;
-		
-		newNormalsStorePermute = vec_lvsl(0,(float *)&newXyzScaleVec);
-		newXyzScaleVec = *(vector float *)&newXyzScale;
-		newXyzScaleVec = vec_perm(newXyzScaleVec,newXyzScaleVec,newNormalsStorePermute);
-		newXyzScaleVec = vec_splat(newXyzScaleVec,0);		
-		newNormalsLoadPermute = vec_lvsl(0,newXyz);
-		newNormalsStorePermute = vec_lvsr(0,outXyz);
-		zero = (vector float)vec_splat_s8(0);
-		//
-		// just copy the vertexes
-		//
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			newXyz += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-			newNormalsLoadPermute = vec_lvsl(0,newXyz);
-			newNormalsStorePermute = vec_lvsr(0,outXyz);
-			newNormalsVec0 = vec_ld(0,newXyz);
-			newNormalsVec1 = vec_ld(16,newXyz);
-			newNormalsVec0 = vec_perm(newNormalsVec0,newNormalsVec1,newNormalsLoadPermute);
-			newNormalsIntVec = vec_unpackh(newNormalsVec0);
-			newNormalsFloatVec = vec_ctf(newNormalsIntVec,0);
-			newNormalsFloatVec = vec_madd(newNormalsFloatVec,newXyzScaleVec,zero);
-			newNormalsFloatVec = vec_perm(newNormalsFloatVec,newNormalsFloatVec,newNormalsStorePermute);
-			//outXyz[0] = newXyz[0] * newXyzScale;
-			//outXyz[1] = newXyz[1] * newXyzScale;
-			//outXyz[2] = newXyz[2] * newXyzScale;
-
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= (FUNCTABLE_SIZE/256);
-			lng *= (FUNCTABLE_SIZE/256);
-
-			// decode X as cos( lat ) * sin( long )
-			// decode Y as sin( lat ) * sin( long )
-			// decode Z as cos( long )
-
-			outNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			outNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			outNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			vec_ste(newNormalsFloatVec,0,outXyz);
-			vec_ste(newNormalsFloatVec,4,outXyz);
-			vec_ste(newNormalsFloatVec,8,outXyz);
-		}
-	} else {
-		//
-		// interpolate and copy the vertex and normal
-		//
-		oldXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-			+ (backEnd.currentEntity->e.oldframe * surf->numVerts * 4);
-		oldNormals = oldXyz + 3;
-
-		oldXyzScale = MD3_XYZ_SCALE * backlerp;
-		oldNormalScale = backlerp;
-
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			oldXyz += 4, newXyz += 4, oldNormals += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-			vec3_t uncompressedOldNormal, uncompressedNewNormal;
-
-			// interpolate the xyz
-			outXyz[0] = oldXyz[0] * oldXyzScale + newXyz[0] * newXyzScale;
-			outXyz[1] = oldXyz[1] * oldXyzScale + newXyz[1] * newXyzScale;
-			outXyz[2] = oldXyz[2] * oldXyzScale + newXyz[2] * newXyzScale;
-
-			// FIXME: interpolate lat/long instead?
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-			uncompressedNewNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedNewNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedNewNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			lat = ( oldNormals[0] >> 8 ) & 0xff;
-			lng = ( oldNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-
-			uncompressedOldNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedOldNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedOldNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			outNormal[0] = uncompressedOldNormal[0] * oldNormalScale + uncompressedNewNormal[0] * newNormalScale;
-			outNormal[1] = uncompressedOldNormal[1] * oldNormalScale + uncompressedNewNormal[1] * newNormalScale;
-			outNormal[2] = uncompressedOldNormal[2] * oldNormalScale + uncompressedNewNormal[2] * newNormalScale;
-
-//			VectorNormalize (outNormal);
-		}
-    	VectorArrayNormalize((vec4_t *)tess.normal[tess.numVertexes], numVerts);
-   	}
-}
-
-#endif
diff --git a/code/renderergl1/tr_animation.c b/code/renderergl1/tr_animation.c
deleted file mode 100644
index 2979ab9f..00000000
--- a/code/renderergl1/tr_animation.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-
-/*
-
-All bones should be an identity orientation to display the mesh exactly
-as it is specified.
-
-For all other frames, the bones represent the transformation from the 
-orientation of the bone in the base frame to the orientation in this
-frame.
-
-*/
-
-
-// copied and adapted from tr_mesh.c
-
-/*
-=============
-R_MDRCullModel
-=============
-*/
-
-static int R_MDRCullModel( mdrHeader_t *header, trRefEntity_t *ent ) {
-	vec3_t		bounds[2];
-	mdrFrame_t	*oldFrame, *newFrame;
-	int			i, frameSize;
-
-	frameSize = (size_t)( &((mdrFrame_t *)0)->bones[ header->numBones ] );
-	
-	// compute frame pointers
-	newFrame = ( mdrFrame_t * ) ( ( byte * ) header + header->ofsFrames + frameSize * ent->e.frame);
-	oldFrame = ( mdrFrame_t * ) ( ( byte * ) header + header->ofsFrames + frameSize * ent->e.oldframe);
-
-	// cull bounding sphere ONLY if this is not an upscaled entity
-	if ( !ent->e.nonNormalizedAxes )
-	{
-		if ( ent->e.frame == ent->e.oldframe )
-		{
-			switch ( R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius ) )
-			{
-				// Ummm... yeah yeah I know we don't really have an md3 here.. but we pretend
-				// we do. After all, the purpose of mdrs are not that different, are they?
-				
-				case CULL_OUT:
-					tr.pc.c_sphere_cull_md3_out++;
-					return CULL_OUT;
-
-				case CULL_IN:
-					tr.pc.c_sphere_cull_md3_in++;
-					return CULL_IN;
-
-				case CULL_CLIP:
-					tr.pc.c_sphere_cull_md3_clip++;
-					break;
-			}
-		}
-		else
-		{
-			int sphereCull, sphereCullB;
-
-			sphereCull  = R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius );
-			if ( newFrame == oldFrame ) {
-				sphereCullB = sphereCull;
-			} else {
-				sphereCullB = R_CullLocalPointAndRadius( oldFrame->localOrigin, oldFrame->radius );
-			}
-
-			if ( sphereCull == sphereCullB )
-			{
-				if ( sphereCull == CULL_OUT )
-				{
-					tr.pc.c_sphere_cull_md3_out++;
-					return CULL_OUT;
-				}
-				else if ( sphereCull == CULL_IN )
-				{
-					tr.pc.c_sphere_cull_md3_in++;
-					return CULL_IN;
-				}
-				else
-				{
-					tr.pc.c_sphere_cull_md3_clip++;
-				}
-			}
-		}
-	}
-	
-	// calculate a bounding box in the current coordinate system
-	for (i = 0 ; i < 3 ; i++) {
-		bounds[0][i] = oldFrame->bounds[0][i] < newFrame->bounds[0][i] ? oldFrame->bounds[0][i] : newFrame->bounds[0][i];
-		bounds[1][i] = oldFrame->bounds[1][i] > newFrame->bounds[1][i] ? oldFrame->bounds[1][i] : newFrame->bounds[1][i];
-	}
-
-	switch ( R_CullLocalBox( bounds ) )
-	{
-		case CULL_IN:
-			tr.pc.c_box_cull_md3_in++;
-			return CULL_IN;
-		case CULL_CLIP:
-			tr.pc.c_box_cull_md3_clip++;
-			return CULL_CLIP;
-		case CULL_OUT:
-		default:
-			tr.pc.c_box_cull_md3_out++;
-			return CULL_OUT;
-	}
-}
-
-/*
-=================
-R_MDRComputeFogNum
-
-=================
-*/
-
-int R_MDRComputeFogNum( mdrHeader_t *header, trRefEntity_t *ent ) {
-	int				i, j;
-	fog_t			*fog;
-	mdrFrame_t		*mdrFrame;
-	vec3_t			localOrigin;
-	int frameSize;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-	
-	frameSize = (size_t)( &((mdrFrame_t *)0)->bones[ header->numBones ] );
-
-	// FIXME: non-normalized axis issues
-	mdrFrame = ( mdrFrame_t * ) ( ( byte * ) header + header->ofsFrames + frameSize * ent->e.frame);
-	VectorAdd( ent->e.origin, mdrFrame->localOrigin, localOrigin );
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( localOrigin[j] - mdrFrame->radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( localOrigin[j] + mdrFrame->radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-
-/*
-==============
-R_MDRAddAnimSurfaces
-==============
-*/
-
-// much stuff in there is just copied from R_AddMd3Surfaces in tr_mesh.c
-
-void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {
-	mdrHeader_t		*header;
-	mdrSurface_t	*surface;
-	mdrLOD_t		*lod;
-	shader_t		*shader;
-	skin_t		*skin;
-	int				i, j;
-	int				lodnum = 0;
-	int				fogNum = 0;
-	int				cull;
-	qboolean	personalModel;
-
-	header = (mdrHeader_t *) tr.currentModel->modelData;
-	
-	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
-	
-	if ( ent->e.renderfx & RF_WRAP_FRAMES )
-	{
-		ent->e.frame %= header->numFrames;
-		ent->e.oldframe %= header->numFrames;
-	}	
-	
-	//
-	// Validate the frames so there is no chance of a crash.
-	// This will write directly into the entity structure, so
-	// when the surfaces are rendered, they don't need to be
-	// range checked again.
-	//
-	if ((ent->e.frame >= header->numFrames) 
-		|| (ent->e.frame < 0)
-		|| (ent->e.oldframe >= header->numFrames)
-		|| (ent->e.oldframe < 0) )
-	{
-		ri.Printf( PRINT_DEVELOPER, "R_MDRAddAnimSurfaces: no such frame %d to %d for '%s'\n",
-			   ent->e.oldframe, ent->e.frame, tr.currentModel->name );
-		ent->e.frame = 0;
-		ent->e.oldframe = 0;
-	}
-
-	//
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	//
-	cull = R_MDRCullModel (header, ent);
-	if ( cull == CULL_OUT ) {
-		return;
-	}	
-
-	// figure out the current LOD of the model we're rendering, and set the lod pointer respectively.
-	lodnum = R_ComputeLOD(ent);
-	// check whether this model has as that many LODs at all. If not, try the closest thing we got.
-	if(header->numLODs <= 0)
-		return;
-	if(header->numLODs <= lodnum)
-		lodnum = header->numLODs - 1;
-
-	lod = (mdrLOD_t *)( (byte *)header + header->ofsLODs);
-	for(i = 0; i < lodnum; i++)
-	{
-		lod = (mdrLOD_t *) ((byte *) lod + lod->ofsEnd);
-	}
-	
-	// set up lighting
-	if ( !personalModel || r_shadows->integer > 1 )
-	{
-		R_SetupEntityLighting( &tr.refdef, ent );
-	}
-
-	// fogNum?
-	fogNum = R_MDRComputeFogNum( header, ent );
-
-	surface = (mdrSurface_t *)( (byte *)lod + lod->ofsSurfaces );
-
-	for ( i = 0 ; i < lod->numSurfaces ; i++ )
-	{
-		
-		if(ent->e.customShader)
-			shader = R_GetShaderByHandle(ent->e.customShader);
-		else if(ent->e.customSkin > 0 && ent->e.customSkin < tr.numSkins)
-		{
-			skin = R_GetSkinByHandle(ent->e.customSkin);
-			shader = tr.defaultShader;
-			
-			for(j = 0; j < skin->numSurfaces; j++)
-			{
-				if (!strcmp(skin->surfaces[j].name, surface->name))
-				{
-					shader = skin->surfaces[j].shader;
-					break;
-				}
-			}
-		}
-		else if(surface->shaderIndex > 0)
-			shader = R_GetShaderByHandle( surface->shaderIndex );
-		else
-			shader = tr.defaultShader;
-
-		// we will add shadows even if the main object isn't visible in the view
-
-		// stencil shadows can't do personal models unless I polyhedron clip
-		if ( !personalModel
-		        && r_shadows->integer == 2
-			&& fogNum == 0
-			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) )
-			&& shader->sort == SS_OPAQUE )
-		{
-			R_AddDrawSurf( (void *)surface, tr.shadowShader, 0, qfalse );
-		}
-
-		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
-			&& fogNum == 0
-			&& (ent->e.renderfx & RF_SHADOW_PLANE )
-			&& shader->sort == SS_OPAQUE )
-		{
-			R_AddDrawSurf( (void *)surface, tr.projectionShadowShader, 0, qfalse );
-		}
-
-		if (!personalModel)
-			R_AddDrawSurf( (void *)surface, shader, fogNum, qfalse );
-
-		surface = (mdrSurface_t *)( (byte *)surface + surface->ofsEnd );
-	}
-}
-
-/*
-==============
-RB_MDRSurfaceAnim
-==============
-*/
-void RB_MDRSurfaceAnim( mdrSurface_t *surface )
-{
-	int				i, j, k;
-	float			frontlerp, backlerp;
-	int				*triangles;
-	int				indexes;
-	int				baseIndex, baseVertex;
-	int				numVerts;
-	mdrVertex_t		*v;
-	mdrHeader_t		*header;
-	mdrFrame_t		*frame;
-	mdrFrame_t		*oldFrame;
-	mdrBone_t		bones[MDR_MAX_BONES], *bonePtr, *bone;
-
-	int			frameSize;
-
-	// don't lerp if lerping off, or this is the only frame, or the last frame...
-	//
-	if (backEnd.currentEntity->e.oldframe == backEnd.currentEntity->e.frame) 
-	{
-		backlerp	= 0;	// if backlerp is 0, lerping is off and frontlerp is never used
-		frontlerp	= 1;
-	} 
-	else  
-	{
-		backlerp	= backEnd.currentEntity->e.backlerp;
-		frontlerp	= 1.0f - backlerp;
-	}
-
-	header = (mdrHeader_t *)((byte *)surface + surface->ofsHeader);
-
-	frameSize = (size_t)( &((mdrFrame_t *)0)->bones[ header->numBones ] );
-
-	frame = (mdrFrame_t *)((byte *)header + header->ofsFrames +
-		backEnd.currentEntity->e.frame * frameSize );
-	oldFrame = (mdrFrame_t *)((byte *)header + header->ofsFrames +
-		backEnd.currentEntity->e.oldframe * frameSize );
-
-	RB_CHECKOVERFLOW( surface->numVerts, surface->numTriangles * 3 );
-
-	triangles	= (int *) ((byte *)surface + surface->ofsTriangles);
-	indexes		= surface->numTriangles * 3;
-	baseIndex	= tess.numIndexes;
-	baseVertex	= tess.numVertexes;
-	
-	// Set up all triangles.
-	for (j = 0 ; j < indexes ; j++) 
-	{
-		tess.indexes[baseIndex + j] = baseVertex + triangles[j];
-	}
-	tess.numIndexes += indexes;
-
-	//
-	// lerp all the needed bones
-	//
-	if ( !backlerp ) 
-	{
-		// no lerping needed
-		bonePtr = frame->bones;
-	} 
-	else 
-	{
-		bonePtr = bones;
-		
-		for ( i = 0 ; i < header->numBones*12 ; i++ ) 
-		{
-			((float *)bonePtr)[i] = frontlerp * ((float *)frame->bones)[i] + backlerp * ((float *)oldFrame->bones)[i];
-		}
-	}
-
-	//
-	// deform the vertexes by the lerped bones
-	//
-	numVerts = surface->numVerts;
-	v = (mdrVertex_t *) ((byte *)surface + surface->ofsVerts);
-	for ( j = 0; j < numVerts; j++ ) 
-	{
-		vec3_t	tempVert, tempNormal;
-		mdrWeight_t	*w;
-
-		VectorClear( tempVert );
-		VectorClear( tempNormal );
-		w = v->weights;
-		for ( k = 0 ; k < v->numWeights ; k++, w++ ) 
-		{
-			bone = bonePtr + w->boneIndex;
-			
-			tempVert[0] += w->boneWeight * ( DotProduct( bone->matrix[0], w->offset ) + bone->matrix[0][3] );
-			tempVert[1] += w->boneWeight * ( DotProduct( bone->matrix[1], w->offset ) + bone->matrix[1][3] );
-			tempVert[2] += w->boneWeight * ( DotProduct( bone->matrix[2], w->offset ) + bone->matrix[2][3] );
-			
-			tempNormal[0] += w->boneWeight * DotProduct( bone->matrix[0], v->normal );
-			tempNormal[1] += w->boneWeight * DotProduct( bone->matrix[1], v->normal );
-			tempNormal[2] += w->boneWeight * DotProduct( bone->matrix[2], v->normal );
-		}
-
-		tess.xyz[baseVertex + j][0] = tempVert[0];
-		tess.xyz[baseVertex + j][1] = tempVert[1];
-		tess.xyz[baseVertex + j][2] = tempVert[2];
-
-		tess.normal[baseVertex + j][0] = tempNormal[0];
-		tess.normal[baseVertex + j][1] = tempNormal[1];
-		tess.normal[baseVertex + j][2] = tempNormal[2];
-
-		tess.texCoords[baseVertex + j][0][0] = v->texCoords[0];
-		tess.texCoords[baseVertex + j][0][1] = v->texCoords[1];
-
-		v = (mdrVertex_t *)&v->weights[v->numWeights];
-	}
-
-	tess.numVertexes += surface->numVerts;
-}
-
-
-#define MC_MASK_X ((1<<(MC_BITS_X))-1)
-#define MC_MASK_Y ((1<<(MC_BITS_Y))-1)
-#define MC_MASK_Z ((1<<(MC_BITS_Z))-1)
-#define MC_MASK_VECT ((1<<(MC_BITS_VECT))-1)
-
-#define MC_SCALE_VECT (1.0f/(float)((1<<(MC_BITS_VECT-1))-2))
-
-#define MC_POS_X (0)
-#define MC_SHIFT_X (0)
-
-#define MC_POS_Y ((((MC_BITS_X))/8))
-#define MC_SHIFT_Y ((((MC_BITS_X)%8)))
-
-#define MC_POS_Z ((((MC_BITS_X+MC_BITS_Y))/8))
-#define MC_SHIFT_Z ((((MC_BITS_X+MC_BITS_Y)%8)))
-
-#define MC_POS_V11 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z))/8))
-#define MC_SHIFT_V11 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z)%8)))
-
-#define MC_POS_V12 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT))/8))
-#define MC_SHIFT_V12 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT)%8)))
-
-#define MC_POS_V13 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*2))/8))
-#define MC_SHIFT_V13 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*2)%8)))
-
-#define MC_POS_V21 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*3))/8))
-#define MC_SHIFT_V21 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*3)%8)))
-
-#define MC_POS_V22 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*4))/8))
-#define MC_SHIFT_V22 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*4)%8)))
-
-#define MC_POS_V23 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*5))/8))
-#define MC_SHIFT_V23 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*5)%8)))
-
-#define MC_POS_V31 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*6))/8))
-#define MC_SHIFT_V31 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*6)%8)))
-
-#define MC_POS_V32 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*7))/8))
-#define MC_SHIFT_V32 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*7)%8)))
-
-#define MC_POS_V33 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*8))/8))
-#define MC_SHIFT_V33 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*8)%8)))
-
-void MC_UnCompress(float mat[3][4],const unsigned char * comp)
-{
-	int val;
-
-	val=(int)((unsigned short *)(comp))[0];
-	val-=1<<(MC_BITS_X-1);
-	mat[0][3]=((float)(val))*MC_SCALE_X;
-
-	val=(int)((unsigned short *)(comp))[1];
-	val-=1<<(MC_BITS_Y-1);
-	mat[1][3]=((float)(val))*MC_SCALE_Y;
-
-	val=(int)((unsigned short *)(comp))[2];
-	val-=1<<(MC_BITS_Z-1);
-	mat[2][3]=((float)(val))*MC_SCALE_Z;
-
-	val=(int)((unsigned short *)(comp))[3];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[0][0]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[4];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[0][1]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[5];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[0][2]=((float)(val))*MC_SCALE_VECT;
-
-
-	val=(int)((unsigned short *)(comp))[6];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[1][0]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[7];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[1][1]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[8];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[1][2]=((float)(val))*MC_SCALE_VECT;
-
-
-	val=(int)((unsigned short *)(comp))[9];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[2][0]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[10];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[2][1]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[11];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[2][2]=((float)(val))*MC_SCALE_VECT;
-}
diff --git a/code/renderergl1/tr_backend.c b/code/renderergl1/tr_backend.c
index 56cf37d1..e8f6e2f7 100644
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
@@ -15,13 +15,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 #include "tr_local.h"
 
-backEndData_t	*backEndData;
+backEndData_t	*backEndData[SMP_FRAMES];
 backEndState_t	backEnd;
 
 
@@ -34,6 +34,16 @@ static float	s_flipMatrix[16] = {
 	0, 0, 0, 1
 };
 
+void GL_SetFogColor(const vec4_t fColor) {
+	glState.fFogColor[0] = fColor[0];
+	glState.fFogColor[1] = fColor[1];
+	glState.fFogColor[2] = fColor[2];
+	glState.fFogColor[3] = fColor[3];
+
+	if (!(glState.glStateBits & GLS_FOG_COLOR)) {
+		qglFogfv(GL_FOG_COLOR, glState.fFogColor);
+	}
+}
 
 /*
 ** GL_Bind
@@ -46,6 +56,7 @@ void GL_Bind( image_t *image ) {
 		texnum = tr.defaultImage->texnum;
 	} else {
 		texnum = image->texnum;
+		image->UseCount++;
 	}
 
 	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
@@ -53,7 +64,7 @@ void GL_Bind( image_t *image ) {
 	}
 
 	if ( glState.currenttextures[glState.currenttmu] != texnum ) {
-		if ( image ) {
+		if (image) {
 			image->frameUsed = tr.frameCount;
 		}
 		glState.currenttextures[glState.currenttmu] = texnum;
@@ -136,16 +147,30 @@ void GL_Cull( int cullType ) {
 	} 
 	else 
 	{
-		qboolean cullFront;
 		qglEnable( GL_CULL_FACE );
 
-		cullFront = (cullType == CT_FRONT_SIDED);
-		if ( backEnd.viewParms.isMirror )
+		if ( cullType == CT_BACK_SIDED )
 		{
-			cullFront = !cullFront;
+			if ( backEnd.viewParms.isMirror )
+			{
+				qglCullFace( GL_FRONT );
+			}
+			else
+			{
+				qglCullFace( GL_BACK );
+			}
+		}
+		else
+		{
+			if ( backEnd.viewParms.isMirror )
+			{
+				qglCullFace( GL_BACK );
+			}
+			else
+			{
+				qglCullFace( GL_FRONT );
+			}
 		}
-
-		qglCullFace( cullFront ? GL_FRONT : GL_BACK );
 	}
 }
 
@@ -176,8 +201,12 @@ void GL_TexEnv( int env )
 	case GL_ADD:
 		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD );
 		break;
+	case GL_COMBINE4_NV:
+	case GL_COMBINE:
+		qglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env);
+		break;
 	default:
-		ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed", env );
+		ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed\n", env );
 		break;
 	}
 }
@@ -190,7 +219,7 @@ void GL_TexEnv( int env )
 */
 void GL_State( unsigned long stateBits )
 {
-	unsigned long diff = stateBits ^ glState.glStateBits;
+	unsigned long diff = glState.glStateBits ^ (glState.externalSetState | stateBits);
 
 	if ( !diff )
 	{
@@ -217,7 +246,7 @@ void GL_State( unsigned long stateBits )
 	//
 	if ( diff & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
 	{
-		GLenum srcFactor = GL_ONE, dstFactor = GL_ONE;
+		GLenum srcFactor, dstFactor;
 
 		if ( stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
 		{
@@ -251,7 +280,8 @@ void GL_State( unsigned long stateBits )
 				srcFactor = GL_SRC_ALPHA_SATURATE;
 				break;
 			default:
-				ri.Error( ERR_DROP, "GL_State: invalid src blend state bits" );
+				srcFactor = GL_ONE;		// to get warning to shut up
+				ri.Error( ERR_DROP, "GL_State: invalid src blend state bits\n" );
 				break;
 			}
 
@@ -282,7 +312,8 @@ void GL_State( unsigned long stateBits )
 				dstFactor = GL_ONE_MINUS_DST_ALPHA;
 				break;
 			default:
-				ri.Error( ERR_DROP, "GL_State: invalid dst blend state bits" );
+				dstFactor = GL_ONE;		// to get warning to shut up
+				ri.Error( ERR_DROP, "GL_State: invalid dst blend state bits\n" );
 				break;
 			}
 
@@ -340,35 +371,186 @@ void GL_State( unsigned long stateBits )
 		}
 	}
 
+	if ((diff & GLS_MULTITEXTURE_ENV) || (diff & GLS_MULTITEXTURE))
+	{
+		if (stateBits & GLS_MULTITEXTURE_ENV)
+		{
+			GL_TexEnv(GL_COMBINE4_NV);
+		}
+		else if (stateBits & GLS_MULTITEXTURE)
+		{
+			if (glState.cntTexEnvExt != GLS_MULTITEXTURE)
+			{
+				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_PRIMARY_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
+				glState.cntTexEnvExt = GLS_MULTITEXTURE;
+			}
+
+			GL_TexEnv(GL_COMBINE);
+		}
+		else
+		{
+			GL_TexEnv(GL_MODULATE);
+		}
+	}
+
 	//
 	// alpha test
 	//
 	if ( diff & GLS_ATEST_BITS )
 	{
-		switch ( stateBits & GLS_ATEST_BITS )
+		switch (stateBits & GLS_ATEST_BITS)
 		{
 		case 0:
-			qglDisable( GL_ALPHA_TEST );
+			qglDisable(GL_ALPHA_TEST);
 			break;
 		case GLS_ATEST_GT_0:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_GREATER, 0.0f );
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GREATER, 0.05f);
 			break;
 		case GLS_ATEST_LT_80:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_LESS, 0.5f );
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_LESS, 0.5f);
 			break;
 		case GLS_ATEST_GE_80:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_GEQUAL, 0.5f );
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GEQUAL, 0.5f);
+			break;
+		case GLS_ATEST_LT_FOLIAGE1:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_LESS, r_alpha_foliage1->value);
+			break;
+		case GLS_ATEST_GE_FOLIAGE1:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GEQUAL, r_alpha_foliage1->value);
+			break;
+		case GLS_ATEST_LT_FOLIAGE2:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_LESS, r_alpha_foliage2->value);
+			break;
+		case GLS_ATEST_GE_FOLIAGE2:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GEQUAL, r_alpha_foliage2->value);
 			break;
 		default:
-			assert( 0 );
+			assert(0);
 			break;
 		}
 	}
 
-	glState.glStateBits = stateBits;
+	if (diff & GLS_CLAMP_EDGE)
+	{
+		float clampValue;
+
+		if (haveClampToEdge)
+		{
+			if (stateBits & GLS_CLAMP_EDGE) {
+				clampValue = GL_CLAMP_TO_EDGE;
+			}
+			else {
+				clampValue = GL_REPEAT;
+			}
+		}
+		else
+		{
+			if (stateBits & GLS_CLAMP_EDGE) {
+				clampValue = GL_CLAMP;
+			}
+			else {
+				clampValue = GL_REPEAT;
+			}
+		}
+
+		if (qglActiveTextureARB)
+		{
+			int currenttmu = glState.currenttmu;
+
+			GL_SelectTexture(0);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
+
+			GL_SelectTexture(1);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
+
+			GL_SelectTexture(currenttmu);
+		}
+		else
+		{
+			GL_SelectTexture(0);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
+		}
+	}
+	
+	if (diff & GLS_FOG)
+	{
+		if (glState.externalSetState & GLS_FOG)
+		{
+			qglEnable(GL_FOG);
+
+			if (stateBits & GLS_FOG_BLACK)
+			{
+				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
+				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
+			}
+			else if (stateBits & GLS_FOG_WHITE)
+			{
+				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
+				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
+			}
+			else
+			{
+				//
+				// Use the global fog
+				qglFogfv(GL_FOG_COLOR, glState.fFogColor);
+			}
+		}
+		else
+		{
+			qglDisable(GL_FOG);
+		}
+	}
+	else if (glState.externalSetState & GLS_FOG)
+	{
+		if (diff & GLS_FOG_ENABLED)
+		{
+			if (stateBits & GLS_FOG_ENABLED) {
+				qglEnable(GL_FOG);
+			}
+			else {
+				qglDisable(GL_FOG);
+			}
+		}
+
+		if (diff & GLS_FOG_COLOR)
+		{
+			if (stateBits & GLS_FOG_BLACK)
+			{
+				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
+				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
+			}
+			else if (stateBits & GLS_FOG_WHITE)
+			{
+				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
+				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
+			}
+			else
+            {
+                //
+                // Use the global fog
+                qglFogfv(GL_FOG_COLOR, glState.fFogColor);
+            }
+		}
+	}
+
+	glState.glStateBits = stateBits | glState.externalSetState;
 }
 
 
@@ -429,30 +611,40 @@ void RB_BeginDrawingView (void) {
 
 	// we will need to change the projection matrix before drawing
 	// 2D images again
-	backEnd.projection2D = qfalse;
+	backEnd.in2D = qfalse;
 
 	//
 	// set the modelview matrix for the viewer
 	//
 	SetViewportAndScissor();
 
+	R_UploadDlights();
+
 	// ensures that depth writes are enabled for the depth clear
 	GL_State( GLS_DEFAULT );
 	// clear relevant buffers
 	clearBits = GL_DEPTH_BUFFER_BIT;
 
-	if ( r_measureOverdraw->integer || r_shadows->integer == 2 )
+	if ( r_measureOverdraw->integer || r_shadows->integer == 3 )
 	{
 		clearBits |= GL_STENCIL_BUFFER_BIT;
 	}
-	if ( r_fastsky->integer && !( backEnd.refdef.rdflags & RDF_NOWORLDMODEL ) )
+
+	if (!( backEnd.refdef.rdflags & RDF_NOWORLDMODEL))
 	{
-		clearBits |= GL_COLOR_BUFFER_BIT;	// FIXME: only if sky shaders have been used
-#ifdef _DEBUG
-		qglClearColor( 0.8f, 0.7f, 0.4f, 1.0f );	// FIXME: get color of sky
-#else
-		qglClearColor( 0.0f, 0.0f, 0.0f, 1.0f );	// FIXME: get color of sky
-#endif
+		if ((backEnd.viewParms.farplane_distance && !tr.skyRendered && !tr.portalRendered) || tr.farclip)
+		{
+			clearBits |= GL_COLOR_BUFFER_BIT;
+			qglClearColor(glState.fFogColor[0], glState.fFogColor[1], glState.fFogColor[2], glState.fFogColor[3]);
+		}
+		else
+		{
+			if (r_fastsky->integer)
+			{
+				clearBits |= GL_COLOR_BUFFER_BIT;
+				qglClearColor(0.5, 0.5, 1.0, 1.0);
+			}
+		}
 	}
 	qglClear( clearBits );
 
@@ -474,17 +666,17 @@ void RB_BeginDrawingView (void) {
 	// clip to the plane of the portal
 	if ( backEnd.viewParms.isPortal ) {
 		float	plane[4];
-		GLdouble	plane2[4];
+		double	plane2[4];
 
 		plane[0] = backEnd.viewParms.portalPlane.normal[0];
 		plane[1] = backEnd.viewParms.portalPlane.normal[1];
 		plane[2] = backEnd.viewParms.portalPlane.normal[2];
 		plane[3] = backEnd.viewParms.portalPlane.dist;
 
-		plane2[0] = DotProduct (backEnd.viewParms.or.axis[0], plane);
-		plane2[1] = DotProduct (backEnd.viewParms.or.axis[1], plane);
-		plane2[2] = DotProduct (backEnd.viewParms.or.axis[2], plane);
-		plane2[3] = DotProduct (plane, backEnd.viewParms.or.origin) - plane[3];
+		plane2[0] = DotProduct (backEnd.viewParms.ori.axis[0], plane);
+		plane2[1] = DotProduct (backEnd.viewParms.ori.axis[1], plane);
+		plane2[2] = DotProduct (backEnd.viewParms.ori.axis[2], plane);
+		plane2[3] = DotProduct (plane, backEnd.viewParms.ori.origin) - plane[3];
 
 		qglLoadMatrixf( s_flipMatrix );
 		qglClipPlane (GL_CLIP_PLANE0, plane2);
@@ -494,7 +686,6 @@ void RB_BeginDrawingView (void) {
 	}
 }
 
-
 /*
 ==================
 RB_RenderDrawSurfList
@@ -502,14 +693,14 @@ RB_RenderDrawSurfList
 */
 void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	shader_t		*shader, *oldShader;
-	int				fogNum, oldFogNum;
 	int				entityNum, oldEntityNum;
-	int				dlighted, oldDlighted;
-	qboolean		depthRange, oldDepthRange, isCrosshair, wasCrosshair;
+	int				dlightMap, oldDlightMap;
+	qboolean		depthRange, oldDepthRange;
+	qboolean		bStaticModel, oldbStaticModel;
 	int				i;
 	drawSurf_t		*drawSurf;
 	int				oldSort;
-	double			originalTime;
+	float			originalTime;
 
 	// save original time for entity shader offsets
 	originalTime = backEnd.refdef.floatTime;
@@ -521,14 +712,14 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	oldEntityNum = -1;
 	backEnd.currentEntity = &tr.worldEntity;
 	oldShader = NULL;
-	oldFogNum = -1;
 	oldDepthRange = qfalse;
-	wasCrosshair = qfalse;
-	oldDlighted = qfalse;
+	oldDlightMap = 0;
 	oldSort = -1;
+	oldbStaticModel = -1;
 	depthRange = qfalse;
 
 	backEnd.pc.c_surfaces += numDrawSurfs;
+	backEnd.numSpheresUsed = 0;
 
 	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
 		if ( drawSurf->sort == oldSort ) {
@@ -537,127 +728,153 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			continue;
 		}
 		oldSort = drawSurf->sort;
-		R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted );
-
-		//
-		// change the tess parameters if needed
-		// a "entityMergable" shader is a shader that can have surfaces from separate
-		// entities merged into a single batch, like smoke and blood puff sprites
-		if ( shader != NULL && ( shader != oldShader || fogNum != oldFogNum || dlighted != oldDlighted 
-			|| ( entityNum != oldEntityNum && !shader->entityMergable ) ) ) {
-			if (oldShader != NULL) {
-				RB_EndSurface();
-			}
-			RB_BeginSurface( shader, fogNum );
-			oldShader = shader;
-			oldFogNum = fogNum;
-			oldDlighted = dlighted;
+		if (*drawSurf->surface != SF_SPRITE) {
+			R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlightMap, &bStaticModel);
+		} else {
+			shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+			entityNum = ENTITYNUM_WORLD;
+			dlightMap = 0;
+			bStaticModel = qfalse;
 		}
 
+		//
+		// change the tess parameters if needed
+		// a "entityMergable" shader is a shader that can have surfaces from seperate
+		// entities merged into a single batch, like smoke and blood puff sprites
+		if (shader != oldShader || dlightMap != oldDlightMap || (oldShader->flags & 1)
+			|| ( entityNum != oldEntityNum && !shader->entityMergable )
+			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )) {
+			if (oldShader != NULL) {
+				RB_EndSurface();
+			}
+			RB_BeginSurface( shader );
+			oldShader = shader;
+			oldDlightMap = dlightMap;
+		}
+
+		backEnd.currentSphere = &backEnd.spareSphere;
 		//
 		// change the modelview matrix if needed
 		//
-		if ( entityNum != oldEntityNum ) {
-			depthRange = isCrosshair = qfalse;
+		if ( entityNum != oldEntityNum || bStaticModel != oldbStaticModel ) {
+			depthRange = qfalse;
 
-			if ( entityNum != REFENTITYNUM_WORLD ) {
-				backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
+			if (bStaticModel) {
+				backEnd.shaderStartTime = 0.0;
+				backEnd.currentEntity = 0;
+				backEnd.spareSphere.TessFunction = 0;
+				backEnd.currentStaticModel = &backEnd.refdef.staticModels[entityNum];
+				R_RotateForStaticModel(backEnd.currentStaticModel, &backEnd.viewParms, &backEnd.ori );
+			}
+			else {
+				backEnd.currentStaticModel = NULL;
+				if (entityNum != ENTITYNUM_WORLD) {
+					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
+					backEnd.shaderStartTime = backEnd.currentEntity->e.shaderTime;
 
-				// FIXME: e.shaderTime must be passed as int to avoid fp-precision loss issues
-				backEnd.refdef.floatTime = originalTime - (double)backEnd.currentEntity->e.shaderTime;
+					// set up the transformation matrix
+					R_RotateForEntity(backEnd.currentEntity, &backEnd.viewParms, &backEnd.ori);
 
-				// we have to reset the shaderTime as well otherwise image animations start
-				// from the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
+					// set up the dynamic lighting if needed
+					if (backEnd.currentEntity->needDlights) {
+						R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
+					}
 
-				// set up the transformation matrix
-				R_RotateForEntity( backEnd.currentEntity, &backEnd.viewParms, &backEnd.or );
-
-				// set up the dynamic lighting if needed
-				if ( backEnd.currentEntity->needDlights ) {
-					R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
+					if (backEnd.currentEntity->e.renderfx & RF_DEPTHHACK) {
+						// hack the depth range to prevent view model from poking into walls
+						depthRange = qtrue;
+					}
 				}
-
-				if(backEnd.currentEntity->e.renderfx & RF_DEPTHHACK)
-				{
-					// hack the depth range to prevent view model from poking into walls
-					depthRange = qtrue;
-					
-					if(backEnd.currentEntity->e.renderfx & RF_CROSSHAIR)
-						isCrosshair = qtrue;
+				else {
+					backEnd.currentEntity = &tr.worldEntity;
+					backEnd.ori = backEnd.viewParms.world;
+					backEnd.shaderStartTime = 0.0;
+					R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
 				}
-			} else {
-				backEnd.currentEntity = &tr.worldEntity;
-				backEnd.refdef.floatTime = originalTime;
-				backEnd.or = backEnd.viewParms.world;
-				// we have to reset the shaderTime as well otherwise image animations on
-				// the world (like water) continue with the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-				R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
 			}
 
-			qglLoadMatrixf( backEnd.or.modelMatrix );
+			qglLoadMatrixf( backEnd.ori.modelMatrix );
 
 			//
-			// change depthrange. Also change projection matrix so first person weapon does not look like coming
-			// out of the screen.
+			// change depthrange if needed
 			//
-			if (oldDepthRange != depthRange || wasCrosshair != isCrosshair)
-			{
-				if (depthRange)
-				{
-					if(backEnd.viewParms.stereoFrame != STEREO_CENTER)
-					{
-						if(isCrosshair)
-						{
-							if(oldDepthRange)
-							{
-								// was not a crosshair but now is, change back proj matrix
-								qglMatrixMode(GL_PROJECTION);
-								qglLoadMatrixf(backEnd.viewParms.projectionMatrix);
-								qglMatrixMode(GL_MODELVIEW);
-							}
-						}
-						else
-						{
-							viewParms_t temp = backEnd.viewParms;
-
-							R_SetupProjection(&temp, r_znear->value, qfalse);
-
-							qglMatrixMode(GL_PROJECTION);
-							qglLoadMatrixf(temp.projectionMatrix);
-							qglMatrixMode(GL_MODELVIEW);
-						}
-					}
-
-					if(!oldDepthRange)
-						qglDepthRange (0, 0.3);
+			if ( oldDepthRange != depthRange ) {
+				if ( depthRange ) {
+					qglDepthRange (0, 0.3);
+				} else {
+					qglDepthRange (0, 1.0);
 				}
-				else
-				{
-					if(!wasCrosshair && backEnd.viewParms.stereoFrame != STEREO_CENTER)
-					{
-						qglMatrixMode(GL_PROJECTION);
-						qglLoadMatrixf(backEnd.viewParms.projectionMatrix);
-						qglMatrixMode(GL_MODELVIEW);
-					}
-
-					qglDepthRange (0, 1);
-				}
-
 				oldDepthRange = depthRange;
-				wasCrosshair = isCrosshair;
 			}
 
 			oldEntityNum = entityNum;
+			oldbStaticModel = bStaticModel;
+		}
+
+		tess.dlightMap = dlightMap;
+		if (r_fastdlights->integer) {
+			tess.dlightMap = 0;
+		}
+
+		if (bStaticModel)
+		{
+			if (r_drawspherelights->integer) {
+				RB_Static_BuildDLights();
+			}
+
+			if (!backEnd.currentStaticModel->bLightGridCalculated) {
+				RB_Grid_SetupStaticModel();
+			}
+		}
+		else if (backEnd.currentEntity->e.tiki)
+		{
+			if (shader->needsLGrid
+				|| shader->needsLSpherical && r_fastentlight->integer
+				|| !r_drawspherelights->integer)
+			{
+				backEnd.currentSphere->TessFunction = RB_CalcLightGridColor;
+				RB_Grid_SetupEntity();
+			}
+			else if (shader->needsLSpherical)
+			{
+				if (tr.refdef.rdflags & RDF_HUD)
+				{
+					backEnd.currentSphere = &backEnd.hudSphere;
+					backEnd.hudSphere.TessFunction = 0;
+					RB_Sphere_SetupEntity();
+				}
+				else if (backEnd.currentEntity->sphereCalculated)
+				{
+					backEnd.currentSphere = &backEnd.spheres[backEnd.currentEntity->lightingSphere];
+				}
+				else
+				{
+					if (backEnd.numSpheresUsed == MAX_SPHERE_LIGHTS)
+					{
+						ri.Printf(PRINT_DEVELOPER, "Spherical lighting: Ran out of space in the sphere array!\n");
+						backEnd.currentSphere = &backEnd.spareSphere;
+					}
+					else
+					{
+						backEnd.currentSphere = &backEnd.spheres[backEnd.numSpheresUsed];
+						backEnd.currentEntity->lightingSphere = backEnd.numSpheresUsed++;
+						backEnd.currentEntity->sphereCalculated = 1;
+					}
+
+					backEnd.currentSphere->TessFunction = NULL;
+					RB_Sphere_SetupEntity();
+				}
+			}
+		}
+
+		if (*drawSurf->surface == SF_SPRITE) {
+			backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
 		}
 
 		// add the triangles for this surface
 		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 	}
 
-	backEnd.refdef.floatTime = originalTime;
-
 	// draw the contents of the last shader batch
 	if (oldShader != NULL) {
 		RB_EndSurface();
@@ -666,13 +883,24 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	// go back to the world modelview matrix
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
 	if ( depthRange ) {
-		qglDepthRange (0, 1);
+		qglDepthRange (0, 1.0);
 	}
 
-	if (r_drawSun->integer) {
-		RB_DrawSun(0.1, tr.sunShader);
+	RB_ShadowFinish();
+	if (!(backEnd.refdef.rdflags & RDF_HUD)) {
+		RB_RenderFlares();
+		R_DrawLensFlares();
 	}
 
+	if (g_bInfoworldtris)
+	{
+		g_bInfoworldtris = 0;
+		R_PrintInfoWorldtris();
+	}
+
+#if 0
+	RB_DrawSun();
+#endif
 	// darken down any stencil shadows
 	RB_ShadowFinish();		
 
@@ -680,11 +908,79 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	RB_RenderFlares();
 }
 
+/*
+==================
+RB_RenderSpriteSurfList
+==================
+*/
+void RB_RenderSpriteSurfList(drawSurf_t* drawSurfs, int numDrawSurfs) {
+	shader_t	*shader;
+	shader_t	*oldShader;
+	qboolean	depthRange;
+	qboolean	oldDepthRange;
+	int			i;
+	drawSurf_t	*drawSurf;
+
+    backEnd.currentEntity = &tr.worldEntity;
+    backEnd.currentStaticModel = 0;
+
+	backEnd.pc.c_surfaces += numDrawSurfs;
+	backEnd.ori = backEnd.viewParms.world;
+
+	oldShader = NULL;
+    depthRange = qfalse;
+    oldDepthRange = qfalse;
+
+    for (i = 0, drawSurf = drawSurfs; i < numDrawSurfs; i++, drawSurf++) {
+		shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+		depthRange = (((refSprite_t*)drawSurf->surface)->renderfx & RF_DEPTHHACK) != 0;
+
+        if ((shader != oldShader || (oldShader->flags & RF_THIRD_PERSON) != 0) && !shader->entityMergable)
+        {
+			if (oldShader) {
+				RB_EndSurface();
+			}
+
+            RB_BeginSurface(shader);
+            oldShader = shader;
+        }
+
+        qglLoadMatrixf(backEnd.ori.modelMatrix);
+
+        if (oldDepthRange != depthRange)
+        {
+			if (depthRange) {
+				qglDepthRange(0.0, 0.3);
+			} else {
+                qglDepthRange(0.0, 1.0);
+			}
+
+            oldDepthRange = depthRange;
+        }
+
+        backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
+
+        // add the triangles for this surface
+        rb_surfaceTable[*drawSurf->surface](drawSurf->surface);
+	}
+
+	if (oldShader) {
+		RB_EndSurface();
+	}
+
+    // go back to the world modelview matrix
+    qglLoadMatrixf(backEnd.viewParms.world.modelMatrix);
+	// go back to the previous depth range
+	if (depthRange) {
+		qglDepthRange(0.0, 1.0);
+	}
+}
+
 
 /*
 ============================================================================
 
-RENDER BACK END FUNCTIONS
+RENDER BACK END THREAD FUNCTIONS
 
 ============================================================================
 */
@@ -696,27 +992,7 @@ RB_SetGL2D
 ================
 */
 void	RB_SetGL2D (void) {
-	backEnd.projection2D = qtrue;
-
-	// set 2D virtual screen size
-	qglViewport( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglScissor( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglMatrixMode(GL_PROJECTION);
-    qglLoadIdentity ();
-	qglOrtho (0, glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1);
-	qglMatrixMode(GL_MODELVIEW);
-    qglLoadIdentity ();
-
-	GL_State( GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA );
-
-	GL_Cull( CT_TWO_SIDED );
-	qglDisable( GL_CLIP_PLANE0 );
-
-	// set time for 2D shaders
-	backEnd.refdef.time = ri.Milliseconds();
-	backEnd.refdef.floatTime = backEnd.refdef.time * 0.001;
+	Set2DWindow(0, 0, glConfig.vidWidth, glConfig.vidHeight, 0.0, glConfig.vidWidth, glConfig.vidHeight, 0.0, 0.0, 1.0);
 }
 
 
@@ -729,23 +1005,19 @@ Stretches a raw 32 bit power of 2 bitmap image over the given screen rectangle.
 Used for cinematics.
 =============
 */
-void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
+void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
 	int			i, j;
 	int			start, end;
 
 	if ( !tr.registered ) {
 		return;
 	}
-	R_IssuePendingRenderCommands();
+	R_SyncRenderThread();
 
-	if ( tess.numIndexes ) {
-		RB_EndSurface();
-	}
-
-	// we definitely want to sync every frame for the cinematics
+	// we definately want to sync every frame for the cinematics
 	qglFinish();
 
-	start = 0;
+	start = end = 0;
 	if ( r_speeds->integer ) {
 		start = ri.Milliseconds();
 	}
@@ -759,8 +1031,22 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 		ri.Error (ERR_DROP, "Draw_StretchRaw: size not a power of 2: %i by %i", cols, rows);
 	}
 
-	RE_UploadCinematic (w, h, cols, rows, data, client, dirty);
-	GL_Bind( tr.scratchImage[client] );
+	GL_Bind( tr.scratchImage );
+
+	// if the scratchImage isn't in the format we want, specify it as a new texture
+	if ( cols != tr.scratchImage->width || rows != tr.scratchImage->height ) {
+		tr.scratchImage->width = tr.scratchImage->uploadWidth = cols;
+		tr.scratchImage->height = tr.scratchImage->uploadHeight = rows;
+		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );	
+	} else {
+		// otherwise, just subimage upload it so that drivers can tell we are going to be changing
+		// it and don't try and do a texture compression
+		qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
+	}
 
 	if ( r_speeds->integer ) {
 		end = ri.Milliseconds();
@@ -783,29 +1069,6 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 	qglEnd ();
 }
 
-void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
-
-	GL_Bind( tr.scratchImage[client] );
-
-	// if the scratchImage isn't in the format we want, specify it as a new texture
-	if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) {
-		tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols;
-		tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows;
-		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, haveClampToEdge ? GL_CLAMP_TO_EDGE : GL_CLAMP );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, haveClampToEdge ? GL_CLAMP_TO_EDGE : GL_CLAMP );
-	} else {
-		if (dirty) {
-			// otherwise, just subimage upload it so that drivers can tell we are going to be changing
-			// it and don't try and do a texture compression
-			qglTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data );
-		}
-	}
-}
-
-
 /*
 =============
 RB_SetColor
@@ -837,7 +1100,7 @@ const void *RB_StretchPic ( const void *data ) {
 
 	cmd = (const stretchPicCommand_t *)data;
 
-	if ( !backEnd.projection2D ) {
+	if ( !backEnd.in2D ) {
 		RB_SetGL2D();
 	}
 
@@ -847,7 +1110,7 @@ const void *RB_StretchPic ( const void *data ) {
 			RB_EndSurface();
 		}
 		backEnd.currentEntity = &backEnd.entity2D;
-		RB_BeginSurface( shader, 0 );
+		RB_BeginSurface( shader );
 	}
 
 	RB_CHECKOVERFLOW( 4, 6 );
@@ -900,6 +1163,31 @@ const void *RB_StretchPic ( const void *data ) {
 	return (const void *)(cmd + 1);
 }
 
+/*
+=============
+RB_SetupFog
+=============
+*/
+void RB_SetupFog() {
+	if (!backEnd.viewParms.farplane_distance) {
+		glState.externalSetState &= ~GLS_FOG;
+	} else if (r_farplane_nofog->integer) {
+		glState.externalSetState &= ~GLS_FOG;
+	} else {
+		vec4_t vFogColor;
+
+		qglFogf(GL_FOG_START, backEnd.viewParms.farplane_bias);
+		qglFogf(GL_FOG_END, backEnd.viewParms.farplane_distance);
+
+        vFogColor[0] = backEnd.viewParms.farplane_color[0] * tr.identityLight;
+        vFogColor[1] = backEnd.viewParms.farplane_color[1] * tr.identityLight;
+        vFogColor[2] = backEnd.viewParms.farplane_color[2] * tr.identityLight;
+        vFogColor[3] = 1.0;
+        GL_SetFogColor(vFogColor);
+
+		glState.externalSetState |= GLS_FOG;
+	}
+}
 
 /*
 =============
@@ -920,12 +1208,39 @@ const void	*RB_DrawSurfs( const void *data ) {
 	backEnd.refdef = cmd->refdef;
 	backEnd.viewParms = cmd->viewParms;
 
+	RB_SetupFog();
 	RB_RenderDrawSurfList( cmd->drawSurfs, cmd->numDrawSurfs );
 
 	return (const void *)(cmd + 1);
 }
 
 
+/*
+=============
+RB_DrawSurfs
+
+=============
+*/
+const void* RB_SpriteSurfs(const void* data) {
+    const drawSurfsCommand_t* cmd;
+
+    // finish any 2D drawing if needed
+    if (tess.numIndexes) {
+        RB_EndSurface();
+    }
+
+    cmd = (const drawSurfsCommand_t*)data;
+
+    backEnd.refdef = cmd->refdef;
+    backEnd.viewParms = cmd->viewParms;
+	
+	RB_SetupFog();
+    RB_RenderSpriteSurfList(cmd->drawSurfs, cmd->numDrawSurfs);
+
+    return (const void*)(cmd + 1);
+}
+
+
 /*
 =============
 RB_DrawBuffer
@@ -958,13 +1273,13 @@ was there.  This is used to test for texture thrashing.
 Also called by RE_EndRegistration
 ===============
 */
-void RB_ShowImages( void ) {
+void RB_ShowImages( qboolean quiet ) {
 	int		i;
 	image_t	*image;
 	float	x, y, w, h;
 	int		start, end;
 
-	if ( !backEnd.projection2D ) {
+	if ( !backEnd.in2D ) {
 		RB_SetGL2D();
 	}
 
@@ -975,7 +1290,7 @@ void RB_ShowImages( void ) {
 	start = ri.Milliseconds();
 
 	for ( i=0 ; i<tr.numImages ; i++ ) {
-		image = tr.images[i];
+		image = &tr.images[i];
 
 		w = glConfig.vidWidth / 20;
 		h = glConfig.vidHeight / 15;
@@ -1004,46 +1319,12 @@ void RB_ShowImages( void ) {
 	qglFinish();
 
 	end = ri.Milliseconds();
-	ri.Printf( PRINT_ALL, "%i msec to draw all images\n", end - start );
 
+    if (!quiet) {
+        ri.Printf(PRINT_ALL, "%i msec to draw all images\n", end - start);
+    }
 }
 
-/*
-=============
-RB_ColorMask
-
-=============
-*/
-const void *RB_ColorMask(const void *data)
-{
-	const colorMaskCommand_t *cmd = data;
-	
-	qglColorMask(cmd->rgba[0], cmd->rgba[1], cmd->rgba[2], cmd->rgba[3]);
-	
-	return (const void *)(cmd + 1);
-}
-
-/*
-=============
-RB_ClearDepth
-
-=============
-*/
-const void *RB_ClearDepth(const void *data)
-{
-	const clearDepthCommand_t *cmd = data;
-	
-	if(tess.numIndexes)
-		RB_EndSurface();
-
-	// texture swapping test
-	if (r_showImages->integer)
-		RB_ShowImages();
-
-	qglClear(GL_DEPTH_BUFFER_BIT);
-	
-	return (const void *)(cmd + 1);
-}
 
 /*
 =============
@@ -1061,7 +1342,7 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	// texture swapping test
 	if ( r_showImages->integer ) {
-		RB_ShowImages();
+		RB_ShowImages(qfalse);
 	}
 
 	cmd = (const swapBuffersCommand_t *)data;
@@ -1093,7 +1374,7 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	GLimp_EndFrame();
 
-	backEnd.projection2D = qfalse;
+	backEnd.in2D = qfalse;
 
 	return (const void *)(cmd + 1);
 }
@@ -1101,6 +1382,9 @@ const void	*RB_SwapBuffers( const void *data ) {
 /*
 ====================
 RB_ExecuteRenderCommands
+
+This function will be called synchronously if running without
+smp extensions, or asynchronously by another thread.
 ====================
 */
 void RB_ExecuteRenderCommands( const void *data ) {
@@ -1108,9 +1392,13 @@ void RB_ExecuteRenderCommands( const void *data ) {
 
 	t1 = ri.Milliseconds ();
 
-	while ( 1 ) {
-		data = PADP(data, sizeof(void *));
+	if ( !r_smp->integer || data == backEndData[0]->commands.cmds ) {
+		backEnd.smpFrame = 0;
+	} else {
+		backEnd.smpFrame = 1;
+	}
 
+	while ( 1 ) {
 		switch ( *(const int *)data ) {
 		case RC_SET_COLOR:
 			data = RB_SetColor( data );
@@ -1121,6 +1409,9 @@ void RB_ExecuteRenderCommands( const void *data ) {
 		case RC_DRAW_SURFS:
 			data = RB_DrawSurfs( data );
 			break;
+		case RC_SPRITE_SURFS:
+			data = RB_SpriteSurfs( data );
+			break;
 		case RC_DRAW_BUFFER:
 			data = RB_DrawBuffer( data );
 			break;
@@ -1130,18 +1421,10 @@ void RB_ExecuteRenderCommands( const void *data ) {
 		case RC_SCREENSHOT:
 			data = RB_TakeScreenshotCmd( data );
 			break;
-		case RC_VIDEOFRAME:
-			data = RB_TakeVideoFrameCmd( data );
-			break;
-		case RC_COLORMASK:
-			data = RB_ColorMask(data);
-			break;
-		case RC_CLEARDEPTH:
-			data = RB_ClearDepth(data);
-			break;
+
 		case RC_END_OF_LIST:
 		default:
-			// stop rendering
+			// stop rendering on this thread
 			t2 = ri.Milliseconds ();
 			backEnd.pc.msec = t2 - t1;
 			return;
@@ -1149,3 +1432,30 @@ void RB_ExecuteRenderCommands( const void *data ) {
 	}
 
 }
+
+
+/*
+================
+RB_RenderThread
+================
+*/
+void RB_RenderThread( void ) {
+	const void	*data;
+
+	// wait for either a rendering command or a quit command
+	while ( 1 ) {
+		// sleep until we have work to do
+		data = GLimp_RendererSleep();
+
+		if ( !data ) {
+			return;	// all done, renderer is shutting down
+		}
+
+		renderThreadActive = qtrue;
+
+		RB_ExecuteRenderCommands( data );
+
+		renderThreadActive = qfalse;
+	}
+}
+
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 5de7ff90..09386625 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -15,13 +16,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_map.c
 
 #include "tr_local.h"
+#include "tr_vis.h"
 
 /*
 
@@ -39,56 +41,86 @@ static	byte		*fileBase;
 int			c_subdivisions;
 int			c_gridVerts;
 
+static int map_length;
+static int nummodels;
+static int numShaders;
+static int numbrushes;
+static int numbrushsides;
+static int numFogs;
+static int numplanes;
+static int num_entities;
+static int numnodes;
+static int numleafs;
+static int numleafsurfaces;
+static int numDrawVerts;
+static int numDrawIndexes;
+static int numDrawSurfaces;
+static int numLightDefs;
+static int numLightBytes;
+static int numVisBytes;
+static int numSLights;
+static int entLightVisSize;
+static int g_iGridArraySize;
+static int g_iGridDataSize;
+static int g_iGridPaletteBytes;
+static int g_iGridOffsets;
+static int g_nStaticModelData;
+static int map_version;
+static int g_nStaticModelIndices;
+static int g_nStaticModels;
+static int g_nTerPatchIndices;
+static int g_nTerraPatches;
+
 //===============================================================================
 
 static void HSVtoRGB( float h, float s, float v, float rgb[3] )
 {
-	int i;
-	float f;
-	float p, q, t;
+    int i;
+    float f;
+    float p, q, t;
 
-	h *= 5;
+    h *= 5;
 
-	i = floor( h );
-	f = h - i;
+    i = floor( h );
+    f = h - i;
 
-	p = v * ( 1 - s );
-	q = v * ( 1 - s * f );
-	t = v * ( 1 - s * ( 1 - f ) );
+    p = v * ( 1 - s );
+    q = v * ( 1 - s * f );
+    t = v * ( 1 - s * ( 1 - f ) );
 
-	switch ( i )
-	{
-	case 0:
-		rgb[0] = v;
-		rgb[1] = t;
-		rgb[2] = p;
-		break;
-	case 1:
-		rgb[0] = q;
-		rgb[1] = v;
-		rgb[2] = p;
-		break;
-	case 2:
-		rgb[0] = p;
-		rgb[1] = v;
-		rgb[2] = t;
-		break;
-	case 3:
-		rgb[0] = p;
-		rgb[1] = q;
-		rgb[2] = v;
-		break;
-	case 4:
-		rgb[0] = t;
-		rgb[1] = p;
-		rgb[2] = v;
-		break;
-	case 5:
-		rgb[0] = v;
-		rgb[1] = p;
-		rgb[2] = q;
-		break;
-	}
+    switch ( i )
+    {
+    case 0:
+        rgb[0] = v;
+        rgb[1] = t;
+        rgb[2] = p;
+        break;
+    case 1:
+        rgb[0] = q;
+        rgb[1] = v;
+        rgb[2] = p;
+        break;
+    case 2:
+        rgb[0] = p;
+        rgb[1] = v;
+        rgb[2] = t;
+        break;
+    case 3:
+        rgb[0] = p;
+        rgb[1] = q;
+        rgb[2] = v;
+        break;
+    case 4:
+        rgb[0] = t;
+        rgb[1] = p;
+        rgb[2] = v;
+        break;
+    case 5:
+        rgb[0] = v;
+        rgb[1] = p;
+        rgb[2] = q;
+        break;
+    }
 }
 
 /*
@@ -97,32 +129,59 @@ R_ColorShiftLightingBytes
 
 ===============
 */
-static	void R_ColorShiftLightingBytes( byte in[4], byte out[4] ) {
-	int		shift, r, g, b;
+static	void R_ColorShiftLightingBytes( byte in[3], byte out[3] ) {
+    int		r, g, b;
 
-	// shift the color data based on overbright range
-	shift = r_mapOverBrightBits->integer - tr.overbrightBits;
+    // shift the data based on overbright range
+    r = in[0] << tr.overbrightShift;
+    g = in[1] << tr.overbrightShift;
+    b = in[2] << tr.overbrightShift;
+    
+    // normalize by color instead of saturating to white
+    if ( ( r | g | b ) > 255 ) {
+        int		max;
 
-	// shift the data based on overbright range
-	r = in[0] << shift;
-	g = in[1] << shift;
-	b = in[2] << shift;
-	
-	// normalize by color instead of saturating to white
-	if ( ( r | g | b ) > 255 ) {
-		int		max;
+        max = r > g ? r : g;
+        max = max > b ? max : b;
+        r = r * 255 / max;
+        g = g * 255 / max;
+        b = b * 255 / max;
+    }
 
-		max = r > g ? r : g;
-		max = max > b ? max : b;
-		r = r * 255 / max;
-		g = g * 255 / max;
-		b = b * 255 / max;
-	}
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+}
 
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
-	out[3] = in[3];
+/*
+===============
+R_ColorShiftLightingBytesAlpha
+
+===============
+*/
+static	void R_ColorShiftLightingBytesAlpha( byte in[4], byte out[4] ) {
+    int		r, g, b;
+
+    // shift the data based on overbright range
+    r = in[0] << tr.overbrightShift;
+    g = in[1] << tr.overbrightShift;
+    b = in[2] << tr.overbrightShift;
+    
+    // normalize by color instead of saturating to white
+    if ( ( r | g | b ) > 255 ) {
+        int		max;
+        
+        max = r > g ? r : g;
+        max = max > b ? max : b;
+        r = r * 255 / max;
+        g = g * 255 / max;
+        b = b * 255 / max;
+    }
+
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = in[3];
 }
 
 /*
@@ -132,84 +191,85 @@ R_LoadLightmaps
 ===============
 */
 #define	LIGHTMAP_SIZE	128
-static	void R_LoadLightmaps( lump_t *l ) {
-	byte		*buf, *buf_p;
-	int			len;
-	byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
-	int			i, j;
-	float maxIntensity = 0;
-	double sumIntensity = 0;
+static	void R_LoadLightmaps(gamelump_t* l) {
+    byte		*buf, *buf_p;
+    int			len;
+    MAC_STATIC byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
+    int			i, j;
+    float maxIntensity = 0;
+    double sumIntensity = 0;
 
-	len = l->filelen;
-	if ( !len ) {
-		return;
-	}
-	buf = fileBase + l->fileofs;
+    len = l->length;
+    if (!len) {
+        return;
+    }
+    buf = l->buffer;
 
-	// we are about to upload textures
-	R_IssuePendingRenderCommands();
+    // we are about to upload textures
+    R_SyncRenderThread();
 
-	// create all the lightmaps
-	tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
-	if ( tr.numLightmaps == 1 ) {
-		//FIXME: HACK: maps with only one lightmap turn up fullbright for some reason.
-		//this avoids this, but isn't the correct solution.
-		tr.numLightmaps++;
-	}
+    // create all the lightmaps
+    tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
 
-	// if we are in r_vertexLight mode, we don't need the lightmaps at all
-	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		return;
-	}
+    // if we are in r_vertexLight mode, we don't need the lightmaps at all
+    if ( r_vertexLight->integer ) {
+        return;
+    }
 
-	tr.lightmaps = ri.Hunk_Alloc( tr.numLightmaps * sizeof(image_t *), h_low );
-	for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
-		// expand the 24 bit on-disk to 32 bit
-		buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
+    for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
+        // expand the 24 bit on-disk to 32 bit
+        buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
 
-		if ( r_lightmap->integer == 2 )
-		{	// color code by intensity as development tool	(FIXME: check range)
-			for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
-			{
-				float r = buf_p[j*3+0];
-				float g = buf_p[j*3+1];
-				float b = buf_p[j*3+2];
-				float intensity;
-				float out[3] = {0.0, 0.0, 0.0};
+        if ( r_lightmap->integer == 2 )
+        {	// color code by intensity as development tool	(FIXME: check range)
+            for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
+            {
+                float r = buf_p[j*3+0];
+                float g = buf_p[j*3+1];
+                float b = buf_p[j*3+2];
+                float intensity;
+                float out[3];
 
-				intensity = 0.33f * r + 0.685f * g + 0.063f * b;
+                intensity = 0.33f * r + 0.685f * g + 0.063f * b;
 
-				if ( intensity > 255 )
-					intensity = 1.0f;
-				else
-					intensity /= 255.0f;
+                if ( intensity > 255 )
+                    intensity = 1.0f;
+                else
+                    intensity /= 255.0f;
 
-				if ( intensity > maxIntensity )
-					maxIntensity = intensity;
+                if ( intensity > maxIntensity )
+                    maxIntensity = intensity;
 
-				HSVtoRGB( intensity, 1.00, 0.50, out );
+                HSVtoRGB( intensity, 1.00, 0.50, out );
 
-				image[j*4+0] = out[0] * 255;
-				image[j*4+1] = out[1] * 255;
-				image[j*4+2] = out[2] * 255;
-				image[j*4+3] = 255;
+                image[j*4+0] = out[0] * 255;
+                image[j*4+1] = out[1] * 255;
+                image[j*4+2] = out[2] * 255;
+                image[j*4+3] = 255;
 
-				sumIntensity += intensity;
-			}
-		} else {
-			for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
-				R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
-				image[j*4+3] = 255;
-			}
-		}
-		tr.lightmaps[i] = R_CreateImage( va("*lightmap%d",i), image, 
-			LIGHTMAP_SIZE, LIGHTMAP_SIZE, IMGTYPE_COLORALPHA,
-			IMGFLAG_NOLIGHTSCALE | IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, 0 );
-	}
+                sumIntensity += intensity;
+            }
+        } else {
+            for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
+                R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
+                image[j*4+3] = 255;
+            }
+        }
+        tr.lightmaps[i] = R_CreateImage(va("*lightmap%d", i), image,
+            LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+    }
 
-	if ( r_lightmap->integer == 2 )	{
-		ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
-	}
+    if ( r_lightmap->integer == 2 )	{
+        ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
+    }
+
+    if (r_fastdlights->integer) {
+        s_worldData.lighting = NULL;
+    }
+    else {
+        s_worldData.lighting = ri.Hunk_Alloc(l->length, h_dontcare);
+        Com_Memcpy(s_worldData.lighting, l->buffer, l->length);
+    }
 }
 
 
@@ -222,7 +282,7 @@ space in big maps...
 =================
 */
 void		RE_SetWorldVisData( const byte *vis ) {
-	tr.externalVisData = vis;
+    tr.externalVisData = vis;
 }
 
 
@@ -231,34 +291,137 @@ void		RE_SetWorldVisData( const byte *vis ) {
 R_LoadVisibility
 =================
 */
-static	void R_LoadVisibility( lump_t *l ) {
-	int		len;
-	byte	*buf;
+static	void R_LoadVisibility(gamelump_t* l) {
+    int		len;
+    byte	*buf;
 
-	len = ( s_worldData.numClusters + 63 ) & ~63;
-	s_worldData.novis = ri.Hunk_Alloc( len, h_low );
-	Com_Memset( s_worldData.novis, 0xff, len );
+    len = ( s_worldData.numClusters + 63 ) & ~63;
+    s_worldData.novis = ri.Hunk_Alloc( len, h_dontcare );
+    Com_Memset( s_worldData.novis, 0xff, len );
 
-    len = l->filelen;
-	if ( !len ) {
-		return;
-	}
-	buf = fileBase + l->fileofs;
+    len = l->length;
+    if (!len) {
+        return;
+    }
+    buf = l->buffer;
 
-	s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
-	s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
+    s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
+    s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
 
-	// CM_Load should have given us the vis data to share, so
-	// we don't need to allocate another copy
-	if ( tr.externalVisData ) {
-		s_worldData.vis = tr.externalVisData;
-	} else {
-		byte	*dest;
+    // CM_Load should have given us the vis data to share, so
+    // we don't need to allocate another copy
+    if ( tr.externalVisData ) {
+        s_worldData.vis = tr.externalVisData;
+    } else {
+        byte	*dest;
 
-		dest = ri.Hunk_Alloc( len - 8, h_low );
-		Com_Memcpy( dest, buf + 8, len - 8 );
-		s_worldData.vis = dest;
-	}
+        dest = ri.Hunk_Alloc( len - 8, h_dontcare );
+        Com_Memcpy( dest, buf + 8, len - 8 );
+        s_worldData.vis = dest;
+    }
+}
+
+/*
+================
+R_LoadSphereLights
+================
+*/
+void R_LoadSphereLights(gamelump_t* l) {
+    int				i, j;
+    mapspherel_t* at;
+    spherel_t* light;
+
+    if (l->length % sizeof(mapspherel_t)) {
+        Com_Error(ERR_DROP, "LoadMap: funny lump size in spherelight data for %s\n", s_worldData.name);
+    }
+
+    tr.numSLights = l->length / sizeof(mapspherel_t);
+
+    if (tr.numSLights >= MAX_MAP_SPHERE_L_SIZE) {
+        Com_Error(ERR_DROP, "LoadMap: Too many spherelights on map %s, limit is %d\n", s_worldData.name, MAX_MAP_SPHERE_L_SIZE);
+    }
+
+    at = l->buffer;
+    light = tr.sLights;
+
+    for (i = 0; i < tr.numSLights; at++, light++, i++) {
+        VectorCopy(at->origin, light->origin);
+        VectorCopy(at->color, light->color);
+        VectorCopy(at->spot_dir, light->spot_dir);
+
+        for (j = 0; j < 3; j++) {
+            light->origin[j] = LittleFloat(light->origin[j]);
+            light->color[j] = LittleFloat(light->color[j]);
+            light->spot_dir[j] = LittleFloat(light->spot_dir[j]);
+        }
+
+        light->spot_radiusbydistance = LittleFloat(at->spot_radiusbydistance);
+        light->intensity = LittleFloat(at->intensity);
+        light->spot_light = LittleLong(at->spot_light);
+        light->needs_trace = LittleLong(at->needs_trace);
+        light->leaf = &s_worldData.nodes[s_worldData.numDecisionNodes + LittleLong(at->leaf)];
+    }
+}
+
+/*
+================
+R_LoadSphereLightVis
+================
+*/
+void R_LoadSphereLightVis(gamelump_t* l) {
+    int i;
+    int j;
+    int h;
+    mnode_t* node;
+    int numentries;
+    int* entries;
+
+    memset(&tr.sSunLight, 0, sizeof(spherel_t));
+
+    if (l->length % 4) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in spherelight vis data for %s\n",
+            s_worldData.name);
+    }
+    else {
+        entries = l->buffer;
+        numentries = l->length / sizeof(int);
+
+        if (numentries) {
+            if (numentries != s_worldData.numnodes - s_worldData.numDecisionNodes) {
+                for (i = 0; i < numentries; ++i)
+                    entries[i] = LittleLong(entries[i]);
+
+                for (node = &s_worldData.nodes[s_worldData.numDecisionNodes]; numentries; node++) {
+                    j = 0;
+                    if (entries[0] != -1) {
+                        do
+                            ++j;
+                        while (entries[j] != -1);
+                    }
+                    if (j) {
+                        node->lights = ri.Hunk_Alloc(j * sizeof(spherel_t*), h_dontcare);
+                        node->numlights = j;
+                        h = 0;
+                        if (entries[0] == -2) {
+                            node->lights[0] = &tr.sSunLight;
+                            tr.sSunLight.leaf = (mnode_t*)-1;
+                            h = 1;
+                        }
+                        while (entries[h] != -1) {
+                            node->lights[h] = &tr.sLights[entries[h]];
+                            h++;
+                        }
+                        entries += h + 1;
+                        numentries = numentries - 1 - h;
+                    }
+                    else {
+                        numentries--;
+                        entries++;
+                    }
+                }
+            }
+        }
+    }
 }
 
 //===============================================================================
@@ -270,31 +433,171 @@ ShaderForShaderNum
 ===============
 */
 static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
-	shader_t	*shader;
-	dshader_t	*dsh;
+    shader_t	*shader;
+    dshader_t	*dsh;
 
-	int _shaderNum = LittleLong( shaderNum );
-	if ( _shaderNum < 0 || _shaderNum >= s_worldData.numShaders ) {
-		ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", _shaderNum );
-	}
-	dsh = &s_worldData.shaders[ _shaderNum ];
+    if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
+        ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
+    }
+    dsh = &s_worldData.shaders[ shaderNum ];
 
-	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		lightmapNum = LIGHTMAP_BY_VERTEX;
-	}
+    if ( r_vertexLight->integer ) {
+        lightmapNum = LIGHTMAP_BY_VERTEX;
+    }
 
-	if ( r_fullbright->integer ) {
-		lightmapNum = LIGHTMAP_WHITEIMAGE;
-	}
+    if ( r_fullbright->integer || !tr.numLightmaps ) {
+        lightmapNum = LIGHTMAP_WHITEIMAGE;
+    }
 
-	shader = R_FindShader( dsh->shader, lightmapNum, qtrue );
+    shader = R_FindShader( dsh->shader, lightmapNum, qtrue, qtrue, qtrue, qtrue);
 
-	// if the shader had errors, just use default shader
-	if ( shader->defaultShader ) {
-		return tr.defaultShader;
-	}
+    // if the shader had errors, just use default shader
+    if ( shader->defaultShader ) {
+        return tr.defaultShader;
+    }
 
-	return shader;
+    return shader;
+}
+
+/*
+================
+R_UnpackTerraPatch
+================
+*/
+void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
+    int i, j;
+
+    pUnpacked->byDirty = qfalse;
+    pUnpacked->visCountCheck = 0;
+    pUnpacked->visCountDraw = 0;
+    pUnpacked->uiDistRecalc = 0;
+
+    if (pPacked->lmapScale <= 0) {
+        Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
+    }
+
+    pUnpacked->drawinfo.lmapStep = (float)(64 / pPacked->lmapScale);
+    pUnpacked->drawinfo.lmapSize = pPacked->lmapScale * 8 + 1;
+    pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
+    pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
+
+    if( s_worldData.lighting ) {
+        pUnpacked->drawinfo.lmData = &s_worldData.lighting[pPacked->iLightMap * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * pPacked->s + 3 * LIGHTMAP_SIZE * pPacked->t];
+    } else {
+        pUnpacked->drawinfo.lmData = NULL;
+    }
+
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 2; j++) {
+            pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
+            pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
+        }
+    }
+
+    pUnpacked->x0 = ((int)pPacked->x << 6);
+    pUnpacked->y0 = ((int)pPacked->y << 6);
+    pUnpacked->z0 = pPacked->iBaseHeight;
+    pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
+    pUnpacked->iNorth = pPacked->iNorth;
+    pUnpacked->iEast = pPacked->iEast;
+    pUnpacked->iSouth = pPacked->iSouth;
+    pUnpacked->iWest = pPacked->iWest;
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
+    {
+        varnode_t *packedVarTree;
+
+        packedVarTree = &pPacked->varTree[0][i];
+        pUnpacked->varTree[0][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[0][i].flags &= ~0xFF;
+        pUnpacked->varTree[0][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+
+        packedVarTree = &pPacked->varTree[1][i];
+        pUnpacked->varTree[1][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[1][i].flags &= ~0xFF;
+        pUnpacked->varTree[1][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+    }
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
+        pUnpacked->heightmap[i] = pPacked->heightmap[i];
+    }
+
+    pUnpacked->zmax = 0;
+    pUnpacked->flags = pPacked->flags;
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++)
+    {
+        if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
+            pUnpacked->zmax = pUnpacked->heightmap[i];
+        }
+    }
+
+    pUnpacked->frameCount = 0;
+    pUnpacked->zmax += pUnpacked->zmax;
+}
+
+/*
+================
+R_LoadTerrain
+================
+IneQuation was here
+*/
+void R_LoadTerrain(gamelump_t* lump) {
+    int		i;
+    cTerraPatch_t* in;
+    cTerraPatchUnpacked_t* out;
+
+    if (!lump->length) {
+        s_worldData.numTerraPatches = 0;
+        s_worldData.terraPatches = NULL;
+        return;
+    }
+
+    if (lump->length % sizeof(cTerraPatch_t)) {
+        Com_Error(ERR_DROP, "R_LoadTerrain: funny lump size");
+    }
+
+    s_worldData.numTerraPatches = lump->length / sizeof(cTerraPatch_t);
+    s_worldData.terraPatches = ri.Hunk_Alloc(s_worldData.numTerraPatches * sizeof(cTerraPatchUnpacked_t), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.terraPatches;
+
+    for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
+        R_SwapTerraPatch(in);
+        R_UnpackTerraPatch(in, out);
+    }
+}
+
+/*
+================
+R_LoadTerrainIndexes
+================
+*/
+void R_LoadTerrainIndexes(gamelump_t* lump) {
+    int		i;
+    short* in;
+    cTerraPatchUnpacked_t** out;
+
+    if (!lump->length) {
+        s_worldData.numVisTerraPatches = 0;
+        s_worldData.visTerraPatches = NULL;
+        return;
+    }
+
+    if (lump->length % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadTerrainIndexes: funny lump size");
+    }
+
+    s_worldData.numVisTerraPatches = lump->length / sizeof(short);
+    s_worldData.visTerraPatches = ri.Hunk_Alloc(s_worldData.numVisTerraPatches * sizeof(cTerraPatchUnpacked_t*), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.visTerraPatches;
+
+    for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
+        *out = &s_worldData.terraPatches[LittleShort(*in)];
+    }
 }
 
 /*
@@ -303,69 +606,109 @@ ParseFace
 ===============
 */
 static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes  ) {
-	int			i, j;
-	srfSurfaceFace_t	*cv;
-	int			numPoints, numIndexes;
-	int			lightmapNum;
-	int			sfaceSize, ofsIndexes;
+    int			i, j;
+    srfSurfaceFace_t	*cv;
+    int			numPoints, numIndexes;
+    int			lightmapNum;
+    int			sfaceSize, ofsIndexes;
+    static surfaceType_t skipData = SF_SKIP;
 
-	lightmapNum = LittleLong( ds->lightmapNum );
+    lightmapNum = LittleLong( ds->lightmapNum );
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get shader value
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    if (surf->shader->surfaceFlags & SURF_NODRAW) {
+        // Nodraw surface doesn't need any processing
+        surf->data = &skipData;
+        return;
+    }
 
-	numPoints = LittleLong( ds->numVerts );
-	if (numPoints > MAX_FACE_POINTS) {
-		ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
+    numPoints = LittleLong( ds->numVerts );
+    if (numPoints > MAX_FACE_POINTS) {
+        ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
     numPoints = MAX_FACE_POINTS;
     surf->shader = tr.defaultShader;
-	}
+    }
 
-	numIndexes = LittleLong( ds->numIndexes );
+    numIndexes = LittleLong( ds->numIndexes );
 
-	// create the srfSurfaceFace_t
-	sfaceSize = offsetof( srfSurfaceFace_t, points ) + sizeof( *cv->points ) * numPoints;
-	ofsIndexes = sfaceSize;
-	sfaceSize += sizeof( int ) * numIndexes;
+    // create the srfSurfaceFace_t
+    sfaceSize = ( int ) &((srfSurfaceFace_t *)0)->points[numPoints];
+    ofsIndexes = sfaceSize;
+    sfaceSize += sizeof( int ) * numIndexes;
 
-	cv = ri.Hunk_Alloc( sfaceSize, h_low );
-	cv->surfaceType = SF_FACE;
-	cv->numPoints = numPoints;
-	cv->numIndices = numIndexes;
-	cv->ofsIndices = ofsIndexes;
+    cv = ri.Hunk_Alloc( sfaceSize, h_dontcare );
+    cv->surfaceType = SF_FACE;
+    cv->numPoints = numPoints;
+    cv->numIndices = numIndexes;
+    cv->ofsIndices = ofsIndexes;
 
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
-			cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytes( verts[i].color, (byte *)&cv->points[i][7] );
-	}
+    verts += LittleLong( ds->firstVert );
+    for ( i = 0 ; i < numPoints ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
+        }
+        for ( j = 0 ; j < 2 ; j++ ) {
+            cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
+            cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
+        }
+        R_ColorShiftLightingBytesAlpha( verts[i].color, (byte *)&cv->points[i][7] );
+    }
 
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
-	}
+    indexes += LittleLong( ds->firstIndex );
+    for ( i = 0 ; i < numIndexes ; i++ ) {
+        ((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
+    }
 
-	// take the plane information from the lightmap vector
-	for ( i = 0 ; i < 3 ; i++ ) {
-		cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
-	cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
-	SetPlaneSignbits( &cv->plane );
-	cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
+    // take the plane information from the lightmap vector
+    for ( i = 0 ; i < 3 ; i++ ) {
+        cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
+    }
+    cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
+    SetPlaneSignbits( &cv->plane );
+    cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
 
-	surf->data = (surfaceType_t *)cv;
+    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
+    {
+        float inv;
+
+        cv->lmX = LittleLong(ds->lightmapX);
+        cv->lmY = LittleLong(ds->lightmapY);
+        cv->lmWidth = LittleLong(ds->lightmapWidth);
+        cv->lmHeight = LittleLong(ds->lightmapHeight);
+
+        if (s_worldData.lighting) {
+            cv->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * cv->lmX + 3 * LIGHTMAP_SIZE * cv->lmY];
+        } else {
+            cv->lmData = NULL;
+        }
+
+        for (i = 0; i < 3; i++)
+        {
+            cv->lmOrigin[i] = LittleFloat(ds->lightmapOrigin[i]);
+            cv->lmVecs[0][i] = LittleFloat(ds->lightmapVecs[0][i]);
+            cv->lmVecs[1][i] = LittleFloat(ds->lightmapVecs[1][i]);
+        }
+
+        inv = VectorNormalize2(cv->lmVecs[0], cv->lmInverseVecs[0]);
+        cv->lmInverseVecs[0][0] *= 1.0 / inv;
+        cv->lmInverseVecs[0][1] *= 1.0 / inv;
+        cv->lmInverseVecs[0][2] *= 1.0 / inv;
+
+        inv = VectorNormalize2(cv->lmVecs[1], cv->lmInverseVecs[1]);
+        cv->lmInverseVecs[1][0] *= 1.0 / inv;
+        cv->lmInverseVecs[1][1] *= 1.0 / inv;
+        cv->lmInverseVecs[1][2] *= 1.0 / inv;
+    }
+    else
+    {
+        cv->lmData = NULL;
+    }
+    surf->data = (surfaceType_t *)cv;
 }
 
 
@@ -375,65 +718,86 @@ ParseMesh
 ===============
 */
 static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
-	srfGridMesh_t	*grid;
-	int				i, j;
-	int				width, height, numPoints;
-	drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
-	int				lightmapNum;
-	vec3_t			bounds[2];
-	vec3_t			tmpVec;
-	static surfaceType_t	skipData = SF_SKIP;
+    srfGridMesh_t	*grid;
+    int				i, j;
+    int				width, height, numPoints;
+    MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
+    int				lightmapNum;
+    vec3_t			bounds[2];
+    vec3_t			tmpVec;
+    float           subdivisions;
+    static surfaceType_t	skipData = SF_SKIP;
 
-	lightmapNum = LittleLong( ds->lightmapNum );
+    lightmapNum = LittleLong( ds->lightmapNum );
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader value
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	// we may have a nodraw surface, because they might still need to
-	// be around for movement clipping
-	if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
-		surf->data = &skipData;
-		return;
-	}
+    // we may have a nodraw surface, because they might still need to
+    // be around for movement clipping
+    if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
+        surf->data = &skipData;
+        return;
+    }
 
-	width = LittleLong( ds->patchWidth );
-	height = LittleLong( ds->patchHeight );
+    width = LittleLong( ds->patchWidth );
+    height = LittleLong( ds->patchHeight );
 
-	verts += LittleLong( ds->firstVert );
-	numPoints = width * height;
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			points[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			points[i].st[j] = LittleFloat( verts[i].st[j] );
-			points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytes( verts[i].color, points[i].color );
-	}
+    verts += LittleLong( ds->firstVert );
+    numPoints = width * height;
+    for ( i = 0 ; i < numPoints ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
+            points[i].normal[j] = LittleFloat( verts[i].normal[j] );
+        }
+        for ( j = 0 ; j < 2 ; j++ ) {
+            points[i].st[j] = LittleFloat( verts[i].st[j] );
+            points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
+        }
+        R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
+    }
 
-	// pre-tesseleate
-	grid = R_SubdividePatchToGrid( width, height, points );
-	surf->data = (surfaceType_t *)grid;
+    // pre-tesseleate
+    subdivisions = LittleFloat(ds->subdivisions);
+    if (subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, subdivisions * (r_subdivisions->value / 10.0), points);
+    } else if (surf->shader->subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, surf->shader->subdivisions * (r_subdivisions->value / 10.0), points);
+    } else {
+        grid = R_SubdividePatchToGrid(width, height, r_subdivisions->value, points);
+    }
+    surf->data = (surfaceType_t *)grid;
 
-	// copy the level of detail origin, which is the center
-	// of the group of all curves that must subdivide the same
-	// to avoid cracking
-	for ( i = 0 ; i < 3 ; i++ ) {
-		bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
-		bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
-	}
-	VectorAdd( bounds[0], bounds[1], bounds[1] );
-	VectorScale( bounds[1], 0.5f, grid->lodOrigin );
-	VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
-	grid->lodRadius = VectorLength( tmpVec );
+    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
+    {
+        grid->lmX = LittleLong(ds->lightmapX);
+        grid->lmY = LittleLong(ds->lightmapY);
+        grid->lmWidth = LittleLong(ds->lightmapWidth);
+        grid->lmHeight = LittleLong(ds->lightmapHeight);
+        if (s_worldData.lighting) {
+            grid->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * grid->lmX + 3 * LIGHTMAP_SIZE * grid->lmY];
+        } else {
+            grid->lmData = NULL;
+        }
+    }
+
+    // copy the level of detail origin, which is the center
+    // of the group of all curves that must subdivide the same
+    // to avoid cracking
+    for ( i = 0 ; i < 3 ; i++ ) {
+        bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
+        bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
+    }
+    VectorAdd( bounds[0], bounds[1], bounds[1] );
+    VectorScale( bounds[1], 0.5f, grid->lodOrigin );
+    VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
+    grid->lodRadius = VectorLength( tmpVec );
 }
 
 /*
@@ -442,57 +806,57 @@ ParseTriSurf
 ===============
 */
 static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfTriangles_t	*tri;
-	int				i, j;
-	int				numVerts, numIndexes;
+    srfTriangles_t	*tri;
+    int				i, j;
+    int				numVerts, numIndexes;
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	numVerts = LittleLong( ds->numVerts );
-	numIndexes = LittleLong( ds->numIndexes );
+    numVerts = LittleLong( ds->numVerts );
+    numIndexes = LittleLong( ds->numIndexes );
 
-	tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
-		+ numIndexes * sizeof( tri->indexes[0] ), h_low );
-	tri->surfaceType = SF_TRIANGLES;
-	tri->numVerts = numVerts;
-	tri->numIndexes = numIndexes;
-	tri->verts = (drawVert_t *)(tri + 1);
-	tri->indexes = (int *)(tri->verts + tri->numVerts );
+    tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
+        + numIndexes * sizeof( tri->indexes[0] ), h_dontcare );
+    tri->surfaceType = SF_TRIANGLES;
+    tri->numVerts = numVerts;
+    tri->numIndexes = numIndexes;
+    tri->verts = (drawVert_t *)(tri + 1);
+    tri->indexes = (int *)(tri->verts + tri->numVerts );
 
-	surf->data = (surfaceType_t *)tri;
+    surf->data = (surfaceType_t *)tri;
 
-	// copy vertexes
-	ClearBounds( tri->bounds[0], tri->bounds[1] );
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numVerts ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
-		for ( j = 0 ; j < 2 ; j++ ) {
-			tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
-			tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
+    // copy vertexes
+    ClearBounds( tri->bounds[0], tri->bounds[1] );
+    verts += LittleLong( ds->firstVert );
+    for ( i = 0 ; i < numVerts ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
+            tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
+        }
+        AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
+        for ( j = 0 ; j < 2 ; j++ ) {
+            tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
+            tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
+        }
 
-		R_ColorShiftLightingBytes( verts[i].color, tri->verts[i].color );
-	}
+        R_ColorShiftLightingBytesAlpha( verts[i].color, tri->verts[i].color );
+    }
 
-	// copy indexes
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		tri->indexes[i] = LittleLong( indexes[i] );
-		if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
-			ri.Error( ERR_DROP, "Bad index in triangle surface" );
-		}
-	}
+    // copy indexes
+    indexes += LittleLong( ds->firstIndex );
+    for ( i = 0 ; i < numIndexes ; i++ ) {
+        tri->indexes[i] = LittleLong( indexes[i] );
+        if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
+            ri.Error( ERR_DROP, "Bad index in triangle surface" );
+        }
+    }
 }
 
 /*
@@ -501,28 +865,28 @@ ParseFlare
 ===============
 */
 static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfFlare_t		*flare;
-	int				i;
+    srfFlare_t		*flare;
+    int				i;
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	flare = ri.Hunk_Alloc( sizeof( *flare ), h_low );
-	flare->surfaceType = SF_FLARE;
+    flare = ri.Hunk_Alloc( sizeof( *flare ), h_dontcare );
+    flare->surfaceType = SF_FLARE;
 
-	surf->data = (surfaceType_t *)flare;
+    surf->data = (surfaceType_t *)flare;
 
-	for ( i = 0 ; i < 3 ; i++ ) {
-		flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
-		flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
-		flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
+    for ( i = 0 ; i < 3 ; i++ ) {
+        flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
+        flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
+        flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
+    }
 }
 
 
@@ -534,17 +898,17 @@ returns true if there are grid points merged on a width edge
 =================
 */
 int R_MergedWidthPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
+    int i, j;
 
-	for (i = 1; i < grid->width-1; i++) {
-		for (j = i + 1; j < grid->width-1; j++) {
-			if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
+    for (i = 1; i < grid->width-1; i++) {
+        for (j = i + 1; j < grid->width-1; j++) {
+            if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
+            if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
+            if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
+            return qtrue;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -555,17 +919,17 @@ returns true if there are grid points merged on a height edge
 =================
 */
 int R_MergedHeightPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
+    int i, j;
 
-	for (i = 1; i < grid->height-1; i++) {
-		for (j = i + 1; j < grid->height-1; j++) {
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
+    for (i = 1; i < grid->height-1; i++) {
+        for (j = i + 1; j < grid->height-1; j++) {
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
+            return qtrue;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -578,107 +942,107 @@ FIXME: write generalized version that also avoids cracks between a patch and one
 =================
 */
 void R_FixSharedVertexLodError_r( int start, srfGridMesh_t *grid1 ) {
-	int j, k, l, m, n, offset1, offset2, touch;
-	srfGridMesh_t *grid2;
+    int j, k, l, m, n, offset1, offset2, touch;
+    srfGridMesh_t *grid2;
 
-	for ( j = start; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// if the LOD errors are already fixed for this patch
-		if ( grid2->lodFixed == 2 ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		touch = qfalse;
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = (grid1->height-1) * grid1->width;
-			else offset1 = 0;
-			if (R_MergedWidthPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->width-1; k++) {
-				for (m = 0; m < 2; m++) {
+    for ( j = start; j < s_worldData.numsurfaces; j++ ) {
+        //
+        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
+        // if this surface is not a grid
+        if ( grid2->surfaceType != SF_GRID ) continue;
+        // if the LOD errors are already fixed for this patch
+        if ( grid2->lodFixed == 2 ) continue;
+        // grids in the same LOD group should have the exact same lod radius
+        if ( grid1->lodRadius != grid2->lodRadius ) continue;
+        // grids in the same LOD group should have the exact same lod origin
+        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
+        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
+        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
+        //
+        touch = qfalse;
+        for (n = 0; n < 2; n++) {
+            //
+            if (n) offset1 = (grid1->height-1) * grid1->width;
+            else offset1 = 0;
+            if (R_MergedWidthPoints(grid1, offset1)) continue;
+            for (k = 1; k < grid1->width-1; k++) {
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = (grid2->height-1) * grid2->width;
+                    else offset2 = 0;
+                    if (R_MergedWidthPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->width-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->widthLodError[l] = grid1->widthLodError[k];
+                        touch = qtrue;
+                    }
+                }
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = grid1->width-1;
-			else offset1 = 0;
-			if (R_MergedHeightPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->height-1; k++) {
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = grid2->width-1;
+                    else offset2 = 0;
+                    if (R_MergedHeightPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->height-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->heightLodError[l] = grid1->widthLodError[k];
+                        touch = qtrue;
+                    }
+                }
+            }
+        }
+        for (n = 0; n < 2; n++) {
+            //
+            if (n) offset1 = grid1->width-1;
+            else offset1 = 0;
+            if (R_MergedHeightPoints(grid1, offset1)) continue;
+            for (k = 1; k < grid1->height-1; k++) {
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = (grid2->height-1) * grid2->width;
+                    else offset2 = 0;
+                    if (R_MergedWidthPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->width-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->widthLodError[l] = grid1->heightLodError[k];
+                        touch = qtrue;
+                    }
+                }
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		if (touch) {
-			grid2->lodFixed = 2;
-			R_FixSharedVertexLodError_r ( start, grid2 );
-			//NOTE: this would be correct but makes things really slow
-			//grid2->lodFixed = 1;
-		}
-	}
+                    if (m) offset2 = grid2->width-1;
+                    else offset2 = 0;
+                    if (R_MergedHeightPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->height-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->heightLodError[l] = grid1->heightLodError[k];
+                        touch = qtrue;
+                    }
+                }
+            }
+        }
+        if (touch) {
+            grid2->lodFixed = 2;
+            R_FixSharedVertexLodError_r ( start, grid2 );
+            //NOTE: this would be correct but makes things really slow
+            //grid2->lodFixed = 1;
+        }
+    }
 }
 
 /*
@@ -690,23 +1054,23 @@ If this is not the case this function will still do its job but won't fix the hi
 =================
 */
 void R_FixSharedVertexLodError( void ) {
-	int i;
-	srfGridMesh_t *grid1;
+    int i;
+    srfGridMesh_t *grid1;
 
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid1->surfaceType != SF_GRID )
-			continue;
-		//
-		if ( grid1->lodFixed )
-			continue;
-		//
-		grid1->lodFixed = 2;
-		// recursively fix other patches in the same LOD group
-		R_FixSharedVertexLodError_r( i + 1, grid1);
-	}
+    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+        //
+        grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+        // if this surface is not a grid
+        if ( grid1->surfaceType != SF_GRID )
+            continue;
+        //
+        if ( grid1->lodFixed )
+            continue;
+        //
+        grid1->lodFixed = 2;
+        // recursively fix other patches in the same LOD group
+        R_FixSharedVertexLodError_r( i + 1, grid1);
+    }
 }
 
 
@@ -716,405 +1080,405 @@ R_StitchPatches
 ===============
 */
 int R_StitchPatches( int grid1num, int grid2num ) {
-	float *v1, *v2;
-	srfGridMesh_t *grid1, *grid2;
-	int k, l, m, n, offset1, offset2, row, column;
+    float *v1, *v2;
+    srfGridMesh_t *grid1, *grid2;
+    int k, l, m, n, offset1, offset2, row, column;
 
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->width-2; k += 2) {
+    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = (grid1->height-1) * grid1->width;
+        else offset1 = 0;
+        if (R_MergedWidthPoints(grid1, offset1))
+            continue;
+        for (k = 0; k < grid1->width-2; k += 2) {
 
-			for (m = 0; m < 2; m++) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k + 2 + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                    grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-					//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                    //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->height-2; k += 2) {
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k + 2 + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = grid1->width-1;
+        else offset1 = 0;
+        if (R_MergedHeightPoints(grid1, offset1))
+            continue;
+        for (k = 0; k < grid1->height-2; k += 2) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = grid1->width-1; k > 1; k -= 2) {
+                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = (grid1->height-1) * grid1->width;
+        else offset1 = 0;
+        if (R_MergedWidthPoints(grid1, offset1))
+            continue;
+        for (k = grid1->width-1; k > 1; k -= 2) {
 
-			for (m = 0; m < 2; m++) {
+            for (m = 0; m < 2; m++) {
 
-				if ( !grid2 || grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k - 2 + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (!grid2 || grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					if (!grid2)
-						break;
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = grid1->height-1; k > 1; k -= 2) {
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k - 2 + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    if (!grid2)
+                        break;
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = grid1->width-1;
+        else offset1 = 0;
+        if (R_MergedHeightPoints(grid1, offset1))
+            continue;
+        for (k = grid1->height-1; k > 1; k -= 2) {
+            for (m = 0; m < 2; m++) {
 
-				if ( !grid2 || grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (!grid2 || grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	return qfalse;
+                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -1131,29 +1495,32 @@ might still appear at that side.
 ===============
 */
 int R_TryStitchingPatch( int grid1num ) {
-	int j, numstitches;
-	srfGridMesh_t *grid1, *grid2;
+    int j, numstitches;
+    srfGridMesh_t *grid1, *grid2;
 
-	numstitches = 0;
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		while (R_StitchPatches(grid1num, j))
-		{
-			numstitches++;
-		}
-	}
-	return numstitches;
+    numstitches = 0;
+    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
+        //
+        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
+        // if this surface is not a grid
+        if ( grid2->surfaceType != SF_GRID ) continue;
+        // grids in the same LOD group should have the exact same lod radius
+        if ( grid1->lodRadius != grid2->lodRadius ) continue;
+        // grids in the same LOD group should have the exact same lod origin
+        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
+        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
+        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
+        //
+        while (R_StitchPatches(grid1num, j))
+        {
+            numstitches++;
+        }
+
+        // the grid1 could be reallocated again
+        grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    }
+    return numstitches;
 }
 
 /*
@@ -1162,31 +1529,31 @@ R_StitchAllPatches
 ===============
 */
 void R_StitchAllPatches( void ) {
-	int i, stitched, numstitches;
-	srfGridMesh_t *grid1;
+    int i, stitched, numstitches;
+    srfGridMesh_t *grid1;
 
-	numstitches = 0;
-	do
-	{
-		stitched = qfalse;
-		for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-			//
-			grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-			// if this surface is not a grid
-			if ( grid1->surfaceType != SF_GRID )
-				continue;
-			//
-			if ( grid1->lodStitched )
-				continue;
-			//
-			grid1->lodStitched = qtrue;
-			stitched = qtrue;
-			//
-			numstitches += R_TryStitchingPatch( i );
-		}
-	}
-	while (stitched);
-	ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
+    numstitches = 0;
+    do
+    {
+        stitched = qfalse;
+        for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+            //
+            grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+            // if this surface is not a grid
+            if ( grid1->surfaceType != SF_GRID )
+                continue;
+            //
+            if ( grid1->lodStitched )
+                continue;
+            //
+            grid1->lodStitched = qtrue;
+            stitched = qtrue;
+            //
+            numstitches += R_TryStitchingPatch( i );
+        }
+    }
+    while (stitched);
+    ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
 }
 
 /*
@@ -1195,30 +1562,30 @@ R_MovePatchSurfacesToHunk
 ===============
 */
 void R_MovePatchSurfacesToHunk(void) {
-	int i, size;
-	srfGridMesh_t *grid, *hunkgrid;
+    int i, size;
+    srfGridMesh_t *grid, *hunkgrid;
 
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid->surfaceType != SF_GRID )
-			continue;
-		//
-		size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-		hunkgrid = ri.Hunk_Alloc( size, h_low );
-		Com_Memcpy(hunkgrid, grid, size);
+    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+        //
+        grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+        // if this surface is not a grid
+        if ( grid->surfaceType != SF_GRID )
+            continue;
+        //
+        size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
+        hunkgrid = ri.Hunk_Alloc( size, h_dontcare );
+        Com_Memcpy(hunkgrid, grid, size);
 
-		hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_low );
-		Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
+        hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_dontcare );
+        Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
 
-		hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_low );
-		Com_Memcpy( hunkgrid->heightLodError, grid->heightLodError, grid->height * 4 );
+        hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_dontcare );
+        Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 );
 
-		R_FreeSurfaceGridMesh( grid );
+        R_FreeSurfaceGridMesh( grid );
 
-		s_worldData.surfaces[i].data = (void *) hunkgrid;
-	}
+        s_worldData.surfaces[i].data = (void *) hunkgrid;
+    }
 }
 
 /*
@@ -1226,73 +1593,73 @@ void R_MovePatchSurfacesToHunk(void) {
 R_LoadSurfaces
 ===============
 */
-static	void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
-	dsurface_t	*in;
-	msurface_t	*out;
-	drawVert_t	*dv;
-	int			*indexes;
-	int			count;
-	int			numFaces, numMeshes, numTriSurfs, numFlares;
-	int			i;
+static	void R_LoadSurfaces(gamelump_t* surfs, gamelump_t* verts, gamelump_t* indexLump) {
+    dsurface_t	*in;
+    msurface_t	*out;
+    drawVert_t	*dv;
+    int			*indexes;
+    int			count;
+    int			numFaces, numMeshes, numTriSurfs, numFlares;
+    int			i;
 
-	numFaces = 0;
-	numMeshes = 0;
-	numTriSurfs = 0;
-	numFlares = 0;
+    numFaces = 0;
+    numMeshes = 0;
+    numTriSurfs = 0;
+    numFlares = 0;
 
-	in = (void *)(fileBase + surfs->fileofs);
-	if (surfs->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = surfs->filelen / sizeof(*in);
+    if (surfs->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = surfs->length / sizeof(*in);
 
-	dv = (void *)(fileBase + verts->fileofs);
-	if (verts->filelen % sizeof(*dv))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
+    dv = (void*)verts->buffer;
+    if (verts->length % sizeof(*dv))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
 
-	indexes = (void *)(fileBase + indexLump->fileofs);
-	if ( indexLump->filelen % sizeof(*indexes))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
+    indexes = (void*)indexLump->buffer;
+    if (indexLump->length % sizeof(*indexes))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
 
-	out = ri.Hunk_Alloc ( count * sizeof(*out), h_low );	
+    in = (void*)surfs->buffer;
+    out = ri.Hunk_Alloc ( count * sizeof(*out), h_dontcare );	
 
-	s_worldData.surfaces = out;
-	s_worldData.numsurfaces = count;
+    s_worldData.surfaces = out;
+    s_worldData.numsurfaces = count;
 
-	for ( i = 0 ; i < count ; i++, in++, out++ ) {
-		switch ( LittleLong( in->surfaceType ) ) {
-		case MST_PATCH:
-			ParseMesh ( in, dv, out );
-			numMeshes++;
-			break;
-		case MST_TRIANGLE_SOUP:
-			ParseTriSurf( in, dv, out, indexes );
-			numTriSurfs++;
-			break;
-		case MST_PLANAR:
-			ParseFace( in, dv, out, indexes );
-			numFaces++;
-			break;
-		case MST_FLARE:
-			ParseFlare( in, dv, out, indexes );
-			numFlares++;
-			break;
-		default:
-			ri.Error( ERR_DROP, "Bad surfaceType" );
-		}
-	}
+    for ( i = 0 ; i < count ; i++, in++, out++ ) {
+        switch ( LittleLong( in->surfaceType ) ) {
+        case MST_PATCH:
+            ParseMesh ( in, dv, out );
+            numMeshes++;
+            break;
+        case MST_TRIANGLE_SOUP:
+            ParseTriSurf( in, dv, out, indexes );
+            numTriSurfs++;
+            break;
+        case MST_PLANAR:
+            ParseFace( in, dv, out, indexes );
+            numFaces++;
+            break;
+        case MST_FLARE:
+            ParseFlare( in, dv, out, indexes );
+            numFlares++;
+            break;
+        default:
+            ri.Error( ERR_DROP, "Bad surfaceType" );
+        }
+    }
 
 #ifdef PATCH_STITCHING
-	R_StitchAllPatches();
+    R_StitchAllPatches();
 #endif
 
-	R_FixSharedVertexLodError();
+    R_FixSharedVertexLodError();
 
 #ifdef PATCH_STITCHING
-	R_MovePatchSurfacesToHunk();
+    R_MovePatchSurfacesToHunk();
 #endif
 
-	ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
-		numFaces, numMeshes, numTriSurfs, numFlares );
+    ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
+        numFaces, numMeshes, numTriSurfs, numFlares );
 }
 
 
@@ -1302,40 +1669,38 @@ static	void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
 R_LoadSubmodels
 =================
 */
-static	void R_LoadSubmodels( lump_t *l ) {
-	dmodel_t	*in;
-	bmodel_t	*out;
-	int			i, j, count;
+static	void R_LoadSubmodels(gamelump_t* l) {
+    dmodel_t	*in;
+    bmodel_t	*out;
+    int			i, j, count;
 
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
+    in = (void*)l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
 
-	s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_low );
+    s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
+    s_worldData.numBmodels = count;
 
-	for ( i=0 ; i<count ; i++, in++, out++ ) {
-		model_t *model;
+    for ( i=0 ; i<count ; i++, in++, out++ ) {
+        model_t *model;
 
-		model = R_AllocModel();
+        model = R_AllocModel();
 
-		assert( model != NULL );			// this should never happen
-		if ( model == NULL ) {
-			ri.Error(ERR_DROP, "R_LoadSubmodels: R_AllocModel() failed");
-		}
+        assert( model != NULL );			// this should never happen
 
-		model->type = MOD_BRUSH;
-		model->bmodel = out;
-		Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
+        model->type = MOD_BRUSH;
+        model->d.bmodel = out;
+        Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
 
-		for (j=0 ; j<3 ; j++) {
-			out->bounds[0][j] = LittleFloat (in->mins[j]);
-			out->bounds[1][j] = LittleFloat (in->maxs[j]);
-		}
+        for (j=0 ; j<3 ; j++) {
+            out->bounds[0][j] = LittleFloat (in->mins[j]);
+            out->bounds[1][j] = LittleFloat (in->maxs[j]);
+        }
 
-		out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
-		out->numSurfaces = LittleLong( in->numSurfaces );
-	}
+        out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
+        out->numSurfaces = LittleLong( in->numSurfaces );
+    }
 }
 
 
@@ -1349,11 +1714,11 @@ R_SetParent
 */
 static	void R_SetParent (mnode_t *node, mnode_t *parent)
 {
-	node->parent = parent;
-	if (node->contents != -1)
-		return;
-	R_SetParent (node->children[0], node);
-	R_SetParent (node->children[1], node);
+    node->parent = parent;
+    if (node->contents != -1)
+        return;
+    R_SetParent (node->children[0], node);
+    R_SetParent (node->children[1], node);
 }
 
 /*
@@ -1361,75 +1726,160 @@ static	void R_SetParent (mnode_t *node, mnode_t *parent)
 R_LoadNodesAndLeafs
 =================
 */
-static	void R_LoadNodesAndLeafs (lump_t *nodeLump, lump_t *leafLump) {
-	int			i, j, p;
-	dnode_t		*in;
-	dleaf_t		*inLeaf;
-	mnode_t 	*out;
-	int			numNodes, numLeafs;
+static	void R_LoadNodesAndLeafs(gamelump_t* nodeLump, gamelump_t* leafLump) {
+    int			i, j, p;
+    dnode_t* in;
+    dleaf_t* inLeaf;
+    mnode_t* out;
+    int			numNodes, numLeafs;
 
-	in = (void *)(fileBase + nodeLump->fileofs);
-	if (nodeLump->filelen % sizeof(dnode_t) ||
-		leafLump->filelen % sizeof(dleaf_t) ) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	numNodes = nodeLump->filelen / sizeof(dnode_t);
-	numLeafs = leafLump->filelen / sizeof(dleaf_t);
+    in = (void*)nodeLump->buffer;
+    if (nodeLump->length % sizeof(dnode_t) ||
+        leafLump->length % sizeof(dleaf_t)) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    }
+    numNodes = nodeLump->length / sizeof(dnode_t);
+    numLeafs = leafLump->length / sizeof(dleaf_t);
 
-	out = ri.Hunk_Alloc ( (numNodes + numLeafs) * sizeof(*out), h_low);	
+    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
 
-	s_worldData.nodes = out;
-	s_worldData.numnodes = numNodes + numLeafs;
-	s_worldData.numDecisionNodes = numNodes;
+    s_worldData.nodes = out;
+    s_worldData.numnodes = numNodes + numLeafs;
+    s_worldData.numDecisionNodes = numNodes;
 
-	// load nodes
-	for ( i=0 ; i<numNodes; i++, in++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->mins[j] = LittleLong (in->mins[j]);
-			out->maxs[j] = LittleLong (in->maxs[j]);
-		}
-	
-		p = LittleLong(in->planeNum);
-		out->plane = s_worldData.planes + p;
+    // load nodes
+    for (i = 0; i < numNodes; i++, in++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(in->mins[j]);
+            out->maxs[j] = LittleLong(in->maxs[j]);
+        }
 
-		out->contents = CONTENTS_NODE;	// differentiate from leafs
+        p = LittleLong(in->planeNum);
+        out->plane = s_worldData.planes + p;
 
-		for (j=0 ; j<2 ; j++)
-		{
-			p = LittleLong (in->children[j]);
-			if (p >= 0)
-				out->children[j] = s_worldData.nodes + p;
-			else
-				out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
-		}
-	}
-	
-	// load leafs
-	inLeaf = (void *)(fileBase + leafLump->fileofs);
-	for ( i=0 ; i<numLeafs ; i++, inLeaf++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->mins[j] = LittleLong (inLeaf->mins[j]);
-			out->maxs[j] = LittleLong (inLeaf->maxs[j]);
-		}
+        out->contents = CONTENTS_NODE;	// differentiate from leafs
 
-		out->cluster = LittleLong(inLeaf->cluster);
-		out->area = LittleLong(inLeaf->area);
+        for (j = 0; j < 2; j++)
+        {
+            p = LittleLong(in->children[j]);
+            if (p >= 0)
+                out->children[j] = s_worldData.nodes + p;
+            else
+                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
+        }
+    }
 
-		if ( out->cluster >= s_worldData.numClusters ) {
-			s_worldData.numClusters = out->cluster + 1;
-		}
+    // load leafs
+    inLeaf = (void*)leafLump->buffer;
+    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(inLeaf->mins[j]);
+            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
+        }
 
-		out->firstmarksurface = s_worldData.marksurfaces +
-			LittleLong(inLeaf->firstLeafSurface);
-		out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
-	}	
+        out->cluster = LittleLong(inLeaf->cluster);
+        out->area = LittleLong(inLeaf->area);
 
-	// chain descendants
-	R_SetParent (s_worldData.nodes, NULL);
+        if (out->cluster >= s_worldData.numClusters) {
+            s_worldData.numClusters = out->cluster + 1;
+        }
+
+        out->firstmarksurface = s_worldData.marksurfaces +
+            LittleLong(inLeaf->firstLeafSurface);
+        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+
+        out->firstStaticModel = LittleLong(inLeaf->firstStaticModel);
+        out->numStaticModels = LittleLong(inLeaf->numStaticModels);
+    }
+
+    // chain decendants
+    R_SetParent(s_worldData.nodes, NULL);
+}
+
+/*
+=================
+R_LoadNodesAndLeafsOld
+=================
+*/
+static	void R_LoadNodesAndLeafsOld(gamelump_t* nodeLump, gamelump_t* leafLump) {
+    int			i, j, p;
+    dnode_t* in;
+    dleaf_t_ver17* inLeaf;
+    mnode_t* out;
+    int			numNodes, numLeafs;
+
+    in = nodeLump->buffer;
+    if (nodeLump->length % sizeof(dnode_t) ||
+        leafLump->length % sizeof(dleaf_t)) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    }
+    numNodes = nodeLump->length / sizeof(dnode_t);
+    numLeafs = leafLump->length / sizeof(dleaf_t);
+
+    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
+
+    s_worldData.nodes = out;
+    s_worldData.numnodes = numNodes + numLeafs;
+    s_worldData.numDecisionNodes = numNodes;
+
+    // load nodes
+    for (i = 0; i < numNodes; i++, in++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(in->mins[j]);
+            out->maxs[j] = LittleLong(in->maxs[j]);
+        }
+
+        p = LittleLong(in->planeNum);
+        out->plane = s_worldData.planes + p;
+
+        out->contents = CONTENTS_NODE;	// differentiate from leafs
+
+        for (j = 0; j < 2; j++)
+        {
+            p = LittleLong(in->children[j]);
+            if (p >= 0)
+                out->children[j] = s_worldData.nodes + p;
+            else
+                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
+        }
+    }
+
+    // load leafs
+    inLeaf = leafLump->buffer;
+    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(inLeaf->mins[j]);
+            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
+        }
+
+        out->cluster = LittleLong(inLeaf->cluster);
+        out->area = LittleLong(inLeaf->area);
+
+        if (out->cluster >= s_worldData.numClusters) {
+            s_worldData.numClusters = out->cluster + 1;
+        }
+
+        out->firstmarksurface = s_worldData.marksurfaces +
+            LittleLong(inLeaf->firstLeafSurface);
+        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+    }
+
+    // chain decendants
+    R_SetParent(s_worldData.nodes, NULL);
 }
 
 //=============================================================================
@@ -1439,25 +1889,25 @@ static	void R_LoadNodesAndLeafs (lump_t *nodeLump, lump_t *leafLump) {
 R_LoadShaders
 =================
 */
-static	void R_LoadShaders( lump_t *l ) {	
-	int		i, count;
-	dshader_t	*in, *out;
-	
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
-	out = ri.Hunk_Alloc ( count*sizeof(*out), h_low );
+static	void R_LoadShaders(gamelump_t* l) {
+    int		i, count;
+    dshader_t* in, * out;
 
-	s_worldData.shaders = out;
-	s_worldData.numShaders = count;
+    in = l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
+    out = ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
 
-	Com_Memcpy( out, in, count*sizeof(*out) );
+    s_worldData.shaders = out;
+    s_worldData.numShaders = count;
 
-	for ( i=0 ; i<count ; i++ ) {
-		out[i].surfaceFlags = LittleLong( out[i].surfaceFlags );
-		out[i].contentFlags = LittleLong( out[i].contentFlags );
-	}
+    Com_Memcpy(out, in, count * sizeof(*out));
+
+    for (i = 0; i < count; i++) {
+        out[i].surfaceFlags = LittleLong(out[i].surfaceFlags);
+        out[i].contentFlags = LittleLong(out[i].contentFlags);
+    }
 }
 
 
@@ -1466,26 +1916,26 @@ static	void R_LoadShaders( lump_t *l ) {
 R_LoadMarksurfaces
 =================
 */
-static	void R_LoadMarksurfaces (lump_t *l)
-{	
-	int		i, j, count;
-	int		*in;
-	msurface_t **out;
-	
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
-	out = ri.Hunk_Alloc ( count*sizeof(*out), h_low);	
+static	void R_LoadMarksurfaces(gamelump_t* l)
+{
+    int		i, j, count;
+    int* in;
+    msurface_t** out;
 
-	s_worldData.marksurfaces = out;
-	s_worldData.nummarksurfaces = count;
+    in = l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
+    out = (msurface_t**)ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
 
-	for ( i=0 ; i<count ; i++)
-	{
-		j = LittleLong(in[i]);
-		out[i] = s_worldData.surfaces + j;
-	}
+    s_worldData.marksurfaces = out;
+    s_worldData.nummarksurfaces = count;
+
+    for (i = 0; i < count; i++)
+    {
+        j = LittleLong(in[i]);
+        out[i] = &s_worldData.surfaces[j];
+    }
 }
 
 
@@ -1494,296 +1944,286 @@ static	void R_LoadMarksurfaces (lump_t *l)
 R_LoadPlanes
 =================
 */
-static	void R_LoadPlanes( lump_t *l ) {
-	int			i, j;
-	cplane_t	*out;
-	dplane_t 	*in;
-	int			count;
-	int			bits;
-	
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
-	out = ri.Hunk_Alloc ( count*2*sizeof(*out), h_low);	
-	
-	s_worldData.planes = out;
-	s_worldData.numplanes = count;
+static	void R_LoadPlanes(gamelump_t* l) {
+    int			i, j;
+    cplane_t* out;
+    dplane_t* in;
+    int			count;
+    int			bits;
 
-	for ( i=0 ; i<count ; i++, in++, out++) {
-		bits = 0;
-		for (j=0 ; j<3 ; j++) {
-			out->normal[j] = LittleFloat (in->normal[j]);
-			if (out->normal[j] < 0) {
-				bits |= 1<<j;
-			}
-		}
+    in = l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
+    out = ri.Hunk_Alloc(count * 2 * sizeof(*out), h_dontcare);
 
-		out->dist = LittleFloat (in->dist);
-		out->type = PlaneTypeForNormal( out->normal );
-		out->signbits = bits;
-	}
+    s_worldData.planes = out;
+    s_worldData.numplanes = count;
+
+    for (i = 0; i < count; i++, in++, out++) {
+        bits = 0;
+        for (j = 0; j < 3; j++) {
+            out->normal[j] = LittleFloat(in->normal[j]);
+            if (out->normal[j] < 0) {
+                bits |= 1 << j;
+            }
+        }
+
+        out->dist = LittleFloat(in->dist);
+        out->type = PlaneTypeForNormal(out->normal);
+        out->signbits = bits;
+    }
 }
 
-/*
-=================
-R_LoadFogs
-
-=================
-*/
-static	void R_LoadFogs( lump_t *l, lump_t *brushesLump, lump_t *sidesLump ) {
-	int			i;
-	fog_t		*out;
-	dfog_t		*fogs;
-	dbrush_t 	*brushes, *brush;
-	dbrushside_t	*sides;
-	int			count, brushesCount, sidesCount;
-	int			sideNum;
-	int			planeNum;
-	shader_t	*shader;
-	float		d;
-	int			firstSide;
-
-	fogs = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*fogs)) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	count = l->filelen / sizeof(*fogs);
-
-	// create fog structures for them
-	s_worldData.numfogs = count + 1;
-	s_worldData.fogs = ri.Hunk_Alloc ( s_worldData.numfogs*sizeof(*out), h_low);
-	out = s_worldData.fogs + 1;
-
-	if ( !count ) {
-		return;
-	}
-
-	brushes = (void *)(fileBase + brushesLump->fileofs);
-	if (brushesLump->filelen % sizeof(*brushes)) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	brushesCount = brushesLump->filelen / sizeof(*brushes);
-
-	sides = (void *)(fileBase + sidesLump->fileofs);
-	if (sidesLump->filelen % sizeof(*sides)) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	sidesCount = sidesLump->filelen / sizeof(*sides);
-
-	for ( i=0 ; i<count ; i++, fogs++) {
-		out->originalBrushNumber = LittleLong( fogs->brushNum );
-
-		if ( (unsigned)out->originalBrushNumber >= brushesCount ) {
-			ri.Error( ERR_DROP, "fog brushNumber out of range" );
-		}
-		brush = brushes + out->originalBrushNumber;
-
-		firstSide = LittleLong( brush->firstSide );
-
-			if ( (unsigned)firstSide > sidesCount - 6 ) {
-			ri.Error( ERR_DROP, "fog brush sideNumber out of range" );
-		}
-
-		// brushes are always sorted with the axial sides first
-		sideNum = firstSide + 0;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[0][0] = -s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 1;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[1][0] = s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 2;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[0][1] = -s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 3;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[1][1] = s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 4;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[0][2] = -s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 5;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[1][2] = s_worldData.planes[ planeNum ].dist;
-
-		// get information from the shader for fog parameters
-		shader = R_FindShader( fogs->shader, LIGHTMAP_NONE, qtrue );
-
-		out->parms = shader->fogParms;
-
-		out->colorInt = ColorBytes4 ( shader->fogParms.color[0] * tr.identityLight, 
-			                          shader->fogParms.color[1] * tr.identityLight, 
-			                          shader->fogParms.color[2] * tr.identityLight, 1.0 );
-
-		d = shader->fogParms.depthForOpaque < 1 ? 1 : shader->fogParms.depthForOpaque;
-		out->tcScale = 1.0f / ( d * 8 );
-
-		// set the gradient vector
-		sideNum = LittleLong( fogs->visibleSide );
-
-		if ( sideNum == -1 ) {
-			out->hasSurface = qfalse;
-		} else {
-			out->hasSurface = qtrue;
-			planeNum = LittleLong( sides[ firstSide + sideNum ].planeNum );
-			VectorSubtract( vec3_origin, s_worldData.planes[ planeNum ].normal, out->surface );
-			out->surface[3] = -s_worldData.planes[ planeNum ].dist;
-		}
-
-		out++;
-	}
-
-}
-
-
 /*
 ================
 R_LoadLightGrid
 
 ================
 */
-void R_LoadLightGrid( lump_t *l ) {
-	int		i;
-	vec3_t	maxs;
-	int		numGridPoints;
-	world_t	*w;
-	float	*wMins, *wMaxs;
+void R_LoadLightGrid(gamelump_t* plPal, gamelump_t* plOffsets, gamelump_t* plData) {
+    int		i;
+    vec3_t	maxs;
+    int		numGridPoints;
+    world_t	*w;
+    float	*wMins, *wMaxs;
 
-	w = &s_worldData;
+    w = &s_worldData;
 
-	w->lightGridInverseSize[0] = 1.0f / w->lightGridSize[0];
-	w->lightGridInverseSize[1] = 1.0f / w->lightGridSize[1];
-	w->lightGridInverseSize[2] = 1.0f / w->lightGridSize[2];
+    if (!plPal->buffer || !plOffsets->buffer || !plData->buffer) {
+        ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
+        w->lightGridOffsets = 0;
+        w->lightGridData = 0;
+        return;
+    }
 
-	wMins = w->bmodels[0].bounds[0];
-	wMaxs = w->bmodels[0].bounds[1];
+    switch (map_version)
+    {
+    case 21:
+        w->lightGridSize[0] = 80.0;
+        w->lightGridSize[1] = 80.0;
+        w->lightGridSize[2] = 80.0;
+        break;
+    case 20:
+        w->lightGridSize[0] = 48.0;
+        w->lightGridSize[1] = 48.0;
+        w->lightGridSize[2] = 64.0;
+        break;
+    default:
+        w->lightGridSize[0] = 32.0;
+        w->lightGridSize[1] = 32.0;
+        w->lightGridSize[2] = 32.0;
+        break;
+    }
 
-	for ( i = 0 ; i < 3 ; i++ ) {
-		w->lightGridOrigin[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
-		maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
-		w->lightGridBounds[i] = (maxs[i] - w->lightGridOrigin[i])/w->lightGridSize[i] + 1;
-	}
+    w->lightGridOOSize[0] = 1.0f / w->lightGridSize[0];
+    w->lightGridOOSize[1] = 1.0f / w->lightGridSize[1];
+    w->lightGridOOSize[2] = 1.0f / w->lightGridSize[2];
 
-	numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] * w->lightGridBounds[2];
+    wMins = w->bmodels[0].bounds[0];
+    wMaxs = w->bmodels[0].bounds[1];
 
-	if ( l->filelen != numGridPoints * 8 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: light grid mismatch\n" );
-		w->lightGridData = NULL;
-		return;
-	}
+    for ( i = 0 ; i < 3 ; i++ ) {
+        w->lightGridMins[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
+        maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
+        w->lightGridBounds[i] = (maxs[i] - w->lightGridMins[i])/w->lightGridSize[i] + 1;
+    }
 
-	w->lightGridData = ri.Hunk_Alloc( l->filelen, h_low );
-	Com_Memcpy( w->lightGridData, (void *)(fileBase + l->fileofs), l->filelen );
+    numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
 
-	// deal with overbright bits
-	for ( i = 0 ; i < numGridPoints ; i++ ) {
-		R_ColorShiftLightingBytes( &w->lightGridData[i*8], &w->lightGridData[i*8] );
-		R_ColorShiftLightingBytes( &w->lightGridData[i*8+3], &w->lightGridData[i*8+3] );
-	}
+    if (plOffsets->length != numGridPoints * 2) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    if (plPal->length != 768) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
+    for (i = 0; i < plOffsets->length / 2; i++) {
+        w->lightGridOffsets[i] = LittleUnsignedShort(((short*)plOffsets->buffer)[i]);
+    }
+    Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
+
+    w->lightGridData = ri.Hunk_Alloc(plData->length, h_dontcare);
+    Com_Memcpy(w->lightGridData, plData->buffer, plData->length);
 }
 
 /*
 ================
-R_LoadEntities
+R_LoadStaticModelData
 ================
 */
-void R_LoadEntities( lump_t *l ) {
-	char *p, *token, *s;
-	char keyname[MAX_TOKEN_CHARS];
-	char value[MAX_TOKEN_CHARS];
-	world_t	*w;
+void R_LoadStaticModelData(gamelump_t* lump) {
+    int		i;
+    byte* pDstColors;
+    byte* pSrcColors;
 
-	w = &s_worldData;
-	w->lightGridSize[0] = 64;
-	w->lightGridSize[1] = 64;
-	w->lightGridSize[2] = 128;
+    if (!lump->length) {
+        s_worldData.numStaticModelData = 0;
+        s_worldData.staticModelData = 0;
+        return;
+    }
 
-	p = (char *)(fileBase + l->fileofs);
 
-	// store for reference by the cgame
-	w->entityString = ri.Hunk_Alloc( l->filelen + 1, h_low );
-	strcpy( w->entityString, p );
-	w->entityParsePoint = w->entityString;
+    if (lump->length % (sizeof(byte) * 3)) {
+        Com_Error(1, "R_LoadStaticModelData: funny lump size");
+    }
 
-	token = COM_ParseExt( &p, qtrue );
-	if (!*token || *token != '{') {
-		return;
-	}
+    s_worldData.numStaticModelData = lump->length / (sizeof(byte) * 3);
+    s_worldData.staticModelData = (byte*)ri.Hunk_Alloc(s_worldData.numStaticModelData * sizeof(color4ub_t), h_dontcare);
 
-	// only parse the world spawn
-	while ( 1 ) {	
-		// parse key
-		token = COM_ParseExt( &p, qtrue );
+    pSrcColors = lump->buffer;
+    pDstColors = s_worldData.staticModelData;
 
-		if ( !*token || *token == '}' ) {
-			break;
-		}
-		Q_strncpyz(keyname, token, sizeof(keyname));
+    for (i = 0; i < lump->length; i += sizeof(byte) * 3)
+    { 
+        // Colors are stored as integers
+        pDstColors[0] = pSrcColors[0];
+        pDstColors[1] = pSrcColors[1];
+        pDstColors[2] = pSrcColors[2];
+        pDstColors[3] = 0xFF;
 
-		// parse value
-		token = COM_ParseExt( &p, qtrue );
-
-		if ( !*token || *token == '}' ) {
-			break;
-		}
-		Q_strncpyz(value, token, sizeof(value));
-
-		// check for remapping of shaders for vertex lighting
-		s = "vertexremapshader";
-		if (!Q_strncmp(keyname, s, strlen(s)) ) {
-			s = strchr(value, ';');
-			if (!s) {
-				ri.Printf( PRINT_WARNING, "WARNING: no semi colon in vertexshaderremap '%s'\n", value );
-				break;
-			}
-			*s++ = 0;
-			if (r_vertexLight->integer) {
-				R_RemapShader(value, s, "0");
-			}
-			continue;
-		}
-		// check for remapping of shaders
-		s = "remapshader";
-		if (!Q_strncmp(keyname, s, strlen(s)) ) {
-			s = strchr(value, ';');
-			if (!s) {
-				ri.Printf( PRINT_WARNING, "WARNING: no semi colon in shaderremap '%s'\n", value );
-				break;
-			}
-			*s++ = 0;
-			R_RemapShader(value, s, "0");
-			continue;
-		}
-		// check for a different grid size
-		if (!Q_stricmp(keyname, "gridsize")) {
-			sscanf(value, "%f %f %f", &w->lightGridSize[0], &w->lightGridSize[1], &w->lightGridSize[2] );
-			continue;
-		}
-	}
+        pSrcColors += sizeof(byte) * 3;
+        pDstColors += sizeof(byte) * 4;
+    }
 }
 
 /*
-=================
-R_GetEntityToken
-=================
+================
+R_CopyStaticModel
+================
 */
-qboolean R_GetEntityToken( char *buffer, int size ) {
-	const char	*s;
-
-	s = COM_Parse( &s_worldData.entityParsePoint );
-	Q_strncpyz( buffer, s, size );
-	if ( !s_worldData.entityParsePoint && !s[0] ) {
-		s_worldData.entityParsePoint = s_worldData.entityString;
-		return qfalse;
-	} else {
-		return qtrue;
-	}
+void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
+    pUnpackedSM->visCount = 0;
+    pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
+    pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
+    pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
+    pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
+    pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
+    pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
+    pUnpackedSM->scale = LittleFloat(pSM->scale);
+    pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
+    pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
+    memcpy(pUnpackedSM->model, pSM->model, sizeof(pUnpackedSM->model));
 }
 
+/*
+================
+R_LoadStaticModelDefs
+================
+*/
+void R_LoadStaticModelDefs(gamelump_t* lump) {
+    int		i;
+    cStaticModel_t* in;
+    cStaticModelUnpacked_t* out;
+
+    if (!lump->length) {
+        s_worldData.numStaticModels = 0;
+        s_worldData.staticModels = NULL;
+        return;
+    }
+
+    if (lump->length % sizeof(cStaticModel_t)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numStaticModels = lump->length / sizeof(cStaticModel_t);
+    s_worldData.staticModels = ri.Hunk_Alloc(s_worldData.numStaticModels * sizeof(cStaticModelUnpacked_t), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.staticModels;
+
+    for (i = 0; i < s_worldData.numStaticModels; in++, out++, i++) {
+        R_CopyStaticModel(in, out);
+    }
+}
+
+/*
+================
+R_LoadStaticModelIndexes
+================
+*/
+void R_LoadStaticModelIndexes(gamelump_t* lump) {
+    int i;
+    unsigned short* in;
+    cStaticModelUnpacked_t** out;
+
+    if (lump->length % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numVisStaticModels = lump->length / sizeof(short);
+    s_worldData.visStaticModels = ri.Hunk_Alloc(s_worldData.numVisStaticModels * sizeof(cStaticModelUnpacked_t*), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.visStaticModels;
+
+    for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
+        unsigned short index = LittleUnsignedShort(*in);
+        if (index >= s_worldData.numStaticModels) {
+            // Added in OPM
+            Com_Error(ERR_DROP, "R_LoadStaticModelIndexes: bad static model index %d", index);
+        }
+
+        *out = &s_worldData.staticModels[index];
+    }
+}
+
+/*
+==================
+R_LoadLump
+
+Loads a lump from the BSP file
+==================
+*/
+int R_LoadLump(fileHandle_t handle, lump_t* lump, gamelump_t* glump, int size)
+{
+    glump->buffer = NULL;
+    glump->length = lump->filelen;
+
+    if (lump->filelen) {
+        glump->buffer = Hunk_AllocateTempMemory(lump->filelen);
+
+        if (FS_Seek(handle, lump->fileofs, FS_SEEK_SET) < 0) {
+            Com_Error(ERR_DROP, "R_LoadLump: Error seeking to lump.");
+        }
+
+        FS_Read(glump->buffer, lump->filelen, handle);
+
+        if (size) {
+            return lump->filelen / size;
+        }
+    }
+
+    return 0;
+}
+
+/*
+==================
+R_FreeLump
+
+Free a previously allocated lump
+==================
+*/
+void R_FreeLump(gamelump_t* lump)
+{
+    if (lump->buffer)
+    {
+        Hunk_FreeTempMemory(lump->buffer);
+        lump->buffer = NULL;
+        lump->length = 0;
+    }
+}
+
+#define _R( id ) UI_LoadResource( "*" #id )
+
 /*
 =================
 RE_LoadWorldMap
@@ -1792,79 +2232,266 @@ Called directly from cgame
 =================
 */
 void RE_LoadWorldMap( const char *name ) {
-	int			i;
-	dheader_t	*header;
-	union {
-		byte *b;
-		void *v;
-	} buffer;
-	byte		*startMarker;
+    int			i;
+    dheader_t	header;
+    fileHandle_t	h;
+    int				length;
+    vec3_t			vDefSundir;
+    gamelump_t		lump, lump2, lump3;
 
-	if ( tr.worldMapLoaded ) {
-		ri.Error( ERR_DROP, "ERROR: attempted to redundantly load world map" );
-	}
+    vDefSundir[0] = 0.45f;
+    vDefSundir[1] = 0.3f;
+    vDefSundir[2] = 0.9f;
 
-	// set default sun direction to be used if it isn't
-	// overridden by a shader
-	tr.sunDirection[0] = 0.45f;
-	tr.sunDirection[1] = 0.3f;
-	tr.sunDirection[2] = 0.9f;
+    _R(52);
 
-	VectorNormalize( tr.sunDirection );
+    // set default sun direction to be used if it isn't
+    // overridden by a shader
+    VectorCopy(vDefSundir, tr.sunDirection);
+    VectorNormalize( tr.sunDirection );
 
-	tr.worldMapLoaded = qtrue;
+    tr.worldMapLoaded = qtrue;
 
-	// load it
-    ri.FS_ReadFile( name, &buffer.v );
-	if ( !buffer.b ) {
-		ri.Error (ERR_DROP, "RE_LoadWorldMap: %s not found", name);
-	}
+    // load it
+    length = ri.FS_OpenFile(name, &h, qtrue, qtrue);
+    if (length <= 0) {
+        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s not found", name);
+    }
 
-	// clear tr.world so if the level fails to load, the next
-	// try will not look at the partially loaded version
-	tr.world = NULL;
+    ri.FS_Read(&header, sizeof(dheader_t), h);
 
-	Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
-	Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
+    for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
+        ((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
+    }
 
-	Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
-	COM_StripExtension(s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
+    map_length = length;
+    map_version = header.version;
 
-	startMarker = ri.Hunk_Alloc(0, h_low);
-	c_gridVerts = 0;
+    // clear tr.world so if the level fails to load, the next
+    // try will not look at the partially loaded version
+    tr.world = NULL;
 
-	header = (dheader_t *)buffer.b;
-	fileBase = (byte *)header;
+    Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
+    Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
 
-	i = LittleLong (header->version);
-	if ( i != BSP_VERSION ) {
-		ri.Error (ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be %i)", 
-			name, i, BSP_VERSION);
-	}
+    Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
+    COM_StripExtension( s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
 
-	// swap all the lumps
-	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
-		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
-	}
+    c_gridVerts = 0;
 
-	// load into heap
-	R_LoadShaders( &header->lumps[LUMP_SHADERS] );
-	R_LoadLightmaps( &header->lumps[LUMP_LIGHTMAPS] );
-	R_LoadPlanes (&header->lumps[LUMP_PLANES]);
-	R_LoadFogs( &header->lumps[LUMP_FOGS], &header->lumps[LUMP_BRUSHES], &header->lumps[LUMP_BRUSHSIDES] );
-	R_LoadSurfaces( &header->lumps[LUMP_SURFACES], &header->lumps[LUMP_DRAWVERTS], &header->lumps[LUMP_DRAWINDEXES] );
-	R_LoadMarksurfaces (&header->lumps[LUMP_LEAFSURFACES]);
-	R_LoadNodesAndLeafs (&header->lumps[LUMP_NODES], &header->lumps[LUMP_LEAFS]);
-	R_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-	R_LoadVisibility( &header->lumps[LUMP_VISIBILITY] );
-	R_LoadEntities( &header->lumps[LUMP_ENTITIES] );
-	R_LoadLightGrid( &header->lumps[LUMP_LIGHTGRID] );
+    i = header.version;
+    if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
+        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
+            name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
+    }
 
-	s_worldData.dataSize = (byte *)ri.Hunk_Alloc(0, h_low) - startMarker;
+    // load into heap
+    // load into heap
+    _R(53);
+    numShaders = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SHADERS), &lump, sizeof(dshader_t));
+    _R(54);
+    R_LoadShaders(&lump);
+    _R(55);
+    R_FreeLump(&lump);
+    _R(56);
+    numplanes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_PLANES), &lump, sizeof(dplane_t));
+    R_LoadPlanes(&lump);
+    _R(57);
+    R_FreeLump(&lump);
+    _R(58);
+    numLightBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTMAPS), &lump, sizeof(byte));
+    _R(59);
+    R_LoadLightmaps(&lump);
+    _R(60);
+    R_FreeLump(&lump);
+    _R(61);
+    numDrawSurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SURFACES), &lump, sizeof(dsurface_t));
+    _R(62);
+    numDrawVerts = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWVERTS), &lump2, sizeof(drawVert_t));
+    _R(63);
+    numDrawIndexes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWINDEXES), &lump3, sizeof(int));
+    _R(64);
+    R_LoadSurfaces(&lump, &lump2, &lump3);
+    _R(65);
+    R_FreeLump(&lump3);
+    _R(66);
+    R_FreeLump(&lump2);
+    _R(67);
+    R_FreeLump(&lump);
+    _R(68);
+    numleafsurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFSURFACES), &lump, sizeof(int));
+    _R(69);
+    R_LoadMarksurfaces(&lump);
+    _R(70);
+    R_FreeLump(&lump);
+    _R(71);
+    numleafs = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFS), &lump2, sizeof(dleaf_t));
+    _R(72);
+    numnodes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_NODES), &lump, sizeof(mnode_t));
+    _R(73);
+    if (header.version > BSP_BETA_VERSION) {
+        R_LoadNodesAndLeafs(&lump, &lump2);
+    }
+    else {
+        R_LoadNodesAndLeafsOld(&lump, &lump2);
+    }
+    _R(74);
+    R_FreeLump(&lump);
+    _R(75);
+    R_FreeLump(&lump2);
+    _R(76);
+    numFogs = 0;
+    nummodels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_MODELS), &lump, sizeof(bmodel_t));
+    _R(77);
+    R_LoadSubmodels(&lump);
+    _R(78);
+    R_FreeLump(&lump);
+    _R(79);
+    numVisBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_VISIBILITY), &lump, sizeof(byte));
+    _R(80);
+    R_LoadVisibility(&lump);
+    _R(81);
+    R_FreeLump(&lump);
+    _R(82);
+    g_iGridPaletteBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDPALETTE), &lump, sizeof(byte));
+    _R(83);
+    g_iGridOffsets = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDOFFSETS), &lump2, sizeof(short));
+    _R(84);
+    g_iGridDataSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDDATA), &lump3, sizeof(byte));
+    _R(85);
+    R_LoadLightGrid( &lump, &lump2, &lump3 );
+    _R(86);
+    R_FreeLump(&lump);
+    _R(87);
+    R_FreeLump(&lump2);
+    _R(88);
+    R_FreeLump(&lump3);
+    _R(89);
+    numSLights = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTS), &lump, sizeof(mapspherel_t));
+    _R(90);
+    R_LoadSphereLights(&lump);
+    _R(91);
+    R_FreeLump(&lump);
+    _R(92);
+    entLightVisSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTVIS), &lump, sizeof(byte));
+    _R(93);
+    R_LoadSphereLightVis(&lump);
+    _R(94);
+    R_FreeLump(&lump);
+    _R(95);
+    g_nTerraPatches = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAIN), &lump, sizeof(cTerraPatch_t));
+    _R(96);
+    R_LoadTerrain(&lump);
+    _R(97);
+    R_FreeLump(&lump);
+    _R(98);
+    g_nTerPatchIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAININDEXES), &lump, sizeof(short));
+    _R(99);
+    R_LoadTerrainIndexes(&lump);
+    _R(100);
+    R_FreeLump(&lump);
+    _R(101);
+    if (header.version > BSP_BETA_VERSION)
+    {
+        g_nStaticModelData = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDATA), &lump, sizeof(byte));
+        _R(102);
+        R_LoadStaticModelData(&lump);
+        _R(103);
+        R_FreeLump(&lump);
+        _R(104);
+        g_nStaticModels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDEF), &lump, sizeof(cStaticModel_t));
+        _R(105);
+        R_LoadStaticModelDefs(&lump);
+        _R(106);
+        R_FreeLump(&lump);
+        _R(107);
+        g_nStaticModelIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELINDEXES), &lump, sizeof(byte));
+        _R(108);
+        R_LoadStaticModelIndexes(&lump);
+        _R(109);
+        R_FreeLump(&lump);
+        _R(110);
+    }
+    else
+    {
+        g_nStaticModelData = 0;
+        g_nStaticModels = 0;
+        g_nStaticModelIndices = 0;
+    }
 
-	// only set tr.world now that we know the entire level has loaded properly
-	tr.world = &s_worldData;
+    // only set tr.world now that we know the entire level has loaded properly
+    tr.world = &s_worldData;
 
-    ri.FS_FreeFile( buffer.v );
+    ri.FS_CloseFile(h);
+
+    UI_LoadResource("*111");
+    R_Sphere_InitLights();
+    UI_LoadResource("*112");
+    R_InitTerrain();
+    UI_LoadResource("*113");
+    R_InitStaticModels();
+    UI_LoadResource("*114");
+    R_LevelMarksLoad(name);
+    UI_LoadResource("*115");
+    R_VisDebugLoad(name);
+    UI_LoadResource("*116");
 }
 
+/*
+=================
+RE_MapVersion
+
+=================
+*/
+int RE_MapVersion(void)
+{
+	return map_version;
+}
+
+/*
+=================
+RE_PrintBSPFileSizes
+
+=================
+*/
+void RE_PrintBSPFileSizes(void)
+{
+  ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
+  ri.Printf(PRINT_ALL, "%6i   models                %7i\n", nummodels, 40 * nummodels);
+  ri.Printf(PRINT_ALL, "%6i   shaders               %7i\n", numShaders, 140 * numShaders);
+  ri.Printf(PRINT_ALL, "%6i   brushes               %7i\n", numbrushes, 12 * numbrushes);
+  ri.Printf(PRINT_ALL, "%6i   brushsides            %7i\n", numbrushsides, 12 * numbrushsides);
+  ri.Printf(PRINT_ALL, "%6i   fogs                  %7i\n", numFogs, 72 * numFogs);
+  ri.Printf(PRINT_ALL, "%6i   planes                %7i\n", numplanes, 16 * numplanes);
+  ri.Printf(PRINT_ALL, "%6i   nodes                 %7i\n", numnodes, 36 * numnodes);
+  ri.Printf(PRINT_ALL, "%6i   leafs                 %7i\n", numleafs, numleafs << 6);
+  ri.Printf(PRINT_ALL, "%6i   leafsurfaces          %7i\n", numleafsurfaces, 4 * numleafsurfaces);
+  ri.Printf(PRINT_ALL, "%6i   drawverts             %7i\n", numDrawVerts, 44 * numDrawVerts);
+  ri.Printf(PRINT_ALL, "%6i   drawindexes           %7i\n", numDrawIndexes, 4 * numDrawIndexes);
+  ri.Printf(PRINT_ALL, "%6i   drawsurfaces          %7i\n", numDrawSurfaces, 108 * numDrawSurfaces);
+  ri.Printf(PRINT_ALL, "%6i   lightdefs             %7i\n", numLightDefs, 52 * numLightDefs);
+  ri.Printf(PRINT_ALL, "%6i   lightmaps             %7i\n", numLightBytes / 49152, numLightBytes);
+  ri.Printf(PRINT_ALL, "         visibility            %7i\n", numVisBytes);
+  ri.Printf(PRINT_ALL, "%6i   entitylights          %7i\n", numSLights, 56 * numSLights);
+  ri.Printf(PRINT_ALL, "         entitylightvis        %7i\n", entLightVisSize);
+  ri.Printf(PRINT_ALL, "         light grid palette    %7i\n", g_iGridPaletteBytes);
+  ri.Printf(PRINT_ALL, "%6i   light grid offsets    %7i\n", g_iGridOffsets, 2 * g_iGridOffsets);
+  ri.Printf(PRINT_ALL, "         light grid data       %7i\n", g_iGridDataSize);
+  ri.Printf(PRINT_ALL, "%6i   terrain               %7i\n", g_nTerraPatches, 388 * g_nTerraPatches);
+  ri.Printf(PRINT_ALL, "%6i   terrain indexes       %7i\n", g_nTerPatchIndices, 2 * g_nTerPatchIndices);
+  ri.Printf(PRINT_ALL, "         static model data     %7i\n", g_nStaticModelData);
+  ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
+  ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
+}
+
+/*
+=================
+R_ClearWorld
+
+Set the world to NULL to prevent anyone from accessing
+freed world data
+=================
+*/
+void R_ClearWorld(void) {
+    tr.world = NULL;
+}
diff --git a/code/renderergl1/tr_cmds.c b/code/renderergl1/tr_cmds.c
index 89bb88a3..466f909d 100644
--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
@@ -15,18 +15,43 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 #include "tr_local.h"
 
+volatile renderCommandList_t	*renderCommandList;
+
+volatile qboolean	renderThreadActive;
+
+static backEndCounters_t pc_save;
+
+/*
+=====================
+R_PerformanceCounters
+=====================
+*/
+void R_SavePerformanceCounters(void) {
+    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
+}
+
 /*
 =====================
 R_PerformanceCounters
 =====================
 */
 void R_PerformanceCounters( void ) {
+	if (fps->integer) {
+		ri.SetPerformanceCounters(
+			backEnd.pc.c_totalIndexes / 3,
+			backEnd.pc.c_vertexes,
+			R_SumOfUsedImages(),
+			pc_save.c_totalIndexes / 3,
+			pc_save.c_vertexes,
+			backEnd.pc.c_characterlights
+			);
+	}
 	if ( !r_speeds->integer ) {
 		// clear the counters even if we aren't printing
 		Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
@@ -70,22 +95,76 @@ void R_PerformanceCounters( void ) {
 }
 
 
+/*
+====================
+R_InitCommandBuffers
+====================
+*/
+void R_InitCommandBuffers( void ) {
+	glConfig.smpActive = qfalse;
+	if ( r_smp->integer ) {
+		ri.Printf( PRINT_ALL, "Trying SMP acceleration...\n" );
+		if ( GLimp_SpawnRenderThread( RB_RenderThread ) ) {
+			ri.Printf( PRINT_ALL, "...succeeded.\n" );
+			glConfig.smpActive = qtrue;
+		} else {
+			ri.Printf( PRINT_ALL, "...failed.\n" );
+		}
+	}
+}
+
+/*
+====================
+R_ShutdownCommandBuffers
+====================
+*/
+void R_ShutdownCommandBuffers( void ) {
+	// kill the rendering thread
+	if ( glConfig.smpActive ) {
+		GLimp_WakeRenderer( NULL );
+		glConfig.smpActive = qfalse;
+	}
+}
+
 /*
 ====================
 R_IssueRenderCommands
 ====================
 */
+int	c_blockedOnRender;
+int	c_blockedOnMain;
+
 void R_IssueRenderCommands( qboolean runPerformanceCounters ) {
 	renderCommandList_t	*cmdList;
 
-	cmdList = &backEndData->commands;
-	assert(cmdList);
+	cmdList = &backEndData[tr.smpFrame]->commands;
+	assert(cmdList); // bk001205
 	// add an end-of-list command
 	*(int *)(cmdList->cmds + cmdList->used) = RC_END_OF_LIST;
 
 	// clear it out, in case this is a sync and not a buffer flip
 	cmdList->used = 0;
 
+	if ( glConfig.smpActive ) {
+		// if the render thread is not idle, wait for it
+		if ( renderThreadActive ) {
+			c_blockedOnRender++;
+			if ( r_showSmp->integer ) {
+				ri.Printf( PRINT_ALL, "R" );
+			}
+		} else {
+			c_blockedOnMain++;
+			if ( r_showSmp->integer ) {
+				ri.Printf( PRINT_ALL, "." );
+			}
+		}
+
+		// sleep until the renderer has completed
+		GLimp_FrontEndSleep();
+	}
+
+	// at this point, the back end thread is idle, so it is ok
+	// to look at it's performance counters
 	if ( runPerformanceCounters ) {
 		R_PerformanceCounters();
 	}
@@ -93,41 +172,53 @@ void R_IssueRenderCommands( qboolean runPerformanceCounters ) {
 	// actually start the commands going
 	if ( !r_skipBackEnd->integer ) {
 		// let it start on the new batch
-		RB_ExecuteRenderCommands( cmdList->cmds );
+		if ( !glConfig.smpActive ) {
+			RB_ExecuteRenderCommands( cmdList->cmds );
+		} else {
+			GLimp_WakeRenderer( cmdList );
+		}
 	}
 }
 
 
 /*
 ====================
-R_IssuePendingRenderCommands
+R_SyncRenderThread
 
 Issue any pending commands and wait for them to complete.
+After exiting, the render thread will have completed its work
+and will remain idle and the main thread is free to issue
+OpenGL calls until R_IssueRenderCommands is called.
 ====================
 */
-void R_IssuePendingRenderCommands( void ) {
+void R_SyncRenderThread( void ) {
 	if ( !tr.registered ) {
 		return;
 	}
 	R_IssueRenderCommands( qfalse );
+
+	if ( !glConfig.smpActive ) {
+		return;
+	}
+	GLimp_FrontEndSleep();
 }
 
 /*
 ============
-R_GetCommandBufferReserved
+R_GetCommandBuffer
 
-make sure there is enough command space
+make sure there is enough command space, waiting on the
+render thread if needed.
 ============
 */
-void *R_GetCommandBufferReserved( int bytes, int reservedBytes ) {
+void *R_GetCommandBuffer( int bytes ) {
 	renderCommandList_t	*cmdList;
 
-	cmdList = &backEndData->commands;
-	bytes = PAD(bytes, sizeof(void *));
+	cmdList = &backEndData[tr.smpFrame]->commands;
 
 	// always leave room for the end of list command
-	if ( cmdList->used + bytes + sizeof( int ) + reservedBytes > MAX_RENDER_COMMANDS ) {
-		if ( bytes > MAX_RENDER_COMMANDS - sizeof( int ) ) {
+	if ( cmdList->used + bytes + 4 > MAX_RENDER_COMMANDS ) {
+		if ( bytes > MAX_RENDER_COMMANDS - 4 ) {
 			ri.Error( ERR_FATAL, "R_GetCommandBuffer: bad size %i", bytes );
 		}
 		// if we run out of room, just start dropping commands
@@ -139,17 +230,6 @@ void *R_GetCommandBufferReserved( int bytes, int reservedBytes ) {
 	return cmdList->cmds + cmdList->used - bytes;
 }
 
-/*
-=============
-R_GetCommandBuffer
-
-returns NULL if there is not enough space for important commands
-=============
-*/
-void *R_GetCommandBuffer( int bytes ) {
-	return R_GetCommandBufferReserved( bytes, PAD( sizeof( swapBuffersCommand_t ), sizeof(void *) ) );
-}
-
 
 /*
 =============
@@ -174,6 +254,29 @@ void	R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 }
 
 
+/*
+=============
+R_AddSpriteSurfCmd
+
+=============
+*/
+void	R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs) {
+    drawSurfsCommand_t* cmd;
+
+    cmd = R_GetCommandBuffer(sizeof(*cmd));
+    if (!cmd) {
+        return;
+    }
+    cmd->commandId = RC_SPRITE_SURFS;
+
+    cmd->drawSurfs = drawSurfs;
+    cmd->numDrawSurfs = numDrawSurfs;
+
+    cmd->refdef = tr.refdef;
+    cmd->viewParms = tr.viewParms;
+}
+
+
 /*
 =============
 RE_SetColor
@@ -233,49 +336,6 @@ void RE_StretchPic ( float x, float y, float w, float h,
 	cmd->t2 = t2;
 }
 
-#define MODE_RED_CYAN	1
-#define MODE_RED_BLUE	2
-#define MODE_RED_GREEN	3
-#define MODE_GREEN_MAGENTA 4
-#define MODE_MAX	MODE_GREEN_MAGENTA
-
-void R_SetColorMode(GLboolean *rgba, stereoFrame_t stereoFrame, int colormode)
-{
-	rgba[0] = rgba[1] = rgba[2] = rgba[3] = GL_TRUE;
-	
-	if(colormode > MODE_MAX)
-	{
-		if(stereoFrame == STEREO_LEFT)
-			stereoFrame = STEREO_RIGHT;
-		else if(stereoFrame == STEREO_RIGHT)
-			stereoFrame = STEREO_LEFT;
-		
-		colormode -= MODE_MAX;
-	}
-	
-	if(colormode == MODE_GREEN_MAGENTA)
-	{
-		if(stereoFrame == STEREO_LEFT)
-			rgba[0] = rgba[2] = GL_FALSE;
-		else if(stereoFrame == STEREO_RIGHT)
-			rgba[1] = GL_FALSE;
-	}
-	else
-	{
-		if(stereoFrame == STEREO_LEFT)
-			rgba[1] = rgba[2] = GL_FALSE;
-		else if(stereoFrame == STEREO_RIGHT)
-		{
-			rgba[0] = GL_FALSE;
-		
-			if(colormode == MODE_RED_BLUE)
-				rgba[1] = GL_FALSE;
-			else if(colormode == MODE_RED_GREEN)
-				rgba[2] = GL_FALSE;
-		}
-	}
-}
-
 
 /*
 ====================
@@ -286,8 +346,7 @@ for each RE_EndFrame
 ====================
 */
 void RE_BeginFrame( stereoFrame_t stereoFrame ) {
-	drawBufferCommand_t	*cmd = NULL;
-	colorMaskCommand_t *colcmd = NULL;
+	drawBufferCommand_t	*cmd;
 
 	if ( !tr.registered ) {
 		return;
@@ -296,6 +355,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 
 	tr.frameCount++;
 	tr.frameSceneNum = 0;
+	g_nStaticSurfaces = 0;
 
 	//
 	// do overdraw measurement
@@ -316,7 +376,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 		}
 		else
 		{
-			R_IssuePendingRenderCommands();
+			R_SyncRenderThread();
 			qglEnable( GL_STENCIL_TEST );
 			qglStencilMask( ~0U );
 			qglClearStencil( 0U );
@@ -329,7 +389,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	{
 		// this is only reached if it was on and is now off
 		if ( r_measureOverdraw->modified ) {
-			R_IssuePendingRenderCommands();
+			R_SyncRenderThread();
 			qglDisable( GL_STENCIL_TEST );
 		}
 		r_measureOverdraw->modified = qfalse;
@@ -339,7 +399,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	// texturemode stuff
 	//
 	if ( r_textureMode->modified ) {
-		R_IssuePendingRenderCommands();
+		R_SyncRenderThread();
 		GL_TextureMode( r_textureMode->string );
 		r_textureMode->modified = qfalse;
 	}
@@ -350,26 +410,30 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	if ( r_gamma->modified ) {
 		r_gamma->modified = qfalse;
 
-		R_IssuePendingRenderCommands();
+		R_SyncRenderThread();
 		R_SetColorMappings();
 	}
 
-	// check for errors
-	if ( !r_ignoreGLErrors->integer )
-	{
-		int	err;
+    // check for errors
+    if ( !r_ignoreGLErrors->integer ) {
+        int	err;
 
-		R_IssuePendingRenderCommands();
-		if ((err = qglGetError()) != GL_NO_ERROR)
-			ri.Error(ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!", err);
+		R_SyncRenderThread();
+        if ( ( err = qglGetError() ) != GL_NO_ERROR ) {
+            ri.Error( ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!\n", err );
+        }
+    }
+
+	//
+	// draw buffer stuff
+	//
+	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
+	if ( !cmd ) {
+		return;
 	}
+	cmd->commandId = RC_DRAW_BUFFER;
 
-	if (glConfig.stereoEnabled) {
-		if( !(cmd = R_GetCommandBuffer(sizeof(*cmd))) )
-			return;
-			
-		cmd->commandId = RC_DRAW_BUFFER;
-		
+	if ( glConfig.stereoEnabled ) {
 		if ( stereoFrame == STEREO_LEFT ) {
 			cmd->buffer = (int)GL_BACK_LEFT;
 		} else if ( stereoFrame == STEREO_RIGHT ) {
@@ -377,78 +441,16 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 		} else {
 			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is enabled, but stereoFrame was %i", stereoFrame );
 		}
-	}
-	else
-	{
-		if(r_anaglyphMode->integer)
-		{
-			if(r_anaglyphMode->modified)
-			{
-				// clear both, front and backbuffer.
-				qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-				qglClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-				
-				qglDrawBuffer(GL_FRONT);
-				qglClear(GL_COLOR_BUFFER_BIT);
-				qglDrawBuffer(GL_BACK);
-				qglClear(GL_COLOR_BUFFER_BIT);
-				
-				r_anaglyphMode->modified = qfalse;
-			}
-			
-			if(stereoFrame == STEREO_LEFT)
-			{
-				if( !(cmd = R_GetCommandBuffer(sizeof(*cmd))) )
-					return;
-				
-				if( !(colcmd = R_GetCommandBuffer(sizeof(*colcmd))) )
-					return;
-			}
-			else if(stereoFrame == STEREO_RIGHT)
-			{
-				clearDepthCommand_t *cldcmd;
-				
-				if( !(cldcmd = R_GetCommandBuffer(sizeof(*cldcmd))) )
-					return;
-
-				cldcmd->commandId = RC_CLEARDEPTH;
-
-				if( !(colcmd = R_GetCommandBuffer(sizeof(*colcmd))) )
-					return;
-			}
-			else
-				ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is enabled, but stereoFrame was %i", stereoFrame );
-
-			R_SetColorMode(colcmd->rgba, stereoFrame, r_anaglyphMode->integer);
-			colcmd->commandId = RC_COLORMASK;
+	} else {
+		if ( stereoFrame != STEREO_CENTER ) {
+			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is disabled, but stereoFrame was %i", stereoFrame );
 		}
-		else
-		{
-			if(stereoFrame != STEREO_CENTER)
-				ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is disabled, but stereoFrame was %i", stereoFrame );
-
-			if( !(cmd = R_GetCommandBuffer(sizeof(*cmd))) )
-				return;
-		}
-
-		if(cmd)
-		{
-			cmd->commandId = RC_DRAW_BUFFER;
-
-			if(r_anaglyphMode->modified)
-			{
-				qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-				r_anaglyphMode->modified = qfalse;
-			}
-
-			if (!Q_stricmp(r_drawBuffer->string, "GL_FRONT"))
-				cmd->buffer = (int)GL_FRONT;
-			else
-				cmd->buffer = (int)GL_BACK;
+		if ( !Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) ) {
+			cmd->buffer = (int)GL_FRONT;
+		} else {
+			cmd->buffer = (int)GL_BACK;
 		}
 	}
-	
-	tr.refdef.stereoFrame = stereoFrame;
 }
 
 
@@ -465,7 +467,7 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
 	if ( !tr.registered ) {
 		return;
 	}
-	cmd = R_GetCommandBufferReserved( sizeof( *cmd ), 0 );
+	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
 	if ( !cmd ) {
 		return;
 	}
@@ -473,7 +475,9 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
 
 	R_IssueRenderCommands( qtrue );
 
-	R_InitNextFrame();
+	// use the other buffers next frame, because another CPU
+	// may still be rendering into the current ones
+	R_ToggleSmpFrame();
 
 	if ( frontEndMsec ) {
 		*frontEndMsec = tr.frontEndMsec;
@@ -485,30 +489,3 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
 	backEnd.pc.msec = 0;
 }
 
-/*
-=============
-RE_TakeVideoFrame
-=============
-*/
-void RE_TakeVideoFrame( int width, int height,
-		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg )
-{
-	videoFrameCommand_t	*cmd;
-
-	if( !tr.registered ) {
-		return;
-	}
-
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if( !cmd ) {
-		return;
-	}
-
-	cmd->commandId = RC_VIDEOFRAME;
-
-	cmd->width = width;
-	cmd->height = height;
-	cmd->captureBuffer = captureBuffer;
-	cmd->encodeBuffer = encodeBuffer;
-	cmd->motionJpeg = motionJpeg;
-}
diff --git a/code/renderergl1/tr_curve.c b/code/renderergl1/tr_curve.c
index eaabba46..446650f5 100644
--- a/code/renderergl1/tr_curve.c
+++ b/code/renderergl1/tr_curve.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -113,7 +113,7 @@ static void MakeMeshNormals( int width, int height, drawVert_t ctrl[MAX_GRID_SIZ
 	int		i, j, k, dist;
 	vec3_t	normal;
 	vec3_t	sum;
-	int		count = 0;
+	int		count;
 	vec3_t	base;
 	vec3_t	delta;
 	int		x, y;
@@ -182,7 +182,7 @@ static	int	neighbors[8][2] = {
 						break;					// edge of patch
 					}
 					VectorSubtract( ctrl[y][x].xyz, base, temp );
-					if ( VectorNormalize( temp ) < 0.001f ) {
+					if ( VectorNormalize2( temp, temp ) == 0 ) {
 						continue;				// degenerate edge, get more dist
 					} else {
 						good[k] = qtrue;
@@ -198,15 +198,16 @@ static	int	neighbors[8][2] = {
 					continue;	// didn't get two points
 				}
 				CrossProduct( around[(k+1)&7], around[k], normal );
-				if ( VectorNormalize( normal ) < 0.001f ) {
+				if ( VectorNormalize2( normal, normal ) == 0 ) {
 					continue;
 				}
 				VectorAdd( normal, sum, sum );
 				count++;
 			}
-			//if ( count == 0 ) {
-			//	printf("bad normal\n");
-			//}
+			if ( count == 0 ) {
+//printf("bad normal\n");
+				count = 1;
+			}
 			VectorNormalize2( sum, dv->normal );
 		}
 	}
@@ -356,16 +357,14 @@ void R_FreeSurfaceGridMesh( srfGridMesh_t *grid ) {
 R_SubdividePatchToGrid
 =================
 */
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
+srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
 								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
 	int			i, j, k, l;
-	drawVert_t_cleared( prev );
-	drawVert_t_cleared( next );
-	drawVert_t_cleared( mid );
+	drawVert_t	prev, next, mid;
 	float		len, maxLen;
 	int			dir;
 	int			t;
-	drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+	MAC_STATIC drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
 	float		errorTable[2][MAX_GRID_SIZE];
 
 	for ( i = 0 ; i < width ; i++ ) {
@@ -432,7 +431,7 @@ srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
 				continue;	// can't subdivide any more
 			}
 
-			if ( maxLen <= r_subdivisions->value ) {
+			if ( maxLen <= subdivide ) {
 				errorTable[dir][j+1] = 1.0f/maxLen;
 				continue;	// didn't need subdivision
 			}
@@ -524,7 +523,7 @@ R_GridInsertColumn
 srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror ) {
 	int i, j;
 	int width, height, oldwidth;
-	drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
 	float errorTable[2][MAX_GRID_SIZE];
 	float lodRadius;
 	vec3_t lodOrigin;
@@ -578,7 +577,7 @@ R_GridInsertRow
 srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror ) {
 	int i, j;
 	int width, height, oldheight;
-	drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
 	float errorTable[2][MAX_GRID_SIZE];
 	float lodRadius;
 	vec3_t lodOrigin;
diff --git a/code/renderer/tr_draw.c b/code/renderergl1/tr_draw.c
similarity index 100%
rename from code/renderer/tr_draw.c
rename to code/renderergl1/tr_draw.c
diff --git a/code/renderergl1/tr_flares.c b/code/renderergl1/tr_flares.c
index 7bd95194..2363cd89 100644
--- a/code/renderergl1/tr_flares.c
+++ b/code/renderergl1/tr_flares.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -29,12 +29,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 LIGHT FLARES
 
 A light flare is an effect that takes place inside the eye when bright light
-sources are visible.  The size of the flare relative to the screen is nearly
+sources are visible.  The size of the flare reletive to the screen is nearly
 constant, irrespective of distance, but the intensity should be proportional to the
 projected area of the light source.
 
 A surface that has been flagged as having a light flare will calculate the depth
-buffer value that its midpoint should have when the surface is added.
+buffer value that it's midpoint should have when the surface is added.
 
 After all opaque surfaces have been rendered, the depth buffer is read back for
 each flare in view.  If the point has not been obscured by a closer surface, the
@@ -75,30 +75,14 @@ typedef struct flare_s {
 	int			windowX, windowY;
 	float		eyeZ;
 
-	vec3_t		origin;
 	vec3_t		color;
 } flare_t;
 
-#define		MAX_FLARES		256
+#define		MAX_FLARES		128
 
 flare_t		r_flareStructs[MAX_FLARES];
 flare_t		*r_activeFlares, *r_inactiveFlares;
 
-int flareCoeff;
-
-/*
-==================
-R_SetFlareCoeff
-==================
-*/
-static void R_SetFlareCoeff( void ) {
-
-	if(r_flareCoeff->value == 0.0f)
-		flareCoeff = atof(FLARE_STDCOEFF);
-	else
-		flareCoeff = r_flareCoeff->value;
-}
-
 /*
 ==================
 R_ClearFlares
@@ -115,8 +99,6 @@ void R_ClearFlares( void ) {
 		r_flareStructs[i].next = r_inactiveFlares;
 		r_inactiveFlares = &r_flareStructs[i];
 	}
-
-	R_SetFlareCoeff();
 }
 
 
@@ -129,27 +111,16 @@ This is called at surface tesselation time
 */
 void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal ) {
 	int				i;
-	flare_t			*f;
+	flare_t			*f, *oldest;
 	vec3_t			local;
-	float			d = 1;
+	float			d;
 	vec4_t			eye, clip, normalized, window;
 
 	backEnd.pc.c_flareAdds++;
 
-	if(normal && (normal[0] || normal[1] || normal[2]))
-	{
-		VectorSubtract( backEnd.viewParms.or.origin, point, local );
-		VectorNormalizeFast(local);
-		d = DotProduct(local, normal);
-
-		// If the viewer is behind the flare don't add it.
-		if(d < 0)
-			return;
-	}
-
 	// if the point is off the screen, don't bother adding it
 	// calculate screen coordinates and depth
-	R_TransformModelToClip( point, backEnd.or.modelMatrix, 
+	R_TransformModelToClip( point, backEnd.ori.modelMatrix, 
 		backEnd.viewParms.projectionMatrix, eye, clip );
 
 	// check to see if the point is completely off screen
@@ -167,6 +138,7 @@ void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t
 	}
 
 	// see if a flare with a matching surface, scene, and view exists
+	oldest = r_flareStructs;
 	for ( f = r_activeFlares ; f ; f = f->next ) {
 		if ( f->surface == surface && f->frameSceneNum == backEnd.viewParms.frameSceneNum
 			&& f->inPortal == backEnd.viewParms.isPortal ) {
@@ -199,12 +171,16 @@ void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t
 	f->addedFrame = backEnd.viewParms.frameCount;
 	f->fogNum = fogNum;
 
-	VectorCopy(point, f->origin);
 	VectorCopy( color, f->color );
 
 	// fade the intensity of the flare down as the
 	// light surface turns away from the viewer
-	VectorScale( f->color, d, f->color ); 
+	if ( normal ) {
+		VectorSubtract( backEnd.viewParms.ori.origin, point, local );
+		VectorNormalizeFast( local );
+		d = DotProduct( local, normal );
+		VectorScale( f->color, d, f->color ); 
+	}
 
 	// save info needed to test
 	f->windowX = backEnd.viewParms.viewportX + window[0];
@@ -221,40 +197,13 @@ RB_AddDlightFlares
 void RB_AddDlightFlares( void ) {
 	dlight_t		*l;
 	int				i, j, k;
-	fog_t			*fog = NULL;
 
 	if ( !r_flares->integer ) {
 		return;
 	}
 
 	l = backEnd.refdef.dlights;
-
-	if(tr.world)
-		fog = tr.world->fogs;
-
 	for (i=0 ; i<backEnd.refdef.num_dlights ; i++, l++) {
-
-		if(fog)
-		{
-			// find which fog volume the light is in 
-			for ( j = 1 ; j < tr.world->numfogs ; j++ ) {
-				fog = &tr.world->fogs[j];
-				for ( k = 0 ; k < 3 ; k++ ) {
-					if ( l->origin[k] < fog->bounds[0][k] || l->origin[k] > fog->bounds[1][k] ) {
-						break;
-					}
-				}
-				if ( k == 3 ) {
-					break;
-				}
-			}
-			if ( j == tr.world->numfogs ) {
-				j = 0;
-			}
-		}
-		else
-			j = 0;
-
 		RB_AddFlare( (void *)l, j, l->origin, l->color, NULL );
 	}
 }
@@ -326,66 +275,17 @@ void RB_RenderFlare( flare_t *f ) {
 	float			size;
 	vec3_t			color;
 	int				iColor[3];
-	float distance, intensity, factor;
-	byte fogFactors[3] = {255, 255, 255};
 
 	backEnd.pc.c_flareRenders++;
 
-	// We don't want too big values anyways when dividing by distance.
-	if(f->eyeZ > -1.0f)
-		distance = 1.0f;
-	else
-		distance = -f->eyeZ;
+	VectorScale( f->color, f->drawIntensity*tr.identityLight, color );
+	iColor[0] = color[0] * 255;
+	iColor[1] = color[1] * 255;
+	iColor[2] = color[2] * 255;
 
-	// calculate the flare size..
-	size = backEnd.viewParms.viewportWidth * ( r_flareSize->value/640.0f + 8 / distance );
+	size = backEnd.viewParms.viewportWidth * ( r_flareSize->value/640.0f + 8 / -f->eyeZ );
 
-/*
- * This is an alternative to intensity scaling. It changes the size of the flare on screen instead
- * with growing distance. See in the description at the top why this is not the way to go.
-	// size will change ~ 1/r.
-	size = backEnd.viewParms.viewportWidth * (r_flareSize->value / (distance * -2.0f));
-*/
-
-/*
- * As flare sizes stay nearly constant with increasing distance we must decrease the intensity
- * to achieve a reasonable visual result. The intensity is ~ (size^2 / distance^2) which can be
- * got by considering the ratio of
- * (flaresurface on screen) : (Surface of sphere defined by flare origin and distance from flare)
- * An important requirement is:
- * intensity <= 1 for all distances.
- *
- * The formula used here to compute the intensity is as follows:
- * intensity = flareCoeff * size^2 / (distance + size*sqrt(flareCoeff))^2
- * As you can see, the intensity will have a max. of 1 when the distance is 0.
- * The coefficient flareCoeff will determine the falloff speed with increasing distance.
- */
-
-	factor = distance + size * sqrt(flareCoeff);
-	
-	intensity = flareCoeff * size * size / (factor * factor);
-
-	VectorScale(f->color, f->drawIntensity * intensity, color);
-
-	// Calculations for fogging
-	if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs)
-	{
-		tess.numVertexes = 1;
-		VectorCopy(f->origin, tess.xyz[0]);
-		tess.fogNum = f->fogNum;
-	
-		RB_CalcModulateColorsByFog(fogFactors);
-		
-		// We don't need to render the flare if colors are 0 anyways.
-		if(!(fogFactors[0] || fogFactors[1] || fogFactors[2]))
-			return;
-	}
-
-	iColor[0] = color[0] * fogFactors[0];
-	iColor[1] = color[1] * fogFactors[1];
-	iColor[2] = color[2] * fogFactors[2];
-	
-	RB_BeginSurface( tr.flareShader, f->fogNum );
+	RB_BeginSurface( tr.flareShader );
 
 	// FIXME: use quadstamp?
 	tess.xyz[tess.numVertexes][0] = f->windowX - size;
@@ -463,17 +363,6 @@ void RB_RenderFlares (void) {
 		return;
 	}
 
-	if(r_flareCoeff->modified)
-	{
-		R_SetFlareCoeff();
-		r_flareCoeff->modified = qfalse;
-	}
-
-	// Reset currentEntity to world so that any previously referenced entities
-	// don't have influence on the rendering of these flares (i.e. RF_ renderer flags).
-	backEnd.currentEntity = &tr.worldEntity;
-	backEnd.or = backEnd.viewParms.world;
-
 //	RB_AddDlightFlares();
 
 	// perform z buffer readback on each flare in this view
diff --git a/code/renderer/tr_font.cpp b/code/renderergl1/tr_font.cpp
similarity index 100%
rename from code/renderer/tr_font.cpp
rename to code/renderergl1/tr_font.cpp
diff --git a/code/renderer/tr_ghost.cpp b/code/renderergl1/tr_ghost.cpp
similarity index 100%
rename from code/renderer/tr_ghost.cpp
rename to code/renderergl1/tr_ghost.cpp
diff --git a/code/renderer/tr_ghost.h b/code/renderergl1/tr_ghost.h
similarity index 100%
rename from code/renderer/tr_ghost.h
rename to code/renderergl1/tr_ghost.h
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index a63de580..b52203ff 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -15,13 +15,31 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_image.c
 #include "tr_local.h"
 
+#include <setjmp.h>
+
+/*
+ * Include file for users of JPEG library.
+ * You will need to have included system headers that define at least
+ * the typedefs FILE and size_t before you can include jpeglib.h.
+ * (stdio.h is sufficient on ANSI-conforming systems.)
+ * You may also wish to include "jerror.h".
+ */
+
+#define JPEG_INTERNALS
+#include <jpeglib.h>
+
+
+static void LoadBMP( const char *name, byte **pic, int *width, int *height );
+static void LoadTGA( const char *name, byte **pic, int *width, int *height );
+static void LoadJPG( const char *name, byte **pic, int *width, int *height );
+
 static byte			 s_intensitytable[256];
 static unsigned char s_gammatable[256];
 
@@ -31,6 +49,8 @@ int		gl_filter_max = GL_LINEAR;
 #define FILE_HASH_SIZE		1024
 static	image_t*		hashTable[FILE_HASH_SIZE];
 
+extern qboolean scr_initialized;
+
 /*
 ** R_GammaCorrect
 */
@@ -112,8 +132,8 @@ void GL_TextureMode( const char *string ) {
 
 	// change all the existing mipmap texture objects
 	for ( i = 0 ; i < tr.numImages ; i++ ) {
-		glt = tr.images[ i ];
-		if ( glt->flags & IMGFLAG_MIPMAP ) {
+		glt = &tr.images[ i ];
+		if ( glt->numMipmaps && glt->texnum ) {
 			GL_Bind (glt);
 			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
@@ -132,8 +152,8 @@ int R_SumOfUsedImages( void ) {
 
 	total = 0;
 	for ( i = 0; i < tr.numImages; i++ ) {
-		if ( tr.images[i]->frameUsed == tr.frameCount ) {
-			total += tr.images[i]->uploadWidth * tr.images[i]->uploadHeight;
+		if ( tr.images[i].frameUsed == tr.frameCount ) {
+			total += tr.images[i].uploadWidth * tr.images[i].uploadHeight;
 		}
 	}
 
@@ -146,139 +166,70 @@ R_ImageList_f
 ===============
 */
 void R_ImageList_f( void ) {
-	int i;
-	int estTotalSize = 0;
+	int		i;
+	image_t	*image;
+	int		texels;
+	const char *yesno[] = {
+		"no ", "yes"
+	};
 
-	ri.Printf(PRINT_ALL, "\n      -w-- -h-- type  -size- --name-------\n");
+	ri.Printf (PRINT_ALL, "\n      -w-- -h-- -mm- -TMU- -if-- wrap --name-------\n");
+	texels = 0;
 
-	for ( i = 0 ; i < tr.numImages ; i++ )
-	{
-		image_t *image = tr.images[i];
-		char *format = "???? ";
-		char *sizeSuffix;
-		int estSize;
-		int displaySize;
+	for ( i = 0 ; i < tr.numImages ; i++ ) {
+		image = &tr.images[ i ];
 
-		estSize = image->uploadHeight * image->uploadWidth;
-
-		switch(image->internalFormat)
-		{
-			case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-				format = "sDXT1";
-				// 64 bits per 16 pixels, so 4 bits per pixel
-				estSize /= 2;
-				break;
-			case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-				format = "sDXT5";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB:
-				format = "sBPTC";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-				format = "LATC ";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-				format = "DXT1 ";
-				// 64 bits per 16 pixels, so 4 bits per pixel
-				estSize /= 2;
-				break;
-			case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-				format = "DXT5 ";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_RGBA_BPTC_UNORM_ARB:
-				format = "BPTC ";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_RGB4_S3TC:
-				format = "S3TC ";
-				// same as DXT1?
-				estSize /= 2;
-				break;
-			case GL_RGBA4:
-			case GL_RGBA8:
-			case GL_RGBA:
-				format = "RGBA ";
-				// 4 bytes per pixel
-				estSize *= 4;
-				break;
-			case GL_LUMINANCE8:
-			case GL_LUMINANCE:
-				format = "L    ";
-				// 1 byte per pixel?
-				break;
-			case GL_RGB5:
-			case GL_RGB8:
-			case GL_RGB:
-				format = "RGB  ";
-				// 3 bytes per pixel?
-				estSize *= 3;
-				break;
-			case GL_LUMINANCE8_ALPHA8:
-			case GL_LUMINANCE_ALPHA:
-				format = "LA   ";
-				// 2 bytes per pixel?
-				estSize *= 2;
-				break;
-			case GL_SRGB_EXT:
-			case GL_SRGB8_EXT:
-				format = "sRGB ";
-				// 3 bytes per pixel?
-				estSize *= 3;
-				break;
-			case GL_SRGB_ALPHA_EXT:
-			case GL_SRGB8_ALPHA8_EXT:
-				format = "sRGBA";
-				// 4 bytes per pixel?
-				estSize *= 4;
-				break;
-			case GL_SLUMINANCE_EXT:
-			case GL_SLUMINANCE8_EXT:
-				format = "sL   ";
-				// 1 byte per pixel?
-				break;
-			case GL_SLUMINANCE_ALPHA_EXT:
-			case GL_SLUMINANCE8_ALPHA8_EXT:
-				format = "sLA  ";
-				// 2 byte per pixel?
-				estSize *= 2;
-				break;
+		texels += image->uploadWidth*image->uploadHeight;
+		ri.Printf (PRINT_ALL,  "%4i: %4i %4i  %s   %d   ",
+			i, image->uploadWidth, image->uploadHeight, yesno[image->numMipmaps], image->TMU );
+		switch ( image->internalFormat ) {
+		case 1:
+			ri.Printf( PRINT_ALL, "I    " );
+			break;
+		case 2:
+			ri.Printf( PRINT_ALL, "IA   " );
+			break;
+		case 3:
+			ri.Printf( PRINT_ALL, "RGB  " );
+			break;
+		case 4:
+			ri.Printf( PRINT_ALL, "RGBA " );
+			break;
+		case GL_RGBA8:
+			ri.Printf( PRINT_ALL, "RGBA8" );
+			break;
+		case GL_RGB8:
+			ri.Printf( PRINT_ALL, "RGB8" );
+			break;
+		case GL_RGB4_S3TC:
+			ri.Printf( PRINT_ALL, "S3TC " );
+			break;
+		case GL_RGBA4:
+			ri.Printf( PRINT_ALL, "RGBA4" );
+			break;
+		case GL_RGB5:
+			ri.Printf( PRINT_ALL, "RGB5 " );
+			break;
+		default:
+			ri.Printf( PRINT_ALL, "???? " );
 		}
 
-		// mipmap adds about 50%
-		if (image->flags & IMGFLAG_MIPMAP)
-			estSize += estSize / 2;
-
-		sizeSuffix = "b ";
-		displaySize = estSize;
-
-		if (displaySize > 1024)
-		{
-			displaySize /= 1024;
-			sizeSuffix = "kb";
+		switch ( image->wrapClampModeX ) {
+		case GL_REPEAT:
+			ri.Printf( PRINT_ALL, "rept " );
+			break;
+		case GL_CLAMP:
+			ri.Printf( PRINT_ALL, "clmp " );
+			break;
+		default:
+			ri.Printf( PRINT_ALL, "%4i ", image->wrapClampModeX );
+			break;
 		}
-
-		if (displaySize > 1024)
-		{
-			displaySize /= 1024;
-			sizeSuffix = "Mb";
-		}
-
-		if (displaySize > 1024)
-		{
-			displaySize /= 1024;
-			sizeSuffix = "Gb";
-		}
-
-		ri.Printf(PRINT_ALL, "%4i: %4ix%4i %s %4i%s %s\n", i, image->uploadWidth, image->uploadHeight, format, displaySize, sizeSuffix, image->imgName);
-		estTotalSize += estSize;
+		
+		ri.Printf( PRINT_ALL, " %s\n", image->imgName );
 	}
-
 	ri.Printf (PRINT_ALL, " ---------\n");
-	ri.Printf (PRINT_ALL, " approx %i bytes\n", estTotalSize);
+	ri.Printf (PRINT_ALL, " %i total texels (not including mipmaps)\n", texels);
 	ri.Printf (PRINT_ALL, " %i total images\n\n", tr.numImages );
 }
 
@@ -324,6 +275,7 @@ static void ResampleTexture( unsigned *in, int inwidth, int inheight, unsigned *
 	for (i=0 ; i<outheight ; i++, out += outwidth) {
 		inrow = in + inwidth*(int)((i+0.25)*inheight/outheight);
 		inrow2 = in + inwidth*(int)((i+0.75)*inheight/outheight);
+		frac = fracstep >> 1;
 		for (j=0 ; j<outwidth ; j++) {
 			pix1 = (byte *)inrow + p1[j];
 			pix2 = (byte *)inrow + p2[j];
@@ -347,6 +299,10 @@ lighting range
 */
 void R_LightScaleTexture (unsigned *in, int inwidth, int inheight, qboolean only_gamma )
 {
+	if (!tr.needsLightScale) {
+		return;
+	}
+
 	if ( only_gamma )
 	{
 		if ( !glConfig.deviceSupportsGamma )
@@ -395,63 +351,6 @@ void R_LightScaleTexture (unsigned *in, int inwidth, int inheight, qboolean only
 	}
 }
 
-
-/*
-================
-R_MipMap2
-
-Operates in place, quartering the size of the texture
-Proper linear filter
-================
-*/
-static void R_MipMap2( unsigned *in, int inWidth, int inHeight ) {
-	int			i, j, k;
-	byte		*outpix;
-	int			inWidthMask, inHeightMask;
-	int			total;
-	int			outWidth, outHeight;
-	unsigned	*temp;
-
-	outWidth = inWidth >> 1;
-	outHeight = inHeight >> 1;
-	temp = ri.Hunk_AllocateTempMemory( outWidth * outHeight * 4 );
-
-	inWidthMask = inWidth - 1;
-	inHeightMask = inHeight - 1;
-
-	for ( i = 0 ; i < outHeight ; i++ ) {
-		for ( j = 0 ; j < outWidth ; j++ ) {
-			outpix = (byte *) ( temp + i * outWidth + j );
-			for ( k = 0 ; k < 4 ; k++ ) {
-				total = 
-					1 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					1 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k] +
-
-					2 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k] +
-
-					2 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k] +
-
-					1 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					1 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k];
-				outpix[k] = total / 36;
-			}
-		}
-	}
-
-	Com_Memcpy( in, temp, outWidth * outHeight * 4 );
-	ri.Hunk_FreeTempMemory( temp );
-}
-
 /*
 ================
 R_MipMap
@@ -464,11 +363,6 @@ static void R_MipMap (byte *in, int width, int height) {
 	byte	*out;
 	int		row;
 
-	if ( !r_simpleMipMaps->integer ) {
-		R_MipMap2( (unsigned *)in, width, height );
-		return;
-	}
-
 	if ( width == 1 && height == 1 ) {
 		return;
 	}
@@ -550,14 +444,22 @@ Upload32
 
 ===============
 */
-static void Upload32( unsigned *data, 
-						  int width, int height, 
-						  qboolean mipmap, 
-						  qboolean picmip, 
-							qboolean lightMap,
-						  qboolean allowCompression,
-						  int *format, 
-						  int *pUploadWidth, int *pUploadHeight )
+extern qboolean charSet;
+static void Upload32(
+	unsigned int* data,
+	int width,
+	int height,
+	int numMipmaps,
+	qboolean picmip, 
+	qboolean dynamicallyUpdated,
+	qboolean force32bit,
+	qboolean hasAlpha,
+	int* format,
+	int* pUploadWidth,
+	int* pUploadHeight,
+	int* bytesUsed,
+	qboolean bIsLightmap
+)
 {
 	int			samples;
 	unsigned	*scaledBuffer = NULL;
@@ -617,7 +519,8 @@ static void Upload32( unsigned *data,
 		scaled_height >>= 1;
 	}
 
-	scaledBuffer = ri.Hunk_AllocateTempMemory( sizeof( unsigned ) * scaled_width * scaled_height );
+	//scaledBuffer = ri.Hunk_AllocateTempMemory( 4 * scaled_width * scaled_height );
+	scaledBuffer = data;
 
 	//
 	// scan the texture for each channel's max values
@@ -626,37 +529,7 @@ static void Upload32( unsigned *data,
 	c = width*height;
 	scan = ((byte *)data);
 	samples = 3;
-
-	if( r_greyscale->integer )
-	{
-		for ( i = 0; i < c; i++ )
-		{
-			byte luma = LUMA(scan[i*4], scan[i*4 + 1], scan[i*4 + 2]);
-			scan[i*4] = luma;
-			scan[i*4 + 1] = luma;
-			scan[i*4 + 2] = luma;
-		}
-	}
-	else if( r_greyscale->value )
-	{
-		for ( i = 0; i < c; i++ )
-		{
-			float luma = LUMA(scan[i*4], scan[i*4 + 1], scan[i*4 + 2]);
-			scan[i*4] = LERP(scan[i*4], luma, r_greyscale->value);
-			scan[i*4 + 1] = LERP(scan[i*4 + 1], luma, r_greyscale->value);
-			scan[i*4 + 2] = LERP(scan[i*4 + 2], luma, r_greyscale->value);
-		}
-	}
-
-	if(lightMap)
-	{
-		if(r_greyscale->integer)
-			internalFormat = GL_LUMINANCE;
-		else
-			internalFormat = GL_RGB;
-	}
-	else
-	{
+	if (!bIsLightmap) {
 		for ( i = 0; i < c; i++ )
 		{
 			if ( scan[i*4+0] > rMax )
@@ -680,77 +553,81 @@ static void Upload32( unsigned *data,
 		// select proper internal format
 		if ( samples == 3 )
 		{
-			if(r_greyscale->integer)
+			if (!force32bit)
 			{
-				if(r_texturebits->integer == 16 || r_texturebits->integer == 32)
-					internalFormat = GL_LUMINANCE8;
-				else
-					internalFormat = GL_LUMINANCE;
-			}
-			else
-			{
-				if ( allowCompression && glConfig.textureCompression == TC_S3TC_ARB )
-				{
-					internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-				}
-				else if ( allowCompression && glConfig.textureCompression == TC_S3TC )
-				{
-					internalFormat = GL_RGB4_S3TC;
-				}
-				else if ( r_texturebits->integer == 16 )
+				if (r_texturebits->integer == 16)
 				{
 					internalFormat = GL_RGB5;
 				}
-				else if ( r_texturebits->integer == 32 )
+				else if (r_texturebits->integer == 32)
 				{
 					internalFormat = GL_RGB8;
 				}
-				else
-				{
-					internalFormat = GL_RGB;
-				}
-			}
-		}
-		else if ( samples == 4 )
-		{
-			if(r_greyscale->integer)
-			{
-				if(r_texturebits->integer == 16 || r_texturebits->integer == 32)
-					internalFormat = GL_LUMINANCE8_ALPHA8;
-				else
-					internalFormat = GL_LUMINANCE_ALPHA;
-			}
-			else
-			{
-				if ( r_texturebits->integer == 16 )
+				else if (r_colorbits->integer == 16)
 				{
 					internalFormat = GL_RGBA4;
 				}
-				else if ( r_texturebits->integer == 32 )
+				else if (r_colorbits->integer == 32)
 				{
 					internalFormat = GL_RGBA8;
 				}
 				else
 				{
-					internalFormat = GL_RGBA;
+					internalFormat = 3;
 				}
 			}
+			else
+			{
+				internalFormat = GL_RGB8;
+			}
 		}
+		else if ( samples == 4 )
+		{
+			if (!force32bit)
+			{
+				if (r_texturebits->integer == 16)
+				{
+					internalFormat = GL_RGBA4;
+				}
+				else if (r_texturebits->integer == 32)
+				{
+					internalFormat = GL_RGBA8;
+				}
+				else if (r_colorbits->integer == 16)
+				{
+					internalFormat = GL_RGBA4;
+				}
+				else if (r_colorbits->integer == 32)
+				{
+					internalFormat = GL_RGBA8;
+				}
+				else
+				{
+					internalFormat = 4;
+				}
+			}
+			else
+			{
+				internalFormat = GL_RGBA8;
+			}
+		}
+	} else {
+		internalFormat = GL_RGB;
 	}
-
 	// copy or resample data as appropriate for first MIP level
 	if ( ( scaled_width == width ) && 
 		( scaled_height == height ) ) {
-		if (!mipmap)
+		if (!numMipmaps)
 		{
 			qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 			*pUploadWidth = scaled_width;
 			*pUploadHeight = scaled_height;
 			*format = internalFormat;
+			*bytesUsed = samples * scaled_width * scaled_height;
 
 			goto done;
 		}
-		Com_Memcpy (scaledBuffer, data, width*height*4);
+		//Com_Memcpy (scaledBuffer, data, width*height*4);
 	}
 	else
 	{
@@ -766,10 +643,10 @@ static void Upload32( unsigned *data,
 				height = 1;
 			}
 		}
-		Com_Memcpy( scaledBuffer, data, width * height * 4 );
+		//Com_Memcpy( scaledBuffer, data, width * height * 4 );
 	}
 
-	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !mipmap );
+	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !numMipmaps);
 
 	*pUploadWidth = scaled_width;
 	*pUploadHeight = scaled_height;
@@ -777,7 +654,9 @@ static void Upload32( unsigned *data,
 
 	qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
 
-	if (mipmap)
+	*bytesUsed = samples * scaled_width * scaled_height;
+
+	if (numMipmaps)
 	{
 		int		miplevel;
 
@@ -802,7 +681,7 @@ static void Upload32( unsigned *data,
 	}
 done:
 
-	if (mipmap)
+	if (numMipmaps)
 	{
 		if ( textureFilterAnisotropic )
 			qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
@@ -813,8 +692,8 @@ done:
 	}
 	else
 	{
-		if ( textureFilterAnisotropic )
-			qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1 );
+		if (textureFilterAnisotropic)
+			qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1);
 
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
@@ -822,12 +701,130 @@ done:
 
 	GL_CheckErrors();
 
-	if ( scaledBuffer != 0 )
-		ri.Hunk_FreeTempMemory( scaledBuffer );
+	//if ( scaledBuffer != 0 )
+	//	ri.Hunk_FreeTempMemory( scaledBuffer );
 	if ( resampledBuffer != 0 )
 		ri.Hunk_FreeTempMemory( resampledBuffer );
 }
 
+static void UploadCompressed(
+	byte* data,
+	int width,
+	int height,
+	int numMipmaps,
+	int iMipmapsAvailable,
+	qboolean picmip,
+	int glCompressMode,
+	int* format,
+	int* pUploadWidth,
+	int* pUploadHeight,
+	int* pBytesUsed
+) {
+	byte* offset;
+	int i;
+	int iStartImage;
+	int size;
+	int blockSize;
+	int scaled_width, scaled_height;
+
+	offset = data;
+	iStartImage = 0;
+	if (picmip) {
+		iStartImage = r_picmip->integer;
+	}
+
+	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable) {
+		iStartImage = iMipmapsAvailable - 1;
+	}
+
+	scaled_width = width;
+	scaled_height = height;
+	if (iStartImage)
+	{
+		scaled_width = width >> iStartImage;
+		scaled_height = height >> iStartImage;
+	}
+	while (scaled_width > glConfig.maxTextureSize || scaled_height > glConfig.maxTextureSize)
+	{
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+		++iStartImage;
+	}
+	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable)
+	{
+		iStartImage = iMipmapsAvailable - 1;
+		scaled_width = width >> (iMipmapsAvailable - 1);
+		scaled_height = height >> (iMipmapsAvailable - 1);
+	}
+
+	*pUploadWidth = scaled_width;
+	*pUploadHeight = scaled_height;
+	*format = glCompressMode;
+	blockSize = 16;
+
+	if (glCompressMode == GL_COMPRESSED_RGB_S3TC_DXT1_EXT || glCompressMode == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
+		blockSize = 8;
+	}
+
+	scaled_width = width;
+	scaled_height = height;
+
+	for (i = 0; i < iStartImage; i++) {
+		int w, h;
+
+		w = (scaled_width + 3) / 4;
+		if (w > 1) {
+			h = (scaled_height + 3) / 4;
+			if (h > 1) {
+				offset += blockSize * w * h;
+			}
+		}
+
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+
+		if (!scaled_width) scaled_width = 1;
+		if (!scaled_height) scaled_height = 1;
+	}
+
+	*pBytesUsed = 0;
+
+	while (scaled_width || scaled_height) {
+		int w, h;
+
+		if (!scaled_width) scaled_width = 1;
+		if (!scaled_height) scaled_height = 1;
+
+		h = (scaled_height + 3) / 4;
+		w = (scaled_width + 3) / 4;
+		size = blockSize * w * h;
+
+		if (w > 1 && h > 1) {
+			*pBytesUsed += size;
+		}
+
+		qglCompressedTexImage2D(GL_TEXTURE_2D, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, offset);
+		GL_CheckErrors();
+
+		if (i < iMipmapsAvailable && w > 1 && h > 1) {
+			offset += size;
+		}
+
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+		i++;
+	}
+
+	if (numMipmaps > 1) {
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
+	} else {
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	}
+
+	GL_CheckErrors();
+}
 
 /*
 ================
@@ -836,39 +833,72 @@ R_CreateImage
 This is the only way any image_t are created
 ================
 */
-image_t *R_CreateImage( const char *name, byte *pic, int width, int height,
-		imgType_t type, imgFlags_t flags, int internalFormat ) {
+image_t* R_CreateImage(
+	const char* name,
+	byte* pic,
+	int width,
+	int height,
+	int numMipmaps,
+	int iMipmapsAvailable,
+	qboolean allowPicmip,
+	qboolean force32bit,
+	qboolean hasAlpha,
+	int glCompressMode,
+	int glWrapClampModeX,
+	int glWrapClampModeY
+) {
 	image_t		*image;
 	qboolean	isLightmap = qfalse;
+	qboolean	dynamicallyUpdated = qfalse;
+	int i;
 	long		hash;
-	int         glWrapClampMode;
 
 	if (strlen(name) >= MAX_QPATH ) {
-		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long", name);
+		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long\n", name);
 	}
-	if ( !strncmp( name, "*lightmap", 9 ) ) {
+	if (!strncmp(name, "*lightmap", 9)) {
 		isLightmap = qtrue;
 	}
-
-	if ( tr.numImages == MAX_DRAWIMAGES ) {
-		ri.Error( ERR_DROP, "R_CreateImage: MAX_DRAWIMAGES hit");
+	else if (!strncmp(name, "*lightmapD", 10)) {
+		dynamicallyUpdated = qtrue;
 	}
 
-	image = tr.images[tr.numImages] = ri.Hunk_Alloc( sizeof( image_t ), h_low );
-	qglGenTextures(1, &image->texnum);
-	tr.numImages++;
+	for (i = 0; i < tr.numImages; i++)
+	{
+		if (!tr.images[i].imgName[0])
+		{
+			// found a free image
+			break;
+		}
+	}
 
-	image->type = type;
-	image->flags = flags;
+	if (i == tr.numImages)
+    {
+        if (tr.numImages == MAX_DRAWIMAGES) {
+            ri.Error(ERR_DROP, "R_CreateImage: MAX_DRAWIMAGES hit\n");
+		} else {
+			tr.numImages++;
+		}
+	}
 
-	strcpy (image->imgName, name);
+	image = &tr.images[i];
+	//image->texnum = 1024 + i;
+    // Fixed in OPM / ioquake3
+    //  Original mohaa uses a fixed texnum instead of generating one regardless of the platform.
+    //  Here, by using glGenTextures, it will guarantee the uniqueness of the texture
+    qglGenTextures(1, &image->texnum);
+
+	image->numMipmaps = numMipmaps;
+	image->allowPicmip = allowPicmip;
+	image->dynamicallyUpdated = dynamicallyUpdated;
+	image->force32bit = force32bit;
+
+	Q_strncpyz (image->imgName, name, sizeof(image->imgName));
 
 	image->width = width;
 	image->height = height;
-	if (flags & IMGFLAG_CLAMPTOEDGE)
-		glWrapClampMode = haveClampToEdge ? GL_CLAMP_TO_EDGE : GL_CLAMP;
-	else
-		glWrapClampMode = GL_REPEAT;
+	image->wrapClampModeX = glWrapClampModeX;
+	image->wrapClampModeY = glWrapClampModeY;
 
 	// lightmaps are always allocated on TMU 1
 	if ( qglActiveTextureARB && isLightmap ) {
@@ -883,21 +913,45 @@ image_t *R_CreateImage( const char *name, byte *pic, int width, int height,
 
 	GL_Bind(image);
 
-	Upload32( (unsigned *)pic, image->width, image->height, 
-								image->flags & IMGFLAG_MIPMAP,
-								image->flags & IMGFLAG_PICMIP,
-								isLightmap,
-								!(image->flags & IMGFLAG_NO_COMPRESSION),
-								&image->internalFormat,
-								&image->uploadWidth,
-								&image->uploadHeight );
+	if (glCompressMode) {
+		UploadCompressed(
+			(byte*)pic,
+			image->width,
+			image->height,
+			image->numMipmaps,
+			iMipmapsAvailable,
+			allowPicmip,
+			glCompressMode,
+			&image->internalFormat,
+			&image->uploadWidth,
+			&image->uploadHeight,
+			&image->bytesUsed
+		);
+	}
+	else {
+		Upload32(
+			(unsigned int*)pic,
+			image->width,
+			image->height,
+			image->numMipmaps,
+			allowPicmip,
+			image->dynamicallyUpdated,
+			force32bit,
+			hasAlpha,
+			&image->internalFormat,
+			&image->uploadWidth,
+			&image->uploadHeight,
+			&image->bytesUsed,
+			isLightmap
+		);
+	}
 
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampMode );
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampMode );
+	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampModeX );
+	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampModeY );
 
-	glState.currenttextures[glState.currenttmu] = 0;
 	qglBindTexture( GL_TEXTURE_2D, 0 );
 
+	glState.currenttextures[image->TMU] = -1;
 	if ( image->TMU == 1 ) {
 		GL_SelectTexture( 0 );
 	}
@@ -905,111 +959,1512 @@ image_t *R_CreateImage( const char *name, byte *pic, int width, int height,
 	hash = generateHashValue(name);
 	image->next = hashTable[hash];
 	hashTable[hash] = image;
+	image->r_sequence = r_sequencenumber;
 
 	return image;
 }
 
-//===================================================================
 
+/*
+=========================================================
+
+BMP LOADING
+
+=========================================================
+*/
 typedef struct
 {
-	char *ext;
-	void (*ImageLoader)( const char *, unsigned char **, int *, int * );
-} imageExtToLoaderMap_t;
+	char id[2];
+	unsigned long fileSize;
+	unsigned long reserved0;
+	unsigned long bitmapDataOffset;
+	unsigned long bitmapHeaderSize;
+	unsigned long width;
+	unsigned long height;
+	unsigned short planes;
+	unsigned short bitsPerPixel;
+	unsigned long compression;
+	unsigned long bitmapDataSize;
+	unsigned long hRes;
+	unsigned long vRes;
+	unsigned long colors;
+	unsigned long importantColors;
+	unsigned char palette[256][4];
+} BMPHeader_t;
 
-// Note that the ordering indicates the order of preference used
-// when there are multiple images of different formats available
-static imageExtToLoaderMap_t imageLoaders[ ] =
+static void LoadBMP( const char *name, byte **pic, int *width, int *height )
 {
-	{ "tga",  R_LoadTGA },
-	{ "jpg",  R_LoadJPG },
-	{ "jpeg", R_LoadJPG },
-	{ "png",  R_LoadPNG },
-	{ "pcx",  R_LoadPCX },
-	{ "bmp",  R_LoadBMP }
-};
+	int		columns, rows, numPixels;
+	byte	*pixbuf;
+	int		row, column;
+	byte	*buf_p;
+	byte	*buffer;
+	int		length;
+	BMPHeader_t bmpHeader;
+	byte		*bmpRGBA;
 
-static int numImageLoaders = ARRAY_LEN( imageLoaders );
+	*pic = NULL;
+
+	//
+	// load the file
+	//
+	length = ri.FS_ReadFile( ( char * ) name, (void **)&buffer);
+	if (!buffer) {
+		return;
+	}
+
+	buf_p = buffer;
+
+	bmpHeader.id[0] = *buf_p++;
+	bmpHeader.id[1] = *buf_p++;
+	bmpHeader.fileSize = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.reserved0 = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.bitmapDataOffset = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.bitmapHeaderSize = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.width = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.height = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.planes = LittleShort( * ( short * ) buf_p );
+	buf_p += 2;
+	bmpHeader.bitsPerPixel = LittleShort( * ( short * ) buf_p );
+	buf_p += 2;
+	bmpHeader.compression = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.bitmapDataSize = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.hRes = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.vRes = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.colors = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.importantColors = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+
+	Com_Memcpy( bmpHeader.palette, buf_p, sizeof( bmpHeader.palette ) );
+
+	if ( bmpHeader.bitsPerPixel == 8 )
+		buf_p += 1024;
+
+	if ( bmpHeader.id[0] != 'B' && bmpHeader.id[1] != 'M' ) 
+	{
+		ri.Error( ERR_DROP, "LoadBMP: only Windows-style BMP files supported (%s)\n", name );
+	}
+	if ( bmpHeader.fileSize != length )
+	{
+		ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%lu vs. %d) (%s)\n", bmpHeader.fileSize, length, name );
+	}
+	if ( bmpHeader.compression != 0 )
+	{
+		ri.Error( ERR_DROP, "LoadBMP: only uncompressed BMP files supported (%s)\n", name );
+	}
+	if ( bmpHeader.bitsPerPixel < 8 )
+	{
+		ri.Error( ERR_DROP, "LoadBMP: monochrome and 4-bit BMP files not supported (%s)\n", name );
+	}
+
+	columns = bmpHeader.width;
+	rows = bmpHeader.height;
+	if ( rows < 0 )
+		rows = -rows;
+	numPixels = columns * rows;
+
+	if ( width ) 
+		*width = columns;
+	if ( height )
+		*height = rows;
+
+	bmpRGBA = ri.Malloc( numPixels * 4 );
+	*pic = bmpRGBA;
+
+
+	for ( row = rows-1; row >= 0; row-- )
+	{
+		pixbuf = bmpRGBA + row*columns*4;
+
+		for ( column = 0; column < columns; column++ )
+		{
+			unsigned char red, green, blue, alpha;
+			int palIndex;
+			unsigned short shortPixel;
+
+			switch ( bmpHeader.bitsPerPixel )
+			{
+			case 8:
+				palIndex = *buf_p++;
+				*pixbuf++ = bmpHeader.palette[palIndex][2];
+				*pixbuf++ = bmpHeader.palette[palIndex][1];
+				*pixbuf++ = bmpHeader.palette[palIndex][0];
+				*pixbuf++ = 0xff;
+				break;
+			case 16:
+				shortPixel = * ( unsigned short * ) pixbuf;
+				pixbuf += 2;
+				*pixbuf++ = ( shortPixel & ( 31 << 10 ) ) >> 7;
+				*pixbuf++ = ( shortPixel & ( 31 << 5 ) ) >> 2;
+				*pixbuf++ = ( shortPixel & ( 31 ) ) << 3;
+				*pixbuf++ = 0xff;
+				break;
+
+			case 24:
+				blue = *buf_p++;
+				green = *buf_p++;
+				red = *buf_p++;
+				*pixbuf++ = red;
+				*pixbuf++ = green;
+				*pixbuf++ = blue;
+				*pixbuf++ = 255;
+				break;
+			case 32:
+				blue = *buf_p++;
+				green = *buf_p++;
+				red = *buf_p++;
+				alpha = *buf_p++;
+				*pixbuf++ = red;
+				*pixbuf++ = green;
+				*pixbuf++ = blue;
+				*pixbuf++ = alpha;
+				break;
+			default:
+				ri.Error( ERR_DROP, "LoadBMP: illegal pixel_size '%d' in file '%s'\n", bmpHeader.bitsPerPixel, name );
+				break;
+			}
+		}
+	}
+
+	ri.FS_FreeFile( buffer );
+
+}
+
+
+/*
+=================================================================
+
+PCX LOADING
+
+=================================================================
+*/
+
+
+/*
+==============
+LoadPCX
+==============
+*/
+static void LoadPCX ( const char *filename, byte **pic, byte **palette, int *width, int *height)
+{
+	byte	*raw;
+	pcx_t	*pcx;
+	int		x, y;
+	int		len;
+	int		dataByte, runLength;
+	byte	*out, *pix;
+	int		xmax, ymax;
+
+	*pic = NULL;
+	*palette = NULL;
+
+	//
+	// load the file
+	//
+	len = ri.FS_ReadFile( ( char * ) filename, (void **)&raw);
+	if (!raw) {
+		return;
+	}
+
+	//
+	// parse the PCX file
+	//
+	pcx = (pcx_t *)raw;
+	raw = (byte*)pcx->data;
+
+  	xmax = LittleShort(pcx->xmax);
+    ymax = LittleShort(pcx->ymax);
+
+	if (pcx->manufacturer != 0x0a
+		|| pcx->version != 5
+		|| pcx->encoding != 1
+		|| pcx->bits_per_pixel != 8
+		|| xmax >= 1024
+		|| ymax >= 1024)
+	{
+		ri.Printf (PRINT_ALL, "Bad pcx file %s (%i x %i) (%i x %i)\n", filename, xmax+1, ymax+1, pcx->xmax, pcx->ymax);
+		return;
+	}
+
+	out = ri.Malloc ( (ymax+1) * (xmax+1) );
+
+	*pic = out;
+
+	pix = out;
+
+	if (palette)
+	{
+		*palette = ri.Malloc(768);
+		Com_Memcpy (*palette, (byte *)pcx + len - 768, 768);
+	}
+
+	if (width)
+		*width = xmax+1;
+	if (height)
+		*height = ymax+1;
+// FIXME: use bytes_per_line here?
+
+	for (y=0 ; y<=ymax ; y++, pix += xmax+1)
+	{
+		for (x=0 ; x<=xmax ; )
+		{
+			dataByte = *raw++;
+
+			if((dataByte & 0xC0) == 0xC0)
+			{
+				runLength = dataByte & 0x3F;
+				dataByte = *raw++;
+			}
+			else
+				runLength = 1;
+
+			while(runLength-- > 0)
+				pix[x++] = dataByte;
+		}
+
+	}
+
+	if ( raw - (byte *)pcx > len)
+	{
+		ri.Printf (PRINT_DEVELOPER, "PCX file %s was malformed", filename);
+		ri.Free (*pic);
+		*pic = NULL;
+	}
+
+	ri.FS_FreeFile (pcx);
+}
+
+
+/*
+==============
+LoadPCX32
+==============
+*/
+static void LoadPCX32 ( const char *filename, byte **pic, int *width, int *height) {
+	byte	*palette;
+	byte	*pic8;
+	int		i, c, p;
+	byte	*pic32;
+
+	LoadPCX (filename, &pic8, &palette, width, height);
+	if (!pic8) {
+		*pic = NULL;
+		return;
+	}
+
+	c = (*width) * (*height);
+	pic32 = *pic = ri.Malloc(4 * c );
+	for (i = 0 ; i < c ; i++) {
+		p = pic8[i];
+		pic32[0] = palette[p*3];
+		pic32[1] = palette[p*3 + 1];
+		pic32[2] = palette[p*3 + 2];
+		pic32[3] = 255;
+		pic32 += 4;
+	}
+
+	ri.Free (pic8);
+	ri.Free (palette);
+}
+
+//==========================
+//
+// DDS Loading
+//
+//==========================
+
+typedef unsigned int   ui32_t;
+
+typedef struct ddsHeader_s
+{
+	ui32_t headerSize;
+	ui32_t flags;
+	ui32_t height;
+	ui32_t width;
+	ui32_t pitchOrFirstMipSize;
+	ui32_t volumeDepth;
+	ui32_t numMips;
+	ui32_t reserved1[11];
+	ui32_t always_0x00000020;
+	ui32_t pixelFormatFlags;
+	ui32_t fourCC;
+	ui32_t rgbBitCount;
+	ui32_t rBitMask;
+	ui32_t gBitMask;
+	ui32_t bBitMask;
+	ui32_t aBitMask;
+	ui32_t caps;
+	ui32_t caps2;
+	ui32_t caps3;
+	ui32_t caps4;
+	ui32_t reserved2;
+}
+ddsHeader_t;
+
+// flags:
+#define _DDSFLAGS_REQUIRED     0x001007
+#define _DDSFLAGS_PITCH        0x8
+#define _DDSFLAGS_MIPMAPCOUNT  0x20000
+#define _DDSFLAGS_FIRSTMIPSIZE 0x80000
+#define _DDSFLAGS_VOLUMEDEPTH  0x800000
+
+// pixelFormatFlags:
+#define DDSPF_ALPHAPIXELS 0x1
+#define DDSPF_ALPHA       0x2
+#define DDSPF_FOURCC      0x4
+#define DDSPF_RGB         0x40
+#define DDSPF_YUV         0x200
+#define DDSPF_LUMINANCE   0x20000
+
+// caps:
+#define DDSCAPS_COMPLEX  0x8
+#define DDSCAPS_MIPMAP   0x400000
+#define DDSCAPS_REQUIRED 0x1000
+
+// caps2:
+#define DDSCAPS2_CUBEMAP 0xFE00
+#define DDSCAPS2_VOLUME  0x200000
+
+typedef struct ddsHeaderDxt10_s
+{
+	ui32_t dxgiFormat;
+	ui32_t dimensions;
+	ui32_t miscFlags;
+	ui32_t arraySize;
+	ui32_t miscFlags2;
+}
+ddsHeaderDxt10_t;
+
+// dxgiFormat
+// from http://msdn.microsoft.com/en-us/library/windows/desktop/bb173059%28v=vs.85%29.aspx
+typedef enum DXGI_FORMAT {
+	DXGI_FORMAT_UNKNOWN = 0,
+	DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
+	DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
+	DXGI_FORMAT_R32G32B32A32_UINT = 3,
+	DXGI_FORMAT_R32G32B32A32_SINT = 4,
+	DXGI_FORMAT_R32G32B32_TYPELESS = 5,
+	DXGI_FORMAT_R32G32B32_FLOAT = 6,
+	DXGI_FORMAT_R32G32B32_UINT = 7,
+	DXGI_FORMAT_R32G32B32_SINT = 8,
+	DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
+	DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
+	DXGI_FORMAT_R16G16B16A16_UNORM = 11,
+	DXGI_FORMAT_R16G16B16A16_UINT = 12,
+	DXGI_FORMAT_R16G16B16A16_SNORM = 13,
+	DXGI_FORMAT_R16G16B16A16_SINT = 14,
+	DXGI_FORMAT_R32G32_TYPELESS = 15,
+	DXGI_FORMAT_R32G32_FLOAT = 16,
+	DXGI_FORMAT_R32G32_UINT = 17,
+	DXGI_FORMAT_R32G32_SINT = 18,
+	DXGI_FORMAT_R32G8X24_TYPELESS = 19,
+	DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
+	DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
+	DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
+	DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
+	DXGI_FORMAT_R10G10B10A2_UNORM = 24,
+	DXGI_FORMAT_R10G10B10A2_UINT = 25,
+	DXGI_FORMAT_R11G11B10_FLOAT = 26,
+	DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
+	DXGI_FORMAT_R8G8B8A8_UNORM = 28,
+	DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
+	DXGI_FORMAT_R8G8B8A8_UINT = 30,
+	DXGI_FORMAT_R8G8B8A8_SNORM = 31,
+	DXGI_FORMAT_R8G8B8A8_SINT = 32,
+	DXGI_FORMAT_R16G16_TYPELESS = 33,
+	DXGI_FORMAT_R16G16_FLOAT = 34,
+	DXGI_FORMAT_R16G16_UNORM = 35,
+	DXGI_FORMAT_R16G16_UINT = 36,
+	DXGI_FORMAT_R16G16_SNORM = 37,
+	DXGI_FORMAT_R16G16_SINT = 38,
+	DXGI_FORMAT_R32_TYPELESS = 39,
+	DXGI_FORMAT_D32_FLOAT = 40,
+	DXGI_FORMAT_R32_FLOAT = 41,
+	DXGI_FORMAT_R32_UINT = 42,
+	DXGI_FORMAT_R32_SINT = 43,
+	DXGI_FORMAT_R24G8_TYPELESS = 44,
+	DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
+	DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
+	DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
+	DXGI_FORMAT_R8G8_TYPELESS = 48,
+	DXGI_FORMAT_R8G8_UNORM = 49,
+	DXGI_FORMAT_R8G8_UINT = 50,
+	DXGI_FORMAT_R8G8_SNORM = 51,
+	DXGI_FORMAT_R8G8_SINT = 52,
+	DXGI_FORMAT_R16_TYPELESS = 53,
+	DXGI_FORMAT_R16_FLOAT = 54,
+	DXGI_FORMAT_D16_UNORM = 55,
+	DXGI_FORMAT_R16_UNORM = 56,
+	DXGI_FORMAT_R16_UINT = 57,
+	DXGI_FORMAT_R16_SNORM = 58,
+	DXGI_FORMAT_R16_SINT = 59,
+	DXGI_FORMAT_R8_TYPELESS = 60,
+	DXGI_FORMAT_R8_UNORM = 61,
+	DXGI_FORMAT_R8_UINT = 62,
+	DXGI_FORMAT_R8_SNORM = 63,
+	DXGI_FORMAT_R8_SINT = 64,
+	DXGI_FORMAT_A8_UNORM = 65,
+	DXGI_FORMAT_R1_UNORM = 66,
+	DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
+	DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
+	DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
+	DXGI_FORMAT_BC1_TYPELESS = 70,
+	DXGI_FORMAT_BC1_UNORM = 71,
+	DXGI_FORMAT_BC1_UNORM_SRGB = 72,
+	DXGI_FORMAT_BC2_TYPELESS = 73,
+	DXGI_FORMAT_BC2_UNORM = 74,
+	DXGI_FORMAT_BC2_UNORM_SRGB = 75,
+	DXGI_FORMAT_BC3_TYPELESS = 76,
+	DXGI_FORMAT_BC3_UNORM = 77,
+	DXGI_FORMAT_BC3_UNORM_SRGB = 78,
+	DXGI_FORMAT_BC4_TYPELESS = 79,
+	DXGI_FORMAT_BC4_UNORM = 80,
+	DXGI_FORMAT_BC4_SNORM = 81,
+	DXGI_FORMAT_BC5_TYPELESS = 82,
+	DXGI_FORMAT_BC5_UNORM = 83,
+	DXGI_FORMAT_BC5_SNORM = 84,
+	DXGI_FORMAT_B5G6R5_UNORM = 85,
+	DXGI_FORMAT_B5G5R5A1_UNORM = 86,
+	DXGI_FORMAT_B8G8R8A8_UNORM = 87,
+	DXGI_FORMAT_B8G8R8X8_UNORM = 88,
+	DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
+	DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
+	DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
+	DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
+	DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
+	DXGI_FORMAT_BC6H_TYPELESS = 94,
+	DXGI_FORMAT_BC6H_UF16 = 95,
+	DXGI_FORMAT_BC6H_SF16 = 96,
+	DXGI_FORMAT_BC7_TYPELESS = 97,
+	DXGI_FORMAT_BC7_UNORM = 98,
+	DXGI_FORMAT_BC7_UNORM_SRGB = 99,
+	DXGI_FORMAT_AYUV = 100,
+	DXGI_FORMAT_Y410 = 101,
+	DXGI_FORMAT_Y416 = 102,
+	DXGI_FORMAT_NV12 = 103,
+	DXGI_FORMAT_P010 = 104,
+	DXGI_FORMAT_P016 = 105,
+	DXGI_FORMAT_420_OPAQUE = 106,
+	DXGI_FORMAT_YUY2 = 107,
+	DXGI_FORMAT_Y210 = 108,
+	DXGI_FORMAT_Y216 = 109,
+	DXGI_FORMAT_NV11 = 110,
+	DXGI_FORMAT_AI44 = 111,
+	DXGI_FORMAT_IA44 = 112,
+	DXGI_FORMAT_P8 = 113,
+	DXGI_FORMAT_A8P8 = 114,
+	DXGI_FORMAT_B4G4R4A4_UNORM = 115,
+	DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
+} DXGI_FORMAT;
+
+#define EncodeFourCC(x) ((((ui32_t)((x)[0]))      ) | \
+                         (((ui32_t)((x)[1])) << 8 ) | \
+                         (((ui32_t)((x)[2])) << 16) | \
+                         (((ui32_t)((x)[3])) << 24) )
+
+
+static void LoadDDS(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
+	int len;
+	unsigned int signature;
+	ddsHeader_t ddsHeader;
+	ddsHeaderDxt10_t* ddsHeaderDxt10 = NULL;
+	fileHandle_t handle;
+	byte* data;
+	int w, h;
+	int minWidth, minHeight;
+	int numMips = 0;
+	int size;
+	int intSize;
+
+	*pic = NULL;
+	*piMipmapsAvailable = 0;
+
+	if (width)
+		*width = 0;
+	if (height)
+		*height = 0;
+
+	//
+	// load the file
+	//
+	len = ri.FS_OpenFile((char*)name, &handle, qtrue, qtrue);
+	if (len < 0) {
+		return;
+	}
+
+	//
+	// reject files that are too small to hold even a header
+	//
+	if (len < 4 + sizeof(ddsHeader))
+	{
+		ri.Printf(PRINT_ALL, "File %s is too small to be a DDS file.\n", name);
+		ri.FS_CloseFile(handle);
+		return;
+	}
+
+	//
+	// reject files that don't start with "DDS "
+	//
+	ri.FS_Read(&signature, sizeof(signature), handle);
+	if (strncmp((const char*)&signature, "DDS ", 4))
+	{
+		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
+		ri.FS_CloseFile(handle);
+		return;
+	}
+
+	ri.FS_Read(&ddsHeader, sizeof(ddsHeader), handle);
+
+	ddsHeader.headerSize = LittleLong(ddsHeader.headerSize);
+	ddsHeader.flags = LittleLong(ddsHeader.flags);
+	ddsHeader.width = LittleLong(ddsHeader.width);
+	ddsHeader.height = LittleLong(ddsHeader.height);
+	ddsHeader.numMips = LittleLong(ddsHeader.numMips);
+	ddsHeader.pitchOrFirstMipSize = LittleLong(ddsHeader.pitchOrFirstMipSize);
+	ddsHeader.fourCC = LittleLong(ddsHeader.fourCC);
+
+	//
+	// Convert DXGI format/FourCC into OpenGL format
+	//
+	if (ddsHeader.fourCC == EncodeFourCC("DXT1")) {
+		intSize = 2;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT2")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT3")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT4")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT5")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+	} else {
+		ri.FS_CloseFile(handle);
+		return;
+	}
+
+	minWidth = ddsHeader.width;
+	for (w = 1; w < ddsHeader.width; w *= 2) {}
+
+	minHeight = ddsHeader.height;
+	for (h = 1; h < ddsHeader.height; h *= 2) {}
+
+	if (w != ddsHeader.width || h != ddsHeader.height) {
+		ri.FS_CloseFile(handle);
+		if (w == ddsHeader.width) {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - height not a power of 2\n", name);
+		} else if (h == ddsHeader.height) {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width not a power of 2\n", name);
+		} else {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width and height not a powers of 2\n", name);
+		}
+
+		return;
+	}
+
+	//
+	// Parse width and height
+	//
+	if (!minWidth) {
+		minWidth = 1;
+	}
+	*width = minWidth;
+
+	if (!minHeight) {
+		minHeight = 1;
+	}
+	*height = minHeight;
+
+	*hasAlpha = ddsHeader.fourCC != EncodeFourCC("DXT1");
+
+	numMips = ddsHeader.numMips;
+	if (!numMips) {
+		numMips = 1;
+	}
+
+	*piMipmapsAvailable = numMips;
+	if (*numMipmaps) {
+		*numMipmaps = numMips;
+	}
+
+	size = ddsHeader.pitchOrFirstMipSize;
+	if (*piMipmapsAvailable > 1) {
+		size = intSize * ddsHeader.pitchOrFirstMipSize;
+	}
+
+	*pic = ri.Malloc(size);
+	ri.FS_Read(*pic, size, handle);
+
+	ri.FS_CloseFile(handle);
+}
+
+/*
+=========================================================
+
+TARGA LOADING
+
+=========================================================
+*/
+
+/*
+=============
+LoadTGA
+=============
+*/
+static void LoadTGA ( const char *name, byte **pic, int *width, int *height)
+{
+	int		columns, rows, numPixels;
+	byte	*pixbuf;
+	int		row, column;
+	byte	*buf_p;
+	byte	*buffer;
+	TargaHeader	targa_header;
+	byte		*targa_rgba;
+
+	*pic = NULL;
+
+	//
+	// load the file
+	//
+	ri.FS_ReadFile ( ( char * ) name, (void **)&buffer);
+	if (!buffer) {
+		return;
+	}
+
+	buf_p = buffer;
+
+	targa_header.id_length = *buf_p++;
+	targa_header.colormap_type = *buf_p++;
+	targa_header.image_type = *buf_p++;
+	
+	targa_header.colormap_index = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.colormap_length = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.colormap_size = *buf_p++;
+	targa_header.x_origin = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.y_origin = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.width = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.height = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.pixel_size = *buf_p++;
+	targa_header.attributes = *buf_p++;
+
+	if (targa_header.image_type!=2 
+		&& targa_header.image_type!=10
+		&& targa_header.image_type != 3 ) 
+	{
+		ri.Error (ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
+	}
+
+	if ( targa_header.colormap_type != 0 )
+	{
+		ri.Error( ERR_DROP, "LoadTGA: colormaps not supported\n" );
+	}
+
+	if ( ( targa_header.pixel_size != 32 && targa_header.pixel_size != 24 ) && targa_header.image_type != 3 )
+	{
+		ri.Error (ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+	}
+
+	columns = targa_header.width;
+	rows = targa_header.height;
+	numPixels = columns * rows;
+
+	if (width)
+		*width = columns;
+	if (height)
+		*height = rows;
+
+	targa_rgba = ri.Malloc (numPixels*4);
+	*pic = targa_rgba;
+
+	if (targa_header.id_length != 0)
+		buf_p += targa_header.id_length;  // skip TARGA image comment
+	
+	if ( targa_header.image_type==2 || targa_header.image_type == 3 )
+	{ 
+		// Uncompressed RGB or gray scale image
+		for(row=rows-1; row>=0; row--) 
+		{
+			pixbuf = targa_rgba + row*columns*4;
+			for(column=0; column<columns; column++) 
+			{
+				unsigned char red,green,blue,alphabyte;
+				switch (targa_header.pixel_size) 
+				{
+					
+				case 8:
+					blue = *buf_p++;
+					green = blue;
+					red = blue;
+					*pixbuf++ = red;
+					*pixbuf++ = green;
+					*pixbuf++ = blue;
+					*pixbuf++ = 255;
+					break;
+
+				case 24:
+					blue = *buf_p++;
+					green = *buf_p++;
+					red = *buf_p++;
+					*pixbuf++ = red;
+					*pixbuf++ = green;
+					*pixbuf++ = blue;
+					*pixbuf++ = 255;
+					break;
+				case 32:
+					blue = *buf_p++;
+					green = *buf_p++;
+					red = *buf_p++;
+					alphabyte = *buf_p++;
+					*pixbuf++ = red;
+					*pixbuf++ = green;
+					*pixbuf++ = blue;
+					*pixbuf++ = alphabyte;
+					break;
+				default:
+					ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
+					break;
+				}
+			}
+		}
+	}
+	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
+		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
+
+		red = 0;
+		green = 0;
+		blue = 0;
+		alphabyte = 0xff;
+
+		for(row=rows-1; row>=0; row--) {
+			pixbuf = targa_rgba + row*columns*4;
+			for(column=0; column<columns; ) {
+				packetHeader= *buf_p++;
+				packetSize = 1 + (packetHeader & 0x7f);
+				if (packetHeader & 0x80) {        // run-length packet
+					switch (targa_header.pixel_size) {
+						case 24:
+								blue = *buf_p++;
+								green = *buf_p++;
+								red = *buf_p++;
+								alphabyte = 255;
+								break;
+						case 32:
+								blue = *buf_p++;
+								green = *buf_p++;
+								red = *buf_p++;
+								alphabyte = *buf_p++;
+								break;
+						default:
+							ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
+							break;
+					}
+	
+					for(j=0;j<packetSize;j++) {
+						*pixbuf++=red;
+						*pixbuf++=green;
+						*pixbuf++=blue;
+						*pixbuf++=alphabyte;
+						column++;
+						if (column==columns) { // run spans across rows
+							column=0;
+							if (row>0)
+								row--;
+							else
+								goto breakOut;
+							pixbuf = targa_rgba + row*columns*4;
+						}
+					}
+				}
+				else {                            // non run-length packet
+					for(j=0;j<packetSize;j++) {
+						switch (targa_header.pixel_size) {
+							case 24:
+									blue = *buf_p++;
+									green = *buf_p++;
+									red = *buf_p++;
+									*pixbuf++ = red;
+									*pixbuf++ = green;
+									*pixbuf++ = blue;
+									*pixbuf++ = 255;
+									break;
+							case 32:
+									blue = *buf_p++;
+									green = *buf_p++;
+									red = *buf_p++;
+									alphabyte = *buf_p++;
+									*pixbuf++ = red;
+									*pixbuf++ = green;
+									*pixbuf++ = blue;
+									*pixbuf++ = alphabyte;
+									break;
+							default:
+								ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
+								break;
+						}
+						column++;
+						if (column==columns) { // pixel packet run spans across rows
+							column=0;
+							if (row>0)
+								row--;
+							else
+								goto breakOut;
+							pixbuf = targa_rgba + row*columns*4;
+						}						
+					}
+				}
+			}
+			breakOut:;
+		}
+	}
+
+#if 0 
+  // TTimo: this is the chunk of code to ensure a behavior that meets TGA specs 
+  // bk0101024 - fix from Leonardo
+  // bit 5 set => top-down
+  if (targa_header.attributes & 0x20) {
+    unsigned char *flip = (unsigned char*)malloc (columns*4);
+    unsigned char *src, *dst;
+
+    for (row = 0; row < rows/2; row++) {
+      src = targa_rgba + row * 4 * columns;
+      dst = targa_rgba + (rows - row - 1) * 4 * columns;
+
+      memcpy (flip, src, columns*4);
+      memcpy (src, dst, columns*4);
+      memcpy (dst, flip, columns*4);
+    }
+    free (flip);
+  }
+#endif
+  // instead we just print a warning
+  if (targa_header.attributes & 0x20) {
+    ri.Printf( PRINT_WARNING, "WARNING: '%s' TGA file header declares top-down image, ignoring\n", name);
+  }
+
+  ri.FS_FreeFile (buffer);
+}
+
+/* Catching errors, as done in libjpeg's example.c */
+typedef struct q_jpeg_error_mgr_s
+{
+    struct jpeg_error_mgr pub;  /* "public" fields */
+
+    jmp_buf setjmp_buffer;  /* for return to caller */
+} q_jpeg_error_mgr_t;
+
+static void R_JPGErrorExit(j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* cinfo->err really points to a q_jpeg_error_mgr_s struct, so coerce pointer */
+  q_jpeg_error_mgr_t *jerr = (q_jpeg_error_mgr_t *)cinfo->err;
+  
+  (*cinfo->err->format_message) (cinfo, buffer);
+
+  ri.Printf(PRINT_ALL, "Error: %s", buffer);
+
+  /* Return control to the setjmp point */
+  longjmp(jerr->setjmp_buffer, 1);
+}
+
+static void R_JPGOutputMessage(j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+  
+  /* Create the message */
+  (*cinfo->err->format_message) (cinfo, buffer);
+  
+  /* Send it to stderr, adding a newline */
+  ri.Printf(PRINT_ALL, "%s\n", buffer);
+}
+
+static void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
+  /* This struct contains the JPEG decompression parameters and pointers to
+   * working space (which is allocated as needed by the JPEG library).
+   */
+  struct jpeg_decompress_struct cinfo;
+  /* We use our private extension JPEG error handler.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  /* This struct represents a JPEG error handler.  It is declared separately
+   * because applications often want to supply a specialized error handler
+   * (see the second half of this file for an example).  But here we just
+   * take the easy way out and use the standard error handler, which will
+   * print a message on stderr and call exit() if compression fails.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  q_jpeg_error_mgr_t jerr;
+  /* More stuff */
+  JSAMPARRAY buffer;		/* Output row buffer */
+  int row_stride;		/* physical row width in output buffer */
+  unsigned int pixelcount, memcount;
+  unsigned int sindex, dindex;
+  unsigned char *out;
+  byte* fbuffer;
+  byte* buf;
+  int len;
+
+  /* In this example we want to open the input file before doing anything else,
+   * so that the setjmp() error recovery below can assume the file is open.
+   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
+   * requires it in order to read binary files.
+   */
+
+  len = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
+  if (!fbuffer) {
+	return;
+  }
+
+  /* Step 1: allocate and initialize JPEG decompression object */
+
+  /* We have to set up the error handler first, in case the initialization
+   * step fails.  (Unlikely, but it could happen if you are out of memory.)
+   * This routine fills in the contents of struct jerr, and returns jerr's
+   * address which we place into the link field in cinfo.
+   */
+  cinfo.err = jpeg_std_error(&jerr.pub);
+  cinfo.err->error_exit = R_JPGErrorExit;
+  cinfo.err->output_message = R_JPGOutputMessage;
+
+  /* Establish the setjmp return context for R_JPGErrorExit to use. */
+  if (setjmp(jerr.setjmp_buffer))
+  {
+	  /* If we get here, the JPEG code has signaled an error.
+	   * We need to clean up the JPEG object, close the input file, and return.
+	   */
+	  jpeg_destroy_decompress(&cinfo);
+	  ri.FS_FreeFile(fbuffer);
+
+	  /* Append the filename to the error for easier debugging */
+	  ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
+	  return;
+  }
+
+  /* Now we can initialize the JPEG decompression object. */
+  jpeg_create_decompress(&cinfo);
+
+  /* Step 2: specify data source (eg, a file) */
+
+  jpeg_mem_src(&cinfo, fbuffer, len);
+
+  /* Step 3: read file parameters with jpeg_read_header() */
+
+  (void) jpeg_read_header(&cinfo, TRUE);
+  /* We can ignore the return value from jpeg_read_header since
+   *   (a) suspension is not possible with the stdio data source, and
+   *   (b) we passed TRUE to reject a tables-only JPEG file as an error.
+   * See libjpeg.doc for more info.
+   */
+
+  /* Step 4: set parameters for decompression */
+
+  /*
+   * Make sure it always converts images to RGB color space. This will
+   * automatically convert 8-bit greyscale images to RGB as well.
+   */
+  cinfo.out_color_space = JCS_RGB;
+
+  /* In this example, we don't need to change any of the defaults set by
+   * jpeg_read_header(), so we do nothing here.
+   */
+
+  /* Step 5: Start decompressor */
+
+  (void) jpeg_start_decompress(&cinfo);
+  /* We can ignore the return value since suspension is not possible
+   * with the stdio data source.
+   */
+
+  /* We may need to do some setup of our own at this point before reading
+   * the data.  After jpeg_start_decompress() we have the correct scaled
+   * output image dimensions available, as well as the output colormap
+   * if we asked for color quantization.
+   * In this example, we need to make an output work buffer of the right size.
+   */ 
+  /* JSAMPLEs per row in output buffer */
+  pixelcount = cinfo.output_width * cinfo.output_height;
+
+  if (!cinfo.output_width || !cinfo.output_height
+      || ((pixelcount * 4) / cinfo.output_width) / 4 != cinfo.output_height
+      || pixelcount > 0x1FFFFFFF || cinfo.output_components != 3
+      )
+  {
+      // Free the memory to make sure we don't leak memory
+      ri.FS_FreeFile(fbuffer);
+      jpeg_destroy_decompress(&cinfo);
+
+      ri.Error(ERR_DROP, "LoadJPG: %s has an invalid image format: %dx%d*4=%d, components: %d", filename,
+          cinfo.output_width, cinfo.output_height, pixelcount * 4, cinfo.output_components);
+  }
+
+  memcount = pixelcount * 4;
+  row_stride = cinfo.output_width * cinfo.output_components;
+
+  out = ri.Malloc(memcount);
+
+  *width = cinfo.output_width;
+  *height = cinfo.output_height;
+
+  /* Step 6: while (scan lines remain to be read) */
+  /*           jpeg_read_scanlines(...); */
+
+  /* Here we use the library's state variable cinfo.output_scanline as the
+   * loop counter, so that we don't have to keep track ourselves.
+   */
+  while (cinfo.output_scanline < cinfo.output_height) {
+	  /* jpeg_read_scanlines expects an array of pointers to scanlines.
+	   * Here the array is only one element long, but you could ask for
+	   * more than one scanline at a time if that's more convenient.
+	   */
+	  buf = ((out + (row_stride * cinfo.output_scanline)));
+	  buffer = &buf;
+	  (void)jpeg_read_scanlines(&cinfo, buffer, 1);
+  }
+
+  buf = out;
+
+  // Expand from RGB to RGBA
+  sindex = pixelcount * cinfo.output_components;
+  dindex = memcount;
+
+  do
+  {
+      buf[--dindex] = 255;
+      buf[--dindex] = buf[--sindex];
+      buf[--dindex] = buf[--sindex];
+      buf[--dindex] = buf[--sindex];
+  } while (sindex);
+
+  *pic = out;
+
+  /* Step 7: Finish decompression */
+
+  (void) jpeg_finish_decompress(&cinfo);
+  /* We can ignore the return value since suspension is not possible
+   * with the stdio data source.
+   */
+
+  /* Step 8: Release JPEG decompression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_decompress(&cinfo);
+
+  /* After finish_decompress, we can close the input file.
+   * Here we postpone it until after no more JPEG errors are possible,
+   * so as to simplify the setjmp error logic above.  (Actually, I don't
+   * think that jpeg_destroy can do an error exit, but why assume anything...)
+   */
+  ri.FS_FreeFile (fbuffer);
+
+  /* At this point you may want to check to see whether any corrupt-data
+   * warnings occurred (test whether jerr.pub.num_warnings is nonzero).
+   */
+
+  /* And we're done! */
+}
+
+
+/* Expanded data destination object for stdio output */
+
+typedef struct {
+  struct jpeg_destination_mgr pub; /* public fields */
+
+  byte* outfile;		/* target stream */
+  int	size;
+} my_destination_mgr;
+
+typedef my_destination_mgr * my_dest_ptr;
+
+
+/*
+ * Initialize destination --- called by jpeg_start_compress
+ * before any data is actually written.
+ */
+
+void init_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+
+  dest->pub.next_output_byte = dest->outfile;
+  dest->pub.free_in_buffer = dest->size;
+}
+
+
+/*
+ * Empty the output buffer --- called whenever buffer fills up.
+ *
+ * In typical applications, this should write the entire output buffer
+ * (ignoring the current state of next_output_byte & free_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been dumped.
+ *
+ * In applications that need to be able to suspend compression due to output
+ * overrun, a FALSE return indicates that the buffer cannot be emptied now.
+ * In this situation, the compressor will return to its caller (possibly with
+ * an indication that it has not accepted all the supplied scanlines).  The
+ * application should resume compression after it has made more room in the
+ * output buffer.  Note that there are substantial restrictions on the use of
+ * suspension --- see the documentation.
+ *
+ * When suspending, the compressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_output_byte & free_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point will be regenerated after resumption, so do not
+ * write it out when emptying the buffer externally.
+ */
+
+boolean empty_output_buffer (j_compress_ptr cinfo)
+{
+  return TRUE;
+}
+
+#if 0
+/*
+ * Compression initialization.
+ * Before calling this, all parameters and a data destination must be set up.
+ *
+ * We require a write_all_tables parameter as a failsafe check when writing
+ * multiple datastreams from the same compression object.  Since prior runs
+ * will have left all the tables marked sent_table=TRUE, a subsequent run
+ * would emit an abbreviated stream (no tables) by default.  This may be what
+ * is wanted, but for safety's sake it should not be the default behavior:
+ * programmers should have to make a deliberate choice to emit abbreviated
+ * images.  Therefore the documentation and examples should encourage people
+ * to pass write_all_tables=TRUE; then it will take active thought to do the
+ * wrong thing.
+ */
+
+GLOBAL void
+jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (write_all_tables)
+    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
+
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Perform master selection of active modules */
+  jinit_compress_master(cinfo);
+  /* Set up for the first pass */
+  (*cinfo->master->prepare_for_pass) (cinfo);
+  /* Ready for application to drive first pass through jpeg_write_scanlines
+   * or jpeg_write_raw_data.
+   */
+  cinfo->next_scanline = 0;
+  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
+}
+
+/*
+ * Write some scanlines of data to the JPEG compressor.
+ *
+ * The return value will be the number of lines actually written.
+ * This should be less than the supplied num_lines only in case that
+ * the data destination module has requested suspension of the compressor,
+ * or if more than image_height scanlines are passed in.
+ *
+ * Note: we warn about excess calls to jpeg_write_scanlines() since
+ * this likely signals an application programmer error.  However,
+ * excess scanlines passed in the last valid call are *silently* ignored,
+ * so that the application need not adjust num_lines for end-of-image
+ * when using a multiple-scanline buffer.
+ */
+
+GLOBAL JDIMENSION
+jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
+		      JDIMENSION num_lines)
+{
+  JDIMENSION row_ctr, rows_left;
+
+  if (cinfo->global_state != CSTATE_SCANNING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->next_scanline >= cinfo->image_height)
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->image_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Give master control module another chance if this is first call to
+   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
+   * delayed so that application can write COM, etc, markers between
+   * jpeg_start_compress and jpeg_write_scanlines.
+   */
+  if (cinfo->master->call_pass_startup)
+    (*cinfo->master->pass_startup) (cinfo);
+
+  /* Ignore any extra scanlines at bottom of image. */
+  rows_left = cinfo->image_height - cinfo->next_scanline;
+  if (num_lines > rows_left)
+    num_lines = rows_left;
+
+  row_ctr = 0;
+  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
+  cinfo->next_scanline += row_ctr;
+  return row_ctr;
+}
+
+/*
+ * Terminate destination --- called by jpeg_finish_compress
+ * after all data has been written.  Usually needs to flush buffer.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+static int hackSize;
+
+void term_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+  size_t datacount = dest->size - dest->pub.free_in_buffer;
+  hackSize = datacount;
+}
+
+
+/*
+ * Prepare for output to a stdio stream.
+ * The caller must have already opened the stream, and is responsible
+ * for closing it after finishing compression.
+ */
+
+void jpegDest (j_compress_ptr cinfo, byte* outfile, int size)
+{
+  my_dest_ptr dest;
+
+  /* The destination object is made permanent so that multiple JPEG images
+   * can be written to the same file without re-executing jpeg_stdio_dest.
+   * This makes it dangerous to use this manager and a different destination
+   * manager serially with the same JPEG object, because their private object
+   * sizes may be different.  Caveat programmer.
+   */
+  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
+    cinfo->dest = (struct jpeg_destination_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  sizeof(my_destination_mgr));
+  }
+
+  dest = (my_dest_ptr) cinfo->dest;
+  dest->pub.init_destination = init_destination;
+  dest->pub.empty_output_buffer = empty_output_buffer;
+  dest->pub.term_destination = term_destination;
+  dest->outfile = outfile;
+  dest->size = size;
+}
+
+void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer) {
+  /* This struct contains the JPEG compression parameters and pointers to
+   * working space (which is allocated as needed by the JPEG library).
+   * It is possible to have several such structures, representing multiple
+   * compression/decompression processes, in existence at once.  We refer
+   * to any one struct (and its associated working data) as a "JPEG object".
+   */
+  struct jpeg_compress_struct cinfo;
+  /* This struct represents a JPEG error handler.  It is declared separately
+   * because applications often want to supply a specialized error handler
+   * (see the second half of this file for an example).  But here we just
+   * take the easy way out and use the standard error handler, which will
+   * print a message on stderr and call exit() if compression fails.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  struct jpeg_error_mgr jerr;
+  /* More stuff */
+  JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */
+  int row_stride;		/* physical row width in image buffer */
+  unsigned char *out;
+
+  /* Step 1: allocate and initialize JPEG compression object */
+
+  /* We have to set up the error handler first, in case the initialization
+   * step fails.  (Unlikely, but it could happen if you are out of memory.)
+   * This routine fills in the contents of struct jerr, and returns jerr's
+   * address which we place into the link field in cinfo.
+   */
+  cinfo.err = jpeg_std_error(&jerr);
+  /* Now we can initialize the JPEG compression object. */
+  jpeg_CreateDecompress(&cinfo);
+
+  /* Step 2: specify data destination (eg, a file) */
+  /* Note: steps 2 and 3 can be done in either order. */
+
+  /* Here we use the library-supplied code to send compressed data to a
+   * stdio stream.  You can also write your own code to do something else.
+   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
+   * requires it in order to write binary files.
+   */
+  out = ri.Hunk_AllocateTempMemory(image_width*image_height*4);
+  jpegDest(&cinfo, out, image_width*image_height*4);
+
+  /* Step 3: set parameters for compression */
+
+  /* First we supply a description of the input image.
+   * Four fields of the cinfo struct must be filled in:
+   */
+  cinfo.image_width = image_width; 	/* image width and height, in pixels */
+  cinfo.image_height = image_height;
+  cinfo.input_components = 4;		/* # of color components per pixel */
+  cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */
+  /* Now use the library's routine to set default compression parameters.
+   * (You must set at least cinfo.in_color_space before calling this,
+   * since the defaults depend on the source color space.)
+   */
+  jpeg_set_defaults(&cinfo);
+  /* Now you can set any non-default parameters you wish to.
+   * Here we just illustrate the use of quality (quantization table) scaling:
+   */
+  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
+
+  /* Step 4: Start compressor */
+
+  /* TRUE ensures that we will write a complete interchange-JPEG file.
+   * Pass TRUE unless you are very sure of what you're doing.
+   */
+  jpeg_start_compress(&cinfo, TRUE);
+
+  /* Step 5: while (scan lines remain to be written) */
+  /*           jpeg_write_scanlines(...); */
+
+  /* Here we use the library's state variable cinfo.next_scanline as the
+   * loop counter, so that we don't have to keep track ourselves.
+   * To keep things simple, we pass one scanline per call; you can pass
+   * more if you wish, though.
+   */
+  row_stride = image_width * 4;	/* JSAMPLEs per row in image_buffer */
+
+  while (cinfo.next_scanline < cinfo.image_height) {
+    /* jpeg_write_scanlines expects an array of pointers to scanlines.
+     * Here the array is only one element long, but you could pass
+     * more than one scanline at a time if that's more convenient.
+     */
+    row_pointer[0] = & image_buffer[((cinfo.image_height-1)*row_stride)-cinfo.next_scanline * row_stride];
+    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
+  }
+
+  /* Step 6: Finish compression */
+
+  jpeg_finish_compress(&cinfo);
+  /* After finish_compress, we can close the output file. */
+  ri.FS_WriteFile( filename, out, hackSize );
+
+  ri.Hunk_FreeTempMemory(out);
+
+  /* Step 7: release JPEG compression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_compress(&cinfo);
+
+  /* And we're done! */
+}
+#endif
+
+//===================================================================
 
 /*
 =================
 R_LoadImage
 
-Loads any of the supported image types into a canonical
+Loads any of the supported image types into a cannonical
 32 bit format.
 =================
 */
-void R_LoadImage( const char *name, byte **pic, int *width, int *height )
-{
-	qboolean orgNameFailed = qfalse;
-	int orgLoader = -1;
-	int i;
-	char localName[ MAX_QPATH ];
-	const char *ext;
-	char *altName;
+static void R_LoadImage(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
+	size_t	len;
+	char	tempName[MAX_STRING_TOKENS + 1];
+	char altname[MAX_QPATH];
 
+
+	*hasAlpha = qfalse;
+	*glCompressMode = 0;
 	*pic = NULL;
 	*width = 0;
 	*height = 0;
 
-	Q_strncpyz( localName, name, MAX_QPATH );
-
-	ext = COM_GetExtension( localName );
-
-	if( *ext )
-	{
-		// Look for the correct loader and use it
-		for( i = 0; i < numImageLoaders; i++ )
-		{
-			if( !Q_stricmp( ext, imageLoaders[ i ].ext ) )
-			{
-				// Load
-				imageLoaders[ i ].ImageLoader( localName, pic, width, height );
-				break;
-			}
-		}
-
-		// A loader was found
-		if( i < numImageLoaders )
-		{
-			if( *pic == NULL )
-			{
-				// Loader failed, most likely because the file isn't there;
-				// try again without the extension
-				orgNameFailed = qtrue;
-				orgLoader = i;
-				COM_StripExtension( name, localName, MAX_QPATH );
-			}
-			else
-			{
-				// Something loaded
-				return;
-			}
-		}
+	len = strlen(name);
+	if (len < 5) {
+		return;
 	}
 
-	// Try and find a suitable match using all
-	// the image formats supported
-	for( i = 0; i < numImageLoaders; i++ )
+	strcpy(altname, name);
+	len = strlen(altname);
+	if (glConfig.textureCompression == TC_S3TC || glConfig.textureCompression == TC_S3TC_ARB)
 	{
-		if (i == orgLoader)
-			continue;
+		len = strlen(altname);
+		altname[len - 3] = 'd';
+		altname[len - 2] = 'd';
+		altname[len - 1] = 's';
+		LoadDDS(altname, pic, width, height, hasAlpha, glCompressMode, numMipmaps, piMipmapsAvailable);
+	}
 
-		altName = va( "%s.%s", localName, imageLoaders[ i ].ext );
-
-		// Load
-		imageLoaders[ i ].ImageLoader( altName, pic, width, height );
-
-		if( *pic )
-		{
-			if( orgNameFailed )
-			{
-				ri.Printf( PRINT_DEVELOPER, "WARNING: %s not present, using %s instead\n",
-						name, altName );
+	if (!*pic)
+	{
+		if (!Q_stricmp(name + len - 4, ".tga") || !Q_stricmp(name + len - 4, ".jpg")) {
+			if (r_loadjpg->integer) {
+				len = strlen(altname);
+				altname[len - 3] = 'j';
+				altname[len - 2] = 'p';
+				altname[len - 1] = 'g';
+				// try jpg first
+				LoadJPG(altname, pic, width, height);
 			}
-
-			break;
+			if (!*pic) {
+				altname[len - 3] = 't';
+				altname[len - 2] = 'g';
+				altname[len - 1] = 'a';
+				LoadTGA(altname, pic, width, height);
+			}
+			*piMipmapsAvailable = 1;
 		}
+		else if (!Q_stricmp(name + len - 4, ".pcx")) {
+			LoadPCX32(name, pic, width, height);
+			*piMipmapsAvailable = 1;
+		}
+		else if (!Q_stricmp(name + len - 4, ".bmp")) {
+			LoadBMP(name, pic, width, height);
+			*piMipmapsAvailable = 1;
+		}
+		else if (!Q_stricmp(name + len - 4, ".jpg")) {
+			LoadJPG(name, pic, width, height);
+			*piMipmapsAvailable = 1;
+        }
+        else if (!Q_stricmp(name + len - 4, ".gst")) {
+            LoadGHOST(name, pic, width, height);
+            *piMipmapsAvailable = 0;
+        }
+	}
+
+	if (scr_initialized)
+	{
+		Com_sprintf(tempName, sizeof(tempName), "n%s", name);
+		UI_LoadResource(tempName);
 	}
 }
 
@@ -1022,11 +2477,15 @@ Finds or loads the given image.
 Returns NULL if it fails, not a default image.
 ==============
 */
-image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
-{
+image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
 	image_t	*image;
 	int		width, height;
 	byte	*pic;
+	int		len;
+	qboolean	hasAlpha;
+	int			glCompressMode;
+	int			numMipmaps;
+	int			iMipmapsAvailable;
 	long	hash;
 
 	if (!name) {
@@ -1038,13 +2497,22 @@ image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 	//
 	// see if the image is already loaded
 	//
-	for (image=hashTable[hash]; image; image=image->next) {
-		if ( !strcmp( name, image->imgName ) ) {
+	for (image = hashTable[hash]; image; image = image->next) {
+		if (!strcmp(name, image->imgName)) {
 			// the white image can be used with any set of parms, but other mismatches are errors
-			if ( strcmp( name, "*white" ) ) {
-				if ( image->flags != flags ) {
-					ri.Printf( PRINT_DEVELOPER, "WARNING: reused image %s with mixed flags (%i vs %i)\n", name, image->flags, flags );
+			if (strcmp(name, "*white")) {
+				if ((image->numMipmaps && !mipmap) || (!image->numMipmaps && mipmap)) {
+					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed mipmap parm\n", name);
 				}
+				if (image->allowPicmip != allowPicmip) {
+					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed allowPicmip parm\n", name);
+				}
+				if (image->wrapClampModeX != glWrapClampModeX || image->wrapClampModeY != glWrapClampModeY) {
+					ri.Printf(PRINT_ALL, "WARNING: reused image %s with mixed glWrapClampMode parm\n", name);
+				}
+			}
+			if (image->r_sequence != -1) {
+				image->r_sequence = r_sequencenumber;
 			}
 			return image;
 		}
@@ -1053,23 +2521,118 @@ image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 	//
 	// load the pic from disk
 	//
-	R_LoadImage( name, &pic, &width, &height );
-	if ( pic == NULL ) {
+	numMipmaps = mipmap;
+	iMipmapsAvailable = 0;
+	R_LoadImage(name, &pic, &width, &height, &hasAlpha, &glCompressMode, &numMipmaps, &iMipmapsAvailable);
+	if (pic == NULL) {
 		return NULL;
 	}
 
-	image = R_CreateImage( ( char * ) name, pic, width, height, type, flags, 0 );
-	ri.Free( pic );
+	image = R_CreateImage(
+		name,
+		pic,
+		width,
+		height,
+		numMipmaps,
+		iMipmapsAvailable,
+		allowPicmip,
+		force32bit,
+		hasAlpha,
+		glCompressMode,
+		glWrapClampModeX,
+		glWrapClampModeY);
+
+    len = strlen(name);
+    if (len > 4 && !strcmp(&name[len - 4], ".gst")) {
+        R_SetGhostImage(name, image);
+    }
+
+	ri.Free(pic);
 	return image;
 }
 
+/*
+================
+R_RefreshImageFile
+================
+*/
+image_t* R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
+	char imagename[64];
+	image_t* image;
+	long hash;
+	
+	if (!name) {
+		return NULL;
+	}
+
+	strncpy(imagename, name, ARRAY_LEN(imagename));
+	hash = generateHashValue(name);
+	image = hashTable[hash];
+
+    if (image)
+    {
+        while (strcmp(name, image->imgName))
+        {
+            image = image->next;
+			if (!image) {
+				return R_FindImageFile(
+					imagename,
+					mipmap,
+					allowPicmip,
+					force32bit,
+					glWrapClampModeX,
+					glWrapClampModeY
+				);
+			}
+        }
+
+        R_FreeImage(image);
+    }
+
+    return R_FindImageFile(
+		imagename,
+		mipmap,
+		allowPicmip,
+		force32bit,
+		glWrapClampModeX,
+		glWrapClampModeY
+	);
+}
+
+/*
+================
+R_ImageExists
+================
+*/
+qboolean R_ImageExists(const char* name) {
+    image_t* image;
+    long int hash;
+
+    if (name)
+    {
+        hash = generateHashValue(name);
+        image = hashTable[hash];
+
+        if (hash)
+        {
+            for (; image != NULL; image = image->next)
+            {
+                if (!strcmp(name, image->imgName)) {
+                    return qtrue;
+                }
+            }
+        }
+    }
+
+    return qfalse;
+}
 
 /*
 ================
 R_CreateDlightImage
 ================
 */
-#define	DLIGHT_SIZE	16
+#define	DLIGHT_SIZE	32
 static void R_CreateDlightImage( void ) {
 	int		x,y;
 	byte	data[DLIGHT_SIZE][DLIGHT_SIZE][4];
@@ -1082,7 +2645,7 @@ static void R_CreateDlightImage( void ) {
 
 			d = ( DLIGHT_SIZE/2 - 0.5f - x ) * ( DLIGHT_SIZE/2 - 0.5f - x ) +
 				( DLIGHT_SIZE/2 - 0.5f - y ) * ( DLIGHT_SIZE/2 - 0.5f - y );
-			b = 4000 / d;
+			b = 16000 / d;
 			if (b > 255) {
 				b = 255;
 			} else if ( b < 75 ) {
@@ -1094,91 +2657,8 @@ static void R_CreateDlightImage( void ) {
 			data[y][x][3] = 255;			
 		}
 	}
-	tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, IMGTYPE_COLORALPHA, IMGFLAG_CLAMPTOEDGE, 0 );
-}
-
-
-/*
-=================
-R_InitFogTable
-=================
-*/
-void R_InitFogTable( void ) {
-	int		i;
-	float	d;
-	float	exp;
-	
-	exp = 0.5;
-
-	for ( i = 0 ; i < FOG_TABLE_SIZE ; i++ ) {
-		d = pow ( (float)i/(FOG_TABLE_SIZE-1), exp );
-
-		tr.fogTable[i] = d;
-	}
-}
-
-/*
-================
-R_FogFactor
-
-Returns a 0.0 to 1.0 fog density value
-This is called for each texel of the fog texture on startup
-and for each vertex of transparent shaders in fog dynamically
-================
-*/
-float	R_FogFactor( float s, float t ) {
-	float	d;
-
-	s -= 1.0/512;
-	if ( s < 0 ) {
-		return 0;
-	}
-	if ( t < 1.0/32 ) {
-		return 0;
-	}
-	if ( t < 31.0/32 ) {
-		s *= (t - 1.0f/32.0f) / (30.0f/32.0f);
-	}
-
-	// we need to leave a lot of clamp range
-	s *= 8;
-
-	if ( s > 1.0 ) {
-		s = 1.0;
-	}
-
-	d = tr.fogTable[ (int)(s * (FOG_TABLE_SIZE-1)) ];
-
-	return d;
-}
-
-/*
-================
-R_CreateFogImage
-================
-*/
-#define	FOG_S	256
-#define	FOG_T	32
-static void R_CreateFogImage( void ) {
-	int		x,y;
-	byte	*data;
-	float	d;
-
-	data = ri.Hunk_AllocateTempMemory( FOG_S * FOG_T * 4 );
-
-	// S is distance, T is depth
-	for (x=0 ; x<FOG_S ; x++) {
-		for (y=0 ; y<FOG_T ; y++) {
-			d = R_FogFactor( ( x + 0.5f ) / FOG_S, ( y + 0.5f ) / FOG_T );
-
-			data[(y*FOG_S+x)*4+0] = 
-			data[(y*FOG_S+x)*4+1] = 
-			data[(y*FOG_S+x)*4+2] = 255;
-			data[(y*FOG_S+x)*4+3] = 255*d;
-		}
-	}
-	tr.fogImage = R_CreateImage("*fog", (byte *)data, FOG_S, FOG_T, IMGTYPE_COLORALPHA, IMGFLAG_CLAMPTOEDGE, 0 );
-	ri.Hunk_FreeTempMemory( data );
+	tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.dlightImage->r_sequence = -1;
 }
 
 /*
@@ -1214,7 +2694,8 @@ static void R_CreateDefaultImage( void ) {
 		data[x][DEFAULT_SIZE-1][2] =
 		data[x][DEFAULT_SIZE-1][3] = 255;
 	}
-	tr.defaultImage = R_CreateImage("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, IMGTYPE_COLORALPHA, IMGFLAG_MIPMAP, 0);
+	tr.defaultImage = R_CreateImage("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, 1, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.defaultImage->r_sequence = -1;
 }
 
 /*
@@ -1222,15 +2703,18 @@ static void R_CreateDefaultImage( void ) {
 R_CreateBuiltinImages
 ==================
 */
-void R_CreateBuiltinImages( void ) {
-	int		x,y;
+void R_CreateBuiltinImages(void) {
+	int		x, y;
+	int		i;
+	byte	lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
 	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
 
 	R_CreateDefaultImage();
 
 	// we use a solid white image instead of disabling texturing
 	Com_Memset( data, 255, sizeof( data ) );
-	tr.whiteImage = R_CreateImage("*white", (byte *)data, 8, 8, IMGTYPE_COLORALPHA, IMGFLAG_NONE, 0);
+	tr.whiteImage = R_CreateImage("*white", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.whiteImage->r_sequence = -1;
 
 	// with overbright bits active, we need an image which is some fraction of full color,
 	// for default lightmaps, etc
@@ -1243,16 +2727,22 @@ void R_CreateBuiltinImages( void ) {
 		}
 	}
 
-	tr.identityLightImage = R_CreateImage("*identityLight", (byte *)data, 8, 8, IMGTYPE_COLORALPHA, IMGFLAG_NONE, 0);
+	Com_Memset(lightmap_buffer, 0xFFFFFFFF, sizeof(lightmap_buffer));
+	for (i = 0; i < 15; i++) {
+		char filename[64];
 
-
-	for(x=0;x<32;x++) {
-		// scratchimage is usually used for cinematic drawing
-		tr.scratchImage[x] = R_CreateImage("*scratch", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, IMGTYPE_COLORALPHA, IMGFLAG_PICMIP | IMGFLAG_CLAMPTOEDGE, 0);
+		Com_sprintf(filename, sizeof(filename), "*lightmapD%i", i);
+		tr.dlightImages[i] = R_CreateImage(filename, lightmap_buffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, 0, GL_CLAMP, GL_CLAMP);
+		tr.dlightImages[i]->r_sequence = -1;
 	}
 
+	tr.identityLightImage = R_CreateImage("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.identityLightImage->r_sequence = -1;
+
+	tr.scratchImage = R_CreateImage("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, qtrue, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.scratchImage->r_sequence = -1;
+
 	R_CreateDlightImage();
-	R_CreateFogImage();
 }
 
 
@@ -1293,10 +2783,11 @@ void R_SetColorMappings( void ) {
 		tr.overbrightBits = 0;
 	}
 
-	tr.identityLight = 1.0f / ( 1 << tr.overbrightBits );
+	tr.overbrightShift = r_mapOverBrightBits->integer - tr.overbrightBits;
+	tr.overbrightMult = (float)(1 << tr.overbrightShift);
+	tr.identityLight = 1.0f / (1 << tr.overbrightBits);
 	tr.identityLightByte = 255 * tr.identityLight;
 
-
 	if ( r_intensity->value <= 1 ) {
 		ri.Cvar_Set( "r_intensity", "1" );
 	}
@@ -1308,6 +2799,15 @@ void R_SetColorMappings( void ) {
 	}
 
 	g = r_gamma->value;
+	if (!glConfig.deviceSupportsGamma && g != 1.0) {
+		tr.needsLightScale = qtrue;
+	}
+	else if (r_intensity->value != 1.0) {
+		tr.needsLightScale = qtrue;
+	}
+	else {
+		tr.needsLightScale = qfalse;
+	}
 
 	shift = tr.overbrightBits;
 
@@ -1348,6 +2848,10 @@ R_InitImages
 */
 void	R_InitImages( void ) {
 	Com_Memset(hashTable, 0, sizeof(hashTable));
+	// clear images
+	Com_Memset(tr.images, 0, sizeof(tr.images));
+	tr.numImages = 0;
+
 	// build brightness translation tables
 	R_SetColorMappings();
 
@@ -1355,6 +2859,51 @@ void	R_InitImages( void ) {
 	R_CreateBuiltinImages();
 }
 
+/*
+===============
+R_DeleteImageFromHash
+===============
+*/
+void R_DeleteImageFromHash(image_t* image) {
+	image_t* current;
+	image_t* prev;
+	int hash;
+
+    hash = generateHashValue(image->imgName);
+    current = hashTable[hash];
+    prev = NULL;
+
+    while (current)
+    {
+        if (image == current)
+        {
+			if (prev) {
+				prev->next = current->next;
+			} else {
+                hashTable[hash] = current->next;
+			}
+            return;
+        }
+
+        prev = current;
+        current = current->next;
+    }
+}
+
+/*
+===============
+R_FreeImage
+===============
+*/
+void R_FreeImage(image_t* image) {
+	if (image->texnum) {
+		qglDeleteTextures(1, &image->texnum);
+	}
+
+    R_DeleteImageFromHash(image);
+	memset(image, 0, sizeof(image_t));
+}
+
 /*
 ===============
 R_DeleteTextures
@@ -1364,23 +2913,102 @@ void R_DeleteTextures( void ) {
 	int		i;
 
 	for ( i=0; i<tr.numImages ; i++ ) {
-		qglDeleteTextures( 1, &tr.images[i]->texnum );
+        R_FreeImage(&tr.images[i]);
 	}
 	Com_Memset( tr.images, 0, sizeof( tr.images ) );
 
 	tr.numImages = 0;
 
 	Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) );
-	if ( qglActiveTextureARB ) {
-		GL_SelectTexture( 1 );
-		qglBindTexture( GL_TEXTURE_2D, 0 );
-		GL_SelectTexture( 0 );
-		qglBindTexture( GL_TEXTURE_2D, 0 );
-	} else {
-		qglBindTexture( GL_TEXTURE_2D, 0 );
+	if ( qglBindTexture ) {
+		if ( qglActiveTextureARB ) {
+			GL_SelectTexture( 1 );
+			qglBindTexture( GL_TEXTURE_2D, 0 );
+			GL_SelectTexture( 0 );
+			qglBindTexture( GL_TEXTURE_2D, 0 );
+		} else {
+			qglBindTexture( GL_TEXTURE_2D, 0 );
+		}
 	}
 }
 
+/*
+===============
+R_DumpTextureMemory
+===============
+*/
+void R_DumpTextureMemory() {
+    int i;
+    char str_buffer[32];
+    char* Label1, * Label2;
+    fileHandle_t stat_file;
+
+    stat_file = FS_SV_FOpenFileWrite("textureuse.csv");
+
+    Label1 = "Texture Name,";
+    FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Size (kb),";
+    FS_Write(Label2, strlen(Label2), stat_file);
+    Label1 = "Num Uses,";
+    FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Miplevels\n";
+    FS_Write(Label2, strlen(Label2), stat_file);
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = &tr.images[i];
+
+        FS_Write(image->imgName, strlen(image->imgName), stat_file);
+        FS_Write(", ", 2, stat_file);
+
+        // Write the number of bytes (in KiB)
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
+        FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        FS_Write(", ", 2, stat_file);
+
+        // Write the sequence
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
+        FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        FS_Write(", ", 2, stat_file);
+    }
+}
+
+/*
+===============
+R_CountTextureMemory
+===============
+*/
+int R_CountTextureMemory() {
+    int total_bytes;
+    int i;
+
+    R_DumpTextureMemory();
+
+    total_bytes = 0;
+
+    for (i = 0; i < tr.numImages; i++) {
+        total_bytes = tr.images[i].bytesUsed;
+    }
+
+    return total_bytes;
+}
+
+/*
+===============
+R_FreeUnusedImages
+===============
+*/
+void R_FreeUnusedImages() {
+    int i;
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = &tr.images[i];
+
+        if (image->imgName[0] && image->r_sequence != r_sequencenumber && image->r_sequence != -1) {
+            R_FreeImage(image);
+        }
+    }
+}
+
 /*
 ============================================================================
 
@@ -1394,7 +3022,7 @@ SKINS
 CommaParse
 
 This is unfortunate, but the skin files aren't
-compatible with our normal parsing rules.
+compatable with our normal parsing rules.
 ==================
 */
 static char *CommaParse( char **data_p ) {
@@ -1427,15 +3055,12 @@ static char *CommaParse( char **data_p ) {
 		// skip double slash comments
 		if ( c == '/' && data[1] == '/' )
 		{
-			data += 2;
-			while (*data && *data != '\n') {
+			while (*data && *data != '\n')
 				data++;
-			}
 		}
 		// skip /* */ comments
 		else if ( c=='/' && data[1] == '*' ) 
 		{
-			data += 2;
 			while ( *data && ( *data != '*' || data[1] != '/' ) ) 
 			{
 				data++;
@@ -1468,7 +3093,7 @@ static char *CommaParse( char **data_p ) {
 				*data_p = ( char * ) data;
 				return com_token;
 			}
-			if (len < MAX_TOKEN_CHARS - 1)
+			if (len < MAX_TOKEN_CHARS)
 			{
 				com_token[len] = c;
 				len++;
@@ -1479,7 +3104,7 @@ static char *CommaParse( char **data_p ) {
 	// parse a regular word
 	do
 	{
-		if (len < MAX_TOKEN_CHARS - 1)
+		if (len < MAX_TOKEN_CHARS)
 		{
 			com_token[len] = c;
 			len++;
@@ -1488,6 +3113,11 @@ static char *CommaParse( char **data_p ) {
 		c = *data;
 	} while (c>32 && c != ',' );
 
+	if (len == MAX_TOKEN_CHARS)
+	{
+//		Com_Printf ("Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
+		len = 0;
+	}
 	com_token[len] = 0;
 
 	*data_p = ( char * ) data;
@@ -1502,26 +3132,20 @@ RE_RegisterSkin
 ===============
 */
 qhandle_t RE_RegisterSkin( const char *name ) {
-	skinSurface_t parseSurfaces[MAX_SKIN_SURFACES];
 	qhandle_t	hSkin;
 	skin_t		*skin;
 	skinSurface_t	*surf;
-	union {
-		char *c;
-		void *v;
-	} text;
-	char		*text_p;
+	char		*text, *text_p;
 	char		*token;
 	char		surfName[MAX_QPATH];
-	int			totalSurfaces;
 
 	if ( !name || !name[0] ) {
-		ri.Printf( PRINT_DEVELOPER, "Empty name passed to RE_RegisterSkin\n" );
+		Com_Printf( "Empty name passed to RE_RegisterSkin\n" );
 		return 0;
 	}
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_DEVELOPER, "Skin name exceeds MAX_QPATH\n" );
+		Com_Printf( "Skin name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
@@ -1543,29 +3167,29 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 		return 0;
 	}
 	tr.numSkins++;
-	skin = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
+	skin = ri.Hunk_Alloc( sizeof( skin_t ), h_dontcare );
 	tr.skins[hSkin] = skin;
 	Q_strncpyz( skin->name, name, sizeof( skin->name ) );
 	skin->numSurfaces = 0;
 
-	R_IssuePendingRenderCommands();
+	// make sure the render thread is stopped
+	R_SyncRenderThread();
 
 	// If not a .skin file, load as a single shader
 	if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
 		skin->numSurfaces = 1;
-		skin->surfaces = ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
-		skin->surfaces[0].shader = R_FindShader( name, LIGHTMAP_NONE, qtrue );
+		skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_dontcare);
+		skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
 		return hSkin;
 	}
 
 	// load and parse the skin file
-    ri.FS_ReadFile( name, &text.v );
-	if ( !text.c ) {
+    ri.FS_ReadFile( name, (void **)&text );
+	if ( !text ) {
 		return 0;
 	}
 
-	totalSurfaces = 0;
-	text_p = text.c;
+	text_p = text;
 	while ( text_p && *text_p ) {
 		// get surface name
 		token = CommaParse( &text_p );
@@ -1588,54 +3212,23 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 		// parse the shader name
 		token = CommaParse( &text_p );
 
-		if ( skin->numSurfaces < MAX_SKIN_SURFACES ) {
-			surf = &parseSurfaces[skin->numSurfaces];
-			Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-			surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );
-			skin->numSurfaces++;
-		}
-
-		totalSurfaces++;
+		surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_dontcare );
+		Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
+		surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
+		skin->numSurfaces++;
 	}
 
-	ri.FS_FreeFile( text.v );
+	ri.FS_FreeFile( text );
 
-	if ( totalSurfaces > MAX_SKIN_SURFACES ) {
-		ri.Printf( PRINT_WARNING, "WARNING: Ignoring excess surfaces (found %d, max is %d) in skin '%s'!\n",
-					totalSurfaces, MAX_SKIN_SURFACES, name );
-	}
 
 	// never let a skin have 0 shaders
 	if ( skin->numSurfaces == 0 ) {
 		return 0;		// use default skin
 	}
 
-	// copy surfaces to skin
-	skin->surfaces = ri.Hunk_Alloc( skin->numSurfaces * sizeof( skinSurface_t ), h_low );
-	memcpy( skin->surfaces, parseSurfaces, skin->numSurfaces * sizeof( skinSurface_t ) );
-
 	return hSkin;
 }
 
-
-/*
-===============
-R_InitSkins
-===============
-*/
-void	R_InitSkins( void ) {
-	skin_t		*skin;
-
-	tr.numSkins = 1;
-
-	// make the default skin have all default shaders
-	skin = tr.skins[0] = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
-	Q_strncpyz( skin->name, "<default skin>", sizeof( skin->name )  );
-	skin->numSurfaces = 1;
-	skin->surfaces = ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
-	skin->surfaces[0].shader = tr.defaultShader;
-}
-
 /*
 ===============
 R_GetSkinByHandle
@@ -1662,10 +3255,10 @@ void	R_SkinList_f( void ) {
 	for ( i = 0 ; i < tr.numSkins ; i++ ) {
 		skin = tr.skins[i];
 
-		ri.Printf( PRINT_ALL, "%3i:%s (%d surfaces)\n", i, skin->name, skin->numSurfaces );
+		ri.Printf( PRINT_ALL, "%3i:%s\n", i, skin->name );
 		for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
 			ri.Printf( PRINT_ALL, "       %s = %s\n", 
-				skin->surfaces[j].name, skin->surfaces[j].shader->name );
+				skin->surfaces[j]->name, skin->surfaces[j]->shader->name );
 		}
 	}
 	ri.Printf (PRINT_ALL, "------------------\n");
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index 1c502018..c2c2498a 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -23,67 +23,60 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-glconfig_t  glConfig;
-qboolean    textureFilterAnisotropic = qfalse;
-int         maxAnisotropy = 0;
-float       displayAspect = 0.0f;
-qboolean    haveClampToEdge = qfalse;
-
+glconfig_t	glConfig;
+qboolean	textureFilterAnisotropic = qfalse;
+int		 maxAnisotropy = 0;
+float	   displayAspect = 0;
+qboolean	haveClampToEdge;
 glstate_t	glState;
+int r_sequencenumber;
 
 static void GfxInfo_f( void );
 
-#ifdef USE_RENDERER_DLOPEN
-cvar_t  *com_altivec;
-#endif
-
 cvar_t	*r_flareSize;
 cvar_t	*r_flareFade;
-cvar_t	*r_flareCoeff;
-
-cvar_t	*r_railWidth;
-cvar_t	*r_railCoreWidth;
-cvar_t	*r_railSegmentLength;
 
 cvar_t	*r_ignoreFastPath;
 
 cvar_t	*r_verbose;
 cvar_t	*r_ignore;
 
-cvar_t  *r_displayRefresh;
-
-cvar_t	*r_detailTextures;
+cvar_t	*r_displayRefresh;
 
 cvar_t	*r_znear;
-cvar_t	*r_zproj;
-cvar_t	*r_stereoSeparation;
 
+cvar_t	*r_smp;
+cvar_t	*r_showSmp;
 cvar_t	*r_skipBackEnd;
 
-cvar_t	*r_stereoEnabled;
-cvar_t	*r_anaglyphMode;
-
-cvar_t	*r_greyscale;
-
 cvar_t	*r_ignorehwgamma;
 cvar_t	*r_measureOverdraw;
 
 cvar_t	*r_inGameVideo;
 cvar_t	*r_fastsky;
+cvar_t	*r_fastdlights;
 cvar_t	*r_drawSun;
-cvar_t	*r_dynamiclight;
 cvar_t	*r_dlightBacks;
 
-cvar_t	*r_lodbias;
 cvar_t	*r_lodscale;
 
 cvar_t	*r_norefresh;
 cvar_t	*r_drawentities;
+cvar_t	*r_drawentitypoly;
+cvar_t	*r_drawstaticmodels;
+cvar_t	*r_drawstaticmodelpoly;
+cvar_t	*r_drawbrushes;
+cvar_t	*r_drawbrushmodels;
+cvar_t	*r_drawstaticdecals;
+cvar_t	*r_drawterrain;
+cvar_t	*r_drawsprites;
+cvar_t	*r_drawspherelights;
 cvar_t	*r_drawworld;
 cvar_t	*r_speeds;
 cvar_t	*r_fullbright;
 cvar_t	*r_novis;
 cvar_t	*r_nocull;
+cvar_t	*r_showcull;
 cvar_t	*r_facePlaneCull;
 cvar_t	*r_showcluster;
 cvar_t	*r_nocurves;
@@ -91,11 +84,17 @@ cvar_t	*r_nocurves;
 cvar_t	*r_allowExtensions;
 
 cvar_t	*r_ext_compressed_textures;
+cvar_t	*r_ext_gamma_control;
 cvar_t	*r_ext_multitexture;
 cvar_t	*r_ext_compiled_vertex_array;
 cvar_t	*r_ext_texture_env_add;
-cvar_t	*r_ext_texture_filter_anisotropic;
+
+cvar_t	*r_ext_texture_env_combine;
+cvar_t	*r_ext_aniso_filter;
 cvar_t	*r_ext_max_anisotropy;
+cvar_t	*r_forceClampToEdge;
+cvar_t	*r_geForce3WorkAround;
+cvar_t	*r_reset_tc_array;
 
 cvar_t	*r_ignoreGLErrors;
 cvar_t	*r_logFile;
@@ -103,25 +102,37 @@ cvar_t	*r_logFile;
 cvar_t	*r_stencilbits;
 cvar_t	*r_depthbits;
 cvar_t	*r_colorbits;
+cvar_t	*r_stereo;
 cvar_t	*r_primitives;
+cvar_t	*r_textureDetails;
 cvar_t	*r_texturebits;
-cvar_t  *r_ext_multisample;
 
 cvar_t	*r_drawBuffer;
+cvar_t  *r_glDriver;
 cvar_t	*r_lightmap;
 cvar_t	*r_vertexLight;
-cvar_t	*r_uiFullScreen;
 cvar_t	*r_shadows;
+cvar_t	*r_entlight_scale;
+cvar_t	*r_entlight_errbound;
+cvar_t	*r_entlight_cubelevel;
+cvar_t	*r_entlight_cubefraction;
+cvar_t	*r_entlight_maxcalc;
 cvar_t	*r_flares;
 cvar_t	*r_mode;
+cvar_t	*r_maxmode;
+cvar_t	*r_vidmode1024;
+cvar_t	*r_vidmodemax;
 cvar_t	*r_nobind;
 cvar_t	*r_singleShader;
+cvar_t	*r_lerpmodels;
 cvar_t	*r_roundImagesDown;
 cvar_t	*r_colorMipLevels;
 cvar_t	*r_picmip;
 cvar_t	*r_showtris;
 cvar_t	*r_showsky;
 cvar_t	*r_shownormals;
+cvar_t	*r_showhbox;
+cvar_t	*r_showstaticbboxes;
 cvar_t	*r_finish;
 cvar_t	*r_clear;
 cvar_t	*r_swapInterval;
@@ -132,42 +143,156 @@ cvar_t	*r_gamma;
 cvar_t	*r_intensity;
 cvar_t	*r_lockpvs;
 cvar_t	*r_noportals;
+cvar_t	*r_entlightmap;
+cvar_t	*r_fastentlight;
 cvar_t	*r_portalOnly;
 
 cvar_t	*r_subdivisions;
 cvar_t	*r_lodCurveError;
 
 cvar_t	*r_fullscreen;
-cvar_t  *r_noborder;
 
 cvar_t	*r_customwidth;
 cvar_t	*r_customheight;
-cvar_t	*r_customPixelAspect;
+cvar_t	*r_customaspect;
 
 cvar_t	*r_overBrightBits;
 cvar_t	*r_mapOverBrightBits;
 
 cvar_t	*r_debugSurface;
-cvar_t	*r_simpleMipMaps;
 
 cvar_t	*r_showImages;
+cvar_t	*r_showlod;
+cvar_t	*r_showstaticlod;
 
 cvar_t	*r_ambientScale;
 cvar_t	*r_directedScale;
-cvar_t	*r_debugLight;
 cvar_t	*r_debugSort;
 cvar_t	*r_printShaders;
 cvar_t	*r_saveFontData;
 
-cvar_t	*r_marksOnTriangleMeshes;
-
-cvar_t	*r_aviMotionJpegQuality;
-cvar_t	*r_screenshotJpegQuality;
-
 cvar_t	*r_maxpolys;
 int		max_polys;
 cvar_t	*r_maxpolyverts;
 int		max_polyverts;
+cvar_t* r_maxtermarks;
+int		max_termarks;
+cvar_t* r_precacheimages;
+
+cvar_t* r_staticlod;
+cvar_t* r_lodscale;
+cvar_t* r_lodcap;
+cvar_t* r_lodviewmodelcap;
+
+cvar_t* r_uselod;
+cvar_t* lod_LOD;
+cvar_t* lod_minLOD;
+cvar_t* lod_maxLOD;
+cvar_t* lod_LOD_slider;
+cvar_t* lod_curve_0_val;
+cvar_t* lod_curve_1_val;
+cvar_t* lod_curve_2_val;
+cvar_t* lod_curve_3_val;
+cvar_t* lod_curve_4_val;
+cvar_t* lod_edit_0;
+cvar_t* lod_edit_1;
+cvar_t* lod_edit_2;
+cvar_t* lod_edit_3;
+cvar_t* lod_edit_4;
+cvar_t* lod_curve_0_slider;
+cvar_t* lod_curve_1_slider;
+cvar_t* lod_curve_2_slider;
+cvar_t* lod_curve_3_slider;
+cvar_t* lod_curve_4_slider;
+cvar_t* lod_pitch_val;
+cvar_t* lod_zee_val;
+cvar_t* lod_mesh;
+cvar_t* lod_meshname;
+cvar_t* lod_tikiname;
+cvar_t* lod_metric;
+cvar_t* lod_tris;
+cvar_t* lod_position;
+cvar_t* lod_save;
+cvar_t* lod_tool;
+
+cvar_t* sys_cpuid;
+cvar_t* r_sse;
+cvar_t* r_static_shaderdata0;
+cvar_t* r_static_shaderdata1;
+cvar_t* r_static_shaderdata2;
+cvar_t* r_static_shaderdata3;
+cvar_t* r_static_shadermultiplier0;
+cvar_t* r_static_shadermultiplier1;
+cvar_t* r_static_shadermultiplier2;
+cvar_t* r_static_shadermultiplier3;
+
+cvar_t* r_numdebuglines;
+
+
+cvar_t* r_stipplelines;
+cvar_t* r_light_lines;
+cvar_t* r_light_sun_line;
+cvar_t* r_light_int_scale;
+cvar_t* r_light_nolight;
+cvar_t* r_light_showgrid;
+cvar_t* r_skyportal;
+cvar_t* r_skyportal_origin;
+cvar_t* r_farplane;
+cvar_t* r_farplane_bias;
+cvar_t* r_farplane_color;
+cvar_t* r_farplane_nocull;
+cvar_t* r_farplane_nofog;
+cvar_t* r_skybox_farplane;
+cvar_t* r_farclip;
+cvar_t* r_lightcoronasize;
+cvar_t* r_useglfog;
+cvar_t* r_debuglines_depthmask;
+cvar_t* r_smoothsmokelight;
+cvar_t* r_showportal;
+cvar_t* ter_minMarkRadius;
+cvar_t* ter_fastMarks;
+cvar_t* r_alpha_foliage1;
+cvar_t* r_alpha_foliage2;
+cvar_t* r_blendtrees;
+cvar_t* r_blendbushes;
+cvar_t* r_bumpmap;
+cvar_t* r_loadjpg;
+cvar_t* r_loadftx;
+
+cvar_t* r_showSkeleton;
+
+cvar_t* r_ext_multisample;
+cvar_t* r_noborder;
+cvar_t* r_ext_texture_filter_anisotropic;
+cvar_t* r_stereoEnabled;
+
+cvar_t* r_screenshotJpegQuality;
+
+static char infostring[8192];
+
+static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
+{
+	if ( shouldBeIntegral )
+	{
+		if ( ( int ) cv->value != cv->integer )
+		{
+			ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' must be integral (%f)\n", cv->name, cv->value );
+			ri.Cvar_Set( cv->name, va( "%d", cv->integer ) );
+		}
+	}
+
+	if ( cv->value < minVal )
+	{
+		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f < %f)\n", cv->name, cv->value, minVal );
+		ri.Cvar_Set( cv->name, va( "%f", minVal ) );
+	}
+	else if ( cv->value > maxVal )
+	{
+		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f > %f)\n", cv->name, cv->value, maxVal );
+		ri.Cvar_Set( cv->name, va( "%f", maxVal ) );
+	}
+}
+
 
 /*
 ** InitOpenGL
@@ -179,11 +304,14 @@ int		max_polyverts;
 */
 static void InitOpenGL( void )
 {
+	char renderer_buffer[1024];
+
 	//
 	// initialize OS specific portions of the renderer
 	//
 	// GLimp_Init directly or indirectly references the following cvars:
 	//		- r_fullscreen
+	//		- r_glDriver
 	//		- r_mode
 	//		- r_(color|depth|stencil)bits
 	//		- r_ignorehwgamma
@@ -194,7 +322,10 @@ static void InitOpenGL( void )
 	{
 		GLint		temp;
 		
-		GLimp_Init( qtrue );
+		GLimp_Init(qtrue);
+
+		strcpy( renderer_buffer, glConfig.renderer_string );
+		Q_strlwr( renderer_buffer );
 
 		// OpenGL driver constants
 		qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp );
@@ -205,8 +336,18 @@ static void InitOpenGL( void )
 		{
 			glConfig.maxTextureSize = 0;
 		}
+
+		if (haveClampToEdge) {
+			ri.Cvar_Set("r_forceClampToEdge", "1");
+		}
 	}
 
+	// init command buffers and SMP
+	R_InitCommandBuffers();
+
+	// print info
+	GfxInfo_f();
+
 	// set default state
 	GL_SetDefaultState();
 }
@@ -261,8 +402,8 @@ void GL_CheckErrors( void ) {
 typedef struct vidmode_s
 {
 	const char *description;
-	int width, height;
-	float pixelAspect;		// pixel width / height
+	int		 width, height;
+	float		pixelAspect;		// pixel width / height
 } vidmode_t;
 
 vidmode_t r_vidModes[] =
@@ -280,11 +421,10 @@ vidmode_t r_vidModes[] =
 	{ "Mode 10: 2048x1536",		2048,	1536,	1 },
 	{ "Mode 11: 856x480 (wide)",856,	480,	1 }
 };
-static int	s_numVidModes = ARRAY_LEN( r_vidModes );
+static int	s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
 
 qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) {
 	vidmode_t	*vm;
-	float			pixelAspect;
 
 	if ( mode < -1 ) {
 		return qfalse;
@@ -296,16 +436,15 @@ qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode )
 	if ( mode == -1 ) {
 		*width = r_customwidth->integer;
 		*height = r_customheight->integer;
-		pixelAspect = r_customPixelAspect->value;
-	} else {
-		vm = &r_vidModes[mode];
-
-		*width  = vm->width;
-		*height = vm->height;
-		pixelAspect = vm->pixelAspect;
+		*windowAspect = r_customaspect->value;
+		return qtrue;
 	}
 
-	*windowAspect = (float)*width / ( *height * pixelAspect );
+	vm = &r_vidModes[mode];
+
+	*width  = vm->width;
+	*height = vm->height;
+	*windowAspect = (float)vm->width / ( vm->height * vm->pixelAspect );
 
 	return qtrue;
 }
@@ -385,13 +524,12 @@ byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *pa
 	return buffer;
 }
 
-/* 
-================== 
+/*
+==================
 RB_TakeScreenshot
-================== 
-*/  
-void RB_TakeScreenshot(int x, int y, int width, int height, char *fileName)
-{
+==================
+*/
+void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
 	byte *allbuf, *buffer;
 	byte *srcptr, *destptr;
 	byte *endline, *endmem;
@@ -450,10 +588,8 @@ void RB_TakeScreenshot(int x, int y, int width, int height, char *fileName)
 ================== 
 RB_TakeScreenshotJPEG
 ================== 
-*/
-
-void RB_TakeScreenshotJPEG(int x, int y, int width, int height, char *fileName)
-{
+*/  
+void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName ) {
 	byte *buffer;
 	size_t offset = 0, memcount;
 	int padlen;
@@ -561,6 +697,68 @@ void R_ScreenshotFilenameJPEG( int lastNumber, char *fileName ) {
 		, a, b, c, d );
 }
 
+/*
+====================
+R_ResampledScreenShot
+====================
+*/
+void R_ResampledScreenShot(const char* filename, int destwidth, int destheight) {
+	char		checkname[MAX_OSPATH];
+	byte		*buffer;
+	byte		*source, *allsource;
+	byte		*src, *dst;
+	size_t			offset = 0;
+	int			padlen;
+	int			x, y;
+	int			r, g, b;
+	float		xScale, yScale;
+	int			xx, yy;
+
+	allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
+	source = allsource + offset;
+
+	buffer = ri.Hunk_AllocateTempMemory(destheight * destwidth * 3 + 18);
+	Com_Memset (buffer, 0, 18);
+	buffer[2]  = 2;		// uncompressed type
+	buffer[12] = destwidth & 255;
+	buffer[13] = destwidth >> 8;
+	buffer[14] = destheight & 255;
+	buffer[15] = destheight >> 8;
+	buffer[16] = 24;	// pixel size
+
+	// resample from source
+	xScale = glConfig.vidWidth / (float)(destwidth * 4);
+	yScale = glConfig.vidHeight / (float)(destheight * 3);
+	for ( y = 0 ; y < destheight ; y++ ) {
+		for ( x = 0 ; x < destwidth ; x++ ) {
+			r = g = b = 0;
+			for ( yy = 0 ; yy < 3 ; yy++ ) {
+				for ( xx = 0 ; xx < 4 ; xx++ ) {
+					src = source + (3 * glConfig.vidWidth + padlen) * (int)((y*3 + yy) * yScale) +
+						3 * (int) ((x*4 + xx) * xScale);
+					r += src[0];
+					g += src[1];
+					b += src[2];
+				}
+			}
+			dst = buffer + 18 + 3 * ( y * destwidth + x );
+			dst[0] = b / 12;
+			dst[1] = g / 12;
+			dst[2] = r / 12;
+		}
+	}
+
+	// gamma correct
+	if ( glConfig.deviceSupportsGamma ) {
+		R_GammaCorrect( buffer + 18, destheight * destwidth * 3 );
+	}
+
+	ri.FS_WriteFile( filename, buffer, destheight * destwidth * 3 + 18 );
+
+	ri.Hunk_FreeTempMemory( buffer );
+	ri.Hunk_FreeTempMemory( allsource );
+}
+
 /*
 ====================
 R_LevelShot
@@ -640,59 +838,85 @@ screenshot [filename]
 Doesn't print the pacifier message if there is a second arg
 ================== 
 */  
-void R_ScreenShot_f (void) {
+void R_ScreenShot_f(void) {
 	char	checkname[MAX_OSPATH];
-	static	int	lastNumber = -1;
+	static int	lastNumber = -1;
+	int		width, height;
 	qboolean	silent;
 
-	if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
+	if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
 		R_LevelShot();
 		return;
 	}
 
-	if ( !strcmp( ri.Cmd_Argv(1), "silent" ) ) {
+	if (!strcmp(ri.Cmd_Argv(1), "silent")) {
 		silent = qtrue;
 	} else {
 		silent = qfalse;
 	}
 
-	if ( ri.Cmd_Argc() == 2 && !silent ) {
+	width = 0;
+	height = 0;
+
+	if (ri.Cmd_Argc() >= 2 && !silent) {
 		// explicit filename
-		Com_sprintf( checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv( 1 ) );
+		const char* name = ri.Cmd_Argv(1);
+		if (strchr(name, '/')) {
+			Q_strncpyz(checkname, name, sizeof(checkname));
+		} else {
+			Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
+		}
+
+		if (ri.Cmd_Argc() > 2) {
+			width = atoi(ri.Cmd_Argv(2));
+			height = atoi(ri.Cmd_Argv(3));
+		}
 	} else {
 		// scan for a free filename
 
 		// if we have saved a previous screenshot, don't scan
 		// again, because recording demo avis can involve
 		// thousands of shots
-		if ( lastNumber == -1 ) {
+		if (lastNumber == -1) {
 			lastNumber = 0;
 		}
 		// scan for a free number
-		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
-			R_ScreenshotFilename( lastNumber, checkname );
+		for (; lastNumber <= 9999; lastNumber++) {
+			R_ScreenshotFilename(lastNumber, checkname);
 
-      if (!ri.FS_FileExists( checkname ))
-      {
-        break; // file doesn't exist
-      }
+			if (!ri.FS_FileExists(checkname))
+			{
+				break; // file doesn't exist
+			}
 		}
 
-		if ( lastNumber >= 9999 ) {
-			ri.Printf (PRINT_ALL, "ScreenShot: Couldn't create a file\n"); 
+		if (lastNumber >= 9999) {
+			ri.Printf(PRINT_ALL, "ScreenShot: Couldn't create a file\n");
 			return;
- 		}
+		}
 
 		lastNumber++;
 	}
 
-	R_TakeScreenshot( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse );
+	if (!width || !height) {
+		R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
 
-	if ( !silent ) {
-		ri.Printf (PRINT_ALL, "Wrote %s\n", checkname);
+		if (!silent) {
+			char message[64];
+
+			Com_sprintf(message, sizeof(message), "centerprint \"%s %s\"\n", ri.LV_ConvertString("Wrote"), checkname);
+			ri.Cmd_ExecuteText(EXEC_NOW, message);
+		}
+	} else {
+		R_ResampledScreenShot(checkname, width, height);
 	}
-} 
+}
 
+/*
+==================
+RB_TakeScreenshot
+==================
+*/
 void R_ScreenShotJPEG_f (void) {
 	char		checkname[MAX_OSPATH];
 	static	int	lastNumber = -1;
@@ -725,10 +949,10 @@ void R_ScreenShotJPEG_f (void) {
 		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
 			R_ScreenshotFilenameJPEG( lastNumber, checkname );
 
-      if (!ri.FS_FileExists( checkname ))
-      {
-        break; // file doesn't exist
-      }
+	  if (!ri.FS_FileExists( checkname ))
+	  {
+		break; // file doesn't exist
+	  }
 		}
 
 		if ( lastNumber == 10000 ) {
@@ -748,85 +972,6 @@ void R_ScreenShotJPEG_f (void) {
 
 //============================================================================
 
-/*
-==================
-RB_TakeVideoFrameCmd
-==================
-*/
-const void *RB_TakeVideoFrameCmd( const void *data )
-{
-	const videoFrameCommand_t	*cmd;
-	byte				*cBuf;
-	size_t				memcount, linelen;
-	int				padwidth, avipadwidth, padlen, avipadlen;
-	GLint packAlign;
-	
-	cmd = (const videoFrameCommand_t *)data;
-	
-	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
-
-	linelen = cmd->width * 3;
-
-	// Alignment stuff for glReadPixels
-	padwidth = PAD(linelen, packAlign);
-	padlen = padwidth - linelen;
-	// AVI line padding
-	avipadwidth = PAD(linelen, AVI_LINE_PADDING);
-	avipadlen = avipadwidth - linelen;
-
-	cBuf = PADP(cmd->captureBuffer, packAlign);
-		
-	qglReadPixels(0, 0, cmd->width, cmd->height, GL_RGB,
-		GL_UNSIGNED_BYTE, cBuf);
-
-	memcount = padwidth * cmd->height;
-
-	// gamma correct
-	if(glConfig.deviceSupportsGamma)
-		R_GammaCorrect(cBuf, memcount);
-
-	if(cmd->motionJpeg)
-	{
-		memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, linelen * cmd->height,
-			r_aviMotionJpegQuality->integer,
-			cmd->width, cmd->height, cBuf, padlen);
-		ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, memcount);
-	}
-	else
-	{
-		byte *lineend, *memend;
-		byte *srcptr, *destptr;
-	
-		srcptr = cBuf;
-		destptr = cmd->encodeBuffer;
-		memend = srcptr + memcount;
-		
-		// swap R and B and remove line paddings
-		while(srcptr < memend)
-		{
-			lineend = srcptr + linelen;
-			while(srcptr < lineend)
-			{
-				*destptr++ = srcptr[2];
-				*destptr++ = srcptr[1];
-				*destptr++ = srcptr[0];
-				srcptr += 3;
-			}
-			
-			Com_Memset(destptr, '\0', avipadlen);
-			destptr += avipadlen;
-			
-			srcptr += padlen;
-		}
-		
-		ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, avipadwidth * cmd->height);
-	}
-
-	return (const void *)(cmd + 1);	
-}
-
-//============================================================================
-
 /*
 ** GL_SetDefaultState
 */
@@ -870,6 +1015,41 @@ void GL_SetDefaultState( void )
 	qglEnable( GL_SCISSOR_TEST );
 	qglDisable( GL_CULL_FACE );
 	qglDisable( GL_BLEND );
+
+	qglFogi(GL_FOG_MODE, GL_LINEAR);
+
+	glState.fFogColor[0] = 0.0;
+	glState.fFogColor[1] = 0.0;
+	glState.fFogColor[2] = 0.0;
+	glState.fFogColor[3] = 1.0;
+}
+
+/*
+==================
+PrintAndAppendString
+==================
+*/
+void PrintAndAppendString(char* string, size_t maxlen, char* fmt, ...) {
+	char msg[1024];
+	size_t len;
+	va_list va;
+
+	va_start(va, fmt);
+	Q_vsnprintf(msg, sizeof(msg), fmt, va);
+	va_end(va);
+
+	ri.Printf(PRINT_ALL, "%s", msg);
+
+	Q_strcat(string, maxlen, msg);
+}
+
+/*
+==================
+RE_GetGraphicsInfo
+==================
+*/
+const char* RE_GetGraphicsInfo() {
+	return infostring;
 }
 
 /*
@@ -879,7 +1059,7 @@ R_PrintLongString
 Workaround for ri.Printf's 1024 characters buffer limit.
 ================
 */
-void R_PrintLongString(const char *string) {
+void R_PrintLongString(char* dest, size_t destsize, const char *string) {
 	char buffer[1024];
 	const char *p;
 	int size = strlen(string);
@@ -888,19 +1068,19 @@ void R_PrintLongString(const char *string) {
 	while(size > 0)
 	{
 		Q_strncpyz(buffer, p, sizeof (buffer) );
-		ri.Printf( PRINT_ALL, "%s", buffer );
+		PrintAndAppendString( dest, destsize, "%s", buffer );
 		p += 1023;
 		size -= 1023;
 	}
 }
 
 /*
-================
-GfxInfo_f
-================
+==================
+BuildGfxInfo
+==================
 */
-void GfxInfo_f( void ) 
-{
+void BuildGfxInfo(char* dest, size_t destsize) {
+	cvar_t *sys_cpustring = ri.Cvar_Get( "sys_cpustring", "", 0 );
 	const char *enablestrings[] =
 	{
 		"disabled",
@@ -912,10 +1092,10 @@ void GfxInfo_f( void )
 		"fullscreen"
 	};
 
-	ri.Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
-	ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
-	ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
-	ri.Printf( PRINT_ALL, "GL_EXTENSIONS: " );
+	PrintAndAppendString( dest, destsize, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
+	PrintAndAppendString( dest, destsize, "GL_RENDERER: %s\n", glConfig.renderer_string );
+	PrintAndAppendString( dest, destsize, "GL_VERSION: %s\n", glConfig.version_string );
+	PrintAndAppendString( dest, destsize, "GL_EXTENSIONS: " );
 	// glConfig.extensions_string is a limited length so get the full list directly
 	if ( qglGetStringi )
 	{
@@ -925,41 +1105,42 @@ void GfxInfo_f( void )
 		qglGetIntegerv( GL_NUM_EXTENSIONS, &numExtensions );
 		for ( i = 0; i < numExtensions; i++ )
 		{
-			ri.Printf( PRINT_ALL, "%s ", qglGetStringi( GL_EXTENSIONS, i ) );
+			PrintAndAppendString( dest, destsize, "%s ", qglGetStringi( GL_EXTENSIONS, i ) );
 		}
 	}
 	else
 	{
-		R_PrintLongString( (char *) qglGetString( GL_EXTENSIONS ) );
+		R_PrintLongString( dest, destsize, (char *) qglGetString( GL_EXTENSIONS ) );
 	}
-	ri.Printf( PRINT_ALL, "\n" );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
-	ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
-	ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
+	PrintAndAppendString( dest, destsize, "\n" );
+	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
+	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
+	PrintAndAppendString( dest, destsize, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
+	PrintAndAppendString( dest, destsize, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
 	if ( glConfig.displayFrequency )
 	{
-		ri.Printf( PRINT_ALL, "%d\n", glConfig.displayFrequency );
+		PrintAndAppendString( dest, destsize, "%d\n", glConfig.displayFrequency );
 	}
 	else
 	{
-		ri.Printf( PRINT_ALL, "N/A\n" );
+		PrintAndAppendString( dest, destsize, "N/A\n" );
 	}
 	if ( glConfig.deviceSupportsGamma )
 	{
-		ri.Printf( PRINT_ALL, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
+		PrintAndAppendString( dest, destsize, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
 	}
 	else
 	{
-		ri.Printf( PRINT_ALL, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
+		PrintAndAppendString( dest, destsize, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
 	}
+	PrintAndAppendString( dest, destsize, "CPU: %s\n", sys_cpustring->string );
 
 	// rendering primitives
 	{
 		int		primitives;
 
 		// default is to use triangles if compiled vertex arrays are present
-		ri.Printf( PRINT_ALL, "rendering primitives: " );
+		PrintAndAppendString( dest, destsize, "rendering primitives: " );
 		primitives = r_primitives->integer;
 		if ( primitives == 0 ) {
 			if ( qglLockArraysEXT ) {
@@ -969,40 +1150,95 @@ void GfxInfo_f( void )
 			}
 		}
 		if ( primitives == -1 ) {
-			ri.Printf( PRINT_ALL, "none\n" );
+			PrintAndAppendString( dest, destsize, "none\n" );
 		} else if ( primitives == 2 ) {
-			ri.Printf( PRINT_ALL, "single glDrawElements\n" );
+			PrintAndAppendString( dest, destsize, "single glDrawElements\n" );
 		} else if ( primitives == 1 ) {
-			ri.Printf( PRINT_ALL, "multiple glArrayElement\n" );
+			PrintAndAppendString( dest, destsize, "multiple glArrayElement\n" );
 		} else if ( primitives == 3 ) {
-			ri.Printf( PRINT_ALL, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
+			PrintAndAppendString( dest, destsize, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
 		}
 	}
 
-	ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
-	ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
-	ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
-	ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
-	ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
-	ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
-	ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
+	PrintAndAppendString( dest, destsize, "texturemode: %s\n", r_textureMode->string );
+	PrintAndAppendString( dest, destsize, "picmip: %d\n", r_picmip->integer );
+	PrintAndAppendString( dest, destsize, "texture bits: %d\n", r_texturebits->integer );
+	PrintAndAppendString( dest, destsize, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
+	PrintAndAppendString( dest, destsize, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
+	PrintAndAppendString( dest, destsize, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
+	PrintAndAppendString( dest, destsize, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
 	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 )
 	{
-		ri.Printf( PRINT_ALL, "HACK: using vertex lightmap approximation\n" );
+		PrintAndAppendString( dest, destsize, "HACK: using vertex lightmap approximation\n" );
 	}
 	if ( glConfig.hardwareType == GLHW_RAGEPRO )
 	{
-		ri.Printf( PRINT_ALL, "HACK: ragePro approximations\n" );
+		PrintAndAppendString( dest, destsize, "HACK: ragePro approximations\n" );
 	}
 	if ( glConfig.hardwareType == GLHW_RIVA128 )
 	{
-		ri.Printf( PRINT_ALL, "HACK: riva128 approximations\n" );
+		PrintAndAppendString( dest, destsize, "HACK: riva128 approximations\n" );
+	}
+	if ( glConfig.smpActive ) {
+		PrintAndAppendString( dest, destsize, "Using dual processor acceleration\n" );
 	}
 	if ( r_finish->integer ) {
-		ri.Printf( PRINT_ALL, "Forcing glFinish\n" );
+		PrintAndAppendString( dest, destsize, "Forcing glFinish\n" );
 	}
 }
 
+/*
+================
+GfxInfo_f
+================
+*/
+void GfxInfo_f( void ) 
+{
+	BuildGfxInfo(infostring, sizeof(infostring));
+	ri.Cvar_Set("r_gfxinfo", infostring);
+}
+
+/*
+==================
+FarPlaneInfo_f
+==================
+*/
+void FarPlaneInfo_f(void) {
+	Com_Printf("Current fog settings:\n");
+	Com_Printf("Distance: %i\n", (int)tr.viewParms.farplane_distance);
+	Com_Printf(
+		"Color: %f  %f  %f\n",
+		tr.viewParms.farplane_color[0],
+		tr.viewParms.farplane_color[1],
+		tr.viewParms.farplane_color[2]);
+	if (tr.viewParms.farplane_cull) {
+		Com_Printf("Cull: on\n");
+	} else {
+		Com_Printf("Cull: off\n");
+	}
+}
+
+/*
+==================
+R_SetMode
+==================
+*/
+qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
+    // FIXME: unimplemented
+	ri.Printf(PRINT_WARNING, "R_SetMode is unimplemented. To change the video mode, set the \"r_mode\" variable and execute the \"vid_restart\" command.\n");
+	return qfalse;
+}
+
+/*
+==================
+R_SetFullscreen
+==================
+*/
+void R_SetFullscreen(qboolean fullscreen) {
+    // FIXME: unimplemented
+    ri.Printf(PRINT_WARNING, "R_SetFullscreen is unimplemented. To change the fullscreen mode, set the \"r_fullscreen\" variable and execute the \"vid_restart\" command.\n");
+}
+
 /*
 ===============
 R_Register
@@ -1010,104 +1246,146 @@ R_Register
 */
 void R_Register( void ) 
 {
-	#ifdef USE_RENDERER_DLOPEN
-	com_altivec = ri.Cvar_Get("com_altivec", "1", CVAR_ARCHIVE);
-	#endif	
-
 	//
 	// latched and archived variables
 	//
+	r_glDriver = ri.Cvar_Get( "r_glDriver", OPENGL_DRIVER_NAME, CVAR_ARCHIVE | CVAR_LATCH );
 	r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compressed_textures", "0", CVAR_ARCHIVE | CVAR_LATCH );
+	r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE | CVAR_LATCH);
+#ifdef __linux__ // broken on linux
+	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "0", CVAR_ARCHIVE | CVAR_LATCH);
+#else
 	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE | CVAR_LATCH);
-
-	r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic",
-			"0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_max_anisotropy = ri.Cvar_Get( "r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH );
+#endif
+	r_ext_texture_env_combine = ri.Cvar_Get("r_ext_texture_env_combine", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_max_anisotropy = ri.Cvar_Get("r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH);
+	r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ROM);
+	r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
+	r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
 
 	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
-	ri.Cvar_CheckRange( r_picmip, 0, 16, qtrue );
-	r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE | CVAR_LATCH );
+	AssertCvarRange( r_picmip, 0, 16, qtrue );
+	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
 	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
+	r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH );
+#ifdef __linux__
+	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
+#else
 	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH );
-	r_depthbits = ri.Cvar_Get( "r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_multisample = ri.Cvar_Get( "r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
-	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
+#endif
+	r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
-	r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE );
-	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_maxmode = ri.Cvar_Get("r_maxmode", "6", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmode1024 = ri.Cvar_Get("r_vidmode1024", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmodemax = ri.Cvar_Get("r_vidmodemax", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
+	
+	// Added in 2.0
+	//  But removed because it's kind of annoying
+	//if (r_mode->integer > r_maxmode->integer)
+	//{
+	//	char buf[8];
+	//
+	//	Com_sprintf(buf, sizeof(buf), "%d", r_maxmode->integer);
+	//	ri.Cvar_Set("r_mode", buf);
+	//	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
+	//}
+	r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
 	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
-	r_customPixelAspect = ri.Cvar_Get( "r_customPixelAspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_uiFullScreen = ri.Cvar_Get( "r_uifullscreen", "0", 0);
-	r_subdivisions = ri.Cvar_Get ("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
-	r_stereoEnabled = ri.Cvar_Get( "r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_ignoreFastPath = ri.Cvar_Get( "r_ignoreFastPath", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_greyscale = ri.Cvar_Get("r_greyscale", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	ri.Cvar_CheckRange(r_greyscale, 0, 1, qfalse);
+	r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
+	r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
+#if (defined(MACOS_X) || defined(__linux__)) && defined(SMP)
+  // Default to using SMP on Mac OS X or Linux if we have multiple processors
+	r_smp = ri.Cvar_Get( "r_smp", Sys_ProcessorCount() > 1 ? "1" : "0", CVAR_ARCHIVE | CVAR_LATCH);
+#else		
+	r_smp = ri.Cvar_Get( "r_smp", "0", CVAR_ARCHIVE | CVAR_LATCH);
+#endif
+	r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
 
 	//
 	// temporary latched variables that can only change over a restart
 	//
 	r_displayRefresh = ri.Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH );
-	ri.Cvar_CheckRange( r_displayRefresh, 0, 200, qtrue );
+	AssertCvarRange( r_displayRefresh, 0, 200, qtrue );
 	r_fullbright = ri.Cvar_Get ("r_fullbright", "0", CVAR_LATCH|CVAR_CHEAT );
-	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "2", CVAR_LATCH );
+	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "1", CVAR_LATCH );
 	r_intensity = ri.Cvar_Get ("r_intensity", "1", CVAR_LATCH );
+	r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
 	r_singleShader = ri.Cvar_Get ("r_singleShader", "0", CVAR_CHEAT | CVAR_LATCH );
 
 	//
 	// archived variables that can change at any time
 	//
+	r_lerpmodels = ri.Cvar_Get("r_lerpmodels", "1", 0);
 	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE|CVAR_CHEAT );
-	r_lodbias = ri.Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE );
 	r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE );
 	r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT );
-	ri.Cvar_CheckRange( r_znear, 0.001f, 200, qfalse );
-	r_zproj = ri.Cvar_Get( "r_zproj", "64", CVAR_ARCHIVE );
-	r_stereoSeparation = ri.Cvar_Get( "r_stereoSeparation", "64", CVAR_ARCHIVE );
+	AssertCvarRange( r_znear, 0.001f, 200, qtrue );
 	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
-	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE );
-	r_inGameVideo = ri.Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE );
+	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", 0 );
+	r_fastdlights = ri.Cvar_Get("r_fastdlights", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE );
-	r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE );
 	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
 	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
-	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE );
-	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0",
-					CVAR_ARCHIVE | CVAR_LATCH );
+	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE );
+	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE );
 	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
 	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
 
-	r_railWidth = ri.Cvar_Get( "r_railWidth", "16", CVAR_ARCHIVE );
-	r_railCoreWidth = ri.Cvar_Get( "r_railCoreWidth", "6", CVAR_ARCHIVE );
-	r_railSegmentLength = ri.Cvar_Get( "r_railSegmentLength", "32", CVAR_ARCHIVE );
-
 	r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE );
 
 	r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT );
 	r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT );
 
-	r_anaglyphMode = ri.Cvar_Get("r_anaglyphMode", "0", CVAR_ARCHIVE);
-
 	//
 	// temporary variables that can change at any time
 	//
 	r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_TEMP );
+	r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
+	r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
+	r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
+	lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
+	lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
+	lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
+	lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
+	lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
+	lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
+	lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
+	lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
+	lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
+	lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
+	lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
+	lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
+	lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
+	lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
+	lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
+	lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
+	lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
+	lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
+	lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
+	lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
+	lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
+	lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
+	lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
+	lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
+	lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
+	lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
+	lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
+	lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
+	lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
 
-	r_debugLight = ri.Cvar_Get( "r_debuglight", "0", CVAR_TEMP );
 	r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT );
 	r_printShaders = ri.Cvar_Get( "r_printShaders", "0", 0 );
-	r_saveFontData = ri.Cvar_Get( "r_saveFontData", "0", 0 );
 
 	r_nocurves = ri.Cvar_Get ("r_nocurves", "0", CVAR_CHEAT );
 	r_drawworld = ri.Cvar_Get ("r_drawworld", "1", CVAR_CHEAT );
@@ -1116,16 +1394,29 @@ void R_Register( void )
 
 	r_flareSize = ri.Cvar_Get ("r_flareSize", "40", CVAR_CHEAT);
 	r_flareFade = ri.Cvar_Get ("r_flareFade", "7", CVAR_CHEAT);
-	r_flareCoeff = ri.Cvar_Get ("r_flareCoeff", FLARE_STDCOEFF, CVAR_CHEAT);
 
+	r_showSmp = ri.Cvar_Get ("r_showSmp", "0", CVAR_CHEAT);
 	r_skipBackEnd = ri.Cvar_Get ("r_skipBackEnd", "0", CVAR_CHEAT);
 
 	r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT );
-	r_lodscale = ri.Cvar_Get( "r_lodscale", "5", CVAR_CHEAT );
-	r_norefresh = ri.Cvar_Get ("r_norefresh", "0", CVAR_CHEAT);
-	r_drawentities = ri.Cvar_Get ("r_drawentities", "1", CVAR_CHEAT );
+	r_norefresh = ri.Cvar_Get("r_norefresh", "0", CVAR_CHEAT);
+	r_drawentities = ri.Cvar_Get("r_drawentities", "1", CVAR_CHEAT);
+	r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
+	r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
+	r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
+	r_drawbrushes = ri.Cvar_Get("r_drawbrushes", "1", CVAR_CHEAT);
+	r_drawbrushmodels = ri.Cvar_Get("r_drawbrushmodels", "1", CVAR_CHEAT);
+	r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
+	r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
+	r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
+	r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
+	r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
+	r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
+	r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
+	r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
 	r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT );
 	r_nocull = ri.Cvar_Get ("r_nocull", "0", CVAR_CHEAT);
+	r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
 	r_novis = ri.Cvar_Get ("r_novis", "0", CVAR_CHEAT);
 	r_showcluster = ri.Cvar_Get ("r_showcluster", "0", CVAR_CHEAT);
 	r_speeds = ri.Cvar_Get ("r_speeds", "0", CVAR_CHEAT);
@@ -1136,21 +1427,75 @@ void R_Register( void )
 	r_showtris = ri.Cvar_Get ("r_showtris", "0", CVAR_CHEAT);
 	r_showsky = ri.Cvar_Get ("r_showsky", "0", CVAR_CHEAT);
 	r_shownormals = ri.Cvar_Get ("r_shownormals", "0", CVAR_CHEAT);
+	r_showhbox = ri.Cvar_Get("r_showhbox", "0", CVAR_CHEAT);
+	r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
 	r_clear = ri.Cvar_Get ("r_clear", "0", CVAR_CHEAT);
 	r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT );
 	r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT );
 	r_drawBuffer = ri.Cvar_Get( "r_drawBuffer", "GL_BACK", CVAR_CHEAT );
 	r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", CVAR_CHEAT);
 	r_noportals = ri.Cvar_Get ("r_noportals", "0", CVAR_CHEAT);
+	r_entlightmap = ri.Cvar_Get("r_entlightmap", "0", CVAR_CHEAT);
+	r_fastentlight = ri.Cvar_Get("r_fastentlight", "1", CVAR_ARCHIVE);
+	r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
+	r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
+	r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
+	r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
+	r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
 	r_shadows = ri.Cvar_Get( "cg_shadows", "1", 0 );
 
-	r_marksOnTriangleMeshes = ri.Cvar_Get("r_marksOnTriangleMeshes", "0", CVAR_ARCHIVE);
-
-	r_aviMotionJpegQuality = ri.Cvar_Get("r_aviMotionJpegQuality", "90", CVAR_ARCHIVE);
-	r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
-
 	r_maxpolys = ri.Cvar_Get( "r_maxpolys", va("%d", MAX_POLYS), 0);
 	r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", va("%d", MAX_POLYVERTS), 0);
+	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
+
+	r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
+	r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
+	r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
+	r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
+	r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_CHEAT | CVAR_ARCHIVE);
+	r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
+	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
+	r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
+	r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
+	r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
+	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
+	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
+	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
+	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
+	r_useglfog = ri.Cvar_Get("r_useglfog", "1", 64);
+	r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
+	r_smoothsmokelight = ri.Cvar_Get("vss_smoothsmokelight", "1", CVAR_ARCHIVE);
+	r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
+	sys_cpuid = ri.Cvar_Get("sys_cpuid", "0", 0);
+	r_sse = ri.Cvar_Get("r_sse", "0", CVAR_ARCHIVE);
+	r_static_shaderdata0 = ri.Cvar_Get("r_static_shaderdata0", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata1 = ri.Cvar_Get("r_static_shaderdata1", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata2 = ri.Cvar_Get("r_static_shaderdata2", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata3 = ri.Cvar_Get("r_static_shaderdata3", "0", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier0 = ri.Cvar_Get("r_static_shadermultiplier0", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
+	r_precacheimages = (cvar_t*)Cvar_Get("r_precacheimages", "0", 0);
+	ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
+	ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
+	r_alpha_foliage1 = ri.Cvar_Get("r_alpha_foliage1", "0.75", CVAR_CHEAT);
+	r_alpha_foliage2 = ri.Cvar_Get("r_alpha_foliage2", "0.75", CVAR_CHEAT);
+	r_blendtrees = ri.Cvar_Get("r_blendtrees", "0", CVAR_LATCH);
+	r_blendbushes = ri.Cvar_Get("r_blendbushes", "0", CVAR_LATCH);
+	fps = ri.Cvar_Get("fps", "0", 0);
+	r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
+	r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
+
+	r_ext_multisample = ri.Cvar_Get("r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_texture_filter_anisotropic = ri.Cvar_Get("r_ext_texture_filter_anisotropic",
+		"0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_stereoEnabled = ri.Cvar_Get("r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
 
 	// make sure all the commands added here are also
 	// removed in R_Shutdown
@@ -1162,7 +1507,33 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
 	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
 	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
-	ri.Cmd_AddCommand( "minimize", GLimp_Minimize );
+	ri.Cmd_AddCommand( "farplane_info", FarPlaneInfo_f );
+	ri.Cmd_AddCommand( "r_infostaticmodels", R_InfoStaticModels_f );
+	ri.Cmd_AddCommand( "r_infoworldtris", R_InfoWorldTris_f );
+
+	//
+	// Added in OPM
+	//
+
+    r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+    r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
+
+	ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
+}
+
+void R_InitExtensions() {
+	// FIXME: qglTextureEnvCombineExists
+	glState.cntTexEnvExt = 0;
+	glState.cntnvblendmode = 0;
+
+	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, 34165.0);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, 8448.0);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, 0x47057700);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, 0x44400000);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 5890.0);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, 0x44400000);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, 0x47057700);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, 770.0);
 }
 
 /*
@@ -1182,16 +1553,18 @@ void R_Init( void ) {
 	Com_Memset( &backEnd, 0, sizeof( backEnd ) );
 	Com_Memset( &tess, 0, sizeof( tess ) );
 
-	if(sizeof(glconfig_t) != 11332)
-		ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t) == %u != 11332", (unsigned int) sizeof(glconfig_t));
-
 //	Swap_Init();
 
 	if ( (intptr_t)tess.xyz & 15 ) {
-		ri.Printf( PRINT_WARNING, "tess.xyz not 16 byte aligned\n" );
+		Com_Printf( "WARNING: tess.xyz not 16 byte aligned\n" );
 	}
 	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );
 
+	tr.worldEntity.e.shaderRGBA[0] = -1;
+	tr.worldEntity.e.shaderRGBA[1] = 0;
+	tr.worldEntity.e.shaderRGBA[2] = -1;
+	tr.worldEntity.e.shaderRGBA[3] = -1;
+
 	//
 	// init function tables
 	//
@@ -1219,10 +1592,16 @@ void R_Init( void ) {
 		}
 	}
 
-	R_InitFogTable();
+	tr.rendererhandle = ri.Milliseconds();
+
+	if (!tr.rendererhandle) {
+		tr.rendererhandle = -1;
+	}
 
 	R_NoiseInit();
 
+	R_Sky_Init();
+
 	R_Register();
 
 	max_polys = r_maxpolys->integer;
@@ -1233,31 +1612,50 @@ void R_Init( void ) {
 	if (max_polyverts < MAX_POLYVERTS)
 		max_polyverts = MAX_POLYVERTS;
 
-	ptr = ri.Hunk_Alloc( sizeof( *backEndData ) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts, h_low);
-	backEndData = (backEndData_t *) ptr;
-	backEndData->polys = (srfPoly_t *) ((char *) ptr + sizeof( *backEndData ));
-	backEndData->polyVerts = (polyVert_t *) ((char *) ptr + sizeof( *backEndData ) + sizeof(srfPoly_t) * max_polys);
-	R_InitNextFrame();
+	max_termarks = r_maxtermarks->integer;
+	if (max_termarks < MAX_TERMARKS)
+		max_termarks = MAX_TERMARKS;
+
+	ptr = ri.Malloc(sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
+	backEndData[0] = (backEndData_t*)ptr;
+	backEndData[0]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[0]));
+	backEndData[0]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys);
+	backEndData[0]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+	backEndData[0]->staticModels = NULL;
+	backEndData[0]->staticModelData = NULL;
+	if (r_smp->integer) {
+		ptr = ri.Malloc(sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+		backEndData[1] = (backEndData_t*)ptr;
+		backEndData[1]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[1]));
+		backEndData[1]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys);
+		backEndData[1]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+		backEndData[1]->staticModels = NULL;
+		backEndData[1]->staticModelData = NULL;
+	}
+	else {
+		backEndData[1] = NULL;
+	}
+	R_ToggleSmpFrame();
 
 	InitOpenGL();
 
+	R_InitExtensions();
+
 	R_InitImages();
 
-	R_InitShaders();
-
-	R_InitSkins();
+	R_StartupShaders();
 
 	R_ModelInit();
 
-	R_InitFreeType();
+	R_LevelMarksInit();
 
+	tr.pFontDebugStrings = R_LoadFont("verdana-14");
+	g_bInfoworldtris = qfalse;
 
 	err = qglGetError();
 	if ( err != GL_NO_ERROR )
 		ri.Printf (PRINT_ALL, "glGetError() = 0x%x\n", err);
 
-	// print info
-	GfxInfo_f();
 	ri.Printf( PRINT_ALL, "----- finished R_Init -----\n" );
 }
 
@@ -1270,24 +1668,23 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
 	ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
 
-	ri.Cmd_RemoveCommand( "imagelist" );
-	ri.Cmd_RemoveCommand( "shaderlist" );
-	ri.Cmd_RemoveCommand( "skinlist" );
-	ri.Cmd_RemoveCommand( "modellist" );
+	ri.Cmd_RemoveCommand ("modellist");
+	ri.Cmd_RemoveCommand ("screenshotJPEG");
+	ri.Cmd_RemoveCommand ("screenshot");
+	ri.Cmd_RemoveCommand ("imagelist");
+	ri.Cmd_RemoveCommand ("shaderlist");
+	ri.Cmd_RemoveCommand ("skinlist");
+	ri.Cmd_RemoveCommand ("gfxinfo");
 	ri.Cmd_RemoveCommand( "modelist" );
-	ri.Cmd_RemoveCommand( "screenshot" );
-	ri.Cmd_RemoveCommand( "screenshotJPEG" );
-	ri.Cmd_RemoveCommand( "gfxinfo" );
-	ri.Cmd_RemoveCommand( "minimize" );
+	ri.Cmd_RemoveCommand( "shaderstate" );
 
 
 	if ( tr.registered ) {
-		R_IssuePendingRenderCommands();
+		R_SyncRenderThread();
+		R_ShutdownCommandBuffers();
 		R_DeleteTextures();
 	}
 
-	R_DoneFreeType();
-
 	// shut down platform specific OpenGL stuff
 	if ( destroyWindow ) {
 		GLimp_Shutdown();
@@ -1304,6 +1701,43 @@ void RE_Shutdown( qboolean destroyWindow ) {
 	tr.registered = qfalse;
 }
 
+extern qboolean scr_initialized;
+
+/*
+** RE_BeginRegistration
+*/
+void RE_BeginRegistration(glconfig_t* glconfigOut) {
+
+	UI_LoadResource("*123");
+	scr_initialized = 0;
+
+	R_SyncRenderThread();
+
+	R_LevelMarksFree();
+	ri.Hunk_Clear();
+
+	*glconfigOut = glConfig;
+
+	r_sequencenumber++;
+	tr.viewCluster = -1;		// force markleafs to regenerate
+	R_ClearFlares();
+	RE_ClearScene();
+
+	// Added in OPM
+	//  Clear the world because some components
+	//  like the mark system access the world object
+	//  to free allocated marks
+	R_ClearWorld();
+
+	R_SetupShaders();
+	R_InitLensFlare();
+	R_LevelMarksInit();
+
+	tr.registered = qtrue;
+
+	scr_initialized = 1;
+	UI_LoadResource("*124");
+}
 
 /*
 =============
@@ -1313,12 +1747,31 @@ Touch all images to make sure they are resident
 =============
 */
 void RE_EndRegistration( void ) {
-	R_IssuePendingRenderCommands();
-	if (!ri.Sys_LowPhysicalMemory()) {
-		RB_ShowImages();
+	R_SyncRenderThread();
+	if (r_precacheimages->integer) {
+		int start, end;
+
+		start = Sys_Milliseconds();
+
+		RB_ShowImages(qtrue);
+
+		end = Sys_Milliseconds();
+
+		Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
+
+	R_FreeUnusedImages();
 }
 
+/*
+=============
+RE_SetRenderTime
+=============
+*/
+void RE_SetRenderTime(int t) {
+	backEnd.refdef.floatTime = (long double)t / 1000.0;
+	R_UpdateGhostTextures();
+}
 
 /*
 @@@@@@@@@@@@@@@@@@@@@
@@ -1326,12 +1779,7 @@ GetRefAPI
 
 @@@@@@@@@@@@@@@@@@@@@
 */
-#ifdef USE_RENDERER_DLOPEN
-Q_EXPORT refexport_t* QDECL GetRefAPI ( int apiVersion, refimport_t *rimp ) {
-#else
 refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
-#endif
-
 	static refexport_t	re;
 
 	ri = *rimp;
@@ -1344,45 +1792,85 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 		return NULL;
 	}
 
+	R_Init();
+
 	// the RE_ functions are Renderer Entry points
 
 	re.Shutdown = RE_Shutdown;
 
+	re.FreeModels = RE_FreeModels;
 	re.BeginRegistration = RE_BeginRegistration;
+	re.EndRegistration = RE_EndRegistration;
 	re.RegisterModel = RE_RegisterModel;
-	re.RegisterSkin = RE_RegisterSkin;
+	re.SpawnEffectModel = RE_SpawnEffectModel;
+	re.RegisterServerModel = RE_RegisterServerModel;
+	re.UnregisterServerModel = RE_UnregisterServerModel;
 	re.RegisterShader = RE_RegisterShader;
 	re.RegisterShaderNoMip = RE_RegisterShaderNoMip;
+	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
 	re.LoadWorld = RE_LoadWorldMap;
+	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
+	re.MapVersion = RE_MapVersion;
+	re.LoadFont = R_LoadFont;
 	re.SetWorldVisData = RE_SetWorldVisData;
-	re.EndRegistration = RE_EndRegistration;
 
 	re.BeginFrame = RE_BeginFrame;
 	re.EndFrame = RE_EndFrame;
 
 	re.MarkFragments = R_MarkFragments;
-	re.LerpTag = R_LerpTag;
+	re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
+	re.GetInlineModelBounds = R_GetInlineModelBounds;
+	re.GetLightingForDecal = R_GetLightingForDecal;
+	re.GetLightingForSmoke = R_GetLightingForSmoke;
+	re.R_GatherLightSources = R_GatherLightSources;
 	re.ModelBounds = R_ModelBounds;
+	re.ModelRadius = R_ModelRadius;
 
 	re.ClearScene = RE_ClearScene;
 	re.AddRefEntityToScene = RE_AddRefEntityToScene;
+	re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
 	re.AddPolyToScene = RE_AddPolyToScene;
-	re.LightForPoint = R_LightForPoint;
+	re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
 	re.AddLightToScene = RE_AddLightToScene;
-	re.AddAdditiveLightToScene = RE_AddAdditiveLightToScene;
 	re.RenderScene = RE_RenderScene;
+	re.GetRenderEntity = RE_GetRenderEntity;
 
-	re.SetColor = RE_SetColor;
-	re.DrawStretchPic = RE_StretchPic;
+	re.SavePerformanceCounters = R_SavePerformanceCounters;
+
+	re.R_Model_GetHandle = R_Model_GetHandle;
+	re.SetColor = Draw_SetColor;
+	re.DrawStretchPic = Draw_StretchPic;
+	re.DrawStretchPic2 = Draw_StretchPic2;
 	re.DrawStretchRaw = RE_StretchRaw;
-	re.UploadCinematic = RE_UploadCinematic;
+	re.DebugLine = R_DebugLine;
+	re.DrawTilePic = Draw_TilePic;
+	re.DrawTilePicOffset = Draw_TilePicOffset;
+	re.DrawTrianglePic = Draw_TrianglePic;
+	re.DrawBox = DrawBox;
+	re.AddBox = AddBox;
+	re.Set2DWindow = Set2DWindow;
+	re.Scissor = RE_Scissor;
+	re.DrawLineLoop = DrawLineLoop;
+	re.DrawString = R_DrawString;
+	re.GetFontHeight = R_GetFontHeight;
+	re.GetFontStringWidth = R_GetFontStringWidth;
+	re.SwipeBegin = RE_SwipeBegin;
+	re.SwipeEnd = RE_SwipeEnd;
+	re.SetRenderTime = RE_SetRenderTime;
+	re.Noise = R_NoiseGet4f;
 
-	re.RegisterFont = RE_RegisterFont;
-	re.RemapShader = R_RemapShader;
-	re.GetEntityToken = R_GetEntityToken;
-	re.inPVS = R_inPVS;
+	re.SetMode = R_SetMode;
+	re.SetFullscreen = R_SetFullscreen;
 
-	re.TakeVideoFrame = RE_TakeVideoFrame;
+	re.GetShaderHeight = RE_GetShaderHeight;
+	re.GetShaderWidth = RE_GetShaderWidth;
+	re.GetShaderName = RE_GetShaderName;
+	re.GetModelName = RE_GetModelName;
+	re.GetGraphicsInfo = RE_GetGraphicsInfo;
+	re.ForceUpdatePose = RE_ForceUpdatePose;
+	re.TIKI_Orientation = RE_TIKI_Orientation;
+	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
+	re.SetFrameNumber = RE_SetFrameNumber;
 
 	return &re;
 }
diff --git a/code/renderergl1/tr_light.c b/code/renderergl1/tr_light.c
index 3eac0535..7d076f34 100644
--- a/code/renderergl1/tr_light.c
+++ b/code/renderergl1/tr_light.c
@@ -1,21 +1,21 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2015-2024 the OpenMoHAA team
 
-This file is part of Quake III Arena source code.
+This file is part of OpenMoHAA source code.
 
-Quake III Arena source code is free software; you can redistribute it
+OpenMoHAA source code is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Quake III Arena source code is distributed in the hope that it will be
+OpenMoHAA source code is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -23,12 +23,637 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-#define	DLIGHT_AT_RADIUS		16
+#define DLIGHT_AT_RADIUS 16
 // at the edge of a dlight's influence, this amount of light will be added
 
-#define	DLIGHT_MINIMUM_RADIUS	16		
+#define DLIGHT_MINIMUM_RADIUS 16
+
 // never calculate a range less than this to prevent huge light numbers
 
+typedef struct {
+    dlight_t *dl;
+    float     power;
+    vec3_t    origin;
+} incidentLight_t;
+
+typedef struct {
+    int             dlightMap;
+    int             allocated[LIGHTMAP_SIZE];
+    byte            lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
+    byte           *srcBase;
+    byte           *dstBase;
+    incidentLight_t lights[32];
+    int             numLights;
+} dlightInfo_t;
+
+typedef struct {
+    vec3_t point;
+    int    s;
+    int    t;
+} patchLightBlock_t;
+
+dlightInfo_t dli;
+
+void     R_SetupEntityLightingGrid(trRefEntity_t *ent);
+qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst);
+qboolean R_AllocLMBlock(int w, int h, int *x, int *y);
+
+/*
+===============
+R_RecursiveDlightPatch
+===============
+*/
+static int R_RecursiveDlightPatch(patchLightBlock_t *plb)
+{
+    patchLightBlock_t cut[4];
+    qboolean          added;
+    int               index;
+
+    if (plb[0].s < plb[1].s - 1) {
+        cut[0] = plb[0];
+        cut[2] = plb[2];
+
+        VectorAdd(plb[0].point, plb[1].point, cut[1].point);
+        VectorScale(cut[1].point, 0.5f, cut[1].point);
+        VectorAdd(plb[2].point, plb[3].point, cut[3].point);
+        VectorScale(cut[3].point, 0.5f, cut[3].point);
+
+        cut[3].s = (plb[0].s + plb[1].s) >> 1;
+        cut[1].s = cut[3].s;
+        cut[1].t = plb[0].t;
+        cut[3].t = plb[2].t;
+
+        added = R_RecursiveDlightPatch(cut);
+
+        cut[0] = cut[1];
+        cut[2] = cut[3];
+
+        index = 1;
+    } else if (plb[0].t < plb[2].t - 1) {
+        cut[0] = plb[0];
+        cut[1] = plb[1];
+
+        VectorAdd(plb[0].point, plb[2].point, cut[2].point);
+        VectorScale(cut[2].point, 0.5f, cut[2].point);
+        VectorAdd(plb[1].point, plb[3].point, cut[3].point);
+        VectorScale(cut[3].point, 0.5f, cut[3].point);
+
+        cut[3].t = (plb[0].t + plb[2].t) >> 1;
+        cut[2].t = cut[3].t;
+        cut[2].s = plb[0].s;
+        cut[3].s = plb[1].s;
+
+        added  = R_RecursiveDlightPatch(cut);
+        cut[0] = cut[2];
+        cut[1] = cut[3];
+
+        index = 2;
+    } else {
+        return R_DlightSample(
+            &dli.srcBase[plb[0].t * (LIGHTMAP_SIZE * 3) + plb[0].s * 3],
+            plb[0].point,
+            &dli.dstBase[plb[0].t * (LIGHTMAP_SIZE * 4) + plb[0].s * 4]
+        );
+    }
+
+    cut[index] = plb[index];
+    cut[3]     = plb[3];
+
+    return R_RecursiveDlightPatch(cut) + added;
+}
+
+/*
+===============
+R_RealDlightPatch
+===============
+*/
+int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
+{
+    int         x, y;
+    int         i, j;
+    int         i2, j2;
+    int         steps[2][2];
+    dlight_t   *dl;
+    qboolean    added;
+    float      *origin;
+    drawVert_t *dv;
+
+    if (!srf->lmHeight || !srf->lmWidth) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    dli.numLights = 0;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        if (!(dlightBits & (1 << i))) {
+            continue;
+        }
+
+        dl = &tr.refdef.dlights[i];
+        if (dl->origin[0] + dl->radius < srf->meshBounds[0][0] || dl->origin[0] - dl->radius > srf->meshBounds[1][0]
+            || dl->origin[1] + dl->radius < srf->meshBounds[0][1] || dl->origin[1] - dl->radius > srf->meshBounds[1][1]
+            || dl->origin[2] + dl->radius < srf->meshBounds[0][2]
+            || dl->origin[2] - dl->radius > srf->meshBounds[1][2]) {
+            dlightBits &= ~(1 << i);
+            continue;
+        }
+
+        VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
+        dli.lights[dli.numLights].dl    = dl;
+        dli.lights[dli.numLights].power = 1.f / dl->radius;
+        dli.numLights++;
+    }
+
+    if (!dli.numLights) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    dli.srcBase = srf->lmData;
+    dli.dstBase = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
+    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
+
+    added = qfalse;
+
+    if (srf->verts[srf->width - 1].lightmap[0] != srf->verts[0].lightmap[0]) {
+        if (srf->verts[srf->width - 1].lightmap[0] < srf->verts[0].lightmap[0]) {
+            steps[0][0] = 0;
+            steps[0][1] = -1;
+        } else {
+            steps[0][0] = 0;
+            steps[0][1] = 1;
+        }
+
+        if (srf->verts[srf->width * (srf->height - 1)].lightmap[1] < srf->verts[0].lightmap[1]) {
+            steps[1][0] = -1;
+            steps[1][1] = 0;
+        } else {
+            steps[1][0] = 1;
+            steps[1][1] = 0;
+        }
+    } else {
+        if (srf->verts[srf->width * (srf->height - 1)].lightmap[0] < srf->verts[0].lightmap[0]) {
+            steps[0][0] = -1;
+            steps[0][1] = 0;
+        } else {
+            steps[0][0] = 1;
+            steps[0][1] = 0;
+        }
+
+        if (srf->verts[srf->width - 1].lightmap[1] < srf->verts[0].lightmap[1]) {
+            steps[1][0] = 0;
+            steps[1][1] = -1;
+        } else {
+            steps[1][0] = 0;
+            steps[1][1] = 1;
+        }
+    }
+
+    for (i = 0; i < srf->height; i++) {
+        for (j = 0; j < srf->width; j++) {
+            patchLightBlock_t plb[4];
+
+            //
+            // Vert 1
+            //
+
+            dv = &srf->verts[i * srf->width + j];
+
+            VectorCopy(dv->xyz, plb[0].point);
+            plb[0].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[0].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            //
+            // Vert 2
+            //
+
+            i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
+
+            VectorCopy(dv->xyz, plb[1].point);
+            plb[1].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[1].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            //
+            // Vert 3
+            //
+
+            i2 = Q_clamp_int(steps[1][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[1][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
+
+            VectorCopy(dv->xyz, plb[2].point);
+            plb[2].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[2].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            //
+            // Vert 4
+            //
+
+            i2 = Q_clamp_int(steps[1][0] + steps[0][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[1][1] + steps[0][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
+
+            VectorCopy(dv->xyz, plb[3].point);
+            plb[3].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[3].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            added |= R_RecursiveDlightPatch(plb);
+        }
+    }
+
+    if (!added) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->lmWidth; i++) {
+        dli.allocated[x + i] = srf->lmHeight + y;
+    }
+
+    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->dlightMap[tr.smpFrame];
+}
+
+/*
+===============
+R_RealDlightFace
+===============
+*/
+int R_RealDlightFace(srfSurfaceFace_t *srf, int dlightBits)
+{
+    int       x, y;
+    byte     *src, *dst;
+    int       i, j;
+    vec3_t    vec;
+    vec3_t    vecStepS, vecStepT;
+    dlight_t *dl;
+    float     d;
+    qboolean  added;
+    float    *origin;
+
+    if (!srf->lmHeight || !srf->lmWidth) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    dli.numLights = 0;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        if (!(dlightBits & (1 << i))) {
+            continue;
+        }
+
+        dl = &tr.refdef.dlights[i];
+
+        d = DotProduct(dl->transformed, srf->plane.normal) - srf->plane.dist;
+
+        if ((d < 0.f && !r_dlightBacks->integer) || (d > dl->radius || d < -dl->radius)) {
+            // dlight doesn't reach the plane
+            dlightBits &= ~(1 << i);
+        } else {
+            VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
+            dli.lights[dli.numLights].dl    = dl;
+            dli.lights[dli.numLights].power = 1.0 / dl->radius;
+            dli.numLights++;
+        }
+    }
+
+    if (!dli.numLights) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    src = srf->lmData;
+    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
+    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
+
+    VectorCopy(srf->lmVecs[0], vecStepS);
+    VectorMA(srf->lmVecs[1], -srf->lmWidth, srf->lmVecs[0], vecStepT);
+
+    added = qfalse;
+    VectorCopy(srf->lmOrigin, vec);
+
+    for (i = 0; i < srf->lmHeight; i++) {
+        for (j = 0; j < srf->lmWidth; j++) {
+            added |= R_DlightSample(src, vec, dst);
+            VectorAdd(vec, vecStepS, vec);
+            src += 3;
+            dst += 4;
+        }
+
+        VectorAdd(vec, vecStepT, vec);
+        src += (LIGHTMAP_SIZE - j) * 3;
+        dst += (LIGHTMAP_SIZE - j) * 4;
+    }
+
+    if (!added) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->lmWidth; i++) {
+        dli.allocated[x + i] = srf->lmHeight + y;
+    }
+
+    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->dlightMap[tr.smpFrame];
+}
+
+/*
+===============
+R_RealDlightTerrain
+===============
+*/
+int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
+{
+    dlight_t *dl;
+    int       x, y;
+    byte     *dst, *src;
+    vec3_t    vec;
+    float     delta, dist;
+    float    *origin;
+    int       i, j, k;
+    int       di, dj;
+    qboolean  added;
+    float     lmScale;
+    int       lumelsPerHeight;
+    float     heightPerLumelSquared;
+    float     z00, z01;
+    float     z10, z11;
+
+    dli.numLights = 0;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+
+        if (dl->radius < srf->x0 - dl->transformed[0] || -512.f - dl->radius > srf->x0 - dl->transformed[0]
+            || -512.f - dl->radius > srf->y0 - dl->transformed[1] || dl->radius < srf->y0 - dl->transformed[1]) {
+            continue;
+        }
+
+        if (dl->radius > 128.f) {
+            dist = 0.f;
+
+            delta = dl->transformed[0] - srf->x0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= 512.f;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
+
+            delta = dl->transformed[1] - srf->y0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= 512.f;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
+
+            delta = dl->transformed[2] - srf->z0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= srf->zmax;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
+
+            if (dl->radius * dl->radius < dist) {
+                continue;
+            }
+        }
+
+        VectorCopy(dl->origin, dli.lights[dli.numLights].origin);
+        dli.lights[dli.numLights].dl    = dl;
+        dli.lights[dli.numLights].power = 1.f / dl->radius;
+        dli.numLights++;
+    }
+
+    if (!dli.numLights) {
+        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->drawinfo.lmapSize, srf->drawinfo.lmapSize, &x, &y)) {
+        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    src = srf->drawinfo.lmData;
+    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->drawinfo.lmapX = x / (float)LIGHTMAP_SIZE;
+    srf->drawinfo.lmapY = y / (float)LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->drawinfo.lmapSize * srf->drawinfo.lmapSize;
+
+    added = qfalse;
+
+    lumelsPerHeight = 64.f / srf->drawinfo.lmapStep;
+    if (lumelsPerHeight == 1) {
+        vec[1] = srf->y0;
+
+        for (i = 0; i < 9; i++) {
+            vec[0] = srf->x0;
+
+            for (j = 0; j < 9; j++) {
+                vec[2] = srf->z0 + (int)(srf->heightmap[0] << 1);
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+
+            src += (LIGHTMAP_SIZE - 9) * 3;
+            dst += (LIGHTMAP_SIZE - 9) * 4;
+            vec[1] += srf->drawinfo.lmapStep;
+        }
+    } else if (lumelsPerHeight == 2) {
+        vec[1] = srf->y0;
+
+        k = 0;
+
+        for (j = 0; j < 8; j++) {
+            vec[0] = srf->x0;
+
+            for (i = 0; i < 8; i++) {
+                z00    = (int)srf->heightmap[k];
+                vec[2] = srf->z0 + z00 + z00;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                // increase lightmap step
+                vec[0] += srf->drawinfo.lmapStep;
+                k++;
+
+                z01    = (int)srf->heightmap[k];
+                vec[2] = srf->z0 + z00 + z01;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+
+            vec[2] = srf->z0 + z01 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += (LIGHTMAP_SIZE - 16) * 3;
+            dst += (LIGHTMAP_SIZE - 16) * 4;
+            k -= 8;
+
+            vec[0] = srf->x0;
+            vec[1] += srf->drawinfo.lmapStep;
+
+            for (i = 0; i < 8; i++) {
+                z00    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
+                vec[2] = srf->z0 + z00;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                k++;
+                vec[0] += srf->drawinfo.lmapStep;
+
+                z01    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
+                vec[2] = srf->z0 + (z00 + z01) * 0.5f;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+
+            vec[2] = srf->z0 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += (LIGHTMAP_SIZE - 16) * 3;
+            dst += (LIGHTMAP_SIZE - 16) * 4;
+            k++;
+            vec[0] += srf->drawinfo.lmapStep;
+            vec[1] += srf->drawinfo.lmapStep;
+        }
+
+        vec[0] = srf->x0;
+
+        for (i = 0; i < 8; i++) {
+            z00    = (int)srf->heightmap[k];
+            vec[2] = srf->z0 + z00 + z00;
+            k++;
+            added |= R_DlightSample(src, vec, dst);
+            src += 3;
+            dst += 4;
+            vec[0] += srf->drawinfo.lmapStep;
+
+            z01    = (int)srf->heightmap[k];
+            vec[2] = srf->z0 + z00 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += 3;
+            dst += 4;
+            vec[0] += srf->drawinfo.lmapStep;
+        }
+
+        vec[2] = srf->z0 + z01 + z01;
+        added |= R_DlightSample(src, vec, dst);
+        vec[0] += srf->drawinfo.lmapStep;
+        vec[1] += srf->drawinfo.lmapStep;
+    } else {
+        vec[1] = srf->y0;
+
+        for (j = 0; j < 8; j++) {
+            dj = 0;
+
+            for (;;) {
+                if (j == 7) {
+                    if (dj >= lumelsPerHeight + 1) {
+                        break;
+                    }
+                } else if (dj >= lumelsPerHeight) {
+                    break;
+                }
+
+                vec[0] = srf->x0;
+
+                for (i = 0; i < 8; i++) {
+                    for (;;) {
+                        if (i == 7) {
+                            if (di >= lumelsPerHeight + 1) {
+                                break;
+                            }
+                        } else if (dj >= lumelsPerHeight) {
+                            break;
+                        }
+
+                        di  = 0;
+                        z00 = (int)srf->heightmap[9 * j + i];
+                        z01 = (int)srf->heightmap[9 * (j + 1) + i];
+                        z10 = (int)srf->heightmap[9 * j + (i + 1)];
+                        z11 = (int)srf->heightmap[9 * (j + 1) + (i + 1)];
+
+                        heightPerLumelSquared = 2.f / (lumelsPerHeight * lumelsPerHeight);
+
+                        vec[2] =
+                            srf->z0
+                            + (dj * (di * z11) + (lumelsPerHeight - dj) * (z10 * di) + z01 * (lumelsPerHeight - di) * dj
+                               + z00 * (lumelsPerHeight - di) * (lumelsPerHeight - dj))
+                                  * heightPerLumelSquared;
+
+                        added |= R_DlightSample(src, vec, dst);
+                        src += 3;
+                        dst += 4;
+
+                        vec[0] += srf->drawinfo.lmapStep;
+                    }
+                }
+
+                src += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 3;
+                dst += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 4;
+                vec[1] += srf->drawinfo.lmapStep;
+            }
+        }
+    }
+
+    if (!added) {
+        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->drawinfo.lmapSize; i++) {
+        dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
+    }
+
+    lmScale = (1.0 / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
+    srf->drawinfo.lmapX -= (srf->x0 * lmScale - (0.5 / LIGHTMAP_SIZE));
+    srf->drawinfo.lmapY -= (srf->y0 * lmScale - (0.5 / LIGHTMAP_SIZE));
+
+    srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->drawinfo.dlightMap[tr.smpFrame];
+}
 
 /*
 ===============
@@ -39,16 +664,17 @@ Used by both the front end (for DlightBmodel) and
 the back end (before doing the lighting calculation)
 ===============
 */
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *or) {
-	int		i;
-	vec3_t	temp;
+void R_TransformDlights(int count, dlight_t *dl, orientationr_t *ori)
+{
+    int    i;
+    vec3_t temp;
 
-	for ( i = 0 ; i < count ; i++, dl++ ) {
-		VectorSubtract( dl->origin, or->origin, temp );
-		dl->transformed[0] = DotProduct( temp, or->axis[0] );
-		dl->transformed[1] = DotProduct( temp, or->axis[1] );
-		dl->transformed[2] = DotProduct( temp, or->axis[2] );
-	}
+    for (i = 0; i < count; i++, dl++) {
+        VectorSubtract(dl->origin, ori->origin, temp);
+        dl->transformed[0] = DotProduct(temp, ori->axis[0]);
+        dl->transformed[1] = DotProduct(temp, ori->axis[1]);
+        dl->transformed[2] = DotProduct(temp, ori->axis[2]);
+    }
 }
 
 /*
@@ -58,274 +684,579 @@ R_DlightBmodel
 Determine which dynamic lights may effect this bmodel
 =============
 */
-void R_DlightBmodel( bmodel_t *bmodel ) {
-	int			i, j;
-	dlight_t	*dl;
-	int			mask;
-	msurface_t	*surf;
+void R_DlightBmodel(bmodel_t *bmodel)
+{
+    int         i, j;
+    dlight_t   *dl;
+    int         mask;
+    msurface_t *surf;
 
-	// transform all the lights
-	R_TransformDlights( tr.refdef.num_dlights, tr.refdef.dlights, &tr.or );
+    // transform all the lights
+    R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.ori);
 
-	mask = 0;
-	for ( i=0 ; i<tr.refdef.num_dlights ; i++ ) {
-		dl = &tr.refdef.dlights[i];
+    mask = 0;
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
 
-		// see if the point is close enough to the bounds to matter
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( dl->transformed[j] - bmodel->bounds[1][j] > dl->radius ) {
-				break;
-			}
-			if ( bmodel->bounds[0][j] - dl->transformed[j] > dl->radius ) {
-				break;
-			}
-		}
-		if ( j < 3 ) {
-			continue;
-		}
+        // see if the point is close enough to the bounds to matter
+        for (j = 0; j < 3; j++) {
+            if (dl->transformed[j] - bmodel->bounds[1][j] > dl->radius) {
+                break;
+            }
+            if (bmodel->bounds[0][j] - dl->transformed[j] > dl->radius) {
+                break;
+            }
+        }
+        if (j < 3) {
+            continue;
+        }
 
-		// we need to check this light
-		mask |= 1 << i;
-	}
+        // we need to check this light
+        mask |= 1 << i;
+    }
 
-	tr.currentEntity->needDlights = (mask != 0);
+    tr.currentEntity->needDlights = (mask != 0);
 
-	// set the dlight bits in all the surfaces
-	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
-		surf = bmodel->firstSurface + i;
+    // set the dlight bits in all the surfaces
+    for (i = 0; i < bmodel->numSurfaces; i++) {
+        surf = bmodel->firstSurface + i;
 
-		if ( *surf->data == SF_FACE ) {
-			((srfSurfaceFace_t *)surf->data)->dlightBits = mask;
-		} else if ( *surf->data == SF_GRID ) {
-			((srfGridMesh_t *)surf->data)->dlightBits = mask;
-		} else if ( *surf->data == SF_TRIANGLES ) {
-			((srfTriangles_t *)surf->data)->dlightBits = mask;
-		}
-	}
+        if (*surf->data == SF_FACE) {
+            ((srfSurfaceFace_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        } else if (*surf->data == SF_GRID) {
+            ((srfGridMesh_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        } else if (*surf->data == SF_TRIANGLES) {
+            ((srfTriangles_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        }
+    }
 }
 
-
-/*
-=============================================================================
-
-LIGHT SAMPLING
-
-=============================================================================
-*/
-
-extern	cvar_t	*r_ambientScale;
-extern	cvar_t	*r_directedScale;
-extern	cvar_t	*r_debugLight;
-
-/*
-=================
-R_SetupEntityLightingGrid
-
-=================
-*/
-static void R_SetupEntityLightingGrid( trRefEntity_t *ent ) {
-	vec3_t	lightOrigin;
-	int		pos[3];
-	int		i, j;
-	byte	*gridData;
-	float	frac[3];
-	int		gridStep[3];
-	vec3_t	direction;
-	float	totalFactor;
-
-	if ( ent->e.renderfx & RF_LIGHTING_ORIGIN ) {
-		// separate lightOrigins are needed so an object that is
-		// sinking into the ground can still be lit, and so
-		// multi-part models can be lit identically
-		VectorCopy( ent->e.lightingOrigin, lightOrigin );
-	} else {
-		VectorCopy( ent->e.origin, lightOrigin );
-	}
-
-	VectorSubtract( lightOrigin, tr.world->lightGridOrigin, lightOrigin );
-	for ( i = 0 ; i < 3 ; i++ ) {
-		float	v;
-
-		v = lightOrigin[i]*tr.world->lightGridInverseSize[i];
-		pos[i] = floor( v );
-		frac[i] = v - pos[i];
-		if ( pos[i] < 0 ) {
-			pos[i] = 0;
-		} else if ( pos[i] > tr.world->lightGridBounds[i] - 1 ) {
-			pos[i] = tr.world->lightGridBounds[i] - 1;
-		}
-	}
-
-	VectorClear( ent->ambientLight );
-	VectorClear( ent->directedLight );
-	VectorClear( direction );
-
-	assert( tr.world->lightGridData ); // NULL with -nolight maps
-
-	// trilerp the light value
-	gridStep[0] = 8;
-	gridStep[1] = 8 * tr.world->lightGridBounds[0];
-	gridStep[2] = 8 * tr.world->lightGridBounds[0] * tr.world->lightGridBounds[1];
-	gridData = tr.world->lightGridData + pos[0] * gridStep[0]
-		+ pos[1] * gridStep[1] + pos[2] * gridStep[2];
-
-	totalFactor = 0;
-	for ( i = 0 ; i < 8 ; i++ ) {
-		float	factor;
-		byte	*data;
-		int		lat, lng;
-		vec3_t	normal;
-		#if idppc
-		float d0, d1, d2, d3, d4, d5;
-		#endif
-		factor = 1.0;
-		data = gridData;
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( i & (1<<j) ) {
-				if ( pos[j] + 1 > tr.world->lightGridBounds[j] - 1 ) {
-					break; // ignore values outside lightgrid
-				}
-				factor *= frac[j];
-				data += gridStep[j];
-			} else {
-				factor *= (1.0f - frac[j]);
-			}
-		}
-
-		if ( j != 3 ) {
-			continue;
-		}
-		if ( !(data[0]+data[1]+data[2]) ) {
-			continue;	// ignore samples in walls
-		}
-		totalFactor += factor;
-		#if idppc
-		d0 = data[0]; d1 = data[1]; d2 = data[2];
-		d3 = data[3]; d4 = data[4]; d5 = data[5];
-
-		ent->ambientLight[0] += factor * d0;
-		ent->ambientLight[1] += factor * d1;
-		ent->ambientLight[2] += factor * d2;
-
-		ent->directedLight[0] += factor * d3;
-		ent->directedLight[1] += factor * d4;
-		ent->directedLight[2] += factor * d5;
-		#else
-		ent->ambientLight[0] += factor * data[0];
-		ent->ambientLight[1] += factor * data[1];
-		ent->ambientLight[2] += factor * data[2];
-
-		ent->directedLight[0] += factor * data[3];
-		ent->directedLight[1] += factor * data[4];
-		ent->directedLight[2] += factor * data[5];
-		#endif
-		lat = data[7];
-		lng = data[6];
-		lat *= (FUNCTABLE_SIZE/256);
-		lng *= (FUNCTABLE_SIZE/256);
-
-		// decode X as cos( lat ) * sin( long )
-		// decode Y as sin( lat ) * sin( long )
-		// decode Z as cos( long )
-
-		normal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-		normal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-		normal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-		VectorMA( direction, factor, normal, direction );
-	}
-
-	if ( totalFactor > 0 && totalFactor < 0.99 ) {
-		totalFactor = 1.0f / totalFactor;
-		VectorScale( ent->ambientLight, totalFactor, ent->ambientLight );
-		VectorScale( ent->directedLight, totalFactor, ent->directedLight );
-	}
-
-	VectorScale( ent->ambientLight, r_ambientScale->value, ent->ambientLight );
-	VectorScale( ent->directedLight, r_directedScale->value, ent->directedLight );
-
-	VectorNormalize2( direction, ent->lightDir );
-}
-
-
 /*
 ===============
-LogLight
+R_GetLightGridPalettedColor
 ===============
 */
-static void LogLight( trRefEntity_t *ent ) {
-	int	max1, max2;
-
-	if ( !(ent->e.renderfx & RF_FIRST_PERSON ) ) {
-		return;
-	}
-
-	max1 = ent->ambientLight[0];
-	if ( ent->ambientLight[1] > max1 ) {
-		max1 = ent->ambientLight[1];
-	} else if ( ent->ambientLight[2] > max1 ) {
-		max1 = ent->ambientLight[2];
-	}
-
-	max2 = ent->directedLight[0];
-	if ( ent->directedLight[1] > max2 ) {
-		max2 = ent->directedLight[1];
-	} else if ( ent->directedLight[2] > max2 ) {
-		max2 = ent->directedLight[2];
-	}
-
-	ri.Printf( PRINT_ALL, "amb:%i  dir:%i\n", max1, max2 );
+static byte *R_GetLightGridPalettedColor(int iColor)
+{
+    return &tr.world->lightGridPalette[iColor * 3];
 }
 
 /*
-=================
-R_SetupEntityLighting
-
-Calculates all the lighting values that will be used
-by the Calc_* functions
-=================
+===============
+R_GetLightingGridValue
+===============
 */
-void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent ) {
+void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
+{
+    byte  *pColor;
+    int    iBaseOffset;
+    int    i;
+    int    iOffset;
+    int    iRowPos;
+    int    iData;
+    int    iLen;
+    int    iGridPos[3];
+    int    iArrayXStep;
+    float  fV;
+    float  fFrac[3];
+    float  fOMFrac[3];
+    float  fWeight, fWeight2;
+    float  fTotalFactor;
+    int    iCurData;
+    vec3_t vLightOrigin;
+    byte  *pCurData;
+
+    if (!tr.world || !tr.world->lightGridData || !tr.world->lightGridOffsets) {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+        return;
+    }
+
+    VectorSubtract(vPos, tr.world->lightGridMins, vLightOrigin);
+
+    for (i = 0; i < 3; i++) {
+        fV          = vLightOrigin[i] * tr.world->lightGridOOSize[i];
+        iGridPos[i] = floor(fV);
+        fFrac[i]    = fV - iGridPos[i];
+        fOMFrac[i]  = 1.0 - fFrac[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
+            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
+        }
+    }
+
+    fTotalFactor = 0;
+    iArrayXStep  = tr.world->lightGridBounds[1];
+    iBaseOffset  = tr.world->lightGridBounds[0] + iGridPos[1] + iArrayXStep * iGridPos[0];
+    VectorClear(vLight);
+
+    for (i = 0; i < 4; i++) {
+        qboolean bContinue = qfalse;
+
+        switch (i) {
+        case 0:
+            fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 1:
+            fWeight  = fOMFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + 1] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 2:
+            fWeight  = fFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]
+                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        case 3:
+            fWeight  = fFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]
+                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        }
+
+        iRowPos  = iGridPos[2];
+        pCurData = &tr.world->lightGridData[iOffset];
+        iData    = 0;
+
+        while (1) {
+            while (1) {
+                iCurData = (char)pCurData[iData];
+                iData++;
+                if (iCurData >= 0) {
+                    break;
+                }
+
+                iLen = -iCurData;
+                if (iLen > iRowPos) {
+                    iData += iRowPos;
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                        VectorMA(vLight, fWeight, pColor, vLight);
+                        fTotalFactor += fWeight;
+                    }
+
+                    iData++;
+                    if (iLen - 1 == iRowPos) {
+                        iData++;
+                    }
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                        VectorMA(vLight, fWeight2, pColor, vLight);
+                        fTotalFactor += fWeight2;
+                    }
+
+                    bContinue = qtrue;
+                    break;
+                }
+
+                iRowPos -= iLen;
+                iData += iLen;
+            }
+
+            if (bContinue) {
+                break;
+            }
+
+            iLen = iCurData + 2;
+            if (iLen - 1 >= iRowPos) {
+                break;
+            }
+
+            iRowPos -= iLen;
+            iData++;
+        }
+
+        if (bContinue) {
+            continue;
+        }
+
+        if (iLen - 1 > iRowPos) {
+            if (!pCurData[iData]) {
+                continue;
+            }
+
+            pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+            VectorMA(vLight, fWeight + fWeight2, pColor, vLight);
+            fTotalFactor += fWeight + fWeight2;
+        } else {
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                VectorMA(vLight, fWeight, pColor, vLight);
+                fTotalFactor += fWeight;
+            }
+
+            iData += 2;
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                VectorMA(vLight, fWeight2, pColor, vLight);
+                fTotalFactor += fWeight2;
+            }
+        }
+    }
+
+    if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
+        VectorScale(vLight, 1.0 / fTotalFactor, vLight);
+    }
+
+    if (fTotalFactor) {
+        if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+            float t;
+            // normalize color values
+            t = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+            VectorScale(vLight, t, vLight);
+        }
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+    }
+}
+
+/*
+===============
+R_GetLightingGridValueFast
+===============
+*/
+void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
+{
+    byte      *pColor;
+    int        i;
+    int        iRowPos;
+    int        iGridPos[3];
+    int        iArrayXStep;
+    float      fV[3];
+    vec3_t     vLightOrigin;
+    int        iData;
+    int        iLen;
+    int        iBaseOffset;
+    byte      *pCurData;
+    int        iOrder;
+    int        iToggle;
+    int        iSample[8];
+    float      fDist[3];
+    int        j, k;
+    static int iSearch[8][8] = {
+        {0, 4, 2, 6, 1, 5, 3, 7},
+        {0, 2, 4, 6, 1, 3, 5, 7},
+        {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 2, 1, 3, 4, 6, 5, 7},
+        {0, 4, 1, 5, 2, 6, 3, 7},
+        {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 4, 5, 2, 3, 6, 7},
+        {0, 1, 2, 3, 4, 5, 6, 7}
+    };
+
+    if (!tr.world->lightGridData || !tr.world->lightGridOffsets) {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+        return;
+    }
+
+    iOrder  = 0;
+    iToggle = 0;
+
+    for (i = 0; i < 3; i++) {
+        fV[i] =
+            (tr.world->lightGridSize[i] * 0.5 + vPos[i] - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i];
+        iGridPos[i] = floor(fV[i]);
+        fV[i] -= iGridPos[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+            fV[i]       = 0.0;
+        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
+            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
+            fV[i]       = 1.0;
+        }
+
+        fDist[i] = 0.5 - fV[i];
+        if (fDist[i] < 0) {
+            fDist[i] = -fDist[i];
+            iToggle |= 1 << i;
+        }
+    }
+
+    if (fDist[1] >= fDist[0]) {
+        iOrder = 1;
+    }
+    if (fDist[2] >= fDist[0]) {
+        iOrder |= 2;
+    }
+    if (fDist[2] >= fDist[1]) {
+        iOrder |= 4;
+    }
+
+    for (i = 0; i < 8; i++) {
+        iSample[i] = -1;
+    }
+
+    iArrayXStep = tr.world->lightGridBounds[1];
+    iBaseOffset = iGridPos[1] + tr.world->lightGridBounds[0] + iGridPos[0] * tr.world->lightGridBounds[1];
+
+    for (i = 0; i < 8; i++) {
+        j = iSearch[iOrder][i] ^ iToggle;
+
+        if (iSample[j] < 0) {
+            switch (j & 3) {
+            case 0:
+                pCurData =
+                    &tr.world->lightGridData
+                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset]];
+                break;
+            case 1:
+                pCurData =
+                    &tr.world->lightGridData
+                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset + 1]];
+                break;
+            case 2:
+                pCurData = &tr.world->lightGridData
+                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
+                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]];
+                break;
+            case 3:
+            default:
+                pCurData = &tr.world->lightGridData
+                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
+                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]];
+                break;
+            }
+
+            k = j & ~1;
+
+            iRowPos = iGridPos[2];
+            iData   = 0;
+
+            while (1) {
+                qboolean bShouldBreak = qfalse;
+
+                for (; (char)pCurData[iData] >= 0; iData += 2, iRowPos -= iLen) {
+                    iLen = (char)pCurData[iData] + 2;
+
+                    if (iLen - 1 < iRowPos) {
+                        continue;
+                    }
+
+                    if (iLen - 1 > iRowPos) {
+                        iSample[k + 1] = pCurData[iData + 1];
+                        iSample[k]     = pCurData[iData + 1];
+                    } else {
+                        iSample[k]     = pCurData[iData + 1];
+                        iSample[k + 1] = pCurData[iData + 3];
+                    }
+
+                    bShouldBreak = qtrue;
+                    break;
+                }
+
+                if (bShouldBreak) {
+                    break;
+                }
+
+                if (-(char)pCurData[iData] > iRowPos) {
+                    iSample[k] = pCurData[iRowPos + iData + 1];
+
+                    if ((-(char)pCurData[iData] - 1) == iRowPos) {
+                        iSample[k + 1] = pCurData[iRowPos + iData + 3];
+                    } else {
+                        iSample[k + 1] = pCurData[iRowPos + iData + 2];
+                    }
+                    break;
+                }
+
+                iRowPos -= -(char)pCurData[iData];
+                iData += -(char)pCurData[iData] + 1;
+            }
+        }
+
+        if (iSample[j] > 0) {
+            pColor    = R_GetLightGridPalettedColor(iSample[j]);
+            vLight[0] = pColor[0];
+            vLight[1] = pColor[1];
+            vLight[2] = pColor[2];
+            return;
+        }
+    }
+
+    vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+}
+
+/*
+===============
+R_GetLightingForDecal
+===============
+*/
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
+{
+    float fMax;
+
+    R_GetLightingGridValue(vOrigin, vLight);
+
+    if (!tr.overbrightShift) {
+        return;
+    }
+
+    VectorScale(vLight, tr.overbrightMult, vLight);
+
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+}
+
+/*
+===============
+R_GetLightingForSmoke
+===============
+*/
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
+{
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    dir;
+    float     d;
+
+    if (r_smoothsmokelight->integer) {
+        R_GetLightingGridValue(vOrigin, vLight);
+    } else {
+        R_GetLightingGridValueFast(vOrigin, vLight);
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        dl = &backEnd.refdef.dlights[i];
+        VectorSubtract(dl->origin, vOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    vLight[0] /= 255.0;
+    vLight[1] /= 255.0;
+    vLight[2] /= 255.0;
+}
+
+/*
+===============
+RB_GetEntityGridLighting
+===============
+*/
+static int RB_GetEntityGridLighting()
+{
+    int       iColor;
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    vLight;
+    vec3_t    dir;
+    float     d;
+    float    *lightOrigin;
+
+    lightOrigin = backEnd.currentSphere->traceOrigin;
+    if (!(backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
+        R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        dl = &backEnd.refdef.dlights[i];
+        VectorSubtract(dl->origin, lightOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    // clamp ambient
+    for (i = 0; i < 3; i++) {
+        if (vLight[i] > tr.identityLightByte) {
+            vLight[i] = tr.identityLightByte;
+        }
+    }
+
+    // save out the byte packet version
+    ((byte *)&iColor)[0] = myftol(vLight[0]);
+    ((byte *)&iColor)[1] = myftol(vLight[1]);
+    ((byte *)&iColor)[2] = myftol(vLight[2]);
+    ((byte *)&iColor)[3] = 0xff;
+
+    return iColor;
+
+#if 0
 	int				i;
-	dlight_t		*dl;
+	dlight_t* dl;
 	float			power;
 	vec3_t			dir;
 	float			d;
 	vec3_t			lightDir;
 	vec3_t			lightOrigin;
-
-	// lighting calculations 
-	if ( ent->lightingCalculated ) {
-		return;
-	}
-	ent->lightingCalculated = qtrue;
+	int				ambientlightInt = 0;
+	trRefEntity_t	*ent = backEnd.currentEntity;
+	trRefdef_t		*refdef = &backEnd.refdef;
 
 	//
 	// trace a sample point down to find ambient light
 	//
-	if ( ent->e.renderfx & RF_LIGHTING_ORIGIN ) {
-		// separate lightOrigins are needed so an object that is
+	if (ent->e.renderfx & RF_LIGHTING_ORIGIN) {
+		// seperate lightOrigins are needed so an object that is
 		// sinking into the ground can still be lit, and so
 		// multi-part models can be lit identically
-		VectorCopy( ent->e.lightingOrigin, lightOrigin );
-	} else {
-		VectorCopy( ent->e.origin, lightOrigin );
+		VectorCopy(ent->e.lightingOrigin, lightOrigin);
+	}
+	else {
+		VectorCopy(ent->e.origin, lightOrigin);
 	}
 
 	// if NOWORLDMODEL, only use dynamic lights (menu system, etc)
-	if ( !(refdef->rdflags & RDF_NOWORLDMODEL ) 
-		&& tr.world->lightGridData ) {
-		R_SetupEntityLightingGrid( ent );
-	} else {
-		ent->ambientLight[0] = ent->ambientLight[1] = 
+	if (!(refdef->rdflags & RDF_NOWORLDMODEL)
+		&& tr.world->lightGridData) {
+		R_SetupEntityLightingGrid(ent);
+	}
+	else {
+		ent->ambientLight[0] = ent->ambientLight[1] =
 			ent->ambientLight[2] = tr.identityLight * 150;
-		ent->directedLight[0] = ent->directedLight[1] = 
+		ent->directedLight[0] = ent->directedLight[1] =
 			ent->directedLight[2] = tr.identityLight * 150;
-		VectorCopy( tr.sunDirection, ent->lightDir );
+		VectorCopy(tr.sunDirection, ent->lightDir);
 	}
 
 	// bonus items and view weapons have a fixed minimum add
-	if ( 1 /* ent->e.renderfx & RF_MINLIGHT */ ) {
+	if (1 /* ent->e.renderfx & RF_MINLIGHT */) {
 		// give everything a minimum light add
 		ent->ambientLight[0] += tr.identityLight * 32;
 		ent->ambientLight[1] += tr.identityLight * 32;
@@ -335,66 +1266,343 @@ void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent ) {
 	//
 	// modify the light by dynamic lights
 	//
-	d = VectorLength( ent->directedLight );
-	VectorScale( ent->lightDir, d, lightDir );
+	d = VectorLength(ent->directedLight);
+	VectorScale(ent->lightDir, d, lightDir);
 
-	for ( i = 0 ; i < refdef->num_dlights ; i++ ) {
+	for (i = 0; i < refdef->num_dlights; i++) {
 		dl = &refdef->dlights[i];
-		VectorSubtract( dl->origin, lightOrigin, dir );
-		d = VectorNormalize( dir );
+		VectorSubtract(dl->origin, lightOrigin, dir);
+		d = VectorNormalize(dir);
 
-		power = DLIGHT_AT_RADIUS * ( dl->radius * dl->radius );
-		if ( d < DLIGHT_MINIMUM_RADIUS ) {
+		power = DLIGHT_AT_RADIUS * (dl->radius * dl->radius);
+		if (d < DLIGHT_MINIMUM_RADIUS) {
 			d = DLIGHT_MINIMUM_RADIUS;
 		}
-		d = power / ( d * d );
+		d = power / (d * d);
 
-		VectorMA( ent->directedLight, d, dl->color, ent->directedLight );
-		VectorMA( lightDir, d, dir, lightDir );
+		VectorMA(ent->directedLight, d, dl->color, ent->directedLight);
+		VectorMA(lightDir, d, dir, lightDir);
 	}
 
 	// clamp ambient
-	for ( i = 0 ; i < 3 ; i++ ) {
-		if ( ent->ambientLight[i] > tr.identityLightByte ) {
+	for (i = 0; i < 3; i++) {
+		if (ent->ambientLight[i] > tr.identityLightByte) {
 			ent->ambientLight[i] = tr.identityLightByte;
 		}
 	}
 
-	if ( r_debugLight->integer ) {
-		LogLight( ent );
-	}
-
 	// save out the byte packet version
-	((byte *)&ent->ambientLightInt)[0] = ri.ftol(ent->ambientLight[0]);
-	((byte *)&ent->ambientLightInt)[1] = ri.ftol(ent->ambientLight[1]);
-	((byte *)&ent->ambientLightInt)[2] = ri.ftol(ent->ambientLight[2]);
-	((byte *)&ent->ambientLightInt)[3] = 0xff;
-	
+	((byte*)&ambientlightInt)[0] = myftol(ent->ambientLight[0]);
+	((byte*)&ambientlightInt)[1] = myftol(ent->ambientLight[1]);
+	((byte*)&ambientlightInt)[2] = myftol(ent->ambientLight[2]);
+	((byte*)&ambientlightInt)[3] = 0xff;
+
 	// transform the direction to local space
-	VectorNormalize( lightDir );
-	ent->lightDir[0] = DotProduct( lightDir, ent->e.axis[0] );
-	ent->lightDir[1] = DotProduct( lightDir, ent->e.axis[1] );
-	ent->lightDir[2] = DotProduct( lightDir, ent->e.axis[2] );
+	VectorNormalize(lightDir);
+	ent->lightDir[0] = DotProduct(lightDir, ent->e.axis[0]);
+	ent->lightDir[1] = DotProduct(lightDir, ent->e.axis[1]);
+	ent->lightDir[2] = DotProduct(lightDir, ent->e.axis[2]);
+
+	return ambientlightInt;
+#endif
 }
 
 /*
-=================
-R_LightForPoint
-=================
+===============
+RB_SetupEntityGridLighting
+===============
 */
-int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir )
+void RB_SetupEntityGridLighting()
 {
-	trRefEntity_t ent;
-	
-	if ( tr.world->lightGridData == NULL )
-	  return qfalse;
+    trRefEntity_t *ent;
+    int            iColor;
 
-	Com_Memset(&ent, 0, sizeof(ent));
-	VectorCopy( point, ent.e.origin );
-	R_SetupEntityLightingGrid( &ent );
-	VectorCopy(ent.ambientLight, ambientLight);
-	VectorCopy(ent.directedLight, directedLight);
-	VectorCopy(ent.lightDir, lightDir);
+    if (backEnd.currentEntity->bLightGridCalculated) {
+        return;
+    }
 
-	return qtrue;
+    for (ent = backEnd.currentEntity; ent->e.parentEntity != ENTITYNUM_NONE;
+         ent = &backEnd.refdef.entities[ent->e.parentEntity]) {
+        trRefEntity_t *newref = &backEnd.refdef.entities[ent->e.parentEntity];
+        if (newref == ent) {
+            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
+            iColor = newref->iGridLighting;
+            break;
+        }
+
+        if (newref->bLightGridCalculated) {
+            iColor = newref->iGridLighting;
+            break;
+        }
+    }
+
+    if (ent->e.parentEntity == ENTITYNUM_NONE) {
+        iColor = RB_GetEntityGridLighting();
+    }
+
+    ent = backEnd.currentEntity;
+    for (;;) {
+        ent->bLightGridCalculated = qtrue;
+        ent->iGridLighting        = iColor;
+        if (ent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        if (ent == &backEnd.refdef.entities[ent->e.parentEntity]) {
+            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
+            break;
+        }
+
+        ent = &backEnd.refdef.entities[ent->e.parentEntity];
+    }
+}
+
+/*
+===============
+RB_SetupStaticModelGridLighting
+===============
+*/
+void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t *ent, const vec3_t lightOrigin)
+{
+    int       iColor;
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    vLight;
+    vec3_t    dir;
+    float     d;
+
+    if (ent->bLightGridCalculated) {
+        return;
+    }
+    ent->bLightGridCalculated = qtrue;
+
+    if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
+        R_GetLightingGridValue(lightOrigin, vLight);
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
+    }
+
+    for (i = 0; i < refdef->num_dlights; i++) {
+        dl = &refdef->dlights[i];
+        VectorSubtract(dl->origin, lightOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    // clamp ambient
+    for (i = 0; i < 3; i++) {
+        if (vLight[i] > tr.identityLightByte) {
+            vLight[i] = tr.identityLightByte;
+        }
+    }
+
+    // save out the byte packet version
+    ((byte *)&ent->iGridLighting)[0] = myftol(vLight[0]);
+    ((byte *)&ent->iGridLighting)[1] = myftol(vLight[1]);
+    ((byte *)&ent->iGridLighting)[2] = myftol(vLight[2]);
+    ((byte *)&ent->iGridLighting)[3] = 0xff;
+}
+
+/*
+=============================================================================
+
+LIGHT SAMPLING
+
+=============================================================================
+*/
+
+extern cvar_t *r_ambientScale;
+extern cvar_t *r_directedScale;
+
+/*
+===============
+LogLight
+===============
+*/
+static void LogLight(trRefEntity_t *ent)
+{
+    int max1, max2;
+
+    if (!(ent->e.renderfx & RF_FIRST_PERSON)) {
+        return;
+    }
+
+    max1 = ent->ambientLight[0];
+    if (ent->ambientLight[1] > max1) {
+        max1 = ent->ambientLight[1];
+    } else if (ent->ambientLight[2] > max1) {
+        max1 = ent->ambientLight[2];
+    }
+
+    max2 = ent->directedLight[0];
+    if (ent->directedLight[1] > max2) {
+        max2 = ent->directedLight[1];
+    } else if (ent->directedLight[2] > max2) {
+        max2 = ent->directedLight[2];
+    }
+
+    ri.Printf(PRINT_ALL, "amb:%i  dir:%i\n", max1, max2);
+}
+
+/*
+===============
+R_ClearRealDlights
+===============
+*/
+void R_ClearRealDlights()
+{
+    memset(dli.allocated, 0, sizeof(dli.allocated));
+    dli.dlightMap = 0;
+}
+
+/*
+===============
+R_UploadDlights
+===============
+*/
+void R_UploadDlights()
+{
+    int i, h;
+
+    if (!tr.pc.c_dlightSurfaces) {
+        return;
+    }
+
+    h = 0;
+    for (i = 0; i < LIGHTMAP_SIZE; i++) {
+        if (h < dli.allocated[i]) {
+            h = dli.allocated[i];
+        }
+    }
+
+    if (h) {
+        if (h > LIGHTMAP_SIZE) {
+            ri.Error(ERR_DROP, "R_UploadDlights: bad allocated height");
+        }
+
+        GL_Bind(tr.dlightImages[dli.dlightMap]);
+        qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LIGHTMAP_SIZE, h, GL_RGBA, GL_UNSIGNED_BYTE, dli.lightmap_buffer);
+
+        tr.pc.c_dlightMaps++;
+        memset(dli.allocated, 0, sizeof(dli.allocated));
+    }
+}
+
+/*
+===============
+R_AllocLMBlock
+===============
+*/
+qboolean R_AllocLMBlock(int w, int h, int *x, int *y)
+{
+    int i, j;
+    int best, best2;
+
+    for (;;) {
+        best = LIGHTMAP_SIZE;
+        for (i = 0; i < LIGHTMAP_SIZE - w; i++) {
+            best2 = 0;
+
+            for (j = 0; j < w && dli.allocated[i + j] < best; j++) {
+                if (best2 < dli.allocated[i + j]) {
+                    best2 = dli.allocated[i + j];
+                }
+            }
+
+            if (j == w) {
+                *x   = i;
+                *y   = best2;
+                best = best2;
+            }
+        }
+
+        if (h + best <= LIGHTMAP_SIZE) {
+            break;
+        }
+
+        if (dli.dlightMap == 14) {
+            return qfalse;
+        }
+
+        R_UploadDlights();
+        dli.dlightMap++;
+    }
+
+    return qtrue;
+}
+
+/*
+===============
+R_DlightSample
+===============
+*/
+qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst)
+{
+    int      r, g, b;
+    int      k;
+    qboolean added;
+    vec3_t   dir;
+    float    add;
+
+    added = qfalse;
+    r     = src[0];
+    g     = src[1];
+    b     = src[2];
+
+    for (k = 0; k < dli.numLights; k++) {
+        incidentLight_t *light = &dli.lights[k];
+
+        VectorSubtract(vec, light->origin, dir);
+        add = VectorLength(dir) * light->power;
+        if (add <= 1.f) {
+            float t = (1.0 - add) * (1.0 - add) * 375.0;
+
+            r = (int)(t * light->dl->color[0] + (float)r);
+            g = (int)(t * light->dl->color[1] + (float)g);
+            b = (int)(t * light->dl->color[2] + (float)b);
+            // light was added
+            added = qtrue;
+        }
+    }
+
+    if (tr.overbrightShift) {
+        r <<= tr.overbrightShift & 0xFF;
+        g <<= tr.overbrightShift & 0xFF;
+        b <<= tr.overbrightShift & 0xFF;
+    }
+
+    if (r > 0xFF || g > 0xFF || b > 0xFF) {
+        float t;
+        // normalize color values
+        t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+        r = (int)((float)r * t);
+        g = (int)((float)g * t);
+        b = (int)((float)b * t);
+    }
+
+    dst[0] = (byte)r;
+    dst[1] = (byte)g;
+    dst[2] = (byte)b;
+    dst[3] = -1;
+
+    return added;
 }
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index e07f575b..c7a44adf 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -15,49 +15,163 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-
-#ifndef TR_LOCAL_H
-#define TR_LOCAL_H
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderercommon/tr_public.h"
-#include "../renderercommon/tr_common.h"
-#include "../renderercommon/iqm.h"
+#include "tr_public.h"
 #include "../renderercommon/qgl.h"
+#include "qgl.h"
 
+#ifdef __cplusplus
+#define GLE(ret, name, ...) extern "C" name##proc * qgl##name;
+#else
 #define GLE(ret, name, ...) extern name##proc * qgl##name;
+#endif
+
 QGL_1_1_PROCS;
 QGL_1_1_FIXED_FUNCTION_PROCS;
+QGL_1_3_PROCS;
 QGL_DESKTOP_1_1_PROCS;
 QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
 QGL_3_0_PROCS;
+
 #undef GLE
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define GL_INDEX_TYPE		GL_UNSIGNED_INT
 typedef unsigned int glIndex_t;
 
-// 14 bits
-// can't be increased without changing bit packing for drawsurfs
+// fast float to int conversion
+#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+long myftol( float f );
+#else
+#define	myftol(x) ((int)(x))
+#endif
+
+
+// everything that is needed by the backend needs
+// to be double buffered to allow it to run in
+// parallel on a dual cpu machine
+#define	SMP_FRAMES		2
+
+// 12 bits
 // see QSORT_SHADERNUM_SHIFT
-#define SHADERNUM_BITS	14
-#define MAX_SHADERS		(1<<SHADERNUM_BITS)
+#define	MAX_SHADERS				16384
 
+//#define MAX_SHADER_STATES 2048
+#define MAX_STATES_PER_SHADER 32
+#define MAX_STATE_NAME 32
 
+// can't be increased without changing bit packing for drawsurfs
+
+typedef struct skelSurfaceGame_s skelSurfaceGame_t;
+typedef struct staticSurface_s staticSurface_t;
+
+// any changes in surfaceType must be mirrored in rb_surfaceTable[]
+typedef enum {
+    SF_BAD,
+    SF_SKIP,				// ignore
+    SF_FACE,
+    SF_GRID,
+    SF_POLY,
+    SF_MARK_FRAG,
+    SF_FLARE,
+    SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
+    SF_DISPLAY_LIST,
+    SF_TIKI_SKEL,
+    SF_TIKI_STATIC,
+    SF_SWIPE,
+    SF_SPRITE,
+    SF_TERRAIN_PATCH,
+    SF_TRIANGLES,
+    SF_MD3,
+    SF_MD4,
+
+    SF_NUM_SURFACE_TYPES,
+    SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
+} surfaceType_t;
+
+typedef struct {
+    struct mnode_s* cntNode;
+    struct msurface_s* skySurfs[32];
+    int numSurfs;
+    vec3_t offset;
+    vec3_t mins;
+    vec3_t maxs;
+} portalsky_t;
+
+typedef struct {
+    vec3_t transformed;
+    int index;
+} sphere_dlight_t;
+
+typedef enum {
+    LIGHT_POINT,
+    LIGHT_DIRECTIONAL,
+    LIGHT_SPOT,
+    LIGHT_SPOT_FAST
+} lighttype_t;
+
+typedef struct reallightinfo_s {
+    vec3_t color;
+    lighttype_t eType;
+    float fIntensity;
+    float fDist;
+    float fSpotSlope;
+    float fSpotConst;
+    float fSpotScale;
+    vec3_t vOrigin;
+    vec3_t vDirection;
+} reallightinfo_t;
+
+typedef float cube_entry_t[3][4];
+
+typedef struct {
+    vec3_t origin;
+    vec3_t worldOrigin;
+    vec3_t traceOrigin;
+    float radius;
+    struct mnode_s* leaves[8];
+    void(*TessFunction) (unsigned char* dstColors);
+    union {
+        unsigned char level[4];
+        int value;
+    } ambient;
+    int numRealLights;
+    reallightinfo_t light[MAX_REAL_LIGHTS];
+    int bUsesCubeMap;
+    float cubemap[24][3][4];
+} sphereor_t;
+
+typedef struct spherel_s {
+    vec3_t origin;
+	vec3_t color;
+    float intensity;
+    struct mnode_s* leaf;
+    int needs_trace;
+    int spot_light;
+    float spot_radiusbydistance;
+	vec3_t spot_dir;
+    int reference_count;
+} spherel_t;
 
 typedef struct dlight_s {
 	vec3_t	origin;
 	vec3_t	color;				// range from 0.0 to 1.0, should be color normalized
 	float	radius;
 
+	dlighttype_t type;
 	vec3_t	transformed;		// origin in local coordinate system
-	int		additive;			// texture detail is lost tho when the lightmap is dark
 } dlight_t;
 
 
@@ -69,13 +183,32 @@ typedef struct {
 	float		axisLength;		// compensate for non-normalized axis
 
 	qboolean	needDlights;	// true for bmodels that touch a dlight
-	qboolean	lightingCalculated;
+	qboolean	bLightGridCalculated;
+	int			iGridLighting;
+	float		lodpercentage[2];
+	qboolean	sphereCalculated;
+	int			lightingSphere;
+
+	//
+	// old lighting variables
+	//
 	vec3_t		lightDir;		// normalized direction towards light
 	vec3_t		ambientLight;	// color normalized to 0-255
 	int			ambientLightInt;	// 32 bit rgba packed
 	vec3_t		directedLight;
 } trRefEntity_t;
 
+typedef struct refSprite_s {
+    surfaceType_t surftype;
+    int hModel;
+    int shaderNum;
+    float origin[3];
+    float scale;
+    float axis[3][3];
+    unsigned char shaderRGBA[4];
+    int renderfx;
+    float shaderTime;
+} refSprite_t;
 
 typedef struct {
 	vec3_t		origin;			// in world coordinates
@@ -84,11 +217,36 @@ typedef struct {
 	float		modelMatrix[16];
 } orientationr_t;
 
+typedef struct image_s {
+	char		imgName[MAX_QPATH];		// game path, including extension
+	int			width, height;				// source image
+	int			uploadWidth, uploadHeight;	// after power of two and picmip but not including clamp to MAX_TEXTURE_SIZE
+	GLuint		texnum;					// gl texture binding
+
+	int			frameUsed;			// for texture usage in frame statistics
+	int			bytesUsed;
+
+	int			internalFormat;
+	int			TMU;				// only needed for voodoo2
+	int			numMipmaps;
+
+	qboolean	dynamicallyUpdated;
+	qboolean	allowPicmip;
+	qboolean	force32bit;
+    int			wrapClampModeX;
+    int			wrapClampModeY;
+	int			r_sequence;
+	int			UseCount;
+
+	struct image_s*	next;
+} image_t;
+
 //===============================================================================
 
 typedef enum {
 	SS_BAD,
 	SS_PORTAL,			// mirrors, portals, viewscreens
+	SS_PORTALSKY,
 	SS_ENVIRONMENT,		// sky box
 	SS_OPAQUE,			// opaque
 
@@ -97,8 +255,6 @@ typedef enum {
 						// in addition to alpha test
 	SS_BANNER,
 
-	SS_FOG,
-
 	SS_UNDERWATER,		// for items that should be drawn in front of the water plane
 
 	SS_BLEND0,			// regular transparency and filters
@@ -129,6 +285,10 @@ typedef enum {
 
 } genFunc_t;
 
+typedef enum {
+	USE_S_COORDS,
+	USE_T_COORDS
+} texDirection_t;
 
 typedef enum {
 	DEFORM_NONE,
@@ -136,17 +296,11 @@ typedef enum {
 	DEFORM_NORMALS,
 	DEFORM_BULGE,
 	DEFORM_MOVE,
-	DEFORM_PROJECTION_SHADOW,
 	DEFORM_AUTOSPRITE,
 	DEFORM_AUTOSPRITE2,
-	DEFORM_TEXT0,
-	DEFORM_TEXT1,
-	DEFORM_TEXT2,
-	DEFORM_TEXT3,
-	DEFORM_TEXT4,
-	DEFORM_TEXT5,
-	DEFORM_TEXT6,
-	DEFORM_TEXT7
+	DEFORM_LIGHTGLOW,
+	DEFORM_FLAP_S,
+	DEFORM_FLAP_T
 } deform_t;
 
 typedef enum {
@@ -159,7 +313,22 @@ typedef enum {
 	AGEN_LIGHTING_SPECULAR,
 	AGEN_WAVEFORM,
 	AGEN_PORTAL,
-	AGEN_CONST
+	AGEN_NOISE,
+	AGEN_DOT,
+	AGEN_ONE_MINUS_DOT,
+	AGEN_CONSTANT,
+	AGEN_GLOBAL_ALPHA,
+	AGEN_SKYALPHA,
+	AGEN_ONE_MINUS_SKYALPHA,
+	AGEN_SCOORD,
+	AGEN_TCOORD,
+	AGEN_DIST_FADE,
+    AGEN_ONE_MINUS_DIST_FADE,
+    AGEN_TIKI_DIST_FADE,
+    AGEN_ONE_MINUS_TIKI_DIST_FADE,
+	AGEN_DOT_VIEW,
+	AGEN_ONE_MINUS_DOT_VIEW,
+	AGEN_HEIGHT_FADE,
 } alphaGen_t;
 
 typedef enum {
@@ -172,9 +341,17 @@ typedef enum {
 	CGEN_VERTEX,			// tess.vertexColors * tr.identityLight
 	CGEN_ONE_MINUS_VERTEX,
 	CGEN_WAVEFORM,			// programmatically generated
-	CGEN_LIGHTING_DIFFUSE,
-	CGEN_FOG,				// standard fog
-	CGEN_CONST				// fixed color
+	CGEN_MULTIPLY_BY_WAVEFORM,
+	CGEN_LIGHTING_GRID,
+	CGEN_LIGHTING_SPHERICAL,
+	CGEN_CONSTANT,
+	CGEN_NOISE,
+	CGEN_GLOBAL_COLOR,
+	CGEN_STATIC,
+	CGEN_SCOORD,
+	CGEN_TCOORD,
+	CGEN_DOT,
+	CGEN_ONE_MINUS_DOT
 } colorGen_t;
 
 typedef enum {
@@ -183,8 +360,10 @@ typedef enum {
 	TCGEN_LIGHTMAP,
 	TCGEN_TEXTURE,
 	TCGEN_ENVIRONMENT_MAPPED,
-	TCGEN_FOG,
-	TCGEN_VECTOR			// S and T from world coordinates
+	TCGEN_VECTOR,			// S and T from world coordinates
+	TCGEN_ENVIRONMENT_MAPPED2,
+	TCGEN_SUN_REFLECTION,
+	TCGEN_FOG
 } texCoordGen_t;
 
 typedef enum {
@@ -206,14 +385,21 @@ typedef struct {
 #define TR_MAX_TEXMODS 4
 
 typedef enum {
-	TMOD_NONE,
-	TMOD_TRANSFORM,
-	TMOD_TURBULENT,
-	TMOD_SCROLL,
-	TMOD_SCALE,
-	TMOD_STRETCH,
-	TMOD_ROTATE,
-	TMOD_ENTITY_TRANSLATE
+    TMOD_NONE,
+    TMOD_TRANSFORM,
+    TMOD_TURBULENT,
+    TMOD_SCROLL,
+    TMOD_SCALE,
+    TMOD_STRETCH,
+    TMOD_ROTATE,
+    TMOD_ENTITY_TRANSLATE,
+    TMOD_NOISE,
+    TMOD_OFFSET,
+    TMOD_PARALLAX,
+    TMOD_MACRO,
+    TMOD_WAVETRANS,
+    TMOD_WAVETRANT,
+    TMOD_BULGETRANS
 } texMod_t;
 
 #define	MAX_SHADER_DEFORMS	3
@@ -244,6 +430,9 @@ typedef struct {
 	float			scale[2];			// s *= scale[0]
 	                                    // t *= scale[1]
 
+	// used for TMOD_PARALLAX
+	float			rate[2];
+
 	// used for TMOD_SCROLL
 	float			scroll[2];			// s' = s + scroll[0] * time
 										// t' = t + scroll[1] * time
@@ -251,16 +440,20 @@ typedef struct {
 	// + = clockwise
 	// - = counterclockwise
 	float			rotateSpeed;
+    float			rotateStart;
+    float			rotateCoef;
 
 } texModInfo_t;
 
 
-#define	MAX_IMAGE_ANIMATIONS	8
+#define	MAX_IMAGE_ANIMATIONS	64
+#define BUNDLE_ANIMATE_ONCE		1
 
 typedef struct {
 	image_t			*image[MAX_IMAGE_ANIMATIONS];
 	int				numImageAnimations;
 	float			imageAnimationSpeed;
+	float			imageAnimationPhase;
 
 	texCoordGen_t	tcGen;
 	vec3_t			tcGenVectors[2];
@@ -270,33 +463,50 @@ typedef struct {
 
 	int				videoMapHandle;
 	qboolean		isLightmap;
+	qboolean		vertexLightmap;
 	qboolean		isVideoMap;
+	int				flags;
 } textureBundle_t;
 
 #define NUM_TEXTURE_BUNDLES 2
 
 typedef struct {
 	qboolean		active;
+	qboolean		hasNormalMap;
 	
 	textureBundle_t	bundle[NUM_TEXTURE_BUNDLES];
+	image_t			*normalMap;
+	int				multitextureEnv;		// 0, GL_MODULATE, GL_ADD (FIXME: put in stage)
 
 	waveForm_t		rgbWave;
 	colorGen_t		rgbGen;
 
 	waveForm_t		alphaWave;
-	alphaGen_t		alphaGen;
+    alphaGen_t		alphaGen;
 
-	byte			constantColor[4];			// for CGEN_CONST and AGEN_CONST
+    unsigned		stateBits;					// GLS_xxxx mask
 
-	unsigned		stateBits;					// GLS_xxxx mask
 
-	acff_t			adjustColorsForFog;
+	qboolean		noMipMaps;
+    qboolean		noPicMip;
+    qboolean		force32bit;
 
-	qboolean		isDetail;
+	float			alphaMin;
+	float			alphaMax;
+	vec3_t			specOrigin;
+
+    byte			colorConst[4];			// for CGEN_CONST and AGEN_CONST
+	byte			alphaConst;
+	byte			alphaConstMin;
 } shaderStage_t;
 
 struct shaderCommands_s;
 
+#define LIGHTMAP_2D			-4		// shader is for 2D rendering
+#define LIGHTMAP_BY_VERTEX	-3		// pre-lit triangle models
+#define LIGHTMAP_WHITEIMAGE	-2
+#define	LIGHTMAP_NONE		-1
+
 typedef enum {
 	CT_FRONT_SIDED,
 	CT_BACK_SIDED,
@@ -314,6 +524,18 @@ typedef struct {
 	image_t		*outerbox[6], *innerbox[6];
 } skyParms_t;
 
+typedef enum {
+	SPRITE_PARALLEL,
+	SPRITE_PARALLEL_ORIENTED,
+	SPRITE_ORIENTED,
+	SPRITE_PARALLEL_UPRIGHT
+} spriteType_t;
+
+typedef struct {
+  spriteType_t type;
+  float scale;
+} spriteParms_t;
+
 typedef struct {
 	vec3_t	color;
 	float	depthForOpaque;
@@ -344,12 +566,15 @@ typedef struct shader_s {
 
 	qboolean	isSky;
 	skyParms_t	sky;
+	spriteParms_t sprite;
+	qboolean	isPortalSky;
+	float subdivisions;
+	float fDistRange;
+	float fDistNear;
 	fogParms_t	fogParms;
 
 	float		portalRange;			// distance to fog out at
 
-	int			multitextureEnv;		// 0, GL_MODULATE, GL_ADD (FIXME: put in stage)
-
 	cullType_t	cullType;				// CT_FRONT_SIDED, CT_BACK_SIDED, or CT_TWO_SIDED
 	qboolean	polygonOffset;			// set for decals and other items that must be offset 
 	qboolean	noMipMaps;				// for console fonts, 2D elements, etc.
@@ -366,18 +591,39 @@ typedef struct shader_s {
 	deformStage_t	deforms[MAX_SHADER_DEFORMS];
 
 	int			numUnfoggedPasses;
-	shaderStage_t	*stages[MAX_SHADER_STAGES];		
+	shaderStage_t	* unfoggedStages[MAX_SHADER_STAGES];
+
+	int			needsLGrid;
+	int			needsLSpherical;
+	int			stagesWithAlphaFog;
+	int			flags;
 
 	void		(*optimalStageIteratorFunc)( void );
 
-  double clampTime;                                  // time this shader is clamped to
-  double timeOffset;                                 // current time offset for this shader
+  float clampTime;                                  // time this shader is clamped to
+  float timeOffset;                                 // current time offset for this shader
+
+  int numStates;                                    // if non-zero this is a state shader
+  struct shader_s *currentShader;                   // current state if this is a state shader
+  struct shader_s *parentShader;                    // current state if this is a state shader
+  int currentState;                                 // current state index for cycle purposes
+  long expireTime;                                  // time in milliseconds this expires
 
   struct shader_s *remappedShader;                  // current shader this one is remapped too
 
+  int shaderStates[MAX_STATES_PER_SHADER];          // index to valid shader states
+
 	struct	shader_s	*next;
 } shader_t;
 
+typedef struct shaderState_s {
+  char shaderName[MAX_QPATH];     // name of shader this state belongs to
+  char name[MAX_STATE_NAME];      // name of this state
+  char stateShader[MAX_QPATH];    // shader this name invokes
+  int cycleTime;                  // time this cycle lasts, <= 0 is forever
+  shader_t *shader;
+} shaderState_t;
+
 
 // trRefdef_t holds everything that comes in refdef_t,
 // as well as the locally generated scene information
@@ -387,8 +633,6 @@ typedef struct {
 	vec3_t		vieworg;
 	vec3_t		viewaxis[3];		// transformation matrix
 
-	stereoFrame_t	stereoFrame;
-
 	int			time;				// time in milliseconds for shader effects and other time dependent rendering issues
 	int			rdflags;			// RDF_NOWORLDMODEL, etc
 
@@ -396,7 +640,7 @@ typedef struct {
 	byte		areamask[MAX_MAP_AREA_BYTES];
 	qboolean	areamaskModified;	// qtrue if areamask changed since last scene
 
-	double		floatTime;			// tr.refdef.time / 1000.0
+	float		floatTime;			// tr.refdef.time / 1000.0
 
 	// text messages for deform text shaders
 	char		text[MAX_RENDER_STRINGS][MAX_RENDER_STRING_LENGTH];
@@ -404,27 +648,44 @@ typedef struct {
 	int			num_entities;
 	trRefEntity_t	*entities;
 
+    int			num_sprites;
+    refSprite_t	*sprites;
+
 	int			num_dlights;
 	struct dlight_s	*dlights;
 
+	int			numTerMarks;
+	struct srfMarkFragment_s *terMarks;
+
 	int			numPolys;
 	struct srfPoly_s	*polys;
 
 	int			numDrawSurfs;
 	struct drawSurf_s	*drawSurfs;
 
+	int			numSpriteSurfs;
+	struct drawSurf_s	*spriteSurfs;
+
+    int			numStaticModels;
+    struct cStaticModelUnpacked_s *staticModels;
+
+    int			numStaticModelData;
+    unsigned char		*staticModelData;
+    qboolean sky_portal;
+    float sky_alpha;
+    vec3_t sky_origin;
+    vec3_t sky_axis[3];
+	// added in 2.0
+	//==
+    qboolean skybox_farplane;
+    qboolean render_terrain;
+	//==
 
 } trRefdef_t;
 
 
 //=================================================================================
 
-// max surfaces per-skin
-// This is an arbitry limit. Vanilla Q3 only supported 32 surfaces in skins but failed to
-// enforce the maximum limit when reading skin files. It was possile to use more than 32
-// surfaces which accessed out of bounds memory past end of skin->surfaces hunk block.
-#define MAX_SKIN_SURFACES	256
-
 // skins allow models to be retextured without modifying the model file
 typedef struct {
 	char		name[MAX_QPATH];
@@ -434,7 +695,7 @@ typedef struct {
 typedef struct skin_s {
 	char		name[MAX_QPATH];		// game path, including extension
 	int			numSurfaces;
-	skinSurface_t	*surfaces;			// dynamically allocated array of surfaces
+	skinSurface_t	*surfaces[MD3_MAX_SURFACES];
 } skin_t;
 
 
@@ -451,22 +712,35 @@ typedef struct {
 	float		surface[4];
 } fog_t;
 
+typedef struct depthfog_s {
+	float len;
+	float oolen;
+	int enabled;
+	int extrafrustums;
+} depthfog_t;
+
 typedef struct {
-	orientationr_t	or;
+	orientationr_t	ori;
 	orientationr_t	world;
 	vec3_t		pvsOrigin;			// may be different than or.origin for portals
 	qboolean	isPortal;			// true if this view is through a portal
 	qboolean	isMirror;			// the portal is a mirror, invert the face culling
+    qboolean	isPortalSky;		// since 2.0 whether or not this view is a portal sky
 	int			frameSceneNum;		// copied from tr.frameSceneNum
 	int			frameCount;			// copied from tr.frameCount
 	cplane_t	portalPlane;		// clip anything behind this if mirroring
 	int			viewportX, viewportY, viewportWidth, viewportHeight;
 	float		fovX, fovY;
 	float		projectionMatrix[16];
-	cplane_t	frustum[4];
+	cplane_t	frustum[5];
 	vec3_t		visBounds[2];
 	float		zFar;
-	stereoFrame_t	stereoFrame;
+	depthfog_t	fog;
+    float		farplane_distance;
+    float		farplane_bias; // added in 2.0
+	float		farplane_color[3];
+    qboolean	farplane_cull;
+    qboolean	renderTerrain; // added in 2.0
 } viewParms_t;
 
 
@@ -478,24 +752,6 @@ SURFACES
 ==============================================================================
 */
 
-// any changes in surfaceType must be mirrored in rb_surfaceTable[]
-typedef enum {
-	SF_BAD,
-	SF_SKIP,				// ignore
-	SF_FACE,
-	SF_GRID,
-	SF_TRIANGLES,
-	SF_POLY,
-	SF_MD3,
-	SF_MDR,
-	SF_IQM,
-	SF_FLARE,
-	SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
-
-	SF_NUM_SURFACE_TYPES,
-	SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
-} surfaceType_t;
-
 typedef struct drawSurf_s {
 	unsigned			sort;			// bit combination for fast compares
 	surfaceType_t		*surface;		// any of surface*_t
@@ -511,11 +767,23 @@ typedef struct drawSurf_s {
 typedef struct srfPoly_s {
 	surfaceType_t	surfaceType;
 	qhandle_t		hShader;
-	int				fogIndex;
 	int				numVerts;
 	polyVert_t		*verts;
+	int				renderfx;
 } srfPoly_t;
 
+typedef struct srfMarkFragment_s {
+	surfaceType_t surfaceType;
+	int iIndex;
+	int numVerts;
+	polyVert_t* verts;
+} srfMarkFragment_t;
+
+typedef struct srfDisplayList_s {
+	surfaceType_t	surfaceType;
+	int				listNum;
+} srfDisplayList_t;
+
 
 typedef struct srfFlare_s {
 	surfaceType_t	surfaceType;
@@ -528,13 +796,22 @@ typedef struct srfGridMesh_s {
 	surfaceType_t	surfaceType;
 
 	// dynamic lighting information
-	int				dlightBits;
+    int				dlightBits[SMP_FRAMES];
+    int				dlightMap[SMP_FRAMES];
 
 	// culling information
 	vec3_t			meshBounds[2];
 	vec3_t			localOrigin;
 	float			meshRadius;
 
+	// lightmap data
+    float			lightmapOffset[2];
+    int				lmX;
+    int				lmY;
+    int				lmWidth;
+    int				lmHeight;
+    unsigned char	*lmData;
+
 	// lod information, which may be different
 	// than the culling information to allow for
 	// groups of curves that LOD as a unit
@@ -558,7 +835,17 @@ typedef struct {
 	cplane_t	plane;
 
 	// dynamic lighting information
-	int			dlightBits;
+    int			dlightBits[SMP_FRAMES];
+    int			dlightMap[SMP_FRAMES];
+    float		lightmapOffset[2];
+    int			lmWidth;
+    int			lmHeight;
+    int			lmX;
+    int			lmY;
+    byte*		lmData;
+    vec3_t		lmOrigin;
+    vec3_t		lmVecs[2];
+    vec3_t		lmInverseVecs[2];
 
 	// triangle definitions (no normals at points)
 	int			numPoints;
@@ -574,7 +861,7 @@ typedef struct {
 	surfaceType_t	surfaceType;
 
 	// dynamic lighting information
-	int				dlightBits;
+	int				dlightBits[SMP_FRAMES];
 
 	// culling information (FIXME: use this!)
 	vec3_t			bounds[2];
@@ -589,63 +876,125 @@ typedef struct {
 	drawVert_t		*verts;
 } srfTriangles_t;
 
-typedef struct {
-	vec3_t translate;
-	quat_t rotate;
-	vec3_t scale;
-} iqmTransform_t;
+typedef union varnodeUnpacked_u {
+    float fVariance;
+    int flags;
+	/*
+    struct {
+#if !Q3_BIG_ENDIAN
+		byte flags;
+        unsigned char unused[3];
+#else
+        unsigned char unused[3];
+        byte flags;
+#endif
+    } s;
+	*/
+} varnodeUnpacked_t;
 
-// inter-quake-model
-typedef struct {
-	int		num_vertexes;
-	int		num_triangles;
-	int		num_frames;
-	int		num_surfaces;
-	int		num_joints;
-	int		num_poses;
-	struct srfIQModel_s	*surfaces;
+typedef unsigned short terraInt;
 
-	int		*triangles;
+typedef struct terrainVert_s {
+    vec3_t xyz;
+    vec2_t texCoords[2];
+    float fVariance;
+    float fHgtAvg;
+    float fHgtAdd;
+    unsigned int uiDistRecalc;
+    terraInt nRef;
+    terraInt iVertArray;
+    byte* pHgt;
+    terraInt iNext;
+    terraInt iPrev;
+} terrainVert_t;
 
-	// vertex arrays
-	float		*positions;
-	float		*texcoords;
-	float		*normals;
-	float		*tangents;
-	byte		*colors;
-	int		*influences; // [num_vertexes] indexes into influenceBlendVertexes
+typedef struct terraTri_s {
+    unsigned short iPt[3];
+    terraInt nSplit;
+    unsigned int uiDistRecalc;
+    struct cTerraPatchUnpacked_s* patch;
+    varnodeUnpacked_t* varnode;
+    terraInt index;
+    byte lod;
+    byte byConstChecks;
+    terraInt iLeft;
+    terraInt iRight;
+    terraInt iBase;
+    terraInt iLeftChild;
+    terraInt iRightChild;
+    terraInt iParent;
+    terraInt iPrev;
+    terraInt iNext;
+} terraTri_t;
 
-	// unique list of vertex blend indexes/weights for faster CPU vertex skinning
-	byte		*influenceBlendIndexes; // [num_influences]
-	union {
-		float	*f;
-		byte	*b;
-	} influenceBlendWeights; // [num_influences]
+typedef struct srfTerrain_s {
+    surfaceType_t surfaceType;
+    terraInt iVertHead;
+    terraInt iTriHead;
+    terraInt iTriTail;
+    terraInt iMergeHead;
+    int nVerts;
+    int nTris;
+    int lmapSize;
+    int dlightBits[2];
+    float lmapStep;
+    int dlightMap[2];
+    byte* lmData;
+    float lmapX;
+    float lmapY;
+} srfTerrain_t;
 
-	// depending upon the exporter, blend indices and weights might be int/float
-	// as opposed to the recommended byte/byte, for example Noesis exports
-	// int/float whereas the official IQM tool exports byte/byte
-	int		blendWeightsType; // IQM_UBYTE or IQM_FLOAT
+typedef struct cTerraPatchUnpacked_s {
+    srfTerrain_t drawinfo;
+    int viewCount;
+    int visCountCheck;
+    int visCountDraw;
+    int frameCount;
+    unsigned int uiDistRecalc;
+    float s;
+    float t;
+    vec2_t texCoord[2][2];
+    float x0;
+    float y0;
+    float z0;
+    float zmax;
+    shader_t* shader;
+    short int iNorth;
+    short int iEast;
+    short int iSouth;
+    short int iWest;
+    struct cTerraPatchUnpacked_s* pNextActive;
+    varnodeUnpacked_t varTree[2][63];
+    unsigned char heightmap[81];
+    byte flags;
+    byte byDirty;
+} cTerraPatchUnpacked_t;
 
-	char		*jointNames;
-	int		*jointParents;
-	float		*bindJoints; // [num_joints * 12]
-	float		*invBindJoints; // [num_joints * 12]
-	iqmTransform_t	*poses; // [num_frames * num_poses]
-	float		*bounds;
-} iqmData_t;
-
-// inter-quake-model surface
-typedef struct srfIQModel_s {
-	surfaceType_t	surfaceType;
-	char		name[MAX_QPATH];
-	shader_t	*shader;
-	iqmData_t	*data;
-	int		first_vertex, num_vertexes;
-	int		first_triangle, num_triangles;
-	int		first_influence, num_influences;
-} srfIQModel_t;
+typedef struct srfStaticModel_s {
+    surfaceType_t surfaceType;
+    struct cStaticModelUnpacked_s* parent;
+} srfStaticModel_t;
 
+typedef struct cStaticModelUnpacked_s {
+    qboolean useSpecialLighting;
+    qboolean bLightGridCalculated;
+    qboolean bRendered;
+    char model[128];
+    vec3_t origin;
+    vec3_t angles;
+    vec3_t axis[3];
+    float scale;
+    int firstVertexData;
+    int numVertexData;
+    int visCount;
+    dtiki_t* tiki;
+    sphere_dlight_t dlights[MAX_DLIGHTS];
+    int numdlights;
+    float radius;
+    float cull_radius;
+    int iGridLighting;
+    float lodpercentage[2];
+} cStaticModelUnpacked_t;
 
 extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
 
@@ -668,6 +1017,7 @@ BRUSH MODELS
 
 typedef struct msurface_s {
 	int					viewCount;		// if == tr.viewCount, already added
+	int					frameCount;
 	struct shader_s		*shader;
 	int					fogIndex;
 
@@ -690,18 +1040,40 @@ typedef struct mnode_s {
 
 	// leaf specific
 	int			cluster;
-	int			area;
+    int			area;
+    spherel_t**	lights;
+    int			numlights;
 
 	msurface_t	**firstmarksurface;
-	int			nummarksurfaces;
+    int			nummarksurfaces;
+
+    int			firstTerraPatch;
+    int			numTerraPatches;
+    int			firstStaticModel;
+    int			numStaticModels;
+    void**		pFirstMarkFragment;
+    int			iNumMarkFragment;
 } mnode_t;
 
 typedef struct {
 	vec3_t		bounds[2];		// for culling
 	msurface_t	*firstSurface;
 	int			numSurfaces;
+    void** pFirstMarkFragment;
+    int iNumMarkFragment;
+    int frameCount;
+    qboolean hasLightmap;
 } bmodel_t;
 
+typedef struct {
+    float width;
+    float height;
+    float origin_x;
+    float origin_y;
+    float scale;
+    shader_t* shader;
+} sprite_t;
+
 typedef struct {
 	char		name[MAX_QPATH];		// ie: maps/tim_dm2.bsp
 	char		baseName[MAX_QPATH];	// ie: tim_dm2
@@ -711,6 +1083,7 @@ typedef struct {
 	int			numShaders;
 	dshader_t	*shaders;
 
+	int			numBmodels;
 	bmodel_t	*bmodels;
 
 	int			numplanes;
@@ -726,24 +1099,36 @@ typedef struct {
 	int			nummarksurfaces;
 	msurface_t	**marksurfaces;
 
-	int			numfogs;
-	fog_t		*fogs;
-
-	vec3_t		lightGridOrigin;
+	vec3_t		lightGridMins;
 	vec3_t		lightGridSize;
-	vec3_t		lightGridInverseSize;
+	vec3_t		lightGridOOSize;
 	int			lightGridBounds[3];
+	unsigned short* lightGridOffsets;
 	byte		*lightGridData;
+	byte        lightGridPalette[768];
 
+    int numTerraPatches;
+    cTerraPatchUnpacked_t* terraPatches;
+    cTerraPatchUnpacked_t* activeTerraPatches;
+
+    int numVisTerraPatches;
+    cTerraPatchUnpacked_t** visTerraPatches;
+
+    int numStaticModelData;
+    byte* staticModelData;
+
+    int numStaticModels;
+    cStaticModelUnpacked_t* staticModels;
+
+    int numVisStaticModels;
+    cStaticModelUnpacked_t** visStaticModels;
 
 	int			numClusters;
 	int			clusterBytes;
 	const byte	*vis;			// may be passed in by CM_LoadMap to save space
 
 	byte		*novis;			// clusterBytes of 0xff
-
-	char		*entityString;
-	char		*entityParsePoint;
+	byte		*lighting;
 } world_t;
 
 //======================================================================
@@ -751,22 +1136,21 @@ typedef struct {
 typedef enum {
 	MOD_BAD,
 	MOD_BRUSH,
-	MOD_MESH,
-	MOD_MDR,
-	MOD_IQM
+	MOD_TIKI,
+	MOD_SPRITE
 } modtype_t;
 
 typedef struct model_s {
 	char		name[MAX_QPATH];
 	modtype_t	type;
-	int			index;		// model = tr.models[model->index]
+	int			index;				// model = tr.models[model->index]
 
-	int			dataSize;	// just for listing purposes
-	bmodel_t	*bmodel;		// only if type == MOD_BRUSH
-	md3Header_t	*md3[MD3_MAX_LODS];	// only if type == MOD_MESH
-	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM)
-
-	int			 numLods;
+    qboolean serveronly;
+    union {
+        bmodel_t* bmodel;
+        dtiki_t* tiki;
+        sprite_t* sprite;
+    } d;
 } model_t;
 
 
@@ -776,19 +1160,24 @@ void		R_ModelInit (void);
 model_t		*R_GetModelByHandle( qhandle_t hModel );
 int			R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, 
 					 float frac, const char *tagName );
-void		R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs );
 
 void		R_Modellist_f (void);
 
 //====================================================
+extern	refimport_t		ri;
 
 #define	MAX_DRAWIMAGES			2048
+#define	MAX_LIGHTMAPS			256
 #define	MAX_SKINS				1024
-
+#define MAX_SPHERE_LIGHTS		512
 
 #define	MAX_DRAWSURFS			0x10000
+#define	MAX_SPRITESURFS			0x8000
 #define	DRAWSURF_MASK			(MAX_DRAWSURFS-1)
 
+#define MAX_SPRITE_DIST				16384.0f
+#define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
+
 /*
 
 the drawsurf sort data is packed into a single 32 bit value so it can be
@@ -796,24 +1185,23 @@ compared quickly during the qsorting process
 
 the bits are allocated as follows:
 
-0 - 1	: dlightmap index
-//2		: used to be clipped flag REMOVED - 03.21.00 rad
-2 - 6	: fog index
-11 - 20	: entity index
 21 - 31	: sorted shader index
+11 - 20	: entity index
+2 - 6	: fog index
+//2		: used to be clipped flag REMOVED - 03.21.00 rad
+0 - 1	: dlightmap index
 
 	TTimo - 1.32
-0-1   : dlightmap index
-2-6   : fog index
+17-31 : sorted shader index
 7-16  : entity index
-17-30 : sorted shader index
+2-6   : fog index
+0-1   : dlightmap index
 */
-#define	QSORT_FOGNUM_SHIFT	2
+#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.30
+#define	QSORT_ENTITYNUM_SHIFT	8
+#define	QSORT_FOGNUM_SHIFT		2
 #define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_SHADERNUM_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
-#if (QSORT_SHADERNUM_SHIFT+SHADERNUM_BITS) > 32
-	#error "Need to update sorting, too many bits."
-#endif
+#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.30
 
 extern	int			gl_filter_min, gl_filter_max;
 
@@ -829,6 +1217,8 @@ typedef struct {
 	int		c_leafs;
 	int		c_dlightSurfaces;
 	int		c_dlightSurfacesCulled;
+	int		c_dlightMaps;
+	int		c_dlightTexels;
 } frontEndCounters_t;
 
 #define	FOG_TABLE_SIZE		256
@@ -844,11 +1234,16 @@ typedef struct {
 	qboolean	finishCalled;
 	int			texEnv[2];
 	int			faceCulling;
-	unsigned long	glStateBits;
+	int			cntTexEnvExt;
+	int			cntnvblendmode;
+	long unsigned int glStateBits;
+	long unsigned int externalSetState;
+	vec4_t fFogColor;
 } glstate_t;
 
+
 typedef struct {
-	int		c_surfaces, c_shaders, c_vertexes, c_indexes, c_totalIndexes;
+	int		c_surfaces, c_shaders, c_vertexes, c_indexes, c_totalIndexes, c_characterlights;
 	float	c_overDraw;
 	
 	int		c_dlightVertexes;
@@ -861,21 +1256,30 @@ typedef struct {
 	int		msec;			// total msec for backend run
 } backEndCounters_t;
 
-// all state modified by the back end is separated
+// all state modified by the back end is seperated
 // from the front end state
 typedef struct {
+	int			smpFrame;
 	trRefdef_t	refdef;
 	viewParms_t	viewParms;
-	orientationr_t	or;
+	orientationr_t	ori;
 	backEndCounters_t	pc;
 	qboolean	isHyperspace;
 	trRefEntity_t	*currentEntity;
-	qboolean	skyRenderedThisView;	// flag for drawing sun
-
-	qboolean	projection2D;	// if qtrue, drawstretchpic doesn't need to change modes
-	byte		color2D[4];
-	qboolean	vertexes2D;		// shader needs to be finished
-	trRefEntity_t	entity2D;	// currentEntity will point at this when doing 2D rendering
+    qboolean skyRenderedThisView;	// flag for drawing sun
+    sphereor_t spheres[MAX_SPHERE_LIGHTS];
+    unsigned short numSpheresUsed;
+    sphereor_t* currentSphere;
+    sphereor_t spareSphere;
+    sphereor_t hudSphere;
+    cStaticModelUnpacked_t* currentStaticModel;
+    int dsStreamVert;
+	qboolean in2D;	// if qtrue, drawstretchpic doesn't need to change modes
+	byte color2D[4];
+	qboolean vertexes2D;		// shader needs to be finished
+	trRefEntity_t entity2D;	// currentEntity will point at this when doing 2D rendering
+    int backEndMsec;
+    float shaderStartTime;
 } backEndState_t;
 
 /*
@@ -895,6 +1299,8 @@ typedef struct {
 	int						viewCount;		// incremented every view (twice a scene if portaled)
 											// and every R_MarkFragments call
 
+	int						smpFrame;		// toggles from 0 to 1 every endFrame
+
 	int						frameSceneNum;	// zeroed at RE_BeginFrame
 
 	qboolean				worldMapLoaded;
@@ -903,12 +1309,13 @@ typedef struct {
 	const byte				*externalVisData;	// from RE_SetWorldVisData, shared with CM_Load
 
 	image_t					*defaultImage;
-	image_t					*scratchImage[32];
+	image_t					*scratchImage;
 	image_t					*fogImage;
 	image_t					*dlightImage;	// inverse-quare highlight for projective adding
 	image_t					*flareImage;
 	image_t					*whiteImage;			// full of 0xff
 	image_t					*identityLightImage;	// full of tr.identityLightByte
+	image_t					*dlightImages[15];
 
 	shader_t				*defaultShader;
 	shader_t				*shadowShader;
@@ -918,12 +1325,14 @@ typedef struct {
 	shader_t				*sunShader;
 
 	int						numLightmaps;
-	image_t					**lightmaps;
+	image_t					*lightmaps[MAX_LIGHTMAPS];
 
 	trRefEntity_t			*currentEntity;
 	trRefEntity_t			worldEntity;		// point currentEntity at this when rendering world
 	int						currentEntityNum;
-	int						shiftedEntityNum;	// currentEntityNum << QSORT_REFENTITYNUM_SHIFT
+	int						currentSpriteNum;
+	int						shiftedEntityNum;	// currentEntityNum << QSORT_ENTITYNUM_SHIFT
+	int                     shiftedIsStatic;
 	model_t					*currentModel;
 
 	viewParms_t				viewParms;
@@ -931,9 +1340,15 @@ typedef struct {
 	float					identityLight;		// 1.0 / ( 1 << overbrightBits )
 	int						identityLightByte;	// identityLight * 255
 	int						overbrightBits;		// r_overbrightBits->integer, but set to 0 if no hw gamma
+    int						overbrightShift;
+    float					overbrightMult;
+    int						needsLightScale;
 
-	orientationr_t			or;					// for current entity
+	orientationr_t			ori;				// for current entity
 
+	portalsky_t				portalsky;
+	qboolean				skyRendered;
+	qboolean				portalRendered;
 	trRefdef_t				refdef;
 
 	int						viewCluster;
@@ -948,11 +1363,11 @@ typedef struct {
 	// put large tables at the end, so most elements will be
 	// within the +/32K indexed range on risc processors
 	//
-	model_t					*models[MAX_MOD_KNOWN];
+	model_t					models[MAX_MOD_KNOWN];
 	int						numModels;
 
 	int						numImages;
-	image_t					*images[MAX_DRAWIMAGES];
+	image_t					images[MAX_DRAWIMAGES];
 
 	// shader indexes from other modules will be looked up in tr.shaders[]
 	// shader indexes from drawsurfs will be looked up in sortedShaders[]
@@ -969,70 +1384,128 @@ typedef struct {
 	float					triangleTable[FUNCTABLE_SIZE];
 	float					sawToothTable[FUNCTABLE_SIZE];
 	float					inverseSawToothTable[FUNCTABLE_SIZE];
-	float					fogTable[FOG_TABLE_SIZE];
+
+    spherel_t sSunLight;
+    spherel_t sLights[1532];
+    int numSLights;
+    int rendererhandle;
+    qboolean shadersParsed;
+    int frame_skel_index;
+    int skel_index[1024];
+    fontheader_t* pFontDebugStrings;
+
+	int farclip;
 } trGlobals_t;
 
 extern backEndState_t	backEnd;
 extern trGlobals_t	tr;
+extern glconfig_t	glConfig;		// outside of TR since it shouldn't be cleared during ref re-init
+
+// These variables should live inside glConfig but can't because of
+// compatibility issues to the original ID vms.  If you release a stand-alone
+// game and your mod uses tr_types.h from this build you can safely move them
+// to the glconfig_t struct.
+extern qboolean  textureFilterAnisotropic;
+extern int       maxAnisotropy;
+extern float     displayAspect;
+extern qboolean  haveClampToEdge;
+
 extern glstate_t	glState;		// outside of TR since it shouldn't be cleared during ref re-init
+extern int r_sequencenumber;
+
 
 //
 // cvars
 //
 extern cvar_t	*r_flareSize;
 extern cvar_t	*r_flareFade;
-// coefficient for the flare intensity falloff function.
-#define FLARE_STDCOEFF "150"
-extern cvar_t	*r_flareCoeff;
-
-extern cvar_t	*r_railWidth;
-extern cvar_t	*r_railCoreWidth;
-extern cvar_t	*r_railSegmentLength;
 
 extern cvar_t	*r_ignore;				// used for debugging anything
 extern cvar_t	*r_verbose;				// used for verbose debug spew
 extern cvar_t	*r_ignoreFastPath;		// allows us to ignore our Tess fast paths
 
 extern cvar_t	*r_znear;				// near Z clip plane
-extern cvar_t	*r_zproj;				// z distance of projection plane
-extern cvar_t	*r_stereoSeparation;			// separation of cameras for stereo rendering
+
+extern cvar_t	*r_stencilbits;			// number of desired stencil bits
+extern cvar_t	*r_depthbits;			// number of desired depth bits
+extern cvar_t	*r_colorbits;			// number of desired color bits, only relevant for fullscreen
+extern cvar_t	*r_stereo;				// desired pixelformat stereo flag
+extern cvar_t	*r_textureDetails;
+extern cvar_t	*r_texturebits;			// number of desired texture bits
+										// 0 = use framebuffer depth
+										// 16 = use 16-bit textures
+										// 32 = use 32-bit textures
+										// all else = error
 
 extern cvar_t	*r_measureOverdraw;		// enables stencil buffer overdraw measurement
 
-extern cvar_t	*r_lodbias;				// push/pull LOD transitions
 extern cvar_t	*r_lodscale;
 
-extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existence
+extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existance
 										// "1" = glDrawElemet tristrips
 										// "2" = glDrawElements triangles
 										// "-1" = no drawing
 
 extern cvar_t	*r_inGameVideo;				// controls whether in game video should be draw
 extern cvar_t	*r_fastsky;				// controls whether sky should be cleared or drawn
+extern cvar_t	*r_fastdlights;
 extern cvar_t	*r_drawSun;				// controls drawing of sun quad
-extern cvar_t	*r_dynamiclight;		// dynamic lights enabled/disabled
 extern cvar_t	*r_dlightBacks;			// dlight non-facing surfaces for continuity
 
 extern	cvar_t	*r_norefresh;			// bypasses the ref rendering
 extern	cvar_t	*r_drawentities;		// disable/enable entity rendering
+extern	cvar_t	*r_drawentitypoly;
+extern	cvar_t	*r_drawstaticmodels;
+extern	cvar_t	*r_drawstaticmodelpoly;
+extern	cvar_t	*r_drawbrushes;
+extern	cvar_t	*r_drawbrushmodels;
+extern	cvar_t	*r_drawstaticdecals;
+extern	cvar_t	*r_drawterrain;
+extern	cvar_t	*r_drawsprites;
+extern	cvar_t	*r_drawspherelights;
 extern	cvar_t	*r_drawworld;			// disable/enable world rendering
 extern	cvar_t	*r_speeds;				// various levels of information display
 extern  cvar_t	*r_detailTextures;		// enables/disables detail texturing stages
 extern	cvar_t	*r_novis;				// disable/enable usage of PVS
 extern	cvar_t	*r_nocull;
+extern	cvar_t	*r_showcull;
 extern	cvar_t	*r_facePlaneCull;		// enables culling of planar surfaces with back side test
 extern	cvar_t	*r_nocurves;
 extern	cvar_t	*r_showcluster;
 
+extern cvar_t	*r_mode;				// video mode
+extern cvar_t	*r_maxmode;
+extern cvar_t	*r_vidmode1024;
+extern cvar_t	*r_vidmodemax;
+extern cvar_t	*r_fullscreen;
 extern cvar_t	*r_gamma;
 extern cvar_t	*r_displayRefresh;		// optional display refresh option
+extern cvar_t	*r_ignorehwgamma;		// overrides hardware gamma capabilities
+
+extern cvar_t	*r_allowExtensions;				// global enable/disable of OpenGL extensions
+extern cvar_t	*r_ext_compressed_textures;		// these control use of specific extensions
+extern cvar_t	*r_ext_gamma_control;
+extern cvar_t	*r_ext_texenv_op;
+extern cvar_t	*r_ext_multitexture;
+extern cvar_t	*r_ext_compiled_vertex_array;
+extern cvar_t	*r_ext_texture_env_add;
+extern cvar_t	*r_ext_texture_env_combine;
+extern cvar_t	*r_ext_aniso_filter;
+extern cvar_t	*r_ext_max_anisotropy;
+extern cvar_t	*r_forceClampToEdge;
+extern cvar_t	*r_geForce3WorkAround;
+extern cvar_t	*r_reset_tc_array;
 
 extern	cvar_t	*r_nobind;						// turns off binding to appropriate textures
 extern	cvar_t	*r_singleShader;				// make most world faces use default shader
+extern	cvar_t	*r_lerpmodels;
 extern	cvar_t	*r_roundImagesDown;
 extern	cvar_t	*r_colorMipLevels;				// development aid to see texture mip usage
 extern	cvar_t	*r_picmip;						// controls picmip values
 extern	cvar_t	*r_finish;
+extern	cvar_t	*r_drawBuffer;
+extern  cvar_t  *r_glDriver;
+extern	cvar_t	*r_swapInterval;
 extern	cvar_t	*r_textureMode;
 extern	cvar_t	*r_offsetFactor;
 extern	cvar_t	*r_offsetUnits;
@@ -1040,52 +1513,145 @@ extern	cvar_t	*r_offsetUnits;
 extern	cvar_t	*r_fullbright;					// avoid lightmap pass
 extern	cvar_t	*r_lightmap;					// render lightmaps only
 extern	cvar_t	*r_vertexLight;					// vertex lighting mode for better performance
-extern	cvar_t	*r_uiFullScreen;				// ui is running fullscreen
 
 extern	cvar_t	*r_logFile;						// number of frames to emit GL logs
 extern	cvar_t	*r_showtris;					// enables wireframe rendering of the world
 extern	cvar_t	*r_showsky;						// forces sky in front of all surfaces
 extern	cvar_t	*r_shownormals;					// draws wireframe normals
+extern	cvar_t	*r_showhbox;
+extern	cvar_t	*r_showstaticbboxes;
 extern	cvar_t	*r_clear;						// force screen clear every frame
 
 extern	cvar_t	*r_shadows;						// controls shadows: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
+extern	cvar_t	*r_entlight_scale;
+extern	cvar_t	*r_entlight_errbound;
+extern	cvar_t	*r_entlight_cubelevel;
+extern	cvar_t	*r_entlight_cubefraction;
+extern	cvar_t	*r_entlight_maxcalc;
 extern	cvar_t	*r_flares;						// light flares
 
 extern	cvar_t	*r_intensity;
 
 extern	cvar_t	*r_lockpvs;
 extern	cvar_t	*r_noportals;
+extern	cvar_t	*r_entlightmap;
+extern	cvar_t	*r_fastentlight;
 extern	cvar_t	*r_portalOnly;
 
 extern	cvar_t	*r_subdivisions;
 extern	cvar_t	*r_lodCurveError;
+extern	cvar_t	*r_smp;
+extern	cvar_t	*r_showSmp;
 extern	cvar_t	*r_skipBackEnd;
 
-extern	cvar_t	*r_anaglyphMode;
-
-extern	cvar_t	*r_greyscale;
-
 extern	cvar_t	*r_ignoreGLErrors;
 
 extern	cvar_t	*r_overBrightBits;
 extern	cvar_t	*r_mapOverBrightBits;
 
 extern	cvar_t	*r_debugSurface;
-extern	cvar_t	*r_simpleMipMaps;
 
 extern	cvar_t	*r_showImages;
+extern	cvar_t	*r_showlod;
+extern	cvar_t	*r_showstaticlod;
 extern	cvar_t	*r_debugSort;
 
 extern	cvar_t	*r_printShaders;
+extern	cvar_t	*r_saveFontData;
 
-extern cvar_t	*r_marksOnTriangleMeshes;
+extern	cvar_t* r_staticlod;
+extern	cvar_t* r_lodscale;
+extern	cvar_t* r_lodcap;
+extern	cvar_t* r_lodviewmodelcap;
+
+extern  cvar_t* r_uselod;
+extern  cvar_t* lod_LOD;
+extern  cvar_t* lod_minLOD;
+extern  cvar_t* lod_maxLOD;
+extern  cvar_t* lod_LOD_slider;
+extern  cvar_t* lod_curve_0_val;
+extern  cvar_t* lod_curve_1_val;
+extern  cvar_t* lod_curve_2_val;
+extern  cvar_t* lod_curve_3_val;
+extern  cvar_t* lod_curve_4_val;
+extern  cvar_t* lod_edit_0;
+extern  cvar_t* lod_edit_1;
+extern  cvar_t* lod_edit_2;
+extern  cvar_t* lod_edit_3;
+extern  cvar_t* lod_edit_4;
+extern  cvar_t* lod_curve_0_slider;
+extern  cvar_t* lod_curve_1_slider;
+extern  cvar_t* lod_curve_2_slider;
+extern  cvar_t* lod_curve_3_slider;
+extern  cvar_t* lod_curve_4_slider;
+extern  cvar_t* lod_pitch_val;
+extern  cvar_t* lod_zee_val;
+extern  cvar_t* lod_mesh;
+extern  cvar_t* lod_meshname;
+extern  cvar_t* lod_tikiname;
+extern  cvar_t* lod_metric;
+extern  cvar_t* lod_tris;
+extern  cvar_t* lod_position;
+extern  cvar_t* lod_save;
+extern  cvar_t* lod_tool;
+extern	cvar_t* sys_cpuid;
+extern	cvar_t* r_sse;
+extern	cvar_t* r_static_shaderdata0;
+extern	cvar_t* r_static_shaderdata1;
+extern	cvar_t* r_static_shaderdata2;
+extern	cvar_t* r_static_shaderdata3;
+extern	cvar_t* r_static_shadermultiplier0;
+extern	cvar_t* r_static_shadermultiplier1;
+extern	cvar_t* r_static_shadermultiplier2;
+extern	cvar_t* r_static_shadermultiplier3;
+
+extern  cvar_t* r_numdebuglines;
+
+extern	cvar_t* r_stipplelines;
+extern	cvar_t* r_light_lines;
+extern	cvar_t* r_light_sun_line;
+extern	cvar_t* r_light_int_scale;
+extern	cvar_t* r_light_nolight;
+extern	cvar_t* r_light_showgrid;
+extern	cvar_t* r_skyportal;
+extern	cvar_t* r_skyportal_origin;
+extern	cvar_t* r_farplane;
+extern	cvar_t* r_farplane_bias;
+extern	cvar_t* r_farplane_color;
+extern	cvar_t* r_farplane_nocull;
+extern	cvar_t* r_farplane_nofog;
+extern	cvar_t* r_skybox_farplane;
+extern	cvar_t* r_farclip;
+extern	cvar_t* r_lightcoronasize;
+extern	cvar_t* r_useglfog;
+extern	cvar_t* r_debuglines_depthmask;
+extern	cvar_t* r_smoothsmokelight;
+extern	cvar_t* r_showportal;
+extern	cvar_t* ter_minMarkRadius;
+extern	cvar_t* ter_fastMarks;
+extern	cvar_t* r_alpha_foliage1;
+extern	cvar_t* r_alpha_foliage2;
+extern	cvar_t* r_blendtrees;
+extern	cvar_t* r_blendbushes;
+extern	cvar_t* r_bumpmap;
+extern	cvar_t* r_loadjpg;
+extern	cvar_t* r_loadftx;
+
+extern  cvar_t* r_showSkeleton;
 
 //====================================================================
 
+float R_NoiseGet4f( float x, float y, float z, float t );
+void  R_NoiseInit( void );
+
 void R_SwapBuffers( int );
 
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
 void R_RenderView( viewParms_t *parms );
 
+qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum);
+
 void R_AddMD3Surfaces( trRefEntity_t *e );
 void R_AddNullModelSurfaces( trRefEntity_t *e );
 void R_AddBeamSurfaces( trRefEntity_t *e );
@@ -1094,27 +1660,32 @@ void R_AddLightningBoltSurfaces( trRefEntity_t *e );
 
 void R_AddPolygonSurfaces( void );
 
-void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap );
+void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel);
 
-void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, int fogIndex, int dlightMap );
+void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap);
 
 
 #define	CULL_IN		0		// completely unclipped
 #define	CULL_CLIP	1		// clipped by one or more planes
 #define	CULL_OUT	2		// completely outside the clipping planes
-void R_LocalNormalToWorld (vec3_t local, vec3_t world);
-void R_LocalPointToWorld (vec3_t local, vec3_t world);
+void R_LocalNormalToWorld (const vec3_t local, vec3_t world);
+void R_LocalPointToWorld (const vec3_t local, vec3_t world);
+int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]);
 int R_CullLocalBox (vec3_t bounds[2]);
 int R_CullPointAndRadius( vec3_t origin, float radius );
 int R_CullLocalPointAndRadius( vec3_t origin, float radius );
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius);
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius);
 
-void R_SetupProjection(viewParms_t *dest, float zProj, qboolean computeFrustum);
-void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms, orientationr_t *or );
+void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms, orientationr_t *ori );
+void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori );
+void R_RotateForViewer(void);
+void R_SetupFrustum(void);
 
 /*
 ** GL wrapper/helper functions
 */
+void	GL_SetFogColor(const vec4_t fColor);
 void	GL_Bind( image_t *image );
 void	GL_SetDefaultState (void);
 void	GL_SelectTexture( int unit );
@@ -1146,35 +1717,82 @@ void	GL_Cull( int cullType );
 #define		GLS_DSTBLEND_BITS					0x000000f0
 
 #define GLS_DEPTHMASK_TRUE						0x00000100
+#define GLS_COLOR_MASK							0x00000200
+#define GLS_POLYMODE_LINE						0x00000400
+#define GLS_DEPTHTEST_DISABLE					0x00000800
+#define GLS_DEPTHFUNC_EQUAL						0x00001000
 
-#define GLS_POLYMODE_LINE						0x00001000
+#define GLS_CLAMP_EDGE							0x00002000
+#define GLS_MULTITEXTURE						0x00004000
+#define GLS_MULTITEXTURE_ENV					0x00008000
+#define GLS_FOG									0x00010000
 
-#define GLS_DEPTHTEST_DISABLE					0x00010000
-#define GLS_DEPTHFUNC_EQUAL						0x00020000
+#define GLS_FOG_ENABLED							0x00020000
+#define GLS_FOG_BLACK							0x00040000
+#define GLS_FOG_WHITE							0x00080000
+#define GLS_FOG_COLOR							(GLS_FOG_BLACK | GLS_FOG_WHITE)
+#define GLS_FOG_BITS							(GLS_FOG_WHITE|GLS_FOG_BLACK|GLS_FOG_ENABLED)
+#define GLS_COLOR_NOMASK						0x00100000
 
 #define GLS_ATEST_GT_0							0x10000000
 #define GLS_ATEST_LT_80							0x20000000
-#define GLS_ATEST_GE_80							0x40000000
-#define		GLS_ATEST_BITS						0x70000000
+#define GLS_ATEST_GE_80							0x30000000
+#define GLS_ATEST_LT_FOLIAGE1					0x40000000
+#define GLS_ATEST_GE_FOLIAGE1					0x50000000
+#define GLS_ATEST_LT_FOLIAGE2					0x60000000
+#define GLS_ATEST_GE_FOLIAGE2					0x70000000
+#define GLS_ATEST_BITS							0x70000000
 
 #define GLS_DEFAULT			GLS_DEPTHMASK_TRUE
 
-void	RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty);
+void Draw_SetColor(const vec4_t rgba);
+void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
+void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
+void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
+void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
+void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
+void DrawBox(float x, float y, float w, float h);
+void AddBox(float x, float y, float w, float h);
+void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
+void RE_Scissor(int x, int y, int width, int height);
+void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
+void RE_StretchRaw(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
 void	RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty);
 
 void		RE_BeginFrame( stereoFrame_t stereoFrame );
 void		RE_BeginRegistration( glconfig_t *glconfig );
 void		RE_LoadWorldMap( const char *mapname );
+void		RE_PrintBSPFileSizes(void);
+int			RE_MapVersion(void);
 void		RE_SetWorldVisData( const byte *vis );
 qhandle_t	RE_RegisterModel( const char *name );
 qhandle_t	RE_RegisterSkin( const char *name );
 void		RE_Shutdown( qboolean destroyWindow );
+void        R_ClearWorld(void);
 
 qboolean	R_GetEntityToken( char *buffer, int size );
 
 model_t		*R_AllocModel( void );
 
 void    	R_Init( void );
+image_t		*R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+image_t		*R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+
+image_t* R_CreateImage(
+	const char* name,
+	byte* pic,
+	int width,
+	int height,
+	int numMipmaps,
+	int iMipmapsAvailable,
+	qboolean allowPicmip,
+	qboolean force32bit,
+	qboolean hasAlpha,
+	int glCompressMode,
+	int glWrapClampModeX,
+	int glWrapClampModeY
+);
+qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );
 
 void		R_SetColorMappings( void );
 void		R_GammaCorrect( byte *buffer, int bufSize );
@@ -1185,29 +1803,57 @@ void	R_SkinList_f( void );
 const void *RB_TakeScreenshotCmd( const void *data );
 void	R_ScreenShot_f( void );
 
-void	R_InitFogTable( void );
-float	R_FogFactor( float s, float t );
 void	R_InitImages( void );
+void	R_FreeImage(image_t* image);
 void	R_DeleteTextures( void );
+void    R_FreeUnusedImages( void );
 int		R_SumOfUsedImages( void );
-void	R_InitSkins( void );
 skin_t	*R_GetSkinByHandle( qhandle_t hSkin );
 
-int R_ComputeLOD( trRefEntity_t *ent );
-
-const void *RB_TakeVideoFrameCmd( const void *data );
 
 //
 // tr_shader.c
 //
-shader_t	*R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage );
+qhandle_t		 RE_RegisterShader( const char *name );
+qhandle_t		 RE_RegisterShaderNoMip( const char *name );
+qhandle_t		RE_RefreshShaderNoMip(const char* name);
+qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_t *image, qboolean mipRawImage);
+
+shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy);
 shader_t	*R_GetShaderByHandle( qhandle_t hShader );
 shader_t	*R_GetShaderByState( int index, long *cycleTime );
-shader_t *R_FindShaderByName( const char *name );
-void		R_InitShaders( void );
+void R_StartupShaders();
+void R_ShutdownShaders();
+void R_SetupShaders();
 void		R_ShaderList_f( void );
 void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
 
+/*
+====================================================================
+
+IMPLEMENTATION SPECIFIC FUNCTIONS
+
+====================================================================
+*/
+
+void		GLimp_Init( qboolean fixedFunction );
+void		GLimp_Shutdown( void );
+void		GLimp_EndFrame( void );
+
+qboolean	GLimp_SpawnRenderThread( void (*function)( void ) );
+void		*GLimp_RendererSleep( void );
+void		GLimp_FrontEndSleep( void );
+void		GLimp_WakeRenderer( void *data );
+
+void		GLimp_LogComment( char *comment );
+
+// NOTE TTimo linux works with float gamma value, not the gamma table
+//   the params won't be used, getting the r_gamma cvar directly
+void		GLimp_SetGamma( unsigned char red[256], 
+						    unsigned char green[256],
+							unsigned char blue[256] );
+
+
 /*
 ====================================================================
 
@@ -1223,7 +1869,6 @@ typedef struct stageVars
 	vec2_t		texcoords[NUM_TEXTURE_BUNDLES][SHADER_MAX_VERTEXES];
 } stageVars_t;
 
-
 typedef struct shaderCommands_s 
 {
 	glIndex_t	indexes[SHADER_MAX_INDEXES] QALIGN(16);
@@ -1238,10 +1883,11 @@ typedef struct shaderCommands_s
 	color4ub_t	constantColor255[SHADER_MAX_VERTEXES] QALIGN(16);
 
 	shader_t	*shader;
-	double		shaderTime;
+	float		shaderTime;
 	int			fogNum;
 
 	int			dlightBits;	// or together of all vertexDlightBits
+	int			dlightMap;
 
 	int			numIndexes;
 	int			numVertexes;
@@ -1250,24 +1896,26 @@ typedef struct shaderCommands_s
 	int			numPasses;
 	void		(*currentStageIteratorFunc)( void );
 	shaderStage_t	**xstages;
+    qboolean no_global_fog;
+    qboolean vertexColorValid;
 } shaderCommands_t;
 
 extern	shaderCommands_t	tess;
 
-void RB_BeginSurface(shader_t *shader, int fogNum );
+void RB_BeginSurface(shader_t *shader );
 void RB_EndSurface(void);
 void RB_CheckOverflow( int verts, int indexes );
 #define RB_CHECKOVERFLOW(v,i) if (tess.numVertexes + (v) >= SHADER_MAX_VERTEXES || tess.numIndexes + (i) >= SHADER_MAX_INDEXES ) {RB_CheckOverflow(v,i);}
 
 void RB_StageIteratorGeneric( void );
 void RB_StageIteratorSky( void );
-void RB_StageIteratorVertexLitTexture( void );
-void RB_StageIteratorLightmappedMultitexture( void );
+void RB_StageIteratorVertexLitTextureUnfogged( void );
+void RB_StageIteratorLightmappedMultitextureUnfogged( void );
 
 void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color );
 void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 );
 
-void RB_ShowImages( void );
+void RB_ShowImages( qboolean quiet );
 
 
 /*
@@ -1278,7 +1926,15 @@ WORLD MAP
 ============================================================
 */
 
+extern terraTri_t* g_pTris;
+extern terrainVert_t* g_pVert;
+
 void R_AddBrushModelSurfaces( trRefEntity_t *e );
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes);
+mnode_t* R_PointInLeaf(const vec3_t p);
+int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
 void R_AddWorldSurfaces( void );
 qboolean R_inPVS( const vec3_t p1, const vec3_t p2 );
 
@@ -1306,9 +1962,27 @@ LIGHTS
 */
 
 void R_DlightBmodel( bmodel_t *bmodel );
+void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
+void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight);
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
 void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent );
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *or );
-int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir );
+void RB_SetupEntityGridLighting();
+void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
+int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBit);
+int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits);
+int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits);
+void R_TransformDlights( int count, dlight_t *dl, orientationr_t *ori );
+void RB_Light_Real(unsigned char* colors);
+void RB_Sphere_BuildDLights();
+void RB_Sphere_SetupEntity();
+void RB_Grid_SetupEntity();
+void RB_Grid_SetupStaticModel();
+void RB_Light_Fullbright(unsigned char* colors);
+void R_Sphere_InitLights();
+int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
+void R_ClearRealDlights();
+void R_UploadDlights();
 
 
 /*
@@ -1320,6 +1994,7 @@ SHADOWS
 */
 
 void RB_ShadowTessEnd( void );
+void RB_ComputeShadowVolume();
 void RB_ShadowFinish( void );
 void RB_ProjectionShadowDeform( void );
 
@@ -1334,7 +2009,7 @@ SKIES
 void R_BuildCloudData( shaderCommands_t *shader );
 void R_InitSkyTexCoords( float cloudLayerHeight );
 void R_DrawSkyBox( shaderCommands_t *shader );
-void RB_DrawSun( float scale, shader_t *shader );
+void RB_DrawSun( void );
 void RB_ClipSkyPolygons( shaderCommands_t *shader );
 
 /*
@@ -1347,7 +2022,7 @@ CURVE TESSELATION
 
 #define PATCH_STITCHING
 
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
+srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
 								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] );
 srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror );
 srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror );
@@ -1362,7 +2037,11 @@ MARKERS, POLYGON PROJECTION ON WORLD POLYGONS
 */
 
 int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );
+				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared);
+
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
 
 
 /*
@@ -1373,50 +2052,202 @@ SCENE GENERATION
 ============================================================
 */
 
-void R_InitNextFrame( void );
+void R_ToggleSmpFrame( void );
 
 void RE_ClearScene( void );
-void RE_AddRefEntityToScene( const refEntity_t *ent );
-void RE_AddPolyToScene( qhandle_t hShader , int numVerts, const polyVert_t *verts, int num );
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b );
+void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber);
+void RE_AddRefSpriteToScene(const refEntity_t* ent);
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+refEntity_t* RE_GetRenderEntity(int entityNumber);
+qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type );
 void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
 void RE_RenderScene( const refdef_t *fd );
 
 /*
 =============================================================
 
-UNCOMPRESSING BONES
-
-=============================================================
-*/
-
-#define MC_BITS_X (16)
-#define MC_BITS_Y (16)
-#define MC_BITS_Z (16)
-#define MC_BITS_VECT (16)
-
-#define MC_SCALE_X (1.0f/64)
-#define MC_SCALE_Y (1.0f/64)
-#define MC_SCALE_Z (1.0f/64)
-
-void MC_UnCompress(float mat[3][4],const unsigned char * comp);
-
-/*
-=============================================================
-
 ANIMATED MODELS
 
 =============================================================
 */
 
-void R_MDRAddAnimSurfaces( trRefEntity_t *ent );
-void RB_MDRSurfaceAnim( mdrSurface_t *surface );
-qboolean R_LoadIQM (model_t *mod, void *buffer, int filesize, const char *name );
-void R_AddIQMSurfaces( trRefEntity_t *ent );
-void RB_IQMSurfaceAnim( surfaceType_t *surface );
-int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
-                  int startFrame, int endFrame,
-                  float frac, const char *tagName );
+void R_MakeAnimModel( model_t *model );
+void R_AddAnimSurfaces(trRefEntity_t* ent);
+
+/*
+=============================================================
+
+FONT
+
+=============================================================
+*/
+fontheader_t* R_LoadFont(const char* name);
+void R_LoadFontShader(fontheader_sgl_t* font);
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
+void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
+float R_GetFontHeight(const fontheader_t* font);
+float R_GetFontStringWidth(const fontheader_t* font, const char* s);
+
+/*
+=============================================================
+
+MARKS
+
+=============================================================
+*/
+void R_LevelMarksLoad(const char* szBSPName);
+void R_LevelMarksInit();
+void R_LevelMarksFree();
+void R_UpdateLevelMarksSystem();
+void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
+
+/*
+=============================================================
+
+SKY PORTALS
+
+=============================================================
+*/
+void R_Sky_Init();
+void R_Sky_Reset();
+void R_Sky_AddSurf(msurface_t* surf);
+void R_Sky_Render();
+
+/*
+=============================================================
+
+SPRITE
+
+=============================================================
+*/
+sprite_t* SPR_RegisterSprite(const char* name);
+void RB_DrawSprite(const refSprite_t* spr);
+
+
+/*
+=============================================================
+
+SUN FLARE
+
+=============================================================
+*/
+void R_InitLensFlare();
+void R_DrawLensFlares();
+
+/*
+=============================================================
+
+SWIPE
+
+=============================================================
+*/
+void RB_DrawSwipeSurface(surfaceType_t* pswipe);
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
+void RE_SwipeEnd();
+void R_AddSwipeSurfaces();
+
+/*
+=============================================================
+
+TERRAIN
+
+=============================================================
+*/
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
+void R_AddTerrainSurfaces();
+void R_AddTerrainMarkSurfaces();
+void R_InitTerrain();
+void R_TerrainPrepareFrame();
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
+void R_SwapTerraPatch(cTerraPatch_t* pPatch);
+
+void R_TerrainCrater_f(void);
+
+/*
+=============================================================
+
+TIKI
+
+=============================================================
+*/
+struct skelHeaderGame_s;
+struct skelAnimFrame_s;
+
+void R_InitStaticModels(void);
+void RE_FreeModels(void);
+qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
+qhandle_t RE_RegisterServerModel(const char* name);
+void RE_UnregisterServerModel(qhandle_t hModel);
+orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
+qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
+float R_ModelRadius(qhandle_t handle);
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
+dtiki_t* R_Model_GetHandle(qhandle_t handle);
+
+float R_GetRadius(refEntity_t* model);
+void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
+void RE_ForceUpdatePose(refEntity_t* model);
+void RE_SetFrameNumber(int frameNumber);
+void R_UpdatePoseInternal(refEntity_t* model);
+void RB_SkelMesh(skelSurfaceGame_t* sf);
+void RB_StaticMesh(staticSurface_t* staticSurf);
+void RB_Static_BuildDLights();
+void R_InfoStaticModels_f(void);
+void R_PrintInfoStaticModels();
+void R_AddSkelSurfaces(trRefEntity_t* ent);
+void R_AddStaticModelSurfaces(void);
+void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris);
+float R_CalcLod(const vec3_t origin, float radius);
+int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
+int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
+void R_InfoWorldTris_f(void);
+void R_PrintInfoWorldtris(void);
+void R_DebugSkeleton(void);
+
+extern int g_nStaticSurfaces;
+extern qboolean g_bInfostaticmodels;
+extern qboolean g_bInfoworldtris;
+
+/*
+=============================================================
+
+UTIL
+
+=============================================================
+*/
+void RB_StreamBegin(shader_t* shader);
+void RB_StreamEnd(void);
+void RB_StreamBeginDrawSurf(void);
+void RB_StreamEndDrawSurf(void);
+static void addTriangle(void);
+void RB_Vertex3fv(vec3_t v);
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
+void RB_Vertex2f(vec_t x, vec_t y);
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
+void RB_Color3f(vec_t r, vec_t g, vec_t b);
+void RB_Color3fv(vec3_t col);
+void RB_Color4bv(unsigned char* colors);
+void RB_Texcoord2f(float s, float t);
+void RB_Texcoord2fv(vec2_t st);
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
+void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
+int RE_GetShaderWidth(qhandle_t hShader);
+int RE_GetShaderHeight(qhandle_t hShader);
+const char* RE_GetShaderName(qhandle_t hShader);
+const char* RE_GetModelName(qhandle_t hModel);
+
+/*
+=============================================================
+
+GHOST
+
+=============================================================
+*/
+
+void R_UpdateGhostTextures();
+void R_SetGhostImage(const char* name, image_t* image);
+void LoadGHOST(const char* name, byte** pic, int* width, int* height);
 
 /*
 =============================================================
@@ -1429,25 +2260,45 @@ void	R_TransformClipToWindow( const vec4_t clip, const viewParms_t *view, vec4_t
 void	RB_DeformTessGeometry( void );
 
 void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
-void	RB_CalcFogTexCoords( float *dstTexCoords );
+void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
+void	RB_CalcSunReflectionTexCoords( float *dstTexCoords );
+void	RB_CalcOffsetTexCoords(const float* offset, float* st);
+void	RB_CalcParallaxTexCoords(const float* rate, float* st);
+void	RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv);
+void	RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2]);
+void	RB_CalcMacroTexCoords(const  float* rate, float* st);
 void	RB_CalcScrollTexCoords( const float scroll[2], float *dstTexCoords );
-void	RB_CalcRotateTexCoords( float rotSpeed, float *dstTexCoords );
+void	RB_CalcRotateTexCoords( float degsPerSecond, float degsPerSecondCoef, float* st, float start );
 void	RB_CalcScaleTexCoords( const float scale[2], float *dstTexCoords );
 void	RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *dstTexCoords );
 void	RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *dstTexCoords );
-void	RB_CalcModulateColorsByFog( unsigned char *dstColors );
-void	RB_CalcModulateAlphasByFog( unsigned char *dstColors );
-void	RB_CalcModulateRGBAsByFog( unsigned char *dstColors );
 void	RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors );
-void	RB_CalcWaveColor( const waveForm_t *wf, unsigned char *dstColors );
+void	RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor);
 void	RB_CalcAlphaFromEntity( unsigned char *dstColors );
 void	RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors );
 void	RB_CalcStretchTexCoords( const waveForm_t *wf, float *texCoords );
 void	RB_CalcColorFromEntity( unsigned char *dstColors );
 void	RB_CalcColorFromOneMinusEntity( unsigned char *dstColors );
-void	RB_CalcSpecularAlpha( unsigned char *alphas );
+void	RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor);
+void	RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha);
+void	RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
+void	RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
+void	RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin);
+void	RB_CalcLightGridColor(unsigned char* colors);
+void	RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax);
 void	RB_CalcDiffuseColor( unsigned char *colors );
 
+void	RB_CalcStretchTexCoords(const waveForm_t* wf, float* st);
+void	RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st);
+void	RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st);
+void	RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st);
+
 /*
 =============================================================
 
@@ -1456,6 +2307,7 @@ RENDERER BACK END FUNCTIONS
 =============================================================
 */
 
+void RB_RenderThread( void );
 void RB_ExecuteRenderCommands( const void *data );
 
 /*
@@ -1468,6 +2320,16 @@ RENDERER BACK END COMMAND QUEUE
 
 #define	MAX_RENDER_COMMANDS	0x40000
 
+typedef struct suninfo_s {
+	vec3_t color;
+	vec3_t direction;
+	vec3_t flaredirection;
+	char szFlareName[64];
+	qboolean exists;
+} suninfo_t;
+
+extern suninfo_t s_sun;
+
 typedef struct {
 	byte	cmds[MAX_RENDER_COMMANDS];
 	int		used;
@@ -1527,68 +2389,64 @@ typedef struct {
 	qboolean jpeg;
 } screenshotCommand_t;
 
-typedef struct {
-	int						commandId;
-	int						width;
-	int						height;
-	byte					*captureBuffer;
-	byte					*encodeBuffer;
-	qboolean			motionJpeg;
-} videoFrameCommand_t;
-
-typedef struct
-{
-	int commandId;
-
-	GLboolean rgba[4];
-} colorMaskCommand_t;
-
-typedef struct
-{
-	int commandId;
-} clearDepthCommand_t;
-
 typedef enum {
 	RC_END_OF_LIST,
 	RC_SET_COLOR,
 	RC_STRETCH_PIC,
 	RC_DRAW_SURFS,
+	RC_SPRITE_SURFS,
 	RC_DRAW_BUFFER,
 	RC_SWAP_BUFFERS,
-	RC_SCREENSHOT,
-	RC_VIDEOFRAME,
-	RC_COLORMASK,
-	RC_CLEARDEPTH
+	RC_SCREENSHOT
 } renderCommand_t;
 
 
 // these are sort of arbitrary limits.
 // the limits apply to the sum of all scenes in a frame --
 // the main view, all the 3D icons, etc
-#define	MAX_POLYS		600
-#define	MAX_POLYVERTS	3000
+#define	MAX_POLYS		4096
+#define	MAX_POLYVERTS	16384
+#define	MAX_TERMARKS	1024
 
 // all of the information needed by the back end must be
-// contained in a backEndData_t
+// contained in a backEndData_t.  This entire structure is
+// duplicated so the front and back end can run in parallel
+// on an SMP machine
 typedef struct {
 	drawSurf_t	drawSurfs[MAX_DRAWSURFS];
+	drawSurf_t  spriteSurfs[MAX_SPRITESURFS];
 	dlight_t	dlights[MAX_DLIGHTS];
-	trRefEntity_t	entities[MAX_REFENTITIES];
-	srfPoly_t	*polys;//[MAX_POLYS];
-	polyVert_t	*polyVerts;//[MAX_POLYVERTS];
+	trRefEntity_t	entities[MAX_ENTITIES];
+	srfMarkFragment_t* terMarks;
+	srfPoly_t	*polys;
+	polyVert_t	*polyVerts;
+	refSprite_t sprites[2048];
+	cStaticModelUnpacked_t* staticModels;
+	byte* staticModelData;
 	renderCommandList_t	commands;
 } backEndData_t;
 
 extern	int		max_polys;
 extern	int		max_polyverts;
+extern	int		max_termarks;
 
-extern	backEndData_t	*backEndData;	// the second one may not be allocated
+extern	backEndData_t	*backEndData[SMP_FRAMES];	// the second one may not be allocated
+
+extern	volatile renderCommandList_t	*renderCommandList;
+
+extern	volatile qboolean	renderThreadActive;
 
 
 void *R_GetCommandBuffer( int bytes );
+void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
+void R_AddSpriteSurfCmd( drawSurf_t* drawSurfs, int numDrawSurfs );
 void RB_ExecuteRenderCommands( const void *data );
 
-void R_IssuePendingRenderCommands( void );
+void R_SavePerformanceCounters(void);
+void R_InitCommandBuffers( void );
+void R_ShutdownCommandBuffers( void );
+
+void R_SyncRenderThread( void );
 
 void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
 
@@ -1597,20 +2455,15 @@ void RE_StretchPic ( float x, float y, float w, float h,
 					  float s1, float t1, float s2, float t2, qhandle_t hShader );
 void RE_BeginFrame( stereoFrame_t stereoFrame );
 void RE_EndFrame( int *frontEndMsec, int *backEndMsec );
-void RE_SaveJPG(char * filename, int quality, int image_width, int image_height,
-                unsigned char *image_buffer, int padding);
-size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, int quality,
-		          int image_width, int image_height, byte *image_buffer, int padding);
-void RE_TakeVideoFrame( int width, int height,
-		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg );
+void RE_SaveJPG(char* filename, int quality, int image_width, int image_height,
+    unsigned char* image_buffer, int padding);
+size_t RE_SaveJPGToBuffer(byte* buffer, size_t bufSize, int quality,
+    int image_width, int image_height, byte* image_buffer, int padding);
 
-void R_DrawElements( int numIndexes, const glIndex_t *indexes );
-void VectorArrayNormalize( vec4_t *normals, unsigned int count );
+void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer);
 
-#ifdef idppc_altivec
-void LerpMeshVertexes_altivec( md3Surface_t *surf, float backlerp );
-void ProjectDlightTexture_altivec( void );
-void RB_CalcDiffuseColor_altivec( unsigned char *colors );
+void UI_LoadResource(const char* name);
+
+#ifdef __cplusplus
+}
 #endif
-
-#endif //TR_LOCAL_H
diff --git a/code/renderergl1/tr_main.c b/code/renderergl1/tr_main.c
index 09559a2e..8b74a47f 100644
--- a/code/renderergl1/tr_main.c
+++ b/code/renderergl1/tr_main.c
@@ -15,15 +15,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_main.c -- main control flow for each frame
 
 #include "tr_local.h"
-
-#include <string.h> // memcpy
+#include "tiki.h"
 
 trGlobals_t		tr;
 
@@ -50,7 +49,7 @@ R_CullLocalBox
 Returns CULL_IN, CULL_CLIP, or CULL_OUT
 =================
 */
-int R_CullLocalBox (vec3_t bounds[2]) {
+int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]) {
 	int		i, j;
 	vec3_t	transformed[8];
 	float	dists[8];
@@ -69,15 +68,16 @@ int R_CullLocalBox (vec3_t bounds[2]) {
 		v[1] = bounds[(i>>1)&1][1];
 		v[2] = bounds[(i>>2)&1][2];
 
-		VectorCopy( tr.or.origin, transformed[i] );
-		VectorMA( transformed[i], v[0], tr.or.axis[0], transformed[i] );
-		VectorMA( transformed[i], v[1], tr.or.axis[1], transformed[i] );
-		VectorMA( transformed[i], v[2], tr.or.axis[2], transformed[i] );
+		VectorCopy( tr.ori.origin, transformed[i] );
+		VectorAdd(transformed[i], offset, transformed[i]);
+		VectorMA( transformed[i], v[0], tr.ori.axis[0], transformed[i] );
+		VectorMA( transformed[i], v[1], tr.ori.axis[1], transformed[i] );
+		VectorMA( transformed[i], v[2], tr.ori.axis[2], transformed[i] );
 	}
 
 	// check against frustum planes
 	anyBack = 0;
-	for (i = 0 ; i < 4 ; i++) {
+	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4 ; i++) {
 		frust = &tr.viewParms.frustum[i];
 
 		front = back = 0;
@@ -106,6 +106,10 @@ int R_CullLocalBox (vec3_t bounds[2]) {
 	return CULL_CLIP;		// partially clipped
 }
 
+int R_CullLocalBox(vec3_t bounds[2]) {
+	return R_CullLocalBoxOffset(vec3_origin, bounds);
+}
+
 /*
 ** R_CullLocalPointAndRadius
 */
@@ -133,7 +137,7 @@ int R_CullPointAndRadius( vec3_t pt, float radius )
 	}
 
 	// check against frustum planes
-	for (i = 0 ; i < 4 ; i++) 
+	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4; i++)
 	{
 		frust = &tr.viewParms.frustum[i];
 
@@ -156,6 +160,34 @@ int R_CullPointAndRadius( vec3_t pt, float radius )
 	return CULL_IN;		// completely inside frustum
 }
 
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	vec3_t transformed;
+
+	R_LocalPointToWorld(pt, transformed);
+
+	return R_DistanceCullPointAndRadius(fDist, transformed, radius);
+}
+
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	if (!r_nocull->integer)
+	{
+		vec3_t vDelta;
+		float fLengthSquared;
+		float fTotalDistSquared;
+
+		VectorSubtract(pt, tr.viewParms.ori.origin, vDelta);
+		fLengthSquared = VectorLengthSquared(vDelta);
+		fTotalDistSquared = Square(fDist + radius);
+
+		if (Square(fDist + radius) < Square(vDelta[2]) + fLengthSquared) {
+			return CULL_OUT;
+		} else if (Square(fDist - radius) > Square(vDelta[2]) + fLengthSquared) {
+			return CULL_IN;
+		}
+	}
+
+	return CULL_CLIP;
+}
 
 /*
 =================
@@ -163,10 +195,10 @@ R_LocalNormalToWorld
 
 =================
 */
-void R_LocalNormalToWorld (vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.or.axis[0][0] + local[1] * tr.or.axis[1][0] + local[2] * tr.or.axis[2][0];
-	world[1] = local[0] * tr.or.axis[0][1] + local[1] * tr.or.axis[1][1] + local[2] * tr.or.axis[2][1];
-	world[2] = local[0] * tr.or.axis[0][2] + local[1] * tr.or.axis[1][2] + local[2] * tr.or.axis[2][2];
+void R_LocalNormalToWorld (const vec3_t local, vec3_t world) {
+	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0];
+	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1];
+	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2];
 }
 
 /*
@@ -175,10 +207,10 @@ R_LocalPointToWorld
 
 =================
 */
-void R_LocalPointToWorld (vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.or.axis[0][0] + local[1] * tr.or.axis[1][0] + local[2] * tr.or.axis[2][0] + tr.or.origin[0];
-	world[1] = local[0] * tr.or.axis[0][1] + local[1] * tr.or.axis[1][1] + local[2] * tr.or.axis[2][1] + tr.or.origin[1];
-	world[2] = local[0] * tr.or.axis[0][2] + local[1] * tr.or.axis[1][2] + local[2] * tr.or.axis[2][2] + tr.or.origin[2];
+void R_LocalPointToWorld (const vec3_t local, vec3_t world) {
+	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0] + tr.ori.origin[0];
+	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1] + tr.ori.origin[1];
+	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2] + tr.ori.origin[2];
 }
 
 /*
@@ -188,9 +220,9 @@ R_WorldToLocal
 =================
 */
 void R_WorldToLocal (vec3_t world, vec3_t local) {
-	local[0] = DotProduct(world, tr.or.axis[0]);
-	local[1] = DotProduct(world, tr.or.axis[1]);
-	local[2] = DotProduct(world, tr.or.axis[2]);
+	local[0] = DotProduct(world, tr.ori.axis[0]);
+	local[1] = DotProduct(world, tr.ori.axis[1]);
+	local[2] = DotProduct(world, tr.ori.axis[2]);
 }
 
 /*
@@ -260,6 +292,29 @@ void myGlMultMatrix( const float *a, const float *b, float *out ) {
 	}
 }
 
+void R_AdjustVisBoundsForSprite(refSprite_t* ent, viewParms_t* viewParms, orientationr_t* or )
+{
+	if (tr.viewParms.visBounds[0][0] > ent->origin[0] - ent->scale) {
+		tr.viewParms.visBounds[0][0] = ent->origin[0] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][1] > ent->origin[1] - ent->scale) {
+        tr.viewParms.visBounds[0][1] = ent->origin[1] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][2] > ent->origin[2] - ent->scale) {
+        tr.viewParms.visBounds[0][2] = ent->origin[2] - ent->scale;
+    }
+
+	if (tr.viewParms.visBounds[1][0] < ent->origin[0] + ent->scale) {
+        tr.viewParms.visBounds[1][0] = ent->origin[0] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][1] < ent->origin[1] + ent->scale) {
+        tr.viewParms.visBounds[1][1] = ent->origin[1] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][2] < ent->origin[2] + ent->scale) {
+        tr.viewParms.visBounds[1][2] = ent->origin[2] + ent->scale;
+    }
+}
+
 /*
 =================
 R_RotateForEntity
@@ -270,47 +325,47 @@ Called by both the front end and the back end
 =================
 */
 void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms,
-					   orientationr_t *or ) {
+					   orientationr_t *ori ) {
 	float	glMatrix[16];
 	vec3_t	delta;
 	float	axisLength;
 
 	if ( ent->e.reType != RT_MODEL ) {
-		*or = viewParms->world;
+		*ori = viewParms->world;
 		return;
 	}
 
-	VectorCopy( ent->e.origin, or->origin );
+	VectorCopy( ent->e.origin, ori->origin );
 
-	VectorCopy( ent->e.axis[0], or->axis[0] );
-	VectorCopy( ent->e.axis[1], or->axis[1] );
-	VectorCopy( ent->e.axis[2], or->axis[2] );
+	VectorCopy( ent->e.axis[0], ori->axis[0] );
+	VectorCopy( ent->e.axis[1], ori->axis[1] );
+	VectorCopy( ent->e.axis[2], ori->axis[2] );
 
-	glMatrix[0] = or->axis[0][0];
-	glMatrix[4] = or->axis[1][0];
-	glMatrix[8] = or->axis[2][0];
-	glMatrix[12] = or->origin[0];
+	glMatrix[0] = ori->axis[0][0];
+	glMatrix[4] = ori->axis[1][0];
+	glMatrix[8] = ori->axis[2][0];
+	glMatrix[12] = ori->origin[0];
 
-	glMatrix[1] = or->axis[0][1];
-	glMatrix[5] = or->axis[1][1];
-	glMatrix[9] = or->axis[2][1];
-	glMatrix[13] = or->origin[1];
+	glMatrix[1] = ori->axis[0][1];
+	glMatrix[5] = ori->axis[1][1];
+	glMatrix[9] = ori->axis[2][1];
+	glMatrix[13] = ori->origin[1];
 
-	glMatrix[2] = or->axis[0][2];
-	glMatrix[6] = or->axis[1][2];
-	glMatrix[10] = or->axis[2][2];
-	glMatrix[14] = or->origin[2];
+	glMatrix[2] = ori->axis[0][2];
+	glMatrix[6] = ori->axis[1][2];
+	glMatrix[10] = ori->axis[2][2];
+	glMatrix[14] = ori->origin[2];
 
 	glMatrix[3] = 0;
 	glMatrix[7] = 0;
 	glMatrix[11] = 0;
 	glMatrix[15] = 1;
 
-	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, or->modelMatrix );
+	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
 
 	// calculate the viewer origin in the model's space
 	// needed for fog, specular, and environment mapping
-	VectorSubtract( viewParms->or.origin, or->origin, delta );
+	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
 
 	// compensate for scale in the axes if necessary
 	if ( ent->e.nonNormalizedAxes ) {
@@ -324,9 +379,61 @@ void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms,
 		axisLength = 1.0f;
 	}
 
-	or->viewOrigin[0] = DotProduct( delta, or->axis[0] ) * axisLength;
-	or->viewOrigin[1] = DotProduct( delta, or->axis[1] ) * axisLength;
-	or->viewOrigin[2] = DotProduct( delta, or->axis[2] ) * axisLength;
+	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] ) * axisLength;
+	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] ) * axisLength;
+	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] ) * axisLength;
+}
+
+/*
+=================
+R_RotateForStaticModel
+
+Generates an orientation for a static model and viewParms
+=================
+*/
+void R_RotateForStaticModel( cStaticModelUnpacked_t *SM, const viewParms_t *viewParms,
+					   orientationr_t *ori ) {
+	float	glMatrix[16];
+	vec3_t	delta;
+	float	tiki_scale;
+
+	tiki_scale = SM->tiki->load_scale * SM->scale;
+
+	VectorCopy( SM->origin, ori->origin );
+
+	VectorCopy( SM->axis[0], ori->axis[0] );
+	VectorCopy( SM->axis[1], ori->axis[1] );
+	VectorCopy( SM->axis[2], ori->axis[2] );
+
+	glMatrix[0]  = ori->axis[0][0] * tiki_scale;
+	glMatrix[4]  = ori->axis[1][0] * tiki_scale;
+	glMatrix[8]  = ori->axis[2][0] * tiki_scale;
+	glMatrix[12] = ori->origin[0];
+
+	glMatrix[1]  = ori->axis[0][1] * tiki_scale;
+	glMatrix[5]  = ori->axis[1][1] * tiki_scale;
+	glMatrix[9]  = ori->axis[2][1] * tiki_scale;
+	glMatrix[13] = ori->origin[1];
+
+	glMatrix[2]  = ori->axis[0][2] * tiki_scale;
+	glMatrix[6]  = ori->axis[1][2] * tiki_scale;
+	glMatrix[10] = ori->axis[2][2] * tiki_scale;
+	glMatrix[14] = ori->origin[2];
+
+	glMatrix[3]  = 0;
+	glMatrix[7]  = 0;
+	glMatrix[11] = 0;
+	glMatrix[15] = 1;
+
+	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
+
+	// calculate the viewer origin in the model's space
+	// needed for fog, specular, and environment mapping
+	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
+
+	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] );
+	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] );
+	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] );
 }
 
 /*
@@ -341,28 +448,28 @@ void R_RotateForViewer (void)
 	float	viewerMatrix[16];
 	vec3_t	origin;
 
-	Com_Memset (&tr.or, 0, sizeof(tr.or));
-	tr.or.axis[0][0] = 1;
-	tr.or.axis[1][1] = 1;
-	tr.or.axis[2][2] = 1;
-	VectorCopy (tr.viewParms.or.origin, tr.or.viewOrigin);
+	Com_Memset (&tr.ori, 0, sizeof(tr.ori));
+	tr.ori.axis[0][0] = 1;
+	tr.ori.axis[1][1] = 1;
+	tr.ori.axis[2][2] = 1;
+	VectorCopy (tr.viewParms.ori.origin, tr.ori.viewOrigin);
 
 	// transform by the camera placement
-	VectorCopy( tr.viewParms.or.origin, origin );
+	VectorCopy( tr.viewParms.ori.origin, origin );
 
-	viewerMatrix[0] = tr.viewParms.or.axis[0][0];
-	viewerMatrix[4] = tr.viewParms.or.axis[0][1];
-	viewerMatrix[8] = tr.viewParms.or.axis[0][2];
+	viewerMatrix[0] = tr.viewParms.ori.axis[0][0];
+	viewerMatrix[4] = tr.viewParms.ori.axis[0][1];
+	viewerMatrix[8] = tr.viewParms.ori.axis[0][2];
 	viewerMatrix[12] = -origin[0] * viewerMatrix[0] + -origin[1] * viewerMatrix[4] + -origin[2] * viewerMatrix[8];
 
-	viewerMatrix[1] = tr.viewParms.or.axis[1][0];
-	viewerMatrix[5] = tr.viewParms.or.axis[1][1];
-	viewerMatrix[9] = tr.viewParms.or.axis[1][2];
+	viewerMatrix[1] = tr.viewParms.ori.axis[1][0];
+	viewerMatrix[5] = tr.viewParms.ori.axis[1][1];
+	viewerMatrix[9] = tr.viewParms.ori.axis[1][2];
 	viewerMatrix[13] = -origin[0] * viewerMatrix[1] + -origin[1] * viewerMatrix[5] + -origin[2] * viewerMatrix[9];
 
-	viewerMatrix[2] = tr.viewParms.or.axis[2][0];
-	viewerMatrix[6] = tr.viewParms.or.axis[2][1];
-	viewerMatrix[10] = tr.viewParms.or.axis[2][2];
+	viewerMatrix[2] = tr.viewParms.ori.axis[2][0];
+	viewerMatrix[6] = tr.viewParms.ori.axis[2][1];
+	viewerMatrix[10] = tr.viewParms.ori.axis[2][2];
 	viewerMatrix[14] = -origin[0] * viewerMatrix[2] + -origin[1] * viewerMatrix[6] + -origin[2] * viewerMatrix[10];
 
 	viewerMatrix[3] = 0;
@@ -372,16 +479,16 @@ void R_RotateForViewer (void)
 
 	// convert from our coordinate system (looking down X)
 	// to OpenGL's coordinate system (looking down -Z)
-	myGlMultMatrix( viewerMatrix, s_flipMatrix, tr.or.modelMatrix );
+	myGlMultMatrix( viewerMatrix, s_flipMatrix, tr.ori.modelMatrix );
 
-	tr.viewParms.world = tr.or;
+	tr.viewParms.world = tr.ori;
 
 }
 
 /*
 ** SetFarClip
 */
-static void R_SetFarClip( void )
+static void SetFarClip( void )
 {
 	float	farthestCornerDistance = 0;
 	int		i;
@@ -430,7 +537,7 @@ static void R_SetFarClip( void )
 			v[2] = tr.viewParms.visBounds[1][2];
 		}
 
-		VectorSubtract( v, tr.viewParms.or.origin, vecTo );
+		VectorSubtract( v, tr.viewParms.ori.origin, vecTo );
 
 		distance = vecTo[0] * vecTo[0] + vecTo[1] * vecTo[1] + vecTo[2] * vecTo[2];
 
@@ -442,144 +549,170 @@ static void R_SetFarClip( void )
 	tr.viewParms.zFar = sqrt( farthestCornerDistance );
 }
 
-/*
-=================
-R_SetupFrustum
-
-Set up the culling frustum planes for the current view using the results we got from computing the first two rows of
-the projection matrix.
-=================
-*/
-void R_SetupFrustum (viewParms_t *dest, float xmin, float xmax, float ymax, float zProj, float stereoSep)
-{
-	vec3_t ofsorigin;
-	float oppleg, adjleg, length;
-	int i;
-	
-	if(stereoSep == 0 && xmin == -xmax)
-	{
-		// symmetric case can be simplified
-		VectorCopy(dest->or.origin, ofsorigin);
-
-		length = sqrt(xmax * xmax + zProj * zProj);
-		oppleg = xmax / length;
-		adjleg = zProj / length;
-
-		VectorScale(dest->or.axis[0], oppleg, dest->frustum[0].normal);
-		VectorMA(dest->frustum[0].normal, adjleg, dest->or.axis[1], dest->frustum[0].normal);
-
-		VectorScale(dest->or.axis[0], oppleg, dest->frustum[1].normal);
-		VectorMA(dest->frustum[1].normal, -adjleg, dest->or.axis[1], dest->frustum[1].normal);
-	}
-	else
-	{
-		// In stereo rendering, due to the modification of the projection matrix, dest->or.origin is not the
-		// actual origin that we're rendering so offset the tip of the view pyramid.
-		VectorMA(dest->or.origin, stereoSep, dest->or.axis[1], ofsorigin);
-	
-		oppleg = xmax + stereoSep;
-		length = sqrt(oppleg * oppleg + zProj * zProj);
-		VectorScale(dest->or.axis[0], oppleg / length, dest->frustum[0].normal);
-		VectorMA(dest->frustum[0].normal, zProj / length, dest->or.axis[1], dest->frustum[0].normal);
-
-		oppleg = xmin + stereoSep;
-		length = sqrt(oppleg * oppleg + zProj * zProj);
-		VectorScale(dest->or.axis[0], -oppleg / length, dest->frustum[1].normal);
-		VectorMA(dest->frustum[1].normal, -zProj / length, dest->or.axis[1], dest->frustum[1].normal);
-	}
-
-	length = sqrt(ymax * ymax + zProj * zProj);
-	oppleg = ymax / length;
-	adjleg = zProj / length;
-
-	VectorScale(dest->or.axis[0], oppleg, dest->frustum[2].normal);
-	VectorMA(dest->frustum[2].normal, adjleg, dest->or.axis[2], dest->frustum[2].normal);
-
-	VectorScale(dest->or.axis[0], oppleg, dest->frustum[3].normal);
-	VectorMA(dest->frustum[3].normal, -adjleg, dest->or.axis[2], dest->frustum[3].normal);
-	
-	for (i=0 ; i<4 ; i++) {
-		dest->frustum[i].type = PLANE_NON_AXIAL;
-		dest->frustum[i].dist = DotProduct (ofsorigin, dest->frustum[i].normal);
-		SetPlaneSignbits( &dest->frustum[i] );
-	}
-}
 
 /*
 ===============
 R_SetupProjection
 ===============
 */
-void R_SetupProjection(viewParms_t *dest, float zProj, qboolean computeFrustum)
-{
+void R_SetupProjection( void ) {
 	float	xmin, xmax, ymin, ymax;
-	float	width, height, stereoSep = r_stereoSeparation->value;
+	float	width, height, depth;
+	float	zNear, zFar;
 
-	/*
-	 * offset the view origin of the viewer for stereo rendering 
-	 * by setting the projection matrix appropriately.
-	 */
+	// dynamically compute far clip plane distance
+	SetFarClip();
 
-	if(stereoSep != 0)
-	{
-		if(dest->stereoFrame == STEREO_LEFT)
-			stereoSep = zProj / stereoSep;
-		else if(dest->stereoFrame == STEREO_RIGHT)
-			stereoSep = zProj / -stereoSep;
-		else
-			stereoSep = 0;
-	}
+	//
+	// set up projection matrix
+	//
+	zNear	= r_znear->value;
+	zFar	= tr.viewParms.zFar;
 
-	ymax = zProj * tan(dest->fovY * M_PI / 360.0f);
+	ymax = zNear * tan( tr.refdef.fov_y * M_PI / 360.0f );
 	ymin = -ymax;
 
-	xmax = zProj * tan(dest->fovX * M_PI / 360.0f);
+	xmax = zNear * tan( tr.refdef.fov_x * M_PI / 360.0f );
 	xmin = -xmax;
 
 	width = xmax - xmin;
 	height = ymax - ymin;
-	
-	dest->projectionMatrix[0] = 2 * zProj / width;
-	dest->projectionMatrix[4] = 0;
-	dest->projectionMatrix[8] = (xmax + xmin + 2 * stereoSep) / width;
-	dest->projectionMatrix[12] = 2 * zProj * stereoSep / width;
+	depth = zFar - zNear;
 
-	dest->projectionMatrix[1] = 0;
-	dest->projectionMatrix[5] = 2 * zProj / height;
-	dest->projectionMatrix[9] = ( ymax + ymin ) / height;	// normally 0
-	dest->projectionMatrix[13] = 0;
+	tr.viewParms.projectionMatrix[0] = 2 * zNear / width;
+	tr.viewParms.projectionMatrix[4] = 0;
+	tr.viewParms.projectionMatrix[8] = ( xmax + xmin ) / width;	// normally 0
+	tr.viewParms.projectionMatrix[12] = 0;
 
-	dest->projectionMatrix[3] = 0;
-	dest->projectionMatrix[7] = 0;
-	dest->projectionMatrix[11] = -1;
-	dest->projectionMatrix[15] = 0;
-	
-	// Now that we have all the data for the projection matrix we can also setup the view frustum.
-	if(computeFrustum)
-		R_SetupFrustum(dest, xmin, xmax, ymax, zProj, stereoSep);
+	tr.viewParms.projectionMatrix[1] = 0;
+	tr.viewParms.projectionMatrix[5] = 2 * zNear / height;
+	tr.viewParms.projectionMatrix[9] = ( ymax + ymin ) / height;	// normally 0
+	tr.viewParms.projectionMatrix[13] = 0;
+
+	tr.viewParms.projectionMatrix[2] = 0;
+	tr.viewParms.projectionMatrix[6] = 0;
+	tr.viewParms.projectionMatrix[10] = -( zFar + zNear ) / depth;
+	tr.viewParms.projectionMatrix[14] = -2 * zFar * zNear / depth;
+
+	tr.viewParms.projectionMatrix[3] = 0;
+	tr.viewParms.projectionMatrix[7] = 0;
+	tr.viewParms.projectionMatrix[11] = -1;
+	tr.viewParms.projectionMatrix[15] = 0;
 }
 
 /*
-===============
-R_SetupProjectionZ
+=================
+R_SetupFrustum
 
-Sets the z-component transformation part in the projection matrix
-===============
+Setup that culling frustum planes for the current view
+=================
 */
-void R_SetupProjectionZ(viewParms_t *dest)
-{
-	float zNear, zFar, depth;
-	
-	zNear	= r_znear->value;
-	zFar	= dest->zFar;	
-	depth	= zFar - zNear;
+void R_SetupFrustum (void) {
+	int		i;
+	float	xs, xc;
+	float	ang;
 
-	dest->projectionMatrix[2] = 0;
-	dest->projectionMatrix[6] = 0;
-	dest->projectionMatrix[10] = -( zFar + zNear ) / depth;
-	dest->projectionMatrix[14] = -2 * zFar * zNear / depth;
+	ang = tr.viewParms.fovX / 180 * M_PI * 0.5f;
+	xs = sin( ang );
+	xc = cos( ang );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[0].normal );
+	VectorMA( tr.viewParms.frustum[0].normal, xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[0].normal );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[1].normal );
+	VectorMA( tr.viewParms.frustum[1].normal, -xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[1].normal );
+
+	ang = tr.viewParms.fovY / 180 * M_PI * 0.5f;
+	xs = sin( ang );
+	xc = cos( ang );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[2].normal );
+	VectorMA( tr.viewParms.frustum[2].normal, xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[2].normal );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[3].normal );
+	VectorMA( tr.viewParms.frustum[3].normal, -xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[3].normal );
+
+	for (i=0 ; i<4 ; i++) {
+		tr.viewParms.frustum[i].type = PLANE_NON_AXIAL;
+		tr.viewParms.frustum[i].dist = DotProduct (tr.viewParms.ori.origin, tr.viewParms.frustum[i].normal);
+		SetPlaneSignbits( &tr.viewParms.frustum[i] );
+	}
+
+	if (tr.viewParms.isPortalSky) {
+		// since 2.0: skybox farplane
+		if (r_skybox_farplane->integer) {
+			tr.viewParms.farplane_distance = r_skybox_farplane->value;
+
+            sscanf(
+                r_farplane_color->string,
+                "%f %f %f",
+                &tr.viewParms.farplane_color[0],
+                &tr.viewParms.farplane_color[1],
+                &tr.viewParms.farplane_color[2]
+			);
+
+			if (r_farplane_nocull->integer > 0) {
+				tr.viewParms.farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				tr.viewParms.farplane_cull = 1;
+            } else {
+                tr.viewParms.farplane_cull = 2;
+            }
+		}
+	}
+	else if (r_farplane->integer)
+	{
+		tr.viewParms.farplane_distance = r_farplane->value;
+		tr.viewParms.farplane_bias = r_farplane_bias->value;
+
+		sscanf(
+			r_farplane_color->string,
+			"%f %f %f",
+			&tr.viewParms.farplane_color[0],
+			&tr.viewParms.farplane_color[1],
+			&tr.viewParms.farplane_color[2]);
+
+			if (r_farplane_nocull->integer > 0) {
+				tr.viewParms.farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				tr.viewParms.farplane_cull = 1;
+            } else {
+                tr.viewParms.farplane_cull = 2;
+            }
+	}
+
+	if (tr.viewParms.farplane_distance)
+	{
+		vec3_t farPoint;
+		float realPlaneLen;
+		float tmp;
+		vec4_t fogColor;
+
+		tr.viewParms.fog.len = tr.viewParms.farplane_distance;
+		tr.viewParms.fog.oolen = 1.0 / tr.viewParms.farplane_distance;
+		VectorMA(tr.viewParms.ori.origin, tr.viewParms.farplane_distance, tr.viewParms.ori.axis[0], farPoint);
+
+		VectorNegate(tr.viewParms.ori.axis[0], tr.viewParms.frustum[4].normal);
+		tr.viewParms.frustum[4].type = PLANE_NON_AXIAL;
+		tr.viewParms.frustum[4].dist = DotProduct(farPoint, tr.viewParms.frustum[4].normal);
+		SetPlaneSignbits(&tr.viewParms.frustum[4]);
+
+		tr.viewParms.fog.enabled = r_farplane_nofog->integer == 0;
+		if (tr.viewParms.farplane_cull) {
+			// extra fustum for culling
+			tr.viewParms.fog.extrafrustums = 1;
+		} else {
+			tr.viewParms.fog.extrafrustums = 0;
+		}
+	}
+	else
+	{
+		tr.viewParms.fog.enabled = 0;
+		tr.viewParms.fog.extrafrustums = 0;
+	}
 }
 
+
 /*
 =================
 R_MirrorPoint
@@ -679,20 +812,20 @@ qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum,
 	R_PlaneForSurface( drawSurf->surface, &originalPlane );
 
 	// rotate the plane if necessary
-	if ( entityNum != REFENTITYNUM_WORLD ) {
+	if ( entityNum != ENTITYNUM_WORLD ) {
 		tr.currentEntityNum = entityNum;
 		tr.currentEntity = &tr.refdef.entities[entityNum];
 
 		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.or );
+		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
 
 		// rotate the plane, but keep the non-rotated version for matching
 		// against the portalSurface entities
 		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.or.origin );
+		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
 
 		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.or.origin );
+		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
 	} else {
 		plane = originalPlane;
 	}
@@ -744,24 +877,7 @@ qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum,
 		VectorSubtract( vec3_origin, camera->axis[1], camera->axis[1] );
 
 		// optionally rotate
-		if ( e->e.oldframe ) {
-			// if a speed is specified
-			if ( e->e.frame ) {
-				// continuous rotate
-				d = (tr.refdef.time/1000.0f) * e->e.frame;
-				VectorCopy( camera->axis[1], transformed );
-				RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
-				CrossProduct( camera->axis[0], camera->axis[1], camera->axis[2] );
-			} else {
-				// bobbing rotate, with skinNum being the rotation offset
-				d = sin( tr.refdef.time * 0.003f );
-				d = e->e.skinNum + d * 4;
-				VectorCopy( camera->axis[1], transformed );
-				RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
-				CrossProduct( camera->axis[0], camera->axis[1], camera->axis[2] );
-			}
-		}
-		else if ( e->e.skinNum ) {
+		if ( e->e.skinNum ) {
 			d = e->e.skinNum;
 			VectorCopy( camera->axis[1], transformed );
 			RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
@@ -796,22 +912,26 @@ static qboolean IsMirror( const drawSurf_t *drawSurf, int entityNum )
 	R_PlaneForSurface( drawSurf->surface, &originalPlane );
 
 	// rotate the plane if necessary
-	if ( entityNum != REFENTITYNUM_WORLD )
+	if ( entityNum != ENTITYNUM_WORLD ) 
 	{
 		tr.currentEntityNum = entityNum;
 		tr.currentEntity = &tr.refdef.entities[entityNum];
 
 		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.or );
+		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
 
 		// rotate the plane, but keep the non-rotated version for matching
 		// against the portalSurface entities
 		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.or.origin );
+		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
 
 		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.or.origin );
+		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
 	} 
+	else 
+	{
+		plane = originalPlane;
+	}
 
 	// locate the portal entity closest to this plane.
 	// origin will be the origin of the portal, origin2 will be
@@ -846,32 +966,38 @@ static qboolean IsMirror( const drawSurf_t *drawSurf, int entityNum )
 **
 ** Determines if a surface is completely offscreen.
 */
-static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128] ) {
+qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum) {
 	float shortest = 100000000;
-	int entityNum;
 	int numTriangles;
-	shader_t *shader;
-	int		fogNum;
-	int dlighted;
+	qboolean doRange;
+	orientationr_t surfOr;
+	unsigned int* indices;
 	vec4_t clip, eye;
 	int i;
 	unsigned int pointOr = 0;
 	unsigned int pointAnd = (unsigned int)~0;
 
-	R_RotateForViewer();
+	if (surface->surfaceType != SF_FACE) {
+		ri.Printf(PRINT_WARNING, "WARNING: SurfIsOffscreen called on non-bmodel!\n");
+		return qfalse;
+	}
+	
+	if ( glConfig.smpActive ) {		// FIXME!  we can't do RB_BeginSurface/RB_EndSurface stuff with smp!
+		return qfalse;
+	}
 
-	R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted );
-	RB_BeginSurface( shader, fogNum );
-	rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
+	if (entityNum == ENTITYNUM_WORLD) {
+		surfOr = tr.viewParms.world;
+	} else {
+		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
+	}
 
-	assert( tess.numVertexes < 128 );
-
-	for ( i = 0; i < tess.numVertexes; i++ )
+	for ( i = 0; i < surface->numPoints; i++ )
 	{
 		int j;
 		unsigned int pointFlags = 0;
 
-		R_TransformModelToClip( tess.xyz[i], tr.or.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
+		R_TransformModelToClip( surface->points[i], surfOr.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
 
 		for ( j = 0; j < 3; j++ )
 		{
@@ -899,22 +1025,28 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128
 	// based on vertex distance isn't 100% correct (we should be checking for
 	// range to the surface), but it's good enough for the types of portals
 	// we have in the game right now.
-	numTriangles = tess.numIndexes / 3;
+	numTriangles = surface->numIndices / 3;
 
-	for ( i = 0; i < tess.numIndexes; i += 3 )
+	for ( i = 0; i < surface->numIndices; i += 3 )
 	{
 		vec3_t normal;
+		float dot;
 		float len;
+		unsigned* indices;
 
-		VectorSubtract( tess.xyz[tess.indexes[i]], tr.viewParms.or.origin, normal );
+		indices = (unsigned*)(((char*)surface) + surface->ofsIndices);
 
-		len = VectorLengthSquared( normal );			// lose the sqrt
-		if ( len < shortest )
-		{
-			shortest = len;
+		VectorSubtract( surface->points[indices[i]], surfOr.viewOrigin, normal);
+
+		if (shader->fDistRange > 0) {
+			len = VectorLengthSquared(normal);			// lose the sqrt
+			if (len < shortest)
+			{
+				shortest = len;
+			}
 		}
 
-		if ( DotProduct( normal, tess.normal[tess.indexes[i]] ) >= 0 )
+		if ( ( dot = DotProduct( normal, surface->plane.normal ) ) >= 0 )
 		{
 			numTriangles--;
 		}
@@ -924,21 +1056,27 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128
 		return qtrue;
 	}
 
-	// mirrors can early out at this point, since we don't do a fade over distance
-	// with them (although we could)
-	if ( IsMirror( drawSurf, entityNum ) )
+	if (shader->fDistRange > 0.0)
 	{
-		return qfalse;
-	}
-
-	if ( shortest > (tess.shader->portalRange*tess.shader->portalRange) )
-	{
-		return qtrue;
+		if (shortest > Square(shader->fDistRange))
+		{
+			return qtrue;
+		}
 	}
 
 	return qfalse;
 }
 
+static qboolean DrawSurfIsOffscreen(drawSurf_t* drawSurf) {
+	int entityNum;
+	shader_t* shader;
+	int dlighted;
+	qboolean bStaticModel;
+
+	R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlighted, &bStaticModel);
+	return SurfIsOffscreen((srfSurfaceFace_t*)drawSurf->surface, shader, entityNum);
+}
+
 /*
 ========================
 R_MirrorViewBySurface
@@ -947,7 +1085,6 @@ Returns qtrue if another view has been rendered
 ========================
 */
 qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
-	vec4_t			clipDest[128];
 	viewParms_t		newParms;
 	viewParms_t		oldParms;
 	orientation_t	surface, camera;
@@ -963,7 +1100,7 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
 	}
 
 	// trivially reject portal/mirror
-	if ( SurfIsOffscreen( drawSurf, clipDest ) ) {
+	if (DrawSurfIsOffscreen( drawSurf ) ) {
 		return qfalse;
 	}
 
@@ -977,14 +1114,14 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
 		return qfalse;		// bad portal, no portalentity
 	}
 
-	R_MirrorPoint (oldParms.or.origin, &surface, &camera, newParms.or.origin );
+	R_MirrorPoint (oldParms.ori.origin, &surface, &camera, newParms.ori.origin );
 
 	VectorSubtract( vec3_origin, camera.axis[0], newParms.portalPlane.normal );
 	newParms.portalPlane.dist = DotProduct( camera.origin, newParms.portalPlane.normal );
 	
-	R_MirrorVector (oldParms.or.axis[0], &surface, &camera, newParms.or.axis[0]);
-	R_MirrorVector (oldParms.or.axis[1], &surface, &camera, newParms.or.axis[1]);
-	R_MirrorVector (oldParms.or.axis[2], &surface, &camera, newParms.or.axis[2]);
+	R_MirrorVector (oldParms.ori.axis[0], &surface, &camera, newParms.ori.axis[0]);
+	R_MirrorVector (oldParms.ori.axis[1], &surface, &camera, newParms.ori.axis[1]);
+	R_MirrorVector (oldParms.ori.axis[2], &surface, &camera, newParms.ori.axis[2]);
 
 	// OPTIMIZE: restrict the viewport on the mirrored view
 
@@ -996,43 +1133,6 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
 	return qtrue;
 }
 
-/*
-=================
-R_SpriteFogNum
-
-See if a sprite is inside a fog volume
-=================
-*/
-int R_SpriteFogNum( trRefEntity_t *ent ) {
-	int				i, j;
-	fog_t			*fog;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-
-	if ( ent->e.renderfx & RF_CROSSHAIR ) {
-		return 0;
-	}
-
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( ent->e.origin[j] - ent->e.radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( ent->e.origin[j] + ent->e.radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
 /*
 ==========================================================================================
 
@@ -1041,57 +1141,201 @@ DRAWSURF SORTING
 ==========================================================================================
 */
 
-/*
-===============
-R_Radix
-===============
-*/
-static ID_INLINE void R_Radix( int byte, int size, drawSurf_t *source, drawSurf_t *dest )
-{
-  int           count[ 256 ] = { 0 };
-  int           index[ 256 ];
-  int           i;
-  unsigned char *sortKey = NULL;
-  unsigned char *end = NULL;
-
-  sortKey = ( (unsigned char *)&source[ 0 ].sort ) + byte;
-  end = sortKey + ( size * sizeof( drawSurf_t ) );
-  for( ; sortKey < end; sortKey += sizeof( drawSurf_t ) )
-    ++count[ *sortKey ];
-
-  index[ 0 ] = 0;
-
-  for( i = 1; i < 256; ++i )
-    index[ i ] = index[ i - 1 ] + count[ i - 1 ];
-
-  sortKey = ( (unsigned char *)&source[ 0 ].sort ) + byte;
-  for( i = 0; i < size; ++i, sortKey += sizeof( drawSurf_t ) )
-    dest[ index[ *sortKey ]++ ] = source[ i ];
+static void SwapDrawSurf(drawSurf_t* a, drawSurf_t* b) {
+	drawSurf_t temp = *a;
+	*a = *b;
+	*b = temp;
 }
 
 /*
-===============
-R_RadixSort
+=================
+qsort replacement
 
-Radix sort with 4 byte size buckets
-===============
+=================
 */
-static void R_RadixSort( drawSurf_t *source, int size )
-{
-  static drawSurf_t scratch[ MAX_DRAWSURFS ];
-#ifdef Q3_LITTLE_ENDIAN
-  R_Radix( 0, size, source, scratch );
-  R_Radix( 1, size, scratch, source );
-  R_Radix( 2, size, source, scratch );
-  R_Radix( 3, size, scratch, source );
-#else
-  R_Radix( 3, size, source, scratch );
-  R_Radix( 2, size, scratch, source );
-  R_Radix( 1, size, source, scratch );
-  R_Radix( 0, size, scratch, source );
-#endif //Q3_LITTLE_ENDIAN
+//#define	SWAP_DRAW_SURF(a,b) temp=((int *)a)[0];((int *)a)[0]=((int *)b)[0];((int *)b)[0]=temp; temp=((int *)a)[1];((int *)a)[1]=((int *)b)[1];((int *)b)[1]=temp;
+
+/* this parameter defines the cutoff between using quick sort and
+   insertion sort for arrays; arrays with lengths shorter or equal to the
+   below value use insertion sort */
+
+#define CUTOFF 8            /* testing shows that this is good value */
+
+static void shortsort( drawSurf_t *lo, drawSurf_t *hi ) {
+    drawSurf_t	*p, *max;
+	int			temp;
+
+    while (hi > lo) {
+        max = lo;
+        for (p = lo + 1; p <= hi; p++ ) {
+            if ( p->sort > max->sort ) {
+                max = p;
+            }
+        }
+		SwapDrawSurf(max, hi);
+        hi--;
+    }
 }
 
+
+/* sort the array between lo and hi (inclusive)
+FIXME: this was lifted and modified from the microsoft lib source...
+ */
+
+void qsortFast (
+    void *base,
+    unsigned num,
+    unsigned width
+    )
+{
+    char *lo, *hi;              /* ends of sub-array currently sorting */
+    char *mid;                  /* points to middle of subarray */
+    char *loguy, *higuy;        /* traveling pointers for partition step */
+    unsigned size;              /* size of the sub-array */
+    char *lostk[30], *histk[30];
+    int stkptr;                 /* stack for saving sub-array to be processed */
+	int	temp;
+
+    /* Note: the number of stack entries required is no more than
+       1 + log2(size), so 30 is sufficient for any array */
+
+    if (num < 2 || width == 0)
+        return;                 /* nothing to do */
+
+    stkptr = 0;                 /* initialize stack */
+
+    lo = base;
+    hi = (char *)base + width * (num-1);        /* initialize limits */
+
+    /* this entry point is for pseudo-recursion calling: setting
+       lo and hi and jumping to here is like recursion, but stkptr is
+       prserved, locals aren't, so we preserve stuff on the stack */
+recurse:
+
+    size = (hi - lo) / width + 1;        /* number of el's to sort */
+
+    /* below a certain size, it is faster to use a O(n^2) sorting method */
+    if (size <= CUTOFF) {
+         shortsort((drawSurf_t *)lo, (drawSurf_t *)hi);
+    }
+    else {
+        /* First we pick a partititioning element.  The efficiency of the
+           algorithm demands that we find one that is approximately the
+           median of the values, but also that we select one fast.  Using
+           the first one produces bad performace if the array is already
+           sorted, so we use the middle one, which would require a very
+           wierdly arranged array for worst case performance.  Testing shows
+           that a median-of-three algorithm does not, in general, increase
+           performance. */
+
+        mid = lo + (size / 2) * width;                   /* find middle element */
+		SwapDrawSurf((drawSurf_t*)mid, (drawSurf_t*)lo);  /* swap it to beginning of array */
+
+        /* We now wish to partition the array into three pieces, one
+           consisiting of elements <= partition element, one of elements
+           equal to the parition element, and one of element >= to it.  This
+           is done below; comments indicate conditions established at every
+           step. */
+
+        loguy = lo;
+        higuy = hi + width;
+
+        /* Note that higuy decreases and loguy increases on every iteration,
+           so loop must terminate. */
+        for (;;) {
+            /* lo <= loguy < hi, lo < higuy <= hi + 1,
+               A[i] <= A[lo] for lo <= i <= loguy,
+               A[i] >= A[lo] for higuy <= i <= hi */
+
+            do  {
+                loguy += width;
+            } while (loguy <= hi &&  
+				( ((drawSurf_t *)loguy)->sort <= ((drawSurf_t *)lo)->sort ) );
+
+            /* lo < loguy <= hi+1, A[i] <= A[lo] for lo <= i < loguy,
+               either loguy > hi or A[loguy] > A[lo] */
+
+            do  {
+                higuy -= width;
+            } while (higuy > lo && 
+				( ((drawSurf_t *)higuy)->sort >= ((drawSurf_t *)lo)->sort ) );
+
+            /* lo-1 <= higuy <= hi, A[i] >= A[lo] for higuy < i <= hi,
+               either higuy <= lo or A[higuy] < A[lo] */
+
+            if (higuy < loguy)
+                break;
+
+            /* if loguy > hi or higuy <= lo, then we would have exited, so
+               A[loguy] > A[lo], A[higuy] < A[lo],
+               loguy < hi, highy > lo */
+
+			SwapDrawSurf((drawSurf_t*)loguy, (drawSurf_t*)higuy);
+
+            /* A[loguy] < A[lo], A[higuy] > A[lo]; so condition at top
+               of loop is re-established */
+        }
+
+        /*     A[i] >= A[lo] for higuy < i <= hi,
+               A[i] <= A[lo] for lo <= i < loguy,
+               higuy < loguy, lo <= higuy <= hi
+           implying:
+               A[i] >= A[lo] for loguy <= i <= hi,
+               A[i] <= A[lo] for lo <= i <= higuy,
+               A[i] = A[lo] for higuy < i < loguy */
+
+		SwapDrawSurf((drawSurf_t*)lo, (drawSurf_t*)higuy);     /* put partition element in place */
+
+        /* OK, now we have the following:
+              A[i] >= A[higuy] for loguy <= i <= hi,
+              A[i] <= A[higuy] for lo <= i < higuy
+              A[i] = A[lo] for higuy <= i < loguy    */
+
+        /* We've finished the partition, now we want to sort the subarrays
+           [lo, higuy-1] and [loguy, hi].
+           We do the smaller one first to minimize stack usage.
+           We only sort arrays of length 2 or more.*/
+
+        if ( higuy - 1 - lo >= hi - loguy ) {
+            if (lo + width < higuy) {
+                lostk[stkptr] = lo;
+                histk[stkptr] = higuy - width;
+                ++stkptr;
+            }                           /* save big recursion for later */
+
+            if (loguy < hi) {
+                lo = loguy;
+                goto recurse;           /* do small recursion */
+            }
+        }
+        else {
+            if (loguy < hi) {
+                lostk[stkptr] = loguy;
+                histk[stkptr] = hi;
+                ++stkptr;               /* save big recursion for later */
+            }
+
+            if (lo + width < higuy) {
+                hi = higuy - width;
+                goto recurse;           /* do small recursion */
+            }
+        }
+    }
+
+    /* We have sorted the array, except for any pending sorts on the stack.
+       Check if there are any, and do them. */
+
+    --stkptr;
+    if (stkptr >= 0) {
+        lo = lostk[stkptr];
+        hi = histk[stkptr];
+        goto recurse;           /* pop subarray from stack */
+    }
+    else
+        return;                 /* all subarrays done */
+}
+
+
 //==========================================================================================
 
 /*
@@ -1099,8 +1343,7 @@ static void R_RadixSort( drawSurf_t *source, int size )
 R_AddDrawSurf
 =================
 */
-void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, 
-				   int fogIndex, int dlightMap ) {
+void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap) {
 	int			index;
 
 	// instead of checking for overflow, we just mask the index
@@ -1109,22 +1352,40 @@ void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader,
 	// the sort data is packed into a single 32 bit value so it can be
 	// compared quickly during the qsorting process
 	tr.refdef.drawSurfs[index].sort = (shader->sortedIndex << QSORT_SHADERNUM_SHIFT) 
-		| tr.shiftedEntityNum | ( fogIndex << QSORT_FOGNUM_SHIFT ) | (int)dlightMap;
+		| tr.shiftedEntityNum | tr.shiftedIsStatic | (dlightMap & 15);
 	tr.refdef.drawSurfs[index].surface = surface;
 	tr.refdef.numDrawSurfs++;
 }
 
+/*
+=================
+R_AddSpriteSurf
+=================
+*/
+void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
+{
+	int index;
+
+	if (zDistance > MAX_SPRITE_DIST_SQUARED) {
+		zDistance = MAX_SPRITE_DIST_SQUARED;
+	}
+
+	index = tr.refdef.numSpriteSurfs % MAX_SPRITES;
+    tr.refdef.spriteSurfs[index].sort = (int)(MAX_SPRITE_DIST_SQUARED - zDistance) | (shader->sortedIndex << QSORT_SHADERNUM_SHIFT);
+    tr.refdef.spriteSurfs[index].surface = surface;
+    tr.refdef.numSpriteSurfs++;
+}
+
 /*
 =================
 R_DecomposeSort
 =================
 */
-void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap ) {
-	*fogNum = ( sort >> QSORT_FOGNUM_SHIFT ) & 31;
+void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel) {
 	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
-	*entityNum = ( sort >> QSORT_REFENTITYNUM_SHIFT ) & REFENTITYNUM_MASK;
-	*dlightMap = sort & 3;
+	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 4095;
+	*dlightMap = sort & 15;
+	*bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
 }
 
 /*
@@ -1132,12 +1393,12 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
 R_SortDrawSurfs
 =================
 */
-void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
+void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs, drawSurf_t *spriteSurfs, int numSpriteSurfs ) {
 	shader_t		*shader;
-	int				fogNum;
 	int				entityNum;
 	int				dlighted;
 	int				i;
+	qboolean		bStaticModel;
 
 	// it is possible for some views to not have any surfaces
 	if ( numDrawSurfs < 1 ) {
@@ -1146,34 +1407,51 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		return;
 	}
 
+	// if we overflowed MAX_DRAWSURFS, the drawsurfs
+	// wrapped around in the buffer and we will be missing
+    // the first surfaces, not the last ones
+    if (numDrawSurfs > MAX_DRAWSURFS) {
+        numDrawSurfs = MAX_DRAWSURFS;
+    }
+    if (numSpriteSurfs > MAX_SPRITESURFS) {
+		numSpriteSurfs = MAX_SPRITESURFS;
+    }
+
 	// sort the drawsurfs by sort type, then orientation, then shader
-	R_RadixSort( drawSurfs, numDrawSurfs );
+	qsortFast (drawSurfs, numDrawSurfs, sizeof(drawSurf_t) );
+	qsortFast (spriteSurfs, numSpriteSurfs, sizeof(drawSurf_t) );
 
-	// check for any pass through drawing, which
-	// may cause another view to be rendered first
-	for ( i = 0 ; i < numDrawSurfs ; i++ ) {
-		R_DecomposeSort( (drawSurfs+i)->sort, &entityNum, &shader, &fogNum, &dlighted );
+	R_Sky_Render();
 
-		if ( shader->sort > SS_PORTAL ) {
-			break;
-		}
+	if (!tr.viewParms.isPortal)
+	{
+		// check for any pass through drawing, which
+		// may cause another view to be rendered first
+		for (i = 0; i < numDrawSurfs; i++) {
+			R_DecomposeSort((drawSurfs + i)->sort, &entityNum, &shader, &dlighted, &bStaticModel);
 
-		// no shader should ever have this sort type
-		if ( shader->sort == SS_BAD ) {
-			ri.Error (ERR_DROP, "Shader '%s'with sort == SS_BAD", shader->name );
-		}
-
-		// if the mirror was completely clipped away, we may need to check another surface
-		if ( R_MirrorViewBySurface( (drawSurfs+i), entityNum) ) {
-			// this is a debug option to see exactly what is being mirrored
-			if ( r_portalOnly->integer ) {
-				return;
+			if (shader->sort > SS_PORTAL) {
+				break;
+			}
+
+			// no shader should ever have this sort type
+			if (shader->sort == SS_BAD) {
+				ri.Error(ERR_DROP, "Shader '%s'with sort == SS_BAD", shader->name);
+			}
+
+			// if the mirror was completely clipped away, we may need to check another surface
+			if (R_MirrorViewBySurface((drawSurfs + i), entityNum)) {
+				// this is a debug option to see exactly what is being mirrored
+				if (r_portalOnly->integer) {
+					return;
+				}
+				break;		// only one mirror view at a time
 			}
-			break;		// only one mirror view at a time
 		}
 	}
 
-	R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
+    R_AddDrawSurfCmd(drawSurfs, numDrawSurfs);
+    R_AddSpriteSurfCmd(spriteSurfs, numSpriteSurfs);
 }
 
 /*
@@ -1185,9 +1463,7 @@ void R_AddEntitySurfaces (void) {
 	trRefEntity_t	*ent;
 	shader_t		*shader;
 
-	if ( !r_drawentities->integer ) {
-		return;
-	}
+	tr.shiftedIsStatic = 0;
 
 	for ( tr.currentEntityNum = 0; 
 	      tr.currentEntityNum < tr.refdef.num_entities; 
@@ -1197,7 +1473,7 @@ void R_AddEntitySurfaces (void) {
 		ent->needDlights = qfalse;
 
 		// preshift the value we are going to OR into the drawsurf sort
-		tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+		tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
 
 		//
 		// the weapon model must be handled special --
@@ -1208,15 +1484,33 @@ void R_AddEntitySurfaces (void) {
 			continue;
 		}
 
+		if (tr.viewParms.isPortalSky) {
+			// Expecting a sky entity in a sky portal
+			if (!(ent->e.renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+		} else {
+			if (ent->e.renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+
+		if (tr.viewParms.isPortal) {
+			if (!(ent->e.renderfx & (RF_WRAP_FRAMES | RF_SHADOW_PLANE))) {
+				continue;
+			}
+		} else {
+			if (ent->e.renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
 		// simple generated models, like sprites and beams, are not culled
 		switch ( ent->e.reType ) {
 		case RT_PORTALSURFACE:
 			break;		// don't draw anything
 		case RT_SPRITE:
 		case RT_BEAM:
-		case RT_LIGHTNING:
-		case RT_RAIL_CORE:
-		case RT_RAIL_RINGS:
 			// self blood sprites, talk balloons, etc should not be drawn in the primary
 			// view.  We can't just do this check for all entities, because md3
 			// entities may still want to cast shadows from them
@@ -1224,26 +1518,23 @@ void R_AddEntitySurfaces (void) {
 				continue;
 			}
 			shader = R_GetShaderByHandle( ent->e.customShader );
-			R_AddDrawSurf( &entitySurface, shader, R_SpriteFogNum( ent ), 0 );
+			R_AddDrawSurf( &entitySurface, shader, 0 );
 			break;
 
 		case RT_MODEL:
-			// we must set up parts of tr.or for model culling
-			R_RotateForEntity( ent, &tr.viewParms, &tr.or );
+			// we must set up parts of tr.ori for model culling
+			R_RotateForEntity( ent, &tr.viewParms, &tr.ori );
 
 			tr.currentModel = R_GetModelByHandle( ent->e.hModel );
 			if (!tr.currentModel) {
-				R_AddDrawSurf( &entitySurface, tr.defaultShader, 0, 0 );
+				R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
 			} else {
 				switch ( tr.currentModel->type ) {
-				case MOD_MESH:
-					R_AddMD3Surfaces( ent );
+				case MOD_SPRITE:
+					Com_Printf("sprite model '%s' being added to renderer!\n", tr.currentModel->name);
 					break;
-				case MOD_MDR:
-					R_MDRAddAnimSurfaces( ent );
-					break;
-				case MOD_IQM:
-					R_AddIQMSurfaces( ent );
+				case MOD_TIKI:
+					R_AddSkelSurfaces( ent );
 					break;
 				case MOD_BRUSH:
 					R_AddBrushModelSurfaces( ent );
@@ -1252,7 +1543,8 @@ void R_AddEntitySurfaces (void) {
 					if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
 						break;
 					}
-					R_AddDrawSurf( &entitySurface, tr.defaultShader, 0, 0 );
+					shader = R_GetShaderByHandle( ent->e.customShader );
+					R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
 					break;
 				default:
 					ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad modeltype" );
@@ -1264,9 +1556,56 @@ void R_AddEntitySurfaces (void) {
 			ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad reType" );
 		}
 	}
-
 }
 
+void R_AddSpriteSurfaces()
+{
+	refSprite_t* sprite;
+	vec3_t delta;
+
+	if (!r_drawsprites->integer) {
+		return;
+	}
+
+	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
+	{
+		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
+
+        if (tr.viewParms.isPortalSky) {
+			if (!(sprite->renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+        } else {
+			if (sprite->renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+        
+		if (tr.viewParms.isPortal) {
+			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
+				continue;
+			}
+		} else {
+			if (sprite->renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
+		tr.currentEntityNum = ENTITYNUM_WORLD;
+        tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
+		if (sprite->hModel && sprite->hModel < tr.numModels) {
+			tr.currentModel = &tr.models[sprite->hModel];
+		} else {
+			tr.currentModel = &tr.models[0];
+		}
+
+		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.ori );
+		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
+
+		VectorSubtract(sprite->origin, tr.refdef.vieworg, delta);
+		R_AddSpriteSurf(&sprite->surftype, tr.currentModel->d.sprite->shader, VectorLengthSquared(delta));
+	}
+}
 
 /*
 ====================
@@ -1275,22 +1614,24 @@ R_GenerateDrawSurfs
 */
 void R_GenerateDrawSurfs( void ) {
 	R_AddWorldSurfaces ();
+	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL)) {
+		R_AddSwipeSurfaces();
+	}
 
 	R_AddPolygonSurfaces();
 
+    R_AddTerrainMarkSurfaces();
+
+    R_AddEntitySurfaces();
+
+	R_AddSpriteSurfaces();
+
 	// set the projection matrix with the minimum zfar
 	// now that we have the world bounded
 	// this needs to be done before entities are
 	// added, because they use the projection
 	// matrix for lod calculation
-
-	// dynamically compute far clip plane distance
-	R_SetFarClip();
-
-	// we know the size of the clipping volume. Now set the rest of the projection matrix.
-	R_SetupProjectionZ (&tr.viewParms);
-
-	R_AddEntitySurfaces ();
+	R_SetupProjection ();
 }
 
 /*
@@ -1332,20 +1673,231 @@ Visualization aid for movement clipping debugging
 ====================
 */
 void R_DebugGraphics( void ) {
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return;
-	}
 	if ( !r_debugSurface->integer ) {
 		return;
 	}
 
-	R_IssuePendingRenderCommands();
+	// the render thread can't make callbacks to the main thread
+	R_SyncRenderThread();
 
 	GL_Bind( tr.whiteImage);
 	GL_Cull( CT_FRONT_SIDED );
 	ri.CM_DrawDebugSurface( R_DebugPolygon );
 }
 
+#define CIRCLE_LENGTH		25
+
+/*
+================
+R_DebugCircle
+================
+*/
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
+    int				i;
+    float			ang;
+	debugline_t* line;
+	vec3_t			forward, right;
+	vec3_t			pos, lastpos;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (horizontal)
+	{
+		VectorSet(forward, 1, 0, 0);
+		VectorSet(right, 0, 1, 0);
+	}
+	else
+	{
+		VectorCopy(tr.refdef.viewaxis[1], right);
+		VectorCopy(tr.refdef.viewaxis[2], forward);
+	}
+
+	VectorClear(pos);
+	VectorClear(lastpos);
+
+	for (i = 0; i < CIRCLE_LENGTH; i++) {
+		VectorCopy(pos, lastpos);
+
+		ang = DEG2RAD((float)(i * 15));
+		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
+			cos(ang) * radius * right[0];
+		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
+			cos(ang) * radius * right[1];
+		pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
+			cos(ang) * radius * right[2];
+
+		if (i > 0)
+		{
+			if (*ri.numDebugLines >= r_numdebuglines->integer) {
+				ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
+				return;
+			}
+
+			line = &(*ri.DebugLines)[*ri.numDebugLines];
+			(*ri.numDebugLines)++;
+			VectorCopy(lastpos, line->start);
+			VectorCopy(pos, line->end);
+			VectorSet(line->color, r, g, b);
+			line->alpha = alpha;
+			line->width = 1.0;
+			line->factor = 1;
+			line->pattern = -1;
+		}
+	}
+}
+
+/*
+================
+R_DebugLine
+================
+*/
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
+	debugline_t* line;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (*ri.numDebugLines >= r_numdebuglines->integer) {
+		ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
+		return;
+	}
+
+	line = &(*ri.DebugLines)[*ri.numDebugLines];
+	(*ri.numDebugLines)++;
+	VectorCopy(start, line->start);
+	VectorCopy(end, line->end);
+	VectorSet(line->color, r, g, b);
+	line->alpha = alpha;
+	line->width = 1.0;
+	line->factor = 1;
+	line->pattern = -1;
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugLines(void) {
+	debugline_t* line;
+	int i;
+	float width;
+	int factor;
+	unsigned short pattern;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (!*ri.numDebugLines) {
+		return;
+	}
+
+	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+		return;
+	}
+
+	if (tr.viewParms.isPortalSky) {
+		return;
+	}
+
+    R_SyncRenderThread();
+    GL_Bind(tr.whiteImage);
+	if (r_debuglines_depthmask->integer) {
+		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+	} else {
+		GL_State(GLS_POLYMODE_LINE);
+	}
+
+    qglDisableClientState(GL_COLOR_ARRAY);
+    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+    width = 1.0;
+    factor = 4;
+    pattern = -1;
+
+    if (r_stipplelines->integer)
+    {
+        qglEnable(GL_LINE_STIPPLE);
+        qglLineStipple(4, -1);
+        qglLineWidth(1.0f);
+    }
+
+	qglBegin(GL_LINES);
+
+	for (i = 0; i < *ri.numDebugLines; i++) {
+		line = &(*ri.DebugLines)[i];
+
+		if (r_stipplelines->integer) {
+			if (line->width != width || line->factor != factor || line->pattern != pattern) {
+				qglEnd();
+				qglLineStipple(line->factor, line->pattern);
+                qglLineWidth(line->width);
+                qglBegin(GL_LINES);
+                factor = line->factor;
+                width = line->width;
+                pattern = line->pattern;
+			}
+		}
+
+		qglColor4f(line->color[0], line->color[1], line->color[2], line->alpha);
+        qglVertex3fv(line->start);
+        qglVertex3fv(line->end);
+	}
+
+    qglEnd();
+
+    if (r_stipplelines->integer)
+    {
+        qglDisable(GL_LINE_STIPPLE);
+        qglLineStipple(1, -1);
+        qglLineWidth(1.0);
+    }
+
+    qglDepthRange(0.0, 1.0);
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugStrings(void) {
+	int i;
+	debugstring_t* string;
+
+	if (!ri.DebugStrings || !ri.numDebugStrings) {
+		return;
+	}
+
+	if (!*ri.numDebugStrings) {
+		return;
+	}
+
+    if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+	for (i = 0; i < *ri.numDebugStrings; i++) {
+		string = &(*ri.DebugStrings)[i];
+
+		R_DrawFloatingString(
+			tr.pFontDebugStrings,
+			string->szText,
+			string->pos,
+			string->color,
+			string->scale,
+			64
+		);
+	}
+}
 
 /*
 ================
@@ -1357,7 +1909,7 @@ or a mirror / remote location
 */
 void R_RenderView (viewParms_t *parms) {
 	int		firstDrawSurf;
-	int		numDrawSurfs;
+	int		firstSpriteSurf;
 
 	if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
 		return;
@@ -1370,25 +1922,28 @@ void R_RenderView (viewParms_t *parms) {
 	tr.viewParms.frameCount = tr.frameCount;
 
 	firstDrawSurf = tr.refdef.numDrawSurfs;
+	firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 	tr.viewCount++;
 
 	// set viewParms.world
 	R_RotateForViewer ();
 
-	R_SetupProjection(&tr.viewParms, r_zproj->value, qtrue);
+	R_SetupFrustum ();
+
+	R_Sky_Reset();
+
+	R_DrawDebugStrings();
 
 	R_GenerateDrawSurfs();
 
-	// if we overflowed MAX_DRAWSURFS, the drawsurfs
-	// wrapped around in the buffer and we will be missing
-	// the first surfaces, not the last ones
-	numDrawSurfs = tr.refdef.numDrawSurfs;
-	if ( numDrawSurfs > MAX_DRAWSURFS ) {
-		numDrawSurfs = MAX_DRAWSURFS;
-	}
+    R_SortDrawSurfs(
+		tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
+		tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
+	);
 
-	R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - firstDrawSurf );
+	R_DrawDebugLines();
+    R_DebugSkeleton();
 
 	// draw main system development information (surface outlines, etc)
 	R_DebugGraphics();
diff --git a/code/renderergl1/tr_marks.c b/code/renderergl1/tr_marks.c
index e757ac88..6fdb7b74 100644
--- a/code/renderergl1/tr_marks.c
+++ b/code/renderergl1/tr_marks.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -38,15 +38,16 @@ Out must have space for two more vertexes than in
 #define	SIDE_FRONT	0
 #define	SIDE_BACK	1
 #define	SIDE_ON		2
-static void R_ChopPolyBehindPlane( int numInPoints, vec3_t inPoints[MAX_VERTS_ON_POLY],
+static void R_ChopPolyBehindPlane( int numInPoints, const vec3_t inPoints[MAX_VERTS_ON_POLY],
 								   int *numOutPoints, vec3_t outPoints[MAX_VERTS_ON_POLY], 
-							vec3_t normal, vec_t dist, vec_t epsilon) {
-	float		dists[MAX_VERTS_ON_POLY+4] = { 0 };
-	int			sides[MAX_VERTS_ON_POLY+4] = { 0 };
+							const vec3_t normal, vec_t dist, vec_t epsilon) {
+	float		dists[MAX_VERTS_ON_POLY+4];
+	int			sides[MAX_VERTS_ON_POLY+4];
 	int			counts[3];
 	float		dot;
 	int			i, j;
-	float		*p1, *p2, *clip;
+	const float* p1, * p2;
+	float		*clip;
 	float		d;
 
 	// don't clip if it might overflow
@@ -158,8 +159,7 @@ void R_BoxSurfaces_r(mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **li
 		//
 		surf = *mark;
 		// check if the surface has NOIMPACT or NOMARKS set
-		if ( ( surf->shader->surfaceFlags & ( SURF_NOIMPACT | SURF_NOMARKS ) )
-			|| ( surf->shader->contentFlags & CONTENTS_FOG ) ) {
+		if ( ( surf->shader->surfaceFlags & ( SURF_NOIMPACT | SURF_NOMARKS ) ) ) {
 			surf->viewCount = tr.viewCount;
 		}
 		// extra check for surfaces to avoid list overflows
@@ -173,9 +173,7 @@ void R_BoxSurfaces_r(mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **li
 				surf->viewCount = tr.viewCount;
 			}
 		}
-		else if (*(surfaceType_t *) (surf->data) != SF_GRID &&
-			 *(surfaceType_t *) (surf->data) != SF_TRIANGLES)
-			surf->viewCount = tr.viewCount;
+		else if (*(surfaceType_t *) (surf->data) != SF_GRID) surf->viewCount = tr.viewCount;
 		// check the viewCount because the surface may have
 		// already been added if it spans multiple leafs
 		if (surf->viewCount != tr.viewCount) {
@@ -194,11 +192,11 @@ R_AddMarkFragments
 =================
 */
 void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POLY],
-				   int numPlanes, vec3_t *normals, float *dists,
+				   int numPlanes, const vec3_t *normals, const float *dists,
 				   int maxPoints, vec3_t pointBuffer,
-				   int maxFragments, markFragment_t *fragmentBuffer,
+				   markFragment_t *fragmentBuffer,
 				   int *returnedPoints, int *returnedFragments,
-				   vec3_t mins, vec3_t maxs) {
+				   float fOnEpsilon) {
 	int pingPong, i;
 	markFragment_t	*mf;
 
@@ -224,28 +222,357 @@ void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POL
 	if ( numClipPoints + (*returnedPoints) > maxPoints ) {
 		return;	// not enough space for this polygon
 	}
-	/*
-	// all the clip points should be within the bounding box
-	for ( i = 0 ; i < numClipPoints ; i++ ) {
-		int j;
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if (clipPoints[pingPong][i][j] < mins[j] - 0.5) break;
-			if (clipPoints[pingPong][i][j] > maxs[j] + 0.5) break;
-		}
-		if (j < 3) break;
-	}
-	if (i < numClipPoints) return;
-	*/
 
 	mf = fragmentBuffer + (*returnedFragments);
 	mf->firstPoint = (*returnedPoints);
 	mf->numPoints = numClipPoints;
+	mf->iIndex = 0;
 	Com_Memcpy( pointBuffer + (*returnedPoints) * 3, clipPoints[pingPong], numClipPoints * sizeof(vec3_t) );
 
 	(*returnedPoints) += numClipPoints;
 	(*returnedFragments)++;
 }
 
+void R_AddMarkFragmentsToTerrain(
+	cTerraPatchUnpacked_t* pTerPatch,
+	int numPlanes,
+    const vec3_t* normals,
+    float* dists,
+	int maxPoints,
+	vec3_t pointBuffer,
+	markFragment_t* fragmentBuffer,
+	int* returnedPoints,
+	int* returnedFragments
+)
+{
+	int i, j;
+	int iType;
+	int iFirstFragment;
+	unsigned char* pubHeight;
+	vec3_t v[8];
+	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
+
+	dists[numPlanes - 2] -= 96.f;
+	dists[numPlanes - 1] -= 108.f;
+
+	v[0][0] = pTerPatch->x0;
+	v[0][1] = pTerPatch->y0;
+	v[0][2] = pTerPatch->z0;
+	v[1][0] = pTerPatch->x0;
+	v[1][1] = pTerPatch->y0 + 512.f;
+    v[1][2] = pTerPatch->z0;
+    v[2][0] = pTerPatch->x0 + 512.f;
+    v[2][1] = pTerPatch->y0 + 512.f;
+    v[2][2] = pTerPatch->z0;
+    v[3][0] = pTerPatch->x0 + 512.f;
+    v[3][1] = pTerPatch->y0;
+    v[3][2] = pTerPatch->z0;
+    v[4][0] = pTerPatch->x0;
+    v[4][1] = pTerPatch->y0;
+    v[4][2] = pTerPatch->z0 + 510.f;
+    v[5][0] = pTerPatch->x0;
+    v[5][1] = pTerPatch->y0 + 512.f;
+    v[5][2] = pTerPatch->z0 + 510.f;
+    v[6][0] = pTerPatch->x0 + 512.f;
+    v[6][1] = pTerPatch->y0 + 512.f;
+    v[6][2] = pTerPatch->z0 + 510.f;
+    v[7][0] = pTerPatch->x0 + 512.f;
+    v[7][1] = pTerPatch->y0;
+    v[7][2] = pTerPatch->z0 + 510.f;
+
+	for (i = 0; i < numPlanes; i++) {
+		pubHeight = pTerPatch->heightmap;
+		iFirstFragment = *returnedFragments;
+
+		for (j = 0; j < 8; j++) {
+			if (DotProduct(v[i], normals[i]) - dists[i] > 0.f) {
+				break;
+			}
+		}
+
+		if (j == 8)
+		{
+			dists[numPlanes - 2] += 96.f;
+			dists[numPlanes - 1] += 108.f;
+			return;
+		}
+	}
+
+	pubHeight = pTerPatch->heightmap;
+	iFirstFragment = *returnedFragments;
+
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < 8; j++) {
+			iType = ri.CM_TerrainSquareType(pTerPatch - tr.world->terraPatches, i, j);
+			if (!iType) {
+				continue;
+			}
+
+			v[0][0] = (i << 6) + pTerPatch->x0;
+			v[0][1] = (j << 6) + pTerPatch->y0;
+            v[0][2] = (pubHeight[0] << 1) + pTerPatch->z0;
+            v[1][0] = (i << 6) + pTerPatch->x0 + 64.f;
+            v[1][1] = (j << 6) + pTerPatch->y0;
+            v[1][2] = (pubHeight[1] << 1) + pTerPatch->z0;
+            v[2][0] = (i << 6) + pTerPatch->x0 + 64.f;
+            v[2][1] = (j << 6) + pTerPatch->y0 + 64.f;
+            v[2][2] = (pubHeight[10] << 1) + pTerPatch->z0;
+            v[3][0] = (i << 6) + pTerPatch->x0;
+            v[3][1] = (j << 6) + pTerPatch->y0 + 64.f;
+            v[3][2] = (pubHeight[9] << 1) + pTerPatch->z0;
+
+			if (((j & 0xFF) + (i & 0xFF)) & 1) {
+				if (iType != 3) {
+					VectorCopy(v[0], clipPoints[0][0]);
+					VectorCopy(v[3], clipPoints[0][1]);
+					VectorCopy(v[1], clipPoints[0][2]);
+
+					R_AddMarkFragments(
+						3,
+						clipPoints,
+						numPlanes,
+						normals,
+						dists,
+						maxPoints,
+						pointBuffer,
+						fragmentBuffer,
+						returnedPoints,
+						returnedFragments,
+						0.f
+					);
+				}
+
+                if (iType != 6) {
+                    VectorCopy(v[2], clipPoints[0][0]);
+                    VectorCopy(v[1], clipPoints[0][1]);
+                    VectorCopy(v[3], clipPoints[0][2]);
+
+                    R_AddMarkFragments(
+                        3,
+                        clipPoints,
+                        numPlanes,
+                        normals,
+                        dists,
+                        maxPoints,
+                        pointBuffer,
+                        fragmentBuffer,
+                        returnedPoints,
+                        returnedFragments,
+                        0.f
+                    );
+				}
+			} else {
+                if (iType != 5) {
+                    VectorCopy(v[3], clipPoints[0][0]);
+                    VectorCopy(v[2], clipPoints[0][1]);
+                    VectorCopy(v[0], clipPoints[0][2]);
+
+                    R_AddMarkFragments(
+                        3,
+                        clipPoints,
+                        numPlanes,
+                        normals,
+                        dists,
+                        maxPoints,
+                        pointBuffer,
+                        fragmentBuffer,
+                        returnedPoints,
+                        returnedFragments,
+                        0.f
+                    );
+				}
+
+                if (iType != 4) {
+                    VectorCopy(v[1], clipPoints[0][0]);
+                    VectorCopy(v[0], clipPoints[0][1]);
+                    VectorCopy(v[2], clipPoints[0][2]);
+
+                    R_AddMarkFragments(
+                        3,
+                        clipPoints,
+                        numPlanes,
+                        normals,
+                        dists,
+                        maxPoints,
+                        pointBuffer,
+                        fragmentBuffer,
+                        returnedPoints,
+                        returnedFragments,
+                        0.f
+                    );
+				}
+			}
+		}
+	}
+
+	for (i = iFirstFragment; i < *returnedFragments; i++) {
+		fragmentBuffer[i].iIndex = pTerPatch - tr.world->terraPatches + 1;
+	}
+
+    dists[numPlanes - 2] += 96.f;
+    dists[numPlanes - 1] += 108.f;
+}
+
+void R_TessellateMarkFragments(
+	int* pReturnedPoints,
+	int* pReturnedFragments,
+	int numsurfaces,
+	surfaceType_t** surfaces,
+	const vec3_t projectionDir,
+	int numPlanes,
+    const vec3_t* normals,
+    float* dists,
+	int maxPoints,
+	vec3_t pointBuffer,
+	int maxFragments,
+	markFragment_t* fragmentBuffer,
+	float fRadiusSquared
+)
+{
+	int i, j, k, m, n;
+	int* indexes;
+	float* v;
+	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
+	vec3_t v1, v2;
+	vec3_t normal;
+	drawVert_t* dv;
+	qboolean bSkipTerrain;
+	srfGridMesh_t* cv;
+	srfSurfaceFace_t* surf;
+	cTerraPatchUnpacked_t* terraPatch;
+	int numClipPoints;
+
+    bSkipTerrain = ter_minMarkRadius->value * ter_minMarkRadius->value >= (long double)fRadiusSquared;
+
+	for (i = 0; i < numsurfaces; i++) {
+		if (*surfaces[i] == SF_GRID) {
+			cv = (srfGridMesh_t*)surfaces[i];
+
+			for (m = 0; m < cv->height - 1; m++) {
+				for (n = 0; n < cv->width - 1; n++) {
+					// We triangulate the grid and chop all triangles within
+					// the bounding planes of the to be projected polygon.
+					// LOD is not taken into account, not such a big deal though.
+					//
+					// It's probably much nicer to chop the grid itself and deal
+					// with this grid as a normal SF_GRID surface so LOD will
+					// be applied. However the LOD of that chopped grid must
+					// be synced with the LOD of the original curve.
+					// One way to do this; the chopped grid shares vertices with
+					// the original curve. When LOD is applied to the original
+					// curve the unused vertices are flagged. Now the chopped curve
+					// should skip the flagged vertices. This still leaves the
+					// problems with the vertices at the chopped grid edges.
+					//
+					// To avoid issues when LOD applied to "hollow curves" (like
+					// the ones around many jump pads) we now just add a 2 unit
+					// offset to the triangle vertices.
+					// The offset is added in the vertex normal vector direction
+					// so all triangles will still fit together.
+					// The 2 unit offset should avoid pretty much all LOD problems.
+
+                    numClipPoints = 3;
+
+                    dv = cv->verts + m * cv->width + n;
+
+                    VectorCopy(dv[0].xyz, clipPoints[0][0]);
+                    VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[0].normal, clipPoints[0][0]);
+                    VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
+                    VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
+                    VectorCopy(dv[1].xyz, clipPoints[0][2]);
+                    VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[1].normal, clipPoints[0][2]);
+                    // check the normal of this triangle
+					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
+					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
+					CrossProduct(v1, v2, normal);
+					VectorNormalize(normal);
+                    if (DotProduct(normal, projectionDir) < -0.1) {
+                        // add the fragments of this triangle
+                        R_AddMarkFragments(numClipPoints, clipPoints,
+                            numPlanes, normals, dists,
+                            maxPoints, pointBuffer,
+                            fragmentBuffer,
+                            pReturnedPoints, pReturnedFragments, 0.f);
+
+                        if (*pReturnedFragments == maxFragments) {
+                            return;	// not enough space for more fragments
+                        }
+                    }
+
+					VectorCopy(dv[1].xyz, clipPoints[0][0]);
+					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[1].normal, clipPoints[0][0]);
+					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
+					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
+					VectorCopy(dv[cv->width+1].xyz, clipPoints[0][2]);
+					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[cv->width+1].normal, clipPoints[0][2]);
+                    // check the normal of this triangle
+                    VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
+                    VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
+                    CrossProduct(v1, v2, normal);
+                    VectorNormalize(normal);
+                    if (DotProduct(normal, projectionDir) < -0.05) {
+                        // add the fragments of this triangle
+                        R_AddMarkFragments(numClipPoints, clipPoints,
+                            numPlanes, normals, dists,
+                            maxPoints, pointBuffer,
+                            fragmentBuffer,
+                            pReturnedPoints, pReturnedFragments, 0.f);
+
+                        if (*pReturnedFragments == maxFragments) {
+                            return;	// not enough space for more fragments
+                        }
+                    }
+				}
+			}
+		} else if (*surfaces[i] == SF_FACE) {
+            surf = (srfSurfaceFace_t*)surfaces[i];
+            // check the normal of this face
+            if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
+                continue;
+            }
+
+            indexes = (int*)((byte*)surf + surf->ofsIndices);
+
+            for (k = 0; k < surf->numIndices; k += 3) {
+                for (j = 0; j < 3; j++) {
+                    v = surf->points[indexes[k + j]];
+                    VectorMA(v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j]);
+                }
+
+                // add the fragments of this face
+                R_AddMarkFragments(3, clipPoints,
+                    numPlanes, normals, dists,
+                    maxPoints, pointBuffer,
+                    fragmentBuffer,
+                    pReturnedPoints, pReturnedFragments, 0.f);
+                if (*pReturnedFragments == maxFragments) {
+                    return;	// not enough space for more fragments
+                }
+            }
+		} else if (*surfaces[i] == SF_TERRAIN_PATCH) {
+			terraPatch = (cTerraPatchUnpacked_t*)surfaces[i];
+
+			if (!bSkipTerrain) {
+				R_AddMarkFragmentsToTerrain(
+					terraPatch,
+					numPlanes,
+					normals,
+					dists,
+					maxPoints,
+					pointBuffer,
+					fragmentBuffer,
+					pReturnedPoints,
+					pReturnedFragments
+				);
+
+				if (*pReturnedFragments == maxFragments) {
+					return;
+				}
+			}
+		}
+	}
+}
+
 /*
 =================
 R_MarkFragments
@@ -253,28 +580,21 @@ R_MarkFragments
 =================
 */
 int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer ) {
-	int				numsurfaces, numPlanes;
-	int				i, j, k, m, n;
-	surfaceType_t	*surfaces[64];
-	vec3_t			mins, maxs;
-	int				returnedFragments;
-	int				returnedPoints;
-	vec3_t			normals[MAX_VERTS_ON_POLY+2];
-	float			dists[MAX_VERTS_ON_POLY+2];
-	vec3_t			clipPoints[2][MAX_VERTS_ON_POLY];
-	int				numClipPoints;
-	float			*v;
-	srfGridMesh_t	*cv;
-	drawVert_t		*dv;
-	vec3_t			normal;
-	vec3_t			projectionDir;
-	vec3_t			v1, v2;
-	int				*indexes;
-
-	if (numPoints <= 0) {
-		return 0;
-	}
+				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared ) {
+    int numsurfaces;
+	int i;
+    surfaceType_t* surfaces[64];
+    vec3_t mins, maxs;
+	vec3_t boxsize;
+	float radius;
+	float backpush, frontpush;
+	int returnedFragments;
+	int returnedPoints;
+	vec3_t normals[MAX_VERTS_ON_POLY + 2];
+	float dists[MAX_VERTS_ON_POLY + 2];
+	vec3_t projectionDir;
+	vec3_t v1, v2;
+	float projdir;
 
 	//increment view count for double check prevention
 	tr.viewCount++;
@@ -294,6 +614,16 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 		AddPointToBounds( temp, mins, maxs );
 	}
 
+	VectorSubtract(maxs, mins, v1);
+	projdir = -DotProduct(v1, projectionDir);
+	VectorMA(v1, projdir, projectionDir, boxsize);
+	radius = VectorLength(boxsize);
+
+    frontpush = radius;
+    if (radius >= 32.f) frontpush = 32.f;
+    backpush = radius;
+	if (radius >= 20.f) backpush = radius;
+
 	if (numPoints > MAX_VERTS_ON_POLY) numPoints = MAX_VERTS_ON_POLY;
 	// create the bounding planes for the to be projected polygon
 	for ( i = 0 ; i < numPoints ; i++ ) {
@@ -306,24 +636,43 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 	}
 	// add near and far clipping planes for projection
 	VectorCopy(projectionDir, normals[numPoints]);
-	dists[numPoints] = DotProduct(normals[numPoints], points[0]) - 32;
+	dists[numPoints] = DotProduct(normals[numPoints], points[0]) - frontpush;
 	VectorCopy(projectionDir, normals[numPoints+1]);
 	VectorInverse(normals[numPoints+1]);
-	dists[numPoints+1] = DotProduct(normals[numPoints+1], points[0]) - 20;
-	numPlanes = numPoints + 2;
+	dists[numPoints+1] = DotProduct(normals[numPoints+1], points[0]) - backpush;
 
+	returnedPoints = 0;
+	returnedFragments = 0;
 	numsurfaces = 0;
+
 	R_BoxSurfaces_r(tr.world->nodes, mins, maxs, surfaces, 64, &numsurfaces, projectionDir);
-	//assert(numsurfaces <= 64);
-	//assert(numsurfaces != 64);
+	if (!numsurfaces) return 0;
+
+    R_TessellateMarkFragments(
+        &returnedPoints,
+        &returnedFragments,
+        numsurfaces,
+        surfaces,
+        projectionDir,
+        numPoints + 2,
+        normals,
+        dists,
+        maxPoints,
+        pointBuffer,
+        maxFragments,
+        fragmentBuffer,
+        fRadiusSquared
+	);
+
+    return returnedFragments;
 
 	returnedPoints = 0;
 	returnedFragments = 0;
 
+#if 0
 	for ( i = 0 ; i < numsurfaces ; i++ ) {
 
 		if (*surfaces[i] == SF_GRID) {
-
 			cv = (srfGridMesh_t *) surfaces[i];
 			for ( m = 0 ; m < cv->height - 1 ; m++ ) {
 				for ( n = 0 ; n < cv->width - 1 ; n++ ) {
@@ -368,8 +717,8 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 						R_AddMarkFragments(numClipPoints, clipPoints,
 										   numPlanes, normals, dists,
 										   maxPoints, pointBuffer,
-										   maxFragments, fragmentBuffer,
-										   &returnedPoints, &returnedFragments, mins, maxs);
+										    fragmentBuffer,
+										   &returnedPoints, &returnedFragments, 0.f);
 
 						if ( returnedFragments == maxFragments ) {
 							return returnedFragments;	// not enough space for more fragments
@@ -392,8 +741,8 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 						R_AddMarkFragments(numClipPoints, clipPoints,
 										   numPlanes, normals, dists,
 										   maxPoints, pointBuffer,
-										   maxFragments, fragmentBuffer,
-										   &returnedPoints, &returnedFragments, mins, maxs);
+										    fragmentBuffer,
+										   &returnedPoints, &returnedFragments, 0.f);
 
 						if ( returnedFragments == maxFragments ) {
 							return returnedFragments;	// not enough space for more fragments
@@ -404,55 +753,203 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 		}
 		else if (*surfaces[i] == SF_FACE) {
 
-			srfSurfaceFace_t *surf = ( srfSurfaceFace_t * ) surfaces[i];
-
+			surf = ( srfSurfaceFace_t * ) surfaces[i];
 			// check the normal of this face
 			if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
 				continue;
 			}
 
+			/*
+			VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
+			VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
+			CrossProduct(v1, v2, normal);
+			VectorNormalize(normal);
+			if (DotProduct(normal, projectionDir) > -0.5) continue;
+			*/
 			indexes = (int *)( (byte *)surf + surf->ofsIndices );
 			for ( k = 0 ; k < surf->numIndices ; k += 3 ) {
 				for ( j = 0 ; j < 3 ; j++ ) {
-					v = &surf->points[0][0] + VERTEXSIZE * indexes[k+j];
+					v = surf->points[0] + VERTEXSIZE * indexes[k+j];;
 					VectorMA( v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j] );
 				}
-
 				// add the fragments of this face
 				R_AddMarkFragments( 3 , clipPoints,
 								   numPlanes, normals, dists,
 								   maxPoints, pointBuffer,
-								   maxFragments, fragmentBuffer,
-								   &returnedPoints, &returnedFragments, mins, maxs);
+								   fragmentBuffer,
+								   &returnedPoints, &returnedFragments, 0.f);
 				if ( returnedFragments == maxFragments ) {
 					return returnedFragments;	// not enough space for more fragments
 				}
 			}
+			continue;
 		}
-		else if(*surfaces[i] == SF_TRIANGLES && r_marksOnTriangleMeshes->integer) {
-
-			srfTriangles_t *surf = (srfTriangles_t *) surfaces[i];
-
-			for (k = 0; k < surf->numIndexes; k += 3)
-			{
-				for(j = 0; j < 3; j++)
-				{
-					v = surf->verts[surf->indexes[k + j]].xyz;
-					VectorMA(v, MARKER_OFFSET, surf->verts[surf->indexes[k + j]].normal, clipPoints[0][j]);
-				}
-
-				// add the fragments of this face
-				R_AddMarkFragments(3, clipPoints,
-								   numPlanes, normals, dists,
-								   maxPoints, pointBuffer,
-								   maxFragments, fragmentBuffer, &returnedPoints, &returnedFragments, mins, maxs);
-				if(returnedFragments == maxFragments)
-				{
-					return returnedFragments;	// not enough space for more fragments
-				}
-			}
+		else {
+			// ignore all other world surfaces
+			// might be cool to also project polygons on a triangle soup
+			// however this will probably create huge amounts of extra polys
+			// even more than the projection onto curves
+			continue;
 		}
 	}
 	return returnedFragments;
+#endif
 }
 
+void R_BoxSurfacesForBModel_r(bmodel_t* pBmodel, const vec3_t mins, const vec3_t maxs, surfaceType_t** list, int listsize, int* listlength, const vec3_t dir)
+{
+	int s;
+	int c;
+	msurface_t* surf;
+	int i;
+
+	surf = pBmodel->firstSurface;
+
+	for (i = 0; i < listsize && i < pBmodel->numSurfaces; i++, surf++) {
+		s = surf->shader->surfaceFlags;
+		c = surf->shader->contentFlags;
+
+		if (!(s & SURF_NOIMPACT)
+			&& !(s & SURF_NOMARKS)
+			&& !(c & CONTENTS_FOG))
+		{
+			switch (*surf->data)
+			{
+			case SF_FACE:
+            {
+                int plane;
+                srfSurfaceFace_t* face;
+
+				face = (srfSurfaceFace_t*)surf->data;
+				plane = BoxOnPlaneSide(mins, maxs, &face->plane);
+				if (plane == PLANE_Y || plane == PLANE_Z) {
+					surf->viewCount = tr.viewCount;
+				}
+				else if (DotProduct(dir, face->plane.normal) > 0.5f) {
+					surf->viewCount = tr.viewCount;
+				}
+				break;
+			}
+            case SF_GRID:
+                surf->viewCount = tr.viewCount;
+				break;
+			default:
+				break;
+			}
+		}
+		else
+		{
+			surf->viewCount = tr.viewCount;
+		}
+
+		if (surf->viewCount != tr.viewCount)
+		{
+			surf->viewCount = tr.viewCount;
+			list[(*listlength)++] = surf->data;
+		}
+	}
+}
+
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+    int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared)
+{
+	int i;
+	int numsurfaces;
+	vec3_t vTmp;
+	vec3_t v1, v2;
+	vec3_t vMins, vMaxs;
+	vec3_t vTransPoints[64];
+	vec3_t vTransProj;
+	vec3_t vTransProjDir;
+	bmodel_t* pBmodel;
+	surfaceType_t* surfaces[64];
+	int returnedFragments;
+	int returnedPoints;
+	vec3_t normals[MAX_VERTS_ON_POLY+2];
+	float dists[MAX_VERTS_ON_POLY+2];
+
+    tr.viewCount++;
+
+    pBmodel = &tr.world->bmodels[bmodel];
+
+	if (numPoints > 64) {
+		numPoints = 64;
+	}
+
+	if (vAngles[0] || vAngles[1] || vAngles[2])
+	{
+		vec3_t axis[3];
+
+		AngleVectorsLeft(vAngles, axis[0], axis[1], axis[2]);
+	
+		for (i = 0; i < numPoints; i++) {
+			VectorSubtract(points[i], vOrigin, vTmp);
+			MatrixTransformVectorRight(axis, vTmp, vTransPoints[i]);
+		}
+
+		MatrixTransformVectorRight(axis, projection, vTransProj);
+	}
+	else
+	{
+        for (i = 0; i < numPoints; i++) {
+            VectorSubtract(points[i], vOrigin, vTransPoints[i]);
+		}
+
+		VectorCopy(projection, vTransProj);
+	}
+
+    VectorNormalize2(vTransProj, vTransProjDir);
+    ClearBounds(vMins, vMaxs);
+
+	for (i = 0; i < numPoints; i++) {
+		AddPointToBounds(vTransPoints[i], vMins, vMaxs);
+		VectorAdd(vTransPoints[i], vTransProj, vTmp);
+		AddPointToBounds(vTmp, vMins, vMaxs);
+		VectorMA(vTransPoints[i], -20.f, vTransProjDir, vTmp);
+		AddPointToBounds(vTmp, vMins, vMaxs);
+	}
+
+	for (i = 0; i < numPoints; i++) {
+		VectorSubtract(vTransPoints[(i + 1) % numPoints], vTransPoints[i], v1);
+		VectorAdd(vTransPoints[i], vTransProj, v2);
+		VectorSubtract(vTransPoints[i], v2, v2);
+		CrossProduct(v1, v2, normals[i]);
+		VectorNormalize(normals[i]);
+		dists[i] = DotProduct(normals[i], vTransPoints[i]);
+	}
+
+	VectorCopy(vTransProjDir, normals[numPoints]);
+	dists[numPoints] = DotProduct(normals[numPoints], vTransPoints[0]) - 32.f;
+
+	VectorCopy(vTransProjDir, normals[numPoints + 1]);
+	VectorInverse(normals[numPoints + 1]);
+	dists[numPoints + 1] = DotProduct(normals[numPoints + 1], vTransPoints[0]) - 20.f;
+
+	returnedPoints = 0;
+	returnedFragments = 0;
+	numsurfaces = 0;
+
+	R_BoxSurfacesForBModel_r(pBmodel, vMins, vMaxs, surfaces, ARRAY_LEN(surfaces), &numsurfaces, vTransProjDir);
+	if (!numsurfaces) {
+		return 0;
+	}
+
+    R_TessellateMarkFragments(
+        &returnedPoints,
+        &returnedFragments,
+        numsurfaces,
+        surfaces,
+        vTransProjDir,
+        numPoints + 2,
+        normals,
+        dists,
+        maxPoints,
+        pointBuffer,
+        maxFragments,
+        fragmentBuffer,
+        fRadiusSquared
+	);
+
+    return returnedFragments;
+}
\ No newline at end of file
diff --git a/code/renderer/tr_marks_permanent.c b/code/renderergl1/tr_marks_permanent.c
similarity index 100%
rename from code/renderer/tr_marks_permanent.c
rename to code/renderergl1/tr_marks_permanent.c
diff --git a/code/renderergl1/tr_mesh.c b/code/renderergl1/tr_mesh.c
deleted file mode 100644
index 4cdd9fc2..00000000
--- a/code/renderergl1/tr_mesh.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_mesh.c: triangle model functions
-
-#include "tr_local.h"
-
-static float ProjectRadius( float r, vec3_t location )
-{
-	float pr;
-	float dist;
-	float c;
-	vec3_t	p;
-	float	projected[4];
-
-	c = DotProduct( tr.viewParms.or.axis[0], tr.viewParms.or.origin );
-	dist = DotProduct( tr.viewParms.or.axis[0], location ) - c;
-
-	if ( dist <= 0 )
-		return 0;
-
-	p[0] = 0;
-	p[1] = fabs( r );
-	p[2] = -dist;
-
-	projected[0] = p[0] * tr.viewParms.projectionMatrix[0] + 
-		           p[1] * tr.viewParms.projectionMatrix[4] +
-				   p[2] * tr.viewParms.projectionMatrix[8] +
-				   tr.viewParms.projectionMatrix[12];
-
-	projected[1] = p[0] * tr.viewParms.projectionMatrix[1] + 
-		           p[1] * tr.viewParms.projectionMatrix[5] +
-				   p[2] * tr.viewParms.projectionMatrix[9] +
-				   tr.viewParms.projectionMatrix[13];
-
-	projected[2] = p[0] * tr.viewParms.projectionMatrix[2] + 
-		           p[1] * tr.viewParms.projectionMatrix[6] +
-				   p[2] * tr.viewParms.projectionMatrix[10] +
-				   tr.viewParms.projectionMatrix[14];
-
-	projected[3] = p[0] * tr.viewParms.projectionMatrix[3] + 
-		           p[1] * tr.viewParms.projectionMatrix[7] +
-				   p[2] * tr.viewParms.projectionMatrix[11] +
-				   tr.viewParms.projectionMatrix[15];
-
-
-	pr = projected[1] / projected[3];
-
-	if ( pr > 1.0f )
-		pr = 1.0f;
-
-	return pr;
-}
-
-/*
-=============
-R_CullModel
-=============
-*/
-static int R_CullModel( md3Header_t *header, trRefEntity_t *ent ) {
-	vec3_t		bounds[2];
-	md3Frame_t	*oldFrame, *newFrame;
-	int			i;
-
-	// compute frame pointers
-	newFrame = ( md3Frame_t * ) ( ( byte * ) header + header->ofsFrames ) + ent->e.frame;
-	oldFrame = ( md3Frame_t * ) ( ( byte * ) header + header->ofsFrames ) + ent->e.oldframe;
-
-	// cull bounding sphere ONLY if this is not an upscaled entity
-	if ( !ent->e.nonNormalizedAxes )
-	{
-		if ( ent->e.frame == ent->e.oldframe )
-		{
-			switch ( R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius ) )
-			{
-			case CULL_OUT:
-				tr.pc.c_sphere_cull_md3_out++;
-				return CULL_OUT;
-
-			case CULL_IN:
-				tr.pc.c_sphere_cull_md3_in++;
-				return CULL_IN;
-
-			case CULL_CLIP:
-				tr.pc.c_sphere_cull_md3_clip++;
-				break;
-			}
-		}
-		else
-		{
-			int sphereCull, sphereCullB;
-
-			sphereCull  = R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius );
-			if ( newFrame == oldFrame ) {
-				sphereCullB = sphereCull;
-			} else {
-				sphereCullB = R_CullLocalPointAndRadius( oldFrame->localOrigin, oldFrame->radius );
-			}
-
-			if ( sphereCull == sphereCullB )
-			{
-				if ( sphereCull == CULL_OUT )
-				{
-					tr.pc.c_sphere_cull_md3_out++;
-					return CULL_OUT;
-				}
-				else if ( sphereCull == CULL_IN )
-				{
-					tr.pc.c_sphere_cull_md3_in++;
-					return CULL_IN;
-				}
-				else
-				{
-					tr.pc.c_sphere_cull_md3_clip++;
-				}
-			}
-		}
-	}
-	
-	// calculate a bounding box in the current coordinate system
-	for (i = 0 ; i < 3 ; i++) {
-		bounds[0][i] = oldFrame->bounds[0][i] < newFrame->bounds[0][i] ? oldFrame->bounds[0][i] : newFrame->bounds[0][i];
-		bounds[1][i] = oldFrame->bounds[1][i] > newFrame->bounds[1][i] ? oldFrame->bounds[1][i] : newFrame->bounds[1][i];
-	}
-
-	switch ( R_CullLocalBox( bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_md3_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_md3_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_md3_out++;
-		return CULL_OUT;
-	}
-}
-
-
-/*
-=================
-R_ComputeLOD
-
-=================
-*/
-int R_ComputeLOD( trRefEntity_t *ent ) {
-	float radius;
-	float flod, lodscale;
-	float projectedRadius;
-	md3Frame_t *frame;
-	mdrHeader_t *mdr;
-	mdrFrame_t *mdrframe;
-	int lod;
-
-	if ( tr.currentModel->numLods < 2 )
-	{
-		// model has only 1 LOD level, skip computations and bias
-		lod = 0;
-	}
-	else
-	{
-		// multiple LODs exist, so compute projected bounding sphere
-		// and use that as a criteria for selecting LOD
-
-		if(tr.currentModel->type == MOD_MDR)
-		{
-			int frameSize;
-			mdr = (mdrHeader_t *) tr.currentModel->modelData;
-			frameSize = (size_t) (&((mdrFrame_t *)0)->bones[mdr->numBones]);
-			
-			mdrframe = (mdrFrame_t *) ((byte *) mdr + mdr->ofsFrames + frameSize * ent->e.frame);
-			
-			radius = RadiusFromBounds(mdrframe->bounds[0], mdrframe->bounds[1]);
-		}
-		else
-		{
-			frame = ( md3Frame_t * ) ( ( ( unsigned char * ) tr.currentModel->md3[0] ) + tr.currentModel->md3[0]->ofsFrames );
-
-			frame += ent->e.frame;
-
-			radius = RadiusFromBounds( frame->bounds[0], frame->bounds[1] );
-		}
-
-		if ( ( projectedRadius = ProjectRadius( radius, ent->e.origin ) ) != 0 )
-		{
-			lodscale = r_lodscale->value;
-			if (lodscale > 20) lodscale = 20;
-			flod = 1.0f - projectedRadius * lodscale;
-		}
-		else
-		{
-			// object intersects near view plane, e.g. view weapon
-			flod = 0;
-		}
-
-		flod *= tr.currentModel->numLods;
-		lod = ri.ftol(flod);
-
-		if ( lod < 0 )
-		{
-			lod = 0;
-		}
-		else if ( lod >= tr.currentModel->numLods )
-		{
-			lod = tr.currentModel->numLods - 1;
-		}
-	}
-
-	lod += r_lodbias->integer;
-	
-	if ( lod >= tr.currentModel->numLods )
-		lod = tr.currentModel->numLods - 1;
-	if ( lod < 0 )
-		lod = 0;
-
-	return lod;
-}
-
-/*
-=================
-R_ComputeFogNum
-
-=================
-*/
-int R_ComputeFogNum( md3Header_t *header, trRefEntity_t *ent ) {
-	int				i, j;
-	fog_t			*fog;
-	md3Frame_t		*md3Frame;
-	vec3_t			localOrigin;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-
-	// FIXME: non-normalized axis issues
-	md3Frame = ( md3Frame_t * ) ( ( byte * ) header + header->ofsFrames ) + ent->e.frame;
-	VectorAdd( ent->e.origin, md3Frame->localOrigin, localOrigin );
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( localOrigin[j] - md3Frame->radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( localOrigin[j] + md3Frame->radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-/*
-=================
-R_AddMD3Surfaces
-
-=================
-*/
-void R_AddMD3Surfaces( trRefEntity_t *ent ) {
-	int				i;
-	md3Header_t		*header = NULL;
-	md3Surface_t	*surface = NULL;
-	md3Shader_t		*md3Shader = NULL;
-	shader_t		*shader = NULL;
-	int				cull;
-	int				lod;
-	int				fogNum;
-	qboolean		personalModel;
-
-	// don't add third_person objects if not in a portal
-	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
-
-	if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
-		ent->e.frame %= tr.currentModel->md3[0]->numFrames;
-		ent->e.oldframe %= tr.currentModel->md3[0]->numFrames;
-	}
-
-	//
-	// Validate the frames so there is no chance of a crash.
-	// This will write directly into the entity structure, so
-	// when the surfaces are rendered, they don't need to be
-	// range checked again.
-	//
-	if ( (ent->e.frame >= tr.currentModel->md3[0]->numFrames) 
-		|| (ent->e.frame < 0)
-		|| (ent->e.oldframe >= tr.currentModel->md3[0]->numFrames)
-		|| (ent->e.oldframe < 0) ) {
-			ri.Printf( PRINT_DEVELOPER, "R_AddMD3Surfaces: no such frame %d to %d for '%s'\n",
-				ent->e.oldframe, ent->e.frame,
-				tr.currentModel->name );
-			ent->e.frame = 0;
-			ent->e.oldframe = 0;
-	}
-
-	//
-	// compute LOD
-	//
-	lod = R_ComputeLOD( ent );
-
-	header = tr.currentModel->md3[lod];
-
-	//
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	//
-	cull = R_CullModel ( header, ent );
-	if ( cull == CULL_OUT ) {
-		return;
-	}
-
-	//
-	// set up lighting now that we know we aren't culled
-	//
-	if ( !personalModel || r_shadows->integer > 1 ) {
-		R_SetupEntityLighting( &tr.refdef, ent );
-	}
-
-	//
-	// see if we are in a fog volume
-	//
-	fogNum = R_ComputeFogNum( header, ent );
-
-	//
-	// draw all surfaces
-	//
-	surface = (md3Surface_t *)( (byte *)header + header->ofsSurfaces );
-	for ( i = 0 ; i < header->numSurfaces ; i++ ) {
-
-		if ( ent->e.customShader ) {
-			shader = R_GetShaderByHandle( ent->e.customShader );
-		} else if ( ent->e.customSkin > 0 && ent->e.customSkin < tr.numSkins ) {
-			skin_t *skin;
-			int		j;
-
-			skin = R_GetSkinByHandle( ent->e.customSkin );
-
-			// match the surface name to something in the skin file
-			shader = tr.defaultShader;
-			for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
-				// the names have both been lowercased
-				if ( !strcmp( skin->surfaces[j].name, surface->name ) ) {
-					shader = skin->surfaces[j].shader;
-					break;
-				}
-			}
-			if (shader == tr.defaultShader) {
-				ri.Printf( PRINT_DEVELOPER, "WARNING: no shader for surface %s in skin %s\n", surface->name, skin->name);
-			}
-			else if (shader->defaultShader) {
-				ri.Printf( PRINT_DEVELOPER, "WARNING: shader %s in skin %s not found\n", shader->name, skin->name);
-			}
-		} else if ( surface->numShaders <= 0 ) {
-			shader = tr.defaultShader;
-		} else {
-			md3Shader = (md3Shader_t *) ( (byte *)surface + surface->ofsShaders );
-			md3Shader += ent->e.skinNum % surface->numShaders;
-			shader = tr.shaders[ md3Shader->shaderIndex ];
-		}
-
-
-		// we will add shadows even if the main object isn't visible in the view
-
-		// stencil shadows can't do personal models unless I polyhedron clip
-		if ( !personalModel
-			&& r_shadows->integer == 2 
-			&& fogNum == 0
-			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.shadowShader, 0, qfalse );
-		}
-
-		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
-			&& fogNum == 0
-			&& (ent->e.renderfx & RF_SHADOW_PLANE )
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.projectionShadowShader, 0, qfalse );
-		}
-
-		// don't add third_person objects if not viewing through a portal
-		if ( !personalModel ) {
-			R_AddDrawSurf( (void *)surface, shader, fogNum, qfalse );
-		}
-
-		surface = (md3Surface_t *)( (byte *)surface + surface->ofsEnd );
-	}
-
-}
-
diff --git a/code/renderergl1/tr_model.c b/code/renderergl1/tr_model.c
deleted file mode 100644
index 51269a51..00000000
--- a/code/renderergl1/tr_model.c
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_models.c -- model loading and caching
-
-#include "tr_local.h"
-
-#define	LL(x) x=LittleLong(x)
-
-static qboolean R_LoadMD3(model_t *mod, int lod, void *buffer, const char *name );
-static qboolean R_LoadMDR(model_t *mod, void *buffer, int filesize, const char *name );
-
-/*
-====================
-R_RegisterMD3
-====================
-*/
-qhandle_t R_RegisterMD3(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	int			lod;
-	int			ident;
-	qboolean	loaded = qfalse;
-	int			numLoaded;
-	char filename[MAX_QPATH], namebuf[MAX_QPATH+20];
-	char *fext, defex[] = "md3";
-
-	numLoaded = 0;
-
-	strcpy(filename, name);
-
-	fext = strchr(filename, '.');
-	if(!fext)
-		fext = defex;
-	else
-	{
-		*fext = '\0';
-		fext++;
-	}
-
-	for (lod = MD3_MAX_LODS - 1 ; lod >= 0 ; lod--)
-	{
-		if(lod)
-			Com_sprintf(namebuf, sizeof(namebuf), "%s_%d.%s", filename, lod, fext);
-		else
-			Com_sprintf(namebuf, sizeof(namebuf), "%s.%s", filename, fext);
-
-		ri.FS_ReadFile( namebuf, &buf.v );
-		if(!buf.u)
-			continue;
-		
-		ident = LittleLong(* (unsigned *) buf.u);
-		if (ident == MD3_IDENT)
-			loaded = R_LoadMD3(mod, lod, buf.u, name);
-		else
-			ri.Printf(PRINT_WARNING,"R_RegisterMD3: unknown fileid for %s\n", name);
-		
-		ri.FS_FreeFile(buf.v);
-
-		if(loaded)
-		{
-			mod->numLods++;
-			numLoaded++;
-		}
-		else
-			break;
-	}
-
-	if(numLoaded)
-	{
-		// duplicate into higher lod spots that weren't
-		// loaded, in case the user changes r_lodbias on the fly
-		for(lod--; lod >= 0; lod--)
-		{
-			mod->numLods++;
-			mod->md3[lod] = mod->md3[lod + 1];
-		}
-
-		return mod->index;
-	}
-
-#ifdef _DEBUG
-	ri.Printf(PRINT_WARNING,"R_RegisterMD3: couldn't load %s\n", name);
-#endif
-
-	mod->type = MOD_BAD;
-	return 0;
-}
-
-/*
-====================
-R_RegisterMDR
-====================
-*/
-qhandle_t R_RegisterMDR(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	int	ident;
-	qboolean loaded = qfalse;
-	int filesize;
-
-	filesize = ri.FS_ReadFile(name, (void **) &buf.v);
-	if(!buf.u)
-	{
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	ident = LittleLong(*(unsigned *)buf.u);
-	if(ident == MDR_IDENT)
-		loaded = R_LoadMDR(mod, buf.u, filesize, name);
-
-	ri.FS_FreeFile (buf.v);
-	
-	if(!loaded)
-	{
-		ri.Printf(PRINT_WARNING,"R_RegisterMDR: couldn't load mdr file %s\n", name);
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	return mod->index;
-}
-
-/*
-====================
-R_RegisterIQM
-====================
-*/
-qhandle_t R_RegisterIQM(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	qboolean loaded = qfalse;
-	int filesize;
-
-	filesize = ri.FS_ReadFile(name, (void **) &buf.v);
-	if(!buf.u)
-	{
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	loaded = R_LoadIQM(mod, buf.u, filesize, name);
-
-	ri.FS_FreeFile (buf.v);
-	
-	if(!loaded)
-	{
-		ri.Printf(PRINT_WARNING,"R_RegisterIQM: couldn't load iqm file %s\n", name);
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	return mod->index;
-}
-
-
-typedef struct
-{
-	char *ext;
-	qhandle_t (*ModelLoader)( const char *, model_t * );
-} modelExtToLoaderMap_t;
-
-// Note that the ordering indicates the order of preference used
-// when there are multiple models of different formats available
-static modelExtToLoaderMap_t modelLoaders[ ] =
-{
-	{ "iqm", R_RegisterIQM },
-	{ "mdr", R_RegisterMDR },
-	{ "md3", R_RegisterMD3 }
-};
-
-static int numModelLoaders = ARRAY_LEN(modelLoaders);
-
-//===============================================================================
-
-/*
-** R_GetModelByHandle
-*/
-model_t	*R_GetModelByHandle( qhandle_t index ) {
-	model_t		*mod;
-
-	// out of range gets the defualt model
-	if ( index < 1 || index >= tr.numModels ) {
-		return tr.models[0];
-	}
-
-	mod = tr.models[index];
-
-	return mod;
-}
-
-//===============================================================================
-
-/*
-** R_AllocModel
-*/
-model_t *R_AllocModel( void ) {
-	model_t		*mod;
-
-	if ( tr.numModels == MAX_MOD_KNOWN ) {
-		return NULL;
-	}
-
-	mod = ri.Hunk_Alloc( sizeof( *tr.models[tr.numModels] ), h_low );
-	mod->index = tr.numModels;
-	tr.models[tr.numModels] = mod;
-	tr.numModels++;
-
-	return mod;
-}
-
-/*
-====================
-RE_RegisterModel
-
-Loads in a model for the given name
-
-Zero will be returned if the model fails to load.
-An entry will be retained for failed models as an
-optimization to prevent disk rescanning if they are
-asked for again.
-====================
-*/
-qhandle_t RE_RegisterModel( const char *name ) {
-	model_t		*mod;
-	qhandle_t	hModel;
-	qboolean	orgNameFailed = qfalse;
-	int			orgLoader = -1;
-	int			i;
-	char		localName[ MAX_QPATH ];
-	const char	*ext;
-	char		altName[ MAX_QPATH ];
-
-	if ( !name || !name[0] ) {
-		ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
-		return 0;
-	}
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Model name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	//
-	// search the currently loaded models
-	//
-	for ( hModel = 1 ; hModel < tr.numModels; hModel++ ) {
-		mod = tr.models[hModel];
-		if ( !strcmp( mod->name, name ) ) {
-			if( mod->type == MOD_BAD ) {
-				return 0;
-			}
-			return hModel;
-		}
-	}
-
-	// allocate a new model_t
-
-	if ( ( mod = R_AllocModel() ) == NULL ) {
-		ri.Printf( PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
-		return 0;
-	}
-
-	// only set the name after the model has been successfully loaded
-	Q_strncpyz( mod->name, name, sizeof( mod->name ) );
-
-
-	R_IssuePendingRenderCommands();
-
-	mod->type = MOD_BAD;
-	mod->numLods = 0;
-
-	//
-	// load the files
-	//
-	Q_strncpyz( localName, name, MAX_QPATH );
-
-	ext = COM_GetExtension( localName );
-
-	if( *ext )
-	{
-		// Look for the correct loader and use it
-		for( i = 0; i < numModelLoaders; i++ )
-		{
-			if( !Q_stricmp( ext, modelLoaders[ i ].ext ) )
-			{
-				// Load
-				hModel = modelLoaders[ i ].ModelLoader( localName, mod );
-				break;
-			}
-		}
-
-		// A loader was found
-		if( i < numModelLoaders )
-		{
-			if( !hModel )
-			{
-				// Loader failed, most likely because the file isn't there;
-				// try again without the extension
-				orgNameFailed = qtrue;
-				orgLoader = i;
-				COM_StripExtension( name, localName, MAX_QPATH );
-			}
-			else
-			{
-				// Something loaded
-				return mod->index;
-			}
-		}
-	}
-
-	// Try and find a suitable match using all
-	// the model formats supported
-	for( i = 0; i < numModelLoaders; i++ )
-	{
-		if (i == orgLoader)
-			continue;
-
-		Com_sprintf( altName, sizeof (altName), "%s.%s", localName, modelLoaders[ i ].ext );
-
-		// Load
-		hModel = modelLoaders[ i ].ModelLoader( altName, mod );
-
-		if( hModel )
-		{
-			if( orgNameFailed )
-			{
-				ri.Printf( PRINT_DEVELOPER, "WARNING: %s not present, using %s instead\n",
-						name, altName );
-			}
-
-			break;
-		}
-	}
-
-	return hModel;
-}
-
-/*
-=================
-R_LoadMD3
-=================
-*/
-static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_name ) {
-	int					i, j;
-	md3Header_t			*pinmodel;
-    md3Frame_t			*frame;
-	md3Surface_t		*surf;
-	md3Shader_t			*shader;
-	md3Triangle_t		*tri;
-	md3St_t				*st;
-	md3XyzNormal_t		*xyz;
-	md3Tag_t			*tag;
-	int					version;
-	int					size;
-
-	pinmodel = (md3Header_t *)buffer;
-
-	version = LittleLong (pinmodel->version);
-	if (version != MD3_VERSION) {
-		ri.Printf( PRINT_WARNING, "R_LoadMD3: %s has wrong version (%i should be %i)\n",
-				 mod_name, version, MD3_VERSION);
-		return qfalse;
-	}
-
-	mod->type = MOD_MESH;
-	size = LittleLong(pinmodel->ofsEnd);
-	mod->dataSize += size;
-	mod->md3[lod] = ri.Hunk_Alloc( size, h_low );
-
-	Com_Memcpy (mod->md3[lod], buffer, LittleLong(pinmodel->ofsEnd) );
-
-    LL(mod->md3[lod]->ident);
-    LL(mod->md3[lod]->version);
-    LL(mod->md3[lod]->numFrames);
-    LL(mod->md3[lod]->numTags);
-    LL(mod->md3[lod]->numSurfaces);
-    LL(mod->md3[lod]->ofsFrames);
-    LL(mod->md3[lod]->ofsTags);
-    LL(mod->md3[lod]->ofsSurfaces);
-    LL(mod->md3[lod]->ofsEnd);
-
-	if ( mod->md3[lod]->numFrames < 1 ) {
-		ri.Printf( PRINT_WARNING, "R_LoadMD3: %s has no frames\n", mod_name );
-		return qfalse;
-	}
-    
-	// swap all the frames
-    frame = (md3Frame_t *) ( (byte *)mod->md3[lod] + mod->md3[lod]->ofsFrames );
-    for ( i = 0 ; i < mod->md3[lod]->numFrames ; i++, frame++) {
-    	frame->radius = LittleFloat( frame->radius );
-        for ( j = 0 ; j < 3 ; j++ ) {
-            frame->bounds[0][j] = LittleFloat( frame->bounds[0][j] );
-            frame->bounds[1][j] = LittleFloat( frame->bounds[1][j] );
-	    	frame->localOrigin[j] = LittleFloat( frame->localOrigin[j] );
-        }
-	}
-
-	// swap all the tags
-    tag = (md3Tag_t *) ( (byte *)mod->md3[lod] + mod->md3[lod]->ofsTags );
-    for ( i = 0 ; i < mod->md3[lod]->numTags * mod->md3[lod]->numFrames ; i++, tag++) {
-        for ( j = 0 ; j < 3 ; j++ ) {
-			tag->origin[j] = LittleFloat( tag->origin[j] );
-			tag->axis[0][j] = LittleFloat( tag->axis[0][j] );
-			tag->axis[1][j] = LittleFloat( tag->axis[1][j] );
-			tag->axis[2][j] = LittleFloat( tag->axis[2][j] );
-        }
-	}
-
-	// swap all the surfaces
-	surf = (md3Surface_t *) ( (byte *)mod->md3[lod] + mod->md3[lod]->ofsSurfaces );
-	for ( i = 0 ; i < mod->md3[lod]->numSurfaces ; i++) {
-
-        LL(surf->ident);
-        LL(surf->flags);
-        LL(surf->numFrames);
-        LL(surf->numShaders);
-        LL(surf->numTriangles);
-        LL(surf->ofsTriangles);
-        LL(surf->numVerts);
-        LL(surf->ofsShaders);
-        LL(surf->ofsSt);
-        LL(surf->ofsXyzNormals);
-        LL(surf->ofsEnd);
-		
-		if ( surf->numVerts >= SHADER_MAX_VERTEXES ) {
-			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i verts on %s (%i).\n",
-				mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
-				surf->numVerts );
-			return qfalse;
-		}
-		if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) {
-			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i triangles on %s (%i).\n",
-				mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
-				surf->numTriangles );
-			return qfalse;
-		}
-	
-		// change to surface identifier
-		surf->ident = SF_MD3;
-
-		// lowercase the surface name so skin compares are faster
-		Q_strlwr( surf->name );
-
-		// strip off a trailing _1 or _2
-		// this is a crutch for q3data being a mess
-		j = strlen( surf->name );
-		if ( j > 2 && surf->name[j-2] == '_' ) {
-			surf->name[j-2] = 0;
-		}
-
-        // register the shaders
-        shader = (md3Shader_t *) ( (byte *)surf + surf->ofsShaders );
-        for ( j = 0 ; j < surf->numShaders ; j++, shader++ ) {
-            shader_t	*sh;
-
-            sh = R_FindShader( shader->name, LIGHTMAP_NONE, qtrue );
-			if ( sh->defaultShader ) {
-				shader->shaderIndex = 0;
-			} else {
-				shader->shaderIndex = sh->index;
-			}
-        }
-
-		// swap all the triangles
-		tri = (md3Triangle_t *) ( (byte *)surf + surf->ofsTriangles );
-		for ( j = 0 ; j < surf->numTriangles ; j++, tri++ ) {
-			LL(tri->indexes[0]);
-			LL(tri->indexes[1]);
-			LL(tri->indexes[2]);
-		}
-
-		// swap all the ST
-        st = (md3St_t *) ( (byte *)surf + surf->ofsSt );
-        for ( j = 0 ; j < surf->numVerts ; j++, st++ ) {
-            st->st[0] = LittleFloat( st->st[0] );
-            st->st[1] = LittleFloat( st->st[1] );
-        }
-
-		// swap all the XyzNormals
-        xyz = (md3XyzNormal_t *) ( (byte *)surf + surf->ofsXyzNormals );
-        for ( j = 0 ; j < surf->numVerts * surf->numFrames ; j++, xyz++ ) 
-		{
-            xyz->xyz[0] = LittleShort( xyz->xyz[0] );
-            xyz->xyz[1] = LittleShort( xyz->xyz[1] );
-            xyz->xyz[2] = LittleShort( xyz->xyz[2] );
-
-            xyz->normal = LittleShort( xyz->normal );
-        }
-
-
-		// find the next surface
-		surf = (md3Surface_t *)( (byte *)surf + surf->ofsEnd );
-	}
-    
-	return qtrue;
-}
-
-
-
-/*
-=================
-R_LoadMDR
-=================
-*/
-static qboolean R_LoadMDR( model_t *mod, void *buffer, int filesize, const char *mod_name ) 
-{
-	int					i, j, k, l;
-	mdrHeader_t			*pinmodel, *mdr;
-	mdrFrame_t			*frame;
-	mdrLOD_t			*lod, *curlod;
-	mdrSurface_t			*surf, *cursurf;
-	mdrTriangle_t			*tri, *curtri;
-	mdrVertex_t			*v, *curv;
-	mdrWeight_t			*weight, *curweight;
-	mdrTag_t			*tag, *curtag;
-	int					size;
-	shader_t			*sh;
-
-	pinmodel = (mdrHeader_t *)buffer;
-
-	pinmodel->version = LittleLong(pinmodel->version);
-	if (pinmodel->version != MDR_VERSION) 
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has wrong version (%i should be %i)\n", mod_name, pinmodel->version, MDR_VERSION);
-		return qfalse;
-	}
-
-	size = LittleLong(pinmodel->ofsEnd);
-	
-	if(size > filesize)
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: Header of %s is broken. Wrong filesize declared!\n", mod_name);
-		return qfalse;
-	}
-	
-	mod->type = MOD_MDR;
-
-	LL(pinmodel->numFrames);
-	LL(pinmodel->numBones);
-	LL(pinmodel->ofsFrames);
-
-	// This is a model that uses some type of compressed Bones. We don't want to uncompress every bone for each rendered frame
-	// over and over again, we'll uncompress it in this function already, so we must adjust the size of the target mdr.
-	if(pinmodel->ofsFrames < 0)
-	{
-		// mdrFrame_t is larger than mdrCompFrame_t:
-		size += pinmodel->numFrames * sizeof(frame->name);
-		// now add enough space for the uncompressed bones.
-		size += pinmodel->numFrames * pinmodel->numBones * ((sizeof(mdrBone_t) - sizeof(mdrCompBone_t)));
-	}
-	
-	// simple bounds check
-	if(pinmodel->numBones < 0 ||
-		sizeof(*mdr) + pinmodel->numFrames * (sizeof(*frame) + (pinmodel->numBones - 1) * sizeof(*frame->bones)) > size)
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-		return qfalse;
-	}
-
-	mod->dataSize += size;
-	mod->modelData = mdr = ri.Hunk_Alloc( size, h_low );
-
-	// Copy all the values over from the file and fix endian issues in the process, if necessary.
-	
-	mdr->ident = LittleLong(pinmodel->ident);
-	mdr->version = pinmodel->version;	// Don't need to swap byte order on this one, we already did above.
-	Q_strncpyz(mdr->name, pinmodel->name, sizeof(mdr->name));
-	mdr->numFrames = pinmodel->numFrames;
-	mdr->numBones = pinmodel->numBones;
-	mdr->numLODs = LittleLong(pinmodel->numLODs);
-	mdr->numTags = LittleLong(pinmodel->numTags);
-	// We don't care about the other offset values, we'll generate them ourselves while loading.
-
-	mod->numLods = mdr->numLODs;
-
-	if ( mdr->numFrames < 1 ) 
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has no frames\n", mod_name);
-		return qfalse;
-	}
-
-	/* The first frame will be put into the first free space after the header */
-	frame = (mdrFrame_t *)(mdr + 1);
-	mdr->ofsFrames = (int)((byte *) frame - (byte *) mdr);
-		
-	if (pinmodel->ofsFrames < 0)
-	{
-		mdrCompFrame_t *cframe;
-				
-		// compressed model...				
-		cframe = (mdrCompFrame_t *)((byte *) pinmodel - pinmodel->ofsFrames);
-		
-		for(i = 0; i < mdr->numFrames; i++)
-		{
-			for(j = 0; j < 3; j++)
-			{
-				frame->bounds[0][j] = LittleFloat(cframe->bounds[0][j]);
-				frame->bounds[1][j] = LittleFloat(cframe->bounds[1][j]);
-				frame->localOrigin[j] = LittleFloat(cframe->localOrigin[j]);
-			}
-
-			frame->radius = LittleFloat(cframe->radius);
-			frame->name[0] = '\0';	// No name supplied in the compressed version.
-			
-			for(j = 0; j < mdr->numBones; j++)
-			{
-				for(k = 0; k < (sizeof(cframe->bones[j].Comp) / 2); k++)
-				{
-					// Do swapping for the uncompressing functions. They seem to use shorts
-					// values only, so I assume this will work. Never tested it on other
-					// platforms, though.
-					
-					((unsigned short *)(cframe->bones[j].Comp))[k] =
-						LittleShort( ((unsigned short *)(cframe->bones[j].Comp))[k] );
-				}
-				
-				/* Now do the actual uncompressing */
-				MC_UnCompress(frame->bones[j].matrix, cframe->bones[j].Comp);
-			}
-			
-			// Next Frame...
-			cframe = (mdrCompFrame_t *) &cframe->bones[j];
-			frame = (mdrFrame_t *) &frame->bones[j];
-		}
-	}
-	else
-	{
-		mdrFrame_t *curframe;
-		
-		// uncompressed model...
-		//
-    
-		curframe = (mdrFrame_t *)((byte *) pinmodel + pinmodel->ofsFrames);
-		
-		// swap all the frames
-		for ( i = 0 ; i < mdr->numFrames ; i++) 
-		{
-			for(j = 0; j < 3; j++)
-			{
-				frame->bounds[0][j] = LittleFloat(curframe->bounds[0][j]);
-				frame->bounds[1][j] = LittleFloat(curframe->bounds[1][j]);
-				frame->localOrigin[j] = LittleFloat(curframe->localOrigin[j]);
-			}
-			
-			frame->radius = LittleFloat(curframe->radius);
-			Q_strncpyz(frame->name, curframe->name, sizeof(frame->name));
-			
-			for (j = 0; j < (int) (mdr->numBones * sizeof(mdrBone_t) / 4); j++) 
-			{
-				((float *)frame->bones)[j] = LittleFloat( ((float *)curframe->bones)[j] );
-			}
-			
-			curframe = (mdrFrame_t *) &curframe->bones[mdr->numBones];
-			frame = (mdrFrame_t *) &frame->bones[mdr->numBones];
-		}
-	}
-	
-	// frame should now point to the first free address after all frames.
-	lod = (mdrLOD_t *) frame;
-	mdr->ofsLODs = (int) ((byte *) lod - (byte *)mdr);
-	
-	curlod = (mdrLOD_t *)((byte *) pinmodel + LittleLong(pinmodel->ofsLODs));
-		
-	// swap all the LOD's
-	for ( l = 0 ; l < mdr->numLODs ; l++)
-	{
-		// simple bounds check
-		if((byte *) (lod + 1) > (byte *) mdr + size)
-		{
-			ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-			return qfalse;
-		}
-
-		lod->numSurfaces = LittleLong(curlod->numSurfaces);
-		
-		// swap all the surfaces
-		surf = (mdrSurface_t *) (lod + 1);
-		lod->ofsSurfaces = (int)((byte *) surf - (byte *) lod);
-		cursurf = (mdrSurface_t *) ((byte *)curlod + LittleLong(curlod->ofsSurfaces));
-		
-		for ( i = 0 ; i < lod->numSurfaces ; i++)
-		{
-			// simple bounds check
-			if((byte *) (surf + 1) > (byte *) mdr + size)
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-				return qfalse;
-			}
-
-			// first do some copying stuff
-			
-			surf->ident = SF_MDR;
-			Q_strncpyz(surf->name, cursurf->name, sizeof(surf->name));
-			Q_strncpyz(surf->shader, cursurf->shader, sizeof(surf->shader));
-			
-			surf->ofsHeader = (byte *) mdr - (byte *) surf;
-			
-			surf->numVerts = LittleLong(cursurf->numVerts);
-			surf->numTriangles = LittleLong(cursurf->numTriangles);
-			// numBoneReferences and BoneReferences generally seem to be unused
-			
-			// now do the checks that may fail.
-			if ( surf->numVerts >= SHADER_MAX_VERTEXES ) 
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i verts on %s (%i).\n",
-					  mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
-					  surf->numVerts );
-				return qfalse;
-			}
-			if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) 
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i triangles on %s (%i).\n",
-					  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
-					  surf->numTriangles );
-				return qfalse;
-			}
-			// lowercase the surface name so skin compares are faster
-			Q_strlwr( surf->name );
-
-			// register the shaders
-			sh = R_FindShader(surf->shader, LIGHTMAP_NONE, qtrue);
-			if ( sh->defaultShader ) {
-				surf->shaderIndex = 0;
-			} else {
-				surf->shaderIndex = sh->index;
-			}
-			
-			// now copy the vertexes.
-			v = (mdrVertex_t *) (surf + 1);
-			surf->ofsVerts = (int)((byte *) v - (byte *) surf);
-			curv = (mdrVertex_t *) ((byte *)cursurf + LittleLong(cursurf->ofsVerts));
-			
-			for(j = 0; j < surf->numVerts; j++)
-			{
-				LL(curv->numWeights);
-			
-				// simple bounds check
-				if(curv->numWeights < 0 || (byte *) (v + 1) + (curv->numWeights - 1) * sizeof(*weight) > (byte *) mdr + size)
-				{
-					ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-					return qfalse;
-				}
-
-				v->normal[0] = LittleFloat(curv->normal[0]);
-				v->normal[1] = LittleFloat(curv->normal[1]);
-				v->normal[2] = LittleFloat(curv->normal[2]);
-				
-				v->texCoords[0] = LittleFloat(curv->texCoords[0]);
-				v->texCoords[1] = LittleFloat(curv->texCoords[1]);
-				
-				v->numWeights = curv->numWeights;
-				weight = &v->weights[0];
-				curweight = &curv->weights[0];
-				
-				// Now copy all the weights
-				for(k = 0; k < v->numWeights; k++)
-				{
-					weight->boneIndex = LittleLong(curweight->boneIndex);
-					weight->boneWeight = LittleFloat(curweight->boneWeight);
-					
-					weight->offset[0] = LittleFloat(curweight->offset[0]);
-					weight->offset[1] = LittleFloat(curweight->offset[1]);
-					weight->offset[2] = LittleFloat(curweight->offset[2]);
-					
-					weight++;
-					curweight++;
-				}
-				
-				v = (mdrVertex_t *) weight;
-				curv = (mdrVertex_t *) curweight;
-			}
-						
-			// we know the offset to the triangles now:
-			tri = (mdrTriangle_t *) v;
-			surf->ofsTriangles = (int)((byte *) tri - (byte *) surf);
-			curtri = (mdrTriangle_t *)((byte *) cursurf + LittleLong(cursurf->ofsTriangles));
-			
-			// simple bounds check
-			if(surf->numTriangles < 0 || (byte *) (tri + surf->numTriangles) > (byte *) mdr + size)
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-				return qfalse;
-			}
-
-			for(j = 0; j < surf->numTriangles; j++)
-			{
-				tri->indexes[0] = LittleLong(curtri->indexes[0]);
-				tri->indexes[1] = LittleLong(curtri->indexes[1]);
-				tri->indexes[2] = LittleLong(curtri->indexes[2]);
-				
-				tri++;
-				curtri++;
-			}
-			
-			// tri now points to the end of the surface.
-			surf->ofsEnd = (byte *) tri - (byte *) surf;
-			surf = (mdrSurface_t *) tri;
-
-			// find the next surface.
-			cursurf = (mdrSurface_t *) ((byte *) cursurf + LittleLong(cursurf->ofsEnd));
-		}
-
-		// surf points to the next lod now.
-		lod->ofsEnd = (int)((byte *) surf - (byte *) lod);
-		lod = (mdrLOD_t *) surf;
-
-		// find the next LOD.
-		curlod = (mdrLOD_t *)((byte *) curlod + LittleLong(curlod->ofsEnd));
-	}
-	
-	// lod points to the first tag now, so update the offset too.
-	tag = (mdrTag_t *) lod;
-	mdr->ofsTags = (int)((byte *) tag - (byte *) mdr);
-	curtag = (mdrTag_t *) ((byte *)pinmodel + LittleLong(pinmodel->ofsTags));
-
-	// simple bounds check
-	if(mdr->numTags < 0 || (byte *) (tag + mdr->numTags) > (byte *) mdr + size)
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-		return qfalse;
-	}
-	
-	for (i = 0 ; i < mdr->numTags ; i++)
-	{
-		tag->boneIndex = LittleLong(curtag->boneIndex);
-		Q_strncpyz(tag->name, curtag->name, sizeof(tag->name));
-		
-		tag++;
-		curtag++;
-	}
-	
-	// And finally we know the real offset to the end.
-	mdr->ofsEnd = (int)((byte *) tag - (byte *) mdr);
-
-	// phew! we're done.
-	
-	return qtrue;
-}
-
-
-
-//=============================================================================
-
-/*
-** RE_BeginRegistration
-*/
-void RE_BeginRegistration( glconfig_t *glconfigOut ) {
-
-	R_Init();
-
-	*glconfigOut = glConfig;
-
-	R_IssuePendingRenderCommands();
-
-	tr.viewCluster = -1;		// force markleafs to regenerate
-	R_ClearFlares();
-	RE_ClearScene();
-
-	tr.registered = qtrue;
-}
-
-//=============================================================================
-
-/*
-===============
-R_ModelInit
-===============
-*/
-void R_ModelInit( void ) {
-	model_t		*mod;
-
-	// leave a space for NULL model
-	tr.numModels = 0;
-
-	mod = R_AllocModel();
-	mod->type = MOD_BAD;
-}
-
-
-/*
-================
-R_Modellist_f
-================
-*/
-void R_Modellist_f( void ) {
-	int		i, j;
-	model_t	*mod;
-	int		total;
-	int		lods;
-
-	total = 0;
-	for ( i = 1 ; i < tr.numModels; i++ ) {
-		mod = tr.models[i];
-		lods = 1;
-		for ( j = 1 ; j < MD3_MAX_LODS ; j++ ) {
-			if ( mod->md3[j] && mod->md3[j] != mod->md3[j-1] ) {
-				lods++;
-			}
-		}
-		ri.Printf( PRINT_ALL, "%8i : (%i) %s\n",mod->dataSize, lods, mod->name );
-		total += mod->dataSize;
-	}
-	ri.Printf( PRINT_ALL, "%8i : Total models\n", total );
-
-#if	0		// not working right with new hunk
-	if ( tr.world ) {
-		ri.Printf( PRINT_ALL, "\n%8i : %s\n", tr.world->dataSize, tr.world->name );
-	}
-#endif
-}
-
-
-//=============================================================================
-
-
-/*
-================
-R_GetTag
-================
-*/
-static md3Tag_t *R_GetTag( md3Header_t *mod, int frame, const char *tagName ) {
-	md3Tag_t		*tag;
-	int				i;
-
-	if ( frame >= mod->numFrames ) {
-		// it is possible to have a bad frame while changing models, so don't error
-		frame = mod->numFrames - 1;
-	}
-
-	tag = (md3Tag_t *)((byte *)mod + mod->ofsTags) + frame * mod->numTags;
-	for ( i = 0 ; i < mod->numTags ; i++, tag++ ) {
-		if ( !strcmp( tag->name, tagName ) ) {
-			return tag;	// found it
-		}
-	}
-
-	return NULL;
-}
-
-md3Tag_t *R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest) 
-{
-	int				i, j, k;
-	int				frameSize;
-	mdrFrame_t		*frame;
-	mdrTag_t		*tag;
-
-	if ( framenum >= mod->numFrames ) 
-	{
-		// it is possible to have a bad frame while changing models, so don't error
-		framenum = mod->numFrames - 1;
-	}
-
-	tag = (mdrTag_t *)((byte *)mod + mod->ofsTags);
-	for ( i = 0 ; i < mod->numTags ; i++, tag++ )
-	{
-		if ( !strcmp( tag->name, tagName ) )
-		{
-			Q_strncpyz(dest->name, tag->name, sizeof(dest->name));
-
-			// uncompressed model...
-			//
-			frameSize = (intptr_t)( &((mdrFrame_t *)0)->bones[ mod->numBones ] );
-			frame = (mdrFrame_t *)((byte *)mod + mod->ofsFrames + framenum * frameSize );
-
-			for (j = 0; j < 3; j++)
-			{
-				for (k = 0; k < 3; k++)
-					dest->axis[j][k]=frame->bones[tag->boneIndex].matrix[k][j];
-			}
-
-			dest->origin[0]=frame->bones[tag->boneIndex].matrix[0][3];
-			dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3];
-			dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3];				
-
-			return dest;
-		}
-	}
-
-	return NULL;
-}
-
-/*
-================
-R_LerpTag
-================
-*/
-int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, 
-					 float frac, const char *tagName ) {
-	md3Tag_t	*start, *end;
-	md3Tag_t	start_space, end_space;
-	int		i;
-	float		frontLerp, backLerp;
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-	if ( !model->md3[0] )
-	{
-		if(model->type == MOD_MDR)
-		{
-			start = R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, &start_space);
-			end = R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, &end_space);
-		}
-		else if( model->type == MOD_IQM ) {
-			return R_IQMLerpTag( tag, model->modelData,
-					startFrame, endFrame,
-					frac, tagName );
-		} else {
-			start = end = NULL;
-		}
-	}
-	else
-	{
-		start = R_GetTag( model->md3[0], startFrame, tagName );
-		end = R_GetTag( model->md3[0], endFrame, tagName );
-	}
-
-	if ( !start || !end ) {
-		AxisClear( tag->axis );
-		VectorClear( tag->origin );
-		return qfalse;
-	}
-
-	frontLerp = frac;
-	backLerp = 1.0f - frac;
-
-	for ( i = 0 ; i < 3 ; i++ ) {
-		tag->origin[i] = start->origin[i] * backLerp +  end->origin[i] * frontLerp;
-		tag->axis[0][i] = start->axis[0][i] * backLerp +  end->axis[0][i] * frontLerp;
-		tag->axis[1][i] = start->axis[1][i] * backLerp +  end->axis[1][i] * frontLerp;
-		tag->axis[2][i] = start->axis[2][i] * backLerp +  end->axis[2][i] * frontLerp;
-	}
-	VectorNormalize( tag->axis[0] );
-	VectorNormalize( tag->axis[1] );
-	VectorNormalize( tag->axis[2] );
-	return qtrue;
-}
-
-
-/*
-====================
-R_ModelBounds
-====================
-*/
-void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-
-	if(model->type == MOD_BRUSH) {
-		VectorCopy( model->bmodel->bounds[0], mins );
-		VectorCopy( model->bmodel->bounds[1], maxs );
-		
-		return;
-	} else if (model->type == MOD_MESH) {
-		md3Header_t	*header;
-		md3Frame_t	*frame;
-
-		header = model->md3[0];
-		frame = (md3Frame_t *) ((byte *)header + header->ofsFrames);
-
-		VectorCopy( frame->bounds[0], mins );
-		VectorCopy( frame->bounds[1], maxs );
-		
-		return;
-	} else if (model->type == MOD_MDR) {
-		mdrHeader_t	*header;
-		mdrFrame_t	*frame;
-
-		header = (mdrHeader_t *)model->modelData;
-		frame = (mdrFrame_t *) ((byte *)header + header->ofsFrames);
-
-		VectorCopy( frame->bounds[0], mins );
-		VectorCopy( frame->bounds[1], maxs );
-		
-		return;
-	} else if(model->type == MOD_IQM) {
-		iqmData_t *iqmData;
-		
-		iqmData = model->modelData;
-
-		if(iqmData->bounds)
-		{
-			VectorCopy(iqmData->bounds, mins);
-			VectorCopy(iqmData->bounds + 3, maxs);
-			return;
-		}
-	}
-
-	VectorClear( mins );
-	VectorClear( maxs );
-}
diff --git a/code/renderer/tr_model.cpp b/code/renderergl1/tr_model.cpp
similarity index 100%
rename from code/renderer/tr_model.cpp
rename to code/renderergl1/tr_model.cpp
diff --git a/code/renderergl1/tr_model_iqm.c b/code/renderergl1/tr_model_iqm.c
deleted file mode 100644
index 5050eb10..00000000
--- a/code/renderergl1/tr_model_iqm.c
+++ /dev/null
@@ -1,1495 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2011 Thilo Schulz <thilo@tjps.eu>
-Copyright (C) 2011 Matthias Bentrup <matthias.bentrup@googlemail.com>
-Copyright (C) 2011-2019 Zack Middleton <zturtleman@gmail.com>
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-
-#define	LL(x) x=LittleLong(x)
-
-// 3x4 identity matrix
-static float identityMatrix[12] = {
-	1, 0, 0, 0,
-	0, 1, 0, 0,
-	0, 0, 1, 0
-};
-
-static qboolean IQM_CheckRange( iqmHeader_t *header, int offset,
-				int count, int size ) {
-	// return true if the range specified by offset, count and size
-	// doesn't fit into the file
-	return ( count <= 0 ||
-		 offset <= 0 ||
-		 offset > header->filesize ||
-		 offset + count * size < 0 ||
-		 offset + count * size > header->filesize );
-}
-// "multiply" 3x4 matrices, these are assumed to be the top 3 rows
-// of a 4x4 matrix with the last row = (0 0 0 1)
-static void Matrix34Multiply( const float *a, const float *b, float *out ) {
-	out[ 0] = a[0] * b[0] + a[1] * b[4] + a[ 2] * b[ 8];
-	out[ 1] = a[0] * b[1] + a[1] * b[5] + a[ 2] * b[ 9];
-	out[ 2] = a[0] * b[2] + a[1] * b[6] + a[ 2] * b[10];
-	out[ 3] = a[0] * b[3] + a[1] * b[7] + a[ 2] * b[11] + a[ 3];
-	out[ 4] = a[4] * b[0] + a[5] * b[4] + a[ 6] * b[ 8];
-	out[ 5] = a[4] * b[1] + a[5] * b[5] + a[ 6] * b[ 9];
-	out[ 6] = a[4] * b[2] + a[5] * b[6] + a[ 6] * b[10];
-	out[ 7] = a[4] * b[3] + a[5] * b[7] + a[ 6] * b[11] + a[ 7];
-	out[ 8] = a[8] * b[0] + a[9] * b[4] + a[10] * b[ 8];
-	out[ 9] = a[8] * b[1] + a[9] * b[5] + a[10] * b[ 9];
-	out[10] = a[8] * b[2] + a[9] * b[6] + a[10] * b[10];
-	out[11] = a[8] * b[3] + a[9] * b[7] + a[10] * b[11] + a[11];
-}
-static void JointToMatrix( const quat_t rot, const vec3_t scale, const vec3_t trans,
-			   float *mat ) {
-	float xx = 2.0f * rot[0] * rot[0];
-	float yy = 2.0f * rot[1] * rot[1];
-	float zz = 2.0f * rot[2] * rot[2];
-	float xy = 2.0f * rot[0] * rot[1];
-	float xz = 2.0f * rot[0] * rot[2];
-	float yz = 2.0f * rot[1] * rot[2];
-	float wx = 2.0f * rot[3] * rot[0];
-	float wy = 2.0f * rot[3] * rot[1];
-	float wz = 2.0f * rot[3] * rot[2];
-
-	mat[ 0] = scale[0] * (1.0f - (yy + zz));
-	mat[ 1] = scale[0] * (xy - wz);
-	mat[ 2] = scale[0] * (xz + wy);
-	mat[ 3] = trans[0];
-	mat[ 4] = scale[1] * (xy + wz);
-	mat[ 5] = scale[1] * (1.0f - (xx + zz));
-	mat[ 6] = scale[1] * (yz - wx);
-	mat[ 7] = trans[1];
-	mat[ 8] = scale[2] * (xz - wy);
-	mat[ 9] = scale[2] * (yz + wx);
-	mat[10] = scale[2] * (1.0f - (xx + yy));
-	mat[11] = trans[2];
-}
-static void Matrix34Invert( const float *inMat, float *outMat ) {
-	vec3_t trans;
-	float invSqrLen, *v;
-
-	outMat[ 0] = inMat[ 0]; outMat[ 1] = inMat[ 4]; outMat[ 2] = inMat[ 8];
-	outMat[ 4] = inMat[ 1]; outMat[ 5] = inMat[ 5]; outMat[ 6] = inMat[ 9];
-	outMat[ 8] = inMat[ 2]; outMat[ 9] = inMat[ 6]; outMat[10] = inMat[10];
-
-	v = outMat + 0; invSqrLen = 1.0f / DotProduct(v, v); VectorScale(v, invSqrLen, v);
-	v = outMat + 4; invSqrLen = 1.0f / DotProduct(v, v); VectorScale(v, invSqrLen, v);
-	v = outMat + 8; invSqrLen = 1.0f / DotProduct(v, v); VectorScale(v, invSqrLen, v);
-
-	trans[0] = inMat[ 3];
-	trans[1] = inMat[ 7];
-	trans[2] = inMat[11];
-
-	outMat[ 3] = -DotProduct(outMat + 0, trans);
-	outMat[ 7] = -DotProduct(outMat + 4, trans);
-	outMat[11] = -DotProduct(outMat + 8, trans);
-}
-static void QuatSlerp(const quat_t from, const quat_t _to, float fraction, quat_t out) {
-	float angle, cosAngle, sinAngle, backlerp, lerp;
-	quat_t to;
-
-	// cos() of angle
-	cosAngle = from[0] * _to[0] + from[1] * _to[1] + from[2] * _to[2] + from[3] * _to[3];
-
-	// negative handling is needed for taking shortest path (required for model joints)
-	if ( cosAngle < 0.0f ) {
-		cosAngle = -cosAngle;
-		to[0] = - _to[0];
-		to[1] = - _to[1];
-		to[2] = - _to[2];
-		to[3] = - _to[3];
-	} else {
-		QuatCopy( _to, to );
-	}
-
-	if ( cosAngle < 0.999999f ) {
-		// spherical lerp (slerp)
-		angle = acosf( cosAngle );
-		sinAngle = sinf( angle );
-		backlerp = sinf( ( 1.0f - fraction ) * angle ) / sinAngle;
-		lerp = sinf( fraction * angle ) / sinAngle;
-	} else {
-		// linear lerp
-		backlerp = 1.0f - fraction;
-		lerp = fraction;
-	}
-
-	out[0] = from[0] * backlerp + to[0] * lerp;
-	out[1] = from[1] * backlerp + to[1] * lerp;
-	out[2] = from[2] * backlerp + to[2] * lerp;
-	out[3] = from[3] * backlerp + to[3] * lerp;
-}
-static vec_t QuatNormalize2( const quat_t v, quat_t out) {
-	float	length, ilength;
-
-	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2] + v[3]*v[3];
-
-	if (length) {
-		/* writing it this way allows gcc to recognize that rsqrt can be used */
-		ilength = 1/(float)sqrt (length);
-		/* sqrt(length) = length * (1 / sqrt(length)) */
-		length *= ilength;
-		out[0] = v[0]*ilength;
-		out[1] = v[1]*ilength;
-		out[2] = v[2]*ilength;
-		out[3] = v[3]*ilength;
-	} else {
-		out[0] = out[1] = out[2] = 0;
-		out[3] = -1;
-	}
-
-	return length;
-}
-
-/*
-=================
-R_LoadIQM
-
-Load an IQM model and compute the joint matrices for every frame.
-=================
-*/
-qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_name ) {
-	iqmHeader_t		*header;
-	iqmVertexArray_t	*vertexarray;
-	iqmTriangle_t		*triangle;
-	iqmMesh_t		*mesh;
-	iqmJoint_t		*joint;
-	iqmPose_t		*pose;
-	iqmBounds_t		*bounds;
-	unsigned short		*framedata;
-	char			*str;
-	int			i, j, k;
-	iqmTransform_t		*transform;
-	float			*mat, *matInv;
-	size_t			size, joint_names;
-	byte			*dataPtr;
-	iqmData_t		*iqmData;
-	srfIQModel_t		*surface;
-	char			meshName[MAX_QPATH];
-	int				vertexArrayFormat[IQM_COLOR+1];
-	int				allocateInfluences;
-	byte *blendIndexes;
-	union {
-		byte *b;
-		float *f;
-	} blendWeights;
-
-	if( filesize < sizeof(iqmHeader_t) ) {
-		return qfalse;
-	}
-
-	header = (iqmHeader_t *)buffer;
-	if( Q_strncmp( header->magic, IQM_MAGIC, sizeof(header->magic) ) ) {
-		return qfalse;
-	}
-
-	LL( header->version );
-	if( header->version != IQM_VERSION ) {
-		ri.Printf(PRINT_WARNING, "R_LoadIQM: %s is a unsupported IQM version (%d), only version %d is supported.\n",
-				mod_name, header->version, IQM_VERSION);
-		return qfalse;
-	}
-
-	LL( header->filesize );
-	if( header->filesize > filesize || header->filesize > 16<<20 ) {
-		return qfalse;
-	}
-
-	LL( header->flags );
-	LL( header->num_text );
-	LL( header->ofs_text );
-	LL( header->num_meshes );
-	LL( header->ofs_meshes );
-	LL( header->num_vertexarrays );
-	LL( header->num_vertexes );
-	LL( header->ofs_vertexarrays );
-	LL( header->num_triangles );
-	LL( header->ofs_triangles );
-	LL( header->ofs_adjacency );
-	LL( header->num_joints );
-	LL( header->ofs_joints );
-	LL( header->num_poses );
-	LL( header->ofs_poses );
-	LL( header->num_anims );
-	LL( header->ofs_anims );
-	LL( header->num_frames );
-	LL( header->num_framechannels );
-	LL( header->ofs_frames );
-	LL( header->ofs_bounds );
-	LL( header->num_comment );
-	LL( header->ofs_comment );
-	LL( header->num_extensions );
-	LL( header->ofs_extensions );
-
-	// check ioq3 joint limit
-	if ( header->num_joints > IQM_MAX_JOINTS ) {
-		ri.Printf(PRINT_WARNING, "R_LoadIQM: %s has more than %d joints (%d).\n",
-				mod_name, IQM_MAX_JOINTS, header->num_joints);
-		return qfalse;
-	}
-
-	for ( i = 0; i < ARRAY_LEN( vertexArrayFormat ); i++ ) {
-		vertexArrayFormat[i] = -1;
-	}
-
-	blendIndexes = NULL;
-	blendWeights.b = NULL;
-
-	allocateInfluences = 0;
-
-	if ( header->num_meshes )
-	{
-		// check and swap vertex arrays
-		if( IQM_CheckRange( header, header->ofs_vertexarrays,
-				    header->num_vertexarrays,
-				    sizeof(iqmVertexArray_t) ) ) {
-			return qfalse;
-		}
-		vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays);
-		for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) {
-			int	n, *intPtr;
-
-			if( vertexarray->size <= 0 || vertexarray->size > 4 ) {
-				return qfalse;
-			}
-
-			// total number of values
-			n = header->num_vertexes * vertexarray->size;
-
-			switch( vertexarray->format ) {
-			case IQM_BYTE:
-			case IQM_UBYTE:
-				// 1 byte, no swapping necessary
-				if( IQM_CheckRange( header, vertexarray->offset,
-						    n, sizeof(byte) ) ) {
-					return qfalse;
-				}
-				break;
-			case IQM_INT:
-			case IQM_UINT:
-			case IQM_FLOAT:
-				// 4-byte swap
-				if( IQM_CheckRange( header, vertexarray->offset,
-						    n, sizeof(float) ) ) {
-					return qfalse;
-				}
-				intPtr = (int *)((byte *)header + vertexarray->offset);
-				for( j = 0; j < n; j++, intPtr++ ) {
-					LL( *intPtr );
-				}
-				break;
-			default:
-				// not supported
-				return qfalse;
-				break;
-			}
-
-			if( vertexarray->type < ARRAY_LEN( vertexArrayFormat ) ) {
-				vertexArrayFormat[vertexarray->type] = vertexarray->format;
-			}
-
-			switch( vertexarray->type ) {
-			case IQM_POSITION:
-			case IQM_NORMAL:
-				if( vertexarray->format != IQM_FLOAT ||
-				    vertexarray->size != 3 ) {
-					return qfalse;
-				}
-				break;
-			case IQM_TANGENT:
-				if( vertexarray->format != IQM_FLOAT ||
-				    vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				break;
-			case IQM_TEXCOORD:
-				if( vertexarray->format != IQM_FLOAT ||
-				    vertexarray->size != 2 ) {
-					return qfalse;
-				}
-				break;
-			case IQM_BLENDINDEXES:
-				if( (vertexarray->format != IQM_INT &&
-					 vertexarray->format != IQM_UBYTE) ||
-					vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				blendIndexes = (byte*)header + vertexarray->offset;
-				break;
-			case IQM_BLENDWEIGHTS:
-				if( (vertexarray->format != IQM_FLOAT &&
-					 vertexarray->format != IQM_UBYTE) ||
-				    vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				if( vertexarray->format == IQM_FLOAT ) {
-					blendWeights.f = (float*)( (byte*)header + vertexarray->offset );
-				} else {
-					blendWeights.b = (byte*)header + vertexarray->offset;
-				}
-				break;
-			case IQM_COLOR:
-				if( vertexarray->format != IQM_UBYTE ||
-				    vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				break;
-			}
-		}
-
-		// check for required vertex arrays
-		if( vertexArrayFormat[IQM_POSITION] == -1 || vertexArrayFormat[IQM_NORMAL] == -1 || vertexArrayFormat[IQM_TEXCOORD] == -1 ) {
-			ri.Printf( PRINT_WARNING, "R_LoadIQM: %s is missing IQM_POSITION, IQM_NORMAL, and/or IQM_TEXCOORD array.\n", mod_name );
-			return qfalse;
-		}
-
-		if( header->num_joints ) {
-			if( vertexArrayFormat[IQM_BLENDINDEXES] == -1 || vertexArrayFormat[IQM_BLENDWEIGHTS] == -1 ) {
-				ri.Printf( PRINT_WARNING, "R_LoadIQM: %s is missing IQM_BLENDINDEXES and/or IQM_BLENDWEIGHTS array.\n", mod_name );
-				return qfalse;
-			}
-		} else {
-			// ignore blend arrays if present
-			vertexArrayFormat[IQM_BLENDINDEXES] = -1;
-			vertexArrayFormat[IQM_BLENDWEIGHTS] = -1;
-		}
-
-		// opengl1 renderer doesn't use tangents
-		vertexArrayFormat[IQM_TANGENT] = -1;
-
-		// check and swap triangles
-		if( IQM_CheckRange( header, header->ofs_triangles,
-				    header->num_triangles, sizeof(iqmTriangle_t) ) ) {
-			return qfalse;
-		}
-		triangle = (iqmTriangle_t *)((byte *)header + header->ofs_triangles);
-		for( i = 0; i < header->num_triangles; i++, triangle++ ) {
-			LL( triangle->vertex[0] );
-			LL( triangle->vertex[1] );
-			LL( triangle->vertex[2] );
-
-			if( triangle->vertex[0] > header->num_vertexes ||
-			    triangle->vertex[1] > header->num_vertexes ||
-			    triangle->vertex[2] > header->num_vertexes ) {
-				return qfalse;
-			}
-		}
-
-		// check and swap meshes
-		if( IQM_CheckRange( header, header->ofs_meshes,
-				    header->num_meshes, sizeof(iqmMesh_t) ) ) {
-			return qfalse;
-		}
-		mesh = (iqmMesh_t *)((byte *)header + header->ofs_meshes);
-		for( i = 0; i < header->num_meshes; i++, mesh++) {
-			LL( mesh->name );
-			LL( mesh->material );
-			LL( mesh->first_vertex );
-			LL( mesh->num_vertexes );
-			LL( mesh->first_triangle );
-			LL( mesh->num_triangles );
-
-			if ( mesh->name < header->num_text ) {
-				Q_strncpyz( meshName, (char*)header + header->ofs_text + mesh->name, sizeof (meshName) );
-			} else {
-				meshName[0] = '\0';
-			}
-
-			// check ioq3 limits
-			if ( mesh->num_vertexes >= SHADER_MAX_VERTEXES ) {
-				ri.Printf( PRINT_WARNING, "R_LoadIQM: %s has more than %i verts on %s (%i).\n",
-					  mod_name, SHADER_MAX_VERTEXES - 1, meshName[0] ? meshName : "a surface",
-					  mesh->num_vertexes );
-				return qfalse;
-			}
-			if ( mesh->num_triangles*3 >= SHADER_MAX_INDEXES ) {
-				ri.Printf( PRINT_WARNING, "R_LoadIQM: %s has more than %i triangles on %s (%i).\n",
-					  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, meshName[0] ? meshName : "a surface",
-					  mesh->num_triangles );
-				return qfalse;
-			}
-
-			if( mesh->first_vertex >= header->num_vertexes ||
-			    mesh->first_vertex + mesh->num_vertexes > header->num_vertexes ||
-			    mesh->first_triangle >= header->num_triangles ||
-			    mesh->first_triangle + mesh->num_triangles > header->num_triangles ||
-			    mesh->name >= header->num_text ||
-			    mesh->material >= header->num_text ) {
-				return qfalse;
-			}
-
-			// find number of unique blend influences per mesh
-			if( header->num_joints ) {
-				for( j = 0; j < mesh->num_vertexes; j++ ) {
-					int vtx = mesh->first_vertex + j;
-
-					for( k = 0; k < j; k++ ) {
-						int influence = mesh->first_vertex + k;
-
-						if( *(int*)&blendIndexes[4*influence] != *(int*)&blendIndexes[4*vtx] ) {
-							continue;
-						}
-
-						if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-							if ( blendWeights.f[4*influence+0] == blendWeights.f[4*vtx+0] &&
-							     blendWeights.f[4*influence+1] == blendWeights.f[4*vtx+1] &&
-							     blendWeights.f[4*influence+2] == blendWeights.f[4*vtx+2] &&
-							     blendWeights.f[4*influence+3] == blendWeights.f[4*vtx+3] ) {
-								break;
-							}
-						} else {
-							if ( *(int*)&blendWeights.b[4*influence] == *(int*)&blendWeights.b[4*vtx] ) {
-								break;
-							}
-						}
-					}
-
-					if ( k == j ) {
-						allocateInfluences++;
-					}
-				}
-			}
-		}
-	}
-
-	if( header->num_poses != header->num_joints && header->num_poses != 0 ) {
-		ri.Printf( PRINT_WARNING, "R_LoadIQM: %s has %d poses and %d joints, must have the same number or 0 poses\n",
-			  mod_name, header->num_poses, header->num_joints );
-		return qfalse;
-	}
-
-	joint_names = 0;
-
-	if ( header->num_joints )
-	{
-		// check and swap joints
-		if( IQM_CheckRange( header, header->ofs_joints,
-					header->num_joints, sizeof(iqmJoint_t) ) ) {
-			return qfalse;
-		}
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			LL( joint->name );
-			LL( joint->parent );
-			LL( joint->translate[0] );
-			LL( joint->translate[1] );
-			LL( joint->translate[2] );
-			LL( joint->rotate[0] );
-			LL( joint->rotate[1] );
-			LL( joint->rotate[2] );
-			LL( joint->rotate[3] );
-			LL( joint->scale[0] );
-			LL( joint->scale[1] );
-			LL( joint->scale[2] );
-
-			if( joint->parent < -1 ||
-				joint->parent >= (int)header->num_joints ||
-				joint->name >= (int)header->num_text ) {
-				return qfalse;
-			}
-			joint_names += strlen( (char *)header + header->ofs_text +
-						   joint->name ) + 1;
-		}
-	}
-
-	if ( header->num_poses )
-	{
-		// check and swap poses
-		if( IQM_CheckRange( header, header->ofs_poses,
-					header->num_poses, sizeof(iqmPose_t) ) ) {
-			return qfalse;
-		}
-		pose = (iqmPose_t *)((byte *)header + header->ofs_poses);
-		for( i = 0; i < header->num_poses; i++, pose++ ) {
-			LL( pose->parent );
-			LL( pose->mask );
-			LL( pose->channeloffset[0] );
-			LL( pose->channeloffset[1] );
-			LL( pose->channeloffset[2] );
-			LL( pose->channeloffset[3] );
-			LL( pose->channeloffset[4] );
-			LL( pose->channeloffset[5] );
-			LL( pose->channeloffset[6] );
-			LL( pose->channeloffset[7] );
-			LL( pose->channeloffset[8] );
-			LL( pose->channeloffset[9] );
-			LL( pose->channelscale[0] );
-			LL( pose->channelscale[1] );
-			LL( pose->channelscale[2] );
-			LL( pose->channelscale[3] );
-			LL( pose->channelscale[4] );
-			LL( pose->channelscale[5] );
-			LL( pose->channelscale[6] );
-			LL( pose->channelscale[7] );
-			LL( pose->channelscale[8] );
-			LL( pose->channelscale[9] );
-		}
-	}
-
-	if (header->ofs_bounds)
-	{
-		// check and swap model bounds
-		if(IQM_CheckRange(header, header->ofs_bounds,
-				  header->num_frames, sizeof(*bounds)))
-		{
-			return qfalse;
-		}
-		bounds = (iqmBounds_t *) ((byte *) header + header->ofs_bounds);
-		for(i = 0; i < header->num_frames; i++)
-		{
-			LL(bounds->bbmin[0]);
-			LL(bounds->bbmin[1]);
-			LL(bounds->bbmin[2]);
-			LL(bounds->bbmax[0]);
-			LL(bounds->bbmax[1]);
-			LL(bounds->bbmax[2]);
-
-			bounds++;
-		}
-	}
-
-	// allocate the model and copy the data
-	size = sizeof(iqmData_t);
-	if( header->num_meshes ) {
-		size += header->num_meshes * sizeof( srfIQModel_t ); // surfaces
-		size += header->num_triangles * 3 * sizeof(int);	// triangles
-		size += header->num_vertexes * 3 * sizeof(float);	// positions
-		size += header->num_vertexes * 2 * sizeof(float);	// texcoords
-		size += header->num_vertexes * 3 * sizeof(float);	// normals
-
-		if ( vertexArrayFormat[IQM_TANGENT] != -1 ) {
-			size += header->num_vertexes * 4 * sizeof(float);	// tangents
-		}
-
-		if ( vertexArrayFormat[IQM_COLOR] != -1 ) {
-			size += header->num_vertexes * 4 * sizeof(byte);	// colors
-		}
-
-		if ( allocateInfluences ) {
-			size += header->num_vertexes * sizeof(int);			// influences
-			size += allocateInfluences * 4 * sizeof(byte);		// influenceBlendIndexes
-
-			if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_UBYTE ) {
-				size += allocateInfluences * 4 * sizeof(byte);	// influenceBlendWeights
-			} else if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-				size += allocateInfluences * 4 * sizeof(float);	// influenceBlendWeights
-			}
-		}
-	}
-	if( header->num_joints ) {
-		size += joint_names;								// joint names
-		size += header->num_joints * sizeof(int);			// joint parents
-		size += header->num_joints * 12 * sizeof(float);	// bind joint matricies
-		size += header->num_joints * 12 * sizeof(float);	// inverse bind joint matricies
-	}
-	if( header->num_poses ) {
-		size += header->num_poses * header->num_frames * sizeof(iqmTransform_t); // pose transforms
-	}
-	if( header->ofs_bounds ) {
-		size += header->num_frames * 6 * sizeof(float);		// model bounds
-	} else if( header->num_meshes && header->num_frames == 0 ) {
-		size += 6 * sizeof(float);							// model bounds
-	}
-
-	mod->type = MOD_IQM;
-	iqmData = (iqmData_t *)ri.Hunk_Alloc( size, h_low );
-	mod->modelData = iqmData;
-
-	// fill header
-	iqmData->num_vertexes = ( header->num_meshes > 0 ) ? header->num_vertexes : 0;
-	iqmData->num_triangles = ( header->num_meshes > 0 ) ? header->num_triangles : 0;
-	iqmData->num_frames   = header->num_frames;
-	iqmData->num_surfaces = header->num_meshes;
-	iqmData->num_joints   = header->num_joints;
-	iqmData->num_poses    = header->num_poses;
-	iqmData->blendWeightsType = vertexArrayFormat[IQM_BLENDWEIGHTS];
-
-	dataPtr = (byte*)iqmData + sizeof(iqmData_t);
-	if( header->num_meshes ) {
-		iqmData->surfaces = (struct srfIQModel_s*)dataPtr;
-		dataPtr += header->num_meshes * sizeof( srfIQModel_t );
-
-		iqmData->triangles = (int*)dataPtr;
-		dataPtr += header->num_triangles * 3 * sizeof(int);		// triangles
-
-		iqmData->positions = (float*)dataPtr;
-		dataPtr += header->num_vertexes * 3 * sizeof(float);	// positions
-
-		iqmData->texcoords = (float*)dataPtr;
-		dataPtr += header->num_vertexes * 2 * sizeof(float);	// texcoords
-
-		iqmData->normals = (float*)dataPtr;
-		dataPtr += header->num_vertexes * 3 * sizeof(float);	// normals
-
-		if ( vertexArrayFormat[IQM_TANGENT] != -1 ) {
-			iqmData->tangents = (float*)dataPtr;
-			dataPtr += header->num_vertexes * 4 * sizeof(float);	// tangents
-		}
-
-		if ( vertexArrayFormat[IQM_COLOR] != -1 ) {
-			iqmData->colors = (byte*)dataPtr;
-			dataPtr += header->num_vertexes * 4 * sizeof(byte);		// colors
-		}
-
-		if ( allocateInfluences ) {
-			iqmData->influences = (int*)dataPtr;
-			dataPtr += header->num_vertexes * sizeof(int);			// influences
-
-			iqmData->influenceBlendIndexes = (byte*)dataPtr;
-			dataPtr += allocateInfluences * 4 * sizeof(byte);		// influenceBlendIndexes
-
-			if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_UBYTE ) {
-				iqmData->influenceBlendWeights.b = (byte*)dataPtr;
-				dataPtr += allocateInfluences * 4 * sizeof(byte);	// influenceBlendWeights
-			} else if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-				iqmData->influenceBlendWeights.f = (float*)dataPtr;
-				dataPtr += allocateInfluences * 4 * sizeof(float);	// influenceBlendWeights
-			}
-		}
-	}
-	if( header->num_joints ) {
-		iqmData->jointNames = (char*)dataPtr;
-		dataPtr += joint_names;								// joint names
-
-		iqmData->jointParents = (int*)dataPtr;
-		dataPtr += header->num_joints * sizeof(int);		// joint parents
-
-		iqmData->bindJoints = (float*)dataPtr;
-		dataPtr += header->num_joints * 12 * sizeof(float);		// bind joint matricies
-
-		iqmData->invBindJoints = (float*)dataPtr;
-		dataPtr += header->num_joints * 12 * sizeof(float);		// inverse bind joint matricies
-	}
-	if( header->num_poses ) {
-		iqmData->poses = (iqmTransform_t*)dataPtr;
-		dataPtr += header->num_poses * header->num_frames * sizeof(iqmTransform_t); // pose transforms
-	}
-	if( header->ofs_bounds ) {
-		iqmData->bounds = (float*)dataPtr;
-		dataPtr += header->num_frames * 6 * sizeof(float);	// model bounds
-	} else if( header->num_meshes && header->num_frames == 0 ) {
-		iqmData->bounds = (float*)dataPtr;
-		dataPtr += 6 * sizeof(float);						// model bounds
-	}
-
-	if( header->num_meshes )
-	{
-		// register shaders
-		// overwrite the material offset with the shader index
-		mesh = (iqmMesh_t *)((byte *)header + header->ofs_meshes);
-		surface = iqmData->surfaces;
-		str = (char *)header + header->ofs_text;
-		for( i = 0; i < header->num_meshes; i++, mesh++, surface++ ) {
-			surface->surfaceType = SF_IQM;
-			Q_strncpyz(surface->name, str + mesh->name, sizeof (surface->name));
-			Q_strlwr(surface->name); // lowercase the surface name so skin compares are faster
-			surface->shader = R_FindShader( str + mesh->material, LIGHTMAP_NONE, qtrue );
-			if( surface->shader->defaultShader )
-				surface->shader = tr.defaultShader;
-			surface->data = iqmData;
-			surface->first_vertex = mesh->first_vertex;
-			surface->num_vertexes = mesh->num_vertexes;
-			surface->first_triangle = mesh->first_triangle;
-			surface->num_triangles = mesh->num_triangles;
-		}
-
-		// copy triangles
-		triangle = (iqmTriangle_t *)((byte *)header + header->ofs_triangles);
-		for( i = 0; i < header->num_triangles; i++, triangle++ ) {
-			iqmData->triangles[3*i+0] = triangle->vertex[0];
-			iqmData->triangles[3*i+1] = triangle->vertex[1];
-			iqmData->triangles[3*i+2] = triangle->vertex[2];
-		}
-
-		// copy vertexarrays and indexes
-		vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays);
-		for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) {
-			int	n;
-
-			// skip disabled arrays
-			if( vertexarray->type < ARRAY_LEN( vertexArrayFormat )
-			    && vertexArrayFormat[vertexarray->type] == -1 )
-				continue;
-
-			// total number of values
-			n = header->num_vertexes * vertexarray->size;
-
-			switch( vertexarray->type ) {
-			case IQM_POSITION:
-				Com_Memcpy( iqmData->positions,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_NORMAL:
-				Com_Memcpy( iqmData->normals,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_TANGENT:
-				Com_Memcpy( iqmData->tangents,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_TEXCOORD:
-				Com_Memcpy( iqmData->texcoords,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_BLENDINDEXES:
-			case IQM_BLENDWEIGHTS:
-				break;
-			case IQM_COLOR:
-				Com_Memcpy( iqmData->colors,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(byte) );
-				break;
-			}
-		}
-
-		// find unique blend influences per mesh
-		if( allocateInfluences ) {
-			int vtx, influence, totalInfluences = 0;
-
-			surface = iqmData->surfaces;
-			for( i = 0; i < header->num_meshes; i++, surface++ ) {
-				surface->first_influence = totalInfluences;
-				surface->num_influences = 0;
-
-				for( j = 0; j < surface->num_vertexes; j++ ) {
-					vtx = surface->first_vertex + j;
-
-					for( k = 0; k < surface->num_influences; k++ ) {
-						influence = surface->first_influence + k;
-
-						if( *(int*)&iqmData->influenceBlendIndexes[4*influence] != *(int*)&blendIndexes[4*vtx] ) {
-							continue;
-						}
-
-						if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-							if ( iqmData->influenceBlendWeights.f[4*influence+0] == blendWeights.f[4*vtx+0] &&
-							     iqmData->influenceBlendWeights.f[4*influence+1] == blendWeights.f[4*vtx+1] &&
-							     iqmData->influenceBlendWeights.f[4*influence+2] == blendWeights.f[4*vtx+2] &&
-							     iqmData->influenceBlendWeights.f[4*influence+3] == blendWeights.f[4*vtx+3] ) {
-								break;
-							}
-						} else {
-							if ( *(int*)&iqmData->influenceBlendWeights.b[4*influence] == *(int*)&blendWeights.b[4*vtx] ) {
-								break;
-							}
-						}
-					}
-
-					iqmData->influences[vtx] = surface->first_influence + k;
-
-					if( k == surface->num_influences ) {
-						influence = surface->first_influence + k;
-
-						iqmData->influenceBlendIndexes[4*influence+0] = blendIndexes[4*vtx+0];
-						iqmData->influenceBlendIndexes[4*influence+1] = blendIndexes[4*vtx+1];
-						iqmData->influenceBlendIndexes[4*influence+2] = blendIndexes[4*vtx+2];
-						iqmData->influenceBlendIndexes[4*influence+3] = blendIndexes[4*vtx+3];
-
-						if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-							iqmData->influenceBlendWeights.f[4*influence+0] = blendWeights.f[4*vtx+0];
-							iqmData->influenceBlendWeights.f[4*influence+1] = blendWeights.f[4*vtx+1];
-							iqmData->influenceBlendWeights.f[4*influence+2] = blendWeights.f[4*vtx+2];
-							iqmData->influenceBlendWeights.f[4*influence+3] = blendWeights.f[4*vtx+3];
-						} else {
-							iqmData->influenceBlendWeights.b[4*influence+0] = blendWeights.b[4*vtx+0];
-							iqmData->influenceBlendWeights.b[4*influence+1] = blendWeights.b[4*vtx+1];
-							iqmData->influenceBlendWeights.b[4*influence+2] = blendWeights.b[4*vtx+2];
-							iqmData->influenceBlendWeights.b[4*influence+3] = blendWeights.b[4*vtx+3];
-						}
-
-						totalInfluences++;
-						surface->num_influences++;
-					}
-				}
-			}
-		}
-	}
-
-	if( header->num_joints )
-	{
-		// copy joint names
-		str = iqmData->jointNames;
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			char *name = (char *)header + header->ofs_text +
-				joint->name;
-			int len = strlen( name ) + 1;
-			Com_Memcpy( str, name, len );
-			str += len;
-		}
-
-		// copy joint parents
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			iqmData->jointParents[i] = joint->parent;
-		}
-
-		// calculate bind joint matrices and their inverses
-		mat = iqmData->bindJoints;
-		matInv = iqmData->invBindJoints;
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			float baseFrame[12], invBaseFrame[12];
-
-			QuatNormalize2( joint->rotate, joint->rotate );
-
-			JointToMatrix( joint->rotate, joint->scale, joint->translate, baseFrame );
-			Matrix34Invert( baseFrame, invBaseFrame );
-
-			if ( joint->parent >= 0 )
-			{
-				Matrix34Multiply( iqmData->bindJoints + 12 * joint->parent, baseFrame, mat );
-				mat += 12;
-				Matrix34Multiply( invBaseFrame, iqmData->invBindJoints + 12 * joint->parent, matInv );
-				matInv += 12;
-			}
-			else
-			{
-				Com_Memcpy( mat, baseFrame,    sizeof(baseFrame)    );
-				mat += 12;
-				Com_Memcpy( matInv, invBaseFrame, sizeof(invBaseFrame) );
-				matInv += 12;
-			}
-		}
-	}
-
-	if( header->num_poses )
-	{
-		// calculate pose transforms
-		transform = iqmData->poses;
-		framedata = (unsigned short *)((byte *)header + header->ofs_frames);
-		for( i = 0; i < header->num_frames; i++ ) {
-			pose = (iqmPose_t *)((byte *)header + header->ofs_poses);
-			for( j = 0; j < header->num_poses; j++, pose++, transform++ ) {
-				vec3_t	translate;
-				quat_t	rotate;
-				vec3_t	scale;
-
-				translate[0] = pose->channeloffset[0];
-				if( pose->mask & 0x001)
-					translate[0] += *framedata++ * pose->channelscale[0];
-				translate[1] = pose->channeloffset[1];
-				if( pose->mask & 0x002)
-					translate[1] += *framedata++ * pose->channelscale[1];
-				translate[2] = pose->channeloffset[2];
-				if( pose->mask & 0x004)
-					translate[2] += *framedata++ * pose->channelscale[2];
-
-				rotate[0] = pose->channeloffset[3];
-				if( pose->mask & 0x008)
-					rotate[0] += *framedata++ * pose->channelscale[3];
-				rotate[1] = pose->channeloffset[4];
-				if( pose->mask & 0x010)
-					rotate[1] += *framedata++ * pose->channelscale[4];
-				rotate[2] = pose->channeloffset[5];
-				if( pose->mask & 0x020)
-					rotate[2] += *framedata++ * pose->channelscale[5];
-				rotate[3] = pose->channeloffset[6];
-				if( pose->mask & 0x040)
-					rotate[3] += *framedata++ * pose->channelscale[6];
-
-				scale[0] = pose->channeloffset[7];
-				if( pose->mask & 0x080)
-					scale[0] += *framedata++ * pose->channelscale[7];
-				scale[1] = pose->channeloffset[8];
-				if( pose->mask & 0x100)
-					scale[1] += *framedata++ * pose->channelscale[8];
-				scale[2] = pose->channeloffset[9];
-				if( pose->mask & 0x200)
-					scale[2] += *framedata++ * pose->channelscale[9];
-
-				VectorCopy( translate, transform->translate );
-				QuatNormalize2( rotate, transform->rotate );
-				VectorCopy( scale, transform->scale );
-			}
-		}
-	}
-
-	// copy model bounds
-	if(header->ofs_bounds)
-	{
-		mat = iqmData->bounds;
-		bounds = (iqmBounds_t *) ((byte *) header + header->ofs_bounds);
-		for(i = 0; i < header->num_frames; i++)
-		{
-			mat[0] = bounds->bbmin[0];
-			mat[1] = bounds->bbmin[1];
-			mat[2] = bounds->bbmin[2];
-			mat[3] = bounds->bbmax[0];
-			mat[4] = bounds->bbmax[1];
-			mat[5] = bounds->bbmax[2];
-
-			mat += 6;
-			bounds++;
-		}
-	}
-	else if( header->num_meshes && header->num_frames == 0 )
-	{
-		mat = iqmData->bounds;
-
-		ClearBounds( &iqmData->bounds[0], &iqmData->bounds[3] );
-		for ( i = 0 ; i < header->num_vertexes ; i++ ) {
-			AddPointToBounds( &iqmData->positions[i*3], &iqmData->bounds[0], &iqmData->bounds[3] );
-		}
-	}
-
-	return qtrue;
-}
-
-/*
-=============
-R_CullIQM
-=============
-*/
-static int R_CullIQM( iqmData_t *data, trRefEntity_t *ent ) {
-	vec3_t		bounds[2];
-	vec_t		*oldBounds, *newBounds;
-	int		i;
-
-	if (!data->bounds) {
-		tr.pc.c_box_cull_md3_clip++;
-		return CULL_CLIP;
-	}
-
-	// compute bounds pointers
-	oldBounds = data->bounds + 6*ent->e.oldframe;
-	newBounds = data->bounds + 6*ent->e.frame;
-
-	// calculate a bounding box in the current coordinate system
-	for (i = 0 ; i < 3 ; i++) {
-		bounds[0][i] = oldBounds[i] < newBounds[i] ? oldBounds[i] : newBounds[i];
-		bounds[1][i] = oldBounds[i+3] > newBounds[i+3] ? oldBounds[i+3] : newBounds[i+3];
-	}
-
-	switch ( R_CullLocalBox( bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_md3_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_md3_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_md3_out++;
-		return CULL_OUT;
-	}
-}
-
-/*
-=================
-R_ComputeIQMFogNum
-
-=================
-*/
-int R_ComputeIQMFogNum( iqmData_t *data, trRefEntity_t *ent ) {
-	int			i, j;
-	fog_t			*fog;
-	const vec_t		*bounds;
-	const vec_t		defaultBounds[6] = { -8, -8, -8, 8, 8, 8 };
-	vec3_t			diag, center;
-	vec3_t			localOrigin;
-	vec_t			radius;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-
-	// FIXME: non-normalized axis issues
-	if (data->bounds) {
-		bounds = data->bounds + 6*ent->e.frame;
-	} else {
-		bounds = defaultBounds;
-	}
-	VectorSubtract( bounds+3, bounds, diag );
-	VectorMA( bounds, 0.5f, diag, center );
-	VectorAdd( ent->e.origin, center, localOrigin );
-	radius = 0.5f * VectorLength( diag );
-
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( localOrigin[j] - radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( localOrigin[j] + radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-/*
-=================
-R_AddIQMSurfaces
-
-Add all surfaces of this model
-=================
-*/
-void R_AddIQMSurfaces( trRefEntity_t *ent ) {
-	iqmData_t		*data;
-	srfIQModel_t		*surface;
-	int			i, j;
-	qboolean		personalModel;
-	int			cull;
-	int			fogNum;
-	shader_t		*shader;
-	skin_t			*skin;
-
-	data = tr.currentModel->modelData;
-	surface = data->surfaces;
-
-	// don't add third_person objects if not in a portal
-	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
-
-	if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
-		ent->e.frame %= data->num_frames;
-		ent->e.oldframe %= data->num_frames;
-	}
-
-	//
-	// Validate the frames so there is no chance of a crash.
-	// This will write directly into the entity structure, so
-	// when the surfaces are rendered, they don't need to be
-	// range checked again.
-	//
-	if ( (ent->e.frame >= data->num_frames) 
-	     || (ent->e.frame < 0)
-	     || (ent->e.oldframe >= data->num_frames)
-	     || (ent->e.oldframe < 0) ) {
-		ri.Printf( PRINT_DEVELOPER, "R_AddIQMSurfaces: no such frame %d to %d for '%s'\n",
-			   ent->e.oldframe, ent->e.frame,
-			   tr.currentModel->name );
-		ent->e.frame = 0;
-		ent->e.oldframe = 0;
-	}
-
-	//
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	//
-	cull = R_CullIQM ( data, ent );
-	if ( cull == CULL_OUT ) {
-		return;
-	}
-
-	//
-	// set up lighting now that we know we aren't culled
-	//
-	if ( !personalModel || r_shadows->integer > 1 ) {
-		R_SetupEntityLighting( &tr.refdef, ent );
-	}
-
-	//
-	// see if we are in a fog volume
-	//
-	fogNum = R_ComputeIQMFogNum( data, ent );
-
-	for ( i = 0 ; i < data->num_surfaces ; i++ ) {
-		if(ent->e.customShader)
-			shader = R_GetShaderByHandle( ent->e.customShader );
-		else if(ent->e.customSkin > 0 && ent->e.customSkin < tr.numSkins)
-		{
-			skin = R_GetSkinByHandle(ent->e.customSkin);
-			shader = tr.defaultShader;
-
-			for(j = 0; j < skin->numSurfaces; j++)
-			{
-				if (!strcmp(skin->surfaces[j].name, surface->name))
-				{
-					shader = skin->surfaces[j].shader;
-					break;
-				}
-			}
-		} else {
-			shader = surface->shader;
-		}
-
-		// we will add shadows even if the main object isn't visible in the view
-
-		// stencil shadows can't do personal models unless I polyhedron clip
-		if ( !personalModel
-			&& r_shadows->integer == 2 
-			&& fogNum == 0
-			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.shadowShader, 0, 0 );
-		}
-
-		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
-			&& fogNum == 0
-			&& (ent->e.renderfx & RF_SHADOW_PLANE )
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.projectionShadowShader, 0, 0 );
-		}
-
-		if( !personalModel ) {
-			R_AddDrawSurf( (void *)surface, shader, fogNum, 0 );
-		}
-
-		surface++;
-	}
-}
-
-
-static void ComputePoseMats( iqmData_t *data, int frame, int oldframe,
-			      float backlerp, float *poseMats ) {
-	iqmTransform_t relativeJoints[IQM_MAX_JOINTS];
-	iqmTransform_t *relativeJoint;
-	const iqmTransform_t *pose;
-	const iqmTransform_t *oldpose;
-	const int *jointParent;
-	const float *invBindMat;
-	float *poseMat, lerp;
-	int i;
-
-	relativeJoint = relativeJoints;
-
-	// copy or lerp animation frame pose
-	if ( oldframe == frame ) {
-		pose = &data->poses[frame * data->num_poses];
-		for ( i = 0; i < data->num_poses; i++, pose++, relativeJoint++ ) {
-			VectorCopy( pose->translate, relativeJoint->translate );
-			QuatCopy( pose->rotate, relativeJoint->rotate );
-			VectorCopy( pose->scale, relativeJoint->scale );
-		}
-	} else {
-		lerp = 1.0f - backlerp;
-		pose = &data->poses[frame * data->num_poses];
-		oldpose = &data->poses[oldframe * data->num_poses];
-		for ( i = 0; i < data->num_poses; i++, oldpose++, pose++, relativeJoint++ ) {
-			relativeJoint->translate[0] = oldpose->translate[0] * backlerp + pose->translate[0] * lerp;
-			relativeJoint->translate[1] = oldpose->translate[1] * backlerp + pose->translate[1] * lerp;
-			relativeJoint->translate[2] = oldpose->translate[2] * backlerp + pose->translate[2] * lerp;
-
-			relativeJoint->scale[0] = oldpose->scale[0] * backlerp + pose->scale[0] * lerp;
-			relativeJoint->scale[1] = oldpose->scale[1] * backlerp + pose->scale[1] * lerp;
-			relativeJoint->scale[2] = oldpose->scale[2] * backlerp + pose->scale[2] * lerp;
-
-			QuatSlerp( oldpose->rotate, pose->rotate, lerp, relativeJoint->rotate );
-		}
-	}
-
-	// multiply by inverse of bind pose and parent 'pose mat' (bind pose transform matrix)
-	relativeJoint = relativeJoints;
-	jointParent = data->jointParents;
-	invBindMat = data->invBindJoints;
-	poseMat = poseMats;
-	for ( i = 0; i < data->num_poses; i++, relativeJoint++, jointParent++, invBindMat += 12, poseMat += 12 ) {
-		float mat1[12], mat2[12];
-
-		JointToMatrix( relativeJoint->rotate, relativeJoint->scale, relativeJoint->translate, mat1 );
-
-		if ( *jointParent >= 0 ) {
-			Matrix34Multiply( &data->bindJoints[(*jointParent)*12], mat1, mat2 );
-			Matrix34Multiply( mat2, invBindMat, mat1 );
-			Matrix34Multiply( &poseMats[(*jointParent)*12], mat1, poseMat );
-		} else {
-			Matrix34Multiply( mat1, invBindMat, poseMat );
-		}
-	}
-}
-
-static void ComputeJointMats( iqmData_t *data, int frame, int oldframe,
-			      float backlerp, float *mat ) {
-	float	*mat1;
-	int	i;
-
-	if ( data->num_poses == 0 ) {
-		Com_Memcpy( mat, data->bindJoints, data->num_joints * 12 * sizeof(float) );
-		return;
-	}
-
-	ComputePoseMats( data, frame, oldframe, backlerp, mat );
-
-	for( i = 0; i < data->num_joints; i++ ) {
-		float outmat[12];
-		mat1 = mat + 12 * i;
-
-		Com_Memcpy(outmat, mat1, sizeof(outmat));
-
-		Matrix34Multiply( outmat, data->bindJoints + 12*i, mat1 );
-	}
-}
-
-
-/*
-=================
-RB_AddIQMSurfaces
-
-Compute vertices for this model surface
-=================
-*/
-void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
-	srfIQModel_t	*surf = (srfIQModel_t *)surface;
-	iqmData_t	*data = surf->data;
-	float		poseMats[IQM_MAX_JOINTS * 12];
-	float		influenceVtxMat[SHADER_MAX_VERTEXES * 12];
-	float		influenceNrmMat[SHADER_MAX_VERTEXES * 9];
-	int		i;
-
-	float		*xyz;
-	float		*normal;
-	float		*texCoords;
-	byte		*color;
-	vec4_t		*outXYZ;
-	vec4_t		*outNormal;
-	vec2_t		(*outTexCoord)[2];
-	color4ub_t	*outColor;
-
-	int	frame = data->num_frames ? backEnd.currentEntity->e.frame % data->num_frames : 0;
-	int	oldframe = data->num_frames ? backEnd.currentEntity->e.oldframe % data->num_frames : 0;
-	float	backlerp = backEnd.currentEntity->e.backlerp;
-
-	int		*tri;
-	glIndex_t	*ptr;
-	glIndex_t	base;
-
-	RB_CHECKOVERFLOW( surf->num_vertexes, surf->num_triangles * 3 );
-
-	xyz = &data->positions[surf->first_vertex * 3];
-	normal = &data->normals[surf->first_vertex * 3];
-	texCoords = &data->texcoords[surf->first_vertex * 2];
-
-	if ( data->colors ) {
-		color = &data->colors[surf->first_vertex * 4];
-	} else {
-		color = NULL;
-	}
-
-	outXYZ = &tess.xyz[tess.numVertexes];
-	outNormal = &tess.normal[tess.numVertexes];
-	outTexCoord = &tess.texCoords[tess.numVertexes];
-	outColor = &tess.vertexColors[tess.numVertexes];
-
-	if ( data->num_poses > 0 ) {
-		// compute interpolated joint matrices
-		ComputePoseMats( data, frame, oldframe, backlerp, poseMats );
-
-		// compute vertex blend influence matricies
-		for( i = 0; i < surf->num_influences; i++ ) {
-			int influence = surf->first_influence + i;
-			float *vtxMat = &influenceVtxMat[12*i];
-			float *nrmMat = &influenceNrmMat[9*i];
-			int	j;
-			float	blendWeights[4];
-
-			if ( data->blendWeightsType == IQM_FLOAT ) {
-				blendWeights[0] = data->influenceBlendWeights.f[4*influence + 0];
-				blendWeights[1] = data->influenceBlendWeights.f[4*influence + 1];
-				blendWeights[2] = data->influenceBlendWeights.f[4*influence + 2];
-				blendWeights[3] = data->influenceBlendWeights.f[4*influence + 3];
-			} else {
-				blendWeights[0] = (float)data->influenceBlendWeights.b[4*influence + 0] / 255.0f;
-				blendWeights[1] = (float)data->influenceBlendWeights.b[4*influence + 1] / 255.0f;
-				blendWeights[2] = (float)data->influenceBlendWeights.b[4*influence + 2] / 255.0f;
-				blendWeights[3] = (float)data->influenceBlendWeights.b[4*influence + 3] / 255.0f;
-			}
-
-			if ( blendWeights[0] <= 0.0f ) {
-				// no blend joint, use identity matrix.
-				vtxMat[0] = identityMatrix[0];
-				vtxMat[1] = identityMatrix[1];
-				vtxMat[2] = identityMatrix[2];
-				vtxMat[3] = identityMatrix[3];
-				vtxMat[4] = identityMatrix[4];
-				vtxMat[5] = identityMatrix[5];
-				vtxMat[6] = identityMatrix[6];
-				vtxMat[7] = identityMatrix[7];
-				vtxMat[8] = identityMatrix[8];
-				vtxMat[9] = identityMatrix[9];
-				vtxMat[10] = identityMatrix[10];
-				vtxMat[11] = identityMatrix[11];
-			} else {
-				// compute the vertex matrix by blending the up to
-				// four blend weights
-				vtxMat[0] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 0];
-				vtxMat[1] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 1];
-				vtxMat[2] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 2];
-				vtxMat[3] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 3];
-				vtxMat[4] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 4];
-				vtxMat[5] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 5];
-				vtxMat[6] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 6];
-				vtxMat[7] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 7];
-				vtxMat[8] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 8];
-				vtxMat[9] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 9];
-				vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10];
-				vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11];
-
-				for( j = 1; j < 4; j++ ) {
-					if ( blendWeights[j] <= 0.0f ) {
-						break;
-					}
-
-					vtxMat[0] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 0];
-					vtxMat[1] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 1];
-					vtxMat[2] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 2];
-					vtxMat[3] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 3];
-					vtxMat[4] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 4];
-					vtxMat[5] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 5];
-					vtxMat[6] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 6];
-					vtxMat[7] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 7];
-					vtxMat[8] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 8];
-					vtxMat[9] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 9];
-					vtxMat[10] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 10];
-					vtxMat[11] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 11];
-				}
-			}
-
-			// compute the normal matrix as transpose of the adjoint
-			// of the vertex matrix
-			nrmMat[ 0] = vtxMat[ 5]*vtxMat[10] - vtxMat[ 6]*vtxMat[ 9];
-			nrmMat[ 1] = vtxMat[ 6]*vtxMat[ 8] - vtxMat[ 4]*vtxMat[10];
-			nrmMat[ 2] = vtxMat[ 4]*vtxMat[ 9] - vtxMat[ 5]*vtxMat[ 8];
-			nrmMat[ 3] = vtxMat[ 2]*vtxMat[ 9] - vtxMat[ 1]*vtxMat[10];
-			nrmMat[ 4] = vtxMat[ 0]*vtxMat[10] - vtxMat[ 2]*vtxMat[ 8];
-			nrmMat[ 5] = vtxMat[ 1]*vtxMat[ 8] - vtxMat[ 0]*vtxMat[ 9];
-			nrmMat[ 6] = vtxMat[ 1]*vtxMat[ 6] - vtxMat[ 2]*vtxMat[ 5];
-			nrmMat[ 7] = vtxMat[ 2]*vtxMat[ 4] - vtxMat[ 0]*vtxMat[ 6];
-			nrmMat[ 8] = vtxMat[ 0]*vtxMat[ 5] - vtxMat[ 1]*vtxMat[ 4];
-		}
-
-		// transform vertexes and fill other data
-		for( i = 0; i < surf->num_vertexes;
-		     i++, xyz+=3, normal+=3, texCoords+=2,
-		     outXYZ++, outNormal++, outTexCoord++ ) {
-			int influence = data->influences[surf->first_vertex + i] - surf->first_influence;
-			float *vtxMat = &influenceVtxMat[12*influence];
-			float *nrmMat = &influenceNrmMat[9*influence];
-
-			(*outTexCoord)[0][0] = texCoords[0];
-			(*outTexCoord)[0][1] = texCoords[1];
-
-			(*outXYZ)[0] =
-				vtxMat[ 0] * xyz[0] +
-				vtxMat[ 1] * xyz[1] +
-				vtxMat[ 2] * xyz[2] +
-				vtxMat[ 3];
-			(*outXYZ)[1] =
-				vtxMat[ 4] * xyz[0] +
-				vtxMat[ 5] * xyz[1] +
-				vtxMat[ 6] * xyz[2] +
-				vtxMat[ 7];
-			(*outXYZ)[2] =
-				vtxMat[ 8] * xyz[0] +
-				vtxMat[ 9] * xyz[1] +
-				vtxMat[10] * xyz[2] +
-				vtxMat[11];
-
-			(*outNormal)[0] =
-				nrmMat[ 0] * normal[0] +
-				nrmMat[ 1] * normal[1] +
-				nrmMat[ 2] * normal[2];
-			(*outNormal)[1] =
-				nrmMat[ 3] * normal[0] +
-				nrmMat[ 4] * normal[1] +
-				nrmMat[ 5] * normal[2];
-			(*outNormal)[2] =
-				nrmMat[ 6] * normal[0] +
-				nrmMat[ 7] * normal[1] +
-				nrmMat[ 8] * normal[2];
-		}
-	} else {
-		// copy vertexes and fill other data
-		for( i = 0; i < surf->num_vertexes;
-		     i++, xyz+=3, normal+=3, texCoords+=2,
-		     outXYZ++, outNormal++, outTexCoord++ ) {
-			(*outTexCoord)[0][0] = texCoords[0];
-			(*outTexCoord)[0][1] = texCoords[1];
-
-			(*outXYZ)[0] = xyz[0];
-			(*outXYZ)[1] = xyz[1];
-			(*outXYZ)[2] = xyz[2];
-
-			(*outNormal)[0] = normal[0];
-			(*outNormal)[1] = normal[1];
-			(*outNormal)[2] = normal[2];
-		}
-	}
-
-	if ( color ) {
-		Com_Memcpy( outColor, color, surf->num_vertexes * sizeof( outColor[0] ) );
-	} else {
-		Com_Memset( outColor, 0, surf->num_vertexes * sizeof( outColor[0] ) );
-	}
-
-	tri = data->triangles + 3 * surf->first_triangle;
-	ptr = &tess.indexes[tess.numIndexes];
-	base = tess.numVertexes;
-
-	for( i = 0; i < surf->num_triangles; i++ ) {
-		*ptr++ = base + (*tri++ - surf->first_vertex);
-		*ptr++ = base + (*tri++ - surf->first_vertex);
-		*ptr++ = base + (*tri++ - surf->first_vertex);
-	}
-
-	tess.numIndexes += 3 * surf->num_triangles;
-	tess.numVertexes += surf->num_vertexes;
-}
-
-int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
-		  int startFrame, int endFrame, 
-		  float frac, const char *tagName ) {
-	float	jointMats[IQM_MAX_JOINTS * 12];
-	int	joint;
-	char	*names = data->jointNames;
-
-	// get joint number by reading the joint names
-	for( joint = 0; joint < data->num_joints; joint++ ) {
-		if( !strcmp( tagName, names ) )
-			break;
-		names += strlen( names ) + 1;
-	}
-	if( joint >= data->num_joints ) {
-		AxisClear( tag->axis );
-		VectorClear( tag->origin );
-		return qfalse;
-	}
-
-	ComputeJointMats( data, startFrame, endFrame, frac, jointMats );
-
-	tag->axis[0][0] = jointMats[12 * joint + 0];
-	tag->axis[1][0] = jointMats[12 * joint + 1];
-	tag->axis[2][0] = jointMats[12 * joint + 2];
-	tag->origin[0] = jointMats[12 * joint + 3];
-	tag->axis[0][1] = jointMats[12 * joint + 4];
-	tag->axis[1][1] = jointMats[12 * joint + 5];
-	tag->axis[2][1] = jointMats[12 * joint + 6];
-	tag->origin[1] = jointMats[12 * joint + 7];
-	tag->axis[0][2] = jointMats[12 * joint + 8];
-	tag->axis[1][2] = jointMats[12 * joint + 9];
-	tag->axis[2][2] = jointMats[12 * joint + 10];
-	tag->origin[2] = jointMats[12 * joint + 11];
-
-	return qtrue;
-}
diff --git a/code/renderer/tr_public.h b/code/renderergl1/tr_public.h
similarity index 100%
rename from code/renderer/tr_public.h
rename to code/renderergl1/tr_public.h
diff --git a/code/renderergl1/tr_scene.c b/code/renderergl1/tr_scene.c
index 639f4e2d..1a43b095 100644
--- a/code/renderergl1/tr_scene.c
+++ b/code/renderergl1/tr_scene.c
@@ -15,14 +15,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
 #include "tr_local.h"
+#include "tr_vis.h"
+#include "tiki.h"
 
 int			r_firstSceneDrawSurf;
+int			r_firstSceneSpriteSurf;
 
 int			r_numdlights;
 int			r_firstSceneDlight;
@@ -30,6 +33,12 @@ int			r_firstSceneDlight;
 int			r_numentities;
 int			r_firstSceneEntity;
 
+int			r_numsprites;
+int			r_firstSceneSprite;
+
+int			r_numtermarks;
+int			r_firstSceneTerMark;
+
 int			r_numpolys;
 int			r_firstScenePoly;
 
@@ -38,14 +47,23 @@ int			r_numpolyverts;
 
 /*
 ====================
-R_InitNextFrame
+R_ToggleSmpFrame
 
 ====================
 */
-void R_InitNextFrame( void ) {
-	backEndData->commands.used = 0;
+void R_ToggleSmpFrame( void ) {
+	if ( r_smp->integer ) {
+		// use the other buffers next frame, because another CPU
+		// may still be rendering into the current ones
+		tr.smpFrame ^= 1;
+	} else {
+		tr.smpFrame = 0;
+	}
+
+	backEndData[tr.smpFrame]->commands.used = 0;
 
 	r_firstSceneDrawSurf = 0;
+	r_firstSceneSpriteSurf = 0;
 
 	r_numdlights = 0;
 	r_firstSceneDlight = 0;
@@ -53,6 +71,12 @@ void R_InitNextFrame( void ) {
 	r_numentities = 0;
 	r_firstSceneEntity = 0;
 
+	r_numsprites = 0;
+	r_firstSceneSprite = 0;
+
+	r_numtermarks = 0;
+	r_firstSceneTerMark = 0;
+
 	r_numpolys = 0;
 	r_firstScenePoly = 0;
 
@@ -69,6 +93,8 @@ RE_ClearScene
 void RE_ClearScene( void ) {
 	r_firstSceneDlight = r_numdlights;
 	r_firstSceneEntity = r_numentities;
+	r_firstSceneSprite = r_numsprites;
+	r_firstSceneTerMark = r_numtermarks;
 	r_firstScenePoly = r_numpolys;
 }
 
@@ -92,12 +118,12 @@ void R_AddPolygonSurfaces( void ) {
 	shader_t	*sh;
 	srfPoly_t	*poly;
 
-	tr.currentEntityNum = REFENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+	tr.currentEntityNum = ENTITYNUM_WORLD;
+	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
 
 	for ( i = 0, poly = tr.refdef.polys; i < tr.refdef.numPolys ; i++, poly++ ) {
 		sh = R_GetShaderByHandle( poly->hShader );
-		R_AddDrawSurf( ( void * )poly, sh, poly->fogIndex, qfalse );
+		R_AddDrawSurf( ( void * )poly, sh, qfalse );
 	}
 }
 
@@ -107,88 +133,98 @@ RE_AddPolyToScene
 
 =====================
 */
-void RE_AddPolyToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts, int numPolys ) {
+qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
 	srfPoly_t	*poly;
-	int			i, j;
-	int			fogIndex;
-	fog_t		*fog;
-	vec3_t		bounds[2];
 
 	if ( !tr.registered ) {
-		return;
+		return qfalse;
 	}
 
-	if ( !hShader ) {
-		ri.Printf( PRINT_WARNING, "WARNING: RE_AddPolyToScene: NULL poly shader\n");
-		return;
+	if (numVerts + r_numpolyverts > max_polyverts || r_numpolys >= max_polys) {
+		ri.Printf(PRINT_WARNING, "Exceeded MAX POLYS\n");
+		return qfalse;
 	}
 
-	for ( j = 0; j < numPolys; j++ ) {
-		if ( r_numpolyverts + numVerts > max_polyverts || r_numpolys >= max_polys ) {
-      /*
-      NOTE TTimo this was initially a PRINT_WARNING
-      but it happens a lot with high fighting scenes and particles
-      since we don't plan on changing the const and making for room for those effects
-      simply cut this message to developer only
-      */
-			ri.Printf( PRINT_DEVELOPER, "WARNING: RE_AddPolyToScene: r_max_polys or r_max_polyverts reached\n");
-			return;
-		}
+	poly = &backEndData[tr.smpFrame]->polys[r_numpolys];
+	poly->surfaceType = SF_POLY;
+	poly->hShader = hShader;
+	poly->numVerts = numVerts;
+	poly->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
+	poly->renderfx = renderfx;
 
-		poly = &backEndData->polys[r_numpolys];
-		poly->surfaceType = SF_POLY;
-		poly->hShader = hShader;
-		poly->numVerts = numVerts;
-		poly->verts = &backEndData->polyVerts[r_numpolyverts];
-		
-		Com_Memcpy( poly->verts, &verts[numVerts*j], numVerts * sizeof( *verts ) );
+	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
+	++r_numpolys;
+	r_numpolyverts += numVerts;
 
-		if ( glConfig.hardwareType == GLHW_RAGEPRO ) {
-			poly->verts->modulate[0] = 255;
-			poly->verts->modulate[1] = 255;
-			poly->verts->modulate[2] = 255;
-			poly->verts->modulate[3] = 255;
-		}
-		// done.
-		r_numpolys++;
-		r_numpolyverts += numVerts;
-
-		// if no world is loaded
-		if ( tr.world == NULL ) {
-			fogIndex = 0;
-		}
-		// see if it is in a fog volume
-		else if ( tr.world->numfogs == 1 ) {
-			fogIndex = 0;
-		} else {
-			// find which fog volume the poly is in
-			VectorCopy( poly->verts[0].xyz, bounds[0] );
-			VectorCopy( poly->verts[0].xyz, bounds[1] );
-			for ( i = 1 ; i < poly->numVerts ; i++ ) {
-				AddPointToBounds( poly->verts[i].xyz, bounds[0], bounds[1] );
-			}
-			for ( fogIndex = 1 ; fogIndex < tr.world->numfogs ; fogIndex++ ) {
-				fog = &tr.world->fogs[fogIndex]; 
-				if ( bounds[1][0] >= fog->bounds[0][0]
-					&& bounds[1][1] >= fog->bounds[0][1]
-					&& bounds[1][2] >= fog->bounds[0][2]
-					&& bounds[0][0] <= fog->bounds[1][0]
-					&& bounds[0][1] <= fog->bounds[1][1]
-					&& bounds[0][2] <= fog->bounds[1][2] ) {
-					break;
-				}
-			}
-			if ( fogIndex == tr.world->numfogs ) {
-				fogIndex = 0;
-			}
-		}
-		poly->fogIndex = fogIndex;
-	}
+	return qtrue;
 }
 
+/*
+=====================
+R_AddTerrainMarkSurfaces
+=====================
+*/
+void R_AddTerrainMarkSurfaces(void) {
+    srfMarkFragment_t* terMark;
+    int j;
+    shader_t* shader;
+
+    for (j = 0; j < tr.refdef.numTerMarks; j++)
+    {
+        terMark = &tr.refdef.terMarks[j];
+
+        shader = R_GetShaderByHandle(terMark->surfaceType);
+        terMark->surfaceType = SF_MARK_FRAG;
+        R_AddDrawSurf(&terMark->surfaceType, shader, 0);
+    }
+}
+
+/*
+=====================
+RE_AddTerrainMarkToScene
+=====================
+*/
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
+    srfMarkFragment_t* terMark;
+
+    if (!tr.registered) {
+        return;
+    }
+
+    if (numVerts + r_numpolyverts > max_polyverts || r_numtermarks >= max_termarks) {
+        ri.Printf(PRINT_WARNING, "Exceeded MAX TERRAIN MARKS\n");
+        return;
+    }
+
+    terMark = &backEndData[tr.smpFrame]->terMarks[r_numtermarks];
+    terMark->surfaceType = hShader;
+    terMark->iIndex = iTerrainIndex;
+    terMark->numVerts = numVerts;
+    terMark->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
+    memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
+
+    r_numtermarks++;
+    r_numpolyverts += numVerts;
+}
 
 //=================================================================================
 
+/*
+=====================
+RE_GetRenderEntity
+=====================
+*/
+refEntity_t* RE_GetRenderEntity(int entityNumber) {
+    int i;
+
+    for (i = 0; i < r_numentities; i++) {
+        if (backEndData[0]->entities[i].e.entityNumber == entityNumber) {
+            return &backEndData[0]->entities[i].e;
+        }
+    }
+
+    return NULL;
+}
 
 /*
 =====================
@@ -196,32 +232,77 @@ RE_AddRefEntityToScene
 
 =====================
 */
-void RE_AddRefEntityToScene( const refEntity_t *ent ) {
+void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber) {
 	if ( !tr.registered ) {
 		return;
 	}
-	if ( r_numentities >= MAX_REFENTITIES ) {
-		ri.Printf(PRINT_DEVELOPER, "RE_AddRefEntityToScene: Dropping refEntity, reached MAX_REFENTITIES\n");
+  // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=402
+	if ( r_numentities >= ENTITYNUM_WORLD ) {
 		return;
 	}
-	if ( Q_isnan(ent->origin[0]) || Q_isnan(ent->origin[1]) || Q_isnan(ent->origin[2]) ) {
-		static qboolean firstTime = qtrue;
-		if (firstTime) {
-			firstTime = qfalse;
-			ri.Printf( PRINT_WARNING, "RE_AddRefEntityToScene passed a refEntity which has an origin with a NaN component\n");
-		}
-		return;
-	}
-	if ( (int)ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
+	if ( ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
 		ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType );
 	}
 
-	backEndData->entities[r_numentities].e = *ent;
-	backEndData->entities[r_numentities].lightingCalculated = qfalse;
+	backEndData[tr.smpFrame]->entities[r_numentities].e = *ent;
+	backEndData[tr.smpFrame]->entities[r_numentities].bLightGridCalculated = qfalse;
+	backEndData[tr.smpFrame]->entities[r_numentities].sphereCalculated = qfalse;
+
+	if (parentEntityNumber != ENTITYNUM_NONE)
+	{
+		int i;
+
+		//
+		// Find the parent entity to attach to
+		//
+		for (i = r_firstSceneEntity; i < r_numentities; i++)
+		{
+			if (backEndData[tr.smpFrame]->entities[i].e.entityNumber == parentEntityNumber)
+			{
+				backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = i - r_firstSceneEntity;
+				break;
+			}
+		}
+
+		if (i == r_numentities) {
+			backEndData[tr.smpFrame]->entities[i].e.parentEntity = ENTITYNUM_NONE;
+		}
+	}
+	else
+	{
+		backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = ENTITYNUM_NONE;
+	}
 
 	r_numentities++;
 }
 
+void RE_AddRefSpriteToScene(const refEntity_t* ent) {
+	refSprite_t* spr;
+	int i;
+
+	if (!tr.registered) {
+		return;
+	}
+
+	if (r_numsprites >= MAX_SPRITES) {
+		return;
+	}
+
+	spr = &backEndData[tr.smpFrame]->sprites[r_numsprites];
+	VectorCopy(ent->origin, spr->origin);
+	spr->surftype = SF_SPRITE;
+    spr->hModel = ent->hModel;
+    spr->scale = ent->scale;
+    spr->renderfx = ent->renderfx;
+    spr->shaderTime = ent->shaderTime;
+	AxisCopy(ent->axis, spr->axis);
+
+	for (i = 0; i < 4; ++i) {
+		spr->shaderRGBA[i] = ent->shaderRGBA[i];
+	}
+
+    ++r_numsprites;
+}
 
 /*
 =====================
@@ -229,7 +310,7 @@ RE_AddDynamicLightToScene
 
 =====================
 */
-void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, float g, float b, int additive ) {
+void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
 	dlight_t	*dl;
 
 	if ( !tr.registered ) {
@@ -241,17 +322,13 @@ void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, floa
 	if ( intensity <= 0 ) {
 		return;
 	}
-	// these cards don't have the correct blend mode
-	if ( glConfig.hardwareType == GLHW_RIVA128 || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		return;
-	}
-	dl = &backEndData->dlights[r_numdlights++];
+	dl = &backEndData[tr.smpFrame]->dlights[r_numdlights++];
 	VectorCopy (org, dl->origin);
 	dl->radius = intensity;
 	dl->color[0] = r;
 	dl->color[1] = g;
 	dl->color[2] = b;
-	dl->additive = additive;
+	dl->type = type;
 }
 
 /*
@@ -260,8 +337,93 @@ RE_AddLightToScene
 
 =====================
 */
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b ) {
-	RE_AddDynamicLightToScene( org, intensity, r, g, b, qfalse );
+void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
+	RE_AddDynamicLightToScene( org, intensity, r, g, b, type );
+}
+
+/*
+=====================
+R_AddLightGridSurfacesToScene
+
+Draw small dots to make a grid.
+A dot matches the calculated color of the light at its location
+=====================
+*/
+void R_AddLightGridSurfacesToScene() {
+    vec3_t vMin, vMax;
+    vec3_t vPos;
+    vec3_t vLight;
+    int i;
+    qhandle_t hShader;
+    polyVert_t verts[4];
+
+    if (!tr.world) {
+        return;
+    }
+    if (!tr.world->lightGridData) {
+        return;
+    }
+    if (!tr.world->lightGridOffsets) {
+        return;
+    }
+
+    hShader = RE_RegisterShader("showgrid");
+    R_GetShaderByHandle(hShader);
+
+    for (i = 0; i < 3; i++) {
+        vMin[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] - 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
+        vMax[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] + 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
+    }
+
+    for (vPos[2] = vMin[2]; vPos[2] < vMax[2]; vPos[2] += tr.world->lightGridSize[2]) {
+        for (vPos[1] = vMin[1]; vPos[1] < vMax[1]; vPos[1] += tr.world->lightGridSize[1]) {
+            for (vPos[0] = vMin[0]; vPos[0] < vMax[0]; vPos[0] += tr.world->lightGridSize[0]) {
+                R_GetLightingGridValueFast(vPos, vLight);
+
+                verts[0].xyz[0] = vPos[0] - 2.0;
+                verts[0].xyz[1] = vPos[1] - 2.0;
+                verts[0].xyz[2] = vPos[2];
+                verts[0].st[0] = 0.0;
+                verts[0].st[1] = 0.0;
+                verts[0].modulate[0] = vLight[0];
+                verts[0].modulate[1] = vLight[1];
+                verts[0].modulate[2] = vLight[2];
+                verts[0].modulate[3] = 0xff;
+
+                verts[1].xyz[0] = vPos[0] + 2.0;
+                verts[1].xyz[1] = vPos[1] - 2.0;
+                verts[1].xyz[2] = vPos[2];
+                verts[1].st[0] = 0.0;
+                verts[1].st[1] = 1.0;
+                verts[1].modulate[0] = vLight[0];
+                verts[1].modulate[1] = vLight[1];
+                verts[1].modulate[2] = vLight[2];
+                verts[1].modulate[3] = 0xff;
+
+                verts[2].xyz[0] = vPos[0] + 2.0;
+                verts[2].xyz[1] = vPos[1] + 2.0;
+                verts[2].xyz[2] = vPos[2];
+                verts[2].st[0] = 1.0;
+                verts[2].st[1] = 1.0;
+                verts[2].modulate[0] = vLight[0];
+                verts[2].modulate[1] = vLight[1];
+                verts[2].modulate[2] = vLight[2];
+                verts[2].modulate[3] = 0xff;
+
+                verts[3].xyz[0] = vPos[0] - 2.0;
+                verts[3].xyz[1] = vPos[1] + 2.0;
+                verts[3].xyz[2] = vPos[2];
+                verts[3].st[0] = 1.0;
+                verts[3].st[1] = 0.0;
+                verts[3].modulate[0] = vLight[0];
+                verts[3].modulate[1] = vLight[1];
+                verts[3].modulate[2] = vLight[2];
+                verts[3].modulate[3] = 0xff;
+
+                RE_AddPolyToScene(hShader, 4, verts, 0);
+            }
+        }
+    }
 }
 
 /*
@@ -304,8 +466,14 @@ void RE_RenderScene( const refdef_t *fd ) {
 		ri.Error (ERR_DROP, "R_RenderScene: NULL worldmodel");
 	}
 
-	Com_Memcpy( tr.refdef.text, fd->text, sizeof( tr.refdef.text ) );
+	if (r_light_showgrid->integer) {
+		R_AddLightGridSurfacesToScene();
+	}
 
+	R_VisDebug();
+	TIKI_Reset_Caches();
+
+	backEnd.in2D = qfalse;
 	tr.refdef.x = fd->x;
 	tr.refdef.y = fd->y;
 	tr.refdef.width = fd->width;
@@ -341,28 +509,45 @@ void RE_RenderScene( const refdef_t *fd ) {
 		}
 	}
 
+	// copy the sky data
+	tr.refdef.sky_alpha = fd->sky_alpha;
+	tr.refdef.sky_portal = fd->sky_portal;
+
+	VectorCopy(fd->sky_origin, tr.refdef.sky_origin);
+	VectorCopy(fd->sky_axis[0], tr.refdef.sky_axis[0]);
+	VectorCopy(fd->sky_axis[1], tr.refdef.sky_axis[1]);
+	VectorCopy(fd->sky_axis[2], tr.refdef.sky_axis[2]);
 
 	// derived info
 
-	tr.refdef.floatTime = tr.refdef.time * 0.001;
+	tr.refdef.floatTime = tr.refdef.time * 0.001f;
 
 	tr.refdef.numDrawSurfs = r_firstSceneDrawSurf;
-	tr.refdef.drawSurfs = backEndData->drawSurfs;
+	tr.refdef.drawSurfs = backEndData[tr.smpFrame]->drawSurfs;
+
+    tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
+    tr.refdef.spriteSurfs = backEndData[tr.smpFrame]->spriteSurfs;
 
 	tr.refdef.num_entities = r_numentities - r_firstSceneEntity;
-	tr.refdef.entities = &backEndData->entities[r_firstSceneEntity];
+	tr.refdef.entities = &backEndData[tr.smpFrame]->entities[r_firstSceneEntity];
+
+	tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
+	tr.refdef.sprites = &backEndData[tr.smpFrame]->sprites[r_firstSceneSprite];
 
 	tr.refdef.num_dlights = r_numdlights - r_firstSceneDlight;
-	tr.refdef.dlights = &backEndData->dlights[r_firstSceneDlight];
+	tr.refdef.dlights = &backEndData[tr.smpFrame]->dlights[r_firstSceneDlight];
+
+	tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
+	tr.refdef.terMarks = &backEndData[tr.smpFrame]->terMarks[r_firstSceneTerMark];
 
 	tr.refdef.numPolys = r_numpolys - r_firstScenePoly;
-	tr.refdef.polys = &backEndData->polys[r_firstScenePoly];
+	tr.refdef.polys = &backEndData[tr.smpFrame]->polys[r_firstScenePoly];
+
+	backEndData[tr.smpFrame]->staticModelData = tr.refdef.staticModelData;
 
 	// turn off dynamic lighting globally by clearing all the
 	// dlights if it needs to be disabled or if vertex lighting is enabled
-	if ( r_dynamiclight->integer == 0 ||
-		 r_vertexLight->integer == 1 ||
-		 glConfig.hardwareType == GLHW_PERMEDIA2 ) {
+	if (r_vertexLight->integer == 1 ) {
 		tr.refdef.num_dlights = 0;
 	}
 
@@ -380,6 +565,8 @@ void RE_RenderScene( const refdef_t *fd ) {
 	// The refdef takes 0-at-the-top y coordinates, so
 	// convert to GL's 0-at-the-bottom space
 	//
+	tr.skyRendered = qfalse;
+	tr.portalRendered = qfalse;
 	Com_Memset( &parms, 0, sizeof( parms ) );
 	parms.viewportX = tr.refdef.x;
 	parms.viewportY = glConfig.vidHeight - ( tr.refdef.y + tr.refdef.height );
@@ -389,22 +576,81 @@ void RE_RenderScene( const refdef_t *fd ) {
 
 	parms.fovX = tr.refdef.fov_x;
 	parms.fovY = tr.refdef.fov_y;
-	
-	parms.stereoFrame = tr.refdef.stereoFrame;
 
-	VectorCopy( fd->vieworg, parms.or.origin );
-	VectorCopy( fd->viewaxis[0], parms.or.axis[0] );
-	VectorCopy( fd->viewaxis[1], parms.or.axis[1] );
-	VectorCopy( fd->viewaxis[2], parms.or.axis[2] );
+	VectorCopy( fd->vieworg, parms.ori.origin );
+	VectorCopy( fd->viewaxis[0], parms.ori.axis[0] );
+	VectorCopy( fd->viewaxis[1], parms.ori.axis[1] );
+	VectorCopy( fd->viewaxis[2], parms.ori.axis[2] );
 
 	VectorCopy( fd->vieworg, parms.pvsOrigin );
 
+	// copy the farplane data
+	parms.farplane_distance = fd->farplane_distance;
+	parms.farplane_bias = fd->farplane_bias;
+	parms.farplane_color[0] = fd->farplane_color[0];
+	parms.farplane_color[1] = fd->farplane_color[1];
+	parms.farplane_color[2] = fd->farplane_color[2];
+	parms.farplane_cull = fd->farplane_cull;
+	parms.renderTerrain = fd->renderTerrain;
+
+	tr.refdef.skybox_farplane = fd->skybox_farplane;
+	tr.refdef.render_terrain = parms.renderTerrain;
+
+	if (fd->farclipOverride >= 15900 || fd->farclipOverride <= -0.99) {
+		tr.farclip = 0;
+	} else {
+		tr.farclip = r_farclip->integer;
+		if (!tr.farclip && (r_picmip->integer > 1 || r_colorbits->integer == 16)) {
+			tr.farclip = 2800;
+		}
+	}
+
+	if (tr.farclip) {
+        if (fd->farclipOverride != 0) {
+            parms.farplane_distance = fd->farclipOverride;
+		} else {
+			parms.farplane_distance = tr.farclip;
+		}
+
+		if (fd->farplane_color[0] >= 0 && fd->farplane_color[1] >= 0 && fd->farplane_color[2] >= 0) {
+            parms.farplane_color[0] = fd->farplane_color[0];
+            parms.farplane_color[1] = fd->farplane_color[1];
+            parms.farplane_color[2] = fd->farplane_color[2];
+		}
+
+		if (fd->farplaneColorOverride[0] >= 0 && fd->farplaneColorOverride[1] >= 0 && fd->farplaneColorOverride[2] >= 0) {
+			parms.farplane_color[0] = fd->farplaneColorOverride[0];
+			parms.farplane_color[1] = fd->farplaneColorOverride[1];
+			parms.farplane_color[2] = fd->farplaneColorOverride[2];
+		}
+
+		parms.farplane_cull = qtrue;
+
+        if (fd->farplane_distance > 0 && fd->farplane_distance < parms.farplane_distance) {
+            parms.farplane_distance = fd->farplane_distance;
+		} else {
+			if (fd->farplane_bias == 0) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else if (fd->farplane_distance <= 500.f) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else {
+				parms.farplane_bias = parms.farplane_distance / fd->farplane_distance;
+			}
+		}
+	} else if (parms.farplane_bias == 0) {
+		parms.farplane_bias = parms.farplane_distance * 0.18f;
+	}
+
+	R_ClearRealDlights();
 	R_RenderView( &parms );
 
 	// the next scene rendered in this frame will tack on after this one
 	r_firstSceneDrawSurf = tr.refdef.numDrawSurfs;
+	r_firstSceneSpriteSurf = tr.refdef.numSpriteSurfs;
 	r_firstSceneEntity = r_numentities;
+	r_firstSceneSprite = r_numsprites;
 	r_firstSceneDlight = r_numdlights;
+	r_firstSceneTerMark = r_numtermarks;
 	r_firstScenePoly = r_numpolys;
 
 	tr.frontEndMsec += ri.Milliseconds() - startTime;
diff --git a/code/renderergl1/tr_shade.c b/code/renderergl1/tr_shade.c
index 7ea78d13..af653548 100644
--- a/code/renderergl1/tr_shade.c
+++ b/code/renderergl1/tr_shade.c
@@ -15,13 +15,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_shade.c
 
-#include "tr_local.h" 
+#include "tr_local.h"
 
 /*
 
@@ -160,7 +160,7 @@ instead of using the single glDrawElements call that may be inefficient
 without compiled vertex arrays.
 ==================
 */
-void R_DrawElements( int numIndexes, const glIndex_t *indexes ) {
+static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) {
 	int		primitives;
 
 	primitives = r_primitives->integer;
@@ -215,35 +215,28 @@ R_BindAnimatedImage
 =================
 */
 static void R_BindAnimatedImage( textureBundle_t *bundle ) {
-	int64_t index;
+	int index;
 
-	if ( bundle->isVideoMap ) {
-		ri.CIN_RunCinematic(bundle->videoMapHandle);
-		ri.CIN_UploadCinematic(bundle->videoMapHandle);
-		return;
-	}
-
-	if ( bundle->numImageAnimations <= 1 ) {
-		GL_Bind( bundle->image[0] );
+	if (bundle->numImageAnimations <= 1) {
+		GL_Bind(bundle->image[0]);
 		return;
 	}
 
 	// it is necessary to do this messy calc to make sure animations line up
 	// exactly with waveforms of the same frequency
-	index = tess.shaderTime * bundle->imageAnimationSpeed * FUNCTABLE_SIZE;
+	index = myftol((tess.shaderTime + bundle->imageAnimationPhase) * bundle->imageAnimationSpeed * FUNCTABLE_SIZE);
 	index >>= FUNCTABLE_SIZE2;
 
-	if ( index < 0 ) {
+	if (index < 0) {
 		index = 0;	// may happen with shader time offsets
 	}
-
-	// Windows x86 doesn't load renderer DLL with 64 bit modulus
-	//index %= bundle->numImageAnimations;
-	while ( index >= bundle->numImageAnimations ) {
-		index -= bundle->numImageAnimations;
+	if (!(bundle->flags & BUNDLE_ANIMATE_ONCE)) {
+		index %= bundle->numImageAnimations;
+	} else if (index >= bundle->numImageAnimations) {
+		index = bundle->numImageAnimations - 1;
 	}
 
-	GL_Bind( bundle->image[ index ] );
+	GL_Bind(bundle->image[index]);
 }
 
 /*
@@ -253,33 +246,83 @@ DrawTris
 Draws triangle outlines for debugging
 ================
 */
-static void DrawTris (shaderCommands_t *input) {
+static void DrawTris (shaderCommands_t *input, int flags) {
 	GL_Bind( tr.whiteImage );
 	qglColor3f (1,1,1);
 
-	GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE );
-	qglDepthRange( 0, 0 );
-
-	qglDisableClientState (GL_COLOR_ARRAY);
-	qglDisableClientState (GL_TEXTURE_COORD_ARRAY);
-
-	qglVertexPointer (3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
-
-	if (qglLockArraysEXT) {
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
+	if (flags == 1) {
+		GL_State(GLS_POLYMODE_LINE);
+	} else {
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+        qglDepthRange(0, 0);
 	}
 
-	R_DrawElements( input->numIndexes, input->indexes );
+	if (flags < 3) {
+		qglDisableClientState(GL_COLOR_ARRAY);
+		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+		qglVertexPointer(3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
+
+		if (qglLockArraysEXT) {
+			qglLockArraysEXT(0, input->numVertexes);
+			GLimp_LogComment("glLockArraysEXT\n");
+		}
+
+		R_DrawElements(input->numIndexes, input->indexes);
+
+		if (qglUnlockArraysEXT) {
+			qglUnlockArraysEXT();
+			GLimp_LogComment("glUnlockArraysEXT\n");
+		}
+		qglDepthRange(0, 1);
+	}
+
+	if (flags > 1) {
+		vec3_t start, end;
+
+        start[1] = start[0] = 0.0;
+		end[1] = end[0] = 0.0;
+
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+        qglDepthRange(0, 0);
+
+        qglDisable(GL_TEXTURE_2D);
+        qglBegin(GL_LINES);
+
+        qglColor4f(1.0, 0.0, 0.0, 1.0);
+
+        start[2] = 0.0 - 5.0;
+        end[2] = 0.0 + 5.0;
+        qglVertex3fv(start);
+        qglVertex3fv(end);
+
+        qglColor4f(0.0, 1.0, 0.0, 1.0);
+
+        start[2] = start[2] + 5.0;
+        end[2] = end[2] - 5.0;
+        start[1] = start[1] - 5.0;
+        end[1] = end[1] + 5.0;
+        qglVertex3fv(start);
+        qglVertex3fv(end);
+
+        qglColor4f(0.0, 0.0, 1.0, 1.0);
+
+        start[1] = start[1] + 5.0;
+        start[0] = start[0] - 5.0;
+        end[0] = end[0] + 5.0;
+        qglVertex3fv(start);
+        qglVertex3fv(end);
+
+        start[0] = start[0] + 5.0;
+        end[0] = end[0] - 5.0;
+
+        qglEnd();
+        qglEnable(GL_TEXTURE_2D);
+        qglDepthRange(0.0, 1.0);
 
-	if (qglUnlockArraysEXT) {
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
 	}
-	qglDepthRange( 0, 1 );
 }
 
-
 /*
 ================
 DrawNormals
@@ -316,24 +359,15 @@ because a surface may be forced to perform a RB_End due
 to overflow.
 ==============
 */
-void RB_BeginSurface( shader_t *shader, int fogNum ) {
-
-	shader_t *state = (shader->remappedShader) ? shader->remappedShader : shader;
-
+void RB_BeginSurface( shader_t *shader ) {
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
-	tess.shader = state;
-	tess.fogNum = fogNum;
+	tess.shader = shader;
 	tess.dlightBits = 0;		// will be OR'd in by surface functions
-	tess.xstages = state->stages;
-	tess.numPasses = state->numUnfoggedPasses;
-	tess.currentStageIteratorFunc = state->optimalStageIteratorFunc;
-
-	tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-	if (tess.shader->clampTime && tess.shaderTime >= tess.shader->clampTime) {
-		tess.shaderTime = tess.shader->clampTime;
-	}
-
+	tess.vertexColorValid = r_vertexLight->integer != 0;
+	tess.xstages = shader->unfoggedStages;
+	tess.numPasses = shader->numUnfoggedPasses;
+	tess.currentStageIteratorFunc = shader->optimalStageIteratorFunc;
 
 }
 
@@ -367,6 +401,40 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) {
 	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] );
 	R_BindAnimatedImage( &pStage->bundle[0] );
 
+/*
+	// was removed since 2.0
+	if (pStage->stateBits & GLS_MULTITEXTURE_ENV)
+	{
+		glState.cntnvblendmode = pStage->multitextureEnv;
+		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
+
+		if (pStage->multitextureEnv == GL_ADD)
+		{
+			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_ADD);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_ONE_MINUS_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE1);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE3_RGB, 0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND3_RGB, GL_ONE_MINUS_SRC_COLOR);
+		}
+		else if (pStage->multitextureEnv == GL_MODULATE)
+		{
+			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE1);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
+		}
+		else
+		{
+			ri.Printf(3, "Unknown MT mode for: %s\n", input->shader);
+		}
+	}
+*/
+
 	//
 	// lightmap/secondary pass
 	//
@@ -374,23 +442,41 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) {
 	qglEnable( GL_TEXTURE_2D );
 	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
 
-	if ( r_lightmap->integer ) {
+	if ( r_lightmap->integer && pStage->bundle[1].isLightmap ) {
 		GL_TexEnv( GL_REPLACE );
+/*
+	// was removed since 2.0
+	} else if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
+		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
+
+		GL_TexEnv(GL_COMBINE);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_SRC_ALPHA);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
+*/
 	} else {
-		GL_TexEnv( tess.shader->multitextureEnv );
+		GL_TexEnv( pStage->multitextureEnv );
 	}
 
 	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[1] );
 
-	R_BindAnimatedImage( &pStage->bundle[1] );
+	if (!input->dlightMap || !pStage->bundle[1].isLightmap) {
+		R_BindAnimatedImage(&pStage->bundle[1]);
+	} else {
+		GL_Bind(tr.dlightImages[input->dlightMap - 1]);
+	}
 
 	R_DrawElements( input->numIndexes, input->indexes );
 
+	qglDisable(GL_TEXTURE_2D);
 	//
 	// disable texturing on TEXTURE1, then select TEXTURE0
 	//
-	//qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-	qglDisable( GL_TEXTURE_2D );
+	qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	GL_SelectTexture( 0 );
 }
@@ -404,114 +490,208 @@ ProjectDlightTexture
 Perform dynamic lighting with another rendering pass
 ===================
 */
-static void ProjectDlightTexture_scalar( void ) {
+static void ProjectDlightTexture( void ) {
 	int		i, l;
+#if idppc_altivec
+	vec_t	origin0, origin1, origin2;
+	float   texCoords0, texCoords1;
+	vector float floatColorVec0, floatColorVec1;
+	vector float modulateVec, colorVec, zero;
+	vector short colorShort;
+	vector signed int colorInt;
+	vector unsigned char floatColorVecPerm, modulatePerm, colorChar;
+	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff);
+#else
 	vec3_t	origin;
+	vec3_t	normal;
+#endif
 	float	*texCoords;
 	byte	*colors;
 	byte	clipBits[SHADER_MAX_VERTEXES];
-	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
+	MAC_STATIC float	texCoordsArray[SHADER_MAX_VERTEXES][2];
 	byte	colorArray[SHADER_MAX_VERTEXES][4];
-	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
+	unsigned	hitIndexes[SHADER_MAX_INDEXES];
 	int		numIndexes;
+	int		planetype;
 	float	scale;
 	float	radius;
 	vec3_t	floatColor;
-	float	modulate = 0.0f;
+	float	modulate;
 
 	if ( !backEnd.refdef.num_dlights ) {
 		return;
 	}
 
+#if idppc_altivec
+	// There has to be a better way to do this so that floatColor 
+	// and/or modulate are already 16-byte aligned.
+	floatColorVecPerm = vec_lvsl(0,(float *)floatColor);
+	modulatePerm = vec_lvsl(0,(float *)&modulate);
+	modulatePerm = (vector unsigned char)vec_splat((vector unsigned int)modulatePerm,0);
+	zero = (vector float)vec_splat_s8(0);
+#endif
+
 	for ( l = 0 ; l < backEnd.refdef.num_dlights ; l++ ) {
 		dlight_t	*dl;
 
 		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
-			continue;	// this surface definitely doesn't have any of this light
+			continue;	// this surface definately doesn't have any of this light
 		}
 		texCoords = texCoordsArray[0];
 		colors = colorArray[0];
 
 		dl = &backEnd.refdef.dlights[l];
+#if idppc_altivec
+		origin0 = dl->transformed[0];
+		origin1 = dl->transformed[1];
+		origin2 = dl->transformed[2];
+#else
 		VectorCopy( dl->transformed, origin );
-		radius = dl->radius;
-		scale = 1.0f / radius;
-
-		if(r_greyscale->integer)
-		{
-			float luminance;
-
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = floatColor[1] = floatColor[2] = luminance;
-		}
-		else if(r_greyscale->value)
-		{
-			float luminance;
-			
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = LERP(dl->color[0] * 255.0f, luminance, r_greyscale->value);
-			floatColor[1] = LERP(dl->color[1] * 255.0f, luminance, r_greyscale->value);
-			floatColor[2] = LERP(dl->color[2] * 255.0f, luminance, r_greyscale->value);
-		}
-		else
-		{
-			floatColor[0] = dl->color[0] * 255.0f;
-			floatColor[1] = dl->color[1] * 255.0f;
-			floatColor[2] = dl->color[2] * 255.0f;
-		}
+#endif
+		radius = dl->radius * 1.75f;
+		scale = 1.75f / radius;
 
+		floatColor[0] = dl->color[0] * 255.0f;
+		floatColor[1] = dl->color[1] * 255.0f;
+		floatColor[2] = dl->color[2] * 255.0f;
+#if idppc_altivec
+		floatColorVec0 = vec_ld(0, floatColor);
+		floatColorVec1 = vec_ld(11, floatColor);
+		floatColorVec0 = vec_perm(floatColorVec0,floatColorVec0,floatColorVecPerm);
+#endif
 		for ( i = 0 ; i < tess.numVertexes ; i++, texCoords += 2, colors += 4 ) {
-			int		clip = 0;
+#if idppc_altivec
+			vec_t dist0, dist1, dist2;
+#else
 			vec3_t	dist;
-			
-			VectorSubtract( origin, tess.xyz[i], dist );
+#endif
+			float	vertdist;
+			int		clip;
 
 			backEnd.pc.c_dlightVertexes++;
 
-			texCoords[0] = 0.5f + dist[0] * scale;
-			texCoords[1] = 0.5f + dist[1] * scale;
+#if idppc_altivec
+			//VectorSubtract( origin, tess.xyz[i], dist );
+			dist0 = origin0 - tess.xyz[i][0];
+			dist1 = origin1 - tess.xyz[i][1];
+			dist2 = origin2 - tess.xyz[i][2];
+			texCoords0 = 0.5f + dist0 * scale;
+			texCoords1 = 0.5f + dist1 * scale;
 
-			if( !r_dlightBacks->integer &&
-					// dist . tess.normal[i]
-					( dist[0] * tess.normal[i][0] +
-					dist[1] * tess.normal[i][1] +
-					dist[2] * tess.normal[i][2] ) < 0.0f ) {
-				clip = 63;
+			clip = 0;
+			if ( texCoords0 < 0.0f ) {
+				clip |= 1;
+			} else if ( texCoords0 > 1.0f ) {
+				clip |= 2;
+			}
+			if ( texCoords1 < 0.0f ) {
+				clip |= 4;
+			} else if ( texCoords1 > 1.0f ) {
+				clip |= 8;
+			}
+			texCoords[0] = texCoords0;
+			texCoords[1] = texCoords1;
+			
+			// modulate the strength based on the height and color
+			if ( dist2 > radius ) {
+				clip |= 16;
+				modulate = 0.0f;
+			} else if ( dist2 < -radius ) {
+				clip |= 32;
+				modulate = 0.0f;
 			} else {
-				if ( texCoords[0] < 0.0f ) {
-					clip |= 1;
-				} else if ( texCoords[0] > 1.0f ) {
-					clip |= 2;
-				}
-				if ( texCoords[1] < 0.0f ) {
-					clip |= 4;
-				} else if ( texCoords[1] > 1.0f ) {
-					clip |= 8;
-				}
-				texCoords[0] = texCoords[0];
-				texCoords[1] = texCoords[1];
-
-				// modulate the strength based on the height and color
-				if ( dist[2] > radius ) {
-					clip |= 16;
-					modulate = 0.0f;
-				} else if ( dist[2] < -radius ) {
-					clip |= 32;
-					modulate = 0.0f;
+				dist2 = Q_fabs(dist2);
+				if ( dist2 < radius * 0.5f ) {
+					modulate = 1.0f;
 				} else {
-					dist[2] = Q_fabs(dist[2]);
-					if ( dist[2] < radius * 0.5f ) {
-						modulate = 1.0f;
-					} else {
-						modulate = 2.0f * (radius - dist[2]) * scale;
-					}
+					modulate = 2.0f * (radius - dist2) * scale;
 				}
 			}
 			clipBits[i] = clip;
-			colors[0] = ri.ftol(floatColor[0] * modulate);
-			colors[1] = ri.ftol(floatColor[1] * modulate);
-			colors[2] = ri.ftol(floatColor[2] * modulate);
+
+			modulateVec = vec_ld(0,(float *)&modulate);
+			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
+			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
+			colorInt = vec_cts(colorVec,0);	// RGBx
+			colorShort = vec_pack(colorInt,colorInt);		// RGBxRGBx
+			colorChar = vec_packsu(colorShort,colorShort);	// RGBxRGBxRGBxRGBx
+			colorChar = vec_sel(colorChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
+			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
+#else
+			VectorCopy(tess.normal[i], normal);
+
+			if (fabs(normal[0]) > fabs(normal[1])) {
+				if (fabs(normal[2]) < fabs(normal[0])) {
+					planetype = 0;
+				} else {
+					planetype = 1;
+				}
+			} else {
+				if (fabs(normal[2]) < fabs(normal[1])) {
+					planetype = 1;
+				}
+				else {
+					planetype = 2;
+				}
+			}
+
+			VectorSubtract( origin, tess.xyz[i], dist );
+			if (planetype == 0)
+			{
+				texCoords[0] = 0.5f + dist[1] * scale;
+				texCoords[1] = 0.5f + dist[2] * scale;
+			}
+			else if (planetype == 1)
+			{
+				texCoords[0] = 0.5f + dist[0] * scale;
+				texCoords[1] = 0.5f + dist[2] * scale;
+			}
+			else
+			{
+				texCoords[0] = 0.5f + dist[0] * scale;
+				texCoords[1] = 0.5f + dist[1] * scale;
+			}
+
+			vertdist = DotProduct(dist, normal);
+			clip = 0;
+			if ( texCoords[0] < 0.0f ) {
+				clip |= 1;
+			} else if ( texCoords[0] > 1.0f ) {
+				clip |= 2;
+			}
+			if ( texCoords[1] < 0.0f ) {
+				clip |= 4;
+			} else if ( texCoords[1] > 1.0f ) {
+				clip |= 8;
+			}
+			// modulate the strength based on the height and color
+			if (vertdist > radius) {
+				clip |= 16;
+				modulate = 0.0f;
+			}
+			else if (vertdist < -radius) {
+				clip |= 32;
+				modulate = 0.0f;
+			}
+			else {
+				dist[2] = Q_fabs(dist[2]);
+				if (dist[2] < radius * 0.5f) {
+					modulate = 1.0f;
+				}
+				else {
+					modulate = 2.0f * (radius - dist[2]) * scale;
+				}
+			}
+			clipBits[i] = clip;
+
+			colors[0] = myftol(floatColor[0] * modulate);
+			colors[1] = myftol(floatColor[1] * modulate);
+			colors[2] = myftol(floatColor[2] * modulate);
 			colors[3] = 255;
+#endif
 		}
 
 		// build a list of triangles that need light
@@ -535,16 +715,15 @@ static void ProjectDlightTexture_scalar( void ) {
 			continue;
 		}
 
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-		qglTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] );
-
-		qglEnableClientState( GL_COLOR_ARRAY );
-		qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray );
+		qglEnableClientState(GL_COLOR_ARRAY);
+		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
+		qglTexCoordPointer(2, GL_FLOAT, 0, texCoordsArray[0]);
 
 		GL_Bind( tr.dlightImage );
 		// include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light
 		// where they aren't rendered
-		if ( dl->additive ) {
+		if ( dl->type & additive) {
 			GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
 		}
 		else {
@@ -556,54 +735,6 @@ static void ProjectDlightTexture_scalar( void ) {
 	}
 }
 
-static void ProjectDlightTexture( void ) {
-#if idppc_altivec
-	if (com_altivec->integer) {
-		// must be in a separate translation unit or G3 systems will crash.
-		ProjectDlightTexture_altivec();
-		return;
-	}
-#endif
-	ProjectDlightTexture_scalar();
-}
-
-
-/*
-===================
-RB_FogPass
-
-Blends a fog texture on top of everything else
-===================
-*/
-static void RB_FogPass( void ) {
-	fog_t		*fog;
-	int			i;
-
-	qglEnableClientState( GL_COLOR_ARRAY );
-	qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors );
-
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY);
-	qglTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] );
-
-	fog = tr.world->fogs + tess.fogNum;
-
-	for ( i = 0; i < tess.numVertexes; i++ ) {
-		* ( int * )&tess.svars.colors[i] = fog->colorInt;
-	}
-
-	RB_CalcFogTexCoords( ( float * ) tess.svars.texcoords[0] );
-
-	GL_Bind( tr.fogImage );
-
-	if ( tess.shader->fogPass == FP_EQUAL ) {
-		GL_State( GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_DEPTHFUNC_EQUAL );
-	} else {
-		GL_State( GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA );
-	}
-
-	R_DrawElements( tess.numIndexes, tess.indexes );
-}
-
 /*
 ===============
 ComputeColors
@@ -625,25 +756,51 @@ static void ComputeColors( shaderStage_t *pStage )
 		case CGEN_IDENTITY_LIGHTING:
 			Com_Memset( tess.svars.colors, tr.identityLightByte, tess.numVertexes * 4 );
 			break;
-		case CGEN_LIGHTING_DIFFUSE:
-			RB_CalcDiffuseColor( ( unsigned char * ) tess.svars.colors );
+		case CGEN_ENTITY:
+			RB_CalcColorFromEntity((unsigned char*)tess.svars.colors);
+			break;
+		case CGEN_ONE_MINUS_ENTITY:
+			RB_CalcColorFromOneMinusEntity((unsigned char*)tess.svars.colors);
 			break;
 		case CGEN_EXACT_VERTEX:
+			if (!tess.vertexColorValid) {
+				static qboolean bWarned = qfalse;
+
+				if (!bWarned) {
+					// mohta and mohtt shows the warning once
+                    bWarned = qtrue;
+
+                    ri.Printf(
+                        PRINT_WARNING,
+                        "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
+                        tess.shader->name
+					);
+				}
+				break;
+			}
 			Com_Memcpy( tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof( tess.vertexColors[0] ) );
 			break;
-		case CGEN_CONST:
-			for ( i = 0; i < tess.numVertexes; i++ ) {
-				*(int *)tess.svars.colors[i] = *(int *)pStage->constantColor;
-			}
-			break;
 		case CGEN_VERTEX:
-			if ( tr.identityLight == 1 )
+            if (!tess.vertexColorValid) {
+                static qboolean bWarned = qfalse;
+
+				if (!bWarned) {
+					bWarned = qtrue;
+
+					ri.Printf(
+						PRINT_WARNING,
+						"Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
+						tess.shader->name);
+				}
+				break;
+			}
+			if (tr.identityLight == 1)
 			{
-				Com_Memcpy( tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof( tess.vertexColors[0] ) );
+				Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
 			}
 			else
 			{
-				for ( i = 0; i < tess.numVertexes; i++ )
+				for (i = 0; i < tess.numVertexes; i++)
 				{
 					tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
 					tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
@@ -672,25 +829,148 @@ static void ComputeColors( shaderStage_t *pStage )
 				}
 			}
 			break;
-		case CGEN_FOG:
+		case CGEN_WAVEFORM:
+			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, NULL);
+			break;
+		case CGEN_MULTIPLY_BY_WAVEFORM:
+			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, pStage->colorConst);
+			break;
+		case CGEN_LIGHTING_GRID:
+			RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
+			break;
+		case CGEN_LIGHTING_SPHERICAL:
+		case CGEN_STATIC:
+			if (!r_drawspherelights->integer) {
+				break;
+			}
+
+			if (!backEnd.currentStaticModel) {
+				if (backEnd.currentSphere->TessFunction) {
+					backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
+				}
+				break;
+			}
+
+			if (!tess.vertexColorValid) {
+				ri.Printf(PRINT_WARNING, "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n", tess.shader->name);
+			}
+
+			if (backEnd.currentStaticModel->useSpecialLighting)
 			{
-				fog_t		*fog;
+				for (i = 0; i < tess.numVertexes; i++)
+				{
+					int j;
+					vec3_t colorout;
+					int r, g, b;
 
-				fog = tr.world->fogs + tess.fogNum;
+					colorout[0] = tess.vertexColors[i][0];
+					colorout[1] = tess.vertexColors[i][1];
+					colorout[2] = tess.vertexColors[i][2];
 
-				for ( i = 0; i < tess.numVertexes; i++ ) {
-					* ( int * )&tess.svars.colors[i] = fog->colorInt;
+					for (j = 0; j < backEnd.currentStaticModel->numdlights; j++)
+					{
+						float ooLightDistSquared;
+						float dot;
+						vec3_t diff;
+						dlight_t* dl;
+
+						dl = &backEnd.refdef.dlights[backEnd.currentStaticModel->dlights[j].index];
+						VectorSubtract(backEnd.currentStaticModel->dlights[j].transformed, tess.xyz[i], diff);
+
+						dot = DotProduct(diff, tess.normal[i]);
+						if (dot >= 0)
+						{
+							float ooLen;
+
+							ooLen = 1.0 / VectorLengthSquared(diff);
+							ooLightDistSquared = dot * (7500.0 * dl->radius * ooLen * sqrt(ooLen));
+							colorout[0] = dl->color[0] * ooLightDistSquared + colorout[0];
+							colorout[1] = dl->color[1] * ooLightDistSquared + colorout[1];
+							colorout[2] = dl->color[2] * ooLightDistSquared + colorout[2];
+						}
+					}
+
+					r = colorout[0];
+					g = colorout[1];
+					b = colorout[2];
+
+					if (tr.overbrightShift)
+					{
+						r = (int)((float)r * tr.overbrightMult);
+						g = (int)((float)g * tr.overbrightMult);
+						b = (int)((float)b * tr.overbrightMult);
+					}
+
+					if (r > 0xFF || g > 0xFF || b > 0xFF)
+					{
+						float t;
+
+						t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+						r = (int)((float)r * t);
+						g = (int)((float)g * t);
+						b = (int)((float)b * t);
+					}
+
+					tess.svars.colors[i][0] = r;
+					tess.svars.colors[i][1] = g;
+					tess.svars.colors[i][2] = b;
+					// Fixed in OPM
+					//  This sets the alpha channel which will prevent vertices from hiding
+					tess.svars.colors[i][3] = tess.vertexColors[i][3];
+				}
+			}
+			else
+			{
+				if (tr.identityLight == 1.0)
+				{
+					Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
+				}
+				else
+				{
+					for (i = 0; i < tess.numVertexes; i++) {
+						tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
+						tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
+						tess.svars.colors[i][2] = tess.vertexColors[i][2] * tr.identityLight;
+					}
 				}
 			}
 			break;
-		case CGEN_WAVEFORM:
-			RB_CalcWaveColor( &pStage->rgbWave, ( unsigned char * ) tess.svars.colors );
+		case CGEN_CONSTANT:
+			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst);
 			break;
-		case CGEN_ENTITY:
-			RB_CalcColorFromEntity( ( unsigned char * ) tess.svars.colors );
+		case CGEN_GLOBAL_COLOR:
+			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D);
 			break;
-		case CGEN_ONE_MINUS_ENTITY:
-			RB_CalcColorFromOneMinusEntity( ( unsigned char * ) tess.svars.colors );
+		case CGEN_SCOORD:
+			RB_CalcRGBFromTexCoords(
+				(unsigned char*)tess.svars.colors,
+				pStage->alphaMin,
+				pStage->alphaMax,
+				pStage->alphaConstMin,
+				pStage->alphaConst,
+				1.0,
+				0.0,
+				tess.svars.texcoords[0][0]
+			);
+			break;
+		case CGEN_TCOORD:
+			RB_CalcRGBFromTexCoords(
+				(unsigned char*)tess.svars.colors,
+				pStage->alphaMin,
+				pStage->alphaMax,
+				pStage->alphaConstMin,
+				pStage->alphaConst,
+				0.0,
+				1.0,
+				tess.svars.texcoords[0][0]
+			);
+			break;
+		case CGEN_DOT:
+			RB_CalcRGBFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+			break;
+		case CGEN_ONE_MINUS_DOT:
+			RB_CalcRGBFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
 			break;
 	}
 
@@ -702,47 +982,42 @@ static void ComputeColors( shaderStage_t *pStage )
 	case AGEN_SKIP:
 		break;
 	case AGEN_IDENTITY:
-		if ( pStage->rgbGen != CGEN_IDENTITY ) {
-			if ( ( pStage->rgbGen == CGEN_VERTEX && tr.identityLight != 1 ) ||
-				 pStage->rgbGen != CGEN_VERTEX ) {
+		if ( pStage->rgbGen != CGEN_IDENTITY
+			&& pStage->rgbGen != CGEN_LIGHTING_GRID
+			&& pStage->rgbGen != CGEN_LIGHTING_SPHERICAL)
+		{
+			if ( pStage->rgbGen != CGEN_VERTEX || tr.identityLight != 1 ) {
 				for ( i = 0; i < tess.numVertexes; i++ ) {
 					tess.svars.colors[i][3] = 0xff;
 				}
 			}
 		}
 		break;
-	case AGEN_CONST:
-		if ( pStage->rgbGen != CGEN_CONST ) {
-			for ( i = 0; i < tess.numVertexes; i++ ) {
-				tess.svars.colors[i][3] = pStage->constantColor[3];
-			}
-		}
-		break;
-	case AGEN_WAVEFORM:
-		RB_CalcWaveAlpha( &pStage->alphaWave, ( unsigned char * ) tess.svars.colors );
-		break;
-	case AGEN_LIGHTING_SPECULAR:
-		RB_CalcSpecularAlpha( ( unsigned char * ) tess.svars.colors );
-		break;
 	case AGEN_ENTITY:
-		RB_CalcAlphaFromEntity( ( unsigned char * ) tess.svars.colors );
+		RB_CalcAlphaFromEntity((unsigned char*)tess.svars.colors);
 		break;
 	case AGEN_ONE_MINUS_ENTITY:
-		RB_CalcAlphaFromOneMinusEntity( ( unsigned char * ) tess.svars.colors );
+		RB_CalcAlphaFromOneMinusEntity((unsigned char*)tess.svars.colors);
 		break;
-    case AGEN_VERTEX:
-		if ( pStage->rgbGen != CGEN_VERTEX ) {
-			for ( i = 0; i < tess.numVertexes; i++ ) {
+	case AGEN_VERTEX:
+		if (pStage->rgbGen != CGEN_VERTEX) {
+			for (i = 0; i < tess.numVertexes; i++) {
 				tess.svars.colors[i][3] = tess.vertexColors[i][3];
 			}
 		}
-        break;
-    case AGEN_ONE_MINUS_VERTEX:
-        for ( i = 0; i < tess.numVertexes; i++ )
-        {
+		break;
+	case AGEN_ONE_MINUS_VERTEX:
+		for (i = 0; i < tess.numVertexes; i++)
+		{
 			tess.svars.colors[i][3] = 255 - tess.vertexColors[i][3];
-        }
-        break;
+		}
+		break;
+	case AGEN_LIGHTING_SPECULAR:
+		RB_CalcSpecularAlpha((unsigned char*)tess.svars.colors, pStage->alphaMax, pStage->specOrigin);
+		break;
+	case AGEN_WAVEFORM:
+		RB_CalcWaveAlpha(&pStage->alphaWave, (unsigned char*)tess.svars.colors);
+		break;
 	case AGEN_PORTAL:
 		{
 			unsigned char alpha;
@@ -752,7 +1027,7 @@ static void ComputeColors( shaderStage_t *pStage )
 				float len;
 				vec3_t v;
 
-				VectorSubtract( tess.xyz[i], backEnd.viewParms.or.origin, v );
+				VectorSubtract( tess.xyz[i], backEnd.viewParms.ori.origin, v );
 				len = VectorLength( v );
 
 				len /= tess.shader->portalRange;
@@ -774,50 +1049,243 @@ static void ComputeColors( shaderStage_t *pStage )
 			}
 		}
 		break;
-	}
+	case AGEN_DOT:
+		RB_CalcAlphaFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+		return;
+	case AGEN_ONE_MINUS_DOT:
+		RB_CalcAlphaFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+		return;
+	case AGEN_CONSTANT:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst[3]);
+		break;
+	case AGEN_GLOBAL_ALPHA:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D[3]);
+		break;
+	case AGEN_SKYALPHA:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, tr.refdef.sky_alpha * 255.0);
+		break;
+	case AGEN_ONE_MINUS_SKYALPHA:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, (1.0 - tr.refdef.sky_alpha) * 255.0);
+		break;
+	case AGEN_SCOORD:
+		RB_CalcAlphaFromTexCoords(
+			(unsigned char*)tess.svars.colors,
+			pStage->alphaMin,
+			pStage->alphaMax,
+			pStage->alphaConstMin,
+			pStage->alphaConst,
+			1.0,
+			0.0,
+			tess.svars.texcoords[0][0]
+		);
+		break;
+	case AGEN_TCOORD:
+		RB_CalcAlphaFromTexCoords(
+			(unsigned char*)tess.svars.colors,
+			pStage->alphaMin,
+			pStage->alphaMax,
+			pStage->alphaConstMin,
+			pStage->alphaConst,
+			0.0,
+			1.0,
+			tess.svars.texcoords[0][0]
+		);
+		break;
+	case AGEN_DIST_FADE:
+		if (backEnd.currentStaticModel)
+		{
+			unsigned char alpha;
 
-	//
-	// fog adjustment for colors to fade out as fog increases
-	//
-	if ( tess.fogNum )
-	{
-		switch ( pStage->adjustColorsForFog )
-		{
-		case ACFF_MODULATE_RGB:
-			RB_CalcModulateColorsByFog( ( unsigned char * ) tess.svars.colors );
-			break;
-		case ACFF_MODULATE_ALPHA:
-			RB_CalcModulateAlphasByFog( ( unsigned char * ) tess.svars.colors );
-			break;
-		case ACFF_MODULATE_RGBA:
-			RB_CalcModulateRGBAsByFog( ( unsigned char * ) tess.svars.colors );
-			break;
-		case ACFF_NONE:
-			break;
+			for (i = 0; i < tess.numVertexes; i++) {
+				float len;
+				vec3_t org, v;
+
+				VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
+				org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
+				org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
+				org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
+			
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0xff;
+				} else if (len > 1) {
+					alpha = 0;
+				} else {
+					alpha = ((1.0 - len) * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
 		}
-	}
-	
-	// if in greyscale rendering mode turn all color values into greyscale.
-	if(r_greyscale->integer)
-	{
-		int scale;
-		for(i = 0; i < tess.numVertexes; i++)
-		{
-			scale = LUMA(tess.svars.colors[i][0], tess.svars.colors[i][1], tess.svars.colors[i][2]);
- 			tess.svars.colors[i][0] = tess.svars.colors[i][1] = tess.svars.colors[i][2] = scale;
+		else
+        {
+            unsigned char alpha;
+
+            for (i = 0; i < tess.numVertexes; i++) {
+                float len;
+                vec3_t org, v;
+
+				if (backEnd.currentEntity) {
+					VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
+					org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
+					org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
+					org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
+				} else {
+					VectorCopy(backEnd.viewParms.ori.origin, org);
+				}
+
+				
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0xff;
+				} else if (len > 1) {
+					alpha = 0;
+				} else {
+					alpha = ((1.0 - len) * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
 		}
-	}
-	else if(r_greyscale->value)
-	{
-		float scale;
-		
-		for(i = 0; i < tess.numVertexes; i++)
+		break;
+	case AGEN_ONE_MINUS_DIST_FADE:
+		if (backEnd.currentStaticModel)
 		{
-			scale = LUMA(tess.svars.colors[i][0], tess.svars.colors[i][1], tess.svars.colors[i][2]);
-			tess.svars.colors[i][0] = LERP(tess.svars.colors[i][0], scale, r_greyscale->value);
-			tess.svars.colors[i][1] = LERP(tess.svars.colors[i][1], scale, r_greyscale->value);
-			tess.svars.colors[i][2] = LERP(tess.svars.colors[i][2], scale, r_greyscale->value);
+			unsigned char alpha;
+
+			for (i = 0; i < tess.numVertexes; i++) {
+				float len;
+				vec3_t org, v;
+
+                VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
+                org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
+                org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
+                org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
+			
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0;
+				} else if (len > 1) {
+					alpha = 0xff;
+				} else {
+					alpha = (len * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
 		}
+		else
+        {
+            unsigned char alpha;
+
+            for (i = 0; i < tess.numVertexes; i++) {
+                float len;
+                vec3_t org, v;
+
+				if (backEnd.currentEntity) {
+                    VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
+                    org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
+                    org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
+                    org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
+				} else {
+					VectorCopy(backEnd.viewParms.ori.origin, org);
+				}
+
+				
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0;
+				} else if (len > 1) {
+					alpha = 0xff;
+				} else {
+					alpha = (len * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
+		}
+		break;
+    case AGEN_TIKI_DIST_FADE:
+    case AGEN_ONE_MINUS_TIKI_DIST_FADE:
+		{
+			unsigned char alpha;
+
+			if (backEnd.currentStaticModel)
+			{
+				float lenSqr;
+				float fDistNearSqr;
+				float fDistFarSqr;
+				vec3_t org;
+
+				VectorSubtract(backEnd.currentStaticModel->origin, backEnd.viewParms.ori.origin, org);
+
+				lenSqr = VectorLengthSquared(org);
+                fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
+                fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
+				if (lenSqr <= fDistNearSqr) {
+					alpha = 0;
+				} else if (lenSqr >= fDistFarSqr) {
+					alpha = 0xff;
+				} else {
+					float len;
+
+					len = VectorLength(org);
+					alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
+				}
+
+				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
+					alpha = 0xff - alpha;
+				}
+			}
+			else if (backEnd.currentEntity)
+			{
+				float lenSqr;
+				float fDistNearSqr;
+				float fDistFarSqr;
+				vec3_t org;
+
+				VectorSubtract(backEnd.currentEntity->e.origin, backEnd.viewParms.ori.origin, org);
+
+				lenSqr = VectorLengthSquared(org);
+				fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
+				fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
+				if (lenSqr <= fDistNearSqr) {
+					alpha = 0;
+				} else if (lenSqr >= fDistFarSqr) {
+					alpha = 0xff;
+				} else {
+					float len;
+
+                    len = VectorLength(org);
+                    alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
+				}
+
+				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
+					alpha = 0xff - alpha;
+				}
+			}
+			else
+			{
+				const char* type;
+				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
+					type = "tikiDistFade";
+				} else {
+					type = "oneMinusTikiDistFade";
+				}
+
+				ri.Error(ERR_DROP, "ERROR: '%s' shader command used on a non-tiki\n", type);
+				alpha = 0xff;
+			}
+			RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, alpha);
+		}
+		break;
+	case AGEN_DOT_VIEW:
+		RB_CalcAlphaFromDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+		break;
+	case AGEN_ONE_MINUS_DOT_VIEW:
+		RB_CalcAlphaFromOneMinusDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+        break;
+    case AGEN_HEIGHT_FADE:
+        RB_CalcAlphaFromHeightFade((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+        break;
+	default:
+		break;
 	}
 }
 
@@ -830,7 +1298,7 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 	int		i;
 	int		b;
 
-	for ( b = 0; b < NUM_TEXTURE_BUNDLES; b++ ) {
+	for ( b = 0; b < NUM_TEXTURE_BUNDLES && pStage->bundle[b].image[0]; b++ ) {
 		int tm;
 
 		//
@@ -853,20 +1321,29 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 				tess.svars.texcoords[b][i][1] = tess.texCoords[i][1][1];
 			}
 			break;
-		case TCGEN_VECTOR:
-			for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-				tess.svars.texcoords[b][i][0] = DotProduct( tess.xyz[i], pStage->bundle[b].tcGenVectors[0] );
-				tess.svars.texcoords[b][i][1] = DotProduct( tess.xyz[i], pStage->bundle[b].tcGenVectors[1] );
-			}
-			break;
-		case TCGEN_FOG:
-			RB_CalcFogTexCoords( ( float * ) tess.svars.texcoords[b] );
-			break;
 		case TCGEN_ENVIRONMENT_MAPPED:
 			RB_CalcEnvironmentTexCoords( ( float * ) tess.svars.texcoords[b] );
+            break;
+		case TCGEN_VECTOR:
+			for (i = 0; i < tess.numVertexes; i++) {
+				tess.svars.texcoords[b][i][0] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[0]);
+				tess.svars.texcoords[b][i][1] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[1]);
+			}
+			break;
+        case TCGEN_ENVIRONMENT_MAPPED2:
+            RB_CalcEnvironmentTexCoords2((float*)tess.svars.texcoords[b]);
+            break;
+		case TCGEN_SUN_REFLECTION:
+			RB_CalcSunReflectionTexCoords(tess.svars.texcoords[b][0]);
+			break;
+        default:
+            ri.Printf(
+				PRINT_DEVELOPER,
+                "WARNING: invalid tcGen '%d' specified for shader '%s'\n",
+                pStage->bundle[b].tcGen,
+                tess.shader->name
+			);
 			break;
-		case TCGEN_BAD:
-			return;
 		}
 
 		//
@@ -911,11 +1388,37 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 
 			case TMOD_ROTATE:
 				RB_CalcRotateTexCoords( pStage->bundle[b].texMods[tm].rotateSpeed,
-										( float * ) tess.svars.texcoords[b] );
+										pStage->bundle[b].texMods[tm].rotateCoef,
+										( float * ) tess.svars.texcoords[b],
+										pStage->bundle[b].texMods[tm].rotateStart );
 				break;
 
+			case TMOD_OFFSET:
+				RB_CalcOffsetTexCoords(pStage->bundle[b].texMods[tm].scroll, tess.svars.texcoords[b][0]);
+				break;
+
+            case TMOD_PARALLAX:
+				RB_CalcParallaxTexCoords(pStage->bundle[b].texMods[tm].rate, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_MACRO:
+				RB_CalcMacroTexCoords(pStage->bundle[b].texMods[tm].scale, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_WAVETRANS:
+				RB_CalcTransWaveTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_WAVETRANT:
+				RB_CalcTransWaveTexCoordsT(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_BULGETRANS:
+				RB_CalcBulgeTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
 			default:
-				ri.Error( ERR_DROP, "ERROR: unknown texmod '%d' in shader '%s'", pStage->bundle[b].texMods[tm].type, tess.shader->name );
+				ri.Printf(PRINT_WARNING, "WARNING: invalid tcMod '%d' specified for shader '%s'\n", pStage->bundle[b].texMods[tm].type, tess.shader->name );
 				break;
 			}
 		}
@@ -929,52 +1432,75 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 {
 	int stage;
 
-	for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ )
+	for (stage = 0; stage < MAX_SHADER_STAGES; stage++)
 	{
-		shaderStage_t *pStage = tess.xstages[stage];
+		shaderStage_t* pStage = tess.xstages[stage];
 
-		if ( !pStage )
+		if (!pStage)
 		{
 			break;
 		}
 
-		ComputeColors( pStage );
-		ComputeTexCoords( pStage );
+		if (pStage->alphaGen == AGEN_SKYALPHA && tr.refdef.sky_alpha < 0.01) {
+			continue;
+		}
+		else if (pStage->alphaGen == AGEN_ONE_MINUS_SKYALPHA && tr.refdef.sky_alpha > 0.99) {
+			continue;
+		}
 
-		if ( !setArraysOnce )
+		ComputeTexCoords(pStage);
+		ComputeColors(pStage);
+
+		if (!setArraysOnce)
 		{
-			qglEnableClientState( GL_COLOR_ARRAY );
-			qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, input->svars.colors );
+			qglEnableClientState(GL_COLOR_ARRAY);
+			qglColorPointer(4, GL_UNSIGNED_BYTE, 0, input->svars.colors);
 		}
 
 		//
 		// do multitexture
 		//
-		if ( pStage->bundle[1].image[0] != 0 )
+		if (pStage->bundle[1].image[0] != 0)
 		{
-			DrawMultitextured( input, stage );
+			DrawMultitextured(input, stage);
 		}
 		else
 		{
-			if ( !setArraysOnce )
+			if (backEnd.in2D) {
+				GL_State(pStage->stateBits | GLS_DEPTHTEST_DISABLE);
+			}
+			else {
+				GL_State(pStage->stateBits);
+			}
+
+			if (!setArraysOnce)
 			{
-				qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] );
+				qglTexCoordPointer(2, GL_FLOAT, 0, input->svars.texcoords[0]);
 			}
 
 			//
 			// set state
 			//
-			R_BindAnimatedImage( &pStage->bundle[0] );
-
-			GL_State( pStage->stateBits );
+			if (pStage->bundle[0].vertexLightmap && r_vertexLight->integer && r_lightmap->integer)
+			{
+				GL_Bind(tr.whiteImage);
+			}
+			else {
+				if (input->dlightMap && tess.xstages[stage]->bundle[0].isLightmap) {
+					GL_Bind(tr.dlightImages[input->dlightMap - 1]);
+				}
+				else {
+					R_BindAnimatedImage(&pStage->bundle[0]);
+				}
+			}
 
 			//
 			// draw
 			//
-			R_DrawElements( input->numIndexes, input->indexes );
+			R_DrawElements(input->numIndexes, input->indexes);
 		}
 		// allow skipping out to show just lightmaps during development
-		if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap ) )
+		if (r_lightmap->integer && (pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap))
 		{
 			break;
 		}
@@ -988,10 +1514,13 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 void RB_StageIteratorGeneric( void )
 {
 	shaderCommands_t *input;
-	shader_t		*shader;
 
 	input = &tess;
-	shader = input->shader;
+
+	input->shaderTime = backEnd.refdef.floatTime;
+	if ((input->shader->flags & 1) != 0) {
+		input->shaderTime = backEnd.refdef.floatTime - backEnd.shaderStartTime;
+	}
 
 	RB_DeformTessGeometry();
 
@@ -1008,10 +1537,10 @@ void RB_StageIteratorGeneric( void )
 	//
 	// set face culling appropriately
 	//
-	GL_Cull( shader->cullType );
+	GL_Cull( input->shader->cullType );
 
 	// set polygon offset if necessary
-	if ( shader->polygonOffset )
+	if ( input->shader->polygonOffset )
 	{
 		qglEnable( GL_POLYGON_OFFSET_FILL );
 		qglPolygonOffset( r_offsetFactor->value, r_offsetUnits->value );
@@ -1023,21 +1552,21 @@ void RB_StageIteratorGeneric( void )
 	// to avoid compiling those arrays since they will change
 	// during multipass rendering
 	//
-	if ( tess.numPasses > 1 || shader->multitextureEnv )
+	if (tess.numPasses > 1 || (tess.xstages[0] && tess.xstages[0]->multitextureEnv))
 	{
 		setArraysOnce = qfalse;
-		qglDisableClientState (GL_COLOR_ARRAY);
-		qglDisableClientState (GL_TEXTURE_COORD_ARRAY);
+		qglDisableClientState(GL_COLOR_ARRAY);
+		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	}
 	else
 	{
 		setArraysOnce = qtrue;
 
-		qglEnableClientState( GL_COLOR_ARRAY);
-		qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors );
+		qglEnableClientState(GL_COLOR_ARRAY);
+		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, tess.svars.colors);
 
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY);
-		qglTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] );
+		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		qglTexCoordPointer(2, GL_FLOAT, 0, tess.svars.texcoords[0]);
 	}
 
 	//
@@ -1067,18 +1596,10 @@ void RB_StageIteratorGeneric( void )
 	// 
 	// now do any dynamic lighting needed
 	//
-	if ( tess.dlightBits && tess.shader->sort <= SS_OPAQUE
-		&& !(tess.shader->surfaceFlags & (SURF_NODLIGHT | SURF_SKY) ) ) {
+	if (tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE) {
 		ProjectDlightTexture();
 	}
 
-	//
-	// now do fog
-	//
-	if ( tess.fogNum && tess.shader->fogPass ) {
-		RB_FogPass();
-	}
-
 	// 
 	// unlock arrays
 	//
@@ -1091,7 +1612,7 @@ void RB_StageIteratorGeneric( void )
 	//
 	// reset polygon offset
 	//
-	if ( shader->polygonOffset )
+	if ( input->shader->polygonOffset )
 	{
 		qglDisable( GL_POLYGON_OFFSET_FILL );
 	}
@@ -1101,18 +1622,37 @@ void RB_StageIteratorGeneric( void )
 /*
 ** RB_StageIteratorVertexLitTexture
 */
-void RB_StageIteratorVertexLitTexture( void )
+void RB_StageIteratorVertexLitTextureUnfogged( void )
 {
 	shaderCommands_t *input;
 	shader_t		*shader;
 
 	input = &tess;
+
 	shader = input->shader;
 
-	//
-	// compute colors
-	//
-	RB_CalcDiffuseColor( ( unsigned char * ) tess.svars.colors );
+	if (backEnd.currentSphere->TessFunction && r_drawspherelights->integer)
+	{
+		//
+		// compute colors using the sphere function
+		//
+		backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
+	}
+	else if (backEnd.currentStaticModel)
+	{
+		//
+		// compute colors
+		//
+		ComputeColors(input->xstages[0]);
+	}
+	else
+	{
+		//
+		// calculate using previously calculated lighting grid
+		// for the entity
+		//
+		RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
+	}
 
 	//
 	// log this call
@@ -1127,7 +1667,7 @@ void RB_StageIteratorVertexLitTexture( void )
 	//
 	// set face culling appropriately
 	//
-	GL_Cull( shader->cullType );
+	GL_Cull( input->shader->cullType );
 
 	//
 	// set arrays and lock
@@ -1155,17 +1695,10 @@ void RB_StageIteratorVertexLitTexture( void )
 	// 
 	// now do any dynamic lighting needed
 	//
-	if ( tess.dlightBits && tess.shader->sort <= SS_OPAQUE ) {
+	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
 		ProjectDlightTexture();
 	}
 
-	//
-	// now do fog
-	//
-	if ( tess.fogNum && tess.shader->fogPass ) {
-		RB_FogPass();
-	}
-
 	// 
 	// unlock arrays
 	//
@@ -1178,12 +1711,10 @@ void RB_StageIteratorVertexLitTexture( void )
 
 //define	REPLACE_MODE
 
-void RB_StageIteratorLightmappedMultitexture( void ) {
+void RB_StageIteratorLightmappedMultitextureUnfogged( void ) {
 	shaderCommands_t *input;
-	shader_t		*shader;
 
 	input = &tess;
-	shader = input->shader;
 
 	//
 	// log this call
@@ -1197,12 +1728,12 @@ void RB_StageIteratorLightmappedMultitexture( void ) {
 	//
 	// set face culling appropriately
 	//
-	GL_Cull( shader->cullType );
+	GL_Cull( input->shader->cullType );
 
 	//
 	// set color, pointers, and lock
 	//
-	GL_State( GLS_DEFAULT );
+	GL_State( GLS_DEFAULT | (tess.xstages[0]->stateBits & (GLS_ATEST_BITS | GLS_FOG_BITS)));
 	qglVertexPointer( 3, GL_FLOAT, 16, input->xyz );
 
 #ifdef REPLACE_MODE
@@ -1233,7 +1764,11 @@ void RB_StageIteratorLightmappedMultitexture( void ) {
 	} else {
 		GL_TexEnv( GL_MODULATE );
 	}
-	R_BindAnimatedImage( &tess.xstages[0]->bundle[1] );
+	if (tess.dlightMap && tess.xstages[0]->bundle[1].isLightmap) {
+		GL_Bind(tr.dlightImages[tess.dlightMap - 1]);
+	} else {
+		R_BindAnimatedImage(&tess.xstages[0]->bundle[1]);
+	}
 	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
 	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][1] );
 
@@ -1262,17 +1797,10 @@ void RB_StageIteratorLightmappedMultitexture( void ) {
 	// 
 	// now do any dynamic lighting needed
 	//
-	if ( tess.dlightBits && tess.shader->sort <= SS_OPAQUE ) {
+	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
 		ProjectDlightTexture();
 	}
 
-	//
-	// now do fog
-	//
-	if ( tess.fogNum && tess.shader->fogPass ) {
-		RB_FogPass();
-	}
-
 	//
 	// unlock arrays
 	//
@@ -1293,7 +1821,6 @@ void RB_EndSurface( void ) {
 	if (input->numIndexes == 0) {
 		return;
 	}
-
 	if (input->indexes[SHADER_MAX_INDEXES-1] != 0) {
 		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_INDEXES hit");
 	}	
@@ -1301,8 +1828,12 @@ void RB_EndSurface( void ) {
 		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_VERTEXES hit");
 	}
 
+	if (tess.xyz[SHADER_MAX_VERTEXES - 1][0] && r_shadows->integer != 3) {
+		tess.xyz[SHADER_MAX_VERTEXES - 1][0] = 0;
+	}
+
 	if ( tess.shader == tr.shadowShader ) {
-		RB_ShadowTessEnd();
+		RB_ComputeShadowVolume();
 		return;
 	}
 
@@ -1324,15 +1855,19 @@ void RB_EndSurface( void ) {
 	//
 	tess.currentStageIteratorFunc();
 
-	//
-	// draw debugging stuff
-	//
-	if ( r_showtris->integer ) {
-		DrawTris (input);
-	}
-	if ( r_shownormals->integer ) {
-		DrawNormals (input);
+	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL) && !backEnd.in2D)
+	{
+		//
+		// draw debugging stuff
+		//
+		if (r_showtris->integer && developer->integer) {
+			DrawTris(input, r_showtris->integer);
+		}
+		if (r_shownormals->integer && developer->integer) {
+			DrawNormals(input);
+		}
 	}
+
 	// clear shader so we can tell we don't have any unclosed surfaces
 	tess.numIndexes = 0;
 
diff --git a/code/renderergl1/tr_shade_calc.c b/code/renderergl1/tr_shade_calc.c
index 455424ed..8fa2abd1 100644
--- a/code/renderergl1/tr_shade_calc.c
+++ b/code/renderergl1/tr_shade_calc.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tr_local.h"
 
 
-#define	WAVEVALUE( table, base, amplitude, phase, freq )  ((base) + table[ ( (int64_t) ( ( (phase) + tess.shaderTime * (freq) ) * FUNCTABLE_SIZE ) ) & FUNCTABLE_MASK ] * (amplitude))
+#define	WAVEVALUE( table, base, amplitude, phase, freq )  ((base) + table[ myftol( ( ( (phase) + tess.shaderTime * (freq) ) * FUNCTABLE_SIZE ) ) & FUNCTABLE_MASK ] * (amplitude))
 
 static float *TableForFunc( genFunc_t func ) 
 {
@@ -45,7 +45,7 @@ static float *TableForFunc( genFunc_t func )
 		break;
 	}
 
-	ri.Error( ERR_DROP, "TableForFunc called with invalid function '%d' in shader '%s'", func, tess.shader->name );
+	ri.Error( ERR_DROP, "TableForFunc called with invalid function '%d' in shader '%s'\n", func, tess.shader->name );
 	return NULL;
 }
 
@@ -57,10 +57,54 @@ static float *TableForFunc( genFunc_t func )
 static float EvalWaveForm( const waveForm_t *wf ) 
 {
 	float	*table;
+	float	base;
+	float	amplitude;
+	float	phase;
+	float	frequency;
 
 	table = TableForFunc( wf->func );
 
-	return WAVEVALUE( table, wf->base, wf->amplitude, wf->phase, wf->frequency );
+    if (wf->base != 1234567.0f) {
+        base = wf->base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (wf->amplitude != 1234567.0f) {
+		amplitude = wf->amplitude;
+    } else if (backEnd.currentEntity) {
+		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+		amplitude = r_static_shaderdata1->value;
+    }
+
+    if (wf->phase != 1234567.0f) {
+		phase = wf->phase;
+    } else if (backEnd.currentEntity) {
+		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+		phase = r_static_shaderdata2->value;
+    }
+
+    if (wf->frequency != 1234567.0f) {
+		frequency = wf->frequency;
+    } else if (backEnd.currentEntity) {
+		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+		frequency = r_static_shaderdata1->value;
+    }
+
+	if (!backEnd.currentEntity)
+	{
+		base *= r_static_shadermultiplier0->value;
+		amplitude *= r_static_shadermultiplier1->value;
+		phase *= r_static_shadermultiplier2->value;
+		frequency *= r_static_shadermultiplier3->value;
+	}
+
+	return WAVEVALUE( table, base, amplitude, phase, frequency );
 }
 
 static float EvalWaveFormClamped( const waveForm_t *wf )
@@ -101,6 +145,65 @@ void RB_CalcStretchTexCoords( const waveForm_t *wf, float *st )
 	RB_CalcTransformTexCoords( &tmi, st );
 }
 
+/*
+========================
+RB_CalcTransWaveTexCoords
+
+========================
+*/
+void RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st)
+{
+	float p;
+	int i;
+
+    p = EvalWaveForm(wf);
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+        st[0] += p;
+    }
+}
+
+/*
+========================
+RB_CalcTransWaveTexCoordsT
+
+========================
+*/
+void RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st)
+{
+    float p;
+    int i;
+
+    p = EvalWaveForm(wf);
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+        st[1] += p;
+    }
+}
+
+/*
+========================
+RB_CalcBulgeTexCoords
+
+========================
+*/
+void RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st)
+{
+	int i;
+	int off;
+	float offset;
+	float now;
+	float amplitude;
+	float width;
+
+    amplitude = wf->amplitude;
+    width = wf->base;
+    now = backEnd.refdef.time / 1000.0 * wf->frequency + wf->phase;
+
+	for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		off = (now + st[0] * width) * FUNCTABLE_SIZE;
+		offset = tr.sinTable[off & FUNCTABLE_MASK] * amplitude;
+	}
+}
+
 /*
 ====================================================================
 
@@ -123,8 +226,52 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 	float	*xyz = ( float * ) tess.xyz;
 	float	*normal = ( float * ) tess.normal;
 	float	*table;
+	float	base;
+	float	amplitude;
+	float	phase;
+	float	frequency;
 
-	if ( ds->deformationWave.frequency == 0 )
+    if (ds->deformationWave.base != 1234567.0f) {
+        base = ds->deformationWave.base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (ds->deformationWave.amplitude != 1234567.0f) {
+		amplitude = ds->deformationWave.amplitude;
+    } else if (backEnd.currentEntity) {
+		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+		amplitude = r_static_shaderdata1->value;
+    }
+
+    if (ds->deformationWave.phase != 1234567.0f) {
+		phase = ds->deformationWave.phase;
+    } else if (backEnd.currentEntity) {
+		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+		phase = r_static_shaderdata2->value;
+    }
+
+    if (ds->deformationWave.frequency != 1234567.0f) {
+		frequency = ds->deformationWave.frequency;
+    } else if (backEnd.currentEntity) {
+		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+		frequency = r_static_shaderdata1->value;
+    }
+
+	if (!backEnd.currentEntity)
+	{
+		base *= r_static_shadermultiplier0->value;
+		amplitude *= r_static_shadermultiplier1->value;
+		phase *= r_static_shadermultiplier2->value;
+		frequency *= r_static_shadermultiplier3->value;
+	}
+
+	if ( frequency == 0 )
 	{
 		scale = EvalWaveForm( &ds->deformationWave );
 
@@ -145,10 +292,7 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 		{
 			float off = ( xyz[0] + xyz[1] + xyz[2] ) * ds->deformationSpread;
 
-			scale = WAVEVALUE( table, ds->deformationWave.base, 
-				ds->deformationWave.amplitude,
-				ds->deformationWave.phase + off,
-				ds->deformationWave.frequency );
+			scale = WAVEVALUE( table, base, amplitude, phase + off, frequency );
 
 			VectorScale( normal, scale, offset );
 			
@@ -159,6 +303,91 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 	}
 }
 
+void RB_CalcFlapVertexes(deformStage_t* ds, texDirection_t coordsToUse)
+{
+    int    i;
+    vec3_t offset;
+    float  scale;
+    vec4_t* xyz, * normal;
+	float* table;
+    float  base;
+    float  amplitude;
+    float  phase;
+    float  frequency;
+    float  min, max;
+    vec2_t (*st)[2];
+    float  vertexScale;
+
+    xyz = tess.xyz;
+    normal = tess.normal;
+    min = ds->bulgeWidth;
+    max = ds->bulgeHeight;
+    st = tess.texCoords;
+
+    if (ds->deformationWave.base != 1234567.0f) {
+        base = ds->deformationWave.base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (ds->deformationWave.amplitude != 1234567.0f) {
+        amplitude = ds->deformationWave.amplitude;
+    } else if (backEnd.currentEntity) {
+        amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+        amplitude = r_static_shaderdata1->value;
+    }
+
+    if (ds->deformationWave.phase != 1234567.0f) {
+        phase = ds->deformationWave.phase;
+    } else if (backEnd.currentEntity) {
+        phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+        phase = r_static_shaderdata2->value;
+    }
+
+    if (ds->deformationWave.frequency != 1234567.0f) {
+        frequency = ds->deformationWave.frequency;
+    } else if (backEnd.currentEntity) {
+        frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+        frequency = r_static_shaderdata3->value;
+    }
+
+    if (!backEnd.currentEntity) {
+        base = base * r_static_shadermultiplier0->value;
+        amplitude = amplitude * r_static_shadermultiplier1->value;
+        phase = phase * r_static_shadermultiplier2->value;
+        frequency = frequency * r_static_shadermultiplier3->value;
+    }
+
+	if (frequency) {
+		table = TableForFunc(ds->deformationWave.func);
+		for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
+			float off;
+
+			off = ((*xyz)[0] + (*xyz)[1] + (*xyz)[2]) * ds->deformationSpread;
+			scale = WAVEVALUE(table, base, amplitude, phase, frequency);
+            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
+            offset[0] = scale * vertexScale * (*normal)[0];
+            offset[1] = scale * vertexScale * (*normal)[1];
+            offset[2] = scale * vertexScale * (*normal)[2];
+			VectorAdd(*xyz, offset, *xyz);
+		}
+	} else {
+        scale = EvalWaveForm(&ds->deformationWave);
+        for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
+            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
+            offset[0] = vertexScale * scale * (*normal)[0];
+            offset[1] = vertexScale * scale * (*normal)[1];
+            offset[2] = vertexScale * scale * (*normal)[2];
+            VectorAdd(*xyz, offset, *xyz);
+		}
+	}
+}
+
 /*
 =========================
 RB_CalcDeformNormals
@@ -203,12 +432,12 @@ void RB_CalcBulgeVertexes( deformStage_t *ds ) {
 	const float *st = ( const float * ) tess.texCoords[0];
 	float		*xyz = ( float * ) tess.xyz;
 	float		*normal = ( float * ) tess.normal;
-	double		now;
+	float		now;
 
-	now = backEnd.refdef.time * 0.001 * ds->bulgeSpeed;
+	now = backEnd.refdef.time * ds->bulgeSpeed * 0.001f;
 
 	for ( i = 0; i < tess.numVertexes; i++, xyz += 4, st += 4, normal += 4 ) {
-		int64_t off;
+		int		off;
 		float scale;
 
 		off = (float)( FUNCTABLE_SIZE / (M_PI*2) ) * ( st[0] * ds->bulgeWidth + now );
@@ -262,7 +491,7 @@ Change a polygon into a bunch of text polygons
 void DeformText( const char *text ) {
 	int		i;
 	vec3_t	origin, width, height;
-	int		len;
+	size_t	len;
 	int		ch;
 	byte	color[4];
 	float	bottom, top;
@@ -333,80 +562,87 @@ GlobalVectorToLocal
 ==================
 */
 static void GlobalVectorToLocal( const vec3_t in, vec3_t out ) {
-	out[0] = DotProduct( in, backEnd.or.axis[0] );
-	out[1] = DotProduct( in, backEnd.or.axis[1] );
-	out[2] = DotProduct( in, backEnd.or.axis[2] );
+	out[0] = DotProduct( in, backEnd.ori.axis[0] );
+	out[1] = DotProduct( in, backEnd.ori.axis[1] );
+	out[2] = DotProduct( in, backEnd.ori.axis[2] );
 }
 
 /*
 =====================
 AutospriteDeform
 
-Assuming all the triangles for this shader are independent
+Assuming all the triangles for this shader are independant
 quads, rebuild them as forward facing sprites
 =====================
 */
-static void AutospriteDeform( void ) {
-	int		i;
-	int		oldVerts;
-	float	*xyz;
-	vec3_t	mid, delta;
-	float	radius;
-	vec3_t	left, up;
-	vec3_t	leftDir, upDir;
+static void AutospriteDeform(void) {
+    int		i;
+    int		oldVerts;
+    float* xyz;
+    vec3_t	mid, delta;
+    float	radius;
+    vec3_t	left, up;
+    vec3_t	leftDir, upDir;
 
-	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite shader %s had odd vertex count\n", tess.shader->name );
-	}
-	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite shader %s had odd index count\n", tess.shader->name );
-	}
-
-	oldVerts = tess.numVertexes;
-	tess.numVertexes = 0;
-	tess.numIndexes = 0;
-
-	if ( backEnd.currentEntity != &tr.worldEntity ) {
-		GlobalVectorToLocal( backEnd.viewParms.or.axis[1], leftDir );
-		GlobalVectorToLocal( backEnd.viewParms.or.axis[2], upDir );
-	} else {
-		VectorCopy( backEnd.viewParms.or.axis[1], leftDir );
-		VectorCopy( backEnd.viewParms.or.axis[2], upDir );
-	}
-
-	for ( i = 0 ; i < oldVerts ; i+=4 ) {
-		// find the midpoint
-		xyz = tess.xyz[i];
-
-		mid[0] = 0.25f * (xyz[0] + xyz[4] + xyz[8] + xyz[12]);
-		mid[1] = 0.25f * (xyz[1] + xyz[5] + xyz[9] + xyz[13]);
-		mid[2] = 0.25f * (xyz[2] + xyz[6] + xyz[10] + xyz[14]);
-
-		VectorSubtract( xyz, mid, delta );
-		radius = VectorLength( delta ) * 0.707f;		// / sqrt(2)
-
-		VectorScale( leftDir, radius, left );
-		VectorScale( upDir, radius, up );
-
-		if ( backEnd.viewParms.isMirror ) {
-			VectorSubtract( vec3_origin, left, left );
-		}
-
-	  // compensate for scale in the axes if necessary
-  	if ( backEnd.currentEntity->e.nonNormalizedAxes ) {
-      float axisLength;
-		  axisLength = VectorLength( backEnd.currentEntity->e.axis[0] );
-  		if ( !axisLength ) {
-	  		axisLength = 0;
-  		} else {
-	  		axisLength = 1.0f / axisLength;
-  		}
-      VectorScale(left, axisLength, left);
-      VectorScale(up, axisLength, up);
+    if (tess.numVertexes & 3) {
+        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd vertex count\n", tess.shader->name);
+    }
+    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
+        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd index count\n", tess.shader->name);
     }
 
-		RB_AddQuadStamp( mid, left, up, tess.vertexColors[i] );
-	}
+    oldVerts = tess.numVertexes;
+    tess.numVertexes = 0;
+    tess.numIndexes = 0;
+
+    if (backEnd.currentEntity != &tr.worldEntity) {
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
+    } else {
+        VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
+        VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
+    }
+
+    for (i = 0; i < oldVerts; i += 4) {
+        // find the midpoint
+        xyz = tess.xyz[i];
+
+        mid[0] = 0.25f * (xyz[0] + xyz[4] + xyz[8] + xyz[12]);
+        mid[1] = 0.25f * (xyz[1] + xyz[5] + xyz[9] + xyz[13]);
+        mid[2] = 0.25f * (xyz[2] + xyz[6] + xyz[10] + xyz[14]);
+
+        VectorSubtract(xyz, mid, delta);
+        radius = VectorLength(delta) * 0.707f;		// / sqrt(2)
+
+        VectorScale(leftDir, radius, left);
+        VectorScale(upDir, radius, up);
+
+        if (backEnd.viewParms.isMirror) {
+            VectorSubtract(vec3_origin, left, left);
+        }
+
+        // compensate for scale in the axes if necessary
+        if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes) {
+            float axisLength;
+
+			if (backEnd.currentStaticModel) {
+				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
+			} else {
+				axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
+			}
+            
+            if (!axisLength) {
+                axisLength = 0;
+            }
+            else {
+                axisLength = 1.0f / axisLength;
+            }
+            VectorScale(left, axisLength, left);
+            VectorScale(up, axisLength, up);
+        }
+
+        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
+    }
 }
 
 
@@ -419,48 +655,54 @@ Autosprite2 will pivot a rectangular quad along the center of its long axis
 */
 int edgeVerts[6][2] = {
 	{ 0, 1 },
-	{ 0, 2 },
 	{ 0, 3 },
-	{ 1, 2 },
+	{ 0, 2 },
 	{ 1, 3 },
-	{ 2, 3 }
+	{ 1, 2 },
+	{ 3, 2 }
 };
 
 static void Autosprite2Deform( void ) {
-	int		i, j, k;
+	int		i, j;
 	int		indexes;
 	float	*xyz;
 	vec3_t	forward;
 
 	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count\n", tess.shader->name );
 	}
 	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count\n", tess.shader->name );
 	}
 
-	if ( backEnd.currentEntity != &tr.worldEntity ) {
-		GlobalVectorToLocal( backEnd.viewParms.or.axis[0], forward );
+	if ( backEnd.currentStaticModel || backEnd.currentEntity != &tr.worldEntity ) {
+		GlobalVectorToLocal( backEnd.viewParms.ori.axis[0], forward );
 	} else {
-		VectorCopy( backEnd.viewParms.or.axis[0], forward );
+		VectorCopy( backEnd.viewParms.ori.axis[0], forward );
 	}
 
 	// this is a lot of work for two triangles...
 	// we could precalculate a lot of it is an issue, but it would mess up
 	// the shader abstraction
 	for ( i = 0, indexes = 0 ; i < tess.numVertexes ; i+=4, indexes+=6 ) {
-		float	lengths[2];
-		int		nums[2];
+		float shortLengths[2];
+		int shortNums[2];
+		float longLengths[2];
+		int longNums[2];
 		vec3_t	mid[2];
 		vec3_t	major, minor;
-		float	*v1, *v2;
+		float	*v1, *v2, *v3, *v4;
+		qboolean firstOnLeft, secondOnLeft;
+		float edgeLength;
 
 		// find the midpoint
 		xyz = tess.xyz[i];
 
 		// identify the two shortest edges
-		nums[0] = nums[1] = 0;
-		lengths[0] = lengths[1] = 999999;
+		shortNums[0] = shortNums[1] = 0;
+		shortLengths[0] = shortLengths[1] = 1000000000;
+		longNums[1] = longNums[0] = 0;
+		longLengths[1] = longLengths[0] = 0;
 
 		for ( j = 0 ; j < 6 ; j++ ) {
 			float	l;
@@ -472,20 +714,30 @@ static void Autosprite2Deform( void ) {
 			VectorSubtract( v1, v2, temp );
 			
 			l = DotProduct( temp, temp );
-			if ( l < lengths[0] ) {
-				nums[1] = nums[0];
-				lengths[1] = lengths[0];
-				nums[0] = j;
-				lengths[0] = l;
-			} else if ( l < lengths[1] ) {
-				nums[1] = j;
-				lengths[1] = l;
+			if ( l < shortLengths[0] ) {
+				shortNums[1] = shortNums[0];
+				shortLengths[1] = shortLengths[0];
+				shortNums[0] = j;
+				shortLengths[0] = l;
+			} else if ( l < shortLengths[1] ) {
+				shortNums[1] = j;
+				shortLengths[1] = l;
+			}
+
+			if (l > longLengths[0]) {
+				longNums[1] = longNums[0];
+				longLengths[1] = longLengths[0];
+				longNums[0] = j;
+				longLengths[0] = l;
+			} else if (l > longLengths[1]) {
+				longNums[1] = j;
+				longLengths[1] = l;
 			}
 		}
 
 		for ( j = 0 ; j < 2 ; j++ ) {
-			v1 = xyz + 4 * edgeVerts[nums[j]][0];
-			v2 = xyz + 4 * edgeVerts[nums[j]][1];
+			v1 = xyz + 4 * edgeVerts[shortNums[j]][0];
+			v2 = xyz + 4 * edgeVerts[shortNums[j]][1];
 
 			mid[j][0] = 0.5f * (v1[0] + v2[0]);
 			mid[j][1] = 0.5f * (v1[1] + v2[1]);
@@ -498,36 +750,151 @@ static void Autosprite2Deform( void ) {
 		// cross this with the view direction to get minor axis
 		CrossProduct( major, forward, minor );
 		VectorNormalize( minor );
-		
-		// re-project the points
-		for ( j = 0 ; j < 2 ; j++ ) {
-			float	l;
 
-			v1 = xyz + 4 * edgeVerts[nums[j]][0];
-			v2 = xyz + 4 * edgeVerts[nums[j]][1];
+        v1 = xyz + 4 * edgeVerts[shortNums[0]][0];
+        v2 = xyz + 4 * edgeVerts[shortNums[0]][1];
 
-			l = 0.5 * sqrt( lengths[j] );
-			
-			// we need to see which direction this edge
-			// is used to determine direction of projection
-			for ( k = 0 ; k < 5 ; k++ ) {
-				if ( tess.indexes[ indexes + k ] == i + edgeVerts[nums[j]][0]
-					&& tess.indexes[ indexes + k + 1 ] == i + edgeVerts[nums[j]][1] ) {
-					break;
-				}
-			}
-
-			if ( k == 5 ) {
-				VectorMA( mid[j], l, minor, v1 );
-				VectorMA( mid[j], -l, minor, v2 );
-			} else {
-				VectorMA( mid[j], -l, minor, v1 );
-				VectorMA( mid[j], l, minor, v2 );
-			}
+        // we need to see which direction this edge
+        // is used to determine direction of projection
+		if (edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][0]
+			|| edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][1])
+		{
+			firstOnLeft = qtrue;
 		}
+		else
+		{
+			firstOnLeft = qfalse;
+        }
+
+        if (edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][0]
+            || edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][1])
+        {
+            secondOnLeft = qtrue;
+        }
+        else
+        {
+			secondOnLeft = qfalse;
+        }
+
+		if (firstOnLeft == secondOnLeft)
+        {
+            v3 = xyz + 4 * edgeVerts[shortNums[1]][0];
+            v4 = xyz + 4 * edgeVerts[shortNums[1]][1];
+		}
+		else
+        {
+            v3 = xyz + 4 * edgeVerts[shortNums[1]][1];
+            v4 = xyz + 4 * edgeVerts[shortNums[1]][0];
+		}
+
+        // re-project the points
+		edgeLength = sqrt(shortLengths[0]) * 0.5;
+        v1[0] = -edgeLength * minor[0] + mid[0][0];
+        v1[1] = -edgeLength * minor[1] + mid[0][1];
+        v1[2] = -edgeLength * minor[2] + mid[0][2];
+		v2[0] = minor[0] * edgeLength + mid[0][0];
+        v2[1] = minor[1] * edgeLength + mid[0][1];
+        v2[2] = minor[2] * edgeLength + mid[0][2];
+
+        edgeLength = sqrt(shortLengths[1]) * 0.5;
+		v3[0] = -edgeLength * minor[0] + mid[1][0];
+        v3[1] = -edgeLength * minor[1] + mid[1][1];
+        v3[2] = -edgeLength * minor[2] + mid[1][2];
+		v4[0] = minor[0] * edgeLength + mid[1][0];
+        v4[1] = minor[1] * edgeLength + mid[1][1];
+        v4[2] = minor[2] * edgeLength + mid[1][2];
 	}
 }
 
+static void LightGlowDeform() {
+	int i;
+	int oldVerts;
+	float* xyz;
+	vec3_t mid, delta;
+	float radius, dist, ofs;
+	vec3_t forward, left, up;
+	vec3_t leftDir, upDir;
+
+    if (tess.numVertexes & 3) {
+        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd vertex count\n", tess.shader->name);
+    }
+    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
+        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd index count\n", tess.shader->name);
+    }
+
+	oldVerts = tess.numVertexes;
+	tess.numVertexes = 0;
+	tess.numIndexes = 0;
+
+    if (backEnd.currentEntity == &tr.worldEntity)
+    {
+		VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
+		VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
+    }
+    else
+    {
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
+    }
+
+	for (i = 0; i < oldVerts; i += 4)
+	{
+		xyz = tess.xyz[i];
+
+		mid[0] = (xyz[0] + xyz[4] + xyz[8] + xyz[12]) * 0.25f;
+		mid[1] = (xyz[1] + xyz[5] + xyz[9] + xyz[13]) * 0.25f;
+		mid[2] = (xyz[2] + xyz[6] + xyz[10] + xyz[14]) * 0.25f;
+
+		VectorSubtract(xyz, mid, delta);
+
+		radius = VectorLength(delta) * 0.707f;
+		VectorAdd(mid, backEnd.ori.origin, delta);
+		VectorSubtract(backEnd.viewParms.ori.origin, delta, forward);
+
+		dist = VectorNormalize(forward) - 4.0;
+
+		VectorScale(forward, radius, forward);
+		VectorScale(leftDir, radius, left);
+		VectorScale(upDir, radius, up);
+
+		if (backEnd.viewParms.isMirror)
+		{
+			VectorSubtract(vec3_origin, forward, forward);
+			VectorSubtract(vec3_origin, left, left);
+		}
+
+		if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes)
+		{
+			float axisLength;
+
+			if (backEnd.currentStaticModel) {
+				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
+			} else {
+                axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
+			}
+
+			if (axisLength != 0.0f) {
+				VectorScale(forward, axisLength, forward);
+				VectorScale(left, axisLength, left);
+				VectorScale(up, axisLength, up);
+			} else {
+				VectorClear(forward);
+				VectorClear(left);
+				VectorClear(up);
+			}
+		}
+
+		ofs = VectorLength(forward);
+        if (ofs > dist)
+        {
+            VectorNormalizeFast(forward);
+			VectorScale(forward, dist, forward);
+        }
+
+		VectorAdd(mid, forward, mid);
+        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
+	}
+}
 
 /*
 =====================
@@ -557,24 +924,20 @@ void RB_DeformTessGeometry( void ) {
 		case DEFORM_MOVE:
 			RB_CalcMoveVertexes( ds );
 			break;
-		case DEFORM_PROJECTION_SHADOW:
-			RB_ProjectionShadowDeform();
-			break;
 		case DEFORM_AUTOSPRITE:
 			AutospriteDeform();
 			break;
 		case DEFORM_AUTOSPRITE2:
 			Autosprite2Deform();
 			break;
-		case DEFORM_TEXT0:
-		case DEFORM_TEXT1:
-		case DEFORM_TEXT2:
-		case DEFORM_TEXT3:
-		case DEFORM_TEXT4:
-		case DEFORM_TEXT5:
-		case DEFORM_TEXT6:
-		case DEFORM_TEXT7:
-			DeformText( backEnd.refdef.text[ds->deformation - DEFORM_TEXT0] );
+		case DEFORM_LIGHTGLOW:
+			LightGlowDeform();
+			break;
+		case DEFORM_FLAP_S:
+			RB_CalcFlapVertexes(ds, USE_S_COORDS);
+			break;
+		case DEFORM_FLAP_T:
+			RB_CalcFlapVertexes(ds, USE_T_COORDS);
 			break;
 		}
 	}
@@ -631,7 +994,178 @@ void RB_CalcColorFromOneMinusEntity( unsigned char *dstColors )
 
 	for ( i = 0; i < tess.numVertexes; i++, pColors++ )
 	{
-		*pColors = c;
+		*pColors = * ( int * ) invModulate;
+	}
+}
+
+/*
+** RB_CalcColorFromConstant
+*/
+void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++) {
+		dstColors[i * 4] = constantColor[0];
+		dstColors[i * 4 + 1] = constantColor[1];
+		dstColors[i * 4 + 2] = constantColor[2];
+		dstColors[i * 4 + 3] = constantColor[3];
+	}
+}
+
+/*
+** RB_CalcRGBFromDot
+*/
+void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcRGBFromOneMinusDot
+*/
+void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromConstant
+*/
+void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++) {
+		dstColors[i * 4 + 3] = constantAlpha;
+	}
+}
+
+/*
+** RB_CalcAlphaFromDot
+*/
+void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromHeightFade
+*/
+void RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	float dist;
+	float alpha;
+
+	for (i = 0; i < tess.numVertexes; i++) {
+		dist = fabs(backEnd.ori.viewOrigin[2] - tess.xyz[i][2]);
+		dist = Q_clamp_float(dist, alphaMin, alphaMax);
+		// Calculate the alpha height
+		alpha = (dist - alphaMin) / (alphaMax - alphaMin);
+		colors[i * 4 + 3] = (unsigned char)((1.f - alpha) * 255.0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromOneMinusDot
+*/
+void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromTexCoords
+*/
+void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
+		float f;
+
+        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - alphaCap), 0);
+		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
+	
+		colors[3] = (unsigned char)f;
+	}
+}
+
+/*
+** RB_CalcRGBFromTexCoords
+*/
+void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
+		float f;
+
+        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - alphaCap), 0);
+		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)f;
 	}
 }
 
@@ -674,7 +1208,7 @@ void RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors )
 /*
 ** RB_CalcWaveColor
 */
-void RB_CalcWaveColor( const waveForm_t *wf, unsigned char *dstColors )
+void RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor)
 {
 	int i;
 	int v;
@@ -696,10 +1230,20 @@ void RB_CalcWaveColor( const waveForm_t *wf, unsigned char *dstColors )
 		glow = 1;
 	}
 
-	v = ri.ftol(255 * glow);
-	color[0] = color[1] = color[2] = v;
+	if (constantColor)
+	{
+		color[0] = constantColor[0] * glow;
+		color[1] = constantColor[1] * glow;
+		color[2] = constantColor[2] * glow;
+	}
+	else
+	{
+		v = myftol(255 * glow);
+		color[0] = color[1] = color[2] = v;
+	}
+
 	color[3] = 255;
-	v = *(int *)color;
+	v = *(int*)color;
 	
 	for ( i = 0; i < tess.numVertexes; i++, colors++ ) {
 		*colors = v;
@@ -725,65 +1269,6 @@ void RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors )
 	}
 }
 
-/*
-** RB_CalcModulateColorsByFog
-*/
-void RB_CalcModulateColorsByFog( unsigned char *colors ) {
-	int		i;
-	float	texCoords[SHADER_MAX_VERTEXES][2];
-
-	// calculate texcoords so we can derive density
-	// this is not wasted, because it would only have
-	// been previously called if the surface was opaque
-	RB_CalcFogTexCoords( texCoords[0] );
-
-	for ( i = 0; i < tess.numVertexes; i++, colors += 4 ) {
-		float f = 1.0 - R_FogFactor( texCoords[i][0], texCoords[i][1] );
-		colors[0] *= f;
-		colors[1] *= f;
-		colors[2] *= f;
-	}
-}
-
-/*
-** RB_CalcModulateAlphasByFog
-*/
-void RB_CalcModulateAlphasByFog( unsigned char *colors ) {
-	int		i;
-	float	texCoords[SHADER_MAX_VERTEXES][2];
-
-	// calculate texcoords so we can derive density
-	// this is not wasted, because it would only have
-	// been previously called if the surface was opaque
-	RB_CalcFogTexCoords( texCoords[0] );
-
-	for ( i = 0; i < tess.numVertexes; i++, colors += 4 ) {
-		float f = 1.0 - R_FogFactor( texCoords[i][0], texCoords[i][1] );
-		colors[3] *= f;
-	}
-}
-
-/*
-** RB_CalcModulateRGBAsByFog
-*/
-void RB_CalcModulateRGBAsByFog( unsigned char *colors ) {
-	int		i;
-	float	texCoords[SHADER_MAX_VERTEXES][2] = {{0.0f}};
-
-	// calculate texcoords so we can derive density
-	// this is not wasted, because it would only have
-	// been previously called if the surface was opaque
-	RB_CalcFogTexCoords( texCoords[0] );
-
-	for ( i = 0; i < tess.numVertexes; i++, colors += 4 ) {
-		float f = 1.0 - R_FogFactor( texCoords[i][0], texCoords[i][1] );
-		colors[0] *= f;
-		colors[1] *= f;
-		colors[2] *= f;
-		colors[3] *= f;
-	}
-}
-
 
 /*
 ====================================================================
@@ -793,95 +1278,6 @@ TEX COORDS
 ====================================================================
 */
 
-/*
-========================
-RB_CalcFogTexCoords
-
-To do the clipped fog plane really correctly, we should use
-projected textures, but I don't trust the drivers and it
-doesn't fit our shader data.
-========================
-*/
-void RB_CalcFogTexCoords( float *st ) {
-	int			i;
-	float		*v;
-	float		s, t;
-	float		eyeT;
-	qboolean	eyeOutside;
-	fog_t		*fog;
-	vec3_t		local;
-	vec4_t		fogDistanceVector, fogDepthVector = {0, 0, 0, 0};
-
-	fog = tr.world->fogs + tess.fogNum;
-
-	// all fogging distance is based on world Z units
-	VectorSubtract( backEnd.or.origin, backEnd.viewParms.or.origin, local );
-	fogDistanceVector[0] = -backEnd.or.modelMatrix[2];
-	fogDistanceVector[1] = -backEnd.or.modelMatrix[6];
-	fogDistanceVector[2] = -backEnd.or.modelMatrix[10];
-	fogDistanceVector[3] = DotProduct( local, backEnd.viewParms.or.axis[0] );
-
-	// scale the fog vectors based on the fog's thickness
-	fogDistanceVector[0] *= fog->tcScale;
-	fogDistanceVector[1] *= fog->tcScale;
-	fogDistanceVector[2] *= fog->tcScale;
-	fogDistanceVector[3] *= fog->tcScale;
-
-	// rotate the gradient vector for this orientation
-	if ( fog->hasSurface ) {
-		fogDepthVector[0] = fog->surface[0] * backEnd.or.axis[0][0] + 
-			fog->surface[1] * backEnd.or.axis[0][1] + fog->surface[2] * backEnd.or.axis[0][2];
-		fogDepthVector[1] = fog->surface[0] * backEnd.or.axis[1][0] + 
-			fog->surface[1] * backEnd.or.axis[1][1] + fog->surface[2] * backEnd.or.axis[1][2];
-		fogDepthVector[2] = fog->surface[0] * backEnd.or.axis[2][0] + 
-			fog->surface[1] * backEnd.or.axis[2][1] + fog->surface[2] * backEnd.or.axis[2][2];
-		fogDepthVector[3] = -fog->surface[3] + DotProduct( backEnd.or.origin, fog->surface );
-
-		eyeT = DotProduct( backEnd.or.viewOrigin, fogDepthVector ) + fogDepthVector[3];
-	} else {
-		eyeT = 1;	// non-surface fog always has eye inside
-	}
-
-	// see if the viewpoint is outside
-	// this is needed for clipping distance even for constant fog
-
-	if ( eyeT < 0 ) {
-		eyeOutside = qtrue;
-	} else {
-		eyeOutside = qfalse;
-	}
-
-	fogDistanceVector[3] += 1.0/512;
-
-	// calculate density for each point
-	for (i = 0, v = tess.xyz[0] ; i < tess.numVertexes ; i++, v += 4) {
-		// calculate the length in fog
-		s = DotProduct( v, fogDistanceVector ) + fogDistanceVector[3];
-		t = DotProduct( v, fogDepthVector ) + fogDepthVector[3];
-
-		// partially clipped fogs use the T axis		
-		if ( eyeOutside ) {
-			if ( t < 1.0 ) {
-				t = 1.0/32;	// point is outside, so no fogging
-			} else {
-				t = 1.0/32 + 30.0/32 * t / ( t - eyeT );	// cut the distance at the fog plane
-			}
-		} else {
-			if ( t < 0 ) {
-				t = 1.0/32;	// point is outside, so no fogging
-			} else {
-				t = 31.0/32;
-			}
-		}
-
-		st[0] = s;
-		st[1] = t;
-		st += 2;
-	}
-}
-
-
-
 /*
 ** RB_CalcEnvironmentTexCoords
 */
@@ -897,7 +1293,7 @@ void RB_CalcEnvironmentTexCoords( float *st )
 
 	for (i = 0 ; i < tess.numVertexes ; i++, v += 4, normal += 4, st += 2 ) 
 	{
-		VectorSubtract (backEnd.or.viewOrigin, v, viewer);
+		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
 		VectorNormalizeFast (viewer);
 
 		d = DotProduct (normal, viewer);
@@ -911,13 +1307,98 @@ void RB_CalcEnvironmentTexCoords( float *st )
 	}
 }
 
+/*
+** RB_CalcEnvironmentTexCoords
+*/
+void RB_CalcEnvironmentTexCoords2(float* st)
+{
+    int			i;
+    float* v, * normal;
+    vec3_t		viewer, reflected, worldReflected;
+    float		d;
+
+    v = tess.xyz[0];
+    normal = tess.normal[0];
+
+    for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2)
+    {
+        VectorSubtract(backEnd.ori.viewOrigin, v, viewer);
+        VectorNormalizeFast(viewer);
+
+        d = DotProduct(normal, viewer);
+		if (d > 0.0f) {
+			VectorCopy(viewer, reflected);
+		} else {
+            d *= -2;
+            reflected[0] = normal[0] * d + viewer[0];
+            reflected[1] = normal[1] * d + viewer[1];
+            reflected[2] = normal[2] * d + viewer[2];
+		}
+
+		worldReflected[0] = reflected[0] * backEnd.ori.axis[0][0];
+		worldReflected[2] = reflected[0] * backEnd.ori.axis[0][2];
+		worldReflected[0] = backEnd.ori.axis[1][0] * reflected[1] + worldReflected[0];
+		worldReflected[2] = backEnd.ori.axis[1][2] * reflected[1] + worldReflected[2];
+		worldReflected[0] = backEnd.ori.axis[2][0] * reflected[2] + worldReflected[0];
+		worldReflected[2] = backEnd.ori.axis[2][2] * reflected[2] + worldReflected[2];
+
+        st[0] = 0.5 + reflected[1] * 0.5;
+        st[1] = 0.5 - reflected[2] * 0.5;
+    }
+}
+
+/*
+** RB_CalcSunReflectionTexCoords
+*/
+void RB_CalcSunReflectionTexCoords(float* st) {
+	int i;
+	vec3_t viewer;
+	vec3_t reflected;
+	vec3_t sunReflected;
+	float d;
+	float* v;
+	float* normal;
+	vec3_t sunAxis[3];
+
+    v = tess.xyz[0];
+    normal = tess.normal[0];
+    sunAxis[0][0] = tr.sunDirection[0];
+    sunAxis[0][1] = tr.sunDirection[1];
+    sunAxis[0][2] = tr.sunDirection[2];
+    sunAxis[1][0] = tr.sunDirection[1];
+    sunAxis[1][1] = -tr.sunDirection[0];
+    sunAxis[1][2] = 0.0;
+    VectorNormalizeFast(sunAxis[1]);
+    CrossProduct(sunAxis[0], sunAxis[1], sunAxis[2]);
+
+	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
+		VectorSubtract(v, backEnd.ori.viewOrigin, viewer);
+		VectorNormalizeFast(viewer);
+
+		d = DotProduct(viewer, normal);
+		if (d > 0) {
+			VectorCopy(viewer, reflected);
+		} else {
+			d *= -2;
+			VectorMA(viewer, d, normal, reflected);
+		}
+
+		VectorScale(sunAxis[0], reflected[0], sunReflected);
+		VectorMA(sunReflected, reflected[2], sunAxis[1], sunReflected);
+		VectorMA(sunReflected, -reflected[1], sunAxis[2], sunReflected);
+
+		st[0] = sunReflected[1] + 0.5;
+		st[1] = sunReflected[2] + 0.5;
+	}
+}
+
 /*
 ** RB_CalcTurbulentTexCoords
 */
 void RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *st )
 {
 	int i;
-	double now;
+	float now;
 
 	now = ( wf->phase + tess.shaderTime * wf->frequency );
 
@@ -926,8 +1407,8 @@ void RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *st )
 		float s = st[0];
 		float t = st[1];
 
-		st[0] = s + tr.sinTable[ ( ( int64_t ) ( ( ( tess.xyz[i][0] + tess.xyz[i][2] )* 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
-		st[1] = t + tr.sinTable[ ( ( int64_t ) ( ( tess.xyz[i][1] * 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
+		st[0] = s + tr.sinTable[ ( ( int ) ( ( ( tess.xyz[i][0] + tess.xyz[i][2] )* 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
+		st[1] = t + tr.sinTable[ ( ( int ) ( ( tess.xyz[i][1] * 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
 	}
 }
 
@@ -945,14 +1426,140 @@ void RB_CalcScaleTexCoords( const float scale[2], float *st )
 	}
 }
 
+/*
+** RB_CalcOffsetTexCoords
+*/
+void RB_CalcOffsetTexCoords( const float *offset, float *st )
+{
+	int i;
+	float offsetS, offsetT;
+
+	if (offset[0] != 1234567) {
+		offsetS = offset[0];
+	} else if (backEnd.currentEntity) {
+        offsetS = backEnd.currentEntity->e.shader_data[0];
+    } else {
+        offsetS = r_static_shaderdata0->value;
+    }
+
+	if (offset[0] != 1234567) {
+		offsetT = offset[1];
+	} else if (backEnd.currentEntity) {
+		offsetT = backEnd.currentEntity->e.shader_data[1];
+    } else {
+		offsetT = r_static_shaderdata1->value;
+    }
+
+    if (!backEnd.currentEntity) {
+        offsetS = offsetS * r_static_shadermultiplier0->value;
+        offsetT = offsetT * r_static_shadermultiplier1->value;
+    }
+
+	for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		float s, t;
+
+		s = st[0];
+		t = st[1];
+
+		st[0] = s + offsetS;
+		st[1] = t + offsetT;
+	}
+}
+
+/*
+** RB_CalcParallaxTexCoords
+*/
+void RB_CalcParallaxTexCoords( const float *rate, float *st )
+{
+	int i;
+	float offsetS, offsetT;
+
+    offsetS = tr.refdef.vieworg[0] * rate[0];
+    offsetT = tr.refdef.vieworg[1] * rate[1];
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		st[0] += offsetS;
+		st[1] += offsetT;
+    }
+}
+
+static vec3_t rb_baseaxis[18];
+
+
+void RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv)
+{
+	int bestaxis;
+	vec_t dot;
+	vec_t best;
+	int i;
+
+	if (normal[0] == 1) {
+		bestaxis = 2;
+	} else if (normal[0] == -1) {
+		bestaxis = 3;
+	} else if (normal[1] == 1) {
+		bestaxis = 4;
+	} else if (normal[1] == -1) {
+		bestaxis = 5;
+	} else if (normal[2] == 1) {
+		bestaxis = 0;
+	} else if (normal[2] == -1) {
+		bestaxis = 1;
+	} else {
+		best = 0;
+		bestaxis = 0;
+
+		for (i = 0; i < 6; i++) {
+			dot = DotProduct(rb_baseaxis[i * 3], normal);
+			if (dot > best) {
+				best = dot;
+				bestaxis = i;
+			}
+		}
+	}
+
+	VectorCopy(rb_baseaxis[bestaxis * 3 + 1], xv);
+	VectorCopy(rb_baseaxis[bestaxis * 3 + 2], yv);
+}
+
+void RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2])
+{
+	RB_TextureAxisFromPlane(normal, mappingVecs[0], mappingVecs[1]);
+
+	VectorScale(mappingVecs[0], scale[0], mappingVecs[0]);
+	VectorScale(mappingVecs[1], scale[1], mappingVecs[1]);
+}
+
+/*
+** RB_CalcMacroTexCoords
+*/
+void RB_CalcMacroTexCoords( const  float* rate, float *st )
+{
+	int i;
+	vec3_t vecs[2];
+	vec_t* v;
+	vec_t* normal;
+	float width, height;
+    v = tess.xyz[0];
+
+    normal = tess.normal[0];
+    width = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadWidth;
+    height = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadHeight;
+
+	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
+		RB_QuakeTextureVecs(normal, rate, vecs);
+		st[0] = DotProduct(vecs[0], v) / width;
+		st[1] = DotProduct(vecs[1], v) / height;
+	}
+}
+
 /*
 ** RB_CalcScrollTexCoords
 */
 void RB_CalcScrollTexCoords( const float scrollSpeed[2], float *st )
 {
 	int i;
-	double timeScale = tess.shaderTime;
-	double adjustedScrollS, adjustedScrollT;
+	float timeScale = tess.shaderTime;
+	float adjustedScrollS, adjustedScrollT;
 
 	adjustedScrollS = scrollSpeed[0] * timeScale;
 	adjustedScrollT = scrollSpeed[1] * timeScale;
@@ -989,15 +1596,24 @@ void RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *st  )
 /*
 ** RB_CalcRotateTexCoords
 */
-void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
+void RB_CalcRotateTexCoords(float degsPerSecond, float degsPerSecondCoef, float* st, float start)
 {
-	double timeScale = tess.shaderTime;
-	double degs;
-	int64_t index;
+	float timeScale = tess.shaderTime;
+	float degs;
+	int index;
 	float sinValue, cosValue;
 	texModInfo_t tmi;
 
-	degs = -degsPerSecond * timeScale;
+    if (degsPerSecond != 1234567) {
+		degs = -degsPerSecond * degsPerSecondCoef * tess.shaderTime - start;
+	} else if (backEnd.currentEntity) {
+		degs = -backEnd.currentEntity->e.shader_data[0] * degsPerSecondCoef * tess.shaderTime - start;
+	} else {
+		degs = r_static_shaderdata0->value;
+	}
+	if (!backEnd.currentEntity) {
+		degs *= r_static_shadermultiplier0->value;
+	}
 	index = degs * ( FUNCTABLE_SIZE / 360.0f );
 
 	sinValue = tr.sinTable[ index & FUNCTABLE_MASK ];
@@ -1015,6 +1631,21 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 }
 
 
+
+
+
+
+#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+
+long myftol( float f ) {
+	static int tmp;
+	__asm fld f
+	__asm fistp tmp
+	__asm mov eax, tmp
+}
+
+#endif
+
 /*
 ** RB_CalcSpecularAlpha
 **
@@ -1022,7 +1653,7 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 */
 vec3_t lightOrigin = { -960, 1980, 96 };		// FIXME: track dynamically
 
-void RB_CalcSpecularAlpha( unsigned char *alphas ) {
+void RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin) {
 	int			i;
 	float		*v, *normal;
 	vec3_t		viewer,  reflected;
@@ -1054,7 +1685,7 @@ void RB_CalcSpecularAlpha( unsigned char *alphas ) {
 		reflected[1] = normal[1]*2*d - lightDir[1];
 		reflected[2] = normal[2]*2*d - lightDir[2];
 
-		VectorSubtract (backEnd.or.viewOrigin, v, viewer);
+		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
 		ilength = Q_rsqrt( DotProduct( viewer, viewer ) );
 		l = DotProduct (reflected, viewer);
 		l *= ilength;
@@ -1074,12 +1705,99 @@ void RB_CalcSpecularAlpha( unsigned char *alphas ) {
 	}
 }
 
+void RB_CalcLightGridColor(unsigned char* colors)
+{
+	int i;
+
+	if (!backEnd.currentEntity) {
+		for (i = 0; i < tess.numVertexes; i++) {
+			colors[i * 4] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[0];
+			colors[i * 4 + 1] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[1];
+			colors[i * 4 + 2] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[2];
+			colors[i * 4 + 3] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[3];
+		}
+	}
+	else if (backEnd.currentEntity != &tr.worldEntity) {
+		for (i = 0; i < tess.numVertexes; i++) {
+			colors[i * 4] = ((byte*)&backEnd.currentEntity->iGridLighting)[0];
+			colors[i * 4 + 1] = ((byte*)&backEnd.currentEntity->iGridLighting)[1];
+			colors[i * 4 + 2] = ((byte*)&backEnd.currentEntity->iGridLighting)[2];
+			colors[i * 4 + 3] = ((byte*)&backEnd.currentEntity->iGridLighting)[3];
+		}
+	}
+	else {
+		Com_Printf(
+			"##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
+			tess.shader->name);
+
+		for (i = 0; i < tess.numVertexes; i++) {
+			colors[i * 4] = 0xFF;
+			colors[i * 4 + 1] = 0xFF;
+			colors[i * 4 + 2] = 0xFF;
+			colors[i * 4 + 3] = 0xFF;
+		}
+	}
+}
+
+void RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+        union {
+            float f;
+            int i;
+        } u;
+
+		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(viewInModel, tess.normal[i]);
+        u.f = fabs(u.f);
+        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+
+		u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+        u.i &= ~(u.i >> 31);
+		colors[3] = u.i;
+	}
+}
+
+void RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+        union {
+            float f;
+            int i;
+        } u;
+
+		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(viewInModel, tess.normal[i]);
+        u.f = fabs(u.f);
+		u.f = 1.0 - u.f;
+        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+        
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+        u.i &= ~(u.i >> 31);
+		colors[3] = u.i;
+	}
+}
+
 /*
 ** RB_CalcDiffuseColor
 **
 ** The basic vertex lighting calc
 */
-static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
+void RB_CalcDiffuseColor( unsigned char *colors )
 {
 	int				i, j;
 	float			*v, *normal;
@@ -1090,53 +1808,101 @@ static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
 	vec3_t			lightDir;
 	vec3_t			directedLight;
 	int				numVertexes;
+#if idppc_altivec
+	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff);
+	vector float ambientLightVec;
+	vector float directedLightVec;
+	vector float lightDirVec;
+	vector float normalVec0, normalVec1;
+	vector float incomingVec0, incomingVec1, incomingVec2;
+	vector float zero, jVec;
+	vector signed int jVecInt;
+	vector signed short jVecShort;
+	vector unsigned char jVecChar, normalPerm;
+#endif
 	ent = backEnd.currentEntity;
 	ambientLightInt = ent->ambientLightInt;
+#if idppc_altivec
+	// A lot of this could be simplified if we made sure
+	// entities light info was 16-byte aligned.
+	jVecChar = vec_lvsl(0, ent->ambientLight);
+	ambientLightVec = vec_ld(0, (vector float *)ent->ambientLight);
+	jVec = vec_ld(11, (vector float *)ent->ambientLight);
+	ambientLightVec = vec_perm(ambientLightVec,jVec,jVecChar);
+
+	jVecChar = vec_lvsl(0, ent->directedLight);
+	directedLightVec = vec_ld(0,(vector float *)ent->directedLight);
+	jVec = vec_ld(11,(vector float *)ent->directedLight);
+	directedLightVec = vec_perm(directedLightVec,jVec,jVecChar);	 
+
+	jVecChar = vec_lvsl(0, ent->lightDir);
+	lightDirVec = vec_ld(0,(vector float *)ent->lightDir);
+	jVec = vec_ld(11,(vector float *)ent->lightDir);
+	lightDirVec = vec_perm(lightDirVec,jVec,jVecChar);	 
+
+	zero = (vector float)vec_splat_s8(0);
+	VectorCopy( ent->lightDir, lightDir );
+#else
 	VectorCopy( ent->ambientLight, ambientLight );
 	VectorCopy( ent->directedLight, directedLight );
 	VectorCopy( ent->lightDir, lightDir );
+#endif
 
 	v = tess.xyz[0];
 	normal = tess.normal[0];
 
+#if idppc_altivec
+	normalPerm = vec_lvsl(0,normal);
+#endif
 	numVertexes = tess.numVertexes;
 	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
+#if idppc_altivec
+		normalVec0 = vec_ld(0,(vector float *)normal);
+		normalVec1 = vec_ld(11,(vector float *)normal);
+		normalVec0 = vec_perm(normalVec0,normalVec1,normalPerm);
+		incomingVec0 = vec_madd(normalVec0, lightDirVec, zero);
+		incomingVec1 = vec_sld(incomingVec0,incomingVec0,4);
+		incomingVec2 = vec_add(incomingVec0,incomingVec1);
+		incomingVec1 = vec_sld(incomingVec1,incomingVec1,4);
+		incomingVec2 = vec_add(incomingVec2,incomingVec1);
+		incomingVec0 = vec_splat(incomingVec2,0);
+		incomingVec0 = vec_max(incomingVec0,zero);
+		normalPerm = vec_lvsl(12,normal);
+		jVec = vec_madd(incomingVec0, directedLightVec, ambientLightVec);
+		jVecInt = vec_cts(jVec,0);	// RGBx
+		jVecShort = vec_pack(jVecInt,jVecInt);		// RGBxRGBx
+		jVecChar = vec_packsu(jVecShort,jVecShort);	// RGBxRGBxRGBxRGBx
+		jVecChar = vec_sel(jVecChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
+		vec_ste((vector unsigned int)jVecChar,0,(unsigned int *)&colors[i*4]);	// store color
+#else
 		incoming = DotProduct (normal, lightDir);
 		if ( incoming <= 0 ) {
 			*(int *)&colors[i*4] = ambientLightInt;
 			continue;
 		} 
-		j = ri.ftol(ambientLight[0] + incoming * directedLight[0]);
+		j = myftol( ambientLight[0] + incoming * directedLight[0] );
 		if ( j > 255 ) {
 			j = 255;
 		}
 		colors[i*4+0] = j;
 
-		j = ri.ftol(ambientLight[1] + incoming * directedLight[1]);
+		j = myftol( ambientLight[1] + incoming * directedLight[1] );
 		if ( j > 255 ) {
 			j = 255;
 		}
 		colors[i*4+1] = j;
 
-		j = ri.ftol(ambientLight[2] + incoming * directedLight[2]);
+		j = myftol( ambientLight[2] + incoming * directedLight[2] );
 		if ( j > 255 ) {
 			j = 255;
 		}
 		colors[i*4+2] = j;
 
 		colors[i*4+3] = 255;
-	}
-}
-
-void RB_CalcDiffuseColor( unsigned char *colors )
-{
-#if idppc_altivec
-	if (com_altivec->integer) {
-		// must be in a separate translation unit or G3 systems will crash.
-		RB_CalcDiffuseColor_altivec( colors );
-		return;
-	}
 #endif
-	RB_CalcDiffuseColor_scalar( colors );
+	}
 }
 
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 2384a118..743da297 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -23,29 +23,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tr_shader.c -- this file deals with the parsing and definition of shaders
 
+
+typedef struct shadertext_s {
+    char name[64];
+    char* text;
+    shader_t* shader;
+    struct shadertext_s* next;
+} shadertext_t;
+
 static char *s_shaderText;
 
 // the shader is parsed into these global variables, then copied into
 // dynamically allocated memory if it is valid.
-static	shaderStage_t	stages[MAX_SHADER_STAGES];		
+static	shaderStage_t	unfoggedStages[MAX_SHADER_STAGES];		
 static	shader_t		shader;
 static	texModInfo_t	texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
 
-#define FILE_HASH_SIZE		1024
-static	shader_t*		hashTable[FILE_HASH_SIZE];
+#define FILE_HASH_SIZE		8192
 
-#define MAX_SHADERTEXT_HASH		2048
-static char **shaderTextHashTable[MAX_SHADERTEXT_HASH];
+static qboolean shader_noPicMip;
+static qboolean shader_noMipMaps;
+static qboolean shader_force32bit;
+static shadertext_t* currentShader = NULL;
+static shadertext_t* hashTable[FILE_HASH_SIZE];
+
+#define GL_CLAMP_TO_EDGE 0x812F
 
 /*
 ================
 return a hash value for the filename
 ================
 */
-#ifdef __GNUCC__
-  #warning TODO: check if long is ok here 
-#endif
-static long generateHashValue( const char *fname, const int size ) {
+static long generateHashValue( const char *fname ) {
 	int		i;
 	long	hash;
 	char	letter;
@@ -61,53 +70,64 @@ static long generateHashValue( const char *fname, const int size ) {
 		i++;
 	}
 	hash = (hash ^ (hash >> 10) ^ (hash >> 20));
-	hash &= (size-1);
+	hash &= (FILE_HASH_SIZE-1);
 	return hash;
 }
 
-void R_RemapShader(const char *shaderName, const char *newShaderName, const char *timeOffset) {
-	char		strippedName[MAX_QPATH];
-	int			hash;
-	shader_t	*sh, *sh2;
-	qhandle_t	h;
+static shadertext_t* AddShaderTextToHash(const char* name, int hash)
+{
+	shadertext_t* shader;
 
-	sh = R_FindShaderByName( shaderName );
-	if (sh == NULL || sh == tr.defaultShader) {
-		h = RE_RegisterShaderLightMap(shaderName, 0);
-		sh = R_GetShaderByHandle(h);
-	}
-	if (sh == NULL || sh == tr.defaultShader) {
-		ri.Printf( PRINT_WARNING, "WARNING: R_RemapShader: shader %s not found\n", shaderName );
-		return;
-	}
+    shader = (shadertext_t*)ri.Malloc(sizeof(shadertext_t));
 
-	sh2 = R_FindShaderByName( newShaderName );
-	if (sh2 == NULL || sh2 == tr.defaultShader) {
-		h = RE_RegisterShaderLightMap(newShaderName, 0);
-		sh2 = R_GetShaderByHandle(h);
-	}
+    Com_Memset(shader, 0, sizeof(shadertext_t));
+    strncpy(shader->name, name, sizeof(shader->name));
+    shader->next = hashTable[hash];
 
-	if (sh2 == NULL || sh2 == tr.defaultShader) {
-		ri.Printf( PRINT_WARNING, "WARNING: R_RemapShader: new shader %s not found\n", newShaderName );
-		return;
-	}
+    hashTable[hash] = shader;
+    return shader;
+}
 
-	// remap all the shaders with the given name
-	// even tho they might have different lightmaps
-	COM_StripExtension(shaderName, strippedName, sizeof(strippedName));
-	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
-	for (sh = hashTable[hash]; sh; sh = sh->next) {
-		if (Q_stricmp(sh->name, strippedName) == 0) {
-			if (sh != sh2) {
-				sh->remappedShader = sh2;
-			} else {
-				sh->remappedShader = NULL;
-			}
-		}
-	}
-	if (timeOffset) {
-		sh2->timeOffset = atof(timeOffset);
-	}
+static shadertext_t* AllocShaderText(const char* name)
+{
+    int hash;
+
+    hash = generateHashValue(name);
+    return AddShaderTextToHash(name, hash);
+}
+
+/*
+====================
+FindShaderText
+
+Scans the combined text description of all the shader files for
+the given shader name.
+
+return NULL if not found
+
+If found, it will return a valid shader
+=====================
+*/
+static shadertext_t* FindShaderText(const char* name)
+{
+    shadertext_t* shader;
+    int hash;
+
+    hash = generateHashValue(name);
+    shader = hashTable[hash];
+    if (!shader) {
+        return AddShaderTextToHash(name, hash);
+    }
+
+    while (Q_stricmp(shader->name, name))
+    {
+        shader = shader->next;
+        if (!shader) {
+            return AddShaderTextToHash(name, hash);
+        }
+    }
+
+    return shader;
 }
 
 /*
@@ -119,13 +139,6 @@ static qboolean ParseVector( char **text, int count, float *v ) {
 	char	*token;
 	int		i;
 
-	// FIXME: spaces are currently required after parens, should change parseext...
-	token = COM_ParseExt( text, qfalse );
-	if ( strcmp( token, "(" ) ) {
-		ri.Printf( PRINT_WARNING, "WARNING: missing parenthesis in shader '%s'\n", shader.name );
-		return qfalse;
-	}
-
 	for ( i = 0 ; i < count ; i++ ) {
 		token = COM_ParseExt( text, qfalse );
 		if ( !token[0] ) {
@@ -135,15 +148,38 @@ static qboolean ParseVector( char **text, int count, float *v ) {
 		v[i] = atof( token );
 	}
 
-	token = COM_ParseExt( text, qfalse );
-	if ( strcmp( token, ")" ) ) {
-		ri.Printf( PRINT_WARNING, "WARNING: missing parenthesis in shader '%s'\n", shader.name );
-		return qfalse;
-	}
-
 	return qtrue;
 }
 
+void InitStaticShaders()
+{
+	char* text;
+	const char* token;
+	char* buf;
+	char shadername[64];
+
+    if (ri.FS_ReadFile("scripts/static_shaders.txt", (void**)&buf) == -1)
+    {
+        ri.Printf(3, "Couldn't find static shaders file: scripts/staticshaders.txt\n");
+		return;
+    }
+
+    text = buf;
+    while (1)
+    {
+        token = COM_ParseExt(&text, 1);
+		if (!*token) {
+			break;
+		}
+
+        strncpy(shadername, token, 0x40u);
+		if (!R_FindShader(shadername, -1, 1, 1, 1, 1)) {
+			ri.Printf(3, "InitStaticShaders: Couldn't find shader: %s\n", shadername);
+		}
+    }
+
+    ri.FS_FreeFile(buf);
+}
 
 /*
 ===============
@@ -164,6 +200,22 @@ static unsigned NameToAFunc( const char *funcname )
 	{
 		return GLS_ATEST_GE_80;
 	}
+	else if ( !Q_stricmp( funcname, "LT_FOLIAGE1" ) )
+	{
+		return GLS_ATEST_LT_FOLIAGE1;
+	}
+	else if ( !Q_stricmp( funcname, "GE_FOLIAGE1" ) )
+	{
+		return GLS_ATEST_GE_FOLIAGE1;
+	}
+	else if ( !Q_stricmp( funcname, "LT_FOLIAGE2" ) )
+	{
+		return GLS_ATEST_LT_FOLIAGE2;
+	}
+	else if ( !Q_stricmp( funcname, "GE_FOLIAGE2" ) )
+	{
+		return GLS_ATEST_GE_FOLIAGE2;
+	}
 
 	ri.Printf( PRINT_WARNING, "WARNING: invalid alphaFunc name '%s' in shader '%s'\n", funcname, shader.name );
 	return 0;
@@ -356,19 +408,19 @@ static void ParseWaveForm( char **text, waveForm_t *wave )
 ParseTexMod
 ===================
 */
-static void ParseTexMod( char *_text, shaderStage_t *stage )
+static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 {
 	const char *token;
 	char **text = &_text;
 	texModInfo_t *tmi;
 
-	if ( stage->bundle[0].numTexMods == TR_MAX_TEXMODS ) {
-		ri.Error( ERR_DROP, "ERROR: too many tcMod stages in shader '%s'", shader.name );
+	if ( stage->bundle[cntBundle].numTexMods == TR_MAX_TEXMODS ) {
+		ri.Error( ERR_DROP, "ERROR: too many tcMod unfoggedStages in shader '%s'\n", shader.name );
 		return;
 	}
 
-	tmi = &stage->bundle[0].texMods[stage->bundle[0].numTexMods];
-	stage->bundle[0].numTexMods++;
+	tmi = &stage->bundle[cntBundle].texMods[stage->bundle[cntBundle].numTexMods];
+	stage->bundle[cntBundle].numTexMods++;
 
 	token = COM_ParseExt( text, qfalse );
 
@@ -407,6 +459,8 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 		tmi->wave.frequency = atof( token );
 
 		tmi->type = TMOD_TURBULENT;
+
+		shader.flags |= 2;
 	}
 	//
 	// scale
@@ -441,62 +495,103 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->scroll[0] = atof( token );
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[0] = 1234567;
+		} else {
+			tmi->scroll[0] = atof(token);
+		}
+
 		token = COM_ParseExt( text, qfalse );
 		if ( token[0] == 0 )
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->scroll[1] = atof( token );
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[1] = 1234567;
+		} else {
+			tmi->scroll[1] = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			}
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			}
+		}
+
 		tmi->type = TMOD_SCROLL;
+
+		shader.flags |= 2;
 	}
 	//
 	// stretch
 	//
 	else if ( !Q_stricmp( token, "stretch" ) )
 	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.func = NameToGenFunc( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.base = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.amplitude = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.phase = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.frequency = atof( token );
-		
+		ParseWaveForm(text, &tmi->wave);
 		tmi->type = TMOD_STRETCH;
+		shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "wavetrans" ) )
+    {
+		ParseWaveForm(text, &tmi->wave);
+		tmi->type = TMOD_WAVETRANS;
+		shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "wavetrant" ) )
+    {
+        ParseWaveForm(text, &tmi->wave);
+        tmi->type = TMOD_WAVETRANT;
+        shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "bulge" ) )
+	{
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+			return;
+		}
+
+        tmi->wave.base = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.amplitude = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.frequency = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.phase = atof(token);
+
+		tmi->type = TMOD_BULGETRANS;
+		shader.flags |= 2;
 	}
 	//
 	// transform
@@ -564,8 +659,78 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->rotateSpeed = atof( token );
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->rotateSpeed = 1234567;
+		} else {
+			tmi->rotateSpeed = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (!Q_stricmp(token, "fromEntity")) {
+				tmi->rotateStart = 1234567;
+			} else {
+				tmi->rotateStart = atof(token);
+			}
+		} else {
+			tmi->rotateStart = 0;
+        }
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			tmi->rotateCoef = atof(token);
+		} else {
+			tmi->rotateCoef = 1;
+		}
+
 		tmi->type = TMOD_ROTATE;
+		shader.flags |= 2;
+	}
+    else if (!Q_stricmp(token, "offset")) {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[0] = 1234567;
+		} else {
+			tmi->scroll[0] = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[1] = 1234567;
+		} else {
+			tmi->scroll[1] = atof(token);
+        }
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			}
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			}
+		}
+
+		tmi->type = TMOD_OFFSET;
 	}
 	//
 	// entityTranslate
@@ -574,9 +739,49 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 	{
 		tmi->type = TMOD_ENTITY_TRANSLATE;
 	}
+	else if ( !Q_stricmp( token, "parallax" ) )
+    {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		tmi->rate[0] = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		tmi->rate[1] = atof(token);
+		tmi->type = TMOD_PARALLAX;
+	}
+	else if ( !Q_stricmp( token, "macro" ) )
+    {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
+            return;
+        }
+
+		tmi->scale[0] = 1.0 / atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
+            return;
+        }
+
+		tmi->scale[1] = 1.0 / atof(token);
+
+		tmi->type = TMOD_MACRO;
+		shader.needsNormal = qtrue;
+	}
 	else
 	{
-		ri.Printf( PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name );
+		ri.Printf(PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name);
 	}
 }
 
@@ -586,70 +791,97 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 ParseStage
 ===================
 */
-static qboolean ParseStage( shaderStage_t *stage, char **text )
+static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 {
-	char *token;
-	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0;
+	char* token;
+	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0, colorBits = 0;
 	qboolean depthMaskExplicit = qfalse;
+	int cntBundle = 0;
+	int depthTestBits = 0;
+	int fogBits = 0;
+	qboolean shouldProcess = qtrue;
 
 	stage->active = qtrue;
+	stage->noMipMaps = shader_noMipMaps;
+	stage->noPicMip = shader_noPicMip;
+	stage->force32bit = shader_force32bit;
 
-	while ( 1 )
+	while (1)
 	{
-		token = COM_ParseExt( text, qtrue );
-		if ( !token[0] )
+		token = COM_ParseExt(text, qtrue);
+		if (!token[0])
 		{
-			ri.Printf( PRINT_WARNING, "WARNING: no matching '}' found\n" );
+			ri.Printf(PRINT_WARNING, "WARNING: no matching '}' found\n");
 			return qfalse;
 		}
 
-		if ( token[0] == '}' )
+		if (token[0] == '}')
 		{
 			break;
 		}
+		// no picmip adjustment
+		else if (!Q_stricmp(token, "nomipmaps"))
+		{
+			stage->noMipMaps = qtrue;
+			continue;
+		}
+		// no picmip adjustment
+		else if (!Q_stricmp(token, "nopicmip"))
+		{
+			stage->noPicMip = qtrue;
+			continue;
+		}
+		// no picmip adjustment
+		else if (!Q_stricmp(token, "nofog"))
+		{
+			fogBits = GLS_FOG;
+			continue;
+		}
 		//
 		// map <name>
 		//
-		else if ( !Q_stricmp( token, "map" ) )
+		else if (!Q_stricmp(token, "map"))
 		{
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0])
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name );
+				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name);
 				return qfalse;
 			}
 
-			if ( !Q_stricmp( token, "$whiteimage" ) )
+			if (!Q_stricmp(token, "$whiteimage"))
 			{
-				stage->bundle[0].image[0] = tr.whiteImage;
+				stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				continue;
 			}
-			else if ( !Q_stricmp( token, "$lightmap" ) )
+			else if (!Q_stricmp(token, "$lightmap"))
 			{
-				stage->bundle[0].isLightmap = qtrue;
-				if ( shader.lightmapIndex < 0 || !tr.lightmaps ) {
-					stage->bundle[0].image[0] = tr.whiteImage;
-				} else {
-					stage->bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
+				stage->bundle[cntBundle].isLightmap = qtrue;
+				if (shader.lightmapIndex < 0) {
+					stage->bundle[cntBundle].image[0] = tr.whiteImage;
+				}
+				else {
+					stage->bundle[cntBundle].image[0] = tr.lightmaps[shader.lightmapIndex];
 				}
 				continue;
 			}
+			else if (!Q_stricmp(token, "$bumpmap"))
+            {
+                token = COM_ParseExt(text, qfalse);
+                if (!token[0])
+                {
+                    ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'bumpmap' keyword in shader '%s'\n", shader.name);
+                    return qfalse;
+                }
+
+				// This is not implemented in mohaa
+			}
 			else
 			{
-				imgType_t type = IMGTYPE_COLORALPHA;
-				imgFlags_t flags = IMGFLAG_NONE;
-
-				if (!shader.noMipMaps)
-					flags |= IMGFLAG_MIPMAP;
-
-				if (!shader.noPicMip)
-					flags |= IMGFLAG_PICMIP;
-
-				stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
-
-				if ( !stage->bundle[0].image[0] )
+				stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
+				if (!stage->bundle[cntBundle].image[0])
 				{
-					ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
 					return qfalse;
 				}
 			}
@@ -657,46 +889,96 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		//
 		// clampmap <name>
 		//
-		else if ( !Q_stricmp( token, "clampmap" ) )
+		else if (!Q_stricmpn(token, "clampmap", 8))
 		{
-			imgType_t type = IMGTYPE_COLORALPHA;
-			imgFlags_t flags = IMGFLAG_CLAMPTOEDGE;
+			int clampx, clampy;
 
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
+			if (!token[8]) {
+				if (!haveClampToEdge) {
+					clampx = GL_CLAMP;
+					clampy = GL_CLAMP;
+				}
+				else {
+					clampx = GL_CLAMP_TO_EDGE;
+					clampy = GL_CLAMP_TO_EDGE;
+				}
+			}
+			else {
+				if (token[8] == 'x')
+				{
+					if (!haveClampToEdge) {
+						clampx = GL_CLAMP;
+					}
+					else {
+						clampx = GL_CLAMP_TO_EDGE;
+					}
+					clampy = GL_CLAMP;
+				}
+				else if (token[8] == 'y')
+				{
+					clampx = GL_CLAMP;
+					if (!haveClampToEdge) {
+						clampy = GL_CLAMP;
+					}
+					else {
+						clampy = GL_CLAMP_TO_EDGE;
+					}
+				}
+				else {
+					ri.Printf(PRINT_WARNING, "WARNING: Converting unknown clampmap type to clampmap\n");
+					continue;
+				}
+			}
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0])
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name );
+				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name);
 				return qfalse;
 			}
 
-			if (!shader.noMipMaps)
-				flags |= IMGFLAG_MIPMAP;
-
-			if (!shader.noPicMip)
-				flags |= IMGFLAG_PICMIP;
-
-			stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
-			if ( !stage->bundle[0].image[0] )
+			stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, clampx, clampy);
+			if (!stage->bundle[cntBundle].image[0])
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+				ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
 				return qfalse;
 			}
 		}
 		//
 		// animMap <frequency> <image1> .... <imageN>
 		//
-		else if ( !Q_stricmp( token, "animMap" ) )
+		else if ( !Q_stricmp( token, "animMap" ) || !Q_stricmp(token, "animMapOnce") || !Q_stricmp(token, "animMapPhase"))
 		{
-			int	totalImages = 0;
+			qboolean phased;
+
+			shader.flags |= 3;
+
+			if (!Q_stricmp(token, "animMapOnce")) {
+				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
+			}
+
+			phased = !Q_stricmp(token, "animMapPhase");
 
 			token = COM_ParseExt( text, qfalse );
 			if ( !token[0] )
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMap' keyword in shader '%s'\n", shader.name );
+				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMmap' keyword in shader '%s'\n", shader.name );
 				return qfalse;
 			}
-			stage->bundle[0].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationPhase = 0;
 
+			if (phased)
+            {
+                token = COM_ParseExt(text, qfalse);
+                if (!token[0])
+                {
+                    ri.Printf(PRINT_WARNING, "WARNING: missing phase for 'animMapPhase' keyword in shader '%s'\n", shader.name);
+                    return qfalse;
+                }
+
+				stage->bundle[cntBundle].imageAnimationPhase = atof(token);
+			}
 			// parse up to MAX_IMAGE_ANIMATIONS animations
 			while ( 1 ) {
 				int		num;
@@ -705,47 +987,39 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				if ( !token[0] ) {
 					break;
 				}
-				num = stage->bundle[0].numImageAnimations;
+				num = stage->bundle[cntBundle].numImageAnimations;
 				if ( num < MAX_IMAGE_ANIMATIONS ) {
-					imgFlags_t flags = IMGFLAG_NONE;
-
-					if (!shader.noMipMaps)
-						flags |= IMGFLAG_MIPMAP;
-
-					if (!shader.noPicMip)
-						flags |= IMGFLAG_PICMIP;
-
-					stage->bundle[0].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
-					if ( !stage->bundle[0].image[num] )
+                    stage->bundle[cntBundle].image[num] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT );
+					if ( !stage->bundle[cntBundle].image[num] )
 					{
 						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 						return qfalse;
 					}
-					stage->bundle[0].numImageAnimations++;
+					stage->bundle[cntBundle].numImageAnimations++;
 				}
-				totalImages++;
-			}
-
-			if ( totalImages > MAX_IMAGE_ANIMATIONS ) {
-				ri.Printf( PRINT_WARNING, "WARNING: ignoring excess images for 'animMap' (found %d, max is %d) in shader '%s'\n",
-						totalImages, MAX_IMAGE_ANIMATIONS, shader.name );
 			}
 		}
-		else if ( !Q_stricmp( token, "videoMap" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'videoMap' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-			stage->bundle[0].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
-			if (stage->bundle[0].videoMapHandle != -1) {
-				stage->bundle[0].isVideoMap = qtrue;
-				stage->bundle[0].image[0] = tr.scratchImage[stage->bundle[0].videoMapHandle];
-			} else {
-				ri.Printf( PRINT_WARNING, "WARNING: could not load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
+		else if (!Q_stricmp(token, "normalmap"))
+        {
+			//
+			// added in 2.30
+			//
+
+            token = COM_ParseExt(text, qfalse);
+            if (!token[0])
+            {
+                ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'normalmap' keyword in shader '%s'\n", shader.name);
+                return qfalse;
+            }
+
+			stage->normalMap = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
+			if (!stage->normalMap)
+            {
+                ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
+                return qfalse;
 			}
+
+			stage->hasNormalMap = qtrue;
 		}
 		//
 		// alphafunc <func>
@@ -776,11 +1050,11 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "lequal" ) )
 			{
-				depthFuncBits = 0;
+				depthTestBits = 0;
 			}
 			else if ( !Q_stricmp( token, "equal" ) )
 			{
-				depthFuncBits = GLS_DEPTHFUNC_EQUAL;
+				depthTestBits = GLS_DEPTHFUNC_EQUAL;
 			}
 			else
 			{
@@ -789,13 +1063,6 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 		}
 		//
-		// detail
-		//
-		else if ( !Q_stricmp( token, "detail" ) )
-		{
-			stage->isDetail = qtrue;
-		}
-		//
 		// blendfunc <srcFactor> <dstFactor>
 		// or blendfunc <add|filter|blend>
 		//
@@ -817,6 +1084,9 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			} else if ( !Q_stricmp( token, "blend" ) ) {
 				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
 				blendDstBits = GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
+			} else if ( !Q_stricmp( token, "alphaadd" ) ) {
+				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
+				blendDstBits = GLS_DSTBLEND_ONE;
 			} else {
 				// complex double blends
 				blendSrcBits = NameToSrcBlendMode( token );
@@ -853,54 +1123,161 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ParseWaveForm( text, &stage->rgbWave );
 				stage->rgbGen = CGEN_WAVEFORM;
 			}
-			else if ( !Q_stricmp( token, "const" ) )
+			else if (!Q_stricmp(token, "colorwave"))
 			{
-				vec3_t	color;
+				vec3_t v;
 
-				VectorClear( color );
-
-				ParseVector( text, 3, color );
-				stage->constantColor[0] = 255 * color[0];
-				stage->constantColor[1] = 255 * color[1];
-				stage->constantColor[2] = 255 * color[2];
-
-				stage->rgbGen = CGEN_CONST;
+				ParseVector(text, 3, v);
+				stage->colorConst[0] = v[0] * 255.0;
+				stage->colorConst[1] = v[1] * 255.0;
+				stage->colorConst[2] = v[2] * 255.0;
+				stage->rgbGen = CGEN_MULTIPLY_BY_WAVEFORM;
+				shader.flags |= 2;
 			}
-			else if ( !Q_stricmp( token, "identity" ) )
+			else if (!Q_stricmp(token, "identity"))
 			{
 				stage->rgbGen = CGEN_IDENTITY;
 			}
-			else if ( !Q_stricmp( token, "identityLighting" ) )
+			else if (!Q_stricmp(token, "identityLighting"))
 			{
 				stage->rgbGen = CGEN_IDENTITY_LIGHTING;
 			}
-			else if ( !Q_stricmp( token, "entity" ) )
+			else if (!Q_stricmp(token, "global"))
+			{
+				stage->rgbGen = CGEN_GLOBAL_COLOR;
+			}
+			else if (!Q_stricmp(token, "entity") || !Q_stricmp(token, "fromentity"))
 			{
 				stage->rgbGen = CGEN_ENTITY;
 			}
-			else if ( !Q_stricmp( token, "oneMinusEntity" ) )
+			else if (!Q_stricmp(token, "oneMinusEntity"))
 			{
 				stage->rgbGen = CGEN_ONE_MINUS_ENTITY;
 			}
-			else if ( !Q_stricmp( token, "vertex" ) )
+			else if (!Q_stricmp(token, "vertex") || !Q_stricmp(token, "fromclient"))
 			{
 				stage->rgbGen = CGEN_VERTEX;
-				if ( stage->alphaGen == 0 ) {
+				if (stage->alphaGen == 0) {
 					stage->alphaGen = AGEN_VERTEX;
 				}
 			}
-			else if ( !Q_stricmp( token, "exactVertex" ) )
+			else if (!Q_stricmp(token, "exactVertex"))
 			{
 				stage->rgbGen = CGEN_EXACT_VERTEX;
 			}
-			else if ( !Q_stricmp( token, "lightingDiffuse" ) )
+			else if (!Q_stricmp(token, "lightingGrid"))
 			{
-				stage->rgbGen = CGEN_LIGHTING_DIFFUSE;
+				stage->rgbGen = CGEN_LIGHTING_GRID;
 			}
-			else if ( !Q_stricmp( token, "oneMinusVertex" ) )
+			else if (!Q_stricmp(token, "lightingSpherical"))
+			{
+				stage->rgbGen = CGEN_LIGHTING_SPHERICAL;
+			}
+			else if (!Q_stricmp(token, "oneMinusVertex"))
 			{
 				stage->rgbGen = CGEN_ONE_MINUS_VERTEX;
 			}
+			else if ( !Q_stricmp( token, "const" ) || !Q_stricmp(token, "constant"))
+			{
+				vec3_t	color;
+
+				ParseVector( text, 3, color );
+				stage->colorConst[0] = 255 * color[0];
+				stage->colorConst[1] = 255 * color[1];
+				stage->colorConst[2] = 255 * color[2];
+
+				stage->rgbGen = CGEN_CONSTANT;
+			}
+			else if (!Q_stricmp(token, "static"))
+			{
+				stage->rgbGen = CGEN_STATIC;
+				if (stage->alphaGen == AGEN_IDENTITY) {
+					stage->alphaGen = AGEN_VERTEX;
+				}
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->rgbGen = CGEN_SCOORD;
+				}
+				else {
+					stage->rgbGen = CGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing rgbGen sCoord or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+
+				stage->alphaConst = atof(token) * 255.0;
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				shader.needsNormal = qtrue;
+
+				stage->rgbGen = CGEN_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneminusdot"))
+			{
+				shader.needsNormal = qtrue;
+
+				stage->rgbGen = CGEN_ONE_MINUS_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
 			else
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
@@ -924,17 +1301,11 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ParseWaveForm( text, &stage->alphaWave );
 				stage->alphaGen = AGEN_WAVEFORM;
 			}
-			else if ( !Q_stricmp( token, "const" ) )
+			else if (!Q_stricmp(token, "global"))
 			{
-				token = COM_ParseExt( text, qfalse );
-				stage->constantColor[3] = 255 * atof( token );
-				stage->alphaGen = AGEN_CONST;
+				stage->alphaGen = AGEN_GLOBAL_ALPHA;
 			}
-			else if ( !Q_stricmp( token, "identity" ) )
-			{
-				stage->alphaGen = AGEN_IDENTITY;
-			}
-			else if ( !Q_stricmp( token, "entity" ) )
+			else if ( !Q_stricmp( token, "entity" ) || !Q_stricmp(token, "fromentity"))
 			{
 				stage->alphaGen = AGEN_ENTITY;
 			}
@@ -942,18 +1313,204 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			{
 				stage->alphaGen = AGEN_ONE_MINUS_ENTITY;
 			}
-			else if ( !Q_stricmp( token, "vertex" ) )
+			else if ( !Q_stricmp( token, "vertex" ) || !Q_stricmp(token, "fromclient"))
 			{
 				stage->alphaGen = AGEN_VERTEX;
 			}
-			else if ( !Q_stricmp( token, "lightingSpecular" ) )
-			{
-				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
-			}
-			else if ( !Q_stricmp( token, "oneMinusVertex" ) )
+			else if ( !Q_stricmp( token, "oneMinusVertex" ) || !Q_stricmp(token, "oneMinusFromClient"))
 			{
 				stage->alphaGen = AGEN_ONE_MINUS_VERTEX;
 			}
+			else if (!Q_stricmp(token, "lightingSpecular"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+				stage->alphaMax = 255;
+				stage->specOrigin[0] = -960;
+				stage->specOrigin[1] = 1980;
+				stage->specOrigin[2] = 96;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0]) {
+					stage->alphaMax = atof(token) * 255.0;
+					ParseVector(text, 3, stage->specOrigin);
+				}
+			}
+			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
+				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))
+			{
+				if (!Q_stricmp(token, "distFade")) {
+					stage->alphaGen = AGEN_DIST_FADE;
+				} else if (!Q_stricmp(token, "oneMinusDistFade")) {
+					stage->alphaGen = AGEN_ONE_MINUS_DIST_FADE;
+				} else if (!Q_stricmp(token, "tikiDistFade")) {
+                    stage->alphaGen = AGEN_TIKI_DIST_FADE;
+                } else {
+                    stage->alphaGen = AGEN_ONE_MINUS_TIKI_DIST_FADE;
+                }
+
+				shader.fDistNear = 256.0;
+				shader.fDistRange = 256.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistNear = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistRange = atof(token);
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "heightFade"))
+            {
+                shader.needsNormal = qtrue;
+                stage->alphaMin = 256.0f;
+                stage->alphaMax = 512.0f;
+                stage->alphaGen = AGEN_HEIGHT_FADE;
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMin = atof(token);
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDot"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "dotView"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDotView"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "const") || !Q_stricmp(token, "constant"))
+			{
+				token = COM_ParseExt(text, qfalse);
+				stage->colorConst[3] = 255 * atof(token);
+				stage->alphaGen = AGEN_CONSTANT;
+			}
+			else if (!Q_stricmp(token, "skyAlpha"))
+			{
+				stage->alphaGen = AGEN_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "oneMinusSkyAlpha"))
+			{
+				stage->alphaGen = AGEN_ONE_MINUS_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->alphaGen = AGEN_SCOORD;
+				} else {
+					stage->alphaGen = AGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing alphaGen s or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+				stage->alphaConst = atof(token) * 255.0;
+			}
 			else if ( !Q_stricmp( token, "portal" ) )
 			{
 				stage->alphaGen = AGEN_PORTAL;
@@ -988,22 +1545,33 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "environment" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_ENVIRONMENT_MAPPED;
-			}
+				shader.needsNormal = qtrue;
+				stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED;
+            }
+            else if (!Q_stricmp(token, "environmentmodel"))
+            {
+                shader.needsNormal = qtrue;
+                stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED2;
+            }
+            else if (!Q_stricmp(token, "sunreflection"))
+            {
+                shader.needsNormal = qtrue;
+                stage->bundle[cntBundle].tcGen = TCGEN_SUN_REFLECTION;
+            }
 			else if ( !Q_stricmp( token, "lightmap" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_LIGHTMAP;
+				stage->bundle[cntBundle].tcGen = TCGEN_LIGHTMAP;
 			}
 			else if ( !Q_stricmp( token, "texture" ) || !Q_stricmp( token, "base" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_TEXTURE;
+				stage->bundle[cntBundle].tcGen = TCGEN_TEXTURE;
 			}
 			else if ( !Q_stricmp( token, "vector" ) )
 			{
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[0] );
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[1] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[0] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[1] );
 
-				stage->bundle[0].tcGen = TCGEN_VECTOR;
+				stage->bundle[cntBundle].tcGen = TCGEN_VECTOR;
 			}
 			else 
 			{
@@ -1022,23 +1590,99 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				token = COM_ParseExt( text, qfalse );
 				if ( token[0] == 0 )
 					break;
-				Q_strcat( buffer, sizeof (buffer), token );
-				Q_strcat( buffer, sizeof (buffer), " " );
+				strcat( buffer, token );
+				strcat( buffer, " " );
 			}
 
-			ParseTexMod( buffer, stage );
+			ParseTexMod( buffer, stage, cntBundle );
 
 			continue;
 		}
 		//
 		// depthmask
 		//
-		else if ( !Q_stricmp( token, "depthwrite" ) )
+		else if ( !Q_stricmp( token, "depthwrite" ) || !Q_stricmp(token, "depthmask"))
 		{
 			depthMaskBits = GLS_DEPTHMASK_TRUE;
 			depthMaskExplicit = qtrue;
 
 			continue;
+        }
+        else if (!Q_stricmp(token, "nodepthwrite") || !Q_stricmp(token, "nodepthmask"))
+        {
+            depthMaskBits = 0;
+            depthMaskExplicit = qtrue;
+
+            continue;
+        }
+        else if (!Q_stricmp(token, "nocolorwrite") || !Q_stricmp(token, "nocolormask"))
+        {
+            colorBits = GLS_COLOR_NOMASK;
+
+            continue;
+        }
+		else if (!Q_stricmp(token, "noDepthTest"))
+		{
+			depthFuncBits = GLS_DEPTHTEST_DISABLE;
+			continue;
+        }
+        else if (!Q_stricmp(token, "nextBundle"))
+        {
+			if (!qglActiveTextureARB) {
+				ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
+				return qfalse;
+			}
+
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] && !Q_stricmp(token, "add")) {
+				stage->multitextureEnv = GL_ADD;
+			} else {
+				stage->multitextureEnv = GL_MODULATE;
+			}
+
+			cntBundle++;
+			if (cntBundle > NUM_TEXTURE_BUNDLES) {
+				ri.Printf(PRINT_WARNING, "WARNING: too many nextBundle commands in shader '%s'\n", shader.name);
+				return qfalse;
+			}
+            continue;
+        }
+		//
+		// Added in 2.0
+		//
+		else if (!Q_stricmp(token, "ifCvar") || !Q_stricmp(token, "ifCvarnot"))
+		{
+			cvar_t* var;
+			qboolean isNot = token[6] != 0;
+			qboolean evaluatedValue;
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar name in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			var = ri.Cvar_Get(token, "0", 0);
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar value in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			if (atof(token) != var->value) {
+				evaluatedValue = qfalse;
+			} else if (var->value) {
+				evaluatedValue = qtrue;
+			} else if (token[0] == '0' || (token[0] == '.' && token[1] == '0')) {
+				evaluatedValue = qtrue;
+			} else if (!Q_stricmp(var->string, token)) {
+				evaluatedValue = qtrue;
+			} else {
+				return qfalse;
+			}
+
+			shouldProcess &= evaluatedValue ^ isNot;
 		}
 		else
 		{
@@ -1047,20 +1691,29 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		}
 	}
 
+	// Added in 2.0
+	//  Ignore vars that didn't met with 'ifCvar' / 'ifCvarnot'
+	if (!shouldProcess) {
+		stage->active = qfalse;
+		stage->rgbGen = CGEN_BAD;
+		return qtrue;
+	}
+
 	//
 	// if cgen isn't explicitly specified, use either identity or identitylighting
 	//
 	if ( stage->rgbGen == CGEN_BAD ) {
-		if ( blendSrcBits == 0 ||
-			blendSrcBits == GLS_SRCBLEND_ONE || 
-			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) {
+		if (cntBundle || stage->bundle[0].isLightmap) {
+			stage->rgbGen = CGEN_IDENTITY;
+		} else if (blendSrcBits == 0 ||
+			blendSrcBits == GLS_SRCBLEND_ONE ||
+			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA) {
 			stage->rgbGen = CGEN_IDENTITY_LIGHTING;
 		} else {
 			stage->rgbGen = CGEN_IDENTITY;
 		}
 	}
 
-
 	//
 	// implicitly assume that a GL_ONE GL_ZERO blend mask disables blending
 	//
@@ -1071,10 +1724,15 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		depthMaskBits = GLS_DEPTHMASK_TRUE;
 	}
 
+	if (depthFuncBits == GLS_DEPTHTEST_DISABLE) {
+		depthMaskBits = 0;
+	}
+
 	// decide which agens we can skip
 	if ( stage->alphaGen == AGEN_IDENTITY ) {
 		if ( stage->rgbGen == CGEN_IDENTITY
-			|| stage->rgbGen == CGEN_LIGHTING_DIFFUSE ) {
+			|| stage->rgbGen == CGEN_LIGHTING_GRID
+			|| stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) {
 			stage->alphaGen = AGEN_SKIP;
 		}
 	}
@@ -1085,7 +1743,10 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 	stage->stateBits = depthMaskBits | 
 		               blendSrcBits | blendDstBits | 
 					   atestBits | 
-					   depthFuncBits;
+					   depthFuncBits |
+					   depthTestBits |
+					   colorBits |
+					   fogBits;
 
 	return qtrue;
 }
@@ -1123,11 +1784,6 @@ static void ParseDeform( char **text ) {
 	ds = &shader.deforms[ shader.numDeforms ];
 	shader.numDeforms++;
 
-	if ( !Q_stricmp( token, "projectionShadow" ) ) {
-		ds->deformation = DEFORM_PROJECTION_SHADOW;
-		return;
-	}
-
 	if ( !Q_stricmp( token, "autosprite" ) ) {
 		ds->deformation = DEFORM_AUTOSPRITE;
 		return;
@@ -1138,14 +1794,8 @@ static void ParseDeform( char **text ) {
 		return;
 	}
 
-	if ( !Q_stricmpn( token, "text", 4 ) ) {
-		int		n;
-		
-		n = token[4] - '0';
-		if ( n < 0 || n > 7 ) {
-			n = 0;
-		}
-		ds->deformation = DEFORM_TEXT0 + n;
+	if (!Q_stricmp(token, "lightglow")) {
+		ds->deformation = DEFORM_LIGHTGLOW;
 		return;
 	}
 
@@ -1175,6 +1825,7 @@ static void ParseDeform( char **text ) {
 		ds->bulgeSpeed = atof( token );
 
 		ds->deformation = DEFORM_BULGE;
+		shader.needsNormal = qtrue;
 		return;
 	}
 
@@ -1199,6 +1850,66 @@ static void ParseDeform( char **text ) {
 
 		ParseWaveForm( text, &ds->deformationWave );
 		ds->deformation = DEFORM_WAVE;
+		shader.needsNormal = qtrue;
+		return;
+	}
+
+	if (!Q_stricmp(token, "flap")) {
+		texDirection_t coordDirection;
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 's') {
+			coordDirection = USE_S_COORDS;
+		}
+		else if (token[0] == 't') {
+			coordDirection = USE_T_COORDS;
+		}
+		else {
+			ri.Printf(PRINT_WARNING, "WARNING: deformVertexes flap requires 's' or 't' in shader '%s'\n", shader.name);
+			return;
+		}
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes flap parm in shader '%s'\n", shader.name);
+			return;
+		}
+
+		if (!atof(token)) {
+			ds->deformationSpread = 100.0;
+			ri.Printf(PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name);
+		}
+		else {
+			ds->deformationSpread = 1.0 / atof(token);
+		}
+
+		ParseWaveForm(text, &ds->deformationWave);
+
+		if (coordDirection == USE_T_COORDS) {
+			ds->deformation = DEFORM_FLAP_T;
+		}
+		else {
+			ds->deformation = DEFORM_FLAP_S;
+		}
+
+		shader.needsNormal = qtrue;
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ds->bulgeWidth = 0.0;
+			ds->bulgeHeight = 1.0;
+			return;
+		}
+		ds->bulgeWidth = atof(token);
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes parm 'max' in shader '%s'\n\n", shader.name);
+			return;
+		}
+		ds->bulgeHeight = atof(token);
 		return;
 	}
 
@@ -1221,6 +1932,7 @@ static void ParseDeform( char **text ) {
 		ds->deformationWave.frequency = atof( token );
 
 		ds->deformation = DEFORM_NORMALS;
+		shader.needsNormal = qtrue;
 		return;
 	}
 
@@ -1257,7 +1969,6 @@ static void ParseSkyParms( char **text ) {
 	static char	*suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
 	char		pathname[MAX_QPATH];
 	int			i;
-	imgFlags_t imgFlags = IMGFLAG_MIPMAP | IMGFLAG_PICMIP;
 
 	// outerbox
 	token = COM_ParseExt( text, qfalse );
@@ -1269,8 +1980,12 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, IMGTYPE_COLORALPHA, imgFlags | IMGFLAG_CLAMPTOEDGE );
-
+			if (!haveClampToEdge) {
+				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
+			}
+			else {
+				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+			}
 			if ( !shader.sky.outerbox[i] ) {
 				shader.sky.outerbox[i] = tr.defaultImage;
 			}
@@ -1300,7 +2015,7 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			shader.sky.innerbox[i] = R_FindImageFile( ( char * ) pathname, IMGTYPE_COLORALPHA, imgFlags );
+			shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, qtrue, qtrue, shader_force32bit, GL_REPEAT, GL_REPEAT );
 			if ( !shader.sky.innerbox[i] ) {
 				shader.sky.innerbox[i] = tr.defaultImage;
 			}
@@ -1364,8 +2079,11 @@ infoParm_t	infoParms[] = {
 	{"lava",		1,	0,	CONTENTS_LAVA },		// very damaging
 	{"playerclip",	1,	0,	CONTENTS_PLAYERCLIP },
 	{"monsterclip",	1,	0,	CONTENTS_MONSTERCLIP },
+	{"fence",		1,	0,	CONTENTS_FENCE },
+	{"weaponclip",	1,	0,	CONTENTS_WEAPONCLIP },
+	{"vehicleclip",	1,	0,	CONTENTS_VEHICLECLIP },
 	{"nodrop",		1,	0,	CONTENTS_NODROP },		// don't drop items or leave bodies (death fog, lava, etc)
-	{"nonsolid",	1,	SURF_NONSOLID,	0},						// clears the solid flag
+	{"nonsolid",	1,	SURF_NONSOLID,	0 },		// clears the solid flag
 
 	// utility relevant attributes
 	{"origin",		1,	0,	CONTENTS_ORIGIN },		// center of rotating brushes
@@ -1373,14 +2091,9 @@ infoParm_t	infoParms[] = {
 	{"detail",		0,	0,	CONTENTS_DETAIL },		// don't include in structural bsp
 	{"structural",	0,	0,	CONTENTS_STRUCTURAL },	// force into structural bsp even if trnas
 	{"areaportal",	1,	0,	CONTENTS_AREAPORTAL },	// divides areas
-	{"clusterportal", 1,0,  CONTENTS_CLUSTERPORTAL },	// for bots
-	{"donotenter",  1,  0,  CONTENTS_DONOTENTER },		// for bots
-
 	{"fog",			1,	0,	CONTENTS_FOG},			// carves surfaces entering
-	{"sky",			0,	SURF_SKY,		0 },		// emit light from an environment map
-	{"lightfilter",	0,	SURF_LIGHTFILTER, 0 },		// filter light going through it
-	{"alphashadow",	0,	SURF_ALPHASHADOW, 0 },		// test light on a per-pixel basis
-	{"hint",		0,	SURF_HINT,		0 },		// use as a primary splitter
+	{"sky",			0,	SURF_SKY,			0 },	// emit light from an environment map
+	{"alphashadow",	1,	SURF_ALPHASHADOW,	0 },	// carves surfaces entering
 
 	// server attributes
 	{"slick",		0,	SURF_SLICK,		0 },
@@ -1388,16 +2101,29 @@ infoParm_t	infoParms[] = {
 	{"nomarks",		0,	SURF_NOMARKS,	0 },		// don't make impact marks, but still explode
 	{"ladder",		0,	SURF_LADDER,	0 },
 	{"nodamage",	0,	SURF_NODAMAGE,	0 },
-	{"metalsteps",	0,	SURF_METALSTEPS,0 },
-	{"flesh",		0,	SURF_FLESH,		0 },
 	{"nosteps",		0,	SURF_NOSTEPS,	0 },
+	{"paper",		0,	SURF_PAPER,		0 },
+	{"wood",		0,	SURF_WOOD,		0 },
+	{"metal",		0,	SURF_METAL,		0 },
+	{"rock",		0,	SURF_ROCK,		0 },
+	{"dirt",		0,	SURF_DIRT,		0 },
+	{"grill",		0,	SURF_GRILL,		0 },
+	{"grass",		0,	SURF_GRASS,		0 },
+	{"mud",			0,	SURF_MUD,		0 },
+	{"puddle",		0,	SURF_PUDDLE,	0 },
+	{"glass",		0,	SURF_GLASS,		0 },
+	{"gravel",		0,	SURF_GRAVEL,	0 },
+	{"sand",		0,	SURF_SAND,		0 },
+	{"foliage",		0,	SURF_FOLIAGE,	0 },
+	{"snow",		0,	SURF_SNOW,		0 },
+	{"carpet",		0,	SURF_CARPET,	0 },
 
 	// drawsurf attributes
-	{"nodraw",		0,	SURF_NODRAW,	0 },	// don't generate a drawsurface (or a lightmap)
-	{"pointlight",	0,	SURF_POINTLIGHT, 0 },	// sample lighting at vertexes
-	{"nolightmap",	0,	SURF_NOLIGHTMAP,0 },	// don't generate a lightmap
-	{"nodlight",	0,	SURF_NODLIGHT, 0 },		// don't ever add dynamic lights
-	{"dust",		0,	SURF_DUST, 0}			// leave a dust trail when walking on this surface
+	{"nodraw",		0,	SURF_NODRAW,		0 },	// don't generate a drawsurface (or a lightmap)
+	{"castshadow",	0,	SURF_CASTSHADOW,	0 },	// sample lighting at vertexes
+	{"nolightmap",	0,	SURF_NOLIGHTMAP,	0 },	// don't generate a lightmap
+	{"nodlight",	0,	SURF_NODLIGHT,		0 },	// don't ever add dynamic lights
+	{"hint",		0,	SURF_HINT,		0}			// leave a dust trail when walking on this surface
 };
 
 
@@ -1410,7 +2136,7 @@ surfaceparm <name>
 */
 static void ParseSurfaceParm( char **text ) {
 	char	*token;
-	int		numInfoParms = ARRAY_LEN( infoParms );
+	int		numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]);
 	int		i;
 
 	token = COM_ParseExt( text, qfalse );
@@ -1437,12 +2163,16 @@ shader.  Parse it into the global shader variable.  Later functions
 will optimize it.
 =================
 */
-static qboolean ParseShader( char **text )
+static qboolean ParseShader( char **text, qboolean picmip )
 {
 	char *token;
 	int s;
+	int matchingendifs;
+	qboolean bInElseBlock;
 
 	s = 0;
+	matchingendifs = 0;
+	bInElseBlock = qfalse;
 
 	token = COM_ParseExt( text, qtrue );
 	if ( token[0] != '{' )
@@ -1468,18 +2198,22 @@ static qboolean ParseShader( char **text )
 		// stage definition
 		else if ( token[0] == '{' )
 		{
-			if ( s >= MAX_SHADER_STAGES ) {
-				ri.Printf( PRINT_WARNING, "WARNING: too many stages in shader %s (max is %i)\n", shader.name, MAX_SHADER_STAGES );
-				return qfalse;
-			}
-
-			if ( !ParseStage( &stages[s], text ) )
+			if ( !ParseStage( &unfoggedStages[s], text, picmip ) )
 			{
 				return qfalse;
 			}
-			stages[s].active = qtrue;
+			if (unfoggedStages[s].rgbGen != CGEN_BAD) {
+				unfoggedStages[s].active = qtrue;
+				if (s > 0) {
+					if (!(unfoggedStages[s].stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))) {
+						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has opaque maps defined after stage 0!!!\n", shader.name);
+					}
+					if (unfoggedStages[s].stateBits & GLS_DEPTHMASK_TRUE) {
+						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has depthmask enabled after stage 0!!!\n", shader.name);
+					}
+				}
+			}
 			s++;
-
 			continue;
 		}
 		// skip stuff that only the QuakeEdRadient needs
@@ -1488,7 +2222,7 @@ static qboolean ParseShader( char **text )
 			continue;
 		}
 		// sun parms
-		else if ( !Q_stricmp( token, "q3map_sun" ) || !Q_stricmp( token, "q3map_sunExt" ) ) {
+		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
 			float	a, b;
 
 			token = COM_ParseExt( text, qfalse );
@@ -1515,9 +2249,6 @@ static qboolean ParseShader( char **text )
 			tr.sunDirection[0] = cos( a ) * cos( b );
 			tr.sunDirection[1] = sin( a ) * cos( b );
 			tr.sunDirection[2] = sin( b );
-
-			SkipRestOfLine( text );
-			continue;
 		}
 		else if ( !Q_stricmp( token, "deformVertexes" ) ) {
 			ParseDeform( text );
@@ -1546,14 +2277,19 @@ static qboolean ParseShader( char **text )
 		// no mip maps
 		else if ( !Q_stricmp( token, "nomipmaps" ) )
 		{
-			shader.noMipMaps = qtrue;
-			shader.noPicMip = qtrue;
+			shader_noMipMaps = qtrue;
 			continue;
 		}
 		// no picmip adjustment
 		else if ( !Q_stricmp( token, "nopicmip" ) )
 		{
-			shader.noPicMip = qtrue;
+			shader_noPicMip = qtrue;
+			continue;
+		}
+		// force 32 bit images
+		else if (!Q_stricmp(token, "force32bit"))
+		{
+			shader_force32bit = qtrue;
 			continue;
 		}
 		// polygonOffset
@@ -1570,41 +2306,10 @@ static qboolean ParseShader( char **text )
 		{
 			shader.entityMergable = qtrue;
 			continue;
-		}
-		// fogParms
-		else if ( !Q_stricmp( token, "fogParms" ) ) 
+			}
+		else if (!Q_stricmp(token, "noMerge"))
 		{
-			if ( !ParseVector( text, 3, shader.fogParms.color ) ) {
-				return qfalse;
-			}
-
-			if ( r_greyscale->integer )
-			{
-				float luminance;
-
-				luminance = LUMA( shader.fogParms.color[0], shader.fogParms.color[1], shader.fogParms.color[2] );
-				VectorSet( shader.fogParms.color, luminance, luminance, luminance );
-			}
-			else if ( r_greyscale->value )
-			{
-				float luminance;
-
-				luminance = LUMA( shader.fogParms.color[0], shader.fogParms.color[1], shader.fogParms.color[2] );
-				shader.fogParms.color[0] = LERP( shader.fogParms.color[0], luminance, r_greyscale->value );
-				shader.fogParms.color[1] = LERP( shader.fogParms.color[1], luminance, r_greyscale->value );
-				shader.fogParms.color[2] = LERP( shader.fogParms.color[2], luminance, r_greyscale->value );
-			}
-
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] ) 
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parm for 'fogParms' keyword in shader '%s'\n", shader.name );
-				continue;
-			}
-			shader.fogParms.depthForOpaque = atof( token );
-
-			// skip any old gradient directions
-			SkipRestOfLine( text );
+			shader.flags |= 1;
 			continue;
 		}
 		// portal
@@ -1619,10 +2324,49 @@ static qboolean ParseShader( char **text )
 			ParseSkyParms( text );
 			continue;
 		}
+		// portal
+		else if (!Q_stricmp(token, "portalsky"))
+		{
+			shader.sort = SS_PORTALSKY;
+			shader.isPortalSky = qtrue;
+			continue;
+		}
 		// light <value> determines flaring in q3map, not needed here
 		else if ( !Q_stricmp(token, "light") ) 
 		{
-			(void)COM_ParseExt( text, qfalse );
+			token = COM_ParseExt( text, qfalse );
+			continue;
+		}
+		else if (!Q_stricmp(token, "spritegen"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritegen parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			if (!Q_stricmp(token, "parallel")) {
+				shader.sprite.type = SPRITE_PARALLEL;
+			} else if (!Q_stricmp(token, "parallel_oriented")) {
+				shader.sprite.type = SPRITE_PARALLEL_ORIENTED;
+			} else if (!Q_stricmp(token, "parallel_upright")) {
+				shader.sprite.type = SPRITE_PARALLEL_UPRIGHT;
+			} else if (!Q_stricmp(token, "oriented")) {
+				shader.sprite.type = SPRITE_ORIENTED;
+			}
+
+			shader.sprite.scale = 1.0;
+			continue;
+		}
+		else if (!Q_stricmp(token, "spritescale"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritescale parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			shader.sprite.scale = atof(token);
 			continue;
 		}
 		// cull <face>
@@ -1655,6 +2399,107 @@ static qboolean ParseShader( char **text )
 			ParseSort( text );
 			continue;
 		}
+		else if (!Q_stricmp(token, "#if") || !Q_stricmp(token, "#if_not") || !Q_stricmp(token, "#else"))
+		{
+			qboolean conditionpassed;
+
+			conditionpassed = qfalse;
+			if (!Q_stricmp(token, "#else"))
+			{
+				if (bInElseBlock) {
+					ri.Printf(
+						PRINT_WARNING,
+						"WARNING: illegal #else after a previous #else in shader '%s'\n",
+						shader.name);
+				}
+
+				matchingendifs--;
+				if (matchingendifs < 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: unmatched #else in shader '%s'\n", shader.name);
+				}
+
+				bInElseBlock = qtrue;
+			}
+			else
+			{
+				qboolean bInvertResult;
+
+				bInvertResult = !Q_stricmp(token, "#if_not");
+
+				token = COM_ParseExt(text, qfalse);
+				if (!Q_stricmp(token, "separate_env")) {
+					conditionpassed = r_textureDetails->integer != 0;
+				} else if (!Q_stricmp(token, "0") || !Q_stricmp(token, "false")) {
+					conditionpassed = qfalse;
+				} else if (!Q_stricmp(token, "1") || !Q_stricmp(token, "true")) {
+					conditionpassed = qtrue;
+				} else {
+					ri.Printf(
+						PRINT_WARNING,
+						"WARNING: invalid #if argument '%s' in shader '%s', not passing.\n",
+						token,
+						shader.name);
+				}
+
+				if (bInvertResult) {
+					conditionpassed = !conditionpassed;
+				}
+			}
+
+			if (!conditionpassed) {
+				int nestedifs = 0;
+
+				SkipRestOfLine(text);
+
+				while (1) {
+					token = COM_ParseExt(text, qtrue);
+					if (!token[0]) {
+						ri.Printf(PRINT_WARNING, "WARNING: no matching #endif in shader '%s'\n", shader.name);
+						break;
+					}
+
+					if (!Q_stricmp(token, "#if")) {
+						nestedifs++;
+						SkipRestOfLine(text);
+					} else if (!Q_stricmp(token, "#endif")) {
+						nestedifs--;
+					} else if (!Q_stricmp(token, "#else")) {
+						if (bInElseBlock) {
+							ri.Printf(
+								PRINT_WARNING,
+								"WARNING: illegal #else after a previous #else in shader '%s'\n",
+								shader.name);
+							break;
+						}
+
+						if (!nestedifs) {
+							matchingendifs++;
+							break;
+						}
+						nestedifs++;
+					} else {
+						SkipRestOfLine(text);
+					}
+
+					if (nestedifs == -1) {
+						break;
+					}
+				}
+			} else {
+				matchingendifs++;
+			}
+
+			continue;
+		}
+		else if (!Q_stricmp(token, "#endif"))
+		{
+			matchingendifs--;
+			if (matchingendifs < 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: unmatched #endif in shader '%s'\n", shader.name);
+			}
+
+			bInElseBlock = qfalse;
+		}
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
@@ -1663,12 +2508,20 @@ static qboolean ParseShader( char **text )
 	}
 
 	//
-	// ignore shaders that don't have any stages, unless it is a sky or fog
+	// ignore shaders that don't have any unfoggedStages, unless it is a sky or fog
 	//
-	if ( s == 0 && !shader.isSky && !(shader.contentFlags & CONTENTS_FOG ) ) {
+	if ( s == 0 && !shader.isSky && !(shader.contentFlags & CONTENTS_FOG) && !(shader.surfaceFlags & SURF_NODRAW)) {
 		return qfalse;
 	}
 
+	if (!(shader.flags & 2)) {
+		shader.flags &= ~1;
+	}
+
+	if ((shader.contentFlags & CONTENTS_FENCE) != 0 && shader.cullType == CT_TWO_SIDED) {
+		shader.cullType = CT_FRONT_SIDED;
+	}
+
 	shader.explicitlyDefined = qtrue;
 
 	return qtrue;
@@ -1700,7 +2553,7 @@ static void ComputeStageIteratorFunc( void )
 	if ( shader.isSky )
 	{
 		shader.optimalStageIteratorFunc = RB_StageIteratorSky;
-		return;
+		goto done;
 	}
 
 	if ( r_ignoreFastPath->integer )
@@ -1713,20 +2566,20 @@ static void ComputeStageIteratorFunc( void )
 	//
 	if ( shader.numUnfoggedPasses == 1 )
 	{
-		if ( stages[0].rgbGen == CGEN_LIGHTING_DIFFUSE )
+		if ( unfoggedStages[0].rgbGen == CGEN_LIGHTING_GRID || unfoggedStages[0].rgbGen == CGEN_LIGHTING_SPHERICAL )
 		{
-			if ( stages[0].alphaGen == AGEN_IDENTITY )
+			if ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP)
 			{
-				if ( stages[0].bundle[0].tcGen == TCGEN_TEXTURE )
+				if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && !unfoggedStages[0].bundle[0].numTexMods)
 				{
 					if ( !shader.polygonOffset )
 					{
-						if ( !shader.multitextureEnv )
+						if ( !unfoggedStages[0].multitextureEnv )
 						{
 							if ( !shader.numDeforms )
 							{
-								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTexture;
-								return;
+								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTextureUnfogged;
+								goto done;
 							}
 						}
 					}
@@ -1740,24 +2593,28 @@ static void ComputeStageIteratorFunc( void )
 	//
 	if ( shader.numUnfoggedPasses == 1 )
 	{
-		if ( ( stages[0].rgbGen == CGEN_IDENTITY ) && ( stages[0].alphaGen == AGEN_IDENTITY ) )
+		if ( ( unfoggedStages[0].rgbGen == CGEN_IDENTITY ) && ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP ) )
 		{
-			if ( stages[0].bundle[0].tcGen == TCGEN_TEXTURE && 
-				stages[0].bundle[1].tcGen == TCGEN_LIGHTMAP )
+			if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && 
+				unfoggedStages[0].bundle[1].tcGen == TCGEN_LIGHTMAP )
 			{
 				if ( !shader.polygonOffset )
 				{
 					if ( !shader.numDeforms )
 					{
-						if ( shader.multitextureEnv )
+						if (unfoggedStages[0].multitextureEnv )
 						{
-							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitexture;
+							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitextureUnfogged;
+							goto done;
 						}
 					}
 				}
 			}
 		}
 	}
+
+done:
+	return;
 }
 
 typedef struct {
@@ -1803,117 +2660,132 @@ static collapse_t	collapse[] = {
 ================
 CollapseMultitexture
 
-Attempt to combine two stages into a single multitexture stage
+Attempt to combine two unfoggedStages into a single multitexture stage
 FIXME: I think modulated add + modulated add collapses incorrectly
 =================
 */
-static qboolean CollapseMultitexture( void ) {
+static void CollapseMultitexture(int *stagecounter) {
+	int iUseCollapse;
+	int stagenum;
 	int abits, bbits;
-	int i;
+	shaderStage_t* stage;
 	textureBundle_t tmpBundle;
 
-	if ( !qglActiveTextureARB ) {
-		return qfalse;
-	}
+	for (stagenum = 0; stagenum < *stagecounter - 1; stagenum++) {
+		stage = &unfoggedStages[stagenum];
 
-	// make sure both stages are active
-	if ( !stages[0].active || !stages[1].active ) {
-		return qfalse;
-	}
-
-	// on voodoo2, don't combine different tmus
-	if ( glConfig.driverType == GLDRV_VOODOO ) {
-		if ( stages[0].bundle[0].image[0]->TMU ==
-			 stages[1].bundle[0].image[0]->TMU ) {
-			return qfalse;
+		// make sure both unfoggedStages are active
+		if (!stage[0].active || !stage[1].active) {
+			continue;
 		}
-	}
 
-	abits = stages[0].stateBits;
-	bbits = stages[1].stateBits;
-
-	// make sure that both stages have identical state other than blend modes
-	if ( ( abits & ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE ) ) !=
-		( bbits & ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE ) ) ) {
-		return qfalse;
-	}
-
-	abits &= ( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-	bbits &= ( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-
-	// search for a valid multitexture blend function
-	for ( i = 0; collapse[i].blendA != -1 ; i++ ) {
-		if ( abits == collapse[i].blendA
-			&& bbits == collapse[i].blendB ) {
-			break;
+		if (stage->multitextureEnv) {
+			continue;
 		}
-	}
 
-	// nothing found
-	if ( collapse[i].blendA == -1 ) {
-		return qfalse;
-	}
+		// on voodoo2, don't combine different tmus
+		if (glConfig.driverType == GLDRV_VOODOO) {
+			if (stage[1].bundle[0].image[0]->TMU ==
+				unfoggedStages[stagenum].bundle[0].image[0]->TMU) {
+				continue;
+			}
+		}
 
-	// GL_ADD is a separate extension
-	if ( collapse[i].multitextureEnv == GL_ADD && !glConfig.textureEnvAddAvailable ) {
-		return qfalse;
-	}
+		abits = stage[0].stateBits;
+		bbits = stage[1].stateBits;
 
-	// make sure waveforms have identical parameters
-	if ( ( stages[0].rgbGen != stages[1].rgbGen ) ||
-		( stages[0].alphaGen != stages[1].alphaGen ) )  {
-		return qfalse;
-	}
+		// make sure that both unfoggedStages have identical state other than blend modes
+		if (
+			(abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)) !=
+			(bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE))
+            && (bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)
+					& abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)
+					& ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHFUNC_EQUAL | GLS_DEPTHMASK_TRUE)
+				|| !(abits & GLS_DEPTHMASK_TRUE)
+				|| !(bbits & GLS_DEPTHFUNC_EQUAL))
+			) {
+			continue;
+		}
 
-	// an add collapse can only have identity colors
-	if ( collapse[i].multitextureEnv == GL_ADD && stages[0].rgbGen != CGEN_IDENTITY ) {
-		return qfalse;
-	}
+		abits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+		bbits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
 
-	if ( stages[0].rgbGen == CGEN_WAVEFORM )
-	{
-		if ( memcmp( &stages[0].rgbWave,
-					 &stages[1].rgbWave,
-					 sizeof( stages[0].rgbWave ) ) )
+		// search for a valid multitexture blend function
+		for (iUseCollapse = 0; collapse[iUseCollapse].blendA != -1; iUseCollapse++) {
+			if (abits == collapse[iUseCollapse].blendA
+				&& bbits == collapse[iUseCollapse].blendB) {
+				break;
+			}
+		}
+
+		// nothing found
+		if (collapse[iUseCollapse].blendA == -1) {
+			continue;
+		}
+
+		// GL_ADD is a separate extension
+		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && !glConfig.textureEnvAddAvailable) {
+			continue;
+		}
+
+		// make sure waveforms have identical parameters
+		if ((stage->rgbGen != unfoggedStages[stagenum + 1].rgbGen) ||
+			(stage->alphaGen != unfoggedStages[stagenum + 1].alphaGen)) {
+			continue;
+		}
+
+		// an add collapse can only have identity colors
+		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && stage->rgbGen != CGEN_IDENTITY) {
+			continue;
+		}
+
+		if (stage->rgbGen == CGEN_WAVEFORM)
 		{
-			return qfalse;
+			if (memcmp(&stage->rgbWave,
+				&unfoggedStages[stagenum + 1].rgbWave,
+				sizeof(stage->rgbWave)))
+			{
+				continue;
+			}
 		}
-	}
-	if ( stages[0].alphaGen == AGEN_WAVEFORM )
-	{
-		if ( memcmp( &stages[0].alphaWave,
-					 &stages[1].alphaWave,
-					 sizeof( stages[0].alphaWave ) ) )
+		if (stage->alphaGen == CGEN_WAVEFORM)
 		{
-			return qfalse;
+			if (memcmp(&stage->alphaWave,
+				&unfoggedStages[stagenum + 1].alphaWave,
+				sizeof(stage->alphaWave)))
+			{
+				continue;
+			}
 		}
+
+
+		// make sure that lightmaps are in bundle 1 for 3dfx
+		if (stage->bundle[0].isLightmap)
+		{
+			tmpBundle = stage->bundle[0];
+			stage->bundle[0] = stage[1].bundle[0];
+			stage->bundle[1] = tmpBundle;
+		}
+		else
+		{
+			stage->bundle[1] = stage[1].bundle[0];
+		}
+
+		// set the new blend state bits
+		stage->multitextureEnv = collapse[iUseCollapse].multitextureEnv;
+		stage->stateBits &= ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+		stage->stateBits |= collapse[iUseCollapse].multitextureBlend;
+
+		//
+		// move down subsequent shaders
+		//
+		if (stagenum + 2 < MAX_SHADER_STAGES) {
+			memmove(&unfoggedStages[stagenum + 1], &unfoggedStages[stagenum + 2], sizeof(unfoggedStages[0]) * (MAX_SHADER_STAGES - 2 - stagenum));
+		}
+
+		Com_Memset(&unfoggedStages[MAX_SHADER_STAGES - 1], 0, sizeof(unfoggedStages[0]));
+		(*stagecounter)--;
 	}
-
-
-	// make sure that lightmaps are in bundle 1 for 3dfx
-	if ( stages[0].bundle[0].isLightmap )
-	{
-		tmpBundle = stages[0].bundle[0];
-		stages[0].bundle[0] = stages[1].bundle[0];
-		stages[0].bundle[1] = tmpBundle;
-	}
-	else
-	{
-		stages[0].bundle[1] = stages[1].bundle[0];
-	}
-
-	// set the new blend state bits
-	shader.multitextureEnv = collapse[i].multitextureEnv;
-	stages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-	stages[0].stateBits |= collapse[i].multitextureBlend;
-
-	//
-	// move down subsequent shaders
-	//
-	memmove( &stages[1], &stages[2], sizeof( stages[0] ) * ( MAX_SHADER_STAGES - 2 ) );
-	Com_Memset( &stages[MAX_SHADER_STAGES-1], 0, sizeof( stages[0] ) );
-
-	return qtrue;
 }
 
 /*
@@ -1928,14 +2800,12 @@ sortedIndex.
 ==============
 */
 static void FixRenderCommandList( int newShader ) {
-	renderCommandList_t	*cmdList = &backEndData->commands;
+	renderCommandList_t	*cmdList = &backEndData[tr.smpFrame]->commands;
 
 	if( cmdList ) {
 		const void *curCmd = cmdList->cmds;
 
 		while ( 1 ) {
-			curCmd = PADP(curCmd, sizeof(void *));
-
 			switch ( *(const int *)curCmd ) {
 			case RC_SET_COLOR:
 				{
@@ -1996,7 +2866,7 @@ static void FixRenderCommandList( int newShader ) {
 SortNewShader
 
 Positions the most recently created shader in the tr.sortedShaders[]
-array so that the shader->sort key is sorted relative to the other
+array so that the shader->sort key is sorted reletive to the other
 shaders.
 
 Sets shader->sortedIndex
@@ -2018,10 +2888,6 @@ static void SortNewShader( void ) {
 		tr.sortedShaders[i+1]->sortedIndex++;
 	}
 
-	// Arnout: fix rendercommandlist
-	// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=493
-	FixRenderCommandList( i+1 );
-
 	newShader->sortedIndex = i+1;
 	tr.sortedShaders[i+1] = newShader;
 }
@@ -2035,22 +2901,18 @@ GeneratePermanentShader
 static shader_t *GeneratePermanentShader( void ) {
 	shader_t	*newShader;
 	int			i, b;
-	int			size, hash;
+	int			size;
 
 	if ( tr.numShaders == MAX_SHADERS ) {
 		ri.Printf( PRINT_WARNING, "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
 		return tr.defaultShader;
 	}
 
-	newShader = ri.Hunk_Alloc( sizeof( shader_t ), h_low );
+	newShader = ri.Hunk_Alloc( sizeof( shader_t ), h_dontcare);
 
 	*newShader = shader;
-
-	if ( shader.sort <= SS_OPAQUE ) {
-		newShader->fogPass = FP_EQUAL;
-	} else if ( shader.contentFlags & CONTENTS_FOG ) {
-		newShader->fogPass = FP_LE;
-	}
+	newShader->next = currentShader->shader;
+	currentShader->shader = newShader;
 
 	tr.shaders[ tr.numShaders ] = newShader;
 	newShader->index = tr.numShaders;
@@ -2061,24 +2923,24 @@ static shader_t *GeneratePermanentShader( void ) {
 	tr.numShaders++;
 
 	for ( i = 0 ; i < newShader->numUnfoggedPasses ; i++ ) {
-		if ( !stages[i].active ) {
+		if ( !unfoggedStages[i].active ) {
 			break;
 		}
-		newShader->stages[i] = ri.Hunk_Alloc( sizeof( stages[i] ), h_low );
-		*newShader->stages[i] = stages[i];
+		newShader->unfoggedStages[i] = ri.Hunk_Alloc( sizeof( unfoggedStages[i] ), h_dontcare );
+		*newShader->unfoggedStages[i] = unfoggedStages[i];
 
 		for ( b = 0 ; b < NUM_TEXTURE_BUNDLES ; b++ ) {
-			size = newShader->stages[i]->bundle[b].numTexMods * sizeof( texModInfo_t );
-			newShader->stages[i]->bundle[b].texMods = ri.Hunk_Alloc( size, h_low );
-			Com_Memcpy( newShader->stages[i]->bundle[b].texMods, stages[i].bundle[b].texMods, size );
+			size = newShader->unfoggedStages[i]->bundle[b].numTexMods * sizeof( texModInfo_t );
+			if (size) {
+				newShader->unfoggedStages[i]->bundle[b].texMods = ri.Hunk_Alloc(size, h_dontcare);
+				Com_Memcpy(newShader->unfoggedStages[i]->bundle[b].texMods, unfoggedStages[i].bundle[b].texMods, size);
+			}
 		}
 	}
 
 	SortNewShader();
 
-	hash = generateHashValue(newShader->name, FILE_HASH_SIZE);
-	newShader->next = hashTable[hash];
-	hashTable[hash] = newShader;
+	currentShader = NULL;
 
 	return newShader;
 }
@@ -2088,7 +2950,7 @@ static shader_t *GeneratePermanentShader( void ) {
 VertexLightingCollapse
 
 If vertex lighting is enabled, only render a single
-pass, trying to guess which is the correct one to best approximate
+pass, trying to guess which is the correct one to best aproximate
 what it is supposed to look like.
 =================
 */
@@ -2102,11 +2964,11 @@ static void VertexLightingCollapse( void ) {
 	if ( shader.sort == SS_OPAQUE ) {
 
 		// pick the best texture for the single pass
-		bestStage = &stages[0];
+		bestStage = &unfoggedStages[0];
 		bestImageRank = -999999;
 
 		for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
-			shaderStage_t *pStage = &stages[stage];
+			shaderStage_t *pStage = &unfoggedStages[stage];
 
 			if ( !pStage->active ) {
 				break;
@@ -2132,37 +2994,37 @@ static void VertexLightingCollapse( void ) {
 			}
 		}
 
-		stages[0].bundle[0] = bestStage->bundle[0];
-		stages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-		stages[0].stateBits |= GLS_DEPTHMASK_TRUE;
+		unfoggedStages[0].bundle[0] = bestStage->bundle[0];
+		unfoggedStages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
+		unfoggedStages[0].stateBits |= GLS_DEPTHMASK_TRUE;
 		if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-			stages[0].rgbGen = CGEN_LIGHTING_DIFFUSE;
+			unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
 		} else {
-			stages[0].rgbGen = CGEN_EXACT_VERTEX;
+			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
 		}
-		stages[0].alphaGen = AGEN_SKIP;		
+		unfoggedStages[0].alphaGen = AGEN_SKIP;		
 	} else {
 		// don't use a lightmap (tesla coils)
-		if ( stages[0].bundle[0].isLightmap ) {
-			stages[0] = stages[1];
+		if ( unfoggedStages[0].bundle[0].isLightmap ) {
+			unfoggedStages[0] = unfoggedStages[1];
 		}
 
 		// if we were in a cross-fade cgen, hack it to normal
-		if ( stages[0].rgbGen == CGEN_ONE_MINUS_ENTITY || stages[1].rgbGen == CGEN_ONE_MINUS_ENTITY ) {
-			stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		if ( unfoggedStages[0].rgbGen == CGEN_ONE_MINUS_ENTITY || unfoggedStages[1].rgbGen == CGEN_ONE_MINUS_ENTITY ) {
+			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
 		}
-		if ( ( stages[0].rgbGen == CGEN_WAVEFORM && stages[0].rgbWave.func == GF_SAWTOOTH )
-			&& ( stages[1].rgbGen == CGEN_WAVEFORM && stages[1].rgbWave.func == GF_INVERSE_SAWTOOTH ) ) {
-			stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_SAWTOOTH )
+			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_INVERSE_SAWTOOTH ) ) {
+			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
 		}
-		if ( ( stages[0].rgbGen == CGEN_WAVEFORM && stages[0].rgbWave.func == GF_INVERSE_SAWTOOTH )
-			&& ( stages[1].rgbGen == CGEN_WAVEFORM && stages[1].rgbWave.func == GF_SAWTOOTH ) ) {
-			stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_INVERSE_SAWTOOTH )
+			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_SAWTOOTH ) ) {
+			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
 		}
 	}
 
 	for ( stage = 1; stage < MAX_SHADER_STAGES; stage++ ) {
-		shaderStage_t *pStage = &stages[stage];
+		shaderStage_t *pStage = &unfoggedStages[stage];
 
 		if ( !pStage->active ) {
 			break;
@@ -2172,26 +3034,6 @@ static void VertexLightingCollapse( void ) {
 	}
 }
 
-/*
-===============
-InitShader
-===============
-*/
-static void InitShader( const char *name, int lightmapIndex ) {
-	int i;
-
-	// clear the global shader
-	Com_Memset( &shader, 0, sizeof( shader ) );
-	Com_Memset( &stages, 0, sizeof( stages ) );
-
-	Q_strncpyz( shader.name, name, sizeof( shader.name ) );
-	shader.lightmapIndex = lightmapIndex;
-
-	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
-		stages[i].bundle[0].texMods = texMods[i];
-	}
-}
-
 /*
 =========================
 FinishShader
@@ -2202,15 +3044,29 @@ from the current global working shader
 */
 static shader_t *FinishShader( void ) {
 	int stage;
-	qboolean		hasLightmapStage;
-	qboolean		vertexLightmap;
+	int i;
+	int bundle;
+	qboolean hasLightmapStage;
+
+	if (!currentShader) {
+		currentShader = FindShaderText(shader.name);
+	}
+
+    if (shader.defaultShader)
+    {
+        currentShader->shader = tr.defaultShader;
+        currentShader = NULL;
+        return tr.defaultShader;
+    }
 
 	hasLightmapStage = qfalse;
-	vertexLightmap = qfalse;
 
 	//
 	// set sky stuff appropriate
 	//
+	if ( shader.isPortalSky ) {
+		shader.sort = SS_PORTALSKY;
+	}
 	if ( shader.isSky ) {
 		shader.sort = SS_ENVIRONMENT;
 	}
@@ -2222,159 +3078,149 @@ static shader_t *FinishShader( void ) {
 		shader.sort = SS_DECAL;
 	}
 
+	shader.needsLGrid = qfalse;
+	shader.needsLSpherical = qfalse;
+
 	//
 	// set appropriate stage information
 	//
-	for ( stage = 0; stage < MAX_SHADER_STAGES; ) {
-		shaderStage_t *pStage = &stages[stage];
-
-		if ( !pStage->active ) {
-			break;
-		}
-
-    // check for a missing texture
+	stage = 0;
+	for (shaderStage_t* pStage = &unfoggedStages[0]; pStage->active; pStage++, stage++) {
+		// check for a missing texture
 		if ( !pStage->bundle[0].image[0] ) {
 			ri.Printf( PRINT_WARNING, "Shader %s has a stage with no image\n", shader.name );
 			pStage->active = qfalse;
-			stage++;
 			continue;
 		}
 
-		//
-		// ditch this stage if it's detail and detail textures are disabled
-		//
-		if ( pStage->isDetail && !r_detailTextures->integer )
-		{
-			int index;
-			
-			for(index = stage + 1; index < MAX_SHADER_STAGES; index++)
-			{
-				if(!stages[index].active)
-					break;
-			}
-			
-			if(index < MAX_SHADER_STAGES)
-				memmove(pStage, pStage + 1, sizeof(*pStage) * (index - stage));
-			else
-			{
-				if(stage + 1 < MAX_SHADER_STAGES)
-					memmove(pStage, pStage + 1, sizeof(*pStage) * (index - stage - 1));
-				
-				Com_Memset(&stages[index - 1], 0, sizeof(*stages));
-			}
-			
-			continue;
+		if (pStage->rgbGen == CGEN_LIGHTING_GRID) {
+			shader.needsLGrid = qtrue;
+		} else if (pStage->rgbGen == CGEN_LIGHTING_SPHERICAL || pStage->rgbGen == CGEN_STATIC) {
+			shader.needsLSpherical = qtrue;
 		}
 
 		//
 		// default texture coordinate generation
 		//
-		if ( pStage->bundle[0].isLightmap ) {
-			if ( pStage->bundle[0].tcGen == TCGEN_BAD ) {
-				pStage->bundle[0].tcGen = TCGEN_LIGHTMAP;
+		for (bundle = 0; bundle < 2; bundle++) {
+			if (pStage->bundle[bundle].isLightmap) {
+				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
+					pStage->bundle[bundle].tcGen = TCGEN_LIGHTMAP;
+				}
+				hasLightmapStage = qtrue;
 			}
-			hasLightmapStage = qtrue;
-		} else {
-			if ( pStage->bundle[0].tcGen == TCGEN_BAD ) {
-				pStage->bundle[0].tcGen = TCGEN_TEXTURE;
-			}
-		}
-
-
-    // not a true lightmap but we want to leave existing 
-    // behaviour in place and not print out a warning
-    //if (pStage->rgbGen == CGEN_VERTEX) {
-    //  vertexLightmap = qtrue;
-    //}
-
-
-
-		//
-		// determine sort order and fog color adjustment
-		//
-		if ( ( pStage->stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) ) &&
-			 ( stages[0].stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) ) ) {
-			int blendSrcBits = pStage->stateBits & GLS_SRCBLEND_BITS;
-			int blendDstBits = pStage->stateBits & GLS_DSTBLEND_BITS;
-
-			// fog color adjustment only works for blend modes that have a contribution
-			// that aproaches 0 as the modulate values aproach 0 --
-			// GL_ONE, GL_ONE
-			// GL_ZERO, GL_ONE_MINUS_SRC_COLOR
-			// GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA
-
-			// modulate, additive
-			if ( ( ( blendSrcBits == GLS_SRCBLEND_ONE ) && ( blendDstBits == GLS_DSTBLEND_ONE ) ) ||
-				( ( blendSrcBits == GLS_SRCBLEND_ZERO ) && ( blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_COLOR ) ) ) {
-				pStage->adjustColorsForFog = ACFF_MODULATE_RGB;
-			}
-			// strict blend
-			else if ( ( blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) && ( blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA ) )
-			{
-				pStage->adjustColorsForFog = ACFF_MODULATE_ALPHA;
-			}
-			// premultiplied alpha
-			else if ( ( blendSrcBits == GLS_SRCBLEND_ONE ) && ( blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA ) )
-			{
-				pStage->adjustColorsForFog = ACFF_MODULATE_RGBA;
-			} else {
-				// we can't adjust this one correctly, so it won't be exactly correct in fog
-			}
-
-			// don't screw with sort order if this is a portal or environment
-			if ( !shader.sort ) {
-				// see through item, like a grill or grate
-				if ( pStage->stateBits & GLS_DEPTHMASK_TRUE ) {
-					shader.sort = SS_SEE_THROUGH;
-				} else {
-					shader.sort = SS_BLEND0;
+			else {
+				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
+					pStage->bundle[bundle].tcGen = TCGEN_TEXTURE;
 				}
 			}
 		}
-		
-		stage++;
-	}
 
-	// there are times when you will need to manually apply a sort to
-	// opaque alpha tested shaders that have later blend passes
-	if ( !shader.sort ) {
-		shader.sort = SS_OPAQUE;
+		if (pStage->multitextureEnv && pStage->bundle[0].isLightmap) {
+			//
+			// exchange bundle
+			//
+			textureBundle_t tmpBundle = pStage->bundle[0];
+			pStage->bundle[0] = pStage->bundle[1];
+			pStage->bundle[1] = tmpBundle;
+		}
 	}
 
 	//
 	// if we are in r_vertexLight mode, never use a lightmap texture
 	//
-	if ( stage > 1 && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) ) {
-		VertexLightingCollapse();
-		stage = 1;
-		hasLightmapStage = qfalse;
-	}
+	if (stage > 1)
+	{
+		if (r_vertexLight->integer) {
+			VertexLightingCollapse();
+			stage = 1;
+			hasLightmapStage = qfalse;
+		}
 
-	//
-	// look for multitexture potential
-	//
-	if ( stage > 1 && CollapseMultitexture() ) {
-		stage--;
-	}
-
-	if ( shader.lightmapIndex >= 0 && !hasLightmapStage ) {
-		if (vertexLightmap) {
-			ri.Printf( PRINT_DEVELOPER, "WARNING: shader '%s' has VERTEX forced lightmap!\n", shader.name );
-		} else {
-			ri.Printf( PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name );
-  			shader.lightmapIndex = LIGHTMAP_NONE;
+		//
+		// look for multitexture potential
+		//
+		if (qglActiveTextureARB) {
+			CollapseMultitexture(&stage);
 		}
 	}
 
+	for (i = 0; i < stage; i++) {
+		int blendSrcBits, blendDstBits;
+
+		shaderStage_t* pStage = &unfoggedStages[i];
+		if (pStage->stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))
+		{
+			blendSrcBits = pStage->stateBits & GLS_SRCBLEND_BITS;
+			blendDstBits = pStage->stateBits & GLS_DSTBLEND_BITS;
+			if (blendSrcBits == GLS_SRCBLEND_ONE && blendDstBits == GLS_DSTBLEND_ONE
+				|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_COLOR
+				|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE
+				|| blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE
+				|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE)
+			{
+				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_BLACK;
+			}
+			else if (blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ZERO
+					|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_SRC_COLOR)
+			{
+				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_WHITE;
+			}
+			else if (blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA
+					|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_SRC_ALPHA
+					|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE)
+			{
+				pStage->stateBits |= GLS_FOG_ENABLED;
+			}
+			else {
+				ri.Printf(PRINT_WARNING, "Shader '%s' stage# %i is unfoggable\n", shader.name, i + 1);
+			}
+
+			if (shader.sort == SS_BAD)
+			{
+				if (pStage->stateBits & GLS_DEPTHMASK_TRUE) {
+					shader.sort = SS_SEE_THROUGH;
+				}
+				else {
+					shader.sort = SS_BLEND0;
+				}
+			}
+		}
+		else {
+			pStage->stateBits |= GLS_FOG_ENABLED;
+
+			if (shader.sort == SS_BAD) {
+				shader.sort = SS_OPAQUE;
+			}
+		}
+
+		if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
+			pStage->stateBits &= ~GLS_FOG_ENABLED;
+		}
+	}
+
+	// fogonly shaders don't have any normal passes
+	if (shader.sort == SS_BAD) {
+		shader.sort = SS_OPAQUE;
+	}
+
+	if (shader.lightmapIndex >= 0 && !hasLightmapStage) {
+		ri.Printf(PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name);
+		shader.lightmapIndex = LIGHTMAP_NONE;
+	}
 
 	//
 	// compute number of passes
 	//
-	shader.numUnfoggedPasses = stage;
+	shader.numUnfoggedPasses = 0;
+	for (stage = 0; stage < MAX_SHADER_STAGES; stage++) {
+		shaderStage_t* pStage = &unfoggedStages[stage];
+		if (!pStage->active) {
+			break;
+		}
 
-	// fogonly shaders don't have any normal passes
-	if (stage == 0 && !shader.isSky)
-		shader.sort = SS_FOG;
+		shader.numUnfoggedPasses++;
+	}
 
 	// determine which stage iterator function is appropriate
 	ComputeStageIteratorFunc();
@@ -2384,103 +3230,6 @@ static shader_t *FinishShader( void ) {
 
 //========================================================================================
 
-/*
-====================
-FindShaderInShaderText
-
-Scans the combined text description of all the shader files for
-the given shader name.
-
-return NULL if not found
-
-If found, it will return a valid shader
-=====================
-*/
-static char *FindShaderInShaderText( const char *shadername ) {
-
-	char *token, *p;
-
-	int i, hash;
-
-	hash = generateHashValue(shadername, MAX_SHADERTEXT_HASH);
-
-	if(shaderTextHashTable[hash])
-	{
-		for (i = 0; shaderTextHashTable[hash][i]; i++)
-		{
-			p = shaderTextHashTable[hash][i];
-			token = COM_ParseExt(&p, qtrue);
-		
-			if(!Q_stricmp(token, shadername))
-				return p;
-		}
-	}
-
-	p = s_shaderText;
-
-	if ( !p ) {
-		return NULL;
-	}
-
-	// look for label
-	while ( 1 ) {
-		token = COM_ParseExt( &p, qtrue );
-		if ( token[0] == 0 ) {
-			break;
-		}
-
-		if ( !Q_stricmp( token, shadername ) ) {
-			return p;
-		}
-		else {
-			// skip the definition
-			SkipBracedSection( &p, 0 );
-		}
-	}
-
-	return NULL;
-}
-
-
-/*
-==================
-R_FindShaderByName
-
-Will always return a valid shader, but it might be the
-default shader if the real one can't be found.
-==================
-*/
-shader_t *R_FindShaderByName( const char *name ) {
-	char		strippedName[MAX_QPATH];
-	int			hash;
-	shader_t	*sh;
-
-	if ( (name==NULL) || (name[0] == 0) ) {
-		return tr.defaultShader;
-	}
-
-	COM_StripExtension(name, strippedName, sizeof(strippedName));
-
-	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
-
-	//
-	// see if the shader is already loaded
-	//
-	for (sh=hashTable[hash]; sh; sh=sh->next) {
-		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
-		// have to check all default shaders otherwise for every call to R_FindShader
-		// with that same strippedName a new default shader is created.
-		if (Q_stricmp(sh->name, strippedName) == 0) {
-			// match found
-			return sh;
-		}
-	}
-
-	return tr.defaultShader;
-}
-
-
 /*
 ===============
 R_FindShader
@@ -2493,25 +3242,26 @@ be defined for every single image used in the game, three default
 shader behaviors can be auto-created for any image:
 
 If lightmapIndex == LIGHTMAP_NONE, then the image will have
-dynamic diffuse lighting applied to it, as appropriate for most
+dynamic diffuse lighting applied to it, as apropriate for most
 entity skin surfaces.
 
 If lightmapIndex == LIGHTMAP_2D, then the image will be used
 for 2D rendering unless an explicit shader is found
 
 If lightmapIndex == LIGHTMAP_BY_VERTEX, then the image will use
-the vertex rgba modulate values, as appropriate for misc_model
+the vertex rgba modulate values, as apropriate for misc_model
 pre-lit surfaces.
 
 Other lightmapIndex values will have a lightmap stage created
-and src*dest blending applied with the texture, as appropriate for
+and src*dest blending applied with the texture, as apropriate for
 most world construction surfaces.
 
 ===============
 */
-shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage ) {
+shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy) {
 	char		strippedName[MAX_QPATH];
-	int			hash;
+	char		fileName[MAX_QPATH];
+	int			i, j, hash;
 	char		*shaderText;
 	image_t		*image;
 	shader_t	*sh;
@@ -2524,35 +3274,67 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 	// lightmaps
 	if ( lightmapIndex >= 0 && lightmapIndex >= tr.numLightmaps ) {
 		lightmapIndex = LIGHTMAP_BY_VERTEX;
-	} else if ( lightmapIndex < LIGHTMAP_2D ) {
-		// negative lightmap indexes cause stray pointers (think tr.lightmaps[lightmapIndex])
-		ri.Printf( PRINT_WARNING, "WARNING: shader '%s' has invalid lightmap index of %d\n", name, lightmapIndex  );
-		lightmapIndex = LIGHTMAP_BY_VERTEX;
 	}
 
-	COM_StripExtension(name, strippedName, sizeof(strippedName));
+	COM_StripExtension( name, strippedName, sizeof(strippedName));
 
-	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
+	hash = generateHashValue(strippedName);
 
 	//
 	// see if the shader is already loaded
 	//
-	for (sh = hashTable[hash]; sh; sh = sh->next) {
+	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
 		// NOTE: if there was no shader or image available with the name strippedName
 		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
 		// have to check all default shaders otherwise for every call to R_FindShader
 		// with that same strippedName a new default shader is created.
-		if ( (sh->lightmapIndex == lightmapIndex || sh->defaultShader) &&
-		     !Q_stricmp(sh->name, strippedName)) {
-			// match found
-			return sh;
+        if (!Q_stricmp(currentShader->name, strippedName))
+		{
+			// shader text found, but it has no shared assigned
+			break;
 		}
 	}
 
-	InitShader( strippedName, lightmapIndex );
+	if (currentShader)
+	{
+		for (sh = currentShader->shader; sh; sh = sh->next)
+		{
+			if (sh->lightmapIndex == lightmapIndex || sh == tr.defaultShader) {
+				return sh;
+			}
+		}
+	}
+	else
+	{
+		// create a new shader text
+		currentShader = AddShaderTextToHash(strippedName, hash);
+	}
 
-	// FIXME: set these "need" values appropriately
-	shader.needsNormal = qtrue;
+	// make sure the render thread is stopped, because we are probably
+	// going to have to upload an image
+	if (r_smp->integer) {
+		R_SyncRenderThread();
+	}
+
+	// clear the global shader
+	Com_Memset( &shader, 0, sizeof( shader ) );
+    Com_Memset(&unfoggedStages, 0, sizeof(unfoggedStages));
+    Com_Memset(&texMods, 0, sizeof(texMods));
+
+    shader.sprite.scale = 1.0;
+    shader_noPicMip = qfalse;
+    shader_noMipMaps = qfalse;
+    shader_force32bit = qfalse;
+	Q_strncpyz(shader.name, strippedName, sizeof(shader.name));
+	shader.lightmapIndex = lightmapIndex;
+	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
+        for (j = 0; j < NUM_TEXTURE_BUNDLES; j++) {
+            unfoggedStages[i].bundle[j].texMods = texMods[i];
+		}
+	}
+
+	// FIXME: set these "need" values apropriately
+	shader.needsNormal = qfalse;
 	shader.needsST1 = qtrue;
 	shader.needsST2 = qtrue;
 	shader.needsColor = qtrue;
@@ -2560,47 +3342,44 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 	//
 	// attempt to define shader from an explicit parameter file
 	//
-	shaderText = FindShaderInShaderText( strippedName );
-	if ( shaderText ) {
+	if ( currentShader->text ) {
+		shaderText = currentShader->text;
 		// enable this when building a pak file to get a global list
 		// of all explicit shaders
 		if ( r_printShaders->integer ) {
 			ri.Printf( PRINT_ALL, "*SHADER* %s\n", name );
 		}
 
-		if ( !ParseShader( &shaderText ) ) {
+		if ( !ParseShader( &shaderText, picmip ) ) {
 			// had errors, so use default shader
 			shader.defaultShader = qtrue;
 		}
+
+		if (shader.lightmapIndex == LIGHTMAP_BY_VERTEX && !(shader.surfaceFlags & SURF_HINT)) {
+			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
+		}
+
 		sh = FinishShader();
 		return sh;
 	}
 
-
 	//
 	// if not defined in the in-memory shader descriptions,
-	// look for a single supported image file
+	// look for a single TGA, BMP, or PCX
 	//
-	{
-		imgFlags_t flags;
+	Q_strncpyz( fileName, name, sizeof( fileName ) );
+	COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" );
+    if (!haveClampToEdge) {
+        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
+	}
+    else {
+        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP_TO_EDGE, wrapy ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+	}
 
-		flags = IMGFLAG_NONE;
-
-		if (mipRawImage)
-		{
-			flags |= IMGFLAG_MIPMAP | IMGFLAG_PICMIP;
-		}
-		else
-		{
-			flags |= IMGFLAG_CLAMPTOEDGE;
-		}
-
-		image = R_FindImageFile( name, IMGTYPE_COLORALPHA, flags );
-		if ( !image ) {
-			ri.Printf( PRINT_DEVELOPER, "Couldn't find image file for shader %s\n", name );
-			shader.defaultShader = qtrue;
-			return FinishShader();
-		}
+	if ( !image ) {
+		ri.Printf( PRINT_WARNING, "Couldn't find image for shader %s\n", name );
+		shader.defaultShader = qtrue;
+		return FinishShader();
 	}
 
 	//
@@ -2608,183 +3387,56 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 	//
 	if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
 		// dynamic colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_LIGHTING_DIFFUSE;
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].bundle[0].image[0] = image;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 	} else if ( shader.lightmapIndex == LIGHTMAP_BY_VERTEX ) {
 		// explicit colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_EXACT_VERTEX;
-		stages[0].alphaGen = AGEN_SKIP;
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].bundle[0].image[0] = image;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
+		unfoggedStages[0].alphaGen = AGEN_SKIP;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 	} else if ( shader.lightmapIndex == LIGHTMAP_2D ) {
 		// GUI elements
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_VERTEX;
-		stages[0].alphaGen = AGEN_VERTEX;
-		stages[0].stateBits = GLS_DEPTHTEST_DISABLE |
+		unfoggedStages[0].bundle[0].image[0] = image;
+        unfoggedStages[0].active = qtrue;
+        unfoggedStages[0].force32bit = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_GLOBAL_COLOR;
+		unfoggedStages[0].alphaGen = AGEN_GLOBAL_ALPHA;
+		unfoggedStages[0].stateBits = GLS_DEPTHTEST_DISABLE |
 			  GLS_SRCBLEND_SRC_ALPHA |
 			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
 	} else if ( shader.lightmapIndex == LIGHTMAP_WHITEIMAGE ) {
 		// fullbright level
-		stages[0].bundle[0].image[0] = tr.whiteImage;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
+		unfoggedStages[1].bundle[0].image[0] = image;
+		unfoggedStages[1].active = qtrue;
+		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
+		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
 	} else {
 		// two pass lightmap
-		stages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
-		stages[0].bundle[0].isLightmap = qtrue;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
+		unfoggedStages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
+		unfoggedStages[0].bundle[0].isLightmap = qtrue;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
 													// for identitylight
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
+		unfoggedStages[1].bundle[0].image[0] = image;
+		unfoggedStages[1].active = qtrue;
+		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
+		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
 	}
 
 	return FinishShader();
 }
 
-
-qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_t *image, qboolean mipRawImage) {
-	int			hash;
-	shader_t	*sh;
-
-	hash = generateHashValue(name, FILE_HASH_SIZE);
-
-	// probably not necessary since this function
-	// only gets called from tr_font.c with lightmapIndex == LIGHTMAP_2D
-	// but better safe than sorry.
-	if ( lightmapIndex >= tr.numLightmaps ) {
-		lightmapIndex = LIGHTMAP_WHITEIMAGE;
-	}
-
-	//
-	// see if the shader is already loaded
-	//
-	for (sh=hashTable[hash]; sh; sh=sh->next) {
-		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
-		// have to check all default shaders otherwise for every call to R_FindShader
-		// with that same strippedName a new default shader is created.
-		if ( (sh->lightmapIndex == lightmapIndex || sh->defaultShader) &&
-			// index by name
-			!Q_stricmp(sh->name, name)) {
-			// match found
-			return sh->index;
-		}
-	}
-
-	InitShader( name, lightmapIndex );
-
-	// FIXME: set these "need" values appropriately
-	shader.needsNormal = qtrue;
-	shader.needsST1 = qtrue;
-	shader.needsST2 = qtrue;
-	shader.needsColor = qtrue;
-
-	//
-	// create the default shading commands
-	//
-	if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-		// dynamic colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_LIGHTING_DIFFUSE;
-		stages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_BY_VERTEX ) {
-		// explicit colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_EXACT_VERTEX;
-		stages[0].alphaGen = AGEN_SKIP;
-		stages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_2D ) {
-		// GUI elements
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_VERTEX;
-		stages[0].alphaGen = AGEN_VERTEX;
-		stages[0].stateBits = GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-	} else if ( shader.lightmapIndex == LIGHTMAP_WHITEIMAGE ) {
-		// fullbright level
-		stages[0].bundle[0].image[0] = tr.whiteImage;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		stages[0].stateBits = GLS_DEFAULT;
-
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	} else {
-		// two pass lightmap
-		stages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
-		stages[0].bundle[0].isLightmap = qtrue;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
-													// for identitylight
-		stages[0].stateBits = GLS_DEFAULT;
-
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	}
-
-	sh = FinishShader();
-  return sh->index; 
-}
-
-
-/* 
-====================
-RE_RegisterShader
-
-This is the exported shader entry point for the rest of the system
-It will always return an index that will be valid.
-
-This should really only be used for explicit shaders, because there is no
-way to ask for different implicit lighting modes (vertex, lightmap, etc)
-====================
-*/
-qhandle_t RE_RegisterShaderLightMap( const char *name, int lightmapIndex ) {
-	shader_t	*sh;
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	sh = R_FindShader( name, lightmapIndex, qtrue );
-
-	// we want to return 0 if the shader failed to
-	// load for some reason, but R_FindShader should
-	// still keep a name allocated for it, so if
-	// something calls RE_RegisterShader again with
-	// the same name, we don't try looking for it again
-	if ( sh->defaultShader ) {
-		return 0;
-	}
-
-	return sh->index;
-}
-
-
 /* 
 ====================
 RE_RegisterShader
@@ -2800,11 +3452,11 @@ qhandle_t RE_RegisterShader( const char *name ) {
 	shader_t	*sh;
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
-	sh = R_FindShader( name, LIGHTMAP_2D, qtrue );
+	sh = R_FindShader( name, LIGHTMAP_2D, qtrue, qtrue, qtrue, qtrue);
 
 	// we want to return 0 if the shader failed to
 	// load for some reason, but R_FindShader should
@@ -2830,11 +3482,11 @@ qhandle_t RE_RegisterShaderNoMip( const char *name ) {
 	shader_t	*sh;
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
-	sh = R_FindShader( name, LIGHTMAP_2D, qfalse );
+	sh = R_FindShader( name, LIGHTMAP_2D, qfalse, qfalse, qfalse, qfalse );
 
 	// we want to return 0 if the shader failed to
 	// load for some reason, but R_FindShader should
@@ -2848,6 +3500,54 @@ qhandle_t RE_RegisterShaderNoMip( const char *name ) {
 	return sh->index;
 }
 
+qhandle_t RE_RefreshShaderNoMip(const char* name) {
+	shader_t* sh;
+	char strippedName[64];
+	int hash;
+
+	if (!name || !*name) {
+		return 0;
+	}
+
+    COM_StripExtension(name, strippedName, sizeof(strippedName));
+
+	hash = generateHashValue(strippedName);
+
+	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
+		if (!Q_stricmp(currentShader->name, strippedName)) {
+			if (currentShader) {
+				image_t* image;
+
+				sh = currentShader->shader;
+				image = sh->unfoggedStages[0]->bundle[0].image[0];
+				currentShader = NULL;
+
+				if (image) {
+					sh->unfoggedStages[0]->bundle[0].image[0] = R_RefreshImageFile(
+						image->imgName,
+						image->numMipmaps,
+						image->allowPicmip,
+						image->force32bit,
+						image->wrapClampModeX,
+						image->wrapClampModeY
+					);
+				}
+
+				return sh->index;
+			}
+
+			break;
+		}
+	}
+
+    sh = R_FindShader(name, -4, 0, 0, 0, 0);
+	if (sh->defaultShader) {
+		return 0;
+	}
+
+    return sh->index;
+}
+
 /*
 ====================
 R_GetShaderByHandle
@@ -2858,7 +3558,7 @@ it and returns a valid (possibly default) shader_t to be used internally.
 */
 shader_t *R_GetShaderByHandle( qhandle_t hShader ) {
 	if ( hShader < 0 ) {
-	  ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
+	  ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader ); // bk: FIXME name
 		return tr.defaultShader;
 	}
 	if ( hShader >= tr.numShaders ) {
@@ -2885,6 +3585,8 @@ void	R_ShaderList_f (void) {
 
 	count = 0;
 	for ( i = 0 ; i < tr.numShaders ; i++ ) {
+		int stage;
+
 		if ( ri.Cmd_Argc() > 1 ) {
 			shader = tr.sortedShaders[i];
 		} else {
@@ -2898,15 +3600,19 @@ void	R_ShaderList_f (void) {
 		} else {
 			ri.Printf (PRINT_ALL, "  ");
 		}
-		if ( shader->multitextureEnv == GL_ADD ) {
-			ri.Printf( PRINT_ALL, "MT(a) " );
-		} else if ( shader->multitextureEnv == GL_MODULATE ) {
-			ri.Printf( PRINT_ALL, "MT(m) " );
-		} else if ( shader->multitextureEnv == GL_DECAL ) {
-			ri.Printf( PRINT_ALL, "MT(d) " );
-		} else {
-			ri.Printf( PRINT_ALL, "      " );
+
+		for (stage = 0; shader->unfoggedStages[stage] && shader->unfoggedStages[stage]->active; stage++) {
+			if (shader->unfoggedStages[stage]->multitextureEnv == GL_ADD ) {
+				ri.Printf( PRINT_ALL, "MT(a) " );
+			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_MODULATE ) {
+				ri.Printf( PRINT_ALL, "MT(m) " );
+			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_DECAL ) {
+				ri.Printf( PRINT_ALL, "MT(d) " );
+			} else {
+				ri.Printf( PRINT_ALL, "      " );
+			}
 		}
+
 		if ( shader->explicitlyDefined ) {
 			ri.Printf( PRINT_ALL, "E " );
 		} else {
@@ -2917,9 +3623,9 @@ void	R_ShaderList_f (void) {
 			ri.Printf( PRINT_ALL, "gen " );
 		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorSky ) {
 			ri.Printf( PRINT_ALL, "sky " );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorLightmappedMultitexture ) {
+		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorLightmappedMultitextureUnfogged ) {
 			ri.Printf( PRINT_ALL, "lmmt" );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorVertexLitTexture ) {
+		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorVertexLitTextureUnfogged ) {
 			ri.Printf( PRINT_ALL, "vlt " );
 		} else {
 			ri.Printf( PRINT_ALL, "    " );
@@ -2936,6 +3642,7 @@ void	R_ShaderList_f (void) {
 	ri.Printf (PRINT_ALL, "------------------\n");
 }
 
+
 /*
 ====================
 ScanAndLoadShaderFiles
@@ -2947,155 +3654,89 @@ a single large text block that can be scanned for shader names
 #define	MAX_SHADER_FILES	4096
 static void ScanAndLoadShaderFiles( void )
 {
-	char **shaderFiles;
-	char *buffers[MAX_SHADER_FILES] = {0};
-	char *p;
-	int numShaderFiles;
-	int i;
-	char *oldp, *token, *hashMem, *textEnd;
-	int shaderTextHashTableSizes[MAX_SHADERTEXT_HASH], hash, size;
-	char shaderName[MAX_QPATH];
-	int shaderLine;
+    char** shaderFiles;
+    char* buffers[MAX_SHADER_FILES];
+    char* p;
+    int numShaders;
+    int i;
 
-	long sum = 0, summand;
-	// scan for shader files
-	shaderFiles = ri.FS_ListFiles( "scripts", ".shader", &numShaderFiles );
+    long sum = 0;
+    // scan for shader files
+    shaderFiles = ri.FS_ListFiles("scripts/", ".shader", &numShaders);
 
-	if ( !shaderFiles || !numShaderFiles )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: no shader files found\n" );
+    if (!shaderFiles || !numShaders)
+    {
+        ri.Printf(PRINT_WARNING, "WARNING: no shader files found\n");
+        return;
+    }
+
+    if (numShaders > MAX_SHADER_FILES) {
+        numShaders = MAX_SHADER_FILES;
+    }
+
+    // load and parse shader files
+    for (i = 0; i < numShaders; i++)
+    {
+        char filename[MAX_QPATH];
+
+        Com_sprintf(filename, sizeof(filename), "scripts/%s", shaderFiles[i]);
+        ri.Printf(PRINT_ALL, "...loading '%s'\n", filename);
+        sum += ri.FS_ReadFile(filename, (void**)&buffers[i]);
+        if (!buffers[i]) {
+            ri.Error(ERR_DROP, "Couldn't load %s", filename);
+        }
+    }
+
+    // build single large buffer
+    s_shaderText = ri.Malloc(sum + numShaders * 2);
+    s_shaderText[0] = 0;
+
+    // free in reverse order, so the temp files are all dumped
+    for (i = numShaders - 1; i >= 0; i--) {
+        strcat(s_shaderText, "\n");
+        p = &s_shaderText[strlen(s_shaderText)];
+        strcat(s_shaderText, buffers[i]);
+        ri.FS_FreeFile(buffers[i]);
+        buffers[i] = p;
+    }
+
+    COM_Compress(s_shaderText);
+    // free up memory
+    ri.FS_FreeFileList(shaderFiles);
+}
+
+static void FindShadersInShaderText()
+{
+	char* p;
+	char* oldp;
+	char* token;
+
+	if (!s_shaderText) {
 		return;
 	}
 
-	if ( numShaderFiles > MAX_SHADER_FILES ) {
-		numShaderFiles = MAX_SHADER_FILES;
-	}
-
-	// load and parse shader files
-	for ( i = 0; i < numShaderFiles; i++ )
-	{
-		char filename[MAX_QPATH];
-
-		Com_sprintf( filename, sizeof( filename ), "scripts/%s", shaderFiles[i] );
-		ri.Printf( PRINT_DEVELOPER, "...loading '%s'\n", filename );
-		summand = ri.FS_ReadFile( filename, (void **)&buffers[i] );
-		
-		if ( !buffers[i] )
-			ri.Error( ERR_DROP, "Couldn't load %s", filename );
-		
-		// Do a simple check on the shader structure in that file to make sure one bad shader file cannot fuck up all other shaders.
-		p = buffers[i];
-		COM_BeginParseSession(filename);
-		while(1)
-		{
-			token = COM_ParseExt(&p, qtrue);
-			
-			if(!*token)
-				break;
-
-			Q_strncpyz(shaderName, token, sizeof(shaderName));
-			shaderLine = COM_GetCurrentParseLine();
-
-			token = COM_ParseExt(&p, qtrue);
-			if(token[0] != '{' || token[1] != '\0')
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
-							filename, shaderName, shaderLine);
-				if (token[0])
-				{
-					ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
-				}
-				ri.Printf(PRINT_WARNING, ".\n");
-				ri.FS_FreeFile(buffers[i]);
-				buffers[i] = NULL;
-				break;
-			}
-
-			if(!SkipBracedSection(&p, 1))
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing closing brace.\n",
-							filename, shaderName, shaderLine);
-				ri.FS_FreeFile(buffers[i]);
-				buffers[i] = NULL;
-				break;
-			}
-		}
-			
-		
-		if (buffers[i])
-			sum += summand;		
-	}
-
-	// build single large buffer
-	s_shaderText = ri.Hunk_Alloc( sum + numShaderFiles*2, h_low );
-	s_shaderText[ 0 ] = '\0';
-	textEnd = s_shaderText;
- 
-	// free in reverse order, so the temp files are all dumped
-	for ( i = numShaderFiles - 1; i >= 0 ; i-- )
-	{
-		if ( !buffers[i] )
-			continue;
-
-		strcat( textEnd, buffers[i] );
-		strcat( textEnd, "\n" );
-		textEnd += strlen( textEnd );
-		ri.FS_FreeFile( buffers[i] );
-	}
-
-	COM_Compress( s_shaderText );
-
-	// free up memory
-	ri.FS_FreeFileList( shaderFiles );
-
-	Com_Memset(shaderTextHashTableSizes, 0, sizeof(shaderTextHashTableSizes));
-	size = 0;
-
 	p = s_shaderText;
-	// look for shader names
-	while ( 1 ) {
-		token = COM_ParseExt( &p, qtrue );
-		if ( token[0] == 0 ) {
-			break;
-		}
-
-		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
-		shaderTextHashTableSizes[hash]++;
-		size++;
-		SkipBracedSection(&p, 0);
-	}
-
-	size += MAX_SHADERTEXT_HASH;
-
-	hashMem = ri.Hunk_Alloc( size * sizeof(char *), h_low );
-
-	for (i = 0; i < MAX_SHADERTEXT_HASH; i++) {
-		shaderTextHashTable[i] = (char **) hashMem;
-		hashMem = ((char *) hashMem) + ((shaderTextHashTableSizes[i] + 1) * sizeof(char *));
-	}
-
-	Com_Memset(shaderTextHashTableSizes, 0, sizeof(shaderTextHashTableSizes));
-
-	p = s_shaderText;
-	// look for shader names
-	while ( 1 ) {
-		oldp = p;
-		token = COM_ParseExt( &p, qtrue );
-		if ( token[0] == 0 ) {
-			break;
-		}
-
-		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
-		shaderTextHashTable[hash][shaderTextHashTableSizes[hash]++] = oldp;
-
-		SkipBracedSection(&p, 0);
-	}
-
-	return;
+    // look for label
+    while (1) {
+        oldp = p;
+        token = COM_ParseExt(&p, qtrue);
+        if (token[0] == 0) {
+            break;
+        }
 
+        if (*token == '{')
+        {
+            p = oldp;
+            SkipBracedSection(&p);
+        }
+        else
+        {
+            currentShader = AllocShaderText(token);
+            currentShader->text = p;
+        }
+    }
 }
 
-
 /*
 ====================
 CreateInternalShaders
@@ -3105,51 +3746,87 @@ static void CreateInternalShaders( void ) {
 	tr.numShaders = 0;
 
 	// init the default shader
-	InitShader( "<default>", LIGHTMAP_NONE );
-	stages[0].bundle[0].image[0] = tr.defaultImage;
-	stages[0].active = qtrue;
-	stages[0].stateBits = GLS_DEFAULT;
-	tr.defaultShader = FinishShader();
+	Com_Memset( &shader, 0, sizeof( shader ) );
+	Com_Memset( &unfoggedStages, 0, sizeof( unfoggedStages ) );
+
+	Q_strncpyz( shader.name, "<default>", sizeof( shader.name ) );
+	shader.lightmapIndex = LIGHTMAP_NONE;
+	unfoggedStages[0].bundle[0].image[0] = tr.defaultImage;
+	unfoggedStages[0].active = qtrue;
+	unfoggedStages[0].stateBits = GLS_DEFAULT;
+	currentShader = FindShaderText(shader.name);
+    tr.defaultShader = FinishShader();
+
+    // white shader
+    Q_strncpyz(shader.name, "<white>", sizeof(shader.name));
+    shader.lightmapIndex = LIGHTMAP_NONE;
+    unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
+    unfoggedStages[0].active = qtrue;
+    unfoggedStages[0].stateBits = GLS_DEFAULT;
+    currentShader = FindShaderText(shader.name);
+	FinishShader();
 
 	// shadow shader is just a marker
 	Q_strncpyz( shader.name, "<stencil shadow>", sizeof( shader.name ) );
-	shader.sort = SS_STENCIL_SHADOW;
+    shader.sort = SS_STENCIL_SHADOW;
+    shader.lightmapIndex = LIGHTMAP_NONE;
+	currentShader = FindShaderText(shader.name);
 	tr.shadowShader = FinishShader();
 }
 
 static void CreateExternalShaders( void ) {
-	tr.projectionShadowShader = R_FindShader( "projectionShadow", LIGHTMAP_NONE, qtrue );
-	tr.flareShader = R_FindShader( "flareShader", LIGHTMAP_NONE, qtrue );
+	tr.flareShader = R_FindShader( "flareShader", LIGHTMAP_NONE, qtrue, qtrue, qtrue, qtrue);
+}
 
-	// Hack to make fogging work correctly on flares. Fog colors are calculated
-	// in tr_flare.c already.
-	if(!tr.flareShader->defaultShader)
-	{
-		int index;
-		
-		for(index = 0; index < tr.flareShader->numUnfoggedPasses; index++)
-		{
-			tr.flareShader->stages[index]->adjustColorsForFog = ACFF_NONE;
-			tr.flareShader->stages[index]->stateBits |= GLS_DEPTHTEST_DISABLE;
-		}
+void R_StartupShaders()
+{
+    ri.Printf(PRINT_ALL, "Initializing Shaders\n");
+
+    currentShader = NULL;
+    s_shaderText = NULL;
+
+    Com_Memset(hashTable, 0, sizeof(hashTable));
+
+    ScanAndLoadShaderFiles();
+
+    FindShadersInShaderText();
+
+    R_SetupShaders();
+}
+
+void R_ShutdownShaders()
+{
+	shadertext_t* shader, * next;
+	int hash;
+
+	if (s_shaderText) {
+		ri.Free(s_shaderText);
 	}
 
-	tr.sunShader = R_FindShader( "sun", LIGHTMAP_NONE, qtrue );
+    for (hash = 0; hash < FILE_HASH_SIZE; hash++) {
+        for (shader = hashTable[hash]; shader; shader = next) {
+            next = shader->next;
+            ri.Free(shader);
+        }
+        hashTable[hash] = NULL;
+	}
 }
 
-/*
-==================
-R_InitShaders
-==================
-*/
-void R_InitShaders( void ) {
-	ri.Printf( PRINT_ALL, "Initializing Shaders\n" );
+void R_SetupShaders()
+{
+	shadertext_t* shader;
+	int hash;
 
-	Com_Memset(hashTable, 0, sizeof(hashTable));
+    ri.Printf(0, "Setting up Shaders\n");
+    currentShader = NULL;
+    for (hash = 0; hash < FILE_HASH_SIZE; ++hash)
+    {
+		for (shader = hashTable[hash]; shader; shader = shader->next) {
+			shader->shader = NULL;
+		}
+    }
 
-	CreateInternalShaders();
-
-	ScanAndLoadShaderFiles();
-
-	CreateExternalShaders();
+    CreateInternalShaders();
+    InitStaticShaders();
+    CreateExternalShaders();
 }
diff --git a/code/renderergl1/tr_shadows.c b/code/renderergl1/tr_shadows.c
index 13fbfdf7..5db94a28 100644
--- a/code/renderergl1/tr_shadows.c
+++ b/code/renderergl1/tr_shadows.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -44,20 +44,6 @@ typedef struct {
 static	edgeDef_t	edgeDefs[SHADER_MAX_VERTEXES][MAX_EDGE_DEFS];
 static	int			numEdgeDefs[SHADER_MAX_VERTEXES];
 static	int			facing[SHADER_MAX_INDEXES/3];
-static	vec3_t		shadowXyz[SHADER_MAX_VERTEXES];
-
-void R_AddEdgeDef( int i1, int i2, int facing ) {
-	int		c;
-
-	c = numEdgeDefs[ i1 ];
-	if ( c == MAX_EDGE_DEFS ) {
-		return;		// overflow
-	}
-	edgeDefs[ i1 ][ c ].i2 = i2;
-	edgeDefs[ i1 ][ c ].facing = facing;
-
-	numEdgeDefs[ i1 ]++;
-}
 
 void R_RenderShadowEdges( void ) {
 	int		i;
@@ -81,13 +67,13 @@ void R_RenderShadowEdges( void ) {
 
 		qglBegin( GL_TRIANGLE_STRIP );
 		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( shadowXyz[ i1 ] );
+		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
 		qglVertex3fv( tess.xyz[ i2 ] );
-		qglVertex3fv( shadowXyz[ i2 ] );
+		qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
 		qglVertex3fv( tess.xyz[ i3 ] );
-		qglVertex3fv( shadowXyz[ i3 ] );
+		qglVertex3fv( tess.xyz[ i3 + tess.numVertexes ] );
 		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( shadowXyz[ i1 ] );
+		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
 		qglEnd();
 	}
 #else
@@ -127,9 +113,9 @@ void R_RenderShadowEdges( void ) {
 			if ( hit[ 1 ] == 0 ) {
 				qglBegin( GL_TRIANGLE_STRIP );
 				qglVertex3fv( tess.xyz[ i ] );
-				qglVertex3fv( shadowXyz[ i ] );
+				qglVertex3fv( tess.xyz[ i + tess.numVertexes ] );
 				qglVertex3fv( tess.xyz[ i2 ] );
-				qglVertex3fv( shadowXyz[ i2 ] );
+				qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
 				qglEnd();
 				c_edges++;
 			} else {
@@ -140,6 +126,19 @@ void R_RenderShadowEdges( void ) {
 #endif
 }
 
+void R_AddEdgeDef(int i1, int i2, int facing) {
+	int		c;
+
+	c = numEdgeDefs[i1];
+	if (c == MAX_EDGE_DEFS) {
+		return;		// overflow
+	}
+	edgeDefs[i1][c].i2 = i2;
+	edgeDefs[i1][c].facing = facing;
+
+	numEdgeDefs[i1]++;
+}
+
 /*
 =================
 RB_ShadowTessEnd
@@ -156,7 +155,11 @@ void RB_ShadowTessEnd( void ) {
 	int		i;
 	int		numTris;
 	vec3_t	lightDir;
-	GLboolean rgba[4];
+
+	// we can only do this if we have enough space in the vertex buffers
+	if ( tess.numVertexes >= SHADER_MAX_VERTEXES / 2 ) {
+		return;
+	}
 
 	if ( glConfig.stencilBits < 4 ) {
 		return;
@@ -166,7 +169,7 @@ void RB_ShadowTessEnd( void ) {
 
 	// project vertexes away from light direction
 	for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-		VectorMA( tess.xyz[i], -512, lightDir, shadowXyz[i] );
+		VectorMA( tess.xyz[i], -512, lightDir, tess.xyz[i+tess.numVertexes] );
 	}
 
 	// decide which triangles face the light
@@ -207,31 +210,141 @@ void RB_ShadowTessEnd( void ) {
 	// draw the silhouette edges
 
 	GL_Bind( tr.whiteImage );
+	qglEnable( GL_CULL_FACE );
 	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
 	qglColor3f( 0.2f, 0.2f, 0.2f );
 
 	// don't write to the color buffer
-	qglGetBooleanv(GL_COLOR_WRITEMASK, rgba);
 	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
 
 	qglEnable( GL_STENCIL_TEST );
 	qglStencilFunc( GL_ALWAYS, 1, 255 );
 
-	GL_Cull( CT_BACK_SIDED );
-	qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+	// mirrors have the culling order reversed
+	if ( backEnd.viewParms.isMirror ) {
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
 
-	R_RenderShadowEdges();
+		R_RenderShadowEdges();
 
-	GL_Cull( CT_FRONT_SIDED );
-	qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
 
-	R_RenderShadowEdges();
+		R_RenderShadowEdges();
+	} else {
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	}
 
 
 	// reenable writing to the color buffer
-	qglColorMask(rgba[0], rgba[1], rgba[2], rgba[3]);
+	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 }
 
+/*
+=================
+RB_ComputeShadowVolume
+
+=================
+*/
+void RB_ComputeShadowVolume() {
+    int i;
+    int numTris;
+    vec3_t lightDir;
+
+    if (r_shadows->integer != 3 || glConfig.stencilBits < 8) {
+        return;
+    }
+
+    VectorSet(lightDir, -2.0, 1.5, 1.0);
+
+    // project vertexes away from light direction
+    for (i = 0; i < tess.numVertexes; i++) {
+        VectorMA(tess.xyz[i], -512, lightDir, tess.xyz[i + tess.numVertexes]);
+    }
+
+    // decide which triangles face the light
+    Com_Memset(numEdgeDefs, 0, 4 * tess.numVertexes);
+
+    numTris = tess.numIndexes / 3;
+    for (i = 0; i < numTris; i++) {
+        int		i1, i2, i3;
+        vec3_t	d1, d2, normal;
+        float* v1, * v2, * v3;
+        float	d;
+
+        i1 = tess.indexes[i * 3 + 0];
+        i2 = tess.indexes[i * 3 + 1];
+        i3 = tess.indexes[i * 3 + 2];
+
+        v1 = tess.xyz[i1];
+        v2 = tess.xyz[i2];
+        v3 = tess.xyz[i3];
+
+        VectorSubtract(v2, v1, d1);
+        VectorSubtract(v3, v1, d2);
+        CrossProduct(d1, d2, normal);
+
+        d = DotProduct(normal, lightDir);
+        if (d > 0) {
+            facing[i] = 1;
+        } else {
+            facing[i] = 0;
+        }
+
+        // create the edges
+        R_AddEdgeDef(i1, i2, facing[i]);
+        R_AddEdgeDef(i2, i3, facing[i]);
+        R_AddEdgeDef(i3, i1, facing[i]);
+    }
+
+	// draw the silhouette edges
+
+	GL_Bind( tr.whiteImage );
+	qglEnable( GL_CULL_FACE );
+	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
+	qglColor3f( 0.2f, 0.2f, 0.2f );
+
+	// don't write to the color buffer
+	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
+
+	qglEnable( GL_STENCIL_TEST );
+	qglStencilFunc( GL_ALWAYS, 1, 255 );
+
+	// mirrors have the culling order reversed
+	if ( backEnd.viewParms.isMirror ) {
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	} else {
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	}
+
+
+	// reenable writing to the color buffer
+	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
+}
 
 /*
 =================
@@ -254,7 +367,7 @@ void RB_ShadowFinish( void ) {
 	qglStencilFunc( GL_NOTEQUAL, 0, 255 );
 
 	qglDisable (GL_CLIP_PLANE0);
-	GL_Cull( CT_TWO_SIDED );
+	qglDisable (GL_CULL_FACE);
 
 	GL_Bind( tr.whiteImage );
 
@@ -276,50 +389,3 @@ void RB_ShadowFinish( void ) {
 	qglColor4f(1,1,1,1);
 	qglDisable( GL_STENCIL_TEST );
 }
-
-
-/*
-=================
-RB_ProjectionShadowDeform
-
-=================
-*/
-void RB_ProjectionShadowDeform( void ) {
-	float	*xyz;
-	int		i;
-	float	h;
-	vec3_t	ground;
-	vec3_t	light;
-	float	groundDist;
-	float	d;
-	vec3_t	lightDir;
-
-	xyz = ( float * ) tess.xyz;
-
-	ground[0] = backEnd.or.axis[0][2];
-	ground[1] = backEnd.or.axis[1][2];
-	ground[2] = backEnd.or.axis[2][2];
-
-	groundDist = backEnd.or.origin[2] - backEnd.currentEntity->e.shadowPlane;
-
-	VectorCopy( backEnd.currentEntity->lightDir, lightDir );
-	d = DotProduct( lightDir, ground );
-	// don't let the shadows get too long or go negative
-	if ( d < 0.5 ) {
-		VectorMA( lightDir, (0.5 - d), ground, lightDir );
-		d = DotProduct( lightDir, ground );
-	}
-	d = 1.0 / d;
-
-	light[0] = lightDir[0] * d;
-	light[1] = lightDir[1] * d;
-	light[2] = lightDir[2] * d;
-
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4 ) {
-		h = DotProduct( xyz, ground ) + groundDist;
-
-		xyz[0] -= light[0] * h;
-		xyz[1] -= light[1] * h;
-		xyz[2] -= light[2] * h;
-	}
-}
diff --git a/code/renderergl1/tr_sky.c b/code/renderergl1/tr_sky.c
index 1d12e924..6da4a80d 100644
--- a/code/renderergl1/tr_sky.c
+++ b/code/renderergl1/tr_sky.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -269,7 +269,7 @@ void RB_ClipSkyPolygons( shaderCommands_t *input )
 		for (j = 0 ; j < 3 ; j++) 
 		{
 			VectorSubtract( input->xyz[input->indexes[i+j]],
-							backEnd.viewParms.or.origin, 
+							backEnd.viewParms.ori.origin, 
 							p[j] );
 		}
 		ClipSkyPolygon( 3, p[0], 0 );
@@ -467,7 +467,7 @@ static void FillCloudySkySide( const int mins[2], const int maxs[2], qboolean ad
 	{
 		for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ )
 		{
-			VectorAdd( s_skyPoints[t][s], backEnd.viewParms.or.origin, tess.xyz[tess.numVertexes] );
+			VectorAdd( s_skyPoints[t][s], backEnd.viewParms.ori.origin, tess.xyz[tess.numVertexes] );
 			tess.texCoords[tess.numVertexes][0][0] = s_skyTexCoords[t][s][0];
 			tess.texCoords[tess.numVertexes][0][1] = s_skyTexCoords[t][s][1];
 
@@ -475,7 +475,7 @@ static void FillCloudySkySide( const int mins[2], const int maxs[2], qboolean ad
 
 			if ( tess.numVertexes >= SHADER_MAX_VERTEXES )
 			{
-				ri.Error( ERR_DROP, "SHADER_MAX_VERTEXES hit in FillCloudySkySide()" );
+				ri.Error( ERR_DROP, "SHADER_MAX_VERTEXES hit in FillCloudySkySide()\n" );
 			}
 		}
 	}
@@ -553,10 +553,10 @@ static void FillCloudBox( const shader_t *shader, int stage )
 			continue;
 		}
 
-		sky_mins_subd[0] = ri.ftol(sky_mins[0][i] * HALF_SKY_SUBDIVISIONS);
-		sky_mins_subd[1] = ri.ftol(sky_mins[1][i] * HALF_SKY_SUBDIVISIONS);
-		sky_maxs_subd[0] = ri.ftol(sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS);
-		sky_maxs_subd[1] = ri.ftol(sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS);
+		sky_mins_subd[0] = myftol( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS );
+		sky_mins_subd[1] = myftol( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS );
+		sky_maxs_subd[0] = myftol( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS );
+		sky_maxs_subd[1] = myftol( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS );
 
 		if ( sky_mins_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
 			sky_mins_subd[0] = -HALF_SKY_SUBDIVISIONS;
@@ -618,14 +618,14 @@ void R_BuildCloudData( shaderCommands_t *input )
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
 
-	if ( shader->sky.cloudHeight )
+	if ( input->shader->sky.cloudHeight )
 	{
 		for ( i = 0; i < MAX_SHADER_STAGES; i++ )
 		{
 			if ( !tess.xstages[i] ) {
 				break;
 			}
-			FillCloudBox( shader, i );
+			FillCloudBox( input->shader, i );
 		}
 	}
 }
@@ -696,21 +696,23 @@ void R_InitSkyTexCoords( float heightCloud )
 /*
 ** RB_DrawSun
 */
-void RB_DrawSun( float scale, shader_t *shader ) {
+void RB_DrawSun( void ) {
 	float		size;
 	float		dist;
 	vec3_t		origin, vec1, vec2;
-	byte		sunColor[4] = { 255, 255, 255, 255 };
+	vec3_t		temp;
 
 	if ( !backEnd.skyRenderedThisView ) {
 		return;
 	}
-
+	if ( !r_drawSun->integer ) {
+		return;
+	}
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
-	qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]);
+	qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
 
 	dist = 	backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	size = dist * scale;
+	size = dist * 0.4;
 
 	VectorScale( tr.sunDirection, dist, origin );
 	PerpendicularVector( vec1, tr.sunDirection );
@@ -722,9 +724,58 @@ void RB_DrawSun( float scale, shader_t *shader ) {
 	// farthest depth range
 	qglDepthRange( 1.0, 1.0 );
 
-	RB_BeginSurface( shader, 0 );
+	// FIXME: use quad stamp
+	RB_BeginSurface( tr.sunShader );
+		VectorCopy( origin, temp );
+		VectorSubtract( temp, vec1, temp );
+		VectorSubtract( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 0;
+		tess.texCoords[tess.numVertexes][0][1] = 0;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
 
-	RB_AddQuadStamp(origin, vec1, vec2, sunColor);
+		VectorCopy( origin, temp );
+		VectorAdd( temp, vec1, temp );
+		VectorSubtract( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 0;
+		tess.texCoords[tess.numVertexes][0][1] = 1;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
+
+		VectorCopy( origin, temp );
+		VectorAdd( temp, vec1, temp );
+		VectorAdd( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 1;
+		tess.texCoords[tess.numVertexes][0][1] = 1;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
+
+		VectorCopy( origin, temp );
+		VectorSubtract( temp, vec1, temp );
+		VectorAdd( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 1;
+		tess.texCoords[tess.numVertexes][0][1] = 0;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
+
+		tess.indexes[tess.numIndexes++] = 0;
+		tess.indexes[tess.numIndexes++] = 1;
+		tess.indexes[tess.numIndexes++] = 2;
+		tess.indexes[tess.numIndexes++] = 0;
+		tess.indexes[tess.numIndexes++] = 2;
+		tess.indexes[tess.numIndexes++] = 3;
 
 	RB_EndSurface();
 
@@ -745,7 +796,7 @@ Other things could be stuck in here, like birds in the sky, etc
 ================
 */
 void RB_StageIteratorSky( void ) {
-	if ( r_fastsky->integer ) {
+	if ( r_fastsky->integer || tr.farclip ) {
 		return;
 	}
 
@@ -769,8 +820,7 @@ void RB_StageIteratorSky( void ) {
 		
 		qglPushMatrix ();
 		GL_State( 0 );
-		GL_Cull( CT_FRONT_SIDED );
-		qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]);
+		qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
 
 		DrawSkyBox( tess.shader );
 
diff --git a/code/renderer/tr_sky_portal.cpp b/code/renderergl1/tr_sky_portal.cpp
similarity index 100%
rename from code/renderer/tr_sky_portal.cpp
rename to code/renderergl1/tr_sky_portal.cpp
diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderergl1/tr_sphere_shade.cpp
similarity index 100%
rename from code/renderer/tr_sphere_shade.cpp
rename to code/renderergl1/tr_sphere_shade.cpp
diff --git a/code/renderer/tr_sprite.c b/code/renderergl1/tr_sprite.c
similarity index 100%
rename from code/renderer/tr_sprite.c
rename to code/renderergl1/tr_sprite.c
diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderergl1/tr_staticmodels.cpp
similarity index 100%
rename from code/renderer/tr_staticmodels.cpp
rename to code/renderergl1/tr_staticmodels.cpp
diff --git a/code/renderergl1/tr_subs.c b/code/renderergl1/tr_subs.c
deleted file mode 100644
index 6f490128..00000000
--- a/code/renderergl1/tr_subs.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2010 James Canete (use.less01@gmail.com)
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_subs.c - common function replacements for modular renderer
-
-#include "tr_local.h"
-
-void QDECL Com_Printf( const char *msg, ... )
-{
-	va_list         argptr;
-	char            text[1024];
-
-	va_start(argptr, msg);
-	Q_vsnprintf(text, sizeof(text), msg, argptr);
-	va_end(argptr);
-
-	ri.Printf(PRINT_ALL, "%s", text);
-}
-
-void QDECL Com_Error( int level, const char *error, ... )
-{
-	va_list         argptr;
-	char            text[1024];
-
-	va_start(argptr, error);
-	Q_vsnprintf(text, sizeof(text), error, argptr);
-	va_end(argptr);
-
-	ri.Error(level, "%s", text);
-}
diff --git a/code/renderer/tr_sun_flare.cpp b/code/renderergl1/tr_sun_flare.cpp
similarity index 100%
rename from code/renderer/tr_sun_flare.cpp
rename to code/renderergl1/tr_sun_flare.cpp
diff --git a/code/renderergl1/tr_surface.c b/code/renderergl1/tr_surface.c
index 41e72738..1d5d83da 100644
--- a/code/renderergl1/tr_surface.c
+++ b/code/renderergl1/tr_surface.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -46,11 +46,6 @@ RB_CheckOverflow
 ==============
 */
 void RB_CheckOverflow( int verts, int indexes ) {
-	if (tess.numVertexes + verts < SHADER_MAX_VERTEXES
-		&& tess.numIndexes + indexes < SHADER_MAX_INDEXES) {
-		return;
-	}
-
 	RB_EndSurface();
 
 	if ( verts >= SHADER_MAX_VERTEXES ) {
@@ -60,7 +55,7 @@ void RB_CheckOverflow( int verts, int indexes ) {
 		ri.Error(ERR_DROP, "RB_CheckOverflow: indices > MAX (%d > %d)", indexes, SHADER_MAX_INDEXES );
 	}
 
-	RB_BeginSurface(tess.shader, tess.fogNum );
+	RB_BeginSurface(tess.shader);
 }
 
 
@@ -104,7 +99,7 @@ void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, flo
 
 
 	// constant normal all the way around
-	VectorSubtract( vec3_origin, backEnd.viewParms.or.axis[0], normal );
+	VectorSubtract( vec3_origin, backEnd.viewParms.ori.axis[0], normal );
 
 	tess.normal[ndx][0] = tess.normal[ndx+1][0] = tess.normal[ndx+2][0] = tess.normal[ndx+3][0] = normal[0];
 	tess.normal[ndx][1] = tess.normal[ndx+1][1] = tess.normal[ndx+2][1] = tess.normal[ndx+3][1] = normal[1];
@@ -134,6 +129,7 @@ void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, flo
 
 	tess.numVertexes += 4;
 	tess.numIndexes += 6;
+	tess.dlightMap = 0;
 }
 
 /*
@@ -157,8 +153,8 @@ static void RB_SurfaceSprite( void ) {
 	// calculate the xyz locations for the four corners
 	radius = backEnd.currentEntity->e.radius;
 	if ( backEnd.currentEntity->e.rotation == 0 ) {
-		VectorScale( backEnd.viewParms.or.axis[1], radius, left );
-		VectorScale( backEnd.viewParms.or.axis[2], radius, up );
+		VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
+		VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
 	} else {
 		float	s, c;
 		float	ang;
@@ -167,11 +163,11 @@ static void RB_SurfaceSprite( void ) {
 		s = sin( ang );
 		c = cos( ang );
 
-		VectorScale( backEnd.viewParms.or.axis[1], c * radius, left );
-		VectorMA( left, -s * radius, backEnd.viewParms.or.axis[2], left );
+		VectorScale( backEnd.viewParms.ori.axis[1], c * radius, left );
+		VectorMA( left, -s * radius, backEnd.viewParms.ori.axis[2], left );
 
-		VectorScale( backEnd.viewParms.or.axis[2], c * radius, up );
-		VectorMA( up, s * radius, backEnd.viewParms.or.axis[1], up );
+		VectorScale( backEnd.viewParms.ori.axis[2], c * radius, up );
+		VectorMA( up, s * radius, backEnd.viewParms.ori.axis[1], up );
 	}
 	if ( backEnd.viewParms.isMirror ) {
 		VectorSubtract( vec3_origin, left, left );
@@ -186,7 +182,7 @@ static void RB_SurfaceSprite( void ) {
 RB_SurfacePolychain
 =============
 */
-static void RB_SurfacePolychain( srfPoly_t *p ) {
+void RB_SurfacePolychain( srfPoly_t *p ) {
 	int		i;
 	int		numv;
 
@@ -211,16 +207,57 @@ static void RB_SurfacePolychain( srfPoly_t *p ) {
 		tess.numIndexes += 3;
 	}
 
+	tess.vertexColorValid = qtrue;
 	tess.numVertexes = numv;
 }
 
+/*
+=============
+RB_SurfaceMarkFragment
+=============
+*/
+void RB_SurfaceMarkFragment(srfMarkFragment_t* p) {
+	int i;
+	int numv;
+
+	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
+
+	if (p->iIndex <= 0 || R_TerrainHeightForPoly(&tr.world->terraPatches[p->iIndex - 1], p->verts, p->numVerts))
+	{
+		// FIXME: from here on out, it's mostly the same code as in RB_SurfacePolychain,
+		// common part could be extracted into an inline func
+
+		// fan triangles into the tess array
+		numv = tess.numVertexes;
+		for ( i = 0; i < p->numVerts; i++ )
+		{
+			VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
+			tess.texCoords[numv][0][0] = p->verts[i].st[0];
+			tess.texCoords[numv][0][1] = p->verts[i].st[1];
+			*(int *)&tess.vertexColors[numv] = *(int *)p->verts[ i ].modulate;
+
+			numv++;
+		}
+
+		// generate fan indexes into the tess array
+		for ( i = 0; i < p->numVerts - 2; i++ ) {
+			tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
+			tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
+			tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
+			tess.numIndexes += 3;
+		}
+
+		tess.vertexColorValid = qtrue;
+		tess.numVertexes = numv;
+	}
+}
 
 /*
 =============
 RB_SurfaceTriangles
 =============
 */
-static void RB_SurfaceTriangles( srfTriangles_t *srf ) {
+void RB_SurfaceTriangles( srfTriangles_t *srf ) {
 	int			i;
 	drawVert_t	*dv;
 	float		*xyz, *normal, *texCoords;
@@ -228,7 +265,7 @@ static void RB_SurfaceTriangles( srfTriangles_t *srf ) {
 	int			dlightBits;
 	qboolean	needsNormal;
 
-	dlightBits = srf->dlightBits;
+	dlightBits = srf->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
 	RB_CHECKOVERFLOW( srf->numVerts, srf->numIndexes );
@@ -281,7 +318,7 @@ static void RB_SurfaceTriangles( srfTriangles_t *srf ) {
 RB_SurfaceBeam
 ==============
 */
-static void RB_SurfaceBeam( void )
+void RB_SurfaceBeam( void ) 
 {
 #define NUM_BEAM_SEGS 6
 	refEntity_t *e;
@@ -333,449 +370,15 @@ static void RB_SurfaceBeam( void )
 	qglEnd();
 }
 
-//================================================================================
-
-static void DoRailCore( const vec3_t start, const vec3_t end, const vec3_t up, float len, float spanWidth )
-{
-	float		spanWidth2;
-	int			vbase;
-	float		t = len / 256.0f;
-
-	RB_CHECKOVERFLOW( 4, 6 );
-
-	vbase = tess.numVertexes;
-
-	spanWidth2 = -spanWidth;
-
-	// FIXME: use quad stamp?
-	VectorMA( start, spanWidth, up, tess.xyz[tess.numVertexes] );
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0] * 0.25;
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1] * 0.25;
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2] * 0.25;
-	tess.numVertexes++;
-
-	VectorMA( start, spanWidth2, up, tess.xyz[tess.numVertexes] );
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-	tess.numVertexes++;
-
-	VectorMA( end, spanWidth, up, tess.xyz[tess.numVertexes] );
-
-	tess.texCoords[tess.numVertexes][0][0] = t;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-	tess.numVertexes++;
-
-	VectorMA( end, spanWidth2, up, tess.xyz[tess.numVertexes] );
-	tess.texCoords[tess.numVertexes][0][0] = t;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-	tess.numVertexes++;
-
-	tess.indexes[tess.numIndexes++] = vbase;
-	tess.indexes[tess.numIndexes++] = vbase + 1;
-	tess.indexes[tess.numIndexes++] = vbase + 2;
-
-	tess.indexes[tess.numIndexes++] = vbase + 2;
-	tess.indexes[tess.numIndexes++] = vbase + 1;
-	tess.indexes[tess.numIndexes++] = vbase + 3;
-}
-
-static void DoRailDiscs( int numSegs, const vec3_t start, const vec3_t dir, const vec3_t right, const vec3_t up )
-{
-	int i;
-	vec3_t	pos[4];
-	vec3_t	v;
-	int		spanWidth = r_railWidth->integer;
-	float c, s;
-	float		scale;
-
-	if ( numSegs > 1 )
-		numSegs--;
-	if ( !numSegs )
-		return;
-
-	scale = 0.25;
-
-	for ( i = 0; i < 4; i++ )
-	{
-		c = cos( DEG2RAD( 45 + i * 90 ) );
-		s = sin( DEG2RAD( 45 + i * 90 ) );
-		v[0] = ( right[0] * c + up[0] * s ) * scale * spanWidth;
-		v[1] = ( right[1] * c + up[1] * s ) * scale * spanWidth;
-		v[2] = ( right[2] * c + up[2] * s ) * scale * spanWidth;
-		VectorAdd( start, v, pos[i] );
-
-		if ( numSegs > 1 )
-		{
-			// offset by 1 segment if we're doing a long distance shot
-			VectorAdd( pos[i], dir, pos[i] );
-		}
-	}
-
-	for ( i = 0; i < numSegs; i++ )
-	{
-		int j;
-
-		RB_CHECKOVERFLOW( 4, 6 );
-
-		for ( j = 0; j < 4; j++ )
-		{
-			VectorCopy( pos[j], tess.xyz[tess.numVertexes] );
-			tess.texCoords[tess.numVertexes][0][0] = ( j < 2 );
-			tess.texCoords[tess.numVertexes][0][1] = ( j && j != 3 );
-			tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-			tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-			tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-			tess.numVertexes++;
-
-			VectorAdd( pos[j], dir, pos[j] );
-		}
-
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 0;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 1;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 3;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 3;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 1;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 2;
-	}
-}
-
-/*
-** RB_SurfaceRailRinges
-*/
-static void RB_SurfaceRailRings( void ) {
-	refEntity_t *e;
-	int			numSegs;
-	int			len;
-	vec3_t		vec;
-	vec3_t		right, up;
-	vec3_t		start, end;
-
-	e = &backEnd.currentEntity->e;
-
-	VectorCopy( e->oldorigin, start );
-	VectorCopy( e->origin, end );
-
-	// compute variables
-	VectorSubtract( end, start, vec );
-	len = VectorNormalize( vec );
-	MakeNormalVectors( vec, right, up );
-	numSegs = ( len ) / r_railSegmentLength->value;
-	if ( numSegs <= 0 ) {
-		numSegs = 1;
-	}
-
-	VectorScale( vec, r_railSegmentLength->value, vec );
-
-	DoRailDiscs( numSegs, start, vec, right, up );
-}
-
-/*
-** RB_SurfaceRailCore
-*/
-static void RB_SurfaceRailCore( void ) {
-	refEntity_t *e;
-	int			len;
-	vec3_t		right;
-	vec3_t		vec;
-	vec3_t		start, end;
-	vec3_t		v1, v2;
-
-	e = &backEnd.currentEntity->e;
-
-	VectorCopy( e->oldorigin, start );
-	VectorCopy( e->origin, end );
-
-	VectorSubtract( end, start, vec );
-	len = VectorNormalize( vec );
-
-	// compute side vector
-	VectorSubtract( start, backEnd.viewParms.or.origin, v1 );
-	VectorNormalize( v1 );
-	VectorSubtract( end, backEnd.viewParms.or.origin, v2 );
-	VectorNormalize( v2 );
-	CrossProduct( v1, v2, right );
-	VectorNormalize( right );
-
-	DoRailCore( start, end, right, len, r_railCoreWidth->integer );
-}
-
-/*
-** RB_SurfaceLightningBolt
-*/
-static void RB_SurfaceLightningBolt( void ) {
-	refEntity_t *e;
-	int			len;
-	vec3_t		right;
-	vec3_t		vec;
-	vec3_t		start, end;
-	vec3_t		v1, v2;
-	int			i;
-
-	e = &backEnd.currentEntity->e;
-
-	VectorCopy( e->oldorigin, end );
-	VectorCopy( e->origin, start );
-
-	// compute variables
-	VectorSubtract( end, start, vec );
-	len = VectorNormalize( vec );
-
-	// compute side vector
-	VectorSubtract( start, backEnd.viewParms.or.origin, v1 );
-	VectorNormalize( v1 );
-	VectorSubtract( end, backEnd.viewParms.or.origin, v2 );
-	VectorNormalize( v2 );
-	CrossProduct( v1, v2, right );
-	VectorNormalize( right );
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		vec3_t	temp;
-
-		DoRailCore( start, end, right, len, 8 );
-		RotatePointAroundVector( temp, vec, right, 45 );
-		VectorCopy( temp, right );
-	}
-}
-
-/*
-** VectorArrayNormalize
-*
-* The inputs to this routing seem to always be close to length = 1.0 (about 0.6 to 2.0)
-* This means that we don't have to worry about zero length or enormously long vectors.
-*/
-void VectorArrayNormalize(vec4_t *normals, unsigned int count)
-{
-//    assert(count);
-        
-#if idppc
-    {
-        float half = 0.5;
-        float one  = 1.0;
-        float *components = (float *)normals;
-        
-        // Vanilla PPC code, but since PPC has a reciprocal square root estimate instruction,
-        // runs *much* faster than calling sqrt().  We'll use a single Newton-Raphson
-        // refinement step to get a little more precision.  This seems to yield results
-        // that are correct to 3 decimal places and usually correct to at least 4 (sometimes 5).
-        // (That is, for the given input range of about 0.6 to 2.0).
-        do {
-            float x, y, z;
-            float B, y0, y1;
-            
-            x = components[0];
-            y = components[1];
-            z = components[2];
-            components += 4;
-            B = x*x + y*y + z*z;
-
-#ifdef __GNUC__            
-            asm("frsqrte %0,%1" : "=f" (y0) : "f" (B));
-#else
-			y0 = __frsqrte(B);
-#endif
-            y1 = y0 + half*y0*(one - B*y0*y0);
-
-            x = x * y1;
-            y = y * y1;
-            components[-4] = x;
-            z = z * y1;
-            components[-3] = y;
-            components[-2] = z;
-        } while(count--);
-    }
-#else // No assembly version for this architecture, or C_ONLY defined
-	// given the input, it's safe to call VectorNormalizeFast
-    while (count--) {
-        VectorNormalizeFast(normals[0]);
-        normals++;
-    }
-#endif
-
-}
-
-
-
-/*
-** LerpMeshVertexes
-*/
-static void LerpMeshVertexes_scalar(md3Surface_t *surf, float backlerp)
-{
-	short	*oldXyz, *newXyz, *oldNormals, *newNormals;
-	float	*outXyz, *outNormal;
-	float	oldXyzScale, newXyzScale;
-	float	oldNormalScale, newNormalScale;
-	int		vertNum;
-	unsigned lat, lng;
-	int		numVerts;
-
-	outXyz = tess.xyz[tess.numVertexes];
-	outNormal = tess.normal[tess.numVertexes];
-
-	newXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-		+ (backEnd.currentEntity->e.frame * surf->numVerts * 4);
-	newNormals = newXyz + 3;
-
-	newXyzScale = MD3_XYZ_SCALE * (1.0 - backlerp);
-	newNormalScale = 1.0 - backlerp;
-
-	numVerts = surf->numVerts;
-
-	if ( backlerp == 0 ) {
-		//
-		// just copy the vertexes
-		//
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			newXyz += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-
-			outXyz[0] = newXyz[0] * newXyzScale;
-			outXyz[1] = newXyz[1] * newXyzScale;
-			outXyz[2] = newXyz[2] * newXyzScale;
-
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= (FUNCTABLE_SIZE/256);
-			lng *= (FUNCTABLE_SIZE/256);
-
-			// decode X as cos( lat ) * sin( long )
-			// decode Y as sin( lat ) * sin( long )
-			// decode Z as cos( long )
-
-			outNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			outNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			outNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-		}
-	} else {
-		//
-		// interpolate and copy the vertex and normal
-		//
-		oldXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-			+ (backEnd.currentEntity->e.oldframe * surf->numVerts * 4);
-		oldNormals = oldXyz + 3;
-
-		oldXyzScale = MD3_XYZ_SCALE * backlerp;
-		oldNormalScale = backlerp;
-
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			oldXyz += 4, newXyz += 4, oldNormals += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-			vec3_t uncompressedOldNormal, uncompressedNewNormal;
-
-			// interpolate the xyz
-			outXyz[0] = oldXyz[0] * oldXyzScale + newXyz[0] * newXyzScale;
-			outXyz[1] = oldXyz[1] * oldXyzScale + newXyz[1] * newXyzScale;
-			outXyz[2] = oldXyz[2] * oldXyzScale + newXyz[2] * newXyzScale;
-
-			// FIXME: interpolate lat/long instead?
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-			uncompressedNewNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedNewNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedNewNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			lat = ( oldNormals[0] >> 8 ) & 0xff;
-			lng = ( oldNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-
-			uncompressedOldNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedOldNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedOldNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			outNormal[0] = uncompressedOldNormal[0] * oldNormalScale + uncompressedNewNormal[0] * newNormalScale;
-			outNormal[1] = uncompressedOldNormal[1] * oldNormalScale + uncompressedNewNormal[1] * newNormalScale;
-			outNormal[2] = uncompressedOldNormal[2] * oldNormalScale + uncompressedNewNormal[2] * newNormalScale;
-
-//			VectorNormalize (outNormal);
-		}
-    	VectorArrayNormalize((vec4_t *)tess.normal[tess.numVertexes], numVerts);
-   	}
-}
-
-static void LerpMeshVertexes(md3Surface_t *surf, float backlerp)
-{
-#if idppc_altivec
-	if (com_altivec->integer) {
-		// must be in a separate translation unit or G3 systems will crash.
-		LerpMeshVertexes_altivec( surf, backlerp );
-		return;
-	}
-#endif // idppc_altivec
-	LerpMeshVertexes_scalar( surf, backlerp );
-}
-
-
-/*
-=============
-RB_SurfaceMesh
-=============
-*/
-static void RB_SurfaceMesh(md3Surface_t *surface) {
-	int				j;
-	float			backlerp;
-	int				*triangles;
-	float			*texCoords;
-	int				indexes;
-	int				Bob, Doug;
-	int				numVerts;
-
-	if (  backEnd.currentEntity->e.oldframe == backEnd.currentEntity->e.frame ) {
-		backlerp = 0;
-	} else  {
-		backlerp = backEnd.currentEntity->e.backlerp;
-	}
-
-	RB_CHECKOVERFLOW( surface->numVerts, surface->numTriangles*3 );
-
-	LerpMeshVertexes (surface, backlerp);
-
-	triangles = (int *) ((byte *)surface + surface->ofsTriangles);
-	indexes = surface->numTriangles * 3;
-	Bob = tess.numIndexes;
-	Doug = tess.numVertexes;
-	for (j = 0 ; j < indexes ; j++) {
-		tess.indexes[Bob + j] = Doug + triangles[j];
-	}
-	tess.numIndexes += indexes;
-
-	texCoords = (float *) ((byte *)surface + surface->ofsSt);
-
-	numVerts = surface->numVerts;
-	for ( j = 0; j < numVerts; j++ ) {
-		tess.texCoords[Doug + j][0][0] = texCoords[j*2+0];
-		tess.texCoords[Doug + j][0][1] = texCoords[j*2+1];
-		// FIXME: fill in lightmapST for completeness?
-	}
-
-	tess.numVertexes += surface->numVerts;
-
-}
-
-
 /*
 ==============
 RB_SurfaceFace
 ==============
 */
-static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
+void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 	int			i;
-	unsigned	*indices;
-	glIndex_t	*tessIndexes;
+	qboolean	needsNormal;
+	unsigned	*indices, *tessIndexes;
 	float		*v;
 	float		*normal;
 	int			ndx;
@@ -785,9 +388,13 @@ static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 
 	RB_CHECKOVERFLOW( surf->numPoints, surf->numIndices );
 
-	dlightBits = surf->dlightBits;
+	dlightBits = surf->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
+	if ((tess.shader->surfaceFlags & SURF_NODLIGHT) || (tess.shader->surfaceFlags & SURF_SKY)) {
+		tess.dlightBits = 0;
+	}
+
 	indices = ( unsigned * ) ( ( ( char  * ) surf ) + surf->ofsIndices );
 
 	Bob = tess.numVertexes;
@@ -800,21 +407,45 @@ static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 
 	numPoints = surf->numPoints;
 
-	if ( tess.shader->needsNormal ) {
+	needsNormal = qfalse;
+	if (tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights) {
+		needsNormal = qtrue;
+	}
+
+	v = surf->points[0];
+
+	ndx = tess.numVertexes;
+
+	if (needsNormal) {
 		normal = surf->plane.normal;
 		for ( i = 0, ndx = tess.numVertexes; i < numPoints; i++, ndx++ ) {
 			VectorCopy( normal, tess.normal[ndx] );
 		}
 	}
 
-	for ( i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++ ) {
-		VectorCopy( v, tess.xyz[ndx]);
-		tess.texCoords[ndx][0][0] = v[3];
-		tess.texCoords[ndx][0][1] = v[4];
-		tess.texCoords[ndx][1][0] = v[5];
-		tess.texCoords[ndx][1][1] = v[6];
-		* ( unsigned int * ) &tess.vertexColors[ndx] = * ( unsigned int * ) &v[7];
-		tess.vertexDlightBits[ndx] = dlightBits;
+	if (tess.dlightMap)
+	{
+		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
+			VectorCopy(v, tess.xyz[ndx]);
+			tess.texCoords[ndx][0][0] = v[3];
+			tess.texCoords[ndx][0][1] = v[4];
+			tess.texCoords[ndx][1][0] = v[5] + surf->lightmapOffset[0];
+			tess.texCoords[ndx][1][1] = v[6] + surf->lightmapOffset[1];
+			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
+			tess.vertexDlightBits[ndx] = dlightBits;
+		}
+	}
+	else
+	{
+		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
+			VectorCopy(v, tess.xyz[ndx]);
+			tess.texCoords[ndx][0][0] = v[3];
+			tess.texCoords[ndx][0][1] = v[4];
+			tess.texCoords[ndx][1][0] = v[5];
+			tess.texCoords[ndx][1][1] = v[6];
+			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
+			tess.vertexDlightBits[ndx] = dlightBits;
+		}
 	}
 
 
@@ -831,15 +462,15 @@ static float	LodErrorForVolume( vec3_t local, float radius ) {
 		return 0;
 	}
 
-	world[0] = local[0] * backEnd.or.axis[0][0] + local[1] * backEnd.or.axis[1][0] + 
-		local[2] * backEnd.or.axis[2][0] + backEnd.or.origin[0];
-	world[1] = local[0] * backEnd.or.axis[0][1] + local[1] * backEnd.or.axis[1][1] + 
-		local[2] * backEnd.or.axis[2][1] + backEnd.or.origin[1];
-	world[2] = local[0] * backEnd.or.axis[0][2] + local[1] * backEnd.or.axis[1][2] + 
-		local[2] * backEnd.or.axis[2][2] + backEnd.or.origin[2];
+	world[0] = local[0] * backEnd.ori.axis[0][0] + local[1] * backEnd.ori.axis[1][0] + 
+		local[2] * backEnd.ori.axis[2][0] + backEnd.ori.origin[0];
+	world[1] = local[0] * backEnd.ori.axis[0][1] + local[1] * backEnd.ori.axis[1][1] + 
+		local[2] * backEnd.ori.axis[2][1] + backEnd.ori.origin[1];
+	world[2] = local[0] * backEnd.ori.axis[0][2] + local[1] * backEnd.ori.axis[1][2] + 
+		local[2] * backEnd.ori.axis[2][2] + backEnd.ori.origin[2];
 
-	VectorSubtract( world, backEnd.viewParms.or.origin, world );
-	d = DotProduct( world, backEnd.viewParms.or.axis[0] );
+	VectorSubtract( world, backEnd.viewParms.ori.origin, world );
+	d = DotProduct( world, backEnd.viewParms.ori.axis[0] );
 
 	if ( d < 0 ) {
 		d = -d;
@@ -859,7 +490,7 @@ RB_SurfaceGrid
 Just copy the grid of points and triangulate
 =============
 */
-static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
+void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	int		i, j;
 	float	*xyz;
 	float	*texCoords;
@@ -877,9 +508,13 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	int		*vDlightBits;
 	qboolean	needsNormal;
 
-	dlightBits = cv->dlightBits;
+	dlightBits = cv->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
+	if (tess.shader->surfaceFlags & (SURF_NODLIGHT | SURF_SKY)) {
+		tess.dlightBits = 0;
+	}
+
 	// determine the allowable discrepance
 	lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );
 
@@ -912,6 +547,7 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	// in the tess structure, so we may have to issue it in multiple passes
 
 	used = 0;
+	rows = 0;
 	while ( used < lodHeight - 1 ) {
 		// see how many rows of both verts and indexes we can add without overflowing
 		do {
@@ -921,7 +557,7 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 			// if we don't have enough space for at least one strip, flush the buffer
 			if ( vrows < 2 || irows < 1 ) {
 				RB_EndSurface();
-				RB_BeginSurface(tess.shader, tess.fogNum );
+				RB_BeginSurface(tess.shader);
 			} else {
 				break;
 			}
@@ -942,31 +578,59 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 		texCoords = tess.texCoords[numVertexes][0];
 		color = ( unsigned char * ) &tess.vertexColors[numVertexes];
 		vDlightBits = &tess.vertexDlightBits[numVertexes];
-		needsNormal = tess.shader->needsNormal;
+		needsNormal = tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights;
 
-		for ( i = 0 ; i < rows ; i++ ) {
-			for ( j = 0 ; j < lodWidth ; j++ ) {
-				dv = cv->verts + heightTable[ used + i ] * cv->width
-					+ widthTable[ j ];
+		if ( tess.dlightMap ) {
+			for ( i = 0 ; i < rows ; i++ ) {
+				for ( j = 0 ; j < lodWidth ; j++ ) {
+					dv = cv->verts + heightTable[ used + i ] * cv->width
+						+ widthTable[ j ];
 
-				xyz[0] = dv->xyz[0];
-				xyz[1] = dv->xyz[1];
-				xyz[2] = dv->xyz[2];
-				texCoords[0] = dv->st[0];
-				texCoords[1] = dv->st[1];
-				texCoords[2] = dv->lightmap[0];
-				texCoords[3] = dv->lightmap[1];
-				if ( needsNormal ) {
-					normal[0] = dv->normal[0];
-					normal[1] = dv->normal[1];
-					normal[2] = dv->normal[2];
+					xyz[0] = dv->xyz[0];
+					xyz[1] = dv->xyz[1];
+					xyz[2] = dv->xyz[2];
+					texCoords[0] = dv->st[0];
+					texCoords[1] = dv->st[1];
+					texCoords[2] = dv->lightmap[0] + cv->lightmapOffset[0];
+					texCoords[3] = dv->lightmap[1] + cv->lightmapOffset[1];
+					if ( needsNormal ) {
+						normal[0] = dv->normal[0];
+						normal[1] = dv->normal[1];
+						normal[2] = dv->normal[2];
+					}
+					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
+					*vDlightBits++ = dlightBits;
+					xyz += 4;
+					normal += 4;
+					texCoords += 4;
+					color += 4;
+				}
+			}
+		} else {
+			for ( i = 0 ; i < rows ; i++ ) {
+				for ( j = 0 ; j < lodWidth ; j++ ) {
+					dv = cv->verts + heightTable[ used + i ] * cv->width
+						+ widthTable[ j ];
+
+					xyz[0] = dv->xyz[0];
+					xyz[1] = dv->xyz[1];
+					xyz[2] = dv->xyz[2];
+					texCoords[0] = dv->st[0];
+					texCoords[1] = dv->st[1];
+					texCoords[2] = dv->lightmap[0];
+					texCoords[3] = dv->lightmap[1];
+					if ( needsNormal ) {
+						normal[0] = dv->normal[0];
+						normal[1] = dv->normal[1];
+						normal[2] = dv->normal[2];
+					}
+					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
+					*vDlightBits++ = dlightBits;
+					xyz += 4;
+					normal += 4;
+					texCoords += 4;
+					color += 4;
 				}
-				* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
-				*vDlightBits++ = dlightBits;
-				xyz += 4;
-				normal += 4;
-				texCoords += 4;
-				color += 4;
 			}
 		}
 
@@ -1025,9 +689,8 @@ RB_SurfaceAxis
 Draws x/y/z lines from the origin for orientation debugging
 ===================
 */
-static void RB_SurfaceAxis( void ) {
+void RB_SurfaceAxis( void ) {
 	GL_Bind( tr.whiteImage );
-	GL_State( GLS_DEFAULT );
 	qglLineWidth( 3 );
 	qglBegin( GL_LINES );
 	qglColor3f( 1,0,0 );
@@ -1052,7 +715,7 @@ RB_SurfaceEntity
 Entities that have a single procedurally generated surface
 ====================
 */
-static void RB_SurfaceEntity( surfaceType_t *surfType ) {
+void RB_SurfaceEntity( surfaceType_t *surfType ) {
 	switch( backEnd.currentEntity->e.reType ) {
 	case RT_SPRITE:
 		RB_SurfaceSprite();
@@ -1060,45 +723,179 @@ static void RB_SurfaceEntity( surfaceType_t *surfType ) {
 	case RT_BEAM:
 		RB_SurfaceBeam();
 		break;
-	case RT_RAIL_CORE:
-		RB_SurfaceRailCore();
-		break;
-	case RT_RAIL_RINGS:
-		RB_SurfaceRailRings();
-		break;
-	case RT_LIGHTNING:
-		RB_SurfaceLightningBolt();
-		break;
 	default:
 		RB_SurfaceAxis();
 		break;
 	}
+	return;
 }
 
-static void RB_SurfaceBad( surfaceType_t *surfType ) {
+void RB_SurfaceBad( surfaceType_t *surfType ) {
 	ri.Printf( PRINT_ALL, "Bad surface tesselated.\n" );
 }
 
-static void RB_SurfaceFlare(srfFlare_t *surf)
-{
-	if (r_flares->integer)
-		RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, surf->normal);
+#if 0
+
+void RB_SurfaceFlare( srfFlare_t *surf ) {
+	vec3_t		left, up;
+	float		radius;
+	byte		color[4];
+	vec3_t		dir;
+	vec3_t		origin;
+	float		d;
+
+	// calculate the xyz locations for the four corners
+	radius = 30;
+	VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
+	VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
+	if ( backEnd.viewParms.isMirror ) {
+		VectorSubtract( vec3_origin, left, left );
+	}
+
+	color[0] = color[1] = color[2] = color[3] = 255;
+
+	VectorMA( surf->origin, 3, surf->normal, origin );
+	VectorSubtract( origin, backEnd.viewParms.ori.origin, dir );
+	VectorNormalize( dir );
+	VectorMA( origin, r_ignore->value, dir, origin );
+
+	d = -DotProduct( dir, surf->normal );
+	if ( d < 0 ) {
+		return;
+	}
+#if 0
+	color[0] *= d;
+	color[1] *= d;
+	color[2] *= d;
+#endif
+
+	RB_AddQuadStamp( origin, left, up, color );
 }
 
-static void RB_SurfaceSkip( void *surf ) {
+#else
+
+void RB_SurfaceFlare( srfFlare_t *surf ) {
+#if 0
+	vec3_t		left, up;
+	byte		color[4];
+
+	color[0] = surf->color[0] * 255;
+	color[1] = surf->color[1] * 255;
+	color[2] = surf->color[2] * 255;
+	color[3] = 255;
+
+	VectorClear( left );
+	VectorClear( up );
+
+	left[0] = r_ignore->value;
+
+	up[1] = r_ignore->value;
+	
+	RB_AddQuadStampExt( surf->origin, left, up, color, 0, 0, 1, 1 );
+#endif
 }
 
+#endif
+
+
+
+void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
+	// all apropriate state must be set in RB_BeginSurface
+	// this isn't implemented yet...
+	qglCallList( surf->listNum );
+}
+
+void RB_SurfaceSkip( void *surf ) {
+}
+
+void RB_DrawTerrainTris(srfTerrain_t* p) {
+	int i;
+	terraInt numv;
+	int dlightBits;
+
+	RB_CHECKOVERFLOW(p->nVerts, p->nTris * 3);
+
+	dlightBits = p->dlightBits[backEnd.smpFrame];
+	tess.dlightBits |= dlightBits;
+	if (p->dlightMap[backEnd.smpFrame])
+	{
+		float lmScale = (1.0 / LIGHTMAP_SIZE) / p->lmapStep;
+
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
+			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
+			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].xyz[0] * lmScale + p->lmapX;
+			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].xyz[1] * lmScale + p->lmapY;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+			tess.vertexColors[tess.numVertexes][0] = -1;
+			tess.vertexColors[tess.numVertexes][1] = -1;
+			tess.vertexColors[tess.numVertexes][2] = -1;
+			tess.vertexColors[tess.numVertexes][3] = -1;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+	else
+	{
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
+			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
+			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].texCoords[1][0];
+			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].texCoords[1][1];
+			tess.vertexDlightBits[tess.numVertexes] = dlightBits;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+			tess.vertexColors[tess.numVertexes][0] = -1;
+			tess.vertexColors[tess.numVertexes][1] = -1;
+			tess.vertexColors[tess.numVertexes][2] = -1;
+			tess.vertexColors[tess.numVertexes][3] = -1;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+
+	for (i = p->iTriHead; i; i = g_pTris[i].iNext)
+	{
+		assert(tess.numVertexes < SHADER_MAX_INDEXES);
+
+		//
+		// Make sure these can be drawn
+		//
+		if (g_pTris[i].byConstChecks & 4)
+		{
+			tess.indexes[tess.numIndexes] = g_pVert[g_pTris[i].iPt[0]].iVertArray;
+			tess.indexes[tess.numIndexes + 1] = g_pVert[g_pTris[i].iPt[1]].iVertArray;
+			tess.indexes[tess.numIndexes + 2] = g_pVert[g_pTris[i].iPt[2]].iVertArray;
+			tess.numIndexes += 3;
+		}
+	}
+}
 
 void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
 	(void(*)(void*))RB_SurfaceBad,			// SF_BAD, 
 	(void(*)(void*))RB_SurfaceSkip,			// SF_SKIP, 
 	(void(*)(void*))RB_SurfaceFace,			// SF_FACE,
-	(void(*)(void*))RB_SurfaceGrid,			// SF_GRID,
-	(void(*)(void*))RB_SurfaceTriangles,		// SF_TRIANGLES,
-	(void(*)(void*))RB_SurfacePolychain,		// SF_POLY,
-	(void(*)(void*))RB_SurfaceMesh,			// SF_MD3,
-	(void(*)(void*))RB_MDRSurfaceAnim,		// SF_MDR,
-	(void(*)(void*))RB_IQMSurfaceAnim,		// SF_IQM,
-	(void(*)(void*))RB_SurfaceFlare,		// SF_FLARE,
-	(void(*)(void*))RB_SurfaceEntity		// SF_ENTITY
+    (void(*)(void*))RB_SurfaceGrid,			// SF_GRID,
+    (void(*)(void*))RB_SurfacePolychain,	// SF_POLY,
+	(void(*)(void*))RB_SurfaceMarkFragment, // SF_MARK_FRAG
+    (void(*)(void*))RB_SurfaceFlare,		// SF_FLARE
+    (void(*)(void*))RB_SurfaceEntity,		// SF_ENTITY
+    (void(*)(void*))RB_SurfaceDisplayList,	// SF_DISPLAY_LIST
+	(void(*)(void*))RB_SkelMesh,			// SF_TIKI_SKEL
+	(void(*)(void*))RB_StaticMesh,			// SF_TIKI_STATIC
+	(void(*)(void*))RB_DrawSwipeSurface,	// SF_SWIPE
+	(void(*)(void*))RB_DrawSprite,			// SF_SPRITE
+	(void(*)(void*))RB_DrawTerrainTris,		// SF_TERRAIN_PATCH
+	(void(*)(void*))RB_SurfaceTriangles,	// SF_TRIANGLES,
 };
diff --git a/code/renderer/tr_swipe.cpp b/code/renderergl1/tr_swipe.cpp
similarity index 100%
rename from code/renderer/tr_swipe.cpp
rename to code/renderergl1/tr_swipe.cpp
diff --git a/code/renderer/tr_terrain.c b/code/renderergl1/tr_terrain.c
similarity index 100%
rename from code/renderer/tr_terrain.c
rename to code/renderergl1/tr_terrain.c
diff --git a/code/renderer/tr_util.cpp b/code/renderergl1/tr_util.cpp
similarity index 100%
rename from code/renderer/tr_util.cpp
rename to code/renderergl1/tr_util.cpp
diff --git a/code/renderer/tr_vis.cpp b/code/renderergl1/tr_vis.cpp
similarity index 100%
rename from code/renderer/tr_vis.cpp
rename to code/renderergl1/tr_vis.cpp
diff --git a/code/renderer/tr_vis.h b/code/renderergl1/tr_vis.h
similarity index 100%
rename from code/renderer/tr_vis.h
rename to code/renderergl1/tr_vis.h
diff --git a/code/renderergl1/tr_world.c b/code/renderergl1/tr_world.c
index 88eca6d8..0d4dab98 100644
--- a/code/renderergl1/tr_world.c
+++ b/code/renderergl1/tr_world.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -58,11 +58,16 @@ static qboolean	R_CullGrid( srfGridMesh_t *cv ) {
 		return qtrue;
 	}
 
-	if ( tr.currentEntityNum != REFENTITYNUM_WORLD ) {
+	if (!tr.refdef.render_terrain) {
+		return qtrue;
+	}
+
+	if ( tr.currentEntityNum != ENTITYNUM_WORLD ) {
 		sphereCull = R_CullLocalPointAndRadius( cv->localOrigin, cv->meshRadius );
 	} else {
 		sphereCull = R_CullPointAndRadius( cv->localOrigin, cv->meshRadius );
 	}
+	boxCull = CULL_OUT;
 	
 	// check for trivial reject
 	if ( sphereCull == CULL_OUT )
@@ -140,7 +145,7 @@ static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
 	}
 
 	sface = ( srfSurfaceFace_t * ) surface;
-	d = DotProduct (tr.or.viewOrigin, sface->plane.normal);
+	d = DotProduct (tr.ori.viewOrigin, sface->plane.normal);
 
 	// don't cull exactly on the plane, because there are levels of rounding
 	// through the BSP, ICD, and hardware that may cause pixel gaps if an
@@ -158,8 +163,12 @@ static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
 	return qfalse;
 }
 
-
-static int R_DlightFace( srfSurfaceFace_t *face, int dlightBits ) {
+/*
+======================
+R_FastDlightFace
+======================
+*/
+static int R_FastDlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 	float		d;
 	int			i;
 	dlight_t	*dl;
@@ -169,7 +178,7 @@ static int R_DlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 			continue;
 		}
 		dl = &tr.refdef.dlights[i];
-		d = DotProduct( dl->origin, face->plane.normal ) - face->plane.dist;
+		d = DotProduct( dl->transformed, face->plane.normal ) - face->plane.dist;
 		if ( d < -dl->radius || d > dl->radius ) {
 			// dlight doesn't reach the plane
 			dlightBits &= ~( 1 << i );
@@ -180,11 +189,16 @@ static int R_DlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 		tr.pc.c_dlightSurfacesCulled++;
 	}
 
-	face->dlightBits = dlightBits;
+	face->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 }
 
-static int R_DlightGrid( srfGridMesh_t *grid, int dlightBits ) {
+/*
+======================
+R_FastDlightGrid
+======================
+*/
+static int R_FastDlightGrid( srfGridMesh_t *grid, int dlightBits ) {
 	int			i;
 	dlight_t	*dl;
 
@@ -208,14 +222,52 @@ static int R_DlightGrid( srfGridMesh_t *grid, int dlightBits ) {
 		tr.pc.c_dlightSurfacesCulled++;
 	}
 
-	grid->dlightBits = dlightBits;
+	grid->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 }
 
+/*
+======================
+R_FastDlightTerrain
+======================
+*/
+static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
+    dlight_t* dl;
+    float* origin;
+    int i;
 
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+        origin = dl->transformed;
+
+        if (srf->x0 - origin[0] > dl->radius
+            || srf->x0 - origin[0] < -512.0 - dl->radius
+            || srf->y0 - origin[1] > dl->radius
+            || srf->y0 - origin[1] < -512.0 - dl->radius
+            || srf->z0 - origin[2] > dl->radius
+            || srf->z0 - origin[2] < -srf->zmax - dl->radius
+            ) {
+            // dlight doesn't reach the bounds
+            dlightBits &= ~(1 << i);
+        }
+    }
+
+    if (!dlightBits) {
+        tr.pc.c_dlightSurfacesCulled++;
+    }
+
+    srf->drawinfo.dlightBits[tr.smpFrame] = dlightBits;
+    return dlightBits;
+}
+
+/*
+======================
+R_DlightTrisurf
+======================
+*/
 static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
 	// FIXME: more dlight culling to trisurfs...
-	surf->dlightBits = dlightBits;
+	surf->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 #if 0
 	int			i;
@@ -241,7 +293,7 @@ static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
 		tr.pc.c_dlightSurfacesCulled++;
 	}
 
-	grid->dlightBits = dlightBits;
+	grid->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 #endif
 }
@@ -256,24 +308,136 @@ more dlights if possible.
 ====================
 */
 static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
+	int dlightMap;
+
+	dlightMap = 0;
+
 	if ( *surf->data == SF_FACE ) {
-		dlightBits = R_DlightFace( (srfSurfaceFace_t *)surf->data, dlightBits );
+		if (!r_fastdlights->integer) {
+			if (surf->shader->lightmapIndex >= 0) {
+				dlightMap = R_RealDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
+			} else {
+				((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+				dlightMap = 0;
+			}
+			return dlightMap;
+        } else {
+			dlightBits = R_FastDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
+		}
 	} else if ( *surf->data == SF_GRID ) {
-		dlightBits = R_DlightGrid( (srfGridMesh_t *)surf->data, dlightBits );
-	} else if ( *surf->data == SF_TRIANGLES ) {
-		dlightBits = R_DlightTrisurf( (srfTriangles_t *)surf->data, dlightBits );
+		if (!r_fastdlights->integer) {
+			if (surf->shader->lightmapIndex >= 0) {
+				dlightMap = R_RealDlightPatch((srfGridMesh_t*)surf->data, dlightBits);
+			} else {
+				((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0.f;
+				dlightMap = 0;
+            }
+            return dlightMap;
+        } else {
+            dlightBits = R_FastDlightGrid((srfGridMesh_t*)surf->data, dlightBits);
+		}
 	} else {
-		dlightBits = 0;
+		return dlightMap;
 	}
 
-	if ( dlightBits ) {
+	if (dlightBits) {
 		tr.pc.c_dlightSurfaces++;
+		return 1;
 	}
 
-	return dlightBits;
+	return dlightMap;
 }
 
+/*
+======================
+R_DlightTerrain
+======================
+*/
+int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	int dlightMap;
 
+    dlightMap = 0;
+
+    if (r_fastdlights->integer)
+    {
+        if (R_FastDlightTerrain(surf, dlightBits)) {
+            ++tr.pc.c_dlightSurfaces;
+			dlightMap = 1;
+        }
+    } else if (surf->shader->lightmapIndex < 0) {
+        surf->drawinfo.dlightMap[tr.smpFrame] = 0;
+    } else {
+		dlightMap = R_RealDlightTerrain(surf, dlightBits);
+    }
+
+    return dlightMap;
+}
+
+/*
+======================
+R_CheckDlightSurface
+======================
+*/
+static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
+{
+    if (dlightBits && surf->frameCount != tr.frameCount)
+    {
+        surf->frameCount = tr.frameCount;
+        return R_DlightSurface(surf, dlightBits);
+    }
+
+	if (dlightBits)
+	{
+		//
+		// Added in 2.0
+		//  Return the existing dlight map
+		if (*surf->data == SF_FACE)
+		{
+			return ((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame];
+		}
+		else if (*surf->data == SF_GRID)
+		{
+			return ((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame];
+		}
+	}
+	else
+	{
+		if (*surf->data == SF_FACE)
+		{
+			((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+			((srfSurfaceFace_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
+		}
+		else if (*surf->data == SF_GRID)
+		{
+			((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+			((srfGridMesh_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
+		}
+	}
+
+    return 0;
+}
+
+/*
+======================
+R_CheckDlightTerrain
+======================
+*/
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	if (surf->frameCount == tr.frameCount) {
+		return surf->drawinfo.dlightMap[tr.smpFrame];
+	}
+
+	surf->frameCount = tr.frameCount;
+	if (dlightBits) {
+		return R_DlightTerrain(surf, dlightBits);
+	}
+
+	surf->drawinfo.dlightMap[tr.smpFrame] = 0;
+	surf->drawinfo.dlightBits[tr.smpFrame] = 0;
+	return 0;
+}
 
 /*
 ======================
@@ -281,9 +445,9 @@ R_AddWorldSurface
 ======================
 */
 static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
-	if ( surf->viewCount == tr.viewCount ) {
-		return;		// already in this view
-	}
+	//if ( surf->viewCount == tr.viewCount ) {
+	//	return;		// already in this view
+	//}
 
 	surf->viewCount = tr.viewCount;
 	// FIXME: bmodel fog?
@@ -294,12 +458,14 @@ static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
 	}
 
 	// check for dlighting
-	if ( dlightBits ) {
-		dlightBits = R_DlightSurface( surf, dlightBits );
-		dlightBits = ( dlightBits != 0 );
+	dlightBits = R_CheckDlightSurface(surf, dlightBits);
+	if (surf->shader && surf->shader->isPortalSky) {
+		// Sky portal
+		R_Sky_AddSurf(surf);
+		return;
 	}
 
-	R_AddDrawSurf( surf->data, surf->shader, surf->fogIndex, dlightBits );
+	R_AddDrawSurf( surf->data, surf->shader, dlightBits );
 }
 
 /*
@@ -323,14 +489,13 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 
 	pModel = R_GetModelByHandle( ent->e.hModel );
 
-	bmodel = pModel->bmodel;
+	bmodel = pModel->d.bmodel;
 
 	clip = R_CullLocalBox( bmodel->bounds );
 	if ( clip == CULL_OUT ) {
 		return;
 	}
 	
-	R_SetupEntityLighting( &tr.refdef, ent );
 	R_DlightBmodel( bmodel );
 
 	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
@@ -347,17 +512,24 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 =============================================================
 */
 
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
+{
+	bmodel_t* bmodel;
+
+	bmodel = &tr.world->bmodels[iIndex];
+	VectorCopy(bmodel->bounds[0], vMins);
+	VectorCopy(bmodel->bounds[1], vMaxs);
+}
+
 
 /*
 ================
 R_RecursiveWorldNode
 ================
 */
-static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, unsigned int dlightBits ) {
+static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits ) {
 
 	do {
-		unsigned int newDlights[2];
-
 		// if the node wasn't marked as potentially visible, exit
 		if (node->visframe != tr.visCount) {
 			return;
@@ -369,85 +541,67 @@ static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, unsigne
 		if ( !r_nocull->integer ) {
 			int		r;
 
-			if ( planeBits & 1 ) {
+			if (planeBits & 1) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[0]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~1;			// all descendants will also be in front
 				}
 			}
 
-			if ( planeBits & 2 ) {
+			if (planeBits & 2) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[1]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~2;			// all descendants will also be in front
 				}
 			}
 
-			if ( planeBits & 4 ) {
+			if (planeBits & 4) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[2]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~4;			// all descendants will also be in front
 				}
 			}
 
-			if ( planeBits & 8 ) {
+			if (planeBits & 8) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[3]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~8;			// all descendants will also be in front
 				}
 			}
 
+			if (planeBits & 16) {
+				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[4]);
+				if (r == 2) {
+					return;						// culled
+				}
+				if (r == 1) {
+					planeBits &= ~16;			// all descendants will also be in front
+				}
+			}
+
 		}
 
 		if ( node->contents != -1 ) {
 			break;
 		}
 
-		// node is just a decision point, so go down both sides
-		// since we don't care about sort orders, just go positive to negative
-
-		// determine which dlights are needed
-		newDlights[0] = 0;
-		newDlights[1] = 0;
-		if ( dlightBits ) {
-			int	i;
-
-			for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-				dlight_t	*dl;
-				float		dist;
-
-				if ( dlightBits & ( 1 << i ) ) {
-					dl = &tr.refdef.dlights[i];
-					dist = DotProduct( dl->origin, node->plane->normal ) - node->plane->dist;
-					
-					if ( dist > -dl->radius ) {
-						newDlights[0] |= ( 1 << i );
-					}
-					if ( dist < dl->radius ) {
-						newDlights[1] |= ( 1 << i );
-					}
-				}
-			}
-		}
-
 		// recurse down the children, front side first
-		R_RecursiveWorldNode (node->children[0], planeBits, newDlights[0] );
+		R_RecursiveWorldNode (node->children[0], planeBits, dlightBits);
 
 		// tail recurse
 		node = node->children[1];
-		dlightBits = newDlights[1];
 	} while ( 1 );
 
 	{
@@ -478,27 +632,100 @@ static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, unsigne
 			tr.viewParms.visBounds[1][2] = node->maxs[2];
 		}
 
-		// add the individual surfaces
-		mark = node->firstmarksurface;
-		c = node->nummarksurfaces;
-		while (c--) {
-			// the surface may have already been added if it
-			// spans multiple leafs
-			surf = *mark;
-			R_AddWorldSurface( surf, dlightBits );
-			mark++;
+		tr.portalsky.cntNode = node;
+
+		if (r_drawbrushes->integer) {
+			// add the individual surfaces
+			mark = node->firstmarksurface;
+			c = node->nummarksurfaces;
+			while (c--) {
+				// the surface may have already been added if it
+				// spans multiple leafs
+				surf = *mark;
+				if (surf->viewCount != tr.viewCount) {
+					R_AddWorldSurface(surf, dlightBits);
+				}
+				mark++;
+			}
+		}
+
+		if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky)
+		{
+			int i;
+
+			for (i = 0; i < node->numTerraPatches; i++) {
+				R_MarkTerrainPatch(tr.world->visTerraPatches[node->firstTerraPatch + i]);
+			}
+		}
+
+		if (r_drawstaticdecals->integer) {
+			if (node->pFirstMarkFragment) {
+				R_AddPermanentMarkFragmentSurfaces(node->pFirstMarkFragment, node->iNumMarkFragment);
+			}
+		}
+
+		if (r_drawstaticmodels->integer) {
+			int i;
+
+			for (i = 0; i < node->numStaticModels; i++) {
+				tr.world->visStaticModels[node->firstStaticModel + i]->visCount = tr.visCount;
+			}
 		}
 	}
 
 }
 
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes) {
+	mnode_t* nodestack[1024];
+	int iNodeStackPos;
+	mnode_t* pCurNode;
+	int nFoundNodes;
 
+	iNodeStackPos = 0;
+	pCurNode = tr.world->nodes;
+	nFoundNodes = 0;
+
+	while (1)
+    {
+        cplane_t* plane;
+		float d;
+
+		while (pCurNode->contents == -1)
+		{
+			plane = pCurNode->plane;
+			if (plane->type >= PLANE_NON_AXIAL) {
+				d = DotProduct(p, plane->normal) - plane->dist;
+			} else {
+				d = p[plane->type] - plane->dist;
+			}
+
+            if (d < r) {
+                if (d > -r) {
+                    nodestack[iNodeStackPos++] = pCurNode->children[0];
+                }
+                pCurNode = pCurNode->children[1];
+            } else {
+                pCurNode = pCurNode->children[0];
+			}
+		}
+
+		nodes[nFoundNodes++] = pCurNode;
+		if (!iNodeStackPos || nFoundNodes == nMaxNodes) {
+			break;
+		}
+
+		iNodeStackPos--;
+        pCurNode = nodestack[iNodeStackPos];
+	}
+
+	return nFoundNodes;
+}
 /*
 ===============
 R_PointInLeaf
 ===============
 */
-static mnode_t *R_PointInLeaf( const vec3_t p ) {
+mnode_t *R_PointInLeaf( const vec3_t p ) {
 	mnode_t		*node;
 	float		d;
 	cplane_t	*plane;
@@ -506,7 +733,7 @@ static mnode_t *R_PointInLeaf( const vec3_t p ) {
 	if ( !tr.world ) {
 		ri.Error (ERR_DROP, "R_PointInLeaf: bad model");
 	}
-
+	
 	node = tr.world->nodes;
 	while( 1 ) {
 		if (node->contents != -1) {
@@ -530,7 +757,7 @@ R_ClusterPVS
 ==============
 */
 static const byte *R_ClusterPVS (int cluster) {
-	if (!tr.world->vis || cluster < 0 || cluster >= tr.world->numClusters ) {
+	if (!tr.world || !tr.world->vis || cluster < 0 || cluster >= tr.world->numClusters ) {
 		return tr.world->novis;
 	}
 
@@ -547,7 +774,7 @@ qboolean R_inPVS( const vec3_t p1, const vec3_t p2 ) {
 	byte	*vis;
 
 	leaf = R_PointInLeaf( p1 );
-	vis = ri.CM_ClusterPVS( leaf->cluster ); // why not R_ClusterPVS ??
+	vis = CM_ClusterPVS( leaf->cluster );
 	leaf = R_PointInLeaf( p2 );
 
 	if ( !(vis[leaf->cluster>>3] & (1<<(leaf->cluster&7))) ) {
@@ -643,26 +870,45 @@ R_AddWorldSurfaces
 =============
 */
 void R_AddWorldSurfaces (void) {
-	if ( !r_drawworld->integer ) {
+	if (!r_drawworld->integer) {
 		return;
 	}
 
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
+	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
 		return;
 	}
 
-	tr.currentEntityNum = REFENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+	tr.currentEntityNum = ENTITYNUM_WORLD;
+	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+		R_TerrainPrepareFrame();
+	}
 
 	// determine which leaves are in the PVS / areamask
-	R_MarkLeaves ();
+	R_MarkLeaves();
 
 	// clear out the visible min/max
-	ClearBounds( tr.viewParms.visBounds[0], tr.viewParms.visBounds[1] );
+	ClearBounds(tr.viewParms.visBounds[0], tr.viewParms.visBounds[1]);
 
 	// perform frustum culling and add all the potentially visible surfaces
-	if ( tr.refdef.num_dlights > MAX_DLIGHTS ) {
-		tr.refdef.num_dlights = MAX_DLIGHTS ;
+	if (tr.refdef.num_dlights > 32) {
+		tr.refdef.num_dlights = 32;
 	}
-	R_RecursiveWorldNode( tr.world->nodes, 15, ( 1ULL << tr.refdef.num_dlights ) - 1 );
+	R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.viewParms.world);
+	R_RecursiveWorldNode(tr.world->nodes, tr.viewParms.fog.extrafrustums ? 31 : 15, (1 << tr.refdef.num_dlights) - 1);
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+		R_AddTerrainSurfaces();
+	}
+	if (r_drawstaticmodels->integer) {
+		R_AddStaticModelSurfaces();
+	}
+
+	if (g_bInfostaticmodels) {
+		g_bInfostaticmodels = 0;
+		R_PrintInfoStaticModels();
+	}
+
+	R_UpdateLevelMarksSystem();
 }

From d884512a7696847639d10406cd261512abfe9b3e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 15:36:52 +0100
Subject: [PATCH 1577/2040] Update renderergl2 from upstream ioq3

---
 code/renderergl2/glsl/depthblur_fp.glsl  |   5 +-
 code/renderergl2/glsl/generic_vp.glsl    |  54 +++--
 code/renderergl2/glsl/lightall_vp.glsl   |  48 +++--
 code/renderergl2/glsl/shaders.cmake      |  14 --
 code/renderergl2/glsl/shadowmask_fp.glsl |   9 +-
 code/renderergl2/glsl/ssao_fp.glsl       |   3 +-
 code/renderergl2/tr_backend.c            | 142 +++++++------
 code/renderergl2/tr_bsp.c                |   9 +-
 code/renderergl2/tr_cmds.c               |  15 +-
 code/renderergl2/tr_curve.c              |   4 +-
 code/renderergl2/tr_extensions.c         | 143 +++++++++++--
 code/renderergl2/tr_fbo.c                |  26 ++-
 code/renderergl2/tr_flares.c             |  10 +-
 code/renderergl2/tr_glsl.c               | 254 +++++++++++++++--------
 code/renderergl2/tr_image.c              | 219 +++++++++++++++----
 code/renderergl2/tr_init.c               | 108 ++++++++--
 code/renderergl2/tr_local.h              | 139 +++----------
 code/renderergl2/tr_mesh.c               |  19 +-
 code/renderergl2/tr_model.c              |   6 +
 code/renderergl2/tr_postprocess.c        |   8 +-
 code/renderergl2/tr_postprocess.h        |   2 +-
 code/renderergl2/tr_shade.c              | 144 +++++++++----
 code/renderergl2/tr_shader.c             | 157 ++++++++++++--
 code/renderergl2/tr_sky.c                |  17 +-
 code/renderergl2/tr_vbo.c                |  67 ++++--
 25 files changed, 1140 insertions(+), 482 deletions(-)
 delete mode 100644 code/renderergl2/glsl/shaders.cmake

diff --git a/code/renderergl2/glsl/depthblur_fp.glsl b/code/renderergl2/glsl/depthblur_fp.glsl
index d63df88a..205ee451 100644
--- a/code/renderergl2/glsl/depthblur_fp.glsl
+++ b/code/renderergl2/glsl/depthblur_fp.glsl
@@ -52,10 +52,9 @@ vec4 depthGaussian1D(sampler2D imageMap, sampler2D depthMap, vec2 tex, float zFa
 #endif
 
 	float zLimit = 5.0 / zFar;
-	int i, j;
-	for (i = 0; i < 2; i++)
+	for (int i = 0; i < 2; i++)
 	{
-		for (j = 1; j < BLUR_SIZE; j++)
+		for (int j = 1; j < BLUR_SIZE; j++)
 		{
 			vec2 offset = direction * (float(j) - 0.25) + nudge;
 #if defined(USE_DEPTH)
diff --git a/code/renderergl2/glsl/generic_vp.glsl b/code/renderergl2/glsl/generic_vp.glsl
index a0055263..e6af9f81 100644
--- a/code/renderergl2/glsl/generic_vp.glsl
+++ b/code/renderergl2/glsl/generic_vp.glsl
@@ -16,8 +16,16 @@ attribute vec4 attr_TexCoord0;
 attribute vec4 attr_TexCoord1;
 #endif
 
-uniform vec4   u_DiffuseTexMatrix;
-uniform vec4   u_DiffuseTexOffTurb;
+#if defined(USE_TCMOD)
+uniform vec4   u_DiffuseTexMatrix0;
+uniform vec4   u_DiffuseTexMatrix1;
+uniform vec4   u_DiffuseTexMatrix2;
+uniform vec4   u_DiffuseTexMatrix3;
+uniform vec4   u_DiffuseTexMatrix4;
+uniform vec4   u_DiffuseTexMatrix5;
+uniform vec4   u_DiffuseTexMatrix6;
+uniform vec4   u_DiffuseTexMatrix7;
+#endif
 
 #if defined(USE_TCGEN) || defined(USE_RGBAGEN)
 uniform vec3   u_LocalViewOrigin;
@@ -140,19 +148,28 @@ vec2 GenTexCoords(int TCGen, vec3 position, vec3 normal, vec3 TCGenVector0, vec3
 #endif
 
 #if defined(USE_TCMOD)
-vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix, vec4 offTurb)
+vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix[8])
 {
-	float amplitude = offTurb.z;
-	float phase = offTurb.w * 2.0 * M_PI;
-	vec2 st2;
-	st2.x = st.x * texMatrix.x + (st.y * texMatrix.z + offTurb.x);
-	st2.y = st.x * texMatrix.y + (st.y * texMatrix.w + offTurb.y);
-
+	vec2 st2 = st;
 	vec2 offsetPos = vec2(position.x + position.z, position.y);
-	
-	vec2 texOffset = sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(phase));
-	
-	return st2 + texOffset * amplitude;	
+
+	st2 = vec2(st2.x * texMatrix[0].x + st2.y * texMatrix[0].y + texMatrix[0].z,
+	           st2.x * texMatrix[1].x + st2.y * texMatrix[1].y + texMatrix[1].z);
+	st2 += texMatrix[0].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[1].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[2].x + st2.y * texMatrix[2].y + texMatrix[2].z,
+	           st2.x * texMatrix[3].x + st2.y * texMatrix[3].y + texMatrix[3].z);
+	st2 += texMatrix[2].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[3].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[4].x + st2.y * texMatrix[4].y + texMatrix[4].z,
+	           st2.x * texMatrix[5].x + st2.y * texMatrix[5].y + texMatrix[5].z);
+	st2 += texMatrix[4].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[5].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[6].x + st2.y * texMatrix[6].y + texMatrix[6].z,
+	           st2.x * texMatrix[7].x + st2.y * texMatrix[7].y + texMatrix[7].z);
+	st2 += texMatrix[6].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[7].w * 2.0 * M_PI));
+
+	return st2;
 }
 #endif
 
@@ -236,7 +253,16 @@ void main()
 #endif
 
 #if defined(USE_TCMOD)
-	var_DiffuseTex = ModTexCoords(tex, position, u_DiffuseTexMatrix, u_DiffuseTexOffTurb);
+	vec4 diffuseTexMatrix[8];
+	diffuseTexMatrix[0] = u_DiffuseTexMatrix0;
+	diffuseTexMatrix[1] = u_DiffuseTexMatrix1;
+	diffuseTexMatrix[2] = u_DiffuseTexMatrix2;
+	diffuseTexMatrix[3] = u_DiffuseTexMatrix3;
+	diffuseTexMatrix[4] = u_DiffuseTexMatrix4;
+	diffuseTexMatrix[5] = u_DiffuseTexMatrix5;
+	diffuseTexMatrix[6] = u_DiffuseTexMatrix6;
+	diffuseTexMatrix[7] = u_DiffuseTexMatrix7;
+	var_DiffuseTex = ModTexCoords(tex, position, diffuseTexMatrix);
 #else
     var_DiffuseTex = tex;
 #endif
diff --git a/code/renderergl2/glsl/lightall_vp.glsl b/code/renderergl2/glsl/lightall_vp.glsl
index 428cf1e6..8ff5e7bb 100644
--- a/code/renderergl2/glsl/lightall_vp.glsl
+++ b/code/renderergl2/glsl/lightall_vp.glsl
@@ -37,8 +37,14 @@ uniform vec3   u_LocalViewOrigin;
 #endif
 
 #if defined(USE_TCMOD)
-uniform vec4   u_DiffuseTexMatrix;
-uniform vec4   u_DiffuseTexOffTurb;
+uniform vec4   u_DiffuseTexMatrix0;
+uniform vec4   u_DiffuseTexMatrix1;
+uniform vec4   u_DiffuseTexMatrix2;
+uniform vec4   u_DiffuseTexMatrix3;
+uniform vec4   u_DiffuseTexMatrix4;
+uniform vec4   u_DiffuseTexMatrix5;
+uniform vec4   u_DiffuseTexMatrix6;
+uniform vec4   u_DiffuseTexMatrix7;
 #endif
 
 uniform mat4   u_ModelViewProjectionMatrix;
@@ -114,19 +120,28 @@ vec2 GenTexCoords(int TCGen, vec3 position, vec3 normal, vec3 TCGenVector0, vec3
 #endif
 
 #if defined(USE_TCMOD)
-vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix, vec4 offTurb)
+vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix[8])
 {
-	float amplitude = offTurb.z;
-	float phase = offTurb.w * 2.0 * M_PI;
-	vec2 st2;
-	st2.x = st.x * texMatrix.x + (st.y * texMatrix.z + offTurb.x);
-	st2.y = st.x * texMatrix.y + (st.y * texMatrix.w + offTurb.y);
-
+	vec2 st2 = st;
 	vec2 offsetPos = vec2(position.x + position.z, position.y);
 
-	vec2 texOffset = sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(phase));
+	st2 = vec2(st2.x * texMatrix[0].x + st2.y * texMatrix[0].y + texMatrix[0].z,
+	           st2.x * texMatrix[1].x + st2.y * texMatrix[1].y + texMatrix[1].z);
+	st2 += texMatrix[0].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[1].w * 2.0 * M_PI));
 
-	return st2 + texOffset * amplitude;	
+	st2 = vec2(st2.x * texMatrix[2].x + st2.y * texMatrix[2].y + texMatrix[2].z,
+	           st2.x * texMatrix[3].x + st2.y * texMatrix[3].y + texMatrix[3].z);
+	st2 += texMatrix[2].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[3].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[4].x + st2.y * texMatrix[4].y + texMatrix[4].z,
+	           st2.x * texMatrix[5].x + st2.y * texMatrix[5].y + texMatrix[5].z);
+	st2 += texMatrix[4].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[5].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[6].x + st2.y * texMatrix[6].y + texMatrix[6].z,
+	           st2.x * texMatrix[7].x + st2.y * texMatrix[7].y + texMatrix[7].z);
+	st2 += texMatrix[6].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[7].w * 2.0 * M_PI));
+
+	return st2;
 }
 #endif
 
@@ -183,7 +198,16 @@ void main()
 #endif
 
 #if defined(USE_TCMOD)
-	var_TexCoords.xy = ModTexCoords(texCoords, position, u_DiffuseTexMatrix, u_DiffuseTexOffTurb);
+	vec4 diffuseTexMatrix[8];
+	diffuseTexMatrix[0] = u_DiffuseTexMatrix0;
+	diffuseTexMatrix[1] = u_DiffuseTexMatrix1;
+	diffuseTexMatrix[2] = u_DiffuseTexMatrix2;
+	diffuseTexMatrix[3] = u_DiffuseTexMatrix3;
+	diffuseTexMatrix[4] = u_DiffuseTexMatrix4;
+	diffuseTexMatrix[5] = u_DiffuseTexMatrix5;
+	diffuseTexMatrix[6] = u_DiffuseTexMatrix6;
+	diffuseTexMatrix[7] = u_DiffuseTexMatrix7;
+	var_TexCoords.xy = ModTexCoords(texCoords, position, diffuseTexMatrix);
 #else
 	var_TexCoords.xy = texCoords;
 #endif
diff --git a/code/renderergl2/glsl/shaders.cmake b/code/renderergl2/glsl/shaders.cmake
deleted file mode 100644
index 925f3513..00000000
--- a/code/renderergl2/glsl/shaders.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-file(GLOB_RECURSE SHADER_GLSL_SRCS "code/renderergl2/glsl/*.glsl")
-
-add_executable(stringify "code/tools/stringify.cpp")
-
-foreach (shader ${SHADER_GLSL_SRCS})
-	get_filename_component(shaderfile ${shader} NAME_WE)
-	list(APPEND SHADER_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${shaderfile}.c)
-	set_source_files_properties(${shaderfile}.c PROPERTIES GENERATED TRUE)
-	add_custom_command(OUTPUT ${shaderfile}.c
-		DEPENDS stringify ${shader}
-		COMMAND stringify ${shader} ${CMAKE_CURRENT_BINARY_DIR}/${shaderfile}.c
-		COMMENT "Generate c source for ${shader}: ${shaderfile}.c"
-	)
-endforeach()
diff --git a/code/renderergl2/glsl/shadowmask_fp.glsl b/code/renderergl2/glsl/shadowmask_fp.glsl
index 2b57e3ba..1a562cbf 100644
--- a/code/renderergl2/glsl/shadowmask_fp.glsl
+++ b/code/renderergl2/glsl/shadowmask_fp.glsl
@@ -103,14 +103,19 @@ void main()
 
 	vec4 shadowpos = u_ShadowMvp * biasPos;
 
+	if ( depth >= 0.999 )
+	{
+		result = 1.0;
+	}
+	else
 #if defined(USE_SHADOW_CASCADE)
 	if (all(lessThan(abs(shadowpos.xyz), vec3(abs(shadowpos.w)))))
-	{
 #endif
+	{
 		shadowpos.xyz = shadowpos.xyz * (0.5 / shadowpos.w) + vec3(0.5);
 		result = PCF(u_ShadowMap, shadowpos.xy, shadowpos.z);
-#if defined(USE_SHADOW_CASCADE)
 	}
+#if defined(USE_SHADOW_CASCADE)
 	else
 	{
 		shadowpos = u_ShadowMvp2 * biasPos;
diff --git a/code/renderergl2/glsl/ssao_fp.glsl b/code/renderergl2/glsl/ssao_fp.glsl
index f3054404..2171f6e7 100644
--- a/code/renderergl2/glsl/ssao_fp.glsl
+++ b/code/renderergl2/glsl/ssao_fp.glsl
@@ -77,8 +77,7 @@ float ambientOcclusion(sampler2D depthMap, const vec2 tex, const float zFarDivZN
 
 	float invZFar = 1.0 / zFar;
 	float zLimit = 20.0 * invZFar;
-	int i;
-	for (i = 0; i < NUM_SAMPLES; i++)
+	for (int i = 0; i < NUM_SAMPLES; i++)
 	{
 		vec2 offset = rmat * poissonDisc[i] * offsetScale;
 		float sampleDiff = getLinearDepth(depthMap, tex + offset, zFarDivZNear) - sampleZ;
diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index ba3e2abb..71548779 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -342,9 +342,7 @@ void RB_BeginDrawingView (void) {
 	{
 		FBO_t *fbo = backEnd.viewParms.targetFbo;
 
-		// FIXME: HUGE HACK: render to the screen fbo if we've already postprocessed the frame and aren't drawing more world
-		// drawing more world check is in case of double renders, such as skyportals
-		if (fbo == NULL && !(backEnd.framePostProcessed && (backEnd.refdef.rdflags & RDF_NOWORLDMODEL)))
+		if (fbo == NULL)
 			fbo = tr.renderFbo;
 
 		if (tr.renderCubeFbo && fbo == tr.renderCubeFbo)
@@ -457,7 +455,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 
 	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
 		if ( drawSurf->sort == oldSort && drawSurf->cubemapIndex == oldCubemapIndex) {
-			if (backEnd.depthFill && shader && shader->sort != SS_OPAQUE)
+			if (backEnd.depthFill && shader && (shader->sort != SS_OPAQUE && shader->sort != SS_PORTAL))
 				continue;
 
 			// fast path, same as previous sort
@@ -486,7 +484,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			oldCubemapIndex = cubemapIndex;
 		}
 
-		if (backEnd.depthFill && shader && shader->sort != SS_OPAQUE)
+		if (backEnd.depthFill && shader && (shader->sort != SS_OPAQUE && shader->sort != SS_PORTAL))
 			continue;
 
 		//
@@ -708,10 +706,9 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 		ri.Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start );
 	}
 
-	// FIXME: HUGE hack
 	if (glRefConfig.framebufferObject)
 	{
-		FBO_Bind(backEnd.framePostProcessed ? NULL : tr.renderFbo);
+		FBO_Bind(tr.renderFbo);
 	}
 
 	RB_SetGL2D();
@@ -735,6 +732,7 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 }
 
 void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
+	byte *buffer;
 	GLuint texture;
 
 	if (!tr.scratchImage[client])
@@ -749,7 +747,18 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
 	if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) {
 		tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols;
 		tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows;
-		qglTextureImage2DEXT(texture, GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+
+		if ( qglesMajorVersion >= 1 ) {
+			buffer = ri.Hunk_AllocateTempMemory( 3 * cols * rows );
+
+			R_ConvertTextureFormat( data, cols, rows, GL_RGB, GL_UNSIGNED_BYTE, buffer );
+			qglTextureImage2DEXT(texture, GL_TEXTURE_2D, 0, GL_RGB, cols, rows, 0, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+
+			ri.Hunk_FreeTempMemory( buffer );
+		} else {
+			qglTextureImage2DEXT(texture, GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+		}
+
 		qglTextureParameterfEXT(texture, GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		qglTextureParameterfEXT(texture, GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
 		qglTextureParameterfEXT(texture, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -758,7 +767,16 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
 		if (dirty) {
 			// otherwise, just subimage upload it so that drivers can tell we are going to be changing
 			// it and don't try and do a texture compression
-			qglTextureSubImage2DEXT(texture, GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
+			if ( qglesMajorVersion >= 1 ) {
+				buffer = ri.Hunk_AllocateTempMemory( 3 * cols * rows );
+
+				R_ConvertTextureFormat( data, cols, rows, GL_RGB, GL_UNSIGNED_BYTE, buffer );
+				qglTextureSubImage2DEXT(texture, GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+
+				ri.Hunk_FreeTempMemory( buffer );
+			} else {
+				qglTextureSubImage2DEXT(texture, GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
+			}
 		}
 	}
 }
@@ -795,9 +813,8 @@ const void *RB_StretchPic ( const void *data ) {
 
 	cmd = (const stretchPicCommand_t *)data;
 
-	// FIXME: HUGE hack
 	if (glRefConfig.framebufferObject)
-		FBO_Bind(backEnd.framePostProcessed ? NULL : tr.renderFbo);
+		FBO_Bind(tr.renderFbo);
 
 	RB_SetGL2D();
 
@@ -1144,14 +1161,14 @@ const void	*RB_DrawSurfs( const void *data ) {
 			if (glRefConfig.occlusionQuery)
 			{
 				tr.sunFlareQueryActive[tr.sunFlareQueryIndex] = qtrue;
-				qglBeginQuery(GL_SAMPLES_PASSED, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
+				qglBeginQuery(glRefConfig.occlusionQueryTarget, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
 			}
 
 			RB_DrawSun(0.3, tr.sunFlareShader);
 
 			if (glRefConfig.occlusionQuery)
 			{
-				qglEndQuery(GL_SAMPLES_PASSED);
+				qglEndQuery(glRefConfig.occlusionQueryTarget);
 			}
 
 			FBO_Bind(oldFbo);
@@ -1173,6 +1190,13 @@ const void	*RB_DrawSurfs( const void *data ) {
 			qglGenerateTextureMipmapEXT(cubemap->image->texnum, GL_TEXTURE_CUBE_MAP);
 	}
 
+	// FIXME? backEnd.viewParms doesn't get properly initialized for 2D drawing.
+	// r_cubeMapping 1 generates cubemaps with R_RenderCubemapSide()
+	// and sets isMirror = qtrue. Clear it here to prevent it from leaking
+	// to 2D drawing and causing the loading screen to be culled.
+	backEnd.viewParms.isMirror = qfalse;
+	backEnd.viewParms.flags = 0;
+
 	return (const void *)(cmd + 1);
 }
 
@@ -1199,6 +1223,10 @@ const void	*RB_DrawBuffer( const void *data ) {
 
 	// clear screen for debugging
 	if ( r_clear->integer ) {
+		if (glRefConfig.framebufferObject && tr.renderFbo) {
+			FBO_Bind(tr.renderFbo);
+		}
+
 		qglClearColor( 1, 0, 0.5, 1 );
 		qglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 	}
@@ -1313,14 +1341,7 @@ const void *RB_ClearDepth(const void *data)
 
 	if (glRefConfig.framebufferObject)
 	{
-		if (!tr.renderFbo || backEnd.framePostProcessed)
-		{
-			FBO_Bind(NULL);
-		}
-		else
-		{
-			FBO_Bind(tr.renderFbo);
-		}
+		FBO_Bind(tr.renderFbo);
 	}
 
 	qglClear(GL_DEPTH_BUFFER_BIT);
@@ -1378,18 +1399,15 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	if (glRefConfig.framebufferObject)
 	{
-		if (!backEnd.framePostProcessed)
+		if (tr.msaaResolveFbo && r_hdr->integer)
 		{
-			if (tr.msaaResolveFbo && r_hdr->integer)
-			{
-				// Resolving an RGB16F MSAA FBO to the screen messes with the brightness, so resolve to an RGB16F FBO first
-				FBO_FastBlit(tr.renderFbo, NULL, tr.msaaResolveFbo, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-				FBO_FastBlit(tr.msaaResolveFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			}
-			else if (tr.renderFbo)
-			{
-				FBO_FastBlit(tr.renderFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			}
+			// Resolving an RGB16F MSAA FBO to the screen messes with the brightness, so resolve to an RGB16F FBO first
+			FBO_FastBlit(tr.renderFbo, NULL, tr.msaaResolveFbo, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			FBO_FastBlit(tr.msaaResolveFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+		}
+		else if (tr.renderFbo)
+		{
+			FBO_FastBlit(tr.renderFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 		}
 	}
 
@@ -1401,7 +1419,6 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	GLimp_EndFrame();
 
-	backEnd.framePostProcessed = qfalse;
 	backEnd.projection2D = qfalse;
 
 	return (const void *)(cmd + 1);
@@ -1452,7 +1469,7 @@ RB_PostProcess
 const void *RB_PostProcess(const void *data)
 {
 	const postProcessCommand_t *cmd = data;
-	FBO_t *srcFbo;
+	FBO_t *srcFbo, *dstFbo;
 	ivec4_t srcBox, dstBox;
 	qboolean autoExposure;
 
@@ -1473,6 +1490,8 @@ const void *RB_PostProcess(const void *data)
 	}
 
 	srcFbo = tr.renderFbo;
+	dstFbo = tr.renderFbo;
+
 	if (tr.msaaResolveFbo)
 	{
 		// Resolve the MSAA before anything else
@@ -1506,13 +1525,13 @@ const void *RB_PostProcess(const void *data)
 		if (r_hdr->integer && (r_toneMap->integer || r_forceToneMap->integer))
 		{
 			autoExposure = r_autoExposure->integer || r_forceAutoExposure->integer;
-			RB_ToneMap(srcFbo, srcBox, NULL, dstBox, autoExposure);
+
+			// Use an intermediate FBO because it can't blit to the same FBO directly
+			// and can't read from an MSAA dstFbo later.
+			RB_ToneMap(srcFbo, srcBox, tr.screenScratchFbo, srcBox, autoExposure);
+			FBO_FastBlit(tr.screenScratchFbo, srcBox, srcFbo, srcBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 		}
-		else if (r_cameraExposure->value == 0.0f)
-		{
-			FBO_FastBlit(srcFbo, srcBox, NULL, dstBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-		}
-		else
+		else if (r_cameraExposure->value != 0.0f)
 		{
 			vec4_t color;
 
@@ -1521,17 +1540,20 @@ const void *RB_PostProcess(const void *data)
 			color[2] = pow(2, r_cameraExposure->value); //exp2(r_cameraExposure->value);
 			color[3] = 1.0f;
 
-			FBO_Blit(srcFbo, srcBox, NULL, NULL, dstBox, NULL, color, 0);
+			FBO_BlitFromTexture(tr.whiteImage, NULL, NULL, srcFbo, srcBox, NULL, color, GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO);
 		}
 	}
 
 	if (r_drawSunRays->integer)
-		RB_SunRays(NULL, srcBox, NULL, dstBox);
+		RB_SunRays(srcFbo, srcBox, srcFbo, srcBox);
 
 	if (1)
-		RB_BokehBlur(NULL, srcBox, NULL, dstBox, backEnd.refdef.blurFactor);
+		RB_BokehBlur(srcFbo, srcBox, srcFbo, srcBox, backEnd.refdef.blurFactor);
 	else
-		RB_GaussianBlur(backEnd.refdef.blurFactor);
+		RB_GaussianBlur(srcFbo, srcFbo, backEnd.refdef.blurFactor);
+
+	if (srcFbo != dstFbo)
+		FBO_FastBlit(srcFbo, srcBox, dstFbo, dstBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 
 #if 0
 	if (0)
@@ -1547,7 +1569,7 @@ const void *RB_PostProcess(const void *data)
 		if (scale < 0.01f)
 			scale = 5.0f;
 
-		FBO_FastBlit(NULL, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+		FBO_FastBlit(dstFbo, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
 		iQtrBox[0] = backEnd.viewParms.viewportX      * tr.quarterImage[0]->width / (float)glConfig.vidWidth;
 		iQtrBox[1] = backEnd.viewParms.viewportY      * tr.quarterImage[0]->height / (float)glConfig.vidHeight;
@@ -1593,7 +1615,7 @@ const void *RB_PostProcess(const void *data)
 
 		SetViewportAndScissor();
 
-		FBO_FastBlit(tr.quarterFbo[1], NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+		FBO_FastBlit(tr.quarterFbo[1], NULL, dstFbo, NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 		FBO_Bind(NULL);
 	}
 #endif
@@ -1602,42 +1624,42 @@ const void *RB_PostProcess(const void *data)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 0, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[0], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[0], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 128, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[1], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[1], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 256, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[2], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[2], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 384, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[3], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[3], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 	if (0 && r_shadows->integer == 4)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 512 + 0, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[0], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[0], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512 + 128, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[1], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[1], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512 + 256, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[2], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[2], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512 + 384, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[3], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[3], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 	if (0)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 256, glConfig.vidHeight - 256, 256, 256);
-		FBO_BlitFromTexture(tr.renderDepthImage, NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.renderDepthImage, NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512, glConfig.vidHeight - 256, 256, 256);
-		FBO_BlitFromTexture(tr.screenShadowImage, NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.screenShadowImage, NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 	if (0)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 256, glConfig.vidHeight - 256, 256, 256);
-		FBO_BlitFromTexture(tr.sunRaysImage, NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunRaysImage, NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 #if 0
@@ -1649,14 +1671,12 @@ const void *RB_PostProcess(const void *data)
 		if (cubemapIndex)
 		{
 			VectorSet4(dstBox, 0, glConfig.vidHeight - 256, 256, 256);
-			//FBO_BlitFromTexture(tr.renderCubeImage, NULL, NULL, NULL, dstBox, &tr.testcubeShader, NULL, 0);
-			FBO_BlitFromTexture(tr.cubemaps[cubemapIndex - 1].image, NULL, NULL, NULL, dstBox, &tr.testcubeShader, NULL, 0);
+			//FBO_BlitFromTexture(tr.renderCubeImage, NULL, NULL, dstFbo, dstBox, &tr.testcubeShader, NULL, 0);
+			FBO_BlitFromTexture(tr.cubemaps[cubemapIndex - 1].image, NULL, NULL, dstFbo, dstBox, &tr.testcubeShader, NULL, 0);
 		}
 	}
 #endif
 
-	backEnd.framePostProcessed = qtrue;
-
 	return (const void *)(cmd + 1);
 }
 
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index ad5fe3a3..57a4efc3 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -276,7 +276,7 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 		tr.deluxemaps = ri.Hunk_Alloc( tr.numLightmaps * sizeof(image_t *), h_low );
 
 	textureInternalFormat = GL_RGBA8;
-	if (r_hdr->integer)
+	if (r_hdr->integer && !qglesMajorVersion)
 	{
 		// Check for the first hdr lightmap, if it exists, use GL_RGBA16 for textures.
 		char filename[MAX_QPATH];
@@ -497,6 +497,7 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 }
 
 
+// If FatPackU() or FatPackV() changes, update FixFatLightmapTexCoords()
 static float FatPackU(float input, int lightmapnum)
 {
 	if (lightmapnum < 0)
@@ -616,7 +617,7 @@ static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
 		lightmapNum = LIGHTMAP_WHITEIMAGE;
 	}
 
-	shader = R_FindShader( dsh->shader, lightmapNum, qtrue );
+	shader = R_FindShaderEx( dsh->shader, FatLightmap( lightmapNum ), qtrue, lightmapNum );
 
 	// if the shader had errors, just use default shader
 	if ( shader->defaultShader ) {
@@ -705,7 +706,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
 	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
 	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, FatLightmap(realLightmapNum) );
+	surf->shader = ShaderForShaderNum( ds->shaderNum, realLightmapNum );
 	if ( r_singleShader->integer && !surf->shader->isSky ) {
 		surf->shader = tr.defaultShader;
 	}
@@ -812,7 +813,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
 	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
 	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, FatLightmap(realLightmapNum) );
+	surf->shader = ShaderForShaderNum( ds->shaderNum, realLightmapNum );
 	if ( r_singleShader->integer && !surf->shader->isSky ) {
 		surf->shader = tr.defaultShader;
 	}
diff --git a/code/renderergl2/tr_cmds.c b/code/renderergl2/tr_cmds.c
index 38ba45d2..2025c41d 100644
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
@@ -348,7 +348,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	//
 	if ( r_measureOverdraw->integer )
 	{
-		if ( glConfig.stencilBits < 4 )
+		if ( qglesMajorVersion >= 1 && !glRefConfig.readStencil )
+		{
+			ri.Printf( PRINT_WARNING, "OpenGL ES needs GL_NV_read_stencil to read stencil bits to measure overdraw\n" );
+			ri.Cvar_Set( "r_measureOverdraw", "0" );
+			r_measureOverdraw->modified = qfalse;
+		}
+		else if ( glConfig.stencilBits < 4 )
 		{
 			ri.Printf( PRINT_ALL, "Warning: not enough stencil bits to measure overdraw: %d\n", glConfig.stencilBits );
 			ri.Cvar_Set( "r_measureOverdraw", "0" );
@@ -426,6 +432,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	}
 	else
 	{
+		if (qglesMajorVersion >= 1 && r_anaglyphMode->integer)
+		{
+			ri.Printf( PRINT_WARNING, "OpenGL ES does not support drawing to separate buffer for anaglyph mode\n" );
+			ri.Cvar_Set( "r_anaglyphMode", "0" );
+			r_anaglyphMode->modified = qfalse;
+		}
+
 		if(r_anaglyphMode->integer)
 		{
 			if(r_anaglyphMode->modified)
diff --git a/code/renderergl2/tr_curve.c b/code/renderergl2/tr_curve.c
index d175789b..54910d04 100644
--- a/code/renderergl2/tr_curve.c
+++ b/code/renderergl2/tr_curve.c
@@ -388,10 +388,10 @@ void R_CreateSurfaceGridMesh(srfBspSurface_t *grid, int width, int height,
 	grid->numVerts = (width * height);
 	grid->verts = ri.Malloc(grid->numVerts * sizeof(srfVert_t));
 #else
-	grid->widthLodError = ri.Hunk_Alloc( width * 4 );
+	grid->widthLodError = ri.Hunk_Alloc( width * 4, h_low );
 	Com_Memcpy( grid->widthLodError, errorTable[0], width * 4 );
 
-	grid->heightLodError = ri.Hunk_Alloc( height * 4 );
+	grid->heightLodError = ri.Hunk_Alloc( height * 4, h_low );
 	Com_Memcpy( grid->heightLodError, errorTable[1], height * 4 );
 
 	grid->numIndexes = numIndexes;
diff --git a/code/renderergl2/tr_extensions.c b/code/renderergl2/tr_extensions.c
index ebc985a9..856526bf 100644
--- a/code/renderergl2/tr_extensions.c
+++ b/code/renderergl2/tr_extensions.c
@@ -45,6 +45,17 @@ void GLimp_InitExtraExtensions(void)
 	if (strstr((char *)qglGetString(GL_RENDERER), "Intel"))
 		glRefConfig.intelGraphics = qtrue;
 
+	if (qglesMajorVersion)
+	{
+		glRefConfig.vaoCacheGlIndexType = GL_UNSIGNED_SHORT;
+		glRefConfig.vaoCacheGlIndexSize = sizeof(unsigned short);
+	}
+	else
+	{
+		glRefConfig.vaoCacheGlIndexType = GL_UNSIGNED_INT;
+		glRefConfig.vaoCacheGlIndexSize = sizeof(unsigned int);
+	}
+
 	// set DSA fallbacks
 #define GLE(ret, name, ...) qgl##name = GLDSA_##name;
 	QGL_EXT_direct_state_access_PROCS;
@@ -53,8 +64,107 @@ void GLimp_InitExtraExtensions(void)
 	// GL function loader, based on https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
 #define GLE(ret, name, ...) qgl##name = (name##proc *) SDL_GL_GetProcAddress("gl" #name);
 
+	//
+	// OpenGL ES extensions
+	//
+	if (qglesMajorVersion)
+	{
+		if (!r_allowExtensions->integer)
+			goto done;
+
+		extension = "GL_EXT_occlusion_query_boolean";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.occlusionQuery = qtrue;
+			glRefConfig.occlusionQueryTarget = GL_ANY_SAMPLES_PASSED;
+
+			if (qglesMajorVersion >= 3) {
+				QGL_ARB_occlusion_query_PROCS;
+			} else {
+				// GL_EXT_occlusion_query_boolean uses EXT suffix
+#undef GLE
+#define GLE(ret, name, ...) qgl##name = (name##proc *) SDL_GL_GetProcAddress("gl" #name "EXT");
+
+				QGL_ARB_occlusion_query_PROCS;
+
+#undef GLE
+#define GLE(ret, name, ...) qgl##name = (name##proc *) SDL_GL_GetProcAddress("gl" #name);
+			}
+
+			ri.Printf(PRINT_ALL, result[glRefConfig.occlusionQuery], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_NV_read_depth
+		extension = "GL_NV_read_depth";
+		if (SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.readDepth = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.readDepth], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_NV_read_stencil
+		extension = "GL_NV_read_stencil";
+		if (SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.readStencil = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.readStencil], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_EXT_shadow_samplers
+		extension = "GL_EXT_shadow_samplers";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.shadowSamplers = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.shadowSamplers], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_OES_standard_derivatives
+		extension = "GL_OES_standard_derivatives";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.standardDerivatives = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.standardDerivatives], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_OES_element_index_uint
+		extension = "GL_OES_element_index_uint";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.vaoCacheGlIndexType = GL_UNSIGNED_INT;
+			glRefConfig.vaoCacheGlIndexSize = sizeof(unsigned int);
+			ri.Printf(PRINT_ALL, result[1], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		goto done;
+	}
+
 	// OpenGL 1.5 - GL_ARB_occlusion_query
 	glRefConfig.occlusionQuery = qtrue;
+	glRefConfig.occlusionQueryTarget = GL_SAMPLES_PASSED;
 	QGL_ARB_occlusion_query_PROCS;
 
 	// OpenGL 3.0 - GL_ARB_framebuffer_object
@@ -146,18 +256,6 @@ void GLimp_InitExtraExtensions(void)
 		ri.Printf(PRINT_ALL, result[2], extension);
 	}
 
-	// Determine GLSL version
-	if (1)
-	{
-		char version[256];
-
-		Q_strncpyz(version, (char *)qglGetString(GL_SHADING_LANGUAGE_VERSION), sizeof(version));
-
-		sscanf(version, "%d.%d", &glRefConfig.glslMajorVersion, &glRefConfig.glslMinorVersion);
-
-		ri.Printf(PRINT_ALL, "...using GLSL version %s\n", version);
-	}
-
 	glRefConfig.memInfo = MI_NONE;
 
 	// GL_NVX_gpu_memory_info
@@ -249,5 +347,26 @@ void GLimp_InitExtraExtensions(void)
 		ri.Printf(PRINT_ALL, result[2], extension);
 	}
 
+done:
+
+	// Determine GLSL version
+	if (1)
+	{
+		char version[256], *version_p;
+
+		Q_strncpyz(version, (char *)qglGetString(GL_SHADING_LANGUAGE_VERSION), sizeof(version));
+
+		// Skip leading text such as "OpenGL ES GLSL ES "
+		version_p = version;
+		while ( *version_p && !isdigit( *version_p ) )
+		{
+			version_p++;
+		}
+
+		sscanf(version_p, "%d.%d", &glRefConfig.glslMajorVersion, &glRefConfig.glslMinorVersion);
+
+		ri.Printf(PRINT_ALL, "...using GLSL version %s\n", version);
+	}
+
 #undef GLE
 }
diff --git a/code/renderergl2/tr_fbo.c b/code/renderergl2/tr_fbo.c
index 26f50c3f..223cbe7f 100644
--- a/code/renderergl2/tr_fbo.c
+++ b/code/renderergl2/tr_fbo.c
@@ -170,9 +170,13 @@ void FBO_CreateBuffer(FBO_t *fbo, int format, int index, int multisample)
 	}
 
 	absent = *pRenderBuffer == 0;
-	if (absent)
+	if (absent) {
 		qglGenRenderbuffers(1, pRenderBuffer);
 
+		// workaround AMD Windows driver requiring bind to create renderbuffer
+		GL_BindRenderbuffer(*pRenderBuffer);
+	}
+
 	if (multisample && glRefConfig.framebufferMultisample)
 		qglNamedRenderbufferStorageMultisampleEXT(*pRenderBuffer, multisample, format, fbo->width, fbo->height);
 	else
@@ -644,10 +648,30 @@ void FBO_FastBlit(FBO_t *src, ivec4_t srcBox, FBO_t *dst, ivec4_t dstBox, int bu
 		int width  = dst ? dst->width  : glConfig.vidWidth;
 		int height = dst ? dst->height : glConfig.vidHeight;
 
+		qglScissor(0, 0, width, height);
+
 		VectorSet4(dstBoxFinal, 0, 0, width, height);
 	}
 	else
 	{
+		ivec4_t scissorBox;
+
+		Vector4Copy(dstBox, scissorBox);
+
+		if (scissorBox[2] < 0)
+		{
+			scissorBox[0] += scissorBox[2];
+			scissorBox[2] = fabsf(scissorBox[2]);
+		}
+
+		if (scissorBox[3] < 0)
+		{
+			scissorBox[1] += scissorBox[3];
+			scissorBox[3] = fabsf(scissorBox[3]);
+		}
+
+		qglScissor(scissorBox[0], scissorBox[1], scissorBox[2], scissorBox[3]);
+
 		VectorSet4(dstBoxFinal, dstBox[0], dstBox[1], dstBox[0] + dstBox[2], dstBox[1] + dstBox[3]);
 	}
 
diff --git a/code/renderergl2/tr_flares.c b/code/renderergl2/tr_flares.c
index fc83df7b..0ad12be0 100644
--- a/code/renderergl2/tr_flares.c
+++ b/code/renderergl2/tr_flares.c
@@ -79,7 +79,7 @@ typedef struct flare_s {
 	vec3_t		color;
 } flare_t;
 
-#define		MAX_FLARES		128
+#define		MAX_FLARES		256
 
 flare_t		r_flareStructs[MAX_FLARES];
 flare_t		*r_activeFlares, *r_inactiveFlares;
@@ -478,6 +478,14 @@ void RB_RenderFlares (void) {
 		return;
 	}
 
+	if ( r_flares->modified ) {
+		if ( qglesMajorVersion >= 1 && !glRefConfig.readDepth ) {
+			ri.Printf( PRINT_WARNING, "OpenGL ES needs GL_NV_read_depth to read depth to determine if flares are visible\n" );
+			ri.Cvar_Set( "r_flares", "0" );
+		}
+		r_flares->modified = qfalse;
+	}
+
 	if(r_flareCoeff->modified)
 	{
 		R_SetFlareCoeff();
diff --git a/code/renderergl2/tr_glsl.c b/code/renderergl2/tr_glsl.c
index 86cca599..39223bf6 100644
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
@@ -88,8 +88,14 @@ static uniformInfo_t uniformsInfo[] =
 
 	{ "u_EnableTextures", GLSL_VEC4 },
 
-	{ "u_DiffuseTexMatrix",  GLSL_VEC4 },
-	{ "u_DiffuseTexOffTurb", GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix0",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix1",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix2",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix3",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix4",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix5",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix6",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix7",  GLSL_VEC4 },
 
 	{ "u_TCGen0",        GLSL_INT },
 	{ "u_TCGen0Vector0", GLSL_VEC3 },
@@ -243,11 +249,25 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
 	// HACK: abuse the GLSL preprocessor to turn GLSL 1.20 shaders into 1.30 ones
 	if(glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 30))
 	{
-		if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 50))
+		if (qglesMajorVersion >= 3 && glRefConfig.glslMajorVersion >= 3)
+			Q_strcat(dest, size, "#version 300 es\n");
+		else if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 50))
 			Q_strcat(dest, size, "#version 150\n");
 		else
 			Q_strcat(dest, size, "#version 130\n");
 
+		// `extra' may contain #extension which must be directly after #version
+		if (extra)
+		{
+			Q_strcat(dest, size, extra);
+		}
+
+		if (qglesMajorVersion >= 2)
+		{
+			Q_strcat(dest, size, "precision mediump float;\n");
+			Q_strcat(dest, size, "precision mediump sampler2DShadow;\n");
+		}
+
 		if(shaderType == GL_VERTEX_SHADER)
 		{
 			Q_strcat(dest, size, "#define attribute in\n");
@@ -266,8 +286,34 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
 	}
 	else
 	{
-		Q_strcat(dest, size, "#version 120\n");
-		Q_strcat(dest, size, "#define shadow2D(a,b) shadow2D(a,b).r \n");
+		if (qglesMajorVersion >= 2)
+		{
+			Q_strcat(dest, size, "#version 100\n");
+
+			if (extra)
+			{
+				Q_strcat(dest, size, extra);
+			}
+
+			Q_strcat(dest, size, "precision mediump float;\n");
+
+			if (glRefConfig.shadowSamplers)
+			{
+				Q_strcat(dest, size, "precision mediump sampler2DShadow;\n");
+				Q_strcat(dest, size, "#define shadow2D(a,b) shadow2DEXT(a,b)\n");
+			}
+		}
+		else
+		{
+			Q_strcat(dest, size, "#version 120\n");
+
+			if (extra)
+			{
+				Q_strcat(dest, size, extra);
+			}
+
+			Q_strcat(dest, size, "#define shadow2D(a,b) shadow2D(a,b).r\n");
+		}
 	}
 
 	// HACK: add some macros to avoid extra uniforms and save speed and code maintenance
@@ -355,11 +401,6 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
 		Q_strcat(dest, size, va("#define ROUGHNESS_MIPS float(%d)\n", numRoughnessMips));
 	}
 
-	if (extra)
-	{
-		Q_strcat(dest, size, extra);
-	}
-
 	// OK we added a lot of stuff but if we do something bad in the GLSL shaders then we want the proper line
 	// so we have to reset the line counting
 	Q_strcat(dest, size, "#line 0\n");
@@ -927,6 +968,15 @@ void GLSL_InitGPUShaders(void)
 
 	startTime = ri.Milliseconds();
 
+	// OpenGL ES may not have enough attributes to fit ones used for vertex animation
+	if ( glRefConfig.maxVertexAttribs > ATTR_INDEX_NORMAL2 ) {
+		ri.Printf(PRINT_ALL, "Using GPU vertex animation\n");
+		glRefConfig.gpuVertexAnimation = qtrue;
+	} else {
+		ri.Printf(PRINT_ALL, "Using CPU vertex animation\n");
+		glRefConfig.gpuVertexAnimation = qfalse;
+	}
+
 	for (i = 0; i < GENERICDEF_COUNT; i++)
 	{	
 		if ((i & GENERICDEF_USE_VERTEX_ANIMATION) && (i & GENERICDEF_USE_BONE_ANIMATION))
@@ -949,6 +999,9 @@ void GLSL_InitGPUShaders(void)
 
 		if (i & GENERICDEF_USE_VERTEX_ANIMATION)
 		{
+			if (!glRefConfig.gpuVertexAnimation)
+				continue;
+
 			Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n");
 			attribs |= ATTR_POSITION2 | ATTR_NORMAL2;
 		}
@@ -1000,6 +1053,9 @@ void GLSL_InitGPUShaders(void)
 		if ((i & FOGDEF_USE_VERTEX_ANIMATION) && (i & FOGDEF_USE_BONE_ANIMATION))
 			continue;
 
+		if ((i & FOGDEF_USE_VERTEX_ANIMATION) && !glRefConfig.gpuVertexAnimation)
+			continue;
+
 		if ((i & FOGDEF_USE_BONE_ANIMATION) && !glRefConfig.glslMaxAnimatedBones)
 			continue;
 
@@ -1180,12 +1236,17 @@ void GLSL_InitGPUShaders(void)
 
 		if (i & LIGHTDEF_ENTITY_VERTEX_ANIMATION)
 		{
-			Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n#define USE_MODELMATRIX\n");
-			attribs |= ATTR_POSITION2 | ATTR_NORMAL2;
+			Q_strcat(extradefines, 1024, "#define USE_MODELMATRIX\n");
 
-			if (r_normalMapping->integer)
+			if (glRefConfig.gpuVertexAnimation)
 			{
-				attribs |= ATTR_TANGENT2;
+				Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n");
+				attribs |= ATTR_POSITION2 | ATTR_NORMAL2;
+
+				if (r_normalMapping->integer)
+				{
+					attribs |= ATTR_TANGENT2;
+				}
 			}
 		}
 		else if (i & LIGHTDEF_ENTITY_BONE_ANIMATION)
@@ -1220,6 +1281,9 @@ void GLSL_InitGPUShaders(void)
 		if ((i & SHADOWMAPDEF_USE_VERTEX_ANIMATION) && (i & SHADOWMAPDEF_USE_BONE_ANIMATION))
 			continue;
 
+		if ((i & SHADOWMAPDEF_USE_VERTEX_ANIMATION) && !glRefConfig.gpuVertexAnimation)
+			continue;
+
 		if ((i & SHADOWMAPDEF_USE_BONE_ANIMATION) && !glRefConfig.glslMaxAnimatedBones)
 			continue;
 
@@ -1344,86 +1408,110 @@ void GLSL_InitGPUShaders(void)
 	}
 
 
-	attribs = ATTR_POSITION | ATTR_TEXCOORD;
-	extradefines[0] = '\0';
-
-	if (r_shadowFilter->integer >= 1)
-		Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER\n");
-
-	if (r_shadowFilter->integer >= 2)
-		Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER2\n");
-
-	if (r_shadowCascadeZFar->integer != 0)
-		Q_strcat(extradefines, 1024, "#define USE_SHADOW_CASCADE\n");
-
-	Q_strcat(extradefines, 1024, va("#define r_shadowMapSize %f\n", r_shadowMapSize->value));
-	Q_strcat(extradefines, 1024, va("#define r_shadowCascadeZFar %f\n", r_shadowCascadeZFar->value));
-
-
-	if (!GLSL_InitGPUShader(&tr.shadowmaskShader, "shadowmask", attribs, qtrue, extradefines, qtrue, fallbackShader_shadowmask_vp, fallbackShader_shadowmask_fp))
-	{
-		ri.Error(ERR_FATAL, "Could not load shadowmask shader!");
-	}
-	
-	GLSL_InitUniforms(&tr.shadowmaskShader);
-
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP,  TB_SHADOWMAP);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP2, TB_SHADOWMAP2);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP3, TB_SHADOWMAP3);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP4, TB_SHADOWMAP4);
-
-	GLSL_FinishGPUShader(&tr.shadowmaskShader);
-
-	numEtcShaders++;
-
-
-	attribs = ATTR_POSITION | ATTR_TEXCOORD;
-	extradefines[0] = '\0';
-
-	if (!GLSL_InitGPUShader(&tr.ssaoShader, "ssao", attribs, qtrue, extradefines, qtrue, fallbackShader_ssao_vp, fallbackShader_ssao_fp))
-	{
-		ri.Error(ERR_FATAL, "Could not load ssao shader!");
-	}
-
-	GLSL_InitUniforms(&tr.ssaoShader);
-
-	GLSL_SetUniformInt(&tr.ssaoShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
-
-	GLSL_FinishGPUShader(&tr.ssaoShader);
-
-	numEtcShaders++;
-
-
-	for (i = 0; i < 4; i++)
+	// GLSL 1.10+ or GL_EXT_shadow_samplers extension are required for sampler2DShadow type
+	if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 10)
+	    || glRefConfig.shadowSamplers)
 	{
 		attribs = ATTR_POSITION | ATTR_TEXCOORD;
 		extradefines[0] = '\0';
 
-		if (i & 1)
-			Q_strcat(extradefines, 1024, "#define USE_VERTICAL_BLUR\n");
-		else
-			Q_strcat(extradefines, 1024, "#define USE_HORIZONTAL_BLUR\n");
-
-		if (!(i & 2))
-			Q_strcat(extradefines, 1024, "#define USE_DEPTH\n");
-
-
-		if (!GLSL_InitGPUShader(&tr.depthBlurShader[i], "depthBlur", attribs, qtrue, extradefines, qtrue, fallbackShader_depthblur_vp, fallbackShader_depthblur_fp))
+		if (qglesMajorVersion < 3 && glRefConfig.shadowSamplers)
 		{
-			ri.Error(ERR_FATAL, "Could not load depthBlur shader!");
+			Q_strcat(extradefines, 1024, "#extension GL_EXT_shadow_samplers : enable\n");
 		}
-		
-		GLSL_InitUniforms(&tr.depthBlurShader[i]);
 
-		GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENIMAGEMAP, TB_COLORMAP);
-		GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENDEPTHMAP, TB_LIGHTMAP);
+		if (r_shadowFilter->integer >= 1)
+			Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER\n");
 
-		GLSL_FinishGPUShader(&tr.depthBlurShader[i]);
+		if (r_shadowFilter->integer >= 2)
+			Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER2\n");
+
+		if (r_shadowCascadeZFar->integer != 0)
+			Q_strcat(extradefines, 1024, "#define USE_SHADOW_CASCADE\n");
+
+		Q_strcat(extradefines, 1024, va("#define r_shadowMapSize %f\n", r_shadowMapSize->value));
+		Q_strcat(extradefines, 1024, va("#define r_shadowCascadeZFar %f\n", r_shadowCascadeZFar->value));
+
+		if (!GLSL_InitGPUShader(&tr.shadowmaskShader, "shadowmask", attribs, qtrue, extradefines, qtrue, fallbackShader_shadowmask_vp, fallbackShader_shadowmask_fp))
+		{
+			ri.Error(ERR_FATAL, "Could not load shadowmask shader!");
+		}
+	
+		GLSL_InitUniforms(&tr.shadowmaskShader);
+
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP,  TB_SHADOWMAP);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP2, TB_SHADOWMAP2);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP3, TB_SHADOWMAP3);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP4, TB_SHADOWMAP4);
+
+		GLSL_FinishGPUShader(&tr.shadowmaskShader);
 
 		numEtcShaders++;
 	}
 
+
+	// GLSL 1.10+ or GL_OES_standard_derivatives extension are required for dFdx() and dFdy() GLSL functions
+	if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 10)
+	    || glRefConfig.standardDerivatives)
+	{
+		attribs = ATTR_POSITION | ATTR_TEXCOORD;
+		extradefines[0] = '\0';
+
+		if (qglesMajorVersion < 3 && glRefConfig.standardDerivatives)
+		{
+			Q_strcat(extradefines, 1024, "#extension GL_OES_standard_derivatives : enable\n");
+		}
+
+		if (!GLSL_InitGPUShader(&tr.ssaoShader, "ssao", attribs, qtrue, extradefines, qtrue, fallbackShader_ssao_vp, fallbackShader_ssao_fp))
+		{
+			ri.Error(ERR_FATAL, "Could not load ssao shader!");
+		}
+
+		GLSL_InitUniforms(&tr.ssaoShader);
+
+		GLSL_SetUniformInt(&tr.ssaoShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
+
+		GLSL_FinishGPUShader(&tr.ssaoShader);
+
+		numEtcShaders++;
+
+
+		for (i = 0; i < 4; i++)
+		{
+			attribs = ATTR_POSITION | ATTR_TEXCOORD;
+			extradefines[0] = '\0';
+
+			if (qglesMajorVersion < 3 && glRefConfig.standardDerivatives)
+			{
+				Q_strcat(extradefines, 1024, "#extension GL_OES_standard_derivatives : enable\n");
+			}
+
+			if (i & 1)
+				Q_strcat(extradefines, 1024, "#define USE_VERTICAL_BLUR\n");
+			else
+				Q_strcat(extradefines, 1024, "#define USE_HORIZONTAL_BLUR\n");
+
+			if (!(i & 2))
+				Q_strcat(extradefines, 1024, "#define USE_DEPTH\n");
+
+
+			if (!GLSL_InitGPUShader(&tr.depthBlurShader[i], "depthBlur", attribs, qtrue, extradefines, qtrue, fallbackShader_depthblur_vp, fallbackShader_depthblur_fp))
+			{
+				ri.Error(ERR_FATAL, "Could not load depthBlur shader!");
+			}
+		
+			GLSL_InitUniforms(&tr.depthBlurShader[i]);
+
+			GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENIMAGEMAP, TB_COLORMAP);
+			GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENDEPTHMAP, TB_LIGHTMAP);
+
+			GLSL_FinishGPUShader(&tr.depthBlurShader[i]);
+
+			numEtcShaders++;
+		}
+	}
+
 #if 0
 	attribs = ATTR_POSITION | ATTR_TEXCOORD;
 	extradefines[0] = '\0';
@@ -1456,7 +1544,7 @@ void GLSL_ShutdownGPUShaders(void)
 
 	ri.Printf(PRINT_ALL, "------- GLSL_ShutdownGPUShaders -------\n");
 
-	for (i = 0; i < ATTR_INDEX_COUNT; i++)
+	for (i = 0; i < ATTR_INDEX_COUNT && i < glRefConfig.maxVertexAttribs; i++)
 		qglDisableVertexAttribArray(i);
 
 	GL_BindNullProgram();
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index de4a38c0..0e829d51 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -1455,6 +1455,106 @@ byte	mipBlendColors[16][4] = {
 	{0,0,255,128},
 };
 
+/*
+==================
+R_ConvertTextureFormat
+
+Convert RGBA unsigned byte to specified format and type
+==================
+*/
+#define ROW_PADDING( width, bpp, alignment ) PAD( (width) * (bpp), (alignment) ) - (width) * (bpp)
+void R_ConvertTextureFormat( const byte *in, int width, int height, GLenum format, GLenum type, byte *out )
+{
+	int x, y, rowPadding;
+	int unpackAlign = 4; // matches GL_UNPACK_ALIGNMENT default
+
+	if ( format == GL_RGB && type == GL_UNSIGNED_BYTE )
+	{
+		rowPadding = ROW_PADDING( width, 3, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++ )
+			{
+				*out++ = *in++;
+				*out++ = *in++;
+				*out++ = *in++;
+				in++;
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_LUMINANCE && type == GL_UNSIGNED_BYTE )
+	{
+		rowPadding = ROW_PADDING( width, 1, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++ )
+			{
+				*out++ = *in++; // red
+				in += 3;
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE )
+	{
+		rowPadding = ROW_PADDING( width, 2, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++ )
+			{
+				*out++ = *in++; // red
+				in += 2;
+				*out++ = *in++; // alpha
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5 )
+	{
+		rowPadding = ROW_PADDING( width, 2, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++, in += 4, out += 2 )
+			{
+				*((unsigned short*)out) = ( (unsigned short)( in[0] >> 3 ) << 11 )
+					    | ( (unsigned short)( in[1] >> 2 ) << 5 )
+					    | ( (unsigned short)( in[2] >> 3 ) << 0 );
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4 )
+	{
+		rowPadding = ROW_PADDING( width, 2, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++, in += 4, out += 2 )
+			{
+				*((unsigned short*)out) = ( (unsigned short)( in[0] >> 4 ) << 12 )
+					    | ( (unsigned short)( in[1] >> 4 ) << 8 )
+					    | ( (unsigned short)( in[2] >> 4 ) << 4 )
+					    | ( (unsigned short)( in[3] >> 4 ) << 0 );
+			}
+
+			out += rowPadding;
+		}
+	}
+	else
+	{
+		ri.Error( ERR_DROP, "Unable to convert RGBA image to OpenGL format 0x%X and type 0x%X", format, type );
+	}
+}
+
 static void RawImage_SwizzleRA( byte *data, int width, int height )
 {
 	int i;
@@ -1944,18 +2044,20 @@ static GLenum PixelDataFormatFromInternalFormat(GLenum internalFormat)
 	}
 }
 
-static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int width, int height, GLenum target, GLenum picFormat, int numMips, GLenum internalFormat, imgType_t type, imgFlags_t flags, qboolean subtexture )
+static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int width, int height, GLenum target, GLenum picFormat, GLenum dataFormat, GLenum dataType, int numMips, GLenum internalFormat, imgType_t type, imgFlags_t flags, qboolean subtexture )
 {
-	GLenum dataFormat, dataType;
 	qboolean rgtc = internalFormat == GL_COMPRESSED_RG_RGTC2;
 	qboolean rgba8 = picFormat == GL_RGBA8 || picFormat == GL_SRGB8_ALPHA8_EXT;
 	qboolean rgba = rgba8 || picFormat == GL_RGBA16;
 	qboolean mipmap = !!(flags & IMGFLAG_MIPMAP);
 	int size, miplevel;
 	qboolean lastMip = qfalse;
+	byte *formatBuffer = NULL;
 
-	dataFormat = PixelDataFormatFromInternalFormat(internalFormat);
-	dataType = picFormat == GL_RGBA16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+	if (qglesMajorVersion && rgba8 && (dataFormat != GL_RGBA || dataType != GL_UNSIGNED_BYTE))
+	{
+		formatBuffer = ri.Hunk_AllocateTempMemory(4 * width * height);
+	}
 
 	miplevel = 0;
 	do
@@ -1974,6 +2076,11 @@ static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int
 
 			if (rgba8 && rgtc)
 				RawImage_UploadToRgtc2Texture(texture, miplevel, x, y, width, height, data);
+			else if (formatBuffer)
+			{
+				R_ConvertTextureFormat(data, width, height, dataFormat, dataType, formatBuffer);
+				qglTextureSubImage2DEXT(texture, target, miplevel, x, y, width, height, dataFormat, dataType, formatBuffer);
+			}
 			else
 				qglTextureSubImage2DEXT(texture, target, miplevel, x, y, width, height, dataFormat, dataType, data);
 		}
@@ -2007,6 +2114,9 @@ static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int
 		}
 	}
 	while (!lastMip);
+
+	if (formatBuffer != NULL)
+		ri.Hunk_FreeTempMemory(formatBuffer);
 }
 
 
@@ -2016,7 +2126,7 @@ Upload32
 
 ===============
 */
-static void Upload32(byte *data, int x, int y, int width, int height, GLenum picFormat, int numMips, image_t *image, qboolean scaled)
+static void Upload32(byte *data, int x, int y, int width, int height, GLenum picFormat, GLenum dataFormat, GLenum dataType, int numMips, image_t *image, qboolean scaled)
 {
 	int			i, c;
 	byte		*scan;
@@ -2071,7 +2181,7 @@ static void Upload32(byte *data, int x, int y, int width, int height, GLenum pic
 		for (i = 0; i < 6; i++)
 		{
 			int w2 = width, h2 = height;
-			RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, picFormat, numMips, internalFormat, type, flags, qfalse);
+			RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, picFormat, dataFormat, dataType, numMips, internalFormat, type, flags, qfalse);
 			for (c = numMips; c; c--)
 			{
 				data += CalculateMipSize(w2, h2, picFormat);
@@ -2082,7 +2192,7 @@ static void Upload32(byte *data, int x, int y, int width, int height, GLenum pic
 	}
 	else
 	{
-		RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_2D, picFormat, numMips, internalFormat, type, flags, qfalse);
+		RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_2D, picFormat, dataFormat, dataType, numMips, internalFormat, type, flags, qfalse);
 	}
 
 	GL_CheckErrors();
@@ -2108,7 +2218,7 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 	qboolean    picmip = !!(flags & IMGFLAG_PICMIP);
 	qboolean    lastMip;
 	GLenum textureTarget = cubemap ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D;
-	GLenum dataFormat;
+	GLenum dataFormat, dataType;
 
 	if (strlen(name) >= MAX_QPATH ) {
 		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long", name);
@@ -2140,6 +2250,53 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 	if (!internalFormat)
 		internalFormat = RawImage_GetFormat(pic, width * height, picFormat, isLightmap, image->type, image->flags);
 
+	dataFormat = PixelDataFormatFromInternalFormat(internalFormat);
+	dataType = picFormat == GL_RGBA16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+
+	// Convert image data format for OpenGL ES, data is converted for each mip level
+	if (qglesMajorVersion)
+	{
+		switch (internalFormat)
+		{
+			case GL_LUMINANCE:
+			case GL_LUMINANCE8:
+				internalFormat = GL_LUMINANCE;
+				dataFormat = GL_LUMINANCE;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_LUMINANCE_ALPHA:
+			case GL_LUMINANCE8_ALPHA8:
+				internalFormat = GL_LUMINANCE_ALPHA;
+				dataFormat = GL_LUMINANCE_ALPHA;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_RGB:
+			case GL_RGB8:
+				internalFormat = GL_RGB;
+				dataFormat = GL_RGB;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_RGB5:
+				internalFormat = GL_RGB;
+				dataFormat = GL_RGB;
+				dataType = GL_UNSIGNED_SHORT_5_6_5;
+				break;
+			case GL_RGBA:
+			case GL_RGBA8:
+				internalFormat = GL_RGBA;
+				dataFormat = GL_RGBA;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_RGBA4:
+				internalFormat = GL_RGBA;
+				dataFormat = GL_RGBA;
+				dataType = GL_UNSIGNED_SHORT_4_4_4_4;
+				break;
+			default:
+				ri.Error( ERR_DROP, "Missing OpenGL ES support for image '%s' with internal format 0x%X\n", name, internalFormat );
+		}
+	}
+
 	image->internalFormat = internalFormat;
 
 	// Possibly scale image before uploading.
@@ -2164,7 +2321,6 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 	image->uploadHeight = height;
 
 	// Allocate texture storage so we don't have to worry about it later.
-	dataFormat = PixelDataFormatFromInternalFormat(internalFormat);
 	mipWidth = width;
 	mipHeight = height;
 	miplevel = 0;
@@ -2176,11 +2332,11 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 			int i;
 
 			for (i = 0; i < 6; i++)
-				qglTextureImage2DEXT(image->texnum, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, GL_UNSIGNED_BYTE, NULL);
+				qglTextureImage2DEXT(image->texnum, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, dataType, NULL);
 		}
 		else
 		{
-			qglTextureImage2DEXT(image->texnum, GL_TEXTURE_2D, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, GL_UNSIGNED_BYTE, NULL);
+			qglTextureImage2DEXT(image->texnum, GL_TEXTURE_2D, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, dataType, NULL);
 		}
 
 		mipWidth  = MAX(1, mipWidth >> 1);
@@ -2191,7 +2347,7 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 
 	// Upload data.
 	if (pic)
-		Upload32(pic, 0, 0, width, height, picFormat, numMips, image, scaled);
+		Upload32(pic, 0, 0, width, height, picFormat, dataFormat, dataType, numMips, image, scaled);
 
 	if (resampledBuffer != NULL)
 		ri.Hunk_FreeTempMemory(resampledBuffer);
@@ -2252,7 +2408,13 @@ image_t *R_CreateImage(const char *name, byte *pic, int width, int height, imgTy
 
 void R_UpdateSubImage( image_t *image, byte *pic, int x, int y, int width, int height, GLenum picFormat )
 {
-	Upload32(pic, x, y, width, height, picFormat, 0, image, qfalse);
+	GLenum dataFormat, dataType;
+
+	// TODO: This is fine for lightmaps but (unused) general RGBA images need to store dataFormat / dataType in image_t for OpenGL ES?
+	dataFormat = PixelDataFormatFromInternalFormat(image->internalFormat);
+	dataType = picFormat == GL_RGBA16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+
+	Upload32(pic, x, y, width, height, picFormat, dataFormat, dataType, 0, image, qfalse);
 }
 
 //===================================================================
@@ -2766,7 +2928,7 @@ void R_CreateBuiltinImages( void ) {
 
 		tr.renderImage = R_CreateImage("_render", NULL, width, height, IMGTYPE_COLORALPHA, IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, hdrFormat);
 
-		if (r_shadowBlur->integer)
+		if (r_shadowBlur->integer || r_hdr->integer)
 			tr.screenScratchImage = R_CreateImage("screenScratch", NULL, width, height, IMGTYPE_COLORALPHA, IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, rgbFormat);
 
 		if (r_shadowBlur->integer || r_ssao->integer)
@@ -3227,32 +3389,3 @@ void	R_SkinList_f( void ) {
 }
 
 
-
-/*
-================
-R_ImageExists
-================
-*/
-qboolean R_ImageExists(const char* name) {
-    image_t* image;
-    long int hash;
-
-    if (name)
-    {
-        hash = generateHashValue(name);
-        image = hashTable[hash];
-
-        if (hash)
-        {
-            for (; image != NULL; image = image->next)
-            {
-                if (!strcmp(name, image->imgName)) {
-                    return qtrue;
-                }
-            }
-        }
-    }
-
-    return qfalse;
-}
-
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 64aa1c4c..12bac4b0 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -279,8 +279,16 @@ static void InitOpenGL( void )
 		qglGetIntegerv( GL_MAX_TEXTURE_IMAGE_UNITS, &temp );
 		glConfig.numTextureUnits = temp;
 
+		qglGetIntegerv( GL_MAX_VERTEX_ATTRIBS, &temp );
+		glRefConfig.maxVertexAttribs = temp;
+
 		// reserve 160 components for other uniforms
-		qglGetIntegerv( GL_MAX_VERTEX_UNIFORM_COMPONENTS, &temp );
+		if ( qglesMajorVersion ) {
+			qglGetIntegerv( GL_MAX_VERTEX_UNIFORM_VECTORS, &temp );
+			temp *= 4;
+		} else {
+			qglGetIntegerv( GL_MAX_VERTEX_UNIFORM_COMPONENTS, &temp );
+		}
 		glRefConfig.glslMaxAnimatedBones = Com_Clamp( 0, IQM_MAX_JOINTS, ( temp - 160 ) / 16 );
 		if ( glRefConfig.glslMaxAnimatedBones < 12 ) {
 			glRefConfig.glslMaxAnimatedBones = 0;
@@ -451,21 +459,43 @@ Return value must be freed with ri.Hunk_FreeTempMemory()
 byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *padlen)
 {
 	byte *buffer, *bufstart;
-	int padwidth, linelen;
-	GLint packAlign;
-	
+	int padwidth, linelen, bytesPerPixel;
+	int yin, xin, xout;
+	GLint packAlign, format;
+
+	// OpenGL ES is only required to support reading GL_RGBA
+	if (qglesMajorVersion >= 1) {
+		format = GL_RGBA;
+		bytesPerPixel = 4;
+	} else {
+		format = GL_RGB;
+		bytesPerPixel = 3;
+	}
+
 	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
-	
-	linelen = width * 3;
+
+	linelen = width * bytesPerPixel;
 	padwidth = PAD(linelen, packAlign);
-	
+
 	// Allocate a few more bytes so that we can choose an alignment we like
 	buffer = ri.Hunk_AllocateTempMemory(padwidth * height + *offset + packAlign - 1);
-	
-	bufstart = PADP((intptr_t) buffer + *offset, packAlign);
 
-	qglReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart);
-	
+	bufstart = PADP((intptr_t) buffer + *offset, packAlign);
+	qglReadPixels(x, y, width, height, format, GL_UNSIGNED_BYTE, bufstart);
+
+	linelen = width * 3;
+
+	// Convert RGBA to RGB, in place, line by line
+	if (format == GL_RGBA) {
+		for (yin = 0; yin < height; yin++) {
+			for (xin = 0, xout = 0; xout < linelen; xin += 4, xout += 3) {
+				bufstart[yin*padwidth + xout + 0] = bufstart[yin*padwidth + xin + 0];
+				bufstart[yin*padwidth + xout + 1] = bufstart[yin*padwidth + xin + 1];
+				bufstart[yin*padwidth + xout + 2] = bufstart[yin*padwidth + xin + 2];
+			}
+		}
+	}
+
 	*offset = bufstart - buffer;
 	*padlen = padwidth - linelen;
 	
@@ -877,9 +907,10 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 {
 	const videoFrameCommand_t	*cmd;
 	byte				*cBuf;
-	size_t				memcount, linelen;
+	size_t				memcount, bytesPerPixel, linelen, avilinelen;
 	int				padwidth, avipadwidth, padlen, avipadlen;
-	GLint packAlign;
+	int				yin, xin, xout;
+	GLint packAlign, format;
 
 	// finish any 2D drawing if needed
 	if(tess.numIndexes)
@@ -887,20 +918,32 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 
 	cmd = (const videoFrameCommand_t *)data;
 	
+	// OpenGL ES is only required to support reading GL_RGBA
+	if (qglesMajorVersion >= 1) {
+		format = GL_RGBA;
+		bytesPerPixel = 4;
+	} else {
+		format = GL_RGB;
+		bytesPerPixel = 3;
+	}
+
 	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
 
-	linelen = cmd->width * 3;
+	linelen = cmd->width * bytesPerPixel;
 
 	// Alignment stuff for glReadPixels
 	padwidth = PAD(linelen, packAlign);
 	padlen = padwidth - linelen;
+
+	avilinelen = cmd->width * 3;
+
 	// AVI line padding
-	avipadwidth = PAD(linelen, AVI_LINE_PADDING);
-	avipadlen = avipadwidth - linelen;
+	avipadwidth = PAD(avilinelen, AVI_LINE_PADDING);
+	avipadlen = avipadwidth - avilinelen;
 
 	cBuf = PADP(cmd->captureBuffer, packAlign);
 		
-	qglReadPixels(0, 0, cmd->width, cmd->height, GL_RGB,
+	qglReadPixels(0, 0, cmd->width, cmd->height, format,
 		GL_UNSIGNED_BYTE, cBuf);
 
 	memcount = padwidth * cmd->height;
@@ -911,7 +954,21 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 
 	if(cmd->motionJpeg)
 	{
-		memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, linelen * cmd->height,
+		// Convert RGBA to RGB, in place, line by line
+		if (format == GL_RGBA) {
+			linelen = cmd->width * 3;
+			padlen = padwidth - linelen;
+
+			for (yin = 0; yin < cmd->height; yin++) {
+				for (xin = 0, xout = 0; xout < linelen; xin += 4, xout += 3) {
+					cBuf[yin*padwidth + xout + 0] = cBuf[yin*padwidth + xin + 0];
+					cBuf[yin*padwidth + xout + 1] = cBuf[yin*padwidth + xin + 1];
+					cBuf[yin*padwidth + xout + 2] = cBuf[yin*padwidth + xin + 2];
+				}
+			}
+		}
+
+		memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, avilinelen * cmd->height,
 			r_aviMotionJpegQuality->integer,
 			cmd->width, cmd->height, cBuf, padlen);
 		ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, memcount);
@@ -934,7 +991,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 				*destptr++ = srcptr[2];
 				*destptr++ = srcptr[1];
 				*destptr++ = srcptr[0];
-				srcptr += 3;
+				srcptr += bytesPerPixel;
 			}
 			
 			Com_Memset(destptr, '\0', avipadlen);
@@ -1308,8 +1365,15 @@ void R_Register( void )
 	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
 	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
 	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE );
+#ifdef __EMSCRIPTEN__
+	// Under Emscripten we don't throttle framerate with com_maxfps by default, so enable
+	// vsync by default instead.
+	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "1",
+					CVAR_ARCHIVE | CVAR_LATCH );
+#else
 	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0",
 					CVAR_ARCHIVE | CVAR_LATCH );
+#endif
 	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
 	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
 
@@ -1425,8 +1489,8 @@ void R_Init( void ) {
 	Com_Memset( &backEnd, 0, sizeof( backEnd ) );
 	Com_Memset( &tess, 0, sizeof( tess ) );
 
-	//if(sizeof(glconfig_t) != 11332)
-	//	ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t) == %u != 11332", (unsigned int) sizeof(glconfig_t));
+	if(sizeof(glconfig_t) != 11332)
+		ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t) == %u != 11332", (unsigned int) sizeof(glconfig_t));
 
 //	Swap_Init();
 
@@ -1644,7 +1708,5 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 
 	re.TakeVideoFrame = RE_TakeVideoFrame;
 
-	GetRefAPI_new(rimp, &re);
-
 	return &re;
 }
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index fa451e27..9f46866f 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -36,11 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../renderercommon/iqm.h"
 #include "../renderercommon/qgl.h"
 
-#ifdef __cplusplus
-#define GLE(ret, name, ...) extern "C" name##proc * qgl##name;
-#else
 #define GLE(ret, name, ...) extern name##proc * qgl##name;
-#endif
 QGL_1_1_PROCS;
 QGL_DESKTOP_1_1_PROCS;
 QGL_1_3_PROCS;
@@ -51,16 +47,12 @@ QGL_ARB_occlusion_query_PROCS;
 QGL_ARB_framebuffer_object_PROCS;
 QGL_ARB_vertex_array_object_PROCS;
 QGL_EXT_direct_state_access_PROCS;
-
-//
-// non-ioq3
-//
-//QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
-//QGL_1_1_FIXED_FUNCTION_PROCS;
 #undef GLE
 
-#define GL_INDEX_TYPE		GL_UNSIGNED_INT
-typedef unsigned int glIndex_t;
+#define GL_INDEX_TYPE		GL_UNSIGNED_SHORT
+typedef unsigned short glIndex_t;
+
+typedef unsigned int vaoCacheGlIndex_t;
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
@@ -78,13 +70,6 @@ typedef unsigned int glIndex_t;
 #define MAX_DRAWN_PSHADOWS    16 // do not increase past 32, because bit flags are used on surfaces
 #define PSHADOW_MAP_SIZE      512
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "new/tr_local_begin.h"
-
 typedef struct cubemap_s {
 	char name[MAX_QPATH];
 	vec3_t origin;
@@ -258,20 +243,7 @@ typedef enum {
 	AGEN_LIGHTING_SPECULAR,
 	AGEN_WAVEFORM,
 	AGEN_PORTAL,
-    AGEN_CONST,
-
-	//
-	// non-ioq3
-	//
-    AGEN_GLOBAL_ALPHA,
-    AGEN_SKYALPHA,
-    AGEN_ONE_MINUS_SKYALPHA,
-    AGEN_SCOORD,
-    AGEN_TCOORD,
-    AGEN_DIST_FADE,
-    AGEN_ONE_MINUS_DIST_FADE,
-    AGEN_DOT_VIEW,
-    AGEN_ONE_MINUS_DOT_VIEW,
+	AGEN_CONST,
 } alphaGen_t;
 
 typedef enum {
@@ -288,21 +260,7 @@ typedef enum {
 	CGEN_WAVEFORM,			// programmatically generated
 	CGEN_LIGHTING_DIFFUSE,
 	CGEN_FOG,				// standard fog
-    CGEN_CONST,				// fixed color
-	//
-	// non-ioq3 values
-	//
-    CGEN_CONSTANT = CGEN_CONST,
-    CGEN_MULTIPLY_BY_WAVEFORM,
-    CGEN_LIGHTING_GRID,
-    CGEN_LIGHTING_SPHERICAL,
-    CGEN_NOISE,
-    CGEN_GLOBAL_COLOR,
-    CGEN_STATIC,
-    CGEN_SCOORD,
-    CGEN_TCOORD,
-    CGEN_DOT,
-    CGEN_ONE_MINUS_DOT
+	CGEN_CONST				// fixed color
 } colorGen_t;
 
 typedef enum {
@@ -534,11 +492,6 @@ typedef struct shader_s {
   struct shader_s *remappedShader;                  // current shader this one is remapped too
 
 	struct	shader_s	*next;
-
-	//
-	// non-ioq3
-    //
-    spriteParms_t sprite;
 } shader_t;
 
 enum
@@ -686,8 +639,14 @@ typedef enum
 
 	UNIFORM_ENABLETEXTURES,
 
-	UNIFORM_DIFFUSETEXMATRIX,
-	UNIFORM_DIFFUSETEXOFFTURB,
+	UNIFORM_DIFFUSETEXMATRIX0,
+	UNIFORM_DIFFUSETEXMATRIX1,
+	UNIFORM_DIFFUSETEXMATRIX2,
+	UNIFORM_DIFFUSETEXMATRIX3,
+	UNIFORM_DIFFUSETEXMATRIX4,
+	UNIFORM_DIFFUSETEXMATRIX5,
+	UNIFORM_DIFFUSETEXMATRIX6,
+	UNIFORM_DIFFUSETEXMATRIX7,
 
 	UNIFORM_TCGEN0,
 	UNIFORM_TCGEN0VECTOR0,
@@ -914,20 +873,6 @@ typedef enum {
 	SF_VAO_MDVMESH,
 	SF_VAO_IQM,
 
-	//
-	// non-ioq3 stuff
-	//
-    SF_MARK_FRAG,
-	SF_DISPLAY_LIST,
-    SF_TIKI_SKEL,
-    SF_TIKI_STATIC,
-    SF_SWIPE,
-    SF_SPRITE,
-    SF_TERRAIN_PATCH,
-
-	//
-	//
-	//
 	SF_NUM_SURFACE_TYPES,
 	SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
 } surfaceType_t;
@@ -1333,12 +1278,7 @@ typedef enum {
 	MOD_BRUSH,
 	MOD_MESH,
 	MOD_MDR,
-    MOD_IQM,
-	//
-	// non-ioq3
-	//
-    MOD_TIKI,
-    MOD_SPRITE
+	MOD_IQM
 } modtype_t;
 
 typedef struct model_s {
@@ -1351,17 +1291,7 @@ typedef struct model_s {
 	mdvModel_t	*mdv[MD3_MAX_LODS];	// only if type == MOD_MESH
 	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM)
 
-    int			 numLods;
-
-	//
-	// non-ioq3
-	//
-    qboolean serveronly;
-    union {
-        bmodel_t* bmodel;
-        dtiki_t* tiki;
-        sprite_t* sprite;
-    } d;
+	int			 numLods;
 } model_t;
 
 
@@ -1478,6 +1408,7 @@ typedef struct {
 	qboolean    intelGraphics;
 
 	qboolean	occlusionQuery;
+	GLenum		occlusionQueryTarget;
 
 	int glslMajorVersion;
 	int glslMinorVersion;
@@ -1501,6 +1432,18 @@ typedef struct {
 
 	qboolean vertexArrayObject;
 	qboolean directStateAccess;
+
+	int maxVertexAttribs;
+	qboolean gpuVertexAnimation;
+
+	GLenum vaoCacheGlIndexType; // GL_UNSIGNED_INT or GL_UNSIGNED_SHORT
+	size_t vaoCacheGlIndexSize; // must be <= sizeof( vaoCacheGlIndex_t )
+
+	// OpenGL ES extensions
+	qboolean readDepth;
+	qboolean readStencil;
+	qboolean shadowSamplers;
+	qboolean standardDerivatives;
 } glRefConfig_t;
 
 
@@ -1550,13 +1493,7 @@ typedef struct {
 
 	FBO_t *last2DFBO;
 	qboolean    colorMask[4];
-	qboolean    framePostProcessed;
 	qboolean    depthFill;
-
-	//
-	// non-ioq3
-    //
-	int dsStreamVert;
 } backEndState_t;
 
 /*
@@ -1739,16 +1676,7 @@ typedef struct {
 	float					triangleTable[FUNCTABLE_SIZE];
 	float					sawToothTable[FUNCTABLE_SIZE];
 	float					inverseSawToothTable[FUNCTABLE_SIZE];
-    float					fogTable[FOG_TABLE_SIZE];
-
-    spherel_t				sSunLight;
-    spherel_t				sLights[1532];
-    int						numSLights;
-    int						rendererhandle;
-    qboolean				shadersParsed;
-    int						frame_skel_index;
-    int						skel_index[1024];
-    fontheader_t			*pFontDebugStrings;
+	float					fogTable[FOG_TABLE_SIZE];
 } trGlobals_t;
 
 extern backEndState_t	backEnd;
@@ -2082,6 +2010,7 @@ const void *RB_TakeVideoFrameCmd( const void *data );
 // tr_shader.c
 //
 shader_t	*R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage );
+shader_t	*R_FindShaderEx( const char *name, int lightmapIndex, qboolean mipRawImage, int realLightmapIndex );
 shader_t	*R_GetShaderByHandle( qhandle_t hShader );
 shader_t	*R_GetShaderByState( int index, long *cycleTime );
 shader_t *R_FindShaderByName( const char *name );
@@ -2299,6 +2228,7 @@ void            R_VaoList_f(void);
 void            RB_UpdateTessVao(unsigned int attribBits);
 
 void VaoCache_Commit(void);
+void VaoCache_DrawElements(int numIndexes, int firstIndex);
 void VaoCache_Init(void);
 void VaoCache_BindVao(void);
 void VaoCache_CheckAdd(qboolean *endSurface, qboolean *recycleVertexBuffer, qboolean *recycleIndexBuffer, int numVerts, int numIndexes);
@@ -2588,10 +2518,7 @@ size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, int quality,
 void RE_TakeVideoFrame( int width, int height,
 		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg );
 
-#include "new/tr_local.h"
+void R_ConvertTextureFormat( const byte *in, int width, int height, GLenum format, GLenum type, byte *out );
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif //TR_LOCAL_H
diff --git a/code/renderergl2/tr_mesh.c b/code/renderergl2/tr_mesh.c
index 4f2c6724..222b06d0 100644
--- a/code/renderergl2/tr_mesh.c
+++ b/code/renderergl2/tr_mesh.c
@@ -282,9 +282,10 @@ R_AddMD3Surfaces
 */
 void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 	int				i;
-	mdvModel_t		*model = NULL;
-	mdvSurface_t	*surface = NULL;
-	shader_t		*shader = NULL;
+	mdvModel_t		*model;
+	mdvSurface_t	*surface;
+	void			*drawSurf;
+	shader_t		*shader;
 	int				cull;
 	int				lod;
 	int				fogNum;
@@ -382,6 +383,12 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 			shader = tr.shaders[ surface->shaderIndexes[ ent->e.skinNum % surface->numShaderIndexes ] ];
 		}
 
+		if ( model->numVaoSurfaces > 0 ) {
+			drawSurf = &model->vaoSurfaces[i];
+		} else {
+			drawSurf = surface;
+		}
+
 		// we will add shadows even if the main object isn't visible in the view
 
 		// stencil shadows can't do personal models unless I polyhedron clip
@@ -390,7 +397,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 			&& fogNum == 0
 			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
 			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)&model->vaoSurfaces[i], tr.shadowShader, 0, qfalse, qfalse, 0 );
+			R_AddDrawSurf( drawSurf, tr.shadowShader, 0, qfalse, qfalse, 0 );
 		}
 
 		// projection shadows work fine with personal models
@@ -398,12 +405,12 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 			&& fogNum == 0
 			&& (ent->e.renderfx & RF_SHADOW_PLANE )
 			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)&model->vaoSurfaces[i], tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
+			R_AddDrawSurf( drawSurf, tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
 		}
 
 		// don't add third_person objects if not viewing through a portal
 		if ( !personalModel ) {
-			R_AddDrawSurf((void *)&model->vaoSurfaces[i], shader, fogNum, qfalse, qfalse, cubemapIndex );
+			R_AddDrawSurf( drawSurf, shader, fogNum, qfalse, qfalse, cubemapIndex );
 		}
 
 		surface++;
diff --git a/code/renderergl2/tr_model.c b/code/renderergl2/tr_model.c
index 0fdf60d8..7201be1b 100644
--- a/code/renderergl2/tr_model.c
+++ b/code/renderergl2/tr_model.c
@@ -664,6 +664,12 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
 		surf++;
 	}
 
+	if (mdvModel->numFrames > 1 && !glRefConfig.gpuVertexAnimation)
+	{
+		mdvModel->numVaoSurfaces = 0;
+		mdvModel->vaoSurfaces = NULL;
+	}
+	else
 	{
 		srfVaoMdvMesh_t *vaoSurf;
 
diff --git a/code/renderergl2/tr_postprocess.c b/code/renderergl2/tr_postprocess.c
index 9931757b..ff9a25a1 100644
--- a/code/renderergl2/tr_postprocess.c
+++ b/code/renderergl2/tr_postprocess.c
@@ -290,6 +290,8 @@ static qboolean RB_UpdateSunFlareVis(void)
 		ri.Printf(PRINT_DEVELOPER, "Waited %d iterations\n", iter);
 	}
 	
+	// Note: On desktop OpenGL this is a sample count (glRefConfig.occlusionQueryTarget == GL_SAMPLES_PASSED)
+	// but on OpenGL ES this is a boolean (glRefConfig.occlusionQueryTarget == GL_ANY_SAMPLES_PASSED)
 	qglGetQueryObjectuiv(tr.sunFlareQuery[tr.sunFlareQueryIndex], GL_QUERY_RESULT, &sampleCount);
 	return sampleCount > 0;
 }
@@ -447,7 +449,7 @@ static void RB_VBlur(FBO_t *srcFbo, FBO_t *dstFbo, float strength)
 	RB_BlurAxis(srcFbo, dstFbo, strength, qfalse);
 }
 
-void RB_GaussianBlur(float blur)
+void RB_GaussianBlur(FBO_t *srcFbo, FBO_t *dstFbo, float blur)
 {
 	//float mul = 1.f;
 	float factor = Com_Clamp(0.f, 1.f, blur);
@@ -462,7 +464,7 @@ void RB_GaussianBlur(float blur)
 		VectorSet4(color, 1, 1, 1, 1);
 
 		// first, downsample the framebuffer
-		FBO_FastBlit(NULL, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+		FBO_FastBlit(srcFbo, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 		FBO_FastBlit(tr.quarterFbo[0], NULL, tr.textureScratchFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
 		// set the alpha channel
@@ -478,6 +480,6 @@ void RB_GaussianBlur(float blur)
 		VectorSet4(srcBox, 0, 0, tr.textureScratchFbo[0]->width, tr.textureScratchFbo[0]->height);
 		VectorSet4(dstBox, 0, 0, glConfig.vidWidth,              glConfig.vidHeight);
 		color[3] = factor;
-		FBO_Blit(tr.textureScratchFbo[0], srcBox, NULL, NULL, dstBox, NULL, color, GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
+		FBO_Blit(tr.textureScratchFbo[0], srcBox, NULL, dstFbo, dstBox, NULL, color, GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
 	}
 }
diff --git a/code/renderergl2/tr_postprocess.h b/code/renderergl2/tr_postprocess.h
index 09daf134..a2d6d0b3 100644
--- a/code/renderergl2/tr_postprocess.h
+++ b/code/renderergl2/tr_postprocess.h
@@ -28,6 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 void RB_ToneMap(FBO_t *hdrFbo, ivec4_t hdrBox, FBO_t *ldrFbo, ivec4_t ldrBox, int autoExposure);
 void RB_BokehBlur(FBO_t *src, ivec4_t srcBox, FBO_t *dst, ivec4_t dstBox, float blur);
 void RB_SunRays(FBO_t *srcFbo, ivec4_t srcBox, FBO_t *dstFbo, ivec4_t dstBox);
-void RB_GaussianBlur(float blur);
+void RB_GaussianBlur(FBO_t *srcFbo, FBO_t *dstFbo, float blur);
 
 #endif
diff --git a/code/renderergl2/tr_shade.c b/code/renderergl2/tr_shade.c
index 1395c905..dec35e52 100644
--- a/code/renderergl2/tr_shade.c
+++ b/code/renderergl2/tr_shade.c
@@ -40,7 +40,14 @@ R_DrawElements
 
 void R_DrawElements( int numIndexes, int firstIndex )
 {
-	qglDrawElements(GL_TRIANGLES, numIndexes, GL_INDEX_TYPE, BUFFER_OFFSET(firstIndex * sizeof(glIndex_t)));
+	if (tess.useCacheVao)
+	{
+		VaoCache_DrawElements(numIndexes, firstIndex);
+	}
+	else
+	{
+		qglDrawElements(GL_TRIANGLES, numIndexes, GL_INDEX_TYPE, BUFFER_OFFSET(firstIndex * sizeof(glIndex_t)));
+	}
 }
 
 
@@ -181,33 +188,30 @@ extern float EvalWaveForm( const waveForm_t *wf );
 extern float EvalWaveFormClamped( const waveForm_t *wf );
 
 
-static void ComputeTexMods( shaderStage_t *pStage, int bundleNum, float *outMatrix, float *outOffTurb)
+static void ComputeTexMods( shaderStage_t *pStage, int bundleNum, vec4_t outMatrix[8])
 {
 	int tm;
-	float matrix[6], currentmatrix[6];
+	float matrix[6];
+	float tmpmatrix[6];
+	float currentmatrix[6];
+	float turb[2];
 	textureBundle_t *bundle = &pStage->bundle[bundleNum];
-
-	matrix[0] = 1.0f; matrix[2] = 0.0f; matrix[4] = 0.0f;
-	matrix[1] = 0.0f; matrix[3] = 1.0f; matrix[5] = 0.0f;
+	qboolean hasTurb = qfalse;
 
 	currentmatrix[0] = 1.0f; currentmatrix[2] = 0.0f; currentmatrix[4] = 0.0f;
 	currentmatrix[1] = 0.0f; currentmatrix[3] = 1.0f; currentmatrix[5] = 0.0f;
 
-	outMatrix[0] = 1.0f; outMatrix[2] = 0.0f;
-	outMatrix[1] = 0.0f; outMatrix[3] = 1.0f;
-
-	outOffTurb[0] = 0.0f; outOffTurb[1] = 0.0f; outOffTurb[2] = 0.0f; outOffTurb[3] = 0.0f;
-
 	for ( tm = 0; tm < bundle->numTexMods ; tm++ ) {
 		switch ( bundle->texMods[tm].type )
 		{
 			
 		case TMOD_NONE:
-			tm = TR_MAX_TEXMODS;		// break out of for loop
+			matrix[0] = 1.0f; matrix[2] = 0.0f; matrix[4] = 0.0f;
+			matrix[1] = 0.0f; matrix[3] = 1.0f; matrix[5] = 0.0f;
 			break;
 
 		case TMOD_TURBULENT:
-			RB_CalcTurbulentFactors(&bundle->texMods[tm].wave, &outOffTurb[2], &outOffTurb[3]);
+			RB_CalcTurbulentFactors(&bundle->texMods[tm].wave, &turb[0], &turb[1]);
 			break;
 
 		case TMOD_ENTITY_TRANSLATE:
@@ -246,35 +250,68 @@ static void ComputeTexMods( shaderStage_t *pStage, int bundleNum, float *outMatr
 
 		switch ( bundle->texMods[tm].type )
 		{	
-		case TMOD_NONE:
 		case TMOD_TURBULENT:
-		default:
+			outMatrix[tm*2+0][0] = 1; outMatrix[tm*2+0][1] = 0; outMatrix[tm*2+0][2] = 0;
+			outMatrix[tm*2+1][0] = 0; outMatrix[tm*2+1][1] = 1; outMatrix[tm*2+1][2] = 0;
+
+			outMatrix[tm*2+0][3] = turb[0];
+			outMatrix[tm*2+1][3] = turb[1];
+
+			hasTurb = qtrue;
 			break;
 
+		case TMOD_NONE:
 		case TMOD_ENTITY_TRANSLATE:
 		case TMOD_SCROLL:
 		case TMOD_SCALE:
 		case TMOD_STRETCH:
 		case TMOD_TRANSFORM:
 		case TMOD_ROTATE:
-			outMatrix[0] = matrix[0] * currentmatrix[0] + matrix[2] * currentmatrix[1];
-			outMatrix[1] = matrix[1] * currentmatrix[0] + matrix[3] * currentmatrix[1];
+		default:
+			outMatrix[tm*2+0][0] = matrix[0]; outMatrix[tm*2+0][1] = matrix[2]; outMatrix[tm*2+0][2] = matrix[4];
+			outMatrix[tm*2+1][0] = matrix[1]; outMatrix[tm*2+1][1] = matrix[3]; outMatrix[tm*2+1][2] = matrix[5];
 
-			outMatrix[2] = matrix[0] * currentmatrix[2] + matrix[2] * currentmatrix[3];
-			outMatrix[3] = matrix[1] * currentmatrix[2] + matrix[3] * currentmatrix[3];
+			outMatrix[tm*2+0][3] = 0;
+			outMatrix[tm*2+1][3] = 0;
 
-			outOffTurb[0] = matrix[0] * currentmatrix[4] + matrix[2] * currentmatrix[5] + matrix[4];
-			outOffTurb[1] = matrix[1] * currentmatrix[4] + matrix[3] * currentmatrix[5] + matrix[5];
+			tmpmatrix[0] = matrix[0] * currentmatrix[0] + matrix[2] * currentmatrix[1];
+			tmpmatrix[1] = matrix[1] * currentmatrix[0] + matrix[3] * currentmatrix[1];
 
-			currentmatrix[0] = outMatrix[0];
-			currentmatrix[1] = outMatrix[1];
-			currentmatrix[2] = outMatrix[2];
-			currentmatrix[3] = outMatrix[3];
-			currentmatrix[4] = outOffTurb[0];
-			currentmatrix[5] = outOffTurb[1];
+			tmpmatrix[2] = matrix[0] * currentmatrix[2] + matrix[2] * currentmatrix[3];
+			tmpmatrix[3] = matrix[1] * currentmatrix[2] + matrix[3] * currentmatrix[3];
+
+			tmpmatrix[4] = matrix[0] * currentmatrix[4] + matrix[2] * currentmatrix[5] + matrix[4];
+			tmpmatrix[5] = matrix[1] * currentmatrix[4] + matrix[3] * currentmatrix[5] + matrix[5];
+
+			currentmatrix[0] = tmpmatrix[0];
+			currentmatrix[1] = tmpmatrix[1];
+			currentmatrix[2] = tmpmatrix[2];
+			currentmatrix[3] = tmpmatrix[3];
+			currentmatrix[4] = tmpmatrix[4];
+			currentmatrix[5] = tmpmatrix[5];
 			break;
 		}
 	}
+
+	// if turb isn't used, only one matrix is needed
+	if ( !hasTurb ) {
+		tm = 0;
+
+		outMatrix[tm*2+0][0] = currentmatrix[0]; outMatrix[tm*2+0][1] = currentmatrix[2]; outMatrix[tm*2+0][2] = currentmatrix[4];
+		outMatrix[tm*2+1][0] = currentmatrix[1]; outMatrix[tm*2+1][1] = currentmatrix[3]; outMatrix[tm*2+1][2] = currentmatrix[5];
+
+		outMatrix[tm*2+0][3] = 0;
+		outMatrix[tm*2+1][3] = 0;
+		tm++;
+	}
+
+	for ( ; tm < TR_MAX_TEXMODS ; tm++ ) {
+		outMatrix[tm*2+0][0] = 1; outMatrix[tm*2+0][1] = 0; outMatrix[tm*2+0][2] = 0;
+		outMatrix[tm*2+1][0] = 0; outMatrix[tm*2+1][1] = 1; outMatrix[tm*2+1][2] = 0;
+
+		outMatrix[tm*2+0][3] = 0;
+		outMatrix[tm*2+1][3] = 0;
+	}
 }
 
 
@@ -500,10 +537,7 @@ static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, vec4_t
 			baseColor[0] =
 			baseColor[1] =
 			baseColor[2] = overbright;
-            break;
-        case CGEN_GLOBAL_COLOR:
-            RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D);
-            break;
+			break;
 		case CGEN_IDENTITY_LIGHTING:
 		case CGEN_BAD:
 			break;
@@ -668,8 +702,7 @@ static void ForwardDlight( void ) {
 		dlight_t	*dl;
 		shaderProgram_t *sp;
 		vec4_t vector;
-		vec4_t texMatrix;
-		vec4_t texOffTurb;
+		vec4_t texMatrix[8];
 
 		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
 			continue;	// this surface definitely doesn't have any of this light
@@ -795,9 +828,15 @@ static void ForwardDlight( void ) {
 		if (r_dlightMode->integer >= 2)
 			GL_BindToTMU(tr.shadowCubemaps[l], TB_SHADOWMAP);
 
-		ComputeTexMods( pStage, TB_DIFFUSEMAP, texMatrix, texOffTurb );
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, texMatrix);
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, texOffTurb);
+		ComputeTexMods( pStage, TB_DIFFUSEMAP, texMatrix );
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, texMatrix[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, texMatrix[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, texMatrix[2]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, texMatrix[3]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, texMatrix[4]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, texMatrix[5]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, texMatrix[6]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, texMatrix[7]);
 
 		GLSL_SetUniformInt(sp, UNIFORM_TCGEN0, pStage->bundle[0].tcGen);
 
@@ -999,8 +1038,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 	{
 		shaderStage_t *pStage = input->xstages[stage];
 		shaderProgram_t *sp;
-		vec4_t texMatrix;
-		vec4_t texOffTurb;
+		vec4_t texMatrix[8];
 
 		if ( !pStage )
 		{
@@ -1187,19 +1225,31 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 
 		if (r_lightmap->integer)
 		{
-			vec4_t v;
-			VectorSet4(v, 1.0f, 0.0f, 0.0f, 1.0f);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, v);
-			VectorSet4(v, 0.0f, 0.0f, 0.0f, 0.0f);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, v);
+			vec4_t st[2];
+			VectorSet4(st[0], 1.0f, 0.0f, 0.0f, 0.0f);
+			VectorSet4(st[1], 0.0f, 1.0f, 0.0f, 0.0f);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, st[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, st[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, st[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, st[1]);
 
 			GLSL_SetUniformInt(sp, UNIFORM_TCGEN0, TCGEN_LIGHTMAP);
 		}
 		else
 		{
-			ComputeTexMods(pStage, TB_DIFFUSEMAP, texMatrix, texOffTurb);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, texMatrix);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, texOffTurb);
+			ComputeTexMods(pStage, TB_DIFFUSEMAP, texMatrix);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, texMatrix[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, texMatrix[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, texMatrix[2]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, texMatrix[3]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, texMatrix[4]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, texMatrix[5]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, texMatrix[6]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, texMatrix[7]);
 
 			GLSL_SetUniformInt(sp, UNIFORM_TCGEN0, pStage->bundle[0].tcGen);
 			if (pStage->bundle[0].tcGen == TCGEN_VECTOR)
@@ -1677,6 +1727,8 @@ void RB_EndSurface( void ) {
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
 	tess.firstIndex = 0;
+	tess.useCacheVao = qfalse;
+	tess.useInternalVao = qfalse;
 
 	GLimp_LogComment( "----------\n" );
 }
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index 0cd78a78..b08a9328 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -30,6 +30,7 @@ static char *s_shaderText;
 static	shaderStage_t	stages[MAX_SHADER_STAGES];		
 static	shader_t		shader;
 static	texModInfo_t	texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
+static	int				shader_realLightmapIndex;
 
 #define FILE_HASH_SIZE		1024
 static	shader_t*		hashTable[FILE_HASH_SIZE];
@@ -1841,12 +1842,17 @@ static qboolean ParseShader( char **text )
 				tr.sunShadowScale = atof(token);
 
 				// parse twice, since older shaders may include mapLightScale before sunShadowScale
-				token = COM_ParseExt( text, qfalse );
-				if (token[0])
-					tr.sunShadowScale = atof(token);
+				if (token[0]) {
+					token = COM_ParseExt( text, qfalse );
+					if (token[0]) {
+						tr.sunShadowScale = atof(token);
+					}
+				}
 			}
 
-			SkipRestOfLine( text );
+			if (token[0]) {
+				SkipRestOfLine( text );
+			}
 			continue;
 		}
 		// tonemap parms
@@ -2580,13 +2586,15 @@ static int CollapseStagesToGLSL(void)
 		numStages++;
 	}
 
-	// convert any remaining lightmap stages to a lighting pass with a white texture
+	// convert any remaining lightmap stages with no blending or blendfunc filter
+	// to a lighting pass with a white texture
 	// only do this with r_sunlightMode non-zero, as it's only for correct shadows.
 	if (r_sunlightMode->integer && shader.numDeforms == 0)
 	{
 		for (i = 0; i < MAX_SHADER_STAGES; i++)
 		{
 			shaderStage_t *pStage = &stages[i];
+			int blendBits;
 
 			if (!pStage->active)
 				continue;
@@ -2594,15 +2602,23 @@ static int CollapseStagesToGLSL(void)
 			if (pStage->adjustColorsForFog)
 				continue;
 
-			if (pStage->bundle[TB_DIFFUSEMAP].tcGen == TCGEN_LIGHTMAP)
-			{
-				pStage->glslShaderGroup = tr.lightallShader;
-				pStage->glslShaderIndex = LIGHTDEF_USE_LIGHTMAP;
-				pStage->bundle[TB_LIGHTMAP] = pStage->bundle[TB_DIFFUSEMAP];
-				pStage->bundle[TB_DIFFUSEMAP].image[0] = tr.whiteImage;
-				pStage->bundle[TB_DIFFUSEMAP].isLightmap = qfalse;
-				pStage->bundle[TB_DIFFUSEMAP].tcGen = TCGEN_TEXTURE;
+			if (pStage->bundle[TB_DIFFUSEMAP].tcGen != TCGEN_LIGHTMAP)
+				continue;
+
+			blendBits = pStage->stateBits & (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+
+			if (blendBits != 0 &&
+				blendBits != (GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO) &&
+				blendBits != (GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR)) {
+				continue;
 			}
+
+			pStage->glslShaderGroup = tr.lightallShader;
+			pStage->glslShaderIndex = LIGHTDEF_USE_LIGHTMAP;
+			pStage->bundle[TB_LIGHTMAP] = pStage->bundle[TB_DIFFUSEMAP];
+			pStage->bundle[TB_DIFFUSEMAP].image[0] = tr.whiteImage;
+			pStage->bundle[TB_DIFFUSEMAP].isLightmap = qfalse;
+			pStage->bundle[TB_DIFFUSEMAP].tcGen = TCGEN_TEXTURE;
 		}
 	}
 
@@ -2890,12 +2906,112 @@ static void VertexLightingCollapse( void ) {
 	}
 }
 
+/*
+=================
+FixFatLightmapTexCoords
+
+Handle edge cases of altering lightmap texcoords for fat lightmap atlas
+=================
+*/
+static void FixFatLightmapTexCoords(void)
+{
+	texModInfo_t *tmi;
+	int lightmapnum;
+	int stage;
+	int size;
+	int i;
+
+	if ( !r_mergeLightmaps->integer || tr.fatLightmapCols <= 0) {
+		return;
+	}
+
+	if ( shader.lightmapIndex < 0 ) {
+		// no internal lightmap, texcoords were not modified
+		return;
+	}
+
+	lightmapnum = shader_realLightmapIndex;
+
+	if (tr.worldDeluxeMapping)
+		lightmapnum >>= 1;
+
+	lightmapnum %= (tr.fatLightmapCols * tr.fatLightmapRows);
+
+	for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
+		shaderStage_t *pStage = &stages[stage];
+
+		if ( !pStage->active ) {
+			break;
+		}
+
+		if ( pStage->bundle[0].isLightmap ) {
+			// fix tcMod transform for internal lightmaps, it may be used by q3map2 lightstyles
+			if ( pStage->bundle[0].tcGen == TCGEN_LIGHTMAP ) {
+				for ( i = 0; i < pStage->bundle[0].numTexMods; i++ ) {
+					tmi = &pStage->bundle[0].texMods[i];
+
+					if ( tmi->type == TMOD_TRANSFORM ) {
+						tmi->translate[0] /= (float)tr.fatLightmapCols;
+						tmi->translate[1] /= (float)tr.fatLightmapRows;
+					}
+				}
+			}
+
+			// fix tcGen environment for internal lightmaps to be limited to the sub-image of the atlas
+			// this is done last so other tcMods are applied first in the 0.0 to 1.0 space
+			if ( pStage->bundle[0].tcGen == TCGEN_ENVIRONMENT_MAPPED ) {
+				if ( pStage->bundle[0].numTexMods == TR_MAX_TEXMODS ) {
+					ri.Printf( PRINT_DEVELOPER, "WARNING: too many tcmods to fix lightmap texcoords for r_mergeLightmaps in shader '%s'", shader.name );
+				} else {
+					tmi = &pStage->bundle[0].texMods[pStage->bundle[0].numTexMods];
+					pStage->bundle[0].numTexMods++;
+
+					tmi->matrix[0][0] = 1.0f / tr.fatLightmapCols;
+					tmi->matrix[0][1] = 0;
+					tmi->matrix[1][0] = 0;
+					tmi->matrix[1][1] = 1.0f / tr.fatLightmapRows;
+
+					tmi->translate[0] = ( lightmapnum % tr.fatLightmapCols ) / (float)tr.fatLightmapCols;
+					tmi->translate[1] = ( lightmapnum / tr.fatLightmapCols ) / (float)tr.fatLightmapRows;
+
+					tmi->type = TMOD_TRANSFORM;
+				}
+			}
+		}
+		// add a tcMod transform for external lightmaps to convert back to the original texcoords
+		else if ( pStage->bundle[0].tcGen == TCGEN_LIGHTMAP ) {
+			if ( pStage->bundle[0].numTexMods == TR_MAX_TEXMODS ) {
+				ri.Printf( PRINT_DEVELOPER, "WARNING: too many tcmods to fix lightmap texcoords for r_mergeLightmaps in shader '%s'", shader.name );
+			} else {
+				size = pStage->bundle[0].numTexMods * sizeof( texModInfo_t );
+
+				if ( size ) {
+					memmove( &pStage->bundle[0].texMods[1], &pStage->bundle[0].texMods[0], size );
+				}
+
+				tmi = &pStage->bundle[0].texMods[0];
+				pStage->bundle[0].numTexMods++;
+
+				tmi->matrix[0][0] = tr.fatLightmapCols;
+				tmi->matrix[0][1] = 0;
+				tmi->matrix[1][0] = 0;
+				tmi->matrix[1][1] = tr.fatLightmapRows;
+
+				tmi->translate[0] = -( lightmapnum % tr.fatLightmapCols );
+				tmi->translate[1] = -( lightmapnum / tr.fatLightmapCols );
+
+				tmi->type = TMOD_TRANSFORM;
+			}
+		}
+	}
+}
+
 /*
 ===============
 InitShader
 ===============
 */
-static void InitShader( const char *name, int lightmapIndex ) {
+static void InitShaderEx( const char *name, int lightmapIndex, int realLightmapIndex ) {
 	int i;
 
 	// clear the global shader
@@ -2904,6 +3020,7 @@ static void InitShader( const char *name, int lightmapIndex ) {
 
 	Q_strncpyz( shader.name, name, sizeof( shader.name ) );
 	shader.lightmapIndex = lightmapIndex;
+	shader_realLightmapIndex = realLightmapIndex;
 
 	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
 		stages[i].bundle[0].texMods = texMods[i];
@@ -2924,6 +3041,10 @@ static void InitShader( const char *name, int lightmapIndex ) {
 	}
 }
 
+static void InitShader( const char *name, int lightmapIndex ) {
+	InitShaderEx( name, lightmapIndex, lightmapIndex );
+}
+
 /*
 =========================
 FinishShader
@@ -3081,6 +3202,8 @@ static shader_t *FinishShader( void ) {
 		hasLightmapStage = qfalse;
 	}
 
+	FixFatLightmapTexCoords();
+
 	//
 	// look for multitexture potential
 	//
@@ -3243,6 +3366,10 @@ most world construction surfaces.
 ===============
 */
 shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage ) {
+	return R_FindShaderEx( name, lightmapIndex, mipRawImage, lightmapIndex );
+}
+
+shader_t *R_FindShaderEx( const char *name, int lightmapIndex, qboolean mipRawImage, int realLightmapIndex ) {
 	char		strippedName[MAX_QPATH];
 	int			hash;
 	char		*shaderText;
@@ -3282,7 +3409,7 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 		}
 	}
 
-	InitShader( strippedName, lightmapIndex );
+	InitShaderEx( strippedName, lightmapIndex, realLightmapIndex );
 
 	//
 	// attempt to define shader from an explicit parameter file
diff --git a/code/renderergl2/tr_sky.c b/code/renderergl2/tr_sky.c
index 94f68d26..c79f48f5 100644
--- a/code/renderergl2/tr_sky.c
+++ b/code/renderergl2/tr_sky.c
@@ -435,7 +435,7 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max
 */
 	{
 		shaderProgram_t *sp = &tr.lightallShader[0];
-		vec4_t vector;
+		vec4_t st[2];
 
 		GLSL_BindProgram(sp);
 		
@@ -453,11 +453,16 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max
 		color[3] = 0.0f;
 		GLSL_SetUniformVec4(sp, UNIFORM_VERTCOLOR, color);
 
-		VectorSet4(vector, 1.0, 0.0, 0.0, 1.0);
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, vector);
-
-		VectorSet4(vector, 0.0, 0.0, 0.0, 0.0);
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, vector);
+		VectorSet4(st[0], 1.0f, 0.0f, 0.0f, 0.0f);
+		VectorSet4(st[1], 0.0f, 1.0f, 0.0f, 0.0f);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, st[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, st[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, st[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, st[1]);
 
 		GLSL_SetUniformInt(sp, UNIFORM_ALPHATEST, 0);
 	}
diff --git a/code/renderergl2/tr_vbo.c b/code/renderergl2/tr_vbo.c
index df64f8bc..5094df18 100644
--- a/code/renderergl2/tr_vbo.c
+++ b/code/renderergl2/tr_vbo.c
@@ -676,7 +676,7 @@ static struct
 	srfVert_t vertexes[VAOCACHE_QUEUE_MAX_VERTEXES];
 	int vertexCommitSize;
 
-	glIndex_t indexes[VAOCACHE_QUEUE_MAX_INDEXES];
+	vaoCacheGlIndex_t indexes[VAOCACHE_QUEUE_MAX_INDEXES];
 	int indexCommitSize;
 }
 vcq;
@@ -687,18 +687,13 @@ vcq;
 // srfVert_t is 60 bytes
 // assuming each vert is referenced 4 times, need 16 bytes (4 glIndex_t) per vert
 // -> need about 4/15ths the space for indexes as vertexes
-#if GL_INDEX_TYPE == GL_UNSIGNED_SHORT
-#define VAOCACHE_VERTEX_BUFFER_SIZE (sizeof(srfVert_t) * USHRT_MAX)
-#define VAOCACHE_INDEX_BUFFER_SIZE (sizeof(glIndex_t) * USHRT_MAX * 4)
-#else // GL_UNSIGNED_INT
 #define VAOCACHE_VERTEX_BUFFER_SIZE (16 * 1024 * 1024)
 #define VAOCACHE_INDEX_BUFFER_SIZE (5 * 1024 * 1024)
-#endif
 
 typedef struct buffered_s
 {
-	void *data;
-	int size;
+	glIndex_t *indexes;
+	int numIndexes;
 	int bufferOffset;
 }
 buffered_t;
@@ -736,7 +731,7 @@ void VaoCache_Commit(void)
 			buffered_t *indexSet2 = indexSet;
 			for (surf = vcq.surfaces; surf < end; surf++, indexSet2++)
 			{
-				if (surf->indexes != indexSet2->data || (surf->numIndexes * sizeof(glIndex_t)) != indexSet2->size)
+				if (surf->indexes != indexSet2->indexes || surf->numIndexes != indexSet2->numIndexes)
 					break;
 			}
 
@@ -750,7 +745,7 @@ void VaoCache_Commit(void)
 	// If found, use it
 	if (indexSet < vc.surfaceIndexSets + vc.numSurfaces)
 	{
-		tess.firstIndex = indexSet->bufferOffset / sizeof(glIndex_t);
+		tess.firstIndex = indexSet->bufferOffset / glRefConfig.vaoCacheGlIndexSize;
 		//ri.Printf(PRINT_ALL, "firstIndex %d numIndexes %d as %d\n", tess.firstIndex, tess.numIndexes, (int)(batchLength - vc.batchLengths));
 		//ri.Printf(PRINT_ALL, "vc.numSurfaces %d vc.numBatches %d\n", vc.numSurfaces, vc.numBatches);
 	}
@@ -759,20 +754,21 @@ void VaoCache_Commit(void)
 	else
 	{
 		srfVert_t *dstVertex = vcq.vertexes;
-		glIndex_t *dstIndex = vcq.indexes;
+		vaoCacheGlIndex_t *dstIndex = vcq.indexes;
+		unsigned short *dstIndexUshort = (unsigned short *)vcq.indexes;
 
 		batchLength = vc.batchLengths + vc.numBatches;
 		*batchLength = vcq.numSurfaces;
 		vc.numBatches++;
 
-		tess.firstIndex = vc.indexOffset / sizeof(glIndex_t);
+		tess.firstIndex = vc.indexOffset / glRefConfig.vaoCacheGlIndexSize;
 		vcq.vertexCommitSize = 0;
 		vcq.indexCommitSize = 0;
 		for (surf = vcq.surfaces; surf < end; surf++)
 		{
 			glIndex_t *srcIndex = surf->indexes;
 			int vertexesSize = surf->numVerts * sizeof(srfVert_t);
-			int indexesSize = surf->numIndexes * sizeof(glIndex_t);
+			int indexesSize = surf->numIndexes * glRefConfig.vaoCacheGlIndexSize;
 			int i, indexOffset = (vc.vertexOffset + vcq.vertexCommitSize) / sizeof(srfVert_t);
 
 			Com_Memcpy(dstVertex, surf->vertexes, vertexesSize);
@@ -781,13 +777,21 @@ void VaoCache_Commit(void)
 			vcq.vertexCommitSize += vertexesSize;
 
 			indexSet = vc.surfaceIndexSets + vc.numSurfaces;
-			indexSet->data = surf->indexes;
-			indexSet->size = indexesSize;
+			indexSet->indexes = surf->indexes;
+			indexSet->numIndexes = surf->numIndexes;
 			indexSet->bufferOffset = vc.indexOffset + vcq.indexCommitSize;
 			vc.numSurfaces++;
 
-			for (i = 0; i < surf->numIndexes; i++)
-				*dstIndex++ = *srcIndex++ + indexOffset;
+			if (glRefConfig.vaoCacheGlIndexType == GL_UNSIGNED_SHORT)
+			{
+				for (i = 0; i < surf->numIndexes; i++)
+					*dstIndexUshort++ = *srcIndex++ + indexOffset;
+			}
+			else
+			{
+				for (i = 0; i < surf->numIndexes; i++)
+					*dstIndex++ = *srcIndex++ + indexOffset;
+			}
 
 			vcq.indexCommitSize += indexesSize;
 		}
@@ -810,9 +814,30 @@ void VaoCache_Commit(void)
 	}
 }
 
+void VaoCache_DrawElements(int numIndexes, int firstIndex)
+{
+	assert( glState.currentVao == vc.vao );
+
+	qglDrawElements(GL_TRIANGLES, numIndexes, glRefConfig.vaoCacheGlIndexType, BUFFER_OFFSET(firstIndex * glRefConfig.vaoCacheGlIndexSize));
+}
+
 void VaoCache_Init(void)
 {
-	vc.vao = R_CreateVao("VaoCache", NULL, VAOCACHE_VERTEX_BUFFER_SIZE, NULL, VAOCACHE_INDEX_BUFFER_SIZE, VAO_USAGE_DYNAMIC);
+	int vertexBufferSize;
+	int indexBufferSize;
+
+	if (glRefConfig.vaoCacheGlIndexType == GL_UNSIGNED_SHORT)
+	{
+		vertexBufferSize = sizeof(srfVert_t) * USHRT_MAX;
+		indexBufferSize = sizeof(unsigned short) * USHRT_MAX * 4;
+	}
+	else
+	{
+		vertexBufferSize = VAOCACHE_VERTEX_BUFFER_SIZE;
+		indexBufferSize = VAOCACHE_INDEX_BUFFER_SIZE;
+	}
+
+	vc.vao = R_CreateVao("VaoCache", NULL, vertexBufferSize, NULL, indexBufferSize, VAO_USAGE_DYNAMIC);
 
 	vc.vao->attribs[ATTR_INDEX_POSITION].enabled       = 1;
 	vc.vao->attribs[ATTR_INDEX_TEXCOORD].enabled       = 1;
@@ -881,7 +906,7 @@ void VaoCache_BindVao(void)
 void VaoCache_CheckAdd(qboolean *endSurface, qboolean *recycleVertexBuffer, qboolean *recycleIndexBuffer, int numVerts, int numIndexes)
 {
 	int vertexesSize = sizeof(srfVert_t) * numVerts;
-	int indexesSize = sizeof(glIndex_t) * numIndexes;
+	int indexesSize = glRefConfig.vaoCacheGlIndexSize * numIndexes;
 
 	if (vc.vao->vertexesSize < vc.vertexOffset + vcq.vertexCommitSize + vertexesSize)
 	{
@@ -924,7 +949,7 @@ void VaoCache_CheckAdd(qboolean *endSurface, qboolean *recycleVertexBuffer, qboo
 		*endSurface = qtrue;
 	}
 
-	if (VAOCACHE_QUEUE_MAX_INDEXES * sizeof(glIndex_t) < vcq.indexCommitSize + indexesSize)
+	if (VAOCACHE_QUEUE_MAX_INDEXES * glRefConfig.vaoCacheGlIndexSize < vcq.indexCommitSize + indexesSize)
 	{
 		//ri.Printf(PRINT_ALL, "out of queued indexes\n");
 		*endSurface = qtrue;
@@ -964,5 +989,5 @@ void VaoCache_AddSurface(srfVert_t *verts, int numVerts, glIndex_t *indexes, int
 	vcq.numSurfaces++;
 
 	vcq.vertexCommitSize += sizeof(srfVert_t) * numVerts;
-	vcq.indexCommitSize += sizeof(glIndex_t) * numIndexes;
+	vcq.indexCommitSize += glRefConfig.vaoCacheGlIndexSize * numIndexes;
 }

From 7e6b0a1c2bfade9a9e6d899648afd034a4a66061 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 16:26:26 +0100
Subject: [PATCH 1578/2040] Remove SMP and render thread code, as they're
 unused

---
 code/cgame/cg_public.h          |   2 +-
 code/renderercommon/tr_common.h |  28 ++-
 code/renderercommon/tr_public.h |   2 +-
 code/renderergl1/tr_backend.c   |  88 ++++++----
 code/renderergl1/tr_bsp.c       |   2 +-
 code/renderergl1/tr_cmds.c      | 300 ++++++++++++++++++++------------
 code/renderergl1/tr_draw.c      |  22 +--
 code/renderergl1/tr_font.cpp    |   4 +-
 code/renderergl1/tr_image.c     |   2 +-
 code/renderergl1/tr_init.c      | 131 ++++++++++----
 code/renderergl1/tr_local.h     |  59 ++++---
 code/renderergl1/tr_main.c      |   4 +-
 code/renderergl1/tr_model.cpp   |   8 +-
 code/renderergl1/tr_scene.c     |  58 +++---
 code/renderergl1/tr_shader.c    |   8 +-
 code/renderergl1/tr_terrain.c   |   6 +-
 16 files changed, 441 insertions(+), 283 deletions(-)

diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index 7d01c86c..9362d5e7 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -317,7 +317,7 @@ functions exported to the main executable
         refEntity_t *(*R_GetRenderEntity)(int entityNumber);
         void (*R_ModelBounds)(clipHandle_t model, vec3_t mins, vec3_t maxs);
         float (*R_ModelRadius)(clipHandle_t model);
-        float (*R_Noise)(float x, float y, float z, float t);
+        float (*R_Noise)(float x, float y, float z, double t);
         void (*R_DebugLine)(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
         baseshader_t *(*GetShader)(int shaderNum);
         // =========== Swipes =============
diff --git a/code/renderercommon/tr_common.h b/code/renderercommon/tr_common.h
index 45744c87..d26ab233 100644
--- a/code/renderercommon/tr_common.h
+++ b/code/renderercommon/tr_common.h
@@ -65,6 +65,16 @@ typedef struct image_s {
 	imgFlags_t  flags;
 
 	struct image_s*	next;
+
+    int			bytesUsed;
+    int			numMipmaps;
+	qboolean	dynamicallyUpdated;
+	qboolean	allowPicmip;
+	qboolean	force32bit;
+    int			wrapClampModeX;
+    int			wrapClampModeY;
+	int			r_sequence;
+	int			UseCount;
 } image_t;
 
 // any change in the LIGHTMAP_* defines here MUST be reflected in
@@ -124,8 +134,22 @@ qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode )
 float R_NoiseGet4f( float x, float y, float z, double t );
 void  R_NoiseInit( void );
 
-image_t     *R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags );
-image_t *R_CreateImage( const char *name, byte *pic, int width, int height, imgType_t type, imgFlags_t flags, int internalFormat );
+image_t		*R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+image_t		*R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+image_t* R_CreateImage(
+	const char* name,
+	byte* pic,
+	int width,
+	int height,
+	int numMipmaps,
+	int iMipmapsAvailable,
+	qboolean allowPicmip,
+	qboolean force32bit,
+	qboolean hasAlpha,
+	int glCompressMode,
+	int glWrapClampModeX,
+	int glWrapClampModeY
+);
 
 void R_IssuePendingRenderCommands( void );
 qhandle_t		 RE_RegisterShaderLightMap( const char *name, int lightmapIndex );
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index 31d01f69..c4eddbdb 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -160,7 +160,7 @@ typedef struct {
     void            (*SwipePoint)(vec3_t point1, vec3_t point2, float time);
     void            (*SwipeEnd)();
     void            (*SetRenderTime)(int t);
-    float           (*Noise)(float x, float y, float z, float t);
+    float           (*Noise)(float x, float y, float z, double t);
     qboolean        (*SetMode)(int mode, const glconfig_t* glConfig);
     void            (*SetFullscreen)(qboolean fullScreen);
     int             (*GetShaderWidth)(qhandle_t hShader);
diff --git a/code/renderergl1/tr_backend.c b/code/renderergl1/tr_backend.c
index e8f6e2f7..bc01c233 100644
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "tr_local.h"
 
-backEndData_t	*backEndData[SMP_FRAMES];
+backEndData_t	*backEndData;
 backEndState_t	backEnd;
 
 
@@ -1012,7 +1012,7 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, int componen
 	if ( !tr.registered ) {
 		return;
 	}
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	// we definately want to sync every frame for the cinematics
 	qglFinish();
@@ -1325,6 +1325,43 @@ void RB_ShowImages( qboolean quiet ) {
     }
 }
 
+/*
+=============
+RB_ColorMask
+
+=============
+*/
+const void *RB_ColorMask(const void *data)
+{
+	const colorMaskCommand_t *cmd = data;
+	
+	qglColorMask(cmd->rgba[0], cmd->rgba[1], cmd->rgba[2], cmd->rgba[3]);
+	
+	return (const void *)(cmd + 1);
+}
+
+/*
+=============
+RB_ClearDepth
+
+=============
+*/
+const void *RB_ClearDepth(const void *data)
+{
+	const clearDepthCommand_t *cmd = data;
+	
+	if(tess.numIndexes)
+		RB_EndSurface();
+
+	// texture swapping test
+	if (r_showImages->integer)
+		RB_ShowImages(qtrue);
+
+	qglClear(GL_DEPTH_BUFFER_BIT);
+	
+	return (const void *)(cmd + 1);
+}
+
 
 /*
 =============
@@ -1392,13 +1429,9 @@ void RB_ExecuteRenderCommands( const void *data ) {
 
 	t1 = ri.Milliseconds ();
 
-	if ( !r_smp->integer || data == backEndData[0]->commands.cmds ) {
-		backEnd.smpFrame = 0;
-	} else {
-		backEnd.smpFrame = 1;
-	}
-
 	while ( 1 ) {
+		data = PADP(data, sizeof(void *));
+
 		switch ( *(const int *)data ) {
 		case RC_SET_COLOR:
 			data = RB_SetColor( data );
@@ -1421,10 +1454,18 @@ void RB_ExecuteRenderCommands( const void *data ) {
 		case RC_SCREENSHOT:
 			data = RB_TakeScreenshotCmd( data );
 			break;
-
+		case RC_VIDEOFRAME:
+			data = RB_TakeVideoFrameCmd( data );
+			break;
+		case RC_COLORMASK:
+			data = RB_ColorMask(data);
+			break;
+		case RC_CLEARDEPTH:
+			data = RB_ClearDepth(data);
+			break;
 		case RC_END_OF_LIST:
 		default:
-			// stop rendering on this thread
+			// stop rendering
 			t2 = ri.Milliseconds ();
 			backEnd.pc.msec = t2 - t1;
 			return;
@@ -1432,30 +1473,3 @@ void RB_ExecuteRenderCommands( const void *data ) {
 	}
 
 }
-
-
-/*
-================
-RB_RenderThread
-================
-*/
-void RB_RenderThread( void ) {
-	const void	*data;
-
-	// wait for either a rendering command or a quit command
-	while ( 1 ) {
-		// sleep until we have work to do
-		data = GLimp_RendererSleep();
-
-		if ( !data ) {
-			return;	// all done, renderer is shutting down
-		}
-
-		renderThreadActive = qtrue;
-
-		RB_ExecuteRenderCommands( data );
-
-		renderThreadActive = qfalse;
-	}
-}
-
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 09386625..dd0bd7cd 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -206,7 +206,7 @@ static	void R_LoadLightmaps(gamelump_t* l) {
     buf = l->buffer;
 
     // we are about to upload textures
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
 
     // create all the lightmaps
     tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
diff --git a/code/renderergl1/tr_cmds.c b/code/renderergl1/tr_cmds.c
index 466f909d..d78b1631 100644
--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
@@ -15,16 +15,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
+along with Quake III Arena source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 #include "tr_local.h"
 
-volatile renderCommandList_t	*renderCommandList;
-
-volatile qboolean	renderThreadActive;
-
 static backEndCounters_t pc_save;
 
 /*
@@ -95,76 +91,22 @@ void R_PerformanceCounters( void ) {
 }
 
 
-/*
-====================
-R_InitCommandBuffers
-====================
-*/
-void R_InitCommandBuffers( void ) {
-	glConfig.smpActive = qfalse;
-	if ( r_smp->integer ) {
-		ri.Printf( PRINT_ALL, "Trying SMP acceleration...\n" );
-		if ( GLimp_SpawnRenderThread( RB_RenderThread ) ) {
-			ri.Printf( PRINT_ALL, "...succeeded.\n" );
-			glConfig.smpActive = qtrue;
-		} else {
-			ri.Printf( PRINT_ALL, "...failed.\n" );
-		}
-	}
-}
-
-/*
-====================
-R_ShutdownCommandBuffers
-====================
-*/
-void R_ShutdownCommandBuffers( void ) {
-	// kill the rendering thread
-	if ( glConfig.smpActive ) {
-		GLimp_WakeRenderer( NULL );
-		glConfig.smpActive = qfalse;
-	}
-}
-
 /*
 ====================
 R_IssueRenderCommands
 ====================
 */
-int	c_blockedOnRender;
-int	c_blockedOnMain;
-
 void R_IssueRenderCommands( qboolean runPerformanceCounters ) {
 	renderCommandList_t	*cmdList;
 
-	cmdList = &backEndData[tr.smpFrame]->commands;
-	assert(cmdList); // bk001205
+	cmdList = &backEndData->commands;
+	assert(cmdList);
 	// add an end-of-list command
 	*(int *)(cmdList->cmds + cmdList->used) = RC_END_OF_LIST;
 
 	// clear it out, in case this is a sync and not a buffer flip
 	cmdList->used = 0;
 
-	if ( glConfig.smpActive ) {
-		// if the render thread is not idle, wait for it
-		if ( renderThreadActive ) {
-			c_blockedOnRender++;
-			if ( r_showSmp->integer ) {
-				ri.Printf( PRINT_ALL, "R" );
-			}
-		} else {
-			c_blockedOnMain++;
-			if ( r_showSmp->integer ) {
-				ri.Printf( PRINT_ALL, "." );
-			}
-		}
-
-		// sleep until the renderer has completed
-		GLimp_FrontEndSleep();
-	}
-
-	// at this point, the back end thread is idle, so it is ok
-	// to look at it's performance counters
 	if ( runPerformanceCounters ) {
 		R_PerformanceCounters();
 	}
@@ -172,53 +114,41 @@ void R_IssueRenderCommands( qboolean runPerformanceCounters ) {
 	// actually start the commands going
 	if ( !r_skipBackEnd->integer ) {
 		// let it start on the new batch
-		if ( !glConfig.smpActive ) {
-			RB_ExecuteRenderCommands( cmdList->cmds );
-		} else {
-			GLimp_WakeRenderer( cmdList );
-		}
+		RB_ExecuteRenderCommands( cmdList->cmds );
 	}
 }
 
 
 /*
 ====================
-R_SyncRenderThread
+R_IssuePendingRenderCommands
 
 Issue any pending commands and wait for them to complete.
-After exiting, the render thread will have completed its work
-and will remain idle and the main thread is free to issue
-OpenGL calls until R_IssueRenderCommands is called.
 ====================
 */
-void R_SyncRenderThread( void ) {
+void R_IssuePendingRenderCommands( void ) {
 	if ( !tr.registered ) {
 		return;
 	}
 	R_IssueRenderCommands( qfalse );
-
-	if ( !glConfig.smpActive ) {
-		return;
-	}
-	GLimp_FrontEndSleep();
 }
 
 /*
 ============
-R_GetCommandBuffer
+R_GetCommandBufferReserved
 
-make sure there is enough command space, waiting on the
-render thread if needed.
+make sure there is enough command space
 ============
 */
-void *R_GetCommandBuffer( int bytes ) {
+void *R_GetCommandBufferReserved( int bytes, int reservedBytes ) {
 	renderCommandList_t	*cmdList;
 
-	cmdList = &backEndData[tr.smpFrame]->commands;
+	cmdList = &backEndData->commands;
+	bytes = PAD(bytes, sizeof(void *));
 
 	// always leave room for the end of list command
-	if ( cmdList->used + bytes + 4 > MAX_RENDER_COMMANDS ) {
-		if ( bytes > MAX_RENDER_COMMANDS - 4 ) {
+	if ( cmdList->used + bytes + sizeof( int ) + reservedBytes > MAX_RENDER_COMMANDS ) {
+		if ( bytes > MAX_RENDER_COMMANDS - sizeof( int ) ) {
 			ri.Error( ERR_FATAL, "R_GetCommandBuffer: bad size %i", bytes );
 		}
 		// if we run out of room, just start dropping commands
@@ -230,6 +160,17 @@ void *R_GetCommandBuffer( int bytes ) {
 	return cmdList->cmds + cmdList->used - bytes;
 }
 
+/*
+=============
+R_GetCommandBuffer
+
+returns NULL if there is not enough space for important commands
+=============
+*/
+void *R_GetCommandBuffer( int bytes ) {
+	return R_GetCommandBufferReserved( bytes, PAD( sizeof( swapBuffersCommand_t ), sizeof(void *) ) );
+}
+
 
 /*
 =============
@@ -336,6 +277,49 @@ void RE_StretchPic ( float x, float y, float w, float h,
 	cmd->t2 = t2;
 }
 
+#define MODE_RED_CYAN	1
+#define MODE_RED_BLUE	2
+#define MODE_RED_GREEN	3
+#define MODE_GREEN_MAGENTA 4
+#define MODE_MAX	MODE_GREEN_MAGENTA
+
+void R_SetColorMode(GLboolean *rgba, stereoFrame_t stereoFrame, int colormode)
+{
+	rgba[0] = rgba[1] = rgba[2] = rgba[3] = GL_TRUE;
+	
+	if(colormode > MODE_MAX)
+	{
+		if(stereoFrame == STEREO_LEFT)
+			stereoFrame = STEREO_RIGHT;
+		else if(stereoFrame == STEREO_RIGHT)
+			stereoFrame = STEREO_LEFT;
+		
+		colormode -= MODE_MAX;
+	}
+	
+	if(colormode == MODE_GREEN_MAGENTA)
+	{
+		if(stereoFrame == STEREO_LEFT)
+			rgba[0] = rgba[2] = GL_FALSE;
+		else if(stereoFrame == STEREO_RIGHT)
+			rgba[1] = GL_FALSE;
+	}
+	else
+	{
+		if(stereoFrame == STEREO_LEFT)
+			rgba[1] = rgba[2] = GL_FALSE;
+		else if(stereoFrame == STEREO_RIGHT)
+		{
+			rgba[0] = GL_FALSE;
+		
+			if(colormode == MODE_RED_BLUE)
+				rgba[1] = GL_FALSE;
+			else if(colormode == MODE_RED_GREEN)
+				rgba[2] = GL_FALSE;
+		}
+	}
+}
+
 
 /*
 ====================
@@ -346,7 +330,8 @@ for each RE_EndFrame
 ====================
 */
 void RE_BeginFrame( stereoFrame_t stereoFrame ) {
-	drawBufferCommand_t	*cmd;
+	drawBufferCommand_t	*cmd = NULL;
+	colorMaskCommand_t *colcmd = NULL;
 
 	if ( !tr.registered ) {
 		return;
@@ -376,7 +361,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 		}
 		else
 		{
-			R_SyncRenderThread();
+			R_IssuePendingRenderCommands();
 			qglEnable( GL_STENCIL_TEST );
 			qglStencilMask( ~0U );
 			qglClearStencil( 0U );
@@ -389,7 +374,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	{
 		// this is only reached if it was on and is now off
 		if ( r_measureOverdraw->modified ) {
-			R_SyncRenderThread();
+			R_IssuePendingRenderCommands();
 			qglDisable( GL_STENCIL_TEST );
 		}
 		r_measureOverdraw->modified = qfalse;
@@ -399,7 +384,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	// texturemode stuff
 	//
 	if ( r_textureMode->modified ) {
-		R_SyncRenderThread();
+		R_IssuePendingRenderCommands();
 		GL_TextureMode( r_textureMode->string );
 		r_textureMode->modified = qfalse;
 	}
@@ -410,30 +395,26 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	if ( r_gamma->modified ) {
 		r_gamma->modified = qfalse;
 
-		R_SyncRenderThread();
+		R_IssuePendingRenderCommands();
 		R_SetColorMappings();
 	}
 
-    // check for errors
-    if ( !r_ignoreGLErrors->integer ) {
-        int	err;
+	// check for errors
+	if ( !r_ignoreGLErrors->integer )
+	{
+		int	err;
 
-		R_SyncRenderThread();
-        if ( ( err = qglGetError() ) != GL_NO_ERROR ) {
-            ri.Error( ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!\n", err );
-        }
-    }
-
-	//
-	// draw buffer stuff
-	//
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
+		R_IssuePendingRenderCommands();
+		if ((err = qglGetError()) != GL_NO_ERROR)
+			ri.Error(ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!", err);
 	}
-	cmd->commandId = RC_DRAW_BUFFER;
 
-	if ( glConfig.stereoEnabled ) {
+	if (glConfig.stereoEnabled) {
+		if( !(cmd = R_GetCommandBuffer(sizeof(*cmd))) )
+			return;
+			
+		cmd->commandId = RC_DRAW_BUFFER;
+		
 		if ( stereoFrame == STEREO_LEFT ) {
 			cmd->buffer = (int)GL_BACK_LEFT;
 		} else if ( stereoFrame == STEREO_RIGHT ) {
@@ -441,16 +422,78 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 		} else {
 			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is enabled, but stereoFrame was %i", stereoFrame );
 		}
-	} else {
-		if ( stereoFrame != STEREO_CENTER ) {
-			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is disabled, but stereoFrame was %i", stereoFrame );
+	}
+	else
+	{
+		if(r_anaglyphMode->integer)
+		{
+			if(r_anaglyphMode->modified)
+			{
+				// clear both, front and backbuffer.
+				qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+				qglClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+				
+				qglDrawBuffer(GL_FRONT);
+				qglClear(GL_COLOR_BUFFER_BIT);
+				qglDrawBuffer(GL_BACK);
+				qglClear(GL_COLOR_BUFFER_BIT);
+				
+				r_anaglyphMode->modified = qfalse;
+			}
+			
+			if(stereoFrame == STEREO_LEFT)
+			{
+				if( !(cmd = R_GetCommandBuffer(sizeof(*cmd))) )
+					return;
+				
+				if( !(colcmd = R_GetCommandBuffer(sizeof(*colcmd))) )
+					return;
+			}
+			else if(stereoFrame == STEREO_RIGHT)
+			{
+				clearDepthCommand_t *cldcmd;
+				
+				if( !(cldcmd = R_GetCommandBuffer(sizeof(*cldcmd))) )
+					return;
+
+				cldcmd->commandId = RC_CLEARDEPTH;
+
+				if( !(colcmd = R_GetCommandBuffer(sizeof(*colcmd))) )
+					return;
+			}
+			else
+				ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is enabled, but stereoFrame was %i", stereoFrame );
+
+			R_SetColorMode(colcmd->rgba, stereoFrame, r_anaglyphMode->integer);
+			colcmd->commandId = RC_COLORMASK;
 		}
-		if ( !Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) ) {
-			cmd->buffer = (int)GL_FRONT;
-		} else {
-			cmd->buffer = (int)GL_BACK;
+		else
+		{
+			if(stereoFrame != STEREO_CENTER)
+				ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is disabled, but stereoFrame was %i", stereoFrame );
+
+			if( !(cmd = R_GetCommandBuffer(sizeof(*cmd))) )
+				return;
+		}
+
+		if(cmd)
+		{
+			cmd->commandId = RC_DRAW_BUFFER;
+
+			if(r_anaglyphMode->modified)
+			{
+				qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+				r_anaglyphMode->modified = qfalse;
+			}
+
+			if (!Q_stricmp(r_drawBuffer->string, "GL_FRONT"))
+				cmd->buffer = (int)GL_FRONT;
+			else
+				cmd->buffer = (int)GL_BACK;
 		}
 	}
+	
+	tr.refdef.stereoFrame = stereoFrame;
 }
 
 
@@ -467,7 +510,7 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
 	if ( !tr.registered ) {
 		return;
 	}
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
+	cmd = R_GetCommandBufferReserved( sizeof( *cmd ), 0 );
 	if ( !cmd ) {
 		return;
 	}
@@ -475,9 +518,7 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
 
 	R_IssueRenderCommands( qtrue );
 
-	// use the other buffers next frame, because another CPU
-	// may still be rendering into the current ones
-	R_ToggleSmpFrame();
+	R_InitNextFrame();
 
 	if ( frontEndMsec ) {
 		*frontEndMsec = tr.frontEndMsec;
@@ -489,3 +530,30 @@ void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
 	backEnd.pc.msec = 0;
 }
 
+/*
+=============
+RE_TakeVideoFrame
+=============
+*/
+void RE_TakeVideoFrame( int width, int height,
+		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg )
+{
+	videoFrameCommand_t	*cmd;
+
+	if( !tr.registered ) {
+		return;
+	}
+
+	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
+	if( !cmd ) {
+		return;
+	}
+
+	cmd->commandId = RC_VIDEOFRAME;
+
+	cmd->width = width;
+	cmd->height = height;
+	cmd->captureBuffer = captureBuffer;
+	cmd->encodeBuffer = encodeBuffer;
+	cmd->motionJpeg = motionJpeg;
+}
diff --git a/code/renderergl1/tr_draw.c b/code/renderergl1/tr_draw.c
index cfac6caf..9e60de83 100644
--- a/code/renderergl1/tr_draw.c
+++ b/code/renderergl1/tr_draw.c
@@ -55,7 +55,7 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 #if 1
 	shader_t* shader;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -102,7 +102,7 @@ void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, fl
 	float scaledWidth1, scaledHeight1;
 	float scaledWidth2, scaledHeight2;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -152,7 +152,7 @@ void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
 	shader_t* shader;
 	float		picw, pich;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -198,7 +198,7 @@ void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, i
 	shader_t* shader;
 	float		picw, pich;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -244,7 +244,7 @@ void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhand
 	int			i;
 	shader_t* shader;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -278,7 +278,7 @@ void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
 	w = glConfig.vidWidth;
 	h = glConfig.vidHeight;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 	qglFinish();
 
 	if (bgr) {
@@ -331,7 +331,7 @@ RE_DrawBackground_DrawPixels
 ================
 */
 void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	GL_State(0);
 	qglDisable(GL_TEXTURE_2D);
@@ -355,7 +355,7 @@ AddBox
 ================
 */
 void AddBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglColor4ubv(backEnd.color2D);
 	qglDisable(GL_TEXTURE_2D);
@@ -379,7 +379,7 @@ DrawBox
 ================
 */
 void DrawBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglColor4ubv(backEnd.color2D);
 	qglDisable(GL_TEXTURE_2D);
@@ -405,7 +405,7 @@ DrawLineLoop
 void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask) {
 	int		i;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglDisable(GL_TEXTURE_2D);
 
@@ -435,7 +435,7 @@ Set2DWindow
 ================
 */
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 	qglViewport(x, y, w, h);
 	qglScissor(x, y, w, h);
 	qglMatrixMode(GL_PROJECTION);
diff --git a/code/renderergl1/tr_font.cpp b/code/renderergl1/tr_font.cpp
index ecc1d1aa..038f15b6 100644
--- a/code/renderergl1/tr_font.cpp
+++ b/code/renderergl1/tr_font.cpp
@@ -552,7 +552,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
 
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
@@ -771,7 +771,7 @@ void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const ve
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
     }
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index b52203ff..f36f1afa 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -3173,7 +3173,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 	skin->numSurfaces = 0;
 
 	// make sure the render thread is stopped
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	// If not a .skin file, load as a single shader
 	if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index c2c2498a..a7861367 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -45,8 +45,6 @@ cvar_t	*r_displayRefresh;
 
 cvar_t	*r_znear;
 
-cvar_t	*r_smp;
-cvar_t	*r_showSmp;
 cvar_t	*r_skipBackEnd;
 
 cvar_t	*r_ignorehwgamma;
@@ -265,7 +263,9 @@ cvar_t* r_ext_multisample;
 cvar_t* r_noborder;
 cvar_t* r_ext_texture_filter_anisotropic;
 cvar_t* r_stereoEnabled;
+cvar_t* r_anaglyphMode;
 
+cvar_t* r_aviMotionJpegQuality;
 cvar_t* r_screenshotJpegQuality;
 
 static char infostring[8192];
@@ -342,9 +342,6 @@ static void InitOpenGL( void )
 		}
 	}
 
-	// init command buffers and SMP
-	R_InitCommandBuffers();
-
 	// print info
 	GfxInfo_f();
 
@@ -972,6 +969,85 @@ void R_ScreenShotJPEG_f (void) {
 
 //============================================================================
 
+/*
+==================
+RB_TakeVideoFrameCmd
+==================
+*/
+const void *RB_TakeVideoFrameCmd( const void *data )
+{
+	const videoFrameCommand_t	*cmd;
+	byte				*cBuf;
+	size_t				memcount, linelen;
+	int				padwidth, avipadwidth, padlen, avipadlen;
+	GLint packAlign;
+	
+	cmd = (const videoFrameCommand_t *)data;
+	
+	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
+
+	linelen = cmd->width * 3;
+
+	// Alignment stuff for glReadPixels
+	padwidth = PAD(linelen, packAlign);
+	padlen = padwidth - linelen;
+	// AVI line padding
+	avipadwidth = PAD(linelen, AVI_LINE_PADDING);
+	avipadlen = avipadwidth - linelen;
+
+	cBuf = PADP(cmd->captureBuffer, packAlign);
+		
+	qglReadPixels(0, 0, cmd->width, cmd->height, GL_RGB,
+		GL_UNSIGNED_BYTE, cBuf);
+
+	memcount = padwidth * cmd->height;
+
+	// gamma correct
+	if(glConfig.deviceSupportsGamma)
+		R_GammaCorrect(cBuf, memcount);
+
+	if(cmd->motionJpeg)
+	{
+		memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, linelen * cmd->height,
+			r_aviMotionJpegQuality->integer,
+			cmd->width, cmd->height, cBuf, padlen);
+		ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, memcount);
+	}
+	else
+	{
+		byte *lineend, *memend;
+		byte *srcptr, *destptr;
+	
+		srcptr = cBuf;
+		destptr = cmd->encodeBuffer;
+		memend = srcptr + memcount;
+		
+		// swap R and B and remove line paddings
+		while(srcptr < memend)
+		{
+			lineend = srcptr + linelen;
+			while(srcptr < lineend)
+			{
+				*destptr++ = srcptr[2];
+				*destptr++ = srcptr[1];
+				*destptr++ = srcptr[0];
+				srcptr += 3;
+			}
+			
+			Com_Memset(destptr, '\0', avipadlen);
+			destptr += avipadlen;
+			
+			srcptr += padlen;
+		}
+		
+		ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, avipadwidth * cmd->height);
+	}
+
+	return (const void *)(cmd + 1);	
+}
+
+//============================================================================
+
 /*
 ** GL_SetDefaultState
 */
@@ -1303,12 +1379,6 @@ void R_Register( void )
 	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
 	r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#if (defined(MACOS_X) || defined(__linux__)) && defined(SMP)
-  // Default to using SMP on Mac OS X or Linux if we have multiple processors
-	r_smp = ri.Cvar_Get( "r_smp", Sys_ProcessorCount() > 1 ? "1" : "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else		
-	r_smp = ri.Cvar_Get( "r_smp", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#endif
 	r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
 
@@ -1347,6 +1417,8 @@ void R_Register( void )
 	r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT );
 	r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT );
 
+	r_anaglyphMode = ri.Cvar_Get("r_anaglyphMode", "0", CVAR_ARCHIVE);
+
 	//
 	// temporary variables that can change at any time
 	//
@@ -1395,7 +1467,6 @@ void R_Register( void )
 	r_flareSize = ri.Cvar_Get ("r_flareSize", "40", CVAR_CHEAT);
 	r_flareFade = ri.Cvar_Get ("r_flareFade", "7", CVAR_CHEAT);
 
-	r_showSmp = ri.Cvar_Get ("r_showSmp", "0", CVAR_CHEAT);
 	r_skipBackEnd = ri.Cvar_Get ("r_skipBackEnd", "0", CVAR_CHEAT);
 
 	r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT );
@@ -1516,6 +1587,7 @@ void R_Register( void )
 	//
 
     r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+	r_aviMotionJpegQuality = ri.Cvar_Get("r_aviMotionJpegQuality", "90", CVAR_ARCHIVE);
     r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
 
 	ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
@@ -1616,26 +1688,14 @@ void R_Init( void ) {
 	if (max_termarks < MAX_TERMARKS)
 		max_termarks = MAX_TERMARKS;
 
-	ptr = ri.Malloc(sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
-	backEndData[0] = (backEndData_t*)ptr;
-	backEndData[0]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[0]));
-	backEndData[0]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys);
-	backEndData[0]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-	backEndData[0]->staticModels = NULL;
-	backEndData[0]->staticModelData = NULL;
-	if (r_smp->integer) {
-		ptr = ri.Malloc(sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-		backEndData[1] = (backEndData_t*)ptr;
-		backEndData[1]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[1]));
-		backEndData[1]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys);
-		backEndData[1]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-		backEndData[1]->staticModels = NULL;
-		backEndData[1]->staticModelData = NULL;
-	}
-	else {
-		backEndData[1] = NULL;
-	}
-	R_ToggleSmpFrame();
+	ptr = ri.Malloc(sizeof(*backEndData) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
+	backEndData = (backEndData_t*)ptr;
+	backEndData->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData));
+	backEndData->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData) + sizeof(srfPoly_t) * max_polys);
+	backEndData->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+	backEndData->staticModels = NULL;
+	backEndData->staticModelData = NULL;
+	R_InitNextFrame();
 
 	InitOpenGL();
 
@@ -1680,8 +1740,7 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
 
 	if ( tr.registered ) {
-		R_SyncRenderThread();
-		R_ShutdownCommandBuffers();
+		R_IssuePendingRenderCommands();
 		R_DeleteTextures();
 	}
 
@@ -1711,7 +1770,7 @@ void RE_BeginRegistration(glconfig_t* glconfigOut) {
 	UI_LoadResource("*123");
 	scr_initialized = 0;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	R_LevelMarksFree();
 	ri.Hunk_Clear();
@@ -1747,7 +1806,7 @@ Touch all images to make sure they are resident
 =============
 */
 void RE_EndRegistration( void ) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 	if (r_precacheimages->integer) {
 		int start, end;
 
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index c7a44adf..7e3e5f9b 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/qcommon.h"
 #include "tr_public.h"
 #include "../renderercommon/qgl.h"
+#include "../renderercommon/tr_common.h"
 #include "qgl.h"
 
 #ifdef __cplusplus
@@ -217,6 +218,7 @@ typedef struct {
 	float		modelMatrix[16];
 } orientationr_t;
 
+/*
 typedef struct image_s {
 	char		imgName[MAX_QPATH];		// game path, including extension
 	int			width, height;				// source image
@@ -240,6 +242,7 @@ typedef struct image_s {
 
 	struct image_s*	next;
 } image_t;
+*/
 
 //===============================================================================
 
@@ -633,6 +636,8 @@ typedef struct {
 	vec3_t		vieworg;
 	vec3_t		viewaxis[3];		// transformation matrix
 
+	stereoFrame_t	stereoFrame;
+
 	int			time;				// time in milliseconds for shader effects and other time dependent rendering issues
 	int			rdflags;			// RDF_NOWORLDMODEL, etc
 
@@ -1540,10 +1545,10 @@ extern	cvar_t	*r_portalOnly;
 
 extern	cvar_t	*r_subdivisions;
 extern	cvar_t	*r_lodCurveError;
-extern	cvar_t	*r_smp;
-extern	cvar_t	*r_showSmp;
 extern	cvar_t	*r_skipBackEnd;
 
+extern	cvar_t	*r_anaglyphMode;
+
 extern	cvar_t	*r_ignoreGLErrors;
 
 extern	cvar_t	*r_overBrightBits;
@@ -1641,11 +1646,8 @@ extern  cvar_t* r_showSkeleton;
 
 //====================================================================
 
-float R_NoiseGet4f( float x, float y, float z, float t );
 void  R_NoiseInit( void );
 
-void R_SwapBuffers( int );
-
 void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
 void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
 void R_RenderView( viewParms_t *parms );
@@ -1775,23 +1777,7 @@ qboolean	R_GetEntityToken( char *buffer, int size );
 model_t		*R_AllocModel( void );
 
 void    	R_Init( void );
-image_t		*R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-image_t		*R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
 
-image_t* R_CreateImage(
-	const char* name,
-	byte* pic,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean allowPicmip,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int glCompressMode,
-	int glWrapClampModeX,
-	int glWrapClampModeY
-);
 qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );
 
 void		R_SetColorMappings( void );
@@ -1810,6 +1796,7 @@ void    R_FreeUnusedImages( void );
 int		R_SumOfUsedImages( void );
 skin_t	*R_GetSkinByHandle( qhandle_t hSkin );
 
+const void *RB_TakeVideoFrameCmd( const void *data );
 
 //
 // tr_shader.c
@@ -2052,7 +2039,7 @@ SCENE GENERATION
 ============================================================
 */
 
-void R_ToggleSmpFrame( void );
+void R_InitNextFrame( void );
 
 void RE_ClearScene( void );
 void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber);
@@ -2389,6 +2376,27 @@ typedef struct {
 	qboolean jpeg;
 } screenshotCommand_t;
 
+typedef struct {
+	int						commandId;
+	int						width;
+	int						height;
+	byte					*captureBuffer;
+	byte					*encodeBuffer;
+	qboolean			motionJpeg;
+} videoFrameCommand_t;
+
+typedef struct
+{
+	int commandId;
+
+	GLboolean rgba[4];
+} colorMaskCommand_t;
+
+typedef struct
+{
+	int commandId;
+} clearDepthCommand_t;
+
 typedef enum {
 	RC_END_OF_LIST,
 	RC_SET_COLOR,
@@ -2397,7 +2405,10 @@ typedef enum {
 	RC_SPRITE_SURFS,
 	RC_DRAW_BUFFER,
 	RC_SWAP_BUFFERS,
-	RC_SCREENSHOT
+	RC_SCREENSHOT,
+	RC_VIDEOFRAME,
+	RC_COLORMASK,
+	RC_CLEARDEPTH
 } renderCommand_t;
 
 
@@ -2430,7 +2441,7 @@ extern	int		max_polys;
 extern	int		max_polyverts;
 extern	int		max_termarks;
 
-extern	backEndData_t	*backEndData[SMP_FRAMES];	// the second one may not be allocated
+extern	backEndData_t	*backEndData;	// the second one may not be allocated
 
 extern	volatile renderCommandList_t	*renderCommandList;
 
diff --git a/code/renderergl1/tr_main.c b/code/renderergl1/tr_main.c
index 8b74a47f..0aab1d9d 100644
--- a/code/renderergl1/tr_main.c
+++ b/code/renderergl1/tr_main.c
@@ -1678,7 +1678,7 @@ void R_DebugGraphics( void ) {
 	}
 
 	// the render thread can't make callbacks to the main thread
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	GL_Bind( tr.whiteImage);
 	GL_Cull( CT_FRONT_SIDED );
@@ -1804,7 +1804,7 @@ void R_DrawDebugLines(void) {
 		return;
 	}
 
-    R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
     GL_Bind(tr.whiteImage);
 	if (r_debuglines_depthmask->integer) {
 		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index 014ace64..d93ba0b7 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -203,7 +203,7 @@ static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki,
 
 
 	// make sure the render thread is stopped
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	mod->serveronly = qtrue;
 
@@ -1607,13 +1607,13 @@ void RB_StaticMesh(staticSurface_t *staticSurf)
         tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
     }
 
-    if (backEndData[backEnd.smpFrame]->staticModelData) {
+    if (backEndData->staticModelData) {
         const size_t offset =
             backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
         assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
         assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
 
-        const color4ub_t *in = (const color4ub_t *)&backEndData[backEnd.smpFrame]->staticModelData[offset];
+        const color4ub_t *in = (const color4ub_t *)&backEndData->staticModelData[offset];
 
         for (i = 0; i < render_count; i++) {
             tess.vertexColors[baseVertex + i][0] = in[i][0];
@@ -1789,7 +1789,7 @@ void R_DebugSkeleton(void) {
         return;
     }
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	GL_Bind( tr.whiteImage );
 	GL_State( GLS_POLYMODE_LINE );
diff --git a/code/renderergl1/tr_scene.c b/code/renderergl1/tr_scene.c
index 1a43b095..19375ca7 100644
--- a/code/renderergl1/tr_scene.c
+++ b/code/renderergl1/tr_scene.c
@@ -51,16 +51,8 @@ R_ToggleSmpFrame
 
 ====================
 */
-void R_ToggleSmpFrame( void ) {
-	if ( r_smp->integer ) {
-		// use the other buffers next frame, because another CPU
-		// may still be rendering into the current ones
-		tr.smpFrame ^= 1;
-	} else {
-		tr.smpFrame = 0;
-	}
-
-	backEndData[tr.smpFrame]->commands.used = 0;
+void R_InitNextFrame( void ) {
+	backEndData->commands.used = 0;
 
 	r_firstSceneDrawSurf = 0;
 	r_firstSceneSpriteSurf = 0;
@@ -145,11 +137,11 @@ qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* ve
 		return qfalse;
 	}
 
-	poly = &backEndData[tr.smpFrame]->polys[r_numpolys];
+	poly = &backEndData->polys[r_numpolys];
 	poly->surfaceType = SF_POLY;
 	poly->hShader = hShader;
 	poly->numVerts = numVerts;
-	poly->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
+	poly->verts = &backEndData->polyVerts[r_numpolyverts];
 	poly->renderfx = renderfx;
 
 	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
@@ -196,11 +188,11 @@ void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts
         return;
     }
 
-    terMark = &backEndData[tr.smpFrame]->terMarks[r_numtermarks];
+    terMark = &backEndData->terMarks[r_numtermarks];
     terMark->surfaceType = hShader;
     terMark->iIndex = iTerrainIndex;
     terMark->numVerts = numVerts;
-    terMark->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
+    terMark->verts = &backEndData->polyVerts[r_numpolyverts];
     memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
 
     r_numtermarks++;
@@ -218,8 +210,8 @@ refEntity_t* RE_GetRenderEntity(int entityNumber) {
     int i;
 
     for (i = 0; i < r_numentities; i++) {
-        if (backEndData[0]->entities[i].e.entityNumber == entityNumber) {
-            return &backEndData[0]->entities[i].e;
+        if (backEndData->entities[i].e.entityNumber == entityNumber) {
+            return &backEndData->entities[i].e;
         }
     }
 
@@ -244,9 +236,9 @@ void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber) {
 		ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType );
 	}
 
-	backEndData[tr.smpFrame]->entities[r_numentities].e = *ent;
-	backEndData[tr.smpFrame]->entities[r_numentities].bLightGridCalculated = qfalse;
-	backEndData[tr.smpFrame]->entities[r_numentities].sphereCalculated = qfalse;
+	backEndData->entities[r_numentities].e = *ent;
+	backEndData->entities[r_numentities].bLightGridCalculated = qfalse;
+	backEndData->entities[r_numentities].sphereCalculated = qfalse;
 
 	if (parentEntityNumber != ENTITYNUM_NONE)
 	{
@@ -257,20 +249,20 @@ void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber) {
 		//
 		for (i = r_firstSceneEntity; i < r_numentities; i++)
 		{
-			if (backEndData[tr.smpFrame]->entities[i].e.entityNumber == parentEntityNumber)
+			if (backEndData->entities[i].e.entityNumber == parentEntityNumber)
 			{
-				backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = i - r_firstSceneEntity;
+				backEndData->entities[r_numentities].e.parentEntity = i - r_firstSceneEntity;
 				break;
 			}
 		}
 
 		if (i == r_numentities) {
-			backEndData[tr.smpFrame]->entities[i].e.parentEntity = ENTITYNUM_NONE;
+			backEndData->entities[i].e.parentEntity = ENTITYNUM_NONE;
 		}
 	}
 	else
 	{
-		backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = ENTITYNUM_NONE;
+		backEndData->entities[r_numentities].e.parentEntity = ENTITYNUM_NONE;
 	}
 
 	r_numentities++;
@@ -288,7 +280,7 @@ void RE_AddRefSpriteToScene(const refEntity_t* ent) {
 		return;
 	}
 
-	spr = &backEndData[tr.smpFrame]->sprites[r_numsprites];
+	spr = &backEndData->sprites[r_numsprites];
 	VectorCopy(ent->origin, spr->origin);
 	spr->surftype = SF_SPRITE;
     spr->hModel = ent->hModel;
@@ -322,7 +314,7 @@ void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, floa
 	if ( intensity <= 0 ) {
 		return;
 	}
-	dl = &backEndData[tr.smpFrame]->dlights[r_numdlights++];
+	dl = &backEndData->dlights[r_numdlights++];
 	VectorCopy (org, dl->origin);
 	dl->radius = intensity;
 	dl->color[0] = r;
@@ -523,27 +515,27 @@ void RE_RenderScene( const refdef_t *fd ) {
 	tr.refdef.floatTime = tr.refdef.time * 0.001f;
 
 	tr.refdef.numDrawSurfs = r_firstSceneDrawSurf;
-	tr.refdef.drawSurfs = backEndData[tr.smpFrame]->drawSurfs;
+	tr.refdef.drawSurfs = backEndData->drawSurfs;
 
     tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
-    tr.refdef.spriteSurfs = backEndData[tr.smpFrame]->spriteSurfs;
+    tr.refdef.spriteSurfs = backEndData->spriteSurfs;
 
 	tr.refdef.num_entities = r_numentities - r_firstSceneEntity;
-	tr.refdef.entities = &backEndData[tr.smpFrame]->entities[r_firstSceneEntity];
+	tr.refdef.entities = &backEndData->entities[r_firstSceneEntity];
 
 	tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
-	tr.refdef.sprites = &backEndData[tr.smpFrame]->sprites[r_firstSceneSprite];
+	tr.refdef.sprites = &backEndData->sprites[r_firstSceneSprite];
 
 	tr.refdef.num_dlights = r_numdlights - r_firstSceneDlight;
-	tr.refdef.dlights = &backEndData[tr.smpFrame]->dlights[r_firstSceneDlight];
+	tr.refdef.dlights = &backEndData->dlights[r_firstSceneDlight];
 
 	tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
-	tr.refdef.terMarks = &backEndData[tr.smpFrame]->terMarks[r_firstSceneTerMark];
+	tr.refdef.terMarks = &backEndData->terMarks[r_firstSceneTerMark];
 
 	tr.refdef.numPolys = r_numpolys - r_firstScenePoly;
-	tr.refdef.polys = &backEndData[tr.smpFrame]->polys[r_firstScenePoly];
+	tr.refdef.polys = &backEndData->polys[r_firstScenePoly];
 
-	backEndData[tr.smpFrame]->staticModelData = tr.refdef.staticModelData;
+	backEndData->staticModelData = tr.refdef.staticModelData;
 
 	// turn off dynamic lighting globally by clearing all the
 	// dlights if it needs to be disabled or if vertex lighting is enabled
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 743da297..66bc5f93 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -2800,7 +2800,7 @@ sortedIndex.
 ==============
 */
 static void FixRenderCommandList( int newShader ) {
-	renderCommandList_t	*cmdList = &backEndData[tr.smpFrame]->commands;
+	renderCommandList_t	*cmdList = &backEndData->commands;
 
 	if( cmdList ) {
 		const void *curCmd = cmdList->cmds;
@@ -3310,12 +3310,6 @@ shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage
 		currentShader = AddShaderTextToHash(strippedName, hash);
 	}
 
-	// make sure the render thread is stopped, because we are probably
-	// going to have to upload an image
-	if (r_smp->integer) {
-		R_SyncRenderThread();
-	}
-
 	// clear the global shader
 	Com_Memset( &shader, 0, sizeof( shader ) );
     Com_Memset(&unfoggedStages, 0, sizeof(unfoggedStages));
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index 3265c47a..7cc887e5 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -681,7 +681,7 @@ static void R_PreTessellateTerrain()
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
 
     if (ter_maxtris->integer < 4 * numTerrainPatches) {
         Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
@@ -1167,10 +1167,6 @@ R_TessellateTerrain
 */
 void R_TessellateTerrain()
 {
-    if (glConfig.smpActive) {
-        R_SyncRenderThread();
-    }
-
     R_DoTriSplitting();
     // Morph geometry according to the view
     R_DoGeomorphs();

From 4ea598d76bd60420c425720e860e28ddee93ed40 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 17:53:42 +0100
Subject: [PATCH 1579/2040] Reimplement SkipBracedSection

---
 code/qcommon/q_shared.c      | 17 ++---------------
 code/qcommon/q_shared.h      |  3 +--
 code/renderergl1/tr_shader.c |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 3912e3c6..fde3bdb4 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -944,25 +944,12 @@ void COM_MatchToken( char **buf_p, char *match ) {
 =================
 SkipBracedSection
 
-The next token should be an open brace.
+The next token should be an open brace or set depth to 1 if already parsed it.
 Skips until a matching close brace is found.
 Internal brace depths are properly skipped.
 =================
 */
-qboolean SkipBracedSection (char **program) {
-	return SkipBracedSectionEx( program, 0 );
-}
-
-/*
-=================
-SkipBracedSectionEx
-
-The next token should be an open brace.
-Skips until a matching close brace is found.
-Internal brace depths are properly skipped.
-=================
-*/
-qboolean SkipBracedSectionEx (char **program, int depth) {
+qboolean SkipBracedSection (char **program, int depth) {
 	char			*token;
 
 	do {
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 277f25dd..2eb7d3f0 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1167,8 +1167,7 @@ typedef struct pc_token_s
 
 void	COM_MatchToken( char**buf_p, char *match );
 
-qboolean SkipBracedSection (char **program);
-qboolean SkipBracedSectionEx (char **program, int depth);
+qboolean SkipBracedSection (char **program, int depth);
 void SkipRestOfLine ( char **data );
 
 void Parse1DMatrix (char **buf_p, int x, float *m);
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 66bc5f93..809d5913 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -3721,7 +3721,7 @@ static void FindShadersInShaderText()
         if (*token == '{')
         {
             p = oldp;
-            SkipBracedSection(&p);
+            SkipBracedSection(&p, 0);
         }
         else
         {

From 4f699f3b58b765df919986aa1c4d2254d84a90c7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 19:21:07 +0100
Subject: [PATCH 1580/2040] Add support to compile renderergl2 (currently
 unimplemented)

---
 CMakeLists.txt                      |  6 +-----
 code/client/cl_ui.cpp               |  3 ++-
 code/qcommon/CMakeLists.txt         |  1 +
 code/qcommon/memory.c               | 13 +++++++++++--
 code/renderercommon/tr_common.h     | 19 +++----------------
 code/renderercommon/tr_public.h     |  3 +++
 code/renderergl1/tr_bsp.c           |  2 +-
 code/renderergl1/tr_image.c         | 24 ++++++++++++------------
 code/renderergl1/tr_init.c          |  3 +++
 code/renderergl1/tr_local.h         | 21 +++++++++++++++++++++
 code/renderergl1/tr_public.h        |  2 --
 code/renderergl1/tr_shader.c        | 20 ++++++++++----------
 code/renderergl2/glsl/shaders.cmake | 14 ++++++++++++++
 code/uilib/ui_public.h              |  1 +
 14 files changed, 83 insertions(+), 49 deletions(-)
 create mode 100644 code/renderergl2/glsl/shaders.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 695730cd..425efb60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,13 +183,9 @@ if (NOT BUILD_NO_CLIENT)
 
 	add_subdirectory("code/client")
 	add_subdirectory("code/renderergl1")
+	#add_subdirectory("code/renderergl2")
 	add_subdirectory("code/sdl")
 
-	#include("code/renderergl2/glsl/shaders.cmake")
-	#file(GLOB_RECURSE SOURCES_RENDERER "code/sdl/*.c" "code/renderercommon/*.c" "code/renderergl2/*.c" "code/renderergl2/*.cpp")
-	#list(FILTER SOURCES_RENDERER EXCLUDE REGEX "code/renderergl2/tr_subs.c")
-	#list(FILTER SOURCES_RENDERER EXCLUDE REGEX "code/renderergl2/tr_model.c")
-
 	add_executable(openmohaa "misc/dummy.c")
 	target_link_libraries(openmohaa PRIVATE syslib)
 	target_link_libraries(openmohaa PRIVATE omohserver)
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index abfdcf22..efb57d40 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3727,6 +3727,7 @@ void CL_FillUIImports(void)
     uii.Rend_Scissor           = re.Scissor;
     uii.Rend_Set2D             = re.Set2DWindow;
     uii.Rend_SetColor          = re.SetColor;
+    uii.Rend_ImageExists       = re.ImageExists;
 
     uii.Cmd_Stuff                   = Cbuf_AddText;
     uii.Cvar_GetString              = CvarGetForUI;
@@ -5537,7 +5538,7 @@ qboolean UI_IsResourceLoaded(const char *name)
     case 107:
         return S_IsSoundRegistered(name + 1);
     case 110:
-        return R_ImageExists(name + 1);
+        return uii.Rend_ImageExists(name + 1);
     default:
         return qfalse;
     }
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index 0b306b15..c10ead9f 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -18,6 +18,7 @@ set(SOURCES_SHARED
 	"${CMAKE_SOURCE_DIR}/code/qcommon/lz77.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/mem_blockalloc.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/mem_tempalloc.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/puff.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/q_math.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/script.cpp"
diff --git a/code/qcommon/memory.c b/code/qcommon/memory.c
index 4b88cea1..46e984f5 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -25,6 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
+#ifdef STANDALONE
+#  include "../client/client.h"
+#endif
+
 #define	ZONEID			0x7331
 #define ZONEID_CONST	0xC057
 
@@ -349,8 +353,13 @@ void Z_Meminfo_f( void )
 
 	Com_Printf( "\n%.2f Kbytes in %zu blocks in all memory pools\n", ( float )totalBytes / 1024.0f, totalBlocks );
 	Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
-	Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )R_CountTextureMemory() / 1024.0f );
-	Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )R_CountTextureMemory() + totalBytes - 1 / 1024.0f );
+
+#ifdef STANDALONE
+	if (re.CountTextureMemory) {
+		Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )re.CountTextureMemory() / 1024.0f );
+		Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )re.CountTextureMemory() + totalBytes - 1 / 1024.0f );
+	}
+#endif
 }
 
 /*
diff --git a/code/renderercommon/tr_common.h b/code/renderercommon/tr_common.h
index d26ab233..4c75eef7 100644
--- a/code/renderercommon/tr_common.h
+++ b/code/renderercommon/tr_common.h
@@ -134,22 +134,9 @@ qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode )
 float R_NoiseGet4f( float x, float y, float z, double t );
 void  R_NoiseInit( void );
 
-image_t		*R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-image_t		*R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-image_t* R_CreateImage(
-	const char* name,
-	byte* pic,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean allowPicmip,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int glCompressMode,
-	int glWrapClampModeX,
-	int glWrapClampModeY
-);
+image_t     *R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags );
+image_t     *R_RefreshImageFile( const char *name, imgType_t type, imgFlags_t flags );
+image_t *R_CreateImage( const char *name, byte *pic, int width, int height, imgType_t type, imgFlags_t flags, int internalFormat );
 
 void R_IssuePendingRenderCommands( void );
 qhandle_t		 RE_RegisterShaderLightMap( const char *name, int lightmapIndex );
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index c4eddbdb..359f53d5 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -172,6 +172,9 @@ typedef struct {
     orientation_t   (*TIKI_Orientation)(refEntity_t* model, int tagNum);
     qboolean        (*TIKI_IsOnGround)(refEntity_t* model, int tagNum, float threshold);
     void            (*SetFrameNumber)(int frameNumber);
+
+	qboolean (*ImageExists)(const char* name);
+	int (*CountTextureMemory)();
 } refexport_t;
 
 //
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index dd0bd7cd..3100546b 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -255,7 +255,7 @@ static	void R_LoadLightmaps(gamelump_t* l) {
                 image[j*4+3] = 255;
             }
         }
-        tr.lightmaps[i] = R_CreateImage(va("*lightmap%d", i), image,
+        tr.lightmaps[i] = R_CreateImageOld(va("*lightmap%d", i), image,
             LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
     }
 
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index f36f1afa..587c0e34 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -833,7 +833,7 @@ R_CreateImage
 This is the only way any image_t are created
 ================
 */
-image_t* R_CreateImage(
+image_t* R_CreateImageOld(
 	const char* name,
 	byte* pic,
 	int width,
@@ -2477,7 +2477,7 @@ Finds or loads the given image.
 Returns NULL if it fails, not a default image.
 ==============
 */
-image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
+image_t* R_FindImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
 	image_t	*image;
 	int		width, height;
 	byte	*pic;
@@ -2528,7 +2528,7 @@ image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip
 		return NULL;
 	}
 
-	image = R_CreateImage(
+	image = R_CreateImageOld(
 		name,
 		pic,
 		width,
@@ -2556,7 +2556,7 @@ image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip
 R_RefreshImageFile
 ================
 */
-image_t* R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
+image_t* R_RefreshImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
 	char imagename[64];
 	image_t* image;
 	long hash;
@@ -2575,7 +2575,7 @@ image_t* R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPic
         {
             image = image->next;
 			if (!image) {
-				return R_FindImageFile(
+				return R_FindImageFileOld(
 					imagename,
 					mipmap,
 					allowPicmip,
@@ -2589,7 +2589,7 @@ image_t* R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPic
         R_FreeImage(image);
     }
 
-    return R_FindImageFile(
+    return R_FindImageFileOld(
 		imagename,
 		mipmap,
 		allowPicmip,
@@ -2657,7 +2657,7 @@ static void R_CreateDlightImage( void ) {
 			data[y][x][3] = 255;			
 		}
 	}
-	tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.dlightImage = R_CreateImageOld("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
 	tr.dlightImage->r_sequence = -1;
 }
 
@@ -2694,7 +2694,7 @@ static void R_CreateDefaultImage( void ) {
 		data[x][DEFAULT_SIZE-1][2] =
 		data[x][DEFAULT_SIZE-1][3] = 255;
 	}
-	tr.defaultImage = R_CreateImage("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, 1, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.defaultImage = R_CreateImageOld("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, 1, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
 	tr.defaultImage->r_sequence = -1;
 }
 
@@ -2713,7 +2713,7 @@ void R_CreateBuiltinImages(void) {
 
 	// we use a solid white image instead of disabling texturing
 	Com_Memset( data, 255, sizeof( data ) );
-	tr.whiteImage = R_CreateImage("*white", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.whiteImage = R_CreateImageOld("*white", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
 	tr.whiteImage->r_sequence = -1;
 
 	// with overbright bits active, we need an image which is some fraction of full color,
@@ -2732,14 +2732,14 @@ void R_CreateBuiltinImages(void) {
 		char filename[64];
 
 		Com_sprintf(filename, sizeof(filename), "*lightmapD%i", i);
-		tr.dlightImages[i] = R_CreateImage(filename, lightmap_buffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, 0, GL_CLAMP, GL_CLAMP);
+		tr.dlightImages[i] = R_CreateImageOld(filename, lightmap_buffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, 0, GL_CLAMP, GL_CLAMP);
 		tr.dlightImages[i]->r_sequence = -1;
 	}
 
-	tr.identityLightImage = R_CreateImage("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.identityLightImage = R_CreateImageOld("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
 	tr.identityLightImage->r_sequence = -1;
 
-	tr.scratchImage = R_CreateImage("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, qtrue, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.scratchImage = R_CreateImageOld("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, qtrue, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
 	tr.scratchImage->r_sequence = -1;
 
 	R_CreateDlightImage();
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index a7861367..5c07becb 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -1931,5 +1931,8 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
 	re.SetFrameNumber = RE_SetFrameNumber;
 
+	re.ImageExists = R_ImageExists;
+	re.CountTextureMemory = R_CountTextureMemory;
+
 	return &re;
 }
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index 7e3e5f9b..b5d99f38 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -1778,6 +1778,27 @@ model_t		*R_AllocModel( void );
 
 void    	R_Init( void );
 
+image_t		*R_FindImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+image_t		*R_RefreshImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+
+image_t* R_CreateImageOld(
+    const char* name,
+    byte* pic,
+    int width,
+    int height,
+    int numMipmaps,
+    int iMipmapsAvailable,
+    qboolean allowPicmip,
+    qboolean force32bit,
+    qboolean hasAlpha,
+    int glCompressMode,
+    int glWrapClampModeX,
+    int glWrapClampModeY
+);
+
+qboolean R_ImageExists(const char* name);
+int R_CountTextureMemory();
+
 qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );
 
 void		R_SetColorMappings( void );
diff --git a/code/renderergl1/tr_public.h b/code/renderergl1/tr_public.h
index c4ad0dd5..c1311eea 100644
--- a/code/renderergl1/tr_public.h
+++ b/code/renderergl1/tr_public.h
@@ -243,8 +243,6 @@ typedef struct {
 // returned.
 refexport_t*GetRefAPI( int apiVersion, refimport_t *rimp );
 
-qboolean R_ImageExists(const char* name);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 809d5913..fc55b4c7 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -878,7 +878,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 			}
 			else
 			{
-				stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
+				stage->bundle[cntBundle].image[0] = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
 				if (!stage->bundle[cntBundle].image[0])
 				{
 					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -937,7 +937,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 				return qfalse;
 			}
 
-			stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, clampx, clampy);
+			stage->bundle[cntBundle].image[0] = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, clampx, clampy);
 			if (!stage->bundle[cntBundle].image[0])
 			{
 				ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -989,7 +989,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 				}
 				num = stage->bundle[cntBundle].numImageAnimations;
 				if ( num < MAX_IMAGE_ANIMATIONS ) {
-                    stage->bundle[cntBundle].image[num] = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT );
+                    stage->bundle[cntBundle].image[num] = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT );
 					if ( !stage->bundle[cntBundle].image[num] )
 					{
 						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
@@ -1012,7 +1012,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
                 return qfalse;
             }
 
-			stage->normalMap = R_FindImageFile(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
+			stage->normalMap = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
 			if (!stage->normalMap)
             {
                 ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -1981,10 +1981,10 @@ static void ParseSkyParms( char **text ) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
 			if (!haveClampToEdge) {
-				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
 			}
 			else {
-				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
 			}
 			if ( !shader.sky.outerbox[i] ) {
 				shader.sky.outerbox[i] = tr.defaultImage;
@@ -2015,7 +2015,7 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, qtrue, qtrue, shader_force32bit, GL_REPEAT, GL_REPEAT );
+			shader.sky.outerbox[i] = R_FindImageFileOld( ( char * ) pathname, qtrue, qtrue, shader_force32bit, GL_REPEAT, GL_REPEAT );
 			if ( !shader.sky.innerbox[i] ) {
 				shader.sky.innerbox[i] = tr.defaultImage;
 			}
@@ -3364,10 +3364,10 @@ shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage
 	Q_strncpyz( fileName, name, sizeof( fileName ) );
 	COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" );
     if (!haveClampToEdge) {
-        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
+        image = R_FindImageFileOld(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
 	}
     else {
-        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP_TO_EDGE, wrapy ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+        image = R_FindImageFileOld(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP_TO_EDGE, wrapy ? GL_REPEAT : GL_CLAMP_TO_EDGE);
 	}
 
 	if ( !image ) {
@@ -3517,7 +3517,7 @@ qhandle_t RE_RefreshShaderNoMip(const char* name) {
 				currentShader = NULL;
 
 				if (image) {
-					sh->unfoggedStages[0]->bundle[0].image[0] = R_RefreshImageFile(
+					sh->unfoggedStages[0]->bundle[0].image[0] = R_RefreshImageFileOld(
 						image->imgName,
 						image->numMipmaps,
 						image->allowPicmip,
diff --git a/code/renderergl2/glsl/shaders.cmake b/code/renderergl2/glsl/shaders.cmake
new file mode 100644
index 00000000..3f8b3fc3
--- /dev/null
+++ b/code/renderergl2/glsl/shaders.cmake
@@ -0,0 +1,14 @@
+file(GLOB_RECURSE SHADER_GLSL_SRCS "*.glsl")
+
+add_executable(stringify "../tools/stringify.cpp")
+
+foreach (shader ${SHADER_GLSL_SRCS})
+	get_filename_component(shaderfile ${shader} NAME_WE)
+	list(APPEND SHADER_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${shaderfile}.c)
+	set_source_files_properties(${shaderfile}.c PROPERTIES GENERATED TRUE)
+	add_custom_command(OUTPUT ${shaderfile}.c
+		DEPENDS stringify ${shader}
+		COMMAND stringify ${shader} ${CMAKE_CURRENT_BINARY_DIR}/${shaderfile}.c
+		COMMENT "Generate c source for ${shader}: ${shaderfile}.c"
+	)
+endforeach()
diff --git a/code/uilib/ui_public.h b/code/uilib/ui_public.h
index 9547e57b..e0712475 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -84,6 +84,7 @@ typedef struct uiimport_s {
 	void( *Rend_DrawBox )( float x, float y, float w, float h );
 	int( *Rend_GetShaderWidth )( qhandle_t hShader );
 	int( *Rend_GetShaderHeight )( qhandle_t hShader );
+    qboolean ( *Rend_ImageExists )( const char* name );
 #ifdef __cplusplus
 	void ( *File_PickFile )( const char *name, Listener *obj, Event& event );
 #else

From b5a73384d387d0e15011a9eb27b536a11672d9b3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 20:33:51 +0100
Subject: [PATCH 1581/2040] Exclude the slash at the beginning of each file for
 FS_ListFilteredFiles

---
 code/qcommon/files.cpp       | 9 ++++++++-
 code/renderergl1/tr_shader.c | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 57ff3a5e..926e42a9 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -2367,6 +2367,9 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 	}
 
 	pathLength = strlen( path );
+	if ( path[pathLength-1] == '\\' || path[pathLength-1] == '/' ) {
+		pathLength--;
+	}
 	extensionLength = strlen( extension );
 	nfiles = 0;
 	FS_ReturnPath(path, zpath, &pathDepth);
@@ -2451,7 +2454,11 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 							nfiles = FS_AddFileToList(zpath, list, nfiles);
 						}
 						else {
-							nfiles = FS_AddFileToList(name + pathLength, list, nfiles);
+							temp = pathLength;
+							if (pathLength) {
+								temp++; // include the '/'
+							}
+							nfiles = FS_AddFileToList(name + temp, list, nfiles);
 						}
 					}
 				}
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index fc55b4c7..8a59026a 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -3656,7 +3656,7 @@ static void ScanAndLoadShaderFiles( void )
 
     long sum = 0;
     // scan for shader files
-    shaderFiles = ri.FS_ListFiles("scripts/", ".shader", &numShaders);
+    shaderFiles = ri.FS_ListFiles("scripts", ".shader", &numShaders);
 
     if (!shaderFiles || !numShaders)
     {

From c9373cbc97d578a782abcff164b3dbdde286543b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 20:34:38 +0100
Subject: [PATCH 1582/2040] Comment out ABI compatibility checks

---
 code/renderergl2/tr_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 12bac4b0..a1bef72e 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -1489,8 +1489,8 @@ void R_Init( void ) {
 	Com_Memset( &backEnd, 0, sizeof( backEnd ) );
 	Com_Memset( &tess, 0, sizeof( tess ) );
 
-	if(sizeof(glconfig_t) != 11332)
-		ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t) == %u != 11332", (unsigned int) sizeof(glconfig_t));
+	//if(sizeof(glconfig_t) != 11332)
+	//	ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t) == %u != 11332", (unsigned int) sizeof(glconfig_t));
 
 //	Swap_Init();
 

From b5c32a41de0ef13a362e7bd4bf5bd09dbb6f462c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 20:35:35 +0100
Subject: [PATCH 1583/2040] Check for tabs alongside spaces in the lexer
 between expressions and variables

This fixes a compile error in some scripts that use tabs instead of spaces between expressions
---
 code/parser/lex_source.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index a8a20cd1..b762d763 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -205,7 +205,7 @@ varname		[a-zA-Z0-9_\"\$]+
 "//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
 
 <VARIABLES>"size"							{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>[ ]*\./([0-9]*[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
+<VARIABLES>[ \t]*\./([0-9]*[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
 <VARIABLES>\"{string}\"						{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
 <VARIABLES>{varname}						{
 												TextValue(yytext, strlen(yytext));
@@ -264,15 +264,15 @@ varname		[a-zA-Z0-9_\"\$]+
 ">"								{ YYLEX( TOKEN_GREATER_THAN ); }
 "<="							{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); }
 ">="							{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); }
-[ ]"-"							{ YYLEX( TOKEN_NEG ); }
+[ \t]"-"						{ YYLEX( TOKEN_NEG ); }
 
 "+"								{ YYLEX( TOKEN_PLUS ); }
 "+="							{ YYLEX( TOKEN_PLUS_EQUALS ); }
-"++"|[ ]"++"					{ YYLEX( TOKEN_INCREMENT ); }
-"-"|"-"[ ]|[ ]"-"[ ]			{ YYLEX( TOKEN_MINUS ); }
+"++"|[ \t]"++"					{ YYLEX( TOKEN_INCREMENT ); }
+"-"|"-"[ \t]|[ \t]"-"[ \t]		{ YYLEX( TOKEN_MINUS ); }
 "-="							{ YYLEX( TOKEN_MINUS_EQUALS ); }
-[ ]"-="							{ YYLEX( TOKEN_MINUS_EQUALS ); }
-"--"|[ ]"--"					{ YYLEX( TOKEN_DECREMENT ); }
+[ \t]"-="						{ YYLEX( TOKEN_MINUS_EQUALS ); }
+"--"|[ \t]"--"					{ YYLEX( TOKEN_DECREMENT ); }
 "*"								{ YYLEX( TOKEN_MULTIPLY ); }
 "*="							{ YYLEX( TOKEN_MULTIPLY_EQUALS ); }
 "/"								{ YYLEX( TOKEN_DIVIDE ); }

From 21f631e733e726041e39cbd2a98c62317a613917 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 1 Dec 2024 22:17:08 +0100
Subject: [PATCH 1584/2040] Compile SDL input/client and SDL OpenGL
 independently

This decouple the renderer from the client part of SDL (input), and only uses SDL for OpenGL
---
 CMakeLists.txt                  |  2 +-
 code/client/CMakeLists.txt      |  2 +-
 code/renderergl1/CMakeLists.txt |  8 +++++++-
 code/sdl/CMakeLists.txt         | 35 ++++++++++++++++++++++-----------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 425efb60..ff26633e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ if (NOT BUILD_NO_CLIENT)
 	target_link_libraries(openmohaa PRIVATE syslib)
 	target_link_libraries(openmohaa PRIVATE omohserver)
 	target_link_libraries(openmohaa PRIVATE omohclient)
-	target_link_libraries(openmohaa PRIVATE omohrenderer omohsdl)
+	target_link_libraries(openmohaa PRIVATE omohrenderer)
 	target_link_libraries(openmohaa PRIVATE qcommon qcommon_standalone)
 
 	# Add the gamespy dependency
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index baaf74bc..b641351c 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(omohclient INTERFACE)
 target_compile_definitions(omohclient INTERFACE APP_MODULE)
 target_compile_features(omohclient INTERFACE cxx_nullptr)
 target_compile_features(omohclient INTERFACE c_variadic_macros)
-target_link_libraries(omohclient INTERFACE omohsdl)
+target_link_libraries(omohclient INTERFACE omohsdl_client)
 target_link_libraries(omohclient INTERFACE gcd)
 
 # Sound stuff
diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
index 926262de..2d5fb2a5 100644
--- a/code/renderergl1/CMakeLists.txt
+++ b/code/renderergl1/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.12)
 project(omohrenderer)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
+list(REMOVE_ITEM SOURCES_RENDERER "./tr_subs.c")
 
 add_library(omohrenderer STATIC ${SOURCES_RENDERER})
 target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon")
@@ -10,7 +11,12 @@ target_compile_features(omohrenderer PUBLIC cxx_nullptr)
 target_compile_features(omohrenderer PUBLIC c_variadic_macros)
 target_compile_definitions(omohrenderer PRIVATE USE_INTERNAL_JPEG=1)
 target_link_libraries(omohrenderer PRIVATE qcommon)
-target_link_libraries(omohrenderer PRIVATE omohsdl)
+target_link_libraries(omohrenderer PRIVATE omohsdl_gl)
+
+get_target_property(target_type omohrenderer TYPE)
+if (target_type STREQUAL "SHARED_LIBRARY")
+	target_sources(omohrenderer PRIVATE "./tr_subs.c")
+endif ()
 
 if(USE_INTERNAL_JPEG)
 	file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
diff --git a/code/sdl/CMakeLists.txt b/code/sdl/CMakeLists.txt
index 636a1ba6..58e79160 100644
--- a/code/sdl/CMakeLists.txt
+++ b/code/sdl/CMakeLists.txt
@@ -2,39 +2,47 @@ cmake_minimum_required(VERSION 3.12)
 
 project(omohsdl)
 
-file(GLOB SOURCES_SDL
+file(GLOB SOURCES_SDL_CLIENT
+"./sdl_input.c"
+)
+
+file(GLOB SOURCES_SDL_GL
 "./sdl_gamma.c"
 "./sdl_glimp.c"
-"./sdl_input.c"
 )
 
 if (NO_MODERN_DMA)
 	list(APPEND SOURCES_SDL "./sdl_snd.c")
 endif()
 
-add_library(omohsdl STATIC ${SOURCES_SDL})
-target_compile_features(omohsdl PUBLIC c_variadic_macros)
-target_link_libraries(omohsdl PRIVATE qcommon qcommon_standalone)
+add_library(omohsdl_client STATIC ${SOURCES_SDL_CLIENT})
+target_compile_features(omohsdl_client PUBLIC c_variadic_macros)
+target_link_libraries(omohsdl_client PRIVATE qcommon qcommon_standalone)
 
 if (NO_MODERN_DMA)
-	target_compile_definitions(omohsdl PRIVATE NO_MODERN_DMA=1)
+	target_compile_definitions(omohsdl_client PRIVATE NO_MODERN_DMA=1)
 endif()
 
+add_library(omohsdl_gl STATIC ${SOURCES_SDL_GL})
+target_link_libraries(omohsdl_gl PRIVATE qcommon)
+
 if(${CMAKE_VERSION} VERSION_GREATER "3.11")
 	cmake_policy(SET CMP0074 NEW)
 endif()
 
+add_library(sdllib INTERFACE)
+
 if(WIN32)
 	find_package(SDL2)
 
 	if (SDL2_FOUND)
 		string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
-		target_include_directories(omohsdl PUBLIC ${SDL2_INCLUDE_DIRS})
-		target_link_libraries(omohsdl PRIVATE ${SDL2_LIBRARIES})
+		target_include_directories(sdllib INTERFACE ${SDL2_INCLUDE_DIRS})
+		target_link_libraries(sdllib INTERFACE ${SDL2_LIBRARIES})
 	else()
 		message(WARNING "SDL2 not found, falling back to using SDL2 from the source tree")
 
-		target_include_directories(omohsdl PUBLIC "../SDL2/include-2.0.22")
+		target_include_directories(sdllib INTERFACE "../SDL2/include-2.0.22")
 
 		if (MSVC)
 			if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -59,7 +67,7 @@ if(WIN32)
 				)
 			endif()
 
-			target_link_libraries(omohsdl PRIVATE sdl2 sdl2main)
+			target_link_libraries(sdllib INTERFACE sdl2 sdl2main)
 		endif()
 	endif()
 
@@ -68,7 +76,10 @@ elseif(UNIX)
 	
 	if (SDL2_FOUND)
 		string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
-		target_include_directories(omohsdl PUBLIC ${SDL2_INCLUDE_DIRS})
-		target_link_libraries(omohsdl PRIVATE ${SDL2_LIBRARIES})
+		target_include_directories(sdllib INTERFACE ${SDL2_INCLUDE_DIRS})
+		target_link_libraries(sdllib INTERFACE ${SDL2_LIBRARIES})
 	endif()
 endif()
+
+target_link_libraries(omohsdl_client PUBLIC sdllib)
+target_link_libraries(omohsdl_gl PUBLIC sdllib)

From ba74943844e386fea5779ad07b8d205dcf9986a1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:59:48 +0100
Subject: [PATCH 1585/2040] Fix picmip adjustment

---
 code/renderergl1/tr_bsp.c            |  2 +-
 code/renderergl1/tr_image.c          | 10 +++++-----
 code/renderergl1/tr_init.c           |  5 +++++
 code/renderergl1/tr_model.cpp        |  2 +-
 code/renderergl1/tr_shader.c         | 16 ++++++++++------
 code/renderergl1/tr_staticmodels.cpp |  2 +-
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 3100546b..78249860 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -449,7 +449,7 @@ static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
         lightmapNum = LIGHTMAP_WHITEIMAGE;
     }
 
-    shader = R_FindShader( dsh->shader, lightmapNum, qtrue, qtrue, qtrue, qtrue);
+    shader = R_FindShader( dsh->shader, lightmapNum, qtrue, r_picmip->integer, qtrue, qtrue);
 
     // if the shader had errors, just use default shader
     if ( shader->defaultShader ) {
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index 587c0e34..b8bbdc54 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -494,8 +494,8 @@ static void Upload32(
 	// perform optional picmip operation
 	//
 	if ( picmip ) {
-		scaled_width >>= r_picmip->integer;
-		scaled_height >>= r_picmip->integer;
+		scaled_width >>= picmip;
+		scaled_height >>= picmip;
 	}
 
 	//
@@ -729,8 +729,8 @@ static void UploadCompressed(
 
 	offset = data;
 	iStartImage = 0;
-	if (picmip) {
-		iStartImage = r_picmip->integer;
+	if (picmip > 0) {
+		iStartImage = picmip;
 	}
 
 	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable) {
@@ -2739,7 +2739,7 @@ void R_CreateBuiltinImages(void) {
 	tr.identityLightImage = R_CreateImageOld("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
 	tr.identityLightImage->r_sequence = -1;
 
-	tr.scratchImage = R_CreateImageOld("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, qtrue, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.scratchImage = R_CreateImageOld("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, r_picmip->integer, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
 	tr.scratchImage->r_sequence = -1;
 
 	R_CreateDlightImage();
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index 5c07becb..78d34b55 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -126,6 +126,7 @@ cvar_t	*r_lerpmodels;
 cvar_t	*r_roundImagesDown;
 cvar_t	*r_colorMipLevels;
 cvar_t	*r_picmip;
+cvar_t	*r_picmip_cap;
 cvar_t	*r_showtris;
 cvar_t	*r_showsky;
 cvar_t	*r_shownormals;
@@ -1344,8 +1345,12 @@ void R_Register( void )
 	r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
 
 	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
+	r_picmip_cap = ri.Cvar_Get ("r_picmip_cap", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
+	if (r_picmip->integer < r_picmip_cap->integer) {
+		ri.Cvar_Set("r_picmip", r_picmip_cap->integer);
+	}
 	AssertCvarRange( r_picmip, 0, 16, qtrue );
 	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
 	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index d93ba0b7..048d2647 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -136,7 +136,7 @@ void R_RegisterShaders( model_t *mod ) {
 		for( j = 0; j < psurface->numskins; j++ )
 		{
 			if( psurface->shader[ j ][ 0 ] ) {
-				sh = R_FindShader( psurface->shader[ j ], LIGHTMAP_NONE, !( psurface->flags & TIKI_SURF_NOMIPMAPS), !(psurface->flags & TIKI_SURF_NOPICMIP), qtrue, qtrue );
+				sh = R_FindShader( psurface->shader[ j ], LIGHTMAP_NONE, !( psurface->flags & TIKI_SURF_NOMIPMAPS), r_picmip->integer, qtrue, qtrue );
 				psurface->hShader[ j ] = sh->index;
 			} else {
 				psurface->hShader[ j ] = 0;
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 8a59026a..27b526eb 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -173,7 +173,7 @@ void InitStaticShaders()
 		}
 
         strncpy(shadername, token, 0x40u);
-		if (!R_FindShader(shadername, -1, 1, 1, 1, 1)) {
+		if (!R_FindShader(shadername, -1, 1, r_picmip->integer, 1, 1)) {
 			ri.Printf(3, "InitStaticShaders: Couldn't find shader: %s\n", shadername);
 		}
     }
@@ -878,7 +878,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 			}
 			else
 			{
-				stage->bundle[cntBundle].image[0] = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
+				stage->bundle[cntBundle].image[0] = R_FindImageFileOld(token, !stage->noMipMaps, stage->noPicMip ? qfalse : picmip, stage->force32bit, GL_REPEAT, GL_REPEAT);
 				if (!stage->bundle[cntBundle].image[0])
 				{
 					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
@@ -1984,7 +1984,7 @@ static void ParseSkyParms( char **text ) {
 				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
 			}
 			else {
-				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, r_picmip->integer, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
 			}
 			if ( !shader.sky.outerbox[i] ) {
 				shader.sky.outerbox[i] = tr.defaultImage;
@@ -2015,7 +2015,11 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			shader.sky.outerbox[i] = R_FindImageFileOld( ( char * ) pathname, qtrue, qtrue, shader_force32bit, GL_REPEAT, GL_REPEAT );
+			if (!haveClampToEdge) {
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
+			} else {
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, r_picmip->integer, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+			}
 			if ( !shader.sky.innerbox[i] ) {
 				shader.sky.innerbox[i] = tr.defaultImage;
 			}
@@ -3450,7 +3454,7 @@ qhandle_t RE_RegisterShader( const char *name ) {
 		return 0;
 	}
 
-	sh = R_FindShader( name, LIGHTMAP_2D, qtrue, qtrue, qtrue, qtrue);
+	sh = R_FindShader( name, LIGHTMAP_2D, qtrue, r_picmip->integer, qtrue, qtrue);
 
 	// we want to return 0 if the shader failed to
 	// load for some reason, but R_FindShader should
@@ -3769,7 +3773,7 @@ static void CreateInternalShaders( void ) {
 }
 
 static void CreateExternalShaders( void ) {
-	tr.flareShader = R_FindShader( "flareShader", LIGHTMAP_NONE, qtrue, qtrue, qtrue, qtrue);
+	tr.flareShader = R_FindShader( "flare", LIGHTMAP_NONE, qtrue, r_picmip->integer, qtrue, qtrue);
 }
 
 void R_StartupShaders()
diff --git a/code/renderergl1/tr_staticmodels.cpp b/code/renderergl1/tr_staticmodels.cpp
index 63b46ca4..b16328f1 100644
--- a/code/renderergl1/tr_staticmodels.cpp
+++ b/code/renderergl1/tr_staticmodels.cpp
@@ -109,7 +109,7 @@ void R_InitStaticModels(void)
                         surf->shader[k],
                         -1,
                         !(surf->flags & TIKI_SURF_NOMIPMAPS),
-                        !(surf->flags & TIKI_SURF_NOPICMIP),
+                        r_picmip->integer,
                         qtrue,
                         qtrue
                     );

From 499fe44bdec219383ea40c00776e16586e25aad6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Dec 2024 19:00:43 +0100
Subject: [PATCH 1586/2040] Call R_RegisterShaderNoMip for the crosshair

This prevents the crosshair texture from being altered by the texture quality settings
---
 code/cgame/cg_drawtools.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index e4708a54..adb9159e 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -1294,6 +1294,9 @@ void CG_DrawCrosshair()
         return;
     }
 
+    // Fixed in OPM: R_RegisterShaderNoMip
+    //  Use R_RegisterShaderNoMip, as it's UI stuff
+
     if (cgs.gametype != GT_FFA) {
         AngleVectorsLeft(cg.refdefViewAngles, forward, NULL, NULL);
 
@@ -1321,23 +1324,23 @@ void CG_DrawCrosshair()
                 || ((myFlags & EF_AXIS) && (friendEnt->currentState.eFlags & EF_AXIS))) {
                 // friend
                 if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-                    shader = cgi.R_RegisterShader(cg_crosshair_friend->string);
+                    shader = cgi.R_RegisterShaderNoMip(cg_crosshair_friend->string);
                 }
             } else {
                 // enemy
                 if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-                    shader = cgi.R_RegisterShader(cg_crosshair->string);
+                    shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
                 }
             }
         } else {
             if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-                shader = cgi.R_RegisterShader(cg_crosshair->string);
+                shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
             }
         }
     } else {
         // FFA
         if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
-            shader = cgi.R_RegisterShader(cg_crosshair->string);
+            shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
         }
     }
 

From 861338b0fc38b9f0313a89925e606a8ae9c3b0e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Dec 2024 19:25:02 +0100
Subject: [PATCH 1587/2040] Add support for smaller lightmaps

Large lightmap can be disabled for very low-end hardware. A BSP file with a smaller lightmap (_sml.bsp) will be used instead of the standard one if the map supports it
---
 code/cgame/cg_local.h       |  1 +
 code/cgame/cg_main.c        | 19 +++++++++++++++++++
 code/cgame/cg_servercmds.c  |  8 ++++++--
 code/client/cl_cgame.cpp    |  8 +++++++-
 code/client/cl_main.cpp     | 20 ++++++++++++++++++++
 code/client/cl_ui.cpp       |  9 ++++++++-
 code/null/null_client.c     |  4 ++++
 code/qcommon/qcommon.h      |  3 +++
 code/renderergl1/tr_init.c  | 14 +++++++++++---
 code/renderergl1/tr_local.h |  1 +
 code/server/sv_ccmds.c      |  7 ++++++-
 code/server/sv_init.c       |  7 ++++++-
 12 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 313c0c1a..99b5b638 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -509,6 +509,7 @@ extern "C" {
     //
     // cg_main.c
     //
+    qboolean    CG_UseLargeLightmaps(const char* mapName);
     void        CG_ProcessConfigString(int num, qboolean modelOnly);
     const char *CG_ConfigString(int index);
     void        CG_AddToTeamChat(const char *str);
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 256708a2..6f4b9498 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -204,6 +204,25 @@ void CG_RegisterCvars(void)
     temp            = cgi.Cvar_Get("sv_running", "0", 0);
     cgs.localServer = temp->integer;
 }
+/*
+===============
+CG_UseLargeLightmaps
+
+Added in 2.0
+Returns true if the standard BSP file should be used, false if the smaller lightmap BSP file should be used
+===============
+*/
+qboolean CG_UseLargeLightmaps(const char* mapName) {
+	char buffer[MAX_QPATH];
+
+	Com_sprintf(buffer, sizeof(buffer), "maps/%s_sml.bsp", mapName);
+
+	if (cgi.FS_ReadFile(buffer, NULL, qtrue) == -1) {
+		return qtrue;
+	}
+
+	return cgi.Cvar_Get("r_largemap", "0", 0)->integer;
+}
 
 /*
 ================
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index bc978af1..34608a1a 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -190,8 +190,12 @@ void CG_ParseServerinfo(void)
         Q_strncpyz(map, mapname, sizeof(map));
     }
 
-    Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s.bsp", map);
-
+    if (CG_UseLargeLightmaps(mapname)) {
+        Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s.bsp", map);
+    } else {
+        Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s_sml.bsp", map);
+    }
+    
     // hide/show huds
     if (cgs.gametype) {
         cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_timelimit\n");
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 16454809..4914e4af 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -923,7 +923,13 @@ void CL_InitCGame( void ) {
 	// find the current mapname
 	info = cl.gameState.stringData + cl.gameState.stringOffsets[ CS_SERVERINFO ];
 	mapname = Info_ValueForKey( info, "mapname" );
-	Com_sprintf( cl.mapname, sizeof( cl.mapname ), "maps/%s.bsp", mapname );
+
+	if (CL_UseLargeLightmap(mapname)) {
+		Com_sprintf(cl.mapname, sizeof(cl.mapname), "maps/%s.bsp", mapname);
+	} else {
+		// Added in 2.0
+		Com_sprintf(cl.mapname, sizeof(cl.mapname), "maps/%s_sml.bsp", mapname);
+	}
 
 	S_BeginRegistration();
 	CL_ShutdownCGame();
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 75642b44..c6e64332 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -172,6 +172,26 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg );
 
 static qboolean cl_bCLSystemStarted = qfalse;
 
+/*
+===============
+CL_UseLargeLightmap
+
+Added in 2.0
+Returns true if the standard BSP file should be used, false if the smaller lightmap BSP file should be used
+===============
+*/
+qboolean CL_UseLargeLightmap(const char* mapName) {
+	char buffer[MAX_QPATH];
+
+	Com_sprintf(buffer, sizeof(buffer), "maps/%s_sml.bsp", mapName);
+
+	if (FS_ReadFileEx(buffer, NULL, qtrue) == -1) {
+		return qtrue;
+	}
+
+	return Cvar_Get("r_largemap", "0", 0)->integer;
+}
+
 /*
 ===============
 CL_CDDialog
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index efb57d40..1276e52d 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -5799,8 +5799,15 @@ void UI_BeginLoad(const char *pszMapName)
 
         loadName = "maps/";
         loadName += pszMapName;
+        mapfile = loadName;
         loadName += ".min";
-        mapfile = loadName + ".bsp";
+
+        if (CL_UseLargeLightmap(pszMapName)) {
+            mapfile += ".bsp";
+        } else {
+            // Added in 2.0
+            mapfile += "_sml.bsp";
+        }
 
         if (UI_ArchiveLoadMapinfo(mapfile)) {
             cls.loading = SS_LOADING2;
diff --git a/code/null/null_client.c b/code/null/null_client.c
index b4d3394b..1f92a26c 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -129,3 +129,7 @@ qboolean CL_FinishedIntro( void ) {
 int R_CountTextureMemory() {
     return 0;
 }
+
+qboolean CL_UseLargeLightmap(const char* mapName) {
+	return qtrue;
+}
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 5cc94fe0..dc8f5309 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1217,6 +1217,9 @@ void	CL_ForwardCommandToServer( const char *string );
 // things like godmode, noclip, etc, are commands directed to the server,
 // so when they are typed in at the console, they will need to be forwarded.
 
+qboolean CL_UseLargeLightmap(const char* mapName);
+// returns true if the standard BSP file should be used
+
 void CL_CDDialog( void );
 // bring up the "need a cd to play" dialog
 
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index 78d34b55..03ce2d0d 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -102,6 +102,7 @@ cvar_t	*r_depthbits;
 cvar_t	*r_colorbits;
 cvar_t	*r_stereo;
 cvar_t	*r_primitives;
+cvar_t	*r_largemap;
 cvar_t	*r_textureDetails;
 cvar_t	*r_texturebits;
 
@@ -1346,11 +1347,18 @@ void R_Register( void )
 
 	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_picmip_cap = ri.Cvar_Get ("r_picmip_cap", "0", CVAR_ARCHIVE | CVAR_LATCH );
+    if (r_picmip->integer < r_picmip_cap->integer) {
+        ri.Cvar_Set("r_picmip", r_picmip_cap->string);
+    }
+
+    if (r_picmip->integer < 2) {
+        r_largemap = ri.Cvar_Get("r_largemap", "1", 0);
+	} else {
+		r_largemap = ri.Cvar_Get("r_largemap", "0", 0);
+	}
+	
 	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
-	if (r_picmip->integer < r_picmip_cap->integer) {
-		ri.Cvar_Set("r_picmip", r_picmip_cap->integer);
-	}
 	AssertCvarRange( r_picmip, 0, 16, qtrue );
 	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
 	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index b5d99f38..60020362 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -1451,6 +1451,7 @@ extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existance
 										// "2" = glDrawElements triangles
 										// "-1" = no drawing
 
+extern cvar_t	*r_largemap;
 extern cvar_t	*r_inGameVideo;				// controls whether in game video should be draw
 extern cvar_t	*r_fastsky;				// controls whether sky should be cleared or drawn
 extern cvar_t	*r_fastdlights;
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 1727a193..0271f204 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -193,7 +193,12 @@ static void SV_Map_f( void ) {
 
 	// make sure the level exists before trying to change, so that
 	// a typo at the server console won't end the game
-	Com_sprintf( expanded, sizeof( expanded ), "maps/%s.bsp", map );
+	// Added in 2.0
+	if ( CL_UseLargeLightmap( mapname ) ) {
+		Com_sprintf( expanded, sizeof( expanded ), "maps/%s.bsp", map );
+	} else {
+		Com_sprintf( expanded, sizeof( expanded ), "maps/%s_sml.bsp", map );
+	}
 	if( FS_ReadFile( expanded, NULL ) == -1 ) {
 		Com_Printf( "Can't find map %s\n", expanded );
 		return;
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index f8f2b61e..ad8dfe60 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -697,7 +697,12 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		char filename[ MAX_QPATH ];
 
 		TIKI_FreeAll();
-		Com_sprintf( filename, sizeof( filename ), "maps/%s.bsp", mapname );
+		if ( CL_UseLargeLightmap( mapname ) ) {
+			Com_sprintf( filename, sizeof( filename ), "maps/%s.bsp", mapname );
+		} else {
+			// Added in 2.0
+			Com_sprintf( filename, sizeof( filename ), "maps/%s_sml.bsp", mapname );
+		}
 		CM_LoadMap( filename, qfalse, &checksum );
 
 		// set checksum

From f7c8c745c41bfb60d9015f6d4f55dd645a8656a7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 2 Dec 2024 21:08:42 +0100
Subject: [PATCH 1588/2040] Don't return a slash at the end for directory name

---
 code/qcommon/files.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 926e42a9..1ea4c1e8 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -2448,16 +2448,17 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 						}
 						// unique the match
 
+						temp = pathLength;
+						if (pathLength) {
+							temp++; // include the '/'
+						}
+
 						if (bDirSearch) {
-							strcpy(zpath, name + pathLength);
-							zpath[length - pathLength - 1] = 0;
+							strcpy(zpath, name + temp);
+							zpath[length - temp - 1] = 0;
 							nfiles = FS_AddFileToList(zpath, list, nfiles);
 						}
 						else {
-							temp = pathLength;
-							if (pathLength) {
-								temp++; // include the '/'
-							}
 							nfiles = FS_AddFileToList(name + temp, list, nfiles);
 						}
 					}

From c69bafeb3fcd465328b18054c93545523b8414ca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 3 Dec 2024 19:39:48 +0100
Subject: [PATCH 1589/2040] Add a section about cleaning up the game directory

---
 docs/getting_started_installation.md | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 37797c0b..2ac5dd9d 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -126,6 +126,26 @@ Extract `omohaaded.*` and `game.*` binaries from the archive to your MOHAA serve
 
 Make sure to replace '*' with the correct name in the binary.
 
+## Cleaning up the game installation directory
+
+If you want to clean up the mohaa installation directory by keeping only what is needed for OpenMoHAA, the following files/directories can be kept:
+```cpp
+[MOHAA]
+├── [main]
+|   ├── [sound]
+|   ├── [video]
+│   ├── Pak*.pk3 // all pak files
+├── [mainta]
+|   ├── [sound]
+|   ├── [video]
+│   ├── pak*.pk3 // all pak files
+├── [maintt]
+|   ├── [sound]
+|   ├── [video]
+│   ├── pak*.pk3 // all pak files
+├── All files from the OpenMoHAA archive
+```
+
 ## Extracting GOG setup file on Linux and macOS
 
 If your MOH:AA copy was acquired from GOG then this section will be relevant.
@@ -149,10 +169,10 @@ Alternatively, free demo versions are available online. Here are the links to th
 |MOH:AA Spearhead    | Multiplayer<sup>2</sup> (2.11)    |https://www.fileplanet.com/archive/p-68997/Medal-of-Honor-Allied-Assault-Spearhead-Demo                 |
 |MOH:AA Breakthrough | Multiplayer<sup>2</sup> (0.30)    |https://www.fileplanet.com/archive/p-50953/Medal-of-Honor-Allied-Assault-Breakthrough-Multiplayer-Demo  |
 
-- MOH:AA singleplayer demo ships with **Mission 3: Level 3**
-- MOH:AA multiplayer demo ships with **Stalingrad**
-- MOH:AA Spearhead multiplayer demo ships with **Malta** and **Druckkammern**
-- MOH:AA Breakthrough multiplayer demo ships with **Anzio** and **Palermo**
+- MOH:AA singleplayer demo ships with the level: **Mission 3: Level 3**
+- MOH:AA multiplayer demo ships with the level: **Stalingrad**
+- MOH:AA Spearhead multiplayer demo ships with multiplayer maps: **Malta** and **Druckkammern**
+- MOH:AA Breakthrough multiplayer demo ships with multiplayer maps: **Anzio** and **Palermo**
 
 --------
 

From 70b8f9868e067b5d6a3d1a01362630985d97a600 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 3 Dec 2024 22:29:53 +0100
Subject: [PATCH 1590/2040] Use GameFront for links to demos

---
 docs/getting_started_installation.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 2ac5dd9d..e2545d0e 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -162,17 +162,17 @@ Alternatively, you can use [WINE](https://www.winehq.org/) as well, but this pro
 
 Alternatively, free demo versions are available online. Here are the links to the demos:
 
-|Game                |Type                               |Link                                                                                                    |
-|--------------------|-----------------------------------|--------------------------------------------------------------------------------------------------------|
-|MOH:AA              | Single-player (0.05)              |https://www.fileplanet.com/archive/p-54011/Medal-of-Honor-Single-Player-Demo                            |
-|MOH:AA              | Multiplayer<sup>1</sup> (1.00)    |https://www.fileplanet.com/archive/p-8725/Medal-of-Honor-Allied-Assault-Multiplayer-Demo                |
-|MOH:AA Spearhead    | Multiplayer<sup>2</sup> (2.11)    |https://www.fileplanet.com/archive/p-68997/Medal-of-Honor-Allied-Assault-Spearhead-Demo                 |
-|MOH:AA Breakthrough | Multiplayer<sup>2</sup> (0.30)    |https://www.fileplanet.com/archive/p-50953/Medal-of-Honor-Allied-Assault-Breakthrough-Multiplayer-Demo  |
+|Game                |Type                               |Link                                                                                  |
+|--------------------|-----------------------------------|--------------------------------------------------------------------------------------|
+|MOH:AA              | Single-player (0.05)              |https://www.gamefront.com/games/medal-of-honor/file/single-player-demo                |
+|MOH:AA              | Multiplayer<sup>1</sup> (1.00)    |https://www.gamefront.com/games/medal-of-honor/file/multiplayer-demo                  |
+|MOH:AA Spearhead    | Multiplayer<sup>2</sup> (2.11)    |https://www.gamefront.com/games/medal-of-honor/file/mohaa-spearhead-demo-eng          |
+|MOH:AA Breakthrough | Multiplayer<sup>2</sup> (0.30)    |https://www.gamefront.com/games/medal-of-honor/file/mohaa-breakthrough-demo           |
 
-- MOH:AA singleplayer demo ships with the level: **Mission 3: Level 3**
-- MOH:AA multiplayer demo ships with the level: **Stalingrad**
-- MOH:AA Spearhead multiplayer demo ships with multiplayer maps: **Malta** and **Druckkammern**
-- MOH:AA Breakthrough multiplayer demo ships with multiplayer maps: **Anzio** and **Palermo**
+- MOH:AA singleplayer demo ships with the level: **Mission 3: Level 3**.
+- MOH:AA multiplayer demo ships with the level: **Stalingrad**. **The Hunt** can be added with the [MP Demo addon](https://www.gamefront.com/games/medal-of-honor/file/mp-demo-add-on-the-hunt). 
+- MOH:AA Spearhead multiplayer demo ships with multiplayer maps: **Malta** and **Druckkammern**.
+- MOH:AA Breakthrough multiplayer demo ships with multiplayer maps: **Anzio** and **Palermo**.
 
 --------
 

From f703ee2f26aefe3d37ba3e96f2eb2654411259f8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:00:24 +0100
Subject: [PATCH 1591/2040] Add a section about installing official patches and
 improve clarity

---
 docs/getting_started_installation.md | 59 ++++++++++++++++++----------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index e2545d0e..3c959ef2 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -1,22 +1,11 @@
 # Installation
 
-Ensure that you download the binaries compatible with your platform in the [releases](https://github.com/openmoh/openmohaa/releases) section.
-
-## Which release should be downloaded?
-
-- If running Windows on AMD/Intel, CPU then `*-windows-x64.zip` is recommended
-- If running Windows on Qualcomm/Snapdragon (ARM-based) CPU, then `*-windows-arm64.zip` is the way to go
-- If running MacOS on Apple Silicon hardware, choose `*-macos-arm64.zip`
-- If running MacOS on AMD/Intel CPU, choose `*-macos-x86_64.zip`
-- If running Linux on AMD/Intel CPU, then `*-linux-amd64` is generally fine. Choose the i686 version for CPUs that don't support 64-bit instructions.
-- If running Linux on a Raspberry Pi 4 or 5, then `*-linux-arm64` (if running ARM64) is the way to go
-
 ## Requirements
 
 - A MOH:AA installation. Common installations include:
   - GOG copy (recommended). A fully patched MOH:AA War Chest copy can be acquired [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
     - For Linux/macOS, see [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos).
-  - From a CD
+  - From a CD. Make sure to [patch your installed copy](#installing-official-patches)
   - Demo. See [obtaining a demo version](#obtaining-a-demo-version)
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 is required.
 
@@ -109,22 +98,52 @@ This matches the hardware requirements (x86) of the original game.
 |Memory         |256MB                                               |256MB
 |GPU            |16MB                                                |32MB
 
-## Client
+## Installing official patches
 
-a) extract archive to your MOHAA installation directory.
+Skip directly to the [OpenMoHAA installation](#downloadinginstalling) section if the **MOH: Warchest** copy is installed.
+
+Otherwise, install the following patches:
+
+|Game           |Patch to download and install
+|---------------|------------------
+|Allied Assault |Depends on the installed language: [English](https://web.archive.org/web/20160229203048/http://largedownloads.ea.com/pub/patches/MOHAA_UKUS_ONLY_patch111v9safedisk.exe), [German](https://web.archive.org/web/20160229203013/http://largedownloads.ea.com/pub/patches/MOHAA_DE_ONLY_patch111v9safedisk.exe), [French](https://web.archive.org/web/20151201080806/http://largedownloads.ea.com/pub/patches/MOHAA_FR_ONLY_patch111v9safedisk.exe) [Italian](https://web.archive.org/web/20141205065317/http://largedownloads.ea.com/pub/patches/MOHAA_IT_ONLY_patch111v9safedisk.exe), [Spanish](https://web.archive.org/web/20151201080738/http://largedownloads.ea.com/pub/patches/MOHAA_ES_ONLY_patch111v9safedisk.exe), or [Dutch](https://web.archive.org/web/20151201080902/http://largedownloads.ea.com/pub/patches/MOHAA_NL_ONLY_patch111v9safedisk.exe)
+|Spearhead      |[2.0 to 2.11](https://web.archive.org/web/20170130184731/ftp://ftp.ea.com/pub/ea/patches/mohaa_spearhead/mohaas_patch_20_to_211.exe), followed by [2.11 to 2.15](https://web.archive.org/web/20170130184725/ftp://ftp.ea.com/pub/ea/patches/mohaa_spearhead/MOHAAS_Patch_211_to_215.exe)
+|Breakthrough   |[2.40b](https://web.archive.org/web/20160301122255/http://largedownloads.ea.com/pub/patches/medal_of_honor_allied_assault_breakthrough_patch_2_40.exe)
+
+These patches are required to connect to multiplayer servers and ensure a smooth, bug-free single-player experience.
+
+## Downloading/installing
+
+Ensure that you download the binaries compatible with your platform in the [releases](https://github.com/openmoh/openmohaa/releases) section.
+
+### Which release should be downloaded?
+
+It depends on the OS that is installed on your device:
+
+|OS       |Kind of hardware (CPU, platform...)        |Archive
+|---------|-------------------------------------------|-----------------------
+|Windows  |AMD/Intel                                  |`*-windows-x64.zip`
+|Windows  |Qualcomm/Snapdragon (ARM-based)            |`*-windows-arm64.zip`
+|macOS    |Apple Silicon (ARM)                        |`*-macos-arm64.zip`
+|macOS    |Intel                                      |`*-macos-x86_64.zip`
+|Linux    |AMD/Intel                                  |`*-linux-amd64`
+|Linux    |Raspberry Pi 4 or 5                        |`*-linux-arm64`
+
+Once the correct archive was downloaded:
+
+a) Extract the archive<sup>1</sup> to your MOHAA installation directory.
 
 -or-
 
-b) extract archive somewhere on your hard drive, create a shortcut to openmohaa (or omohaaded), and set the start directory on the shortcut to your MOHAA installation directory.
+b) Extract the archive<sup>1</sup> somewhere on your hard drive, create a shortcut to each of the **launch_openmohaa_\*** executables (or omohaaded.exe), and set the shortcut's 'Start in' directory to your MOHAA installation directory.
 
-## Server
+Once you're ready, start one of the three launchers based on whether you want to play the base game, Spearhead, or Breakthrough, and then you can start playing.
 
-Extract `omohaaded.*` and `game.*` binaries from the archive to your MOHAA server installation directory. Then proceed like you would do with mohaa server:
+----
 
-- `.\omohaaded.*.exe +exec server.cfg` on Windows
-- `./omohaaded.* +exec server.cfg` on Linux
+**Notes:**
 
-Make sure to replace '*' with the correct name in the binary.
+1. For servers, only the `omohaaded.*` and `game.*` binaries from the archive are required.
 
 ## Cleaning up the game installation directory
 

From ac6b274a4ffbefa0d3e99b5eb11a43172ef1c6b4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 19:21:29 +0100
Subject: [PATCH 1592/2040] Use MAP_SIZE instead of MAX_MAP_BOUNDS

This fixes collision being incorrect on big maps
---
 code/qcommon/cm_patch.c   |  2 +-
 code/qcommon/cm_polylib.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index 17b9e5de..7330bf9d 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -783,7 +783,7 @@ static qboolean CM_ValidateFacet( facet_t *facet ) {
 	FreeWinding( w );
 	
 	for ( j = 0 ; j < 3 ; j++ ) {
-		if ( bounds[1][j] - bounds[0][j] > MAX_MAP_BOUNDS ) {
+		if ( bounds[1][j] - bounds[0][j] > MAP_SIZE ) {
 			return qfalse;		// we must be missing a plane
 		}
 	}
diff --git a/code/qcommon/cm_polylib.c b/code/qcommon/cm_polylib.c
index bed23de9..5f8816a5 100644
--- a/code/qcommon/cm_polylib.c
+++ b/code/qcommon/cm_polylib.c
@@ -160,8 +160,8 @@ void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs)
 	vec_t	v;
 	int		i,j;
 
-	mins[0] = mins[1] = mins[2] = MAX_MAP_BOUNDS;
-	maxs[0] = maxs[1] = maxs[2] = -MAX_MAP_BOUNDS;
+	mins[0] = mins[1] = mins[2] = 99999;
+	maxs[0] = maxs[1] = maxs[2] = -99999;
 
 	for (i=0 ; i<w->numpoints ; i++)
 	{
@@ -208,7 +208,7 @@ winding_t *BaseWindingForPlane (vec3_t normal, vec_t dist)
 	
 // find the major axis
 
-	max = -MAX_MAP_BOUNDS;
+	max = -MAP_SIZE;
 	x = -1;
 	for (i=0 ; i<3; i++)
 	{
@@ -242,8 +242,8 @@ winding_t *BaseWindingForPlane (vec3_t normal, vec_t dist)
 	
 	CrossProduct (vup, normal, vright);
 	
-	VectorScale (vup, MAX_MAP_BOUNDS, vup);
-	VectorScale (vright, MAX_MAP_BOUNDS, vright);
+	VectorScale (vup, MAP_SIZE, vup);
+	VectorScale (vright, MAP_SIZE, vright);
 
 // project a really big	axis aligned box onto the plane
 	w = AllocWinding (4);
@@ -564,7 +564,7 @@ void CheckWinding (winding_t *w)
 		p1 = w->p[i];
 
 		for (j=0 ; j<3 ; j++)
-			if (p1[j] > MAX_MAP_BOUNDS || p1[j] < -MAX_MAP_BOUNDS)
+			if (p1[j] > MAP_SIZE || p1[j] < -MAP_SIZE)
 				Com_Error (ERR_DROP, "CheckFace: BUGUS_RANGE: %f",p1[j]);
 
 		j = i+1 == w->numpoints ? 0 : i+1;

From 5da24a8ab54d602685a57c83928f9f7e3aafd3e7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 19:37:45 +0100
Subject: [PATCH 1593/2040] Update mac runner OS to macos-15

---
 .github/workflows/shared-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index eb1a6d7e..2cd95dae 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -350,7 +350,7 @@ jobs:
         ]
 
     name: "Building for platform macos-${{matrix.architecture.name}}"
-    runs-on: "macos-14"
+    runs-on: "macos-15"
     environment: ${{inputs.environment}}
 
     steps:

From c2e45710adda742726d5170ceccec556020fd5ca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:15:01 +0100
Subject: [PATCH 1594/2040] Improve code clarity

---
 code/tiki/tiki_files.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index b80a34c3..8e217113 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -742,9 +742,10 @@ void SkeletorCacheUnloadData(int index)
     }
 
     m_cachedData[m_cachedDataLookup[index]].lookup = -1;
-    for (i = index + 1; i < m_numInCache; i++) {
-        m_cachedDataLookup[i - 1]                  = m_cachedDataLookup[i];
-        m_cachedData[m_cachedDataLookup[i]].lookup = i - 1;
+
+    for (i = index; i < m_numInCache; i++) {
+        m_cachedDataLookup[i] = m_cachedDataLookup[i + 1];
+        m_cachedData[m_cachedDataLookup[i]].lookup = i;
     }
 }
 
@@ -757,9 +758,12 @@ void SkeletorCacheCleanCache()
 {
     int i;
 
-    for (i = m_numInCache - 1; i >= 0; i--) {
-        if (!m_cachedData[m_cachedDataLookup[i]].numusers) {
-            SkeletorCacheUnloadData(i);
+    // Fixed in OPM
+    //  In original, i starts from 0 up to m_numInCache
+    //  the problem is that m_numInCache can decrement
+    for (i = m_numInCache; i > 0; i--) {
+        if (!m_cachedData[m_cachedDataLookup[i - 1]].numusers) {
+            SkeletorCacheUnloadData(i - 1);
         }
     }
 }

From b6dd3914becf338834cbc9fae1f4d4d125eeda6a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:30:26 +0100
Subject: [PATCH 1595/2040] Correctly free skels when freeing TIKIs

This fixes a potential memory leak that would occur when the first skelcache's skel is NULL
---
 code/tiki/tiki_cache.cpp | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index bfdc6492..2f3cee9e 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -245,14 +245,15 @@ void TIKI_FreeAll()
             }
 
             tiki->m_boneList.CleanUpChannels();
+            // Fixed in OPM
+            //  It's better to free aliases when actually clearing the anim cache
             /*
-			if( tiki->a->m_aliases )
-			{
-				TIKI_Free( tiki->a->m_aliases );
-				tiki->a->m_aliases = NULL;
-				tiki->a->num_anims = 0;
-			}
-			*/
+            if (tiki->a->m_aliases) {
+                TIKI_Free(tiki->a->m_aliases);
+                tiki->a->m_aliases = NULL;
+                tiki->a->num_anims = 0;
+            }
+            */
 
             TIKI_Free(tiki);
         }
@@ -268,6 +269,8 @@ void TIKI_FreeAll()
 
             TIKI_RemoveTiki(tikianim);
 
+            // Fixed in OPM
+            //  Each tikianim should free their aliases
             if (tikianim->m_aliases) {
                 TIKI_Free(tikianim->m_aliases);
                 tikianim->m_aliases = NULL;
@@ -281,12 +284,10 @@ void TIKI_FreeAll()
     }
 
     tiki_loading = true;
-    if (skelcache) {
-        for (i = 0; i < cache_maxskel; i++) {
-            if (skelcache->skel) {
-                TIKI_FreeSkel(i);
-            }
-        }
+
+    for (i = 0; i < cache_maxskel; i++) {
+        assert(skelcache[i].skel);
+        TIKI_FreeSkel(i);
     }
 }
 
@@ -300,8 +301,8 @@ static qboolean tiki_started;
 void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
 {
     skeletor_c *skel;
-    int i;
-    int index;
+    int         i;
+    int         index;
 
     if (entnum == ENTITYNUM_NONE) {
         if (!tiki->skeletor) {
@@ -329,13 +330,13 @@ void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
         }
 
         index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
-        skel = skel_entity_cache[index];
+        skel  = skel_entity_cache[index];
 
         if (skel) {
             delete skel;
         }
 
-        skel                      = new skeletor_c(tiki);
+        skel                     = new skeletor_c(tiki);
         skel_entity_cache[index] = skel;
     }
 
@@ -350,7 +351,7 @@ TIKI_DeleteSkeletor
 static void TIKI_DeleteSkeletor(int entnum)
 {
     skeletor_c *skel;
-    int i;
+    int         i;
 
     if (entnum == ENTITYNUM_NONE) {
         return;

From 01d098dab5e308937de93abc418a85142d608a50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:32:39 +0100
Subject: [PATCH 1596/2040] Clear the number of uses of the skel cache when
 registering a new skeleton

---
 code/tiki/tiki_skel.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index c7fe9ed7..5c4bcd4d 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -1087,6 +1087,8 @@ int TIKI_RegisterSkel(const char *path, dtiki_t *tiki)
         TIKI_Error("TIKI_RegisterSkel: No free spots open in skel cache for %s\n", path);
         return -1;
     }
+    
+    cache->numuses = 0;
 
     if (cache - skelcache + 1 > cache_maxskel) {
         cache_maxskel = cache - skelcache + 1;

From 8446a655bb9f2243b93ad5e5d84b75b598103510 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:33:42 +0100
Subject: [PATCH 1597/2040] Print an error when the skel file extension is
 unknown

---
 code/tiki/tiki_skel.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 5c4bcd4d..e3403a2c 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -1103,6 +1103,9 @@ int TIKI_RegisterSkel(const char *path, dtiki_t *tiki)
         if (!TIKI_LoadSKD(path, cache)) {
             return -1;
         }
+    } else {
+        TIKI_Error("TIKI_RegisterSkel: Unknown extension %s\n", extension);
+        return -1;
     }
 
     Com_sprintf(tempName, sizeof(tempName), "l%s", path);

From 0559d643b7c04af9de057ff7203256120a2a8b0d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Dec 2024 00:42:31 +0100
Subject: [PATCH 1598/2040] Use TIKI_DPrintf instead of Skel_DPrintf

---
 code/qcommon/tiki_main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index f5f58024..f7589a57 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.cpp
@@ -67,7 +67,7 @@ void TIKI_Message(const char *fmt, ...)
     va_start(va, fmt);
     Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
-    Skel_DPrintf(msg);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -83,7 +83,7 @@ void TIKI_Warning(const char *fmt, ...)
     va_start(va, fmt);
     Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
-    Skel_DPrintf(msg);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -99,7 +99,7 @@ void TIKI_Error(const char *fmt, ...)
     va_start(va, fmt);
     Q_vsnprintf(msg, sizeof(msg), fmt, va);
     va_end(va);
-    Skel_DPrintf(msg);
+    TIKI_DPrintf(msg);
 }
 
 /*

From d7c0ee47fed6272c98fe4e4847af30b96f8638a0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Dec 2024 00:42:50 +0100
Subject: [PATCH 1599/2040] Check if the skel is valid before freeing it

---
 code/tiki/tiki_cache.cpp | 5 +++--
 code/tiki/tiki_skel.cpp  | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index 2f3cee9e..7a68ea15 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -286,8 +286,9 @@ void TIKI_FreeAll()
     tiki_loading = true;
 
     for (i = 0; i < cache_maxskel; i++) {
-        assert(skelcache[i].skel);
-        TIKI_FreeSkel(i);
+        if (skelcache[i].skel) {
+            TIKI_FreeSkel(i);
+        }
     }
 }
 
diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index e3403a2c..53e9cddf 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -1026,8 +1026,11 @@ TIKI_FindSkel
 skelcache_t *TIKI_FindSkel(const char *path)
 {
     int          i;
+    int          num;
     skelcache_t *cache;
 
+    num = cache_numskel;
+
     for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
         cache = &skelcache[i];
 
@@ -1038,6 +1041,11 @@ skelcache_t *TIKI_FindSkel(const char *path)
         if (!strcmp(path, cache->path)) {
             return cache;
         }
+
+        if (num == 0) {
+            break;
+        }
+        num--;
     }
 
     return NULL;

From 115b7b82aa41988b1574e16b9f7b03d2f72e5386 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Dec 2024 19:38:47 +0100
Subject: [PATCH 1600/2040] Correctly handle the scenario where multiple
 architectures are specified

Each target will produce a single binary having multiple architectures, instead of having a binary per architecture. The suffix for each binary will be `multiarch`. This makes it easier for the end-user to install and use. This also helps the transition between Intel and Apple Silicon hardware
---
 .github/workflows/shared-build.yml         | 14 +++++++----
 .github/workflows/tags-publish-release.yml |  5 ++--
 CMakeLists.txt                             | 29 +++++++++++++---------
 code/qcommon/q_platform.h                  | 10 +++++---
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 2cd95dae..90b2bca9 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -345,8 +345,12 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'x86_64',   triple: 'x86_64-apple-macos10.8'},
-          {name: 'arm64',    triple: 'arm64-apple-macos11'}
+          #{name: 'x86_64',   triple: 'x86_64-apple-macos10.8'},
+          #{name: 'arm64',    triple: 'arm64-apple-macos11'}
+          #{name: 'x86_64',    build_name: 'x86_64'},
+          #{name: 'arm64',     build_name: 'arm64'},
+          # Compile into an universal binary
+          {name: 'multiarch(arm64-x86_64)', build_name: 'arm64;x86_64' }
         ]
 
     name: "Building for platform macos-${{matrix.architecture.name}}"
@@ -383,7 +387,7 @@ jobs:
       with:
         version: 2-latest
         build-type: Release
-        cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }}
+        cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}'
           -DCMAKE_VERBOSE_MAKEFILE=on"
     ###
     # OpenAL
@@ -404,7 +408,7 @@ jobs:
       run: |
         cmake -B ./build \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
-        -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
+        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
         -DCMAKE_VERBOSE_MAKEFILE=on
         cmake --build ./build --config Release --parallel
         cmake --install ./build --config Release
@@ -422,7 +426,7 @@ jobs:
         echo "CMAKE_PARAM=--log-level=VERBOSE \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DCMAKE_VERBOSE_MAKEFILE=on \
-        -DCMAKE_OSX_ARCHITECTURES=${{ matrix.architecture.name }} \
+        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
diff --git a/.github/workflows/tags-publish-release.yml b/.github/workflows/tags-publish-release.yml
index 4bb77996..fef5899d 100644
--- a/.github/workflows/tags-publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -38,8 +38,9 @@ jobs:
           'windows-x86-pdb',
           'windows-arm64',
           'windows-arm64-pdb',
-          'macos-x86_64',
-          'macos-arm64'
+          #'macos-x86_64',
+          #'macos-arm64',
+          'macos-multiarch(arm64-x86_64)',
         ]
 
     runs-on: ubuntu-24.04
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff26633e..e2f22e66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ project(openmohaa)
 include(TargetArch.cmake)
 
 target_architecture(TARGET_ARCH)
+list(LENGTH TARGET_ARCH TARGET_ARCH_COUNT)
 
 set(USE_INTERNAL_LIBS ON)
 if(USE_SYSTEM_LIBS)
@@ -62,11 +63,11 @@ if(DEBUG_MEMORY)
 	add_definitions(-D_DEBUG_MEM)
 endif()
 
-IF("${TARGET_ARCH}" STREQUAL "i386")
+if("${TARGET_ARCH}" STREQUAL "i386")
 	set(TARGET_ARCH_SUFFIX "x86")
-ELSE()
+else()
 	set(TARGET_ARCH_SUFFIX ${TARGET_ARCH})
-ENDIF()
+endif()
 
 message(STATUS "Architecture detected: ${TARGET_ARCH}")
 
@@ -74,23 +75,27 @@ if(TARGET_LOCAL_SYSTEM)
 	add_definitions(-DTARGET_LOCAL_SYSTEM)
 	# As it targets the local system, no need to know about the architecture used
 	set(TARGET_BIN_SUFFIX "")
-	message(STATUS "Suffix will not be used as the local system is the target")
+	message(STATUS "Binary suffix will not be used as the local system is the target")
+elseif(${TARGET_ARCH_COUNT} GREATER 1)
+	add_definitions(-DTARGET_MULTIPLE_ARCHITECTURES)
+	set(TARGET_BIN_SUFFIX ".multiarch")
+	message(STATUS "Multiple architectures were specified, suffix set to 'multiarch'.")
 else()
 	set(TARGET_BIN_SUFFIX ".${TARGET_ARCH}")
-	message(STATUS "Suffix set to ${TARGET_ARCH_SUFFIX}.")
+	message(STATUS "Binary suffix set to '${TARGET_ARCH_SUFFIX}'.")
 endif()
 
-IF(WIN32)
+if(WIN32)
 	set(TARGET_PLATFORM_PREFIX "")
 	message(STATUS "Using Win32 naming convention")
-ELSEIF(UNIX)
+elseif(UNIX)
 	set(TARGET_PLATFORM_PREFIX "")
 	message(STATUS "Using Unix naming convention")
-ELSE()
+else()
 	set(TARGET_PLATFORM_PREFIX "")
-ENDIF()
+endif()
 
-IF(CMAKE_BUILD_TYPE MATCHES Debug)
+if(CMAKE_BUILD_TYPE MATCHES Debug)
 	add_compile_definitions(_DEBUG)
 
 	# NOTE: The following may mess up function importation
@@ -99,10 +104,10 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug)
 	#	set(CMAKE_ENABLE_EXPORTS ON)
 	#	message(STATUS "Enabling exports on Unix for backtrace")
 	#endif()
-ELSE()
+else()
 	# Non-debug builds
 	add_compile_definitions(NDEBUG)
-ENDIF()
+endif()
 
 if(APPLE)
 	# macOS doesn't search the executable path by default
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 0846c2df..16bb9a44 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -86,10 +86,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define DLL_SUFFIX
 #endif
 
-#if !defined(TARGET_LOCAL_SYSTEM)
-#  define ARCH_SUFFIX "." ARCH_STRING
-#else
+#if defined(TARGET_LOCAL_SYSTEM)
 #  define ARCH_SUFFIX
+#elif defined(TARGET_MULTIPLE_ARCHITECTURES)
+// Targeting multiple architecture in a single binary.
+// For example, OSX supports compiling multiple architectures in a single binary
+#  define ARCH_SUFFIX ".multiarch"
+#else
+#  define ARCH_SUFFIX "." ARCH_STRING
 #endif
 
 // alloca

From 35f40e949b468b16908b1671fc253c65905749e5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 5 Dec 2024 23:31:38 +0100
Subject: [PATCH 1601/2040] Properly clear UI resources when shutting down the
 UI

---
 code/uilib/uimenu.cpp   | 8 ++++++++
 code/uilib/uiwinman.cpp | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/code/uilib/uimenu.cpp b/code/uilib/uimenu.cpp
index a1da2b47..64f6cf71 100644
--- a/code/uilib/uimenu.cpp
+++ b/code/uilib/uimenu.cpp
@@ -639,6 +639,14 @@ void MenuManager::DeleteAllMenus
 		Menu *menu = m_menulist.ObjectAt( i );
 		delete menu;
 	}
+
+	//
+	// Added in OPM
+	//  Make sure to clear the menu list and stack
+	m_menulist.FreeObjectList();
+
+	m_menustack.Clear();
+	m_showmenustack.Clear();
 }
 
 Menu *MenuManager::FindMenu
diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index 90631334..701210f6 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -910,6 +910,8 @@ void UIWindowManager::Shutdown(void)
         delete b;
     }
 
+    m_cursor = NULL;
+
     UIWidget::Shutdown();
 }
 

From 28bdd1b2b39f96b417a08671e2d49e0885b751cb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 6 Dec 2024 00:09:07 +0100
Subject: [PATCH 1602/2040] Made the renderer modular and loadable

This removes coupling between the renderer and UI/client functions. An option USE_RENDERER_DLOPEN was added to specify whether a renderer module should be compiled and loaded, instead of integrating the renderer into the executable directly. This opens the door for a new renderer
---
 CMakeLists.txt                         |   1 +
 code/client/cl_main.cpp                | 224 ++++++++++++++++++-------
 code/client/cl_ui.cpp                  |   3 +
 code/client/client.h                   |   5 +
 code/qcommon/CMakeLists.txt            |  31 ++--
 code/qcommon/files.cpp                 |   2 +
 code/qcommon/memory.c                  |   4 +-
 code/renderercommon/new/tr_types_new.h |   2 +
 code/renderercommon/tr_public.h        |  46 ++++-
 code/renderergl1/CMakeLists.txt        |  25 ++-
 code/renderergl1/tr_bsp.c              |  22 +--
 code/renderergl1/tr_cmds.c             |   2 +-
 code/renderergl1/tr_font.cpp           |  31 +++-
 code/renderergl1/tr_image.c            |  28 ++--
 code/renderergl1/tr_init.c             |  29 +++-
 code/renderergl1/tr_local.h            |   3 +
 code/renderergl1/tr_marks_permanent.c  |  64 +++----
 code/renderergl1/tr_model.cpp          | 104 +++++++-----
 code/renderergl1/tr_shade.c            |   4 +-
 code/renderergl1/tr_staticmodels.cpp   |  19 +--
 code/renderergl1/tr_subs.c             |  60 +++++++
 code/renderergl1/tr_terrain.c          |   8 +-
 code/renderergl1/tr_vis.cpp            |   4 +-
 code/renderergl1/tr_world.c            |   2 +-
 code/sdl/CMakeLists.txt                |   4 +-
 code/tiki/CMakeLists.txt               |  19 ++-
 code/tiki/tiki_skel.cpp                |  36 ++++
 code/tiki/tiki_skel.h                  |   1 +
 code/uilib/ui_public.h                 |   6 +
 code/uilib/uifont.cpp                  |  64 ++++++-
 code/uilib/uifont.h                    |   9 +
 31 files changed, 645 insertions(+), 217 deletions(-)
 create mode 100644 code/renderergl1/tr_subs.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2f22e66..c8a93176 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ endif()
 option(USE_INTERNAL_JPEG "If set, use bundled libjpeg." ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_MAD  "If set, use bundled libmad."  ${USE_INTERNAL_LIBS})
 option(USE_INTERNAL_ZLIB "If set, use bundled zlib."    ${USE_INTERNAL_LIBS})
+option(USE_RENDERER_DLOPEN "Whether to compile the renderer as separate pluggable modules" OFF)
 option(TARGET_LOCAL_SYSTEM "Indicate that the project will be compiled and installed for the local system" OFF)
 
 if(TARGET_GAME_TYPE)
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index c6e64332..32ac0bf5 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -29,14 +29,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/localization.h"
 #include "../qcommon/bg_compat.h"
 #include "../sys/sys_local.h"
-#ifdef USE_RENDERER_DLL
-#include "../sys/sys_loadlib.h"
-#endif
+
+extern "C" {
+	#include "../sys/sys_loadlib.h"
+}
 
 #include "../gamespy/gcdkey/gcdkeyc.h"
 
 #include <climits>
 
+#ifdef USE_RENDERER_DLOPEN
+cvar_t* cl_renderer;
+#endif
+
 cvar_t	*cl_nodelta;
 cvar_t	*cl_debugMove;
 
@@ -130,19 +135,14 @@ clientGameExport_t	*cge;
 
 // Structure containing functions exported from refresh DLL
 refexport_t	re;
+#ifdef USE_RENDERER_DLOPEN
+static void	*rendererLib = NULL;
+#endif
 
 qboolean camera_reset;
 qboolean camera_active;
 vec3_t camera_offset;
 
-#ifdef USE_RENDERER_DLL
-// su44: for plugable renderer system
-refexport_t* (*DGetRefAPI)(int apiVersion, refimport_t * rimp) = NULL;
-static cvar_t  *cl_renderer = NULL;
-static void    *rendererLib = NULL;
-#endif // USE_RENDERER_DLL
-
-
 ping_t	cl_pinglist[MAX_PINGREQUESTS];
 
 typedef struct serverStatus_s
@@ -802,9 +802,10 @@ void CL_ShutdownAll(qboolean shutdownRef) {
 	TIKI_FreeAll();
 
 	// shutdown the renderer
-	if ( re.Shutdown ) {
-		re.Shutdown( qfalse );		// don't destroy window or context
-	}
+	if(shutdownRef)
+		CL_ShutdownRef();
+	else if(re.Shutdown)
+		re.Shutdown(qfalse);		// don't destroy window or context
 
 	cls.uiStarted = qfalse;
 	cls.cgameStarted = qfalse;
@@ -1580,19 +1581,24 @@ void CL_Vid_Restart_f( void ) {
 
 	S_BeginRegistration();
 
+	// shutdown the UI
+	//CL_ShutdownUI();
 	// shutdown the renderer and clear the renderer interface
-	CL_ShutdownRef();
+    CL_ShutdownRef();
+
+    cls.rendererRegistered = qfalse;
+
 	// shutdown the CGame
 	CL_ShutdownCGame();
 	// initialize the renderer interface
 	CL_InitRef();
+	// initialize the UI
+	//CL_InitializeUI();
 	// initialize the ui library
 	UI_ResolutionChange();
 	// clear aliases
 	Alias_Clear();
 
-	cls.rendererRegistered = qfalse;
-
 	// unpause so the cgame definately gets a snapshot and renders a frame
 	Com_Unpause();
 
@@ -2809,15 +2815,15 @@ CL_ShutdownRef
 ============
 */
 void CL_ShutdownRef( void ) {
-	if ( !re.Shutdown ) {
-		return;
+	if ( re.Shutdown ) {
+		re.Shutdown( qtrue );
 	}
-	re.Shutdown( qtrue );
+
 	Com_Memset( &re, 0, sizeof( re ) );
-#ifdef USE_RENDERER_DLL
-	// su44: remember to unload renderer library
-	if(rendererLib) {
-		Sys_UnloadLibrary(rendererLib);
+
+#ifdef USE_RENDERER_DLOPEN
+	if ( rendererLib ) {
+		Sys_UnloadLibrary( rendererLib );
 		rendererLib = NULL;
 	}
 #endif
@@ -2994,22 +3000,105 @@ void CL_CG_EndTiki( dtiki_t *tiki ) {
 	}
 }
 
+/*
+============
+CL_CG_EndTiki
+============
+*/
 extern "C"
 int CL_ScaledMilliseconds(void) {
 	return Sys_Milliseconds()*com_timescale->value;
 }
 
+/*
+============
+CL_RefFS_WriteFile
+============
+*/
 void CL_RefFS_WriteFile(const char* qpath, const void* buffer, int size) {
 	FS_WriteFile(qpath, buffer, size);
 }
 
+/*
+============
+CL_RefFS_ListFiles
+============
+*/
 char** CL_RefFS_ListFiles(const char* name, const char* extension, int* numfilesfound) {
 	return FS_ListFiles(name, extension, qtrue, numfilesfound);
 }
 
+/*
+============
+CL_RefCIN_UploadCinematic
+============
+*/
 void CL_RefCIN_UploadCinematic(int handle) {
 }
 
+/*
+============
+CL_RefTIKI_GetNumChannels
+============
+*/
+int CL_RefTIKI_GetNumChannels(dtiki_t* tiki) {
+	return tiki->m_boneList.NumChannels();
+}
+
+/*
+============
+CL_RefTIKI_GetLocalChannel
+============
+*/
+int CL_RefTIKI_GetLocalChannel(dtiki_t* tiki, int channel) {
+	return tiki->m_boneList.LocalChannel(channel);
+}
+
+/*
+============
+CL_RefTIKI_GetLocalFromGlobal
+============
+*/
+int CL_RefTIKI_GetLocalFromGlobal(dtiki_t* tiki, int channel) {
+    return tiki->m_boneList.GetLocalFromGlobal(channel);
+}
+
+/*
+============
+CL_RefSKEL_GetMorphWeightFrame
+============
+*/
+int CL_RefSKEL_GetMorphWeightFrame(void* skeletor, int index, float time, int* data) {
+    return ((skeletor_c*)skeletor)->GetMorphWeightFrame(index, time, data);
+}
+
+/*
+============
+CL_RefSKEL_GetBoneParent
+============
+*/
+int CL_RefSKEL_GetBoneParent(void* skeletor, int boneIndex) {
+	return ((skeletor_c*)skeletor)->GetBoneParent(boneIndex);
+}
+
+/*
+============
+CL_GetRefSequence
+============
+*/
+int CL_GetRefSequence(void) {
+	return cls.refSequence;
+}
+
+/*
+============
+CL_IsRendererRegistered
+============
+*/
+qboolean CL_IsRendererRegistered(void) {
+    return cls.rendererRegistered;
+}
+
 /*
 ============
 CL_InitRef
@@ -3018,12 +3107,40 @@ CL_InitRef
 void CL_InitRef( void ) {
 	refimport_t	ri;
 	refexport_t	*ret;
-#ifdef USE_RENDERER_DLL
-	char dllName[256];
+#ifdef USE_RENDERER_DLOPEN
+	GetRefAPI_t		GetRefAPI;
+	char			dllName[MAX_OSPATH];
 #endif
 
 	Com_Printf( "----- Initializing Renderer ----\n" );
 
+#ifdef USE_RENDERER_DLOPEN
+	cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | CVAR_LATCH);
+
+	Com_sprintf(dllName, sizeof(dllName), "renderer_%s" ARCH_SUFFIX DLL_SUFFIX DLL_EXT, cl_renderer->string);
+
+	if(!(rendererLib = Sys_LoadDll(dllName, qfalse)) && strcmp(cl_renderer->string, cl_renderer->resetString))
+	{
+		Com_Printf("failed:\n\"%s\"\n", Sys_LibraryError());
+		Cvar_ForceReset("cl_renderer");
+
+		Com_sprintf(dllName, sizeof(dllName), "renderer_opengl1" ARCH_SUFFIX DLL_SUFFIX DLL_EXT);
+		rendererLib = Sys_LoadDll(dllName, qfalse);
+	}
+
+	if(!rendererLib)
+	{
+		Com_Printf("failed:\n\"%s\"\n", Sys_LibraryError());
+		Com_Error(ERR_FATAL, "Failed to load renderer");
+	}
+
+	GetRefAPI = (GetRefAPI_t)Sys_LoadFunction(rendererLib, "GetRefAPI");
+	if(!GetRefAPI)
+	{
+		Com_Error(ERR_FATAL, "Can't load symbol GetRefAPI: '%s'",  Sys_LibraryError());
+	}
+#endif
+
 	ri.Cmd_AddCommand = Cmd_AddCommand;
 	ri.Cmd_RemoveCommand = Cmd_RemoveCommand;
 	ri.Cmd_Argc = Cmd_Argc;
@@ -3047,8 +3164,10 @@ void CL_InitRef( void ) {
 	ri.CM_DrawDebugSurface = CM_DrawDebugSurface;
 
 	ri.FS_OpenFile = FS_FOpenFileRead;
+	ri.FS_OpenFileWrite = FS_FOpenFileWrite;
 	ri.FS_CloseFile = FS_FCloseFile;
 	ri.FS_Read = FS_Read;
+	ri.FS_Write = FS_Write;
 	ri.FS_Seek = FS_Seek;
 	ri.FS_ReadFile = FS_ReadFile;
 	ri.FS_ReadFileEx = FS_ReadFileEx;
@@ -3058,6 +3177,7 @@ void CL_InitRef( void ) {
 	ri.FS_ListFiles = CL_RefFS_ListFiles;
 	ri.FS_FileIsInPAK = FS_FileIsInPAK;
 	ri.FS_FileExists = FS_FileExists;
+	ri.FS_CanonicalFilename = FS_CanonicalFilename;
 	ri.Cvar_Get = Cvar_Get;
 	ri.Cvar_Set = Cvar_Set;
 	ri.Cvar_SetDefault = Cvar_SetDefault;
@@ -3108,40 +3228,30 @@ void CL_InitRef( void ) {
     ri.Sys_GLimpInit = Sys_GLimpInit;
     ri.Sys_LowPhysicalMemory = Sys_LowPhysicalMemory;
 
-#ifdef USE_RENDERER_DLL
-	// su44: load renderer dll
-	cl_renderer = Cvar_Get("cl_renderer", "glom", CVAR_ARCHIVE);
-	Q_snprintf(dllName, sizeof(dllName), "renderer_%s" ARCH_STRING DLL_EXT, cl_renderer->string); 
-	Com_Printf("Loading \"%s\"...", dllName);
-	if((rendererLib = Sys_LoadLibrary(dllName)) == 0) {
-#ifdef _WIN32
-		Com_Error(ERR_FATAL, "failed:\n\"%s\"\n", Sys_LibraryError());
-#else
-		char            fn[1024];
+	//
+	// Added in OPM
+	//
+	ri.UI_LoadResource = UI_LoadResource;
+	ri.CM_PointLeafnum = CM_PointLeafnum;
+	ri.CM_LeafCluster = CM_LeafCluster;
 
-		Q_strncpyz(fn, Sys_Cwd(), sizeof(fn));
-		strncat(fn, "/", sizeof(fn) - strlen(fn) - 1);
-		strncat(fn, dllName, sizeof(fn) - strlen(fn) - 1);
+    ri.TIKI_CalcLodConsts = TIKI_CalcLodConsts;
+    ri.TIKI_CalculateBounds = TIKI_CalculateBounds;
+    ri.TIKI_FindTiki = TIKI_FindTiki;
+    ri.TIKI_RegisterTikiFlags = TIKI_RegisterTikiFlags;
+    ri.TIKI_GetSkeletor = TIKI_GetSkeletor;
+    ri.TIKI_GetSkel = TIKI_GetSkel;
+    ri.TIKI_GetSkelAnimFrame = TIKI_GetSkelAnimFrame;
+    ri.TIKI_GlobalRadius = TIKI_GlobalRadius;
+    ri.TIKI_FindSkelByHeader = TIKI_FindSkelByHeader;
+	ri.TIKI_GetNumChannels = CL_RefTIKI_GetNumChannels;
+    ri.TIKI_GetLocalChannel = CL_RefTIKI_GetLocalChannel;
+    ri.TIKI_GetLocalFromGlobal = CL_RefTIKI_GetLocalFromGlobal;
 
-		Com_Printf("Loading \"%s\"...", fn);
-		if((rendererLib = Sys_LoadLibrary(fn)) == 0)
-		{
-			Com_Error(ERR_FATAL, "failed:\n\"%s\"", Sys_LibraryError());
-		}
-#endif	/* _WIN32 */
-	}
+	ri.SKEL_GetBoneParent = CL_RefSKEL_GetBoneParent;
+	ri.SKEL_GetMorphWeightFrame = CL_RefSKEL_GetMorphWeightFrame;
 
-	Com_Printf("done\n");
-
-	DGetRefAPI = Sys_LoadFunction(rendererLib, "GetRefAPI");
-	if(!DGetRefAPI)
-	{
-		Com_Error(ERR_FATAL, "Can't load symbol GetRefAPI: '%s'",  Sys_LibraryError());
-	}
-	ret = DGetRefAPI( REF_API_VERSION, &ri );
-#else
 	ret = GetRefAPI( REF_API_VERSION, &ri );
-#endif
 
 #if defined __USEA3D && defined __A3D_GEOM
 	hA3Dg_ExportRenderGeom (ret);
@@ -3157,6 +3267,8 @@ void CL_InitRef( void ) {
 
 	// unpause so the cgame definately gets a snapshot and renders a frame
 	Cvar_Set( "cl_paused", "0" );
+
+	cls.refSequence++;
 }
 
 
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 1276e52d..6da0dbe1 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3766,6 +3766,9 @@ void CL_FillUIImports(void)
 
     uii.GetConfigstring   = CL_ConfigString;
     uii.UI_CloseDMConsole = UI_CloseDMConsole;
+
+    uii.GetRefSequence = CL_GetRefSequence;
+    uii.IsRendererRegistered = CL_IsRendererRegistered;
 }
 
 /*
diff --git a/code/client/client.h b/code/client/client.h
index 92509338..a13bbb7f 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -389,6 +389,8 @@ typedef struct {
 	qhandle_t	whiteShader;
 	qhandle_t	consoleShader;
 	fontInfo_t	consoleFont;
+
+	int refSequence;
 } clientStatic_t;
 
 extern clientStatic_t	cls;
@@ -557,6 +559,9 @@ void UI_LoadResource( const char *name );
 
 qboolean CL_CheckPaused(void);
 
+int CL_GetRefSequence(void);
+qboolean CL_IsRendererRegistered(void);
+
 //
 // cl_input
 //
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index c10ead9f..88281dc5 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 include("./q_version.cmake")
 
 # Shared source files for modules
-set(SOURCES_SHARED
+set(SOURCES_SHARED_UBER
 	"${CMAKE_SOURCE_DIR}/code/qcommon/class.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/con_set.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/con_timer.cpp"
@@ -18,26 +18,35 @@ set(SOURCES_SHARED
 	"${CMAKE_SOURCE_DIR}/code/qcommon/lz77.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/mem_blockalloc.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/mem_tempalloc.cpp"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/puff.c"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/q_math.c"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/script.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/str.cpp"
 	"${CMAKE_SOURCE_DIR}/code/script/scriptexception.cpp"
 	"${CMAKE_SOURCE_DIR}/code/script/scriptvariable.cpp"
 )
 
-add_library(qcommon INTERFACE)
-target_sources(qcommon INTERFACE ${SOURCES_SHARED})
+add_library(qcommon_uber INTERFACE)
+target_sources(qcommon_uber INTERFACE ${SOURCES_SHARED_UBER})
+target_compile_features(qcommon_uber INTERFACE cxx_nullptr)
+target_include_directories(qcommon_uber INTERFACE "../qcommon" "../script")
 
 if(DEBUG_MEM_BLOCK)
-	target_compile_definitions(qcommon INTERFACE _DEBUG_MEMBLOCK=1)
+	target_compile_definitions(qcommon_uber INTERFACE _DEBUG_MEMBLOCK=1)
 endif()
 
-target_include_directories(qcommon INTERFACE "../qcommon" "../script")
-target_compile_features(qcommon INTERFACE cxx_nullptr)
-target_compile_features(qcommon INTERFACE c_variadic_macros)
-target_link_libraries(qcommon INTERFACE qcommon_version)
+set(SOURCES_SHARED
+	"${CMAKE_SOURCE_DIR}/code/qcommon/puff.c"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/q_math.c"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
+)
+
+add_library(qcommon_shared INTERFACE)
+target_sources(qcommon_shared INTERFACE ${SOURCES_SHARED})
+target_compile_features(qcommon_shared INTERFACE c_variadic_macros)
+target_include_directories(qcommon_shared INTERFACE "../qcommon")
+target_link_libraries(qcommon_shared INTERFACE qcommon_version)
+
+add_library(qcommon INTERFACE)
+target_link_libraries(qcommon INTERFACE qcommon_shared qcommon_uber)
 
 # Source files for standalone executable
 set(SOURCES_COMMON
diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index 1ea4c1e8..b5fbfb49 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -4012,7 +4012,9 @@ void FS_Restart( int checksumFeed ) {
 	// try to start up normally
 	FS_Startup(com_basegame->string);
 
+#ifndef STANDALONE
 	FS_CheckPak0( );
+#endif
 
 	// if we can't find default.cfg, assume that the paths are
 	// busted and error out now, rather than getting an unreadable
diff --git a/code/qcommon/memory.c b/code/qcommon/memory.c
index 46e984f5..b1e0da47 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
-#ifdef STANDALONE
+#ifndef DEDICATED
 #  include "../client/client.h"
 #endif
 
@@ -354,7 +354,7 @@ void Z_Meminfo_f( void )
 	Com_Printf( "\n%.2f Kbytes in %zu blocks in all memory pools\n", ( float )totalBytes / 1024.0f, totalBlocks );
 	Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
 
-#ifdef STANDALONE
+#ifndef DEDICATED
 	if (re.CountTextureMemory) {
 		Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )re.CountTextureMemory() / 1024.0f );
 		Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )re.CountTextureMemory() + totalBytes - 1 / 1024.0f );
diff --git a/code/renderercommon/new/tr_types_new.h b/code/renderercommon/new/tr_types_new.h
index 5b634d16..382cad95 100644
--- a/code/renderercommon/new/tr_types_new.h
+++ b/code/renderercommon/new/tr_types_new.h
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#include "../../tiki/tiki_shared.h"
+
 #define	MAX_ENTITIES	1023		// can't be increased without changing drawsurf bit packing
 #define MAX_POINTS     32
 #define MAX_SPRITES    2048
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index 359f53d5..47040bc3 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -266,10 +266,13 @@ typedef struct {
     void (*Cvar_SetDefault)(cvar_t* var, const char* varValue);
 
     long    (*FS_OpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
+	fileHandle_t (*FS_OpenFileWrite)(const char* filename);
     size_t  (*FS_Read)(void* buffer, size_t len, fileHandle_t fileHandle);
+	size_t (*FS_Write)(const void* buffer, size_t len, fileHandle_t h);
     void    (*FS_CloseFile)(fileHandle_t fileHandle);
     int     (*FS_Seek)(fileHandle_t fileHandle, long offset, int origin);
     long     (*FS_ReadFileEx)(const char* qpath, void** buffer, qboolean quiet);
+	void	(*FS_CanonicalFilename)(char* filename);
 
     void        (*CM_BoxTrace)(trace_t* results, const vec3_t start, const vec3_t end, const vec3_t mins, const vec3_t maxs, int model, int brushMask, int cylinder);
     int         (*CM_TerrainSquareType)(int terrainPatch, int i, int j);
@@ -287,13 +290,42 @@ typedef struct {
     debugstring_t** DebugStrings;
     int* numDebugStrings;
 
-    orientation_t   (*TIKI_OrientationInternal)(dtiki_t* tiki, int entNum, int tagNum, float scale);
-    qboolean        (*TIKI_IsOnGroundInternal)(dtiki_t* tiki, int entNum, int tagNum, float thresHold);
-    void            (*TIKI_SetPoseInternal)(void* skeletor, const frameInfo_t* frameInfo, const int* boneTag, const vec4_t *boneQuat, float actionWeight);
-    void*           (*TIKI_Alloc)(size_t size);
-    float           (*GetRadiusInternal)(dtiki_t* tiki, int entNum, float scale);
-    float           (*GetCentroidRadiusInternal)(dtiki_t* tiki, int entNum, float scale, vec3_t centroid);
-    void            (*GetFrameInternal)(dtiki_t* tiki, int entNum, skelAnimFrame_t* newFrame);
+    orientation_t (*TIKI_OrientationInternal)(dtiki_t *tiki, int entNum, int tagNum, float scale);
+    qboolean (*TIKI_IsOnGroundInternal)(dtiki_t *tiki, int entNum, int tagNum, float thresHold);
+    void (*TIKI_SetPoseInternal)(
+        void *skeletor, const frameInfo_t *frameInfo, const int *boneTag, const vec4_t *boneQuat, float actionWeight
+    );
+    void *(*TIKI_Alloc)(size_t size);
+    float (*GetRadiusInternal)(dtiki_t *tiki, int entNum, float scale);
+    float (*GetCentroidRadiusInternal)(dtiki_t *tiki, int entNum, float scale, vec3_t centroid);
+    void (*GetFrameInternal)(dtiki_t *tiki, int entNum, skelAnimFrame_t *newFrame);
+
+    void (*UI_LoadResource)(const char *name);
+
+    int (*CM_PointLeafnum)(const vec3_t p);
+    int (*CM_LeafCluster)(int leafnum);
+
+    //
+    // TIKI imports
+    //
+    void (*TIKI_CalcLodConsts)(lodControl_t *LOD);
+    void (*TIKI_CalculateBounds)(dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs);
+    dtiki_t *(*TIKI_FindTiki)(const char *path);
+    dtiki_t *(*TIKI_RegisterTikiFlags)(const char *path, qboolean use);
+    void *(*TIKI_GetSkeletor)(dtiki_t *tiki, int entnum);
+    skelHeaderGame_t *(*TIKI_GetSkel)(int index);
+    void (*TIKI_GetSkelAnimFrame)(dtiki_t *tiki, skelBoneCache_t *bones, float *radius, vec3_t *mins, vec3_t *maxes);
+    float (*TIKI_GlobalRadius)(dtiki_t *pmdl);
+    skelcache_t *(*TIKI_FindSkelByHeader)(skelHeaderGame_t *skelmodel);
+    int (*TIKI_GetNumChannels)(dtiki_t *tiki);
+    int (*TIKI_GetLocalChannel)(dtiki_t *tiki, int channel);
+    int (*TIKI_GetLocalFromGlobal)(dtiki_t *tiki, int channel);
+
+    //
+    // Skeletor imports
+    //
+    int (*SKEL_GetMorphWeightFrame)(void *skeletor, int index, float time, int *data);
+    int (*SKEL_GetBoneParent)(void *skeletor, int boneIndex);
 } refimport_t;
 
 
diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
index 2d5fb2a5..dad93085 100644
--- a/code/renderergl1/CMakeLists.txt
+++ b/code/renderergl1/CMakeLists.txt
@@ -5,17 +5,26 @@ project(omohrenderer)
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
 list(REMOVE_ITEM SOURCES_RENDERER "./tr_subs.c")
 
-add_library(omohrenderer STATIC ${SOURCES_RENDERER})
+set(SOURCES_RENDERER ${SOURCES_RENDERER}
+	"../tiki/tiki_mesh.cpp"
+)
+
+if (${USE_RENDERER_DLOPEN})
+	add_library(omohrenderer SHARED ${SOURCES_RENDERER})
+else()
+	add_library(omohrenderer STATIC ${SOURCES_RENDERER})
+endif()
 target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon")
 target_compile_features(omohrenderer PUBLIC cxx_nullptr)
 target_compile_features(omohrenderer PUBLIC c_variadic_macros)
 target_compile_definitions(omohrenderer PRIVATE USE_INTERNAL_JPEG=1)
-target_link_libraries(omohrenderer PRIVATE qcommon)
+target_link_libraries(omohrenderer PRIVATE qcommon_shared)
 target_link_libraries(omohrenderer PRIVATE omohsdl_gl)
 
 get_target_property(target_type omohrenderer TYPE)
 if (target_type STREQUAL "SHARED_LIBRARY")
 	target_sources(omohrenderer PRIVATE "./tr_subs.c")
+	target_compile_definitions(omohrenderer PUBLIC USE_RENDERER_DLOPEN=1)
 endif ()
 
 if(USE_INTERNAL_JPEG)
@@ -28,3 +37,15 @@ else()
 	target_include_directories(omohrenderer PUBLIC ${JPEG_INCLUDE_DIRS})
 	target_link_libraries(omohrenderer PRIVATE ${JPEG_LIBRARIES})
 endif()
+
+set_target_properties(omohrenderer PROPERTIES PREFIX "")
+set_target_properties(omohrenderer PROPERTIES OUTPUT_NAME "renderer_opengl1${TARGET_BIN_SUFFIX}")
+
+
+if (target_type STREQUAL "SHARED_LIBRARY")
+	INSTALL(TARGETS omohrenderer DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
+
+	if(MSVC)
+		INSTALL(FILES $<TARGET_PDB_FILE:omohrenderer> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
+	endif()
+endif ()
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 78249860..8be03c29 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -2189,13 +2189,13 @@ int R_LoadLump(fileHandle_t handle, lump_t* lump, gamelump_t* glump, int size)
     glump->length = lump->filelen;
 
     if (lump->filelen) {
-        glump->buffer = Hunk_AllocateTempMemory(lump->filelen);
+        glump->buffer = ri.Hunk_AllocateTempMemory(lump->filelen);
 
-        if (FS_Seek(handle, lump->fileofs, FS_SEEK_SET) < 0) {
+        if (ri.FS_Seek(handle, lump->fileofs, FS_SEEK_SET) < 0) {
             Com_Error(ERR_DROP, "R_LoadLump: Error seeking to lump.");
         }
 
-        FS_Read(glump->buffer, lump->filelen, handle);
+        ri.FS_Read(glump->buffer, lump->filelen, handle);
 
         if (size) {
             return lump->filelen / size;
@@ -2216,13 +2216,13 @@ void R_FreeLump(gamelump_t* lump)
 {
     if (lump->buffer)
     {
-        Hunk_FreeTempMemory(lump->buffer);
+        ri.Hunk_FreeTempMemory(lump->buffer);
         lump->buffer = NULL;
         lump->length = 0;
     }
 }
 
-#define _R( id ) UI_LoadResource( "*" #id )
+#define _R( id ) ri.UI_LoadResource( "*" #id )
 
 /*
 =================
@@ -2424,17 +2424,17 @@ void RE_LoadWorldMap( const char *name ) {
 
     ri.FS_CloseFile(h);
 
-    UI_LoadResource("*111");
+    ri.UI_LoadResource("*111");
     R_Sphere_InitLights();
-    UI_LoadResource("*112");
+    ri.UI_LoadResource("*112");
     R_InitTerrain();
-    UI_LoadResource("*113");
+    ri.UI_LoadResource("*113");
     R_InitStaticModels();
-    UI_LoadResource("*114");
+    ri.UI_LoadResource("*114");
     R_LevelMarksLoad(name);
-    UI_LoadResource("*115");
+    ri.UI_LoadResource("*115");
     R_VisDebugLoad(name);
-    UI_LoadResource("*116");
+    ri.UI_LoadResource("*116");
 }
 
 /*
diff --git a/code/renderergl1/tr_cmds.c b/code/renderergl1/tr_cmds.c
index d78b1631..a7d4fd35 100644
--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
@@ -38,7 +38,7 @@ R_PerformanceCounters
 =====================
 */
 void R_PerformanceCounters( void ) {
-	if (fps->integer) {
+	if (r_fps->integer) {
 		ri.SetPerformanceCounters(
 			backEnd.pc.c_totalIndexes / 3,
 			backEnd.pc.c_vertexes,
diff --git a/code/renderergl1/tr_font.cpp b/code/renderergl1/tr_font.cpp
index 038f15b6..22e5b82d 100644
--- a/code/renderergl1/tr_font.cpp
+++ b/code/renderergl1/tr_font.cpp
@@ -34,6 +34,29 @@ static float s_fontHeightScale = 1.0;
 static float s_fontGeneralScale = 1.0;
 static float s_fontZ = 0.0;
 
+void R_ShutdownFont() {
+    int i;
+    fontheader_t *header;
+    fontheader_sgl_t *header_sgl;
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header = &s_loadedFonts[i];
+        if (header->charTable) {
+            ri.Free(header->charTable);
+            header->charTable = NULL;
+        }
+
+        memset(header, 0, sizeof(*header));
+    }
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header_sgl = &s_loadedFonts_sgl[i];
+        memset(header_sgl, 0, sizeof(*header_sgl));
+    }
+}
+
 void R_SetFontHeightScale(float scale)
 {
     s_fontHeightScale = scale;
@@ -331,7 +354,7 @@ fontheader_t* R_LoadFont(const char* name) {
             else if (!Q_stricmp(token, "Chars"))
             {
                 header->charTableLength = atoi(COM_Parse(&ref));
-                header->charTable = (fontchartable_t*)Z_Malloc(header->charTableLength * sizeof(fontchartable_t));
+                header->charTable = (fontchartable_t*)ri.Malloc(header->charTableLength * sizeof(fontchartable_t));
                 if (!header->charTable)
                 {
                     ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
@@ -363,7 +386,7 @@ fontheader_t* R_LoadFont(const char* name) {
                         break;
                     }
 
-                    pRitFontNames[i] = (char*)Z_Malloc(strlen(token) + 1);
+                    pRitFontNames[i] = (char*)ri.Malloc(strlen(token) + 1);
                     if (!pRitFontNames[i])
                     {
                         ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
@@ -468,13 +491,13 @@ fontheader_t* R_LoadFont(const char* name) {
 
         // Free all allocated strings
         for (i = 0; i < header->numPages; i++) {
-            Z_Free(pRitFontNames[i]);
+            ri.Free(pRitFontNames[i]);
         }
 
         if (error)
         {
             if (header->charTable) {
-                Z_Free(header->charTable);
+                ri.Free(header->charTable);
             }
 
             header->numPages = 0;
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index b8bbdc54..50d58968 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -2373,7 +2373,7 @@ void SaveJPG(char * filename, int quality, int image_width, int image_height, un
 
   jpeg_finish_compress(&cinfo);
   /* After finish_compress, we can close the output file. */
-  ri.FS_WriteFile( filename, out, hackSize );
+  ri.ri.FS_WriteFile( filename, out, hackSize );
 
   ri.Hunk_FreeTempMemory(out);
 
@@ -2461,10 +2461,10 @@ static void R_LoadImage(const char* name, byte** pic, int* width, int* height, q
         }
 	}
 
-	if (scr_initialized)
+	if (tr.registered)
 	{
 		Com_sprintf(tempName, sizeof(tempName), "n%s", name);
-		UI_LoadResource(tempName);
+		ri.UI_LoadResource(tempName);
 	}
 }
 
@@ -2943,32 +2943,32 @@ void R_DumpTextureMemory() {
     char* Label1, * Label2;
     fileHandle_t stat_file;
 
-    stat_file = FS_SV_FOpenFileWrite("textureuse.csv");
+    stat_file = ri.FS_OpenFileWrite("textureuse.csv");
 
     Label1 = "Texture Name,";
-    FS_Write(Label1, strlen(Label1), stat_file);
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
     Label2 = "Size (kb),";
-    FS_Write(Label2, strlen(Label2), stat_file);
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
     Label1 = "Num Uses,";
-    FS_Write(Label1, strlen(Label1), stat_file);
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
     Label2 = "Miplevels\n";
-    FS_Write(Label2, strlen(Label2), stat_file);
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
 
     for (i = 0; i < tr.numImages; i++) {
         image_t* image = &tr.images[i];
 
-        FS_Write(image->imgName, strlen(image->imgName), stat_file);
-        FS_Write(", ", 2, stat_file);
+        ri.FS_Write(image->imgName, strlen(image->imgName), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
 
         // Write the number of bytes (in KiB)
         Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
-        FS_Write(str_buffer, strlen(str_buffer), stat_file);
-        FS_Write(", ", 2, stat_file);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
 
         // Write the sequence
         Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
-        FS_Write(str_buffer, strlen(str_buffer), stat_file);
-        FS_Write(", ", 2, stat_file);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
     }
 }
 
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index 03ce2d0d..3aab4805 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -270,6 +270,9 @@ cvar_t* r_anaglyphMode;
 cvar_t* r_aviMotionJpegQuality;
 cvar_t* r_screenshotJpegQuality;
 
+cvar_t* r_developer;
+cvar_t* r_fps;
+
 static char infostring[8192];
 
 static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
@@ -1564,14 +1567,14 @@ void R_Register( void )
 	r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
 	r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
 	r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
-	r_precacheimages = (cvar_t*)Cvar_Get("r_precacheimages", "0", 0);
+	r_precacheimages = ri.Cvar_Get("r_precacheimages", "0", 0);
 	ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
 	ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
 	r_alpha_foliage1 = ri.Cvar_Get("r_alpha_foliage1", "0.75", CVAR_CHEAT);
 	r_alpha_foliage2 = ri.Cvar_Get("r_alpha_foliage2", "0.75", CVAR_CHEAT);
 	r_blendtrees = ri.Cvar_Get("r_blendtrees", "0", CVAR_LATCH);
 	r_blendbushes = ri.Cvar_Get("r_blendbushes", "0", CVAR_LATCH);
-	fps = ri.Cvar_Get("fps", "0", 0);
+	r_fps = ri.Cvar_Get("fps", "0", 0);
 	r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
 	r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
 
@@ -1599,6 +1602,7 @@ void R_Register( void )
 	// Added in OPM
 	//
 
+	r_developer = ri.Cvar_Get("developer", "", 0);
     r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
 	r_aviMotionJpegQuality = ri.Cvar_Get("r_aviMotionJpegQuality", "90", CVAR_ARCHIVE);
     r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
@@ -1770,18 +1774,20 @@ void RE_Shutdown( qboolean destroyWindow ) {
 		Com_Memset( &glState, 0, sizeof( glState ) );
 	}
 
+	R_ShutdownFont();
+
 	tr.registered = qfalse;
 }
 
-extern qboolean scr_initialized;
+//extern qboolean scr_initialized;
 
 /*
 ** RE_BeginRegistration
 */
 void RE_BeginRegistration(glconfig_t* glconfigOut) {
 
-	UI_LoadResource("*123");
-	scr_initialized = 0;
+	ri.UI_LoadResource("*123");
+	//scr_initialized = 0;
 
 	R_IssuePendingRenderCommands();
 
@@ -1807,8 +1813,8 @@ void RE_BeginRegistration(glconfig_t* glconfigOut) {
 
 	tr.registered = qtrue;
 
-	scr_initialized = 1;
-	UI_LoadResource("*124");
+	//scr_initialized = 1;
+	ri.UI_LoadResource("*124");
 }
 
 /*
@@ -1823,11 +1829,11 @@ void RE_EndRegistration( void ) {
 	if (r_precacheimages->integer) {
 		int start, end;
 
-		start = Sys_Milliseconds();
+		start = ri.Milliseconds();
 
 		RB_ShowImages(qtrue);
 
-		end = Sys_Milliseconds();
+		end = ri.Milliseconds();
 
 		Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
@@ -1851,7 +1857,12 @@ GetRefAPI
 
 @@@@@@@@@@@@@@@@@@@@@
 */
+#ifdef USE_RENDERER_DLOPEN
+Q_EXPORT refexport_t* QDECL GetRefAPI ( int apiVersion, refimport_t *rimp ) {
+#else
 refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
+#endif
+
 	static refexport_t	re;
 
 	ri = *rimp;
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index 60020362..03a2cdff 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -1644,6 +1644,8 @@ extern	cvar_t* r_loadjpg;
 extern	cvar_t* r_loadftx;
 
 extern  cvar_t* r_showSkeleton;
+extern  cvar_t* r_developer;
+extern  cvar_t* r_fps;
 
 //====================================================================
 
@@ -2091,6 +2093,7 @@ FONT
 
 =============================================================
 */
+void R_ShutdownFont();
 fontheader_t* R_LoadFont(const char* name);
 void R_LoadFontShader(fontheader_sgl_t* font);
 void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
diff --git a/code/renderergl1/tr_marks_permanent.c b/code/renderergl1/tr_marks_permanent.c
index db920996..d23feb61 100644
--- a/code/renderergl1/tr_marks_permanent.c
+++ b/code/renderergl1/tr_marks_permanent.c
@@ -160,7 +160,7 @@ void DCLC_Save(void)
     char               map_time[32];
     int                littleValue;
 
-    hFile = FS_FOpenFileWrite(lm.szDCLFilename);
+    hFile = ri.FS_OpenFileWrite(lm.szDCLFilename);
     if (!hFile) {
         ri.Printf(PRINT_ALL, "R_SaveDCLFile: couldn't write to %s\n", lm.szDCLFilename);
     }
@@ -182,20 +182,20 @@ void DCLC_Save(void)
     header.iNumDecals    = LittleLong(iNumDecals);
     header.iNumFragments = LittleLong(iNumFragments);
 
-    FS_Write(&header, sizeof(header), hFile);
+    ri.FS_Write(&header, sizeof(header), hFile);
 
     //
     // Write the map time
     //
     memset(map_time, 0, sizeof(map_time));
     Q_strncpyz(map_time, ri.CM_MapTime(), sizeof(map_time));
-    FS_Write(map_time, sizeof(map_time), hFile);
+    ri.FS_Write(map_time, sizeof(map_time), hFile);
 
     if (!iNumDecals) {
         //
         // Nothing to write
         //
-        FS_FCloseFile(hFile);
+        ri.FS_CloseFile(hFile);
         return;
     }
 
@@ -221,7 +221,7 @@ void DCLC_Save(void)
 
         saveMark.bDoLighting = LittleLong(pMark->bDoLighting);
 
-        FS_Write(&saveMark, sizeof(saveMark), hFile);
+        ri.FS_Write(&saveMark, sizeof(saveMark), hFile);
     }
 
     for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
@@ -232,8 +232,8 @@ void DCLC_Save(void)
             savePoly.iIndex    = LittleLong(pPoly->surf.iIndex);
             savePoly.iNumVerts = LittleLong(pPoly->surf.numVerts);
 
-            FS_Write(&savePoly, sizeof(savePoly), hFile);
-            FS_Write(pPoly->verts, sizeof(pPoly->verts[0]) * savePoly.iNumVerts, hFile);
+            ri.FS_Write(&savePoly, sizeof(savePoly), hFile);
+            ri.FS_Write(pPoly->verts, sizeof(pPoly->verts[0]) * savePoly.iNumVerts, hFile);
         }
     }
 
@@ -245,16 +245,16 @@ void DCLC_Save(void)
             // No fragment to save
             //
             littleValue = 0;
-            FS_Write(&littleValue, sizeof(littleValue), hFile);
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
             continue;
         }
 
         littleValue = LittleLong(pBmodel->iNumMarkFragment);
-        FS_Write(&littleValue, sizeof(int), hFile);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
 
         for (j = 0; j < pBmodel->iNumMarkFragment; i++) {
             littleValue = ((lmPoly_t *)pBmodel->pFirstMarkFragment[j])->viewCount;
-            FS_Write(&littleValue, sizeof(int), hFile);
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
         }
     }
 
@@ -266,20 +266,20 @@ void DCLC_Save(void)
             // No fragment to save
             //
             littleValue = 0;
-            FS_Write(&littleValue, sizeof(littleValue), hFile);
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
             continue;
         }
 
         littleValue = LittleLong(pLeaf->iNumMarkFragment);
-        FS_Write(&littleValue, sizeof(int), hFile);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
 
         for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
             littleValue = ((lmPoly_t *)pLeaf->pFirstMarkFragment[j])->viewCount;
-            FS_Write(&littleValue, sizeof(int), hFile);
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
         }
     }
 
-    FS_FCloseFile(hFile);
+    ri.FS_CloseFile(hFile);
 }
 
 /*
@@ -1361,23 +1361,23 @@ void DCLC_GetInfo(void)
     }
 
     if (lm.pCurrentMark->fRotation == -1) {
-        Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
-        Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
-        Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
     } else {
-        Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
-        Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
-        Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
-        Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
-        Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
-        Cvar_SetValue("dcl_rotation", lm.pCurrentMark->fRotation);
-        Cvar_SetValue("dcl_r", lm.pCurrentMark->color[0]);
-        Cvar_SetValue("dcl_g", lm.pCurrentMark->color[1]);
-        Cvar_SetValue("dcl_b", lm.pCurrentMark->color[2]);
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+        ri.Cvar_SetValue("dcl_rotation", lm.pCurrentMark->fRotation);
+        ri.Cvar_SetValue("dcl_r", lm.pCurrentMark->color[0]);
+        ri.Cvar_SetValue("dcl_g", lm.pCurrentMark->color[1]);
+        ri.Cvar_SetValue("dcl_b", lm.pCurrentMark->color[2]);
     }
 
-    Cvar_SetValue("dcl_alpha", lm.pCurrentMark->color[3]);
-    Cvar_SetValue("dcl_dolighting", lm.pCurrentMark->bDoLighting);
+    ri.Cvar_SetValue("dcl_alpha", lm.pCurrentMark->color[3]);
+    ri.Cvar_SetValue("dcl_dolighting", lm.pCurrentMark->bDoLighting);
 
     lm.bAutoApplySettings = qtrue;
 }
@@ -1494,7 +1494,7 @@ DCLC_RandomRoll
 */
 void DCLC_RandomRoll(void)
 {
-    Cvar_SetValue("dcl_rotation", random() * 360.0);
+    ri.Cvar_SetValue("dcl_rotation", random() * 360.0);
 }
 
 /*
@@ -1735,14 +1735,14 @@ void R_UpdateLevelMarksSystem()
                 if (shader != tr.defaultShader && lm.pCurrentMark->markShader != shader) {
                     lm.pCurrentMark->markShader = shader;
                     // Set the decal radius
-                    Cvar_SetValue("dcl_radius", 16.0);
+                    ri.Cvar_SetValue("dcl_radius", 16.0);
                     dcl_radius->modified = qfalse;
 
                     // Set the decal scale
-                    Cvar_SetValue(
+                    ri.Cvar_SetValue(
                         "dcl_heightscale", shader->unfoggedStages[0]->bundle[0].image[0]->height / 16.0 * 0.5
                     );
-                    Cvar_SetValue("dcl_widthscale", shader->unfoggedStages[0]->bundle[0].image[0]->width / 16.0 * 0.5);
+                    ri.Cvar_SetValue("dcl_widthscale", shader->unfoggedStages[0]->bundle[0].image[0]->width / 16.0 * 0.5);
 
                     bDoUpdate = qtrue;
                 }
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index 048d2647..96189a70 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -229,7 +229,7 @@ static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki,
 		}
 		else if( !stricmp( ptr, "tik" ) )
 		{
-			mod->d.tiki = TIKI_RegisterTikiFlags( name, use );
+			mod->d.tiki = ri.TIKI_RegisterTikiFlags( name, use );
 			Q_strncpyz( mod->name, name, sizeof( mod->name ) );
 
 			if( mod->d.tiki )
@@ -373,7 +373,7 @@ float R_ModelRadius( qhandle_t handle ) {
 		}
 		break;
 	case MOD_TIKI:
-		return TIKI_GlobalRadius( model->d.tiki );
+		return ri.TIKI_GlobalRadius( model->d.tiki );
 	case MOD_SPRITE:
 		maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
 		w = model->d.sprite->height * model->d.sprite->scale * 0.5;
@@ -411,7 +411,7 @@ void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
 		VectorCopy( model->d.bmodel->bounds[ 1 ], maxs );
 		break;
 	case MOD_TIKI:
-		TIKI_CalculateBounds( model->d.tiki, 1.0, mins, maxs );
+		ri.TIKI_CalculateBounds( model->d.tiki, 1.0, mins, maxs );
 		break;
 	case MOD_SPRITE:
 		mins[ 0 ] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
@@ -424,6 +424,8 @@ void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
 	}
 }
 
+#if 0
+// Replaced by TIKI_FindSkelByHeader
 /*
 ====================
 GetModelPath
@@ -455,6 +457,7 @@ const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
 
 	return NULL;
 }
+#endif
 
 /*
 ====================
@@ -508,6 +511,22 @@ int GetLodCutoff( skelHeaderGame_t *skelmodel, float lod_val, int renderfx ) {
 	}
 }
 
+/*
+===============
+R_SaveLODFile
+===============
+*/
+static void R_SaveLODFile(const char *path, lodControl_t *LOD)
+{
+    fileHandle_t file = ri.FS_OpenFileWrite(path);
+    if (!file) {
+        ri.Printf(PRINT_WARNING, "SaveLODFile: Failed to open file %s\n", path);
+        return;
+    }
+
+    ri.FS_Write(LOD, sizeof(lodControl_t), file);
+}
+
 /*
 ====================
 GetToolLodCutoff
@@ -532,32 +551,32 @@ int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
 
 	if( lod_save->integer == 1 )
 	{
-		Cvar_Set( "lod_save", "0" );
-		Q_strncpyz( lodPath, GetModelPath( skelmodel ), sizeof( lodPath ) );
+		ri.Cvar_Set( "lod_save", "0" );
+		Q_strncpyz( lodPath, ri.TIKI_FindSkelByHeader( skelmodel )->path, sizeof( lodPath ) );
 		ext = strstr( lodPath, "skd" );
 		strcpy( ext, "lod" );
-		SaveLODFile( lodPath, LOD );
+		R_SaveLODFile( lodPath, LOD );
 	}
 
 	if( lod_mesh->modified )
 	{
 		lod_mesh->modified = qfalse;
-		Cvar_Set( "lod_minLOD", va( "%f", LOD->minMetric ) );
-		Cvar_Set( "lod_maxLOD", va( "%f", LOD->maxMetric ) );
-		Cvar_Set( "lod_LOD_slider", va( "%f", 0.5 ) );
-		Cvar_Set( "lod_curve_0_slider", va( "%f", LOD->curve[ 0 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_1_slider", va( "%f", LOD->curve[ 1 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_2_slider", va( "%f", LOD->curve[ 2 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_3_slider", va( "%f", LOD->curve[ 3 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_4_slider", va( "%f", LOD->curve[ 4 ].val / totalRange ) );
+		ri.Cvar_Set( "lod_minLOD", va( "%f", LOD->minMetric ) );
+		ri.Cvar_Set( "lod_maxLOD", va( "%f", LOD->maxMetric ) );
+		ri.Cvar_Set( "lod_LOD_slider", va( "%f", 0.5 ) );
+		ri.Cvar_Set( "lod_curve_0_slider", va( "%f", LOD->curve[ 0 ].val / totalRange ) );
+		ri.Cvar_Set( "lod_curve_1_slider", va( "%f", LOD->curve[ 1 ].val / totalRange ) );
+		ri.Cvar_Set( "lod_curve_2_slider", va( "%f", LOD->curve[ 2 ].val / totalRange ) );
+		ri.Cvar_Set( "lod_curve_3_slider", va( "%f", LOD->curve[ 3 ].val / totalRange ) );
+		ri.Cvar_Set( "lod_curve_4_slider", va( "%f", LOD->curve[ 4 ].val / totalRange ) );
 	}
 
 
-	Cvar_Set( "lod_curve_0_val", va( "%f", lod_curve_0_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_1_val", va( "%f", lod_curve_1_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_2_val", va( "%f", lod_curve_2_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_3_val", va( "%f", lod_curve_3_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_4_val", va( "%f", lod_curve_4_slider->value * totalRange ) );
+	ri.Cvar_Set( "lod_curve_0_val", va( "%f", lod_curve_0_slider->value * totalRange ) );
+	ri.Cvar_Set( "lod_curve_1_val", va( "%f", lod_curve_1_slider->value * totalRange ) );
+	ri.Cvar_Set( "lod_curve_2_val", va( "%f", lod_curve_2_slider->value * totalRange ) );
+	ri.Cvar_Set( "lod_curve_3_val", va( "%f", lod_curve_3_slider->value * totalRange ) );
+	ri.Cvar_Set( "lod_curve_4_val", va( "%f", lod_curve_4_slider->value * totalRange ) );
 
 	LOD->minMetric = lod_minLOD->value;
 	LOD->maxMetric = lod_maxLOD->value;
@@ -567,7 +586,7 @@ int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
 	LOD->curve[ 3 ].val = lod_curve_3_val->value;
 	LOD->curve[ 4 ].val = lod_curve_4_val->value;
 
-	TIKI_CalcLodConsts( LOD );
+	ri.TIKI_CalcLodConsts( LOD );
 	return GetLodCutoff( skelmodel, lod_val, 0 );
 }
 
@@ -604,7 +623,7 @@ void RB_DrawSkeletor(trRefEntity_t* ent) {
 	skeletor_c	*skeletor;
 
 	tiki = R_Model_GetHandle( ent->e.hModel );
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ENTITYNUM_NONE );
+	skeletor = ( skeletor_c * )ri.TIKI_GetSkeletor( tiki, ENTITYNUM_NONE );
 
 	if( r_showSkeleton->integer == 1 ) {
 		//vec3_t vForward, vRight, vUp;
@@ -615,11 +634,10 @@ void RB_DrawSkeletor(trRefEntity_t* ent) {
 		qglLineWidth( 3 );
 		qglBegin( GL_LINES );
 
-
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) { // draw a skeleton
+		for( i = 0; i < ri.TIKI_GetNumChannels(tiki); i++ ) { // draw a skeleton
 
 			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-			iParentBone = skeletor->GetBoneParent( i );
+			iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
 
 			if( iParentBone != -1 ) {
 				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
@@ -665,8 +683,8 @@ void RB_DrawSkeletor(trRefEntity_t* ent) {
 
 		qglLineWidth( 3 );
 		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			iParentBone = skeletor->GetBoneParent( i );
+		for( i = 0; i < ri.TIKI_GetNumChannels(tiki); i++ ) {
+			iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
 
 			if( iParentBone > 0 )	{
 				ori = R_GetTagPositionAndOrientation( &ent->e, i );
@@ -680,7 +698,7 @@ void RB_DrawSkeletor(trRefEntity_t* ent) {
 		qglEnd();
 
 		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
+		for( i = 0; i < ri.TIKI_GetNumChannels(tiki); i++ ) {
 			vec3_t up, down, front;
 			ori = R_GetTagPositionAndOrientation( &ent->e, i );
 
@@ -754,7 +772,7 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
 
 	outbones = &TIKI_Skel_Bones[ TIKI_Skel_Bones_Index ];
 
-	num_tags = tiki->m_boneList.NumChannels();
+	num_tags = ri.TIKI_GetNumChannels(tiki);
 
 	if( num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES )
 	{
@@ -815,7 +833,7 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
 		}
 	}
 
-	newFrame = ( skelAnimFrame_t * )ri.Hunk_AllocateTempMemory( sizeof( skelAnimFrame_t ) + tiki->m_boneList.NumChannels() * sizeof( SkelMat4 ) );
+	newFrame = ( skelAnimFrame_t * )ri.Hunk_AllocateTempMemory( sizeof( skelAnimFrame_t ) + ri.TIKI_GetNumChannels(tiki) * sizeof( SkelMat4 ) );
 	R_GetFrame( &ent->e, newFrame );
 
 	if (lod_tool->integer || iRadiusCull != CULL_CLIP || R_CullSkelModel(tiki, &ent->e, newFrame, tiki_scale, tiki_localorigin) != CULL_OUT)
@@ -852,12 +870,12 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
 	//
 	// get the skeletor
 	//
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ent->e.entityNumber );
+	skeletor = ( skeletor_c * )ri.TIKI_GetSkeletor( tiki, ent->e.entityNumber );
 
 	//
 	// add morphs
 	//
-	added = skeletor->GetMorphWeightFrame( ent->e.frameInfo[ 0 ].index, ent->e.frameInfo[ 0 ].time, &skeletorMorphCache[ skeletorMorphCacheIndex ] );
+	added = ri.SKEL_GetMorphWeightFrame( skeletor, ent->e.frameInfo[ 0 ].index, ent->e.frameInfo[ 0 ].time, &skeletorMorphCache[ skeletorMorphCacheIndex ] );
 	ent->e.morphstart = skeletorMorphCacheIndex;
 
 	if( added )
@@ -874,7 +892,7 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
 	bsurf = &ent->e.surfaces[ 0 ];
 	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
 	{
-		skelHeaderGame_t *skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
+		skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel( tiki->mesh[ mesh ] );
 
 		if( !skelmodel )
 		{
@@ -1064,7 +1082,7 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 	bFound = qfalse;
 	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
 	{
-		skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
+		skelmodel = ri.TIKI_GetSkel( tiki->mesh[ mesh ] );
 		psurface = skelmodel->pSurfaces;
 
 		// find the surface
@@ -1246,14 +1264,14 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
 				}
 
-				boneNum = tiki->m_boneList.LocalChannel(channelNum);
+				boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
 				bone = &bones[boneNum];
 
 				SkelVertGetNormal(newVerts, bone, normal);
 
 				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-					boneNum = tiki->m_boneList.LocalChannel(channelNum);
+					boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
 					bone = &bones[boneNum];
 
 					if (!weightNum) {
@@ -1352,14 +1370,14 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
 
 				channelNum = skelmodel->pBones[weight->boneIndex].channel;
-				boneNum = tiki->m_boneList.LocalChannel(channelNum);
+				boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
 				bone = &bones[boneNum];
 
 				SkelVertGetNormal(newVerts, bone, normal);
 
 				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
 					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-					boneNum = tiki->m_boneList.LocalChannel(channelNum);
+					boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
 					bone = &bones[boneNum];
 
 					SkelWeightGetXyz(weight, bone, out);
@@ -1501,7 +1519,7 @@ void RB_StaticMesh(staticSurface_t *staticSurf)
     assert(surf->pStaticXyz);
 
     meshNum   = staticSurf->meshNum;
-    skelmodel = TIKI_GetSkel(tiki->mesh[meshNum]);
+    skelmodel = ri.TIKI_GetSkel(tiki->mesh[meshNum]);
 
     //
     // Process LOD
@@ -1673,7 +1691,7 @@ void R_PrintInfoWorldtris( void ) {
 
         totalNumTris += numTris;
         tiki = backEnd.refdef.entities[i].e.tiki;
-        skelmodel = TIKI_GetSkel(tiki->mesh[0]);
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
         Com_Printf("ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
     }
 
@@ -1690,7 +1708,7 @@ void R_PrintInfoWorldtris( void ) {
 
         totalNumTris += numTris;
         tiki = backEnd.refdef.staticModels[i].tiki;
-        skelmodel = TIKI_GetSkel(tiki->mesh[0]);
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
         Com_Printf("sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
     }
 
@@ -1719,7 +1737,7 @@ void R_UpdatePoseInternal( refEntity_t *model ) {
 		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
 	}
 
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
+	ri.TIKI_SetPoseInternal( ri.TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
 }
 
 /*
@@ -1732,7 +1750,7 @@ void RE_ForceUpdatePose( refEntity_t *model ) {
 		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
 	}
 
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
+	ri.TIKI_SetPoseInternal( ri.TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
 }
 
 /*
@@ -1940,7 +1958,7 @@ void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, in
 
 	for (int i = 0; i < tiki->numMeshes; i++)
 	{
-		skelHeaderGame_t *skelmodel = TIKI_GetSkel(tiki->mesh[i]);
+		skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tiki->mesh[i]);
 		skelSurfaceGame_t *surface = skelmodel->pSurfaces;
 
 		for (int j = 0; j < skelmodel->numSurfaces; j++)
diff --git a/code/renderergl1/tr_shade.c b/code/renderergl1/tr_shade.c
index af653548..23270d8d 100644
--- a/code/renderergl1/tr_shade.c
+++ b/code/renderergl1/tr_shade.c
@@ -1860,10 +1860,10 @@ void RB_EndSurface( void ) {
 		//
 		// draw debugging stuff
 		//
-		if (r_showtris->integer && developer->integer) {
+		if (r_showtris->integer && r_developer->integer) {
 			DrawTris(input, r_showtris->integer);
 		}
-		if (r_shownormals->integer && developer->integer) {
+		if (r_shownormals->integer && r_developer->integer) {
 			DrawNormals(input);
 		}
 	}
diff --git a/code/renderergl1/tr_staticmodels.cpp b/code/renderergl1/tr_staticmodels.cpp
index b16328f1..dfa57ec8 100644
--- a/code/renderergl1/tr_staticmodels.cpp
+++ b/code/renderergl1/tr_staticmodels.cpp
@@ -86,16 +86,16 @@ void R_InitStaticModels(void)
             Com_sprintf(szTemp, sizeof(szTemp), "models/%s", pSM->model);
         }
 
-        FS_CanonicalFilename(szTemp);
-        exists    = TIKI_FindTiki(szTemp) != NULL;
-        pSM->tiki = TIKI_RegisterTiki(szTemp);
+        ri.FS_CanonicalFilename(szTemp);
+        exists    = ri.TIKI_FindTiki(szTemp) != NULL;
+        pSM->tiki = ri.TIKI_RegisterTikiFlags(szTemp, qfalse);
 
         if (!pSM->tiki) {
             ri.Printf(PRINT_WARNING, "^~^~^: Warning: Cannot Load Static Model %s\n", szTemp);
             continue;
         }
 
-        pSM->radius = TIKI_GlobalRadius(pSM->tiki);
+        pSM->radius = ri.TIKI_GlobalRadius(pSM->tiki);
 
         //
         // register shaders
@@ -121,7 +121,7 @@ void R_InitStaticModels(void)
         }
 
         // prepare the skeleton frame for the static model
-        TIKI_GetSkelAnimFrame(pSM->tiki, bones, &radius, &mins, &maxs);
+        ri.TIKI_GetSkelAnimFrame(pSM->tiki, bones, &radius, &mins, &maxs);
         pSM->cull_radius = radius * pSM->tiki->load_scale * pSM->scale;
 
         // Suggestion:
@@ -129,7 +129,7 @@ void R_InitStaticModels(void)
 
         if (!exists) {
             for (j = 0; j < pSM->tiki->numMeshes; j++) {
-                skelHeaderGame_t  *skelmodel = TIKI_GetSkel(pSM->tiki->mesh[j]);
+                skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(pSM->tiki->mesh[j]);
                 skelSurfaceGame_t *surf;
 
                 if (!skelmodel) {
@@ -168,8 +168,7 @@ void R_InitStaticModels(void)
                                                   + vert->numMorphs * sizeof(skeletorMorph_t));
 
                         if (j > 0) {
-                            channel =
-                                pSM->tiki->m_boneList.GetLocalFromGlobal(skelmodel->pBones[weight->boneIndex].channel);
+                            channel = ri.TIKI_GetLocalChannel(pSM->tiki, skelmodel->pBones[weight->boneIndex].channel);
                         } else {
                             channel = weight->boneIndex;
                         }
@@ -365,7 +364,7 @@ void R_AddStaticModelSurfaces(void)
             //
             dsurf = tiki->surfaces;
             for (int mesh = 0; mesh < tiki->numMeshes; mesh++) {
-                skelHeaderGame_t  *skelmodel = TIKI_GetSkel(tiki->mesh[mesh]);
+                skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
                 skelSurfaceGame_t *surface;
                 staticSurface_t   *s_surface;
                 shader_t          *shader;
@@ -572,7 +571,7 @@ void R_PrintInfoStaticModels()
     Com_Printf("Total static models rendered: %d\n", iRenderCount);
 
     for (i = 0; i < count; i++) {
-        skelHeaderGame_t *skelmodel = TIKI_GetSkel(tikis[i]->mesh[0]);
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tikis[i]->mesh[0]);
 
         Com_Printf(
             "model: %s, version: %d, count: %d,\n culling min %.1f %.1f %.1f, max %.1f %.1f %.1f, radius %.1f\n",
diff --git a/code/renderergl1/tr_subs.c b/code/renderergl1/tr_subs.c
new file mode 100644
index 00000000..cbe7503d
--- /dev/null
+++ b/code/renderergl1/tr_subs.c
@@ -0,0 +1,60 @@
+/*
+===========================================================================
+Copyright (C) 2010 James Canete (use.less01@gmail.com)
+
+This file is part of Quake III Arena source code.
+
+Quake III Arena source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+Quake III Arena source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Quake III Arena source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// tr_subs.c - common function replacements for modular renderer
+
+#include "tr_local.h"
+
+void QDECL Com_Printf( const char *msg, ... )
+{
+	va_list         argptr;
+	char            text[1024];
+
+	va_start(argptr, msg);
+	Q_vsnprintf(text, sizeof(text), msg, argptr);
+	va_end(argptr);
+
+	ri.Printf(PRINT_ALL, "%s", text);
+}
+
+void QDECL Com_DPrintf( const char *msg, ... )
+{
+	va_list         argptr;
+	char            text[1024];
+
+	va_start(argptr, msg);
+	Q_vsnprintf(text, sizeof(text), msg, argptr);
+	va_end(argptr);
+
+	ri.Printf(PRINT_DEVELOPER, "%s", text);
+}
+
+void QDECL Com_Error( int level, const char *error, ... )
+{
+	va_list         argptr;
+	char            text[1024];
+
+	va_start(argptr, error);
+	Q_vsnprintf(text, sizeof(text), error, argptr);
+	va_end(argptr);
+
+	ri.Error(level, "%s", text);
+}
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index 7cc887e5..ee3ee1bf 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -684,9 +684,9 @@ static void R_PreTessellateTerrain()
     R_IssuePendingRenderCommands();
 
     if (ter_maxtris->integer < 4 * numTerrainPatches) {
-        Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
+        ri.Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
     } else if (ter_maxtris->integer > 65535) {
-        Cvar_SetValue("ter_maxtris", 65535);
+        ri.Cvar_SetValue("ter_maxtris", 65535);
     }
 
     Com_DPrintf("Using ter_maxtris = %d\n", ter_maxtris->integer);
@@ -1602,7 +1602,7 @@ void R_TerrainCrater_f(void)
 {
     vec3_t dir;
 
-    if (!Cvar_VariableIntegerValue("cheats")) {
+    if (!ri.Cvar_VariableIntegerValue("cheats")) {
         //
         // Added in OPM
         //  This command may be used for debugging purposes.
@@ -1634,7 +1634,7 @@ void R_InitTerrain()
     ter_maxtris        = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
     ter_count          = ri.Cvar_Get("ter_count", "0", 0);
 
-    Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
+    ri.Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
     R_PreTessellateTerrain();
 
     for (i = 0; i < TERRAIN_TABLE_SIZE; i++) {
diff --git a/code/renderergl1/tr_vis.cpp b/code/renderergl1/tr_vis.cpp
index fe303a41..b4dbf0de 100644
--- a/code/renderergl1/tr_vis.cpp
+++ b/code/renderergl1/tr_vis.cpp
@@ -335,8 +335,8 @@ void R_VisDebug()
         LoadPortals(buffer);
     }
 
-    leafnum = CM_PointLeafnum(tr.refdef.vieworg);
-    cluster = CM_LeafCluster(leafnum);
+    leafnum = ri.CM_PointLeafnum(tr.refdef.vieworg);
+    cluster = ri.CM_LeafCluster(leafnum);
     if (cluster < 0) {
         return;
     }
diff --git a/code/renderergl1/tr_world.c b/code/renderergl1/tr_world.c
index 0d4dab98..2e36217a 100644
--- a/code/renderergl1/tr_world.c
+++ b/code/renderergl1/tr_world.c
@@ -774,7 +774,7 @@ qboolean R_inPVS( const vec3_t p1, const vec3_t p2 ) {
 	byte	*vis;
 
 	leaf = R_PointInLeaf( p1 );
-	vis = CM_ClusterPVS( leaf->cluster );
+	vis = ri.CM_ClusterPVS( leaf->cluster );
 	leaf = R_PointInLeaf( p2 );
 
 	if ( !(vis[leaf->cluster>>3] & (1<<(leaf->cluster&7))) ) {
diff --git a/code/sdl/CMakeLists.txt b/code/sdl/CMakeLists.txt
index 58e79160..25f29f73 100644
--- a/code/sdl/CMakeLists.txt
+++ b/code/sdl/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.12)
 
 project(omohsdl)
 
-file(GLOB SOURCES_SDL_CLIENT
+set(SOURCES_SDL_CLIENT
 "./sdl_input.c"
 )
 
-file(GLOB SOURCES_SDL_GL
+set(SOURCES_SDL_GL
 "./sdl_gamma.c"
 "./sdl_glimp.c"
 )
diff --git a/code/tiki/CMakeLists.txt b/code/tiki/CMakeLists.txt
index 7a02e3f4..cb9ebff0 100644
--- a/code/tiki/CMakeLists.txt
+++ b/code/tiki/CMakeLists.txt
@@ -2,14 +2,27 @@ cmake_minimum_required(VERSION 3.12)
 
 project(omohtiki)
 
-file(GLOB_RECURSE SOURCES_TIKI "./*.c" "./*.cpp")
+set(SOURCES_TIKI
+	"./tiki_anim.cpp"
+	"./tiki_cache.cpp"
+	"./tiki_commands.cpp"
+	"./tiki_files.cpp"
+	"./tiki_frame.cpp"
+	"./tiki_imports.cpp"
+	"./tiki_parse.cpp"
+	"./tiki_skel.cpp"
+	"./tiki_surface.cpp"
+	"./tiki_tag.cpp"
+	"./tiki_utility.cpp"
+)
 
-set(COMMON_TIKI_SRCS
+
+set(SOURCES_TIKI_COMMON
 	"../qcommon/tiki_main.cpp"
 	"../qcommon/tiki_script.cpp"
 )
 
-add_library(omohtiki STATIC ${SOURCES_TIKI} ${COMMON_TIKI_SRCS})
+add_library(omohtiki STATIC ${SOURCES_TIKI} ${SOURCES_TIKI_COMMON})
 target_compile_features(omohtiki PRIVATE cxx_nullptr)
 target_compile_features(omohtiki PRIVATE c_variadic_macros)
 target_link_libraries(omohtiki PUBLIC qcommon)
\ No newline at end of file
diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index 53e9cddf..3da54637 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -1051,6 +1051,42 @@ skelcache_t *TIKI_FindSkel(const char *path)
     return NULL;
 }
 
+/*
+===============
+TIKI_FindSkelByHeader
+
+Added in OPM
+Return the skelcache associated with the specified skelmodel
+===============
+*/
+skelcache_t *TIKI_FindSkelByHeader(skelHeaderGame_t *skelmodel)
+{
+    int          i;
+    int          num;
+    skelcache_t *cache;
+
+    num = cache_numskel;
+
+    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+        cache = &skelcache[i];
+
+        if (!cache->skel) {
+            continue;
+        }
+
+        if (cache->skel == skelmodel) {
+            return cache;
+        }
+
+        if (num == 0) {
+            break;
+        }
+        num--;
+    }
+
+    return NULL;
+}
+
 /*
 ===============
 TIKI_FindFreeSkel
diff --git a/code/tiki/tiki_skel.h b/code/tiki/tiki_skel.h
index 86361487..210e06e8 100644
--- a/code/tiki/tiki_skel.h
+++ b/code/tiki/tiki_skel.h
@@ -37,6 +37,7 @@ extern "C" {
     void              TIKI_FreeSkel(int index);
     void              TIKI_FreeSkelCache(skelcache_t *cache);
     skelcache_t      *TIKI_FindSkel(const char *path);
+    skelcache_t      *TIKI_FindSkelByHeader(skelHeaderGame_t *skelmodel);
     skelcache_t      *TIKI_FindFreeSkel(void);
     int               TIKI_RegisterSkel(const char *path, dtiki_t *tiki);
 
diff --git a/code/uilib/ui_public.h b/code/uilib/ui_public.h
index e0712475..ac7f801d 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -126,6 +126,12 @@ typedef struct uiimport_s {
 	const char *( *GetConfigstring )( int index );
 	void ( *UI_CloseDMConsole )( void );
 	void ( *GetClipboardData )( char *buf, int buflen );
+
+	//
+	// Added in OPM
+	//
+	int (*GetRefSequence)(void);
+	qboolean (*IsRendererRegistered)(void);
 } uiimport_t;
 
 #if 1
diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 48cb298e..36879cf4 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -83,11 +83,23 @@ const unsigned char DBCS_Tokin_Korean[] = {
 
 int UIFont::CodeSearch(unsigned short uch)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return -1;
+    }
+
     return UI_FontCodeSearch(m_font, uch);
 }
 
 bool UIFont::DBCSIsLeadByte(unsigned short uch)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
     return UI_FontDBCSIsLeadByte(m_font, uch);
 }
 
@@ -97,6 +109,12 @@ bool UIFont::DBCSIsMaekin(unsigned short uch)
     const unsigned char   *p;
     unsigned char ch;
 
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
     if (uch < 0x100) {
         return false;
     }
@@ -135,6 +153,12 @@ bool UIFont::DBCSIsAtokin(unsigned short uch)
     const unsigned char   *p;
     unsigned char ch;
 
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
     if (uch < 0x100) {
         return false;
     }
@@ -249,6 +273,9 @@ UIFont::UIFont()
 
     color = UBlack;
     setColor(color);
+
+    refHandle = uii.GetRefSequence();
+    name = "verdana-14";
 }
 
 UIFont::UIFont(const char *fn)
@@ -272,10 +299,19 @@ void UIFont::setFont(const char *fontname)
     if (!m_font) {
         uii.Sys_Error(ERR_DROP, "Couldn't load font %s\n", fontname);
     }
+
+    refHandle = uii.GetRefSequence();
+    name = fontname;
 }
 
 void UIFont::Print(float x, float y, const char *text, size_t maxlen, const float *virtualScreen)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return;
+    }
+
     uii.Rend_SetColor(color);
     uii.Rend_DrawString(m_font, text, x, y, maxlen, virtualScreen);
 }
@@ -489,11 +525,23 @@ void UIFont::PrintOutlinedJustified(
 
 int UIFont::getMaxWidthIndex(const char *text, int maxlen)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return 0;
+    }
+
     return UI_FontStringMaxWidth(m_font, text, maxlen);
 }
 
 int UIFont::getWidth(const char *text, int maxlen)
 {
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return 0;
+    }
+
     return UI_FontStringWidth(m_font, text, maxlen);
 }
 
@@ -503,8 +551,10 @@ int UIFont::getCharWidth(unsigned short ch)
     int indirected;
     float widthMul = 1.0f; // Added in OPM for easier readability
 
+    CheckRefreshFont();
+
     if (!m_font) {
-        return 0;
+        return 4;
     }
 
     if (ch == '\t') {
@@ -537,6 +587,8 @@ int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
     float height;
     int   i;
 
+    CheckRefreshFont();
+
     if (!m_font) {
         return 0;
     }
@@ -558,6 +610,8 @@ int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
 
 int UIFont::getHeight(const float* virtualScale)
 {
+    CheckRefreshFont();
+
     if (virtualScale) {
         if (m_font) {
             return (m_font->sgl[0]->height * virtualScale[0]);
@@ -731,3 +785,11 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 
     return maxwidths * 256.0;
 }
+
+void UIFont::CheckRefreshFont() {
+    if (refHandle != uii.GetRefSequence()) {
+        setFont(name);
+    } else if (!uii.IsRendererRegistered()) {
+        m_font = NULL;
+    }
+}
\ No newline at end of file
diff --git a/code/uilib/uifont.h b/code/uilib/uifont.h
index 93a61349..786fee3b 100644
--- a/code/uilib/uifont.h
+++ b/code/uilib/uifont.h
@@ -43,6 +43,12 @@ protected:
     UColor        color;
     fontheader_t *m_font;
 
+    //
+    // Added in OPM
+    //
+    str           name;
+    int           refHandle;
+
 public:
     UIFont();
     UIFont(const char *fn);
@@ -67,6 +73,9 @@ public:
     bool DBCSIsMaekin(unsigned short uch);
     bool DBCSIsAtokin(unsigned short uch);
     int DBCSGetWordBlockCount(const char* text, int maxlen);
+
+private:
+    void CheckRefreshFont();
 };
 
 int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen);

From 39981643a81545f550f4d8a6e68e73c961543d75 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 6 Dec 2024 00:45:08 +0100
Subject: [PATCH 1603/2040] Fix incorrect count when unloading sgl fonts

---
 code/renderergl1/tr_font.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl1/tr_font.cpp b/code/renderergl1/tr_font.cpp
index 22e5b82d..5fe39d51 100644
--- a/code/renderergl1/tr_font.cpp
+++ b/code/renderergl1/tr_font.cpp
@@ -50,7 +50,7 @@ void R_ShutdownFont() {
         memset(header, 0, sizeof(*header));
     }
 
-    for (i = 0; i < s_numLoadedFonts; i++)
+    for (i = 0; i < s_numLoadedFonts_sgl; i++)
     {
         header_sgl = &s_loadedFonts_sgl[i];
         memset(header_sgl, 0, sizeof(*header_sgl));

From 6f686cb7fa4dad999acba57401ec713c0d104af1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 6 Dec 2024 00:45:18 +0100
Subject: [PATCH 1604/2040] Check if the renderer is loaded instead of checking
 if it's registered

---
 code/client/cl_main.cpp | 6 +++---
 code/client/cl_ui.cpp   | 2 +-
 code/client/client.h    | 2 +-
 code/uilib/ui_public.h  | 2 +-
 code/uilib/uifont.cpp   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 32ac0bf5..bb139edf 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3092,11 +3092,11 @@ int CL_GetRefSequence(void) {
 
 /*
 ============
-CL_IsRendererRegistered
+CL_IsRendererLoaded
 ============
 */
-qboolean CL_IsRendererRegistered(void) {
-    return cls.rendererRegistered;
+qboolean CL_IsRendererLoaded(void) {
+	return re.Shutdown != NULL;
 }
 
 /*
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 6da0dbe1..ccc4dd4c 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3768,7 +3768,7 @@ void CL_FillUIImports(void)
     uii.UI_CloseDMConsole = UI_CloseDMConsole;
 
     uii.GetRefSequence = CL_GetRefSequence;
-    uii.IsRendererRegistered = CL_IsRendererRegistered;
+    uii.IsRendererLoaded = CL_IsRendererLoaded;
 }
 
 /*
diff --git a/code/client/client.h b/code/client/client.h
index a13bbb7f..7c15b003 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -560,7 +560,7 @@ void UI_LoadResource( const char *name );
 qboolean CL_CheckPaused(void);
 
 int CL_GetRefSequence(void);
-qboolean CL_IsRendererRegistered(void);
+qboolean CL_IsRendererLoaded(void);
 
 //
 // cl_input
diff --git a/code/uilib/ui_public.h b/code/uilib/ui_public.h
index ac7f801d..bb86d51a 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -131,7 +131,7 @@ typedef struct uiimport_s {
 	// Added in OPM
 	//
 	int (*GetRefSequence)(void);
-	qboolean (*IsRendererRegistered)(void);
+	qboolean (*IsRendererLoaded)(void);
 } uiimport_t;
 
 #if 1
diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 36879cf4..51ac1328 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -616,7 +616,7 @@ int UIFont::getHeight(const float* virtualScale)
         if (m_font) {
             return (m_font->sgl[0]->height * virtualScale[0]);
         } else {
-            return (16.0 * uid.vidHeight * virtualScale[1]);
+            return (16.0 * virtualScale[1]);
         }
     } else {
         if (m_font) {
@@ -789,7 +789,7 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 void UIFont::CheckRefreshFont() {
     if (refHandle != uii.GetRefSequence()) {
         setFont(name);
-    } else if (!uii.IsRendererRegistered()) {
+    } else if (!uii.IsRendererLoaded()) {
         m_font = NULL;
     }
 }
\ No newline at end of file

From c3157ad4d7d69a7dbb762b4f829b3871b6f9bf53 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:33:53 +0100
Subject: [PATCH 1605/2040] Use DebugPrintf for errors that are relevant to
 developers

---
 code/cgame/cg_commands.cpp | 14 +++++++-------
 code/qcommon/listener.h    |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index a8395aa7..0ccee1bc 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -3866,7 +3866,7 @@ void ClientGameCommandManager::PlaySound(
     }
 
     if (!name || !soundAlias) {
-        Com_Printf(
+        cgi.DPrintf(
             "\nERROR PlaySound: %s needs an alias in ubersound.scr or uberdialog.scr - Please fix.\n",
             sound_name.c_str()
         );
@@ -4066,7 +4066,7 @@ void ClientGameCommandManager::StopAliasChannel(Event *ev)
     }
 
     if (!name || !soundAlias) {
-        Com_Printf("\nERROR stopaliaschannel: couldn't find alias %s\n", sound_name.c_str());
+        cgi.DPrintf("\nERROR stopaliaschannel: couldn't find alias %s\n", sound_name.c_str());
         return;
     }
 
@@ -4145,7 +4145,7 @@ void ClientGameCommandManager::StopLoopSound(Event* ev)
         return;
     }
 
-    Com_Printf("\n\nClientGameCommandManager::StopLoopSound\n\n");
+    cgi.DPrintf("\n\nClientGameCommandManager::StopLoopSound\n\n");
     current_centity->tikiLoopSound = (sfxHandle_t)0;
 }
 
@@ -4265,7 +4265,7 @@ qboolean bLoadForMap(const char *psMapsBuffer, const char *name)
     }
 
     if (!token || !token[0]) {
-        Com_Printf("ERROR bLoadForMap: %s alias with empty maps specification.\n", name);
+        cgi.DPrintf("ERROR bLoadForMap: %s alias with empty maps specification.\n", name);
         return false;
     }
 
@@ -5179,7 +5179,7 @@ void CG_ProcessInitCommands(dtiki_t *tiki, refEntity_t *ent)
         }
 
         if (!commandManager.SelectProcessEvent(ev)) {
-            Com_Printf(
+            cgi.DPrintf(
                 "^~^~^ CG_ProcessInitCommands: Bad init client command '%s' in '%s'\n", pcmd->args[0], tiki->name
             );
         }
@@ -5225,7 +5225,7 @@ void CG_ProcessCacheInitCommands(dtiki_t *tiki)
             }
 
             if (!commandManager.SelectProcessEvent(ev)) {
-                Com_Printf(
+                cgi.DPrintf(
                     "^~^~^ CG_ProcessInitCommands: Bad init client command '%s' in '%s'\n", pcmd->args[0], tiki->name
                 );
             }
@@ -5840,7 +5840,7 @@ void ClientGameCommandManager::SetCurrentTiki(Event *ev)
     str tikiName;
 
     if (ev->NumArgs() != 1) {
-        Com_Printf("ERROR: settiki command takes 1 parameter.\n");
+        cgi.DPrintf("ERROR: settiki command takes 1 parameter.\n");
         return;
     }
 
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 7e6a7c29..631bf463 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -637,7 +637,7 @@ extern MEM_BlockAlloc<Event> Event_allocator;
 // cgame dll specific defines
 //
 #    define EVENT_DebugPrintf cgi.DebugPrintf
-#    define EVENT_DPrintf     cgi.Printf
+#    define EVENT_DPrintf     cgi.DPrintf
 #    define EVENT_Printf      cgi.Printf
 #    define EVENT_time        (((float)cg.time / 1000.0f))
 #    define EVENT_msec        cg.time
@@ -649,7 +649,7 @@ extern MEM_BlockAlloc<Event> Event_allocator;
 #elif defined(UI_LIB)
 
 #    define EVENT_DebugPrintf Com_DebugPrintf
-#    define EVENT_DPrintf     Com_Printf
+#    define EVENT_DPrintf     Com_DPrintf
 #    define EVENT_Printf      Com_Printf
 #    define EVENT_time        (((float)cls.realtime / 1000.0f))
 #    define EVENT_msec        cls.realtime
@@ -663,7 +663,7 @@ extern MEM_BlockAlloc<Event> Event_allocator;
 // client specific defines
 //
 #    define EVENT_DebugPrintf Com_DebugPrintf
-#    define EVENT_DPrintf     Com_Printf
+#    define EVENT_DPrintf     Com_DPrintf
 #    define EVENT_Printf      Com_Printf
 #    define EVENT_time        (((float)cls.realtime / 1000.0f))
 #    define EVENT_msec        cls.realtime

From d8d98ade6a158a656e487d09cf5f5e03b6e49c94 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 12:37:59 +0100
Subject: [PATCH 1606/2040] Set the default sound quality to 44 Hz

---
 code/client/snd_dma_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
index 242e9276..47fb79eb 100644
--- a/code/client/snd_dma_new.cpp
+++ b/code/client/snd_dma_new.cpp
@@ -104,7 +104,7 @@ void S_Init(qboolean full_startup)
     s_musicVolume    = Cvar_Get("s_musicvolume", "0.9", CVAR_ARCHIVE);
     s_ambientVolume  = Cvar_Get("s_ambientvolume", "1.00", CVAR_ARCHIVE);
     s_separation     = Cvar_Get("s_separation", "0.5", CVAR_ARCHIVE);
-    s_khz            = Cvar_Get("s_khz", "11", CVAR_ARCHIVE | CVAR_SOUND_LATCH);
+    s_khz            = Cvar_Get("s_khz", "44", CVAR_ARCHIVE | CVAR_SOUND_LATCH);
     s_loadas8bit     = Cvar_Get("s_loadas8bit", "0", CVAR_ARCHIVE | CVAR_LATCH);
     s_mixPreStep     = Cvar_Get("s_mixPreStep", "0.05", CVAR_ARCHIVE);
     s_show           = Cvar_Get("s_show", "0", CVAR_CHEAT);

From da0c36cc88707ee1bf8665978332e3bf91b742f3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 12:40:21 +0100
Subject: [PATCH 1607/2040] Also show the port of clients in status

---
 code/server/sv_ccmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 0271f204..e33bea9d 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1242,7 +1242,7 @@ static void SV_Status_f(void) {
 
 		Com_Printf("%*u ", colSize[4], svs.time - cl->lastPacketTime);
 
-		s = NET_AdrToString(cl->netchan.remoteAddress);
+		s = NET_AdrToStringwPort(cl->netchan.remoteAddress);
 		Com_Printf("%s ", s);
 
 		len = strlen(s);

From 5801af34bb634ebcd47a764a99a678640be68f77 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 12:43:05 +0100
Subject: [PATCH 1608/2040] Don't execute newconfig.cfg

This prevents graphic settings from being overridden by the configuration file previously generated by the original game
---
 code/qcommon/common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index fe7b9328..63015233 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1676,7 +1676,9 @@ void Com_Init( char *commandLine ) {
 
 	Cbuf_AddText( "exec menu.cfg\n" );
 
-	Cbuf_AddText ("exec newconfig.cfg\n");
+	// Removed in OPM
+	//  Not relevant as there is no auto-configurator
+	//Cbuf_AddText ("exec newconfig.cfg\n");
 
 	cvar_global_force = qtrue;
 	Cbuf_Execute( 0 );

From 333c452f4458a84793dab9f775a1fe6a5d9ff74c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 12:51:14 +0100
Subject: [PATCH 1609/2040] Sanitize the name with a maximum buffer size limit

---
 code/client/cl_main.cpp | 2 +-
 code/fgame/g_client.cpp | 2 +-
 code/fgame/g_public.h   | 2 +-
 code/qcommon/common.c   | 7 +++++--
 code/qcommon/qcommon.h  | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index bb139edf..636940c4 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2580,7 +2580,7 @@ void CL_CheckUserinfo( void ) {
 	// send a reliable userinfo update if needed
 	if(cvar_modifiedFlags & CVAR_USERINFO)
 	{
-		if (Com_SanitizeName(name->string, szSanitizedName)) {
+		if (Com_SanitizeName(name->string, szSanitizedName, sizeof(szSanitizedName))) {
 			Cvar_Set("name", szSanitizedName);
 		}
 
diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 83d97da0..fcea882d 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -772,7 +772,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
 
     clientnum = ent - g_entities;
 
-    if (gi.SanitizeName(s, client->pers.netname)) {
+    if (gi.SanitizeName(s, client->pers.netname, sizeof(client->pers.netname))) {
         gi.Printf("WARNING: had to sanitize the name for client %i\n", clientnum);
     }
 
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index a821de17..ac9369b8 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -478,7 +478,7 @@ typedef struct gameImport_s {
     void (*HudDrawAlpha)(int info, float alpha);
     void (*HudDrawString)(int info, const char *string);
     void (*HudDrawFont)(int info, const char *fontName);
-    qboolean (*SanitizeName)(const char *oldName, char *newName);
+    qboolean (*SanitizeName)(const char *oldName, char *newName, size_t bufferSize);
 
     //
     // Added in OPM
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 63015233..2f92a88a 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2372,11 +2372,14 @@ void Com_Shutdown (void) {
 
 }
 
-qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
+qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName, size_t bufferSize )
 {
 	int i;
 	qboolean bBadName = qfalse;
 	const char *p = pszOldName;
+	size_t maxLength;
+
+	maxLength = (bufferSize / sizeof(char)) - 1;
 
 	if( *pszOldName && *pszOldName <= ' ' )
 	{
@@ -2389,7 +2392,7 @@ qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
 	}
 
 	i = 0;
-	for( i = 0; *p && *p >= ' '; p++, i++ )
+	for( i = 0; *p && *p >= ' ' && i < maxLength; p++, i++ )
 	{
 		if( *p == '~' || *p == '`' )
 		{
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index dc8f5309..5dde760e 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1155,7 +1155,7 @@ void Com_Init( char *commandLine );
 void Com_Frame( void );
 void Com_Shutdown( void );
 
-qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName );
+qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName, size_t bufferSize );
 const char *Com_GetArchiveFileName( const char *filename, const char *extension );
 const char *Com_GetArchiveFolder();
 void Com_WipeSavegame( const char *savename );

From c4a1175ad0894b9800b9dcbf6f21d754f6882ae0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 15:53:37 +0100
Subject: [PATCH 1610/2040] Clear the invulnerable override when loading

---
 code/fgame/level.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 5e1312d5..0cf4329d 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -1097,6 +1097,12 @@ void Level::SpawnEntities(char *entities, int svsTime)
     int         start, end;
     char        name[128];
 
+    if (gi.Cvar_Get("g_invulnoverride", "0", 0)->integer == 1) {
+        // Added in 2.30
+        //  Clear the invulnerable override when loading
+        gi.cvar_set("g_invulnoverride", "0");
+    }
+
     Com_Printf("-------------------- Spawning Entities -----------------------\n");
 
     t1 = gi.Milliseconds();

From f0cc34cccf8cceaef2f0e62f52ded468f8e56a5b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 16:19:57 +0100
Subject: [PATCH 1611/2040] Correctly parse identifiers starting with a number
 and containing non-numeric characters

---
 code/parser/lex_source.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index b762d763..8c8e97de 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -190,6 +190,7 @@ static bool UseField( void )
 
 string		([^\\\"\r\n]|\\.)*
 identifier	[^\{\}\(\)\[\]\r\n\,:; \t]
+nonnumeric	[a-zA-Z_\"'?@#`\x80-\xff]
 alphanum	[a-zA-Z0-9_]+
 varname		[a-zA-Z0-9_\"\$]+
 
@@ -312,11 +313,17 @@ varname		[a-zA-Z0-9_\"\$]+
 [\r\n]+							{ if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
 [ \t]							{ ; }
 
-[0-9^`]+									{
+[0-9]+									{
 											char* p = nullptr;
 											yylval.s.val.intValue = std::strtol(yytext, &p, 10);
 											YYLEX(TOKEN_INTEGER);
 										}
+
+[0-9\.]+{nonnumeric}					{
+											BEGIN(IDENTIFIER);
+											yymore();
+										}
+
 [0-9\.]+|[0-9\.]+("e+"|"e-")+[0-9\.]	{
 											char* p = nullptr;
 											yylval.s.val.floatValue = std::strtof(yytext, &p);

From f3f53947bcaa32d1490c65efad97bc986799d059 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 16:43:58 +0100
Subject: [PATCH 1612/2040] Call the switch label only is the primary turret is
 valid

---
 code/fgame/vehicleturret.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 43ad5a4d..2b814bbe 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -2130,7 +2130,11 @@ void VehicleTurretGunTandem::SwitchToLinkedTurret()
     } else {
         pTurret = m_PrimaryTurret;
         // Added in 2.30
-        m_PrimaryTurret->m_SwitchLabel.Execute(this, pTurret, NULL);
+        if (m_PrimaryTurret) {
+            // Fixed in OPM
+            //  Check for primary turret before setting the switch label
+            m_PrimaryTurret->m_SwitchLabel.Execute(this, pTurret, NULL);
+        }
     }
 
     SetActiveTurret(pTurret);

From af1cbea96673739f8e1f5d833e79c97a216fc876 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 17:19:39 +0100
Subject: [PATCH 1613/2040] Also make players non-solid in a vehicle slot

---
 code/fgame/VehicleSlot.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/fgame/VehicleSlot.cpp b/code/fgame/VehicleSlot.cpp
index 3454aa9f..e4858da5 100644
--- a/code/fgame/VehicleSlot.cpp
+++ b/code/fgame/VehicleSlot.cpp
@@ -71,9 +71,14 @@ void cVehicleSlot::NotSolid(void)
         }
     }
 
-    if (!ent->IsSubclassOfPlayer()) {
-        ent->setSolidType(SOLID_NOT);
-    }
+    // Added in 2.0
+    // Commented in OPM
+    //  Not sure why since 2.0, players aren't made non-solid in slots
+    //if (!ent->IsSubclassOfPlayer()) {
+    //    ent->setSolidType(SOLID_NOT);
+    //}
+
+    ent->setSolidType(SOLID_NOT);
 }
 
 void cVehicleSlot::Solid(void)

From f719b87e69aed41bf21a60b5d646dfedc618e515 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 18:15:26 +0100
Subject: [PATCH 1614/2040] Handle identifiers that are present after strings,
 by marking strings as identifier

---
 code/parser/lex_source.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 8c8e97de..c9e82be8 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -190,6 +190,7 @@ static bool UseField( void )
 
 string		([^\\\"\r\n]|\\.)*
 identifier	[^\{\}\(\)\[\]\r\n\,:; \t]
+nonexpr		[0-9a-zA-Z_\"'?@#`\.\x80-\xff]
 nonnumeric	[a-zA-Z_\"'?@#`\x80-\xff]
 alphanum	[a-zA-Z0-9_]+
 varname		[a-zA-Z0-9_\"\$]+
@@ -222,9 +223,15 @@ varname		[a-zA-Z0-9_\"\$]+
 												unput(yytext[yyleng - 1]);
 												yyreducepos(1);
 											}
-								
-\"{string}\"					{ TextEscapeValue( yytext + 1, yyleng - 2 ); YYLEX( TOKEN_STRING ); }
 
+											
+
+\"{string}\"{nonexpr}			{
+									BEGIN(IDENTIFIER);
+									yymore();
+								}
+
+\"{string}\"					{ TextEscapeValue( yytext + 1, yyleng - 2 ); YYLEX( TOKEN_STRING ); }
 
 "?"								{ YYLEX( TOKEN_TERNARY ); }
 "if"							{ YYLEX( TOKEN_IF ); }

From a08a9a4f10deaa6b78a6e9cc1673a7dcee824fd7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 18:24:33 +0100
Subject: [PATCH 1615/2040] Remove TOKEN_NUMBER (unused)

Some maps use #xx to indicate an identifier, so remove this token to avoid errors
---
 code/parser/bison_source.txt | 1 -
 code/parser/lex_source.txt   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index d583777d..d58522db 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -103,7 +103,6 @@ int success_pos;
 %left TOKEN_DOUBLE_COLON
 %left TOKEN_SEMICOLON
 %right TOKEN_DOLLAR
-%left TOKEN_NUMBER
 
 %token TOKEN_INCREMENT TOKEN_DECREMENT TOKEN_PERIOD
 
diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index c9e82be8..1b18232c 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -301,7 +301,6 @@ varname		[a-zA-Z0-9_\"\$]+
 "."								{ YYLEX( TOKEN_PERIOD ); }
 
 ","								{ YYLEX( TOKEN_COMMA ); }
-"#"								{ YYLEX( TOKEN_NUMBER ); }
 
 "NULL"							{ YYLEX( TOKEN_NULL ); }
 "NIL"							{ YYLEX( TOKEN_NIL ); }

From f684349c180a513d11e40d1bbf38d8921e5fcfad Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 18:47:10 +0100
Subject: [PATCH 1616/2040] Make sure to pop the loading screen on error

This fixes the client getting stuck in the loading screen due to a drop error
---
 code/null/null_client.c |  3 +++
 code/qcommon/common.c   | 38 ++++++++++++++++++++++++--------------
 code/qcommon/qcommon.h  |  1 +
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/code/null/null_client.c b/code/null/null_client.c
index 1f92a26c..3c70de34 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -62,6 +62,9 @@ void CL_CharEvent( int key ) {
 void CL_Disconnect() {
 }
 
+void CL_AbnormalDisconnect() {
+}
+
 void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 }
 
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 2f92a88a..7383240a 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -419,30 +419,40 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
 		Cvar_Set("com_errorMessage", com_errorMessage);
 
 	if (code == ERR_DISCONNECT || code == ERR_SERVERDISCONNECT) {
-		CL_Disconnect();
-		CL_FlushMemory( );
+		if (com_cl_running && com_cl_running->integer) {
+			CL_AbnormalDisconnect();
+			CL_FlushMemory();
+			CL_StartHunkUsers(qfalse);
+		} else {
+            SV_Shutdown(va("Server disconnected: %s", com_errorMessage));
+		}
 		// make sure we can get at our local stuff
 		FS_PureServerSetLoadedPaks("", "");
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if (code == ERR_DROP) {
 		Com_Printf ("********************\nERROR: %s\n********************\n", com_errorMessage);
-		SV_Shutdown (va("Server crashed: %s",  com_errorMessage));
-		CL_Disconnect();
-		CL_FlushMemory( );
+        SV_Shutdown(va("Server crashed: %s", com_errorMessage));
+#ifndef DEDICATED
+		if (com_cl_running && com_cl_running->integer) {
+			CL_AbnormalDisconnect();
+			CL_FlushMemory();
+			CL_StartHunkUsers(qfalse);
+		}
+#endif
 		FS_PureServerSetLoadedPaks("", "");
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if ( code == ERR_NEED_CD ) {
-		SV_Shutdown( "Server didn't have CD" );
-		if ( com_cl_running && com_cl_running->integer ) {
-			CL_Disconnect();
-			CL_FlushMemory( );
-			com_errorEntered = qfalse;
-			CL_CDDialog();
-		} else {
-			Com_Printf("Server didn't have CD\n" );
-		}
+        SV_Shutdown("Server didn't have CD");
+        if (com_cl_running && com_cl_running->integer) {
+            CL_Disconnect();
+            CL_FlushMemory();
+            com_errorEntered = qfalse;
+            CL_CDDialog();
+        } else {
+            Com_Printf("Server didn't have CD\n");
+        }
 		FS_PureServerSetLoadedPaks("", "");
 		longjmp (abortframe, -1);
 	} else {
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 5dde760e..57ab9486 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1181,6 +1181,7 @@ void CL_InitKeyCommands( void );
 
 void CL_Init( void );
 void CL_Disconnect();
+void CL_AbnormalDisconnect();
 void CL_Shutdown(const char *finalmsg, qboolean disconnect, qboolean quit);
 qboolean CL_FinishedIntro(void);
 void CL_FinishedStartStage(void);

From 70a5dde7265266d56aedf8f73105e1c49f01637d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:22:25 +0100
Subject: [PATCH 1617/2040] Correctly handle long strings in chat and game
 message box

---
 code/client/cl_uidmbox.cpp | 590 ++++++++++++++++++-------------------
 code/client/cl_uigmbox.cpp | 564 +++++++++++++++++------------------
 2 files changed, 550 insertions(+), 604 deletions(-)

diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 98e49fb6..5131d83d 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -40,127 +40,116 @@ Event EV_DMBox_Decay
 	"Event to make the dmbox console line decay"
 );
 
-static float s_dmboxWidth = 384.0;
+static float s_dmboxWidth   = 384.0;
 static float s_dmboxOffsetX = 3.0f;
 static float s_dmboxOffsetY = 8.0f;
 
-CLASS_DECLARATION( UIWidget, UIDMBox, NULL )
-{
-	{ &W_SizeChanged,		&UIDMBox::OnSizeChanged },
-	{ &EV_DMBox_Goin,		&UIDMBox::MoveInEvent },
-	{ &EV_DMBox_Decay,		&UIDMBox::DecayEvent },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIDMBox, NULL) {
+    {&W_SizeChanged,  &UIDMBox::OnSizeChanged},
+    {&EV_DMBox_Goin,  &UIDMBox::MoveInEvent  },
+    {&EV_DMBox_Decay, &UIDMBox::DecayEvent   },
+    {NULL,            NULL                   }
 };
 
 UIDMBox::UIDMBox()
 {
-	m_numitems = 0;
-	m_reallyshown = true;
-	m_fontbold = NULL;
-	m_boxstate = boxstate_t::box_out;
-	m_iBeginDecay = 0;
-	m_boxtime = uid.time;
-	m_movespeed = 500;
-	m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
+    m_numitems    = 0;
+    m_reallyshown = true;
+    m_fontbold    = NULL;
+    m_boxstate    = boxstate_t::box_out;
+    m_iBeginDecay = 0;
+    m_boxtime     = uid.time;
+    m_movespeed   = 500;
+    m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
 }
 
-void UIDMBox::VerifyBoxOut( void )
+void UIDMBox::VerifyBoxOut(void)
 {
-	PostMoveinEvent();
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out)
-	{
-		ChangeBoxState(boxstate_t::box_moving_out);
-	}
+    PostMoveinEvent();
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out) {
+        ChangeBoxState(boxstate_t::box_moving_out);
+    }
 }
 
-void UIDMBox::ChangeBoxState( boxstate_t state )
+void UIDMBox::ChangeBoxState(boxstate_t state)
 {
-	m_boxstate = state;
-	m_boxtime = uid.time;
-	setShowState();
+    m_boxstate = state;
+    m_boxtime  = uid.time;
+    setShowState();
 
-	if (state == box_out) {
-		PostMoveinEvent();
-	}
+    if (state == box_out) {
+        PostMoveinEvent();
+    }
 }
 
-void UIDMBox::HandleBoxMoving( void )
+void UIDMBox::HandleBoxMoving(void)
 {
-	int delta;
-	UIRect2D newRect;
+    int      delta;
+    UIRect2D newRect;
 
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
+        return;
+    }
 
-	delta = m_movespeed * (uid.time - m_boxtime) / 1000;
-	m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
-	if (m_boxstate == boxstate_t::box_moving_out)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta + m_frame.pos.y;
+    delta     = m_movespeed * (uid.time - m_boxtime) / 1000;
+    m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
+    if (m_boxstate == boxstate_t::box_moving_out) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta + m_frame.pos.y;
 
-		if (newRect.pos.y <= 0.0)
-		{
-			newRect.pos.y = 0.0;
-			ChangeBoxState(boxstate_t::box_out);
-		}
-	}
-	else if (m_boxstate == boxstate_t::box_moving_in)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta - m_frame.pos.y;
+        if (newRect.pos.y <= 0.0) {
+            newRect.pos.y = 0.0;
+            ChangeBoxState(boxstate_t::box_out);
+        }
+    } else if (m_boxstate == boxstate_t::box_moving_in) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta - m_frame.pos.y;
 
-		if (newRect.pos.y <= -newRect.size.height)
-		{
-			newRect.pos.y = -newRect.size.height;
-			ChangeBoxState(boxstate_t::box_in);
-		}
-	}
-	else {
-		newRect = m_frame;
-	}
+        if (newRect.pos.y <= -newRect.size.height) {
+            newRect.pos.y = -newRect.size.height;
+            ChangeBoxState(boxstate_t::box_in);
+        }
+    } else {
+        newRect = m_frame;
+    }
 
-	setFrame(newRect);
+    setFrame(newRect);
 }
 
-void UIDMBox::PostMoveinEvent( void )
+void UIDMBox::PostMoveinEvent(void)
 {
-	if (m_boxstate != boxstate_t::box_out) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_out) {
+        return;
+    }
 
-	if (!EventPending(EV_DMBox_Goin)) {
-		PostEvent(EV_DMBox_Goin, 10.0);
-	}
-	else {
-		PostponeEvent(EV_DMBox_Goin, 10.0);
-	}
+    if (!EventPending(EV_DMBox_Goin)) {
+        PostEvent(EV_DMBox_Goin, 10.0);
+    } else {
+        PostponeEvent(EV_DMBox_Goin, 10.0);
+    }
 }
 
-void UIDMBox::PostDecayEvent( void )
+void UIDMBox::PostDecayEvent(void)
 {
-	if (!EventPending(EV_DMBox_Decay))
-	{
-		float fDelayTime;
-		int iNumLines;
-		int i;
-		const char* pszString = m_items[0].string.c_str();
+    if (!EventPending(EV_DMBox_Decay)) {
+        float       fDelayTime;
+        int         iNumLines;
+        int         i;
+        const char *pszString = m_items[0].string.c_str();
 
-		//
-		// Calculate the number of lines
-		//
-		iNumLines = 1;
-		for (i = 0; pszString[i]; i++)
-		{
-			if (pszString[i] == '\n') {
-				iNumLines++;
-			}
-		}
+        //
+        // Calculate the number of lines
+        //
+        iNumLines = 1;
+        for (i = 0; pszString[i]; i++) {
+            if (pszString[i] == '\n') {
+                iNumLines++;
+            }
+        }
 
         if (m_items[0].flags & DMBOX_ITEM_FLAG_BOLD) {
             fDelayTime = iNumLines * 8.0;
@@ -168,291 +157,272 @@ void UIDMBox::PostDecayEvent( void )
         //
         // Bold as twice more decay
         //
-		else if (m_items[0].flags & DMBOX_ITEM_FLAG_DEATH) {
-			fDelayTime = iNumLines * 6.0;
-		}
-		else {
-			fDelayTime = iNumLines * 5.0;
-		}
+        else if (m_items[0].flags & DMBOX_ITEM_FLAG_DEATH) {
+            fDelayTime = iNumLines * 6.0;
+        } else {
+            fDelayTime = iNumLines * 5.0;
+        }
 
-		m_iBeginDecay = cls.realtime;
-		m_iEndDecay = (int)(fDelayTime * 1000.0);
+        m_iBeginDecay = cls.realtime;
+        m_iEndDecay   = (int)(fDelayTime * 1000.0);
 
-		PostEvent(EV_DMBox_Decay, fDelayTime);
-	}
+        PostEvent(EV_DMBox_Decay, fDelayTime);
+    }
 }
 
-void UIDMBox::setShowState( void )
+void UIDMBox::setShowState(void)
 {
-	if (m_reallyshown) {
-		setShow(m_boxstate != box_in);
-	} else {
-		setShow(false);
-	}
+    if (m_reallyshown) {
+        setShow(m_boxstate != box_in);
+    } else {
+        setShow(false);
+    }
 }
 
-void UIDMBox::RemoveTopItem( void )
+void UIDMBox::RemoveTopItem(void)
 {
-	int i;
+    int i;
 
-	if (m_numitems > 0) {
-		for (i = 0; i < m_numitems - 1; i++) {
-			m_items[i] = m_items[i + 1];
-		}
+    if (m_numitems > 0) {
+        for (i = 0; i < m_numitems - 1; i++) {
+            m_items[i] = m_items[i + 1];
+        }
 
-		m_numitems--;
-	}
+        m_numitems--;
+    }
 }
 
-str UIDMBox::CalculateBreaks( UIFont *font, str text, float max_width )
+str UIDMBox::CalculateBreaks(UIFont *font, str text, float max_width)
 {
-	str newText, sTmp;
-	int i;
-	float fX;
-	float fwX, fsX;
+    str         newText;
+    float       fX;
+    float       fwX;
+    const char *current;
+    int         count;
 
-	Cmd_TokenizeString(text.c_str());
-	if (Cmd_Argc())
-	{
-		fX = 0.0;
-		fsX = font->getCharWidth(' ');
+    current = text;
+    fX      = 0.0;
 
-		for (i = 0; i < Cmd_Argc(); i++)
-		{
-			sTmp = Cmd_Argv(i);
+    for (count = font->DBCSGetWordBlockCount(current, -1); count;
+         current += count, count = font->DBCSGetWordBlockCount(current, -1)) {
+        fwX = font->getWidth(current, count);
 
-			fwX = font->getWidth(sTmp.c_str(), -1);
-			if (fwX + i <= max_width)
-			{
-				if (fwX + i + fX <= max_width)
-				{
-					newText += sTmp + " ";
-				} else {
-					newText += "\n" + sTmp + " ";
-				}
-			}
-			else
-			{
-				sTmp += "\n";
-				fX = 0.0;
-			}
-		}
-	} else {
-		newText = "";
-	}
+        if (fX + fwX > max_width) {
+            newText += "\n" + str(current, 0, count);
+            fX = 0;
+        } else {
+            newText += str(current, 0, count);
+        }
 
-	return newText;
+        fX += fwX;
+    }
+
+    return newText;
 }
 
-float UIDMBox::PrintWrap( UIFont *font, float x, float y, str text )
+float UIDMBox::PrintWrap(UIFont *font, float x, float y, str text)
 {
-	const char* p1, * p2;
-	size_t n, l;
-	float fY;
+    const char *p1, *p2;
+    size_t      n, l;
+    float       fY;
 
-	fY = y;
-	p1 = text.c_str();
-	l = text.length();
+    fY = y;
+    p1 = text.c_str();
+    l  = text.length();
 
-	for (;;)
-	{
-		p2 = strchr(p1, '\n');
-		if (!p2) {
-			break;
-		}
+    for (;;) {
+        p2 = strchr(p1, '\n');
+        if (!p2) {
+            break;
+        }
 
-		n = p2 - p1;
-		if (n >= l) {
-			break;
-		}
+        n = p2 - p1;
+        if (n >= l) {
+            break;
+        }
 
-		font->Print(x, fY, p1, p2 - p1, getHighResScale());
-		p1 = p2 + 1;
-		l -= n;
-		fY += font->getHeight();
-	}
+        font->Print(x, fY, p1, p2 - p1, getHighResScale());
+        p1 = p2 + 1;
+        l -= n;
+        fY += font->getHeight();
+    }
 
-	font->Print(x, fY, p1, l, getHighResScale());
+    if (*p1) {
+        font->Print(x, fY, p1, l, getHighResScale());
+        fY += font->getHeight();
+    }
 
-	return font->getHeight() + (fY - y);
+    return fY - y;
 }
 
-float UIDMBox::DrawItem( item_t *in, float x, float y, float alpha )
+float UIDMBox::DrawItem(item_t *in, float x, float y, float alpha)
 {
-	if (m_drawoutline) {
-		//
-		// Draw an outline
-		//
+    if (m_drawoutline) {
+        //
+        // Draw an outline
+        //
 
-		in->font->setColor(UBlack);
-		in->font->setAlpha(alpha);
+        in->font->setColor(UBlack);
+        in->font->setAlpha(alpha);
 
-		PrintWrap(in->font, x + 1, y + 2, in->string);
-		PrintWrap(in->font, x + 2, y + 1, in->string);
-		PrintWrap(in->font, x - 1, y + 2, in->string);
-		PrintWrap(in->font, x - 2, y + 1, in->string);
-		PrintWrap(in->font, x - 1, y - 2, in->string);
-		PrintWrap(in->font, x - 2, y - 1, in->string);
-		PrintWrap(in->font, x + 1, y - 2, in->string);
-		PrintWrap(in->font, x + 2, y - 1, in->string);
-		PrintWrap(in->font, x + 2, y, in->string);
-		PrintWrap(in->font, x - 2, y, in->string);
-		PrintWrap(in->font, x, y + 2, in->string);
-		PrintWrap(in->font, x, y - 2, in->string);
-	}
+        PrintWrap(in->font, x + 1, y + 2, in->string);
+        PrintWrap(in->font, x + 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y + 2, in->string);
+        PrintWrap(in->font, x - 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y - 2, in->string);
+        PrintWrap(in->font, x - 2, y - 1, in->string);
+        PrintWrap(in->font, x + 1, y - 2, in->string);
+        PrintWrap(in->font, x + 2, y - 1, in->string);
+        PrintWrap(in->font, x + 2, y, in->string);
+        PrintWrap(in->font, x - 2, y, in->string);
+        PrintWrap(in->font, x, y + 2, in->string);
+        PrintWrap(in->font, x, y - 2, in->string);
+    }
 
-	in->font->setColor(in->color);
-	in->font->setAlpha(alpha);
+    in->font->setColor(in->color);
+    in->font->setAlpha(alpha);
 
-	return PrintWrap(in->font, x, y, in->string);
+    return PrintWrap(in->font, x, y, in->string);
 }
 
-void UIDMBox::Print( const char *text )
+void UIDMBox::Print(const char *text)
 {
-	const char* text1 = text;
+    const char *text1 = text;
 
-	if (m_numitems > 5)
-	{
-		//
-		// Overwrite an item
-		//
-		RemoveTopItem();
-	}
+    if (m_numitems > 5) {
+        //
+        // Overwrite an item
+        //
+        RemoveTopItem();
+    }
 
-	m_items[m_numitems].flags = 0;
+    m_items[m_numitems].flags = 0;
 
-	if (*text == MESSAGE_CHAT_WHITE)
-	{
-		m_items[m_numitems].color = UGrey;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
+    if (*text == MESSAGE_CHAT_WHITE) {
+        m_items[m_numitems].color = UGrey;
+        m_items[m_numitems].font  = m_fontbold;
+        m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
 
-		text1 = text + 1;
-	}
-	else if (*text == MESSAGE_CHAT_RED)
-	{
-		m_items[m_numitems].color = ULightRed;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
+        text1 = text + 1;
+    } else if (*text == MESSAGE_CHAT_RED) {
+        m_items[m_numitems].color = ULightRed;
+        m_items[m_numitems].font  = m_fontbold;
+        m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
-		text1 = text + 1;
-	}
-	else if (*text == MESSAGE_CHAT_GREEN)
-	{
-		if (com_target_game->integer >= TG_MOHTA) {
-			m_items[m_numitems].color = ULightGreen;
-		} else {
-			m_items[m_numitems].color = UGreen;
-		}
+        text1 = text + 1;
+    } else if (*text == MESSAGE_CHAT_GREEN) {
+        if (com_target_game->integer >= TG_MOHTA) {
+            m_items[m_numitems].color = ULightGreen;
+        } else {
+            m_items[m_numitems].color = UGreen;
+        }
         m_items[m_numitems].font = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
-		text1 = text + 1;
-	}
-	else
-	{
-		m_items[m_numitems].color = m_foreground_color;
-		m_items[m_numitems].font = m_font;
-	}
+        text1 = text + 1;
+    } else {
+        m_items[m_numitems].color = m_foreground_color;
+        m_items[m_numitems].font  = m_font;
+    }
 
-	m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_dmboxWidth);
+    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_dmboxWidth);
 
-	m_numitems++;
-	VerifyBoxOut();
-	PostDecayEvent();
+    m_numitems++;
+    VerifyBoxOut();
+    PostDecayEvent();
 }
 
-void UIDMBox::OnSizeChanged( Event *ev )
+void UIDMBox::OnSizeChanged(Event *ev)
 {
-	s_dmboxWidth = m_frame.size.width;
+    s_dmboxWidth = m_frame.size.width;
 }
 
-void UIDMBox::Create( const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha )
+void UIDMBox::Create(const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha)
 {
-	InitFrame(NULL, rect, 0, "facfont-20");
+    InitFrame(NULL, rect, 0, "facfont-20");
 
-	if (!m_fontbold) {
-		m_fontbold = new UIFont("facfont-20");
-	}
+    if (!m_fontbold) {
+        m_fontbold = new UIFont("facfont-20");
+    }
 
-	m_fontbold->setColor(URed);
-	setBackgroundColor(back, true);
-	setForegroundColor(fore);
-	setBackgroundAlpha(alpha);
+    m_fontbold->setColor(URed);
+    setBackgroundColor(back, true);
+    setForegroundColor(fore);
+    setBackgroundAlpha(alpha);
 
-	Connect(this, W_SizeChanged, W_SizeChanged);
-	OnSizeChanged(NULL);
+    Connect(this, W_SizeChanged, W_SizeChanged);
+    OnSizeChanged(NULL);
 
-	m_movespeed = rect.size.height * 3.0;
+    m_movespeed = rect.size.height * 3.0;
 
-	setShowState();
+    setShowState();
 }
 
-void UIDMBox::MoveInEvent( Event *ev )
+void UIDMBox::MoveInEvent(Event *ev) {}
+
+void UIDMBox::DecayEvent(Event *ev)
 {
+    RemoveTopItem();
+    if (m_numitems) {
+        PostDecayEvent();
+    }
 }
 
-void UIDMBox::DecayEvent( Event *ev )
+void UIDMBox::Draw(void)
 {
-	RemoveTopItem();
-	if (m_numitems) {
-		PostDecayEvent();
-	}
+    float fsY;
+    int   i;
+    float alpha;
+    float alphaScale;
+
+    alphaScale = 0.8f;
+    HandleBoxMoving();
+
+    if (!m_numitems) {
+        //
+        // Nothing to show
+        //
+        return;
+    }
+
+    m_font->setColor(m_foreground_color);
+    alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    alpha = (1.0 - alpha) * 4.0;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    if (cge) {
+        alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
+    }
+
+    fsY = DrawItem(m_items, s_dmboxOffsetX, s_dmboxOffsetY, alpha * alphaScale);
+    fsY = alpha <= 0.2 ? s_dmboxOffsetY : fsY + s_dmboxOffsetY;
+
+    for (i = 1; i < m_numitems; i++) {
+        fsY += DrawItem(&m_items[i], s_dmboxOffsetX, fsY, alphaScale);
+        if (fsY > m_frame.size.height) {
+            if (EventPending(EV_DMBox_Decay)) {
+                CancelEventsOfType(EV_DMBox_Decay);
+            }
+
+            PostEvent(EV_DMBox_Decay, 0.0);
+            break;
+        }
+    }
 }
 
-void UIDMBox::Draw( void )
+void UIDMBox::setRealShow(bool b)
 {
-	float fsY;
-	int i;
-	float alpha;
-	float alphaScale;
-
-	alphaScale = 0.8f;
-	HandleBoxMoving();
-
-	if (!m_numitems) {
-		//
-		// Nothing to show
-		//
-		return;
-	}
-
-	m_font->setColor(m_foreground_color);
-	alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
-	if (alpha > 1.0) alpha = 1.0;
-
-	alpha = (1.0 - alpha) * 4.0;
-	if (alpha > 1.0) alpha = 1.0;
-
-	if (cge) {
-		alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
-	}
-
-	fsY = DrawItem(m_items, s_dmboxOffsetX, s_dmboxOffsetY, alpha * alphaScale);
-	fsY = alpha <= 0.2 ? s_dmboxOffsetY : fsY + s_dmboxOffsetY;
-
-	for (i = 1; i < m_numitems; i++)
-	{
-		fsY += DrawItem(&m_items[i], s_dmboxOffsetX, fsY, alphaScale);
-		if (fsY > m_frame.size.height)
-		{
-			if (EventPending(EV_DMBox_Decay)) {
-				CancelEventsOfType(EV_DMBox_Decay);
-			}
-
-			PostEvent(EV_DMBox_Decay, 0.0);
-			break;
-		}
-	}
+    this->m_reallyshown = b;
+    setShowState();
 }
 
-void UIDMBox::setRealShow( bool b )
+void UIDMBox::Clear(void)
 {
-	this->m_reallyshown = b;
-	setShowState();
-}
-
-void UIDMBox::Clear( void )
-{
-	m_numitems = 0;
+    m_numitems = 0;
 }
diff --git a/code/client/cl_uigmbox.cpp b/code/client/cl_uigmbox.cpp
index 8823fa56..937f4539 100644
--- a/code/client/cl_uigmbox.cpp
+++ b/code/client/cl_uigmbox.cpp
@@ -40,394 +40,370 @@ Event EV_GMBox_Decay
 	"Event to make the gmbox console line decay"
 );
 
-static float s_gmboxWidth = 640.0;
+static float s_gmboxWidth   = 640.0;
 static float s_gmboxOffsetX = 3.0f;
 static float s_gmboxOffsetY = 0.0f;
 
-CLASS_DECLARATION( UIWidget, UIGMBox, NULL )
-{
-	{ &W_SizeChanged,		&UIGMBox::OnSizeChanged },
-	{ &EV_GMBox_Goin,		&UIGMBox::MoveInEvent },
-	{ &EV_GMBox_Decay,		&UIGMBox::DecayEvent },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIGMBox, NULL) {
+    {&W_SizeChanged,  &UIGMBox::OnSizeChanged},
+    {&EV_GMBox_Goin,  &UIGMBox::MoveInEvent  },
+    {&EV_GMBox_Decay, &UIGMBox::DecayEvent   },
+    {NULL,            NULL                   }
 };
 
 UIGMBox::UIGMBox()
 {
-	m_numitems = 0;
-	m_reallyshown = true;
-	m_fontbold = NULL;
-	m_boxstate = boxstate_t::box_out;
-	m_iBeginDecay = 0;
-	m_boxtime = uid.time;
-	m_movespeed = 500;
-	m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
+    m_numitems    = 0;
+    m_reallyshown = true;
+    m_fontbold    = NULL;
+    m_boxstate    = boxstate_t::box_out;
+    m_iBeginDecay = 0;
+    m_boxtime     = uid.time;
+    m_movespeed   = 500;
+    m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
 }
 
-void UIGMBox::VerifyBoxOut( void )
+void UIGMBox::VerifyBoxOut(void)
 {
-	PostMoveinEvent();
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out)
-	{
-		ChangeBoxState(boxstate_t::box_moving_out);
-	}
+    PostMoveinEvent();
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out) {
+        ChangeBoxState(boxstate_t::box_moving_out);
+    }
 }
 
-void UIGMBox::ChangeBoxState( boxstate_t state )
+void UIGMBox::ChangeBoxState(boxstate_t state)
 {
-	m_boxstate = state;
-	m_boxtime = uid.time;
-	setShowState();
+    m_boxstate = state;
+    m_boxtime  = uid.time;
+    setShowState();
 
-	if (state == box_out) {
-		PostMoveinEvent();
-	}
+    if (state == box_out) {
+        PostMoveinEvent();
+    }
 }
 
-void UIGMBox::HandleBoxMoving( void )
+void UIGMBox::HandleBoxMoving(void)
 {
-	int delta;
-	UIRect2D newRect;
+    int      delta;
+    UIRect2D newRect;
 
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
+        return;
+    }
 
-	delta = m_movespeed * (uid.time - m_boxtime) / 1000;
-	m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
-	if (m_boxstate == boxstate_t::box_moving_out)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta + m_frame.pos.y;
+    delta     = m_movespeed * (uid.time - m_boxtime) / 1000;
+    m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
+    if (m_boxstate == boxstate_t::box_moving_out) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta + m_frame.pos.y;
 
-		if (newRect.pos.y <= 0.0)
-		{
-			newRect.pos.y = 0.0;
-			ChangeBoxState(boxstate_t::box_out);
-		}
-	}
-	else if (m_boxstate == boxstate_t::box_moving_in)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta - m_frame.pos.y;
+        if (newRect.pos.y <= 0.0) {
+            newRect.pos.y = 0.0;
+            ChangeBoxState(boxstate_t::box_out);
+        }
+    } else if (m_boxstate == boxstate_t::box_moving_in) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta - m_frame.pos.y;
 
-		if (newRect.pos.y <= -newRect.size.height)
-		{
-			newRect.pos.y = -newRect.size.height;
-			ChangeBoxState(boxstate_t::box_in);
-		}
-	} else {
-		newRect = m_frame;
-	}
+        if (newRect.pos.y <= -newRect.size.height) {
+            newRect.pos.y = -newRect.size.height;
+            ChangeBoxState(boxstate_t::box_in);
+        }
+    } else {
+        newRect = m_frame;
+    }
 
-	setFrame(newRect);
+    setFrame(newRect);
 }
 
-void UIGMBox::PostMoveinEvent( void )
+void UIGMBox::PostMoveinEvent(void)
 {
-	if (m_boxstate != boxstate_t::box_out) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_out) {
+        return;
+    }
 
-	if (!EventPending(EV_GMBox_Goin)) {
-		PostEvent(EV_GMBox_Goin, 10.0);
-	} else {
-		PostponeEvent(EV_GMBox_Goin, 10.0);
-	}
+    if (!EventPending(EV_GMBox_Goin)) {
+        PostEvent(EV_GMBox_Goin, 10.0);
+    } else {
+        PostponeEvent(EV_GMBox_Goin, 10.0);
+    }
 }
 
-void UIGMBox::PostDecayEvent( void )
+void UIGMBox::PostDecayEvent(void)
 {
-	if (!EventPending(EV_GMBox_Decay))
-	{
-		float fDelayTime;
-		int iNumLines;
-		int i;
-		const char* pszString = m_items[0].string.c_str();
+    if (!EventPending(EV_GMBox_Decay)) {
+        float       fDelayTime;
+        int         iNumLines;
+        int         i;
+        const char *pszString = m_items[0].string.c_str();
 
-		//
-		// Calculate the number of lines
-		//
-		iNumLines = 1;
-		for (i = 0; pszString[i]; i++)
-		{
-			if (pszString[i] == '\n') {
-				iNumLines++;
-			}
-		}
+        //
+        // Calculate the number of lines
+        //
+        iNumLines = 1;
+        for (i = 0; pszString[i]; i++) {
+            if (pszString[i] == '\n') {
+                iNumLines++;
+            }
+        }
 
-		//
-		// Bold as twice more decay
-		//
-		if (m_items[0].flags & GMBOX_ITEM_FLAG_BOLD) {
-			fDelayTime = iNumLines * 10.0;
-		} else {
-			fDelayTime = iNumLines * 5.0;
-		}
+        //
+        // Bold as twice more decay
+        //
+        if (m_items[0].flags & GMBOX_ITEM_FLAG_BOLD) {
+            fDelayTime = iNumLines * 10.0;
+        } else {
+            fDelayTime = iNumLines * 5.0;
+        }
 
-		m_iBeginDecay = cls.realtime;
-		m_iEndDecay = (int)(fDelayTime * 1000.0);
+        m_iBeginDecay = cls.realtime;
+        m_iEndDecay   = (int)(fDelayTime * 1000.0);
 
-		PostEvent(EV_GMBox_Decay, fDelayTime);
-	}
+        PostEvent(EV_GMBox_Decay, fDelayTime);
+    }
 }
 
-void UIGMBox::setShowState( void )
+void UIGMBox::setShowState(void)
 {
-	if (m_reallyshown) {
-		setShow(m_boxstate != box_in);
-	} else {
-		setShow(false);
-	}
+    if (m_reallyshown) {
+        setShow(m_boxstate != box_in);
+    } else {
+        setShow(false);
+    }
 }
 
-void UIGMBox::RemoveTopItem( void )
+void UIGMBox::RemoveTopItem(void)
 {
-	int i;
+    int i;
 
-	if (m_numitems > 0) {
-		for (i = 0; i < m_numitems - 1; i++) {
-			m_items[i] = m_items[i + 1];
-		}
+    if (m_numitems > 0) {
+        for (i = 0; i < m_numitems - 1; i++) {
+            m_items[i] = m_items[i + 1];
+        }
 
-		m_numitems--;
-	}
+        m_numitems--;
+    }
 }
 
-str UIGMBox::CalculateBreaks( UIFont *font, str text, float max_width )
+str UIGMBox::CalculateBreaks(UIFont *font, str text, float max_width)
 {
-	str newText, sTmp;
-	int i;
-	float fX;
-	float fwX, fsX;
+    str         newText;
+    float       fX;
+    float       fwX;
+    const char *current;
+    int         count;
 
-	Cmd_TokenizeString(text.c_str());
-	if (Cmd_Argc())
-	{
-		fX = 0.0;
-		fsX = font->getCharWidth(' ');
+    current = text;
+    fX      = 0.0;
 
-		for (i = 0; i < Cmd_Argc(); i++)
-		{
-			sTmp = Cmd_Argv(i);
+    for (count = font->DBCSGetWordBlockCount(current, -1); count;
+         current += count, count = font->DBCSGetWordBlockCount(current, -1)) {
+        fwX = font->getWidth(current, count);
 
-			fwX = font->getWidth(sTmp.c_str(), -1);
-			if (fwX + i <= max_width)
-			{
-				if (fwX + i + fX <= max_width)
-				{
-					newText += sTmp + " ";
-				} else {
-					newText += "\n" + sTmp + " ";
-				}
-			}
-			else
-			{
-				sTmp += "\n";
-				fX = 0.0;
-			}
-		}
-	} else {
-		newText = "";
-	}
+        if (fX + fwX > max_width) {
+            newText += "\n" + str(current, 0, count);
+            fX = 0;
+        } else {
+            newText += str(current, 0, count);
+        }
 
-	return newText;
+        fX += fwX;
+    }
+
+    return newText;
 }
 
-float UIGMBox::PrintWrap( UIFont *font, float x, float y, str text )
+float UIGMBox::PrintWrap(UIFont *font, float x, float y, str text)
 {
-	const char* p1, * p2;
-	size_t n, l;
-	float fY;
+    const char *p1, *p2;
+    size_t      n, l;
+    float       fY;
 
-	fY = y;
-	p1 = text.c_str();
-	l = text.length();
+    fY = y;
+    p1 = text.c_str();
+    l  = text.length();
 
-	for (;;)
-	{
-		p2 = strchr(p1, '\n');
-		if (!p2) {
-			break;
-		}
+    for (;;) {
+        p2 = strchr(p1, '\n');
+        if (!p2) {
+            break;
+        }
 
-		n = p2 - p1;
-		if (n >= l) {
-			break;
-		}
+        n = p2 - p1;
+        if (n >= l) {
+            break;
+        }
 
-		font->Print(x, fY, p1, p2 - p1, getHighResScale());
-		p1 = p2 + 1;
-		l -= n;
-		fY += font->getHeight();
-	}
+        font->Print(x, fY, p1, p2 - p1, getHighResScale());
+        p1 = p2 + 1;
+        l -= n;
+        fY += font->getHeight();
+    }
 
-	font->Print(x, fY, p1, l, getHighResScale());
+    if (*p1) {
+        font->Print(x, fY, p1, l, getHighResScale());
+        fY += font->getHeight();
+    }
 
-	return font->getHeight() + (fY - y);
+    return fY - y;
 }
 
-float UIGMBox::DrawItem( item_t *in, float x, float y, float alpha )
+float UIGMBox::DrawItem(item_t *in, float x, float y, float alpha)
 {
-	if (m_drawoutline) {
-		//
-		// Draw an outline
-		//
+    if (m_drawoutline) {
+        //
+        // Draw an outline
+        //
 
-		in->font->setColor(UBlack);
-		in->font->setAlpha(alpha);
+        in->font->setColor(UBlack);
+        in->font->setAlpha(alpha);
 
-		PrintWrap(in->font, x + 1, y + 2, in->string);
-		PrintWrap(in->font, x + 2, y + 1, in->string);
-		PrintWrap(in->font, x - 1, y + 2, in->string);
-		PrintWrap(in->font, x - 2, y + 1, in->string);
-		PrintWrap(in->font, x - 1, y - 2, in->string);
-		PrintWrap(in->font, x - 2, y - 1, in->string);
-		PrintWrap(in->font, x + 1, y - 2, in->string);
-		PrintWrap(in->font, x + 2, y - 1, in->string);
-		PrintWrap(in->font, x + 2, y, in->string);
-		PrintWrap(in->font, x - 2, y, in->string);
-		PrintWrap(in->font, x, y + 2, in->string);
-		PrintWrap(in->font, x, y - 2, in->string);
-	}
+        PrintWrap(in->font, x + 1, y + 2, in->string);
+        PrintWrap(in->font, x + 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y + 2, in->string);
+        PrintWrap(in->font, x - 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y - 2, in->string);
+        PrintWrap(in->font, x - 2, y - 1, in->string);
+        PrintWrap(in->font, x + 1, y - 2, in->string);
+        PrintWrap(in->font, x + 2, y - 1, in->string);
+        PrintWrap(in->font, x + 2, y, in->string);
+        PrintWrap(in->font, x - 2, y, in->string);
+        PrintWrap(in->font, x, y + 2, in->string);
+        PrintWrap(in->font, x, y - 2, in->string);
+    }
 
-	in->font->setColor(in->color);
-	in->font->setAlpha(alpha);
+    in->font->setColor(in->color);
+    in->font->setAlpha(alpha);
 
-	return PrintWrap(in->font, x, y, in->string);
+    return PrintWrap(in->font, x, y, in->string);
 }
 
-void UIGMBox::Print( const char *text )
+void UIGMBox::Print(const char *text)
 {
-	const char* text1 = text;
+    const char *text1 = text;
 
-	if (m_numitems > 4)
-	{
-		//
-		// Overwrite an item
-		//
-		RemoveTopItem();
-	}
+    if (m_numitems > 4) {
+        //
+        // Overwrite an item
+        //
+        RemoveTopItem();
+    }
 
-	m_items[m_numitems].flags = 0;
+    m_items[m_numitems].flags = 0;
 
-	if (*text == 3)
-	{
-		m_items[m_numitems].color = UWhite;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= GMBOX_ITEM_FLAG_BOLD;
+    if (*text == 3) {
+        m_items[m_numitems].color = UWhite;
+        m_items[m_numitems].font  = m_fontbold;
+        m_items[m_numitems].flags |= GMBOX_ITEM_FLAG_BOLD;
 
-		text1 = text + 1;
-	}
-	else
-	{
-		m_items[m_numitems].color = m_foreground_color;
-		m_items[m_numitems].font = m_font;
-	}
+        text1 = text + 1;
+    } else {
+        m_items[m_numitems].color = m_foreground_color;
+        m_items[m_numitems].font  = m_font;
+    }
 
-	m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_gmboxWidth);
+    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_gmboxWidth);
 
-	m_numitems++;
-	VerifyBoxOut();
-	PostDecayEvent();
+    m_numitems++;
+    VerifyBoxOut();
+    PostDecayEvent();
 }
 
-void UIGMBox::OnSizeChanged( Event *ev )
+void UIGMBox::OnSizeChanged(Event *ev)
 {
-	s_gmboxWidth = m_frame.size.width;
+    s_gmboxWidth = m_frame.size.width;
 }
 
-void UIGMBox::Create( const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha )
+void UIGMBox::Create(const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha)
 {
-	InitFrame(NULL, rect, 0, "facfont-20");
+    InitFrame(NULL, rect, 0, "facfont-20");
 
-	if (!m_fontbold) {
-		m_fontbold = new UIFont("facfont-20");
-	}
+    if (!m_fontbold) {
+        m_fontbold = new UIFont("facfont-20");
+    }
 
-	m_fontbold->setColor(URed);
-	setBackgroundColor(back, true);
-	setForegroundColor(fore);
-	setBackgroundAlpha(alpha);
+    m_fontbold->setColor(URed);
+    setBackgroundColor(back, true);
+    setForegroundColor(fore);
+    setBackgroundAlpha(alpha);
 
-	Connect(this, W_SizeChanged, W_SizeChanged);
-	OnSizeChanged(NULL);
+    Connect(this, W_SizeChanged, W_SizeChanged);
+    OnSizeChanged(NULL);
 
-	m_movespeed = rect.size.height * 3.0;
+    m_movespeed = rect.size.height * 3.0;
 
-	setShowState();
+    setShowState();
 }
 
-void UIGMBox::MoveInEvent( Event *ev )
+void UIGMBox::MoveInEvent(Event *ev) {}
+
+void UIGMBox::DecayEvent(Event *ev)
 {
+    RemoveTopItem();
+    if (m_numitems) {
+        PostDecayEvent();
+    }
 }
 
-void UIGMBox::DecayEvent( Event *ev )
+void UIGMBox::Draw(void)
 {
-	RemoveTopItem();
-	if (m_numitems) {
-		PostDecayEvent();
-	}
+    float fsY;
+    int   i;
+    float alpha;
+    float alphaScale;
+
+    alphaScale = 1.0;
+    HandleBoxMoving();
+
+    if (!m_numitems) {
+        //
+        // Nothing to show
+        //
+        return;
+    }
+
+    m_font->setColor(m_foreground_color);
+    alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    alpha = (1.0 - alpha) * 4.0;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    if (cge) {
+        alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
+    }
+
+    fsY = DrawItem(m_items, s_gmboxOffsetX, s_gmboxOffsetY, alpha * alphaScale);
+    fsY = alpha <= 0.2 ? s_gmboxOffsetY : fsY + s_gmboxOffsetY;
+
+    for (i = 1; i < m_numitems; i++) {
+        fsY += DrawItem(&m_items[i], s_gmboxOffsetX, fsY, alphaScale);
+        if (fsY > m_frame.size.height) {
+            if (EventPending(EV_GMBox_Decay)) {
+                CancelEventsOfType(EV_GMBox_Decay);
+            }
+
+            PostEvent(EV_GMBox_Decay, 0.0);
+            break;
+        }
+    }
 }
 
-void UIGMBox::Draw( void )
+void UIGMBox::setRealShow(bool b)
 {
-	float fsY;
-	int i;
-	float alpha;
-	float alphaScale;
-
-	alphaScale = 1.0;
-	HandleBoxMoving();
-
-	if (!m_numitems) {
-		//
-		// Nothing to show
-		//
-		return;
-	}
-
-	m_font->setColor(m_foreground_color);
-	alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
-	if (alpha > 1.0) alpha = 1.0;
-
-	alpha = (1.0 - alpha) * 4.0;
-	if (alpha > 1.0) alpha = 1.0;
-
-	if (cge) {
-		alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
-	}
-
-	fsY = DrawItem(m_items, s_gmboxOffsetX, s_gmboxOffsetY, alpha * alphaScale);
-	fsY = alpha <= 0.2 ? s_gmboxOffsetY : fsY + s_gmboxOffsetY;
-
-	for (i = 1; i < m_numitems; i++)
-	{
-		fsY += DrawItem(&m_items[i], s_gmboxOffsetX, fsY, alphaScale);
-		if (fsY > m_frame.size.height)
-		{
-			if (EventPending(EV_GMBox_Decay)) {
-				CancelEventsOfType(EV_GMBox_Decay);
-			}
-
-			PostEvent(EV_GMBox_Decay, 0.0);
-			break;
-		}
-	}
+    this->m_reallyshown = b;
+    setShowState();
 }
 
-void UIGMBox::setRealShow( bool b )
+void UIGMBox::Clear(void)
 {
-	this->m_reallyshown = b;
-	setShowState();
+    m_numitems = 0;
 }
-
-void UIGMBox::Clear( void )
-{
-	m_numitems = 0;
-}
-

From 1ec88142b9c707f330276f12c26b25ebbeb01d55 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:36:53 +0100
Subject: [PATCH 1618/2040] Put the value of the working directory in quotes

---
 .github/workflows/tags-publish-release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tags-publish-release.yml b/.github/workflows/tags-publish-release.yml
index fef5899d..a1d44b74 100644
--- a/.github/workflows/tags-publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -57,8 +57,8 @@ jobs:
         path: ${{github.workspace}}/${{matrix.target_os}}
 
     - name: Zip
-      working-directory: ${{github.workspace}}/${{matrix.target_os}}
-      run: zip -r ../${{ env.RELEASE_NAME }}.zip ./
+      working-directory: '${{github.workspace}}/${{matrix.target_os}}'
+      run: zip -r "../${{ env.RELEASE_NAME }}.zip" ./
 
     - name: Release
       uses: softprops/action-gh-release@v2

From 3897a44ce6718e5bcc8b581117e34461e7a61095 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:58:59 +0100
Subject: [PATCH 1619/2040] Bump the version number

---
 code/qcommon/q_version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 4814408b..0a57b0d6 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023-2024 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			80
+#define PRODUCT_VERSION_MINOR			81
 #define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 

From b58f031bcc5adddbe5e15c8c0af70ea8a8b9d11b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:09:23 +0100
Subject: [PATCH 1620/2040] Remove unused cg variables

---
 code/client/cl_main.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 636940c4..f7b467d1 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3620,14 +3620,6 @@ void CL_Init( void ) {
 	Cvar_Get ("dm_playermodel", "american_army", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("dm_playergermanmodel", "german_wehrmacht_soldier", CVAR_USERINFO | CVAR_ARCHIVE );
 
-	Cvar_Get ("cg_predictItems", "1", CVAR_USERINFO | CVAR_ARCHIVE );
-
-
-	// cgame might not be initialized before menu is used
-	Cvar_Get ("cg_viewsize", "100", CVAR_ARCHIVE );
-
-	Cvar_Get ("cg_running", "0", CVAR_ROM );
-
 	//
 	// register our commands
 	//

From 835ddb1de35cc783bc17f0b59a386522e7eb2f13 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:08:00 +0100
Subject: [PATCH 1621/2040] Set the compass scale to 0.55 by default on the
 base game

---
 code/client/cl_ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index ccc4dd4c..2a6e1d18 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -3857,7 +3857,7 @@ void UI_ResolutionChange(void)
         ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
     } else {
         // Older version doesn't have an adjustable compass, so assume 0.5 by default
-        ui_compass_scale = Cvar_Get("ui_compass_scale", "0.5", CVAR_ARCHIVE | CVAR_LATCH);
+        ui_compass_scale = Cvar_Get("ui_compass_scale", "0.55", CVAR_ARCHIVE | CVAR_LATCH);
     }
 
     CL_FillUIImports();

From fee63902810e119e9015934e4bb393eec94b4dcf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:55:36 +0100
Subject: [PATCH 1622/2040] Update README

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7973f2f3..07779dd5 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,9 @@ The entire single-player campaign should work (Allied Assault, Spearhead and Bre
 
 ### Multiplayer
 
-The Multiplayer part is almost fully stable.
+The Multiplayer part is almost fully stable, all game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liberation` from Medal of Honor: Breakthrough are implemented and are working as intended. Mods like `Freeze-Tag` are working as well.
 
-Server admins can use OpenMoHAA to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server. Bugs must be reported by creating a new [issue](https://github.com/openmoh/openmohaa/issues) on the OpenMoHAA GitHub project. Players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on a mohaa/mohaas/mohaab server.
-
-All game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liberation` from Medal of Honor: Breakthrough are implemented and are working as intended. Mods like `Freeze-Tag` are working as well.
+OpenMoHAA can be used to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server and players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on any server. Unfortunately, some bugs/strange behaviors and crashes can occur especially for servers hosting some specific mods. The best way to report bugs is by [creating a new issue](https://github.com/openmoh/openmohaa/issues) on the [OpenMoHAA GitHub](https://github.com/openmoh/openmohaa) project with the steps to reproduce (with eventually the problematic mods).
 
 ## Features
 

From aa52fe73a5e7c3ac16129e9b3b75f2b96733b71a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 19:31:58 +0100
Subject: [PATCH 1623/2040] Restart the file system when connected and when the
 local server has no paks

---
 code/client/cl_parse.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 68f8fc7b..6d0131a3 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -538,6 +538,7 @@ void CL_ParseGamestate( msg_t *msg ) {
 	entityState_t	nullstate;
 	int				cmd;
 	char			*s;
+	cvar_t			*sv_paks;
 
 	UI_CloseConsole();
 
@@ -606,9 +607,14 @@ void CL_ParseGamestate( msg_t *msg ) {
 	// stop recording now so the demo won't have an unnecessary level load at the end.
 	if(cl_autoRecordDemo->integer && clc.demorecording)
 		CL_StopRecord_f();
-	
-	// reinitialize the filesystem if the game directory has changed
-	FS_ConditionalRestart( clc.checksumFeed, qfalse );
+
+	if (clc.state == CA_CONNECTED && !Cvar_Get("sv_paks", "", 0)->string[0]) {
+		// Added in 2.30
+		FS_Restart(clc.checksumFeed);
+	} else {
+		// reinitialize the filesystem if the game directory has changed
+		FS_ConditionalRestart(clc.checksumFeed, qfalse);
+	}
 
 	clc.state = CA_LOADING;
     if (!com_sv_running->integer)

From 9c952ab49de83eff684cf7e0e2b7e1d439930495 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 19:33:05 +0100
Subject: [PATCH 1624/2040] Set the map name from the server

---
 code/client/cl_parse.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 6d0131a3..4f5a9407 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -620,8 +620,12 @@ void CL_ParseGamestate( msg_t *msg ) {
     if (!com_sv_running->integer)
     {
         const char *info = cl.gameState.stringData + cl.gameState.stringOffsets[CS_SERVERINFO];
-        UI_ClearState();
-        UI_BeginLoad(Info_ValueForKey(info, "mapname"));
+		const char *mapname = Info_ValueForKey(info, "mapname");
+		// Added in 2.0
+		Cvar_Set("mapname", mapname);
+
+		UI_ClearState();
+        UI_BeginLoad(mapname);
     }
 
 	// This used to call CL_StartHunkUsers, but now we enter the download state before loading the

From a2e4f1dc253ddd3312f065e25561f8aa8ba69822 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 19:34:19 +0100
Subject: [PATCH 1625/2040] Use the server frametime when parsing baseline
 entities from the game state

---
 code/client/cl_parse.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 4f5a9407..68a9cc7e 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -538,7 +538,6 @@ void CL_ParseGamestate( msg_t *msg ) {
 	entityState_t	nullstate;
 	int				cmd;
 	char			*s;
-	cvar_t			*sv_paks;
 
 	UI_CloseConsole();
 
@@ -569,6 +568,7 @@ void CL_ParseGamestate( msg_t *msg ) {
             csNum = CPT_NormalizeConfigstring(i);
             if (csNum < 0 || csNum >= MAX_CONFIGSTRINGS) {
                 Com_Error(ERR_DROP, "configstring > MAX_CONFIGSTRINGS");
+				return;
             }
             s = MSG_ReadScrambledBigString(msg);
             len = strlen(s);
@@ -589,8 +589,7 @@ void CL_ParseGamestate( msg_t *msg ) {
 			//Com_Memset (&nullstate, 0, sizeof(nullstate));
 			MSG_GetNullEntityState(&nullstate);
 			es = &cl.entityBaselines[ newnum ];
-			// FIXME: frametime
-			MSG_ReadDeltaEntity( msg, &nullstate, es, newnum, 0.0);
+			MSG_ReadDeltaEntity( msg, &nullstate, es, newnum, cls.serverFrameTime);
 		} else {
 			Com_Error( ERR_DROP, "CL_ParseGamestate: bad command byte %i", cmd );
 		}

From 0644bc29677b6536acbdd775ab8eb1e00a96e537 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:27:08 +0100
Subject: [PATCH 1626/2040] Don't execute old commands from previous map when
 initializing cgame

---
 code/client/cl_cgame.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 4914e4af..685f32a8 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -944,10 +944,17 @@ void CL_InitCGame( void ) {
 		CL_InitClientSavedData();
 	}
 
-	// init for this gamestate
-	// use the lastExecutedServerCommand instead of the serverCommandSequence
-	// otherwise server commands sent just before a gamestate are dropped
-	cge->CG_Init( &cgi, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum );
+	if (cl.snap.valid) {
+		// init for this gamestate
+		// use the lastExecutedServerCommand instead of the serverCommandSequence
+		// otherwise server commands sent just before a gamestate are dropped
+		cge->CG_Init(&cgi, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum);
+	} else {
+		// executing client commands from previous map/server might be an issue, some commands might be cs commands,
+		// like old CS_SYSTEMINFO configstrings which still contain the sv_serverId from previous map.
+		// It would cause the client to lose the game state number
+		cge->CG_Init(&cgi, clc.serverMessageSequence, clc.serverCommandSequence, clc.clientNum);
+	}
 
 	ClearNewConfigFlag();
 	TIKI_FinishLoad();

From d26718a71164bf71784747ebab5d1fc1b319ce41 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:32:38 +0100
Subject: [PATCH 1627/2040] Fix teamkill kick warning not working

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index cfb4542c..de3cd791 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4256,7 +4256,7 @@ void Player::ClientInactivityTimer(void)
         //
         // The player reached maximum team kills
         //
-        G_PrintToAllClients(va("%s %s", client->pers.netname, message.c_str()), qfalse);
+        G_PrintToAllClients(va("%s %s", client->pers.netname, message.c_str()), 2);
 
         if (Q_stricmp(Info_ValueForKey(client->pers.userinfo, "ip"), "localhost")) {
             //

From 3cc417151dba2cd670e672a7ec034dae1374818e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:42:45 +0100
Subject: [PATCH 1628/2040] Fix newlines for G_PrintToAllClients

---
 code/fgame/dm_manager.cpp | 4 ++--
 code/fgame/g_utils.cpp    | 4 ++--
 code/fgame/player.cpp     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 643e7346..ed1763ac 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1254,7 +1254,7 @@ bool DM_Manager::CheckEndMatch()
 
                     m_bIgnoringClockForBomb = false;
                 } else if (m_iNumBombsPlanted > 0) {
-                    G_PrintToAllClients("A bomb is still set!");
+                    G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("A Bomb is Still Set!")));
                     m_bIgnoringClockForBomb = true;
                     return false;
                 }
@@ -1328,7 +1328,7 @@ bool DM_Manager::CheckEndMatch()
             return true;
         } else if (m_iNumBombsPlanted >= m_iNumTargetsToDestroy - m_iNumTargetsDestroyed) {
             if (!m_bIgnoringClockForBomb) {
-                G_PrintToAllClients("A bomb is still set!");
+                G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("A Bomb is Still Set!")));
                 m_bIgnoringClockForBomb = true;
             }
         } else {
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 6204835d..8f20931c 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -2171,9 +2171,9 @@ void G_PrintToAllClients(const char *pszString, int iType)
         }
     } else {
         if (iType == 0) {
-            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", pszString);
+            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\"", pszString);
         } else {
-            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\n\"", pszString);
+            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\"", pszString);
         }
     }
 }
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index de3cd791..81917483 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4256,7 +4256,7 @@ void Player::ClientInactivityTimer(void)
         //
         // The player reached maximum team kills
         //
-        G_PrintToAllClients(va("%s %s", client->pers.netname, message.c_str()), 2);
+        G_PrintToAllClients(va("%s %s\n", client->pers.netname, message.c_str()), 2);
 
         if (Q_stricmp(Info_ValueForKey(client->pers.userinfo, "ip"), "localhost")) {
             //

From 37466cdffbbe1c5448f9fd767e3b9b82bc98eef5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 22:02:48 +0100
Subject: [PATCH 1629/2040] Fix wrong condition for checking entity

---
 code/fgame/playerbot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 16e8ba4f..d64c1245 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -177,7 +177,7 @@ void BotController::CheckUse(void)
     trace = G_Trace(start, vec_zero, vec_zero, end, controlledEnt, MASK_USABLE, false, "BotController::CheckUse");
 
     // It may be a door
-    if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.entityNum) {
+    if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.ent) {
         if (trace.ent->entity->IsSubclassOfDoor()) {
             Door *door = static_cast<Door *>(trace.ent->entity);
             if (door->isOpen()) {

From 231553f574059293b39edd891f9b2a59e8e411cf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 22:14:57 +0100
Subject: [PATCH 1630/2040] Fix round not ending when the clock reached 0:00

The wrong variable was being checked to end the round
---
 code/fgame/dm_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index ed1763ac..e4b1e13d 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1245,7 +1245,7 @@ bool DM_Manager::CheckEndMatch()
     if (AllowRespawn() || (!m_team_axis.IsDead() && !m_team_allies.IsDead())) {
         int roundLimit = GetRoundLimit();
 
-        if (roundLimit > 0 && level.time >= m_iDefaultRoundLimit * 60 + m_fRoundTime) {
+        if (roundLimit > 0 && level.time >= roundLimit * 60 + m_fRoundTime) {
             if (m_csTeamBombPlantSide != STRING_DRAW) {
                 if (m_bIgnoringClockForBomb) {
                     if (m_iNumBombsPlanted > 0) {

From 8a84436d1b03a995061a968ab3bd013c51abc345 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 9 Dec 2024 22:33:36 +0100
Subject: [PATCH 1631/2040] Fix Cmd_TokenizeString2 incorrectly ignoring
 extended ascii characters

---
 code/qcommon/cmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
index e6129e64..c4d75124 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -667,7 +667,7 @@ static void Cmd_TokenizeString2( const char *text_in, qboolean ignoreQuotes ) {
 
 		while ( 1 ) {
 			// skip whitespace
-			while ( *text && *text <= ' ' ) {
+			while ( *text && ( unsigned char )*text <= ' ' ) {
 				text++;
 			}
 			if ( !*text ) {
@@ -715,7 +715,7 @@ static void Cmd_TokenizeString2( const char *text_in, qboolean ignoreQuotes ) {
 		cmd_argc++;
 
 		// skip until whitespace, quote, or command
-		while ( *text > ' ' ) {
+		while ( ( unsigned char )*text > ' ' ) {
 			if ( !ignoreQuotes && text[0] == '"' ) {
 				break;
 			}

From a199188ede9dd84b6995ef1ba5cbde12163e1afd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Dec 2024 19:53:15 +0100
Subject: [PATCH 1632/2040] Add more stuff to build dev/server containers

---
 docker/README.md                         | 11 +++-----
 docker/dev/README.md                     |  9 ++++++
 docker/{ => dev}/armhf/Dockerfile        |  0
 docker/{ => dev}/build.ps1               |  0
 docker/{ => dev}/i386/18.04/Dockerfile   |  0
 docker/{ => dev}/s390x/Dockerfile        |  0
 docker/{ => dev}/x86_64/14.04/Dockerfile |  0
 docker/{ => dev}/x86_64/16.04/Dockerfile |  0
 docker/{ => dev}/x86_64/18.04/Dockerfile |  0
 docker/{ => dev}/x86_64/20.04/Dockerfile |  0
 docker/{ => dev}/x86_64/22.04/Dockerfile |  0
 docker/{ => dev}/x86_64/22.10/Dockerfile |  0
 docker/server/README.md                  | 34 ++++++++++++++++++++++
 docker/server/base/Dockerfile            | 36 ++++++++++++++++++++++++
 docker/server/build.ps1                  |  2 ++
 docker/server/build.sh                   |  2 ++
 docker/server/full/.dockerignore         |  2 ++
 docker/server/full/Dockerfile            |  6 ++++
 docker/server/full/game/.gitkeep         |  0
 docker/server/full/game/mods/.gitkeep    |  0
 20 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 docker/dev/README.md
 rename docker/{ => dev}/armhf/Dockerfile (100%)
 rename docker/{ => dev}/build.ps1 (100%)
 rename docker/{ => dev}/i386/18.04/Dockerfile (100%)
 rename docker/{ => dev}/s390x/Dockerfile (100%)
 rename docker/{ => dev}/x86_64/14.04/Dockerfile (100%)
 rename docker/{ => dev}/x86_64/16.04/Dockerfile (100%)
 rename docker/{ => dev}/x86_64/18.04/Dockerfile (100%)
 rename docker/{ => dev}/x86_64/20.04/Dockerfile (100%)
 rename docker/{ => dev}/x86_64/22.04/Dockerfile (100%)
 rename docker/{ => dev}/x86_64/22.10/Dockerfile (100%)
 create mode 100644 docker/server/README.md
 create mode 100644 docker/server/base/Dockerfile
 create mode 100644 docker/server/build.ps1
 create mode 100644 docker/server/build.sh
 create mode 100644 docker/server/full/.dockerignore
 create mode 100644 docker/server/full/Dockerfile
 create mode 100644 docker/server/full/game/.gitkeep
 create mode 100644 docker/server/full/game/mods/.gitkeep

diff --git a/docker/README.md b/docker/README.md
index 30b23b8e..3fe249db 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,6 @@
 # Docker
 
-Run with
-```sh
-mkdir .cmake
-cd .cmake
-cmake -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 -G Ninja ../
-ninja
-```
+This contains Docker files for openmohaa development and server.
+
+- See [Development](dev/README.md) to build dev containers.
+- See [Server](server/README.md) to containers for hosting an OpenMoHAA server.
diff --git a/docker/dev/README.md b/docker/dev/README.md
new file mode 100644
index 00000000..30b23b8e
--- /dev/null
+++ b/docker/dev/README.md
@@ -0,0 +1,9 @@
+# Docker
+
+Run with
+```sh
+mkdir .cmake
+cd .cmake
+cmake -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 -G Ninja ../
+ninja
+```
diff --git a/docker/armhf/Dockerfile b/docker/dev/armhf/Dockerfile
similarity index 100%
rename from docker/armhf/Dockerfile
rename to docker/dev/armhf/Dockerfile
diff --git a/docker/build.ps1 b/docker/dev/build.ps1
similarity index 100%
rename from docker/build.ps1
rename to docker/dev/build.ps1
diff --git a/docker/i386/18.04/Dockerfile b/docker/dev/i386/18.04/Dockerfile
similarity index 100%
rename from docker/i386/18.04/Dockerfile
rename to docker/dev/i386/18.04/Dockerfile
diff --git a/docker/s390x/Dockerfile b/docker/dev/s390x/Dockerfile
similarity index 100%
rename from docker/s390x/Dockerfile
rename to docker/dev/s390x/Dockerfile
diff --git a/docker/x86_64/14.04/Dockerfile b/docker/dev/x86_64/14.04/Dockerfile
similarity index 100%
rename from docker/x86_64/14.04/Dockerfile
rename to docker/dev/x86_64/14.04/Dockerfile
diff --git a/docker/x86_64/16.04/Dockerfile b/docker/dev/x86_64/16.04/Dockerfile
similarity index 100%
rename from docker/x86_64/16.04/Dockerfile
rename to docker/dev/x86_64/16.04/Dockerfile
diff --git a/docker/x86_64/18.04/Dockerfile b/docker/dev/x86_64/18.04/Dockerfile
similarity index 100%
rename from docker/x86_64/18.04/Dockerfile
rename to docker/dev/x86_64/18.04/Dockerfile
diff --git a/docker/x86_64/20.04/Dockerfile b/docker/dev/x86_64/20.04/Dockerfile
similarity index 100%
rename from docker/x86_64/20.04/Dockerfile
rename to docker/dev/x86_64/20.04/Dockerfile
diff --git a/docker/x86_64/22.04/Dockerfile b/docker/dev/x86_64/22.04/Dockerfile
similarity index 100%
rename from docker/x86_64/22.04/Dockerfile
rename to docker/dev/x86_64/22.04/Dockerfile
diff --git a/docker/x86_64/22.10/Dockerfile b/docker/dev/x86_64/22.10/Dockerfile
similarity index 100%
rename from docker/x86_64/22.10/Dockerfile
rename to docker/dev/x86_64/22.10/Dockerfile
diff --git a/docker/server/README.md b/docker/server/README.md
new file mode 100644
index 00000000..0874fcf3
--- /dev/null
+++ b/docker/server/README.md
@@ -0,0 +1,34 @@
+# Server image
+
+## Introduction
+
+Contains Dockerfile for building openmohaa-based server on Debian Bookworm. MOHAA data must be stored in `/usr/local/share/mohaa`, the directory structure should look like this:
+```
+[/usr/local/share/mohaa]
+├── [main]
+│   └── Pakx.pk3
+├── [mainta]
+│   └── pakx.pk3
+├── [maintt]
+│   └── pakx.pk3
+└── [mods]
+    └── Custom PK3s go here
+```
+
+`sound` and `video` folders are not needed.
+
+There are two ways to handle game data:
+1) Create a new image based on this image (with a new Dockerfile) and copy the game directory in `/usr/local/share/mohaa`. This is the recommended solution because game data should be immutable. For mods, a base image can be created, or a volume can be mounted to `/usr/local/share/mohaa/mods` which contains files that will modify the game.
+
+or
+
+2) Mount a volume to the game directory directly in `/usr/local/share/mohaa`.
+
+## Building
+
+1) Put the game data (`main`, `mainta` and `maintt`) inside `full/game`, it should match the directory structure above
+2) Execute one of the build.* scripts (depending on if you are running Linux or Windows).
+
+## Starting
+
+The server can now be executed using `docker run -p 12203:12203 -p 12300:12300 openmohaa/full`, or by using a docker composition file.
diff --git a/docker/server/base/Dockerfile b/docker/server/base/Dockerfile
new file mode 100644
index 00000000..11623857
--- /dev/null
+++ b/docker/server/base/Dockerfile
@@ -0,0 +1,36 @@
+FROM debian:bookworm
+
+RUN apt update && apt install -y git clang cmake flex bison zlib1g-dev ninja-build
+
+# Compile with clang
+ENV CC=clang
+ENV CXX=clang++
+
+# Clone the repository
+RUN mkdir -p /tmp/openmohaa/build \
+    && cd /tmp/openmohaa \
+    && git clone --depth 1 --single-branch -b main https://github.com/openmoh/openmohaa.git
+
+# Build the project
+RUN cd /tmp/openmohaa/build \
+    && cmake -G "Ninja" -DBUILD_NO_CLIENT=1 -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DTARGET_LOCAL_SYSTEM=1 -DCMAKE_INSTALL_PREFIX="/usr/local/games/openmohaa" /tmp/openmohaa/openmohaa \
+    && cmake --build . \
+    && cmake --install .
+
+# Reset to the base debian image, will gain space
+FROM debian:bookworm
+
+# Copy the installed directory
+COPY --from=0 /usr/local/games/openmohaa /usr/local/games/openmohaa
+
+# MOHAA data (main, mainta and maintt) goes inside this directory
+# mods can go inside a subdirectory called "mods"
+VOLUME "/usr/local/share/mohaa"
+
+# Create an user for starting the server
+# This improves the overall security of the server instance
+RUN useradd -m openmohaa
+USER openmohaa
+
+WORKDIR "/usr/local/share/mohaa"
+ENTRYPOINT [ "/usr/local/games/openmohaa/lib/openmohaa/omohaaded", "+set", "fs_game", "mods" ]
diff --git a/docker/server/build.ps1 b/docker/server/build.ps1
new file mode 100644
index 00000000..d41125a6
--- /dev/null
+++ b/docker/server/build.ps1
@@ -0,0 +1,2 @@
+docker build -t openmohaa/base base
+docker build -t openmohaa/full full
diff --git a/docker/server/build.sh b/docker/server/build.sh
new file mode 100644
index 00000000..d41125a6
--- /dev/null
+++ b/docker/server/build.sh
@@ -0,0 +1,2 @@
+docker build -t openmohaa/base base
+docker build -t openmohaa/full full
diff --git a/docker/server/full/.dockerignore b/docker/server/full/.dockerignore
new file mode 100644
index 00000000..52417c5b
--- /dev/null
+++ b/docker/server/full/.dockerignore
@@ -0,0 +1,2 @@
+**/.gitignore
+**/.gitkeep
\ No newline at end of file
diff --git a/docker/server/full/Dockerfile b/docker/server/full/Dockerfile
new file mode 100644
index 00000000..e2a3d64d
--- /dev/null
+++ b/docker/server/full/Dockerfile
@@ -0,0 +1,6 @@
+FROM openmohaa/base
+
+USER openmohaa
+
+COPY --chown=openmohaa:openmohaa "game" "/usr/local/share/mohaa"
+
diff --git a/docker/server/full/game/.gitkeep b/docker/server/full/game/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/docker/server/full/game/mods/.gitkeep b/docker/server/full/game/mods/.gitkeep
new file mode 100644
index 00000000..e69de29b

From 3dcb2cad649c240802bdb2a8d4aba76f6cb961a3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 10 Dec 2024 23:07:57 +0100
Subject: [PATCH 1633/2040] Fix typo

---
 docker/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 3fe249db..eecfbf4a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,5 +2,5 @@
 
 This contains Docker files for openmohaa development and server.
 
-- See [Development](dev/README.md) to build dev containers.
-- See [Server](server/README.md) to containers for hosting an OpenMoHAA server.
+- See [Development](dev/README.md) to build dev container images.
+- See [Server](server/README.md) to build an OpenMoHAA server container image.

From 279cfb364b3990f0302cb0016300785b50c696cd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Dec 2024 00:42:54 +0100
Subject: [PATCH 1634/2040] Change the homepath instead of the game directory

Otherwise, clients would look for cgamex86.dll module that is inside the fs_game directory
---
 docker/server/README.md       | 13 +++++++++----
 docker/server/base/Dockerfile |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docker/server/README.md b/docker/server/README.md
index 0874fcf3..104ee3c0 100644
--- a/docker/server/README.md
+++ b/docker/server/README.md
@@ -6,13 +6,18 @@ Contains Dockerfile for building openmohaa-based server on Debian Bookworm. MOHA
 ```
 [/usr/local/share/mohaa]
 ├── [main]
-│   └── Pakx.pk3
+│   └── Pak*.pk3
 ├── [mainta]
-│   └── pakx.pk3
+│   └── pak*.pk3
 ├── [maintt]
-│   └── pakx.pk3
+│   └── pak*.pk3
 └── [mods]
-    └── Custom PK3s go here
+    ├── [main]
+    │   └── Custom PK3s go here
+    ├── [mainta]
+    │   └── Custom PK3s go here
+    └── [maintt]
+        └── Custom PK3s go here
 ```
 
 `sound` and `video` folders are not needed.
diff --git a/docker/server/base/Dockerfile b/docker/server/base/Dockerfile
index 11623857..7f97c0b7 100644
--- a/docker/server/base/Dockerfile
+++ b/docker/server/base/Dockerfile
@@ -24,7 +24,7 @@ FROM debian:bookworm
 COPY --from=0 /usr/local/games/openmohaa /usr/local/games/openmohaa
 
 # MOHAA data (main, mainta and maintt) goes inside this directory
-# mods can go inside a subdirectory called "mods"
+# mods can go inside a subdirectory called "home"
 VOLUME "/usr/local/share/mohaa"
 
 # Create an user for starting the server
@@ -33,4 +33,4 @@ RUN useradd -m openmohaa
 USER openmohaa
 
 WORKDIR "/usr/local/share/mohaa"
-ENTRYPOINT [ "/usr/local/games/openmohaa/lib/openmohaa/omohaaded", "+set", "fs_game", "mods" ]
+ENTRYPOINT [ "/usr/local/games/openmohaa/lib/openmohaa/omohaaded", "+set", "fs_homepath", "home" ]

From fcdde53774976b674cb446f5132c3dd807178932 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Dec 2024 00:57:31 +0100
Subject: [PATCH 1635/2040] Use home instead of mods

---
 docker/server/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/server/README.md b/docker/server/README.md
index 104ee3c0..7dfa48f3 100644
--- a/docker/server/README.md
+++ b/docker/server/README.md
@@ -11,7 +11,7 @@ Contains Dockerfile for building openmohaa-based server on Debian Bookworm. MOHA
 │   └── pak*.pk3
 ├── [maintt]
 │   └── pak*.pk3
-└── [mods]
+└── [home]
     ├── [main]
     │   └── Custom PK3s go here
     ├── [mainta]
@@ -23,7 +23,7 @@ Contains Dockerfile for building openmohaa-based server on Debian Bookworm. MOHA
 `sound` and `video` folders are not needed.
 
 There are two ways to handle game data:
-1) Create a new image based on this image (with a new Dockerfile) and copy the game directory in `/usr/local/share/mohaa`. This is the recommended solution because game data should be immutable. For mods, a base image can be created, or a volume can be mounted to `/usr/local/share/mohaa/mods` which contains files that will modify the game.
+1) Create a new image based on this image (with a new Dockerfile) and copy the game directory in `/usr/local/share/mohaa`. This is the recommended solution because game data should be immutable. For mods, a base image can be created, or a volume can be mounted to `/usr/local/share/mohaa/home` which contains files (in main, mainta or maintt subdir) that will modify the game.
 
 or
 

From 9b247a746c5e4d0f769fdff0eab86a780f4599a7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Dec 2024 20:19:34 +0100
Subject: [PATCH 1636/2040] Add health check script to check for the state of
 the mohaa server

---
 docker/server/base/Dockerfile      |  5 ++++
 docker/server/base/health_check.sh | 37 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 docker/server/base/health_check.sh

diff --git a/docker/server/base/Dockerfile b/docker/server/base/Dockerfile
index 7f97c0b7..7f2fb580 100644
--- a/docker/server/base/Dockerfile
+++ b/docker/server/base/Dockerfile
@@ -27,6 +27,11 @@ COPY --from=0 /usr/local/games/openmohaa /usr/local/games/openmohaa
 # mods can go inside a subdirectory called "home"
 VOLUME "/usr/local/share/mohaa"
 
+# Install tools to check for the health
+RUN apt update && apt install -y socat
+COPY "health_check.sh" "/usr/local/bin/health_check.sh"
+HEALTHCHECK --interval=15s --timeout=20s --start-period=10s --retries=3 CMD [ "bash", "/usr/local/bin/health_check.sh" ]
+
 # Create an user for starting the server
 # This improves the overall security of the server instance
 RUN useradd -m openmohaa
diff --git a/docker/server/base/health_check.sh b/docker/server/base/health_check.sh
new file mode 100644
index 00000000..fd4c4659
--- /dev/null
+++ b/docker/server/base/health_check.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+header=$'\xff\xff\xff\xff\x01disconnect'
+# to avoid spamming the log file with getinfo/getstatus
+# simply send an unsupported message
+# so the server will return the disconnect message
+message=$'none'
+
+query_port=12203
+data=""
+
+while [ -z "$data" ]
+do
+    data=$(echo "$message" | socat - UDP:0.0.0.0:$query_port 2>/dev/null)
+    ret=$?
+
+    if [ $ret != 0 ]
+    then
+        echo "Fail (socat returned $ret)"
+        exit 1
+    fi
+
+    if [ -n "$data" ]
+    then
+        break
+    fi
+done
+
+if [ "$data" != "$header" ]
+then
+    echo "Fail (not maching header)"
+    echo $line
+    exit 1
+fi
+
+# Success
+exit 0

From 0a41f3bb767591e4e94872ea5a6b390ae6926b8a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Dec 2024 21:55:22 +0100
Subject: [PATCH 1637/2040] Indicate when processing events

---
 code/qcommon/listener.cpp | 11 ++++++++++-
 code/qcommon/listener.h   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 2d141d4c..f98d86f7 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -73,7 +73,8 @@ EventQueueNode Event::EventQueue;
 
 int DisableListenerNotify = 0;
 
-bool Listener::EventSystemStarted = 0;
+bool Listener::EventSystemStarted = false;
+bool Listener::ProcessingEvents = false;
 
 Event EV_Listener_CancelFor
 (
@@ -575,6 +576,8 @@ void L_ProcessPendingEvents()
 {
     EventQueueNode *node;
 
+    Listener::ProcessingEvents = true;
+
     int t = EVENT_msec;
     while (!LL_Empty(&Event::EventQueue, next, prev)) {
         Listener *obj;
@@ -600,6 +603,8 @@ void L_ProcessPendingEvents()
 
         delete node;
     }
+
+    Listener::ProcessingEvents = false;
 }
 
 void L_ShutdownEvents(void)
@@ -3007,6 +3012,8 @@ qboolean Listener::ProcessPendingEvents(void)
 
     t = EVENT_msec;
 
+    Listener::ProcessingEvents = true;
+
     event = Event::EventQueue.next;
     while (event != &Event::EventQueue) {
         Listener *obj;
@@ -3039,6 +3046,8 @@ qboolean Listener::ProcessPendingEvents(void)
         }
     }
 
+    Listener::ProcessingEvents = false;
+
     return processedEvents;
 }
 
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 631bf463..899750dd 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -457,6 +457,7 @@ public:
 #endif
 
     static bool EventSystemStarted;
+    static bool ProcessingEvents;
 
 private:
 #ifdef WITH_SCRIPT_ENGINE

From 95466b810f1515c12839dc30dfe4def911b9eb4d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Dec 2024 21:55:31 +0100
Subject: [PATCH 1638/2040] Prevent an infinite loop in ProcessPendingEvents()
 when an entity is being deleted in thinks

---
 code/fgame/entity.cpp |  8 ++++++++
 code/fgame/item.cpp   | 12 ++++--------
 code/fgame/weapon.cpp | 10 ++--------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 12d63a78..47ed2b89 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -5721,6 +5721,14 @@ void Entity::Delete(void)
     // Delete the entity the next frame
 
     if (g_iInThinks) {
+        if (ProcessingEvents) {
+            // Fixed in OPM
+            //  Add a slight delay because otherwise this would cause an infinite loop
+            //  when processing pending events
+            PostEvent(EV_Remove, 0.001);
+            return;
+        }
+
         PostEvent(EV_Remove, 0);
     } else {
         delete this;
diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp
index 0f72820b..5c4a3bfc 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -418,15 +418,11 @@ void Item::RemoveFromOwner(void)
 
 void Item::Delete(void)
 {
-    if (g_iInThinks) {
-        if (owner) {
-            RemoveFromOwner();
-        }
-
-        PostEvent(EV_Remove, 0);
-    } else {
-        delete this;
+    if (g_iInThinks && owner) {
+        RemoveFromOwner();
     }
+
+    Animate::Delete();
 }
 
 void Item::SetNoRemove(Event *ev)
diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 2816fa53..061be0e2 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1238,15 +1238,9 @@ void Weapon::Delete(void)
 {
     if (g_iInThinks) {
         DetachGun();
-
-        if (owner) {
-            RemoveFromOwner();
-        }
-
-        PostEvent(EV_Remove, 0);
-    } else {
-        delete this;
     }
+
+    Item::Delete();
 }
 
 //======================

From 1b8ef411eef8ffd23b70983b743e71e109715735 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 11 Dec 2024 23:20:27 +0100
Subject: [PATCH 1639/2040] Increase the value of MAX_PATCH_PLANES

---
 code/qcommon/cm_patch.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/cm_patch.h b/code/qcommon/cm_patch.h
index 62f31ada..52b82f5a 100644
--- a/code/qcommon/cm_patch.h
+++ b/code/qcommon/cm_patch.h
@@ -61,7 +61,10 @@ properly.
 
 
 #define	MAX_FACETS			1024
-#define	MAX_PATCH_PLANES	4096 // 2048 su44: increased for m1l2a
+// Changed in OPM
+//  In OG it's 4096, however due to a tiny floating point difference
+//  between x86 and x64, more patch planes can appear in x64
+#define	MAX_PATCH_PLANES	6144
 
 typedef struct {
 	float	plane[4];

From cd06dc053509f2575f9aee0baa0cc6446a325b6d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:34:23 +0100
Subject: [PATCH 1640/2040] Don't validate facet if there is an invalid border
 plane

The check was missing, which would cause a crash during collision test
---
 code/qcommon/cm_patch.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index 7330bf9d..b3128094 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -766,6 +766,10 @@ static qboolean CM_ValidateFacet( facet_t *facet ) {
 	Vector4Copy( planes[ facet->surfacePlane ].plane, plane );
 	w = BaseWindingForPlane( plane,  plane[3] );
 	for ( j = 0 ; j < facet->numBorders && w ; j++ ) {
+		if ( facet->borderPlanes[j] == -1 ) {
+			FreeWinding( w );
+			return qfalse;
+		}
 		Vector4Copy( planes[ facet->borderPlanes[j] ].plane, plane );
 		if ( !facet->borderInward[j] ) {
 			VectorSubtract( vec3_origin, plane, plane );

From 26c2225a2464fc0c0313e8d96d5f6b297d27652f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:45:44 +0100
Subject: [PATCH 1641/2040] Remove rate assertion

---
 code/fgame/entity.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 47ed2b89..1b2c6566 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -2996,7 +2996,6 @@ void Entity::FadeIn(Event *ev)
 
     if (ev->NumArgs() > 0) {
         rate = ev->GetFloat(1);
-        assert(rate);
         if (rate > 0) {
             rate = FRAMETIME / rate;
         }
@@ -3032,7 +3031,6 @@ void Entity::Fade(Event *ev)
 
     if (ev->NumArgs() > 0) {
         rate = ev->GetFloat(1);
-        assert(rate);
         if (rate > 0) {
             rate = FRAMETIME / rate;
         }

From e15440af5e28b1bbe1be809cc5f26cc017627c70 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:52:28 +0100
Subject: [PATCH 1642/2040] Clear the view velocity when PMF_NO_MOVE is set

---
 code/cgame/cg_view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 1bd6a4a2..75c49ce2 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -298,7 +298,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
 
     VectorCopy(origin, vOldOrigin);
 
-    if (!cg.predicted_player_state.walking || !(cg.predicted_player_state.pm_flags & PMF_FROZEN)) {
+    if (!cg.predicted_player_state.walking || (!(cg.predicted_player_state.pm_flags & PMF_FROZEN) && !(cg.predicted_player_state.pm_flags & PMF_NO_MOVE))) {
         VectorCopy(cg.predicted_player_state.velocity, vVelocity);
     } else {
         //

From 85da9fabdd8c3e2508cbe73f20688d231aa0da15 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 12 Dec 2024 23:50:42 +0100
Subject: [PATCH 1643/2040] Fix incorrect event/return value for
 ScriptOrigin::GetAngleEvent

---
 code/fgame/scriptslave.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 174b3b2c..62385d6a 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -2126,7 +2126,8 @@ Event EV_ScriptOrigin_GetAngle
     NULL,
     "get the angles of the entity using just one value.\n"
     "Gets the yaw of the entity or an up and down\n"
-    "direction if newAngle is [0-359] or -1 or -2"
+    "direction if newAngle is [0-359] or -1 or -2",
+    EV_GETTER
 );
 
 CLASS_DECLARATION(ScriptSlave, ScriptOrigin, "script_origin") {
@@ -2173,7 +2174,10 @@ void ScriptOrigin::SetAngleEvent(Event* ev)
 
 void ScriptOrigin::GetAngleEvent(Event* ev)
 {
-    ev->AddFloat(G_GetAngle(angles));
+    Vector forward;
+
+    angles.AngleVectorsLeft(&forward);
+    ev->AddFloat(G_GetAngle(forward));
 }
 
 /*****************************************************************************/

From e53c6b55bf17eda7e21933a0674200151bd3c483 Mon Sep 17 00:00:00 2001
From: Bulldozer <bulldozerecske@gmail.com>
Date: Fri, 13 Dec 2024 18:55:17 +0100
Subject: [PATCH 1644/2040] Update getting_started_installation.md

Spearhead was mentioned instead of Breakthrough.
---
 docs/getting_started_installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 3c959ef2..eb156aa6 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -71,7 +71,7 @@ This matches the hardware requirements (x86) of the original game.
 
 ### Breakthrough expansion
 
-800 MB of free disk space is required to install Spearhead on top of the base game.
+800 MB of free disk space is required to install Breakthrough on top of the base game.
 
 #### x86 (AMD and Intel)
 

From d5ec17ec26f283b043d2d002d07fae2419399669 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Dec 2024 19:24:58 +0100
Subject: [PATCH 1645/2040] Allow subtitles to be set from stufftext

---
 code/cgame/cg_servercmds.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 34608a1a..96b559c7 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -465,6 +465,10 @@ void CG_ExecuteNewServerCommands(int latestSequence, qboolean differentServer)
 static const char *whiteListedVariables[] = {
     "r_fastsky", // some mods set this variable to make the sky uniform
     "ui_hud",
+    "subtitle0",
+    "subtitle1",
+    "subtitle2",
+    "subtitle3"
 };
 
 //

From 32bee2602c113b0e5af590dd280a48577d792c5f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:37:13 +0100
Subject: [PATCH 1646/2040] Rename mods to home

---
 docker/server/full/game/{mods => home}/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docker/server/full/game/{mods => home}/.gitkeep (100%)

diff --git a/docker/server/full/game/mods/.gitkeep b/docker/server/full/game/home/.gitkeep
similarity index 100%
rename from docker/server/full/game/mods/.gitkeep
rename to docker/server/full/game/home/.gitkeep

From acf2dd0ad1629a8aec1e9862c3f143fc9aa4537b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Dec 2024 22:17:43 +0100
Subject: [PATCH 1647/2040] Use an integer when waiting

Since the expected time is in milliseconds, it's best to use an integer instead. Floating-point numbers lose precision as they get larger, especially when the level's current time is long (e.g., over 24 hours). This loss of precision could cause scripts to wait unsuccessfully with small numbers, causing unexpected behaviors
---
 code/fgame/scriptthread.cpp | 2 +-
 code/fgame/scriptthread.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index b3abdec0..5de1693b 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2478,7 +2478,7 @@ void ScriptThread::Stop(void)
     }
 }
 
-void ScriptThread::Wait(float time)
+void ScriptThread::Wait(int time)
 {
     StartTiming(level.inttime + time);
     m_ScriptVM->Suspend();
diff --git a/code/fgame/scriptthread.h b/code/fgame/scriptthread.h
index 1c39e70b..afe1e3e2 100644
--- a/code/fgame/scriptthread.h
+++ b/code/fgame/scriptthread.h
@@ -196,7 +196,7 @@ public:
     void                  Execute(Event *ev);
     void                  Execute();
     void                  Execute(ScriptVariable *data, int dataSize);
-    void                  Wait(float time);
+    void                  Wait(int time);
     void                  Pause(void);
     void                  ScriptExecute(ScriptVariable *data, int dataSize, ScriptVariable& returnValue);
     void                  ScriptExecuteInternal(ScriptVariable *data = NULL, int dataSize = 0);

From c293a52f7a5b8429e3bcfdc26fc1e0b6af9ebc68 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Dec 2024 22:52:42 +0100
Subject: [PATCH 1648/2040] Fix MASK_LADDER mask

---
 code/fgame/bg_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index bedc5ce8..30e55a0b 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -652,7 +652,7 @@ movement on the server game.
 #define MASK_CAMERASOLID (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_BODY | MASK_WATER)
 #define MASK_BEAM        (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_FENCE)
 #define MASK_LADDER \
-    (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_FENCE)
+    (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_AUTOCALCLIFE (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_FENCE)
 #define MASK_EXPLOSION    (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_WEAPONCLIP)
 #define MASK_SOUND        (CONTENTS_SOLID | CONTENTS_TRANSLUCENT)

From 508ee871b9ebaf1112bd58ee1e6924993df4b373 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Dec 2024 23:30:01 +0100
Subject: [PATCH 1649/2040] Add a small offset for checking if the player can
 get off ladder

This compensates with the difference with floating-point precision between architectures
---
 code/fgame/misc.cpp                | 2 +-
 code/fgame/player_conditionals.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index effbe0d9..7dd84950 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -3094,7 +3094,7 @@ void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
         );
     }
 
-    pUser->setOrigin(trace.endpos + m_vFacingDir * 0.005);
+    pUser->setOrigin(trace.endpos);
 }
 
 void FuncLadder::EnsureOverLadder(Entity *pUser)
diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index c3d9f1c6..ef2af238 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -1515,7 +1515,7 @@ qboolean Player::CondCanGetOffLadderTop(Conditional& condition)
 
     angles.AngleVectorsLeft(&vForward);
 
-    vStart = origin - vForward * 12.0f;
+    vStart = origin - vForward * 12.0f * 1.005f;
     vStart[2] += maxs[2] - 8.0f;
 
     vEnd = vStart + vForward * 40.0f;

From 981b12b63d28599768cebe1d08d2183ce19424b9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 13 Dec 2024 23:55:34 +0100
Subject: [PATCH 1650/2040] Return a rounded number in G_GetAngle

There are scripts that compare the returned angle with an exact value and sometimes G_GetAngle return a value with a tiny fraction difference
---
 code/fgame/g_utils.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 8f20931c..3d2ada67 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -924,10 +924,10 @@ float G_GetAngle(Vector movedir)
     angle = RAD2DEG(atan(1.0) * 2 + atan(-movedir[0] / sqrt(-movedir[0] * movedir[0] + 1.0)));
 
     if (movedir[1] < 0) {
-        return 360 - angle;
+        return (int)((360 - angle) * 10000) / 10000.0;
     }
 
-    return angle;
+    return (int)(angle * 10000) / 10000.0;
 }
 
 /*

From 0fb80a4ab52455595689e11c21b52574b3b4d292 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 19:38:52 +0100
Subject: [PATCH 1651/2040] Use unnamedsoldier.cfg config file if the openmohaa
 config file doesn't exist

---
 code/qcommon/common.c | 44 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 7383240a..9024bcde 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1612,6 +1612,22 @@ static void Com_InitRand(void)
 		srand(time(NULL));
 }
 
+/*
+=================
+Com_ConfigExists
+=================
+*/
+qboolean Com_ConfigExists(const char* configname) {
+	fileHandle_t handle = (fileHandle_t)0;
+
+    if (FS_FOpenFileRead(va("configs/%s", configname), &handle, qfalse, qfalse) == -1) {
+		return qfalse;
+    }
+
+	FS_FCloseFile(handle);
+	return qtrue;
+}
+
 /*
 =================
 Com_Init
@@ -1701,27 +1717,33 @@ void Com_Init( char *commandLine ) {
 
 	config = Cvar_Get( "config", "omconfig.cfg", 0 );
 
-	if( strlen( config->string ) <= 1 )
+	if( strlen( config->string ) > 1 )
+	{
+		size_t len = strlen( config->string );
+
+		Q_strncpyz( configname, config->string, len >= sizeof( configname ) ? sizeof( configname ) : len );
+		COM_StripExtension( configname, configname, sizeof( configname ) );
+		Q_strcat( configname, sizeof( configname ), ".cfg" );
+		SaveRegistryInfo( 1, "config", configname, sizeof( configname ) );
+	}
+	else
 	{
 		long size = sizeof( configname );
 		LoadRegistryInfo(1, "config", configname, &size );
 		COM_DefaultExtension( configname, sizeof( configname ), ".cfg" );
 	}
-	else
-	{
-		size_t len = strlen( config->string );
-
-		strncpy( configname, config->string, len >= sizeof( configname ) ? sizeof( configname ) : len );
-		COM_StripExtension( configname, configname, sizeof( configname ) );
-		strcat( configname, ".cfg" );
-		SaveRegistryInfo( 1, "config", configname, sizeof( configname ) );
-	}
 
 	SaveRegistryInfo( 1, "config", configname, sizeof( configname ) );
+
 	Cvar_Set( "config", configname );
 	Com_Printf( "Config: %s\n", configname );
 
-	Cbuf_AddText( va( "exec configs/%s\n", configname ) );
+	if ( !Com_ConfigExists( configname )) {
+		Com_Printf( "The config file '%s' doesn't exist, using unnamedsoldier.cfg as a template\n", configname );
+		Cbuf_AddText( va( "exec configs/unnamedsoldier.cfg\n", configname ) );
+	} else {
+		Cbuf_AddText( va( "exec configs/%s\n", configname ) );
+	}
 
 	if( Com_SafeMode() )
 	{

From 1ef61a6e3dd2664ca319759654bdf1769a7553cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 19:40:49 +0100
Subject: [PATCH 1652/2040] Use the PID file in non-debug builds

The PID file is used to check if openmohaa cleanly exited, and in case it didn't, the user is prompted to start in safe mode
---
 code/qcommon/common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 9024bcde..96d11279 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1863,7 +1863,9 @@ void Com_Init( char *commandLine ) {
 
 	Sys_Init();
 
-	//Sys_InitPIDFile(FS_GetCurrentGameDir());
+#ifndef NDEBUG
+	Sys_InitPIDFile(FS_GetCurrentGameDir());
+#endif
 
 	// Pick a random port value
 	Com_RandomBytes((byte*)&qport, sizeof(int));

From 13eafb9bf186008ebdfe0ebf4a1d44398e3abe03 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 19:52:50 +0100
Subject: [PATCH 1653/2040] Update server doc

---
 docs/configuration/server.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 00445aa9..77d3f7ec 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -2,6 +2,8 @@
 
 This documentation currently only lists new changes that were introduced in OpenMoHAA.
 
+If you want to use containers, see [Building a server container in Docker](../../docker/server/README.md) to build an image for your dedicated server.
+
 ## Home directory
 
 In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:

From d3fb1331f8f7f1617533c31f4a228b787a38c952 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 20:09:33 +0100
Subject: [PATCH 1654/2040] Fix NDEBUG check

---
 code/qcommon/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 96d11279..448c63f6 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1863,7 +1863,7 @@ void Com_Init( char *commandLine ) {
 
 	Sys_Init();
 
-#ifndef NDEBUG
+#ifdef NDEBUG
 	Sys_InitPIDFile(FS_GetCurrentGameDir());
 #endif
 

From 20c1fab815e73657c1e2b671191551f8b4ec7bdd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 22:13:11 +0100
Subject: [PATCH 1655/2040] Don't set the frame number if the renderer function
 doesn't exist

---
 code/client/cl_main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index f7b467d1..27645771 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2590,6 +2590,10 @@ void CL_CheckUserinfo( void ) {
 }
 
 void CL_SetFrameNumber(int frameNumber) {
+	if (!re.SetFrameNumber) {
+		return;
+	}
+
 	re.SetFrameNumber(frameNumber);
 }
 

From f2f9ba9f8331ab196591f9a5565be272406e8dfb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 22:14:55 +0100
Subject: [PATCH 1656/2040] Fix emulated death message incorrectly having a '?'
 at the beginning of each message on base game

---
 code/fgame/g_utils.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 3d2ada67..45b1b3c6 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -2232,9 +2232,12 @@ G_PrintDeathMessageEmulated(const char *s1, const char *s2, char *attackerName,
     result2 = NULL;
 
     if (type == tolower(type)) {
+        // Enemy
         hudColor = 4;
     } else {
-        hudColor = 5;
+        // Friend
+        //hudColor = 5;
+        hudColor = 4;
     }
 
     if (*s1 != 'x') {
@@ -2327,7 +2330,7 @@ void G_PrintDeathMessage_Old(const char *pszString)
             continue;
         }
 
-        gi.SendServerCommand(ent - g_entities, "print \"" HUD_MESSAGE_CHAT_RED "%s\"", pszString);
+        gi.SendServerCommand(ent - g_entities, "print \"%s\"", pszString);
     }
 }
 

From 0765537d29022ebe61b2e9d6b993ea808f396132 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 14 Dec 2024 23:32:17 +0100
Subject: [PATCH 1657/2040] Improve bot attack state

This should stop bot aiming forever behind walls and getting stuck to a wall
---
 code/fgame/playerbot.cpp | 32 +++++++++++++++++++++++---------
 code/fgame/playerbot.h   |  1 +
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index d64c1245..fcea8457 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -648,6 +648,7 @@ bool BotController::CheckCondition_Attack(void)
 
         if (controlledEnt->CanSee(sent, 80, maxDistance, false)) {
             m_pEnemy      = sent;
+            m_vLastEnemyPos = m_pEnemy->centroid;
             m_iAttackTime = level.inttime + 1000;
             return true;
         }
@@ -674,6 +675,7 @@ void BotController::State_EndAttack(void)
 void BotController::State_Attack(void)
 {
     bool    bMelee              = false;
+    bool    bCanSee             = false;
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
     Weapon *pWeap               = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
@@ -686,9 +688,10 @@ void BotController::State_Attack(void)
     }
     float fDistanceSquared = (m_pEnemy->origin - controlledEnt->origin).lengthSquared();
 
-    if (controlledEnt->CanSee(
-            m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false
-        )) {
+    m_vOldEnemyPos = m_vLastEnemyPos;
+
+    bCanSee = controlledEnt->CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false);
+    if (bCanSee) {
         if (!pWeap) {
             return;
         }
@@ -761,15 +764,19 @@ void BotController::State_Attack(void)
             controlledEnt->ZoomOff();
         }
 
-        m_iAttackTime   = level.inttime + 1000;
-        m_vOldEnemyPos  = m_vLastEnemyPos;
-        m_vLastEnemyPos = m_pEnemy->centroid;
+        m_iAttackTime           = level.inttime + 1000;
+        m_iAttackStopAimTime    = level.inttime + 3000;
+        m_vLastEnemyPos         = m_pEnemy->centroid;
     } else {
         m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
         fMinDistanceSquared = 0;
     }
 
-    rotation.AimAt(m_pEnemy->centroid + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
+    if (bCanSee || level.inttime < m_iAttackStopAimTime) {
+        rotation.AimAt(m_vLastEnemyPos + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
+    } else {
+        AimAtAimNode();
+    }
 
     if (bNoMove) {
         return;
@@ -777,14 +784,21 @@ void BotController::State_Attack(void)
 
     if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving())
         || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())) {
-        if (!bMelee) {
+        if (!bMelee || !bCanSee) {
             if ((controlledEnt->origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
                 Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
                 VectorNormalizeFast(vDir);
 
                 movement.AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(controlledEnt->orientation[1]) * 512);
             } else {
-                movement.MoveNear(m_vLastEnemyPos, fMinDistance);
+                movement.MoveTo(m_vLastEnemyPos);
+            }
+
+            if (!bCanSee && movement.MoveDone()) {
+                // Lost track of the enemy
+                m_pEnemy = NULL;
+                m_iAttackTime = 0;
+                return;
             }
         } else {
             movement.MoveTo(m_vLastEnemyPos);
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index eb12bae5..73496981 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -137,6 +137,7 @@ private:
     // States
     int               m_iCuriousTime;
     int               m_iAttackTime;
+    int               m_iAttackStopAimTime;
     Vector            m_vLastCuriousPos;
     Vector            m_vNewCuriousPos;
     Vector            m_vOldEnemyPos;

From ac4138a76332823ebb7c1587e659475a97dc72ff Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Dec 2024 00:20:31 +0100
Subject: [PATCH 1658/2040] Declare PID functions

---
 code/qcommon/qcommon.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 57ab9486..53b176de 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1456,6 +1456,9 @@ typedef enum
 
 dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *title );
 
+void Sys_RemovePIDFile( const char *gamedir );
+void Sys_InitPIDFile( const char *gamedir );
+
 /* This is based on the Adaptive Huffman algorithm described in Sayood's Data
  * Compression book.  The ranks are not actually stored, but implicitly defined
  * by the location of a node within a doubly-linked list */

From 872b3f5d70e79b8001b15f0c223aa5c78ba58c1e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:10:48 +0100
Subject: [PATCH 1659/2040] Improve bot movement when stuck

---
 code/fgame/playerbot_movement.cpp | 32 ++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/code/fgame/playerbot_movement.cpp b/code/fgame/playerbot_movement.cpp
index 7cde3abe..03e402f0 100644
--- a/code/fgame/playerbot_movement.cpp
+++ b/code/fgame/playerbot_movement.cpp
@@ -118,14 +118,44 @@ void BotMovement::MoveThink(usercmd_t& botcmd)
         }
 
         if (m_bTempAway) {
+            Vector nextPos;
+            Vector dir;
+
             m_bTempAway     = true;
             m_iTempAwayTime = level.inttime + 750;
             m_iNumBlocks++;
 
             // Try to backward a little
+            if (m_Path.CurrentNode()) {
+                nextPos = m_Path.CurrentNode()->point;
+            } else {
+                nextPos = m_vTargetPos;
+            }
+
             m_Path.Clear();
             m_Path.ForceShortLookahead();
-            m_vCurrentGoal = controlledEntity->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+
+            if (rand() % 10 != 0) {
+                dir = nextPos - controlledEntity->origin;
+                dir.z = 0;
+                dir.normalize();
+
+                if (dir.x < -0.5 || dir.x > 0.5) {
+                    dir.x *= 4;
+                    dir.y /= 4;
+                } else if (dir.y < -0.5 || dir.y > 0.5) {
+                    dir.x /= 4;
+                    dir.y *= 4;
+                } else {
+                    dir.x = G_CRandom(2);
+                    dir.y = G_CRandom(2);
+                }
+
+                m_vCurrentGoal = nextPos + dir * 128;
+            } else {
+                m_vCurrentGoal = controlledEntity->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+            }
+
         } else {
             m_iNumBlocks = 0;
 

From 79643d963edb935abda67e7237ae37a1a56e5a84 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:32:23 +0100
Subject: [PATCH 1660/2040] Correctly parse the name of the players returned by
 the serverstatus command

---
 code/client/cl_main.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 27645771..82108ef2 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -4053,7 +4053,7 @@ CL_ServerStatusResponse
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
 	const char	*s;
 	char		info[MAX_INFO_STRING];
-	int			i, l, score, ping;
+	int			i, l, ping;
 	int			len;
 	serverStatus_t *serverStatus;
 
@@ -4107,7 +4107,7 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
 
 	if (serverStatus->print) {
 		Com_Printf("\nPlayers:\n");
-		Com_Printf("num: score: ping: name:\n");
+		Com_Printf("num: ping: name:\n");
 	}
 	for (i = 0, s = MSG_ReadStringLine( msg ); *s; s = MSG_ReadStringLine( msg ), i++) {
 
@@ -4115,16 +4115,14 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
 		Com_sprintf(&serverStatus->string[len], sizeof(serverStatus->string)-len, "\\%s", s);
 
 		if (serverStatus->print) {
-			score = ping = 0;
-			sscanf(s, "%d %d", &score, &ping);
+			ping = 0;
+			sscanf(s, "%d", &ping);
 			s = strchr(s, ' ');
-			if (s)
-				s = strchr(s+1, ' ');
 			if (s)
 				s++;
 			else
 				s = "unknown";
-			Com_Printf("%-2d   %-3d    %-3d   %s\n", i, score, ping, s );
+			Com_Printf("%-2d   %-3d   %s\n", i, ping, s );
 		}
 	}
 	len = strlen(serverStatus->string);

From 932367d061f58cbaf894a8eefcf3f4e3afe7d95a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:32:34 +0100
Subject: [PATCH 1661/2040] Append "demo" to the keywords if fs_restrict is
 enabled

---
 code/server/sv_main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index a8fd9123..2c4f5d8b 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -510,6 +510,14 @@ void SVC_Status( netadr_t from ) {
 	// to prevent timed spoofed reply packets that add ghost servers
 	Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) );
 
+	if (Cvar_VariableIntegerValue("fs_restrict")) {
+		char keywords[MAX_INFO_STRING];
+
+		// Append "demo" at the beginning of the keywords
+		Com_sprintf(keywords, sizeof(keywords), "demo %s", Info_ValueForKey(infostring, "sv_keywords"));
+		Info_SetValueForKey(infostring, "sv_keywords", keywords);
+	}
+
 	status[0] = 0;
 	statusLength = 0;
 

From f4519325ce407b6d71cd570a9dfbbb17394fa6fb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:41:01 +0100
Subject: [PATCH 1662/2040] Speed up bot rotation

---
 code/fgame/playerbot_rotation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/playerbot_rotation.cpp b/code/fgame/playerbot_rotation.cpp
index 28d913b9..0228be21 100644
--- a/code/fgame/playerbot_rotation.cpp
+++ b/code/fgame/playerbot_rotation.cpp
@@ -62,7 +62,7 @@ void BotRotation::TurnThink(usercmd_t& botcmd, usereyes_t& eyeinfo)
         m_vTargetAng[PITCH] -= 360;
     }
 
-    factor    = 0.25f;
+    factor    = 0.5f;
     maxchange = 360;
 
     if (maxchange < 240) {
@@ -84,7 +84,7 @@ void BotRotation::TurnThink(usercmd_t& botcmd, usereyes_t& eyeinfo)
         m_vCurrentAng[i] += anglespeed;
         m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
 
-        //demping
+        //damping
         m_vAngSpeed[i] *= 0.2 * (1 - factor);
     }
 
@@ -132,7 +132,7 @@ Make the bot face to the specified direction
 */
 void BotRotation::AimAt(Vector vPos)
 {
-    Vector vDelta = vPos - controlledEntity->centroid;
+    Vector vDelta = vPos - controlledEntity->EyePosition();
 
     VectorNormalize(vDelta);
     vectoangles(vDelta, m_vTargetAng);

From 876829a7424670199ad08e83d52f014ef6c8c9f2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:45:42 +0100
Subject: [PATCH 1663/2040] Properly aim the enemy

The bot wasn't aiming properly at the enemy because the bot was aiming from the centroid. It also caused issues when the enemy was crouching
---
 code/fgame/playerbot.cpp | 41 +++++++++++++++++++++++++++++++++++-----
 code/fgame/playerbot.h   |  1 +
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index fcea8457..4d6ea013 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -66,6 +66,7 @@ BotController::BotController()
 
     m_iCuriousTime = 0;
     m_iAttackTime  = 0;
+    m_iEnemyEyesTag = -1;
 
     m_iNextTauntTime = 0;
 
@@ -373,6 +374,7 @@ void BotController::ClearEnemy(void)
 {
     m_iAttackTime   = 0;
     m_pEnemy        = NULL;
+    m_iEnemyEyesTag = -1;
     m_vOldEnemyPos  = vec_zero;
     m_vLastEnemyPos = vec_zero;
 }
@@ -459,6 +461,7 @@ void BotController::State_Reset(void)
     m_vLastEnemyPos   = vec_zero;
     m_vLastDeathPos   = vec_zero;
     m_pEnemy          = NULL;
+    m_iEnemyEyesTag   = -1;
 }
 
 /*
@@ -647,6 +650,10 @@ bool BotController::CheckCondition_Attack(void)
         maxDistance = Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828);
 
         if (controlledEnt->CanSee(sent, 80, maxDistance, false)) {
+            if (m_pEnemy != sent) {
+                m_iEnemyEyesTag = -1;
+            }
+
             m_pEnemy      = sent;
             m_vLastEnemyPos = m_pEnemy->centroid;
             m_iAttackTime = level.inttime + 1000;
@@ -678,6 +685,7 @@ void BotController::State_Attack(void)
     bool    bCanSee             = false;
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
+    float   fEnemyDistanceSquared;
     Weapon *pWeap               = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
     bool    bNoMove             = false;
 
@@ -773,7 +781,28 @@ void BotController::State_Attack(void)
     }
 
     if (bCanSee || level.inttime < m_iAttackStopAimTime) {
-        rotation.AimAt(m_vLastEnemyPos + Vector(G_CRandom(8), G_CRandom(8), G_CRandom(8)));
+        Vector vRandomOffset;
+        Vector vTarget;
+        orientation_t eyes_or;
+        
+        if (m_iEnemyEyesTag == -1) {
+            // Cache the tag
+            m_iEnemyEyesTag = gi.Tag_NumForName(m_pEnemy->edict->tiki, "eyes bone");
+        }
+
+        if (m_iEnemyEyesTag != -1) {
+            // Use the enemy's eyes bone
+            m_pEnemy->GetTag(m_iEnemyEyesTag, &eyes_or);
+
+            vRandomOffset = Vector(G_CRandom(8), G_CRandom(8), -G_Random(32));
+            vTarget = eyes_or.origin + vRandomOffset;
+            rotation.AimAt(eyes_or.origin + vRandomOffset);
+        } else {
+            vRandomOffset = Vector(G_CRandom(8), G_CRandom(8), 16 + G_Random(m_pEnemy->viewheight - 16));
+            vTarget = m_pEnemy->origin + vRandomOffset;
+        }
+
+        rotation.AimAt(vTarget);
     } else {
         AimAtAimNode();
     }
@@ -782,10 +811,13 @@ void BotController::State_Attack(void)
         return;
     }
 
+    fEnemyDistanceSquared = (controlledEnt->origin - m_vLastEnemyPos).lengthSquared();
+
     if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving())
-        || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())) {
+        || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())
+        || fEnemyDistanceSquared < fMinDistanceSquared) {
         if (!bMelee || !bCanSee) {
-            if ((controlledEnt->origin - m_vLastEnemyPos).lengthSquared() < fMinDistanceSquared) {
+            if (fEnemyDistanceSquared < fMinDistanceSquared) {
                 Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
                 VectorNormalizeFast(vDir);
 
@@ -796,8 +828,7 @@ void BotController::State_Attack(void)
 
             if (!bCanSee && movement.MoveDone()) {
                 // Lost track of the enemy
-                m_pEnemy = NULL;
-                m_iAttackTime = 0;
+                ClearEnemy();
                 return;
             }
         } else {
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 73496981..4ebac23d 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -144,6 +144,7 @@ private:
     Vector            m_vLastEnemyPos;
     Vector            m_vLastDeathPos;
     SafePtr<Sentient> m_pEnemy;
+    int               m_iEnemyEyesTag;
 
     // Input
     usercmd_t  m_botCmd;

From 0057a8273cab11e7131dfaef1ebb2f9d15295845 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Dec 2024 21:17:36 +0100
Subject: [PATCH 1664/2040] Initialize the total map time

---
 code/fgame/dm_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index e4b1e13d..037069c6 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -677,6 +677,7 @@ DM_Manager::DM_Manager()
     m_bAllowAxisRespawn    = true;
     m_bAllowAlliedRespawn  = true;
     m_bRoundActive         = false;
+    m_iTotalMapTime        = 0;
 }
 
 DM_Manager::~DM_Manager() {}

From a6c168c289f1d7c7cc51c36256cb3ea2c2aa4acd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:13:26 +0100
Subject: [PATCH 1665/2040] Count from 0 instead of CS_OBJECTIVES for more
 clarity

---
 code/fgame/level.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 0cf4329d..8247343e 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -969,8 +969,8 @@ void Level::CleanUp(qboolean samemap, qboolean resetConfigStrings)
         gi.setConfigstring(CS_RAIN_NUMSHADERS, "0");
         gi.setConfigstring(CS_CURRENT_OBJECTIVE, "");
 
-        for (int i = CS_OBJECTIVES; i < CS_OBJECTIVES + MAX_OBJECTIVES; i++) {
-            gi.setConfigstring(i, "");
+        for (i = 0; i < MAX_OBJECTIVES; i++) {
+            gi.setConfigstring(CS_OBJECTIVES + i, "");
         }
 
         gi.setConfigstring(CS_VOTE_TIME, "");

From f165ebf9a3cbbf55e2e47f0b6e04388fbc0adf07 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Dec 2024 23:03:15 +0100
Subject: [PATCH 1666/2040] Refactor G_ExitLevel

---
 code/fgame/g_main.cpp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 54b8ef25..72a6847b 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1881,8 +1881,8 @@ void G_ExitLevel(void)
             // The nextmap cvar was set (possibly by a vote - so go ahead and use it)
             level.nextmap = sv_nextmap->string;
             gi.cvar_set("nextmap", "");
-        } else // Use the next map in the maplist
-        {
+        } else {
+            // Use the next map in the maplist
             char *s, *f, *t;
 
             f = NULL;
@@ -1892,19 +1892,17 @@ void G_ExitLevel(void)
                 if (!Q_stricmp(t, level.mapname.c_str())) {
                     // it's in the list, go to the next one
                     t = strtok(NULL, seps);
-                    if (t == NULL) // end of list, go to first one
-                    {
-                        if (f == NULL) // there isn't a first one, same level
-                        {
-                            level.nextmap = level.mapname;
-                        } else {
-                            level.nextmap = f;
-                        }
-                    } else {
+                    if (t) {
                         level.nextmap = t;
+                    } else if (f) {
+                        // end of list, go to first one
+                        level.nextmap = f;
+                    } else {
+                        // there isn't a first one, same level
+                        level.nextmap = level.mapname;
                     }
-                    free(s);
-                    goto out;
+
+                    break;
                 }
 
                 // set the first map
@@ -1915,7 +1913,7 @@ void G_ExitLevel(void)
             }
             free(s);
         }
-    out:
+
         // level.nextmap should be set now, but if it isn't use the same map
         if (level.nextmap.length() == 0) {
             // Stay on the same map since no nextmap was set
@@ -1929,8 +1927,8 @@ void G_ExitLevel(void)
             // alias on another map
             Q_strncpyz(command, level.nextmap, sizeof(command));
             gi.SendConsoleCommand(command);
-        } else // use the level.nextmap variable
-        {
+        } else {
+            // use the level.nextmap variable
             Com_sprintf(command, sizeof(command), "gamemap \"%s\"\n", level.nextmap.c_str());
             gi.SendConsoleCommand(command);
         }

From 869b257bf867bf57dea07ff6c5b20d3ba9a66553 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 16 Dec 2024 23:05:35 +0100
Subject: [PATCH 1667/2040] Add a slight random response time before attacking

It's a way to make the fight less difficult between bots and players
---
 code/fgame/playerbot.cpp | 51 ++++++++++++++++++++++++++--------------
 code/fgame/playerbot.h   | 10 ++++----
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 4d6ea013..a2e571ac 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -64,8 +64,9 @@ BotController::BotController()
     m_botEyes.ofs[1]    = 0;
     m_botEyes.ofs[2]    = DEFAULT_VIEWHEIGHT;
 
-    m_iCuriousTime = 0;
-    m_iAttackTime  = 0;
+    m_iCuriousTime  = 0;
+    m_iAttackTime   = 0;
+    m_iConfirmTime  = 0;
     m_iEnemyEyesTag = -1;
 
     m_iNextTauntTime = 0;
@@ -373,6 +374,7 @@ Clear the bot's enemy
 void BotController::ClearEnemy(void)
 {
     m_iAttackTime   = 0;
+    m_iConfirmTime  = 0;
     m_pEnemy        = NULL;
     m_iEnemyEyesTag = -1;
     m_vOldEnemyPos  = vec_zero;
@@ -654,8 +656,19 @@ bool BotController::CheckCondition_Attack(void)
                 m_iEnemyEyesTag = -1;
             }
 
-            m_pEnemy      = sent;
-            m_vLastEnemyPos = m_pEnemy->centroid;
+            if (!m_pEnemy) {
+                // Slight reaction time
+                m_iConfirmTime = level.inttime + (200 + G_Random(200));
+            }
+
+            m_pEnemy        = sent;
+            m_vLastEnemyPos = m_pEnemy->origin;
+            if (level.inttime < m_iConfirmTime) {
+                return false;
+            }
+        }
+
+        if (m_pEnemy && level.inttime >= m_iConfirmTime) {
             m_iAttackTime = level.inttime + 1000;
             return true;
         }
@@ -686,8 +699,8 @@ void BotController::State_Attack(void)
     float   fMinDistance        = 128;
     float   fMinDistanceSquared = fMinDistance * fMinDistance;
     float   fEnemyDistanceSquared;
-    Weapon *pWeap               = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
-    bool    bNoMove             = false;
+    Weapon *pWeap   = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
+    bool    bNoMove = false;
 
     if (!m_pEnemy || !IsValidEnemy(m_pEnemy)) {
         // Ignore dead enemies
@@ -698,7 +711,8 @@ void BotController::State_Attack(void)
 
     m_vOldEnemyPos = m_vLastEnemyPos;
 
-    bCanSee = controlledEnt->CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false);
+    bCanSee =
+        controlledEnt->CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false);
     if (bCanSee) {
         if (!pWeap) {
             return;
@@ -734,7 +748,9 @@ void BotController::State_Attack(void)
         if (controlledEnt->client->ps.stats[STAT_AMMO] > 0 || controlledEnt->client->ps.stats[STAT_CLIPAMMO] > 0) {
             if (fDistanceSquared <= fPrimaryBulletRangeSquared) {
                 if (pWeap->IsSemiAuto()) {
-                    if (controlledEnt->client->ps.iViewModelAnim == VM_ANIM_IDLE || controlledEnt->client->ps.iViewModelAnim >= VM_ANIM_IDLE_0 && controlledEnt->client->ps.iViewModelAnim <= VM_ANIM_IDLE_2) {
+                    if (controlledEnt->client->ps.iViewModelAnim == VM_ANIM_IDLE
+                        || controlledEnt->client->ps.iViewModelAnim >= VM_ANIM_IDLE_0
+                               && controlledEnt->client->ps.iViewModelAnim <= VM_ANIM_IDLE_2) {
                         if (fSpreadFactor < 0.25) {
                             m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
                             if (pWeap->GetZoom()) {
@@ -772,19 +788,19 @@ void BotController::State_Attack(void)
             controlledEnt->ZoomOff();
         }
 
-        m_iAttackTime           = level.inttime + 1000;
-        m_iAttackStopAimTime    = level.inttime + 3000;
-        m_vLastEnemyPos         = m_pEnemy->centroid;
+        m_iAttackTime        = level.inttime + 1000;
+        m_iAttackStopAimTime = level.inttime + 3000;
+        m_vLastEnemyPos      = m_pEnemy->centroid;
     } else {
         m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
         fMinDistanceSquared = 0;
     }
 
     if (bCanSee || level.inttime < m_iAttackStopAimTime) {
-        Vector vRandomOffset;
-        Vector vTarget;
+        Vector        vRandomOffset;
+        Vector        vTarget;
         orientation_t eyes_or;
-        
+
         if (m_iEnemyEyesTag == -1) {
             // Cache the tag
             m_iEnemyEyesTag = gi.Tag_NumForName(m_pEnemy->edict->tiki, "eyes bone");
@@ -795,11 +811,11 @@ void BotController::State_Attack(void)
             m_pEnemy->GetTag(m_iEnemyEyesTag, &eyes_or);
 
             vRandomOffset = Vector(G_CRandom(8), G_CRandom(8), -G_Random(32));
-            vTarget = eyes_or.origin + vRandomOffset;
+            vTarget       = eyes_or.origin + vRandomOffset;
             rotation.AimAt(eyes_or.origin + vRandomOffset);
         } else {
             vRandomOffset = Vector(G_CRandom(8), G_CRandom(8), 16 + G_Random(m_pEnemy->viewheight - 16));
-            vTarget = m_pEnemy->origin + vRandomOffset;
+            vTarget       = m_pEnemy->origin + vRandomOffset;
         }
 
         rotation.AimAt(vTarget);
@@ -814,8 +830,7 @@ void BotController::State_Attack(void)
     fEnemyDistanceSquared = (controlledEnt->origin - m_vLastEnemyPos).lengthSquared();
 
     if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving())
-        || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone())
-        || fEnemyDistanceSquared < fMinDistanceSquared) {
+        || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone()) || fEnemyDistanceSquared < fMinDistanceSquared) {
         if (!bMelee || !bCanSee) {
             if (fEnemyDistanceSquared < fMinDistanceSquared) {
                 Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 4ebac23d..ac8c2bcd 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -110,12 +110,13 @@ private:
     float  m_fYawSpeedMult;
 };
 
-class BotState {
+class BotState
+{
 public:
     virtual bool CheckCondition() const = 0;
-    virtual void Begin() = 0;
-    virtual void End() = 0;
-    virtual void Think() = 0;
+    virtual void Begin()                = 0;
+    virtual void End()                  = 0;
+    virtual void Think()                = 0;
 };
 
 class BotController : public Listener
@@ -137,6 +138,7 @@ private:
     // States
     int               m_iCuriousTime;
     int               m_iAttackTime;
+    int               m_iConfirmTime;
     int               m_iAttackStopAimTime;
     Vector            m_vLastCuriousPos;
     Vector            m_vNewCuriousPos;

From 1be50cdddf34ce3744b39a1a472d5b6f5e2fb856 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:01:13 +0100
Subject: [PATCH 1668/2040] Clear the attack time during reaction time

---
 code/fgame/playerbot.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index a2e571ac..dd403b95 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -659,6 +659,7 @@ bool BotController::CheckCondition_Attack(void)
             if (!m_pEnemy) {
                 // Slight reaction time
                 m_iConfirmTime = level.inttime + (200 + G_Random(200));
+                m_iAttackTime = 0;
             }
 
             m_pEnemy        = sent;

From 6b36bec8e94fa4850dc4c75efac69b02fc70144a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 19:29:17 +0100
Subject: [PATCH 1669/2040] Allow custom game ports other than 12203 to be
 specified through GAME_PORT environment variable

---
 docker/server/base/Dockerfile      | 6 +++++-
 docker/server/base/entrypoint.sh   | 5 +++++
 docker/server/base/health_check.sh | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 docker/server/base/entrypoint.sh

diff --git a/docker/server/base/Dockerfile b/docker/server/base/Dockerfile
index 7f2fb580..d476b786 100644
--- a/docker/server/base/Dockerfile
+++ b/docker/server/base/Dockerfile
@@ -37,5 +37,9 @@ HEALTHCHECK --interval=15s --timeout=20s --start-period=10s --retries=3 CMD [ "b
 RUN useradd -m openmohaa
 USER openmohaa
 
+ENV GAME_PORT=12203
+
+COPY "entrypoint.sh" "/usr/local/bin/entrypoint.sh"
 WORKDIR "/usr/local/share/mohaa"
-ENTRYPOINT [ "/usr/local/games/openmohaa/lib/openmohaa/omohaaded", "+set", "fs_homepath", "home" ]
+
+ENTRYPOINT [ "bash", "entrypoint.sh" ]
diff --git a/docker/server/base/entrypoint.sh b/docker/server/base/entrypoint.sh
new file mode 100644
index 00000000..1ba9b5ee
--- /dev/null
+++ b/docker/server/base/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# It's amazing that with Docker, one can't put environment variables in the array of the ENTRYPOINT command
+
+/usr/local/games/openmohaa/lib/openmohaa/omohaaded +set fs_homepath home +set dedicated 2 +set net_port $GAME_PORT:-12203 $@
diff --git a/docker/server/base/health_check.sh b/docker/server/base/health_check.sh
index fd4c4659..f7f490eb 100644
--- a/docker/server/base/health_check.sh
+++ b/docker/server/base/health_check.sh
@@ -6,7 +6,7 @@ header=$'\xff\xff\xff\xff\x01disconnect'
 # so the server will return the disconnect message
 message=$'none'
 
-query_port=12203
+query_port=${GAME_PORT:-12203}
 data=""
 
 while [ -z "$data" ]

From e3536730057b1454989a2f6e6c0f17283fad32d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:11:34 +0100
Subject: [PATCH 1670/2040] Fix player deaths (or total kills) being added
 twice in round-based matches

---
 code/fgame/player.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 81917483..0e6cb084 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -11992,10 +11992,6 @@ void Player::Spawned(void)
 void Player::AddKills(int num)
 {
     num_kills += num;
-
-    if (g_gametype->integer >= GT_TEAM_ROUNDS) {
-        num_deaths += num;
-    }
 }
 
 void Player::AddDeaths(int num)

From 2c7d18b331acc18728cc5cfb2ce3b609e60aabd2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:16:45 +0100
Subject: [PATCH 1671/2040] Initialize client persistent in
 G_InitClientPersistant

---
 code/fgame/g_session.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/fgame/g_session.cpp b/code/fgame/g_session.cpp
index e78bfae1..f133c2e5 100644
--- a/code/fgame/g_session.cpp
+++ b/code/fgame/g_session.cpp
@@ -87,6 +87,13 @@ Called on a first-time connect
 */
 void G_InitClientPersistant( gclient_t *client, const char *userinfo )
 {
+	// Clear the persistent data
+	client->pers = {};
+
+	// Added in OPM
+	//  Reset the persistent session data.
+	//  This fixes some bugs like the player getting score
+	//  from previous maps
 	G_WriteClientSessionData( client );
 }
 

From a21d712f5477ec5c36d350ebfd8d85c467df5328 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:30:48 +0100
Subject: [PATCH 1672/2040] Reopen the door to the other side if it's blocked

---
 code/fgame/doors.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index a5ff7775..73320309 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -848,6 +848,15 @@ void Door::DoorBlocked(Event *ev)
         if (state == STATE_OPENING || state == STATE_OPEN) {
             spawnflags &= ~DOOR_START_OPEN;
             ProcessEvent(EV_Door_Close);
+
+            // Added in OPM
+            //  Reopen to the other side
+            //  so the door cannot be blocked by a player
+            //  in multiplayer
+            diropened = -diropened;
+            e = new Event(EV_Door_Open);
+            e->AddEntity(other);
+            ProcessEvent(e);
         } else {
             e = new Event(EV_Door_Open);
             e->AddEntity(other);

From 12686c0ab1b3f304be2fa755d0be71289966c5e2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:02:35 +0100
Subject: [PATCH 1673/2040] Format mover source file

---
 code/fgame/mover.cpp | 340 +++++++++++++++++++------------------------
 code/fgame/mover.h   |  51 +++----
 2 files changed, 174 insertions(+), 217 deletions(-)

diff --git a/code/fgame/mover.cpp b/code/fgame/mover.cpp
index e897deb1..a235e865 100644
--- a/code/fgame/mover.cpp
+++ b/code/fgame/mover.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -35,93 +35,75 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MOVE_ANGLES 1
 #define MOVE_ORIGIN 2
 
-CLASS_DECLARATION( Trigger, Mover, "mover" )
-	{
-	   { &EV_MoveDone,         &Mover::MoveDone },
-		{ NULL, NULL }
-	};
-
+CLASS_DECLARATION(Trigger, Mover, "mover") {
+    {&EV_MoveDone, &Mover::MoveDone},
+    {NULL,         NULL            }
+};
 
 Mover::Mover()
-   {
-   endevent = NULL;
-   }
-
-Mover::~Mover()
-	{
-	}
-
-void Mover::MoveDone
-	(
-	Event *ev
-	)
 {
-	Event * event;
-	Vector move;
-	Vector amove;
+    endevent = NULL;
+}
 
-	// zero out the movement
+Mover::~Mover() {}
+
+void Mover::MoveDone(Event *ev)
+{
+    Event *event;
+    Vector move;
+    Vector amove;
+
+    // zero out the movement
     avelocity = vec_zero;
-	if( moveflags & MOVE_ANGLES )
-	{
-		amove = angledest - localangles;
-	}
-	else
-	{
-		amove = vec_zero;
-	}
+    if (moveflags & MOVE_ANGLES) {
+        amove = angledest - localangles;
+    } else {
+        amove = vec_zero;
+    }
 
     velocity = vec_zero;
-	if( moveflags & MOVE_ORIGIN )
-	{
-		move = finaldest - localorigin;
-	}
-	else
-	{
-		move = vec_zero;
-	}
+    if (moveflags & MOVE_ORIGIN) {
+        move = finaldest - localorigin;
+    } else {
+        move = vec_zero;
+    }
 
-    accel = vec_zero;
+    accel  = vec_zero;
     aaccel = vec_zero;
 
-	if( !G_PushMove( this, move, amove ) )
-	{
-		// Delay finish till we can move into the final position
-		PostEvent( EV_MoveDone, FRAMETIME );
-		return;
-	}
+    if (!G_PushMove(this, move, amove)) {
+        // Delay finish till we can move into the final position
+        PostEvent(EV_MoveDone, FRAMETIME);
+        return;
+    }
 
-	//
-	// After moving, set origin to exact final destination
-	//
-	if( moveflags & MOVE_ORIGIN )
-	{
-		setLocalOrigin( finaldest );
-	}
+    //
+    // After moving, set origin to exact final destination
+    //
+    if (moveflags & MOVE_ORIGIN) {
+        setLocalOrigin(finaldest);
+    }
 
-	if( moveflags & MOVE_ANGLES )
-	{
-		localangles = angledest;
+    if (moveflags & MOVE_ANGLES) {
+        localangles = angledest;
 
-		if( ( localangles.x >= 360 ) || ( localangles.x < 0 ) )
-		{
-			localangles.x -= ( ( int )localangles.x / 360 ) * 360;
-		}
-		if( ( localangles.y >= 360 ) || ( localangles.y < 0 ) )
-		{
-			localangles.y -= ( ( int )localangles.y / 360 ) * 360;
-		}
-		if( ( localangles.z >= 360 ) || ( localangles.z < 0 ) )
-		{
-			localangles.z -= ( ( int )localangles.z / 360 ) * 360;
-		}
-	}
+        if ((localangles.x >= 360) || (localangles.x < 0)) {
+            localangles.x -= ((int)localangles.x / 360) * 360;
+        }
+        if ((localangles.y >= 360) || (localangles.y < 0)) {
+            localangles.y -= ((int)localangles.y / 360) * 360;
+        }
+        if ((localangles.z >= 360) || (localangles.z < 0)) {
+            localangles.z -= ((int)localangles.z / 360) * 360;
+        }
+    }
 
-	event = endevent;
-	endevent = NULL;
+    event    = endevent;
+    endevent = NULL;
 
-	if( event )
-		ProcessEvent( event );
+    if (event) {
+        ProcessEvent(event);
+    }
 }
 
 /*
@@ -132,99 +114,87 @@ calculate self.velocity and self.nextthink to reach dest from
 self.origin traveling at speed
 ===============
 */
-void Mover::MoveTo( Vector tdest, Vector angdest, float tspeed, Event& event )
+void Mover::MoveTo(Vector tdest, Vector angdest, float tspeed, Event& event)
 {
-	Vector vdestdelta;
-	Vector angdestdelta;
-	float  len;
-	float  traveltime;
+    Vector vdestdelta;
+    Vector angdestdelta;
+    float  len;
+    float  traveltime;
 
-	assert( tspeed >= 0.0f );
+    assert(tspeed >= 0.0f);
 
-	if( !tspeed )
-	{
-		error( "MoveTo", "No speed is defined!" );
-	}
+    if (!tspeed) {
+        error("MoveTo", "No speed is defined!");
+    }
 
-	if( tspeed < 0.0f )
-	{
-		error( "MoveTo", "Speed is negative!" );
-	}
+    if (tspeed < 0.0f) {
+        error("MoveTo", "Speed is negative!");
+    }
 
-	// Cancel previous moves
-	CancelEventsOfType( EV_MoveDone );
+    // Cancel previous moves
+    CancelEventsOfType(EV_MoveDone);
 
-	moveflags = 0;
+    moveflags = 0;
 
-	if( endevent )
-	{
-		delete endevent;
-	}
+    if (endevent) {
+        delete endevent;
+    }
 
-	endevent = new Event( event );
+    endevent = new Event(event);
 
-	finaldest = tdest;
-	angledest = angdest;
+    finaldest = tdest;
+    angledest = angdest;
 
-	if( finaldest != localorigin )
-	{
-		moveflags |= MOVE_ORIGIN;
-	}
-	if( angledest != localangles )
-	{
-		moveflags |= MOVE_ANGLES;
-	}
+    if (finaldest != localorigin) {
+        moveflags |= MOVE_ORIGIN;
+    }
+    if (angledest != localangles) {
+        moveflags |= MOVE_ANGLES;
+    }
 
-	if( !moveflags )
-	{
-		// stop the object from moving
-		velocity = vec_zero;
-		avelocity = vec_zero;
+    if (!moveflags) {
+        // stop the object from moving
+        velocity  = vec_zero;
+        avelocity = vec_zero;
 
-		// post the event so we don't wait forever
-		PostEvent( EV_MoveDone, FRAMETIME );
-		return;
-	}
+        // post the event so we don't wait forever
+        PostEvent(EV_MoveDone, FRAMETIME);
+        return;
+    }
 
-	// set destdelta to the vector needed to move
-	vdestdelta = tdest - localorigin;
-	angdestdelta[ 0 ] = angledist( angdest[ 0 ] - localangles[ 0 ] );
-	angdestdelta[ 1 ] = angledist( angdest[ 1 ] - localangles[ 1 ] );
-	angdestdelta[ 2 ] = angledist( angdest[ 2 ] - localangles[ 2 ] );
+    // set destdelta to the vector needed to move
+    vdestdelta      = tdest - localorigin;
+    angdestdelta[0] = angledist(angdest[0] - localangles[0]);
+    angdestdelta[1] = angledist(angdest[1] - localangles[1]);
+    angdestdelta[2] = angledist(angdest[2] - localangles[2]);
 
-	if( tdest == localorigin )
-	{
-		// calculate length of vector based on angles
-		len = angdestdelta.length();
-	}
-	else
-	{
-		// calculate length of vector based on distance
-		len = vdestdelta.length();
-	}
+    if (tdest == localorigin) {
+        // calculate length of vector based on angles
+        len = angdestdelta.length();
+    } else {
+        // calculate length of vector based on distance
+        len = vdestdelta.length();
+    }
 
-	// divide by speed to get time to reach dest
-	traveltime = len / tspeed;
+    // divide by speed to get time to reach dest
+    traveltime = len / tspeed;
 
-	if( traveltime < level.frametime )
-	{
-		traveltime = level.frametime;
-		vdestdelta = vec_zero;
-		angdestdelta = vec_zero;
-	}
+    if (traveltime < level.frametime) {
+        traveltime   = level.frametime;
+        vdestdelta   = vec_zero;
+        angdestdelta = vec_zero;
+    }
 
-	// scale the destdelta vector by the time spent traveling to get velocity
-	if( moveflags & MOVE_ORIGIN )
-	{
-		velocity = vdestdelta * ( 1.0f / traveltime );
-	}
+    // scale the destdelta vector by the time spent traveling to get velocity
+    if (moveflags & MOVE_ORIGIN) {
+        velocity = vdestdelta * (1.0f / traveltime);
+    }
 
-	if( moveflags & MOVE_ANGLES )
-	{
-		avelocity = angdestdelta * ( 1.0f / traveltime );
-	}
+    if (moveflags & MOVE_ANGLES) {
+        avelocity = angdestdelta * (1.0f / traveltime);
+    }
 
-	PostEvent( EV_MoveDone, traveltime );
+    PostEvent(EV_MoveDone, traveltime);
 }
 
 /*
@@ -232,55 +202,45 @@ void Mover::MoveTo( Vector tdest, Vector angdest, float tspeed, Event& event )
 LinearInterpolate
 ===============
 */
-void Mover::LinearInterpolate
-	(
-	Vector tdest,
-	Vector angdest,
-	float time,
-	Event &event
-	)
+void Mover::LinearInterpolate(Vector tdest, Vector angdest, float time, Event& event)
 {
-	Vector vdestdelta;
-	Vector angdestdelta;
-	float t;
+    Vector vdestdelta;
+    Vector angdestdelta;
+    float  t;
 
-	if( endevent )
-	{
-		delete endevent;
-	}
-	endevent = new Event( event );
-	finaldest = tdest;
-	angledest = angdest;
+    if (endevent) {
+        delete endevent;
+    }
+    endevent  = new Event(event);
+    finaldest = tdest;
+    angledest = angdest;
 
-	// Cancel previous moves
-	CancelEventsOfType( EV_MoveDone );
+    // Cancel previous moves
+    CancelEventsOfType(EV_MoveDone);
 
-	// Quantize to FRAMETIME
-	if( time < FRAMETIME )
-	{
-		time = FRAMETIME;
-	}
+    // Quantize to FRAMETIME
+    if (time < FRAMETIME) {
+        time = FRAMETIME;
+    }
 
-	moveflags = 0;
-	t = 1 / time;
-	// scale the destdelta vector by the time spent traveling to get velocity
-	if( finaldest != localorigin )
-	{
-		vdestdelta = tdest - localorigin;
-		velocity = vdestdelta * t;
-		moveflags |= MOVE_ORIGIN;
-	}
+    moveflags = 0;
+    t         = 1 / time;
+    // scale the destdelta vector by the time spent traveling to get velocity
+    if (finaldest != localorigin) {
+        vdestdelta = tdest - localorigin;
+        velocity   = vdestdelta * t;
+        moveflags |= MOVE_ORIGIN;
+    }
 
-	if( angledest != localangles )
-	{
-		angdestdelta = angdest - localangles;
-		avelocity = angdestdelta * t;
-		moveflags |= MOVE_ANGLES;
-	}
+    if (angledest != localangles) {
+        angdestdelta = angdest - localangles;
+        avelocity    = angdestdelta * t;
+        moveflags |= MOVE_ANGLES;
+    }
 
-	if( g_bBeforeThinks )
-		time -= FRAMETIME;
+    if (g_bBeforeThinks) {
+        time -= FRAMETIME;
+    }
 
-	PostEvent( EV_MoveDone, time );
+    PostEvent(EV_MoveDone, time);
 }
-
diff --git a/code/fgame/mover.h b/code/fgame/mover.h
index 0516c93d..ad6d33f7 100644
--- a/code/fgame/mover.h
+++ b/code/fgame/mover.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // Base class for any object that needs to move to specific locations over a
 // period of time.  This class is kept separate from most entities to keep
 // class size down for objects that don't need such behavior.
-// 
+//
 
 #pragma once
 
@@ -33,33 +33,30 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "trigger.h"
 
 class Mover : public Trigger
-	{		
-	private:
-      Vector				finaldest;
-		Vector				angledest;
-		Event					*endevent;
-		int					moveflags;
+{
+private:
+    Vector finaldest;
+    Vector angledest;
+    Event *endevent;
+    int    moveflags;
 
-	public:
-		CLASS_PROTOTYPE( Mover );
+public:
+    CLASS_PROTOTYPE(Mover);
 
-								Mover();
-		virtual				~Mover();
-		void					MoveDone( Event *ev );
-		void					MoveTo( Vector tdest, Vector angdest, float tspeed, Event &event );
-		void					LinearInterpolate( Vector tdest, Vector angdest, float time, Event &event );
-	   void Archive( Archiver &arc ) override;
-   };
+    Mover();
+    virtual ~Mover();
+    void MoveDone(Event *ev);
+    void MoveTo(Vector tdest, Vector angdest, float tspeed, Event& event);
+    void LinearInterpolate(Vector tdest, Vector angdest, float time, Event& event);
+    void Archive(Archiver& arc) override;
+};
 
-inline void Mover::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Trigger::Archive( arc );
+inline void Mover::Archive(Archiver& arc)
+{
+    Trigger::Archive(arc);
 
-   arc.ArchiveVector( &finaldest );
-   arc.ArchiveVector( &angledest );
-   arc.ArchiveEventPointer( &endevent );
-   arc.ArchiveInteger( &moveflags );
-   }
+    arc.ArchiveVector(&finaldest);
+    arc.ArchiveVector(&angledest);
+    arc.ArchiveEventPointer(&endevent);
+    arc.ArchiveInteger(&moveflags);
+}

From 29fe5780e904e03c4e6741f1a199d295e07144e3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:15:53 +0100
Subject: [PATCH 1674/2040] Only post the EV_MoveDone event if it's not pending
 when done moving

There are some situations where EV_MoveDone is posted again through a call to G_PushMove(), this avoids the mover unexpectedly and immediately moving to the new location
---
 code/fgame/mover.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/fgame/mover.cpp b/code/fgame/mover.cpp
index a235e865..b4ade81a 100644
--- a/code/fgame/mover.cpp
+++ b/code/fgame/mover.cpp
@@ -72,8 +72,14 @@ void Mover::MoveDone(Event *ev)
     aaccel = vec_zero;
 
     if (!G_PushMove(this, move, amove)) {
-        // Delay finish till we can move into the final position
-        PostEvent(EV_MoveDone, FRAMETIME);
+        // Added in OPM
+        //  Check to make sure the event isn't pending
+        //  blocked events called by G_PushMove() might alter
+        //  the mover
+        if (!EventPending(EV_MoveDone)) {
+            // Delay finish till we can move into the final position
+            PostEvent(EV_MoveDone, FRAMETIME);
+        }
         return;
     }
 

From 8dba91fbccec2fdb184503e20bf4074bb68a7d35 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:17:02 +0100
Subject: [PATCH 1675/2040] Reopen doors to the other side when blocked

---
 code/fgame/doors.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 73320309..fe95e0a5 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -847,16 +847,20 @@ void Door::DoorBlocked(Event *ev)
 
         if (state == STATE_OPENING || state == STATE_OPEN) {
             spawnflags &= ~DOOR_START_OPEN;
+
+            const bool bIsMoving = EventPending(EV_MoveDone);
             ProcessEvent(EV_Door_Close);
 
-            // Added in OPM
-            //  Reopen to the other side
-            //  so the door cannot be blocked by a player
-            //  in multiplayer
-            diropened = -diropened;
-            e = new Event(EV_Door_Open);
-            e->AddEntity(other);
-            ProcessEvent(e);
+            if (bIsMoving) {
+                // Added in OPM
+                //  Reopen to the other side so sentients can still pass.
+                //  This avoid entities like players trying to prevent the door
+                //  from opening in multiplayer
+                diropened = -diropened;
+                e = new Event(EV_Door_Open);
+                e->AddEntity(other);
+                ProcessEvent(e);
+            }
         } else {
             e = new Event(EV_Door_Open);
             e->AddEntity(other);

From bcbe7cd870d4f4efa4d340933ba2e796bcc7ab8a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:45:43 +0100
Subject: [PATCH 1676/2040] Fix spawn point metric functions not counting the
 last player

---
 code/fgame/dm_manager.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 037069c6..bc7db6c4 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -130,14 +130,14 @@ static PlayerStart *GetRandomSpawnpointFromList(spawnsort_t *pSpots, int nSpots)
     }
 }
 
-float SpawnpointMetric_Ffa(const float *origin, DM_Team *dmTeam, const Player *player)
+float SpawnpointMetric_Ffa(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    float fMinEnemyDistSquared = 23170.0f * 23170.0f;
+    float fMinEnemyDistSquared = Square(23170);
     int   i;
     int   nPlayers = dmManager.PlayerCount();
     float fDist;
 
-    for (i = 1; i < nPlayers; i++) {
+    for (i = 1; i <= nPlayers; i++) {
         Player *teammate = dmManager.GetPlayer(i);
         if (teammate == player || teammate->IsDead() || teammate->IsSpectator()) {
             continue;
@@ -150,12 +150,12 @@ float SpawnpointMetric_Ffa(const float *origin, DM_Team *dmTeam, const Player *p
         }
     }
 
-    return fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * (1024.0f * 1024.0f);
+    return fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * Square(1024);
 }
 
-float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *player)
+float SpawnpointMetric_Team(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    float fMinEnemyDistSquared  = 23170.0f * 23170.0f;
+    float fMinEnemyDistSquared  = Square(23170);
     float fSumFriendDistSquared = 0.0f;
     float fDistSquared;
     float fMetric;
@@ -163,7 +163,7 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
     int   nPlayers = dmManager.PlayerCount();
     int   nFriends = 0;
 
-    for (i = 1; i < nPlayers; i++) {
+    for (i = 1; i <= nPlayers; i++) {
         Player *teammate = dmManager.GetPlayer(i);
         if (teammate == player || teammate->IsDead() || teammate->IsSpectator()) {
             continue;
@@ -174,14 +174,12 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
         if (teammate->GetDM_Team() == dmTeam) {
             nFriends++;
             fSumFriendDistSquared += fDistSquared;
-        } else {
-            if (fMinEnemyDistSquared > fDistSquared) {
-                fMinEnemyDistSquared = fDistSquared;
-            }
+        } else if (fMinEnemyDistSquared > fDistSquared) {
+            fMinEnemyDistSquared = fDistSquared;
         }
     }
 
-    fMetric = fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * (1024.0f * 1024.0f);
+    fMetric = fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * Square(1024);
 
     if (nFriends) {
         fMetric += 0.25f * ((23170.0f * 23170.0f) - fSumFriendDistSquared / nFriends);
@@ -190,7 +188,7 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
     return fMetric;
 }
 
-float SpawnpointMetric_Objective(const float *origin, DM_Team *dmTeam, const Player *player)
+float SpawnpointMetric_Objective(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
     return rand() * 0.0000000005f;
 }

From 16166a36b5992bd709ce801066d4f10ab13b850a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:48:10 +0100
Subject: [PATCH 1677/2040] Fix spawnpoint metric for objective-based matches

---
 code/fgame/dm_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index bc7db6c4..88cabd29 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -190,7 +190,7 @@ float SpawnpointMetric_Team(const vec3_t origin, DM_Team *dmTeam, const Player *
 
 float SpawnpointMetric_Objective(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    return rand() * 0.0000000005f;
+    return rand() / (float)RAND_MAX;
 }
 
 CLASS_DECLARATION(Listener, DM_Team, NULL) {

From 4e69d7a78a21effb9036729b16f8a41b7dcea912 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:50:25 +0100
Subject: [PATCH 1678/2040] Remove redundant code

---
 code/fgame/dm_manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 88cabd29..dac05a69 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -457,8 +457,7 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
                     vNewSpawn, player->mins, player->maxs, vEnd, player, MASK_PLAYERSOLID, qfalse, "TempSpawnPoint"
                 );
 
-                if (!trace.allsolid && !trace.startsolid && trace.fraction != 1.0f && trace.fraction != 1.0f
-                    && trace.plane.dist >= 0.8f) {
+                if (!trace.allsolid && !trace.startsolid && trace.fraction != 1.0f && trace.plane.dist >= 0.8f) {
                     points[numSpots].spawnpoint = new PlayerStart;
                     points[numSpots].spawnpoint->setOrigin(trace.endpos);
                     points[numSpots].spawnpoint->setAngles(spot->angles);

From 3b1b994152adefe2c84d71d7285e3c6d9c924052 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:54:46 +0100
Subject: [PATCH 1679/2040] Fix temporary spawn spots being incorrectly ignored

---
 code/fgame/dm_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index dac05a69..69d7613a 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -462,6 +462,7 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
                     points[numSpots].spawnpoint->setOrigin(trace.endpos);
                     points[numSpots].spawnpoint->setAngles(spot->angles);
                     points[numSpots].fMetric = MetricFunction(vNewSpawn, this, player);
+                    numSpots++;
 
                     if (numSpots >= (sizeof(points) / sizeof(points[0]))) {
                         break;
@@ -494,6 +495,7 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
         if (!SpotWouldTelefrag(spot->origin)) {
             points[numSpots].spawnpoint = spot;
             points[numSpots].fMetric    = MetricFunction(spot->origin, this, player);
+            numSpots++;
 
             if (numSpots >= (sizeof(points) / sizeof(points[0]))) {
                 break;

From 7e15c2ac1bd53defaa0fd15fc79d3d05361a2070 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 17 Dec 2024 23:03:58 +0100
Subject: [PATCH 1680/2040] Update features.md

---
 docs/features.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/features.md b/docs/features.md
index 483b31ff..49b5026e 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -68,6 +68,7 @@ Enable this feature with `set sv_netoptimize 2`.
 - Fix for `sv_fps` (tickrate), higher values won't cause animation issues anymore
 - Grenades with 1 ammo can now be picked up
 - Prevent crashing when the last weapon has no ammo and other weapons are inventory items
+- Prevent doors from getting blocked
 
 ## Planned features
 

From bd021b109c0e6f755eef3ce025a6aa9ec8a140f5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Dec 2024 19:31:21 +0100
Subject: [PATCH 1681/2040] Fix a terrible mistake in TIKI_FindTiki with
 uninitialized variable

This was using an uninitialized buffer to find the cached TIKI, in most configurations it always returned false, but when compiled with GCC it would return true
---
 code/tiki/tiki_cache.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index 7a68ea15..34ba05a2 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -83,6 +83,9 @@ dtiki_t *TIKI_FindTiki(const char *path)
     if (tikicache) {
         dtiki_t **t;
 
+        Q_strncpyz(filename, path, sizeof(filename));
+        FS_CanonicalFilename(filename);
+
         t = tikicache->find(filename);
         if (t) {
             return *t;

From 58bef33bc70cdc17f42cdeb418f721ee578a6302 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Dec 2024 19:41:28 +0100
Subject: [PATCH 1682/2040] Don't check if the TIKI model exists when
 initializing a static model

In later version like 2.0 and above, the TIKI model can be registered before static models which would prevent static xyz to be initialized
---
 code/renderergl1/tr_staticmodels.cpp | 166 +++++++++++++--------------
 1 file changed, 82 insertions(+), 84 deletions(-)

diff --git a/code/renderergl1/tr_staticmodels.cpp b/code/renderergl1/tr_staticmodels.cpp
index dfa57ec8..3ea21917 100644
--- a/code/renderergl1/tr_staticmodels.cpp
+++ b/code/renderergl1/tr_staticmodels.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015-2024 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -41,7 +41,6 @@ void R_InitStaticModels(void)
 {
     cStaticModelUnpacked_t *pSM;
     char                    szTemp[1024];
-    bool                    exists;
     skelBoneCache_t         bones[128];
     float                   radius;
     int                     i, j, k, l;
@@ -87,7 +86,7 @@ void R_InitStaticModels(void)
         }
 
         ri.FS_CanonicalFilename(szTemp);
-        exists    = ri.TIKI_FindTiki(szTemp) != NULL;
+        //const bool exists = ri.TIKI_FindTiki(szTemp) != NULL;
         pSM->tiki = ri.TIKI_RegisterTikiFlags(szTemp, qfalse);
 
         if (!pSM->tiki) {
@@ -106,12 +105,7 @@ void R_InitStaticModels(void)
             for (k = 0; k < surf->numskins; k++) {
                 if (surf->shader[k][0]) {
                     shader_t *sh = R_FindShader(
-                        surf->shader[k],
-                        -1,
-                        !(surf->flags & TIKI_SURF_NOMIPMAPS),
-                        r_picmip->integer,
-                        qtrue,
-                        qtrue
+                        surf->shader[k], -1, !(surf->flags & TIKI_SURF_NOMIPMAPS), r_picmip->integer, qtrue, qtrue
                     );
                     surf->hShader[k] = sh->index;
                 } else {
@@ -127,91 +121,96 @@ void R_InitStaticModels(void)
         // Suggestion:
         // It would be cool to have animated static model in the future
 
-        if (!exists) {
-            for (j = 0; j < pSM->tiki->numMeshes; j++) {
-                skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(pSM->tiki->mesh[j]);
-                skelSurfaceGame_t *surf;
+        // Removed in 2.0
+        //  This only leads to issues where pStaticXyz is not initialized
+        //  and it can occurs if the TIKI model is registered before the static model
+        //if (exists) {
+        //    continue;
+        //}
 
-                if (!skelmodel) {
-                    ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
+        for (j = 0; j < pSM->tiki->numMeshes; j++) {
+            skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(pSM->tiki->mesh[j]);
+            skelSurfaceGame_t *surf;
+
+            if (!skelmodel) {
+                ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
+                continue;
+            }
+
+            surf = skelmodel->pSurfaces;
+
+            for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext) {
+                byte             *buf;
+                byte             *p;
+                skelWeight_t     *weight;
+                skeletorVertex_t *vert;
+
+                if (surf->pStaticXyz) {
                     continue;
                 }
 
-                surf = skelmodel->pSurfaces;
+                // allocate static vectors
+                p = buf =
+                    (byte *)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
+                surf->pStaticXyz = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticNormal = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticTexCoords = (vec2_t(*)[2])p;
 
-                for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext) {
-                    byte             *buf;
-                    byte             *p;
-                    skelWeight_t     *weight;
-                    skeletorVertex_t *vert;
+                vert = surf->pVerts;
 
-                    if (surf->pStaticXyz) {
-                        continue;
+                for (l = 0; l < surf->numVerts; l++) {
+                    int              channel;
+                    skelBoneCache_t *bone;
+
+                    weight = (skelWeight_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                              + vert->numMorphs * sizeof(skeletorMorph_t));
+
+                    if (j > 0) {
+                        channel = ri.TIKI_GetLocalChannel(pSM->tiki, skelmodel->pBones[weight->boneIndex].channel);
+                    } else {
+                        channel = weight->boneIndex;
                     }
 
-                    // allocate static vectors
-                    p = buf =
-                        (byte *)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
-                    surf->pStaticXyz = (vec4_t *)p;
-                    p += sizeof(vec4_t) * surf->numVerts;
-                    surf->pStaticNormal = (vec4_t *)p;
-                    p += sizeof(vec4_t) * surf->numVerts;
-                    surf->pStaticTexCoords = (vec2_t(*)[2])p;
+                    bone = &bones[channel];
 
-                    vert = surf->pVerts;
+                    surf->pStaticXyz[l][0] =
+                        ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                          + weight->offset[2] * bone->matrix[2][0])
+                         + bone->offset[0])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][1] =
+                        ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                          + weight->offset[2] * bone->matrix[2][1])
+                         + bone->offset[1])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][2] =
+                        ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                          + weight->offset[2] * bone->matrix[2][2])
+                         + bone->offset[2])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][3] = 0.f;
 
-                    for (l = 0; l < surf->numVerts; l++) {
-                        int              channel;
-                        skelBoneCache_t *bone;
+                    surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
+                                              + vert->normal[1] * bone->matrix[1][0]
+                                              + vert->normal[2] * bone->matrix[2][0];
+                    surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
+                                              + vert->normal[1] * bone->matrix[1][1]
+                                              + vert->normal[2] * bone->matrix[2][1];
+                    surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
+                                              + vert->normal[1] * bone->matrix[1][2]
+                                              + vert->normal[2] * bone->matrix[2][2];
+                    surf->pStaticNormal[l][3] = 0.f;
 
-                        weight = (skelWeight_t *)((byte *)vert + sizeof(skeletorVertex_t)
-                                                  + vert->numMorphs * sizeof(skeletorMorph_t));
+                    surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][0][1] = vert->texCoords[1];
+                    surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
 
-                        if (j > 0) {
-                            channel = ri.TIKI_GetLocalChannel(pSM->tiki, skelmodel->pBones[weight->boneIndex].channel);
-                        } else {
-                            channel = weight->boneIndex;
-                        }
-
-                        bone = &bones[channel];
-
-                        surf->pStaticXyz[l][0] =
-                            ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
-                              + weight->offset[2] * bone->matrix[2][0])
-                             + bone->offset[0])
-                            * weight->boneWeight;
-                        surf->pStaticXyz[l][1] =
-                            ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
-                              + weight->offset[2] * bone->matrix[2][1])
-                             + bone->offset[1])
-                            * weight->boneWeight;
-                        surf->pStaticXyz[l][2] =
-                            ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
-                              + weight->offset[2] * bone->matrix[2][2])
-                             + bone->offset[2])
-                            * weight->boneWeight;
-                        surf->pStaticXyz[l][3] = 0.f;
-
-                        surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
-                                                  + vert->normal[1] * bone->matrix[1][0]
-                                                  + vert->normal[2] * bone->matrix[2][0];
-                        surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
-                                                  + vert->normal[1] * bone->matrix[1][1]
-                                                  + vert->normal[2] * bone->matrix[2][1];
-                        surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
-                                                  + vert->normal[1] * bone->matrix[1][2]
-                                                  + vert->normal[2] * bone->matrix[2][2];
-                        surf->pStaticNormal[l][3] = 0.f;
-
-                        surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
-                        surf->pStaticTexCoords[l][0][1] = vert->texCoords[1];
-                        surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
-                        surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
-
-                        vert = (skeletorVertex_t *)((byte *)vert + sizeof(skeletorVertex_t)
-                                                    + sizeof(skeletorMorph_t) * vert->numMorphs
-                                                    + sizeof(skelWeight_t) * vert->numWeights);
-                    }
+                    vert = (skeletorVertex_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * vert->numMorphs
+                                                + sizeof(skelWeight_t) * vert->numWeights);
                 }
             }
         }
@@ -338,8 +337,7 @@ void R_AddStaticModelSurfaces(void)
         iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, SM->cull_radius);
 
         if (r_showcull->integer & 8) {
-            switch (iRadiusCull)
-            {
+            switch (iRadiusCull) {
             case CULL_IN:
                 R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.2, 0.0, 1.0, 0.0, 0.5, 0);
                 break;

From 7d369dec74f74cc86e39a1157b6b6420a7922655 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Dec 2024 19:44:48 +0100
Subject: [PATCH 1683/2040] Don't render static mesh if there is no static xyz

---
 code/renderergl1/tr_model.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index 96189a70..8ac7a97f 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -1517,6 +1517,9 @@ void RB_StaticMesh(staticSurface_t *staticSurf)
     surf = staticSurf->surface;
 
     assert(surf->pStaticXyz);
+	if (!surf->pStaticXyz) {
+		return;
+	}
 
     meshNum   = staticSurf->meshNum;
     skelmodel = ri.TIKI_GetSkel(tiki->mesh[meshNum]);

From 38427fa3c5d517149dec9cdd4f535eef80b8d793 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 18 Dec 2024 23:24:04 +0100
Subject: [PATCH 1684/2040] Add support for compiling both opengl1 and opengl2
 when they're built as shared libraries

renderercommon is now used, which will appropriately use opengl1 when building static libraries, or compile both opengl1/opengl2 modules when building shared libraries
---
 CMakeLists.txt                     |  3 +-
 code/renderercommon/CMakeLists.txt | 34 +++++++++++++++++++++++
 code/renderergl1/CMakeLists.txt    | 44 ++++++++++--------------------
 code/renderergl2/CMakeLists.txt    | 33 ++++++++++++++++++++++
 4 files changed, 83 insertions(+), 31 deletions(-)
 create mode 100644 code/renderercommon/CMakeLists.txt
 create mode 100644 code/renderergl2/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8a93176..54060f98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,8 +188,7 @@ if (NOT BUILD_NO_CLIENT)
 	option(NO_MODERN_DMA "Use older sound-system" FALSE)
 
 	add_subdirectory("code/client")
-	add_subdirectory("code/renderergl1")
-	#add_subdirectory("code/renderergl2")
+	add_subdirectory("code/renderercommon")
 	add_subdirectory("code/sdl")
 
 	add_executable(openmohaa "misc/dummy.c")
diff --git a/code/renderercommon/CMakeLists.txt b/code/renderercommon/CMakeLists.txt
new file mode 100644
index 00000000..2b3358aa
--- /dev/null
+++ b/code/renderercommon/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(omohrenderer)
+
+file(GLOB_RECURSE SOURCES_RENDERER_COMMON "./*.c" "./*.cpp")
+
+add_library(omohrenderer_common STATIC ${SOURCES_RENDERER_COMMON})
+target_include_directories(omohrenderer_common PUBLIC "../sdl" "./")
+target_link_libraries(omohrenderer_common PUBLIC qcommon_shared)
+target_link_libraries(omohrenderer_common PUBLIC omohsdl_gl)
+target_compile_definitions(omohrenderer_common PRIVATE USE_INTERNAL_JPEG=1)
+
+# Add JPEG
+if(USE_INTERNAL_JPEG)
+	file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
+	add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
+	target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
+	target_include_directories(omohrenderer_common PUBLIC "../jpeg-8c")
+	target_link_libraries(omohrenderer_common PRIVATE jpeg8)
+else()
+	target_include_directories(omohrenderer_common PUBLIC ${JPEG_INCLUDE_DIRS})
+	target_link_libraries(omohrenderer_common PRIVATE ${JPEG_LIBRARIES})
+endif()
+
+add_subdirectory("../renderergl1" renderergl1)
+
+add_library(omohrenderer INTERFACE)
+target_link_libraries(omohrenderer INTERFACE omohrenderergl1)
+
+if (${USE_RENDERER_DLOPEN})
+	add_subdirectory("../renderergl2" renderergl2)
+	
+	target_link_libraries(omohrenderer INTERFACE omohrenderergl2)
+endif()
\ No newline at end of file
diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
index dad93085..ab89e2a4 100644
--- a/code/renderergl1/CMakeLists.txt
+++ b/code/renderergl1/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.12)
 
-project(omohrenderer)
+project(omohrenderergl1)
 
-file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
+file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
 list(REMOVE_ITEM SOURCES_RENDERER "./tr_subs.c")
 
 set(SOURCES_RENDERER ${SOURCES_RENDERER}
@@ -10,42 +10,28 @@ set(SOURCES_RENDERER ${SOURCES_RENDERER}
 )
 
 if (${USE_RENDERER_DLOPEN})
-	add_library(omohrenderer SHARED ${SOURCES_RENDERER})
+	add_library(omohrenderergl1 SHARED ${SOURCES_RENDERER})
 else()
-	add_library(omohrenderer STATIC ${SOURCES_RENDERER})
+	add_library(omohrenderergl1 STATIC ${SOURCES_RENDERER})
 endif()
-target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon")
-target_compile_features(omohrenderer PUBLIC cxx_nullptr)
-target_compile_features(omohrenderer PUBLIC c_variadic_macros)
-target_compile_definitions(omohrenderer PRIVATE USE_INTERNAL_JPEG=1)
-target_link_libraries(omohrenderer PRIVATE qcommon_shared)
-target_link_libraries(omohrenderer PRIVATE omohsdl_gl)
 
-get_target_property(target_type omohrenderer TYPE)
+target_compile_features(omohrenderergl1 PUBLIC cxx_nullptr)
+target_compile_features(omohrenderergl1 PUBLIC c_variadic_macros)
+target_link_libraries(omohrenderergl1 PRIVATE omohrenderer_common)
+
+get_target_property(target_type omohrenderergl1 TYPE)
 if (target_type STREQUAL "SHARED_LIBRARY")
-	target_sources(omohrenderer PRIVATE "./tr_subs.c")
-	target_compile_definitions(omohrenderer PUBLIC USE_RENDERER_DLOPEN=1)
+	target_sources(omohrenderergl1 PRIVATE "./tr_subs.c")
+	target_compile_definitions(omohrenderergl1 PUBLIC USE_RENDERER_DLOPEN=1)
 endif ()
 
-if(USE_INTERNAL_JPEG)
-	file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
-	add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
-	target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
-	target_include_directories(omohrenderer PUBLIC "../jpeg-8c")
-	target_link_libraries(omohrenderer PRIVATE jpeg8)
-else()
-	target_include_directories(omohrenderer PUBLIC ${JPEG_INCLUDE_DIRS})
-	target_link_libraries(omohrenderer PRIVATE ${JPEG_LIBRARIES})
-endif()
-
-set_target_properties(omohrenderer PROPERTIES PREFIX "")
-set_target_properties(omohrenderer PROPERTIES OUTPUT_NAME "renderer_opengl1${TARGET_BIN_SUFFIX}")
-
+set_target_properties(omohrenderergl1 PROPERTIES PREFIX "")
+set_target_properties(omohrenderergl1 PROPERTIES OUTPUT_NAME "renderer_opengl1${TARGET_BIN_SUFFIX}")
 
 if (target_type STREQUAL "SHARED_LIBRARY")
-	INSTALL(TARGETS omohrenderer DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
+	INSTALL(TARGETS omohrenderergl1 DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
 
 	if(MSVC)
-		INSTALL(FILES $<TARGET_PDB_FILE:omohrenderer> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
+		INSTALL(FILES $<TARGET_PDB_FILE:omohrenderergl1> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
 	endif()
 endif ()
diff --git a/code/renderergl2/CMakeLists.txt b/code/renderergl2/CMakeLists.txt
new file mode 100644
index 00000000..780d584a
--- /dev/null
+++ b/code/renderergl2/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(omohrenderergl2)
+
+file(GLOB SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
+include("glsl/shaders.cmake")
+
+if (${USE_RENDERER_DLOPEN})
+	add_library(omohrenderergl2 SHARED ${SOURCES_RENDERER} ${SHADER_SRCS})
+else()
+	add_library(omohrenderergl2 STATIC ${SOURCES_RENDERER} ${SHADER_SRCS})
+endif()
+
+target_compile_features(omohrenderergl2 PUBLIC cxx_nullptr)
+target_compile_features(omohrenderergl2 PUBLIC c_variadic_macros)
+target_link_libraries(omohrenderergl2 PRIVATE omohrenderer_common)
+
+get_target_property(target_type omohrenderergl2 TYPE)
+if (target_type STREQUAL "SHARED_LIBRARY")
+	target_sources(omohrenderergl2 PRIVATE "./tr_subs.c")
+	target_compile_definitions(omohrenderergl2 PUBLIC USE_RENDERER_DLOPEN=1)
+endif ()
+
+set_target_properties(omohrenderergl2 PROPERTIES PREFIX "")
+set_target_properties(omohrenderergl2 PROPERTIES OUTPUT_NAME "renderer_opengl2${TARGET_BIN_SUFFIX}")
+
+if (target_type STREQUAL "SHARED_LIBRARY")
+	INSTALL(TARGETS omohrenderergl2 DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
+
+	if(MSVC)
+		INSTALL(FILES $<TARGET_PDB_FILE:omohrenderergl2> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
+	endif()
+endif ()

From 9d4ea75a181944264384db6bbff87b3aa2007c4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 19:18:13 +0100
Subject: [PATCH 1685/2040] Increase the number of aliases that can be found

Previously, 64 aliases could be chosen for random search, it was incremented to 128 since 2.0, however it should have been increased in Breakthrough as well, because there are aliases with more than 128 elements
---
 code/qcommon/alias.c | 1105 +++++++++++++++++++-----------------------
 1 file changed, 501 insertions(+), 604 deletions(-)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index 3dc9ce2a..8169b35f 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,764 +24,661 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "alias.h"
 
-static AliasList_t* Aliases;
-static AliasListNode_t* foundlist[64];
+static AliasList_t *Aliases;
+//static AliasListNode_t* foundlist[64];
+// Changed in 2.0
+//static AliasListNode_t* foundlist[128];
+// Changed in OPM
+static AliasListNode_t *foundlist[256];
 
-AliasListNode_t* AliasListNode_New()
+AliasListNode_t *AliasListNode_New()
 {
-	AliasListNode_t* node = Z_TagMalloc(sizeof(AliasListNode_t), TAG_TIKI);
+    AliasListNode_t *node = Z_TagMalloc(sizeof(AliasListNode_t), TAG_TIKI);
 
-	memset(node, 0, sizeof(AliasListNode_t));
-	node->weight = 1.0f;
-	node->next = NULL;
+    memset(node, 0, sizeof(AliasListNode_t));
+    node->weight = 1.0f;
+    node->next   = NULL;
 
-	return node;
+    return node;
 }
 
-AliasList_t* AliasList_New(const char* name)
+AliasList_t *AliasList_New(const char *name)
 {
-	AliasList_t* list = Z_TagMalloc(sizeof(AliasList_t), TAG_TIKI);
+    AliasList_t *list = Z_TagMalloc(sizeof(AliasList_t), TAG_TIKI);
 
-	list->num_in_list = 0;
-	list->sorted_list = NULL;
-	list->data_list = NULL;
-	list->dirty = qfalse;
+    list->num_in_list = 0;
+    list->sorted_list = NULL;
+    list->data_list   = NULL;
+    list->dirty       = qfalse;
 
-	if (name)
-	{
-		strncpy(list->name, name, sizeof(list->name));
-	}
-	else
-	{
-		list->name[0] = 0;
-	}
+    if (name) {
+        strncpy(list->name, name, sizeof(list->name));
+    } else {
+        list->name[0] = 0;
+    }
 
-	return list;
+    return list;
 }
 
-void Alias_ListClear(AliasList_t* list)
+void Alias_ListClear(AliasList_t *list)
 {
-	AliasListNode_t* node;
-	AliasListNode_t* next;
+    AliasListNode_t *node;
+    AliasListNode_t *next;
 
-	if (list->sorted_list)
-	{
-		Z_Free(list->sorted_list);
-	}
+    if (list->sorted_list) {
+        Z_Free(list->sorted_list);
+    }
 
-	for (node = list->data_list; node != NULL; node = next)
-	{
-		next = node->next;
-		Z_Free(node);
-	}
+    for (node = list->data_list; node != NULL; node = next) {
+        next = node->next;
+        Z_Free(node);
+    }
 
-	list->num_in_list = 0;
-	list->dirty = qfalse;
-	list->sorted_list = NULL;
-	list->data_list = NULL;
+    list->num_in_list = 0;
+    list->dirty       = qfalse;
+    list->sorted_list = NULL;
+    list->data_list   = NULL;
 }
 
-void Alias_ListDelete(AliasList_t* list)
+void Alias_ListDelete(AliasList_t *list)
 {
-	Alias_ListClear(list);
-	Z_Free(list);
+    Alias_ListClear(list);
+    Z_Free(list);
 }
 
-float getTokenFloat(const char** parameters, char* parmName, AliasListNode_t* node)
+float getTokenFloat(const char **parameters, char *parmName, AliasListNode_t *node)
 {
-	const char* token;
-	float temp_float = 0.0f;
+    const char *token;
+    float       temp_float = 0.0f;
 
-	token = COM_GetToken((char**)parameters, 1);
-	
-	if (token && *token)
-	{
-		temp_float = (float)atof(token);
-		if (temp_float < 0.0f)
-		{
-			Com_Printf("ERROR getTokenFloat: %s value out of range in %s alias\n", parmName, node->alias_name);
-		}
+    token = COM_GetToken((char **)parameters, 1);
 
-		return temp_float;
-	}
-	else
-	{
-		Com_Printf("ERROR getTokenFloat: %s value is hosed or wasn't found for %s\n", parmName, node->alias_name);
-	}
+    if (token && *token) {
+        temp_float = (float)atof(token);
+        if (temp_float < 0.0f) {
+            Com_Printf("ERROR getTokenFloat: %s value out of range in %s alias\n", parmName, node->alias_name);
+        }
 
-	return 0.0f;
+        return temp_float;
+    } else {
+        Com_Printf("ERROR getTokenFloat: %s value is hosed or wasn't found for %s\n", parmName, node->alias_name);
+    }
+
+    return 0.0f;
 }
 
-int S_ChannelNameToNum(const char* pszName)
+int S_ChannelNameToNum(const char *pszName)
 {
-	if (!Q_stricmp(pszName, "auto"))
-	{
-		return CHAN_AUTO;
-	}
-	else if (!Q_stricmp(pszName, "local"))
-	{
-		return CHAN_LOCAL;
-	}
-	else if (!Q_stricmp(pszName, "weapon"))
-	{
-		return CHAN_WEAPON;
-	}
-	else if (!Q_stricmp(pszName, "voice"))
-	{
-		return CHAN_VOICE;
-	}
-	else if (!Q_stricmp(pszName, "item"))
-	{
-		return CHAN_ITEM;
-	}
-	else if (!Q_stricmp(pszName, "body"))
-	{
-		return CHAN_BODY;
-	}
-	else if (!Q_stricmp(pszName, "dialog"))
-	{
-		return CHAN_DIALOG;
-	}
-	else if (!Q_stricmp(pszName, "dialog_secondary"))
-	{
-		return CHAN_DIALOG_SECONDARY;
-	}
-	else if (!Q_stricmp(pszName, "weaponidle"))
-	{
-		return CHAN_WEAPONIDLE;
-	}
-	else if (!Q_stricmp(pszName, "menu"))
-	{
-		return CHAN_MENU;
-	}
-	else
-	{
-		return -1;
-	}
+    if (!Q_stricmp(pszName, "auto")) {
+        return CHAN_AUTO;
+    } else if (!Q_stricmp(pszName, "local")) {
+        return CHAN_LOCAL;
+    } else if (!Q_stricmp(pszName, "weapon")) {
+        return CHAN_WEAPON;
+    } else if (!Q_stricmp(pszName, "voice")) {
+        return CHAN_VOICE;
+    } else if (!Q_stricmp(pszName, "item")) {
+        return CHAN_ITEM;
+    } else if (!Q_stricmp(pszName, "body")) {
+        return CHAN_BODY;
+    } else if (!Q_stricmp(pszName, "dialog")) {
+        return CHAN_DIALOG;
+    } else if (!Q_stricmp(pszName, "dialog_secondary")) {
+        return CHAN_DIALOG_SECONDARY;
+    } else if (!Q_stricmp(pszName, "weaponidle")) {
+        return CHAN_WEAPONIDLE;
+    } else if (!Q_stricmp(pszName, "menu")) {
+        return CHAN_MENU;
+    } else {
+        return -1;
+    }
 }
 
-const char* S_ChannelNumToName(int iChannel)
+const char *S_ChannelNumToName(int iChannel)
 {
-	switch (iChannel)
-	{
-	case CHAN_AUTO:
-		return "auto";
-	case CHAN_LOCAL:
-		return "local";
-	case CHAN_WEAPON:
-		return "weapon";
-	case CHAN_VOICE:
-		return "voice";
-	case CHAN_ITEM:
-		return "item";
-	case CHAN_BODY:
-		return "body";
-	case CHAN_DIALOG:
-		return "dialog";
-	case CHAN_DIALOG_SECONDARY:
-		return "dialog_secondary";
-	case CHAN_WEAPONIDLE:
-		return "weaponidle";
-	case CHAN_MENU:
-		return "menu";
-	default:
-		return NULL;
-	}
+    switch (iChannel) {
+    case CHAN_AUTO:
+        return "auto";
+    case CHAN_LOCAL:
+        return "local";
+    case CHAN_WEAPON:
+        return "weapon";
+    case CHAN_VOICE:
+        return "voice";
+    case CHAN_ITEM:
+        return "item";
+    case CHAN_BODY:
+        return "body";
+    case CHAN_DIALOG:
+        return "dialog";
+    case CHAN_DIALOG_SECONDARY:
+        return "dialog_secondary";
+    case CHAN_WEAPONIDLE:
+        return "weaponidle";
+    case CHAN_MENU:
+        return "menu";
+    default:
+        return NULL;
+    }
 }
 
-void Alias_ListAddParms(AliasListNode_t* node, const char* parameters)
+void Alias_ListAddParms(AliasListNode_t *node, const char *parameters)
 {
-	const char* token;
-	float temp_float;
-	const char* nptr;
+    const char *token;
+    float       temp_float;
+    const char *nptr;
 
-	if (!node || !parameters)
-	{
-		return;
-	}
+    if (!node || !parameters) {
+        return;
+    }
 
-	for (;;)
-	{
-		token = nptr = COM_GetToken((char**)&parameters, qtrue);
-		if (!token || !token[0])
-		{
-			break;
-		}
+    for (;;) {
+        token = nptr = COM_GetToken((char **)&parameters, qtrue);
+        if (!token || !token[0]) {
+            break;
+        }
 
-		if (!Q_stricmp(token, "stop"))
-		{
-			node->stop_flag = 1;
-		}
-		else if (!Q_stricmp(token, "soundparms"))
-		{
-			node->volume = getTokenFloat(&parameters, "volume", node);
-			node->volumeMod = getTokenFloat(&parameters, "volumeMod", node);
-			node->pitch = getTokenFloat(&parameters, "pitch", node);
-			node->pitchMod = getTokenFloat(&parameters, "pitchMod", node);
-			node->dist = getTokenFloat(&parameters, "dist", node);
-			node->maxDist = getTokenFloat(&parameters, "maxDist", node);
+        if (!Q_stricmp(token, "stop")) {
+            node->stop_flag = 1;
+        } else if (!Q_stricmp(token, "soundparms")) {
+            node->volume    = getTokenFloat(&parameters, "volume", node);
+            node->volumeMod = getTokenFloat(&parameters, "volumeMod", node);
+            node->pitch     = getTokenFloat(&parameters, "pitch", node);
+            node->pitchMod  = getTokenFloat(&parameters, "pitchMod", node);
+            node->dist      = getTokenFloat(&parameters, "dist", node);
+            node->maxDist   = getTokenFloat(&parameters, "maxDist", node);
 
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			node->channel = S_ChannelNameToNum(token);
-			if (node->channel == -1)
-			{
-				Com_Printf("%s is not avalid channel on %s alias.\n", token, node->alias_name);
-				node->channel = 0;
-			}
+            node->channel = S_ChannelNameToNum(token);
+            if (node->channel == -1) {
+                Com_Printf("%s is not avalid channel on %s alias.\n", token, node->alias_name);
+                node->channel = 0;
+            }
 
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("ERROR: defaulting %s to not streamed - please setup alias properly.\n", node->alias_name);
-				return;
-			}
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("ERROR: defaulting %s to not streamed - please setup alias properly.\n", node->alias_name);
+                return;
+            }
 
-			if (!Q_stricmp(token, "streamed"))
-			{
-				node->streamed = qtrue;
-			}
-			else if (!Q_stricmp(token, "loaded"))
-			{
-				node->streamed = qfalse;
-			}
-			else
-			{
-				Com_Printf("ERROR: Expecting streamed or loaded in ubersound and got %s on alias %s\n", token, node->alias_name);
-				continue;
-			}
-		}
-		else if (!Q_stricmp(token, "subtitle") || !Q_stricmp(token, "forcesubtitle"))
-		{
-			size_t size;
+            if (!Q_stricmp(token, "streamed")) {
+                node->streamed = qtrue;
+            } else if (!Q_stricmp(token, "loaded")) {
+                node->streamed = qfalse;
+            } else {
+                Com_Printf(
+                    "ERROR: Expecting streamed or loaded in ubersound and got %s on alias %s\n", token, node->alias_name
+                );
+                continue;
+            }
+        } else if (!Q_stricmp(token, "subtitle") || !Q_stricmp(token, "forcesubtitle")) {
+            size_t size;
 
-			if (!Q_stricmp(token, "subtitle")) {
-				node->forcesubtitle = qfalse;
-			} else {
-				node->forcesubtitle = qtrue;
-			}
+            if (!Q_stricmp(token, "subtitle")) {
+                node->forcesubtitle = qfalse;
+            } else {
+                node->forcesubtitle = qtrue;
+            }
 
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("NULL subtitle on %s alias.\n", node->alias_name);
-				return;
-			}
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("NULL subtitle on %s alias.\n", node->alias_name);
+                return;
+            }
 
-			size = strlen(token) + 1;
-			node->subtitle = Z_TagMalloc(size, TAG_TIKI);
-			memcpy(node->subtitle, token, size);
-		}
-		else if (!Q_stricmp(token, "pitch"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            size           = strlen(token) + 1;
+            node->subtitle = Z_TagMalloc(size, TAG_TIKI);
+            memcpy(node->subtitle, token, size);
+        } else if (!Q_stricmp(token, "pitch")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("Pitch value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("Pitch value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			node->pitch = temp_float;
-		}
-		else if (!Q_stricmp(token, "pitchmod"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            node->pitch = temp_float;
+        } else if (!Q_stricmp(token, "pitchmod")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("PitchMod value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("PitchMod value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			node->pitchMod = temp_float;
-		}
-		else if (!Q_stricmp(token, "volumemod"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            node->pitchMod = temp_float;
+        } else if (!Q_stricmp(token, "volumemod")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("volumeMod value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("volumeMod value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			node->volumeMod = temp_float;
-		}
-		else if (!Q_stricmp(token, "dist"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("\n\n BAD DISTANCE\n\n");
-				return;
-			}
+            node->volumeMod = temp_float;
+        } else if (!Q_stricmp(token, "dist")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("\n\n BAD DISTANCE\n\n");
+                return;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("dist value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("dist value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			node->dist = temp_float;
-		}
-		else if (!Q_stricmp(token, "channel"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("\n\n BAD DISTANCE\n\n");
-				return;
-			}
+            node->dist = temp_float;
+        } else if (!Q_stricmp(token, "channel")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("\n\n BAD DISTANCE\n\n");
+                return;
+            }
 
-			node->channel = S_ChannelNameToNum(token);
-			if (node->channel == -1)
-			{
-				Com_Printf("%s is not a valid channel on %s alias.\n", token, node->alias_name);
-				node->channel = CHAN_AUTO;
-			}
-		}
-		else
-		{
-			Com_Printf("Unknown parameter for %s alias\n", node->alias_name);
-			continue;
-		}
-	}
+            node->channel = S_ChannelNameToNum(token);
+            if (node->channel == -1) {
+                Com_Printf("%s is not a valid channel on %s alias.\n", token, node->alias_name);
+                node->channel = CHAN_AUTO;
+            }
+        } else {
+            Com_Printf("Unknown parameter for %s alias\n", node->alias_name);
+            continue;
+        }
+    }
 }
 
-qboolean Alias_ListAdd(AliasList_t* list, const char* alias, const char* name, const char* parameters)
+qboolean Alias_ListAdd(AliasList_t *list, const char *alias, const char *name, const char *parameters)
 {
-	AliasListNode_t* ptr = NULL;
-	int i;
-	AliasListNode_t* node;
+    AliasListNode_t *ptr = NULL;
+    int              i;
+    AliasListNode_t *node;
 
-	if (!list)
-	{
-		return qfalse;
-	}
+    if (!list) {
+        return qfalse;
+    }
 
-	if (list->dirty)
-	{
-		for (node = list->data_list; node != NULL; node = node->next)
-		{
-			if (!strcmp(node->alias_name, alias))
-			{
-				Com_DPrintf("DUPLICATE ALIASES: %s and %s\n", node->alias_name, alias);
-				return qtrue;
-			}
-		}
-	}
-	else
-	{
-		ptr = Alias_ListFindNode(list, alias);
-	}
+    if (list->dirty) {
+        for (node = list->data_list; node != NULL; node = node->next) {
+            if (!strcmp(node->alias_name, alias)) {
+                Com_DPrintf("DUPLICATE ALIASES: %s and %s\n", node->alias_name, alias);
+                return qtrue;
+            }
+        }
+    } else {
+        ptr = Alias_ListFindNode(list, alias);
+    }
 
-	if (!ptr)
-	{
-		node = AliasListNode_New();
-		strncpy(node->alias_name, alias, sizeof(node->alias_name));
+    if (!ptr) {
+        node = AliasListNode_New();
+        strncpy(node->alias_name, alias, sizeof(node->alias_name));
 
-		for (i = 0; i < MAX_ALIASLIST_NAME_LENGTH; i++)
-		{
-			node->alias_name[i] = tolower(node->alias_name[i]);
-		}
+        for (i = 0; i < MAX_ALIASLIST_NAME_LENGTH; i++) {
+            node->alias_name[i] = tolower(node->alias_name[i]);
+        }
 
-		strncpy(node->real_name, name, sizeof(node->real_name));
-		node->stop_flag = 0;
-		Alias_ListAddParms(node, parameters);
-		list->dirty = qtrue;
-		list->num_in_list++;
-		node->next = list->data_list;
-		list->data_list = node;
-	}
-	else if (strcmp(name, ptr->real_name))
-	{
-		Com_DPrintf("Duplicate Aliases for %s in list %s.\n", alias, name);
-	}
+        strncpy(node->real_name, name, sizeof(node->real_name));
+        node->stop_flag = 0;
+        Alias_ListAddParms(node, parameters);
+        list->dirty = qtrue;
+        list->num_in_list++;
+        node->next      = list->data_list;
+        list->data_list = node;
+    } else if (strcmp(name, ptr->real_name)) {
+        Com_DPrintf("Duplicate Aliases for %s in list %s.\n", alias, name);
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
-void Alias_ListSort(AliasList_t* list)
+void Alias_ListSort(AliasList_t *list)
 {
-	int num;
-	int size;
-	int i;
-	AliasListNode_t* root;
-	AliasListNode_t* ptr;
-	AliasListNode_t* smallest = NULL;
-	AliasListNode_t* prev;
-	AliasListNode_t* smallprev;
-	AliasListNode_t* last = NULL;
+    int              num;
+    int              size;
+    int              i;
+    AliasListNode_t *root;
+    AliasListNode_t *ptr;
+    AliasListNode_t *smallest = NULL;
+    AliasListNode_t *prev;
+    AliasListNode_t *smallprev;
+    AliasListNode_t *last = NULL;
 
-	if (!list->dirty)
-	{
-		return;
-	}
+    if (!list->dirty) {
+        return;
+    }
 
-	num = 0;
+    num = 0;
 
-	root = list->data_list;
-	list->data_list = NULL;
-	if (list->sorted_list)
-		Z_Free(list->sorted_list);
+    root            = list->data_list;
+    list->data_list = NULL;
+    if (list->sorted_list) {
+        Z_Free(list->sorted_list);
+    }
 
-	size = list->num_in_list * sizeof(AliasListNode_t*);
-	list->sorted_list = Z_TagMalloc(size, TAG_TIKI);
-	memset(list->sorted_list, 0, size);
+    size              = list->num_in_list * sizeof(AliasListNode_t *);
+    list->sorted_list = Z_TagMalloc(size, TAG_TIKI);
+    memset(list->sorted_list, 0, size);
 
-	for (i = 0; i < list->num_in_list; i++)
-	{
-		prev = root;
-		smallprev = root;
+    for (i = 0; i < list->num_in_list; i++) {
+        prev      = root;
+        smallprev = root;
 
-		for (ptr = root->next; ptr != NULL; ptr = ptr->next)
-		{
-			if (strcmp(ptr->alias_name, smallprev->alias_name) < 0)
-			{
-				smallest = prev;
-				smallprev = ptr;
-			}
+        for (ptr = root->next; ptr != NULL; ptr = ptr->next) {
+            if (strcmp(ptr->alias_name, smallprev->alias_name) < 0) {
+                smallest  = prev;
+                smallprev = ptr;
+            }
 
-			prev = ptr;
-		}
+            prev = ptr;
+        }
 
-		if (smallprev == root)
-		{
-			root = smallprev->next;
-		}
-		else
-		{
-			smallest->next = smallprev->next;
-		}
+        if (smallprev == root) {
+            root = smallprev->next;
+        } else {
+            smallest->next = smallprev->next;
+        }
 
-		if (!last || strcmp(last->alias_name, smallprev->alias_name))
-		{
-			list->sorted_list[num++] = smallprev;
-			smallprev->next = list->data_list;
-			list->data_list = smallprev;
-			last = smallprev;
-		}
-		else
-		{
-			if (strcmp(last->real_name, smallprev->real_name))
-			{
-				Com_DPrintf("Duplicate Aliases for %s in list %s  Last: %p.\n", last->alias_name, list->name, last);
-			}
+        if (!last || strcmp(last->alias_name, smallprev->alias_name)) {
+            list->sorted_list[num++] = smallprev;
+            smallprev->next          = list->data_list;
+            list->data_list          = smallprev;
+            last                     = smallprev;
+        } else {
+            if (strcmp(last->real_name, smallprev->real_name)) {
+                Com_DPrintf("Duplicate Aliases for %s in list %s  Last: %p.\n", last->alias_name, list->name, last);
+            }
 
-			Z_Free(smallprev);
-		}
-	}
+            Z_Free(smallprev);
+        }
+    }
 
-	list->dirty = 0;
-	list->num_in_list = num;
+    list->dirty       = 0;
+    list->num_in_list = num;
 }
 
-const char* Alias_ListFind(AliasList_t* list, const char* alias)
+const char *Alias_ListFind(AliasList_t *list, const char *alias)
 {
-	AliasListNode_t* node = Alias_ListFindNode(list, alias);
+    AliasListNode_t *node = Alias_ListFindNode(list, alias);
 
-	if (node)
-	{
-		return node->real_name;
-	}
-	else
-	{
-		return NULL;
-	}
+    if (node) {
+        return node->real_name;
+    } else {
+        return NULL;
+    }
 }
 
-void Alias_ListUpdateDialog(AliasList_t* list, const char* alias)
+void Alias_ListUpdateDialog(AliasList_t *list, const char *alias)
 {
-	int min_index;
-	int max_index;
-	float total_weight;
+    int   min_index;
+    int   max_index;
+    float total_weight;
 
-	Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
+    Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
 }
 
-AliasListNode_t* Alias_ListFindNode(AliasList_t* list, const char* alias)
+AliasListNode_t *Alias_ListFindNode(AliasList_t *list, const char *alias)
 {
-	char convalias[40];
-	int index;
-	int l;
-	int r;
-	int diff;
-	size_t length;
-	int __res;
+    char   convalias[40];
+    int    index;
+    int    l;
+    int    r;
+    int    diff;
+    size_t length;
+    int    __res;
 
-	if (list->dirty)
-	{
-		Alias_ListSort(list);
-	}
+    if (list->dirty) {
+        Alias_ListSort(list);
+    }
 
-	length = strlen(alias);
+    length = strlen(alias);
 
-	for (index = 0; index < length; index++)
-	{
-		convalias[index] = tolower(alias[index]);
-	}
+    for (index = 0; index < length; index++) {
+        convalias[index] = tolower(alias[index]);
+    }
 
-	convalias[length] = 0;
+    convalias[length] = 0;
 
-	r = 0;
-	l = list->num_in_list - 1;
-	for (index = l; index >= 0; index--)
-	{
-		__res = (l + r) >> 1;
-		diff = strcmp(convalias, list->sorted_list[index]->alias_name);
+    r = 0;
+    l = list->num_in_list - 1;
+    for (index = l; index >= 0; index--) {
+        __res = (l + r) >> 1;
+        diff  = strcmp(convalias, list->sorted_list[index]->alias_name);
 
-		if (diff == 0)
-		{
-			return list->sorted_list[index];
-		}
-		else if (diff > 0)
-		{
-			r = __res + 1;
-		}
-		else
-		{
-			l = __res - 1;
-		}
-	}
+        if (diff == 0) {
+            return list->sorted_list[index];
+        } else if (diff > 0) {
+            r = __res + 1;
+        } else {
+            l = __res - 1;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 float randweight()
 {
-	return ((float)(rand() & 0x7fff)) / ((float)0x8000);
+    return ((float)(rand() & 0x7fff)) / ((float)0x8000);
 }
 
-const char* Alias_ListFindRandom(AliasList_t* list, const char* alias, AliasListNode_t** ret)
+const char *Alias_ListFindRandom(AliasList_t *list, const char *alias, AliasListNode_t **ret)
 {
-	int min_index;
-	int max_index;
-	float total_weight;
-	int i;
-	int numfound;
-	float weight;
-	float num;
+    int   min_index;
+    int   max_index;
+    float total_weight;
+    int   i;
+    int   numfound;
+    float weight;
+    float num;
 
-	if (!*alias)
-	{
-		return NULL;
-	}
+    if (!*alias) {
+        return NULL;
+    }
 
-	Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
+    Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
 
-	if (min_index == -1 || max_index == -1)
-	{
-		return NULL;
-	}
+    if (min_index == -1 || max_index == -1) {
+        return NULL;
+    }
 
-	num = 0.0f;
-	numfound = max_index - min_index + 1;
-	weight = randweight() * total_weight;
+    num      = 0.0f;
+    numfound = max_index - min_index + 1;
+    weight   = randweight() * total_weight;
 
-	for (i = 0; i < numfound; i++)
-	{
-		num += list->sorted_list[i + min_index]->weight;
-		if (num > weight)
-		{
-			if (ret)
-			{
-				*ret = list->sorted_list[i + min_index];
-			}
+    for (i = 0; i < numfound; i++) {
+        num += list->sorted_list[i + min_index]->weight;
+        if (num > weight) {
+            if (ret) {
+                *ret = list->sorted_list[i + min_index];
+            }
 
-			return list->sorted_list[i + min_index]->real_name;
-		}
-	}
+            return list->sorted_list[i + min_index]->real_name;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
-void Alias_ListFindRandomRange(AliasList_t* list, const char* alias, int* min_index, int* max_index, float* total_weight)
+void Alias_ListFindRandomRange(
+    AliasList_t *list, const char *alias, int *min_index, int *max_index, float *total_weight
+)
 {
-	char convalias[MAX_ALIASLIST_NAME_LENGTH];
-	int index;
-	int l;
-	int r;
-	int diff;
-	int i;
-	size_t length;
-	int numfound;
-	float totalfoundweight = 0.0f;
-	AliasListNode_t** ptr;
+    char              convalias[MAX_ALIASLIST_NAME_LENGTH];
+    int               index;
+    int               l;
+    int               r;
+    int               diff;
+    int               i;
+    size_t            length;
+    int               numfound;
+    float             totalfoundweight = 0.0f;
+    AliasListNode_t **ptr;
 
-	*min_index = -1;
-	*max_index = -1;
+    *min_index = -1;
+    *max_index = -1;
 
-	if (!*alias)
-		return;
+    if (!*alias) {
+        return;
+    }
 
-	if (list->dirty)
-		Alias_ListSort(list);
+    if (list->dirty) {
+        Alias_ListSort(list);
+    }
 
-	length = strlen(alias);
+    length = strlen(alias);
 
-	if (length > MAX_ALIASLIST_NAME_LENGTH)
-	{
-		return;
-	}
+    if (length > MAX_ALIASLIST_NAME_LENGTH) {
+        return;
+    }
 
-	for (index = 0; index < length; index++)
-	{
-		convalias[index] = tolower(alias[index]);
-	}
+    for (index = 0; index < length; index++) {
+        convalias[index] = tolower(alias[index]);
+    }
 
-	convalias[length] = 0;
+    convalias[length] = 0;
 
-	l = 0;
-	r = list->num_in_list - 1;
-	if (r >= 0)
-	{
-		do
-		{
-			index = (l + r) >> 1;
-			diff = strncmp(convalias, list->sorted_list[index]->alias_name, length);
+    l = 0;
+    r = list->num_in_list - 1;
+    if (r >= 0) {
+        do {
+            index = (l + r) >> 1;
+            diff  = strncmp(convalias, list->sorted_list[index]->alias_name, length);
 
-			if (diff == 0)
-			{
-				break;
-			}
-			else if (diff > 0)
-			{
-				l = index + 1;
-			}
-			else
-			{
-				r = index - 1;
-			}
-		} while (r >= l);
+            if (diff == 0) {
+                break;
+            } else if (diff > 0) {
+                l = index + 1;
+            } else {
+                r = index - 1;
+            }
+        } while (r >= l);
 
-		if (r >= l)
-		{
-			numfound = 0;
-			*min_index = index;
-			*max_index = index;
-			totalfoundweight = 0.f;
+        if (r >= l) {
+            numfound         = 0;
+            *min_index       = index;
+            *max_index       = index;
+            totalfoundweight = 0.f;
 
-			ptr = &list->sorted_list[index];
-			for (i = index + 1; i > 0; i--, ptr--)
-			{
-				if (strncmp(convalias, (*ptr)->alias_name, length)) {
-					break;
-				}
+            ptr = &list->sorted_list[index];
+            for (i = index + 1; i > 0; i--, ptr--) {
+                if (strncmp(convalias, (*ptr)->alias_name, length)) {
+                    break;
+                }
 
-				if (numfound <= 63 && (*ptr)->alias_name[length] != '_')
-				{
-					foundlist[numfound++] = *ptr;
-					totalfoundweight += (*ptr)->weight;
-					*min_index = i - 1;
-				}
-			}
+                if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
+                    foundlist[numfound++] = *ptr;
+                    totalfoundweight += (*ptr)->weight;
+                    *min_index = i - 1;
+                }
+            }
 
-			ptr = &list->sorted_list[index + 1];
+            ptr = &list->sorted_list[index + 1];
 
-			for (i = index + 1; i < list->num_in_list; i++, ptr++)
-			{
-				if (strncmp(convalias, (*ptr)->alias_name, length)) {
-					break;
-				}
+            for (i = index + 1; i < list->num_in_list; i++, ptr++) {
+                if (strncmp(convalias, (*ptr)->alias_name, length)) {
+                    break;
+                }
 
-				if (numfound <= 63 && (*ptr)->alias_name[length] != '_')
-				{
-					foundlist[numfound++] = *ptr;
-					totalfoundweight += (*ptr)->weight;
-					*max_index = i;
-				}
-			}
+                if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
+                    foundlist[numfound++] = *ptr;
+                    totalfoundweight += (*ptr)->weight;
+                    *max_index = i;
+                }
+            }
 
-			if (numfound)
-			{
-				*total_weight = totalfoundweight;
-			}
-			else
-			{
-				*min_index = -1;
-				*max_index = -1;
-			}
-		}
-	}
+            if (numfound) {
+                *total_weight = totalfoundweight;
+            } else {
+                *min_index = -1;
+                *max_index = -1;
+            }
+        }
+    }
 }
 
-void Alias_ListDump(AliasList_t* list)
+void Alias_ListDump(AliasList_t *list)
 {
-	AliasListNode_t* ptr;
-	int i;
+    AliasListNode_t *ptr;
+    int              i;
 
-	if (list->dirty)
-		Alias_ListSort(list);
+    if (list->dirty) {
+        Alias_ListSort(list);
+    }
 
-	Com_DPrintf("Alias List: %s\n", list->name);
-	Com_DPrintf("Alias Name / Weight / Real Name\n");
+    Com_DPrintf("Alias List: %s\n", list->name);
+    Com_DPrintf("Alias Name / Weight / Real Name\n");
 
-	for (i = 0; i < list->num_in_list; ++i)
-	{
-		ptr = list->sorted_list[i];
-		Com_DPrintf("%32s %3.2f %s\n", ptr->alias_name, ptr->weight, ptr->real_name);
-	}
+    for (i = 0; i < list->num_in_list; ++i) {
+        ptr = list->sorted_list[i];
+        Com_DPrintf("%32s %3.2f %s\n", ptr->alias_name, ptr->weight, ptr->real_name);
+    }
 
-	Com_DPrintf("%d total aliases\n", list->num_in_list);
+    Com_DPrintf("%d total aliases\n", list->num_in_list);
 }
 
-const char* Alias_Find(const char* alias)
+const char *Alias_Find(const char *alias)
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	return Alias_ListFind(Aliases, alias);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    return Alias_ListFind(Aliases, alias);
 }
 
-qboolean Alias_Add(const char* alias, const char* name, const char* parameters)
+qboolean Alias_Add(const char *alias, const char *name, const char *parameters)
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	return Alias_ListAdd(Aliases, alias, name, parameters);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    return Alias_ListAdd(Aliases, alias, name, parameters);
 }
 
-qboolean Alias_Delete(const char* alias)
+qboolean Alias_Delete(const char *alias)
 {
-	return qtrue;
+    return qtrue;
 }
 
-const char* Alias_FindRandom(const char* alias, AliasListNode_t** ret)
+const char *Alias_FindRandom(const char *alias, AliasListNode_t **ret)
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	return Alias_ListFindRandom(Aliases, alias, ret);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    return Alias_ListFindRandom(Aliases, alias, ret);
 }
 
 void Alias_Dump()
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	Alias_ListDump(Aliases);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    Alias_ListDump(Aliases);
 }
 
 void Alias_Clear()
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	Alias_ListClear(Aliases);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    Alias_ListClear(Aliases);
 }
 
-AliasList_t* Alias_GetGlobalList()
+AliasList_t *Alias_GetGlobalList()
 {
-	return Aliases;
+    return Aliases;
 }

From a4d0a96ce51de627824f8fe6b0bb810e4edb5f25 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 19:52:29 +0100
Subject: [PATCH 1686/2040] Clear the camera jitter when ending the remote
 control

---
 code/fgame/vehicleturret.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 2b814bbe..9a64e883 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -1681,6 +1681,10 @@ void VehicleTurretGun::EndRemoteControl()
     m_iFiring           = 0;
     m_vTargetAngles     = m_vLocalAngles;
 
+    // Added in OPM
+    //  Clear the camera shake/jitter
+    m_fCurrViewJitter = 0;
+
     //
     // Added in OPM.
     //  The camera must be removed after ending the remote control.

From f86b495cc6982c798380112e29e9b6610b1e0db4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 19:53:31 +0100
Subject: [PATCH 1687/2040] Set all common renderer imports and add openmohaa
 imports after ioquake3 imports for more clarity

---
 code/renderergl1/tr_backend.c |  22 +++++++
 code/renderergl1/tr_bsp.c     |  10 +++
 code/renderergl1/tr_init.c    |  60 +++++++++++------
 code/renderergl1/tr_light.c   |   5 ++
 code/renderergl1/tr_local.h   |   4 ++
 code/renderergl1/tr_model.cpp |  11 ++++
 code/renderergl1/tr_shader.c  | 117 ++++++++++++++++++++++++++++++++++
 7 files changed, 211 insertions(+), 18 deletions(-)

diff --git a/code/renderergl1/tr_backend.c b/code/renderergl1/tr_backend.c
index bc01c233..2e6f2a2a 100644
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
@@ -1069,6 +1069,28 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, int componen
 	qglEnd ();
 }
 
+void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
+
+	GL_Bind( &tr.scratchImage[client] );
+
+	// if the scratchImage isn't in the format we want, specify it as a new texture
+	if ( cols != tr.scratchImage[client].width || rows != tr.scratchImage[client].height ) {
+		tr.scratchImage[client].width = tr.scratchImage[client].uploadWidth = cols;
+		tr.scratchImage[client].height = tr.scratchImage[client].uploadHeight = rows;
+		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, haveClampToEdge ? GL_CLAMP_TO_EDGE : GL_CLAMP );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, haveClampToEdge ? GL_CLAMP_TO_EDGE : GL_CLAMP );
+	} else {
+		if (dirty) {
+			// otherwise, just subimage upload it so that drivers can tell we are going to be changing
+			// it and don't try and do a texture compression
+			qglTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data );
+		}
+	}
+}
+
 /*
 =============
 RB_SetColor
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 8be03c29..2d224037 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -2176,6 +2176,16 @@ void R_LoadStaticModelIndexes(gamelump_t* lump) {
     }
 }
 
+/*
+=================
+R_GetEntityToken
+=================
+*/
+qboolean R_GetEntityToken( char *buffer, int size ) {
+    // Stub
+    return qfalse;
+}
+
 /*
 ==================
 R_LoadLump
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index 3aab4805..d49ce74b 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -1881,42 +1881,66 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 
 	re.Shutdown = RE_Shutdown;
 
-	re.FreeModels = RE_FreeModels;
 	re.BeginRegistration = RE_BeginRegistration;
-	re.EndRegistration = RE_EndRegistration;
 	re.RegisterModel = RE_RegisterModel;
-	re.SpawnEffectModel = RE_SpawnEffectModel;
-	re.RegisterServerModel = RE_RegisterServerModel;
-	re.UnregisterServerModel = RE_UnregisterServerModel;
+	re.RegisterSkin = RE_RegisterSkin;
 	re.RegisterShader = RE_RegisterShader;
 	re.RegisterShaderNoMip = RE_RegisterShaderNoMip;
-	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
 	re.LoadWorld = RE_LoadWorldMap;
-	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
-	re.MapVersion = RE_MapVersion;
-	re.LoadFont = R_LoadFont;
 	re.SetWorldVisData = RE_SetWorldVisData;
+	re.EndRegistration = RE_EndRegistration;
 
 	re.BeginFrame = RE_BeginFrame;
 	re.EndFrame = RE_EndFrame;
 
 	re.MarkFragments = R_MarkFragments;
-	re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
-	re.GetInlineModelBounds = R_GetInlineModelBounds;
-	re.GetLightingForDecal = R_GetLightingForDecal;
-	re.GetLightingForSmoke = R_GetLightingForSmoke;
-	re.R_GatherLightSources = R_GatherLightSources;
+	re.LerpTag = R_LerpTag;
 	re.ModelBounds = R_ModelBounds;
-	re.ModelRadius = R_ModelRadius;
 
 	re.ClearScene = RE_ClearScene;
 	re.AddRefEntityToScene = RE_AddRefEntityToScene;
-	re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
 	re.AddPolyToScene = RE_AddPolyToScene;
-	re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
+	re.LightForPoint = R_LightForPoint;
 	re.AddLightToScene = RE_AddLightToScene;
+	re.AddAdditiveLightToScene = RE_AddAdditiveLightToScene;
 	re.RenderScene = RE_RenderScene;
-	re.GetRenderEntity = RE_GetRenderEntity;
+
+	re.SetColor = RE_SetColor;
+	re.DrawStretchPic = RE_StretchPic;
+	re.DrawStretchRaw = RE_StretchRaw;
+	re.UploadCinematic = RE_UploadCinematic;
+
+	re.RegisterFont = RE_RegisterFont;
+	re.RemapShader = R_RemapShader;
+	re.GetEntityToken = R_GetEntityToken;
+	re.inPVS = R_inPVS;
+
+	re.TakeVideoFrame = RE_TakeVideoFrame;
+
+	//
+	// After ioquake3 imports
+	//
+
+    re.FreeModels = RE_FreeModels;
+	re.EndRegistration = RE_EndRegistration;
+    re.SpawnEffectModel = RE_SpawnEffectModel;
+    re.RegisterServerModel = RE_RegisterServerModel;
+    re.UnregisterServerModel = RE_UnregisterServerModel;
+	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
+	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
+	re.MapVersion = RE_MapVersion;
+    re.LoadFont = R_LoadFont;
+
+    re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
+    re.GetInlineModelBounds = R_GetInlineModelBounds;
+    re.GetLightingForDecal = R_GetLightingForDecal;
+    re.GetLightingForSmoke = R_GetLightingForSmoke;
+    re.R_GatherLightSources = R_GatherLightSources;
+    re.ModelRadius = R_ModelRadius;
+    re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
+    re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
+
+    re.GetRenderEntity = RE_GetRenderEntity;
 
 	re.SavePerformanceCounters = R_SavePerformanceCounters;
 
diff --git a/code/renderergl1/tr_light.c b/code/renderergl1/tr_light.c
index 7d076f34..c8587f86 100644
--- a/code/renderergl1/tr_light.c
+++ b/code/renderergl1/tr_light.c
@@ -1606,3 +1606,8 @@ qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst)
 
     return added;
 }
+
+int R_LightForPoint(vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir) {
+    // Stub
+    return 0;
+}
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index 03a2cdff..a7c20d0f 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -1836,6 +1836,7 @@ shader_t	*R_GetShaderByState( int index, long *cycleTime );
 void R_StartupShaders();
 void R_ShutdownShaders();
 void R_SetupShaders();
+shader_t *R_FindShaderByName( const char *name );
 void		R_ShaderList_f( void );
 void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
 
@@ -1995,6 +1996,7 @@ int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightI
 void R_ClearRealDlights();
 void R_UploadDlights();
 
+int R_LightForPoint(vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir);
 
 /*
 ============================================================
@@ -2495,6 +2497,8 @@ void RE_SaveJPG(char* filename, int quality, int image_width, int image_height,
     unsigned char* image_buffer, int padding);
 size_t RE_SaveJPGToBuffer(byte* buffer, size_t bufSize, int quality,
     int image_width, int image_height, byte* image_buffer, int padding);
+void RE_TakeVideoFrame( int width, int height,
+		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg );
 
 void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer);
 
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index 8ac7a97f..a33b8e49 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -2023,4 +2023,15 @@ void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, in
 
 	*render_tris = numtris;
 	*total_tris = totaltris;
+}
+
+/*
+==================
+R_LerpTag
+==================
+*/
+int R_LerpTag(orientation_t* tag, qhandle_t handle, int startFrame, int endFrame,
+	float frac, const char* tagName) {
+	// stub
+	return 0;
 }
\ No newline at end of file
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 27b526eb..35409bb1 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -130,6 +130,51 @@ static shadertext_t* FindShaderText(const char* name)
     return shader;
 }
 
+void R_RemapShader(const char *shaderName, const char *newShaderName, const char *timeOffset) {
+	char		strippedName[MAX_QPATH];
+	int			hash;
+	shader_t	*sh, *sh2;
+	qhandle_t	h;
+
+	sh = R_FindShaderByName( shaderName );
+	if (sh == NULL || sh == tr.defaultShader) {
+		h = RE_RegisterShaderLightMap(shaderName, 0);
+		sh = R_GetShaderByHandle(h);
+	}
+	if (sh == NULL || sh == tr.defaultShader) {
+		ri.Printf( PRINT_WARNING, "WARNING: R_RemapShader: shader %s not found\n", shaderName );
+		return;
+	}
+
+	sh2 = R_FindShaderByName( newShaderName );
+	if (sh2 == NULL || sh2 == tr.defaultShader) {
+		h = RE_RegisterShaderLightMap(newShaderName, 0);
+		sh2 = R_GetShaderByHandle(h);
+	}
+
+	if (sh2 == NULL || sh2 == tr.defaultShader) {
+		ri.Printf( PRINT_WARNING, "WARNING: R_RemapShader: new shader %s not found\n", newShaderName );
+		return;
+	}
+
+	// remap all the shaders with the given name
+	// even tho they might have different lightmaps
+	COM_StripExtension(shaderName, strippedName, sizeof(strippedName));
+	hash = generateHashValue(strippedName);
+	for (sh = hashTable[hash]; sh; sh = sh->next) {
+		if (Q_stricmp(sh->name, strippedName) == 0) {
+			if (sh != sh2) {
+				sh->remappedShader = sh2;
+			} else {
+				sh->remappedShader = NULL;
+			}
+		}
+	}
+	if (timeOffset) {
+		sh2->timeOffset = atof(timeOffset);
+	}
+}
+
 /*
 ===============
 ParseVector
@@ -3234,6 +3279,44 @@ static shader_t *FinishShader( void ) {
 
 //========================================================================================
 
+/*
+==================
+R_FindShaderByName
+
+Will always return a valid shader, but it might be the
+default shader if the real one can't be found.
+==================
+*/
+shader_t *R_FindShaderByName( const char *name ) {
+	char		strippedName[MAX_QPATH];
+	int			hash;
+	shader_t	*sh;
+
+	if ( (name==NULL) || (name[0] == 0) ) {
+		return tr.defaultShader;
+	}
+
+	COM_StripExtension(name, strippedName, sizeof(strippedName));
+
+	hash = generateHashValue(strippedName);
+
+	//
+	// see if the shader is already loaded
+	//
+	for (sh=hashTable[hash]; sh; sh=sh->next) {
+		// NOTE: if there was no shader or image available with the name strippedName
+		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
+		// have to check all default shaders otherwise for every call to R_FindShader
+		// with that same strippedName a new default shader is created.
+		if (Q_stricmp(sh->name, strippedName) == 0) {
+			// match found
+			return sh;
+		}
+	}
+
+	return tr.defaultShader;
+}
+
 /*
 ===============
 R_FindShader
@@ -3435,6 +3518,40 @@ shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage
 	return FinishShader();
 }
 
+
+/* 
+====================
+RE_RegisterShader
+
+This is the exported shader entry point for the rest of the system
+It will always return an index that will be valid.
+
+This should really only be used for explicit shaders, because there is no
+way to ask for different implicit lighting modes (vertex, lightmap, etc)
+====================
+*/
+qhandle_t RE_RegisterShaderLightMap( const char *name, int lightmapIndex ) {
+	shader_t	*sh;
+
+	if ( strlen( name ) >= MAX_QPATH ) {
+		ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+		return 0;
+	}
+
+	sh = R_FindShader( name, lightmapIndex, qtrue, qfalse, qfalse, qfalse );
+
+	// we want to return 0 if the shader failed to
+	// load for some reason, but R_FindShader should
+	// still keep a name allocated for it, so if
+	// something calls RE_RegisterShader again with
+	// the same name, we don't try looking for it again
+	if ( sh->defaultShader ) {
+		return 0;
+	}
+
+	return sh->index;
+}
+
 /* 
 ====================
 RE_RegisterShader

From 49b5c29c1105149d001d6270a83a7a4d2adf9231 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 20:20:43 +0100
Subject: [PATCH 1688/2040] Format renderergl1 source files

---
 code/renderergl1/CMakeLists.txt    |    1 -
 code/renderergl1/tr_font.cpp       |    2 +-
 code/renderergl1/tr_local.h        |   29 +-
 code/renderergl1/tr_model.cpp      | 2236 ++++++++++++++--------------
 code/renderergl1/tr_sky_portal.cpp |  162 +-
 code/renderergl1/tr_terrain.c      |    2 +-
 code/renderergl1/tr_util.cpp       |  467 +++---
 7 files changed, 1448 insertions(+), 1451 deletions(-)

diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
index ab89e2a4..fb2222a5 100644
--- a/code/renderergl1/CMakeLists.txt
+++ b/code/renderergl1/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.12)
 project(omohrenderergl1)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
-list(REMOVE_ITEM SOURCES_RENDERER "./tr_subs.c")
 
 set(SOURCES_RENDERER ${SOURCES_RENDERER}
 	"../tiki/tiki_mesh.cpp"
diff --git a/code/renderergl1/tr_font.cpp b/code/renderergl1/tr_font.cpp
index 5fe39d51..4d634018 100644
--- a/code/renderergl1/tr_font.cpp
+++ b/code/renderergl1/tr_font.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index a7c20d0f..a4ec1b53 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -1651,8 +1651,6 @@ extern  cvar_t* r_fps;
 
 void  R_NoiseInit( void );
 
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
 void R_RenderView( viewParms_t *parms );
 
 qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum);
@@ -2106,6 +2104,18 @@ float R_GetFontStringWidth(const fontheader_t* font, const char* s);
 /*
 =============================================================
 
+GHOST
+
+=============================================================
+*/
+
+void R_UpdateGhostTextures();
+void R_SetGhostImage(const char* name, image_t* image);
+void LoadGHOST(const char* name, byte** pic, int* width, int* height);
+
+/*
+=============================================================
+
 MARKS
 
 =============================================================
@@ -2230,6 +2240,7 @@ UTIL
 
 =============================================================
 */
+
 void RB_StreamBegin(shader_t* shader);
 void RB_StreamEnd(void);
 void RB_StreamBeginDrawSurf(void);
@@ -2246,23 +2257,13 @@ void RB_Texcoord2f(float s, float t);
 void RB_Texcoord2fv(vec2_t st);
 void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
 void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
 int RE_GetShaderWidth(qhandle_t hShader);
 int RE_GetShaderHeight(qhandle_t hShader);
 const char* RE_GetShaderName(qhandle_t hShader);
 const char* RE_GetModelName(qhandle_t hModel);
 
-/*
-=============================================================
-
-GHOST
-
-=============================================================
-*/
-
-void R_UpdateGhostTextures();
-void R_SetGhostImage(const char* name, image_t* image);
-void LoadGHOST(const char* name, byte** pic, int* width, int* height);
-
 /*
 =============================================================
 =============================================================
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index a33b8e49..a8009232 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -26,41 +26,43 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tiki.h"
 #include <vector.h>
 
-#define	LL(x) x=LittleLong(x)
+#define LL(x) x = LittleLong(x)
 
-qboolean g_bInfoworldtris = qfalse;
+qboolean   g_bInfoworldtris = qfalse;
 static int entityNumIndexes[MAX_ENTITIES];
 static int staticModelNumIndexes[4095];
 
-static int R_CullSkelModel(dtiki_t* tiki, refEntity_t* e, skelAnimFrame_t* newFrame, float fScale, float* vLocalOrg);
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg);
 
 /*
 ** R_GetModelByHandle
 */
-model_t	*R_GetModelByHandle( qhandle_t hModel ) {
-	model_t		*mod;
+model_t *R_GetModelByHandle(qhandle_t hModel)
+{
+    model_t *mod;
 
-	// out of range gets the default model
-	if( hModel < 1 || hModel >= tr.numModels ) {
-		return &tr.models[0];
-	}
+    // out of range gets the default model
+    if (hModel < 1 || hModel >= tr.numModels) {
+        return &tr.models[0];
+    }
 
-	mod = &tr.models[hModel];
+    mod = &tr.models[hModel];
 
-	return mod;
+    return mod;
 }
 
 /*
 ** R_Model_GetHandle
 */
-dtiki_t	*R_Model_GetHandle( qhandle_t handle ) {
-	model_t		*model = R_GetModelByHandle( handle );
+dtiki_t *R_Model_GetHandle(qhandle_t handle)
+{
+    model_t *model = R_GetModelByHandle(handle);
 
-	if( model->type == MOD_TIKI ) {
-		return model->d.tiki;
-	}
+    if (model->type == MOD_TIKI) {
+        return model->d.tiki;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 //===============================================================================
@@ -68,236 +70,238 @@ dtiki_t	*R_Model_GetHandle( qhandle_t handle ) {
 /*
 ** R_FreeModel
 */
-void R_FreeModel( model_t *mod ) {
-	if( mod->type == MOD_TIKI ) {
-		ri.CG_EndTiki( mod->d.tiki );
-	}
+void R_FreeModel(model_t *mod)
+{
+    if (mod->type == MOD_TIKI) {
+        ri.CG_EndTiki(mod->d.tiki);
+    }
 
-	memset( mod, 0, sizeof( model_t ) );
+    memset(mod, 0, sizeof(model_t));
 }
 
 /*
 ** R_AllocModel
 */
-model_t *R_AllocModel( void ) {
-	int i;
+model_t *R_AllocModel(void)
+{
+    int i;
 
-	for( i = 0; i < tr.numModels; i++ )
-	{
-		if( !tr.models[ i ].name[ 0 ] ) {
-			break;
-		}
-	}
+    for (i = 0; i < tr.numModels; i++) {
+        if (!tr.models[i].name[0]) {
+            break;
+        }
+    }
 
-	if( i == tr.numModels ) {
-		if( i == MAX_MOD_KNOWN ) {
-			return NULL;
-		}
-		tr.numModels++;
-	}
+    if (i == tr.numModels) {
+        if (i == MAX_MOD_KNOWN) {
+            return NULL;
+        }
+        tr.numModels++;
+    }
 
-	tr.models[ i ].index = i;
+    tr.models[i].index = i;
 
-	return &tr.models[ i ];
+    return &tr.models[i];
 }
 
 /*
 ** RE_FreeModels
 */
-void RE_FreeModels( void ) {
-	int		hModel;
+void RE_FreeModels(void)
+{
+    int hModel;
 
-	for( hModel = 0; hModel < tr.numModels; hModel++ )
-	{
-		if( !tr.models[ hModel ].name[ 0 ] ) {
-			continue;
-		}
+    for (hModel = 0; hModel < tr.numModels; hModel++) {
+        if (!tr.models[hModel].name[0]) {
+            continue;
+        }
 
-		R_FreeModel( &tr.models[ hModel ] );
-	}
+        R_FreeModel(&tr.models[hModel]);
+    }
 }
 
 /*
 ** R_RegisterShaders
 */
-void R_RegisterShaders( model_t *mod ) {
-	dtiki_t			*tiki;
-	int				i, j;
-	dtikisurface_t	*psurface;
-	shader_t		*sh;
+void R_RegisterShaders(model_t *mod)
+{
+    dtiki_t        *tiki;
+    int             i, j;
+    dtikisurface_t *psurface;
+    shader_t       *sh;
 
-	tiki = mod->d.tiki;
+    tiki = mod->d.tiki;
 
-	for( i = 0; i < tiki->num_surfaces; i++ )
-	{
-		psurface = &tiki->surfaces[ i ];
+    for (i = 0; i < tiki->num_surfaces; i++) {
+        psurface = &tiki->surfaces[i];
 
-		assert( psurface->numskins <= MAX_TIKI_SHADER );
-		for( j = 0; j < psurface->numskins; j++ )
-		{
-			if( psurface->shader[ j ][ 0 ] ) {
-				sh = R_FindShader( psurface->shader[ j ], LIGHTMAP_NONE, !( psurface->flags & TIKI_SURF_NOMIPMAPS), r_picmip->integer, qtrue, qtrue );
-				psurface->hShader[ j ] = sh->index;
-			} else {
-				psurface->hShader[ j ] = 0;
-			}
-		}
-	}
+        assert(psurface->numskins <= MAX_TIKI_SHADER);
+        for (j = 0; j < psurface->numskins; j++) {
+            if (psurface->shader[j][0]) {
+                sh = R_FindShader(
+                    psurface->shader[j],
+                    LIGHTMAP_NONE,
+                    !(psurface->flags & TIKI_SURF_NOMIPMAPS),
+                    r_picmip->integer,
+                    qtrue,
+                    qtrue
+                );
+                psurface->hShader[j] = sh->index;
+            } else {
+                psurface->hShader[j] = 0;
+            }
+        }
+    }
 }
 
 /*
 ** RE_UnregisterServerModel
 */
-void RE_UnregisterServerModel( qhandle_t hModel ) {
-	if( hModel < 0 || hModel >= MAX_MOD_KNOWN ) {
-		return;
-	}
+void RE_UnregisterServerModel(qhandle_t hModel)
+{
+    if (hModel < 0 || hModel >= MAX_MOD_KNOWN) {
+        return;
+    }
 
-	if( tr.models[ hModel ].serveronly ) {
-		R_FreeModel( &tr.models[ hModel ] );
-	}
+    if (tr.models[hModel].serveronly) {
+        R_FreeModel(&tr.models[hModel]);
+    }
 }
 
 /*
 ** R_RegisterModelInternal
 */
-static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki, qboolean use ) {
-	model_t		*mod;
-	qhandle_t	hModel;
-	const char	*ptr;
+static qhandle_t R_RegisterModelInternal(const char *name, qboolean bBeginTiki, qboolean use)
+{
+    model_t    *mod;
+    qhandle_t   hModel;
+    const char *ptr;
 
-	if( !name || !*name )
-	{
-		ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
-		return 0;
-	}
+    if (!name || !*name) {
+        ri.Printf(PRINT_ALL, "RE_RegisterModel: NULL name\n");
+        return 0;
+    }
 
-	if( strlen( name ) >= 128 )
-	{
-		Com_Printf( "Model name exceeds MAX_MODEL_NAME\n" );
-		return 0;
-	}
+    if (strlen(name) >= 128) {
+        Com_Printf("Model name exceeds MAX_MODEL_NAME\n");
+        return 0;
+    }
 
-	//
-	// search the currently loaded models
-	//
-	for( hModel = 1; hModel < tr.numModels; hModel++ ) {
-		mod = &tr.models[ hModel ];
-		if( !Q_stricmp( mod->name, name ) ) {
-			if( mod->type == MOD_BAD ) {
-				return 0;
-			}
-			return hModel;
-		}
-	}
+    //
+    // search the currently loaded models
+    //
+    for (hModel = 1; hModel < tr.numModels; hModel++) {
+        mod = &tr.models[hModel];
+        if (!Q_stricmp(mod->name, name)) {
+            if (mod->type == MOD_BAD) {
+                return 0;
+            }
+            return hModel;
+        }
+    }
 
-	// allocate a new model_t
+    // allocate a new model_t
 
-	if( ( mod = R_AllocModel() ) == NULL ) {
-		ri.Printf( PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name );
-		return 0;
-	}
+    if ((mod = R_AllocModel()) == NULL) {
+        ri.Printf(PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
+        return 0;
+    }
 
-	// only set the name after the model has been successfully loaded
-	Q_strncpyz( mod->name, name, sizeof( mod->name ) );
+    // only set the name after the model has been successfully loaded
+    Q_strncpyz(mod->name, name, sizeof(mod->name));
 
+    // make sure the render thread is stopped
+    R_IssuePendingRenderCommands();
 
-	// make sure the render thread is stopped
-	R_IssuePendingRenderCommands();
+    mod->serveronly = qtrue;
 
-	mod->serveronly = qtrue;
+    //
+    // load the files
+    //
+    ptr = strrchr(name, '.');
 
-	//
-	// load the files
-	//
-	ptr = strrchr( name, '.' );
+    if (ptr) {
+        ptr++;
 
-	if( ptr )
-	{
-		ptr++;
+        if (!stricmp(ptr, "spr")) {
+            mod->d.sprite = SPR_RegisterSprite(name);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
 
-		if( !stricmp( ptr, "spr" ) )
-		{
-			mod->d.sprite = SPR_RegisterSprite( name );
-			Q_strncpyz( mod->name, name, sizeof( mod->name ) );
+            if (mod->d.sprite) {
+                mod->type = MOD_SPRITE;
+                return mod->index;
+            }
+        } else if (!stricmp(ptr, "tik")) {
+            mod->d.tiki = ri.TIKI_RegisterTikiFlags(name, use);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
 
-			if( mod->d.sprite )
-			{
-				mod->type = MOD_SPRITE;
-				return mod->index;
-			}
-		}
-		else if( !stricmp( ptr, "tik" ) )
-		{
-			mod->d.tiki = ri.TIKI_RegisterTikiFlags( name, use );
-			Q_strncpyz( mod->name, name, sizeof( mod->name ) );
+            if (mod->d.tiki) {
+                mod->type = MOD_TIKI;
+                R_RegisterShaders(mod);
 
-			if( mod->d.tiki )
-			{
-				mod->type = MOD_TIKI;
-				R_RegisterShaders( mod );
+                if (bBeginTiki) {
+                    ri.CG_ProcessInitCommands(mod->d.tiki, NULL);
+                }
 
-				if( bBeginTiki ) {
-					ri.CG_ProcessInitCommands( mod->d.tiki, NULL );
-				}
+                return mod->index;
+            }
+        }
+    }
 
-				return mod->index;
-			}
-		}
-	}
+    ri.Printf(PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name);
+    mod->type = MOD_BAD;
 
-	ri.Printf( PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name );
-	mod->type = MOD_BAD;
-
-	return 0;
+    return 0;
 }
 
 /*
 ** RE_RegisterServerModel
 */
-qhandle_t RE_RegisterServerModel( const char *name ) {
-	return R_RegisterModelInternal( name, qtrue, qfalse );
+qhandle_t RE_RegisterServerModel(const char *name)
+{
+    return R_RegisterModelInternal(name, qtrue, qfalse);
 }
 
 /*
 ** RE_SpawnEffectModel
 */
-qhandle_t RE_SpawnEffectModel( const char *szModel, vec3_t vPos, vec3_t *axis ) {
-	refEntity_t		new_entity;
+qhandle_t RE_SpawnEffectModel(const char *szModel, vec3_t vPos, vec3_t *axis)
+{
+    refEntity_t new_entity;
 
-	memset( &new_entity, 0, sizeof( refEntity_t ) );
-	memset( &new_entity.shaderRGBA, 255, sizeof( byte ) * 4 );
+    memset(&new_entity, 0, sizeof(refEntity_t));
+    memset(&new_entity.shaderRGBA, 255, sizeof(byte) * 4);
 
-	VectorCopy( vPos, new_entity.origin );
-	new_entity.scale = 1.0;
+    VectorCopy(vPos, new_entity.origin);
+    new_entity.scale = 1.0;
 
-	if( axis ) {
-		AxisCopy( axis, new_entity.axis );
-	}
+    if (axis) {
+        AxisCopy(axis, new_entity.axis);
+    }
 
-	new_entity.hModel = R_RegisterModelInternal( szModel, qfalse, qtrue );
+    new_entity.hModel = R_RegisterModelInternal(szModel, qfalse, qtrue);
 
-	if( new_entity.hModel )
-	{
-		tr.models[ new_entity.hModel ].serveronly = qfalse;
-		ri.CG_ProcessInitCommands( tr.models[ new_entity.hModel ].d.tiki, &new_entity );
-	}
+    if (new_entity.hModel) {
+        tr.models[new_entity.hModel].serveronly = qfalse;
+        ri.CG_ProcessInitCommands(tr.models[new_entity.hModel].d.tiki, &new_entity);
+    }
 
-	return new_entity.hModel;
+    return new_entity.hModel;
 }
 
 /*
 ** RE_RegisterModel
 */
-qhandle_t RE_RegisterModel( const char *name ) {
-	qhandle_t		handle;
+qhandle_t RE_RegisterModel(const char *name)
+{
+    qhandle_t handle;
 
-	handle = R_RegisterModelInternal( name, qtrue, qtrue );
+    handle = R_RegisterModelInternal(name, qtrue, qtrue);
 
-	if( handle ) {
-		tr.models[ handle ].serveronly = qfalse;
-	}
-	return handle;
+    if (handle) {
+        tr.models[handle].serveronly = qfalse;
+    }
+    return handle;
 }
 
 //=============================================================================
@@ -307,34 +311,35 @@ qhandle_t RE_RegisterModel( const char *name ) {
 R_ModelInit
 ===============
 */
-void R_ModelInit( void ) {
-	model_t		*mod;
-	int			i;
+void R_ModelInit(void)
+{
+    model_t *mod;
+    int      i;
 
-	// leave a space for NULL model
-	tr.numModels = 0;
+    // leave a space for NULL model
+    tr.numModels = 0;
 
-	mod = R_AllocModel();
-	Q_strncpyz( mod->name, "** BAD MODEL **", sizeof( mod->name ) );
-	mod->type = MOD_BAD;
+    mod = R_AllocModel();
+    Q_strncpyz(mod->name, "** BAD MODEL **", sizeof(mod->name));
+    mod->type = MOD_BAD;
 
-	for (i = 0; i < sizeof(tr.skel_index) / sizeof(tr.skel_index[0]); i++) {
-		tr.skel_index[i] = -1;
-	}
+    for (i = 0; i < ARRAY_LEN(tr.skel_index); i++) {
+        tr.skel_index[i] = -1;
+    }
 }
 
-
 /*
 ================
 R_Modellist_f
 ================
 */
-void R_Modellist_f( void ) {
-	int		i;
+void R_Modellist_f(void)
+{
+    int i;
 
-	for( i = 1; i < tr.numModels; i++ ) {
-		ri.Printf( PRINT_ALL, "%s\n", tr.models[ i ].name );
-	}
+    for (i = 1; i < tr.numModels; i++) {
+        ri.Printf(PRINT_ALL, "%s\n", tr.models[i].name);
+    }
 }
 
 /*
@@ -342,51 +347,51 @@ void R_Modellist_f( void ) {
 R_ModelRadius
 ====================
 */
-float R_ModelRadius( qhandle_t handle ) {
-	int				j;
-	vec3_t			bounds[ 2 ];
-	model_t			*model;
-	float			radius, maxRadius;
-	vec3_t			tmpVec;
-	float			w;
+float R_ModelRadius(qhandle_t handle)
+{
+    int      j;
+    vec3_t   bounds[2];
+    model_t *model;
+    float    radius, maxRadius;
+    vec3_t   tmpVec;
+    float    w;
 
-	model = R_GetModelByHandle( handle );
+    model = R_GetModelByHandle(handle);
 
-	switch( model->type )
-	{
-	case MOD_BRUSH:
-		maxRadius = 0.0;
+    switch (model->type) {
+    case MOD_BRUSH:
+        maxRadius = 0.0;
 
-		VectorCopy( model->d.bmodel->bounds[ 0 ], bounds[ 0 ] );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], bounds[ 1 ] );
+        VectorCopy(model->d.bmodel->bounds[0], bounds[0]);
+        VectorCopy(model->d.bmodel->bounds[1], bounds[1]);
 
-		for( j = 0; j < 8; j++ ) {
-			tmpVec[ 0 ] = bounds[ j & 1 ? 1 : 0 ][ 0 ];
-			tmpVec[ 1 ] = bounds[ j & 2 ? 1 : 0 ][ 1 ];
-			tmpVec[ 2 ] = bounds[ j & 4 ? 1 : 0 ][ 2 ];
+        for (j = 0; j < 8; j++) {
+            tmpVec[0] = bounds[j & 1 ? 1 : 0][0];
+            tmpVec[1] = bounds[j & 2 ? 1 : 0][1];
+            tmpVec[2] = bounds[j & 4 ? 1 : 0][2];
 
-			radius = VectorLength( tmpVec );
+            radius = VectorLength(tmpVec);
 
-			if( maxRadius < radius ) {
-				maxRadius = radius;
-			}
-		}
-		break;
-	case MOD_TIKI:
-		return ri.TIKI_GlobalRadius( model->d.tiki );
-	case MOD_SPRITE:
-		maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		w = model->d.sprite->height * model->d.sprite->scale * 0.5;
+            if (maxRadius < radius) {
+                maxRadius = radius;
+            }
+        }
+        break;
+    case MOD_TIKI:
+        return ri.TIKI_GlobalRadius(model->d.tiki);
+    case MOD_SPRITE:
+        maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        w         = model->d.sprite->height * model->d.sprite->scale * 0.5;
 
-		if( maxRadius <= w ) {
-			maxRadius = w;
-		}
-		break;
-	default:
-		maxRadius = 0.0;
-	}
+        if (maxRadius <= w) {
+            maxRadius = w;
+        }
+        break;
+    default:
+        maxRadius = 0.0;
+    }
 
-	return maxRadius;
+    return maxRadius;
 }
 
 /*
@@ -394,34 +399,34 @@ float R_ModelRadius( qhandle_t handle ) {
 R_ModelBounds
 ====================
 */
-void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
-	model_t		*model;
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs)
+{
+    model_t *model;
 
-	model = R_GetModelByHandle( handle );
+    model = R_GetModelByHandle(handle);
 
-	switch( model->type )
-	{
-	default:
-	case MOD_BAD:
-		VectorClear( mins );
-		VectorClear( maxs );
-		break;
-	case MOD_BRUSH:
-		VectorCopy( model->d.bmodel->bounds[ 0 ], mins );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], maxs );
-		break;
-	case MOD_TIKI:
-		ri.TIKI_CalculateBounds( model->d.tiki, 1.0, mins, maxs );
-		break;
-	case MOD_SPRITE:
-		mins[ 0 ] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
-		mins[ 1 ] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
-		mins[ 2 ] = -0.0;
-		maxs[ 0 ] = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		maxs[ 1 ] = model->d.sprite->height * model->d.sprite->scale * 0.5;
-		maxs[ 2 ] = 0.0;
-		break;
-	}
+    switch (model->type) {
+    default:
+    case MOD_BAD:
+        VectorClear(mins);
+        VectorClear(maxs);
+        break;
+    case MOD_BRUSH:
+        VectorCopy(model->d.bmodel->bounds[0], mins);
+        VectorCopy(model->d.bmodel->bounds[1], maxs);
+        break;
+    case MOD_TIKI:
+        ri.TIKI_CalculateBounds(model->d.tiki, 1.0, mins, maxs);
+        break;
+    case MOD_SPRITE:
+        mins[0] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
+        mins[1] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
+        mins[2] = -0.0;
+        maxs[0] = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        maxs[1] = model->d.sprite->height * model->d.sprite->scale * 0.5;
+        maxs[2] = 0.0;
+        break;
+    }
 }
 
 #if 0
@@ -464,51 +469,38 @@ const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
 GetLodCutoff
 ====================
 */
-int GetLodCutoff( skelHeaderGame_t *skelmodel, float lod_val, int renderfx ) {
-	lodControl_t	*LOD;
-	float			f;
-	float			fLODCap;
+int GetLodCutoff(skelHeaderGame_t *skelmodel, float lod_val, int renderfx)
+{
+    lodControl_t *LOD;
+    float         f;
+    float         fLODCap;
 
-	LOD = skelmodel->pLOD;
+    LOD = skelmodel->pLOD;
 
-	if( renderfx & RF_DEPTHHACK )
-	{
-		fLODCap = LOD->maxMetric + ( LOD->minMetric - LOD->maxMetric ) * r_lodviewmodelcap->value;
-	}
-	else
-	{
-		f = ( LOD->minMetric - LOD->maxMetric ) * r_lodcap->value + LOD->maxMetric;
-		fLODCap = ( lod_val - LOD->maxMetric ) * r_lodscale->value + LOD->maxMetric;
+    if (renderfx & RF_DEPTHHACK) {
+        fLODCap = LOD->maxMetric + (LOD->minMetric - LOD->maxMetric) * r_lodviewmodelcap->value;
+    } else {
+        f       = (LOD->minMetric - LOD->maxMetric) * r_lodcap->value + LOD->maxMetric;
+        fLODCap = (lod_val - LOD->maxMetric) * r_lodscale->value + LOD->maxMetric;
 
-		if( fLODCap > f ) {
-			fLODCap = f;
-		}
-	}
+        if (fLODCap > f) {
+            fLODCap = f;
+        }
+    }
 
-	if( fLODCap >= LOD->minMetric || !r_uselod->integer )
-	{
-		return LOD->curve[ 0 ].val;
-	}
-	else if( fLODCap <= LOD->maxMetric )
-	{
-		return LOD->curve[ 4 ].val;
-	}
-	else if( fLODCap <= LOD->consts[ 3 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 3 ].scale + LOD->consts[ 3 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 2 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 2 ].scale + LOD->consts[ 2 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 1 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 1 ].scale + LOD->consts[ 1 ].base;
-	}
-	else
-	{
-		return fLODCap * LOD->consts[ 0 ].scale + LOD->consts[ 0 ].base;
-	}
+    if (fLODCap >= LOD->minMetric || !r_uselod->integer) {
+        return LOD->curve[0].val;
+    } else if (fLODCap <= LOD->maxMetric) {
+        return LOD->curve[4].val;
+    } else if (fLODCap <= LOD->consts[3].cutoff) {
+        return fLODCap * LOD->consts[3].scale + LOD->consts[3].base;
+    } else if (fLODCap <= LOD->consts[2].cutoff) {
+        return fLODCap * LOD->consts[2].scale + LOD->consts[2].base;
+    } else if (fLODCap <= LOD->consts[1].cutoff) {
+        return fLODCap * LOD->consts[1].scale + LOD->consts[1].base;
+    } else {
+        return fLODCap * LOD->consts[0].scale + LOD->consts[0].base;
+    }
 }
 
 /*
@@ -532,62 +524,59 @@ static void R_SaveLODFile(const char *path, lodControl_t *LOD)
 GetToolLodCutoff
 ====================
 */
-int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
-	lodControl_t	*LOD;
-	float			totalRange;
-	int				i;
-	char			lodPath[ 256 ];
-	char			*ext;
+int GetToolLodCutoff(skelHeaderGame_t *skelmodel, float lod_val)
+{
+    lodControl_t *LOD;
+    float         totalRange;
+    int           i;
+    char          lodPath[256];
+    char         *ext;
 
-	LOD = skelmodel->pLOD;
-	totalRange = 0.0;
-	for( i = 0; i < 10; i++ )
-	{
-		if( skelmodel->lodIndex[ i ] > 0 ) {
-			totalRange = skelmodel->lodIndex[ i ];
-			break;
-		}
-	}
+    LOD        = skelmodel->pLOD;
+    totalRange = 0.0;
+    for (i = 0; i < 10; i++) {
+        if (skelmodel->lodIndex[i] > 0) {
+            totalRange = skelmodel->lodIndex[i];
+            break;
+        }
+    }
 
-	if( lod_save->integer == 1 )
-	{
-		ri.Cvar_Set( "lod_save", "0" );
-		Q_strncpyz( lodPath, ri.TIKI_FindSkelByHeader( skelmodel )->path, sizeof( lodPath ) );
-		ext = strstr( lodPath, "skd" );
-		strcpy( ext, "lod" );
-		R_SaveLODFile( lodPath, LOD );
-	}
+    if (lod_save->integer == 1) {
+        ri.Cvar_Set("lod_save", "0");
+        Q_strncpyz(lodPath, ri.TIKI_FindSkelByHeader(skelmodel)->path, sizeof(lodPath));
+        ext = strstr(lodPath, "skd");
+        strcpy(ext, "lod");
+        R_SaveLODFile(lodPath, LOD);
+    }
 
-	if( lod_mesh->modified )
-	{
-		lod_mesh->modified = qfalse;
-		ri.Cvar_Set( "lod_minLOD", va( "%f", LOD->minMetric ) );
-		ri.Cvar_Set( "lod_maxLOD", va( "%f", LOD->maxMetric ) );
-		ri.Cvar_Set( "lod_LOD_slider", va( "%f", 0.5 ) );
-		ri.Cvar_Set( "lod_curve_0_slider", va( "%f", LOD->curve[ 0 ].val / totalRange ) );
-		ri.Cvar_Set( "lod_curve_1_slider", va( "%f", LOD->curve[ 1 ].val / totalRange ) );
-		ri.Cvar_Set( "lod_curve_2_slider", va( "%f", LOD->curve[ 2 ].val / totalRange ) );
-		ri.Cvar_Set( "lod_curve_3_slider", va( "%f", LOD->curve[ 3 ].val / totalRange ) );
-		ri.Cvar_Set( "lod_curve_4_slider", va( "%f", LOD->curve[ 4 ].val / totalRange ) );
-	}
+    if (lod_mesh->modified) {
+        lod_mesh->modified = qfalse;
+        ri.Cvar_Set("lod_minLOD", va("%f", LOD->minMetric));
+        ri.Cvar_Set("lod_maxLOD", va("%f", LOD->maxMetric));
+        ri.Cvar_Set("lod_LOD_slider", va("%f", 0.5));
+        ri.Cvar_Set("lod_curve_0_slider", va("%f", LOD->curve[0].val / totalRange));
+        ri.Cvar_Set("lod_curve_1_slider", va("%f", LOD->curve[1].val / totalRange));
+        ri.Cvar_Set("lod_curve_2_slider", va("%f", LOD->curve[2].val / totalRange));
+        ri.Cvar_Set("lod_curve_3_slider", va("%f", LOD->curve[3].val / totalRange));
+        ri.Cvar_Set("lod_curve_4_slider", va("%f", LOD->curve[4].val / totalRange));
+    }
 
+    ri.Cvar_Set("lod_curve_0_val", va("%f", lod_curve_0_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_1_val", va("%f", lod_curve_1_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_2_val", va("%f", lod_curve_2_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_3_val", va("%f", lod_curve_3_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_4_val", va("%f", lod_curve_4_slider->value * totalRange));
 
-	ri.Cvar_Set( "lod_curve_0_val", va( "%f", lod_curve_0_slider->value * totalRange ) );
-	ri.Cvar_Set( "lod_curve_1_val", va( "%f", lod_curve_1_slider->value * totalRange ) );
-	ri.Cvar_Set( "lod_curve_2_val", va( "%f", lod_curve_2_slider->value * totalRange ) );
-	ri.Cvar_Set( "lod_curve_3_val", va( "%f", lod_curve_3_slider->value * totalRange ) );
-	ri.Cvar_Set( "lod_curve_4_val", va( "%f", lod_curve_4_slider->value * totalRange ) );
+    LOD->minMetric    = lod_minLOD->value;
+    LOD->maxMetric    = lod_maxLOD->value;
+    LOD->curve[0].val = lod_curve_0_val->value;
+    LOD->curve[1].val = lod_curve_1_val->value;
+    LOD->curve[2].val = lod_curve_2_val->value;
+    LOD->curve[3].val = lod_curve_3_val->value;
+    LOD->curve[4].val = lod_curve_4_val->value;
 
-	LOD->minMetric = lod_minLOD->value;
-	LOD->maxMetric = lod_maxLOD->value;
-	LOD->curve[ 0 ].val = lod_curve_0_val->value;
-	LOD->curve[ 1 ].val = lod_curve_1_val->value;
-	LOD->curve[ 2 ].val = lod_curve_2_val->value;
-	LOD->curve[ 3 ].val = lod_curve_3_val->value;
-	LOD->curve[ 4 ].val = lod_curve_4_val->value;
-
-	ri.TIKI_CalcLodConsts( LOD );
-	return GetLodCutoff( skelmodel, lod_val, 0 );
+    ri.TIKI_CalcLodConsts(LOD);
+    return GetLodCutoff(skelmodel, lod_val, 0);
 }
 
 /*
@@ -595,21 +584,21 @@ int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
 R_GetTagPositionAndOrientation
 ==============
 */
-orientation_t R_GetTagPositionAndOrientation( refEntity_t *ent, int tagnum ) {
-	int i;
-	orientation_t tag_or, new_or;
+orientation_t R_GetTagPositionAndOrientation(refEntity_t *ent, int tagnum)
+{
+    int           i;
+    orientation_t tag_or, new_or;
 
-	tag_or = RE_TIKI_Orientation( ent, tagnum );
+    tag_or = RE_TIKI_Orientation(ent, tagnum);
 
-	VectorCopy( ent->origin, new_or.origin );
+    VectorCopy(ent->origin, new_or.origin);
 
-	for( i = 0; i < 3; i++ )
-	{
-		VectorMA( new_or.origin, tag_or.origin[ i ], ent->axis[ i ], new_or.origin );
-	}
+    for (i = 0; i < 3; i++) {
+        VectorMA(new_or.origin, tag_or.origin[i], ent->axis[i], new_or.origin);
+    }
 
-	MatrixMultiply( tag_or.axis, ent->axis, new_or.axis );
-	return new_or;
+    MatrixMultiply(tag_or.axis, ent->axis, new_or.axis);
+    return new_or;
 }
 
 /*
@@ -617,41 +606,42 @@ orientation_t R_GetTagPositionAndOrientation( refEntity_t *ent, int tagnum ) {
 RB_DrawSkeletor
 ==============
 */
-void RB_DrawSkeletor(trRefEntity_t* ent) {
-	int i;
-	dtiki_t		*tiki;
-	skeletor_c	*skeletor;
+void RB_DrawSkeletor(trRefEntity_t *ent)
+{
+    int         i;
+    dtiki_t    *tiki;
+    skeletor_c *skeletor;
 
-	tiki = R_Model_GetHandle( ent->e.hModel );
-	skeletor = ( skeletor_c * )ri.TIKI_GetSkeletor( tiki, ENTITYNUM_NONE );
+    tiki     = R_Model_GetHandle(ent->e.hModel);
+    skeletor = (skeletor_c *)ri.TIKI_GetSkeletor(tiki, ENTITYNUM_NONE);
 
-	if( r_showSkeleton->integer == 1 ) {
-		//vec3_t vForward, vRight, vUp;
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
+    if (r_showSkeleton->integer == 1) {
+        //vec3_t vForward, vRight, vUp;
+        orientation_t ori;
+        orientation_t parent_or;
+        int           iParentBone;
 
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
+        qglLineWidth(3);
+        qglBegin(GL_LINES);
 
-		for( i = 0; i < ri.TIKI_GetNumChannels(tiki); i++ ) { // draw a skeleton
+        for (i = 0; i < ri.TIKI_GetNumChannels(tiki); i++) { // draw a skeleton
 
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-			iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
+            ori         = R_GetTagPositionAndOrientation(&ent->e, i);
+            iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
 
-			if( iParentBone != -1 ) {
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-			} else {
-				VectorCopy( ent->e.origin, parent_or.origin );
-				AxisCopy( ent->e.axis, parent_or.axis );
-			}
+            if (iParentBone != -1) {
+                parent_or = R_GetTagPositionAndOrientation(&ent->e, iParentBone);
+            } else {
+                VectorCopy(ent->e.origin, parent_or.origin);
+                AxisCopy(ent->e.axis, parent_or.axis);
+            }
 
             qglColor3f(1, 1, 1);
             qglVertex3fv(parent_or.origin);
             qglVertex3fv(ori.origin);
 
-			// draw bone axis
-			/*glColor3f( 1, 0, 0 );
+            // draw bone axis
+            /*glColor3f( 1, 0, 0 );
 			glVertex3fv( parent_or.origin );
 			VectorAdd( parent_or.origin, parent_or.axis[ 0 ], vForward );
 			glVertex3fv( vForward );
@@ -671,130 +661,124 @@ void RB_DrawSkeletor(trRefEntity_t* ent) {
 			glVertex3fv( vUp );
 			glVertex3fv( vUp );
 			glVertex3fv( ori.origin );*/
+        }
+        qglEnd();
+        qglLineWidth(1);
+    } else if (r_showSkeleton->integer == 2) { // draw skeleton with bones
+        orientation_t ori;
+        orientation_t parent_or;
+        int           iParentBone;
 
-		}
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-	else if( r_showSkeleton->integer == 2 ) { // draw skeleton with bones
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
+        qglLineWidth(3);
+        qglBegin(GL_LINES);
+        for (i = 0; i < ri.TIKI_GetNumChannels(tiki); i++) {
+            iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
 
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-		for( i = 0; i < ri.TIKI_GetNumChannels(tiki); i++ ) {
-			iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
+            if (iParentBone > 0) {
+                ori       = R_GetTagPositionAndOrientation(&ent->e, i);
+                parent_or = R_GetTagPositionAndOrientation(&ent->e, iParentBone);
+                qglColor3f(1, 1, 1);
+                qglVertex3fv(parent_or.origin);
+                qglVertex3fv(ori.origin);
+            }
+        }
+        qglEnd();
 
-			if( iParentBone > 0 )	{
-				ori = R_GetTagPositionAndOrientation( &ent->e, i );
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-				qglColor3f( 1, 1, 1 );
-				qglVertex3fv( parent_or.origin );
-				qglVertex3fv( ori.origin );
-			}
+        qglBegin(GL_LINES);
+        for (i = 0; i < ri.TIKI_GetNumChannels(tiki); i++) {
+            vec3_t up, down, front;
+            ori = R_GetTagPositionAndOrientation(&ent->e, i);
 
-		}
-		qglEnd();
+            VectorCopy(ori.origin, up);
+            up[1] += 5;
+            VectorCopy(ori.origin, down);
+            down[1] += 5;
+            VectorCopy(ori.origin, front);
+            front[0] += 5;
 
-		qglBegin( GL_LINES );
-		for( i = 0; i < ri.TIKI_GetNumChannels(tiki); i++ ) {
-			vec3_t up, down, front;
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
+            qglColor3f(1, 0, 1);
+            qglVertex3fv(front);
+            qglVertex3fv(ori.origin);
+            qglVertex3fv(down);
+            qglVertex3fv(ori.origin);
+            qglVertex3fv(up);
+            qglVertex3fv(ori.origin);
+        }
 
-			VectorCopy( ori.origin, up );
-			up[ 1 ] += 5;
-			VectorCopy( ori.origin, down );
-			down[ 1 ] += 5;
-			VectorCopy( ori.origin, front );
-			front[ 0 ] += 5;
-
-			qglColor3f( 1, 0, 1 );
-			qglVertex3fv( front );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( down );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( up );
-			qglVertex3fv( ori.origin );
-		}
-
-		qglEnd();
-		qglLineWidth( 1 );
-	}
+        qglEnd();
+        qglLineWidth(1);
+    }
 }
 
-surfaceType_t	skelSurface = SF_TIKI_SKEL;
+surfaceType_t skelSurface = SF_TIKI_SKEL;
 
 /*
 ==============
 R_AddSkelSurfaces
 ==============
 */
-void R_AddSkelSurfaces( trRefEntity_t *ent ) {
-	dtiki_t *tiki;
-	qboolean personalModel;
-	float tiki_scale;
-	vec3_t tiki_localorigin;
-	vec3_t tiki_worldorigin;
-	skelBoneCache_t *outbones;
-	//int tikiSurfNumOffset;
-	static cvar_t *vmEntity = NULL;
-	skeletor_c *skeletor;
-	float radius;
-	SkelVec3 centroid;
-	skelAnimFrame_t *newFrame;
-	int added;
-	shader_t *shader;
-	dtikisurface_t *dsurf;
-	byte *bsurf;
-	//float range;
-	//int render_count, total_tris;
-	skelSurfaceGame_t *surface;
-	//int skinnum;
-	//float target;
-	Vector newDistance;
-	//vec3_t org;
-	int i;
-	int mesh;
-	int iRadiusCull = 0;
-	int num_tags;
+void R_AddSkelSurfaces(trRefEntity_t *ent)
+{
+    dtiki_t         *tiki;
+    qboolean         personalModel;
+    float            tiki_scale;
+    vec3_t           tiki_localorigin;
+    vec3_t           tiki_worldorigin;
+    skelBoneCache_t *outbones;
+    //int tikiSurfNumOffset;
+    static cvar_t   *vmEntity = NULL;
+    skeletor_c      *skeletor;
+    float            radius;
+    SkelVec3         centroid;
+    skelAnimFrame_t *newFrame;
+    int              added;
+    shader_t        *shader;
+    dtikisurface_t  *dsurf;
+    byte            *bsurf;
+    //float range;
+    //int render_count, total_tris;
+    skelSurfaceGame_t *surface;
+    //int skinnum;
+    //float target;
+    Vector newDistance;
+    //vec3_t org;
+    int i;
+    int mesh;
+    int iRadiusCull = 0;
+    int num_tags;
 
-	tiki = ent->e.tiki;
+    tiki = ent->e.tiki;
 
-	if( !vmEntity ) {
-		vmEntity = ri.Cvar_Get( "viewmodelentity", "", 0 );
-	}
+    if (!vmEntity) {
+        vmEntity = ri.Cvar_Get("viewmodelentity", "", 0);
+    }
 
-	R_UpdatePoseInternal( &ent->e );
+    R_UpdatePoseInternal(&ent->e);
 
-	// don't add third_person objects if in a portal
-	personalModel = ( ent->e.renderfx & RF_THIRD_PERSON ) && !tr.viewParms.isPortal;
+    // don't add third_person objects if in a portal
+    personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
 
-	outbones = &TIKI_Skel_Bones[ TIKI_Skel_Bones_Index ];
+    outbones = &TIKI_Skel_Bones[TIKI_Skel_Bones_Index];
 
-	num_tags = ri.TIKI_GetNumChannels(tiki);
+    num_tags = ri.TIKI_GetNumChannels(tiki);
 
-	if( num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES )
-	{
-		ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name );
-		return;
-	}
+    if (num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES) {
+        ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name);
+        return;
+    }
 
-	tiki_scale = tiki->load_scale * ent->e.scale;
-	VectorScale( tiki->load_origin, tiki_scale, tiki_localorigin );
-	R_LocalPointToWorld( tiki_localorigin, tiki_worldorigin );
+    tiki_scale = tiki->load_scale * ent->e.scale;
+    VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+    R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
 
-	radius = R_GetRadius( &ent->e );
+    radius = R_GetRadius(&ent->e);
 
-	if( !lod_tool->integer )
-	{
-		iRadiusCull = R_CullPointAndRadius( tiki_worldorigin, radius );
-		if (r_showcull->integer & 2)
-		{
-			switch (iRadiusCull)
-			{
-			case CULL_IN:
-				R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+    if (!lod_tool->integer) {
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, radius);
+        if (r_showcull->integer & 2) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
                 break;
             case CULL_CLIP:
                 R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
@@ -802,11 +786,10 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
             case CULL_OUT:
                 R_DebugCircle(tiki_worldorigin, radius * 1.2f + 32.f, 1, 0.2f, 0.2f, 0.5f, qfalse);
                 break;
-			}
-		}
+            }
+        }
 
-        switch (iRadiusCull)
-        {
+        switch (iRadiusCull) {
         case CULL_IN:
             tr.pc.c_sphere_cull_md3_in++;
             break;
@@ -817,146 +800,144 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
             tr.pc.c_sphere_cull_md3_out++;
             break;
         }
-	}
+    }
 
-	if (tiki->a->bIsCharacter) {
+    if (tiki->a->bIsCharacter) {
         if (tr.viewParms.isPortal) {
             ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
         } else {
             ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
         }
-	} else {
-		if (tr.viewParms.isPortal) {
-			ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
-		} else {
-			ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
-		}
-	}
+    } else {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        }
+    }
 
-	newFrame = ( skelAnimFrame_t * )ri.Hunk_AllocateTempMemory( sizeof( skelAnimFrame_t ) + ri.TIKI_GetNumChannels(tiki) * sizeof( SkelMat4 ) );
-	R_GetFrame( &ent->e, newFrame );
+    newFrame = (skelAnimFrame_t *)ri.Hunk_AllocateTempMemory(
+        sizeof(skelAnimFrame_t) + ri.TIKI_GetNumChannels(tiki) * sizeof(SkelMat4)
+    );
+    R_GetFrame(&ent->e, newFrame);
 
-	if (lod_tool->integer || iRadiusCull != CULL_CLIP || R_CullSkelModel(tiki, &ent->e, newFrame, tiki_scale, tiki_localorigin) != CULL_OUT)
-	{
-		//
-		// copy bones position and axis
-		//
-		for (i = 0; i < num_tags; i++)
-		{
-			VectorCopy(newFrame->bones[i][3], outbones->offset);
-			outbones->matrix[0][0] = newFrame->bones[i][0][0];
-			outbones->matrix[0][1] = newFrame->bones[i][0][1];
-			outbones->matrix[0][2] = newFrame->bones[i][0][2];
-			outbones->matrix[0][3] = 0;
-			outbones->matrix[1][0] = newFrame->bones[i][1][0];
-			outbones->matrix[1][1] = newFrame->bones[i][1][1];
-			outbones->matrix[1][2] = newFrame->bones[i][1][2];
-			outbones->matrix[1][3] = 0;
-			outbones->matrix[2][0] = newFrame->bones[i][2][0];
-			outbones->matrix[2][1] = newFrame->bones[i][2][1];
-			outbones->matrix[2][2] = newFrame->bones[i][2][2];
-			outbones->matrix[2][3] = 0;
-			outbones++;
-		}
-	}
+    if (lod_tool->integer || iRadiusCull != CULL_CLIP
+        || R_CullSkelModel(tiki, &ent->e, newFrame, tiki_scale, tiki_localorigin) != CULL_OUT) {
+        //
+        // copy bones position and axis
+        //
+        for (i = 0; i < num_tags; i++) {
+            VectorCopy(newFrame->bones[i][3], outbones->offset);
+            outbones->matrix[0][0] = newFrame->bones[i][0][0];
+            outbones->matrix[0][1] = newFrame->bones[i][0][1];
+            outbones->matrix[0][2] = newFrame->bones[i][0][2];
+            outbones->matrix[0][3] = 0;
+            outbones->matrix[1][0] = newFrame->bones[i][1][0];
+            outbones->matrix[1][1] = newFrame->bones[i][1][1];
+            outbones->matrix[1][2] = newFrame->bones[i][1][2];
+            outbones->matrix[1][3] = 0;
+            outbones->matrix[2][0] = newFrame->bones[i][2][0];
+            outbones->matrix[2][1] = newFrame->bones[i][2][1];
+            outbones->matrix[2][2] = newFrame->bones[i][2][2];
+            outbones->matrix[2][3] = 0;
+            outbones++;
+        }
+    }
 
-	ri.Hunk_FreeTempMemory( newFrame );
+    ri.Hunk_FreeTempMemory(newFrame);
 
-	ent->e.bonestart = TIKI_Skel_Bones_Index;
-	TIKI_Skel_Bones_Index += num_tags;
+    ent->e.bonestart = TIKI_Skel_Bones_Index;
+    TIKI_Skel_Bones_Index += num_tags;
 
-	ent->e.hasMorph = qfalse;
+    ent->e.hasMorph = qfalse;
 
-	//
-	// get the skeletor
-	//
-	skeletor = ( skeletor_c * )ri.TIKI_GetSkeletor( tiki, ent->e.entityNumber );
+    //
+    // get the skeletor
+    //
+    skeletor = (skeletor_c *)ri.TIKI_GetSkeletor(tiki, ent->e.entityNumber);
 
-	//
-	// add morphs
-	//
-	added = ri.SKEL_GetMorphWeightFrame( skeletor, ent->e.frameInfo[ 0 ].index, ent->e.frameInfo[ 0 ].time, &skeletorMorphCache[ skeletorMorphCacheIndex ] );
-	ent->e.morphstart = skeletorMorphCacheIndex;
+    //
+    // add morphs
+    //
+    added = ri.SKEL_GetMorphWeightFrame(
+        skeletor, ent->e.frameInfo[0].index, ent->e.frameInfo[0].time, &skeletorMorphCache[skeletorMorphCacheIndex]
+    );
+    ent->e.morphstart = skeletorMorphCacheIndex;
 
-	if( added )
-	{
-		// found morphs
-		skeletorMorphCacheIndex += added;
-		ent->e.hasMorph = qtrue;
-	}
+    if (added) {
+        // found morphs
+        skeletorMorphCacheIndex += added;
+        ent->e.hasMorph = qtrue;
+    }
 
-	//
-	// draw all meshes
-	//
-	dsurf = tiki->surfaces;
-	bsurf = &ent->e.surfaces[ 0 ];
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel( tiki->mesh[ mesh ] );
+    //
+    // draw all meshes
+    //
+    dsurf = tiki->surfaces;
+    bsurf = &ent->e.surfaces[0];
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
 
-		if( !skelmodel )
-		{
-			ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name );
-			return;
-		}
+        if (!skelmodel) {
+            ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name);
+            return;
+        }
 
-		if( lod_tool->integer && !stricmp( ent->e.tiki->a->name, lod_tikiname->string ) )
-		{
-			if( lod_mesh->integer > tiki->numMeshes - 1 ) {
-				ri.Cvar_Set( "lod_mesh", va( "%d", tiki->numMeshes - 1 ) );
-			}
+        if (lod_tool->integer && !stricmp(ent->e.tiki->a->name, lod_tikiname->string)) {
+            if (lod_mesh->integer > tiki->numMeshes - 1) {
+                ri.Cvar_Set("lod_mesh", va("%d", tiki->numMeshes - 1));
+            }
 
-			if( mesh == lod_mesh->integer ) {
-				if( skelmodel->pLOD ) {
-					break;
-				}
-			}
-		}
+            if (mesh == lod_mesh->integer) {
+                if (skelmodel->pLOD) {
+                    break;
+                }
+            }
+        }
 
-		//
-		// draw all surfaces
-		//
-		surface = skelmodel->pSurfaces;
-		for( i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext ) {
+        //
+        // draw all surfaces
+        //
+        surface = skelmodel->pSurfaces;
+        for (i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext) {
+            if (*bsurf & 4) {
+                continue;
+            }
 
-			if( *bsurf & 4 ) {
-				continue;
-			}
+            shader         = NULL;
+            surface->ident = SF_TIKI_SKEL;
 
-			shader = NULL;
-			surface->ident = SF_TIKI_SKEL;
+            // use a custom shader if specified
+            if (!(ent->e.customShader) || (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                int iShaderNum = ent->e.skinNum + (*bsurf & 3);
 
-			// use a custom shader if specified
-			if( !( ent->e.customShader ) || ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				int iShaderNum = ent->e.skinNum + ( *bsurf & 3 );
+                if (iShaderNum >= dsurf->numskins) {
+                    iShaderNum = 0;
+                }
+                shader = tr.shaders[dsurf->hShader[iShaderNum]];
+            } else {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+            }
 
-				if( iShaderNum >= dsurf->numskins ) {
-					iShaderNum = 0;
-				}
-				shader = tr.shaders[ dsurf->hShader[ iShaderNum ] ];
-			} else {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-			}
+            if (!personalModel) {
+                if ((*bsurf & 0x40) && (dsurf->numskins > 1)) {
+                    int iShaderNum = ent->e.skinNum + (*bsurf & 2);
 
-			if( !personalModel ) {
-				if( ( *bsurf & 0x40 ) && ( dsurf->numskins > 1 ) ) {
-					int iShaderNum = ent->e.skinNum + ( *bsurf & 2 );
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum]], 0);
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum + 1]], 0);
+                } else {
+                    R_AddDrawSurf((surfaceType_t *)surface, shader, 0);
+                }
+            }
 
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum ] ], 0 );
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum + 1 ] ], 0);
-				} else {
-					R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0);
-				}
-			}
+            if ((ent->e.customShader) && (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+                R_AddDrawSurf((surfaceType_t *)surface, shader, 0);
+            }
+        }
+    }
 
-			if( ( ent->e.customShader ) && ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-				R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0);
-			}
-		}
-	}
-
-	// FIXME: setup LOD
+    // FIXME: setup LOD
 }
 
 /*
@@ -964,18 +945,16 @@ void R_AddSkelSurfaces( trRefEntity_t *ent ) {
 SkelVertGetNormal
 =============
 */
-inline static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 0 ];
+inline static void SkelVertGetNormal(skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] = vert->normal[0] * bone->matrix[0][0] + vert->normal[1] * bone->matrix[1][0]
+           + vert->normal[2] * bone->matrix[2][0];
 
-	out[ 1 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 1 ];
+    out[1] = vert->normal[0] * bone->matrix[0][1] + vert->normal[1] * bone->matrix[1][1]
+           + vert->normal[2] * bone->matrix[2][1];
 
-	out[ 2 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 2 ];
+    out[2] = vert->normal[0] * bone->matrix[0][2] + vert->normal[1] * bone->matrix[1][2]
+           + vert->normal[2] * bone->matrix[2][2];
 }
 
 /*
@@ -983,8 +962,9 @@ inline static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *b
 SkelMorphGetXyz
 =============
 */
-inline static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
-	VectorMA(out, *morphcache, morph->offset, out);
+inline static void SkelMorphGetXyz(skeletorMorph_t *morph, int *morphcache, vec3_t out)
+{
+    VectorMA(out, *morphcache, morph->offset, out);
 }
 
 /*
@@ -992,21 +972,22 @@ inline static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec
 SkelWeightGetXyz
 =============
 */
-inline static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-				bone->offset[ 0 ] ) * weight->boneWeight;
+inline static void SkelWeightGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] += ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                + weight->offset[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
 
-	out[ 1 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-				bone->offset[ 1 ] ) * weight->boneWeight;
+    out[1] += ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                + weight->offset[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
 
-	out[ 2 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-				bone->offset[ 2 ] ) * weight->boneWeight;
+    out[2] += ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                + weight->offset[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
 }
 
 /*
@@ -1014,25 +995,23 @@ inline static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone
 SkelWeightMorphGetXyz
 =============
 */
-inline static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out ) {
-	vec3_t point;
+inline static void SkelWeightMorphGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out)
+{
+    vec3_t point;
 
-	VectorAdd( totalmorph, weight->offset, point );
+    VectorAdd(totalmorph, weight->offset, point);
 
-	out[ 0 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-					bone->offset[ 0 ] ) * weight->boneWeight;
+    out[0] += ((point[0] * bone->matrix[0][0] + point[1] * bone->matrix[1][0] + point[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
 
-	out[ 1 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-					bone->offset[ 1 ] ) * weight->boneWeight;
+    out[1] += ((point[0] * bone->matrix[0][1] + point[1] * bone->matrix[1][1] + point[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
 
-	out[ 2 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-					bone->offset[ 2 ] ) * weight->boneWeight;
+    out[2] += ((point[0] * bone->matrix[0][2] + point[1] * bone->matrix[1][2] + point[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
 }
 
 /*
@@ -1040,158 +1019,146 @@ inline static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t
 RB_SkelMesh
 =============
 */
-void RB_SkelMesh( skelSurfaceGame_t *sf ) {
-	unsigned int baseIndex, baseVertex;
-	unsigned int render_count;
-	unsigned int indexes;
-    float* outXyz;
-    vec4_t* outNormal;
-    skelIndex_t* triangles;
-    skelIndex_t* collapse_map;
-    skeletorVertex_t* newVerts;
-    skeletorMorph_t* morph;
-    skelWeight_t* weight;
-    int vertNum;
-    int morphNum;
-    int weightNum;
-    skelBoneCache_t* bones;
-    skelBoneCache_t* bone;
-    int* morphs;
-    int* morphcache;
-    float scale;
-    dtiki_t* tiki;
-    int mesh;
-    int surf;
-	int i;
-    skelHeaderGame_t* skelmodel;
-    skelSurfaceGame_t* psurface;
-    qboolean bFound;
-    short collapse[TIKI_MAX_VERTEXES];
+void RB_SkelMesh(skelSurfaceGame_t *sf)
+{
+    unsigned int       baseIndex, baseVertex;
+    unsigned int       render_count;
+    unsigned int       indexes;
+    float             *outXyz;
+    vec4_t            *outNormal;
+    skelIndex_t       *triangles;
+    skelIndex_t       *collapse_map;
+    skeletorVertex_t  *newVerts;
+    skeletorMorph_t   *morph;
+    skelWeight_t      *weight;
+    int                vertNum;
+    int                morphNum;
+    int                weightNum;
+    skelBoneCache_t   *bones;
+    skelBoneCache_t   *bone;
+    int               *morphs;
+    int               *morphcache;
+    float              scale;
+    dtiki_t           *tiki;
+    int                mesh;
+    int                surf;
+    int                i;
+    skelHeaderGame_t  *skelmodel;
+    skelSurfaceGame_t *psurface;
+    qboolean           bFound;
+    short              collapse[TIKI_MAX_VERTEXES];
 
-	if (!r_drawentitypoly->integer) {
-		return;
-	}
-
-	tiki = backEnd.currentEntity->e.tiki;
-
-	scale = tiki->load_scale * backEnd.currentEntity->e.scale;
-
-	//
-	// get the mesh associated with the surface
-	//
-	bFound = qfalse;
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelmodel = ri.TIKI_GetSkel( tiki->mesh[ mesh ] );
-		psurface = skelmodel->pSurfaces;
-
-		// find the surface
-		for( surf = 0; surf < skelmodel->numSurfaces; surf++ )
-		{
-			if( psurface == sf ) {
-				bFound = qtrue;
-				break;
-			}
-			psurface = psurface->pNext;
-		}
-
-		if( bFound ) {
-			break;
-		}
-	}
-
-	assert( bFound );
-
-	//
-	// Process LOD
-	//
-	if( skelmodel->pLOD )
-	{
-		float lod_val;
-		int renderfx;
-
-        lod_val = backEnd.currentEntity->lodpercentage[0];
-        renderfx = backEnd.currentEntity->e.renderfx;
-
-		if (sf->numVerts > 3) {
-			skelIndex_t* collapseIndex;
-			int mid, low, high;
-			int lod_cutoff;
-
-			if (lod_tool->integer
-				&& !strcmp(backEnd.currentEntity->e.tiki->a->name, lod_tikiname->string)
-				&& mesh == lod_mesh->integer)
-			{
-				lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0]);
-			}
-			else
-			{
-				lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0], renderfx);
-			}
-
-			collapseIndex = sf->pCollapseIndex;
-			if (collapseIndex[2] < lod_cutoff) {
-				return;
-			}
-
-			low = mid = 3;
-			high = sf->numVerts;
-			while (high >= low) {
-				mid = (low + high) >> 1;
-				if (collapseIndex[mid] < lod_cutoff) {
-					high = mid - 1;
-					if (collapseIndex[mid - 1] >= lod_cutoff) {
-						break;
-					}
-				}
-				else
-				{
-					mid++;
-					low = mid;
-					if (high == mid || collapseIndex[mid] < lod_cutoff) {
-						break;
-					}
-				}
-            }
-
-			render_count = mid;
-		} else {
-			render_count = sf->numVerts;
-		}
-
-		if (!render_count) {
-			return;
-		}
-	} else {
-		render_count = sf->numVerts;
+    if (!r_drawentitypoly->integer) {
+        return;
     }
 
+    tiki = backEnd.currentEntity->e.tiki;
+
+    scale = tiki->load_scale * backEnd.currentEntity->e.scale;
+
+    //
+    // get the mesh associated with the surface
+    //
+    bFound = qfalse;
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+        psurface  = skelmodel->pSurfaces;
+
+        // find the surface
+        for (surf = 0; surf < skelmodel->numSurfaces; surf++) {
+            if (psurface == sf) {
+                bFound = qtrue;
+                break;
+            }
+            psurface = psurface->pNext;
+        }
+
+        if (bFound) {
+            break;
+        }
+    }
+
+    assert(bFound);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD) {
+        float lod_val;
+        int   renderfx;
+
+        lod_val  = backEnd.currentEntity->lodpercentage[0];
+        renderfx = backEnd.currentEntity->e.renderfx;
+
+        if (sf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentEntity->e.tiki->a->name, lod_tikiname->string)
+                && mesh == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0], renderfx);
+            }
+
+            collapseIndex = sf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = sf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = sf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = sf->numVerts;
+    }
 
     indexes = sf->numTriangles * 3;
     RB_CHECKOVERFLOW(render_count, indexes);
 
     collapse_map = sf->pCollapse;
-    triangles = sf->pTriangles;
-    baseIndex = tess.numIndexes;
-    baseVertex = tess.numVertexes;
+    triangles    = sf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
     tess.numVertexes += render_count;
 
-    outXyz = tess.xyz[baseVertex];
+    outXyz    = tess.xyz[baseVertex];
     outNormal = &tess.normal[baseVertex];
-    newVerts = sf->pVerts;
+    newVerts  = sf->pVerts;
 
-	if (render_count == sf->numVerts)
-	{
-		for (i = 0; i < indexes; i++) {
-			tess.indexes[baseIndex + i] = baseVertex + triangles[i];
-		}
+    if (render_count == sf->numVerts) {
+        for (i = 0; i < indexes; i++) {
+            tess.indexes[baseIndex + i] = baseVertex + triangles[i];
+        }
 
         entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
-		tess.numIndexes += indexes;
-	}
-	else
-    {
-		assert(sf->numVerts < TIKI_MAX_VERTEXES);
+        tess.numIndexes += indexes;
+    } else {
+        assert(sf->numVerts < TIKI_MAX_VERTEXES);
 
         for (i = 0; i < render_count; i++) {
             collapse[i] = i;
@@ -1201,20 +1168,18 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
             collapse[i] = collapse[collapse_map[i]];
         }
 
-        for (i = 0; i < indexes; i += 3)
-        {
-			assert(collapse[triangles[i]] < sf->numVerts);
-			assert(collapse[triangles[i + 1]] < sf->numVerts);
-			assert(collapse[triangles[i + 2]] < sf->numVerts);
+        for (i = 0; i < indexes; i += 3) {
+            assert(collapse[triangles[i]] < sf->numVerts);
+            assert(collapse[triangles[i + 1]] < sf->numVerts);
+            assert(collapse[triangles[i + 2]] < sf->numVerts);
 
-            if (collapse[triangles[i]] == collapse[triangles[i + 1]] ||
-                collapse[triangles[i + 1]] == collapse[triangles[i + 2]] ||
-                collapse[triangles[i + 2]] == collapse[triangles[i]])
-            {
+            if (collapse[triangles[i]] == collapse[triangles[i + 1]]
+                || collapse[triangles[i + 1]] == collapse[triangles[i + 2]]
+                || collapse[triangles[i + 2]] == collapse[triangles[i]]) {
                 break;
             }
 
-            tess.indexes[baseIndex + i] = baseVertex + collapse[triangles[i]];
+            tess.indexes[baseIndex + i]     = baseVertex + collapse[triangles[i]];
             tess.indexes[baseIndex + i + 1] = baseVertex + collapse[triangles[i + 1]];
             tess.indexes[baseIndex + i + 2] = baseVertex + collapse[triangles[i + 2]];
         }
@@ -1223,216 +1188,215 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
         tess.numIndexes += i;
     }
 
-	//
-	// just copy the vertexes
-	//
-	bones = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
-	morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
+    //
+    // just copy the vertexes
+    //
+    bones  = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
+    morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
 
-	if (backEnd.currentEntity->e.hasMorph)
-	{
-		if (mesh > 0)
-		{
-			for (vertNum = 0; vertNum < render_count; vertNum++)
-			{
-				vec3_t normal;
-				vec3_t out;
-				vec3_t totalmorph;
-				int channelNum;
-				int boneNum;
+    if (backEnd.currentEntity->e.hasMorph) {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+                int    channelNum;
+                int    boneNum;
 
-				VectorClear(out);
-				VectorClear(outXyz);
-				VectorClear(totalmorph);
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
 
-				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
-				morph = (skeletorMorph_t*)((byte*)newVerts + sizeof(skeletorVertex_t));
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
 
-				for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
-					morphcache = &morphs[morph->morphIndex];
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
 
-					if (*morphcache) {
-						SkelMorphGetXyz(morph, morphcache, totalmorph);
-					}
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
 
-					morph++;
-				}
+                    morph++;
+                }
 
-				if (newVerts->numMorphs) {
-					channelNum = skelmodel->pBones[morph->morphIndex].channel;
-				} else {
-					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-				}
+                if (newVerts->numMorphs) {
+                    channelNum = skelmodel->pBones[morph->morphIndex].channel;
+                } else {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                }
 
-				boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
-				bone = &bones[boneNum];
+                boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone    = &bones[boneNum];
 
-				SkelVertGetNormal(newVerts, bone, normal);
+                SkelVertGetNormal(newVerts, bone, normal);
 
-				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
-					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-					boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
-					bone = &bones[boneNum];
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
 
-					if (!weightNum) {
-						SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
-					} else {
-						SkelWeightGetXyz(weight, bone, out);
-					}
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
 
-					weight++;
-				}
+                    weight++;
+                }
 
-				VectorCopy(normal, *outNormal);
-				VectorScale(out, scale, outXyz);
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
 
-				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
-				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
-				// FIXME: fill in lightmapST for completeness?
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
 
-				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
-				outXyz += 4;
-				outNormal++;
-			}
-		}
-		else
-		{
-			for (vertNum = 0; vertNum < render_count; vertNum++)
-			{
-				vec3_t normal;
-				vec3_t out;
-				vec3_t totalmorph;
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
 
-				VectorClear(out);
-				VectorClear(outXyz);
-				VectorClear(totalmorph);
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
 
-				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
-				morph = (skeletorMorph_t*)((byte*)newVerts + sizeof(skeletorVertex_t));
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
 
-				for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
-					morphcache = &morphs[morph->morphIndex];
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
 
-					if (*morphcache) {
-						SkelMorphGetXyz(morph, morphcache, totalmorph);
-					}
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
 
-					morph++;
-				}
+                    morph++;
+                }
 
-				if (newVerts->numMorphs) {
-					bone = &bones[morph->morphIndex];
-				} else {
-					bone = &bones[weight->boneIndex];
-				}
+                if (newVerts->numMorphs) {
+                    bone = &bones[morph->morphIndex];
+                } else {
+                    bone = &bones[weight->boneIndex];
+                }
 
-				SkelVertGetNormal(newVerts, bone, normal);
+                SkelVertGetNormal(newVerts, bone, normal);
 
-				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
-					bone = &bones[weight->boneIndex];
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
 
-					if (!weightNum) {
-						SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
-					} else {
-						SkelWeightGetXyz(weight, bone, out);
-					}
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
 
-					weight++;
-				}
+                    weight++;
+                }
 
-				VectorCopy(normal, *outNormal);
-				VectorScale(out, scale, outXyz);
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
 
-				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
-				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
-				// FIXME: fill in lightmapST for completeness?
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
 
-				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
-				outXyz += 4;
-				outNormal++;
-			}
-		}
-	}
-	else
-	{
-		if (mesh > 0)
-		{
-			for (vertNum = 0; vertNum < render_count; vertNum++)
-			{
-				vec3_t normal;
-				vec3_t out;
-				int channelNum;
-				int boneNum;
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        }
+    } else {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                int    channelNum;
+                int    boneNum;
 
-				VectorClear(out);
-				VectorClear(outXyz);
+                VectorClear(out);
+                VectorClear(outXyz);
 
-				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
 
-				channelNum = skelmodel->pBones[weight->boneIndex].channel;
-				boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
-				bone = &bones[boneNum];
+                channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone       = &bones[boneNum];
 
-				SkelVertGetNormal(newVerts, bone, normal);
+                SkelVertGetNormal(newVerts, bone, normal);
 
-				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
-					channelNum = skelmodel->pBones[weight->boneIndex].channel;
-					boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
-					bone = &bones[boneNum];
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
 
-					SkelWeightGetXyz(weight, bone, out);
+                    SkelWeightGetXyz(weight, bone, out);
 
-					weight++;
-				}
+                    weight++;
+                }
 
-				VectorCopy(normal, *outNormal);
-				VectorScale(out, scale, outXyz);
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
 
-				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
-				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
-				// FIXME: fill in lightmapST for completeness?
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
 
-				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
-				outXyz += 4;
-				outNormal++;
-			}
-		}
-		else
-		{
-			for (vertNum = 0; vertNum < render_count; vertNum++)
-			{
-				vec3_t normal;
-				vec3_t out;
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
 
-				VectorClear(out);
-				VectorClear(outXyz);
+                VectorClear(out);
+                VectorClear(outXyz);
 
-				weight = (skelWeight_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
 
-				bone = &bones[weight->boneIndex];
-				SkelVertGetNormal(newVerts, bone, normal);
+                bone = &bones[weight->boneIndex];
+                SkelVertGetNormal(newVerts, bone, normal);
 
-				for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
-					bone = &bones[weight->boneIndex];
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
 
-					SkelWeightGetXyz(weight, bone, out);
+                    SkelWeightGetXyz(weight, bone, out);
 
-					weight++;
-				}
+                    weight++;
+                }
 
-				VectorCopy(normal, *outNormal);
-				VectorScale(out, scale, outXyz);
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
 
-				tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
-				tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
-				// FIXME: fill in lightmapST for completeness?
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
 
-				newVerts = (skeletorVertex_t*)((byte*)newVerts + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * newVerts->numMorphs + sizeof(skelWeight_t) * newVerts->numWeights);
-				outXyz += 4;
-				outNormal++;
-			}
-		}
-	}
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        }
+    }
 
 #if 0
 	if( backEnd.currentEntity->e.staticModelIndex ) {
@@ -1456,37 +1420,37 @@ void RB_SkelMesh( skelSurfaceGame_t *sf ) {
 		in = &tr.world->smColors[ sm->firstVert + cdofs ];
 		out = tess.vertexColors + baseVertex;
 		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
-#if 1
+#    if 1
 			( *out )[ 0 ] = ( *in )[ 0 ];
 			( *out )[ 1 ] = ( *in )[ 1 ];
 			( *out )[ 2 ] = ( *in )[ 2 ];
 			( *out )[ 3 ] = 255;
-#elif 0
+#    elif 0
 			( ( int* )out ) = tr.identityLightByte;
-#else		
+#    else		
 			// su44: set it to something special so
 			// I can debug vertex colors rendering
 			( *out )[ 0 ] = 255;
 			( *out )[ 1 ] = 0;
 			( *out )[ 2 ] = 0;
 			( *out )[ 3 ] = 255;
-#endif
+#    endif
 		}
 	} //else
 #endif
-	//{
-	//	// an attemp to fix bizarre vertex colors bug
-	//	color4ub_t *col;
-	//	
-	//	col = &tess.vertexColors[baseVertex];
-	//	for(i = 0; i < sf->numVerts; i++,col++) {
-	//		(*col)[0] = 255;
-	//		(*col)[1] = 255;
-	//		(*col)[2] = 255;
-	//		(*col)[3] = 255;
-	//	}
-	//}
-	//tess.numVertexes += sf->numVerts;
+    //{
+    //	// an attemp to fix bizarre vertex colors bug
+    //	color4ub_t *col;
+    //
+    //	col = &tess.vertexColors[baseVertex];
+    //	for(i = 0; i < sf->numVerts; i++,col++) {
+    //		(*col)[0] = 255;
+    //		(*col)[1] = 255;
+    //		(*col)[2] = 255;
+    //		(*col)[3] = 255;
+    //	}
+    //}
+    //tess.numVertexes += sf->numVerts;
 }
 
 /*
@@ -1517,9 +1481,9 @@ void RB_StaticMesh(staticSurface_t *staticSurf)
     surf = staticSurf->surface;
 
     assert(surf->pStaticXyz);
-	if (!surf->pStaticXyz) {
-		return;
-	}
+    if (!surf->pStaticXyz) {
+        return;
+    }
 
     meshNum   = staticSurf->meshNum;
     skelmodel = ri.TIKI_GetSkel(tiki->mesh[meshNum]);
@@ -1659,7 +1623,8 @@ void RB_StaticMesh(staticSurface_t *staticSurf)
 R_InfoWorldTris_f
 =============
 */
-void R_InfoWorldTris_f( void ) {
+void R_InfoWorldTris_f(void)
+{
     int i;
 
     g_bInfoworldtris = qtrue;
@@ -1677,12 +1642,13 @@ void R_InfoWorldTris_f( void ) {
 R_PrintInfoWorldtris
 =============
 */
-void R_PrintInfoWorldtris( void ) {
-    int i;
-    int numTris;
-    int totalNumTris;
-    dtiki_t* tiki;
-    skelHeaderGame_t* skelmodel;
+void R_PrintInfoWorldtris(void)
+{
+    int               i;
+    int               numTris;
+    int               totalNumTris;
+    dtiki_t          *tiki;
+    skelHeaderGame_t *skelmodel;
 
     totalNumTris = 0;
 
@@ -1693,7 +1659,7 @@ void R_PrintInfoWorldtris( void ) {
         }
 
         totalNumTris += numTris;
-        tiki = backEnd.refdef.entities[i].e.tiki;
+        tiki      = backEnd.refdef.entities[i].e.tiki;
         skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
         Com_Printf("ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
     }
@@ -1702,7 +1668,6 @@ void R_PrintInfoWorldtris( void ) {
 
     totalNumTris = 0;
 
-
     for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
         numTris = staticModelNumIndexes[i] / 3;
         if (!numTris) {
@@ -1710,7 +1675,7 @@ void R_PrintInfoWorldtris( void ) {
         }
 
         totalNumTris += numTris;
-        tiki = backEnd.refdef.staticModels[i].tiki;
+        tiki      = backEnd.refdef.staticModels[i].tiki;
         skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
         Com_Printf("sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
     }
@@ -1723,8 +1688,9 @@ void R_PrintInfoWorldtris( void ) {
 RE_SetFrameNumber
 =============
 */
-void RE_SetFrameNumber( int frameNumber ) {
-	tr.frame_skel_index = frameNumber;
+void RE_SetFrameNumber(int frameNumber)
+{
+    tr.frame_skel_index = frameNumber;
 }
 
 /*
@@ -1732,15 +1698,22 @@ void RE_SetFrameNumber( int frameNumber ) {
 R_UpdatePoseInternal
 =============
 */
-void R_UpdatePoseInternal( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		if( tr.skel_index[ model->entityNumber ] == tr.frame_skel_index ) {
-			return;
-		}
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
+void R_UpdatePoseInternal(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        if (tr.skel_index[model->entityNumber] == tr.frame_skel_index) {
+            return;
+        }
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
 
-	ri.TIKI_SetPoseInternal( ri.TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
 }
 
 /*
@@ -1748,12 +1721,19 @@ void R_UpdatePoseInternal( refEntity_t *model ) {
 RE_ForceUpdatePose
 =============
 */
-void RE_ForceUpdatePose( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
+void RE_ForceUpdatePose(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
 
-	ri.TIKI_SetPoseInternal( ri.TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
 }
 
 /*
@@ -1761,9 +1741,10 @@ void RE_ForceUpdatePose( refEntity_t *model ) {
 RE_TIKI_Orientation
 =============
 */
-orientation_t RE_TIKI_Orientation( refEntity_t *model, int tagnum ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_OrientationInternal( model->tiki, model->entityNumber, tagnum, model->scale );
+orientation_t RE_TIKI_Orientation(refEntity_t *model, int tagnum)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_OrientationInternal(model->tiki, model->entityNumber, tagnum, model->scale);
 }
 
 /*
@@ -1771,9 +1752,10 @@ orientation_t RE_TIKI_Orientation( refEntity_t *model, int tagnum ) {
 RE_TIKI_IsOnGround
 =============
 */
-qboolean RE_TIKI_IsOnGround( refEntity_t *model, int tagnum, float threshold ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_IsOnGroundInternal( model->tiki, model->entityNumber, tagnum, threshold );
+qboolean RE_TIKI_IsOnGround(refEntity_t *model, int tagnum, float threshold)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_IsOnGroundInternal(model->tiki, model->entityNumber, tagnum, threshold);
 }
 
 /*
@@ -1781,9 +1763,10 @@ qboolean RE_TIKI_IsOnGround( refEntity_t *model, int tagnum, float threshold ) {
 R_GetRadius
 =============
 */
-float R_GetRadius( refEntity_t *model ) {
-	R_UpdatePoseInternal( model );
-	return ri.GetRadiusInternal( model->tiki, model->entityNumber, model->scale );
+float R_GetRadius(refEntity_t *model)
+{
+    R_UpdatePoseInternal(model);
+    return ri.GetRadiusInternal(model->tiki, model->entityNumber, model->scale);
 }
 
 /*
@@ -1791,9 +1774,10 @@ float R_GetRadius( refEntity_t *model ) {
 R_GetFrame
 =============
 */
-void R_GetFrame( refEntity_t *model, struct skelAnimFrame_s *newFrame ) {
-	R_UpdatePoseInternal( model );
-	ri.GetFrameInternal( model->tiki, model->entityNumber, newFrame );
+void R_GetFrame(refEntity_t *model, struct skelAnimFrame_s *newFrame)
+{
+    R_UpdatePoseInternal(model);
+    ri.GetFrameInternal(model->tiki, model->entityNumber, newFrame);
 }
 
 /*
@@ -1801,35 +1785,36 @@ void R_GetFrame( refEntity_t *model, struct skelAnimFrame_s *newFrame ) {
 R_DebugSkeleton
 =============
 */
-void R_DebugSkeleton(void) {
-	int i;
-	trRefEntity_t *ent;
-	model_t *model;
+void R_DebugSkeleton(void)
+{
+    int            i;
+    trRefEntity_t *ent;
+    model_t       *model;
 
     if (!r_showSkeleton->integer) {
         return;
     }
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	GL_Bind( tr.whiteImage );
-	GL_State( GLS_POLYMODE_LINE );
+    GL_Bind(tr.whiteImage);
+    GL_State(GLS_POLYMODE_LINE);
 
-	qglDisableClientState( GL_COLOR_ARRAY );
-	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
+    qglDisableClientState(GL_COLOR_ARRAY);
+    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
-	for( i = 0; i < tr.refdef.num_entities; i++ ) {
-		ent = &tr.refdef.entities[ i ];
+    for (i = 0; i < tr.refdef.num_entities; i++) {
+        ent = &tr.refdef.entities[i];
 
-		if( ent->e.reType == RT_MODEL ) {
-			model = R_GetModelByHandle( ent->e.hModel );
+        if (ent->e.reType == RT_MODEL) {
+            model = R_GetModelByHandle(ent->e.hModel);
 
-			if( model->type == MOD_TIKI ) {
-				RE_ForceUpdatePose( &ent->e );
-				RB_DrawSkeletor( ent );
-			}
-		}
-	}
+            if (model->type == MOD_TIKI) {
+                RE_ForceUpdatePose(&ent->e);
+                RB_DrawSkeletor(ent);
+            }
+        }
+    }
 }
 
 /*
@@ -1839,13 +1824,13 @@ ProjectRadius
 */
 static float ProjectRadius(float r, const vec3_t location)
 {
-	Vector separation;
-	float projectedRadius;
+    Vector separation;
+    float  projectedRadius;
 
-	separation = Vector(tr.viewParms.ori.origin) - Vector(location);
-	projectedRadius = separation.length();
+    separation      = Vector(tr.viewParms.ori.origin) - Vector(location);
+    projectedRadius = separation.length();
 
-	return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
+    return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
 }
 
 /*
@@ -1855,7 +1840,7 @@ R_CalcLod
 */
 float R_CalcLod(const vec3_t origin, float radius)
 {
-	return ProjectRadius(radius, origin);
+    return ProjectRadius(radius, origin);
 }
 
 /*
@@ -1863,46 +1848,44 @@ float R_CalcLod(const vec3_t origin, float radius)
 R_CullTIKI
 =============
 */
-static int R_CullSkelModel(dtiki_t* tiki, refEntity_t* e, skelAnimFrame_t* newFrame, float fScale, float* vLocalOrg) {
-	vec3_t bounds[2];
-	vec3_t delta;
-	int i;
-	int cull;
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg)
+{
+    vec3_t bounds[2];
+    vec3_t delta;
+    int    i;
+    int    cull;
 
-	// FIXME: not working properly
-	return CULL_IN;
+    // FIXME: not working properly
+    return CULL_IN;
 
-	if (tr.currentEntity->e.renderfx & RF_FRAMELERP) {
-		VectorSubtract(e->origin, e->oldorigin, delta);
-	} else {
-		VectorClear(delta);
-	}
+    if (tr.currentEntity->e.renderfx & RF_FRAMELERP) {
+        VectorSubtract(e->origin, e->oldorigin, delta);
+    } else {
+        VectorClear(delta);
+    }
 
-	for (i = 0; i < 3; i++)
-	{
-		bounds[0][i] = newFrame->bounds[0][i] * fScale + vLocalOrg[i];
-		bounds[1][i] = newFrame->bounds[1][i] * fScale + vLocalOrg[i];
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = newFrame->bounds[0][i] * fScale + vLocalOrg[i];
+        bounds[1][i] = newFrame->bounds[1][i] * fScale + vLocalOrg[i];
 
-		if (delta[i] > 0) {
-			bounds[1][i] += delta[i];
-		} else {
-			bounds[0][i] += delta[i];
-		}
-	}
+        if (delta[i] > 0) {
+            bounds[1][i] += delta[i];
+        } else {
+            bounds[0][i] += delta[i];
+        }
+    }
 
-	cull = R_CullLocalBox(bounds);
+    cull = R_CullLocalBox(bounds);
 
-	if (r_showcull->integer & 1)
-	{
-		float fR, fG, fB;
-		vec3_t vAngles;
+    if (r_showcull->integer & 1) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
 
-		switch (cull)
-		{
+        switch (cull) {
         case CULL_IN:
-			fR = 0;
-			fG = 1;
-			fB = 0;
+            fR = 0;
+            fG = 1;
+            fB = 0;
             break;
         case CULL_CLIP:
             fR = 1;
@@ -1914,19 +1897,18 @@ static int R_CullSkelModel(dtiki_t* tiki, refEntity_t* e, skelAnimFrame_t* newFr
             fG = 0.2f;
             fB = 0.2f;
 
-			for (i = 0; i < 3; i++) {
-				bounds[0][i] -= 16;
-				bounds[1][i] += 16;
-			}
-			break;
+            for (i = 0; i < 3; i++) {
+                bounds[0][i] -= 16;
+                bounds[1][i] += 16;
+            }
+            break;
         }
 
         MatrixToEulerAngles(tr.ori.axis, vAngles);
         R_DebugRotatedBBox(tr.ori.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
-	}
+    }
 
-    switch (cull)
-    {
+    switch (cull) {
     case CULL_IN:
         tr.pc.c_box_cull_md3_in++;
         return CULL_IN;
@@ -1953,76 +1935,66 @@ FIXME: Shares some code with RB_StaticMesh, common parts could be extracted.
 According to debug symbols, this was originally in tiki_mesh.cpp
 ==================
 */
-void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris)
+void R_CountTikiLodTris(dtiki_t *tiki, float lodpercentage, int *render_tris, int *total_tris)
 {
-	*render_tris = 0;
-	*total_tris = 0;
-	int numtris = 0, totaltris = 0;
+    *render_tris = 0;
+    *total_tris  = 0;
+    int numtris = 0, totaltris = 0;
 
-	for (int i = 0; i < tiki->numMeshes; i++)
-	{
-		skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tiki->mesh[i]);
-		skelSurfaceGame_t *surface = skelmodel->pSurfaces;
+    for (int i = 0; i < tiki->numMeshes; i++) {
+        skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[i]);
+        skelSurfaceGame_t *surface   = skelmodel->pSurfaces;
 
-		for (int j = 0; j < skelmodel->numSurfaces; j++)
-		{
-			int render_count = 0;
-			if (skelmodel->pLOD)
-			{
-				int lod_cutoff = GetLodCutoff(skelmodel, lodpercentage, 0);
-				skelIndex_t *collapseIndex = surface->pCollapseIndex;
-				render_count = surface->numVerts;
+        for (int j = 0; j < skelmodel->numSurfaces; j++) {
+            int render_count = 0;
+            if (skelmodel->pLOD) {
+                int          lod_cutoff    = GetLodCutoff(skelmodel, lodpercentage, 0);
+                skelIndex_t *collapseIndex = surface->pCollapseIndex;
+                render_count               = surface->numVerts;
 
-				// Determine the number of vertices to be rendered based on the LOD cutoff
-				while (render_count > 0 && collapseIndex[render_count - 1] < lod_cutoff)
-				{
-					render_count--;
-				}
-			}
-			else
-			{
-				// The surf mesh doesn't have a LOD model, so all vertices will be rendered
-				render_count = surface->numVerts;
-			}
+                // Determine the number of vertices to be rendered based on the LOD cutoff
+                while (render_count > 0 && collapseIndex[render_count - 1] < lod_cutoff) {
+                    render_count--;
+                }
+            } else {
+                // The surf mesh doesn't have a LOD model, so all vertices will be rendered
+                render_count = surface->numVerts;
+            }
 
-			skelIndex_t *triangles = surface->pTriangles;
-			int indexes = surface->numTriangles * 3; // 3 vertex/index for each tri
-			skelIndex_t *collapse_map = surface->pCollapse;
-			totaltris += surface->numTriangles;
-			skelIndex_t collapse[4096]{};
+            skelIndex_t *triangles    = surface->pTriangles;
+            int          indexes      = surface->numTriangles * 3; // 3 vertex/index for each tri
+            skelIndex_t *collapse_map = surface->pCollapse;
+            totaltris += surface->numTriangles;
+            skelIndex_t collapse[4096] {};
 
-			// Initialize array for collapsed indices
-			int k;
-			for (k = 0; k < render_count; ++k)
-			{
-				collapse[k] = k;
-			}
+            // Initialize array for collapsed indices
+            int k;
+            for (k = 0; k < render_count; ++k) {
+                collapse[k] = k;
+            }
 
-			// Map remaining vertices to their collapsed indices using the collapse map
-			for (k = render_count; k < surface->numVerts; ++k)
-			{
-				collapse[k] = collapse[collapse_map[k]];
-			}
+            // Map remaining vertices to their collapsed indices using the collapse map
+            for (k = render_count; k < surface->numVerts; ++k) {
+                collapse[k] = collapse[collapse_map[k]];
+            }
 
-			// Check the first two collapsed indices of each triangle
-			for (k = 0; k < indexes; k += 3)
-			{
-				if (collapse[triangles[k]] == collapse[triangles[k + 1]])
-				{
-					// The collapsed indices of the two vertices are the same:
-					// this, and any subsequent tris do not need to be rendered
-					// because the collapsed vertices (for this surface) coincide from here.
-					break;
-				}
-			}
+            // Check the first two collapsed indices of each triangle
+            for (k = 0; k < indexes; k += 3) {
+                if (collapse[triangles[k]] == collapse[triangles[k + 1]]) {
+                    // The collapsed indices of the two vertices are the same:
+                    // this, and any subsequent tris do not need to be rendered
+                    // because the collapsed vertices (for this surface) coincide from here.
+                    break;
+                }
+            }
 
-			surface = surface->pNext;
-			numtris += k / 3;
-		}
-	}
+            surface = surface->pNext;
+            numtris += k / 3;
+        }
+    }
 
-	*render_tris = numtris;
-	*total_tris = totaltris;
+    *render_tris = numtris;
+    *total_tris  = totaltris;
 }
 
 /*
@@ -2030,8 +2002,8 @@ void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, in
 R_LerpTag
 ==================
 */
-int R_LerpTag(orientation_t* tag, qhandle_t handle, int startFrame, int endFrame,
-	float frac, const char* tagName) {
-	// stub
-	return 0;
+int R_LerpTag(orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, float frac, const char *tagName)
+{
+    // stub
+    return 0;
 }
\ No newline at end of file
diff --git a/code/renderergl1/tr_sky_portal.cpp b/code/renderergl1/tr_sky_portal.cpp
index 7f02a4c6..02ca1a5c 100644
--- a/code/renderergl1/tr_sky_portal.cpp
+++ b/code/renderergl1/tr_sky_portal.cpp
@@ -32,8 +32,8 @@ R_Sky_Init
 */
 void R_Sky_Init()
 {
-	tr.viewParms.isPortalSky = qfalse;
-	tr.portalsky.numSurfs = 0;
+    tr.viewParms.isPortalSky = qfalse;
+    tr.portalsky.numSurfs    = 0;
 }
 
 /*
@@ -48,14 +48,14 @@ void R_Sky_Reset()
         return;
     }
 
-	tr.portalsky.mins[0] = 8192.0;
-	tr.portalsky.mins[1] = 8192.0;
-	tr.portalsky.mins[2] = 8192.0;
-	tr.portalsky.maxs[0] = -8192.0;
-	tr.portalsky.maxs[1] = -8192.0;
-	tr.portalsky.maxs[2] = -8192.0;
-	tr.portalsky.cntNode = 0;
-	tr.portalsky.numSurfs = 0;
+    tr.portalsky.mins[0]  = 8192.0;
+    tr.portalsky.mins[1]  = 8192.0;
+    tr.portalsky.mins[2]  = 8192.0;
+    tr.portalsky.maxs[0]  = -8192.0;
+    tr.portalsky.maxs[1]  = -8192.0;
+    tr.portalsky.maxs[2]  = -8192.0;
+    tr.portalsky.cntNode  = 0;
+    tr.portalsky.numSurfs = 0;
 }
 
 /*
@@ -64,39 +64,36 @@ R_Sky_AddSurf
 
 =================
 */
-void R_Sky_AddSurf(msurface_t* surf)
+void R_Sky_AddSurf(msurface_t *surf)
 {
-	if (tr.viewParms.isPortalSky)
-	{
-		static int last_sky_warning = 0;
+    if (tr.viewParms.isPortalSky) {
+        static int last_sky_warning = 0;
 
-		if (tr.refdef.time - 1000 > last_sky_warning)
-		{
-			ri.Printf(3, "WARNING: sky being drawn in a sky portal!  Bad!  Bad!\n");
-			last_sky_warning = tr.refdef.time;
-		}
+        if (tr.refdef.time - 1000 > last_sky_warning) {
+            ri.Printf(3, "WARNING: sky being drawn in a sky portal!  Bad!  Bad!\n");
+            last_sky_warning = tr.refdef.time;
+        }
 
-		return;
-	}
+        return;
+    }
 
-	if (tr.portalsky.numSurfs < 32) {
-		tr.portalsky.skySurfs[tr.portalsky.numSurfs++] = surf;
-	}
+    if (tr.portalsky.numSurfs < 32) {
+        tr.portalsky.skySurfs[tr.portalsky.numSurfs++] = surf;
+    }
 
-	if (tr.portalsky.cntNode)
-	{
-		int i;
+    if (tr.portalsky.cntNode) {
+        int i;
 
-		for (i = 0; i < 3; i++) {
-			if (tr.portalsky.mins[i] >= tr.portalsky.cntNode->mins[i]) {
-				tr.portalsky.mins[i] = tr.portalsky.cntNode->mins[i];
-			}
+        for (i = 0; i < 3; i++) {
+            if (tr.portalsky.mins[i] >= tr.portalsky.cntNode->mins[i]) {
+                tr.portalsky.mins[i] = tr.portalsky.cntNode->mins[i];
+            }
 
-			if (tr.portalsky.maxs[i] >= tr.portalsky.cntNode->maxs[i]) {
-				tr.portalsky.maxs[i] = tr.portalsky.cntNode->maxs[i];
-			}
-		}
-	}
+            if (tr.portalsky.maxs[i] >= tr.portalsky.cntNode->maxs[i]) {
+                tr.portalsky.maxs[i] = tr.portalsky.cntNode->maxs[i];
+            }
+        }
+    }
 }
 
 /*
@@ -105,10 +102,11 @@ R_Sky_Render
 
 =================
 */
-void R_Sky_Render() {
-    int i;
+void R_Sky_Render()
+{
+    int         i;
     viewParms_t newParms, oldParms;
-    mnode_t* leaf;
+    mnode_t    *leaf;
 
     if (!tr.portalsky.numSurfs) {
         return;
@@ -123,12 +121,16 @@ void R_Sky_Render() {
         return;
     }
 
-	if (tr.viewParms.isPortalSky) {
-		return;
-	}
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
 
     for (i = 0; i < tr.portalsky.numSurfs; i++) {
-        if (!SurfIsOffscreen((const srfSurfaceFace_t*)tr.portalsky.skySurfs[i]->data, tr.portalsky.skySurfs[i]->shader, ENTITYNUM_WORLD)) {
+        if (!SurfIsOffscreen(
+                (const srfSurfaceFace_t *)tr.portalsky.skySurfs[i]->data,
+                tr.portalsky.skySurfs[i]->shader,
+                ENTITYNUM_WORLD
+            )) {
             break;
         }
     }
@@ -140,30 +142,33 @@ void R_Sky_Render() {
     oldParms = tr.viewParms;
     newParms = tr.viewParms;
 
-	if (r_skyportal->integer)
-	{
-		if (sscanf(r_skyportal_origin->string, "%f %f %f", &newParms.ori.origin[0], &newParms.ori.origin[1], &newParms.ori.origin[2]) != 3)
-		{
-			ri.Printf(PRINT_WARNING, "WARNING: Invalid sky portal origin: %s\n", r_skyportal_origin->string);
-			return;
-		}
-	}
-	else
-	{
+    if (r_skyportal->integer) {
+        if (sscanf(
+                r_skyportal_origin->string,
+                "%f %f %f",
+                &newParms.ori.origin[0],
+                &newParms.ori.origin[1],
+                &newParms.ori.origin[2]
+            )
+            != 3) {
+            ri.Printf(PRINT_WARNING, "WARNING: Invalid sky portal origin: %s\n", r_skyportal_origin->string);
+            return;
+        }
+    } else {
         VectorCopy(tr.refdef.sky_origin, newParms.ori.origin);
-		MatrixMultiply(newParms.ori.axis, tr.refdef.sky_axis, newParms.ori.axis);
-	}
+        MatrixMultiply(newParms.ori.axis, tr.refdef.sky_axis, newParms.ori.axis);
+    }
 
     VectorCopy(newParms.ori.origin, newParms.pvsOrigin);
-	newParms.isPortalSky = qtrue;
-	newParms.farplane_distance = tr.refdef.skybox_farplane;
-	newParms.renderTerrain = tr.refdef.render_terrain;
+    newParms.isPortalSky       = qtrue;
+    newParms.farplane_distance = tr.refdef.skybox_farplane;
+    newParms.renderTerrain     = tr.refdef.render_terrain;
 
-	if (oldParms.farplane_bias == 0.0 || oldParms.farplane_distance == 0.0) {
-		newParms.farplane_bias = 0.0;
-	} else {
-		newParms.farplane_bias = newParms.farplane_distance / oldParms.farplane_distance * oldParms.farplane_bias;
-	}
+    if (oldParms.farplane_bias == 0.0 || oldParms.farplane_distance == 0.0) {
+        newParms.farplane_bias = 0.0;
+    } else {
+        newParms.farplane_bias = newParms.farplane_distance / oldParms.farplane_distance * oldParms.farplane_bias;
+    }
 
     leaf = R_PointInLeaf(newParms.pvsOrigin);
     if (leaf) {
@@ -172,11 +177,11 @@ void R_Sky_Render() {
 
     tr.viewParms = oldParms;
 
-	tr.portalsky.numSurfs = 0;
-	tr.skyRendered = qtrue;
+    tr.portalsky.numSurfs = 0;
+    tr.skyRendered        = qtrue;
 
-	R_RotateForViewer();
-	R_SetupFrustum();
+    R_RotateForViewer();
+    R_SetupFrustum();
 }
 
 /*
@@ -185,12 +190,13 @@ R_Sky_ChangeFrustum
 
 =================
 */
-void R_Sky_ChangeFrustum() {
-    cplane_t* frust;
-    int i;
-    vec3_t bounds[2];
-    vec3_t origin;
-    cplane_t abouts[4];
+void R_Sky_ChangeFrustum()
+{
+    cplane_t *frust;
+    int       i;
+    vec3_t    bounds[2];
+    vec3_t    origin;
+    cplane_t  abouts[4];
 
     VectorCopy(tr.portalsky.mins, bounds[0]);
     VectorCopy(tr.portalsky.maxs, bounds[1]);
@@ -203,8 +209,8 @@ void R_Sky_ChangeFrustum() {
 
     for (i = 0; i < 4; i++) {
         cplane_t out;
-        int i1;
-        float leastfov = 99999;
+        int      i1;
+        float    leastfov = 99999;
 
         frust = &tr.viewParms.frustum[i];
 
@@ -213,9 +219,9 @@ void R_Sky_ChangeFrustum() {
 
         for (i1 = 0; i1 < 8; i1++) {
             vec3_t point;
-            vec_t distFromFrustum;
-            float angle;
-            int i2;
+            vec_t  distFromFrustum;
+            float  angle;
+            int    i2;
 
             for (i2 = 0; i2 < 3; i2++) {
                 point[i2] = bounds[i1 % 3][i2];
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index ee3ee1bf..4f98c527 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -143,7 +143,7 @@ static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
     pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
     assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight);
 
-    // Calculate the average Z 
+    // Calculate the average Z
     pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
     pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
     pVert->fHgtAvg += pPatch->z0;
diff --git a/code/renderergl1/tr_util.cpp b/code/renderergl1/tr_util.cpp
index 4950e5ac..3853f50f 100644
--- a/code/renderergl1/tr_util.cpp
+++ b/code/renderergl1/tr_util.cpp
@@ -1,61 +1,62 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
-This file is part of Quake III Arena source code.
+This file is part of OpenMoHAA source code.
 
-Quake III Arena source code is free software; you can redistribute it
+OpenMoHAA source code is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Quake III Arena source code is distributed in the hope that it will be
+OpenMoHAA source code is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
+
 // tr_util.c -- renderer utility
 
 #include "tr_local.h"
 #include "../qcommon/str.h"
 
-static byte cntColor[4];
-static float cntSt[ 2 ];
+static byte  cntColor[4];
+static float cntSt[2];
 
 static int Numbers[12][8] = {
-    { 1, 3, 4, 5, 6, 7, 0, 0 },
-    { 4, 5, 0, 0, 0, 0, 0, 0 },
-    { 1, 4, 2, 7, 3, 0, 0, 0 },
-    { 1, 4, 2, 5, 3, 0, 0, 0 },
-    { 6, 4, 2, 5, 0, 0, 0, 0 },
-    { 1, 6, 2, 5, 3, 0, 0, 0 },
-    { 1, 6, 2, 5, 7, 3, 0, 0 },
-    { 1, 8, 0, 0, 0, 0, 0, 0 },
-    { 1, 2, 3, 4, 5, 6, 7, 0 },
-    { 1, 6, 4, 2, 5, 3, 0, 0 },
-    { 9, 10, 11, 12, 0, 0, 0, 0 },
-    { 2, 0, 0, 0, 0, 0, 0, 0 }
+    {1, 3,  4,  5,  6, 7, 0, 0},
+    {4, 5,  0,  0,  0, 0, 0, 0},
+    {1, 4,  2,  7,  3, 0, 0, 0},
+    {1, 4,  2,  5,  3, 0, 0, 0},
+    {6, 4,  2,  5,  0, 0, 0, 0},
+    {1, 6,  2,  5,  3, 0, 0, 0},
+    {1, 6,  2,  5,  7, 3, 0, 0},
+    {1, 8,  0,  0,  0, 0, 0, 0},
+    {1, 2,  3,  4,  5, 6, 7, 0},
+    {1, 6,  4,  2,  5, 3, 0, 0},
+    {9, 10, 11, 12, 0, 0, 0, 0},
+    {2, 0,  0,  0,  0, 0, 0, 0}
 };
 
 static float Lines[13][4] = {
-    { 0.0, 0.0, 0.0, 0.0 },
-    { -4.0, 8.0, 4.0, 8.0 },
-    { -4.0, 4.0, 4.0, 4.0 },
-    { -4.0, 0.0, 4.0, 0.0 },
-    { 4.0, 8.0, 4.0, 4.0 },
-    { 4.0, 4.0, 4.0, 0.0 },
-    { -4.0, 8.0, -4.0, 4.0 },
-    { -4.0, 4.0, -4.0, 0.0 },
-    { 4.0, 8.0, -4.0, 0.0 },
-    { -1.0, 2.0, 1.0, 2.0 },
-    { 1.0, 2.0, 1.0, 0.0 },
-    { -1.0, 0.0, 1.0, 0.0 },
-    { -1.0, 0.0, -1.0, 2.0 }
+    {0.0,  0.0, 0.0,  0.0},
+    {-4.0, 8.0, 4.0,  8.0},
+    {-4.0, 4.0, 4.0,  4.0},
+    {-4.0, 0.0, 4.0,  0.0},
+    {4.0,  8.0, 4.0,  4.0},
+    {4.0,  4.0, 4.0,  0.0},
+    {-4.0, 8.0, -4.0, 4.0},
+    {-4.0, 4.0, -4.0, 0.0},
+    {4.0,  8.0, -4.0, 0.0},
+    {-1.0, 2.0, 1.0,  2.0},
+    {1.0,  2.0, 1.0,  0.0},
+    {-1.0, 0.0, 1.0,  0.0},
+    {-1.0, 0.0, -1.0, 2.0}
 };
 
 /*
@@ -63,8 +64,9 @@ static float Lines[13][4] = {
 RB_StreamBegin
 ===============
 */
-void RB_StreamBegin( shader_t *shader ) {
-	RB_BeginSurface( shader );
+void RB_StreamBegin(shader_t *shader)
+{
+    RB_BeginSurface(shader);
 }
 
 /*
@@ -72,26 +74,27 @@ void RB_StreamBegin( shader_t *shader ) {
 RB_StreamEnd
 ===============
 */
-void RB_StreamEnd( void ) {
-	int i;
+void RB_StreamEnd(void)
+{
+    int i;
 
-	if( tess.numVertexes <= 2 ) {
-		RB_EndSurface();
-		return;
-	}
+    if (tess.numVertexes <= 2) {
+        RB_EndSurface();
+        return;
+    }
 
-	tess.indexes[ 0 ] = 0;
-	tess.indexes[ 1 ] = 1;
-	tess.indexes[ 2 ] = 2;
+    tess.indexes[0] = 0;
+    tess.indexes[1] = 1;
+    tess.indexes[2] = 2;
 
-	for( i = 0; i < tess.numVertexes - 2; i++ ) {
-		tess.indexes[ i * 3 + 0 ] = ( i & 1 ) + i;
-		tess.indexes[ i * 3 + 1 ] = i - ( ( i & 1 ) - 1 );
-		tess.indexes[ i * 3 + 2 ] = i + 2;
-		tess.numIndexes += 3;
-	}
+    for (i = 0; i < tess.numVertexes - 2; i++) {
+        tess.indexes[i * 3 + 0] = (i & 1) + i;
+        tess.indexes[i * 3 + 1] = i - ((i & 1) - 1);
+        tess.indexes[i * 3 + 2] = i + 2;
+        tess.numIndexes += 3;
+    }
 
-	RB_EndSurface();
+    RB_EndSurface();
 }
 
 /*
@@ -99,8 +102,9 @@ void RB_StreamEnd( void ) {
 RB_StreamBeginDrawSurf
 ===============
 */
-void RB_StreamBeginDrawSurf( void ) {
-	backEnd.dsStreamVert = tess.numVertexes;
+void RB_StreamBeginDrawSurf(void)
+{
+    backEnd.dsStreamVert = tess.numVertexes;
 }
 
 /*
@@ -108,22 +112,23 @@ void RB_StreamBeginDrawSurf( void ) {
 RB_StreamEndDrawSurf
 ===============
 */
-void RB_StreamEndDrawSurf( void ) {
-	int		numverts;
-	int		i;
+void RB_StreamEndDrawSurf(void)
+{
+    int numverts;
+    int i;
 
-	if( tess.numVertexes - backEnd.dsStreamVert <= 2 ) {
-		tess.numVertexes = backEnd.dsStreamVert;
-		return;
-	}
+    if (tess.numVertexes - backEnd.dsStreamVert <= 2) {
+        tess.numVertexes = backEnd.dsStreamVert;
+        return;
+    }
 
-	numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
-	for( i = 0; i < numverts; i++ ) {
-		tess.indexes[ i + tess.numIndexes ] = ( i & 1 ) + i + backEnd.dsStreamVert;
-		tess.indexes[ i + tess.numIndexes + 1 ] = i + backEnd.dsStreamVert - ( ( i & 1 ) - 1 );
-		tess.indexes[ i + tess.numIndexes + 2 ] = i + backEnd.dsStreamVert + 2;
-		tess.numIndexes += 3;
-	}
+    numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
+    for (i = 0; i < numverts; i++) {
+        tess.indexes[i + tess.numIndexes]     = (i & 1) + i + backEnd.dsStreamVert;
+        tess.indexes[i + tess.numIndexes + 1] = i + backEnd.dsStreamVert - ((i & 1) - 1);
+        tess.indexes[i + tess.numIndexes + 2] = i + backEnd.dsStreamVert + 2;
+        tess.numIndexes += 3;
+    }
 }
 
 /*
@@ -131,15 +136,16 @@ void RB_StreamEndDrawSurf( void ) {
 addTriangle
 ===============
 */
-static void addTriangle( void ) {
-	tess.texCoords[ tess.numVertexes ][ 0 ][ 0 ] = cntSt[ 0 ];
-	tess.texCoords[ tess.numVertexes ][ 0 ][ 1 ] = cntSt[ 1 ];
-	tess.vertexColors[ tess.numVertexes ][ 0 ] = cntColor[ 0 ];
-	tess.vertexColors[ tess.numVertexes ][ 1 ] = cntColor[ 1 ];
-	tess.vertexColors[ tess.numVertexes ][ 2 ] = cntColor[ 2 ];
-	tess.vertexColors[ tess.numVertexes ][ 3 ] = cntColor[ 3 ];
-	tess.vertexColorValid = qtrue;
-	tess.numVertexes++;
+static void addTriangle(void)
+{
+    tess.texCoords[tess.numVertexes][0][0] = cntSt[0];
+    tess.texCoords[tess.numVertexes][0][1] = cntSt[1];
+    tess.vertexColors[tess.numVertexes][0] = cntColor[0];
+    tess.vertexColors[tess.numVertexes][1] = cntColor[1];
+    tess.vertexColors[tess.numVertexes][2] = cntColor[2];
+    tess.vertexColors[tess.numVertexes][3] = cntColor[3];
+    tess.vertexColorValid                  = qtrue;
+    tess.numVertexes++;
 }
 
 /*
@@ -147,9 +153,10 @@ static void addTriangle( void ) {
 RB_Vertex3fv
 ===============
 */
-void RB_Vertex3fv( vec3_t v ) {
-	VectorCopy( v, tess.xyz[ tess.numVertexes ] );
-	addTriangle();
+void RB_Vertex3fv(vec3_t v)
+{
+    VectorCopy(v, tess.xyz[tess.numVertexes]);
+    addTriangle();
 }
 
 /*
@@ -157,11 +164,12 @@ void RB_Vertex3fv( vec3_t v ) {
 RB_Vertex3f
 ===============
 */
-void RB_Vertex3f( vec_t x, vec_t y, vec_t z ) {
-	tess.xyz[ tess.numVertexes ][ 0 ] = x;
-	tess.xyz[ tess.numVertexes ][ 1 ] = y;
-	tess.xyz[ tess.numVertexes ][ 2 ] = z;
-	addTriangle();
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z)
+{
+    tess.xyz[tess.numVertexes][0] = x;
+    tess.xyz[tess.numVertexes][1] = y;
+    tess.xyz[tess.numVertexes][2] = z;
+    addTriangle();
 }
 
 /*
@@ -169,8 +177,9 @@ void RB_Vertex3f( vec_t x, vec_t y, vec_t z ) {
 RB_Vertex2f
 ===============
 */
-void RB_Vertex2f( vec_t x, vec_t y ) {
-	RB_Vertex3f( x, y, 0 );
+void RB_Vertex2f(vec_t x, vec_t y)
+{
+    RB_Vertex3f(x, y, 0);
 }
 
 /*
@@ -178,11 +187,12 @@ void RB_Vertex2f( vec_t x, vec_t y ) {
 RB_Color4f
 ===============
 */
-void RB_Color4f( vec_t r, vec_t g, vec_t b, vec_t a ) {
-	cntColor[ 0 ] = r * tr.identityLightByte;
-	cntColor[ 1 ] = g * tr.identityLightByte;
-	cntColor[ 2 ] = b * tr.identityLightByte;
-	cntColor[ 3 ] = a * 255.0;
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a)
+{
+    cntColor[0] = r * tr.identityLightByte;
+    cntColor[1] = g * tr.identityLightByte;
+    cntColor[2] = b * tr.identityLightByte;
+    cntColor[3] = a * 255.0;
 }
 
 /*
@@ -190,8 +200,9 @@ void RB_Color4f( vec_t r, vec_t g, vec_t b, vec_t a ) {
 RB_Color3f
 ===============
 */
-void RB_Color3f( vec_t r, vec_t g, vec_t b ) {
-	RB_Color4f( r, g, b, 1.0 );
+void RB_Color3f(vec_t r, vec_t g, vec_t b)
+{
+    RB_Color4f(r, g, b, 1.0);
 }
 
 /*
@@ -199,8 +210,9 @@ void RB_Color3f( vec_t r, vec_t g, vec_t b ) {
 RB_Color3fv
 ===============
 */
-void RB_Color3fv( vec3_t col ) {
-	RB_Color3f( col[ 0 ], col[ 1 ], col[ 2 ] );
+void RB_Color3fv(vec3_t col)
+{
+    RB_Color3f(col[0], col[1], col[2]);
 }
 
 /*
@@ -208,11 +220,12 @@ void RB_Color3fv( vec3_t col ) {
 RB_Color4bv
 ===============
 */
-void RB_Color4bv( unsigned char *colors ) {
-	cntColor[ 0 ] = colors[ 0 ];
-	cntColor[ 1 ] = colors[ 1 ];
-	cntColor[ 2 ] = colors[ 2 ];
-	cntColor[ 3 ] = colors[ 3 ];
+void RB_Color4bv(unsigned char *colors)
+{
+    cntColor[0] = colors[0];
+    cntColor[1] = colors[1];
+    cntColor[2] = colors[2];
+    cntColor[3] = colors[3];
 }
 
 /*
@@ -220,9 +233,10 @@ void RB_Color4bv( unsigned char *colors ) {
 RB_Texcoord2f
 ===============
 */
-void RB_Texcoord2f( float s, float t ) {
-	cntSt[ 0 ] = s;
-	cntSt[ 1 ] = t;
+void RB_Texcoord2f(float s, float t)
+{
+    cntSt[0] = s;
+    cntSt[1] = t;
 }
 
 /*
@@ -230,9 +244,10 @@ void RB_Texcoord2f( float s, float t ) {
 RB_Texcoord2fv
 ===============
 */
-void RB_Texcoord2fv( vec2_t st ) {
-	cntSt[ 0 ] = st[ 0 ];
-	cntSt[ 1 ] = st[ 1 ];
+void RB_Texcoord2fv(vec2_t st)
+{
+    cntSt[0] = st[0];
+    cntSt[1] = st[1];
 }
 
 /*
@@ -240,70 +255,69 @@ void RB_Texcoord2fv( vec2_t st ) {
 R_DrawDebugNumber
 ===============
 */
-void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, float g, float b, int precision ) {
-	vec3_t up, right;
-	vec3_t pos1, pos2;
-	vec3_t start;
-	str text;
-	char format[20];
-	int i;
-	int j;
-	int l;
-	int num;
-	
-	VectorCopy(tr.viewParms.ori.axis[2], up);
-	VectorCopy(tr.viewParms.ori.axis[1], right);
-	VectorNegate(right, right);
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision)
+{
+    vec3_t up, right;
+    vec3_t pos1, pos2;
+    vec3_t start;
+    str    text;
+    char   format[20];
+    int    i;
+    int    j;
+    int    l;
+    int    num;
 
-	VectorNormalize(up);
-	VectorNormalize(right);
+    VectorCopy(tr.viewParms.ori.axis[2], up);
+    VectorCopy(tr.viewParms.ori.axis[1], right);
+    VectorNegate(right, right);
 
-	VectorScale(up, scale, up);
-	VectorScale(right, scale, right);
+    VectorNormalize(up);
+    VectorNormalize(right);
+
+    VectorScale(up, scale, up);
+    VectorScale(right, scale, right);
 
     if (precision > 0) {
-		Com_sprintf(format, sizeof(format), "%%.%df", precision);
+        Com_sprintf(format, sizeof(format), "%%.%df", precision);
         text = va(format, number);
-	} else {
-		text = va("%d", (int)number);
-	}
+    } else {
+        text = va("%d", (int)number);
+    }
 
-	// NOTE: this cast here is needed!
-	// Otherwise the compiler will do very nasty implicit casting of negative
-	// numbers to unsigned numbers, resulting in incorrect values.
-	// -------------------v
-	VectorMA(org, 5 - 5 * (int)text.length(), right, start);
+    // NOTE: this cast here is needed!
+    // Otherwise the compiler will do very nasty implicit casting of negative
+    // numbers to unsigned numbers, resulting in incorrect values.
+    // -------------------v
+    VectorMA(org, 5 - 5 * (int)text.length(), right, start);
 
-	// Draw each character/digit of the text
-	for (i = 0; i < text.length(); i++) {
-		if (text[i] == '.') {
-			num = 10;
-		}
-		else if (text[i] == '-') {
-			num = 11;
-		}
-		else {
-			num = text[i] - '0';
-		}
+    // Draw each character/digit of the text
+    for (i = 0; i < text.length(); i++) {
+        if (text[i] == '.') {
+            num = 10;
+        } else if (text[i] == '-') {
+            num = 11;
+        } else {
+            num = text[i] - '0';
+        }
 
-		// Get the first line index for the number to be drawn
-		l = Numbers[num][0];
+        // Get the first line index for the number to be drawn
+        l = Numbers[num][0];
 
-		// Draw each line of the character/digit
-		for (j = 0; j < 8 && l; ++j, l = Numbers[num][j]) {
+        // Draw each line of the character/digit
+        for (j = 0; j < 8 && l; ++j, l = Numbers[num][j]) {
             pos1[0] = start[0] + Lines[l][0] * right[0] + Lines[l][1] * up[0];
             pos1[1] = start[1] + Lines[l][0] * right[1] + Lines[l][1] * up[1];
             pos1[2] = start[2] + Lines[l][0] * right[2] + Lines[l][1] * up[2];
 
-			pos2[0] = start[0] + Lines[l][2] * right[0] + Lines[l][3] * up[0];
-			pos2[1] = start[1] + Lines[l][2] * right[1] + Lines[l][3] * up[1];
-			pos2[2] = start[2] + Lines[l][2] * right[2] + Lines[l][3] * up[2];
+            pos2[0] = start[0] + Lines[l][2] * right[0] + Lines[l][3] * up[0];
+            pos2[1] = start[1] + Lines[l][2] * right[1] + Lines[l][3] * up[1];
+            pos2[2] = start[2] + Lines[l][2] * right[2] + Lines[l][3] * up[2];
 
-			R_DebugLine(pos1, pos2, r, g, b, 1.0);
+            R_DebugLine(pos1, pos2, r, g, b, 1.0);
         }
 
-		VectorMA(start, 10.0, right, start);
-	}
+        VectorMA(start, 10.0, right, start);
+    }
 }
 
 /*
@@ -311,36 +325,38 @@ void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, fl
 R_DebugRotatedBBox
 ===============
 */
-void R_DebugRotatedBBox( const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha ) {
-	int i;
-	vec3_t tmp;
-	vec3_t points[8];
-	vec3_t axis[3];
+void R_DebugRotatedBBox(
+    const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha
+)
+{
+    int    i;
+    vec3_t tmp;
+    vec3_t points[8];
+    vec3_t axis[3];
 
-	AnglesToAxis(ang, axis);
+    AnglesToAxis(ang, axis);
 
-	for (i = 0; i < 8; i++) {
-		if (i & 1) {
-			tmp[0] = mins[0];
-		} else {
-			tmp[0] = maxs[0];
+    for (i = 0; i < 8; i++) {
+        if (i & 1) {
+            tmp[0] = mins[0];
+        } else {
+            tmp[0] = maxs[0];
         }
 
         if (i & 2) {
             tmp[1] = mins[1];
-        }
-        else {
+        } else {
             tmp[1] = maxs[1];
         }
 
-		if (i & 4) {
-			tmp[2] = mins[2];
-		} else {
-			tmp[2] = maxs[2];
-		}
+        if (i & 4) {
+            tmp[2] = mins[2];
+        } else {
+            tmp[2] = maxs[2];
+        }
 
-		points[i][0] = tmp[0] * axis[0][0];
-		points[i][1] = tmp[0] * axis[0][1];
+        points[i][0] = tmp[0] * axis[0][0];
+        points[i][1] = tmp[0] * axis[0][1];
         points[i][2] = tmp[0] * axis[0][2];
 
         points[i][0] += tmp[1] * axis[1][0];
@@ -351,10 +367,10 @@ void R_DebugRotatedBBox( const vec3_t org, const vec3_t ang, const vec3_t mins,
         points[i][1] += tmp[2] * axis[2][1];
         points[i][2] += tmp[2] * axis[2][2];
 
-		points[i][0] += org[0];
-		points[i][1] += org[1];
-		points[i][2] += org[2];
-	}
+        points[i][0] += org[0];
+        points[i][1] += org[1];
+        points[i][2] += org[2];
+    }
 
     R_DebugLine(points[0], points[1], r, g, b, alpha);
     R_DebugLine(points[1], points[3], r, g, b, alpha);
@@ -365,9 +381,9 @@ void R_DebugRotatedBBox( const vec3_t org, const vec3_t ang, const vec3_t mins,
     R_DebugLine(points[7], points[6], r, g, b, alpha);
     R_DebugLine(points[6], points[4], r, g, b, alpha);
 
-	for (i = 0; i < 4; i++) {
-		R_DebugLine(points[i], points[i + 4], r, g, b, alpha);
-	}
+    for (i = 0; i < 4; i++) {
+        R_DebugLine(points[i], points[i + 4], r, g, b, alpha);
+    }
 }
 
 /*
@@ -375,43 +391,9 @@ void R_DebugRotatedBBox( const vec3_t org, const vec3_t ang, const vec3_t mins,
 RE_GetShaderWidth
 ===============
 */
-int RE_GetShaderWidth( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	} else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->unfoggedStages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadWidth;
-}
-
-/*
-===============
-RE_GetShaderHeight
-===============
-*/
-int RE_GetShaderHeight( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->unfoggedStages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadHeight;
-}
-
-/*
-===============
-RE_GetShaderName
-===============
-*/
-const char* RE_GetShaderName(qhandle_t hShader) {
-    shader_t* shader;
+int RE_GetShaderWidth(qhandle_t hShader)
+{
+    shader_t *shader;
 
     if (hShader) {
         shader = R_GetShaderByHandle(hShader);
@@ -419,7 +401,43 @@ const char* RE_GetShaderName(qhandle_t hShader) {
         shader = tr.defaultShader;
     }
 
-	return shader->name;
+    return shader->unfoggedStages[0]->bundle[0].image[0]->uploadWidth;
+}
+
+/*
+===============
+RE_GetShaderHeight
+===============
+*/
+int RE_GetShaderHeight(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->unfoggedStages[0]->bundle[0].image[0]->uploadHeight;
+}
+
+/*
+===============
+RE_GetShaderName
+===============
+*/
+const char *RE_GetShaderName(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->name;
 }
 
 /*
@@ -427,14 +445,15 @@ const char* RE_GetShaderName(qhandle_t hShader) {
 RE_GetModelName
 ===============
 */
-const char* RE_GetModelName(qhandle_t hModel) {
+const char *RE_GetModelName(qhandle_t hModel)
+{
     model_t *model;
 
-	if (!hModel) {
-		return "";
-	}
+    if (!hModel) {
+        return "";
+    }
 
-	model = R_GetModelByHandle(hModel);
+    model = R_GetModelByHandle(hModel);
 
-	return model->name;
+    return model->name;
 }

From 390c1d3f3d3af68645c57ac4cb591cac171857ab Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 21:18:54 +0100
Subject: [PATCH 1689/2040] Move tiki_mesh inclusion to renderercommon
 CMakeLists

---
 code/renderercommon/CMakeLists.txt | 4 ++++
 code/renderergl1/CMakeLists.txt    | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/renderercommon/CMakeLists.txt b/code/renderercommon/CMakeLists.txt
index 2b3358aa..9ff89d4e 100644
--- a/code/renderercommon/CMakeLists.txt
+++ b/code/renderercommon/CMakeLists.txt
@@ -4,6 +4,10 @@ project(omohrenderer)
 
 file(GLOB_RECURSE SOURCES_RENDERER_COMMON "./*.c" "./*.cpp")
 
+set(SOURCES_RENDERER_COMMON ${SOURCES_RENDERER_COMMON}
+	"../tiki/tiki_mesh.cpp"
+)
+
 add_library(omohrenderer_common STATIC ${SOURCES_RENDERER_COMMON})
 target_include_directories(omohrenderer_common PUBLIC "../sdl" "./")
 target_link_libraries(omohrenderer_common PUBLIC qcommon_shared)
diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
index fb2222a5..16e42d9a 100644
--- a/code/renderergl1/CMakeLists.txt
+++ b/code/renderergl1/CMakeLists.txt
@@ -4,10 +4,6 @@ project(omohrenderergl1)
 
 file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
 
-set(SOURCES_RENDERER ${SOURCES_RENDERER}
-	"../tiki/tiki_mesh.cpp"
-)
-
 if (${USE_RENDERER_DLOPEN})
 	add_library(omohrenderergl1 SHARED ${SOURCES_RENDERER})
 else()

From fe16f999d84bcbced222b021556449f1b18d2d26 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 22:05:28 +0100
Subject: [PATCH 1690/2040] Use ri.Printf to print instead of the Com_*
 functions

---
 code/renderergl1/tr_cmds.c           |  2 +-
 code/renderergl1/tr_font.cpp         | 12 ++++++------
 code/renderergl1/tr_image.c          |  4 ++--
 code/renderergl1/tr_init.c           | 14 +++++++-------
 code/renderergl1/tr_main.c           |  2 +-
 code/renderergl1/tr_model.cpp        | 10 +++++-----
 code/renderergl1/tr_shade_calc.c     |  6 +++---
 code/renderergl1/tr_shader.c         |  4 ++--
 code/renderergl1/tr_staticmodels.cpp | 12 ++++++------
 code/renderergl1/tr_terrain.c        |  6 +++---
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/code/renderergl1/tr_cmds.c b/code/renderergl1/tr_cmds.c
index a7d4fd35..f389ac70 100644
--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
@@ -25,7 +25,7 @@ static backEndCounters_t pc_save;
 
 /*
 =====================
-R_PerformanceCounters
+R_SavePerformanceCounters
 =====================
 */
 void R_SavePerformanceCounters(void) {
diff --git a/code/renderergl1/tr_font.cpp b/code/renderergl1/tr_font.cpp
index 4d634018..cb567413 100644
--- a/code/renderergl1/tr_font.cpp
+++ b/code/renderergl1/tr_font.cpp
@@ -604,7 +604,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
         case '\t':
             indirected = font->indirection[32];
             if (indirected == -1) {
-                Com_DPrintf("R_DrawString: no space-character in font!\n");
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no space-character in font!\n");
             } else {
                 x = s_fontGeneralScale * font->locations[indirected].size[0] * 256.0 * 3.0 + x;
             }
@@ -624,10 +624,10 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
             indirected = font->indirection[c];
             if (indirected == -1)
             {
-                Com_DPrintf("R_DrawString: no 0x%02x-character in font!\n", c);
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no 0x%02x-character in font!\n", c);
                 indirected = font->indirection['?'];
                 if (indirected == -1) {
-                    Com_DPrintf("R_DrawString: no '?' character in font!\n");
+                    ri.Printf(PRINT_DEVELOPER, "R_DrawString: no '?' character in font!\n");
                     break;
 				}
                 // set the indirection for the next time
@@ -829,7 +829,7 @@ void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const ve
         indirected = font->indirection[c];
         if (indirected == -1)
         {
-            Com_Printf("R_DrawFloatingString: no 0x%02x-character in font!\n", c);
+            ri.Printf(PRINT_ALL, "R_DrawFloatingString: no 0x%02x-character in font!\n", c);
             continue;
         }
 
@@ -920,7 +920,7 @@ float R_GetFontStringWidth_sgl(const fontheader_sgl_t* font, const char* s)
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0] * 3.0;
             } else {
-                Com_Printf("R_GetFontStringWidth: no space-character in font!\n");
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no space-character in font!\n");
             }
         }
         else
@@ -929,7 +929,7 @@ float R_GetFontStringWidth_sgl(const fontheader_sgl_t* font, const char* s)
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0];
             } else {
-                Com_Printf("R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
             }
         }
     }
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index 50d58968..e1a3f0d5 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -3140,12 +3140,12 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 	char		surfName[MAX_QPATH];
 
 	if ( !name || !name[0] ) {
-		Com_Printf( "Empty name passed to RE_RegisterSkin\n" );
+		ri.Printf(PRINT_ALL,  "Empty name passed to RE_RegisterSkin\n" );
 		return 0;
 	}
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Skin name exceeds MAX_QPATH\n" );
+		ri.Printf(PRINT_ALL,  "Skin name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index d49ce74b..fa6742be 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -1285,17 +1285,17 @@ FarPlaneInfo_f
 ==================
 */
 void FarPlaneInfo_f(void) {
-	Com_Printf("Current fog settings:\n");
-	Com_Printf("Distance: %i\n", (int)tr.viewParms.farplane_distance);
-	Com_Printf(
+	ri.Printf(PRINT_ALL, "Current fog settings:\n");
+	ri.Printf(PRINT_ALL, "Distance: %i\n", (int)tr.viewParms.farplane_distance);
+	ri.Printf(PRINT_ALL, 
 		"Color: %f  %f  %f\n",
 		tr.viewParms.farplane_color[0],
 		tr.viewParms.farplane_color[1],
 		tr.viewParms.farplane_color[2]);
 	if (tr.viewParms.farplane_cull) {
-		Com_Printf("Cull: on\n");
+		ri.Printf(PRINT_ALL, "Cull: on\n");
 	} else {
-		Com_Printf("Cull: off\n");
+		ri.Printf(PRINT_ALL, "Cull: off\n");
 	}
 }
 
@@ -1645,7 +1645,7 @@ void R_Init( void ) {
 //	Swap_Init();
 
 	if ( (intptr_t)tess.xyz & 15 ) {
-		Com_Printf( "WARNING: tess.xyz not 16 byte aligned\n" );
+		ri.Printf(PRINT_ALL,  "WARNING: tess.xyz not 16 byte aligned\n" );
 	}
 	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );
 
@@ -1835,7 +1835,7 @@ void RE_EndRegistration( void ) {
 
 		end = ri.Milliseconds();
 
-		Com_Printf("RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
+		ri.Printf(PRINT_ALL, "RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
 
 	R_FreeUnusedImages();
diff --git a/code/renderergl1/tr_main.c b/code/renderergl1/tr_main.c
index 0aab1d9d..240e321c 100644
--- a/code/renderergl1/tr_main.c
+++ b/code/renderergl1/tr_main.c
@@ -1531,7 +1531,7 @@ void R_AddEntitySurfaces (void) {
 			} else {
 				switch ( tr.currentModel->type ) {
 				case MOD_SPRITE:
-					Com_Printf("sprite model '%s' being added to renderer!\n", tr.currentModel->name);
+					ri.Printf(PRINT_ALL, "sprite model '%s' being added to renderer!\n", tr.currentModel->name);
 					break;
 				case MOD_TIKI:
 					R_AddSkelSurfaces( ent );
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
index a8009232..660b128e 100644
--- a/code/renderergl1/tr_model.cpp
+++ b/code/renderergl1/tr_model.cpp
@@ -183,7 +183,7 @@ static qhandle_t R_RegisterModelInternal(const char *name, qboolean bBeginTiki,
     }
 
     if (strlen(name) >= 128) {
-        Com_Printf("Model name exceeds MAX_MODEL_NAME\n");
+        ri.Printf(PRINT_ALL, "Model name exceeds MAX_MODEL_NAME\n");
         return 0;
     }
 
@@ -1661,10 +1661,10 @@ void R_PrintInfoWorldtris(void)
         totalNumTris += numTris;
         tiki      = backEnd.refdef.entities[i].e.tiki;
         skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
-        Com_Printf("ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+        ri.Printf(PRINT_ALL, "ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
     }
 
-    Com_Printf("total entity tris: %i\n\n", totalNumTris);
+    ri.Printf(PRINT_ALL, "total entity tris: %i\n\n", totalNumTris);
 
     totalNumTris = 0;
 
@@ -1677,10 +1677,10 @@ void R_PrintInfoWorldtris(void)
         totalNumTris += numTris;
         tiki      = backEnd.refdef.staticModels[i].tiki;
         skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
-        Com_Printf("sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+        ri.Printf(PRINT_ALL, "sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
     }
 
-    Com_Printf("total static model tris: %i\n\n", totalNumTris);
+    ri.Printf(PRINT_ALL, "total static model tris: %i\n\n", totalNumTris);
 }
 
 /*
diff --git a/code/renderergl1/tr_shade_calc.c b/code/renderergl1/tr_shade_calc.c
index 8fa2abd1..9c8dd658 100644
--- a/code/renderergl1/tr_shade_calc.c
+++ b/code/renderergl1/tr_shade_calc.c
@@ -1726,7 +1726,7 @@ void RB_CalcLightGridColor(unsigned char* colors)
 		}
 	}
 	else {
-		Com_Printf(
+		ri.Printf(PRINT_ALL, 
 			"##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
 			tess.shader->name);
 
@@ -1755,7 +1755,7 @@ void RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaM
 
         u.f = DotProduct(viewInModel, tess.normal[i]);
         u.f = fabs(u.f);
-        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+        ri.Printf(PRINT_ALL, "normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
 
 		u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
         u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
@@ -1782,7 +1782,7 @@ void RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, floa
         u.f = DotProduct(viewInModel, tess.normal[i]);
         u.f = fabs(u.f);
 		u.f = 1.0 - u.f;
-        Com_Printf("normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+        ri.Printf(PRINT_ALL, "normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
         
         u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
         u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 35409bb1..6a57ff72 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -3567,7 +3567,7 @@ qhandle_t RE_RegisterShader( const char *name ) {
 	shader_t	*sh;
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
+		ri.Printf(PRINT_ALL,  "Shader name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
@@ -3597,7 +3597,7 @@ qhandle_t RE_RegisterShaderNoMip( const char *name ) {
 	shader_t	*sh;
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
+		ri.Printf(PRINT_ALL,  "Shader name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
diff --git a/code/renderergl1/tr_staticmodels.cpp b/code/renderergl1/tr_staticmodels.cpp
index 3ea21917..c62f5674 100644
--- a/code/renderergl1/tr_staticmodels.cpp
+++ b/code/renderergl1/tr_staticmodels.cpp
@@ -525,8 +525,8 @@ void R_PrintInfoStaticModels()
     cStaticModelUnpacked_t *pSM[MAX_DISTINCT_STATIC_MODELS];
     int                     count;
 
-    Com_Printf("Static model info:\n");
-    Com_Printf("------------------\n");
+    ri.Printf(PRINT_ALL, "Static model info:\n");
+    ri.Printf(PRINT_ALL, "------------------\n");
 
     count        = 0;
     iRenderCount = 0;
@@ -541,7 +541,7 @@ void R_PrintInfoStaticModels()
         iRenderCount++;
 
         if (!SM->tiki) {
-            Com_Printf("ERROR: static model with no tiki\n");
+            ri.Printf(PRINT_ALL, "ERROR: static model with no tiki\n");
             continue;
         }
 
@@ -553,7 +553,7 @@ void R_PrintInfoStaticModels()
         }
 
         if (count >= MAX_DISTINCT_STATIC_MODELS) {
-            Com_Printf("R_PrintInfoStaticModels: MAX_DISTINCT_STATIC_MODELS exceeded - increase and recompile\n");
+            ri.Printf(PRINT_ALL, "R_PrintInfoStaticModels: MAX_DISTINCT_STATIC_MODELS exceeded - increase and recompile\n");
             break;
         }
 
@@ -566,12 +566,12 @@ void R_PrintInfoStaticModels()
         }
     }
 
-    Com_Printf("Total static models rendered: %d\n", iRenderCount);
+    ri.Printf(PRINT_ALL, "Total static models rendered: %d\n", iRenderCount);
 
     for (i = 0; i < count; i++) {
         skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tikis[i]->mesh[0]);
 
-        Com_Printf(
+        ri.Printf(PRINT_ALL, 
             "model: %s, version: %d, count: %d,\n culling min %.1f %.1f %.1f, max %.1f %.1f %.1f, radius %.1f\n",
             tikis[i]->a->name,
             skelmodel ? skelmodel->version : -1,
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index 4f98c527..ba16191c 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -689,7 +689,7 @@ static void R_PreTessellateTerrain()
         ri.Cvar_SetValue("ter_maxtris", 65535);
     }
 
-    Com_DPrintf("Using ter_maxtris = %d\n", ter_maxtris->integer);
+    ri.Printf(PRINT_DEVELOPER, "Using ter_maxtris = %d\n", ter_maxtris->integer);
 
     g_nTris  = ter_maxtris->integer * 2 + 1;
     g_nVerts = ter_maxtris->integer + 1;
@@ -999,7 +999,7 @@ static void R_DoTriSplitting()
                 // make sure there are sufficient number of tris
                 //
                 if (g_tri.nFree < 14 || g_vert.nFree < 14) {
-                    Com_DPrintf("WARNING: aborting terrain tessellation -- insufficient tris\n");
+                    ri.Printf(PRINT_DEVELOPER, "WARNING: aborting terrain tessellation -- insufficient tris\n");
                     return;
                 }
 
@@ -1336,7 +1336,7 @@ void R_AddTerrainSurfaces()
 
             if (ter_count->integer && (g_nSplit || g_nMerge)) {
                 if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
-                    Com_DPrintf(
+                    ri.Printf(PRINT_DEVELOPER, 
                         "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
                         g_nTris - g_tri.nFree,
                         g_nVerts - g_vert.nFree,

From 3d950764a2372000f590364093afcaff60ffa2ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 23:18:21 +0100
Subject: [PATCH 1691/2040] Add minimal renderergl2 implementation

This implementation should just let the game run without crashing, the renderer doesn't show anything yet
---
 code/renderercommon/CMakeLists.txt       |    2 +
 code/renderercommon/tr_types.h           |    2 +-
 code/renderergl2/CMakeLists.txt          |    5 +-
 code/renderergl2/new/tr_bsp.c            |   34 -
 code/renderergl2/new/tr_cmds.c           |   38 -
 code/renderergl2/new/tr_image.c          |   23 -
 code/renderergl2/new/tr_init.c           |  175 --
 code/renderergl2/new/tr_light.c          |   33 -
 code/renderergl2/new/tr_local.h          |  465 -----
 code/renderergl2/new/tr_local_begin.h    |  107 --
 code/renderergl2/new/tr_main.c           |  122 --
 code/renderergl2/new/tr_marks.c          |   35 -
 code/renderergl2/new/tr_model.cpp        | 1463 ----------------
 code/renderergl2/new/tr_scene.c          |   77 -
 code/renderergl2/new/tr_shade_calc.c     |   77 -
 code/renderergl2/new/tr_shader.c         |   29 -
 code/renderergl2/new/tr_sphere_shade.cpp |  129 --
 code/renderergl2/new/tr_sprite.c         |   66 -
 code/renderergl2/new/tr_swipe.cpp        |   44 -
 code/renderergl2/new/tr_util.cpp         |  260 ---
 code/renderergl2/new/tr_world.c          |   28 -
 code/renderergl2/tr_bsp.c                |   99 ++
 code/renderergl2/tr_cmds.c               |   22 +
 code/renderergl2/{new => }/tr_draw.c     |  234 ++-
 code/renderergl2/{new => }/tr_font.cpp   |  522 +++++-
 code/renderergl2/tr_ghost.cpp            | 1662 ++++++++++++++++++
 code/renderergl2/tr_ghost.h              |  300 ++++
 code/renderergl2/tr_image.c              |   95 +
 code/renderergl2/tr_init.c               |  284 +++
 code/renderergl2/tr_light.c              |   24 +
 code/renderergl2/tr_local.h              |  830 ++++++++-
 code/renderergl2/tr_main.c               |  418 +++++
 code/renderergl2/tr_marks.c              |   11 +-
 code/renderergl2/tr_marks_permanent.c    | 2001 ++++++++++++++++++++++
 code/renderergl2/tr_model.cpp            | 1880 ++++++++++++++++++++
 code/renderergl2/tr_scene.c              |  152 ++
 code/renderergl2/tr_shader.c             |   35 +
 code/renderergl2/tr_sky_portal.cpp       |  254 +++
 code/renderergl2/tr_sphere_shade.cpp     | 1465 ++++++++++++++++
 code/renderergl2/tr_sprite.c             |  218 +++
 code/renderergl2/tr_staticmodels.cpp     |  586 +++++++
 code/renderergl2/tr_sun_flare.cpp        |  732 ++++++++
 code/renderergl2/tr_swipe.cpp            |  183 ++
 code/renderergl2/tr_util.cpp             |  388 +++++
 code/renderergl2/tr_world.c              |   15 +-
 45 files changed, 12269 insertions(+), 3355 deletions(-)
 delete mode 100644 code/renderergl2/new/tr_bsp.c
 delete mode 100644 code/renderergl2/new/tr_cmds.c
 delete mode 100644 code/renderergl2/new/tr_image.c
 delete mode 100644 code/renderergl2/new/tr_init.c
 delete mode 100644 code/renderergl2/new/tr_light.c
 delete mode 100644 code/renderergl2/new/tr_local.h
 delete mode 100644 code/renderergl2/new/tr_local_begin.h
 delete mode 100644 code/renderergl2/new/tr_main.c
 delete mode 100644 code/renderergl2/new/tr_marks.c
 delete mode 100644 code/renderergl2/new/tr_model.cpp
 delete mode 100644 code/renderergl2/new/tr_scene.c
 delete mode 100644 code/renderergl2/new/tr_shade_calc.c
 delete mode 100644 code/renderergl2/new/tr_shader.c
 delete mode 100644 code/renderergl2/new/tr_sphere_shade.cpp
 delete mode 100644 code/renderergl2/new/tr_sprite.c
 delete mode 100644 code/renderergl2/new/tr_swipe.cpp
 delete mode 100644 code/renderergl2/new/tr_util.cpp
 delete mode 100644 code/renderergl2/new/tr_world.c
 rename code/renderergl2/{new => }/tr_draw.c (65%)
 rename code/renderergl2/{new => }/tr_font.cpp (52%)
 create mode 100644 code/renderergl2/tr_ghost.cpp
 create mode 100644 code/renderergl2/tr_ghost.h
 create mode 100644 code/renderergl2/tr_marks_permanent.c
 create mode 100644 code/renderergl2/tr_model.cpp
 create mode 100644 code/renderergl2/tr_sky_portal.cpp
 create mode 100644 code/renderergl2/tr_sphere_shade.cpp
 create mode 100644 code/renderergl2/tr_sprite.c
 create mode 100644 code/renderergl2/tr_staticmodels.cpp
 create mode 100644 code/renderergl2/tr_sun_flare.cpp
 create mode 100644 code/renderergl2/tr_swipe.cpp
 create mode 100644 code/renderergl2/tr_util.cpp

diff --git a/code/renderercommon/CMakeLists.txt b/code/renderercommon/CMakeLists.txt
index 9ff89d4e..de7634b9 100644
--- a/code/renderercommon/CMakeLists.txt
+++ b/code/renderercommon/CMakeLists.txt
@@ -10,6 +10,8 @@ set(SOURCES_RENDERER_COMMON ${SOURCES_RENDERER_COMMON}
 
 add_library(omohrenderer_common STATIC ${SOURCES_RENDERER_COMMON})
 target_include_directories(omohrenderer_common PUBLIC "../sdl" "./")
+target_compile_features(omohrenderer_common PUBLIC cxx_nullptr)
+target_compile_features(omohrenderer_common PUBLIC c_variadic_macros)
 target_link_libraries(omohrenderer_common PUBLIC qcommon_shared)
 target_link_libraries(omohrenderer_common PUBLIC omohsdl_gl)
 target_compile_definitions(omohrenderer_common PRIVATE USE_INTERNAL_JPEG=1)
diff --git a/code/renderercommon/tr_types.h b/code/renderercommon/tr_types.h
index a76a2d7c..a677d155 100644
--- a/code/renderercommon/tr_types.h
+++ b/code/renderercommon/tr_types.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define	MAX_DLIGHTS			32		// can't be increased, because bit flags are used on surfaces
 #define MAX_REAL_LIGHTS		32
 
-#define	REFENTITYNUM_BITS	10		// can't be increased without changing drawsurf bit packing
+#define	REFENTITYNUM_BITS	12		// can't be increased without changing drawsurf bit packing
 #define	REFENTITYNUM_MASK	((1<<REFENTITYNUM_BITS) - 1)
 // the last N-bit number (2^REFENTITYNUM_BITS - 1) is reserved for the special world refentity,
 //  and this is reflected by the value of MAX_REFENTITIES (which therefore is not a power-of-2)
diff --git a/code/renderergl2/CMakeLists.txt b/code/renderergl2/CMakeLists.txt
index 780d584a..f49c3e33 100644
--- a/code/renderergl2/CMakeLists.txt
+++ b/code/renderergl2/CMakeLists.txt
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.12)
 
 project(omohrenderergl2)
 
-file(GLOB SOURCES_RENDERER "./*.c" "./*.cpp" "../renderercommon/tr_*.c")
+file(GLOB SOURCES_RENDERER "*.c" "*.cpp" "../renderercommon/tr_*.c")
+# Remove Quake III old model source
+list(REMOVE_ITEM SOURCES_RENDERER "${CMAKE_CURRENT_SOURCE_DIR}/tr_model.c")
+
 include("glsl/shaders.cmake")
 
 if (${USE_RENDERER_DLOPEN})
diff --git a/code/renderergl2/new/tr_bsp.c b/code/renderergl2/new/tr_bsp.c
deleted file mode 100644
index dacb52d7..00000000
--- a/code/renderergl2/new/tr_bsp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-int RE_MapVersion(void)
-{
-    // FIXME: unimplemented
-    return 0;
-}
-
-void RE_PrintBSPFileSizes(void)
-{
-    // FIXME: unimplemented
-}
diff --git a/code/renderergl2/new/tr_cmds.c b/code/renderergl2/new/tr_cmds.c
deleted file mode 100644
index 90c60eba..00000000
--- a/code/renderergl2/new/tr_cmds.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-static backEndCounters_t pc_save;
-
-/*
-=====================
-R_PerformanceCounters
-=====================
-*/
-void R_SavePerformanceCounters(void) {
-    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
-}
-
-void R_SyncRenderThread() {
-    R_IssuePendingRenderCommands();
-}
diff --git a/code/renderergl2/new/tr_image.c b/code/renderergl2/new/tr_image.c
deleted file mode 100644
index c8106ae3..00000000
--- a/code/renderergl2/new/tr_image.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
diff --git a/code/renderergl2/new/tr_init.c b/code/renderergl2/new/tr_init.c
deleted file mode 100644
index 14969cfc..00000000
--- a/code/renderergl2/new/tr_init.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-cvar_t* r_reset_tc_array;
-cvar_t* r_numdebuglines;
-
-
-cvar_t* r_staticlod;
-cvar_t* r_lodscale;
-cvar_t* r_lodcap;
-cvar_t* r_lodviewmodelcap;
-
-cvar_t* r_uselod;
-cvar_t* lod_LOD;
-cvar_t* lod_minLOD;
-cvar_t* lod_maxLOD;
-cvar_t* lod_LOD_slider;
-cvar_t* lod_curve_0_val;
-cvar_t* lod_curve_1_val;
-cvar_t* lod_curve_2_val;
-cvar_t* lod_curve_3_val;
-cvar_t* lod_curve_4_val;
-cvar_t* lod_edit_0;
-cvar_t* lod_edit_1;
-cvar_t* lod_edit_2;
-cvar_t* lod_edit_3;
-cvar_t* lod_edit_4;
-cvar_t* lod_curve_0_slider;
-cvar_t* lod_curve_1_slider;
-cvar_t* lod_curve_2_slider;
-cvar_t* lod_curve_3_slider;
-cvar_t* lod_curve_4_slider;
-cvar_t* lod_pitch_val;
-cvar_t* lod_zee_val;
-cvar_t* lod_mesh;
-cvar_t* lod_meshname;
-cvar_t* lod_tikiname;
-cvar_t* lod_metric;
-cvar_t* lod_tris;
-cvar_t* lod_position;
-cvar_t* lod_save;
-cvar_t* lod_tool;
-
-cvar_t* r_showSkeleton;
-
-int r_sequencenumber;
-
-//=============================================================================
-
-/*
-** RE_BeginRegistration
-*/
-void RE_BeginRegistration(glconfig_t* glconfigOut) {
-    int	i;
-
-    R_Init();
-
-    *glconfigOut = glConfig;
-
-    R_IssuePendingRenderCommands();
-
-    tr.visIndex = 0;
-    // force markleafs to regenerate
-    for (i = 0; i < MAX_VISCOUNTS; i++) {
-        tr.visClusters[i] = -2;
-    }
-
-    R_ClearFlares();
-    RE_ClearScene();
-
-    tr.registered = qtrue;
-}
-
-const char* RE_GetGraphicsInfo() {
-    // FIXME: unimplemented
-    return NULL;
-}
-
-qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
-    // FIXME: unimplemented
-    return qfalse;
-}
-
-void R_SetFullscreen(qboolean fullscreen) {
-    // FIXME: unimplemented
-}
-
-void RE_SetRenderTime(int t) {
-    // FIXME: unimplemented
-}
-
-void GetRefAPI_new(refimport_t* ri, refexport_t* re)
-{
-    re->FreeModels = RE_FreeModels;
-    re->SpawnEffectModel = RE_SpawnEffectModel;
-    re->RegisterServerModel = RE_RegisterServerModel;
-    re->UnregisterServerModel = RE_UnregisterServerModel;
-    re->RefreshShaderNoMip = RE_RefreshShaderNoMip;
-    re->PrintBSPFileSizes = RE_PrintBSPFileSizes;
-    re->MapVersion = RE_MapVersion;
-    re->LoadFont = R_LoadFont;
-
-    re->BeginFrame = RE_BeginFrame;
-    
-    re->MarkFragments = R_MarkFragments_New;
-    re->MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
-    re->GetInlineModelBounds = R_GetInlineModelBounds;
-    re->GetLightingForDecal = R_GetLightingForDecal;
-    re->GetLightingForSmoke = R_GetLightingForSmoke;
-    re->R_GatherLightSources = R_GatherLightSources;
-    re->ModelBounds = R_ModelBounds;
-    re->ModelRadius = R_ModelRadius;
-
-    re->AddRefEntityToScene = RE_AddRefEntityToScene;
-    re->AddRefSpriteToScene = RE_AddRefSpriteToScene;
-    re->AddPolyToScene = RE_AddPolyToScene;
-    re->AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
-    re->AddLightToScene = RE_AddLightToScene;
-    re->RenderScene = RE_RenderScene;
-    re->GetRenderEntity = RE_GetRenderEntity;
-
-    re->SavePerformanceCounters = R_SavePerformanceCounters;
-
-    re->R_Model_GetHandle = R_Model_GetHandle;
-    re->DrawStretchRaw = RE_StretchRaw;
-    re->DebugLine = R_DebugLine;
-    re->DrawStretchPic = Draw_StretchPic;
-    re->DrawTilePic = Draw_TilePic;
-    re->DrawTilePicOffset = Draw_TilePicOffset;
-    re->DrawTrianglePic = Draw_TrianglePic;
-    re->DrawBox = DrawBox;
-    re->AddBox = AddBox;
-    re->Set2DWindow = Set2DWindow;
-    re->Scissor = RE_Scissor;
-    re->DrawLineLoop = DrawLineLoop;
-    re->DrawString = R_DrawString;
-    re->GetFontHeight = R_GetFontHeight;
-    re->GetFontStringWidth = R_GetFontStringWidth;
-    re->SwipeBegin = RE_SwipeBegin;
-    re->SwipeEnd = RE_SwipeEnd;
-    re->SetRenderTime = RE_SetRenderTime;
-    re->Noise = R_NoiseGet4f;
-
-    re->SetMode = R_SetMode;
-    re->SetFullscreen = R_SetFullscreen;
-
-    re->GetShaderHeight = RE_GetShaderHeight;
-    re->GetShaderWidth = RE_GetShaderWidth;
-    re->GetGraphicsInfo = RE_GetGraphicsInfo;
-    re->ForceUpdatePose = RE_ForceUpdatePose;
-    re->TIKI_Orientation = RE_TIKI_Orientation;
-    re->TIKI_IsOnGround = RE_TIKI_IsOnGround;
-    re->SetFrameNumber = RE_SetFrameNumber;
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_light.c b/code/renderergl2/new/tr_light.c
deleted file mode 100644
index e79a8072..00000000
--- a/code/renderergl2/new/tr_light.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-void R_GetLightingForDecal(vec3_t vLight, vec3_t vFacing, vec3_t vOrigin)
-{
-    // FIXME: unimplemented
-}
-
-void R_GetLightingForSmoke(vec3_t vLight, vec3_t vOrigin)
-{
-    // FIXME: unimplemented
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_local.h b/code/renderergl2/new/tr_local.h
deleted file mode 100644
index 6e97ca52..00000000
--- a/code/renderergl2/new/tr_local.h
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#pragma once
-
-extern int r_sequencenumber;
-
-void GetRefAPI_new(refimport_t* ri, refexport_t* re);
-
-extern cvar_t* r_reset_tc_array;
-extern  cvar_t* r_numdebuglines;
-
-extern cvar_t* r_staticlod;
-extern cvar_t* r_lodscale;
-extern cvar_t* r_lodcap;
-extern cvar_t* r_lodviewmodelcap;
-
-extern cvar_t* r_uselod;
-extern cvar_t* lod_LOD;
-extern cvar_t* lod_minLOD;
-extern cvar_t* lod_maxLOD;
-extern cvar_t* lod_LOD_slider;
-extern cvar_t* lod_curve_0_val;
-extern cvar_t* lod_curve_1_val;
-extern cvar_t* lod_curve_2_val;
-extern cvar_t* lod_curve_3_val;
-extern cvar_t* lod_curve_4_val;
-extern cvar_t* lod_edit_0;
-extern cvar_t* lod_edit_1;
-extern cvar_t* lod_edit_2;
-extern cvar_t* lod_edit_3;
-extern cvar_t* lod_edit_4;
-extern cvar_t* lod_curve_0_slider;
-extern cvar_t* lod_curve_1_slider;
-extern cvar_t* lod_curve_2_slider;
-extern cvar_t* lod_curve_3_slider;
-extern cvar_t* lod_curve_4_slider;
-extern cvar_t* lod_pitch_val;
-extern cvar_t* lod_zee_val;
-extern cvar_t* lod_mesh;
-extern cvar_t* lod_meshname;
-extern cvar_t* lod_tikiname;
-extern cvar_t* lod_metric;
-extern cvar_t* lod_tris;
-extern cvar_t* lod_position;
-extern cvar_t* lod_save;
-extern cvar_t* lod_tool;
-extern cvar_t* r_showSkeleton;
-
-typedef union varnodeUnpacked_u {
-    float fVariance;
-    struct {
-        byte flags;
-        unsigned char unused[3];
-    } s;
-} varnodeUnpacked_t;
-
-typedef unsigned short terraInt;
-
-typedef struct terrainVert_s {
-    vec3_t xyz;
-    vec2_t texCoords[2];
-    float fVariance;
-    float fHgtAvg;
-    float fHgtAdd;
-    unsigned int uiDistRecalc;
-    terraInt nRef;
-    terraInt iVertArray;
-    byte* pHgt;
-    terraInt iNext;
-    terraInt iPrev;
-} terrainVert_t;
-
-typedef struct terraTri_s {
-    unsigned short iPt[3];
-    terraInt nSplit;
-    unsigned int uiDistRecalc;
-    struct cTerraPatchUnpacked_s* patch;
-    varnodeUnpacked_t* varnode;
-    terraInt index;
-    byte lod;
-    byte byConstChecks;
-    terraInt iLeft;
-    terraInt iRight;
-    terraInt iBase;
-    terraInt iLeftChild;
-    terraInt iRightChild;
-    terraInt iParent;
-    terraInt iPrev;
-    terraInt iNext;
-} terraTri_t;
-
-typedef struct srfTerrain_s {
-    surfaceType_t surfaceType;
-    terraInt iVertHead;
-    terraInt iTriHead;
-    terraInt iTriTail;
-    terraInt iMergeHead;
-    int nVerts;
-    int nTris;
-    int lmapSize;
-    int dlightBits[2];
-    float lmapStep;
-    int dlightMap[2];
-    byte* lmData;
-    float lmapX;
-    float lmapY;
-} srfTerrain_t;
-
-typedef struct cTerraPatchUnpacked_s {
-    srfTerrain_t drawinfo;
-    int viewCount;
-    int visCountCheck;
-    int visCountDraw;
-    int frameCount;
-    unsigned int uiDistRecalc;
-    float s;
-    float t;
-    vec2_t texCoord[2][2];
-    float x0;
-    float y0;
-    float z0;
-    float zmax;
-    shader_t* shader;
-    short int iNorth;
-    short int iEast;
-    short int iSouth;
-    short int iWest;
-    struct cTerraPatchUnpacked_s* pNextActive;
-    varnodeUnpacked_t varTree[2][63];
-    unsigned char heightmap[81];
-    byte flags;
-    byte byDirty;
-} cTerraPatchUnpacked_t;
-
-typedef struct srfStaticModel_s {
-    surfaceType_t surfaceType;
-    struct cStaticModelUnpacked_s* parent;
-} srfStaticModel_t;
-
-typedef struct cStaticModelUnpacked_s {
-    qboolean useSpecialLighting;
-    qboolean bLightGridCalculated;
-    qboolean bRendered;
-    char model[128];
-    vec3_t origin;
-    vec3_t angles;
-    vec3_t axis[3];
-    float scale;
-    int firstVertexData;
-    int numVertexData;
-    int visCount;
-    dtiki_t* tiki;
-    sphere_dlight_t dlights[32];
-    int numdlights;
-    float radius;
-    float cull_radius;
-    int iGridLighting;
-    float lodpercentage[2];
-} cStaticModelUnpacked_t;
-
-typedef struct refSprite_s {
-    surfaceType_t surftype;
-    int hModel;
-    int shaderNum;
-    float origin[3];
-    float scale;
-    float axis[3][3];
-    unsigned char shaderRGBA[4];
-    int renderfx;
-    float shaderTime;
-} refSprite_t;
-
-//
-// tr_shader.c
-//
-qhandle_t		RE_RefreshShaderNoMip(const char* name);
-
-//
-// tr_bsp.c
-//
-void		RE_PrintBSPFileSizes(void);
-int			RE_MapVersion(void);
-
-typedef struct skelSurfaceGame_s skelSurfaceGame_t;
-typedef struct staticSurface_s staticSurface_t;
-
-/*
-============================================================
-
-DRAWING
-
-============================================================
-*/
-void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
-void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
-void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
-void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
-void DrawBox(float x, float y, float w, float h);
-void AddBox(float x, float y, float w, float h);
-void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
-void RE_Scissor(int x, int y, int width, int height);
-void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
-
-/*
-============================================================
-
-FLARES
-
-============================================================
-*/
-
-void R_ClearFlares(void);
-
-void RB_AddFlare(void* surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal);
-void RB_AddDlightFlares(void);
-void RB_RenderFlares(void);
-
-/*
-=============================================================
-
-FONT
-
-=============================================================
-*/
-fontheader_t* R_LoadFont(const char* name);
-void R_LoadFontShader(fontheader_t* font);
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen);
-float R_GetFontHeight(const fontheader_t* font);
-float R_GetFontStringWidth(const fontheader_t* font, const char* s);
-
-/*
-============================================================
-
-LIGHTS
-
-============================================================
-*/
-
-void R_DlightBmodel(bmodel_t* bmodel);
-void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
-void R_GetLightingForDecal(vec3_t vLight, vec3_t vFacing, vec3_t vOrigin);
-void R_GetLightingForSmoke(vec3_t vLight, vec3_t vOrigin);
-void R_SetupEntityLighting(const trRefdef_t* refdef, trRefEntity_t* ent);
-void RB_SetupEntityGridLighting();
-void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
-void R_TransformDlights(int count, dlight_t* dl, orientationr_t* ori);
-void RB_Light_Real(unsigned char* colors);
-void RB_Sphere_BuildDLights();
-void RB_Sphere_SetupEntity();
-void RB_Grid_SetupEntity();
-void RB_Grid_SetupStaticModel();
-void RB_Light_Fullbright(unsigned char* colors);
-void R_Sphere_InitLights();
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
-void R_UploadDlights();
-
-/*
-=============================================================
-
-MARKS
-
-=============================================================
-*/
-void R_LevelMarksLoad(const char* szBSPName);
-void R_LevelMarksInit();
-void R_LevelMarksFree();
-void R_UpdateLevelMarksSystem();
-void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
-
-int R_MarkFragments_New(int numPoints, const vec3_t* points, const vec3_t projection,
-    int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t angles, const vec3_t origin, int numPoints,
-    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-    int maxFragments, markFragment_t* fragmentBuffer, float radiusSquared);
-
-
-/*
-=============================================================
-
-SHADE
-
-=============================================================
-*/
-void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor);
-void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha);
-void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-
-/*
-=============================================================
-
-SKY PORTALS
-
-=============================================================
-*/
-void R_Sky_Init();
-void R_Sky_Reset();
-void R_Sky_AddSurf(msurface_t* surf);
-
-/*
-=============================================================
-
-SPRITE
-
-=============================================================
-*/
-sprite_t* SPR_RegisterSprite(const char* name);
-void RB_DrawSprite(const refSprite_t* spr);
-
-
-/*
-=============================================================
-
-SUN FLARE
-
-=============================================================
-*/
-void R_InitLensFlare();
-void R_DrawLensFlares();
-
-/*
-=============================================================
-
-SWIPE
-
-=============================================================
-*/
-void RB_DrawSwipeSurface(surfaceType_t* pswipe);
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
-void RE_SwipeEnd();
-
-/*
-=============================================================
-
-TERRAIN
-
-=============================================================
-*/
-void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
-void R_AddTerrainSurfaces();
-void R_InitTerrain();
-void R_TerrainPrepareFrame();
-
-/*
-=============================================================
-
-SCENE GENERATION
-
-=============================================================
-*/
-void RE_AddRefSpriteToScene(const refEntity_t* ent);
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-refEntity_t* RE_GetRenderEntity(int entityNumber);
-
-/*
-=============================================================
-
-TIKI
-
-=============================================================
-*/
-void R_InitStaticModels(void);
-void RE_FreeModels(void);
-qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
-qhandle_t RE_RegisterServerModel(const char* name);
-void RE_UnregisterServerModel(qhandle_t hModel);
-orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
-qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
-float R_ModelRadius(qhandle_t handle);
-void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
-dtiki_t* R_Model_GetHandle(qhandle_t handle);
-
-float R_GetRadius(refEntity_t* model);
-void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
-void RE_ForceUpdatePose(refEntity_t* model);
-void RE_SetFrameNumber(int frameNumber);
-void R_UpdatePoseInternal(refEntity_t* model);
-void RB_SkelMesh(skelSurfaceGame_t* sf);
-void RB_StaticMesh(staticSurface_t* staticSurf);
-void RB_Static_BuildDLights();
-void R_PrintInfoStaticModels();
-void R_AddSkelSurfaces(trRefEntity_t* ent);
-void R_AddStaticModelSurfaces(void);
-float R_CalcLod(const vec3_t origin, float radius);
-int R_LerpTag(orientation_t* tag, qhandle_t handle, int startFrame, int endFrame,
-    float frac, const char* tagName);
-void R_PrintInfoWorldtris(void);
-
-/*
-=============================================================
-
-UTIL
-
-=============================================================
-*/
-int RE_GetShaderHeight(qhandle_t hShader);
-int RE_GetShaderWidth(qhandle_t hShader);
-void RB_StreamBegin(shader_t* shader);
-void RB_StreamEnd(void);
-void RB_StreamBeginDrawSurf(void);
-void RB_StreamEndDrawSurf(void);
-static void addTriangle(void);
-void RB_Vertex3fv(vec3_t v);
-void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
-void RB_Vertex2f(vec_t x, vec_t y);
-void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
-void RB_Color3f(vec_t r, vec_t g, vec_t b);
-void RB_Color3fv(vec3_t col);
-void RB_Color4bv(unsigned char* colors);
-void RB_Texcoord2f(float s, float t);
-void RB_Texcoord2fv(vec2_t st);
-void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
-void R_DebugRotatedBBox(const vec3_t org, vec3_t ang, vec3_t mins, vec3_t maxs, float r, float g, float b, float alpha);
-const char* RE_GetGraphicsInfo();
-
-/*
-=============================================================
-
-WORLD MAP
-
-=============================================================
-*/
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
-
-extern int g_nStaticSurfaces;
-extern qboolean g_bInfostaticmodels;
-extern qboolean g_bInfoworldtris;
-
-//
-//
-//
-
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
-
-void RE_SetRenderTime(int t);
-qboolean R_SetMode(int mode, const glconfig_t* glConfig);
-void R_SetFullscreen(qboolean fullscreen);
-void R_SavePerformanceCounters(void);
-void R_SyncRenderThread(void);
diff --git a/code/renderergl2/new/tr_local_begin.h b/code/renderergl2/new/tr_local_begin.h
deleted file mode 100644
index 76316645..00000000
--- a/code/renderergl2/new/tr_local_begin.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#pragma once
-
-typedef struct suninfo_s {
-    vec3_t color;
-    vec3_t direction;
-    vec3_t flaredirection;
-    char szFlareName[64];
-    qboolean exists;
-} suninfo_t;
-
-typedef struct {
-    vec3_t transformed;
-    int index;
-} sphere_dlight_t;
-
-typedef enum {
-    LIGHT_POINT,
-    LIGHT_DIRECTIONAL,
-    LIGHT_SPOT,
-    LIGHT_SPOT_FAST
-} lighttype_t;
-
-typedef struct reallightinfo_s {
-    vec3_t color;
-    lighttype_t eType;
-    float fIntensity;
-    float fDist;
-    float fSpotSlope;
-    float fSpotConst;
-    float fSpotScale;
-    vec3_t vOrigin;
-    vec3_t vDirection;
-} reallightinfo_t;
-
-typedef float cube_entry_t[3][4];
-
-typedef struct {
-    vec3_t origin;
-    vec3_t worldOrigin;
-    vec3_t traceOrigin;
-    float radius;
-    struct mnode_s* leaves[8];
-    void(*TessFunction) (unsigned char* dstColors);
-    union {
-        unsigned char level[4];
-        int value;
-    } ambient;
-    int numRealLights;
-    reallightinfo_t light[32];
-    int bUsesCubeMap;
-    float cubemap[24][3][4];
-} sphereor_t;
-
-typedef struct spherel_s {
-    vec3_t origin;
-    vec3_t color;
-    float intensity;
-    struct mnode_s* leaf;
-    int needs_trace;
-    int spot_light;
-    float spot_radiusbydistance;
-    vec3_t spot_dir;
-    int reference_count;
-} spherel_t;
-
-typedef enum {
-    SPRITE_PARALLEL,
-    SPRITE_PARALLEL_ORIENTED,
-    SPRITE_ORIENTED,
-    SPRITE_PARALLEL_UPRIGHT
-} spriteType_t;
-
-typedef struct {
-    spriteType_t type;
-    float scale;
-} spriteParms_t;
-
-typedef struct {
-    float width;
-    float height;
-    float origin_x;
-    float origin_y;
-    float scale;
-    struct shader_s* shader;
-} sprite_t;
diff --git a/code/renderergl2/new/tr_main.c b/code/renderergl2/new/tr_main.c
deleted file mode 100644
index 02e20309..00000000
--- a/code/renderergl2/new/tr_main.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-#define CIRCLE_LENGTH		25
-
-/*
-================
-R_DebugCircle
-================
-*/
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
-    int				i;
-    float			ang;
-    debugline_t* line;
-    vec3_t			forward, right;
-    vec3_t			pos, lastpos;
-
-    if (!ri.DebugLines || !ri.numDebugLines) {
-        return;
-    }
-
-    if (horizontal)
-    {
-        VectorSet(forward, 1, 0, 0);
-        VectorSet(right, 0, 1, 0);
-    }
-    else
-    {
-        VectorCopy(tr.refdef.viewaxis[1], right);
-        VectorCopy(tr.refdef.viewaxis[2], forward);
-    }
-
-    VectorClear(pos);
-    VectorClear(lastpos);
-
-    for (i = 0; i < CIRCLE_LENGTH; i++) {
-        VectorCopy(pos, lastpos);
-
-        ang = (float)i * 0.0174532925199433f;
-        pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
-            cos(ang) * radius * right[0];
-        pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
-            cos(ang) * radius * right[1];
-        pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
-            cos(ang) * radius * right[2];
-
-        if (i > 0)
-        {
-            if (*ri.numDebugLines >= r_numdebuglines->integer) {
-                ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
-                return;
-            }
-
-            line = &(*ri.DebugLines)[*ri.numDebugLines];
-            (*ri.numDebugLines)++;
-            VectorCopy(lastpos, line->start);
-            VectorCopy(pos, line->end);
-            VectorSet(line->color, r, g, b);
-            line->alpha = alpha;
-            line->width = 1.0;
-            line->factor = 1;
-            line->pattern = -1;
-        }
-    }
-}
-
-/*
-================
-R_DebugLine
-================
-*/
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
-    debugline_t* line;
-
-    if (!ri.DebugLines || !ri.numDebugLines) {
-        return;
-    }
-
-    if (*ri.numDebugLines >= r_numdebuglines->integer) {
-        ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
-    }
-
-    line = &(*ri.DebugLines)[*ri.numDebugLines];
-    (*ri.numDebugLines)++;
-    VectorCopy(start, line->start);
-    VectorCopy(end, line->end);
-    VectorSet(line->color, r, g, b);
-    line->alpha = alpha;
-    line->width = 1.0;
-    line->factor = 1;
-    line->pattern = -1;
-}
-
-/*
-================
-R_DrawDebugLines
-================
-*/
-void R_DrawDebugLines(void) {
-    // FIXME: stub
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_marks.c b/code/renderergl2/new/tr_marks.c
deleted file mode 100644
index 248aee5b..00000000
--- a/code/renderergl2/new/tr_marks.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-int R_MarkFragments_New(int numPoints, const vec3_t* points, const vec3_t projection,
-    int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared) {
-    return R_MarkFragments(numPoints, points, projection, maxPoints, pointBuffer, maxFragments, fragmentBuffer);
-}
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t angles, const vec3_t origin, int numPoints,
-    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-    int maxFragments, markFragment_t* fragmentBuffer, float radiusSquared)
-{
-    // FIXME: unimplemented
-    return 0;
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_model.cpp b/code/renderergl2/new/tr_model.cpp
deleted file mode 100644
index 8ce84cda..00000000
--- a/code/renderergl2/new/tr_model.cpp
+++ /dev/null
@@ -1,1463 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_models.cpp -- model loading and caching
-
-#include "../tr_local.h"
-#include "tiki.h"
-#include <vector.h>
-
-#define	LL(x) x=LittleLong(x)
-
-qboolean g_bInfoworldtris;
-
-/*
-** R_GetModelByHandle
-*/
-model_t	*R_GetModelByHandle( qhandle_t hModel ) {
-	model_t		*mod;
-
-	// out of range gets the default model
-	if( hModel < 1 || hModel >= tr.numModels ) {
-		return tr.models[0];
-	}
-
-	mod = tr.models[hModel];
-
-	return mod;
-}
-
-/*
-** R_Model_GetHandle
-*/
-dtiki_t	*R_Model_GetHandle( qhandle_t handle ) {
-	model_t		*model = R_GetModelByHandle( handle );
-
-	if( model->type == MOD_TIKI ) {
-		return model->d.tiki;
-	}
-
-	return NULL;
-}
-
-//===============================================================================
-
-/*
-** R_FreeModel
-*/
-void R_FreeModel( model_t *mod ) {
-	if( mod->type == MOD_TIKI ) {
-		ri.CG_EndTiki( mod->d.tiki );
-	}
-
-	ri.Free(mod);
-}
-
-/*
-** R_AllocModel
-*/
-model_t* R_AllocModel(void) {
-    model_t* mod;
-
-    if (tr.numModels == MAX_MOD_KNOWN) {
-        return NULL;
-    }
-
-    mod = (model_t*)ri.Malloc(sizeof(*tr.models[tr.numModels]));
-    mod->index = tr.numModels;
-    tr.models[tr.numModels] = mod;
-    tr.numModels++;
-
-    return mod;
-}
-
-/*
-** RE_FreeModels
-*/
-void RE_FreeModels( void ) {
-	int		hModel;
-
-	for( hModel = 0; hModel < tr.numModels; hModel++ )
-	{
-		if( !tr.models[ hModel ]->name[ 0 ] ) {
-			continue;
-		}
-
-		R_FreeModel( tr.models[ hModel ] );
-	}
-}
-
-/*
-** R_RegisterShaders
-*/
-void R_RegisterShaders( model_t *mod ) {
-	dtiki_t			*tiki;
-	int				i, j;
-	dtikisurface_t	*psurface;
-	shader_t		*sh;
-
-	tiki = mod->d.tiki;
-
-	for( i = 0; i < tiki->num_surfaces; i++ )
-	{
-		psurface = &tiki->surfaces[ i ];
-
-		assert( psurface->numskins < MAX_TIKI_SHADER );
-		for( j = 0; j < psurface->numskins; j++ )
-		{
-			if( psurface->shader[ j ][ 0 ] ) {
-				sh = R_FindShader( psurface->shader[ j ], LIGHTMAP_NONE, !( psurface->flags & TIKI_SURF_NOMIPMAPS) );
-				psurface->hShader[ j ] = sh->index;
-			} else {
-				psurface->hShader[ j ] = 0;
-			}
-		}
-	}
-}
-
-/*
-** RE_UnregisterServerModel
-*/
-void RE_UnregisterServerModel( qhandle_t hModel ) {
-	if( hModel < 0 || hModel >= MAX_MOD_KNOWN ) {
-		return;
-	}
-
-	if( tr.models[ hModel ]->serveronly ) {
-		R_FreeModel( tr.models[ hModel ] );
-	}
-}
-
-/*
-** R_RegisterModelInternal
-*/
-static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki, qboolean use ) {
-	model_t		*mod;
-	qhandle_t	hModel;
-	const char	*ptr;
-
-	if( !name || !*name )
-	{
-		ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
-		return 0;
-	}
-
-	if( strlen( name ) >= 128 )
-	{
-		Com_Printf( "Model name exceeds MAX_MODEL_NAME\n" );
-		return 0;
-	}
-
-	//
-	// search the currently loaded models
-	//
-	for( hModel = 1; hModel < tr.numModels; hModel++ ) {
-		mod = tr.models[ hModel ];
-		if( !strcmp( mod->name, name ) ) {
-			if( mod->type == MOD_BAD ) {
-				return 0;
-			}
-			return hModel;
-		}
-	}
-
-	// allocate a new model_t
-
-	if( ( mod = R_AllocModel() ) == NULL ) {
-		ri.Printf( PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name );
-		return 0;
-	}
-
-	// only set the name after the model has been successfully loaded
-	Q_strncpyz( mod->name, name, sizeof( mod->name ) );
-
-
-	// make sure the render thread is stopped
-	R_SyncRenderThread();
-
-	mod->serveronly = qtrue;
-
-	//
-	// load the files
-	//
-	ptr = strrchr( name, '.' );
-
-	if( ptr )
-	{
-		ptr++;
-
-		if( !stricmp( ptr, "spr" ) )
-		{
-			mod->d.sprite = SPR_RegisterSprite( name );
-			strcpy( mod->name, name );
-
-			if( mod->d.sprite )
-			{
-				mod->type = MOD_SPRITE;
-				return mod->index;
-			}
-		}
-		else if( !stricmp( ptr, "tik" ) )
-		{
-			mod->d.tiki = TIKI_RegisterTikiFlags( name, use );
-			strcpy( mod->name, name );
-
-			if( mod->d.tiki )
-			{
-				mod->type = MOD_TIKI;
-				R_RegisterShaders( mod );
-
-				if( bBeginTiki ) {
-					ri.CG_ProcessInitCommands( mod->d.tiki, NULL );
-				}
-
-				return mod->index;
-			}
-		}
-	}
-
-	ri.Printf( PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name );
-	mod->type = MOD_BAD;
-
-	return 0;
-}
-
-/*
-** RE_RegisterServerModel
-*/
-qhandle_t RE_RegisterServerModel( const char *name ) {
-	return R_RegisterModelInternal( name, qtrue, qfalse );
-}
-
-/*
-** RE_SpawnEffectModel
-*/
-qhandle_t RE_SpawnEffectModel( const char *szModel, vec3_t vPos, vec3_t *axis ) {
-	refEntity_t		new_entity;
-
-	memset( &new_entity, 0, sizeof( refEntity_t ) );
-	memset( &new_entity.shaderRGBA, 255, sizeof( byte ) * 4 );
-
-	VectorCopy( vPos, new_entity.origin );
-	new_entity.scale = 1.0;
-
-	if( axis ) {
-		AxisCopy( axis, new_entity.axis );
-	}
-
-	new_entity.hModel = R_RegisterModelInternal( szModel, qfalse, qtrue );
-
-	if( new_entity.hModel )
-	{
-		tr.models[ new_entity.hModel ]->serveronly = qfalse;
-		ri.CG_ProcessInitCommands( tr.models[ new_entity.hModel ]->d.tiki, &new_entity );
-	}
-
-	return new_entity.hModel;
-}
-
-/*
-** RE_RegisterModel
-*/
-qhandle_t RE_RegisterModel( const char *name ) {
-	qhandle_t		handle;
-
-	handle = R_RegisterModelInternal( name, qtrue, qtrue );
-
-	if( handle ) {
-		tr.models[ handle ]->serveronly = qfalse;
-	}
-	return handle;
-}
-
-//=============================================================================
-
-/*
-===============
-R_ModelInit
-===============
-*/
-void R_ModelInit( void ) {
-	model_t		*mod;
-	int			i;
-
-	// leave a space for NULL model
-	tr.numModels = 0;
-
-	mod = R_AllocModel();
-	strcpy( mod->name, "** BAD MODEL **" );
-	mod->type = MOD_BAD;
-
-	for (i = 0; i < sizeof(tr.skel_index) / sizeof(tr.skel_index[0]); i++) {
-		tr.skel_index[i] = -1;
-	}
-}
-
-
-/*
-================
-R_Modellist_f
-================
-*/
-void R_Modellist_f( void ) {
-	int		i;
-
-	for( i = 1; i < tr.numModels; i++ ) {
-		ri.Printf( PRINT_ALL, "%s\n", tr.models[ i ]->name );
-	}
-}
-
-/*
-====================
-R_ModelRadius
-====================
-*/
-float R_ModelRadius( qhandle_t handle ) {
-	int				j;
-	vec3_t			bounds[ 2 ];
-	model_t			*model;
-	float			radius, maxRadius;
-	vec3_t			tmpVec;
-	float			w;
-
-	model = R_GetModelByHandle( handle );
-
-	switch( model->type )
-	{
-	case MOD_BRUSH:
-		maxRadius = 0.0;
-
-		VectorCopy( model->d.bmodel->bounds[ 0 ], bounds[ 0 ] );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], bounds[ 1 ] );
-
-		for( j = 0; j < 8; j++ ) {
-			tmpVec[ 0 ] = bounds[ j & 1 ? 1 : 0 ][ 0 ];
-			tmpVec[ 1 ] = bounds[ j & 2 ? 1 : 0 ][ 1 ];
-			tmpVec[ 2 ] = bounds[ j & 4 ? 1 : 0 ][ 2 ];
-
-			radius = VectorLength( tmpVec );
-
-			if( maxRadius < radius ) {
-				maxRadius = radius;
-			}
-		}
-		break;
-	case MOD_TIKI:
-		return TIKI_GlobalRadius( model->d.tiki );
-	case MOD_SPRITE:
-		maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		w = model->d.sprite->height * model->d.sprite->scale * 0.5;
-
-		if( maxRadius <= w ) {
-			maxRadius = w;
-		}
-		break;
-	default:
-		maxRadius = 0.0;
-	}
-
-	return maxRadius;
-}
-
-/*
-====================
-R_ModelBounds
-====================
-*/
-void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-
-	switch( model->type )
-	{
-	default:
-	case MOD_BAD:
-		VectorClear( mins );
-		VectorClear( maxs );
-		break;
-	case MOD_BRUSH:
-		VectorCopy( model->d.bmodel->bounds[ 0 ], mins );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], maxs );
-		break;
-	case MOD_TIKI:
-		TIKI_CalculateBounds( model->d.tiki, 1.0, mins, maxs );
-		break;
-	case MOD_SPRITE:
-		mins[ 0 ] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
-		mins[ 1 ] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
-		mins[ 2 ] = -0.0;
-		maxs[ 0 ] = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		maxs[ 1 ] = model->d.sprite->height * model->d.sprite->scale * 0.5;
-		maxs[ 2 ] = 0.0;
-		break;
-	}
-}
-
-/*
-====================
-GetModelPath
-====================
-*/
-const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
-	int			i;
-	int			num;
-	skelcache_t	*cache;
-
-	num = cache_numskel;
-
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-	{
-		cache = &skelcache[ i ];
-
-		if( cache->skel )
-		{
-			if( cache->skel == skelmodel ) {
-				return cache->path;
-			}
-
-			num--;
-			if( num < 0 ) {
-				break;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/*
-====================
-GetLodCutoff
-====================
-*/
-int GetLodCutoff( skelHeaderGame_t *skelmodel, float lod_val, int renderfx ) {
-	lodControl_t	*LOD;
-	float			f;
-	float			fLODCap;
-
-	LOD = skelmodel->pLOD;
-
-	if( renderfx & RF_DEPTHHACK )
-	{
-		fLODCap = LOD->maxMetric + ( LOD->minMetric - LOD->maxMetric ) * r_lodviewmodelcap->value;
-	}
-	else
-	{
-		f = ( LOD->minMetric - LOD->maxMetric ) * r_lodcap->value + LOD->maxMetric;
-		fLODCap = ( lod_val - LOD->maxMetric ) * r_lodscale->value + LOD->maxMetric;
-
-		if( fLODCap > f ) {
-			fLODCap = f;
-		}
-	}
-
-	if( fLODCap >= LOD->minMetric || !r_uselod->integer )
-	{
-		return LOD->curve[ 0 ].val;
-	}
-	else if( fLODCap <= LOD->maxMetric )
-	{
-		return LOD->curve[ 4 ].val;
-	}
-	else if( fLODCap <= LOD->consts[ 3 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 3 ].scale + LOD->consts[ 3 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 2 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 2 ].scale + LOD->consts[ 2 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 1 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 1 ].scale + LOD->consts[ 1 ].base;
-	}
-	else
-	{
-		return fLODCap * LOD->consts[ 0 ].scale + LOD->consts[ 0 ].base;
-	}
-}
-
-/*
-====================
-GetToolLodCutoff
-====================
-*/
-int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
-	lodControl_t	*LOD;
-	float			totalRange;
-	int				i;
-	char			lodPath[ 256 ];
-	char			*ext;
-
-	LOD = skelmodel->pLOD;
-	totalRange = 0.0;
-	for( i = 0; i < 10; i++ )
-	{
-		if( skelmodel->lodIndex[ i ] > 0 ) {
-			totalRange = skelmodel->lodIndex[ i ];
-			break;
-		}
-	}
-
-	if( lod_save->integer == 1 )
-	{
-		Cvar_Set( "lod_save", "0" );
-		strcpy( lodPath, GetModelPath( skelmodel ) );
-		ext = strstr( lodPath, "skd" );
-		strcpy( ext, "lod" );
-		SaveLODFile( lodPath, LOD );
-	}
-
-	if( lod_mesh->modified )
-	{
-		lod_mesh->modified = qfalse;
-		Cvar_Set( "lod_minLOD", va( "%f", LOD->minMetric ) );
-		Cvar_Set( "lod_maxLOD", va( "%f", LOD->maxMetric ) );
-		Cvar_Set( "lod_LOD_slider", va( "%f", 0.5 ) );
-		Cvar_Set( "lod_curve_0_slider", va( "%f", LOD->curve[ 0 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_1_slider", va( "%f", LOD->curve[ 1 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_2_slider", va( "%f", LOD->curve[ 2 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_3_slider", va( "%f", LOD->curve[ 3 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_4_slider", va( "%f", LOD->curve[ 4 ].val / totalRange ) );
-	}
-
-
-	Cvar_Set( "lod_curve_0_val", va( "%f", lod_curve_0_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_1_val", va( "%f", lod_curve_1_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_2_val", va( "%f", lod_curve_2_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_3_val", va( "%f", lod_curve_3_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_4_val", va( "%f", lod_curve_4_slider->value * totalRange ) );
-
-	LOD->minMetric = lod_minLOD->value;
-	LOD->maxMetric = lod_maxLOD->value;
-	LOD->curve[ 0 ].val = lod_curve_0_val->value;
-	LOD->curve[ 1 ].val = lod_curve_1_val->value;
-	LOD->curve[ 2 ].val = lod_curve_2_val->value;
-	LOD->curve[ 3 ].val = lod_curve_3_val->value;
-	LOD->curve[ 4 ].val = lod_curve_4_val->value;
-
-	TIKI_CalcLodConsts( LOD );
-	return GetLodCutoff( skelmodel, lod_val, 0 );
-}
-
-/*
-==============
-R_GetTagPositionAndOrientation
-==============
-*/
-orientation_t R_GetTagPositionAndOrientation( refEntity_t *ent, int tagnum ) {
-	int i;
-	orientation_t tag_or, new_or;
-
-	tag_or = RE_TIKI_Orientation( ent, tagnum );
-
-	VectorCopy( ent->origin, new_or.origin );
-
-	for( i = 0; i < 3; i++ )
-	{
-		VectorMA( new_or.origin, tag_or.origin[ i ], ent->axis[ i ], new_or.origin );
-	}
-
-	MatrixMultiply( tag_or.axis, ent->axis, new_or.axis );
-	return new_or;
-}
-
-/*
-==============
-RB_DrawSkeletor
-==============
-*/
-void RB_DrawSkeletor( trRefEntity_t *ent ) {
-	int i;
-	dtiki_t		*tiki;
-	skeletor_c	*skeletor;
-
-	tiki = R_Model_GetHandle( ent->e.hModel );
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ENTITYNUM_NONE );
-
-	// FIXME: unimplemented
-#if 0
-	if( r_showSkeleton->integer == 1 ) {
-		//vec3_t vForward, vRight, vUp;
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
-
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-
-
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) { // draw a skeleton
-
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-			iParentBone = skeletor->GetBoneParent( i );
-
-			if( iParentBone != -1 ) {
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-			} else {
-				VectorCopy( ent->e.origin, parent_or.origin );
-				AxisCopy( ent->e.axis, parent_or.axis );
-			}
-
-            qglColor3f(1, 1, 1);
-            qglVertex3fv(parent_or.origin);
-            qglVertex3fv(ori.origin);
-
-			// draw bone axis
-			/*glColor3f( 1, 0, 0 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 0 ], vForward );
-			glVertex3fv( vForward );
-			glVertex3fv( vForward );
-			glVertex3fv( ori.origin );
-
-			glColor3f( 0, 1, 0 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 1 ], vRight );
-			glVertex3fv( vRight );
-			glVertex3fv( vRight );
-			glVertex3fv( ori.origin );
-
-			glColor3f( 0, 0, 1 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 2 ], vUp );
-			glVertex3fv( vUp );
-			glVertex3fv( vUp );
-			glVertex3fv( ori.origin );*/
-
-		}
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-	else if( r_showSkeleton->integer == 2 ) { // draw skeleton with bones
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
-
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			iParentBone = skeletor->GetBoneParent( i );
-
-			if( iParentBone > 0 )	{
-				ori = R_GetTagPositionAndOrientation( &ent->e, i );
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-				qglColor3f( 1, 1, 1 );
-				qglVertex3fv( parent_or.origin );
-				qglVertex3fv( ori.origin );
-			}
-
-		}
-		qglEnd();
-
-		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			vec3_t up, down, front;
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-
-			VectorCopy( ori.origin, up );
-			up[ 1 ] += 5;
-			VectorCopy( ori.origin, down );
-			down[ 1 ] += 5;
-			VectorCopy( ori.origin, front );
-			front[ 0 ] += 5;
-
-			qglColor3f( 1, 0, 1 );
-			qglVertex3fv( front );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( down );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( up );
-			qglVertex3fv( ori.origin );
-		}
-
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-#endif
-}
-
-/*
-=============
-R_CullTIKI
-=============
-*/
-static int R_CullTIKI( dtiki_t *tiki, trRefEntity_t *ent ) {
-#if 0
-	//// cull bounding sphere ONLY if this is not an upscaled entity
-	if( !ent->e.nonNormalizedAxes )
-	{
-		switch( R_CullPointAndRadius( ent->e.origin, ent->e.radius ) )
-		{
-		case CULL_OUT:
-			tr.pc.c_sphere_cull_tiki_out++;
-			return CULL_OUT;
-
-		case CULL_IN:
-			tr.pc.c_sphere_cull_tiki_in++;
-			return CULL_IN;
-
-		case CULL_CLIP:
-			tr.pc.c_sphere_cull_tiki_clip++;
-			break;
-		}
-	}
-
-	switch( R_CullLocalBox( ent->e.bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_tiki_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_tiki_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_tiki_out++;
-		return CULL_OUT;
-	}
-#endif
-	// FIXME: unimplemented
-	return 0;
-}
-
-surfaceType_t	skelSurface = SF_TIKI_SKEL;
-
-/*
-==============
-R_AddSkelSurfaces
-==============
-*/
-void R_AddSkelSurfaces( trRefEntity_t *ent ) {
-	dtiki_t *tiki;
-	qboolean personalModel;
-	float tiki_scale;
-	vec3_t tiki_localorigin;
-	vec3_t tiki_worldorigin;
-	skelBoneCache_t *outbones;
-	//int tikiSurfNumOffset;
-	static cvar_t *vmEntity = NULL;
-	skeletor_c *skeletor;
-	float radius;
-	SkelVec3 centroid;
-	skelAnimFrame_t *newFrame;
-	int added;
-	shader_t *shader;
-	dtikisurface_t *dsurf;
-	byte *bsurf;
-	//float range;
-	//int render_count, total_tris;
-	skelSurfaceGame_t *surface;
-	//int skinnum;
-	//float target;
-	Vector newDistance;
-	//vec3_t org;
-	int i;
-	int mesh;
-	int iRadiusCull = 0;
-	int num_tags;
-
-	tiki = ent->e.tiki;
-
-	if( !vmEntity ) {
-		vmEntity = ri.Cvar_Get( "viewmodelentity", "", 0 );
-	}
-
-	R_UpdatePoseInternal( &ent->e );
-
-	// don't add third_person objects if in a portal
-	personalModel = ( ent->e.renderfx & RF_THIRD_PERSON ) && !tr.viewParms.isPortal;
-
-	outbones = &TIKI_Skel_Bones[ TIKI_Skel_Bones_Index ];
-
-	num_tags = tiki->m_boneList.NumChannels();
-
-	if( num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES )
-	{
-		ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name );
-		return;
-	}
-
-	tiki_scale = tiki->load_scale * ent->e.scale;
-	VectorScale( tiki->load_origin, tiki_scale, tiki_localorigin );
-	R_LocalPointToWorld( tiki_localorigin, tiki_worldorigin );
-
-	radius = R_GetRadius( &ent->e );
-
-	if( !lod_tool->integer )
-	{
-		iRadiusCull = R_CullPointAndRadius( tiki_worldorigin, radius );
-		// FIXME: Draw a debug circle
-	}
-
-	// FIXME: calculate lod percentage
-	if( !lod_tool->integer && iRadiusCull == -1 ) {
-		return;
-	}
-
-	//if( R_CullTIKI( tiki, ent ) == CULL_OUT ) {
-	//	return;
-	//}
-
-	newFrame = ( skelAnimFrame_t * )ri.Hunk_AllocateTempMemory( sizeof( skelAnimFrame_t ) + tiki->m_boneList.NumChannels() * sizeof( SkelMat4 ) );
-	R_GetFrame( &ent->e, newFrame );
-
-	//
-	// copy bones position and axis
-	//
-	for( i = 0; i < num_tags; i++ )
-	{
-		VectorCopy( newFrame->bones[ i ][ 3 ], outbones->offset );
-		outbones->matrix[ 0 ][ 0 ] = newFrame->bones[ i ][ 0 ][ 0 ];
-		outbones->matrix[ 0 ][ 1 ] = newFrame->bones[ i ][ 0 ][ 1 ];
-		outbones->matrix[ 0 ][ 2 ] = newFrame->bones[ i ][ 0 ][ 2 ];
-		outbones->matrix[ 0 ][ 3 ] = 0;
-		outbones->matrix[ 1 ][ 0 ] = newFrame->bones[ i ][ 1 ][ 0 ];
-		outbones->matrix[ 1 ][ 1 ] = newFrame->bones[ i ][ 1 ][ 1 ];
-		outbones->matrix[ 1 ][ 2 ] = newFrame->bones[ i ][ 1 ][ 2 ];
-		outbones->matrix[ 1 ][ 3 ] = 0;
-		outbones->matrix[ 2 ][ 0 ] = newFrame->bones[ i ][ 2 ][ 0 ];
-		outbones->matrix[ 2 ][ 1 ] = newFrame->bones[ i ][ 2 ][ 1 ];
-		outbones->matrix[ 2 ][ 2 ] = newFrame->bones[ i ][ 2 ][ 2 ];
-		outbones->matrix[ 2 ][ 3 ] = 0;
-		outbones++;
-	}
-
-	ri.Hunk_FreeTempMemory( newFrame );
-
-	ent->e.bonestart = TIKI_Skel_Bones_Index;
-	TIKI_Skel_Bones_Index += num_tags;
-
-	ent->e.hasMorph = qfalse;
-
-	//
-	// get the skeletor
-	//
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ent->e.entityNumber );
-
-	//
-	// add morphs
-	//
-	added = skeletor->GetMorphWeightFrame( ent->e.frameInfo[ 0 ].index, ent->e.frameInfo[ 0 ].time, &skeletorMorphCache[ skeletorMorphCacheIndex ] );
-	ent->e.morphstart = skeletorMorphCacheIndex;
-
-	if( added )
-	{
-		// found morphs
-		skeletorMorphCacheIndex += added;
-		ent->e.hasMorph = qtrue;
-	}
-
-	//
-	// draw all meshes
-	//
-	dsurf = tiki->surfaces;
-	bsurf = &ent->e.surfaces[ 0 ];
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelHeaderGame_t *skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
-
-		if( !skelmodel )
-		{
-			ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name );
-			return;
-		}
-
-		if( lod_tool->integer && !stricmp( ent->e.tiki->a->name, lod_tikiname->string ) )
-		{
-			if( lod_mesh->integer > tiki->numMeshes - 1 ) {
-				ri.Cvar_Set( "lod_mesh", va( "%d", tiki->numMeshes - 1 ) );
-			}
-
-			if( mesh == lod_mesh->integer ) {
-				if( skelmodel->pLOD ) {
-					break;
-				}
-			}
-		}
-
-		//
-		// draw all surfaces
-		//
-		surface = skelmodel->pSurfaces;
-		for( i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext ) {
-
-			if( *bsurf & 4 ) {
-				continue;
-			}
-
-			shader = NULL;
-			surface->ident = SF_TIKI_SKEL;
-
-			// use a custom shader if specified
-			if( !( ent->e.customShader ) || ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				int iShaderNum = ent->e.skinNum + ( *bsurf & 3 );
-
-				if( iShaderNum >= dsurf->numskins ) {
-					iShaderNum = 0;
-				}
-				shader = tr.shaders[ dsurf->hShader[ iShaderNum ] ];
-			} else {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-			}
-
-			if( !personalModel ) {
-				if( ( *bsurf & 0x40 ) && ( dsurf->numskins > 1 ) ) {
-					int iShaderNum = ent->e.skinNum + ( *bsurf & 2 );
-
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum ] ], 0, 0, 0, 0 );
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum + 1 ] ], 0, 0, 0, 0 );
-				} else {
-					R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0, 0, 0, 0 );
-				}
-			}
-
-			if( ( ent->e.customShader ) && ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-				R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0, 0, 0, 0 );
-			}
-		}
-	}
-
-	// FIXME: setup LOD
-}
-
-/*
-=============
-SkelVertGetNormal
-=============
-*/
-static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 0 ];
-
-	out[ 1 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 1 ];
-
-	out[ 2 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 2 ];
-}
-
-/*
-=============
-SkelMorphGetXyz
-=============
-*/
-static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
-	out[ 0 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 1 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 2 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-}
-
-/*
-=============
-SkelWeightGetXyz
-=============
-*/
-static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-				bone->offset[ 0 ] ) * weight->boneWeight;
-
-	out[ 1 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-				bone->offset[ 1 ] ) * weight->boneWeight;
-
-	out[ 2 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-				bone->offset[ 2 ] ) * weight->boneWeight;
-}
-
-/*
-=============
-SkelWeightMorphGetXyz
-=============
-*/
-static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out ) {
-	vec3_t point;
-
-	VectorAdd( totalmorph, weight->offset, point );
-
-	out[ 0 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-					bone->offset[ 0 ] ) * weight->boneWeight;
-
-	out[ 1 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-					bone->offset[ 1 ] ) * weight->boneWeight;
-
-	out[ 2 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-					bone->offset[ 2 ] ) * weight->boneWeight;
-}
-
-/*
-=============
-LerpSkelMesh
-=============
-*/
-static void LerpSkelMesh( skelSurfaceGame_t *sf ) {
-    float* outXyz;
-    int16_t* outNormal;
-	skeletorVertex_t *newVerts;
-	skeletorMorph_t *morph;
-	skelWeight_t *weight;
-	int vertNum;
-	int morphNum;
-	int weightNum;
-	skelBoneCache_t *bones;
-	skelBoneCache_t *bone;
-	int *morphs;
-	int *morphcache;
-	float scale;
-	dtiki_t *tiki;
-	int mesh;
-	int surf;
-	skelHeaderGame_t *skelmodel;
-	skelSurfaceGame_t *psurface;
-	qboolean bFound;
-
-	tiki = backEnd.currentEntity->e.tiki;
-	newVerts = sf->pVerts;
-
-	outXyz = tess.xyz[ tess.numVertexes ];
-	outNormal = tess.normal[ tess.numVertexes ];
-
-	bones = &TIKI_Skel_Bones[ backEnd.currentEntity->e.bonestart ];
-	morphs = &skeletorMorphCache[ backEnd.currentEntity->e.morphstart ];
-
-	scale = tiki->load_scale * backEnd.currentEntity->e.scale;
-
-	//
-	// get the mesh associated with the surface
-	//
-	bFound = qfalse;
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
-		psurface = skelmodel->pSurfaces;
-
-		// find the surface
-		for( surf = 0; surf < skelmodel->numSurfaces; surf++ )
-		{
-			if( psurface == sf ) {
-				bFound = qtrue;
-				break;
-			}
-			psurface = psurface->pNext;
-		}
-
-		if( bFound ) {
-			break;
-		}
-	}
-
-	assert( bFound );
-
-	//
-	// Process LOD
-	//
-	if( skelmodel->pLOD )
-	{
-		// FIXME
-	}
-
-	//
-	// just copy the vertexes
-	//
-	for( vertNum = 0; vertNum < sf->numVerts; vertNum++ )
-	{
-		vec3_t normal;
-		vec3_t out;
-
-		VectorClear( out );
-		VectorClear( outXyz );
-
-		weight = ( skelWeight_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs );
-
-		if( backEnd.currentEntity->e.hasMorph )
-		{
-			vec3_t totalmorph;
-
-			VectorClear( totalmorph );
-			morph = ( skeletorMorph_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) );
-
-			if( mesh > 0 )
-			{
-				int channelNum;
-				int boneNum;
-
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
-
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
-					}
-
-					morph++;
-				}
-
-				channelNum = skelmodel->pBones[ morph->morphIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
-
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
-
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
-					} else {
-						SkelWeightGetXyz( weight, bone, out );
-					}
-
-					weight++;
-				}
-			}
-			else
-			{
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
-
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
-					}
-
-					morph++;
-				}
-
-				bone = &bones[ morph->morphIndex ];
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
-
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
-					} else {
-						SkelWeightGetXyz( weight, bone, out );
-					}
-
-					weight++;
-				}
-			}
-		}
-		else
-		{
-			if( mesh > 0 )
-			{
-				int channelNum;
-				int boneNum;
-
-				channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
-
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
-
-					SkelWeightGetXyz( weight, bone, out );
-
-					weight++;
-				}
-			}
-			else
-			{
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
-
-					SkelWeightGetXyz( weight, bone, out );
-
-					weight++;
-				}
-			}
-		}
-
-		R_VaoPackNormal(outNormal, normal);
-
-		VectorScale( out, scale, outXyz );
-
-		newVerts = ( skeletorVertex_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs + sizeof( skelWeight_t ) * newVerts->numWeights );
-		outXyz += 4;
-		outNormal += 4;
-	}
-}
-
-/*
-=============
-RB_SkelMesh
-=============
-*/
-void RB_SkelMesh( skelSurfaceGame_t *sf ) {
-	int					j;
-	skeletorVertex_t	*vert;
-	int					baseIndex, baseVertex;
-	int					numVerts;
-	int					numIndexes;
-
-	numIndexes = sf->numTriangles * 3;
-
-	RB_CHECKOVERFLOW( sf->numVerts, numIndexes );
-
-	LerpSkelMesh( sf );
-
-	baseIndex = tess.numIndexes;
-	baseVertex = tess.numVertexes;
-	for( j = 0; j < numIndexes; j++ ) {
-		tess.indexes[ baseIndex + j ] = baseVertex + sf->pTriangles[ j ];
-	}
-	tess.numIndexes += numIndexes;
-
-	numVerts = sf->numVerts;
-	vert = sf->pVerts;
-	for( j = 0; j < numVerts; j++ ) {
-		tess.texCoords[ baseVertex + j ][ 0 ] = vert->texCoords[ 0 ];
-		tess.texCoords[ baseVertex + j ][ 1 ] = vert->texCoords[ 1 ];
-		vert = ( skeletorVertex_t * )( ( byte * )vert + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * vert->numMorphs + sizeof( skelWeight_t ) * vert->numWeights );
-		// FIXME: fill in lightmapST for completeness?
-	}
-
-	tess.numVertexes += numVerts;
-
-#if 0
-	if( backEnd.currentEntity->e.staticModelIndex ) {
-		mstaticModel_t *sm;
-		color4ub_t *out;
-		color3ub_t *in;
-		int cdofs;
-		skdSurface_t *sf2;
-
-		sm = &tr.world->staticModels[ backEnd.currentEntity->e.staticModelIndex - 1 ];
-
-		tess.useStaticModelVertexColors = qtrue;
-
-		cdofs = 0;
-		sf2 = tiki->surfs;
-		while( sf2 != sf ) {
-			cdofs += sf2->numVerts;
-			sf2 = ( skdSurface_t* )( ( ( byte* )sf2 ) + sf2->ofsEnd );
-		}
-
-		in = &tr.world->smColors[ sm->firstVert + cdofs ];
-		out = tess.vertexColors + baseVertex;
-		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
-#if 1
-			( *out )[ 0 ] = ( *in )[ 0 ];
-			( *out )[ 1 ] = ( *in )[ 1 ];
-			( *out )[ 2 ] = ( *in )[ 2 ];
-			( *out )[ 3 ] = 255;
-#elif 0
-			( ( int* )out ) = tr.identityLightByte;
-#else		
-			// su44: set it to something special so
-			// I can debug vertex colors rendering
-			( *out )[ 0 ] = 255;
-			( *out )[ 1 ] = 0;
-			( *out )[ 2 ] = 0;
-			( *out )[ 3 ] = 255;
-#endif
-		}
-	} //else
-#endif
-	//{
-	//	// an attemp to fix bizarre vertex colors bug
-	//	color4ub_t *col;
-	//	
-	//	col = &tess.vertexColors[baseVertex];
-	//	for(i = 0; i < sf->numVerts; i++,col++) {
-	//		(*col)[0] = 255;
-	//		(*col)[1] = 255;
-	//		(*col)[2] = 255;
-	//		(*col)[3] = 255;
-	//	}
-	//}
-	//tess.numVertexes += sf->numVerts;
-}
-
-/*
-=============
-R_PrintInfoWorldtris
-=============
-*/
-void R_PrintInfoWorldtris( void ) {
-	// FIXME: stub
-}
-
-/*
-=============
-RE_SetFrameNumber
-=============
-*/
-void RE_SetFrameNumber( int frameNumber ) {
-	tr.frame_skel_index = frameNumber;
-}
-
-/*
-=============
-R_UpdatePoseInternal
-=============
-*/
-void R_UpdatePoseInternal( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		if( tr.skel_index[ model->entityNumber ] == tr.frame_skel_index ) {
-			return;
-		}
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
-
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
-}
-
-/*
-=============
-RE_ForceUpdatePose
-=============
-*/
-void RE_ForceUpdatePose( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
-
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
-}
-
-/*
-=============
-RE_TIKI_Orientation
-=============
-*/
-orientation_t RE_TIKI_Orientation( refEntity_t *model, int tagnum ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_OrientationInternal( model->tiki, model->entityNumber, tagnum, model->scale );
-}
-
-/*
-=============
-RE_TIKI_IsOnGround
-=============
-*/
-qboolean RE_TIKI_IsOnGround( refEntity_t *model, int tagnum, float threshold ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_IsOnGroundInternal( model->tiki, model->entityNumber, tagnum, threshold );
-}
-
-/*
-=============
-R_GetRadius
-=============
-*/
-float R_GetRadius( refEntity_t *model ) {
-	R_UpdatePoseInternal( model );
-	return ri.GetRadiusInternal( model->tiki, model->entityNumber, model->scale );
-}
-
-/*
-=============
-R_GetFrame
-=============
-*/
-void R_GetFrame( refEntity_t *model, struct skelAnimFrame_s *newFrame ) {
-	R_UpdatePoseInternal( model );
-	ri.GetFrameInternal( model->tiki, model->entityNumber, newFrame );
-}
-
-/*
-=============
-R_DebugSkeleton
-=============
-*/
-void R_DebugSkeleton( void ) {
-	int i;
-	trRefEntity_t *ent;
-	model_t *model;
-
-	// FIXME: unimplemented
-#if 0
-	R_SyncRenderThread();
-
-	GL_BindToTMU( tr.whiteImage, TB_COLORMAP );
-	GL_State( 0x200 );
-
-	qglDisableClientState( GL_COLOR_ARRAY );
-	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	for( i = 0; i < tr.refdef.num_entities; i++ ) {
-		ent = &tr.refdef.entities[ i ];
-
-		if( ent->e.reType == RT_MODEL ) {
-			model = R_GetModelByHandle( ent->e.hModel );
-
-			if( model->type == MOD_TIKI ) {
-				RE_ForceUpdatePose( &ent->e );
-				RB_DrawSkeletor( ent );
-			}
-		}
-	}
-#endif
-}
-static float ProjectRadius(float r, const vec3_t location)
-{
-	Vector separation;
-	float projectedRadius;
-
-	separation = Vector(tr.viewParms.or.origin) - Vector(location);
-	projectedRadius = separation.length();
-
-	return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
-}
-
-float R_CalcLod(const vec3_t origin, float radius)
-{
-	return ProjectRadius(radius, origin);
-}
-
-int R_LerpTag(orientation_t* tag, qhandle_t handle, int startFrame, int endFrame,
-	float frac, const char* tagName)
-{
-	// This is unused
-	return 0;
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_scene.c b/code/renderergl2/new/tr_scene.c
deleted file mode 100644
index 08ac082e..00000000
--- a/code/renderergl2/new/tr_scene.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-extern int			r_firstSceneDrawSurf;
-
-extern int			r_numdlights;
-extern int			r_firstSceneDlight;
-
-extern int			r_numentities;
-extern int			r_firstSceneEntity;
-
-extern int			r_numpolys;
-extern int			r_firstScenePoly;
-
-extern int			r_numpolyverts;
-
-void RE_AddRefSpriteToScene(const refEntity_t* ent) {
-    // FIXME: unimplemented
-}
-
-/*
-=====================
-R_AddTerrainMarkSurfaces
-=====================
-*/
-void R_AddTerrainMarkSurfaces(void) {
-    // FIXME: unimplemented
-}
-
-/*
-=====================
-RE_AddTerrainMarkToScene
-=====================
-*/
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-    // FIXME: unimplemented
-}
-
-//=================================================================================
-
-/*
-=====================
-RE_GetRenderEntity
-=====================
-*/
-refEntity_t* RE_GetRenderEntity(int entityNumber) {
-    int i;
-
-    for (i = 0; i < r_numentities; i++) {
-        if (backEndData->entities[i].e.entityNumber == entityNumber) {
-            return &backEndData->entities[i].e;
-        }
-    }
-
-    return NULL;
-}
diff --git a/code/renderergl2/new/tr_shade_calc.c b/code/renderergl2/new/tr_shade_calc.c
deleted file mode 100644
index 809f31dd..00000000
--- a/code/renderergl2/new/tr_shade_calc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-/*
-** RB_CalcColorFromConstant
-*/
-void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor)
-{
-    int i;
-
-    for (i = 0; i < tess.numVertexes; i++) {
-        dstColors[i * 4] = constantColor[0];
-        dstColors[i * 4 + 1] = constantColor[1];
-        dstColors[i * 4 + 2] = constantColor[2];
-        dstColors[i * 4 + 3] = constantColor[3];
-    }
-}
-
-void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
-{
-    int i;
-
-    for (i = 0; i < tess.numVertexes; i++) {
-        dstColors[i * 4 + 3] = constantAlpha;
-    }
-}
-
-void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-    // FIXME: unimplemented
-}
diff --git a/code/renderergl2/new/tr_shader.c b/code/renderergl2/new/tr_shader.c
deleted file mode 100644
index 53dbeada..00000000
--- a/code/renderergl2/new/tr_shader.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-qhandle_t RE_RefreshShaderNoMip(const char* name) {
-    // FIXME: unimplemented
-    // Workaround
-    return RE_RegisterShaderNoMip(name);
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_sphere_shade.cpp b/code/renderergl2/new/tr_sphere_shade.cpp
deleted file mode 100644
index 1f22f0a2..00000000
--- a/code/renderergl2/new/tr_sphere_shade.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_sphere_shade.cpp -- sphere shade
-
-#include "../tr_local.h"
-
-vec3_t spheredef[6];
-suninfo_t s_sun;
-static vec3_t ambientlight;
-static qboolean bEntityOverbright;
-static int iEntityLightingMax;
-static int light_reference_count = 0;
-
-int compare_light_intensities(const void* p1, const void* p2)
-{
-	return ((const reallightinfo_t*)p2)->fIntensity - ((const reallightinfo_t*)p1)->fIntensity;
-}
-
-static void RB_OptimizeLights()
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Light_CubeMap(const color4ub_t colors)
-{
-	// FIXME: unimplemented
-}
-
-void RB_Light_Real(unsigned char* colors)
-{
-	int i, j;
-	float* normal;
-	float* xyz;
-	unsigned char* color;
-	vec3_t v;
-	vec3_t colorout;
-	float fDot;
-	reallightinfo_t* pLight;
-
-
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_Light_Sun()
-{
-	// FIXME: unimplemented
-}
-
-static qboolean RB_Sphere_CalculateSphereOrigin()
-{
-	// FIXME: unimplemented
-	return qfalse;
-}
-
-static void RB_Sphere_DrawDebugLine(const spherel_t* thislight, float falloff, const vec3_t origin)
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_AddSpotLight(const spherel_t* thislight)
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_AddLight(const spherel_t* thislight)
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_BuildStaticLights()
-{
-	// FIXME: unimplemented
-}
-
-void RB_Sphere_BuildDLights()
-{
-	// FIXME: unimplemented
-}
-
-void RB_Sphere_SetupEntity()
-{
-    // FIXME: unimplemented
-}
-
-void RB_Grid_SetupEntity()
-{
-	// FIXME: unimplemented
-}
-
-void RB_Grid_SetupStaticModel()
-{
-    // FIXME: unimplemented
-}
-
-void RB_Light_Fullbright(unsigned char* colors)
-{
-	memset((void*)colors, 0xFF, tess.numVertexes);
-}
-
-void R_Sphere_InitLights()
-{
-    // FIXME: unimplemented
-}
-
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights)
-{
-    // FIXME: unimplemented
-    return 0;
-}
diff --git a/code/renderergl2/new/tr_sprite.c b/code/renderergl2/new/tr_sprite.c
deleted file mode 100644
index 1cf6473c..00000000
--- a/code/renderergl2/new/tr_sprite.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2010 su44
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_sprite.c - MoHAA sprite system
-
-#include "../tr_local.h"
-
-/*
-=====================
-SPR_RegisterSprite
-=====================
-*/
-sprite_t *SPR_RegisterSprite(const char *name)
-{
-	image_t *spriteImage;
-	shader_t *shader;
-	sprite_t *spr;
-	char shadername[256];
-	COM_StripExtension(name,shadername,sizeof(shadername));
-	shader = R_FindShader(shadername,-1,qfalse,qfalse,qfalse,qfalse);
-	if(shader) {
-		spriteImage = 0;
-		if(shader->stages[0])
-			spriteImage = shader->stages[0]->bundle[0].image[0];
-		if ( !spriteImage ) {
-			ri.Printf(1, "Could not find image for sprite in shader %s\n", name);
-			return 0;
-		}
-		spr = ri.Hunk_Alloc(sizeof(sprite_t), h_dontcare);
-		spr->height = spriteImage->height;
-		spr->width = spriteImage->width;
-		spr->origin_x = spr->width * 0.5;
-		spr->origin_y = spr->height * 0.5;
-		spr->shader = shader;
-		spr->scale = spr->shader->sprite.scale;
-		return spr;
-	}
-	return 0;
-}
-
-/*
-=====================
-RB_DrawSprite
-=====================
-*/
-void RB_DrawSprite( const refSprite_t *spr ) {
-	// FIXME: stub
-}
diff --git a/code/renderergl2/new/tr_swipe.cpp b/code/renderergl2/new/tr_swipe.cpp
deleted file mode 100644
index dc6ad9f2..00000000
--- a/code/renderergl2/new/tr_swipe.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_swipe.cpp -- swipe rendering
-
-#include "../tr_local.h"
-
-void RB_DrawSwipeSurface(surfaceType_t* pswipe) {
-    // FIXME: unimplemented
-}
-
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
-{
-    // FIXME: unimplemented
-}
-
-void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
-{
-    // FIXME: unimplemented
-}
-
-void RE_SwipeEnd()
-{
-    // FIXME: unimplemented
-}
diff --git a/code/renderergl2/new/tr_util.cpp b/code/renderergl2/new/tr_util.cpp
deleted file mode 100644
index ebfcb58d..00000000
--- a/code/renderergl2/new/tr_util.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_util.c -- renderer utility
-
-#include "../tr_local.h"
-
-static const size_t colorSize = (1 << (sizeof(uint16_t) * 8)) - 1;
-static uint16_t cntColor[4];
-static float cntSt[ 2 ];
-
-/*
-===============
-RB_StreamBegin
-===============
-*/
-void RB_StreamBegin( shader_t *shader ) {
-	RB_BeginSurface( shader, 0, 0 );
-}
-
-/*
-===============
-RB_StreamEnd
-===============
-*/
-void RB_StreamEnd( void ) {
-	int i;
-
-	if( tess.numVertexes <= 2 ) {
-		RB_EndSurface();
-		return;
-	}
-
-	tess.indexes[ 0 ] = 0;
-	tess.indexes[ 1 ] = 1;
-	tess.indexes[ 2 ] = 2;
-
-	for( i = 0; i < tess.numVertexes - 2; i++ ) {
-		tess.indexes[ i * 3 + 0 ] = ( i & 1 ) + i;
-		tess.indexes[ i * 3 + 1 ] = i - ( ( i & 1 ) - 1 );
-		tess.indexes[ i * 3 + 2 ] = i + 2;
-		tess.numIndexes += 3;
-	}
-
-	RB_EndSurface();
-}
-
-/*
-===============
-RB_StreamBeginDrawSurf
-===============
-*/
-void RB_StreamBeginDrawSurf( void ) {
-	backEnd.dsStreamVert = tess.numVertexes;
-}
-
-/*
-===============
-RB_StreamEndDrawSurf
-===============
-*/
-void RB_StreamEndDrawSurf( void ) {
-	int		numverts;
-	int		i;
-
-	if( tess.numVertexes - backEnd.dsStreamVert <= 2 ) {
-		tess.numVertexes = backEnd.dsStreamVert;
-		return;
-	}
-
-	numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
-	for( i = 0; i < numverts; i++ ) {
-		tess.indexes[ i + tess.numIndexes ] = ( i & 1 ) + i + backEnd.dsStreamVert;
-		tess.indexes[ i + tess.numIndexes + 1 ] = i + backEnd.dsStreamVert - ( ( i & 1 ) - 1 );
-		tess.indexes[ i + tess.numIndexes + 2 ] = i + backEnd.dsStreamVert + 2;
-		tess.numIndexes += 3;
-	}
-}
-
-/*
-===============
-addTriangle
-===============
-*/
-static void addTriangle(void) {
-    tess.texCoords[tess.numVertexes][0] = cntSt[0];
-    tess.texCoords[tess.numVertexes][1] = cntSt[1];
-    tess.color[tess.numVertexes][0] = cntColor[0];
-    tess.color[tess.numVertexes][1] = cntColor[1];
-    tess.color[tess.numVertexes][2] = cntColor[2];
-    tess.color[tess.numVertexes][3] = cntColor[3];
-	tess.numVertexes++;
-}
-
-/*
-===============
-RB_Vertex3fv
-===============
-*/
-void RB_Vertex3fv( vec3_t v ) {
-	VectorCopy( v, tess.xyz[ tess.numVertexes ] );
-	addTriangle();
-}
-
-/*
-===============
-RB_Vertex3f
-===============
-*/
-void RB_Vertex3f( vec_t x, vec_t y, vec_t z ) {
-	tess.xyz[ tess.numVertexes ][ 0 ] = x;
-	tess.xyz[ tess.numVertexes ][ 1 ] = y;
-	tess.xyz[ tess.numVertexes ][ 2 ] = z;
-	addTriangle();
-}
-
-/*
-===============
-RB_Vertex2f
-===============
-*/
-void RB_Vertex2f( vec_t x, vec_t y ) {
-	RB_Vertex3f( x, y, 0 );
-}
-
-/*
-===============
-RB_Color4f
-===============
-*/
-void RB_Color4f( vec_t r, vec_t g, vec_t b, vec_t a ) {
-	cntColor[ 0 ] = r * tr.identityLightByte;
-	cntColor[ 1 ] = g * tr.identityLightByte;
-	cntColor[ 2 ] = b * tr.identityLightByte;
-	cntColor[ 3 ] = a * 255.0;
-}
-
-/*
-===============
-RB_Color3f
-===============
-*/
-void RB_Color3f( vec_t r, vec_t g, vec_t b ) {
-	RB_Color4f( r, g, b, 1.0 );
-}
-
-/*
-===============
-RB_Color3fv
-===============
-*/
-void RB_Color3fv( vec3_t col ) {
-	RB_Color3f( col[ 0 ], col[ 1 ], col[ 2 ] );
-}
-
-/*
-===============
-RB_Color4bv
-===============
-*/
-void RB_Color4bv( unsigned char *colors ) {
-	cntColor[ 0 ] = colors[ 0 ];
-	cntColor[ 1 ] = colors[ 1 ];
-	cntColor[ 2 ] = colors[ 2 ];
-	cntColor[ 3 ] = colors[ 3 ];
-}
-
-/*
-===============
-RB_Texcoord2f
-===============
-*/
-void RB_Texcoord2f( float s, float t ) {
-	cntSt[ 0 ] = s;
-	cntSt[ 1 ] = t;
-}
-
-/*
-===============
-RB_Texcoord2fv
-===============
-*/
-void RB_Texcoord2fv( vec2_t st ) {
-	cntSt[ 0 ] = st[ 0 ];
-	cntSt[ 1 ] = st[ 1 ];
-}
-
-static int Numbers[ 12 ][ 8 ];
-static float Lines[ 13 ][ 4 ];
-
-/*
-===============
-R_DrawDebugNumber
-===============
-*/
-void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, float g, float b, int precision ) {
-	// FIXME: unimplemented
-}
-
-/*
-===============
-R_DebugRotatedBBox
-===============
-*/
-void R_DebugRotatedBBox( const vec3_t org, vec3_t ang, vec3_t mins, vec3_t maxs, float r, float g, float b, float alpha ) {
-
-}
-
-/*
-===============
-RE_GetShaderWidth
-===============
-*/
-int RE_GetShaderWidth( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	} else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->stages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadWidth;
-}
-
-/*
-===============
-RE_GetShaderHeight
-===============
-*/
-int RE_GetShaderHeight( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->stages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadHeight;
-}
diff --git a/code/renderergl2/new/tr_world.c b/code/renderergl2/new/tr_world.c
deleted file mode 100644
index 2f55db4f..00000000
--- a/code/renderergl2/new/tr_world.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
-{
-    // FIXME: unimplemented
-}
\ No newline at end of file
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 57a4efc3..152a5970 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -43,6 +43,42 @@ static	byte		*fileBase;
 int			c_subdivisions;
 int			c_gridVerts;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+static int map_length;
+static int nummodels;
+static int numShaders;
+static int numbrushes;
+static int numbrushsides;
+static int numFogs;
+static int numplanes;
+static int num_entities;
+static int numnodes;
+static int numleafs;
+static int numleafsurfaces;
+static int numDrawVerts;
+static int numDrawIndexes;
+static int numDrawSurfaces;
+static int numLightDefs;
+static int numLightBytes;
+static int numVisBytes;
+static int numSLights;
+static int entLightVisSize;
+static int g_iGridArraySize;
+static int g_iGridDataSize;
+static int g_iGridPaletteBytes;
+static int g_iGridOffsets;
+static int g_nStaticModelData;
+static int map_version;
+static int g_nStaticModelIndices;
+static int g_nStaticModels;
+static int g_nTerPatchIndices;
+static int g_nTerraPatches;
+
+//=========================
+
 //===============================================================================
 
 static void HSVtoRGB( float h, float s, float v, float rgb[3] )
@@ -3016,3 +3052,66 @@ void RE_LoadWorldMap( const char *name ) {
 
     ri.FS_FreeFile( buffer.v );
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+=================
+RE_MapVersion
+
+=================
+*/
+int RE_MapVersion(void)
+{
+	return map_version;
+}
+
+/*
+=================
+RE_PrintBSPFileSizes
+
+=================
+*/
+void RE_PrintBSPFileSizes(void)
+{
+  ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
+  ri.Printf(PRINT_ALL, "%6i   models                %7i\n", nummodels, 40 * nummodels);
+  ri.Printf(PRINT_ALL, "%6i   shaders               %7i\n", numShaders, 140 * numShaders);
+  ri.Printf(PRINT_ALL, "%6i   brushes               %7i\n", numbrushes, 12 * numbrushes);
+  ri.Printf(PRINT_ALL, "%6i   brushsides            %7i\n", numbrushsides, 12 * numbrushsides);
+  ri.Printf(PRINT_ALL, "%6i   fogs                  %7i\n", numFogs, 72 * numFogs);
+  ri.Printf(PRINT_ALL, "%6i   planes                %7i\n", numplanes, 16 * numplanes);
+  ri.Printf(PRINT_ALL, "%6i   nodes                 %7i\n", numnodes, 36 * numnodes);
+  ri.Printf(PRINT_ALL, "%6i   leafs                 %7i\n", numleafs, numleafs << 6);
+  ri.Printf(PRINT_ALL, "%6i   leafsurfaces          %7i\n", numleafsurfaces, 4 * numleafsurfaces);
+  ri.Printf(PRINT_ALL, "%6i   drawverts             %7i\n", numDrawVerts, 44 * numDrawVerts);
+  ri.Printf(PRINT_ALL, "%6i   drawindexes           %7i\n", numDrawIndexes, 4 * numDrawIndexes);
+  ri.Printf(PRINT_ALL, "%6i   drawsurfaces          %7i\n", numDrawSurfaces, 108 * numDrawSurfaces);
+  ri.Printf(PRINT_ALL, "%6i   lightdefs             %7i\n", numLightDefs, 52 * numLightDefs);
+  ri.Printf(PRINT_ALL, "%6i   lightmaps             %7i\n", numLightBytes / 49152, numLightBytes);
+  ri.Printf(PRINT_ALL, "         visibility            %7i\n", numVisBytes);
+  ri.Printf(PRINT_ALL, "%6i   entitylights          %7i\n", numSLights, 56 * numSLights);
+  ri.Printf(PRINT_ALL, "         entitylightvis        %7i\n", entLightVisSize);
+  ri.Printf(PRINT_ALL, "         light grid palette    %7i\n", g_iGridPaletteBytes);
+  ri.Printf(PRINT_ALL, "%6i   light grid offsets    %7i\n", g_iGridOffsets, 2 * g_iGridOffsets);
+  ri.Printf(PRINT_ALL, "         light grid data       %7i\n", g_iGridDataSize);
+  ri.Printf(PRINT_ALL, "%6i   terrain               %7i\n", g_nTerraPatches, 388 * g_nTerraPatches);
+  ri.Printf(PRINT_ALL, "%6i   terrain indexes       %7i\n", g_nTerPatchIndices, 2 * g_nTerPatchIndices);
+  ri.Printf(PRINT_ALL, "         static model data     %7i\n", g_nStaticModelData);
+  ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
+  ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
+}
+
+/*
+=================
+R_ClearWorld
+
+Set the world to NULL to prevent anyone from accessing
+freed world data
+=================
+*/
+void R_ClearWorld(void) {
+    tr.world = NULL;
+}
diff --git a/code/renderergl2/tr_cmds.c b/code/renderergl2/tr_cmds.c
index 2025c41d..ff2195df 100644
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
@@ -21,12 +21,34 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "tr_local.h"
 
+static backEndCounters_t pc_save;
+
+/*
+=====================
+R_SavePerformanceCounters
+=====================
+*/
+void R_SavePerformanceCounters(void) {
+    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
+}
+
 /*
 =====================
 R_PerformanceCounters
 =====================
 */
 void R_PerformanceCounters( void ) {
+	if (r_fps->integer) {
+		ri.SetPerformanceCounters(
+			backEnd.pc.c_totalIndexes / 3,
+			backEnd.pc.c_vertexes,
+			R_SumOfUsedImages(),
+			pc_save.c_totalIndexes / 3,
+			pc_save.c_vertexes,
+			backEnd.pc.c_characterlights
+			);
+	}
+
 	if ( !r_speeds->integer ) {
 		// clear the counters even if we aren't printing
 		Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
diff --git a/code/renderergl2/new/tr_draw.c b/code/renderergl2/tr_draw.c
similarity index 65%
rename from code/renderergl2/new/tr_draw.c
rename to code/renderergl2/tr_draw.c
index fdaff185..b1efd026 100644
--- a/code/renderergl2/new/tr_draw.c
+++ b/code/renderergl2/tr_draw.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // tr_draw.c -- drawing
 
-#include "../tr_local.h"
+#include "tr_local.h"
 
 vec4_t r_colorWhite = { 1.0, 1.0, 1.0, 1.0 };
 
@@ -40,6 +40,7 @@ void Draw_SetColor(const vec4_t rgba) {
 	backEnd.color2D[1] = (byte)(rgba[1] * tr.identityLightByte);
 	backEnd.color2D[2] = (byte)(rgba[2] * tr.identityLightByte);
 	backEnd.color2D[3] = (byte)(rgba[3] * 255.0);
+	//qglColor4ubv(backEnd.color2D);
 #else
 	RE_SetColor(rgba);
 #endif
@@ -54,7 +55,7 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 #if 1
 	shader_t* shader;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -90,6 +91,58 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 #endif
 }
 
+/*
+================
+Draw_StretchPic2
+================
+*/
+void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader) {
+	shader_t* shader;
+	float halfWidth, halfHeight;
+	float scaledWidth1, scaledHeight1;
+	float scaledWidth2, scaledHeight2;
+
+	R_IssuePendingRenderCommands();
+
+	if (hShader) {
+		shader = R_GetShaderByHandle(hShader);
+	}
+	else {
+		shader = tr.defaultShader;
+	}
+
+	if (w <= 0) {
+		w = shader->stages[0]->bundle[0].image[0]->width;
+		h = shader->stages[0]->bundle[0].image[0]->height;
+	}
+
+	halfWidth = w * 0.5f;
+	halfHeight = h * 0.5f;
+	scaledWidth1 = halfWidth * sy;
+	scaledHeight1 = halfHeight * sx;
+	scaledWidth2 = halfWidth * sx;
+	scaledHeight2 = halfHeight * sy;
+
+	// draw the pic
+	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+	RB_BeginSurface(shader, 0, 0);
+
+	RB_Texcoord2f(s1, t1);
+	RB_Vertex3f(x + halfWidth - (scaledWidth2 + -scaledHeight2), y + halfWidth - scaledHeight1 - scaledWidth1, 0);
+
+	RB_Texcoord2f(t2, t1);
+	RB_Vertex3f(scaledWidth2 - -scaledHeight2 + x + halfWidth, scaledWidth1 - scaledHeight1 + y + halfWidth, 0);
+
+	RB_Texcoord2f(s1, s2);
+	RB_Vertex3f(x+ halfWidth - (scaledWidth2 + scaledHeight2), scaledHeight1 - scaledWidth1 + y + halfWidth, 0);
+
+	RB_Texcoord2f(t2, s2);
+	RB_Vertex3f(scaledWidth2 - scaledHeight2 + x + halfWidth, scaledWidth1 + scaledHeight1 + y + halfWidth, 0);
+
+	RB_StreamEnd();
+}
+
+
 /*
 ================
 Draw_TilePic
@@ -99,7 +152,7 @@ void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
 	shader_t* shader;
 	float		picw, pich;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -145,7 +198,7 @@ void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, i
 	shader_t* shader;
 	float		picw, pich;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -191,7 +244,7 @@ void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhand
 	int			i;
 	shader_t* shader;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -219,15 +272,15 @@ RE_DrawBackground_TexSubImage
 ================
 */
 void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
+	// FIXME: unimplemented (GL2)
+#if 0
 	GLenum	format;
-    int		w, h;
-    vec4_t quadVerts[4];
-    vec2_t texCoords[4];
+	int		w, h;
 
 	w = glConfig.vidWidth;
 	h = glConfig.vidHeight;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 	qglFinish();
 
 	if (bgr) {
@@ -237,17 +290,17 @@ void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
 		format = GL_RGB;
 	}
 
-	GL_BindToTMU(tr.scratchImage[0], TB_COLORMAP);
+	GL_Bind(tr.scratchImage);
 
-	if (cols == tr.scratchImage[0]->width && rows == tr.scratchImage[0]->height && format == tr.scratchImage[0]->internalFormat)
+	if (cols == tr.scratchImage->width && rows == tr.scratchImage->height && format == tr.scratchImage->internalFormat)
 	{
 		qglTexSubImage2D(3553, 0, 0, 0, cols, rows, format, 5121, data);
 	}
 	else
 	{
-		tr.scratchImage[0]->uploadWidth = cols;
-		tr.scratchImage[0]->uploadHeight = rows;
-		tr.scratchImage[0]->internalFormat = format;
+		tr.scratchImage->uploadWidth = cols;
+		tr.scratchImage->uploadHeight = rows;
+		tr.scratchImage->internalFormat = format;
 		qglTexImage2D(GL_TEXTURE_2D, 0, 3, cols, rows, 0, format, 5121, data);
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 9729.0);
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 9729.0);
@@ -257,22 +310,22 @@ void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
 	qglDisable(GL_DEPTH_TEST);
 	qglEnable(GL_TEXTURE_2D);
 
-	VectorSet4(quadVerts[0], 0.0f, 0.0f, 0.0f, 1.0f);
-	VectorSet4(quadVerts[1], w, 0.0f, 0.0f, 1.0f);
-	VectorSet4(quadVerts[2], w, h, 0.0f, 1.0f);
-    VectorSet4(quadVerts[3], 0.0f, h, 0.0f, 1.0f);
+	qglBegin(GL_QUADS);
 
-    VectorSet2(texCoords[0], 0.5f / cols, (rows - 0.5f) / rows);
-    VectorSet2(texCoords[1], (cols - 0.5f) / cols, (rows - 0.5f) / rows);
-    VectorSet2(texCoords[2], (cols - 0.5f) / cols, 0.5f / rows);
-    VectorSet2(texCoords[3], 0.5f / cols, 0.5f / rows);
+	qglTexCoord2f(0.5 / (GLfloat)cols, ((GLfloat)rows - 0.5) / rows);
+	qglVertex2f(0, 0);
 
-    GLSL_BindProgram(&tr.textureColorShader);
+	qglTexCoord2f(((GLfloat)cols - 0.5) / cols, ((GLfloat)rows - 0.5) / rows);
+	qglVertex2f(w, 0);
 
-    GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-    GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, colorWhite);
+	qglTexCoord2f(((GLfloat)cols - 0.5) / cols, 0.5 / (GLfloat)rows);
+	qglVertex2f(w, h);
 
-    RB_InstantQuad2(quadVerts, texCoords);
+	qglTexCoord2f(0.5 / (GLfloat)rows, 0.5 / (GLfloat)rows);
+	qglVertex2f(0, h);
+
+	qglEnd();
+#endif
 }
 
 /*
@@ -281,7 +334,25 @@ RE_DrawBackground_DrawPixels
 ================
 */
 void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
-	// FIXME: stub
+    // FIXME: unimplemented (GL2)
+#if 0
+	R_IssuePendingRenderCommands();
+
+	GL_State(0);
+	qglDisable(GL_TEXTURE_2D);
+
+	qglPixelZoom(glConfig.vidWidth / rows, glConfig.vidHeight / cols);
+
+	if (bgr) {
+		qglDrawPixels(cols, rows, GL_BGR, GL_UNSIGNED_BYTE, data);
+	} else {
+		qglDrawPixels(cols, rows, GL_RGB, GL_UNSIGNED_BYTE, data);
+	}
+
+	qglPixelZoom(1.0, 1.0);
+
+	qglEnable(GL_TEXTURE_2D);
+#endif
 }
 
 /*
@@ -290,36 +361,25 @@ AddBox
 ================
 */
 void AddBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
+    // FIXME: unimplemented (GL2)
+#if 0
+	R_IssuePendingRenderCommands();
 
+	qglColor4ubv(backEnd.color2D);
 	qglDisable(GL_TEXTURE_2D);
 	GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE);
 
-    {
-        shaderProgram_t* sp = &tr.textureColorShader;
-        vec4_t color = { backEnd.color2D[0] / 255.0f, backEnd.color2D[1] / 255.0f, backEnd.color2D[2] / 255.0f, backEnd.color2D[3] / 255.0f };
-        vec4_t quadVerts[4];
-        vec2_t texCoords[4];
+	qglBegin(GL_QUADS);
 
-        VectorSet4(quadVerts[0], x, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[1], x + w, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
-        VectorSet4(quadVerts[3], x, y + h, 0.0f, 1.0f);
+	qglVertex2f(x, y);
+	qglVertex2f(x + w, y);
+	qglVertex2f(x + w, y + h);
+	qglVertex2f(x, y + h);
 
-        VectorSet2(texCoords[0], 0.0f, 0.0f);
-        VectorSet2(texCoords[1], 1.0f, 0.0f);
-        VectorSet2(texCoords[2], 1.0f, 1.0f);
-        VectorSet2(texCoords[3], 0.0f, 1.0f);
-
-        GLSL_BindProgram(sp);
-
-        GLSL_SetUniformMat4(sp, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-        GLSL_SetUniformVec4(sp, UNIFORM_COLOR, color);
-
-        RB_InstantQuad2(quadVerts, texCoords);
-    }
+	qglEnd();
 
 	qglEnable(GL_TEXTURE_2D);
+#endif
 }
 
 /*
@@ -328,36 +388,25 @@ DrawBox
 ================
 */
 void DrawBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
+    // FIXME: unimplemented (GL2)
+#if 0
+	R_IssuePendingRenderCommands();
 
+	qglColor4ubv(backEnd.color2D);
 	qglDisable(GL_TEXTURE_2D);
 	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
 
-    {
-        shaderProgram_t* sp = &tr.textureColorShader;
-        vec4_t color = { backEnd.color2D[0] / 255.0f, backEnd.color2D[1] / 255.0f, backEnd.color2D[2] / 255.0f, backEnd.color2D[3] / 255.0f };
-        vec4_t quadVerts[4];
-        vec2_t texCoords[4];
+	qglBegin(GL_QUADS);
 
-        VectorSet4(quadVerts[0], x, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[1], x + w, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
-        VectorSet4(quadVerts[3], x, y + h, 0.0f, 1.0f);
+	qglVertex2f(x, y);
+	qglVertex2f(x + w, y);
+	qglVertex2f(x + w, y + h);
+	qglVertex2f(x, y + h);
 
-        VectorSet2(texCoords[0], 0.0f, 0.0f);
-        VectorSet2(texCoords[1], 1.0f, 0.0f);
-        VectorSet2(texCoords[2], 1.0f, 1.0f);
-        VectorSet2(texCoords[3], 0.0f, 1.0f);
-
-        GLSL_BindProgram(sp);
-
-        GLSL_SetUniformMat4(sp, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-        GLSL_SetUniformVec4(sp, UNIFORM_COLOR, color);
-
-        RB_InstantQuad2(quadVerts, texCoords);
-    }
+	qglEnd();
 
 	qglEnable(GL_TEXTURE_2D);
+#endif
 }
 
 /*
@@ -366,19 +415,19 @@ DrawLineLoop
 ================
 */
 void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask) {
+    // FIXME: unimplemented (GL2)
+#if 0
 	int		i;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglDisable(GL_TEXTURE_2D);
 
 	if (stipple_factor) {
 		qglEnable(GL_LINE_STIPPLE);
-		glLineStipple(stipple_factor, stipple_mask);
+		qglLineStipple(stipple_factor, stipple_mask);
 	}
 
-	// FIXME: unimplemented
-	/*
 	qglBegin(GL_LINE_LOOP);
 
 	for (i = 0; i < count; i++) {
@@ -386,13 +435,13 @@ void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipp
 	}
 
 	qglEnd();
-	*/
 
 	qglEnable(GL_TEXTURE_2D);
 
 	if (stipple_factor) {
 		qglDisable(GL_LINE_STIPPLE);
 	}
+#endif
 }
 
 /*
@@ -401,32 +450,36 @@ Set2DWindow
 ================
 */
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-	mat4_t matrix;
-
-	R_SyncRenderThread();
+    // FIXME: unimplemented (GL2)
+#if 0
+	R_IssuePendingRenderCommands();
 	qglViewport(x, y, w, h);
 	qglScissor(x, y, w, h);
+	qglMatrixMode(GL_PROJECTION);
+	qglLoadIdentity();
+	qglOrtho(left, right, bottom, top, n, f);
+	qglMatrixMode(GL_MODELVIEW);
 
-    Mat4Ortho(left, right, bottom, top, n, f, matrix);
-    GL_SetProjectionMatrix(matrix);
-    Mat4Identity(matrix);
-    GL_SetModelviewMatrix(matrix);
-
+	qglLoadIdentity();
 	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
 	qglEnable(GL_BLEND);
 	qglDisable(GL_CULL_FACE);
 	qglDisable(GL_CLIP_PLANE0);
+	// Make sure to disable the fog to avoid messing up with the UI
+	qglDisable(GL_FOG);
+	qglFogf(GL_FOG_START, 0);
 
-	//if (r_reset_tc_array->integer) {
-	//	qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	//}
+	if (r_reset_tc_array->integer) {
+		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	}
 
-	if (!backEnd.projection2D)
+	if (!backEnd.in2D)
 	{
 		backEnd.refdef.time = ri.Milliseconds();
-		backEnd.projection2D = qtrue;
+		backEnd.in2D = qtrue;
 		backEnd.refdef.floatTime = backEnd.refdef.time / 1000.0;
 	}
+#endif
 }
 
 /*
@@ -435,6 +488,9 @@ RE_Scissor
 ================
 */
 void RE_Scissor(int x, int y, int width, int height) {
+    // FIXME: unimplemented (GL2)
+#if 0
 	qglEnable(GL_SCISSOR_TEST);
 	qglScissor(x, y, width, height);
+#endif
 }
diff --git a/code/renderergl2/new/tr_font.cpp b/code/renderergl2/tr_font.cpp
similarity index 52%
rename from code/renderergl2/new/tr_font.cpp
rename to code/renderergl2/tr_font.cpp
index a3d763df..abb9ff6e 100644
--- a/code/renderergl2/new/tr_font.cpp
+++ b/code/renderergl2/tr_font.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,16 +22,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tr_font.cpp -- font rendering
 
-#include "../tr_local.h"
+#include "tr_local.h"
 
 #define MAX_LOADED_FONTS 255
 
+static fontheader_sgl_t s_loadedFonts_sgl[MAX_LOADED_FONTS];
+static int s_numLoadedFonts_sgl = 0;
 static fontheader_t s_loadedFonts[MAX_LOADED_FONTS];
 static int s_numLoadedFonts = 0;
 static float s_fontHeightScale = 1.0;
 static float s_fontGeneralScale = 1.0;
 static float s_fontZ = 0.0;
 
+void R_ShutdownFont() {
+    int i;
+    fontheader_t *header;
+    fontheader_sgl_t *header_sgl;
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header = &s_loadedFonts[i];
+        if (header->charTable) {
+            ri.Free(header->charTable);
+            header->charTable = NULL;
+        }
+
+        memset(header, 0, sizeof(*header));
+    }
+
+    for (i = 0; i < s_numLoadedFonts_sgl; i++)
+    {
+        header_sgl = &s_loadedFonts_sgl[i];
+        memset(header_sgl, 0, sizeof(*header_sgl));
+    }
+}
+
 void R_SetFontHeightScale(float scale)
 {
     s_fontHeightScale = scale;
@@ -47,20 +72,75 @@ void R_SetFontZ(float zed)
     s_fontZ = zed;
 }
 
-fontheader_t* R_LoadFont(const char* name)
+static int CodeSearch(const fontheader_t* font, unsigned short uch) {
+    int mid;
+    int l, r;
+
+    r = font->charTableLength;
+    l = 0;
+    while (l < r) {
+        mid = (l + r) / 2;
+        
+        if (font->charTable[mid].cp > uch) {
+            r = (l + r) / 2;
+            continue;
+        }
+
+        if (uch == font->charTable[mid].cp) {
+            return (l + r) / 2;
+        }
+
+        l = mid + 1;
+    }
+
+    if (uch != font->charTable[l].cp) {
+        return -1;
+    }
+
+    return l;
+}
+
+static qboolean DBCSIsLeadByte(const fontheader_t* font, unsigned short uch) {
+    // Byte ranges found in Wikipedia articles with relevant search strings in each case
+    switch (font->codePage) {
+    case 932:
+        // Shift_jis
+        return ((uch >= 0x81) && (uch <= 0x9F)) ||
+            ((uch >= 0xE0) && (uch <= 0xFC));
+        // Lead bytes F0 to FC may be a Microsoft addition.
+    case 936:
+        // GBK
+        return (uch >= 0x81) && (uch <= 0xFE);
+    case 949:
+        // Korean Wansung KS C-5601-1987
+        return (uch >= 0x81) && (uch <= 0xFE);
+    case 950:
+        // Big5
+        return (uch >= 0x81) && (uch <= 0xFE);
+    case 1361:
+        // Korean Johab KS C-5601-1992
+        return
+            ((uch >= 0x84) && (uch <= 0xD3)) ||
+            ((uch >= 0xD8) && (uch <= 0xDE)) ||
+            ((uch >= 0xE0) && (uch <= 0xF9));
+    }
+    return false;
+}
+
+fontheader_sgl_t* R_LoadFont_sgl(const char* name)
 {
     int i;
     char* theFile;
-    fontheader_t* header;
+    fontheader_sgl_t* header;
     char* ref;
     const char* token;
     qboolean error;
 
     error = qfalse;
 
-    for (i = 0; i < s_numLoadedFonts; i++)
+    for (i = 0; i < s_numLoadedFonts_sgl; i++)
     {
-        header = &s_loadedFonts[i];
+        header = &s_loadedFonts_sgl[i];
         if (!Q_stricmp(name, header->name)) {
             return header;
         }
@@ -72,14 +152,13 @@ fontheader_t* R_LoadFont(const char* name)
         return NULL;
     }
 
-    va("fonts/%s.RitualFont", name);
     if (ri.FS_ReadFile(va("fonts/%s.RitualFont", name), (void**)&theFile) == -1)
     {
         ri.Printf(PRINT_WARNING, "LoadFont: Couldn't load font %s\n", name);
-        return 0;
+        return NULL;
     }
 
-    header = &s_loadedFonts[s_numLoadedFonts];
+    header = &s_loadedFonts_sgl[s_numLoadedFonts_sgl];
     header->height = 0.0;
     header->aspectRatio = 0.0;
     Q_strncpyz(header->name, name, sizeof(header->name));
@@ -152,7 +231,7 @@ fontheader_t* R_LoadFont(const char* name)
                 header->locations[i].pos[1] = atof(COM_Parse(&ref)) * header->aspectRatio / 256.0;
                 header->locations[i].size[0] = atof(COM_Parse(&ref)) / 256.0;
                 header->locations[i].size[1] = atof(COM_Parse(&ref)) * header->aspectRatio / 256.0;
-
+            
                 token = COM_Parse(&ref);
                 if (Q_stricmp(token, "}"))
                 {
@@ -211,14 +290,228 @@ fontheader_t* R_LoadFont(const char* name)
     }
     else
     {
-        s_numLoadedFonts++;
+        s_numLoadedFonts_sgl++;
         return header;
     }
 
     return NULL;
 }
 
-void R_LoadFontShader(fontheader_t* font)
+fontheader_t* R_LoadFont(const char* name) {
+    int i;
+    char* theFile;
+    fontheader_t* header;
+    char* ref;
+    const char* token;
+    qboolean error;
+    char* pRitFontNames[32];
+
+    error = qfalse;
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header = &s_loadedFonts[i];
+        if (!Q_stricmp(name, header->name)) {
+            return header;
+        }
+    }
+
+    if (s_numLoadedFonts >= MAX_LOADED_FONTS)
+    {
+        ri.Printf(PRINT_WARNING, "LoadFont: Too many fonts loaded!  Couldn't load %s\n", name);
+        return NULL;
+    }
+
+    if (ri.FS_ReadFile(va("fonts/%s.RitualFont", name), (void**)&theFile) == -1)
+    {
+        ri.Printf(PRINT_WARNING, "LoadFont: Couldn't load font %s\n", name);
+        return NULL;
+    }
+
+    memset(pRitFontNames, 0, sizeof(pRitFontNames));
+    ref = theFile;
+    header = &s_loadedFonts[s_numLoadedFonts];
+
+    token = COM_Parse(&ref);
+    if (Q_stricmp(token, "RitFontList"))
+    {
+        if (Q_stricmp(token, "RitFont"))
+        {
+            ri.Printf(PRINT_WARNING, "LoadFont: Not actual font %s\n", name);
+            return NULL;
+        }
+        header->numPages = 0;
+    }
+    else
+    {
+        while (ref && !error)
+        {
+            token = COM_Parse(&ref);
+            if (!Q_stricmp(token, "CodePage"))
+            {
+                header->codePage = atoi(COM_Parse(&ref));
+            }
+            else if (!Q_stricmp(token, "Chars"))
+            {
+                header->charTableLength = atoi(COM_Parse(&ref));
+                header->charTable = (fontchartable_t*)ri.Malloc(header->charTableLength * sizeof(fontchartable_t));
+                if (!header->charTable)
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+            }
+            else if (!Q_stricmp(token, "Pages"))
+            {
+                header->numPages = atoi(COM_Parse(&ref));
+            }
+            else if (!Q_stricmp(token, "RitFontName"))
+            {
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "{"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+
+                for (i = 0; i < header->numPages; i++)
+                {
+                    token = COM_Parse(&ref);
+                    if (!token[0])
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Bad Token %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+
+                    pRitFontNames[i] = (char*)ri.Malloc(strlen(token) + 1);
+                    if (!pRitFontNames[i])
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+
+                    strcpy(pRitFontNames[i], token);
+                }
+
+                if (error) {
+                    break;
+                }
+
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "}"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+            }
+            else if (!Q_stricmp(token, "CharTable"))
+            {
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "{"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+
+                for (i = 0; i < header->charTableLength; i++) {
+                    token = COM_Parse(&ref);
+                    if (Q_stricmp(token, "{"))
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Bad Token %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+
+                    header->charTable[i].cp = atoi(COM_Parse(&ref));
+                    header->charTable[i].index = atoi(COM_Parse(&ref));
+                    header->charTable[i].loc = atoi(COM_Parse(&ref));
+                    atoi(COM_Parse(&ref));
+
+                    token = COM_Parse(&ref);
+                    if (Q_stricmp(token, "}"))
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+                }
+
+                if (error) {
+                    break;
+                }
+
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "}"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+            }
+            else
+            {
+                ri.Printf(PRINT_WARNING, "LoadFont: Bad Token %s\n", name);
+                error = qtrue;
+                break;
+            }
+        }
+    }
+
+    ri.FS_FreeFile(theFile);
+
+    if (!header->numPages)
+    {
+        header->charTableLength = 0;
+        header->charTable = NULL;
+        header->sgl[0] = R_LoadFont_sgl(name);
+        if (!header->sgl[0])
+        {
+            ri.Printf(PRINT_WARNING, "LoadFont: failed %s\n", name);
+            return NULL;
+        }
+    }
+    else
+    {
+        for (i = 0; i < header->numPages; i++)
+        {
+            header->sgl[i] = R_LoadFont_sgl(pRitFontNames[i]);
+            if (!header->sgl[i])
+            {
+                ri.Printf(PRINT_WARNING, "LoadFont: failed %s(%s)\n", pRitFontNames[i], name);
+                error = qtrue;
+                break;
+            }
+        }
+
+        // Free all allocated strings
+        for (i = 0; i < header->numPages; i++) {
+            ri.Free(pRitFontNames[i]);
+        }
+
+        if (error)
+        {
+            if (header->charTable) {
+                ri.Free(header->charTable);
+            }
+
+            header->numPages = 0;
+            header->charTableLength = 0;
+            header->charTable = NULL;
+        }
+    }
+
+    strcpy(header->name, name);
+    s_numLoadedFonts++;
+    return header;
+}
+
+void R_LoadFontShader(fontheader_sgl_t* font)
 {
     int i;
     int save;
@@ -255,7 +548,7 @@ void R_LoadFontShader(fontheader_t* font)
     }
 }
 
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen) {
+void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
     float charHeight;
     float startx, starty;
     int i;
@@ -264,14 +557,25 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     i = 0;
     startx = x;
     starty = y;
-    fWidthScale = (double)glConfig.vidWidth / 640.0;
-    fHeightScale = (double)glConfig.vidHeight / 480.0;
+    if (pvVirtualScreen) {
+        if (pvVirtualScreen[0]) {
+            fWidthScale = pvVirtualScreen[0];
+        } else {
+            fWidthScale = (double)glConfig.vidWidth / 640.0;
+        }
+
+        if (pvVirtualScreen[1]) {
+            fHeightScale = pvVirtualScreen[1];
+        } else {
+            fHeightScale = (double)glConfig.vidHeight / 480.0;
+        }
+    }
 
     if (!font) {
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
 
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
@@ -300,9 +604,8 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
         case '\t':
             indirected = font->indirection[32];
             if (indirected == -1) {
-                Com_DPrintf("R_DrawString: no space-character in font!\n");
-            }
-            else {
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no space-character in font!\n");
+            } else {
                 x = s_fontGeneralScale * font->locations[indirected].size[0] * 256.0 * 3.0 + x;
             }
             break;
@@ -321,19 +624,17 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
             indirected = font->indirection[c];
             if (indirected == -1)
             {
-                Com_DPrintf("R_DrawString: no 0x%02x-character in font!\n", c);
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no 0x%02x-character in font!\n", c);
                 indirected = font->indirection['?'];
                 if (indirected == -1) {
-                    Com_DPrintf("R_DrawString: no '?' character in font!\n");
+                    ri.Printf(PRINT_DEVELOPER, "R_DrawString: no '?' character in font!\n");
                     break;
-                }
+				}
                 // set the indirection for the next time
-                font->indirection[c] = indirected;
+				font->indirection[c] = indirected;
             }
 
-            if (tess.numVertexes + 4 >= SHADER_MAX_VERTEXES || tess.numIndexes + 6 >= SHADER_MAX_INDEXES) {
-                RB_CheckOverflow(4, 6);
-            }
+            RB_CHECKOVERFLOW(4, 6);
 
             loc = &font->locations[indirected];
 
@@ -369,7 +670,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
             tess.indexes[tess.numIndexes + 4] = tess.numVertexes + 3;
             tess.indexes[tess.numIndexes + 5] = tess.numVertexes + 2;
 
-            if (bVirtualScreen)
+            if (pvVirtualScreen)
             {
                 // scale the string properly if virtual screen
                 tess.xyz[tess.numVertexes][0] *= fWidthScale;
@@ -392,7 +693,96 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     RB_EndSurface();
 }
 
-void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
+    int i;
+    int code;
+    unsigned short uch;
+    char buffer[512];
+    size_t buflen;
+    int cursgl;
+    float curX, curY;
+    float curHeight;
+    
+    if (!font->numPages) {
+        if (font->sgl[0]) {
+            R_DrawString_sgl(font->sgl[0], text, x, y, maxlen, pvVirtualScreen);
+        }
+        return;
+    }
+
+    if (maxlen < 0) {
+        maxlen = strlen(text);
+    }
+    
+    curX = x;
+    curY = y;
+    curHeight = 0.f;
+    cursgl = -1;
+    buflen = 0;
+
+    i = 0;
+    while(i < maxlen) {
+        fontchartable_t* ct;
+
+        uch = text[i];
+        i++;
+
+        if (DBCSIsLeadByte(font, uch)) {
+            uch = (uch << 8) | text[i];
+            i++;
+        }
+
+        if (!uch) {
+            break;
+        }
+
+        if (uch == '\n' || uch == '\r') {
+            buffer[buflen] = 0;
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
+            
+            curX = x;
+            curHeight = 0.f;
+            buflen = 0;
+            if (uch == '\n') {
+                curY += font->sgl[0]->height * s_fontGeneralScale * s_fontHeightScale;
+            }
+
+            continue;
+        }
+
+        code = CodeSearch(font, uch);
+        if (code < 0) {
+            continue;
+        }
+
+        if (cursgl == -1) {
+            cursgl = font->charTable[code].index;
+        }
+
+        ct = &font->charTable[code];
+        if (cursgl != ct->index || buflen >= ARRAY_LEN(buffer) - 2) {
+            buffer[buflen] = 0;
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
+
+            curX += curHeight;
+            curHeight = 0.f;
+            buflen = 0;
+            ct = &font->charTable[code];
+            cursgl = ct->index;
+        }
+
+        buffer[buflen++] = ct->loc;
+        curHeight += font->sgl[cursgl]->locations[ct->loc].size[0] * 256.0f;
+    }
+
+    if (buflen)
+    {
+        buffer[buflen] = 0;
+        R_DrawString_sgl(font->sgl[cursgl], buffer, curX, y, buflen, pvVirtualScreen);
+    }
+}
+
+void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
     shader_t* fontshader;
     qhandle_t fsh;
     float charWidth, charHeight;
@@ -404,8 +794,7 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
         return;
     }
 
-
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
     }
@@ -435,12 +824,12 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
         unsigned char c;
         int indirected;
         letterloc_t* loc;
-
+        
         c = text[i];
         indirected = font->indirection[c];
         if (indirected == -1)
         {
-            Com_Printf("R_DrawFloatingString: no 0x%02x-character in font!\n", c);
+            ri.Printf(PRINT_ALL, "R_DrawFloatingString: no 0x%02x-character in font!\n", c);
             continue;
         }
 
@@ -485,8 +874,10 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
         verts[0].xyz[1] = verts[1].xyz[1] + tr.refdef.viewaxis[1][1] * charWidth;
         verts[0].xyz[2] = verts[1].xyz[2] + tr.refdef.viewaxis[1][2] * charWidth;
         verts[0].xyz[0] = verts[1].xyz[0] + tr.refdef.viewaxis[1][0] * charWidth;
-
-        RE_AddPolyToScene(fsh, 4, verts, 1);
+    
+        if (RE_AddPolyToScene2(fsh, 4, verts, 0)) {
+            ++tr.refdef.numPolys;
+        }
 
         pos[0] = verts[2].xyz[0];
         pos[1] = verts[2].xyz[1];
@@ -494,16 +885,20 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
     }
 }
 
+void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
+    return R_DrawFloatingString_sgl(font->sgl[0], text, org, color, scale, maxlen);
+}
+
 float R_GetFontHeight(const fontheader_t* font)
 {
-    if (!font) {
+    if (!font || !font->sgl[0]) {
         return 0.0;
     }
 
-    return font->height * s_fontGeneralScale * s_fontHeightScale;
+    return font->sgl[0]->height * s_fontGeneralScale * s_fontHeightScale;
 }
 
-float R_GetFontStringWidth(const fontheader_t* font, const char* s)
+float R_GetFontStringWidth_sgl(const fontheader_sgl_t* font, const char* s)
 {
     float widths;
     int i;
@@ -519,14 +914,13 @@ float R_GetFontStringWidth(const fontheader_t* font, const char* s)
         int indirected;
         char c = *s;
 
-        if (c == 9)
+        if (c == '\t')
         {
             indirected = font->indirection[32];
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0] * 3.0;
-            }
-            else {
-                Com_Printf("R_GetFontStringWidth: no space-character in font!\n");
+            } else {
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no space-character in font!\n");
             }
         }
         else
@@ -534,12 +928,52 @@ float R_GetFontStringWidth(const fontheader_t* font, const char* s)
             indirected = font->indirection[c];
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0];
-            }
-            else {
-                Com_Printf("R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
+            } else {
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
             }
         }
     }
 
     return widths * s_fontGeneralScale * 256.0;
 }
+
+float R_GetFontStringWidth(const fontheader_t* font, const char* s)
+{
+    int i;
+    int code;
+    fontchartable_t* ct;
+    float width = 0.f;
+
+    if (!font->numPages) {
+        return R_GetFontStringWidth_sgl(font->sgl[0], s);
+    }
+
+    i = 0;
+    while(s[i]) {
+        unsigned char uch = s[i++];
+
+        if (DBCSIsLeadByte(font, uch)) {
+            uch = (uch << 8) | s[i++];
+            if (!uch) {
+                break;
+            }
+        }
+
+        if (uch == '\t') {
+            code = CodeSearch(font, ' ');
+            if (code >= 0) {
+                ct = &font->charTable[code];
+                width += font->sgl[ct->index]->locations[ct->loc].size[0] * 3.f;
+            }
+        }
+        else {
+            code = CodeSearch(font, uch);
+            if (code >= 0) {
+                ct = &font->charTable[code];
+                width += font->sgl[ct->index]->locations[ct->loc].size[0];
+            }
+        }
+    }
+
+    return width;
+}
diff --git a/code/renderergl2/tr_ghost.cpp b/code/renderergl2/tr_ghost.cpp
new file mode 100644
index 00000000..2c767e8d
--- /dev/null
+++ b/code/renderergl2/tr_ghost.cpp
@@ -0,0 +1,1662 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_ghost.cpp
+
+#include "tr_local.h"
+#include "tr_ghost.h"
+
+GhostManager ghostManager;
+
+int frameTime;
+int lastTime;
+
+/*
+====================
+RandomizeRange
+
+====================
+*/
+float RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+/*
+====================
+Particle::Particle
+
+Initializes the particle with the specified parameters
+====================
+*/
+Particle::Particle(
+    Vector   pos,
+    Vector   vel,
+    Vector   acc,
+    int      srcColor,
+    int      dstColor,
+    float    colorRate,
+    qboolean wavy,
+    float    wavyDist,
+    float    currentTime,
+    float    dieTime,
+    float    maxspeed,
+    Vector   parentOrg,
+    qboolean swarm,
+    int      freq,
+    int      delta
+)
+{
+    m_position     = pos;
+    m_realposition = pos;
+    m_velocity     = vel;
+    m_acceleration = acc;
+
+    m_srcColor  = srcColor;
+    m_dstColor  = dstColor;
+    m_color     = srcColor;
+    m_colorRate = colorRate;
+
+    m_wavy       = wavy;
+    m_wavyDist   = wavyDist;
+    m_wavyOffset = RandomizeRange(-wavyDist, wavyDist);
+
+    m_swarm          = swarm;
+    m_swarmfrequency = freq;
+    m_swarmdelta     = delta;
+
+    m_startTime = currentTime;
+    m_dieTime   = dieTime;
+    m_life      = dieTime - currentTime;
+
+    m_maxspeed     = maxspeed;
+    m_parentOrigin = parentOrg;
+
+    Vector tempvec = m_velocity;
+    VectorNormalize(tempvec);
+
+    m_perp.x = tempvec.x * cos(M_PI / 2) - tempvec.y * sin(M_PI / 2);
+    m_perp.y = tempvec.x * sin(M_PI / 2) + tempvec.y * cos(M_PI / 2);
+
+    m_srcR = (m_srcColor & 0xff);
+    m_srcG = (m_srcColor & 0xff00) >> 8;
+    m_srcB = (m_srcColor & 0xff0000) >> 16;
+
+    m_dstR = (m_dstColor & 0xff);
+    m_dstG = (m_dstColor & 0xff00) >> 8;
+    m_dstB = (m_dstColor & 0xff0000) >> 16;
+
+    m_deltaR = m_dstR - m_srcR;
+    m_deltaG = m_dstG - m_srcG;
+    m_deltaB = m_dstB - m_srcB;
+}
+
+/*
+====================
+Particle::Update
+
+Updates the particle based on the current time
+====================
+*/
+void Particle::Update(float currentTime)
+{
+    int    r, g, b;
+    float  ftime;
+    float  time2;
+    float  factor;
+    Vector offset;
+
+    ftime = frameTime / 1000.0;
+    time2 = Square(ftime) * 0.5;
+
+    if (m_swarm) {
+        if (!(rand() % m_swarmfrequency)) {
+            m_velocity[0] = crandom() * m_maxspeed;
+            m_velocity[1] = crandom() * m_maxspeed;
+            m_velocity[2] = crandom() * m_maxspeed;
+        }
+
+        if (m_parentOrigin[0] > m_position[0]) {
+            m_velocity[0] += m_swarmdelta;
+        } else {
+            m_velocity[0] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[1] > m_position[1]) {
+            m_velocity[1] += m_swarmdelta;
+        } else {
+            m_velocity[1] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[2] > m_position[2]) {
+            m_velocity[2] += m_swarmdelta;
+        } else {
+            m_velocity[2] -= m_swarmdelta;
+        }
+    }
+
+    m_position = m_realposition;
+
+    m_position += m_velocity * ftime + m_acceleration * time2;
+    m_velocity += m_acceleration * ftime;
+    m_realposition = m_position;
+
+    if (m_wavy) {
+        offset = m_perp * sin(currentTime + m_wavyOffset) * (m_wavyOffset + m_wavyDist);
+        m_position += offset;
+    }
+
+    factor = 1.0 - (m_dieTime - currentTime) / m_life;
+    r      = m_deltaR * factor;
+    g      = m_deltaG * factor;
+    b      = m_deltaB * factor;
+
+    m_color = (r) | (g << 8) | (b << 8);
+}
+
+/*
+====================
+Particle::GetDieTime
+
+Returns the time at which the particle stops
+====================
+*/
+float Particle::GetDieTime()
+{
+    return m_dieTime;
+}
+
+/*
+====================
+ParticleEmitter::ParticleEmitter
+
+Initializes the particle emitter with specified parameters
+====================
+*/
+ParticleEmitter::ParticleEmitter(
+    Vector   position,
+    float    minSpeed,
+    float    maxSpeed,
+    float    angle,
+    float    angleVar,
+    float    minAccSpeed,
+    float    maxAccSpeed,
+    float    accAngle,
+    float    accAngleVar,
+    float    minRate,
+    float    maxRate,
+    int      srcColor,
+    int      dstColor,
+    float    minColorRate,
+    float    maxColorRate,
+    qboolean wavy,
+    float    minWavyDist,
+    float    maxWavyDist,
+    float    minLife,
+    float    maxLife,
+    qboolean particles,
+    qboolean gravityWell,
+    float    gravityWellStrength,
+    qboolean ballLightning,
+    int      minBallLightningRadius,
+    int      maxBallLightningRadius,
+    float    lightningVar,
+    int      lightningSubdivisions,
+    qboolean swarm,
+    int      swarmfreq,
+    int      swarmdelta
+)
+{
+    m_position = position;
+
+    m_minSpeed = minSpeed;
+    m_maxSpeed = maxSpeed;
+
+    m_angle       = angle;
+    m_angleVar    = angleVar;
+    m_minAccSpeed = minAccSpeed;
+    m_maxAccSpeed = maxAccSpeed;
+    m_accAngle    = accAngle;
+    m_accAngleVar = accAngleVar;
+
+    m_maxRate = 1.0 / maxRate;
+    m_minRate = 1.0 / minRate;
+
+    m_srcColor     = srcColor;
+    m_dstColor     = dstColor;
+    m_minColorRate = minColorRate;
+    m_maxColorRate = maxColorRate;
+
+    m_minWavyDist = minWavyDist;
+    m_maxWavyDist = maxWavyDist;
+    m_minLife     = minLife;
+    m_maxLife     = maxLife;
+
+    m_wavy = wavy;
+
+    m_particles = particles;
+
+    m_gravityWellStrength = gravityWellStrength;
+    m_gravityWell         = gravityWell;
+
+    m_ballLightning          = ballLightning;
+    m_minBallLightningRadius = minBallLightningRadius;
+    m_lightningVar           = lightningVar;
+    m_maxBallLightningRadius = maxBallLightningRadius;
+    m_lightningSubdivisions  = lightningSubdivisions;
+
+    m_swarm          = swarm;
+    m_swarmfrequency = swarmfreq;
+    m_swarmdelta     = swarmdelta;
+
+    m_time     = tr.refdef.time;
+    m_lasttime = m_time;
+
+    m_gravityEffectVector = vec_zero;
+}
+
+/*
+====================
+ParticleEmitter::ParticleEmitter
+====================
+*/
+ParticleEmitter::ParticleEmitter()
+{
+    m_lasttime = tr.refdef.time / 1000.0;
+}
+
+/*
+====================
+ParticleEmitter::~ParticleEmitter
+====================
+*/
+ParticleEmitter::~ParticleEmitter() {}
+
+/*
+====================
+ParticleEmitter::Emit
+
+Creates new particles based on the current time
+====================
+*/
+void ParticleEmitter::Emit(float currentTime)
+{
+    Particle *p;
+    float     rate;
+    float     delta;
+
+    rate  = GetRate();
+    delta = currentTime = m_lasttime;
+
+    if (!rate) {
+        m_lasttime = currentTime;
+        return;
+    }
+
+    for (; delta > rate; delta -= rate) {
+        p = new Particle(
+            m_position,
+            GetVelocity(),
+            GetAcceleration(),
+            GetSrcColor(),
+            GetDstColor(),
+            GetColorRate(),
+            IsWavy(),
+            GetWavyDistance(),
+            currentTime,
+            GetDieTime(currentTime),
+            m_maxSpeed,
+            GetPosition(),
+            IsSwarm(),
+            m_swarmfrequency,
+            m_swarmdelta
+        );
+
+        particleList.AddObject(p);
+
+        m_lasttime = currentTime;
+    }
+}
+
+/*
+====================
+ParticleEmitter::UpdateValues
+
+Updates all particles with the last renderer time
+====================
+*/
+void ParticleEmitter::UpdateValues()
+{
+    int i;
+    int numParticles;
+
+    numParticles = particleList.NumObjects();
+    for (i = 1; i <= numParticles; i++) {
+        Particle *p = particleList.ObjectAt(i);
+
+        p->Update(m_lasttime);
+    }
+}
+
+/*
+====================
+ParticleEmitter::GetPosition
+
+Returns the current particle position
+====================
+*/
+Vector ParticleEmitter::GetPosition()
+{
+    return m_position;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocity
+
+Returns the random velocity based on random angle, and random speed
+====================
+*/
+Vector ParticleEmitter::GetVelocity()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirection
+
+Returns the direction of the random velocity
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirection()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMin
+
+Returns the random velocity direction based on random angle, and minimum speed
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirectionMin()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMax
+
+Returns the random velocity direction based on random angle, and maximum speed
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirectionMax()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_maxSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAcceleration
+
+Returns the random acceleration based on random angle, and random speed
+====================
+*/
+Vector ParticleEmitter::GetAcceleration()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirection
+
+Returns the direction of the random acceleration
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirection()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMin
+
+Returns the random acceleration direction based on random angle, and minimum speed
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirectionMin()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMax
+
+Returns the random acceleration direction based on random angle, and maximum speed
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirectionMax()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the maximum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetSrcColor
+
+Returns the source color
+====================
+*/
+int ParticleEmitter::GetSrcColor()
+{
+    return m_srcColor;
+}
+
+/*
+====================
+ParticleEmitter::GetDstColor
+
+Returns the destination color
+====================
+*/
+int ParticleEmitter::GetDstColor()
+{
+    return m_dstColor;
+}
+
+/*
+====================
+ParticleEmitter::GetGravityWellStrength
+
+Returns the strength of the gravity
+====================
+*/
+float ParticleEmitter::GetGravityWellStrength()
+{
+    return m_gravityWellStrength;
+}
+
+/*
+====================
+ParticleEmitter::GetRate
+
+Returns a random rate between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetRate()
+{
+    return RandomizeRange(m_minRate, m_maxRate);
+}
+
+/*
+====================
+ParticleEmitter::GetColorRate
+
+Returns a random color between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetColorRate()
+{
+    return RandomizeRange(m_minColorRate, m_maxColorRate);
+}
+
+/*
+====================
+ParticleEmitter::GetWavyDistance
+
+Returns a random wavy distance between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetWavyDistance()
+{
+    return RandomizeRange(m_minWavyDist, m_maxWavyDist);
+}
+
+/*
+====================
+ParticleEmitter::GetDieTime
+
+Returns a random time at which the particle will stop, between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetDieTime(float currentTime)
+{
+    return currentTime + RandomizeRange(m_minLife, m_maxLife);
+}
+
+/*
+====================
+ParticleEmitter::GetBallLightningRadius
+
+Returns a random lightning radius between minimum and maximum
+====================
+*/
+int ParticleEmitter::GetBallLightningRadius()
+{
+    return RandomizeRange(m_minBallLightningRadius, m_maxBallLightningRadius);
+}
+
+/*
+====================
+ParticleEmitter::GetLightningVar
+
+Returns the maximum lightning value
+====================
+*/
+float ParticleEmitter::GetLightningVar()
+{
+    return m_lightningVar;
+}
+
+/*
+====================
+ParticleEmitter::GetLightningSubdivisions
+
+Returns the number of lightning subdivisions
+====================
+*/
+int ParticleEmitter::GetLightningSubdivisions()
+{
+    return m_lightningSubdivisions;
+}
+
+/*
+====================
+ParticleEmitter::IsWavy
+
+Returns whether or not this is a wavy particle
+====================
+*/
+qboolean ParticleEmitter::IsWavy()
+{
+    return m_wavy;
+}
+
+/*
+====================
+ParticleEmitter::IsGravityWell
+
+Returns whether or not this particle has gravity
+====================
+*/
+qboolean ParticleEmitter::IsGravityWell()
+{
+    return m_gravityWell;
+}
+
+/*
+====================
+ParticleEmitter::IsParticles
+
+Returns whether or not this contains particles
+====================
+*/
+qboolean ParticleEmitter::IsParticles()
+{
+    return m_particles;
+}
+
+/*
+====================
+ParticleEmitter::IsBallLightning
+
+Returns whether or not ball lightning can be applied
+====================
+*/
+qboolean ParticleEmitter::IsBallLightning()
+{
+    return m_ballLightning;
+}
+
+/*
+====================
+ParticleEmitter::IsSwarm
+
+Returns whether or not this is a swarm of particles
+====================
+*/
+qboolean ParticleEmitter::IsSwarm()
+{
+    return m_swarm;
+}
+
+/*
+====================
+ParticleEmitter::SetMinSpeed
+
+Sets the minimum speed
+====================
+*/
+void ParticleEmitter::SetMinSpeed(float value)
+{
+    m_minSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxSpeed
+
+Sets the maximum speed
+====================
+*/
+void ParticleEmitter::SetMaxSpeed(float value)
+{
+    m_maxSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAngle
+
+Sets the angle/minimum angle
+====================
+*/
+void ParticleEmitter::SetAngle(float value)
+{
+    m_angle = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAngleVar
+
+Sets the maximum speed
+====================
+*/
+void ParticleEmitter::SetAngleVar(float value)
+{
+    m_angleVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinAccSpeed
+
+Sets the minimum acceleration speed
+====================
+*/
+void ParticleEmitter::SetMinAccSpeed(float value)
+{
+    m_minAccSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxAccSpeed
+
+Sets the maximum acceleration speed
+====================
+*/
+void ParticleEmitter::SetMaxAccSpeed(float value)
+{
+    m_maxAccSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAccAngle
+
+Sets the acceleration angle / minimum acceleration angle
+====================
+*/
+void ParticleEmitter::SetAccAngle(float value)
+{
+    m_accAngle = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAccAngleVar
+
+Sets the maximum acceleration speed
+====================
+*/
+void ParticleEmitter::SetAccAngleVar(float value)
+{
+    m_accAngleVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinRate
+
+Sets the minimum rate
+====================
+*/
+void ParticleEmitter::SetMinRate(float value)
+{
+    m_minRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxRate
+
+Sets the maximum rate
+====================
+*/
+void ParticleEmitter::SetMaxRate(float value)
+{
+    m_maxRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetSrcColor
+
+Sets the source color
+====================
+*/
+void ParticleEmitter::SetSrcColor(int value)
+{
+    m_srcColor = value;
+}
+
+/*
+====================
+ParticleEmitter::SetDstColor
+
+Sets the destination color
+====================
+*/
+void ParticleEmitter::SetDstColor(int value)
+{
+    m_dstColor = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinColorRate
+
+Sets the minimum color rate
+====================
+*/
+void ParticleEmitter::SetMinColorRate(float value)
+{
+    m_minColorRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxColorRate
+
+Sets the maximum color rate
+====================
+*/
+void ParticleEmitter::SetMaxColorRate(float value)
+{
+    m_maxColorRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetWavy
+
+Sets whether or not this is a wavy particle
+====================
+*/
+void ParticleEmitter::SetWavy(int value)
+{
+    m_wavy = value;
+}
+
+/*
+====================
+ParticleEmitter::SetParticles
+
+Sets whether or not this contains particles
+====================
+*/
+void ParticleEmitter::SetParticles(int value)
+{
+    m_particles = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityWell
+
+Sets whether or not this has gravity
+====================
+*/
+void ParticleEmitter::SetGravityWell(int value)
+{
+    m_gravityWell = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinWavyDist
+
+Sets the minimum wavy distance
+====================
+*/
+void ParticleEmitter::SetMinWavyDist(float value)
+{
+    m_minWavyDist = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxWavyDist
+
+Sets the maximum wavy distance
+====================
+*/
+void ParticleEmitter::SetMaxWavyDist(float value)
+{
+    m_maxWavyDist = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinLife
+
+Sets the minimum life
+====================
+*/
+void ParticleEmitter::SetMinLife(float value)
+{
+    m_minLife = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxLife
+
+Sets the maximum life
+====================
+*/
+void ParticleEmitter::SetMaxLife(float value)
+{
+    m_maxLife = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityWellStrength
+
+Sets the strength of the gravity
+====================
+*/
+void ParticleEmitter::SetGravityWellStrength(float value)
+{
+    m_gravityWellStrength = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityEffectVector
+
+Sets the direction at which gravity is applied
+====================
+*/
+void ParticleEmitter::SetGravityEffectVector(Vector value)
+{
+    m_gravityEffectVector = value;
+}
+
+/*
+====================
+ParticleEmitter::SetBallLightning
+
+Sets whether or not it has ball lightning
+====================
+*/
+void ParticleEmitter::SetBallLightning(int value)
+{
+    m_ballLightning = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinBallLightningRadius
+
+Sets the minimum ball lightning radius
+====================
+*/
+void ParticleEmitter::SetMinBallLightningRadius(int value)
+{
+    m_minBallLightningRadius = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxBallLightningRadius
+
+Sets the maximum ball lightning radius
+====================
+*/
+void ParticleEmitter::SetMaxBallLightningRadius(int value)
+{
+    m_maxBallLightningRadius = value;
+}
+
+/*
+====================
+ParticleEmitter::SetLightningVar
+
+Sets the maximum lightning value
+====================
+*/
+void ParticleEmitter::SetLightningVar(float value)
+{
+    m_lightningVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetLightningSubdivisions
+
+Sets the number of subdivisions for the lightning
+====================
+*/
+void ParticleEmitter::SetLightningSubdivisions(int value)
+{
+    m_lightningSubdivisions = value;
+}
+
+/*
+====================
+ParticleEmitter::RandomizeRange
+
+Returns a random value between the range [min, max]
+====================
+*/
+float ParticleEmitter::RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+/*
+====================
+ParticleEmitter::RandomizeAngle
+
+Returns a random angle between the range [min, max]
+====================
+*/
+float ParticleEmitter::RandomizeAngle(float min, float max)
+{
+    return min + ((rand() - (RAND_MAX / 2)) / (float)RAND_MAX) * max;
+}
+
+/*
+====================
+ParticleEmitter::CalculateDirection
+
+Returns a random Vector direction based on the angle value
+====================
+*/
+Vector ParticleEmitter::CalculateDirection(float value)
+{
+    float deg = DEG2RAD(value);
+
+    return Vector(cos(deg), -sin(deg), 0);
+}
+
+/*
+====================
+ParticleEmitter::Load
+
+Loads the specified particle emitter from the string buffer
+====================
+*/
+void ParticleEmitter::Load(char **buf_p)
+{
+    m_position[0] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[1] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[2] = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_srcColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_dstColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_minLife = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxLife = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_angle       = atoi(COM_ParseExt(buf_p, qtrue));
+    m_angleVar    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngle    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngleVar = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_minAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_minWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_wavy        = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_particles = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_gravityWell         = atoi(COM_ParseExt(buf_p, qtrue));
+    m_gravityWellStrength = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_ballLightning          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningVar           = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningSubdivisions  = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_swarm          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmfrequency = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmdelta     = atoi(COM_ParseExt(buf_p, qtrue));
+}
+
+/*
+====================
+GhostTexture::GhostTexture
+====================
+*/
+GhostTexture::GhostTexture()
+{
+    m_image   = NULL;
+    m_texture = NULL;
+}
+
+/*
+====================
+GhostTexture::SetTexel
+
+Sets color at the specified xy texel location
+====================
+*/
+void GhostTexture::SetTexel(int x, int y, unsigned int color)
+{
+    m_texture[x + m_width * y] = color;
+}
+
+/*
+====================
+GhostTexture::Burn
+
+Applies fade/burn effect to the ghost texture
+====================
+*/
+void GhostTexture::Burn()
+{
+    int     x, y;
+    int     r, g, b;
+    GLint   pixel;
+    GLuint *line;
+
+    if (m_isfade) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (line[x] & 0xff) - m_faderate;
+                g = ((line[x] & 0xff00) >> 8) - m_faderate;
+                b = ((line[x] & 0xff0000) >> 16) - m_faderate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                line[x] = (r) | (g << 8) | (b << 16);
+            }
+        }
+    } else if (m_isburn) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (((line[m_width + x] & 0xff) + (line[x + 1] & 0xff) + (line[x - 1] & 0xff) + (line[x] & 0xff)) >> 2)
+                  - m_burnrate;
+                g = ((((line[m_width + x] & 0xFF00) >> 8) + ((line[x + 1] & 0xFF00) >> 8)
+                      + ((line[x - 1] & 0xFF00) >> 8) + ((line[x] & 0xFF00) >> 8))
+                     >> 2)
+                  - m_burnrate;
+                b = ((((line[m_width + x] & 0xFF0000) >> 16) + ((line[x + 1] & 0xFF0000) >> 16)
+                      + ((line[x - 1] & 0xFF0000) >> 16) + ((line[x] & 0xFF0000) >> 16))
+                     >> 2)
+                  - m_burnrate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                pixel = (r) | (g << 8) | (b << 16);
+                if (pixel > 0) {
+                    line[x] = pixel;
+                }
+            }
+        }
+    }
+
+    line = m_texture;
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+
+    for (y = 0; y < m_height; ++y) {
+        line[m_width * y]               = 0;
+        line[m_width - 1 + m_width * y] = 0;
+    }
+
+    line = &m_texture[m_width * (m_height - 1)];
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+}
+
+/*
+====================
+GhostTexture::ComputeOutCode
+
+Returns a flag value indicating if x/y variable reached xmin/xmax
+====================
+*/
+outcode GhostTexture::ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax)
+{
+    outcode code = 0;
+
+    if (y > ymax) {
+        code = 1;
+    } else if (y < ymin) {
+        code = 2;
+    }
+
+    if (x > xmax) {
+        code |= 4;
+    } else if (x < xmin) {
+        code |= 8;
+    }
+
+    return code;
+}
+
+/*
+====================
+GhostTexture::ClipAndDrawLine
+
+Draws a line from p0 to p1 with clipping
+====================
+*/
+void GhostTexture::ClipAndDrawLine(Vector p0, Vector p1, int color)
+{
+    int     x0, x1;
+    int     y0, y1;
+    int     d;
+    int     x, y;
+    int     ax, ay;
+    int     sx, sy;
+    int     dx, dy;
+    int     xmax, ymax;
+    bool    accept;
+    outcode outcode0;
+    outcode outcode1;
+
+    x0   = p0.x;
+    y0   = p0.y;
+    x1   = p1.x;
+    y1   = p1.y;
+    xmax = m_width - 1;
+    ymax = m_height - 1;
+
+    accept = false;
+
+    outcode0 = ComputeOutCode(x0, y0, 0, xmax, 0, ymax);
+    outcode1 = ComputeOutCode(x1, y1, 0, xmax, 0, ymax);
+
+    while (outcode1 | outcode0) {
+        outcode outCodeOut;
+        if (outcode0 & outcode1) {
+            break;
+        }
+
+        outCodeOut = outcode0 ? outcode0 : outcode1;
+
+        if (outCodeOut & 1) {
+            x = x0 + (x1 - x0) * (ymax - y0) / (y1 - y0);
+            y = ymax;
+        } else if (outCodeOut & 2) {
+            x = x0 - y0 * (x1 - x0) / (y1 - y0);
+            y = 0;
+        } else if (outCodeOut & 4) {
+            x = xmax;
+            y = y0 + (y1 - y0) * (xmax - x0) / (x1 - x0);
+        } else if (outCodeOut * 8) {
+            x = 0;
+            y = y0 - x0 * (y1 - y0) / (x1 - x0);
+        } else {
+            x = x0;
+            y = y0;
+        }
+        if (outCodeOut == outcode0) {
+            y0       = y;
+            x0       = x;
+            outcode0 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        } else {
+            x1       = x;
+            y1       = y;
+            outcode1 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        }
+    }
+
+    accept = true;
+    if (!accept) {
+        return;
+    }
+
+    dx = x1 - x0;
+    if (dx < 0) {
+        dx = x0 - x1;
+    }
+    ax = dx * 2;
+    sx = dx >= 0 ? 1 : -1;
+
+    dy = y1 - y0;
+    if (dy < 0) {
+        dy = y0 - y1;
+    }
+    ay = dy * 2;
+    sy = dy >= 0 ? 1 : -1;
+
+    x = x0;
+    y = y0;
+
+    if (ax > ay) {
+        for (d = ay - (ax >> 1);; d += ay, x += sx) {
+            SetTexel(x, y, color);
+            if (x == x1) {
+                break;
+            }
+
+            if (d >= 0) {
+                y += sy;
+                d -= ax;
+            }
+        }
+    } else {
+        for (d = ax - (ay >> 1);; d += ax, y += sy) {
+            SetTexel(x, y, color);
+            if (y == y1) {
+                break;
+            }
+
+            if (d >= 0) {
+                x += sx;
+                d -= ay;
+            }
+        }
+    }
+}
+
+/*
+====================
+GhostTexture::RotateVector
+
+Rotates the vector from angle
+====================
+*/
+Vector GhostTexture::RotateVector(Vector v, float angle)
+{
+    Vector vec;
+    float  rad;
+
+    rad   = DEG2RAD(angle);
+    vec.x = cos(rad) * v.x - sin(rad) * v.y;
+    vec.y = cos(rad) * v.y + sin(rad) * v.x;
+    vec.z = 0;
+
+    return vec;
+}
+
+/*
+====================
+GhostTexture::GenerateLightning
+
+Generates a lightning effect
+====================
+*/
+void GhostTexture::GenerateLightning(
+    Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions
+)
+{
+    Vector mid;
+    Vector delta;
+    float  length;
+
+    if (numSubdivisions == maxSubdivisions) {
+        p1[0] += 0.5;
+        p1[1] += 0.5;
+        p2[0] += 0.5;
+        p2[1] += 0.5;
+        ClipAndDrawLine(p1, p2, color);
+
+        return;
+    }
+
+    delta  = p2 - p1;
+    length = delta.length() * 0.5;
+    delta.normalize();
+
+    mid = RotateVector(delta, RandomizeRange(-angleVar, angleVar));
+    mid = p1 + mid * length;
+
+    GenerateLightning(p1, mid, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+    GenerateLightning(mid, p2, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+}
+
+/*
+====================
+GhostTexture::Update
+
+Updates the ghost texture
+====================
+*/
+void GhostTexture::Update()
+{
+    Vector pos;
+    int    i, j;
+    int    numEmitters;
+    float  currentTime;
+
+    currentTime = tr.refdef.time / 1000.0;
+
+    numEmitters = m_emitterList.NumObjects();
+
+    for (i = 1; i <= numEmitters; i++) {
+        ParticleEmitter *pe = m_emitterList.ObjectAt(i);
+
+        if (pe->IsGravityWell()) {
+            break;
+        }
+
+        if (pe->IsBallLightning()) {
+            Vector p1, p2;
+
+            if (pe->GetBallLightningRadius()) {
+                p1 = pe->GetPosition();
+                p2 = pe->GetVelocityDirection();
+
+                p2 = p1 + p2 * pe->GetBallLightningRadius();
+                GenerateLightning(p1, p2, pe->GetSrcColor(), pe->GetLightningVar(), 0, pe->GetLightningSubdivisions());
+            }
+        } else if (pe->IsParticles()) {
+            pe->Emit(currentTime);
+        } else {
+            Vector p = pe->GetPosition();
+
+            SetTexel(p.x, p.y, pe->GetSrcColor());
+        }
+
+        for (j = pe->particleList.NumObjects(); j > 0; j--) {
+            Particle *p = pe->particleList.ObjectAt(j);
+
+            p->Update(currentTime);
+            if (p->m_position.x < m_width && p->m_position.x >= 0 && p->m_position.y < m_height && p->m_position.y >= 0
+                && currentTime <= p->GetDieTime()) {
+                SetTexel(p->m_position.x, p->m_position.y, p->m_color);
+            } else {
+                delete p;
+                pe->particleList.RemoveObjectAt(j);
+            }
+        }
+    }
+}
+
+/*
+====================
+R_UpdateGhostTextures
+
+Updates all ghost textures
+====================
+*/
+void R_UpdateGhostTextures()
+{
+    int i;
+    int numTextures;
+
+    frameTime = tr.refdef.time - lastTime;
+    lastTime  = tr.refdef.time;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        gt->Update();
+        gt->Burn();
+
+        GL_BindToTMU(gt->m_image, 0);
+        qglTexImage2D(GL_TEXTURE_2D, 0, 3, gt->m_width, gt->m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, gt->m_texture);
+    }
+}
+
+/*
+====================
+R_SetGhostImage
+
+Applies an image to the specified named ghost texture
+====================
+*/
+void R_SetGhostImage(const char *name, image_t *image)
+{
+    int i;
+    int numTextures;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        if (gt->m_name == name) {
+            gt->m_image = image;
+        }
+    }
+}
+
+/*
+====================
+LoadGHOST
+
+Loads a GHOST image file
+====================
+*/
+void LoadGHOST(const char *name, byte **pic, int *width, int *height)
+{
+    char         *buf_p;
+    char         *buffer;
+    int           numPixels;
+    int           numParticles;
+    int           i;
+    GhostTexture *gt;
+
+    if (ri.FS_ReadFile(name, (void **)&buffer) == -1) {
+        return;
+    }
+
+    buf_p = buffer;
+    COM_ParseExt(&buf_p, qtrue);
+
+    *width  = atoi(COM_ParseExt(&buf_p, qtrue));
+    *height = atoi(COM_ParseExt(&buf_p, qtrue));
+
+    numParticles = atoi(COM_ParseExt(&buf_p, qtrue));
+    numPixels    = *height * *width;
+    *pic         = new byte[numPixels * 4];
+
+    gt            = new GhostTexture();
+    gt->m_width   = *width;
+    gt->m_height  = *height;
+    gt->m_texture = new unsigned int[numPixels];
+
+    gt->m_isburn   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_burnrate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    gt->m_isfade   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_faderate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    ghostManager.m_textureList.AddObject(gt);
+
+    for (i = 0; i < numParticles; i++) {
+        ParticleEmitter *pe = new ParticleEmitter();
+        gt->m_emitterList.AddObject(pe);
+        pe->Load(&buf_p);
+    }
+}
diff --git a/code/renderergl2/tr_ghost.h b/code/renderergl2/tr_ghost.h
new file mode 100644
index 00000000..6c151ea6
--- /dev/null
+++ b/code/renderergl2/tr_ghost.h
@@ -0,0 +1,300 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "tr_local.h"
+#include "../qcommon/vector.h"
+#include "../qcommon/container.h"
+#include "../qcommon/str.h"
+
+using outcode = unsigned int;
+
+class Particle
+{
+private:
+    float m_startTime;
+    float m_dieTime;
+
+    Vector m_velocity;
+    Vector m_acceleration;
+    Vector m_perp;
+
+    qboolean m_wavy;
+    float    m_wavyDist;
+    float    m_wavyOffset;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    int   m_deltaR;
+    int   m_deltaG;
+    int   m_deltaB;
+    int   m_srcR;
+    int   m_srcG;
+    int   m_srcB;
+    int   m_dstR;
+    int   m_dstG;
+    int   m_dstB;
+    float m_colorRate;
+
+    Vector m_realposition;
+
+    float m_life;
+    float m_maxspeed;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    Vector m_parentOrigin;
+
+public:
+    Vector m_position;
+    int    m_color;
+
+public:
+    Particle(
+        Vector   pos,
+        Vector   vel,
+        Vector   acc,
+        int      srcColor,
+        int      dstColor,
+        float    colorRate,
+        qboolean wavy,
+        float    wavyDist,
+        float    currentTime,
+        float    dieTime,
+        float    maxspeed,
+        Vector   parentOrg,
+        qboolean swarm,
+        int      freq,
+        int      delta
+    );
+
+    void  Update(float currentTime);
+    float GetDieTime();
+};
+
+class ParticleEmitter
+{
+private:
+    float m_time;
+    float m_lasttime;
+
+    Vector m_position;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    float m_minColorRate;
+    float m_maxColorRate;
+
+    float m_minRate;
+    float m_maxRate;
+
+    float m_minLife;
+    float m_maxLife;
+
+    float m_angle;
+    float m_angleVar;
+
+    float m_minSpeed;
+    float m_maxSpeed;
+    float m_accAngle;
+    float m_accAngleVar;
+    float m_minAccSpeed;
+    float m_maxAccSpeed;
+
+    float    m_minWavyDist;
+    float    m_maxWavyDist;
+    qboolean m_wavy;
+
+    qboolean m_gravityWell;
+    float    m_gravityWellStrength;
+
+    qboolean m_particles;
+    Vector   m_gravityEffectVector;
+
+    qboolean m_ballLightning;
+    int      m_minBallLightningRadius;
+    int      m_maxBallLightningRadius;
+    float    m_lightningVar;
+    int      m_lightningSubdivisions;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    int m_maxspeed;
+
+public:
+    Container<Particle *> particleList;
+
+public:
+    ParticleEmitter(
+        Vector   position,
+        float    minSpeed,
+        float    maxSpeed,
+        float    angle,
+        float    angleVar,
+        float    minAccSpeed,
+        float    maxAccSpeed,
+        float    accAngle,
+        float    accAngleVar,
+        float    minRate,
+        float    maxRate,
+        int      srcColor,
+        int      dstColor,
+        float    minColorRate,
+        float    maxColorRate,
+        qboolean wavy,
+        float    minWavyDist,
+        float    maxWavyDist,
+        float    minLife,
+        float    maxLife,
+        qboolean particles,
+        qboolean gravityWell,
+        float    gravityWellStrength,
+        qboolean ballLightning,
+        int      minBallLightningRadius,
+        int      maxBallLightningRadius,
+        float    lightningVar,
+        int      lightningSubdivisions,
+        qboolean swarm,
+        int      swarmfreq,
+        int      swarmdelta
+    );
+    ParticleEmitter();
+    ~ParticleEmitter();
+
+    void Emit(float currentTime);
+    void UpdateValues();
+
+    Vector GetPosition();
+    Vector GetVelocity();
+    Vector GetVelocityDirection();
+    Vector GetVelocityDirectionMin();
+    Vector GetVelocityDirectionMax();
+    Vector GetAcceleration();
+    Vector GetAccelerationDirection();
+    Vector GetAccelerationDirectionMin();
+    Vector GetAccelerationDirectionMax();
+
+    int GetSrcColor();
+    int GetDstColor();
+
+    float GetGravityWellStrength();
+    float GetRate();
+    float GetColorRate();
+
+    float GetWavyDistance();
+    float GetDieTime(float currentTime);
+    int   GetBallLightningRadius();
+    float GetLightningVar();
+    int   GetLightningSubdivisions();
+
+    qboolean IsWavy();
+    qboolean IsGravityWell();
+    qboolean IsParticles();
+    qboolean IsBallLightning();
+    qboolean IsSwarm();
+
+    void SetMinSpeed(float value);
+    void SetMaxSpeed(float value);
+
+    void SetAngle(float value);
+    void SetAngleVar(float value);
+
+    void SetMinAccSpeed(float value);
+    void SetMaxAccSpeed(float value);
+    void SetAccAngle(float value);
+    void SetAccAngleVar(float value);
+
+    void SetMinRate(float value);
+    void SetMaxRate(float value);
+
+    void SetSrcColor(int value);
+    void SetDstColor(int value);
+    void SetMinColorRate(float value);
+    void SetMaxColorRate(float value);
+
+    void SetWavy(int value);
+
+    void SetParticles(int value);
+    void SetGravityWell(int value);
+
+    void SetMinWavyDist(float value);
+    void SetMaxWavyDist(float value);
+
+    void SetMinLife(float value);
+    void SetMaxLife(float value);
+
+    void SetGravityWellStrength(float value);
+    void SetGravityEffectVector(Vector value);
+
+    void SetBallLightning(int value);
+    void SetMinBallLightningRadius(int value);
+    void SetMaxBallLightningRadius(int value);
+    void SetLightningVar(float value);
+    void SetLightningSubdivisions(int value);
+
+    float RandomizeRange(float minRange, float maxRange);
+    float RandomizeAngle(float minAngle, float maxAngle);
+
+    Vector CalculateDirection(float value);
+
+    void Load(char **buf_p);
+};
+
+class GhostTexture
+{
+public:
+    Container<ParticleEmitter *> m_emitterList;
+
+    int m_width;
+    int m_height;
+
+    image_t      *m_image;
+    unsigned int *m_texture;
+    str           m_name;
+
+    qboolean m_isburn;
+    qboolean m_isfade;
+    int      m_faderate;
+    int      m_burnrate;
+
+public:
+    GhostTexture();
+
+    void   Update();
+    void   SetTexel(int x, int y, unsigned int color);
+    void   Burn();
+    void   GenerateLightning(Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions);
+    Vector RotateVector(Vector v, float angle);
+    void   ClipAndDrawLine(Vector p0, Vector p1, int color);
+    outcode ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax);
+};
+
+class GhostManager
+{
+public:
+    Container<GhostTexture *> m_textureList;
+};
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index 0e829d51..35ab1378 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -3388,4 +3388,99 @@ void	R_SkinList_f( void ) {
 	ri.Printf (PRINT_ALL, "------------------\n");
 }
 
+//
+// OPENMOHAA-specific stuff
+//
 
+image_t* R_RefreshImageFile(const char* name, imgType_t type, imgFlags_t flags) {
+	// FIXME: unimplemented (GL2)
+	return NULL;
+}
+
+/*
+================
+R_ImageExists
+================
+*/
+qboolean R_ImageExists(const char* name) {
+    image_t* image;
+    long int hash;
+
+    if (name)
+    {
+        hash = generateHashValue(name);
+        image = hashTable[hash];
+
+        if (hash)
+        {
+            for (; image != NULL; image = image->next)
+            {
+                if (!strcmp(name, image->imgName)) {
+                    return qtrue;
+                }
+            }
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+===============
+R_DumpTextureMemory
+===============
+*/
+void R_DumpTextureMemory() {
+    int i;
+    char str_buffer[32];
+    char* Label1, * Label2;
+    fileHandle_t stat_file;
+
+    stat_file = ri.FS_OpenFileWrite("textureuse.csv");
+
+    Label1 = "Texture Name,";
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Size (kb),";
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
+    Label1 = "Num Uses,";
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Miplevels\n";
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = tr.images[i];
+
+        ri.FS_Write(image->imgName, strlen(image->imgName), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+
+        // Write the number of bytes (in KiB)
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+
+        // Write the sequence
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+    }
+}
+
+/*
+===============
+R_CountTextureMemory
+===============
+*/
+int R_CountTextureMemory() {
+    int total_bytes;
+    int i;
+
+    R_DumpTextureMemory();
+
+    total_bytes = 0;
+
+    for (i = 0; i < tr.numImages; i++) {
+        total_bytes = tr.images[i]->bytesUsed;
+    }
+
+    return total_bytes;
+}
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index a1bef72e..e8c0382d 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -236,6 +236,86 @@ int		max_polys;
 cvar_t	*r_maxpolyverts;
 int		max_polyverts;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+int r_sequencenumber;
+
+// DRAWING
+
+cvar_t *r_drawentitypoly;
+cvar_t *r_drawstaticmodels;
+cvar_t *r_drawstaticmodelpoly;
+cvar_t *r_drawstaticdecals;
+cvar_t *r_drawterrain;
+cvar_t *r_drawsprites;
+cvar_t *r_drawspherelights;
+
+cvar_t *r_numdebuglines;
+cvar_t *r_stipplelines;
+cvar_t *r_debuglines_depthmask;
+
+cvar_t	*r_maxpolys;
+int		max_polys;
+cvar_t	*r_maxpolyverts;
+int		max_polyverts;
+cvar_t* r_maxtermarks;
+int		max_termarks;
+
+cvar_t* r_skyportal;
+cvar_t* r_skyportal_origin;
+cvar_t* r_lightcoronasize;
+
+// LOD
+
+cvar_t* r_staticlod;
+cvar_t* r_lodscale;
+cvar_t* r_lodcap;
+cvar_t* r_lodviewmodelcap;
+
+cvar_t* r_uselod;
+cvar_t* lod_LOD;
+cvar_t* lod_minLOD;
+cvar_t* lod_maxLOD;
+cvar_t* lod_LOD_slider;
+cvar_t* lod_curve_0_val;
+cvar_t* lod_curve_1_val;
+cvar_t* lod_curve_2_val;
+cvar_t* lod_curve_3_val;
+cvar_t* lod_curve_4_val;
+cvar_t* lod_edit_0;
+cvar_t* lod_edit_1;
+cvar_t* lod_edit_2;
+cvar_t* lod_edit_3;
+cvar_t* lod_edit_4;
+cvar_t* lod_curve_0_slider;
+cvar_t* lod_curve_1_slider;
+cvar_t* lod_curve_2_slider;
+cvar_t* lod_curve_3_slider;
+cvar_t* lod_curve_4_slider;
+cvar_t* lod_pitch_val;
+cvar_t* lod_zee_val;
+cvar_t* lod_mesh;
+cvar_t* lod_meshname;
+cvar_t* lod_tikiname;
+cvar_t* lod_metric;
+cvar_t* lod_tris;
+cvar_t* lod_position;
+cvar_t* lod_save;
+cvar_t* lod_tool;
+
+// Utils
+
+cvar_t* r_developer;
+cvar_t* r_fps;
+cvar_t* r_showstaticbboxes;
+cvar_t* r_showcull;
+cvar_t* r_showlod;
+cvar_t* r_showstaticlod;
+
+//=========================
+
 /*
 ** InitOpenGL
 **
@@ -1452,6 +1532,77 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "minimize", GLimp_Minimize );
 	ri.Cmd_AddCommand( "gfxmeminfo", GfxMemInfo_f );
 	ri.Cmd_AddCommand( "exportCubemaps", R_ExportCubemaps_f );
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	// Draw
+
+    r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
+    r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
+    r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
+    r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
+    r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
+    r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
+    r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
+
+    r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
+    r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
+    r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
+
+	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
+
+    r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+    r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+    r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
+
+	// LOD
+
+	r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
+	r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
+	r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
+	r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
+	
+	r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
+	lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
+	lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
+	lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
+	lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
+	lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
+	lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
+	lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
+	lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
+	lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
+	lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
+	lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
+	lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
+	lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
+	lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
+	lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
+	lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
+	lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
+	lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
+	lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
+	lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
+	lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
+	lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
+	lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
+	lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
+	lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
+	lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
+	lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
+	lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
+	lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
+
+	// Utils
+
+    r_fps = ri.Cvar_Get("fps", "0", 0);
+    r_developer = ri.Cvar_Get("developer", "", 0);
+    r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
+    r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
+    r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
+    r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
 }
 
 void R_InitQueries(void)
@@ -1628,6 +1779,28 @@ void RE_Shutdown( qboolean destroyWindow ) {
 	tr.registered = qfalse;
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+** RE_BeginRegistration
+*/
+void RE_BeginRegistration(glconfig_t* glconfigOut) {
+
+    R_Init();
+
+    *glconfigOut = glConfig;
+
+    R_IssuePendingRenderCommands();
+
+    tr.viewCluster = -1;		// force markleafs to regenerate
+    R_ClearFlares();
+    RE_ClearScene();
+
+    tr.registered = qtrue;
+}
+//=========================
 
 /*
 =============
@@ -1643,6 +1816,52 @@ void RE_EndRegistration( void ) {
 	}
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+==================
+R_SetMode
+==================
+*/
+qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
+    // FIXME: unimplemented (GL2)
+	ri.Printf(PRINT_WARNING, "R_SetMode is unimplemented. To change the video mode, set the \"r_mode\" variable and execute the \"vid_restart\" command.\n");
+	return qfalse;
+}
+
+/*
+==================
+R_SetFullscreen
+==================
+*/
+void R_SetFullscreen(qboolean fullscreen) {
+    // FIXME: unimplemented (GL2)
+    ri.Printf(PRINT_WARNING, "R_SetFullscreen is unimplemented. To change the fullscreen mode, set the \"r_fullscreen\" variable and execute the \"vid_restart\" command.\n");
+}
+
+/*
+=============
+RE_SetRenderTime
+=============
+*/
+void RE_SetRenderTime(int t) {
+    backEnd.refdef.floatTime = (long double)t / 1000.0;
+    R_UpdateGhostTextures();
+}
+
+/*
+==================
+RE_GetGraphicsInfo
+==================
+*/
+const char* RE_GetGraphicsInfo() {
+	// FIXME: unimplemented (GL2)
+	// Looks like it's unused anyway
+}
+
+//=========================
 
 /*
 @@@@@@@@@@@@@@@@@@@@@
@@ -1708,5 +1927,70 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 
 	re.TakeVideoFrame = RE_TakeVideoFrame;
 
+	//
+	// After ioquake3 imports
+	//
+
+    re.FreeModels = RE_FreeModels;
+	re.EndRegistration = RE_EndRegistration;
+    re.SpawnEffectModel = RE_SpawnEffectModel;
+    re.RegisterServerModel = RE_RegisterServerModel;
+    re.UnregisterServerModel = RE_UnregisterServerModel;
+	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
+	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
+	re.MapVersion = RE_MapVersion;
+    re.LoadFont = R_LoadFont;
+
+    re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
+    re.GetInlineModelBounds = R_GetInlineModelBounds;
+    re.GetLightingForDecal = R_GetLightingForDecal;
+    re.GetLightingForSmoke = R_GetLightingForSmoke;
+    re.R_GatherLightSources = R_GatherLightSources;
+    re.ModelRadius = R_ModelRadius;
+    re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
+    re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
+
+    re.GetRenderEntity = RE_GetRenderEntity;
+
+	re.SavePerformanceCounters = R_SavePerformanceCounters;
+
+	re.R_Model_GetHandle = R_Model_GetHandle;
+	re.SetColor = Draw_SetColor;
+	re.DrawStretchPic = Draw_StretchPic;
+	re.DrawStretchPic2 = Draw_StretchPic2;
+	re.DrawStretchRaw = RE_StretchRaw;
+	re.DebugLine = R_DebugLine;
+	re.DrawTilePic = Draw_TilePic;
+	re.DrawTilePicOffset = Draw_TilePicOffset;
+	re.DrawTrianglePic = Draw_TrianglePic;
+	re.DrawBox = DrawBox;
+	re.AddBox = AddBox;
+	re.Set2DWindow = Set2DWindow;
+	re.Scissor = RE_Scissor;
+	re.DrawLineLoop = DrawLineLoop;
+	re.DrawString = R_DrawString;
+	re.GetFontHeight = R_GetFontHeight;
+	re.GetFontStringWidth = R_GetFontStringWidth;
+	re.SwipeBegin = RE_SwipeBegin;
+	re.SwipeEnd = RE_SwipeEnd;
+	re.SetRenderTime = RE_SetRenderTime;
+	re.Noise = R_NoiseGet4f;
+
+	re.SetMode = R_SetMode;
+	re.SetFullscreen = R_SetFullscreen;
+
+	re.GetShaderHeight = RE_GetShaderHeight;
+	re.GetShaderWidth = RE_GetShaderWidth;
+	re.GetShaderName = RE_GetShaderName;
+	re.GetModelName = RE_GetModelName;
+	re.GetGraphicsInfo = RE_GetGraphicsInfo;
+	re.ForceUpdatePose = RE_ForceUpdatePose;
+	re.TIKI_Orientation = RE_TIKI_Orientation;
+	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
+	re.SetFrameNumber = RE_SetFrameNumber;
+
+	re.ImageExists = R_ImageExists;
+	re.CountTextureMemory = R_CountTextureMemory;
+
 	return &re;
 }
diff --git a/code/renderergl2/tr_light.c b/code/renderergl2/tr_light.c
index 3ac2154e..1c46024a 100644
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
@@ -509,3 +509,27 @@ int R_CubemapForPoint( vec3_t point )
 
 	return cubemapIndex + 1;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+===============
+R_GetLightingForDecal
+===============
+*/
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
+{
+    // FIXME: unimplemented (GL2)
+}
+
+/*
+===============
+R_GetLightingForSmoke
+===============
+*/
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
+{
+	// FIXME: unimplemented (GL2)
+}
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 9f46866f..28545a62 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -36,7 +36,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../renderercommon/iqm.h"
 #include "../renderercommon/qgl.h"
 
+#ifdef __cplusplus
+#define GLE(ret, name, ...) extern "C" name##proc * qgl##name;
+#else
 #define GLE(ret, name, ...) extern name##proc * qgl##name;
+#endif
 QGL_1_1_PROCS;
 QGL_DESKTOP_1_1_PROCS;
 QGL_1_3_PROCS;
@@ -49,6 +53,10 @@ QGL_ARB_vertex_array_object_PROCS;
 QGL_EXT_direct_state_access_PROCS;
 #undef GLE
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define GL_INDEX_TYPE		GL_UNSIGNED_SHORT
 typedef unsigned short glIndex_t;
 
@@ -84,6 +92,12 @@ typedef struct dlight_s {
 
 	vec3_t	transformed;		// origin in local coordinate system
 	int		additive;			// texture detail is lost tho when the lightmap is dark
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    dlighttype_t type;
 } dlight_t;
 
 
@@ -102,6 +116,12 @@ typedef struct {
 	vec3_t		ambientLight;	// color normalized to 0-255
 	int			ambientLightInt;	// 32 bit rgba packed
 	vec3_t		directedLight;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    float		lodpercentage[2];
 } trRefEntity_t;
 
 
@@ -243,7 +263,17 @@ typedef enum {
 	AGEN_LIGHTING_SPECULAR,
 	AGEN_WAVEFORM,
 	AGEN_PORTAL,
-	AGEN_CONST,
+    AGEN_CONST,
+
+    //
+    // OPENMOHAA-specific stuff
+    //
+
+    AGEN_GLOBAL_ALPHA,
+    AGEN_DIST_FADE,
+    AGEN_ONE_MINUS_DIST_FADE,
+    AGEN_TIKI_DIST_FADE,
+    AGEN_ONE_MINUS_TIKI_DIST_FADE,
 } alphaGen_t;
 
 typedef enum {
@@ -260,7 +290,13 @@ typedef enum {
 	CGEN_WAVEFORM,			// programmatically generated
 	CGEN_LIGHTING_DIFFUSE,
 	CGEN_FOG,				// standard fog
-	CGEN_CONST				// fixed color
+	CGEN_CONST,				// fixed color
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    CGEN_GLOBAL_COLOR,
 } colorGen_t;
 
 typedef enum {
@@ -439,6 +475,24 @@ typedef struct {
 	float	depthForOpaque;
 } fogParms_t;
 
+//
+// OPENMOHAA-specific stuff
+//
+//=============================
+
+typedef enum {
+	SPRITE_PARALLEL,
+	SPRITE_PARALLEL_ORIENTED,
+	SPRITE_ORIENTED,
+	SPRITE_PARALLEL_UPRIGHT
+} spriteType_t;
+
+typedef struct {
+  spriteType_t type;
+  float scale;
+} spriteParms_t;
+
+//=============================
 
 typedef struct shader_s {
 	char		name[MAX_QPATH];		// game path, including extension
@@ -492,6 +546,14 @@ typedef struct shader_s {
   struct shader_s *remappedShader;                  // current shader this one is remapped too
 
 	struct	shader_s	*next;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    float fDistRange;
+    float fDistNear;
+    spriteParms_t sprite;
 } shader_t;
 
 enum
@@ -775,6 +837,30 @@ typedef struct {
 
 	float       autoExposureMinMax[2];
 	float       toneMinAvgMaxLinear[3];
+
+	
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	int numTerMarks;
+	struct srfMarkFragment_s *terMarks;
+
+	int numSpriteSurfs;
+	struct drawSurf_s *spriteSurfs;
+
+    int numStaticModels;
+    struct cStaticModelUnpacked_s *staticModels;
+
+    int numStaticModelData;
+    unsigned char *staticModelData;
+
+    qboolean sky_portal;
+    float sky_alpha;
+    vec3_t sky_origin;
+    vec3_t sky_axis[3];
+    qboolean skybox_farplane;
+    qboolean render_terrain;
 } trRefdef_t;
 
 
@@ -812,6 +898,19 @@ typedef struct {
 	float		surface[4];
 } fog_t;
 
+//
+// OPENMOHAA-specific stuff
+// 
+//=========================
+typedef struct depthfog_s {
+	float len;
+	float oolen;
+	int enabled;
+	int extrafrustums;
+} depthfog_t;
+
+//=========================
+
 typedef enum {
 	VPF_NONE            = 0x00,
 	VPF_NOVIEWMODEL     = 0x01,
@@ -845,6 +944,18 @@ typedef struct {
 	float		zFar;
 	float       zNear;
 	stereoFrame_t	stereoFrame;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    qboolean	isPortalSky;		// since 2.0 whether or not this view is a portal sky
+    depthfog_t	fog;
+    float		farplane_distance;
+    float		farplane_bias; // added in 2.0
+    float		farplane_color[3];
+    qboolean	farplane_cull;
+    qboolean	renderTerrain; // added in 2.0
 } viewParms_t;
 
 
@@ -873,6 +984,17 @@ typedef enum {
 	SF_VAO_MDVMESH,
 	SF_VAO_IQM,
 
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    SF_MARK_FRAG,
+    SF_DISPLAY_LIST,
+    SF_TIKI_SKEL,
+    SF_TIKI_STATIC,
+    SF_SWIPE,
+    SF_SPRITE,
+    SF_TERRAIN_PATCH,
 	SF_NUM_SURFACE_TYPES,
 	SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
 } surfaceType_t;
@@ -896,6 +1018,12 @@ typedef struct srfPoly_s {
 	int				fogIndex;
 	int				numVerts;
 	polyVert_t		*verts;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    int renderfx;
 } srfPoly_t;
 
 
@@ -1054,6 +1182,210 @@ typedef struct srfVaoMdvMesh_s
 
 extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
 
+//
+// OPENMOHAA-specific stuff
+//
+
+typedef struct {
+    struct mnode_s* cntNode;
+    struct msurface_s* skySurfs[32];
+    int numSurfs;
+    vec3_t offset;
+    vec3_t mins;
+    vec3_t maxs;
+} portalsky_t;
+
+typedef struct {
+    vec3_t transformed;
+    int index;
+} sphere_dlight_t;
+
+typedef enum {
+    LIGHT_POINT,
+    LIGHT_DIRECTIONAL,
+    LIGHT_SPOT,
+    LIGHT_SPOT_FAST
+} lighttype_t;
+
+typedef struct reallightinfo_s {
+    vec3_t color;
+    lighttype_t eType;
+    float fIntensity;
+    float fDist;
+    float fSpotSlope;
+    float fSpotConst;
+    float fSpotScale;
+    vec3_t vOrigin;
+    vec3_t vDirection;
+} reallightinfo_t;
+
+typedef float cube_entry_t[3][4];
+
+typedef struct {
+    vec3_t origin;
+    vec3_t worldOrigin;
+    vec3_t traceOrigin;
+    float radius;
+    struct mnode_s* leaves[8];
+    void(*TessFunction) (unsigned char* dstColors);
+    union {
+        unsigned char level[4];
+        int value;
+    } ambient;
+    int numRealLights;
+    reallightinfo_t light[MAX_REAL_LIGHTS];
+    int bUsesCubeMap;
+    float cubemap[24][3][4];
+} sphereor_t;
+
+typedef struct spherel_s {
+    vec3_t origin;
+	vec3_t color;
+    float intensity;
+    struct mnode_s* leaf;
+    int needs_trace;
+    int spot_light;
+    float spot_radiusbydistance;
+	vec3_t spot_dir;
+    int reference_count;
+} spherel_t;
+
+typedef struct suninfo_s {
+	vec3_t color;
+	vec3_t direction;
+	vec3_t flaredirection;
+	char szFlareName[64];
+	qboolean exists;
+} suninfo_t;
+
+typedef union varnodeUnpacked_u {
+    float fVariance;
+    int flags;
+} varnodeUnpacked_t;
+
+typedef unsigned short terraInt;
+
+typedef struct terrainVert_s {
+    vec3_t xyz;
+    vec2_t texCoords[2];
+    float fVariance;
+    float fHgtAvg;
+    float fHgtAdd;
+    unsigned int uiDistRecalc;
+    terraInt nRef;
+    terraInt iVertArray;
+    byte* pHgt;
+    terraInt iNext;
+    terraInt iPrev;
+} terrainVert_t;
+
+typedef struct terraTri_s {
+    unsigned short iPt[3];
+    terraInt nSplit;
+    unsigned int uiDistRecalc;
+    struct cTerraPatchUnpacked_s* patch;
+    varnodeUnpacked_t* varnode;
+    terraInt index;
+    byte lod;
+    byte byConstChecks;
+    terraInt iLeft;
+    terraInt iRight;
+    terraInt iBase;
+    terraInt iLeftChild;
+    terraInt iRightChild;
+    terraInt iParent;
+    terraInt iPrev;
+    terraInt iNext;
+} terraTri_t;
+
+typedef struct srfTerrain_s {
+    surfaceType_t surfaceType;
+    terraInt iVertHead;
+    terraInt iTriHead;
+    terraInt iTriTail;
+    terraInt iMergeHead;
+    int nVerts;
+    int nTris;
+    int lmapSize;
+    int dlightBits[2];
+    float lmapStep;
+    int dlightMap[2];
+    byte* lmData;
+    float lmapX;
+    float lmapY;
+} srfTerrain_t;
+
+typedef struct cTerraPatchUnpacked_s {
+    srfTerrain_t drawinfo;
+    int viewCount;
+    int visCountCheck;
+    int visCountDraw;
+    int frameCount;
+    unsigned int uiDistRecalc;
+    float s;
+    float t;
+    vec2_t texCoord[2][2];
+    float x0;
+    float y0;
+    float z0;
+    float zmax;
+    shader_t* shader;
+    short int iNorth;
+    short int iEast;
+    short int iSouth;
+    short int iWest;
+    struct cTerraPatchUnpacked_s* pNextActive;
+    varnodeUnpacked_t varTree[2][63];
+    unsigned char heightmap[81];
+    byte flags;
+    byte byDirty;
+} cTerraPatchUnpacked_t;
+
+typedef struct srfStaticModel_s {
+    surfaceType_t surfaceType;
+    struct cStaticModelUnpacked_s* parent;
+} srfStaticModel_t;
+
+typedef struct srfMarkFragment_s {
+	surfaceType_t surfaceType;
+	int iIndex;
+	int numVerts;
+	polyVert_t* verts;
+} srfMarkFragment_t;
+
+typedef struct cStaticModelUnpacked_s {
+    qboolean useSpecialLighting;
+    qboolean bLightGridCalculated;
+    qboolean bRendered;
+    char model[128];
+    vec3_t origin;
+    vec3_t angles;
+    vec3_t axis[3];
+    float scale;
+    int firstVertexData;
+    int numVertexData;
+    int visCount;
+    dtiki_t* tiki;
+    sphere_dlight_t dlights[MAX_DLIGHTS];
+    int numdlights;
+    float radius;
+    float cull_radius;
+    int iGridLighting;
+    float lodpercentage[2];
+} cStaticModelUnpacked_t;
+
+typedef struct refSprite_s {
+    surfaceType_t surftype;
+    int hModel;
+    int shaderNum;
+    float origin[3];
+    float scale;
+    float axis[3][3];
+    byte shaderRGBA[4];
+    int renderfx;
+    float shaderTime;
+} refSprite_t;
+
 /*
 ==============================================================================
 
@@ -1140,12 +1472,35 @@ typedef struct mnode_s {
 
 	int         firstmarksurface;
 	int			nummarksurfaces;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    spherel_t**	lights;
+    int			numlights;
+
+    int			firstTerraPatch;
+    int			numTerraPatches;
+    int			firstStaticModel;
+    int			numStaticModels;
+    void**		pFirstMarkFragment;
+    int			iNumMarkFragment;
 } mnode_t;
 
 typedef struct {
 	vec3_t		bounds[2];		// for culling
 	int	        firstSurface;
 	int			numSurfaces;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    void** pFirstMarkFragment;
+    int iNumMarkFragment;
+    int frameCount;
+    qboolean hasLightmap;
 } bmodel_t;
 
 typedef struct {
@@ -1195,8 +1550,39 @@ typedef struct {
 
 	char		*entityString;
 	char		*entityParsePoint;
+	
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    int numTerraPatches;
+    cTerraPatchUnpacked_t* terraPatches;
+    cTerraPatchUnpacked_t* activeTerraPatches;
+
+    int numVisTerraPatches;
+    cTerraPatchUnpacked_t** visTerraPatches;
+
+    int numStaticModelData;
+    byte* staticModelData;
+
+    int numStaticModels;
+    cStaticModelUnpacked_t* staticModels;
+
+    int numVisStaticModels;
+    cStaticModelUnpacked_t** visStaticModels;
 } world_t;
 
+//
+// OPENMOHAA-specific stuff
+//
+typedef struct {
+    float width;
+    float height;
+    float origin_x;
+    float origin_y;
+    float scale;
+    shader_t* shader;
+} sprite_t;
 
 /*
 ==============================================================================
@@ -1278,7 +1664,10 @@ typedef enum {
 	MOD_BRUSH,
 	MOD_MESH,
 	MOD_MDR,
-	MOD_IQM
+	MOD_IQM,
+	// OPENMOHAA-specific stuff
+    MOD_TIKI,
+    MOD_SPRITE
 } modtype_t;
 
 typedef struct model_s {
@@ -1292,6 +1681,13 @@ typedef struct model_s {
 	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM)
 
 	int			 numLods;
+
+	// OPENMOHAA-specific stuff
+    union {
+        dtiki_t* tiki;
+        sprite_t* sprite;
+    } d;
+    qboolean serveronly;
 } model_t;
 
 
@@ -1341,8 +1737,9 @@ the bits are allocated as follows:
 0     : dlight flag
 */
 #define	QSORT_FOGNUM_SHIFT	2
-#define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_SHADERNUM_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
+#define	QSORT_REFENTITYNUM_SHIFT	4
+#define	QSORT_STATICMODEL_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
+#define	QSORT_SHADERNUM_SHIFT	(QSORT_STATICMODEL_SHIFT+1)
 #if (QSORT_SHADERNUM_SHIFT+SHADERNUM_BITS) > 32
 	#error "Need to update sorting, too many bits."
 #endif
@@ -1473,6 +1870,12 @@ typedef struct {
 	int     c_dlightDraws;
 
 	int		msec;			// total msec for backend run
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	int		c_characterlights;
 } backEndCounters_t;
 
 // all state modified by the back end is separated
@@ -1494,6 +1897,11 @@ typedef struct {
 	FBO_t *last2DFBO;
 	qboolean    colorMask[4];
 	qboolean    depthFill;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+    cStaticModelUnpacked_t* currentStaticModel;
 } backEndState_t;
 
 /*
@@ -1677,6 +2085,28 @@ typedef struct {
 	float					sawToothTable[FUNCTABLE_SIZE];
 	float					inverseSawToothTable[FUNCTABLE_SIZE];
 	float					fogTable[FOG_TABLE_SIZE];
+
+	//
+	// OPENMOHAA-specific stuff
+    //
+
+    int shiftedIsStatic;
+
+    int overbrightShift;
+    float overbrightMult;
+
+    portalsky_t portalsky;
+    qboolean skyRendered;
+    qboolean portalRendered;
+
+    spherel_t sSunLight;
+    spherel_t sLights[1532];
+    int numSLights;
+    int rendererhandle;
+    qboolean shadersParsed;
+    int frame_skel_index;
+    int skel_index[1024];
+    fontheader_t* pFontDebugStrings;
 } trGlobals_t;
 
 extern backEndState_t	backEnd;
@@ -1848,6 +2278,86 @@ extern	cvar_t	*r_printShaders;
 
 extern cvar_t	*r_marksOnTriangleMeshes;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+extern int r_sequencenumber;
+
+// DRAWING
+
+extern cvar_t	*r_drawentitypoly;
+extern cvar_t	*r_drawstaticmodels;
+extern cvar_t	*r_drawstaticmodelpoly;
+extern cvar_t	*r_drawstaticdecals;
+extern cvar_t	*r_drawterrain;
+extern cvar_t	*r_drawsprites;
+extern cvar_t	*r_drawspherelights;
+
+extern cvar_t	*r_numdebuglines;
+extern cvar_t	*r_stipplelines;
+extern cvar_t	*r_debuglines_depthmask;
+
+extern cvar_t	*r_maxpolys;
+extern int		max_polys;
+extern cvar_t	*r_maxpolyverts;
+extern int		max_polyverts;
+extern cvar_t* r_maxtermarks;
+extern int		max_termarks;
+
+extern cvar_t* r_skyportal;
+extern cvar_t* r_skyportal_origin;
+extern cvar_t* r_lightcoronasize;
+
+// LOD
+
+extern cvar_t* r_staticlod;
+extern cvar_t* r_lodscale;
+extern cvar_t* r_lodcap;
+extern cvar_t* r_lodviewmodelcap;
+
+extern cvar_t* r_uselod;
+extern cvar_t* lod_LOD;
+extern cvar_t* lod_minLOD;
+extern cvar_t* lod_maxLOD;
+extern cvar_t* lod_LOD_slider;
+extern cvar_t* lod_curve_0_val;
+extern cvar_t* lod_curve_1_val;
+extern cvar_t* lod_curve_2_val;
+extern cvar_t* lod_curve_3_val;
+extern cvar_t* lod_curve_4_val;
+extern cvar_t* lod_edit_0;
+extern cvar_t* lod_edit_1;
+extern cvar_t* lod_edit_2;
+extern cvar_t* lod_edit_3;
+extern cvar_t* lod_edit_4;
+extern cvar_t* lod_curve_0_slider;
+extern cvar_t* lod_curve_1_slider;
+extern cvar_t* lod_curve_2_slider;
+extern cvar_t* lod_curve_3_slider;
+extern cvar_t* lod_curve_4_slider;
+extern cvar_t* lod_pitch_val;
+extern cvar_t* lod_zee_val;
+extern cvar_t* lod_mesh;
+extern cvar_t* lod_meshname;
+extern cvar_t* lod_tikiname;
+extern cvar_t* lod_metric;
+extern cvar_t* lod_tris;
+extern cvar_t* lod_position;
+extern cvar_t* lod_save;
+extern cvar_t* lod_tool;
+
+// UTILS
+
+extern cvar_t* r_developer;
+extern cvar_t* r_fps;
+extern cvar_t* r_showstaticbboxes;
+extern cvar_t* r_showcull;
+extern cvar_t* r_showlod;
+extern cvar_t* r_showstaticlod;
+
+//=========================
+
 //====================================================================
 
 static ID_INLINE qboolean ShaderRequiresCPUDeforms(const shader_t * shader)
@@ -2018,6 +2528,42 @@ void		R_InitShaders( void );
 void		R_ShaderList_f( void );
 void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori);
+void R_RotateForViewer(void);
+void R_SetupFrustum(void);
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius);
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius);
+qboolean R_ImageExists(const char* name);
+int R_CountTextureMemory();
+
+//
+// tr_bsp.c
+//
+void		RE_PrintBSPFileSizes(void);
+int			RE_MapVersion(void);
+
+//
+// tr_cmds.c
+//
+void R_SavePerformanceCounters(void);
+
+//
+// tr_main.c
+//
+
+qboolean SurfIsOffscreen2(const srfBspSurface_t* surface, shader_t* shader, int entityNum);
+
+//
+// tr_shader.c
+//
+qhandle_t		RE_RefreshShaderNoMip(const char* name);
+//=========================
+
+
 /*
 ====================================================================
 
@@ -2079,6 +2625,12 @@ typedef struct shaderCommands_s
 	int			numPasses;
 	void		(*currentStageIteratorFunc)( void );
 	shaderStage_t	**xstages;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    qboolean no_global_fog;
 } shaderCommands_t;
 
 extern	shaderCommands_t	tess;
@@ -2111,9 +2663,10 @@ WORLD MAP
 ============================================================
 */
 
-void R_AddBrushModelSurfaces( trRefEntity_t *e );
-void R_AddWorldSurfaces( void );
+void R_AddBrushModelSurfaces(trRefEntity_t* e);
+void R_AddWorldSurfaces(void);
 qboolean R_inPVS( const vec3_t p1, const vec3_t p2 );
+mnode_t* R_PointInLeaf(const vec3_t p);
 
 
 /*
@@ -2145,7 +2698,6 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world );
 int R_CubemapForPoint( vec3_t point );
 
-
 /*
 ============================================================
 
@@ -2195,8 +2747,12 @@ MARKERS, POLYGON PROJECTION ON WORLD POLYGONS
 ============================================================
 */
 
-int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );
+int R_MarkFragments(int numPoints, const vec3_t *points, const vec3_t projection,
+				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared);
+
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
 
 
 /*
@@ -2317,6 +2873,248 @@ int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
                   int startFrame, int endFrame,
                   float frac, const char *tagName );
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+
+/*
+=============================================================
+
+DRAWING
+
+=============================================================
+*/
+
+void Draw_SetColor(const vec4_t rgba);
+void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
+void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
+void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
+void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
+void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
+void DrawBox(float x, float y, float w, float h);
+void AddBox(float x, float y, float w, float h);
+void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
+void RE_Scissor(int x, int y, int width, int height);
+void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
+
+/*
+=============================================================
+
+FONT
+
+=============================================================
+*/
+void R_ShutdownFont();
+fontheader_t* R_LoadFont(const char* name);
+void R_LoadFontShader(fontheader_sgl_t* font);
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
+void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
+float R_GetFontHeight(const fontheader_t* font);
+float R_GetFontStringWidth(const fontheader_t* font, const char* s);
+
+/*
+=============================================================
+
+GHOST
+
+=============================================================
+*/
+
+void R_UpdateGhostTextures();
+void R_SetGhostImage(const char* name, image_t* image);
+void LoadGHOST(const char* name, byte** pic, int* width, int* height);
+
+/*
+============================================================
+
+LIGHTS
+
+============================================================
+*/
+
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
+int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
+
+extern suninfo_t s_sun;
+
+/*
+=============================================================
+
+MARKS
+
+=============================================================
+*/
+void R_LevelMarksLoad(const char* szBSPName);
+void R_LevelMarksInit();
+void R_LevelMarksFree();
+void R_UpdateLevelMarksSystem();
+void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
+
+/*
+============================================================
+
+SCENE
+
+============================================================
+*/
+
+void RE_AddRefSpriteToScene(const refEntity_t* ent);
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+refEntity_t* RE_GetRenderEntity(int entityNumber);
+qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+
+/*
+=============================================================
+
+SKY PORTALS
+
+=============================================================
+*/
+void R_Sky_Init();
+void R_Sky_Reset();
+void R_Sky_AddSurf(msurface_t* surf);
+void R_Sky_Render();
+
+/*
+=============================================================
+
+SPRITE
+
+=============================================================
+*/
+sprite_t* SPR_RegisterSprite(const char* name);
+void RB_DrawSprite(const refSprite_t* spr);
+
+
+/*
+=============================================================
+
+SUN FLARE
+
+=============================================================
+*/
+void R_InitLensFlare();
+void R_DrawLensFlares();
+
+/*
+=============================================================
+
+SWIPE
+
+=============================================================
+*/
+void RB_DrawSwipeSurface(surfaceType_t* pswipe);
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
+void RE_SwipeEnd();
+void R_AddSwipeSurfaces();
+
+/*
+=============================================================
+
+TERRAIN
+
+=============================================================
+*/
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
+void R_AddTerrainSurfaces();
+void R_AddTerrainMarkSurfaces();
+void R_InitTerrain();
+void R_TerrainPrepareFrame();
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
+void R_SwapTerraPatch(cTerraPatch_t* pPatch);
+
+void R_TerrainCrater_f(void);
+
+/*
+=============================================================
+
+TIKI
+
+=============================================================
+*/
+struct skelHeaderGame_s;
+struct skelAnimFrame_s;
+
+void R_InitStaticModels(void);
+void RE_FreeModels(void);
+qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
+qhandle_t RE_RegisterServerModel(const char* name);
+void RE_UnregisterServerModel(qhandle_t hModel);
+orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
+qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
+float R_ModelRadius(qhandle_t handle);
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
+dtiki_t* R_Model_GetHandle(qhandle_t handle);
+
+float R_GetRadius(refEntity_t* model);
+void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
+void RE_ForceUpdatePose(refEntity_t* model);
+void RE_SetFrameNumber(int frameNumber);
+void R_UpdatePoseInternal(refEntity_t* model);
+void RB_SkelMesh(skelSurfaceGame_t* sf);
+void RB_StaticMesh(staticSurface_t* staticSurf);
+void RB_Static_BuildDLights();
+void R_InfoStaticModels_f(void);
+void R_PrintInfoStaticModels();
+void R_AddSkelSurfaces(trRefEntity_t* ent);
+void R_AddStaticModelSurfaces(void);
+void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris);
+float R_CalcLod(const vec3_t origin, float radius);
+int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
+int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
+void R_InfoWorldTris_f(void);
+void R_PrintInfoWorldtris(void);
+void R_DebugSkeleton(void);
+
+extern int g_nStaticSurfaces;
+extern qboolean g_bInfostaticmodels;
+extern qboolean g_bInfoworldtris;
+
+/*
+=============================================================
+
+UTIL
+
+=============================================================
+*/
+
+void RB_StreamBegin(shader_t* shader);
+void RB_StreamEnd(void);
+void RB_StreamBeginDrawSurf(void);
+void RB_StreamEndDrawSurf(void);
+static void addTriangle(void);
+void RB_Vertex3fv(vec3_t v);
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
+void RB_Vertex2f(vec_t x, vec_t y);
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
+void RB_Color3f(vec_t r, vec_t g, vec_t b);
+void RB_Color3fv(vec3_t col);
+void RB_Color4bv(unsigned char* colors);
+void RB_Texcoord2f(float s, float t);
+void RB_Texcoord2fv(vec2_t st);
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
+void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
+int RE_GetShaderWidth(qhandle_t hShader);
+int RE_GetShaderHeight(qhandle_t hShader);
+const char* RE_GetShaderName(qhandle_t hShader);
+const char* RE_GetModelName(qhandle_t hModel);
+
+/*
+============================================================
+
+WORLD MAP
+
+============================================================
+*/
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
+mnode_t* R_PointInLeaf(const vec3_t p);
+
+//=========================
+
 /*
 =============================================================
 =============================================================
@@ -2478,6 +3276,7 @@ typedef enum {
 // the main view, all the 3D icons, etc
 #define	MAX_POLYS		600
 #define	MAX_POLYVERTS	3000
+#define	MAX_TERMARKS	1024
 
 // all of the information needed by the back end must be
 // contained in a backEndData_t
@@ -2489,6 +3288,14 @@ typedef struct {
 	polyVert_t	*polyVerts;//[MAX_POLYVERTS];
 	pshadow_t pshadows[MAX_CALC_PSHADOWS];
 	renderCommandList_t	commands;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+	srfMarkFragment_t* terMarks;
+    refSprite_t sprites[2048];
+    cStaticModelUnpacked_t* staticModels;
+    byte* staticModelData;
 } backEndData_t;
 
 extern	int		max_polys;
@@ -2520,5 +3327,8 @@ void RE_TakeVideoFrame( int width, int height,
 
 void R_ConvertTextureFormat( const byte *in, int width, int height, GLenum format, GLenum type, byte *out );
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif //TR_LOCAL_H
diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index 02f7d489..4b7e9d23 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -1729,6 +1729,220 @@ void R_DebugGraphics( void ) {
 	ri.CM_DrawDebugSurface( R_DebugPolygon );
 }
 
+#define CIRCLE_LENGTH		25
+
+/*
+================
+R_DebugCircle
+================
+*/
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
+    int				i;
+    float			ang;
+	debugline_t* line;
+	vec3_t			forward, right;
+	vec3_t			pos, lastpos;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (horizontal)
+	{
+		VectorSet(forward, 1, 0, 0);
+		VectorSet(right, 0, 1, 0);
+	}
+	else
+	{
+		VectorCopy(tr.refdef.viewaxis[1], right);
+		VectorCopy(tr.refdef.viewaxis[2], forward);
+	}
+
+	VectorClear(pos);
+	VectorClear(lastpos);
+
+	for (i = 0; i < CIRCLE_LENGTH; i++) {
+		VectorCopy(pos, lastpos);
+
+		ang = DEG2RAD((float)(i * 15));
+		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
+			cos(ang) * radius * right[0];
+		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
+			cos(ang) * radius * right[1];
+		pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
+			cos(ang) * radius * right[2];
+
+		if (i > 0)
+		{
+			if (*ri.numDebugLines >= r_numdebuglines->integer) {
+				ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
+				return;
+			}
+
+			line = &(*ri.DebugLines)[*ri.numDebugLines];
+			(*ri.numDebugLines)++;
+			VectorCopy(lastpos, line->start);
+			VectorCopy(pos, line->end);
+			VectorSet(line->color, r, g, b);
+			line->alpha = alpha;
+			line->width = 1.0;
+			line->factor = 1;
+			line->pattern = -1;
+		}
+	}
+}
+
+/*
+================
+R_DebugLine
+================
+*/
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
+	debugline_t* line;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (*ri.numDebugLines >= r_numdebuglines->integer) {
+		ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
+		return;
+	}
+
+	line = &(*ri.DebugLines)[*ri.numDebugLines];
+	(*ri.numDebugLines)++;
+	VectorCopy(start, line->start);
+	VectorCopy(end, line->end);
+	VectorSet(line->color, r, g, b);
+	line->alpha = alpha;
+	line->width = 1.0;
+	line->factor = 1;
+	line->pattern = -1;
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugLines(void) {
+	debugline_t* line;
+	int i;
+	float width;
+	int factor;
+	unsigned short pattern;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (!*ri.numDebugLines) {
+		return;
+	}
+
+	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+		return;
+	}
+
+	if (tr.viewParms.isPortalSky) {
+		return;
+	}
+
+	R_IssuePendingRenderCommands();
+    GL_BindToTMU(tr.whiteImage, 0);
+	if (r_debuglines_depthmask->integer) {
+		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+	} else {
+		GL_State(GLS_POLYMODE_LINE);
+	}
+
+    qglDisableClientState(GL_COLOR_ARRAY);
+    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+    width = 1.0;
+    factor = 4;
+    pattern = -1;
+
+    if (r_stipplelines->integer)
+    {
+        qglEnable(GL_LINE_STIPPLE);
+        qglLineStipple(4, -1);
+        qglLineWidth(1.0f);
+    }
+
+	qglBegin(GL_LINES);
+
+	for (i = 0; i < *ri.numDebugLines; i++) {
+		line = &(*ri.DebugLines)[i];
+
+		if (r_stipplelines->integer) {
+			if (line->width != width || line->factor != factor || line->pattern != pattern) {
+				qglEnd();
+				qglLineStipple(line->factor, line->pattern);
+                qglLineWidth(line->width);
+                qglBegin(GL_LINES);
+                factor = line->factor;
+                width = line->width;
+                pattern = line->pattern;
+			}
+		}
+
+		qglColor4f(line->color[0], line->color[1], line->color[2], line->alpha);
+        qglVertex3fv(line->start);
+        qglVertex3fv(line->end);
+	}
+
+    qglEnd();
+
+    if (r_stipplelines->integer)
+    {
+        qglDisable(GL_LINE_STIPPLE);
+        qglLineStipple(1, -1);
+        qglLineWidth(1.0);
+    }
+
+    qglDepthRange(0.0, 1.0);
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugStrings(void) {
+	int i;
+	debugstring_t* string;
+
+	if (!ri.DebugStrings || !ri.numDebugStrings) {
+		return;
+	}
+
+	if (!*ri.numDebugStrings) {
+		return;
+	}
+
+    if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+	for (i = 0; i < *ri.numDebugStrings; i++) {
+		string = &(*ri.DebugStrings)[i];
+
+		R_DrawFloatingString(
+			tr.pFontDebugStrings,
+			string->szText,
+			string->pos,
+			string->color,
+			string->scale,
+			64
+		);
+	}
+}
+
 
 /*
 ================
@@ -2672,3 +2886,207 @@ void R_RenderCubemapSide( int cubemapIndex, int cubemapSide, qboolean subscene )
 	if (!subscene)
 		RE_EndScene();
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+=================
+R_RotateForStaticModel
+
+Generates an orientation for a static model and viewParms
+=================
+*/
+void R_RotateForStaticModel( cStaticModelUnpacked_t *SM, const viewParms_t *viewParms,
+					   orientationr_t *ori ) {
+	float	glMatrix[16];
+	vec3_t	delta;
+	float	tiki_scale;
+
+	tiki_scale = SM->tiki->load_scale * SM->scale;
+
+	VectorCopy( SM->origin, ori->origin );
+
+	VectorCopy( SM->axis[0], ori->axis[0] );
+	VectorCopy( SM->axis[1], ori->axis[1] );
+	VectorCopy( SM->axis[2], ori->axis[2] );
+
+	glMatrix[0]  = ori->axis[0][0] * tiki_scale;
+	glMatrix[4]  = ori->axis[1][0] * tiki_scale;
+	glMatrix[8]  = ori->axis[2][0] * tiki_scale;
+	glMatrix[12] = ori->origin[0];
+
+	glMatrix[1]  = ori->axis[0][1] * tiki_scale;
+	glMatrix[5]  = ori->axis[1][1] * tiki_scale;
+	glMatrix[9]  = ori->axis[2][1] * tiki_scale;
+	glMatrix[13] = ori->origin[1];
+
+	glMatrix[2]  = ori->axis[0][2] * tiki_scale;
+	glMatrix[6]  = ori->axis[1][2] * tiki_scale;
+	glMatrix[10] = ori->axis[2][2] * tiki_scale;
+	glMatrix[14] = ori->origin[2];
+
+	glMatrix[3]  = 0;
+	glMatrix[7]  = 0;
+	glMatrix[11] = 0;
+	glMatrix[15] = 1;
+
+	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
+
+	// calculate the viewer origin in the model's space
+	// needed for fog, specular, and environment mapping
+	VectorSubtract( viewParms->or.origin, ori->origin, delta );
+
+	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] );
+	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] );
+	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] );
+}
+
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	vec3_t transformed;
+
+	R_LocalPointToWorld(pt, transformed);
+
+	return R_DistanceCullPointAndRadius(fDist, transformed, radius);
+}
+
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	if (!r_nocull->integer)
+	{
+		vec3_t vDelta;
+		float fLengthSquared;
+		float fTotalDistSquared;
+
+		VectorSubtract(pt, tr.viewParms.or.origin, vDelta);
+		fLengthSquared = VectorLengthSquared(vDelta);
+		fTotalDistSquared = Square(fDist + radius);
+
+		if (Square(fDist + radius) < Square(vDelta[2]) + fLengthSquared) {
+			return CULL_OUT;
+		} else if (Square(fDist - radius) > Square(vDelta[2]) + fLengthSquared) {
+			return CULL_IN;
+		}
+	}
+
+	return CULL_CLIP;
+}
+
+/*
+** SurfIsOffscreen
+**
+** Determines if a surface is completely offscreen.
+*/
+qboolean SurfIsOffscreen2(const srfBspSurface_t* surface, shader_t* shader, int entityNum) {
+	float shortest = 100000000;
+	int numTriangles;
+	qboolean doRange;
+	orientationr_t surfOr;
+	unsigned int* indices;
+	vec4_t clip, eye;
+	int i;
+	unsigned int pointOr = 0;
+	unsigned int pointAnd = (unsigned int)~0;
+
+	if (surface->surfaceType != SF_FACE) {
+		ri.Printf(PRINT_WARNING, "WARNING: SurfIsOffscreen called on non-bmodel!\n");
+		return qfalse;
+	}
+	
+	if ( glConfig.smpActive ) {		// FIXME!  we can't do RB_BeginSurface/RB_EndSurface stuff with smp!
+		return qfalse;
+	}
+
+	if (entityNum == ENTITYNUM_WORLD) {
+		surfOr = tr.viewParms.world;
+	} else {
+		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
+	}
+
+	for ( i = 0; i < surface->numVerts; i++ )
+	{
+		int j;
+		unsigned int pointFlags = 0;
+
+		R_TransformModelToClip( surface->verts[i].xyz, surfOr.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
+
+		for ( j = 0; j < 3; j++ )
+		{
+			if ( clip[j] >= clip[3] )
+			{
+				pointFlags |= (1 << (j*2));
+			}
+			else if ( clip[j] <= -clip[3] )
+			{
+				pointFlags |= ( 1 << (j*2+1));
+			}
+		}
+		pointAnd &= pointFlags;
+		pointOr |= pointFlags;
+	}
+
+	// trivially reject
+	if ( pointAnd )
+	{
+		return qtrue;
+	}
+
+	// determine if this surface is backfaced and also determine the distance
+	// to the nearest vertex so we can cull based on portal range.  Culling
+	// based on vertex distance isn't 100% correct (we should be checking for
+	// range to the surface), but it's good enough for the types of portals
+	// we have in the game right now.
+	numTriangles = surface->numIndexes / 3;
+
+	for ( i = 0; i < surface->numIndexes; i += 3 )
+	{
+		vec3_t normal;
+		float dot;
+		float len;
+		unsigned* indices;
+
+		indices = surface->indexes; // (unsigned*)(((char*)surface) + surface->ofsIndices);
+
+		VectorSubtract( surface->verts[indices[i]].xyz, surfOr.viewOrigin, normal);
+
+		if (shader->fDistRange > 0) {
+			len = VectorLengthSquared(normal);			// lose the sqrt
+			if (len < shortest)
+			{
+				shortest = len;
+			}
+		}
+
+		if ( ( dot = DotProduct( normal, surface->cullPlane.normal ) ) >= 0 )
+		{
+			numTriangles--;
+		}
+	}
+	if ( !numTriangles )
+	{
+		return qtrue;
+	}
+
+	if (shader->fDistRange > 0.0)
+	{
+		if (shortest > Square(shader->fDistRange))
+		{
+			return qtrue;
+		}
+	}
+
+	return qfalse;
+}
+
+static qboolean DrawSurfIsOffscreen(drawSurf_t* drawSurf) {
+	// FIXME: unimplemented (GL2)
+#if 0
+	int entityNum;
+	shader_t* shader;
+	int dlighted;
+	qboolean bStaticModel;
+
+	R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlighted, &bStaticModel);
+	return SurfIsOffscreen2((srfBspSurface_t*)drawSurf->surface, shader, entityNum);
+#endif
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_marks.c b/code/renderergl2/tr_marks.c
index 682c13d8..0fd7a00d 100644
--- a/code/renderergl2/tr_marks.c
+++ b/code/renderergl2/tr_marks.c
@@ -469,7 +469,10 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 	return returnedFragments;
 }
 
-
-
-
-
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared)
+{
+	// FIXME: unimplemented (GL2)
+	return 0;
+}
diff --git a/code/renderergl2/tr_marks_permanent.c b/code/renderergl2/tr_marks_permanent.c
new file mode 100644
index 00000000..eb16ce7c
--- /dev/null
+++ b/code/renderergl2/tr_marks_permanent.c
@@ -0,0 +1,2001 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_marks_pernanent.c: permanent marks
+
+#include "tr_local.h"
+
+#define DCL_FILE_SIGNATURE   *(int *)"DCL "
+#define DCL_FILE_OLD_VERSION 1
+#define DCL_FILE_VERSION     2
+
+typedef struct lmEditPoly_s {
+    srfMarkFragment_t    surf;
+    shader_t            *shader;
+    int                  viewCount;
+    polyVert_t           verts[8];
+    struct lmEditPoly_s *pNextPoly;
+    mnode_t             *pLeafs[8];
+    int                  iNumLeafs;
+} lmEditPoly_t;
+
+typedef struct lmEditMarkDef_s {
+    struct lmEditMarkDef_s *pNextMark;
+    struct lmEditMarkDef_s *pPrevMark;
+    shader_t               *markShader;
+    vec3_t                  vPos;
+    vec3_t                  vProjection;
+    float                   fRadius;
+    float                   fHeightScale;
+    float                   fWidthScale;
+    float                   fRotation;
+    vec4_t                  color;
+    qboolean                bDoLighting;
+    lmEditPoly_t           *pMarkEditPolys;
+    int                     iNumEditPolys;
+    vec3_t                  vPathCorners[4];
+} lmEditMarkDef_t;
+
+typedef struct lmPoly_s {
+    srfMarkFragment_t surf;
+    shader_t         *shader;
+    int               viewCount;
+} lmPoly_t;
+
+typedef struct {
+    qboolean         bLevelMarksLoaded;
+    char             szDCLFilename[MAX_QPATH];
+    lmPoly_t        *pMarkFragments;
+    qboolean         bAutoApplySettings;
+    lmEditPoly_t    *pFreeEditPolys;
+    lmEditMarkDef_t  activeMarkDefs;
+    lmEditMarkDef_t *pFreeMarkDefs;
+    lmEditMarkDef_t *pCurrentMark;
+    qboolean         bPathLayingMode;
+    treadMark_t      treadMark;
+    lmEditMarkDef_t *pTreadMarkStartDecal;
+    lmEditMarkDef_t *pTreadMarkEndDecal;
+} lmGlobals_t;
+
+typedef struct {
+    int ident;
+    int version;
+    int checksum;
+    int iNumDecals;
+    int iNumFragments;
+} dclHeader_t;
+
+typedef struct {
+    char     shader[MAX_RES_NAME];
+    vec3_t   vPos;
+    vec3_t   vProjection;
+    float    fRadius;
+    float    fHeightScale;
+    float    fWidthScale;
+    float    fRotation;
+    vec4_t   color;
+    qboolean bDoLighting;
+} dclSavedMarkDef_t;
+
+typedef struct {
+    char shader[MAX_RES_NAME];
+    int  fogIndex;
+    int  iIndex;
+    int  iNumVerts;
+} dclSavedMarkPoly_t;
+
+cvar_t *dcl_editmode;
+cvar_t *dcl_showcurrent;
+cvar_t *dcl_autogetinfo;
+cvar_t *dcl_shiftstep;
+cvar_t *dcl_shader;
+cvar_t *dcl_radius;
+cvar_t *dcl_heightscale;
+cvar_t *dcl_widthscale;
+cvar_t *dcl_rotation;
+cvar_t *dcl_r;
+cvar_t *dcl_g;
+cvar_t *dcl_b;
+cvar_t *dcl_alpha;
+cvar_t *dcl_dolighting;
+cvar_t *dcl_doworld;
+cvar_t *dcl_doterrain;
+cvar_t *dcl_dobmodels;
+cvar_t *dcl_dostring;
+cvar_t *dcl_pathmode;
+cvar_t *dcl_maxsegment;
+cvar_t *dcl_minsegment;
+cvar_t *dcl_maxoffset;
+cvar_t *dcl_texturescale;
+
+static lmGlobals_t lm;
+
+vec3_t vec_upwards;
+
+lmEditMarkDef_t *R_AllocateMarkDef(void);
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+);
+void DCLC_Delete(void);
+void DCLC_GetInfo(void);
+
+/*
+=============
+DCLC_Save
+
+Save level marks into a DCL file
+=============
+*/
+void DCLC_Save(void)
+{
+    fileHandle_t       hFile;
+    dclHeader_t        header;
+    int                i, j;
+    int                iNumDecals, iNumFragments;
+    lmEditPoly_t      *pPoly;
+    lmEditMarkDef_t   *pMark;
+    bmodel_t          *pBmodel;
+    mnode_t           *pLeaf;
+    dclSavedMarkDef_t  saveMark;
+    dclSavedMarkPoly_t savePoly;
+    char               map_time[32];
+    int                littleValue;
+
+    hFile = ri.FS_OpenFileWrite(lm.szDCLFilename);
+    if (!hFile) {
+        ri.Printf(PRINT_ALL, "R_SaveDCLFile: couldn't write to %s\n", lm.szDCLFilename);
+    }
+
+    pMark         = lm.activeMarkDefs.pNextMark;
+    iNumDecals    = 0;
+    iNumFragments = 0;
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark, iNumDecals++) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; iNumFragments++) {
+            pPoly->viewCount = iNumFragments;
+            pPoly            = pPoly->pNextPoly;
+        }
+    }
+
+    header.ident         = DCL_FILE_SIGNATURE;
+    header.version       = LittleLong(DCL_FILE_VERSION);
+    header.checksum      = 0;
+    header.iNumDecals    = LittleLong(iNumDecals);
+    header.iNumFragments = LittleLong(iNumFragments);
+
+    ri.FS_Write(&header, sizeof(header), hFile);
+
+    //
+    // Write the map time
+    //
+    memset(map_time, 0, sizeof(map_time));
+    Q_strncpyz(map_time, ri.CM_MapTime(), sizeof(map_time));
+    ri.FS_Write(map_time, sizeof(map_time), hFile);
+
+    if (!iNumDecals) {
+        //
+        // Nothing to write
+        //
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        Q_strncpyz(saveMark.shader, pMark->markShader->name, sizeof(saveMark.shader));
+
+        saveMark.vPos[0]        = LittleFloat(pMark->vPos[0]);
+        saveMark.vPos[1]        = LittleFloat(pMark->vPos[1]);
+        saveMark.vPos[2]        = LittleFloat(pMark->vPos[2]);
+        saveMark.vProjection[0] = LittleFloat(pMark->vProjection[0]);
+        saveMark.vProjection[1] = LittleFloat(pMark->vProjection[1]);
+        saveMark.vProjection[2] = LittleFloat(pMark->vProjection[2]);
+
+        saveMark.fRadius      = LittleFloat(pMark->fRadius);
+        saveMark.fHeightScale = LittleFloat(pMark->fHeightScale);
+        saveMark.fWidthScale  = LittleFloat(pMark->fWidthScale);
+        saveMark.fRotation    = LittleFloat(pMark->fRotation);
+
+        saveMark.color[0] = LittleFloat(pMark->color[0]);
+        saveMark.color[1] = LittleFloat(pMark->color[1]);
+        saveMark.color[2] = LittleFloat(pMark->color[2]);
+        saveMark.color[3] = LittleFloat(pMark->color[3]);
+
+        saveMark.bDoLighting = LittleLong(pMark->bDoLighting);
+
+        ri.FS_Write(&saveMark, sizeof(saveMark), hFile);
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            Q_strncpyz(savePoly.shader, pMark->markShader->name, sizeof(savePoly.shader));
+
+            savePoly.fogIndex  = 0;
+            savePoly.iIndex    = LittleLong(pPoly->surf.iIndex);
+            savePoly.iNumVerts = LittleLong(pPoly->surf.numVerts);
+
+            ri.FS_Write(&savePoly, sizeof(savePoly), hFile);
+            ri.FS_Write(pPoly->verts, sizeof(pPoly->verts[0]) * savePoly.iNumVerts, hFile);
+        }
+    }
+
+    for (i = 0; i < tr.world->numBModels; i++) {
+        pBmodel = &tr.world->bmodels[i];
+
+        if (!pBmodel->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pBmodel->iNumMarkFragment);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pBmodel->iNumMarkFragment; i++) {
+            littleValue = ((lmPoly_t *)pBmodel->pFirstMarkFragment[j])->viewCount;
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+        pLeaf = &tr.world->nodes[i];
+
+        if (!pLeaf->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pLeaf->iNumMarkFragment);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+            littleValue = ((lmPoly_t *)pLeaf->pFirstMarkFragment[j])->viewCount;
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+}
+
+/*
+=============
+R_LevelMarksLoad
+
+Load level marks from a DCL file
+=============
+*/
+void R_LevelMarksLoad(const char *szBSPName)
+{
+    int          i;
+    int          iLength;
+    fileHandle_t hFile;
+    dclHeader_t  dclHeader;
+    const char  *real_map_time;
+    char         map_time[33];
+
+    if (lm.bLevelMarksLoaded) {
+        //
+        // Destroy and reallocate level marks
+        //
+
+        R_LevelMarksFree();
+        R_LevelMarksInit();
+    }
+
+    COM_StripExtension(szBSPName, lm.szDCLFilename, sizeof(lm.szDCLFilename));
+    Q_strcat(lm.szDCLFilename, sizeof(lm.szDCLFilename), ".dcl");
+
+    if (ri.FS_OpenFile(lm.szDCLFilename, &hFile, qtrue, qtrue) <= 0) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s not found\n", lm.szDCLFilename);
+        return;
+    }
+
+    lm.bLevelMarksLoaded = qtrue;
+
+    //
+    // Read the DCL file header
+    //
+
+    iLength = ri.FS_Read(&dclHeader, sizeof(dclHeader), hFile);
+    if (iLength < sizeof(dclHeader)) {
+        ri.FS_CloseFile(hFile);
+        ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+        return;
+    }
+
+    //
+    // Signature and version checks
+    //
+
+    if (dclHeader.ident != DCL_FILE_SIGNATURE) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s Seems to be an invalid DCL file\n", lm.szDCLFilename);
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
+        ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);
+    }
+
+    if (dclHeader.version != DCL_FILE_OLD_VERSION && dclHeader.version != DCL_FILE_VERSION) {
+        ri.Printf(
+            PRINT_ALL,
+            "R_LevelMarksLoad: %s is wrong version (%i should be %i)\n",
+            lm.szDCLFilename,
+            dclHeader.version,
+            DCL_FILE_VERSION
+        );
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    if (dclHeader.version == DCL_FILE_OLD_VERSION) {
+        //
+        // The old version has no map time
+        //
+        map_time[0] = 0;
+    } else {
+        map_time[32] = 0;
+        ri.FS_Read(map_time, sizeof(map_time) - 1, hFile);
+    }
+
+    ri.Printf(PRINT_ALL, "----------- Loading DCL file %s ---------\n", lm.szDCLFilename);
+
+    if (dcl_editmode->integer) {
+        dclSavedMarkDef_t saveMark;
+        lmEditMarkDef_t  *pMark;
+        qhandle_t         hShader;
+
+        //
+        // Load all editor-mode decals
+        //
+
+        for (i = 0; i < dclHeader.iNumDecals; i++) {
+            ri.FS_Read(&saveMark, sizeof(saveMark), hFile);
+
+            saveMark.vPos[0]        = LittleFloat(saveMark.vPos[0]);
+            saveMark.vPos[1]        = LittleFloat(saveMark.vPos[1]);
+            saveMark.vPos[2]        = LittleFloat(saveMark.vPos[2]);
+            saveMark.vProjection[0] = LittleFloat(saveMark.vProjection[0]);
+            saveMark.vProjection[1] = LittleFloat(saveMark.vProjection[1]);
+            saveMark.vProjection[2] = LittleFloat(saveMark.vProjection[2]);
+
+            saveMark.fRadius      = LittleFloat(saveMark.fRadius);
+            saveMark.fHeightScale = LittleFloat(saveMark.fHeightScale);
+            saveMark.fWidthScale  = LittleFloat(saveMark.fWidthScale);
+            saveMark.fRotation    = LittleFloat(saveMark.fRotation);
+
+            saveMark.color[0] = LittleFloat(saveMark.color[0]);
+            saveMark.color[1] = LittleFloat(saveMark.color[1]);
+            saveMark.color[2] = LittleFloat(saveMark.color[2]);
+            saveMark.color[3] = LittleFloat(saveMark.color[3]);
+
+            saveMark.bDoLighting = LittleLong(saveMark.bDoLighting);
+
+            pMark = R_AllocateMarkDef();
+            if (!pMark) {
+                break;
+            }
+
+            hShader = RE_RegisterShader(saveMark.shader);
+            if (hShader) {
+                pMark->markShader = R_GetShaderByHandle(hShader);
+            } else {
+                ri.Printf(PRINT_ALL, "Bad decal shader %s\n", saveMark.shader);
+                pMark->markShader = tr.defaultShader;
+            }
+
+            //
+            // Copy settings from the saved mark
+            // to the newly allocated mark def
+            //
+
+            VectorCopy(saveMark.vPos, pMark->vPos);
+            VectorCopy(saveMark.vProjection, pMark->vProjection);
+
+            pMark->fRadius      = saveMark.fRadius;
+            pMark->fWidthScale  = saveMark.fWidthScale;
+            pMark->fHeightScale = saveMark.fHeightScale;
+            pMark->fRotation    = saveMark.fRotation;
+
+            Vector4Copy(saveMark.color, pMark->color);
+            pMark->bDoLighting = saveMark.bDoLighting;
+
+            lm.pCurrentMark = pMark;
+
+            //
+            // Now add the loaded mark
+            //
+
+            if (!R_ApplyLevelDecal(pMark->vPos, pMark->vProjection, qtrue, qtrue, 0)) {
+                DCLC_Delete();
+            }
+        }
+    } else {
+        int                j;
+        int                iIndex;
+        dclSavedMarkPoly_t savePoly;
+        lmPoly_t          *pPoly;
+        shader_t          *shader;
+        qhandle_t          hShader;
+        char               szLastShaderName[MAX_RES_NAME];
+        bmodel_t          *pBmodel;
+        mnode_t           *pLeaf;
+
+        szLastShaderName[0] = 0;
+        real_map_time       = ri.CM_MapTime();
+
+        if (!*real_map_time || strcmp(real_map_time, map_time)) {
+            ri.Printf(PRINT_ALL, "!!! BSP file is newer than DCL file.\n");
+            ri.Printf(PRINT_ALL, "!!! The DCL file needs to be updated.\n");
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        if (!dclHeader.iNumDecals) {
+            //
+            // Nothing to load
+            //
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        //
+        // Skip editor stuff
+        //
+        ri.FS_Seek(hFile, sizeof(dclSavedMarkDef_t) * dclHeader.iNumDecals, FS_SEEK_CUR);
+
+        //
+        // Load all saved polys
+        //
+
+        lm.pMarkFragments = (lmPoly_t *)ri.Hunk_Alloc(sizeof(lmPoly_t) * dclHeader.iNumFragments, h_low);
+
+        for (i = 0; i < dclHeader.iNumFragments; i++) {
+            polyVert_t *pv;
+
+            ri.FS_Read(&savePoly, sizeof(savePoly), hFile);
+
+            savePoly.fogIndex  = LittleLong(savePoly.fogIndex);
+            savePoly.iIndex    = LittleLong(savePoly.iIndex);
+            savePoly.iNumVerts = LittleLong(savePoly.iNumVerts);
+
+            pPoly = &lm.pMarkFragments[i];
+
+            //
+            // Make sure to register the shader once
+            //
+            if (Q_stricmp(savePoly.shader, szLastShaderName)) {
+                hShader = RE_RegisterShader(savePoly.shader);
+                if (!hShader) {
+                    // Added in 2.30
+                    //  Don't mess with decal loading, so drop immediately
+                    Com_Error(ERR_DROP, "Decal file lists non-existant shader: %s", savePoly.shader);
+
+                    pPoly->shader           = tr.defaultShader;
+                    pPoly->surf.iIndex      = 0;
+                    pPoly->surf.surfaceType = SF_SKIP;
+                    pPoly->surf.numVerts    = 0;
+                    continue;
+                }
+
+                shader = R_GetShaderByHandle(hShader);
+                Q_strncpyz(szLastShaderName, savePoly.shader, sizeof(szLastShaderName));
+            }
+
+            pPoly->shader           = shader;
+            pPoly->surf.iIndex      = savePoly.iIndex;
+            pPoly->surf.surfaceType = SF_MARK_FRAG;
+
+            //
+            // Load vertices
+            //
+
+            pPoly->surf.numVerts = savePoly.iNumVerts;
+            pPoly->surf.verts    = (polyVert_t *)ri.Hunk_Alloc(sizeof(polyVert_t) * savePoly.iNumVerts, h_low);
+            ri.FS_Read(pPoly->surf.verts, sizeof(polyVert_t) * savePoly.iNumVerts, hFile);
+
+            for (j = 0; j < savePoly.iNumVerts; j++) {
+                pv = &pPoly->surf.verts[j];
+
+                pv->xyz[0] = LittleFloat(pv->xyz[0]);
+                pv->xyz[1] = LittleFloat(pv->xyz[1]);
+                pv->xyz[2] = LittleFloat(pv->xyz[2]);
+                pv->st[0]  = LittleFloat(pv->st[0]);
+                pv->st[1]  = LittleFloat(pv->st[1]);
+            }
+        }
+
+        //
+        // Load all brush models
+        //
+        for (i = 0; i < tr.world->numBModels; i++) {
+            pBmodel = &tr.world->bmodels[i];
+
+            ri.FS_Read(&pBmodel->iNumMarkFragment, sizeof(int), hFile);
+            pBmodel->iNumMarkFragment = LittleLong(pBmodel->iNumMarkFragment);
+
+            //
+            // Load brush model fragments
+            //
+            if (pBmodel->iNumMarkFragment) {
+                pBmodel->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pBmodel->iNumMarkFragment, h_low);
+
+                for (j = 0; j < pBmodel->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pBmodel->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+
+        //
+        // Load all leafs
+        //
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            pLeaf = &tr.world->nodes[i];
+
+            ri.FS_Read(&pLeaf->iNumMarkFragment, sizeof(int), hFile);
+            pLeaf->iNumMarkFragment = LittleLong(pLeaf->iNumMarkFragment);
+
+            if (pLeaf->iNumMarkFragment) {
+                pLeaf->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pLeaf->iNumMarkFragment, h_low);
+
+                //
+                // Load leaf fragments
+                //
+                for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pLeaf->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+    ri.Printf(0, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+}
+
+/*
+=============
+R_RemoveEditPolyFromPointerList
+
+=============
+*/
+void R_RemoveEditPolyFromPointerList(lmEditPoly_t *pPoly, void **pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    for (i = 0; i < *piNumFragments; i++, pFragmentList++) {
+        if (*pFragmentList == pPoly) {
+            *pFragmentList = NULL;
+        }
+
+        if (!*pFragmentList && i < *piNumFragments - 1) {
+            *pFragmentList   = pFragmentList[1];
+            pFragmentList[1] = NULL;
+        }
+    }
+
+    (*piNumFragments)--;
+}
+
+/*
+=============
+R_FreeMarkFragments
+
+Free up all allocated marks
+=============
+*/
+void R_FreeMarkFragments(lmEditMarkDef_t *pMark)
+{
+    lmEditPoly_t *pPoly;
+    int           i;
+
+    while ((pPoly = pMark->pMarkEditPolys)) {
+        pMark->pMarkEditPolys = pPoly->pNextPoly;
+
+        if (pPoly->surf.iIndex < 0) {
+            //
+            // It's a brush model
+            //
+            bmodel_t *pBmodel;
+
+            pBmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+
+            R_RemoveEditPolyFromPointerList(pPoly, pBmodel->pFirstMarkFragment, &pBmodel->iNumMarkFragment);
+            continue;
+        } else {
+            //
+            // It's a leaf
+            //
+            mnode_t *pLeaf;
+
+            for (i = 0; i < pPoly->iNumLeafs; i++) {
+                pLeaf = pPoly->pLeafs[i];
+
+                R_RemoveEditPolyFromPointerList(pPoly, pLeaf->pFirstMarkFragment, &pLeaf->iNumMarkFragment);
+            }
+        }
+
+        pPoly->pNextPoly  = lm.pFreeEditPolys;
+        lm.pFreeEditPolys = pPoly;
+    }
+
+    pMark->iNumEditPolys = 0;
+}
+
+/*
+=============
+R_InitMarkDef
+
+Applies default values to the specified mark definition
+=============
+*/
+void R_InitMarkDef(lmEditMarkDef_t *pMark)
+{
+    VectorClear(pMark->vPos);
+    VectorSet(pMark->vProjection, 0, 0, -1);
+    pMark->fRadius        = 8.0;
+    pMark->fHeightScale   = 1.0;
+    pMark->fWidthScale    = 1.0;
+    pMark->fRotation      = 0.0;
+    pMark->markShader     = tr.defaultShader;
+    pMark->color[0]       = NAN;
+    pMark->bDoLighting    = 1;
+    pMark->pMarkEditPolys = 0;
+    pMark->iNumEditPolys  = 0;
+}
+
+/*
+=============
+R_AllocateMarkDef
+
+Allocates a new mark definition for editing
+=============
+*/
+lmEditMarkDef_t *R_AllocateMarkDef(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    int              i;
+
+    if (!lm.pFreeMarkDefs) {
+        lm.pFreeMarkDefs = (lmEditMarkDef_t *)ri.Hunk_Alloc(sizeof(lmEditMarkDef_t) * MAX_MARK_FRAGMENTS, h_low);
+        if (!lm.pFreeMarkDefs) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_FRAGMENTS - 1; i++) {
+            lm.pFreeMarkDefs[i].pNextMark = &lm.pFreeMarkDefs[i + 1];
+        }
+        lm.pFreeMarkDefs[MAX_MARK_FRAGMENTS - 1].pNextMark = NULL;
+    }
+
+    pNewMark         = lm.pFreeMarkDefs;
+    lm.pFreeMarkDefs = lm.pFreeMarkDefs->pNextMark;
+
+    pNewMark->pNextMark = lm.activeMarkDefs.pNextMark;
+    pNewMark->pPrevMark = &lm.activeMarkDefs;
+
+    lm.activeMarkDefs.pNextMark->pPrevMark = pNewMark;
+    lm.activeMarkDefs.pNextMark            = pNewMark;
+
+    R_InitMarkDef(pNewMark);
+    return pNewMark;
+}
+
+/*
+=============
+R_AllocateEditPoly
+
+Allocates a new mark poly for editing
+=============
+*/
+lmEditPoly_t *R_AllocateEditPoly(void)
+{
+    lmEditPoly_t *pNewPoly;
+    int           i;
+
+    if (!lm.pFreeEditPolys) {
+        lm.pFreeEditPolys = (lmEditPoly_t *)ri.Hunk_Alloc(sizeof(lmEditPoly_t) * MAX_MARK_POLYVERTS, h_low);
+        if (!lm.pFreeEditPolys) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_POLYVERTS - 1; i++) {
+            lm.pFreeEditPolys[i].pNextPoly = &lm.pFreeEditPolys[i + 1];
+        }
+        lm.pFreeEditPolys[MAX_MARK_POLYVERTS - 1].pNextPoly = NULL;
+    }
+
+    pNewPoly                   = lm.pFreeEditPolys;
+    lm.pFreeEditPolys          = lm.pFreeEditPolys->pNextPoly;
+    pNewPoly->surf.surfaceType = SF_MARK_FRAG;
+    pNewPoly->surf.verts       = pNewPoly->verts;
+
+    return pNewPoly;
+}
+
+/*
+=============
+R_AddEditPolyToPointerList
+
+=============
+*/
+qboolean R_AddEditPolyToPointerList(lmEditPoly_t *pPoly, void ***pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    if (!*pFragmentList || (*pFragmentList)[*piNumFragments] == (void *)-1) {
+        void **pNewList = (void **)ri.Malloc((*piNumFragments + MAX_MARK_FRAGMENTS) * sizeof(void *));
+        if (!pNewList) {
+            return 0;
+        }
+
+        for (i = 0; i < *piNumFragments + MAX_MARK_FRAGMENTS; i++) {
+            pNewList[i] = NULL;
+        }
+        pNewList[*piNumFragments + MAX_MARK_FRAGMENTS - 1] = (void *)-1;
+
+        if (*pFragmentList) {
+            Com_Memcpy(pNewList, *pFragmentList, *piNumFragments * sizeof(void *));
+            ri.Free(*pFragmentList);
+        }
+
+        *pFragmentList = pNewList;
+    }
+
+    (*pFragmentList)[*piNumFragments] = pPoly;
+    (*piNumFragments)++;
+
+    return qtrue;
+}
+
+/*
+=============
+R_ApplyLevelDecal
+
+=============
+*/
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+)
+{
+    qboolean         bDoLighting;
+    qboolean         bDoMerge;
+    int              i, j, k, l;
+    int              iNumFragments;
+    float            fRadius;
+    float            fSScale, fTScale;
+    float            fR, fG, fB, fA;
+    float            fRoll;
+    shader_t        *shader;
+    qhandle_t        hShader;
+    lmEditMarkDef_t *pMark;
+    lmEditPoly_t    *pPoly;
+    vec3_t           vOrigin;
+    vec3_t           vProjection;
+    vec3_t           vTmp, vTmp2;
+    vec3_t           vNorm, vNorm2;
+    vec3_t           bounds[2];
+    markFragment_t   markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t  *mf, *mf2;
+    polyVert_t       verts[MAX_MARK_POLYVERTS];
+    bmodel_t        *pBModel;
+    mnode_t         *pNode;
+    int              iNumNewVerts, iNumMergeVerts;
+    int              iFirstEdgeVert, iFirstEdgeVert2;
+    polyVert_t      *pNewVerts[8];
+    polyVert_t      *pFragVerts;
+    polyVert_t      *pMergeVerts[16];
+    float            fDist, fDist2;
+
+    iFirstEdgeVert = iFirstEdgeVert2 = 0;
+
+    if (bUseCurrent && !lm.pCurrentMark) {
+        return NULL;
+    }
+
+    if (iPathIndex) {
+        shader = R_GetShaderByHandle(lm.treadMark.hTreadShader);
+
+        fRadius = lm.treadMark.fWidth;
+        fTScale = 1.0;
+        fSScale = 1.0;
+
+        fG = 1.0;
+        fR = 1.0;
+        fA = 1.0;
+        fB = 1.0;
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = -1.0;
+    } else if (bUseCurrent && bUseCurrentSettings) {
+        shader = lm.pCurrentMark->markShader;
+
+        fRadius = lm.pCurrentMark->fRadius;
+        fSScale = lm.pCurrentMark->fWidthScale;
+        fTScale = lm.pCurrentMark->fHeightScale;
+
+        fR = lm.pCurrentMark->color[0];
+        fG = lm.pCurrentMark->color[1];
+        fB = lm.pCurrentMark->color[2];
+        fA = lm.pCurrentMark->color[3];
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = lm.pCurrentMark->fRotation;
+    } else {
+        hShader = RE_RegisterShader(dcl_shader->string);
+        if (hShader) {
+            shader = R_GetShaderByHandle(hShader);
+        } else {
+            ri.Printf(PRINT_ALL, "Bad decal shader %s\n", dcl_shader->string);
+            shader = tr.defaultShader;
+        }
+
+        fRadius = dcl_radius->value;
+        fSScale = dcl_widthscale->value;
+        fTScale = dcl_heightscale->value;
+
+        fR = Q_clamp_float(dcl_r->value, 0.0, 1.0);
+        fG = Q_clamp_float(dcl_g->value, 0.0, 1.0);
+        fB = Q_clamp_float(dcl_b->value, 0.0, 1.0);
+        fA = Q_clamp_float(dcl_alpha->value, 0.0, 1.0);
+
+        bDoLighting = dcl_dolighting->integer != 0;
+        fRoll       = anglemod(dcl_rotation->value);
+    }
+
+    if (fRadius < 0.0) {
+        fRadius = 0.001;
+    }
+    if (fSScale < 0.0) {
+        fSScale = 0.001;
+    }
+    if (fTScale < 0.0) {
+        fTScale = 0.001;
+    }
+
+    VectorCopy(vPos, vOrigin);
+    VectorNormalize2(vDir, vProjection);
+
+    if (iPathIndex) {
+        iNumFragments =
+            ri.CG_PermanentTreadMarkDecal(&lm.treadMark, iPathIndex == 1, bDoLighting, markFragments, verts);
+    } else {
+        iNumFragments = ri.CG_PermanentMark(
+            vOrigin,
+            vProjection,
+            anglemod(fRoll + 90),
+            fSScale * fRadius,
+            fTScale * fRadius,
+            fR,
+            fG,
+            fB,
+            fA,
+            bDoLighting,
+            0.5,
+            0.5,
+            markFragments,
+            verts
+        );
+    }
+
+    if (!iNumFragments) {
+        return NULL;
+    }
+
+    if (bUseCurrent) {
+        pMark = lm.pCurrentMark;
+        R_FreeMarkFragments(lm.pCurrentMark);
+    } else {
+        pMark = R_AllocateMarkDef();
+        if (!pMark) {
+            return NULL;
+        }
+    }
+
+    VectorCopy(vOrigin, pMark->vPos);
+    VectorCopy(vProjection, pMark->vProjection);
+
+    pMark->markShader   = shader;
+    pMark->fRadius      = fRadius;
+    pMark->fWidthScale  = fSScale;
+    pMark->fHeightScale = fTScale;
+    VectorSet4(pMark->color, fR, fG, fB, fA);
+
+    pMark->bDoLighting = bDoLighting;
+    pMark->fRotation   = fRoll;
+
+    if (iPathIndex) {
+        if (iPathIndex == 1) {
+            VectorCopy(lm.treadMark.vStartVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vStartVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[3]);
+        } else {
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vEndVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vEndVerts[1], pMark->vPathCorners[3]);
+        }
+
+        VectorClear(vOrigin);
+
+        for (i = 0; i < 4; i++) {
+            VectorAdd(vOrigin, pMark->vPathCorners[i], vOrigin);
+        }
+
+        vOrigin[0] /= 4.0;
+        vOrigin[1] /= 4.0;
+        vOrigin[2] = vOrigin[2] / 4.0 + 16.0;
+        VectorCopy(vOrigin, pMark->vPos);
+    }
+
+    for (i = 0; i < iNumFragments; i++) {
+        mf = &markFragments[i];
+
+        if (!mf->numPoints) {
+            continue;
+        }
+
+        assert(mf->numPoints >= 3);
+
+        iNumNewVerts = mf->numPoints;
+        for (j = 0; j < mf->numPoints; ++j) {
+            pNewVerts[j] = &verts[mf->firstPoint + j];
+        }
+
+        VectorSubtract(pNewVerts[0]->xyz, pNewVerts[1]->xyz, vTmp);
+        VectorSubtract(pNewVerts[2]->xyz, pNewVerts[1]->xyz, vTmp2);
+        CrossProduct(vTmp, vTmp2, vNorm);
+        VectorNormalize(vNorm);
+
+        fDist = DotProduct(vNorm, pNewVerts[0]->xyz);
+
+        if (mf->iIndex <= 0) {
+            for (j = i + 1; j < iNumFragments; j++) {
+                mf2 = &markFragments[j];
+
+                if (!mf2->numPoints) {
+                    continue;
+                }
+                if (mf2->iIndex > 0 || mf->iIndex == mf2->iIndex) {
+                    continue;
+                }
+
+                pFragVerts = &verts[mf2->firstPoint];
+
+                if (fabs(DotProduct(vNorm, pFragVerts->xyz) - fDist) > 0.01) {
+                    continue;
+                }
+
+                VectorSubtract(pFragVerts[0].xyz, pFragVerts[1].xyz, vTmp);
+                VectorSubtract(pFragVerts[2].xyz, pFragVerts[1].xyz, vTmp2);
+                CrossProduct(vTmp, vTmp2, vNorm2);
+                VectorNormalize(vNorm2);
+
+                if (!VectorCompare(vNorm, vNorm2)) {
+                    continue;
+                }
+
+                bDoMerge = qfalse;
+                for (k = 0; k < iNumNewVerts; k++) {
+                    for (l = 0; l < mf2->numPoints; l++) {
+                        if (VectorCompare(pNewVerts[k]->xyz, pFragVerts[(l + 1) % mf2->numPoints].xyz)
+                            && VectorCompare(pNewVerts[(k + 1) % iNumNewVerts]->xyz, pFragVerts[l].xyz)) {
+                            bDoMerge        = 1;
+                            iFirstEdgeVert  = k;
+                            iFirstEdgeVert2 = l;
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        break;
+                    }
+                }
+
+                if (bDoMerge) {
+                    iNumMergeVerts = 0;
+                    for (k = 1; k < iNumNewVerts; ++k) {
+                        pMergeVerts[iNumMergeVerts++] = pNewVerts[(k + iFirstEdgeVert) % iNumNewVerts];
+                    }
+
+                    for (k = 1; k < mf2->numPoints; k++) {
+                        pMergeVerts[iNumMergeVerts++] = &pFragVerts[(k + iFirstEdgeVert2) % mf2->numPoints];
+                    }
+
+                    bDoMerge = qtrue;
+
+                    for (k = 0; k < iNumMergeVerts; k++) {
+                        VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                        CrossProduct(vNorm, vTmp, vNorm2);
+                        VectorNormalize(vNorm2);
+
+                        for (l = 0; l < iNumMergeVerts; l++) {
+                            if (l == k) {
+                                break;
+                            }
+
+                            if (DotProduct(pMergeVerts[l]->xyz, vNorm)
+                                > DotProduct(pMergeVerts[k]->xyz, vNorm2) + 0.01) {
+                                bDoMerge = qfalse;
+                                break;
+                            }
+                        }
+
+                        if (!bDoMerge) {
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        for (k = 0; k < iNumMergeVerts; k++) {
+                            VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                            VectorNormalize(vTmp);
+                            VectorSubtract(
+                                pMergeVerts[k]->xyz, pMergeVerts[(iNumMergeVerts + k - 1) % iNumMergeVerts]->xyz, vTmp
+                            );
+                            VectorNormalize(vTmp2);
+
+                            if (DotProduct(vTmp, vTmp2) > 0.999) {
+                                for (l = k + 1; l < iNumMergeVerts; l++) {
+                                    pMergeVerts[l - 1] = pMergeVerts[l];
+                                }
+                            }
+                        }
+
+                        if (iNumMergeVerts <= 8) {
+                            iNumNewVerts = iNumMergeVerts;
+                            for (k = 0; k < iNumMergeVerts; k++) {
+                                pNewVerts[k] = pMergeVerts[k];
+                            }
+
+                            mf2->numPoints = 0;
+                        }
+                    }
+                }
+            }
+        }
+
+        pPoly = R_AllocateEditPoly();
+        if (!pPoly) {
+            return pMark;
+        }
+
+        pPoly->shader        = shader;
+        pPoly->surf.numVerts = iNumNewVerts;
+
+        for (j = 0; j < iNumNewVerts; j++) {
+            memcpy(&pPoly->verts[j], pNewVerts[j], sizeof(polyVert_t));
+        }
+
+        pPoly->surf.iIndex = mf->iIndex;
+        pPoly->iNumLeafs   = 0;
+
+        if (mf->iIndex <= 0 || dcl_doworld->integer && dcl_doterrain->integer) {
+            if (mf->iIndex >= 0) {
+                if (dcl_doworld->integer) {
+                    ClearBounds(bounds[0], bounds[1]);
+                    VectorClear(vOrigin);
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorAdd(pPoly->verts[j].xyz, vNorm, vTmp);
+
+                        pNode = R_PointInLeaf(vTmp);
+                        if (pNode && pNode->contents != -1 && !(pNode->contents & CONTENTS_SOLID)) {
+                            for (k = 0; k < pPoly->iNumLeafs; k++) {
+                                if (pPoly->pLeafs[k] == pNode) {
+                                    break;
+                                }
+                            }
+
+                            if (k == pPoly->iNumLeafs) {
+                                R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                                pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                                pPoly->iNumLeafs++;
+                            }
+                        }
+
+                        AddPointToBounds(vTmp, bounds[0], bounds[1]);
+                        VectorAdd(vOrigin, vTmp, vOrigin);
+                    }
+
+                    VectorScale(vOrigin, 1.0 / pPoly->surf.numVerts, vOrigin);
+
+                    pNode = R_PointInLeaf(vOrigin);
+                    for (k = 0; k < pPoly->iNumLeafs; k++) {
+                        if (pPoly->pLeafs[k] == pNode) {
+                            break;
+                        }
+                    }
+
+                    if (k == pPoly->iNumLeafs) {
+                        R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                        pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                        pPoly->iNumLeafs++;
+                    }
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            } else {
+                if (dcl_dobmodels->integer) {
+                    R_AddEditPolyToPointerList(
+                        pPoly,
+                        &tr.world->bmodels[-mf->iIndex].pFirstMarkFragment,
+                        &tr.world->bmodels[-mf->iIndex].iNumMarkFragment
+                    );
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            }
+        }
+    }
+
+    return pMark;
+}
+
+/*
+=============
+DCLC_Make
+
+=============
+*/
+void DCLC_Make(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    vec3_t           vProjection;
+
+    VectorNegate(tr.refdef.viewaxis[0], vProjection);
+
+    pNewMark = R_ApplyLevelDecal(tr.refdef.vieworg, vProjection, qfalse, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
+}
+
+/*
+=============
+DCLC_Reapply
+
+=============
+*/
+void DCLC_Reapply(void)
+{
+    lmEditMarkDef_t *pNewMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    pNewMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
+}
+
+/*
+=============
+DCLC_Delete
+
+=============
+*/
+void DCLC_Delete(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    R_FreeMarkFragments(lm.pCurrentMark);
+    lm.pCurrentMark = pMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = pMark->pPrevMark;
+        if (lm.pCurrentMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = NULL;
+        }
+    }
+
+    pMark->pPrevMark->pNextMark = pMark->pNextMark;
+    pMark->pNextMark->pPrevMark = pMark->pPrevMark;
+    pMark->pNextMark            = lm.pFreeMarkDefs;
+    pMark->pPrevMark            = 0;
+    lm.pFreeMarkDefs            = pMark;
+
+    if (dcl_autogetinfo->integer) {
+        lm.bAutoApplySettings = qtrue;
+        DCLC_GetInfo();
+    } else {
+        lm.bAutoApplySettings = qfalse;
+    }
+}
+
+/*
+=============
+DCLC_SelectNext
+
+=============
+*/
+void DCLC_SelectNext(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pPrevMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pPrevMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        if (lm.activeMarkDefs.pPrevMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
+}
+
+/*
+=============
+DCLC_SelectPrev
+
+=============
+*/
+void DCLC_SelectPrev(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pNextMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        if (lm.activeMarkDefs.pNextMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
+}
+
+/*
+=============
+DCLC_SelectCh
+
+=============
+*/
+void DCLC_SelectCh(void)
+{
+    // Nothing to do
+}
+
+/*
+=============
+DCLC_SelectChNxt
+
+=============
+*/
+void DCLC_SelectChNxt(void)
+{
+    // Nothing to do
+}
+
+/*
+=============
+DCLC_GetInfo
+
+=============
+*/
+void DCLC_GetInfo(void)
+{
+    if (!lm.pCurrentMark) {
+        return;
+    }
+
+    if (lm.pCurrentMark->fRotation == -1) {
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+    } else {
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+        ri.Cvar_SetValue("dcl_rotation", lm.pCurrentMark->fRotation);
+        ri.Cvar_SetValue("dcl_r", lm.pCurrentMark->color[0]);
+        ri.Cvar_SetValue("dcl_g", lm.pCurrentMark->color[1]);
+        ri.Cvar_SetValue("dcl_b", lm.pCurrentMark->color[2]);
+    }
+
+    ri.Cvar_SetValue("dcl_alpha", lm.pCurrentMark->color[3]);
+    ri.Cvar_SetValue("dcl_dolighting", lm.pCurrentMark->bDoLighting);
+
+    lm.bAutoApplySettings = qtrue;
+}
+
+/*
+=============
+DCLC_ShiftUp
+
+=============
+*/
+void DCLC_ShiftUp(void)
+{
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftDown
+
+=============
+*/
+void DCLC_ShiftDown(void)
+{
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftLeft
+
+=============
+*/
+void DCLC_ShiftLeft(void)
+{
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftRight
+
+=============
+*/
+void DCLC_ShiftRight(void)
+{
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_RandomRoll
+
+=============
+*/
+void DCLC_RandomRoll(void)
+{
+    ri.Cvar_SetValue("dcl_rotation", random() * 360.0);
+}
+
+/*
+=============
+R_LevelMarksInit
+
+Initialize the level mark system with variables and commands
+=============
+*/
+void R_LevelMarksInit()
+{
+    memset(&lm, 0, sizeof(lm));
+
+    dcl_editmode     = ri.Cvar_Get("dcl_editmode", "0", CVAR_LATCH);
+    dcl_showcurrent  = ri.Cvar_Get("dcl_showcurrent", "1", 0);
+    dcl_autogetinfo  = ri.Cvar_Get("dcl_autogetinfo", "1", 0);
+    dcl_shiftstep    = ri.Cvar_Get("dcl_shiftstep", "4", 0);
+    dcl_shader       = ri.Cvar_Get("dcl_shader", "blastmark", 0);
+    dcl_radius       = ri.Cvar_Get("dcl_radius", "16", 0);
+    dcl_heightscale  = ri.Cvar_Get("dcl_heightscale", "1", 0);
+    dcl_widthscale   = ri.Cvar_Get("dcl_widthscale", "1", 0);
+    dcl_rotation     = ri.Cvar_Get("dcl_rotation", "0", 0);
+    dcl_r            = ri.Cvar_Get("dcl_r", "1", 0);
+    dcl_g            = ri.Cvar_Get("dcl_g", "1", 0);
+    dcl_b            = ri.Cvar_Get("dcl_b", "1", 0);
+    dcl_alpha        = ri.Cvar_Get("dcl_alpha", "1", 0);
+    dcl_dolighting   = ri.Cvar_Get("dcl_dolighting", "1", 0);
+    dcl_doworld      = ri.Cvar_Get("dcl_doworld", "1", 0);
+    dcl_doterrain    = ri.Cvar_Get("dcl_doterrain", "1", 0);
+    dcl_dobmodels    = ri.Cvar_Get("dcl_dobmodels", "1", 0);
+    dcl_dostring     = ri.Cvar_Get("dcl_dostring", "apply to all", 0);
+    dcl_pathmode     = ri.Cvar_Get("dcl_pathmode", "0", 0);
+    dcl_maxsegment   = ri.Cvar_Get("dcl_maxsegment", "512", 0);
+    dcl_minsegment   = ri.Cvar_Get("dcl_minsegment", "24", 0);
+    dcl_maxoffset    = ri.Cvar_Get("dcl_maxoffset", "10", 0);
+    dcl_texturescale = ri.Cvar_Get("dcl_texturescale", "32", 0);
+
+    if (dcl_editmode->integer) {
+        ri.Cmd_AddCommand("dclc_make", DCLC_Make);
+        ri.Cmd_AddCommand("dclc_reapply", DCLC_Reapply);
+        ri.Cmd_AddCommand("dclc_delete", DCLC_Delete);
+        ri.Cmd_AddCommand("dclc_selectnext", DCLC_SelectNext);
+        ri.Cmd_AddCommand("dclc_selectprev", DCLC_SelectPrev);
+        ri.Cmd_AddCommand("dclc_selectch", DCLC_SelectCh);
+        ri.Cmd_AddCommand("dclc_selectchnxt", DCLC_SelectChNxt);
+        ri.Cmd_AddCommand("dclc_getinfo", DCLC_GetInfo);
+        ri.Cmd_AddCommand("dclc_shiftup", DCLC_ShiftUp);
+        ri.Cmd_AddCommand("dclc_shiftdown", DCLC_ShiftDown);
+        ri.Cmd_AddCommand("dclc_shiftleft", DCLC_ShiftLeft);
+        ri.Cmd_AddCommand("dclc_shiftright", DCLC_ShiftRight);
+        ri.Cmd_AddCommand("dclc_randomroll", DCLC_RandomRoll);
+        ri.Cmd_AddCommand("dclc_save", DCLC_Save);
+
+        lm.activeMarkDefs.pNextMark = &lm.activeMarkDefs;
+        lm.activeMarkDefs.pPrevMark = &lm.activeMarkDefs;
+    }
+}
+
+/*
+=============
+R_LevelMarksFree
+
+Remove level marks commands and deallocate all memory
+=============
+*/
+void R_LevelMarksFree()
+{
+    int i;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    ri.Cmd_RemoveCommand("dclc_make");
+    ri.Cmd_RemoveCommand("dclc_reapply");
+    ri.Cmd_RemoveCommand("dclc_delete");
+    ri.Cmd_RemoveCommand("dclc_selectnext");
+    ri.Cmd_RemoveCommand("dclc_selectprev");
+    ri.Cmd_RemoveCommand("dclc_selectch");
+    ri.Cmd_RemoveCommand("dclc_selectchnxt");
+    ri.Cmd_RemoveCommand("dclc_getinfo");
+    ri.Cmd_RemoveCommand("dclc_shiftup");
+    ri.Cmd_RemoveCommand("dclc_shiftdown");
+    ri.Cmd_RemoveCommand("dclc_shiftleft");
+    ri.Cmd_RemoveCommand("dclc_shiftright");
+    ri.Cmd_RemoveCommand("dclc_randomroll");
+    ri.Cmd_RemoveCommand("dclc_save");
+
+    if (tr.world) {
+        for (i = 0; i < tr.world->numBModels; i++) {
+            bmodel_t *pBmodel = &tr.world->bmodels[i];
+
+            if (pBmodel->iNumMarkFragment && pBmodel->pFirstMarkFragment) {
+                ri.Free(pBmodel->pFirstMarkFragment);
+                pBmodel->pFirstMarkFragment = NULL;
+                pBmodel->iNumMarkFragment   = 0;
+            }
+        }
+
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            mnode_t *pLeaf = &tr.world->nodes[i];
+
+            if (pLeaf->iNumMarkFragment && pLeaf->pFirstMarkFragment) {
+                ri.Free(pLeaf->pFirstMarkFragment);
+                pLeaf->pFirstMarkFragment = NULL;
+                pLeaf->iNumMarkFragment   = 0;
+            }
+        }
+    }
+}
+
+/*
+=============
+R_InitTreadMark
+
+=============
+*/
+static void R_InitTreadMark(treadMark_t *treadMark)
+{
+    treadMark->iReferenceNumber = 0;
+    treadMark->iLastTime        = 0;
+    treadMark->hTreadShader     = 0;
+    treadMark->iState           = 0;
+    treadMark->fWidth           = 0;
+
+    VectorClear(treadMark->vStartDir);
+    VectorClear(treadMark->vStartVerts[0]);
+    VectorClear(treadMark->vStartVerts[1]);
+    treadMark->fStartTexCoord = 0;
+    treadMark->fStartAlpha    = 0;
+
+    VectorClear(treadMark->vMidPos);
+    VectorClear(treadMark->vMidVerts[0]);
+    VectorClear(treadMark->vMidVerts[1]);
+    treadMark->fMidTexCoord = 0;
+    treadMark->fMidAlpha    = 0;
+
+    VectorClear(treadMark->vEndPos);
+    VectorClear(treadMark->vEndVerts[0]);
+    VectorClear(treadMark->vEndVerts[1]);
+    treadMark->fEndTexCoord = 0;
+    treadMark->fEndAlpha    = 0;
+}
+
+/*
+=============
+R_UpdateLevelMarksSystem
+
+Draw lines for editing
+=============
+*/
+void R_UpdateLevelMarksSystem()
+{
+    int   iReturn;
+    float fAlpha;
+    float fTexScale;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    if (dcl_pathmode->integer) {
+        if (!lm.bPathLayingMode) {
+            R_InitTreadMark(&lm.treadMark);
+            lm.treadMark.iLastTime  = -1000;
+            lm.pTreadMarkStartDecal = NULL;
+            lm.pTreadMarkEndDecal   = NULL;
+            lm.bPathLayingMode      = qtrue;
+        }
+
+        lm.treadMark.hTreadShader = RE_RegisterShader(dcl_shader->string);
+        lm.treadMark.fWidth       = Q_clamp_float(dcl_radius->value * dcl_widthscale->value, 2, 1024);
+
+        fAlpha    = Q_clamp_float(dcl_alpha->value, 0, 1);
+        fTexScale = 1.0 / dcl_texturescale->value;
+        iReturn   = ri.CG_PermanentUpdateTreadMark(
+            &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+        );
+
+        if (iReturn == 1) {
+            lm.pTreadMarkStartDecal = lm.pTreadMarkEndDecal;
+            lm.pTreadMarkEndDecal   = NULL;
+
+            ri.CG_PermanentUpdateTreadMark(
+                &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+            );
+        }
+
+        if (iReturn != -1) {
+            if (!lm.pTreadMarkEndDecal) {
+                lm.pTreadMarkEndDecal = R_AllocateMarkDef();
+            }
+
+            if (lm.pTreadMarkEndDecal) {
+                lm.pCurrentMark = lm.pTreadMarkEndDecal;
+                lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 2);
+                if (!lm.pCurrentMark) {
+                    R_FreeMarkFragments(lm.pTreadMarkEndDecal);
+                }
+            }
+
+            if (lm.treadMark.iState == 3) {
+                if (!lm.pTreadMarkStartDecal) {
+                    lm.pTreadMarkStartDecal = R_AllocateMarkDef();
+                }
+
+                if (lm.pTreadMarkStartDecal) {
+                    lm.pCurrentMark = lm.pTreadMarkStartDecal;
+                    lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 1);
+                    if (!lm.pCurrentMark) {
+                        R_FreeMarkFragments(lm.pTreadMarkStartDecal);
+                    }
+                }
+            }
+        }
+
+        if (lm.pTreadMarkEndDecal) {
+            lm.pCurrentMark = lm.pTreadMarkEndDecal;
+        } else if (lm.pTreadMarkStartDecal) {
+            lm.pCurrentMark = lm.pTreadMarkStartDecal;
+        }
+
+    } else if (lm.bPathLayingMode) {
+        lm.bPathLayingMode = qfalse;
+    }
+
+    if (lm.bAutoApplySettings && lm.pCurrentMark && lm.pCurrentMark->fRotation != -1) {
+        qboolean bDoUpdate = qfalse;
+        float    f;
+
+        if (dcl_shader->modified) {
+            shader_t *shader;
+            qhandle_t hShader;
+
+            hShader = RE_RegisterShader(dcl_shader->string);
+            if (hShader) {
+                shader = R_GetShaderByHandle(hShader);
+                if (shader != tr.defaultShader && lm.pCurrentMark->markShader != shader) {
+                    lm.pCurrentMark->markShader = shader;
+                    // Set the decal radius
+                    ri.Cvar_SetValue("dcl_radius", 16.0);
+                    dcl_radius->modified = qfalse;
+
+                    // Set the decal scale
+                    ri.Cvar_SetValue(
+                        "dcl_heightscale", shader->stages[0]->bundle[0].image[0]->height / 16.0 * 0.5
+                    );
+                    ri.Cvar_SetValue("dcl_widthscale", shader->stages[0]->bundle[0].image[0]->width / 16.0 * 0.5);
+
+                    bDoUpdate = qtrue;
+                }
+            }
+            dcl_shader->modified = 0;
+        }
+
+        if (dcl_radius->modified) {
+            f = dcl_radius->value;
+            if (lm.pCurrentMark->fRadius != f) {
+                lm.pCurrentMark->fRadius = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_radius->modified = qfalse;
+        }
+
+        if (dcl_heightscale->modified) {
+            f = dcl_heightscale->value;
+            if (lm.pCurrentMark->fHeightScale != f) {
+                lm.pCurrentMark->fHeightScale = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_heightscale->modified = qfalse;
+        }
+        if (dcl_widthscale->modified) {
+            f = dcl_widthscale->value;
+            if (lm.pCurrentMark->fWidthScale != f) {
+                lm.pCurrentMark->fWidthScale = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_widthscale->modified = qfalse;
+        }
+
+        if (dcl_rotation->modified) {
+            f = anglemod(dcl_rotation->value);
+            if (lm.pCurrentMark->fRotation != f) {
+                lm.pCurrentMark->fRotation = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_rotation->modified = qfalse;
+        }
+
+        if (dcl_r->modified) {
+            f = Q_clamp_float(dcl_r->value, 0, 1);
+            if (lm.pCurrentMark->color[0] != f) {
+                lm.pCurrentMark->color[0] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_r->modified = qfalse;
+        }
+        if (dcl_g->modified) {
+            f = Q_clamp_float(dcl_g->value, 0, 1);
+            if (lm.pCurrentMark->color[1] != f) {
+                lm.pCurrentMark->color[1] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_g->modified = qfalse;
+        }
+        if (dcl_b->modified) {
+            f = Q_clamp_float(dcl_b->value, 0, 1);
+            if (lm.pCurrentMark->color[2] != f) {
+                lm.pCurrentMark->color[2] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_b->modified = qfalse;
+        }
+        if (dcl_alpha->modified) {
+            f = Q_clamp_float(dcl_alpha->value, 0, 1);
+            if (lm.pCurrentMark->color[3] != f) {
+                lm.pCurrentMark->color[3] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_alpha->modified = qfalse;
+        }
+
+        if (dcl_dolighting->modified) {
+            qboolean bDoLighting = dcl_dolighting->integer != 0;
+            if (lm.pCurrentMark->bDoLighting != bDoLighting) {
+                lm.pCurrentMark->bDoLighting = bDoLighting;
+                bDoUpdate                    = 1;
+            }
+            dcl_dolighting->modified = 0;
+        }
+
+        if (bDoUpdate) {
+            lm.pCurrentMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qtrue, 0);
+        }
+    }
+
+    if (dcl_showcurrent->integer && lm.pCurrentMark && lm.pCurrentMark->iNumEditPolys) {
+        float          fColor;
+        float          fLength;
+        int            j;
+        int            iEntNum;
+        lmEditPoly_t  *pPoly;
+        polyVert_t    *pVert, *pVert2;
+        polyVert_t     verts[8];
+        trRefEntity_t *ent;
+        bmodel_t      *bmodel, *lastbmodel;
+        model_t       *pModel;
+        vec3_t         vOrigin;
+        vec3_t         axis[3];
+        vec3_t         vPos, vPos2;
+        vec3_t         polyaxis[3];
+
+        iEntNum    = 0;
+        ent        = NULL;
+        lastbmodel = NULL;
+        vectoangles(lm.pCurrentMark->vProjection, vPos);
+
+        vPos[2] = anglemod(vPos[2] + lm.pCurrentMark->fRotation);
+        AngleVectorsLeft(vPos, polyaxis[0], polyaxis[1], polyaxis[2]);
+        VectorNormalize2(lm.pCurrentMark->vProjection, polyaxis[0]);
+        PerpendicularVector(polyaxis[1], polyaxis[0]);
+        RotatePointAroundVector(polyaxis[2], polyaxis[0], polyaxis[1], anglemod(lm.pCurrentMark->fRotation + 90.0));
+        CrossProduct(polyaxis[0], polyaxis[2], polyaxis[1]);
+
+        fColor = sin(tr.refdef.time / 500.0) / 4.0 + 0.6;
+
+        for (pPoly = lm.pCurrentMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            if (pPoly->surf.iIndex > 0) {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, 1.0 - fColor, 0.1, 1.0);
+                }
+            } else if (pPoly->surf.iIndex < 0) {
+                bmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+                if (bmodel != lastbmodel) {
+                    //
+                    // Find the matching entity
+                    //
+
+                    ent = &tr.refdef.entities[0];
+                    for (iEntNum = 0; iEntNum < tr.refdef.num_entities; iEntNum++) {
+                        ent = &tr.refdef.entities[iEntNum];
+
+                        pModel = R_GetModelByHandle(ent->e.hModel);
+                        if (pModel->type == MOD_BRUSH && pModel->bmodel == bmodel) {
+                            break;
+                        }
+                    }
+
+                    VectorCopy(ent->e.origin, vOrigin);
+                    AxisCopy(ent->e.axis, axis);
+                }
+
+                if (iEntNum != tr.refdef.num_entities) {
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        MatrixTransformVector(pPoly->verts[j].xyz, axis, pPoly->verts[j].xyz);
+                        VectorAdd(pPoly->verts[j].xyz, vOrigin, pPoly->verts[j].xyz);
+                    }
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                        VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                        VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                    }
+                }
+            } else {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                }
+            }
+        }
+
+        //
+        // Draw the front
+        //
+
+        fLength = (lm.pCurrentMark->fWidthScale + lm.pCurrentMark->fHeightScale) * lm.pCurrentMark->fRadius * 0.75;
+        if (fLength < 4) {
+            fLength = 4;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[0], vPos);
+
+        R_DebugLine(lm.pCurrentMark->vPos, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the right
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fWidthScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[1], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[1], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the up
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fHeightScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[2], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[2], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+    }
+}
+
+/*
+=============
+R_AddPermanentMarkFragmentSurfaces
+
+=============
+*/
+void R_AddPermanentMarkFragmentSurfaces(void **pFirstMarkFragment, int iNumMarkFragment)
+{
+    int       i;
+    lmPoly_t *pPoly;
+
+    for (i = 0; i < iNumMarkFragment; i++) {
+        pPoly = (lmPoly_t *)pFirstMarkFragment[i];
+
+        if (pPoly->viewCount == tr.viewCount) {
+            continue;
+        }
+        pPoly->viewCount = tr.viewCount;
+
+        R_AddDrawSurf(&pPoly->surf.surfaceType, pPoly->shader, 0, 0, 0, 0);
+    }
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_model.cpp b/code/renderergl2/tr_model.cpp
new file mode 100644
index 00000000..b7586502
--- /dev/null
+++ b/code/renderergl2/tr_model.cpp
@@ -0,0 +1,1880 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_models.cpp -- model loading and caching
+
+#include "tr_local.h"
+#include "tiki.h"
+#include <vector.h>
+
+#define LL(x) x = LittleLong(x)
+
+qboolean   g_bInfoworldtris = qfalse;
+static int entityNumIndexes[MAX_ENTITIES];
+static int staticModelNumIndexes[4095];
+
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg);
+
+/*
+** R_GetModelByHandle
+*/
+model_t *R_GetModelByHandle(qhandle_t hModel)
+{
+    model_t *mod;
+
+    // out of range gets the default model
+    if (hModel < 1 || hModel >= tr.numModels) {
+        return tr.models[0];
+    }
+
+    mod = tr.models[hModel];
+
+    return mod;
+}
+
+/*
+** R_Model_GetHandle
+*/
+dtiki_t *R_Model_GetHandle(qhandle_t handle)
+{
+    model_t *model = R_GetModelByHandle(handle);
+
+    if (model->type == MOD_TIKI) {
+        return model->d.tiki;
+    }
+
+    return NULL;
+}
+
+//===============================================================================
+
+/*
+** R_FreeModel
+*/
+void R_FreeModel(model_t *mod)
+{
+    if (mod->type == MOD_TIKI) {
+        ri.CG_EndTiki(mod->d.tiki);
+    }
+
+    memset(mod, 0, sizeof(*mod));
+}
+
+/*
+** R_AllocModel
+*/
+model_t *R_AllocModel(void)
+{
+	model_t *mod;
+    int i;
+
+    for (i = 0; i < tr.numModels; i++) {
+        mod = tr.models[i];
+        if (!mod->name[0]) {
+            break;
+        }
+    }
+
+    if (i == tr.numModels) {
+        if (i == MAX_MOD_KNOWN) {
+            return NULL;
+        }
+
+        mod = (model_t*)ri.Hunk_Alloc(sizeof(*tr.models[tr.numModels]), h_low);
+        mod->index = tr.numModels;
+        tr.models[tr.numModels] = mod;
+        tr.numModels++;
+    } else {
+        mod = tr.models[i];
+    }
+
+    return mod;
+}
+
+/*
+** RE_FreeModels
+*/
+void RE_FreeModels(void)
+{
+    int hModel;
+
+    for (hModel = 0; hModel < tr.numModels; hModel++) {
+        if (!tr.models[hModel]->name[0]) {
+            continue;
+        }
+
+        R_FreeModel(tr.models[hModel]);
+    }
+}
+
+/*
+** R_RegisterShaders
+*/
+void R_RegisterShaders(model_t *mod)
+{
+    dtiki_t        *tiki;
+    int             i, j;
+    dtikisurface_t *psurface;
+    shader_t       *sh;
+
+    tiki = mod->d.tiki;
+
+    for (i = 0; i < tiki->num_surfaces; i++) {
+        psurface = &tiki->surfaces[i];
+
+        assert(psurface->numskins <= MAX_TIKI_SHADER);
+        for (j = 0; j < psurface->numskins; j++) {
+            if (psurface->shader[j][0]) {
+                sh                   = R_FindShader(psurface->shader[j], LIGHTMAP_NONE, qtrue);
+                psurface->hShader[j] = sh->index;
+            } else {
+                psurface->hShader[j] = 0;
+            }
+        }
+    }
+}
+
+/*
+** RE_UnregisterServerModel
+*/
+void RE_UnregisterServerModel(qhandle_t hModel)
+{
+    if (hModel < 0 || hModel >= MAX_MOD_KNOWN) {
+        return;
+    }
+
+    if (tr.models[hModel]->serveronly) {
+        R_FreeModel(tr.models[hModel]);
+    }
+}
+
+/*
+** R_RegisterModelInternal
+*/
+static qhandle_t R_RegisterModelInternal(const char *name, qboolean bBeginTiki, qboolean use)
+{
+    model_t    *mod;
+    qhandle_t   hModel;
+    const char *ptr;
+
+    if (!name || !*name) {
+        ri.Printf(PRINT_ALL, "RE_RegisterModel: NULL name\n");
+        return 0;
+    }
+
+    if (strlen(name) >= 128) {
+        Com_Printf("Model name exceeds MAX_MODEL_NAME\n");
+        return 0;
+    }
+
+    //
+    // search the currently loaded models
+    //
+    for (hModel = 1; hModel < tr.numModels; hModel++) {
+        mod = tr.models[hModel];
+        if (!Q_stricmp(mod->name, name)) {
+            if (mod->type == MOD_BAD) {
+                return 0;
+            }
+            return hModel;
+        }
+    }
+
+    // allocate a new model_t
+
+    if ((mod = R_AllocModel()) == NULL) {
+        ri.Printf(PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
+        return 0;
+    }
+
+    // only set the name after the model has been successfully loaded
+    Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+    // make sure the render thread is stopped
+    R_IssuePendingRenderCommands();
+
+    mod->serveronly = qtrue;
+
+    //
+    // load the files
+    //
+    ptr = strrchr(name, '.');
+
+    if (ptr) {
+        ptr++;
+
+        if (!stricmp(ptr, "spr")) {
+            mod->d.sprite = SPR_RegisterSprite(name);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+            if (mod->d.sprite) {
+                mod->type = MOD_SPRITE;
+                return mod->index;
+            }
+        } else if (!stricmp(ptr, "tik")) {
+            mod->d.tiki = ri.TIKI_RegisterTikiFlags(name, use);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+            if (mod->d.tiki) {
+                mod->type = MOD_TIKI;
+                R_RegisterShaders(mod);
+
+                if (bBeginTiki) {
+                    ri.CG_ProcessInitCommands(mod->d.tiki, NULL);
+                }
+
+                return mod->index;
+            }
+        }
+    }
+
+    ri.Printf(PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name);
+    mod->type = MOD_BAD;
+
+    return 0;
+}
+
+/*
+** RE_RegisterServerModel
+*/
+qhandle_t RE_RegisterServerModel(const char *name)
+{
+    return R_RegisterModelInternal(name, qtrue, qfalse);
+}
+
+/*
+** RE_SpawnEffectModel
+*/
+qhandle_t RE_SpawnEffectModel(const char *szModel, vec3_t vPos, vec3_t *axis)
+{
+    refEntity_t new_entity;
+
+    memset(&new_entity, 0, sizeof(refEntity_t));
+    memset(&new_entity.shaderRGBA, 255, sizeof(byte) * 4);
+
+    VectorCopy(vPos, new_entity.origin);
+    new_entity.scale = 1.0;
+
+    if (axis) {
+        AxisCopy(axis, new_entity.axis);
+    }
+
+    new_entity.hModel = R_RegisterModelInternal(szModel, qfalse, qtrue);
+
+    if (new_entity.hModel) {
+        tr.models[new_entity.hModel]->serveronly = qfalse;
+        ri.CG_ProcessInitCommands(tr.models[new_entity.hModel]->d.tiki, &new_entity);
+    }
+
+    return new_entity.hModel;
+}
+
+/*
+** RE_RegisterModel
+*/
+qhandle_t RE_RegisterModel(const char *name)
+{
+    qhandle_t handle;
+
+    handle = R_RegisterModelInternal(name, qtrue, qtrue);
+
+    if (handle) {
+        tr.models[handle]->serveronly = qfalse;
+    }
+    return handle;
+}
+
+//=============================================================================
+
+/*
+===============
+R_ModelInit
+===============
+*/
+void R_ModelInit(void)
+{
+    model_t *mod;
+    int      i;
+
+    // leave a space for NULL model
+    tr.numModels = 0;
+
+    mod = R_AllocModel();
+    Q_strncpyz(mod->name, "** BAD MODEL **", sizeof(mod->name));
+    mod->type = MOD_BAD;
+
+    for (i = 0; i < ARRAY_LEN(tr.skel_index); i++) {
+        tr.skel_index[i] = -1;
+    }
+}
+
+/*
+================
+R_Modellist_f
+================
+*/
+void R_Modellist_f(void)
+{
+    int i;
+
+    for (i = 1; i < tr.numModels; i++) {
+        ri.Printf(PRINT_ALL, "%s\n", tr.models[i]->name);
+    }
+}
+
+/*
+====================
+R_ModelRadius
+====================
+*/
+float R_ModelRadius(qhandle_t handle)
+{
+    int      j;
+    vec3_t   bounds[2];
+    model_t *model;
+    float    radius, maxRadius;
+    vec3_t   tmpVec;
+    float    w;
+
+    model = R_GetModelByHandle(handle);
+
+    switch (model->type) {
+    case MOD_BRUSH:
+        maxRadius = 0.0;
+
+        VectorCopy(model->bmodel->bounds[0], bounds[0]);
+        VectorCopy(model->bmodel->bounds[1], bounds[1]);
+
+        for (j = 0; j < 8; j++) {
+            tmpVec[0] = bounds[j & 1 ? 1 : 0][0];
+            tmpVec[1] = bounds[j & 2 ? 1 : 0][1];
+            tmpVec[2] = bounds[j & 4 ? 1 : 0][2];
+
+            radius = VectorLength(tmpVec);
+
+            if (maxRadius < radius) {
+                maxRadius = radius;
+            }
+        }
+        break;
+    case MOD_TIKI:
+        return ri.TIKI_GlobalRadius(model->d.tiki);
+    case MOD_SPRITE:
+        maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        w         = model->d.sprite->height * model->d.sprite->scale * 0.5;
+
+        if (maxRadius <= w) {
+            maxRadius = w;
+        }
+        break;
+    default:
+        maxRadius = 0.0;
+    }
+
+    return maxRadius;
+}
+
+/*
+====================
+R_ModelBounds
+====================
+*/
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs)
+{
+    model_t *model;
+
+    model = R_GetModelByHandle(handle);
+
+    switch (model->type) {
+    default:
+    case MOD_BAD:
+        VectorClear(mins);
+        VectorClear(maxs);
+        break;
+    case MOD_BRUSH:
+        VectorCopy(model->bmodel->bounds[0], mins);
+        VectorCopy(model->bmodel->bounds[1], maxs);
+        break;
+    case MOD_TIKI:
+        ri.TIKI_CalculateBounds(model->d.tiki, 1.0, mins, maxs);
+        break;
+    case MOD_SPRITE:
+        mins[0] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
+        mins[1] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
+        mins[2] = -0.0;
+        maxs[0] = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        maxs[1] = model->d.sprite->height * model->d.sprite->scale * 0.5;
+        maxs[2] = 0.0;
+        break;
+    }
+}
+
+#if 0
+// Replaced by TIKI_FindSkelByHeader
+/*
+====================
+GetModelPath
+====================
+*/
+const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
+	int			i;
+	int			num;
+	skelcache_t	*cache;
+
+	num = cache_numskel;
+
+	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
+	{
+		cache = &skelcache[ i ];
+
+		if( cache->skel )
+		{
+			if( cache->skel == skelmodel ) {
+				return cache->path;
+			}
+
+			num--;
+			if( num < 0 ) {
+				break;
+			}
+		}
+	}
+
+	return NULL;
+}
+#endif
+
+/*
+====================
+GetLodCutoff
+====================
+*/
+int GetLodCutoff(skelHeaderGame_t *skelmodel, float lod_val, int renderfx)
+{
+    lodControl_t *LOD;
+    float         f;
+    float         fLODCap;
+
+    LOD = skelmodel->pLOD;
+
+    if (renderfx & RF_DEPTHHACK) {
+        fLODCap = LOD->maxMetric + (LOD->minMetric - LOD->maxMetric) * r_lodviewmodelcap->value;
+    } else {
+        f       = (LOD->minMetric - LOD->maxMetric) * r_lodcap->value + LOD->maxMetric;
+        fLODCap = (lod_val - LOD->maxMetric) * r_lodscale->value + LOD->maxMetric;
+
+        if (fLODCap > f) {
+            fLODCap = f;
+        }
+    }
+
+    if (fLODCap >= LOD->minMetric || !r_uselod->integer) {
+        return LOD->curve[0].val;
+    } else if (fLODCap <= LOD->maxMetric) {
+        return LOD->curve[4].val;
+    } else if (fLODCap <= LOD->consts[3].cutoff) {
+        return fLODCap * LOD->consts[3].scale + LOD->consts[3].base;
+    } else if (fLODCap <= LOD->consts[2].cutoff) {
+        return fLODCap * LOD->consts[2].scale + LOD->consts[2].base;
+    } else if (fLODCap <= LOD->consts[1].cutoff) {
+        return fLODCap * LOD->consts[1].scale + LOD->consts[1].base;
+    } else {
+        return fLODCap * LOD->consts[0].scale + LOD->consts[0].base;
+    }
+}
+
+/*
+===============
+R_SaveLODFile
+===============
+*/
+static void R_SaveLODFile(const char *path, lodControl_t *LOD)
+{
+    fileHandle_t file = ri.FS_OpenFileWrite(path);
+    if (!file) {
+        ri.Printf(PRINT_WARNING, "SaveLODFile: Failed to open file %s\n", path);
+        return;
+    }
+
+    ri.FS_Write(LOD, sizeof(lodControl_t), file);
+}
+
+/*
+====================
+GetToolLodCutoff
+====================
+*/
+int GetToolLodCutoff(skelHeaderGame_t *skelmodel, float lod_val)
+{
+    lodControl_t *LOD;
+    float         totalRange;
+    int           i;
+    char          lodPath[256];
+    char         *ext;
+
+    LOD        = skelmodel->pLOD;
+    totalRange = 0.0;
+    for (i = 0; i < 10; i++) {
+        if (skelmodel->lodIndex[i] > 0) {
+            totalRange = skelmodel->lodIndex[i];
+            break;
+        }
+    }
+
+    if (lod_save->integer == 1) {
+        ri.Cvar_Set("lod_save", "0");
+        Q_strncpyz(lodPath, ri.TIKI_FindSkelByHeader(skelmodel)->path, sizeof(lodPath));
+        ext = strstr(lodPath, "skd");
+        strcpy(ext, "lod");
+        R_SaveLODFile(lodPath, LOD);
+    }
+
+    if (lod_mesh->modified) {
+        lod_mesh->modified = qfalse;
+        ri.Cvar_Set("lod_minLOD", va("%f", LOD->minMetric));
+        ri.Cvar_Set("lod_maxLOD", va("%f", LOD->maxMetric));
+        ri.Cvar_Set("lod_LOD_slider", va("%f", 0.5));
+        ri.Cvar_Set("lod_curve_0_slider", va("%f", LOD->curve[0].val / totalRange));
+        ri.Cvar_Set("lod_curve_1_slider", va("%f", LOD->curve[1].val / totalRange));
+        ri.Cvar_Set("lod_curve_2_slider", va("%f", LOD->curve[2].val / totalRange));
+        ri.Cvar_Set("lod_curve_3_slider", va("%f", LOD->curve[3].val / totalRange));
+        ri.Cvar_Set("lod_curve_4_slider", va("%f", LOD->curve[4].val / totalRange));
+    }
+
+    ri.Cvar_Set("lod_curve_0_val", va("%f", lod_curve_0_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_1_val", va("%f", lod_curve_1_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_2_val", va("%f", lod_curve_2_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_3_val", va("%f", lod_curve_3_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_4_val", va("%f", lod_curve_4_slider->value * totalRange));
+
+    LOD->minMetric    = lod_minLOD->value;
+    LOD->maxMetric    = lod_maxLOD->value;
+    LOD->curve[0].val = lod_curve_0_val->value;
+    LOD->curve[1].val = lod_curve_1_val->value;
+    LOD->curve[2].val = lod_curve_2_val->value;
+    LOD->curve[3].val = lod_curve_3_val->value;
+    LOD->curve[4].val = lod_curve_4_val->value;
+
+    ri.TIKI_CalcLodConsts(LOD);
+    return GetLodCutoff(skelmodel, lod_val, 0);
+}
+
+/*
+==============
+R_GetTagPositionAndOrientation
+==============
+*/
+orientation_t R_GetTagPositionAndOrientation(refEntity_t *ent, int tagnum)
+{
+    int           i;
+    orientation_t tag_or, new_or;
+
+    tag_or = RE_TIKI_Orientation(ent, tagnum);
+
+    VectorCopy(ent->origin, new_or.origin);
+
+    for (i = 0; i < 3; i++) {
+        VectorMA(new_or.origin, tag_or.origin[i], ent->axis[i], new_or.origin);
+    }
+
+    MatrixMultiply(tag_or.axis, ent->axis, new_or.axis);
+    return new_or;
+}
+
+/*
+==============
+RB_DrawSkeletor
+==============
+*/
+void RB_DrawSkeletor(trRefEntity_t *ent)
+{
+    // FIXME: Unimplemented (GL2)
+}
+
+surfaceType_t skelSurface = SF_TIKI_SKEL;
+
+/*
+==============
+R_AddSkelSurfaces
+==============
+*/
+void R_AddSkelSurfaces(trRefEntity_t *ent)
+{
+    dtiki_t         *tiki;
+    qboolean         personalModel;
+    float            tiki_scale;
+    vec3_t           tiki_localorigin;
+    vec3_t           tiki_worldorigin;
+    skelBoneCache_t *outbones;
+    //int tikiSurfNumOffset;
+    static cvar_t   *vmEntity = NULL;
+    skeletor_c      *skeletor;
+    float            radius;
+    SkelVec3         centroid;
+    skelAnimFrame_t *newFrame;
+    int              added;
+    shader_t        *shader;
+    dtikisurface_t  *dsurf;
+    byte            *bsurf;
+    //float range;
+    //int render_count, total_tris;
+    skelSurfaceGame_t *surface;
+    //int skinnum;
+    //float target;
+    Vector newDistance;
+    //vec3_t org;
+    int i;
+    int mesh;
+    int iRadiusCull = 0;
+    int num_tags;
+
+    tiki = ent->e.tiki;
+
+    if (!vmEntity) {
+        vmEntity = ri.Cvar_Get("viewmodelentity", "", 0);
+    }
+
+    R_UpdatePoseInternal(&ent->e);
+
+    // don't add third_person objects if in a portal
+    personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
+
+    outbones = &TIKI_Skel_Bones[TIKI_Skel_Bones_Index];
+
+    num_tags = ri.TIKI_GetNumChannels(tiki);
+
+    if (num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES) {
+        ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name);
+        return;
+    }
+
+    tiki_scale = tiki->load_scale * ent->e.scale;
+    VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+    R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
+
+    radius = R_GetRadius(&ent->e);
+
+    if (!lod_tool->integer) {
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, radius);
+        if (r_showcull->integer & 2) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+                break;
+            case CULL_CLIP:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f + 32.f, 1, 0.2f, 0.2f, 0.5f, qfalse);
+                break;
+            }
+        }
+
+        switch (iRadiusCull) {
+        case CULL_IN:
+            tr.pc.c_sphere_cull_md3_in++;
+            break;
+        case CULL_CLIP:
+            tr.pc.c_sphere_cull_md3_clip++;
+            break;
+        case CULL_OUT:
+            tr.pc.c_sphere_cull_md3_out++;
+            break;
+        }
+    }
+
+    if (tiki->a->bIsCharacter) {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
+        }
+    } else {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        }
+    }
+
+    newFrame = (skelAnimFrame_t *)ri.Hunk_AllocateTempMemory(
+        sizeof(skelAnimFrame_t) + ri.TIKI_GetNumChannels(tiki) * sizeof(SkelMat4)
+    );
+    R_GetFrame(&ent->e, newFrame);
+
+    if (lod_tool->integer || iRadiusCull != CULL_CLIP
+        || R_CullSkelModel(tiki, &ent->e, newFrame, tiki_scale, tiki_localorigin) != CULL_OUT) {
+        //
+        // copy bones position and axis
+        //
+        for (i = 0; i < num_tags; i++) {
+            VectorCopy(newFrame->bones[i][3], outbones->offset);
+            outbones->matrix[0][0] = newFrame->bones[i][0][0];
+            outbones->matrix[0][1] = newFrame->bones[i][0][1];
+            outbones->matrix[0][2] = newFrame->bones[i][0][2];
+            outbones->matrix[0][3] = 0;
+            outbones->matrix[1][0] = newFrame->bones[i][1][0];
+            outbones->matrix[1][1] = newFrame->bones[i][1][1];
+            outbones->matrix[1][2] = newFrame->bones[i][1][2];
+            outbones->matrix[1][3] = 0;
+            outbones->matrix[2][0] = newFrame->bones[i][2][0];
+            outbones->matrix[2][1] = newFrame->bones[i][2][1];
+            outbones->matrix[2][2] = newFrame->bones[i][2][2];
+            outbones->matrix[2][3] = 0;
+            outbones++;
+        }
+    }
+
+    ri.Hunk_FreeTempMemory(newFrame);
+
+    ent->e.bonestart = TIKI_Skel_Bones_Index;
+    TIKI_Skel_Bones_Index += num_tags;
+
+    ent->e.hasMorph = qfalse;
+
+    //
+    // get the skeletor
+    //
+    skeletor = (skeletor_c *)ri.TIKI_GetSkeletor(tiki, ent->e.entityNumber);
+
+    //
+    // add morphs
+    //
+    added = ri.SKEL_GetMorphWeightFrame(
+        skeletor, ent->e.frameInfo[0].index, ent->e.frameInfo[0].time, &skeletorMorphCache[skeletorMorphCacheIndex]
+    );
+    ent->e.morphstart = skeletorMorphCacheIndex;
+
+    if (added) {
+        // found morphs
+        skeletorMorphCacheIndex += added;
+        ent->e.hasMorph = qtrue;
+    }
+
+    //
+    // draw all meshes
+    //
+    dsurf = tiki->surfaces;
+    bsurf = &ent->e.surfaces[0];
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+
+        if (!skelmodel) {
+            ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name);
+            return;
+        }
+
+        if (lod_tool->integer && !stricmp(ent->e.tiki->a->name, lod_tikiname->string)) {
+            if (lod_mesh->integer > tiki->numMeshes - 1) {
+                ri.Cvar_Set("lod_mesh", va("%d", tiki->numMeshes - 1));
+            }
+
+            if (mesh == lod_mesh->integer) {
+                if (skelmodel->pLOD) {
+                    break;
+                }
+            }
+        }
+
+        //
+        // draw all surfaces
+        //
+        surface = skelmodel->pSurfaces;
+        for (i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext) {
+            if (*bsurf & 4) {
+                continue;
+            }
+
+            shader         = NULL;
+            surface->ident = SF_TIKI_SKEL;
+
+            // use a custom shader if specified
+            if (!(ent->e.customShader) || (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                int iShaderNum = ent->e.skinNum + (*bsurf & 3);
+
+                if (iShaderNum >= dsurf->numskins) {
+                    iShaderNum = 0;
+                }
+                shader = tr.shaders[dsurf->hShader[iShaderNum]];
+            } else {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+            }
+
+            if (!personalModel) {
+                if ((*bsurf & 0x40) && (dsurf->numskins > 1)) {
+                    int iShaderNum = ent->e.skinNum + (*bsurf & 2);
+
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum]], 0, 0, 0, 0);
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum + 1]], 0, 0, 0, 0);
+                } else {
+                    R_AddDrawSurf((surfaceType_t *)surface, shader, 0, 0, 0, 0);
+                }
+            }
+
+            if ((ent->e.customShader) && (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+                R_AddDrawSurf((surfaceType_t *)surface, shader, 0, 0, 0, 0);
+            }
+        }
+    }
+
+    // FIXME: setup LOD
+}
+
+/*
+=============
+SkelVertGetNormal
+=============
+*/
+inline static void SkelVertGetNormal(skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] = vert->normal[0] * bone->matrix[0][0] + vert->normal[1] * bone->matrix[1][0]
+           + vert->normal[2] * bone->matrix[2][0];
+
+    out[1] = vert->normal[0] * bone->matrix[0][1] + vert->normal[1] * bone->matrix[1][1]
+           + vert->normal[2] * bone->matrix[2][1];
+
+    out[2] = vert->normal[0] * bone->matrix[0][2] + vert->normal[1] * bone->matrix[1][2]
+           + vert->normal[2] * bone->matrix[2][2];
+}
+
+/*
+=============
+SkelMorphGetXyz
+=============
+*/
+inline static void SkelMorphGetXyz(skeletorMorph_t *morph, int *morphcache, vec3_t out)
+{
+    VectorMA(out, *morphcache, morph->offset, out);
+}
+
+/*
+=============
+SkelWeightGetXyz
+=============
+*/
+inline static void SkelWeightGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] += ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                + weight->offset[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
+
+    out[1] += ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                + weight->offset[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
+
+    out[2] += ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                + weight->offset[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
+}
+
+/*
+=============
+SkelWeightMorphGetXyz
+=============
+*/
+inline static void SkelWeightMorphGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out)
+{
+    vec3_t point;
+
+    VectorAdd(totalmorph, weight->offset, point);
+
+    out[0] += ((point[0] * bone->matrix[0][0] + point[1] * bone->matrix[1][0] + point[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
+
+    out[1] += ((point[0] * bone->matrix[0][1] + point[1] * bone->matrix[1][1] + point[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
+
+    out[2] += ((point[0] * bone->matrix[0][2] + point[1] * bone->matrix[1][2] + point[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
+}
+
+/*
+=============
+RB_SkelMesh
+=============
+*/
+void RB_SkelMesh(skelSurfaceGame_t *sf)
+{
+    unsigned int       baseIndex, baseVertex;
+    unsigned int       render_count;
+    unsigned int       indexes;
+    float             *outXyz;
+    int16_t           *outNormal;
+    skelIndex_t       *triangles;
+    skelIndex_t       *collapse_map;
+    skeletorVertex_t  *newVerts;
+    skeletorMorph_t   *morph;
+    skelWeight_t      *weight;
+    int                vertNum;
+    int                morphNum;
+    int                weightNum;
+    skelBoneCache_t   *bones;
+    skelBoneCache_t   *bone;
+    int               *morphs;
+    int               *morphcache;
+    float              scale;
+    dtiki_t           *tiki;
+    int                mesh;
+    int                surf;
+    int                i;
+    skelHeaderGame_t  *skelmodel;
+    skelSurfaceGame_t *psurface;
+    qboolean           bFound;
+    short              collapse[TIKI_MAX_VERTEXES];
+
+    if (!r_drawentitypoly->integer) {
+        return;
+    }
+
+    tiki = backEnd.currentEntity->e.tiki;
+
+    scale = tiki->load_scale * backEnd.currentEntity->e.scale;
+
+    //
+    // get the mesh associated with the surface
+    //
+    bFound = qfalse;
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+        psurface  = skelmodel->pSurfaces;
+
+        // find the surface
+        for (surf = 0; surf < skelmodel->numSurfaces; surf++) {
+            if (psurface == sf) {
+                bFound = qtrue;
+                break;
+            }
+            psurface = psurface->pNext;
+        }
+
+        if (bFound) {
+            break;
+        }
+    }
+
+    assert(bFound);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD) {
+        float lod_val;
+        int   renderfx;
+
+        lod_val  = backEnd.currentEntity->lodpercentage[0];
+        renderfx = backEnd.currentEntity->e.renderfx;
+
+        if (sf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentEntity->e.tiki->a->name, lod_tikiname->string)
+                && mesh == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0], renderfx);
+            }
+
+            collapseIndex = sf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = sf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = sf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = sf->numVerts;
+    }
+
+    indexes = sf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, indexes);
+
+    collapse_map = sf->pCollapse;
+    triangles    = sf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    outXyz    = tess.xyz[baseVertex];
+    outNormal = tess.normal[baseVertex];
+    newVerts  = sf->pVerts;
+
+    if (render_count == sf->numVerts) {
+        for (i = 0; i < indexes; i++) {
+            tess.indexes[baseIndex + i] = baseVertex + triangles[i];
+        }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        assert(sf->numVerts < TIKI_MAX_VERTEXES);
+
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+
+        for (i = render_count; i < sf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (i = 0; i < indexes; i += 3) {
+            assert(collapse[triangles[i]] < sf->numVerts);
+            assert(collapse[triangles[i + 1]] < sf->numVerts);
+            assert(collapse[triangles[i + 2]] < sf->numVerts);
+
+            if (collapse[triangles[i]] == collapse[triangles[i + 1]]
+                || collapse[triangles[i + 1]] == collapse[triangles[i + 2]]
+                || collapse[triangles[i + 2]] == collapse[triangles[i]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + i]     = baseVertex + collapse[triangles[i]];
+            tess.indexes[baseIndex + i + 1] = baseVertex + collapse[triangles[i + 1]];
+            tess.indexes[baseIndex + i + 2] = baseVertex + collapse[triangles[i + 2]];
+        }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
+        tess.numIndexes += i;
+    }
+
+    //
+    // just copy the vertexes
+    //
+    bones  = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
+    morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
+
+    if (backEnd.currentEntity->e.hasMorph) {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+                int    channelNum;
+                int    boneNum;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
+
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
+
+                    morph++;
+                }
+
+                if (newVerts->numMorphs) {
+                    channelNum = skelmodel->pBones[morph->morphIndex].channel;
+                } else {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                }
+
+                boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone    = &bones[boneNum];
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
+
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
+
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
+
+                    morph++;
+                }
+
+                if (newVerts->numMorphs) {
+                    bone = &bones[morph->morphIndex];
+                } else {
+                    bone = &bones[weight->boneIndex];
+                }
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
+
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        }
+    } else {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                int    channelNum;
+                int    boneNum;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+
+                channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone       = &bones[boneNum];
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
+
+                    SkelWeightGetXyz(weight, bone, out);
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+
+                bone = &bones[weight->boneIndex];
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
+
+                    SkelWeightGetXyz(weight, bone, out);
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        }
+    }
+
+#if 0
+	if( backEnd.currentEntity->e.staticModelIndex ) {
+		mstaticModel_t *sm;
+		color4ub_t *out;
+		color3ub_t *in;
+		int cdofs;
+		skdSurface_t *sf2;
+
+		sm = &tr.world->staticModels[ backEnd.currentEntity->e.staticModelIndex - 1 ];
+
+		tess.useStaticModelVertexColors = qtrue;
+
+		cdofs = 0;
+		sf2 = tiki->surfs;
+		while( sf2 != sf ) {
+			cdofs += sf2->numVerts;
+			sf2 = ( skdSurface_t* )( ( ( byte* )sf2 ) + sf2->ofsEnd );
+		}
+
+		in = &tr.world->smColors[ sm->firstVert + cdofs ];
+		out = tess.vertexColors + baseVertex;
+		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
+#    if 1
+			( *out )[ 0 ] = ( *in )[ 0 ];
+			( *out )[ 1 ] = ( *in )[ 1 ];
+			( *out )[ 2 ] = ( *in )[ 2 ];
+			( *out )[ 3 ] = 255;
+#    elif 0
+			( ( int* )out ) = tr.identityLightByte;
+#    else		
+			// su44: set it to something special so
+			// I can debug vertex colors rendering
+			( *out )[ 0 ] = 255;
+			( *out )[ 1 ] = 0;
+			( *out )[ 2 ] = 0;
+			( *out )[ 3 ] = 255;
+#    endif
+		}
+	} //else
+#endif
+    //{
+    //	// an attemp to fix bizarre vertex colors bug
+    //	color4ub_t *col;
+    //
+    //	col = &tess.vertexColors[baseVertex];
+    //	for(i = 0; i < sf->numVerts; i++,col++) {
+    //		(*col)[0] = 255;
+    //		(*col)[1] = 255;
+    //		(*col)[2] = 255;
+    //		(*col)[3] = 255;
+    //	}
+    //}
+    //tess.numVertexes += sf->numVerts;
+}
+
+/*
+=============
+RB_StaticMesh
+=============
+*/
+void RB_StaticMesh(staticSurface_t *staticSurf)
+{
+    int                i, j;
+    dtiki_t           *tiki;
+    skelSurfaceGame_t *surf;
+    int                meshNum;
+    skelHeaderGame_t  *skelmodel;
+    int                render_count;
+    skelIndex_t       *collapse_map;
+    skelIndex_t       *triangles;
+    int                indexes;
+    int                baseIndex, baseVertex;
+    short              collapse[1000];
+
+    if (!r_drawstaticmodelpoly->integer) {
+        return;
+    }
+
+    assert(backEnd.currentStaticModel);
+    tiki = backEnd.currentStaticModel->tiki;
+    surf = staticSurf->surface;
+
+    assert(surf->pStaticXyz);
+    if (!surf->pStaticXyz) {
+        return;
+    }
+
+    meshNum   = staticSurf->meshNum;
+    skelmodel = ri.TIKI_GetSkel(tiki->mesh[meshNum]);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD && r_staticlod->integer) {
+        float lod_val;
+
+        lod_val = backEnd.currentStaticModel->lodpercentage[0];
+
+        if (surf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
+                && meshNum == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
+            }
+
+            collapseIndex = surf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = surf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = surf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = surf->numVerts;
+    }
+
+    indexes = surf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, surf->numTriangles);
+
+    collapse_map = surf->pCollapse;
+    triangles    = surf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    if (render_count == surf->numVerts) {
+        for (j = 0; j < indexes; j++) {
+            tess.indexes[baseIndex + j] = baseVertex + triangles[j];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+        for (i = render_count; i < surf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (j = 0; j < indexes; j += 3) {
+            if (collapse[triangles[j]] == collapse[triangles[j + 1]]
+                || collapse[triangles[j + 1]] == collapse[triangles[j + 2]]
+                || collapse[triangles[j + 2]] == collapse[triangles[j]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + j]     = baseVertex + collapse[triangles[j]];
+            tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
+            tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += j;
+        tess.numIndexes += j;
+    }
+
+    for (j = 0; j < render_count; j++) {
+        Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
+        Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
+        tess.texCoords[baseVertex + j][0]   = surf->pStaticTexCoords[j][0][0];
+        tess.texCoords[baseVertex + j][1]   = surf->pStaticTexCoords[j][0][1];
+        tess.lightCoords[baseVertex + j][0] = surf->pStaticTexCoords[j][1][0];
+        tess.lightCoords[baseVertex + j][1] = surf->pStaticTexCoords[j][1][1];
+    }
+
+    if (backEndData->staticModelData) {
+        const size_t offset =
+            backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
+        assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
+        assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
+
+        const color4ub_t *in = (const color4ub_t *)&backEndData->staticModelData[offset];
+
+        for (i = 0; i < render_count; i++) {
+            tess.color[baseVertex + i][0] = in[i][0] * 0xffff / 0xff;
+            tess.color[baseVertex + i][1] = in[i][1] * 0xffff / 0xff;
+            tess.color[baseVertex + i][2] = in[i][2] * 0xffff / 0xff;
+            tess.color[baseVertex + i][3] = in[i][3] * 0xffff / 0xff;
+        }
+    } else {
+        for (i = 0; i < render_count; i++) {
+            tess.color[baseVertex + i][0] = 0xffff;
+            tess.color[baseVertex + i][1] = 0xffff;
+            tess.color[baseVertex + i][2] = 0xffff;
+            tess.color[baseVertex + i][3] = 0xffff;
+        }
+    }
+}
+
+/*
+=============
+R_InfoWorldTris_f
+=============
+*/
+void R_InfoWorldTris_f(void)
+{
+    int i;
+
+    g_bInfoworldtris = qtrue;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        entityNumIndexes[i] = 0;
+    }
+    for (i = 0; i < ARRAY_LEN(staticModelNumIndexes); i++) {
+        staticModelNumIndexes[i] = 0;
+    }
+}
+
+/*
+=============
+R_PrintInfoWorldtris
+=============
+*/
+void R_PrintInfoWorldtris(void)
+{
+    int               i;
+    int               numTris;
+    int               totalNumTris;
+    dtiki_t          *tiki;
+    skelHeaderGame_t *skelmodel;
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = entityNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki      = backEnd.refdef.entities[i].e.tiki;
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
+        Com_Printf("ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    Com_Printf("total entity tris: %i\n\n", totalNumTris);
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = staticModelNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki      = backEnd.refdef.staticModels[i].tiki;
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
+        Com_Printf("sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    Com_Printf("total static model tris: %i\n\n", totalNumTris);
+}
+
+/*
+=============
+RE_SetFrameNumber
+=============
+*/
+void RE_SetFrameNumber(int frameNumber)
+{
+    tr.frame_skel_index = frameNumber;
+}
+
+/*
+=============
+R_UpdatePoseInternal
+=============
+*/
+void R_UpdatePoseInternal(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        if (tr.skel_index[model->entityNumber] == tr.frame_skel_index) {
+            return;
+        }
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
+
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
+}
+
+/*
+=============
+RE_ForceUpdatePose
+=============
+*/
+void RE_ForceUpdatePose(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
+
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
+}
+
+/*
+=============
+RE_TIKI_Orientation
+=============
+*/
+orientation_t RE_TIKI_Orientation(refEntity_t *model, int tagnum)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_OrientationInternal(model->tiki, model->entityNumber, tagnum, model->scale);
+}
+
+/*
+=============
+RE_TIKI_IsOnGround
+=============
+*/
+qboolean RE_TIKI_IsOnGround(refEntity_t *model, int tagnum, float threshold)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_IsOnGroundInternal(model->tiki, model->entityNumber, tagnum, threshold);
+}
+
+/*
+=============
+R_GetRadius
+=============
+*/
+float R_GetRadius(refEntity_t *model)
+{
+    R_UpdatePoseInternal(model);
+    return ri.GetRadiusInternal(model->tiki, model->entityNumber, model->scale);
+}
+
+/*
+=============
+R_GetFrame
+=============
+*/
+void R_GetFrame(refEntity_t *model, struct skelAnimFrame_s *newFrame)
+{
+    R_UpdatePoseInternal(model);
+    ri.GetFrameInternal(model->tiki, model->entityNumber, newFrame);
+}
+
+/*
+=============
+R_DebugSkeleton
+=============
+*/
+void R_DebugSkeleton(void)
+{
+    // FIXME: unimplemented (GL2)
+}
+
+/*
+=============
+ProjectRadius
+=============
+*/
+static float ProjectRadius(float r, const vec3_t location)
+{
+    Vector separation;
+    float  projectedRadius;
+
+    separation      = Vector(tr.viewParms.or.origin) - Vector(location);
+    projectedRadius = separation.length();
+
+    return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
+}
+
+/*
+=============
+R_CalcLod
+=============
+*/
+float R_CalcLod(const vec3_t origin, float radius)
+{
+    return ProjectRadius(radius, origin);
+}
+
+/*
+=============
+R_CullTIKI
+=============
+*/
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg)
+{
+    vec3_t bounds[2];
+    vec3_t delta;
+    int    i;
+    int    cull;
+
+    // FIXME: not working properly
+    return CULL_IN;
+
+    if (tr.currentEntity->e.renderfx & RF_FRAMELERP) {
+        VectorSubtract(e->origin, e->oldorigin, delta);
+    } else {
+        VectorClear(delta);
+    }
+
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = newFrame->bounds[0][i] * fScale + vLocalOrg[i];
+        bounds[1][i] = newFrame->bounds[1][i] * fScale + vLocalOrg[i];
+
+        if (delta[i] > 0) {
+            bounds[1][i] += delta[i];
+        } else {
+            bounds[0][i] += delta[i];
+        }
+    }
+
+    cull = R_CullLocalBox(bounds);
+
+    if (r_showcull->integer & 1) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
+
+        switch (cull) {
+        case CULL_IN:
+            fR = 0;
+            fG = 1;
+            fB = 0;
+            break;
+        case CULL_CLIP:
+            fR = 1;
+            fG = 1;
+            fB = 0;
+            break;
+        case CULL_OUT:
+            fR = 1;
+            fG = 0.2f;
+            fB = 0.2f;
+
+            for (i = 0; i < 3; i++) {
+                bounds[0][i] -= 16;
+                bounds[1][i] += 16;
+            }
+            break;
+        }
+
+        MatrixToEulerAngles(tr.or.axis, vAngles);
+        R_DebugRotatedBBox(tr.or.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
+    }
+
+    switch (cull) {
+    case CULL_IN:
+        tr.pc.c_box_cull_md3_in++;
+        return CULL_IN;
+    case CULL_CLIP:
+        tr.pc.c_box_cull_md3_clip++;
+        return CULL_CLIP;
+    case CULL_OUT:
+    default:
+        tr.pc.c_box_cull_md3_out++;
+        return CULL_OUT;
+    }
+}
+
+/*
+==================
+R_CountTikiLodTris
+
+Computes the number of triangles to be rendered for the given TIKI model
+based on the given LoD percentage, and passes it back with render_tris.
+The total number of triangles in the TIKI model are passed back with total_tris.
+Currently only used for debugging purposes.
+
+FIXME: Shares some code with RB_StaticMesh, common parts could be extracted.
+According to debug symbols, this was originally in tiki_mesh.cpp
+==================
+*/
+void R_CountTikiLodTris(dtiki_t *tiki, float lodpercentage, int *render_tris, int *total_tris)
+{
+    *render_tris = 0;
+    *total_tris  = 0;
+    int numtris = 0, totaltris = 0;
+
+    for (int i = 0; i < tiki->numMeshes; i++) {
+        skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[i]);
+        skelSurfaceGame_t *surface   = skelmodel->pSurfaces;
+
+        for (int j = 0; j < skelmodel->numSurfaces; j++) {
+            int render_count = 0;
+            if (skelmodel->pLOD) {
+                int          lod_cutoff    = GetLodCutoff(skelmodel, lodpercentage, 0);
+                skelIndex_t *collapseIndex = surface->pCollapseIndex;
+                render_count               = surface->numVerts;
+
+                // Determine the number of vertices to be rendered based on the LOD cutoff
+                while (render_count > 0 && collapseIndex[render_count - 1] < lod_cutoff) {
+                    render_count--;
+                }
+            } else {
+                // The surf mesh doesn't have a LOD model, so all vertices will be rendered
+                render_count = surface->numVerts;
+            }
+
+            skelIndex_t *triangles    = surface->pTriangles;
+            int          indexes      = surface->numTriangles * 3; // 3 vertex/index for each tri
+            skelIndex_t *collapse_map = surface->pCollapse;
+            totaltris += surface->numTriangles;
+            skelIndex_t collapse[4096] {};
+
+            // Initialize array for collapsed indices
+            int k;
+            for (k = 0; k < render_count; ++k) {
+                collapse[k] = k;
+            }
+
+            // Map remaining vertices to their collapsed indices using the collapse map
+            for (k = render_count; k < surface->numVerts; ++k) {
+                collapse[k] = collapse[collapse_map[k]];
+            }
+
+            // Check the first two collapsed indices of each triangle
+            for (k = 0; k < indexes; k += 3) {
+                if (collapse[triangles[k]] == collapse[triangles[k + 1]]) {
+                    // The collapsed indices of the two vertices are the same:
+                    // this, and any subsequent tris do not need to be rendered
+                    // because the collapsed vertices (for this surface) coincide from here.
+                    break;
+                }
+            }
+
+            surface = surface->pNext;
+            numtris += k / 3;
+        }
+    }
+
+    *render_tris = numtris;
+    *total_tris  = totaltris;
+}
+
+/*
+==================
+R_LerpTag
+==================
+*/
+int R_LerpTag(orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, float frac, const char *tagName)
+{
+    // stub
+    return 0;
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_scene.c b/code/renderergl2/tr_scene.c
index aea153e1..d21e6146 100644
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
@@ -35,6 +35,17 @@ int			r_firstScenePoly;
 
 int			r_numpolyverts;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+int			r_numsprites;
+int			r_firstSceneSprite;
+
+int			r_numtermarks;
+int			r_firstSceneTerMark;
+
+//=========================
 
 /*
 ====================
@@ -57,6 +68,16 @@ void R_InitNextFrame( void ) {
 	r_firstScenePoly = 0;
 
 	r_numpolyverts = 0;
+
+    //
+    // OPENMOHAA-specific stuff
+	//
+
+	r_numsprites = 0;
+	r_firstSceneSprite = 0;
+
+	r_numtermarks = 0;
+	r_firstSceneTerMark = 0;
 }
 
 
@@ -571,3 +592,134 @@ void RE_RenderScene( const refdef_t *fd ) {
 
 	tr.frontEndMsec += ri.Milliseconds() - startTime;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+void RE_AddRefSpriteToScene(const refEntity_t* ent) {
+	refSprite_t* spr;
+	int i;
+
+	if (!tr.registered) {
+		return;
+	}
+
+	if (r_numsprites >= MAX_SPRITES) {
+		return;
+	}
+
+	spr = &backEndData->sprites[r_numsprites];
+	VectorCopy(ent->origin, spr->origin);
+	spr->surftype = SF_SPRITE;
+    spr->hModel = ent->hModel;
+    spr->scale = ent->scale;
+    spr->renderfx = ent->renderfx;
+    spr->shaderTime = ent->shaderTime;
+	AxisCopy(ent->axis, spr->axis);
+
+	for (i = 0; i < 4; ++i) {
+		spr->shaderRGBA[i] = ent->shaderRGBA[i];
+	}
+
+    ++r_numsprites;
+}
+
+/*
+=====================
+RE_AddPolyToScene
+
+=====================
+*/
+qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
+	srfPoly_t	*poly;
+
+	if ( !tr.registered ) {
+		return qfalse;
+	}
+
+	if (numVerts + r_numpolyverts > max_polyverts || r_numpolys >= max_polys) {
+		ri.Printf(PRINT_WARNING, "Exceeded MAX POLYS\n");
+		return qfalse;
+	}
+
+	poly = &backEndData->polys[r_numpolys];
+	poly->surfaceType = SF_POLY;
+	poly->hShader = hShader;
+	poly->numVerts = numVerts;
+	poly->verts = &backEndData->polyVerts[r_numpolyverts];
+	poly->renderfx = renderfx;
+
+	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
+	++r_numpolys;
+	r_numpolyverts += numVerts;
+
+	return qtrue;
+}
+
+/*
+=====================
+R_AddTerrainMarkSurfaces
+=====================
+*/
+void R_AddTerrainMarkSurfaces(void) {
+    srfMarkFragment_t* terMark;
+    int j;
+    shader_t* shader;
+
+    for (j = 0; j < tr.refdef.numTerMarks; j++)
+    {
+        terMark = &tr.refdef.terMarks[j];
+
+        shader = R_GetShaderByHandle(terMark->surfaceType);
+        terMark->surfaceType = SF_MARK_FRAG;
+        R_AddDrawSurf(&terMark->surfaceType, shader, 0, 0, 0, 0);
+    }
+}
+
+/*
+=====================
+RE_AddTerrainMarkToScene
+=====================
+*/
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
+    srfMarkFragment_t* terMark;
+
+    if (!tr.registered) {
+        return;
+    }
+
+    if (numVerts + r_numpolyverts > max_polyverts || r_numtermarks >= max_termarks) {
+        ri.Printf(PRINT_WARNING, "Exceeded MAX TERRAIN MARKS\n");
+        return;
+    }
+
+    terMark = &backEndData->terMarks[r_numtermarks];
+    terMark->surfaceType = hShader;
+    terMark->iIndex = iTerrainIndex;
+    terMark->numVerts = numVerts;
+    terMark->verts = &backEndData->polyVerts[r_numpolyverts];
+    memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
+
+    r_numtermarks++;
+    r_numpolyverts += numVerts;
+}
+
+//=================================================================================
+
+/*
+=====================
+RE_GetRenderEntity
+=====================
+*/
+refEntity_t* RE_GetRenderEntity(int entityNumber) {
+    int i;
+
+    for (i = 0; i < r_numentities; i++) {
+        if (backEndData->entities[i].e.entityNumber == entityNumber) {
+            return &backEndData->entities[i].e;
+        }
+    }
+
+    return NULL;
+}
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index b08a9328..ad3fd98a 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -4025,3 +4025,38 @@ void R_InitShaders( void ) {
 
 	CreateExternalShaders();
 }
+
+qhandle_t RE_RefreshShaderNoMip(const char* name) {
+	shader_t* sh;
+	char strippedName[64];
+	int hash;
+
+	if (!name || !*name) {
+		return 0;
+	}
+
+    COM_StripExtension(name, strippedName, sizeof(strippedName));
+
+	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
+	
+	for (sh = hashTable[hash]; sh; sh = sh->next) {
+		if (Q_stricmp(sh->name, strippedName) == 0) {
+			image_t* image;
+
+			image = sh->stages[0]->bundle[0].image[0];
+
+			if (image) {
+				sh->stages[0]->bundle[0].image[0] = R_RefreshImageFile(image->imgName, IMGTYPE_COLORALPHA, image->flags);
+			}
+
+			return sh->index;
+		}
+	}
+
+    sh = R_FindShader(name, -4, qfalse);
+	if (sh->defaultShader) {
+		return 0;
+	}
+
+    return sh->index;
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_sky_portal.cpp b/code/renderergl2/tr_sky_portal.cpp
new file mode 100644
index 00000000..b2ce1a97
--- /dev/null
+++ b/code/renderergl2/tr_sky_portal.cpp
@@ -0,0 +1,254 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sky_portal.cpp: sky portal
+
+#include "tr_local.h"
+
+/*
+=================
+R_Sky_Init
+
+=================
+*/
+void R_Sky_Init()
+{
+    tr.viewParms.isPortalSky = qfalse;
+    tr.portalsky.numSurfs    = 0;
+}
+
+/*
+=================
+R_Sky_Reset
+
+=================
+*/
+void R_Sky_Reset()
+{
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    tr.portalsky.mins[0]  = 8192.0;
+    tr.portalsky.mins[1]  = 8192.0;
+    tr.portalsky.mins[2]  = 8192.0;
+    tr.portalsky.maxs[0]  = -8192.0;
+    tr.portalsky.maxs[1]  = -8192.0;
+    tr.portalsky.maxs[2]  = -8192.0;
+    tr.portalsky.cntNode  = 0;
+    tr.portalsky.numSurfs = 0;
+}
+
+/*
+=================
+R_Sky_AddSurf
+
+=================
+*/
+void R_Sky_AddSurf(msurface_t *surf)
+{
+    if (tr.viewParms.isPortalSky) {
+        static int last_sky_warning = 0;
+
+        if (tr.refdef.time - 1000 > last_sky_warning) {
+            ri.Printf(3, "WARNING: sky being drawn in a sky portal!  Bad!  Bad!\n");
+            last_sky_warning = tr.refdef.time;
+        }
+
+        return;
+    }
+
+    if (tr.portalsky.numSurfs < 32) {
+        tr.portalsky.skySurfs[tr.portalsky.numSurfs++] = surf;
+    }
+
+    if (tr.portalsky.cntNode) {
+        int i;
+
+        for (i = 0; i < 3; i++) {
+            if (tr.portalsky.mins[i] >= tr.portalsky.cntNode->mins[i]) {
+                tr.portalsky.mins[i] = tr.portalsky.cntNode->mins[i];
+            }
+
+            if (tr.portalsky.maxs[i] >= tr.portalsky.cntNode->maxs[i]) {
+                tr.portalsky.maxs[i] = tr.portalsky.cntNode->maxs[i];
+            }
+        }
+    }
+}
+
+/*
+=================
+R_Sky_Render
+
+=================
+*/
+void R_Sky_Render()
+{
+    int         i;
+    viewParms_t newParms, oldParms;
+    mnode_t    *leaf;
+
+    if (!tr.portalsky.numSurfs) {
+        return;
+    }
+
+    if (!tr.refdef.sky_portal) {
+        return;
+    }
+
+    if (tr.skyRendered) {
+        // already rendered
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    for (i = 0; i < tr.portalsky.numSurfs; i++) {
+        if (!SurfIsOffscreen2(
+                (const srfBspSurface_t*)tr.portalsky.skySurfs[i]->data,
+                tr.portalsky.skySurfs[i]->shader,
+                ENTITYNUM_WORLD
+            )) {
+            break;
+        }
+    }
+
+    if (i == tr.portalsky.numSurfs) {
+        return;
+    }
+
+    oldParms = tr.viewParms;
+    newParms = tr.viewParms;
+
+    if (r_skyportal->integer) {
+        if (sscanf(
+                r_skyportal_origin->string,
+                "%f %f %f",
+                &newParms.or.origin[0],
+                &newParms.or.origin[1],
+                &newParms.or.origin[2]
+            )
+            != 3) {
+            ri.Printf(PRINT_WARNING, "WARNING: Invalid sky portal origin: %s\n", r_skyportal_origin->string);
+            return;
+        }
+    } else {
+        VectorCopy(tr.refdef.sky_origin, newParms.or.origin);
+        MatrixMultiply(newParms.or.axis, tr.refdef.sky_axis, newParms.or.axis);
+    }
+
+    VectorCopy(newParms.or.origin, newParms.pvsOrigin);
+    newParms.isPortalSky       = qtrue;
+    newParms.farplane_distance = tr.refdef.skybox_farplane;
+    newParms.renderTerrain     = tr.refdef.render_terrain;
+
+    if (oldParms.farplane_bias == 0.0 || oldParms.farplane_distance == 0.0) {
+        newParms.farplane_bias = 0.0;
+    } else {
+        newParms.farplane_bias = newParms.farplane_distance / oldParms.farplane_distance * oldParms.farplane_bias;
+    }
+
+    leaf = R_PointInLeaf(newParms.pvsOrigin);
+    if (leaf) {
+        R_RenderView(&newParms);
+    }
+
+    tr.viewParms = oldParms;
+
+    tr.portalsky.numSurfs = 0;
+    tr.skyRendered        = qtrue;
+
+    R_RotateForViewer();
+    R_SetupFrustum();
+}
+
+/*
+=================
+R_Sky_ChangeFrustum
+
+=================
+*/
+void R_Sky_ChangeFrustum()
+{
+    cplane_t *frust;
+    int       i;
+    vec3_t    bounds[2];
+    vec3_t    origin;
+    cplane_t  abouts[4];
+
+    VectorCopy(tr.portalsky.mins, bounds[0]);
+    VectorCopy(tr.portalsky.maxs, bounds[1]);
+    VectorCopy(tr.viewParms.or.origin, origin);
+
+    VectorCopy(tr.viewParms.or.axis[2], abouts[0].normal);
+    VectorNegate(tr.viewParms.or.axis[2], abouts[1].normal);
+    VectorCopy(tr.viewParms.or.axis[1], abouts[2].normal);
+    VectorNegate(tr.viewParms.or.axis[1], abouts[3].normal);
+
+    for (i = 0; i < 4; i++) {
+        cplane_t out;
+        int      i1;
+        float    leastfov = 99999;
+
+        frust = &tr.viewParms.frustum[i];
+
+        abouts[i].dist = DotProduct(tr.viewParms.or.origin, abouts[i].normal);
+        CrossProduct(frust->normal, abouts[i].normal, out.normal);
+
+        for (i1 = 0; i1 < 8; i1++) {
+            vec3_t point;
+            vec_t  distFromFrustum;
+            float  angle;
+            int    i2;
+
+            for (i2 = 0; i2 < 3; i2++) {
+                point[i2] = bounds[i1 % 3][i2];
+            }
+
+            VectorSubtract(point, origin, point);
+            distFromFrustum = DotProduct(point, frust->normal);
+            if (distFromFrustum <= 0) {
+                break;
+            }
+
+            angle = atan2(DotProduct(point, out.normal), distFromFrustum);
+            if (angle >= 0) {
+                angle = RAD2DEG(angle);
+                if (leastfov > angle) {
+                    leastfov = angle;
+                }
+            }
+        }
+
+        if (leastfov > 0 && leastfov < 180) {
+            RotatePointAroundVector(frust->normal, abouts[i].normal, frust->normal, leastfov);
+            VectorNormalize(frust->normal);
+
+            frust->type = PLANE_NON_AXIAL;
+            frust->dist = DotProduct(origin, frust->normal);
+            SetPlaneSignbits(frust);
+        }
+    }
+}
diff --git a/code/renderergl2/tr_sphere_shade.cpp b/code/renderergl2/tr_sphere_shade.cpp
new file mode 100644
index 00000000..c2dd2701
--- /dev/null
+++ b/code/renderergl2/tr_sphere_shade.cpp
@@ -0,0 +1,1465 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sphere_shade.cpp -- sphere shade
+
+#include "tr_local.h"
+
+typedef struct gatheredLight_s {
+    spherel_t       *pLight;
+    float            fIntensity;
+    gatheredLight_s *pPrev;
+    gatheredLight_s *pNext;
+} gatheredLight_t;
+
+// FIXME: unimplemlented (GL2)
+
+vec3_t          spheredef[6];
+suninfo_t       s_sun;
+static vec3_t   ambientlight;
+static qboolean bEntityOverbright;
+static int      iEntityLightingMax;
+static int      light_reference_count = 0;
+
+const float one_half_root  = 0.70710678118654752440084436210485f;
+const float one_third_root = 0.57735026918962576450914878050196f;
+
+static vec3_t offsets[26] = {
+    {1.0,             0.0,             0.0            },
+    {-1.0,            0.0,             0.0            },
+    {0.0,             1.0,             0.0            },
+    {0.0,             -1.0,            0.0            },
+    {0.0,             0.0,             1.0            },
+    {0.0,             0.0,             -1.0           },
+    {one_half_root,   one_half_root,   0.0            },
+    {one_half_root,   -one_half_root,  0.0            },
+    {-one_half_root,  one_half_root,   0.0            },
+    {-one_half_root,  -one_half_root,  0.0            },
+    {one_half_root,   0.0,             one_half_root  },
+    {one_half_root,   0.0,             -one_half_root },
+    {-one_half_root,  0.0,             one_half_root  },
+    {-one_half_root,  0.0,             -one_half_root },
+    {0.0,             one_half_root,   one_half_root  },
+    {0.0,             one_half_root,   -one_half_root },
+    {0.0,             -one_half_root,  one_half_root  },
+    {0.0,             -one_half_root,  -one_half_root },
+    {one_third_root,  one_third_root,  one_third_root },
+    {one_third_root,  one_third_root,  -one_third_root},
+    {one_third_root,  -one_third_root, one_third_root },
+    {one_third_root,  -one_third_root, -one_third_root},
+    {-one_third_root, one_third_root,  one_third_root },
+    {-one_third_root, one_third_root,  -one_third_root},
+    {-one_third_root, -one_third_root, one_third_root },
+    {-one_third_root, -one_third_root, -one_third_root}
+};
+
+#if 0
+
+int compare_light_intensities(const void *p1, const void *p2)
+{
+    return *(int *)&((const reallightinfo_t *)p2)->fIntensity - *(int *)&((const reallightinfo_t *)p1)->fIntensity;
+}
+
+static void RB_OptimizeLights()
+{
+    static int iCubeBuildInfo[24][9] = {
+        {0, 1, 2, 1,  1,  0, 6,  10, 18},
+        {0, 1, 2, 1,  -1, 0, 6,  11, 19},
+        {0, 1, 2, -1, 1,  0, 7,  10, 20},
+        {0, 1, 2, -1, -1, 0, 7,  11, 21},
+        {0, 1, 2, -1, -1, 1, 8,  12, 22},
+        {0, 1, 2, -1, 1,  1, 8,  13, 23},
+        {0, 1, 2, 1,  -1, 1, 9,  12, 24},
+        {0, 1, 2, 1,  1,  1, 9,  13, 25},
+        {1, 0, 2, 1,  1,  2, 6,  14, 18},
+        {1, 0, 2, 1,  -1, 2, 6,  15, 19},
+        {1, 0, 2, -1, -1, 3, 7,  16, 20},
+        {1, 0, 2, -1, 1,  3, 7,  17, 21},
+        {1, 0, 2, -1, 1,  2, 8,  14, 22},
+        {1, 0, 2, -1, -1, 2, 8,  15, 23},
+        {1, 0, 2, 1,  -1, 3, 9,  16, 24},
+        {1, 0, 2, 1,  1,  3, 9,  17, 25},
+        {2, 1, 0, 1,  1,  4, 14, 10, 18},
+        {2, 1, 0, -1, -1, 5, 15, 11, 19},
+        {2, 1, 0, -1, 1,  4, 16, 10, 20},
+        {2, 1, 0, 1,  -1, 5, 17, 11, 21},
+        {2, 1, 0, 1,  -1, 4, 14, 12, 22},
+        {2, 1, 0, -1, 1,  5, 15, 13, 23},
+        {2, 1, 0, -1, -1, 4, 16, 12, 24},
+        {2, 1, 0, 1,  1,  5, 17, 13, 25}
+    };
+    int    i, j;
+    int    nCubeMapLights;
+    float  fMaxIntensity;
+    vec3_t cubecolor[26];
+    vec3_t colorout;
+    float(*cube)[3][4];
+    reallightinfo_t *pLight;
+
+    nCubeMapLights = 0;
+
+    // FIXME: re-enable when cubemap light is fixed
+#if 0
+    if (backEnd.currentSphere->numRealLights > 2) {
+        qsort(
+            backEnd.currentSphere->light,
+            backEnd.currentSphere->numRealLights,
+            sizeof(reallightinfo_t),
+            compare_light_intensities
+        );
+
+        for (i = 0; i < backEnd.currentSphere->numRealLights && i < r_entlight_maxcalc->integer; i++) {
+            pLight = &backEnd.currentSphere->light[i];
+
+            if (pLight->fIntensity < r_entlight_cubelevel->value
+                || pLight->fIntensity * r_entlight_cubefraction->value > pLight->fIntensity) {
+                break;
+            }
+        }
+
+        nCubeMapLights = backEnd.currentSphere->numRealLights - i;
+        if (nCubeMapLights <= 1) {
+            nCubeMapLights = 0;
+        }
+    }
+#endif
+
+    backEnd.currentSphere->bUsesCubeMap = nCubeMapLights > 0;
+    if (backEnd.currentSphere->bUsesCubeMap) {
+        for (i = 0; i < 26; i++) {
+            float  fDot;
+            vec3_t v;
+
+            colorout[0] = backEnd.currentSphere->ambient.level[0];
+            colorout[1] = backEnd.currentSphere->ambient.level[1];
+            colorout[2] = backEnd.currentSphere->ambient.level[2];
+
+            for (j = backEnd.currentSphere->numRealLights - nCubeMapLights; j < backEnd.currentSphere->numRealLights;
+                 j++) {
+                pLight = &backEnd.currentSphere->light[j];
+
+                switch (pLight->eType) {
+                case LIGHT_SPOT:
+                    {
+                        fDot = DotProduct(pLight->vDirection, offsets[i]);
+                        if (fDot > 0) {
+                            float fProjSquared;
+                            float fDistSquared;
+
+                            VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                            fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                            fDistSquared  = VectorLengthSquared(v);
+                            fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                            if (fMaxIntensity > 0) {
+                                fDot /= fDistSquared;
+                                if (fMaxIntensity < 1) {
+                                    fDot *= fMaxIntensity;
+                                }
+
+                                VectorMA(colorout, fDot, pLight->color, colorout);
+                            }
+                        }
+                    }
+                    break;
+                case LIGHT_SPOT_FAST:
+                    fDot = DotProduct(pLight->vDirection, offsets[i]);
+                    if (fDot > 0) {
+                        float fDistSquared;
+
+                        VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                        fDistSquared = VectorLengthSquared(v);
+
+                        fDot /= fDistSquared;
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_DIRECTIONAL:
+                    fDot = DotProduct(pLight->vDirection, offsets[i]);
+                    if (fDot > 0) {
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_POINT:
+                    VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                    fDot = DotProduct(v, offsets[i]);
+                    if (fDot > 0) {
+                        fDot /= VectorLengthSquared(v);
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                default:
+                    assert(!"unhandled light type");
+                    break;
+                }
+            }
+
+            cubecolor[i][0] = Q_min(colorout[0], 255);
+            cubecolor[i][1] = Q_min(colorout[1], 255);
+            cubecolor[i][2] = Q_min(colorout[2], 255);
+        }
+
+        cube = backEnd.currentSphere->cubemap;
+
+        for (i = 0; i < 24; i++) {
+            for (j = 0; j < 3; j++) {
+                vec4_t f;
+
+                f[0] = cubecolor[iCubeBuildInfo[i][5]][j];
+                f[1] = cubecolor[iCubeBuildInfo[i][6]][j];
+                f[2] = cubecolor[iCubeBuildInfo[i][7]][j];
+                f[3] = cubecolor[iCubeBuildInfo[i][8]][j];
+
+                cube[i][j][0] = f[0];
+                cube[i][j][1] = (f[1] - f[0]) * iCubeBuildInfo[i][3];
+                cube[i][j][2] = (f[2] - f[0]) * iCubeBuildInfo[i][4];
+                cube[i][j][3] = (f[0] - f[1] - f[2] + f[3]) * iCubeBuildInfo[i][3] * iCubeBuildInfo[i][4];
+            }
+        }
+
+        backEnd.currentSphere->numRealLights -= nCubeMapLights;
+    }
+
+    for (i = 0; i < backEnd.currentSphere->numRealLights; i++) {
+        float  fDistParallel;
+        float  fDistPerp;
+        float  fDistSquared;
+        float  fRadiusSquared;
+        float  fSlope;
+        vec3_t v;
+
+        pLight = &backEnd.currentSphere->light[i];
+
+        switch (pLight->eType) {
+        case LIGHT_SPOT:
+            VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+            fDistSquared   = VectorLengthSquared(v);
+            fSlope         = DotProduct(v, pLight->vDirection);
+            fDistPerp      = sqrt(fDistSquared - Square(fSlope));
+            fRadiusSquared = Square(backEnd.currentSphere->radius);
+            fDistParallel  = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
+            if (Square(fDistParallel) >= fRadiusSquared + Square(pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
+                pLight->eType = LIGHT_SPOT_FAST;
+            }
+            break;
+        case LIGHT_POINT:
+            if ((pLight->fDist - backEnd.currentSphere->radius) * r_entlight_errbound->value * pLight->fDist
+                > backEnd.currentSphere->radius * pLight->fIntensity) {
+                pLight->eType = LIGHT_DIRECTIONAL;
+
+                VectorScale(pLight->color, 1.0f / pLight->fDist, pLight->color);
+                VectorNormalize2(pLight->vOrigin, pLight->vDirection);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+static void RB_Light_CubeMap(unsigned char *colors)
+{
+    int              i, j;
+    float           *normal;
+    float           *xyz;
+    unsigned char   *color;
+    vec3_t           colorout;
+    reallightinfo_t *pLight;
+
+    color  = colors;
+    normal = (float *)tess.normal;
+    xyz    = (float *)tess.xyz;
+
+    for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+        unsigned int components[3];
+
+        if (normal[1] == -1) {
+            components[0] = 1;
+            components[1] = 0;
+            components[2] = 2;
+        } else if (normal[1] == 1 && !normal[0] && !normal[2]) {
+            components[0] = 1;
+            components[1] = 0;
+            components[2] = 2;
+        } else if (Q_fabs(normal[0]) >= Q_fabs(normal[2])) {
+            components[0] = 0;
+            components[1] = 1;
+            components[2] = 2;
+        } else {
+            components[0] = 2;
+            components[1] = 1;
+            components[2] = 0;
+        }
+
+        unsigned int cubeIndex =
+            (normal[2] < 0 ? 1 : 0) | (normal[1] < 0 ? 2 : 0) | (normal[0] < 0 ? 4 : 0) | (components[0] << 3);
+        float newnorms[3];
+        float mapping[3];
+        float(*cube)[3][4];
+
+        newnorms[0] = normal[components[0]];
+        newnorms[1] = normal[components[1]];
+        newnorms[2] = normal[components[2]];
+
+        mapping[0] = 1.f / newnorms[0] * newnorms[1];
+        mapping[1] = 1.f / newnorms[0] * newnorms[2];
+        mapping[2] = mapping[0] * mapping[1];
+
+        cube = &backEnd.currentSphere->cubemap[cubeIndex];
+        colorout[0] =
+            (*cube)[0][0] + (*cube)[0][1] * mapping[0] + (*cube)[0][2] * mapping[1] + (*cube)[0][3] * mapping[2];
+        colorout[1] =
+            (*cube)[1][0] + (*cube)[1][1] * mapping[0] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
+        colorout[2] =
+            (*cube)[2][0] + (*cube)[2][1] * mapping[0] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[2];
+
+        for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
+            float  fDistSquared;
+            float  fProjSquared;
+            float  fMaxIntensity;
+            float  fDot;
+            vec3_t v;
+
+            pLight = &backEnd.currentSphere->light[j];
+
+            switch (pLight->eType) {
+            case LIGHT_DIRECTIONAL:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorMA(colorout, fDot, pLight->color, colorout);
+                }
+                break;
+            case LIGHT_SPOT:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+
+                    fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                    fDistSquared  = VectorLengthSquared(v);
+                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                    if (fMaxIntensity > 0) {
+                        fDot /= fDistSquared;
+                        if (fMaxIntensity < 1) {
+                            fDot *= fMaxIntensity;
+                        }
+
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                }
+                break;
+            case LIGHT_SPOT_FAST:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                }
+                break;
+            case LIGHT_POINT:
+                VectorSubtract(pLight->vOrigin, xyz, v);
+                fDot = DotProduct(v, normal);
+                if (fDot > 0) {
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                }
+                break;
+            }
+        }
+
+        color[0] = Q_min(colorout[0], 255);
+        color[1] = Q_min(colorout[1], 255);
+        color[2] = Q_min(colorout[2], 255);
+        color[3] = 0xff;
+    }
+}
+
+void RB_Light_Real(unsigned char *colors)
+{
+    int              i, j;
+    float           *normal;
+    float           *xyz;
+    unsigned char   *color;
+    vec3_t           v;
+    vec3_t           colorout;
+    float            fDot;
+    reallightinfo_t *pLight;
+
+    color = colors;
+    if (backEnd.currentSphere->bUsesCubeMap) {
+        RB_Light_CubeMap(colors);
+        return;
+    }
+
+    if (!backEnd.currentSphere->numRealLights) {
+        for (i = 0; i < tess.numVertexes; i++, color += 4) {
+            color[0] = backEnd.currentSphere->ambient.level[0];
+            color[1] = backEnd.currentSphere->ambient.level[1];
+            color[2] = backEnd.currentSphere->ambient.level[2];
+            color[3] = backEnd.currentSphere->ambient.level[3];
+        }
+        return;
+    }
+
+    if (backEnd.currentSphere->numRealLights != 1) {
+        normal = (float *)tess.normal;
+        xyz    = (float *)tess.xyz;
+
+        for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+            colorout[0] = colorout[1] = colorout[2] = 0;
+
+            for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
+                float fDistSquared;
+                float fProjSquared;
+                float fMaxIntensity;
+
+                pLight = &backEnd.currentSphere->light[j];
+
+                switch (pLight->eType) {
+                case LIGHT_DIRECTIONAL:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_SPOT:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorSubtract(pLight->vOrigin, xyz, v);
+
+                        fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                        fDistSquared  = VectorLengthSquared(v);
+                        fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                        if (fMaxIntensity > 0) {
+                            fDot /= fDistSquared;
+                            if (fMaxIntensity < 1) {
+                                fDot *= fMaxIntensity;
+                            }
+
+                            VectorMA(colorout, fDot, pLight->color, colorout);
+                        }
+                    }
+                    break;
+                case LIGHT_SPOT_FAST:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorSubtract(pLight->vOrigin, xyz, v);
+                        fDistSquared = VectorLengthSquared(v);
+                        VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_POINT:
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDot = DotProduct(v, normal);
+                    if (fDot > 0) {
+                        fDistSquared = VectorLengthSquared(v);
+                        VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                    }
+                    break;
+                }
+            }
+
+            color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+            color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+            color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+            color[3] = 0xff;
+        }
+    } else {
+        normal = (float *)tess.normal;
+        xyz    = (float *)tess.xyz;
+
+        pLight = &backEnd.currentSphere->light[0];
+
+        switch (backEnd.currentSphere->light[0].eType) {
+        case LIGHT_DIRECTIONAL:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorScale(pLight->color, fDot, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                } else {
+                    color[0] = backEnd.currentSphere->ambient.level[0];
+                    color[1] = backEnd.currentSphere->ambient.level[1];
+                    color[2] = backEnd.currentSphere->ambient.level[2];
+                    color[3] = backEnd.currentSphere->ambient.level[3];
+                }
+            }
+            break;
+        case LIGHT_SPOT:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                float fDistSquared;
+                float fProjSquared;
+                float fMaxIntensity;
+
+                color[0] = backEnd.currentSphere->ambient.level[0];
+                color[1] = backEnd.currentSphere->ambient.level[1];
+                color[2] = backEnd.currentSphere->ambient.level[2];
+                color[3] = backEnd.currentSphere->ambient.level[3];
+
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+
+                    fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                    fDistSquared  = VectorLengthSquared(v);
+                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                    if (fMaxIntensity > 0) {
+                        fDot /= fDistSquared;
+                        if (fMaxIntensity < 1) {
+                            fDot *= fMaxIntensity;
+                        }
+
+                        VectorScale(pLight->color, fDot, colorout);
+
+                        color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                        color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                        color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                        color[3] = 0xff;
+                    }
+                }
+            }
+            break;
+        case LIGHT_SPOT_FAST:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                color[0] = backEnd.currentSphere->ambient.level[0];
+                color[1] = backEnd.currentSphere->ambient.level[1];
+                color[2] = backEnd.currentSphere->ambient.level[2];
+                color[3] = backEnd.currentSphere->ambient.level[3];
+
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    float fDistSquared;
+
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                }
+            }
+            break;
+        case LIGHT_POINT:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                VectorSubtract(pLight->vOrigin, xyz, v);
+                fDot = DotProduct(v, normal);
+                if (fDot > 0) {
+                    float fDistSquared;
+
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                } else {
+                    color[0] = backEnd.currentSphere->ambient.level[0];
+                    color[1] = backEnd.currentSphere->ambient.level[1];
+                    color[2] = backEnd.currentSphere->ambient.level[2];
+                    color[3] = backEnd.currentSphere->ambient.level[3];
+                }
+            }
+            break;
+        }
+    }
+}
+
+static void RB_Sphere_Light_Sun()
+{
+    int      curleaf;
+    qboolean hitSun;
+    vec3_t   end;
+    mnode_t *leaf;
+    trace_t  trace;
+
+    if (!s_sun.exists) {
+        return;
+    }
+
+    if (tr.world->vis && backEnd.currentSphere->leaves[0] && tr.sSunLight.leaf == (struct mnode_s *)-1) {
+        vec3_t transpos;
+        vec3_t temppos;
+
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
+            if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
+                break;
+            }
+        }
+
+        if (!leaf || (leaf->lights && leaf->lights[0] != &tr.sSunLight)) {
+            if (r_light_sun_line->integer) {
+                VectorMA(backEnd.currentSphere->worldOrigin, 16384.0, s_sun.direction, end);
+
+                VectorCopy(backEnd.currentEntity->e.origin, temppos);
+                MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
+
+                GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+
+                qglPushMatrix();
+
+                qglLoadMatrixf(backEnd.ori.modelMatrix);
+                // Clear the depth range
+                qglDepthRange(0.0, 0.0);
+
+                qglDisable(GL_TEXTURE_2D);
+
+                qglBegin(GL_LINES);
+                qglColor3f(0.0, 0.0, 0.0);
+                qglVertex3fv(backEnd.currentSphere->origin);
+                qglColor3f(0.5, 0.5, 0.5);
+                qglVertex3fv(transpos);
+                qglEnd();
+
+                qglEnable(GL_TEXTURE_2D);
+
+                // Bring the depth range back
+                qglDepthRange(0.0, 1.0);
+
+                qglPopMatrix();
+            }
+
+            return;
+        }
+    }
+
+    VectorMA(backEnd.currentSphere->traceOrigin, 16384.0, s_sun.direction, end);
+    ri.CM_BoxTrace(
+        &trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID | CONTENTS_FENCE, 0
+    );
+
+    hitSun = (trace.surfaceFlags >> 2) & 1;
+    if (r_light_sun_line->integer) {
+        vec3_t transpos;
+        vec3_t temppos;
+
+        VectorSubtract(trace.endpos, backEnd.currentEntity->e.origin, temppos);
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
+
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+
+        qglPushMatrix();
+
+        qglLoadMatrixf(backEnd.ori.modelMatrix);
+        // Clear the depth range
+        qglDepthRange(0.0, 0.0);
+
+        qglDisable(GL_TEXTURE_2D);
+
+        qglBegin(GL_LINES);
+
+        if (hitSun) {
+            qglColor3f(1.0, 1.0, 0.0);
+        } else {
+            qglColor3f(0.0, 0.0, 0.0);
+        }
+
+        qglVertex3fv(backEnd.currentSphere->origin);
+        qglColor3f(0.5, 0.5, 0.5);
+        qglVertex3fv(transpos);
+        qglEnd();
+
+        qglEnable(GL_TEXTURE_2D);
+
+        // Bring the depth range back
+        qglDepthRange(0.0, 1.0);
+
+        qglPopMatrix();
+    }
+
+    if (hitSun) {
+        vec3_t           sunnormal;
+        sphereor_t      *pSphere;
+        reallightinfo_t *pLight;
+
+        pSphere = backEnd.currentSphere;
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, s_sun.direction, sunnormal);
+
+        pLight = &pSphere->light[pSphere->numRealLights];
+        VectorScale(s_sun.color, r_entlight_scale->value, pLight->color);
+        //VectorScale(s_sun.color, r_entlight_scale->value * tr.overbrightMult, pLight->color);
+
+        VectorCopy(sunnormal, pLight->vDirection);
+        pLight->eType      = LIGHT_DIRECTIONAL;
+        pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+        pSphere->numRealLights++;
+    }
+}
+
+static qboolean RB_Sphere_CalculateSphereOrigin()
+{
+    vec3_t        *axis;
+    vec3_t         sphereOrigin;
+    trRefEntity_t *refent;
+    trRefEntity_t *newref;
+
+    axis = backEnd.currentEntity->e.axis;
+    if (!backEnd.currentEntity->e.tiki) {
+        return qfalse;
+    }
+
+    backEnd.currentSphere->radius = backEnd.currentEntity->e.radius;
+    VectorCopy(backEnd.currentEntity->e.lightingOrigin, backEnd.currentSphere->worldOrigin);
+
+    VectorSubtract(backEnd.currentSphere->worldOrigin, backEnd.currentEntity->e.origin, sphereOrigin);
+    MatrixTransformVectorRight(axis, sphereOrigin, backEnd.currentSphere->origin);
+
+    for (refent = backEnd.currentEntity;; refent = newref) {
+        if (refent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        newref = &backEnd.refdef.entities[refent->e.parentEntity];
+        if (refent == newref) {
+            break;
+        }
+    }
+
+    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
+
+    return qtrue;
+}
+
+static bool RB_Sphere_SetupGlobals()
+{
+    int i;
+
+    if ((backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && !(backEnd.refdef.rdflags & RDF_HUD)) {
+        backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+        return false;
+    }
+
+    if (backEnd.refdef.rdflags & RDF_HUD) {
+        if (!backEnd.refdef.vieworg[0] && !backEnd.refdef.vieworg[1] && !backEnd.refdef.vieworg[2]) {
+            backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+            return false;
+        }
+
+        VectorCopy(backEnd.refdef.vieworg, backEnd.currentSphere->worldOrigin);
+        VectorClear(backEnd.currentSphere->origin);
+        backEnd.currentSphere->radius = 2.0;
+    } else if (!RB_Sphere_CalculateSphereOrigin()) {
+        backEnd.currentSphere->TessFunction = &RB_CalcLightGridColor;
+
+        if (!backEnd.currentEntity->bLightGridCalculated) {
+            RB_SetupEntityGridLighting();
+        }
+
+        return false;
+    }
+
+    light_reference_count++;
+    for (i = 0; i < 8; i++) {
+        backEnd.currentSphere->leaves[i] = 0;
+    }
+
+    R_SphereInLeafs(
+        backEnd.currentSphere->worldOrigin, backEnd.currentSphere->radius, backEnd.currentSphere->leaves, 8
+    );
+
+    backEnd.currentSphere->TessFunction = &RB_Light_Real;
+    return true;
+}
+
+static bool RB_Sphere_ResetPointColors()
+{
+    vec3_t light_offset, amb;
+
+    R_GetLightingGridValue(backEnd.currentSphere->worldOrigin, light_offset);
+    light_offset[0] = ambientlight[0] + light_offset[0] * 0.18;
+    light_offset[1] = ambientlight[1] + light_offset[1] * 0.18;
+    light_offset[2] = ambientlight[2] + light_offset[2] * 0.18;
+    if (tr.refdef.rdflags & RDF_FULLBRIGHT) {
+        float fMin = tr.identityLight * 20.0;
+
+        if (fMin <= light_offset[0] || fMin <= light_offset[1] || fMin <= light_offset[2]) {
+            light_offset[0] += fMin;
+            light_offset[1] += fMin;
+            light_offset[2] += fMin;
+        }
+    }
+
+    VectorScale(light_offset, tr.overbrightMult * r_entlight_scale->value, amb);
+    backEnd.currentSphere->ambient.level[0] = Q_min(amb[0], 0xff);
+    backEnd.currentSphere->ambient.level[1] = Q_min(amb[1], 0xff);
+    backEnd.currentSphere->ambient.level[2] = Q_min(amb[2], 0xff);
+    backEnd.currentSphere->ambient.level[3] = 0xff;
+
+    return true;
+}
+
+static void RB_Sphere_DrawDebugLine(const spherel_t *thislight, float falloff, const vec3_t origin)
+{
+    int    i;
+    vec3_t newColor;
+    vec3_t fakeLine, fakeLine2;
+
+    if (!r_light_lines->integer) {
+        return;
+    }
+
+    qglPushMatrix();
+
+    qglLoadMatrixf(backEnd.ori.modelMatrix);
+    // Clear the depth range
+    qglDepthRange(0.0, 0.0);
+
+    qglDisable(GL_TEXTURE_2D);
+
+    if (r_light_lines->integer == 2) {
+        newColor[0] = thislight->color[0] * (falloff * r_entlight_scale->value / 255.0);
+        newColor[1] = thislight->color[1] * (falloff * r_entlight_scale->value / 255.0);
+        newColor[2] = thislight->color[2] * (falloff * r_entlight_scale->value / 255.0);
+
+        if (newColor[0] > 1 || newColor[1] > 1 || newColor[2] > 1) {
+            NormalizeColor(newColor, newColor);
+        }
+    } else if (thislight->spot_light) {
+        newColor[0] = 1.0;
+        newColor[1] = 0.7;
+        newColor[2] = 0.7;
+    } else {
+        newColor[0] = 1.0;
+        newColor[1] = 1.0;
+        newColor[2] = 1.0;
+    }
+
+    qglColor3f(newColor[0], newColor[1], newColor[2]);
+
+    qglBegin(GL_LINES);
+    qglVertex3fv(origin);
+    qglVertex3fv(backEnd.currentSphere->origin);
+
+    for (i = 0; i < 5; i += 2) {
+        VectorMA(origin, 16.0, spheredef[i], fakeLine);
+        VectorMA(origin, -16.0, spheredef[i], fakeLine2);
+
+        qglVertex3fv(fakeLine);
+        qglVertex3fv(fakeLine2);
+    }
+
+    if (thislight->spot_light) {
+        qglColor3f(0.7, 1.0, 0.7);
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, fakeLine);
+        VectorMA(origin, 32.0, fakeLine, fakeLine);
+
+        qglVertex3fv(origin);
+        qglVertex3fv(fakeLine);
+    }
+
+    qglEnd();
+    qglEnable(GL_TEXTURE_2D);
+    // Restore depth
+    qglDepthRange(0.0, 1.0);
+    qglPopMatrix();
+}
+
+static void RB_Sphere_AddSpotLight(const spherel_t *thislight)
+{
+    vec3_t lightorigin;
+    vec3_t newlight;
+    vec3_t lightline;
+    vec3_t newdir;
+    float  falloff;
+    float  dot;
+    float  radiusByDistance;
+    float  radiusAtDist;
+    float  sampleRadius;
+    vec3_t pointAtDist;
+
+    radiusByDistance = thislight->spot_radiusbydistance;
+    if (radiusByDistance < 0) {
+        vec3_t proj;
+        vec3_t delta;
+        float  distfromcentroid;
+
+        dot =
+            -(DotProduct(backEnd.currentSphere->worldOrigin, thislight->spot_dir)
+              - DotProduct(thislight->origin, thislight->spot_dir));
+        VectorMA(thislight->origin, dot, thislight->spot_dir, proj);
+        VectorSubtract(proj, thislight->origin, delta);
+
+        distfromcentroid = VectorLengthSquared(delta);
+        if (distfromcentroid > radiusByDistance * radiusByDistance) {
+            VectorScale(delta, -radiusByDistance / sqrt(distfromcentroid), delta);
+        }
+
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+        VectorAdd(lightorigin, delta, lightorigin);
+    } else {
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+    }
+
+    MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
+    VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
+
+    falloff = thislight->intensity * 7500.0 / VectorLengthSquared(newlight);
+    if (falloff >= 5.0) {
+        reallightinfo_t *pLight;
+        float            fMinDist;
+        float            fRadByDistSquared;
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, newdir);
+        dot = -DotProduct(newlight, newdir);
+        if (dot > 0) {
+            fMinDist = sqrt(
+                Square(newlight[0] + newdir[0] * dot) + Square(newlight[1] + newdir[1] * dot)
+                + Square(newlight[2] + newdir[2] * dot)
+            );
+
+            if (fMinDist < radiusByDistance * dot && backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
+
+                pLight->eType = LIGHT_SPOT;
+                VectorScale(thislight->color, thislight->intensity * 7500.0 * tr.overbrightMult, pLight->color);
+                pLight->fDist = VectorLength(newlight);
+                pLight->fIntensity =
+                    (thislight->color[0] * 0.299f + thislight->color[1] * 0.587f + thislight->color[2] * 0.114f)
+                    * (thislight->intensity * 7500.0 * tr.overbrightMult);
+
+                sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
+                if (sampleRadius > 0) {
+                    pLight->fIntensity /= (sampleRadius * sampleRadius);
+                }
+
+                VectorCopy(lightline, pLight->vOrigin);
+                VectorNegate(newdir, pLight->vDirection);
+                fRadByDistSquared  = radiusByDistance * radiusByDistance;
+                pLight->fSpotConst = fRadByDistSquared + 1.0;
+                pLight->fSpotScale = 1.0 / (fRadByDistSquared * 0.19);
+                pLight->fSpotSlope = radiusByDistance;
+
+                backEnd.currentSphere->numRealLights++;
+            }
+
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+        }
+    }
+}
+
+static void RB_Sphere_AddLight(const spherel_t *thislight)
+{
+    vec3_t lightorigin;
+    vec3_t newlight;
+    vec3_t lightline;
+    float  intensity;
+    float  falloff;
+
+    if (thislight->intensity > 0 && (backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
+        return;
+    }
+
+    if (thislight->intensity < 0 && !(backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
+        return;
+    }
+
+    if (thislight->needs_trace) {
+        trace_t trace;
+        ri.CM_BoxTrace(
+            &trace,
+            backEnd.currentSphere->traceOrigin,
+            thislight->origin,
+            vec3_origin,
+            vec3_origin,
+            0,
+            CONTENTS_SOLID,
+            0
+        );
+
+        if (trace.fraction < 1) {
+            return;
+        }
+    }
+
+    if (!thislight->spot_light) {
+        reallightinfo_t *pLight;
+        float            fDist;
+        float            fRadius;
+
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
+        VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
+
+        intensity = fabs(thislight->intensity) * 7500.0;
+        falloff   = 1.f / VectorLengthSquared(newlight) * intensity;
+        if (falloff >= 5.0) {
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+
+            if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
+
+                fDist = VectorLength(newlight);
+                VectorScale(
+                    thislight->color, falloff * tr.overbrightMult * r_entlight_scale->value * fDist, pLight->color
+                );
+
+                VectorCopy(lightline, pLight->vOrigin);
+                pLight->fDist      = fDist;
+                pLight->eType      = LIGHT_POINT;
+                pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+                fRadius = fDist - backEnd.currentSphere->radius;
+                if (fRadius > 0) {
+                    pLight->fIntensity /= fRadius;
+                }
+
+                backEnd.currentSphere->numRealLights++;
+            }
+        }
+    } else {
+        RB_Sphere_AddSpotLight(thislight);
+    }
+}
+
+static void RB_Sphere_BuildStaticLights()
+{
+    int      i;
+    int      curleaf;
+    mnode_t *leaf;
+
+    if (tr.world->vis) {
+        int cntarea;
+
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
+            cntarea = leaf->numlights;
+
+            if (cntarea) {
+                for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
+                    spherel_t *pLight = leaf->lights[i];
+                    byte       mask   = backEnd.refdef.areamask[pLight->leaf->area >> 3];
+
+                    if (!(mask & (1 << (pLight->leaf->area & 7))) && pLight->reference_count != light_reference_count) {
+                        RB_Sphere_AddLight(pLight);
+                        pLight->reference_count = light_reference_count;
+                    }
+                }
+            }
+        }
+    } else {
+        for (i = 0; i < tr.numSLights; i++) {
+            RB_Sphere_AddLight(&tr.sLights[i]);
+        }
+    }
+}
+
+void RB_Sphere_BuildDLights()
+{
+    int              i;
+    float            length;
+    vec3_t           lightorigin;
+    vec3_t           delta;
+    float            scale;
+    float            fRadius;
+    sphereor_t      *pSphere;
+    reallightinfo_t *pLight;
+
+    pSphere                             = backEnd.currentSphere;
+    backEnd.currentSphere->TessFunction = RB_Light_Real;
+
+    for (i = 0; i < backEnd.refdef.num_dlights && pSphere->numRealLights < MAX_REAL_LIGHTS; i++) {
+        VectorSubtract(backEnd.refdef.dlights[i].origin, pSphere->worldOrigin, delta);
+        length = VectorLength(delta);
+
+        fRadius = backEnd.refdef.dlights[i].radius + pSphere->radius;
+        if (fRadius < length) {
+            continue;
+        }
+
+        VectorSubtract(backEnd.refdef.dlights[i].origin, backEnd.currentEntity->e.origin, lightorigin);
+        scale  = r_entlight_scale->value * tr.overbrightMult * 7500.0 * backEnd.refdef.dlights[i].radius / length;
+        pLight = &pSphere->light[pSphere->numRealLights];
+        pLight->color[0] = scale * backEnd.refdef.dlights[i].color[0];
+        pLight->color[1] = scale * backEnd.refdef.dlights[i].color[1];
+        pLight->color[2] = scale * backEnd.refdef.dlights[i].color[2];
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, pLight->vOrigin);
+
+        pLight->eType      = LIGHT_POINT;
+        pLight->fDist      = length;
+        pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+        if (pLight->fDist - backEnd.currentSphere->radius >= 0.f) {
+            pLight->fIntensity /= pLight->fDist - backEnd.currentSphere->radius;
+        }
+
+        backEnd.currentSphere->numRealLights++;
+    }
+}
+
+void RB_Sphere_SetupEntity()
+{
+    if (r_light_nolight->integer) {
+        backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+    } else if (RB_Sphere_SetupGlobals() && RB_Sphere_ResetPointColors()) {
+        backEnd.currentSphere->numRealLights = 0;
+        RB_Sphere_Light_Sun();
+        RB_Sphere_BuildStaticLights();
+        RB_Sphere_BuildDLights();
+        backEnd.pc.c_characterlights += backEnd.currentSphere->numRealLights;
+        RB_OptimizeLights();
+    }
+}
+
+void RB_Grid_SetupEntity()
+{
+    trRefEntity_t *refent;
+    trRefEntity_t *newref;
+
+    for (refent = backEnd.currentEntity;; refent = newref) {
+        if (refent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        newref = &backEnd.refdef.entities[refent->e.parentEntity];
+        if (refent == newref) {
+            break;
+        }
+    }
+
+    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
+    RB_SetupEntityGridLighting();
+}
+
+void RB_Grid_SetupStaticModel()
+{
+    RB_SetupStaticModelGridLighting(&tr.refdef, backEnd.currentStaticModel, backEnd.currentStaticModel->origin);
+}
+
+void RB_Light_Fullbright(unsigned char *colors)
+{
+    int i;
+
+    for (i = 0; i < tess.numVertexes; i++) {
+        colors[i * 4]     = 0xFF;
+        colors[i * 4 + 1] = 0xFF;
+        colors[i * 4 + 2] = 0xFF;
+        colors[i * 4 + 3] = 0xFF;
+    }
+}
+
+void R_Sphere_InitLights()
+{
+    const char *ents;
+    const char *ret;
+    qboolean    bFlareDirSet;
+    qboolean    bIsWorld;
+    qboolean    bWorldProcessed;
+
+    ents            = ri.CM_EntityString();
+    bFlareDirSet    = qfalse;
+    bIsWorld        = qfalse;
+    bWorldProcessed = qfalse;
+
+    s_sun.szFlareName[0] = 0;
+    s_sun.exists         = qfalse;
+
+    for (int i = 0; i < MAX_SPHERE_LIGHTS; i++) {
+        backEnd.spheres[i].TessFunction = &RB_Light_Real;
+    }
+
+    VectorClear(ambientlight);
+    backEnd.spareSphere.TessFunction = &RB_Light_Real;
+    backEnd.currentSphere            = &backEnd.spareSphere;
+    bEntityOverbright                = qfalse;
+    iEntityLightingMax               = tr.identityLightByte;
+    s_sun.color[0] = s_sun.color[1] = s_sun.color[2] = tr.overbrightMult * 70;
+
+    while (ents) {
+        ret = COM_Parse((char **)&ents);
+        if (*ret == '{' || *ret == '}') {
+            continue;
+        }
+
+        if (!bWorldProcessed && !strcmp(ret, "classname")) {
+            //
+            // Added in 2.0
+            //  Make sure that the world's properties are not overridden
+            //  by some random entities
+            //
+            if (!strcmp(COM_Parse((char **)&ents), "worldspawn")) {
+                bIsWorld = qtrue;
+            } else {
+                bWorldProcessed = qtrue;
+            }
+
+            continue;
+        }
+
+        if (!strcmp(ret, "suncolor") || !strcmp(ret, "sunlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple suncolors defined in map\n");
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &s_sun.color[0], &s_sun.color[1], &s_sun.color[2]);
+            s_sun.color[0] *= tr.overbrightMult;
+            s_sun.color[1] *= tr.overbrightMult;
+            s_sun.color[2] *= tr.overbrightMult;
+            s_sun.exists = qtrue;
+        } else if (!strcmp(ret, "sundirection")) {
+            vec3_t dir;
+
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple sundirections defined in map\n");
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
+            AngleVectorsLeft(dir, s_sun.direction, 0, 0);
+
+            s_sun.exists = qtrue;
+            if (!bFlareDirSet) {
+                s_sun.flaredirection[0] = s_sun.direction[0];
+                s_sun.flaredirection[1] = s_sun.direction[1];
+                s_sun.flaredirection[2] = s_sun.direction[2];
+            }
+        } else if (!strcmp(ret, "sunflaredirection")) {
+            vec3_t dir;
+
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
+            AngleVectorsLeft(dir, s_sun.flaredirection, 0, 0);
+            bFlareDirSet = qtrue;
+        } else if (!strcmp(ret, "sunflarename")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            Q_strncpyz(s_sun.szFlareName, COM_Parse((char **)&ents), sizeof(s_sun.szFlareName));
+        } else if (!strcmp(ret, "ambientlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple ambientlights defined in map\n");
+                continue;
+            }
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &ambientlight[0], &ambientlight[1], &ambientlight[2]);
+        } else if (!strcmp(ret, "overbright")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            ret = COM_Parse((char **)&ents);
+            if (strcmp(ret, "world") || strcmp(ret, "none")) {
+                bEntityOverbright  = qtrue;
+                iEntityLightingMax = 0xFF;
+            }
+        } else {
+            COM_Parse((char **)&ents);
+        }
+    }
+
+    if (s_sun.exists && !s_sun.szFlareName[0]) {
+        Q_strncpyz(s_sun.szFlareName, "sun", sizeof(s_sun.szFlareName));
+    }
+}
+
+static qboolean R_CheckAddLightToList(spherel_t *pLight, const vec3_t vPos, float *pfFalloff)
+{
+    vec3_t vDelta;
+
+    if (pLight->intensity < 0) {
+        return qfalse;
+    }
+
+    VectorSubtract(pLight->origin, vPos, vDelta);
+    *pfFalloff = pLight->intensity * 7500.0 / VectorLengthSquared(vDelta);
+
+    return *pfFalloff >= 5.0;
+}
+
+static void R_InsertLightIntoList(spherel_t *pLight, float fIntensity, gatheredLight_t **pLightsList)
+{
+    gatheredLight_t *pCurrLight;
+    gatheredLight_t *pLastLight;
+
+    if (pLightsList[0]->pPrev->fIntensity >= fIntensity) {
+        return;
+    }
+
+    if (fIntensity > pLightsList[0]->fIntensity) {
+        pLightsList[0]             = pLightsList[0]->pPrev;
+        pLightsList[0]->pLight     = pLight;
+        pLightsList[0]->fIntensity = fIntensity;
+        return;
+    }
+
+    pCurrLight = pLightsList[0]->pNext;
+    if (!pCurrLight) {
+        return;
+    }
+
+    while (pCurrLight->fIntensity >= fIntensity) {
+        pCurrLight = pCurrLight->pNext;
+        if (!pCurrLight) {
+            return;
+        }
+    }
+
+    pLastLight                   = pLightsList[0]->pPrev->pPrev;
+    pCurrLight->pPrev->pNext     = pLightsList[0]->pPrev;
+    pLightsList[0]->pPrev->pPrev = pCurrLight->pPrev;
+    pLightsList[0]->pPrev->pNext = pCurrLight;
+    pCurrLight->pPrev            = pLightsList[0]->pPrev;
+    pLastLight->pNext            = pLightsList[0];
+    pLightsList[0]->pPrev        = pLastLight;
+    pCurrLight                   = pCurrLight->pPrev;
+    pCurrLight->fIntensity       = fIntensity;
+    pCurrLight->pLight           = pLight;
+}
+
+#endif
+
+#define MAX_GATHERED_LIGHTS 8
+
+int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightIntensity, int iMaxLights)
+{
+    // FIXME: unimplemented (GL2)
+    return 0;
+
+#if 0
+    int              i, j;
+    int              iLightCount;
+    vec3_t           vEnd;
+    vec3_t           vDelta;
+    spherel_t       *pCurrLight;
+    gatheredLight_t  lights[MAX_GATHERED_LIGHTS];
+    gatheredLight_t *pLightsHead;
+    gatheredLight_t *pLightsCurr;
+    float            fFalloff;
+    trace_t          trace;
+    mnode_t         *leaf;
+
+    fFalloff = 0;
+    leaf     = NULL;
+
+    if (iMaxLights <= 0 || !r_drawspherelights->integer) {
+        return 0;
+    }
+
+    memset(lights, 0, sizeof(lights));
+
+    for (j = 0; j < MAX_GATHERED_LIGHTS - 2; j++) {
+        lights[j + 1].pNext = &lights[j + 2];
+        lights[j + 1].pPrev = &lights[j];
+    }
+
+    lights[0].pNext                       = &lights[1];
+    lights[0].pPrev                       = &lights[MAX_GATHERED_LIGHTS - 1];
+    lights[MAX_GATHERED_LIGHTS - 1].pNext = &lights[0];
+    lights[MAX_GATHERED_LIGHTS - 1].pPrev = &lights[MAX_GATHERED_LIGHTS - 2];
+    pLightsHead                           = &lights[0];
+
+    if (tr.world->vis) {
+        leaf = R_PointInLeaf(vPos);
+        if (leaf->area == -1 || !leaf->numlights) {
+            leaf = NULL;
+        }
+    }
+
+    if (leaf) {
+        if (leaf->numlights) {
+            light_reference_count++;
+
+            for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < leaf->numlights; i++) {
+                pCurrLight = leaf->lights[i];
+                if (pCurrLight->leaf != (mnode_t *)-1) {
+                    byte mask = backEnd.refdef.areamask[pCurrLight->leaf->area >> 3];
+
+                    if (!(mask & (1 << (pCurrLight->leaf->area & 7)))
+                        && pCurrLight->reference_count != light_reference_count) {
+                        if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
+                            R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
+                        }
+
+                        pCurrLight->reference_count = light_reference_count;
+                    }
+                }
+            }
+        }
+    } else {
+        for (i = 0; i < tr.numSLights; i++) {
+            pCurrLight = &tr.sLights[i];
+
+            if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
+                R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
+            }
+        }
+    }
+
+    iLightCount = 0;
+
+    if (s_sun.exists) {
+        if (leaf && leaf->lights[0] == &tr.sSunLight) {
+            VectorMA(vPos, 16384.0, s_sun.direction, vEnd);
+            ri.CM_BoxTrace(&trace, vPos, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+            if (trace.surfaceFlags & SURF_SKY) {
+                VectorMA(vPos, 16384.0, s_sun.direction, pvLightPos[0]);
+                pvLightIntensity[0][0] = s_sun.color[0] * (1.0 / 510.0);
+                pvLightIntensity[0][1] = s_sun.color[1] * (1.0 / 510.0);
+                pvLightIntensity[0][2] = s_sun.color[2] * (1.0 / 510.0);
+                iLightCount            = 1;
+            }
+        }
+    }
+
+    pLightsCurr = pLightsHead;
+
+    for (; iLightCount < iMaxLights && iLightCount < MAX_GATHERED_LIGHTS && pLightsCurr->pLight;
+         iLightCount++, pLightsCurr = pLightsCurr->pNext) {
+        VectorCopy(pLightsCurr->pLight->origin, pvLightPos[iLightCount]);
+        vDelta[0] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[0];
+        vDelta[1] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[1];
+        vDelta[2] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[2];
+
+        if (vDelta[0] > 1.0 || vDelta[1] > 1.0 || vDelta[2] > 1.0) {
+            NormalizeColor(vDelta, vDelta);
+        }
+
+        VectorCopy(vDelta, pvLightIntensity[iLightCount]);
+        pLightsCurr = pLightsCurr->pNext;
+        if (pLightsCurr == pLightsHead) {
+            break;
+        }
+    }
+
+    return iLightCount;
+#endif
+}
diff --git a/code/renderergl2/tr_sprite.c b/code/renderergl2/tr_sprite.c
new file mode 100644
index 00000000..1739c63d
--- /dev/null
+++ b/code/renderergl2/tr_sprite.c
@@ -0,0 +1,218 @@
+/*
+===========================================================================
+Copyright (C) 2010 su44
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// tr_sprite.c - MoHAA sprite system
+
+#include "tr_local.h"
+
+/*
+=====================
+SPR_RegisterSprite
+=====================
+*/
+sprite_t *SPR_RegisterSprite(const char *name)
+{
+	image_t *spriteImage;
+	shader_t *shader;
+	sprite_t *spr;
+	char shadername[256];
+	COM_StripExtension(name,shadername,sizeof(shadername));
+	shader = R_FindShader(shadername,-1,qfalse);
+	if(shader) {
+		spriteImage = 0;
+		if(shader->stages[0])
+			spriteImage = shader->stages[0]->bundle[0].image[0];
+		if ( !spriteImage ) {
+			ri.Printf(1, "Could not find image for sprite in shader %s\n", name);
+			return 0;
+		}
+		spr = ri.Hunk_Alloc(sizeof(sprite_t), h_dontcare);
+		spr->height = spriteImage->height;
+		spr->width = spriteImage->width;
+		spr->origin_x = spr->width * 0.5;
+		spr->origin_y = spr->height * 0.5;
+		spr->shader = shader;
+		spr->scale = spr->shader->sprite.scale;
+		return spr;
+	}
+	return 0;
+}
+
+static int CullSprite(const vec3_t* points) {
+	int i, j;
+
+	for (i = 0; i < backEnd.viewParms.fog.extrafrustums + 4; i++) {
+		for (j = 0; j < 4; j++) {
+			if (DotProduct(points[j], backEnd.viewParms.frustum[i].normal) - backEnd.viewParms.frustum[i].dist > 0.0f) {
+				break;
+			}
+		}
+
+		if (j == 4) {
+			return CULL_CLIP;
+		}
+	}
+
+	return CULL_IN;
+}
+
+/*
+=====================
+RB_DrawSprite
+=====================
+*/
+void RB_DrawSprite( const refSprite_t *spr ) {
+	model_t* model;
+	vec3_t norm;
+	vec3_t up, right;
+	vec3_t points[4];
+	float org_x, org_y;
+	float scale;
+	int i;
+
+	if (!spr->hModel)
+	{
+        ri.Printf(PRINT_WARNING, "No model found for Sprite\n");
+        return;
+	}
+
+    model = tr.models;
+	if (spr->hModel > 0 && spr->hModel < tr.numModels) {
+		model = &tr.models[spr->hModel];
+	}
+
+	scale = spr->scale * model->d.sprite->scale;
+
+	switch (model->d.sprite->shader->sprite.type)
+    {
+    case SPRITE_PARALLEL_ORIENTED:
+		{
+			float invmag;
+			float cr, sr;
+			int i;
+
+			invmag = 1.0 / sqrt(spr->axis[1][2] * spr->axis[1][2] + spr->axis[1][1] * spr->axis[1][1]);
+
+			cr = invmag * spr->axis[1][1];
+			sr = invmag * spr->axis[1][2];
+
+			for (i = 0; i < 3; i++)
+			{
+				up[i] = backEnd.viewParms.or.axis[2][i] * cr - backEnd.viewParms.or.axis[1][i] * sr;
+				right[i] = backEnd.viewParms.or.axis[1][i] * cr + backEnd.viewParms.or.axis[2][i] * sr;
+			}
+		}
+        break;
+    case SPRITE_PARALLEL:
+		VectorCopy(backEnd.viewParms.or.axis[2], up);
+		if (!backEnd.viewParms.isMirror) {
+			VectorNegate(backEnd.viewParms.or.axis[1], right);
+		} else {
+			VectorCopy(backEnd.viewParms.or.axis[1], right);
+		}
+        break;
+    case SPRITE_ORIENTED:
+		VectorCopy(spr->axis[1], right);
+		VectorCopy(spr->axis[2], up);
+        break;
+    case SPRITE_PARALLEL_UPRIGHT:
+		VectorCopy(backEnd.viewParms.or.axis[0], norm);
+		VectorCopy(backEnd.viewParms.or.axis[1], right);
+		VectorCopy(backEnd.viewParms.or.axis[2], up);
+		if (backEnd.viewParms.or.axis[0][2] > 0.999) {
+			return;
+		} else if (backEnd.viewParms.or.axis[0][2] < -0.999) {
+			return;
+		}
+
+		VectorSet(up, 0.0f, 0.0f, 1.0f);
+		VectorSet(right, backEnd.viewParms.or.axis[0][1], -backEnd.viewParms.or.axis[0][0], 0.0f);
+		VectorNormalize(right);
+		VectorSet(norm, -right[1], right[0], 0.0f);
+		break;
+	}
+
+	org_x = model->d.sprite->origin_x * scale;
+	org_y = model->d.sprite->origin_y * scale;
+
+    VectorScale(up, org_y, up);
+    VectorScale(right, org_x, right);
+
+	points[0][0] = spr->origin[0] + up[0] - right[0];
+	points[1][0] = spr->origin[0] + up[0] + right[0];
+	points[2][0] = spr->origin[0] - up[0] - right[0];
+	points[3][0] = spr->origin[0] - up[0] + right[0];
+
+    points[0][1] = spr->origin[1] + up[1] - right[1];
+    points[1][1] = spr->origin[1] + up[1] + right[1];
+    points[2][1] = spr->origin[1] - up[1] - right[1];
+    points[3][1] = spr->origin[1] - up[1] + right[1];
+
+    points[0][2] = spr->origin[2] + up[2] - right[2];
+    points[1][2] = spr->origin[2] + up[2] + right[2];
+    points[2][2] = spr->origin[2] - up[2] - right[2];
+    points[3][2] = spr->origin[2] - up[2] + right[2];
+
+	if (CullSprite(points) == CULL_OUT) {
+		return;
+	}
+
+	RB_CHECKOVERFLOW(4, 6);
+
+	for (i = 0; i < 4; i++) {
+		tess.color[tess.numVertexes + i][0] = spr->shaderRGBA[0] * 0xffff / 0xff;
+		tess.color[tess.numVertexes + i][1] = spr->shaderRGBA[1] * 0xffff / 0xff;
+		tess.color[tess.numVertexes + i][2] = spr->shaderRGBA[2] * 0xffff / 0xff;
+		tess.color[tess.numVertexes + i][3] = spr->shaderRGBA[3] * 0xffff / 0xff;
+	}
+
+    tess.texCoords[tess.numVertexes][0] = 0.0f;
+    tess.texCoords[tess.numVertexes][1] = 0.0f;
+    tess.texCoords[tess.numVertexes + 1][0] = 1.0f;
+    tess.texCoords[tess.numVertexes + 1][1] = 0.0f;
+    tess.texCoords[tess.numVertexes + 2][0] = 0.0f;
+    tess.texCoords[tess.numVertexes + 2][1] = 1.0f;
+    tess.texCoords[tess.numVertexes + 3][0] = 1.0f;
+    tess.texCoords[tess.numVertexes + 3][1] = 1.0f;
+
+    tess.xyz[tess.numVertexes][0] = points[0][0];
+    tess.xyz[tess.numVertexes][1] = points[0][1];
+    tess.xyz[tess.numVertexes][2] = points[0][2];
+    tess.xyz[tess.numVertexes + 1][0] = points[1][0];
+    tess.xyz[tess.numVertexes + 1][1] = points[1][1];
+    tess.xyz[tess.numVertexes + 1][2] = points[1][2];
+    tess.xyz[tess.numVertexes + 2][0] = points[2][0];
+    tess.xyz[tess.numVertexes + 2][1] = points[2][1];
+    tess.xyz[tess.numVertexes + 2][2] = points[2][2];
+    tess.xyz[tess.numVertexes + 3][0] = points[3][0];
+    tess.xyz[tess.numVertexes + 3][1] = points[3][1];
+    tess.xyz[tess.numVertexes + 3][2] = points[3][2];
+
+    tess.indexes[tess.numIndexes] = tess.numVertexes + 2;
+    tess.indexes[tess.numIndexes + 1] = tess.numVertexes + 1;
+    tess.indexes[tess.numIndexes + 2] = tess.numVertexes;
+    tess.indexes[tess.numIndexes + 3] = tess.numVertexes + 2;
+    tess.indexes[tess.numIndexes + 4] = tess.numVertexes + 3;
+    tess.indexes[tess.numIndexes + 5] = tess.numVertexes + 1;
+
+    tess.numVertexes += 4;
+    tess.numIndexes += 6;
+}
diff --git a/code/renderergl2/tr_staticmodels.cpp b/code/renderergl2/tr_staticmodels.cpp
new file mode 100644
index 00000000..fdd3ca18
--- /dev/null
+++ b/code/renderergl2/tr_staticmodels.cpp
@@ -0,0 +1,586 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_staticmodels.cpp -- static model rendering
+
+#include "tr_local.h"
+#include "tiki.h"
+
+#define MAX_STATIC_MODELS_SURFS    8192
+#define MAX_DISTINCT_STATIC_MODELS 1000
+
+int             g_nStaticSurfaces;
+staticSurface_t g_staticSurfaces[MAX_STATIC_MODELS_SURFS];
+qboolean        g_bInfostaticmodels = qfalse;
+
+/*
+==============
+R_InitStaticModels
+==============
+*/
+void R_InitStaticModels(void)
+{
+    cStaticModelUnpacked_t *pSM;
+    char                    szTemp[1024];
+    skelBoneCache_t         bones[128];
+    float                   radius;
+    int                     i, j, k, l;
+
+    g_bInfostaticmodels = qfalse;
+
+    if (tr.overbrightShift) {
+        for (i = 0; i < tr.world->numStaticModelData; i++) {
+            int r, g, b;
+
+            r = (int)((float)tr.world->staticModelData[i * 4] * tr.overbrightMult);
+            g = (int)((float)tr.world->staticModelData[i * 4 + 1] * tr.overbrightMult);
+            b = (int)((float)tr.world->staticModelData[i * 4 + 2] * tr.overbrightMult);
+
+            if (r > 0xFF || g > 0xFF || b > 0xFF) {
+                float t;
+
+                t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+                r = (int)((float)r * t);
+                g = (int)((float)g * t);
+                b = (int)((float)b * t);
+            }
+
+            tr.world->staticModelData[i * 4]     = r;
+            tr.world->staticModelData[i * 4 + 1] = g;
+            tr.world->staticModelData[i * 4 + 2] = b;
+        }
+    }
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        vec3_t mins, maxs;
+
+        pSM = &tr.world->staticModels[i];
+
+        pSM->bRendered = qfalse;
+        AngleVectorsLeft(pSM->angles, pSM->axis[0], pSM->axis[1], pSM->axis[2]);
+
+        if (!strnicmp(pSM->model, "models", 6)) {
+            Q_strncpyz(szTemp, pSM->model, sizeof(szTemp));
+        } else {
+            Com_sprintf(szTemp, sizeof(szTemp), "models/%s", pSM->model);
+        }
+
+        ri.FS_CanonicalFilename(szTemp);
+        //const bool exists = ri.TIKI_FindTiki(szTemp) != NULL;
+        pSM->tiki = ri.TIKI_RegisterTikiFlags(szTemp, qfalse);
+
+        if (!pSM->tiki) {
+            ri.Printf(PRINT_WARNING, "^~^~^: Warning: Cannot Load Static Model %s\n", szTemp);
+            continue;
+        }
+
+        pSM->radius = ri.TIKI_GlobalRadius(pSM->tiki);
+
+        //
+        // register shaders
+        //
+        for (j = 0; j < pSM->tiki->num_surfaces; j++) {
+            dtikisurface_t *surf = &pSM->tiki->surfaces[j];
+
+            for (k = 0; k < surf->numskins; k++) {
+                if (surf->shader[k][0]) {
+                    shader_t *sh = R_FindShader(surf->shader[k], -1, !(surf->flags & TIKI_SURF_NOMIPMAPS));
+                    surf->hShader[k] = sh->index;
+                } else {
+                    surf->hShader[k] = 0;
+                }
+            }
+        }
+
+        // prepare the skeleton frame for the static model
+        ri.TIKI_GetSkelAnimFrame(pSM->tiki, bones, &radius, &mins, &maxs);
+        pSM->cull_radius = radius * pSM->tiki->load_scale * pSM->scale;
+
+        // Suggestion:
+        // It would be cool to have animated static model in the future
+
+        // Removed in 2.0
+        //  This only leads to issues where pStaticXyz is not initialized
+        //  and it can occurs if the TIKI model is registered before the static model
+        //if (exists) {
+        //    continue;
+        //}
+
+        for (j = 0; j < pSM->tiki->numMeshes; j++) {
+            skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(pSM->tiki->mesh[j]);
+            skelSurfaceGame_t *surf;
+
+            if (!skelmodel) {
+                ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
+                continue;
+            }
+
+            surf = skelmodel->pSurfaces;
+
+            for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext) {
+                byte             *buf;
+                byte             *p;
+                skelWeight_t     *weight;
+                skeletorVertex_t *vert;
+
+                if (surf->pStaticXyz) {
+                    continue;
+                }
+
+                // allocate static vectors
+                p = buf =
+                    (byte *)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
+                surf->pStaticXyz = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticNormal = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticTexCoords = (vec2_t(*)[2])p;
+
+                vert = surf->pVerts;
+
+                for (l = 0; l < surf->numVerts; l++) {
+                    int              channel;
+                    skelBoneCache_t *bone;
+
+                    weight = (skelWeight_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                              + vert->numMorphs * sizeof(skeletorMorph_t));
+
+                    if (j > 0) {
+                        channel = ri.TIKI_GetLocalChannel(pSM->tiki, skelmodel->pBones[weight->boneIndex].channel);
+                    } else {
+                        channel = weight->boneIndex;
+                    }
+
+                    bone = &bones[channel];
+
+                    surf->pStaticXyz[l][0] =
+                        ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                          + weight->offset[2] * bone->matrix[2][0])
+                         + bone->offset[0])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][1] =
+                        ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                          + weight->offset[2] * bone->matrix[2][1])
+                         + bone->offset[1])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][2] =
+                        ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                          + weight->offset[2] * bone->matrix[2][2])
+                         + bone->offset[2])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][3] = 0.f;
+
+                    surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
+                                              + vert->normal[1] * bone->matrix[1][0]
+                                              + vert->normal[2] * bone->matrix[2][0];
+                    surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
+                                              + vert->normal[1] * bone->matrix[1][1]
+                                              + vert->normal[2] * bone->matrix[2][1];
+                    surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
+                                              + vert->normal[1] * bone->matrix[1][2]
+                                              + vert->normal[2] * bone->matrix[2][2];
+                    surf->pStaticNormal[l][3] = 0.f;
+
+                    surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][0][1] = vert->texCoords[1];
+                    surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
+
+                    vert = (skeletorVertex_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * vert->numMorphs
+                                                + sizeof(skelWeight_t) * vert->numWeights);
+                }
+            }
+        }
+    }
+
+    tr.refdef.numStaticModels    = tr.world->numStaticModels;
+    tr.refdef.staticModels       = tr.world->staticModels;
+    tr.refdef.numStaticModelData = tr.world->numStaticModelData;
+    tr.refdef.staticModelData    = tr.world->staticModelData;
+}
+
+/*
+==============
+R_CullStaticModel
+==============
+*/
+static int R_CullStaticModel(dtiki_t *tiki, float fScale, const vec3_t vLocalOrg)
+{
+    vec3_t bounds[2];
+    int    i;
+    int    cull;
+
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = vLocalOrg[i] + tiki->a->mins[i] * fScale;
+        bounds[1][i] = vLocalOrg[i] + tiki->a->maxs[i] * fScale;
+    }
+
+    cull = R_CullLocalBox(bounds);
+
+    if (r_showcull->integer & 4) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
+
+        switch (cull) {
+        case CULL_CLIP:
+            fR = 1.0f;
+            fG = 1.0f;
+            fB = 0.0f;
+            break;
+        case CULL_IN:
+            fR = 0.0f;
+            fG = 1.0f;
+            fB = 0.0f;
+            break;
+        case CULL_OUT:
+            fR = 1.0f;
+            fG = 0.2f;
+            fB = 0.2f;
+            for (i = 0; i < 2; i++) {
+                bounds[0][i] = bounds[0][i] - 16.0;
+                bounds[1][i] = bounds[1][i] + 16.0;
+            }
+            break;
+        default:
+            break;
+        }
+
+        MatrixToEulerAngles(tr.or.axis, vAngles);
+        R_DebugRotatedBBox(tr.or.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
+    }
+
+    switch (cull) {
+    case CULL_CLIP:
+        tr.pc.c_box_cull_md3_clip++;
+        break;
+    case CULL_IN:
+        tr.pc.c_box_cull_md3_in++;
+        break;
+    case CULL_OUT:
+        tr.pc.c_box_cull_md3_out++;
+        break;
+    }
+
+    return cull;
+}
+
+/*
+==============
+R_AddStaticModelSurfaces
+==============
+*/
+void R_AddStaticModelSurfaces(void)
+{
+    cStaticModelUnpacked_t *SM;
+    int                     i, j, k;
+    int                     ofsStaticData;
+    int                     iRadiusCull;
+    dtiki_t                *tiki;
+    float                   tiki_scale;
+    vec3_t                  tiki_localorigin;
+    vec3_t                  tiki_worldorigin;
+
+    if (!tr.world->numStaticModels) {
+        return;
+    }
+
+    tr.shiftedIsStatic = (1 << QSORT_STATICMODEL_SHIFT);
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+
+        //if( SM->visCount != tr.visCounts[ tr.visIndex ] ) {
+        //	continue;
+        //}
+
+        tiki = SM->tiki;
+
+        if (!tiki) {
+            continue;
+        }
+
+        tr.currentEntityNum = i;
+        tr.shiftedEntityNum = i << QSORT_REFENTITYNUM_SHIFT;
+
+        R_RotateForStaticModel(SM, &tr.viewParms, &tr.or);
+
+        ofsStaticData = 0;
+
+        // get the world position
+        tiki_scale = tiki->load_scale * SM->scale;
+        VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+        R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
+
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, SM->cull_radius);
+
+        if (r_showcull->integer & 8) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.2, 0.0, 1.0, 0.0, 0.5, 0);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.4 + 16.0, 1.0, 0.2, 0.2, 0.5, 0);
+                break;
+            }
+        }
+
+        if (iRadiusCull != CULL_OUT
+            && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT)) {
+            dtikisurface_t *dsurf;
+
+            if (tr.viewParms.isPortal) {
+                SM->lodpercentage[1] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            } else {
+                SM->lodpercentage[0] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            }
+
+            //
+            // draw all meshes
+            //
+            dsurf = tiki->surfaces;
+            for (int mesh = 0; mesh < tiki->numMeshes; mesh++) {
+                skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+                skelSurfaceGame_t *surface;
+                staticSurface_t   *s_surface;
+                shader_t          *shader;
+                float              fDist;
+                vec3_t             vDelta;
+
+                if (!skelmodel) {
+                    continue;
+                }
+
+                //
+                // draw all surfaces
+                //
+                surface = skelmodel->pSurfaces;
+                for (j = 0; j < skelmodel->numSurfaces;
+                     j++, ofsStaticData += surface->numVerts, surface = surface->pNext, dsurf++) {
+                    if (g_nStaticSurfaces >= MAX_STATIC_MODELS_SURFS) {
+                        ri.Printf(
+                            PRINT_DEVELOPER,
+                            "^~^~^ ERROR: MAX_STATIC_MODELS_SURFS exceeded - surface of '%s' skipped\n",
+                            tiki->a->name
+                        );
+                        continue;
+                    }
+
+                    s_surface                = &g_staticSurfaces[g_nStaticSurfaces++];
+                    s_surface->ident         = SF_TIKI_STATIC;
+                    s_surface->ofsStaticData = ofsStaticData;
+                    s_surface->surface       = surface;
+                    s_surface->meshNum       = mesh;
+
+                    shader = tr.shaders[dsurf->hShader[0]];
+
+                    if (shader->numUnfoggedPasses == 1 && !r_nocull->integer) {
+                        switch (shader->stages[0]->alphaGen) {
+                        case AGEN_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(
+                                    shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius
+                                )
+                                == CULL_OUT) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius)
+                                == CULL_IN) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.or.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) >= Square(fDist)) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.or.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) <= Square(shader->fDistNear)) {
+                                continue;
+                            }
+                            break;
+                        }
+                    }
+
+                    SM->bRendered = qtrue;
+                    R_AddDrawSurf((surfaceType_t *)s_surface, shader, 0, 0, 0, 0);
+
+                    if (r_showstaticlod->integer) {
+                        vec3_t org;
+                        int    render_count, total_tris;
+
+                        VectorCopy(SM->origin, org);
+                        org[2] += 100.0;
+                        R_DrawDebugNumber(org, SM->lodpercentage[0], r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 3);
+
+                        org[2] += 125.0;
+                        R_CountTikiLodTris(tiki, SM->lodpercentage[0], &render_count, &total_tris);
+                        R_DrawDebugNumber(org, render_count, r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 0);
+                    }
+
+                    if (r_showstaticbboxes->integer) {
+                        vec3_t vMins, vMaxs;
+
+                        for (k = 0; k < 3; k++) {
+                            vMins[k] = tiki->a->mins[k] * tiki->load_scale * SM->scale;
+                            vMaxs[k] = tiki->a->maxs[k] * tiki->load_scale * SM->scale;
+                        }
+
+                        R_DebugRotatedBBox(SM->origin, SM->angles, vMins, vMaxs, 1.0, 0.0, 1.0, 0.75);
+                    }
+                }
+            }
+        }
+    }
+
+    tr.shiftedIsStatic = 0;
+}
+
+/*
+==============
+RB_Static_BuildDLights
+==============
+*/
+void RB_Static_BuildDLights()
+{
+    int i;
+
+    backEnd.currentStaticModel->useSpecialLighting = backEnd.refdef.num_dlights > 0;
+    backEnd.currentStaticModel->numdlights         = 0;
+
+    if (!backEnd.currentStaticModel->useSpecialLighting) {
+        return;
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights && backEnd.currentStaticModel->numdlights != 32; i++) {
+        vec3_t lightorigin, delta;
+
+        VectorCopy(backEnd.refdef.dlights[i].origin, lightorigin);
+        VectorSubtract(lightorigin, backEnd.currentStaticModel->origin, delta);
+        if (backEnd.refdef.dlights[i].radius * 2.0 >= VectorLength(delta)) {
+            MatrixTransformVectorRight(
+                backEnd.currentStaticModel->axis,
+                delta,
+                backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights].transformed
+            );
+
+            backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights++].index = i;
+        }
+    }
+
+    if (!backEnd.currentStaticModel->numdlights) {
+        backEnd.currentStaticModel->useSpecialLighting = qfalse;
+    }
+}
+
+/*
+==============
+R_InfoStaticModels_f
+==============
+*/
+void R_InfoStaticModels_f(void)
+{
+    g_bInfostaticmodels = qtrue;
+}
+
+/*
+==============
+R_PrintInfoStaticModels
+==============
+*/
+void R_PrintInfoStaticModels()
+{
+    int                     iRenderCount;
+    int                     i, j;
+    cStaticModelUnpacked_t *SM;
+    dtiki_t                *tikis[MAX_DISTINCT_STATIC_MODELS];
+    int                     tiki_count[MAX_DISTINCT_STATIC_MODELS];
+    cStaticModelUnpacked_t *pSM[MAX_DISTINCT_STATIC_MODELS];
+    int                     count;
+
+    ri.Printf(PRINT_ALL, "Static model info:\n");
+    ri.Printf(PRINT_ALL, "------------------\n");
+
+    count        = 0;
+    iRenderCount = 0;
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+        if (!SM->bRendered) {
+            continue;
+        }
+
+        SM->bRendered = qfalse;
+        iRenderCount++;
+
+        if (!SM->tiki) {
+            ri.Printf(PRINT_ALL, "ERROR: static model with no tiki\n");
+            continue;
+        }
+
+        for (j = 0; j < count; j++) {
+            if (SM->tiki == tikis[j]) {
+                tiki_count[j]++;
+                break;
+            }
+        }
+
+        if (count >= MAX_DISTINCT_STATIC_MODELS) {
+            ri.Printf(PRINT_ALL, "R_PrintInfoStaticModels: MAX_DISTINCT_STATIC_MODELS exceeded - increase and recompile\n");
+            break;
+        }
+
+        if (j == count) {
+            tikis[count]      = SM->tiki;
+            pSM[count]        = SM;
+            tiki_count[count] = 1;
+
+            count++;
+        }
+    }
+
+    ri.Printf(PRINT_ALL, "Total static models rendered: %d\n", iRenderCount);
+
+    for (i = 0; i < count; i++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tikis[i]->mesh[0]);
+
+        ri.Printf(PRINT_ALL, 
+            "model: %s, version: %d, count: %d,\n culling min %.1f %.1f %.1f, max %.1f %.1f %.1f, radius %.1f\n",
+            tikis[i]->a->name,
+            skelmodel ? skelmodel->version : -1,
+            tiki_count[i],
+            tikis[i]->a->mins[0],
+            tikis[i]->a->mins[1],
+            tikis[i]->a->mins[2],
+            tikis[i]->a->maxs[0],
+            tikis[i]->a->maxs[1],
+            tikis[i]->a->maxs[2],
+            pSM[i]->cull_radius
+        );
+    }
+}
diff --git a/code/renderergl2/tr_sun_flare.cpp b/code/renderergl2/tr_sun_flare.cpp
new file mode 100644
index 00000000..c5ac29fe
--- /dev/null
+++ b/code/renderergl2/tr_sun_flare.cpp
@@ -0,0 +1,732 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sun_flare.cpp: Sun flares
+
+#include "tr_local.h"
+
+#define MAX_FLARES 20
+
+class flare_s
+{
+public:
+    float     size;
+    float     where;
+    shader_t *shader;
+    float     alphascale;
+};
+
+class lens_flare
+{
+public:
+    static int max_flares;
+
+    float dot_min;
+    float fullscale;
+
+    // List of flares
+    int     num_flares;
+    flare_s flares[MAX_FLARES];
+
+    shader_t *fullscreen;
+    int       fullfade;
+    qboolean  blend_active;
+
+    // Flare location
+    vec3_t trace_v;
+    vec3_t v;
+
+    // Color and alpha
+    vec3_t color;
+    float  alpha;
+
+    // Screen projection
+    vec2_t screen;
+    float  dot;
+
+    int   lasttime;
+    float lastbright;
+
+    // Whether or not it's inside a portal sky
+    bool inportalsky;
+
+    qboolean initted;
+
+public:
+    lens_flare()
+    {
+        color[0] = 1.0;
+        color[1] = 1.0;
+        color[2] = 1.0;
+        alpha    = 1.0;
+        initted  = false;
+    }
+
+    bool         CheckRange();
+    bool         CheckRay();
+    bool         ScreenCalc();
+    virtual void Try();
+    virtual void Init(const char *which);
+    void         ScreenBlend();
+    void         InPortalSky();
+    void         NotInPortalSky();
+    void         SetVect(const float *vect);
+
+    void SetColor(const float *c) { VectorCopy(c, color); }
+
+    void SetAlpha(float a) { alpha = a; }
+};
+
+class dlight_lens_flare : public lens_flare
+{
+public:
+    shader_t *corona_shader;
+
+public:
+    dlight_lens_flare() { corona_shader = NULL; }
+
+    void Try() override;
+
+    void Init(const char *which) override
+    {
+        lens_flare::Init(which);
+        corona_shader = R_FindShader("textures/sprites/corona", -1, qfalse);
+    }
+};
+
+class sun_flare_class : public lens_flare
+{
+public:
+    bool SunCheckRay();
+    void SunScreenCalc();
+    void SunTry();
+};
+
+lens_flare        torches;
+dlight_lens_flare dlights;
+sun_flare_class   sunFlare;
+int               lens_flare::max_flares;
+
+void lens_flare::SetVect(const float *vect)
+{
+    if (inportalsky) {
+        vec3_t offset;
+        vec3_t rot_offset;
+
+        VectorSubtract(vect, tr.refdef.sky_origin, offset);
+        VectorRotate(offset, tr.refdef.sky_axis, rot_offset);
+        VectorAdd(tr.refdef.vieworg, rot_offset, v);
+
+        VectorNormalize(offset);
+        VectorMA(tr.refdef.vieworg, 16384, offset, trace_v);
+    } else {
+        VectorCopy(vect, v);
+        VectorCopy(vect, trace_v);
+    }
+}
+
+void lens_flare::InPortalSky()
+{
+    inportalsky = true;
+}
+
+void lens_flare::NotInPortalSky()
+{
+    inportalsky = false;
+}
+
+bool lens_flare::CheckRange()
+{
+    vec3_t diff;
+
+    VectorSubtract(v, backEnd.viewParms.or.origin, diff);
+    VectorNormalizeFast(diff);
+    dot = DotProduct(backEnd.viewParms.or.axis[0], diff);
+
+    return dot > dot_min;
+}
+
+bool lens_flare::CheckRay()
+{
+    trace_t trace;
+
+    ri.CM_BoxTrace(&trace, backEnd.viewParms.or.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse);
+    if (inportalsky) {
+        return (trace.surfaceFlags & 4) != 0;
+    }
+
+    return trace.fraction == 1.0;
+}
+
+bool lens_flare::ScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    bool   retval;
+    int    i, j;
+
+    retval = true;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.or.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 3; i++) {
+        if (clip[i] >= clip[3] || clip[i] <= -clip[3]) {
+            retval = false;
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+
+    return retval;
+}
+
+void lens_flare::Try()
+{
+    vec2_t diff;
+    vec2_t point;
+    float  alpha;
+    int    i;
+
+    if (!ScreenCalc()) {
+        return;
+    }
+    if (!CheckRange()) {
+        return;
+    }
+    if (!CheckRay()) {
+        return;
+    }
+
+    VectorScale2D(screen, -2.0, diff);
+    alpha = (dot - dot_min) / (1.0 - dot_min);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    lasttime     = backEnd.refdef.time;
+    blend_active = true;
+    lastbright   = Square(alpha) * Square(alpha) * this->fullscale;
+}
+
+void dlight_lens_flare::Try()
+{
+    float size;
+
+    size = r_lightcoronasize->value;
+    lens_flare::Try();
+    lens_flare::CheckRange();
+
+    if (dot <= 0) {
+        return;
+    }
+
+    if (!CheckRay()) {
+        return;
+    }
+
+    RB_Color4f(color[0], color[1], color[2], alpha);
+    RB_StreamBegin(corona_shader);
+    RB_Texcoord2f(0.0, 0.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] + size);
+    RB_Texcoord2f(1.0, 0.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] + size);
+    RB_Texcoord2f(0.0, 1.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] - size);
+    RB_Texcoord2f(1.0, 1.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] - size);
+    RB_StreamEnd();
+}
+
+void lens_flare::ScreenBlend()
+{
+    float alpha;
+    int   timediff;
+
+    if (!fullscreen || !blend_active) {
+        return;
+    }
+
+    timediff = backEnd.refdef.time - lasttime;
+    if (timediff > fullfade) {
+        blend_active = false;
+        return;
+    }
+
+    alpha = (float)(fullfade - timediff) / fullfade * lastbright;
+    if (alpha <= 0.0001) {
+        blend_active = false;
+        return;
+    }
+
+    RB_Color4f(1.0, 1.0, 1.0, alpha);
+
+    RB_StreamBegin(fullscreen);
+    RB_Vertex2f(-1.0, -1.0);
+    RB_Vertex2f(1.0, -1.0);
+    RB_Vertex2f(-1.0, 1.0);
+    RB_Vertex2f(1.0, 1.0);
+
+    RB_StreamEnd();
+}
+
+class tmpRiFile
+{
+private:
+    bool  file_exists;
+    void *buf;
+
+public:
+    tmpRiFile()
+    {
+        file_exists = false;
+        buf         = NULL;
+    }
+
+    ~tmpRiFile() { close(); }
+
+    int open(const char *which, void **buffer)
+    {
+        close();
+
+        if (ri.FS_ReadFile(which, buffer) != -1) {
+            file_exists = true;
+            buf         = *buffer;
+        }
+
+        return file_exists;
+    }
+
+    bool exists() const { return file_exists; }
+
+    void close()
+    {
+        if (file_exists) {
+            ri.FS_FreeFile(buf);
+            file_exists = false;
+        }
+    }
+};
+
+void lens_flare::Init(const char *which)
+{
+    char       *file;
+    const char *token;
+    tmpRiFile   theFile;
+
+    initted = false;
+    theFile.open("global/lensflaredefs.txt", (void **)&file);
+
+    if (!theFile.exists()) {
+        ri.Printf(PRINT_WARNING, "WARNING: Could not open lens flare info file!\n");
+        return;
+    }
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find begin for section '%s' in lensflares\n", which);
+            return;
+        }
+
+        if (!Q_stricmp(token, "begin")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!Q_stricmp(token, which)) {
+                break;
+            }
+        }
+    }
+
+    dot_min      = 0.8f;
+    fullscale    = 0.7f;
+    num_flares   = 0;
+    fullscreen   = NULL;
+    initted      = true;
+    fullfade     = 0;
+    blend_active = false;
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find end for section '%s' in lensflares\n", which);
+            break;
+        }
+
+        if (!Q_stricmp(token, "dot_min")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: invalid dot_min in lensflares\n");
+                continue;
+            }
+            dot_min = atof(token);
+        } else if (!Q_stricmp(token, "flare")) {
+            assert(num_flares < MAX_FLARES);
+
+            flares[num_flares].alphascale = 1.0;
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 1 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].size = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 2 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].where = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 3 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].shader = R_FindShader(token, -1, qfalse);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (token[0]) {
+                flares[num_flares].alphascale = atof(token);
+            }
+
+            num_flares++;
+        } else if (!Q_stricmp(token, "fullscale")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullscale, assuming default (in lensflares)\n");
+                continue;
+            }
+            fullscale = atof(token);
+        } else if (!Q_stricmp(token, "fullscreen")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullsreen in lensflares\n");
+                continue;
+            }
+            fullscreen = R_FindShader(token, -1, qfalse);
+        } else if (!Q_stricmp(token, "fullfade")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullfade in lensflares\n");
+                continue;
+            }
+            fullfade = atof(token);
+        } else if (!Q_stricmp(token, "end")) {
+            break;
+        }
+    }
+
+    if (!num_flares) {
+        ri.Printf(PRINT_WARNING, "WARNING: no lensflares defined!\n");
+    }
+    lasttime = backEnd.refdef.time - fullfade;
+}
+
+static void R_DrawSunFlare()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        if (!s_sun.szFlareName[0]) {
+            return;
+        }
+        if (Q_stricmp(s_sun.szFlareName, "none")) {
+            sunFlare.Init(s_sun.szFlareName);
+        }
+    }
+
+    if (!sunFlare.initted) {
+        s_sun.szFlareName[0] = 0;
+        return;
+    }
+
+    if (!sunFlare.num_flares) {
+        return;
+    }
+
+    VectorMA(backEnd.viewParms.or.origin, 16384, s_sun.flaredirection, sunFlare.trace_v);
+    VectorMA(backEnd.viewParms.or.origin, 128, s_sun.flaredirection, sunFlare.v);
+
+    sunFlare.SunTry();
+}
+
+static void R_DrawSunFlareBlend()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        return;
+    }
+
+    sunFlare.ScreenBlend();
+}
+
+void R_DrawLensFlares()
+{
+    // FIXME: unimplemented (GL2)
+#if 0
+    int i;
+
+    R_RotateForViewer();
+
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglMatrixMode(GL_PROJECTION);
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglOrtho(-1.0, 1.0, -1.0, 1.0, -99999.0, 99999.0);
+
+    tess.no_global_fog = true;
+    R_DrawSunFlare();
+
+    for (i = 0; i < backEnd.refdef.num_entities; i++) {
+        if ((backEnd.viewParms.isPortalSky && !(backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))
+            || (!backEnd.viewParms.isPortalSky && (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))) {
+            continue;
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_LENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                dlights.InPortalSky();
+            } else {
+                dlights.NotInPortalSky();
+            }
+
+            dlights.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            //
+            // Set the dlight color from entity
+            //
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            dlights.SetColor(rgb);
+
+            dlights.Try();
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_VIEWLENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                torches.InPortalSky();
+            } else {
+                torches.NotInPortalSky();
+            }
+
+            torches.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            torches.SetColor(rgb);
+
+            torches.Try();
+        }
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        if ((backEnd.refdef.dlights[i].type & dlighttype_t::lensflare)
+            || (backEnd.refdef.dlights[i].type & dlighttype_t::additive)) {
+            dlights.NotInPortalSky();
+            dlights.SetVect(backEnd.refdef.dlights[i].origin);
+            dlights.SetColor(backEnd.refdef.dlights[i].color);
+
+            dlights.Try();
+        }
+    }
+
+    R_DrawSunFlareBlend();
+    tess.no_global_fog = qfalse;
+
+    qglPopMatrix();
+    qglMatrixMode(GL_MODELVIEW);
+    qglPopMatrix();
+#endif
+}
+
+void R_InitLensFlare()
+{
+    torches.Init("entity");
+    dlights.Init("dlight");
+    sunFlare.initted = false;
+}
+
+bool sun_flare_class::SunCheckRay()
+{
+    mnode_t *pViewLeaf;
+    trace_t  trace;
+
+    pViewLeaf = R_PointInLeaf(tr.refdef.vieworg);
+
+    if (pViewLeaf->area == -1 || !tr.world->vis || tr.sSunLight.leaf != (mnode_s *)-1
+        || pViewLeaf->numlights && pViewLeaf->lights[0] == &tr.sSunLight) {
+        ri.CM_BoxTrace(
+            &trace, backEnd.viewParms.or.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse
+        );
+
+        if (trace.surfaceFlags & SURF_SKY) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void sun_flare_class::SunScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    int    i, j;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.or.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+}
+
+void sun_flare_class::SunTry()
+{
+    vec2_t   diff;
+    vec2_t   point;
+    float    alpha;
+    int      i;
+    qboolean bDrawingFade = qfalse;
+
+    if (!CheckRange()) {
+        return;
+    }
+
+    if (SunCheckRay()) {
+        alpha = (dot - dot_min) / (1.0 - dot_min);
+    } else {
+        int timediff;
+
+        if (!fullscreen) {
+            return;
+        }
+        if (!blend_active) {
+            return;
+        }
+
+        timediff = backEnd.refdef.time - lasttime;
+        alpha    = (float)(fullfade - timediff) / fullfade * lastbright;
+
+        if (alpha <= 0.0001) {
+            return;
+        }
+
+        bDrawingFade = qtrue;
+    }
+
+    SunScreenCalc();
+    VectorScale2D(screen, -2.0, diff);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    if (!bDrawingFade) {
+        lasttime     = backEnd.refdef.time;
+        blend_active = true;
+        lastbright   = Square(alpha) * Square(alpha) * fullscale;
+    }
+}
diff --git a/code/renderergl2/tr_swipe.cpp b/code/renderergl2/tr_swipe.cpp
new file mode 100644
index 00000000..90081678
--- /dev/null
+++ b/code/renderergl2/tr_swipe.cpp
@@ -0,0 +1,183 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_swipe.cpp -- swipe rendering
+
+#include "tr_local.h"
+
+#define MAX_SWIPE_POINTS 1024
+#define MAX_SWIPES       32
+
+typedef struct {
+    vec3_t points[2];
+    float  time;
+} rswipepoint_t;
+
+typedef struct {
+    surfaceType_t surftype;
+    float         life;
+    float         time;
+    int           lastrendtime;
+    qhandle_t     shader;
+    int           numswipes;
+    rswipepoint_t swipes[MAX_SWIPE_POINTS];
+} rendswipe_t;
+
+static int         lastswipeframe;
+static int         numswipes;
+static rendswipe_t swipes[MAX_SWIPES];
+
+/*
+======================
+RE_SwipeBegin
+======================
+*/
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
+{
+    rendswipe_t *swipe;
+
+    if (tr.frameCount != lastswipeframe) {
+        swipe     = &swipes[0];
+        numswipes = 0;
+    }
+
+    if (numswipes >= MAX_SWIPES) {
+        return;
+    }
+
+    swipe = &swipes[numswipes++];
+
+    swipe->life         = life;
+    swipe->time         = thistime;
+    swipe->surftype     = SF_SWIPE;
+    swipe->numswipes    = 0;
+    swipe->lastrendtime = 0;
+    swipe->shader       = shader;
+
+    if (shader < 0 && life) {
+        ri.Printf(PRINT_DEVELOPER, "RE_SwipeBegin: Invalid shader handle\n");
+    }
+
+    lastswipeframe = tr.frameCount;
+}
+
+/*
+======================
+RE_SwipePoint
+======================
+*/
+void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
+{
+    rendswipe_t *swipe = &swipes[numswipes - 1];
+
+    if (swipe->numswipes >= MAX_SWIPE_POINTS) {
+        return;
+    }
+
+    VectorCopy(point1, swipe->swipes[swipe->numswipes - 1].points[0]);
+    VectorCopy(point2, swipe->swipes[swipe->numswipes - 1].points[1]);
+}
+
+/*
+======================
+RE_SwipeEnd
+======================
+*/
+void RE_SwipeEnd() {}
+
+/*
+======================
+R_AddSwipeSurfaces
+======================
+*/
+void R_AddSwipeSurfaces()
+{
+    shader_t *shader;
+    int       at;
+
+    if (!numswipes) {
+        return;
+    }
+
+    tr.currentEntityNum = ENTITYNUM_WORLD;
+    tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+
+    for (at = 0; at < numswipes; at++) {
+        rendswipe_t *swipe     = &swipes[at];
+        int          timedelta = 0;
+
+        if (!swipe->numswipes) {
+            continue;
+        }
+
+        if (swipe->lastrendtime) {
+            timedelta = tr.refdef.time - swipe->lastrendtime;
+        }
+        swipe->lastrendtime = tr.refdef.time;
+
+        if (timedelta) {
+            swipe->time += timedelta;
+        }
+
+        shader = R_GetShaderByHandle(swipe->shader);
+        R_AddDrawSurf(&swipe->surftype, shader, 0, 0, 0, 0);
+    }
+}
+
+/*
+======================
+RB_DrawSwipeSurface
+======================
+*/
+void RB_DrawSwipeSurface(surfaceType_t *pswipe)
+{
+    int          i;
+    float        oolife;
+    rendswipe_t *swipe = (rendswipe_t *)pswipe;
+
+    oolife = 1.0 / swipe->life;
+
+    RB_CHECKOVERFLOW(swipe->numswipes * 2, swipe->numswipes * 6);
+
+    RB_StreamBeginDrawSurf();
+
+    for (i = 0; i < swipe->numswipes; i++) {
+        rswipepoint_t *swipepoint = &swipe->swipes[i];
+        float          alpha;
+        float          f;
+
+        f = 1.0 - (swipe->time - swipepoint->time) * oolife;
+        if (f > 0 && swipe->time >= swipepoint->time) {
+            alpha = f - Q_max(f - 1.0, 0);
+
+            RB_Color4f(alpha, alpha, alpha, alpha);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[0]);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[1]);
+        } else if (i == swipe->numswipes - 1) {
+            swipe->numswipes = 0;
+        }
+    }
+
+    RB_StreamEndDrawSurf();
+}
diff --git a/code/renderergl2/tr_util.cpp b/code/renderergl2/tr_util.cpp
new file mode 100644
index 00000000..a5bcb618
--- /dev/null
+++ b/code/renderergl2/tr_util.cpp
@@ -0,0 +1,388 @@
+/*
+===========================================================================
+Copyright (C) 1999-2005 Id Software, Inc.
+
+This file is part of Quake III Arena source code.
+
+Quake III Arena source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+Quake III Arena source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Quake III Arena source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// tr_util.c -- renderer utility
+
+#include "tr_local.h"
+#include "../qcommon/str.h"
+
+static byte  cntColor[4];
+static float cntSt[2];
+
+static int Numbers[12][8] = {
+    {1, 3,  4,  5,  6, 7, 0, 0},
+    {4, 5,  0,  0,  0, 0, 0, 0},
+    {1, 4,  2,  7,  3, 0, 0, 0},
+    {1, 4,  2,  5,  3, 0, 0, 0},
+    {6, 4,  2,  5,  0, 0, 0, 0},
+    {1, 6,  2,  5,  3, 0, 0, 0},
+    {1, 6,  2,  5,  7, 3, 0, 0},
+    {1, 8,  0,  0,  0, 0, 0, 0},
+    {1, 2,  3,  4,  5, 6, 7, 0},
+    {1, 6,  4,  2,  5, 3, 0, 0},
+    {9, 10, 11, 12, 0, 0, 0, 0},
+    {2, 0,  0,  0,  0, 0, 0, 0}
+};
+
+static float Lines[13][4] = {
+    {0.0,  0.0, 0.0,  0.0},
+    {-4.0, 8.0, 4.0,  8.0},
+    {-4.0, 4.0, 4.0,  4.0},
+    {-4.0, 0.0, 4.0,  0.0},
+    {4.0,  8.0, 4.0,  4.0},
+    {4.0,  4.0, 4.0,  0.0},
+    {-4.0, 8.0, -4.0, 4.0},
+    {-4.0, 4.0, -4.0, 0.0},
+    {4.0,  8.0, -4.0, 0.0},
+    {-1.0, 2.0, 1.0,  2.0},
+    {1.0,  2.0, 1.0,  0.0},
+    {-1.0, 0.0, 1.0,  0.0},
+    {-1.0, 0.0, -1.0, 2.0}
+};
+
+/*
+===============
+RB_StreamBegin
+===============
+*/
+void RB_StreamBegin(shader_t *shader)
+{
+    RB_BeginSurface(shader, 0, 0);
+}
+
+/*
+===============
+RB_StreamEnd
+===============
+*/
+void RB_StreamEnd(void)
+{
+    int i;
+
+    if (tess.numVertexes <= 2) {
+        RB_EndSurface();
+        return;
+    }
+
+    tess.indexes[0] = 0;
+    tess.indexes[1] = 1;
+    tess.indexes[2] = 2;
+
+    for (i = 0; i < tess.numVertexes - 2; i++) {
+        tess.indexes[i * 3 + 0] = (i & 1) + i;
+        tess.indexes[i * 3 + 1] = i - ((i & 1) - 1);
+        tess.indexes[i * 3 + 2] = i + 2;
+        tess.numIndexes += 3;
+    }
+
+    RB_EndSurface();
+}
+
+/*
+===============
+RB_StreamBeginDrawSurf
+===============
+*/
+void RB_StreamBeginDrawSurf(void)
+{
+    // FIXME: unimplemented (GL2)
+}
+
+/*
+===============
+RB_StreamEndDrawSurf
+===============
+*/
+void RB_StreamEndDrawSurf(void)
+{
+    // FIXME: unimplemented (GL2)
+}
+
+/*
+===============
+addTriangle
+===============
+*/
+static void addTriangle(void)
+{
+    tess.texCoords[tess.numVertexes][0] = cntSt[0];
+    tess.texCoords[tess.numVertexes][1] = cntSt[1];
+    tess.color[tess.numVertexes][0] = cntColor[0];
+    tess.color[tess.numVertexes][1] = cntColor[1];
+    tess.color[tess.numVertexes][2] = cntColor[2];
+    tess.color[tess.numVertexes][3] = cntColor[3];
+    tess.numVertexes++;
+}
+
+/*
+===============
+RB_Vertex3fv
+===============
+*/
+void RB_Vertex3fv(vec3_t v)
+{
+    VectorCopy(v, tess.xyz[tess.numVertexes]);
+    addTriangle();
+}
+
+/*
+===============
+RB_Vertex3f
+===============
+*/
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z)
+{
+    tess.xyz[tess.numVertexes][0] = x;
+    tess.xyz[tess.numVertexes][1] = y;
+    tess.xyz[tess.numVertexes][2] = z;
+    addTriangle();
+}
+
+/*
+===============
+RB_Vertex2f
+===============
+*/
+void RB_Vertex2f(vec_t x, vec_t y)
+{
+    RB_Vertex3f(x, y, 0);
+}
+
+/*
+===============
+RB_Color4f
+===============
+*/
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a)
+{
+    cntColor[0] = r * tr.identityLightByte;
+    cntColor[1] = g * tr.identityLightByte;
+    cntColor[2] = b * tr.identityLightByte;
+    cntColor[3] = a * 255.0;
+}
+
+/*
+===============
+RB_Color3f
+===============
+*/
+void RB_Color3f(vec_t r, vec_t g, vec_t b)
+{
+    RB_Color4f(r, g, b, 1.0);
+}
+
+/*
+===============
+RB_Color3fv
+===============
+*/
+void RB_Color3fv(vec3_t col)
+{
+    RB_Color3f(col[0], col[1], col[2]);
+}
+
+/*
+===============
+RB_Color4bv
+===============
+*/
+void RB_Color4bv(unsigned char *colors)
+{
+    cntColor[0] = colors[0];
+    cntColor[1] = colors[1];
+    cntColor[2] = colors[2];
+    cntColor[3] = colors[3];
+}
+
+/*
+===============
+RB_Texcoord2f
+===============
+*/
+void RB_Texcoord2f(float s, float t)
+{
+    cntSt[0] = s;
+    cntSt[1] = t;
+}
+
+/*
+===============
+RB_Texcoord2fv
+===============
+*/
+void RB_Texcoord2fv(vec2_t st)
+{
+    cntSt[0] = st[0];
+    cntSt[1] = st[1];
+}
+
+/*
+===============
+R_DrawDebugNumber
+===============
+*/
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision)
+{
+    vec3_t up, right;
+    vec3_t pos1, pos2;
+    vec3_t start;
+    str    text;
+    char   format[20];
+    int    i;
+    int    j;
+    int    l;
+    int    num;
+
+    VectorCopy(tr.viewParms.or.axis[2], up);
+    VectorCopy(tr.viewParms.or.axis[1], right);
+    VectorNegate(right, right);
+
+    VectorNormalize(up);
+    VectorNormalize(right);
+
+    VectorScale(up, scale, up);
+    VectorScale(right, scale, right);
+
+    if (precision > 0) {
+        Com_sprintf(format, sizeof(format), "%%.%df", precision);
+        text = va(format, number);
+    } else {
+        text = va("%d", (int)number);
+    }
+
+    // NOTE: this cast here is needed!
+    // Otherwise the compiler will do very nasty implicit casting of negative
+    // numbers to unsigned numbers, resulting in incorrect values.
+    // -------------------v
+    VectorMA(org, 5 - 5 * (int)text.length(), right, start);
+
+    // Draw each character/digit of the text
+    for (i = 0; i < text.length(); i++) {
+        if (text[i] == '.') {
+            num = 10;
+        } else if (text[i] == '-') {
+            num = 11;
+        } else {
+            num = text[i] - '0';
+        }
+
+        // Get the first line index for the number to be drawn
+        l = Numbers[num][0];
+
+        // Draw each line of the character/digit
+        for (j = 0; j < 8 && l; ++j, l = Numbers[num][j]) {
+            pos1[0] = start[0] + Lines[l][0] * right[0] + Lines[l][1] * up[0];
+            pos1[1] = start[1] + Lines[l][0] * right[1] + Lines[l][1] * up[1];
+            pos1[2] = start[2] + Lines[l][0] * right[2] + Lines[l][1] * up[2];
+
+            pos2[0] = start[0] + Lines[l][2] * right[0] + Lines[l][3] * up[0];
+            pos2[1] = start[1] + Lines[l][2] * right[1] + Lines[l][3] * up[1];
+            pos2[2] = start[2] + Lines[l][2] * right[2] + Lines[l][3] * up[2];
+
+            R_DebugLine(pos1, pos2, r, g, b, 1.0);
+        }
+
+        VectorMA(start, 10.0, right, start);
+    }
+}
+
+/*
+===============
+R_DebugRotatedBBox
+===============
+*/
+void R_DebugRotatedBBox(
+    const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha
+)
+{
+}
+
+/*
+===============
+RE_GetShaderWidth
+===============
+*/
+int RE_GetShaderWidth(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->stages[0]->bundle[0].image[0]->uploadWidth;
+}
+
+/*
+===============
+RE_GetShaderHeight
+===============
+*/
+int RE_GetShaderHeight(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->stages[0]->bundle[0].image[0]->uploadHeight;
+}
+
+/*
+===============
+RE_GetShaderName
+===============
+*/
+const char *RE_GetShaderName(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->name;
+}
+
+/*
+===============
+RE_GetModelName
+===============
+*/
+const char *RE_GetModelName(qhandle_t hModel)
+{
+    model_t *model;
+
+    if (!hModel) {
+        return "";
+    }
+
+    model = R_GetModelByHandle(hModel);
+
+    return model->name;
+}
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index f9a24424..2a4d37be 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -589,7 +589,7 @@ static void R_RecursiveWorldNode( mnode_t *node, uint32_t planeBits, uint32_t dl
 R_PointInLeaf
 ===============
 */
-static mnode_t *R_PointInLeaf( const vec3_t p ) {
+mnode_t *R_PointInLeaf( const vec3_t p ) {
 	mnode_t		*node;
 	float		d;
 	cplane_t	*plane;
@@ -807,3 +807,16 @@ void R_AddWorldSurfaces (void) {
 		tr.refdef.dlightMask = ~tr.refdef.dlightMask;
 	}
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
+{
+    bmodel_t* bmodel;
+
+    bmodel = &tr.world->bmodels[iIndex];
+    VectorCopy(bmodel->bounds[0], vMins);
+    VectorCopy(bmodel->bounds[1], vMaxs);
+}
\ No newline at end of file

From e1be3c0fd16613d5cbd61ed16cb631f184b586cc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 19:13:08 +0100
Subject: [PATCH 1692/2040] Call G_SetClientConfigString() instead to properly
 set the team configstring

---
 code/fgame/g_client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index fcea882d..7fffb86c 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -794,7 +794,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
 
     Q_strncpyz(client->pers.dm_playergermanmodel, s, sizeof(client->pers.dm_playergermanmodel));
 
-    gi.setConfigstring(CS_PLAYERS + clientnum, va("name\\%s", client->pers.netname));
+    G_SetClientConfigString(ent);
 
     if (ent->entity) {
         float fov;

From 011f49616bbe16fd780fa58edadb1b8af41fe19c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 19:35:27 +0100
Subject: [PATCH 1693/2040] Fix the improper focus and activation of pulldown
 menus

---
 code/uilib/uipulldownmenu.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/uilib/uipulldownmenu.cpp b/code/uilib/uipulldownmenu.cpp
index e062e4bc..9f2e4fb0 100644
--- a/code/uilib/uipulldownmenu.cpp
+++ b/code/uilib/uipulldownmenu.cpp
@@ -84,6 +84,11 @@ UIPulldownMenu::UIPulldownMenu()
 
 	// uninitialized in original game
 	m_submenuptr = NULL;
+
+	// Added in OPM
+	//  This is so the window manager knows it can be activated
+	//  and appropriately handle this as the first responder
+	m_canactivate = true;
 }
 
 UIPulldownMenu::~UIPulldownMenu()

From e6848a3ab056d680b5564cfa6bca372b5eebd7b9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 20:13:05 +0100
Subject: [PATCH 1694/2040] Fix the window sizer losing focus when rapidly
 dragging the mouse

This would lead to annoyances when trying to resize the window as the window sizer would lose focus
---
 code/uilib/uistatus.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/uilib/uistatus.cpp b/code/uilib/uistatus.cpp
index ff05d122..0487db8c 100644
--- a/code/uilib/uistatus.cpp
+++ b/code/uilib/uistatus.cpp
@@ -35,6 +35,10 @@ UIWindowSizer::UIWindowSizer()
 {
 	m_draggingwidget = NULL;
 	m_mouseState = M_NONE;
+
+	// Added in OPM
+	//  So this can be made as the first responder
+	m_canactivate = true;
 }
 
 

From 77646bda78c36bfc1c65a37b8cc121b1d5b28f81 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:21:10 +0100
Subject: [PATCH 1695/2040] Implement RB_Stream draw surfaces

---
 code/renderergl2/tr_local.h  |  1 +
 code/renderergl2/tr_util.cpp | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 28545a62..1be81e5c 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -1902,6 +1902,7 @@ typedef struct {
 	// OPENMOHAA-specific stuff
 	//
     cStaticModelUnpacked_t* currentStaticModel;
+    int dsStreamVert;
 } backEndState_t;
 
 /*
diff --git a/code/renderergl2/tr_util.cpp b/code/renderergl2/tr_util.cpp
index a5bcb618..34f1a207 100644
--- a/code/renderergl2/tr_util.cpp
+++ b/code/renderergl2/tr_util.cpp
@@ -103,7 +103,7 @@ RB_StreamBeginDrawSurf
 */
 void RB_StreamBeginDrawSurf(void)
 {
-    // FIXME: unimplemented (GL2)
+    backEnd.dsStreamVert = tess.numVertexes;
 }
 
 /*
@@ -113,7 +113,21 @@ RB_StreamEndDrawSurf
 */
 void RB_StreamEndDrawSurf(void)
 {
-    // FIXME: unimplemented (GL2)
+    int numverts;
+    int i;
+
+    if (tess.numVertexes - backEnd.dsStreamVert <= 2) {
+        tess.numVertexes = backEnd.dsStreamVert;
+        return;
+    }
+
+    numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
+    for (i = 0; i < numverts; i++) {
+        tess.indexes[i + tess.numIndexes]     = (i & 1) + i + backEnd.dsStreamVert;
+        tess.indexes[i + tess.numIndexes + 1] = i + backEnd.dsStreamVert - ((i & 1) - 1);
+        tess.indexes[i + tess.numIndexes + 2] = i + backEnd.dsStreamVert + 2;
+        tess.numIndexes += 3;
+    }
 }
 
 /*
@@ -125,10 +139,10 @@ static void addTriangle(void)
 {
     tess.texCoords[tess.numVertexes][0] = cntSt[0];
     tess.texCoords[tess.numVertexes][1] = cntSt[1];
-    tess.color[tess.numVertexes][0] = cntColor[0];
-    tess.color[tess.numVertexes][1] = cntColor[1];
-    tess.color[tess.numVertexes][2] = cntColor[2];
-    tess.color[tess.numVertexes][3] = cntColor[3];
+    tess.color[tess.numVertexes][0] = cntColor[0] * 65535 / 255;
+    tess.color[tess.numVertexes][1] = cntColor[1] * 65535 / 255;
+    tess.color[tess.numVertexes][2] = cntColor[2] * 65535 / 255;
+    tess.color[tess.numVertexes][3] = cntColor[3] * 65535 / 255;
     tess.numVertexes++;
 }
 

From 7e150c7a8a73fce4af0aad0aae0b6fbc2387f51d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:27:10 +0100
Subject: [PATCH 1696/2040] Implement used draw functions

---
 code/renderergl2/tr_draw.c | 120 +++++++++++++++++++++++--------------
 1 file changed, 75 insertions(+), 45 deletions(-)

diff --git a/code/renderergl2/tr_draw.c b/code/renderergl2/tr_draw.c
index b1efd026..f8837211 100644
--- a/code/renderergl2/tr_draw.c
+++ b/code/renderergl2/tr_draw.c
@@ -40,7 +40,6 @@ void Draw_SetColor(const vec4_t rgba) {
 	backEnd.color2D[1] = (byte)(rgba[1] * tr.identityLightByte);
 	backEnd.color2D[2] = (byte)(rgba[2] * tr.identityLightByte);
 	backEnd.color2D[3] = (byte)(rgba[3] * 255.0);
-	//qglColor4ubv(backEnd.color2D);
 #else
 	RE_SetColor(rgba);
 #endif
@@ -55,7 +54,10 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 #if 1
 	shader_t* shader;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
+
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -70,9 +72,10 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 	}
 
 	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
 	RB_BeginSurface(shader, 0, 0);
 
+    RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+
 	RB_Texcoord2f(s1, t1);
 	RB_Vertex2f(x, y);
 
@@ -361,25 +364,41 @@ AddBox
 ================
 */
 void AddBox(float x, float y, float w, float h) {
-    // FIXME: unimplemented (GL2)
-#if 0
+    vec4_t quadVerts[4];
+    vec2_t texCoords[4];
+	vec4_t color;
+
 	R_IssuePendingRenderCommands();
 
-	qglColor4ubv(backEnd.color2D);
-	qglDisable(GL_TEXTURE_2D);
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE);
+    GL_BindToTMU(tr.whiteImage, TB_COLORMAP);
+    GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE);
 
-	qglBegin(GL_QUADS);
+	if (glRefConfig.framebufferObject)
+	{
+		FBO_Bind(tr.renderFbo);
+	}
 
-	qglVertex2f(x, y);
-	qglVertex2f(x + w, y);
-	qglVertex2f(x + w, y + h);
-	qglVertex2f(x, y + h);
+	color[0] = backEnd.color2D[0] / 255.0;
+	color[1] = backEnd.color2D[1] / 255.0;
+	color[2] = backEnd.color2D[2] / 255.0;
+	color[3] = backEnd.color2D[3] / 255.0;
+	
+	VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
+	VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
+	VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
+	VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
 
-	qglEnd();
+	VectorSet2(texCoords[0], 0.0f, 0.0f);
+	VectorSet2(texCoords[1], 1.0f, 0.0f);
+	VectorSet2(texCoords[2], 1.0f, 1.0f);
+	VectorSet2(texCoords[3], 0.0f, 1.0f);
 
-	qglEnable(GL_TEXTURE_2D);
-#endif
+	GLSL_BindProgram(&tr.textureColorShader);
+	
+	GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
+	GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
+
+    RB_InstantQuad2(quadVerts, texCoords);
 }
 
 /*
@@ -388,25 +407,41 @@ DrawBox
 ================
 */
 void DrawBox(float x, float y, float w, float h) {
-    // FIXME: unimplemented (GL2)
-#if 0
+    vec4_t quadVerts[4];
+    vec2_t texCoords[4];
+	vec4_t color;
+
 	R_IssuePendingRenderCommands();
 
-	qglColor4ubv(backEnd.color2D);
-	qglDisable(GL_TEXTURE_2D);
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
+    GL_BindToTMU(tr.whiteImage, TB_COLORMAP);
+    GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
 
-	qglBegin(GL_QUADS);
+	if (glRefConfig.framebufferObject)
+	{
+		FBO_Bind(tr.renderFbo);
+	}
 
-	qglVertex2f(x, y);
-	qglVertex2f(x + w, y);
-	qglVertex2f(x + w, y + h);
-	qglVertex2f(x, y + h);
+	color[0] = backEnd.color2D[0] / 255.0;
+	color[1] = backEnd.color2D[1] / 255.0;
+	color[2] = backEnd.color2D[2] / 255.0;
+	color[3] = backEnd.color2D[3] / 255.0;
+	
+	VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
+	VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
+	VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
+	VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
 
-	qglEnd();
+	VectorSet2(texCoords[0], 0.0f, 0.0f);
+	VectorSet2(texCoords[1], 1.0f, 0.0f);
+	VectorSet2(texCoords[2], 1.0f, 1.0f);
+	VectorSet2(texCoords[3], 0.0f, 1.0f);
 
-	qglEnable(GL_TEXTURE_2D);
-#endif
+	GLSL_BindProgram(&tr.textureColorShader);
+	
+	GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
+	GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
+
+    RB_InstantQuad2(quadVerts, texCoords);
 }
 
 /*
@@ -450,17 +485,19 @@ Set2DWindow
 ================
 */
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-    // FIXME: unimplemented (GL2)
-#if 0
+	mat4_t    oldmodelview, oldprojection, matrix;
+
 	R_IssuePendingRenderCommands();
 	qglViewport(x, y, w, h);
 	qglScissor(x, y, w, h);
-	qglMatrixMode(GL_PROJECTION);
-	qglLoadIdentity();
-	qglOrtho(left, right, bottom, top, n, f);
-	qglMatrixMode(GL_MODELVIEW);
 
-	qglLoadIdentity();
+	Mat4Copy(glState.projection, oldprojection);
+	Mat4Copy(glState.modelview, oldmodelview);
+	Mat4Identity(matrix);
+	GL_SetProjectionMatrix(matrix);
+	Mat4Ortho(left, right, bottom, top, n, f, matrix);
+	GL_SetModelviewMatrix(matrix);
+
 	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
 	qglEnable(GL_BLEND);
 	qglDisable(GL_CULL_FACE);
@@ -469,17 +506,13 @@ void Set2DWindow(int x, int y, int w, int h, float left, float right, float bott
 	qglDisable(GL_FOG);
 	qglFogf(GL_FOG_START, 0);
 
-	if (r_reset_tc_array->integer) {
-		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	}
 
-	if (!backEnd.in2D)
+	if (!backEnd.projection2D)
 	{
 		backEnd.refdef.time = ri.Milliseconds();
-		backEnd.in2D = qtrue;
+		backEnd.projection2D = qtrue;
 		backEnd.refdef.floatTime = backEnd.refdef.time / 1000.0;
 	}
-#endif
 }
 
 /*
@@ -488,9 +521,6 @@ RE_Scissor
 ================
 */
 void RE_Scissor(int x, int y, int width, int height) {
-    // FIXME: unimplemented (GL2)
-#if 0
 	qglEnable(GL_SCISSOR_TEST);
 	qglScissor(x, y, width, height);
-#endif
 }

From 954d09626149630e186d1005646472fadcbfd435 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:53:33 +0100
Subject: [PATCH 1697/2040] Fix font rendering

---
 code/renderergl2/tr_font.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/renderergl2/tr_font.cpp b/code/renderergl2/tr_font.cpp
index abb9ff6e..021a5c48 100644
--- a/code/renderergl2/tr_font.cpp
+++ b/code/renderergl2/tr_font.cpp
@@ -535,8 +535,8 @@ void R_LoadFontShader(fontheader_sgl_t* font)
         {
             if (fontshader->stages[0] != NULL && fontshader->stages[0]->active)
             {
-                fontshader->stages[0]->rgbGen = CGEN_GLOBAL_COLOR;
-                fontshader->stages[0]->alphaGen = AGEN_GLOBAL_ALPHA;
+                fontshader->stages[0]->rgbGen = CGEN_ENTITY;
+                fontshader->stages[0]->alphaGen = AGEN_ENTITY;
             }
         }
 
@@ -585,6 +585,9 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
         R_LoadFontShader(font);
     }
 
+    Vector4Copy(backEnd.color2D, backEnd.entity2D.e.shaderRGBA);
+    backEnd.currentEntity = &backEnd.entity2D;
+
     charHeight = s_fontHeightScale * font->height * s_fontGeneralScale;
     RB_BeginSurface((shader_t*)font->shader, 0, 0);
 

From 1919b0efcb57d3f0e9faecb0fba09d5085c5407d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:11:32 +0100
Subject: [PATCH 1698/2040] Fix Cvar_SetValue not set for ref imports

---
 code/client/cl_main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 82108ef2..d1b43ea6 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3184,6 +3184,7 @@ void CL_InitRef( void ) {
 	ri.FS_CanonicalFilename = FS_CanonicalFilename;
 	ri.Cvar_Get = Cvar_Get;
 	ri.Cvar_Set = Cvar_Set;
+	ri.Cvar_SetValue = Cvar_SetValue;
 	ri.Cvar_SetDefault = Cvar_SetDefault;
 
     ri.CM_EntityString = CM_EntityString;

From d0c0a55e6d33fbad56774abf46a5819848d15617 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:20:30 +0100
Subject: [PATCH 1699/2040] Fix drawing elements with color

---
 code/renderergl2/tr_draw.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/code/renderergl2/tr_draw.c b/code/renderergl2/tr_draw.c
index f8837211..d9d8399a 100644
--- a/code/renderergl2/tr_draw.c
+++ b/code/renderergl2/tr_draw.c
@@ -74,7 +74,7 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 	// draw the pic
 	RB_BeginSurface(shader, 0, 0);
 
-    RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+    RB_Color4bv(backEnd.color2D);
 
 	RB_Texcoord2f(s1, t1);
 	RB_Vertex2f(x, y);
@@ -126,8 +126,8 @@ void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, fl
 	scaledWidth2 = halfWidth * sx;
 	scaledHeight2 = halfHeight * sy;
 
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
 	RB_BeginSurface(shader, 0, 0);
 
 	RB_Texcoord2f(s1, t1);
@@ -172,8 +172,8 @@ void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
 	picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
 	pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
 
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
 
 	RB_StreamBegin(shader);
 
@@ -218,8 +218,8 @@ void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, i
 	picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
 	pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
 
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
 
 	RB_StreamBegin(shader);
 
@@ -256,8 +256,8 @@ void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhand
 		shader = tr.defaultShader;
 	}
 
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
 
 	RB_BeginSurface(shader, 0, 0);
 
@@ -485,27 +485,20 @@ Set2DWindow
 ================
 */
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-	mat4_t    oldmodelview, oldprojection, matrix;
+	mat4_t matrix;
 
 	R_IssuePendingRenderCommands();
 	qglViewport(x, y, w, h);
 	qglScissor(x, y, w, h);
 
-	Mat4Copy(glState.projection, oldprojection);
-	Mat4Copy(glState.modelview, oldmodelview);
-	Mat4Identity(matrix);
+    Mat4Ortho(left, right, bottom, top, n, f, matrix);
 	GL_SetProjectionMatrix(matrix);
-	Mat4Ortho(left, right, bottom, top, n, f, matrix);
+	Mat4Identity(matrix);
 	GL_SetModelviewMatrix(matrix);
 
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
-	qglEnable(GL_BLEND);
-	qglDisable(GL_CULL_FACE);
-	qglDisable(GL_CLIP_PLANE0);
-	// Make sure to disable the fog to avoid messing up with the UI
-	qglDisable(GL_FOG);
-	qglFogf(GL_FOG_START, 0);
+	GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
 
+    GL_Cull(CT_TWO_SIDED);
 
 	if (!backEnd.projection2D)
 	{

From 3afb87486b350cefb1951c49a90a599ddd04306d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:21:28 +0100
Subject: [PATCH 1700/2040] Add basic support for mohaa shaders for GL2

---
 code/renderergl2/tr_local.h  |  52 +++-
 code/renderergl2/tr_shader.c | 474 ++++++++++++++++++++++++++++++++++-
 2 files changed, 520 insertions(+), 6 deletions(-)

diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 1be81e5c..7b7ff8e3 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -268,12 +268,23 @@ typedef enum {
     //
     // OPENMOHAA-specific stuff
     //
-
-    AGEN_GLOBAL_ALPHA,
-    AGEN_DIST_FADE,
+	
+	AGEN_NOISE,
+	AGEN_DOT,
+	AGEN_ONE_MINUS_DOT,
+	AGEN_CONSTANT,
+	AGEN_GLOBAL_ALPHA,
+	AGEN_SKYALPHA,
+	AGEN_ONE_MINUS_SKYALPHA,
+	AGEN_SCOORD,
+	AGEN_TCOORD,
+	AGEN_DIST_FADE,
     AGEN_ONE_MINUS_DIST_FADE,
     AGEN_TIKI_DIST_FADE,
     AGEN_ONE_MINUS_TIKI_DIST_FADE,
+	AGEN_DOT_VIEW,
+	AGEN_ONE_MINUS_DOT_VIEW,
+	AGEN_HEIGHT_FADE,
 } alphaGen_t;
 
 typedef enum {
@@ -295,8 +306,17 @@ typedef enum {
 	//
 	// OPENMOHAA-specific stuff
 	//
-
+	
+    CGEN_MULTIPLY_BY_WAVEFORM,
+    CGEN_LIGHTING_GRID,
+    CGEN_LIGHTING_SPHERICAL,
+    CGEN_NOISE,
     CGEN_GLOBAL_COLOR,
+    CGEN_STATIC,
+    CGEN_SCOORD,
+    CGEN_TCOORD,
+    CGEN_DOT,
+    CGEN_ONE_MINUS_DOT,
 } colorGen_t;
 
 typedef enum {
@@ -449,6 +469,17 @@ typedef struct {
 	vec4_t normalScale;
 	vec4_t specularScale;
 
+	//
+	// OPENMOHAA-SPECIFIC stuff
+	//
+
+	float			alphaMin;
+	float			alphaMax;
+	vec3_t			specOrigin;
+
+    byte			colorConst[4];			// for CGEN_CONST and AGEN_CONST
+	byte			alphaConst;
+	byte			alphaConstMin;
 } shaderStage_t;
 
 struct shaderCommands_s;
@@ -550,7 +581,7 @@ typedef struct shader_s {
 	//
 	// OPENMOHAA-specific stuff
 	//
-
+	qboolean force32bit;
     float fDistRange;
     float fDistNear;
     spriteParms_t sprite;
@@ -2533,6 +2564,17 @@ void    R_RemapShader(const char *oldShader, const char *newShader, const char *
 // OPENMOHAA-specific stuff
 //=========================
 
+#define GLS_MULTITEXTURE						0x00004000
+#define GLS_MULTITEXTURE_ENV					0x00008000
+#define GLS_FOG									0x00080000
+
+#define GLS_FOG_ENABLED							0x00100000
+#define GLS_FOG_BLACK							0x00200000
+#define GLS_FOG_WHITE							0x00400000
+#define GLS_FOG_COLOR							(GLS_FOG_BLACK | GLS_FOG_WHITE)
+#define GLS_FOG_BITS							(GLS_FOG_WHITE|GLS_FOG_BLACK|GLS_FOG_ENABLED)
+#define GLS_COLOR_NOMASK						0x00800000
+
 void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori);
 void R_RotateForViewer(void);
 void R_SetupFrustum(void);
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index ad3fd98a..21ef5039 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -117,6 +117,7 @@ ParseVector
 ===============
 */
 static qboolean ParseVector( char **text, int count, float *v ) {
+#if 0
 	char	*token;
 	int		i;
 
@@ -143,6 +144,25 @@ static qboolean ParseVector( char **text, int count, float *v ) {
 	}
 
 	return qtrue;
+#endif
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+	char	*token;
+	int		i;
+
+	for ( i = 0 ; i < count ; i++ ) {
+		token = COM_ParseExt( text, qfalse );
+		if ( !token[0] ) {
+			ri.Printf( PRINT_WARNING, "WARNING: missing vector element in shader '%s'\n", shader.name );
+			return qfalse;
+		}
+		v[i] = atof( token );
+	}
+
+	return qtrue;
+
 }
 
 
@@ -604,6 +624,15 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 	char *token;
 	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0;
 	qboolean depthMaskExplicit = qfalse;
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	int colorBits;
+	int cntBundle = 0;
+	int depthTestBits = 0;
+	int fogBits = 0;
+	qboolean shouldProcess = qtrue;
+	//=========================
 
 	stage->active = qtrue;
 
@@ -875,6 +904,13 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			} else if ( !Q_stricmp( token, "blend" ) ) {
 				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
 				blendDstBits = GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			} else if ( !Q_stricmp( token, "alphaadd" ) ) {
+				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
+                blendDstBits = GLS_DSTBLEND_ONE;
+			//=========================
 			} else {
 				// complex double blends
 				blendSrcBits = NameToSrcBlendMode( token );
@@ -1214,6 +1250,142 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			{
 				stage->rgbGen = CGEN_ONE_MINUS_VERTEX;
 			}
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			else if (!Q_stricmp(token, "colorwave"))
+			{
+				vec3_t v;
+
+				ParseVector(text, 3, v);
+				stage->colorConst[0] = v[0] * 255.0;
+				stage->colorConst[1] = v[1] * 255.0;
+				stage->colorConst[2] = v[2] * 255.0;
+				stage->rgbGen = CGEN_MULTIPLY_BY_WAVEFORM;
+			}
+			else if (!Q_stricmp(token, "global"))
+			{
+				stage->rgbGen = CGEN_GLOBAL_COLOR;
+            }
+            else if (!Q_stricmp(token, "fromentity"))
+            {
+                stage->rgbGen = CGEN_ENTITY;
+            }
+			else if (!Q_stricmp(token, "fromclient"))
+			{
+				stage->rgbGen = CGEN_VERTEX;
+				if (stage->alphaGen == 0) {
+					stage->alphaGen = AGEN_VERTEX;
+				}
+			}
+			else if (!Q_stricmp(token, "lightingGrid"))
+			{
+				stage->rgbGen = CGEN_LIGHTING_GRID;
+			}
+			else if (!Q_stricmp(token, "lightingSpherical"))
+			{
+				stage->rgbGen = CGEN_LIGHTING_SPHERICAL;
+			}
+			else if (!Q_stricmp(token, "constant"))
+			{
+				vec3_t	color;
+
+				VectorClear( color );
+
+				ParseVector( text, 3, color );
+				stage->constantColor[0] = 255 * color[0];
+				stage->constantColor[1] = 255 * color[1];
+				stage->constantColor[2] = 255 * color[2];
+
+				stage->rgbGen = CGEN_CONST;
+			}
+			else if (!Q_stricmp(token, "static"))
+			{
+				stage->rgbGen = CGEN_STATIC;
+				if (stage->alphaGen == AGEN_IDENTITY) {
+					stage->alphaGen = AGEN_VERTEX;
+				}
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->rgbGen = CGEN_SCOORD;
+				}
+				else {
+					stage->rgbGen = CGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing rgbGen sCoord or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+
+				stage->alphaConst = atof(token) * 255.0;
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				stage->rgbGen = CGEN_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneminusdot"))
+			{
+				stage->rgbGen = CGEN_ONE_MINUS_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+            }
+            //=========================
 			else
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
@@ -1261,7 +1433,21 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 			else if ( !Q_stricmp( token, "lightingSpecular" ) )
 			{
-				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+                stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+                //
+                // OPENMOHAA-specific stuff
+                //=========================
+				stage->alphaMax = 255;
+				stage->specOrigin[0] = -960;
+				stage->specOrigin[1] = 1980;
+				stage->specOrigin[2] = 96;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0]) {
+					stage->alphaMax = atof(token) * 255.0;
+					ParseVector(text, 3, stage->specOrigin);
+                }
+                //=========================
 			}
 			else if ( !Q_stricmp( token, "oneMinusVertex" ) )
 			{
@@ -1281,6 +1467,196 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 					shader.portalRange = atof( token );
 				}
 			}
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			else if (!Q_stricmp(token, "global"))
+			{
+				stage->alphaGen = AGEN_GLOBAL_ALPHA;
+			}
+			else if (!Q_stricmp(token, "fromentity"))
+			{
+				stage->alphaGen = AGEN_ENTITY;
+			}
+			else if (!Q_stricmp(token, "fromclient"))
+			{
+				stage->alphaGen = AGEN_VERTEX;
+			}
+			else if (!Q_stricmp(token, "oneMinusFromClient"))
+			{
+				stage->alphaGen = AGEN_ONE_MINUS_VERTEX;
+			}
+			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
+				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))
+			{
+				if (!Q_stricmp(token, "distFade")) {
+					stage->alphaGen = AGEN_DIST_FADE;
+				} else if (!Q_stricmp(token, "oneMinusDistFade")) {
+					stage->alphaGen = AGEN_ONE_MINUS_DIST_FADE;
+				} else if (!Q_stricmp(token, "tikiDistFade")) {
+                    stage->alphaGen = AGEN_TIKI_DIST_FADE;
+                } else {
+                    stage->alphaGen = AGEN_ONE_MINUS_TIKI_DIST_FADE;
+                }
+
+				shader.fDistNear = 256.0;
+				shader.fDistRange = 256.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistNear = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistRange = atof(token);
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "heightFade"))
+            {
+                stage->alphaMin = 256.0f;
+                stage->alphaMax = 512.0f;
+                stage->alphaGen = AGEN_HEIGHT_FADE;
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMin = atof(token);
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDot"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "dotView"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDotView"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "constant"))
+			{
+				token = COM_ParseExt(text, qfalse);
+				stage->constantColor[3] = 255 * atof(token);
+				stage->alphaGen = AGEN_CONST;
+			}
+			else if (!Q_stricmp(token, "skyAlpha"))
+			{
+				stage->alphaGen = AGEN_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "oneMinusSkyAlpha"))
+			{
+				stage->alphaGen = AGEN_ONE_MINUS_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->alphaGen = AGEN_SCOORD;
+				} else {
+					stage->alphaGen = AGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing alphaGen s or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+				stage->alphaConst = atof(token) * 255.0;
+			}
+			//=========================
 			else
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: unknown alphaGen parameter '%s' in shader '%s'\n", token, shader.name );
@@ -1353,6 +1729,92 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			continue;
 		}
+		//
+		// OPENMOHAA-specific stuff
+		//
+		else if (!Q_stricmp(token, "depthmask"))
+		{
+			depthMaskBits = GLS_DEPTHMASK_TRUE;
+			depthMaskExplicit = qtrue;
+
+			continue;
+        }
+        else if (!Q_stricmp(token, "nodepthwrite") || !Q_stricmp(token, "nodepthmask"))
+        {
+            depthMaskBits = 0;
+            depthMaskExplicit = qtrue;
+
+            continue;
+        }
+        else if (!Q_stricmp(token, "nocolorwrite") || !Q_stricmp(token, "nocolormask"))
+        {
+            colorBits = GLS_COLOR_NOMASK;
+
+            continue;
+        }
+		else if (!Q_stricmp(token, "noDepthTest"))
+		{
+			depthFuncBits = GLS_DEPTHTEST_DISABLE;
+			continue;
+        }
+        else if (!Q_stricmp(token, "nextBundle"))
+        {
+			if (!qglActiveTextureARB) {
+				ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
+				return qfalse;
+			}
+
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] && !Q_stricmp(token, "add")) {
+				//stage->multitextureEnv = GL_ADD;
+			} else {
+				//stage->multitextureEnv = GL_MODULATE;
+			}
+
+			cntBundle++;
+			if (cntBundle > NUM_TEXTURE_BUNDLES) {
+				ri.Printf(PRINT_WARNING, "WARNING: too many nextBundle commands in shader '%s'\n", shader.name);
+				return qfalse;
+			}
+            continue;
+        }
+		//
+		// Added in 2.0
+		//
+		else if (!Q_stricmp(token, "ifCvar") || !Q_stricmp(token, "ifCvarnot"))
+		{
+			cvar_t* var;
+			qboolean isNot = token[6] != 0;
+			qboolean evaluatedValue;
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar name in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			var = ri.Cvar_Get(token, "0", 0);
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar value in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			if (atof(token) != var->value) {
+				evaluatedValue = qfalse;
+			} else if (var->value) {
+				evaluatedValue = qtrue;
+			} else if (token[0] == '0' || (token[0] == '.' && token[1] == '0')) {
+				evaluatedValue = qtrue;
+			} else if (!Q_stricmp(var->string, token)) {
+				evaluatedValue = qtrue;
+			} else {
+				return qfalse;
+			}
+
+			shouldProcess &= evaluatedValue ^ isNot;
+		}
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
@@ -2009,6 +2471,16 @@ static qboolean ParseShader( char **text )
 			ParseSort( text );
 			continue;
 		}
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		// force 32 bit images
+		if (!Q_stricmp(token, "force32bit"))
+		{
+			shader.force32bit = qtrue;
+			continue;
+		}
+		//=========================
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );

From 6d21d52d3ec43047a5771c6a551e0bfdbe0c50f8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:31:03 +0100
Subject: [PATCH 1701/2040] Define USE_INTERNAL_JPEG macro for renderer when
 using the internal JPEG

---
 code/renderercommon/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderercommon/CMakeLists.txt b/code/renderercommon/CMakeLists.txt
index de7634b9..2270b0c4 100644
--- a/code/renderercommon/CMakeLists.txt
+++ b/code/renderercommon/CMakeLists.txt
@@ -23,6 +23,7 @@ if(USE_INTERNAL_JPEG)
 	target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
 	target_include_directories(omohrenderer_common PUBLIC "../jpeg-8c")
 	target_link_libraries(omohrenderer_common PRIVATE jpeg8)
+	target_compile_definitions(omohrenderer_common PUBLIC USE_INTERNAL_JPEG)
 else()
 	target_include_directories(omohrenderer_common PUBLIC ${JPEG_INCLUDE_DIRS})
 	target_link_libraries(omohrenderer_common PRIVATE ${JPEG_LIBRARIES})

From dc9fec9d0312a09e731aa2740f86e283822d86c2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:34:09 +0100
Subject: [PATCH 1702/2040] Load JPEG file first before TGA

---
 code/renderergl2/tr_image.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index 35ab1378..2957c449 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -2484,6 +2484,40 @@ void R_LoadImage( const char *name, byte **pic, int *width, int *height, GLenum
 			return;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	// The original game will first try to load the JPG file before the TGA
+	// this is really dirty, but unfortunately without it,
+	// some unexpected artifacts (like broken UI elements) will appear
+    if (!Q_stricmp(ext, "tga")) {
+        char altJPEGName[MAX_QPATH];
+		int len;
+
+        Q_strncpyz(altJPEGName, name, sizeof(altJPEGName));
+
+        len = strlen(altJPEGName);
+		altJPEGName[len - 3] = 'j';
+		altJPEGName[len - 2] = 'p';
+		altJPEGName[len - 1] = 'g';
+
+		// Look for the correct loader and use it
+		for (i = 0; i < numImageLoaders; i++)
+		{
+			if (!Q_stricmp(imageLoaders[i].ext, "jpg"))
+			{
+				// Load
+				imageLoaders[i].ImageLoader(altJPEGName, pic, width, height);
+				break;
+			}
+		}
+
+		if (*pic) {
+			return;
+        }
+    }
+    //=========================
+
 	if( *ext )
 	{
 		// Look for the correct loader and use it

From 14e83a52a451fe3a5091f54026abf697f2e0784d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Dec 2024 14:01:11 +0100
Subject: [PATCH 1703/2040] Add terrain rendering

---
 code/renderergl2/tr_local.h   |    1 +
 code/renderergl2/tr_terrain.c | 1681 +++++++++++++++++++++++++++++++++
 code/renderergl2/tr_world.c   |   78 +-
 3 files changed, 1759 insertions(+), 1 deletion(-)
 create mode 100644 code/renderergl2/tr_terrain.c

diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 7b7ff8e3..19db5dc5 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -3155,6 +3155,7 @@ WORLD MAP
 */
 void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
 mnode_t* R_PointInLeaf(const vec3_t p);
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
 
 //=========================
 
diff --git a/code/renderergl2/tr_terrain.c b/code/renderergl2/tr_terrain.c
new file mode 100644
index 00000000..4afb2989
--- /dev/null
+++ b/code/renderergl2/tr_terrain.c
@@ -0,0 +1,1681 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_terrain.c : Terrain rendering
+
+#include "tr_local.h"
+
+cvar_t *ter_maxlod;
+cvar_t *ter_maxtris;
+cvar_t *ter_cull;
+cvar_t *ter_lock;
+cvar_t *ter_error;
+cvar_t *ter_cautiousframes;
+cvar_t *ter_count;
+
+#define TERRAIN_TABLE_SIZE 180
+
+static float g_fDistanceTable[TERRAIN_TABLE_SIZE];
+static float g_fClipDotProductTable[TERRAIN_TABLE_SIZE];
+static float g_fClipDotSquaredTable[TERRAIN_TABLE_SIZE];
+static float g_fFogDistance;
+static float g_fClipDotProduct;
+static float g_fClipDotSquared;
+
+static vec3_t g_vClipOrigin;
+static vec3_t g_vClipVector;
+static vec3_t g_vViewOrigin;
+static vec3_t g_vViewVector;
+
+static int    g_terVisCount;
+static float  g_fCheck;
+static size_t g_nTris;
+static size_t g_nVerts;
+static int    g_nMerge;
+static int    g_nSplit;
+unsigned int  g_uiTerDist;
+vec2_t        g_vTerOrg;
+vec3_t        g_vTerFwd;
+
+static const unsigned int MAX_TERRAIN_LOD       = 6;
+static const float        TERRAIN_LIGHTMAP_SIZE = 128.0f;
+
+typedef struct poolInfo_s {
+    terraInt iFreeHead;
+    terraInt iCur;
+    size_t   nFree;
+} poolInfo_t;
+
+static int modeTable[8];
+
+terraTri_t    *g_pTris;
+terrainVert_t *g_pVert;
+
+poolInfo_t g_tri;
+poolInfo_t g_vert;
+
+/*
+================
+R_ValidateHeightmapForVertex
+================
+*/
+static void R_ValidateHeightmapForVertex(terraTri_t *pTri)
+{
+    for (terraInt i = 0; i < 3; i++) {
+        terrainVert_t *pVert = &g_pVert[pTri->iPt[i]];
+        if (pVert->pHgt < pTri->patch->heightmap || pVert->pHgt > &pTri->patch->heightmap[80]) {
+            pVert->pHgt = pTri->patch->heightmap;
+        }
+    }
+}
+
+/*
+================
+R_AllocateVert
+================
+*/
+static terraInt R_AllocateVert(cTerraPatchUnpacked_t *patch)
+{
+    terraInt iVert = g_vert.iFreeHead;
+
+    g_vert.iFreeHead                = g_pVert[g_vert.iFreeHead].iNext;
+    g_pVert[g_vert.iFreeHead].iPrev = 0;
+
+    g_pVert[iVert].iPrev                     = 0;
+    g_pVert[iVert].iNext                     = patch->drawinfo.iVertHead;
+    g_pVert[patch->drawinfo.iVertHead].iPrev = iVert;
+
+    patch->drawinfo.iVertHead = iVert;
+    patch->drawinfo.nVerts++;
+
+    assert(g_vert.nFree > 0);
+    g_vert.nFree--;
+
+    g_pVert[iVert].nRef         = 0;
+    g_pVert[iVert].uiDistRecalc = 0;
+
+    return iVert;
+}
+
+/*
+================
+R_InterpolateVert
+================
+*/
+static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
+{
+    const terrainVert_t         *pVert0 = &g_pVert[pTri->iPt[0]];
+    const terrainVert_t         *pVert1 = &g_pVert[pTri->iPt[1]];
+    const cTerraPatchUnpacked_t *pPatch = pTri->patch;
+    const byte                  *pMinHeight, *pMaxHeight;
+
+    // Interpolate texture coordinates
+    pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
+    pVert->texCoords[0][1] = (pVert0->texCoords[0][1] + pVert1->texCoords[0][1]) * 0.5f;
+    pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
+    pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
+
+    // Fixed in OPM
+    //  Use the delta of the two pointers instead of adding them + divide to get the average height,
+    //  otherwise the resulting integer would overflow/warp and cause a segmentation fault.
+    //  Although rare, the overflow issue can occur in the original game
+    pMinHeight  = (byte *)Q_min((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pMaxHeight  = (byte *)Q_max((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
+    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight);
+
+    // Calculate the average Z
+    pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
+    pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
+    pVert->fHgtAvg += pPatch->z0;
+    // Calculate the average position
+    pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
+    pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
+    pVert->xyz[2] = pVert->fHgtAvg;
+}
+
+/*
+================
+R_ReleaseVert
+================
+*/
+static void R_ReleaseVert(cTerraPatchUnpacked_t *patch, int iVert)
+{
+    terrainVert_t *pVert = &g_pVert[iVert];
+
+    terraInt iPrev       = pVert->iPrev;
+    terraInt iNext       = pVert->iNext;
+    g_pVert[iPrev].iNext = iNext;
+    g_pVert[iNext].iPrev = iPrev;
+
+    assert(patch->drawinfo.nVerts > 0);
+    patch->drawinfo.nVerts--;
+
+    if (patch->drawinfo.iVertHead == iVert) {
+        patch->drawinfo.iVertHead = iNext;
+    }
+
+    pVert->iPrev                    = 0;
+    pVert->iNext                    = g_vert.iFreeHead;
+    g_pVert[g_vert.iFreeHead].iPrev = iVert;
+    g_vert.iFreeHead                = iVert;
+    g_vert.nFree++;
+}
+
+/*
+================
+R_AllocateTri
+================
+*/
+terraInt R_AllocateTri(cTerraPatchUnpacked_t *patch, qboolean check)
+{
+    terraInt iTri = g_tri.iFreeHead;
+
+    g_tri.iFreeHead                = g_pTris[iTri].iNext;
+    g_pTris[g_tri.iFreeHead].iPrev = 0;
+
+    g_pTris[iTri].iPrev                     = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext                     = 0;
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+    patch->drawinfo.iTriTail                = iTri;
+
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
+
+    patch->drawinfo.nTris++;
+    assert(g_tri.nFree > 0);
+    g_tri.nFree--;
+
+    g_pTris[iTri].byConstChecks = check ? 0 : 4;
+    g_pTris[iTri].uiDistRecalc  = 0;
+    patch->uiDistRecalc         = 0;
+
+    return iTri;
+}
+
+/*
+================
+R_ReleaseTri
+================
+*/
+static void R_ReleaseTri(cTerraPatchUnpacked_t *patch, terraInt iTri)
+{
+    terraTri_t *pTri = &g_pTris[iTri];
+
+    terraInt iPrev       = pTri->iPrev;
+    terraInt iNext       = pTri->iNext;
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    patch->uiDistRecalc = 0;
+
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
+
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
+
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
+
+    pTri->iPrev                    = 0;
+    pTri->iNext                    = g_tri.iFreeHead;
+    g_pTris[g_tri.iFreeHead].iPrev = iTri;
+    g_tri.iFreeHead                = iTri;
+    g_tri.nFree++;
+
+    for (int i = 0; i < 3; i++) {
+        terraInt ptNum = pTri->iPt[i];
+
+        g_pVert[ptNum].nRef--;
+        if (!g_pVert[ptNum].nRef) {
+            R_ReleaseVert(patch, ptNum);
+        }
+    }
+}
+
+/*
+================
+R_ConstChecksForTri
+================
+*/
+static int R_ConstChecksForTri(terraTri_t *pTri)
+{
+    varnodeUnpacked_t vn;
+
+    if (pTri->lod == MAX_TERRAIN_LOD) {
+        return 2;
+    }
+
+    vn = *pTri->varnode;
+    //vn.s.flags &= 0xF0;
+    vn.flags &= 0xFFFFFFF0;
+
+    if (vn.fVariance == 0.0 && !(pTri->varnode->flags & 8)) {
+        return 2;
+    } else if (pTri->varnode->flags & 8) {
+        return 3;
+    } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->flags & 4) && pTri->lod < ter_maxlod->integer) {
+        return 0;
+    }
+
+    return 2;
+}
+
+/*
+================
+R_DemoteInAncestry
+================
+*/
+static void R_DemoteInAncestry(cTerraPatchUnpacked_t *patch, terraInt iTri)
+{
+    terraInt iPrev = g_pTris[iTri].iPrev;
+    terraInt iNext = g_pTris[iTri].iNext;
+
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
+
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
+
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
+
+    g_pTris[iTri].iPrev                       = 0;
+    g_pTris[iTri].iNext                       = patch->drawinfo.iMergeHead;
+    g_pTris[patch->drawinfo.iMergeHead].iPrev = iTri;
+    patch->drawinfo.iMergeHead                = iTri;
+}
+
+/*
+================
+R_TerrainHeapInit
+================
+*/
+static void R_TerrainHeapInit()
+{
+    g_tri.iFreeHead  = 1;
+    g_tri.nFree      = g_nTris - 1;
+    g_vert.iFreeHead = 1;
+    g_vert.nFree     = g_nVerts - 1;
+
+    for (size_t i = 0; i < g_nTris; i++) {
+        g_pTris[i].iPrev = (terraInt)i - 1;
+        g_pTris[i].iNext = (terraInt)i + 1;
+    }
+
+    g_pTris[0].iPrev           = 0;
+    g_pTris[g_nTris - 1].iNext = 0;
+
+    for (size_t i = 0; i < g_nVerts; i++) {
+        g_pVert[i].iPrev = (terraInt)i - 1;
+        g_pVert[i].iNext = (terraInt)i + 1;
+    }
+
+    g_pVert[0].iPrev            = 0;
+    g_pVert[g_nVerts - 1].iNext = 0;
+}
+
+/*
+================
+R_TerrainPatchesInit
+================
+*/
+static void R_TerrainPatchesInit()
+{
+    int i;
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+        patch->drawinfo.iTriHead     = 0;
+        patch->drawinfo.iTriTail     = 0;
+        patch->drawinfo.iMergeHead   = 0;
+        patch->drawinfo.iVertHead    = 0;
+        patch->drawinfo.nTris        = 0;
+        patch->drawinfo.nVerts       = 0;
+    }
+}
+
+/*
+================
+R_SplitTri
+================
+*/
+
+void R_SplitTri(
+    terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight
+)
+{
+    terraTri_t *pSplit = &g_pTris[iSplit];
+
+    terraTri_t *pLeft;
+    if (iLeft) {
+        pLeft = &g_pTris[iLeft];
+    } else {
+        pLeft = NULL;
+    }
+
+    terraTri_t *pRight;
+    if (iRight) {
+        pRight = &g_pTris[iRight];
+    } else {
+        pRight = NULL;
+    }
+
+    int                iNextLod = pSplit->lod + 1;
+    int                index    = pSplit->index;
+    varnodeUnpacked_t *varnode  = &pSplit->varnode[index];
+
+    if (pLeft) {
+        pLeft->patch   = pSplit->patch;
+        pLeft->index   = index * 2;
+        pLeft->varnode = varnode;
+        pLeft->lod     = iNextLod;
+        pLeft->iLeft   = iRight;
+        pLeft->iRight  = iRightOfLeft;
+        pLeft->iBase   = pSplit->iLeft;
+        pLeft->iPt[0]  = pSplit->iPt[1];
+        pLeft->iPt[1]  = pSplit->iPt[2];
+        pLeft->iPt[2]  = iNewPt;
+
+        R_ValidateHeightmapForVertex(pLeft);
+        pLeft->byConstChecks |= R_ConstChecksForTri(pLeft);
+
+        g_pVert[pLeft->iPt[0]].nRef++;
+        g_pVert[pLeft->iPt[1]].nRef++;
+        g_pVert[pLeft->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pLeft->nSplit = 0;
+    }
+
+    if (pSplit->iLeft) {
+        if (g_pTris[pSplit->iLeft].lod == iNextLod) {
+            g_pTris[pSplit->iLeft].iBase = iLeft;
+        } else {
+            g_pTris[pSplit->iLeft].iRight = iLeft;
+        }
+    }
+
+    if (pRight) {
+        pRight->patch   = pSplit->patch;
+        pRight->index   = index * 2 + 1;
+        pRight->varnode = varnode + 1;
+        pRight->lod     = iNextLod;
+        pRight->iLeft   = iLeftOfRight;
+        pRight->iRight  = iLeft;
+        pRight->iBase   = pSplit->iRight;
+        pRight->iPt[0]  = pSplit->iPt[2];
+        pRight->iPt[1]  = pSplit->iPt[0];
+        pRight->iPt[2]  = iNewPt;
+
+        R_ValidateHeightmapForVertex(pRight);
+        pRight->byConstChecks |= R_ConstChecksForTri(pRight);
+
+        g_pVert[pRight->iPt[0]].nRef++;
+        g_pVert[pRight->iPt[1]].nRef++;
+        g_pVert[pRight->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pRight->nSplit = 0;
+    }
+
+    if (pSplit->iRight) {
+        if (g_pTris[pSplit->iRight].lod == iNextLod) {
+            g_pTris[pSplit->iRight].iBase = iRight;
+        } else {
+            g_pTris[pSplit->iRight].iLeft = iRight;
+        }
+    }
+}
+
+/*
+================
+R_ForceSplit
+================
+*/
+static void R_ForceSplit(terraInt iTri)
+{
+    terraTri_t    *pTri = &g_pTris[iTri];
+    terraTri_t    *pBase;
+    terrainVert_t *pVert;
+    terraInt       iBase;
+    terraInt       iTriLeft, iTriRight;
+    terraInt       iNewPt;
+    terraInt       iBaseLeft = 0, iBaseRight = 0;
+    terraInt       iNewBasePt;
+    uint32_t       flags, flags2;
+
+    g_nSplit++;
+
+    iBase = pTri->iBase;
+    pBase = &g_pTris[iBase];
+    if (iBase && pBase->lod != pTri->lod) {
+        assert(g_pTris[pTri->iBase].iBase != iTri);
+        assert(g_tri.nFree >= 8);
+
+        R_ForceSplit(iBase);
+
+        assert(g_tri.nFree >= 4);
+
+        iBase = pTri->iBase;
+        pBase = &g_pTris[iBase];
+    }
+
+    flags = pTri->varnode->flags;
+
+    iTriLeft  = R_AllocateTri(pTri->patch, (flags & 2));
+    iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
+
+    iNewPt = R_AllocateVert(pTri->patch);
+    R_InterpolateVert(pTri, &g_pVert[iNewPt]);
+
+    g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
+
+    iBaseLeft  = 0;
+    iBaseRight = 0;
+
+    if (iBase) {
+        flags2 = pBase->varnode->flags;
+        flags |= flags2;
+
+        iBaseLeft  = R_AllocateTri(pBase->patch, (flags2 & 2));
+        iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
+
+        iNewBasePt = iNewPt;
+        if (pBase->patch != pTri->patch) {
+            iNewBasePt = R_AllocateVert(pBase->patch);
+            pVert      = &g_pVert[iNewBasePt];
+            R_InterpolateVert(pBase, pVert);
+
+            pVert->fVariance = g_pVert[iNewPt].fVariance;
+            if (flags & 8) {
+                pVert->fHgtAvg += pVert->fHgtAdd;
+                pVert->fHgtAdd   = 0.0;
+                pVert->fVariance = 0.0;
+                pVert->xyz[2]    = pVert->fHgtAvg;
+            }
+        }
+
+        R_SplitTri(iBase, iNewBasePt, iBaseLeft, iBaseRight, iTriRight, iTriLeft);
+
+        pBase->iLeftChild           = iBaseLeft;
+        pBase->iRightChild          = iBaseRight;
+        g_pTris[iBaseLeft].iParent  = iBase;
+        g_pTris[iBaseRight].iParent = iBase;
+        R_DemoteInAncestry(pBase->patch, iBase);
+    }
+
+    if (flags & 8) {
+        pVert = &g_pVert[iNewPt];
+        pVert->fHgtAvg += pVert->fHgtAdd;
+        pVert->fHgtAdd   = 0.0;
+        pVert->fVariance = 0.0;
+        pVert->xyz[2]    = pVert->fHgtAvg;
+    }
+
+    R_SplitTri(iTri, iNewPt, iTriLeft, iTriRight, iBaseRight, iBaseLeft);
+
+    pTri->iLeftChild           = iTriLeft;
+    pTri->iRightChild          = iTriRight;
+    g_pTris[iTriLeft].iParent  = iTri;
+    g_pTris[iTriRight].iParent = iTri;
+    R_DemoteInAncestry(pTri->patch, iTri);
+}
+
+/*
+================
+R_ForceMerge
+================
+*/
+static void R_ForceMerge(terraInt iTri)
+{
+    terraTri_t            *pTri  = &g_pTris[iTri];
+    cTerraPatchUnpacked_t *patch = pTri->patch;
+    terraInt               iPrev = pTri->iPrev;
+    terraInt               iNext = pTri->iNext;
+
+    g_nMerge++;
+
+    if (pTri->iLeftChild) {
+        terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
+
+        pTri->iLeft = iLeft;
+        if (iLeft) {
+            if (g_pTris[iLeft].lod == pTri->lod) {
+                g_pTris[iLeft].iRight = iTri;
+            } else {
+                g_pTris[iLeft].iBase = iTri;
+            }
+        }
+
+        R_ReleaseTri(pTri->patch, pTri->iLeftChild);
+
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
+
+    if (pTri->iRightChild) {
+        terraInt iRight = g_pTris[pTri->iRightChild].iBase;
+
+        pTri->iRight = iRight;
+        if (iRight) {
+            if (g_pTris[iRight].lod == pTri->lod) {
+                g_pTris[iRight].iLeft = iTri;
+            } else {
+                g_pTris[iRight].iBase = iTri;
+            }
+        }
+
+        R_ReleaseTri(pTri->patch, pTri->iRightChild);
+
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
+
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    patch->drawinfo.nTris++;
+    if (patch->drawinfo.iMergeHead == iTri) {
+        patch->drawinfo.iMergeHead = iNext;
+    }
+
+    g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext = 0;
+
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+
+    patch->drawinfo.iTriTail = iTri;
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
+}
+
+/*
+================
+R_TerraTriNeighbor
+================
+*/
+static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, int dir)
+{
+    int iNeighbor;
+
+    if (iPatch < 0) {
+        return 0;
+    }
+
+    iNeighbor = 2 * iPatch + 1;
+
+    switch (dir) {
+    case 0:
+        return iNeighbor;
+    case 1:
+        if (terraPatches[iPatch].flags & 0x80) {
+            return iNeighbor;
+        } else {
+            return iNeighbor + 1;
+        }
+        break;
+    case 2:
+        return iNeighbor + 1;
+    case 3:
+        if (terraPatches[iPatch].flags & 0x80) {
+            return iNeighbor + 1;
+        } else {
+            return iNeighbor;
+        }
+        break;
+    }
+
+    return 0;
+}
+
+/*
+================
+R_PreTessellateTerrain
+================
+*/
+static void R_PreTessellateTerrain()
+{
+    size_t numTerrainPatches = tr.world->numTerraPatches;
+
+    if (!numTerrainPatches) {
+        return;
+    }
+
+    R_IssuePendingRenderCommands();
+
+    if (ter_maxtris->integer < 4 * numTerrainPatches) {
+        ri.Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
+    } else if (ter_maxtris->integer > 65535) {
+        ri.Cvar_SetValue("ter_maxtris", 65535);
+    }
+
+    ri.Printf(PRINT_DEVELOPER, "Using ter_maxtris = %d\n", ter_maxtris->integer);
+
+    g_nTris  = ter_maxtris->integer * 2 + 1;
+    g_nVerts = ter_maxtris->integer + 1;
+    g_pTris  = ri.Hunk_Alloc(g_nTris * sizeof(terraTri_t), h_dontcare);
+    g_pVert  = ri.Hunk_Alloc(g_nVerts * sizeof(terrainVert_t), h_dontcare);
+
+    // Init triangles & vertices
+    R_TerrainHeapInit();
+    R_TerrainPatchesInit();
+
+    for (size_t i = 0; i < numTerrainPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+
+        patch->drawinfo.surfaceType = SF_TERRAIN_PATCH;
+        patch->drawinfo.nTris       = 0;
+        patch->drawinfo.nVerts      = 0;
+        patch->drawinfo.iTriHead    = 0;
+        patch->drawinfo.iTriTail    = 0;
+        patch->drawinfo.iVertHead   = 0;
+
+        float sMin, tMin;
+
+        if (patch->texCoord[0][0][0] < patch->texCoord[0][1][0]) {
+            sMin = patch->texCoord[0][0][0];
+        } else {
+            sMin = patch->texCoord[0][1][0];
+        }
+
+        float sMin2;
+        if (patch->texCoord[1][0][0] < patch->texCoord[1][1][0]) {
+            sMin2 = patch->texCoord[1][0][0];
+        } else {
+            sMin2 = patch->texCoord[1][1][0];
+        }
+
+        if (sMin >= sMin2) {
+            if (patch->texCoord[1][0][0] >= patch->texCoord[1][1][0]) {
+                sMin = floor(patch->texCoord[1][1][0]);
+            } else {
+                sMin = floor(patch->texCoord[1][0][0]);
+            }
+        } else if (patch->texCoord[0][0][0] >= patch->texCoord[0][1][0]) {
+            sMin = floor(patch->texCoord[0][1][0]);
+        } else {
+            sMin = floor(patch->texCoord[0][0][0]);
+        }
+
+        if (patch->texCoord[0][0][1] < patch->texCoord[0][1][1]) {
+            tMin = patch->texCoord[0][0][1];
+        } else {
+            tMin = patch->texCoord[0][1][1];
+        }
+
+        float tMin2;
+        if (patch->texCoord[1][0][1] < patch->texCoord[1][1][1]) {
+            tMin2 = patch->texCoord[1][0][1];
+        } else {
+            tMin2 = patch->texCoord[1][1][1];
+        }
+
+        if (tMin >= tMin2) {
+            if (patch->texCoord[1][0][1] >= patch->texCoord[1][1][1]) {
+                tMin = floor(patch->texCoord[1][1][1]);
+            } else {
+                tMin = floor(patch->texCoord[1][0][1]);
+            }
+        } else if (patch->texCoord[0][0][1] >= patch->texCoord[0][1][1]) {
+            tMin = floor(patch->texCoord[0][1][1]);
+        } else {
+            tMin = floor(patch->texCoord[0][0][1]);
+        }
+
+        const float s00 = patch->texCoord[0][0][0] - sMin;
+        const float s01 = patch->texCoord[0][1][0] - sMin;
+        const float s10 = patch->texCoord[1][0][0] - sMin;
+        const float s11 = patch->texCoord[1][1][0] - sMin;
+
+        const float t00 = patch->texCoord[0][0][1] - tMin;
+        const float t01 = patch->texCoord[0][1][1] - tMin;
+        const float t10 = patch->texCoord[1][0][1] - tMin;
+        const float t11 = patch->texCoord[1][1][1] - tMin;
+
+        const float lmapSize = (float)(patch->drawinfo.lmapSize - 1) / TERRAIN_LIGHTMAP_SIZE;
+        const float ls       = patch->s + lmapSize;
+        const float lt       = patch->t + lmapSize;
+
+        terraInt iTri0 = R_AllocateTri(patch, qfalse);
+        terraInt iTri1 = R_AllocateTri(patch, qfalse);
+        terraInt i00   = R_AllocateVert(patch);
+        terraInt i01   = R_AllocateVert(patch);
+        terraInt i10   = R_AllocateVert(patch);
+        terraInt i11   = R_AllocateVert(patch);
+
+        terrainVert_t *pVert;
+        pVert                  = &g_pVert[i00];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[0] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[0];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s00;
+        pVert->texCoords[0][1] = t00;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i01];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[72] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[72];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s01;
+        pVert->texCoords[0][1] = t01;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i10];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[8] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[8];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s10;
+        pVert->texCoords[0][1] = t10;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i11];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[80] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[80];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s11;
+        pVert->texCoords[0][1] = t11;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        terraTri_t *pTri = &g_pTris[iTri0];
+        pTri->patch      = patch;
+        pTri->varnode    = &patch->varTree[0][0];
+        pTri->index      = 1;
+        pTri->lod        = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+
+        pTri->iBase = iTri1;
+        if ((patch->flags & 0x80u) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            } else {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            }
+            pTri->iPt[2] = i01;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            } else {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            }
+            pTri->iPt[2] = i11;
+        }
+
+        R_ValidateHeightmapForVertex(pTri);
+
+        pTri          = &g_pTris[iTri1];
+        pTri->patch   = patch;
+        pTri->varnode = &patch->varTree[1][0];
+        pTri->index   = 1;
+        pTri->lod     = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+
+        pTri->iBase = iTri0;
+        if ((patch->flags & 0x80u) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            } else {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            }
+            pTri->iPt[2] = i10;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            } else {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            }
+            pTri->iPt[2] = i00;
+        }
+
+        R_ValidateHeightmapForVertex(pTri);
+    }
+}
+
+/*
+================
+R_NeedSplitTri
+================
+*/
+static qboolean R_NeedSplitTri(terraTri_t *pTri)
+{
+    uint8_t byConstChecks = pTri->byConstChecks;
+    if (byConstChecks & 2) {
+        return byConstChecks & 1;
+    }
+
+    if (pTri->uiDistRecalc > g_uiTerDist) {
+        return qfalse;
+    }
+
+    float fRatio = ((g_pVert[pTri->iPt[0]].xyz[0] + g_pVert[pTri->iPt[1]].xyz[0]) * g_vViewVector[0]
+                    + (g_pVert[pTri->iPt[0]].xyz[1] + g_pVert[pTri->iPt[1]].xyz[1]) * g_vViewVector[1])
+                     * 0.5
+                 + g_vViewVector[2] - pTri->varnode->fVariance * g_fCheck;
+
+    if (fRatio > 0) {
+        pTri->uiDistRecalc = floor(fRatio) + g_uiTerDist;
+        return qfalse;
+    }
+
+    return qtrue;
+}
+
+/*
+================
+R_CalcVertMorphHeight
+================
+*/
+static void R_CalcVertMorphHeight(terrainVert_t *pVert)
+{
+    float dot;
+
+    pVert->xyz[2]       = pVert->fHgtAvg;
+    pVert->uiDistRecalc = g_uiTerDist + 1;
+    dot                 = (pVert->fVariance * g_fCheck)
+        - (g_vViewVector[0] * pVert->xyz[0] + g_vViewVector[1] * pVert->xyz[1] + g_vViewVector[2]);
+
+    if (dot > 0.0) {
+        float calc = dot / 400.0;
+
+        if (calc > 1.0) {
+            pVert->uiDistRecalc = (unsigned int)((g_uiTerDist - 400) + floor(dot));
+            calc                = 1.0;
+        }
+
+        pVert->xyz[2] += pVert->fHgtAdd * calc;
+    } else {
+        pVert->uiDistRecalc = g_uiTerDist - (int)ceil(dot);
+    }
+}
+
+/*
+================
+R_UpdateVertMorphHeight
+================
+*/
+static void R_UpdateVertMorphHeight(terrainVert_t *pVert)
+{
+    if (pVert->uiDistRecalc <= g_uiTerDist) {
+        R_CalcVertMorphHeight(pVert);
+    }
+}
+
+/*
+================
+R_DoTriSplitting
+================
+*/
+static void R_DoTriSplitting()
+{
+    cTerraPatchUnpacked_t *patch;
+
+    for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+        if (patch->uiDistRecalc > g_uiTerDist) {
+            continue;
+        }
+
+        patch->uiDistRecalc = -1;
+        g_tri.iCur          = patch->drawinfo.iTriHead;
+        while (g_tri.iCur != 0) {
+            terraTri_t *pTri = &g_pTris[g_tri.iCur];
+
+            if (R_NeedSplitTri(pTri)) {
+                //
+                // make sure there are sufficient number of tris
+                //
+                if (g_tri.nFree < 14 || g_vert.nFree < 14) {
+                    ri.Printf(PRINT_DEVELOPER, "WARNING: aborting terrain tessellation -- insufficient tris\n");
+                    return;
+                }
+
+                patch->uiDistRecalc = 0;
+                R_ForceSplit(g_tri.iCur);
+
+                if (&g_pTris[g_tri.iCur] == pTri) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            } else {
+                if ((pTri->byConstChecks & 3) != 2) {
+                    if (patch->uiDistRecalc > pTri->uiDistRecalc) {
+                        patch->uiDistRecalc = pTri->uiDistRecalc;
+                    }
+                }
+
+                g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+            }
+        }
+    }
+}
+
+/*
+================
+R_DoGeomorphs
+================
+*/
+static void R_DoGeomorphs()
+{
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
+
+        g_vert.iCur = patch->drawinfo.iVertHead;
+
+        if (patch->visCountDraw == g_terVisCount) {
+            if (patch->byDirty) {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_CalcVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+
+                patch->byDirty = qfalse;
+            } else {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_UpdateVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+            }
+        } else {
+            if (!patch->byDirty) {
+                patch->byDirty = qtrue;
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    pVert->xyz[2]        = pVert->fHgtAvg;
+                    g_vert.iCur          = pVert->iNext;
+                }
+            }
+        }
+    }
+}
+
+/*
+================
+R_MergeInternalAggressive
+================
+*/
+static qboolean R_MergeInternalAggressive()
+{
+    terraTri_t *pTri = &g_pTris[g_tri.iCur];
+    terraTri_t *pBase;
+
+    if (pTri->nSplit) {
+        return qfalse;
+    }
+
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
+
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit) {
+            return qfalse;
+        }
+
+        R_ForceMerge(pTri->iBase);
+    }
+
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
+}
+
+/*
+================
+R_MergeInternalCautious
+================
+*/
+static qboolean R_MergeInternalCautious()
+{
+    terraTri_t *pTri;
+    terraTri_t *pBase;
+
+    pTri = &g_pTris[g_tri.iCur];
+
+    if (pTri->nSplit) {
+        return qfalse;
+    }
+
+    if (pTri->varnode->flags & 8) {
+        return qfalse;
+    }
+
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
+
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit || (pBase->varnode->flags & 8)) {
+            return qfalse;
+        }
+
+        R_ForceMerge(pTri->iBase);
+    }
+
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
+}
+
+/*
+================
+R_DoTriMerging
+================
+*/
+static void R_DoTriMerging()
+{
+    int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
+
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        const cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
+
+        g_tri.iCur = patch->drawinfo.iMergeHead;
+        if (patch->visCountDraw >= iCautiousFrame) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalCautious()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        } else if (patch->visCountDraw > iCautiousFrame - 10) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalAggressive()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        }
+    }
+}
+
+/*
+================
+R_TessellateTerrain
+================
+*/
+void R_TessellateTerrain()
+{
+    R_DoTriSplitting();
+    // Morph geometry according to the view
+    R_DoGeomorphs();
+    // Merge vertices
+    R_DoTriMerging();
+}
+
+/*
+================
+R_TerrainPrepareFrame
+================
+*/
+void R_TerrainPrepareFrame()
+{
+    float distance;
+    int   index;
+    float fFov;
+    float fCheck;
+    float fDistBound;
+
+    if (ter_lock->integer) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    g_terVisCount++;
+    tr.world->activeTerraPatches = NULL;
+
+    if (ter_error->value < 0.1) {
+        ri.Cvar_Set("ter_error", "0.1");
+    }
+
+    distance = 1.0;
+    fFov     = tr.refdef.fov_x;
+    if (fFov < 1.0) {
+        fFov = 1.0;
+    }
+
+    fCheck = 1.0 / (tan(fFov / 114.0) * ter_error->value / 320.0);
+    if (g_terVisCount) {
+        float fFarPlane = tr.viewParms.farplane_distance;
+        if (fFarPlane == 0.0) {
+            fFarPlane = 4096.0;
+        }
+
+        fDistBound = fabs((fCheck - g_fCheck) * 510.0) + fabs((tr.refdef.vieworg[0] - g_vTerOrg[0]) * g_vTerFwd[0])
+                   + fabs((tr.refdef.vieworg[1] - g_vTerOrg[1]) * g_vTerFwd[1])
+                   + fabs((tr.refdef.viewaxis[0][0] - g_vTerFwd[0]) * fFarPlane)
+                   + fabs((tr.refdef.viewaxis[0][1] - g_vTerFwd[1]) * fFarPlane);
+
+        g_uiTerDist = (ceil(fDistBound) + (float)g_uiTerDist);
+        if (g_uiTerDist > 0xF0000000) {
+            for (index = 0; index < tr.world->numTerraPatches; index++) {
+                tr.world->terraPatches[index].uiDistRecalc = 0;
+            }
+
+            for (index = 0; index < g_nTris; index++) {
+                g_pTris[index].uiDistRecalc = 0;
+            }
+
+            for (index = 0; index < g_nVerts; index++) {
+                g_pVert[index].uiDistRecalc = 0;
+            }
+
+            g_uiTerDist = 0;
+        }
+    } else {
+        fDistBound  = 0.0;
+        g_uiTerDist = 0;
+    }
+
+    VectorCopy2D(tr.refdef.vieworg, g_vTerOrg);
+    VectorCopy(tr.refdef.viewaxis[0], g_vTerFwd);
+    g_fCheck = fCheck;
+
+    if (fDistBound != 0.0) {
+        index    = (int)tr.refdef.fov_x;
+        distance = g_fDistanceTable[index];
+
+        g_fClipDotSquared = g_fClipDotSquaredTable[index];
+        g_fClipDotProduct = g_fClipDotProductTable[index];
+        VectorCopy(tr.refdef.viewaxis[0], g_vClipVector);
+        g_vClipOrigin[0] = tr.refdef.vieworg[0] - distance * tr.refdef.viewaxis[0][0] - 256.0;
+        g_vClipOrigin[1] = tr.refdef.vieworg[1] - distance * tr.refdef.viewaxis[0][1] - 256.0;
+        g_vClipOrigin[2] = tr.refdef.vieworg[2] - distance * tr.refdef.viewaxis[0][2] - 255.0;
+        g_vViewVector[0] = tr.refdef.viewaxis[0][0];
+        g_vViewVector[1] = tr.refdef.viewaxis[0][1];
+        g_vViewVector[2] =
+            -(tr.refdef.viewaxis[0][0] * tr.refdef.vieworg[0] + tr.refdef.viewaxis[0][1] * tr.refdef.vieworg[1]);
+        VectorCopy(tr.refdef.vieworg, g_vViewOrigin);
+
+        if (tr.viewParms.farplane_distance > 0) {
+            g_fFogDistance = distance + tr.viewParms.farplane_distance + 768.0;
+        } else {
+            g_fFogDistance = 999999.0;
+        }
+    }
+}
+
+/*
+================
+R_MarkTerrainPatch
+================
+*/
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t *pPatch)
+{
+    if (pPatch->visCountCheck == g_terVisCount) {
+        return;
+    }
+
+    pPatch->visCountCheck = g_terVisCount;
+    if (ter_cull->integer) {
+        vec3_t v;
+        float  dot;
+
+        v[0] = pPatch->x0 - g_vClipOrigin[0];
+        v[1] = pPatch->y0 - g_vClipOrigin[1];
+        v[2] = pPatch->z0 - g_vClipOrigin[2];
+
+        dot = DotProduct(v, g_vClipVector);
+        if (dot > g_fFogDistance) {
+            return;
+        }
+
+        if (VectorLengthSquared(v) * g_fClipDotSquared > dot * dot) {
+            return;
+        }
+    }
+
+    pPatch->visCountDraw         = g_terVisCount;
+    pPatch->pNextActive          = tr.world->activeTerraPatches;
+    tr.world->activeTerraPatches = pPatch;
+}
+
+/*
+================
+R_AddTerrainSurfaces
+================
+*/
+void R_AddTerrainSurfaces()
+{
+    int                    i;
+    int                    dlight;
+    cTerraPatchUnpacked_t *patch;
+
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
+
+    if (!ter_lock->integer) {
+        R_TessellateTerrain();
+    }
+
+    if (ter_count->integer || ter_lock->integer == 2) {
+        for (i = 0; i < tr.world->numTerraPatches; i++) {
+            patch = &tr.world->terraPatches[i];
+
+            if (ter_lock->integer == 2 || patch->visCountDraw == g_terVisCount) {
+                assert(patch->shader);
+
+                dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+                R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, 0, dlight, 0, 0);
+            }
+
+            if (ter_count->integer && (g_nSplit || g_nMerge)) {
+                if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
+                    ri.Printf(PRINT_DEVELOPER, 
+                        "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
+                        g_nTris - g_tri.nFree,
+                        g_nVerts - g_vert.nFree,
+                        g_nSplit,
+                        g_nMerge
+                    );
+                }
+
+                g_nSplit = 0;
+                g_nMerge = 0;
+            }
+        }
+    } else {
+        for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+            assert(patch->shader);
+
+            dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+            R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, 0, dlight, 0, 0);
+        }
+    }
+}
+
+/*
+================
+R_TerrainHeightForPoly
+
+Calculates the height of a terrain polygon by interpolating the heights of its vertices.
+The function finds the triangle containing the given point (x, y) within the terrain patch,
+and then computes the height at each vertex of the polygon using barycentric interpolation.
+Finally, it updates the z-coordinate of each vertex to store the calculated height.
+Returns qtrue if the triangle was found and the height could be calculated and saved into its vertices.
+
+ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
+================
+*/
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVerts, int nVerts)
+{
+    float x0     = 0;
+    float y0     = 0;
+    float x1     = 0;
+    float y1     = 0;
+    float x2     = 0;
+    float y2     = 0;
+    float fKx[3] = {0}, fKy[3] = {0}, fKz[3] = {0}, fArea[3] = {0};
+    float fAreaTotal = 0;
+
+    float    x = pVerts->xyz[0];
+    float    y = pVerts->xyz[1];
+    terraInt iTri;
+
+    // Calculate the average of the x and y coordinates of all vertices
+    if (nVerts > 1) {
+        for (int i = 1; i < nVerts; i++) {
+            x += pVerts[i].xyz[0];
+            y += pVerts[i].xyz[1];
+        }
+
+        // Use the averaged values from this point onwards
+        x = x / nVerts;
+        y = y / nVerts;
+    }
+
+    // Get the first valid triangle in the patch
+    iTri = pPatch->drawinfo.iTriHead;
+
+    // Find a triangle that contains the point (x, y)
+    for (iTri = pPatch->drawinfo.iTriHead; iTri; iTri = g_pTris[iTri].iNext) {
+        if (g_pTris[iTri].byConstChecks & 4) {
+            // Get all three x-y coordinates of the current triangle's vertices
+            x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
+            y0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[1];
+            x1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[0];
+            y1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[1];
+            x2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[0];
+            y2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[1];
+
+            // Calculate the signed areas of the three sub-triangles
+            fArea[0] = (x - x1) * (y2 - y1) - (y - y1) * (x2 - x1);
+            if (fArea[0] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fArea[1] = (x - x2) * (y0 - y2) - (y - y2) * (x0 - x2);
+            if (fArea[1] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fArea[2] = (x - x0) * (y1 - y0) - (y - y0) * (x1 - x0);
+            if (fArea[2] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fAreaTotal = fArea[0] + fArea[1] + fArea[2];
+            if (fAreaTotal > 0.0) {
+                //
+                // Found it - the point is inside the triangle
+                // Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
+                //
+
+                float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
+                float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
+                float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
+
+                fKy[0] = z0 * (x2 - x1);
+                fKy[1] = z1 * (x0 - x2);
+                fKy[2] = z2 * (x1 - x0);
+
+                fKx[0] = z0 * (y2 - y1);
+                fKx[1] = z1 * (y0 - y2);
+                fKx[2] = z2 * (y1 - y0);
+
+                // Note: this could be done with the CrossProduct macro if everything were in a vector
+                fKz[0] = fKx[0] * x1 - y1 * fKy[0];
+                fKz[1] = fKx[1] * x2 - y2 * fKy[1];
+                fKz[2] = fKx[2] * x0 - y0 * fKy[2];
+
+                // Calculate the height for each vertex
+                for (int i = 0; i < nVerts; i++) {
+                    float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
+                    float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
+                    float fConstZ = fKz[0] + fKz[1] + fKz[2];
+
+                    // Write back the calculated height into the vertex
+                    pVerts[i].xyz[2] = fScaleX - fScaleY - fConstZ;
+                }
+
+                return qtrue;
+            }
+        }
+    }
+
+    assert(
+        !pPatch->drawinfo.iTriHead
+        && va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n", x, y, pPatch->x0, pPatch->y0, pPatch->z0)
+    );
+    return qfalse;
+}
+
+/*
+================
+R_TerrainRestart_f
+================
+*/
+void R_TerrainRestart_f(void)
+{
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
+
+    if (g_pVert) {
+        ri.Free(g_pVert);
+        g_pVert = NULL;
+    }
+    if (g_pTris) {
+        ri.Free(g_pTris);
+        g_pTris = NULL;
+    }
+
+    R_PreTessellateTerrain();
+}
+
+/*
+================
+R_CraterTerrain
+================
+*/
+void R_CraterTerrain(const vec3_t pos, const vec3_t dir, float fDepth, float fRadius)
+{
+    int                    i, j, k;
+    int                    index;
+    qboolean               bMorphed;
+    cTerraPatchUnpacked_t *pPatch;
+    float                  x, y, z;
+    float                  dzSquared;
+    float                  heightmap[81];
+    float                  fMinHeight, fMaxHeight;
+    float                  fMaxOrig;
+    vec3_t                 vArcCenter;
+    float                  fArcRadius;
+    float                  fArcSquared;
+
+    fArcRadius  = (fRadius * fRadius / fDepth + fDepth) * 0.5;
+    fArcSquared = Square(fArcRadius);
+    VectorMA(pos, fDepth - fArcRadius, dir, vArcCenter);
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        pPatch = &tr.world->terraPatches[i];
+
+        bMorphed = qfalse;
+
+        fMaxOrig   = pPatch->z0;
+        fMaxHeight = pPatch->z0;
+        fMinHeight = pPatch->z0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                x = pPatch->x0 + (k << 6);
+                y = pPatch->y0 + (j << 6);
+                z = pPatch->z0 + (pPatch->heightmap[index] * 2);
+
+                heightmap[index] = z;
+
+                if (fMaxHeight < z) {
+                    fMaxHeight = z;
+                }
+                if (fMaxOrig < z) {
+                    fMaxOrig = z;
+                }
+
+                dzSquared = fArcSquared - (Square(x - vArcCenter[0]) + Square(y - vArcCenter[1]));
+
+                if (Square(z - vArcCenter[2]) > dzSquared) {
+                    continue;
+                }
+
+                if (pPatch->flags & 0x40) {
+                    heightmap[index] = vArcCenter[2] + sqrt(dzSquared);
+                    if (fMaxHeight < heightmap[index]) {
+                        fMaxHeight = heightmap[index];
+                    }
+                } else {
+                    heightmap[index] = vArcCenter[2] - sqrt(dzSquared);
+                    if (fMinHeight > heightmap[index]) {
+                        fMinHeight = heightmap[index];
+                    }
+                }
+
+                bMorphed = qtrue;
+            }
+        }
+
+        if (!bMorphed) {
+            continue;
+        }
+
+        if (fMinHeight < fMaxOrig - 510.0) {
+            fMinHeight = fMaxOrig - 510.0;
+        }
+
+        pPatch->z0 = floor((fMinHeight + 1.0) * 0.5) * 2.0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                pPatch->heightmap[index] = Q_clamp_float(floor((heightmap[index] - pPatch->z0 + 1.0) * 0.5), 0, 255);
+            }
+        }
+    }
+}
+
+/*
+================
+R_TerrainCrater_f
+================
+*/
+void R_TerrainCrater_f(void)
+{
+    vec3_t dir;
+
+    if (!ri.Cvar_VariableIntegerValue("cheats")) {
+        //
+        // Added in OPM
+        //  This command may be used for debugging purposes.
+        //  It also prevents executing this command accidentally
+        //
+        return;
+    }
+
+    VectorNegate(tr.refdef.viewaxis[2], dir);
+
+    R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
+    R_TerrainRestart_f();
+}
+
+/*
+================
+R_InitTerrain
+================
+*/
+void R_InitTerrain()
+{
+    int i;
+
+    ter_maxlod         = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ter_cull           = ri.Cvar_Get("ter_cull", "1", 0);
+    ter_lock           = ri.Cvar_Get("ter_lock", "0", 0);
+    ter_error          = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
+    ter_maxtris        = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
+    ter_count          = ri.Cvar_Get("ter_count", "0", 0);
+
+    ri.Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
+    R_PreTessellateTerrain();
+
+    for (i = 0; i < TERRAIN_TABLE_SIZE; i++) {
+        float dot                 = (1.0 / (0.82 - cos((float)i / 57.29) * 0.18) - 1.0) * (16.0 / 9.0);
+        g_fClipDotSquaredTable[i] = dot;
+        g_fClipDotProductTable[i] = sqrt(dot);
+        g_fDistanceTable[i]       = 443.5 / sqrt(1.0 - dot);
+    }
+}
+
+/*
+====================
+R_SwapTerraPatch
+
+Swaps the patch on big-endian
+====================
+*/
+void R_SwapTerraPatch(cTerraPatch_t *pPatch)
+{
+#ifdef Q3_BIG_ENDIAN
+    int i;
+
+    pPatch->texCoord[0][0][0] = LittleFloat(pPatch->texCoord[0][0][0]);
+    pPatch->texCoord[0][0][1] = LittleFloat(pPatch->texCoord[0][0][1]);
+    pPatch->texCoord[0][1][0] = LittleFloat(pPatch->texCoord[0][1][0]);
+    pPatch->texCoord[0][1][1] = LittleFloat(pPatch->texCoord[0][1][1]);
+    pPatch->texCoord[1][0][0] = LittleFloat(pPatch->texCoord[1][0][0]);
+    pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
+    pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
+    pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
+    pPatch->iBaseHeight       = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader           = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap         = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth            = LittleShort(pPatch->iNorth);
+    pPatch->iEast             = LittleShort(pPatch->iEast);
+    pPatch->iSouth            = LittleShort(pPatch->iSouth);
+    pPatch->iWest             = LittleShort(pPatch->iWest);
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
+        pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);
+        pPatch->varTree[1][i].flags = LittleUnsignedShort(pPatch->varTree[1][i].flags);
+    }
+#endif
+}
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index 2a4d37be..1a51b765 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -819,4 +819,80 @@ void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
     bmodel = &tr.world->bmodels[iIndex];
     VectorCopy(bmodel->bounds[0], vMins);
     VectorCopy(bmodel->bounds[1], vMaxs);
-}
\ No newline at end of file
+}
+
+/*
+======================
+R_FastDlightTerrain
+======================
+*/
+static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
+    dlight_t* dl;
+    float* origin;
+    int i;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+        origin = dl->transformed;
+
+        if (srf->x0 - origin[0] > dl->radius
+            || srf->x0 - origin[0] < -512.0 - dl->radius
+            || srf->y0 - origin[1] > dl->radius
+            || srf->y0 - origin[1] < -512.0 - dl->radius
+            || srf->z0 - origin[2] > dl->radius
+            || srf->z0 - origin[2] < -srf->zmax - dl->radius
+            ) {
+            // dlight doesn't reach the bounds
+            dlightBits &= ~(1 << i);
+        }
+    }
+
+    if (!dlightBits) {
+        tr.pc.c_dlightSurfacesCulled++;
+    }
+
+    srf->drawinfo.dlightBits[0] = dlightBits;
+    return dlightBits;
+}
+
+/*
+======================
+R_DlightTerrain
+======================
+*/
+int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	int dlightMap = 0;
+
+	// FIXME: unimplemented
+	// Fast Dlight only
+
+	if (R_FastDlightTerrain(surf, dlightBits)) {
+		++tr.pc.c_dlightSurfaces;
+		dlightMap = 1;
+	}
+
+    return dlightMap;
+}
+
+
+/*
+======================
+R_CheckDlightTerrain
+======================
+*/
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	if (surf->frameCount == tr.frameCount) {
+		return surf->drawinfo.dlightMap[0];
+	}
+
+	surf->frameCount = tr.frameCount;
+	if (dlightBits) {
+		return R_DlightTerrain(surf, dlightBits);
+	}
+
+	surf->drawinfo.dlightMap[0] = 0;
+	surf->drawinfo.dlightBits[0] = 0;
+	return 0;
+}

From 546b90d75f6572e41fa755b0f5a6dd408375fa52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Dec 2024 17:04:23 +0100
Subject: [PATCH 1704/2040] Add basic 3D GL2 rendering with static models and
 terrain

---
 code/renderergl2/tr_backend.c        | 102 ++--
 code/renderergl2/tr_bsp.c            | 678 ++++++++++++++++++++++++++-
 code/renderergl2/tr_cmds.c           |   8 +-
 code/renderergl2/tr_image.c          |   7 +
 code/renderergl2/tr_init.c           |  32 ++
 code/renderergl2/tr_local.h          |  61 ++-
 code/renderergl2/tr_main.c           | 143 +++++-
 code/renderergl2/tr_marks.c          |   1 +
 code/renderergl2/tr_scene.c          | 101 ++++
 code/renderergl2/tr_shade.c          |  15 +
 code/renderergl2/tr_shader.c         |   4 +-
 code/renderergl2/tr_sphere_shade.cpp |   7 +
 code/renderergl2/tr_surface.c        | 134 +++++-
 code/renderergl2/tr_world.c          |  57 +++
 14 files changed, 1303 insertions(+), 47 deletions(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index 71548779..b9c09637 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -433,6 +433,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	int				oldSort;
 	double			originalTime;
 	FBO_t*			fbo = NULL;
+	qboolean		bStaticModel, oldbStaticModel;
 
 	// save original time for entity shader offsets
 	originalTime = backEnd.refdef.floatTime;
@@ -450,6 +451,10 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	oldPshadowed = qfalse;
 	oldCubemapIndex = -1;
 	oldSort = -1;
+	// OPENMOHAA-specific stuff
+	//=========================
+    oldbStaticModel = -1;
+    //=========================
 
 	backEnd.pc.c_surfaces += numDrawSurfs;
 
@@ -463,7 +468,19 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			continue;
 		}
 		oldSort = drawSurf->sort;
-		R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed );
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		if (*drawSurf->surface != SF_SPRITE) {
+			R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed,
+				&bStaticModel );
+		} else {
+			shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+			entityNum = ENTITYNUM_WORLD;
+			dlighted = 0;
+			bStaticModel = qfalse;
+        }
+        //=========================
 		cubemapIndex = drawSurf->cubemapIndex;
 
 		//
@@ -471,7 +488,9 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		// a "entityMergable" shader is a shader that can have surfaces from separate
 		// entities merged into a single batch, like smoke and blood puff sprites
 		if ( shader != NULL && ( shader != oldShader || fogNum != oldFogNum || dlighted != oldDlighted || pshadowed != oldPshadowed || cubemapIndex != oldCubemapIndex
-			|| ( entityNum != oldEntityNum && !shader->entityMergable ) ) ) {
+			|| ( entityNum != oldEntityNum && !shader->entityMergable )
+			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )
+			) ) {
 			if (oldShader != NULL) {
 				RB_EndSurface();
 			}
@@ -490,43 +509,60 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		//
 		// change the modelview matrix if needed
 		//
-		if ( entityNum != oldEntityNum ) {
+		if ( entityNum != oldEntityNum
+			|| bStaticModel != oldbStaticModel ) {
 			depthRange = isCrosshair = qfalse;
+			
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			if (bStaticModel) {
+				backEnd.shaderStartTime = 0.0;
+				backEnd.currentEntity = 0;
+				backEnd.spareSphere.TessFunction = 0;
+				backEnd.currentStaticModel = &backEnd.refdef.staticModels[entityNum];
+				R_RotateForStaticModel(backEnd.currentStaticModel, &backEnd.viewParms, &backEnd.or);
+			}
+			else {
+                backEnd.currentStaticModel = NULL;
+                oldbStaticModel = bStaticModel;
+			//=========================
 
-			if ( entityNum != REFENTITYNUM_WORLD ) {
-				backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
+				if ( entityNum != REFENTITYNUM_WORLD ) {
+					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
 
-				// FIXME: e.shaderTime must be passed as int to avoid fp-precision loss issues
-				backEnd.refdef.floatTime = originalTime - (double)backEnd.currentEntity->e.shaderTime;
+					// FIXME: e.shaderTime must be passed as int to avoid fp-precision loss issues
+					backEnd.refdef.floatTime = originalTime - (double)backEnd.currentEntity->e.shaderTime;
 
-				// we have to reset the shaderTime as well otherwise image animations start
-				// from the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
+					// we have to reset the shaderTime as well otherwise image animations start
+					// from the wrong frame
+					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
 
-				// set up the transformation matrix
-				R_RotateForEntity( backEnd.currentEntity, &backEnd.viewParms, &backEnd.or );
+					// set up the transformation matrix
+					R_RotateForEntity( backEnd.currentEntity, &backEnd.viewParms, &backEnd.or );
 
-				// set up the dynamic lighting if needed
-				if ( backEnd.currentEntity->needDlights ) {
+					// set up the dynamic lighting if needed
+					if ( backEnd.currentEntity->needDlights ) {
+						R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
+					}
+
+					if(backEnd.currentEntity->e.renderfx & RF_DEPTHHACK)
+					{
+						// hack the depth range to prevent view model from poking into walls
+						depthRange = qtrue;
+					
+						if(backEnd.currentEntity->e.renderfx & RF_CROSSHAIR)
+							isCrosshair = qtrue;
+					}
+				} else {
+					backEnd.currentEntity = &tr.worldEntity;
+					backEnd.refdef.floatTime = originalTime;
+					backEnd.or = backEnd.viewParms.world;
+					// we have to reset the shaderTime as well otherwise image animations on
+					// the world (like water) continue with the wrong frame
+					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
 					R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
 				}
-
-				if(backEnd.currentEntity->e.renderfx & RF_DEPTHHACK)
-				{
-					// hack the depth range to prevent view model from poking into walls
-					depthRange = qtrue;
-					
-					if(backEnd.currentEntity->e.renderfx & RF_CROSSHAIR)
-						isCrosshair = qtrue;
-				}
-			} else {
-				backEnd.currentEntity = &tr.worldEntity;
-				backEnd.refdef.floatTime = originalTime;
-				backEnd.or = backEnd.viewParms.world;
-				// we have to reset the shaderTime as well otherwise image animations on
-				// the world (like water) continue with the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-				R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
 			}
 
 			GL_SetModelviewMatrix( backEnd.or.modelMatrix );
@@ -579,6 +615,10 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			oldEntityNum = entityNum;
 		}
 
+        if (*drawSurf->surface == SF_SPRITE) {
+            backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
+        }
+
 		// add the triangles for this surface
 		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 	}
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 152a5970..78fb6881 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -37,6 +37,8 @@ void RE_LoadWorldMap( const char *name );
 
 */
 
+#define _R( id ) ri.UI_LoadResource( "*" #id )
+
 static	world_t		s_worldData;
 static	byte		*fileBase;
 
@@ -1982,6 +1984,16 @@ static	void R_LoadNodesAndLeafs (lump_t *nodeLump, lump_t *leafLump) {
 
 		out->firstmarksurface = LittleLong(inLeaf->firstLeafSurface);
 		out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+	
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+
+        out->firstStaticModel = LittleLong(inLeaf->firstStaticModel);
+        out->numStaticModels = LittleLong(inLeaf->numStaticModels);
+		//=========================
 	}	
 
 	// chain descendants
@@ -2320,6 +2332,29 @@ void R_LoadEntities( lump_t *l ) {
 	w->lightGridSize[1] = 64;
 	w->lightGridSize[2] = 128;
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    switch (map_version)
+    {
+    case 21:
+        w->lightGridSize[0] = 80.0;
+        w->lightGridSize[1] = 80.0;
+        w->lightGridSize[2] = 80.0;
+        break;
+    case 20:
+        w->lightGridSize[0] = 48.0;
+        w->lightGridSize[1] = 48.0;
+        w->lightGridSize[2] = 64.0;
+        break;
+    default:
+        w->lightGridSize[0] = 32.0;
+        w->lightGridSize[1] = 32.0;
+        w->lightGridSize[2] = 32.0;
+        break;
+    }
+    //=========================
+
 	p = (char *)(fileBase + l->fileofs);
 
 	// store for reference by the cgame
@@ -2730,6 +2765,530 @@ void R_CalcVertexLightDirs( void )
 	}
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+================
+R_LoadSphereLights
+================
+*/
+void R_LoadSphereLights(lump_t* l) {
+    int				i, j;
+    mapspherel_t* at;
+    spherel_t* light;
+
+    if (l->filelen % sizeof(mapspherel_t)) {
+        Com_Error(ERR_DROP, "LoadMap: funny lump size in spherelight data for %s\n", s_worldData.name);
+    }
+
+    tr.numSLights = l->filelen / sizeof(mapspherel_t);
+
+    if (tr.numSLights >= MAX_MAP_SPHERE_L_SIZE) {
+        Com_Error(ERR_DROP, "LoadMap: Too many spherelights on map %s, limit is %d\n", s_worldData.name, MAX_MAP_SPHERE_L_SIZE);
+    }
+
+	at = (mapspherel_t*)(fileBase + l->fileofs);
+    light = tr.sLights;
+
+    for (i = 0; i < tr.numSLights; at++, light++, i++) {
+        VectorCopy(at->origin, light->origin);
+        VectorCopy(at->color, light->color);
+        VectorCopy(at->spot_dir, light->spot_dir);
+
+        for (j = 0; j < 3; j++) {
+            light->origin[j] = LittleFloat(light->origin[j]);
+            light->color[j] = LittleFloat(light->color[j]);
+            light->spot_dir[j] = LittleFloat(light->spot_dir[j]);
+        }
+
+        light->spot_radiusbydistance = LittleFloat(at->spot_radiusbydistance);
+        light->intensity = LittleFloat(at->intensity);
+        light->spot_light = LittleLong(at->spot_light);
+        light->needs_trace = LittleLong(at->needs_trace);
+        light->leaf = &s_worldData.nodes[s_worldData.numDecisionNodes + LittleLong(at->leaf)];
+    }
+}
+
+/*
+================
+R_LoadSphereLightVis
+================
+*/
+void R_LoadSphereLightVis(lump_t* l) {
+    int i;
+    int j;
+    int h;
+    mnode_t* node;
+    int numentries;
+    int* entries;
+
+    memset(&tr.sSunLight, 0, sizeof(spherel_t));
+
+    if (l->filelen % 4) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in spherelight vis data for %s\n",
+            s_worldData.name);
+    }
+    else {
+        entries = (int*)(fileBase + l->fileofs);
+        numentries = l->filelen / sizeof(int);
+
+        if (numentries) {
+            if (numentries != s_worldData.numnodes - s_worldData.numDecisionNodes) {
+                for (i = 0; i < numentries; ++i)
+                    entries[i] = LittleLong(entries[i]);
+
+                for (node = &s_worldData.nodes[s_worldData.numDecisionNodes]; numentries; node++) {
+                    j = 0;
+                    if (entries[0] != -1) {
+                        do
+                            ++j;
+                        while (entries[j] != -1);
+                    }
+                    if (j) {
+                        node->lights = ri.Hunk_Alloc(j * sizeof(spherel_t*), h_dontcare);
+                        node->numlights = j;
+                        h = 0;
+                        if (entries[0] == -2) {
+                            node->lights[0] = &tr.sSunLight;
+                            tr.sSunLight.leaf = (mnode_t*)-1;
+                            h = 1;
+                        }
+                        while (entries[h] != -1) {
+                            node->lights[h] = &tr.sLights[entries[h]];
+                            h++;
+                        }
+                        entries += h + 1;
+                        numentries = numentries - 1 - h;
+                    }
+                    else {
+                        numentries--;
+                        entries++;
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+=================
+R_LoadNodesAndLeafsOld
+=================
+*/
+static	void R_LoadNodesAndLeafsOld(lump_t* nodeLump, lump_t* leafLump) {
+    int			i, j, p;
+    dnode_t* in;
+    dleaf_t_ver17* inLeaf;
+    mnode_t* out;
+    int			numNodes, numLeafs;
+
+    in = (dnode_t*)(fileBase + nodeLump->fileofs);
+    if (nodeLump->filelen % sizeof(dnode_t) ||
+        leafLump->filelen % sizeof(dleaf_t)) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    }
+    numNodes = nodeLump->filelen / sizeof(dnode_t);
+    numLeafs = leafLump->filelen / sizeof(dleaf_t);
+
+    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
+
+    s_worldData.nodes = out;
+    s_worldData.numnodes = numNodes + numLeafs;
+    s_worldData.numDecisionNodes = numNodes;
+
+    // load nodes
+    for (i = 0; i < numNodes; i++, in++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(in->mins[j]);
+            out->maxs[j] = LittleLong(in->maxs[j]);
+        }
+
+        p = LittleLong(in->planeNum);
+        out->plane = s_worldData.planes + p;
+
+        out->contents = CONTENTS_NODE;	// differentiate from leafs
+
+        for (j = 0; j < 2; j++)
+        {
+            p = LittleLong(in->children[j]);
+            if (p >= 0)
+                out->children[j] = s_worldData.nodes + p;
+            else
+                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
+        }
+    }
+
+    // load leafs
+    inLeaf = (dleaf_t_ver17*)(fileBase + leafLump->fileofs);
+    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(inLeaf->mins[j]);
+            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
+        }
+
+        out->cluster = LittleLong(inLeaf->cluster);
+        out->area = LittleLong(inLeaf->area);
+
+        if (out->cluster >= s_worldData.numClusters) {
+            s_worldData.numClusters = out->cluster + 1;
+        }
+
+        out->firstmarksurface = s_worldData.marksurfaces +
+            LittleLong(inLeaf->firstLeafSurface);
+        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+    }
+
+    // chain decendants
+    R_SetParent(s_worldData.nodes, NULL);
+}
+
+/*
+================
+R_UnpackTerraPatch
+================
+*/
+void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
+    int i, j;
+
+    pUnpacked->byDirty = qfalse;
+    pUnpacked->visCountCheck = 0;
+    pUnpacked->visCountDraw = 0;
+    pUnpacked->uiDistRecalc = 0;
+
+    if (pPacked->lmapScale <= 0) {
+        Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
+    }
+
+    pUnpacked->drawinfo.lmapStep = (float)(64 / pPacked->lmapScale);
+    pUnpacked->drawinfo.lmapSize = pPacked->lmapScale * 8 + 1;
+    pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
+    pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
+    pUnpacked->drawinfo.lmData = NULL;
+
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 2; j++) {
+            pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
+            pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
+        }
+    }
+
+    pUnpacked->x0 = ((int)pPacked->x << 6);
+    pUnpacked->y0 = ((int)pPacked->y << 6);
+    pUnpacked->z0 = pPacked->iBaseHeight;
+    pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
+    pUnpacked->iNorth = pPacked->iNorth;
+    pUnpacked->iEast = pPacked->iEast;
+    pUnpacked->iSouth = pPacked->iSouth;
+    pUnpacked->iWest = pPacked->iWest;
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
+    {
+        varnode_t *packedVarTree;
+
+        packedVarTree = &pPacked->varTree[0][i];
+        pUnpacked->varTree[0][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[0][i].flags &= ~0xFF;
+        pUnpacked->varTree[0][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+
+        packedVarTree = &pPacked->varTree[1][i];
+        pUnpacked->varTree[1][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[1][i].flags &= ~0xFF;
+        pUnpacked->varTree[1][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+    }
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
+        pUnpacked->heightmap[i] = pPacked->heightmap[i];
+    }
+
+    pUnpacked->zmax = 0;
+    pUnpacked->flags = pPacked->flags;
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++)
+    {
+        if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
+            pUnpacked->zmax = pUnpacked->heightmap[i];
+        }
+    }
+
+    pUnpacked->frameCount = 0;
+    pUnpacked->zmax += pUnpacked->zmax;
+}
+
+/*
+================
+R_LoadTerrain
+================
+IneQuation was here
+*/
+void R_LoadTerrain(lump_t* lump) {
+    int		i;
+    cTerraPatch_t* in;
+    cTerraPatchUnpacked_t* out;
+
+    if (!lump->filelen) {
+        s_worldData.numTerraPatches = 0;
+        s_worldData.terraPatches = NULL;
+        return;
+    }
+
+    if (lump->filelen % sizeof(cTerraPatch_t)) {
+        Com_Error(ERR_DROP, "R_LoadTerrain: funny lump size");
+    }
+
+    s_worldData.numTerraPatches = lump->filelen / sizeof(cTerraPatch_t);
+    s_worldData.terraPatches = ri.Hunk_Alloc(s_worldData.numTerraPatches * sizeof(cTerraPatchUnpacked_t), h_dontcare);
+
+    in = (cTerraPatch_t*)(fileBase + lump->fileofs);
+    out = s_worldData.terraPatches;
+
+    for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
+        R_SwapTerraPatch(in);
+        R_UnpackTerraPatch(in, out);
+    }
+}
+
+/*
+================
+R_LoadTerrainIndexes
+================
+*/
+void R_LoadTerrainIndexes(lump_t* lump) {
+    int		i;
+    short* in;
+    cTerraPatchUnpacked_t** out;
+
+    if (!lump->filelen) {
+        s_worldData.numVisTerraPatches = 0;
+        s_worldData.visTerraPatches = NULL;
+        return;
+    }
+
+    if (lump->filelen % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadTerrainIndexes: funny lump size");
+    }
+
+    s_worldData.numVisTerraPatches = lump->filelen / sizeof(short);
+    s_worldData.visTerraPatches = ri.Hunk_Alloc(s_worldData.numVisTerraPatches * sizeof(cTerraPatchUnpacked_t*), h_dontcare);
+
+    in = (short*)(fileBase + lump->fileofs);
+    out = s_worldData.visTerraPatches;
+
+    for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
+        *out = &s_worldData.terraPatches[LittleShort(*in)];
+    }
+}
+
+/*
+================
+R_LoadLightGrid2
+
+================
+*/
+void R_LoadLightGrid2(lump_t* plPal, lump_t* plOffsets, lump_t* plData) {
+    int		i;
+    vec3_t	maxs;
+    int		numGridPoints;
+    world_t	*w;
+    float	*wMins, *wMaxs;
+
+    w = &s_worldData;
+
+    if (!plPal->filelen || !plOffsets->filelen || !plData->filelen) {
+        ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
+        w->lightGridOffsets = 0;
+        w->lightGridData = 0;
+        return;
+    }
+
+    switch (map_version)
+    {
+    case 21:
+        w->lightGridSize[0] = 80.0;
+        w->lightGridSize[1] = 80.0;
+        w->lightGridSize[2] = 80.0;
+        break;
+    case 20:
+        w->lightGridSize[0] = 48.0;
+        w->lightGridSize[1] = 48.0;
+        w->lightGridSize[2] = 64.0;
+        break;
+    default:
+        w->lightGridSize[0] = 32.0;
+        w->lightGridSize[1] = 32.0;
+        w->lightGridSize[2] = 32.0;
+        break;
+    }
+
+    w->lightGridInverseSize[0] = 1.0f / w->lightGridSize[0];
+    w->lightGridInverseSize[1] = 1.0f / w->lightGridSize[1];
+    w->lightGridInverseSize[2] = 1.0f / w->lightGridSize[2];
+
+    wMins = w->bmodels[0].bounds[0];
+    wMaxs = w->bmodels[0].bounds[1];
+
+	for ( i = 0 ; i < 3 ; i++ ) {
+		w->lightGridOrigin[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
+		maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
+		w->lightGridBounds[i] = (maxs[i] - w->lightGridOrigin[i])/w->lightGridSize[i] + 1;
+	}
+
+    numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
+
+    if (plOffsets->filelen != numGridPoints * 2) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    if (plPal->filelen != 768) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->filelen, h_dontcare);
+    for (i = 0; i < plOffsets->filelen / 2; i++) {
+        w->lightGridOffsets[i] = LittleUnsignedShort(((short*)(fileBase + plOffsets->fileofs))[i]);
+    }
+    Com_Memcpy(w->lightGridPalette, fileBase + plPal->fileofs, sizeof(s_worldData.lightGridPalette));
+
+    //w->lightGridData = ri.Hunk_Alloc(plData->filelen, h_dontcare);
+    //Com_Memcpy(w->lightGridData, fileBase + plData->fileofs, plData->filelen);
+}
+
+/*
+================
+R_LoadStaticModelData
+================
+*/
+void R_LoadStaticModelData(lump_t* lump) {
+    int		i;
+    byte* pDstColors;
+    byte* pSrcColors;
+
+    if (!lump->filelen) {
+        s_worldData.numStaticModelData = 0;
+        s_worldData.staticModelData = 0;
+        return;
+    }
+
+
+    if (lump->filelen % (sizeof(byte) * 3)) {
+        Com_Error(1, "R_LoadStaticModelData: funny lump size");
+    }
+
+    s_worldData.numStaticModelData = lump->filelen / (sizeof(byte) * 3);
+    s_worldData.staticModelData = (byte*)ri.Hunk_Alloc(s_worldData.numStaticModelData * sizeof(color4ub_t), h_dontcare);
+
+    pSrcColors = (byte*)(fileBase + lump->fileofs);
+    pDstColors = s_worldData.staticModelData;
+
+    for (i = 0; i < lump->filelen; i += sizeof(byte) * 3)
+    { 
+        // Colors are stored as integers
+        pDstColors[0] = pSrcColors[0];
+        pDstColors[1] = pSrcColors[1];
+        pDstColors[2] = pSrcColors[2];
+        pDstColors[3] = 0xFF;
+
+        pSrcColors += sizeof(byte) * 3;
+        pDstColors += sizeof(byte) * 4;
+    }
+}
+
+/*
+================
+R_CopyStaticModel
+================
+*/
+void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
+    pUnpackedSM->visCount = 0;
+    pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
+    pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
+    pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
+    pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
+    pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
+    pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
+    pUnpackedSM->scale = LittleFloat(pSM->scale);
+    pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
+    pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
+    memcpy(pUnpackedSM->model, pSM->model, sizeof(pUnpackedSM->model));
+}
+
+/*
+================
+R_LoadStaticModelDefs
+================
+*/
+void R_LoadStaticModelDefs(lump_t* lump) {
+    int		i;
+    cStaticModel_t* in;
+    cStaticModelUnpacked_t* out;
+
+    if (!lump->filelen) {
+        s_worldData.numStaticModels = 0;
+        s_worldData.staticModels = NULL;
+        return;
+    }
+
+    if (lump->filelen % sizeof(cStaticModel_t)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numStaticModels = lump->filelen / sizeof(cStaticModel_t);
+    s_worldData.staticModels = ri.Hunk_Alloc(s_worldData.numStaticModels * sizeof(cStaticModelUnpacked_t), h_dontcare);
+
+    in = (cStaticModel_t*)(fileBase + lump->fileofs);
+    out = s_worldData.staticModels;
+
+    for (i = 0; i < s_worldData.numStaticModels; in++, out++, i++) {
+        R_CopyStaticModel(in, out);
+    }
+}
+
+/*
+================
+R_LoadStaticModelIndexes
+================
+*/
+void R_LoadStaticModelIndexes(lump_t* lump) {
+    int i;
+    unsigned short* in;
+    cStaticModelUnpacked_t** out;
+
+    if (lump->filelen % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numVisStaticModels = lump->filelen / sizeof(short);
+    s_worldData.visStaticModels = ri.Hunk_Alloc(s_worldData.numVisStaticModels * sizeof(cStaticModelUnpacked_t*), h_dontcare);
+
+    in = (unsigned short*)(fileBase + lump->fileofs);
+    out = s_worldData.visStaticModels;
+
+    for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
+        unsigned short index = LittleUnsignedShort(*in);
+        if (index >= s_worldData.numStaticModels) {
+            // Added in OPM
+            Com_Error(ERR_DROP, "R_LoadStaticModelIndexes: bad static model index %d", index);
+        }
+
+        *out = &s_worldData.staticModels[index];
+    }
+}
+
+//=========================
 
 /*
 =================
@@ -2809,18 +3368,119 @@ void RE_LoadWorldMap( const char *name ) {
 		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    map_version = header->version;
+    //=========================
+
 	// load into heap
+#if 0
 	R_LoadEntities( &header->lumps[LUMP_ENTITIES] );
 	R_LoadShaders( &header->lumps[LUMP_SHADERS] );
 	R_LoadLightmaps( &header->lumps[LUMP_LIGHTMAPS], &header->lumps[LUMP_SURFACES] );
 	R_LoadPlanes (&header->lumps[LUMP_PLANES]);
-	R_LoadFogs( &header->lumps[LUMP_FOGS], &header->lumps[LUMP_BRUSHES], &header->lumps[LUMP_BRUSHSIDES] );
+	//R_LoadFogs( &header->lumps[LUMP_FOGS], &header->lumps[LUMP_BRUSHES], &header->lumps[LUMP_BRUSHSIDES] );
 	R_LoadSurfaces( &header->lumps[LUMP_SURFACES], &header->lumps[LUMP_DRAWVERTS], &header->lumps[LUMP_DRAWINDEXES] );
 	R_LoadMarksurfaces (&header->lumps[LUMP_LEAFSURFACES]);
 	R_LoadNodesAndLeafs (&header->lumps[LUMP_NODES], &header->lumps[LUMP_LEAFS]);
 	R_LoadSubmodels (&header->lumps[LUMP_MODELS]);
 	R_LoadVisibility( &header->lumps[LUMP_VISIBILITY] );
 	R_LoadLightGrid( &header->lumps[LUMP_LIGHTGRID] );
+#endif
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	_R(53);
+    _R(54);
+    R_LoadShaders(Q_GetLumpByVersion(header, LUMP_SHADERS));
+    _R(55);
+    _R(56);
+    R_LoadPlanes(Q_GetLumpByVersion(header, LUMP_PLANES));
+    _R(57);
+    _R(58);
+    _R(59);
+    R_LoadLightmaps(Q_GetLumpByVersion(header, LUMP_LIGHTMAPS), Q_GetLumpByVersion(header, LUMP_SURFACES));
+    _R(60);
+    _R(61);
+    _R(62);
+    _R(63);
+    _R(64);
+    R_LoadSurfaces(Q_GetLumpByVersion(header, LUMP_SURFACES), Q_GetLumpByVersion(header, LUMP_DRAWVERTS), Q_GetLumpByVersion(header, LUMP_DRAWINDEXES));
+    _R(65);
+    _R(66);
+    _R(67);
+    _R(68);
+    _R(69);
+    R_LoadMarksurfaces(Q_GetLumpByVersion(header, LUMP_LEAFSURFACES));
+    _R(70);
+    _R(71);
+    _R(72);
+    _R(73);
+    if (header->version > BSP_BETA_VERSION) {
+        R_LoadNodesAndLeafs(Q_GetLumpByVersion(header, LUMP_NODES), Q_GetLumpByVersion(header, LUMP_LEAFS));
+    } else {
+        R_LoadNodesAndLeafsOld(Q_GetLumpByVersion(header, LUMP_NODES), Q_GetLumpByVersion(header, LUMP_LEAFS));
+    }
+    _R(74);
+    _R(75);
+    _R(76);
+    numFogs = 0;
+    _R(77);
+    R_LoadSubmodels(Q_GetLumpByVersion(header, LUMP_MODELS));
+    _R(78);
+    _R(79);
+    _R(80);
+    R_LoadVisibility(Q_GetLumpByVersion(header, LUMP_VISIBILITY));
+    _R(81);
+    _R(82);
+    _R(83);
+    _R(84);
+    _R(85);
+    R_LoadLightGrid2(Q_GetLumpByVersion(header, LUMP_LIGHTGRIDPALETTE), Q_GetLumpByVersion(header, LUMP_LIGHTGRIDOFFSETS), Q_GetLumpByVersion(header, LUMP_LIGHTGRIDDATA));
+    _R(86);
+    _R(87);
+    _R(88);
+    _R(89);
+    _R(90);
+    R_LoadSphereLights(Q_GetLumpByVersion(header, LUMP_SPHERELIGHTS));
+    _R(91);
+    _R(92);
+    _R(93);
+    R_LoadSphereLightVis(Q_GetLumpByVersion(header, LUMP_SPHERELIGHTVIS));
+    _R(94);
+    _R(95);
+    _R(96);
+    R_LoadTerrain(Q_GetLumpByVersion(header, LUMP_TERRAIN));
+    _R(97);
+    _R(98);
+    _R(99);
+    R_LoadTerrainIndexes(Q_GetLumpByVersion(header, LUMP_TERRAININDEXES));
+    _R(100);
+    _R(101);
+    if (header->version > BSP_BETA_VERSION)
+    {
+        _R(102);
+        R_LoadStaticModelData(Q_GetLumpByVersion(header, LUMP_STATICMODELDATA));
+        _R(103);
+        _R(104);
+        _R(105);
+        R_LoadStaticModelDefs(Q_GetLumpByVersion(header, LUMP_STATICMODELDEF));
+        _R(106);
+        _R(107);
+        _R(108);
+        R_LoadStaticModelIndexes(Q_GetLumpByVersion(header, LUMP_STATICMODELINDEXES));
+        _R(109);
+        _R(110);
+    }
+    else
+    {
+        g_nStaticModelData = 0;
+        g_nStaticModels = 0;
+        g_nStaticModelIndices = 0;
+    }
+	//=========================
 
 	// determine vertex light directions
 	R_CalcVertexLightDirs();
@@ -3051,6 +3711,22 @@ void RE_LoadWorldMap( const char *name ) {
 	}
 
     ri.FS_FreeFile( buffer.v );
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    ri.UI_LoadResource("*111");
+    R_Sphere_InitLights();
+    ri.UI_LoadResource("*112");
+    R_InitTerrain();
+    ri.UI_LoadResource("*113");
+    R_InitStaticModels();
+    ri.UI_LoadResource("*114");
+    R_LevelMarksLoad(name);
+    ri.UI_LoadResource("*115");
+    R_VisDebugLoad(name);
+    ri.UI_LoadResource("*116");
+    //=========================
 }
 
 //
diff --git a/code/renderergl2/tr_cmds.c b/code/renderergl2/tr_cmds.c
index ff2195df..2d4279e8 100644
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
@@ -554,7 +554,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 		}
 	}
 	
-	tr.refdef.stereoFrame = stereoFrame;
+    tr.refdef.stereoFrame = stereoFrame;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    g_nStaticSurfaces = 0;
 }
 
 
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index 2957c449..42c28955 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -3098,6 +3098,13 @@ void R_SetColorMappings( void ) {
 	{
 		GLimp_SetGamma( s_gammatable, s_gammatable, s_gammatable );
 	}
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    tr.overbrightShift = r_mapOverBrightBits->integer - tr.overbrightBits;
+    tr.overbrightMult = (float)(1 << tr.overbrightShift);
+    //=========================
 }
 
 /*
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index e8c0382d..db1133e2 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -265,6 +265,13 @@ int		max_termarks;
 
 cvar_t* r_skyportal;
 cvar_t* r_skyportal_origin;
+cvar_t* r_farplane;
+cvar_t* r_farplane_bias;
+cvar_t* r_farplane_color;
+cvar_t* r_farplane_nocull;
+cvar_t* r_farplane_nofog;
+cvar_t* r_skybox_farplane;
+cvar_t* r_farclip;
 cvar_t* r_lightcoronasize;
 
 // LOD
@@ -313,6 +320,7 @@ cvar_t* r_showstaticbboxes;
 cvar_t* r_showcull;
 cvar_t* r_showlod;
 cvar_t* r_showstaticlod;
+cvar_t* r_showportal;
 
 //=========================
 
@@ -1555,6 +1563,13 @@ void R_Register( void )
 
     r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
     r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
+	r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
+	r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
+	r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
+	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
+	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
+	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
     r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
 
 	// LOD
@@ -1603,6 +1618,7 @@ void R_Register( void )
     r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
     r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
     r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
+    r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
 }
 
 void R_InitQueries(void)
@@ -1718,6 +1734,22 @@ void R_Init( void ) {
 
 	R_InitQueries();
 
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+
+    R_Sky_Init();
+
+    max_termarks = r_maxtermarks->integer;
+    if (max_termarks < MAX_TERMARKS)
+        max_termarks = MAX_TERMARKS;
+
+    R_LevelMarksInit();
+
+    tr.pFontDebugStrings = R_LoadFont("verdana-14");
+    g_bInfoworldtris = qfalse;
+
+	//=========================
 
 	err = qglGetError();
 	if ( err != GL_NO_ERROR )
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 19db5dc5..911565a6 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -78,6 +78,18 @@ typedef unsigned int vaoCacheGlIndex_t;
 #define MAX_DRAWN_PSHADOWS    16 // do not increase past 32, because bit flags are used on surfaces
 #define PSHADOW_MAP_SIZE      512
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+#define MAX_SPHERE_LIGHTS		512
+#define	MAX_SPRITESURFS			0x8000
+
+#define MAX_SPRITE_DIST				16384.0f
+#define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
+
+//=========================
+
 typedef struct cubemap_s {
 	char name[MAX_QPATH];
 	vec3_t origin;
@@ -874,6 +886,9 @@ typedef struct {
 	// OPENMOHAA-specific stuff
 	//
 
+    int num_sprites;
+	struct refSprite_s *sprites;
+
 	int numTerMarks;
 	struct srfMarkFragment_s *terMarks;
 
@@ -1020,7 +1035,6 @@ typedef enum {
 	//
 
     SF_MARK_FRAG,
-    SF_DISPLAY_LIST,
     SF_TIKI_SKEL,
     SF_TIKI_STATIC,
     SF_SWIPE,
@@ -1215,7 +1229,7 @@ extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
 
 //
 // OPENMOHAA-specific stuff
-//
+//=========================
 
 typedef struct {
     struct mnode_s* cntNode;
@@ -1417,6 +1431,8 @@ typedef struct refSprite_s {
     float shaderTime;
 } refSprite_t;
 
+//=========================
+
 /*
 ==============================================================================
 
@@ -1586,6 +1602,9 @@ typedef struct {
 	// OPENMOHAA-specific stuff
 	//
 
+	unsigned short* lightGridOffsets;
+	byte        lightGridPalette[768];
+
     int numTerraPatches;
     cTerraPatchUnpacked_t* terraPatches;
     cTerraPatchUnpacked_t* activeTerraPatches;
@@ -1605,7 +1624,7 @@ typedef struct {
 
 //
 // OPENMOHAA-specific stuff
-//
+//=========================
 typedef struct {
     float width;
     float height;
@@ -1614,6 +1633,7 @@ typedef struct {
     float scale;
     shader_t* shader;
 } sprite_t;
+//=========================
 
 /*
 ==============================================================================
@@ -1696,7 +1716,10 @@ typedef enum {
 	MOD_MESH,
 	MOD_MDR,
 	MOD_IQM,
+
+	//
 	// OPENMOHAA-specific stuff
+	//
     MOD_TIKI,
     MOD_SPRITE
 } modtype_t;
@@ -1767,6 +1790,11 @@ the bits are allocated as follows:
 1     : pshadow flag
 0     : dlight flag
 */
+/*
+#define	QSORT_FOGNUM_SHIFT	2
+#define	QSORT_REFENTITYNUM_SHIFT	7
+#define	QSORT_SHADERNUM_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
+*/
 #define	QSORT_FOGNUM_SHIFT	2
 #define	QSORT_REFENTITYNUM_SHIFT	4
 #define	QSORT_STATICMODEL_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
@@ -1932,7 +1960,13 @@ typedef struct {
 	//
 	// OPENMOHAA-specific stuff
 	//
+    sphereor_t spheres[MAX_SPHERE_LIGHTS];
+    unsigned short numSpheresUsed;
+    sphereor_t* currentSphere;
+    sphereor_t spareSphere;
+    sphereor_t hudSphere;
     cStaticModelUnpacked_t* currentStaticModel;
+    float shaderStartTime;
     int dsStreamVert;
 } backEndState_t;
 
@@ -2139,6 +2173,7 @@ typedef struct {
     int frame_skel_index;
     int skel_index[1024];
     fontheader_t* pFontDebugStrings;
+    int farclip;
 } trGlobals_t;
 
 extern backEndState_t	backEnd;
@@ -2339,6 +2374,13 @@ extern int		max_termarks;
 
 extern cvar_t* r_skyportal;
 extern cvar_t* r_skyportal_origin;
+extern cvar_t* r_farplane;
+extern cvar_t* r_farplane_bias;
+extern cvar_t* r_farplane_color;
+extern cvar_t* r_farplane_nocull;
+extern cvar_t* r_farplane_nofog;
+extern cvar_t* r_skybox_farplane;
+extern cvar_t* r_farclip;
 extern cvar_t* r_lightcoronasize;
 
 // LOD
@@ -2387,6 +2429,7 @@ extern cvar_t* r_showstaticbboxes;
 extern cvar_t* r_showcull;
 extern cvar_t* r_showlod;
 extern cvar_t* r_showstaticlod;
+extern cvar_t* r_showportal;
 
 //=========================
 
@@ -2435,7 +2478,7 @@ void R_AddLightningBoltSurfaces( trRefEntity_t *e );
 void R_AddPolygonSurfaces( void );
 
 void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap, int *pshadowMap );
+					 int *fogNum, int *dlightMap, int *pshadowMap, qboolean *bStaticModel );
 
 void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, 
 				   int fogIndex, int dlightMap, int pshadowMap, int cubemap );
@@ -2741,6 +2784,8 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world );
 int R_CubemapForPoint( vec3_t point );
 
+void R_Sphere_InitLights();
+
 /*
 ============================================================
 
@@ -2920,7 +2965,6 @@ int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
 // OPENMOHAA-specific stuff
 //=========================
 
-
 /*
 =============================================================
 
@@ -3060,6 +3104,10 @@ TERRAIN
 
 =============================================================
 */
+
+extern terraTri_t* g_pTris;
+extern terrainVert_t* g_pVert;
+
 void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
 void R_AddTerrainSurfaces();
 void R_AddTerrainMarkSurfaces();
@@ -3335,7 +3383,8 @@ typedef struct {
 
 	//
 	// OPENMOHAA-specific stuff
-	//
+    //
+    drawSurf_t  spriteSurfs[MAX_SPRITESURFS];
 	srfMarkFragment_t* terMarks;
     refSprite_t sprites[2048];
     cStaticModelUnpacked_t* staticModels;
diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index 4b7e9d23..249f4516 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -743,6 +743,86 @@ void R_SetupFrustum (viewParms_t *dest, float xmin, float xmax, float ymax, floa
 		SetPlaneSignbits( &dest->frustum[4] );
 		dest->flags |= VPF_FARPLANEFRUSTUM;
 	}
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	
+	if (dest->isPortalSky) {
+		// since 2.0: skybox farplane
+		if (r_skybox_farplane->integer) {
+			dest->farplane_distance = r_skybox_farplane->value;
+
+            sscanf(
+                r_farplane_color->string,
+                "%f %f %f",
+                &dest->farplane_color[0],
+                &dest->farplane_color[1],
+                &dest->farplane_color[2]
+			);
+
+			if (r_farplane_nocull->integer > 0) {
+				dest->farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				dest->farplane_cull = 1;
+            } else {
+                dest->farplane_cull = 2;
+            }
+		}
+	}
+	else if (r_farplane->integer)
+	{
+		dest->farplane_distance = r_farplane->value;
+		dest->farplane_bias = r_farplane_bias->value;
+
+		sscanf(
+			r_farplane_color->string,
+			"%f %f %f",
+			&dest->farplane_color[0],
+			&dest->farplane_color[1],
+			&dest->farplane_color[2]);
+
+			if (r_farplane_nocull->integer > 0) {
+				dest->farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				dest->farplane_cull = 1;
+            } else {
+                dest->farplane_cull = 2;
+            }
+	}
+
+	if (dest->farplane_distance)
+	{
+		vec3_t farPoint;
+		float realPlaneLen;
+		float tmp;
+		vec4_t fogColor;
+
+		dest->fog.len = dest->farplane_distance;
+		dest->fog.oolen = 1.0 / dest->farplane_distance;
+		VectorMA(dest->or.origin, dest->farplane_distance, dest->or.axis[0], farPoint);
+
+		VectorNegate(dest->or.axis[0], dest->frustum[4].normal);
+		dest->frustum[4].type = PLANE_NON_AXIAL;
+		dest->frustum[4].dist = DotProduct(farPoint, dest->frustum[4].normal);
+		SetPlaneSignbits(&dest->frustum[4]);
+
+		dest->fog.enabled = r_farplane_nofog->integer == 0;
+		if (dest->farplane_cull) {
+            // extra fustum for culling
+            dest->flags |= VPF_FARPLANEFRUSTUM;
+			dest->fog.extrafrustums = 1;
+		} else {
+			dest->fog.extrafrustums = 0;
+		}
+	}
+	else
+	{
+		dest->fog.enabled = 0;
+		dest->fog.extrafrustums = 0;
+    }
+
+    //=========================
 }
 
 /*
@@ -1208,10 +1288,12 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128
 	int i;
 	unsigned int pointOr = 0;
 	unsigned int pointAnd = (unsigned int)~0;
+	qboolean bStaticModel;
 
 	R_RotateForViewer();
 
-	R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed );
+	R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed,
+			&bStaticModel );
 	RB_BeginSurface( shader, fogNum, drawSurf->cubemapIndex);
 	rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 
@@ -1469,7 +1551,8 @@ void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader,
 	// compared quickly during the qsorting process
 	tr.refdef.drawSurfs[index].sort = (shader->sortedIndex << QSORT_SHADERNUM_SHIFT) 
 		| tr.shiftedEntityNum | ( fogIndex << QSORT_FOGNUM_SHIFT ) 
-		| ((int)pshadowMap << QSORT_PSHADOW_SHIFT) | (int)dlightMap;
+		| ((int)pshadowMap << QSORT_PSHADOW_SHIFT) | (int)dlightMap
+		| tr.shiftedIsStatic;
 	tr.refdef.drawSurfs[index].cubemapIndex = cubemap;
 	tr.refdef.drawSurfs[index].surface = surface;
 	tr.refdef.numDrawSurfs++;
@@ -1481,12 +1564,21 @@ R_DecomposeSort
 =================
 */
 void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap, int *pshadowMap ) {
+					 int *fogNum, int *dlightMap, int *pshadowMap,
+                     qboolean *bStaticModel
+			) {
 	*fogNum = ( sort >> QSORT_FOGNUM_SHIFT ) & 31;
 	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
 	*entityNum = ( sort >> QSORT_REFENTITYNUM_SHIFT ) & REFENTITYNUM_MASK;
 	*pshadowMap = (sort >> QSORT_PSHADOW_SHIFT ) & 1;
-	*dlightMap = sort & 1;
+    *dlightMap = sort & 1;
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	*fogNum = 0;
+    *bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
+    //=========================
 }
 
 /*
@@ -1500,7 +1592,8 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	int				entityNum;
 	int				dlighted;
 	int             pshadowed;
-	int				i;
+    int				i;
+    qboolean		bStaticModel;
 
 	//ri.Printf(PRINT_ALL, "firstDrawSurf %d numDrawSurfs %d\n", (int)(drawSurfs - tr.refdef.drawSurfs), numDrawSurfs);
 
@@ -1524,7 +1617,7 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	// check for any pass through drawing, which
 	// may cause another view to be rendered first
 	for ( i = 0 ; i < numDrawSurfs ; i++ ) {
-		R_DecomposeSort( (drawSurfs+i)->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed );
+		R_DecomposeSort( (drawSurfs+i)->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed, &bStaticModel );
 
 		if ( shader->sort > SS_PORTAL ) {
 			break;
@@ -1611,6 +1704,16 @@ static void R_AddEntitySurface (int entityNum)
 			case MOD_BRUSH:
 				R_AddBrushModelSurfaces( ent );
 				break;
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			case MOD_SPRITE:
+				ri.Printf(PRINT_ALL, "sprite model '%s' being added to renderer!\n", tr.currentModel->name);
+                break;
+            case MOD_TIKI:
+                R_AddSkelSurfaces(ent);
+                break;
+			//=========================
 			case MOD_BAD:		// null model axis
 				if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
 					break;
@@ -1640,6 +1743,12 @@ void R_AddEntitySurfaces (void) {
 		return;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    tr.shiftedIsStatic = 0;
+    //=========================
+
 	for ( i = 0; i < tr.refdef.num_entities; i++)
 		R_AddEntitySurface(i);
 }
@@ -1826,6 +1935,8 @@ R_DrawDebugLines
 ================
 */
 void R_DrawDebugLines(void) {
+	// FIXME: unimplemented
+#if 0
 	debugline_t* line;
 	int i;
 	float width;
@@ -1902,6 +2013,7 @@ void R_DrawDebugLines(void) {
     }
 
     qglDepthRange(0.0, 1.0);
+#endif
 }
 
 /*
@@ -2891,6 +3003,25 @@ void R_RenderCubemapSide( int cubemapIndex, int cubemapSide, qboolean subscene )
 // OPENMOHAA-specific stuff
 //
 
+/*
+=================
+R_AddSpriteSurf
+=================
+*/
+void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
+{
+	int index;
+
+	if (zDistance > MAX_SPRITE_DIST_SQUARED) {
+		zDistance = MAX_SPRITE_DIST_SQUARED;
+	}
+
+	index = tr.refdef.numSpriteSurfs % MAX_SPRITES;
+    tr.refdef.spriteSurfs[index].sort = (int)(MAX_SPRITE_DIST_SQUARED - zDistance) | (shader->sortedIndex << QSORT_SHADERNUM_SHIFT);
+    tr.refdef.spriteSurfs[index].surface = surface;
+    tr.refdef.numSpriteSurfs++;
+}
+
 /*
 =================
 R_RotateForStaticModel
diff --git a/code/renderergl2/tr_marks.c b/code/renderergl2/tr_marks.c
index 0fd7a00d..0c81b4e8 100644
--- a/code/renderergl2/tr_marks.c
+++ b/code/renderergl2/tr_marks.c
@@ -243,6 +243,7 @@ void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POL
 	mf = fragmentBuffer + (*returnedFragments);
 	mf->firstPoint = (*returnedPoints);
 	mf->numPoints = numClipPoints;
+	mf->iIndex = 0; // OPENMOHAA-specific stuff
 	Com_Memcpy( pointBuffer + (*returnedPoints) * 3, clipPoints[pingPong], numClipPoints * sizeof(vec3_t) );
 
 	(*returnedPoints) += numClipPoints;
diff --git a/code/renderergl2/tr_scene.c b/code/renderergl2/tr_scene.c
index d21e6146..8e19a8eb 100644
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
@@ -39,6 +39,8 @@ int			r_numpolyverts;
 // OPENMOHAA-specific stuff
 //=========================
 
+int			r_firstSceneSpriteSurf;
+
 int			r_numsprites;
 int			r_firstSceneSprite;
 
@@ -453,6 +455,35 @@ void RE_BeginScene(const refdef_t *fd)
 	// each scene / view.
 	tr.frameSceneNum++;
 	tr.sceneCount++;
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    TIKI_Reset_Caches();
+
+    // copy the sky data
+    tr.refdef.sky_alpha = fd->sky_alpha;
+    tr.refdef.sky_portal = fd->sky_portal;
+
+    VectorCopy(fd->sky_origin, tr.refdef.sky_origin);
+    VectorCopy(fd->sky_axis[0], tr.refdef.sky_axis[0]);
+    VectorCopy(fd->sky_axis[1], tr.refdef.sky_axis[1]);
+    VectorCopy(fd->sky_axis[2], tr.refdef.sky_axis[2]);
+
+    tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
+    tr.refdef.spriteSurfs = backEndData->spriteSurfs;
+
+    tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
+    tr.refdef.sprites = &backEndData->sprites[r_firstSceneSprite];
+
+    tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
+    tr.refdef.terMarks = &backEndData->terMarks[r_firstSceneTerMark];
+
+    backEndData->staticModelData = tr.refdef.staticModelData;
+	
+    tr.skyRendered = qfalse;
+    tr.portalRendered = qfalse;
+	//=========================
 }
 
 
@@ -463,6 +494,14 @@ void RE_EndScene(void)
 	r_firstSceneEntity = r_numentities;
 	r_firstSceneDlight = r_numdlights;
 	r_firstScenePoly = r_numpolys;
+
+	//
+	// OPENMOHAA-specific stuff
+    //
+
+    r_firstSceneSpriteSurf = tr.refdef.numSpriteSurfs;
+    r_firstSceneSprite = r_numsprites;
+    r_firstSceneTerMark = r_numtermarks;
 }
 
 /*
@@ -583,6 +622,68 @@ void RE_RenderScene( const refdef_t *fd ) {
 		parms.flags = VPF_USESUNLIGHT;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+
+	// copy the farplane data
+	parms.farplane_distance = fd->farplane_distance;
+	parms.farplane_bias = fd->farplane_bias;
+	parms.farplane_color[0] = fd->farplane_color[0];
+	parms.farplane_color[1] = fd->farplane_color[1];
+	parms.farplane_color[2] = fd->farplane_color[2];
+	parms.farplane_cull = fd->farplane_cull;
+	parms.renderTerrain = fd->renderTerrain;
+
+	tr.refdef.skybox_farplane = fd->skybox_farplane;
+	tr.refdef.render_terrain = parms.renderTerrain;
+
+	if (fd->farclipOverride >= 15900 || fd->farclipOverride <= -0.99) {
+		tr.farclip = 0;
+	} else {
+		tr.farclip = r_farclip->integer;
+		if (!tr.farclip && (r_picmip->integer > 1 || r_colorbits->integer == 16)) {
+			tr.farclip = 2800;
+		}
+	}
+
+	if (tr.farclip) {
+        if (fd->farclipOverride != 0) {
+            parms.farplane_distance = fd->farclipOverride;
+		} else {
+			parms.farplane_distance = tr.farclip;
+		}
+
+		if (fd->farplane_color[0] >= 0 && fd->farplane_color[1] >= 0 && fd->farplane_color[2] >= 0) {
+            parms.farplane_color[0] = fd->farplane_color[0];
+            parms.farplane_color[1] = fd->farplane_color[1];
+            parms.farplane_color[2] = fd->farplane_color[2];
+		}
+
+		if (fd->farplaneColorOverride[0] >= 0 && fd->farplaneColorOverride[1] >= 0 && fd->farplaneColorOverride[2] >= 0) {
+			parms.farplane_color[0] = fd->farplaneColorOverride[0];
+			parms.farplane_color[1] = fd->farplaneColorOverride[1];
+			parms.farplane_color[2] = fd->farplaneColorOverride[2];
+		}
+
+		parms.farplane_cull = qtrue;
+
+        if (fd->farplane_distance > 0 && fd->farplane_distance < parms.farplane_distance) {
+            parms.farplane_distance = fd->farplane_distance;
+		} else {
+			if (fd->farplane_bias == 0) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else if (fd->farplane_distance <= 500.f) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else {
+				parms.farplane_bias = parms.farplane_distance / fd->farplane_distance;
+			}
+		}
+	} else if (parms.farplane_bias == 0) {
+		parms.farplane_bias = parms.farplane_distance * 0.18f;
+	}
+	//=========================
+
 	R_RenderView( &parms );
 
 	if(!( fd->rdflags & RDF_NOWORLDMODEL ))
diff --git a/code/renderergl2/tr_shade.c b/code/renderergl2/tr_shade.c
index dec35e52..484f4ae7 100644
--- a/code/renderergl2/tr_shade.c
+++ b/code/renderergl2/tr_shade.c
@@ -541,6 +541,21 @@ static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, vec4_t
 		case CGEN_IDENTITY_LIGHTING:
 		case CGEN_BAD:
 			break;
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		case CGEN_STATIC:
+			baseColor[0] =
+			baseColor[1] =
+			baseColor[2] =
+			baseColor[3] = 0.0f;
+
+			vertColor[0] =
+			vertColor[1] =
+			vertColor[2] =
+			vertColor[3] = 1.0f;
+			break;
+		//=========================
 	}
 
 	//
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index 21ef5039..ac140cd0 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -3165,9 +3165,11 @@ static void FixRenderCommandList( int newShader ) {
 				int         pshadowMap;
 				int			sortedIndex;
 				const drawSurfsCommand_t *ds_cmd =  (const drawSurfsCommand_t *)curCmd;
+				qboolean	bStaticModel;
 
 				for( i = 0, drawSurf = ds_cmd->drawSurfs; i < ds_cmd->numDrawSurfs; i++, drawSurf++ ) {
-					R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlightMap, &pshadowMap );
+					R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlightMap, &pshadowMap,
+						&bStaticModel );
                     sortedIndex = (( drawSurf->sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1));
 					if( sortedIndex >= newShader ) {
 						sortedIndex++;
diff --git a/code/renderergl2/tr_sphere_shade.cpp b/code/renderergl2/tr_sphere_shade.cpp
index c2dd2701..cf4d1951 100644
--- a/code/renderergl2/tr_sphere_shade.cpp
+++ b/code/renderergl2/tr_sphere_shade.cpp
@@ -1344,6 +1344,13 @@ static void R_InsertLightIntoList(spherel_t *pLight, float fIntensity, gatheredL
     pCurrLight->pLight           = pLight;
 }
 
+#else
+
+void R_Sphere_InitLights()
+{
+    // UNIMPLEMENTED
+}
+
 #endif
 
 #define MAX_GATHERED_LIGHTS 8
diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c
index 3151638a..72e3a585 100644
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@@ -1299,6 +1299,128 @@ void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
 static void RB_SurfaceSkip( void *surf ) {
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+=============
+RB_SurfaceMarkFragment
+=============
+*/
+void RB_SurfaceMarkFragment(srfMarkFragment_t* p) {
+	int i;
+	int numv;
+
+	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
+
+	if (p->iIndex <= 0 || R_TerrainHeightForPoly(&tr.world->terraPatches[p->iIndex - 1], p->verts, p->numVerts))
+	{
+		// FIXME: from here on out, it's mostly the same code as in RB_SurfacePolychain,
+		// common part could be extracted into an inline func
+
+		// fan triangles into the tess array
+		numv = tess.numVertexes;
+		for ( i = 0; i < p->numVerts; i++ )
+		{
+			VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
+            tess.texCoords[numv][0] = p->verts[i].st[0];
+            tess.texCoords[numv][1] = p->verts[i].st[1];
+			tess.color[numv][0] = p->verts[i].modulate[0] * 65535 / 255;
+            tess.color[numv][1] = p->verts[i].modulate[1] * 65535 / 255;
+            tess.color[numv][2] = p->verts[i].modulate[2] * 65535 / 255;
+            tess.color[numv][3] = p->verts[i].modulate[3] * 65535 / 255;
+
+			numv++;
+		}
+
+		// generate fan indexes into the tess array
+		for ( i = 0; i < p->numVerts - 2; i++ ) {
+			tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
+			tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
+			tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
+			tess.numIndexes += 3;
+		}
+
+		tess.numVertexes = numv;
+	}
+}
+
+void RB_DrawTerrainTris(srfTerrain_t* p) {
+	int i;
+	terraInt numv;
+	int dlightBits;
+
+	RB_CHECKOVERFLOW(p->nVerts, p->nTris * 3);
+
+	dlightBits = p->dlightBits[0];
+	tess.dlightBits |= dlightBits;
+	if (p->dlightMap[0])
+	{
+		float lmScale = (1.0 / LIGHTMAP_SIZE) / p->lmapStep;
+
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+            tess.texCoords[tess.numVertexes][0] = g_pVert[i].texCoords[0][0];
+            tess.texCoords[tess.numVertexes][1] = g_pVert[i].texCoords[0][1];
+            tess.lightCoords[tess.numVertexes][0] = g_pVert[i].xyz[0] * lmScale + p->lmapX;
+            tess.lightCoords[tess.numVertexes][1] = g_pVert[i].xyz[1] * lmScale + p->lmapY;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+			tess.color[tess.numVertexes][0] = 0xffff;
+			tess.color[tess.numVertexes][1] = 0xffff;
+			tess.color[tess.numVertexes][2] = 0xffff;
+			tess.color[tess.numVertexes][3] = 0xffff;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+	else
+	{
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+            tess.texCoords[tess.numVertexes][0] = g_pVert[i].texCoords[0][0];
+            tess.texCoords[tess.numVertexes][1] = g_pVert[i].texCoords[0][1];
+            tess.lightCoords[tess.numVertexes][0] = g_pVert[i].texCoords[1][0];
+            tess.lightCoords[tess.numVertexes][1] = g_pVert[i].texCoords[1][1];
+			//tess.vertexDlightBits[tess.numVertexes] = dlightBits;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+            tess.color[tess.numVertexes][0] = 0xffff;
+            tess.color[tess.numVertexes][1] = 0xffff;
+            tess.color[tess.numVertexes][2] = 0xffff;
+            tess.color[tess.numVertexes][3] = 0xffff;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+
+	for (i = p->iTriHead; i; i = g_pTris[i].iNext)
+	{
+		assert(tess.numVertexes < SHADER_MAX_INDEXES);
+
+		//
+		// Make sure these can be drawn
+		//
+		if (g_pTris[i].byConstChecks & 4)
+		{
+			tess.indexes[tess.numIndexes] = g_pVert[g_pTris[i].iPt[0]].iVertArray;
+			tess.indexes[tess.numIndexes + 1] = g_pVert[g_pTris[i].iPt[1]].iVertArray;
+			tess.indexes[tess.numIndexes + 2] = g_pVert[g_pTris[i].iPt[2]].iVertArray;
+			tess.numIndexes += 3;
+		}
+	}
+}
+
+//=========================
 
 void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
 	(void(*)(void*))RB_SurfaceBad,			// SF_BAD, 
@@ -1313,5 +1435,15 @@ void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
 	(void(*)(void*))RB_SurfaceFlare,		// SF_FLARE,
 	(void(*)(void*))RB_SurfaceEntity,		// SF_ENTITY
 	(void(*)(void*))RB_SurfaceVaoMdvMesh,   // SF_VAO_MDVMESH
-	(void(*)(void*))RB_IQMSurfaceAnimVao,   // SF_VAO_IQM
+    (void(*)(void*))RB_IQMSurfaceAnimVao,   // SF_VAO_IQM
+    //
+    // OPENMOHAA-specific stuff
+    //=========================
+    (void(*)(void*))RB_SurfaceMarkFragment, // SF_MARK_FRAG
+	(void(*)(void*))RB_SkelMesh,			// SF_TIKI_SKEL
+	(void(*)(void*))RB_StaticMesh,			// SF_TIKI_STATIC
+	(void(*)(void*))RB_DrawSwipeSurface,	// SF_SWIPE
+	(void(*)(void*))RB_DrawSprite,			// SF_SPRITE
+    (void(*)(void*))RB_DrawTerrainTris,		// SF_TERRAIN_PATCH
+    //=========================
 };
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index 1a51b765..850996d0 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -581,6 +581,35 @@ static void R_RecursiveWorldNode( mnode_t *node, uint32_t planeBits, uint32_t dl
 		}
 	}
 
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky)
+	{
+		int i;
+
+		for (i = 0; i < node->numTerraPatches; i++) {
+			R_MarkTerrainPatch(tr.world->visTerraPatches[node->firstTerraPatch + i]);
+		}
+	}
+
+	if (r_drawstaticdecals->integer) {
+		if (node->pFirstMarkFragment) {
+			R_AddPermanentMarkFragmentSurfaces(node->pFirstMarkFragment, node->iNumMarkFragment);
+		}
+	}
+
+	if (r_drawstaticmodels->integer) {
+		int i;
+
+		for (i = 0; i < node->numStaticModels; i++) {
+			tr.world->visStaticModels[node->firstStaticModel + i]->visCount = tr.visCounts[tr.visIndex];
+		}
+    }
+
+    //=========================
 }
 
 
@@ -752,6 +781,14 @@ void R_AddWorldSurfaces (void) {
 	tr.currentEntityNum = REFENTITYNUM_WORLD;
 	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+        R_TerrainPrepareFrame();
+    }
+    //=========================
+
 	// determine which leaves are in the PVS / areamask
 	if (!(tr.viewParms.flags & VPF_DEPTHSHADOW))
 		R_MarkLeaves ();
@@ -806,6 +843,26 @@ void R_AddWorldSurfaces (void) {
 
 		tr.refdef.dlightMask = ~tr.refdef.dlightMask;
 	}
+
+    //
+    // OPENMOHAA-specific stuff
+    //=========================
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+		R_AddTerrainSurfaces();
+	}
+	if (r_drawstaticmodels->integer) {
+		R_AddStaticModelSurfaces();
+	}
+
+	if (g_bInfostaticmodels) {
+		g_bInfostaticmodels = 0;
+		R_PrintInfoStaticModels();
+	}
+
+    R_UpdateLevelMarksSystem();
+
+    //=========================
 }
 
 //

From 66664b7b466d4039f5cd902e5d802399eba74494 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:43:08 +0100
Subject: [PATCH 1705/2040] Add tr_vis

---
 code/renderergl2/tr_vis.cpp | 361 ++++++++++++++++++++++++++++++++++++
 code/renderergl2/tr_vis.h   |  36 ++++
 2 files changed, 397 insertions(+)
 create mode 100644 code/renderergl2/tr_vis.cpp
 create mode 100644 code/renderergl2/tr_vis.h

diff --git a/code/renderergl2/tr_vis.cpp b/code/renderergl2/tr_vis.cpp
new file mode 100644
index 00000000..b4dbf0de
--- /dev/null
+++ b/code/renderergl2/tr_vis.cpp
@@ -0,0 +1,361 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_vis.cpp: visibility culling
+
+#include "tr_local.h"
+#include "tr_vis.h"
+
+#define MAX_POINTS_ON_WINDING 128
+#define MAX_MAP_VISIBILITY    0x200000
+#define MAX_VPORTALS          1024
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[24];
+} viswinding_t;
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[4];
+} winding_t;
+
+typedef struct {
+    vec3_t normal;
+    float  dist;
+} plane_t;
+
+typedef struct {
+    int           num;
+    qboolean      hint;
+    plane_t       plane;
+    int           leaf;
+    vec3_t        origin;
+    float         radius;
+    viswinding_t *winding;
+} vportal_t;
+
+typedef struct leaf_s {
+    int        numportals;
+    vportal_t *portals[MAX_VPORTALS];
+} leaf_t;
+
+int             portalclusters;
+int             numportals;
+int             numfaces;
+int             leafbytes;
+int             leaflongs;
+int             portalbytes;
+int             portallongs;
+vportal_t      *portals;
+leaf_t         *leafs;
+int             numVisBytes;
+static char     mapname[256];
+static qboolean prev_showportal = qfalse;
+
+winding_t *AllocWinding(int points)
+{
+    winding_t *w;
+    int        s;
+
+    if (points > MAX_POINTS_ON_WINDING) {
+        ri.Error(ERR_DROP, "Exceeded MAX_POINTS_ON_WINDING");
+        return NULL;
+    }
+    s = sizeof(vec_t) * 4 * points + sizeof(int) * 4;
+
+    w = (winding_t *)malloc(s);
+    if (!w) {
+        ri.Error(ERR_DROP, "Couldn't allocate winding");
+        return NULL;
+    }
+
+    if (s < 0) {
+        s = sizeof(vec_t) * 4 * points + sizeof(int) * 4 + 3;
+    }
+
+    memset(w, 0, s);
+
+    return w;
+}
+
+viswinding_t *AllocVisWinding(int points)
+{
+    return (viswinding_t *)AllocWinding(points);
+}
+
+void PlaneFromWinding(viswinding_t *w, plane_t *plane)
+{
+    vec3_t v1, v2;
+
+    VectorSubtract(w->p[2], w->p[1], v1);
+    VectorSubtract(w->p[2], w->p[1], v1);
+    CrossProduct(v2, v1, plane->normal);
+    VectorNormalize(plane->normal);
+
+    plane->dist = DotProduct(w->p[0], plane->normal);
+}
+
+void SetPortalSphere(vportal_t *p)
+{
+    int           i;
+    vec3_t        total;
+    vec3_t        dist;
+    viswinding_t *w;
+    float         r;
+    float         bestr;
+
+    w = p->winding;
+    VectorCopy(vec3_origin, total);
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorAdd(total, w->p[i], total);
+    }
+
+    for (i = 0; i < 3; i++) {
+        total[i] /= w->numpoints;
+    }
+
+    bestr = 0;
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorSubtract(w->p[i], total, dist);
+        r = VectorLength(dist);
+        if (bestr < r) {
+            bestr = r;
+        }
+    }
+
+    VectorCopy(total, p->origin);
+    p->radius = bestr;
+}
+
+void LoadPortals(const char *name)
+{
+    int         i, j;
+    vportal_t  *p;
+    leaf_t     *l;
+    const char *magic;
+    int         leafnums[2];
+    plane_t     plane;
+    char       *data;
+    char       *f;
+    int         numpoints;
+    qboolean    bHint;
+
+    if (ri.FS_ReadFile(name, (void **)&f) == -1) {
+        ri.Error(ERR_DROP, "LoadPortals: couldn't read %s\n", name);
+        return;
+    }
+
+    data  = f;
+    magic = COM_Parse(&data);
+
+    if (strcmp(magic, "PRT1")) {
+        ri.Error(1, "LoadPortals: not a portal file");
+    }
+
+    portalclusters = atoi(COM_Parse(&data));
+    numportals     = atoi(COM_Parse(&data));
+    numfaces       = atoi(COM_Parse(&data));
+
+    ri.Printf(PRINT_DEVELOPER, "%6i portalclusters\n", portalclusters);
+    ri.Printf(PRINT_DEVELOPER, "%6i numportals\n", numportals);
+    ri.Printf(PRINT_DEVELOPER, "%6i numfaces\n", numfaces);
+
+    leafbytes   = ((portalclusters + 63) & 0xC0) >> 3;
+    leaflongs   = leafbytes >> 2;
+    portalbytes = ((numportals * 2 + 63) & 0xC0) >> 3;
+    portallongs = portalbytes >> 2;
+
+    //
+    // Initialize portals
+    //
+    portals = (vportal_t *)malloc(numportals * sizeof(vportal_t));
+    if (!portals) {
+        ri.Error(ERR_DROP, "LoadPortals: portals allocation failed\n");
+        return;
+    }
+    memset(portals, 0, numportals * sizeof(vportal_t));
+
+    //
+    // Initialize leafs
+    //
+    leafs = (leaf_t *)malloc(portalclusters * sizeof(leaf_t));
+    if (!leafs) {
+        ri.Error(ERR_DROP, "LoadPortals: leafs allocation failed\n");
+        return;
+    }
+    memset(leafs, 0, portalclusters * sizeof(leaf_t));
+
+    assert(leafbytes * portalclusters + sizeof(leafnums) <= MAX_MAP_VISIBILITY);
+    if (numVisBytes > MAX_MAP_VISIBILITY) {
+        ri.Error(ERR_DROP, "LoadPortals: NumVisBytes %d exceeds %d\n", numVisBytes, 0x200000);
+    }
+
+    for (i = 0; i < numportals; i++) {
+        viswinding_t *w;
+
+        p = &portals[i];
+
+        numpoints   = atoi(COM_Parse(&data));
+        leafnums[0] = atoi(COM_Parse(&data));
+        leafnums[1] = atoi(COM_Parse(&data));
+
+        if (numpoints > MAX_POINTS_ON_WINDING) {
+            ri.Error(ERR_DROP, "LoadPortals: portal %i has too many points", i);
+            return;
+        }
+
+        if (leafnums[0] > portalclusters || leafnums[1] > portalclusters) {
+            ri.Error(ERR_DROP, "LoadPortals: reading portal %i", i);
+            return;
+        }
+
+        bHint        = atoi(COM_Parse(&data));
+        w            = AllocVisWinding(numpoints);
+        w->numpoints = numpoints;
+        p->winding   = w;
+
+        for (j = 0; j < numpoints; j++) {
+            magic = COM_Parse(&data);
+            if (magic[0] != '(') {
+                ri.Error(ERR_DROP, "LoadPortals: expecting '(' not '%s'", magic);
+                return;
+            }
+
+            if (magic[1]) {
+                w->p[j][0] = atof(magic + 1);
+            } else {
+                w->p[j][0] = atof(COM_Parse(&data));
+            }
+
+            w->p[j][1] = atof(COM_Parse(&data));
+            w->p[j][2] = atof(COM_Parse(&data));
+
+            magic = COM_Parse(&data);
+            if (strcmp(")", magic)) {
+                ri.Error(ERR_DROP, "LoadPortals: expecting ')' not '%s'", magic);
+            }
+        }
+
+        PlaneFromWinding(w, &plane);
+
+        //
+        // Leafs
+        //
+
+        // First leaf
+
+        l = &leafs[leafnums[0]];
+
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = w;
+        VectorSubtract(vec3_origin, plane.normal, p->plane.normal);
+        p->plane.dist = -plane.dist;
+        p->leaf = leafnums[1];
+        SetPortalSphere(p);
+
+        // Second leaf
+
+        p++;
+
+        l = &leafs[leafnums[1]];
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = (viswinding_t *)AllocVisWinding(w->numpoints);
+        p->winding->numpoints       = w->numpoints;
+
+        for (j = 0; j < w->numpoints; j++) {
+            VectorCopy(w->p[numpoints - (j + 1)], p->winding->p[j]);
+        }
+
+        p->plane = plane;
+        p->leaf  = leafnums[0];
+        SetPortalSphere(p);
+    }
+
+    ri.FS_FreeFile(f);
+}
+
+void R_VisDebug()
+{
+    int           leafnum;
+    int           cluster;
+    int           numportals;
+    leaf_t       *leaf;
+    vportal_t    *p;
+    int           pnum;
+    viswinding_t *w;
+    int           numpoints;
+    int           i;
+
+    if (!r_showportal->integer) {
+        return;
+    }
+
+    if (!prev_showportal) {
+        char buffer[256];
+
+        prev_showportal = qtrue;
+        COM_StripExtension(mapname, buffer, sizeof(buffer));
+        Q_strcat(buffer, sizeof(buffer), ".prt");
+        LoadPortals(buffer);
+    }
+
+    leafnum = ri.CM_PointLeafnum(tr.refdef.vieworg);
+    cluster = ri.CM_LeafCluster(leafnum);
+    if (cluster < 0) {
+        return;
+    }
+
+    leaf       = &leafs[cluster];
+    numportals = leaf->numportals;
+    for (pnum = 0; pnum < numportals; pnum++) {
+        p = leaf->portals[pnum];
+        w = p->winding;
+
+        numpoints = w->numpoints;
+        for (i = 0; i < numpoints; i++) {
+            R_DebugLine(w->p[i], w->p[(i + 1) % numpoints], 0.0, 1.0, 0.0, 1.0);
+        }
+    }
+}
+
+void R_VisDebugLoad(const char *szBSPName)
+{
+    prev_showportal = qfalse;
+    return Q_strncpyz(mapname, szBSPName, sizeof(mapname));
+}
diff --git a/code/renderergl2/tr_vis.h b/code/renderergl2/tr_vis.h
new file mode 100644
index 00000000..e31cb444
--- /dev/null
+++ b/code/renderergl2/tr_vis.h
@@ -0,0 +1,36 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "tr_local.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void R_VisDebugLoad(const char* szBSPName);
+void R_VisDebug();
+
+#ifdef __cplusplus
+}
+#endif

From e04cbd57ea5ce6b154a0f578855f45fbb3e83434 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:43:42 +0100
Subject: [PATCH 1706/2040] Fix most shader errors, light rendering

---
 code/renderergl2/tr_backend.c        | 113 ++++++++
 code/renderergl2/tr_bsp.c            |   9 +-
 code/renderergl2/tr_cmds.c           |  26 ++
 code/renderergl2/tr_init.c           |  28 +-
 code/renderergl2/tr_light.c          | 373 ++++++++++++++++++++++++++-
 code/renderergl2/tr_local.h          |  81 +++++-
 code/renderergl2/tr_main.c           | 129 ++++++++-
 code/renderergl2/tr_shade_calc.c     |  52 +++-
 code/renderergl2/tr_shader.c         | 285 +++++++++++++++++---
 code/renderergl2/tr_sphere_shade.cpp |  39 ++-
 code/renderergl2/tr_sprite.c         |   2 +-
 code/renderergl2/tr_world.c          |  46 ++++
 12 files changed, 1105 insertions(+), 78 deletions(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index b9c09637..cc3bc1c8 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -36,6 +36,13 @@ static float	s_flipMatrix[16] = {
 	0, 0, 0, 1
 };
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+const void* RB_SpriteSurfs(const void* data);
+
+//=========================
 
 /*
 ** GL_BindToTMU
@@ -1839,6 +1846,13 @@ void RB_ExecuteRenderCommands( const void *data ) {
 		case RC_EXPORT_CUBEMAPS:
 			data = RB_ExportCubemaps(data);
 			break;
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		case RC_SPRITE_SURFS:
+			data = RB_SpriteSurfs( data );
+			break;
+		//=========================
 		case RC_END_OF_LIST:
 		default:
 			// finish any 2D drawing if needed
@@ -1853,3 +1867,102 @@ void RB_ExecuteRenderCommands( const void *data ) {
 	}
 
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+
+
+/*
+==================
+RB_RenderSpriteSurfList
+==================
+*/
+void RB_RenderSpriteSurfList(drawSurf_t* drawSurfs, int numDrawSurfs) {
+	shader_t	*shader;
+	shader_t	*oldShader;
+	qboolean	depthRange;
+	qboolean	oldDepthRange;
+	int			i;
+	drawSurf_t	*drawSurf;
+
+    backEnd.currentEntity = &tr.worldEntity;
+    backEnd.currentStaticModel = NULL;
+
+	backEnd.pc.c_surfaces += numDrawSurfs;
+	backEnd.or = backEnd.viewParms.world;
+
+	oldShader = NULL;
+    depthRange = qfalse;
+    oldDepthRange = qfalse;
+
+    for (i = 0, drawSurf = drawSurfs; i < numDrawSurfs; i++, drawSurf++) {
+		shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+		depthRange = (((refSprite_t*)drawSurf->surface)->renderfx & RF_DEPTHHACK) != 0;
+
+        if (shader != oldShader)
+        {
+			if (oldShader) {
+				RB_EndSurface();
+			}
+
+            RB_BeginSurface(shader, 0, 0);
+            oldShader = shader;
+        }
+		
+		GL_SetModelviewMatrix( backEnd.or.modelMatrix );
+
+        if (oldDepthRange != depthRange)
+        {
+			if (depthRange) {
+				qglDepthRange(0.0, 0.3);
+			} else {
+                qglDepthRange(0.0, 1.0);
+			}
+
+            oldDepthRange = depthRange;
+        }
+
+        backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
+
+        // add the triangles for this surface
+        rb_surfaceTable[*drawSurf->surface](drawSurf->surface);
+	}
+
+	if (oldShader) {
+		RB_EndSurface();
+	}
+
+    // go back to the world modelview matrix
+	GL_SetModelviewMatrix( backEnd.viewParms.world.modelMatrix );
+	// go back to the previous depth range
+	if (depthRange) {
+		qglDepthRange(0.0, 1.0);
+	}
+}
+
+/*
+=============
+RB_SpriteSurfs
+
+=============
+*/
+const void* RB_SpriteSurfs(const void* data) {
+    const drawSurfsCommand_t* cmd;
+
+    // finish any 2D drawing if needed
+    if (tess.numIndexes) {
+        RB_EndSurface();
+    }
+
+    cmd = (const drawSurfsCommand_t*)data;
+
+    backEnd.refdef = cmd->refdef;
+    backEnd.viewParms = cmd->viewParms;
+	
+	//RB_SetupFog();
+    RB_RenderSpriteSurfList(cmd->drawSurfs, cmd->numDrawSurfs);
+
+    return (const void*)(cmd + 1);
+}
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 78fb6881..5f30f7ab 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -3163,8 +3163,8 @@ void R_LoadLightGrid2(lump_t* plPal, lump_t* plOffsets, lump_t* plData) {
     }
     Com_Memcpy(w->lightGridPalette, fileBase + plPal->fileofs, sizeof(s_worldData.lightGridPalette));
 
-    //w->lightGridData = ri.Hunk_Alloc(plData->filelen, h_dontcare);
-    //Com_Memcpy(w->lightGridData, fileBase + plData->fileofs, plData->filelen);
+    w->lightGridData = ri.Hunk_Alloc(plData->filelen, h_dontcare);
+    Com_Memcpy(w->lightGridData, fileBase + plData->fileofs, plData->filelen);
 }
 
 /*
@@ -3480,6 +3480,9 @@ void RE_LoadWorldMap( const char *name ) {
         g_nStaticModels = 0;
         g_nStaticModelIndices = 0;
     }
+
+    ri.UI_LoadResource("*111");
+    R_Sphere_InitLights();
 	//=========================
 
 	// determine vertex light directions
@@ -3715,8 +3718,6 @@ void RE_LoadWorldMap( const char *name ) {
 	//
 	// OPENMOHAA-specific stuff
 	//=========================
-    ri.UI_LoadResource("*111");
-    R_Sphere_InitLights();
     ri.UI_LoadResource("*112");
     R_InitTerrain();
     ri.UI_LoadResource("*113");
diff --git a/code/renderergl2/tr_cmds.c b/code/renderergl2/tr_cmds.c
index 2d4279e8..d1b5fc58 100644
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
@@ -624,3 +624,29 @@ void RE_TakeVideoFrame( int width, int height,
 	cmd->encodeBuffer = encodeBuffer;
 	cmd->motionJpeg = motionJpeg;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+=============
+R_AddSpriteSurfCmd
+
+=============
+*/
+void	R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs) {
+    drawSurfsCommand_t* cmd;
+
+    cmd = R_GetCommandBuffer(sizeof(*cmd));
+    if (!cmd) {
+        return;
+    }
+    cmd->commandId = RC_SPRITE_SURFS;
+
+    cmd->drawSurfs = drawSurfs;
+    cmd->numDrawSurfs = numDrawSurfs;
+
+    cmd->refdef = tr.refdef;
+    cmd->viewParms = tr.viewParms;
+}
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index db1133e2..1e6bc1c4 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -272,7 +272,20 @@ cvar_t* r_farplane_nocull;
 cvar_t* r_farplane_nofog;
 cvar_t* r_skybox_farplane;
 cvar_t* r_farclip;
+
+// Lighting
+
 cvar_t* r_lightcoronasize;
+cvar_t *r_entlight_scale;
+cvar_t *r_entlight_errbound;
+cvar_t *r_entlight_cubelevel;
+cvar_t *r_entlight_cubefraction;
+cvar_t *r_entlight_maxcalc;
+cvar_t *r_light_lines;
+cvar_t *r_light_sun_line;
+cvar_t *r_light_int_scale;
+cvar_t *r_light_nolight;
+cvar_t *r_light_showgrid;
 
 // LOD
 
@@ -1560,7 +1573,7 @@ void R_Register( void )
     r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
 
 	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
-
+	
     r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
     r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
 	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
@@ -1570,7 +1583,20 @@ void R_Register( void )
 	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
 	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
 	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
+
+	// Lighting
+
     r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
+    r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
+    r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
+    r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
+    r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_CHEAT | CVAR_ARCHIVE);
+    r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
+    r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
+    r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
+    r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
+    r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
+    r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
 
 	// LOD
 
diff --git a/code/renderergl2/tr_light.c b/code/renderergl2/tr_light.c
index 1c46024a..183f7280 100644
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
@@ -127,6 +127,7 @@ R_SetupEntityLightingGrid
 
 =================
 */
+#if 0
 static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
 	vec3_t	lightOrigin;
 	int		pos[3];
@@ -277,6 +278,9 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
 
 	VectorNormalize2( direction, ent->lightDir );
 }
+#endif
+
+static void R_SetupEntityLightingGrid(trRefEntity_t* ent, world_t* world);
 
 
 /*
@@ -461,7 +465,7 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 	return qtrue;
 }
 
-
+#if 0
 int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world )
 {
 	trRefEntity_t ent;
@@ -480,7 +484,7 @@ int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *w
 
 	return qtrue;
 }
-
+#endif
 
 int R_CubemapForPoint( vec3_t point )
 {
@@ -514,6 +518,246 @@ int R_CubemapForPoint( vec3_t point )
 // OPENMOHAA-specific stuff
 //
 
+/*
+===============
+RB_SetupEntityGridLighting
+===============
+*/
+void RB_SetupEntityGridLighting()
+{
+	// FIXME: unimplemented
+}
+
+/*
+===============
+RB_SetupStaticModelGridLighting
+===============
+*/
+void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t *ent, const vec3_t lightOrigin)
+{
+    // FIXME: unimplemented
+}
+
+/*
+===============
+R_PointInLeaf
+===============
+*/
+mnode_t *R_FindPoint( world_t *world, const vec3_t p ) {
+	mnode_t		*node;
+	float		d;
+	cplane_t	*plane;
+
+	node = world->nodes;
+	while( 1 ) {
+		if (node->contents != -1) {
+			break;
+		}
+		plane = node->plane;
+		d = DotProduct (p,plane->normal) - plane->dist;
+		if (d > 0) {
+			node = node->children[0];
+		} else {
+			node = node->children[1];
+		}
+	}
+	
+	return node;
+}
+
+/*
+===============
+R_GetLightGridPalettedColor
+===============
+*/
+static byte *R_GetLightGridPalettedColor(world_t *world, int iColor)
+{
+    return &world->lightGridPalette[iColor * 3];
+}
+
+/*
+===============
+R_GetLightingGridValue
+===============
+*/
+void R_GetLightingGridValue(world_t *world, const vec3_t vPos, vec3_t vAmbientLight, vec3_t vDirectedLight)
+{
+    byte  *pColor;
+    int    iBaseOffset;
+    int    i;
+    int    iOffset;
+    int    iRowPos;
+    int    iData;
+    int    iLen;
+    int    iGridPos[3];
+    int    iArrayXStep;
+    float  fV;
+    float  fFrac[3];
+    float  fOMFrac[3];
+    float  fWeight, fWeight2;
+    float  fTotalFactor;
+    int    iCurData;
+    vec3_t vLightOrigin;
+    byte  *pCurData;
+
+    if (!world || !world->lightGridData || !world->lightGridOffsets) {
+		vDirectedLight[0] = vDirectedLight[1] = vDirectedLight[2] = tr.identityLightByte;
+		vAmbientLight[0] = vAmbientLight[1] = vAmbientLight[2] = tr.identityLightByte;
+        return;
+    }
+
+    VectorSubtract(vPos, world->lightGridOrigin, vLightOrigin);
+
+    for (i = 0; i < 3; i++) {
+        fV          = vLightOrigin[i] * world->lightGridInverseSize[i];
+        iGridPos[i] = floor(fV);
+        fFrac[i]    = fV - iGridPos[i];
+        fOMFrac[i]  = 1.0 - fFrac[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+        } else if (iGridPos[i] > world->lightGridBounds[i] - 2) {
+            iGridPos[i] = world->lightGridBounds[i] - 2;
+        }
+    }
+
+    fTotalFactor = 0;
+    iArrayXStep  = world->lightGridBounds[1];
+    iBaseOffset  = world->lightGridBounds[0] + iGridPos[1] + iArrayXStep * iGridPos[0];
+    VectorClear(vDirectedLight);
+    VectorClear(vAmbientLight);
+
+    for (i = 0; i < 4; i++) {
+        qboolean bContinue = qfalse;
+
+        switch (i) {
+        case 0:
+            fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset] + (world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 1:
+            fWeight  = fOMFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset + 1] + (world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 2:
+            fWeight  = fFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset + iArrayXStep]
+                    + (world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        case 3:
+            fWeight  = fFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]
+                    + (world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        }
+
+        iRowPos  = iGridPos[2];
+        pCurData = &world->lightGridData[iOffset];
+        iData    = 0;
+
+        while (1) {
+            while (1) {
+                iCurData = (char)pCurData[iData];
+                iData++;
+                if (iCurData >= 0) {
+                    break;
+                }
+
+                iLen = -iCurData;
+                if (iLen > iRowPos) {
+                    iData += iRowPos;
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                        VectorMA(vAmbientLight, fWeight, pColor, vAmbientLight);
+                        fTotalFactor += fWeight;
+                    }
+
+                    iData++;
+                    if (iLen - 1 == iRowPos) {
+                        iData++;
+                    }
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                        VectorMA(vDirectedLight, fWeight2, pColor, vDirectedLight);
+                        fTotalFactor += fWeight2;
+                    }
+
+                    bContinue = qtrue;
+                    break;
+                }
+
+                iRowPos -= iLen;
+                iData += iLen;
+            }
+
+            if (bContinue) {
+                break;
+            }
+
+            iLen = iCurData + 2;
+            if (iLen - 1 >= iRowPos) {
+                break;
+            }
+
+            iRowPos -= iLen;
+            iData++;
+        }
+
+        if (bContinue) {
+            continue;
+        }
+
+        if (iLen - 1 > iRowPos) {
+            if (!pCurData[iData]) {
+                continue;
+            }
+
+            pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+            VectorMA(vAmbientLight, fWeight + fWeight2, pColor, vAmbientLight);
+            VectorMA(vDirectedLight, fWeight + fWeight2, pColor, vDirectedLight);
+            fTotalFactor += fWeight + fWeight2;
+        } else {
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                VectorMA(vAmbientLight, fWeight, pColor, vAmbientLight);
+                fTotalFactor += fWeight;
+            }
+
+            iData += 2;
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                VectorMA(vDirectedLight, fWeight2, pColor, vDirectedLight);
+                fTotalFactor += fWeight2;
+            }
+        }
+    }
+
+    if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
+        VectorScale(vAmbientLight, 1.0 / fTotalFactor, vAmbientLight);
+        VectorScale(vDirectedLight, 1.0 / fTotalFactor, vDirectedLight);
+    }
+
+    if (fTotalFactor) {
+		/*
+        if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+            float t;
+            // normalize color values
+            t = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+            VectorScale(vLight, t, vLight);
+        }
+		*/
+    } else {
+		vDirectedLight[0] = vDirectedLight[1] = vDirectedLight[2] = tr.identityLightByte;
+		vAmbientLight[0] = vAmbientLight[1] = vAmbientLight[2] = tr.identityLightByte;
+    }
+}
+
 /*
 ===============
 R_GetLightingForDecal
@@ -533,3 +777,128 @@ void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
 {
 	// FIXME: unimplemented (GL2)
 }
+
+qboolean R_FindGridPointForSphere(world_t *world, const vec3_t sphereOrigin, const vec3_t point, vec3_t out) {
+    int i, j, k;
+    int gridStep[3][3];
+	trace_t trace;
+
+    for (i = 0; i < 3; i++) {
+        gridStep[i][0] = 0;
+        gridStep[i][1] = -world->lightGridSize[i];
+        gridStep[i][2] = world->lightGridSize[i];
+    }
+
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 3; k++) {
+				vec3_t vOffset;
+
+                vOffset[0] = point[0] + gridStep[0][i];
+                vOffset[1] = point[1] + gridStep[1][j];
+                vOffset[2] = point[2] + gridStep[2][k];
+
+				ri.CM_BoxTrace(&trace, point, sphereOrigin, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+				if (trace.fraction == 1 || trace.surfaceFlags & SURF_SKY) {
+					return qtrue;
+				}
+			}
+		}
+	}
+
+	return qfalse;
+}
+
+int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world )
+{
+    vec3_t vLight;
+    vec3_t vEnd;
+    mnode_t* leaf;
+    trace_t trace;
+    vec3_t summedDir;
+    float addSize;
+    int iNumLights;
+    int i;
+	int j, k, l;
+    int gridStep[3][3];
+
+	if ( world->lightGridData == NULL )
+	  return qfalse;
+
+    VectorClear(summedDir);
+	leaf = NULL;
+	iNumLights = 0;
+
+    if (world->vis) {
+        leaf = R_FindPoint(world, point);
+        if (leaf->area == -1 || !leaf->numlights) {
+            leaf = NULL;
+        }
+    }
+
+    if (leaf && leaf->numlights) {
+        spherel_t* sphere;
+
+		for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < leaf->numlights; i++) {
+			sphere = leaf->lights[i];
+			if (sphere->leaf != (mnode_t*)-1) {
+				byte mask = backEnd.refdef.areamask[sphere->leaf->area >> 3];
+
+                if (!(mask & (1 << (sphere->leaf->area & 7)))) {
+
+                    ri.CM_BoxTrace(&trace, point, sphere->origin, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+                    if (trace.fraction == 1) {
+                        vec3_t dir;
+
+                        VectorSubtract(sphere->origin, point, dir);
+
+                        addSize = VectorLength(sphere->color);
+                        VectorMA(summedDir, addSize, dir, summedDir);
+
+                        iNumLights++;
+                    }
+				}
+			}
+		}
+	}
+	
+    if (s_sun.exists) {
+        if (leaf && leaf->lights[0] == &tr.sSunLight) {
+            vec3_t newPoint;
+
+            VectorMA(point, 16384.0, s_sun.direction, vEnd);
+
+
+            ri.CM_BoxTrace(&trace, point, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+            if (trace.surfaceFlags & SURF_SKY) {
+                addSize = VectorLength(s_sun.color);
+
+                VectorMA(summedDir, addSize, s_sun.direction, summedDir);
+
+                iNumLights++;
+            }
+        }
+    }
+
+	VectorNormalize(summedDir);
+
+    if (DotProduct(summedDir, normal) > 0.2f)
+        VectorCopy(summedDir, lightDir);
+    else
+        VectorCopy(normal, lightDir);
+
+	return qtrue;
+}
+
+static void R_SetupEntityLightingGrid(trRefEntity_t* ent, world_t* world)
+{
+	vec3_t normal;
+
+    R_GetLightingGridValue(world, ent->e.origin, ent->ambientLight, ent->directedLight);
+
+	VectorSet(normal, 1, 0, 0);
+    R_LightDirForPoint(ent->e.origin, ent->lightDir, normal, world);
+}
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 911565a6..8dd394bd 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -88,6 +88,13 @@ typedef unsigned int vaoCacheGlIndex_t;
 #define MAX_SPRITE_DIST				16384.0f
 #define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
 
+typedef enum {
+    USE_S_COORDS,
+    USE_T_COORDS
+} texDirection_t;
+
+#define BUNDLE_ANIMATE_ONCE		1
+
 //=========================
 
 typedef struct cubemap_s {
@@ -133,6 +140,7 @@ typedef struct {
 	// OPENMOHAA-specific stuff
 	//
 
+    int			iGridLighting;
     float		lodpercentage[2];
 } trRefEntity_t;
 
@@ -243,7 +251,14 @@ typedef enum {
 	DEFORM_TEXT4,
 	DEFORM_TEXT5,
 	DEFORM_TEXT6,
-	DEFORM_TEXT7
+	DEFORM_TEXT7,
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	DEFORM_LIGHTGLOW,
+	DEFORM_FLAP_S,
+	DEFORM_FLAP_T,
+	//=========================
 } deform_t;
 
 // deformVertexes types that can be handled by the GPU
@@ -409,7 +424,12 @@ typedef struct {
 } texModInfo_t;
 
 
-#define	MAX_IMAGE_ANIMATIONS	8
+//#define	MAX_IMAGE_ANIMATIONS	8
+//
+// OPENMOHAA-specific stuff
+//=========================
+#define	MAX_IMAGE_ANIMATIONS	64
+//=========================
 
 typedef struct {
 	image_t			*image[MAX_IMAGE_ANIMATIONS];
@@ -425,6 +445,13 @@ typedef struct {
 	int				videoMapHandle;
 	qboolean		isLightmap;
 	qboolean		isVideoMap;
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    float imageAnimationPhase;
+    int flags;
+    //=========================
 } textureBundle_t;
 
 enum
@@ -2156,6 +2183,7 @@ typedef struct {
 	// OPENMOHAA-specific stuff
     //
 
+    int currentSpriteNum;
     int shiftedIsStatic;
 
     int overbrightShift;
@@ -2381,7 +2409,20 @@ extern cvar_t* r_farplane_nocull;
 extern cvar_t* r_farplane_nofog;
 extern cvar_t* r_skybox_farplane;
 extern cvar_t* r_farclip;
+
+// Lighting
+
 extern cvar_t* r_lightcoronasize;
+extern cvar_t *r_entlight_scale;
+extern cvar_t *r_entlight_errbound;
+extern cvar_t *r_entlight_cubelevel;
+extern cvar_t *r_entlight_cubefraction;
+extern cvar_t *r_entlight_maxcalc;
+extern cvar_t *r_light_lines;
+extern cvar_t *r_light_sun_line;
+extern cvar_t *r_light_int_scale;
+extern cvar_t *r_light_nolight;
+extern cvar_t *r_light_showgrid;
 
 // LOD
 
@@ -2641,6 +2682,7 @@ void R_SavePerformanceCounters(void);
 // tr_main.c
 //
 
+void R_AddSpriteSurfaces();
 qboolean SurfIsOffscreen2(const srfBspSurface_t* surface, shader_t* shader, int entityNum);
 
 //
@@ -2784,8 +2826,6 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world );
 int R_CubemapForPoint( vec3_t point );
 
-void R_Sphere_InitLights();
-
 /*
 ============================================================
 
@@ -3022,6 +3062,17 @@ LIGHTS
 
 void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
 void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
+void R_GetLightingGridValue(world_t* world, const vec3_t vPos, vec3_t vAmbientLight, vec3_t vDirectedLight);
+void RB_SetupEntityGridLighting();
+void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
+
+void RB_Light_Real(unsigned char* colors);
+void RB_Sphere_BuildDLights();
+void RB_Sphere_SetupEntity();
+void RB_Grid_SetupEntity();
+void RB_Grid_SetupStaticModel();
+void RB_Light_Fullbright(unsigned char* colors);
+void R_Sphere_InitLights();
 int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
 
 extern suninfo_t s_sun;
@@ -3052,6 +3103,17 @@ void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts
 refEntity_t* RE_GetRenderEntity(int entityNumber);
 qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
 
+
+/*
+============================================================
+
+SHADE CALC
+
+============================================================
+*/
+
+void RB_CalcLightGridColor(unsigned char* colors);
+
 /*
 =============================================================
 
@@ -3202,9 +3264,12 @@ WORLD MAP
 ============================================================
 */
 void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes);
 mnode_t* R_PointInLeaf(const vec3_t p);
 int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
 
+void R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs);
+
 //=========================
 
 /*
@@ -3359,7 +3424,13 @@ typedef enum {
 	RC_CLEARDEPTH,
 	RC_CAPSHADOWMAP,
 	RC_POSTPROCESS,
-	RC_EXPORT_CUBEMAPS
+	RC_EXPORT_CUBEMAPS,
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	RC_SPRITE_SURFS,
 } renderCommand_t;
 
 
diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index 249f4516..2eef5387 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -1586,7 +1586,9 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
 R_SortDrawSurfs
 =================
 */
-void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
+void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs,
+	drawSurf_t *spriteSurfs, int numSpriteSurfs
+) {
 	shader_t		*shader;
 	int				fogNum;
 	int				entityNum;
@@ -1601,11 +1603,13 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	if ( numDrawSurfs < 1 ) {
 		// we still need to add it for hyperspace cases
 		R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
+		R_AddSpriteSurfCmd( spriteSurfs, numSpriteSurfs );
 		return;
 	}
 
 	// sort the drawsurfs by sort type, then orientation, then shader
 	R_RadixSort( drawSurfs, numDrawSurfs );
+	R_RadixSort( spriteSurfs, numSpriteSurfs );
 
 	// skip pass through drawing if rendering a shadow map
 	if (tr.viewParms.flags & (VPF_SHADOWMAP | VPF_DEPTHSHADOW))
@@ -1639,6 +1643,7 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	}
 
 	R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
+    R_AddSpriteSurfCmd( spriteSurfs, numSpriteSurfs );
 }
 
 static void R_AddEntitySurface (int entityNum)
@@ -1780,6 +1785,12 @@ void R_GenerateDrawSurfs( void ) {
 	R_SetupProjectionZ (&tr.viewParms);
 
 	R_AddEntitySurfaces ();
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    R_AddSpriteSurfaces();
+	//=========================
 }
 
 /*
@@ -2066,7 +2077,8 @@ or a mirror / remote location
 */
 void R_RenderView (viewParms_t *parms) {
 	int		firstDrawSurf;
-	int		numDrawSurfs;
+    int		numDrawSurfs;
+    int		firstSpriteSurf;
 
 	if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
 		return;
@@ -2078,7 +2090,8 @@ void R_RenderView (viewParms_t *parms) {
 	tr.viewParms.frameSceneNum = tr.frameSceneNum;
 	tr.viewParms.frameCount = tr.frameCount;
 
-	firstDrawSurf = tr.refdef.numDrawSurfs;
+    firstDrawSurf = tr.refdef.numDrawSurfs;
+    firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 	tr.viewCount++;
 
@@ -2097,7 +2110,9 @@ void R_RenderView (viewParms_t *parms) {
 		numDrawSurfs = MAX_DRAWSURFS;
 	}
 
-	R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - firstDrawSurf );
+	R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - firstDrawSurf,
+        tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
+	);
 
 	// draw main system development information (surface outlines, etc)
 	R_DebugGraphics();
@@ -2248,6 +2263,24 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 					radius = 0.5f * VectorLength( diag );
 				}
 				break;
+				// OPENMOHAA-specific stuff
+				//=========================
+				case MOD_TIKI:
+					radius = ri.TIKI_GlobalRadius(model->d.tiki);
+                    break;
+				case MOD_SPRITE:
+				{
+					float w;
+
+					radius = model->d.sprite->width * model->d.sprite->scale * 0.5;
+					w = model->d.sprite->height * model->d.sprite->scale * 0.5;
+
+					if (radius <= w) {
+						radius = w;
+					}
+				}
+					break;
+				//=========================
 
 				default:
 					break;
@@ -2401,6 +2434,7 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 	for ( i = 0; i < tr.refdef.num_pshadows; i++)
 	{
 		int firstDrawSurf;
+		int firstSpriteSurf;
 		pshadow_t *shadow = &tr.refdef.pshadows[i];
 		int j;
 
@@ -2443,7 +2477,8 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 			tr.viewParms.frameSceneNum = tr.frameSceneNum;
 			tr.viewParms.frameCount = tr.frameCount;
 
-			firstDrawSurf = tr.refdef.numDrawSurfs;
+            firstDrawSurf = tr.refdef.numDrawSurfs;
+            firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 			tr.viewCount++;
 
@@ -2514,7 +2549,9 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 				R_AddEntitySurface(shadow->entityNums[j]);
 			}
 
-			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf );
+			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
+				tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
+			);
 
 			if (!glRefConfig.framebufferObject)
 				R_AddCapShadowmapCmd( i, -1 );
@@ -2810,6 +2847,7 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
 
 	{
 		int firstDrawSurf;
+		int firstSpriteSurf;
 
 		Com_Memset( &shadowParms, 0, sizeof( shadowParms ) );
 
@@ -2853,6 +2891,7 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
 			tr.viewParms.frameCount = tr.frameCount;
 
 			firstDrawSurf = tr.refdef.numDrawSurfs;
+			firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 			tr.viewCount++;
 
@@ -2867,7 +2906,8 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
 
 			R_AddEntitySurfaces ();
 
-			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf );
+			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
+				tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf );
 		}
 
 		Mat4Multiply(tr.viewParms.projectionMatrix, tr.viewParms.world.modelMatrix, tr.refdef.sunShadowMvp[level]);
@@ -3003,6 +3043,29 @@ void R_RenderCubemapSide( int cubemapIndex, int cubemapSide, qboolean subscene )
 // OPENMOHAA-specific stuff
 //
 
+void R_AdjustVisBoundsForSprite(refSprite_t* ent, viewParms_t* viewParms, orientationr_t* or )
+{
+	if (tr.viewParms.visBounds[0][0] > ent->origin[0] - ent->scale) {
+		tr.viewParms.visBounds[0][0] = ent->origin[0] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][1] > ent->origin[1] - ent->scale) {
+        tr.viewParms.visBounds[0][1] = ent->origin[1] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][2] > ent->origin[2] - ent->scale) {
+        tr.viewParms.visBounds[0][2] = ent->origin[2] - ent->scale;
+    }
+
+	if (tr.viewParms.visBounds[1][0] < ent->origin[0] + ent->scale) {
+        tr.viewParms.visBounds[1][0] = ent->origin[0] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][1] < ent->origin[1] + ent->scale) {
+        tr.viewParms.visBounds[1][1] = ent->origin[1] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][2] < ent->origin[2] + ent->scale) {
+        tr.viewParms.visBounds[1][2] = ent->origin[2] + ent->scale;
+    }
+}
+
 /*
 =================
 R_AddSpriteSurf
@@ -3022,6 +3085,58 @@ void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
     tr.refdef.numSpriteSurfs++;
 }
 
+void R_AddSpriteSurfaces()
+{
+	refSprite_t* sprite;
+	vec3_t delta;
+
+	if (!r_drawsprites->integer) {
+		return;
+	}
+
+	// FIXME: fix buggy sprites causing annoying crashes
+	return;
+
+	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
+	{
+		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
+
+        if (tr.viewParms.isPortalSky) {
+			if (!(sprite->renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+        } else {
+			if (sprite->renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+        
+		if (tr.viewParms.isPortal) {
+			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
+				continue;
+			}
+		} else {
+			if (sprite->renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
+		tr.currentEntityNum = ENTITYNUM_WORLD;
+        tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+		if (sprite->hModel && sprite->hModel < tr.numModels) {
+			tr.currentModel = tr.models[sprite->hModel];
+		} else {
+			tr.currentModel = tr.models[0];
+		}
+
+		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.or );
+		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
+
+		VectorSubtract(sprite->origin, tr.refdef.vieworg, delta);
+		R_AddSpriteSurf(&sprite->surftype, tr.currentModel->d.sprite->shader, VectorLengthSquared(delta));
+	}
+}
+
 /*
 =================
 R_RotateForStaticModel
diff --git a/code/renderergl2/tr_shade_calc.c b/code/renderergl2/tr_shade_calc.c
index 15cfb9c6..3f5c28d9 100644
--- a/code/renderergl2/tr_shade_calc.c
+++ b/code/renderergl2/tr_shade_calc.c
@@ -400,9 +400,19 @@ static void AutospriteDeform( void ) {
 		}
 
 	  // compensate for scale in the axes if necessary
-  	if ( backEnd.currentEntity->e.nonNormalizedAxes ) {
+  	if ( backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes ) {
       float axisLength;
-		  axisLength = VectorLength( backEnd.currentEntity->e.axis[0] );
+
+          // OPENMOHAA-specific stuff
+	      //=========================
+          if (backEnd.currentStaticModel) {
+              axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
+          }
+          else
+          //=========================
+		  {
+              axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
+          }
   		if ( !axisLength ) {
 	  		axisLength = 0;
   		} else {
@@ -816,3 +826,41 @@ void RB_CalcRotateTexMatrix( float degsPerSecond, float *matrix )
 	matrix[0] = cosValue; matrix[2] = -sinValue; matrix[4] = 0.5 - 0.5 * cosValue + 0.5 * sinValue;
 	matrix[1] = sinValue; matrix[3] = cosValue;  matrix[5] = 0.5 - 0.5 * sinValue - 0.5 * cosValue;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+void RB_CalcLightGridColor(unsigned char* colors)
+{
+    int i;
+
+    if (!backEnd.currentEntity) {
+        for (i = 0; i < tess.numVertexes; i++) {
+            colors[i * 4] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[0];
+            colors[i * 4 + 1] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[1];
+            colors[i * 4 + 2] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[2];
+            colors[i * 4 + 3] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[3];
+        }
+    }
+    else if (backEnd.currentEntity != &tr.worldEntity) {
+        for (i = 0; i < tess.numVertexes; i++) {
+            colors[i * 4] = ((byte*)&backEnd.currentEntity->iGridLighting)[0];
+            colors[i * 4 + 1] = ((byte*)&backEnd.currentEntity->iGridLighting)[1];
+            colors[i * 4 + 2] = ((byte*)&backEnd.currentEntity->iGridLighting)[2];
+            colors[i * 4 + 3] = ((byte*)&backEnd.currentEntity->iGridLighting)[3];
+        }
+    }
+    else {
+        ri.Printf(PRINT_ALL,
+            "##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
+            tess.shader->name);
+
+        for (i = 0; i < tess.numVertexes; i++) {
+            colors[i * 4] = 0xFF;
+            colors[i * 4 + 1] = 0xFF;
+            colors[i * 4 + 2] = 0xFF;
+            colors[i * 4 + 3] = 0xFF;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index ac140cd0..4ee311ed 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -38,6 +38,12 @@ static	shader_t*		hashTable[FILE_HASH_SIZE];
 #define MAX_SHADERTEXT_HASH		2048
 static char **shaderTextHashTable[MAX_SHADERTEXT_HASH];
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+static void CreateMultistageFromBundle();
+//=========================
+
 /*
 ================
 return a hash value for the filename
@@ -663,16 +669,16 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "$whiteimage" ) )
 			{
-				stage->bundle[0].image[0] = tr.whiteImage;
+				stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				continue;
 			}
 			else if ( !Q_stricmp( token, "$lightmap" ) )
 			{
-				stage->bundle[0].isLightmap = qtrue;
+				stage->bundle[cntBundle].isLightmap = qtrue;
 				if ( shader.lightmapIndex < 0 || !tr.lightmaps ) {
-					stage->bundle[0].image[0] = tr.whiteImage;
+					stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				} else {
-					stage->bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
+					stage->bundle[cntBundle].image[0] = tr.lightmaps[shader.lightmapIndex];
 				}
 				continue;
 			}
@@ -684,11 +690,11 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 					return qfalse;
 				}
 
-				stage->bundle[0].isLightmap = qtrue;
+				stage->bundle[cntBundle].isLightmap = qtrue;
 				if ( shader.lightmapIndex < 0 ) {
-					stage->bundle[0].image[0] = tr.whiteImage;
+					stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				} else {
-					stage->bundle[0].image[0] = tr.deluxemaps[shader.lightmapIndex];
+					stage->bundle[cntBundle].image[0] = tr.deluxemaps[shader.lightmapIndex];
 				}
 				continue;
 			}
@@ -717,9 +723,9 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 						flags |= IMGFLAG_GENNORMALMAP;
 				}
 
-				stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
+				stage->bundle[cntBundle].image[0] = R_FindImageFile( token, type, flags );
 
-				if ( !stage->bundle[0].image[0] )
+				if ( !stage->bundle[cntBundle].image[0] )
 				{
 					ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 					return qfalse;
@@ -762,8 +768,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 
 
-			stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
-			if ( !stage->bundle[0].image[0] )
+			stage->bundle[cntBundle].image[0] = R_FindImageFile( token, type, flags );
+			if ( !stage->bundle[cntBundle].image[0] )
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 				return qfalse;
@@ -782,7 +788,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMap' keyword in shader '%s'\n", shader.name );
 				return qfalse;
 			}
-			stage->bundle[0].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
 
 			// parse up to MAX_IMAGE_ANIMATIONS animations
 			while ( 1 ) {
@@ -792,7 +798,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				if ( !token[0] ) {
 					break;
 				}
-				num = stage->bundle[0].numImageAnimations;
+				num = stage->bundle[cntBundle].numImageAnimations;
 				if ( num < MAX_IMAGE_ANIMATIONS ) {
 					imgFlags_t flags = IMGFLAG_NONE;
 
@@ -802,13 +808,13 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 					if (!shader.noPicMip)
 						flags |= IMGFLAG_PICMIP;
 
-					stage->bundle[0].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
-					if ( !stage->bundle[0].image[num] )
+					stage->bundle[cntBundle].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
+					if ( !stage->bundle[cntBundle].image[num] )
 					{
 						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 						return qfalse;
 					}
-					stage->bundle[0].numImageAnimations++;
+					stage->bundle[cntBundle].numImageAnimations++;
 				}
 				totalImages++;
 			}
@@ -826,10 +832,10 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'videoMap' keyword in shader '%s'\n", shader.name );
 				return qfalse;
 			}
-			stage->bundle[0].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
-			if (stage->bundle[0].videoMapHandle != -1) {
-				stage->bundle[0].isVideoMap = qtrue;
-				stage->bundle[0].image[0] = tr.scratchImage[stage->bundle[0].videoMapHandle];
+			stage->bundle[cntBundle].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
+			if (stage->bundle[cntBundle].videoMapHandle != -1) {
+				stage->bundle[cntBundle].isVideoMap = qtrue;
+				stage->bundle[cntBundle].image[0] = tr.scratchImage[stage->bundle[cntBundle].videoMapHandle];
 			} else {
 				ri.Printf( PRINT_WARNING, "WARNING: could not load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
 			}
@@ -1677,22 +1683,22 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "environment" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_ENVIRONMENT_MAPPED;
+				stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED;
 			}
 			else if ( !Q_stricmp( token, "lightmap" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_LIGHTMAP;
+				stage->bundle[cntBundle].tcGen = TCGEN_LIGHTMAP;
 			}
 			else if ( !Q_stricmp( token, "texture" ) || !Q_stricmp( token, "base" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_TEXTURE;
+				stage->bundle[cntBundle].tcGen = TCGEN_TEXTURE;
 			}
 			else if ( !Q_stricmp( token, "vector" ) )
 			{
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[0] );
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[1] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[0] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[1] );
 
-				stage->bundle[0].tcGen = TCGEN_VECTOR;
+				stage->bundle[cntBundle].tcGen = TCGEN_VECTOR;
 			}
 			else 
 			{
@@ -1731,7 +1737,70 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		}
 		//
 		// OPENMOHAA-specific stuff
-		//
+		//=========================
+		else if ( !Q_stricmp(token, "animMapOnce") || !Q_stricmp(token, "animMapPhase"))
+		{
+			qboolean phased;
+
+			if (!Q_stricmp(token, "animMapOnce")) {
+				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
+			}
+
+			phased = !Q_stricmp(token, "animMapPhase");
+
+			token = COM_ParseExt( text, qfalse );
+			if ( !token[0] )
+			{
+				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMmap' keyword in shader '%s'\n", shader.name );
+				return qfalse;
+			}
+			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationPhase = 0;
+
+			if (phased)
+            {
+                token = COM_ParseExt(text, qfalse);
+                if (!token[0])
+                {
+                    ri.Printf(PRINT_WARNING, "WARNING: missing phase for 'animMapPhase' keyword in shader '%s'\n", shader.name);
+                    return qfalse;
+                }
+
+				stage->bundle[cntBundle].imageAnimationPhase = atof(token);
+			}
+			// parse up to MAX_IMAGE_ANIMATIONS animations
+			while ( 1 ) {
+				int		num;
+
+				token = COM_ParseExt( text, qfalse );
+				if ( !token[0] ) {
+					break;
+				}
+				num = stage->bundle[cntBundle].numImageAnimations;
+				if ( num < MAX_IMAGE_ANIMATIONS ) {
+					imgFlags_t flags = IMGFLAG_NONE;
+
+					if (!shader.noMipMaps)
+						flags |= IMGFLAG_MIPMAP;
+
+					if (!shader.noPicMip)
+						flags |= IMGFLAG_PICMIP;
+
+					stage->bundle[cntBundle].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
+					if ( !stage->bundle[cntBundle].image[num] )
+					{
+						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+						return qfalse;
+					}
+					stage->bundle[cntBundle].numImageAnimations++;
+				}
+			}
+		}
+		else if (!Q_stricmp(token, "nofog"))
+		{
+			// FIXME: unimplemented
+			continue;
+		}
 		else if (!Q_stricmp(token, "depthmask"))
 		{
 			depthMaskBits = GLS_DEPTHMASK_TRUE;
@@ -1759,10 +1828,10 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
         }
         else if (!Q_stricmp(token, "nextBundle"))
         {
-			if (!qglActiveTextureARB) {
-				ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
-				return qfalse;
-			}
+			//if (!qglActiveTextureARB) {
+			//	ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
+			//	return qfalse;
+			//}
 
 			token = COM_ParseExt(text, qfalse);
 			if (token[0] && !Q_stricmp(token, "add")) {
@@ -1814,7 +1883,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 
 			shouldProcess &= evaluatedValue ^ isNot;
-		}
+        }
+        //=========================
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
@@ -2016,6 +2086,72 @@ static void ParseDeform( char **text ) {
 		return;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	if (!Q_stricmp(token, "lightglow")) {
+		ds->deformation = DEFORM_LIGHTGLOW;
+		return;
+	}
+
+	if (!Q_stricmp(token, "flap")) {
+		texDirection_t coordDirection;
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 's') {
+			coordDirection = USE_S_COORDS;
+		}
+		else if (token[0] == 't') {
+			coordDirection = USE_T_COORDS;
+		}
+		else {
+			ri.Printf(PRINT_WARNING, "WARNING: deformVertexes flap requires 's' or 't' in shader '%s'\n", shader.name);
+			return;
+		}
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes flap parm in shader '%s'\n", shader.name);
+			return;
+		}
+
+		if (!atof(token)) {
+			ds->deformationSpread = 100.0;
+			ri.Printf(PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name);
+		}
+		else {
+			ds->deformationSpread = 1.0 / atof(token);
+		}
+
+		ParseWaveForm(text, &ds->deformationWave);
+
+		if (coordDirection == USE_T_COORDS) {
+			ds->deformation = DEFORM_FLAP_T;
+		}
+		else {
+			ds->deformation = DEFORM_FLAP_S;
+		}
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ds->bulgeWidth = 0.0;
+			ds->bulgeHeight = 1.0;
+			return;
+		}
+		ds->bulgeWidth = atof(token);
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes parm 'max' in shader '%s'\n\n", shader.name);
+			return;
+		}
+		ds->bulgeHeight = atof(token);
+		return;
+    }
+    //=========================
+
 	ri.Printf( PRINT_WARNING, "WARNING: unknown deformVertexes subtype '%s' found in shader '%s'\n", token, shader.name );
 }
 
@@ -2473,7 +2609,44 @@ static qboolean ParseShader( char **text )
 		}
 		//
 		// OPENMOHAA-specific stuff
-		//=========================
+        //=========================
+        else if (!Q_stricmp(token, "noMerge"))
+        {
+			// FIXME: unimplemented
+            continue;
+		}
+		else if (!Q_stricmp(token, "spritegen"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritegen parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			if (!Q_stricmp(token, "parallel")) {
+				shader.sprite.type = SPRITE_PARALLEL;
+			} else if (!Q_stricmp(token, "parallel_oriented")) {
+				shader.sprite.type = SPRITE_PARALLEL_ORIENTED;
+			} else if (!Q_stricmp(token, "parallel_upright")) {
+				shader.sprite.type = SPRITE_PARALLEL_UPRIGHT;
+			} else if (!Q_stricmp(token, "oriented")) {
+				shader.sprite.type = SPRITE_ORIENTED;
+			}
+
+			shader.sprite.scale = 1.0;
+			continue;
+		}
+		else if (!Q_stricmp(token, "spritescale"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritescale parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			shader.sprite.scale = atof(token);
+			continue;
+		}
 		// force 32 bit images
 		if (!Q_stricmp(token, "force32bit"))
 		{
@@ -3535,6 +3708,12 @@ static shader_t *FinishShader( void ) {
 	hasLightmapStage = qfalse;
 	vertexLightmap = qfalse;
 
+    //
+    // OPENMOHAA-specific stuff
+    //=========================
+    CreateMultistageFromBundle();
+    //=========================
+
 	//
 	// set sky stuff appropriate
 	//
@@ -4500,6 +4679,46 @@ void R_InitShaders( void ) {
 	CreateExternalShaders();
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+static void CreateMultistageFromBundle() {
+    int stage, bundle;
+	int i;
+
+	for (stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
+		shaderStage_t* pStage = &stages[stage];
+
+		if (!pStage->active) {
+			break;
+		}
+
+        if (pStage->bundle[TB_LIGHTMAP].isLightmap) {
+			shaderStage_t* newStage = NULL;
+
+			for (i = stage; i < MAX_SHADER_STAGES; i++) {
+				if (!stages[i].active) {
+					newStage = &stages[i];
+					break;
+				}
+			}
+
+			if (newStage) {
+				*newStage = *pStage;
+				newStage->stateBits = GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO | GLS_DEPTHFUNC_EQUAL;
+
+                newStage->bundle[TB_COLORMAP] = pStage->bundle[TB_LIGHTMAP];
+                memset(&newStage->bundle[TB_LIGHTMAP], 0, sizeof(textureBundle_t));
+				memset(&pStage->bundle[TB_LIGHTMAP], 0, sizeof(textureBundle_t));
+				stage = i;
+			}
+		}
+	}
+}
+
+//=========================
+
 qhandle_t RE_RefreshShaderNoMip(const char* name) {
 	shader_t* sh;
 	char strippedName[64];
diff --git a/code/renderergl2/tr_sphere_shade.cpp b/code/renderergl2/tr_sphere_shade.cpp
index cf4d1951..3611d913 100644
--- a/code/renderergl2/tr_sphere_shade.cpp
+++ b/code/renderergl2/tr_sphere_shade.cpp
@@ -72,8 +72,6 @@ static vec3_t offsets[26] = {
     {-one_third_root, -one_third_root, -one_third_root}
 };
 
-#if 0
-
 int compare_light_intensities(const void *p1, const void *p2)
 {
     return *(int *)&((const reallightinfo_t *)p2)->fIntensity - *(int *)&((const reallightinfo_t *)p1)->fIntensity;
@@ -624,9 +622,11 @@ static void RB_Sphere_Light_Sun()
 
                 GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
 
+                // FIXME: unimplemented
+#if 0
                 qglPushMatrix();
 
-                qglLoadMatrixf(backEnd.ori.modelMatrix);
+                qglLoadMatrixf(backEnd.or.modelMatrix);
                 // Clear the depth range
                 qglDepthRange(0.0, 0.0);
 
@@ -645,6 +645,7 @@ static void RB_Sphere_Light_Sun()
                 qglDepthRange(0.0, 1.0);
 
                 qglPopMatrix();
+#endif
             }
 
             return;
@@ -666,9 +667,11 @@ static void RB_Sphere_Light_Sun()
 
         GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
 
+        // FIXME: unimplemented
+#if 0
         qglPushMatrix();
 
-        qglLoadMatrixf(backEnd.ori.modelMatrix);
+        qglLoadMatrixf(backEnd.or.modelMatrix);
         // Clear the depth range
         qglDepthRange(0.0, 0.0);
 
@@ -693,6 +696,7 @@ static void RB_Sphere_Light_Sun()
         qglDepthRange(0.0, 1.0);
 
         qglPopMatrix();
+#endif
     }
 
     if (hitSun) {
@@ -771,7 +775,7 @@ static bool RB_Sphere_SetupGlobals()
     } else if (!RB_Sphere_CalculateSphereOrigin()) {
         backEnd.currentSphere->TessFunction = &RB_CalcLightGridColor;
 
-        if (!backEnd.currentEntity->bLightGridCalculated) {
+        if (!backEnd.currentEntity->lightingCalculated) {
             RB_SetupEntityGridLighting();
         }
 
@@ -793,9 +797,9 @@ static bool RB_Sphere_SetupGlobals()
 
 static bool RB_Sphere_ResetPointColors()
 {
-    vec3_t light_offset, amb;
+    vec3_t light_offset, amb_light_offset, amb;
 
-    R_GetLightingGridValue(backEnd.currentSphere->worldOrigin, light_offset);
+    R_GetLightingGridValue(tr.world, backEnd.currentSphere->worldOrigin, light_offset, amb_light_offset);
     light_offset[0] = ambientlight[0] + light_offset[0] * 0.18;
     light_offset[1] = ambientlight[1] + light_offset[1] * 0.18;
     light_offset[2] = ambientlight[2] + light_offset[2] * 0.18;
@@ -809,7 +813,7 @@ static bool RB_Sphere_ResetPointColors()
         }
     }
 
-    VectorScale(light_offset, tr.overbrightMult * r_entlight_scale->value, amb);
+    VectorScale(amb_light_offset, tr.overbrightMult * r_entlight_scale->value, amb);
     backEnd.currentSphere->ambient.level[0] = Q_min(amb[0], 0xff);
     backEnd.currentSphere->ambient.level[1] = Q_min(amb[1], 0xff);
     backEnd.currentSphere->ambient.level[2] = Q_min(amb[2], 0xff);
@@ -828,9 +832,11 @@ static void RB_Sphere_DrawDebugLine(const spherel_t *thislight, float falloff, c
         return;
     }
 
+    // FIXME: unimplemented
+#if 0
     qglPushMatrix();
 
-    qglLoadMatrixf(backEnd.ori.modelMatrix);
+    qglLoadMatrixf(backEnd.or.modelMatrix);
     // Clear the depth range
     qglDepthRange(0.0, 0.0);
 
@@ -883,6 +889,7 @@ static void RB_Sphere_DrawDebugLine(const spherel_t *thislight, float falloff, c
     // Restore depth
     qglDepthRange(0.0, 1.0);
     qglPopMatrix();
+#endif
 }
 
 static void RB_Sphere_AddSpotLight(const spherel_t *thislight)
@@ -1344,23 +1351,10 @@ static void R_InsertLightIntoList(spherel_t *pLight, float fIntensity, gatheredL
     pCurrLight->pLight           = pLight;
 }
 
-#else
-
-void R_Sphere_InitLights()
-{
-    // UNIMPLEMENTED
-}
-
-#endif
-
 #define MAX_GATHERED_LIGHTS 8
 
 int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightIntensity, int iMaxLights)
 {
-    // FIXME: unimplemented (GL2)
-    return 0;
-
-#if 0
     int              i, j;
     int              iLightCount;
     vec3_t           vEnd;
@@ -1468,5 +1462,4 @@ int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightI
     }
 
     return iLightCount;
-#endif
 }
diff --git a/code/renderergl2/tr_sprite.c b/code/renderergl2/tr_sprite.c
index 1739c63d..3604fa8c 100644
--- a/code/renderergl2/tr_sprite.c
+++ b/code/renderergl2/tr_sprite.c
@@ -96,7 +96,7 @@ void RB_DrawSprite( const refSprite_t *spr ) {
 
     model = tr.models;
 	if (spr->hModel > 0 && spr->hModel < tr.numModels) {
-		model = &tr.models[spr->hModel];
+		model = tr.models[spr->hModel];
 	}
 
 	scale = spr->scale * model->d.sprite->scale;
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index 850996d0..4f3931b8 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -869,6 +869,52 @@ void R_AddWorldSurfaces (void) {
 // OPENMOHAA-specific stuff
 //
 
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes) {
+	mnode_t* nodestack[1024];
+	int iNodeStackPos;
+	mnode_t* pCurNode;
+	int nFoundNodes;
+
+	iNodeStackPos = 0;
+	pCurNode = tr.world->nodes;
+	nFoundNodes = 0;
+
+	while (1)
+    {
+        cplane_t* plane;
+		float d;
+
+		while (pCurNode->contents == -1)
+		{
+			plane = pCurNode->plane;
+			if (plane->type >= PLANE_NON_AXIAL) {
+				d = DotProduct(p, plane->normal) - plane->dist;
+			} else {
+				d = p[plane->type] - plane->dist;
+			}
+
+            if (d < r) {
+                if (d > -r) {
+                    nodestack[iNodeStackPos++] = pCurNode->children[0];
+                }
+                pCurNode = pCurNode->children[1];
+            } else {
+                pCurNode = pCurNode->children[0];
+			}
+		}
+
+		nodes[nFoundNodes++] = pCurNode;
+		if (!iNodeStackPos || nFoundNodes == nMaxNodes) {
+			break;
+		}
+
+		iNodeStackPos--;
+        pCurNode = nodestack[iNodeStackPos];
+	}
+
+	return nFoundNodes;
+}
+
 void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
 {
     bmodel_t* bmodel;

From b4bae40da83fc597feb2251e9437f9ef9fc8fce1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:00:15 +0100
Subject: [PATCH 1707/2040] Fix BSP minimum and maximum version on GL2

---
 code/renderergl2/tr_bsp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index 5f30f7ab..d1003fb9 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -3358,10 +3358,20 @@ void RE_LoadWorldMap( const char *name ) {
 	fileBase = (byte *)header;
 
 	i = LittleLong (header->version);
+#if 0
 	if ( i != BSP_VERSION ) {
 		ri.Error (ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be %i)", 
 			name, i, BSP_VERSION);
 	}
+#endif
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
+        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
+            name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
+    }
+    //=========================
 
 	// swap all the lumps
 	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {

From 4c57ba6ef38a923e8744326ed449b91c36918d09 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:03:11 +0100
Subject: [PATCH 1708/2040] Fix currentStaticModel assignment

---
 code/renderergl2/tr_backend.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index cc3bc1c8..fb951847 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -532,7 +532,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			}
 			else {
                 backEnd.currentStaticModel = NULL;
-                oldbStaticModel = bStaticModel;
 			//=========================
 
 				if ( entityNum != REFENTITYNUM_WORLD ) {
@@ -619,7 +618,12 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 				wasCrosshair = isCrosshair;
 			}
 
-			oldEntityNum = entityNum;
+            oldEntityNum = entityNum;
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+            oldbStaticModel = bStaticModel;
+            //=========================
 		}
 
         if (*drawSurf->surface == SF_SPRITE) {

From 439e0718ce8fbe6b3c80b6ffabb35c12b5d021df Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:16:27 +0100
Subject: [PATCH 1709/2040] Fix sprite rendering causing crashes

---
 code/renderergl2/tr_main.c  | 3 ---
 code/renderergl2/tr_scene.c | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index 2eef5387..e815d55e 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -3094,9 +3094,6 @@ void R_AddSpriteSurfaces()
 		return;
 	}
 
-	// FIXME: fix buggy sprites causing annoying crashes
-	return;
-
 	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
 	{
 		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
diff --git a/code/renderergl2/tr_scene.c b/code/renderergl2/tr_scene.c
index 8e19a8eb..43fb46b8 100644
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
@@ -73,7 +73,9 @@ void R_InitNextFrame( void ) {
 
     //
     // OPENMOHAA-specific stuff
-	//
+    //
+
+    r_firstSceneSpriteSurf = 0;
 
 	r_numsprites = 0;
 	r_firstSceneSprite = 0;

From 1d0b912f752152da688b10b0d904d31739b3e9f4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:57:14 +0100
Subject: [PATCH 1710/2040] Make sure to check if the sprite is valid

---
 code/renderergl2/tr_main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index e815d55e..0e1c56c7 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -3126,6 +3126,10 @@ void R_AddSpriteSurfaces()
 			tr.currentModel = tr.models[0];
 		}
 
+		if (tr.currentModel->type != MOD_SPRITE) {
+			continue;
+		}
+
 		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.or );
 		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
 

From a760cb75a344e07f9afd03711631b448ae08dd73 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 20:27:59 +0100
Subject: [PATCH 1711/2040] Use RE_AddPolyToScene2 for poly like beams

---
 code/renderergl2/tr_init.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 1e6bc1c4..d22132fb 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -2005,6 +2005,7 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
     re.GetLightingForSmoke = R_GetLightingForSmoke;
     re.R_GatherLightSources = R_GatherLightSources;
     re.ModelRadius = R_ModelRadius;
+    re.AddPolyToScene = RE_AddPolyToScene2;
     re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
     re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
 

From 70dc1820db7894c8a9afac6e9ed315d7c6fffd02 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 21:53:19 +0100
Subject: [PATCH 1712/2040] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 07779dd5..0174f158 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The entire single-player campaign should work (Allied Assault, Spearhead and Bre
 
 The Multiplayer part is almost fully stable, all game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liberation` from Medal of Honor: Breakthrough are implemented and are working as intended. Mods like `Freeze-Tag` are working as well.
 
-OpenMoHAA can be used to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server and players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on any server. Unfortunately, some bugs/strange behaviors and crashes can occur especially for servers hosting some specific mods. The best way to report bugs is by [creating a new issue](https://github.com/openmoh/openmohaa/issues) on the [OpenMoHAA GitHub](https://github.com/openmoh/openmohaa) project with the steps to reproduce (with eventually the problematic mods).
+OpenMoHAA can be used to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server and players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on any server. If some bugs/strange behavior occurs, the best way to report them is by [creating a new issue](https://github.com/openmoh/openmohaa/issues) on the [OpenMoHAA GitHub](https://github.com/openmoh/openmohaa) project with the steps to reproduce (with eventually the problematic mods).
 
 ## Features
 

From a32a9e8ae8b5d60578c3765fd7fcbf1ee6155f87 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 21:56:59 +0100
Subject: [PATCH 1713/2040] Update documentation about bots

---
 README.md                    |  2 ++
 docs/configuration/server.md | 12 +++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0174f158..c25787d0 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,8 @@ The Multiplayer part is almost fully stable, all game modes including `Tug-of-Wa
 
 OpenMoHAA can be used to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server and players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on any server. If some bugs/strange behavior occurs, the best way to report them is by [creating a new issue](https://github.com/openmoh/openmohaa/issues) on the [OpenMoHAA GitHub](https://github.com/openmoh/openmohaa) project with the steps to reproduce (with eventually the problematic mods).
 
+One of the big multiplayer features are bots. They were introduced for testing and for entertainment purposes so players can have fun alone. See [Configuring bots](docs/configuration/server.md#bots) in the dedicated server configuration documentation to set them up.
+
 ## Features
 
 - [List of new features](docs/features.md)
diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 77d3f7ec..24857510 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -102,16 +102,13 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 
 ### Bots
 
-Bots are supported and can be used for testing or for entertainment. The [mp-navigation](https://github.com/openmoh/mp-navigation) pk3 will be needed so bots can navigate and move on MP maps. The following variables are used to configure bots:
+OpenMoHAA introduced multiplayer bots which can be used for entertainment or for testing purposes.
+
+First get the [mp-navigation](https://github.com/openmoh/mp-navigation) pk3, it is needed so bots can navigate through MP maps. Then the following variables are used to configure bots:
 
 - `set sv_maxbots x`: **Required**, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
 - `set sv_numbots x`: Set the number of bots to spawn. It will be capped to the value of `sv_maxbots`.
-- `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected, the game will spawn 3 bots to make sure there are always 8 players in the game.
-
-Commands:
-
-- `addbot x`: x is the number of bots to add. It only changes the `sv_numbots` variable.
-- `removebot x`: x is the number of bots to remove. It only changes the `sv_numbots` variable.
+- `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players in a team is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected and in a team, the game will spawn 3 bots to make sure there are always 8 players in the game.
 
 Example with the requirement of 6 players:
 ```cpp
@@ -124,3 +121,4 @@ Example with 4 bots playing:
 set sv_maxbots 16 // Reserve 16 client slots for bots
 set sv_numbots 4 // Spawn 4 bots
 ```
+

From 31278fba92fd22b8e31ead9350212a662deb2db6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 22 Dec 2024 22:41:54 +0100
Subject: [PATCH 1714/2040] Make sure to bind to the renderer FBO when drawing

---
 code/renderergl2/tr_draw.c | 528 +++++++++++++++++++------------------
 1 file changed, 272 insertions(+), 256 deletions(-)

diff --git a/code/renderergl2/tr_draw.c b/code/renderergl2/tr_draw.c
index d9d8399a..b06a7a15 100644
--- a/code/renderergl2/tr_draw.c
+++ b/code/renderergl2/tr_draw.c
@@ -32,16 +32,16 @@ Draw_SetColor
 */
 void Draw_SetColor(const vec4_t rgba) {
 #if 1
-	if (!rgba) {
-		rgba = r_colorWhite;
-	}
+    if (!rgba) {
+        rgba = r_colorWhite;
+    }
 
-	backEnd.color2D[0] = (byte)(rgba[0] * tr.identityLightByte);
-	backEnd.color2D[1] = (byte)(rgba[1] * tr.identityLightByte);
-	backEnd.color2D[2] = (byte)(rgba[2] * tr.identityLightByte);
-	backEnd.color2D[3] = (byte)(rgba[3] * 255.0);
+    backEnd.color2D[0] = (byte)(rgba[0] * tr.identityLightByte);
+    backEnd.color2D[1] = (byte)(rgba[1] * tr.identityLightByte);
+    backEnd.color2D[2] = (byte)(rgba[2] * tr.identityLightByte);
+    backEnd.color2D[3] = (byte)(rgba[3] * 255.0);
 #else
-	RE_SetColor(rgba);
+    RE_SetColor(rgba);
 #endif
 }
 
@@ -52,45 +52,45 @@ Draw_StretchPic
 */
 void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader) {
 #if 1
-	shader_t* shader;
+    shader_t* shader;
 
     R_IssuePendingRenderCommands();
 
     if (glRefConfig.framebufferObject)
         FBO_Bind(tr.renderFbo);
 
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
 
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
 
-	// draw the pic
-	RB_BeginSurface(shader, 0, 0);
+    // draw the pic
+    RB_BeginSurface(shader, 0, 0);
 
     RB_Color4bv(backEnd.color2D);
 
-	RB_Texcoord2f(s1, t1);
-	RB_Vertex2f(x, y);
+    RB_Texcoord2f(s1, t1);
+    RB_Vertex2f(x, y);
 
-	RB_Texcoord2f(s2, t1);
-	RB_Vertex2f(x + w, y);
+    RB_Texcoord2f(s2, t1);
+    RB_Vertex2f(x + w, y);
 
-	RB_Texcoord2f(s1, t2);
-	RB_Vertex2f(x, y + h);
+    RB_Texcoord2f(s1, t2);
+    RB_Vertex2f(x, y + h);
 
-	RB_Texcoord2f(s2, t2);
-	RB_Vertex2f(x + w, y + h);
+    RB_Texcoord2f(s2, t2);
+    RB_Vertex2f(x + w, y + h);
 
-	RB_StreamEnd();
+    RB_StreamEnd();
 #else
-	RE_StretchPic(x, y, w, h, s1, t1, s2, t2, hShader);
+    RE_StretchPic(x, y, w, h, s1, t1, s2, t2, hShader);
 #endif
 }
 
@@ -100,49 +100,52 @@ Draw_StretchPic2
 ================
 */
 void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader) {
-	shader_t* shader;
-	float halfWidth, halfHeight;
-	float scaledWidth1, scaledHeight1;
-	float scaledWidth2, scaledHeight2;
+    shader_t* shader;
+    float halfWidth, halfHeight;
+    float scaledWidth1, scaledHeight1;
+    float scaledWidth2, scaledHeight2;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
 
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
 
-	halfWidth = w * 0.5f;
-	halfHeight = h * 0.5f;
-	scaledWidth1 = halfWidth * sy;
-	scaledHeight1 = halfHeight * sx;
-	scaledWidth2 = halfWidth * sx;
-	scaledHeight2 = halfHeight * sy;
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    halfWidth = w * 0.5f;
+    halfHeight = h * 0.5f;
+    scaledWidth1 = halfWidth * sy;
+    scaledHeight1 = halfHeight * sx;
+    scaledWidth2 = halfWidth * sx;
+    scaledHeight2 = halfHeight * sy;
 
     // draw the pic
     RB_Color4bv(backEnd.color2D);
-	RB_BeginSurface(shader, 0, 0);
+    RB_BeginSurface(shader, 0, 0);
 
-	RB_Texcoord2f(s1, t1);
-	RB_Vertex3f(x + halfWidth - (scaledWidth2 + -scaledHeight2), y + halfWidth - scaledHeight1 - scaledWidth1, 0);
+    RB_Texcoord2f(s1, t1);
+    RB_Vertex3f(x + halfWidth - (scaledWidth2 + -scaledHeight2), y + halfWidth - scaledHeight1 - scaledWidth1, 0);
 
-	RB_Texcoord2f(t2, t1);
-	RB_Vertex3f(scaledWidth2 - -scaledHeight2 + x + halfWidth, scaledWidth1 - scaledHeight1 + y + halfWidth, 0);
+    RB_Texcoord2f(t2, t1);
+    RB_Vertex3f(scaledWidth2 - -scaledHeight2 + x + halfWidth, scaledWidth1 - scaledHeight1 + y + halfWidth, 0);
 
-	RB_Texcoord2f(s1, s2);
-	RB_Vertex3f(x+ halfWidth - (scaledWidth2 + scaledHeight2), scaledHeight1 - scaledWidth1 + y + halfWidth, 0);
+    RB_Texcoord2f(s1, s2);
+    RB_Vertex3f(x+ halfWidth - (scaledWidth2 + scaledHeight2), scaledHeight1 - scaledWidth1 + y + halfWidth, 0);
 
-	RB_Texcoord2f(t2, s2);
-	RB_Vertex3f(scaledWidth2 - scaledHeight2 + x + halfWidth, scaledWidth1 + scaledHeight1 + y + halfWidth, 0);
+    RB_Texcoord2f(t2, s2);
+    RB_Vertex3f(scaledWidth2 - scaledHeight2 + x + halfWidth, scaledWidth1 + scaledHeight1 + y + halfWidth, 0);
 
-	RB_StreamEnd();
+    RB_StreamEnd();
 }
 
 
@@ -152,44 +155,47 @@ Draw_TilePic
 ================
 */
 void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
-	shader_t* shader;
-	float		picw, pich;
+    shader_t* shader;
+    float        picw, pich;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
 
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
 
-	picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
-	pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
+    pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
 
     // draw the pic
     RB_Color4bv(backEnd.color2D);
 
-	RB_StreamBegin(shader);
+    RB_StreamBegin(shader);
 
-	RB_Texcoord2f(x / picw, y / pich);
-	RB_Vertex2f(x, y);
+    RB_Texcoord2f(x / picw, y / pich);
+    RB_Vertex2f(x, y);
 
-	RB_Texcoord2f((x + w) / picw, y / pich);
-	RB_Vertex2f(x + w, y);
+    RB_Texcoord2f((x + w) / picw, y / pich);
+    RB_Vertex2f(x + w, y);
 
-	RB_Texcoord2f(x / picw, (y + h) / pich);
-	RB_Vertex2f(x, y + h);
+    RB_Texcoord2f(x / picw, (y + h) / pich);
+    RB_Vertex2f(x, y + h);
 
-	RB_Texcoord2f((x + w) / picw, (y + h) / pich);
-	RB_Vertex2f(x + w, y + h);
+    RB_Texcoord2f((x + w) / picw, (y + h) / pich);
+    RB_Vertex2f(x + w, y + h);
 
-	RB_StreamEnd();
+    RB_StreamEnd();
 }
 
 /*
@@ -198,44 +204,47 @@ Draw_TilePicOffset
 ================
 */
 void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY) {
-	shader_t* shader;
-	float		picw, pich;
+    shader_t* shader;
+    float        picw, pich;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
 
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
 
-	picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
-	pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
+    pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
 
     // draw the pic
     RB_Color4bv(backEnd.color2D);
 
-	RB_StreamBegin(shader);
+    RB_StreamBegin(shader);
 
-	RB_Texcoord2f(x / picw, y / pich);
-	RB_Vertex2f(x + offsetX, y + offsetY);
+    RB_Texcoord2f(x / picw, y / pich);
+    RB_Vertex2f(x + offsetX, y + offsetY);
 
-	RB_Texcoord2f((x + w) / picw, y / pich);
-	RB_Vertex2f(x + offsetX + w, y + offsetY);
+    RB_Texcoord2f((x + w) / picw, y / pich);
+    RB_Vertex2f(x + offsetX + w, y + offsetY);
 
-	RB_Texcoord2f(x / picw, (y + h) / pich);
-	RB_Vertex2f(x + offsetX, y + offsetY + h);
+    RB_Texcoord2f(x / picw, (y + h) / pich);
+    RB_Vertex2f(x + offsetX, y + offsetY + h);
 
-	RB_Texcoord2f((x + w) / picw, (y + h) / pich);
-	RB_Vertex2f(x + offsetX + w, y + offsetY + h);
+    RB_Texcoord2f((x + w) / picw, (y + h) / pich);
+    RB_Vertex2f(x + offsetX + w, y + offsetY + h);
 
-	RB_StreamEnd();
+    RB_StreamEnd();
 }
 
 /*
@@ -244,29 +253,32 @@ Draw_TrianglePic
 ================
 */
 void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader) {
-	int			i;
-	shader_t* shader;
+    int            i;
+    shader_t* shader;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
 
     // draw the pic
     RB_Color4bv(backEnd.color2D);
 
-	RB_BeginSurface(shader, 0, 0);
+    RB_BeginSurface(shader, 0, 0);
 
-	for (i = 0; i < 3; i++) {
-		RB_Texcoord2f(vTexCoords[i][0], vTexCoords[i][1]);
-		RB_Vertex2f(vPoints[i][0], vPoints[i][1]);
-	}
+    for (i = 0; i < 3; i++) {
+        RB_Texcoord2f(vTexCoords[i][0], vTexCoords[i][1]);
+        RB_Vertex2f(vPoints[i][0], vPoints[i][1]);
+    }
 
-	RB_StreamEnd();
+    RB_StreamEnd();
 }
 
 /*
@@ -275,59 +287,59 @@ RE_DrawBackground_TexSubImage
 ================
 */
 void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
-	// FIXME: unimplemented (GL2)
+    // FIXME: unimplemented (GL2)
 #if 0
-	GLenum	format;
-	int		w, h;
+    GLenum    format;
+    int        w, h;
 
-	w = glConfig.vidWidth;
-	h = glConfig.vidHeight;
+    w = glConfig.vidWidth;
+    h = glConfig.vidHeight;
 
-	R_IssuePendingRenderCommands();
-	qglFinish();
+    R_IssuePendingRenderCommands();
+    qglFinish();
 
-	if (bgr) {
-		format = GL_BGR_EXT;
-	}
-	else {
-		format = GL_RGB;
-	}
+    if (bgr) {
+        format = GL_BGR_EXT;
+    }
+    else {
+        format = GL_RGB;
+    }
 
-	GL_Bind(tr.scratchImage);
+    GL_Bind(tr.scratchImage);
 
-	if (cols == tr.scratchImage->width && rows == tr.scratchImage->height && format == tr.scratchImage->internalFormat)
-	{
-		qglTexSubImage2D(3553, 0, 0, 0, cols, rows, format, 5121, data);
-	}
-	else
-	{
-		tr.scratchImage->uploadWidth = cols;
-		tr.scratchImage->uploadHeight = rows;
-		tr.scratchImage->internalFormat = format;
-		qglTexImage2D(GL_TEXTURE_2D, 0, 3, cols, rows, 0, format, 5121, data);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 9729.0);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 9729.0);
-	}
+    if (cols == tr.scratchImage->width && rows == tr.scratchImage->height && format == tr.scratchImage->internalFormat)
+    {
+        qglTexSubImage2D(3553, 0, 0, 0, cols, rows, format, 5121, data);
+    }
+    else
+    {
+        tr.scratchImage->uploadWidth = cols;
+        tr.scratchImage->uploadHeight = rows;
+        tr.scratchImage->internalFormat = format;
+        qglTexImage2D(GL_TEXTURE_2D, 0, 3, cols, rows, 0, format, 5121, data);
+        qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 9729.0);
+        qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 9729.0);
+    }
 
-	qglDisable(GL_CULL_FACE);
-	qglDisable(GL_DEPTH_TEST);
-	qglEnable(GL_TEXTURE_2D);
+    qglDisable(GL_CULL_FACE);
+    qglDisable(GL_DEPTH_TEST);
+    qglEnable(GL_TEXTURE_2D);
 
-	qglBegin(GL_QUADS);
+    qglBegin(GL_QUADS);
 
-	qglTexCoord2f(0.5 / (GLfloat)cols, ((GLfloat)rows - 0.5) / rows);
-	qglVertex2f(0, 0);
+    qglTexCoord2f(0.5 / (GLfloat)cols, ((GLfloat)rows - 0.5) / rows);
+    qglVertex2f(0, 0);
 
-	qglTexCoord2f(((GLfloat)cols - 0.5) / cols, ((GLfloat)rows - 0.5) / rows);
-	qglVertex2f(w, 0);
+    qglTexCoord2f(((GLfloat)cols - 0.5) / cols, ((GLfloat)rows - 0.5) / rows);
+    qglVertex2f(w, 0);
 
-	qglTexCoord2f(((GLfloat)cols - 0.5) / cols, 0.5 / (GLfloat)rows);
-	qglVertex2f(w, h);
+    qglTexCoord2f(((GLfloat)cols - 0.5) / cols, 0.5 / (GLfloat)rows);
+    qglVertex2f(w, h);
 
-	qglTexCoord2f(0.5 / (GLfloat)rows, 0.5 / (GLfloat)rows);
-	qglVertex2f(0, h);
+    qglTexCoord2f(0.5 / (GLfloat)rows, 0.5 / (GLfloat)rows);
+    qglVertex2f(0, h);
 
-	qglEnd();
+    qglEnd();
 #endif
 }
 
@@ -339,22 +351,22 @@ RE_DrawBackground_DrawPixels
 void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
     // FIXME: unimplemented (GL2)
 #if 0
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	GL_State(0);
-	qglDisable(GL_TEXTURE_2D);
+    GL_State(0);
+    qglDisable(GL_TEXTURE_2D);
 
-	qglPixelZoom(glConfig.vidWidth / rows, glConfig.vidHeight / cols);
+    qglPixelZoom(glConfig.vidWidth / rows, glConfig.vidHeight / cols);
 
-	if (bgr) {
-		qglDrawPixels(cols, rows, GL_BGR, GL_UNSIGNED_BYTE, data);
-	} else {
-		qglDrawPixels(cols, rows, GL_RGB, GL_UNSIGNED_BYTE, data);
-	}
+    if (bgr) {
+        qglDrawPixels(cols, rows, GL_BGR, GL_UNSIGNED_BYTE, data);
+    } else {
+        qglDrawPixels(cols, rows, GL_RGB, GL_UNSIGNED_BYTE, data);
+    }
 
-	qglPixelZoom(1.0, 1.0);
+    qglPixelZoom(1.0, 1.0);
 
-	qglEnable(GL_TEXTURE_2D);
+    qglEnable(GL_TEXTURE_2D);
 #endif
 }
 
@@ -366,37 +378,37 @@ AddBox
 void AddBox(float x, float y, float w, float h) {
     vec4_t quadVerts[4];
     vec2_t texCoords[4];
-	vec4_t color;
+    vec4_t color;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
     GL_BindToTMU(tr.whiteImage, TB_COLORMAP);
     GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE);
 
-	if (glRefConfig.framebufferObject)
-	{
-		FBO_Bind(tr.renderFbo);
-	}
+    if (glRefConfig.framebufferObject)
+    {
+        FBO_Bind(tr.renderFbo);
+    }
 
-	color[0] = backEnd.color2D[0] / 255.0;
-	color[1] = backEnd.color2D[1] / 255.0;
-	color[2] = backEnd.color2D[2] / 255.0;
-	color[3] = backEnd.color2D[3] / 255.0;
-	
-	VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
-	VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
-	VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
-	VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
+    color[0] = backEnd.color2D[0] / 255.0;
+    color[1] = backEnd.color2D[1] / 255.0;
+    color[2] = backEnd.color2D[2] / 255.0;
+    color[3] = backEnd.color2D[3] / 255.0;
+    
+    VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
+    VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
 
-	VectorSet2(texCoords[0], 0.0f, 0.0f);
-	VectorSet2(texCoords[1], 1.0f, 0.0f);
-	VectorSet2(texCoords[2], 1.0f, 1.0f);
-	VectorSet2(texCoords[3], 0.0f, 1.0f);
+    VectorSet2(texCoords[0], 0.0f, 0.0f);
+    VectorSet2(texCoords[1], 1.0f, 0.0f);
+    VectorSet2(texCoords[2], 1.0f, 1.0f);
+    VectorSet2(texCoords[3], 0.0f, 1.0f);
 
-	GLSL_BindProgram(&tr.textureColorShader);
-	
-	GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-	GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
+    GLSL_BindProgram(&tr.textureColorShader);
+    
+    GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
+    GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
 
     RB_InstantQuad2(quadVerts, texCoords);
 }
@@ -409,37 +421,37 @@ DrawBox
 void DrawBox(float x, float y, float w, float h) {
     vec4_t quadVerts[4];
     vec2_t texCoords[4];
-	vec4_t color;
+    vec4_t color;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
     GL_BindToTMU(tr.whiteImage, TB_COLORMAP);
     GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
 
-	if (glRefConfig.framebufferObject)
-	{
-		FBO_Bind(tr.renderFbo);
-	}
+    if (glRefConfig.framebufferObject)
+    {
+        FBO_Bind(tr.renderFbo);
+    }
 
-	color[0] = backEnd.color2D[0] / 255.0;
-	color[1] = backEnd.color2D[1] / 255.0;
-	color[2] = backEnd.color2D[2] / 255.0;
-	color[3] = backEnd.color2D[3] / 255.0;
-	
-	VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
-	VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
-	VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
-	VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
+    color[0] = backEnd.color2D[0] / 255.0;
+    color[1] = backEnd.color2D[1] / 255.0;
+    color[2] = backEnd.color2D[2] / 255.0;
+    color[3] = backEnd.color2D[3] / 255.0;
+    
+    VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
+    VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
 
-	VectorSet2(texCoords[0], 0.0f, 0.0f);
-	VectorSet2(texCoords[1], 1.0f, 0.0f);
-	VectorSet2(texCoords[2], 1.0f, 1.0f);
-	VectorSet2(texCoords[3], 0.0f, 1.0f);
+    VectorSet2(texCoords[0], 0.0f, 0.0f);
+    VectorSet2(texCoords[1], 1.0f, 0.0f);
+    VectorSet2(texCoords[2], 1.0f, 1.0f);
+    VectorSet2(texCoords[3], 0.0f, 1.0f);
 
-	GLSL_BindProgram(&tr.textureColorShader);
-	
-	GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-	GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
+    GLSL_BindProgram(&tr.textureColorShader);
+    
+    GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
+    GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
 
     RB_InstantQuad2(quadVerts, texCoords);
 }
@@ -452,30 +464,30 @@ DrawLineLoop
 void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask) {
     // FIXME: unimplemented (GL2)
 #if 0
-	int		i;
+    int        i;
 
-	R_IssuePendingRenderCommands();
+    R_IssuePendingRenderCommands();
 
-	qglDisable(GL_TEXTURE_2D);
+    qglDisable(GL_TEXTURE_2D);
 
-	if (stipple_factor) {
-		qglEnable(GL_LINE_STIPPLE);
-		qglLineStipple(stipple_factor, stipple_mask);
-	}
+    if (stipple_factor) {
+        qglEnable(GL_LINE_STIPPLE);
+        qglLineStipple(stipple_factor, stipple_mask);
+    }
 
-	qglBegin(GL_LINE_LOOP);
+    qglBegin(GL_LINE_LOOP);
 
-	for (i = 0; i < count; i++) {
-		qglVertex2f(points[i][0], points[i][1]);
-	}
+    for (i = 0; i < count; i++) {
+        qglVertex2f(points[i][0], points[i][1]);
+    }
 
-	qglEnd();
+    qglEnd();
 
-	qglEnable(GL_TEXTURE_2D);
+    qglEnable(GL_TEXTURE_2D);
 
-	if (stipple_factor) {
-		qglDisable(GL_LINE_STIPPLE);
-	}
+    if (stipple_factor) {
+        qglDisable(GL_LINE_STIPPLE);
+    }
 #endif
 }
 
@@ -485,27 +497,31 @@ Set2DWindow
 ================
 */
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-	mat4_t matrix;
+    mat4_t matrix;
 
-	R_IssuePendingRenderCommands();
-	qglViewport(x, y, w, h);
-	qglScissor(x, y, w, h);
+    R_IssuePendingRenderCommands();
+
+    backEnd.projection2D = qtrue;
+    backEnd.last2DFBO = glState.currentFBO;
+
+    qglViewport(x, y, w, h);
+    qglScissor(x, y, w, h);
 
     Mat4Ortho(left, right, bottom, top, n, f, matrix);
-	GL_SetProjectionMatrix(matrix);
-	Mat4Identity(matrix);
-	GL_SetModelviewMatrix(matrix);
+    GL_SetProjectionMatrix(matrix);
+    Mat4Identity(matrix);
+    GL_SetModelviewMatrix(matrix);
 
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
+    GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
 
     GL_Cull(CT_TWO_SIDED);
 
-	if (!backEnd.projection2D)
-	{
-		backEnd.refdef.time = ri.Milliseconds();
-		backEnd.projection2D = qtrue;
-		backEnd.refdef.floatTime = backEnd.refdef.time / 1000.0;
-	}
+    if (!backEnd.projection2D)
+    {
+        backEnd.refdef.time = ri.Milliseconds();
+        backEnd.projection2D = qtrue;
+        backEnd.refdef.floatTime = backEnd.refdef.time / 1000.0;
+    }
 }
 
 /*
@@ -514,6 +530,6 @@ RE_Scissor
 ================
 */
 void RE_Scissor(int x, int y, int width, int height) {
-	qglEnable(GL_SCISSOR_TEST);
-	qglScissor(x, y, width, height);
+    qglEnable(GL_SCISSOR_TEST);
+    qglScissor(x, y, width, height);
 }

From 07f7c557ce48f70410df4725cfc0c5aa353f2458 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:34:50 +0100
Subject: [PATCH 1715/2040] Move TargetArch.cmake to misc/cmake

---
 CMakeLists.txt                                  | 2 +-
 TargetArch.cmake => misc/cmake/TargetArch.cmake | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename TargetArch.cmake => misc/cmake/TargetArch.cmake (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54060f98..ba983bc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 project(openmohaa)
 
-include(TargetArch.cmake)
+include(misc/cmake/TargetArch.cmake)
 
 target_architecture(TARGET_ARCH)
 list(LENGTH TARGET_ARCH TARGET_ARCH_COUNT)
diff --git a/TargetArch.cmake b/misc/cmake/TargetArch.cmake
similarity index 100%
rename from TargetArch.cmake
rename to misc/cmake/TargetArch.cmake

From 85c401496ad91f1b69a2f33972987723220f3955 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:53:31 +0100
Subject: [PATCH 1716/2040] Add a client-game variable for customizing the FOV
 client-side

---
 code/cgame/cg_local.h   |  5 +++++
 code/cgame/cg_main.c    | 11 +++++++++++
 code/cgame/cg_predict.c | 20 +++++++++++++++++---
 code/cgame/cg_view.c    |  9 +++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 99b5b638..98149204 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -506,6 +506,11 @@ extern "C" {
     extern cvar_t *cg_shadowdebug;
     extern cvar_t *ui_timemessage;
 
+    //
+    // Added in OPM
+    //
+    extern cvar_t *cg_fov;
+
     //
     // cg_main.c
     //
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 6f4b9498..98e4eb50 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -112,6 +112,11 @@ cvar_t *cg_shadowscount;
 cvar_t *cg_shadowdebug;
 cvar_t *ui_timemessage;
 
+//
+// Added in OPM
+//
+cvar_t *cg_fov;
+
 /*
 =================
 CG_RegisterCvars
@@ -203,6 +208,12 @@ void CG_RegisterCvars(void)
     // see if we are also running the server on this machine
     temp            = cgi.Cvar_Get("sv_running", "0", 0);
     cgs.localServer = temp->integer;
+
+    //
+    // Added in OPM
+    //
+
+    cg_fov = cgi.Cvar_Get("cg_fov", "80", CVAR_ARCHIVE);
 }
 /*
 ===============
diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index 5d7e1a8a..4eeb4ac1 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -330,8 +330,18 @@ static void CG_InterpolatePlayerStateCamera(void)
     //
     VectorCopy(cg.predicted_player_state.camera_angles, cg.camera_angles);
     VectorCopy(cg.predicted_player_state.camera_origin, cg.camera_origin);
-    cg.camera_fov = cg.predicted_player_state.fov;
 
+    //
+    // Added in OPM
+    //  Use the specified fov specified by the server
+    //  when zooming
+    //
+    if (cg.predicted_player_state.stats[STAT_INZOOM]) {
+        cg.camera_fov = cg.predicted_player_state.fov;
+    } else {
+        cg.camera_fov = cg_fov->value;
+    }
+    
     // if the next frame is a teleport, we can't lerp to it
     if (cg.nextFrameCameraCut) {
         return;
@@ -343,8 +353,12 @@ static void CG_InterpolatePlayerStateCamera(void)
 
     f = (float)(cg.time - prev->serverTime) / (next->serverTime - prev->serverTime);
 
-    // interpolate fov
-    cg.camera_fov = prev->ps.fov + f * (next->ps.fov - prev->ps.fov);
+    if (cg.predicted_player_state.stats[STAT_INZOOM]) {
+        // interpolate fov
+        cg.camera_fov = prev->ps.fov + f * (next->ps.fov - prev->ps.fov);
+    } else {
+        cg.camera_fov = cg_fov->value;
+    }
 
     if (!(cg.snap->ps.pm_flags & PMF_CAMERA_VIEW)) {
         return;
diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 75c49ce2..aa950eac 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -840,6 +840,15 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
         // no entities should be marked as interpolating
     }
 
+    //
+    // Added in OPM
+    //  Clamp the fov to avoid artifacts
+    if (cg_fov->value < 65) {
+        cgi.Cvar_Set("cg_fov", "65");
+    } else if (cg_fov->value > 140) {
+        cgi.Cvar_Set("cg_fov", "120");
+    }
+
     // update cg.predicted_player_state
     CG_PredictPlayerState();
 

From 37f5f64ef3017b6c03c13973cb1f8dde01a468b8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:55:17 +0100
Subject: [PATCH 1717/2040] Update features.md

---
 docs/features.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/features.md b/docs/features.md
index 49b5026e..bafa02a4 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -16,7 +16,7 @@ Overall, better compatibility on modern systems and bugfixes.
 
 ## Additions
 
-### Client-side and server-side
+### General
 
 - Demo recording
 - Features from ioquake3
@@ -25,6 +25,7 @@ Overall, better compatibility on modern systems and bugfixes.
 
 ### Client-side
 
+- Customizable FOV
 - OpenAL and SDL are used
 - Smoother animations
 - Stufftext protection: commands that the server want clients to execute are now filtered

From 515beeafa7d0968f4456d839095bd8c197cb179c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:57:26 +0100
Subject: [PATCH 1718/2040] Fix wrong fov clamping

---
 code/cgame/cg_view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index aa950eac..89b85900 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -845,7 +845,7 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
     //  Clamp the fov to avoid artifacts
     if (cg_fov->value < 65) {
         cgi.Cvar_Set("cg_fov", "65");
-    } else if (cg_fov->value > 140) {
+    } else if (cg_fov->value > 120) {
         cgi.Cvar_Set("cg_fov", "120");
     }
 

From da5c35ec2bca702e380bdea61168063e42640f09 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Dec 2024 18:30:08 +0100
Subject: [PATCH 1719/2040] Prevent connecting clients from receiving snapshots
 and CG messages while connecting

---
 code/server/sv_snapshot.c | 46 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index 3b979687..bd393116 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1218,31 +1218,38 @@ void SV_SendClientSnapshot( client_t *client ) {
 		return;
 	}
 
-	MSG_Init (&msg, msg_buf, sizeof(msg_buf));
-	msg.allowoverflow = qtrue;
+    MSG_Init(&msg, msg_buf, sizeof(msg_buf));
+    msg.allowoverflow = qtrue;
 
-	// NOTE, MRE: all server->client messages now acknowledge
-	// let the client know which reliable clientCommands we have received
-	MSG_WriteLong( &msg, client->lastClientCommand );
+    // NOTE, MRE: all server->client messages now acknowledge
+    // let the client know which reliable clientCommands we have received
+    MSG_WriteLong(&msg, client->lastClientCommand);
 
-	// (re)send any reliable server commands
-	SV_UpdateServerCommandsToClient( client, &msg );
+	if (g_gametype->integer <= GT_SINGLE_PLAYER || client->serverIdAcknowledge == sv.serverId || client->serverIdAcknowledge == sv.restartedServerId) {
+		// (re)send any reliable server commands
+		SV_UpdateServerCommandsToClient( client, &msg );
 
-	// send over all the relevant entityState_t
-	// and the playerState_t
-	SV_WriteSnapshotToClient( client, &msg );
+		// send over all the relevant entityState_t
+		// and the playerState_t
+		SV_WriteSnapshotToClient( client, &msg );
 
-	// clear the sounds on the client, preventing them to be sent each at packet
-	SV_ClearSounds( client );
+		// clear the sounds on the client, preventing them to be sent each at packet
+		SV_ClearSounds( client );
 
-	// clear center print, preventing it to be sent at each packet
-	client->stringToPrint[ 0 ] = 0;
+		// clear center print, preventing it to be sent at each packet
+		client->stringToPrint[ 0 ] = 0;
 
-	// su44: write any pending MoHAA cg messages
-	SV_WriteCGMToClient( client, &msg );
+		// su44: write any pending MoHAA cg messages
+		SV_WriteCGMToClient( client, &msg );
 
-	// Add any download data if the client is downloading
-	SV_WriteDownloadToClient( client, &msg );
+		// Add any download data if the client is downloading
+		SV_WriteDownloadToClient( client, &msg );
+	} else {
+		// Fixed in 2.0
+		//  Don't send snapshots until the player has acknowledged the server id (which happens when the client enters the world).
+		//  This also prevent sending CG messages while the client connects, as the cgame module is loaded when parsing the gamestate
+		MSG_WriteSVC(&msg, svc_nop);
+	}
 
 #ifdef USE_VOIP
 	SV_WriteVoipToClient( client, &msg );
@@ -1264,10 +1271,9 @@ SV_SendClientMessages
 */
 void SV_SendClientMessages(void)
 {
-	int				i, j;
+	int				i;
 	int				rate;
 	client_t		*c;
-	gentity_t		*ent;
 
 	// send a message to each connected client
 	for(i=0; i < sv_maxclients->integer; i++)

From cb1c3c0b1c5ac91f26c4cdf59ecb5ea639718480 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Dec 2024 18:41:20 +0100
Subject: [PATCH 1720/2040] Remove call to SV_WriteDownloadToClient() when
 sending snapshots, as it's already called when sending download messages

---
 code/server/sv_snapshot.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index bd393116..d87c689e 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -1242,8 +1242,9 @@ void SV_SendClientSnapshot( client_t *client ) {
 		// su44: write any pending MoHAA cg messages
 		SV_WriteCGMToClient( client, &msg );
 
-		// Add any download data if the client is downloading
-		SV_WriteDownloadToClient( client, &msg );
+#ifdef USE_VOIP
+		SV_WriteVoipToClient(client, &msg);
+#endif
 	} else {
 		// Fixed in 2.0
 		//  Don't send snapshots until the player has acknowledged the server id (which happens when the client enters the world).
@@ -1251,10 +1252,6 @@ void SV_SendClientSnapshot( client_t *client ) {
 		MSG_WriteSVC(&msg, svc_nop);
 	}
 
-#ifdef USE_VOIP
-	SV_WriteVoipToClient( client, &msg );
-#endif
-
 	// check for overflow
 	if ( msg.overflowed ) {
 		Com_Printf ("WARNING: msg overflowed for %s\n", client->name);

From 7274ceb0ff74f7df93a71c859fa2ea5171c5268e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Dec 2024 19:53:20 +0100
Subject: [PATCH 1721/2040] Make the bot melee when it is near the player

---
 code/fgame/playerbot.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index dd403b95..290e22eb 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -776,17 +776,27 @@ void BotController::State_Attack(void)
                 m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
                 controlledEnt->ZoomOff();
             }
-        } else if (pWeap->GetFireType(FIRE_SECONDARY) == FT_MELEE) {
-            bMelee = true;
+        } else {
+            m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+            controlledEnt->ZoomOff();
+        }
+
+        if (pWeap->GetFireType(FIRE_SECONDARY) == FT_MELEE) {
+            if (controlledEnt->client->ps.stats[STAT_AMMO] <= 0 && controlledEnt->client->ps.stats[STAT_CLIPAMMO] <= 0) {
+                bMelee = true;
+            } else if (fDistanceSquared <= fSecondaryBulletRangeSquared) {
+                bMelee = true;
+            }
+        }
+
+        if (bMelee) {
+            m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
 
             if (fDistanceSquared <= fSecondaryBulletRangeSquared) {
                 m_botCmd.buttons ^= BUTTON_ATTACKRIGHT;
             } else {
                 m_botCmd.buttons &= ~BUTTON_ATTACKRIGHT;
             }
-        } else {
-            m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
-            controlledEnt->ZoomOff();
         }
 
         m_iAttackTime        = level.inttime + 1000;

From 963b2a2bbd6404556f6e6b054d9b7d6b6292d822 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Dec 2024 20:04:59 +0100
Subject: [PATCH 1722/2040] Add getters for Sentient inventory and ammo
 inventory

---
 code/fgame/sentient.h          | 3 +++
 code/fgame/sentient_combat.cpp | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/code/fgame/sentient.h b/code/fgame/sentient.h
index 02edcd6d..8230d890 100644
--- a/code/fgame/sentient.h
+++ b/code/fgame/sentient.h
@@ -361,6 +361,9 @@ public:
     void FootstepMain(trace_t *trace, int iRunning, int iEquipment);
     void Footstep(const char *szTagName, int iRunning, int iEquipment);
     void LandingSound(float volume, int iEquipment);
+
+    const Container<int>& getInventory() const;
+    const Container<Ammo*>& getAmmoInventory() const;
 };
 
 typedef SafePtr<Sentient> SentientPtr;
diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index dd213c79..28e0cea2 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -1308,3 +1308,11 @@ void Sentient::GetActiveWeap(Event *ev)
 
     ev->AddEntity(weapon);
 }
+
+const Container<int>& Sentient::getInventory() const {
+    return inventory;
+}
+
+const Container<Ammo*>& Sentient::getAmmoInventory() const {
+    return ammo_inventory;
+}

From 25fd01c46b29c88576bdc9b1843a543fc9d74e94 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 24 Dec 2024 20:19:08 +0100
Subject: [PATCH 1723/2040] Automatically switch to another weapon when the
 current weapon has no ammo

---
 code/fgame/playerbot.cpp | 111 ++++++++++++++++++++++++++++++++++++++-
 code/fgame/playerbot.h   |   5 ++
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 290e22eb..120d5afa 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -93,7 +93,7 @@ void BotController::Init(void)
     InitState_Curious(&botfuncs[1]);
     InitState_Grenade(&botfuncs[2]);
     InitState_Idle(&botfuncs[3]);
-    InitState_Weapon(&botfuncs[4]);
+    //InitState_Weapon(&botfuncs[4]);
 }
 
 void BotController::GetUsercmd(usercmd_t *ucmd)
@@ -162,6 +162,8 @@ void BotController::UpdateBotStates(void)
     movement.MoveThink(m_botCmd);
     rotation.TurnThink(m_botCmd, m_botEyes);
     CheckUse();
+
+    CheckValidWeapon();
 }
 
 void BotController::CheckUse(void)
@@ -197,6 +199,17 @@ void BotController::CheckUse(void)
     }
 }
 
+void BotController::CheckValidWeapon() {
+    Weapon* weapon = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
+    if (!weapon) {
+        // If holstered, use the best weapon available
+        UseWeaponWithAmmo();
+    } else if (!weapon->HasAmmo(FIRE_PRIMARY) && !controlledEnt->GetNewActiveWeapon()) {
+        // In case the current weapon has no ammo, use the best available weapon
+        UseWeaponWithAmmo();
+    }
+}
+
 void BotController::SendCommand(const char *text)
 {
     char        *buffer;
@@ -922,6 +935,102 @@ void BotController::State_BeginWeapon(void)
     SendCommand(va("use \"%s\"", weap->model.c_str()));
 }
 
+Weapon* BotController::FindWeaponWithAmmo() {
+  
+    Weapon *next;
+    int     n;
+    int     j;
+    int     bestrank;
+    Weapon *bestweapon;
+    const Container<int>& inventory = controlledEnt->getInventory();
+
+    n = inventory.NumObjects();
+
+    // Search until we find the best weapon with ammo
+    bestweapon = NULL;
+    bestrank   = -999999;
+
+    for (j = 1; j <= n; j++) {
+        next = (Weapon *)G_GetEntity(inventory.ObjectAt(j));
+
+        assert(next);
+        if (!next->IsSubclassOfWeapon() || next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetWeaponClass() & WEAPON_CLASS_THROWABLE) {
+            continue;
+        }
+
+        if (next->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (!next->HasAmmo(FIRE_PRIMARY)) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
+    }
+
+    return bestweapon;
+}
+
+Weapon* BotController::FindMeleeWeapon() {
+  
+    Weapon *next;
+    int     n;
+    int     j;
+    int     bestrank;
+    Weapon *bestweapon;
+    const Container<int>& inventory = controlledEnt->getInventory();
+
+    n = inventory.NumObjects();
+
+    // Search until we find the best weapon with ammo
+    bestweapon = NULL;
+    bestrank   = -999999;
+
+    for (j = 1; j <= n; j++) {
+        next = (Weapon *)G_GetEntity(inventory.ObjectAt(j));
+
+        assert(next);
+        if (!next->IsSubclassOfWeapon() || next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (next->GetFireType(FIRE_SECONDARY) != FT_MELEE) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
+    }
+
+    return bestweapon;
+}
+
+void BotController::UseWeaponWithAmmo() {
+    Weapon* bestWeapon = FindWeaponWithAmmo();
+    if (!bestWeapon) {
+        //
+        // If there is no weapon with ammo, fallback to a weapon that can melee
+        //
+        bestWeapon = FindMeleeWeapon();
+    }
+
+    if (!bestWeapon || bestWeapon == controlledEnt->GetActiveWeapon(WEAPON_MAIN)) {
+        return;
+    }
+
+    controlledEnt->useWeapon(bestWeapon, WEAPON_MAIN);
+}
+
 void BotController::Spawned(void)
 {
     ClearEnemy();
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index ac8c2bcd..83caa0bb 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -161,7 +161,12 @@ private:
     int m_iNextTauntTime;
 
 private:
+    Weapon* FindWeaponWithAmmo(void);
+    Weapon* FindMeleeWeapon(void);
+    void UseWeaponWithAmmo(void);
+
     void CheckUse(void);
+    void CheckValidWeapon(void);
 
     void State_DefaultBegin(void);
     void State_DefaultEnd(void);

From 47d6843b70d890b576b6bd5a41fc307e20598318 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Dec 2024 14:50:07 +0100
Subject: [PATCH 1724/2040] Fix player model list never initialized

---
 code/fgame/g_bot.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 97b2af2d..f8d181a1 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -43,7 +43,7 @@ Return whether or not the specified filename is for allies
 */
 bool IsAlliedPlayerModel(const char *filename)
 {
-    return !Q_stricmpn(filename, "/allied_", 8) || !Q_stricmpn(filename, "/american_", 10);
+    return !Q_stricmpn(filename, "allied_", 7) || !Q_stricmpn(filename, "american_", 9);
 }
 
 /*
@@ -55,7 +55,7 @@ Return whether or not the specified filename is for axis
 */
 bool IsGermanPlayerModel(const char *filename)
 {
-    return !Q_stricmpn(filename, "/german_", 8) || !Q_stricmpn(filename, "/IT_", 4) || !Q_stricmpn(filename, "/SC_", 4);
+    return !Q_stricmpn(filename, "german_", 7) || !Q_stricmpn(filename, "IT_", 3) || !Q_stricmpn(filename, "SC_", 3);
 }
 
 /*
@@ -140,9 +140,9 @@ void InitModelList()
         }
 
         if (IsAlliedPlayerModel(filename)) {
-            alliedModelList.AddObject(str(filename + 1, 0, len - 5));
+            alliedModelList.AddObject(str(filename, 0, len - 4));
         } else {
-            germanModelList.AddObject(str(filename + 1, 0, len - 5));
+            germanModelList.AddObject(str(filename, 0, len - 4));
         }
     }
 

From 583c2720e27a756fa8b434690c5a3147e16df452 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:00:32 +0100
Subject: [PATCH 1725/2040] Fix Info_RemoveKey not correctly removing the key

---
 code/qcommon/q_shared.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index fde3bdb4..696786a5 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -1853,9 +1853,8 @@ void Info_RemoveKey( char *s, const char *key ) {
 
 		if (!strcmp (key, pkey) )
 		{
-			//strcpy (start, s);	// remove this part
-			// Fixed in OPM
-			memmove(start, s, strlen(s));
+			memmove(start, s, strlen(s) + 1); // remove this part
+			
 			return;
 		}
 

From 3f2c2f7aa40df65e10430372a3208afbef8646a4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:08:00 +0100
Subject: [PATCH 1726/2040] Spectate the next player in mohaa 1.0 (instead of
 random) when pressing use in spectator

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0e6cb084..b94ac4f5 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4748,7 +4748,7 @@ void Player::Think(void)
                 }
             } else {
                 if ((server_new_buttons & BUTTON_USE)) {
-                    SetPlayerSpectateRandom();
+                    SetPlayerSpectate(true);
                 }
             }
 

From ebe9795bba60b5d48d94ddb7f89730877e692e25 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:08:57 +0100
Subject: [PATCH 1727/2040] Select a random player skin when the bot dies

---
 code/fgame/g_bot.cpp     | 40 ++++++++++++++++++++++++++++++++--------
 code/fgame/g_bot.h       |  4 +++-
 code/fgame/playerbot.cpp | 10 ++++++++++
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index f8d181a1..de3124bf 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -383,6 +383,36 @@ bool G_IsPlayer(gentity_t *ent)
     return true;
 }
 
+/*
+===========
+G_GetRandomAlliedPlayerModel
+============
+*/
+const char* G_GetRandomAlliedPlayerModel()
+{
+    if (!alliedModelList.NumObjects()) {
+        return "";
+    }
+
+    const unsigned int index = rand() % alliedModelList.NumObjects();
+    return alliedModelList[index];
+}
+
+/*
+===========
+G_GetRandomGermanPlayerModel
+============
+*/
+const char* G_GetRandomGermanPlayerModel()
+{
+    if (!germanModelList.NumObjects()) {
+        return "";
+    }
+
+    const unsigned int index = rand() % germanModelList.NumObjects();
+    return germanModelList[index];
+}
+
 /*
 ===========
 G_AddBot
@@ -429,14 +459,8 @@ void G_AddBot(const saved_bot_t *saved)
     //
     // Choose a random model
     //
-    if (alliedModelList.NumObjects()) {
-        const unsigned int index = rand() % alliedModelList.NumObjects();
-        Info_SetValueForKey(userinfo, "dm_playermodel", alliedModelList[index]);
-    }
-    if (germanModelList.NumObjects()) {
-        const unsigned int index = rand() % germanModelList.NumObjects();
-        Info_SetValueForKey(userinfo, "dm_playergermanmodel", germanModelList[index]);
-    }
+    Info_SetValueForKey(userinfo, "dm_playermodel", G_GetRandomAlliedPlayerModel());
+    Info_SetValueForKey(userinfo, "dm_playergermanmodel", G_GetRandomGermanPlayerModel());
 
     Info_SetValueForKey(userinfo, "fov", "80");
     Info_SetValueForKey(userinfo, "ip", "localhost");
diff --git a/code/fgame/g_bot.h b/code/fgame/g_bot.h
index 3eb222dc..7cbe8015 100644
--- a/code/fgame/g_bot.h
+++ b/code/fgame/g_bot.h
@@ -40,4 +40,6 @@ void       G_ResetBots();
 void       G_BotInit();
 void       G_BotFrame();
 void       G_BotPostInit();
-void       G_SpawnBots();
\ No newline at end of file
+void       G_SpawnBots();
+const char* G_GetRandomAlliedPlayerModel();
+const char* G_GetRandomGermanPlayerModel();
\ No newline at end of file
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 120d5afa..3b033e2a 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "scriptexception.h"
 #include "vehicleturret.h"
 #include "weaputils.h"
+#include "g_bot.h"
 
 // We assume that we have limited access to the server-side
 // and that most logic come from the playerstate_s structure
@@ -1081,6 +1082,15 @@ void BotController::Killed(Event *ev)
     event.AddString("auto");
 
     controlledEnt->ProcessEvent(event);
+
+    //
+    // This is useful to change nationality in Spearhead and Breakthrough
+    // this allows the AI to use more weapons
+    //
+    Info_SetValueForKey(controlledEnt->client->pers.userinfo, "dm_playermodel", G_GetRandomAlliedPlayerModel());
+    Info_SetValueForKey(controlledEnt->client->pers.userinfo, "dm_playergermanmodel", G_GetRandomGermanPlayerModel());
+
+    G_ClientUserinfoChanged(controlledEnt->edict, controlledEnt->client->pers.userinfo);
 }
 
 void BotController::GotKill(Event *ev)

From 3e9d2bf89afd839be615c2755059554b32bf76f3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:33:29 +0100
Subject: [PATCH 1728/2040] Fix incompatible type being used for shadertext

---
 code/renderergl1/tr_shader.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 6a57ff72..61de647b 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -131,10 +131,11 @@ static shadertext_t* FindShaderText(const char* name)
 }
 
 void R_RemapShader(const char *shaderName, const char *newShaderName, const char *timeOffset) {
-	char		strippedName[MAX_QPATH];
-	int			hash;
-	shader_t	*sh, *sh2;
-	qhandle_t	h;
+	char			strippedName[MAX_QPATH];
+	int				hash;
+	shader_t		*sh, *sh2;
+	shadertext_t	*sht;
+	qhandle_t		h;
 
 	sh = R_FindShaderByName( shaderName );
 	if (sh == NULL || sh == tr.defaultShader) {
@@ -161,12 +162,12 @@ void R_RemapShader(const char *shaderName, const char *newShaderName, const char
 	// even tho they might have different lightmaps
 	COM_StripExtension(shaderName, strippedName, sizeof(strippedName));
 	hash = generateHashValue(strippedName);
-	for (sh = hashTable[hash]; sh; sh = sh->next) {
+	for (sht = hashTable[hash]; sht; sht = sht->next) {
 		if (Q_stricmp(sh->name, strippedName) == 0) {
-			if (sh != sh2) {
-				sh->remappedShader = sh2;
+			if (sht->shader != sh2) {
+				sht->shader->remappedShader = sh2;
 			} else {
-				sh->remappedShader = NULL;
+				sht->shader->remappedShader = NULL;
 			}
 		}
 	}
@@ -3288,9 +3289,9 @@ default shader if the real one can't be found.
 ==================
 */
 shader_t *R_FindShaderByName( const char *name ) {
-	char		strippedName[MAX_QPATH];
-	int			hash;
-	shader_t	*sh;
+	char			strippedName[MAX_QPATH];
+	int				hash;
+	shadertext_t	*sh;
 
 	if ( (name==NULL) || (name[0] == 0) ) {
 		return tr.defaultShader;
@@ -3310,7 +3311,7 @@ shader_t *R_FindShaderByName( const char *name ) {
 		// with that same strippedName a new default shader is created.
 		if (Q_stricmp(sh->name, strippedName) == 0) {
 			// match found
-			return sh;
+			return sh->shader;
 		}
 	}
 

From 78cd0cf28be7e966ae9feedccccaece01d0c7858 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Dec 2024 13:45:18 +0100
Subject: [PATCH 1729/2040] Prevent firing weapon if there is a weapon command

This prevent tricks like firing and dropping weapon to shoot silently
---
 code/fgame/player.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index b94ac4f5..0725b080 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -11687,6 +11687,13 @@ void Player::FireWeapon(int number, firemode_t mode)
         return;
     }
 
+    if ((last_ucmd.buttons & WEAPON_COMMAND_MASK) >> 7) {
+        // Added in OPM
+        //  If there is a weapon command (like DROP), then remove don't fire
+        //  this prevent tricky behaviors, like silent firing
+        return;
+    }
+
     Sentient::FireWeapon(number, mode);
 
     if (g_gametype->integer != GT_SINGLE_PLAYER) {

From 4ec10af1fd64648a6ca636d24d06f30466b7a45a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:43:41 +0100
Subject: [PATCH 1730/2040] Fix private message not working

---
 code/cgame/cg_ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/cgame/cg_ui.cpp b/code/cgame/cg_ui.cpp
index 3adf953b..c884fc97 100644
--- a/code/cgame/cg_ui.cpp
+++ b/code/cgame/cg_ui.cpp
@@ -120,7 +120,7 @@ void CG_MessageSingleClient_f(void)
 
         // copy the rest
         for (i = 2; i < cgi.Argc(); i++) {
-            sString += va("%s", cgi.Argv(i));
+            sString += va(" %s", cgi.Argv(i));
         }
 
         sString += "\n";

From 2656000ce4fd8d6d9cc43e250cefd7b6345d66f2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:45:15 +0100
Subject: [PATCH 1731/2040] Print chat message from the game module instead of
 the server

---
 code/fgame/player.cpp   | 26 ++++++++++++++++++++++++++
 code/server/sv_client.c | 14 ++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0725b080..355976b4 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10783,10 +10783,29 @@ void Player::EventDMMessage(Event *ev)
         return;
     }
 
+    //
+    // Added in OPM
+    //=============
+    // Print the dm message to console
+    sToken = "";
+
+    for (i = 2; i <= ev->NumArgs(); i++) {
+        if (i != 2) {
+            sToken += " ";
+        }
+
+        sToken += ev->GetString(i);
+    }
+    //=============
+
     if (iMode == 0) {
         //
         // everyone
         //
+
+        // Added in OPM
+        gi.Printf("%s (%zu) says to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+
         if (!IsSpectator() || g_spectate_allow_full_chat->integer) {
             for (i = 0; i < game.maxclients; i++) {
                 ent = &g_entities[i];
@@ -10831,6 +10850,10 @@ void Player::EventDMMessage(Event *ev)
         //
         // team message
         //
+
+        // Added in OPM
+        gi.Printf("%s (%zu) says to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+
         if (IsSpectator()) {
             for (i = 0; i < game.maxclients; i++) {
                 ent = &g_entities[i];
@@ -10890,6 +10913,9 @@ void Player::EventDMMessage(Event *ev)
             return;
         }
 
+        // Added in OPM
+        gi.Printf("%s (%zu) says to client #%d: %s\n", client->pers.netname, edict - g_entities, iMode - 1, sToken.c_str());
+
         gi.SendServerCommand(iMode - 1, "%s", szPrintString);
 
         if (ent->entity != this) {
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index dce9288e..da97fd94 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -1641,12 +1641,14 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 		}
 	}
 
-	// Added in 1.11 MAC server
-	//  Display chat messages
-	//  NOTE: this should be handled by fgame, not server
-	if (!Q_stricmp(Cmd_Argv(0), "dmmessage")) {
-		Com_Printf("%s (%zu): %s", cl->name, (size_t)(cl - svs.clients), s);
-	}
+	// Removed in OPM
+	//  Message printing is now handled by fgame
+    //// Added in 1.11 MAC server
+    ////  Display chat messages
+    ////  NOTE: this should be handled by fgame, not server
+    ////if (!Q_stricmp(Cmd_Argv(0), "dmmessage")) {
+    ////	Com_Printf("%s (%zu): %s", cl->name, (size_t)(cl - svs.clients), s);
+    ////}
 
 	if (clientOK) {
 		// pass unknown strings to the game

From 51a2f7d479706496fa5c8f7d0a73c86fcc6249a3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 00:55:29 +0100
Subject: [PATCH 1732/2040] Use an enumeration for weapon commands and a
 function to get the weapon command

This improves clarity for using weapon commands. Also the mask was incorrect for protocol above version 8 (mohaas and mohaab)
---
 code/cgame/cg_consolecmds.c |  2 +-
 code/fgame/g_utils.cpp      |  4 ++++
 code/fgame/g_utils.h        |  1 +
 code/fgame/player.cpp       |  6 ++---
 code/qcommon/q_shared.h     | 47 ++++++++++++++++++++-----------------
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index 03450e46..9ab3817f 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -705,5 +705,5 @@ int CG_WeaponCommandButtonBits(void)
         cg.iWeaponCommand = 0;
     }
 
-    return iShiftedWeaponCommand & WEAPON_COMMAND_MASK;
+    return iShiftedWeaponCommand & GetWeaponCommandMask(cg_protocol >= PROTOCOL_MOHTA_MIN ? WEAPON_COMMAND_MAX_VER17 : WEAPON_COMMAND_MAX_VER6);
 }
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 45b1b3c6..c7ed568e 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -2452,3 +2452,7 @@ gentity_t *G_GetGEntity(int ent_num)
 
     return ent;
 }
+
+unsigned int G_GetWeaponCommand(unsigned int buttons) {
+    return GetWeaponCommand(buttons, g_protocol >= PROTOCOL_MOHTA_MIN ? WEAPON_COMMAND_MAX_VER17 : WEAPON_COMMAND_MAX_VER6);
+}
diff --git a/code/fgame/g_utils.h b/code/fgame/g_utils.h
index 649713a6..7d5fb4be 100644
--- a/code/fgame/g_utils.h
+++ b/code/fgame/g_utils.h
@@ -327,3 +327,4 @@ const char  *WeaponHandNumToName(weaponhand_t hand);
 weaponhand_t WeaponHandNameToNum(str side);
 void         G_DebugTargets(Entity *e, str from);
 void         G_DebugDamage(float damage, Entity *victim, Entity *attacker, Entity *inflictor);
+unsigned int G_GetWeaponCommand(unsigned int buttons);
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 355976b4..05b98580 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -4807,7 +4807,7 @@ void Player::Think(void)
     }
 
     if (!IsDead()) {
-        m_iClientWeaponCommand = (server_new_buttons & WEAPON_COMMAND_MASK) >> 7;
+        m_iClientWeaponCommand = G_GetWeaponCommand(server_new_buttons);
 
         switch (m_iClientWeaponCommand) {
         case 0:
@@ -11713,9 +11713,9 @@ void Player::FireWeapon(int number, firemode_t mode)
         return;
     }
 
-    if ((last_ucmd.buttons & WEAPON_COMMAND_MASK) >> 7) {
+    if (G_GetWeaponCommand(last_ucmd.buttons)) {
         // Added in OPM
-        //  If there is a weapon command (like DROP), then remove don't fire
+        //  If there is a weapon command (like DROP), then just don't fire
         //  this prevent tricky behaviors, like silent firing
         return;
     }
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 2eb7d3f0..15dde8ed 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1840,30 +1840,35 @@ typedef struct playerState_s {
 #define	BUTTON_ANY			   (1 << BUTTON_ANY_BITINDEX)		   // any key whatsoever
 #define BUTTON_MOUSE           (1 << BUTTON_MOUSE_BITINDEX)
 
-#define WEAPON_COMMAND_USE_PISTOL               1
-#define WEAPON_COMMAND_USE_RIFLE                2
-#define WEAPON_COMMAND_USE_SMG                  3
-#define WEAPON_COMMAND_USE_MG                   4
-#define WEAPON_COMMAND_USE_GRENADE              5
-#define WEAPON_COMMAND_USE_HEAVY                6
-#define WEAPON_COMMAND_USE_ITEM1                7
-#define WEAPON_COMMAND_USE_ITEM2                8
-#define WEAPON_COMMAND_USE_ITEM3                9
-#define WEAPON_COMMAND_USE_ITEM4                10
-#define WEAPON_COMMAND_USE_PREV_WEAPON          11
-#define WEAPON_COMMAND_USE_NEXT_WEAPON          12
-#define WEAPON_COMMAND_USE_LAST_WEAPON          13
-#define WEAPON_COMMAND_HOLSTER                  14
-#define WEAPON_COMMAND_DROP                     15
+typedef enum {
+    WEAPON_COMMAND_NONE,
+	WEAPON_COMMAND_USE_PISTOL,
+	WEAPON_COMMAND_USE_RIFLE,
+	WEAPON_COMMAND_USE_SMG,
+	WEAPON_COMMAND_USE_MG,
+	WEAPON_COMMAND_USE_GRENADE,
+	WEAPON_COMMAND_USE_HEAVY,
+	WEAPON_COMMAND_USE_ITEM1,
+	WEAPON_COMMAND_USE_ITEM2,
+	WEAPON_COMMAND_USE_ITEM3,
+	WEAPON_COMMAND_USE_ITEM4,
+    WEAPON_COMMAND_USE_PREV_WEAPON,
+    WEAPON_COMMAND_USE_NEXT_WEAPON,
+    WEAPON_COMMAND_USE_LAST_WEAPON,
+	WEAPON_COMMAND_HOLSTER,
+    WEAPON_COMMAND_DROP,
+} weaponcommand_t;
 
-#if TARGET_GAME_PROTOCOL >= 15
-#define WEAPON_COMMAND_MAX						31
-#else
-#define WEAPON_COMMAND_MAX						15
-#endif
+#define WEAPON_COMMAND_MAX_VER6		15
+#define WEAPON_COMMAND_MAX_VER17	31
 
-#define WEAPON_COMMAND_MASK						(WEAPON_COMMAND_MAX << 7)
+static unsigned int GetWeaponCommandMask(unsigned int maxCmds) {
+	return maxCmds << 7;
+}
 
+static unsigned int GetWeaponCommand(unsigned int buttons, unsigned int maxCmds) {
+    return (buttons & (maxCmds << 7)) >> 7;
+}
 
 #define	MOVE_RUN			120			// if forwardmove or rightmove are >= MOVE_RUN,
 										// then BUTTON_WALKING should be set

From 04b1e88077c7c29704e9ed5b127386475ff22521 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:12:37 +0100
Subject: [PATCH 1733/2040] Clamp r_subdivisions value

---
 code/renderergl1/tr_init.c | 30 ++++--------------------------
 code/renderergl2/tr_init.c |  2 ++
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index fa6742be..d2a850df 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -275,29 +275,6 @@ cvar_t* r_fps;
 
 static char infostring[8192];
 
-static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
-{
-	if ( shouldBeIntegral )
-	{
-		if ( ( int ) cv->value != cv->integer )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' must be integral (%f)\n", cv->name, cv->value );
-			ri.Cvar_Set( cv->name, va( "%d", cv->integer ) );
-		}
-	}
-
-	if ( cv->value < minVal )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f < %f)\n", cv->name, cv->value, minVal );
-		ri.Cvar_Set( cv->name, va( "%f", minVal ) );
-	}
-	else if ( cv->value > maxVal )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f > %f)\n", cv->name, cv->value, maxVal );
-		ri.Cvar_Set( cv->name, va( "%f", maxVal ) );
-	}
-}
-
 
 /*
 ** InitOpenGL
@@ -1362,7 +1339,7 @@ void R_Register( void )
 	
 	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
-	AssertCvarRange( r_picmip, 0, 16, qtrue );
+	ri.Cvar_CheckRange( r_picmip, 0, 16, qtrue );
 	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
 	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
@@ -1397,12 +1374,13 @@ void R_Register( void )
 	r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
 	r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
+	ri.Cvar_CheckRange(r_subdivisions, 2, 24, qtrue);
 
 	//
 	// temporary latched variables that can only change over a restart
 	//
 	r_displayRefresh = ri.Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH );
-	AssertCvarRange( r_displayRefresh, 0, 200, qtrue );
+	ri.Cvar_CheckRange( r_displayRefresh, 0, 200, qtrue );
 	r_fullbright = ri.Cvar_Get ("r_fullbright", "0", CVAR_LATCH|CVAR_CHEAT );
 	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "1", CVAR_LATCH );
 	r_intensity = ri.Cvar_Get ("r_intensity", "1", CVAR_LATCH );
@@ -1416,7 +1394,7 @@ void R_Register( void )
 	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE|CVAR_CHEAT );
 	r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE );
 	r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT );
-	AssertCvarRange( r_znear, 0.001f, 200, qtrue );
+	ri.Cvar_CheckRange( r_znear, 0.001f, 200, qtrue );
 	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
 	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", 0 );
 	r_fastdlights = ri.Cvar_Get("r_fastdlights", "1", CVAR_ARCHIVE | CVAR_LATCH);
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index d22132fb..23c08daa 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -1558,6 +1558,8 @@ void R_Register( void )
 	// OPENMOHAA-specific stuff
 	//
 
+	ri.Cvar_CheckRange(r_subdivisions, 2, 24, qtrue);
+
 	// Draw
 
     r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);

From e0dee1257836def1b5ccbfa4806be614f9a9b0fd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:14:17 +0100
Subject: [PATCH 1734/2040] Clamp LOD terrain values

---
 code/renderergl1/tr_terrain.c | 23 ++++++++++++++++-------
 code/renderergl2/tr_terrain.c | 23 ++++++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index ba16191c..9b8a59ee 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -1336,7 +1336,8 @@ void R_AddTerrainSurfaces()
 
             if (ter_count->integer && (g_nSplit || g_nMerge)) {
                 if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
-                    ri.Printf(PRINT_DEVELOPER, 
+                    ri.Printf(
+                        PRINT_DEVELOPER,
                         "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
                         g_nTris - g_tri.nFree,
                         g_nVerts - g_vert.nFree,
@@ -1626,13 +1627,21 @@ void R_InitTerrain()
 {
     int i;
 
-    ter_maxlod         = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
-    ter_cull           = ri.Cvar_Get("ter_cull", "1", 0);
-    ter_lock           = ri.Cvar_Get("ter_lock", "0", 0);
-    ter_error          = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ter_maxlod = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxlod, 3, 6, qtrue);
+
+    ter_cull = ri.Cvar_Get("ter_cull", "1", 0);
+    ter_lock = ri.Cvar_Get("ter_lock", "0", CVAR_CHEAT);
+
+    ter_error = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ri.Cvar_CheckRange(ter_error, 0.1, 16, qfalse);
+
     ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
-    ter_maxtris        = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
-    ter_count          = ri.Cvar_Get("ter_count", "0", 0);
+
+    ter_maxtris = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxtris, 16384, 65536, qtrue);
+
+    ter_count = ri.Cvar_Get("ter_count", "0", 0);
 
     ri.Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
     R_PreTessellateTerrain();
diff --git a/code/renderergl2/tr_terrain.c b/code/renderergl2/tr_terrain.c
index 4afb2989..7b35f992 100644
--- a/code/renderergl2/tr_terrain.c
+++ b/code/renderergl2/tr_terrain.c
@@ -1336,7 +1336,8 @@ void R_AddTerrainSurfaces()
 
             if (ter_count->integer && (g_nSplit || g_nMerge)) {
                 if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
-                    ri.Printf(PRINT_DEVELOPER, 
+                    ri.Printf(
+                        PRINT_DEVELOPER,
                         "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
                         g_nTris - g_tri.nFree,
                         g_nVerts - g_vert.nFree,
@@ -1626,13 +1627,21 @@ void R_InitTerrain()
 {
     int i;
 
-    ter_maxlod         = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
-    ter_cull           = ri.Cvar_Get("ter_cull", "1", 0);
-    ter_lock           = ri.Cvar_Get("ter_lock", "0", 0);
-    ter_error          = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ter_maxlod = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxlod, 3, 6, qtrue);
+
+    ter_cull = ri.Cvar_Get("ter_cull", "1", 0);
+    ter_lock = ri.Cvar_Get("ter_lock", "0", CVAR_CHEAT);
+
+    ter_error = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ri.Cvar_CheckRange(ter_error, 0, 16, qtrue);
+
     ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
-    ter_maxtris        = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
-    ter_count          = ri.Cvar_Get("ter_count", "0", 0);
+
+    ter_maxtris = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxtris, 16384, 65536, qtrue);
+
+    ter_count = ri.Cvar_Get("ter_count", "0", 0);
 
     ri.Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
     R_PreTessellateTerrain();

From 716a574abecf05d5ced5f5df0d02d20827b17959 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:46:37 +0100
Subject: [PATCH 1735/2040] Clean up terrain when shutting the Ref down

---
 code/renderergl1/tr_bsp.c     |  4 ++--
 code/renderergl1/tr_init.c    |  4 ++++
 code/renderergl1/tr_local.h   |  2 ++
 code/renderergl1/tr_terrain.c | 40 +++++++++++++++++++++++++++-------
 code/renderergl2/tr_init.c    | 18 +++++++++++++++
 code/renderergl2/tr_local.h   |  2 ++
 code/renderergl2/tr_terrain.c | 41 +++++++++++++++++++++++++++--------
 7 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 2d224037..b0bf884a 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -630,8 +630,8 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int
     numPoints = LittleLong( ds->numVerts );
     if (numPoints > MAX_FACE_POINTS) {
         ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
-    numPoints = MAX_FACE_POINTS;
-    surf->shader = tr.defaultShader;
+        numPoints = MAX_FACE_POINTS;
+        surf->shader = tr.defaultShader;
     }
 
     numIndexes = LittleLong( ds->numIndexes );
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index d2a850df..4a818ada 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -1754,6 +1754,8 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
 	R_ShutdownFont();
 
+	R_ShutdownTerrain();
+
 	tr.registered = qfalse;
 }
 
@@ -1770,6 +1772,8 @@ void RE_BeginRegistration(glconfig_t* glconfigOut) {
 	R_IssuePendingRenderCommands();
 
 	R_LevelMarksFree();
+	R_TerrainFree();
+
 	ri.Hunk_Clear();
 
 	*glconfigOut = glConfig;
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index a4ec1b53..66cb029d 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -2182,6 +2182,8 @@ void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
 void R_AddTerrainSurfaces();
 void R_AddTerrainMarkSurfaces();
 void R_InitTerrain();
+void R_ShutdownTerrain();
+void R_TerrainFree();
 void R_TerrainPrepareFrame();
 qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
 void R_SwapTerraPatch(cTerraPatch_t* pPatch);
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index 9b8a59ee..4dc75097 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -1490,14 +1490,7 @@ void R_TerrainRestart_f(void)
         return;
     }
 
-    if (g_pVert) {
-        ri.Free(g_pVert);
-        g_pVert = NULL;
-    }
-    if (g_pTris) {
-        ri.Free(g_pTris);
-        g_pTris = NULL;
-    }
+    R_TerrainFree();
 
     R_PreTessellateTerrain();
 }
@@ -1654,6 +1647,37 @@ void R_InitTerrain()
     }
 }
 
+/*
+================
+R_ShutdownTerrain
+================
+*/
+void R_ShutdownTerrain()
+{
+    ri.Cmd_RemoveCommand("ter_restart");
+
+    R_TerrainFree();
+}
+
+/*
+================
+R_TerrainFree
+
+Frees terrain memory
+================
+*/
+void R_TerrainFree()
+{
+    if (g_pVert) {
+        ri.Free(g_pVert);
+        g_pVert = NULL;
+    }
+    if (g_pTris) {
+        ri.Free(g_pTris);
+        g_pTris = NULL;
+    }
+}
+
 /*
 ====================
 R_SwapTerraPatch
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 23c08daa..32ba6917 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -1836,6 +1836,12 @@ void RE_Shutdown( qboolean destroyWindow ) {
 		Com_Memset( &glState, 0, sizeof( glState ) );
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    R_ShutdownTerrain();
+    //=========================
+
 	tr.registered = qfalse;
 }
 
@@ -1858,6 +1864,18 @@ void RE_BeginRegistration(glconfig_t* glconfigOut) {
     R_ClearFlares();
     RE_ClearScene();
 
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    R_LevelMarksFree();
+    R_TerrainFree();
+
+    R_InitLensFlare();
+    R_LevelMarksInit();
+
+    ri.UI_LoadResource("*124");
+	//=========================
+
     tr.registered = qtrue;
 }
 //=========================
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 8dd394bd..84730a46 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -3174,6 +3174,8 @@ void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
 void R_AddTerrainSurfaces();
 void R_AddTerrainMarkSurfaces();
 void R_InitTerrain();
+void R_ShutdownTerrain();
+void R_TerrainFree();
 void R_TerrainPrepareFrame();
 qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
 void R_SwapTerraPatch(cTerraPatch_t* pPatch);
diff --git a/code/renderergl2/tr_terrain.c b/code/renderergl2/tr_terrain.c
index 7b35f992..b8fa1f86 100644
--- a/code/renderergl2/tr_terrain.c
+++ b/code/renderergl2/tr_terrain.c
@@ -1489,15 +1489,8 @@ void R_TerrainRestart_f(void)
     if (tr.world->numTerraPatches < 0) {
         return;
     }
-
-    if (g_pVert) {
-        ri.Free(g_pVert);
-        g_pVert = NULL;
-    }
-    if (g_pTris) {
-        ri.Free(g_pTris);
-        g_pTris = NULL;
-    }
+    
+    R_TerrainFree();
 
     R_PreTessellateTerrain();
 }
@@ -1654,6 +1647,36 @@ void R_InitTerrain()
     }
 }
 
+/*
+================
+R_ShutdownTerrain
+================
+*/
+void R_ShutdownTerrain()
+{
+    ri.Cmd_RemoveCommand("ter_restart");
+
+    R_TerrainFree();
+}
+/*
+================
+R_TerrainFree
+
+Frees terrain memory
+================
+*/
+void R_TerrainFree()
+{
+    if (g_pVert) {
+        ri.Free(g_pVert);
+        g_pVert = NULL;
+    }
+    if (g_pTris) {
+        ri.Free(g_pTris);
+        g_pTris = NULL;
+    }
+}
+
 /*
 ====================
 R_SwapTerraPatch

From 18a365893558e1a40bfc74e5ec7fd62539522015 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 19:18:20 +0100
Subject: [PATCH 1736/2040] Ignore fast path if the drawsurf is a sprite

---
 code/renderergl1/tr_backend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl1/tr_backend.c b/code/renderergl1/tr_backend.c
index 2e6f2a2a..ef3f1961 100644
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
@@ -722,7 +722,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	backEnd.numSpheresUsed = 0;
 
 	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
-		if ( drawSurf->sort == oldSort ) {
+		if ( drawSurf->sort == oldSort && *drawSurf->surface != SF_SPRITE ) {
 			// fast path, same as previous sort
 			rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 			continue;

From aa9847cf900d6ea0463e87b82c0fc9f79d16426e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 19:18:54 +0100
Subject: [PATCH 1737/2040] Use clean Radix sort code from ioquake3 to sort
 draw surfaces

---
 code/renderergl1/tr_main.c | 234 +++++++------------------------------
 1 file changed, 45 insertions(+), 189 deletions(-)

diff --git a/code/renderergl1/tr_main.c b/code/renderergl1/tr_main.c
index 240e321c..43063bd2 100644
--- a/code/renderergl1/tr_main.c
+++ b/code/renderergl1/tr_main.c
@@ -1141,201 +1141,57 @@ DRAWSURF SORTING
 ==========================================================================================
 */
 
-static void SwapDrawSurf(drawSurf_t* a, drawSurf_t* b) {
-	drawSurf_t temp = *a;
-	*a = *b;
-	*b = temp;
+/*
+===============
+R_Radix
+===============
+*/
+static ID_INLINE void R_Radix( int byte, int size, drawSurf_t *source, drawSurf_t *dest )
+{
+  int           count[ 256 ] = { 0 };
+  int           index[ 256 ];
+  int           i;
+  unsigned char *sortKey = NULL;
+  unsigned char *end = NULL;
+
+  sortKey = ( (unsigned char *)&source[ 0 ].sort ) + byte;
+  end = sortKey + ( size * sizeof( drawSurf_t ) );
+  for( ; sortKey < end; sortKey += sizeof( drawSurf_t ) )
+    ++count[ *sortKey ];
+
+  index[ 0 ] = 0;
+
+  for( i = 1; i < 256; ++i )
+    index[ i ] = index[ i - 1 ] + count[ i - 1 ];
+
+  sortKey = ( (unsigned char *)&source[ 0 ].sort ) + byte;
+  for( i = 0; i < size; ++i, sortKey += sizeof( drawSurf_t ) )
+    dest[ index[ *sortKey ]++ ] = source[ i ];
 }
 
 /*
-=================
-qsort replacement
+===============
+R_RadixSort
 
-=================
+Radix sort with 4 byte size buckets
+===============
 */
-//#define	SWAP_DRAW_SURF(a,b) temp=((int *)a)[0];((int *)a)[0]=((int *)b)[0];((int *)b)[0]=temp; temp=((int *)a)[1];((int *)a)[1]=((int *)b)[1];((int *)b)[1]=temp;
-
-/* this parameter defines the cutoff between using quick sort and
-   insertion sort for arrays; arrays with lengths shorter or equal to the
-   below value use insertion sort */
-
-#define CUTOFF 8            /* testing shows that this is good value */
-
-static void shortsort( drawSurf_t *lo, drawSurf_t *hi ) {
-    drawSurf_t	*p, *max;
-	int			temp;
-
-    while (hi > lo) {
-        max = lo;
-        for (p = lo + 1; p <= hi; p++ ) {
-            if ( p->sort > max->sort ) {
-                max = p;
-            }
-        }
-		SwapDrawSurf(max, hi);
-        hi--;
-    }
-}
-
-
-/* sort the array between lo and hi (inclusive)
-FIXME: this was lifted and modified from the microsoft lib source...
- */
-
-void qsortFast (
-    void *base,
-    unsigned num,
-    unsigned width
-    )
+static void R_RadixSort( drawSurf_t *source, int size )
 {
-    char *lo, *hi;              /* ends of sub-array currently sorting */
-    char *mid;                  /* points to middle of subarray */
-    char *loguy, *higuy;        /* traveling pointers for partition step */
-    unsigned size;              /* size of the sub-array */
-    char *lostk[30], *histk[30];
-    int stkptr;                 /* stack for saving sub-array to be processed */
-	int	temp;
-
-    /* Note: the number of stack entries required is no more than
-       1 + log2(size), so 30 is sufficient for any array */
-
-    if (num < 2 || width == 0)
-        return;                 /* nothing to do */
-
-    stkptr = 0;                 /* initialize stack */
-
-    lo = base;
-    hi = (char *)base + width * (num-1);        /* initialize limits */
-
-    /* this entry point is for pseudo-recursion calling: setting
-       lo and hi and jumping to here is like recursion, but stkptr is
-       prserved, locals aren't, so we preserve stuff on the stack */
-recurse:
-
-    size = (hi - lo) / width + 1;        /* number of el's to sort */
-
-    /* below a certain size, it is faster to use a O(n^2) sorting method */
-    if (size <= CUTOFF) {
-         shortsort((drawSurf_t *)lo, (drawSurf_t *)hi);
-    }
-    else {
-        /* First we pick a partititioning element.  The efficiency of the
-           algorithm demands that we find one that is approximately the
-           median of the values, but also that we select one fast.  Using
-           the first one produces bad performace if the array is already
-           sorted, so we use the middle one, which would require a very
-           wierdly arranged array for worst case performance.  Testing shows
-           that a median-of-three algorithm does not, in general, increase
-           performance. */
-
-        mid = lo + (size / 2) * width;                   /* find middle element */
-		SwapDrawSurf((drawSurf_t*)mid, (drawSurf_t*)lo);  /* swap it to beginning of array */
-
-        /* We now wish to partition the array into three pieces, one
-           consisiting of elements <= partition element, one of elements
-           equal to the parition element, and one of element >= to it.  This
-           is done below; comments indicate conditions established at every
-           step. */
-
-        loguy = lo;
-        higuy = hi + width;
-
-        /* Note that higuy decreases and loguy increases on every iteration,
-           so loop must terminate. */
-        for (;;) {
-            /* lo <= loguy < hi, lo < higuy <= hi + 1,
-               A[i] <= A[lo] for lo <= i <= loguy,
-               A[i] >= A[lo] for higuy <= i <= hi */
-
-            do  {
-                loguy += width;
-            } while (loguy <= hi &&  
-				( ((drawSurf_t *)loguy)->sort <= ((drawSurf_t *)lo)->sort ) );
-
-            /* lo < loguy <= hi+1, A[i] <= A[lo] for lo <= i < loguy,
-               either loguy > hi or A[loguy] > A[lo] */
-
-            do  {
-                higuy -= width;
-            } while (higuy > lo && 
-				( ((drawSurf_t *)higuy)->sort >= ((drawSurf_t *)lo)->sort ) );
-
-            /* lo-1 <= higuy <= hi, A[i] >= A[lo] for higuy < i <= hi,
-               either higuy <= lo or A[higuy] < A[lo] */
-
-            if (higuy < loguy)
-                break;
-
-            /* if loguy > hi or higuy <= lo, then we would have exited, so
-               A[loguy] > A[lo], A[higuy] < A[lo],
-               loguy < hi, highy > lo */
-
-			SwapDrawSurf((drawSurf_t*)loguy, (drawSurf_t*)higuy);
-
-            /* A[loguy] < A[lo], A[higuy] > A[lo]; so condition at top
-               of loop is re-established */
-        }
-
-        /*     A[i] >= A[lo] for higuy < i <= hi,
-               A[i] <= A[lo] for lo <= i < loguy,
-               higuy < loguy, lo <= higuy <= hi
-           implying:
-               A[i] >= A[lo] for loguy <= i <= hi,
-               A[i] <= A[lo] for lo <= i <= higuy,
-               A[i] = A[lo] for higuy < i < loguy */
-
-		SwapDrawSurf((drawSurf_t*)lo, (drawSurf_t*)higuy);     /* put partition element in place */
-
-        /* OK, now we have the following:
-              A[i] >= A[higuy] for loguy <= i <= hi,
-              A[i] <= A[higuy] for lo <= i < higuy
-              A[i] = A[lo] for higuy <= i < loguy    */
-
-        /* We've finished the partition, now we want to sort the subarrays
-           [lo, higuy-1] and [loguy, hi].
-           We do the smaller one first to minimize stack usage.
-           We only sort arrays of length 2 or more.*/
-
-        if ( higuy - 1 - lo >= hi - loguy ) {
-            if (lo + width < higuy) {
-                lostk[stkptr] = lo;
-                histk[stkptr] = higuy - width;
-                ++stkptr;
-            }                           /* save big recursion for later */
-
-            if (loguy < hi) {
-                lo = loguy;
-                goto recurse;           /* do small recursion */
-            }
-        }
-        else {
-            if (loguy < hi) {
-                lostk[stkptr] = loguy;
-                histk[stkptr] = hi;
-                ++stkptr;               /* save big recursion for later */
-            }
-
-            if (lo + width < higuy) {
-                hi = higuy - width;
-                goto recurse;           /* do small recursion */
-            }
-        }
-    }
-
-    /* We have sorted the array, except for any pending sorts on the stack.
-       Check if there are any, and do them. */
-
-    --stkptr;
-    if (stkptr >= 0) {
-        lo = lostk[stkptr];
-        hi = histk[stkptr];
-        goto recurse;           /* pop subarray from stack */
-    }
-    else
-        return;                 /* all subarrays done */
+  static drawSurf_t scratch[ MAX_DRAWSURFS ];
+#ifdef Q3_LITTLE_ENDIAN
+  R_Radix( 0, size, source, scratch );
+  R_Radix( 1, size, scratch, source );
+  R_Radix( 2, size, source, scratch );
+  R_Radix( 3, size, scratch, source );
+#else
+  R_Radix( 3, size, source, scratch );
+  R_Radix( 2, size, scratch, source );
+  R_Radix( 1, size, source, scratch );
+  R_Radix( 0, size, scratch, source );
+#endif //Q3_LITTLE_ENDIAN
 }
 
-
 //==========================================================================================
 
 /*
@@ -1418,8 +1274,8 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs, drawSurf_t *sprit
     }
 
 	// sort the drawsurfs by sort type, then orientation, then shader
-	qsortFast (drawSurfs, numDrawSurfs, sizeof(drawSurf_t) );
-	qsortFast (spriteSurfs, numSpriteSurfs, sizeof(drawSurf_t) );
+	R_RadixSort (drawSurfs, numDrawSurfs );
+	R_RadixSort (spriteSurfs, numSpriteSurfs );
 
 	R_Sky_Render();
 

From d83ad43b0bd8c2922107f0c4afa84f17f47b5765 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 30 Dec 2024 20:24:49 +0100
Subject: [PATCH 1738/2040] Fix FPS model not being set correctly to match the
 world model

---
 code/cgame/cg_modelanim.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index 2c1145e6..e3d20b4e 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -1200,7 +1200,9 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
             if (!cg.pLastPlayerWorldModel || cg.pLastPlayerWorldModel != model.tiki) {
                 qhandle_t hModel;
                 char      fpsname[128];
+
                 COM_StripExtension(model.tiki->a->name, fpsname, sizeof(fpsname));
+                Q_strcat(fpsname, sizeof(fpsname), "_fps.tik");
 
                 hModel = cgi.R_RegisterModel(fpsname);
                 if (hModel) {

From f4a412cc2493b05042b6301e57bab2f2345eb313 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 31 Dec 2024 13:04:33 +0100
Subject: [PATCH 1739/2040] Fix reverb toggle at runtime even if reverb is
 unimplemented

---
 code/client/snd_openal_new.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 11324874..07258952 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -599,6 +599,7 @@ qboolean S_OPENAL_Init()
             Com_Printf("OpenAL: No reverb support. Reverb is disabled.\n");
         }
     }
+    s_reverb->modified = false;
 
     al_current_volume = Square(s_volume->value);
     qalListenerf(AL_GAIN, al_current_volume);
@@ -2401,7 +2402,10 @@ S_OPENAL_reverb
 */
 static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel)
 {
-    // No reverb.
+    // FIXME: Connect source to effect slot
+    //  see https://github.com/kcat/openal-soft/blob/master/examples/alreverb.c
+
+    // No reverb currently.
 }
 
 /*
@@ -2416,6 +2420,10 @@ void S_OPENAL_SetReverb(int iType, float fLevel)
     if (al_use_reverb) {
         s_bReverbChanged = true;
     }
+
+    // FIXME: generate effect and auxiliary effect slot
+    //  or destroy them
+    //  see https://github.com/kcat/openal-soft/blob/master/examples/alreverb.c
 }
 
 /*
@@ -2487,7 +2495,16 @@ void S_OPENAL_Update()
 
     if (s_reverb->modified) {
         s_reverb->modified = false;
-        Com_Printf("FIXME: Allow reverb toggle at runtime in OpenAL code.\n");
+
+        if (s_reverb->integer) {
+            if (al_use_reverb) {
+                S_OPENAL_SetReverb(s_iReverbType, s_fReverbLevel);
+            } else {
+                Com_Printf("OpenAL: No reverb support. Reverb is disabled.\n");
+            }
+        } else if (al_use_reverb) {
+            S_OPENAL_SetReverb(0, 0);
+        }
     }
 
     if (s_show_num_active_sounds->integer == 1) {

From b16aaa5adc76e08f65f0cce055d91cb2c27b7a69 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 Jan 2025 12:40:59 +0100
Subject: [PATCH 1740/2040] Use a scripted object to store the C file handle
 for file functions

---
 code/fgame/scriptthread.cpp | 288 ++++++++++++++++++++----------------
 code/fgame/scriptthread.h   |  17 ++-
 2 files changed, 175 insertions(+), 130 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 5de1693b..1325b214 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2496,7 +2496,7 @@ void ScriptThread::Getcvar(Event *ev)
     str s       = gi.Cvar_Get(varName.c_str(), "", 0)->string;
 
     if (strstr(s.c_str(), ".")) {
-        for (int i = s.length() - 1; i >= 0; i--) {
+        for (size_t i = s.length() - 1; i >= 0; i--) {
             if (s[i] == '0') {
                 s[i] = 0;
             } else {
@@ -4093,7 +4093,7 @@ void ScriptThread::EventRadiusDamage(Event *ev)
 
 void ScriptThread::EventBspTransition(Event *ev)
 {
-    str map = ev->GetString(1);
+    str  map      = ev->GetString(1);
     bool skipFade = false;
 
     if (ev->NumArgs() >= 2) {
@@ -4203,12 +4203,12 @@ void ScriptThread::EventPointsWithinDist(Event *ev)
 {
     Vector delta;
     Vector v1, v2;
-    float fDistance;
-   
-    v1 = ev->GetVector(1);
-    v2 = ev->GetVector(2);
+    float  fDistance;
+
+    v1        = ev->GetVector(1);
+    v2        = ev->GetVector(2);
     fDistance = ev->GetFloat(3);
-    delta = v1 - v2;
+    delta     = v1 - v2;
 
     // check squared distance
     ev->AddInteger(delta.lengthSquared() < Square(fDistance));
@@ -5361,15 +5361,15 @@ void ScriptThread::FileOpen(Event *ev)
 
     f = fopen(filename, accesstype);
 
-    if (f == NULL) {
-        ev->AddInteger(0);
-        return;
-    } else {
-        ev->AddInteger((int)(size_t)f);
-        Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer + 1);
-        gi.cvar_set("sv_scriptfiles", buf);
+    if (!f) {
+        ev->AddNil();
         return;
     }
+
+    ev->AddListener(new OSFile(f));
+
+    Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer + 1);
+    gi.cvar_set("sv_scriptfiles", buf);
 }
 
 void ScriptThread::FileWrite(Event *ev) {}
@@ -5378,11 +5378,10 @@ void ScriptThread::FileRead(Event *ev) {}
 
 void ScriptThread::FileClose(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
-    char  buf[16] = {0};
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    FILE   *f       = NULL;
+    char    buf[16] = {0};
 
     numArgs = ev->NumArgs();
 
@@ -5390,57 +5389,30 @@ void ScriptThread::FileClose(Event *ev)
         throw ScriptException("Wrong arguments count for fclose!\n");
     }
 
-    id = ev->GetInteger(1);
-
-    /*if( (int)scriptFiles[0].f != id && (int)scriptFiles[1].f != id )
-    {
-    gi.Printf("Wrong file handle for fclose!\n");
-    return;
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
     }
 
-    if( (int)scriptFiles[0].f == id )
-    {
-    scriptFiles[0].inUse = 0;
-    fclose( scriptFiles[0].f );
-    return;
-    }
-    else if( (int)scriptFiles[1].f == id )
-    {
-    scriptFiles[1].inUse = 0;
-    fclose( scriptFiles[1].f );
-    return;
-    }
-    else
-    {
-    gi.Printf("Unknown error while closing file - fclose!\n");
-    return;
-    }*/
-
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     if (f == NULL) {
         throw ScriptException("File handle is NULL for fclose!\n");
     }
 
-    ret = fclose(f);
+    // delete the file object
+    delete osFile;
 
-    if (ret == 0) {
-        ev->AddInteger(0);
-        Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer - 1);
-        gi.cvar_set("sv_scriptfiles", buf);
-        return;
-    } else {
-        ev->AddInteger(ret);
-        return;
-    }
+    Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer - 1);
+    gi.cvar_set("sv_scriptfiles", buf);
 }
 
 void ScriptThread::FileEof(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5448,9 +5420,12 @@ void ScriptThread::FileEof(Event *ev)
         throw ScriptException("Wrong arguments count for feof!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = feof(f);
 
@@ -5459,7 +5434,7 @@ void ScriptThread::FileEof(Event *ev)
 
 void ScriptThread::FileSeek(Event *ev)
 {
-    int      id      = 0;
+    OSFile  *osFile  = NULL;
     int      numArgs = 0;
     int      pos     = 0;
     long int offset  = 0;
@@ -5472,9 +5447,12 @@ void ScriptThread::FileSeek(Event *ev)
         throw ScriptException("Wrong arguments count for fseek!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     offset = ev->GetInteger(2);
 
@@ -5495,7 +5473,7 @@ void ScriptThread::FileSeek(Event *ev)
 
 void ScriptThread::FileTell(Event *ev)
 {
-    int      id      = 0;
+    OSFile  *osFile  = NULL;
     int      numArgs = 0;
     long int ret     = 0;
     FILE    *f       = NULL;
@@ -5506,9 +5484,12 @@ void ScriptThread::FileTell(Event *ev)
         throw ScriptException("Wrong arguments count for ftell!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = ftell(f);
 
@@ -5517,7 +5498,7 @@ void ScriptThread::FileTell(Event *ev)
 
 void ScriptThread::FileRewind(Event *ev)
 {
-    int      id      = 0;
+    OSFile  *osFile  = NULL;
     int      numArgs = 0;
     long int ret     = 0;
     FILE    *f       = NULL;
@@ -5528,20 +5509,23 @@ void ScriptThread::FileRewind(Event *ev)
         throw ScriptException("Wrong arguments count for frewind!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     rewind(f);
 }
 
 void ScriptThread::FilePutc(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
-    int   c       = 0;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
+    int     c       = 0;
 
     numArgs = ev->NumArgs();
 
@@ -5549,9 +5533,12 @@ void ScriptThread::FilePutc(Event *ev)
         throw ScriptException("Wrong arguments count for fputc!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     c = ev->GetInteger(2);
 
@@ -5562,11 +5549,11 @@ void ScriptThread::FilePutc(Event *ev)
 
 void ScriptThread::FilePuts(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
-    str   c;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
+    str     c;
 
     numArgs = ev->NumArgs();
 
@@ -5574,9 +5561,12 @@ void ScriptThread::FilePuts(Event *ev)
         throw ScriptException("Wrong arguments count for fputs!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     c = ev->GetString(2);
     //gi.Printf("Putting line into a file\n");
@@ -5587,10 +5577,10 @@ void ScriptThread::FilePuts(Event *ev)
 
 void ScriptThread::FileGetc(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5598,9 +5588,12 @@ void ScriptThread::FileGetc(Event *ev)
         throw ScriptException("Wrong arguments count for fgetc!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = fgetc(f);
 
@@ -5609,12 +5602,12 @@ void ScriptThread::FileGetc(Event *ev)
 
 void ScriptThread::FileGets(Event *ev)
 {
-    int   id       = 0;
-    int   numArgs  = 0;
-    int   maxCount = 0;
-    FILE *f        = NULL;
-    char *c        = NULL;
-    char *buff     = NULL;
+    OSFile *osFile   = NULL;
+    int     numArgs  = 0;
+    int     maxCount = 0;
+    FILE   *f        = NULL;
+    char   *c        = NULL;
+    char   *buff     = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5622,9 +5615,12 @@ void ScriptThread::FileGets(Event *ev)
         throw ScriptException("Wrong arguments count for fgets!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     maxCount = ev->GetInteger(2);
 
@@ -5657,10 +5653,10 @@ void ScriptThread::FileGets(Event *ev)
 
 void ScriptThread::FileError(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5668,9 +5664,12 @@ void ScriptThread::FileError(Event *ev)
         throw ScriptException("Wrong arguments count for ferror!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = ferror(f);
 
@@ -5679,10 +5678,10 @@ void ScriptThread::FileError(Event *ev)
 
 void ScriptThread::FileFlush(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5690,9 +5689,12 @@ void ScriptThread::FileFlush(Event *ev)
         throw ScriptException("Wrong arguments count for fflush!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = fflush(f);
 
@@ -5701,7 +5703,6 @@ void ScriptThread::FileFlush(Event *ev)
 
 void ScriptThread::FileExists(Event *ev)
 {
-    int   id      = 0;
     int   numArgs = 0;
     FILE *f       = 0;
     str   filename;
@@ -5729,13 +5730,13 @@ void ScriptThread::FileExists(Event *ev)
 
 void ScriptThread::FileReadAll(Event *ev)
 {
-    int    id         = 0;
-    int    numArgs    = 0;
-    FILE  *f          = NULL;
-    char  *ret        = NULL;
-    long   currentPos = 0;
-    size_t size       = 0;
-    size_t sizeRead   = 0;
+    OSFile *osFile     = NULL;
+    int     numArgs    = 0;
+    FILE   *f          = NULL;
+    char   *ret        = NULL;
+    long    currentPos = 0;
+    size_t  size       = 0;
+    size_t  sizeRead   = 0;
 
     numArgs = ev->NumArgs();
 
@@ -5743,9 +5744,12 @@ void ScriptThread::FileReadAll(Event *ev)
         throw ScriptException("Wrong arguments count for freadall!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     currentPos = ftell(f);
     fseek(f, 0, SEEK_END);
@@ -5769,11 +5773,11 @@ void ScriptThread::FileReadAll(Event *ev)
 
 void ScriptThread::FileSaveAll(Event *ev)
 {
-    int    id        = 0;
-    int    numArgs   = 0;
-    FILE  *f         = NULL;
-    size_t sizeWrite = 0;
-    str    text;
+    OSFile *osFile    = NULL;
+    int     numArgs   = 0;
+    FILE   *f         = NULL;
+    size_t  sizeWrite = 0;
+    str     text;
 
     numArgs = ev->NumArgs();
 
@@ -5781,8 +5785,12 @@ void ScriptThread::FileSaveAll(Event *ev)
         throw ScriptException("Wrong arguments count for fsaveall!\n");
     }
 
-    id = ev->GetInteger(1);
-    f  = (FILE *)id;
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
+
+    f = (FILE *)osFile->getOSFile();
 
     text = ev->GetString(2);
 
@@ -5798,7 +5806,6 @@ void ScriptThread::FileSaveAll(Event *ev)
 
 void ScriptThread::FileRemove(Event *ev)
 {
-    int id      = 0;
     int numArgs = 0;
     int ret     = 0;
     str filename;
@@ -5822,7 +5829,6 @@ void ScriptThread::FileRemove(Event *ev)
 
 void ScriptThread::FileRename(Event *ev)
 {
-    int id      = 0;
     int numArgs = 0;
     int ret     = 0;
     str oldfilename, newfilename;
@@ -7049,4 +7055,28 @@ void ScriptThread::TraceDetails(Event *ev)
     array.setArrayAtRef(entityIndex, entityValue);
 
     ev->AddValue(array);
-}
\ No newline at end of file
+}
+
+CLASS_DECLARATION(Listener, OSFile, NULL) {
+    {NULL, NULL}
+};
+
+OSFile::OSFile()
+    : file(NULL)
+{}
+
+OSFile::OSFile(void *inFile)
+    : file(inFile)
+{}
+
+OSFile::~OSFile()
+{
+    if (file) {
+        fclose((FILE *)file);
+    }
+}
+
+void *OSFile::getOSFile() const
+{
+    return file;
+}
diff --git a/code/fgame/scriptthread.h b/code/fgame/scriptthread.h
index afe1e3e2..8b07f17c 100644
--- a/code/fgame/scriptthread.h
+++ b/code/fgame/scriptthread.h
@@ -345,4 +345,19 @@ public:
     void UnregisterEvent(Event *ev);
     void VisionGetNaked(Event *ev);
     void VisionSetNaked(Event *ev);
-};
\ No newline at end of file
+};
+
+class OSFile : public Listener
+{
+    CLASS_PROTOTYPE(OSFile);
+
+public:
+    OSFile();
+    OSFile(void *inFile);
+    ~OSFile();
+
+    void *getOSFile() const;
+
+private:
+    void *file;
+};

From a067c58b3d476c9b76e30c471806286056528093 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 Jan 2025 23:38:49 +0100
Subject: [PATCH 1741/2040] Add EV_ScriptThread_FileClose2 to call fclose()
 without getting the return value

---
 code/fgame/scriptthread.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 1325b214..d86f7f19 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -1435,6 +1435,15 @@ Event EV_ScriptThread_FileRead
     EV_NORMAL
 );
 Event EV_ScriptThread_FileClose
+(
+    "fclose",
+    EV_DEFAULT,
+    "i",
+    "filehandle",
+    "Closes file of given file handle",
+    EV_NORMAL
+);
+Event EV_ScriptThread_FileClose2
 (
     "fclose",
     EV_DEFAULT,
@@ -2191,6 +2200,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_Earthquake2,             &ScriptThread::Earthquake              },
     {&EV_ScriptThread_FadeSound,               &ScriptThread::FadeSound               },
     {&EV_ScriptThread_FileClose,               &ScriptThread::FileClose               },
+    {&EV_ScriptThread_FileClose2,              &ScriptThread::FileClose               },
     {&EV_ScriptThread_FileCopy,                &ScriptThread::FileCopy                },
     {&EV_ScriptThread_FileEof,                 &ScriptThread::FileEof                 },
     {&EV_ScriptThread_FileError,               &ScriptThread::FileError               },

From 869075f47b4c354042436c036872079896ecf5e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 1 Jan 2025 23:48:02 +0100
Subject: [PATCH 1742/2040] Disable audio virtualization on special audio
 sources such as music and ambient sounds

This prevents the music from being muffled by HRTF virtualization
---
 code/client/snd_openal_new.cpp | 47 +++++++++++++++++++++++++++++++---
 code/client/snd_openal_new.h   |  2 ++
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 07258952..d09bbaa3 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -646,6 +646,17 @@ qboolean S_OPENAL_Init()
         return false;
     }
 
+    //
+    // Disable sound virtualization on special channels
+    //  (triggered music, ambient sounds...)
+    //
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        openal.chan_song[i].set_no_virtualization();
+    }
+    openal.chan_mp3.set_no_virtualization();
+    openal.chan_trig_music.set_no_virtualization();
+    openal.chan_movie.set_no_virtualization();
+
     Cmd_AddCommand("playmp3", S_OPENAL_PlayMP3);
     Cmd_AddCommand("stopmp3", S_OPENAL_StopMP3);
     Cmd_AddCommand("loadsoundtrack", S_loadsoundtrack);
@@ -1366,16 +1377,15 @@ static void S_OPENAL_Start2DSound(
         pChannel->iBaseRate = pChannel->sample_playback_rate();
         pChannel->set_no_3d();
         fRealVolume = fRealVolume * s_fVolumeGain;
-        pChannel->set_gain(fRealVolume);
-        pChannel->play();
     } else {
         pChannel->stop();
         pChannel->set_no_3d();
         pChannel->set_sfx(pSfx);
-        pChannel->set_gain(fRealVolume);
-        pChannel->play();
     }
 
+    pChannel->set_gain(fRealVolume);
+    pChannel->play();
+
     if (s_show_sounds->integer > 0) {
         Com_DPrintf(
             "OpenAL: 2D - %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
@@ -2912,6 +2922,35 @@ void openal_channel::play()
     alDieIfError();
 }
 
+/*
+==============
+openal_channel::set_no_virtualization
+==============
+*/
+void openal_channel::set_no_virtualization()
+{
+#if AL_SOFT_direct_channels_remix
+    qalSourcei(source, AL_DIRECT_CHANNELS_SOFT, AL_REMIX_UNMATCHED_SOFT);
+    alDieIfError();
+#elif AL_SOFT_direct_channels
+    qalSourcei(source, AL_DIRECT_CHANNELS_SOFT, AL_TRUE);
+    alDieIfError();
+#endif
+}
+
+/*
+==============
+openal_channel::set_virtualization
+==============
+*/
+void openal_channel::set_virtualization()
+{
+#if AL_SOFT_direct_channels_remix || AL_SOFT_direct_channels
+    qalSourcei(source, AL_DIRECT_CHANNELS_SOFT, AL_FALSE);
+    alDieIfError();
+#endif
+}
+
 /*
 ==============
 openal_channel::pause
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
index 27ef2a75..a22e2d6f 100644
--- a/code/client/snd_openal_new.h
+++ b/code/client/snd_openal_new.h
@@ -95,6 +95,8 @@ public:
 
     void  set_no_3d();
     void  set_3d();
+    void  set_no_virtualization();
+    void  set_virtualization();
 
     void set_gain(float gain);
     void set_velocity(float v0, float v1, float v2);

From 713e361d85fa15e3a0d5ab8c66287d1bf0c0e4ee Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 01:35:52 +0100
Subject: [PATCH 1743/2040] Fix DM box position with resolutions above
 1920x1080

---
 code/client/cl_ui.cpp | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 2a6e1d18..363723ff 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -143,6 +143,9 @@ static unsigned int  totalLoadTime;
 static unsigned int  currentLoadTime;
 unsigned char        UIListCtrlItem[8];
 
+static const float maxWidthRes  = 1920;
+static const float maxHeightRes = 1080;
+
 inventory_t              client_inv;
 bind_t                   client_bind;
 static str               scoreboard_menuname;
@@ -1128,6 +1131,20 @@ static void DMConsoleCommandHandler(const char *txt)
     CL_AddReliableCommand(szStringOut, qfalse);
 }
 
+/*
+====================
+getScreenWidth
+====================
+*/
+static float getScreenWidth()
+{
+    if (uid.bHighResScaling) {
+        return maxWidthRes;
+    } else {
+        return uid.vidWidth;
+    }
+}
+
 /*
 ====================
 getNewConsole
@@ -1196,7 +1213,7 @@ static UIRect2D getDefaultGMBoxRectangle(void)
         height = y;
     }
 
-    return UIRect2D(20.0f, height, (uid.vidWidth - 20) * uid.scaleRes[0], 128.0f * uid.scaleRes[1]);
+    return UIRect2D(20.0f, height, (getScreenWidth() - 20) * uid.scaleRes[0], 128.0f * uid.scaleRes[1]);
 }
 
 /*
@@ -1206,9 +1223,12 @@ getDefaultDMBoxRectangle
 */
 static UIRect2D getDefaultDMBoxRectangle(void)
 {
-    float width = uid.vidWidth * uid.scaleRes[0] * ui_compass_scale->value * 0.2f;
+    float width;
+    float screenWidth = getScreenWidth();
+   
+    width = screenWidth * uid.scaleRes[0] * ui_compass_scale->value * 0.2f;
 
-    return UIRect2D(width, 0, (uid.vidWidth - (width + 192.0f)) * uid.scaleRes[0], 120.0f * uid.scaleRes[1]);
+    return UIRect2D(width, 0, (screenWidth - (width + 192.0f)) * uid.scaleRes[0], 120.0f * uid.scaleRes[1]);
 }
 
 /*
@@ -3850,8 +3870,6 @@ UI_ResolutionChange
 void UI_ResolutionChange(void)
 {
     UIRect2D frame;
-    const float maxWidthRes = 1920;
-    const float maxHeightRes = 1080;
 
     if (com_target_game->integer >= TG_MOHTA) {
         ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);

From 3f299610fc029c49873325d62039082e1b34c442 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:33:04 +0100
Subject: [PATCH 1744/2040] Also try to find weapon by name in useWeapon()

---
 code/fgame/sentient_combat.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index 28e0cea2..700d8fab 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -1097,6 +1097,9 @@ void Sentient::useWeapon(const char *weaponname, weaponhand_t hand)
 
     // Find the item in the sentient's inventory
     weapon = (Weapon *)FindItem(weaponname);
+    if (!weapon) {
+        weapon = (Weapon *)FindItemByExternalName(weaponname);
+    }
 
     // If it exists, then make the change to the slot number specified
     if (weapon) {

From 088b44e2cc8fa06b61cc5b111a6eb6d10a064cfa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:13:52 +0100
Subject: [PATCH 1745/2040] Don't use the same weapon and add getters for the
 newActiveWeapon

---
 code/fgame/sentient.cpp        | 28 +++++++++++++++++++++----
 code/fgame/sentient.h          |  3 +++
 code/fgame/sentient_combat.cpp | 37 +++++++++++++++++++++++++---------
 3 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 93a00bb9..ed58aa61 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -578,6 +578,24 @@ Event EV_Sentient_GetNewActiveWeap
     "gets new active weapon",
     EV_RETURN
 );
+Event EV_Sentient_GetNewActiveWeapon
+(
+    "newActiveWeapon",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets new active weapon",
+    EV_GETTER
+);
+Event EV_Sentient_GetNewActiveWeaponHand
+(
+    "newActiveWeaponHand",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the hand of the new active weapon",
+    EV_GETTER
+);
 Event EV_Sentient_GetActiveWeap
 (
     "getactiveweap",
@@ -656,10 +674,12 @@ CLASS_DECLARATION(Animate, Sentient, NULL) {
     {&EV_Sentient_ForceDropWeapon2,     &Sentient::EventForceDropWeapon         },
     {&EV_Sentient_GetForceDropWeapon,   &Sentient::EventGetForceDropWeapon      },
 
-    {&EV_Sentient_GetActiveWeap,        &Sentient::GetActiveWeap                },
-    {&EV_Sentient_GetNewActiveWeap,     &Sentient::GetNewActiveWeapon           },
-    {&EV_Sentient_Client_Landing,       &Sentient::EventClientLanding           },
-    {NULL,                              NULL                                    }
+    {&EV_Sentient_GetActiveWeap,            &Sentient::GetActiveWeap                },
+    {&EV_Sentient_GetNewActiveWeap,         &Sentient::GetNewActiveWeaponOld        },
+    {&EV_Sentient_GetNewActiveWeapon,       &Sentient::GetNewActiveWeapon           },
+    {&EV_Sentient_GetNewActiveWeaponHand,   &Sentient::GetNewActiveWeaponHand       },
+    {&EV_Sentient_Client_Landing,           &Sentient::EventClientLanding           },
+    {NULL,                                  NULL                                    }
 };
 
 Container<Sentient *> SentientList;
diff --git a/code/fgame/sentient.h b/code/fgame/sentient.h
index 8230d890..c148db26 100644
--- a/code/fgame/sentient.h
+++ b/code/fgame/sentient.h
@@ -321,6 +321,7 @@ public:
     Weapon      *GetNewActiveWeapon(void);
     weaponhand_t GetNewActiveWeaponHand(void);
     void         ClearNewActiveWeapon(void);
+    void         SetNewActiveWeapon(Weapon* weapon, weaponhand_t hand);
     void         Holster(qboolean putaway);
     void         SafeHolster(qboolean putaway);
     void         ActivateNewWeapon(void);
@@ -355,7 +356,9 @@ public:
     // Custom openmohaa stuff
     //
     void GetActiveWeap(Event *ev);
+    void GetNewActiveWeaponOld(Event *ev);
     void GetNewActiveWeapon(Event *ev);
+    void GetNewActiveWeaponHand(Event *ev);
     void EventClientLanding(Event *ev);
 
     void FootstepMain(trace_t *trace, int iRunning, int iEquipment);
diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index 700d8fab..e095d49d 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -54,8 +54,13 @@ Weapon *Sentient::GetNewActiveWeapon(void)
 
 void Sentient::ClearNewActiveWeapon(void)
 {
-    newActiveWeapon.weapon.Clear();
-    newActiveWeapon.hand = WEAPON_ERROR;
+    SetNewActiveWeapon(NULL, WEAPON_ERROR);
+}
+
+void Sentient::SetNewActiveWeapon(Weapon* weapon, weaponhand_t hand)
+{
+    newActiveWeapon.weapon = weapon;
+    newActiveWeapon.hand   = hand;
 }
 
 void Sentient::EventGiveAmmo(Event *ev)
@@ -1117,8 +1122,7 @@ void Sentient::useWeapon(Weapon *weapon, weaponhand_t hand)
     }
 
     if (newActiveWeapon.weapon) {
-        newActiveWeapon.weapon = weapon;
-        newActiveWeapon.hand   = hand;
+        SetNewActiveWeapon(weapon, hand);
         return;
     }
 
@@ -1130,14 +1134,15 @@ void Sentient::useWeapon(Weapon *weapon, weaponhand_t hand)
         activeWeaponList[WEAPON_OFFHAND]->PutAway();
     }
 
-    if (activeWeaponList[WEAPON_MAIN] && activeWeaponList[WEAPON_MAIN] != weapon) {
+    if (activeWeaponList[WEAPON_MAIN] == weapon) {
+        return;
+    }
+
+    if (activeWeaponList[WEAPON_MAIN]) {
         activeWeaponList[WEAPON_MAIN]->PutAway();
     }
 
-    newActiveWeapon.weapon = weapon;
-    newActiveWeapon.hand   = hand;
-
-    //ChangeWeapon( weapon, hand );
+    SetNewActiveWeapon(weapon, hand);
 }
 
 void Sentient::EventUseWeaponClass(Event *ev)
@@ -1290,11 +1295,23 @@ Ammo *Sentient::FindAmmoByName(str name)
     return NULL;
 }
 
-void Sentient::GetNewActiveWeapon(Event *ev)
+void Sentient::GetNewActiveWeaponOld(Event *ev)
+{
+    ScriptDeprecatedAltVariable("newActiveWeapon");
+
+    ev->AddEntity(GetNewActiveWeapon());
+}
+
+void Sentient::GetNewActiveWeapon(Event* ev)
 {
     ev->AddEntity(GetNewActiveWeapon());
 }
 
+void Sentient::GetNewActiveWeaponHand(Event* ev)
+{
+    ev->AddInteger(GetNewActiveWeaponHand());
+}
+
 void Sentient::GetActiveWeap(Event *ev)
 {
     weaponhand_t weaponhand;

From 6b2160c876d2d05c81b11800e66db5ba92bcb84d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:27:39 +0100
Subject: [PATCH 1746/2040] Add putaway getter for Weapon

---
 code/fgame/weapon.cpp | 23 +++++++++++++++++++++++
 code/fgame/weapon.h   |  1 +
 2 files changed, 24 insertions(+)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index 061be0e2..da4250cb 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -901,6 +901,16 @@ Event EV_Weapon_DoneAnimating
     EV_NORMAL
 );
 
+Event EV_Weapon_GetPutaway
+(
+    "putaway",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns whether or not the given weapon is being put away",
+    EV_GETTER
+);
+
 CLASS_DECLARATION(Item, Weapon, NULL) {
     {&EV_SetAnim,                       &Weapon::SetWeaponAnimEvent     },
     {&EV_Item_Pickup,                   &Weapon::PickupWeapon           },
@@ -1001,6 +1011,7 @@ CLASS_DECLARATION(Item, Weapon, NULL) {
     // Added in OPM
     //
     {&EV_Weapon_DoneAnimating,          &Weapon::DoneAnimating          },
+    {&EV_Weapon_GetPutaway,             &Weapon::EventGetPutaway        },
     {NULL,                              NULL                            }
 };
 
@@ -4622,12 +4633,24 @@ Listener *Weapon::GetScriptOwner(void)
     return owner;
 }
 
+//======================
+//Weapon::DoneAnimating
+//======================
 void Weapon::DoneAnimating(Event* ev) {
     // Added in OPM
     //  Set to idle when done reloading
     SetWeaponIdleAnim();
 }
 
+//======================
+//Weapon::GetMaxFireMovementMult
+//======================
+void Weapon::EventGetPutaway(Event* ev) {
+    // Added in OPM
+    //  Set to idle when done reloading
+    ev->AddInteger(GetPutaway());
+}
+
 //======================
 //Weapon::GetMaxFireMovementMult
 //======================
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index cc4dd494..18e9bf8f 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -460,6 +460,7 @@ public:
     firemode_t GetFireMode(void);
     qboolean   IsSemiAuto(void);
     void       DoneAnimating(Event *ev);
+    void       EventGetPutaway(Event *ev);
 
     float GetMaxFireMovementMult() const;
     float GetZoomMovement() const;

From df22895b942941d813568d869cf168c2e2ef5427 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:30:34 +0100
Subject: [PATCH 1747/2040] Fix compile error

---
 code/script/scriptexception.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptexception.h b/code/script/scriptexception.h
index 5fb9ea78..af987943 100644
--- a/code/script/scriptexception.h
+++ b/code/script/scriptexception.h
@@ -48,6 +48,6 @@ public:
 void Error(const char *format, ...);
 
 #define ScriptDeprecated(function) throw ScriptException(function ": DEPRECATED. DON'T USE IT ANYMORE")
-#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: " __FUNCTION__ ": is deprecated and has been superseded by the " alternative_name " method")
-#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: " __FUNCTION__ ": is deprecated and has been superseded by the " alternative_name " variable")
+#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " method")
+#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " variable")
 #define ScriptError                throw ScriptException

From 465d46275690dad8b018872644597cf338c82c17 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:52:45 +0100
Subject: [PATCH 1748/2040] Automatically adjust the FOV depending on the
 aspect ratio

---
 code/cgame/cg_view.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 89b85900..11b4d436 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -485,9 +485,16 @@ static int CG_CalcFov(void)
     int   contents;
     float fov_x, fov_y;
     int   inwater;
+    float fov_ratio;
 
-    fov_x = cg.camera_fov;
-    x     = cg.refdef.width / tan(fov_x / 360 * M_PI);
+    fov_ratio = (float)cg.refdef.width / (float)cg.refdef.height * (3.0 / 4.0);
+    if (fov_ratio == 1) {
+        fov_x = cg.camera_fov;
+    } else {
+        fov_x = RAD2DEG(atan(tan(DEG2RAD(cg.camera_fov / 2.0)) * fov_ratio)) * 2.0;
+    }
+
+    x = cg.refdef.width / tan(fov_x / 360 * M_PI);
     fov_y = atan2(cg.refdef.height, x);
     fov_y = fov_y * 360 / M_PI;
 

From efeda23627658524f7feca25ef0679458b2b99a3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 18:04:32 +0100
Subject: [PATCH 1749/2040] Fix player losing part torso animation during pain

---
 code/fgame/player_animation.cpp | 56 +++++++++++++++------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index 5f9070e1..f51ed045 100644
--- a/code/fgame/player_animation.cpp
+++ b/code/fgame/player_animation.cpp
@@ -345,18 +345,12 @@ void Player::AdjustAnimBlends(void)
     if (m_fPartBlends[legs] <= 0.0f) {
         if (partOldAnim[legs] != "") {
             StopAnimating(iOldPartSlot);
+        }
 
-            if (partAnim[legs] == "") {
-                SetWeight(iPartSlot, 0.0);
-            } else {
-                SetWeight(iPartSlot, 1.0);
-            }
+        if (partAnim[legs] == "") {
+            SetWeight(iPartSlot, 0.0);
         } else {
-            if (partAnim[legs] == "") {
-                SetWeight(iPartSlot, 0.0);
-            } else {
-                SetWeight(iPartSlot, 1.0);
-            }
+            SetWeight(iPartSlot, 1.0);
         }
     } else {
         m_fPartBlends[legs] -= level.frametime * partBlendMult[legs];
@@ -387,12 +381,14 @@ void Player::AdjustAnimBlends(void)
         if (partOldAnim[torso] != "") {
             StopAnimating(iOldPartSlot);
             partOldAnim[torso] = "";
+        }
 
-            if (partAnim[torso] == "") {
-                SetWeight(iPartSlot, 0.0);
-            } else {
-                SetWeight(iPartSlot, 1.0);
-            }
+        if (partAnim[torso] == "") {
+            SetWeight(iPartSlot, 0.0);
+            edict->s.actionWeight = 0.0;
+        } else {
+            SetWeight(iPartSlot, 1.0);
+            edict->s.actionWeight = 1.0;
         }
     } else {
         m_fPartBlends[torso] = m_fPartBlends[torso] - level.frametime * partBlendMult[torso];
@@ -427,16 +423,16 @@ void Player::AdjustAnimBlends(void)
     if (m_fPainBlend) {
         if (m_sPainAnim == "") {
             StopAnimating(ANIMSLOT_PAIN);
-            edict->s.frameInfo[ANIMSLOT_PAIN].weight = 0;
-            m_fPainBlend                             = 0;
-            animdone_Pain                            = false;
+            SetWeight(ANIMSLOT_PAIN, 0);
+            m_fPainBlend  = 0;
+            animdone_Pain = false;
         } else if (animdone_Pain) {
             m_fPainBlend -= level.frametime * (10.0 / 3.0);
             if (m_fPainBlend < 0.01f) {
                 StopAnimating(ANIMSLOT_PAIN);
-                edict->s.frameInfo[ANIMSLOT_PAIN].weight = 0;
-                m_fPainBlend                             = 0;
-                animdone_Pain                            = false;
+                SetWeight(ANIMSLOT_PAIN, 0);
+                m_fPainBlend  = 0;
+                animdone_Pain = false;
             }
         }
 
@@ -444,12 +440,12 @@ void Player::AdjustAnimBlends(void)
             int   i;
             float w;
 
-            edict->s.frameInfo[ANIMSLOT_PAIN].weight = m_fPainBlend;
-            w                                        = 1.0 - m_fPainBlend * 0.5;
+            SetWeight(ANIMSLOT_PAIN, m_fPainBlend);
+            w = 1.0 - m_fPainBlend * 0.5;
 
             for (i = 0; i < ANIMSLOT_PAIN; i++) {
-                if (edict->s.frameInfo[i].weight) {
-                    edict->s.frameInfo[i].weight *= w;
+                if (GetWeight(i)) {
+                    SetWeight(i, GetWeight(i) * w);
                 }
             }
 
@@ -490,7 +486,7 @@ void Player::PlayerAnimDelta(float *vDelta)
         // get the anim delta
         gi.Anim_DeltaOverTime(edict->tiki, animnum, fBackTime, fTime, vNewDelta);
 
-        VectorMA(vDelta, edict->s.frameInfo[m_iPartSlot[legs]].weight, vNewDelta, vDelta);
+        VectorMA(vDelta, GetWeight(m_iPartSlot[legs]), vNewDelta, vDelta);
     }
 
     animnum = -1;
@@ -509,15 +505,15 @@ void Player::PlayerAnimDelta(float *vDelta)
 
         gi.Anim_DeltaOverTime(edict->tiki, animnum, fBackTime, fTime, vNewDelta);
 
-        VectorMA(vDelta, edict->s.frameInfo[m_iPartSlot[torso]].weight, vNewDelta, vDelta);
+        VectorMA(vDelta, GetWeight(m_iPartSlot[torso]), vNewDelta, vDelta);
     }
 }
 
 void Player::EventTestAnim(Event *ev)
 {
-    str name;
+    str   name;
     float weight;
-    int animNum;
+    int   animNum;
 
     weight = ev->GetFloat(1);
     if (weight <= 0) {
@@ -527,7 +523,7 @@ void Player::EventTestAnim(Event *ev)
     }
 
     if (ev->NumArgs() > 1) {
-        name = ev->GetString(1);
+        name    = ev->GetString(1);
         animNum = gi.Anim_NumForName(edict->tiki, name.c_str());
         if (animNum == -1) {
             gi.Printf("Couldn't find anim '%s'\n", name.c_str());

From 32f507ce1508e92367512b07a6c4cbe9dd1a2e63 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 3 Jan 2025 22:08:26 +0100
Subject: [PATCH 1750/2040] Fix pulldown menu container using the wrong
 foreground color

---
 code/uilib/uipulldownmenucontainer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/uilib/uipulldownmenucontainer.cpp b/code/uilib/uipulldownmenucontainer.cpp
index 06396b29..4d105266 100644
--- a/code/uilib/uipulldownmenucontainer.cpp
+++ b/code/uilib/uipulldownmenucontainer.cpp
@@ -166,7 +166,7 @@ void UIPulldownMenuContainer::FrameInitialized
 {
 	AllowActivate(qfalse);
 	m_menu->setBackgroundColor(m_background_color, qtrue);
-	m_menu->setForegroundColor(m_background_color);
+	m_menu->setForegroundColor(m_foreground_color);
 }
 
 void UIPulldownMenuContainer::setBackgroundAlpha

From fe42511c541b84a1478fe02da5a561cf83e2e451 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 3 Jan 2025 22:08:59 +0100
Subject: [PATCH 1751/2040] Changed the color of UIListBox elements

---
 code/uilib/uilistbox.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/uilib/uilistbox.cpp b/code/uilib/uilistbox.cpp
index ab18e695..df6840ce 100644
--- a/code/uilib/uilistbox.cpp
+++ b/code/uilib/uilistbox.cpp
@@ -279,9 +279,13 @@ void UIListBox::Draw(void)
     float       aty;
     int         i;
     const char *str;
-    UColor      selectedBG(0, 1, 1, 1);
-    UColor      selectedColor  = UBlack;
-    UColor      selectedBorder = UWhite;
+    //UColor      selectedBG(0, 1, 1, 1);
+    //UColor      selectedColor  = UBlack;
+    //UColor      selectedBorder = UWhite;
+    // Changed in 2.0
+    UColor      selectedBG(0.2, 0.18, 0.015);
+    UColor      selectedColor(0.9, 0.8, 0.6);
+    UColor      selectedBorder(0.315, 0.27, 0.0225);
 
     aty = 0;
 

From 6e357459e66dac0ecebeefaed0302af52a586459 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 4 Jan 2025 17:48:42 +0100
Subject: [PATCH 1752/2040] Fix fragments being sent too fast

This prevented players with low connection speed unable to connect due to UDP packets being lost. The rate of connecting clients will be properly taken into account
---
 code/qcommon/net_chan.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c
index 3824bc6e..a03628f1 100644
--- a/code/qcommon/net_chan.c
+++ b/code/qcommon/net_chan.c
@@ -339,6 +339,10 @@ void Netchan_TransmitNextFragment( netchan_t *chan, netprofpacketlist_t *packetl
 
 	// send the datagram
 	NET_SendPacket( chan->sock, send.cursize, send.data, chan->remoteAddress );
+	
+	// Store send time and size of this packet for rate control
+	chan->lastSentTime = Sys_Milliseconds();
+	chan->lastSentSize = send.cursize;
 
 	if ( showpackets->integer ) {
 		Com_Printf ("%s send %4zu : s=%i fragment=%zu,%zu\n"
@@ -410,6 +414,10 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data, netprof
 	// send the datagram
 	NET_SendPacket( chan->sock, send.cursize, send.data, chan->remoteAddress );
 
+	// Store send time and size of this packet for rate control
+	chan->lastSentTime = Sys_Milliseconds();
+	chan->lastSentSize = send.cursize;
+
 	if ( showpackets->integer ) {
 		Com_Printf( "%s send %4zu : s=%i ack=%i\n"
 			, netsrcString[ chan->sock ]

From 3c26b98b65b14af40436cf1ac609988f5baf724e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 4 Jan 2025 17:55:33 +0100
Subject: [PATCH 1753/2040] Generate checksum with noncompat protocol

---
 code/qcommon/net_chan.c | 31 ++++++++++++++++++++++++++-----
 code/qcommon/qcommon.h  |  9 ++++++---
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c
index a03628f1..df7dbb4e 100644
--- a/code/qcommon/net_chan.c
+++ b/code/qcommon/net_chan.c
@@ -325,7 +325,12 @@ void Netchan_TransmitNextFragment( netchan_t *chan, netprofpacketlist_t *packetl
 	// send the qport if we are a client
 	if ( chan->sock == NS_CLIENT ) {
 		MSG_WriteShort( &send, qport->integer );
-	}
+    }
+
+#ifdef LEGACY_PROTOCOL
+    if (!chan->compat)
+#endif
+        MSG_WriteLong(&send, NETCHAN_GENCHECKSUM(chan->challenge, chan->outgoingSequence));
 
 	// copy the reliable message to the packet first
 	fragmentLength = FRAGMENT_SIZE;
@@ -402,12 +407,17 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data, netprof
 	MSG_InitOOB (&send, send_buf, chan->remoteAddress.type == NA_LOOPBACK ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN);
 
 	MSG_WriteLong( &send, chan->outgoingSequence );
-	chan->outgoingSequence++;
 
 	// send the qport if we are a client
-	if ( chan->sock == NS_CLIENT ) {
-		MSG_WriteShort( &send, qport->integer );
-	}
+	if(chan->sock == NS_CLIENT)
+		MSG_WriteShort(&send, qport->integer);
+
+#ifdef LEGACY_PROTOCOL
+	if(!chan->compat)
+#endif
+		MSG_WriteLong(&send, NETCHAN_GENCHECKSUM(chan->challenge, chan->outgoingSequence));
+
+	chan->outgoingSequence++;
 
 	MSG_WriteData( &send, data, length );
 
@@ -469,6 +479,17 @@ qboolean Netchan_Process( netchan_t *chan, msg_t *msg, netprofpacketlist_t *pack
 		qport = MSG_ReadShort( msg );
 	}
 
+#ifdef LEGACY_PROTOCOL
+	if(!chan->compat)
+#endif
+	{
+		int checksum = MSG_ReadLong(msg);
+
+		// UDP spoofing protection
+		if(NETCHAN_GENCHECKSUM(chan->challenge, sequence) != checksum)
+			return qfalse;
+	}
+
 	// read the fragment information
 	if ( fragmented ) {
 		fragmentStart = MSG_ReadLong( msg );
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 53b176de..dd06a54a 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -255,11 +255,14 @@ void		NET_LeaveMulticast6(void);
 void		NET_Sleep(int msec);
 
 
-#define	MAX_MSGLEN			49152		// max length of a message, which may
+#define	MAX_MSGLEN				49152		// max length of a message, which may
 											// be fragmented into multiple packets
 
-#define MAX_DOWNLOAD_WINDOW			8		// max of eight download frames
-#define MAX_DOWNLOAD_BLKSIZE		2048	// 2048 byte block chunks
+#define MAX_DOWNLOAD_WINDOW		48	// ACK window of 48 download chunks. Cannot set this higher, or clients
+						// will overflow the reliable commands buffer
+#define MAX_DOWNLOAD_BLKSIZE		1024	// 896 byte block chunks
+
+#define NETCHAN_GENCHECKSUM(challenge, sequence) ((challenge) ^ ((sequence) * (challenge)))
  
 
 /*

From c10fd17d192741c096d601089dbfb2fa6f08a421 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 4 Jan 2025 18:01:52 +0100
Subject: [PATCH 1754/2040] Bump patch number

---
 code/qcommon/q_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 0a57b0d6..d73e58a1 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
 #define PRODUCT_VERSION_MINOR			81
-#define PRODUCT_VERSION_PATCH			0
+#define PRODUCT_VERSION_PATCH			1
 #define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 
 //

From 9427137dbd2f86dd9477c6576c840b12511c849c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 4 Jan 2025 19:43:47 +0100
Subject: [PATCH 1755/2040] Properly increment the packet number before sending
 the gamespy reply

Some programs parse the packet number and stop working properly if the packet number is an incorrect value
---
 code/gamespy/sv_gqueryreporting.c | 4 ++--
 code/qcommon/q_version.h          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index f0559f0e..af05144f 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -192,11 +192,11 @@ static void packet_send(qr_t qrec, struct sockaddr *addr, char *buffer)
         return;
     }
 
+    qrec->packetnumber += 1;
+
     Com_sprintf(keyvalue, sizeof(keyvalue), "\\queryid\\%d.%d", qrec->queryid, qrec->packetnumber);
     strcat(buffer, keyvalue);
 
-    qrec->packetnumber++;
-
     sendto((SOCKET)qrec->querysock, buffer, (int)strlen(buffer), 0, addr, sizeof(*addr));
     *buffer = 0;
 }
diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index d73e58a1..04a14e8a 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
 #define PRODUCT_VERSION_MINOR			81
-#define PRODUCT_VERSION_PATCH			1
+#define PRODUCT_VERSION_PATCH			2
 #define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 
 //

From 9930d50f99cf44a5d55f198ad395631942e0396f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 4 Jan 2025 20:37:15 +0100
Subject: [PATCH 1756/2040] Fix inconsistent player animation debug print

---
 code/fgame/player.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 05b98580..8e5aece3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5542,21 +5542,25 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
     }
 
     if (g_showplayeranim->integer) {
-        if (last_leg_anim_name != AnimName(legs)) {
-            gi.DPrintf("Legs change from %s to %s\n", last_leg_anim_name.c_str(), AnimName(legs));
-            last_leg_anim_name = AnimName(legs);
+        str sNewAnim;
+
+        sNewAnim = AnimName(m_iPartSlot[legs]);
+        if (last_leg_anim_name != sNewAnim) {
+            gi.DPrintf("Legs anim change from %s to %s\n", last_leg_anim_name.c_str(), sNewAnim.c_str());
+            last_leg_anim_name = sNewAnim;
         }
 
-        if (last_torso_anim_name != AnimName(torso)) {
-            gi.DPrintf("Torso change from %s to %s\n", last_torso_anim_name.c_str(), AnimName(torso));
-            last_torso_anim_name = AnimName(torso);
+        sNewAnim = AnimName(m_iPartSlot[torso]);
+        if (last_torso_anim_name != sNewAnim) {
+            gi.DPrintf("Torso anim change from %s to %s\n", last_torso_anim_name.c_str(), sNewAnim.c_str());
+            last_torso_anim_name = sNewAnim;
         }
     }
 
     if (g_showplayerstate->integer) {
         if (startstate_Legs != currentState_Legs) {
             gi.DPrintf(
-                "Legs change from %s to %s\n",
+                "Legs state change from %s to %s\n",
                 startstate_Legs ? startstate_Legs->getName() : "NULL",
                 currentState_Legs ? currentState_Legs->getName() : "NULL"
             );
@@ -5564,7 +5568,7 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
 
         if (startstate_Torso != currentState_Torso) {
             gi.DPrintf(
-                "Torso change from %s to %s\n",
+                "Torso state change from %s to %s\n",
                 startstate_Torso ? startstate_Torso->getName() : "NULL",
                 currentState_Torso ? currentState_Torso->getName() : "NULL"
             );

From 19eec6305bbd1c1623c7f4b2f2826120a6aa60f9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 4 Jan 2025 21:15:32 +0100
Subject: [PATCH 1757/2040] Use "idle" anim when in noclip mode

---
 code/fgame/player_animation.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index f51ed045..47dd39e1 100644
--- a/code/fgame/player_animation.cpp
+++ b/code/fgame/player_animation.cpp
@@ -61,9 +61,13 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
 {
     int animnum;
 
-    if (getMoveType() == MOVETYPE_NOCLIP && slot) {
-        StopPartAnimating(torso);
-        return;
+    if (getMoveType() == MOVETYPE_NOCLIP) {
+        if (slot) {
+            StopPartAnimating(torso);
+            return;
+        }
+
+        anim = "idle";
     }
 
     animnum = gi.Anim_NumForName(edict->tiki, anim);

From 269e73168e17b0fd0c73d62c40b028b753a176b8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 02:00:40 +0100
Subject: [PATCH 1758/2040] Fix an issue where animations (legs) would not loop

---
 code/fgame/player.cpp           |  1 -
 code/fgame/player_animation.cpp | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 8e5aece3..6d82bcc1 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5510,7 +5510,6 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                 laststate_Legs = NULL;
             }
 
-            animdone_Legs = false;
             if (currentState_Legs) {
                 if (laststate_Legs) {
                     // Process exit commands of the last state
diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index 47dd39e1..e1e45511 100644
--- a/code/fgame/player_animation.cpp
+++ b/code/fgame/player_animation.cpp
@@ -71,7 +71,7 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
     }
 
     animnum = gi.Anim_NumForName(edict->tiki, anim);
-    if (animnum == CurrentAnim() && partAnim[slot] == anim) {
+    if (animnum == CurrentAnim(m_iPartSlot[slot]) && partAnim[slot] == anim) {
         return;
     }
 
@@ -93,21 +93,19 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
     if (m_fPartBlends[slot] < 0.5f) {
         SetAnimDoneEvent(NULL, m_iPartSlot[slot]);
 
-        float m_fCrossTime = gi.Anim_CrossTime(edict->tiki, animnum);
-
-        partBlendMult[slot] = m_fCrossTime;
-        if (m_fCrossTime <= 0.0f) {
-            partOldAnim[slot]   = "";
-            m_fPartBlends[slot] = 0.0f;
-        } else {
+        partBlendMult[slot] = gi.Anim_CrossTime(edict->tiki, animnum);
+        if (partBlendMult[slot] > 0.0f) {
             m_iPartSlot[slot] ^= 1;
-            partBlendMult[slot] = 1.0f / m_fCrossTime;
+            partBlendMult[slot] = 1.0f / partBlendMult[slot];
             partOldAnim[slot]   = partAnim[slot];
             m_fPartBlends[slot] = 1.0f;
+        } else {
+            partOldAnim[slot]   = "";
+            m_fPartBlends[slot] = 0.0f;
         }
     }
 
-    if (slot) {
+    if (slot != legs) {
         animdone_Torso = false;
     } else {
         animdone_Legs = false;
@@ -117,7 +115,7 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
 
     partAnim[slot] = anim;
 
-    if (slot) {
+    if (slot != legs) {
         NewAnim(animnum, EV_Player_AnimLoop_Torso, m_iPartSlot[slot]);
     } else {
         NewAnim(animnum, EV_Player_AnimLoop_Legs, m_iPartSlot[legs]);
@@ -147,7 +145,7 @@ void Player::StopPartAnimating(bodypart_t part)
 
     StopAnimating(m_iPartSlot[part]);
 
-    if (part) {
+    if (part != legs) {
         animdone_Torso = false;
     } else {
         animdone_Legs = false;
@@ -162,7 +160,7 @@ void Player::PausePartAnim(bodypart_t part)
 
 int Player::CurrentPartAnim(bodypart_t part) const
 {
-    if (!*partAnim[part]) {
+    if (partAnim[part] == "") {
         return -1;
     }
 

From a14a2c96843e8f34bab672ffce05ca1a11ae2756 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 02:09:46 +0100
Subject: [PATCH 1759/2040] Fix inconsistent torso animation cross-blending

---
 code/fgame/player_animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index e1e45511..2f46c15e 100644
--- a/code/fgame/player_animation.cpp
+++ b/code/fgame/player_animation.cpp
@@ -402,8 +402,8 @@ void Player::AdjustAnimBlends(void)
                 fWeightTotal += m_fPartBlends[torso];
             }
             if (partAnim[torso] != "") {
-                SetWeight(iPartSlot, m_fPartBlends[torso]);
-                fWeightTotal += 1.0f - m_fPartBlends[torso];
+                SetWeight(iPartSlot, 1.0 - m_fPartBlends[torso]);
+                fWeightTotal += 1.0 - m_fPartBlends[torso];
             }
 
             edict->s.actionWeight = fWeightTotal;

From 88018348041dc0784167f99509d91ec584818fda Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 02:20:43 +0100
Subject: [PATCH 1760/2040] Don't restart the legs animation from the beginning
 in the same state

This prevent walking silently by switching weapons indefinitely
---
 code/fgame/player.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 6d82bcc1..437018a1 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5530,7 +5530,23 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     StopPartAnimating(legs);
                     animdone_Legs = true;
                 } else if (legsAnim != "") {
-                    SetPartAnim(legsAnim, legs);
+                    float oldTime;
+                    
+                    if (currentState_Legs == laststate_Legs) {
+                        //
+                        // Added in OPM
+                        //  This allows different animations in the same state
+                        //  to be continued at the same moment.
+                        //  This is used to avoid "ghost walking" where the player
+                        //  would switch weapons indefinitely to avoid footstep sounds
+                        //
+
+                        oldTime = GetTime(m_iPartSlot[legs]);
+                        SetPartAnim(legsAnim, legs);
+                        SetTime(m_iPartSlot[legs], oldTime);
+                    } else {
+                        SetPartAnim(legsAnim, legs);
+                    }
                 }
             } else {
                 currentState_Legs = laststate_Legs;

From b5875ae89092c9ddb9cab4cef05b94dd77c08197 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 02:29:02 +0100
Subject: [PATCH 1761/2040] Allow the same torso animation to play again

This allows replaying the same torso animation, like when activating a new weapon of the same weapon class
---
 code/fgame/player.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 437018a1..ef87f24c 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5420,6 +5420,13 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     StopPartAnimating(torso);
                     animdone_Torso = true;
                 } else if (torsoAnim != "") {
+                    if (torsoAnim == partAnim[torso]) {
+                        // Fixed in OPM
+                        //  Stop the part if it's the same animation
+                        //  so the new animation can play and make some action
+                        //  like activate the new weapon.
+                        StopPartAnimating(torso);
+                    }
                     SetPartAnim(torsoAnim.c_str(), torso);
                 }
             } else {
@@ -5427,6 +5434,11 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     StopPartAnimating(torso);
                     animdone_Torso = true;
                 } else if (torsoAnim != "") {
+                    if (torsoAnim == partAnim[torso]) {
+                        // Fixed in OPM
+                        //  See above
+                        StopPartAnimating(torso);
+                    }
                     SetPartAnim(torsoAnim.c_str(), torso);
                 }
 

From 528039f80b97b3c0c4a49b4567e51b4c74a4bb57 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:49:27 +0100
Subject: [PATCH 1762/2040] Don't sanitize semicolon

---
 code/qcommon/cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
index c4d75124..338456a1 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -620,7 +620,7 @@ void Cmd_Args_Sanitize(void)
 		if(strlen(c) > MAX_CVAR_VALUE_STRING - 1)
 			c[MAX_CVAR_VALUE_STRING - 1] = '\0';
 		
-		while ((c = strpbrk(c, "\n\r;"))) {
+		while ((c = strpbrk(c, "\n\r"))) {
 			*c = ' ';
 			++c;
 		}

From 6a86fc80670c50ac536b16546dfefa24093c318f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:50:06 +0100
Subject: [PATCH 1763/2040] Fix num voters when calling vote

---
 code/fgame/level.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 8247343e..df1e3910 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -1916,6 +1916,8 @@ void Level::CheckVote(void)
                 level.m_voteNo++;
             }
         }
+
+        numVoters++;
     }
 
     level.m_numVoters = numVoters;

From cf65fd890d7da24372577ed71362d5a082c5e107 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 18:20:00 +0100
Subject: [PATCH 1764/2040] Fix incorrect number of wins in the scoreboard

---
 code/fgame/dm_manager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 69d7613a..ddc05fb3 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1903,11 +1903,11 @@ void DM_Manager::BuildTeamInfo_ver15(DM_Team *dmTeam)
         iPing /= iNumPlayers;
     }
 
-    if (g_gametype->integer >= GT_TEAM_ROUNDS) {
-        iKills  = dmTeam->m_wins_in_a_row;
-        iDeaths = dmTeam->m_teamwins;
+    if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE || g_gametype->integer == GT_TOW) {
+        iKills  = dmTeam->m_teamwins;
+        iDeaths = dmTeam->m_wins_in_a_row;
     } else {
-        iKills  = dmTeam->m_iKills;
+        iKills  = dmTeam->m_teamwins;
         iDeaths = dmTeam->m_iDeaths;
     }
 

From 8a8ac2e3d1e85a6828a34bb6e8ed6dde5f00da84 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 18:36:45 +0100
Subject: [PATCH 1765/2040] Fix newline in win message

---
 code/fgame/dm_manager.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index ddc05fb3..2a8075ce 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1412,24 +1412,24 @@ void DM_Manager::EventDoRoundTransition(Event *ev)
     }
 
     if (m_iTeamWin == TEAM_AXIS) {
-        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Axis win!\n")));
-        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Axis win!\n")));
+        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Axis win!")));
+        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Axis win!")));
 
         // Play the axis victory sound
         world->Sound("den_victory_v");
 
         Unregister(STRING_AXISWIN);
     } else if (m_iTeamWin == TEAM_ALLIES) {
-        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Allies win!\n")));
-        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Allies win!\n")));
+        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Allies win!")));
+        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Allies win!")));
 
         // Play the allies victory sound
         world->Sound("dfr_victory_v");
 
         Unregister(STRING_ALLIESWIN);
     } else {
-        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("It's a draw!\n")));
-        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("It's a draw!\n")));
+        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("It's a draw!")));
+        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("It's a draw!")));
 
         Unregister(STRING_DRAW);
     }

From 2c738fa28ef179b762568bc7441de0eaf7c0dc4a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 19:54:32 +0100
Subject: [PATCH 1766/2040] Fix occasional errors related to SV_FindIndex

Some maps (and mods) declare many sounds, sounds with the same name would be present more than once because the case was taken into account
---
 code/server/sv_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index ad8dfe60..3c96d2d4 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -166,7 +166,7 @@ int SV_FindIndex( const char *name, int start, int max, qboolean create ) {
 		if( !s || !s[ 0 ] ) {
 			break;
 		}
-		if( !strcmp( s, name ) ) {
+		if( !Q_stricmp( s, name ) ) {
 			return i;
 		}
 	}

From 418985f90b8ae1d1b75b3157cc2800e9c36a8d85 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 20:02:45 +0100
Subject: [PATCH 1767/2040] Fix animation not looping in the same state

---
 code/fgame/player.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index ef87f24c..654f21c7 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -5555,7 +5555,10 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
 
                         oldTime = GetTime(m_iPartSlot[legs]);
                         SetPartAnim(legsAnim, legs);
-                        SetTime(m_iPartSlot[legs], oldTime);
+
+                        if (animtimes[m_iPartSlot[legs]] > 0) {
+                            SetTime(m_iPartSlot[legs], fmod(oldTime, animtimes[m_iPartSlot[legs]]));        
+                        }
                     } else {
                         SetPartAnim(legsAnim, legs);
                     }

From 8fb3856ea64015fc43f787860d1fc6d72d1faefd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 20:19:52 +0100
Subject: [PATCH 1768/2040] Add a centerprint message when joining a team that
 is full

---
 code/fgame/player.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 654f21c7..fdd07938 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -11565,13 +11565,15 @@ qboolean Player::CheckCanSwitchTeam(teamtype_t team)
             }
 
             if (pNewTeam->m_players.NumObjects() > numTeamPlayers) {
+                const char* message = gi.LV_ConvertString("That team has enough players. Choose the team that has the lowest number of players.");
+
                 gi.SendServerCommand(
                     edict - g_entities,
                     "print \"" HUD_MESSAGE_WHITE "%s\n\"",
-                    gi.LV_ConvertString(
-                        "That team has enough players. Choose the team that has the lowest number of players."
-                    )
+                    gi.LV_ConvertString(message)
                 );
+
+                gi.centerprintf(edict, message);
                 return qfalse;
             }
         }

From 5f236d4d4266b82cfb1461b0fddfac0ef8a38536 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 5 Jan 2025 23:57:08 +0100
Subject: [PATCH 1769/2040] Fix projectiles having an unassigned weapon owner

This fixes weapons that shoot projectiles not being taken into account for being the preferred weapon
---
 code/fgame/weapon.cpp    |  2 +-
 code/fgame/weaputils.cpp | 58 +++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index da4250cb..2d7de504 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -1855,7 +1855,7 @@ void Weapon::Shoot(Event *ev)
 
         switch (firetype[mode]) {
         case FT_PROJECTILE:
-            ProjectileAttack(pos, forward, owner, projectileModel[mode], charge_fraction);
+            ProjectileAttack(pos, forward, owner, projectileModel[mode], charge_fraction, 0, this);
             break;
         case FT_LANDMINE:
             PlaceLandmine(pos, owner, projectileModel[mode], this);
diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 32bc86b4..72117e3a 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -633,10 +633,11 @@ Projectile::Projectile()
     takedamage           = DAMAGE_NO;
     owner                = ENTITYNUM_NONE;
     edict->r.ownerNum    = ENTITYNUM_NONE;
+
     // Added in 2.0
-    m_bArcToTarget       = false;
+    m_bArcToTarget = false;
     // Added in 2.30
-    m_bDieInWater        = false;
+    m_bDieInWater = false;
 
     // make this shootable but non-solid on the client
     setContents(CONTENTS_SHOOTONLY);
@@ -646,7 +647,7 @@ Projectile::Projectile()
     //
     flags |= FL_TOUCH_TRIGGERS;
 
-    m_iTeam           = 0;
+    m_iTeam = 0;
 
     // Added in OPM
     m_bHadPlayerOwner = false;
@@ -1253,21 +1254,21 @@ void Projectile::Touch(Event *ev)
         other->Damage(
             this, owner, damage, origin, velocity, level.impact_trace.plane.normal, knockback, 0, meansofdeath
         );
-    }
 
-    if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
-        if (other->IsSubclassOfPlayer() || other->IsSubclassOfVehicle() || other->IsSubclassOfVehicleTank()
-            || other->isSubclassOf(VehicleCollisionEntity)) {
-            weap->m_iNumHits++;
-            weap->m_iNumTorsoShots++;
+        if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
+            if (other->IsSubclassOfSentient() || other->IsSubclassOfVehicle() || other->IsSubclassOfVehicleTank()
+                || other->isSubclassOf(VehicleCollisionEntity)) {
+                weap->m_iNumHits++;
+                weap->m_iNumTorsoShots++;
 
-            if (weap->IsSubclassOfVehicleTurretGun()) {
-                VehicleTurretGun* t = (VehicleTurretGun*)weap.Pointer();
-                Player* p = (Player*)t->GetRemoteOwner().Pointer();
+                if (weap->IsSubclassOfVehicleTurretGun()) {
+                    VehicleTurretGun *t = (VehicleTurretGun *)weap.Pointer();
+                    Player           *p = (Player *)t->GetRemoteOwner().Pointer();
 
-                if (p && p->IsSubclassOfPlayer()) {
-                    p->m_iNumHits++;
-                    p->m_iNumTorsoShots++;
+                    if (p && p->IsSubclassOfPlayer()) {
+                        p->m_iNumHits++;
+                        p->m_iNumTorsoShots++;
+                    }
                 }
             }
         }
@@ -1291,7 +1292,7 @@ void Projectile::Touch(Event *ev)
     PostEvent(EV_Remove, 0);
 
     // Call the explosion event
-    Event* explEv;
+    Event *explEv;
     explEv = new Event(EV_Projectile_Explode);
     explEv->AddEntity(other);
     ProcessEvent(explEv);
@@ -1301,21 +1302,21 @@ void Projectile::Touch(Event *ev)
     //  Check for projectile vulnerability
     //
 
-    Vehicle* pVehicle = NULL;
+    Vehicle *pVehicle = NULL;
 
     if (other->IsSubclassOfVehicle()) {
-        pVehicle = static_cast<Vehicle*>(other);
+        pVehicle = static_cast<Vehicle *>(other);
     } else if (other->IsSubclassOfVehicleTurretGun()) {
-        VehicleTurretGun* pTurret = static_cast<VehicleTurretGun*>(other);
-        Entity* pEnt = pTurret->GetVehicle();
+        VehicleTurretGun *pTurret = static_cast<VehicleTurretGun *>(other);
+        Entity           *pEnt    = pTurret->GetVehicle();
         if (pEnt && pEnt->IsSubclassOfVehicle()) {
-            pVehicle = static_cast<Vehicle*>(pEnt);
+            pVehicle = static_cast<Vehicle *>(pEnt);
         }
     } else if (other->isSubclassOf(VehicleCollisionEntity)) {
-        VehicleCollisionEntity* pCollision = static_cast<VehicleCollisionEntity*>(other);
+        VehicleCollisionEntity *pCollision = static_cast<VehicleCollisionEntity *>(other);
 
         if (pCollision && pCollision->GetOwner()->IsSubclassOfVehicle()) {
-            pVehicle = static_cast<Vehicle*>(pCollision->GetOwner());
+            pVehicle = static_cast<Vehicle *>(pCollision->GetOwner());
         }
     }
 
@@ -1920,6 +1921,7 @@ Projectile *ProjectileAttack(
     proj->edict->r.ownerNum = owner->entnum;
     proj->angles            = dir.toAngles();
     proj->charge_fraction   = fraction;
+    proj->weap              = weap;
 
     if (!real_speed) {
         if (proj->projFlags & P_CHARGE_SPEED) {
@@ -2270,7 +2272,7 @@ float BulletAttack(
                     if (g_showbullettrace->integer) {
                         gi.Printf("%.2f\n", newdamage);
                     }
-                    
+
                     if (newdamage < 1.f) {
                         vTmpEnd        = vTraceStart + vDir * -4;
                         trace.fraction = 1.f;
@@ -2391,10 +2393,12 @@ float BulletAttack(
                     if (trace.surfaceFlags & (SURF_FOLIAGE | SURF_GLASS | SURF_PUDDLE | SURF_PAPER)
                         || trace.contents & (CONTENTS_CLAYPIDGEON | CONTENTS_WATER)
                         || (g_protocol < protocol_e::PROTOCOL_MOHTA && trace.startsolid)
-                        || (bulletlarge && trace.ent && (g_protocol < protocol_e::PROTOCOL_MOHTA || (trace.ent->r.contents & CONTENTS_BBOX)) && !trace.ent->r.bmodel
-                            && trace.ent->entity->takedamage)
+                        || (bulletlarge && trace.ent
+                            && (g_protocol < protocol_e::PROTOCOL_MOHTA || (trace.ent->r.contents & CONTENTS_BBOX))
+                            && !trace.ent->r.bmodel && trace.ent->entity->takedamage)
                         || ((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
-                        || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal && iContinueCount < 5)) {
+                        || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal && iContinueCount < 5
+                        )) {
                         if (((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
                             || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal)) {
                             if (trace.contents & CONTENTS_FENCE) {

From 1f3661238a75fe0a1da709171f7319293f0cf8f6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:26:29 +0100
Subject: [PATCH 1770/2040] Check for valid player 0 before setting subtitle

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 1b2c6566..63bcd3e8 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3693,7 +3693,7 @@ void Entity::Sound(
                 if ((!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
                     Entity *p = G_GetEntity(0);
 
-                    if (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin)) {
+                    if (p && (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin))) {
                         cvar_t *curSubtitle = gi.Cvar_Get("curSubtitle", "0", 0);
                         int curSub;
 

From 4d2b61a7664e47bf3efba639f76af09ac6750711 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:29:12 +0100
Subject: [PATCH 1771/2040] Server-side subtitles must only work on
 single-player mode

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 63bcd3e8..4e1d98bf 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3690,7 +3690,7 @@ void Entity::Sound(
                     break;
                 }
 
-                if ((!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
+                if (g_gametype->integer == GT_SINGLE_PLAYER && (!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
                     Entity *p = G_GetEntity(0);
 
                     if (p && (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin))) {

From 7f8446ab820aa553803a24abe10da208c25d2365 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:32:50 +0100
Subject: [PATCH 1772/2040] If random alias name is NULL, use one from global
 aliases

---
 code/fgame/entity.cpp | 178 +++++++++++++++++++++---------------------
 1 file changed, 88 insertions(+), 90 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 4e1d98bf..c56ef332 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3609,106 +3609,104 @@ void Entity::Sound(
         }
 
         if (!name) {
-            name = sound_name.c_str();
+            name = gi.GlobalAlias_FindRandom(sound_name.c_str(), &ret);
         }
 
         // Play the sound
 
-        if (name != NULL) {
-            if (ret) {
-                aliaschannel = ret->channel;
-                aliasvolume = G_Random() * ret->volumeMod + ret->volume;
-                aliaspitch = G_Random() * ret->pitchMod + ret->pitch;
-                aliasmin_dist = ret->dist;
-                aliasmax_dist = ret->maxDist;
+        if (name && ret) {
+            aliaschannel = ret->channel;
+            aliasvolume = G_Random() * ret->volumeMod + ret->volume;
+            aliaspitch = G_Random() * ret->pitchMod + ret->pitch;
+            aliasmin_dist = ret->dist;
+            aliasmax_dist = ret->maxDist;
+
+            if (channel < 0) {
+                channel = ret->channel;
+            }
+
+            num = entnum;
+            if (sound_origin) {
+                VectorCopy(*sound_origin, org);
+                num = ENTITYNUM_NONE;
+            } else {
+                VectorCopy(edict->s.origin, org);
+
+                if (doCallback) {
+                    num |= S_FLAG_DO_CALLBACK;
+                }
+            }
+
+            switch (argstype) {
+            case 0:
+                volume = aliasvolume;
+                pitch = aliaspitch;
+                min_dist = aliasmin_dist;
+                max_dist = aliasmax_dist;
+                channel = aliaschannel;
+                break;
+            case 1:
+                if (volume >= 0.0f) {
+                    volume = volume * aliasvolume;
+                } else {
+                    volume = aliasvolume;
+                }
+
+                if (pitch >= 0.0f) {
+                    pitch = pitch * aliaspitch;
+                } else {
+                    pitch = aliaspitch;
+                }
+
+                if (min_dist < 0.0f) {
+                    min_dist = aliasmin_dist;
+                }
+
+                if (max_dist < 0.0f) {
+                    max_dist = aliasmax_dist;
+                }
 
                 if (channel < 0) {
-                    channel = ret->channel;
-                }
-
-                num = entnum;
-                if (sound_origin) {
-                    VectorCopy(*sound_origin, org);
-                    num = ENTITYNUM_NONE;
-                } else {
-                    VectorCopy(edict->s.origin, org);
-
-                    if (doCallback) {
-                        num |= S_FLAG_DO_CALLBACK;
-                    }
-                }
-
-                switch (argstype) {
-                case 0:
-                    volume = aliasvolume;
-                    pitch = aliaspitch;
-                    min_dist = aliasmin_dist;
-                    max_dist = aliasmax_dist;
                     channel = aliaschannel;
-                    break;
-                case 1:
-                    if (volume >= 0.0f) {
-                        volume = volume * aliasvolume;
-                    } else {
-                        volume = aliasvolume;
-                    }
-
-                    if (pitch >= 0.0f) {
-                        pitch = pitch * aliaspitch;
-                    } else {
-                        pitch = aliaspitch;
-                    }
-
-                    if (min_dist < 0.0f) {
-                        min_dist = aliasmin_dist;
-                    }
-
-                    if (max_dist < 0.0f) {
-                        max_dist = aliasmax_dist;
-                    }
-
-                    if (channel < 0) {
-                        channel = aliaschannel;
-                    }
-                    break;
-                default:
-                    if (volume < 0.0) {
-                        volume = aliasvolume;
-                    }
-                    if (pitch < 0.0) {
-                        pitch = aliaspitch;
-                    }
-                    if (min_dist < 0.0) {
-                        min_dist = aliasmin_dist;
-                    }
-                    if (max_dist < 0.0) {
-                        max_dist = aliasmax_dist;
-                    }
-                    if (channel < 0) {
-                        channel = aliaschannel;
-                    }
-                    break;
                 }
-
-                if (g_gametype->integer == GT_SINGLE_PLAYER && (!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
-                    Entity *p = G_GetEntity(0);
-
-                    if (p && (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin))) {
-                        cvar_t *curSubtitle = gi.Cvar_Get("curSubtitle", "0", 0);
-                        int curSub;
-
-                        gi.cvar_set(va("subtitle%d", curSubtitle->integer), va("%s", ret->subtitle));
-                        curSub = curSubtitle->integer + 1;
-                        if (curSubtitle->integer + 1 < 0) {
-                            curSub = curSubtitle->integer + MAX_SUBTITLES;
-                        }
-                        
-                        gi.cvar_set("curSubtitle", va("%d", (curSubtitle->integer + 1) - MAX_SUBTITLES * (curSub >> 2)));
-                    }
+                break;
+            default:
+                if (volume < 0.0) {
+                    volume = aliasvolume;
                 }
-
-                gi.Sound(&org, num, channel, name, volume, min_dist, pitch, max_dist, ret->streamed);
+                if (pitch < 0.0) {
+                    pitch = aliaspitch;
+                }
+                if (min_dist < 0.0) {
+                    min_dist = aliasmin_dist;
+                }
+                if (max_dist < 0.0) {
+                    max_dist = aliasmax_dist;
+                }
+                if (channel < 0) {
+                    channel = aliaschannel;
+                }
+                break;
             }
+
+            if (g_gametype->integer == GT_SINGLE_PLAYER && (!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
+                Entity *p = G_GetEntity(0);
+
+                if (p && (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin))) {
+                    cvar_t *curSubtitle = gi.Cvar_Get("curSubtitle", "0", 0);
+                    int curSub;
+
+                    gi.cvar_set(va("subtitle%d", curSubtitle->integer), va("%s", ret->subtitle));
+                    curSub = curSubtitle->integer + 1;
+                    if (curSubtitle->integer + 1 < 0) {
+                        curSub = curSubtitle->integer + MAX_SUBTITLES;
+                    }
+                    
+                    gi.cvar_set("curSubtitle", va("%d", (curSubtitle->integer + 1) - MAX_SUBTITLES * (curSub >> 2)));
+                }
+            }
+
+            gi.Sound(&org, num, channel, name, volume, min_dist, pitch, max_dist, ret->streamed);
         } else {
             gi.DPrintf(
                 "ERROR: Entity::Sound: %s needs an alias in ubersound.scr or uberdialog.scr - Please fix.\n",

From f999d87f682c7e42d1ad233592b6eda0694ee3f3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:37:12 +0100
Subject: [PATCH 1773/2040] Set the subtitle regardless of g_subtitle if the
 alias indicate it's forced

---
 code/fgame/entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index c56ef332..055b2877 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -3689,7 +3689,7 @@ void Entity::Sound(
                 break;
             }
 
-            if (g_gametype->integer == GT_SINGLE_PLAYER && (!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER && (ret->forcesubtitle || !checkSubtitle || g_subtitle->integer) && ret->subtitle) {
                 Entity *p = G_GetEntity(0);
 
                 if (p && (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin))) {

From adc2704da0149e3dfd28c53269ed55bdc41882df Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:09:28 +0100
Subject: [PATCH 1774/2040] Improve code clarity

---
 code/fgame/dm_manager.cpp | 107 ++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 55 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 2a8075ce..a479f53a 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -58,15 +58,12 @@ static qboolean SpotWouldTelefrag(float *origin)
 static int compare_spawnsort(const void *pe1, const void *pe2)
 {
     float fDelta = ((spawnsort_t *)pe1)->fMetric - ((spawnsort_t *)pe2)->fMetric;
-
-    if (fDelta >= -0.001f) {
-        if (fDelta <= 0.001f) {
-            return 0;
-        } else {
-            return -1;
-        }
-    } else {
+    if (fDelta < -0.001) {
         return 1;
+    } else if (fDelta > 0.001) {
+        return -1;
+    } else {
+        return 0;
     }
 }
 
@@ -83,56 +80,56 @@ static PlayerStart *GetRandomSpawnpointFromList(spawnsort_t *pSpots, int nSpots)
 
     qsort(pSpots, nSpots, sizeof(spawnsort_t), compare_spawnsort);
 
-    if (pSpots[0].fMetric > 0.0f) {
-        if (nSpots > 5) {
-            nSpots = 5;
-        }
-
-        fMinPosMetric = pSpots[0].fMetric * nSpots;
-        fTotalMetric  = fMinPosMetric;
-
-        if (nSpots <= 1) {
-            fChosen = fMinPosMetric;
-        } else {
-            i            = 0;
-            fTotalMetric = 0.0f;
-
-            for (i = 0; i < nSpots; i++) {
-                if (pSpots[i].fMetric <= 0.0f) {
-                    break;
-                }
-
-                fChosen = pSpots[i].fMetric * (nSpots - i);
-                fTotalMetric += fChosen;
-
-                i++;
-            }
-
-            if (i < nSpots) {
-                fChosen = fMinPosMetric;
-            }
-
-            fMinPosMetric = fTotalMetric;
-        }
-
-        fTotalMetric = (fMinPosMetric - i * fChosen * 0.90f) * G_Random();
-        for (i = 0; i < nSpots - 1; i++) {
-            fTotalMetric -= (nSpots - i) * pSpots[i].fMetric - (fChosen * 0.90f);
-            if (fTotalMetric <= 0.0f) {
-                break;
-            }
-        }
-
-        return pSpots[i].spawnpoint;
-    } else {
+    if (pSpots[0].fMetric <= 0) {
         // return the spot anyway
         return pSpots[0].spawnpoint;
     }
+
+    if (nSpots > 5) {
+        nSpots = 5;
+    }
+
+    fMinPosMetric = pSpots[0].fMetric * nSpots;
+    fTotalMetric  = fMinPosMetric;
+
+    if (nSpots > 1) {
+        i            = 0;
+        fTotalMetric = 0.0f;
+
+        for (i = 0; i < nSpots; i++) {
+            if (pSpots[i].fMetric <= 0.0f) {
+                break;
+            }
+
+            fChosen = pSpots[i].fMetric * (nSpots - i);
+            fTotalMetric += fChosen;
+
+            i++;
+        }
+
+        if (i < nSpots) {
+            fChosen = fMinPosMetric;
+        }
+        
+        fMinPosMetric = fTotalMetric;
+    } else {
+        fChosen = fMinPosMetric;
+    }
+
+    fTotalMetric = (fMinPosMetric - i * fChosen * 0.9) * G_Random();
+    for (i = 0; i < nSpots - 1; i++) {
+        fTotalMetric -= (nSpots - i) * pSpots[i].fMetric - (fChosen * 0.9);
+        if (fTotalMetric <= 0) {
+            break;
+        }
+    }
+
+    return pSpots[i].spawnpoint;
 }
 
 float SpawnpointMetric_Ffa(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    float fMinEnemyDistSquared = Square(23170);
+    float fMinEnemyDistSquared = Square(23170.f);
     int   i;
     int   nPlayers = dmManager.PlayerCount();
     float fDist;
@@ -150,12 +147,12 @@ float SpawnpointMetric_Ffa(const vec3_t origin, DM_Team *dmTeam, const Player *p
         }
     }
 
-    return fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * Square(1024);
+    return fMinEnemyDistSquared - Square(1024) * (G_Random(0.25) + 1.0);
 }
 
 float SpawnpointMetric_Team(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    float fMinEnemyDistSquared  = Square(23170);
+    float fMinEnemyDistSquared  = Square(23170.f);
     float fSumFriendDistSquared = 0.0f;
     float fDistSquared;
     float fMetric;
@@ -179,10 +176,10 @@ float SpawnpointMetric_Team(const vec3_t origin, DM_Team *dmTeam, const Player *
         }
     }
 
-    fMetric = fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * Square(1024);
+    fMetric = fMinEnemyDistSquared - Square(1024) * (G_Random(0.25) + 1.0);
 
     if (nFriends) {
-        fMetric += 0.25f * ((23170.0f * 23170.0f) - fSumFriendDistSquared / nFriends);
+        fMetric += Square(23170) * 0.25 - fSumFriendDistSquared / nFriends;
     }
 
     return fMetric;

From ce38cf904092e09cb8f626ed8f618d2f199051ea Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:09:44 +0100
Subject: [PATCH 1775/2040] Add missing newline for the health pickup message

---
 code/fgame/health.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/health.cpp b/code/fgame/health.cpp
index b438b627..a7d19f33 100644
--- a/code/fgame/health.cpp
+++ b/code/fgame/health.cpp
@@ -114,7 +114,7 @@ void Health::PickupHealth(Event *ev)
 
     gi.SendServerCommand(
         player->edict - g_entities,
-        "print \"" HUD_MESSAGE_YELLOW "%s \"",
+        "print \"" HUD_MESSAGE_YELLOW "%s\n\"",
         gi.LV_ConvertString(va("Recovered %d Health", amount))
     );
 }

From 3bcd5cf308018fd955ef8bb9e50b66dc46e909cd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:26:33 +0100
Subject: [PATCH 1776/2040] Add UColor copy constructor

---
 code/uilib/ucolor.cpp | 8 ++++++++
 code/uilib/ucolor.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/code/uilib/ucolor.cpp b/code/uilib/ucolor.cpp
index 623fcb02..0544f0d1 100644
--- a/code/uilib/ucolor.cpp
+++ b/code/uilib/ucolor.cpp
@@ -121,6 +121,14 @@ UColor::UColor
 	}
 }
 
+UColor::UColor(const UColor& color)
+	: r(color.r)
+	, g(color.g)
+	, b(color.b)
+	, a(color.a)
+{
+}
+
 UColor::operator float *( )
 {
 	return ( float * )this;
diff --git a/code/uilib/ucolor.h b/code/uilib/ucolor.h
index 8200cd37..3fa7fa92 100644
--- a/code/uilib/ucolor.h
+++ b/code/uilib/ucolor.h
@@ -32,6 +32,7 @@ public:
 	UColor();
 	UColor( float r, float g, float b, float a = 1.0 );
 	UColor( class UColorHSV hsv );
+	UColor( const UColor& color );
 
 	operator float *( );
 	operator float *( ) const;

From 25f4d0199dd5ef4cc694ab3b4a289b12c6955b29 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:32:03 +0100
Subject: [PATCH 1777/2040] Use const UColor pointer

---
 code/uilib/uiconsole.cpp | 12 ++++++------
 code/uilib/uiconsole.h   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/uilib/uiconsole.cpp b/code/uilib/uiconsole.cpp
index 24cfb5c1..c77f1b73 100644
--- a/code/uilib/uiconsole.cpp
+++ b/code/uilib/uiconsole.cpp
@@ -305,7 +305,7 @@ void UIConsole::setConsoleHandler
 void UIConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -488,7 +488,7 @@ void UIConsole::Draw
 	)
 
 {
-	UColor* pCurrColor;
+	const UColor* pCurrColor;
 
 	m_font->setColor(m_foreground_color);
 	pCurrColor = &m_foreground_color;
@@ -945,7 +945,7 @@ void UIFloatingConsole::OnChildSizeChanged
 void UIFloatingConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1132,7 +1132,7 @@ void UIDMConsole::KeyEnter
 void UIDMConsole::AddDMMessageText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1465,7 +1465,7 @@ void UIFloatingDMConsole::OnChildSizeChanged
 void UIFloatingDMConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1477,7 +1477,7 @@ void UIFloatingDMConsole::AddText
 void UIFloatingDMConsole::AddDMMessageText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
diff --git a/code/uilib/uiconsole.h b/code/uilib/uiconsole.h
index 5c9ddc02..41d3393c 100644
--- a/code/uilib/uiconsole.h
+++ b/code/uilib/uiconsole.h
@@ -30,7 +30,7 @@ public:
 	int lines;
 	int begins[ 10 ];
 	int breaks[ 10 ];
-	UColor *pColor;
+	const UColor *pColor;
 
 	item();
 };
@@ -85,7 +85,7 @@ public:
 	UIConsole();
 
 	void		setConsoleHandler( consoleHandler_t handler );
-	void		AddText( const char *text, UColor *pColor );
+	void		AddText( const char *text, const UColor *pColor );
 	void		CalcLineBreaks( item& theItem );
 	void		Clear( void );
 	void		FrameInitialized( void ) override;
@@ -112,7 +112,7 @@ public:
 
 	void		FrameInitialized( void ) override;
 	void		OnChildSizeChanged( Event *ev );
-	void		AddText( const char *text, UColor *pColor );
+	void		AddText( const char *text, const UColor *pColor );
 	void		setConsoleHandler( consoleHandler_t handler );
 	void		Clear( void );
 	void		OnClosePressed( Event *ev );
@@ -133,7 +133,7 @@ private:
 public:
 	UIDMConsole();
 
-	void			AddDMMessageText( const char *text, UColor *pColor );
+	void			AddDMMessageText( const char *text, const UColor *pColor );
 	void			Draw( void ) override;
 	qboolean		KeyEvent( int key, unsigned int time ) override;
 	qboolean		GetQuickMessageMode( void );
@@ -159,8 +159,8 @@ public:
 
 	void			FrameInitialized( void ) override;
 	void			OnChildSizeChanged( Event *ev );
-	void			AddText( const char *text, UColor *pColor );
-	void			AddDMMessageText( const char *text, UColor *pColor );
+	void			AddText( const char *text, const UColor *pColor );
+	void			AddDMMessageText( const char *text, const UColor *pColor );
 	void			setConsoleHandler( consoleHandler_t handler );
 	void			Clear( void );
 	void			OnClosePressed( Event *ev );

From d6db83805dbbb96440769035f372c141f719e33e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:39:45 +0100
Subject: [PATCH 1778/2040] Make chat message colors brighter

---
 code/client/cl_ui.cpp      | 20 ++++++++++++--------
 code/client/cl_ui.h        | 11 +++++++----
 code/client/cl_uidmbox.cpp | 10 +++-------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 363723ff..8e1a6b81 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -152,6 +152,10 @@ static str               scoreboard_menuname;
 static str               ui_sCurrentLoadingMenu;
 static Container<Menu *> hudList;
 
+const UColor UWhiteChatMessageColor(0.75, 0.75, 0.75);
+const UColor URedChatMessageColor(1.0, 0.25, 0.25);
+const UColor UGreenChatMessageColor(0.0, 1.0, 0.25, 1.0);
+
 void UI_MultiplayerMenuWidgetsUpdate(void);
 void UI_MultiplayerMainMenuWidgetsUpdate(void);
 void UI_MainMenuWidgetsUpdate(void);
@@ -1303,11 +1307,11 @@ UI_PrintConsole
 */
 void UI_PrintConsole(const char *msg)
 {
-    UColor     *pColor = NULL;
-    const char *pszString;
-    char        szString[1024];
-    char        szBlah[1024];
-    qboolean    bPrintedDMBox = qfalse;
+    const UColor *pColor = NULL;
+    const char   *pszString;
+    char          szString[1024];
+    char          szBlah[1024];
+    qboolean      bPrintedDMBox = qfalse;
 
     pszString = msg;
     strncpy(szString, msg, 1024);
@@ -1325,7 +1329,7 @@ void UI_PrintConsole(const char *msg)
             break;
         case MESSAGE_CHAT_WHITE:
             bDMMessage = qtrue;
-            pColor     = &UGrey;
+            pColor     = &UWhiteChatMessageColor;
             break;
         case MESSAGE_WHITE:
             bBold  = qtrue;
@@ -1333,11 +1337,11 @@ void UI_PrintConsole(const char *msg)
             break;
         case MESSAGE_CHAT_RED:
             bDeathMessage = MESSAGE_CHAT_RED;
-            pColor        = &ULightRed;
+            pColor        = &URedChatMessageColor;
             break;
         case MESSAGE_CHAT_GREEN:
             bDeathMessage = MESSAGE_CHAT_GREEN;
-            pColor        = &UGreen;
+            pColor        = &UGreenChatMessageColor;
             break;
         }
 
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 60da029e..ab3a001e 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -47,10 +47,13 @@ void CL_ShutdownUI(void);
 //
 // general ui stuff
 //
-extern inventory_t client_inv;
-extern bind_t      client_bind;
-extern cvar_t     *cl_greenfps;
-extern qboolean    server_loading;
+extern inventory_t  client_inv;
+extern bind_t       client_bind;
+extern cvar_t      *cl_greenfps;
+extern qboolean     server_loading;
+extern const UColor UWhiteChatMessageColor;
+extern const UColor URedChatMessageColor;
+extern const UColor UGreenChatMessageColor;
 
 const char *CvarGetForUI(const char *name, const char *defval);
 void        UI_ClearState(void);
diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 5131d83d..87c44e40 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -299,23 +299,19 @@ void UIDMBox::Print(const char *text)
     m_items[m_numitems].flags = 0;
 
     if (*text == MESSAGE_CHAT_WHITE) {
-        m_items[m_numitems].color = UGrey;
+        m_items[m_numitems].color = UWhiteChatMessageColor;
         m_items[m_numitems].font  = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
 
         text1 = text + 1;
     } else if (*text == MESSAGE_CHAT_RED) {
-        m_items[m_numitems].color = ULightRed;
+        m_items[m_numitems].color = URedChatMessageColor;
         m_items[m_numitems].font  = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
         text1 = text + 1;
     } else if (*text == MESSAGE_CHAT_GREEN) {
-        if (com_target_game->integer >= TG_MOHTA) {
-            m_items[m_numitems].color = ULightGreen;
-        } else {
-            m_items[m_numitems].color = UGreen;
-        }
+        m_items[m_numitems].color = UGreenChatMessageColor;
         m_items[m_numitems].font = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 

From 4c06dd7107fede8c501df16f48ec5aa620c0e9b1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:40:11 +0100
Subject: [PATCH 1779/2040] Make UColor constant

---
 code/uilib/ucolor.cpp | 26 +++++++++++++-------------
 code/uilib/ucolor.h   | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/code/uilib/ucolor.cpp b/code/uilib/ucolor.cpp
index 0544f0d1..3a62c5fa 100644
--- a/code/uilib/ucolor.cpp
+++ b/code/uilib/ucolor.cpp
@@ -23,19 +23,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "ucolor.h"
 #include <cmath>
 
-UColor UClear( 0, 0, 0, 0 );
-UColor UWhite( 1, 1, 1, 1 );
-UColor UBlack( 0, 0, 0, 1 );
-UColor ULightGrey( 0.875, 0.875, 0.875, 1.0 );
-UColor UGrey( 0.75, 0.75, 0.75, 1.0 );
-UColor UDarkGrey( 0.5, 0.5, 0.5, 1.0 );
-UColor ULightRed( 1.0, 0.5, 0.5, 1.0 );
-UColor URed( 1.0, 0.0, 0.0, 1.0 );
-UColor UGreen( 0.0, 1.0, 0.0, 1.0 );
-UColor ULightGreen( 0.5, 1.0, 0.5, 1.0 );
-UColor UBlue( 0.0, 0.0, 1.0, 1.0 );
-UColor UYellow( 1.0, 1.0, 0.0, 1.0 );
-UColor UHudColor( 0.7f, 0.6f, 0.05f, 1.0f );
+const UColor UClear( 0, 0, 0, 0 );
+const UColor UWhite( 1, 1, 1, 1 );
+const UColor UBlack( 0, 0, 0, 1 );
+const UColor ULightGrey( 0.875, 0.875, 0.875, 1.0 );
+const UColor UGrey( 0.75, 0.75, 0.75, 1.0 );
+const UColor UDarkGrey( 0.5, 0.5, 0.5, 1.0 );
+const UColor ULightRed( 1.0, 0.5, 0.5, 1.0 );
+const UColor URed( 1.0, 0.0, 0.0, 1.0 );
+const UColor UGreen( 0.0, 1.0, 0.0, 1.0 );
+const UColor ULightGreen( 0.5, 1.0, 0.5, 1.0 );
+const UColor UBlue( 0.0, 0.0, 1.0, 1.0 );
+const UColor UYellow( 1.0, 1.0, 0.0, 1.0 );
+const UColor UHudColor( 0.7f, 0.6f, 0.05f, 1.0f );
 
 UColor::UColor
 	(
diff --git a/code/uilib/ucolor.h b/code/uilib/ucolor.h
index 3fa7fa92..29e3345e 100644
--- a/code/uilib/ucolor.h
+++ b/code/uilib/ucolor.h
@@ -72,16 +72,16 @@ public:
 	void CreateSolidBorder( const UColor& color, colorType_t type );
 };
 
-extern UColor UClear;
-extern UColor UWhite;
-extern UColor UBlack;
-extern UColor ULightGrey;
-extern UColor UGrey;
-extern UColor UDarkGrey;
-extern UColor ULightRed;
-extern UColor URed;
-extern UColor UGreen;
-extern UColor ULightGreen;
-extern UColor UBlue;
-extern UColor UYellow;
-extern UColor UHudColor;
+extern const UColor UClear;
+extern const UColor UWhite;
+extern const UColor UBlack;
+extern const UColor ULightGrey;
+extern const UColor UGrey;
+extern const UColor UDarkGrey;
+extern const UColor ULightRed;
+extern const UColor URed;
+extern const UColor UGreen;
+extern const UColor ULightGreen;
+extern const UColor UBlue;
+extern const UColor UYellow;
+extern const UColor UHudColor;

From f7947b3fe3b9a42a9186f6036fc584562b1829d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 01:03:35 +0100
Subject: [PATCH 1780/2040] Add playerbot_strategy source files

---
 code/fgame/playerbot_strategy.cpp | 28 +++++++++++++++++++++++
 code/fgame/playerbot_strategy.h   | 37 +++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 code/fgame/playerbot_strategy.cpp
 create mode 100644 code/fgame/playerbot_strategy.h

diff --git a/code/fgame/playerbot_strategy.cpp b/code/fgame/playerbot_strategy.cpp
new file mode 100644
index 00000000..db8e8b83
--- /dev/null
+++ b/code/fgame/playerbot_strategy.cpp
@@ -0,0 +1,28 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "g_local.h"
+#include "playerbot_strategy.h"
+
+CLASS_DECLARATION(SimpleEntity, NavigationPoint, NULL) {
+    {NULL, NULL}
+};
diff --git a/code/fgame/playerbot_strategy.h b/code/fgame/playerbot_strategy.h
new file mode 100644
index 00000000..8352e1f9
--- /dev/null
+++ b/code/fgame/playerbot_strategy.h
@@ -0,0 +1,37 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_strategy.h: Bot strategy & navigation points
+
+#pragma once
+
+#include "simpleentity.h"
+
+//
+// Abstract class for navigation points
+//
+class NavigationPoint : public SimpleEntity
+{
+public:
+    CLASS_PROTOTYPE(NavigationPoint);
+
+    // TODO
+};

From 8cc1cd6f2c167ce7ce77e8cceee10b275e0ac4d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 01:07:45 +0100
Subject: [PATCH 1781/2040] Install audio libraries for CodeQL

---
 .github/workflows/main-codeql.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/main-codeql.yml b/.github/workflows/main-codeql.yml
index 5068a534..5de08e79 100644
--- a/.github/workflows/main-codeql.yml
+++ b/.github/workflows/main-codeql.yml
@@ -47,6 +47,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required packages
+      with:
+        packages: libopenal-dev libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
+        version: "0.1"
+
     # Setup SDL
     - name: Set up SDL
       id: sdl

From b95241dcfec29f0c7af55ecbe61fee2f86ae4886 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 20:49:25 +0100
Subject: [PATCH 1782/2040] Rotate audio listener by +90 degrees forward

This fixes wrong spatialization of 3D sources with HRTF
---
 code/client/snd_openal_new.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index d09bbaa3..151bd9c4 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2250,12 +2250,14 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Orientation
     //
-    alorientation[0][0] = vAxis[0][0];
-    alorientation[0][1] = vAxis[0][1];
-    alorientation[0][2] = vAxis[0][2];
-    alorientation[1][0] = vAxis[2][0];
-    alorientation[1][1] = vAxis[2][1];
-    alorientation[1][2] = vAxis[2][2];
+
+    // +90 degrees forward
+    alorientation[0][0] = -vAxis[2][0];
+    alorientation[0][1] = -vAxis[2][1];
+    alorientation[0][2] = -vAxis[2][2];
+    alorientation[1][0] = vAxis[0][0];
+    alorientation[1][1] = vAxis[0][1];
+    alorientation[1][2] = vAxis[0][2];
     qalListenerfv(AL_ORIENTATION, (const ALfloat *)alorientation);
     alDieIfError();
 

From bbdbe62930ed9ed6524a1362e7280c0d3d3fb5d7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 21:41:49 +0100
Subject: [PATCH 1783/2040] Let SetOwner() assign the edict's ownerNum

---
 code/fgame/weaputils.cpp | 10 +++++++---
 code/fgame/weaputils.h   |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 72117e3a..62acae3e 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -940,6 +940,13 @@ void Projectile::SetSmashThroughGlass(Event *ev)
 }
 
 void Projectile::SmashThroughGlassThink(Event *ev)
+{
+    SmashThroughGlassThink();
+
+    PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
+}
+
+void Projectile::SmashThroughGlassThink()
 {
     if (velocity.length() > m_iSmashThroughGlass) {
         Vector  vEnd;
@@ -961,8 +968,6 @@ void Projectile::SmashThroughGlassThink(Event *ev)
             }
         }
     }
-
-    PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
 }
 
 void Projectile::BeamCommand(Event *ev)
@@ -1918,7 +1923,6 @@ Projectile *ProjectileAttack(
     proj->setMoveType(MOVETYPE_BOUNCE);
     proj->ProcessInitCommands();
     proj->SetOwner(owner);
-    proj->edict->r.ownerNum = owner->entnum;
     proj->angles            = dir.toAngles();
     proj->charge_fraction   = fraction;
     proj->weap              = weap;
diff --git a/code/fgame/weaputils.h b/code/fgame/weaputils.h
index 744139c8..2cff35ed 100644
--- a/code/fgame/weaputils.h
+++ b/code/fgame/weaputils.h
@@ -87,8 +87,12 @@ public:
 	bool m_bDieInWater;
 	// Added in 2.0
 	int m_iTeam;
+
+	//
+    // Added in OPM
+	//
 	bool m_bHadPlayerOwner;
-	SafePtr<Entity> m_pOwnerPtr;
+    SafePtr<Entity> m_pOwnerPtr;
 
 	Projectile();
 	void Archive( Archiver &arc ) override;
@@ -127,6 +131,7 @@ public:
 	void			HeatSeek( Event *ev );
 	void			Drunk( Event *ev );
 	void			SmashThroughGlassThink( Event *ev );
+	void			SmashThroughGlassThink(); // Added in OPM
 	void			AddOwnerVelocity( Event *ev );
 	void			Prethink( Event *ev );
 	float			ResolveMinimumDistance( Entity *potential_target, float currmin );
@@ -146,7 +151,7 @@ public:
 	//
 	// Added in OPM
 	//
-	bool			CheckTeams( void );
+	bool			CheckTeams(void);
 };
 
 inline void Projectile::SetMartyr(int entnum)

From 7ba29029e108888744c71cceee6781b7bd79ec1a Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Wed, 8 Jan 2025 11:26:54 +0200
Subject: [PATCH 1784/2040] Add support for additional BSD platforms in
 platform detection

---
 code/gamespy/common/gsPlatform.h |  2 +-
 code/qcommon/q_platform.h        | 36 +++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/code/gamespy/common/gsPlatform.h b/code/gamespy/common/gsPlatform.h
index 6264efc4..780abd8f 100644
--- a/code/gamespy/common/gsPlatform.h
+++ b/code/gamespy/common/gsPlatform.h
@@ -34,7 +34,7 @@
 	#endif
 #endif
 
-#if defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__)
+#if defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 	#define _UNIX
 #endif
 
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 16bb9a44..57cdd932 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -99,6 +99,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // alloca
 #ifdef _MSC_VER
 #  include <malloc.h>
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#  include <stdlib.h>
 #else
 #  include <alloca.h>
 #endif
@@ -318,16 +320,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ID_INLINE inline
 #define PATH_SEP '/'
 
-#ifdef __i386__
-#define ARCH_STRING "i386"
-#elif defined __axp__
-#define ARCH_STRING "alpha"
+#if defined(__i386__) || defined(__i386)
+#define ARCH_STRING "x86"
+#elif defined(__amd64__) || defined(__x86_64__)
+#define ARCH_STRING "x86_64"
+#elif defined(__arm__)
+#define ARCH_STRING "arm"
+#elif defined(__aarch64__)
+#define ARCH_STRING "arm64"
+#elif defined(__powerpc__) || defined(__ppc__)
+#define ARCH_STRING "ppc"
+#elif defined(__powerpc64__)
+#define ARCH_STRING "ppc64"
+#elif defined(__sparc64__)
+#define ARCH_STRING "sparc64"
+#elif defined(__mips__)
+#define ARCH_STRING "mips"
+#elif defined(__riscv)
+#if __SIZEOF_POINTER__ == 8
+#define ARCH_STRING "riscv64"
+#else
+#define ARCH_STRING "riscv"
+#endif
+#else
+#define ARCH_STRING "unknown"
 #endif
 
-#if __BIG_ENDIAN__
-#  define Q3_BIG_ENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
+#define Q3_BIG_ENDIAN
 #else
-#  define Q3_LITTLE_ENDIAN
+#define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".so"

From 2ec2ef8bbf65191c9d12c51b6ad40ea412d0b72b Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Wed, 8 Jan 2025 11:27:06 +0200
Subject: [PATCH 1785/2040] Update `sys` CMake configuration to link execinfo
 for BSD variants

---
 code/sys/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 8311c2f1..95624808 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -55,7 +55,7 @@ elseif(UNIX)
 						ERROR_VARIABLE COMPILER_OUTPUT
 						OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-		if(COMPILER_OUTPUT MATCHES "musl")
+		if(COMPILER_OUTPUT MATCHES "musl|freebsd|openbsd|netbsd")
 			target_link_libraries(syslib INTERFACE execinfo m)
 		else()
 			target_link_libraries(syslib INTERFACE m)

From 4268a875fa8d6239a9a88622414fd3cb51c6235a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 17:56:44 +0100
Subject: [PATCH 1786/2040] Revert commit
 b95241dcfec29f0c7af55ecbe61fee2f86ae4886

---
 code/client/snd_openal_new.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 151bd9c4..d09bbaa3 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -2250,14 +2250,12 @@ void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxi
     //
     // Orientation
     //
-
-    // +90 degrees forward
-    alorientation[0][0] = -vAxis[2][0];
-    alorientation[0][1] = -vAxis[2][1];
-    alorientation[0][2] = -vAxis[2][2];
-    alorientation[1][0] = vAxis[0][0];
-    alorientation[1][1] = vAxis[0][1];
-    alorientation[1][2] = vAxis[0][2];
+    alorientation[0][0] = vAxis[0][0];
+    alorientation[0][1] = vAxis[0][1];
+    alorientation[0][2] = vAxis[0][2];
+    alorientation[1][0] = vAxis[2][0];
+    alorientation[1][1] = vAxis[2][1];
+    alorientation[1][2] = vAxis[2][2];
     qalListenerfv(AL_ORIENTATION, (const ALfloat *)alorientation);
     alDieIfError();
 

From 4f32d436bb851fe46cfd7b43cdc12e27e8779dce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 18:45:05 +0100
Subject: [PATCH 1787/2040] Disable OpenAL limiter

---
 code/client/snd_openal_new.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index d09bbaa3..11517d2d 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -271,7 +271,7 @@ S_OPENAL_InitContext
 static bool S_OPENAL_InitContext()
 {
     const char *dev;
-    int         attrlist[8];
+    int         attrlist[10];
 
     Com_DPrintf("OpenAL: Context initialization\n");
 
@@ -406,10 +406,15 @@ static bool S_OPENAL_InitContext()
     );
     attrlist[4] = 0;
     attrlist[5] = 0;
-#endif
+#endif7
 
-    attrlist[6] = 0;
-    attrlist[7] = 0;
+#ifdef ALC_SOFT_output_limiter
+    // Disable limiter
+    attrlist[6] = ALC_OUTPUT_LIMITER_SOFT;
+    attrlist[7] = ALC_FALSE;
+#endif
+    attrlist[8] = 0;
+    attrlist[9] = 0;
 
     Com_Printf("OpenAL: Creating AL context...\n");
     al_context_id = qalcCreateContext(al_device, attrlist);

From d396a45e64a51f76ed4cba2831e5164f9f805bef Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 18:55:54 +0100
Subject: [PATCH 1788/2040] Annoying MSVC focus mistake

---
 code/client/snd_openal_new.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 11517d2d..956073e4 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -406,7 +406,7 @@ static bool S_OPENAL_InitContext()
     );
     attrlist[4] = 0;
     attrlist[5] = 0;
-#endif7
+#endif
 
 #ifdef ALC_SOFT_output_limiter
     // Disable limiter

From cd65424b0020c8bbcffd3210cab5724f46c48dc0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 20:32:34 +0100
Subject: [PATCH 1789/2040] Fix an infinite loop when setting up path for
 Vehicle

---
 code/fgame/vehicle.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index 1d691345..6f8ca73b 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -3465,27 +3465,26 @@ void Vehicle::SetupPath(cVehicleSpline *pPath, SimpleEntity *se)
 
     vLastOrigin = se->origin;
 
-    for (ent = se; ent != NULL; ent = ent->Next(), i++) {
+    for (ent = se; ent; ent = ent->Next(), i++) {
         Vector vDelta = vLastOrigin - ent->origin;
         float  vTmp[4];
 
         if (vDelta.length() == 0 && i > 1) {
             Com_Printf("^~^~^Warning: Vehicle Driving with a Path that contains 2 equal points\n");
-            continue;
-        }
-
-        fCurLength += vDelta.length();
-
-        vTmp[0] = fCurLength;
-        VectorCopy(ent->origin, vTmp + 1);
-
-        if (ent->IsSubclassOfVehiclePoint()) {
-            pPath->Add(vTmp, static_cast<VehiclePoint*>(ent)->spawnflags);
         } else {
-            pPath->Add(vTmp, 0);
-        }
+            fCurLength += vDelta.length();
 
-        vLastOrigin = ent->origin;
+            vTmp[0] = fCurLength;
+            VectorCopy(ent->origin, vTmp + 1);
+
+            if (ent->IsSubclassOfVehiclePoint()) {
+                pPath->Add(vTmp, static_cast<VehiclePoint*>(ent)->spawnflags);
+            } else {
+                pPath->Add(vTmp, 0);
+            }
+
+            vLastOrigin = ent->origin;
+        }
 
         if (ent == se && i > 1) {
             break;

From f91d0c16939dad71b6677c27ac95580399508c7b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 20:52:24 +0100
Subject: [PATCH 1790/2040] Add missing EV_CanSeeNoEnts

The `canseenoents` was accidentally missing from the Entity's response list, some scripts rely on it
---
 code/fgame/entity.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 055b2877..503ceb18 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -1217,6 +1217,8 @@ Event EV_CanSee
     "returns 1 if the entities can see eachother, 0 if not",
     EV_RETURN
 );
+
+// Added in 2.0
 Event EV_CanSeeNoEnts
 (
     "canseenoents",
@@ -1226,6 +1228,7 @@ Event EV_CanSeeNoEnts
     "returns 1 if the entities can see eachother, 0 if not; ignores any entities between them",
     EV_RETURN
 );
+
 Event EV_Entity_InPVS
 (
     "inpvs",
@@ -1628,6 +1631,7 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_IsTouching,                   &Entity::IsTouching               },
     {&EV_IsInside,                     &Entity::IsInside                 },
     {&EV_CanSee,                       &Entity::CanSee                   },
+    {&EV_CanSeeNoEnts,                 &Entity::CanSeeNoEnts             }, // Added in 2.0
     {&EV_Entity_InPVS,                 &Entity::EventInPVS               },
     {&EV_SetShaderData,                &Entity::SetShaderData            },
     {&EV_GetVelocity,                  &Entity::GetVelocity              },

From b84a47ad3f3b3eb26cfa53081aba8bb5b4100010 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:04:09 +0100
Subject: [PATCH 1791/2040] Localization files should be sorted
 case-insensitive

---
 code/sys/win_localization.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index 4cb6efd7..f9006b56 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -67,7 +67,7 @@ int compare_strings( const void *pe1, const void *pe2 )
 {
 	const char *psz1 = ( const char * )pe1;
 	const char *psz2 = ( const char * )pe2;
-	return strcmp( psz1, psz2 );
+	return Q_stricmp( psz1, psz2 );
 }
 
 cLocalization::cLocalization()

From 7f8bcf8075bc04ca52d16a5d5df8c8bffeb2c903 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:07:13 +0100
Subject: [PATCH 1792/2040] Don't read localization.txt file twice

---
 code/sys/win_localization.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index f9006b56..faff7f4d 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -92,10 +92,6 @@ cLocalization::cLocalization()
 		LoadFile( szFilename );
 	}
 
-	memcpy( szFilename + iBasePos, "localization.txt", 17 );
-	Com_Printf( "--- Localization: reading file %s\n", szFilename );
-	LoadFile( szFilename );
-
 	FS_FreeFileList( ppszFiles );
 }
 

From 6a31381c8e72132a517f665727f7f85e998c4d4f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:25:59 +0100
Subject: [PATCH 1793/2040] Format localization source files

---
 code/qcommon/localization.h   |   8 +-
 code/sys/win_localization.cpp | 805 ++++++++++++++++------------------
 code/sys/win_localization.h   |  38 +-
 3 files changed, 408 insertions(+), 443 deletions(-)

diff --git a/code/qcommon/localization.h b/code/qcommon/localization.h
index 847451af..79e720c5 100644
--- a/code/qcommon/localization.h
+++ b/code/qcommon/localization.h
@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-	void Sys_InitLocalization();
-	void Sys_ShutLocalization();
-	const char* Sys_LV_ConvertString(const char* var);
-	const char* Sys_LV_CL_ConvertString(const char* var);
+    void        Sys_InitLocalization();
+    void        Sys_ShutLocalization();
+    const char *Sys_LV_ConvertString(const char *var);
+    const char *Sys_LV_CL_ConvertString(const char *var);
 
 #ifdef __cplusplus
 }
diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index faff7f4d..467d1134 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -25,542 +25,507 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "win_localization.h"
 #include <tiki.h>
 
-#define MAX_BUFFERS				6
+#define MAX_BUFFERS             6
 #define MAX_LOCALIZATION_LENGTH 1024
 
 cLocalization *g_localization;
-static char global_buf[MAX_BUFFERS][MAX_LOCALIZATION_LENGTH];
-static char szTemp[ 100 ];
-static size_t buf_index = 0;
+static char    global_buf[MAX_BUFFERS][MAX_LOCALIZATION_LENGTH];
+static char    szTemp[100];
+static size_t  buf_index = 0;
 
 void Sys_InitLocalization()
 {
-	g_localization = new cLocalization;
+    g_localization = new cLocalization;
 }
 
 void Sys_ShutLocalization()
 {
-	delete g_localization;
-	g_localization = NULL;
+    delete g_localization;
+    g_localization = NULL;
 }
 
-const char *Sys_LV_ConvertString( const char *var )
+const char *Sys_LV_ConvertString(const char *var)
 {
-	//
-	// Since 2.0, don't localize messages from fgame.
-	// The client already localize messages it receives
-	//
-	return var;
+    //
+    // Since 2.0, don't localize messages from fgame.
+    // The client already localize messages it receives
+    //
+    return var;
 }
 
-const char *Sys_LV_CL_ConvertString( const char *var )
+const char *Sys_LV_CL_ConvertString(const char *var)
 {
-	if (!g_localization) {
-		return var;
-	}
+    if (!g_localization) {
+        return var;
+    }
 
-	return g_localization->ConvertString( var );
+    return g_localization->ConvertString(var);
 }
 
 typedef char *charstar;
-int compare_strings( const void *pe1, const void *pe2 )
+
+int compare_strings(const void *pe1, const void *pe2)
 {
-	const char *psz1 = ( const char * )pe1;
-	const char *psz2 = ( const char * )pe2;
-	return Q_stricmp( psz1, psz2 );
+    const char *psz1 = (const char *)pe1;
+    const char *psz2 = (const char *)pe2;
+    return Q_stricmp(psz1, psz2);
 }
 
 cLocalization::cLocalization()
 {
-	int i;
-	int iFileCount;
-	char **ppszFiles;
-	char szFilename[ MAX_QPATH ];
-	size_t iBasePos;
+    int    i;
+    int    iFileCount;
+    char **ppszFiles;
+    char   szFilename[MAX_QPATH];
+    size_t iBasePos;
 
-	ppszFiles = FS_ListFilteredFiles( "global", "txt", "localization*.txt", qfalse, &iFileCount, qtrue );
-	Q_strncpyz( szFilename, "global/", sizeof( szFilename ) );
-	memset( szFilename + 8, 0, sizeof( szFilename ) - 8 );
-	iBasePos = strlen( szFilename );
+    ppszFiles = FS_ListFilteredFiles("global", "txt", "localization*.txt", qfalse, &iFileCount, qtrue);
+    Q_strncpyz(szFilename, "global/", sizeof(szFilename));
+    memset(szFilename + 8, 0, sizeof(szFilename) - 8);
+    iBasePos = strlen(szFilename);
 
-	Com_Printf( "-- Localization: I see %d localization files\n", iFileCount );
-	qsort( ppszFiles, iFileCount, sizeof( char * ), compare_strings );
-	for( i = 0; i < iFileCount; i++ )
-	{
-		Q_strncpyz( szFilename + iBasePos, ppszFiles[ i ], sizeof( szFilename ) - iBasePos );
-		Com_Printf( "--- Localization: reading file %s\n", szFilename );
-		LoadFile( szFilename );
-	}
+    Com_Printf("-- Localization: I see %d localization files\n", iFileCount);
+    qsort(ppszFiles, iFileCount, sizeof(char *), compare_strings);
+    for (i = 0; i < iFileCount; i++) {
+        Q_strncpyz(szFilename + iBasePos, ppszFiles[i], sizeof(szFilename) - iBasePos);
+        Com_Printf("--- Localization: reading file %s\n", szFilename);
+        LoadFile(szFilename);
+    }
 
-	FS_FreeFileList( ppszFiles );
+    FS_FreeFileList(ppszFiles);
 }
 
-void cLocalization::LoadFile( const char *name )
+void cLocalization::LoadFile(const char *name)
 {
-	TikiScript tiki;
-	const char *token;
-	loc_entry_t new_entry;
-	const char *p, *p2;
-	size_t rl;
-	size_t ll;
+    TikiScript  tiki;
+    const char *token;
+    loc_entry_t new_entry;
+    const char *p, *p2;
+    size_t      rl;
+    size_t      ll;
 
-	Com_Printf( "Loading Localization File %s\n", name );
+    Com_Printf("Loading Localization File %s\n", name);
 
-	if( !tiki.LoadFile( name, qtrue ) )
-	{
-		Com_Printf( "--- Error: File Not Found\n" );
-		return;
-	}
+    if (!tiki.LoadFile(name, qtrue)) {
+        Com_Printf("--- Error: File Not Found\n");
+        return;
+    }
 
-	while( tiki.TokenAvailable( qtrue ) )
-	{
-		token = tiki.GetToken( qtrue );
+    while (tiki.TokenAvailable(qtrue)) {
+        token = tiki.GetToken(qtrue);
 
-		if( !Q_stricmp( token, "{" ) )
-		{
-			if( !tiki.TokenAvailable( qtrue ) ) {
-				break;
-			}
+        if (!Q_stricmp(token, "{")) {
+            if (!tiki.TokenAvailable(qtrue)) {
+                break;
+            }
 
-			token = tiki.GetToken( qtrue );
-			new_entry.m_refName = token;
+            token               = tiki.GetToken(qtrue);
+            new_entry.m_refName = token;
 
-			rl = strlen( token );
-			p = strstr( token, "&&&" );
+            rl = strlen(token);
+            p  = strstr(token, "&&&");
 
-			if( p )
-			{
-				new_entry.m_r1_rep = p - token;
-				p2 = p + 3;
-				p = strstr( p2, "&&&" );
+            if (p) {
+                new_entry.m_r1_rep = p - token;
+                p2                 = p + 3;
+                p                  = strstr(p2, "&&&");
 
-				if( p )
-				{
-					new_entry.m_r2_rep = p - p2;
-					new_entry.m_r3_rep = strlen( p + 3 );
-				}
-				else
-				{
-					new_entry.m_r2_rep = strlen( p2 );
-					new_entry.m_r3_rep = -1;
-				}
-			}
-			else
-			{
-				new_entry.m_r1_rep = rl;
-				new_entry.m_r2_rep = -1;
-				new_entry.m_r3_rep = -1;
-				new_entry.m_l1_rep = -1;
-				new_entry.m_l2_rep = -1;
-				new_entry.m_l3_rep = -1;
-			}
+                if (p) {
+                    new_entry.m_r2_rep = p - p2;
+                    new_entry.m_r3_rep = strlen(p + 3);
+                } else {
+                    new_entry.m_r2_rep = strlen(p2);
+                    new_entry.m_r3_rep = -1;
+                }
+            } else {
+                new_entry.m_r1_rep = rl;
+                new_entry.m_r2_rep = -1;
+                new_entry.m_r3_rep = -1;
+                new_entry.m_l1_rep = -1;
+                new_entry.m_l2_rep = -1;
+                new_entry.m_l3_rep = -1;
+            }
 
-			if( !tiki.TokenAvailable( qtrue ) )
-			{
-				Com_Printf( "--- Error: EOF Found without LocName. Last RefName was %s. (Misspelling/Unused)\n", new_entry.m_refName.c_str() );
-				break;
-			}
+            if (!tiki.TokenAvailable(qtrue)) {
+                Com_Printf(
+                    "--- Error: EOF Found without LocName. Last RefName was %s. (Misspelling/Unused)\n",
+                    new_entry.m_refName.c_str()
+                );
+                break;
+            }
 
-			token = tiki.GetToken( qtrue );
-			new_entry.m_locName = token;
+            token               = tiki.GetToken(qtrue);
+            new_entry.m_locName = token;
 
-			ll = strlen( token );
-			p = strstr( token, "&&&" );
+            ll = strlen(token);
+            p  = strstr(token, "&&&");
 
-			if( p )
-			{
-				new_entry.m_l1_rep = p - token;
-				p2 = p + 3;
-				p = strstr( p2, "&&&" );
+            if (p) {
+                new_entry.m_l1_rep = p - token;
+                p2                 = p + 3;
+                p                  = strstr(p2, "&&&");
 
-				if( p )
-				{
-					new_entry.m_l2_rep = p - p2;
-					new_entry.m_l3_rep = strlen( p + 3 );
-				}
-				else
-				{
-					new_entry.m_l2_rep = strlen( p2 );
-					new_entry.m_l3_rep = -1;
-				}
-			}
-			else
-			{
-				new_entry.m_r1_rep = rl;
-				new_entry.m_r2_rep = -1;
-				new_entry.m_r3_rep = -1;
-				new_entry.m_l1_rep = ll;
-				new_entry.m_l2_rep = -1;
-				new_entry.m_l3_rep = -1;
-			}
+                if (p) {
+                    new_entry.m_l2_rep = p - p2;
+                    new_entry.m_l3_rep = strlen(p + 3);
+                } else {
+                    new_entry.m_l2_rep = strlen(p2);
+                    new_entry.m_l3_rep = -1;
+                }
+            } else {
+                new_entry.m_r1_rep = rl;
+                new_entry.m_r2_rep = -1;
+                new_entry.m_r3_rep = -1;
+                new_entry.m_l1_rep = ll;
+                new_entry.m_l2_rep = -1;
+                new_entry.m_l3_rep = -1;
+            }
 
-			m_entries.AddObject( new_entry );
+            m_entries.AddObject(new_entry);
 
-			if( !tiki.TokenAvailable( qtrue ) ) {
-				break;
-			}
+            if (!tiki.TokenAvailable(qtrue)) {
+                break;
+            }
 
-			token = tiki.GetToken( qtrue );
+            token = tiki.GetToken(qtrue);
 
-			if( Q_stricmp( token, "}" ) )
-			{
-				Com_Printf( "--- Error: Invalid Entry... RefName: %s\t\tLocName: %s  Attempting to Recover.\n", new_entry.m_refName.c_str(), new_entry.m_locName.c_str() );
-				do
-				{
-					if( !tiki.TokenAvailable( qtrue ) )
-					{
-						Com_Printf( "--- Error: EOF Found. Unable to Recover from Error. \n" );
-						break;
-					}
+            if (Q_stricmp(token, "}")) {
+                Com_Printf(
+                    "--- Error: Invalid Entry... RefName: %s\t\tLocName: %s  Attempting to Recover.\n",
+                    new_entry.m_refName.c_str(),
+                    new_entry.m_locName.c_str()
+                );
+                do {
+                    if (!tiki.TokenAvailable(qtrue)) {
+                        Com_Printf("--- Error: EOF Found. Unable to Recover from Error. \n");
+                        break;
+                    }
 
-					token = tiki.GetToken( qtrue );
-				} while( Q_stricmp( token, "}" ) );
+                    token = tiki.GetToken(qtrue);
+                } while (Q_stricmp(token, "}"));
 
-				Com_Printf( "--- Warning: Recovered From Error, Data May have been lost.\n" );
-			}
-		}
-	}
+                Com_Printf("--- Warning: Recovered From Error, Data May have been lost.\n");
+            }
+        }
+    }
 
-	Com_Printf( "Loaded %d localization entries\n", m_entries.NumObjects() );
+    Com_Printf("Loaded %d localization entries\n", m_entries.NumObjects());
 }
 
-static int bjb_strnscmp( const char *a, const char *b, size_t n )
+static int bjb_strnscmp(const char *a, const char *b, size_t n)
 {
-	while( 1 )
-	{
-		while( isspace( (unsigned char)*a ) )
-			a++;
-		while( isspace( (unsigned char)*b ) )
-			b++;
-		while( *a && *a == *b )
-			a++, b++;
-		if( isspace( (unsigned char)*a ) )
-		{
-			if( isalnum( (unsigned char)a[ -1 ] ) && isalnum( (unsigned char)*b ) )
-				break;
-		}
-		else if( isspace( (unsigned char)*b ) )
-		{
-			if( isalnum( (unsigned char)b[ -1 ] ) && isalnum( (unsigned char)*a ) )
-				break;
-		}
-		else
-			break;
-	}
-	return *a - *b;
+    while (1) {
+        while (isspace((unsigned char)*a)) {
+            a++;
+        }
+        while (isspace((unsigned char)*b)) {
+            b++;
+        }
+        while (*a && *a == *b) {
+            a++, b++;
+        }
+        if (isspace((unsigned char)*a)) {
+            if (isalnum((unsigned char)a[-1]) && isalnum((unsigned char)*b)) {
+                break;
+            }
+        } else if (isspace((unsigned char)*b)) {
+            if (isalnum((unsigned char)b[-1]) && isalnum((unsigned char)*a)) {
+                break;
+            }
+        } else {
+            break;
+        }
+    }
+    return *a - *b;
 }
 
-static void bjb_rebreak( const char *var, char *buf, size_t max )
+static void bjb_rebreak(const char *var, char *buf, size_t max)
 {
-	const char *nl;
-	char *rb, *rb1, *rb2;
+    const char *nl;
+    char       *rb, *rb1, *rb2;
 
-	nl = strchr( var, '\n' );
-	if( !nl || nl >= &var[ max ] ) {
-		return;
-	}
+    nl = strchr(var, '\n');
+    if (!nl || nl >= &var[max]) {
+        return;
+    }
 
-	while( 1 )
-	{
-		rb = &buf[ nl - var ];
-		rb1 = &buf[ nl - var ];
-		rb2 = &buf[ nl - var ];
+    while (1) {
+        rb  = &buf[nl - var];
+        rb1 = &buf[nl - var];
+        rb2 = &buf[nl - var];
 
-		if( strlen( buf ) < nl - var ) {
-			return;
-		}
+        if (strlen(buf) < nl - var) {
+            return;
+        }
 
-		while( rb1 > var && !isspace( *rb1 ) )
-			rb1--;
-		while( *rb2 && rb2 < &var[ max ] && !isspace( *rb2 ) )
-			rb2++;
+        while (rb1 > var && !isspace(*rb1)) {
+            rb1--;
+        }
+        while (*rb2 && rb2 < &var[max] && !isspace(*rb2)) {
+            rb2++;
+        }
 
-		if( rb1 < var )
-		{
-			if( !*rb2 || !isspace( *rb2 ) ) {
-				return;
-			}
+        if (rb1 < var) {
+            if (!*rb2 || !isspace(*rb2)) {
+                return;
+            }
 
-			goto _set_new_line;
-		}
+            goto _set_new_line;
+        }
 
-		if( !*rb2 || !isspace( *rb1 ) || !isspace( *rb2 ) )
-		{
-			if( rb1 >= var && isspace( *rb1 ) ) {
-				*rb1 = '\n';
-				goto _new_line_set;
-			} else if( !*rb2 || !isspace( *rb2 ) ) {
-				return;
-			}
+        if (!*rb2 || !isspace(*rb1) || !isspace(*rb2)) {
+            if (rb1 >= var && isspace(*rb1)) {
+                *rb1 = '\n';
+                goto _new_line_set;
+            } else if (!*rb2 || !isspace(*rb2)) {
+                return;
+            }
 
-			goto _set_new_line;
-		}
+            goto _set_new_line;
+        }
 
-		if( rb - rb1 - 4 <= rb2 - rb )
-		{
-			*rb1 = '\n';
-			goto _new_line_set;
-		}
+        if (rb - rb1 - 4 <= rb2 - rb) {
+            *rb1 = '\n';
+            goto _new_line_set;
+        }
 
-_set_new_line:
-		*rb2 = '\n';
-_new_line_set:
-		nl = strchr( nl + 1, '\n' );
-		if( !nl || nl >= &var[ max ] ) {
-			return;
-		}
-	}
+    _set_new_line:
+        *rb2 = '\n';
+    _new_line_set:
+        nl = strchr(nl + 1, '\n');
+        if (!nl || nl >= &var[max]) {
+            return;
+        }
+    }
 }
 
-const char *cLocalization::ConvertString( const char *var )
+const char *cLocalization::ConvertString(const char *var)
 {
-	size_t l;
-	intptr_t i, m, n, o;
-	intptr_t nArg1;
-	const char *pArg1, *pArg2;
-	const char *pRef;
-	const char *pVar;
-	const char *pAfter;
-	const char *pSrc;
-	intptr_t nAfter, nBefore;
-	intptr_t n1, n2;
-	loc_entry_t *entry;
-	str s1, s2;
+    size_t       l;
+    intptr_t     i, m, n, o;
+    intptr_t     nArg1;
+    const char  *pArg1, *pArg2;
+    const char  *pRef;
+    const char  *pVar;
+    const char  *pAfter;
+    const char  *pSrc;
+    intptr_t     nAfter, nBefore;
+    intptr_t     n1, n2;
+    loc_entry_t *entry;
+    str          s1, s2;
 
-	l = strlen( var );
+    l = strlen(var);
 
-	for( o = l; o > 0; o-- )
-	{
-		if( var[ o - 1 ] >= ' ' ) {
-			break;
-		}
-	}
+    for (o = l; o > 0; o--) {
+        if (var[o - 1] >= ' ') {
+            break;
+        }
+    }
 
-	pRef = &var[ o ];
-	m = l - o;
-	n = 0;
+    pRef = &var[o];
+    m    = l - o;
+    n    = 0;
 
-	for( pVar = var; o > 0; o-- )
-	{
-		if( *pVar >= ' ' ) {
-			break;
-		}
+    for (pVar = var; o > 0; o--) {
+        if (*pVar >= ' ') {
+            break;
+        }
 
-		pVar++;
-		n++;
-	}
+        pVar++;
+        n++;
+    }
 
-	char* buf = global_buf[(buf_index++) % MAX_BUFFERS];
-	for( i = 1; i <= m_entries.NumObjects(); i++ )
-	{
-		entry = &m_entries.ObjectAt( i );
+    char *buf = global_buf[(buf_index++) % MAX_BUFFERS];
+    for (i = 1; i <= m_entries.NumObjects(); i++) {
+        entry = &m_entries.ObjectAt(i);
 
-		if( entry->m_r2_rep < 0 )
-		{
-			if( entry->m_r1_rep != o || bjb_strnscmp( pVar, entry->m_refName.c_str(), o ) ) {
-				continue;
-			}
+        if (entry->m_r2_rep < 0) {
+            if (entry->m_r1_rep != o || bjb_strnscmp(pVar, entry->m_refName.c_str(), o)) {
+                continue;
+            }
 
-			if( !( m + n ) )
-			{
-				strncpy( buf, entry->m_locName, MAX_LOCALIZATION_LENGTH );
-				bjb_rebreak( var, buf, MAX_LOCALIZATION_LENGTH );
-				return buf;
-			}
+            if (!(m + n)) {
+                strncpy(buf, entry->m_locName, MAX_LOCALIZATION_LENGTH);
+                bjb_rebreak(var, buf, MAX_LOCALIZATION_LENGTH);
+                return buf;
+            }
 
-			if( entry->m_l1_rep + m + n < MAX_LOCALIZATION_LENGTH )
-			{
-				memcpy( buf, var, n );
-				memcpy( &buf[ n ], entry->m_locName.c_str(), entry->m_l1_rep );
-				memcpy( &buf[ entry->m_l1_rep + n ], pRef, m );
-				buf[ entry->m_l1_rep + m + n ] = 0;
-				bjb_rebreak( var, buf, entry->m_l1_rep );
-				return buf;
-			} else {
-				return var;
-			}
-		}
+            if (entry->m_l1_rep + m + n < MAX_LOCALIZATION_LENGTH) {
+                memcpy(buf, var, n);
+                memcpy(&buf[n], entry->m_locName.c_str(), entry->m_l1_rep);
+                memcpy(&buf[entry->m_l1_rep + n], pRef, m);
+                buf[entry->m_l1_rep + m + n] = 0;
+                bjb_rebreak(var, buf, entry->m_l1_rep);
+                return buf;
+            } else {
+                return var;
+            }
+        }
 
-		nArg1 = entry->m_r1_rep + entry->m_r2_rep;
-		if( entry->m_r3_rep >= 0 ) {
-			nArg1 += entry->m_r3_rep;
-		}
+        nArg1 = entry->m_r1_rep + entry->m_r2_rep;
+        if (entry->m_r3_rep >= 0) {
+            nArg1 += entry->m_r3_rep;
+        }
 
-		if( nArg1 > o ) {
-			continue;
-		}
+        if (nArg1 > o) {
+            continue;
+        }
 
-		if( bjb_strnscmp( pVar, entry->m_refName.c_str(), entry->m_r1_rep ) ) {
-			continue;
-		}
+        if (bjb_strnscmp(pVar, entry->m_refName.c_str(), entry->m_r1_rep)) {
+            continue;
+        }
 
-		pSrc = &pVar[ entry->m_r1_rep ];
+        pSrc = &pVar[entry->m_r1_rep];
 
-		if( entry->m_r3_rep >= 0 )
-		{
-			pAfter = &entry->m_refName[ entry->m_r1_rep + 3 ];
+        if (entry->m_r3_rep >= 0) {
+            pAfter = &entry->m_refName[entry->m_r1_rep + 3];
 
-			if( entry->m_r2_rep > 100 ) {
-				continue;
-			}
+            if (entry->m_r2_rep > 100) {
+                continue;
+            }
 
-			strncpy( szTemp, pAfter, entry->m_r2_rep );
-			szTemp[ entry->m_r2_rep ] = 0;
+            strncpy(szTemp, pAfter, entry->m_r2_rep);
+            szTemp[entry->m_r2_rep] = 0;
 
-			pArg1 = strstr( pSrc, szTemp );
+            pArg1 = strstr(pSrc, szTemp);
 
-			if( !pArg1 ) {
-				continue;
-			}
+            if (!pArg1) {
+                continue;
+            }
 
-			nAfter = pArg1 - pSrc;
-			pArg2 = &pArg1[ entry->m_r2_rep ];
+            nAfter = pArg1 - pSrc;
+            pArg2  = &pArg1[entry->m_r2_rep];
 
-			if( entry->m_r3_rep > 0 )
-			{
-				if( strlen( pArg2 ) < entry->m_r3_rep ) {
-					continue;
-				}
+            if (entry->m_r3_rep > 0) {
+                if (strlen(pArg2) < entry->m_r3_rep) {
+                    continue;
+                }
 
-				if( bjb_strnscmp( &pVar[ o - entry->m_r3_rep ], &pAfter[ entry->m_r2_rep + 3 ], entry->m_r3_rep ) ) {
-					continue;
-				}
+                if (bjb_strnscmp(&pVar[o - entry->m_r3_rep], &pAfter[entry->m_r2_rep + 3], entry->m_r3_rep)) {
+                    continue;
+                }
 
-				nBefore = &pVar[ o - entry->m_r3_rep ] - pArg2;
-			} else {
-				nBefore = o - ( pArg2 - pVar );
-			}
-		}
-		else
-		{
-			if( entry->m_r2_rep > 0 )
-			{
-				if( bjb_strnscmp( &pVar[ o - entry->m_r2_rep ], &entry->m_refName[ entry->m_r1_rep + 3 ], entry->m_r2_rep ) ) {
-					continue;
-				}
+                nBefore = &pVar[o - entry->m_r3_rep] - pArg2;
+            } else {
+                nBefore = o - (pArg2 - pVar);
+            }
+        } else {
+            if (entry->m_r2_rep > 0) {
+                if (bjb_strnscmp(&pVar[o - entry->m_r2_rep], &entry->m_refName[entry->m_r1_rep + 3], entry->m_r2_rep)) {
+                    continue;
+                }
 
-				nAfter = &pVar[ o - entry->m_r2_rep ] - pSrc;
-			}
-			else
-			{
-				nAfter = o - entry->m_r1_rep;
-			}
+                nAfter = &pVar[o - entry->m_r2_rep] - pSrc;
+            } else {
+                nAfter = o - entry->m_r1_rep;
+            }
 
-			pArg2 = NULL;
-			nBefore = -1;
-		}
+            pArg2   = NULL;
+            nBefore = -1;
+        }
 
-		n1 = 0;
-		n2 = 0;
-		if( n > 0 )
-		{
-			if( n >= 1024 ) {
-				continue;
-			}
+        n1 = 0;
+        n2 = 0;
+        if (n > 0) {
+            if (n >= 1024) {
+                continue;
+            }
 
-			memcpy( buf, var, n );
-			n2 = n;
-		}
+            memcpy(buf, var, n);
+            n2 = n;
+        }
 
-		if( entry->m_l1_rep >= 0 )
-		{
-			if( entry->m_l1_rep + n2 >= 1024 ) {
-				continue;
-			}
+        if (entry->m_l1_rep >= 0) {
+            if (entry->m_l1_rep + n2 >= 1024) {
+                continue;
+            }
 
-			if( entry->m_l1_rep > 0 ) {
-				memcpy( &buf[ n2 ], &entry->m_locName[ 0 ], entry->m_l1_rep );
-			}
+            if (entry->m_l1_rep > 0) {
+                memcpy(&buf[n2], &entry->m_locName[0], entry->m_l1_rep);
+            }
 
-			n2 += entry->m_l1_rep;
-			n1 = entry->m_l1_rep + 3;
-		}
+            n2 += entry->m_l1_rep;
+            n1 = entry->m_l1_rep + 3;
+        }
 
-		if( nAfter >= 0 )
-		{
-			if( nAfter + n2 >= 1024 ) {
-				continue;
-			}
+        if (nAfter >= 0) {
+            if (nAfter + n2 >= 1024) {
+                continue;
+            }
 
-			if( nAfter > 0 ) {
-				memcpy( &buf[ n2 ], pSrc, nAfter );
-			}
+            if (nAfter > 0) {
+                memcpy(&buf[n2], pSrc, nAfter);
+            }
 
-			n2 += nAfter;
-		}
+            n2 += nAfter;
+        }
 
-		if( entry->m_l2_rep >= 0 )
-		{
-			if( entry->m_l2_rep + n2 >= 1024 ) {
-				continue;
-			}
+        if (entry->m_l2_rep >= 0) {
+            if (entry->m_l2_rep + n2 >= 1024) {
+                continue;
+            }
 
-			if( entry->m_l2_rep > 0 ) {
-				memcpy( &buf[ n2 ], &entry->m_locName[ n1 ], entry->m_l2_rep );
-			}
+            if (entry->m_l2_rep > 0) {
+                memcpy(&buf[n2], &entry->m_locName[n1], entry->m_l2_rep);
+            }
 
-			n2 += entry->m_l2_rep;
-			n1 += entry->m_l2_rep + 3;
-		}
+            n2 += entry->m_l2_rep;
+            n1 += entry->m_l2_rep + 3;
+        }
 
-		if( nBefore >= 0 )
-		{
-			if( nBefore + n2 >= 1024 ) {
-				continue;
-			}
+        if (nBefore >= 0) {
+            if (nBefore + n2 >= 1024) {
+                continue;
+            }
 
-			if( nBefore > 0 ) {
-				memcpy( &buf[ n2 ], pArg2, nBefore );
-			}
+            if (nBefore > 0) {
+                memcpy(&buf[n2], pArg2, nBefore);
+            }
 
-			n2 += nBefore;
-		}
+            n2 += nBefore;
+        }
 
-		if( entry->m_l3_rep >= 0 )
-		{
-			if( entry->m_l3_rep + n2 >= 1024 ) {
-				continue;
-			}
+        if (entry->m_l3_rep >= 0) {
+            if (entry->m_l3_rep + n2 >= 1024) {
+                continue;
+            }
 
-			if( entry->m_l3_rep > 0 ) {
-				memcpy( &buf[ n2 ], &entry->m_locName[ n1 ], entry->m_l3_rep );
-			}
+            if (entry->m_l3_rep > 0) {
+                memcpy(&buf[n2], &entry->m_locName[n1], entry->m_l3_rep);
+            }
 
-			n2 += entry->m_l3_rep;
-		}
+            n2 += entry->m_l3_rep;
+        }
 
-		if( m <= 0 || m + n2 < 1024 )
-		{
-			if( m + n2 < 1024 ) {
-				memcpy( &buf[ n2 ], pRef, m );
-				n2 += m;
-			}
+        if (m <= 0 || m + n2 < 1024) {
+            if (m + n2 < 1024) {
+                memcpy(&buf[n2], pRef, m);
+                n2 += m;
+            }
 
-			buf[ n2 ] = 0;
-			bjb_rebreak( var, buf, n2 );
-			return buf;
-		}
-	}
+            buf[n2] = 0;
+            bjb_rebreak(var, buf, n2);
+            return buf;
+        }
+    }
 
-	if( !developer->integer || !var[ 0 ] || !var[ 1 ] ) {
-		return var;
-	}
+    if (!developer->integer || !var[0] || !var[1]) {
+        return var;
+    }
 
-	i = 0;
+    i = 0;
 
-	while( var[ i ] < 0 || !isspace( var[ i ] ) )
-	{
-		i++;
-		if( !var[ i ] ) {
-			return var;
-		}
-	}
+    while (var[i] < 0 || !isspace(var[i])) {
+        i++;
+        if (!var[i]) {
+            return var;
+        }
+    }
 
-	if( !missing.ObjectInList( var ) )
-	{
-		missing.AddUniqueObject( var );
-		Com_DPrintf( "LOCALIZATION ERROR: '%s' does not have a localization entry\n", var );
-	}
+    if (!missing.ObjectInList(var)) {
+        missing.AddUniqueObject(var);
+        Com_DPrintf("LOCALIZATION ERROR: '%s' does not have a localization entry\n", var);
+    }
 
-	return var;
+    return var;
 }
diff --git a/code/sys/win_localization.h b/code/sys/win_localization.h
index ac65c14b..c49c5cff 100644
--- a/code/sys/win_localization.h
+++ b/code/sys/win_localization.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -30,32 +30,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/localization.h"
 
 #ifdef __cplusplus
-#include "str.h"
-#include "container.h"
+#    include "str.h"
+#    include "container.h"
 
 typedef struct {
-	str			m_refName;
-	str			m_locName;
-	intptr_t	m_r1_rep;
-	intptr_t	m_r2_rep;
-	intptr_t	m_r3_rep;
-	intptr_t	m_l1_rep;
-	intptr_t	m_l2_rep;
-	intptr_t	m_l3_rep;
+    str      m_refName;
+    str      m_locName;
+    intptr_t m_r1_rep;
+    intptr_t m_r2_rep;
+    intptr_t m_r3_rep;
+    intptr_t m_l1_rep;
+    intptr_t m_l2_rep;
+    intptr_t m_l3_rep;
 } loc_entry_t;
 
-class cLocalization {
-	Container< loc_entry_t > m_entries;
-	Container< str > missing;
+class cLocalization
+{
+    Container<loc_entry_t> m_entries;
+    Container<str>         missing;
 
 public:
-	cLocalization();
+    cLocalization();
 
-	const char		*ConvertString( const char *var );
+    const char *ConvertString(const char *var);
 
 private:
-	void			LoadFile( const char *name );
-	void			GenerateMissing( const char *file_name );
+    void LoadFile(const char *name);
+    void GenerateMissing(const char *file_name);
 };
 #endif
-

From 6049ecfc6e97479b5f932cf5ab43009f35511fb0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:26:47 +0100
Subject: [PATCH 1794/2040] Localize dmbox and gmbox

---
 code/client/cl_uidmbox.cpp | 3 ++-
 code/client/cl_uigmbox.cpp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 87c44e40..c55afa08 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
 Event EV_DMBox_Goin
 (
@@ -321,7 +322,7 @@ void UIDMBox::Print(const char *text)
         m_items[m_numitems].font  = m_font;
     }
 
-    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_dmboxWidth);
+    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, Sys_LV_CL_ConvertString(text1), s_dmboxWidth);
 
     m_numitems++;
     VerifyBoxOut();
diff --git a/code/client/cl_uigmbox.cpp b/code/client/cl_uigmbox.cpp
index 937f4539..18962d4a 100644
--- a/code/client/cl_uigmbox.cpp
+++ b/code/client/cl_uigmbox.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
 Event EV_GMBox_Goin
 (
@@ -295,7 +296,7 @@ void UIGMBox::Print(const char *text)
 
     m_items[m_numitems].flags = 0;
 
-    if (*text == 3) {
+    if (*text == MESSAGE_WHITE) {
         m_items[m_numitems].color = UWhite;
         m_items[m_numitems].font  = m_fontbold;
         m_items[m_numitems].flags |= GMBOX_ITEM_FLAG_BOLD;
@@ -306,7 +307,7 @@ void UIGMBox::Print(const char *text)
         m_items[m_numitems].font  = m_font;
     }
 
-    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_gmboxWidth);
+    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, Sys_LV_CL_ConvertString(text1), s_gmboxWidth);
 
     m_numitems++;
     VerifyBoxOut();

From ec95b6bfbe71c88ecd1d69e7a5d0cff1b76478a1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 8 Jan 2025 22:52:47 +0100
Subject: [PATCH 1795/2040] Fix localization not working properly

---
 code/sys/win_localization.cpp | 83 +++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 28 deletions(-)

diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index 467d1134..ce46ba75 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -103,6 +103,7 @@ void cLocalization::LoadFile(const char *name)
     const char *p, *p2;
     size_t      rl;
     size_t      ll;
+    size_t      i;
 
     Com_Printf("Loading Localization File %s\n", name);
 
@@ -181,7 +182,15 @@ void cLocalization::LoadFile(const char *name)
                 new_entry.m_l3_rep = -1;
             }
 
-            m_entries.AddObject(new_entry);
+            for (i = 1; i <= m_entries.NumObjects(); i++) {
+                if (new_entry.m_refName == m_entries.ObjectAt(i).m_refName) {
+                    break;
+                }
+            }
+
+            if (i == m_entries.NumObjects() + 1) {
+                m_entries.AddObject(new_entry);
+            }
 
             if (!tiki.TokenAvailable(qtrue)) {
                 break;
@@ -214,33 +223,49 @@ void cLocalization::LoadFile(const char *name)
 
 static int bjb_strnscmp(const char *a, const char *b, size_t n)
 {
-    while (1) {
-        while (isspace((unsigned char)*a)) {
+    int i;
+
+    while (n > 0 && *a && *b) {
+        if (*a == *b) {
             a++;
+            b++;
+            n--;
+            continue;
         }
-        while (isspace((unsigned char)*b)) {
+
+        if (!isspace((unsigned char)*a) || !isspace((unsigned char)*b)) {
+            return *a - *b;
+        }
+
+        while (n > 0 && *a && isspace(*a)) {
+            a++;
+            n--;
+        }
+
+        while (*b && isspace(*b)) {
             b++;
         }
-        while (*a && *a == *b) {
-            a++, b++;
-        }
-        if (isspace((unsigned char)*a)) {
-            if (isalnum((unsigned char)a[-1]) && isalnum((unsigned char)*b)) {
-                break;
-            }
-        } else if (isspace((unsigned char)*b)) {
-            if (isalnum((unsigned char)b[-1]) && isalnum((unsigned char)*a)) {
-                break;
-            }
-        } else {
-            break;
-        }
     }
+
+    while (n > 0 && *a && isspace(*a)) {
+        a++;
+        n--;
+    }
+
+    while (*b && isspace(*b)) {
+        b++;
+    }
+
+    if (n <= 0) {
+        return 0;
+    }
+
     return *a - *b;
 }
 
 static void bjb_rebreak(const char *var, char *buf, size_t max)
 {
+#if 0
     const char *nl;
     char       *rb, *rb1, *rb2;
 
@@ -297,6 +322,7 @@ static void bjb_rebreak(const char *var, char *buf, size_t max)
             return;
         }
     }
+#endif
 }
 
 const char *cLocalization::ConvertString(const char *var)
@@ -314,23 +340,24 @@ const char *cLocalization::ConvertString(const char *var)
     loc_entry_t *entry;
     str          s1, s2;
 
-    l = strlen(var);
+    if (!*var) {
+        return var;
+    }
 
-    for (o = l; o > 0; o--) {
-        if (var[o - 1] >= ' ') {
-            break;
-        }
+    l = strlen(var);
+    o = l;
+
+    while (o && var[o - 1] < ' ') {
+        o--;
     }
 
     pRef = &var[o];
+    pVar = var;
     m    = l - o;
     n    = 0;
 
-    for (pVar = var; o > 0; o--) {
-        if (*pVar >= ' ') {
-            break;
-        }
-
+    while (o && (unsigned char)*pVar < ' ') {
+        o--;
         pVar++;
         n++;
     }

From 305c026f4e55c0c55f6e48430306c2eae75335bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:29:30 +0100
Subject: [PATCH 1796/2040] Import alGetStringiSOFT

---
 code/client/qal.c | 6 ++++++
 code/client/qal.h | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/code/client/qal.c b/code/client/qal.c
index 78e0b80e..8b32af17 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -88,6 +88,9 @@ LPALGETBUFFERI qalGetBufferi;
 LPALDOPPLERFACTOR qalDopplerFactor;
 LPALSPEEDOFSOUND qalSpeedOfSound;
 LPALDISTANCEMODEL qalDistanceModel;
+#ifdef AL_SOFT_source_resampler
+LPALGETSTRINGISOFT qalGetStringiSOFT;
+#endif
 
 LPALCCREATECONTEXT qalcCreateContext;
 LPALCMAKECONTEXTCURRENT qalcMakeContextCurrent;
@@ -209,6 +212,9 @@ qboolean QAL_Init(const char *libname)
 	qalDopplerFactor = GPA("alDopplerFactor");
 	qalSpeedOfSound = GPA("alSpeedOfSound");
 	qalDistanceModel = GPA("alDistanceModel");
+#ifdef AL_SOFT_source_resampler
+	qalGetStringiSOFT = GPA("alGetStringiSOFT");
+#endif
 
 	qalcCreateContext = GPA("alcCreateContext");
 	qalcMakeContextCurrent = GPA("alcMakeContextCurrent");
diff --git a/code/client/qal.h b/code/client/qal.h
index 3495cc85..94111724 100644
--- a/code/client/qal.h
+++ b/code/client/qal.h
@@ -36,15 +36,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef USE_LOCAL_HEADERS
 #include "../AL/al.h"
 #include "../AL/alc.h"
+#include "../AL/alext.h"
 #else
 #if defined(_MSC_VER) || defined(__APPLE__)
   // MSVC users must install the OpenAL SDK which doesn't use the AL/*.h scheme.
   // OSX framework also needs this
   #include <al.h>
   #include <alc.h>
+  #include <alext.h>
 #else
   #include <AL/al.h>
   #include <AL/alc.h>
+  #include <AL/alext.h>
 #endif
 #endif
 
@@ -132,6 +135,9 @@ extern LPALGETBUFFERIV qalGetBufferiv;
 extern LPALDOPPLERFACTOR qalDopplerFactor;
 extern LPALSPEEDOFSOUND qalSpeedOfSound;
 extern LPALDISTANCEMODEL qalDistanceModel;
+#ifdef AL_SOFT_source_resampler
+extern LPALGETSTRINGISOFT qalGetStringiSOFT;
+#endif
 
 extern LPALCCREATECONTEXT qalcCreateContext;
 extern LPALCMAKECONTEXTCURRENT qalcMakeContextCurrent;

From 28fd0ba201df39ddd268b26bd61f25760cc2d871 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:29:43 +0100
Subject: [PATCH 1797/2040] Use spline as the default source resampler for
 OpenAL

This makes sounds feel stronger, the spline resampler has slightly louder high frequencies
---
 code/client/snd_openal_new.cpp | 46 +++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 956073e4..1a4713c4 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -69,15 +69,17 @@ static float reverb_table[] = {
     1.0f,   0.097000003f, 0.208f, 0.65200001f, 1.0f,        0.875f, 0.139f, 0.486f,
 };
 
-static vec3_t       vec_zero                  = {0, 0, 0};
-int                 s_iNumMilesAudioProviders = 0;
-bool                s_bProvidersEmunerated    = false;
-static bool         al_initialized            = false;
-static bool         al_use_reverb             = false;
-static float        al_current_volume         = 0;
-static unsigned int al_frequency              = 22050;
-static ALCcontext  *al_context_id             = NULL;
-static ALCdevice   *al_device                 = NULL;
+static vec3_t       vec_zero                   = {0, 0, 0};
+int                 s_iNumMilesAudioProviders  = 0;
+bool                s_bProvidersEmunerated     = false;
+static bool         al_initialized             = false;
+static bool         al_use_reverb              = false;
+static float        al_current_volume          = 0;
+static unsigned int al_frequency               = 22050;
+static ALCcontext  *al_context_id              = NULL;
+static ALCdevice   *al_device                  = NULL;
+static ALsizei      al_default_resampler_index = 0;
+static ALsizei      al_resampler_index         = 0;
 
 static ALboolean (*_alutLoadMP3_LOKI)(unsigned int buffer, const byte *data, int length);
 static void (*_alReverbScale_LOKI)();
@@ -272,6 +274,8 @@ static bool S_OPENAL_InitContext()
 {
     const char *dev;
     int         attrlist[10];
+    size_t      i;
+    size_t      numResamplers;
 
     Com_DPrintf("OpenAL: Context initialization\n");
 
@@ -429,6 +433,23 @@ static bool S_OPENAL_InitContext()
     qalcMakeContextCurrent(al_context_id);
     alDieIfError();
 
+#ifdef AL_SOFT_source_resampler
+    al_default_resampler_index = qalGetInteger(AL_DEFAULT_RESAMPLER_SOFT);
+    alDieIfError();
+    al_resampler_index = al_default_resampler_index;
+    numResamplers = qalGetInteger(AL_NUM_RESAMPLERS_SOFT);
+    alDieIfError();
+
+    for (i = 0; i < numResamplers; i++) {
+        const ALchar* resamplerName = qalGetStringiSOFT(AL_RESAMPLER_NAME_SOFT, i);
+        if (Q_stristr(resamplerName, "spline")) {
+            Com_Printf("OpenAL: Using %s as the resampler.\n", resamplerName);
+            al_resampler_index = i;
+            break;
+        }
+     }
+#endif
+
     Com_Printf("AL_VENDOR: %s\n", qalGetString(AL_VENDOR));
     alDieIfError();
 
@@ -534,6 +555,11 @@ static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
     qalSourcei(chan->source, AL_SOURCE_RELATIVE, true);
     alDieIfError();
 
+#ifdef AL_SOFT_source_resampler
+    qalSourcei(chan->source, AL_SOURCE_RESAMPLER_SOFT, al_resampler_index);
+    alDieIfError();
+#endif
+
     return true;
 }
 
@@ -713,6 +739,8 @@ void S_OPENAL_Shutdown()
 
     s_bProvidersEmunerated = false;
     al_initialized         = false;
+
+    QAL_Shutdown();
 }
 
 /*

From bbfd4ac280f38c7b8f6d50b6e279aafa6cadf361 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:38:18 +0100
Subject: [PATCH 1798/2040] Bump version number

---
 code/qcommon/q_version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index 04a14e8a..536a876b 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			81
-#define PRODUCT_VERSION_PATCH			2
+#define PRODUCT_VERSION_MINOR			82
+#define PRODUCT_VERSION_PATCH			0
 #define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 
 //

From 5e041242119b6c5624d770ee7821d28eba303d71 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 21:30:40 +0100
Subject: [PATCH 1799/2040] Fix accuracy being 0.0 in the stats screen

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index fdd07938..b1f16852 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10360,7 +10360,7 @@ void Player::Stats(Event *ev)
             m_iObjectivesCompleted,
             iNumShotsFired,
             iNumHits,
-            (iNumHits / iNumShotsFired * 100.f),
+            ((float)iNumHits / (float)iNumShotsFired * 100.f),
             szPreferredWeapon.c_str(),
             m_iNumHitsTaken,
             m_iNumObjectsDestroyed,

From 63c2b3642c0399a3c520df3809b16fefdd5ef50d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 21:42:12 +0100
Subject: [PATCH 1800/2040] Print the version when opening the logfile

---
 code/qcommon/common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 448c63f6..38c24a72 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -265,6 +265,7 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 			if(logfile)
 			{
 				Com_Printf( "logfile opened on %s\n", asctime( newtime ) );
+				Com_Printf( "=> game is version %s\n", com_version->string );
 
 				if ( com_logfile->integer > 1 )
 				{

From a9ec7cff4f13372c0c67f33d5534f9d51b300c73 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 22:23:02 +0100
Subject: [PATCH 1801/2040] Write the time before each message printed in the
 logfile

---
 code/qcommon/common.c | 50 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 38c24a72..0a22074a 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -282,8 +282,54 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 
       opening_qconsole = qfalse;
 		}
-		if ( logfile && FS_Initialized()) {
-			FS_Write(msg, strlen(msg), logfile);
+        if (logfile && FS_Initialized()) {
+            // Added in OPM
+            //  Write the time before each message
+			//================
+            size_t msgLen;
+            static qboolean no_newline = qfalse;
+
+			if (!no_newline) {
+				time_t t;
+				time_t t_gmt;
+				struct tm tms_local;
+				struct tm tms_gm;
+				double tz;
+				const char* tzStr;
+				char buffer[26];
+
+				t = time(NULL);
+				localtime_s(&tms_local, &t);
+				gmtime_s(&tms_gm, &t);
+				t_gmt = mktime(&tms_gm);
+				tz = difftime(t, t_gmt) / 60.0 / 60.0;
+
+				strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", &tms_local);
+				FS_Write("[", 1, logfile);
+				FS_Write(buffer, strlen(buffer), logfile);
+				FS_Write(" ", 1, logfile);
+
+				if (tz >= 0) {
+					tzStr = va("UTC+%.03f", tz);
+				} else {
+					tzStr = va("UTC%.03f", tz);
+				}
+
+				FS_Write(tzStr, strlen(tzStr), logfile);
+				FS_Write("] ", 2, logfile);
+            }
+
+            msgLen = strlen(msg);
+            if (msgLen > 1 && msg[msgLen - 1] != '\n') {
+				// Don't write the time if the previous message has no newline
+                no_newline = qtrue;
+            } else {
+                no_newline = qfalse;
+            }
+
+            //================
+
+			FS_Write(msg, msgLen, logfile);
 		}
 	}
 }

From 089e68e85e7f8d255cb6e54542484be70b9ae6c2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 23:08:15 +0100
Subject: [PATCH 1802/2040] Add a cvar to opt out for logfile timestamps

---
 code/qcommon/common.c | 75 ++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 0a22074a..e28c8612 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -87,6 +87,7 @@ cvar_t	*com_sv_running;
 cvar_t	*com_cl_running;
 cvar_t	*com_viewlog;
 cvar_t	*com_logfile;		// 1 = buffer log, 2 = flush after each print
+cvar_t	*com_logfile_timestamps;
 cvar_t	*com_pipefile;
 cvar_t	*com_showtrace;
 cvar_t	*com_shortversion;
@@ -285,48 +286,49 @@ void QDECL Com_Printf( const char *fmt, ... ) {
         if (logfile && FS_Initialized()) {
             // Added in OPM
             //  Write the time before each message
-			//================
-            size_t msgLen;
-            static qboolean no_newline = qfalse;
+            //================
+			size_t msgLen = strlen(msg);
 
-			if (!no_newline) {
-				time_t t;
-				time_t t_gmt;
-				struct tm tms_local;
-				struct tm tms_gm;
-				double tz;
-				const char* tzStr;
-				char buffer[26];
+			if (com_logfile_timestamps->integer) {
+				static qboolean no_newline = qfalse;
 
-				t = time(NULL);
-				localtime_s(&tms_local, &t);
-				gmtime_s(&tms_gm, &t);
-				t_gmt = mktime(&tms_gm);
-				tz = difftime(t, t_gmt) / 60.0 / 60.0;
+				if (!no_newline) {
+					time_t t;
+					time_t t_gmt;
+					struct tm tms_local;
+					struct tm tms_gm;
+					double tz;
+					const char* tzStr;
+					char buffer[26];
 
-				strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", &tms_local);
-				FS_Write("[", 1, logfile);
-				FS_Write(buffer, strlen(buffer), logfile);
-				FS_Write(" ", 1, logfile);
+					t = time(NULL);
+					localtime_s(&tms_local, &t);
+					gmtime_s(&tms_gm, &t);
+					t_gmt = mktime(&tms_gm);
+					tz = difftime(t, t_gmt) / 60.0 / 60.0;
 
-				if (tz >= 0) {
-					tzStr = va("UTC+%.03f", tz);
-				} else {
-					tzStr = va("UTC%.03f", tz);
+					strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", &tms_local);
+					FS_Write("[", 1, logfile);
+					FS_Write(buffer, strlen(buffer), logfile);
+					FS_Write(" ", 1, logfile);
+
+					if (tz >= 0) {
+						tzStr = va("UTC+%.03f", tz);
+					} else {
+						tzStr = va("UTC%.03f", tz);
+					}
+
+					FS_Write(tzStr, strlen(tzStr), logfile);
+					FS_Write("] ", 2, logfile);
 				}
 
-				FS_Write(tzStr, strlen(tzStr), logfile);
-				FS_Write("] ", 2, logfile);
-            }
-
-            msgLen = strlen(msg);
-            if (msgLen > 1 && msg[msgLen - 1] != '\n') {
-				// Don't write the time if the previous message has no newline
-                no_newline = qtrue;
-            } else {
-                no_newline = qfalse;
-            }
-
+				if (msgLen > 1 && msg[msgLen - 1] != '\n') {
+					// Don't write the time if the previous message has no newline
+					no_newline = qtrue;
+				} else {
+					no_newline = qfalse;
+				}
+			}
             //================
 
 			FS_Write(msg, msgLen, logfile);
@@ -1862,6 +1864,7 @@ void Com_Init( char *commandLine ) {
 	com_dropsim = Cvar_Get( "com_dropsim", "0", CVAR_CHEAT );
 	com_viewlog = Cvar_Get( "viewlog", "0", CVAR_CHEAT );
 	com_logfile = Cvar_Get("logfile", "0", CVAR_TEMP);
+	com_logfile_timestamps = Cvar_Get("logfile_timestamps", "1", CVAR_TEMP);
 	com_speeds = Cvar_Get( "com_speeds", "0", 0 );
 	com_timedemo = Cvar_Get( "timedemo", "0", CVAR_CHEAT );
 	com_dedicated = Cvar_Get( "dedicated", "0", CVAR_LATCH );

From 1b5232c2d0b8e839912b57f705540e3441b1b92b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 9 Jan 2025 23:15:25 +0100
Subject: [PATCH 1803/2040] Fix compile errors

---
 code/qcommon/common.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index e28c8612..ffc7eb25 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -37,6 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  include <chrono>
 #endif
 
+#include <time.h>
+
 #include "tiki.h"
 
 #ifndef DEDICATED
@@ -302,8 +304,13 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 					char buffer[26];
 
 					t = time(NULL);
+#ifdef WIN32
 					localtime_s(&tms_local, &t);
 					gmtime_s(&tms_gm, &t);
+#else
+                    localtime_r(&tms_local, &t);
+                    gmtime_r(&tms_gm, &t);
+#endif
 					t_gmt = mktime(&tms_gm);
 					tz = difftime(t, t_gmt) / 60.0 / 60.0;
 

From a0f6d7d361dc1725951a99041fdf488996df5641 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 11 Jan 2025 15:04:56 +0100
Subject: [PATCH 1804/2040] Initialize met_comment to false

---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index b1f16852..0a80a22c 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10777,7 +10777,7 @@ void Player::EventDMMessage(Event *ev)
         Q_strcat(szPrintString, sizeof(szPrintString), ": ");
         Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(pTmpInstantMsg));
     } else {
-        bool met_comment;
+        bool met_comment = false;
 
         Q_strcat(szPrintString, sizeof(szPrintString), ":");
         iStringLength = strlen(szPrintString);

From 752588ffcd75f796579e896645aa3fc6ff50b60e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 11 Jan 2025 15:20:59 +0100
Subject: [PATCH 1805/2040] Update OpenAL to version 1.24.2

---
 .github/workflows/shared-build.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 90b2bca9..0c1edb7d 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -88,12 +88,13 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.1'
+        ref: '1.24.2'
 
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
         cmake -B ./build \
+        -DALSOFT_UTILS=OFF \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
         cmake --build ./build --config Release --parallel
         cmake --install ./build --config Release
@@ -242,7 +243,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.1'
+        ref: '1.24.2'
 
     # soft-oal build
     # Statically link the CRT runtime into OAL as a workaround to prevent crashes
@@ -337,9 +338,9 @@ jobs:
   ##########################
   #
   # Apple macOS
-  # macOS 14
+  # macOS 15
   #
-  # This version is used as the OS, as older versions are slower.
+  # This version is used as the OS, as it's faster than other versions.
   ##########################
   build-platform-macos:
     strategy:
@@ -401,7 +402,7 @@ jobs:
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.1'
+        ref: '1.24.2'
 
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal

From f22ea9eb211aff7b765ff037c9c02235b82e85a3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 11 Jan 2025 23:50:33 +0100
Subject: [PATCH 1806/2040] Link against rt

---
 code/sys/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 95624808..fbfee5bd 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -62,6 +62,11 @@ elseif(UNIX)
 		endif()
 	endif()
 	target_link_libraries(syslib INTERFACE stdc++)
+
+	if (NOT APPLE)
+		# For when using GLIBC versions older than 2.34
+		target_link_libraries(syslib INTERFACE rt)
+	endif()
 endif()
 
 if (APPLE)

From 59fdcf0ae951b778fbdb280e57db16a5ed8d5bac Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 12 Jan 2025 20:29:53 +0100
Subject: [PATCH 1807/2040] Add debian 11 and 12

---
 docker/dev/build.ps1                   | 15 +++++++++------
 docker/dev/x86_64/debian-11/Dockerfile |  8 ++++++++
 docker/dev/x86_64/debian-12/Dockerfile |  8 ++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 docker/dev/x86_64/debian-11/Dockerfile
 create mode 100644 docker/dev/x86_64/debian-12/Dockerfile

diff --git a/docker/dev/build.ps1 b/docker/dev/build.ps1
index d6165255..61601a22 100644
--- a/docker/dev/build.ps1
+++ b/docker/dev/build.ps1
@@ -1,7 +1,10 @@
-docker build -t openmohaa/builder.14_04 x86_64/14.04 && `
-docker build -t openmohaa/builder.16_04 x86_64/16.04 && `
-docker build -t openmohaa/builder.18_04 x86_64/18.04 && `
-docker build -t openmohaa/builder.20_04 x86_64/20.04 && `
-docker build -t openmohaa/builder.22_04 x86_64/22.04 && `
-docker build -t openmohaa/builder.22_10 x86_64/22.10 && `
+docker build -t openmohaa/builder.14_04 x86_64/14.04
+docker build -t openmohaa/builder.16_04 x86_64/16.04
+docker build -t openmohaa/builder.18_04 x86_64/18.04
+docker build -t openmohaa/builder.20_04 x86_64/20.04
+docker build -t openmohaa/builder.22_04 x86_64/22.04
+docker build -t openmohaa/builder.22_10 x86_64/22.10
+docker build -t openmohaa/builder.debian-11 x86_64/debian-11
+docker build -t openmohaa/builder.debian-12 x86_64/debian-12
+
 docker build -t openmohaa/builder.18_04.i386 i386/18.04
diff --git a/docker/dev/x86_64/debian-11/Dockerfile b/docker/dev/x86_64/debian-11/Dockerfile
new file mode 100644
index 00000000..cf3a9e6c
--- /dev/null
+++ b/docker/dev/x86_64/debian-11/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:11
+
+# install dev tools
+RUN apt update && apt install -y ninja-build cmake make clang-16 lld-16 gcc-10 g++-10 flex bison
+# install some important libraries like GL
+RUN apt install -y --no-install-recommends ncurses-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libxxf86vm-dev libxxf86dga-dev libsdl2-dev
+
+WORKDIR /usr/src/openmohaa/
diff --git a/docker/dev/x86_64/debian-12/Dockerfile b/docker/dev/x86_64/debian-12/Dockerfile
new file mode 100644
index 00000000..19f8d33c
--- /dev/null
+++ b/docker/dev/x86_64/debian-12/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:12
+
+# install dev tools
+RUN apt update && apt install -y ninja-build cmake make clang-19 lld-19 gcc-12 g++-12 flex bison
+# install some important libraries like GL
+RUN apt install -y --no-install-recommends ncurses-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libxxf86vm-dev libxxf86dga-dev libsdl2-dev
+
+WORKDIR /usr/src/openmohaa/

From c69ea0e4d8e72a3fb664965e7c18be0a38fb7558 Mon Sep 17 00:00:00 2001
From: DraGoN <51184732+ysdragon@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:21:56 +0200
Subject: [PATCH 1808/2040] Fixed parameter order in `localtime_r`and
 `gmtime_r` for FreeBSD, OpenBSD, and NetBSD

---
 code/qcommon/common.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index ffc7eb25..9d3c2969 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -307,9 +307,12 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 #ifdef WIN32
 					localtime_s(&tms_local, &t);
 					gmtime_s(&tms_gm, &t);
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+					localtime_r(&t, &tms_local);
+					gmtime_r(&t, &tms_gm);
 #else
-                    localtime_r(&tms_local, &t);
-                    gmtime_r(&tms_gm, &t);
+					localtime_r(&tms_local, &t);
+					gmtime_r(&tms_gm, &t);
 #endif
 					t_gmt = mktime(&tms_gm);
 					tz = difftime(t, t_gmt) / 60.0 / 60.0;

From 393dfae33e7d661dbde7a4e7a7b482bac706381e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:27:07 +0100
Subject: [PATCH 1809/2040] Give starting ammo at the next frame

---
 code/fgame/sentient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index ed58aa61..4ae5f731 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1222,13 +1222,13 @@ Item *Sentient::giveItem(str itemname, int amount)
 
         AddItem(item);
 
-        if (item->isSubclassOf(Weapon)) {
+        if (item->IsSubclassOfWeapon()) {
             // Post an event to give the ammo to the sentient
             Event *ev1;
 
             ev1 = new Event(EV_Weapon_GiveStartingAmmo);
             ev1->AddEntity(this);
-            item->PostEvent(ev1, 0);
+            item->PostEvent(ev1, level.frametime);
         }
 
         return item;

From e7cddd47a54347dbc393b241bb462b63eca26d58 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:45:53 +0100
Subject: [PATCH 1810/2040] Fix incorrect map name and spawnpoint when a
 spawnpoint ('$') is specified, causing crash

---
 code/fgame/level.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index df1e3910..78f09eaf 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -1511,9 +1511,9 @@ void Level::ServerSpawned(void)
 
 void Level::SetMap(const char *themapname)
 {
-    char *spawnpos;
-    int   i;
-    str   text;
+    const char *spawnpos;
+    int         i;
+    str         text;
 
     Init();
 
@@ -1522,8 +1522,8 @@ void Level::SetMap(const char *themapname)
     // set a specific spawnpoint if the map was started with a $
     spawnpos = strchr((char *)themapname, '$');
     if (spawnpos) {
-        mapname    = (const char *)(spawnpos - themapname);
-        spawnpoint = mapname;
+        mapname    = str(themapname, 0, spawnpos - themapname);
+        spawnpoint = spawnpos + 1;
     } else {
         mapname    = themapname;
         spawnpoint = "";

From 317664f88c0fedb03a62df316f5c91a76e58ac94 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:51:28 +0100
Subject: [PATCH 1811/2040] Throw an error if the player is dead in EndLevel()

---
 code/fgame/player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 0a80a22c..441815a9 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2663,6 +2663,11 @@ void Player::ChooseSpawnPoint(void)
 
 void Player::EndLevel(Event *ev)
 {
+    if (IsDead()) {
+        ScriptError("cannot do player.endlevel if the player is dead");
+        return;
+    }
+
     InitPowerups();
     if (health > max_health) {
         health = max_health;

From 6d71cabbda6302827ca2a35a4e3a0d3c590ce14e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 13 Jan 2025 23:22:33 +0100
Subject: [PATCH 1812/2040] Export FS_FOpenFile

---
 code/fgame/g_public.h | 1 +
 code/server/sv_game.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index ac9369b8..f06f38b6 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -257,6 +257,7 @@ typedef struct gameImport_s {
     int (*FS_WriteFile)(const char *qpath, const void *buffer, int size);
     fileHandle_t (*FS_FOpenFileWrite)(const char *fileName);
     fileHandle_t (*FS_FOpenFileAppend)(const char *fileName);
+    fileHandle_t (*FS_FOpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
     const char *(*FS_PrepFileWrite)(const char *fileName);
     size_t (*FS_Write)(const void *buffer, size_t size, fileHandle_t fileHandle);
     size_t (*FS_Read)(void *buffer, size_t len, fileHandle_t fileHandle);
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 3934f9b0..106b9e62 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -1786,6 +1786,7 @@ void SV_InitGameProgs( void ) {
 	import.FS_WriteFile					= FS_WriteFile;
 	import.FS_FOpenFileWrite			= FS_FOpenFileWrite;
 	import.FS_FOpenFileAppend			= FS_FOpenFileAppend;
+	import.FS_FOpenFile					= FS_FOpenFileRead;
 	import.FS_PrepFileWrite				= FS_PrepFileWrite;
 	import.FS_Write						= FS_Write;
 	import.FS_Read						= FS_Read;

From bfd0f6e744d33d2a3361710f0cdbb5c9de221e52 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 14 Jan 2025 00:08:34 +0100
Subject: [PATCH 1813/2040] Fix the platform dependant compile error

---
 code/fgame/g_public.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index f06f38b6..3e7599f9 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -257,7 +257,7 @@ typedef struct gameImport_s {
     int (*FS_WriteFile)(const char *qpath, const void *buffer, int size);
     fileHandle_t (*FS_FOpenFileWrite)(const char *fileName);
     fileHandle_t (*FS_FOpenFileAppend)(const char *fileName);
-    fileHandle_t (*FS_FOpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
+    long (*FS_FOpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
     const char *(*FS_PrepFileWrite)(const char *fileName);
     size_t (*FS_Write)(const void *buffer, size_t size, fileHandle_t fileHandle);
     size_t (*FS_Read)(void *buffer, size_t len, fileHandle_t fileHandle);

From 619d27da81ce92687904648753453b28241609be Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:00:04 +0100
Subject: [PATCH 1814/2040] Add getentity

---
 code/fgame/scriptthread.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index d86f7f19..6c29ac5f 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -1981,6 +1981,15 @@ Event EV_ScriptThread_Md5String
     "generates MD5 hash of given text",
     EV_RETURN
 );
+Event EV_ScriptThread_GetEntity
+(
+    "getentity",
+    EV_CHEAT,
+    "i",
+    "ent_num",
+    "Gets the specified entity",
+    EV_RETURN
+);
 Event EV_ScriptThread_SetTimer
 (
     "settimer",
@@ -2180,6 +2189,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_GetTanH,                 &ScriptThread::EventTanH               },
     {&EV_ScriptThread_strncpy,                 &ScriptThread::StringBytesCopy         },
     {&EV_ScriptThread_Md5String,               &ScriptThread::Md5String               },
+    {&EV_ScriptThread_GetEntity,               &ScriptThread::GetEntByEntnum          },
     {&EV_ScriptThread_TypeOf,                  &ScriptThread::TypeOfVariable          },
     {&EV_ScriptThread_RegisterEv,              &ScriptThread::RegisterEvent           },
     {&EV_ScriptThread_UnregisterEv,            &ScriptThread::UnregisterEvent         },

From 3f9bed938e3bef8878dbb6ceb2d586ad2931a9e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:03:37 +0100
Subject: [PATCH 1815/2040] Fix NULL string checking

---
 code/fgame/scriptthread.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 6c29ac5f..a1db2f3f 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -5735,7 +5735,7 @@ void ScriptThread::FileExists(Event *ev)
 
     filename = ev->GetString(1);
 
-    if (filename == NULL) {
+    if (!filename.length()) {
         throw ScriptException("Empty file name passed to fexists!\n");
     }
 
@@ -5814,7 +5814,7 @@ void ScriptThread::FileSaveAll(Event *ev)
 
     text = ev->GetString(2);
 
-    if (text == NULL) {
+    if (text.length()) {
         ev->AddInteger(-1);
         throw ScriptException("Text to be written is NULL - fsaveall!\n");
     }
@@ -5838,7 +5838,7 @@ void ScriptThread::FileRemove(Event *ev)
 
     filename = ev->GetString(1);
 
-    if (filename == NULL) {
+    if (!filename.length()) {
         throw ScriptException("Empty file name passed to fremove!\n");
     }
 
@@ -5948,7 +5948,7 @@ void ScriptThread::FileReadPak(Event *ev)
 
     filename = ev->GetString(1);
 
-    if (filename == NULL) {
+    if (!filename.length()) {
         throw ScriptException("Filename is NULL - freadpak!\n");
     }
 
@@ -6023,7 +6023,7 @@ void ScriptThread::FileNewDirectory(Event *ev)
 
     path = ev->GetString(1);
 
-    if (path == NULL) {
+    if (!path.length()) {
         throw ScriptException("Path is NULL - fnewdir!\n");
     }
 
@@ -6051,7 +6051,7 @@ void ScriptThread::FileRemoveDirectory(Event *ev)
 
     path = ev->GetString(1);
 
-    if (path == NULL) {
+    if (!path.length()) {
         throw ScriptException("Path is NULL - fremovedir!\n");
     }
 

From 2dbe61789d496ade0682c5684412c38910ce3740 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:29:35 +0100
Subject: [PATCH 1816/2040] Don't use the target list if the world is NULL

---
 code/script/scriptvm.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 481a7bb6..3e70d985 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1769,7 +1769,13 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_UN_TARGETNAME:
                 // retrieve the target name
-                targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
+                if (world) {
+                    targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
+                } else {
+                    // Added in OPM
+                    //  don't use the target list if the world is NULL
+                    targetList = NULL;
+                }
 
                 if (!targetList || !targetList->list.NumObjects()) {
                     str targetname = m_VMStack.GetTop().stringValue();

From 1500d213e7f270f9f1f1d62ac1c5dd1d50d8b764 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:29:56 +0100
Subject: [PATCH 1817/2040] Fix wrong pointer being deleted

---
 code/fgame/dm_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index a479f53a..615e9313 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -472,8 +472,8 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
     spot = GetRandomSpawnpointFromList(points, numSpots);
     for (int i = 0; i < numSpots; i++) {
         // delete all created spawnpoint
-        if (points[numSpots].spawnpoint != spot) {
-            delete points[numSpots].spawnpoint;
+        if (points[i].spawnpoint != spot) {
+            delete points[i].spawnpoint;
         }
     }
 

From 4bec5cef01f0d96eb594ee120aec0c1174786007 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:42:34 +0100
Subject: [PATCH 1818/2040] Reduce telefrag bounds

---
 code/fgame/dm_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 615e9313..a2d3d1f5 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -42,8 +42,8 @@ typedef struct spawnsort_s {
 
 static qboolean SpotWouldTelefrag(float *origin)
 {
-    static Vector mins = Vector(-16, -16, 1);
-    static Vector maxs = Vector(16, 16, 97);
+    static Vector mins = Vector(-15, -15, 1);
+    static Vector maxs = Vector(15, 15, 96);
     trace_t       trace;
 
     trace = G_Trace(Vector(origin), mins, maxs, Vector(origin), NULL, MASK_PLAYERSTART, qfalse, "SpotWouldTelefrag");

From 94aaeac194de6db81e91c2c6b0e0e432bb71839b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 20:16:58 +0100
Subject: [PATCH 1819/2040] Check for the vehicle owner

---
 code/fgame/vehicleturret.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 9a64e883..f2d8052a 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -370,6 +370,11 @@ void VehicleTurretGun::P_UserAim(usercmd_t *ucmd)
         return;
     }
 
+    if (!m_pVehicleOwner) {
+        // Added in OPM
+        return;
+    }
+
     if (!m_pVehicleOwner->IsSubclassOfVehicle()) {
         return;
     }

From ab80045329e2c1ccfad3ecaefaabe4e041b7d307 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:38:49 +0100
Subject: [PATCH 1820/2040] Properly check if the number of tris is sufficient
 for tessellation

---
 code/renderergl1/tr_terrain.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index 4dc75097..7936ade2 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -998,7 +998,9 @@ static void R_DoTriSplitting()
                 //
                 // make sure there are sufficient number of tris
                 //
-                if (g_tri.nFree < 14 || g_vert.nFree < 14) {
+                // Fixed in OPM
+                //  Properly check the number of tris, which is double the number of verts
+                if (g_tri.nFree < 14*2 || g_vert.nFree < 14) {
                     ri.Printf(PRINT_DEVELOPER, "WARNING: aborting terrain tessellation -- insufficient tris\n");
                     return;
                 }

From a6d936920428f3ebda7721ac5cb965b14c260479 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:17:03 +0100
Subject: [PATCH 1821/2040] Remove DM player in destructor rather than in a
 manual function call

---
 code/fgame/player.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 441815a9..adad62aa 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2209,6 +2209,12 @@ Player::~Player()
     //  when the player is deleted
     RemoveFromVehiclesAndTurrets();
 
+    // Added in OPM
+    //  Remove the player at destructor
+    if (g_gametype->integer != GT_SINGLE_PLAYER && dmManager.PlayerCount()) {
+        dmManager.RemovePlayer(this);
+    }
+
     entflags &= ~ECF_PLAYER;
 }
 
@@ -9704,9 +9710,9 @@ void Player::Disconnect(void)
     ev->AddListener(this);
     scriptedEvents[SE_DISCONNECTED].Trigger(ev);
 
-    if (g_gametype->integer != GT_SINGLE_PLAYER) {
-        dmManager.RemovePlayer(this);
-    }
+//     if (g_gametype->integer != GT_SINGLE_PLAYER) {
+//         dmManager.RemovePlayer(this);
+//     }
 }
 
 void Player::CallVote(Event *ev)

From 95e72dd339386779d830f589393be3929aaa4f10 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:27:51 +0100
Subject: [PATCH 1822/2040] Use the number of controllers to get the number of
 spawned bots

---
 code/fgame/g_bot.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index de3124bf..cd71cfad 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static saved_bot_t *saved_bots        = NULL;
 static unsigned int num_saved_bots    = 0;
-static unsigned int current_bot_count = 0;
 static unsigned int botId             = 0;
 
 Container<str> alliedModelList;
@@ -438,7 +437,6 @@ void G_AddBot(const saved_bot_t *saved)
 
     clientNum = e - g_entities;
 
-    current_bot_count++;
     // increase the unique ID
     botId++;
 
@@ -504,7 +502,6 @@ void G_RemoveBot(gentity_t *ent)
     }
 
     G_ClientDisconnect(ent);
-    current_bot_count--;
 }
 
 /*
@@ -583,17 +580,19 @@ void G_SaveBots()
         saved_bots = NULL;
     }
 
-    if (!current_bot_count) {
+    const BotControllerManager& manager = botManager.getControllerManager();
+    unsigned int numSpawnedBots = manager.getControllers().NumObjects();
+
+    if (!numSpawnedBots) {
         return;
     }
 
-    saved_bots     = new saved_bot_t[current_bot_count];
+    saved_bots     = new saved_bot_t[numSpawnedBots];
     num_saved_bots = 0;
 
-    const BotControllerManager& manager = botManager.getControllerManager();
 
     count = manager.getControllers().NumObjects();
-    assert(count <= current_bot_count);
+    assert(count <= numSpawnedBots);
 
     for (n = 1; n <= count; n++) {
         const BotController *controller = manager.getControllers().ObjectAt(n);
@@ -700,8 +699,7 @@ void G_ResetBots()
 
     botManager.Cleanup();
 
-    current_bot_count = 0;
-    botId             = 0;
+    botId = 0;
 }
 
 /*
@@ -754,6 +752,7 @@ void G_SpawnBots()
 {
     unsigned int numClients;
     unsigned int numBotsToSpawn;
+    unsigned int numSpawnedBots;
 
     //
     // Check the minimum bot count
@@ -776,12 +775,14 @@ void G_SpawnBots()
         numBotsToSpawn = Q_min(numBotsToSpawn, sv_maxbots->integer);
     }
 
+    numSpawnedBots = botManager.getControllerManager().getControllers().NumObjects();
+
     //
     // Spawn bots
     //
-    if (numBotsToSpawn > current_bot_count) {
-        G_AddBots(numBotsToSpawn - current_bot_count);
-    } else if (numBotsToSpawn < current_bot_count) {
-        G_RemoveBots(current_bot_count - numBotsToSpawn);
+    if (numBotsToSpawn > numSpawnedBots) {
+        G_AddBots(numBotsToSpawn - numSpawnedBots);
+    } else if (numBotsToSpawn < numSpawnedBots) {
+        G_RemoveBots(numSpawnedBots - numBotsToSpawn);
     }
 }

From 210eeff4813f04ac4c86a4bfe697fb9742910f0f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:28:37 +0100
Subject: [PATCH 1823/2040] Remove controllers that don't have an associated
 entity

This prevents crashes when the entity was removed (potentially by a mod)
---
 code/fgame/playerbot.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 3b033e2a..25a17f0c 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1198,6 +1198,19 @@ void BotControllerManager::ThinkControllers()
 {
     int i;
 
+    // Delete controllers that don't have associated player entity
+    // This cannot happen unless some mods remove them
+    for (i = controllers.NumObjects(); i > 0; i--) {
+        BotController* controller = controllers.ObjectAt(i);
+        if (!controller->getControlledEntity()) {
+            gi.DPrintf("Bot %d has no associated player entity. This shouldn't happen unless the entity has been removed by a script. The controller will be removed, please fix.\n", i);
+
+            // Remove the controller, it will be recreated later to match `sv_numbots`
+            delete controller;
+            controllers.RemoveObjectAt(i);
+        }
+    }
+
     for (i = 1; i <= controllers.NumObjects(); i++) {
         BotController *controller = controllers.ObjectAt(i);
         controller->Think();

From 539c2df378040513f31a0dbce6e5d4755ec204fb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:25:26 +0100
Subject: [PATCH 1824/2040] Check for valid event on listener and print an
 error if the command cannot be executed

---
 code/script/scriptvm.cpp | 17 +++++++++++++++++
 code/script/scriptvm.h   |  1 +
 2 files changed, 18 insertions(+)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 3e70d985..cc48908f 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -541,6 +541,8 @@ void ScriptVM::executeCommandInternal<false>(
 )
 {
     transferVarsToEvent(ev, fromVar, iParamCount);
+    checkValidEvent(ev, listener);
+
     listener->ProcessScriptEvent(ev);
 }
 
@@ -550,6 +552,7 @@ void ScriptVM::executeCommandInternal<true>(
 )
 {
     transferVarsToEvent(ev, fromVar, iParamCount);
+    checkValidEvent(ev, listener);
 
     try {
         listener->ProcessScriptEvent(ev);
@@ -595,6 +598,20 @@ void ScriptVM::transferVarsToEvent(Event& ev, ScriptVariable *fromVar, op_parmNu
     ev.CopyValues(fromVar, count);
 }
 
+void ScriptVM::checkValidEvent(Event& ev, Listener* listener) {
+    ClassDef *c = listener->classinfo();
+
+    if (!c->GetDef(&ev)) {
+        if (listener == m_Thread) {
+            ScriptError("Failed execution of command '%s'", ev.getName());
+        } else if (listener->isSubclassOf(SimpleEntity)) {
+            ScriptError("Failed execution of command '%s' for class '%s' Targetname '%s'", ev.getName(), c->classname, static_cast<SimpleEntity*>(listener)->targetname.c_str());
+        } else {
+            ScriptError("Failed execution of command '%s' for class '%s'", ev.getName(), c->classname);
+        }
+    }
+}
+
 bool ScriptVM::executeGetter(Listener *listener, op_evName_t eventName)
 {
     int eventNum = Event::FindGetterEventNum(eventName);
diff --git a/code/script/scriptvm.h b/code/script/scriptvm.h
index 7f4b0e6c..ece0af2f 100644
--- a/code/script/scriptvm.h
+++ b/code/script/scriptvm.h
@@ -177,6 +177,7 @@ private:
     bool executeGetter(Listener *listener, op_evName_t eventName);
     bool executeSetter(Listener *listener, op_evName_t eventName);
     void transferVarsToEvent(Event& ev, ScriptVariable *fromVar, op_parmNum_t count);
+    void checkValidEvent(Event& ev, Listener *listener);
 
     void            loadTopInternal(Listener *listener);
     ScriptVariable *storeTopInternal(Listener *listener);

From 7f0c506fea3c4ef85161c099badfd7679197cd59 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:53:49 +0100
Subject: [PATCH 1825/2040] Add a comment about the spawn behavior in OG

---
 code/fgame/scriptthread.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index a1db2f3f..3a3863b6 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -3052,6 +3052,16 @@ Listener *ScriptThread::SpawnInternal(Event *ev)
         throw ScriptException("Usage: spawn entityname [keyname] [value]...");
     }
 
+    // Fixed in OPM
+    //  The original game uses a raw char* pointer to get the classname rather than storing it in an str.
+    //  This causes an issue when the argument is none (NIL), stringValue() will allocate and return a new str() with "NIL".
+    //  As the returned str() is not stored anywhere, it gets destroyed immediately, meaning that the char* pointer gets empty.
+    //  This has the effect of using empty class ID, which is "Explosion" in original game.
+    //
+    //  For example, t2l2 has an incorrect "mg42_spawner_gunner" of class PathNode, but PathNode has no model variable.
+    //  global/spawner.scr::spawner_activate:
+    //  - In OG, it will successfully spawn an instance of "Explosion" due to the NIL argument behavior stated above.
+    //  - In OPM, it will not spawn anything and will cause script errors, it's the expected behavior by design
     classname = ev->GetString(1);
 
     if (getClassForID(classname) || getClass(classname)) {

From 87e5b6d41e41452881f9775fc7db0cf26c5b2070 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:21:13 +0100
Subject: [PATCH 1826/2040] Clear the top variable when the event is not valid
 too

---
 code/script/scriptvm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index cc48908f..e2f8462f 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -541,8 +541,8 @@ void ScriptVM::executeCommandInternal<false>(
 )
 {
     transferVarsToEvent(ev, fromVar, iParamCount);
-    checkValidEvent(ev, listener);
 
+    checkValidEvent(ev, listener);
     listener->ProcessScriptEvent(ev);
 }
 
@@ -552,9 +552,9 @@ void ScriptVM::executeCommandInternal<true>(
 )
 {
     transferVarsToEvent(ev, fromVar, iParamCount);
-    checkValidEvent(ev, listener);
 
     try {
+        checkValidEvent(ev, listener);
         listener->ProcessScriptEvent(ev);
     } catch (...) {
         m_VMStack.GetTop().Clear();

From 6b0245719083c32e32c0a52fcb9d7daa0815507e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:49:38 +0100
Subject: [PATCH 1827/2040] Properly correct the opcode in
 OP_LOAD_STORE_SELF_VAR when self is NULL

---
 code/script/scriptvm.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index e2f8462f..1e082792 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1534,6 +1534,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_LOAD_STORE_SELF_VAR:
                 if (!m_ScriptClass->m_Self) {
+                    m_CodePos += sizeof(unsigned int);
                     ScriptError("self is NULL");
                 }
 

From 591be6c2fd7037288bc464f31e4aa38cf267d5ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 17 Jan 2025 21:49:17 +0100
Subject: [PATCH 1828/2040] Create a new node if the load index is outside the
 node count

---
 code/fgame/navigate.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 3a7410da..bc0478ac 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -2500,7 +2500,10 @@ PathNode *PathSearch::FindNearestSniperNode(Entity*pEnt, Vector& vPos, Entity *p
 
 PathNode *PathSearch::GetSpawnNode(ClassDef *cls)
 {
-    if (m_bNodesloaded) {
+    if (m_bNodesloaded
+        // Fixed in OPM
+        && m_LoadIndex < nodecount
+        ) {
         return pathnodes[m_LoadIndex++];
     } else {
         // Otherwise create a new node

From 1ea273fba07cfd9a93e2a858f34419f241355167 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:02:05 +0100
Subject: [PATCH 1829/2040] Clear the top stack result when self is NULL

---
 code/script/scriptvm.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 1e082792..4d923640 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1666,13 +1666,13 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_STORE_OWNER_VAR:
                 if (!m_ScriptClass->m_Self) {
-                    m_VMStack.Push();
+                    m_VMStack.PushAndGet().Clear();
                     m_CodePos += sizeof(unsigned int);
                     ScriptError("self is NULL");
                 }
 
                 if (!m_ScriptClass->m_Self->GetScriptOwner()) {
-                    m_VMStack.Push();
+                    m_VMStack.PushAndGet().Clear();
                     m_CodePos += sizeof(unsigned int);
                     ScriptError("self.owner is NULL");
                 }
@@ -1686,7 +1686,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_STORE_SELF_VAR:
                 if (!m_ScriptClass->m_Self) {
-                    m_VMStack.Push();
+                    m_VMStack.PushAndGet().Clear();
                     m_CodePos += sizeof(unsigned int);
                     ScriptError("self is NULL");
                 }
@@ -1715,10 +1715,10 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 break;
 
             case OP_STORE_OWNER:
-                m_VMStack.Push();
-
-                if (!m_ScriptClass->m_Self) {
+                if (m_ScriptClass->m_Self) {
                     m_VMStack.Push();
+                } else {
+                    m_VMStack.PushAndGet().Clear();
                     ScriptError("self is NULL");
                 }
 

From 1a71d44b432c5055e87a438b092c08c281a48e5a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:23:30 +0100
Subject: [PATCH 1830/2040] Safely check if other is NULL when triggering

---
 code/fgame/trigger.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 1383c5b4..fe442df2 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -440,6 +440,12 @@ void Trigger::TriggerStuff(Event *ev)
         ScriptError("trigger '%s' triggered by self", TargetName().c_str());
     }
 
+    // Fixed in OPM
+    //  Safety check
+    if (other == NULL) {
+        ScriptError("trigger '%s' triggered by NULL entity", TargetName().c_str());
+    }
+
     // Always respond to activate messages from the world since they're probably from
     // the "trigger" command
     if (!respondTo(other) && (other != world || *ev != EV_Activate)
@@ -894,6 +900,12 @@ void TriggerAll::TriggerStuff(Event *ev)
         ScriptError("trigger '%s' triggered by self", TargetName().c_str());
     }
 
+    // Fixed in OPM
+    //  Safety check
+    if (other == NULL) {
+        ScriptError("trigger '%s' triggered by NULL entity", TargetName().c_str());
+    }
+
     // Always respond to activate messages from the world since they're probably from
     // the "trigger" command
     if (!respondTo(other) && !((other == world) && (*ev == EV_Activate))

From 7ab04b0bcb2a2b868e21db14e2f42c56c1e8949d Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 18 Jan 2025 15:43:20 +0100
Subject: [PATCH 1831/2040] Fix IsEntity() and SimpleEntity() improperly
 returning true when the listener is NULL

---
 code/script/scriptvariable.cpp | 43 ++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index d1537eb6..99beb73b 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -604,17 +604,22 @@ variabletype ScriptVariable::GetType() const
 
 qboolean ScriptVariable::IsEntity(void)
 {
-    if (type == VARIABLE_LISTENER) {
-        if (!m_data.listenerValue->Pointer()
-#if defined(GAME_DLL)
-            || checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())
-#endif
-        ) {
-            return true;
-        }
+    if (type != VARIABLE_LISTENER) {
+        return false;
     }
 
-    return false;
+    if (!m_data.listenerValue->Pointer()) {
+        // Fixed in OPM
+        //  Not sure why OG returns true
+        return false;
+    }
+#if defined(GAME_DLL)
+    if (!checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())) {
+        return false;
+    }
+#endif
+
+    return true;
 }
 
 qboolean ScriptVariable::IsListener(void)
@@ -636,14 +641,22 @@ qboolean ScriptVariable::IsConstArray() const
 
 qboolean ScriptVariable::IsSimpleEntity(void)
 {
-    if (type == VARIABLE_LISTENER) {
-        if (!m_data.listenerValue->Pointer()
-            || checkInheritance(&SimpleEntity::ClassInfo, m_data.listenerValue->Pointer()->classinfo())) {
-            return true;
-        }
+    if (type != VARIABLE_LISTENER) {
+        return false;
     }
 
-    return false;
+    if (!m_data.listenerValue->Pointer()) {
+        // Fixed in OPM
+        //  Not sure why OG returns true
+        return false;
+    }
+#if defined(GAME_DLL)
+    if (!checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())) {
+        return false;
+    }
+#endif
+
+    return true;
 }
 
 #endif

From 45de1067bdd6c96dc1aaaed5cd2be606d1200f5e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 01:41:26 +0100
Subject: [PATCH 1832/2040] Fix localtime_r parameter

---
 code/qcommon/common.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 9d3c2969..fe7a33ed 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -307,12 +307,9 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 #ifdef WIN32
 					localtime_s(&tms_local, &t);
 					gmtime_s(&tms_gm, &t);
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-					localtime_r(&t, &tms_local);
-					gmtime_r(&t, &tms_gm);
 #else
-					localtime_r(&tms_local, &t);
-					gmtime_r(&tms_gm, &t);
+                    localtime_r(&t, &tms_local);
+                    gmtime_r(&t, &tms_gm);
 #endif
 					t_gmt = mktime(&tms_gm);
 					tz = difftime(t, t_gmt) / 60.0 / 60.0;

From ec6cab28a5d3063c25b6fe9beb7b4db9b5346bcc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:45:20 +0100
Subject: [PATCH 1833/2040] Don't apply kick fireback on older versions of the
 game

---
 code/fgame/vehicleturret.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index f2d8052a..6bd57faa 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -1157,6 +1157,14 @@ void VehicleTurretGun::ApplyFireKickback(const Vector& org, float kickback)
         return;
     }
 
+    if (g_target_game <= target_game_e::TG_MOH) {
+        // Don't apply fire kickback in older version
+        // this could cause issues as models weren't made for this feature
+        return;
+    }
+
+    // Added in 2.0
+
     pVehicle = static_cast<Vehicle *>(m_pVehicleOwner.Pointer());
     pVehicle->m_fForwardForce += org.x * kickback;
     pVehicle->m_fLeftForce += org.y * kickback;

From 47cd8ccfc805d60d6a7d7f55d27a73012d901e11 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:07:50 +0100
Subject: [PATCH 1834/2040] Force vertex light when using permedia 2

---
 code/renderergl1/tr_bsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index b0bf884a..49fa1d9e 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -441,7 +441,7 @@ static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
     }
     dsh = &s_worldData.shaders[ shaderNum ];
 
-    if ( r_vertexLight->integer ) {
+    if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
         lightmapNum = LIGHTMAP_BY_VERTEX;
     }
 

From c2bac6d1ef88aa1e85d1353e76e98037d003b951 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:16:35 +0100
Subject: [PATCH 1835/2040] Prevent lightmapIndex from going below LIGHTMAP_2D

---
 code/renderergl1/tr_shader.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 61de647b..0ba971e7 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -3362,6 +3362,10 @@ shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage
 	// lightmaps
 	if ( lightmapIndex >= 0 && lightmapIndex >= tr.numLightmaps ) {
 		lightmapIndex = LIGHTMAP_BY_VERTEX;
+	} else if ( lightmapIndex < LIGHTMAP_2D ) {
+		// negative lightmap indexes cause stray pointers (think tr.lightmaps[lightmapIndex])
+		ri.Printf( PRINT_WARNING, "WARNING: shader '%s' has invalid lightmap index of %d\n", name, lightmapIndex  );
+		lightmapIndex = LIGHTMAP_BY_VERTEX;
 	}
 
 	COM_StripExtension( name, strippedName, sizeof(strippedName));

From 7452bf39fb300f5feadab3c1dc28cf84efc12dc1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:19:27 +0100
Subject: [PATCH 1836/2040] Always initialize numLightmaps when loading
 lightmaps

This fixes an issue where the number of lightmaps is kept from the previous map if the new map has no lightmaps
---
 code/renderergl1/tr_bsp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 49fa1d9e..5dbded41 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -199,6 +199,8 @@ static	void R_LoadLightmaps(gamelump_t* l) {
     float maxIntensity = 0;
     double sumIntensity = 0;
 
+    tr.numLightmaps = 0;
+
     len = l->length;
     if (!len) {
         return;

From edf3560dd59e7d9337a64bf84da53513bcdc7c4c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:21:11 +0100
Subject: [PATCH 1837/2040] Don't load lightmaps on on Permedia 2

---
 code/renderergl1/tr_bsp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 5dbded41..20f5f6d5 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -212,9 +212,9 @@ static	void R_LoadLightmaps(gamelump_t* l) {
 
     // create all the lightmaps
     tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
-
-    // if we are in r_vertexLight mode, we don't need the lightmaps at all
-    if ( r_vertexLight->integer ) {
+    
+	// if we are in r_vertexLight mode, we don't need the lightmaps at all
+	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
         return;
     }
 

From 4e174fd5bfe7729ddeb267f5ddaeae79ded8f4dc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 16:08:28 +0100
Subject: [PATCH 1838/2040] Fix cheats mistakenly being disabled when loading a
 saved game, when developer mode is enabled

---
 code/server/sv_ccmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index e33bea9d..67c59295 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -2317,7 +2317,7 @@ void SV_Loadgame_f(void)
 	Cvar_Get("g_gametype", "0", CVAR_LATCH | CVAR_SERVERINFO);
 	Cvar_Get("sv_maxclients", "0", CVAR_LATCH | CVAR_SERVERINFO);
 
-	if (developer->integer) {
+	if (!developer->integer) {
 		if (svs.iNumClients == 1) {
 			Cvar_Set("cheats", "1");
 		} else {

From 1f599e62c66922529d478174ebfff136e28e5859 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 17:31:50 +0100
Subject: [PATCH 1839/2040] Clear numLightmaps in renderergl2

---
 code/renderergl2/tr_bsp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index d1003fb9..92d76d40 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -248,6 +248,8 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 	float maxIntensity = 0;
 	double sumIntensity = 0;
 
+	tr.numLightmaps = 0;
+
 	len = l->filelen;
 	if ( !len ) {
 		return;

From 83caae7586a096950e067e2143677bad0f7d1226 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 17:32:14 +0100
Subject: [PATCH 1840/2040] Fix terrain tessellation when there is insufficient
 tris in renderergl2

---
 code/renderergl2/tr_terrain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/renderergl2/tr_terrain.c b/code/renderergl2/tr_terrain.c
index b8fa1f86..61fa1f2d 100644
--- a/code/renderergl2/tr_terrain.c
+++ b/code/renderergl2/tr_terrain.c
@@ -998,7 +998,7 @@ static void R_DoTriSplitting()
                 //
                 // make sure there are sufficient number of tris
                 //
-                if (g_tri.nFree < 14 || g_vert.nFree < 14) {
+                if (g_tri.nFree < 14*2 || g_vert.nFree < 14) {
                     ri.Printf(PRINT_DEVELOPER, "WARNING: aborting terrain tessellation -- insufficient tris\n");
                     return;
                 }

From 8fdc66d138c93e7634bf8d542e187548b251b094 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 19 Jan 2025 19:16:28 +0100
Subject: [PATCH 1841/2040] Allow axis players to select kar98 sniper on 2.0
 and above by choosing german panzer skins

---
 code/fgame/player.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index adad62aa..bfee5db9 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -8923,7 +8923,11 @@ void Player::EquipWeapons()
             }
             break;
         case NA_GERMAN:
-            if (g_target_game < target_game_e::TG_MOHTA || dmflags->integer & DF_OLD_SNIPER) {
+            if (g_target_game < target_game_e::TG_MOHTA || dmflags->integer & DF_OLD_SNIPER
+                // Added in OPM
+                //  This was also a feature of Daven's fixes
+                //  Use KAR98 for panzer skins
+                || !Q_stricmpn(client->pers.dm_playergermanmodel, "german_panzer", 13)) {
                 // Old snipers are forced older versions of the game
                 giveItem("weapons/kar98sniper.tik");
                 event->AddString("KAR98 - Sniper");

From 599914934cf898099900be35d4e13571d5fc31d1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 20 Jan 2025 12:17:48 +0100
Subject: [PATCH 1842/2040] Update documentation

---
 docs/getting_started_installation.md | 107 +++------------------------
 docs/getting_started_requirements.md |  88 ++++++++++++++++++++++
 2 files changed, 100 insertions(+), 95 deletions(-)
 create mode 100644 docs/getting_started_requirements.md

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index eb156aa6..1b367547 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -1,5 +1,8 @@
 # Installation
 
+- On Windows there is no installer yet, so you have to follow all the steps below.
+- On Linux, you might want to check if an OpenMoHAA package is available with your package manager.
+
 ## Requirements
 
 - A MOH:AA installation. Common installations include:
@@ -8,99 +11,11 @@
   - From a CD. Make sure to [patch your installed copy](#installing-official-patches)
   - Demo. See [obtaining a demo version](#obtaining-a-demo-version)
 - On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 is required.
-
-## System requirements
-
-This matches the hardware requirements (x86) of the original game.
-
-### Medal of Honor: Allied Assault
-
-1.2 GB of free disk space is required for the full game installation + binaries.
-
-#### x86 (AMD and Intel)
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
-|Memory         |128MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-#### ARM
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
-|Memory         |128MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-#### PowerPC
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |G3 450 MHz                                          |G4 1 GHz
-|Memory         |128MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-### Spearhead expansion
-
-1.0 GB of free disk space is required to install Spearhead on top of the base game.
-
-#### x86 (AMD and Intel)
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
-|Memory         |128MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-#### ARM
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
-|Memory         |128MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-#### PowerPC
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |G3 500 MHz                                          |G4 1 GHz
-|Memory         |256MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-### Breakthrough expansion
-
-800 MB of free disk space is required to install Breakthrough on top of the base game.
-
-#### x86 (AMD and Intel)
-
-|Hardware       |Minimum                                              |Recommended
-|---------------|-----------------------------------------------------|---------------
-|CPU            |733 MHz (Intel Pentium III), or 700 MHz (AMD Athlon) |1 GHz (Intel Pentium III or AMD Athlon)
-|Memory         |128MB                                                |256MB
-|GPU            |16MB                                                 |32MB
-
-#### ARM
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |800 MHz ARM Cortex-A9                               |1 GHz ARM Cortex-A15
-|Memory         |128MB                                               |256MB
-|GPU            |16MB                                                |32MB
-
-
-#### PowerPC
-
-|Hardware       |Minimum                                             |Recommended
-|---------------|----------------------------------------------------|---------------
-|CPU            |G3 800 MHz                                          |G4 1 GHz
-|Memory         |256MB                                               |256MB
-|GPU            |16MB                                                |32MB
+- The game should be able to run on any modern hardware. See [System requirements](./getting_started_requirements.md)
 
 ## Installing official patches
 
-Skip directly to the [OpenMoHAA installation](#downloadinginstalling) section if the **MOH: Warchest** copy is installed.
+If the **MOH: Warchest** copy is installed, skip directly to the [OpenMoHAA installation](#downloadinginstalling) section.
 
 Otherwise, install the following patches:
 
@@ -112,9 +27,9 @@ Otherwise, install the following patches:
 
 These patches are required to connect to multiplayer servers and ensure a smooth, bug-free single-player experience.
 
-## Downloading/installing
+## Downloading/installing OpenMoHAA
 
-Ensure that you download the binaries compatible with your platform in the [releases](https://github.com/openmoh/openmohaa/releases) section.
+Ensure that you download the binaries compatible with your platform in the [releases](https://github.com/openmoh/openmohaa/releases/latest) section.
 
 ### Which release should be downloaded?
 
@@ -145,7 +60,9 @@ Once you're ready, start one of the three launchers based on whether you want to
 
 1. For servers, only the `omohaaded.*` and `game.*` binaries from the archive are required.
 
-## Cleaning up the game installation directory
+## Appendix
+
+### Cleaning up the game installation directory
 
 If you want to clean up the mohaa installation directory by keeping only what is needed for OpenMoHAA, the following files/directories can be kept:
 ```cpp
@@ -165,7 +82,7 @@ If you want to clean up the mohaa installation directory by keeping only what is
 ├── All files from the OpenMoHAA archive
 ```
 
-## Extracting GOG setup file on Linux and macOS
+### Extracting GOG setup file on Linux and macOS
 
 If your MOH:AA copy was acquired from GOG then this section will be relevant.
 
@@ -177,7 +94,7 @@ The MOH:AA Warchest installer files on GOG are Windows binaries. To attain the g
 
 Alternatively, you can use [WINE](https://www.winehq.org/) as well, but this process may take longer if you do not already have WINE installed and configured. 
 
-## Obtaining a demo version
+### Obtaining a demo version
 
 Alternatively, free demo versions are available online. Here are the links to the demos:
 
diff --git a/docs/getting_started_requirements.md b/docs/getting_started_requirements.md
new file mode 100644
index 00000000..ad76075f
--- /dev/null
+++ b/docs/getting_started_requirements.md
@@ -0,0 +1,88 @@
+# System requirements
+
+This matches the hardware requirements (x86) of the original game.
+
+## Medal of Honor: Allied Assault
+
+1.2 GB of free disk space is required for the full game installation + binaries.
+
+### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 450 MHz                                          |G4 1 GHz
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+## Spearhead expansion
+
+1.0 GB of free disk space is required to install Spearhead on top of the base game.
+
+### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 500 MHz                                          |G4 1 GHz
+|Memory         |256MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+## Breakthrough expansion
+
+800 MB of free disk space is required to install Breakthrough on top of the base game.
+
+### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                              |Recommended
+|---------------|-----------------------------------------------------|---------------
+|CPU            |733 MHz (Intel Pentium III), or 700 MHz (AMD Athlon) |1 GHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                                |256MB
+|GPU            |16MB                                                 |32MB
+
+### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |800 MHz ARM Cortex-A9                               |1 GHz ARM Cortex-A15
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+
+### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 800 MHz                                          |G4 1 GHz
+|Memory         |256MB                                               |256MB
+|GPU            |16MB                                                |32MB

From 24c73111623585c24c137773203cecfdb97f45eb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:22:24 +0100
Subject: [PATCH 1843/2040] Also save the valid ground trace when stepping

---
 code/fgame/g_mmove.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index 0152d314..785324c4 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -365,6 +365,7 @@ void MM_StepSlideMove(void)
     vec3_t   start_hit_origin;
     vec3_t   first_hit_origin;
     trace_t  nostep_groundTrace;
+    qboolean nostep_validGroundTrace;
 
     VectorCopy(mm->origin, start_o);
     VectorCopy(mm->velocity, start_v);
@@ -410,6 +411,9 @@ void MM_StepSlideMove(void)
     VectorCopy(mm->origin, nostep_o);
     VectorCopy(mm->velocity, nostep_v);
     memcpy(&nostep_groundTrace, &mml.groundTrace, sizeof(trace_t));
+    // Fixed in OPM
+    //  Save the valid ground trace
+    nostep_validGroundTrace = mml.validGroundTrace;
 
     VectorCopy(up, mm->origin);
     VectorCopy(start_v, mm->velocity);
@@ -432,6 +436,10 @@ void MM_StepSlideMove(void)
         VectorCopy(nostep_o, mm->origin);
         VectorCopy(nostep_v, mm->velocity);
         memcpy(&mml.groundTrace, &nostep_groundTrace, sizeof(mml.groundTrace));
+        // Fixed in OPM
+        //  Do not use the ground trace as it's invalid and would have an invalid entity number
+        mml.validGroundTrace = nostep_validGroundTrace;
+
         mm->hit_obstacle = first_hit_wall;
         VectorCopy(first_hit_origin, mm->hit_origin);
         VectorCopy(first_wall_normal, mm->obstacle_normal);

From 19e12701f3fa581f0f5dc11b0e88ff05e0fb4475 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 21 Jan 2025 20:13:46 +0100
Subject: [PATCH 1844/2040] Fix HUD scaling for spectator text, and vote text
 on 4K

---
 code/cgame/cg_drawtools.cpp | 211 ++++++++++++++++++++++++------------
 1 file changed, 139 insertions(+), 72 deletions(-)

diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index adb9159e..043b3882 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -577,9 +577,9 @@ void CG_RefreshHudDrawElements()
 
 void CG_HudDrawElements()
 {
-    int   i;
-    float fX, fY;
-    float fWidth, fHeight;
+    int    i;
+    float  fX, fY;
+    float  fWidth, fHeight;
     vec2_t virtualScale;
 
     if (!cg_huddraw_force->integer && !cg_hud->integer) {
@@ -638,20 +638,13 @@ void CG_HudDrawElements()
 
         cgi.R_SetColor(cgi.HudDrawElements[i].vColor);
         if (cgi.HudDrawElements[i].string[0]) {
-            fontheader_t* pFont = cgi.HudDrawElements[i].pFont;
+            fontheader_t *pFont = cgi.HudDrawElements[i].pFont;
             if (!pFont) {
                 pFont = cgs.media.hudDrawFont;
             }
 
             if (cgi.HudDrawElements[i].bVirtualScreen) {
-                cgi.R_DrawString(
-                    pFont,
-                    cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
-                    fX,
-                    fY,
-                    -1,
-                    virtualScale
-                );
+                cgi.R_DrawString(pFont, cgi.LV_ConvertString(cgi.HudDrawElements[i].string), fX, fY, -1, virtualScale);
             } else {
                 cgi.R_DrawString(
                     pFont,
@@ -700,8 +693,8 @@ void CG_DrawObjectives()
     int          i;
     int          iCurrentObjective;
     float        fTimeDelta;
-    const char   *pszLocalizedText;
-    const char   *pszLine;
+    const char  *pszLocalizedText;
+    const char  *pszLine;
 
     iTotalNumLines = 0;
     for (i = CS_OBJECTIVES; i < CS_OBJECTIVES + MAX_OBJECTIVES; ++i) {
@@ -732,9 +725,9 @@ void CG_DrawObjectives()
         }
 
         iNumObjectives++;
-        iNumLines[i] = 0;
+        iNumLines[i]     = 0;
         pszLocalizedText = cgi.LV_ConvertString(cg.Objectives[i].text);
-        
+
         for (pszLine = strchr(pszLocalizedText, '\n'); pszLine; pszLine = strchr(pszLine + 1, '\n')) {
             iNumLines[i]++;
         }
@@ -750,7 +743,17 @@ void CG_DrawObjectives()
     vColor[0] = 0.2f;
     vColor[3] = cg.ObjectivesCurrentAlpha * 0.75;
     cgi.R_SetColor(vColor);
-    cgi.R_DrawStretchPic(fX, fY, 450.0 * cgs.uiHiResScale[0], fWidth * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, cgs.media.objectivesBackShader);
+    cgi.R_DrawStretchPic(
+        fX,
+        fY,
+        450.0 * cgs.uiHiResScale[0],
+        fWidth * cgs.uiHiResScale[1],
+        0.0,
+        0.0,
+        1.0,
+        1.0,
+        cgs.media.objectivesBackShader
+    );
 
     fX        = 30.0;
     fY        = fObjectivesTop + 10;
@@ -759,15 +762,29 @@ void CG_DrawObjectives()
     vColor[2] = 1.0;
     vColor[3] = cg.ObjectivesCurrentAlpha;
     cgi.R_SetColor(vColor);
-    cgi.R_DrawString(cgs.media.objectiveFont, cgi.LV_ConvertString("Mission Objectives:"), fX, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.objectiveFont,
+        cgi.LV_ConvertString("Mission Objectives:"),
+        fX,
+        fY / cgs.uiHiResScale[1],
+        -1,
+        cgs.uiHiResScale
+    );
     fY = fY + 5.0;
 
-    cgi.R_DrawString(cgs.media.objectiveFont, "_______________________________________________________", fX, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.objectiveFont,
+        "_______________________________________________________",
+        fX,
+        fY / cgs.uiHiResScale[1],
+        -1,
+        cgs.uiHiResScale
+    );
     fHeight = fObjectivesTop + 35 * cgs.uiHiResScale[1];
 
     for (i = 0; i < MAX_OBJECTIVES; ++i) {
         qhandle_t hBoxShader;
-        
+
         if ((cg.Objectives[i].flags == OBJ_FLAG_NONE) || (cg.Objectives[i].flags & OBJ_FLAG_HIDDEN)) {
             continue;
         }
@@ -905,12 +922,28 @@ void CG_DrawPlayerEntInfo()
 
     if (handle) {
         cgi.R_SetColor(0);
-        cgi.R_DrawStretchPic(fX, fY, 16.0 * cgs.uiHiResScale[0], 16.0 * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle);
+        cgi.R_DrawStretchPic(
+            fX, fY, 16.0 * cgs.uiHiResScale[0], 16.0 * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle
+        );
     }
 
     cgi.R_SetColor(color);
-    cgi.R_DrawString(cgs.media.hudDrawFont, (char *)pszName, fX / cgs.uiHiResScale[0] + 24.0, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
-    cgi.R_DrawString(cgs.media.hudDrawFont, va("%i", cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]), fX / cgs.uiHiResScale[0] + 24.0, fY / cgs.uiHiResScale[1] + 20.0, -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.hudDrawFont,
+        (char *)pszName,
+        fX / cgs.uiHiResScale[0] + 24.0,
+        fY / cgs.uiHiResScale[1],
+        -1,
+        cgs.uiHiResScale
+    );
+    cgi.R_DrawString(
+        cgs.media.hudDrawFont,
+        va("%i", cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]),
+        fX / cgs.uiHiResScale[0] + 24.0,
+        fY / cgs.uiHiResScale[1] + 20.0,
+        -1,
+        cgs.uiHiResScale
+    );
 }
 
 void CG_UpdateAttackerDisplay()
@@ -981,12 +1014,14 @@ void CG_UpdateAttackerDisplay()
     }
 
     cgi.R_SetColor(color);
-    cgi.R_DrawString(cgs.media.attackerFont, pszName, fX / cgs.uiHiResScale[0] + 32.0, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, pszName, fX / cgs.uiHiResScale[0] + 32.0, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 }
 
 void CG_UpdateCountdown()
 {
-    const char* message = "";
+    const char *message = "";
 
     if (!cg.snap) {
         return;
@@ -998,7 +1033,7 @@ void CG_UpdateCountdown()
         iSecondsLeft = (cgs.matchEndTime - cg.time) / 1000;
         if (iSecondsLeft >= 0) {
             iMinutesLeft = iSecondsLeft / 60;
-            message = va("%s %2i:%02i", cgi.LV_ConvertString("Time Left:"), iMinutesLeft, iSecondsLeft % 60);
+            message      = va("%s %2i:%02i", cgi.LV_ConvertString("Time Left:"), iMinutesLeft, iSecondsLeft % 60);
         } else if (!cgs.matchEndTime) {
             message = "";
         }
@@ -1012,7 +1047,8 @@ void CG_UpdateCountdown()
     }
 }
 
-static void CG_RemoveStopwatch() {
+static void CG_RemoveStopwatch()
+{
     cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
     cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse\n");
     cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse_wet\n");
@@ -1095,7 +1131,9 @@ void CG_DrawInstantMessageMenu()
     x = 8.0;
     y = ((float)cgs.glconfig.vidHeight - h) * 0.5;
     cgi.R_SetColor(0);
-    cgi.R_DrawStretchPic(x * cgs.uiHiResScale[0], y, w * cgs.uiHiResScale[0], h * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle);
+    cgi.R_DrawStretchPic(
+        x * cgs.uiHiResScale[0], y, w * cgs.uiHiResScale[0], h * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle
+    );
 }
 
 void CG_DrawSpectatorView_ver_15()
@@ -1118,10 +1156,14 @@ void CG_DrawSpectatorView_ver_15()
     if (!bOnTeam) {
         cgi.Key_GetKeysForCommand("+attackprimary", &iKey1, &iKey2);
         pszString = cgi.LV_ConvertString(va("Press Fire(%s) to join the battle!", cgi.Key_KeynumToBindString(iKey1)));
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = cgs.glconfig.vidHeight - 64.0;
+        fX        = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = cgs.glconfig.vidHeight - 64.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(NULL);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
     if (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) {
@@ -1134,10 +1176,14 @@ void CG_DrawSpectatorView_ver_15()
                cgi.Key_KeynumToBindString(iKey1b))
         );
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 40.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 40.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
     if (!bOnTeam && (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
@@ -1145,10 +1191,14 @@ void CG_DrawSpectatorView_ver_15()
         pszString =
             cgi.LV_ConvertString(va("Press Use(%s) to enter free spectate mode.", cgi.Key_KeynumToBindString(iKey1)));
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 24.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 24.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
     if (!(cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
@@ -1158,20 +1208,27 @@ void CG_DrawSpectatorView_ver_15()
             va("Press Use(%s) to enter player following spectate mode.", cgi.Key_KeynumToBindString(iKey1))
         );
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 24.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 24.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
-    if ((cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) != 0 && cg.snap && cg.snap->ps.stats[STAT_INFOCLIENT] != -1) {
+    if ((cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) != 0 && cg.snap
+        && cg.snap->ps.stats[STAT_INFOCLIENT] != -1) {
         int       iClientNum;
         qhandle_t hShader;
         vec4_t    color;
         char      buf[128];
 
         iClientNum = cg.snap->ps.stats[STAT_INFOCLIENT];
-        Com_sprintf(buf, sizeof(buf), "%s : %i", cg.clientinfo[iClientNum].name, cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]);
+        Com_sprintf(
+            buf, sizeof(buf), "%s : %i", cg.clientinfo[iClientNum].name, cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]
+        );
 
         hShader  = 0;
         color[0] = 0.5;
@@ -1179,10 +1236,14 @@ void CG_DrawSpectatorView_ver_15()
         color[2] = 0.5;
         color[3] = 1.0;
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) - 16) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 80.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - (cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) - 16) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 80.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(color);
-        cgi.R_DrawString(cgs.media.attackerFont, buf, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, buf, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
 
         if (cg.clientinfo[iClientNum].team == TEAM_ALLIES) {
             hShader = cgi.R_RegisterShader("textures/hud/allies");
@@ -1234,10 +1295,14 @@ void CG_DrawSpectatorView_ver_6()
         pszString = cgi.LV_ConvertString(va("Press Use(%s) to follow a player.", cgi.Key_KeynumToBindString(iKey1)));
     }
 
-    fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-    fY = (float)cgs.glconfig.vidHeight - 40.0;
+    fX = (float)(cgs.glconfig.vidWidth
+                 - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+       * 0.5;
+    fY = (float)cgs.glconfig.vidHeight - 40.0 * cgs.uiHiResScale[1];
     cgi.R_SetColor(0);
-    cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 
     if (!bOnTeam && (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
         cgi.Key_GetKeysForCommand("+moveup", &iKey1, &iKey2);
@@ -1248,10 +1313,14 @@ void CG_DrawSpectatorView_ver_6()
                cgi.Key_KeynumToBindString(iKey1b))
         );
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 24.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 24.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 }
 
@@ -1351,17 +1420,7 @@ void CG_DrawCrosshair()
         y      = (cgs.glconfig.vidHeight - height) * 0.5f;
 
         cgi.R_SetColor(NULL);
-        cgi.R_DrawStretchPic(
-            x,
-            y,
-            width * cgs.uiHiResScale[0],
-            height * cgs.uiHiResScale[1],
-            0,
-            0,
-            1,
-            1,
-            shader
-        );
+        cgi.R_DrawStretchPic(x, y, width * cgs.uiHiResScale[0], height * cgs.uiHiResScale[1], 0, 0, 1, 1, shader);
     }
 }
 
@@ -1392,15 +1451,17 @@ void CG_DrawVote()
     percentNo        = cgs.numVotesNo * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
     percentUndecided = cgs.numUndecidedVotes * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
 
-    x = 8;
-    y = (cgs.glconfig.vidHeight > 480) ? (cgs.glconfig.vidHeight * 0.725f) : (cgs.glconfig.vidHeight * 0.75f);
+    x = 8 * cgs.uiHiResScale[0];
+    y = ((cgs.glconfig.vidHeight > 480) ? (cgs.glconfig.vidHeight * 0.725f) : (cgs.glconfig.vidHeight * 0.75f));
 
     cgi.R_SetColor(NULL);
 
     text = va("%s: %s", cgi.LV_ConvertString("Vote Running"), cgs.voteString);
-    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 
-    y += 12;
+    y += 12 * cgs.uiHiResScale[1];
 
     text =
         va("%s: %isec  %s: %i%%  %s: %i%%  %s: %i%%",
@@ -1412,7 +1473,9 @@ void CG_DrawVote()
            percentNo,
            cgi.LV_ConvertString("Undecided"),
            percentUndecided);
-    cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 
     if (cg.snap && !cg.snap->ps.voted) {
         col[0] = 0.5;
@@ -1421,15 +1484,19 @@ void CG_DrawVote()
         col[3] = 1.0;
         cgi.R_SetColor(col);
 
-        y += 12;
+        y += 12 * cgs.uiHiResScale[1];
 
         text = cgi.LV_ConvertString("Vote now, it's your patriotic duty!");
-        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
 
-        y += 12;
+        y += 12 * cgs.uiHiResScale[1];
 
         text = cgi.LV_ConvertString("To vote Yes, press F1. To vote No, press F2.");
-        cgi.R_DrawString(cgs.media.attackerFont, text, x, y, -1, cgs.uiHiResScale);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
         cgi.R_SetColor(NULL);
     }
 }

From f8f9d2f65c40c304d40885b5dc33c296d291af24 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 21 Jan 2025 20:56:26 +0100
Subject: [PATCH 1845/2040] Use MAX_PATHNODES rather than a constant number

---
 code/fgame/navigate.cpp | 8 ++++----
 code/fgame/navigate.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index bc0478ac..e8a8f24d 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -1001,7 +1001,7 @@ PathNode *PathSearch::FindCornerNodeForWall(
 
 PathNode *PathSearch::FindCornerNodeForExactPath(Entity *pSelf, Sentient *enemy, float fMaxPath)
 {
-    PathNode *pPathNode[4096];
+    PathNode *pPathNode[MAX_PATHNODES];
     PathNode *pParentNode;
     size_t    i, iDepth;
     Vector    vEnd;
@@ -1554,7 +1554,7 @@ void DrawNode(int iNodeCount)
     Vector    aStart;
     Vector    aEnd;
     PathNode *node;
-    PathNode *nodelist[4096];
+    PathNode *nodelist[MAX_PATHNODES];
     Vector    end;
     Vector    start;
     Vector    p;
@@ -1562,8 +1562,8 @@ void DrawNode(int iNodeCount)
 
     playerorigin = g_entities[0].client->ps.origin;
 
-    if (iNodeCount > 4096) {
-        iNodeCount = 4096;
+    if (iNodeCount > MAX_PATHNODES) {
+        iNodeCount = MAX_PATHNODES;
     }
 
     if (ai_showallnode->integer) {
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index 1b86d7c0..3404aebc 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -252,7 +252,7 @@ private:
     static int       m_LoadIndex;
 
 public:
-    static PathNode   *pathnodes[4096];
+    static PathNode   *pathnodes[MAX_PATHNODES];
     static int         nodecount;
     static float       total_dist;
     static const char *last_error;

From 7b53e25dd5e2829955f16502f8d3fda11748611e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 21 Jan 2025 22:08:19 +0100
Subject: [PATCH 1846/2040] Set the default rate to 25000 (xDSL)

---
 code/client/cl_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index d1b43ea6..3bcf0628 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3619,7 +3619,7 @@ void CL_Init( void ) {
 
 	// userinfo
 	name = Cvar_Get ("name", "UnnamedSoldier", CVAR_USERINFO | CVAR_ARCHIVE );
-	cl_rate = Cvar_Get ("rate", "5000", CVAR_USERINFO | CVAR_ARCHIVE );
+	cl_rate = Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("password", "", CVAR_USERINFO);
 	Cvar_Get ("dm_playermodel", "american_army", CVAR_USERINFO | CVAR_ARCHIVE );

From b8c7223da7b343f7d0d4759372256dcb3f1c5f9a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 21 Jan 2025 22:33:29 +0100
Subject: [PATCH 1847/2040] Allow "name" to be changed by server

Players often get their name changed due to them having an empty or duplicate name
---
 code/cgame/cg_servercmds.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 96b559c7..74d4269a 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -468,7 +468,8 @@ static const char *whiteListedVariables[] = {
     "subtitle0",
     "subtitle1",
     "subtitle2",
-    "subtitle3"
+    "subtitle3",
+    "name"
 };
 
 //

From 02fc573e31f5af3de819a9dbaa1e41f604a69afa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 21 Jan 2025 22:56:05 +0100
Subject: [PATCH 1848/2040] Apply client and server config tweaks when loading
 the original config

---
 code/client/cl_main.cpp | 18 ++++++++++++++++++
 code/client/client.h    |  1 +
 code/qcommon/common.c   |  7 ++++++-
 code/qcommon/qcommon.h  |  1 +
 code/server/server.h    |  2 ++
 code/server/sv_init.c   | 14 ++++++++++++++
 6 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 3bcf0628..2f8ffd8c 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3685,6 +3685,12 @@ void CL_Init( void ) {
 
 	end = Sys_Milliseconds();
 
+	if (com_gotOriginalConfig) {
+		// Added in OPM
+		//  Apply config tweaks after loading the original config
+		CL_ApplyOriginalConfigTweaks();
+	}
+
 	Com_Printf( "----- Client Initialization Complete ----- %i ms\n", start - end );
 }
 
@@ -4861,3 +4867,15 @@ void TIKI_CG_Command_ProcessFile(char* filename, qboolean quiet, dtiki_t* curTik
 
 	Com_Printf("NO CGE \n");
 }
+
+void CL_ApplyOriginalConfigTweaks()
+{
+	cvar_t* snaps = Cvar_Get("snaps", "", 0);
+
+    // Those variables are not editable via UI so reset them
+	// snaps/maxpackets can also have wrong values due to them being changed
+	// via stufftext
+
+	Cvar_Set("snaps", snaps->resetString);
+	Cvar_Set("cl_maxpackets", cl_maxpackets->resetString);
+}
diff --git a/code/client/client.h b/code/client/client.h
index 7c15b003..c693fbe8 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -561,6 +561,7 @@ qboolean CL_CheckPaused(void);
 
 int CL_GetRefSequence(void);
 qboolean CL_IsRendererLoaded(void);
+void CL_ApplyOriginalConfigTweaks();
 
 //
 // cl_input
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index fe7a33ed..f340d246 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -144,6 +144,7 @@ qboolean	com_errorEntered = qfalse;
 qboolean	com_fullyInitialized = qfalse;
 qboolean	com_gameRestarting = qfalse;
 qboolean	com_gameClientRestarting = qfalse;
+qboolean	com_gotOriginalConfig = qfalse;
 
 char	com_errorMessage[MAXPRINTMSG];
 
@@ -1695,6 +1696,7 @@ void Com_Init( char *commandLine ) {
 	const char	*s;
 	char		configname[ 128 ];
 	int			qport;
+	qboolean	configExists;
 
 	Com_Printf( "--- Common Initialization ---\n" );
 
@@ -1794,9 +1796,12 @@ void Com_Init( char *commandLine ) {
 	Cvar_Set( "config", configname );
 	Com_Printf( "Config: %s\n", configname );
 
-	if ( !Com_ConfigExists( configname )) {
+	configExists = Com_ConfigExists(configname);
+
+	if ( !configExists ) {
 		Com_Printf( "The config file '%s' doesn't exist, using unnamedsoldier.cfg as a template\n", configname );
 		Cbuf_AddText( va( "exec configs/unnamedsoldier.cfg\n", configname ) );
+		com_gotOriginalConfig = qtrue;
 	} else {
 		Cbuf_AddText( va( "exec configs/%s\n", configname ) );
 	}
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index dd06a54a..d1fd7a1e 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1074,6 +1074,7 @@ extern	int		com_frameMsec;
 
 extern	qboolean	com_errorEntered;
 extern	qboolean	com_fullyInitialized;
+extern	qboolean	com_gotOriginalConfig;
 
 extern	fileHandle_t	com_journalFile;
 extern	fileHandle_t	com_journalDataFile;
diff --git a/code/server/server.h b/code/server/server.h
index 9ef4134c..1322ba59 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -489,6 +489,8 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 int SV_PVSSoundIndex(const char* name, qboolean streamed);
 void SV_HandleNonPVSSound();
 
+void SV_ApplyOriginalConfigTweaks();
+
 
 //
 // sv_client.c
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 3c96d2d4..3686f3b7 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -1109,6 +1109,12 @@ void SV_Init (void)
 	
 	// Load saved bans
 	Cbuf_AddText("rehashbans\n");
+
+    if (com_gotOriginalConfig) {
+        // Added in OPM
+        //  Apply config tweaks after loading the original config
+		SV_ApplyOriginalConfigTweaks();
+	}
 }
 
 
@@ -1325,3 +1331,11 @@ void SV_HandleNonPVSSound()
 	SV_CleanupNonPVSSound();
 }
 
+/*
+===============
+SV_ApplyOriginalConfigTweaks
+===============
+*/
+void SV_ApplyOriginalConfigTweaks()
+{
+}

From 90e46f535c08439ea3fa17ec9ea45e60eb0fc115 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:24:39 +0100
Subject: [PATCH 1849/2040] Add a random number next to the default name

---
 code/client/cl_main.cpp | 2 +-
 code/qcommon/common.c   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 2f8ffd8c..de1fc457 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3618,7 +3618,7 @@ void CL_Init( void ) {
 	cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE );
 
 	// userinfo
-	name = Cvar_Get ("name", "UnnamedSoldier", CVAR_USERINFO | CVAR_ARCHIVE );
+	name = Cvar_Get ("name", va("UnnamedSoldier#%d", rand() % 100000), CVAR_USERINFO | CVAR_ARCHIVE);
 	cl_rate = Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("password", "", CVAR_USERINFO);
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index f340d246..abe0a311 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2528,7 +2528,8 @@ qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName, size_t buff
 
 	if( !i )
 	{
-		memcpy( pszNewName, "*** Blank Name ***", sizeof( "*** Blank Name ***" ) );
+        const char* pNewNameDynamic = va("*** Blank Name #%04d ***", rand() % 100000);
+		Q_strncpyz(pszNewName, pNewNameDynamic, bufferSize);
 		bBadName = qtrue;
 	}
 

From 92a0a9c197642bb7e0f2b9c14ca0298329d25dfa Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 22 Jan 2025 18:22:40 +0100
Subject: [PATCH 1850/2040] Cache all models inside the models/player directory

Some player models are missing from precache scripts. This caches all models inside the player directory to avoid a short hitch when a player spawns with a non-cached model
---
 code/fgame/level.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 78f09eaf..9824be9f 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -1588,6 +1588,30 @@ void Level::Precache(void)
 
     LoadAllScripts("global", ".scr");
     InitVoteOptions();
+
+    // Added in OPM
+    //  Cache all player models in multi-player
+    //  This avoids using precache scripts
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        char **fileList;
+        int    numFiles;
+        int    i;
+
+        fileList = gi.FS_ListFiles("models/player", ".tik", qfalse, &numFiles);
+
+        for (i = 0; i < numFiles; i++) {
+            const char *filename = fileList[i];
+            const size_t filelen = strlen(filename);
+
+            if (!Q_stricmpn(filename, "allied_", 7) || !Q_stricmpn(filename, "american_", 9)
+                || !Q_stricmpn(filename, "german_", 7) || !Q_stricmpn(filename, "IT_", 3)
+                || !Q_stricmpn(filename, "SC_", 3)) {
+                CacheResource(va("models/player/%s", filename));
+            }
+        }
+
+        gi.FS_FreeFileList(fileList);
+    }
 }
 
 /*

From ef2c5d2df633294e9efb8cd860ea58ffc12cf785 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 22 Jan 2025 20:52:05 +0100
Subject: [PATCH 1851/2040] Check and verify that selected player models are
 valid

If the player model or the player german model is not valid, they will be reset to the default value. If the server doesn't have one or more of these models, force model feature will not work
---
 code/cgame/cg_local.h     |   5 +
 code/cgame/cg_main.c      |   6 +
 code/cgame/cg_modelanim.c | 329 ++++++++++++++++++++++++++++++--------
 code/cgame/cg_view.c      |   3 +
 4 files changed, 278 insertions(+), 65 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 98149204..21104299 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -270,6 +270,8 @@ extern "C" {
         qhandle_t hAlliedPlayerModelHandle;
         dtiki_t  *pAxisPlayerModel;
         qhandle_t hAxisPlayerModelHandle;
+        qboolean  serverAlliedModelValid;
+        qboolean  serverAxisModelValid;
 
         // view eyes
         vec3_t vOffsetViewAngles;
@@ -530,6 +532,9 @@ extern "C" {
     //
     // cg_modelanim.cpp
     //
+    void CG_ProcessPlayerModel();
+    void CG_ServerModelLoaded(const char* name, qhandle_t handle);
+    void CG_ServerModelUnloaded(qhandle_t handle);
     void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime);
     void CG_AttachEntity(
         refEntity_t *entity, refEntity_t *parent, dtiki_t *tiki, int tagnum, qboolean use_angles, vec3_t attach_offset
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 98e4eb50..99f327c8 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -365,6 +365,8 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
             if (tiki) {
                 CG_ProcessCacheInitCommands(tiki);
             }
+
+            CG_ServerModelLoaded(str, hModel);
         } else {
             // clear out the model
             if (hOldModel && CG_IsHandleUnique(hOldModel)) {
@@ -372,6 +374,10 @@ void CG_ProcessConfigString(int num, qboolean modelOnly)
                 cgi.R_UnregisterServerModel(hOldModel);
             }
             cgs.model_draw[num - CS_MODELS] = 0;
+
+            if (!str || !str[0]) {
+                CG_ServerModelUnloaded(hOldModel);
+            }
         }
     }
 
diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index e3d20b4e..d47dc1cc 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,6 +26,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "tiki.h"
 
+static qboolean cg_forceModelAllowed = qfalse;
+
+/*
+===============
+CG_GetPlayerModelTiki
+===============
+*/
+const char *CG_GetPlayerModelTiki(const char *modelName)
+{
+    return va("models/player/%s.tik", modelName);
+}
+
+/*
+===============
+CG_GetPlayerLocalModelTiki
+===============
+*/
+const char *CG_GetPlayerLocalModelTiki(const char *modelName)
+{
+    return va("models/player/%s.tik", modelName);
+}
+
+/*
+===============
+CG_PlayerTeamIcon
+===============
+*/
 void CG_PlayerTeamIcon(refEntity_t *pModel, entityState_t *pPlayerState)
 {
     qboolean bInArtillery, bInTeam, bSpecialIcon;
@@ -187,13 +214,13 @@ CG_InterpolateAnimParms
 Interpolate between current and next entity
 ===============
 */
-void CG_InterpolateAnimParms(entityState_t* state, entityState_t* sNext, refEntity_t* model)
+void CG_InterpolateAnimParms(entityState_t *state, entityState_t *sNext, refEntity_t *model)
 {
     static cvar_t *vmEntity = NULL;
-    int i;
-    float t;
-    float animLength;
-    float t1, t2;
+    int            i;
+    float          t;
+    float          animLength;
+    float          t1, t2;
 
     if (!vmEntity) {
         vmEntity = cgi.Cvar_Get("viewmodelanim", "1", 0);
@@ -202,7 +229,7 @@ void CG_InterpolateAnimParms(entityState_t* state, entityState_t* sNext, refEnti
     if (sNext && sNext->usageIndex == state->usageIndex) {
         t1 = cg.time - cg.snap->serverTime;
         t2 = cg.nextSnap->serverTime - cg.snap->serverTime;
-        t = t1 / t2;
+        t  = t1 / t2;
 
         model->actionWeight = (sNext->actionWeight - state->actionWeight) * t + state->actionWeight;
 
@@ -214,7 +241,8 @@ void CG_InterpolateAnimParms(entityState_t* state, entityState_t* sNext, refEnti
                         (sNext->frameInfo[i].weight - state->frameInfo[i].weight) * t + state->frameInfo[i].weight;
 
                     if (sNext->frameInfo[i].time >= state->frameInfo[i].time) {
-                        model->frameInfo[i].time = (sNext->frameInfo[i].time - state->frameInfo[i].time) * t + state->frameInfo[i].time;
+                        model->frameInfo[i].time =
+                            (sNext->frameInfo[i].time - state->frameInfo[i].time) * t + state->frameInfo[i].time;
                     } else {
                         animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
                         if (!animLength) {
@@ -298,20 +326,20 @@ CG_CastFootShadow
 Cast complex foot shadow using lights
 ===============
 */
-void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag, refEntity_t* model)
+void CG_CastFootShadow(const vec_t *vLightPos, vec_t *vLightIntensity, int iTag, refEntity_t *model)
 {
-    int i;
-    float fAlpha;
-    float fLength;
-    float fWidth;
-    float fAlphaOfs;
-    float fOfs;
-    float fPitchCos;
-    vec3_t vPos;
-    vec3_t vEnd;
-    vec3_t vDelta;
-    vec3_t vLightAngles;
-    trace_t trace;
+    int           i;
+    float         fAlpha;
+    float         fLength;
+    float         fWidth;
+    float         fAlphaOfs;
+    float         fOfs;
+    float         fPitchCos;
+    vec3_t        vPos;
+    vec3_t        vEnd;
+    vec3_t        vDelta;
+    vec3_t        vLightAngles;
+    trace_t       trace;
     orientation_t oFoot;
 
     VectorCopy(model->origin, vPos);
@@ -321,8 +349,7 @@ void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag,
         VectorMA(vPos, vEnd[i], model->axis[i], vPos);
     }
 
-    if (cg_shadowdebug->integer)
-    {
+    if (cg_shadowdebug->integer) {
         vec3_t vDir;
 
         //
@@ -373,12 +400,11 @@ void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag,
     }
 
     fLength = fPitchCos * fPitchCos * 32.0 + fPitchCos * 8.0 + 10.0;
-    fOfs = 0.5 - (-4.1 / tan(DEG2RAD(vLightAngles[0])) + 4.0 - fLength) / fLength * 0.5;
+    fOfs    = 0.5 - (-4.1 / tan(DEG2RAD(vLightAngles[0])) + 4.0 - fLength) / fLength * 0.5;
     VectorMA(vPos, -96.0, vDelta, vEnd);
     CG_Trace(&trace, vPos, vec3_origin, vec3_origin, vEnd, 0, MASK_FOOTSHADOW, qfalse, qtrue, "CG_CastFootShadow");
-   
-    if (cg_shadowdebug->integer)
-    {
+
+    if (cg_shadowdebug->integer) {
         cgi.R_DebugLine(vPos, vLightPos, 0.75, 0.75, 0.5, 1.0);
         cgi.R_DebugLine(vPos, vEnd, 1.0, 1.0, 1.0, 1.0);
     }
@@ -392,7 +418,7 @@ void CG_CastFootShadow(const vec_t* vLightPos, vec_t* vLightIntensity, int iTag,
         trace.fraction = 0;
     }
 
-    fWidth = 10.f - (1.f - trace.fraction) * 6.f;
+    fWidth    = 10.f - (1.f - trace.fraction) * 6.f;
     fAlphaOfs = (1.f - trace.fraction) * fAlpha;
 
     fAlpha = Q_max(vLightIntensity[0], Q_max(vLightIntensity[1], vLightIntensity[2]));
@@ -445,13 +471,21 @@ CG_CastSimpleFeetShadow
 Cast basic feet shadow
 ===============
 */
-void CG_CastSimpleFeetShadow(const trace_t* pTrace, float fWidth, float fAlpha, int iRightTag, int iLeftTag, const dtiki_t* tiki, refEntity_t* model)
+void CG_CastSimpleFeetShadow(
+    const trace_t *pTrace,
+    float          fWidth,
+    float          fAlpha,
+    int            iRightTag,
+    int            iLeftTag,
+    const dtiki_t *tiki,
+    refEntity_t   *model
+)
 {
-    int i;
-    float fShadowYaw;
-    float fLength;
-    vec3_t vPos, vRightPos, vLeftPos;
-    vec3_t vDelta;
+    int           i;
+    float         fShadowYaw;
+    float         fLength;
+    vec3_t        vPos, vRightPos, vLeftPos;
+    vec3_t        vDelta;
     orientation_t oFoot;
 
     //
@@ -485,7 +519,7 @@ void CG_CastSimpleFeetShadow(const trace_t* pTrace, float fWidth, float fAlpha,
 
     // get the facing yaw
     fShadowYaw = vectoyaw(vDelta);
-    fLength = VectorNormalize(vDelta) * 0.5 + 12;
+    fLength    = VectorNormalize(vDelta) * 0.5 + 12;
     if (fLength < fWidth * 0.7) {
         fLength = fWidth * 0.7;
     }
@@ -550,15 +584,13 @@ qboolean CG_EntityShadow(centity_t *cent, refEntity_t *model)
         }
 
         if (iTagR != -1) {
-            int iNumLights, iCurrLight;
+            int    iNumLights, iCurrLight;
             vec3_t avLightPos[16], avLightIntensity[16];
 
             iNumLights = Q_clamp(cg_shadowscount->integer, 1, 8);
             iNumLights = cgi.R_GatherLightSources(model->origin, avLightPos, avLightIntensity, iNumLights);
-            if (iNumLights)
-            {
-                for (iCurrLight = 0; iCurrLight < iNumLights; iCurrLight++)
-                {
+            if (iNumLights) {
+                for (iCurrLight = 0; iCurrLight < iNumLights; iCurrLight++) {
                     CG_CastFootShadow(avLightPos[iCurrLight], avLightIntensity[iCurrLight], iTagL, model);
                     CG_CastFootShadow(avLightPos[iCurrLight], avLightIntensity[iCurrLight], iTagR, model);
                 }
@@ -725,6 +757,11 @@ void CG_AttachEntity(
     VectorAdd(entity->origin, vOrigin, entity->lightingOrigin);
 }
 
+/*
+===============
+CG_AttachEyeEntity
+===============
+*/
 void CG_AttachEyeEntity(
     refEntity_t *entity, refEntity_t *parent, dtiki_t *tiki, int tagnum, qboolean use_angles, vec_t *attach_offset
 )
@@ -737,8 +774,7 @@ void CG_AttachEyeEntity(
         AnglesToAxis(cg.refdefViewAngles, entity->axis);
     }
 
-    if (attach_offset[0] || attach_offset[1] || attach_offset[2])
-    {
+    if (attach_offset[0] || attach_offset[1] || attach_offset[2]) {
         for (i = 0; i < 3; i++) {
             VectorMA(entity->origin, attach_offset[i], entity->axis[i], entity->origin);
         }
@@ -750,56 +786,219 @@ void CG_AttachEyeEntity(
     VectorCopy(parent->lightingOrigin, entity->lightingOrigin);
 }
 
+/*
+===============
+CG_IsValidServerModel
+===============
+*/
+qboolean CG_IsValidServerModel(const char *modelpath)
+{
+    const char *str;
+    int         i;
+
+    for (i = 1; i < MAX_MODELS; i++) {
+        str = CG_ConfigString(CS_MODELS + i);
+        if (!Q_stricmp(str, modelpath)) {
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+===============
+CG_CheckValidModels
+
+This verifies the allied player model and the german player model:
+- If they don't exist on the client, reset to the default allied player model
+- If they don't exist on the server, don't allow forceModel so the client explicitly know the skin isn't supported
+===============
+*/
+void CG_CheckValidModels()
+{
+    const char *modelpath;
+    qboolean    isDirty = qfalse;
+
+    if (dm_playermodel->modified) {
+        // Check for allied model
+        modelpath = va("models/player/%s.tik", dm_playermodel->string);
+        if (!cgi.R_RegisterModel(modelpath)) {
+            cgi.Printf(
+                "Allied model '%s' is invalid, resetting to '%s'\n", dm_playermodel->string, dm_playermodel->resetString
+            );
+
+            cgi.Cvar_Set("dm_playermodel", dm_playermodel->resetString);
+            modelpath = va("models/player/%s.tik", dm_playermodel->string);
+        }
+
+        cg.serverAlliedModelValid = CG_IsValidServerModel(modelpath);
+    }
+
+    if (dm_playergermanmodel->modified) {
+        // Check for axis model
+        modelpath = va("models/player/%s.tik", dm_playergermanmodel->string);
+        if (!cgi.R_RegisterModel(modelpath)) {
+            cgi.Printf(
+                "Allied model '%s' is invalid, resetting to '%s'\n",
+                dm_playergermanmodel->string,
+                dm_playergermanmodel->resetString
+            );
+
+            cgi.Cvar_Set("dm_playergermanmodel", dm_playergermanmodel->resetString);
+            modelpath = va("models/player/%s.tik", dm_playergermanmodel->string);
+        }
+
+        cg.serverAxisModelValid = CG_IsValidServerModel(modelpath);
+    }
+
+    if (dm_playermodel->modified || dm_playergermanmodel->modified) {
+        cg_forceModelAllowed = cg.serverAlliedModelValid && cg.serverAxisModelValid;
+    }
+}
+
+/*
+===============
+CG_ServerModelLoaded
+===============
+*/
+void CG_ServerModelLoaded(const char *name, qhandle_t handle)
+{
+    if (!Q_stricmpn(name, "models/player/", 14) && (!cg.serverAlliedModelValid || !cg.serverAxisModelValid)) {
+        char modelName[MAX_QPATH];
+        COM_StripExtension(name + 14, modelName, sizeof(modelName));
+
+        //
+        // The player model has been loaded on the server
+        // so try again parsing
+        //
+        if (!Q_stricmp(modelName, dm_playermodel->string)) {
+            dm_playermodel->modified = qtrue;
+        }
+        if (!Q_stricmp(modelName, dm_playergermanmodel->string)) {
+            dm_playergermanmodel->modified = qtrue;
+        }
+    }
+}
+
+/*
+===============
+CG_ServerModelUnloaded
+===============
+*/
+void CG_ServerModelUnloaded(qhandle_t handle)
+{
+#if 0
+    if (cg.serverAlliedModelValid && handle == cg.hAlliedPlayerModelHandle) {
+        dm_playermodel->modified = qtrue;
+    }
+    if (cg.serverAxisModelValid && handle == cg.hAxisPlayerModelHandle) {
+        dm_playergermanmodel->modified = qtrue;
+    }
+#endif
+}
+
+/*
+===============
+CG_UpdateForceModels
+===============
+*/
 void CG_UpdateForceModels()
 {
     qhandle_t hModel;
-    char* pszAlliesPartial;
-    char* pszAxisPartial;
-    char szAlliesModel[256];
-    char szAxisModel[256];
+    char     *pszAlliesPartial;
+    char     *pszAxisPartial;
+    char      szAlliesModel[256];
+    char      szAxisModel[256];
+    qboolean  isDirty;
 
-    if (cg.pAlliedPlayerModel && cg.pAxisPlayerModel && !dm_playermodel->modified && !dm_playergermanmodel->modified) {
+    isDirty = dm_playermodel->modified || dm_playergermanmodel->modified || cg_forceModel->modified;
+
+    if (!cg_forceModelAllowed) {
+        if (isDirty) {
+            cgi.Printf(
+                "One or more of the selected players model don't exist on the server or are not loaded, using the "
+                "default skin\n"
+            );
+        }
+
+        return;
+    }
+
+    if (cg.pAlliedPlayerModel && cg.pAxisPlayerModel && !isDirty) {
         return;
     }
 
     pszAlliesPartial = dm_playermodel->string;
-    pszAxisPartial = dm_playergermanmodel->string;
+    pszAxisPartial   = dm_playergermanmodel->string;
 
     Com_sprintf(szAlliesModel, sizeof(szAlliesModel), "models/player/%s.tik", pszAlliesPartial);
     Com_sprintf(szAxisModel, sizeof(szAxisModel), "models/player/%s.tik", pszAxisPartial);
-    hModel = cgi.R_RegisterModel(szAlliesModel);
-    if (!hModel) hModel = cgi.R_RegisterModel("models/player/american_army.tik");
+
+    hModel = cg.serverAlliedModelValid ? cgi.R_RegisterModel(szAlliesModel) : 0;
+    if (!hModel) {
+        Com_sprintf(szAlliesModel, sizeof(szAlliesModel), "models/player/%s.tik", dm_playermodel->resetString);
+        hModel = cgi.R_RegisterModel(szAlliesModel);
+    }
 
     if (hModel) {
         cg.hAlliedPlayerModelHandle = hModel;
-        cg.pAlliedPlayerModel = cgi.R_Model_GetHandle(hModel);
+        cg.pAlliedPlayerModel       = cgi.R_Model_GetHandle(hModel);
         if (!cg.pAlliedPlayerModel) {
             cg.hAlliedPlayerModelHandle = 0;
         }
     } else {
         cg.hAlliedPlayerModelHandle = 0;
-        cg.pAlliedPlayerModel = 0;
+        cg.pAlliedPlayerModel       = NULL;
     }
 
-    hModel = cgi.R_RegisterModel(szAxisModel);
-    if (!hModel) hModel = cgi.R_RegisterModel("models/player/german_wehrmacht_soldier.tik");
+    hModel = cg.serverAxisModelValid ? cgi.R_RegisterModel(szAxisModel) : 0;
+    if (!hModel) {
+        Com_sprintf(szAxisModel, sizeof(szAxisModel), "models/player/%s.tik", dm_playergermanmodel->resetString);
+        hModel = cgi.R_RegisterModel(szAxisModel);
+    }
 
     if (hModel) {
         cg.hAxisPlayerModelHandle = hModel;
-        cg.pAxisPlayerModel = cgi.R_Model_GetHandle(hModel);
+        cg.pAxisPlayerModel       = cgi.R_Model_GetHandle(hModel);
         if (!cg.pAxisPlayerModel) {
             cg.hAxisPlayerModelHandle = 0;
         }
     } else {
         cg.hAxisPlayerModelHandle = 0;
-        cg.pAxisPlayerModel = 0;
+        cg.pAxisPlayerModel       = 0;
     }
 
     // Clear modified flag
-    dm_playermodel->modified = qfalse;
-    dm_playergermanmodel->modified = qfalse;
+    //dm_playermodel->modified       = qfalse;
+    //dm_playergermanmodel->modified = qfalse;
 }
 
+/*
+===============
+CG_ProcessPlayerModel
+
+Checks player models, and update force models
+===============
+*/
+void CG_ProcessPlayerModel()
+{
+    CG_CheckValidModels();
+    if (cg_forceModel->integer) {
+        CG_UpdateForceModels();
+    }
+
+    // Clear modified flag
+    dm_playermodel->modified       = qfalse;
+    dm_playergermanmodel->modified = qfalse;
+    cg_forceModel->modified        = qfalse;
+}
+
+/*
+===============
+CG_ModelAnim
+===============
+*/
 void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
 {
     entityState_t *s1;
@@ -940,8 +1139,8 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
     model.tiki      = cgi.R_Model_GetHandle(cgs.model_draw[s1->modelindex]);
 
     if (s1->number != cg.snap->ps.clientNum && (s1->eType == ET_PLAYER || (s1->eFlags & EF_DEAD))) {
-        if (cg_forceModel->integer) {
-            CG_UpdateForceModels();
+        if (cg_forceModel->integer && cg_forceModelAllowed) {
+            //CG_UpdateForceModels();
 
             if (s1->eFlags & EF_AXIS) {
                 model.hModel = cg.hAxisPlayerModelHandle;
@@ -965,9 +1164,9 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
         if (!model.hModel || !model.tiki) {
             // Use a model in case it still doesn't exist
             if (s1->eFlags & EF_AXIS) {
-                model.hModel = cgi.R_RegisterModel("models/player/german_wehrmacht_soldier.tik");
+                model.hModel = cgi.R_RegisterModel(CG_GetPlayerModelTiki(dm_playergermanmodel->resetString));
             } else {
-                model.hModel = cgi.R_RegisterModel("models/player/american_army.tik");
+                model.hModel = cgi.R_RegisterModel(CG_GetPlayerModelTiki(dm_playermodel->resetString));
             }
             model.tiki      = cgi.R_Model_GetHandle(model.hModel);
             model.hOldModel = cgs.model_draw[s1->modelindex];
@@ -1213,9 +1412,9 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
                     }
                 } else {
                     if (cg.snap->ps.stats[STAT_TEAM] == TEAM_AXIS) {
-                        hModel = cgi.R_RegisterModel("models/player/german_wehrmacht_soldier_fps.tik");
+                        hModel = cgi.R_RegisterModel(CG_GetPlayerLocalModelTiki(dm_playergermanmodel->resetString));
                     } else {
-                        hModel = cgi.R_RegisterModel("models/player/american_army_fps.tik");
+                        hModel = cgi.R_RegisterModel(CG_GetPlayerLocalModelTiki(dm_playermodel->resetString));
                     }
 
                     if (hModel) {
@@ -1337,7 +1536,7 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
             if (!((cent->animLastWeight >> i) & 1) || model.frameInfo[i].index != cent->animLast[i]) {
                 CG_ProcessEntityCommands(TIKI_FRAME_ENTRY, model.frameInfo[i].index, s1->number, &model, cent);
                 if (cent->animLastTimes[i] == -1) {
-                    cent->animLast[i] = model.frameInfo[i].index;
+                    cent->animLast[i]      = model.frameInfo[i].index;
                     cent->animLastTimes[i] = model.frameInfo[i].time;
                 } else {
                     cent->animLastTimes[i] = 0;
diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index 11b4d436..8da21cac 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -963,6 +963,9 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
         cg.bIntermissionDisplay = qfalse;
     }
 
+    // Added in OPM
+    CG_ProcessPlayerModel();
+
     // build the render lists
     if (!cg.hyperspace) {
         CG_AddPacketEntities(); // after calcViewValues, so predicted player state is correct

From 187079842fe34e62ef47454ac2ac5c86829f3168 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 22 Jan 2025 21:26:29 +0100
Subject: [PATCH 1852/2040] Add cg_cheats to check if cheats are enabled

---
 code/cgame/cg_local.h | 1 +
 code/cgame/cg_main.c  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 21104299..86921201 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -512,6 +512,7 @@ extern "C" {
     // Added in OPM
     //
     extern cvar_t *cg_fov;
+    extern cvar_t *cg_cheats;
 
     //
     // cg_main.c
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 99f327c8..71295f3e 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -116,6 +116,7 @@ cvar_t *ui_timemessage;
 // Added in OPM
 //
 cvar_t *cg_fov;
+cvar_t *cg_cheats;
 
 /*
 =================
@@ -214,6 +215,7 @@ void CG_RegisterCvars(void)
     //
 
     cg_fov = cgi.Cvar_Get("cg_fov", "80", CVAR_ARCHIVE);
+    cg_cheats = cgi.Cvar_Get("cheats", "0", CVAR_USERINFO | CVAR_SERVERINFO | CVAR_LATCH);
 }
 /*
 ===============

From 08e52088351626359dd0b3f58d7d97628cea354a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 22 Jan 2025 21:35:09 +0100
Subject: [PATCH 1853/2040] Add "append" as allowed command

---
 code/cgame/cg_servercmds.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 74d4269a..1a61109f 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -654,8 +654,14 @@ static qboolean CG_IsStatementFiltered(char *cmd)
         }
 
         if (!Q_stricmp(com_token, "set") || !Q_stricmp(com_token, "setu") || !Q_stricmp(com_token, "seta")
-            || !Q_stricmp(com_token, "sets")) {
-            char type = com_token[3];
+            || !Q_stricmp(com_token, "sets") || !Q_stricmp(com_token, "append")) {
+            char type;
+            
+            if (Q_stricmp(com_token, "append")) {
+                type = com_token[3];
+            } else {
+                type = 0;
+            }
 
             //
             // variable

From 52744fb784f6348e17702db2882f725d0139406a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 22 Jan 2025 21:35:27 +0100
Subject: [PATCH 1854/2040] Whitelist cg_3rd_person

---
 code/cgame/cg_servercmds.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 1a61109f..081f0394 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -469,7 +469,8 @@ static const char *whiteListedVariables[] = {
     "subtitle1",
     "subtitle2",
     "subtitle3",
-    "name"
+    "name",
+    "cg_3rd_person" // for 3rd person server
 };
 
 //

From 98bb3e0366425add94bf3bc0ca7cac15553c9176 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 23 Jan 2025 01:07:44 +0100
Subject: [PATCH 1855/2040] Fix Com_SanitizeName infinite loop

---
 code/qcommon/common.c | 108 +++++++++++++++++++-----------------------
 1 file changed, 49 insertions(+), 59 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index abe0a311..0b3e93c0 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2468,75 +2468,65 @@ void Com_Shutdown (void) {
 
 }
 
-qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName, size_t bufferSize )
+qboolean Com_SanitizeName(const char* pszOldName, char* pszNewName, size_t bufferSize)
 {
-	int i;
-	qboolean bBadName = qfalse;
-	const char *p = pszOldName;
-	size_t maxLength;
+    int i;
+    qboolean bBadName = qfalse;
+    const char* p = pszOldName;
+    size_t maxLength;
 
-	maxLength = (bufferSize / sizeof(char)) - 1;
+    maxLength = (bufferSize / sizeof(char)) - 1;
+    bBadName = qfalse;
 
-	if( *pszOldName && *pszOldName <= ' ' )
-	{
-		bBadName = qtrue;
+    for (p = pszOldName; *p && *(unsigned char*)p <= ' '; p++) {
+        bBadName = qtrue;
+    }
 
-		while( *p && *p <= ' ' )
-		{
-			p++;
-		}
-	}
+    for (i = 0; *p && *p >= ' ' && i < maxLength; p++, i++)
+    {
+        if (*p == '~' || *p == '`')
+        {
+            pszNewName[i] = '*';
+            bBadName = qtrue;
+        }
+        else if (*p == '\"')
+        {
+            pszNewName[i] = '\'';
+            bBadName = qtrue;
+        }
+        else if (*p == '\\')
+        {
+            pszNewName[i] = '/';
+            bBadName = qtrue;
+        }
+        else if (*p == ';')
+        {
+            pszNewName[i] = ':';
+            bBadName = qtrue;
+        }
+        else
+        {
+            pszNewName[i] = *p;
+        }
+    }
 
-	i = 0;
-	for( i = 0; *p && *p >= ' ' && i < maxLength; p++, i++ )
-	{
-		if( *p == '~' || *p == '`' )
-		{
-			pszNewName[ i ] = '*';
-			bBadName = qtrue;
-		}
-		else if( *p == '\"' )
-		{
-			pszNewName[ i ] = '\'';
-			bBadName = qtrue;
-		}
-		else if( *p == '\\' )
-		{
-			pszNewName[ i ] = '/';
-			bBadName = qtrue;
-		}
-		else if( *p == ';' )
-		{
-			pszNewName[ i ] = ':';
-			bBadName = qtrue;
-		}
-		else
-		{
-			pszNewName[ i ] = *p;
-		}
-	}
+    for (; i > 0 && (unsigned char)pszNewName[i - 1] <= ' '; i--) {
+        bBadName = qtrue;
+    }
 
-	if( i > 0 && pszNewName[ i - 1 ] <= ' ' )
-	{
-		bBadName = qtrue;
-		do
-		{
-			p++;
-		} while( i > 0 && pszNewName[ i - 1 ] <= ' ' );
-	}
-	pszNewName[ i ] = 0;
+    pszNewName[i] = 0;
 
-	if( !i )
-	{
+    if (!i)
+    {
         const char* pNewNameDynamic = va("*** Blank Name #%04d ***", rand() % 100000);
-		Q_strncpyz(pszNewName, pNewNameDynamic, bufferSize);
-		bBadName = qtrue;
-	}
+        Q_strncpyz(pszNewName, pNewNameDynamic, bufferSize);
+        bBadName = qtrue;
+    }
 
-	if( *p )
-		bBadName = qtrue;
+    if (*p)
+        bBadName = qtrue;
 
-	return bBadName;
+    return bBadName;
 }
 
 const char *Com_GetArchiveFileName( const char *filename, const char *extension )

From 33855cfbee3ca5b44e11daada222096f0ddda605 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 23 Jan 2025 01:09:33 +0100
Subject: [PATCH 1856/2040] Implement add, subtract, scale, append and bitset

---
 code/qcommon/cvar.c | 204 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 167 insertions(+), 37 deletions(-)

diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index d0846a3f..2d044859 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -1017,6 +1017,167 @@ void Cvar_SetS_f( void ) {
 	v->flags |= CVAR_SERVERINFO;
 }
 
+/*
+============
+Cvar_Reset_f
+============
+*/
+void Cvar_Reset_f( void ) {
+	if ( Cmd_Argc() != 2 ) {
+		Com_Printf ("usage: reset <variable>\n");
+		return;
+	}
+	Cvar_Reset( Cmd_Argv( 1 ) );
+}
+
+/*
+============
+Cvar_Add_f
+
+su44: Adds a value to a variable
+============
+*/
+void Cvar_Add_f( void ) {
+	int c;
+	float current;
+	float amount;
+	char val[32];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: add <variable> <amount>\n");
+		return;
+	}
+
+	amount = atof(Cmd_Argv(2));
+	current = Cvar_VariableValue(Cmd_Argv(1)) + amount;
+	c = (int)current;
+	if (current == c) {
+		Com_sprintf(val, 32, "%i", c);
+	} else {
+		Com_sprintf(val, 32, "%f", current);
+	}
+
+	Cvar_Set2(Cmd_Argv(1), val, qfalse);
+}
+
+/*
+============
+Cvar_Subtract_f
+============
+*/
+void Cvar_Subtract_f( void ) {
+	int c;
+	float current;
+	float amount;
+	char val[32];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: subtract <variable> <amount>\n");
+		return;
+	}
+
+	amount = atof(Cmd_Argv(2));
+	current = Cvar_VariableValue(Cmd_Argv(1)) - amount;
+	c = (int)current;
+	if (current == c) {
+		Com_sprintf(val, 32, "%i", c);
+	} else {
+		Com_sprintf(val, 32, "%f", current);
+	}
+
+	Cvar_Set2(Cmd_Argv(1), val, qfalse);
+}
+
+/*
+============
+Cvar_Scale_f
+============
+*/
+void Cvar_Scale_f( void ) {
+	int c;
+	float current;
+	float amount;
+	char val[32];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: scale <variable> <amount>\n");
+		return;
+	}
+
+	amount = atof(Cmd_Argv(2));
+	current = Cvar_VariableValue(Cmd_Argv(1)) * amount;
+	c = (int)current;
+	if (current == c) {
+		Com_sprintf(val, 32, "%i", c);
+	} else {
+		Com_sprintf(val, 32, "%f", current);
+	}
+
+	Cvar_Set2(Cmd_Argv(1), val, qfalse);
+}
+
+/*
+============
+Cvar_Append_f
+============
+*/
+void Cvar_Append_f( void ) {
+	int c;
+	char buffer[1024];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: append <variable> <string>\n");
+		return;
+	}
+
+	Com_sprintf(buffer, sizeof(buffer), "%s %s", Cvar_VariableString(Cmd_Argv(1)), Cmd_Argv(2));
+	Cvar_Set2(Cmd_Argv(1), buffer, qfalse);
+}
+
+/*
+============
+Cvar_Append_f
+============
+*/
+void Cvar_Bitset_f( void ) {
+	cvar_t* var;
+	const char* name;
+	int bit;
+	char val[32];
+
+	// Removed in OPM
+	//  Also let clients use bitset
+	/*
+	if (!com_sv_running->integer) {
+		Com_Printf("Server is not running.\n");
+		return;
+	}
+	*/
+
+	if (Cmd_Argc() < 3 || Cmd_Argc() > 4) {
+		//Com_Printf("Usage: bitset cvar bit [value]\n");
+		Com_Printf("Usage: bitset <variable> <bit> [1=add, 0=remove]\n");
+		return;
+	}
+
+	name = Cmd_Argv(1);
+	bit = atoi(Cmd_Argv(2));
+	var = Cvar_Get(name, "", 0);
+
+	if (!var->integer && var->string[0] != '0') {
+		Com_Printf("Error: cvar %s does not store an integer\n", name);
+		return;
+	}
+
+	if (Cmd_Argc() > 3 && !atoi(Cmd_Argv(3))) {
+		Com_sprintf(val, sizeof(val), "%i", var->integer & ~(1 << bit));
+	} else {
+		Com_sprintf(val, sizeof(val), "%i", var->integer | (1 << bit));
+	}
+
+	Cvar_Set(name, val);
+}
+
 /*
 ============
 Cvar_SetA_f
@@ -1039,43 +1200,6 @@ void Cvar_SetA_f( void ) {
 	v->flags |= CVAR_ARCHIVE;
 }
 
-/*
-============
-Cvar_Add_f
-
-su44: Adds a value to a variable
-============
-*/
-void Cvar_Add_f( void ) {
-	cvar_t	*v;
-	float f;
-
-	if ( Cmd_Argc() != 3 ) {
-		Com_Printf ("usage: add <variable> <amount>\n");
-		return;
-	}
-	v = Cvar_FindVar( Cmd_Argv( 1 ) );
-	if ( !v ) {
-		Cvar_Set( Cmd_Argv( 1 ), Cmd_Argv( 2 ) );
-		return;
-	}
-	f = v->value;
-	f += atof(Cmd_Argv(2));
-	Cvar_Set(v->name,va("%f",f));
-}
-/*
-============
-Cvar_Reset_f
-============
-*/
-void Cvar_Reset_f( void ) {
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("usage: reset <variable>\n");
-		return;
-	}
-	Cvar_Reset( Cmd_Argv( 1 ) );
-}
-
 /*
 ============
 Cvar_WriteVariables
@@ -1648,6 +1772,12 @@ void Cvar_Init (void)
 	Cmd_AddCommand ("cvar_restart", Cvar_Restart_f);
 	// su44: added for MoHAA
 	Cmd_AddCommand ("add", Cvar_Add_f);
+	Cmd_AddCommand ("subtract", Cvar_Subtract_f);
+	Cmd_AddCommand ("scale", Cvar_Scale_f);
+	Cmd_AddCommand ("append", Cvar_Append_f);
+
+	// Added in 2.30
+	Cmd_AddCommand ("bitset", Cvar_Bitset_f);
 }
 
 #ifndef STANDALONE

From 7e26814cfa47d92b772389feaeb0161ea0ff137a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 24 Jan 2025 21:39:09 +0100
Subject: [PATCH 1857/2040] Use a signed integer to display the score

---
 code/server/sv_ccmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 67c59295..790379ed 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -1219,7 +1219,7 @@ static void SV_Status_f(void) {
 		ps = SV_GameClientNum(i);
 		// su44: ps->persistant is not avaible in mohaa
 		//Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
-		Com_Printf("%*u ", colSize[1], ps->stats[STAT_KILLS]);
+		Com_Printf("%*i ", colSize[1], ps->stats[STAT_KILLS]);
 
 		if (cl->state == CS_CONNECTED)
 			Com_Printf("CNCT ");

From 9bb4789b328ec93ddf9e85b2a2e57c3b1eb7c0c2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 25 Jan 2025 16:40:41 +0100
Subject: [PATCH 1858/2040] Add terrain flags

---
 code/qcommon/cm_terrain.c     |  6 +++---
 code/qcommon/qfiles.h         |  2 ++
 code/renderergl1/tr_terrain.c | 33 ++++++++++++++++++---------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 8893481d..c2435256 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -200,7 +200,7 @@ void CM_PickTerrainSquareMode(terrainCollideSquare_t *square, vec3_t vTest, int
     int             flags0, flags1;
     varnodeIndex_t *vni;
 
-    if (patch->flags & 0x80) {
+    if (patch->flags & TERPATCH_NEIGHBOR) {
         vni = g_vni[1][i][j];
     } else {
         vni = g_vni[0][i][j];
@@ -297,7 +297,7 @@ void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc)
             square = &tc->squares[i][j];
 
             if ((i + j) & 1) {
-                if (patch->flags & 0x40) {
+                if (patch->flags & TERPATCH_FLIP) {
                     CM_PlaneFromPoints(square->plane[0], v4, v2, v3);
                     CM_PlaneFromPoints(square->plane[1], v2, v4, v1);
                 } else {
@@ -306,7 +306,7 @@ void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc)
                 }
                 CM_PickTerrainSquareMode(square, v1, i, j, patch);
             } else {
-                if (patch->flags & 0x40) {
+                if (patch->flags & TERPATCH_FLIP) {
                     CM_PlaneFromPoints(square->plane[0], v1, v3, v4);
                     CM_PlaneFromPoints(square->plane[1], v3, v1, v2);
                 } else {
diff --git a/code/qcommon/qfiles.h b/code/qcommon/qfiles.h
index 927cbc98..f62cb9eb 100644
--- a/code/qcommon/qfiles.h
+++ b/code/qcommon/qfiles.h
@@ -425,6 +425,8 @@ typedef struct fcm_s {
 } fcm_t;
 
 #define MAX_TERRAIN_VARNODES 63
+#define TERPATCH_FLIP		0x40
+#define TERPATCH_NEIGHBOR	0x80
 
 typedef struct varnode_s {
 	unsigned short flags;
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index 7936ade2..bcbab3da 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -59,6 +59,9 @@ vec3_t        g_vTerFwd;
 static const unsigned int MAX_TERRAIN_LOD       = 6;
 static const float        TERRAIN_LIGHTMAP_SIZE = 128.0f;
 
+#define VARNODE_INVISIBLE	4
+#define VARNODE_DELETE		8
+
 typedef struct poolInfo_s {
     terraInt iFreeHead;
     terraInt iCur;
@@ -277,9 +280,9 @@ static int R_ConstChecksForTri(terraTri_t *pTri)
     //vn.s.flags &= 0xF0;
     vn.flags &= 0xFFFFFFF0;
 
-    if (vn.fVariance == 0.0 && !(pTri->varnode->flags & 8)) {
+    if (vn.fVariance == 0.0 && !(pTri->varnode->flags & VARNODE_DELETE)) {
         return 2;
-    } else if (pTri->varnode->flags & 8) {
+    } else if (pTri->varnode->flags & VARNODE_DELETE) {
         return 3;
     } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->flags & 4) && pTri->lod < ter_maxlod->integer) {
         return 0;
@@ -522,7 +525,7 @@ static void R_ForceSplit(terraInt iTri)
             R_InterpolateVert(pBase, pVert);
 
             pVert->fVariance = g_pVert[iNewPt].fVariance;
-            if (flags & 8) {
+            if (flags & VARNODE_DELETE) {
                 pVert->fHgtAvg += pVert->fHgtAdd;
                 pVert->fHgtAdd   = 0.0;
                 pVert->fVariance = 0.0;
@@ -539,7 +542,7 @@ static void R_ForceSplit(terraInt iTri)
         R_DemoteInAncestry(pBase->patch, iBase);
     }
 
-    if (flags & 8) {
+    if (flags & VARNODE_DELETE) {
         pVert = &g_pVert[iNewPt];
         pVert->fHgtAvg += pVert->fHgtAdd;
         pVert->fHgtAdd   = 0.0;
@@ -648,7 +651,7 @@ static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, i
     case 0:
         return iNeighbor;
     case 1:
-        if (terraPatches[iPatch].flags & 0x80) {
+        if (terraPatches[iPatch].flags & TERPATCH_NEIGHBOR) {
             return iNeighbor;
         } else {
             return iNeighbor + 1;
@@ -657,7 +660,7 @@ static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, i
     case 2:
         return iNeighbor + 1;
     case 3:
-        if (terraPatches[iPatch].flags & 0x80) {
+        if (terraPatches[iPatch].flags & TERPATCH_NEIGHBOR) {
             return iNeighbor + 1;
         } else {
             return iNeighbor;
@@ -844,10 +847,10 @@ static void R_PreTessellateTerrain()
         pTri->byConstChecks |= R_ConstChecksForTri(pTri);
 
         pTri->iBase = iTri1;
-        if ((patch->flags & 0x80u) == 0) {
+        if ((patch->flags & TERPATCH_NEIGHBOR) == 0) {
             pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
             pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
-            if (patch->flags & 0x40) {
+            if (patch->flags & TERPATCH_FLIP) {
                 pTri->iPt[0] = i00;
                 pTri->iPt[1] = i11;
             } else {
@@ -858,7 +861,7 @@ static void R_PreTessellateTerrain()
         } else {
             pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
             pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
-            if (patch->flags & 0x40) {
+            if (patch->flags & TERPATCH_FLIP) {
                 pTri->iPt[0] = i01;
                 pTri->iPt[1] = i10;
             } else {
@@ -878,10 +881,10 @@ static void R_PreTessellateTerrain()
         pTri->byConstChecks |= R_ConstChecksForTri(pTri);
 
         pTri->iBase = iTri0;
-        if ((patch->flags & 0x80u) == 0) {
+        if ((patch->flags & TERPATCH_NEIGHBOR) == 0) {
             pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
             pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
-            if (patch->flags & 0x40) {
+            if (patch->flags & TERPATCH_FLIP) {
                 pTri->iPt[0] = i11;
                 pTri->iPt[1] = i00;
             } else {
@@ -892,7 +895,7 @@ static void R_PreTessellateTerrain()
         } else {
             pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
             pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
-            if (patch->flags & 0x40) {
+            if (patch->flags & TERPATCH_FLIP) {
                 pTri->iPt[0] = i10;
                 pTri->iPt[1] = i01;
             } else {
@@ -1112,7 +1115,7 @@ static qboolean R_MergeInternalCautious()
         return qfalse;
     }
 
-    if (pTri->varnode->flags & 8) {
+    if (pTri->varnode->flags & VARNODE_DELETE) {
         return qfalse;
     }
 
@@ -1122,7 +1125,7 @@ static qboolean R_MergeInternalCautious()
 
     if (pTri->iBase) {
         pBase = &g_pTris[pTri->iBase];
-        if (pBase->nSplit || (pBase->varnode->flags & 8)) {
+        if (pBase->nSplit || (pBase->varnode->flags & VARNODE_DELETE)) {
             return qfalse;
         }
 
@@ -1553,7 +1556,7 @@ void R_CraterTerrain(const vec3_t pos, const vec3_t dir, float fDepth, float fRa
                     continue;
                 }
 
-                if (pPatch->flags & 0x40) {
+                if (pPatch->flags & TERPATCH_FLIP) {
                     heightmap[index] = vArcCenter[2] + sqrt(dzSquared);
                     if (fMaxHeight < heightmap[index]) {
                         fMaxHeight = heightmap[index];

From c345035e125948381d59da4ddcdab7e50b7fb529 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 27 Jan 2025 00:13:01 +0100
Subject: [PATCH 1859/2040] Add Cvar_CheckRange exports

---
 code/cgame/cg_public.h   | 1 +
 code/client/cl_cgame.cpp | 1 +
 code/fgame/g_public.h    | 2 ++
 code/server/sv_game.c    | 1 +
 4 files changed, 5 insertions(+)

diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index 9362d5e7..4e5de840 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -122,6 +122,7 @@ functions exported to the main executable
         cvar_t *(*Cvar_Get)(const char *var_name, const char *value, int flags);
         cvar_t *(*Cvar_Find)(const char *var_name);
         void (*Cvar_Set)(const char *var_name, const char *value);
+        void (*Cvar_CheckRange)(cvar_t* var, float min, float max, qboolean integral);
 
         // ClientCommand and ConsoleCommand parameter access
         int (*Argc)(void);
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 685f32a8..e6737760 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -629,6 +629,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->Cvar_Get						= Cvar_Get;
 	cgi->Cvar_Find						= Cvar_FindVar;
 	cgi->Cvar_Set						= Cvar_Set;
+	cgi->Cvar_CheckRange				= Cvar_CheckRange;
 
 	cgi->Argc							= Cmd_Argc;
 	cgi->Args							= Cmd_Args;
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 3e7599f9..e4f235d3 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -248,6 +248,8 @@ typedef struct gameImport_s {
     void (*cvar_set)(const char *varName, const char *varValue);
     cvar_t *(*cvar_set2)(const char *varName, const char *varValue, qboolean force);
     cvar_t *(*NextCvar)(cvar_t *var);
+    void (*Cvar_CheckRange)(cvar_t* var, float min, float max, qboolean integral);
+
     int (*Argc)();
     char *(*Argv)(int arg);
     char *(*Args)();
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 106b9e62..a87df2ad 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -1772,6 +1772,7 @@ void SV_InitGameProgs( void ) {
 	import.cvar_set						= Cvar_Set;
 	import.cvar_set2					= Cvar_Set2;
 	import.NextCvar						= Cvar_Next;
+	import.Cvar_CheckRange				= Cvar_CheckRange;
 
 	import.Argc							= Cmd_Argc;
 	import.Args							= Cmd_Args;

From e510c50a24bce61cc04473a94df6e309347949d8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 27 Jan 2025 00:44:17 +0100
Subject: [PATCH 1860/2040] Set minimum and maximum for effect variables

---
 code/cgame/cg_tempmodels.cpp | 63 +++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index af75f3ba..3ce3ab04 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -131,10 +131,10 @@ void ClientGameCommandManager::FreeAllTempModels(void)
 //===============
 void ClientGameCommandManager::FreeSomeTempModels(void)
 {
-    ctempmodel_t* model;
-    int count = 0;
-    unsigned int i;
-    unsigned int numToFree;
+    ctempmodel_t *model;
+    int           count = 0;
+    unsigned int  i;
+    unsigned int  numToFree;
 
     if (!m_free_tempmodels) {
         return;
@@ -159,10 +159,10 @@ void ClientGameCommandManager::FreeSomeTempModels(void)
 //===============
 // FreeSpawnthing
 //===============
-void ClientGameCommandManager::FreeSpawnthing(spawnthing_t* sp)
+void ClientGameCommandManager::FreeSpawnthing(spawnthing_t *sp)
 {
-    ctempmodel_t* model;
-    ctempmodel_t* prev;
+    ctempmodel_t *model;
+    ctempmodel_t *prev;
 
     if (sp->numtempmodels) {
         for (model = m_active_tempmodels.prev; model != &m_active_tempmodels; model = prev) {
@@ -199,7 +199,7 @@ void ClientGameCommandManager::ResetTempModels(void)
 }
 
 static int lastTempModelFrameTime = 0;
-int next_tempmodel_warning = 0;
+int        next_tempmodel_warning = 0;
 
 void CG_ResetTempModels(void)
 {
@@ -228,11 +228,16 @@ void ClientGameCommandManager::InitializeTempModels(void)
 
 void ClientGameCommandManager::InitializeTempModelCvars(void)
 {
-    cg_showtempmodels     = cgi.Cvar_Get("cg_showtempmodels", "0", 0);
-    cg_detail             = cgi.Cvar_Get("detail", "1", CVAR_ARCHIVE);
-    cg_effectdetail       = cgi.Cvar_Get("cg_effectdetail", "0.2", CVAR_ARCHIVE);
+    cg_showtempmodels = cgi.Cvar_Get("cg_showtempmodels", "0", 0);
+    cg_detail         = cgi.Cvar_Get("detail", "1", CVAR_ARCHIVE);
+
+    cg_effectdetail = cgi.Cvar_Get("cg_effectdetail", "0.2", CVAR_ARCHIVE);
+    cgi.Cvar_CheckRange(cg_effectdetail, 0.2, 1.0, qfalse);
+
     cg_effect_physicsrate = cgi.Cvar_Get("cg_effect_physicsrate", "10", CVAR_ARCHIVE);
     cg_max_tempmodels     = cgi.Cvar_Get("cg_max_tempmodels", "1100", CVAR_ARCHIVE);
+    cgi.Cvar_CheckRange(cg_max_tempmodels, 200, MAX_TEMPMODELS, qtrue);
+
     cg_reserve_tempmodels = cgi.Cvar_Get("cg_reserve_tempmodels", "200", CVAR_ARCHIVE);
 
     if (cg_max_tempmodels->integer > MAX_TEMPMODELS) {
@@ -253,9 +258,9 @@ void ClientGameCommandManager::InitializeTempModelCvars(void)
 //===============
 void ClientGameCommandManager::AnimateTempModel(ctempmodel_t *p, Vector origin, refEntity_t *newEnt)
 {
-    int numframes;
-    int deltatime;
-    int frametime;
+    int   numframes;
+    int   deltatime;
+    int   frametime;
     float prev;
 
     // This code is for animating tempmodels that are spawned from the client
@@ -491,16 +496,16 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t *p, Vector ori
     if (p->number != -1) {
         refEntity_t *old_entity;
         dtiki_t     *old_tiki;
-        int         oldnum;
-        float       oldscale;
+        int          oldnum;
+        float        oldscale;
 
         // Set the axis
         AnglesToAxis(p->cgd.angles, axis);
 
         old_entity = current_entity;
-        old_tiki = current_tiki;
-        oldnum = current_entity_number;
-        oldscale = current_scale;
+        old_tiki   = current_tiki;
+        oldnum     = current_entity_number;
+        oldscale   = current_scale;
 
         current_scale         = newEnt->scale;
         current_entity        = newEnt;
@@ -525,7 +530,7 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t *p, Vector ori
 
     if (p->cgd.flags2 & T2_ALIGNSTRETCH) {
         Vector vDelta;
-        float fScale;
+        float  fScale;
 
         vDelta = p->cgd.origin - p->cgd.oldorigin;
         fScale = vDelta.length() * p->cgd.scale2;
@@ -562,8 +567,8 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
 
     // If linked to the parent or hardlinked, get the parent's origin
     if ((p->cgd.flags & (T_PARENTLINK | T_HARDLINK)) && (p->cgd.parent != ENTITYNUM_NONE)) {
-        centity_t* pc;
-        refEntity_t* e;
+        centity_t   *pc;
+        refEntity_t *e;
 
         pc = &cg_entities[p->cgd.parent];
         if (!pc->currentValid) {
@@ -577,8 +582,7 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
 
         parentOrigin = e->origin;
         vectoangles(e->axis[0], parentAngles);
-    }
-    else if (p->cgd.flags & T_SWARM) {
+    } else if (p->cgd.flags & T_SWARM) {
         p->cgd.parentOrigin = p->cgd.velocity + p->cgd.accel * ftime * scale;
     }
 
@@ -891,10 +895,11 @@ void ClientGameCommandManager::AddTempModels(void)
     refEntity_t  *old_ent;
 
     // To counteract cg.time going backwards
-    if (lastTempModelFrameTime && ((cg.time < lastTempModelFrameTime) || (cg.time - lastTempModelFrameTime > TOO_MUCH_TIME_PASSED))) {
+    if (lastTempModelFrameTime
+        && ((cg.time < lastTempModelFrameTime) || (cg.time - lastTempModelFrameTime > TOO_MUCH_TIME_PASSED))) {
         p = m_active_tempmodels.prev;
         for (; p != &m_active_tempmodels; p = next) {
-            next = p->prev;
+            next               = p->prev;
             p->lastPhysicsTime = cg.time;
         }
         lastTempModelFrameTime = cg.time;
@@ -994,7 +999,7 @@ void ClientGameCommandManager::AddTempModels(void)
         // Run physics if the lastEnt is not valid to get a valid lerp
         if (!p->lastEntValid) {
             float t;
-            t  = physics_rate / 1000.0f;
+            t = physics_rate / 1000.0f;
 
             ret = TempModelPhysics(p, t, scale);
             if (!ret) {
@@ -1180,7 +1185,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
         if (m_spawnthing->cgd.flags & T_WAVE) {
             p->m_spawnthing = m_spawnthing;
             m_spawnthing->numtempmodels++;
-            start           = Vector(0, 0, 0);
+            start = Vector(0, 0, 0);
         } else {
             p->m_spawnthing = NULL;
             start           = m_spawnthing->cgd.origin;
@@ -1205,7 +1210,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
                 Vector dst;
                 // Create a circular shaped burst around the up vector
                 float angle;
-                
+
                 if (mcount == 1) {
                     angle = random() * 360;
                 } else {

From 33dbb07559100b028f35c57f99cdce301f644ab2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 Jan 2025 19:30:17 +0100
Subject: [PATCH 1861/2040] Export game name and shortversion as information
 clients/servers can see

---
 code/qcommon/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 0b3e93c0..5da3f9c5 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1904,8 +1904,8 @@ void Com_Init( char *commandLine ) {
 
 	s = va( "%s %s (Medal of Honor: %s %s) %s %s", PRODUCT_NAME, PRODUCT_VERSION_FULL, Cvar_VariableString("com_target_extension"), Cvar_VariableString("com_target_version"), PLATFORM_STRING, PRODUCT_VERSION_DATE);
 	com_version = Cvar_Get( "version", s, CVAR_ROM | CVAR_SERVERINFO );
-	com_gamename = Cvar_Get("com_gamename", "", CVAR_SERVERINFO | CVAR_INIT);
-	com_shortversion = Cvar_Get( "shortversion", PRODUCT_VERSION, CVAR_ROM );
+	com_gamename = Cvar_Get("com_gamename", "", CVAR_SERVERINFO | CVAR_INIT | CVAR_USERINFO | CVAR_SERVERINFO);
+	com_shortversion = Cvar_Get( "shortversion", PRODUCT_VERSION, CVAR_ROM | CVAR_USERINFO | CVAR_SERVERINFO );
 	com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_INIT);
 #ifdef LEGACY_PROTOCOL
 	com_legacyprotocol = Cvar_Get("com_legacyprotocol", va("%i", PROTOCOL_LEGACY_VERSION), CVAR_INIT);

From 1fc36fce9be790003e31cdc401da8822f9144791 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 Jan 2025 20:03:02 +0100
Subject: [PATCH 1862/2040] Fix multiple bullet hole effects unnecessarily
 spawning

---
 code/cgame/cg_parsemsg.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 551fc595..a5f87d4e 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -584,7 +584,8 @@ static void CG_MakeBulletTracerInternal(
                              || (trace.contents & CONTENTS_WATER))
                             && iContinueCount < 5) {
                             if (bInWater) {
-                                VectorSubtract(trace.endpos, vDir, vTmp);
+                                VectorMA(trace.endpos, -1.0, vDir, vTmp);
+
                                 if (!(trace.contents & CONTENTS_FLUID) && !(trace.surfaceFlags & SURF_PUDDLE)
                                     && !(cgi.CM_PointContents(vTmp, 0) & CONTENTS_FLUID)) {
                                     CG_MakeBubbleTrail(vTrailStart, trace.endpos, iLarge, alpha);
@@ -596,8 +597,7 @@ static void CG_MakeBulletTracerInternal(
                                 bInWater = qtrue;
                             }
 
-                            VectorAdd(vDir, vDir, vTraceStart);
-                            VectorAdd(vTraceStart, vTraceStart, trace.endpos);
+                            VectorMA(trace.endpos, 2.0, vDir, vTraceStart);
 
                             iContinueCount++;
                         } else {

From 8341f8cb6aa21bc704ea36775d9273a47794d4e2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 Jan 2025 20:24:02 +0100
Subject: [PATCH 1863/2040] Fix bullet hole sometimes not playing

---
 code/cgame/cg_parsemsg.cpp | 123 +++++++++++++++++++++++--------------
 1 file changed, 76 insertions(+), 47 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index a5f87d4e..5fab94fe 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -85,7 +85,12 @@ void CG_MakeBulletHoleSound(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarg
         iSurfType = SURF_PUDDLE;
     }
 
-    if (trace.fraction == 1.0f || trace.startsolid || (trace.surfaceFlags & SURF_SKY)) {
+    if (trace.fraction == 1) {
+        // no reason to make a sound if it nothing was hit
+        return;
+    }
+
+    if ((trace.surfaceFlags & SURF_SKY) || !CG_CheckMakeMarkOnEntity(trace.entityNum)) {
         return;
     }
 
@@ -253,7 +258,12 @@ CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t
         iSurfType = SURF_PUDDLE;
     }
 
-    if (trace.fraction == 1.0f || trace.startsolid || (trace.surfaceFlags & SURF_SKY)) {
+    if (trace.fraction == 1.0f || trace.startsolid) {
+        return;
+    }
+
+    if (trace.surfaceFlags & SURF_SKY) {
+        // ignore sky surfaces
         return;
     }
 
@@ -460,35 +470,36 @@ static void CG_MakeBulletTracerInternal(
     float         alpha
 )
 {
-    vec3_t       vPos;
-    int          iBullet;
-    int          iContinueCount;
-    int          iDist;
-    int          iHeadDist;
-    int          iTravelDist;
-    float        fLen, fDist;
-    trace_t      trace;
-    qboolean     bStartInWater, bInWater;
-    qboolean     bBulletDone;
-    qboolean     bMadeTracer;
-    vec3_t       vDir;
-    vec3_t       vTrailStart;
-    vec3_t       vTraceStart;
-    vec3_t       vTraceEnd;
-    vec3_t       vTmp;
-    int          iNumImpacts;
-    trace_t      tImpacts[128];
-    float        fImpSndDistRA;
-    static float fImpSndDistLA;
-    float        fImpSndDistRB;
-    float        fImpSndDistLB;
-    int          iImpSndIndexRA;
-    int          iImpSndIndexRB;
-    int          iImpSndIndexLB;
-    float        fVolume;
-    float        fPitch;
-    float        fZingDistA, fZingDistB, fZingDistC;
-    vec3_t       vZingPosA, vZingPosB, vZingPosC;
+    vec3_t   vPos;
+    int      iBullet;
+    int      iContinueCount;
+    int      iDist;
+    int      iHeadDist;
+    int      iTravelDist;
+    float    fLen, fDist;
+    trace_t  trace;
+    qboolean bStartInWater, bInWater;
+    qboolean bBulletDone;
+    qboolean bMadeTracer;
+    vec3_t   vDir;
+    vec3_t   vTrailStart;
+    vec3_t   vTraceStart;
+    vec3_t   vTraceEnd;
+    vec3_t   vTmp;
+    int      iNumImpacts;
+    trace_t  tImpacts[128];
+    float    fImpSndDistRA;
+    float    fImpSndDistLA;
+    float    fImpSndDistRB;
+    float    fImpSndDistLB;
+    int      iImpSndIndexRA;
+    int      iImpSndIndexLA;
+    int      iImpSndIndexRB;
+    int      iImpSndIndexLB;
+    float    fVolume;
+    float    fPitch;
+    float    fZingDistA, fZingDistB, fZingDistC;
+    vec3_t   vZingPosA, vZingPosB, vZingPosC;
 
     fZingDistB  = 9999.0;
     fZingDistA  = 9999.0;
@@ -659,46 +670,46 @@ static void CG_MakeBulletTracerInternal(
     if (iNumImpacts > 2) {
         fImpSndDistRA  = 9999.0f;
         fImpSndDistRB  = 9999.0f;
-        iImpSndIndexRA = 0;
-        iImpSndIndexRB = 0;
+        fImpSndDistLA  = 9999.0f;
         fImpSndDistLB  = 9999.0f;
+        iImpSndIndexRA = 0;
+        iImpSndIndexLA = 0;
+        iImpSndIndexRB = 0;
         iImpSndIndexLB = 0;
 
         for (iBullet = 0; iBullet < iNumImpacts; iBullet++) {
             CG_MakeBulletHole(
-                tImpacts[iImpSndIndexLB].endpos,
-                tImpacts[iImpSndIndexLB].plane.normal,
-                iLarge,
-                &tImpacts[iImpSndIndexLB],
-                qfalse
+                tImpacts[iBullet].endpos, tImpacts[iBullet].plane.normal, iLarge, &tImpacts[iBullet], qfalse
             );
 
-            VectorSubtract(tImpacts[iImpSndIndexLB].endpos, cg.SoundOrg, vTmp);
+            VectorSubtract(tImpacts[iBullet].endpos, cg.SoundOrg, vTmp);
             iHeadDist = VectorLength(vTmp);
 
             if (DotProduct(vTmp, cg.SoundAxis[1]) <= 0.f) {
-                if (iHeadDist < 9999.0f || iHeadDist < fImpSndDistLB) {
-                    if (iHeadDist < 9999.0f) {
-                        fImpSndDistRA  = iHeadDist;
-                        fImpSndDistLB  = 9999.0;
+                if (iHeadDist < fImpSndDistLA || iHeadDist < fImpSndDistLB) {
+                    if (iHeadDist < fImpSndDistLA) {
+                        iImpSndIndexLB = iImpSndIndexLA;
+                        fImpSndDistLB  = fImpSndDistLA;
                         iImpSndIndexRA = iBullet;
+                        fImpSndDistRA  = iHeadDist;
                     } else if (iHeadDist < fImpSndDistLB) {
-                        fImpSndDistLB = iHeadDist;
+                        iImpSndIndexLB = iBullet;
+                        fImpSndDistLB  = iHeadDist;
                     }
                 }
             } else {
                 if (iHeadDist < fImpSndDistRA || iHeadDist < fImpSndDistRB) {
                     if (iHeadDist < fImpSndDistRA) {
                         iImpSndIndexRB = iImpSndIndexRA;
+                        fImpSndDistRB  = fImpSndDistRA;
                         iImpSndIndexRA = iBullet;
+                        fImpSndDistRA  = iHeadDist;
                     } else if (iHeadDist < fImpSndDistRB) {
-                        fImpSndDistRB  = iHeadDist;
                         iImpSndIndexRB = iBullet;
+                        fImpSndDistRB  = iHeadDist;
                     }
                 }
             }
-
-            iImpSndIndexLB++;
         }
 
         if (fImpSndDistRA < 9999.0f) {
@@ -718,6 +729,24 @@ static void CG_MakeBulletTracerInternal(
                 );
             }
         }
+
+        if (fImpSndDistLA < 9999.0f) {
+            CG_MakeBulletHoleSound(
+                tImpacts[iImpSndIndexLA].endpos,
+                tImpacts[iImpSndIndexLA].plane.normal,
+                iLarge,
+                &tImpacts[iImpSndIndexLA]
+            );
+
+            if (fImpSndDistLB < 9999.0f) {
+                CG_MakeBulletHoleSound(
+                    tImpacts[iImpSndIndexLB].endpos,
+                    tImpacts[iImpSndIndexLB].plane.normal,
+                    iLarge,
+                    &tImpacts[iImpSndIndexLB]
+                );
+            }
+        }
     } else {
         for (iBullet = 0; iBullet < iNumImpacts; iBullet++) {
             CG_MakeBulletHole(

From e66fd2883191ff53084620035315c5cb1aa3468a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:52:58 +0100
Subject: [PATCH 1864/2040] Fix incompatible functions in renderergl2

---
 code/renderergl2/tr_backend.c | 11 +++++++++++
 code/renderergl2/tr_init.c    | 11 ++++++-----
 code/renderergl2/tr_local.h   |  6 ++++--
 code/renderergl2/tr_scene.c   | 21 +++++++++++++++++++++
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index fb951847..e31e0048 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -1878,6 +1878,17 @@ void RB_ExecuteRenderCommands( const void *data ) {
 
 
 
+
+/*
+=============
+RE_StretchRaw2
+
+=============
+*/
+void RE_StretchRaw2 (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
+	RE_StretchRaw(x, y, w, h, cols, rows, data, 0, qtrue);
+}
+
 /*
 ==================
 RB_RenderSpriteSurfList
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 32ba6917..c40b9d93 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -1937,6 +1937,7 @@ RE_GetGraphicsInfo
 const char* RE_GetGraphicsInfo() {
 	// FIXME: unimplemented (GL2)
 	// Looks like it's unused anyway
+	return "";
 }
 
 //=========================
@@ -1986,16 +1987,16 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 	re.ModelBounds = R_ModelBounds;
 
 	re.ClearScene = RE_ClearScene;
-	re.AddRefEntityToScene = RE_AddRefEntityToScene;
-	re.AddPolyToScene = RE_AddPolyToScene;
+	re.AddRefEntityToScene = RE_AddRefEntityToScene2;
+	re.AddPolyToScene = RE_AddPolyToScene2;
 	re.LightForPoint = R_LightForPoint;
-	re.AddLightToScene = RE_AddLightToScene;
+	re.AddLightToScene = RE_AddLightToScene2;
 	re.AddAdditiveLightToScene = RE_AddAdditiveLightToScene;
 	re.RenderScene = RE_RenderScene;
 
 	re.SetColor = RE_SetColor;
 	re.DrawStretchPic = RE_StretchPic;
-	re.DrawStretchRaw = RE_StretchRaw;
+	re.DrawStretchRaw = RE_StretchRaw2;
 	re.UploadCinematic = RE_UploadCinematic;
 
 	re.RegisterFont = RE_RegisterFont;
@@ -2037,7 +2038,7 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 	re.SetColor = Draw_SetColor;
 	re.DrawStretchPic = Draw_StretchPic;
 	re.DrawStretchPic2 = Draw_StretchPic2;
-	re.DrawStretchRaw = RE_StretchRaw;
+	re.DrawStretchRaw = RE_StretchRaw2;
 	re.DebugLine = R_DebugLine;
 	re.DrawTilePic = Draw_TilePic;
 	re.DrawTilePicOffset = Draw_TilePicOffset;
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index 84730a46..9c517dcc 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -2962,7 +2962,8 @@ void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, fl
 void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
 void RE_BeginScene( const refdef_t *fd );
 void RE_RenderScene( const refdef_t *fd );
-void RE_EndScene( void );
+void RE_EndScene(void);
+void RE_AddRefEntityToScene2(const refEntity_t* ent, int parentEntityNumber);
 
 /*
 =============================================================
@@ -3024,6 +3025,7 @@ void AddBox(float x, float y, float w, float h);
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
 void RE_Scissor(int x, int y, int width, int height);
 void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
+void RE_StretchRaw2(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
 
 /*
 =============================================================
@@ -3102,7 +3104,7 @@ void RE_AddRefSpriteToScene(const refEntity_t* ent);
 void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
 refEntity_t* RE_GetRenderEntity(int entityNumber);
 qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-
+void RE_AddLightToScene2(const vec3_t org, float intensity, float r, float g, float b, int type);
 
 /*
 ============================================================
diff --git a/code/renderergl2/tr_scene.c b/code/renderergl2/tr_scene.c
index 43fb46b8..f2663dfd 100644
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
@@ -700,6 +700,27 @@ void RE_RenderScene( const refdef_t *fd ) {
 // OPENMOHAA-specific stuff
 //
 
+/*
+=====================
+RE_AddLightToScene2
+
+=====================
+*/
+void RE_AddLightToScene2(const vec3_t org, float intensity, float r, float g, float b, int type) {
+    RE_AddDynamicLightToScene(org, intensity, r, g, b, qfalse);
+}
+
+
+/*
+=====================
+RE_AddRefEntityToScene2
+
+=====================
+*/
+void RE_AddRefEntityToScene2( const refEntity_t *ent, int parentEntityNumber ) {
+	RE_AddRefEntityToScene(ent);
+}
+
 void RE_AddRefSpriteToScene(const refEntity_t* ent) {
 	refSprite_t* spr;
 	int i;

From 80d1b3b204d82ef90389836299145223ab5dd28d Mon Sep 17 00:00:00 2001
From: Bulldozer <bulldozerecske@gmail.com>
Date: Wed, 29 Jan 2025 10:12:09 +0100
Subject: [PATCH 1865/2040] Create Frequently Asked Questions (FAQ)

This document will be suitable for answering issues that have user-related solutions.
---
 docs/faq.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 docs/faq.md

diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 00000000..0304e505
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,44 @@
+# Frequently Asked Questions
+
+## 1. My OpenMoHAA client has crashed, leaving the desktop brightened up. How can I fix this without restarting the computer?
+
+### 1.1 Lock and Unlock Your Screen (Windows+L)
+Simply pressing **Win+L** to lock your screen and then logging back in can sometimes reset the brightness to its previous state.
+
+### 1.2. Command Line Fix (Windows)
+If you have an **NVIDIA** or **AMD** GPU, you can try these commands:
+
+- **For NVIDIA GPUs:**
+  Open **Command Prompt (cmd.exe)** or **PowerShell** and run:
+  
+  ```powershell
+  nvidia-settings -a "DPY-0/RedBrightness=0.0" -a "DPY-0/GreenBrightness=0.0" -a "DPY-0/BlueBrightness=0.0"
+  ```
+  
+  (If you have multiple displays, `DPY-0` may need to be replaced with the correct display identifier.)
+
+- **For AMD GPUs:**
+  Open the **AMD Radeon Software** and manually adjust brightness or SDR settings to reset them.
+
+### 1.3. Use a Third-Party Tool to Reset Gamma & Brightness
+Programs like **Gamma Panel** or **f.lux** can help restore modified brightness and gamma settings quickly.
+
+### 1.4. Restart the Graphics Driver (Windows)
+Press **Win + Ctrl + Shift + B** to restart the graphics driver without rebooting your PC. Your screen will briefly go black, then reset.
+
+### 1.5. Reset Gamma via Xrandr (Linux, Xorg Users)
+If you’re using Linux with Xorg, try this command to reset gamma settings:
+
+```bash
+xrandr --output eDP-1 --gamma 1:1:1
+```
+
+(Replace `eDP-1` with the correct display name, which you can find by running `xrandr` in the terminal.)
+
+### 1.6. Changing Display Mode in Windows (Alternative)
+If none of the above solutions work, you can manually reset brightness by changing the display mode:
+1. Right-click on your desktop and select **Display settings**.
+2. Scroll down to **Display resolution** and change it to a different setting.
+3. Revert it back to your original resolution.
+
+This forces Windows to refresh display settings, which may restore brightness.

From 3769bd2a683566851951f6edfd0d41c2712ebd35 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:57:01 +0100
Subject: [PATCH 1866/2040] Translate instant messages when printing to console

---
 code/fgame/player.cpp | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index bfee5db9..c377dc65 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10838,12 +10838,16 @@ void Player::EventDMMessage(Event *ev)
     // Print the dm message to console
     sToken = "";
 
-    for (i = 2; i <= ev->NumArgs(); i++) {
-        if (i != 2) {
-            sToken += " ";
-        }
+    if (bInstaMessage) {
+        sToken += pTmpInstantMsg;
+    } else {
+        for (i = 2; i <= ev->NumArgs(); i++) {
+            if (i != 2) {
+                sToken += " ";
+            }
 
-        sToken += ev->GetString(i);
+            sToken += ev->GetString(i);
+        }
     }
     //=============
 
@@ -10853,7 +10857,11 @@ void Player::EventDMMessage(Event *ev)
         //
 
         // Added in OPM
-        gi.Printf("%s (%zu) says to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        if (bInstaMessage) {
+            gi.Printf("%s (%zu) says (voice) to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        } else {
+            gi.Printf("%s (%zu) says (text) to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        }
 
         if (!IsSpectator() || g_spectate_allow_full_chat->integer) {
             for (i = 0; i < game.maxclients; i++) {
@@ -10901,7 +10909,11 @@ void Player::EventDMMessage(Event *ev)
         //
 
         // Added in OPM
-        gi.Printf("%s (%zu) says to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        if (bInstaMessage) {
+            gi.Printf("%s (%zu) says (voice) to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        } else {
+            gi.Printf("%s (%zu) says (text) to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        }
 
         if (IsSpectator()) {
             for (i = 0; i < game.maxclients; i++) {
@@ -10963,7 +10975,11 @@ void Player::EventDMMessage(Event *ev)
         }
 
         // Added in OPM
-        gi.Printf("%s (%zu) says to client #%d: %s\n", client->pers.netname, edict - g_entities, iMode - 1, sToken.c_str());
+        if (bInstaMessage) {
+            gi.Printf("%s (%zu) says (voice) to client #%d: %s\n", client->pers.netname, edict - g_entities, iMode - 1, sToken.c_str());
+        } else {
+            gi.Printf("%s (%zu) says (text) to client #%d: %s\n", client->pers.netname, edict - g_entities, iMode - 1, sToken.c_str());
+        }
 
         gi.SendServerCommand(iMode - 1, "%s", szPrintString);
 

From dfc3fdb88b63d69a98e39971378cb495bd1bf225 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 30 Jan 2025 21:05:02 +0100
Subject: [PATCH 1867/2040] Link to the FAQ

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c25787d0..9b39a56a 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 - [Running OpenMoHAA and using expansion assets](docs/getting_started_running.md)
 - [Dedicated server configuration](docs/configuration/server.md)
 
+If you encounter any issues, please refer to the [FAQ](docs/faq.md) for possible solutions.
+
 ## Current state
 
 ### Single-player

From f10ddcaa17cc659d37d851b4d9623a2dd5c6c0b4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:21:24 +0100
Subject: [PATCH 1868/2040] Update bot documentation

---
 docs/configuration/server.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/configuration/server.md b/docs/configuration/server.md
index 24857510..3e655f21 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration/server.md
@@ -102,7 +102,7 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 
 ### Bots
 
-OpenMoHAA introduced multiplayer bots which can be used for entertainment or for testing purposes.
+OpenMoHAA introduced multiplayer bots which can be used for entertainment or for testing purposes. Bots are players controlled by the computer, they appear in the scoreboard with their ping set to **bot**.
 
 First get the [mp-navigation](https://github.com/openmoh/mp-navigation) pk3, it is needed so bots can navigate through MP maps. Then the following variables are used to configure bots:
 
@@ -122,3 +122,4 @@ set sv_maxbots 16 // Reserve 16 client slots for bots
 set sv_numbots 4 // Spawn 4 bots
 ```
 
+*Note: Bots will have their ping set to **bot** so that all players in-game know they are bots. This prevents any confusion and eliminates any doubt about a hacker being in the game.*

From b1a02389f65708e4490e19dae93e3e20ebf6ac9b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:22:03 +0100
Subject: [PATCH 1869/2040] Define REF_DLL

---
 code/renderergl1/CMakeLists.txt | 1 +
 code/renderergl2/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
index 16e42d9a..bec51e02 100644
--- a/code/renderergl1/CMakeLists.txt
+++ b/code/renderergl1/CMakeLists.txt
@@ -18,6 +18,7 @@ get_target_property(target_type omohrenderergl1 TYPE)
 if (target_type STREQUAL "SHARED_LIBRARY")
 	target_sources(omohrenderergl1 PRIVATE "./tr_subs.c")
 	target_compile_definitions(omohrenderergl1 PUBLIC USE_RENDERER_DLOPEN=1)
+	target_compile_definitions(omohrenderergl1 PRIVATE REF_DLL=1)
 endif ()
 
 set_target_properties(omohrenderergl1 PROPERTIES PREFIX "")
diff --git a/code/renderergl2/CMakeLists.txt b/code/renderergl2/CMakeLists.txt
index f49c3e33..90682de3 100644
--- a/code/renderergl2/CMakeLists.txt
+++ b/code/renderergl2/CMakeLists.txt
@@ -22,6 +22,7 @@ get_target_property(target_type omohrenderergl2 TYPE)
 if (target_type STREQUAL "SHARED_LIBRARY")
 	target_sources(omohrenderergl2 PRIVATE "./tr_subs.c")
 	target_compile_definitions(omohrenderergl2 PUBLIC USE_RENDERER_DLOPEN=1)
+	target_compile_definitions(omohrenderergl2 PRIVATE REF_DLL=1)
 endif ()
 
 set_target_properties(omohrenderergl2 PROPERTIES PREFIX "")

From bb23fe159fac1dd111750606ba9ae527378e388c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:27:37 +0100
Subject: [PATCH 1870/2040] Fix copy constructor not using a const object

---
 code/fgame/characterstate.cpp | 2 +-
 code/fgame/characterstate.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/characterstate.cpp b/code/fgame/characterstate.cpp
index c280ad93..e0c672ff 100644
--- a/code/fgame/characterstate.cpp
+++ b/code/fgame/characterstate.cpp
@@ -77,7 +77,7 @@ Conditional::Conditional()
 
 Expression::Expression() {}
 
-Expression::Expression(Expression& exp)
+Expression::Expression(const Expression& exp)
 
 {
     int i;
diff --git a/code/fgame/characterstate.h b/code/fgame/characterstate.h
index 83d43b16..afc4d604 100644
--- a/code/fgame/characterstate.h
+++ b/code/fgame/characterstate.h
@@ -184,7 +184,7 @@ private:
 
 public:
     Expression();
-    Expression(Expression& exp);
+    Expression(const Expression& exp);
     Expression(Script& script, State& state);
 
     void operator=(const Expression& exp);

From d4bbaa41c34a62904c5424ab9745e791e480de9a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:31:16 +0100
Subject: [PATCH 1871/2040] Format safeptr source file

---
 code/qcommon/safeptr.h | 223 ++++++++++++++++++++---------------------
 1 file changed, 108 insertions(+), 115 deletions(-)

diff --git a/code/qcommon/safeptr.h b/code/qcommon/safeptr.h
index 7da6d692..00f5c042 100644
--- a/code/qcommon/safeptr.h
+++ b/code/qcommon/safeptr.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -30,217 +30,210 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 class SafePtrBase
 {
 private:
-	void	AddReference( Class *ptr );
-	void	RemoveReference( Class *ptr );
+    void AddReference(Class *ptr);
+    void RemoveReference(Class *ptr);
 
 protected:
-	SafePtrBase	*prev;
-	SafePtrBase	*next;
-	Class		*ptr;
+    SafePtrBase *prev;
+    SafePtrBase *next;
+    Class       *ptr;
 
 public:
-	SafePtrBase();
-	virtual		~SafePtrBase();
-	void		InitSafePtr( Class *newptr );
-	Class		*Pointer( void );
-	void		Clear( void );
+    SafePtrBase();
+    virtual ~SafePtrBase();
+    void   InitSafePtr(Class *newptr);
+    Class *Pointer(void);
+    void   Clear(void);
 };
 
-inline void SafePtrBase::AddReference( Class *ptr )
+inline void SafePtrBase::AddReference(Class *ptr)
 {
-	if( !ptr->SafePtrList )
-	{
-		ptr->SafePtrList = this;
-		LL_Reset( this, next, prev );
-	}
-	else
-	{
-		LL_Add( ptr->SafePtrList, this, next, prev );
-	}
+    if (!ptr->SafePtrList) {
+        ptr->SafePtrList = this;
+        LL_Reset(this, next, prev);
+    } else {
+        LL_Add(ptr->SafePtrList, this, next, prev);
+    }
 }
 
-inline void SafePtrBase::RemoveReference( Class *ptr )
+inline void SafePtrBase::RemoveReference(Class *ptr)
 {
-	if( ptr->SafePtrList == this )
-	{
-		if( ptr->SafePtrList->next == this )
-		{
-			ptr->SafePtrList = nullptr;
-		}
-		else
-		{
-			ptr->SafePtrList = next;
-			LL_Remove( this, next, prev );
-		}
-	}
-	else
-	{
-		LL_Remove( this, next, prev );
-	}
+    if (ptr->SafePtrList == this) {
+        if (ptr->SafePtrList->next == this) {
+            ptr->SafePtrList = nullptr;
+        } else {
+            ptr->SafePtrList = next;
+            LL_Remove(this, next, prev);
+        }
+    } else {
+        LL_Remove(this, next, prev);
+    }
 }
 
-inline void SafePtrBase::Clear( void )
+inline void SafePtrBase::Clear(void)
 {
-	if( ptr )
-	{
-		RemoveReference( ptr );
-		ptr = nullptr;
-	}
+    if (ptr) {
+        RemoveReference(ptr);
+        ptr = nullptr;
+    }
 }
 
 inline SafePtrBase::SafePtrBase()
 {
-	prev = nullptr;
-	next = nullptr;
-	ptr = nullptr;
+    prev = nullptr;
+    next = nullptr;
+    ptr  = nullptr;
 }
 
 inline SafePtrBase::~SafePtrBase()
 {
-	Clear();
+    Clear();
 }
 
-inline Class * SafePtrBase::Pointer( void )
+inline Class *SafePtrBase::Pointer(void)
 {
-	return ptr;
+    return ptr;
 }
 
-inline void SafePtrBase::InitSafePtr( Class *newptr )
+inline void SafePtrBase::InitSafePtr(Class *newptr)
 {
-	if( ptr != newptr )
-	{
-		if( ptr )
-		{
-			RemoveReference( ptr );
-		}
+    if (ptr != newptr) {
+        if (ptr) {
+            RemoveReference(ptr);
+        }
 
-		ptr = newptr;
-		if( ptr == nullptr )
-		{
-			return;
-		}
+        ptr = newptr;
+        if (ptr == nullptr) {
+            return;
+        }
 
-		AddReference( ptr );
-	}
+        AddReference(ptr);
+    }
 }
 
 template<class T>
 class SafePtr : public SafePtrBase
 {
 public:
-	SafePtr( T* objptr = 0 );
-	SafePtr( const SafePtr& obj );
+    SafePtr(T *objptr = 0);
+    SafePtr(const SafePtr& obj);
 
-	SafePtr& operator=( const SafePtr& obj );
-	SafePtr& operator=( T * const obj );
+    SafePtr& operator=(const SafePtr& obj);
+    SafePtr& operator=(T *const obj);
 
 #ifdef LINUX
-	friend bool operator==<>( SafePtr<T> a, T *b );
-	friend bool operator!=<>( SafePtr<T> a, T *b );
-	friend bool operator==<>( T *a, SafePtr<T> b );
-	friend bool operator!=<>( T *a, SafePtr<T> b );
-	friend bool operator==<>( SafePtr<T> a, SafePtr<T> b );
-	friend bool operator!=<>( SafePtr<T> a, SafePtr<T> b );
+    friend bool operator== <>(SafePtr<T> a, T *b);
+    friend bool operator!= <>(SafePtr<T> a, T *b);
+    friend bool operator== <>(T *a, SafePtr<T> b);
+    friend bool operator!= <>(T *a, SafePtr<T> b);
+    friend bool operator== <>(SafePtr<T> a, SafePtr<T> b);
+    friend bool operator!= <>(SafePtr<T> a, SafePtr<T> b);
 #else
-	// The compiler/linker gets confused when the friend functions definition are not templated
-	template< class U > friend bool operator==( SafePtr<U> a, U *b );
-	template< class U > friend bool operator!=( SafePtr<U> a, U *b );
-	template< class U > friend bool operator==( U *a, SafePtr<U> b );
-	template< class U > friend bool operator!=( U *a, SafePtr<U> b );
-	template< class U > friend bool operator==( SafePtr<U> a, SafePtr<U> b );
-	template< class U > friend bool operator!=( SafePtr<U> a, SafePtr<U> b );
+    // The compiler/linker gets confused when the friend functions definition are not templated
+    template<class U>
+    friend bool operator==(SafePtr<U> a, U *b);
+    template<class U>
+    friend bool operator!=(SafePtr<U> a, U *b);
+    template<class U>
+    friend bool operator==(U *a, SafePtr<U> b);
+    template<class U>
+    friend bool operator!=(U *a, SafePtr<U> b);
+    template<class U>
+    friend bool operator==(SafePtr<U> a, SafePtr<U> b);
+    template<class U>
+    friend bool operator!=(SafePtr<U> a, SafePtr<U> b);
 #endif
 
-	bool operator !( ) const;
-	operator T*( ) const;
-	T* operator->( ) const;
-	T& operator*( ) const;
+    bool operator!() const;
+    operator T *() const;
+    T *operator->() const;
+    T& operator*() const;
 };
 
 template<class T>
-inline SafePtr<T>::SafePtr( T* objptr )
+inline SafePtr<T>::SafePtr(T *objptr)
 {
-	InitSafePtr( ( Class * )objptr );
+    InitSafePtr((Class *)objptr);
 }
 
 template<class T>
-inline SafePtr<T>::SafePtr( const SafePtr& obj )
+inline SafePtr<T>::SafePtr(const SafePtr& obj)
 {
-	InitSafePtr( obj.ptr );
+    InitSafePtr(obj.ptr);
 }
 
 template<class T>
-inline SafePtr<T>& SafePtr<T>::operator=( const SafePtr& obj )
+inline SafePtr<T>& SafePtr<T>::operator=(const SafePtr& obj)
 {
-	InitSafePtr( obj.ptr );
-	return *this;
+    InitSafePtr(obj.ptr);
+    return *this;
 }
 
 template<class T>
-inline SafePtr<T>& SafePtr<T>::operator=( T * const obj )
+inline SafePtr<T>& SafePtr<T>::operator=(T *const obj)
 {
-	InitSafePtr( obj );
-	return *this;
+    InitSafePtr(obj);
+    return *this;
 }
 
 template<class T>
-inline bool operator==( SafePtr<T> a, T *b )
+inline bool operator==(SafePtr<T> a, T *b)
 {
-	return a.ptr == b;
+    return a.ptr == b;
 }
 
 template<class T>
-inline bool operator!=( SafePtr<T> a, T* b )
+inline bool operator!=(SafePtr<T> a, T *b)
 {
-	return a.ptr != b;
+    return a.ptr != b;
 }
 
 template<class T>
-inline bool operator==( T* a, SafePtr<T> b )
+inline bool operator==(T *a, SafePtr<T> b)
 {
-	return a == b.ptr;
+    return a == b.ptr;
 }
 
 template<class T>
-inline bool operator!=( T* a, SafePtr<T> b )
+inline bool operator!=(T *a, SafePtr<T> b)
 {
-	return a != b.ptr;
+    return a != b.ptr;
 }
 
 template<class T>
-inline bool operator==( SafePtr<T> a, SafePtr<T> b )
+inline bool operator==(SafePtr<T> a, SafePtr<T> b)
 {
-	return a.ptr == b.ptr;
+    return a.ptr == b.ptr;
 }
 
 template<class T>
-inline bool operator!=( SafePtr<T> a, SafePtr<T> b )
+inline bool operator!=(SafePtr<T> a, SafePtr<T> b)
 {
-	return a.ptr != b.ptr;
+    return a.ptr != b.ptr;
 }
 
 template<class T>
-inline bool SafePtr<T>::operator !( ) const
+inline bool SafePtr<T>::operator!() const
 {
-	return ptr == nullptr;
+    return ptr == nullptr;
 }
 
 template<class T>
-inline SafePtr<T>::operator T*( ) const
+inline SafePtr<T>::operator T *() const
 {
-	return ( T * )ptr;
+    return (T *)ptr;
 }
 
 template<class T>
-inline T* SafePtr<T>::operator->( ) const
+inline T *SafePtr<T>::operator->() const
 {
-	return ( T * )ptr;
+    return (T *)ptr;
 }
 
 template<class T>
-inline T& SafePtr<T>::operator*( ) const
+inline T& SafePtr<T>::operator*() const
 {
-	return *( T * )ptr;
+    return *(T *)ptr;
 }
 
 #endif

From 7a8aa4eb840df9aa3f574c4da3e393196fd5c7dc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:45:18 +0100
Subject: [PATCH 1872/2040] Add placement new/delete for LightClass

---
 code/qcommon/lightclass.cpp | 9 +++++++++
 code/qcommon/lightclass.h   | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/code/qcommon/lightclass.cpp b/code/qcommon/lightclass.cpp
index c8bd448f..8ced7e43 100644
--- a/code/qcommon/lightclass.cpp
+++ b/code/qcommon/lightclass.cpp
@@ -99,3 +99,12 @@ void LightClass::operator delete(void *ptr)
 #    endif
 }
 #endif
+
+void* LightClass::operator new(size_t size, void* placement)
+{
+    return placement;
+}
+
+void LightClass::operator delete(void* ptr, void* placement)
+{
+}
diff --git a/code/qcommon/lightclass.h b/code/qcommon/lightclass.h
index bf4bdc62..4d6a0b2c 100644
--- a/code/qcommon/lightclass.h
+++ b/code/qcommon/lightclass.h
@@ -31,6 +31,9 @@ public:
 #ifndef _DEBUG_MEM
     void* operator new(size_t);
     void operator delete(void*);
+
+    void* operator new(size_t size, void* placement);
+    void operator delete(void* ptr, void* placement);
 #endif
 };
 

From fbee409f473c52d6c75920c0bc7367a661408ea1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:49:44 +0100
Subject: [PATCH 1873/2040] Swap code with event pointer

---
 code/fgame/gamescript.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 8251e379..0d55ca1d 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -910,11 +910,6 @@ void ScriptThreadLabel::Execute(Listener *listener)
 }
 
 void ScriptThreadLabel::Execute(Listener *listener, Event& ev)
-{
-    Execute(listener, &ev);
-}
-
-void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
 {
     if (!m_Script) {
         return;
@@ -927,6 +922,11 @@ void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
     }
 }
 
+void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
+{
+    Execute(listener, *ev);
+}
+
 void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
 {
     if (!m_Script) {

From 3fa489c0f9c56cdbe6de232b7b9c4aa3994dadd1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 21:09:12 +0100
Subject: [PATCH 1874/2040] Add move constructor for SafePtr

---
 code/qcommon/safeptr.h | 67 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/safeptr.h b/code/qcommon/safeptr.h
index 00f5c042..58b4436e 100644
--- a/code/qcommon/safeptr.h
+++ b/code/qcommon/safeptr.h
@@ -22,11 +22,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // safeptr.h: Safe Pointers
 
-#ifndef __SAFEPTR_H__
-#define __SAFEPTR_H__
+#pragma once
 
 #include "Linklist.h"
 
+#include <utility>
+
 class SafePtrBase
 {
 private:
@@ -44,6 +45,9 @@ public:
     void   InitSafePtr(Class *newptr);
     Class *Pointer(void);
     void   Clear(void);
+
+protected:
+    void Move(SafePtrBase&& other);
 };
 
 inline void SafePtrBase::AddReference(Class *ptr)
@@ -111,15 +115,57 @@ inline void SafePtrBase::InitSafePtr(Class *newptr)
     }
 }
 
+inline void SafePtrBase::Move(SafePtrBase&& other)
+{
+    prev = other.prev;
+    next = other.next;
+    ptr  = other.ptr;
+
+    if (ptr && ptr->SafePtrList) {
+        if (ptr->SafePtrList == &other) {
+            ptr->SafePtrList = this;
+        } else {
+            if (ptr->SafePtrList->prev == &other) {
+                ptr->SafePtrList->prev = this;
+            }
+            if (ptr->SafePtrList->next == &other) {
+                ptr->SafePtrList->next = this;
+            }
+        }
+    }
+
+    if (prev) {
+        if (prev == &other) {
+            prev = this;
+        } else {
+            assert(prev->next == &other || prev->next == this);
+            prev->next = this;
+        }
+    }
+    if (next) {
+        if (next == &other) {
+            next = this;
+        } else {
+            assert(next->prev == &other || next->prev == this);
+            next->prev = this;
+        }
+    }
+
+    other.next = other.prev = NULL;
+    other.ptr               = NULL;
+}
+
 template<class T>
 class SafePtr : public SafePtrBase
 {
 public:
     SafePtr(T *objptr = 0);
     SafePtr(const SafePtr& obj);
+    SafePtr(SafePtr&& obj);
 
     SafePtr& operator=(const SafePtr& obj);
     SafePtr& operator=(T *const obj);
+    SafePtr& operator=(SafePtr&& obj);
 
 #ifdef LINUX
     friend bool operator== <>(SafePtr<T> a, T *b);
@@ -162,6 +208,12 @@ inline SafePtr<T>::SafePtr(const SafePtr& obj)
     InitSafePtr(obj.ptr);
 }
 
+template<class T>
+inline SafePtr<T>::SafePtr(SafePtr&& obj)
+{
+    Move(std::move(obj));
+}
+
 template<class T>
 inline SafePtr<T>& SafePtr<T>::operator=(const SafePtr& obj)
 {
@@ -169,6 +221,15 @@ inline SafePtr<T>& SafePtr<T>::operator=(const SafePtr& obj)
     return *this;
 }
 
+template<class T>
+inline SafePtr<T>& SafePtr<T>::operator=(SafePtr&& obj)
+{
+    Clear();
+    Move(std::move(obj));
+
+    return *this;
+}
+
 template<class T>
 inline SafePtr<T>& SafePtr<T>::operator=(T *const obj)
 {
@@ -235,5 +296,3 @@ inline T& SafePtr<T>::operator*() const
 {
     return *(T *)ptr;
 }
-
-#endif

From aa0085b57d44c084b7624e268c2df56f49448b82 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:26:36 +0100
Subject: [PATCH 1875/2040] Improve the Container class by using move
 constructor on reallocation when possible

This greatly optimize memory and speed by moving objects instead of copying objects
---
 code/qcommon/container.h | 217 +++++++++++++++++++++++----------------
 1 file changed, 128 insertions(+), 89 deletions(-)

diff --git a/code/qcommon/container.h b/code/qcommon/container.h
index 750ca6a4..e0e6cb0e 100644
--- a/code/qcommon/container.h
+++ b/code/qcommon/container.h
@@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    define CONTAINER_Error          gi.Error
 #    define CONTAINER_DPrintf        gi.DPrintf
 #    define CONTAINER_WDPrintf(text) gi.DPrintf(text)
+#    define CONTAINER_Alloc          gi.Malloc
+#    define CONTAINER_Free           gi.Free
 
 #elif defined(CGAME_DLL)
 //
@@ -43,8 +45,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    define CONTAINER_Error          cgi.Error
 #    define CONTAINER_DPrintf        cgi.DPrintf
 #    define CONTAINER_WDPrintf(text) cgi.DPrintf(text)
+#    define CONTAINER_Alloc          cgi.Malloc
+#    define CONTAINER_Free           cgi.Free
 
-#else
+#elif defined(REF_DLL)
+
+#    include "../renderercommon/tr_common.h"
 
 //
 // client specific defines
@@ -52,8 +58,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    define CONTAINER_Error          Com_Error
 #    define CONTAINER_DPrintf        Com_DPrintf
 #    define CONTAINER_WDPrintf(text) Com_DPrintf(text)
+#    define CONTAINER_Alloc          ri.Malloc
+#    define CONTAINER_Free           ri.Free
+
+#else
+
+#    include "qcommon.h"
+
+//
+// client specific defines
+//
+#    define CONTAINER_Error          Com_Error
+#    define CONTAINER_DPrintf        Com_DPrintf
+#    define CONTAINER_WDPrintf(text) Com_DPrintf(text)
+#    define CONTAINER_Alloc          Z_Malloc
+#    define CONTAINER_Free           Z_Free
 #endif
 
+#include <utility>
+#include <new>
+
 class Archiver;
 
 template<class Type>
@@ -69,34 +93,37 @@ private:
 
 public:
     Container();
+
     Container(const Container<Type>& container);
+    Container<Type>& operator=(const Container<Type>& container);
+
+    Container(Container<Type>&& container);
+    Container<Type>& operator=(Container<Type>&& container);
+
     ~Container();
 
     void Archive(Archiver& arc);
     void Archive(Archiver& arc, void (*ArchiveFunc)(Archiver& arc, Type *obj));
 
-    int   AddObject(const Type  &obj);
-    int   AddUniqueObject(const Type  &obj);
-    void  AddObjectAt(int index, const Type &obj);
+    int   AddObject(const Type& obj);
+    int   AddUniqueObject(const Type& obj);
+    void  AddObjectAt(int index, const Type& obj);
     Type *AddressOfObjectAt(int index);
-    //	void				Archive( Archiver &arc );
-    void             ClearObjectList(void);
-    void             Fix(void);
-    void             FreeObjectList(void);
-    int              IndexOfObject(const Type             &obj);
-    void             InsertObjectAt(int index, const Type            &obj);
-    int              MaxObjects(void) const;
-    int              NumObjects(void) const;
-    Type           & ObjectAt(const size_t index) const;
-    bool             ObjectInList(const Type            &obj);
-    void             RemoveObjectAt(int index);
-    void             RemoveObject(const Type            &obj);
-    void             Reset(void);
-    void             Resize(int maxelements);
-    void             SetObjectAt(int index, const Type            &obj);
-    void             Sort(int (*compare)(const void *elem1, const void *elem2));
-    Type           & operator[](const int index) const;
-    Container<Type>& operator=(const Container<Type>& container);
+    void  ClearObjectList(void);
+    void  FreeObjectList(void);
+    int   IndexOfObject(const Type& obj);
+    void  InsertObjectAt(int index, const Type& obj);
+    int   MaxObjects(void) const;
+    int   NumObjects(void) const;
+    Type& ObjectAt(const size_t index) const;
+    bool  ObjectInList(const Type& obj);
+    void  RemoveObjectAt(int index);
+    void  RemoveObject(const Type& obj);
+    void  Reset(void);
+    void  Resize(int maxelements);
+    void  SetObjectAt(int index, const Type& obj);
+    void  Sort(int (*compare)(const void *elem1, const void *elem2));
+    Type& operator[](const uintptr_t index) const;
 };
 
 template<class Type>
@@ -115,6 +142,38 @@ Container<Type>::Container(const Container<Type>& container)
     Copy(container);
 }
 
+template<class Type>
+Container<Type>& Container<Type>::operator=(const Container<Type>& container)
+{
+    Copy(container);
+
+    return *this;
+}
+
+template<class Type>
+Container<Type>::Container(Container<Type>&& container)
+{
+    objlist              = container.objlist;
+    numobjects           = container.numobjects;
+    maxobjects           = container.maxobjects;
+    container.objlist    = NULL;
+    container.numobjects = 0;
+    container.maxobjects = 0;
+}
+
+template<class Type>
+Container<Type>& Container<Type>::operator=(Container<Type>&& container)
+{
+    objlist              = container.objlist;
+    numobjects           = container.numobjects;
+    maxobjects           = container.maxobjects;
+    container.objlist    = NULL;
+    container.numobjects = 0;
+    container.maxobjects = 0;
+
+    return *this;
+}
+
 template<class Type>
 Container<Type>::~Container()
 {
@@ -132,7 +191,7 @@ int Container<Type>::AddObject(const Type& obj)
         Resize(numobjects * 2);
     }
 
-    objlist[numobjects] = obj;
+    new (objlist + numobjects) Type(obj);
     numobjects++;
 
     return numobjects;
@@ -183,53 +242,29 @@ Type *Container<Type>::AddressOfObjectAt(int index)
 template<class Type>
 void Container<Type>::ClearObjectList(void)
 {
+    size_t i;
+
     if (objlist && numobjects) {
-        delete[] objlist;
-
-        if (maxobjects == 0) {
-            objlist = NULL;
-            return;
+        for (i = 0; i < numobjects; ++i) {
+            objlist[i].~Type();
         }
 
-        objlist    = new Type[maxobjects];
+        // don't free the object list, it can be reused later
         numobjects = 0;
     }
 }
 
-template<class Type>
-void Container<Type>::Fix(void)
-{
-    if (!objlist || !numobjects) {
-        return;
-    }
-
-    Type *newlist = new Type[numobjects];
-    int   j       = 0;
-
-    for (int i = 0; i < numobjects; i++) {
-        if (objlist[i] == NULL) {
-            continue;
-        }
-
-        newlist[j] = objlist[i];
-        j++;
-    }
-
-    numobjects = j;
-
-    delete[] objlist;
-    objlist = newlist;
-
-    if (!numobjects) {
-        ClearObjectList();
-    }
-}
-
 template<class Type>
 void Container<Type>::FreeObjectList(void)
 {
+    size_t i;
+
     if (objlist) {
-        delete[] objlist;
+        for (i = 0; i < numobjects; ++i) {
+            objlist[i].~Type();
+        }
+
+        CONTAINER_Free(objlist);
     }
 
     objlist    = NULL;
@@ -258,43 +293,48 @@ int Container<Type>::IndexOfObject(const Type& obj)
 template<class Type>
 void Container<Type>::InsertObjectAt(int index, const Type& obj)
 {
+    size_t i;
+
     if ((index <= 0) || (index > numobjects + 1)) {
         CONTAINER_Error(ERR_DROP, "Container::InsertObjectAt : index out of range");
         return;
     }
 
     numobjects++;
-    int arrayIndex = index - 1;
+    intptr_t arrayIndex = index - 1;
 
     if (numobjects > maxobjects) {
         maxobjects = numobjects;
         if (!objlist) {
-            objlist             = new Type[maxobjects];
-            objlist[arrayIndex] = obj;
-            return;
+            objlist = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
+
+            for (i = 0; i < arrayIndex; ++i) {
+                new (objlist + i) Type();
+            }
+
+            new (objlist + arrayIndex) Type(obj);
         } else {
             Type *temp = objlist;
             if (maxobjects < numobjects) {
                 maxobjects = numobjects;
             }
 
-            objlist = new Type[maxobjects];
+            objlist = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
 
-            int i;
-            for (i = arrayIndex - 1; i >= 0; i--) {
-                objlist[i] = temp[i];
+            for (i = 0; i < arrayIndex; ++i) {
+                new (objlist + i) Type(std::move(temp[i]));
             }
 
-            objlist[arrayIndex] = obj;
-            for (i = numobjects - 1; i > arrayIndex; i--) {
-                objlist[i] = temp[i - 1];
+            new (objlist + arrayIndex) Type(obj);
+            for (i = arrayIndex + 1; i < numobjects; ++i) {
+                new (objlist + i) Type(std::move(temp[i]));
             }
 
-            delete[] temp;
+            CONTAINER_Free(temp);
         }
     } else {
-        for (int i = numobjects - 1; i > arrayIndex; i--) {
-            objlist[i] = objlist[i - 1];
+        for (i = numobjects - 1; i > arrayIndex; i--) {
+            objlist[i] = std::move(objlist[i - 1]);
         }
         objlist[arrayIndex] = obj;
     }
@@ -349,8 +389,11 @@ void Container<Type>::RemoveObjectAt(int index)
     numobjects--;
 
     for (i = index - 1; i < numobjects; i++) {
-        objlist[i] = objlist[i + 1];
+        objlist[i] = std::move(objlist[i + 1]);
     }
+
+    // Destroy the last object as it's now useless
+    objlist[numobjects].~Type();
 }
 
 template<class Type>
@@ -380,8 +423,8 @@ void Container<Type>::Reset()
 template<class Type>
 void Container<Type>::Resize(int maxelements)
 {
-    Type *temp;
-    int   i;
+    Type  *temp;
+    size_t i;
 
     if (maxelements <= 0) {
         FreeObjectList();
@@ -390,7 +433,7 @@ void Container<Type>::Resize(int maxelements)
 
     if (!objlist) {
         maxobjects = maxelements;
-        objlist    = new Type[maxobjects];
+        objlist    = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
     } else {
         temp = objlist;
 
@@ -400,13 +443,17 @@ void Container<Type>::Resize(int maxelements)
             maxobjects = numobjects;
         }
 
-        objlist = new Type[maxobjects];
+        objlist = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
 
         for (i = 0; i < numobjects; i++) {
-            objlist[i] = temp[i];
+            // move the older type
+            new (objlist + i) Type(std::move(temp[i]));
+
+            // destruct the older type
+            temp[i].~Type();
         }
 
-        delete[] temp;
+        CONTAINER_Free(temp);
     }
 }
 
@@ -435,7 +482,7 @@ void Container<Type>::Sort(int (*compare)(const void *elem1, const void *elem2))
 }
 
 template<class Type>
-Type& Container<Type>::operator[](const int index) const
+Type& Container<Type>::operator[](const uintptr_t index) const
 {
     return ObjectAt(index + 1);
 }
@@ -471,11 +518,3 @@ void Container<Type>::Copy(const Container<Type>& container)
 
     return;
 }
-
-template<class Type>
-Container<Type>& Container<Type>::operator=(const Container<Type>& container)
-{
-    Copy(container);
-
-    return *this;
-}

From fdea2a2e92a17cda1adaf5b7400485d87d9a4f76 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:46:35 +0100
Subject: [PATCH 1876/2040] Free the object list when moving the container

---
 code/qcommon/container.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/qcommon/container.h b/code/qcommon/container.h
index e0e6cb0e..c045f20f 100644
--- a/code/qcommon/container.h
+++ b/code/qcommon/container.h
@@ -164,6 +164,8 @@ Container<Type>::Container(Container<Type>&& container)
 template<class Type>
 Container<Type>& Container<Type>::operator=(Container<Type>&& container)
 {
+    FreeObjectList();
+
     objlist              = container.objlist;
     numobjects           = container.numobjects;
     maxobjects           = container.maxobjects;

From 7b97ad6e2f65106d4c42fdbca75645d29d7417bc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:53:31 +0100
Subject: [PATCH 1877/2040] Add move constructor for ContainerClass and
 refactor it

---
 code/qcommon/containerclass.h | 195 ++++++++++++++++++++++++++++++----
 1 file changed, 172 insertions(+), 23 deletions(-)

diff --git a/code/qcommon/containerclass.h b/code/qcommon/containerclass.h
index e935648b..c8f74ec8 100644
--- a/code/qcommon/containerclass.h
+++ b/code/qcommon/containerclass.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -33,27 +33,176 @@ class ContainerClass : public Class
     Container<Type> value;
 
 public:
-    virtual ~ContainerClass() { value.FreeObjectList(); }
-    virtual void Archive(Archiver& arc);
+    ContainerClass();
+    ContainerClass(const Container<Type>& container);
+    ContainerClass<Type>& operator=(const Container<Type>& container);
+    ContainerClass(Container<Type>&& container);
+    ContainerClass<Type>& operator=(Container<Type>&& container);
 
-    int AddObject(const Type& obj) { return value.AddObject(obj); }
-    int AddUniqueObject(const Type& obj) { return value.AddUniqueObject(obj); }
-    void AddObjectAt(int index, const Type& obj) { return value.AddObjectAt(index, obj); }
-    Type *AddressOfObjectAt(int index) { return value.AddressOfObjectAt(index); }
-    void ClearObjectList(void) { return value.ClearObjectList(); }
-    void Fix(void) { return value.Fix(); }
-    void FreeObjectList(void) { return value.FreeObjectList(); }
-    int IndexOfObject(const Type& obj) { return value.IndexOfObject(obj); }
-    void InsertObjectAt(int index, const Type& obj) { return value.InsertObjectAt(index, obj); }
-    int NumObjects(void) const { return value.NumObjects(); }
-    Type& ObjectAt(const size_t index) const { return value.ObjectAt(index); }
-    bool ObjectInList(const Type& obj) { return value.ObjectInList(obj); }
-    void RemoveObjectAt(int index) { return value.RemoveObjectAt(index); }
-    void RemoveObject(const Type& obj) { return value.RemoveObject(obj); }
-    void Reset(void) { return value.Reset(); }
-    void Resize(int maxelements) { return value.Resize(maxelements); }
-    void SetObjectAt(int index, const Type& obj) { return value.SetObjectAt(index, obj); }
-    void Sort(int (*compare)(const void *elem1, const void *elem2)) { return value.Sort(compare); }
-    Type& operator[](const int index) const { return value[index]; }
-    Container<Type>& operator=(const Container<Type>& container) { return value = container; }
+    ~ContainerClass() override;
+
+    void Archive(Archiver& arc) override;
+
+    int   AddObject(const Type& obj);
+    int   AddUniqueObject(const Type& obj);
+    void  AddObjectAt(int index, const Type& obj);
+    Type *AddressOfObjectAt(int index);
+    void  ClearObjectList(void);
+    void  FreeObjectList(void);
+    int   IndexOfObject(const Type& obj);
+    void  InsertObjectAt(int index, const Type& obj);
+    int   NumObjects(void) const;
+    Type& ObjectAt(const size_t index) const;
+    bool  ObjectInList(const Type& obj);
+    void  RemoveObjectAt(int index);
+    void  RemoveObject(const Type& obj);
+    void  Reset(void);
+    void  Resize(int maxelements);
+    void  SetObjectAt(int index, const Type& obj);
+    void  Sort(int (*compare)(const void *elem1, const void *elem2));
+    Type& operator[](const int index) const;
 };
+
+template<typename Type>
+ContainerClass<Type>::ContainerClass()
+{}
+
+template<typename Type>
+ContainerClass<Type>::ContainerClass(const Container<Type>& container)
+    : value(container)
+{}
+
+template<typename Type>
+ContainerClass<Type>& ContainerClass<Type>::operator=(const Container<Type>& container)
+{
+    value = container;
+
+    return *this;
+}
+
+template<typename Type>
+ContainerClass<Type>::ContainerClass(Container<Type>&& container)
+    : value(std::move(container))
+{}
+
+template<typename Type>
+ContainerClass<Type>& ContainerClass<Type>::operator=(Container<Type>&& container)
+{
+    value = std::move(container);
+
+    return *this;
+}
+
+template<typename Type>
+ContainerClass<Type>::~ContainerClass()
+{
+    value.FreeObjectList();
+}
+
+template<typename Type>
+int ContainerClass<Type>::AddObject(const Type& obj)
+{
+    return value.AddObject(obj);
+}
+
+template<typename Type>
+int ContainerClass<Type>::AddUniqueObject(const Type& obj)
+{
+    return value.AddUniqueObject(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::AddObjectAt(int index, const Type& obj)
+{
+    return value.AddObjectAt(index, obj);
+}
+
+template<typename Type>
+Type *ContainerClass<Type>::AddressOfObjectAt(int index)
+{
+    return value.AddressOfObjectAt(index);
+}
+
+template<typename Type>
+void ContainerClass<Type>::ClearObjectList(void)
+{
+    return value.ClearObjectList();
+}
+
+template<typename Type>
+void ContainerClass<Type>::FreeObjectList(void)
+{
+    return value.FreeObjectList();
+}
+
+template<typename Type>
+int ContainerClass<Type>::IndexOfObject(const Type& obj)
+{
+    return value.IndexOfObject(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::InsertObjectAt(int index, const Type& obj)
+{
+    return value.InsertObjectAt(index, obj);
+}
+
+template<typename Type>
+int ContainerClass<Type>::NumObjects(void) const
+{
+    return value.NumObjects();
+}
+
+template<typename Type>
+Type& ContainerClass<Type>::ObjectAt(const size_t index) const
+{
+    return value.ObjectAt(index);
+}
+
+template<typename Type>
+bool ContainerClass<Type>::ObjectInList(const Type& obj)
+{
+    return value.ObjectInList(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::RemoveObjectAt(int index)
+{
+    return value.RemoveObjectAt(index);
+}
+
+template<typename Type>
+void ContainerClass<Type>::RemoveObject(const Type& obj)
+{
+    return value.RemoveObject(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::Reset(void)
+{
+    return value.Reset();
+}
+
+template<typename Type>
+void ContainerClass<Type>::Resize(int maxelements)
+{
+    return value.Resize(maxelements);
+}
+
+template<typename Type>
+void ContainerClass<Type>::SetObjectAt(int index, const Type& obj)
+{
+    return value.SetObjectAt(index, obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::Sort(int (*compare)(const void *elem1, const void *elem2))
+{
+    return value.Sort(compare);
+}
+
+template<typename Type>
+Type& ContainerClass<Type>::operator[](const int index) const
+{
+    return value[index];
+}

From 9c811c23189f0cdaa790930dae05754af6f03318 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:46:08 +0100
Subject: [PATCH 1878/2040] Mark getter methods as const for ScriptThreadLabel

---
 code/fgame/gamescript.cpp | 16 ++++++++--------
 code/fgame/gamescript.h   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 0d55ca1d..831f1830 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -866,7 +866,7 @@ ScriptThreadLabel::ScriptThreadLabel()
     m_Label  = STRING_EMPTY;
 }
 
-ScriptThread *ScriptThreadLabel::Create(Listener *listener)
+ScriptThread *ScriptThreadLabel::Create(Listener *listener) const
 {
     ScriptClass  *scriptClass;
     ScriptThread *thread;
@@ -896,7 +896,7 @@ ScriptThread *ScriptThreadLabel::Create(Listener *listener)
     return thread;
 }
 
-void ScriptThreadLabel::Execute(Listener *listener)
+void ScriptThreadLabel::Execute(Listener *listener) const
 {
     if (!m_Script) {
         return;
@@ -909,7 +909,7 @@ void ScriptThreadLabel::Execute(Listener *listener)
     }
 }
 
-void ScriptThreadLabel::Execute(Listener *listener, Event& ev)
+void ScriptThreadLabel::Execute(Listener *listener, Event& ev) const
 {
     if (!m_Script) {
         return;
@@ -922,12 +922,12 @@ void ScriptThreadLabel::Execute(Listener *listener, Event& ev)
     }
 }
 
-void ScriptThreadLabel::Execute(Listener *listener, Event *ev)
+void ScriptThreadLabel::Execute(Listener *listener, Event *ev) const
 {
     Execute(listener, *ev);
 }
 
-void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
+void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param) const
 {
     if (!m_Script) {
         return;
@@ -1214,7 +1214,7 @@ bool ScriptThreadLabel::TrySetScript(const_str label)
     return true;
 }
 
-void ScriptThreadLabel::GetScriptValue(ScriptVariable *var)
+void ScriptThreadLabel::GetScriptValue(ScriptVariable *var) const
 {
     if (!m_Script) {
         var->Clear();
@@ -1228,12 +1228,12 @@ void ScriptThreadLabel::GetScriptValue(ScriptVariable *var)
     var->setConstArrayValue(var_array, 2);
 }
 
-bool ScriptThreadLabel::IsSet(void)
+bool ScriptThreadLabel::IsSet(void) const
 {
     return m_Script != NULL;
 }
 
-bool ScriptThreadLabel::IsFile(const_str filename)
+bool ScriptThreadLabel::IsFile(const_str filename) const
 {
     return m_Script && m_Script->ConstFilename() == filename && m_Label == STRING_EMPTY;
 }
diff --git a/code/fgame/gamescript.h b/code/fgame/gamescript.h
index a153fcfa..23e85774 100644
--- a/code/fgame/gamescript.h
+++ b/code/fgame/gamescript.h
@@ -169,11 +169,11 @@ private:
 public:
     ScriptThreadLabel();
 
-    ScriptThread *Create(Listener *listener);
-    void          Execute(Listener *listener = NULL);
-    void          Execute(Listener *listener, Event& ev);
-    void          Execute(Listener *listener, Event *ev);
-    void          Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param);
+    ScriptThread *Create(Listener *listener) const;
+    void          Execute(Listener *listener = NULL) const;
+    void          Execute(Listener *listener, Event& ev) const;
+    void          Execute(Listener *listener, Event *ev) const;
+    void          Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param) const;
 
     void Clear();
     void Set(const char *label);
@@ -188,10 +188,10 @@ public:
     bool TrySetScript(const_str label);
     bool TrySetScript(const char *label);
 
-    bool IsSet(void);
-    bool IsFile(const_str filename);
+    bool IsSet(void) const;
+    bool IsFile(const_str filename) const;
 
-    void GetScriptValue(ScriptVariable *var);
+    void GetScriptValue(ScriptVariable *var) const;
 
     void Archive(Archiver& arc);
 

From cfb343d26228b358c4938ae6237e394c30974fed Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:46:18 +0100
Subject: [PATCH 1879/2040] Add str move constructor/assignment

---
 code/qcommon/str.cpp |  2 +-
 code/qcommon/str.h   | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/code/qcommon/str.cpp b/code/qcommon/str.cpp
index 166c685b..b37d2b2a 100644
--- a/code/qcommon/str.cpp
+++ b/code/qcommon/str.cpp
@@ -631,7 +631,7 @@ void TestStringClass(void)
     str  b;         // b.len == 0, b.data == "\0"
     str  c("test"); // c.len == 4, c.data == "test\0"
     str  d(c);      // d.len == 4, d.data == "test\0"
-    str e(nullptr);
+    str  e(nullptr);
     // e.len == 0, e.data == "\0"					ASSERT!
     size_t i; // i == ?
 
diff --git a/code/qcommon/str.h b/code/qcommon/str.h
index 1c367ec1..14f4ddcc 100644
--- a/code/qcommon/str.h
+++ b/code/qcommon/str.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -96,6 +96,9 @@ public:
     str(const long long num);
     str(const unsigned long long num);
 
+    str(str&& string);
+    str& operator=(str&& string);
+
     size_t      length(void) const;
     const char *c_str(void) const;
 
@@ -387,6 +390,24 @@ inline const char *str::c_str(void) const
     }
 }
 
+inline str::str(str&& string)
+    : m_data(string.m_data)
+{
+    string.m_data = NULL;
+}
+
+inline str& str::operator=(str&& string)
+{
+    if (m_data) {
+        m_data->DelRef();
+    }
+
+    m_data        = string.m_data;
+    string.m_data = NULL;
+
+    return *this;
+}
+
 inline void str::append(const char *text)
 {
     size_t len;
@@ -626,8 +647,7 @@ inline int str::cmpn(const str& text, size_t n) const
 
 inline void str::tolower(void)
 {
-    if (m_data)
-    {
+    if (m_data) {
         EnsureDataWritable();
 
         str::tolower(m_data->data);
@@ -636,8 +656,7 @@ inline void str::tolower(void)
 
 inline void str::toupper(void)
 {
-    if (m_data)
-    {
+    if (m_data) {
         EnsureDataWritable();
 
         str::toupper(m_data->data);

From 9cb593c9e45e6669ea2fb6f9de6d136bf522cb55 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 00:51:38 +0100
Subject: [PATCH 1880/2040] Add support for event subscription (delegates)

---
 code/fgame/scriptdelegate.cpp | 162 ++++++++++++++++++++++++++++++
 code/fgame/scriptdelegate.h   | 183 ++++++++++++++++++++++++++++++++++
 code/qcommon/CMakeLists.txt   |   1 +
 code/qcommon/delegate.cpp     |  52 ++++++++++
 code/qcommon/delegate.h       | 125 +++++++++++++++++++++++
 5 files changed, 523 insertions(+)
 create mode 100644 code/fgame/scriptdelegate.cpp
 create mode 100644 code/fgame/scriptdelegate.h
 create mode 100644 code/qcommon/delegate.cpp
 create mode 100644 code/qcommon/delegate.h

diff --git a/code/fgame/scriptdelegate.cpp b/code/fgame/scriptdelegate.cpp
new file mode 100644
index 00000000..383edd1b
--- /dev/null
+++ b/code/fgame/scriptdelegate.cpp
@@ -0,0 +1,162 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "scriptdelegate.h"
+#include "../script/scriptexception.h"
+
+ScriptDelegate *ScriptDelegate::root = NULL;
+
+ScriptRegisteredDelegate_Script::ScriptRegisteredDelegate_Script(const ScriptThreadLabel& inLabel)
+    : label(inLabel)
+{}
+
+void ScriptRegisteredDelegate_Script::Execute(const Event& ev)
+{
+    Event newev = ev;
+
+    label.Execute(NULL, newev);
+}
+
+bool ScriptRegisteredDelegate_Script::operator==(const ScriptRegisteredDelegate_Script& registeredDelegate) const
+{
+    return label == registeredDelegate.label;
+}
+
+ScriptRegisteredDelegate_CodeMember::ScriptRegisteredDelegate_CodeMember(
+    Class *inObject, DelegateClassResponse inResponse
+)
+    : object(inObject)
+    , response(inResponse)
+{}
+
+void ScriptRegisteredDelegate_CodeMember::Execute(const Event& ev)
+{
+    if (!object) {
+        return;
+    }
+
+    (object->*response)(ev);
+}
+
+bool ScriptRegisteredDelegate_CodeMember::operator==(const ScriptRegisteredDelegate_CodeMember& registeredDelegate
+) const
+{
+    return object == registeredDelegate.object && response == registeredDelegate.response;
+}
+
+ScriptRegisteredDelegate_Code::ScriptRegisteredDelegate_Code(DelegateResponse inResponse)
+    : response(inResponse)
+{}
+
+void ScriptRegisteredDelegate_Code::Execute(const Event& ev)
+{
+    (*response)(ev);
+}
+
+bool ScriptRegisteredDelegate_Code::operator==(const ScriptRegisteredDelegate_Code& registeredDelegate) const
+{
+    return response == registeredDelegate.response;
+}
+
+ScriptDelegate::ScriptDelegate(const char *inName, const char *inDescription)
+    : name(inName)
+    , description(inDescription)
+{
+    LL_SafeAdd(root, this, next, prev);
+}
+
+ScriptDelegate::~ScriptDelegate()
+{
+    LL_SafeRemoveRoot(root, this, next, prev);
+}
+
+const ScriptDelegate *ScriptDelegate::GetRoot()
+{
+    return root;
+}
+
+const ScriptDelegate *ScriptDelegate::GetNext() const
+{
+    return next;
+}
+
+void ScriptDelegate::Register(const ScriptThreadLabel& label)
+{
+    if (!label.IsSet()) {
+        ScriptError("Invalid label specified for the script delegate");
+    }
+
+    list_script.AddUniqueObject(label);
+}
+
+void ScriptDelegate::Unregister(const ScriptThreadLabel& label)
+{
+    list_script.RemoveObject(label);
+}
+
+void ScriptDelegate::Register(ScriptRegisteredDelegate_Code::DelegateResponse response)
+{
+    list_code.AddUniqueObject(ScriptRegisteredDelegate_Code(response));
+}
+
+void ScriptDelegate::Unregister(ScriptRegisteredDelegate_Code::DelegateResponse response)
+{
+    list_code.RemoveObject(response);
+}
+
+void ScriptDelegate::Register(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response)
+{
+    list_codeMember.AddUniqueObject(ScriptRegisteredDelegate_CodeMember(object, response));
+}
+
+void ScriptDelegate::Unregister(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response)
+{
+    list_codeMember.RemoveObject(ScriptRegisteredDelegate_CodeMember(object, response));
+}
+
+void ScriptDelegate::Trigger(const Event& ev) const
+{
+    size_t i;
+
+    for (i = 1; i <= list_script.NumObjects(); i++) {
+        list_script.ObjectAt(i).Execute(ev);
+    }
+
+    for (i = 1; i <= list_code.NumObjects(); i++) {
+        list_code.ObjectAt(i).Execute(ev);
+    }
+
+    for (i = 1; i <= list_codeMember.NumObjects(); i++) {
+        list_codeMember.ObjectAt(i).Execute(ev);
+    }
+}
+
+ScriptDelegate *ScriptDelegate::GetScriptDelegate(const char *name)
+{
+    for (ScriptDelegate *delegate = root; delegate; delegate = delegate->next) {
+        if (!Q_stricmp(delegate->name, name)) {
+            return delegate;
+        }
+    }
+
+    return NULL;
+}
diff --git a/code/fgame/scriptdelegate.h b/code/fgame/scriptdelegate.h
new file mode 100644
index 00000000..1472d7d8
--- /dev/null
+++ b/code/fgame/scriptdelegate.h
@@ -0,0 +1,183 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// scriptdelegate -- manages function delegate
+
+#include "../qcommon/listener.h"
+#include "../qcommon/delegate.h"
+#include "gamescript.h"
+
+class ScriptRegisteredDelegate
+{
+public:
+    void Execute(const Event& ev);
+};
+
+/**
+ * Registered delegate, for scripts.
+ * It contains a ScriptThreadLabel with the game script and the label to execute.
+ */
+class ScriptRegisteredDelegate_Script : public ScriptRegisteredDelegate
+{
+public:
+    ScriptRegisteredDelegate_Script(const ScriptThreadLabel& inLabel);
+
+    void Execute(const Event& ev);
+
+    bool operator==(const ScriptRegisteredDelegate_Script& registeredDelegate) const;
+
+private:
+    ScriptThreadLabel label;
+};
+
+/**
+ * Registered delegate, for code use.
+ * It contains the function to execute.
+ */
+class ScriptRegisteredDelegate_Code : public ScriptRegisteredDelegate
+{
+public:
+    using DelegateResponse = void (*)(const Event& ev);
+
+public:
+    ScriptRegisteredDelegate_Code(DelegateResponse inResponse);
+
+    void Execute(const Event& ev);
+
+    bool operator==(const ScriptRegisteredDelegate_Code& registeredDelegate) const;
+
+private:
+    DelegateResponse response;
+};
+
+/**
+ * Registered delegate, for code use.
+ * It contains the object along the member function to execute.
+ * The function will not be executed if the object is NULL.
+ */
+class ScriptRegisteredDelegate_CodeMember : public ScriptRegisteredDelegate
+{
+public:
+    using DelegateClassResponse = void (Class::*)(const Event& ev);
+
+public:
+    ScriptRegisteredDelegate_CodeMember(Class *inObject, DelegateClassResponse inResponse);
+
+    void Execute(const Event& ev);
+
+    bool operator==(const ScriptRegisteredDelegate_CodeMember& registeredDelegate) const;
+
+private:
+    SafePtr<Class>        object;
+    DelegateClassResponse response;
+};
+
+/**
+ * A script delegate provides a way for code to subscribe for events.
+ * Scripts and code can register for a delegate and have their function executed
+ * when the delegate gets triggered.
+ */
+class ScriptDelegate
+{
+public:
+    ScriptDelegate(const char *name, const char *description);
+    ~ScriptDelegate();
+
+    static const ScriptDelegate *GetRoot();
+    const ScriptDelegate        *GetNext() const;
+
+    /**
+     * Register a script label.
+     *
+     * @param label The label to be executed
+     */
+    void Register(const ScriptThreadLabel& label);
+
+    /**
+     * Unregistered the label.
+     *
+     * @param label The label to unregister
+     */
+    void Unregister(const ScriptThreadLabel& label);
+
+    /**
+     * Register a function.
+     *
+     * @param response The function to be executed
+     */
+    void Register(ScriptRegisteredDelegate_Code::DelegateResponse response);
+
+    /**
+     * Unregistered the function.
+     *
+     * @param response the function to unregister
+     */
+    void Unregister(ScriptRegisteredDelegate_Code::DelegateResponse response);
+
+    /**
+     * Register with an object and a member function.
+     *
+     * @param object The object to notify
+     * @param response The member function of the object to be executed
+     */
+    void Register(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response);
+
+    /**
+     * Unregistered the member function.
+     *
+     * @param object The object where the member function is
+     * @param response The member function to unregister
+     */
+    void Unregister(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response);
+
+    /**
+     * Executes all registered delegates with the specified event.
+     *
+     * @param ev Parameter list
+     */
+    void Trigger(const Event& ev) const;
+
+    /**
+     * Search and return the specified script delegate by name.
+     *
+     * @param name The name to search for
+     */
+    static ScriptDelegate *GetScriptDelegate(const char *name);
+
+    // non-movable and non-copyable
+    ScriptDelegate(ScriptDelegate&& other)                 = delete;
+    ScriptDelegate& operator=(ScriptDelegate&& other)      = delete;
+    ScriptDelegate(const ScriptDelegate& other)            = delete;
+    ScriptDelegate& operator=(const ScriptDelegate& other) = delete;
+
+private:
+    // Linked-list
+    ScriptDelegate        *next;
+    ScriptDelegate        *prev;
+    static ScriptDelegate *root;
+    const char            *name;
+    const char            *description;
+
+    Container<ScriptRegisteredDelegate_Script>     list_script;
+    Container<ScriptRegisteredDelegate_Code>       list_code;
+    Container<ScriptRegisteredDelegate_CodeMember> list_codeMember;
+};
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index 88281dc5..bde54547 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -13,6 +13,7 @@ set(SOURCES_SHARED_UBER
 	"${CMAKE_SOURCE_DIR}/code/qcommon/class.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/con_set.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/con_timer.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/delegate.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/lightclass.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/listener.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/lz77.cpp"
diff --git a/code/qcommon/delegate.cpp b/code/qcommon/delegate.cpp
new file mode 100644
index 00000000..48899977
--- /dev/null
+++ b/code/qcommon/delegate.cpp
@@ -0,0 +1,52 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "delegate.h"
+
+uint64_t DelegateHandle::currentHandle = 0;
+
+DelegateHandle::DelegateHandle()
+    : handle(GenerateDelegateID())
+{}
+
+bool DelegateHandle::operator==(const DelegateHandle& other) const
+{
+    return handle == other.handle;
+}
+
+bool DelegateHandle::operator!=(const DelegateHandle& other) const
+{
+    return handle != other.handle;
+}
+
+uint64_t DelegateHandle::GenerateDelegateID()
+{
+    uint64_t handle;
+
+    handle = ++currentHandle;
+
+    if (handle == 0) {
+        handle = ++currentHandle;
+    }
+
+    return handle;
+}
diff --git a/code/qcommon/delegate.h b/code/qcommon/delegate.h
new file mode 100644
index 00000000..394e84c7
--- /dev/null
+++ b/code/qcommon/delegate.h
@@ -0,0 +1,125 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include <functional>
+#include "container.h"
+
+template<typename T>
+using Delegate = std::function<T>;
+
+struct DelegateHandle {
+public:
+    DelegateHandle();
+
+    bool operator==(const DelegateHandle& other) const;
+    bool operator!=(const DelegateHandle& other) const;
+
+private:
+    static uint64_t GenerateDelegateID();
+    static uint64_t currentHandle;
+
+    uint64_t handle;
+};
+
+template<typename T>
+class DelegateMultiElement
+{
+public:
+    DelegateMultiElement(Delegate<T>&& inFunction);
+
+    template<typename... Args>
+    void Execute(Args&&...args) const;
+
+    DelegateHandle GetHandle() const;
+
+private:
+    DelegateHandle handle;
+    Delegate<T>    func;
+};
+
+template<typename T>
+DelegateMultiElement<T>::DelegateMultiElement(Delegate<T>&& inFunction)
+    : func(inFunction)
+{}
+
+template<typename T>
+template<typename... Args>
+void DelegateMultiElement<T>::Execute(Args&&...args) const
+{
+    func(std::move(args)...);
+}
+
+template<typename T>
+DelegateHandle DelegateMultiElement<T>::GetHandle() const
+{
+    return handle;
+}
+
+template<typename T>
+class MulticastDelegate
+{
+public:
+    DelegateHandle Add(Delegate<T>&& function);
+    void           Remove(DelegateHandle handle);
+
+    template<typename... Args>
+    void Execute(Args&&...args);
+
+private:
+    Container<DelegateMultiElement<T>> delegates;
+};
+
+template<typename T>
+DelegateHandle MulticastDelegate<T>::Add(Delegate<T>&& function)
+{
+    int index = delegates.AddObject(DelegateMultiElement<T>(std::move(function)));
+
+    return delegates.ObjectAt(index).GetHandle();
+}
+
+template<typename T>
+void MulticastDelegate<T>::Remove(DelegateHandle handle)
+{
+    size_t i;
+
+    for (i = delegates.NumObjects(); i > 0; i--) {
+        const DelegateMultiElement<T>& elem = delegates.ObjectAt(i);
+
+        if (elem.GetHandle() == handle) {
+            delegates.RemoveObjectAt(i);
+            break;
+        }
+    }
+}
+
+template<typename T>
+template<typename... Args>
+void MulticastDelegate<T>::Execute(Args&&...args)
+{
+    size_t i;
+
+    for (i = 1; i <= delegates.NumObjects(); i++) {
+        const DelegateMultiElement<T>& element = delegates.ObjectAt(i);
+
+        element.Execute(std::move(args)...);
+    }
+}

From 7f64ef05d54d51fd3aef724afa34618fd1ba06fc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:01:41 +0100
Subject: [PATCH 1881/2040] Mark Event getter methods as const

---
 code/qcommon/listener.cpp | 46 +++++++++++++++++++--------------------
 code/qcommon/listener.h   | 46 +++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index f98d86f7..52ebfcf5 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -2117,7 +2117,7 @@ void Event::Clear(void)
 CheckPos
 =======================
 */
-void Event::CheckPos(int pos)
+void Event::CheckPos(int pos) const
 {
     if (pos > NumArgs()) {
         ScriptError("Index %d out of range.", pos);
@@ -2129,7 +2129,7 @@ void Event::CheckPos(int pos)
 GetBoolean
 =======================
 */
-bool Event::GetBoolean(int pos)
+bool Event::GetBoolean(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2143,7 +2143,7 @@ bool Event::GetBoolean(int pos)
 GetConstString
 =======================
 */
-const_str Event::GetConstString(int pos)
+const_str Event::GetConstString(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2157,7 +2157,7 @@ const_str Event::GetConstString(int pos)
 GetEntity
 =======================
 */
-Entity *Event::GetEntity(int pos)
+Entity *Event::GetEntity(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2169,7 +2169,7 @@ Entity *Event::GetEntity(int pos)
 GetFloat
 =======================
 */
-float Event::GetFloat(int pos)
+float Event::GetFloat(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2181,7 +2181,7 @@ float Event::GetFloat(int pos)
 GetInteger
 =======================
 */
-int Event::GetInteger(int pos)
+int Event::GetInteger(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2193,7 +2193,7 @@ int Event::GetInteger(int pos)
 GetListener
 =======================
 */
-Listener *Event::GetListener(int pos)
+Listener *Event::GetListener(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2207,7 +2207,7 @@ Listener *Event::GetListener(int pos)
 GetSimpleEntity
 =======================
 */
-SimpleEntity *Event::GetSimpleEntity(int pos)
+SimpleEntity *Event::GetSimpleEntity(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2221,7 +2221,7 @@ SimpleEntity *Event::GetSimpleEntity(int pos)
 GetString
 =======================
 */
-str Event::GetString(int pos)
+str Event::GetString(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
     return variable.stringValue();
@@ -2232,7 +2232,7 @@ str Event::GetString(int pos)
 GetToken
 =======================
 */
-str Event::GetToken(int pos)
+str Event::GetToken(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
     return variable.stringValue();
@@ -2243,7 +2243,7 @@ str Event::GetToken(int pos)
 GetValue
 =======================
 */
-ScriptVariable& Event::GetValue(int pos)
+ScriptVariable& Event::GetValue(int pos) const
 {
     if (pos < 0) {
         pos = NumArgs() + pos + 1;
@@ -2303,7 +2303,7 @@ ScriptVariable& Event::GetValue(void)
 GetVector
 =======================
 */
-Vector Event::GetVector(int pos)
+Vector Event::GetVector(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2317,7 +2317,7 @@ Vector Event::GetVector(int pos)
 GetPathNode
 =======================
 */
-PathNode *Event::GetPathNode(int pos)
+PathNode *Event::GetPathNode(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2329,7 +2329,7 @@ PathNode *Event::GetPathNode(int pos)
 GetWaypoint
 =======================
 */
-Waypoint *Event::GetWaypoint(int pos)
+Waypoint *Event::GetWaypoint(int pos) const
 {
     ScriptVariable& variable = GetValue(pos);
 
@@ -2343,7 +2343,7 @@ Waypoint *Event::GetWaypoint(int pos)
 IsEntityAt
 =======================
 */
-qboolean Event::IsEntityAt(int pos)
+qboolean Event::IsEntityAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2355,7 +2355,7 @@ qboolean Event::IsEntityAt(int pos)
 IsListenerAt
 =======================
 */
-qboolean Event::IsListenerAt(int pos)
+qboolean Event::IsListenerAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2367,7 +2367,7 @@ qboolean Event::IsListenerAt(int pos)
 IsNilAt
 =======================
 */
-qboolean Event::IsNilAt(int pos)
+qboolean Event::IsNilAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2379,7 +2379,7 @@ qboolean Event::IsNilAt(int pos)
 IsNumericAt
 =======================
 */
-qboolean Event::IsNumericAt(int pos)
+qboolean Event::IsNumericAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2393,7 +2393,7 @@ qboolean Event::IsNumericAt(int pos)
 IsSimpleEntityAt
 =======================
 */
-qboolean Event::IsSimpleEntityAt(int pos)
+qboolean Event::IsSimpleEntityAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2407,7 +2407,7 @@ qboolean Event::IsSimpleEntityAt(int pos)
 IsStringAt
 =======================
 */
-qboolean Event::IsStringAt(int pos)
+qboolean Event::IsStringAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2419,7 +2419,7 @@ qboolean Event::IsStringAt(int pos)
 IsVectorAt
 =======================
 */
-qboolean Event::IsVectorAt(int pos)
+qboolean Event::IsVectorAt(int pos) const
 {
     CheckPos(pos);
 
@@ -2431,7 +2431,7 @@ qboolean Event::IsVectorAt(int pos)
 IsFromScript
 =======================
 */
-qboolean Event::IsFromScript()
+qboolean Event::IsFromScript() const
 {
     return fromScript;
 }
@@ -2441,7 +2441,7 @@ qboolean Event::IsFromScript()
 NumArgs
 =======================
 */
-int Event::NumArgs()
+int Event::NumArgs() const
 {
     return dataSize;
 }
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 899750dd..2033815d 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -364,45 +364,45 @@ public:
 
     void Clear(void);
 
-    void CheckPos(int pos);
+    void CheckPos(int pos) const;
 
-    bool GetBoolean(int pos);
+    bool GetBoolean(int pos) const;
 
-    const_str GetConstString(int pos);
+    const_str GetConstString(int pos) const;
 
-    Entity *GetEntity(int pos);
+    Entity *GetEntity(int pos) const;
 
-    float     GetFloat(int pos);
-    int       GetInteger(int pos);
-    Listener *GetListener(int pos);
+    float     GetFloat(int pos) const;
+    int       GetInteger(int pos) const;
+    Listener *GetListener(int pos) const;
 
-    class PathNode *GetPathNode(int pos);
+    class PathNode *GetPathNode(int pos) const;
 
 #ifdef WITH_SCRIPT_ENGINE
-    SimpleEntity *GetSimpleEntity(int pos);
+    SimpleEntity *GetSimpleEntity(int pos) const;
 #endif
 
-    str             GetString(int pos);
-    str             GetToken(int pos);
-    ScriptVariable& GetValue(int pos);
+    str             GetString(int pos) const;
+    str             GetToken(int pos) const;
+    ScriptVariable& GetValue(int pos) const;
     ScriptVariable& GetValue(void);
-    Vector          GetVector(int pos);
+    Vector          GetVector(int pos) const;
 
-    class Waypoint *GetWaypoint(int pos);
+    class Waypoint *GetWaypoint(int pos) const;
 
-    qboolean IsEntityAt(int pos);
-    qboolean IsListenerAt(int pos);
-    qboolean IsNilAt(int pos);
-    qboolean IsNumericAt(int pos);
+    qboolean IsEntityAt(int pos) const;
+    qboolean IsListenerAt(int pos) const;
+    qboolean IsNilAt(int pos) const;
+    qboolean IsNumericAt(int pos) const;
 #ifdef WITH_SCRIPT_ENGINE
-    qboolean IsSimpleEntityAt(int pos);
+    qboolean IsSimpleEntityAt(int pos) const;
 #endif
-    qboolean IsStringAt(int pos);
-    qboolean IsVectorAt(int pos);
+    qboolean IsStringAt(int pos) const;
+    qboolean IsVectorAt(int pos) const;
 
-    qboolean IsFromScript(void);
+    qboolean IsFromScript(void) const;
 
-    int NumArgs();
+    int NumArgs() const;
 };
 
 #define NODE_CANCEL      1

From b813f7ee5640bb02ec16d39779ca6c126e9d9aeb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:02:11 +0100
Subject: [PATCH 1882/2040] Add delegates related for kill/damage

---
 code/fgame/entity.cpp   | 78 ++++++++++++++++++++++++-----------------
 code/fgame/entity.h     |  7 ++++
 code/fgame/sentient.cpp | 70 +++++++++++++++++++-----------------
 3 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 503ceb18..6dfecf6b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -2673,7 +2673,7 @@ void Entity::DamageEvent(Event *ev)
     Vector  momentum;
     Vector  position, direction, normal;
     int     knockback, damageflags, meansofdeath, location;
-    Event  *event;
+    Event   event;
     float   m;
     EntityPtr This;
 
@@ -2759,67 +2759,79 @@ void Entity::DamageEvent(Event *ev)
 
     if (health <= 0) {
         if (attacker) {
-            event = new Event(EV_GotKill);
-            event->AddEntity(this);
-            event->AddInteger(damage);
-            event->AddEntity(inflictor);
-            event->AddInteger(meansofdeath);
-            event->AddInteger(0);
+            const EntityPtr attackerPtr = attacker;
 
-            attacker->ProcessEvent(event);
+            event = Event(EV_GotKill, 5);
+            event.AddEntity(this);
+            event.AddInteger(damage);
+            event.AddEntity(inflictor);
+            event.AddInteger(meansofdeath);
+            event.AddInteger(0);
+
+            attackerPtr->ProcessEvent(event);
+            if (attackerPtr) {
+                attackerPtr->delegate_gotKill.Execute(event);
+            }
         }
 
         if (!This) {
             return;
         }
 
-        event = new Event(EV_Killed);
-        event->AddEntity(attacker);
-        event->AddFloat(damage);
-        event->AddEntity(inflictor);
-        event->AddVector(position);
-        event->AddVector(direction);
-        event->AddVector(normal);
-        event->AddInteger(knockback);
-        event->AddInteger(damageflags);
-        event->AddInteger(meansofdeath);
-        event->AddInteger(location);
+        event = Event(EV_Killed, 10);
+        event.AddEntity(attacker);
+        event.AddFloat(damage);
+        event.AddEntity(inflictor);
+        event.AddVector(position);
+        event.AddVector(direction);
+        event.AddVector(normal);
+        event.AddInteger(knockback);
+        event.AddInteger(damageflags);
+        event.AddInteger(meansofdeath);
+        event.AddInteger(location);
 
         ProcessEvent(event);
-
         if (!This) {
             return;
         }
 
         // Notify scripts
         Unregister(STRING_DAMAGE);
+        if (!This) {
+            return;
+        }
+
+        delegate_killed.Execute(event);
         return;
     }
 
-    event = new Event(EV_Pain);
-    event->AddEntity(attacker);
-    event->AddFloat(damage);
-    event->AddEntity(inflictor);
-    event->AddVector(position);
-    event->AddVector(direction);
-    event->AddVector(normal);
-    event->AddInteger(knockback);
-    event->AddInteger(damageflags);
-    event->AddInteger(meansofdeath);
-    event->AddInteger(location);
+    event = Event(EV_Pain, 10);
+    event.AddEntity(attacker);
+    event.AddFloat(damage);
+    event.AddEntity(inflictor);
+    event.AddVector(position);
+    event.AddVector(direction);
+    event.AddVector(normal);
+    event.AddInteger(knockback);
+    event.AddInteger(damageflags);
+    event.AddInteger(meansofdeath);
+    event.AddInteger(location);
 
     ProcessEvent(event);
-
     if (!This) {
         return;
     }
 
     // Notify scripts
     Unregister(STRING_DAMAGE);
+    if (!This) {
+        return;
+    }
+
+    delegate_damage.Execute(event);
 }
 
 qboolean Entity::IsTouching(Entity *e1)
-
 {
     if (e1->absmin.x > absmax.x) {
         return false;
diff --git a/code/fgame/entity.h b/code/fgame/entity.h
index fbedaaea..3291a791 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -51,6 +51,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "script.h"
 #include "listener.h"
 #include "simpleentity.h"
+#include "../qcommon/delegate.h"
 
 // modification flags
 #define FLAG_IGNORE 0
@@ -296,6 +297,12 @@ public:
     //====
 #endif
 
+    MulticastDelegate<void (const Event& ev)> delegate_damage;
+    MulticastDelegate<void (const Event& ev)> delegate_killed;
+    MulticastDelegate<void (const Event& ev)> delegate_gotKill;
+
+public:
+
     Entity();
     virtual ~Entity();
 
diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 4ae5f731..1551a715 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -1368,7 +1368,7 @@ void Sentient::ArmorDamage(Event *ev)
     Vector   position;
     Vector   normal;
     Vector   direction;
-    Event    *event;
+    Event    event;
     int      dflags;
     int      meansofdeath;
     int      knockback;
@@ -1582,50 +1582,56 @@ void Sentient::ArmorDamage(Event *ev)
         health = 0;
 
         if (attacker) {
-            // Added in OPM
-            event = new Event(EV_GotKill);
-            event->AddEntity(this);
-            event->AddInteger(damage);
-            event->AddEntity(inflictor);
-            event->AddInteger(meansofdeath);
-            event->AddInteger(0);
+            const EntityPtr attackerPtr = attacker;
 
-            attacker->ProcessEvent(event);
+            // Added in OPM
+            event = Event(EV_GotKill);
+            event.AddEntity(this);
+            event.AddInteger(damage);
+            event.AddEntity(inflictor);
+            event.AddInteger(meansofdeath);
+            event.AddInteger(0);
+
+            attackerPtr->ProcessEvent(event);
+            if (attackerPtr) {
+                attackerPtr->delegate_gotKill.Execute(event);
+            }
         }
 
-        event = new Event(EV_Killed, 10);
-        event->AddEntity(attacker);
-        event->AddFloat(damage);
-        event->AddEntity(inflictor);
-        event->AddVector(position);
-        event->AddVector(direction);
-        event->AddVector(normal);
-        event->AddInteger(knockback);
-        event->AddInteger(dflags);
-        event->AddInteger(meansofdeath);
-        event->AddInteger(location);
+        event = Event(EV_Killed, 10);
+        event.AddEntity(attacker);
+        event.AddFloat(damage);
+        event.AddEntity(inflictor);
+        event.AddVector(position);
+        event.AddVector(direction);
+        event.AddVector(normal);
+        event.AddInteger(knockback);
+        event.AddInteger(dflags);
+        event.AddInteger(meansofdeath);
+        event.AddInteger(location);
 
         ProcessEvent(event);
+        delegate_killed.Execute(event);
     }
 
     if (health > 0) {
         // Send pain event
-        event = new Event(EV_Pain, 10);
-        event->AddEntity(attacker);
-        event->AddFloat(damage);
-        event->AddEntity(inflictor);
-        event->AddVector(position);
-        event->AddVector(direction);
-        event->AddVector(normal);
-        event->AddInteger(knockback);
-        event->AddInteger(dflags);
-        event->AddInteger(meansofdeath);
-        event->AddInteger(location);
+        event = Event(EV_Pain, 10);
+        event.AddEntity(attacker);
+        event.AddFloat(damage);
+        event.AddEntity(inflictor);
+        event.AddVector(position);
+        event.AddVector(direction);
+        event.AddVector(normal);
+        event.AddInteger(knockback);
+        event.AddInteger(dflags);
+        event.AddInteger(meansofdeath);
+        event.AddInteger(location);
 
         ProcessEvent(event);
     }
 
-    return;
+    delegate_damage.Execute(*ev);
 }
 
 qboolean Sentient::CanBlock(int meansofdeath, qboolean full_block)

From 9242faaa49fea0fe8df07766599d7c0798a9c2ae Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:02:22 +0100
Subject: [PATCH 1883/2040] Add delegate for stufftext

---
 code/fgame/player.cpp | 7 +++++--
 code/fgame/player.h   | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index c377dc65..4e07c8a3 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10429,9 +10429,12 @@ void Player::EventStuffText(Event *ev)
         Event *event = new Event(EV_Player_StuffText);
         event->AddValue(ev->GetValue(1));
         PostEvent(event, level.frametime, 0);
-    } else {
-        gi.SendServerCommand(edict - g_entities, "stufftext \"%s\"", ev->GetString(1).c_str());
+        return;
     }
+
+    gi.SendServerCommand(edict - g_entities, "stufftext \"%s\"", ev->GetString(1).c_str());
+
+    delegate_stufftext.Execute(ev->GetString(1));
 }
 
 void Player::EventSetVoiceType(Event *ev)
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 1435777c..3646d6e2 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -310,6 +310,9 @@ private:
     bool m_bShowingHint;
 #endif
 
+public:
+    MulticastDelegate<void (const str& text)> delegate_stufftext;
+
 public:
     int m_iNumObjectives;
     int m_iObjectivesCompleted;

From ee970a3fcee0419b198be0d8572851360840f9ca Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:02:56 +0100
Subject: [PATCH 1884/2040] Remove PlayerBot class and use delegates instead

---
 code/fgame/dm_manager.cpp   |  8 ++---
 code/fgame/g_bot.cpp        | 12 +++----
 code/fgame/g_client.cpp     |  1 +
 code/fgame/playerbot.cpp    | 62 +++++++++++--------------------------
 code/fgame/playerbot.h      | 31 ++++++-------------
 code/fgame/simpleentity.cpp |  5 ---
 code/fgame/simpleentity.h   |  1 -
 7 files changed, 38 insertions(+), 82 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index a2d3d1f5..1a2cd537 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1843,7 +1843,7 @@ void DM_Manager::BuildTeamInfo_ver6(DM_Team *dmTeam)
     for (int i = iNumPlayers; i > 0; i--) {
         pTeamPlayer = dmTeam->m_players.ObjectAt(i);
 
-        if (pTeamPlayer->IsSubclassOfBot()) {
+        if (pTeamPlayer->edict->r.svFlags & SVF_BOT) {
             continue;
         }
 
@@ -1888,7 +1888,7 @@ void DM_Manager::BuildTeamInfo_ver15(DM_Team *dmTeam)
     for (int i = iNumPlayers; i > 0; i--) {
         pTeamPlayer = dmTeam->m_players.ObjectAt(i);
 
-        if (pTeamPlayer->IsSubclassOfBot()) {
+        if (pTeamPlayer->edict->r.svFlags & SVF_BOT) {
             continue;
         }
 
@@ -1962,7 +1962,7 @@ void DM_Manager::BuildPlayerTeamInfo(DM_Team *dmTeam, int *iPlayerList, DM_Team
                 pTeamPlayer->GetNumKills(),
                 pTeamPlayer->GetNumDeaths(),
                 G_TimeString(level.svsFloatTime - pTeamPlayer->edict->client->pers.enterTime),
-                pTeamPlayer->IsSubclassOfBot() ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
+                (pTeamPlayer->edict->r.svFlags & SVF_BOT) ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
             );
         } else {
             Com_sprintf(
@@ -1973,7 +1973,7 @@ void DM_Manager::BuildPlayerTeamInfo(DM_Team *dmTeam, int *iPlayerList, DM_Team
                 pTeamPlayer->GetNumKills(),
                 pTeamPlayer->GetNumDeaths(),
                 G_TimeString(level.svsFloatTime - pTeamPlayer->edict->client->pers.enterTime),
-                pTeamPlayer->IsSubclassOfBot() ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
+                (pTeamPlayer->edict->r.svFlags & SVF_BOT) ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
             );
         }
 
diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index cd71cfad..fabebdae 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -157,16 +157,16 @@ Begin spawning a new bot entity
 */
 void G_BotBegin(gentity_t *ent)
 {
-    PlayerBot     *player;
+    Player        *player;
     BotController *controller;
 
     level.spawn_entnum = ent->s.number;
-    player             = new PlayerBot;
+    player             = new Player;
 
     G_ClientBegin(ent, NULL);
 
     controller = botManager.getControllerManager().createController(player);
-    player->setController(controller);
+    //player->setController(controller);
 }
 
 /*
@@ -271,7 +271,7 @@ void G_BotShift(int clientNum)
         return;
     }
 
-    if (!ent->entity->IsSubclassOfBot()) {
+    if (!botManager.getControllerManager().findController(ent->entity)) {
         return;
     }
 
@@ -355,7 +355,7 @@ bool G_IsBot(gentity_t *ent)
         return false;
     }
 
-    if (!ent->entity || !ent->entity->IsSubclassOfBot()) {
+    if (!ent->entity || !botManager.getControllerManager().findController(ent->entity)) {
         return false;
     }
 
@@ -375,7 +375,7 @@ bool G_IsPlayer(gentity_t *ent)
         return false;
     }
 
-    if (!ent->entity || ent->entity->IsSubclassOfBot()) {
+    if (!ent->entity || botManager.getControllerManager().findController(ent->entity)) {
         return false;
     }
 
diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 7fffb86c..c7f22dd2 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -827,6 +827,7 @@ void G_BotConnect(int clientNum, qboolean firstTime, const char *userinfo)
 
     ent->client   = game.clients + clientNum;
     ent->s.number = clientNum;
+    ent->r.svFlags |= SVF_BOT;
 
     client = ent->client;
 
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 25a17f0c..958e4ce4 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -76,6 +76,15 @@ BotController::BotController()
     m_RunLabel.TrySetScript("global/bot_run.scr");
 }
 
+BotController::~BotController()
+{
+    if (controlledEnt) {
+        controlledEnt->delegate_gotKill.Remove(delegateHandle_gotKill);
+        controlledEnt->delegate_killed.Remove(delegateHandle_killed);
+        controlledEnt->delegate_stufftext.Remove(delegateHandle_stufftext);
+    }
+}
+
 BotMovement& BotController::GetMovement()
 {
     return movement;
@@ -1051,7 +1060,7 @@ void BotController::Think()
     G_ClientThink(controlledEnt->edict, &ucmd, &eyeinfo);
 }
 
-void BotController::Killed(Event *ev)
+void BotController::Killed(const Event& ev)
 {
     Entity *attacker;
 
@@ -1068,7 +1077,7 @@ void BotController::Killed(Event *ev)
     m_botEyes.angles[0] = 0;
     m_botEyes.angles[1] = 0;
 
-    attacker = ev->GetEntity(1);
+    attacker = ev.GetEntity(1);
 
     if (attacker && rand() % 5 == 0) {
         // 1/5 chance to go back to the attacker position
@@ -1093,7 +1102,7 @@ void BotController::Killed(Event *ev)
     G_ClientUserinfoChanged(controlledEnt->edict, controlledEnt->client->pers.userinfo);
 }
 
-void BotController::GotKill(Event *ev)
+void BotController::GotKill(const Event& ev)
 {
     ClearEnemy();
     m_iCuriousTime = 0;
@@ -1118,9 +1127,9 @@ void BotController::GotKill(Event *ev)
     }
 }
 
-void BotController::EventStuffText(Event *ev)
+void BotController::EventStuffText(const str& text)
 {
-    SendCommand(ev->GetString(1));
+    SendCommand(text);
 }
 
 void BotController::setControlledEntity(Player *player)
@@ -1128,6 +1137,10 @@ void BotController::setControlledEntity(Player *player)
     controlledEnt = player;
     movement.SetControlledEntity(player);
     rotation.SetControlledEntity(player);
+
+    delegateHandle_gotKill = player->delegate_gotKill.Add(std::bind(&BotController::GotKill, this, std::placeholders::_1));
+    delegateHandle_killed = player->delegate_killed.Add(std::bind(&BotController::Killed, this, std::placeholders::_1));
+    delegateHandle_stufftext = player->delegate_stufftext.Add(std::bind(&BotController::EventStuffText, this, std::placeholders::_1));
 }
 
 Player *BotController::getControlledEntity() const
@@ -1216,42 +1229,3 @@ void BotControllerManager::ThinkControllers()
         controller->Think();
     }
 }
-
-CLASS_DECLARATION(Player, PlayerBot, NULL) {
-    {&EV_Killed,           &PlayerBot::Killed        },
-    {&EV_GotKill,          &PlayerBot::GotKill       },
-    {&EV_Player_StuffText, &PlayerBot::EventStuffText},
-    {NULL,                 NULL                      }
-};
-
-PlayerBot::PlayerBot()
-{
-    entflags |= ECF_BOT;
-    controller = NULL;
-}
-
-void PlayerBot::setController(BotController *controlledBy)
-{
-    controller = controlledBy;
-}
-
-void PlayerBot::Spawned(void)
-{
-    controller->Spawned();
-
-    Player::Spawned();
-}
-
-void PlayerBot::Killed(Event *ev)
-{
-    Player::Killed(ev);
-
-    controller->Killed(ev);
-}
-
-void PlayerBot::GotKill(Event *ev)
-{
-    Player::GotKill(ev);
-
-    controller->GotKill(ev);
-}
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 83caa0bb..6d67fab3 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -160,6 +160,11 @@ private:
     // Taunts
     int m_iNextTauntTime;
 
+private:
+    DelegateHandle delegateHandle_gotKill;
+    DelegateHandle delegateHandle_killed;
+    DelegateHandle delegateHandle_stufftext;
+
 private:
     Weapon* FindWeaponWithAmmo(void);
     Weapon* FindMeleeWeapon(void);
@@ -209,6 +214,7 @@ public:
     CLASS_PROTOTYPE(BotController);
 
     BotController();
+    ~BotController();
 
     static void Init(void);
 
@@ -229,9 +235,9 @@ public:
 
     void Spawned(void);
 
-    void Killed(Event *ev);
-    void GotKill(Event *ev);
-    void EventStuffText(Event *ev);
+    void Killed(const Event& ev);
+    void GotKill(const Event& ev);
+    void EventStuffText(const str& text);
 
     BotMovement& GetMovement();
 
@@ -282,22 +288,3 @@ private:
 };
 
 extern BotManager botManager;
-
-class PlayerBot : public Player
-{
-public:
-    CLASS_PROTOTYPE(PlayerBot);
-
-public:
-    PlayerBot();
-
-    void setController(BotController *controlledBy);
-
-    void Spawned(void) override;
-
-    void Killed(Event *ev) override;
-    void GotKill(Event *ev);
-
-private:
-    BotController *controller;
-};
diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index 6bcd7805..6b582500 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -356,11 +356,6 @@ int SimpleEntity::IsSubclassOfCrateObject(void) const
     return (entflags & ECF_CRATEOBJECT);
 }
 
-int SimpleEntity::IsSubclassOfBot(void) const
-{
-    return (entflags & ECF_BOT);
-}
-
 void SimpleEntity::SetTargetName(str targetname)
 {
     if (!world) {
diff --git a/code/fgame/simpleentity.h b/code/fgame/simpleentity.h
index c29b91c5..d9f2aa18 100644
--- a/code/fgame/simpleentity.h
+++ b/code/fgame/simpleentity.h
@@ -91,7 +91,6 @@ public:
     int IsSubclassOfVehiclePoint(void) const;
     int IsSubclassOfSplinePath(void) const;
     int IsSubclassOfCrateObject(void) const;
-    int IsSubclassOfBot(void) const;
 
     void GetOrigin(Event *ev);
     void SetOrigin(Event *ev);

From e962e4e1f51a7f4a0f9c132e886872faf17511e4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:03:32 +0100
Subject: [PATCH 1885/2040] Use an int instead of a size_t

---
 code/qcommon/delegate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/delegate.h b/code/qcommon/delegate.h
index 394e84c7..f839682c 100644
--- a/code/qcommon/delegate.h
+++ b/code/qcommon/delegate.h
@@ -99,7 +99,7 @@ DelegateHandle MulticastDelegate<T>::Add(Delegate<T>&& function)
 template<typename T>
 void MulticastDelegate<T>::Remove(DelegateHandle handle)
 {
-    size_t i;
+    int i;
 
     for (i = delegates.NumObjects(); i > 0; i--) {
         const DelegateMultiElement<T>& elem = delegates.ObjectAt(i);

From 8234ce1e5f5e2b096ac01ad106b2c22e66eaf83b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:20:14 +0100
Subject: [PATCH 1886/2040] Add pragma once

---
 code/qcommon/delegate.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/qcommon/delegate.h b/code/qcommon/delegate.h
index f839682c..103f4c00 100644
--- a/code/qcommon/delegate.h
+++ b/code/qcommon/delegate.h
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#pragma once
+
 #include <functional>
 #include "container.h"
 

From d190cc6e40b00d8928bf5f3b318f087019c771b6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:35:27 +0100
Subject: [PATCH 1887/2040] Use SafeAddFirst

---
 code/fgame/scriptdelegate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/scriptdelegate.cpp b/code/fgame/scriptdelegate.cpp
index 383edd1b..ebe063e6 100644
--- a/code/fgame/scriptdelegate.cpp
+++ b/code/fgame/scriptdelegate.cpp
@@ -81,7 +81,7 @@ ScriptDelegate::ScriptDelegate(const char *inName, const char *inDescription)
     : name(inName)
     , description(inDescription)
 {
-    LL_SafeAdd(root, this, next, prev);
+    LL_SafeAddFirst(root, this, next, prev);
 }
 
 ScriptDelegate::~ScriptDelegate()

From a5c59c4b77e54cfee95e9659bd914ecd3dc37043 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 16:50:07 +0100
Subject: [PATCH 1888/2040] Use maxDataSize when copying Event

---
 code/qcommon/listener.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 52ebfcf5..427c433d 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -1711,7 +1711,7 @@ Event::Event(const Event& ev)
     maxDataSize = ev.maxDataSize;
 
     if (dataSize) {
-        data = new ScriptVariable[dataSize];
+        data = new ScriptVariable[maxDataSize];
 
         for (int i = 0; i < dataSize; i++) {
             data[i] = ev.data[i];
@@ -1733,7 +1733,7 @@ Event::Event(const Event& ev, int numArgs)
     maxDataSize = ev.maxDataSize;
 
     if (dataSize) {
-        data = new ScriptVariable[dataSize];
+        data = new ScriptVariable[maxDataSize];
 
         for (int i = 0; i < dataSize; i++) {
             data[i] = ev.data[i];

From 38cf5b82b2a0fcd2a10b8b2c50d759571c362961 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 17:07:03 +0100
Subject: [PATCH 1889/2040] Copy the list of registered delegates to execute
 them

---
 code/fgame/scriptdelegate.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/code/fgame/scriptdelegate.cpp b/code/fgame/scriptdelegate.cpp
index ebe063e6..fb87c301 100644
--- a/code/fgame/scriptdelegate.cpp
+++ b/code/fgame/scriptdelegate.cpp
@@ -137,16 +137,25 @@ void ScriptDelegate::Trigger(const Event& ev) const
 {
     size_t i;
 
-    for (i = 1; i <= list_script.NumObjects(); i++) {
-        list_script.ObjectAt(i).Execute(ev);
+    {
+        const Container<ScriptRegisteredDelegate_Script> tmpList = list_script;
+        for (i = 1; i <= tmpList.NumObjects(); i++) {
+            tmpList.ObjectAt(i).Execute(ev);
+        }
     }
 
-    for (i = 1; i <= list_code.NumObjects(); i++) {
-        list_code.ObjectAt(i).Execute(ev);
+    {
+        const Container<ScriptRegisteredDelegate_Code> tmpList = list_code;
+        for (i = 1; i <= tmpList.NumObjects(); i++) {
+            tmpList.ObjectAt(i).Execute(ev);
+        }
     }
 
-    for (i = 1; i <= list_codeMember.NumObjects(); i++) {
-        list_codeMember.ObjectAt(i).Execute(ev);
+    {
+        const Container<ScriptRegisteredDelegate_CodeMember> tmpList = list_codeMember;
+        for (i = 1; i <= tmpList.NumObjects(); i++) {
+            tmpList.ObjectAt(i).Execute(ev);
+        }
     }
 }
 

From 1eb7458af9fa297c480910c51991ca75d90ff184 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 17:07:22 +0100
Subject: [PATCH 1890/2040] Add event_subscribe and event_unsubscribe scripting
 commands

---
 code/fgame/scriptthread.cpp | 60 +++++++++++++++++++++++++++++++++++++
 code/fgame/scriptthread.h   |  3 ++
 2 files changed, 63 insertions(+)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 3a3863b6..409ef1f2 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -1676,6 +1676,24 @@ Event EV_ScriptThread_UnregisterEv
     "Unregisters script callback handler for specified event",
     EV_RETURN
 );
+Event EV_ScriptThread_Event_Subscribe
+(
+    "event_subscribe",
+    EV_DEFAULT,
+    "ss",
+    "eventname script",
+    "Subscribe to the specified event. The specified script will be executed when the event gets triggered.",
+    EV_NORMAL
+);
+Event EV_ScriptThread_Event_Unsubscribe
+(
+    "event_unsubscribe",
+    EV_DEFAULT,
+    "ss",
+    "eventname script",
+    "Unsubscribe the script from the specified event.",
+    EV_NORMAL
+);
 Event EV_ScriptThread_Conprintf
 (
     "conprintf",
@@ -2193,6 +2211,8 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_TypeOf,                  &ScriptThread::TypeOfVariable          },
     {&EV_ScriptThread_RegisterEv,              &ScriptThread::RegisterEvent           },
     {&EV_ScriptThread_UnregisterEv,            &ScriptThread::UnregisterEvent         },
+    {&EV_ScriptThread_Event_Subscribe,         &ScriptThread::SubscribeEvent          },
+    {&EV_ScriptThread_Event_Unsubscribe,       &ScriptThread::UnsubscribeEvent        },
     {&EV_ScriptThread_CancelWaiting,           &ScriptThread::CancelWaiting           },
     {&EV_ScriptThread_GetTime,                 &ScriptThread::GetTime                 },
     {&EV_ScriptThread_GetTimeZone,             &ScriptThread::GetTimeZone             },
@@ -6855,6 +6875,8 @@ void ScriptThread::RegisterEvent(Event *ev)
     char             eventname_full[64];
     scriptedEvType_t evType;
 
+    ScriptDeprecatedAltMethod("event_subscribe");
+
     eventname = ev->GetString(1);
 
     evType = EventNameToType(eventname, eventname_full);
@@ -6886,6 +6908,8 @@ void ScriptThread::UnregisterEvent(Event *ev)
     int              numArgs = 0;
     scriptedEvType_t evType;
 
+    ScriptDeprecatedAltMethod("event_unsubscribe");
+
     eventname = ev->GetString(1);
 
     evType = EventNameToType(eventname, NULL);
@@ -6919,6 +6943,42 @@ void ScriptThread::UnregisterEvent(Event *ev)
     ev->AddInteger(0);
 }
 
+void ScriptThread::SubscribeEvent(Event *ev)
+{
+    str eventName;
+    ScriptDelegate *delegate;
+    ScriptThreadLabel label;
+
+    eventName = ev->GetString(1);
+
+    delegate = ScriptDelegate::GetScriptDelegate(eventName);
+    if (!delegate) {
+        throw ScriptException("Invalid event '%s'", eventName.c_str());
+    }
+
+    label.SetThread(ev->GetValue(2));
+
+    delegate->Register(label);
+}
+
+void ScriptThread::UnsubscribeEvent(Event *ev)
+{
+    str eventName;
+    ScriptDelegate* delegate;
+    ScriptThreadLabel label;
+
+    eventName = ev->GetString(1);
+
+    delegate = ScriptDelegate::GetScriptDelegate(eventName);
+    if (!delegate) {
+        throw ScriptException("Invalid event '%s'", eventName.c_str());
+    }
+
+    label.SetThread(ev->GetValue(2));
+
+    delegate->Unregister(label);
+}
+
 void ScriptThread::TypeOfVariable(Event *ev)
 {
     int             numArgs = 0;
diff --git a/code/fgame/scriptthread.h b/code/fgame/scriptthread.h
index 8b07f17c..bdba0c34 100644
--- a/code/fgame/scriptthread.h
+++ b/code/fgame/scriptthread.h
@@ -345,6 +345,9 @@ public:
     void UnregisterEvent(Event *ev);
     void VisionGetNaked(Event *ev);
     void VisionSetNaked(Event *ev);
+
+    void SubscribeEvent(Event *ev);
+    void UnsubscribeEvent(Event *ev);
 };
 
 class OSFile : public Listener

From e6cbd008714b5337f05c3d27dff2a46185efffda Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:18:55 +0100
Subject: [PATCH 1891/2040] Add script delegates matching common scripted
 events

---
 code/fgame/player.cpp | 16 ++++++++++++++--
 code/fgame/player.h   |  7 +++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 4e07c8a3..96427e56 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -58,6 +58,12 @@ const Vector power_color(0.0, 1.0, 0.0);
 const Vector acolor(1.0, 1.0, 1.0);
 const Vector bcolor(1.0, 0.0, 0.0);
 
+ScriptDelegate Player::scriptDelegate_connected("player_connected", "Sent once when the player connected");
+ScriptDelegate Player::scriptDelegate_disconnecting("player_disconnecting", "The player is disconnecting");
+ScriptDelegate Player::scriptDelegate_spawned("player_spawned", "The player has spawned");
+ScriptDelegate Player::scriptDelegate_damage("player_damage", "The player got hit");
+ScriptDelegate Player::scriptDelegate_kill("player_killed", "The player got killed");
+
 //
 // mohaas 2.0 and above
 //
@@ -2264,6 +2270,8 @@ void Player::Init(void)
 
         Event *ev = new Event;
         ev->AddEntity(this);
+
+        scriptDelegate_connected.Trigger(*ev);
         scriptedEvents[SE_CONNECTED].Trigger(ev);
     }
 
@@ -3217,6 +3225,7 @@ void Player::Killed(Event *ev)
     event->AddInteger(ev->GetInteger(10));
     event->AddEntity(this);
 
+    scriptDelegate_kill.Trigger(*event);
     scriptedEvents[SE_KILL].Trigger(event);
 
     Unregister(STRING_DEATH);
@@ -9704,14 +9713,16 @@ void Player::ArmorDamage(Event *ev)
     event->AddInteger(ev->GetInteger(10));
     event->AddEntity(this);
 
+    scriptDelegate_damage.Trigger(*event);
     scriptedEvents[SE_DAMAGE].Trigger(event);
 }
 
 void Player::Disconnect(void)
 {
     Event *ev = new Event;
-
     ev->AddListener(this);
+
+    scriptDelegate_disconnecting.Trigger(*ev);
     scriptedEvents[SE_DISCONNECTED].Trigger(ev);
 
 //     if (g_gametype->integer != GT_SINGLE_PLAYER) {
@@ -12087,8 +12098,9 @@ bool Player::IsReady(void) const
 void Player::Spawned(void)
 {
     Event *ev = new Event;
-
     ev->AddEntity(this);
+
+    scriptDelegate_spawned.Trigger(*ev);
     scriptedEvents[SE_SPAWN].Trigger(ev);
 }
 
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 3646d6e2..2073125f 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "vehicle.h"
 #include "dm_manager.h"
+#include "scriptdelegate.h"
 
 extern Event EV_Player_EndLevel;
 extern Event EV_Player_GiveCheat;
@@ -313,6 +314,12 @@ private:
 public:
     MulticastDelegate<void (const str& text)> delegate_stufftext;
 
+    static ScriptDelegate scriptDelegate_connected;
+    static ScriptDelegate scriptDelegate_disconnecting;
+    static ScriptDelegate scriptDelegate_spawned;
+    static ScriptDelegate scriptDelegate_damage;
+    static ScriptDelegate scriptDelegate_kill;
+
 public:
     int m_iNumObjectives;
     int m_iObjectivesCompleted;

From 58e12e0141ebbcd7ae1181c0f8b77104d598d222 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:35:01 +0100
Subject: [PATCH 1892/2040] Reset delegates on restart

---
 code/fgame/scriptdelegate.cpp | 14 ++++++++++++++
 code/fgame/scriptdelegate.h   |  6 ++++++
 code/fgame/scriptmaster.cpp   |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/code/fgame/scriptdelegate.cpp b/code/fgame/scriptdelegate.cpp
index fb87c301..42d62034 100644
--- a/code/fgame/scriptdelegate.cpp
+++ b/code/fgame/scriptdelegate.cpp
@@ -169,3 +169,17 @@ ScriptDelegate *ScriptDelegate::GetScriptDelegate(const char *name)
 
     return NULL;
 }
+
+void ScriptDelegate::Reset()
+{
+    list_script.FreeObjectList();
+    list_code.FreeObjectList();
+    list_codeMember.FreeObjectList();
+}
+
+void ScriptDelegate::ResetAllDelegates()
+{
+    for (ScriptDelegate* delegate = root; delegate; delegate = delegate->next) {
+        delegate->Reset();
+    }
+}
diff --git a/code/fgame/scriptdelegate.h b/code/fgame/scriptdelegate.h
index 1472d7d8..2a2387a6 100644
--- a/code/fgame/scriptdelegate.h
+++ b/code/fgame/scriptdelegate.h
@@ -156,12 +156,18 @@ public:
      */
     void Trigger(const Event& ev) const;
 
+    /**
+     * Reset the delegate, unregister callbacks.
+     */
+    void Reset();
+
     /**
      * Search and return the specified script delegate by name.
      *
      * @param name The name to search for
      */
     static ScriptDelegate *GetScriptDelegate(const char *name);
+    static void ResetAllDelegates();
 
     // non-movable and non-copyable
     ScriptDelegate(ScriptDelegate&& other)                 = delete;
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 2ba03830..6900dc42 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -766,6 +766,8 @@ void ScriptMaster::Reset(qboolean samemap)
         StringDict.clear();
         InitConstStrings();
     }
+
+    ScriptDelegate::ResetAllDelegates();
 }
 
 void ScriptMaster::ExecuteRunning(void)

From e37a5f4d0649bad3f773f9122a43d5203e4d9db1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Feb 2025 21:02:06 +0100
Subject: [PATCH 1893/2040] Add "isBot" to check whether or not the player is a
 bot

---
 code/fgame/scriptthread.cpp | 37 +++++++++++++++++++++++++++++++++----
 code/fgame/scriptthread.h   |  1 +
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 409ef1f2..f5a91873 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -2054,6 +2054,15 @@ Event EV_ScriptThread_VisionSetNaked
     "empty string, it will be set to the current map's name.",
     EV_NORMAL
 );
+Event EV_ScriptThread_IsBot
+(
+    "isBot",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Returns 1 if the client is a bot, 0 otherwise. Will return 0 if the entity is not a client.",
+    EV_RETURN
+);
 
 CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_GetCvar,                 &ScriptThread::Getcvar                 },
@@ -2283,6 +2292,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_TraceDetails,            &ScriptThread::TraceDetails            },
     {&EV_ScriptThread_VisionGetNaked,          &ScriptThread::VisionGetNaked          },
     {&EV_ScriptThread_VisionSetNaked,          &ScriptThread::VisionSetNaked          },
+    {&EV_ScriptThread_IsBot,                   &ScriptThread::IsPlayerBot             },
     {NULL,                                     NULL                                   }
 };
 
@@ -6945,8 +6955,8 @@ void ScriptThread::UnregisterEvent(Event *ev)
 
 void ScriptThread::SubscribeEvent(Event *ev)
 {
-    str eventName;
-    ScriptDelegate *delegate;
+    str               eventName;
+    ScriptDelegate   *delegate;
     ScriptThreadLabel label;
 
     eventName = ev->GetString(1);
@@ -6963,8 +6973,8 @@ void ScriptThread::SubscribeEvent(Event *ev)
 
 void ScriptThread::UnsubscribeEvent(Event *ev)
 {
-    str eventName;
-    ScriptDelegate* delegate;
+    str               eventName;
+    ScriptDelegate   *delegate;
     ScriptThreadLabel label;
 
     eventName = ev->GetString(1);
@@ -7147,6 +7157,25 @@ void ScriptThread::TraceDetails(Event *ev)
     ev->AddValue(array);
 }
 
+void ScriptThread::IsPlayerBot(Event *ev)
+{
+    Entity *e = ev->GetEntity(1);
+
+    if (!e || !e->client) {
+        // Invalid entity or not a client
+        ev->AddInteger(0);
+        return;
+    }
+
+    if (!(e->edict->r.svFlags & SVF_BOT)) {
+        ev->AddInteger(0);
+        return;
+    }
+
+    // has SVF_BOT server flag
+    ev->AddInteger(1);
+}
+
 CLASS_DECLARATION(Listener, OSFile, NULL) {
     {NULL, NULL}
 };
diff --git a/code/fgame/scriptthread.h b/code/fgame/scriptthread.h
index bdba0c34..89536853 100644
--- a/code/fgame/scriptthread.h
+++ b/code/fgame/scriptthread.h
@@ -345,6 +345,7 @@ public:
     void UnregisterEvent(Event *ev);
     void VisionGetNaked(Event *ev);
     void VisionSetNaked(Event *ev);
+    void IsPlayerBot(Event *ev);
 
     void SubscribeEvent(Event *ev);
     void UnsubscribeEvent(Event *ev);

From 033b76af143aa79870518798ca322de54649fcb2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:22:29 +0100
Subject: [PATCH 1894/2040] Allow the self object to be specified

---
 code/fgame/scriptdelegate.cpp | 25 +++++++++++++++----------
 code/fgame/scriptdelegate.h   | 21 ++++++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/code/fgame/scriptdelegate.cpp b/code/fgame/scriptdelegate.cpp
index 42d62034..636aa88c 100644
--- a/code/fgame/scriptdelegate.cpp
+++ b/code/fgame/scriptdelegate.cpp
@@ -29,11 +29,11 @@ ScriptRegisteredDelegate_Script::ScriptRegisteredDelegate_Script(const ScriptThr
     : label(inLabel)
 {}
 
-void ScriptRegisteredDelegate_Script::Execute(const Event& ev)
+void ScriptRegisteredDelegate_Script::Execute(Listener *object, const Event& ev)
 {
     Event newev = ev;
 
-    label.Execute(NULL, newev);
+    label.Execute(object, newev);
 }
 
 bool ScriptRegisteredDelegate_Script::operator==(const ScriptRegisteredDelegate_Script& registeredDelegate) const
@@ -48,13 +48,13 @@ ScriptRegisteredDelegate_CodeMember::ScriptRegisteredDelegate_CodeMember(
     , response(inResponse)
 {}
 
-void ScriptRegisteredDelegate_CodeMember::Execute(const Event& ev)
+void ScriptRegisteredDelegate_CodeMember::Execute(Listener *object, const Event& ev)
 {
     if (!object) {
         return;
     }
 
-    (object->*response)(ev);
+    (object->*response)(object, ev);
 }
 
 bool ScriptRegisteredDelegate_CodeMember::operator==(const ScriptRegisteredDelegate_CodeMember& registeredDelegate
@@ -67,9 +67,9 @@ ScriptRegisteredDelegate_Code::ScriptRegisteredDelegate_Code(DelegateResponse in
     : response(inResponse)
 {}
 
-void ScriptRegisteredDelegate_Code::Execute(const Event& ev)
+void ScriptRegisteredDelegate_Code::Execute(Listener *object, const Event& ev)
 {
-    (*response)(ev);
+    (*response)(object, ev);
 }
 
 bool ScriptRegisteredDelegate_Code::operator==(const ScriptRegisteredDelegate_Code& registeredDelegate) const
@@ -134,27 +134,32 @@ void ScriptDelegate::Unregister(Class *object, ScriptRegisteredDelegate_CodeMemb
 }
 
 void ScriptDelegate::Trigger(const Event& ev) const
+{
+    Trigger(NULL, ev);
+}
+
+void ScriptDelegate::Trigger(Listener *object, const Event& ev) const
 {
     size_t i;
 
     {
         const Container<ScriptRegisteredDelegate_Script> tmpList = list_script;
         for (i = 1; i <= tmpList.NumObjects(); i++) {
-            tmpList.ObjectAt(i).Execute(ev);
+            tmpList.ObjectAt(i).Execute(object, ev);
         }
     }
 
     {
         const Container<ScriptRegisteredDelegate_Code> tmpList = list_code;
         for (i = 1; i <= tmpList.NumObjects(); i++) {
-            tmpList.ObjectAt(i).Execute(ev);
+            tmpList.ObjectAt(i).Execute(object, ev);
         }
     }
 
     {
         const Container<ScriptRegisteredDelegate_CodeMember> tmpList = list_codeMember;
         for (i = 1; i <= tmpList.NumObjects(); i++) {
-            tmpList.ObjectAt(i).Execute(ev);
+            tmpList.ObjectAt(i).Execute(object, ev);
         }
     }
 }
@@ -179,7 +184,7 @@ void ScriptDelegate::Reset()
 
 void ScriptDelegate::ResetAllDelegates()
 {
-    for (ScriptDelegate* delegate = root; delegate; delegate = delegate->next) {
+    for (ScriptDelegate *delegate = root; delegate; delegate = delegate->next) {
         delegate->Reset();
     }
 }
diff --git a/code/fgame/scriptdelegate.h b/code/fgame/scriptdelegate.h
index 2a2387a6..3de52c3d 100644
--- a/code/fgame/scriptdelegate.h
+++ b/code/fgame/scriptdelegate.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 class ScriptRegisteredDelegate
 {
 public:
-    void Execute(const Event& ev);
+    void Execute(Listener *object, const Event& ev);
 };
 
 /**
@@ -41,7 +41,7 @@ class ScriptRegisteredDelegate_Script : public ScriptRegisteredDelegate
 public:
     ScriptRegisteredDelegate_Script(const ScriptThreadLabel& inLabel);
 
-    void Execute(const Event& ev);
+    void Execute(Listener *object, const Event& ev);
 
     bool operator==(const ScriptRegisteredDelegate_Script& registeredDelegate) const;
 
@@ -56,12 +56,12 @@ private:
 class ScriptRegisteredDelegate_Code : public ScriptRegisteredDelegate
 {
 public:
-    using DelegateResponse = void (*)(const Event& ev);
+    using DelegateResponse = void (*)(Listener *object, const Event& ev);
 
 public:
     ScriptRegisteredDelegate_Code(DelegateResponse inResponse);
 
-    void Execute(const Event& ev);
+    void Execute(Listener *object, const Event& ev);
 
     bool operator==(const ScriptRegisteredDelegate_Code& registeredDelegate) const;
 
@@ -77,12 +77,12 @@ private:
 class ScriptRegisteredDelegate_CodeMember : public ScriptRegisteredDelegate
 {
 public:
-    using DelegateClassResponse = void (Class::*)(const Event& ev);
+    using DelegateClassResponse = void (Class::*)(Listener *object, const Event& ev);
 
 public:
     ScriptRegisteredDelegate_CodeMember(Class *inObject, DelegateClassResponse inResponse);
 
-    void Execute(const Event& ev);
+    void Execute(Listener *object, const Event& ev);
 
     bool operator==(const ScriptRegisteredDelegate_CodeMember& registeredDelegate) const;
 
@@ -156,6 +156,13 @@ public:
      */
     void Trigger(const Event& ev) const;
 
+    /**
+     * Executes all registered delegates with the specified event.
+     *
+     * @param ev Parameter list
+     */
+    void Trigger(Listener *object, const Event& ev) const;
+
     /**
      * Reset the delegate, unregister callbacks.
      */
@@ -167,7 +174,7 @@ public:
      * @param name The name to search for
      */
     static ScriptDelegate *GetScriptDelegate(const char *name);
-    static void ResetAllDelegates();
+    static void            ResetAllDelegates();
 
     // non-movable and non-copyable
     ScriptDelegate(ScriptDelegate&& other)                 = delete;

From 4aa7e06a5628f195145981c2bf1a231308963157 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:23:54 +0100
Subject: [PATCH 1895/2040] Make ev optional for Trigger()

---
 code/fgame/scriptdelegate.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptdelegate.h b/code/fgame/scriptdelegate.h
index 3de52c3d..0ff04923 100644
--- a/code/fgame/scriptdelegate.h
+++ b/code/fgame/scriptdelegate.h
@@ -154,14 +154,14 @@ public:
      *
      * @param ev Parameter list
      */
-    void Trigger(const Event& ev) const;
+    void Trigger(const Event& ev = Event()) const;
 
     /**
      * Executes all registered delegates with the specified event.
      *
      * @param ev Parameter list
      */
-    void Trigger(Listener *object, const Event& ev) const;
+    void Trigger(Listener *object, const Event& ev = Event()) const;
 
     /**
      * Reset the delegate, unregister callbacks.

From fd94f53e25375a932b12a334cccbec5b835a6d1b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:32:14 +0100
Subject: [PATCH 1896/2040] Add a delegate for player text messages

self = the player who sent the message
first parameter = the text
second parameter = is team message?
---
 code/fgame/player.cpp | 99 +++++++++++++++++++++++++++++--------------
 code/fgame/player.h   |  3 +-
 2 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 96427e56..81b23e04 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -63,6 +63,7 @@ ScriptDelegate Player::scriptDelegate_disconnecting("player_disconnecting", "The
 ScriptDelegate Player::scriptDelegate_spawned("player_spawned", "The player has spawned");
 ScriptDelegate Player::scriptDelegate_damage("player_damage", "The player got hit");
 ScriptDelegate Player::scriptDelegate_kill("player_killed", "The player got killed");
+ScriptDelegate Player::scriptDelegate_textMessage("player_textMessage", "The player just sent a text message");
 
 //
 // mohaas 2.0 and above
@@ -1910,7 +1911,6 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_AdminRights,              &Player::AdminRights                  },
     {&EV_Player_BindWeap,                 &Player::BindWeap                     },
     {&EV_Player_Dive,                     &Player::Dive                         },
-    {&EV_Player_DMMessage,                &Player::EventDMMessage               },
     {&EV_Player_FreezeControls,           &Player::FreezeControls               },
     {&EV_Player_SetTeam,                  &Player::EventSetTeam                 },
     {&EV_Player_GetConnState,             &Player::GetConnState                 },
@@ -5563,7 +5563,7 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     animdone_Legs = true;
                 } else if (legsAnim != "") {
                     float oldTime;
-                    
+
                     if (currentState_Legs == laststate_Legs) {
                         //
                         // Added in OPM
@@ -5577,7 +5577,7 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                         SetPartAnim(legsAnim, legs);
 
                         if (animtimes[m_iPartSlot[legs]] > 0) {
-                            SetTime(m_iPartSlot[legs], fmod(oldTime, animtimes[m_iPartSlot[legs]]));        
+                            SetTime(m_iPartSlot[legs], fmod(oldTime, animtimes[m_iPartSlot[legs]]));
                         }
                     } else {
                         SetPartAnim(legsAnim, legs);
@@ -5685,7 +5685,7 @@ void Player::SelectPreviousWeapon(Event *ev)
         // Fixed in OPM
         //  Fixes the bug that cause infinite loop when the last weapon has no ammo
         //  and the only weapon is an inventory item
-        for (weapon = initialWeapon = PreviousWeapon(activeWeapon); weapon && weapon != activeWeapon; ) {
+        for (weapon = initialWeapon = PreviousWeapon(activeWeapon); weapon && weapon != activeWeapon;) {
             if (g_gametype->integer == GT_SINGLE_PLAYER || !weapon->IsSubclassOfInventoryItem()) {
                 break;
             }
@@ -5734,7 +5734,7 @@ void Player::SelectNextWeapon(Event *ev)
         // Fixed in OPM
         //  Fixes the bug that cause infinite loop when the last weapon has no ammo
         //  and the only weapon is an inventory item
-        for (weapon = initialWeapon = NextWeapon(activeWeapon); weapon && weapon != activeWeapon; ) {
+        for (weapon = initialWeapon = NextWeapon(activeWeapon); weapon && weapon != activeWeapon;) {
             if (g_gametype->integer == GT_SINGLE_PLAYER || !weapon->IsSubclassOfInventoryItem()) {
                 break;
             }
@@ -8932,7 +8932,8 @@ void Player::EquipWeapons()
             }
             break;
         case NA_GERMAN:
-            if (g_target_game < target_game_e::TG_MOHTA || dmflags->integer & DF_OLD_SNIPER
+            if (g_target_game < target_game_e::TG_MOHTA
+                || dmflags->integer & DF_OLD_SNIPER
                 // Added in OPM
                 //  This was also a feature of Daven's fixes
                 //  Use KAR98 for panzer skins
@@ -9725,9 +9726,9 @@ void Player::Disconnect(void)
     scriptDelegate_disconnecting.Trigger(*ev);
     scriptedEvents[SE_DISCONNECTED].Trigger(ev);
 
-//     if (g_gametype->integer != GT_SINGLE_PLAYER) {
-//         dmManager.RemovePlayer(this);
-//     }
+    //     if (g_gametype->integer != GT_SINGLE_PLAYER) {
+    //         dmManager.RemovePlayer(this);
+    //     }
 }
 
 void Player::CallVote(Event *ev)
@@ -10852,16 +10853,12 @@ void Player::EventDMMessage(Event *ev)
     // Print the dm message to console
     sToken = "";
 
-    if (bInstaMessage) {
-        sToken += pTmpInstantMsg;
-    } else {
-        for (i = 2; i <= ev->NumArgs(); i++) {
-            if (i != 2) {
-                sToken += " ";
-            }
-
-            sToken += ev->GetString(i);
+    for (i = 2; i <= ev->NumArgs(); i++) {
+        if (i != 2) {
+            sToken += " ";
         }
+
+        sToken += ev->GetString(i);
     }
     //=============
 
@@ -10872,9 +10869,13 @@ void Player::EventDMMessage(Event *ev)
 
         // Added in OPM
         if (bInstaMessage) {
-            gi.Printf("%s (%zu) says (voice) to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+            gi.Printf(
+                "%s (%zu) says (voice) to everyone: %s\n", client->pers.netname, edict - g_entities, pTmpInstantMsg
+            );
         } else {
-            gi.Printf("%s (%zu) says (text) to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+            gi.Printf(
+                "%s (%zu) says (text) to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str()
+            );
         }
 
         if (!IsSpectator() || g_spectate_allow_full_chat->integer) {
@@ -10917,6 +10918,15 @@ void Player::EventDMMessage(Event *ev)
                 gi.SendServerCommand(i, "%s", szPrintString);
             }
         }
+
+        if (!bInstaMessage) {
+            Event event;
+            // sent to everyone (not a team)
+            event.AddString(sToken);
+            event.AddInteger(false);
+
+            scriptDelegate_textMessage.Trigger(this, event);
+        }
     } else if (iMode < 0) {
         //
         // team message
@@ -10924,7 +10934,7 @@ void Player::EventDMMessage(Event *ev)
 
         // Added in OPM
         if (bInstaMessage) {
-            gi.Printf("%s (%zu) says (voice) to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+            gi.Printf("%s (%zu) says (voice) to team: %s\n", client->pers.netname, edict - g_entities, pTmpInstantMsg);
         } else {
             gi.Printf("%s (%zu) says (text) to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
         }
@@ -10953,7 +10963,7 @@ void Player::EventDMMessage(Event *ev)
                     continue;
                 }
 
-                bSameTeam = static_cast<Player*>(ent->entity)->GetTeam() == GetTeam();
+                bSameTeam = static_cast<Player *>(ent->entity)->GetTeam() == GetTeam();
                 if (bSameTeam) {
                     gi.SendServerCommand(i, "%s", szPrintString);
                 }
@@ -10971,6 +10981,15 @@ void Player::EventDMMessage(Event *ev)
                 }
             }
         }
+
+        if (!bInstaMessage) {
+            Event event;
+            // sent to team
+            event.AddString(sToken);
+            event.AddInteger(true);
+
+            scriptDelegate_textMessage.Trigger(this, event);
+        }
     } else if (iMode <= game.maxclients) {
         ent = &g_entities[iMode - 1];
 
@@ -10990,9 +11009,21 @@ void Player::EventDMMessage(Event *ev)
 
         // Added in OPM
         if (bInstaMessage) {
-            gi.Printf("%s (%zu) says (voice) to client #%d: %s\n", client->pers.netname, edict - g_entities, iMode - 1, sToken.c_str());
+            gi.Printf(
+                "%s (%zu) says (voice) to client #%d: %s\n",
+                client->pers.netname,
+                edict - g_entities,
+                iMode - 1,
+                pTmpInstantMsg
+            );
         } else {
-            gi.Printf("%s (%zu) says (text) to client #%d: %s\n", client->pers.netname, edict - g_entities, iMode - 1, sToken.c_str());
+            gi.Printf(
+                "%s (%zu) says (text) to client #%d: %s\n",
+                client->pers.netname,
+                edict - g_entities,
+                iMode - 1,
+                sToken.c_str()
+            );
         }
 
         gi.SendServerCommand(iMode - 1, "%s", szPrintString);
@@ -11306,17 +11337,21 @@ str Player::TranslateBattleLanguageTokens(const char *string)
 
 void Player::EventIPrint(Event *ev)
 {
-    str         sString = ev->GetString(1);
-    qboolean    iBold   = qfalse;
+    str      sString = ev->GetString(1);
+    qboolean iBold   = qfalse;
 
     if (ev->NumArgs() > 1) {
         iBold = ev->GetInteger(2);
     }
 
     if (iBold) {
-        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(sString.c_str()));
+        gi.SendServerCommand(
+            edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(sString.c_str())
+        );
     } else {
-        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", gi.LV_ConvertString(sString.c_str()));
+        gi.SendServerCommand(
+            edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", gi.LV_ConvertString(sString.c_str())
+        );
     }
 }
 
@@ -11610,12 +11645,12 @@ qboolean Player::CheckCanSwitchTeam(teamtype_t team)
             }
 
             if (pNewTeam->m_players.NumObjects() > numTeamPlayers) {
-                const char* message = gi.LV_ConvertString("That team has enough players. Choose the team that has the lowest number of players.");
+                const char *message = gi.LV_ConvertString(
+                    "That team has enough players. Choose the team that has the lowest number of players."
+                );
 
                 gi.SendServerCommand(
-                    edict - g_entities,
-                    "print \"" HUD_MESSAGE_WHITE "%s\n\"",
-                    gi.LV_ConvertString(message)
+                    edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(message)
                 );
 
                 gi.centerprintf(edict, message);
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 2073125f..93a7986b 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -312,13 +312,14 @@ private:
 #endif
 
 public:
-    MulticastDelegate<void (const str& text)> delegate_stufftext;
+    MulticastDelegate<void(const str& text)> delegate_stufftext;
 
     static ScriptDelegate scriptDelegate_connected;
     static ScriptDelegate scriptDelegate_disconnecting;
     static ScriptDelegate scriptDelegate_spawned;
     static ScriptDelegate scriptDelegate_damage;
     static ScriptDelegate scriptDelegate_kill;
+    static ScriptDelegate scriptDelegate_textMessage;
 
 public:
     int m_iNumObjectives;

From 32f850556e148a5324ce299bae64c1f2f7916bec Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:33:34 +0100
Subject: [PATCH 1897/2040] Set the `self` object when triggering the delegate

---
 code/fgame/player.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 81b23e04..17003f01 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -2271,7 +2271,7 @@ void Player::Init(void)
         Event *ev = new Event;
         ev->AddEntity(this);
 
-        scriptDelegate_connected.Trigger(*ev);
+        scriptDelegate_connected.Trigger(this, *ev);
         scriptedEvents[SE_CONNECTED].Trigger(ev);
     }
 
@@ -3225,7 +3225,7 @@ void Player::Killed(Event *ev)
     event->AddInteger(ev->GetInteger(10));
     event->AddEntity(this);
 
-    scriptDelegate_kill.Trigger(*event);
+    scriptDelegate_kill.Trigger(this, *event);
     scriptedEvents[SE_KILL].Trigger(event);
 
     Unregister(STRING_DEATH);
@@ -9714,7 +9714,7 @@ void Player::ArmorDamage(Event *ev)
     event->AddInteger(ev->GetInteger(10));
     event->AddEntity(this);
 
-    scriptDelegate_damage.Trigger(*event);
+    scriptDelegate_damage.Trigger(this, *event);
     scriptedEvents[SE_DAMAGE].Trigger(event);
 }
 
@@ -9723,7 +9723,7 @@ void Player::Disconnect(void)
     Event *ev = new Event;
     ev->AddListener(this);
 
-    scriptDelegate_disconnecting.Trigger(*ev);
+    scriptDelegate_disconnecting.Trigger(this, *ev);
     scriptedEvents[SE_DISCONNECTED].Trigger(ev);
 
     //     if (g_gametype->integer != GT_SINGLE_PLAYER) {
@@ -12135,7 +12135,7 @@ void Player::Spawned(void)
     Event *ev = new Event;
     ev->AddEntity(this);
 
-    scriptDelegate_spawned.Trigger(*ev);
+    scriptDelegate_spawned.Trigger(this, *ev);
     scriptedEvents[SE_SPAWN].Trigger(ev);
 }
 

From 32411b2a90b43c7613adee73ff1177f022561a91 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:35:04 +0100
Subject: [PATCH 1898/2040] Rename `player_damage` to `player_damaged`.

The name was ambiguous. The delegate is triggered when the player gets hit (getting damaged), and not when the player damages someone else. The name properly matches the action.
---
 code/fgame/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 17003f01..bc4dec7c 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -61,7 +61,7 @@ const Vector bcolor(1.0, 0.0, 0.0);
 ScriptDelegate Player::scriptDelegate_connected("player_connected", "Sent once when the player connected");
 ScriptDelegate Player::scriptDelegate_disconnecting("player_disconnecting", "The player is disconnecting");
 ScriptDelegate Player::scriptDelegate_spawned("player_spawned", "The player has spawned");
-ScriptDelegate Player::scriptDelegate_damage("player_damage", "The player got hit");
+ScriptDelegate Player::scriptDelegate_damage("player_damaged", "The player got hit");
 ScriptDelegate Player::scriptDelegate_kill("player_killed", "The player got killed");
 ScriptDelegate Player::scriptDelegate_textMessage("player_textMessage", "The player just sent a text message");
 

From e31c64e42ee11f5cb16c4e1d9a44b87f0c50b829 Mon Sep 17 00:00:00 2001
From: Bulldozer <bulldozerecske@gmail.com>
Date: Mon, 3 Feb 2025 19:55:20 +0100
Subject: [PATCH 1899/2040] Updated FAQ

Added 2 additional issues and changed the layout.
---
 docs/faq.md | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 0304e505..82895a25 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,11 +1,14 @@
 # Frequently Asked Questions
 
-## 1. My OpenMoHAA client has crashed, leaving the desktop brightened up. How can I fix this without restarting the computer?
+<details>
+<summary>My OpenMoHAA client has crashed, leaving the desktop brightened up. How can I fix this without restarting the computer?</summary>
 
-### 1.1 Lock and Unlock Your Screen (Windows+L)
+## Try one of the following options:
+  
+### 1. Lock and Unlock Your Screen (Windows+L)
 Simply pressing **Win+L** to lock your screen and then logging back in can sometimes reset the brightness to its previous state.
 
-### 1.2. Command Line Fix (Windows)
+### 2. Command Line Fix (Windows)
 If you have an **NVIDIA** or **AMD** GPU, you can try these commands:
 
 - **For NVIDIA GPUs:**
@@ -20,13 +23,13 @@ If you have an **NVIDIA** or **AMD** GPU, you can try these commands:
 - **For AMD GPUs:**
   Open the **AMD Radeon Software** and manually adjust brightness or SDR settings to reset them.
 
-### 1.3. Use a Third-Party Tool to Reset Gamma & Brightness
+### 3. Use a Third-Party Tool to Reset Gamma & Brightness
 Programs like **Gamma Panel** or **f.lux** can help restore modified brightness and gamma settings quickly.
 
-### 1.4. Restart the Graphics Driver (Windows)
+### 4. Restart the Graphics Driver (Windows)
 Press **Win + Ctrl + Shift + B** to restart the graphics driver without rebooting your PC. Your screen will briefly go black, then reset.
 
-### 1.5. Reset Gamma via Xrandr (Linux, Xorg Users)
+### 5. Reset Gamma via Xrandr (Linux, Xorg Users)
 If you’re using Linux with Xorg, try this command to reset gamma settings:
 
 ```bash
@@ -35,10 +38,45 @@ xrandr --output eDP-1 --gamma 1:1:1
 
 (Replace `eDP-1` with the correct display name, which you can find by running `xrandr` in the terminal.)
 
-### 1.6. Changing Display Mode in Windows (Alternative)
+### 6. Changing Display Mode in Windows (Alternative)
 If none of the above solutions work, you can manually reset brightness by changing the display mode:
 1. Right-click on your desktop and select **Display settings**.
 2. Scroll down to **Display resolution** and change it to a different setting.
 3. Revert it back to your original resolution.
 
 This forces Windows to refresh display settings, which may restore brightness.
+</details>
+
+---
+
+<details>
+<summary>I am using a custom map/mod, and I experience glitches that do not occur in the original game. What should I do?</summary>
+
+### 1. Check game file precedences:
+As OpenMoHAA has MultiUser Support (on Windows, user game data is stored in `%APPDATA%\openmohaa`), custom files in this directory ovveride existing files in the game installation folder.
+
+|Example|
+|-|
+| A custom `grenzuebergang_KE.pk3` (placed in the user game data folder) contains a `scripts/effects.shader` file and it does not declare `bh_wood_puff_simple`. As a result, bullet impact effect has no texture.
+However, if `grenzuebergang_KE.pk3` is placed in the game installation folder (`MOHAA/main` or `/mainta` or `/maintt`, where the base `pak*.pk3` files are located) original files take precedence over custom files as they follow the alphabetical order of file naming.
+`Pak1.pk3` contains the original `scripts/effects.shader` where the impact effect is declared; therefore, the player does not experience any issue, as the original file is "loaded" after the custom file. |
+
+### 2. Create a new issue:
+If changing the file precedences has no effect on the glitch you discovered, you have probably found a new bug in the OpenMoHAA engine, so please <a href="https://github.com/openmoh/openmohaa/issues/new/choose">create a new issue</a> for the developers.
+</details>
+
+---
+
+<details>
+<summary>I cannot set my screen resolution in the Options/Video menu. How can I change it?</summary>
+
+### 1. Edit `omconfig.cfg`
+
+If they do not exist, add the following cvars to your OpenMoHAA config file that is located in the user game data folder (on Windows,  `%APPDATA%\openmohaa\main` or `mainta` or `maintt` `\configs\omconfig.cfg`):
+
+> seta r_mode "-1"<br/>
+> seta r_customwidth "1920"<br/>
+> seta r_customheight "1080"
+
+Change the width and height accordingly.
+</details>

From eaa7f10b36d0a6ba7ff8b0b22b08e2be04ef4b1e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:21:18 +0100
Subject: [PATCH 1900/2040] Remove useless print

---
 code/fgame/g_client.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index c7f22dd2..5d7f9775 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -878,8 +878,6 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differen
     gentity_t *ent;
     char       userinfo[MAX_INFO_STRING];
 
-    gi.DPrintf("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\n");
-
     // Added in OPM
     G_BotShift(clientNum);
 

From fb5ed82401beb87d158ee54c81429d762d1241d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:24:35 +0100
Subject: [PATCH 1901/2040] Add events documentation

---
 README.md             |  2 +-
 docs/script/events.md | 89 +++++++++++++++++++++++++++++++++++++++++++
 docs/scripting.md     |  6 +++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 docs/script/events.md
 create mode 100644 docs/scripting.md

diff --git a/README.md b/README.md
index 9b39a56a..44189e4b 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ One of the big multiplayer features are bots. They were introduced for testing a
 ## Features
 
 - [List of new features](docs/features.md)
-- [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html)
+- [Scripting](docs/scripting.md)
 
 ## Compiling
 
diff --git a/docs/script/events.md b/docs/script/events.md
new file mode 100644
index 00000000..b51b53bc
--- /dev/null
+++ b/docs/script/events.md
@@ -0,0 +1,89 @@
+# Events
+
+OpenMoHAA introduces a new way for scripts to monitor for specific events, like players spawning or getting killed.
+
+## Subscribing
+
+Script commands related to events:
+```cpp
+event_subscribe event_name script_label
+    Subscribes to an event, script_label will be called when the event is triggered
+
+event_unsubscribe event_name script_label
+    Unsubscribe from an event, script_label will not be called anymore
+```
+
+Example:
+```cpp
+main:
+    event_subscribe "player_spawned" event_player_spawned
+end
+
+event_player_spawned:
+    iprintlnbold("player entity number " + self.entnum + " just spawned!")
+end
+```
+
+When monitoring is not needed, make sure to call `event_unsubscribe` with the same parameters used when subscribing to events.
+
+## List of events
+
+### Player events
+
+The `self` object in scripts for all events will be the player object.
+
+#### player_connected
+
+The player spawned for the first time.
+
+This event is called:
+- When a client spawns for the first time
+- When the map restarts, or when the map changes (all players)
+- On the next round (all players)
+
+It's called after the player finished spawning with weapons, and before `player_spawned` event.
+
+#### player_damaged
+
+The player just got hit.
+
+The parameters are the same as the `damage` command:
+```
+player_damaged local.attacker local.damage local.inflictor local.position local.direction local.normal local.knockback local.damageflags local.meansofdeath local.location
+```
+
+#### player_disconnecting
+
+The player is disconnecting.
+
+#### player_killed
+
+The player got killed.
+
+The parameters are the same as the `killed` command:
+```
+player_killed local.attacker local.damage local.inflictor local.position local.direction local.normal local.knockback local.damageflags local.meansofdeath local.location
+```
+
+#### player_spawned
+
+The player just spawned. This is called when:
+- The player has entered the battle
+- The player respawned or spawned with weapons
+
+The event can be called even for spectators (when the spectator gets respawned).
+
+It's called after the player finished spawning with weapons.
+
+#### player_textMessage
+
+
+The player sent a text message.
+
+```
+player_textMessage local.text local.is_team
+```
+
+Parameters:
+- local.text: The full text message with battle language tokens applied
+- local.is_team: `1` if it's a team message. `0` otherwise.
diff --git a/docs/scripting.md b/docs/scripting.md
new file mode 100644
index 00000000..d8130122
--- /dev/null
+++ b/docs/scripting.md
@@ -0,0 +1,6 @@
+# Scripting
+
+The documentation is currently incomplete.
+
+- [Event subscription](./script/events.md)
+- [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html) (all classes documentation)
\ No newline at end of file

From ad01c2d966b3a42dafae80144025fb2093fbe5f4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:43:03 +0100
Subject: [PATCH 1902/2040] Fix wrong flags getting checked for allowed weapons

---
 code/fgame/player.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index bc4dec7c..38b69d94 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -8845,25 +8845,25 @@ void Player::EnsurePlayerHasAllowedWeapons()
 
             Q_strncpyz(client->pers.dm_primary, "smg", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "smg")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_SMG)) {
                 return;
             }
 
             Q_strncpyz(client->pers.dm_primary, "mg", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "mg")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_MG)) {
                 return;
             }
 
             Q_strncpyz(client->pers.dm_primary, "shotgun", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "shotgun")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) {
                 return;
             }
 
             Q_strncpyz(client->pers.dm_primary, "heavy", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "heavy")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_ROCKET)) {
                 return;
             }
 

From 5f0a0d036358feac7e6095df1f68289118244279 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:57:07 +0100
Subject: [PATCH 1903/2040] Update events documentation

---
 docs/script/events.md | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/docs/script/events.md b/docs/script/events.md
index b51b53bc..eb015ded 100644
--- a/docs/script/events.md
+++ b/docs/script/events.md
@@ -1,10 +1,10 @@
 # Events
 
-OpenMoHAA introduces a new way for scripts to monitor for specific events, like players spawning or getting killed.
+OpenMoHAA introduces a new way for scripts to monitor for specific events, like players spawning or getting killed. Multiple scripts can subscribe to the same events.
 
 ## Subscribing
 
-Script commands related to events:
+Commands related to events:
 ```cpp
 event_subscribe event_name script_label
     Subscribes to an event, script_label will be called when the event is triggered
@@ -13,10 +13,15 @@ event_unsubscribe event_name script_label
     Unsubscribe from an event, script_label will not be called anymore
 ```
 
-Example:
+When an event is not needed anymore, make sure to call `event_unsubscribe` with the same parameters used when subscribing to the event.
+
+### Example
+
 ```cpp
 main:
     event_subscribe "player_spawned" event_player_spawned
+    // Can specify another script:
+    //event_subscribe "player_spawned" global/test_script::event_player_spawned
 end
 
 event_player_spawned:
@@ -24,24 +29,22 @@ event_player_spawned:
 end
 ```
 
-When monitoring is not needed, make sure to call `event_unsubscribe` with the same parameters used when subscribing to events.
-
 ## List of events
 
 ### Player events
 
-The `self` object in scripts for all events will be the player object.
+The `self` object is the player object for all triggered player events.
 
 #### player_connected
 
-The player spawned for the first time.
+The player entered the game.
 
-This event is called:
+Called when:
+- On the next round (for all players)
 - When a client spawns for the first time
-- When the map restarts, or when the map changes (all players)
-- On the next round (all players)
+- When the map restarts, or when the map changes (for all players)
 
-It's called after the player finished spawning with weapons, and before `player_spawned` event.
+This is called after the player finished spawning, and before `player_spawned` event.
 
 #### player_damaged
 
@@ -67,17 +70,18 @@ player_killed local.attacker local.damage local.inflictor local.position local.d
 
 #### player_spawned
 
-The player just spawned. This is called when:
+The player just spawned.
+
+Called when:
 - The player has entered the battle
 - The player respawned or spawned with weapons
 
+This is called after the player finished spawning.
+
 The event can be called even for spectators (when the spectator gets respawned).
 
-It's called after the player finished spawning with weapons.
-
 #### player_textMessage
 
-
 The player sent a text message.
 
 ```

From 330b45a1ed734febbba0d9ce5ba646be3eb8d403 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:27:44 +0100
Subject: [PATCH 1904/2040] Fix container object list not constructed when
 loading

---
 code/fgame/archive.h | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/code/fgame/archive.h b/code/fgame/archive.h
index 71a649dd..45033055 100644
--- a/code/fgame/archive.h
+++ b/code/fgame/archive.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -153,7 +153,7 @@ public:
 
     void ArchiveRaw(void *data, size_t size);
     void ArchiveObject(Class *obj);
-    void ArchiveObject(SafePtrBase* obj); // Added in OPM
+    void ArchiveObject(SafePtrBase *obj); // Added in OPM
 
     qboolean ObjectPositionExists(void *obj);
 
@@ -167,23 +167,29 @@ public:
 template<class Type>
 inline void Container<Type>::Archive(Archiver& arc, void (*ArchiveFunc)(Archiver& arc, Type *obj))
 {
-    int num;
-    int i;
+    Type *obj;
+    int   num;
+    int   i;
 
     if (arc.Loading()) {
         arc.ArchiveInteger(&num);
         Resize(num);
-    } else {
-        num = numobjects;
-        arc.ArchiveInteger(&num);
-    }
 
-    for (i = 1; i <= num; i++) {
         if (num > numobjects) {
             numobjects = num;
         }
 
-        ArchiveFunc(arc, &objlist[i - 1]);
+        for (i = 0; i < num; i++) {
+            obj = new (objlist + i) Type();
+            ArchiveFunc(arc, obj);
+        }
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+            ArchiveFunc(arc, &objlist[i]);
+        }
     }
 }
 
@@ -303,7 +309,7 @@ void con_set<key, value>::Archive(Archiver& arc)
 
         defaultEntry = e;
     } else {
-#ifndef NDEBUG
+#    ifndef NDEBUG
         int total;
 
         total = 0;
@@ -316,13 +322,13 @@ void con_set<key, value>::Archive(Archiver& arc)
         }
         // it must match the number of elements
         assert(total == count);
-#else
+#    else
         for (i = 0; i < tableLength; i++) {
             for (e = table[i]; e != NULL; e = e->next) {
                 e->Archive(arc);
             }
         }
-#endif
+#    endif
     }
 }
 

From 0b12d160bb2adc464136eed95eec2d0d03b244d4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:28:13 +0100
Subject: [PATCH 1905/2040] Properly construct all objects that has been
 allocated with AddObjectAt()

---
 code/qcommon/container.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/container.h b/code/qcommon/container.h
index c045f20f..8ec8b020 100644
--- a/code/qcommon/container.h
+++ b/code/qcommon/container.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -216,11 +216,17 @@ int Container<Type>::AddUniqueObject(const Type& obj)
 template<class Type>
 void Container<Type>::AddObjectAt(int index, const Type& obj)
 {
+    int i;
+
     if (index > maxobjects) {
         Resize(index);
     }
 
     if (index > numobjects) {
+        for (i = numobjects; i < index; i++) {
+            new (objlist + i) Type();
+        }
+
         numobjects = index;
     }
 

From 6f9e710ec91fc6774ac0c9f89a09891d80e25b50 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 22:12:11 +0100
Subject: [PATCH 1906/2040] Update events documentation

---
 docs/script/events.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/script/events.md b/docs/script/events.md
index eb015ded..74bad85b 100644
--- a/docs/script/events.md
+++ b/docs/script/events.md
@@ -40,9 +40,9 @@ The `self` object is the player object for all triggered player events.
 The player entered the game.
 
 Called when:
-- On the next round (for all players)
 - When a client spawns for the first time
 - When the map restarts, or when the map changes (for all players)
+- On the next round (for all players)
 
 This is called after the player finished spawning, and before `player_spawned` event.
 
@@ -89,5 +89,5 @@ player_textMessage local.text local.is_team
 ```
 
 Parameters:
-- local.text: The full text message with battle language tokens applied
-- local.is_team: `1` if it's a team message. `0` otherwise.
+- local.text: The raw text message the client sent to the server
+- local.is_team: `1` if it's a team message. `0` otherwise (everyone)

From 2f75092d8b202145fc225e80bd622fdd9b85f9d1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 23:42:38 +0100
Subject: [PATCH 1907/2040] Reserve console name for DMMessage

---
 code/fgame/player.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 38b69d94..ea4140a1 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10633,6 +10633,13 @@ void Player::EventDMMessage(Event *ev)
         return;
     }
 
+    if (!Q_stricmp(client->pers.netname, "console")) {
+        // Added in OPM
+        //  Reserved name
+        gi.Printf( "Client %d trying to send a message using a reserved name ('%s')\n", edict - g_entities, client->pers.netname);
+        return;
+    }
+
     sToken = ev->GetString(2);
 
     // Check for taunts

From a1e7afac764a686385e081738cdca59a7db70d69 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Feb 2025 23:51:40 +0100
Subject: [PATCH 1908/2040] Prevent using a trick to spoof another name in 1.11
 and below

---
 code/fgame/player.cpp | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index ea4140a1..273fe84c 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -10636,7 +10636,11 @@ void Player::EventDMMessage(Event *ev)
     if (!Q_stricmp(client->pers.netname, "console")) {
         // Added in OPM
         //  Reserved name
-        gi.Printf( "Client %d trying to send a message using a reserved name ('%s')\n", edict - g_entities, client->pers.netname);
+        gi.Printf(
+            "Client %d trying to send a message using a reserved name ('%s')\n",
+            edict - g_entities,
+            client->pers.netname
+        );
         return;
     }
 
@@ -10819,6 +10823,13 @@ void Player::EventDMMessage(Event *ev)
         Q_strcat(szPrintString, sizeof(szPrintString), ":");
         iStringLength = strlen(szPrintString);
 
+        // Added in OPM.
+        //  Checks for comments in string (as COM_Parse will parse them)
+        //  This was fixed in 2.0 but make the fix compatible with older versions
+        if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN && strstr(client->pers.netname, "/*")) {
+            met_comment = true;
+        }
+
         for (i = 2; i <= ev->NumArgs(); i++) {
             sToken = ev->GetString(i);
             // Added in 2.40
@@ -10830,13 +10841,7 @@ void Player::EventDMMessage(Event *ev)
                 break;
             }
 
-            // Added in OPM.
-            //  Checks for comments in string (as COM_Parse will parse them)
-            if (strstr(sToken, "/*")) {
-                met_comment = true;
-            }
-
-            if (strstr(sToken, "*/") && met_comment) {
+            if (met_comment && strstr(sToken, "*/")) {
                 // ignore messages containing comments
                 return;
             }
@@ -10849,9 +10854,11 @@ void Player::EventDMMessage(Event *ev)
     Q_strcat(szPrintString, sizeof(szPrintString), "\n");
 
     // ignore names containing comments
-    if (strstr(client->pers.netname, "//")
-        || (strstr(client->pers.netname, "/*") && strstr(client->pers.netname, "*/"))) {
-        return;
+    if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+        if (strstr(client->pers.netname, "//")
+            || (strstr(client->pers.netname, "/*") && strstr(client->pers.netname, "*/"))) {
+            return;
+        }
     }
 
     //

From ca2322a4da9d0df5785bd829558926c377f283f4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:03:30 +0100
Subject: [PATCH 1909/2040] Add recursive check in Com_Printf

This prevents recursive call to Com_Printf during localization and also remove localization errors
---
 code/qcommon/common.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 5da3f9c5..64c46a3e 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -223,8 +223,13 @@ A raw string should NEVER be passed as fmt, because of "%f" type crashers.
 void QDECL Com_Printf( const char *fmt, ... ) {
 	va_list		argptr;
 	char		msg[MAXPRINTMSG];
-  static qboolean opening_qconsole = qfalse;
+	static qboolean opening_qconsole = qfalse;
+	static qboolean recursive_count = qfalse;
 
+	if (recursive_count) {
+		return;
+	}
+	recursive_count = qtrue;
 
 	va_start (argptr,fmt);
 	Q_vsnprintf (msg, sizeof(msg), fmt, argptr);
@@ -239,6 +244,7 @@ void QDECL Com_Printf( const char *fmt, ... ) {
     // TTimo nooo .. that would defeat the purpose
 		//rd_flush(rd_buffer);
 		//*rd_buffer = 0;
+		recursive_count--;
 		return;
 	}
 
@@ -341,7 +347,9 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 
 			FS_Write(msg, msgLen, logfile);
 		}
-	}
+    }
+
+    recursive_count--;
 }
 
 

From 8ac186ce17af985496d012e0bb7adea0d0aafc66 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:08:16 +0100
Subject: [PATCH 1910/2040] Mark Archive() as override

---
 code/fgame/smokegrenade.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/smokegrenade.h b/code/fgame/smokegrenade.h
index 6f20491e..15b6f710 100644
--- a/code/fgame/smokegrenade.h
+++ b/code/fgame/smokegrenade.h
@@ -48,7 +48,7 @@ public:
 
     void Think() override;
 
-    void Archive(Archiver& arc);
+    void Archive(Archiver& arc) override;
 
     void      setOwner(Sentient *other);
     Sentient *getOwner() const;

From 49335ba8a8ecbe8963cca1b4d67bdaa44636436e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:08:37 +0100
Subject: [PATCH 1911/2040] Fix improper check of dir->path empty string

---
 code/qcommon/files.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index b5fbfb49..f3e5ccbd 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -4379,7 +4379,7 @@ void FS_FileTime(const char *filename, char *date, char *size)
     // but look through all searchpaths
     //ospath = FS_BuildOSPath(fs_homepath->string, fs_gamedir, filename);
     for (auto search = fs_searchpaths; search; search = search->next) {
-        if (search->dir != NULL && search->dir->path != NULL) {
+        if (search->dir != NULL && search->dir->path[0]) {
             ospath = FS_BuildOSPath(search->dir->path, fs_gamedir, filename);
             result = stat(ospath, &fileStat);
             if (result != -1) {

From ee385abfefddcadf1b45e12c3c6f79d69a2ccd2f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Feb 2025 18:52:46 +0100
Subject: [PATCH 1912/2040] Update links to third-party libraries

---
 docs/compiling.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/compiling.md b/docs/compiling.md
index df4930d5..0eb3f76d 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -38,8 +38,8 @@ Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compi
 
 Visual Studio (2019 or 2022) is generally preferred.
 
-Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
-OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/tag/1.24.1 rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
+Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/latest
+OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/latest rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
 
 Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.
 

From c77fcd2cbcb03f1c064b96d7460f4b0a2273c8cd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Feb 2025 21:28:37 +0100
Subject: [PATCH 1913/2040] Clear the edict model when freeing the edict

This fixes an issue where configstrings or game state chars would overflow when many models (such as actors with random headmodels/headskins) are spawned
---
 code/fgame/level.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 9824be9f..05ee31ac 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -1754,6 +1754,10 @@ void Level::FreeEdict(gentity_t *ed)
 {
     gclient_t *client;
 
+    // clear the model so it decreases the user count
+    // and free memory if the model is not used anywhere
+    gi.clearmodel(ed);
+
     // unlink from world
     gi.unlinkentity(ed);
 

From fd4f5e7d518d1c8ccfe3dd583ec9ef771b4a2a17 Mon Sep 17 00:00:00 2001
From: Richard Radics <richard.radics@supercharge.io>
Date: Tue, 4 Feb 2025 22:14:52 +0100
Subject: [PATCH 1914/2040] fix: fix elapsed time and logged date in loadgame
 ui

fixes #545
---
 code/client/cl_uiloadsave.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_uiloadsave.cpp b/code/client/cl_uiloadsave.cpp
index ac682170..206bb38b 100644
--- a/code/client/cl_uiloadsave.cpp
+++ b/code/client/cl_uiloadsave.cpp
@@ -333,6 +333,7 @@ str FAKKLoadGameItem::getListItemString(int which) const
         {
             int numseconds;
             int numseconds_hours;
+            int seconds;
 
             // hours
             numseconds = atol(strings[1]);
@@ -341,17 +342,18 @@ str FAKKLoadGameItem::getListItemString(int which) const
 
             // minutes
             numseconds_hours = numseconds % 3600;
-            if (numseconds_hours / 60 <= 9) {
+            if (numseconds_hours / 60 < 10) {
                 itemstring += "0";
             }
             itemstring += (numseconds_hours / 60);
             itemstring += ":";
 
             // seconds
-            if (numseconds_hours / 60 <= 9) {
+            seconds = numseconds_hours % 60;
+            if (seconds < 10) {
                 itemstring += "0";
             }
-            itemstring += (numseconds_hours % 60);
+            itemstring += seconds;
         }
         break;
     case 2:
@@ -360,7 +362,7 @@ str FAKKLoadGameItem::getListItemString(int which) const
             char   buffer[2048];
 
             time = atol(strings[2]);
-            strftime(buffer, sizeof(buffer), "%a %b %d %H:%M:%S %Y", localtime(&time));
+            strftime(buffer, sizeof(buffer), "%a %b %d %Y %H:%M:%S", localtime(&time));
             itemstring = buffer;
         }
         break;

From fcba3bed95eb4079ad3386b5eeb0fd1a95ab26c8 Mon Sep 17 00:00:00 2001
From: Richard Radics <richard.radics@supercharge.io>
Date: Wed, 5 Feb 2025 21:46:29 +0100
Subject: [PATCH 1915/2040] feat: add GameSpy service unavailable dialog

resolves #127
---
 code/client/cl_ui.cpp        |   2 +
 code/client/cl_uigamespy.cpp | 109 +++++++++++++++++++++++++++++++++++
 code/client/cl_uigamespy.h   |  48 +++++++++++++++
 3 files changed, 159 insertions(+)
 create mode 100644 code/client/cl_uigamespy.cpp
 create mode 100644 code/client/cl_uigamespy.h

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 8e1a6b81..7610bd00 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_version.h"
 
 #include "cl_ui.h"
+#include "cl_uigamespy.h"
 
 #include <ctime>
 
@@ -5346,6 +5347,7 @@ void CL_InitializeUI(void)
     Cmd_AddCommand("setreturnmenu", UI_SetReturnMenuToCurrent);
     Cmd_AddCommand("gotoreturnmenu", UI_PushReturnMenu_f);
     Cmd_AddCommand("salesscreen", UI_SalesScreen_f);
+    Cmd_AddCommand("launchgamespy", UI_LaunchGameSpy_f);
 
     if (developer->integer) {
         UColor bgColor;
diff --git a/code/client/cl_uigamespy.cpp b/code/client/cl_uigamespy.cpp
new file mode 100644
index 00000000..69b0d296
--- /dev/null
+++ b/code/client/cl_uigamespy.cpp
@@ -0,0 +1,109 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// cl_uigamespy.cpp
+#include "cl_uigamespy.h"
+
+CLASS_DECLARATION(UIFloatingWindow, GameSpyDialog, NULL) {
+    {&W_Deactivated, &UIFloatingWindow::ClosePressed},
+    {NULL, NULL}
+};
+
+GameSpyDialog::GameSpyDialog() {    
+    overlay = new UIButton();
+    overlay->InitFrame(NULL, 
+        UIRect2D(0, 0, uid.vidWidth, uid.vidHeight),
+        0);    
+    overlay->setBackgroundColor(UColor(0, 0, 0, 0.5f), true);
+    overlay->AllowActivate(true);
+    
+    overlay->Connect(this, W_Button_Pressed, W_Deactivated);
+
+    Connect(this, W_Deactivated, W_Deactivated);
+
+    AddFlag(WF_ALWAYS_TOP);
+}
+
+GameSpyDialog::~GameSpyDialog() {
+    if (overlay) {
+        delete overlay;
+        overlay = NULL;
+    }
+
+    if (label) {
+        delete label;
+        label = NULL;
+    }
+
+    if (closeButton) {
+        delete closeButton;
+        closeButton = NULL;
+    }
+}
+
+void GameSpyDialog::FrameInitialized(void) {
+    UIFloatingWindow::FrameInitialized();
+    
+    label = new UILabel();
+    
+    label->InitFrame(getChildSpace(), getChildSpace()->getClientFrame(), 0);
+    label->setTitle("GameSpy's multiplayer matchmaking\n"
+        "and server browsing services, which were\n"
+        "essential for online gaming in many classic\n"
+        "titles including Medal of Honor: Allied Assault,\n"
+        "were permanently shut down in 2014.");
+    label->setForegroundColor(UHudColor);
+
+    closeButton = new UIButton();
+    closeButton->InitFrame(getChildSpace(), 
+        UIRect2D(100, 150, 100, 30),
+        0);
+    closeButton->setTitle("Close");
+    closeButton->AllowActivate(true);
+    closeButton->Connect(this, W_Button_Pressed, W_Deactivated);
+}
+
+void GameSpyDialog::Create(UIWidget* parent, const UIRect2D& rect, const char* title, const UColor& bgColor, const UColor& fgColor) 
+{
+    // First call parent's Create
+    UIFloatingWindow::Create(parent, rect, title, bgColor, fgColor);
+    
+    // After creation, find minimize button by name and hide it
+    for(UIWidget* child = getFirstChild(); child; child = getNextChild(child)) {
+        if (strcmp(child->getName(), "minimizebutton") == 0) {
+            child->setShow(false);
+            break;
+        }
+    }
+}
+
+void UI_LaunchGameSpy_f(void) {
+    GameSpyDialog *dialog = new GameSpyDialog();
+
+    dialog->Create(
+        NULL,
+        UIRect2D((uid.vidWidth - 300) / 2, (uid.vidHeight - 200) / 2, 300, 200),
+        "GameSpy",
+        UColor(0.15f, 0.195f, 0.278f),
+        UHudColor
+    );
+}
diff --git a/code/client/cl_uigamespy.h b/code/client/cl_uigamespy.h
new file mode 100644
index 00000000..d2e78071
--- /dev/null
+++ b/code/client/cl_uigamespy.h
@@ -0,0 +1,48 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// cl_gamespy.h
+#ifndef __CL_GAMESPY_H__
+#define __CL_GAMESPY_H__
+
+#include "cl_ui.h"
+#include "keycodes.h"
+
+class GameSpyDialog : public UIFloatingWindow {
+private:
+    UIButton    *overlay;
+    UILabel     *label;
+    UIButton    *closeButton;
+
+protected:
+	void		FrameInitialized( void ) override;
+
+public:
+    GameSpyDialog();
+    ~GameSpyDialog();
+    void Create(UIWidget* parent, const UIRect2D& rect, const char* title, const UColor& bgColor, const UColor& fgColor);
+
+    CLASS_PROTOTYPE(GameSpyDialog);
+};
+
+void UI_LaunchGameSpy_f(void);
+#endif

From 54753caf946d54b791285fb284add950b8defdb4 Mon Sep 17 00:00:00 2001
From: Bulldozer <bulldozerecske@gmail.com>
Date: Thu, 6 Feb 2025 21:24:44 +0100
Subject: [PATCH 1916/2040] Updated FAQ

Added 1 new FAQ and refined format.
---
 docs/faq.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 6 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 82895a25..6f54759f 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -53,7 +53,7 @@ This forces Windows to refresh display settings, which may restore brightness.
 <summary>I am using a custom map/mod, and I experience glitches that do not occur in the original game. What should I do?</summary>
 
 ### 1. Check game file precedences:
-As OpenMoHAA has MultiUser Support (on Windows, user game data is stored in `%APPDATA%\openmohaa`), custom files in this directory ovveride existing files in the game installation folder.
+As OpenMoHAA has MultiUser Support (on Windows, user game data is stored in `%APPDATA%\openmohaa`), custom files in this directory override existing files in the game installation folder.
 
 |Example|
 |-|
@@ -70,13 +70,57 @@ If changing the file precedences has no effect on the glitch you discovered, you
 <details>
 <summary>I cannot set my screen resolution in the Options/Video menu. How can I change it?</summary>
 
-### 1. Edit `omconfig.cfg`
+### Edit `omconfig.cfg`:
 
-If they do not exist, add the following cvars to your OpenMoHAA config file that is located in the user game data folder (on Windows,  `%APPDATA%\openmohaa\main` or `mainta` or `maintt` `\configs\omconfig.cfg`):
+If they do not exist, add the following console variables (cvars) to your `omconfig.cfg`[^1]
 
-> seta r_mode "-1"<br/>
-> seta r_customwidth "1920"<br/>
-> seta r_customheight "1080"
+```
+seta r_mode "-1"
+seta r_customwidth "1920"
+seta r_customheight "1080"
+```
+
+### or (alternatively) run the game with command line parameters:
+
+Launch your OpenMoHAA client with the following:
+
+```
++set r_mode -1 +set r_customwidth 1920 +set r_customheight 1080
+```
 
 Change the width and height accordingly.
+
 </details>
+
+---
+
+<details>
+<summary>Console does not show up in OpenMoHAA. How can I enable it?</summary>
+
+### 1. Check if console is enabled
+
+In the Options -> Advanced menu, make sure that the checkbox is checked (red "X") at the Console.
+Alternatively, check if the value is equal to 1 for the following cvar in `omconfig.cfg`[^1]:
+```
+seta ui_console "1"
+```
+
+### 2. Check Console keys cvar
+
+OpenMoHAA introduces a new cvar that stores the keys to open up console. Edit the following cvar in your `omconfig.cfg`[^1]:
+
+```
+seta cl_consoleKeys "~ ` 0x7e 0x60"
+```
+
+As you see the default variable above, you can add multiple keys (between the quotation marks, divided by spaces) to display/hide the console. 
+
+> bind ` "toggleconsole" is not to be used anymore.
+</details>
+
+
+---
+
+Footnotes:
+
+[^1]: omconfig.cfg is the OpenMoHAA configuration file that is located in the user game data folder (on Windows,  `%APPDATA%\openmohaa\main` or `mainta` or `maintt` `\configs\omconfig.cfg`)

From 3c836144e29d57a0994154c1f337db632ea65939 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:41:50 +0100
Subject: [PATCH 1917/2040] Move widget object creation from the constructor to
 FrameInitialized()

---
 code/client/cl_uigamespy.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/code/client/cl_uigamespy.cpp b/code/client/cl_uigamespy.cpp
index 69b0d296..a3b05153 100644
--- a/code/client/cl_uigamespy.cpp
+++ b/code/client/cl_uigamespy.cpp
@@ -28,18 +28,8 @@ CLASS_DECLARATION(UIFloatingWindow, GameSpyDialog, NULL) {
     {NULL, NULL}
 };
 
-GameSpyDialog::GameSpyDialog() {    
-    overlay = new UIButton();
-    overlay->InitFrame(NULL, 
-        UIRect2D(0, 0, uid.vidWidth, uid.vidHeight),
-        0);    
-    overlay->setBackgroundColor(UColor(0, 0, 0, 0.5f), true);
-    overlay->AllowActivate(true);
-    
-    overlay->Connect(this, W_Button_Pressed, W_Deactivated);
-
-    Connect(this, W_Deactivated, W_Deactivated);
-
+GameSpyDialog::GameSpyDialog()
+    : overlay(NULL) {
     AddFlag(WF_ALWAYS_TOP);
 }
 
@@ -80,6 +70,17 @@ void GameSpyDialog::FrameInitialized(void) {
     closeButton->setTitle("Close");
     closeButton->AllowActivate(true);
     closeButton->Connect(this, W_Button_Pressed, W_Deactivated);
+
+    overlay = new UIButton();
+    overlay->InitFrame(NULL, 
+        UIRect2D(0, 0, uid.vidWidth, uid.vidHeight),
+        0);    
+    overlay->setBackgroundColor(UColor(0, 0, 0, 0.5f), true);
+    overlay->AllowActivate(true);
+    
+    overlay->Connect(this, W_Button_Pressed, W_Deactivated);
+
+    Connect(this, W_Deactivated, W_Deactivated);
 }
 
 void GameSpyDialog::Create(UIWidget* parent, const UIRect2D& rect, const char* title, const UColor& bgColor, const UColor& fgColor) 

From 9922a7095b50a9162bf8d933db79d94047ae0840 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:50:21 +0100
Subject: [PATCH 1918/2040] Activate the control and connect dialog's
 W_Deactivated after its creation

As the control is activated before, the connection should be done after the activation because ActivateControl() sends W_Activated to the UIFloatingWindow, which will cause ActivateControl() to be called again to activate the dialog's title bar button (and would deactivate the gamespy dialog)
---
 code/client/cl_uigamespy.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_uigamespy.cpp b/code/client/cl_uigamespy.cpp
index a3b05153..d8bc83e5 100644
--- a/code/client/cl_uigamespy.cpp
+++ b/code/client/cl_uigamespy.cpp
@@ -79,8 +79,6 @@ void GameSpyDialog::FrameInitialized(void) {
     overlay->AllowActivate(true);
     
     overlay->Connect(this, W_Button_Pressed, W_Deactivated);
-
-    Connect(this, W_Deactivated, W_Deactivated);
 }
 
 void GameSpyDialog::Create(UIWidget* parent, const UIRect2D& rect, const char* title, const UColor& bgColor, const UColor& fgColor) 
@@ -107,4 +105,8 @@ void UI_LaunchGameSpy_f(void) {
         UColor(0.15f, 0.195f, 0.278f),
         UHudColor
     );
+
+    uWinMan.ActivateControl(dialog);
+
+    dialog->Connect(dialog, W_Deactivated, W_Deactivated);
 }

From e8f69e197ca20b475604ac91e725786cd401a840 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:56:24 +0100
Subject: [PATCH 1919/2040] Initialize variables from the class

---
 code/client/cl_uigamespy.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/client/cl_uigamespy.cpp b/code/client/cl_uigamespy.cpp
index d8bc83e5..1c87b4ec 100644
--- a/code/client/cl_uigamespy.cpp
+++ b/code/client/cl_uigamespy.cpp
@@ -29,7 +29,9 @@ CLASS_DECLARATION(UIFloatingWindow, GameSpyDialog, NULL) {
 };
 
 GameSpyDialog::GameSpyDialog()
-    : overlay(NULL) {
+    : overlay(NULL)
+    , label(NULL)
+    , closeButton(NULL) {
     AddFlag(WF_ALWAYS_TOP);
 }
 

From b90bbd9dcfc4ede6009eab402c5be1d3de307370 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:56:49 +0100
Subject: [PATCH 1920/2040] Format document

---
 code/client/cl_uigamespy.cpp | 42 ++++++++++++++++++++----------------
 code/client/cl_uigamespy.h   | 14 ++++++------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/code/client/cl_uigamespy.cpp b/code/client/cl_uigamespy.cpp
index 1c87b4ec..843ae75c 100644
--- a/code/client/cl_uigamespy.cpp
+++ b/code/client/cl_uigamespy.cpp
@@ -25,17 +25,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 CLASS_DECLARATION(UIFloatingWindow, GameSpyDialog, NULL) {
     {&W_Deactivated, &UIFloatingWindow::ClosePressed},
-    {NULL, NULL}
+    {NULL,           NULL                           }
 };
 
 GameSpyDialog::GameSpyDialog()
     : overlay(NULL)
     , label(NULL)
-    , closeButton(NULL) {
+    , closeButton(NULL)
+{
     AddFlag(WF_ALWAYS_TOP);
 }
 
-GameSpyDialog::~GameSpyDialog() {
+GameSpyDialog::~GameSpyDialog()
+{
     if (overlay) {
         delete overlay;
         overlay = NULL;
@@ -52,44 +54,45 @@ GameSpyDialog::~GameSpyDialog() {
     }
 }
 
-void GameSpyDialog::FrameInitialized(void) {
+void GameSpyDialog::FrameInitialized(void)
+{
     UIFloatingWindow::FrameInitialized();
-    
+
     label = new UILabel();
-    
+
     label->InitFrame(getChildSpace(), getChildSpace()->getClientFrame(), 0);
-    label->setTitle("GameSpy's multiplayer matchmaking\n"
+    label->setTitle(
+        "GameSpy's multiplayer matchmaking\n"
         "and server browsing services, which were\n"
         "essential for online gaming in many classic\n"
         "titles including Medal of Honor: Allied Assault,\n"
-        "were permanently shut down in 2014.");
+        "were permanently shut down in 2014."
+    );
     label->setForegroundColor(UHudColor);
 
     closeButton = new UIButton();
-    closeButton->InitFrame(getChildSpace(), 
-        UIRect2D(100, 150, 100, 30),
-        0);
+    closeButton->InitFrame(getChildSpace(), UIRect2D(100, 150, 100, 30), 0);
     closeButton->setTitle("Close");
     closeButton->AllowActivate(true);
     closeButton->Connect(this, W_Button_Pressed, W_Deactivated);
 
     overlay = new UIButton();
-    overlay->InitFrame(NULL, 
-        UIRect2D(0, 0, uid.vidWidth, uid.vidHeight),
-        0);    
+    overlay->InitFrame(NULL, UIRect2D(0, 0, uid.vidWidth, uid.vidHeight), 0);
     overlay->setBackgroundColor(UColor(0, 0, 0, 0.5f), true);
     overlay->AllowActivate(true);
-    
+
     overlay->Connect(this, W_Button_Pressed, W_Deactivated);
 }
 
-void GameSpyDialog::Create(UIWidget* parent, const UIRect2D& rect, const char* title, const UColor& bgColor, const UColor& fgColor) 
+void GameSpyDialog::Create(
+    UIWidget *parent, const UIRect2D& rect, const char *title, const UColor& bgColor, const UColor& fgColor
+)
 {
     // First call parent's Create
     UIFloatingWindow::Create(parent, rect, title, bgColor, fgColor);
-    
+
     // After creation, find minimize button by name and hide it
-    for(UIWidget* child = getFirstChild(); child; child = getNextChild(child)) {
+    for (UIWidget *child = getFirstChild(); child; child = getNextChild(child)) {
         if (strcmp(child->getName(), "minimizebutton") == 0) {
             child->setShow(false);
             break;
@@ -97,7 +100,8 @@ void GameSpyDialog::Create(UIWidget* parent, const UIRect2D& rect, const char* t
     }
 }
 
-void UI_LaunchGameSpy_f(void) {
+void UI_LaunchGameSpy_f(void)
+{
     GameSpyDialog *dialog = new GameSpyDialog();
 
     dialog->Create(
diff --git a/code/client/cl_uigamespy.h b/code/client/cl_uigamespy.h
index d2e78071..8d1117d4 100644
--- a/code/client/cl_uigamespy.h
+++ b/code/client/cl_uigamespy.h
@@ -27,19 +27,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_ui.h"
 #include "keycodes.h"
 
-class GameSpyDialog : public UIFloatingWindow {
+class GameSpyDialog : public UIFloatingWindow
+{
 private:
-    UIButton    *overlay;
-    UILabel     *label;
-    UIButton    *closeButton;
+    UIButton *overlay;
+    UILabel  *label;
+    UIButton *closeButton;
 
 protected:
-	void		FrameInitialized( void ) override;
+    void FrameInitialized(void) override;
 
 public:
     GameSpyDialog();
     ~GameSpyDialog();
-    void Create(UIWidget* parent, const UIRect2D& rect, const char* title, const UColor& bgColor, const UColor& fgColor);
+    void
+    Create(UIWidget *parent, const UIRect2D& rect, const char *title, const UColor& bgColor, const UColor& fgColor);
 
     CLASS_PROTOTYPE(GameSpyDialog);
 };

From 38d9f98221c072cb0edae26ea46b8710521687c2 Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Sat, 8 Feb 2025 03:49:24 +0200
Subject: [PATCH 1921/2040] Update gsPlatformThread.h to include pthread for
 OpenBSD

---
 code/gamespy/common/gsPlatformThread.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/gamespy/common/gsPlatformThread.h b/code/gamespy/common/gsPlatformThread.h
index 85421ea8..7b5cf779 100644
--- a/code/gamespy/common/gsPlatformThread.h
+++ b/code/gamespy/common/gsPlatformThread.h
@@ -89,7 +89,11 @@ extern "C" {
 	} GSICriticalSection;
 	typedef void (*GSThreadFunc)(void *arg);
 
-#elif defined(_UNIX) //_LINUX || _MACOSX
+#elif defined(_UNIX) // Linux, Mac OS X, openbsd, etc.
+	#if defined(__OpenBSD__)
+		#include <pthread.h>
+	#endif
+
 	typedef pthread_mutex_t GSICriticalSection;
 	typedef struct
 	{

From 833408c663750f2cdde1aef0895416779c9e422a Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Sat, 8 Feb 2025 04:03:19 +0200
Subject: [PATCH 1922/2040] Don't link against rt for musl and *BSD platforms

---
 code/sys/CMakeLists.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index fbfee5bd..15e6844a 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -59,14 +59,13 @@ elseif(UNIX)
 			target_link_libraries(syslib INTERFACE execinfo m)
 		else()
 			target_link_libraries(syslib INTERFACE m)
+			if (NOT APPLE)
+				# For when using GLIBC versions older than 2.34
+				target_link_libraries(syslib INTERFACE rt)
+			endif()
 		endif()
 	endif()
 	target_link_libraries(syslib INTERFACE stdc++)
-
-	if (NOT APPLE)
-		# For when using GLIBC versions older than 2.34
-		target_link_libraries(syslib INTERFACE rt)
-	endif()
 endif()
 
 if (APPLE)

From ff3c27ab20614039b9d879abae21f0c04b435302 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Feb 2025 20:28:46 +0100
Subject: [PATCH 1923/2040] Fix assertion when the height is identical between
 vert0 and vert1

---
 code/renderergl1/tr_terrain.c | 2 +-
 code/renderergl2/tr_terrain.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
index bcbab3da..10f73a15 100644
--- a/code/renderergl1/tr_terrain.c
+++ b/code/renderergl1/tr_terrain.c
@@ -144,7 +144,7 @@ static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
     pMinHeight  = (byte *)Q_min((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
     pMaxHeight  = (byte *)Q_max((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
     pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
-    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight);
+    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight || pMinHeight == pMaxHeight);
 
     // Calculate the average Z
     pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
diff --git a/code/renderergl2/tr_terrain.c b/code/renderergl2/tr_terrain.c
index 61fa1f2d..94c5fff2 100644
--- a/code/renderergl2/tr_terrain.c
+++ b/code/renderergl2/tr_terrain.c
@@ -141,7 +141,7 @@ static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
     pMinHeight  = (byte *)Q_min((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
     pMaxHeight  = (byte *)Q_max((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
     pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
-    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight);
+    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight || pMinHeight == pMaxHeight);
 
     // Calculate the average Z
     pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);

From 2aa46f5a52ec2afac9485b6cba667c37254c01e8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Feb 2025 22:22:41 +0100
Subject: [PATCH 1924/2040] Add getters to get facing dir and angles for
 FuncLadder

---
 code/fgame/misc.cpp | 167 ++++++++++++++------------------------------
 code/fgame/misc.h   |   5 +-
 2 files changed, 56 insertions(+), 116 deletions(-)

diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index 7dd84950..14eb47ac 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -146,8 +146,7 @@ If PROJECTILES is set, the trigger will respond to projectiles (rockets, grenade
 
 Event EV_ExplodingWall_StopRotating
 (
-    "stoprotating",
-    EV_DEFAULT,
+    "stoprotating", EV_DEFAULT,
     NULL,
     NULL,
     "Stop rotating the wall.",
@@ -155,17 +154,16 @@ Event EV_ExplodingWall_StopRotating
 );
 Event EV_ExplodingWall_OnGround
 (
-    "checkonground",
-    EV_DEFAULT,
+    "checkonground", EV_DEFAULT,
     NULL,
     NULL,
     "Check if exploding wall is on ground.",
     EV_NORMAL
+
 );
 Event EV_ExplodingWall_AngleSpeed
 (
-    "anglespeed",
-    EV_DEFAULT,
+    "anglespeed", EV_DEFAULT,
     "f",
     "speed",
     "Set the angle speed.",
@@ -173,8 +171,7 @@ Event EV_ExplodingWall_AngleSpeed
 );
 Event EV_ExplodingWall_LandRadius
 (
-    "land_radius",
-    EV_DEFAULT,
+    "land_radius", EV_DEFAULT,
     "f",
     "radius",
     "Set the land radius.",
@@ -182,8 +179,7 @@ Event EV_ExplodingWall_LandRadius
 );
 Event EV_ExplodingWall_LandAngles
 (
-    "land_angles",
-    EV_DEFAULT,
+    "land_angles", EV_DEFAULT,
     "v",
     "angles",
     "Set the land angles.",
@@ -191,15 +187,13 @@ Event EV_ExplodingWall_LandAngles
 );
 Event EV_ExplodingWall_BaseVelocity
 (
-    "base_velocity",
-    EV_DEFAULT,
+    "base_velocity", EV_DEFAULT,
     "v",
     "velocity",
     "Set the base velocity.",
     EV_NORMAL
 );
-Event EV_ExplodingWall_RandomVelocity
-(
+Event EV_ExplodingWall_RandomVelocity(
     "random_velocity",
     EV_DEFAULT,
     "v",
@@ -209,8 +203,7 @@ Event EV_ExplodingWall_RandomVelocity
 );
 Event EV_ExplodingWall_SetDmg
 (
-    "dmg",
-    EV_DEFAULT,
+    "dmg", EV_DEFAULT,
     "i",
     "dmg",
     "Set the damage from the exploding wall.",
@@ -218,17 +211,16 @@ Event EV_ExplodingWall_SetDmg
 );
 Event EV_ExplodingWall_SetExplosions
 (
-    "explosions",
-    EV_DEFAULT,
+    "explosions", EV_DEFAULT,
     "i",
     "explosions",
     "Set the number of explosions.",
     EV_NORMAL
+
 );
 Event EV_ExplodingWall_Setup
 (
-    "setup",
-    EV_CODEONLY,
+    "setup", EV_CODEONLY,
     NULL,
     NULL,
     "Initializes the exploding wall.",
@@ -253,49 +245,41 @@ CLASS_DECLARATION(Trigger, ExplodingWall, "func_explodingwall") {
 };
 
 void ExplodingWall::AngleSpeed(Event *ev)
-
 {
     angle_speed = ev->GetFloat(1);
 }
 
 void ExplodingWall::LandRadius(Event *ev)
-
 {
     land_radius = ev->GetFloat(1);
 }
 
 void ExplodingWall::LandAngles(Event *ev)
-
 {
     land_angles = ev->GetVector(1);
 }
 
 void ExplodingWall::BaseVelocity(Event *ev)
-
 {
     base_velocity = ev->GetVector(1);
 }
 
 void ExplodingWall::RandomVelocity(Event *ev)
-
 {
     random_velocity = ev->GetVector(1);
 }
 
 void ExplodingWall::SetDmg(Event *ev)
-
 {
     dmg = ev->GetInteger(1);
 }
 
 void ExplodingWall::SetExplosions(Event *ev)
-
 {
     explosions = ev->GetInteger(1);
 }
 
 void ExplodingWall::Explode(Event *ev)
-
 {
     Entity *other;
     Vector  pos;
@@ -390,7 +374,6 @@ void ExplodingWall::Explode(Event *ev)
 }
 
 void ExplodingWall::DamageEvent(Event *ev)
-
 {
     Event  *event;
     Entity *inflictor;
@@ -427,7 +410,6 @@ void ExplodingWall::DamageEvent(Event *ev)
 }
 
 void ExplodingWall::GroundDamage(Event *ev)
-
 {
     Entity *inflictor;
     Entity *attacker;
@@ -467,14 +449,12 @@ void ExplodingWall::GroundDamage(Event *ev)
 }
 
 void ExplodingWall::SetupSecondStage(void)
-
 {
     health     = max_health;
     takedamage = DAMAGE_YES;
 }
 
 void ExplodingWall::StopRotating(Event *ev)
-
 {
     avelocity = vec_zero;
     setAngles(land_angles);
@@ -484,7 +464,6 @@ void ExplodingWall::StopRotating(Event *ev)
 }
 
 void ExplodingWall::CheckOnGround(Event *ev)
-
 {
     if ((velocity == vec_zero) && groundentity) {
         Vector delta;
@@ -532,7 +511,6 @@ void ExplodingWall::CheckOnGround(Event *ev)
 }
 
 void ExplodingWall::TouchFunc(Event *ev)
-
 {
     Entity *other;
 
@@ -568,7 +546,6 @@ void ExplodingWall::TouchFunc(Event *ev)
 }
 
 void ExplodingWall::Setup(Event *ev)
-
 {
     if (spawnflags & INVISIBLE) {
         if (Targeted()) {
@@ -650,6 +627,7 @@ Event EV_Teleporter_StopTeleport
     "entity",
     "Releases the entity at the end of the teleport.",
     EV_NORMAL
+
 );
 Event EV_Teleporter_SetThread
 (
@@ -759,7 +737,6 @@ void Teleporter::StartTeleport(Event *ev)
 }
 
 void Teleporter::Teleport(Event *ev)
-
 {
     Entity  *dest;
     int      i;
@@ -873,7 +850,6 @@ void Teleporter::Teleport(Event *ev)
 }
 
 void Teleporter::StopTeleport(Event *ev)
-
 {
     Entity *other;
 
@@ -974,6 +950,7 @@ Event EV_UseAnim_Reset
     NULL,
     "Reset's the Use Anim after it has no longer been touched.",
     EV_NORMAL
+
 );
 Event EV_UseAnim_Thread
 (
@@ -983,15 +960,16 @@ Event EV_UseAnim_Thread
     "label",
     "Sets which thread to use when this UseAnim is triggered.",
     EV_NORMAL
+
 );
 Event EV_UseAnim_Count
 (
-    "count",
-    EV_DEFAULT,
+    "count", EV_DEFAULT,
     "i",
     "newCount",
     "Sets how many times the UseAnim can be triggered.",
     EV_NORMAL
+
 );
 Event EV_UseAnim_TriggerTarget
 (
@@ -1019,6 +997,7 @@ Event EV_UseAnim_SetKey
     "keyName",
     "set the key needed to make this UseAnim function.",
     EV_NORMAL
+
 );
 Event EV_UseAnim_SetState
 (
@@ -1029,8 +1008,7 @@ Event EV_UseAnim_SetState
     "set the state to use for the player.",
     EV_NORMAL
 );
-Event EV_UseAnim_SetCamera
-(
+Event EV_UseAnim_SetCamera(
     "camera",
     EV_DEFAULT,
     "s",
@@ -1047,9 +1025,9 @@ Event EV_UseAnim_SetNumLoops
     "loopCount",
     "set the number of times to loop an animation per use.",
     EV_NORMAL
+
 );
-Event EV_UseAnim_SetDelay
-(
+Event EV_UseAnim_SetDelay(
     "delay",
     EV_DEFAULT,
     "f",
@@ -1120,7 +1098,6 @@ UseAnim::UseAnim()
 }
 
 void UseAnim::Touched(Event *ev)
-
 {
     Entity *other;
 
@@ -1142,7 +1119,6 @@ void UseAnim::Touched(Event *ev)
 }
 
 bool UseAnim::canBeUsed(Entity *activator)
-
 {
     Entity *dest;
 
@@ -1210,7 +1186,6 @@ bool UseAnim::canBeUsed(Entity *activator)
 bool UseAnim::GetInformation(
     Entity *activator, Vector *org, Vector *angles, str *animation, int *loopcount, str *state, str *camera
 )
-
 {
     Entity             *dest;
     UseAnimDestination *uadest;
@@ -1282,7 +1257,6 @@ bool UseAnim::GetInformation(
 }
 
 void UseAnim::TriggerTargets(Entity *activator)
-
 {
     //
     // fire off our trigger target if appropriate
@@ -1312,7 +1286,6 @@ void UseAnim::TriggerTargets(Entity *activator)
 }
 
 void UseAnim::Reset(Event *ev)
-
 {
     //
     // find out if our triggertarget is of type door and only reset if the door is closed
@@ -1363,25 +1336,21 @@ void UseAnim::Reset(Event *ev)
 }
 
 void UseAnim::SetThread(Event *ev)
-
 {
     thread.SetThread(ev->GetValue(1));
 }
 
 void UseAnim::SetDelay(Event *ev)
-
 {
     delay = ev->GetFloat(1);
 }
 
 void UseAnim::SetTriggerTarget(Event *ev)
-
 {
     triggertarget = ev->GetString(1);
 }
 
 void UseAnim::SetCount(Event *ev)
-
 {
     count = ev->GetInteger(1);
 }
@@ -1518,6 +1487,7 @@ Event EV_UseObject_StopThread
     "label",
     "Sets which stop thread to use when this UseObject is finished.",
     EV_NORMAL
+
 );
 Event EV_UseObject_ResetThread
 (
@@ -1527,6 +1497,7 @@ Event EV_UseObject_ResetThread
     "label",
     "Sets which thread to call when resetting.",
     EV_NORMAL
+
 );
 Event EV_UseObject_Count
 (
@@ -1536,6 +1507,7 @@ Event EV_UseObject_Count
     "newCount",
     "Sets how many times the UseObject can be triggered.",
     EV_NORMAL
+
 );
 Event EV_UseObject_Cone
 (
@@ -1545,6 +1517,7 @@ Event EV_UseObject_Cone
     "newCone",
     "Sets the cone in angles of where the Useobject can be used.",
     EV_NORMAL
+
 );
 Event EV_UseObject_Offset
 (
@@ -1554,6 +1527,7 @@ Event EV_UseObject_Offset
     "newOffset",
     "Sets the offset to use for this UseObject.",
     EV_NORMAL
+
 );
 Event EV_UseObject_YawOffset
 (
@@ -1563,6 +1537,7 @@ Event EV_UseObject_YawOffset
     "newYawOffset",
     "Sets the yaw offset to use for this UseObject.",
     EV_NORMAL
+
 );
 Event EV_UseObject_State
 (
@@ -1581,6 +1556,7 @@ Event EV_UseObject_StateBackwards
     "newState",
     "Sets the backward state to use for this UseObject.",
     EV_NORMAL
+
 );
 Event EV_UseObject_TriggerTarget
 (
@@ -1626,6 +1602,7 @@ Event EV_UseObject_Resetting
     NULL,
     "Intermediate function for useobject reset.",
     EV_NORMAL
+
 );
 Event EV_UseObject_DamageTriggered
 (
@@ -1662,6 +1639,7 @@ Event EV_UseObject_UseMaterial
     "nameOfUseMaterial",
     "the name of the material that glows when active.",
     EV_NORMAL
+
 );
 Event EV_UseObject_SetActiveState
 (
@@ -1671,6 +1649,7 @@ Event EV_UseObject_SetActiveState
     NULL,
     "event that sets up the proper skin for the useobject.",
     EV_NORMAL
+
 );
 
 #define MULTI_STATE (1 << 0)
@@ -1821,87 +1800,73 @@ void UseObject::SetActiveState(Event *ev)
 }
 
 void UseObject::SetMoveThread(Event *ev)
-
 {
     move_thread.SetThread(ev->GetValue(1));
 }
 
 void UseObject::SetStopThread(Event *ev)
-
 {
     stop_thread.SetThread(ev->GetValue(1));
 }
 
 void UseObject::SetResetThread(Event *ev)
-
 {
     reset_thread.SetThread(ev->GetValue(1));
 }
 
 void UseObject::ActivateEvent(Event *ev)
-
 {
     active = qtrue;
     PostEvent(EV_UseObject_SetActiveState, 0);
 }
 
 void UseObject::DeactivateEvent(Event *ev)
-
 {
     active = qfalse;
     PostEvent(EV_UseObject_SetActiveState, 0);
 }
 
 void UseObject::SetTriggerTarget(Event *ev)
-
 {
     triggertarget = ev->GetString(1);
 }
 
 void UseObject::SetOffset(Event *ev)
-
 {
     offset = ev->GetVector(1);
 }
 
 void UseObject::SetYawOffset(Event *ev)
-
 {
     yaw_offset = ev->GetFloat(1);
 }
 
 void UseObject::SetCount(Event *ev)
-
 {
     count = ev->GetInteger(1);
 }
 
 void UseObject::SetCone(Event *ev)
-
 {
     cone = cos(DEG2RAD(ev->GetFloat(1)));
 }
 
 void UseObject::SetState(Event *ev)
-
 {
     state = ev->GetString(1);
 }
 
 void UseObject::SetBackwardsState(Event *ev)
-
 {
     state_backwards = ev->GetString(1);
 }
 
 void UseObject::UseMaterialEvent(Event *ev)
-
 {
     useMaterial = ev->GetString(1);
 }
 
 void UseObject::SetResetTime(Event *ev)
-
 {
     reset_time = ev->GetFloat(1);
 }
@@ -1912,7 +1877,6 @@ void UseObject::Reset(Event *ev)
 }
 
 void UseObject::Resetting(Event *ev)
-
 {
     SetActiveState(NULL);
     NewAnim("start");
@@ -1948,7 +1912,6 @@ void UseObject::Resetting(Event *ev)
 }
 
 bool UseObject::canBeUsed(Vector org, Vector dir)
-
 {
     float  dot;
     Vector forward;
@@ -1992,7 +1955,6 @@ bool UseObject::canBeUsed(Vector org, Vector dir)
 }
 
 void UseObject::DamageFunc(Event *ev)
-
 {
     Event  *e;
     Entity *attacker;
@@ -2029,14 +1991,12 @@ void UseObject::DamageFunc(Event *ev)
 }
 
 void UseObject::DamageTriggered(Event *ev)
-
 {
     // grab the attacker from our event
     Stop(ev->GetEntity(1));
 }
 
 void UseObject::Setup(Entity *activator, Vector *org, Vector *ang, str *newstate)
-
 {
     if ((spawnflags & MULTI_STATE) && objectState) {
         *newstate = state_backwards;
@@ -2060,7 +2020,6 @@ void UseObject::Setup(Entity *activator, Vector *org, Vector *ang, str *newstate
 }
 
 void UseObject::Start(Event *ev)
-
 {
     //
     // fire off the move_thread
@@ -2079,7 +2038,6 @@ void UseObject::Start(Event *ev)
 }
 
 bool UseObject::Loop(void)
-
 {
     if (!count) {
         return qfalse;
@@ -2089,7 +2047,6 @@ bool UseObject::Loop(void)
 }
 
 void UseObject::Stop(Entity *activator)
-
 {
     if ((spawnflags & MULTI_STATE) && objectState) {
         NewAnim("start");
@@ -2222,7 +2179,6 @@ MonkeyBars::MonkeyBars()
 }
 
 void MonkeyBars::SetAngleEvent(Event *ev)
-
 {
     dir = ev->GetFloat(1);
 }
@@ -2252,7 +2208,6 @@ HorizontalPipe::HorizontalPipe()
 }
 
 void HorizontalPipe::SetAngleEvent(Event *ev)
-
 {
     dir = ev->GetFloat(1);
 }
@@ -2263,14 +2218,15 @@ void HorizontalPipe::SetAngleEvent(Event *ev)
 
 Event EV_TossObject_SetBounceSound
 (
-    "bouncesound", EV_DEFAULT,
+    "bouncesound",
+    EV_DEFAULT,
     "s",
     "sound",
     "When bouncing, what sound to play on impact",
     EV_NORMAL
+
 );
-Event EV_TossObject_SetBounceSoundChance
-(
+Event EV_TossObject_SetBounceSoundChance(
     "bouncesoundchance",
     EV_DEFAULT,
     "f[0,1]",
@@ -2309,31 +2265,26 @@ TossObject::TossObject(str model)
 }
 
 void TossObject::SetBounceSound(str bounce)
-
 {
     bouncesound = bounce;
 }
 
 void TossObject::SetBounceSound(Event *ev)
-
 {
     bouncesound = ev->GetString(1);
 }
 
 void TossObject::SetBounceSoundChance(float chance)
-
 {
     bouncesoundchance = chance;
 }
 
 void TossObject::SetBounceSoundChance(Event *ev)
-
 {
     bouncesoundchance = ev->GetFloat(1);
 }
 
 void TossObject::Stop(Event *ev)
-
 {
     setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_NOT);
@@ -2345,7 +2296,6 @@ void TossObject::Stop(Event *ev)
 }
 
 void TossObject::Touch(Event *ev)
-
 {
     Entity *ent;
 
@@ -2368,7 +2318,6 @@ void TossObject::Touch(Event *ev)
 }
 
 void TossObject::SetVelocity(float severity)
-
 {
     setSolidType(SOLID_BBOX);
     velocity[0] = 100.0 * crandom();
@@ -2413,8 +2362,7 @@ Pushable object
 
 Event EV_PushObject_Start
 (
-    "start",
-    EV_DEFAULT,
+    "start", EV_DEFAULT,
     NULL,
     NULL,
     "Sets up the pushobject.",
@@ -2423,8 +2371,7 @@ Event EV_PushObject_Start
 
 Event EV_PushObject_SetDamage
 (
-    "dmg",
-    EV_DEFAULT,
+    "dmg", EV_DEFAULT,
     "i",
     "damage",
     "Set the damage.",
@@ -2433,8 +2380,7 @@ Event EV_PushObject_SetDamage
 
 Event EV_PushObject_SetPushSound
 (
-    "pushsound",
-    EV_DEFAULT,
+    "pushsound", EV_DEFAULT,
     "s",
     "sound",
     "Set the pushing sound",
@@ -2464,13 +2410,11 @@ PushObject::PushObject()
 }
 
 void PushObject::SetPushSound(Event *ev)
-
 {
     pushsound = ev->GetString(1);
 }
 
 void PushObject::Start(Event *ev)
-
 {
     // make sure that this touches triggers
     flags |= FL_TOUCH_TRIGGERS;
@@ -2483,7 +2427,6 @@ void PushObject::Start(Event *ev)
 }
 
 qboolean PushObject::canPush(Vector dir)
-
 {
     trace_t trace;
 
@@ -2494,7 +2437,6 @@ qboolean PushObject::canPush(Vector dir)
 }
 
 qboolean PushObject::Push(Entity *pusher, Vector move)
-
 {
     trace_t trace;
 
@@ -2524,13 +2466,11 @@ qboolean PushObject::Push(Entity *pusher, Vector move)
 }
 
 Entity *PushObject::getOwner(void)
-
 {
     return (Entity *)owner;
 }
 
 void PushObject::BlockFunc(Event *ev)
-
 {
     Entity *other;
 
@@ -2544,7 +2484,6 @@ void PushObject::BlockFunc(Event *ev)
 }
 
 void PushObject::SetDamage(Event *ev)
-
 {
     dmg = ev->GetInteger(1);
 }
@@ -2632,6 +2571,7 @@ Event EV_FallingRock_SetBounceSound
     "sound",
     "Set the sound to play when the rock bounces",
     EV_NORMAL
+
 );
 
 CLASS_DECLARATION(Entity, FallingRock, "func_fallingrock") {
@@ -2666,7 +2606,6 @@ FallingRock::FallingRock()
 }
 
 Entity *FallingRock::SetNextBounceDir(void)
-
 {
     Entity *ent;
 
@@ -2686,7 +2625,6 @@ Entity *FallingRock::SetNextBounceDir(void)
 }
 
 void FallingRock::NextBounce(void)
-
 {
     float  time;
     float  distance;
@@ -2729,7 +2667,6 @@ void FallingRock::NextBounce(void)
 }
 
 void FallingRock::Rotate(Event *ev)
-
 {
     float mat[3][3];
     float ang;
@@ -2747,19 +2684,16 @@ void FallingRock::Rotate(Event *ev)
 }
 
 void FallingRock::SetWait(Event *ev)
-
 {
     wait = ev->GetFloat(1);
 }
 
 void FallingRock::SetSpeed(Event *ev)
-
 {
     speed = ev->GetFloat(1);
 }
 
 void FallingRock::SetDmg(Event *ev)
-
 {
     dmg = ev->GetInteger(1);
 }
@@ -2772,13 +2706,11 @@ void FallingRock::SetBounceSound(str sound)
 }
 
 void FallingRock::SetBounceSound(Event *ev)
-
 {
     SetBounceSound(ev->GetString(1));
 }
 
 void FallingRock::Activate(Event *ev)
-
 {
     if (active == 1) {
         return;
@@ -2802,7 +2734,6 @@ void FallingRock::Activate(Event *ev)
 }
 
 void FallingRock::StartFalling(Event *ev)
-
 {
     if (current) {
         return;
@@ -2827,7 +2758,6 @@ void FallingRock::StartFalling(Event *ev)
 }
 
 void FallingRock::Touch(Event *ev)
-
 {
     Entity *other;
 
@@ -2858,7 +2788,6 @@ void FallingRock::Touch(Event *ev)
 }
 
 void FallingRock::Bounce(Event *ev)
-
 {
     Vector delta;
 
@@ -3155,10 +3084,19 @@ void FuncLadder::EnsureForwardOffLadder(Entity *pUser)
     pUser->setOrigin(trace.endpos);
 }
 
+const Vector& FuncLadder::getFacingAngles() const
+{
+    return m_vFacingAngles;
+}
+
+const Vector& FuncLadder::getFacingDir() const
+{
+    return m_vFacingDir;
+}
+
 Event EV_InfoLandmark_Name
 (
-    "landmark_name",
-    EV_DEFAULT,
+    "landmark_name", EV_DEFAULT,
     "s",
     "name",
     "Set the name of this landmark",
@@ -3166,8 +3104,7 @@ Event EV_InfoLandmark_Name
 );
 Event EV_InfoLandmark_SetOrigin
 (
-    "origin",
-    EV_DEFAULT,
+    "origin", EV_DEFAULT,
     "v",
     "origin",
     "Set the origin of the landmark.",
diff --git a/code/fgame/misc.h b/code/fgame/misc.h
index 51909c7f..95f4d2c2 100644
--- a/code/fgame/misc.h
+++ b/code/fgame/misc.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -565,6 +565,9 @@ public:
     void EnsureOverLadder(Entity *pUser);
     void EnsureForwardOffLadder(Entity *pUser);
 
+    const Vector& getFacingAngles() const;
+    const Vector& getFacingDir() const;
+
     void Archive(Archiver& arc) override;
 };
 

From bbac9c559cf3a4c38ef7706538bb78e0111593d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 14 Feb 2025 23:54:15 +0100
Subject: [PATCH 1925/2040] Escape variable name

---
 code/parser/lex_source.txt | 159 ++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 80 deletions(-)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 1b18232c..8ef8afb5 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -29,120 +29,119 @@
 
 #include <stdio.h>
 
-void fprintf2( FILE *f, const char *format, ... )
+void fprintf2(FILE * f, const char *format, ...)
 {
-	va_list va;
-	static char buffer[ 4200 ];
+    va_list     va;
+    static char buffer[4200];
 
-	va_start( va, format );
-	vsprintf( buffer, format, va );
-	va_end( va );
+    va_start(va, format);
+    vsprintf(buffer, format, va);
+    va_end(va);
 
-	gi.Printf( buffer );
+    gi.Printf(buffer);
 }
 
 #define fprintf fprintf2
 
-const char* start_ptr;
-const char* in_ptr;
-extern int prev_yylex;
-extern int out_pos;
-extern int success_pos;
+const char  *start_ptr;
+const char  *in_ptr;
+extern int   prev_yylex;
+extern int   out_pos;
+extern int   success_pos;
 parseStage_e parseStage;
 
 extern yyparsedata parsedata;
 
-void yyllocset(YYLTYPE *loc, uint32_t off)
+void yyllocset(YYLTYPE * loc, uint32_t off)
 {
-	success_pos = out_pos - yyleng + off;
-	loc->sourcePos = success_pos;
-	parsedata.pos = success_pos;
+    success_pos    = out_pos - yyleng + off;
+    loc->sourcePos = success_pos;
+    parsedata.pos  = success_pos;
 }
 
 void yyreducepos(uint32_t off)
 {
-	out_pos -= off;
+    out_pos -= off;
 }
 
-#define YYLEX(n) { yyllocset(&yylloc, 0); prev_yylex = n; return n; }
-#define YYLEXOFF(n, off) { yyllocset(&yylloc, off); prev_yylex = n; return n; }
+#define YYLEX(n)               \
+    {                          \
+        yyllocset(&yylloc, 0); \
+        prev_yylex = n;        \
+        return n;              \
+    }
+#define YYLEXOFF(n, off)         \
+    {                            \
+        yyllocset(&yylloc, off); \
+        prev_yylex = n;          \
+        return n;                \
+    }
 
-#define YY_USER_ACTION \
-{ \
-	out_pos += yyleng - yy_more_len; \
-	yylloc.sourcePos = out_pos; \
-	parsedata.pos = out_pos; \
-}
+#define YY_USER_ACTION                   \
+    {                                    \
+        out_pos += yyleng - yy_more_len; \
+        yylloc.sourcePos = out_pos;      \
+        parsedata.pos    = out_pos;      \
+    }
 
-#define YY_FATAL_ERROR( n ) yylexerror( n )
+#define YY_FATAL_ERROR(n) yylexerror(n)
 
-void yylexerror( const char *msg )
+void yylexerror(const char *msg)
 {
-	gi.DPrintf( "%s\n%s", msg, yytext );
-	assert( 0 );
+    gi.DPrintf("%s\n%s", msg, yytext);
+    assert(0);
 }
 
-static void TextEscapeValue( char *str, size_t len )
+static void TextEscapeValue(char *str, size_t len)
 {
-	char *to = parsetree_malloc( len + 1 );
+    char *to = parsetree_malloc(len + 1);
 
-	yylval.s.val.stringValue = to;
+    yylval.s.val.stringValue = to;
 
-	while( len )
-	{
-		if( *str == '\\' )
-		{
-			if( len == 1 )
-				break;
+    while (len) {
+        if (*str == '\\') {
+            if (len == 1) {
+                break;
+            }
 
-			if( str[1] == 'n' )
-			{
-				*to = '\n';
-				to++;
-			}
-			else if( str[1] == 't' )
-			{
-				*to = '\t';
-				to++;
-			}
-			else if( str[1] == '"' )
-			{
-				*to = '\"';
-				to++;
-			}
-			else
-			{
-				*to = str[1];
-				to++;
-			}
+            if (str[1] == 'n') {
+                *to = '\n';
+                to++;
+            } else if (str[1] == 't') {
+                *to = '\t';
+                to++;
+            } else if (str[1] == '"') {
+                *to = '\"';
+                to++;
+            } else {
+                *to = str[1];
+                to++;
+            }
 
-			len -= 2;
-			str += 2;
-		}
-		else
-		{
-			*to = *str;
-			to++;
-			len--;
-			str++;
-		}
-	}
+            len -= 2;
+            str += 2;
+        } else {
+            *to = *str;
+            to++;
+            len--;
+            str++;
+        }
+    }
 
-	*to = 0;
+    *to = 0;
 }
 
-static void TextValue( char *str, size_t len )
+static void TextValue(char *str, size_t len)
 {
-	char* s = parsetree_malloc(len + 1);
-	strncpy(s, str, len);
-	s[len] = 0;
-	yylval.s.val.stringValue = s;
+    char *s = parsetree_malloc(len + 1);
+    strncpy(s, str, len);
+    s[len]                   = 0;
+    yylval.s.val.stringValue = s;
 }
 
-static bool UseField( void )
+static bool UseField(void)
 {
-	return prev_yylex == TOKEN_PERIOD
-		|| prev_yylex == TOKEN_DOLLAR;
+    return prev_yylex == TOKEN_PERIOD || prev_yylex == TOKEN_DOLLAR;
 }
 
 #define YY_INPUT(buf,result,max_size) \
@@ -193,7 +192,7 @@ identifier	[^\{\}\(\)\[\]\r\n\,:; \t]
 nonexpr		[0-9a-zA-Z_\"'?@#`\.\x80-\xff]
 nonnumeric	[a-zA-Z_\"'?@#`\x80-\xff]
 alphanum	[a-zA-Z0-9_]+
-varname		[a-zA-Z0-9_\"\$]+
+varname		[a-zA-Z0-9_\"$\\]+
 
 %%
 
@@ -210,7 +209,7 @@ varname		[a-zA-Z0-9_\"\$]+
 <VARIABLES>[ \t]*\./([0-9]*[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
 <VARIABLES>\"{string}\"						{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
 <VARIABLES>{varname}						{
-												TextValue(yytext, strlen(yytext));
+												TextEscapeValue(yytext, strlen(yytext));
 												YYLEX(TOKEN_IDENTIFIER);
 											}
 <VARIABLES>[ \t\r\n]						{

From 2c12d4f2de8a34cb94f0a8343930867537d79dc5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Feb 2025 00:46:24 +0100
Subject: [PATCH 1926/2040] Add a newline to ScriptDeprecatedAlt functions

---
 code/script/scriptexception.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptexception.h b/code/script/scriptexception.h
index af987943..44a5ca0c 100644
--- a/code/script/scriptexception.h
+++ b/code/script/scriptexception.h
@@ -48,6 +48,6 @@ public:
 void Error(const char *format, ...);
 
 #define ScriptDeprecated(function) throw ScriptException(function ": DEPRECATED. DON'T USE IT ANYMORE")
-#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " method")
-#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " variable")
+#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " method\n")
+#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " variable\n")
 #define ScriptError                throw ScriptException

From 3af35fa610880bfd1f89a9cd72c51b53cde5bbd2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Feb 2025 00:48:07 +0100
Subject: [PATCH 1927/2040] Correctly parse the function name in
 ScriptDeprecatedAlt

---
 code/script/scriptexception.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/script/scriptexception.h b/code/script/scriptexception.h
index 44a5ca0c..b48aa931 100644
--- a/code/script/scriptexception.h
+++ b/code/script/scriptexception.h
@@ -48,6 +48,6 @@ public:
 void Error(const char *format, ...);
 
 #define ScriptDeprecated(function) throw ScriptException(function ": DEPRECATED. DON'T USE IT ANYMORE")
-#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " method\n")
-#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: " XSTRING(__FUNCTION__) ": is deprecated and has been superseded by the " alternative_name " variable\n")
+#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: %s: is deprecated and has been superseded by the " alternative_name " method\n", __FUNCTION__)
+#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: %s: is deprecated and has been superseded by the " alternative_name " variable\n", __FUNCTION__)
 #define ScriptError                throw ScriptException

From 68181acec7753a93c96eb7edc4cff496c3f83e37 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Feb 2025 14:38:51 +0100
Subject: [PATCH 1928/2040] Implement Stop()

---
 code/fgame/mover.cpp | 23 ++++++++++++++++++++++-
 code/fgame/mover.h   |  3 ++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/code/fgame/mover.cpp b/code/fgame/mover.cpp
index b4ade81a..3b99e3df 100644
--- a/code/fgame/mover.cpp
+++ b/code/fgame/mover.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -250,3 +250,24 @@ void Mover::LinearInterpolate(Vector tdest, Vector angdest, float time, Event& e
 
     PostEvent(EV_MoveDone, time);
 }
+
+/*
+=============
+Stop
+===============
+*/
+void Mover::Stop()
+{
+    if (endevent) {
+        delete endevent;
+        endevent = NULL;
+    }
+
+    CancelEventsOfType(EV_MoveDone);
+
+    moveflags = 0;
+    avelocity = vec_zero;
+    velocity  = vec_zero;
+    accel     = vec_zero;
+    aaccel    = vec_zero;
+}
diff --git a/code/fgame/mover.h b/code/fgame/mover.h
index ad6d33f7..f128a334 100644
--- a/code/fgame/mover.h
+++ b/code/fgame/mover.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -48,6 +48,7 @@ public:
     void MoveDone(Event *ev);
     void MoveTo(Vector tdest, Vector angdest, float tspeed, Event& event);
     void LinearInterpolate(Vector tdest, Vector angdest, float time, Event& event);
+    void Stop();
     void Archive(Archiver& arc) override;
 };
 

From 22b593215faf929f6f2c19cdfc121708850de2e6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Feb 2025 14:39:54 +0100
Subject: [PATCH 1929/2040] Implement stop, threadmove and moveoffset

---
 code/fgame/scriptslave.cpp | 54 +++++++++++++++++++++++++++++++++++++-
 code/fgame/scriptslave.h   |  5 +++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 62385d6a..b357820f 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -69,6 +69,22 @@ Event EV_ScriptSlave_WaitMove
     "Move the script slave and wait until finished.",
     EV_NORMAL
 );
+Event EV_ScriptSlave_Stop
+(
+    "stop",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop the script slave."
+);
+Event EV_ScriptSlave_ThreadMove
+(
+    "threadmove",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Move the script slave and create thread which waits until finished."
+);
 Event EV_ScriptSlave_Angles
 (
     "angles",
@@ -222,6 +238,15 @@ Event EV_ScriptSlave_MoveRight
     "Move the position right.",
     EV_NORMAL
 );
+Event EV_ScriptSlave_MoveOffset
+(
+    "moveOffset",
+    EV_DEFAULT,
+    "v",
+    "dist",
+    "Move the position by the offset vector.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateXDownTo
 (
     "rotateXdownto",
@@ -609,6 +634,8 @@ CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
     {&EV_Unbind,                             &ScriptSlave::EventUnbind          },
     {&EV_ScriptSlave_DoMove,                 &ScriptSlave::DoMove               },
     {&EV_ScriptSlave_WaitMove,               &ScriptSlave::WaitMove             },
+    {&EV_ScriptSlave_Stop,                   &ScriptSlave::Stop                 },
+    {&EV_ScriptSlave_ThreadMove,             &ScriptSlave::ThreadMove           },
     {&EV_ScriptSlave_Angles,                 &ScriptSlave::SetAnglesEvent       },
     {&EV_SetAngle,                           &ScriptSlave::SetAngleEvent        },
     {&EV_Model,                              &ScriptSlave::SetModelEvent        },
@@ -628,6 +655,7 @@ CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
     {&EV_ScriptSlave_MoveBackward,           &ScriptSlave::MoveBackward         },
     {&EV_ScriptSlave_MoveLeft,               &ScriptSlave::MoveLeft             },
     {&EV_ScriptSlave_MoveRight,              &ScriptSlave::MoveRight            },
+    {&EV_ScriptSlave_MoveOffset,             &ScriptSlave::MoveOffset           },
     {&EV_ScriptSlave_RotateXDownTo,          &ScriptSlave::RotateXdownto        },
     {&EV_ScriptSlave_RotateYDownTo,          &ScriptSlave::RotateYdownto        },
     {&EV_ScriptSlave_RotateZDownTo,          &ScriptSlave::RotateZdownto        },
@@ -818,6 +846,24 @@ void ScriptSlave::WaitMove(Event *ev)
     Register(0, Director.CurrentScriptThread());
 }
 
+void ScriptSlave::Stop(Event *ev)
+{
+    commandswaiting = false;
+    if (RegisterSize(0)) {
+        Event newev(EV_DelayThrow);
+        newev.AddConstString(STRING_FAIL);
+        BroadcastEvent(0, newev);
+    }
+
+    Mover::Stop();
+}
+
+void ScriptSlave::ThreadMove(Event *ev)
+{
+    NewMove();
+    Register(0, CreateThreadInternal(ev->GetValue(1)));
+}
+
 void ScriptSlave::MoveEnd(Event *ev)
 {
     Unregister(0);
@@ -1082,6 +1128,12 @@ void ScriptSlave::MoveRight(Event *ev)
     NewPos -= v * ev->GetFloat(1);
 }
 
+void ScriptSlave::MoveOffset(Event *ev)
+{
+    CheckNewOrders();
+    NewPos += ev->GetVector(1);
+}
+
 // exact rotate commands
 
 void ScriptSlave::RotateXdownto(Event *ev)
diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h
index 891fcb56..b3bbae74 100644
--- a/code/fgame/scriptslave.h
+++ b/code/fgame/scriptslave.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -93,6 +93,8 @@ protected:
     void EventUnbind(Event *ev);
     void DoMove(Event *ev);
     void WaitMove(Event *ev);
+    void Stop(Event *ev);
+    void ThreadMove(Event *ev);
     void MoveEnd(Event *ev);
     void SetAnglesEvent(Event *ev);
     void SetAngleEvent(Event *ev);
@@ -113,6 +115,7 @@ protected:
     void MoveBackward(Event *ev);
     void MoveLeft(Event *ev);
     void MoveRight(Event *ev);
+    void MoveOffset(Event *ev);
     void RotateXdownto(Event *ev);
     void RotateYdownto(Event *ev);
     void RotateZdownto(Event *ev);

From a5bb4c1874bea14bc6e146612460976b176bd174 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 20:43:03 +0100
Subject: [PATCH 1930/2040] Free up debug strings when deallocating game-data

This fixes a memory leak, which also occurs in the original game
---
 code/fgame/g_main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 72a6847b..6fdfd9ff 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -227,9 +227,13 @@ void G_AllocGameData(void)
 
 void G_DeAllocGameData(void)
 {
-    // Initialize debug lines
+    // Free up debug lines
     G_DeAllocDebugLines();
 
+    // Added in OPM
+    //  Free up debug strings
+    G_DeAllocDebugStrings();
+
     // free up the entities
     if (g_entities) {
         gi.Free(g_entities);

From a1d47cf64aed08fb55afddb6d752ecf14cfcc1e0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 20:54:24 +0100
Subject: [PATCH 1931/2040] Add placement new/placement delete

---
 code/qcommon/container.h  | 15 +++++++++++++++
 code/qcommon/lightclass.h | 23 ++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/code/qcommon/container.h b/code/qcommon/container.h
index 8ec8b020..b2f1f63f 100644
--- a/code/qcommon/container.h
+++ b/code/qcommon/container.h
@@ -526,3 +526,18 @@ void Container<Type>::Copy(const Container<Type>& container)
 
     return;
 }
+
+template<typename T>
+void *operator new(size_t count, Container<T>& container)
+{
+    (void)count;
+
+    assert(count == sizeof(T));
+    return &container.ObjectAt(container.AddObject());
+}
+
+template<typename T>
+void operator delete(void *ptr, Container<T>& container)
+{
+    container.RemoveObject((T *)ptr);
+}
diff --git a/code/qcommon/lightclass.h b/code/qcommon/lightclass.h
index 4d6a0b2c..3cd0526b 100644
--- a/code/qcommon/lightclass.h
+++ b/code/qcommon/lightclass.h
@@ -26,14 +26,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_shared.h"
 
-class LightClass {
+class LightClass
+{
 public:
 #ifndef _DEBUG_MEM
-    void* operator new(size_t);
-    void operator delete(void*);
+    void *operator new(size_t);
+    void  operator delete(void *);
 
-    void* operator new(size_t size, void* placement);
-    void operator delete(void* ptr, void* placement);
+    void *operator new(size_t size, void *placement);
+    void  operator delete(void *ptr, void *placement);
+
+    template<typename T>
+    void *operator new(size_t size, T& placement)
+    {
+        return operator new(size, (void *)&placement);
+    }
+
+    template<typename T>
+    void operator delete(void *ptr, T& placement)
+    {
+        return operator delete(ptr, (void *)&placement);
+    }
 #endif
 };
 

From 47a447dbb01fb91e30e79d2c44c5e6744650b22f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 21:08:44 +0100
Subject: [PATCH 1932/2040] Remove all state scripts that were created

This fixes a memory leak that also occurs in the original game
---
 code/fgame/gamescript.cpp | 18 +++++++++++++++---
 code/fgame/gamescript.h   |  5 +++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index 831f1830..fe5999c0 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -686,10 +686,17 @@ void GameScript::ArchiveCodePos(Archiver& arc, unsigned char **codePos)
 
 void GameScript::Close(void)
 {
+    // Free up catch blocks
     for (int i = m_CatchBlocks.NumObjects(); i > 0; i--) {
         delete m_CatchBlocks.ObjectAt(i);
     }
 
+    // Added in OPM
+    //  Free up allocated state scripts
+    for (int i = m_StateScripts.NumObjects(); i > 0; i--) {
+        delete m_StateScripts.ObjectAt(i);
+    }
+
     m_CatchBlocks.FreeObjectList();
 
     if (m_ProgToSource) {
@@ -814,7 +821,11 @@ StateScript *GameScript::CreateCatchStateScript(unsigned char *try_begin_code_po
 
 StateScript *GameScript::CreateSwitchStateScript(void)
 {
-    return new StateScript;
+    StateScript *stateScript = new StateScript;
+
+    m_StateScripts.AddObject(stateScript);
+
+    return stateScript;
 }
 
 StateScript *GameScript::GetCatchStateScript(unsigned char *in, unsigned char *& out)
@@ -927,7 +938,8 @@ void ScriptThreadLabel::Execute(Listener *listener, Event *ev) const
     Execute(listener, *ev);
 }
 
-void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param) const
+void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
+    const
 {
     if (!m_Script) {
         return;
diff --git a/code/fgame/gamescript.h b/code/fgame/gamescript.h
index 23e85774..80af333b 100644
--- a/code/fgame/gamescript.h
+++ b/code/fgame/gamescript.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -118,7 +118,8 @@ class GameScript : public AbstractScript
 {
 protected:
     // try/throw variable
-    Container<CatchBlock *> m_CatchBlocks;
+    Container<CatchBlock *>  m_CatchBlocks;
+    Container<StateScript *> m_StateScripts;
 
 public:
     // program variables

From 840002b63a7839a8777a317b367280eeebe6f1cb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 21:34:18 +0100
Subject: [PATCH 1933/2040] Save and restore bots when needed

When the map was changing, it allocated an array of saved bots which would never be used due to the game module being freed, it caused a memory leaka
---
 code/fgame/g_bot.cpp  | 31 ++++++++++++++++++++-----------
 code/fgame/g_bot.h    | 37 +++++++++++++++++++------------------
 code/fgame/g_main.cpp |  3 +++
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index fabebdae..5ee6d165 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,9 +26,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerbot.h"
 #include "g_bot.h"
 
-static saved_bot_t *saved_bots        = NULL;
-static unsigned int num_saved_bots    = 0;
-static unsigned int botId             = 0;
+static saved_bot_t *saved_bots     = NULL;
+static unsigned int num_saved_bots = 0;
+static unsigned int botId          = 0;
 
 Container<str> alliedModelList;
 Container<str> germanModelList;
@@ -387,7 +387,7 @@ bool G_IsPlayer(gentity_t *ent)
 G_GetRandomAlliedPlayerModel
 ============
 */
-const char* G_GetRandomAlliedPlayerModel()
+const char *G_GetRandomAlliedPlayerModel()
 {
     if (!alliedModelList.NumObjects()) {
         return "";
@@ -402,7 +402,7 @@ const char* G_GetRandomAlliedPlayerModel()
 G_GetRandomGermanPlayerModel
 ============
 */
-const char* G_GetRandomGermanPlayerModel()
+const char *G_GetRandomGermanPlayerModel()
 {
     if (!germanModelList.NumObjects()) {
         return "";
@@ -580,8 +580,8 @@ void G_SaveBots()
         saved_bots = NULL;
     }
 
-    const BotControllerManager& manager = botManager.getControllerManager();
-    unsigned int numSpawnedBots = manager.getControllers().NumObjects();
+    const BotControllerManager& manager        = botManager.getControllerManager();
+    unsigned int                numSpawnedBots = manager.getControllers().NumObjects();
 
     if (!numSpawnedBots) {
         return;
@@ -590,7 +590,6 @@ void G_SaveBots()
     saved_bots     = new saved_bot_t[numSpawnedBots];
     num_saved_bots = 0;
 
-
     count = manager.getControllers().NumObjects();
     assert(count <= numSpawnedBots);
 
@@ -686,6 +685,18 @@ int G_CountClients()
     return count;
 }
 
+/*
+===========
+G_RestartBots
+
+Save bots
+============
+*/
+void G_RestartBots()
+{
+    G_SaveBots();
+}
+
 /*
 ===========
 G_ResetBots
@@ -695,8 +706,6 @@ Save and reset the bot count
 */
 void G_ResetBots()
 {
-    G_SaveBots();
-
     botManager.Cleanup();
 
     botId = 0;
diff --git a/code/fgame/g_bot.h b/code/fgame/g_bot.h
index 7cbe8015..5db1b88a 100644
--- a/code/fgame/g_bot.h
+++ b/code/fgame/g_bot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2024 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,20 +26,21 @@ struct saved_bot_t {
     char userinfo[MAX_INFO_STRING];
 };
 
-void       G_BotBegin(gentity_t *ent);
-void       G_BotThink(gentity_t *ent, int msec);
-void       G_BotShift(int clientNum);
-gentity_t *G_GetFirstBot();
-void       G_AddBot(const saved_bot_t *saved = NULL);
-void       G_AddBots(unsigned int num);
-void       G_RemoveBot(gentity_t *ent);
-void       G_RemoveBots(unsigned int num);
-bool       G_IsBot(gentity_t *ent);
-bool       G_IsPlayer(gentity_t *ent);
-void       G_ResetBots();
-void       G_BotInit();
-void       G_BotFrame();
-void       G_BotPostInit();
-void       G_SpawnBots();
-const char* G_GetRandomAlliedPlayerModel();
-const char* G_GetRandomGermanPlayerModel();
\ No newline at end of file
+void        G_BotBegin(gentity_t *ent);
+void        G_BotThink(gentity_t *ent, int msec);
+void        G_BotShift(int clientNum);
+gentity_t  *G_GetFirstBot();
+void        G_AddBot(const saved_bot_t *saved = NULL);
+void        G_AddBots(unsigned int num);
+void        G_RemoveBot(gentity_t *ent);
+void        G_RemoveBots(unsigned int num);
+bool        G_IsBot(gentity_t *ent);
+bool        G_IsPlayer(gentity_t *ent);
+void        G_ResetBots();
+void        G_RestartBots();
+void        G_BotInit();
+void        G_BotFrame();
+void        G_BotPostInit();
+void        G_SpawnBots();
+const char *G_GetRandomAlliedPlayerModel();
+const char *G_GetRandomGermanPlayerModel();
\ No newline at end of file
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 6fdfd9ff..ccb0e3f7 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -918,6 +918,9 @@ void G_Restart(void)
 
     // Added in 2.0
     G_ResetSmokeSprites();
+
+    // Added in OPM
+    G_RestartBots();
 }
 
 void G_SetFrameNumber(int framenum)

From 854c1980ccfa4571096a1717fab6949d22bf7ee0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 21:46:25 +0100
Subject: [PATCH 1934/2040] Make EventQueueNode part of LightClass

---
 code/qcommon/listener.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 2033815d..c819bfda 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -408,7 +408,7 @@ public:
 #define NODE_CANCEL      1
 #define NODE_FIXED_EVENT 2
 
-class EventQueueNode
+class EventQueueNode : public LightClass
 {
 public:
     Event            *event;

From 758176dd326a6614b42433cd32e96c095faac13e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 21:52:35 +0100
Subject: [PATCH 1935/2040] Delete the waitTillSet when destroying the class

---
 code/qcommon/class.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp
index 25aa8e4f..4c335f53 100644
--- a/code/qcommon/class.cpp
+++ b/code/qcommon/class.cpp
@@ -409,6 +409,11 @@ ClassDef::~ClassDef()
         delete[] responseLookup;
         responseLookup = NULL;
     }
+#ifdef WITH_SCRIPT_ENGINE
+    if (waitTillSet) {
+        delete waitTillSet;
+    }
+#endif
 }
 
 #ifdef WITH_SCRIPT_ENGINE

From 97fe824b80159d25e46010738a3799bcea2b335b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 22:31:46 +0100
Subject: [PATCH 1936/2040] Clear subtitles for all nodes when deleting the
 alias list

---
 code/qcommon/alias.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index 8169b35f..94c2889c 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -70,6 +70,11 @@ void Alias_ListClear(AliasList_t *list)
     }
 
     for (node = list->data_list; node != NULL; node = next) {
+        if (node->subtitle) {
+            // Added in OPM
+            Z_Free(node->subtitle);
+        }
+
         next = node->next;
         Z_Free(node);
     }

From 004f88dae9d8087f7beac522c1dadbc1e610ced7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 18 Feb 2025 22:39:52 +0100
Subject: [PATCH 1937/2040] Use a better method for storing class lists

This prevents allocating a ClassDef just to act as a root list. The classlist would never be freed (memory leak)
---
 code/qcommon/class.cpp | 44 ++++++++++++++++++++++--------------------
 code/qcommon/class.h   | 15 +++++++++-----
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp
index 4c335f53..f35e5192 100644
--- a/code/qcommon/class.cpp
+++ b/code/qcommon/class.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -57,6 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 ClassDef *ClassDef::classlist;
+ClassDef *ClassDef::classroot;
 int       ClassDef::numclasses;
 
 int                   ClassDef::dump_numclasses;
@@ -78,7 +79,7 @@ void ClassDef::SortClassList(Container<ClassDef *> *sortedList)
 
     sortedList->Resize(numclasses);
 
-    for (c = classlist->next; c != classlist; c = c->next) {
+    for (c = classlist; c; c = c->next) {
         sortedList->AddObject(c);
     }
 
@@ -92,7 +93,7 @@ ClassDef *getClassForID(const char *name)
     ClassDef *classlist = ClassDef::classlist;
     ClassDef *c;
 
-    for (c = classlist->next; c != classlist; c = c->next) {
+    for (c = classlist; c; c = c->next) {
         if (c->classID && !Q_stricmp(c->classID, name)) {
             return c;
         }
@@ -110,7 +111,7 @@ ClassDef *getClass(const char *name)
     ClassDef *list = ClassDef::classlist;
     ClassDef *c;
 
-    for (c = list->next; c != list; c = c->next) {
+    for (c = list; c; c = c->next) {
         if (Q_stricmp(c->classname, name) == 0) {
             return c;
         }
@@ -129,7 +130,7 @@ void listAllClasses(void)
     ClassDef *c;
     ClassDef *list = ClassDef::classlist;
 
-    for (c = list->next; c != list; c = c->next) {
+    for (c = list; c; c = c->next) {
         CLASS_DPrintf("%s\n", c->classname);
     }
 }
@@ -353,7 +354,7 @@ ClassDef::ClassDef(
     ClassDef *node;
 
     if (classlist == NULL) {
-        classlist = new ClassDef;
+        classlist = this;
     }
 
     this->classname      = classname;
@@ -374,7 +375,7 @@ ClassDef::ClassDef(
         this->classID = "";
     }
 
-    for (node = classlist->next; node != classlist; node = node->next) {
+    for (node = classlist; node; node = node->next) {
         if ((node->super == NULL) && (!Q_stricmp(node->superclass, this->classname))
             && (Q_stricmp(node->classname, "Class"))) {
             node->super = this;
@@ -382,7 +383,7 @@ ClassDef::ClassDef(
     }
 
     // Add to front of list
-    LL_AddFirst(classlist, this, prev, next);
+    LL_SafeAdd(classroot, this, next, prev);
 
     numclasses++;
 }
@@ -391,18 +392,13 @@ ClassDef::~ClassDef()
 {
     ClassDef *node;
 
-    if (classlist != this) {
-        LL_Remove(this, prev, next);
+    LL_SafeRemoveRoot(classlist, this, next, prev);
 
-        // Check if any subclasses were initialized before their superclass
-        for (node = classlist->next; node != classlist; node = node->next) {
-            if (node->super == this) {
-                node->super = NULL;
-            }
+    // Check if any subclasses were initialized before their superclass
+    for (node = classlist; node; node = node->next) {
+        if (node->super == this) {
+            node->super = NULL;
         }
-    } else {
-        // If the head of the list is deleted before the list is cleared, then we may have problems
-        assert(this->next == this->prev);
     }
 
     if (responseLookup) {
@@ -502,7 +498,7 @@ void ClassDef::BuildResponseList(void)
     }
     //size will be total event count, because it WAS faster to look for an event via eventnum
     //nowadays there's not much overhead in performance, TODO: change size to appropriate.
-    num = Event::NumEventCommands();
+    num            = Event::NumEventCommands();
     responseLookup = (ResponseDef<Class> **)new char[sizeof(ResponseDef<Class> *) * num];
     memset(responseLookup, 0, sizeof(ResponseDef<Class> *) * num);
 
@@ -544,7 +540,7 @@ void ClassDef::BuildEventResponses(void)
     amount     = 0;
     numclasses = 0;
 
-    for (c = classlist->next; c != classlist; c = c->next) {
+    for (c = classlist; c; c = c->next) {
         c->BuildResponseList();
 
         amount += c->numEvents * sizeof(Response *);
@@ -697,7 +693,13 @@ void DumpClass(FILE *class_file, const char *className)
 
     CLASS_Print(class_file, "\n");
     if (classDef->classID[0]) {
-        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s (<i>%s</i>)</a>", classDef->classname, classDef->classname, classDef->classID);
+        CLASS_Print(
+            class_file,
+            "<h2> <a name=\"%s\">%s (<i>%s</i>)</a>",
+            classDef->classname,
+            classDef->classname,
+            classDef->classID
+        );
     } else {
         CLASS_Print(class_file, "<h2> <a name=\"%s\">%s</a>", classDef->classname, classDef->classname);
     }
diff --git a/code/qcommon/class.h b/code/qcommon/class.h
index 47f8f38b..c7f1928a 100644
--- a/code/qcommon/class.h
+++ b/code/qcommon/class.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -87,15 +87,19 @@ class Event;
         }                                                      \
         bool classname::WaitTillAllowed(str s)                 \
         {                                                      \
-            for(ClassDef* c = classinfo(); c; c = c->super) {  \
-                if (c->WaitTillDefined(s)) { return true; }    \
+            for (ClassDef *c = classinfo(); c; c = c->super) { \
+                if (c->WaitTillDefined(s)) {                   \
+                    return true;                               \
+                }                                              \
             }                                                  \
             return false;                                      \
         }                                                      \
         bool classname::WaitTillAllowed(const_str s)           \
         {                                                      \
-            for(ClassDef* c = classinfo(); c; c = c->super) {  \
-                if (c->WaitTillDefined(s)) { return true; }    \
+            for (ClassDef *c = classinfo(); c; c = c->super) { \
+                if (c->WaitTillDefined(s)) {                   \
+                    return true;                               \
+                }                                              \
             }                                                  \
             return false;                                      \
         }                                                      \
@@ -188,6 +192,7 @@ public:
     int numEvents;
 
     static ClassDef *classlist;
+    static ClassDef *classroot;
     static int       numclasses;
 
     static int                   dump_numclasses;

From 178c486b8335afcea37233fa89eb0561e64cee78 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 19 Feb 2025 18:16:53 +0100
Subject: [PATCH 1938/2040] Use NewEntry/DeleteEntry like con_set

---
 code/qcommon/con_arrayset.h | 79 +++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 34 deletions(-)

diff --git a/code/qcommon/con_arrayset.h b/code/qcommon/con_arrayset.h
index 753c1e2c..38dd3362 100644
--- a/code/qcommon/con_arrayset.h
+++ b/code/qcommon/con_arrayset.h
@@ -26,34 +26,51 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "mem_blockalloc.h"
 
-template<typename key, typename value>
+template<typename k, typename v>
+class con_arrayset;
+
+template<typename k, typename v>
 class con_arrayset_enum;
 
+template<typename k, typename v>
+class con_arrayset_Entry
+{
+    friend con_arrayset<k, v>;
+    friend con_arrayset_enum<k, v>;
+
+public:
+    k            key;
+    v            value;
+    unsigned int index;
+
+    con_arrayset_Entry *next;
+
+public:
+    void *operator new(size_t size) { return con_arrayset<k, v>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_arrayset<k, v>::DeleteEntry(ptr); }
+
+    con_arrayset_Entry()
+    {
+        this->key   = k();
+        this->value = v();
+
+        index = 0;
+        next  = NULL;
+    }
+
+#ifdef ARCHIVE_SUPPORTED
+    void Archive(Archiver& arc);
+#endif
+};
+
 template<typename k, typename v>
 class con_arrayset
 {
     friend class con_arrayset_enum<k, v>;
 
 public:
-    class Entry
-    {
-    public:
-        k            key;
-        v            value;
-        unsigned int index;
-
-        Entry *next;
-
-    public:
-        void *operator new(size_t size);
-        void  operator delete(void *ptr);
-
-        Entry();
-
-#ifdef ARCHIVE_SUPPORTED
-        void Archive(Archiver& arc);
-#endif
-    };
+    using Entry = con_arrayset_Entry<k, v>;
 
 public:
     static MEM_BlockAlloc<Entry> Entry_allocator;
@@ -72,6 +89,10 @@ protected:
     Entry *addKeyEntry(const k& key);
     Entry *addNewKeyEntry(const k& key);
 
+public:
+    static void *NewEntry(size_t size);
+    static void  DeleteEntry(void *entry);
+
 public:
     con_arrayset();
     ~con_arrayset();
@@ -87,7 +108,7 @@ public:
     unsigned int findKeyIndex(const k& key);
     unsigned int addKeyIndex(const k& key);
     unsigned int addNewKeyIndex(const k& key);
-    bool         remove(const k        &key);
+    bool         remove(const k& key);
 
     v& operator[](unsigned int index);
 };
@@ -96,25 +117,15 @@ template<typename k, typename v>
 MEM_BlockAlloc<typename con_arrayset<k, v>::Entry> con_arrayset<k, v>::Entry_allocator;
 
 template<typename k, typename v>
-void *con_arrayset<k, v>::Entry::operator new(size_t size)
+void *con_arrayset<k, v>::NewEntry(size_t size)
 {
     return Entry_allocator.Alloc();
 }
 
 template<typename k, typename v>
-void con_arrayset<k, v>::Entry::operator delete(void *ptr)
+void con_arrayset<k, v>::DeleteEntry(void *entry)
 {
-    Entry_allocator.Free(ptr);
-}
-
-template<typename k, typename v>
-con_arrayset<k, v>::Entry::Entry()
-{
-    this->key   = k();
-    this->value = v();
-
-    index = 0;
-    next  = NULL;
+    Entry_allocator.Free(entry);
 }
 
 template<typename key, typename value>

From 587f7f544e8466213d1c6b004cdd0583cc3cd55f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 19 Feb 2025 20:03:23 +0100
Subject: [PATCH 1939/2040] Add REF_DLL for mem_blockalloc

---
 code/qcommon/mem_blockalloc.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/code/qcommon/mem_blockalloc.cpp b/code/qcommon/mem_blockalloc.cpp
index 1cb9f94d..51dd94a5 100644
--- a/code/qcommon/mem_blockalloc.cpp
+++ b/code/qcommon/mem_blockalloc.cpp
@@ -50,6 +50,20 @@ void MEM_Free(void *ptr)
     return cgi.Free(ptr);
 }
 
+#elif defined(REF_DLL)
+
+#    include "../renderercommon/tr_common.h"
+
+void *MEM_Alloc(int size)
+{
+    return ri.Malloc(size);
+}
+
+void MEM_Free(void *ptr)
+{
+    return ri.Free(ptr);
+}
+
 #else
 
 #    include "qcommon.h"

From 076fd6913119ee2eaaf2104c425bdc78b358e344 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 19 Feb 2025 20:11:07 +0100
Subject: [PATCH 1940/2040] Use the engine allocator to allocate/delete memory
 from the table of pointers

---
 code/qcommon/con_arrayset.h | 52 ++++++++++++++++++++++++++++++++-----
 code/qcommon/con_set.h      | 46 +++++++++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/code/qcommon/con_arrayset.h b/code/qcommon/con_arrayset.h
index 38dd3362..94315984 100644
--- a/code/qcommon/con_arrayset.h
+++ b/code/qcommon/con_arrayset.h
@@ -26,6 +26,31 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "mem_blockalloc.h"
 
+#if defined(GAME_DLL)
+#    include "../fgame/g_local.h"
+
+#    define ARRAYSET_Alloc gi.Malloc
+#    define ARRAYSET_Free  gi.Free
+
+#elif defined(CGAME_DLL)
+#    include "../cgame/cg_local.h"
+
+#    define ARRAYSET_Alloc cgi.Malloc
+#    define ARRAYSET_Free  cgi.Free
+
+#elif defined(REF_DLL)
+#    include "../renderercommon/tr_common.h"
+
+#    define ARRAYSET_Alloc ri.Malloc
+#    define ARRAYSET_Free  ri.Free
+
+#else
+#    include "qcommon.h"
+
+#    define ARRAYSET_Alloc Z_Malloc
+#    define ARRAYSET_Free  Z_Free
+#endif
+
 template<typename k, typename v>
 class con_arrayset;
 
@@ -92,6 +117,8 @@ protected:
 public:
     static void *NewEntry(size_t size);
     static void  DeleteEntry(void *entry);
+    static void *NewTable(size_t count);
+    static void  DeleteTable(void *table);
 
 public:
     con_arrayset();
@@ -128,6 +155,18 @@ void con_arrayset<k, v>::DeleteEntry(void *entry)
     Entry_allocator.Free(entry);
 }
 
+template<typename k, typename v>
+void *con_arrayset<k, v>::NewTable(size_t count)
+{
+    return ARRAYSET_Alloc(sizeof(Entry *) * (int)count);
+}
+
+template<typename k, typename v>
+void con_arrayset<k, v>::DeleteTable(void *table)
+{
+    ARRAYSET_Free(table);
+}
+
 template<typename key, typename value>
 con_arrayset<key, value>::con_arrayset()
 {
@@ -172,8 +211,7 @@ void con_arrayset<key, value>::resize(int count)
     }
 
     // allocate a new table
-    table = new Entry *[tableLength]();
-    memset(table, 0, tableLength * sizeof(Entry *));
+    table = new (NewTable(tableLength)) Entry *[tableLength]();
 
     // rehash the table
     for (i = oldTableLength; i > 0; i--) {
@@ -191,18 +229,18 @@ void con_arrayset<key, value>::resize(int count)
 
     if (oldTableLength > 1) {
         // delete the previous table
-        delete[] oldTable;
+        DeleteTable(oldTable);
     }
 
     // allocate a bigger reverse table
-    reverseTable = new Entry *[this->tableLength]();
+    reverseTable = new (NewTable(tableLength)) Entry *[this->tableLength]();
 
     for (i = 0; i < oldTableLength; i++) {
         reverseTable[i] = oldReverseTable[i];
     }
 
     if (oldTableLength > 1) {
-        delete[] oldReverseTable;
+        DeleteTable(oldReverseTable);
     }
 }
 
@@ -220,7 +258,7 @@ void con_arrayset<key, value>::clear()
     unsigned int i;
 
     if (tableLength > 1) {
-        delete[] reverseTable;
+        DeleteTable(reverseTable);
         reverseTable = &defaultEntry;
     }
 
@@ -232,7 +270,7 @@ void con_arrayset<key, value>::clear()
     }
 
     if (tableLength > 1) {
-        delete[] table;
+        DeleteTable(table);
     }
 
     tableLength = 1;
diff --git a/code/qcommon/con_set.h b/code/qcommon/con_set.h
index 225b4561..d9a91b1b 100644
--- a/code/qcommon/con_set.h
+++ b/code/qcommon/con_set.h
@@ -26,6 +26,31 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "mem_blockalloc.h"
 
+#if defined(GAME_DLL)
+#    include "../fgame/g_local.h"
+
+#    define SET_Alloc gi.Malloc
+#    define SET_Free  gi.Free
+
+#elif defined(CGAME_DLL)
+#    include "../cgame/cg_local.h"
+
+#    define SET_Alloc cgi.Malloc
+#    define SET_Free  cgi.Free
+
+#elif defined(REF_DLL)
+#    include "../renderercommon/tr_common.h"
+
+#    define SET_Alloc ri.Malloc
+#    define SET_Free  ri.Free
+
+#else
+#    include "qcommon.h"
+
+#    define SET_Alloc Z_Malloc
+#    define SET_Free  Z_Free
+#endif
+
 class Class;
 class Archiver;
 
@@ -116,6 +141,8 @@ protected:
 public:
     static void *NewEntry(size_t size);
     static void  DeleteEntry(void *entry);
+    static void *NewTable(size_t count);
+    static void  DeleteTable(void *table);
 
 public:
     con_set();
@@ -156,6 +183,18 @@ void con_set<k, v>::DeleteEntry(void *entry)
     Entry_allocator.Free(entry);
 }
 
+template<typename k, typename v>
+void *con_set<k, v>::NewTable(size_t count)
+{
+    return SET_Alloc(sizeof(Entry *) * (int)count);
+}
+
+template<typename k, typename v>
+void con_set<k, v>::DeleteTable(void *table)
+{
+    SET_Free(table);
+}
+
 template<typename k>
 int HashCode(const k& key);
 
@@ -193,7 +232,7 @@ void con_set<key, value>::clear()
     }
 
     if (tableLength > 1) {
-        delete[] table;
+        DeleteTable(table);
     }
 
     tableLength = 1;
@@ -229,8 +268,7 @@ void con_set<key, value>::resize(int count)
     }
 
     // allocate a new table
-    table = new Entry *[tableLength]();
-    memset(table, 0, tableLength * sizeof(Entry *));
+    table = new (NewTable(tableLength)) Entry *[tableLength]();
 
     // rehash the table
     for (i = oldTableLength; i > 0; i--) {
@@ -248,7 +286,7 @@ void con_set<key, value>::resize(int count)
 
     if (oldTableLength > 1) {
         // delete the previous table
-        delete[] oldTable;
+        DeleteTable(oldTable);
     }
 }
 

From 8a9e0f0b016bc0bb4a719219499a7d6fc7930655 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 19 Feb 2025 20:39:04 +0100
Subject: [PATCH 1941/2040] Update master server address

It's now using master.openmohaa.org, which provides more flexibility for configuring the domain
---
 code/gamespy/sv_gqueryreporting.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index 95f1a3f7..4e00ae0a 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -66,4 +66,4 @@ typedef struct qr_implementation_s {
     void               *udata;
 } qr_implementation_t, *qr_t;
 
-#define MASTER_SERVER_HOST "master.x-null.net"
+#define MASTER_SERVER_HOST "master.openmohaa.org"

From a36bbb0cdad35fd281e306f50cddc29586d9f0b0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 19 Feb 2025 20:39:56 +0100
Subject: [PATCH 1942/2040] Remove useless qr fields

---
 code/gamespy/sv_gqueryreporting.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index 4e00ae0a..e143b599 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define MAX_KEYVALUES_LENGTH 1400
 
-static const unsigned int MIN_HEARTBEAT_TIME = 30000; // wait at least 30 seconds before new heartbeat can be sent
+static const unsigned int MIN_HEARTBEAT_TIME = 30000;  // wait at least 30 seconds before new heartbeat can be sent
 static const unsigned int MAX_HEARTBEAT_TIME = 300000; // 5 minutes
 
 typedef void (*qr_querycallback_t)(char *outbuf, int maxlen, void *userdata);
@@ -59,9 +59,6 @@ typedef struct qr_implementation_s {
     int                 qport;
     char                no_query;
     struct sockaddr_in  master_saddr;
-    int                 unk2;
-    int                 unk3;
-    int                 unk4;
     qr_custom_handler_t qr_custom_handler;
     void               *udata;
 } qr_implementation_t, *qr_t;

From 512831dea9daef57597f0948b43d385ca13baeaf Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:36:19 +0100
Subject: [PATCH 1943/2040] Properly unregister events from the level object

Unregister() was mistakenly being called on the DM_Manager object when it should have been called on the level object, to unregister events like axiswin, allieswin, draw
---
 code/fgame/dm_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index 1a2cd537..dcd87a6d 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1415,7 +1415,7 @@ void DM_Manager::EventDoRoundTransition(Event *ev)
         // Play the axis victory sound
         world->Sound("den_victory_v");
 
-        Unregister(STRING_AXISWIN);
+        level.Unregister(STRING_AXISWIN);
     } else if (m_iTeamWin == TEAM_ALLIES) {
         G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Allies win!")));
         G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Allies win!")));
@@ -1423,12 +1423,12 @@ void DM_Manager::EventDoRoundTransition(Event *ev)
         // Play the allies victory sound
         world->Sound("dfr_victory_v");
 
-        Unregister(STRING_ALLIESWIN);
+        level.Unregister(STRING_ALLIESWIN);
     } else {
         G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("It's a draw!")));
         G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("It's a draw!")));
 
-        Unregister(STRING_DRAW);
+        level.Unregister(STRING_DRAW);
     }
 
     G_DisplayScoresToAllClients();

From 08c718d2324f7e8fa4cbef5c9245af28fadfccc7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 20:36:32 +0100
Subject: [PATCH 1944/2040] Add support for server list encryption and tell the
 master server to return the server list encrypted

---
 code/gamespy/CMakeLists.txt |   1 +
 code/gamespy/gcrypt.c       | 198 ++++++++++++++++++++++++++++++++++++
 code/gamespy/gcrypt.h       |  40 ++++++++
 code/gamespy/gserverlist.c  |  96 ++++++++++++-----
 4 files changed, 312 insertions(+), 23 deletions(-)
 create mode 100644 code/gamespy/gcrypt.c
 create mode 100644 code/gamespy/gcrypt.h

diff --git a/code/gamespy/CMakeLists.txt b/code/gamespy/CMakeLists.txt
index 91533d3d..c867bfaa 100644
--- a/code/gamespy/CMakeLists.txt
+++ b/code/gamespy/CMakeLists.txt
@@ -11,6 +11,7 @@ file(GLOB SRCS_common
 	"./hashtable.c"
 	"./md5c.c"
 	"./gutil.c"
+	"./gcrypt.c"
 )
 
 file(GLOB SRCS_gcdkey
diff --git a/code/gamespy/gcrypt.c b/code/gamespy/gcrypt.c
new file mode 100644
index 00000000..26c14023
--- /dev/null
+++ b/code/gamespy/gcrypt.c
@@ -0,0 +1,198 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "gcrypt.h"
+#include "../qcommon/q_platform.h"
+#include "../qcommon/q_shared.h"
+
+static unsigned int rotl32(unsigned int value, unsigned int count)
+{
+    return (value << count) | (value >> (-count & 31));
+}
+
+static unsigned int crypt_seek(GCryptInfo *info, unsigned int n1, unsigned int n2)
+{
+    int part;
+    int i;
+    int keyIndex;
+    int xorKey;
+    int current;
+
+    current  = 0x8000;
+    xorKey   = n1;
+    keyIndex = 0;
+    i        = 1;
+
+    info->offset = 0;
+
+    while (current > 0) {
+        xorKey += i;
+        keyIndex += xorKey;
+        xorKey += keyIndex;
+
+        if (n2 & current) {
+            part   = rotl32(~xorKey, 24);
+            xorKey = rotl32(info->key[(unsigned char)part] ^ part, 24);
+            part   = rotl32(info->key[(unsigned char)keyIndex] ^ keyIndex, 8);
+            xorKey ^= info->key[(unsigned char)xorKey];
+            keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 8);
+
+            i += 1 + i;
+        } else {
+            info->msg[info->offset]      = xorKey;
+            info->msg[info->offset + 16] = keyIndex;
+            info->msg[info->offset + 32] = i;
+            info->offset++;
+
+            part     = rotl32(keyIndex, 24);
+            keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 24);
+            part     = rotl32(info->key[(unsigned char)xorKey] ^ xorKey, 8);
+            keyIndex ^= info->key[(unsigned char)keyIndex];
+            xorKey = rotl32(info->key[(unsigned char)part] ^ part, 8);
+
+            i *= 2;
+        }
+
+        current >>= 1;
+    }
+
+    info->xorKey   = xorKey;
+    info->keyIndex = keyIndex;
+    info->i        = i;
+    info->start    = n1;
+
+    return keyIndex ^ xorKey;
+}
+
+static void crypt_encrypt(GCryptInfo *info, unsigned int *words, int len)
+{
+    int          part;
+    unsigned int i;
+    unsigned int w;
+    int          keyIndex;
+    int          xorKey;
+    int          offset;
+
+    offset   = info->offset;
+    xorKey   = info->xorKey;
+    keyIndex = info->keyIndex;
+    i        = info->i;
+
+    for (w = 0; w < len; w++) {
+        while (i < 0x10000) {
+            xorKey += i;
+            keyIndex += xorKey;
+            xorKey += keyIndex;
+
+            info->msg[offset]      = xorKey;
+            info->msg[offset + 16] = keyIndex;
+            info->msg[offset + 32] = i;
+            offset++;
+
+            part     = rotl32(keyIndex, 24);
+            keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 24);
+            part     = rotl32(info->key[(unsigned char)xorKey] ^ xorKey, 8);
+            keyIndex ^= info->key[(unsigned char)keyIndex];
+            xorKey = rotl32(info->key[(unsigned char)part] ^ part, 8);
+
+            i *= 2;
+        }
+
+        words[w] = LittleLong(keyIndex ^ xorKey);
+        offset--;
+        if (offset < 0) {
+            offset = 0;
+        }
+
+        part   = rotl32(~info->msg[offset], 24);
+        xorKey = rotl32(info->key[(unsigned char)part] ^ part, 24);
+        part   = rotl32(info->key[(unsigned char)info->msg[offset + 16]] ^ info->msg[offset + 16], 8);
+        xorKey ^= info->key[(unsigned char)xorKey];
+        keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 8);
+
+        i = info->msg[offset + 32] + 1 + info->msg[offset + 32];
+    }
+
+    info->offset   = offset;
+    info->xorKey   = xorKey;
+    info->keyIndex = keyIndex;
+    info->i        = i;
+}
+
+void init_crypt_key(unsigned char *src, unsigned int len, GCryptInfo *info)
+{
+    int index;
+    int i, j, k;
+    int tmp;
+
+    info->wordPtr = NULL;
+    for (k = 0; k < 256; k++) {
+        info->key[k] = 0;
+    }
+
+    for (i = 0; i < 4; i++) {
+        for (k = 0; k < 256; k++) {
+            info->key[k] = (info->key[k] << 8) + k;
+        }
+
+        index = i;
+
+        for (j = 0; j < 2; j++) {
+            for (k = 0; k < 256; k++) {
+                index = ((info->key[k] & 0xff) + src[k % len] + index) & 0xff;
+
+                tmp              = info->key[k];
+                info->key[k]     = info->key[index];
+                info->key[index] = tmp;
+            }
+        }
+    }
+
+    for (k = 0; k < 256; k++) {
+        info->key[k] = LittleLong(info->key[k]);
+    }
+
+    for (k = 0; k < 256; k++) {
+        info->key[k] ^= k;
+    }
+
+    crypt_seek(info, 0, 0);
+}
+
+void crypt_docrypt(GCryptInfo *info, unsigned char *out, int len)
+{
+    int i;
+
+    for (i = 0; i < len; i++) {
+        if (!info->wordPtr || ((char *)info->wordPtr - (char *)info->words) >= (sizeof(info->words) - 1)) {
+            info->wordPtr = (unsigned char *)info->words;
+            crypt_encrypt(info, info->words, ARRAY_LEN(info->words));
+        }
+
+        char value[4];
+        CopyLittleLong(value, info->wordPtr);
+        memcpy(info->wordPtr, value, sizeof(value));
+
+        out[i] ^= *(unsigned char *)info->wordPtr;
+        info->wordPtr++;
+    }
+}
diff --git a/code/gamespy/gcrypt.h b/code/gamespy/gcrypt.h
new file mode 100644
index 00000000..dfe6993c
--- /dev/null
+++ b/code/gamespy/gcrypt.h
@@ -0,0 +1,40 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+typedef struct {
+    int key[256];
+    int msg[48];
+
+    int offset;
+    int xorKey;
+    int keyIndex;
+    int i;
+    int start;
+
+    unsigned int   words[16];
+    unsigned char *wordPtr;
+} GCryptInfo;
+
+void init_crypt_key(unsigned char *src, unsigned int len, GCryptInfo *info);
+void crypt_docrypt(GCryptInfo *info, unsigned char *out, int len);
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 378c3eac..f3105f58 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -45,6 +45,9 @@ Fax(714)549-0757
 #include <string.h>
 #include <stdlib.h>
 
+// Added in 2.0
+#include "gcrypt.h"
+
 #define MSHOST MASTER_SERVER_HOST
 #define MSPORT	28900
 #define SERVER_GROWBY 64
@@ -87,6 +90,10 @@ struct GServerListImplementation
 	unsigned long lanstarttime;
 	GQueryType querytype;
 	HashTable keylist;
+
+    // Added in 2.0
+    GCryptInfo cryptinfo;
+    int encryptdata;
 };
 
 GServerList g_sortserverlist; //global serverlist for sorting info!!
@@ -125,6 +132,7 @@ GServerList	ServerListNew(const char *gamename, const char *enginename, const ch
 	assert(CallBackFn != NULL);
 	list->instance = instance;
 	list->sortkey = "";
+    list->encryptdata = 1;
 	SocketStartUp();
 	return list;	
 }
@@ -242,7 +250,7 @@ static GError SendListRequest(GServerList serverlist, char *filter)
 {
 	char data[256], *ptr, result[64];
 	int len;
-
+    int i;
 	
 	len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
 	if (gsiSocketIsError(len))
@@ -254,11 +262,25 @@ static GError SendListRequest(GServerList serverlist, char *filter)
 		return GE_DATAERROR;
 	ptr = ptr + strlen(SECURE);
 	gs_encrypt   ( (uchar *) serverlist->seckey, 6, (uchar *)ptr, 6 );
+    if (serverlist->encryptdata) {
+        // Added in 2.0
+        for(i = 0; i < 6; i++) {
+            ptr[i] ^= serverlist->seckey[i];
+        }
+    }
 	gs_encode ( (uchar *)ptr, 6, (uchar *) result );
 
-	//validate to the master
-	sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\final\\\\queryid\\1.1\\",
-			serverlist->enginename, ENGINE_VERSION, result); //validate us		
+    if (serverlist->encryptdata) {
+        // Added in 2.0
+        //  Encrypt data
+        //validate to the master
+        sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\enctype\\2\\final\\\\queryid\\1.1\\",
+                serverlist->enginename, "2", result); //validate us		
+    } else {
+        //validate to the master
+        sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\final\\\\queryid\\1.1\\",
+                serverlist->enginename, ENGINE_VERSION, result); //validate us	
+    }
 	
 	len = send ( serverlist->slsocket, data, strlen(data), 0 );
 	if (gsiSocketIsError(len) || len == 0)
@@ -337,6 +359,8 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
 	if (error) return error;
 	serverlist->nextupdate = 0;
 	serverlist->abortupdate = 0;
+    // Added in 2.0
+    serverlist->cryptinfo.offset = -1;
 	if (!async)
 		DoSyncLoop(serverlist);
 
@@ -577,27 +601,53 @@ static GError ServerListReadList(GServerList serverlist)
 		return GE_NOCONNECT;
 
 	}
-	oldlen += len;
+
+    if (serverlist->encryptdata && serverlist->cryptinfo.offset != -1) {
+        // Added in 2.0
+        crypt_docrypt(&serverlist->cryptinfo, data + oldlen, len);
+    }
+
+    oldlen += len;
 
 	p = data;
-	while (p - data <= oldlen - 6)
-	{
-		if (strncmp(p,"\\final\\",7) == 0 || serverlist->abortupdate)
-		{
-			closesocket(serverlist->slsocket);
-			serverlist->slsocket = INVALID_SOCKET;
-			oldlen = 0; //clear data so it can be used again
-			ServerListModeChange(serverlist, sl_querying);
-			return 0; //get out!!
-		}
-		if (oldlen < 6) //no way it could be a full IP, quit
-			break;
-		memcpy(&ip,p,4);
-		p += 4;
-		memcpy(&port,p,2);
-		p += 2;
-		ServerListAddServer(serverlist,ip,  ntohs(port), serverlist->querytype );
-	}
+
+    if (!serverlist->encryptdata) {
+        serverlist->cryptinfo.offset = 0;
+    } else if (serverlist->cryptinfo.offset == -1) {
+        // Added in 2.0
+        if (oldlen > (*p ^ 0xEC)) {
+            *p ^= 0xEC;
+            len = strlen(serverlist->seckey);
+            for (i = 0; i < len; i++) {
+                p[i + 1] ^= serverlist->seckey[i];
+            }
+            init_crypt_key((unsigned char *)p + 1, *p, &serverlist->cryptinfo);
+            p += *p + 1;
+            crypt_docrypt(&serverlist->cryptinfo, (unsigned char *)p, oldlen - (p - data));
+        }
+    }
+
+    if (serverlist->cryptinfo.offset != -1)
+    {
+        while (p - data <= oldlen - 6)
+        {
+            if (strncmp(p,"\\final\\",7) == 0 || serverlist->abortupdate)
+            {
+                closesocket(serverlist->slsocket);
+                serverlist->slsocket = INVALID_SOCKET;
+                oldlen = 0; //clear data so it can be used again
+                ServerListModeChange(serverlist, sl_querying);
+                return 0; //get out!!
+            }
+            if (oldlen < 6) //no way it could be a full IP, quit
+                break;
+            memcpy(&ip,p,4);
+            p += 4;
+            memcpy(&port,p,2);
+            p += 2;
+            ServerListAddServer(serverlist,ip,  ntohs(port), serverlist->querytype );
+        }
+    }
 	oldlen = oldlen - (p - data);
 	memmove(data,p,oldlen); //shift it over
 	return 0;

From ebd86b32bd1174eb3de59cb0f84d63708d4fa0c0 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:11:29 +0100
Subject: [PATCH 1945/2040] Improve code clarity

---
 code/gamespy/gcrypt.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/code/gamespy/gcrypt.c b/code/gamespy/gcrypt.c
index 26c14023..da5c4848 100644
--- a/code/gamespy/gcrypt.c
+++ b/code/gamespy/gcrypt.c
@@ -51,10 +51,10 @@ static unsigned int crypt_seek(GCryptInfo *info, unsigned int n1, unsigned int n
 
         if (n2 & current) {
             part   = rotl32(~xorKey, 24);
-            xorKey = rotl32(info->key[(unsigned char)part] ^ part, 24);
-            part   = rotl32(info->key[(unsigned char)keyIndex] ^ keyIndex, 8);
-            xorKey ^= info->key[(unsigned char)xorKey];
-            keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 8);
+            xorKey = rotl32(info->key[part & 0xff] ^ part, 24);
+            part   = rotl32(info->key[keyIndex & 0xff] ^ keyIndex, 8);
+            xorKey ^= info->key[xorKey & 0xff];
+            keyIndex = rotl32(info->key[part & 0xff] ^ part, 8);
 
             i += 1 + i;
         } else {
@@ -64,10 +64,10 @@ static unsigned int crypt_seek(GCryptInfo *info, unsigned int n1, unsigned int n
             info->offset++;
 
             part     = rotl32(keyIndex, 24);
-            keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 24);
-            part     = rotl32(info->key[(unsigned char)xorKey] ^ xorKey, 8);
-            keyIndex ^= info->key[(unsigned char)keyIndex];
-            xorKey = rotl32(info->key[(unsigned char)part] ^ part, 8);
+            keyIndex = rotl32(info->key[part & 0xff] ^ part, 24);
+            part     = rotl32(info->key[xorKey & 0xff] ^ xorKey, 8);
+            keyIndex ^= info->key[keyIndex & 0xff];
+            xorKey = rotl32(info->key[part & 0xff] ^ part, 8);
 
             i *= 2;
         }
@@ -109,10 +109,10 @@ static void crypt_encrypt(GCryptInfo *info, unsigned int *words, int len)
             offset++;
 
             part     = rotl32(keyIndex, 24);
-            keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 24);
-            part     = rotl32(info->key[(unsigned char)xorKey] ^ xorKey, 8);
-            keyIndex ^= info->key[(unsigned char)keyIndex];
-            xorKey = rotl32(info->key[(unsigned char)part] ^ part, 8);
+            keyIndex = rotl32(info->key[part & 0xff] ^ part, 24);
+            part     = rotl32(info->key[xorKey & 0xff] ^ xorKey, 8);
+            keyIndex ^= info->key[keyIndex & 0xff];
+            xorKey = rotl32(info->key[part & 0xff] ^ part, 8);
 
             i *= 2;
         }
@@ -124,10 +124,10 @@ static void crypt_encrypt(GCryptInfo *info, unsigned int *words, int len)
         }
 
         part   = rotl32(~info->msg[offset], 24);
-        xorKey = rotl32(info->key[(unsigned char)part] ^ part, 24);
-        part   = rotl32(info->key[(unsigned char)info->msg[offset + 16]] ^ info->msg[offset + 16], 8);
-        xorKey ^= info->key[(unsigned char)xorKey];
-        keyIndex = rotl32(info->key[(unsigned char)part] ^ part, 8);
+        xorKey = rotl32(info->key[part & 0xff] ^ part, 24);
+        part   = rotl32(info->key[info->msg[offset + 16] & 0xff] ^ info->msg[offset + 16], 8);
+        xorKey ^= info->key[xorKey & 0xff];
+        keyIndex = rotl32(info->key[part & 0xff] ^ part, 8);
 
         i = info->msg[offset + 32] + 1 + info->msg[offset + 32];
     }

From 56d61bdef3d9e0da7d65bb964fc3156a5eed0e07 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:13:23 +0100
Subject: [PATCH 1946/2040] Implement support for parsing group rooms and
 master info

---
 code/gamespy/goaceng.h     |   2 +-
 code/gamespy/gserver.c     |  56 +++++++++++++++
 code/gamespy/gserver.h     |   1 +
 code/gamespy/gserverlist.c | 144 ++++++++++++++++++++++++++++++++++---
 4 files changed, 191 insertions(+), 12 deletions(-)

diff --git a/code/gamespy/goaceng.h b/code/gamespy/goaceng.h
index 298f8338..3aabed11 100644
--- a/code/gamespy/goaceng.h
+++ b/code/gamespy/goaceng.h
@@ -85,7 +85,7 @@ stricase - assume the values are strings and do a case insensitive compare */
 typedef enum {cm_int, cm_float, cm_strcase, cm_stricase} GCompareMode;
 
 
-typedef enum {qt_basic, qt_info, qt_rules, qt_players, qt_info_rules, qt_status} GQueryType;
+typedef enum {qt_basic, qt_info, qt_rules, qt_players, qt_info_rules, qt_status, qt_grouprooms, qt_masterinfo} GQueryType;
 
 /* Messages that are passed to the ListCallBackFn */
 #define	LIST_STATECHANGED		1 // ServerListState changed, no parameters
diff --git a/code/gamespy/gserver.c b/code/gamespy/gserver.c
index 7a300558..a91a0cfc 100644
--- a/code/gamespy/gserver.c
+++ b/code/gamespy/gserver.c
@@ -36,6 +36,8 @@ Updated 6-17-99 (DDW)
 
 static int KeyValHashKeyP(const void *elem, int numbuckets);
 static int KeyValCompareKeyP(const void *entry1, const void *entry2);
+static char *mytok(char *instr, char delim);
+static char *LookupKey(GServer server, char *k);
 
 
 
@@ -48,6 +50,60 @@ void ServerFree(void *elem)
 	free(server);
 }
 
+static void ServerSetAddressFromString (GServer server, char *address)
+{
+    char *cpos;
+
+    cpos = strchr(address, ':');
+    if (!cpos) {
+        return;
+    }
+
+    *cpos = 0;
+    server->ip = inet_addr(address);
+    server->port = atoi(cpos + 1);
+}
+
+GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQueryType qtype, HashTable keylist)
+{
+    GServer       server;
+    char         *k;
+    char         *v;
+    int           curfield;
+    GKeyValuePair kvpair;
+
+    curfield = 0;
+    server   = (GServer)ServerNew(0, 0, qtype, keylist);
+    v        = mytok(serverdata + 1, '\\');
+
+    while (curfield < fieldcount) {
+        k = fieldlist[curfield];
+        if (!v) {
+            v = "";
+        }
+
+        if (!strcmp(k, "ip")) {
+            ServerSetAddressFromString((int)server, v);
+        } else if (qtype == qt_grouprooms && !strcmp(k, "other")) {
+            for (char *p = v; *p; ++p) {
+                if (*p == 1) {
+                    *p = '\\';
+                }
+            }
+            ServerParseKeyVals(server, v);
+        } else {
+            kvpair.key   = (char *)LookupKey((int)server, k);
+            kvpair.value = (char *)LookupKey((int)server, v);
+            TableEnter(server->keyvals, &kvpair);
+        }
+        if (++curfield < fieldcount) {
+            v = mytok(0, '\\');
+        }
+    }
+
+    return server;
+}
+
 GServer ServerNew(unsigned long ip, unsigned short port, GQueryType qtype, HashTable keylist)
 {
 	GServer server;
diff --git a/code/gamespy/gserver.h b/code/gamespy/gserver.h
index a62822fd..bfae31b8 100644
--- a/code/gamespy/gserver.h
+++ b/code/gamespy/gserver.h
@@ -62,6 +62,7 @@ typedef struct
 } GEnumData;
 
 void ServerFree(void *elem);
+GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQueryType qtype, HashTable keylist);
 GServer ServerNew(unsigned long ip, unsigned short port, GQueryType qtype, HashTable keylist);
 void ServerParseKeyVals(GServer server, char *keyvals);
 int GStringHash(const void *elem, int numbuckets);
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index f3105f58..debcec3e 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -69,7 +69,7 @@ typedef struct
 	struct sockaddr_in saddr;
 } UpdateInfo;
 
-
+typedef enum { pi_fieldcount, pi_fields, pi_servers } GParseInfoState;
 
 struct GServerListImplementation
 {
@@ -94,6 +94,7 @@ struct GServerListImplementation
     // Added in 2.0
     GCryptInfo cryptinfo;
     int encryptdata;
+    GParseInfoState pistate;
 };
 
 GServerList g_sortserverlist; //global serverlist for sorting info!!
@@ -251,6 +252,7 @@ static GError SendListRequest(GServerList serverlist, char *filter)
 	char data[256], *ptr, result[64];
 	int len;
     int i;
+    char *modifier;
 	
 	len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
 	if (gsiSocketIsError(len))
@@ -286,11 +288,23 @@ static GError SendListRequest(GServerList serverlist, char *filter)
 	if (gsiSocketIsError(len) || len == 0)
 		return GE_NOCONNECT;
 
-	//send the list request
+    if (serverlist->querytype == qt_grouprooms) {
+        modifier = "groups";
+
+        serverlist->pistate = pi_fieldcount;
+    } else if (serverlist->querytype == qt_masterinfo) {
+        modifier = "info2";
+
+        serverlist->pistate = pi_fieldcount;
+    } else {
+        modifier = "cmp";
+    }
+
+    //send the list request
 	if (filter)
-		sprintf(data, "\\list\\cmp\\gamename\\%s\\where\\%s\\final\\", serverlist->gamename, filter);
+		sprintf(data, "\\list\\%s\\gamename\\%s\\where\\%s\\final\\", modifier, serverlist->gamename, filter);
 	else
-		sprintf(data, "\\list\\cmp\\gamename\\%s\\final\\", serverlist->gamename);
+		sprintf(data, "\\list\\%s\\gamename\\%s\\final\\", modifier, serverlist->gamename);
 	len = send ( serverlist->slsocket, data, strlen(data), 0 );
 	if (gsiSocketIsError(len) || len == 0)
 		return GE_NOCONNECT;
@@ -393,6 +407,15 @@ GError ServerListLANUpdate(GServerList serverlist, gbool async, int startsearchp
 	return 0;
 }
 
+//add a new server based on the data
+static GServer ServerListAddServerData(GServerList serverlist, char **fieldlist, int fieldcount, char *serverdata, GQueryType qtype)
+{
+    GServer server;
+
+    server = ServerNewData(fieldlist, fieldcount, serverdata, qtype, serverlist->keylist);
+    ArrayAppend(serverlist->servers, &server);
+    return server;
+}
 
 //add the server to the list with the given ip, port
 static void ServerListAddServer(GServerList serverlist, unsigned long ip, unsigned short port, GQueryType qtype)
@@ -566,9 +589,97 @@ static GError ServerListLANList(GServerList serverlist)
 		ServerListModeChange(serverlist, sl_querying);
 	}
 	return 0;
-
 }
-							 
+
+static int CountSlashOffset(char *data, int len, int slashcount)
+{
+    char *p;
+
+    for (p = data; slashcount && p != data + len; ++p) {
+        if (*p == '\\') {
+            slashcount--;
+        }
+    }
+
+    if (slashcount) {
+        return -1;
+    }
+
+    return p - data;
+}
+
+//parses and retrieve servers based on fields
+static int ServerListParseInfoList(GServerList serverlist, char *data, int len)
+{
+    char      *fieldlist[20];
+    char       tempfield[64];
+    char      *tempptr;
+    static int fieldcount;
+    int        offset;
+    int        i;
+    GServer    server;
+
+    switch (serverlist->pistate) {
+    case pi_fieldcount:
+        offset = CountSlashOffset(data, len, 3);
+        if (offset == -1) {
+            return 0;
+        }
+        if (offset < 12) {
+            return 0;
+        }
+
+        strncpy(tempfield, data + 12, offset - 12);
+        tempfield[offset - 13] = 0;
+
+        fieldcount = atoi(tempfield);
+        if (fieldcount > 20) {
+            return -1;
+        }
+
+        serverlist->pistate = pi_fields;
+
+        for (i = 0; i < fieldcount; ++i) {
+            fieldlist[i] = 0;
+        }
+
+        return offset - 1;
+    case pi_fields:
+        offset = CountSlashOffset(data, len, 2);
+        if (offset == -1) {
+            return 0;
+        }
+
+        strncpy(tempfield, data + 1, offset - 2);
+        tempfield[offset - 2] = 0;
+        tempptr               = goastrdup(tempfield);
+
+        for (i = 0; i < fieldcount; ++i) {
+            if (!fieldlist[i]) {
+                fieldlist[i] = tempptr;
+                if (i == fieldcount - 1) {
+                    serverlist->pistate = pi_servers;
+                }
+                return offset - 1;
+            }
+        }
+
+        return -1;
+    case pi_servers:
+        offset = CountSlashOffset(data, len, fieldcount + 1);
+        if (offset == -1) {
+            return 0;
+        }
+
+        server = ServerListAddServerData(serverlist, (char **)fieldlist, fieldcount, data, serverlist->querytype);
+        data[offset - 1] = '\\';
+        serverlist->CallBackFn(serverlist, 2, serverlist->instance, server, 0);
+        return offset - 1;
+    default:
+        return -1;
+    }
+}
+
 //reads the server list from the socket and parses it
 static GError ServerListReadList(GServerList serverlist)
 {
@@ -641,11 +752,22 @@ static GError ServerListReadList(GServerList serverlist)
             }
             if (oldlen < 6) //no way it could be a full IP, quit
                 break;
-            memcpy(&ip,p,4);
-            p += 4;
-            memcpy(&port,p,2);
-            p += 2;
-            ServerListAddServer(serverlist,ip,  ntohs(port), serverlist->querytype );
+
+            if (serverlist->querytype == qt_grouprooms || serverlist->querytype == qt_masterinfo) {
+                i = ServerListParseInfoList(serverlist, p, oldlen - (p - data));
+                if (i < 0) {
+                    serverlist->abortupdate = 1;
+                } else if (!i) {
+                    // finished
+                    break;
+                }
+            } else {
+                memcpy(&ip, p, 4);
+                p += 4;
+                memcpy(&port, p, 2);
+                p += 2;
+                ServerListAddServer(serverlist, ip, ntohs(port), serverlist->querytype);
+            }
         }
     }
 	oldlen = oldlen - (p - data);

From 83aa818c006ab375781f2caa6f3464182a370080 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:24:19 +0100
Subject: [PATCH 1947/2040] Don't add the same server twice

---
 code/gamespy/gserverlist.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index debcec3e..3b089d35 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -91,9 +91,13 @@ struct GServerListImplementation
 	GQueryType querytype;
 	HashTable keylist;
 
+    // Added in 2.0
+    int numservers;
     // Added in 2.0
     GCryptInfo cryptinfo;
+    // Added in OPM
     int encryptdata;
+
     GParseInfoState pistate;
 };
 
@@ -133,7 +137,11 @@ GServerList	ServerListNew(const char *gamename, const char *enginename, const ch
 	assert(CallBackFn != NULL);
 	list->instance = instance;
 	list->sortkey = "";
+    // Added in 2.0
+    list->numservers = 0;
+    // Added in OPM
     list->encryptdata = 1;
+
 	SocketStartUp();
 	return list;	
 }
@@ -374,6 +382,8 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
 	serverlist->nextupdate = 0;
 	serverlist->abortupdate = 0;
     // Added in 2.0
+    serverlist->numservers = ServerListCount(serverlist);
+    // Added in 2.0
     serverlist->cryptinfo.offset = -1;
 	if (!async)
 		DoSyncLoop(serverlist);
@@ -436,12 +446,12 @@ static void ServerListInsertServer(GServerList serverlist, unsigned long ip, uns
 }
 
 //find the server in the list, returns -1 if it does not exist
-static int ServerListFindServer(GServerList serverlist, unsigned int ip, int port)
+static int ServerListFindServerMax(GServerList serverlist, unsigned int ip, int port, int count)
 {
 	int i;
 	GServer server;
 
-	for (i = 0; i < ArrayLength(serverlist->servers) ; i++)
+	for (i = 0; i < count ; i++)
 	{
 		server = *(GServer *)ArrayNth(serverlist->servers,i);
 		if (port == ServerGetQueryPort(server) && ServerGetInetAddress(server)==ip)
@@ -452,6 +462,12 @@ static int ServerListFindServer(GServerList serverlist, unsigned int ip, int por
 	return -1;
 }
 
+//find the server in the list, returns -1 if it does not exist
+static int ServerListFindServer(GServerList serverlist, unsigned int ip, int port)
+{
+    return ServerListFindServerMax(serverlist, ip, port, ArrayLength(serverlist->servers));
+}
+
 //finds the server in the list of servers currently being queried
 // returns -1 if it does not exist
 static int ServerListFindServerInUpdateList(GServerList serverlist, GServer server)
@@ -766,7 +782,11 @@ static GError ServerListReadList(GServerList serverlist)
                 p += 4;
                 memcpy(&port, p, 2);
                 p += 2;
-                ServerListAddServer(serverlist, ip, ntohs(port), serverlist->querytype);
+                // Added in 2.0
+                //  Skip adding the server if already exists
+                if (ServerListFindServerMax(serverlist, ip, ntohs(port), serverlist->numservers) == -1) {
+                    ServerListAddServer(serverlist, ip, ntohs(port), serverlist->querytype);
+                }
             }
         }
     }

From 7fff3192a6012984cbbc65cee977e7cf3778d4ad Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:34:19 +0100
Subject: [PATCH 1948/2040] Fix server object mistakenly casted to int

---
 code/gamespy/gserver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/gamespy/gserver.c b/code/gamespy/gserver.c
index a91a0cfc..d5ccc7fe 100644
--- a/code/gamespy/gserver.c
+++ b/code/gamespy/gserver.c
@@ -83,7 +83,7 @@ GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQuery
         }
 
         if (!strcmp(k, "ip")) {
-            ServerSetAddressFromString((int)server, v);
+            ServerSetAddressFromString(server, v);
         } else if (qtype == qt_grouprooms && !strcmp(k, "other")) {
             for (char *p = v; *p; ++p) {
                 if (*p == 1) {
@@ -92,8 +92,8 @@ GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQuery
             }
             ServerParseKeyVals(server, v);
         } else {
-            kvpair.key   = (char *)LookupKey((int)server, k);
-            kvpair.value = (char *)LookupKey((int)server, v);
+            kvpair.key   = (char *)LookupKey(server, k);
+            kvpair.value = (char *)LookupKey(server, v);
             TableEnter(server->keyvals, &kvpair);
         }
         if (++curfield < fieldcount) {

From 32ba71693c4299e35988f88c8644195762c77b68 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 22:56:57 +0100
Subject: [PATCH 1949/2040] Remove some unnecessary endian swap

---
 code/gamespy/gcrypt.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/code/gamespy/gcrypt.c b/code/gamespy/gcrypt.c
index da5c4848..ed0f6ab4 100644
--- a/code/gamespy/gcrypt.c
+++ b/code/gamespy/gcrypt.c
@@ -167,10 +167,6 @@ void init_crypt_key(unsigned char *src, unsigned int len, GCryptInfo *info)
         }
     }
 
-    for (k = 0; k < 256; k++) {
-        info->key[k] = LittleLong(info->key[k]);
-    }
-
     for (k = 0; k < 256; k++) {
         info->key[k] ^= k;
     }
@@ -188,11 +184,7 @@ void crypt_docrypt(GCryptInfo *info, unsigned char *out, int len)
             crypt_encrypt(info, info->words, ARRAY_LEN(info->words));
         }
 
-        char value[4];
-        CopyLittleLong(value, info->wordPtr);
-        memcpy(info->wordPtr, value, sizeof(value));
-
-        out[i] ^= *(unsigned char *)info->wordPtr;
+        out[i] ^= *info->wordPtr;
         info->wordPtr++;
     }
 }

From 2c72908f768f038c883b3534a9e5d6ec07081d04 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Feb 2025 23:29:40 +0100
Subject: [PATCH 1950/2040] Use the correct allocator when archiving a con_set
 object

The default c++ allocator was be used to allocate an array of pointers, but then when destroying the array, Z_Free was called which would throw an error
---
 code/fgame/archive.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/fgame/archive.h b/code/fgame/archive.h
index 45033055..0e584fd8 100644
--- a/code/fgame/archive.h
+++ b/code/fgame/archive.h
@@ -293,7 +293,7 @@ void con_set<key, value>::Archive(Archiver& arc)
 
     if (arc.Loading()) {
         if (tableLength != 1) {
-            table = new Entry *[tableLength]();
+            table = new (NewTable(tableLength)) Entry *[tableLength]();
             memset(table, 0, tableLength * sizeof(Entry *));
         }
 

From 01381ed084412f5ecfcc5b51f0724c069357890b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 23 Feb 2025 21:30:56 +0100
Subject: [PATCH 1951/2040] Add HTTP support and update checking

---
 .github/workflows/shared-build.yml            |    98 +-
 code/cpp-httplib-0.19.0/.gitattributes        |     2 +
 code/cpp-httplib-0.19.0/CMakeLists.txt        |   309 +
 code/cpp-httplib-0.19.0/Dockerfile            |    11 +
 code/cpp-httplib-0.19.0/LICENSE               |    22 +
 code/cpp-httplib-0.19.0/README.md             |   979 +
 code/cpp-httplib-0.19.0/benchmark/Makefile    |    62 +
 .../benchmark/cpp-httplib-base/httplib.h      | 10154 +++++++
 .../benchmark/cpp-httplib-base/main.cpp       |    12 +
 .../benchmark/cpp-httplib/main.cpp            |    12 +
 .../benchmark/crow/crow_all.h                 | 14316 ++++++++++
 .../benchmark/crow/main.cpp                   |    17 +
 code/cpp-httplib-0.19.0/benchmark/download.sh |     2 +
 .../cpp-httplib-0.19.0/cmake/FindBrotli.cmake |   168 +
 .../cmake/httplibConfig.cmake.in              |    84 +
 code/cpp-httplib-0.19.0/docker-compose.yml    |     7 +
 .../cpp-httplib-0.19.0/docker/html/index.html |    21 +
 code/cpp-httplib-0.19.0/docker/main.cc        |    81 +
 .../example/Dockerfile.hello                  |    12 +
 code/cpp-httplib-0.19.0/example/Makefile      |    64 +
 code/cpp-httplib-0.19.0/example/benchmark.cc  |    33 +
 code/cpp-httplib-0.19.0/example/ca-bundle.crt |  3401 +++
 code/cpp-httplib-0.19.0/example/client.cc     |    41 +
 .../cpp-httplib-0.19.0/example/client.vcxproj |   160 +
 code/cpp-httplib-0.19.0/example/example.sln   |    46 +
 code/cpp-httplib-0.19.0/example/hello.cc      |    19 +
 .../example/one_time_request.cc               |    56 +
 code/cpp-httplib-0.19.0/example/redirect.cc   |    60 +
 code/cpp-httplib-0.19.0/example/server.cc     |   113 +
 .../cpp-httplib-0.19.0/example/server.vcxproj |   160 +
 .../example/server_and_client.cc              |    90 +
 code/cpp-httplib-0.19.0/example/simplecli.cc  |    29 +
 code/cpp-httplib-0.19.0/example/simplesvr.cc  |   135 +
 code/cpp-httplib-0.19.0/example/upload.cc     |    61 +
 code/cpp-httplib-0.19.0/example/uploader.sh   |     6 +
 code/cpp-httplib-0.19.0/httplib.h             | 10475 +++++++
 code/cpp-httplib-0.19.0/meson.build           |   116 +
 code/cpp-httplib-0.19.0/meson_options.txt     |    10 +
 code/cpp-httplib-0.19.0/split.py              |    67 +
 code/cpp-httplib-0.19.0/test/CMakeLists.txt   |   121 +
 code/cpp-httplib-0.19.0/test/Makefile         |    73 +
 code/cpp-httplib-0.19.0/test/ca-bundle.crt    |  3401 +++
 .../test/fuzzing/CMakeLists.txt               |    10 +
 code/cpp-httplib-0.19.0/test/fuzzing/Makefile |    27 +
 code/cpp-httplib-0.19.0/test/fuzzing/corpus/1 |     1 +
 code/cpp-httplib-0.19.0/test/fuzzing/corpus/2 |     5 +
 code/cpp-httplib-0.19.0/test/fuzzing/corpus/3 |   Bin 0 -> 54 bytes
 ...e-minimized-server_fuzzer-5042094968537088 |   Bin 0 -> 516575 bytes
 ...e-minimized-server_fuzzer-5372331946541056 |   Bin 0 -> 1041826 bytes
 ...e-minimized-server_fuzzer-5386708825800704 |   Bin 0 -> 787294 bytes
 ...e-minimized-server_fuzzer-5667822731132928 |   Bin 0 -> 317 bytes
 ...e-minimized-server_fuzzer-5886572146327552 |   Bin 0 -> 974479 bytes
 ...e-minimized-server_fuzzer-5942767436562432 |   Bin 0 -> 395 bytes
 ...e-minimized-server_fuzzer-6007379124158464 |   Bin 0 -> 452123 bytes
 ...e-minimized-server_fuzzer-6508706672541696 |     7 +
 .../test/fuzzing/corpus/issue1264             |    19 +
 .../test/fuzzing/server_fuzzer.cc             |    98 +
 .../test/fuzzing/server_fuzzer.dict           |   224 +
 .../fuzzing/standalone_fuzz_target_runner.cpp |    35 +
 code/cpp-httplib-0.19.0/test/gen-certs.sh     |    18 +
 .../test/gtest/gtest-all.cc                   | 12501 +++++++++
 code/cpp-httplib-0.19.0/test/gtest/gtest.h    | 12377 +++++++++
 .../test/gtest/gtest_main.cc                  |    54 +
 code/cpp-httplib-0.19.0/test/image.jpg        |   Bin 0 -> 33653 bytes
 .../test/include_httplib.cc                   |     5 +
 .../test/make-shared-library.sh               |    28 +
 code/cpp-httplib-0.19.0/test/meson.build      |   144 +
 code/cpp-httplib-0.19.0/test/proxy/Dockerfile |    13 +
 .../test/proxy/basic_passwd                   |     1 +
 .../test/proxy/basic_squid.conf               |    81 +
 .../test/proxy/digest_passwd                  |     1 +
 .../test/proxy/digest_squid.conf              |    81 +
 .../test/proxy/docker-compose.yml             |    22 +
 code/cpp-httplib-0.19.0/test/test.cc          |  8458 ++++++
 code/cpp-httplib-0.19.0/test/test.conf        |    21 +
 code/cpp-httplib-0.19.0/test/test.rootCA.conf |    18 +
 code/cpp-httplib-0.19.0/test/test.sln         |    28 +
 code/cpp-httplib-0.19.0/test/test.vcxproj     |   180 +
 code/cpp-httplib-0.19.0/test/test_proxy.cc    |   288 +
 code/cpp-httplib-0.19.0/test/www/dir/1MB.txt  |  8192 ++++++
 .../test/www/dir/index.html                   |     8 +
 .../test/www/dir/meson.build                  |     8 +
 .../test/www/dir/test.abcde                   |     1 +
 .../cpp-httplib-0.19.0/test/www/dir/test.html |     1 +
 code/cpp-httplib-0.19.0/test/www/empty_file   |     0
 code/cpp-httplib-0.19.0/test/www/file         |     1 +
 code/cpp-httplib-0.19.0/test/www/meson.build  |     7 +
 .../test/www/日本語Dir/日本語File.txt         |     1 +
 .../test/www2/dir/index.html                  |     8 +
 .../test/www2/dir/meson.build                 |     6 +
 .../test/www2/dir/test.html                   |     1 +
 .../test/www3/dir/index.html                  |     8 +
 .../test/www3/dir/meson.build                 |     6 +
 .../test/www3/dir/test.html                   |     1 +
 code/qcommon/common.c                         |     8 +-
 code/qcommon/json.hpp                         | 22875 ++++++++++++++++
 code/qcommon/qcommon.h                        |     3 +
 code/sys/CMakeLists.txt                       |    17 +-
 code/sys/new/sys_local_new.h                  |    15 +-
 code/sys/new/sys_main_new.c                   |    12 +
 code/sys/sys_main.c                           |     2 +
 code/sys/sys_update_checker.cpp               |   250 +
 code/sys/sys_update_checker.h                 |    85 +
 docs/compiling.md                             |    13 +-
 104 files changed, 111355 insertions(+), 25 deletions(-)
 create mode 100644 code/cpp-httplib-0.19.0/.gitattributes
 create mode 100644 code/cpp-httplib-0.19.0/CMakeLists.txt
 create mode 100644 code/cpp-httplib-0.19.0/Dockerfile
 create mode 100644 code/cpp-httplib-0.19.0/LICENSE
 create mode 100644 code/cpp-httplib-0.19.0/README.md
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/Makefile
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/crow/main.cpp
 create mode 100644 code/cpp-httplib-0.19.0/benchmark/download.sh
 create mode 100644 code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake
 create mode 100644 code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in
 create mode 100644 code/cpp-httplib-0.19.0/docker-compose.yml
 create mode 100644 code/cpp-httplib-0.19.0/docker/html/index.html
 create mode 100644 code/cpp-httplib-0.19.0/docker/main.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/Dockerfile.hello
 create mode 100644 code/cpp-httplib-0.19.0/example/Makefile
 create mode 100644 code/cpp-httplib-0.19.0/example/benchmark.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/ca-bundle.crt
 create mode 100644 code/cpp-httplib-0.19.0/example/client.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/client.vcxproj
 create mode 100644 code/cpp-httplib-0.19.0/example/example.sln
 create mode 100644 code/cpp-httplib-0.19.0/example/hello.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/one_time_request.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/redirect.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/server.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/server.vcxproj
 create mode 100644 code/cpp-httplib-0.19.0/example/server_and_client.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/simplecli.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/simplesvr.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/upload.cc
 create mode 100644 code/cpp-httplib-0.19.0/example/uploader.sh
 create mode 100644 code/cpp-httplib-0.19.0/httplib.h
 create mode 100644 code/cpp-httplib-0.19.0/meson.build
 create mode 100644 code/cpp-httplib-0.19.0/meson_options.txt
 create mode 100644 code/cpp-httplib-0.19.0/split.py
 create mode 100644 code/cpp-httplib-0.19.0/test/CMakeLists.txt
 create mode 100644 code/cpp-httplib-0.19.0/test/Makefile
 create mode 100644 code/cpp-httplib-0.19.0/test/ca-bundle.crt
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/Makefile
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/1
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/2
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/3
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5372331946541056
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5386708825800704
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5667822731132928
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5942767436562432
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict
 create mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp
 create mode 100644 code/cpp-httplib-0.19.0/test/gen-certs.sh
 create mode 100644 code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc
 create mode 100644 code/cpp-httplib-0.19.0/test/gtest/gtest.h
 create mode 100644 code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc
 create mode 100644 code/cpp-httplib-0.19.0/test/image.jpg
 create mode 100644 code/cpp-httplib-0.19.0/test/include_httplib.cc
 create mode 100644 code/cpp-httplib-0.19.0/test/make-shared-library.sh
 create mode 100644 code/cpp-httplib-0.19.0/test/meson.build
 create mode 100644 code/cpp-httplib-0.19.0/test/proxy/Dockerfile
 create mode 100644 code/cpp-httplib-0.19.0/test/proxy/basic_passwd
 create mode 100644 code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf
 create mode 100644 code/cpp-httplib-0.19.0/test/proxy/digest_passwd
 create mode 100644 code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf
 create mode 100644 code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml
 create mode 100644 code/cpp-httplib-0.19.0/test/test.cc
 create mode 100644 code/cpp-httplib-0.19.0/test/test.conf
 create mode 100644 code/cpp-httplib-0.19.0/test/test.rootCA.conf
 create mode 100644 code/cpp-httplib-0.19.0/test/test.sln
 create mode 100644 code/cpp-httplib-0.19.0/test/test.vcxproj
 create mode 100644 code/cpp-httplib-0.19.0/test/test_proxy.cc
 create mode 100644 code/cpp-httplib-0.19.0/test/www/dir/1MB.txt
 create mode 100644 code/cpp-httplib-0.19.0/test/www/dir/index.html
 create mode 100644 code/cpp-httplib-0.19.0/test/www/dir/meson.build
 create mode 100644 code/cpp-httplib-0.19.0/test/www/dir/test.abcde
 create mode 100644 code/cpp-httplib-0.19.0/test/www/dir/test.html
 create mode 100644 code/cpp-httplib-0.19.0/test/www/empty_file
 create mode 100644 code/cpp-httplib-0.19.0/test/www/file
 create mode 100644 code/cpp-httplib-0.19.0/test/www/meson.build
 create mode 100644 code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt
 create mode 100644 code/cpp-httplib-0.19.0/test/www2/dir/index.html
 create mode 100644 code/cpp-httplib-0.19.0/test/www2/dir/meson.build
 create mode 100644 code/cpp-httplib-0.19.0/test/www2/dir/test.html
 create mode 100644 code/cpp-httplib-0.19.0/test/www3/dir/index.html
 create mode 100644 code/cpp-httplib-0.19.0/test/www3/dir/meson.build
 create mode 100644 code/cpp-httplib-0.19.0/test/www3/dir/test.html
 create mode 100644 code/qcommon/json.hpp
 create mode 100644 code/sys/sys_update_checker.cpp
 create mode 100644 code/sys/sys_update_checker.h

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 0c1edb7d..e87a802a 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -12,6 +12,11 @@ env:
   BUILD_TYPE: RelWithDebInfo
   RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
 
+#
+# NOTE:
+#  OpenSSL can be statically linked by configuring it with "no-shared no-threads" options
+#
+
 jobs:
   ##########################
   #
@@ -24,13 +29,13 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'amd64',    triple: 'x86_64-linux-gnu'},
-          {name: 'i686',     triple: 'i686-linux-gnu'},
-          {name: 'arm64',    triple: 'aarch64-linux-gnu'},
-          {name: 'armhf',    triple: 'arm-linux-gnueabihf'},
-          {name: 'powerpc',  triple: 'powerpc-linux-gnu'},
-          {name: 'ppc64',    triple: 'powerpc64-linux-gnu'},
-          {name: 'ppc64el',  triple: 'powerpc64le-linux-gnu'}
+          {name: 'amd64',    triple: 'x86_64-linux-gnu',        arch_option: 'linux-x86_64'},
+          {name: 'i686',     triple: 'i686-linux-gnu',          arch_option: 'linux-x86'},
+          {name: 'arm64',    triple: 'aarch64-linux-gnu',       arch_option: 'linux-aarch64'},
+          {name: 'armhf',    triple: 'arm-linux-gnueabihf',     arch_option: 'linux-armv4'},
+          {name: 'powerpc',  triple: 'powerpc-linux-gnu',       arch_option: 'linux-ppc'},
+          {name: 'ppc64',    triple: 'powerpc64-linux-gnu',     arch_option: 'linux-ppc64'},
+          {name: 'ppc64el',  triple: 'powerpc64le-linux-gnu',   arch_option: 'linux-ppc64le'}
         ]
 
     name: "Building for platform linux-${{matrix.architecture.name}}"
@@ -99,6 +104,26 @@ jobs:
         cmake --build ./build --config Release --parallel
         cmake --install ./build --config Release
 
+    ###
+    # OpenSSL
+    ###
+
+    # OpenSSL setup
+    - name: Checkout openssl
+      uses: actions/checkout@v4
+      with:
+        repository: 'openssl/openssl'
+        path: 'thirdparties/openssl'
+        ref: 'openssl-3.4.1'
+
+    # OpenSSL build
+    - name: Configure and install openssl
+      working-directory: ${{github.workspace}}/thirdparties/openssl
+      run: |
+        CC=gcc-12 CFLAGS= ./Configure --prefix=${{github.workspace}}/thirdparties/openssl/install --cross-compile-prefix=${{matrix.architecture.triple}}- ${{matrix.architecture.arch_option}}
+        make -j$(nproc)
+        make install
+
     ###
     # Project
     ###
@@ -113,6 +138,9 @@ jobs:
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
+        -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' \
+        -DHTTPLIB_REQUIRE_OPENSSL=ON \
+        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
         -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
 
@@ -143,6 +171,8 @@ jobs:
         mkdir ${{github.workspace}}/package
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/openssl/install/lib*/libcrypto.so.3 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/openssl/install/lib*/libssl.so.3 '${{github.workspace}}/package/'
         if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
         if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
 
@@ -167,9 +197,9 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'x64',   config: 'x64',    toolset: 'x64' },
-          {name: 'x86',   config: 'Win32',  toolset: 'x64_x86' },
-          {name: 'arm64', config: 'ARM64',  toolset: 'x64_arm64' }
+          {name: 'x64',   config: 'x64',    toolset: 'x64',        arch_option: 'VC-WIN64A'},
+          {name: 'x86',   config: 'Win32',  toolset: 'x64_x86',    arch_option: 'VC-WIN32' },
+          {name: 'arm64', config: 'ARM64',  toolset: 'x64_arm64',  arch_option: 'VC-WIN64-ARM' }
         ]
 
     name: "Building for platform windows-${{matrix.architecture.name}}"
@@ -188,13 +218,6 @@ jobs:
     #  run: |
     #    choco install -y ninja
 
-    - name: Install required packages
-      run: |
-        $DownloadPath="$($env:USERPROFILE)\Downloads"
-        Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
-        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "$($env:PROGRAMFILES)\ninja"
-        echo "$($env:PROGRAMFILES)\ninja" >> $GITHUB_PATH
-
     - name: Install Flex/Bison
       working-directory: ${{github.workspace}}
       run: |
@@ -220,6 +243,16 @@ jobs:
         }
         popd
 
+    - name: Install required packages
+      run: |
+        $DownloadPath="$($env:USERPROFILE)\Downloads"
+        Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "$($env:PROGRAMFILES)\ninja"
+        Invoke-WebRequest "http://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
+        Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "$($env:PROGRAMFILES)\jom"
+        $env:PATH += ";$($env:PROGRAMFILES)\ninja;$($env:PROGRAMFILES)\jom"
+        echo "PATH=$($env:PATH)" >> $env:GITHUB_ENV
+
     ###
     # SDL
     ###
@@ -267,6 +300,26 @@ jobs:
         # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
         if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
 
+    ###
+    # OpenSSL
+    ###
+
+    # OpenSSL setup
+    - name: Checkout openssl
+      uses: actions/checkout@v4
+      with:
+        repository: 'openssl/openssl'
+        path: 'thirdparties/openssl'
+        ref: 'openssl-3.4.1'
+
+    # OpenSSL build
+    - name: Configure and install openssl
+      working-directory: ${{github.workspace}}/thirdparties/openssl
+      run: |
+        perl .\Configure --prefix=${{github.workspace}}/thirdparties/openssl/install no-asm ${{matrix.architecture.arch_option}} /FS
+        jom -j($(Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors)
+        nmake install
+
     ###
     # Project
     ###
@@ -284,6 +337,9 @@ jobs:
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' `
+        -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' `
+        -DHTTPLIB_REQUIRE_OPENSSL=ON `
+        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF `
         -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
         -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
 
@@ -313,6 +369,7 @@ jobs:
         New-Item -ItemType Directory '${{github.workspace}}/package'
         Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
         Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/openssl/install/bin/*.dll' -Destination '${{github.workspace}}/package'
         if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
         if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
 
@@ -367,7 +424,7 @@ jobs:
     # Paths on x86_64 and ARM64 are different for homebrew
     - name: Install required packages
       run: |
-        brew update && brew install git flex bison ninja cmake llvm ninja
+        brew update && brew install git flex bison ninja cmake llvm ninja perl
 
     - name: Settings
       working-directory: ${{github.workspace}}
@@ -390,6 +447,7 @@ jobs:
         build-type: Release
         cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}'
           -DCMAKE_VERBOSE_MAKEFILE=on"
+
     ###
     # OpenAL
     ###
@@ -404,6 +462,7 @@ jobs:
         path: 'thirdparties/soft-oal'
         ref: '1.24.2'
 
+    # soft-oal build
     - name: Configure and install soft-oal
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
@@ -430,6 +489,9 @@ jobs:
         -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
+        -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' \
+        -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF \
+        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
         -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
 
diff --git a/code/cpp-httplib-0.19.0/.gitattributes b/code/cpp-httplib-0.19.0/.gitattributes
new file mode 100644
index 00000000..f8184834
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/.gitattributes
@@ -0,0 +1,2 @@
+/test/www*/dir/*.html text eol=lf
+/test/www*/dir/*.txt text eol=lf
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/CMakeLists.txt b/code/cpp-httplib-0.19.0/CMakeLists.txt
new file mode 100644
index 00000000..61419c63
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/CMakeLists.txt
@@ -0,0 +1,309 @@
+#[[
+	Build options:
+	* BUILD_SHARED_LIBS (default off) builds as a shared library (if HTTPLIB_COMPILE is ON)
+	* HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on)
+	* HTTPLIB_USE_ZLIB_IF_AVAILABLE (default on)
+	* HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on)
+	* HTTPLIB_REQUIRE_OPENSSL (default off)
+	* HTTPLIB_REQUIRE_ZLIB (default off)
+	* HTTPLIB_REQUIRE_BROTLI (default off)
+	* HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN (default on)
+	* HTTPLIB_COMPILE (default off)
+	* HTTPLIB_INSTALL (default on)
+	* HTTPLIB_TEST (default off)
+	* BROTLI_USE_STATIC_LIBS - tells Cmake to use the static Brotli libs (only works if you have them installed).
+	* OPENSSL_USE_STATIC_LIBS - tells Cmake to use the static OpenSSL libs (only works if you have them installed).
+
+	-------------------------------------------------------------------------------
+
+	After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL ZLIB Brotli) is available.
+	This creates a httplib::httplib target (if found and if listed components are supported).
+	It can be linked like so:
+
+	target_link_libraries(your_exe httplib::httplib)
+
+	The following will build & install for later use.
+
+	Linux/macOS:
+
+	mkdir -p build
+	cd build
+	cmake -DCMAKE_BUILD_TYPE=Release ..
+	sudo cmake --build . --target install
+
+	Windows:
+
+	mkdir build
+	cd build
+	cmake ..
+	runas /user:Administrator "cmake --build . --config Release --target install"
+
+	-------------------------------------------------------------------------------
+
+	These variables are available after you run find_package(httplib)
+	* HTTPLIB_HEADER_PATH - this is the full path to the installed header (e.g. /usr/include/httplib.h).
+	* HTTPLIB_IS_USING_OPENSSL - a bool for if OpenSSL support is enabled.
+	* HTTPLIB_IS_USING_ZLIB - a bool for if ZLIB support is enabled.
+	* HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled.
+	* HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN - a bool for if support of loading system certs from the Apple Keychain is enabled.
+	* HTTPLIB_IS_COMPILED - a bool for if the library is compiled, or otherwise header-only.
+	* HTTPLIB_INCLUDE_DIR - the root path to httplib's header (e.g. /usr/include).
+	* HTTPLIB_LIBRARY - the full path to the library if compiled (e.g. /usr/lib/libhttplib.so).
+	* httplib_VERSION or HTTPLIB_VERSION - the project's version string.
+	* HTTPLIB_FOUND - a bool for if the target was found.
+
+	Want to use precompiled headers (Cmake feature since v3.16)?
+	It's as simple as doing the following (before linking):
+
+	target_precompile_headers(httplib::httplib INTERFACE "${HTTPLIB_HEADER_PATH}")
+
+	-------------------------------------------------------------------------------
+
+	ARCH_INDEPENDENT option of write_basic_package_version_file() requires Cmake v3.14
+]]
+cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
+
+# Get the CPPHTTPLIB_VERSION value and use it as a version
+# This gets the string with the CPPHTTPLIB_VERSION value from the header.
+# This is so the maintainer doesn't actually need to update this manually.
+file(STRINGS httplib.h _raw_version_string REGEX "CPPHTTPLIB_VERSION \"([0-9]+\\.[0-9]+\\.[0-9]+)\"")
+
+# Extracts just the version string itself from the whole string contained in _raw_version_string
+# since _raw_version_string would contain the entire line of code where it found the version string
+string(REGEX MATCH "([0-9]+\\.?)+" _httplib_version "${_raw_version_string}")
+
+project(httplib
+	VERSION ${_httplib_version}
+	LANGUAGES CXX
+	DESCRIPTION "A C++ header-only HTTP/HTTPS server and client library."
+	HOMEPAGE_URL "https://github.com/yhirose/cpp-httplib"
+)
+
+# Change as needed to set an OpenSSL minimum version.
+# This is used in the installed Cmake config file.
+set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0")
+
+# Lets you disable C++ exception during CMake configure time.
+# The value is used in the install CMake config file.
+option(HTTPLIB_NO_EXCEPTIONS "Disable the use of C++ exceptions" OFF)
+# Allow for a build to require OpenSSL to pass, instead of just being optional
+option(HTTPLIB_REQUIRE_OPENSSL "Requires OpenSSL to be found & linked, or fails build." OFF)
+option(HTTPLIB_REQUIRE_ZLIB "Requires ZLIB to be found & linked, or fails build." OFF)
+# Allow for a build to casually enable OpenSSL/ZLIB support, but silently continue if not found.
+# Make these options so their automatic use can be specifically disabled (as needed)
+option(HTTPLIB_USE_OPENSSL_IF_AVAILABLE "Uses OpenSSL (if available) to enable HTTPS support." ON)
+option(HTTPLIB_USE_ZLIB_IF_AVAILABLE "Uses ZLIB (if available) to enable Zlib compression support." ON)
+# Lets you compile the program as a regular library instead of header-only
+option(HTTPLIB_COMPILE "If ON, uses a Python script to split the header into a compilable header & source file (requires Python v3)." OFF)
+# Lets you disable the installation (useful when fetched from another CMake project)
+option(HTTPLIB_INSTALL "Enables the installation target" ON)
+option(HTTPLIB_TEST "Enables testing and builds tests" OFF)
+option(HTTPLIB_REQUIRE_BROTLI "Requires Brotli to be found & linked, or fails build." OFF)
+option(HTTPLIB_USE_BROTLI_IF_AVAILABLE "Uses Brotli (if available) to enable Brotli decompression support." ON)
+option(HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN "Enable feature to load system certs from the Apple Keychain." ON)
+# Defaults to static library
+option(BUILD_SHARED_LIBS "Build the library as a shared library instead of static. Has no effect if using header-only." OFF)
+if (BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
+	# Necessary for Windows if building shared libs
+	# See https://stackoverflow.com/a/40743080
+	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+# Set some variables that are used in-tree and while building based on our options
+set(HTTPLIB_IS_COMPILED ${HTTPLIB_COMPILE})
+set(HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN ${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN})
+
+# Threads needed for <thread> on some systems, and for <pthread.h> on Linux
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+find_package(Threads REQUIRED)
+# Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
+if(HTTPLIB_REQUIRE_OPENSSL)
+	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
+	set(HTTPLIB_IS_USING_OPENSSL TRUE)
+elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
+	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
+	# Avoid a rare circumstance of not finding all components but the end-user did their
+	# own call for OpenSSL, which might trick us into thinking we'd otherwise have what we wanted
+	if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
+		set(HTTPLIB_IS_USING_OPENSSL ${OPENSSL_FOUND})
+	else()
+		set(HTTPLIB_IS_USING_OPENSSL FALSE)
+	endif()
+endif()
+
+if(HTTPLIB_REQUIRE_ZLIB)
+	find_package(ZLIB REQUIRED)
+	set(HTTPLIB_IS_USING_ZLIB TRUE)
+elseif(HTTPLIB_USE_ZLIB_IF_AVAILABLE)
+	find_package(ZLIB QUIET)
+	# FindZLIB doesn't have a ZLIB_FOUND variable, so check the target.
+	if(TARGET ZLIB::ZLIB)
+		set(HTTPLIB_IS_USING_ZLIB TRUE)
+	endif()
+endif()
+
+# Adds our cmake folder to the search path for find_package
+# This is so we can use our custom FindBrotli.cmake
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+if(HTTPLIB_REQUIRE_BROTLI)
+	find_package(Brotli COMPONENTS encoder decoder common REQUIRED)
+	set(HTTPLIB_IS_USING_BROTLI TRUE)
+elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
+	find_package(Brotli COMPONENTS encoder decoder common QUIET)
+	set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
+endif()
+
+# Used for default, common dirs that the end-user can change (if needed)
+# like CMAKE_INSTALL_INCLUDEDIR or CMAKE_INSTALL_DATADIR
+include(GNUInstallDirs)
+
+if(HTTPLIB_COMPILE)
+	# Put the split script into the build dir
+	configure_file(split.py "${CMAKE_CURRENT_BINARY_DIR}/split.py"
+		COPYONLY
+	)
+	# Needs to be in the same dir as the python script
+	configure_file(httplib.h "${CMAKE_CURRENT_BINARY_DIR}/httplib.h"
+		COPYONLY
+	)
+
+	# Used outside of this if-else
+	set(_INTERFACE_OR_PUBLIC PUBLIC)
+	# Brings in the Python3_EXECUTABLE path we can use.
+	find_package(Python3 REQUIRED)
+	# Actually split the file
+	# Keeps the output in the build dir to not pollute the main dir
+	execute_process(COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/split.py"
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+		ERROR_VARIABLE _httplib_split_error
+	)
+	if(_httplib_split_error)
+		message(FATAL_ERROR "Failed when trying to split cpp-httplib with the Python script.\n${_httplib_split_error}")
+	endif()
+
+	# split.py puts output in "out"
+	set(_httplib_build_includedir "${CMAKE_CURRENT_BINARY_DIR}/out")
+	# This will automatically be either static or shared based on the value of BUILD_SHARED_LIBS
+	add_library(${PROJECT_NAME} "${_httplib_build_includedir}/httplib.cc")
+	target_sources(${PROJECT_NAME}
+		PUBLIC
+			$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
+			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
+	)
+	set_target_properties(${PROJECT_NAME}
+		PROPERTIES
+			VERSION ${${PROJECT_NAME}_VERSION}
+			SOVERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}"
+			OUTPUT_NAME cpp-httplib
+	)
+else()
+	# This is for header-only.
+	set(_INTERFACE_OR_PUBLIC INTERFACE)
+	add_library(${PROJECT_NAME} INTERFACE)
+	set(_httplib_build_includedir "${CMAKE_CURRENT_SOURCE_DIR}")
+endif()
+# Lets you address the target with httplib::httplib
+# Only useful if building in-tree, versus using it from an installation.
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+# Require C++11
+target_compile_features(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} cxx_std_11)
+
+target_include_directories(${PROJECT_NAME} SYSTEM ${_INTERFACE_OR_PUBLIC}
+    $<BUILD_INTERFACE:${_httplib_build_includedir}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+# Always require threads
+target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+		Threads::Threads
+		# Needed for Windows libs on Mingw, as the pragma comment(lib, "xyz") aren't triggered.
+		$<$<PLATFORM_ID:Windows>:ws2_32>
+		$<$<PLATFORM_ID:Windows>:crypt32>
+		# Needed for API from MacOS Security framework
+		"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
+		# Can't put multiple targets in a single generator expression or it bugs out.
+		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::common>
+		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
+		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::decoder>
+		$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
+		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
+		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
+)
+
+# Set the definitions to enable optional features
+target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+	$<$<BOOL:${HTTPLIB_NO_EXCEPTIONS}>:CPPHTTPLIB_NO_EXCEPTIONS>
+	$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:CPPHTTPLIB_BROTLI_SUPPORT>
+	$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:CPPHTTPLIB_ZLIB_SUPPORT>
+	$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT>
+	$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN>
+)
+
+# CMake configuration files installation directory
+set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+include(CMakePackageConfigHelpers)
+
+# Configures the meta-file httplibConfig.cmake.in to replace variables with paths/values/etc.
+configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+	INSTALL_DESTINATION "${_TARGET_INSTALL_CMAKEDIR}"
+	# Passes the includedir install path
+	PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
+)
+
+if(HTTPLIB_COMPILE)
+	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+		# Example: if you find_package(httplib 0.5.4)
+		# then anything >= 0.5.4 and < 0.6 is accepted
+		COMPATIBILITY SameMinorVersion
+	)
+else()
+	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+		# Example: if you find_package(httplib 0.5.4)
+		# then anything >= 0.5.4 and < 0.6 is accepted
+		COMPATIBILITY SameMinorVersion
+		# Tells Cmake that it's a header-only lib
+		# Mildly useful for end-users :)
+		ARCH_INDEPENDENT
+	)
+endif()
+
+if(HTTPLIB_INSTALL)
+	# Creates the export httplibTargets.cmake
+	# This is strictly what holds compilation requirements
+	# and linkage information (doesn't find deps though).
+	install(TARGETS ${PROJECT_NAME} EXPORT httplibTargets)
+
+	install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE)
+
+	install(FILES
+		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+		# Install it so it can be used later by the httplibConfig.cmake file.
+		# Put it in the same dir as our config file instead of a global path so we don't potentially stomp on other packages.
+		"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindBrotli.cmake"
+		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
+	)
+
+	# NOTE: This path changes depending on if it's on Windows or Linux
+	install(EXPORT httplibTargets
+		# Puts the targets into the httplib namespace
+		# So this makes httplib::httplib linkable after doing find_package(httplib)
+		NAMESPACE ${PROJECT_NAME}::
+		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
+	)
+
+	# Install documentation & license
+	# ex: /usr/share/doc/httplib/README.md and /usr/share/licenses/httplib/LICENSE
+	install(FILES "README.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}")
+	install(FILES "LICENSE" DESTINATION "${CMAKE_INSTALL_DATADIR}/licenses/${PROJECT_NAME}")
+
+	include(CPack)
+endif()
+
+if(HTTPLIB_TEST)
+    include(CTest)
+    add_subdirectory(test)
+endif()
diff --git a/code/cpp-httplib-0.19.0/Dockerfile b/code/cpp-httplib-0.19.0/Dockerfile
new file mode 100644
index 00000000..654845b2
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/Dockerfile
@@ -0,0 +1,11 @@
+FROM yhirose4dockerhub/ubuntu-builder AS builder
+WORKDIR /build
+COPY httplib.h .
+COPY docker/main.cc .
+RUN g++ -std=c++23 -static -o server -O2 -I. -DCPPHTTPLIB_USE_POLL main.cc && strip server
+
+FROM scratch
+COPY --from=builder /build/server /server
+COPY docker/html/index.html /html/index.html
+EXPOSE 80
+CMD ["/server"]
diff --git a/code/cpp-httplib-0.19.0/LICENSE b/code/cpp-httplib-0.19.0/LICENSE
new file mode 100644
index 00000000..3e5ed359
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 yhirose
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/code/cpp-httplib-0.19.0/README.md b/code/cpp-httplib-0.19.0/README.md
new file mode 100644
index 00000000..fc4b537f
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/README.md
@@ -0,0 +1,979 @@
+cpp-httplib
+===========
+
+[![](https://github.com/yhirose/cpp-httplib/workflows/test/badge.svg)](https://github.com/yhirose/cpp-httplib/actions)
+
+A C++11 single-file header-only cross platform HTTP/HTTPS library.
+
+It's extremely easy to setup. Just include the **httplib.h** file in your code!
+
+> [!IMPORTANT]
+> This library uses 'blocking' socket I/O. If you are looking for a library with 'non-blocking' socket I/O, this is not the one that you want.
+
+Simple examples
+---------------
+
+#### Server (Multi-threaded)
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+// HTTP
+httplib::Server svr;
+
+// HTTPS
+httplib::SSLServer svr;
+
+svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
+  res.set_content("Hello World!", "text/plain");
+});
+
+svr.listen("0.0.0.0", 8080);
+```
+
+#### Client
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+// HTTP
+httplib::Client cli("http://yhirose.github.io");
+
+// HTTPS
+httplib::Client cli("https://yhirose.github.io");
+
+auto res = cli.Get("/hi");
+res->status;
+res->body;
+```
+
+SSL Support
+-----------
+
+SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
+
+> [!NOTE]
+> cpp-httplib currently supports only version 3.0 or later. Please see [this page](https://www.openssl.org/policies/releasestrat.html) to get more information.
+
+> [!TIP]
+> For macOS: cpp-httplib now can use system certs with `CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN`. `CoreFoundation` and `Security` should be linked with `-framework`.
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+#include "path/to/httplib.h"
+
+// Server
+httplib::SSLServer svr("./cert.pem", "./key.pem");
+
+// Client
+httplib::Client cli("https://localhost:1234"); // scheme + host
+httplib::SSLClient cli("localhost:1234"); // host
+httplib::SSLClient cli("localhost", 1234); // host, port
+
+// Use your CA bundle
+cli.set_ca_cert_path("./ca-bundle.crt");
+
+// Disable cert verification
+cli.enable_server_certificate_verification(false);
+
+// Disable host verification
+cli.enable_server_hostname_verification(false);
+```
+
+> [!NOTE]
+> When using SSL, it seems impossible to avoid SIGPIPE in all cases, since on some operating systems, SIGPIPE can only be suppressed on a per-message basis, but there is no way to make the OpenSSL library do so for its internal communications. If your program needs to avoid being terminated on SIGPIPE, the only fully general way might be to set up a signal handler for SIGPIPE to handle or ignore it yourself.
+
+Server
+------
+
+```c++
+#include <httplib.h>
+
+int main(void)
+{
+  using namespace httplib;
+
+  Server svr;
+
+  svr.Get("/hi", [](const Request& req, Response& res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  // Match the request path against a regular expression
+  // and extract its captures
+  svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) {
+    auto numbers = req.matches[1];
+    res.set_content(numbers, "text/plain");
+  });
+
+  // Capture the second segment of the request path as "id" path param
+  svr.Get("/users/:id", [&](const Request& req, Response& res) {
+    auto user_id = req.path_params.at("id");
+    res.set_content(user_id, "text/plain");
+  });
+
+  // Extract values from HTTP headers and URL query params
+  svr.Get("/body-header-param", [](const Request& req, Response& res) {
+    if (req.has_header("Content-Length")) {
+      auto val = req.get_header_value("Content-Length");
+    }
+    if (req.has_param("key")) {
+      auto val = req.get_param_value("key");
+    }
+    res.set_content(req.body, "text/plain");
+  });
+
+  // If the handler takes time to finish, you can also poll the connection state
+  svr.Get("/task", [&](const Request& req, Response& res) {
+    const char * result = nullptr;
+    process.run(); // for example, starting an external process
+    while (result == nullptr) {
+      sleep(1);
+      if (req.is_connection_closed()) {
+        process.kill(); // kill the process
+        return;
+      }
+      result = process.stdout(); // != nullptr if the process finishes
+    }
+    res.set_content(result, "text/plain");
+  });
+
+  svr.Get("/stop", [&](const Request& req, Response& res) {
+    svr.stop();
+  });
+
+  svr.listen("localhost", 1234);
+}
+```
+
+`Post`, `Put`, `Delete` and `Options` methods are also supported.
+
+### Bind a socket to multiple interfaces and any available port
+
+```cpp
+int port = svr.bind_to_any_port("0.0.0.0");
+svr.listen_after_bind();
+```
+
+### Static File Server
+
+```cpp
+// Mount / to ./www directory
+auto ret = svr.set_mount_point("/", "./www");
+if (!ret) {
+  // The specified base directory doesn't exist...
+}
+
+// Mount /public to ./www directory
+ret = svr.set_mount_point("/public", "./www");
+
+// Mount /public to ./www1 and ./www2 directories
+ret = svr.set_mount_point("/public", "./www1"); // 1st order to search
+ret = svr.set_mount_point("/public", "./www2"); // 2nd order to search
+
+// Remove mount /
+ret = svr.remove_mount_point("/");
+
+// Remove mount /public
+ret = svr.remove_mount_point("/public");
+```
+
+```cpp
+// User defined file extension and MIME type mappings
+svr.set_file_extension_and_mimetype_mapping("cc", "text/x-c");
+svr.set_file_extension_and_mimetype_mapping("cpp", "text/x-c");
+svr.set_file_extension_and_mimetype_mapping("hh", "text/x-h");
+```
+
+The followings are built-in mappings:
+
+| Extension  |          MIME Type          | Extension  |          MIME Type          |
+| :--------- | :-------------------------- | :--------- | :-------------------------- |
+| css        | text/css                    | mpga       | audio/mpeg                  |
+| csv        | text/csv                    | weba       | audio/webm                  |
+| txt        | text/plain                  | wav        | audio/wave                  |
+| vtt        | text/vtt                    | otf        | font/otf                    |
+| html, htm  | text/html                   | ttf        | font/ttf                    |
+| apng       | image/apng                  | woff       | font/woff                   |
+| avif       | image/avif                  | woff2      | font/woff2                  |
+| bmp        | image/bmp                   | 7z         | application/x-7z-compressed |
+| gif        | image/gif                   | atom       | application/atom+xml        |
+| png        | image/png                   | pdf        | application/pdf             |
+| svg        | image/svg+xml               | mjs, js    | application/javascript      |
+| webp       | image/webp                  | json       | application/json            |
+| ico        | image/x-icon                | rss        | application/rss+xml         |
+| tif        | image/tiff                  | tar        | application/x-tar           |
+| tiff       | image/tiff                  | xhtml, xht | application/xhtml+xml       |
+| jpeg, jpg  | image/jpeg                  | xslt       | application/xslt+xml        |
+| mp4        | video/mp4                   | xml        | application/xml             |
+| mpeg       | video/mpeg                  | gz         | application/gzip            |
+| webm       | video/webm                  | zip        | application/zip             |
+| mp3        | audio/mp3                   | wasm       | application/wasm            |
+
+> [!WARNING]
+> These static file server methods are not thread-safe.
+
+### File request handler
+
+```cpp
+// The handler is called right before the response is sent to a client
+svr.set_file_request_handler([](const Request &req, Response &res) {
+  ...
+});
+```
+
+### Logging
+
+```cpp
+svr.set_logger([](const auto& req, const auto& res) {
+  your_logger(req, res);
+});
+```
+
+### Error handler
+
+```cpp
+svr.set_error_handler([](const auto& req, auto& res) {
+  auto fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
+  char buf[BUFSIZ];
+  snprintf(buf, sizeof(buf), fmt, res.status);
+  res.set_content(buf, "text/html");
+});
+```
+
+### Exception handler
+The exception handler gets called if a user routing handler throws an error.
+
+```cpp
+svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) {
+  auto fmt = "<h1>Error 500</h1><p>%s</p>";
+  char buf[BUFSIZ];
+  try {
+    std::rethrow_exception(ep);
+  } catch (std::exception &e) {
+    snprintf(buf, sizeof(buf), fmt, e.what());
+  } catch (...) { // See the following NOTE
+    snprintf(buf, sizeof(buf), fmt, "Unknown Exception");
+  }
+  res.set_content(buf, "text/html");
+  res.status = StatusCode::InternalServerError_500;
+});
+```
+
+> [!CAUTION]
+> if you don't provide the `catch (...)` block for a rethrown exception pointer, an uncaught exception will end up causing the server crash. Be careful!
+
+### Pre routing handler
+
+```cpp
+svr.set_pre_routing_handler([](const auto& req, auto& res) {
+  if (req.path == "/hello") {
+    res.set_content("world", "text/html");
+    return Server::HandlerResponse::Handled;
+  }
+  return Server::HandlerResponse::Unhandled;
+});
+```
+
+### Post routing handler
+
+```cpp
+svr.set_post_routing_handler([](const auto& req, auto& res) {
+  res.set_header("ADDITIONAL_HEADER", "value");
+});
+```
+
+### 'multipart/form-data' POST data
+
+```cpp
+svr.Post("/multipart", [&](const auto& req, auto& res) {
+  auto size = req.files.size();
+  auto ret = req.has_file("name1");
+  const auto& file = req.get_file_value("name1");
+  // file.filename;
+  // file.content_type;
+  // file.content;
+});
+```
+
+### Receive content with a content receiver
+
+```cpp
+svr.Post("/content_receiver",
+  [&](const Request &req, Response &res, const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      // NOTE: `content_reader` is blocking until every form data field is read
+      MultipartFormDataItems files;
+      content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+```
+
+### Send content with the content provider
+
+```cpp
+const size_t DATA_CHUNK_SIZE = 4;
+
+svr.Get("/stream", [&](const Request &req, Response &res) {
+  auto data = new std::string("abcdefg");
+
+  res.set_content_provider(
+    data->size(), // Content length
+    "text/plain", // Content type
+    [&, data](size_t offset, size_t length, DataSink &sink) {
+      const auto &d = *data;
+      sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
+      return true; // return 'false' if you want to cancel the process.
+    },
+    [data](bool success) { delete data; });
+});
+```
+
+Without content length:
+
+```cpp
+svr.Get("/stream", [&](const Request &req, Response &res) {
+  res.set_content_provider(
+    "text/plain", // Content type
+    [&](size_t offset, DataSink &sink) {
+      if (/* there is still data */) {
+        std::vector<char> data;
+        // prepare data...
+        sink.write(data.data(), data.size());
+      } else {
+        sink.done(); // No more data
+      }
+      return true; // return 'false' if you want to cancel the process.
+    });
+});
+```
+
+### Chunked transfer encoding
+
+```cpp
+svr.Get("/chunked", [&](const Request& req, Response& res) {
+  res.set_chunked_content_provider(
+    "text/plain",
+    [](size_t offset, DataSink &sink) {
+      sink.write("123", 3);
+      sink.write("345", 3);
+      sink.write("789", 3);
+      sink.done(); // No more data
+      return true; // return 'false' if you want to cancel the process.
+    }
+  );
+});
+```
+
+With trailer:
+
+```cpp
+svr.Get("/chunked", [&](const Request& req, Response& res) {
+  res.set_header("Trailer", "Dummy1, Dummy2");
+  res.set_chunked_content_provider(
+    "text/plain",
+    [](size_t offset, DataSink &sink) {
+      sink.write("123", 3);
+      sink.write("345", 3);
+      sink.write("789", 3);
+      sink.done_with_trailer({
+        {"Dummy1", "DummyVal1"},
+        {"Dummy2", "DummyVal2"}
+      });
+      return true;
+    }
+  );
+});
+```
+
+### Send file content
+
+```cpp
+svr.Get("/content", [&](const Request &req, Response &res) {
+  res.set_file_content("./path/to/conent.html");
+});
+
+svr.Get("/content", [&](const Request &req, Response &res) {
+  res.set_file_content("./path/to/conent", "text/html");
+});
+```
+
+### 'Expect: 100-continue' handler
+
+By default, the server sends a `100 Continue` response for an `Expect: 100-continue` header.
+
+```cpp
+// Send a '417 Expectation Failed' response.
+svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
+  return StatusCode::ExpectationFailed_417;
+});
+```
+
+```cpp
+// Send a final status without reading the message body.
+svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
+  return res.status = StatusCode::Unauthorized_401;
+});
+```
+
+### Keep-Alive connection
+
+```cpp
+svr.set_keep_alive_max_count(2); // Default is 5
+svr.set_keep_alive_timeout(10);  // Default is 5
+```
+
+### Timeout
+
+```c++
+svr.set_read_timeout(5, 0); // 5 seconds
+svr.set_write_timeout(5, 0); // 5 seconds
+svr.set_idle_interval(0, 100000); // 100 milliseconds
+```
+
+### Set maximum payload length for reading a request body
+
+```c++
+svr.set_payload_max_length(1024 * 1024 * 512); // 512MB
+```
+
+> [!NOTE]
+> When the request body content type is 'www-form-urlencoded', the actual payload length shouldn't exceed `CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH`.
+
+### Server-Sent Events
+
+Please see [Server example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssesvr.cc) and [Client example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssecli.cc).
+
+### Default thread pool support
+
+`ThreadPool` is used as a **default** task queue, and the default thread count is 8, or `std::thread::hardware_concurrency()`. You can change it with `CPPHTTPLIB_THREAD_POOL_COUNT`.
+
+If you want to set the thread count at runtime, there is no convenient way... But here is how.
+
+```cpp
+svr.new_task_queue = [] { return new ThreadPool(12); };
+```
+
+You can also provide an optional parameter to limit the maximum number
+of pending requests, i.e. requests `accept()`ed by the listener but
+still waiting to be serviced by worker threads.
+
+```cpp
+svr.new_task_queue = [] { return new ThreadPool(/*num_threads=*/12, /*max_queued_requests=*/18); };
+```
+
+Default limit is 0 (unlimited). Once the limit is reached, the listener
+will shutdown the client connection.
+
+### Override the default thread pool with yours
+
+You can supply your own thread pool implementation according to your need.
+
+```cpp
+class YourThreadPoolTaskQueue : public TaskQueue {
+public:
+  YourThreadPoolTaskQueue(size_t n) {
+    pool_.start_with_thread_count(n);
+  }
+
+  virtual bool enqueue(std::function<void()> fn) override {
+    /* Return true if the task was actually enqueued, or false
+     * if the caller must drop the corresponding connection. */
+    return pool_.enqueue(fn);
+  }
+
+  virtual void shutdown() override {
+    pool_.shutdown_gracefully();
+  }
+
+private:
+  YourThreadPool pool_;
+};
+
+svr.new_task_queue = [] {
+  return new YourThreadPoolTaskQueue(12);
+};
+```
+
+Client
+------
+
+```c++
+#include <httplib.h>
+#include <iostream>
+
+int main(void)
+{
+  httplib::Client cli("localhost", 1234);
+
+  if (auto res = cli.Get("/hi")) {
+    if (res->status == StatusCode::OK_200) {
+      std::cout << res->body << std::endl;
+    }
+  } else {
+    auto err = res.error();
+    std::cout << "HTTP error: " << httplib::to_string(err) << std::endl;
+  }
+}
+```
+
+> [!TIP]
+> Constructor with scheme-host-port string is now supported!
+
+```c++
+httplib::Client cli("localhost");
+httplib::Client cli("localhost:8080");
+httplib::Client cli("http://localhost");
+httplib::Client cli("http://localhost:8080");
+httplib::Client cli("https://localhost");
+httplib::SSLClient cli("localhost");
+```
+
+### Error code
+
+Here is the list of errors from `Result::error()`.
+
+```c++
+enum Error {
+  Success = 0,
+  Unknown,
+  Connection,
+  BindIPAddress,
+  Read,
+  Write,
+  ExceedRedirectCount,
+  Canceled,
+  SSLConnection,
+  SSLLoadingCerts,
+  SSLServerVerification,
+  UnsupportedMultipartBoundaryChars,
+  Compression,
+  ConnectionTimeout,
+};
+```
+
+### GET with HTTP headers
+
+```c++
+httplib::Headers headers = {
+  { "Hello", "World!" }
+};
+auto res = cli.Get("/hi", headers);
+```
+or
+```c++
+auto res = cli.Get("/hi", {{"Hello", "World!"}});
+```
+or
+```c++
+cli.set_default_headers({
+  { "Hello", "World!" }
+});
+auto res = cli.Get("/hi");
+```
+
+### POST
+
+```c++
+res = cli.Post("/post", "text", "text/plain");
+res = cli.Post("/person", "name=john1&note=coder", "application/x-www-form-urlencoded");
+```
+
+### POST with parameters
+
+```c++
+httplib::Params params;
+params.emplace("name", "john");
+params.emplace("note", "coder");
+
+auto res = cli.Post("/post", params);
+```
+ or
+
+```c++
+httplib::Params params{
+  { "name", "john" },
+  { "note", "coder" }
+};
+
+auto res = cli.Post("/post", params);
+```
+
+### POST with Multipart Form Data
+
+```c++
+httplib::MultipartFormDataItems items = {
+  { "text1", "text default", "", "" },
+  { "text2", "aωb", "", "" },
+  { "file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain" },
+  { "file2", "{\n  \"world\", true\n}\n", "world.json", "application/json" },
+  { "file3", "", "", "application/octet-stream" },
+};
+
+auto res = cli.Post("/multipart", items);
+```
+
+### PUT
+
+```c++
+res = cli.Put("/resource/foo", "text", "text/plain");
+```
+
+### DELETE
+
+```c++
+res = cli.Delete("/resource/foo");
+```
+
+### OPTIONS
+
+```c++
+res = cli.Options("*");
+res = cli.Options("/resource/foo");
+```
+
+### Timeout
+
+```c++
+cli.set_connection_timeout(0, 300000); // 300 milliseconds
+cli.set_read_timeout(5, 0); // 5 seconds
+cli.set_write_timeout(5, 0); // 5 seconds
+
+// This method works the same as curl's `--max-timeout` option
+svr.set_max_timeout(5000); // 5 seconds
+```
+
+### Receive content with a content receiver
+
+```c++
+std::string body;
+
+auto res = cli.Get("/large-data",
+  [&](const char *data, size_t data_length) {
+    body.append(data, data_length);
+    return true;
+  });
+```
+
+```cpp
+std::string body;
+
+auto res = cli.Get(
+  "/stream", Headers(),
+  [&](const Response &response) {
+    EXPECT_EQ(StatusCode::OK_200, response.status);
+    return true; // return 'false' if you want to cancel the request.
+  },
+  [&](const char *data, size_t data_length) {
+    body.append(data, data_length);
+    return true; // return 'false' if you want to cancel the request.
+  });
+```
+
+### Send content with a content provider
+
+```cpp
+std::string body = ...;
+
+auto res = cli.Post(
+  "/stream", body.size(),
+  [](size_t offset, size_t length, DataSink &sink) {
+    sink.write(body.data() + offset, length);
+    return true; // return 'false' if you want to cancel the request.
+  },
+  "text/plain");
+```
+
+### Chunked transfer encoding
+
+```cpp
+auto res = cli.Post(
+  "/stream",
+  [](size_t offset, DataSink &sink) {
+    sink.os << "chunked data 1";
+    sink.os << "chunked data 2";
+    sink.os << "chunked data 3";
+    sink.done();
+    return true; // return 'false' if you want to cancel the request.
+  },
+  "text/plain");
+```
+
+### With Progress Callback
+
+```cpp
+httplib::Client cli(url, port);
+
+// prints: 0 / 000 bytes => 50% complete
+auto res = cli.Get("/", [](uint64_t len, uint64_t total) {
+  printf("%lld / %lld bytes => %d%% complete\n",
+    len, total,
+    (int)(len*100/total));
+  return true; // return 'false' if you want to cancel the request.
+}
+);
+```
+
+![progress](https://user-images.githubusercontent.com/236374/33138910-495c4ecc-cf86-11e7-8693-2fc6d09615c4.gif)
+
+### Authentication
+
+```cpp
+// Basic Authentication
+cli.set_basic_auth("user", "pass");
+
+// Digest Authentication
+cli.set_digest_auth("user", "pass");
+
+// Bearer Token Authentication
+cli.set_bearer_token_auth("token");
+```
+
+> [!NOTE]
+> OpenSSL is required for Digest Authentication.
+
+### Proxy server support
+
+```cpp
+cli.set_proxy("host", port);
+
+// Basic Authentication
+cli.set_proxy_basic_auth("user", "pass");
+
+// Digest Authentication
+cli.set_proxy_digest_auth("user", "pass");
+
+// Bearer Token Authentication
+cli.set_proxy_bearer_token_auth("pass");
+```
+
+> [!NOTE]
+> OpenSSL is required for Digest Authentication.
+
+### Range
+
+```cpp
+httplib::Client cli("httpbin.org");
+
+auto res = cli.Get("/range/32", {
+  httplib::make_range_header({{1, 10}}) // 'Range: bytes=1-10'
+});
+// res->status should be 206.
+// res->body should be "bcdefghijk".
+```
+
+```cpp
+httplib::make_range_header({{1, 10}, {20, -1}})      // 'Range: bytes=1-10, 20-'
+httplib::make_range_header({{100, 199}, {500, 599}}) // 'Range: bytes=100-199, 500-599'
+httplib::make_range_header({{0, 0}, {-1, 1}})        // 'Range: bytes=0-0, -1'
+```
+
+### Keep-Alive connection
+
+```cpp
+httplib::Client cli("localhost", 1234);
+
+cli.Get("/hello");         // with "Connection: close"
+
+cli.set_keep_alive(true);
+cli.Get("/world");
+
+cli.set_keep_alive(false);
+cli.Get("/last-request");  // with "Connection: close"
+```
+
+### Redirect
+
+```cpp
+httplib::Client cli("yahoo.com");
+
+auto res = cli.Get("/");
+res->status; // 301
+
+cli.set_follow_location(true);
+res = cli.Get("/");
+res->status; // 200
+```
+
+### Use a specific network interface
+
+> [!NOTE]
+> This feature is not available on Windows, yet.
+
+```cpp
+cli.set_interface("eth0"); // Interface name, IP address or host name
+```
+
+Compression
+-----------
+
+The server can apply compression to the following MIME type contents:
+
+  * all text types except text/event-stream
+  * image/svg+xml
+  * application/javascript
+  * application/json
+  * application/xml
+  * application/xhtml+xml
+
+### Zlib Support
+
+'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`. `libz` should be linked.
+
+### Brotli Support
+
+Brotli compression is available with `CPPHTTPLIB_BROTLI_SUPPORT`. Necessary libraries should be linked.
+Please see https://github.com/google/brotli for more detail.
+
+### Default `Accept-Encoding` value
+
+The default `Acdcept-Encoding` value contains all possible compression types. So, the following two examples are same.
+
+```c++
+res = cli.Get("/resource/foo");
+res = cli.Get("/resource/foo", {{"Accept-Encoding", "gzip, deflate, br"}});
+```
+
+If we don't want a response without compression, we have to set `Accept-Encoding` to an empty string. This behavior is similar to curl.
+
+```c++
+res = cli.Get("/resource/foo", {{"Accept-Encoding", ""}});
+```
+
+### Compress request body on client
+
+```c++
+cli.set_compress(true);
+res = cli.Post("/resource/foo", "...", "text/plain");
+```
+
+### Compress response body on client
+
+```c++
+cli.set_decompress(false);
+res = cli.Get("/resource/foo");
+res->body; // Compressed data
+
+```
+
+Use `poll` instead of `select`
+------------------------------
+
+`select` system call is used as default since it's more widely supported. If you want to let cpp-httplib use `poll` instead, you can do so with `CPPHTTPLIB_USE_POLL`.
+
+Unix Domain Socket Support
+--------------------------
+
+Unix Domain Socket support is available on Linux and macOS.
+
+```c++
+// Server
+httplib::Server svr("./my-socket.sock");
+svr.set_address_family(AF_UNIX).listen("./my-socket.sock", 80);
+
+// Client
+httplib::Client cli("./my-socket.sock");
+cli.set_address_family(AF_UNIX);
+```
+
+"my-socket.sock" can be a relative path or an absolute path. You application must have the appropriate permissions for the path. You can also use an abstract socket address on Linux. To use an abstract socket address, prepend a null byte ('\x00') to the path.
+
+
+Split httplib.h into .h and .cc
+-------------------------------
+
+```console
+$ ./split.py -h
+usage: split.py [-h] [-e EXTENSION] [-o OUT]
+
+This script splits httplib.h into .h and .cc parts.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -e EXTENSION, --extension EXTENSION
+                        extension of the implementation file (default: cc)
+  -o OUT, --out OUT     where to write the files (default: out)
+
+$ ./split.py
+Wrote out/httplib.h and out/httplib.cc
+```
+
+Dockerfile for Static HTTP Server
+---------------------------------
+
+Dockerfile for static HTTP server is available. Port number of this HTTP server is 80, and it serves static files from `/html` directory in the container.
+
+```bash
+> docker build -t cpp-httplib-server .
+...
+
+> docker run --rm -it -p 8080:80 -v ./docker/html:/html cpp-httplib-server
+Serving HTTP on 0.0.0.0 port 80 ...
+192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
+```
+
+From Docker Hub
+
+```bash
+> docker run --rm -it -p 8080:80 -v ./docker/html:/html yhirose4dockerhub/cpp-httplib-server
+Serving HTTP on 0.0.0.0 port 80 ...
+192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
+192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
+```
+
+NOTE
+----
+
+### g++
+
+g++ 4.8 and below cannot build this library since `<regex>` in the versions are [broken](https://stackoverflow.com/questions/12530406/is-gcc-4-8-or-earlier-buggy-about-regular-expressions).
+
+### Windows
+
+Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32_LEAN_AND_MEAN` beforehand.
+
+```cpp
+#include <httplib.h>
+#include <Windows.h>
+```
+
+```cpp
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <httplib.h>
+```
+
+> [!NOTE]
+> cpp-httplib officially supports only the latest Visual Studio. It might work with former versions of Visual Studio, but I can no longer verify it. Pull requests are always welcome for the older versions of Visual Studio unless they break the C++11 conformance.
+
+> [!NOTE]
+> Windows 8 or lower, Visual Studio 2015 or lower, and Cygwin and MSYS2 including MinGW are neither supported nor tested.
+
+License
+-------
+
+MIT license (© 2025 Yuji Hirose)
+
+Special Thanks To
+-----------------
+
+[These folks](https://github.com/yhirose/cpp-httplib/graphs/contributors) made great contributions to polish this library to totally another level from a simple toy!
diff --git a/code/cpp-httplib-0.19.0/benchmark/Makefile b/code/cpp-httplib-0.19.0/benchmark/Makefile
new file mode 100644
index 00000000..5107664c
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/Makefile
@@ -0,0 +1,62 @@
+CXXFLAGS = -std=c++11 -O2 -I..
+
+CPPHTTPLIB_FLAGS = -DCPPHTTPLIB_THREAD_POOL_COUNT=16
+
+BENCH = bombardier -c 10 -d 5s localhost:8080
+MONITOR = ali http://localhost:8080
+
+# cpp-httplib
+bench: server
+	@echo "--------------------\n cpp-httplib latest\n--------------------\n"
+	@./server & export PID=$$!; $(BENCH); kill $${PID}
+	@echo ""
+
+monitor: server
+	@./server & export PID=$$!; $(MONITOR); kill $${PID}
+
+run : server
+	@./server
+
+server : cpp-httplib/main.cpp ../httplib.h
+	g++ -o $@ $(CXXFLAGS) $(CPPHTTPLIB_FLAGS) cpp-httplib/main.cpp
+
+# cpp-httplib
+bench-base: server-base
+	@echo "---------------------\n cpp-httplib v0.18.0\n---------------------\n"
+	@./server-base & export PID=$$!; $(BENCH); kill $${PID}
+	@echo ""
+
+monitor-base: server-base
+	@./server-base & export PID=$$!; $(MONITOR); kill $${PID}
+
+run-base : server-base
+	@./server-base
+
+server-base : cpp-httplib-base/main.cpp cpp-httplib-base/httplib.h
+	g++ -o $@ $(CXXFLAGS) $(CPPHTTPLIB_FLAGS) cpp-httplib-base/main.cpp
+
+# crow
+bench-crow: server-crow
+	@echo "-------------\n Crow v1.2.0\n-------------\n"
+	@./server-crow & export PID=$$!; $(BENCH); kill $${PID}
+	@echo ""
+
+monitor-crow: server-crow
+	@./server-crow & export PID=$$!; $(MONITOR); kill $${PID}
+
+run-crow : server-crow
+	@./server-crow
+
+server-crow : crow/main.cpp
+	g++ -o $@ $(CXXFLAGS) crow/main.cpp
+
+# misc
+build: server server-base server-crow
+
+bench-all: bench-crow bench bench-base
+
+issue:
+	bombardier -c 10 -d 30s localhost:8080
+
+clean:
+	rm -rf server*
diff --git a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h
new file mode 100644
index 00000000..3e28fcff
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h
@@ -0,0 +1,10154 @@
+//
+//  httplib.h
+//
+//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#ifndef CPPHTTPLIB_HTTPLIB_H
+#define CPPHTTPLIB_HTTPLIB_H
+
+#define CPPHTTPLIB_VERSION "0.18.0"
+
+/*
+ * Configuration
+ */
+
+#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT
+#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 100
+#endif
+
+#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND
+#define CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND 300
+#endif
+
+#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND
+#define CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND
+#define CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND
+#define CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND
+#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND
+#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND
+#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND 300
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND
+#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND
+#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND
+#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_IDLE_INTERVAL_SECOND
+#define CPPHTTPLIB_IDLE_INTERVAL_SECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_IDLE_INTERVAL_USECOND
+#ifdef _WIN32
+#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 10000
+#else
+#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 0
+#endif
+#endif
+
+#ifndef CPPHTTPLIB_REQUEST_URI_MAX_LENGTH
+#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_HEADER_MAX_LENGTH
+#define CPPHTTPLIB_HEADER_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_REDIRECT_MAX_COUNT
+#define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
+#endif
+
+#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
+#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
+#endif
+
+#ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
+#endif
+
+#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
+#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
+#endif
+
+#ifndef CPPHTTPLIB_TCP_NODELAY
+#define CPPHTTPLIB_TCP_NODELAY false
+#endif
+
+#ifndef CPPHTTPLIB_IPV6_V6ONLY
+#define CPPHTTPLIB_IPV6_V6ONLY false
+#endif
+
+#ifndef CPPHTTPLIB_RECV_BUFSIZ
+#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
+#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_THREAD_POOL_COUNT
+#define CPPHTTPLIB_THREAD_POOL_COUNT                                           \
+  ((std::max)(8u, std::thread::hardware_concurrency() > 0                      \
+                      ? std::thread::hardware_concurrency() - 1                \
+                      : 0))
+#endif
+
+#ifndef CPPHTTPLIB_RECV_FLAGS
+#define CPPHTTPLIB_RECV_FLAGS 0
+#endif
+
+#ifndef CPPHTTPLIB_SEND_FLAGS
+#define CPPHTTPLIB_SEND_FLAGS 0
+#endif
+
+#ifndef CPPHTTPLIB_LISTEN_BACKLOG
+#define CPPHTTPLIB_LISTEN_BACKLOG 5
+#endif
+
+/*
+ * Headers
+ */
+
+#ifdef _WIN32
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif //_CRT_SECURE_NO_WARNINGS
+
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif //_CRT_NONSTDC_NO_DEPRECATE
+
+#if defined(_MSC_VER)
+#if _MSC_VER < 1900
+#error Sorry, Visual Studio versions prior to 2015 are not supported
+#endif
+
+#pragma comment(lib, "ws2_32.lib")
+
+#ifdef _WIN64
+using ssize_t = __int64;
+#else
+using ssize_t = long;
+#endif
+#endif // _MSC_VER
+
+#ifndef S_ISREG
+#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
+#endif // S_ISREG
+
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
+#endif // S_ISDIR
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif // NOMINMAX
+
+#include <io.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#ifndef WSA_FLAG_NO_HANDLE_INHERIT
+#define WSA_FLAG_NO_HANDLE_INHERIT 0x80
+#endif
+
+using socket_t = SOCKET;
+#ifdef CPPHTTPLIB_USE_POLL
+#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
+#endif
+
+#else // not _WIN32
+
+#include <arpa/inet.h>
+#if !defined(_AIX) && !defined(__MVS__)
+#include <ifaddrs.h>
+#endif
+#ifdef __MVS__
+#include <strings.h>
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+#endif
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#ifdef __linux__
+#include <resolv.h>
+#endif
+#include <netinet/tcp.h>
+#ifdef CPPHTTPLIB_USE_POLL
+#include <poll.h>
+#endif
+#include <csignal>
+#include <pthread.h>
+#include <sys/mman.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+using socket_t = int;
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET (-1)
+#endif
+#endif //_WIN32
+
+#include <algorithm>
+#include <array>
+#include <atomic>
+#include <cassert>
+#include <cctype>
+#include <climits>
+#include <condition_variable>
+#include <cstring>
+#include <errno.h>
+#include <exception>
+#include <fcntl.h>
+#include <fstream>
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <regex>
+#include <set>
+#include <sstream>
+#include <string>
+#include <sys/stat.h>
+#include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#ifdef _WIN32
+#include <wincrypt.h>
+
+// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
+// used
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#undef PKCS7_SIGNER_INFO
+
+#ifdef _MSC_VER
+#pragma comment(lib, "crypt32.lib")
+#endif
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#include <TargetConditionals.h>
+#if TARGET_OS_OSX
+#include <CoreFoundation/CoreFoundation.h>
+#include <Security/Security.h>
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+
+#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK)
+#include <openssl/applink.c>
+#endif
+
+#include <iostream>
+#include <sstream>
+
+#if defined(OPENSSL_IS_BORINGSSL) || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010107f
+#error Please use OpenSSL or a current version of BoringSSL
+#endif
+#define SSL_get1_peer_certificate SSL_get_peer_certificate
+#elif OPENSSL_VERSION_NUMBER < 0x30000000L
+#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
+#endif
+
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+#include <zlib.h>
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+#include <brotli/decode.h>
+#include <brotli/encode.h>
+#endif
+
+/*
+ * Declaration
+ */
+namespace httplib {
+
+namespace detail {
+
+/*
+ * Backport std::make_unique from C++14.
+ *
+ * NOTE: This code came up with the following stackoverflow post:
+ * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique
+ *
+ */
+
+template <class T, class... Args>
+typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
+make_unique(Args &&...args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+template <class T>
+typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
+make_unique(std::size_t n) {
+  typedef typename std::remove_extent<T>::type RT;
+  return std::unique_ptr<T>(new RT[n]);
+}
+
+namespace case_ignore {
+
+inline unsigned char to_lower(int c) {
+  const static unsigned char table[256] = {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+      30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+      45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+      60,  61,  62,  63,  64,  97,  98,  99,  100, 101, 102, 103, 104, 105, 106,
+      107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+      122, 91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+      105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+      135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+      150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+      165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+      180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 224, 225, 226,
+      227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+      242, 243, 244, 245, 246, 215, 248, 249, 250, 251, 252, 253, 254, 223, 224,
+      225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+      240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+      255,
+  };
+  return table[(unsigned char)(char)c];
+}
+
+inline bool equal(const std::string &a, const std::string &b) {
+  return a.size() == b.size() &&
+         std::equal(a.begin(), a.end(), b.begin(),
+                    [](char ca, char cb) { return to_lower(ca) == to_lower(cb); });
+}
+
+struct equal_to {
+  bool operator()(const std::string &a, const std::string &b) const {
+    return equal(a, b);
+  }
+};
+
+struct hash {
+  size_t operator()(const std::string &key) const {
+    return hash_core(key.data(), key.size(), 0);
+  }
+
+  size_t hash_core(const char *s, size_t l, size_t h) const {
+    return (l == 0) ? h
+                    : hash_core(s + 1, l - 1,
+                                // Unsets the 6 high bits of h, therefore no
+                                // overflow happens
+                                (((std::numeric_limits<size_t>::max)() >> 6) &
+                                 h * 33) ^
+                                    static_cast<unsigned char>(to_lower(*s)));
+  }
+};
+
+}; // namespace case_ignore
+
+// This is based on
+// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
+
+struct scope_exit {
+  explicit scope_exit(std::function<void(void)> &&f)
+      : exit_function(std::move(f)), execute_on_destruction{true} {}
+
+  scope_exit(scope_exit &&rhs) noexcept
+      : exit_function(std::move(rhs.exit_function)),
+        execute_on_destruction{rhs.execute_on_destruction} {
+    rhs.release();
+  }
+
+  ~scope_exit() {
+    if (execute_on_destruction) { this->exit_function(); }
+  }
+
+  void release() { this->execute_on_destruction = false; }
+
+private:
+  scope_exit(const scope_exit &) = delete;
+  void operator=(const scope_exit &) = delete;
+  scope_exit &operator=(scope_exit &&) = delete;
+
+  std::function<void(void)> exit_function;
+  bool execute_on_destruction;
+};
+
+} // namespace detail
+
+enum StatusCode {
+  // Information responses
+  Continue_100 = 100,
+  SwitchingProtocol_101 = 101,
+  Processing_102 = 102,
+  EarlyHints_103 = 103,
+
+  // Successful responses
+  OK_200 = 200,
+  Created_201 = 201,
+  Accepted_202 = 202,
+  NonAuthoritativeInformation_203 = 203,
+  NoContent_204 = 204,
+  ResetContent_205 = 205,
+  PartialContent_206 = 206,
+  MultiStatus_207 = 207,
+  AlreadyReported_208 = 208,
+  IMUsed_226 = 226,
+
+  // Redirection messages
+  MultipleChoices_300 = 300,
+  MovedPermanently_301 = 301,
+  Found_302 = 302,
+  SeeOther_303 = 303,
+  NotModified_304 = 304,
+  UseProxy_305 = 305,
+  unused_306 = 306,
+  TemporaryRedirect_307 = 307,
+  PermanentRedirect_308 = 308,
+
+  // Client error responses
+  BadRequest_400 = 400,
+  Unauthorized_401 = 401,
+  PaymentRequired_402 = 402,
+  Forbidden_403 = 403,
+  NotFound_404 = 404,
+  MethodNotAllowed_405 = 405,
+  NotAcceptable_406 = 406,
+  ProxyAuthenticationRequired_407 = 407,
+  RequestTimeout_408 = 408,
+  Conflict_409 = 409,
+  Gone_410 = 410,
+  LengthRequired_411 = 411,
+  PreconditionFailed_412 = 412,
+  PayloadTooLarge_413 = 413,
+  UriTooLong_414 = 414,
+  UnsupportedMediaType_415 = 415,
+  RangeNotSatisfiable_416 = 416,
+  ExpectationFailed_417 = 417,
+  ImATeapot_418 = 418,
+  MisdirectedRequest_421 = 421,
+  UnprocessableContent_422 = 422,
+  Locked_423 = 423,
+  FailedDependency_424 = 424,
+  TooEarly_425 = 425,
+  UpgradeRequired_426 = 426,
+  PreconditionRequired_428 = 428,
+  TooManyRequests_429 = 429,
+  RequestHeaderFieldsTooLarge_431 = 431,
+  UnavailableForLegalReasons_451 = 451,
+
+  // Server error responses
+  InternalServerError_500 = 500,
+  NotImplemented_501 = 501,
+  BadGateway_502 = 502,
+  ServiceUnavailable_503 = 503,
+  GatewayTimeout_504 = 504,
+  HttpVersionNotSupported_505 = 505,
+  VariantAlsoNegotiates_506 = 506,
+  InsufficientStorage_507 = 507,
+  LoopDetected_508 = 508,
+  NotExtended_510 = 510,
+  NetworkAuthenticationRequired_511 = 511,
+};
+
+using Headers =
+    std::unordered_multimap<std::string, std::string, detail::case_ignore::hash,
+                            detail::case_ignore::equal_to>;
+
+using Params = std::multimap<std::string, std::string>;
+using Match = std::smatch;
+
+using Progress = std::function<bool(uint64_t current, uint64_t total)>;
+
+struct Response;
+using ResponseHandler = std::function<bool(const Response &response)>;
+
+struct MultipartFormData {
+  std::string name;
+  std::string content;
+  std::string filename;
+  std::string content_type;
+};
+using MultipartFormDataItems = std::vector<MultipartFormData>;
+using MultipartFormDataMap = std::multimap<std::string, MultipartFormData>;
+
+class DataSink {
+public:
+  DataSink() : os(&sb_), sb_(*this) {}
+
+  DataSink(const DataSink &) = delete;
+  DataSink &operator=(const DataSink &) = delete;
+  DataSink(DataSink &&) = delete;
+  DataSink &operator=(DataSink &&) = delete;
+
+  std::function<bool(const char *data, size_t data_len)> write;
+  std::function<bool()> is_writable;
+  std::function<void()> done;
+  std::function<void(const Headers &trailer)> done_with_trailer;
+  std::ostream os;
+
+private:
+  class data_sink_streambuf final : public std::streambuf {
+  public:
+    explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
+
+  protected:
+    std::streamsize xsputn(const char *s, std::streamsize n) override {
+      sink_.write(s, static_cast<size_t>(n));
+      return n;
+    }
+
+  private:
+    DataSink &sink_;
+  };
+
+  data_sink_streambuf sb_;
+};
+
+using ContentProvider =
+    std::function<bool(size_t offset, size_t length, DataSink &sink)>;
+
+using ContentProviderWithoutLength =
+    std::function<bool(size_t offset, DataSink &sink)>;
+
+using ContentProviderResourceReleaser = std::function<void(bool success)>;
+
+struct MultipartFormDataProvider {
+  std::string name;
+  ContentProviderWithoutLength provider;
+  std::string filename;
+  std::string content_type;
+};
+using MultipartFormDataProviderItems = std::vector<MultipartFormDataProvider>;
+
+using ContentReceiverWithProgress =
+    std::function<bool(const char *data, size_t data_length, uint64_t offset,
+                       uint64_t total_length)>;
+
+using ContentReceiver =
+    std::function<bool(const char *data, size_t data_length)>;
+
+using MultipartContentHeader =
+    std::function<bool(const MultipartFormData &file)>;
+
+class ContentReader {
+public:
+  using Reader = std::function<bool(ContentReceiver receiver)>;
+  using MultipartReader = std::function<bool(MultipartContentHeader header,
+                                             ContentReceiver receiver)>;
+
+  ContentReader(Reader reader, MultipartReader multipart_reader)
+      : reader_(std::move(reader)),
+        multipart_reader_(std::move(multipart_reader)) {}
+
+  bool operator()(MultipartContentHeader header,
+                  ContentReceiver receiver) const {
+    return multipart_reader_(std::move(header), std::move(receiver));
+  }
+
+  bool operator()(ContentReceiver receiver) const {
+    return reader_(std::move(receiver));
+  }
+
+  Reader reader_;
+  MultipartReader multipart_reader_;
+};
+
+using Range = std::pair<ssize_t, ssize_t>;
+using Ranges = std::vector<Range>;
+
+struct Request {
+  std::string method;
+  std::string path;
+  Headers headers;
+  std::string body;
+
+  std::string remote_addr;
+  int remote_port = -1;
+  std::string local_addr;
+  int local_port = -1;
+
+  // for server
+  std::string version;
+  std::string target;
+  Params params;
+  MultipartFormDataMap files;
+  Ranges ranges;
+  Match matches;
+  std::unordered_map<std::string, std::string> path_params;
+
+  // for client
+  ResponseHandler response_handler;
+  ContentReceiverWithProgress content_receiver;
+  Progress progress;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  const SSL *ssl = nullptr;
+#endif
+
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, const char *def = "",
+                               size_t id = 0) const;
+  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
+                                size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
+
+  bool has_param(const std::string &key) const;
+  std::string get_param_value(const std::string &key, size_t id = 0) const;
+  size_t get_param_value_count(const std::string &key) const;
+
+  bool is_multipart_form_data() const;
+
+  bool has_file(const std::string &key) const;
+  MultipartFormData get_file_value(const std::string &key) const;
+  std::vector<MultipartFormData> get_file_values(const std::string &key) const;
+
+  // private members...
+  size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
+  size_t content_length_ = 0;
+  ContentProvider content_provider_;
+  bool is_chunked_content_provider_ = false;
+  size_t authorization_count_ = 0;
+};
+
+struct Response {
+  std::string version;
+  int status = -1;
+  std::string reason;
+  Headers headers;
+  std::string body;
+  std::string location; // Redirect location
+
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, const char *def = "",
+                               size_t id = 0) const;
+  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
+                                size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
+
+  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
+  void set_content(const char *s, size_t n, const std::string &content_type);
+  void set_content(const std::string &s, const std::string &content_type);
+  void set_content(std::string &&s, const std::string &content_type);
+
+  void set_content_provider(
+      size_t length, const std::string &content_type, ContentProvider provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_content_provider(
+      const std::string &content_type, ContentProviderWithoutLength provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_chunked_content_provider(
+      const std::string &content_type, ContentProviderWithoutLength provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_file_content(const std::string &path,
+                        const std::string &content_type);
+  void set_file_content(const std::string &path);
+
+  Response() = default;
+  Response(const Response &) = default;
+  Response &operator=(const Response &) = default;
+  Response(Response &&) = default;
+  Response &operator=(Response &&) = default;
+  ~Response() {
+    if (content_provider_resource_releaser_) {
+      content_provider_resource_releaser_(content_provider_success_);
+    }
+  }
+
+  // private members...
+  size_t content_length_ = 0;
+  ContentProvider content_provider_;
+  ContentProviderResourceReleaser content_provider_resource_releaser_;
+  bool is_chunked_content_provider_ = false;
+  bool content_provider_success_ = false;
+  std::string file_content_path_;
+  std::string file_content_content_type_;
+};
+
+class Stream {
+public:
+  virtual ~Stream() = default;
+
+  virtual bool is_readable() const = 0;
+  virtual bool is_writable() const = 0;
+
+  virtual ssize_t read(char *ptr, size_t size) = 0;
+  virtual ssize_t write(const char *ptr, size_t size) = 0;
+  virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual socket_t socket() const = 0;
+
+  ssize_t write(const char *ptr);
+  ssize_t write(const std::string &s);
+};
+
+class TaskQueue {
+public:
+  TaskQueue() = default;
+  virtual ~TaskQueue() = default;
+
+  virtual bool enqueue(std::function<void()> fn) = 0;
+  virtual void shutdown() = 0;
+
+  virtual void on_idle() {}
+};
+
+class ThreadPool final : public TaskQueue {
+public:
+  explicit ThreadPool(size_t n, size_t mqr = 0)
+      : shutdown_(false), max_queued_requests_(mqr) {
+    while (n) {
+      threads_.emplace_back(worker(*this));
+      n--;
+    }
+  }
+
+  ThreadPool(const ThreadPool &) = delete;
+  ~ThreadPool() override = default;
+
+  bool enqueue(std::function<void()> fn) override {
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
+        return false;
+      }
+      jobs_.push_back(std::move(fn));
+    }
+
+    cond_.notify_one();
+    return true;
+  }
+
+  void shutdown() override {
+    // Stop all worker threads...
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      shutdown_ = true;
+    }
+
+    cond_.notify_all();
+
+    // Join...
+    for (auto &t : threads_) {
+      t.join();
+    }
+  }
+
+private:
+  struct worker {
+    explicit worker(ThreadPool &pool) : pool_(pool) {}
+
+    void operator()() {
+      for (;;) {
+        std::function<void()> fn;
+        {
+          std::unique_lock<std::mutex> lock(pool_.mutex_);
+
+          pool_.cond_.wait(
+              lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; });
+
+          if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
+
+          fn = pool_.jobs_.front();
+          pool_.jobs_.pop_front();
+        }
+
+        assert(true == static_cast<bool>(fn));
+        fn();
+      }
+
+#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL) &&   \
+    !defined(LIBRESSL_VERSION_NUMBER)
+      OPENSSL_thread_stop();
+#endif
+    }
+
+    ThreadPool &pool_;
+  };
+  friend struct worker;
+
+  std::vector<std::thread> threads_;
+  std::list<std::function<void()>> jobs_;
+
+  bool shutdown_;
+  size_t max_queued_requests_ = 0;
+
+  std::condition_variable cond_;
+  std::mutex mutex_;
+};
+
+using Logger = std::function<void(const Request &, const Response &)>;
+
+using SocketOptions = std::function<void(socket_t sock)>;
+
+void default_socket_options(socket_t sock);
+
+const char *status_message(int status);
+
+std::string get_bearer_token_auth(const Request &req);
+
+namespace detail {
+
+class MatcherBase {
+public:
+  virtual ~MatcherBase() = default;
+
+  // Match request path and populate its matches and
+  virtual bool match(Request &request) const = 0;
+};
+
+/**
+ * Captures parameters in request path and stores them in Request::path_params
+ *
+ * Capture name is a substring of a pattern from : to /.
+ * The rest of the pattern is matched agains the request path directly
+ * Parameters are captured starting from the next character after
+ * the end of the last matched static pattern fragment until the next /.
+ *
+ * Example pattern:
+ * "/path/fragments/:capture/more/fragments/:second_capture"
+ * Static fragments:
+ * "/path/fragments/", "more/fragments/"
+ *
+ * Given the following request path:
+ * "/path/fragments/:1/more/fragments/:2"
+ * the resulting capture will be
+ * {{"capture", "1"}, {"second_capture", "2"}}
+ */
+class PathParamsMatcher final : public MatcherBase {
+public:
+  PathParamsMatcher(const std::string &pattern);
+
+  bool match(Request &request) const override;
+
+private:
+  // Treat segment separators as the end of path parameter capture
+  // Does not need to handle query parameters as they are parsed before path
+  // matching
+  static constexpr char separator = '/';
+
+  // Contains static path fragments to match against, excluding the '/' after
+  // path params
+  // Fragments are separated by path params
+  std::vector<std::string> static_fragments_;
+  // Stores the names of the path parameters to be used as keys in the
+  // Request::path_params map
+  std::vector<std::string> param_names_;
+};
+
+/**
+ * Performs std::regex_match on request path
+ * and stores the result in Request::matches
+ *
+ * Note that regex match is performed directly on the whole request.
+ * This means that wildcard patterns may match multiple path segments with /:
+ * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
+ */
+class RegexMatcher final : public MatcherBase {
+public:
+  RegexMatcher(const std::string &pattern) : regex_(pattern) {}
+
+  bool match(Request &request) const override;
+
+private:
+  std::regex regex_;
+};
+
+ssize_t write_headers(Stream &strm, const Headers &headers);
+
+} // namespace detail
+
+class Server {
+public:
+  using Handler = std::function<void(const Request &, Response &)>;
+
+  using ExceptionHandler =
+      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
+
+  enum class HandlerResponse {
+    Handled,
+    Unhandled,
+  };
+  using HandlerWithResponse =
+      std::function<HandlerResponse(const Request &, Response &)>;
+
+  using HandlerWithContentReader = std::function<void(
+      const Request &, Response &, const ContentReader &content_reader)>;
+
+  using Expect100ContinueHandler =
+      std::function<int(const Request &, Response &)>;
+
+  Server();
+
+  virtual ~Server();
+
+  virtual bool is_valid() const;
+
+  Server &Get(const std::string &pattern, Handler handler);
+  Server &Post(const std::string &pattern, Handler handler);
+  Server &Post(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Put(const std::string &pattern, Handler handler);
+  Server &Put(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Patch(const std::string &pattern, Handler handler);
+  Server &Patch(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Delete(const std::string &pattern, Handler handler);
+  Server &Delete(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Options(const std::string &pattern, Handler handler);
+
+  bool set_base_dir(const std::string &dir,
+                    const std::string &mount_point = std::string());
+  bool set_mount_point(const std::string &mount_point, const std::string &dir,
+                       Headers headers = Headers());
+  bool remove_mount_point(const std::string &mount_point);
+  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                  const std::string &mime);
+  Server &set_default_file_mimetype(const std::string &mime);
+  Server &set_file_request_handler(Handler handler);
+
+  template <class ErrorHandlerFunc>
+  Server &set_error_handler(ErrorHandlerFunc &&handler) {
+    return set_error_handler_core(
+        std::forward<ErrorHandlerFunc>(handler),
+        std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
+  }
+
+  Server &set_exception_handler(ExceptionHandler handler);
+  Server &set_pre_routing_handler(HandlerWithResponse handler);
+  Server &set_post_routing_handler(Handler handler);
+
+  Server &set_expect_100_continue_handler(Expect100ContinueHandler handler);
+  Server &set_logger(Logger logger);
+
+  Server &set_address_family(int family);
+  Server &set_tcp_nodelay(bool on);
+  Server &set_ipv6_v6only(bool on);
+  Server &set_socket_options(SocketOptions socket_options);
+
+  Server &set_default_headers(Headers headers);
+  Server &
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  Server &set_keep_alive_max_count(size_t count);
+  Server &set_keep_alive_timeout(time_t sec);
+
+  Server &set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_idle_interval(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_idle_interval(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_payload_max_length(size_t length);
+
+  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
+  int bind_to_any_port(const std::string &host, int socket_flags = 0);
+  bool listen_after_bind();
+
+  bool listen(const std::string &host, int port, int socket_flags = 0);
+
+  bool is_running() const;
+  void wait_until_ready() const;
+  void stop();
+  void decommission();
+
+  std::function<TaskQueue *(void)> new_task_queue;
+
+protected:
+  bool process_request(Stream &strm, const std::string &remote_addr,
+                       int remote_port, const std::string &local_addr,
+                       int local_port, bool close_connection,
+                       bool &connection_closed,
+                       const std::function<void(Request &)> &setup_request);
+
+  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
+  size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
+  time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
+  time_t read_timeout_sec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND;
+  time_t read_timeout_usec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND;
+  time_t write_timeout_sec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND;
+  time_t write_timeout_usec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND;
+  time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND;
+  time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND;
+  size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
+
+private:
+  using Handlers =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
+  using HandlersForContentReader =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
+                            HandlerWithContentReader>>;
+
+  static std::unique_ptr<detail::MatcherBase>
+  make_matcher(const std::string &pattern);
+
+  Server &set_error_handler_core(HandlerWithResponse handler, std::true_type);
+  Server &set_error_handler_core(Handler handler, std::false_type);
+
+  socket_t create_server_socket(const std::string &host, int port,
+                                int socket_flags,
+                                SocketOptions socket_options) const;
+  int bind_internal(const std::string &host, int port, int socket_flags);
+  bool listen_internal();
+
+  bool routing(Request &req, Response &res, Stream &strm);
+  bool handle_file_request(const Request &req, Response &res,
+                           bool head = false);
+  bool dispatch_request(Request &req, Response &res,
+                        const Handlers &handlers) const;
+  bool dispatch_request_for_content_reader(
+      Request &req, Response &res, ContentReader content_reader,
+      const HandlersForContentReader &handlers) const;
+
+  bool parse_request_line(const char *s, Request &req) const;
+  void apply_ranges(const Request &req, Response &res,
+                    std::string &content_type, std::string &boundary) const;
+  bool write_response(Stream &strm, bool close_connection, Request &req,
+                      Response &res);
+  bool write_response_with_content(Stream &strm, bool close_connection,
+                                   const Request &req, Response &res);
+  bool write_response_core(Stream &strm, bool close_connection,
+                           const Request &req, Response &res,
+                           bool need_apply_ranges);
+  bool write_content_with_provider(Stream &strm, const Request &req,
+                                   Response &res, const std::string &boundary,
+                                   const std::string &content_type);
+  bool read_content(Stream &strm, Request &req, Response &res);
+  bool
+  read_content_with_content_receiver(Stream &strm, Request &req, Response &res,
+                                     ContentReceiver receiver,
+                                     MultipartContentHeader multipart_header,
+                                     ContentReceiver multipart_receiver);
+  bool read_content_core(Stream &strm, Request &req, Response &res,
+                         ContentReceiver receiver,
+                         MultipartContentHeader multipart_header,
+                         ContentReceiver multipart_receiver) const;
+
+  virtual bool process_and_close_socket(socket_t sock);
+
+  std::atomic<bool> is_running_{false};
+  std::atomic<bool> is_decommisioned{false};
+
+  struct MountPointEntry {
+    std::string mount_point;
+    std::string base_dir;
+    Headers headers;
+  };
+  std::vector<MountPointEntry> base_dirs_;
+  std::map<std::string, std::string> file_extension_and_mimetype_map_;
+  std::string default_file_mimetype_ = "application/octet-stream";
+  Handler file_request_handler_;
+
+  Handlers get_handlers_;
+  Handlers post_handlers_;
+  HandlersForContentReader post_handlers_for_content_reader_;
+  Handlers put_handlers_;
+  HandlersForContentReader put_handlers_for_content_reader_;
+  Handlers patch_handlers_;
+  HandlersForContentReader patch_handlers_for_content_reader_;
+  Handlers delete_handlers_;
+  HandlersForContentReader delete_handlers_for_content_reader_;
+  Handlers options_handlers_;
+
+  HandlerWithResponse error_handler_;
+  ExceptionHandler exception_handler_;
+  HandlerWithResponse pre_routing_handler_;
+  Handler post_routing_handler_;
+  Expect100ContinueHandler expect_100_continue_handler_;
+
+  Logger logger_;
+
+  int address_family_ = AF_UNSPEC;
+  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
+  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
+  SocketOptions socket_options_ = default_socket_options;
+
+  Headers default_headers_;
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+};
+
+enum class Error {
+  Success = 0,
+  Unknown,
+  Connection,
+  BindIPAddress,
+  Read,
+  Write,
+  ExceedRedirectCount,
+  Canceled,
+  SSLConnection,
+  SSLLoadingCerts,
+  SSLServerVerification,
+  SSLServerHostnameVerification,
+  UnsupportedMultipartBoundaryChars,
+  Compression,
+  ConnectionTimeout,
+  ProxyConnection,
+
+  // For internal use only
+  SSLPeerCouldBeClosed_,
+};
+
+std::string to_string(Error error);
+
+std::ostream &operator<<(std::ostream &os, const Error &obj);
+
+class Result {
+public:
+  Result() = default;
+  Result(std::unique_ptr<Response> &&res, Error err,
+         Headers &&request_headers = Headers{})
+      : res_(std::move(res)), err_(err),
+        request_headers_(std::move(request_headers)) {}
+  // Response
+  operator bool() const { return res_ != nullptr; }
+  bool operator==(std::nullptr_t) const { return res_ == nullptr; }
+  bool operator!=(std::nullptr_t) const { return res_ != nullptr; }
+  const Response &value() const { return *res_; }
+  Response &value() { return *res_; }
+  const Response &operator*() const { return *res_; }
+  Response &operator*() { return *res_; }
+  const Response *operator->() const { return res_.get(); }
+  Response *operator->() { return res_.get(); }
+
+  // Error
+  Error error() const { return err_; }
+
+  // Request Headers
+  bool has_request_header(const std::string &key) const;
+  std::string get_request_header_value(const std::string &key,
+                                       const char *def = "",
+                                       size_t id = 0) const;
+  uint64_t get_request_header_value_u64(const std::string &key,
+                                        uint64_t def = 0, size_t id = 0) const;
+  size_t get_request_header_value_count(const std::string &key) const;
+
+private:
+  std::unique_ptr<Response> res_;
+  Error err_ = Error::Unknown;
+  Headers request_headers_;
+};
+
+class ClientImpl {
+public:
+  explicit ClientImpl(const std::string &host);
+
+  explicit ClientImpl(const std::string &host, int port);
+
+  explicit ClientImpl(const std::string &host, int port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path);
+
+  virtual ~ClientImpl();
+
+  virtual bool is_valid() const;
+
+  Result Get(const std::string &path);
+  Result Get(const std::string &path, const Headers &headers);
+  Result Get(const std::string &path, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             Progress progress);
+  Result Get(const std::string &path, ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, ContentReceiver content_receiver,
+             Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver, Progress progress);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler, ContentReceiver content_receiver,
+             Progress progress);
+
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ContentReceiver content_receiver,
+             Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress = nullptr);
+
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const char *body, size_t content_length,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type, Progress progress);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, size_t content_length,
+              ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              size_t content_length, ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params, Progress progress);
+  Result Post(const std::string &path, const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items, const std::string &boundary);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items,
+              const MultipartFormDataProviderItems &provider_items);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type, Progress progress);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, size_t content_length,
+             ContentProvider content_provider, const std::string &content_type);
+  Result Put(const std::string &path,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             size_t content_length, ContentProvider content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params, Progress progress);
+  Result Put(const std::string &path, const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items, const std::string &boundary);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type,
+               Progress progress);
+  Result Patch(const std::string &path, size_t content_length,
+               ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               size_t content_length, ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+
+  Result Delete(const std::string &path);
+  Result Delete(const std::string &path, const Headers &headers);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type,
+                Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type,
+                Progress progress);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
+
+  bool send(Request &req, Response &res, Error &error);
+  Result send(const Request &req);
+
+  void stop();
+
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
+  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
+
+  void set_default_headers(Headers headers);
+
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  void set_address_family(int family);
+  void set_tcp_nodelay(bool on);
+  void set_ipv6_v6only(bool on);
+  void set_socket_options(SocketOptions socket_options);
+
+  void set_connection_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void
+  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
+#endif
+
+  void set_keep_alive(bool on);
+  void set_follow_location(bool on);
+
+  void set_url_encode(bool on);
+
+  void set_compress(bool on);
+
+  void set_decompress(bool on);
+
+  void set_interface(const std::string &intf);
+
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void enable_server_certificate_verification(bool enabled);
+  void enable_server_hostname_verification(bool enabled);
+  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
+#endif
+
+  void set_logger(Logger logger);
+
+protected:
+  struct Socket {
+    socket_t sock = INVALID_SOCKET;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSL *ssl = nullptr;
+#endif
+
+    bool is_open() const { return sock != INVALID_SOCKET; }
+  };
+
+  virtual bool create_and_connect_socket(Socket &socket, Error &error);
+
+  // All of:
+  //   shutdown_ssl
+  //   shutdown_socket
+  //   close_socket
+  // should ONLY be called when socket_mutex_ is locked.
+  // Also, shutdown_ssl and close_socket should also NOT be called concurrently
+  // with a DIFFERENT thread sending requests using that socket.
+  virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
+  void shutdown_socket(Socket &socket) const;
+  void close_socket(Socket &socket);
+
+  bool process_request(Stream &strm, Request &req, Response &res,
+                       bool close_connection, Error &error);
+
+  bool write_content_with_provider(Stream &strm, const Request &req,
+                                   Error &error) const;
+
+  void copy_settings(const ClientImpl &rhs);
+
+  // Socket endpoint information
+  const std::string host_;
+  const int port_;
+  const std::string host_and_port_;
+
+  // Current open socket
+  Socket socket_;
+  mutable std::mutex socket_mutex_;
+  std::recursive_mutex request_mutex_;
+
+  // These are all protected under socket_mutex
+  size_t socket_requests_in_flight_ = 0;
+  std::thread::id socket_requests_are_from_thread_ = std::thread::id();
+  bool socket_should_be_closed_when_request_is_done_ = false;
+
+  // Hostname-IP map
+  std::map<std::string, std::string> addr_map_;
+
+  // Default headers
+  Headers default_headers_;
+
+  // Header writer
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+
+  // Settings
+  std::string client_cert_path_;
+  std::string client_key_path_;
+
+  time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND;
+  time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND;
+  time_t read_timeout_sec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND;
+  time_t read_timeout_usec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND;
+  time_t write_timeout_sec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND;
+  time_t write_timeout_usec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND;
+
+  std::string basic_auth_username_;
+  std::string basic_auth_password_;
+  std::string bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string digest_auth_username_;
+  std::string digest_auth_password_;
+#endif
+
+  bool keep_alive_ = false;
+  bool follow_location_ = false;
+
+  bool url_encode_ = true;
+
+  int address_family_ = AF_UNSPEC;
+  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
+  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
+  SocketOptions socket_options_ = nullptr;
+
+  bool compress_ = false;
+  bool decompress_ = true;
+
+  std::string interface_;
+
+  std::string proxy_host_;
+  int proxy_port_ = -1;
+
+  std::string proxy_basic_auth_username_;
+  std::string proxy_basic_auth_password_;
+  std::string proxy_bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string proxy_digest_auth_username_;
+  std::string proxy_digest_auth_password_;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string ca_cert_file_path_;
+  std::string ca_cert_dir_path_;
+
+  X509_STORE *ca_cert_store_ = nullptr;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  bool server_certificate_verification_ = true;
+  bool server_hostname_verification_ = true;
+  std::function<bool(SSL *ssl)> server_certificate_verifier_;
+#endif
+
+  Logger logger_;
+
+private:
+  bool send_(Request &req, Response &res, Error &error);
+  Result send_(Request &&req);
+
+  socket_t create_client_socket(Error &error) const;
+  bool read_response_line(Stream &strm, const Request &req,
+                          Response &res) const;
+  bool write_request(Stream &strm, Request &req, bool close_connection,
+                     Error &error);
+  bool redirect(Request &req, Response &res, Error &error);
+  bool handle_request(Stream &strm, Request &req, Response &res,
+                      bool close_connection, Error &error);
+  std::unique_ptr<Response> send_with_content_provider(
+      Request &req, const char *body, size_t content_length,
+      ContentProvider content_provider,
+      ContentProviderWithoutLength content_provider_without_length,
+      const std::string &content_type, Error &error);
+  Result send_with_content_provider(
+      const std::string &method, const std::string &path,
+      const Headers &headers, const char *body, size_t content_length,
+      ContentProvider content_provider,
+      ContentProviderWithoutLength content_provider_without_length,
+      const std::string &content_type, Progress progress);
+  ContentProviderWithoutLength get_multipart_content_provider(
+      const std::string &boundary, const MultipartFormDataItems &items,
+      const MultipartFormDataProviderItems &provider_items) const;
+
+  std::string adjust_host_string(const std::string &host) const;
+
+  virtual bool process_socket(const Socket &socket,
+                              std::function<bool(Stream &strm)> callback);
+  virtual bool is_ssl() const;
+};
+
+class Client {
+public:
+  // Universal interface
+  explicit Client(const std::string &scheme_host_port);
+
+  explicit Client(const std::string &scheme_host_port,
+                  const std::string &client_cert_path,
+                  const std::string &client_key_path);
+
+  // HTTP only interface
+  explicit Client(const std::string &host, int port);
+
+  explicit Client(const std::string &host, int port,
+                  const std::string &client_cert_path,
+                  const std::string &client_key_path);
+
+  Client(Client &&) = default;
+  Client &operator=(Client &&) = default;
+
+  ~Client();
+
+  bool is_valid() const;
+
+  Result Get(const std::string &path);
+  Result Get(const std::string &path, const Headers &headers);
+  Result Get(const std::string &path, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             Progress progress);
+  Result Get(const std::string &path, ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, ContentReceiver content_receiver,
+             Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver, Progress progress);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler, ContentReceiver content_receiver,
+             Progress progress);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress);
+
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ContentReceiver content_receiver,
+             Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress = nullptr);
+
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const char *body, size_t content_length,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type, Progress progress);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, size_t content_length,
+              ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              size_t content_length, ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params, Progress progress);
+  Result Post(const std::string &path, const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items, const std::string &boundary);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items,
+              const MultipartFormDataProviderItems &provider_items);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type, Progress progress);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, size_t content_length,
+             ContentProvider content_provider, const std::string &content_type);
+  Result Put(const std::string &path,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             size_t content_length, ContentProvider content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params, Progress progress);
+  Result Put(const std::string &path, const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items, const std::string &boundary);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type,
+               Progress progress);
+  Result Patch(const std::string &path, size_t content_length,
+               ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               size_t content_length, ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+
+  Result Delete(const std::string &path);
+  Result Delete(const std::string &path, const Headers &headers);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type,
+                Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type,
+                Progress progress);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
+
+  bool send(Request &req, Response &res, Error &error);
+  Result send(const Request &req);
+
+  void stop();
+
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
+  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
+
+  void set_default_headers(Headers headers);
+
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  void set_address_family(int family);
+  void set_tcp_nodelay(bool on);
+  void set_socket_options(SocketOptions socket_options);
+
+  void set_connection_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void
+  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
+#endif
+
+  void set_keep_alive(bool on);
+  void set_follow_location(bool on);
+
+  void set_url_encode(bool on);
+
+  void set_compress(bool on);
+
+  void set_decompress(bool on);
+
+  void set_interface(const std::string &intf);
+
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void enable_server_certificate_verification(bool enabled);
+  void enable_server_hostname_verification(bool enabled);
+  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
+#endif
+
+  void set_logger(Logger logger);
+
+  // SSL
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
+
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
+
+  long get_openssl_verify_result() const;
+
+  SSL_CTX *ssl_context() const;
+#endif
+
+private:
+  std::unique_ptr<ClientImpl> cli_;
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  bool is_ssl_ = false;
+#endif
+};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+class SSLServer : public Server {
+public:
+  SSLServer(const char *cert_path, const char *private_key_path,
+            const char *client_ca_cert_file_path = nullptr,
+            const char *client_ca_cert_dir_path = nullptr,
+            const char *private_key_password = nullptr);
+
+  SSLServer(X509 *cert, EVP_PKEY *private_key,
+            X509_STORE *client_ca_cert_store = nullptr);
+
+  SSLServer(
+      const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback);
+
+  ~SSLServer() override;
+
+  bool is_valid() const override;
+
+  SSL_CTX *ssl_context() const;
+
+  void update_certs(X509 *cert, EVP_PKEY *private_key,
+                    X509_STORE *client_ca_cert_store = nullptr);
+
+private:
+  bool process_and_close_socket(socket_t sock) override;
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+};
+
+class SSLClient final : public ClientImpl {
+public:
+  explicit SSLClient(const std::string &host);
+
+  explicit SSLClient(const std::string &host, int port);
+
+  explicit SSLClient(const std::string &host, int port,
+                     const std::string &client_cert_path,
+                     const std::string &client_key_path,
+                     const std::string &private_key_password = std::string());
+
+  explicit SSLClient(const std::string &host, int port, X509 *client_cert,
+                     EVP_PKEY *client_key,
+                     const std::string &private_key_password = std::string());
+
+  ~SSLClient() override;
+
+  bool is_valid() const override;
+
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
+
+  long get_openssl_verify_result() const;
+
+  SSL_CTX *ssl_context() const;
+
+private:
+  bool create_and_connect_socket(Socket &socket, Error &error) override;
+  void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
+  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
+
+  bool process_socket(const Socket &socket,
+                      std::function<bool(Stream &strm)> callback) override;
+  bool is_ssl() const override;
+
+  bool connect_with_proxy(Socket &sock, Response &res, bool &success,
+                          Error &error);
+  bool initialize_ssl(Socket &socket, Error &error);
+
+  bool load_certs();
+
+  bool verify_host(X509 *server_cert) const;
+  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
+  bool verify_host_with_common_name(X509 *server_cert) const;
+  bool check_host_name(const char *pattern, size_t pattern_len) const;
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+  std::once_flag initialize_cert_;
+
+  std::vector<std::string> host_components_;
+
+  long verify_result_ = 0;
+
+  friend class ClientImpl;
+};
+#endif
+
+/*
+ * Implementation of template methods.
+ */
+
+namespace detail {
+
+template <typename T, typename U>
+inline void duration_to_sec_and_usec(const T &duration, U callback) {
+  auto sec = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+  auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
+                  duration - std::chrono::seconds(sec))
+                  .count();
+  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
+}
+
+inline uint64_t get_header_value_u64(const Headers &headers,
+                                     const std::string &key, uint64_t def,
+                                     size_t id) {
+  auto rng = headers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) {
+    return std::strtoull(it->second.data(), nullptr, 10);
+  }
+  return def;
+}
+
+} // namespace detail
+
+inline uint64_t Request::get_header_value_u64(const std::string &key,
+                                              uint64_t def, size_t id) const {
+  return detail::get_header_value_u64(headers, key, def, id);
+}
+
+inline uint64_t Response::get_header_value_u64(const std::string &key,
+                                               uint64_t def, size_t id) const {
+  return detail::get_header_value_u64(headers, key, def, id);
+}
+
+inline void default_socket_options(socket_t sock) {
+  int opt = 1;
+#ifdef _WIN32
+  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+             reinterpret_cast<const char *>(&opt), sizeof(opt));
+  setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
+             reinterpret_cast<const char *>(&opt), sizeof(opt));
+#else
+#ifdef SO_REUSEPORT
+  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT,
+             reinterpret_cast<const void *>(&opt), sizeof(opt));
+#else
+  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+             reinterpret_cast<const void *>(&opt), sizeof(opt));
+#endif
+#endif
+}
+
+inline const char *status_message(int status) {
+  switch (status) {
+  case StatusCode::Continue_100: return "Continue";
+  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
+  case StatusCode::Processing_102: return "Processing";
+  case StatusCode::EarlyHints_103: return "Early Hints";
+  case StatusCode::OK_200: return "OK";
+  case StatusCode::Created_201: return "Created";
+  case StatusCode::Accepted_202: return "Accepted";
+  case StatusCode::NonAuthoritativeInformation_203:
+    return "Non-Authoritative Information";
+  case StatusCode::NoContent_204: return "No Content";
+  case StatusCode::ResetContent_205: return "Reset Content";
+  case StatusCode::PartialContent_206: return "Partial Content";
+  case StatusCode::MultiStatus_207: return "Multi-Status";
+  case StatusCode::AlreadyReported_208: return "Already Reported";
+  case StatusCode::IMUsed_226: return "IM Used";
+  case StatusCode::MultipleChoices_300: return "Multiple Choices";
+  case StatusCode::MovedPermanently_301: return "Moved Permanently";
+  case StatusCode::Found_302: return "Found";
+  case StatusCode::SeeOther_303: return "See Other";
+  case StatusCode::NotModified_304: return "Not Modified";
+  case StatusCode::UseProxy_305: return "Use Proxy";
+  case StatusCode::unused_306: return "unused";
+  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
+  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
+  case StatusCode::BadRequest_400: return "Bad Request";
+  case StatusCode::Unauthorized_401: return "Unauthorized";
+  case StatusCode::PaymentRequired_402: return "Payment Required";
+  case StatusCode::Forbidden_403: return "Forbidden";
+  case StatusCode::NotFound_404: return "Not Found";
+  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
+  case StatusCode::NotAcceptable_406: return "Not Acceptable";
+  case StatusCode::ProxyAuthenticationRequired_407:
+    return "Proxy Authentication Required";
+  case StatusCode::RequestTimeout_408: return "Request Timeout";
+  case StatusCode::Conflict_409: return "Conflict";
+  case StatusCode::Gone_410: return "Gone";
+  case StatusCode::LengthRequired_411: return "Length Required";
+  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
+  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
+  case StatusCode::UriTooLong_414: return "URI Too Long";
+  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
+  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
+  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
+  case StatusCode::ImATeapot_418: return "I'm a teapot";
+  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
+  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
+  case StatusCode::Locked_423: return "Locked";
+  case StatusCode::FailedDependency_424: return "Failed Dependency";
+  case StatusCode::TooEarly_425: return "Too Early";
+  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
+  case StatusCode::PreconditionRequired_428: return "Precondition Required";
+  case StatusCode::TooManyRequests_429: return "Too Many Requests";
+  case StatusCode::RequestHeaderFieldsTooLarge_431:
+    return "Request Header Fields Too Large";
+  case StatusCode::UnavailableForLegalReasons_451:
+    return "Unavailable For Legal Reasons";
+  case StatusCode::NotImplemented_501: return "Not Implemented";
+  case StatusCode::BadGateway_502: return "Bad Gateway";
+  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
+  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
+  case StatusCode::HttpVersionNotSupported_505:
+    return "HTTP Version Not Supported";
+  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
+  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
+  case StatusCode::LoopDetected_508: return "Loop Detected";
+  case StatusCode::NotExtended_510: return "Not Extended";
+  case StatusCode::NetworkAuthenticationRequired_511:
+    return "Network Authentication Required";
+
+  default:
+  case StatusCode::InternalServerError_500: return "Internal Server Error";
+  }
+}
+
+inline std::string get_bearer_token_auth(const Request &req) {
+  if (req.has_header("Authorization")) {
+    static std::string BearerHeaderPrefix = "Bearer ";
+    return req.get_header_value("Authorization")
+        .substr(BearerHeaderPrefix.length());
+  }
+  return "";
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
+  return *this;
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
+  return *this;
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); });
+  return *this;
+}
+
+inline std::string to_string(const Error error) {
+  switch (error) {
+  case Error::Success: return "Success (no error)";
+  case Error::Connection: return "Could not establish connection";
+  case Error::BindIPAddress: return "Failed to bind IP address";
+  case Error::Read: return "Failed to read connection";
+  case Error::Write: return "Failed to write connection";
+  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
+  case Error::Canceled: return "Connection handling canceled";
+  case Error::SSLConnection: return "SSL connection failed";
+  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
+  case Error::SSLServerVerification: return "SSL server verification failed";
+  case Error::SSLServerHostnameVerification:
+    return "SSL server hostname verification failed";
+  case Error::UnsupportedMultipartBoundaryChars:
+    return "Unsupported HTTP multipart boundary characters";
+  case Error::Compression: return "Compression failed";
+  case Error::ConnectionTimeout: return "Connection timed out";
+  case Error::ProxyConnection: return "Proxy connection failed";
+  case Error::Unknown: return "Unknown";
+  default: break;
+  }
+
+  return "Invalid";
+}
+
+inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
+  os << to_string(obj);
+  os << " (" << static_cast<std::underlying_type<Error>::type>(obj) << ')';
+  return os;
+}
+
+inline uint64_t Result::get_request_header_value_u64(const std::string &key,
+                                                     uint64_t def,
+                                                     size_t id) const {
+  return detail::get_header_value_u64(request_headers_, key, def, id);
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_connection_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) {
+    set_connection_timeout(sec, usec);
+  });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_read_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_write_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
+}
+
+template <class Rep, class Period>
+inline void Client::set_connection_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_connection_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_read_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_write_timeout(duration);
+}
+
+/*
+ * Forward declarations and types that will be part of the .h file if split into
+ * .h + .cc.
+ */
+
+std::string hosted_at(const std::string &hostname);
+
+void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
+
+std::string append_query_params(const std::string &path, const Params &params);
+
+std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
+
+std::pair<std::string, std::string>
+make_basic_authentication_header(const std::string &username,
+                                 const std::string &password,
+                                 bool is_proxy = false);
+
+namespace detail {
+
+struct FileStat {
+  FileStat(const std::string &path);
+  bool is_file() const;
+  bool is_dir() const;
+
+private:
+  struct stat st_;
+  int ret_ = -1;
+};
+
+std::string encode_query_param(const std::string &value);
+
+std::string decode_url(const std::string &s, bool convert_plus_to_space);
+
+void read_file(const std::string &path, std::string &out);
+
+std::string trim_copy(const std::string &s);
+
+void divide(
+    const char *data, std::size_t size, char d,
+    std::function<void(const char *, std::size_t, const char *, std::size_t)>
+        fn);
+
+void divide(
+    const std::string &str, char d,
+    std::function<void(const char *, std::size_t, const char *, std::size_t)>
+        fn);
+
+void split(const char *b, const char *e, char d,
+           std::function<void(const char *, const char *)> fn);
+
+void split(const char *b, const char *e, char d, size_t m,
+           std::function<void(const char *, const char *)> fn);
+
+bool process_client_socket(socket_t sock, time_t read_timeout_sec,
+                           time_t read_timeout_usec, time_t write_timeout_sec,
+                           time_t write_timeout_usec,
+                           std::function<bool(Stream &)> callback);
+
+socket_t create_client_socket(const std::string &host, const std::string &ip,
+                              int port, int address_family, bool tcp_nodelay,
+                              bool ipv6_v6only, SocketOptions socket_options,
+                              time_t connection_timeout_sec,
+                              time_t connection_timeout_usec,
+                              time_t read_timeout_sec, time_t read_timeout_usec,
+                              time_t write_timeout_sec,
+                              time_t write_timeout_usec,
+                              const std::string &intf, Error &error);
+
+const char *get_header_value(const Headers &headers, const std::string &key,
+                             const char *def, size_t id);
+
+std::string params_to_query_str(const Params &params);
+
+void parse_query_text(const char *data, std::size_t size, Params &params);
+
+void parse_query_text(const std::string &s, Params &params);
+
+bool parse_multipart_boundary(const std::string &content_type,
+                              std::string &boundary);
+
+bool parse_range_header(const std::string &s, Ranges &ranges);
+
+int close_socket(socket_t sock);
+
+ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
+
+ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
+
+enum class EncodingType { None = 0, Gzip, Brotli };
+
+EncodingType encoding_type(const Request &req, const Response &res);
+
+class BufferStream final : public Stream {
+public:
+  BufferStream() = default;
+  ~BufferStream() override = default;
+
+  bool is_readable() const override;
+  bool is_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+
+  const std::string &get_buffer() const;
+
+private:
+  std::string buffer;
+  size_t position = 0;
+};
+
+class compressor {
+public:
+  virtual ~compressor() = default;
+
+  typedef std::function<bool(const char *data, size_t data_len)> Callback;
+  virtual bool compress(const char *data, size_t data_length, bool last,
+                        Callback callback) = 0;
+};
+
+class decompressor {
+public:
+  virtual ~decompressor() = default;
+
+  virtual bool is_valid() const = 0;
+
+  typedef std::function<bool(const char *data, size_t data_len)> Callback;
+  virtual bool decompress(const char *data, size_t data_length,
+                          Callback callback) = 0;
+};
+
+class nocompressor final : public compressor {
+public:
+  ~nocompressor() override = default;
+
+  bool compress(const char *data, size_t data_length, bool /*last*/,
+                Callback callback) override;
+};
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+class gzip_compressor final : public compressor {
+public:
+  gzip_compressor();
+  ~gzip_compressor() override;
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  bool is_valid_ = false;
+  z_stream strm_;
+};
+
+class gzip_decompressor final : public decompressor {
+public:
+  gzip_decompressor();
+  ~gzip_decompressor() override;
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  bool is_valid_ = false;
+  z_stream strm_;
+};
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+class brotli_compressor final : public compressor {
+public:
+  brotli_compressor();
+  ~brotli_compressor();
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  BrotliEncoderState *state_ = nullptr;
+};
+
+class brotli_decompressor final : public decompressor {
+public:
+  brotli_decompressor();
+  ~brotli_decompressor();
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  BrotliDecoderResult decoder_r;
+  BrotliDecoderState *decoder_s = nullptr;
+};
+#endif
+
+// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
+// to store data. The call can set memory on stack for performance.
+class stream_line_reader {
+public:
+  stream_line_reader(Stream &strm, char *fixed_buffer,
+                     size_t fixed_buffer_size);
+  const char *ptr() const;
+  size_t size() const;
+  bool end_with_crlf() const;
+  bool getline();
+
+private:
+  void append(char c);
+
+  Stream &strm_;
+  char *fixed_buffer_;
+  const size_t fixed_buffer_size_;
+  size_t fixed_buffer_used_size_ = 0;
+  std::string glowable_buffer_;
+};
+
+class mmap {
+public:
+  mmap(const char *path);
+  ~mmap();
+
+  bool open(const char *path);
+  void close();
+
+  bool is_open() const;
+  size_t size() const;
+  const char *data() const;
+
+private:
+#if defined(_WIN32)
+  HANDLE hFile_ = NULL;
+  HANDLE hMapping_ = NULL;
+#else
+  int fd_ = -1;
+#endif
+  size_t size_ = 0;
+  void *addr_ = nullptr;
+  bool is_open_empty_file = false;
+};
+
+} // namespace detail
+
+// ----------------------------------------------------------------------------
+
+/*
+ * Implementation that will be part of the .cc file if split into .h + .cc.
+ */
+
+namespace detail {
+
+inline bool is_hex(char c, int &v) {
+  if (0x20 <= c && isdigit(c)) {
+    v = c - '0';
+    return true;
+  } else if ('A' <= c && c <= 'F') {
+    v = c - 'A' + 10;
+    return true;
+  } else if ('a' <= c && c <= 'f') {
+    v = c - 'a' + 10;
+    return true;
+  }
+  return false;
+}
+
+inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
+                          int &val) {
+  if (i >= s.size()) { return false; }
+
+  val = 0;
+  for (; cnt; i++, cnt--) {
+    if (!s[i]) { return false; }
+    auto v = 0;
+    if (is_hex(s[i], v)) {
+      val = val * 16 + v;
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+inline std::string from_i_to_hex(size_t n) {
+  static const auto charset = "0123456789abcdef";
+  std::string ret;
+  do {
+    ret = charset[n & 15] + ret;
+    n >>= 4;
+  } while (n > 0);
+  return ret;
+}
+
+inline size_t to_utf8(int code, char *buff) {
+  if (code < 0x0080) {
+    buff[0] = static_cast<char>(code & 0x7F);
+    return 1;
+  } else if (code < 0x0800) {
+    buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
+    buff[1] = static_cast<char>(0x80 | (code & 0x3F));
+    return 2;
+  } else if (code < 0xD800) {
+    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
+    return 3;
+  } else if (code < 0xE000) { // D800 - DFFF is invalid...
+    return 0;
+  } else if (code < 0x10000) {
+    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
+    return 3;
+  } else if (code < 0x110000) {
+    buff[0] = static_cast<char>(0xF0 | ((code >> 18) & 0x7));
+    buff[1] = static_cast<char>(0x80 | ((code >> 12) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[3] = static_cast<char>(0x80 | (code & 0x3F));
+    return 4;
+  }
+
+  // NOTREACHED
+  return 0;
+}
+
+// NOTE: This code came up with the following stackoverflow post:
+// https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c
+inline std::string base64_encode(const std::string &in) {
+  static const auto lookup =
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+  std::string out;
+  out.reserve(in.size());
+
+  auto val = 0;
+  auto valb = -6;
+
+  for (auto c : in) {
+    val = (val << 8) + static_cast<uint8_t>(c);
+    valb += 8;
+    while (valb >= 0) {
+      out.push_back(lookup[(val >> valb) & 0x3F]);
+      valb -= 6;
+    }
+  }
+
+  if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); }
+
+  while (out.size() % 4) {
+    out.push_back('=');
+  }
+
+  return out;
+}
+
+inline bool is_valid_path(const std::string &path) {
+  size_t level = 0;
+  size_t i = 0;
+
+  // Skip slash
+  while (i < path.size() && path[i] == '/') {
+    i++;
+  }
+
+  while (i < path.size()) {
+    // Read component
+    auto beg = i;
+    while (i < path.size() && path[i] != '/') {
+      if (path[i] == '\0') {
+        return false;
+      } else if (path[i] == '\\') {
+        return false;
+      }
+      i++;
+    }
+
+    auto len = i - beg;
+    assert(len > 0);
+
+    if (!path.compare(beg, len, ".")) {
+      ;
+    } else if (!path.compare(beg, len, "..")) {
+      if (level == 0) { return false; }
+      level--;
+    } else {
+      level++;
+    }
+
+    // Skip slash
+    while (i < path.size() && path[i] == '/') {
+      i++;
+    }
+  }
+
+  return true;
+}
+
+inline FileStat::FileStat(const std::string &path) {
+  ret_ = stat(path.c_str(), &st_);
+}
+inline bool FileStat::is_file() const {
+  return ret_ >= 0 && S_ISREG(st_.st_mode);
+}
+inline bool FileStat::is_dir() const {
+  return ret_ >= 0 && S_ISDIR(st_.st_mode);
+}
+
+inline std::string encode_query_param(const std::string &value) {
+  std::ostringstream escaped;
+  escaped.fill('0');
+  escaped << std::hex;
+
+  for (auto c : value) {
+    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
+        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
+        c == ')') {
+      escaped << c;
+    } else {
+      escaped << std::uppercase;
+      escaped << '%' << std::setw(2)
+              << static_cast<int>(static_cast<unsigned char>(c));
+      escaped << std::nouppercase;
+    }
+  }
+
+  return escaped.str();
+}
+
+inline std::string encode_url(const std::string &s) {
+  std::string result;
+  result.reserve(s.size());
+
+  for (size_t i = 0; s[i]; i++) {
+    switch (s[i]) {
+    case ' ': result += "%20"; break;
+    case '+': result += "%2B"; break;
+    case '\r': result += "%0D"; break;
+    case '\n': result += "%0A"; break;
+    case '\'': result += "%27"; break;
+    case ',': result += "%2C"; break;
+    // case ':': result += "%3A"; break; // ok? probably...
+    case ';': result += "%3B"; break;
+    default:
+      auto c = static_cast<uint8_t>(s[i]);
+      if (c >= 0x80) {
+        result += '%';
+        char hex[4];
+        auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
+        assert(len == 2);
+        result.append(hex, static_cast<size_t>(len));
+      } else {
+        result += s[i];
+      }
+      break;
+    }
+  }
+
+  return result;
+}
+
+inline std::string decode_url(const std::string &s,
+                              bool convert_plus_to_space) {
+  std::string result;
+
+  for (size_t i = 0; i < s.size(); i++) {
+    if (s[i] == '%' && i + 1 < s.size()) {
+      if (s[i + 1] == 'u') {
+        auto val = 0;
+        if (from_hex_to_i(s, i + 2, 4, val)) {
+          // 4 digits Unicode codes
+          char buff[4];
+          size_t len = to_utf8(val, buff);
+          if (len > 0) { result.append(buff, len); }
+          i += 5; // 'u0000'
+        } else {
+          result += s[i];
+        }
+      } else {
+        auto val = 0;
+        if (from_hex_to_i(s, i + 1, 2, val)) {
+          // 2 digits hex codes
+          result += static_cast<char>(val);
+          i += 2; // '00'
+        } else {
+          result += s[i];
+        }
+      }
+    } else if (convert_plus_to_space && s[i] == '+') {
+      result += ' ';
+    } else {
+      result += s[i];
+    }
+  }
+
+  return result;
+}
+
+inline void read_file(const std::string &path, std::string &out) {
+  std::ifstream fs(path, std::ios_base::binary);
+  fs.seekg(0, std::ios_base::end);
+  auto size = fs.tellg();
+  fs.seekg(0);
+  out.resize(static_cast<size_t>(size));
+  fs.read(&out[0], static_cast<std::streamsize>(size));
+}
+
+inline std::string file_extension(const std::string &path) {
+  std::smatch m;
+  static auto re = std::regex("\\.([a-zA-Z0-9]+)$");
+  if (std::regex_search(path, m, re)) { return m[1].str(); }
+  return std::string();
+}
+
+inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; }
+
+inline std::pair<size_t, size_t> trim(const char *b, const char *e, size_t left,
+                                      size_t right) {
+  while (b + left < e && is_space_or_tab(b[left])) {
+    left++;
+  }
+  while (right > 0 && is_space_or_tab(b[right - 1])) {
+    right--;
+  }
+  return std::make_pair(left, right);
+}
+
+inline std::string trim_copy(const std::string &s) {
+  auto r = trim(s.data(), s.data() + s.size(), 0, s.size());
+  return s.substr(r.first, r.second - r.first);
+}
+
+inline std::string trim_double_quotes_copy(const std::string &s) {
+  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
+    return s.substr(1, s.size() - 2);
+  }
+  return s;
+}
+
+inline void
+divide(const char *data, std::size_t size, char d,
+       std::function<void(const char *, std::size_t, const char *, std::size_t)>
+           fn) {
+  const auto it = std::find(data, data + size, d);
+  const auto found = static_cast<std::size_t>(it != data + size);
+  const auto lhs_data = data;
+  const auto lhs_size = static_cast<std::size_t>(it - data);
+  const auto rhs_data = it + found;
+  const auto rhs_size = size - lhs_size - found;
+
+  fn(lhs_data, lhs_size, rhs_data, rhs_size);
+}
+
+inline void
+divide(const std::string &str, char d,
+       std::function<void(const char *, std::size_t, const char *, std::size_t)>
+           fn) {
+  divide(str.data(), str.size(), d, std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d,
+                  std::function<void(const char *, const char *)> fn) {
+  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d, size_t m,
+                  std::function<void(const char *, const char *)> fn) {
+  size_t i = 0;
+  size_t beg = 0;
+  size_t count = 1;
+
+  while (e ? (b + i < e) : (b[i] != '\0')) {
+    if (b[i] == d && count < m) {
+      auto r = trim(b, e, beg, i);
+      if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
+      beg = i + 1;
+      count++;
+    }
+    i++;
+  }
+
+  if (i) {
+    auto r = trim(b, e, beg, i);
+    if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
+  }
+}
+
+inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer,
+                                              size_t fixed_buffer_size)
+    : strm_(strm), fixed_buffer_(fixed_buffer),
+      fixed_buffer_size_(fixed_buffer_size) {}
+
+inline const char *stream_line_reader::ptr() const {
+  if (glowable_buffer_.empty()) {
+    return fixed_buffer_;
+  } else {
+    return glowable_buffer_.data();
+  }
+}
+
+inline size_t stream_line_reader::size() const {
+  if (glowable_buffer_.empty()) {
+    return fixed_buffer_used_size_;
+  } else {
+    return glowable_buffer_.size();
+  }
+}
+
+inline bool stream_line_reader::end_with_crlf() const {
+  auto end = ptr() + size();
+  return size() >= 2 && end[-2] == '\r' && end[-1] == '\n';
+}
+
+inline bool stream_line_reader::getline() {
+  fixed_buffer_used_size_ = 0;
+  glowable_buffer_.clear();
+
+#ifndef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+  char prev_byte = 0;
+#endif
+
+  for (size_t i = 0;; i++) {
+    char byte;
+    auto n = strm_.read(&byte, 1);
+
+    if (n < 0) {
+      return false;
+    } else if (n == 0) {
+      if (i == 0) {
+        return false;
+      } else {
+        break;
+      }
+    }
+
+    append(byte);
+
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+    if (byte == '\n') { break; }
+#else
+    if (prev_byte == '\r' && byte == '\n') { break; }
+    prev_byte = byte;
+#endif
+  }
+
+  return true;
+}
+
+inline void stream_line_reader::append(char c) {
+  if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
+    fixed_buffer_[fixed_buffer_used_size_++] = c;
+    fixed_buffer_[fixed_buffer_used_size_] = '\0';
+  } else {
+    if (glowable_buffer_.empty()) {
+      assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
+      glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
+    }
+    glowable_buffer_ += c;
+  }
+}
+
+inline mmap::mmap(const char *path) {
+  open(path);
+}
+
+inline mmap::~mmap() { close(); }
+
+inline bool mmap::open(const char *path) {
+  close();
+
+#if defined(_WIN32)
+  std::wstring wpath;
+  for (size_t i = 0; i < strlen(path); i++) {
+    wpath += path[i];
+  }
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,
+                         OPEN_EXISTING, NULL);
+#else
+  hFile_ = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
+                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
+
+  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
+
+  LARGE_INTEGER size{};
+  if (!::GetFileSizeEx(hFile_, &size)) { return false; }
+  // If the following line doesn't compile due to QuadPart, update Windows SDK.
+  // See:
+  // https://github.com/yhirose/cpp-httplib/issues/1903#issuecomment-2316520721
+  if (static_cast<ULONGLONG>(size.QuadPart) >
+      (std::numeric_limits<decltype(size_)>::max)()) {
+    // `size_t` might be 32-bits, on 32-bits Windows.
+    return false;
+  }
+  size_ = static_cast<size_t>(size.QuadPart);
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  hMapping_ =
+      ::CreateFileMappingFromApp(hFile_, NULL, PAGE_READONLY, size_, NULL);
+#else
+  hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
+#endif
+
+  // Special treatment for an empty file...
+  if (hMapping_ == NULL && size_ == 0) {
+    close();
+    is_open_empty_file = true;
+    return true;
+  }
+
+  if (hMapping_ == NULL) {
+    close();
+    return false;
+  }
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  addr_ = ::MapViewOfFileFromApp(hMapping_, FILE_MAP_READ, 0, 0);
+#else
+  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
+#endif
+
+  if (addr_ == nullptr) {
+    close();
+    return false;
+  }
+#else
+  fd_ = ::open(path, O_RDONLY);
+  if (fd_ == -1) { return false; }
+
+  struct stat sb;
+  if (fstat(fd_, &sb) == -1) {
+    close();
+    return false;
+  }
+  size_ = static_cast<size_t>(sb.st_size);
+
+  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
+
+  // Special treatment for an empty file...
+  if (addr_ == MAP_FAILED && size_ == 0) {
+    close();
+    is_open_empty_file = true;
+    return false;
+  }
+#endif
+
+  return true;
+}
+
+inline bool mmap::is_open() const {
+  return is_open_empty_file ? true : addr_ != nullptr;
+}
+
+inline size_t mmap::size() const { return size_; }
+
+inline const char *mmap::data() const {
+  return is_open_empty_file ? "" : static_cast<const char *>(addr_);
+}
+
+inline void mmap::close() {
+#if defined(_WIN32)
+  if (addr_) {
+    ::UnmapViewOfFile(addr_);
+    addr_ = nullptr;
+  }
+
+  if (hMapping_) {
+    ::CloseHandle(hMapping_);
+    hMapping_ = NULL;
+  }
+
+  if (hFile_ != INVALID_HANDLE_VALUE) {
+    ::CloseHandle(hFile_);
+    hFile_ = INVALID_HANDLE_VALUE;
+  }
+
+  is_open_empty_file = false;
+#else
+  if (addr_ != nullptr) {
+    munmap(addr_, size_);
+    addr_ = nullptr;
+  }
+
+  if (fd_ != -1) {
+    ::close(fd_);
+    fd_ = -1;
+  }
+#endif
+  size_ = 0;
+}
+inline int close_socket(socket_t sock) {
+#ifdef _WIN32
+  return closesocket(sock);
+#else
+  return close(sock);
+#endif
+}
+
+template <typename T> inline ssize_t handle_EINTR(T fn) {
+  ssize_t res = 0;
+  while (true) {
+    res = fn();
+    if (res < 0 && errno == EINTR) {
+      std::this_thread::sleep_for(std::chrono::microseconds{1});
+      continue;
+    }
+    break;
+  }
+  return res;
+}
+
+inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
+  return handle_EINTR([&]() {
+    return recv(sock,
+#ifdef _WIN32
+                static_cast<char *>(ptr), static_cast<int>(size),
+#else
+                ptr, size,
+#endif
+                flags);
+  });
+}
+
+inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size,
+                           int flags) {
+  return handle_EINTR([&]() {
+    return send(sock,
+#ifdef _WIN32
+                static_cast<const char *>(ptr), static_cast<int>(size),
+#else
+                ptr, size,
+#endif
+                flags);
+  });
+}
+
+inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
+#ifdef CPPHTTPLIB_USE_POLL
+  struct pollfd pfd_read;
+  pfd_read.fd = sock;
+  pfd_read.events = POLLIN;
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
+#else
+#ifndef _WIN32
+  if (sock >= FD_SETSIZE) { return -1; }
+#endif
+
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(sock, &fds);
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  return handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), &fds, nullptr, nullptr, &tv);
+  });
+#endif
+}
+
+inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
+#ifdef CPPHTTPLIB_USE_POLL
+  struct pollfd pfd_read;
+  pfd_read.fd = sock;
+  pfd_read.events = POLLOUT;
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
+#else
+#ifndef _WIN32
+  if (sock >= FD_SETSIZE) { return -1; }
+#endif
+
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(sock, &fds);
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  return handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), nullptr, &fds, nullptr, &tv);
+  });
+#endif
+}
+
+inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
+                                        time_t usec) {
+#ifdef CPPHTTPLIB_USE_POLL
+  struct pollfd pfd_read;
+  pfd_read.fd = sock;
+  pfd_read.events = POLLIN | POLLOUT;
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
+
+  if (poll_res == 0) { return Error::ConnectionTimeout; }
+
+  if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
+    auto error = 0;
+    socklen_t len = sizeof(error);
+    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
+                          reinterpret_cast<char *>(&error), &len);
+    auto successful = res >= 0 && !error;
+    return successful ? Error::Success : Error::Connection;
+  }
+
+  return Error::Connection;
+#else
+#ifndef _WIN32
+  if (sock >= FD_SETSIZE) { return Error::Connection; }
+#endif
+
+  fd_set fdsr;
+  FD_ZERO(&fdsr);
+  FD_SET(sock, &fdsr);
+
+  auto fdsw = fdsr;
+  auto fdse = fdsr;
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  auto ret = handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), &fdsr, &fdsw, &fdse, &tv);
+  });
+
+  if (ret == 0) { return Error::ConnectionTimeout; }
+
+  if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
+    auto error = 0;
+    socklen_t len = sizeof(error);
+    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
+                          reinterpret_cast<char *>(&error), &len);
+    auto successful = res >= 0 && !error;
+    return successful ? Error::Success : Error::Connection;
+  }
+  return Error::Connection;
+#endif
+}
+
+inline bool is_socket_alive(socket_t sock) {
+  const auto val = detail::select_read(sock, 0, 0);
+  if (val == 0) {
+    return true;
+  } else if (val < 0 && errno == EBADF) {
+    return false;
+  }
+  char buf[1];
+  return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0;
+}
+
+class SocketStream final : public Stream {
+public:
+  SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+               time_t write_timeout_sec, time_t write_timeout_usec);
+  ~SocketStream() override;
+
+  bool is_readable() const override;
+  bool is_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+
+private:
+  socket_t sock_;
+  time_t read_timeout_sec_;
+  time_t read_timeout_usec_;
+  time_t write_timeout_sec_;
+  time_t write_timeout_usec_;
+
+  std::vector<char> read_buff_;
+  size_t read_buff_off_ = 0;
+  size_t read_buff_content_size_ = 0;
+
+  static const size_t read_buff_size_ = 1024l * 4;
+};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+class SSLSocketStream final : public Stream {
+public:
+  SSLSocketStream(socket_t sock, SSL *ssl, time_t read_timeout_sec,
+                  time_t read_timeout_usec, time_t write_timeout_sec,
+                  time_t write_timeout_usec);
+  ~SSLSocketStream() override;
+
+  bool is_readable() const override;
+  bool is_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+
+private:
+  socket_t sock_;
+  SSL *ssl_;
+  time_t read_timeout_sec_;
+  time_t read_timeout_usec_;
+  time_t write_timeout_sec_;
+  time_t write_timeout_usec_;
+};
+#endif
+
+template <typename T>
+inline bool
+process_server_socket_core(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                           size_t keep_alive_max_count,
+                           time_t keep_alive_timeout_sec, T callback) {
+  assert(keep_alive_max_count > 0);
+  auto ret = false;
+  auto count = keep_alive_max_count;
+  while (svr_sock != INVALID_SOCKET && count > 0 &&
+         select_read(sock, keep_alive_timeout_sec, 0) > 0) {
+    auto close_connection = count == 1;
+    auto connection_closed = false;
+    ret = callback(close_connection, connection_closed);
+    if (!ret || connection_closed) { break; }
+    count--;
+  }
+  return ret;
+}
+
+template <typename T>
+inline bool
+process_server_socket(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                      size_t keep_alive_max_count,
+                      time_t keep_alive_timeout_sec, time_t read_timeout_sec,
+                      time_t read_timeout_usec, time_t write_timeout_sec,
+                      time_t write_timeout_usec, T callback) {
+  return process_server_socket_core(
+      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
+      [&](bool close_connection, bool &connection_closed) {
+        SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
+                          write_timeout_sec, write_timeout_usec);
+        return callback(strm, close_connection, connection_closed);
+      });
+}
+
+inline bool process_client_socket(socket_t sock, time_t read_timeout_sec,
+                                  time_t read_timeout_usec,
+                                  time_t write_timeout_sec,
+                                  time_t write_timeout_usec,
+                                  std::function<bool(Stream &)> callback) {
+  SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
+                    write_timeout_sec, write_timeout_usec);
+  return callback(strm);
+}
+
+inline int shutdown_socket(socket_t sock) {
+#ifdef _WIN32
+  return shutdown(sock, SD_BOTH);
+#else
+  return shutdown(sock, SHUT_RDWR);
+#endif
+}
+
+inline std::string escape_abstract_namespace_unix_domain(const std::string &s) {
+  if (s.size() > 1 && s[0] == '\0') {
+    auto ret = s;
+    ret[0] = '@';
+    return ret;
+  }
+  return s;
+}
+
+inline std::string
+unescape_abstract_namespace_unix_domain(const std::string &s) {
+  if (s.size() > 1 && s[0] == '@') {
+    auto ret = s;
+    ret[0] = '\0';
+    return ret;
+  }
+  return s;
+}
+
+template <typename BindOrConnect>
+socket_t create_socket(const std::string &host, const std::string &ip, int port,
+                       int address_family, int socket_flags, bool tcp_nodelay,
+                       bool ipv6_v6only, SocketOptions socket_options,
+                       BindOrConnect bind_or_connect) {
+  // Get address info
+  const char *node = nullptr;
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = IPPROTO_IP;
+
+  if (!ip.empty()) {
+    node = ip.c_str();
+    // Ask getaddrinfo to convert IP in c-string to address
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_flags = AI_NUMERICHOST;
+  } else {
+    if (!host.empty()) { node = host.c_str(); }
+    hints.ai_family = address_family;
+    hints.ai_flags = socket_flags;
+  }
+
+#ifndef _WIN32
+  if (hints.ai_family == AF_UNIX) {
+    const auto addrlen = host.length();
+    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
+
+#ifdef SOCK_CLOEXEC
+    auto sock = socket(hints.ai_family, hints.ai_socktype | SOCK_CLOEXEC,
+                       hints.ai_protocol);
+#else
+    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
+#endif
+
+    if (sock != INVALID_SOCKET) {
+      sockaddr_un addr{};
+      addr.sun_family = AF_UNIX;
+
+      auto unescaped_host = unescape_abstract_namespace_unix_domain(host);
+      std::copy(unescaped_host.begin(), unescaped_host.end(), addr.sun_path);
+
+      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
+      hints.ai_addrlen = static_cast<socklen_t>(
+          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
+
+#ifndef SOCK_CLOEXEC
+      fcntl(sock, F_SETFD, FD_CLOEXEC);
+#endif
+
+      if (socket_options) { socket_options(sock); }
+
+      bool dummy;
+      if (!bind_or_connect(sock, hints, dummy)) {
+        close_socket(sock);
+        sock = INVALID_SOCKET;
+      }
+    }
+    return sock;
+  }
+#endif
+
+  auto service = std::to_string(port);
+
+  if (getaddrinfo(node, service.c_str(), &hints, &result)) {
+#if defined __linux__ && !defined __ANDROID__
+    res_init();
+#endif
+    return INVALID_SOCKET;
+  }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    // Create a socket
+#ifdef _WIN32
+    auto sock =
+        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
+                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
+    /**
+     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
+     * and above the socket creation fails on older Windows Systems.
+     *
+     * Let's try to create a socket the old way in this case.
+     *
+     * Reference:
+     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
+     *
+     * WSA_FLAG_NO_HANDLE_INHERIT:
+     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
+     * SP1, and later
+     *
+     */
+    if (sock == INVALID_SOCKET) {
+      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    }
+#else
+
+#ifdef SOCK_CLOEXEC
+    auto sock =
+        socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
+#else
+    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+#endif
+
+#endif
+    if (sock == INVALID_SOCKET) { continue; }
+
+#if !defined _WIN32 && !defined SOCK_CLOEXEC
+    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
+      close_socket(sock);
+      continue;
+    }
+#endif
+
+    if (tcp_nodelay) {
+      auto opt = 1;
+#ifdef _WIN32
+      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+                 reinterpret_cast<const char *>(&opt), sizeof(opt));
+#else
+      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+                 reinterpret_cast<const void *>(&opt), sizeof(opt));
+#endif
+    }
+
+    if (rp->ai_family == AF_INET6) {
+      auto opt = ipv6_v6only ? 1 : 0;
+#ifdef _WIN32
+      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                 reinterpret_cast<const char *>(&opt), sizeof(opt));
+#else
+      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                 reinterpret_cast<const void *>(&opt), sizeof(opt));
+#endif
+    }
+
+    if (socket_options) { socket_options(sock); }
+
+    // bind or connect
+    auto quit = false;
+    if (bind_or_connect(sock, *rp, quit)) { return sock; }
+
+    close_socket(sock);
+
+    if (quit) { break; }
+  }
+
+  return INVALID_SOCKET;
+}
+
+inline void set_nonblocking(socket_t sock, bool nonblocking) {
+#ifdef _WIN32
+  auto flags = nonblocking ? 1UL : 0UL;
+  ioctlsocket(sock, FIONBIO, &flags);
+#else
+  auto flags = fcntl(sock, F_GETFL, 0);
+  fcntl(sock, F_SETFL,
+        nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
+#endif
+}
+
+inline bool is_connection_error() {
+#ifdef _WIN32
+  return WSAGetLastError() != WSAEWOULDBLOCK;
+#else
+  return errno != EINPROGRESS;
+#endif
+}
+
+inline bool bind_ip_address(socket_t sock, const std::string &host) {
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+
+  if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  auto ret = false;
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    const auto &ai = *rp;
+    if (!::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
+      ret = true;
+      break;
+    }
+  }
+
+  return ret;
+}
+
+#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
+#define USE_IF2IP
+#endif
+
+#ifdef USE_IF2IP
+inline std::string if2ip(int address_family, const std::string &ifn) {
+  struct ifaddrs *ifap;
+  getifaddrs(&ifap);
+  auto se = detail::scope_exit([&] { freeifaddrs(ifap); });
+
+  std::string addr_candidate;
+  for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
+    if (ifa->ifa_addr && ifn == ifa->ifa_name &&
+        (AF_UNSPEC == address_family ||
+         ifa->ifa_addr->sa_family == address_family)) {
+      if (ifa->ifa_addr->sa_family == AF_INET) {
+        auto sa = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr);
+        char buf[INET_ADDRSTRLEN];
+        if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) {
+          return std::string(buf, INET_ADDRSTRLEN);
+        }
+      } else if (ifa->ifa_addr->sa_family == AF_INET6) {
+        auto sa = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr);
+        if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) {
+          char buf[INET6_ADDRSTRLEN] = {};
+          if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) {
+            // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL
+            auto s6_addr_head = sa->sin6_addr.s6_addr[0];
+            if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) {
+              addr_candidate = std::string(buf, INET6_ADDRSTRLEN);
+            } else {
+              return std::string(buf, INET6_ADDRSTRLEN);
+            }
+          }
+        }
+      }
+    }
+  }
+  return addr_candidate;
+}
+#endif
+
+inline socket_t create_client_socket(
+    const std::string &host, const std::string &ip, int port,
+    int address_family, bool tcp_nodelay, bool ipv6_v6only,
+    SocketOptions socket_options, time_t connection_timeout_sec,
+    time_t connection_timeout_usec, time_t read_timeout_sec,
+    time_t read_timeout_usec, time_t write_timeout_sec,
+    time_t write_timeout_usec, const std::string &intf, Error &error) {
+  auto sock = create_socket(
+      host, ip, port, address_family, 0, tcp_nodelay, ipv6_v6only,
+      std::move(socket_options),
+      [&](socket_t sock2, struct addrinfo &ai, bool &quit) -> bool {
+        if (!intf.empty()) {
+#ifdef USE_IF2IP
+          auto ip_from_if = if2ip(address_family, intf);
+          if (ip_from_if.empty()) { ip_from_if = intf; }
+          if (!bind_ip_address(sock2, ip_from_if)) {
+            error = Error::BindIPAddress;
+            return false;
+          }
+#endif
+        }
+
+        set_nonblocking(sock2, true);
+
+        auto ret =
+            ::connect(sock2, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen));
+
+        if (ret < 0) {
+          if (is_connection_error()) {
+            error = Error::Connection;
+            return false;
+          }
+          error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
+                                             connection_timeout_usec);
+          if (error != Error::Success) {
+            if (error == Error::ConnectionTimeout) { quit = true; }
+            return false;
+          }
+        }
+
+        set_nonblocking(sock2, false);
+
+        {
+#ifdef _WIN32
+          auto timeout = static_cast<uint32_t>(read_timeout_sec * 1000 +
+                                               read_timeout_usec / 1000);
+          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
+                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+          timeval tv;
+          tv.tv_sec = static_cast<long>(read_timeout_sec);
+          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
+          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
+                     reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+        }
+        {
+
+#ifdef _WIN32
+          auto timeout = static_cast<uint32_t>(write_timeout_sec * 1000 +
+                                               write_timeout_usec / 1000);
+          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
+                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+          timeval tv;
+          tv.tv_sec = static_cast<long>(write_timeout_sec);
+          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
+          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
+                     reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+        }
+
+        error = Error::Success;
+        return true;
+      });
+
+  if (sock != INVALID_SOCKET) {
+    error = Error::Success;
+  } else {
+    if (error == Error::Success) { error = Error::Connection; }
+  }
+
+  return sock;
+}
+
+inline bool get_ip_and_port(const struct sockaddr_storage &addr,
+                            socklen_t addr_len, std::string &ip, int &port) {
+  if (addr.ss_family == AF_INET) {
+    port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
+  } else if (addr.ss_family == AF_INET6) {
+    port =
+        ntohs(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_port);
+  } else {
+    return false;
+  }
+
+  std::array<char, NI_MAXHOST> ipstr{};
+  if (getnameinfo(reinterpret_cast<const struct sockaddr *>(&addr), addr_len,
+                  ipstr.data(), static_cast<socklen_t>(ipstr.size()), nullptr,
+                  0, NI_NUMERICHOST)) {
+    return false;
+  }
+
+  ip = ipstr.data();
+  return true;
+}
+
+inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
+inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+
+  if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+#ifndef _WIN32
+    if (addr.ss_family == AF_UNIX) {
+#if defined(__linux__)
+      struct ucred ucred;
+      socklen_t len = sizeof(ucred);
+      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
+        port = ucred.pid;
+      }
+#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__
+      pid_t pid;
+      socklen_t len = sizeof(pid);
+      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
+        port = pid;
+      }
+#endif
+      return;
+    }
+#endif
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
+inline constexpr unsigned int str2tag_core(const char *s, size_t l,
+                                           unsigned int h) {
+  return (l == 0)
+             ? h
+             : str2tag_core(
+                   s + 1, l - 1,
+                   // Unsets the 6 high bits of h, therefore no overflow happens
+                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
+                    h * 33) ^
+                       static_cast<unsigned char>(*s));
+}
+
+inline unsigned int str2tag(const std::string &s) {
+  return str2tag_core(s.data(), s.size(), 0);
+}
+
+namespace udl {
+
+inline constexpr unsigned int operator"" _t(const char *s, size_t l) {
+  return str2tag_core(s, l, 0);
+}
+
+} // namespace udl
+
+inline std::string
+find_content_type(const std::string &path,
+                  const std::map<std::string, std::string> &user_data,
+                  const std::string &default_content_type) {
+  auto ext = file_extension(path);
+
+  auto it = user_data.find(ext);
+  if (it != user_data.end()) { return it->second; }
+
+  using udl::operator""_t;
+
+  switch (str2tag(ext)) {
+  default: return default_content_type;
+
+  case "css"_t: return "text/css";
+  case "csv"_t: return "text/csv";
+  case "htm"_t:
+  case "html"_t: return "text/html";
+  case "js"_t:
+  case "mjs"_t: return "text/javascript";
+  case "txt"_t: return "text/plain";
+  case "vtt"_t: return "text/vtt";
+
+  case "apng"_t: return "image/apng";
+  case "avif"_t: return "image/avif";
+  case "bmp"_t: return "image/bmp";
+  case "gif"_t: return "image/gif";
+  case "png"_t: return "image/png";
+  case "svg"_t: return "image/svg+xml";
+  case "webp"_t: return "image/webp";
+  case "ico"_t: return "image/x-icon";
+  case "tif"_t: return "image/tiff";
+  case "tiff"_t: return "image/tiff";
+  case "jpg"_t:
+  case "jpeg"_t: return "image/jpeg";
+
+  case "mp4"_t: return "video/mp4";
+  case "mpeg"_t: return "video/mpeg";
+  case "webm"_t: return "video/webm";
+
+  case "mp3"_t: return "audio/mp3";
+  case "mpga"_t: return "audio/mpeg";
+  case "weba"_t: return "audio/webm";
+  case "wav"_t: return "audio/wave";
+
+  case "otf"_t: return "font/otf";
+  case "ttf"_t: return "font/ttf";
+  case "woff"_t: return "font/woff";
+  case "woff2"_t: return "font/woff2";
+
+  case "7z"_t: return "application/x-7z-compressed";
+  case "atom"_t: return "application/atom+xml";
+  case "pdf"_t: return "application/pdf";
+  case "json"_t: return "application/json";
+  case "rss"_t: return "application/rss+xml";
+  case "tar"_t: return "application/x-tar";
+  case "xht"_t:
+  case "xhtml"_t: return "application/xhtml+xml";
+  case "xslt"_t: return "application/xslt+xml";
+  case "xml"_t: return "application/xml";
+  case "gz"_t: return "application/gzip";
+  case "zip"_t: return "application/zip";
+  case "wasm"_t: return "application/wasm";
+  }
+}
+
+inline bool can_compress_content_type(const std::string &content_type) {
+  using udl::operator""_t;
+
+  auto tag = str2tag(content_type);
+
+  switch (tag) {
+  case "image/svg+xml"_t:
+  case "application/javascript"_t:
+  case "application/json"_t:
+  case "application/xml"_t:
+  case "application/protobuf"_t:
+  case "application/xhtml+xml"_t: return true;
+
+  case "text/event-stream"_t: return false;
+
+  default: return !content_type.rfind("text/", 0);
+  }
+}
+
+inline EncodingType encoding_type(const Request &req, const Response &res) {
+  auto ret =
+      detail::can_compress_content_type(res.get_header_value("Content-Type"));
+  if (!ret) { return EncodingType::None; }
+
+  const auto &s = req.get_header_value("Accept-Encoding");
+  (void)(s);
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+  // TODO: 'Accept-Encoding' has br, not br;q=0
+  ret = s.find("br") != std::string::npos;
+  if (ret) { return EncodingType::Brotli; }
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  // TODO: 'Accept-Encoding' has gzip, not gzip;q=0
+  ret = s.find("gzip") != std::string::npos;
+  if (ret) { return EncodingType::Gzip; }
+#endif
+
+  return EncodingType::None;
+}
+
+inline bool nocompressor::compress(const char *data, size_t data_length,
+                                   bool /*last*/, Callback callback) {
+  if (!data_length) { return true; }
+  return callback(data, data_length);
+}
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+inline gzip_compressor::gzip_compressor() {
+  std::memset(&strm_, 0, sizeof(strm_));
+  strm_.zalloc = Z_NULL;
+  strm_.zfree = Z_NULL;
+  strm_.opaque = Z_NULL;
+
+  is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
+                           Z_DEFAULT_STRATEGY) == Z_OK;
+}
+
+inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); }
+
+inline bool gzip_compressor::compress(const char *data, size_t data_length,
+                                      bool last, Callback callback) {
+  assert(is_valid_);
+
+  do {
+    constexpr size_t max_avail_in =
+        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
+
+    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
+        (std::min)(data_length, max_avail_in));
+    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
+
+    data_length -= strm_.avail_in;
+    data += strm_.avail_in;
+
+    auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
+    auto ret = Z_OK;
+
+    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+    do {
+      strm_.avail_out = static_cast<uInt>(buff.size());
+      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
+
+      ret = deflate(&strm_, flush);
+      if (ret == Z_STREAM_ERROR) { return false; }
+
+      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
+        return false;
+      }
+    } while (strm_.avail_out == 0);
+
+    assert((flush == Z_FINISH && ret == Z_STREAM_END) ||
+           (flush == Z_NO_FLUSH && ret == Z_OK));
+    assert(strm_.avail_in == 0);
+  } while (data_length > 0);
+
+  return true;
+}
+
+inline gzip_decompressor::gzip_decompressor() {
+  std::memset(&strm_, 0, sizeof(strm_));
+  strm_.zalloc = Z_NULL;
+  strm_.zfree = Z_NULL;
+  strm_.opaque = Z_NULL;
+
+  // 15 is the value of wbits, which should be at the maximum possible value
+  // to ensure that any gzip stream can be decoded. The offset of 32 specifies
+  // that the stream type should be automatically detected either gzip or
+  // deflate.
+  is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK;
+}
+
+inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); }
+
+inline bool gzip_decompressor::is_valid() const { return is_valid_; }
+
+inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
+                                          Callback callback) {
+  assert(is_valid_);
+
+  auto ret = Z_OK;
+
+  do {
+    constexpr size_t max_avail_in =
+        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
+
+    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
+        (std::min)(data_length, max_avail_in));
+    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
+
+    data_length -= strm_.avail_in;
+    data += strm_.avail_in;
+
+    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+    while (strm_.avail_in > 0 && ret == Z_OK) {
+      strm_.avail_out = static_cast<uInt>(buff.size());
+      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
+
+      ret = inflate(&strm_, Z_NO_FLUSH);
+
+      assert(ret != Z_STREAM_ERROR);
+      switch (ret) {
+      case Z_NEED_DICT:
+      case Z_DATA_ERROR:
+      case Z_MEM_ERROR: inflateEnd(&strm_); return false;
+      }
+
+      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
+        return false;
+      }
+    }
+
+    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
+
+  } while (data_length > 0);
+
+  return true;
+}
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+inline brotli_compressor::brotli_compressor() {
+  state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
+}
+
+inline brotli_compressor::~brotli_compressor() {
+  BrotliEncoderDestroyInstance(state_);
+}
+
+inline bool brotli_compressor::compress(const char *data, size_t data_length,
+                                        bool last, Callback callback) {
+  std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+
+  auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
+  auto available_in = data_length;
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
+
+  for (;;) {
+    if (last) {
+      if (BrotliEncoderIsFinished(state_)) { break; }
+    } else {
+      if (!available_in) { break; }
+    }
+
+    auto available_out = buff.size();
+    auto next_out = buff.data();
+
+    if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in,
+                                     &available_out, &next_out, nullptr)) {
+      return false;
+    }
+
+    auto output_bytes = buff.size() - available_out;
+    if (output_bytes) {
+      callback(reinterpret_cast<const char *>(buff.data()), output_bytes);
+    }
+  }
+
+  return true;
+}
+
+inline brotli_decompressor::brotli_decompressor() {
+  decoder_s = BrotliDecoderCreateInstance(0, 0, 0);
+  decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT
+                        : BROTLI_DECODER_RESULT_ERROR;
+}
+
+inline brotli_decompressor::~brotli_decompressor() {
+  if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); }
+}
+
+inline bool brotli_decompressor::is_valid() const { return decoder_s; }
+
+inline bool brotli_decompressor::decompress(const char *data,
+                                            size_t data_length,
+                                            Callback callback) {
+  if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
+      decoder_r == BROTLI_DECODER_RESULT_ERROR) {
+    return 0;
+  }
+
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
+  size_t avail_in = data_length;
+  size_t total_out;
+
+  decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
+
+  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+  while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
+    char *next_out = buff.data();
+    size_t avail_out = buff.size();
+
+    decoder_r = BrotliDecoderDecompressStream(
+        decoder_s, &avail_in, &next_in, &avail_out,
+        reinterpret_cast<uint8_t **>(&next_out), &total_out);
+
+    if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
+
+    if (!callback(buff.data(), buff.size() - avail_out)) { return false; }
+  }
+
+  return decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
+         decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
+}
+#endif
+
+inline bool has_header(const Headers &headers, const std::string &key) {
+  return headers.find(key) != headers.end();
+}
+
+inline const char *get_header_value(const Headers &headers,
+                                    const std::string &key, const char *def,
+                                    size_t id) {
+  auto rng = headers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second.c_str(); }
+  return def;
+}
+
+template <typename T>
+inline bool parse_header(const char *beg, const char *end, T fn) {
+  // Skip trailing spaces and tabs.
+  while (beg < end && is_space_or_tab(end[-1])) {
+    end--;
+  }
+
+  auto p = beg;
+  while (p < end && *p != ':') {
+    p++;
+  }
+
+  if (p == end) { return false; }
+
+  auto key_end = p;
+
+  if (*p++ != ':') { return false; }
+
+  while (p < end && is_space_or_tab(*p)) {
+    p++;
+  }
+
+  if (p < end) {
+    auto key_len = key_end - beg;
+    if (!key_len) { return false; }
+
+    auto key = std::string(beg, key_end);
+    auto val = case_ignore::equal(key, "Location")
+                   ? std::string(p, end)
+                   : decode_url(std::string(p, end), false);
+
+    // NOTE: From RFC 9110:
+    // Field values containing CR, LF, or NUL characters are
+    // invalid and dangerous, due to the varying ways that
+    // implementations might parse and interpret those
+    // characters; a recipient of CR, LF, or NUL within a field
+    // value MUST either reject the message or replace each of
+    // those characters with SP before further processing or
+    // forwarding of that message.
+    static const std::string CR_LF_NUL("\r\n\0", 3);
+    if (val.find_first_of(CR_LF_NUL) != std::string::npos) { return false; }
+
+    fn(key, val);
+    return true;
+  }
+
+  return false;
+}
+
+inline bool read_headers(Stream &strm, Headers &headers) {
+  const auto bufsiz = 2048;
+  char buf[bufsiz];
+  stream_line_reader line_reader(strm, buf, bufsiz);
+
+  for (;;) {
+    if (!line_reader.getline()) { return false; }
+
+    // Check if the line ends with CRLF.
+    auto line_terminator_len = 2;
+    if (line_reader.end_with_crlf()) {
+      // Blank line indicates end of headers.
+      if (line_reader.size() == 2) { break; }
+    } else {
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+      // Blank line indicates end of headers.
+      if (line_reader.size() == 1) { break; }
+      line_terminator_len = 1;
+#else
+      continue; // Skip invalid line.
+#endif
+    }
+
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+
+    // Exclude line terminator
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    if (!parse_header(line_reader.ptr(), end,
+                      [&](const std::string &key, std::string &val) {
+                        headers.emplace(key, val);
+                      })) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+inline bool read_content_with_length(Stream &strm, uint64_t len,
+                                     Progress progress,
+                                     ContentReceiverWithProgress out) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+
+  uint64_t r = 0;
+  while (r < len) {
+    auto read_len = static_cast<size_t>(len - r);
+    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
+    if (n <= 0) { return false; }
+
+    if (!out(buf, static_cast<size_t>(n), r, len)) { return false; }
+    r += static_cast<uint64_t>(n);
+
+    if (progress) {
+      if (!progress(r, len)) { return false; }
+    }
+  }
+
+  return true;
+}
+
+inline void skip_content_with_length(Stream &strm, uint64_t len) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+  uint64_t r = 0;
+  while (r < len) {
+    auto read_len = static_cast<size_t>(len - r);
+    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
+    if (n <= 0) { return; }
+    r += static_cast<uint64_t>(n);
+  }
+}
+
+inline bool read_content_without_length(Stream &strm,
+                                        ContentReceiverWithProgress out) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+  uint64_t r = 0;
+  for (;;) {
+    auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
+    if (n <= 0) { return true; }
+
+    if (!out(buf, static_cast<size_t>(n), r, 0)) { return false; }
+    r += static_cast<uint64_t>(n);
+  }
+
+  return true;
+}
+
+template <typename T>
+inline bool read_content_chunked(Stream &strm, T &x,
+                                 ContentReceiverWithProgress out) {
+  const auto bufsiz = 16;
+  char buf[bufsiz];
+
+  stream_line_reader line_reader(strm, buf, bufsiz);
+
+  if (!line_reader.getline()) { return false; }
+
+  unsigned long chunk_len;
+  while (true) {
+    char *end_ptr;
+
+    chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16);
+
+    if (end_ptr == line_reader.ptr()) { return false; }
+    if (chunk_len == ULONG_MAX) { return false; }
+
+    if (chunk_len == 0) { break; }
+
+    if (!read_content_with_length(strm, chunk_len, nullptr, out)) {
+      return false;
+    }
+
+    if (!line_reader.getline()) { return false; }
+
+    if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; }
+
+    if (!line_reader.getline()) { return false; }
+  }
+
+  assert(chunk_len == 0);
+
+  // NOTE: In RFC 9112, '7.1 Chunked Transfer Coding' mentiones "The chunked
+  // transfer coding is complete when a chunk with a chunk-size of zero is
+  // received, possibly followed by a trailer section, and finally terminated by
+  // an empty line". https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1
+  //
+  // In '7.1.3. Decoding Chunked', however, the pseudo-code in the section
+  // does't care for the existence of the final CRLF. In other words, it seems
+  // to be ok whether the final CRLF exists or not in the chunked data.
+  // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1.3
+  //
+  // According to the reference code in RFC 9112, cpp-htpplib now allows
+  // chuncked transfer coding data without the final CRLF.
+  if (!line_reader.getline()) { return true; }
+
+  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+
+    // Exclude line terminator
+    constexpr auto line_terminator_len = 2;
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    parse_header(line_reader.ptr(), end,
+                 [&](const std::string &key, const std::string &val) {
+                   x.headers.emplace(key, val);
+                 });
+
+    if (!line_reader.getline()) { return false; }
+  }
+
+  return true;
+}
+
+inline bool is_chunked_transfer_encoding(const Headers &headers) {
+  return case_ignore::equal(
+      get_header_value(headers, "Transfer-Encoding", "", 0), "chunked");
+}
+
+template <typename T, typename U>
+bool prepare_content_receiver(T &x, int &status,
+                              ContentReceiverWithProgress receiver,
+                              bool decompress, U callback) {
+  if (decompress) {
+    std::string encoding = x.get_header_value("Content-Encoding");
+    std::unique_ptr<decompressor> decompressor;
+
+    if (encoding == "gzip" || encoding == "deflate") {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+      decompressor = detail::make_unique<gzip_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    } else if (encoding.find("br") != std::string::npos) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+      decompressor = detail::make_unique<brotli_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    }
+
+    if (decompressor) {
+      if (decompressor->is_valid()) {
+        ContentReceiverWithProgress out = [&](const char *buf, size_t n,
+                                              uint64_t off, uint64_t len) {
+          return decompressor->decompress(buf, n,
+                                          [&](const char *buf2, size_t n2) {
+                                            return receiver(buf2, n2, off, len);
+                                          });
+        };
+        return callback(std::move(out));
+      } else {
+        status = StatusCode::InternalServerError_500;
+        return false;
+      }
+    }
+  }
+
+  ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off,
+                                        uint64_t len) {
+    return receiver(buf, n, off, len);
+  };
+  return callback(std::move(out));
+}
+
+template <typename T>
+bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
+                  Progress progress, ContentReceiverWithProgress receiver,
+                  bool decompress) {
+  return prepare_content_receiver(
+      x, status, std::move(receiver), decompress,
+      [&](const ContentReceiverWithProgress &out) {
+        auto ret = true;
+        auto exceed_payload_max_length = false;
+
+        if (is_chunked_transfer_encoding(x.headers)) {
+          ret = read_content_chunked(strm, x, out);
+        } else if (!has_header(x.headers, "Content-Length")) {
+          ret = read_content_without_length(strm, out);
+        } else {
+          auto len = get_header_value_u64(x.headers, "Content-Length", 0, 0);
+          if (len > payload_max_length) {
+            exceed_payload_max_length = true;
+            skip_content_with_length(strm, len);
+            ret = false;
+          } else if (len > 0) {
+            ret = read_content_with_length(strm, len, std::move(progress), out);
+          }
+        }
+
+        if (!ret) {
+          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
+                                             : StatusCode::BadRequest_400;
+        }
+        return ret;
+      });
+}
+
+inline ssize_t write_request_line(Stream &strm, const std::string &method,
+                                  const std::string &path) {
+  std::string s = method;
+  s += " ";
+  s += path;
+  s += " HTTP/1.1\r\n";
+  return strm.write(s.data(), s.size());
+}
+
+inline ssize_t write_response_line(Stream &strm, int status) {
+  std::string s = "HTTP/1.1 ";
+  s += std::to_string(status);
+  s += " ";
+  s += httplib::status_message(status);
+  s += "\r\n";
+  return strm.write(s.data(), s.size());
+}
+
+inline ssize_t write_headers(Stream &strm, const Headers &headers) {
+  ssize_t write_len = 0;
+  for (const auto &x : headers) {
+    std::string s;
+    s = x.first;
+    s += ": ";
+    s += x.second;
+    s += "\r\n";
+
+    auto len = strm.write(s.data(), s.size());
+    if (len < 0) { return len; }
+    write_len += len;
+  }
+  auto len = strm.write("\r\n");
+  if (len < 0) { return len; }
+  write_len += len;
+  return write_len;
+}
+
+inline bool write_data(Stream &strm, const char *d, size_t l) {
+  size_t offset = 0;
+  while (offset < l) {
+    auto length = strm.write(d + offset, l - offset);
+    if (length < 0) { return false; }
+    offset += static_cast<size_t>(length);
+  }
+  return true;
+}
+
+template <typename T>
+inline bool write_content(Stream &strm, const ContentProvider &content_provider,
+                          size_t offset, size_t length, T is_shutting_down,
+                          Error &error) {
+  size_t end_offset = offset + length;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      if (strm.is_writable() && write_data(strm, d, l)) {
+        offset += l;
+      } else {
+        ok = false;
+      }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  while (offset < end_offset && !is_shutting_down()) {
+    if (!strm.is_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
+      error = Error::Canceled;
+      return false;
+    } else if (!ok) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  error = Error::Success;
+  return true;
+}
+
+template <typename T>
+inline bool write_content(Stream &strm, const ContentProvider &content_provider,
+                          size_t offset, size_t length,
+                          const T &is_shutting_down) {
+  auto error = Error::Success;
+  return write_content(strm, content_provider, offset, length, is_shutting_down,
+                       error);
+}
+
+template <typename T>
+inline bool
+write_content_without_length(Stream &strm,
+                             const ContentProvider &content_provider,
+                             const T &is_shutting_down) {
+  size_t offset = 0;
+  auto data_available = true;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      offset += l;
+      if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  data_sink.done = [&](void) { data_available = false; };
+
+  while (data_available && !is_shutting_down()) {
+    if (!strm.is_writable()) {
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      return false;
+    } else if (!ok) {
+      return false;
+    }
+  }
+  return true;
+}
+
+template <typename T, typename U>
+inline bool
+write_content_chunked(Stream &strm, const ContentProvider &content_provider,
+                      const T &is_shutting_down, U &compressor, Error &error) {
+  size_t offset = 0;
+  auto data_available = true;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      data_available = l > 0;
+      offset += l;
+
+      std::string payload;
+      if (compressor.compress(d, l, false,
+                              [&](const char *data, size_t data_len) {
+                                payload.append(data, data_len);
+                                return true;
+                              })) {
+        if (!payload.empty()) {
+          // Emit chunked response header and footer for each chunk
+          auto chunk =
+              from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
+          if (!strm.is_writable() ||
+              !write_data(strm, chunk.data(), chunk.size())) {
+            ok = false;
+          }
+        }
+      } else {
+        ok = false;
+      }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  auto done_with_trailer = [&](const Headers *trailer) {
+    if (!ok) { return; }
+
+    data_available = false;
+
+    std::string payload;
+    if (!compressor.compress(nullptr, 0, true,
+                             [&](const char *data, size_t data_len) {
+                               payload.append(data, data_len);
+                               return true;
+                             })) {
+      ok = false;
+      return;
+    }
+
+    if (!payload.empty()) {
+      // Emit chunked response header and footer for each chunk
+      auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
+      if (!strm.is_writable() ||
+          !write_data(strm, chunk.data(), chunk.size())) {
+        ok = false;
+        return;
+      }
+    }
+
+    static const std::string done_marker("0\r\n");
+    if (!write_data(strm, done_marker.data(), done_marker.size())) {
+      ok = false;
+    }
+
+    // Trailer
+    if (trailer) {
+      for (const auto &kv : *trailer) {
+        std::string field_line = kv.first + ": " + kv.second + "\r\n";
+        if (!write_data(strm, field_line.data(), field_line.size())) {
+          ok = false;
+        }
+      }
+    }
+
+    static const std::string crlf("\r\n");
+    if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
+  };
+
+  data_sink.done = [&](void) { done_with_trailer(nullptr); };
+
+  data_sink.done_with_trailer = [&](const Headers &trailer) {
+    done_with_trailer(&trailer);
+  };
+
+  while (data_available && !is_shutting_down()) {
+    if (!strm.is_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      error = Error::Canceled;
+      return false;
+    } else if (!ok) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  error = Error::Success;
+  return true;
+}
+
+template <typename T, typename U>
+inline bool write_content_chunked(Stream &strm,
+                                  const ContentProvider &content_provider,
+                                  const T &is_shutting_down, U &compressor) {
+  auto error = Error::Success;
+  return write_content_chunked(strm, content_provider, is_shutting_down,
+                               compressor, error);
+}
+
+template <typename T>
+inline bool redirect(T &cli, Request &req, Response &res,
+                     const std::string &path, const std::string &location,
+                     Error &error) {
+  Request new_req = req;
+  new_req.path = path;
+  new_req.redirect_count_ -= 1;
+
+  if (res.status == StatusCode::SeeOther_303 &&
+      (req.method != "GET" && req.method != "HEAD")) {
+    new_req.method = "GET";
+    new_req.body.clear();
+    new_req.headers.clear();
+  }
+
+  Response new_res;
+
+  auto ret = cli.send(new_req, new_res, error);
+  if (ret) {
+    req = new_req;
+    res = new_res;
+
+    if (res.location.empty()) { res.location = location; }
+  }
+  return ret;
+}
+
+inline std::string params_to_query_str(const Params &params) {
+  std::string query;
+
+  for (auto it = params.begin(); it != params.end(); ++it) {
+    if (it != params.begin()) { query += "&"; }
+    query += it->first;
+    query += "=";
+    query += encode_query_param(it->second);
+  }
+  return query;
+}
+
+inline void parse_query_text(const char *data, std::size_t size,
+                             Params &params) {
+  std::set<std::string> cache;
+  split(data, data + size, '&', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(std::move(kv));
+
+    std::string key;
+    std::string val;
+    divide(b, static_cast<std::size_t>(e - b), '=',
+           [&](const char *lhs_data, std::size_t lhs_size, const char *rhs_data,
+               std::size_t rhs_size) {
+             key.assign(lhs_data, lhs_size);
+             val.assign(rhs_data, rhs_size);
+           });
+
+    if (!key.empty()) {
+      params.emplace(decode_url(key, true), decode_url(val, true));
+    }
+  });
+}
+
+inline void parse_query_text(const std::string &s, Params &params) {
+  parse_query_text(s.data(), s.size(), params);
+}
+
+inline bool parse_multipart_boundary(const std::string &content_type,
+                                     std::string &boundary) {
+  auto boundary_keyword = "boundary=";
+  auto pos = content_type.find(boundary_keyword);
+  if (pos == std::string::npos) { return false; }
+  auto end = content_type.find(';', pos);
+  auto beg = pos + strlen(boundary_keyword);
+  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
+  return !boundary.empty();
+}
+
+inline void parse_disposition_params(const std::string &s, Params &params) {
+  std::set<std::string> cache;
+  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(kv);
+
+    std::string key;
+    std::string val;
+    split(b, e, '=', [&](const char *b2, const char *e2) {
+      if (key.empty()) {
+        key.assign(b2, e2);
+      } else {
+        val.assign(b2, e2);
+      }
+    });
+
+    if (!key.empty()) {
+      params.emplace(trim_double_quotes_copy((key)),
+                     trim_double_quotes_copy((val)));
+    }
+  });
+}
+
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+inline bool parse_range_header(const std::string &s, Ranges &ranges) {
+#else
+inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
+#endif
+  auto is_valid = [](const std::string &str) {
+    return std::all_of(str.cbegin(), str.cend(),
+                       [](unsigned char c) { return std::isdigit(c); });
+  };
+
+  if (s.size() > 7 && s.compare(0, 6, "bytes=") == 0) {
+    const auto pos = static_cast<size_t>(6);
+    const auto len = static_cast<size_t>(s.size() - 6);
+    auto all_valid_ranges = true;
+    split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
+      if (!all_valid_ranges) { return; }
+
+      const auto it = std::find(b, e, '-');
+      if (it == e) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      const auto lhs = std::string(b, it);
+      const auto rhs = std::string(it + 1, e);
+      if (!is_valid(lhs) || !is_valid(rhs)) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      const auto first =
+          static_cast<ssize_t>(lhs.empty() ? -1 : std::stoll(lhs));
+      const auto last =
+          static_cast<ssize_t>(rhs.empty() ? -1 : std::stoll(rhs));
+      if ((first == -1 && last == -1) ||
+          (first != -1 && last != -1 && first > last)) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      ranges.emplace_back(first, last);
+    });
+    return all_valid_ranges && !ranges.empty();
+  }
+  return false;
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+}
+#else
+} catch (...) { return false; }
+#endif
+
+class MultipartFormDataParser {
+public:
+  MultipartFormDataParser() = default;
+
+  void set_boundary(std::string &&boundary) {
+    boundary_ = boundary;
+    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
+    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
+  }
+
+  bool is_valid() const { return is_valid_; }
+
+  bool parse(const char *buf, size_t n, const ContentReceiver &content_callback,
+             const MultipartContentHeader &header_callback) {
+
+    buf_append(buf, n);
+
+    while (buf_size() > 0) {
+      switch (state_) {
+      case 0: { // Initial boundary
+        buf_erase(buf_find(dash_boundary_crlf_));
+        if (dash_boundary_crlf_.size() > buf_size()) { return true; }
+        if (!buf_start_with(dash_boundary_crlf_)) { return false; }
+        buf_erase(dash_boundary_crlf_.size());
+        state_ = 1;
+        break;
+      }
+      case 1: { // New entry
+        clear_file_info();
+        state_ = 2;
+        break;
+      }
+      case 2: { // Headers
+        auto pos = buf_find(crlf_);
+        if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+        while (pos < buf_size()) {
+          // Empty line
+          if (pos == 0) {
+            if (!header_callback(file_)) {
+              is_valid_ = false;
+              return false;
+            }
+            buf_erase(crlf_.size());
+            state_ = 3;
+            break;
+          }
+
+          const auto header = buf_head(pos);
+
+          if (!parse_header(header.data(), header.data() + header.size(),
+                            [&](const std::string &, const std::string &) {})) {
+            is_valid_ = false;
+            return false;
+          }
+
+          static const std::string header_content_type = "Content-Type:";
+
+          if (start_with_case_ignore(header, header_content_type)) {
+            file_.content_type =
+                trim_copy(header.substr(header_content_type.size()));
+          } else {
+            static const std::regex re_content_disposition(
+                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
+                std::regex_constants::icase);
+
+            std::smatch m;
+            if (std::regex_match(header, m, re_content_disposition)) {
+              Params params;
+              parse_disposition_params(m[1], params);
+
+              auto it = params.find("name");
+              if (it != params.end()) {
+                file_.name = it->second;
+              } else {
+                is_valid_ = false;
+                return false;
+              }
+
+              it = params.find("filename");
+              if (it != params.end()) { file_.filename = it->second; }
+
+              it = params.find("filename*");
+              if (it != params.end()) {
+                // Only allow UTF-8 enconnding...
+                static const std::regex re_rfc5987_encoding(
+                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
+
+                std::smatch m2;
+                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
+                  file_.filename = decode_url(m2[1], false); // override...
+                } else {
+                  is_valid_ = false;
+                  return false;
+                }
+              }
+            }
+          }
+          buf_erase(pos + crlf_.size());
+          pos = buf_find(crlf_);
+        }
+        if (state_ != 3) { return true; }
+        break;
+      }
+      case 3: { // Body
+        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
+        auto pos = buf_find(crlf_dash_boundary_);
+        if (pos < buf_size()) {
+          if (!content_callback(buf_data(), pos)) {
+            is_valid_ = false;
+            return false;
+          }
+          buf_erase(pos + crlf_dash_boundary_.size());
+          state_ = 4;
+        } else {
+          auto len = buf_size() - crlf_dash_boundary_.size();
+          if (len > 0) {
+            if (!content_callback(buf_data(), len)) {
+              is_valid_ = false;
+              return false;
+            }
+            buf_erase(len);
+          }
+          return true;
+        }
+        break;
+      }
+      case 4: { // Boundary
+        if (crlf_.size() > buf_size()) { return true; }
+        if (buf_start_with(crlf_)) {
+          buf_erase(crlf_.size());
+          state_ = 1;
+        } else {
+          if (dash_.size() > buf_size()) { return true; }
+          if (buf_start_with(dash_)) {
+            buf_erase(dash_.size());
+            is_valid_ = true;
+            buf_erase(buf_size()); // Remove epilogue
+          } else {
+            return true;
+          }
+        }
+        break;
+      }
+      }
+    }
+
+    return true;
+  }
+
+private:
+  void clear_file_info() {
+    file_.name.clear();
+    file_.filename.clear();
+    file_.content_type.clear();
+  }
+
+  bool start_with_case_ignore(const std::string &a,
+                              const std::string &b) const {
+    if (a.size() < b.size()) { return false; }
+    for (size_t i = 0; i < b.size(); i++) {
+      if (case_ignore::to_lower(a[i]) != case_ignore::to_lower(b[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  const std::string dash_ = "--";
+  const std::string crlf_ = "\r\n";
+  std::string boundary_;
+  std::string dash_boundary_crlf_;
+  std::string crlf_dash_boundary_;
+
+  size_t state_ = 0;
+  bool is_valid_ = false;
+  MultipartFormData file_;
+
+  // Buffer
+  bool start_with(const std::string &a, size_t spos, size_t epos,
+                  const std::string &b) const {
+    if (epos - spos < b.size()) { return false; }
+    for (size_t i = 0; i < b.size(); i++) {
+      if (a[i + spos] != b[i]) { return false; }
+    }
+    return true;
+  }
+
+  size_t buf_size() const { return buf_epos_ - buf_spos_; }
+
+  const char *buf_data() const { return &buf_[buf_spos_]; }
+
+  std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); }
+
+  bool buf_start_with(const std::string &s) const {
+    return start_with(buf_, buf_spos_, buf_epos_, s);
+  }
+
+  size_t buf_find(const std::string &s) const {
+    auto c = s.front();
+
+    size_t off = buf_spos_;
+    while (off < buf_epos_) {
+      auto pos = off;
+      while (true) {
+        if (pos == buf_epos_) { return buf_size(); }
+        if (buf_[pos] == c) { break; }
+        pos++;
+      }
+
+      auto remaining_size = buf_epos_ - pos;
+      if (s.size() > remaining_size) { return buf_size(); }
+
+      if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; }
+
+      off = pos + 1;
+    }
+
+    return buf_size();
+  }
+
+  void buf_append(const char *data, size_t n) {
+    auto remaining_size = buf_size();
+    if (remaining_size > 0 && buf_spos_ > 0) {
+      for (size_t i = 0; i < remaining_size; i++) {
+        buf_[i] = buf_[buf_spos_ + i];
+      }
+    }
+    buf_spos_ = 0;
+    buf_epos_ = remaining_size;
+
+    if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); }
+
+    for (size_t i = 0; i < n; i++) {
+      buf_[buf_epos_ + i] = data[i];
+    }
+    buf_epos_ += n;
+  }
+
+  void buf_erase(size_t size) { buf_spos_ += size; }
+
+  std::string buf_;
+  size_t buf_spos_ = 0;
+  size_t buf_epos_ = 0;
+};
+
+inline std::string random_string(size_t length) {
+  static const char data[] =
+      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+  // std::random_device might actually be deterministic on some
+  // platforms, but due to lack of support in the c++ standard library,
+  // doing better requires either some ugly hacks or breaking portability.
+  static std::random_device seed_gen;
+
+  // Request 128 bits of entropy for initialization
+  static std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(),
+                                     seed_gen()};
+
+  static std::mt19937 engine(seed_sequence);
+
+  std::string result;
+  for (size_t i = 0; i < length; i++) {
+    result += data[engine() % (sizeof(data) - 1)];
+  }
+  return result;
+}
+
+inline std::string make_multipart_data_boundary() {
+  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
+}
+
+inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
+  auto valid = true;
+  for (size_t i = 0; i < boundary.size(); i++) {
+    auto c = boundary[i];
+    if (!std::isalnum(c) && c != '-' && c != '_') {
+      valid = false;
+      break;
+    }
+  }
+  return valid;
+}
+
+template <typename T>
+inline std::string
+serialize_multipart_formdata_item_begin(const T &item,
+                                        const std::string &boundary) {
+  std::string body = "--" + boundary + "\r\n";
+  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
+  if (!item.filename.empty()) {
+    body += "; filename=\"" + item.filename + "\"";
+  }
+  body += "\r\n";
+  if (!item.content_type.empty()) {
+    body += "Content-Type: " + item.content_type + "\r\n";
+  }
+  body += "\r\n";
+
+  return body;
+}
+
+inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
+
+inline std::string
+serialize_multipart_formdata_finish(const std::string &boundary) {
+  return "--" + boundary + "--\r\n";
+}
+
+inline std::string
+serialize_multipart_formdata_get_content_type(const std::string &boundary) {
+  return "multipart/form-data; boundary=" + boundary;
+}
+
+inline std::string
+serialize_multipart_formdata(const MultipartFormDataItems &items,
+                             const std::string &boundary, bool finish = true) {
+  std::string body;
+
+  for (const auto &item : items) {
+    body += serialize_multipart_formdata_item_begin(item, boundary);
+    body += item.content + serialize_multipart_formdata_item_end();
+  }
+
+  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
+
+  return body;
+}
+
+inline bool range_error(Request &req, Response &res) {
+  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
+    ssize_t contant_len = static_cast<ssize_t>(
+        res.content_length_ ? res.content_length_ : res.body.size());
+
+    ssize_t prev_first_pos = -1;
+    ssize_t prev_last_pos = -1;
+    size_t overwrapping_count = 0;
+
+    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
+    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
+    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
+
+    // Too many ranges
+    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
+
+    for (auto &r : req.ranges) {
+      auto &first_pos = r.first;
+      auto &last_pos = r.second;
+
+      if (first_pos == -1 && last_pos == -1) {
+        first_pos = 0;
+        last_pos = contant_len;
+      }
+
+      if (first_pos == -1) {
+        first_pos = contant_len - last_pos;
+        last_pos = contant_len - 1;
+      }
+
+      if (last_pos == -1) { last_pos = contant_len - 1; }
+
+      // Range must be within content length
+      if (!(0 <= first_pos && first_pos <= last_pos &&
+            last_pos <= contant_len - 1)) {
+        return true;
+      }
+
+      // Ranges must be in ascending order
+      if (first_pos <= prev_first_pos) { return true; }
+
+      // Request must not have more than two overlapping ranges
+      if (first_pos <= prev_last_pos) {
+        overwrapping_count++;
+        if (overwrapping_count > 2) { return true; }
+      }
+
+      prev_first_pos = (std::max)(prev_first_pos, first_pos);
+      prev_last_pos = (std::max)(prev_last_pos, last_pos);
+    }
+  }
+
+  return false;
+}
+
+inline std::pair<size_t, size_t>
+get_range_offset_and_length(Range r, size_t content_length) {
+  assert(r.first != -1 && r.second != -1);
+  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
+  assert(r.first <= r.second &&
+         r.second < static_cast<ssize_t>(content_length));
+  (void)(content_length);
+  return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
+}
+
+inline std::string make_content_range_header_field(
+    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
+  auto st = offset_and_length.first;
+  auto ed = st + offset_and_length.second - 1;
+
+  std::string field = "bytes ";
+  field += std::to_string(st);
+  field += "-";
+  field += std::to_string(ed);
+  field += "/";
+  field += std::to_string(content_length);
+  return field;
+}
+
+template <typename SToken, typename CToken, typename Content>
+bool process_multipart_ranges_data(const Request &req,
+                                   const std::string &boundary,
+                                   const std::string &content_type,
+                                   size_t content_length, SToken stoken,
+                                   CToken ctoken, Content content) {
+  for (size_t i = 0; i < req.ranges.size(); i++) {
+    ctoken("--");
+    stoken(boundary);
+    ctoken("\r\n");
+    if (!content_type.empty()) {
+      ctoken("Content-Type: ");
+      stoken(content_type);
+      ctoken("\r\n");
+    }
+
+    auto offset_and_length =
+        get_range_offset_and_length(req.ranges[i], content_length);
+
+    ctoken("Content-Range: ");
+    stoken(make_content_range_header_field(offset_and_length, content_length));
+    ctoken("\r\n");
+    ctoken("\r\n");
+
+    if (!content(offset_and_length.first, offset_and_length.second)) {
+      return false;
+    }
+    ctoken("\r\n");
+  }
+
+  ctoken("--");
+  stoken(boundary);
+  ctoken("--");
+
+  return true;
+}
+
+inline void make_multipart_ranges_data(const Request &req, Response &res,
+                                       const std::string &boundary,
+                                       const std::string &content_type,
+                                       size_t content_length,
+                                       std::string &data) {
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data += token; },
+      [&](const std::string &token) { data += token; },
+      [&](size_t offset, size_t length) {
+        assert(offset + length <= content_length);
+        data += res.body.substr(offset, length);
+        return true;
+      });
+}
+
+inline size_t get_multipart_ranges_data_length(const Request &req,
+                                               const std::string &boundary,
+                                               const std::string &content_type,
+                                               size_t content_length) {
+  size_t data_length = 0;
+
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data_length += token.size(); },
+      [&](const std::string &token) { data_length += token.size(); },
+      [&](size_t /*offset*/, size_t length) {
+        data_length += length;
+        return true;
+      });
+
+  return data_length;
+}
+
+template <typename T>
+inline bool
+write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
+                            const std::string &boundary,
+                            const std::string &content_type,
+                            size_t content_length, const T &is_shutting_down) {
+  return process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { strm.write(token); },
+      [&](const std::string &token) { strm.write(token); },
+      [&](size_t offset, size_t length) {
+        return write_content(strm, res.content_provider_, offset, length,
+                             is_shutting_down);
+      });
+}
+
+inline bool expect_content(const Request &req) {
+  if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
+      req.method == "PRI" || req.method == "DELETE") {
+    return true;
+  }
+  // TODO: check if Content-Length is set
+  return false;
+}
+
+inline bool has_crlf(const std::string &s) {
+  auto p = s.c_str();
+  while (*p) {
+    if (*p == '\r' || *p == '\n') { return true; }
+    p++;
+  }
+  return false;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
+  auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>(
+      EVP_MD_CTX_new(), EVP_MD_CTX_free);
+
+  unsigned int hash_length = 0;
+  unsigned char hash[EVP_MAX_MD_SIZE];
+
+  EVP_DigestInit_ex(context.get(), algo, nullptr);
+  EVP_DigestUpdate(context.get(), s.c_str(), s.size());
+  EVP_DigestFinal_ex(context.get(), hash, &hash_length);
+
+  std::stringstream ss;
+  for (auto i = 0u; i < hash_length; ++i) {
+    ss << std::hex << std::setw(2) << std::setfill('0')
+       << static_cast<unsigned int>(hash[i]);
+  }
+
+  return ss.str();
+}
+
+inline std::string MD5(const std::string &s) {
+  return message_digest(s, EVP_md5());
+}
+
+inline std::string SHA_256(const std::string &s) {
+  return message_digest(s, EVP_sha256());
+}
+
+inline std::string SHA_512(const std::string &s) {
+  return message_digest(s, EVP_sha512());
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#ifdef _WIN32
+// NOTE: This code came up with the following stackoverflow post:
+// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
+inline bool load_system_certs_on_windows(X509_STORE *store) {
+  auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
+  if (!hStore) { return false; }
+
+  auto result = false;
+  PCCERT_CONTEXT pContext = NULL;
+  while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
+         nullptr) {
+    auto encoded_cert =
+        static_cast<const unsigned char *>(pContext->pbCertEncoded);
+
+    auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded);
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  CertFreeCertificateContext(pContext);
+  CertCloseStore(hStore, 0);
+
+  return result;
+}
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#if TARGET_OS_OSX
+template <typename T>
+using CFObjectPtr =
+    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
+
+inline void cf_object_ptr_deleter(CFTypeRef obj) {
+  if (obj) { CFRelease(obj); }
+}
+
+inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
+  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
+                        kCFBooleanTrue};
+
+  CFObjectPtr<CFDictionaryRef> query(
+      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
+                         sizeof(keys) / sizeof(keys[0]),
+                         &kCFTypeDictionaryKeyCallBacks,
+                         &kCFTypeDictionaryValueCallBacks),
+      cf_object_ptr_deleter);
+
+  if (!query) { return false; }
+
+  CFTypeRef security_items = nullptr;
+  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
+      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
+    return false;
+  }
+
+  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
+  return true;
+}
+
+inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFArrayRef root_security_items = nullptr;
+  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
+    return false;
+  }
+
+  certs.reset(root_security_items);
+  return true;
+}
+
+inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
+  auto result = false;
+  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
+    const auto cert = reinterpret_cast<const __SecCertificate *>(
+        CFArrayGetValueAtIndex(certs, i));
+
+    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
+
+    CFDataRef cert_data = nullptr;
+    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
+        errSecSuccess) {
+      continue;
+    }
+
+    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
+
+    auto encoded_cert = static_cast<const unsigned char *>(
+        CFDataGetBytePtr(cert_data_ptr.get()));
+
+    auto x509 =
+        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
+
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  return result;
+}
+
+inline bool load_system_certs_on_macos(X509_STORE *store) {
+  auto result = false;
+  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
+  if (retrieve_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store);
+  }
+
+  if (retrieve_root_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store) || result;
+  }
+
+  return result;
+}
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+#endif // CPPHTTPLIB_OPENSSL_SUPPORT
+
+#ifdef _WIN32
+class WSInit {
+public:
+  WSInit() {
+    WSADATA wsaData;
+    if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true;
+  }
+
+  ~WSInit() {
+    if (is_valid_) WSACleanup();
+  }
+
+  bool is_valid_ = false;
+};
+
+static WSInit wsinit_;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline std::pair<std::string, std::string> make_digest_authentication_header(
+    const Request &req, const std::map<std::string, std::string> &auth,
+    size_t cnonce_count, const std::string &cnonce, const std::string &username,
+    const std::string &password, bool is_proxy = false) {
+  std::string nc;
+  {
+    std::stringstream ss;
+    ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count;
+    nc = ss.str();
+  }
+
+  std::string qop;
+  if (auth.find("qop") != auth.end()) {
+    qop = auth.at("qop");
+    if (qop.find("auth-int") != std::string::npos) {
+      qop = "auth-int";
+    } else if (qop.find("auth") != std::string::npos) {
+      qop = "auth";
+    } else {
+      qop.clear();
+    }
+  }
+
+  std::string algo = "MD5";
+  if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); }
+
+  std::string response;
+  {
+    auto H = algo == "SHA-256"   ? detail::SHA_256
+             : algo == "SHA-512" ? detail::SHA_512
+                                 : detail::MD5;
+
+    auto A1 = username + ":" + auth.at("realm") + ":" + password;
+
+    auto A2 = req.method + ":" + req.path;
+    if (qop == "auth-int") { A2 += ":" + H(req.body); }
+
+    if (qop.empty()) {
+      response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2));
+    } else {
+      response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce +
+                   ":" + qop + ":" + H(A2));
+    }
+  }
+
+  auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : "";
+
+  auto field = "Digest username=\"" + username + "\", realm=\"" +
+               auth.at("realm") + "\", nonce=\"" + auth.at("nonce") +
+               "\", uri=\"" + req.path + "\", algorithm=" + algo +
+               (qop.empty() ? ", response=\""
+                            : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" +
+                                  cnonce + "\", response=\"") +
+               response + "\"" +
+               (opaque.empty() ? "" : ", opaque=\"" + opaque + "\"");
+
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, field);
+}
+#endif
+
+inline bool parse_www_authenticate(const Response &res,
+                                   std::map<std::string, std::string> &auth,
+                                   bool is_proxy) {
+  auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
+  if (res.has_header(auth_key)) {
+    static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
+    auto s = res.get_header_value(auth_key);
+    auto pos = s.find(' ');
+    if (pos != std::string::npos) {
+      auto type = s.substr(0, pos);
+      if (type == "Basic") {
+        return false;
+      } else if (type == "Digest") {
+        s = s.substr(pos + 1);
+        auto beg = std::sregex_iterator(s.begin(), s.end(), re);
+        for (auto i = beg; i != std::sregex_iterator(); ++i) {
+          const auto &m = *i;
+          auto key = s.substr(static_cast<size_t>(m.position(1)),
+                              static_cast<size_t>(m.length(1)));
+          auto val = m.length(2) > 0
+                         ? s.substr(static_cast<size_t>(m.position(2)),
+                                    static_cast<size_t>(m.length(2)))
+                         : s.substr(static_cast<size_t>(m.position(3)),
+                                    static_cast<size_t>(m.length(3)));
+          auth[key] = val;
+        }
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+class ContentProviderAdapter {
+public:
+  explicit ContentProviderAdapter(
+      ContentProviderWithoutLength &&content_provider)
+      : content_provider_(content_provider) {}
+
+  bool operator()(size_t offset, size_t, DataSink &sink) {
+    return content_provider_(offset, sink);
+  }
+
+private:
+  ContentProviderWithoutLength content_provider_;
+};
+
+} // namespace detail
+
+inline std::string hosted_at(const std::string &hostname) {
+  std::vector<std::string> addrs;
+  hosted_at(hostname, addrs);
+  if (addrs.empty()) { return std::string(); }
+  return addrs[0];
+}
+
+inline void hosted_at(const std::string &hostname,
+                      std::vector<std::string> &addrs) {
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+
+  if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) {
+#if defined __linux__ && !defined __ANDROID__
+    res_init();
+#endif
+    return;
+  }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    const auto &addr =
+        *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
+    std::string ip;
+    auto dummy = -1;
+    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
+                                dummy)) {
+      addrs.push_back(ip);
+    }
+  }
+}
+
+inline std::string append_query_params(const std::string &path,
+                                       const Params &params) {
+  std::string path_with_query = path;
+  const static std::regex re("[^?]+\\?.*");
+  auto delm = std::regex_match(path, re) ? '&' : '?';
+  path_with_query += delm + detail::params_to_query_str(params);
+  return path_with_query;
+}
+
+// Header utilities
+inline std::pair<std::string, std::string>
+make_range_header(const Ranges &ranges) {
+  std::string field = "bytes=";
+  auto i = 0;
+  for (const auto &r : ranges) {
+    if (i != 0) { field += ", "; }
+    if (r.first != -1) { field += std::to_string(r.first); }
+    field += '-';
+    if (r.second != -1) { field += std::to_string(r.second); }
+    i++;
+  }
+  return std::make_pair("Range", std::move(field));
+}
+
+inline std::pair<std::string, std::string>
+make_basic_authentication_header(const std::string &username,
+                                 const std::string &password, bool is_proxy) {
+  auto field = "Basic " + detail::base64_encode(username + ":" + password);
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, std::move(field));
+}
+
+inline std::pair<std::string, std::string>
+make_bearer_token_authentication_header(const std::string &token,
+                                        bool is_proxy = false) {
+  auto field = "Bearer " + token;
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, std::move(field));
+}
+
+// Request implementation
+inline bool Request::has_header(const std::string &key) const {
+  return detail::has_header(headers, key);
+}
+
+inline std::string Request::get_header_value(const std::string &key,
+                                             const char *def, size_t id) const {
+  return detail::get_header_value(headers, key, def, id);
+}
+
+inline size_t Request::get_header_value_count(const std::string &key) const {
+  auto r = headers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Request::set_header(const std::string &key,
+                                const std::string &val) {
+  if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
+    headers.emplace(key, val);
+  }
+}
+
+inline bool Request::has_param(const std::string &key) const {
+  return params.find(key) != params.end();
+}
+
+inline std::string Request::get_param_value(const std::string &key,
+                                            size_t id) const {
+  auto rng = params.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second; }
+  return std::string();
+}
+
+inline size_t Request::get_param_value_count(const std::string &key) const {
+  auto r = params.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline bool Request::is_multipart_form_data() const {
+  const auto &content_type = get_header_value("Content-Type");
+  return !content_type.rfind("multipart/form-data", 0);
+}
+
+inline bool Request::has_file(const std::string &key) const {
+  return files.find(key) != files.end();
+}
+
+inline MultipartFormData Request::get_file_value(const std::string &key) const {
+  auto it = files.find(key);
+  if (it != files.end()) { return it->second; }
+  return MultipartFormData();
+}
+
+inline std::vector<MultipartFormData>
+Request::get_file_values(const std::string &key) const {
+  std::vector<MultipartFormData> values;
+  auto rng = files.equal_range(key);
+  for (auto it = rng.first; it != rng.second; it++) {
+    values.push_back(it->second);
+  }
+  return values;
+}
+
+// Response implementation
+inline bool Response::has_header(const std::string &key) const {
+  return headers.find(key) != headers.end();
+}
+
+inline std::string Response::get_header_value(const std::string &key,
+                                              const char *def,
+                                              size_t id) const {
+  return detail::get_header_value(headers, key, def, id);
+}
+
+inline size_t Response::get_header_value_count(const std::string &key) const {
+  auto r = headers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Response::set_header(const std::string &key,
+                                 const std::string &val) {
+  if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
+    headers.emplace(key, val);
+  }
+}
+
+inline void Response::set_redirect(const std::string &url, int stat) {
+  if (!detail::has_crlf(url)) {
+    set_header("Location", url);
+    if (300 <= stat && stat < 400) {
+      this->status = stat;
+    } else {
+      this->status = StatusCode::Found_302;
+    }
+  }
+}
+
+inline void Response::set_content(const char *s, size_t n,
+                                  const std::string &content_type) {
+  body.assign(s, n);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
+inline void Response::set_content(const std::string &s,
+                                  const std::string &content_type) {
+  set_content(s.data(), s.size(), content_type);
+}
+
+inline void Response::set_content(std::string &&s,
+                                  const std::string &content_type) {
+  body = std::move(s);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
+inline void Response::set_content_provider(
+    size_t in_length, const std::string &content_type, ContentProvider provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = in_length;
+  if (in_length > 0) { content_provider_ = std::move(provider); }
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = false;
+}
+
+inline void Response::set_content_provider(
+    const std::string &content_type, ContentProviderWithoutLength provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = 0;
+  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = false;
+}
+
+inline void Response::set_chunked_content_provider(
+    const std::string &content_type, ContentProviderWithoutLength provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = 0;
+  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = true;
+}
+
+inline void Response::set_file_content(const std::string &path,
+                                       const std::string &content_type) {
+  file_content_path_ = path;
+  file_content_content_type_ = content_type;
+}
+
+inline void Response::set_file_content(const std::string &path) {
+  file_content_path_ = path;
+}
+
+// Result implementation
+inline bool Result::has_request_header(const std::string &key) const {
+  return request_headers_.find(key) != request_headers_.end();
+}
+
+inline std::string Result::get_request_header_value(const std::string &key,
+                                                    const char *def,
+                                                    size_t id) const {
+  return detail::get_header_value(request_headers_, key, def, id);
+}
+
+inline size_t
+Result::get_request_header_value_count(const std::string &key) const {
+  auto r = request_headers_.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+// Stream implementation
+inline ssize_t Stream::write(const char *ptr) {
+  return write(ptr, strlen(ptr));
+}
+
+inline ssize_t Stream::write(const std::string &s) {
+  return write(s.data(), s.size());
+}
+
+namespace detail {
+
+// Socket stream implementation
+inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec,
+                                  time_t read_timeout_usec,
+                                  time_t write_timeout_sec,
+                                  time_t write_timeout_usec)
+    : sock_(sock), read_timeout_sec_(read_timeout_sec),
+      read_timeout_usec_(read_timeout_usec),
+      write_timeout_sec_(write_timeout_sec),
+      write_timeout_usec_(write_timeout_usec), read_buff_(read_buff_size_, 0) {}
+
+inline SocketStream::~SocketStream() = default;
+
+inline bool SocketStream::is_readable() const {
+  return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
+}
+
+inline bool SocketStream::is_writable() const {
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_);
+}
+
+inline ssize_t SocketStream::read(char *ptr, size_t size) {
+#ifdef _WIN32
+  size =
+      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
+#else
+  size = (std::min)(size,
+                    static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
+#endif
+
+  if (read_buff_off_ < read_buff_content_size_) {
+    auto remaining_size = read_buff_content_size_ - read_buff_off_;
+    if (size <= remaining_size) {
+      memcpy(ptr, read_buff_.data() + read_buff_off_, size);
+      read_buff_off_ += size;
+      return static_cast<ssize_t>(size);
+    } else {
+      memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size);
+      read_buff_off_ += remaining_size;
+      return static_cast<ssize_t>(remaining_size);
+    }
+  }
+
+  if (!is_readable()) { return -1; }
+
+  read_buff_off_ = 0;
+  read_buff_content_size_ = 0;
+
+  if (size < read_buff_size_) {
+    auto n = read_socket(sock_, read_buff_.data(), read_buff_size_,
+                         CPPHTTPLIB_RECV_FLAGS);
+    if (n <= 0) {
+      return n;
+    } else if (n <= static_cast<ssize_t>(size)) {
+      memcpy(ptr, read_buff_.data(), static_cast<size_t>(n));
+      return n;
+    } else {
+      memcpy(ptr, read_buff_.data(), size);
+      read_buff_off_ = size;
+      read_buff_content_size_ = static_cast<size_t>(n);
+      return static_cast<ssize_t>(size);
+    }
+  } else {
+    return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS);
+  }
+}
+
+inline ssize_t SocketStream::write(const char *ptr, size_t size) {
+  if (!is_writable()) { return -1; }
+
+#if defined(_WIN32) && !defined(_WIN64)
+  size =
+      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
+#endif
+
+  return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
+}
+
+inline void SocketStream::get_remote_ip_and_port(std::string &ip,
+                                                 int &port) const {
+  return detail::get_remote_ip_and_port(sock_, ip, port);
+}
+
+inline void SocketStream::get_local_ip_and_port(std::string &ip,
+                                                int &port) const {
+  return detail::get_local_ip_and_port(sock_, ip, port);
+}
+
+inline socket_t SocketStream::socket() const { return sock_; }
+
+// Buffer stream implementation
+inline bool BufferStream::is_readable() const { return true; }
+
+inline bool BufferStream::is_writable() const { return true; }
+
+inline ssize_t BufferStream::read(char *ptr, size_t size) {
+#if defined(_MSC_VER) && _MSC_VER < 1910
+  auto len_read = buffer._Copy_s(ptr, size, size, position);
+#else
+  auto len_read = buffer.copy(ptr, size, position);
+#endif
+  position += static_cast<size_t>(len_read);
+  return static_cast<ssize_t>(len_read);
+}
+
+inline ssize_t BufferStream::write(const char *ptr, size_t size) {
+  buffer.append(ptr, size);
+  return static_cast<ssize_t>(size);
+}
+
+inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
+                                                 int & /*port*/) const {}
+
+inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
+                                                int & /*port*/) const {}
+
+inline socket_t BufferStream::socket() const { return 0; }
+
+inline const std::string &BufferStream::get_buffer() const { return buffer; }
+
+inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
+  static constexpr char marker[] = "/:";
+
+  // One past the last ending position of a path param substring
+  std::size_t last_param_end = 0;
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+  // Needed to ensure that parameter names are unique during matcher
+  // construction
+  // If exceptions are disabled, only last duplicate path
+  // parameter will be set
+  std::unordered_set<std::string> param_name_set;
+#endif
+
+  while (true) {
+    const auto marker_pos = pattern.find(
+        marker, last_param_end == 0 ? last_param_end : last_param_end - 1);
+    if (marker_pos == std::string::npos) { break; }
+
+    static_fragments_.push_back(
+        pattern.substr(last_param_end, marker_pos - last_param_end + 1));
+
+    const auto param_name_start = marker_pos + 2;
+
+    auto sep_pos = pattern.find(separator, param_name_start);
+    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
+
+    auto param_name =
+        pattern.substr(param_name_start, sep_pos - param_name_start);
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+    if (param_name_set.find(param_name) != param_name_set.cend()) {
+      std::string msg = "Encountered path parameter '" + param_name +
+                        "' multiple times in route pattern '" + pattern + "'.";
+      throw std::invalid_argument(msg);
+    }
+#endif
+
+    param_names_.push_back(std::move(param_name));
+
+    last_param_end = sep_pos + 1;
+  }
+
+  if (last_param_end < pattern.length()) {
+    static_fragments_.push_back(pattern.substr(last_param_end));
+  }
+}
+
+inline bool PathParamsMatcher::match(Request &request) const {
+  request.matches = std::smatch();
+  request.path_params.clear();
+  request.path_params.reserve(param_names_.size());
+
+  // One past the position at which the path matched the pattern last time
+  std::size_t starting_pos = 0;
+  for (size_t i = 0; i < static_fragments_.size(); ++i) {
+    const auto &fragment = static_fragments_[i];
+
+    if (starting_pos + fragment.length() > request.path.length()) {
+      return false;
+    }
+
+    // Avoid unnecessary allocation by using strncmp instead of substr +
+    // comparison
+    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
+                     fragment.length()) != 0) {
+      return false;
+    }
+
+    starting_pos += fragment.length();
+
+    // Should only happen when we have a static fragment after a param
+    // Example: '/users/:id/subscriptions'
+    // The 'subscriptions' fragment here does not have a corresponding param
+    if (i >= param_names_.size()) { continue; }
+
+    auto sep_pos = request.path.find(separator, starting_pos);
+    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
+
+    const auto &param_name = param_names_[i];
+
+    request.path_params.emplace(
+        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
+
+    // Mark everything up to '/' as matched
+    starting_pos = sep_pos + 1;
+  }
+  // Returns false if the path is longer than the pattern
+  return starting_pos >= request.path.length();
+}
+
+inline bool RegexMatcher::match(Request &request) const {
+  request.path_params.clear();
+  return std::regex_match(request.path, request.matches, regex_);
+}
+
+} // namespace detail
+
+// HTTP server implementation
+inline Server::Server()
+    : new_task_queue(
+          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
+#ifndef _WIN32
+  signal(SIGPIPE, SIG_IGN);
+#endif
+}
+
+inline Server::~Server() = default;
+
+inline std::unique_ptr<detail::MatcherBase>
+Server::make_matcher(const std::string &pattern) {
+  if (pattern.find("/:") != std::string::npos) {
+    return detail::make_unique<detail::PathParamsMatcher>(pattern);
+  } else {
+    return detail::make_unique<detail::RegexMatcher>(pattern);
+  }
+}
+
+inline Server &Server::Get(const std::string &pattern, Handler handler) {
+  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Post(const std::string &pattern, Handler handler) {
+  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Post(const std::string &pattern,
+                            HandlerWithContentReader handler) {
+  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                 std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Put(const std::string &pattern, Handler handler) {
+  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Put(const std::string &pattern,
+                           HandlerWithContentReader handler) {
+  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Patch(const std::string &pattern, Handler handler) {
+  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Patch(const std::string &pattern,
+                             HandlerWithContentReader handler) {
+  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                  std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Delete(const std::string &pattern, Handler handler) {
+  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Delete(const std::string &pattern,
+                              HandlerWithContentReader handler) {
+  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                   std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Options(const std::string &pattern, Handler handler) {
+  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline bool Server::set_base_dir(const std::string &dir,
+                                 const std::string &mount_point) {
+  return set_mount_point(mount_point, dir);
+}
+
+inline bool Server::set_mount_point(const std::string &mount_point,
+                                    const std::string &dir, Headers headers) {
+  detail::FileStat stat(dir);
+  if (stat.is_dir()) {
+    std::string mnt = !mount_point.empty() ? mount_point : "/";
+    if (!mnt.empty() && mnt[0] == '/') {
+      base_dirs_.push_back({mnt, dir, std::move(headers)});
+      return true;
+    }
+  }
+  return false;
+}
+
+inline bool Server::remove_mount_point(const std::string &mount_point) {
+  for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
+    if (it->mount_point == mount_point) {
+      base_dirs_.erase(it);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline Server &
+Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                const std::string &mime) {
+  file_extension_and_mimetype_map_[ext] = mime;
+  return *this;
+}
+
+inline Server &Server::set_default_file_mimetype(const std::string &mime) {
+  default_file_mimetype_ = mime;
+  return *this;
+}
+
+inline Server &Server::set_file_request_handler(Handler handler) {
+  file_request_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_error_handler_core(HandlerWithResponse handler,
+                                              std::true_type) {
+  error_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_error_handler_core(Handler handler,
+                                              std::false_type) {
+  error_handler_ = [handler](const Request &req, Response &res) {
+    handler(req, res);
+    return HandlerResponse::Handled;
+  };
+  return *this;
+}
+
+inline Server &Server::set_exception_handler(ExceptionHandler handler) {
+  exception_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) {
+  pre_routing_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_post_routing_handler(Handler handler) {
+  post_routing_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_logger(Logger logger) {
+  logger_ = std::move(logger);
+  return *this;
+}
+
+inline Server &
+Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
+  expect_100_continue_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_address_family(int family) {
+  address_family_ = family;
+  return *this;
+}
+
+inline Server &Server::set_tcp_nodelay(bool on) {
+  tcp_nodelay_ = on;
+  return *this;
+}
+
+inline Server &Server::set_ipv6_v6only(bool on) {
+  ipv6_v6only_ = on;
+  return *this;
+}
+
+inline Server &Server::set_socket_options(SocketOptions socket_options) {
+  socket_options_ = std::move(socket_options);
+  return *this;
+}
+
+inline Server &Server::set_default_headers(Headers headers) {
+  default_headers_ = std::move(headers);
+  return *this;
+}
+
+inline Server &Server::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+  return *this;
+}
+
+inline Server &Server::set_keep_alive_max_count(size_t count) {
+  keep_alive_max_count_ = count;
+  return *this;
+}
+
+inline Server &Server::set_keep_alive_timeout(time_t sec) {
+  keep_alive_timeout_sec_ = sec;
+  return *this;
+}
+
+inline Server &Server::set_read_timeout(time_t sec, time_t usec) {
+  read_timeout_sec_ = sec;
+  read_timeout_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_write_timeout(time_t sec, time_t usec) {
+  write_timeout_sec_ = sec;
+  write_timeout_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_idle_interval(time_t sec, time_t usec) {
+  idle_interval_sec_ = sec;
+  idle_interval_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_payload_max_length(size_t length) {
+  payload_max_length_ = length;
+  return *this;
+}
+
+inline bool Server::bind_to_port(const std::string &host, int port,
+                                 int socket_flags) {
+  auto ret = bind_internal(host, port, socket_flags);
+  if (ret == -1) { is_decommisioned = true; }
+  return ret >= 0;
+}
+inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
+  auto ret = bind_internal(host, 0, socket_flags);
+  if (ret == -1) { is_decommisioned = true; }
+  return ret;
+}
+
+inline bool Server::listen_after_bind() { return listen_internal(); }
+
+inline bool Server::listen(const std::string &host, int port,
+                           int socket_flags) {
+  return bind_to_port(host, port, socket_flags) && listen_internal();
+}
+
+inline bool Server::is_running() const { return is_running_; }
+
+inline void Server::wait_until_ready() const {
+  while (!is_running_ && !is_decommisioned) {
+    std::this_thread::sleep_for(std::chrono::milliseconds{1});
+  }
+}
+
+inline void Server::stop() {
+  if (is_running_) {
+    assert(svr_sock_ != INVALID_SOCKET);
+    std::atomic<socket_t> sock(svr_sock_.exchange(INVALID_SOCKET));
+    detail::shutdown_socket(sock);
+    detail::close_socket(sock);
+  }
+  is_decommisioned = false;
+}
+
+inline void Server::decommission() { is_decommisioned = true; }
+
+inline bool Server::parse_request_line(const char *s, Request &req) const {
+  auto len = strlen(s);
+  if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
+  len -= 2;
+
+  {
+    size_t count = 0;
+
+    detail::split(s, s + len, ' ', [&](const char *b, const char *e) {
+      switch (count) {
+      case 0: req.method = std::string(b, e); break;
+      case 1: req.target = std::string(b, e); break;
+      case 2: req.version = std::string(b, e); break;
+      default: break;
+      }
+      count++;
+    });
+
+    if (count != 3) { return false; }
+  }
+
+  static const std::set<std::string> methods{
+      "GET",     "HEAD",    "POST",  "PUT",   "DELETE",
+      "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"};
+
+  if (methods.find(req.method) == methods.end()) { return false; }
+
+  if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { return false; }
+
+  {
+    // Skip URL fragment
+    for (size_t i = 0; i < req.target.size(); i++) {
+      if (req.target[i] == '#') {
+        req.target.erase(i);
+        break;
+      }
+    }
+
+    detail::divide(req.target, '?',
+                   [&](const char *lhs_data, std::size_t lhs_size,
+                       const char *rhs_data, std::size_t rhs_size) {
+                     req.path = detail::decode_url(
+                         std::string(lhs_data, lhs_size), false);
+                     detail::parse_query_text(rhs_data, rhs_size, req.params);
+                   });
+  }
+
+  return true;
+}
+
+inline bool Server::write_response(Stream &strm, bool close_connection,
+                                   Request &req, Response &res) {
+  // NOTE: `req.ranges` should be empty, otherwise it will be applied
+  // incorrectly to the error content.
+  req.ranges.clear();
+  return write_response_core(strm, close_connection, req, res, false);
+}
+
+inline bool Server::write_response_with_content(Stream &strm,
+                                                bool close_connection,
+                                                const Request &req,
+                                                Response &res) {
+  return write_response_core(strm, close_connection, req, res, true);
+}
+
+inline bool Server::write_response_core(Stream &strm, bool close_connection,
+                                        const Request &req, Response &res,
+                                        bool need_apply_ranges) {
+  assert(res.status != -1);
+
+  if (400 <= res.status && error_handler_ &&
+      error_handler_(req, res) == HandlerResponse::Handled) {
+    need_apply_ranges = true;
+  }
+
+  std::string content_type;
+  std::string boundary;
+  if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
+
+  // Prepare additional headers
+  if (close_connection || req.get_header_value("Connection") == "close") {
+    res.set_header("Connection", "close");
+  } else {
+    std::string s = "timeout=";
+    s += std::to_string(keep_alive_timeout_sec_);
+    s += ", max=";
+    s += std::to_string(keep_alive_max_count_);
+    res.set_header("Keep-Alive", s);
+  }
+
+  if ((!res.body.empty() || res.content_length_ > 0 || res.content_provider_) &&
+      !res.has_header("Content-Type")) {
+    res.set_header("Content-Type", "text/plain");
+  }
+
+  if (res.body.empty() && !res.content_length_ && !res.content_provider_ &&
+      !res.has_header("Content-Length")) {
+    res.set_header("Content-Length", "0");
+  }
+
+  if (req.method == "HEAD" && !res.has_header("Accept-Ranges")) {
+    res.set_header("Accept-Ranges", "bytes");
+  }
+
+  if (post_routing_handler_) { post_routing_handler_(req, res); }
+
+  // Response line and headers
+  {
+    detail::BufferStream bstrm;
+    if (!detail::write_response_line(bstrm, res.status)) { return false; }
+    if (!header_writer_(bstrm, res.headers)) { return false; }
+
+    // Flush buffer
+    auto &data = bstrm.get_buffer();
+    detail::write_data(strm, data.data(), data.size());
+  }
+
+  // Body
+  auto ret = true;
+  if (req.method != "HEAD") {
+    if (!res.body.empty()) {
+      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
+        ret = false;
+      }
+    } else if (res.content_provider_) {
+      if (write_content_with_provider(strm, req, res, boundary, content_type)) {
+        res.content_provider_success_ = true;
+      } else {
+        ret = false;
+      }
+    }
+  }
+
+  // Log
+  if (logger_) { logger_(req, res); }
+
+  return ret;
+}
+
+inline bool
+Server::write_content_with_provider(Stream &strm, const Request &req,
+                                    Response &res, const std::string &boundary,
+                                    const std::string &content_type) {
+  auto is_shutting_down = [this]() {
+    return this->svr_sock_ == INVALID_SOCKET;
+  };
+
+  if (res.content_length_ > 0) {
+    if (req.ranges.empty()) {
+      return detail::write_content(strm, res.content_provider_, 0,
+                                   res.content_length_, is_shutting_down);
+    } else if (req.ranges.size() == 1) {
+      auto offset_and_length = detail::get_range_offset_and_length(
+          req.ranges[0], res.content_length_);
+
+      return detail::write_content(strm, res.content_provider_,
+                                   offset_and_length.first,
+                                   offset_and_length.second, is_shutting_down);
+    } else {
+      return detail::write_multipart_ranges_data(
+          strm, req, res, boundary, content_type, res.content_length_,
+          is_shutting_down);
+    }
+  } else {
+    if (res.is_chunked_content_provider_) {
+      auto type = detail::encoding_type(req, res);
+
+      std::unique_ptr<detail::compressor> compressor;
+      if (type == detail::EncodingType::Gzip) {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+        compressor = detail::make_unique<detail::gzip_compressor>();
+#endif
+      } else if (type == detail::EncodingType::Brotli) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+        compressor = detail::make_unique<detail::brotli_compressor>();
+#endif
+      } else {
+        compressor = detail::make_unique<detail::nocompressor>();
+      }
+      assert(compressor != nullptr);
+
+      return detail::write_content_chunked(strm, res.content_provider_,
+                                           is_shutting_down, *compressor);
+    } else {
+      return detail::write_content_without_length(strm, res.content_provider_,
+                                                  is_shutting_down);
+    }
+  }
+}
+
+inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
+  MultipartFormDataMap::iterator cur;
+  auto file_count = 0;
+  if (read_content_core(
+          strm, req, res,
+          // Regular
+          [&](const char *buf, size_t n) {
+            if (req.body.size() + n > req.body.max_size()) { return false; }
+            req.body.append(buf, n);
+            return true;
+          },
+          // Multipart
+          [&](const MultipartFormData &file) {
+            if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
+              return false;
+            }
+            cur = req.files.emplace(file.name, file);
+            return true;
+          },
+          [&](const char *buf, size_t n) {
+            auto &content = cur->second.content;
+            if (content.size() + n > content.max_size()) { return false; }
+            content.append(buf, n);
+            return true;
+          })) {
+    const auto &content_type = req.get_header_value("Content-Type");
+    if (!content_type.find("application/x-www-form-urlencoded")) {
+      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
+        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
+        return false;
+      }
+      detail::parse_query_text(req.body, req.params);
+    }
+    return true;
+  }
+  return false;
+}
+
+inline bool Server::read_content_with_content_receiver(
+    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
+    MultipartContentHeader multipart_header,
+    ContentReceiver multipart_receiver) {
+  return read_content_core(strm, req, res, std::move(receiver),
+                           std::move(multipart_header),
+                           std::move(multipart_receiver));
+}
+
+inline bool
+Server::read_content_core(Stream &strm, Request &req, Response &res,
+                          ContentReceiver receiver,
+                          MultipartContentHeader multipart_header,
+                          ContentReceiver multipart_receiver) const {
+  detail::MultipartFormDataParser multipart_form_data_parser;
+  ContentReceiverWithProgress out;
+
+  if (req.is_multipart_form_data()) {
+    const auto &content_type = req.get_header_value("Content-Type");
+    std::string boundary;
+    if (!detail::parse_multipart_boundary(content_type, boundary)) {
+      res.status = StatusCode::BadRequest_400;
+      return false;
+    }
+
+    multipart_form_data_parser.set_boundary(std::move(boundary));
+    out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) {
+      /* For debug
+      size_t pos = 0;
+      while (pos < n) {
+        auto read_size = (std::min)<size_t>(1, n - pos);
+        auto ret = multipart_form_data_parser.parse(
+            buf + pos, read_size, multipart_receiver, multipart_header);
+        if (!ret) { return false; }
+        pos += read_size;
+      }
+      return true;
+      */
+      return multipart_form_data_parser.parse(buf, n, multipart_receiver,
+                                              multipart_header);
+    };
+  } else {
+    out = [receiver](const char *buf, size_t n, uint64_t /*off*/,
+                     uint64_t /*len*/) { return receiver(buf, n); };
+  }
+
+  if (req.method == "DELETE" && !req.has_header("Content-Length")) {
+    return true;
+  }
+
+  if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
+                            out, true)) {
+    return false;
+  }
+
+  if (req.is_multipart_form_data()) {
+    if (!multipart_form_data_parser.is_valid()) {
+      res.status = StatusCode::BadRequest_400;
+      return false;
+    }
+  }
+
+  return true;
+}
+
+inline bool Server::handle_file_request(const Request &req, Response &res,
+                                        bool head) {
+  for (const auto &entry : base_dirs_) {
+    // Prefix match
+    if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
+      std::string sub_path = "/" + req.path.substr(entry.mount_point.size());
+      if (detail::is_valid_path(sub_path)) {
+        auto path = entry.base_dir + sub_path;
+        if (path.back() == '/') { path += "index.html"; }
+
+        detail::FileStat stat(path);
+
+        if (stat.is_dir()) {
+          res.set_redirect(sub_path + "/", StatusCode::MovedPermanently_301);
+          return true;
+        }
+
+        if (stat.is_file()) {
+          for (const auto &kv : entry.headers) {
+            res.set_header(kv.first, kv.second);
+          }
+
+          auto mm = std::make_shared<detail::mmap>(path.c_str());
+          if (!mm->is_open()) { return false; }
+
+          res.set_content_provider(
+              mm->size(),
+              detail::find_content_type(path, file_extension_and_mimetype_map_,
+                                        default_file_mimetype_),
+              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+                sink.write(mm->data() + offset, length);
+                return true;
+              });
+
+          if (!head && file_request_handler_) {
+            file_request_handler_(req, res);
+          }
+
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+
+inline socket_t
+Server::create_server_socket(const std::string &host, int port,
+                             int socket_flags,
+                             SocketOptions socket_options) const {
+  return detail::create_socket(
+      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
+      ipv6_v6only_, std::move(socket_options),
+      [](socket_t sock, struct addrinfo &ai, bool & /*quit*/) -> bool {
+        if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
+          return false;
+        }
+        if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) { return false; }
+        return true;
+      });
+}
+
+inline int Server::bind_internal(const std::string &host, int port,
+                                 int socket_flags) {
+  if (is_decommisioned) { return -1; }
+
+  if (!is_valid()) { return -1; }
+
+  svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
+  if (svr_sock_ == INVALID_SOCKET) { return -1; }
+
+  if (port == 0) {
+    struct sockaddr_storage addr;
+    socklen_t addr_len = sizeof(addr);
+    if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&addr),
+                    &addr_len) == -1) {
+      return -1;
+    }
+    if (addr.ss_family == AF_INET) {
+      return ntohs(reinterpret_cast<struct sockaddr_in *>(&addr)->sin_port);
+    } else if (addr.ss_family == AF_INET6) {
+      return ntohs(reinterpret_cast<struct sockaddr_in6 *>(&addr)->sin6_port);
+    } else {
+      return -1;
+    }
+  } else {
+    return port;
+  }
+}
+
+inline bool Server::listen_internal() {
+  if (is_decommisioned) { return false; }
+
+  auto ret = true;
+  is_running_ = true;
+  auto se = detail::scope_exit([&]() { is_running_ = false; });
+
+  {
+    std::unique_ptr<TaskQueue> task_queue(new_task_queue());
+
+    while (svr_sock_ != INVALID_SOCKET) {
+#ifndef _WIN32
+      if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
+#endif
+        auto val = detail::select_read(svr_sock_, idle_interval_sec_,
+                                       idle_interval_usec_);
+        if (val == 0) { // Timeout
+          task_queue->on_idle();
+          continue;
+        }
+#ifndef _WIN32
+      }
+#endif
+
+#if defined _WIN32
+      // sockets conneced via WASAccept inherit flags NO_HANDLE_INHERIT,
+      // OVERLAPPED
+      socket_t sock = WSAAccept(svr_sock_, nullptr, nullptr, nullptr, 0);
+#elif defined SOCK_CLOEXEC
+      socket_t sock = accept4(svr_sock_, nullptr, nullptr, SOCK_CLOEXEC);
+#else
+      socket_t sock = accept(svr_sock_, nullptr, nullptr);
+#endif
+
+      if (sock == INVALID_SOCKET) {
+        if (errno == EMFILE) {
+          // The per-process limit of open file descriptors has been reached.
+          // Try to accept new connections after a short sleep.
+          std::this_thread::sleep_for(std::chrono::microseconds{1});
+          continue;
+        } else if (errno == EINTR || errno == EAGAIN) {
+          continue;
+        }
+        if (svr_sock_ != INVALID_SOCKET) {
+          detail::close_socket(svr_sock_);
+          ret = false;
+        } else {
+          ; // The server socket was closed by user.
+        }
+        break;
+      }
+
+      {
+#ifdef _WIN32
+        auto timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 +
+                                             read_timeout_usec_ / 1000);
+        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+        timeval tv;
+        tv.tv_sec = static_cast<long>(read_timeout_sec_);
+        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
+        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+                   reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+      }
+      {
+
+#ifdef _WIN32
+        auto timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 +
+                                             write_timeout_usec_ / 1000);
+        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+        timeval tv;
+        tv.tv_sec = static_cast<long>(write_timeout_sec_);
+        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_);
+        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+                   reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+      }
+
+      if (!task_queue->enqueue(
+              [this, sock]() { process_and_close_socket(sock); })) {
+        detail::shutdown_socket(sock);
+        detail::close_socket(sock);
+      }
+    }
+
+    task_queue->shutdown();
+  }
+
+  is_decommisioned = !ret;
+  return ret;
+}
+
+inline bool Server::routing(Request &req, Response &res, Stream &strm) {
+  if (pre_routing_handler_ &&
+      pre_routing_handler_(req, res) == HandlerResponse::Handled) {
+    return true;
+  }
+
+  // File handler
+  auto is_head_request = req.method == "HEAD";
+  if ((req.method == "GET" || is_head_request) &&
+      handle_file_request(req, res, is_head_request)) {
+    return true;
+  }
+
+  if (detail::expect_content(req)) {
+    // Content reader handler
+    {
+      ContentReader reader(
+          [&](ContentReceiver receiver) {
+            return read_content_with_content_receiver(
+                strm, req, res, std::move(receiver), nullptr, nullptr);
+          },
+          [&](MultipartContentHeader header, ContentReceiver receiver) {
+            return read_content_with_content_receiver(strm, req, res, nullptr,
+                                                      std::move(header),
+                                                      std::move(receiver));
+          });
+
+      if (req.method == "POST") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                post_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "PUT") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                put_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "PATCH") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                patch_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "DELETE") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                delete_handlers_for_content_reader_)) {
+          return true;
+        }
+      }
+    }
+
+    // Read content into `req.body`
+    if (!read_content(strm, req, res)) { return false; }
+  }
+
+  // Regular handler
+  if (req.method == "GET" || req.method == "HEAD") {
+    return dispatch_request(req, res, get_handlers_);
+  } else if (req.method == "POST") {
+    return dispatch_request(req, res, post_handlers_);
+  } else if (req.method == "PUT") {
+    return dispatch_request(req, res, put_handlers_);
+  } else if (req.method == "DELETE") {
+    return dispatch_request(req, res, delete_handlers_);
+  } else if (req.method == "OPTIONS") {
+    return dispatch_request(req, res, options_handlers_);
+  } else if (req.method == "PATCH") {
+    return dispatch_request(req, res, patch_handlers_);
+  }
+
+  res.status = StatusCode::BadRequest_400;
+  return false;
+}
+
+inline bool Server::dispatch_request(Request &req, Response &res,
+                                     const Handlers &handlers) const {
+  for (const auto &x : handlers) {
+    const auto &matcher = x.first;
+    const auto &handler = x.second;
+
+    if (matcher->match(req)) {
+      handler(req, res);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline void Server::apply_ranges(const Request &req, Response &res,
+                                 std::string &content_type,
+                                 std::string &boundary) const {
+  if (req.ranges.size() > 1 && res.status == StatusCode::PartialContent_206) {
+    auto it = res.headers.find("Content-Type");
+    if (it != res.headers.end()) {
+      content_type = it->second;
+      res.headers.erase(it);
+    }
+
+    boundary = detail::make_multipart_data_boundary();
+
+    res.set_header("Content-Type",
+                   "multipart/byteranges; boundary=" + boundary);
+  }
+
+  auto type = detail::encoding_type(req, res);
+
+  if (res.body.empty()) {
+    if (res.content_length_ > 0) {
+      size_t length = 0;
+      if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
+        length = res.content_length_;
+      } else if (req.ranges.size() == 1) {
+        auto offset_and_length = detail::get_range_offset_and_length(
+            req.ranges[0], res.content_length_);
+
+        length = offset_and_length.second;
+
+        auto content_range = detail::make_content_range_header_field(
+            offset_and_length, res.content_length_);
+        res.set_header("Content-Range", content_range);
+      } else {
+        length = detail::get_multipart_ranges_data_length(
+            req, boundary, content_type, res.content_length_);
+      }
+      res.set_header("Content-Length", std::to_string(length));
+    } else {
+      if (res.content_provider_) {
+        if (res.is_chunked_content_provider_) {
+          res.set_header("Transfer-Encoding", "chunked");
+          if (type == detail::EncodingType::Gzip) {
+            res.set_header("Content-Encoding", "gzip");
+          } else if (type == detail::EncodingType::Brotli) {
+            res.set_header("Content-Encoding", "br");
+          }
+        }
+      }
+    }
+  } else {
+    if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
+      ;
+    } else if (req.ranges.size() == 1) {
+      auto offset_and_length =
+          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
+      auto offset = offset_and_length.first;
+      auto length = offset_and_length.second;
+
+      auto content_range = detail::make_content_range_header_field(
+          offset_and_length, res.body.size());
+      res.set_header("Content-Range", content_range);
+
+      assert(offset + length <= res.body.size());
+      res.body = res.body.substr(offset, length);
+    } else {
+      std::string data;
+      detail::make_multipart_ranges_data(req, res, boundary, content_type,
+                                         res.body.size(), data);
+      res.body.swap(data);
+    }
+
+    if (type != detail::EncodingType::None) {
+      std::unique_ptr<detail::compressor> compressor;
+      std::string content_encoding;
+
+      if (type == detail::EncodingType::Gzip) {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+        compressor = detail::make_unique<detail::gzip_compressor>();
+        content_encoding = "gzip";
+#endif
+      } else if (type == detail::EncodingType::Brotli) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+        compressor = detail::make_unique<detail::brotli_compressor>();
+        content_encoding = "br";
+#endif
+      }
+
+      if (compressor) {
+        std::string compressed;
+        if (compressor->compress(res.body.data(), res.body.size(), true,
+                                 [&](const char *data, size_t data_len) {
+                                   compressed.append(data, data_len);
+                                   return true;
+                                 })) {
+          res.body.swap(compressed);
+          res.set_header("Content-Encoding", content_encoding);
+        }
+      }
+    }
+
+    auto length = std::to_string(res.body.size());
+    res.set_header("Content-Length", length);
+  }
+}
+
+inline bool Server::dispatch_request_for_content_reader(
+    Request &req, Response &res, ContentReader content_reader,
+    const HandlersForContentReader &handlers) const {
+  for (const auto &x : handlers) {
+    const auto &matcher = x.first;
+    const auto &handler = x.second;
+
+    if (matcher->match(req)) {
+      handler(req, res, content_reader);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline bool
+Server::process_request(Stream &strm, const std::string &remote_addr,
+                        int remote_port, const std::string &local_addr,
+                        int local_port, bool close_connection,
+                        bool &connection_closed,
+                        const std::function<void(Request &)> &setup_request) {
+  std::array<char, 2048> buf{};
+
+  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
+
+  // Connection has been closed on client
+  if (!line_reader.getline()) { return false; }
+
+  Request req;
+
+  Response res;
+  res.version = "HTTP/1.1";
+  res.headers = default_headers_;
+
+#ifdef _WIN32
+  // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL).
+#else
+#ifndef CPPHTTPLIB_USE_POLL
+  // Socket file descriptor exceeded FD_SETSIZE...
+  if (strm.socket() >= FD_SETSIZE) {
+    Headers dummy;
+    detail::read_headers(strm, dummy);
+    res.status = StatusCode::InternalServerError_500;
+    return write_response(strm, close_connection, req, res);
+  }
+#endif
+#endif
+
+  // Check if the request URI doesn't exceed the limit
+  if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
+    Headers dummy;
+    detail::read_headers(strm, dummy);
+    res.status = StatusCode::UriTooLong_414;
+    return write_response(strm, close_connection, req, res);
+  }
+
+  // Request line and headers
+  if (!parse_request_line(line_reader.ptr(), req) ||
+      !detail::read_headers(strm, req.headers)) {
+    res.status = StatusCode::BadRequest_400;
+    return write_response(strm, close_connection, req, res);
+  }
+
+  if (req.get_header_value("Connection") == "close") {
+    connection_closed = true;
+  }
+
+  if (req.version == "HTTP/1.0" &&
+      req.get_header_value("Connection") != "Keep-Alive") {
+    connection_closed = true;
+  }
+
+  req.remote_addr = remote_addr;
+  req.remote_port = remote_port;
+  req.set_header("REMOTE_ADDR", req.remote_addr);
+  req.set_header("REMOTE_PORT", std::to_string(req.remote_port));
+
+  req.local_addr = local_addr;
+  req.local_port = local_port;
+  req.set_header("LOCAL_ADDR", req.local_addr);
+  req.set_header("LOCAL_PORT", std::to_string(req.local_port));
+
+  if (req.has_header("Range")) {
+    const auto &range_header_value = req.get_header_value("Range");
+    if (!detail::parse_range_header(range_header_value, req.ranges)) {
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      return write_response(strm, close_connection, req, res);
+    }
+  }
+
+  if (setup_request) { setup_request(req); }
+
+  if (req.get_header_value("Expect") == "100-continue") {
+    int status = StatusCode::Continue_100;
+    if (expect_100_continue_handler_) {
+      status = expect_100_continue_handler_(req, res);
+    }
+    switch (status) {
+    case StatusCode::Continue_100:
+    case StatusCode::ExpectationFailed_417:
+      detail::write_response_line(strm, status);
+      strm.write("\r\n");
+      break;
+    default:
+      connection_closed = true;
+      return write_response(strm, true, req, res);
+    }
+  }
+
+  // Routing
+  auto routed = false;
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+  routed = routing(req, res, strm);
+#else
+  try {
+    routed = routing(req, res, strm);
+  } catch (std::exception &e) {
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      std::string val;
+      auto s = e.what();
+      for (size_t i = 0; s[i]; i++) {
+        switch (s[i]) {
+        case '\r': val += "\\r"; break;
+        case '\n': val += "\\n"; break;
+        default: val += s[i]; break;
+        }
+      }
+      res.set_header("EXCEPTION_WHAT", val);
+    }
+  } catch (...) {
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
+    }
+  }
+#endif
+  if (routed) {
+    if (res.status == -1) {
+      res.status = req.ranges.empty() ? StatusCode::OK_200
+                                      : StatusCode::PartialContent_206;
+    }
+
+    if (detail::range_error(req, res)) {
+      res.body.clear();
+      res.content_length_ = 0;
+      res.content_provider_ = nullptr;
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      return write_response(strm, close_connection, req, res);
+    }
+
+    // Serve file content by using a content provider
+    if (!res.file_content_path_.empty()) {
+      const auto &path = res.file_content_path_;
+      auto mm = std::make_shared<detail::mmap>(path.c_str());
+      if (!mm->is_open()) {
+        res.body.clear();
+        res.content_length_ = 0;
+        res.content_provider_ = nullptr;
+        res.status = StatusCode::NotFound_404;
+        return write_response(strm, close_connection, req, res);
+      }
+
+      auto content_type = res.file_content_content_type_;
+      if (content_type.empty()) {
+        content_type = detail::find_content_type(
+            path, file_extension_and_mimetype_map_, default_file_mimetype_);
+      }
+
+      res.set_content_provider(
+          mm->size(), content_type,
+          [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+            sink.write(mm->data() + offset, length);
+            return true;
+          });
+    }
+
+    return write_response_with_content(strm, close_connection, req, res);
+  } else {
+    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
+
+    return write_response(strm, close_connection, req, res);
+  }
+}
+
+inline bool Server::is_valid() const { return true; }
+
+inline bool Server::process_and_close_socket(socket_t sock) {
+  std::string remote_addr;
+  int remote_port = 0;
+  detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
+
+  std::string local_addr;
+  int local_port = 0;
+  detail::get_local_ip_and_port(sock, local_addr, local_port);
+
+  auto ret = detail::process_server_socket(
+      svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
+      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_,
+      [&](Stream &strm, bool close_connection, bool &connection_closed) {
+        return process_request(strm, remote_addr, remote_port, local_addr,
+                               local_port, close_connection, connection_closed,
+                               nullptr);
+      });
+
+  detail::shutdown_socket(sock);
+  detail::close_socket(sock);
+  return ret;
+}
+
+// HTTP client implementation
+inline ClientImpl::ClientImpl(const std::string &host)
+    : ClientImpl(host, 80, std::string(), std::string()) {}
+
+inline ClientImpl::ClientImpl(const std::string &host, int port)
+    : ClientImpl(host, port, std::string(), std::string()) {}
+
+inline ClientImpl::ClientImpl(const std::string &host, int port,
+                              const std::string &client_cert_path,
+                              const std::string &client_key_path)
+    : host_(detail::escape_abstract_namespace_unix_domain(host)), port_(port),
+      host_and_port_(adjust_host_string(host_) + ":" + std::to_string(port)),
+      client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
+
+inline ClientImpl::~ClientImpl() {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  shutdown_socket(socket_);
+  close_socket(socket_);
+}
+
+inline bool ClientImpl::is_valid() const { return true; }
+
+inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
+  client_cert_path_ = rhs.client_cert_path_;
+  client_key_path_ = rhs.client_key_path_;
+  connection_timeout_sec_ = rhs.connection_timeout_sec_;
+  read_timeout_sec_ = rhs.read_timeout_sec_;
+  read_timeout_usec_ = rhs.read_timeout_usec_;
+  write_timeout_sec_ = rhs.write_timeout_sec_;
+  write_timeout_usec_ = rhs.write_timeout_usec_;
+  basic_auth_username_ = rhs.basic_auth_username_;
+  basic_auth_password_ = rhs.basic_auth_password_;
+  bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  digest_auth_username_ = rhs.digest_auth_username_;
+  digest_auth_password_ = rhs.digest_auth_password_;
+#endif
+  keep_alive_ = rhs.keep_alive_;
+  follow_location_ = rhs.follow_location_;
+  url_encode_ = rhs.url_encode_;
+  address_family_ = rhs.address_family_;
+  tcp_nodelay_ = rhs.tcp_nodelay_;
+  ipv6_v6only_ = rhs.ipv6_v6only_;
+  socket_options_ = rhs.socket_options_;
+  compress_ = rhs.compress_;
+  decompress_ = rhs.decompress_;
+  interface_ = rhs.interface_;
+  proxy_host_ = rhs.proxy_host_;
+  proxy_port_ = rhs.proxy_port_;
+  proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
+  proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
+  proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
+  proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
+#endif
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  ca_cert_file_path_ = rhs.ca_cert_file_path_;
+  ca_cert_dir_path_ = rhs.ca_cert_dir_path_;
+  ca_cert_store_ = rhs.ca_cert_store_;
+#endif
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  server_certificate_verification_ = rhs.server_certificate_verification_;
+  server_hostname_verification_ = rhs.server_hostname_verification_;
+  server_certificate_verifier_ = rhs.server_certificate_verifier_;
+#endif
+  logger_ = rhs.logger_;
+}
+
+inline socket_t ClientImpl::create_client_socket(Error &error) const {
+  if (!proxy_host_.empty() && proxy_port_ != -1) {
+    return detail::create_client_socket(
+        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
+        ipv6_v6only_, socket_options_, connection_timeout_sec_,
+        connection_timeout_usec_, read_timeout_sec_, read_timeout_usec_,
+        write_timeout_sec_, write_timeout_usec_, interface_, error);
+  }
+
+  // Check is custom IP specified for host_
+  std::string ip;
+  auto it = addr_map_.find(host_);
+  if (it != addr_map_.end()) { ip = it->second; }
+
+  return detail::create_client_socket(
+      host_, ip, port_, address_family_, tcp_nodelay_, ipv6_v6only_,
+      socket_options_, connection_timeout_sec_, connection_timeout_usec_,
+      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_, interface_, error);
+}
+
+inline bool ClientImpl::create_and_connect_socket(Socket &socket,
+                                                  Error &error) {
+  auto sock = create_client_socket(error);
+  if (sock == INVALID_SOCKET) { return false; }
+  socket.sock = sock;
+  return true;
+}
+
+inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
+                                     bool /*shutdown_gracefully*/) {
+  // If there are any requests in flight from threads other than us, then it's
+  // a thread-unsafe race because individual ssl* objects are not thread-safe.
+  assert(socket_requests_in_flight_ == 0 ||
+         socket_requests_are_from_thread_ == std::this_thread::get_id());
+}
+
+inline void ClientImpl::shutdown_socket(Socket &socket) const {
+  if (socket.sock == INVALID_SOCKET) { return; }
+  detail::shutdown_socket(socket.sock);
+}
+
+inline void ClientImpl::close_socket(Socket &socket) {
+  // If there are requests in flight in another thread, usually closing
+  // the socket will be fine and they will simply receive an error when
+  // using the closed socket, but it is still a bug since rarely the OS
+  // may reassign the socket id to be used for a new socket, and then
+  // suddenly they will be operating on a live socket that is different
+  // than the one they intended!
+  assert(socket_requests_in_flight_ == 0 ||
+         socket_requests_are_from_thread_ == std::this_thread::get_id());
+
+  // It is also a bug if this happens while SSL is still active
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  assert(socket.ssl == nullptr);
+#endif
+  if (socket.sock == INVALID_SOCKET) { return; }
+  detail::close_socket(socket.sock);
+  socket.sock = INVALID_SOCKET;
+}
+
+inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
+                                           Response &res) const {
+  std::array<char, 2048> buf{};
+
+  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
+
+  if (!line_reader.getline()) { return false; }
+
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
+#else
+  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
+#endif
+
+  std::cmatch m;
+  if (!std::regex_match(line_reader.ptr(), m, re)) {
+    return req.method == "CONNECT";
+  }
+  res.version = std::string(m[1]);
+  res.status = std::stoi(std::string(m[2]));
+  res.reason = std::string(m[3]);
+
+  // Ignore '100 Continue'
+  while (res.status == StatusCode::Continue_100) {
+    if (!line_reader.getline()) { return false; } // CRLF
+    if (!line_reader.getline()) { return false; } // next response line
+
+    if (!std::regex_match(line_reader.ptr(), m, re)) { return false; }
+    res.version = std::string(m[1]);
+    res.status = std::stoi(std::string(m[2]));
+    res.reason = std::string(m[3]);
+  }
+
+  return true;
+}
+
+inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
+  std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
+  auto ret = send_(req, res, error);
+  if (error == Error::SSLPeerCouldBeClosed_) {
+    assert(!ret);
+    ret = send_(req, res, error);
+  }
+  return ret;
+}
+
+inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
+  {
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+
+    // Set this to false immediately - if it ever gets set to true by the end of
+    // the request, we know another thread instructed us to close the socket.
+    socket_should_be_closed_when_request_is_done_ = false;
+
+    auto is_alive = false;
+    if (socket_.is_open()) {
+      is_alive = detail::is_socket_alive(socket_.sock);
+      if (!is_alive) {
+        // Attempt to avoid sigpipe by shutting down nongracefully if it seems
+        // like the other side has already closed the connection Also, there
+        // cannot be any requests in flight from other threads since we locked
+        // request_mutex_, so safe to close everything immediately
+        const bool shutdown_gracefully = false;
+        shutdown_ssl(socket_, shutdown_gracefully);
+        shutdown_socket(socket_);
+        close_socket(socket_);
+      }
+    }
+
+    if (!is_alive) {
+      if (!create_and_connect_socket(socket_, error)) { return false; }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      // TODO: refactoring
+      if (is_ssl()) {
+        auto &scli = static_cast<SSLClient &>(*this);
+        if (!proxy_host_.empty() && proxy_port_ != -1) {
+          auto success = false;
+          if (!scli.connect_with_proxy(socket_, res, success, error)) {
+            return success;
+          }
+        }
+
+        if (!scli.initialize_ssl(socket_, error)) { return false; }
+      }
+#endif
+    }
+
+    // Mark the current socket as being in use so that it cannot be closed by
+    // anyone else while this request is ongoing, even though we will be
+    // releasing the mutex.
+    if (socket_requests_in_flight_ > 1) {
+      assert(socket_requests_are_from_thread_ == std::this_thread::get_id());
+    }
+    socket_requests_in_flight_ += 1;
+    socket_requests_are_from_thread_ = std::this_thread::get_id();
+  }
+
+  for (const auto &header : default_headers_) {
+    if (req.headers.find(header.first) == req.headers.end()) {
+      req.headers.insert(header);
+    }
+  }
+
+  auto ret = false;
+  auto close_connection = !keep_alive_;
+
+  auto se = detail::scope_exit([&]() {
+    // Briefly lock mutex in order to mark that a request is no longer ongoing
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    socket_requests_in_flight_ -= 1;
+    if (socket_requests_in_flight_ <= 0) {
+      assert(socket_requests_in_flight_ == 0);
+      socket_requests_are_from_thread_ = std::thread::id();
+    }
+
+    if (socket_should_be_closed_when_request_is_done_ || close_connection ||
+        !ret) {
+      shutdown_ssl(socket_, true);
+      shutdown_socket(socket_);
+      close_socket(socket_);
+    }
+  });
+
+  ret = process_socket(socket_, [&](Stream &strm) {
+    return handle_request(strm, req, res, close_connection, error);
+  });
+
+  if (!ret) {
+    if (error == Error::Success) { error = Error::Unknown; }
+  }
+
+  return ret;
+}
+
+inline Result ClientImpl::send(const Request &req) {
+  auto req2 = req;
+  return send_(std::move(req2));
+}
+
+inline Result ClientImpl::send_(Request &&req) {
+  auto res = detail::make_unique<Response>();
+  auto error = Error::Success;
+  auto ret = send(req, *res, error);
+  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)};
+}
+
+inline bool ClientImpl::handle_request(Stream &strm, Request &req,
+                                       Response &res, bool close_connection,
+                                       Error &error) {
+  if (req.path.empty()) {
+    error = Error::Connection;
+    return false;
+  }
+
+  auto req_save = req;
+
+  bool ret;
+
+  if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) {
+    auto req2 = req;
+    req2.path = "http://" + host_and_port_ + req.path;
+    ret = process_request(strm, req2, res, close_connection, error);
+    req = req2;
+    req.path = req_save.path;
+  } else {
+    ret = process_request(strm, req, res, close_connection, error);
+  }
+
+  if (!ret) { return false; }
+
+  if (res.get_header_value("Connection") == "close" ||
+      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
+    // TODO this requires a not-entirely-obvious chain of calls to be correct
+    // for this to be safe.
+
+    // This is safe to call because handle_request is only called by send_
+    // which locks the request mutex during the process. It would be a bug
+    // to call it from a different thread since it's a thread-safety issue
+    // to do these things to the socket if another thread is using the socket.
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    shutdown_ssl(socket_, true);
+    shutdown_socket(socket_);
+    close_socket(socket_);
+  }
+
+  if (300 < res.status && res.status < 400 && follow_location_) {
+    req = req_save;
+    ret = redirect(req, res, error);
+  }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if ((res.status == StatusCode::Unauthorized_401 ||
+       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
+      req.authorization_count_ < 5) {
+    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
+    const auto &username =
+        is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
+    const auto &password =
+        is_proxy ? proxy_digest_auth_password_ : digest_auth_password_;
+
+    if (!username.empty() && !password.empty()) {
+      std::map<std::string, std::string> auth;
+      if (detail::parse_www_authenticate(res, auth, is_proxy)) {
+        Request new_req = req;
+        new_req.authorization_count_ += 1;
+        new_req.headers.erase(is_proxy ? "Proxy-Authorization"
+                                       : "Authorization");
+        new_req.headers.insert(detail::make_digest_authentication_header(
+            req, auth, new_req.authorization_count_, detail::random_string(10),
+            username, password, is_proxy));
+
+        Response new_res;
+
+        ret = send(new_req, new_res, error);
+        if (ret) { res = new_res; }
+      }
+    }
+  }
+#endif
+
+  return ret;
+}
+
+inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
+  if (req.redirect_count_ == 0) {
+    error = Error::ExceedRedirectCount;
+    return false;
+  }
+
+  auto location = res.get_header_value("location");
+  if (location.empty()) { return false; }
+
+  const static std::regex re(
+      R"((?:(https?):)?(?://(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
+
+  std::smatch m;
+  if (!std::regex_match(location, m, re)) { return false; }
+
+  auto scheme = is_ssl() ? "https" : "http";
+
+  auto next_scheme = m[1].str();
+  auto next_host = m[2].str();
+  if (next_host.empty()) { next_host = m[3].str(); }
+  auto port_str = m[4].str();
+  auto next_path = m[5].str();
+  auto next_query = m[6].str();
+
+  auto next_port = port_;
+  if (!port_str.empty()) {
+    next_port = std::stoi(port_str);
+  } else if (!next_scheme.empty()) {
+    next_port = next_scheme == "https" ? 443 : 80;
+  }
+
+  if (next_scheme.empty()) { next_scheme = scheme; }
+  if (next_host.empty()) { next_host = host_; }
+  if (next_path.empty()) { next_path = "/"; }
+
+  auto path = detail::decode_url(next_path, true) + next_query;
+
+  if (next_scheme == scheme && next_host == host_ && next_port == port_) {
+    return detail::redirect(*this, req, res, path, location, error);
+  } else {
+    if (next_scheme == "https") {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      SSLClient cli(next_host, next_port);
+      cli.copy_settings(*this);
+      if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); }
+      return detail::redirect(cli, req, res, path, location, error);
+#else
+      return false;
+#endif
+    } else {
+      ClientImpl cli(next_host, next_port);
+      cli.copy_settings(*this);
+      return detail::redirect(cli, req, res, path, location, error);
+    }
+  }
+}
+
+inline bool ClientImpl::write_content_with_provider(Stream &strm,
+                                                    const Request &req,
+                                                    Error &error) const {
+  auto is_shutting_down = []() { return false; };
+
+  if (req.is_chunked_content_provider_) {
+    // TODO: Brotli support
+    std::unique_ptr<detail::compressor> compressor;
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+    if (compress_) {
+      compressor = detail::make_unique<detail::gzip_compressor>();
+    } else
+#endif
+    {
+      compressor = detail::make_unique<detail::nocompressor>();
+    }
+
+    return detail::write_content_chunked(strm, req.content_provider_,
+                                         is_shutting_down, *compressor, error);
+  } else {
+    return detail::write_content(strm, req.content_provider_, 0,
+                                 req.content_length_, is_shutting_down, error);
+  }
+}
+
+inline bool ClientImpl::write_request(Stream &strm, Request &req,
+                                      bool close_connection, Error &error) {
+  // Prepare additional headers
+  if (close_connection) {
+    if (!req.has_header("Connection")) {
+      req.set_header("Connection", "close");
+    }
+  }
+
+  if (!req.has_header("Host")) {
+    if (is_ssl()) {
+      if (port_ == 443) {
+        req.set_header("Host", host_);
+      } else {
+        req.set_header("Host", host_and_port_);
+      }
+    } else {
+      if (port_ == 80) {
+        req.set_header("Host", host_);
+      } else {
+        req.set_header("Host", host_and_port_);
+      }
+    }
+  }
+
+  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
+
+#ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
+  if (!req.has_header("User-Agent")) {
+    auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
+    req.set_header("User-Agent", agent);
+  }
+#endif
+
+  if (req.body.empty()) {
+    if (req.content_provider_) {
+      if (!req.is_chunked_content_provider_) {
+        if (!req.has_header("Content-Length")) {
+          auto length = std::to_string(req.content_length_);
+          req.set_header("Content-Length", length);
+        }
+      }
+    } else {
+      if (req.method == "POST" || req.method == "PUT" ||
+          req.method == "PATCH") {
+        req.set_header("Content-Length", "0");
+      }
+    }
+  } else {
+    if (!req.has_header("Content-Type")) {
+      req.set_header("Content-Type", "text/plain");
+    }
+
+    if (!req.has_header("Content-Length")) {
+      auto length = std::to_string(req.body.size());
+      req.set_header("Content-Length", length);
+    }
+  }
+
+  if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) {
+    if (!req.has_header("Authorization")) {
+      req.headers.insert(make_basic_authentication_header(
+          basic_auth_username_, basic_auth_password_, false));
+    }
+  }
+
+  if (!proxy_basic_auth_username_.empty() &&
+      !proxy_basic_auth_password_.empty()) {
+    if (!req.has_header("Proxy-Authorization")) {
+      req.headers.insert(make_basic_authentication_header(
+          proxy_basic_auth_username_, proxy_basic_auth_password_, true));
+    }
+  }
+
+  if (!bearer_token_auth_token_.empty()) {
+    if (!req.has_header("Authorization")) {
+      req.headers.insert(make_bearer_token_authentication_header(
+          bearer_token_auth_token_, false));
+    }
+  }
+
+  if (!proxy_bearer_token_auth_token_.empty()) {
+    if (!req.has_header("Proxy-Authorization")) {
+      req.headers.insert(make_bearer_token_authentication_header(
+          proxy_bearer_token_auth_token_, true));
+    }
+  }
+
+  // Request line and headers
+  {
+    detail::BufferStream bstrm;
+
+    const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path;
+    detail::write_request_line(bstrm, req.method, path);
+
+    header_writer_(bstrm, req.headers);
+
+    // Flush buffer
+    auto &data = bstrm.get_buffer();
+    if (!detail::write_data(strm, data.data(), data.size())) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  // Body
+  if (req.body.empty()) {
+    return write_content_with_provider(strm, req, error);
+  }
+
+  if (!detail::write_data(strm, req.body.data(), req.body.size())) {
+    error = Error::Write;
+    return false;
+  }
+
+  return true;
+}
+
+inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
+    Request &req, const char *body, size_t content_length,
+    ContentProvider content_provider,
+    ContentProviderWithoutLength content_provider_without_length,
+    const std::string &content_type, Error &error) {
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  if (compress_ && !content_provider_without_length) {
+    // TODO: Brotli support
+    detail::gzip_compressor compressor;
+
+    if (content_provider) {
+      auto ok = true;
+      size_t offset = 0;
+      DataSink data_sink;
+
+      data_sink.write = [&](const char *data, size_t data_len) -> bool {
+        if (ok) {
+          auto last = offset + data_len == content_length;
+
+          auto ret = compressor.compress(
+              data, data_len, last,
+              [&](const char *compressed_data, size_t compressed_data_len) {
+                req.body.append(compressed_data, compressed_data_len);
+                return true;
+              });
+
+          if (ret) {
+            offset += data_len;
+          } else {
+            ok = false;
+          }
+        }
+        return ok;
+      };
+
+      while (ok && offset < content_length) {
+        if (!content_provider(offset, content_length - offset, data_sink)) {
+          error = Error::Canceled;
+          return nullptr;
+        }
+      }
+    } else {
+      if (!compressor.compress(body, content_length, true,
+                               [&](const char *data, size_t data_len) {
+                                 req.body.append(data, data_len);
+                                 return true;
+                               })) {
+        error = Error::Compression;
+        return nullptr;
+      }
+    }
+  } else
+#endif
+  {
+    if (content_provider) {
+      req.content_length_ = content_length;
+      req.content_provider_ = std::move(content_provider);
+      req.is_chunked_content_provider_ = false;
+    } else if (content_provider_without_length) {
+      req.content_length_ = 0;
+      req.content_provider_ = detail::ContentProviderAdapter(
+          std::move(content_provider_without_length));
+      req.is_chunked_content_provider_ = true;
+      req.set_header("Transfer-Encoding", "chunked");
+    } else {
+      req.body.assign(body, content_length);
+    }
+  }
+
+  auto res = detail::make_unique<Response>();
+  return send(req, *res, error) ? std::move(res) : nullptr;
+}
+
+inline Result ClientImpl::send_with_content_provider(
+    const std::string &method, const std::string &path, const Headers &headers,
+    const char *body, size_t content_length, ContentProvider content_provider,
+    ContentProviderWithoutLength content_provider_without_length,
+    const std::string &content_type, Progress progress) {
+  Request req;
+  req.method = method;
+  req.headers = headers;
+  req.path = path;
+  req.progress = progress;
+
+  auto error = Error::Success;
+
+  auto res = send_with_content_provider(
+      req, body, content_length, std::move(content_provider),
+      std::move(content_provider_without_length), content_type, error);
+
+  return Result{std::move(res), error, std::move(req.headers)};
+}
+
+inline std::string
+ClientImpl::adjust_host_string(const std::string &host) const {
+  if (host.find(':') != std::string::npos) { return "[" + host + "]"; }
+  return host;
+}
+
+inline bool ClientImpl::process_request(Stream &strm, Request &req,
+                                        Response &res, bool close_connection,
+                                        Error &error) {
+  // Send request
+  if (!write_request(strm, req, close_connection, error)) { return false; }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if (is_ssl()) {
+    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
+    if (!is_proxy_enabled) {
+      char buf[1];
+      if (SSL_peek(socket_.ssl, buf, 1) == 0 &&
+          SSL_get_error(socket_.ssl, 0) == SSL_ERROR_ZERO_RETURN) {
+        error = Error::SSLPeerCouldBeClosed_;
+        return false;
+      }
+    }
+  }
+#endif
+
+  // Receive response and headers
+  if (!read_response_line(strm, req, res) ||
+      !detail::read_headers(strm, res.headers)) {
+    error = Error::Read;
+    return false;
+  }
+
+  // Body
+  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
+      req.method != "CONNECT") {
+    auto redirect = 300 < res.status && res.status < 400 && follow_location_;
+
+    if (req.response_handler && !redirect) {
+      if (!req.response_handler(res)) {
+        error = Error::Canceled;
+        return false;
+      }
+    }
+
+    auto out =
+        req.content_receiver
+            ? static_cast<ContentReceiverWithProgress>(
+                  [&](const char *buf, size_t n, uint64_t off, uint64_t len) {
+                    if (redirect) { return true; }
+                    auto ret = req.content_receiver(buf, n, off, len);
+                    if (!ret) { error = Error::Canceled; }
+                    return ret;
+                  })
+            : static_cast<ContentReceiverWithProgress>(
+                  [&](const char *buf, size_t n, uint64_t /*off*/,
+                      uint64_t /*len*/) {
+                    if (res.body.size() + n > res.body.max_size()) {
+                      return false;
+                    }
+                    res.body.append(buf, n);
+                    return true;
+                  });
+
+    auto progress = [&](uint64_t current, uint64_t total) {
+      if (!req.progress || redirect) { return true; }
+      auto ret = req.progress(current, total);
+      if (!ret) { error = Error::Canceled; }
+      return ret;
+    };
+
+    if (res.has_header("Content-Length")) {
+      if (!req.content_receiver) {
+        auto len = std::min<size_t>(res.get_header_value_u64("Content-Length"),
+                                    res.body.max_size());
+        if (len > 0) { res.body.reserve(len); }
+      }
+    }
+
+    int dummy_status;
+    if (!detail::read_content(strm, res, (std::numeric_limits<size_t>::max)(),
+                              dummy_status, std::move(progress), std::move(out),
+                              decompress_)) {
+      if (error != Error::Canceled) { error = Error::Read; }
+      return false;
+    }
+  }
+
+  // Log
+  if (logger_) { logger_(req, res); }
+
+  return true;
+}
+
+inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
+    const std::string &boundary, const MultipartFormDataItems &items,
+    const MultipartFormDataProviderItems &provider_items) const {
+  size_t cur_item = 0;
+  size_t cur_start = 0;
+  // cur_item and cur_start are copied to within the std::function and maintain
+  // state between successive calls
+  return [&, cur_item, cur_start](size_t offset,
+                                  DataSink &sink) mutable -> bool {
+    if (!offset && !items.empty()) {
+      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
+      return true;
+    } else if (cur_item < provider_items.size()) {
+      if (!cur_start) {
+        const auto &begin = detail::serialize_multipart_formdata_item_begin(
+            provider_items[cur_item], boundary);
+        offset += begin.size();
+        cur_start = offset;
+        sink.os << begin;
+      }
+
+      DataSink cur_sink;
+      auto has_data = true;
+      cur_sink.write = sink.write;
+      cur_sink.done = [&]() { has_data = false; };
+
+      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
+        return false;
+      }
+
+      if (!has_data) {
+        sink.os << detail::serialize_multipart_formdata_item_end();
+        cur_item++;
+        cur_start = 0;
+      }
+      return true;
+    } else {
+      sink.os << detail::serialize_multipart_formdata_finish(boundary);
+      sink.done();
+      return true;
+    }
+  };
+}
+
+inline bool
+ClientImpl::process_socket(const Socket &socket,
+                           std::function<bool(Stream &strm)> callback) {
+  return detail::process_client_socket(
+      socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_, std::move(callback));
+}
+
+inline bool ClientImpl::is_ssl() const { return false; }
+
+inline Result ClientImpl::Get(const std::string &path) {
+  return Get(path, Headers(), Progress());
+}
+
+inline Result ClientImpl::Get(const std::string &path, Progress progress) {
+  return Get(path, Headers(), std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers) {
+  return Get(path, headers, Progress());
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              Progress progress) {
+  Request req;
+  req.method = "GET";
+  req.path = path;
+  req.headers = headers;
+  req.progress = std::move(progress);
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ContentReceiver content_receiver) {
+  return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, Headers(), nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ContentReceiver content_receiver) {
+  return Get(path, headers, nullptr, std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver) {
+  return Get(path, Headers(), std::move(response_handler),
+             std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver) {
+  return Get(path, headers, std::move(response_handler),
+             std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, Headers(), std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  Request req;
+  req.method = "GET";
+  req.path = path;
+  req.headers = headers;
+  req.response_handler = std::move(response_handler);
+  req.content_receiver =
+      [content_receiver](const char *data, size_t data_length,
+                         uint64_t /*offset*/, uint64_t /*total_length*/) {
+        return content_receiver(data, data_length);
+      };
+  req.progress = std::move(progress);
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers, Progress progress) {
+  if (params.empty()) { return Get(path, headers); }
+
+  std::string path_with_query = append_query_params(path, params);
+  return Get(path_with_query, headers, std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, params, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  if (params.empty()) {
+    return Get(path, headers, std::move(response_handler),
+               std::move(content_receiver), std::move(progress));
+  }
+
+  std::string path_with_query = append_query_params(path, params);
+  return Get(path_with_query, headers, std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
+}
+
+inline Result ClientImpl::Head(const std::string &path) {
+  return Head(path, Headers());
+}
+
+inline Result ClientImpl::Head(const std::string &path,
+                               const Headers &headers) {
+  Request req;
+  req.method = "HEAD";
+  req.headers = headers;
+  req.path = path;
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Post(const std::string &path) {
+  return Post(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               const Headers &headers) {
+  return Post(path, headers, nullptr, 0, std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path, const char *body,
+                               size_t content_length,
+                               const std::string &content_type) {
+  return Post(path, Headers(), body, content_length, content_type, nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const char *body, size_t content_length,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const char *body, size_t content_length,
+                               const std::string &content_type,
+                               Progress progress) {
+  return send_with_content_provider("POST", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const std::string &body,
+                               const std::string &content_type) {
+  return Post(path, Headers(), body, content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const std::string &body,
+                               const std::string &content_type,
+                               Progress progress) {
+  return Post(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const std::string &body,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const std::string &body,
+                               const std::string &content_type,
+                               Progress progress) {
+  return send_with_content_provider("POST", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Params &params) {
+  return Post(path, Headers(), params);
+}
+
+inline Result ClientImpl::Post(const std::string &path, size_t content_length,
+                               ContentProvider content_provider,
+                               const std::string &content_type) {
+  return Post(path, Headers(), content_length, std::move(content_provider),
+              content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               ContentProviderWithoutLength content_provider,
+                               const std::string &content_type) {
+  return Post(path, Headers(), std::move(content_provider), content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               size_t content_length,
+                               ContentProvider content_provider,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               ContentProviderWithoutLength content_provider,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Post(path, headers, query, "application/x-www-form-urlencoded");
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const Params &params, Progress progress) {
+  auto query = detail::params_to_query_str(params);
+  return Post(path, headers, query, "application/x-www-form-urlencoded",
+              progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               const MultipartFormDataItems &items) {
+  return Post(path, Headers(), items);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const MultipartFormDataItems &items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const MultipartFormDataItems &items,
+                               const std::string &boundary) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type);
+}
+
+inline Result
+ClientImpl::Post(const std::string &path, const Headers &headers,
+                 const MultipartFormDataItems &items,
+                 const MultipartFormDataProviderItems &provider_items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "POST", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path) {
+  return Put(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Put(const std::string &path, const char *body,
+                              size_t content_length,
+                              const std::string &content_type) {
+  return Put(path, Headers(), body, content_length, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const char *body, size_t content_length,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const char *body, size_t content_length,
+                              const std::string &content_type,
+                              Progress progress) {
+  return send_with_content_provider("PUT", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const std::string &body,
+                              const std::string &content_type) {
+  return Put(path, Headers(), body, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const std::string &body,
+                              const std::string &content_type,
+                              Progress progress) {
+  return Put(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const std::string &body,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const std::string &body,
+                              const std::string &content_type,
+                              Progress progress) {
+  return send_with_content_provider("PUT", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path, size_t content_length,
+                              ContentProvider content_provider,
+                              const std::string &content_type) {
+  return Put(path, Headers(), content_length, std::move(content_provider),
+             content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path,
+                              ContentProviderWithoutLength content_provider,
+                              const std::string &content_type) {
+  return Put(path, Headers(), std::move(content_provider), content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              size_t content_length,
+                              ContentProvider content_provider,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              ContentProviderWithoutLength content_provider,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Params &params) {
+  return Put(path, Headers(), params);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Put(path, headers, query, "application/x-www-form-urlencoded");
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const Params &params, Progress progress) {
+  auto query = detail::params_to_query_str(params);
+  return Put(path, headers, query, "application/x-www-form-urlencoded",
+             progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path,
+                              const MultipartFormDataItems &items) {
+  return Put(path, Headers(), items);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const MultipartFormDataItems &items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const MultipartFormDataItems &items,
+                              const std::string &boundary) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type);
+}
+
+inline Result
+ClientImpl::Put(const std::string &path, const Headers &headers,
+                const MultipartFormDataItems &items,
+                const MultipartFormDataProviderItems &provider_items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "PUT", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, nullptr);
+}
+inline Result ClientImpl::Patch(const std::string &path) {
+  return Patch(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const char *body,
+                                size_t content_length,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), body, content_length, content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const char *body,
+                                size_t content_length,
+                                const std::string &content_type,
+                                Progress progress) {
+  return Patch(path, Headers(), body, content_length, content_type, progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const char *body, size_t content_length,
+                                const std::string &content_type) {
+  return Patch(path, headers, body, content_length, content_type, nullptr);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const char *body, size_t content_length,
+                                const std::string &content_type,
+                                Progress progress) {
+  return send_with_content_provider("PATCH", path, headers, body,
+                                    content_length, nullptr, nullptr,
+                                    content_type, progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path,
+                                const std::string &body,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), body, content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path,
+                                const std::string &body,
+                                const std::string &content_type,
+                                Progress progress) {
+  return Patch(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const std::string &body,
+                                const std::string &content_type) {
+  return Patch(path, headers, body, content_type, nullptr);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const std::string &body,
+                                const std::string &content_type,
+                                Progress progress) {
+  return send_with_content_provider("PATCH", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
+                                ContentProvider content_provider,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), content_length, std::move(content_provider),
+               content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path,
+                                ContentProviderWithoutLength content_provider,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), std::move(content_provider), content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                size_t content_length,
+                                ContentProvider content_provider,
+                                const std::string &content_type) {
+  return send_with_content_provider("PATCH", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                ContentProviderWithoutLength content_provider,
+                                const std::string &content_type) {
+  return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Delete(const std::string &path) {
+  return Delete(path, Headers(), std::string(), std::string());
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers) {
+  return Delete(path, headers, std::string(), std::string());
+}
+
+inline Result ClientImpl::Delete(const std::string &path, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type) {
+  return Delete(path, Headers(), body, content_length, content_type);
+}
+
+inline Result ClientImpl::Delete(const std::string &path, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  return Delete(path, Headers(), body, content_length, content_type, progress);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type) {
+  return Delete(path, headers, body, content_length, content_type, nullptr);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  Request req;
+  req.method = "DELETE";
+  req.headers = headers;
+  req.path = path;
+  req.progress = progress;
+
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+  req.body.assign(body, content_length);
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const std::string &body,
+                                 const std::string &content_type) {
+  return Delete(path, Headers(), body.data(), body.size(), content_type);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const std::string &body,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  return Delete(path, Headers(), body.data(), body.size(), content_type,
+                progress);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
+                                 const std::string &body,
+                                 const std::string &content_type) {
+  return Delete(path, headers, body.data(), body.size(), content_type);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
+                                 const std::string &body,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  return Delete(path, headers, body.data(), body.size(), content_type,
+                progress);
+}
+
+inline Result ClientImpl::Options(const std::string &path) {
+  return Options(path, Headers());
+}
+
+inline Result ClientImpl::Options(const std::string &path,
+                                  const Headers &headers) {
+  Request req;
+  req.method = "OPTIONS";
+  req.headers = headers;
+  req.path = path;
+
+  return send_(std::move(req));
+}
+
+inline void ClientImpl::stop() {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+
+  // If there is anything ongoing right now, the ONLY thread-safe thing we can
+  // do is to shutdown_socket, so that threads using this socket suddenly
+  // discover they can't read/write any more and error out. Everything else
+  // (closing the socket, shutting ssl down) is unsafe because these actions are
+  // not thread-safe.
+  if (socket_requests_in_flight_ > 0) {
+    shutdown_socket(socket_);
+
+    // Aside from that, we set a flag for the socket to be closed when we're
+    // done.
+    socket_should_be_closed_when_request_is_done_ = true;
+    return;
+  }
+
+  // Otherwise, still holding the mutex, we can shut everything down ourselves
+  shutdown_ssl(socket_, true);
+  shutdown_socket(socket_);
+  close_socket(socket_);
+}
+
+inline std::string ClientImpl::host() const { return host_; }
+
+inline int ClientImpl::port() const { return port_; }
+
+inline size_t ClientImpl::is_socket_open() const {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  return socket_.is_open();
+}
+
+inline socket_t ClientImpl::socket() const { return socket_.sock; }
+
+inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
+  connection_timeout_sec_ = sec;
+  connection_timeout_usec_ = usec;
+}
+
+inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) {
+  read_timeout_sec_ = sec;
+  read_timeout_usec_ = usec;
+}
+
+inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
+  write_timeout_sec_ = sec;
+  write_timeout_usec_ = usec;
+}
+
+inline void ClientImpl::set_basic_auth(const std::string &username,
+                                       const std::string &password) {
+  basic_auth_username_ = username;
+  basic_auth_password_ = password;
+}
+
+inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
+  bearer_token_auth_token_ = token;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void ClientImpl::set_digest_auth(const std::string &username,
+                                        const std::string &password) {
+  digest_auth_username_ = username;
+  digest_auth_password_ = password;
+}
+#endif
+
+inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; }
+
+inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
+
+inline void ClientImpl::set_url_encode(bool on) { url_encode_ = on; }
+
+inline void
+ClientImpl::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
+  addr_map_ = std::move(addr_map);
+}
+
+inline void ClientImpl::set_default_headers(Headers headers) {
+  default_headers_ = std::move(headers);
+}
+
+inline void ClientImpl::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+}
+
+inline void ClientImpl::set_address_family(int family) {
+  address_family_ = family;
+}
+
+inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }
+
+inline void ClientImpl::set_ipv6_v6only(bool on) { ipv6_v6only_ = on; }
+
+inline void ClientImpl::set_socket_options(SocketOptions socket_options) {
+  socket_options_ = std::move(socket_options);
+}
+
+inline void ClientImpl::set_compress(bool on) { compress_ = on; }
+
+inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
+
+inline void ClientImpl::set_interface(const std::string &intf) {
+  interface_ = intf;
+}
+
+inline void ClientImpl::set_proxy(const std::string &host, int port) {
+  proxy_host_ = host;
+  proxy_port_ = port;
+}
+
+inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
+                                             const std::string &password) {
+  proxy_basic_auth_username_ = username;
+  proxy_basic_auth_password_ = password;
+}
+
+inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
+  proxy_bearer_token_auth_token_ = token;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
+                                              const std::string &password) {
+  proxy_digest_auth_username_ = username;
+  proxy_digest_auth_password_ = password;
+}
+
+inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                         const std::string &ca_cert_dir_path) {
+  ca_cert_file_path_ = ca_cert_file_path;
+  ca_cert_dir_path_ = ca_cert_dir_path;
+}
+
+inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (ca_cert_store && ca_cert_store != ca_cert_store_) {
+    ca_cert_store_ = ca_cert_store;
+  }
+}
+
+inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
+                                                    std::size_t size) const {
+  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
+  auto se = detail::scope_exit([&] { BIO_free_all(mem); });
+  if (!mem) { return nullptr; }
+
+  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
+  if (!inf) { return nullptr; }
+
+  auto cts = X509_STORE_new();
+  if (cts) {
+    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
+      auto itmp = sk_X509_INFO_value(inf, i);
+      if (!itmp) { continue; }
+
+      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
+      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
+    }
+  }
+
+  sk_X509_INFO_pop_free(inf, X509_INFO_free);
+  return cts;
+}
+
+inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
+  server_certificate_verification_ = enabled;
+}
+
+inline void ClientImpl::enable_server_hostname_verification(bool enabled) {
+  server_hostname_verification_ = enabled;
+}
+
+inline void ClientImpl::set_server_certificate_verifier(
+    std::function<bool(SSL *ssl)> verifier) {
+  server_certificate_verifier_ = verifier;
+}
+#endif
+
+inline void ClientImpl::set_logger(Logger logger) {
+  logger_ = std::move(logger);
+}
+
+/*
+ * SSL Implementation
+ */
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+namespace detail {
+
+template <typename U, typename V>
+inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex,
+                    U SSL_connect_or_accept, V setup) {
+  SSL *ssl = nullptr;
+  {
+    std::lock_guard<std::mutex> guard(ctx_mutex);
+    ssl = SSL_new(ctx);
+  }
+
+  if (ssl) {
+    set_nonblocking(sock, true);
+    auto bio = BIO_new_socket(static_cast<int>(sock), BIO_NOCLOSE);
+    BIO_set_nbio(bio, 1);
+    SSL_set_bio(ssl, bio, bio);
+
+    if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) {
+      SSL_shutdown(ssl);
+      {
+        std::lock_guard<std::mutex> guard(ctx_mutex);
+        SSL_free(ssl);
+      }
+      set_nonblocking(sock, false);
+      return nullptr;
+    }
+    BIO_set_nbio(bio, 0);
+    set_nonblocking(sock, false);
+  }
+
+  return ssl;
+}
+
+inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, socket_t sock,
+                       bool shutdown_gracefully) {
+  // sometimes we may want to skip this to try to avoid SIGPIPE if we know
+  // the remote has closed the network connection
+  // Note that it is not always possible to avoid SIGPIPE, this is merely a
+  // best-efforts.
+  if (shutdown_gracefully) {
+#ifdef _WIN32
+    SSL_shutdown(ssl);
+#else
+    timeval tv;
+    tv.tv_sec = 1;
+    tv.tv_usec = 0;
+    setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+               reinterpret_cast<const void *>(&tv), sizeof(tv));
+
+    auto ret = SSL_shutdown(ssl);
+    while (ret == 0) {
+      std::this_thread::sleep_for(std::chrono::milliseconds{100});
+      ret = SSL_shutdown(ssl);
+    }
+#endif
+  }
+
+  std::lock_guard<std::mutex> guard(ctx_mutex);
+  SSL_free(ssl);
+}
+
+template <typename U>
+bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
+                                       U ssl_connect_or_accept,
+                                       time_t timeout_sec,
+                                       time_t timeout_usec) {
+  auto res = 0;
+  while ((res = ssl_connect_or_accept(ssl)) != 1) {
+    auto err = SSL_get_error(ssl, res);
+    switch (err) {
+    case SSL_ERROR_WANT_READ:
+      if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; }
+      break;
+    case SSL_ERROR_WANT_WRITE:
+      if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; }
+      break;
+    default: break;
+    }
+    return false;
+  }
+  return true;
+}
+
+template <typename T>
+inline bool process_server_socket_ssl(
+    const std::atomic<socket_t> &svr_sock, SSL *ssl, socket_t sock,
+    size_t keep_alive_max_count, time_t keep_alive_timeout_sec,
+    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
+    time_t write_timeout_usec, T callback) {
+  return process_server_socket_core(
+      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
+      [&](bool close_connection, bool &connection_closed) {
+        SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
+                             write_timeout_sec, write_timeout_usec);
+        return callback(strm, close_connection, connection_closed);
+      });
+}
+
+template <typename T>
+inline bool
+process_client_socket_ssl(SSL *ssl, socket_t sock, time_t read_timeout_sec,
+                          time_t read_timeout_usec, time_t write_timeout_sec,
+                          time_t write_timeout_usec, T callback) {
+  SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
+                       write_timeout_sec, write_timeout_usec);
+  return callback(strm);
+}
+
+class SSLInit {
+public:
+  SSLInit() {
+    OPENSSL_init_ssl(
+        OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+  }
+};
+
+// SSL socket stream implementation
+inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl,
+                                        time_t read_timeout_sec,
+                                        time_t read_timeout_usec,
+                                        time_t write_timeout_sec,
+                                        time_t write_timeout_usec)
+    : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec),
+      read_timeout_usec_(read_timeout_usec),
+      write_timeout_sec_(write_timeout_sec),
+      write_timeout_usec_(write_timeout_usec) {
+  SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
+}
+
+inline SSLSocketStream::~SSLSocketStream() = default;
+
+inline bool SSLSocketStream::is_readable() const {
+  return detail::select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
+}
+
+inline bool SSLSocketStream::is_writable() const {
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_);
+}
+
+inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
+  if (SSL_pending(ssl_) > 0) {
+    return SSL_read(ssl_, ptr, static_cast<int>(size));
+  } else if (is_readable()) {
+    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
+#ifdef _WIN32
+      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
+#else
+      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
+#endif
+        if (SSL_pending(ssl_) > 0) {
+          return SSL_read(ssl_, ptr, static_cast<int>(size));
+        } else if (is_readable()) {
+          std::this_thread::sleep_for(std::chrono::microseconds{10});
+          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          return -1;
+        }
+      }
+    }
+    return ret;
+  }
+  return -1;
+}
+
+inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
+  if (is_writable()) {
+    auto handle_size = static_cast<int>(
+        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
+
+    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
+#ifdef _WIN32
+      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
+#else
+      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
+#endif
+        if (is_writable()) {
+          std::this_thread::sleep_for(std::chrono::microseconds{10});
+          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          return -1;
+        }
+      }
+    }
+    return ret;
+  }
+  return -1;
+}
+
+inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
+                                                    int &port) const {
+  detail::get_remote_ip_and_port(sock_, ip, port);
+}
+
+inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
+                                                   int &port) const {
+  detail::get_local_ip_and_port(sock_, ip, port);
+}
+
+inline socket_t SSLSocketStream::socket() const { return sock_; }
+
+static SSLInit sslinit_;
+
+} // namespace detail
+
+// SSL HTTP server implementation
+inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
+                            const char *client_ca_cert_file_path,
+                            const char *client_ca_cert_dir_path,
+                            const char *private_key_password) {
+  ctx_ = SSL_CTX_new(TLS_server_method());
+
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+
+    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+    if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_,
+          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
+    }
+
+    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
+            1 ||
+        SSL_CTX_check_private_key(ctx_) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
+      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
+                                    client_ca_cert_dir_path);
+
+      SSL_CTX_set_verify(
+          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
+    }
+  }
+}
+
+inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key,
+                            X509_STORE *client_ca_cert_store) {
+  ctx_ = SSL_CTX_new(TLS_server_method());
+
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+
+    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+    if (SSL_CTX_use_certificate(ctx_, cert) != 1 ||
+        SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_store) {
+      SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
+
+      SSL_CTX_set_verify(
+          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
+    }
+  }
+}
+
+inline SSLServer::SSLServer(
+    const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback) {
+  ctx_ = SSL_CTX_new(TLS_method());
+  if (ctx_) {
+    if (!setup_ssl_ctx_callback(*ctx_)) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLServer::~SSLServer() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+}
+
+inline bool SSLServer::is_valid() const { return ctx_; }
+
+inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
+
+inline void SSLServer::update_certs(X509 *cert, EVP_PKEY *private_key,
+                                    X509_STORE *client_ca_cert_store) {
+
+  std::lock_guard<std::mutex> guard(ctx_mutex_);
+
+  SSL_CTX_use_certificate(ctx_, cert);
+  SSL_CTX_use_PrivateKey(ctx_, private_key);
+
+  if (client_ca_cert_store != nullptr) {
+    SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
+  }
+}
+
+inline bool SSLServer::process_and_close_socket(socket_t sock) {
+  auto ssl = detail::ssl_new(
+      sock, ctx_, ctx_mutex_,
+      [&](SSL *ssl2) {
+        return detail::ssl_connect_or_accept_nonblocking(
+            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_);
+      },
+      [](SSL * /*ssl2*/) { return true; });
+
+  auto ret = false;
+  if (ssl) {
+    std::string remote_addr;
+    int remote_port = 0;
+    detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
+
+    std::string local_addr;
+    int local_port = 0;
+    detail::get_local_ip_and_port(sock, local_addr, local_port);
+
+    ret = detail::process_server_socket_ssl(
+        svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
+        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+        write_timeout_usec_,
+        [&](Stream &strm, bool close_connection, bool &connection_closed) {
+          return process_request(strm, remote_addr, remote_port, local_addr,
+                                 local_port, close_connection,
+                                 connection_closed,
+                                 [&](Request &req) { req.ssl = ssl; });
+        });
+
+    // Shutdown gracefully if the result seemed successful, non-gracefully if
+    // the connection appeared to be closed.
+    const bool shutdown_gracefully = ret;
+    detail::ssl_delete(ctx_mutex_, ssl, sock, shutdown_gracefully);
+  }
+
+  detail::shutdown_socket(sock);
+  detail::close_socket(sock);
+  return ret;
+}
+
+// SSL HTTP client implementation
+inline SSLClient::SSLClient(const std::string &host)
+    : SSLClient(host, 443, std::string(), std::string()) {}
+
+inline SSLClient::SSLClient(const std::string &host, int port)
+    : SSLClient(host, port, std::string(), std::string()) {}
+
+inline SSLClient::SSLClient(const std::string &host, int port,
+                            const std::string &client_cert_path,
+                            const std::string &client_key_path,
+                            const std::string &private_key_password)
+    : ClientImpl(host, port, client_cert_path, client_key_path) {
+  ctx_ = SSL_CTX_new(TLS_client_method());
+
+  SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(b, e);
+                });
+
+  if (!client_cert_path.empty() && !client_key_path.empty()) {
+    if (!private_key_password.empty()) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_, reinterpret_cast<void *>(
+                    const_cast<char *>(private_key_password.c_str())));
+    }
+
+    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(),
+                                     SSL_FILETYPE_PEM) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(),
+                                    SSL_FILETYPE_PEM) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLClient::SSLClient(const std::string &host, int port,
+                            X509 *client_cert, EVP_PKEY *client_key,
+                            const std::string &private_key_password)
+    : ClientImpl(host, port) {
+  ctx_ = SSL_CTX_new(TLS_client_method());
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(b, e);
+                });
+
+  if (client_cert != nullptr && client_key != nullptr) {
+    if (!private_key_password.empty()) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_, reinterpret_cast<void *>(
+                    const_cast<char *>(private_key_password.c_str())));
+    }
+
+    if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 ||
+        SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLClient::~SSLClient() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+  // Make sure to shut down SSL since shutdown_ssl will resolve to the
+  // base function rather than the derived function once we get to the
+  // base class destructor, and won't free the SSL (causing a leak).
+  shutdown_ssl_impl(socket_, true);
+}
+
+inline bool SSLClient::is_valid() const { return ctx_; }
+
+inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (ca_cert_store) {
+    if (ctx_) {
+      if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
+        // Free memory allocated for old cert and use new store `ca_cert_store`
+        SSL_CTX_set_cert_store(ctx_, ca_cert_store);
+      }
+    } else {
+      X509_STORE_free(ca_cert_store);
+    }
+  }
+}
+
+inline void SSLClient::load_ca_cert_store(const char *ca_cert,
+                                          std::size_t size) {
+  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
+}
+
+inline long SSLClient::get_openssl_verify_result() const {
+  return verify_result_;
+}
+
+inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }
+
+inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
+  return is_valid() && ClientImpl::create_and_connect_socket(socket, error);
+}
+
+// Assumes that socket_mutex_ is locked and that there are no requests in flight
+inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
+                                          bool &success, Error &error) {
+  success = true;
+  Response proxy_res;
+  if (!detail::process_client_socket(
+          socket.sock, read_timeout_sec_, read_timeout_usec_,
+          write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
+            Request req2;
+            req2.method = "CONNECT";
+            req2.path = host_and_port_;
+            return process_request(strm, req2, proxy_res, false, error);
+          })) {
+    // Thread-safe to close everything because we are assuming there are no
+    // requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
+    success = false;
+    return false;
+  }
+
+  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
+    if (!proxy_digest_auth_username_.empty() &&
+        !proxy_digest_auth_password_.empty()) {
+      std::map<std::string, std::string> auth;
+      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
+        proxy_res = Response();
+        if (!detail::process_client_socket(
+                socket.sock, read_timeout_sec_, read_timeout_usec_,
+                write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
+                  Request req3;
+                  req3.method = "CONNECT";
+                  req3.path = host_and_port_;
+                  req3.headers.insert(detail::make_digest_authentication_header(
+                      req3, auth, 1, detail::random_string(10),
+                      proxy_digest_auth_username_, proxy_digest_auth_password_,
+                      true));
+                  return process_request(strm, req3, proxy_res, false, error);
+                })) {
+          // Thread-safe to close everything because we are assuming there are
+          // no requests in flight
+          shutdown_ssl(socket, true);
+          shutdown_socket(socket);
+          close_socket(socket);
+          success = false;
+          return false;
+        }
+      }
+    }
+  }
+
+  // If status code is not 200, proxy request is failed.
+  // Set error to ProxyConnection and return proxy response
+  // as the response of the request
+  if (proxy_res.status != StatusCode::OK_200) {
+    error = Error::ProxyConnection;
+    res = std::move(proxy_res);
+    // Thread-safe to close everything because we are assuming there are
+    // no requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
+    return false;
+  }
+
+  return true;
+}
+
+inline bool SSLClient::load_certs() {
+  auto ret = true;
+
+  std::call_once(initialize_cert_, [&]() {
+    std::lock_guard<std::mutex> guard(ctx_mutex_);
+    if (!ca_cert_file_path_.empty()) {
+      if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(),
+                                         nullptr)) {
+        ret = false;
+      }
+    } else if (!ca_cert_dir_path_.empty()) {
+      if (!SSL_CTX_load_verify_locations(ctx_, nullptr,
+                                         ca_cert_dir_path_.c_str())) {
+        ret = false;
+      }
+    } else {
+      auto loaded = false;
+#ifdef _WIN32
+      loaded =
+          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#if TARGET_OS_OSX
+      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
+    }
+  });
+
+  return ret;
+}
+
+inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
+  auto ssl = detail::ssl_new(
+      socket.sock, ctx_, ctx_mutex_,
+      [&](SSL *ssl2) {
+        if (server_certificate_verification_) {
+          if (!load_certs()) {
+            error = Error::SSLLoadingCerts;
+            return false;
+          }
+          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
+        }
+
+        if (!detail::ssl_connect_or_accept_nonblocking(
+                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
+                connection_timeout_usec_)) {
+          error = Error::SSLConnection;
+          return false;
+        }
+
+        if (server_certificate_verification_) {
+          if (server_certificate_verifier_) {
+            if (!server_certificate_verifier_(ssl2)) {
+              error = Error::SSLServerVerification;
+              return false;
+            }
+          } else {
+            verify_result_ = SSL_get_verify_result(ssl2);
+
+            if (verify_result_ != X509_V_OK) {
+              error = Error::SSLServerVerification;
+              return false;
+            }
+
+            auto server_cert = SSL_get1_peer_certificate(ssl2);
+            auto se = detail::scope_exit([&] { X509_free(server_cert); });
+
+            if (server_cert == nullptr) {
+              error = Error::SSLServerVerification;
+              return false;
+            }
+
+            if (server_hostname_verification_) {
+              if (!verify_host(server_cert)) {
+                error = Error::SSLServerHostnameVerification;
+                return false;
+              }
+            }
+          }
+        }
+
+        return true;
+      },
+      [&](SSL *ssl2) {
+#if defined(OPENSSL_IS_BORINGSSL)
+        SSL_set_tlsext_host_name(ssl2, host_.c_str());
+#else
+        // NOTE: Direct call instead of using the OpenSSL macro to suppress
+        // -Wold-style-cast warning
+        SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name,
+                 static_cast<void *>(const_cast<char *>(host_.c_str())));
+#endif
+        return true;
+      });
+
+  if (ssl) {
+    socket.ssl = ssl;
+    return true;
+  }
+
+  shutdown_socket(socket);
+  close_socket(socket);
+  return false;
+}
+
+inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) {
+  shutdown_ssl_impl(socket, shutdown_gracefully);
+}
+
+inline void SSLClient::shutdown_ssl_impl(Socket &socket,
+                                         bool shutdown_gracefully) {
+  if (socket.sock == INVALID_SOCKET) {
+    assert(socket.ssl == nullptr);
+    return;
+  }
+  if (socket.ssl) {
+    detail::ssl_delete(ctx_mutex_, socket.ssl, socket.sock,
+                       shutdown_gracefully);
+    socket.ssl = nullptr;
+  }
+  assert(socket.ssl == nullptr);
+}
+
+inline bool
+SSLClient::process_socket(const Socket &socket,
+                          std::function<bool(Stream &strm)> callback) {
+  assert(socket.ssl);
+  return detail::process_client_socket_ssl(
+      socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_,
+      write_timeout_sec_, write_timeout_usec_, std::move(callback));
+}
+
+inline bool SSLClient::is_ssl() const { return true; }
+
+inline bool SSLClient::verify_host(X509 *server_cert) const {
+  /* Quote from RFC2818 section 3.1 "Server Identity"
+
+     If a subjectAltName extension of type dNSName is present, that MUST
+     be used as the identity. Otherwise, the (most specific) Common Name
+     field in the Subject field of the certificate MUST be used. Although
+     the use of the Common Name is existing practice, it is deprecated and
+     Certification Authorities are encouraged to use the dNSName instead.
+
+     Matching is performed using the matching rules specified by
+     [RFC2459].  If more than one identity of a given type is present in
+     the certificate (e.g., more than one dNSName name, a match in any one
+     of the set is considered acceptable.) Names may contain the wildcard
+     character * which is considered to match any single domain name
+     component or component fragment. E.g., *.a.com matches foo.a.com but
+     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
+
+     In some cases, the URI is specified as an IP address rather than a
+     hostname. In this case, the iPAddress subjectAltName must be present
+     in the certificate and must exactly match the IP in the URI.
+
+  */
+  return verify_host_with_subject_alt_name(server_cert) ||
+         verify_host_with_common_name(server_cert);
+}
+
+inline bool
+SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
+  auto ret = false;
+
+  auto type = GEN_DNS;
+
+  struct in6_addr addr6 {};
+  struct in_addr addr {};
+  size_t addr_len = 0;
+
+#ifndef __MINGW32__
+  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in6_addr);
+  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in_addr);
+  }
+#endif
+
+  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
+      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
+
+  if (alt_names) {
+    auto dsn_matched = false;
+    auto ip_matched = false;
+
+    auto count = sk_GENERAL_NAME_num(alt_names);
+
+    for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
+      auto val = sk_GENERAL_NAME_value(alt_names, i);
+      if (val->type == type) {
+        auto name =
+            reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
+        auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
+
+        switch (type) {
+        case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
+
+        case GEN_IPADD:
+          if (!memcmp(&addr6, name, addr_len) ||
+              !memcmp(&addr, name, addr_len)) {
+            ip_matched = true;
+          }
+          break;
+        }
+      }
+    }
+
+    if (dsn_matched || ip_matched) { ret = true; }
+  }
+
+  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
+      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
+  return ret;
+}
+
+inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
+  const auto subject_name = X509_get_subject_name(server_cert);
+
+  if (subject_name != nullptr) {
+    char name[BUFSIZ];
+    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                              name, sizeof(name));
+
+    if (name_len != -1) {
+      return check_host_name(name, static_cast<size_t>(name_len));
+    }
+  }
+
+  return false;
+}
+
+inline bool SSLClient::check_host_name(const char *pattern,
+                                       size_t pattern_len) const {
+  if (host_.size() == pattern_len && host_ == pattern) { return true; }
+
+  // Wildcard match
+  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
+  std::vector<std::string> pattern_components;
+  detail::split(&pattern[0], &pattern[pattern_len], '.',
+                [&](const char *b, const char *e) {
+                  pattern_components.emplace_back(b, e);
+                });
+
+  if (host_components_.size() != pattern_components.size()) { return false; }
+
+  auto itr = pattern_components.begin();
+  for (const auto &h : host_components_) {
+    auto &p = *itr;
+    if (p != h && p != "*") {
+      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
+                            !p.compare(0, p.size() - 1, h));
+      if (!partial_match) { return false; }
+    }
+    ++itr;
+  }
+
+  return true;
+}
+#endif
+
+// Universal client implementation
+inline Client::Client(const std::string &scheme_host_port)
+    : Client(scheme_host_port, std::string(), std::string()) {}
+
+inline Client::Client(const std::string &scheme_host_port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path) {
+  const static std::regex re(
+      R"((?:([a-z]+):\/\/)?(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)");
+
+  std::smatch m;
+  if (std::regex_match(scheme_host_port, m, re)) {
+    auto scheme = m[1].str();
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    if (!scheme.empty() && (scheme != "http" && scheme != "https")) {
+#else
+    if (!scheme.empty() && scheme != "http") {
+#endif
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+      std::string msg = "'" + scheme + "' scheme is not supported.";
+      throw std::invalid_argument(msg);
+#endif
+      return;
+    }
+
+    auto is_ssl = scheme == "https";
+
+    auto host = m[2].str();
+    if (host.empty()) { host = m[3].str(); }
+
+    auto port_str = m[4].str();
+    auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80);
+
+    if (is_ssl) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
+                                            client_key_path);
+      is_ssl_ = is_ssl;
+#endif
+    } else {
+      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                             client_key_path);
+    }
+  } else {
+    // NOTE: Update TEST(UniversalClientImplTest, Ipv6LiteralAddress)
+    // if port param below changes.
+    cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
+                                           client_cert_path, client_key_path);
+  }
+} // namespace detail
+
+inline Client::Client(const std::string &host, int port)
+    : cli_(detail::make_unique<ClientImpl>(host, port)) {}
+
+inline Client::Client(const std::string &host, int port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path)
+    : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                           client_key_path)) {}
+
+inline Client::~Client() = default;
+
+inline bool Client::is_valid() const {
+  return cli_ != nullptr && cli_->is_valid();
+}
+
+inline Result Client::Get(const std::string &path) { return cli_->Get(path); }
+inline Result Client::Get(const std::string &path, const Headers &headers) {
+  return cli_->Get(path, headers);
+}
+inline Result Client::Get(const std::string &path, Progress progress) {
+  return cli_->Get(path, std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          Progress progress) {
+  return cli_->Get(path, headers, std::move(progress));
+}
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, headers, std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, headers, std::move(content_receiver),
+                   std::move(progress));
+}
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, std::move(response_handler),
+                   std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, headers, std::move(response_handler),
+                   std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers, Progress progress) {
+  return cli_->Get(path, params, headers, std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, params, headers, std::move(content_receiver),
+                   std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, params, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+
+inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
+inline Result Client::Head(const std::string &path, const Headers &headers) {
+  return cli_->Head(path, headers);
+}
+
+inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
+inline Result Client::Post(const std::string &path, const Headers &headers) {
+  return cli_->Post(path, headers);
+}
+inline Result Client::Post(const std::string &path, const char *body,
+                           size_t content_length,
+                           const std::string &content_type) {
+  return cli_->Post(path, body, content_length, content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const char *body, size_t content_length,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, body, content_length, content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const char *body, size_t content_length,
+                           const std::string &content_type, Progress progress) {
+  return cli_->Post(path, headers, body, content_length, content_type,
+                    progress);
+}
+inline Result Client::Post(const std::string &path, const std::string &body,
+                           const std::string &content_type) {
+  return cli_->Post(path, body, content_type);
+}
+inline Result Client::Post(const std::string &path, const std::string &body,
+                           const std::string &content_type, Progress progress) {
+  return cli_->Post(path, body, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, body, content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type, Progress progress) {
+  return cli_->Post(path, headers, body, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, size_t content_length,
+                           ContentProvider content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, content_length, std::move(content_provider),
+                    content_type);
+}
+inline Result Client::Post(const std::string &path,
+                           ContentProviderWithoutLength content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, std::move(content_provider), content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           size_t content_length,
+                           ContentProvider content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, content_length, std::move(content_provider),
+                    content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           ContentProviderWithoutLength content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, std::move(content_provider), content_type);
+}
+inline Result Client::Post(const std::string &path, const Params &params) {
+  return cli_->Post(path, params);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const Params &params) {
+  return cli_->Post(path, headers, params);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const Params &params, Progress progress) {
+  return cli_->Post(path, headers, params, progress);
+}
+inline Result Client::Post(const std::string &path,
+                           const MultipartFormDataItems &items) {
+  return cli_->Post(path, items);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const MultipartFormDataItems &items) {
+  return cli_->Post(path, headers, items);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const MultipartFormDataItems &items,
+                           const std::string &boundary) {
+  return cli_->Post(path, headers, items, boundary);
+}
+inline Result
+Client::Post(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items) {
+  return cli_->Post(path, headers, items, provider_items);
+}
+inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
+inline Result Client::Put(const std::string &path, const char *body,
+                          size_t content_length,
+                          const std::string &content_type) {
+  return cli_->Put(path, body, content_length, content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const char *body, size_t content_length,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, body, content_length, content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const char *body, size_t content_length,
+                          const std::string &content_type, Progress progress) {
+  return cli_->Put(path, headers, body, content_length, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const std::string &body,
+                          const std::string &content_type) {
+  return cli_->Put(path, body, content_type);
+}
+inline Result Client::Put(const std::string &path, const std::string &body,
+                          const std::string &content_type, Progress progress) {
+  return cli_->Put(path, body, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, body, content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type, Progress progress) {
+  return cli_->Put(path, headers, body, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, size_t content_length,
+                          ContentProvider content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, content_length, std::move(content_provider),
+                   content_type);
+}
+inline Result Client::Put(const std::string &path,
+                          ContentProviderWithoutLength content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, std::move(content_provider), content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          size_t content_length,
+                          ContentProvider content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, content_length, std::move(content_provider),
+                   content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          ContentProviderWithoutLength content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, std::move(content_provider), content_type);
+}
+inline Result Client::Put(const std::string &path, const Params &params) {
+  return cli_->Put(path, params);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const Params &params) {
+  return cli_->Put(path, headers, params);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const Params &params, Progress progress) {
+  return cli_->Put(path, headers, params, progress);
+}
+inline Result Client::Put(const std::string &path,
+                          const MultipartFormDataItems &items) {
+  return cli_->Put(path, items);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const MultipartFormDataItems &items) {
+  return cli_->Put(path, headers, items);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const MultipartFormDataItems &items,
+                          const std::string &boundary) {
+  return cli_->Put(path, headers, items, boundary);
+}
+inline Result
+Client::Put(const std::string &path, const Headers &headers,
+            const MultipartFormDataItems &items,
+            const MultipartFormDataProviderItems &provider_items) {
+  return cli_->Put(path, headers, items, provider_items);
+}
+inline Result Client::Patch(const std::string &path) {
+  return cli_->Patch(path);
+}
+inline Result Client::Patch(const std::string &path, const char *body,
+                            size_t content_length,
+                            const std::string &content_type) {
+  return cli_->Patch(path, body, content_length, content_type);
+}
+inline Result Client::Patch(const std::string &path, const char *body,
+                            size_t content_length,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, body, content_length, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const char *body, size_t content_length,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, body, content_length, content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const char *body, size_t content_length,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, headers, body, content_length, content_type,
+                     progress);
+}
+inline Result Client::Patch(const std::string &path, const std::string &body,
+                            const std::string &content_type) {
+  return cli_->Patch(path, body, content_type);
+}
+inline Result Client::Patch(const std::string &path, const std::string &body,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, body, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, body, content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, headers, body, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, size_t content_length,
+                            ContentProvider content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, content_length, std::move(content_provider),
+                     content_type);
+}
+inline Result Client::Patch(const std::string &path,
+                            ContentProviderWithoutLength content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, std::move(content_provider), content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            size_t content_length,
+                            ContentProvider content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, content_length, std::move(content_provider),
+                     content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            ContentProviderWithoutLength content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, std::move(content_provider), content_type);
+}
+inline Result Client::Delete(const std::string &path) {
+  return cli_->Delete(path);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers) {
+  return cli_->Delete(path, headers);
+}
+inline Result Client::Delete(const std::string &path, const char *body,
+                             size_t content_length,
+                             const std::string &content_type) {
+  return cli_->Delete(path, body, content_length, content_type);
+}
+inline Result Client::Delete(const std::string &path, const char *body,
+                             size_t content_length,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, body, content_length, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const char *body, size_t content_length,
+                             const std::string &content_type) {
+  return cli_->Delete(path, headers, body, content_length, content_type);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const char *body, size_t content_length,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, headers, body, content_length, content_type,
+                      progress);
+}
+inline Result Client::Delete(const std::string &path, const std::string &body,
+                             const std::string &content_type) {
+  return cli_->Delete(path, body, content_type);
+}
+inline Result Client::Delete(const std::string &path, const std::string &body,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, body, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const std::string &body,
+                             const std::string &content_type) {
+  return cli_->Delete(path, headers, body, content_type);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const std::string &body,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, headers, body, content_type, progress);
+}
+inline Result Client::Options(const std::string &path) {
+  return cli_->Options(path);
+}
+inline Result Client::Options(const std::string &path, const Headers &headers) {
+  return cli_->Options(path, headers);
+}
+
+inline bool Client::send(Request &req, Response &res, Error &error) {
+  return cli_->send(req, res, error);
+}
+
+inline Result Client::send(const Request &req) { return cli_->send(req); }
+
+inline void Client::stop() { cli_->stop(); }
+
+inline std::string Client::host() const { return cli_->host(); }
+
+inline int Client::port() const { return cli_->port(); }
+
+inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
+
+inline socket_t Client::socket() const { return cli_->socket(); }
+
+inline void
+Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
+  cli_->set_hostname_addr_map(std::move(addr_map));
+}
+
+inline void Client::set_default_headers(Headers headers) {
+  cli_->set_default_headers(std::move(headers));
+}
+
+inline void Client::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  cli_->set_header_writer(writer);
+}
+
+inline void Client::set_address_family(int family) {
+  cli_->set_address_family(family);
+}
+
+inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }
+
+inline void Client::set_socket_options(SocketOptions socket_options) {
+  cli_->set_socket_options(std::move(socket_options));
+}
+
+inline void Client::set_connection_timeout(time_t sec, time_t usec) {
+  cli_->set_connection_timeout(sec, usec);
+}
+
+inline void Client::set_read_timeout(time_t sec, time_t usec) {
+  cli_->set_read_timeout(sec, usec);
+}
+
+inline void Client::set_write_timeout(time_t sec, time_t usec) {
+  cli_->set_write_timeout(sec, usec);
+}
+
+inline void Client::set_basic_auth(const std::string &username,
+                                   const std::string &password) {
+  cli_->set_basic_auth(username, password);
+}
+inline void Client::set_bearer_token_auth(const std::string &token) {
+  cli_->set_bearer_token_auth(token);
+}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_digest_auth(const std::string &username,
+                                    const std::string &password) {
+  cli_->set_digest_auth(username, password);
+}
+#endif
+
+inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); }
+inline void Client::set_follow_location(bool on) {
+  cli_->set_follow_location(on);
+}
+
+inline void Client::set_url_encode(bool on) { cli_->set_url_encode(on); }
+
+inline void Client::set_compress(bool on) { cli_->set_compress(on); }
+
+inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
+
+inline void Client::set_interface(const std::string &intf) {
+  cli_->set_interface(intf);
+}
+
+inline void Client::set_proxy(const std::string &host, int port) {
+  cli_->set_proxy(host, port);
+}
+inline void Client::set_proxy_basic_auth(const std::string &username,
+                                         const std::string &password) {
+  cli_->set_proxy_basic_auth(username, password);
+}
+inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
+  cli_->set_proxy_bearer_token_auth(token);
+}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_proxy_digest_auth(const std::string &username,
+                                          const std::string &password) {
+  cli_->set_proxy_digest_auth(username, password);
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::enable_server_certificate_verification(bool enabled) {
+  cli_->enable_server_certificate_verification(enabled);
+}
+
+inline void Client::enable_server_hostname_verification(bool enabled) {
+  cli_->enable_server_hostname_verification(enabled);
+}
+
+inline void Client::set_server_certificate_verifier(
+    std::function<bool(SSL *ssl)> verifier) {
+  cli_->set_server_certificate_verifier(verifier);
+}
+#endif
+
+inline void Client::set_logger(Logger logger) {
+  cli_->set_logger(std::move(logger));
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                     const std::string &ca_cert_dir_path) {
+  cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
+}
+
+inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (is_ssl_) {
+    static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
+  } else {
+    cli_->set_ca_cert_store(ca_cert_store);
+  }
+}
+
+inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
+  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
+}
+
+inline long Client::get_openssl_verify_result() const {
+  if (is_ssl_) {
+    return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
+  }
+  return -1; // NOTE: -1 doesn't match any of X509_V_ERR_???
+}
+
+inline SSL_CTX *Client::ssl_context() const {
+  if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); }
+  return nullptr;
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+} // namespace httplib
+
+#if defined(_WIN32) && defined(CPPHTTPLIB_USE_POLL)
+#undef poll
+#endif
+
+#endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp
new file mode 100644
index 00000000..86070a10
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp
@@ -0,0 +1,12 @@
+#include "./httplib.h"
+using namespace httplib;
+
+int main() {
+  Server svr;
+
+  svr.Get("/", [](const Request &, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  svr.listen("0.0.0.0", 8080);
+}
diff --git a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp
new file mode 100644
index 00000000..ab2e757b
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp
@@ -0,0 +1,12 @@
+#include "httplib.h"
+using namespace httplib;
+
+int main() {
+  Server svr;
+
+  svr.Get("/", [](const Request &, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  svr.listen("0.0.0.0", 8080);
+}
diff --git a/code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h b/code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h
new file mode 100644
index 00000000..0465f96d
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h
@@ -0,0 +1,14316 @@
+// SPDX-License-Identifier: BSD-3-Clause AND ISC AND MIT
+/*BSD 3-Clause License
+
+Copyright (c) 2014-2017, ipkn
+              2020-2022, CrowCpp
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the author nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The Crow logo and other graphic material (excluding third party logos) used are under exclusive Copyright (c) 2021-2022, Farook Al-Sammarraie (The-EDev), All rights reserved.
+*/
+#pragma once
+// This file is generated from nginx/conf/mime.types using nginx_mime2cpp.py on 2021-12-03.
+#include <unordered_map>
+#include <string>
+
+namespace crow
+{
+    const std::unordered_map<std::string, std::string> mime_types{
+      {"shtml", "text/html"},
+      {"htm", "text/html"},
+      {"html", "text/html"},
+      {"css", "text/css"},
+      {"xml", "text/xml"},
+      {"gif", "image/gif"},
+      {"jpg", "image/jpeg"},
+      {"jpeg", "image/jpeg"},
+      {"js", "application/javascript"},
+      {"atom", "application/atom+xml"},
+      {"rss", "application/rss+xml"},
+      {"mml", "text/mathml"},
+      {"txt", "text/plain"},
+      {"jad", "text/vnd.sun.j2me.app-descriptor"},
+      {"wml", "text/vnd.wap.wml"},
+      {"htc", "text/x-component"},
+      {"avif", "image/avif"},
+      {"png", "image/png"},
+      {"svgz", "image/svg+xml"},
+      {"svg", "image/svg+xml"},
+      {"tiff", "image/tiff"},
+      {"tif", "image/tiff"},
+      {"wbmp", "image/vnd.wap.wbmp"},
+      {"webp", "image/webp"},
+      {"ico", "image/x-icon"},
+      {"jng", "image/x-jng"},
+      {"bmp", "image/x-ms-bmp"},
+      {"woff", "font/woff"},
+      {"woff2", "font/woff2"},
+      {"ear", "application/java-archive"},
+      {"war", "application/java-archive"},
+      {"jar", "application/java-archive"},
+      {"json", "application/json"},
+      {"hqx", "application/mac-binhex40"},
+      {"doc", "application/msword"},
+      {"pdf", "application/pdf"},
+      {"ai", "application/postscript"},
+      {"eps", "application/postscript"},
+      {"ps", "application/postscript"},
+      {"rtf", "application/rtf"},
+      {"m3u8", "application/vnd.apple.mpegurl"},
+      {"kml", "application/vnd.google-earth.kml+xml"},
+      {"kmz", "application/vnd.google-earth.kmz"},
+      {"xls", "application/vnd.ms-excel"},
+      {"eot", "application/vnd.ms-fontobject"},
+      {"ppt", "application/vnd.ms-powerpoint"},
+      {"odg", "application/vnd.oasis.opendocument.graphics"},
+      {"odp", "application/vnd.oasis.opendocument.presentation"},
+      {"ods", "application/vnd.oasis.opendocument.spreadsheet"},
+      {"odt", "application/vnd.oasis.opendocument.text"},
+      {"pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
+      {"xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
+      {"docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
+      {"wmlc", "application/vnd.wap.wmlc"},
+      {"wasm", "application/wasm"},
+      {"7z", "application/x-7z-compressed"},
+      {"cco", "application/x-cocoa"},
+      {"jardiff", "application/x-java-archive-diff"},
+      {"jnlp", "application/x-java-jnlp-file"},
+      {"run", "application/x-makeself"},
+      {"pm", "application/x-perl"},
+      {"pl", "application/x-perl"},
+      {"pdb", "application/x-pilot"},
+      {"prc", "application/x-pilot"},
+      {"rar", "application/x-rar-compressed"},
+      {"rpm", "application/x-redhat-package-manager"},
+      {"sea", "application/x-sea"},
+      {"swf", "application/x-shockwave-flash"},
+      {"sit", "application/x-stuffit"},
+      {"tk", "application/x-tcl"},
+      {"tcl", "application/x-tcl"},
+      {"crt", "application/x-x509-ca-cert"},
+      {"pem", "application/x-x509-ca-cert"},
+      {"der", "application/x-x509-ca-cert"},
+      {"xpi", "application/x-xpinstall"},
+      {"xhtml", "application/xhtml+xml"},
+      {"xspf", "application/xspf+xml"},
+      {"zip", "application/zip"},
+      {"dll", "application/octet-stream"},
+      {"exe", "application/octet-stream"},
+      {"bin", "application/octet-stream"},
+      {"deb", "application/octet-stream"},
+      {"dmg", "application/octet-stream"},
+      {"img", "application/octet-stream"},
+      {"iso", "application/octet-stream"},
+      {"msm", "application/octet-stream"},
+      {"msp", "application/octet-stream"},
+      {"msi", "application/octet-stream"},
+      {"kar", "audio/midi"},
+      {"midi", "audio/midi"},
+      {"mid", "audio/midi"},
+      {"mp3", "audio/mpeg"},
+      {"ogg", "audio/ogg"},
+      {"m4a", "audio/x-m4a"},
+      {"ra", "audio/x-realaudio"},
+      {"3gp", "video/3gpp"},
+      {"3gpp", "video/3gpp"},
+      {"ts", "video/mp2t"},
+      {"mp4", "video/mp4"},
+      {"mpg", "video/mpeg"},
+      {"mpeg", "video/mpeg"},
+      {"mov", "video/quicktime"},
+      {"webm", "video/webm"},
+      {"flv", "video/x-flv"},
+      {"m4v", "video/x-m4v"},
+      {"mng", "video/x-mng"},
+      {"asf", "video/x-ms-asf"},
+      {"asx", "video/x-ms-asf"},
+      {"wmv", "video/x-ms-wmv"},
+      {"avi", "video/x-msvideo"}};
+}
+
+
+#include <string>
+
+namespace crow
+{
+    /// An abstract class that allows any other class to be returned by a handler.
+    struct returnable
+    {
+        std::string content_type;
+        virtual std::string dump() const = 0;
+
+        returnable(std::string ctype):
+          content_type{ctype}
+        {}
+
+        virtual ~returnable(){};
+    };
+} // namespace crow
+
+
+#include <stdio.h>
+#include <string.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <iostream>
+#include <memory>
+
+namespace crow
+{
+
+// ----------------------------------------------------------------------------
+// qs_parse (modified)
+// https://github.com/bartgrantham/qs_parse
+// ----------------------------------------------------------------------------
+/*  Similar to strncmp, but handles URL-encoding for either string  */
+int qs_strncmp(const char* s, const char* qs, size_t n);
+
+
+/*  Finds the beginning of each key/value pair and stores a pointer in qs_kv.
+ *  Also decodes the value portion of the k/v pair *in-place*.  In a future
+ *  enhancement it will also have a compile-time option of sorting qs_kv
+ *  alphabetically by key.  */
+size_t qs_parse(char* qs, char* qs_kv[], size_t qs_kv_size, bool parse_url);
+
+
+/*  Used by qs_parse to decode the value portion of a k/v pair  */
+int qs_decode(char * qs);
+
+
+/*  Looks up the value according to the key on a pre-processed query string
+ *  A future enhancement will be a compile-time option to look up the key
+ *  in a pre-sorted qs_kv array via a binary search.  */
+//char * qs_k2v(const char * key, char * qs_kv[], int qs_kv_size);
+ char * qs_k2v(const char * key, char * const * qs_kv, size_t qs_kv_size, int nth);
+
+
+/*  Non-destructive lookup of value, based on key.  User provides the
+ *  destinaton string and length.  */
+char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_len);
+
+// TODO: implement sorting of the qs_kv array; for now ensure it's not compiled
+#undef _qsSORTING
+
+// isxdigit _is_ available in <ctype.h>, but let's avoid another header instead
+#define CROW_QS_ISHEX(x)    ((((x)>='0'&&(x)<='9') || ((x)>='A'&&(x)<='F') || ((x)>='a'&&(x)<='f')) ? 1 : 0)
+#define CROW_QS_HEX2DEC(x)  (((x)>='0'&&(x)<='9') ? (x)-48 : ((x)>='A'&&(x)<='F') ? (x)-55 : ((x)>='a'&&(x)<='f') ? (x)-87 : 0)
+#define CROW_QS_ISQSCHR(x) ((((x)=='=')||((x)=='#')||((x)=='&')||((x)=='\0')) ? 0 : 1)
+
+inline int qs_strncmp(const char * s, const char * qs, size_t n)
+{
+    unsigned char u1, u2, unyb, lnyb;
+
+    while(n-- > 0)
+    {
+        u1 = static_cast<unsigned char>(*s++);
+        u2 = static_cast<unsigned char>(*qs++);
+
+        if ( ! CROW_QS_ISQSCHR(u1) ) {  u1 = '\0';  }
+        if ( ! CROW_QS_ISQSCHR(u2) ) {  u2 = '\0';  }
+
+        if ( u1 == '+' ) {  u1 = ' ';  }
+        if ( u1 == '%' ) // easier/safer than scanf
+        {
+            unyb = static_cast<unsigned char>(*s++);
+            lnyb = static_cast<unsigned char>(*s++);
+            if ( CROW_QS_ISHEX(unyb) && CROW_QS_ISHEX(lnyb) )
+                u1 = (CROW_QS_HEX2DEC(unyb) * 16) + CROW_QS_HEX2DEC(lnyb);
+            else
+                u1 = '\0';
+        }
+
+        if ( u2 == '+' ) {  u2 = ' ';  }
+        if ( u2 == '%' ) // easier/safer than scanf
+        {
+            unyb = static_cast<unsigned char>(*qs++);
+            lnyb = static_cast<unsigned char>(*qs++);
+            if ( CROW_QS_ISHEX(unyb) && CROW_QS_ISHEX(lnyb) )
+                u2 = (CROW_QS_HEX2DEC(unyb) * 16) + CROW_QS_HEX2DEC(lnyb);
+            else
+                u2 = '\0';
+        }
+
+        if ( u1 != u2 )
+            return u1 - u2;
+        if ( u1 == '\0' )
+            return 0;
+    }
+    if ( CROW_QS_ISQSCHR(*qs) )
+        return -1;
+    else
+        return 0;
+}
+
+
+inline size_t qs_parse(char* qs, char* qs_kv[], size_t qs_kv_size, bool parse_url = true)
+{
+    size_t i, j;
+    char * substr_ptr;
+
+    for(i=0; i<qs_kv_size; i++)  qs_kv[i] = NULL;
+
+    // find the beginning of the k/v substrings or the fragment
+    substr_ptr = parse_url ? qs + strcspn(qs, "?#") : qs;
+    if (parse_url)
+    {
+        if (substr_ptr[0] != '\0')
+            substr_ptr++;
+        else
+            return 0; // no query or fragment
+    }
+
+    i=0;
+    while(i<qs_kv_size)
+    {
+        qs_kv[i] = substr_ptr;
+        j = strcspn(substr_ptr, "&");
+        if ( substr_ptr[j] == '\0' ) { i++; break;  } // x &'s -> means x iterations of this loop -> means *x+1* k/v pairs
+        substr_ptr += j + 1;
+        i++;
+    }
+
+    // we only decode the values in place, the keys could have '='s in them
+    // which will hose our ability to distinguish keys from values later
+    for(j=0; j<i; j++)
+    {
+        substr_ptr = qs_kv[j] + strcspn(qs_kv[j], "=&#");
+        if ( substr_ptr[0] == '&' || substr_ptr[0] == '\0')  // blank value: skip decoding
+            substr_ptr[0] = '\0';
+        else
+            qs_decode(++substr_ptr);
+    }
+
+#ifdef _qsSORTING
+// TODO: qsort qs_kv, using qs_strncmp() for the comparison
+#endif
+
+    return i;
+}
+
+
+inline int qs_decode(char * qs)
+{
+    int i=0, j=0;
+
+    while( CROW_QS_ISQSCHR(qs[j]) )
+    {
+        if ( qs[j] == '+' ) {  qs[i] = ' ';  }
+        else if ( qs[j] == '%' ) // easier/safer than scanf
+        {
+            if ( ! CROW_QS_ISHEX(qs[j+1]) || ! CROW_QS_ISHEX(qs[j+2]) )
+            {
+                qs[i] = '\0';
+                return i;
+            }
+            qs[i] = (CROW_QS_HEX2DEC(qs[j+1]) * 16) + CROW_QS_HEX2DEC(qs[j+2]);
+            j+=2;
+        }
+        else
+        {
+            qs[i] = qs[j];
+        }
+        i++;  j++;
+    }
+    qs[i] = '\0';
+
+    return i;
+}
+
+
+inline char * qs_k2v(const char * key, char * const * qs_kv, size_t qs_kv_size, int nth = 0)
+{
+    size_t i;
+    size_t key_len, skip;
+
+    key_len = strlen(key);
+
+#ifdef _qsSORTING
+// TODO: binary search for key in the sorted qs_kv
+#else  // _qsSORTING
+    for(i=0; i<qs_kv_size; i++)
+    {
+        // we rely on the unambiguous '=' to find the value in our k/v pair
+        if ( qs_strncmp(key, qs_kv[i], key_len) == 0 )
+        {
+            skip = strcspn(qs_kv[i], "=");
+            if ( qs_kv[i][skip] == '=' )
+                skip++;
+            // return (zero-char value) ? ptr to trailing '\0' : ptr to value
+            if(nth == 0)
+                return qs_kv[i] + skip;
+            else
+                --nth;
+        }
+    }
+#endif  // _qsSORTING
+
+    return nullptr;
+}
+
+inline std::unique_ptr<std::pair<std::string, std::string>> qs_dict_name2kv(const char * dict_name, char * const * qs_kv, size_t qs_kv_size, int nth = 0)
+{
+    size_t i;
+    size_t name_len, skip_to_eq, skip_to_brace_open, skip_to_brace_close;
+
+    name_len = strlen(dict_name);
+
+#ifdef _qsSORTING
+// TODO: binary search for key in the sorted qs_kv
+#else  // _qsSORTING
+    for(i=0; i<qs_kv_size; i++)
+    {
+        if ( strncmp(dict_name, qs_kv[i], name_len) == 0 )
+        {
+            skip_to_eq = strcspn(qs_kv[i], "=");
+            if ( qs_kv[i][skip_to_eq] == '=' )
+                skip_to_eq++;
+            skip_to_brace_open = strcspn(qs_kv[i], "[");
+            if ( qs_kv[i][skip_to_brace_open] == '[' )
+                skip_to_brace_open++;
+            skip_to_brace_close = strcspn(qs_kv[i], "]");
+
+            if ( skip_to_brace_open <= skip_to_brace_close &&
+                 skip_to_brace_open > 0 &&
+                 skip_to_brace_close > 0 &&
+                 nth == 0 )
+            {
+                auto key = std::string(qs_kv[i] + skip_to_brace_open, skip_to_brace_close - skip_to_brace_open);
+                auto value = std::string(qs_kv[i] + skip_to_eq);
+                return std::unique_ptr<std::pair<std::string, std::string>>(new std::pair<std::string, std::string>(key, value));
+            }
+            else
+            {
+                --nth;
+            }
+        }
+    }
+#endif  // _qsSORTING
+
+    return nullptr;
+}
+
+
+inline char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_len)
+{
+    size_t i, key_len;
+    const char * tmp;
+
+    // find the beginning of the k/v substrings
+    if ( (tmp = strchr(qs, '?')) != NULL )
+        qs = tmp + 1;
+
+    key_len = strlen(key);
+    while(qs[0] != '#' && qs[0] != '\0')
+    {
+        if ( qs_strncmp(key, qs, key_len) == 0 )
+            break;
+        qs += strcspn(qs, "&") + 1;
+    }
+
+    if ( qs[0] == '\0' ) return NULL;
+
+    qs += strcspn(qs, "=&#");
+    if ( qs[0] == '=' )
+    {
+        qs++;
+        i = strcspn(qs, "&=#");
+#ifdef _MSC_VER
+        strncpy_s(val, val_len, qs, (val_len - 1)<(i + 1) ? (val_len - 1) : (i + 1));
+#else
+        strncpy(val, qs, (val_len - 1)<(i + 1) ? (val_len - 1) : (i + 1));
+#endif
+		qs_decode(val);
+    }
+    else
+    {
+        if ( val_len > 0 )
+            val[0] = '\0';
+    }
+
+    return val;
+}
+}
+// ----------------------------------------------------------------------------
+
+
+namespace crow
+{
+    struct request;
+    /// A class to represent any data coming after the `?` in the request URL into key-value pairs.
+    class query_string
+    {
+    public:
+        static const int MAX_KEY_VALUE_PAIRS_COUNT = 256;
+
+        query_string() = default;
+
+        query_string(const query_string& qs):
+          url_(qs.url_)
+        {
+            for (auto p : qs.key_value_pairs_)
+            {
+                key_value_pairs_.push_back((char*)(p - qs.url_.c_str() + url_.c_str()));
+            }
+        }
+
+        query_string& operator=(const query_string& qs)
+        {
+            url_ = qs.url_;
+            key_value_pairs_.clear();
+            for (auto p : qs.key_value_pairs_)
+            {
+                key_value_pairs_.push_back((char*)(p - qs.url_.c_str() + url_.c_str()));
+            }
+            return *this;
+        }
+
+        query_string& operator=(query_string&& qs) noexcept
+        {
+            key_value_pairs_ = std::move(qs.key_value_pairs_);
+            char* old_data = (char*)qs.url_.c_str();
+            url_ = std::move(qs.url_);
+            for (auto& p : key_value_pairs_)
+            {
+                p += (char*)url_.c_str() - old_data;
+            }
+            return *this;
+        }
+
+
+        query_string(std::string params, bool url = true):
+          url_(std::move(params))
+        {
+            if (url_.empty())
+                return;
+
+            key_value_pairs_.resize(MAX_KEY_VALUE_PAIRS_COUNT);
+            size_t count = qs_parse(&url_[0], &key_value_pairs_[0], MAX_KEY_VALUE_PAIRS_COUNT, url);
+
+            key_value_pairs_.resize(count);
+            key_value_pairs_.shrink_to_fit();
+        }
+
+        void clear()
+        {
+            key_value_pairs_.clear();
+            url_.clear();
+        }
+
+        friend std::ostream& operator<<(std::ostream& os, const query_string& qs)
+        {
+            os << "[ ";
+            for (size_t i = 0; i < qs.key_value_pairs_.size(); ++i)
+            {
+                if (i)
+                    os << ", ";
+                os << qs.key_value_pairs_[i];
+            }
+            os << " ]";
+            return os;
+        }
+
+        /// Get a value from a name, used for `?name=value`.
+
+        ///
+        /// Note: this method returns the value of the first occurrence of the key only, to return all occurrences, see \ref get_list().
+        char* get(const std::string& name) const
+        {
+            char* ret = qs_k2v(name.c_str(), key_value_pairs_.data(), key_value_pairs_.size());
+            return ret;
+        }
+
+        /// Works similar to \ref get() except it removes the item from the query string.
+        char* pop(const std::string& name)
+        {
+            char* ret = get(name);
+            if (ret != nullptr)
+            {
+                for (unsigned int i = 0; i < key_value_pairs_.size(); i++)
+                {
+                    std::string str_item(key_value_pairs_[i]);
+                    if (str_item.substr(0, name.size() + 1) == name + '=')
+                    {
+                        key_value_pairs_.erase(key_value_pairs_.begin() + i);
+                        break;
+                    }
+                }
+            }
+            return ret;
+        }
+
+        /// Returns a list of values, passed as `?name[]=value1&name[]=value2&...name[]=valuen` with n being the size of the list.
+
+        ///
+        /// Note: Square brackets in the above example are controlled by `use_brackets` boolean (true by default). If set to false, the example becomes `?name=value1,name=value2...name=valuen`
+        std::vector<char*> get_list(const std::string& name, bool use_brackets = true) const
+        {
+            std::vector<char*> ret;
+            std::string plus = name + (use_brackets ? "[]" : "");
+            char* element = nullptr;
+
+            int count = 0;
+            while (1)
+            {
+                element = qs_k2v(plus.c_str(), key_value_pairs_.data(), key_value_pairs_.size(), count++);
+                if (!element)
+                    break;
+                ret.push_back(element);
+            }
+            return ret;
+        }
+
+        /// Similar to \ref get_list() but it removes the
+        std::vector<char*> pop_list(const std::string& name, bool use_brackets = true)
+        {
+            std::vector<char*> ret = get_list(name, use_brackets);
+            if (!ret.empty())
+            {
+                for (unsigned int i = 0; i < key_value_pairs_.size(); i++)
+                {
+                    std::string str_item(key_value_pairs_[i]);
+                    if ((use_brackets ? (str_item.substr(0, name.size() + 3) == name + "[]=") : (str_item.substr(0, name.size() + 1) == name + '=')))
+                    {
+                        key_value_pairs_.erase(key_value_pairs_.begin() + i--);
+                    }
+                }
+            }
+            return ret;
+        }
+
+        /// Works similar to \ref get_list() except the brackets are mandatory must not be empty.
+
+        ///
+        /// For example calling `get_dict(yourname)` on `?yourname[sub1]=42&yourname[sub2]=84` would give a map containing `{sub1 : 42, sub2 : 84}`.
+        ///
+        /// if your query string has both empty brackets and ones with a key inside, use pop_list() to get all the values without a key before running this method.
+        std::unordered_map<std::string, std::string> get_dict(const std::string& name) const
+        {
+            std::unordered_map<std::string, std::string> ret;
+
+            int count = 0;
+            while (1)
+            {
+                if (auto element = qs_dict_name2kv(name.c_str(), key_value_pairs_.data(), key_value_pairs_.size(), count++))
+                    ret.insert(*element);
+                else
+                    break;
+            }
+            return ret;
+        }
+
+        /// Works the same as \ref get_dict() but removes the values from the query string.
+        std::unordered_map<std::string, std::string> pop_dict(const std::string& name)
+        {
+            std::unordered_map<std::string, std::string> ret = get_dict(name);
+            if (!ret.empty())
+            {
+                for (unsigned int i = 0; i < key_value_pairs_.size(); i++)
+                {
+                    std::string str_item(key_value_pairs_[i]);
+                    if (str_item.substr(0, name.size() + 1) == name + '[')
+                    {
+                        key_value_pairs_.erase(key_value_pairs_.begin() + i--);
+                    }
+                }
+            }
+            return ret;
+        }
+
+        std::vector<std::string> keys() const
+        {
+            std::vector<std::string> keys;
+            keys.reserve(key_value_pairs_.size());
+
+            for (const char* const element : key_value_pairs_)
+            {
+                const char* delimiter = strchr(element, '=');
+                if (delimiter)
+                    keys.emplace_back(element, delimiter);
+                else
+                    keys.emplace_back(element);
+            }
+
+            return keys;
+        }
+
+    private:
+        std::string url_;
+        std::vector<char*> key_value_pairs_;
+    };
+
+} // namespace crow
+
+#ifdef CROW_ENABLE_COMPRESSION
+
+#include <string>
+#include <zlib.h>
+
+// http://zlib.net/manual.html
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+    namespace compression
+    {
+        // Values used in the 'windowBits' parameter for deflateInit2.
+        enum algorithm
+        {
+            // 15 is the default value for deflate
+            DEFLATE = 15,
+            // 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.
+            GZIP = 15 | 16,
+        };
+
+        inline std::string compress_string(std::string const& str, algorithm algo)
+        {
+            std::string compressed_str;
+            z_stream stream{};
+            // Initialize with the default values
+            if (::deflateInit2(&stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, algo, 8, Z_DEFAULT_STRATEGY) == Z_OK)
+            {
+                char buffer[8192];
+
+                stream.avail_in = str.size();
+                // zlib does not take a const pointer. The data is not altered.
+                stream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(str.c_str()));
+
+                int code = Z_OK;
+                do
+                {
+                    stream.avail_out = sizeof(buffer);
+                    stream.next_out = reinterpret_cast<Bytef*>(&buffer[0]);
+
+                    code = ::deflate(&stream, Z_FINISH);
+                    // Successful and non-fatal error code returned by deflate when used with Z_FINISH flush
+                    if (code == Z_OK || code == Z_STREAM_END)
+                    {
+                        std::copy(&buffer[0], &buffer[sizeof(buffer) - stream.avail_out], std::back_inserter(compressed_str));
+                    }
+
+                } while (code == Z_OK);
+
+                if (code != Z_STREAM_END)
+                    compressed_str.clear();
+
+                ::deflateEnd(&stream);
+            }
+
+            return compressed_str;
+        }
+
+        inline std::string decompress_string(std::string const& deflated_string)
+        {
+            std::string inflated_string;
+            Bytef tmp[8192];
+
+            z_stream zstream{};
+            zstream.avail_in = deflated_string.size();
+            // Nasty const_cast but zlib won't alter its contents
+            zstream.next_in = const_cast<Bytef*>(reinterpret_cast<Bytef const*>(deflated_string.c_str()));
+            // Initialize with automatic header detection, for gzip support
+            if (::inflateInit2(&zstream, MAX_WBITS | 32) == Z_OK)
+            {
+                do
+                {
+                    zstream.avail_out = sizeof(tmp);
+                    zstream.next_out = &tmp[0];
+
+                    auto ret = ::inflate(&zstream, Z_NO_FLUSH);
+                    if (ret == Z_OK || ret == Z_STREAM_END)
+                    {
+                        std::copy(&tmp[0], &tmp[sizeof(tmp) - zstream.avail_out], std::back_inserter(inflated_string));
+                    }
+                    else
+                    {
+                        // Something went wrong with inflate; make sure we return an empty string
+                        inflated_string.clear();
+                        break;
+                    }
+
+                } while (zstream.avail_out == 0);
+
+                // Free zlib's internal memory
+                ::inflateEnd(&zstream);
+            }
+
+            return inflated_string;
+        }
+    } // namespace compression
+} // namespace crow
+
+#endif
+
+/*
+ * SHA1 Wikipedia Page: http://en.wikipedia.org/wiki/SHA-1
+ * 
+ * Copyright (c) 2012-22 SAURAV MOHAPATRA <mohaps@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/** 
+ * \file TinySHA1.hpp
+ * \author SAURAV MOHAPATRA <mohaps@gmail.com>
+ * \date 2012-22
+ * \brief TinySHA1 - a header only implementation of the SHA1 algorithm in C++. Based
+ * on the implementation in boost::uuid::details.
+ *
+ * In this file are defined:
+ * - sha1::SHA1
+ */
+#ifndef _TINY_SHA1_HPP_
+#define _TINY_SHA1_HPP_
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <stdint.h>
+
+/**
+ * \namespace sha1
+ * \brief Here is defined the SHA1 class
+ */
+namespace sha1
+{
+	/**
+	 * \class SHA1
+	 * \brief A tiny SHA1 algorithm implementation used internally in the
+	 * Crow server (specifically in crow/websocket.h).
+	 */
+	class SHA1
+	{
+	public:
+		typedef uint32_t digest32_t[5];
+		typedef uint8_t digest8_t[20];
+		inline static uint32_t LeftRotate(uint32_t value, size_t count) {
+			return (value << count) ^ (value >> (32-count));
+		}
+		SHA1(){ reset(); }
+		virtual ~SHA1() {}
+		SHA1(const SHA1& s) { *this = s; }
+		const SHA1& operator = (const SHA1& s) {
+			memcpy(m_digest, s.m_digest, 5 * sizeof(uint32_t));
+			memcpy(m_block, s.m_block, 64);
+			m_blockByteIndex = s.m_blockByteIndex;
+			m_byteCount = s.m_byteCount;
+			return *this;
+		}
+		SHA1& reset() {
+			m_digest[0] = 0x67452301;
+			m_digest[1] = 0xEFCDAB89;
+			m_digest[2] = 0x98BADCFE;
+			m_digest[3] = 0x10325476;
+			m_digest[4] = 0xC3D2E1F0;
+			m_blockByteIndex = 0;
+			m_byteCount = 0;
+			return *this;
+		}
+		SHA1& processByte(uint8_t octet) {
+			this->m_block[this->m_blockByteIndex++] = octet;
+			++this->m_byteCount;
+			if(m_blockByteIndex == 64) {
+				this->m_blockByteIndex = 0;
+				processBlock();
+			}
+			return *this;
+		}
+		SHA1& processBlock(const void* const start, const void* const end) {
+			const uint8_t* begin = static_cast<const uint8_t*>(start);
+			const uint8_t* finish = static_cast<const uint8_t*>(end);
+			while(begin != finish) {
+				processByte(*begin);
+				begin++;
+			}
+			return *this;
+		}
+		SHA1& processBytes(const void* const data, size_t len) {
+			const uint8_t* block = static_cast<const uint8_t*>(data);
+			processBlock(block, block + len);
+			return *this;
+		}
+		const uint32_t* getDigest(digest32_t digest) {
+			size_t bitCount = this->m_byteCount * 8;
+			processByte(0x80);
+			if (this->m_blockByteIndex > 56) {
+				while (m_blockByteIndex != 0) {
+					processByte(0);
+				}
+				while (m_blockByteIndex < 56) {
+					processByte(0);
+				}
+			} else {
+				while (m_blockByteIndex < 56) {
+					processByte(0);
+				}
+			}
+			processByte(0);
+			processByte(0);
+			processByte(0);
+			processByte(0);
+			processByte( static_cast<unsigned char>((bitCount>>24) & 0xFF));
+			processByte( static_cast<unsigned char>((bitCount>>16) & 0xFF));
+			processByte( static_cast<unsigned char>((bitCount>>8 ) & 0xFF));
+			processByte( static_cast<unsigned char>((bitCount)     & 0xFF));
+	
+			memcpy(digest, m_digest, 5 * sizeof(uint32_t));
+			return digest;
+		}
+		const uint8_t* getDigestBytes(digest8_t digest) {
+			digest32_t d32;
+			getDigest(d32);
+			size_t di = 0;
+			digest[di++] = ((d32[0] >> 24) & 0xFF);
+			digest[di++] = ((d32[0] >> 16) & 0xFF);
+			digest[di++] = ((d32[0] >> 8) & 0xFF);
+			digest[di++] = ((d32[0]) & 0xFF);
+			
+			digest[di++] = ((d32[1] >> 24) & 0xFF);
+			digest[di++] = ((d32[1] >> 16) & 0xFF);
+			digest[di++] = ((d32[1] >> 8) & 0xFF);
+			digest[di++] = ((d32[1]) & 0xFF);
+			
+			digest[di++] = ((d32[2] >> 24) & 0xFF);
+			digest[di++] = ((d32[2] >> 16) & 0xFF);
+			digest[di++] = ((d32[2] >> 8) & 0xFF);
+			digest[di++] = ((d32[2]) & 0xFF);
+			
+			digest[di++] = ((d32[3] >> 24) & 0xFF);
+			digest[di++] = ((d32[3] >> 16) & 0xFF);
+			digest[di++] = ((d32[3] >> 8) & 0xFF);
+			digest[di++] = ((d32[3]) & 0xFF);
+			
+			digest[di++] = ((d32[4] >> 24) & 0xFF);
+			digest[di++] = ((d32[4] >> 16) & 0xFF);
+			digest[di++] = ((d32[4] >> 8) & 0xFF);
+			digest[di++] = ((d32[4]) & 0xFF);
+			return digest;
+		}
+	
+	protected:
+		void processBlock() {
+			uint32_t w[80];
+			for (size_t i = 0; i < 16; i++) {
+				w[i]  = (m_block[i*4 + 0] << 24);
+				w[i] |= (m_block[i*4 + 1] << 16);
+				w[i] |= (m_block[i*4 + 2] << 8);
+				w[i] |= (m_block[i*4 + 3]);
+			}
+			for (size_t i = 16; i < 80; i++) {
+				w[i] = LeftRotate((w[i-3] ^ w[i-8] ^ w[i-14] ^ w[i-16]), 1);
+			}
+	
+			uint32_t a = m_digest[0];
+			uint32_t b = m_digest[1];
+			uint32_t c = m_digest[2];
+			uint32_t d = m_digest[3];
+			uint32_t e = m_digest[4];
+	
+			for (std::size_t i=0; i<80; ++i) {
+				uint32_t f = 0;
+				uint32_t k = 0;
+	
+				if (i<20) {
+					f = (b & c) | (~b & d);
+					k = 0x5A827999;
+				} else if (i<40) {
+					f = b ^ c ^ d;
+					k = 0x6ED9EBA1;
+				} else if (i<60) {
+					f = (b & c) | (b & d) | (c & d);
+					k = 0x8F1BBCDC;
+				} else {
+					f = b ^ c ^ d;
+					k = 0xCA62C1D6;
+				}
+				uint32_t temp = LeftRotate(a, 5) + f + e + k + w[i];
+				e = d;
+				d = c;
+				c = LeftRotate(b, 30);
+				b = a;
+				a = temp;
+			}
+	
+			m_digest[0] += a;
+			m_digest[1] += b;
+			m_digest[2] += c;
+			m_digest[3] += d;
+			m_digest[4] += e;
+		}
+	private:
+		digest32_t m_digest;
+		uint8_t m_block[64];
+		size_t m_blockByteIndex;
+		size_t m_byteCount;
+	};
+}
+#endif
+
+// settings for crow
+// TODO(ipkn) replace with runtime config. libucl?
+
+/* #ifdef - enables debug mode */
+//#define CROW_ENABLE_DEBUG
+
+/* #ifdef - enables logging */
+#define CROW_ENABLE_LOGGING
+
+/* #ifdef - enforces section 5.2 and 6.1 of RFC6455 (only accepting masked messages from clients) */
+//#define CROW_ENFORCE_WS_SPEC
+
+/* #define - specifies log level */
+/*
+    Debug       = 0
+    Info        = 1
+    Warning     = 2
+    Error       = 3
+    Critical    = 4
+
+    default to INFO
+*/
+#ifndef CROW_LOG_LEVEL
+#define CROW_LOG_LEVEL 1
+#endif
+
+#ifndef CROW_STATIC_DIRECTORY
+#define CROW_STATIC_DIRECTORY "static/"
+#endif
+#ifndef CROW_STATIC_ENDPOINT
+#define CROW_STATIC_ENDPOINT "/static/<path>"
+#endif
+
+// compiler flags
+#if defined(_MSVC_LANG) && _MSVC_LANG >= 201402L
+#define CROW_CAN_USE_CPP14
+#endif
+#if __cplusplus >= 201402L
+#define CROW_CAN_USE_CPP14
+#endif
+
+#if defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
+#define CROW_CAN_USE_CPP17
+#endif
+#if __cplusplus >= 201703L
+#define CROW_CAN_USE_CPP17
+#if defined(__GNUC__) && __GNUC__ < 8
+#define CROW_FILESYSTEM_IS_EXPERIMENTAL
+#endif
+#endif
+
+#if defined(_MSC_VER)
+#if _MSC_VER < 1900
+#define CROW_MSVC_WORKAROUND
+#define constexpr const
+#define noexcept throw()
+#endif
+#endif
+
+#if defined(__GNUC__) && __GNUC__ == 8 && __GNUC_MINOR__ < 4
+#if __cplusplus > 201103L
+#define CROW_GCC83_WORKAROUND
+#else
+#error "GCC 8.1 - 8.3 has a bug that prevents Crow from compiling with C++11. Please update GCC to > 8.3 or use C++ > 11."
+#endif
+#endif
+
+
+#ifdef CROW_USE_BOOST
+#include <boost/asio.hpp>
+#include <boost/asio/version.hpp>
+#ifdef CROW_ENABLE_SSL
+#include <boost/asio/ssl.hpp>
+#endif
+#else
+#ifndef ASIO_STANDALONE
+#define ASIO_STANDALONE
+#endif
+#include <asio.hpp>
+#include <asio/version.hpp>
+#ifdef CROW_ENABLE_SSL
+#include <asio/ssl.hpp>
+#endif
+#endif
+
+#if (CROW_USE_BOOST && BOOST_VERSION >= 107000) || (ASIO_VERSION >= 101300)
+#define GET_IO_SERVICE(s) ((asio::io_context&)(s).get_executor().context())
+#else
+#define GET_IO_SERVICE(s) ((s).get_io_service())
+#endif
+
+namespace crow
+{
+#ifdef CROW_USE_BOOST
+    namespace asio = boost::asio;
+    using error_code = boost::system::error_code;
+#else
+    using error_code = asio::error_code;
+#endif
+    using tcp = asio::ip::tcp;
+
+    /// A wrapper for the asio::ip::tcp::socket and asio::ssl::stream
+    struct SocketAdaptor
+    {
+        using context = void;
+        SocketAdaptor(asio::io_service& io_service, context*):
+          socket_(io_service)
+        {}
+
+        asio::io_service& get_io_service()
+        {
+            return GET_IO_SERVICE(socket_);
+        }
+
+        /// Get the TCP socket handling data trasfers, regardless of what layer is handling transfers on top of the socket.
+        tcp::socket& raw_socket()
+        {
+            return socket_;
+        }
+
+        /// Get the object handling data transfers, this can be either a TCP socket or an SSL stream (if SSL is enabled).
+        tcp::socket& socket()
+        {
+            return socket_;
+        }
+
+        tcp::endpoint remote_endpoint()
+        {
+            return socket_.remote_endpoint();
+        }
+
+        bool is_open()
+        {
+            return socket_.is_open();
+        }
+
+        void close()
+        {
+            error_code ec;
+            socket_.close(ec);
+        }
+
+        void shutdown_readwrite()
+        {
+            error_code ec;
+            socket_.shutdown(asio::socket_base::shutdown_type::shutdown_both, ec);
+        }
+
+        void shutdown_write()
+        {
+            error_code ec;
+            socket_.shutdown(asio::socket_base::shutdown_type::shutdown_send, ec);
+        }
+
+        void shutdown_read()
+        {
+            error_code ec;
+            socket_.shutdown(asio::socket_base::shutdown_type::shutdown_receive, ec);
+        }
+
+        template<typename F>
+        void start(F f)
+        {
+            f(error_code());
+        }
+
+        tcp::socket socket_;
+    };
+
+#ifdef CROW_ENABLE_SSL
+    struct SSLAdaptor
+    {
+        using context = asio::ssl::context;
+        using ssl_socket_t = asio::ssl::stream<tcp::socket>;
+        SSLAdaptor(asio::io_service& io_service, context* ctx):
+          ssl_socket_(new ssl_socket_t(io_service, *ctx))
+        {}
+
+        asio::ssl::stream<tcp::socket>& socket()
+        {
+            return *ssl_socket_;
+        }
+
+        tcp::socket::lowest_layer_type&
+          raw_socket()
+        {
+            return ssl_socket_->lowest_layer();
+        }
+
+        tcp::endpoint remote_endpoint()
+        {
+            return raw_socket().remote_endpoint();
+        }
+
+        bool is_open()
+        {
+            return ssl_socket_ ? raw_socket().is_open() : false;
+        }
+
+        void close()
+        {
+            if (is_open())
+            {
+                error_code ec;
+                raw_socket().close(ec);
+            }
+        }
+
+        void shutdown_readwrite()
+        {
+            if (is_open())
+            {
+                error_code ec;
+                raw_socket().shutdown(asio::socket_base::shutdown_type::shutdown_both, ec);
+            }
+        }
+
+        void shutdown_write()
+        {
+            if (is_open())
+            {
+                error_code ec;
+                raw_socket().shutdown(asio::socket_base::shutdown_type::shutdown_send, ec);
+            }
+        }
+
+        void shutdown_read()
+        {
+            if (is_open())
+            {
+                error_code ec;
+                raw_socket().shutdown(asio::socket_base::shutdown_type::shutdown_receive, ec);
+            }
+        }
+
+        asio::io_service& get_io_service()
+        {
+            return GET_IO_SERVICE(raw_socket());
+        }
+
+        template<typename F>
+        void start(F f)
+        {
+            ssl_socket_->async_handshake(asio::ssl::stream_base::server,
+                                         [f](const error_code& ec) {
+                                             f(ec);
+                                         });
+        }
+
+        std::unique_ptr<asio::ssl::stream<tcp::socket>> ssl_socket_;
+    };
+#endif
+} // namespace crow
+
+
+#include <cstdint>
+#include <stdexcept>
+#include <tuple>
+#include <type_traits>
+#include <cstring>
+#include <cctype>
+#include <functional>
+#include <string>
+#include <sstream>
+#include <unordered_map>
+#include <random>
+#include <algorithm>
+
+
+#if defined(CROW_CAN_USE_CPP17) && !defined(CROW_FILESYSTEM_IS_EXPERIMENTAL)
+#include <filesystem>
+#endif
+
+// TODO(EDev): Adding C++20's [[likely]] and [[unlikely]] attributes might be useful
+#if defined(__GNUG__) || defined(__clang__)
+#define CROW_LIKELY(X) __builtin_expect(!!(X), 1)
+#define CROW_UNLIKELY(X) __builtin_expect(!!(X), 0)
+#else
+#define CROW_LIKELY(X) (X)
+#define CROW_UNLIKELY(X) (X)
+#endif
+
+namespace crow
+{
+    /// @cond SKIP
+    namespace black_magic
+    {
+#ifndef CROW_MSVC_WORKAROUND
+        /// Out of Range Exception for const_str
+        struct OutOfRange
+        {
+            OutOfRange(unsigned /*pos*/, unsigned /*length*/) {}
+        };
+        /// Helper function to throw an exception if i is larger than len
+        constexpr unsigned requires_in_range(unsigned i, unsigned len)
+        {
+            return i >= len ? throw OutOfRange(i, len) : i;
+        }
+
+        /// A constant string implementation.
+        class const_str
+        {
+            const char* const begin_;
+            unsigned size_;
+
+        public:
+            template<unsigned N>
+            constexpr const_str(const char (&arr)[N]):
+              begin_(arr), size_(N - 1)
+            {
+                static_assert(N >= 1, "not a string literal");
+            }
+            constexpr char operator[](unsigned i) const
+            {
+                return requires_in_range(i, size_), begin_[i];
+            }
+
+            constexpr operator const char*() const
+            {
+                return begin_;
+            }
+
+            constexpr const char* begin() const { return begin_; }
+            constexpr const char* end() const { return begin_ + size_; }
+
+            constexpr unsigned size() const
+            {
+                return size_;
+            }
+        };
+
+        constexpr unsigned find_closing_tag(const_str s, unsigned p)
+        {
+            return s[p] == '>' ? p : find_closing_tag(s, p + 1);
+        }
+
+        /// Check that the CROW_ROUTE string is valid
+        constexpr bool is_valid(const_str s, unsigned i = 0, int f = 0)
+        {
+            return i == s.size()   ? f == 0 :
+                   f < 0 || f >= 2 ? false :
+                   s[i] == '<'     ? is_valid(s, i + 1, f + 1) :
+                   s[i] == '>'     ? is_valid(s, i + 1, f - 1) :
+                                     is_valid(s, i + 1, f);
+        }
+
+        constexpr bool is_equ_p(const char* a, const char* b, unsigned n)
+        {
+            return *a == 0 && *b == 0 && n == 0 ? true :
+                   (*a == 0 || *b == 0)         ? false :
+                   n == 0                       ? true :
+                   *a != *b                     ? false :
+                                                  is_equ_p(a + 1, b + 1, n - 1);
+        }
+
+        constexpr bool is_equ_n(const_str a, unsigned ai, const_str b, unsigned bi, unsigned n)
+        {
+            return ai + n > a.size() || bi + n > b.size() ? false :
+                   n == 0                                 ? true :
+                   a[ai] != b[bi]                         ? false :
+                                                            is_equ_n(a, ai + 1, b, bi + 1, n - 1);
+        }
+
+        constexpr bool is_int(const_str s, unsigned i)
+        {
+            return is_equ_n(s, i, "<int>", 0, 5);
+        }
+
+        constexpr bool is_uint(const_str s, unsigned i)
+        {
+            return is_equ_n(s, i, "<uint>", 0, 6);
+        }
+
+        constexpr bool is_float(const_str s, unsigned i)
+        {
+            return is_equ_n(s, i, "<float>", 0, 7) ||
+                   is_equ_n(s, i, "<double>", 0, 8);
+        }
+
+        constexpr bool is_str(const_str s, unsigned i)
+        {
+            return is_equ_n(s, i, "<str>", 0, 5) ||
+                   is_equ_n(s, i, "<string>", 0, 8);
+        }
+
+        constexpr bool is_path(const_str s, unsigned i)
+        {
+            return is_equ_n(s, i, "<path>", 0, 6);
+        }
+#endif
+        template<typename T>
+        struct parameter_tag
+        {
+            static const int value = 0;
+        };
+#define CROW_INTERNAL_PARAMETER_TAG(t, i) \
+    template<>                            \
+    struct parameter_tag<t>               \
+    {                                     \
+        static const int value = i;       \
+    }
+        CROW_INTERNAL_PARAMETER_TAG(int, 1);
+        CROW_INTERNAL_PARAMETER_TAG(char, 1);
+        CROW_INTERNAL_PARAMETER_TAG(short, 1);
+        CROW_INTERNAL_PARAMETER_TAG(long, 1);
+        CROW_INTERNAL_PARAMETER_TAG(long long, 1);
+        CROW_INTERNAL_PARAMETER_TAG(unsigned int, 2);
+        CROW_INTERNAL_PARAMETER_TAG(unsigned char, 2);
+        CROW_INTERNAL_PARAMETER_TAG(unsigned short, 2);
+        CROW_INTERNAL_PARAMETER_TAG(unsigned long, 2);
+        CROW_INTERNAL_PARAMETER_TAG(unsigned long long, 2);
+        CROW_INTERNAL_PARAMETER_TAG(double, 3);
+        CROW_INTERNAL_PARAMETER_TAG(std::string, 4);
+#undef CROW_INTERNAL_PARAMETER_TAG
+        template<typename... Args>
+        struct compute_parameter_tag_from_args_list;
+
+        template<>
+        struct compute_parameter_tag_from_args_list<>
+        {
+            static const int value = 0;
+        };
+
+        template<typename Arg, typename... Args>
+        struct compute_parameter_tag_from_args_list<Arg, Args...>
+        {
+            static const int sub_value =
+              compute_parameter_tag_from_args_list<Args...>::value;
+            static const int value =
+              parameter_tag<typename std::decay<Arg>::type>::value ? sub_value * 6 + parameter_tag<typename std::decay<Arg>::type>::value : sub_value;
+        };
+
+        static inline bool is_parameter_tag_compatible(uint64_t a, uint64_t b)
+        {
+            if (a == 0)
+                return b == 0;
+            if (b == 0)
+                return a == 0;
+            int sa = a % 6;
+            int sb = a % 6;
+            if (sa == 5) sa = 4;
+            if (sb == 5) sb = 4;
+            if (sa != sb)
+                return false;
+            return is_parameter_tag_compatible(a / 6, b / 6);
+        }
+
+        static inline unsigned find_closing_tag_runtime(const char* s, unsigned p)
+        {
+            return s[p] == 0   ? throw std::runtime_error("unmatched tag <") :
+                   s[p] == '>' ? p :
+                                 find_closing_tag_runtime(s, p + 1);
+        }
+
+        static inline uint64_t get_parameter_tag_runtime(const char* s, unsigned p = 0)
+        {
+            return s[p] == 0   ? 0 :
+                   s[p] == '<' ? (
+                                   std::strncmp(s + p, "<int>", 5) == 0  ? get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 1 :
+                                   std::strncmp(s + p, "<uint>", 6) == 0 ? get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 2 :
+                                   (std::strncmp(s + p, "<float>", 7) == 0 ||
+                                    std::strncmp(s + p, "<double>", 8) == 0) ?
+                                                                           get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 3 :
+                                   (std::strncmp(s + p, "<str>", 5) == 0 ||
+                                    std::strncmp(s + p, "<string>", 8) == 0) ?
+                                                                           get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 4 :
+                                   std::strncmp(s + p, "<path>", 6) == 0 ? get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 5 :
+                                                                           throw std::runtime_error("invalid parameter type")) :
+                                 get_parameter_tag_runtime(s, p + 1);
+        }
+#ifndef CROW_MSVC_WORKAROUND
+        constexpr uint64_t get_parameter_tag(const_str s, unsigned p = 0)
+        {
+            return p == s.size() ? 0 :
+                   s[p] == '<'   ? (
+                                   is_int(s, p)   ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 1 :
+                                     is_uint(s, p)  ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 2 :
+                                     is_float(s, p) ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 3 :
+                                     is_str(s, p)   ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 4 :
+                                     is_path(s, p)  ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 5 :
+                                                      throw std::runtime_error("invalid parameter type")) :
+                                 get_parameter_tag(s, p + 1);
+        }
+#endif
+
+        template<typename... T>
+        struct S
+        {
+            template<typename U>
+            using push = S<U, T...>;
+            template<typename U>
+            using push_back = S<T..., U>;
+            template<template<typename... Args> class U>
+            using rebind = U<T...>;
+        };
+
+        // Check whether the template function can be called with specific arguments
+        template<typename F, typename Set>
+        struct CallHelper;
+        template<typename F, typename... Args>
+        struct CallHelper<F, S<Args...>>
+        {
+            template<typename F1, typename... Args1, typename = decltype(std::declval<F1>()(std::declval<Args1>()...))>
+            static char __test(int);
+
+            template<typename...>
+            static int __test(...);
+
+            static constexpr bool value = sizeof(__test<F, Args...>(0)) == sizeof(char);
+        };
+
+        // Check Tuple contains type T
+        template<typename T, typename Tuple>
+        struct has_type;
+
+        template<typename T>
+        struct has_type<T, std::tuple<>> : std::false_type
+        {};
+
+        template<typename T, typename U, typename... Ts>
+        struct has_type<T, std::tuple<U, Ts...>> : has_type<T, std::tuple<Ts...>>
+        {};
+
+        template<typename T, typename... Ts>
+        struct has_type<T, std::tuple<T, Ts...>> : std::true_type
+        {};
+
+        // Find index of type in tuple
+        template<class T, class Tuple>
+        struct tuple_index;
+
+        template<class T, class... Types>
+        struct tuple_index<T, std::tuple<T, Types...>>
+        {
+            static const int value = 0;
+        };
+
+        template<class T, class U, class... Types>
+        struct tuple_index<T, std::tuple<U, Types...>>
+        {
+            static const int value = 1 + tuple_index<T, std::tuple<Types...>>::value;
+        };
+
+        // Extract element from forward tuple or get default
+#ifdef CROW_CAN_USE_CPP14
+        template<typename T, typename Tup>
+        typename std::enable_if<has_type<T&, Tup>::value, typename std::decay<T>::type&&>::type
+          tuple_extract(Tup& tup)
+        {
+            return std::move(std::get<T&>(tup));
+        }
+#else
+        template<typename T, typename Tup>
+        typename std::enable_if<has_type<T&, Tup>::value, T&&>::type
+          tuple_extract(Tup& tup)
+        {
+            return std::move(std::get<tuple_index<T&, Tup>::value>(tup));
+        }
+#endif
+
+        template<typename T, typename Tup>
+        typename std::enable_if<!has_type<T&, Tup>::value, T>::type
+          tuple_extract(Tup&)
+        {
+            return T{};
+        }
+
+        // Kind of fold expressions in C++11
+        template<bool...>
+        struct bool_pack;
+        template<bool... bs>
+        using all_true = std::is_same<bool_pack<bs..., true>, bool_pack<true, bs...>>;
+
+        template<int N>
+        struct single_tag_to_type
+        {};
+
+        template<>
+        struct single_tag_to_type<1>
+        {
+            using type = int64_t;
+        };
+
+        template<>
+        struct single_tag_to_type<2>
+        {
+            using type = uint64_t;
+        };
+
+        template<>
+        struct single_tag_to_type<3>
+        {
+            using type = double;
+        };
+
+        template<>
+        struct single_tag_to_type<4>
+        {
+            using type = std::string;
+        };
+
+        template<>
+        struct single_tag_to_type<5>
+        {
+            using type = std::string;
+        };
+
+
+        template<uint64_t Tag>
+        struct arguments
+        {
+            using subarguments = typename arguments<Tag / 6>::type;
+            using type =
+              typename subarguments::template push<typename single_tag_to_type<Tag % 6>::type>;
+        };
+
+        template<>
+        struct arguments<0>
+        {
+            using type = S<>;
+        };
+
+        template<typename... T>
+        struct last_element_type
+        {
+            using type = typename std::tuple_element<sizeof...(T) - 1, std::tuple<T...>>::type;
+        };
+
+
+        template<>
+        struct last_element_type<>
+        {};
+
+
+        // from http://stackoverflow.com/questions/13072359/c11-compile-time-array-with-logarithmic-evaluation-depth
+        template<class T>
+        using Invoke = typename T::type;
+
+        template<unsigned...>
+        struct seq
+        {
+            using type = seq;
+        };
+
+        template<class S1, class S2>
+        struct concat;
+
+        template<unsigned... I1, unsigned... I2>
+        struct concat<seq<I1...>, seq<I2...>> : seq<I1..., (sizeof...(I1) + I2)...>
+        {};
+
+        template<class S1, class S2>
+        using Concat = Invoke<concat<S1, S2>>;
+
+        template<unsigned N>
+        struct gen_seq;
+        template<unsigned N>
+        using GenSeq = Invoke<gen_seq<N>>;
+
+        template<unsigned N>
+        struct gen_seq : Concat<GenSeq<N / 2>, GenSeq<N - N / 2>>
+        {};
+
+        template<>
+        struct gen_seq<0> : seq<>
+        {};
+        template<>
+        struct gen_seq<1> : seq<0>
+        {};
+
+        template<typename Seq, typename Tuple>
+        struct pop_back_helper;
+
+        template<unsigned... N, typename Tuple>
+        struct pop_back_helper<seq<N...>, Tuple>
+        {
+            template<template<typename... Args> class U>
+            using rebind = U<typename std::tuple_element<N, Tuple>::type...>;
+        };
+
+        template<typename... T>
+        struct pop_back //: public pop_back_helper<typename gen_seq<sizeof...(T)-1>::type, std::tuple<T...>>
+        {
+            template<template<typename... Args> class U>
+            using rebind = typename pop_back_helper<typename gen_seq<sizeof...(T) - 1>::type, std::tuple<T...>>::template rebind<U>;
+        };
+
+        template<>
+        struct pop_back<>
+        {
+            template<template<typename... Args> class U>
+            using rebind = U<>;
+        };
+
+        // from http://stackoverflow.com/questions/2118541/check-if-c0x-parameter-pack-contains-a-type
+        template<typename Tp, typename... List>
+        struct contains : std::true_type
+        {};
+
+        template<typename Tp, typename Head, typename... Rest>
+        struct contains<Tp, Head, Rest...> : std::conditional<std::is_same<Tp, Head>::value, std::true_type, contains<Tp, Rest...>>::type
+        {};
+
+        template<typename Tp>
+        struct contains<Tp> : std::false_type
+        {};
+
+        template<typename T>
+        struct empty_context
+        {};
+
+        template<typename T>
+        struct promote
+        {
+            using type = T;
+        };
+
+#define CROW_INTERNAL_PROMOTE_TYPE(t1, t2) \
+    template<>                             \
+    struct promote<t1>                     \
+    {                                      \
+        using type = t2;                   \
+    }
+
+        CROW_INTERNAL_PROMOTE_TYPE(char, int64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(short, int64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(int, int64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(long, int64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(long long, int64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(unsigned char, uint64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(unsigned short, uint64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(unsigned int, uint64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(unsigned long, uint64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(unsigned long long, uint64_t);
+        CROW_INTERNAL_PROMOTE_TYPE(float, double);
+#undef CROW_INTERNAL_PROMOTE_TYPE
+
+        template<typename T>
+        using promote_t = typename promote<T>::type;
+
+    } // namespace black_magic
+
+    namespace detail
+    {
+
+        template<class T, std::size_t N, class... Args>
+        struct get_index_of_element_from_tuple_by_type_impl
+        {
+            static constexpr auto value = N;
+        };
+
+        template<class T, std::size_t N, class... Args>
+        struct get_index_of_element_from_tuple_by_type_impl<T, N, T, Args...>
+        {
+            static constexpr auto value = N;
+        };
+
+        template<class T, std::size_t N, class U, class... Args>
+        struct get_index_of_element_from_tuple_by_type_impl<T, N, U, Args...>
+        {
+            static constexpr auto value = get_index_of_element_from_tuple_by_type_impl<T, N + 1, Args...>::value;
+        };
+    } // namespace detail
+
+    namespace utility
+    {
+        template<class T, class... Args>
+        T& get_element_by_type(std::tuple<Args...>& t)
+        {
+            return std::get<detail::get_index_of_element_from_tuple_by_type_impl<T, 0, Args...>::value>(t);
+        }
+
+        template<typename T>
+        struct function_traits;
+
+#ifndef CROW_MSVC_WORKAROUND
+        template<typename T>
+        struct function_traits : public function_traits<decltype(&T::operator())>
+        {
+            using parent_t = function_traits<decltype(&T::operator())>;
+            static const size_t arity = parent_t::arity;
+            using result_type = typename parent_t::result_type;
+            template<size_t i>
+            using arg = typename parent_t::template arg<i>;
+        };
+#endif
+
+        template<typename ClassType, typename R, typename... Args>
+        struct function_traits<R (ClassType::*)(Args...) const>
+        {
+            static const size_t arity = sizeof...(Args);
+
+            typedef R result_type;
+
+            template<size_t i>
+            using arg = typename std::tuple_element<i, std::tuple<Args...>>::type;
+        };
+
+        template<typename ClassType, typename R, typename... Args>
+        struct function_traits<R (ClassType::*)(Args...)>
+        {
+            static const size_t arity = sizeof...(Args);
+
+            typedef R result_type;
+
+            template<size_t i>
+            using arg = typename std::tuple_element<i, std::tuple<Args...>>::type;
+        };
+
+        template<typename R, typename... Args>
+        struct function_traits<std::function<R(Args...)>>
+        {
+            static const size_t arity = sizeof...(Args);
+
+            typedef R result_type;
+
+            template<size_t i>
+            using arg = typename std::tuple_element<i, std::tuple<Args...>>::type;
+        };
+        /// @endcond
+
+        inline static std::string base64encode(const unsigned char* data, size_t size, const char* key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")
+        {
+            std::string ret;
+            ret.resize((size + 2) / 3 * 4);
+            auto it = ret.begin();
+            while (size >= 3)
+            {
+                *it++ = key[(static_cast<unsigned char>(*data) & 0xFC) >> 2];
+                unsigned char h = (static_cast<unsigned char>(*data++) & 0x03) << 4;
+                *it++ = key[h | ((static_cast<unsigned char>(*data) & 0xF0) >> 4)];
+                h = (static_cast<unsigned char>(*data++) & 0x0F) << 2;
+                *it++ = key[h | ((static_cast<unsigned char>(*data) & 0xC0) >> 6)];
+                *it++ = key[static_cast<unsigned char>(*data++) & 0x3F];
+
+                size -= 3;
+            }
+            if (size == 1)
+            {
+                *it++ = key[(static_cast<unsigned char>(*data) & 0xFC) >> 2];
+                unsigned char h = (static_cast<unsigned char>(*data++) & 0x03) << 4;
+                *it++ = key[h];
+                *it++ = '=';
+                *it++ = '=';
+            }
+            else if (size == 2)
+            {
+                *it++ = key[(static_cast<unsigned char>(*data) & 0xFC) >> 2];
+                unsigned char h = (static_cast<unsigned char>(*data++) & 0x03) << 4;
+                *it++ = key[h | ((static_cast<unsigned char>(*data) & 0xF0) >> 4)];
+                h = (static_cast<unsigned char>(*data++) & 0x0F) << 2;
+                *it++ = key[h];
+                *it++ = '=';
+            }
+            return ret;
+        }
+
+        inline static std::string base64encode(std::string data, size_t size, const char* key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")
+        {
+            return base64encode((const unsigned char*)data.c_str(), size, key);
+        }
+
+        inline static std::string base64encode_urlsafe(const unsigned char* data, size_t size)
+        {
+            return base64encode(data, size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_");
+        }
+
+        inline static std::string base64encode_urlsafe(std::string data, size_t size)
+        {
+            return base64encode((const unsigned char*)data.c_str(), size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_");
+        }
+
+        inline static std::string base64decode(const char* data, size_t size)
+        {
+            // We accept both regular and url encoding here, as there does not seem to be any downside to that.
+            // If we want to distinguish that we should use +/ for non-url and -_ for url.
+
+            // Mapping logic from characters to [0-63]
+            auto key = [](char c) -> unsigned char {
+                if ((c >= 'A') && (c <= 'Z')) return c - 'A';
+                if ((c >= 'a') && (c <= 'z')) return c - 'a' + 26;
+                if ((c >= '0') && (c <= '9')) return c - '0' + 52;
+                if ((c == '+') || (c == '-')) return 62;
+                if ((c == '/') || (c == '_')) return 63;
+                return 0;
+            };
+
+            // Not padded
+            if (size % 4 == 2)             // missing last 2 characters
+                size = (size / 4 * 3) + 1; // Not subtracting extra characters because they're truncated in int division
+            else if (size % 4 == 3)        // missing last character
+                size = (size / 4 * 3) + 2; // Not subtracting extra characters because they're truncated in int division
+
+            // Padded
+            else if (data[size - 2] == '=') // padded with '=='
+                size = (size / 4 * 3) - 2;  // == padding means the last block only has 1 character instead of 3, hence the '-2'
+            else if (data[size - 1] == '=') // padded with '='
+                size = (size / 4 * 3) - 1;  // = padding means the last block only has 2 character instead of 3, hence the '-1'
+
+            // Padding not needed
+            else
+                size = size / 4 * 3;
+
+            std::string ret;
+            ret.resize(size);
+            auto it = ret.begin();
+
+            // These will be used to decode 1 character at a time
+            unsigned char odd;  // char1 and char3
+            unsigned char even; // char2 and char4
+
+            // Take 4 character blocks to turn into 3
+            while (size >= 3)
+            {
+                // dec_char1 = (char1 shifted 2 bits to the left) OR ((char2 AND 00110000) shifted 4 bits to the right))
+                odd = key(*data++);
+                even = key(*data++);
+                *it++ = (odd << 2) | ((even & 0x30) >> 4);
+                // dec_char2 = ((char2 AND 00001111) shifted 4 bits left) OR ((char3 AND 00111100) shifted 2 bits right))
+                odd = key(*data++);
+                *it++ = ((even & 0x0F) << 4) | ((odd & 0x3C) >> 2);
+                // dec_char3 = ((char3 AND 00000011) shifted 6 bits left) OR (char4)
+                even = key(*data++);
+                *it++ = ((odd & 0x03) << 6) | (even);
+
+                size -= 3;
+            }
+            if (size == 2)
+            {
+                // d_char1 = (char1 shifted 2 bits to the left) OR ((char2 AND 00110000) shifted 4 bits to the right))
+                odd = key(*data++);
+                even = key(*data++);
+                *it++ = (odd << 2) | ((even & 0x30) >> 4);
+                // d_char2 = ((char2 AND 00001111) shifted 4 bits left) OR ((char3 AND 00111100) shifted 2 bits right))
+                odd = key(*data++);
+                *it++ = ((even & 0x0F) << 4) | ((odd & 0x3C) >> 2);
+            }
+            else if (size == 1)
+            {
+                // d_char1 = (char1 shifted 2 bits to the left) OR ((char2 AND 00110000) shifted 4 bits to the right))
+                odd = key(*data++);
+                even = key(*data++);
+                *it++ = (odd << 2) | ((even & 0x30) >> 4);
+            }
+            return ret;
+        }
+
+        inline static std::string base64decode(const std::string& data, size_t size)
+        {
+            return base64decode(data.data(), size);
+        }
+
+        inline static std::string base64decode(const std::string& data)
+        {
+            return base64decode(data.data(), data.length());
+        }
+
+        inline static std::string normalize_path(const std::string& directoryPath)
+        {
+            std::string normalizedPath = directoryPath;
+            std::replace(normalizedPath.begin(), normalizedPath.end(), '\\', '/');
+            if (!normalizedPath.empty() && normalizedPath.back() != '/')
+                normalizedPath += '/';
+            return normalizedPath;
+        }
+
+        inline static void sanitize_filename(std::string& data, char replacement = '_')
+        {
+            if (data.length() > 255)
+                data.resize(255);
+
+            static const auto toUpper = [](char c) {
+                return ((c >= 'a') && (c <= 'z')) ? (c - ('a' - 'A')) : c;
+            };
+            // Check for special device names. The Windows behavior is really odd here, it will consider both AUX and AUX.txt
+            // a special device. Thus we search for the string (case-insensitive), and then check if the string ends or if
+            // is has a dangerous follow up character (.:\/)
+            auto sanitizeSpecialFile = [](std::string& source, unsigned ofs, const char* pattern, bool includeNumber, char replacement) {
+                unsigned i = ofs;
+                size_t len = source.length();
+                const char* p = pattern;
+                while (*p)
+                {
+                    if (i >= len) return;
+                    if (toUpper(source[i]) != *p) return;
+                    ++i;
+                    ++p;
+                }
+                if (includeNumber)
+                {
+                    if ((i >= len) || (source[i] < '1') || (source[i] > '9')) return;
+                    ++i;
+                }
+                if ((i >= len) || (source[i] == '.') || (source[i] == ':') || (source[i] == '/') || (source[i] == '\\'))
+                {
+                    source.erase(ofs + 1, (i - ofs) - 1);
+                    source[ofs] = replacement;
+                }
+            };
+            bool checkForSpecialEntries = true;
+            for (unsigned i = 0; i < data.length(); ++i)
+            {
+                // Recognize directory traversals and the special devices CON/PRN/AUX/NULL/COM[1-]/LPT[1-9]
+                if (checkForSpecialEntries)
+                {
+                    checkForSpecialEntries = false;
+                    switch (toUpper(data[i]))
+                    {
+                        case 'A':
+                            sanitizeSpecialFile(data, i, "AUX", false, replacement);
+                            break;
+                        case 'C':
+                            sanitizeSpecialFile(data, i, "CON", false, replacement);
+                            sanitizeSpecialFile(data, i, "COM", true, replacement);
+                            break;
+                        case 'L':
+                            sanitizeSpecialFile(data, i, "LPT", true, replacement);
+                            break;
+                        case 'N':
+                            sanitizeSpecialFile(data, i, "NUL", false, replacement);
+                            break;
+                        case 'P':
+                            sanitizeSpecialFile(data, i, "PRN", false, replacement);
+                            break;
+                        case '.':
+                            sanitizeSpecialFile(data, i, "..", false, replacement);
+                            break;
+                    }
+                }
+
+                // Sanitize individual characters
+                unsigned char c = data[i];
+                if ((c < ' ') || ((c >= 0x80) && (c <= 0x9F)) || (c == '?') || (c == '<') || (c == '>') || (c == ':') || (c == '*') || (c == '|') || (c == '\"'))
+                {
+                    data[i] = replacement;
+                }
+                else if ((c == '/') || (c == '\\'))
+                {
+                    if (CROW_UNLIKELY(i == 0)) //Prevent Unix Absolute Paths (Windows Absolute Paths are prevented with `(c == ':')`)
+                    {
+                        data[i] = replacement;
+                    }
+                    else
+                    {
+                        checkForSpecialEntries = true;
+                    }
+                }
+            }
+        }
+
+        inline static std::string random_alphanum(std::size_t size)
+        {
+            static const char alphabet[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+            std::random_device dev;
+            std::mt19937 rng(dev());
+            std::uniform_int_distribution<std::mt19937::result_type> dist(0, sizeof(alphabet) - 2);
+            std::string out;
+            out.reserve(size);
+            for (std::size_t i = 0; i < size; i++)
+                out.push_back(alphabet[dist(rng)]);
+            return out;
+        }
+
+        inline static std::string join_path(std::string path, const std::string& fname)
+        {
+#if defined(CROW_CAN_USE_CPP17) && !defined(CROW_FILESYSTEM_IS_EXPERIMENTAL)
+            return (std::filesystem::path(path) / fname).string();
+#else
+            if (!(path.back() == '/' || path.back() == '\\'))
+                path += '/';
+            path += fname;
+            return path;
+#endif
+        }
+
+        /**
+         * @brief Checks two string for equality.
+         * Always returns false if strings differ in size.
+         * Defaults to case-insensitive comparison.
+         */
+        inline static bool string_equals(const std::string& l, const std::string& r, bool case_sensitive = false)
+        {
+            if (l.length() != r.length())
+                return false;
+
+            for (size_t i = 0; i < l.length(); i++)
+            {
+                if (case_sensitive)
+                {
+                    if (l[i] != r[i])
+                        return false;
+                }
+                else
+                {
+                    if (std::toupper(l[i]) != std::toupper(r[i]))
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        template<typename T, typename U>
+        inline static T lexical_cast(const U& v)
+        {
+            std::stringstream stream;
+            T res;
+
+            stream << v;
+            stream >> res;
+
+            return res;
+        }
+
+        template<typename T>
+        inline static T lexical_cast(const char* v, size_t count)
+        {
+            std::stringstream stream;
+            T res;
+
+            stream.write(v, count);
+            stream >> res;
+
+            return res;
+        }
+
+
+        /// Return a copy of the given string with its
+        /// leading and trailing whitespaces removed.
+        inline static std::string trim(const std::string& v)
+        {
+            if (v.empty())
+                return "";
+
+            size_t begin = 0, end = v.length();
+
+            size_t i;
+            for (i = 0; i < v.length(); i++)
+            {
+                if (!std::isspace(v[i]))
+                {
+                    begin = i;
+                    break;
+                }
+            }
+
+            if (i == v.length())
+                return "";
+
+            for (i = v.length(); i > 0; i--)
+            {
+                if (!std::isspace(v[i - 1]))
+                {
+                    end = i;
+                    break;
+                }
+            }
+
+            return v.substr(begin, end - begin);
+        }
+    } // namespace utility
+} // namespace crow
+
+
+#include <locale>
+#include <unordered_map>
+
+namespace crow
+{
+    /// Hashing function for ci_map (unordered_multimap).
+    struct ci_hash
+    {
+        size_t operator()(const std::string& key) const
+        {
+            std::size_t seed = 0;
+            std::locale locale;
+
+            for (auto c : key)
+                hash_combine(seed, std::toupper(c, locale));
+
+            return seed;
+        }
+
+    private:
+        static inline void hash_combine(std::size_t& seed, char v)
+        {
+            std::hash<char> hasher;
+            seed ^= hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+        }
+    };
+
+    /// Equals function for ci_map (unordered_multimap).
+    struct ci_key_eq
+    {
+        bool operator()(const std::string& l, const std::string& r) const
+        {
+            return utility::string_equals(l, r);
+        }
+    };
+
+    using ci_map = std::unordered_multimap<std::string, std::string, ci_hash, ci_key_eq>;
+} // namespace crow
+
+
+#include <vector>
+#include <string>
+#include <stdexcept>
+#include <iostream>
+
+namespace crow
+{
+    const char cr = '\r';
+    const char lf = '\n';
+    const std::string crlf("\r\n");
+
+    enum class HTTPMethod : char
+    {
+#ifndef DELETE
+        DELETE = 0,
+        GET,
+        HEAD,
+        POST,
+        PUT,
+
+        CONNECT,
+        OPTIONS,
+        TRACE,
+
+        PATCH,
+        PURGE,
+
+        COPY,
+        LOCK,
+        MKCOL,
+        MOVE,
+        PROPFIND,
+        PROPPATCH,
+        SEARCH,
+        UNLOCK,
+        BIND,
+        REBIND,
+        UNBIND,
+        ACL,
+
+        REPORT,
+        MKACTIVITY,
+        CHECKOUT,
+        MERGE,
+
+        MSEARCH,
+        NOTIFY,
+        SUBSCRIBE,
+        UNSUBSCRIBE,
+
+        MKCALENDAR,
+
+        LINK,
+        UNLINK,
+
+        SOURCE,
+#endif
+
+        Delete = 0,
+        Get,
+        Head,
+        Post,
+        Put,
+
+        Connect,
+        Options,
+        Trace,
+
+        Patch,
+        Purge,
+
+        Copy,
+        Lock,
+        MkCol,
+        Move,
+        Propfind,
+        Proppatch,
+        Search,
+        Unlock,
+        Bind,
+        Rebind,
+        Unbind,
+        Acl,
+
+        Report,
+        MkActivity,
+        Checkout,
+        Merge,
+
+        MSearch,
+        Notify,
+        Subscribe,
+        Unsubscribe,
+
+        MkCalendar,
+
+        Link,
+        Unlink,
+
+        Source,
+
+
+        InternalMethodCount,
+        // should not add an item below this line: used for array count
+    };
+
+    constexpr const char* method_strings[] =
+      {
+        "DELETE",
+        "GET",
+        "HEAD",
+        "POST",
+        "PUT",
+
+        "CONNECT",
+        "OPTIONS",
+        "TRACE",
+
+        "PATCH",
+        "PURGE",
+
+        "COPY",
+        "LOCK",
+        "MKCOL",
+        "MOVE",
+        "PROPFIND",
+        "PROPPATCH",
+        "SEARCH",
+        "UNLOCK",
+        "BIND",
+        "REBIND",
+        "UNBIND",
+        "ACL",
+
+        "REPORT",
+        "MKACTIVITY",
+        "CHECKOUT",
+        "MERGE",
+
+        "M-SEARCH",
+        "NOTIFY",
+        "SUBSCRIBE",
+        "UNSUBSCRIBE",
+
+        "MKCALENDAR",
+
+        "LINK",
+        "UNLINK",
+
+        "SOURCE"};
+
+
+    inline std::string method_name(HTTPMethod method)
+    {
+        if (CROW_LIKELY(method < HTTPMethod::InternalMethodCount))
+        {
+            return method_strings[(unsigned char)method];
+        }
+        return "invalid";
+    }
+
+    // clang-format off
+
+    enum status
+    {
+        CONTINUE                      = 100,
+        SWITCHING_PROTOCOLS           = 101,
+
+        OK                            = 200,
+        CREATED                       = 201,
+        ACCEPTED                      = 202,
+        NON_AUTHORITATIVE_INFORMATION = 203,
+        NO_CONTENT                    = 204,
+        RESET_CONTENT                 = 205,
+        PARTIAL_CONTENT               = 206,
+
+        MULTIPLE_CHOICES              = 300,
+        MOVED_PERMANENTLY             = 301,
+        FOUND                         = 302,
+        SEE_OTHER                     = 303,
+        NOT_MODIFIED                  = 304,
+        TEMPORARY_REDIRECT            = 307,
+        PERMANENT_REDIRECT            = 308,
+
+        BAD_REQUEST                   = 400,
+        UNAUTHORIZED                  = 401,
+        FORBIDDEN                     = 403,
+        NOT_FOUND                     = 404,
+        METHOD_NOT_ALLOWED            = 405,
+        NOT_ACCEPTABLE                = 406,
+        PROXY_AUTHENTICATION_REQUIRED = 407,
+        CONFLICT                      = 409,
+        GONE                          = 410,
+        PAYLOAD_TOO_LARGE             = 413,
+        UNSUPPORTED_MEDIA_TYPE        = 415,
+        RANGE_NOT_SATISFIABLE         = 416,
+        EXPECTATION_FAILED            = 417,
+        PRECONDITION_REQUIRED         = 428,
+        TOO_MANY_REQUESTS             = 429,
+        UNAVAILABLE_FOR_LEGAL_REASONS = 451,
+
+        INTERNAL_SERVER_ERROR         = 500,
+        NOT_IMPLEMENTED               = 501,
+        BAD_GATEWAY                   = 502,
+        SERVICE_UNAVAILABLE           = 503,
+        GATEWAY_TIMEOUT               = 504,
+        VARIANT_ALSO_NEGOTIATES       = 506
+    };
+
+    // clang-format on
+
+    enum class ParamType : char
+    {
+        INT,
+        UINT,
+        DOUBLE,
+        STRING,
+        PATH,
+
+        MAX
+    };
+
+    /// @cond SKIP
+    struct routing_params
+    {
+        std::vector<int64_t> int_params;
+        std::vector<uint64_t> uint_params;
+        std::vector<double> double_params;
+        std::vector<std::string> string_params;
+
+        void debug_print() const
+        {
+            std::cerr << "routing_params" << std::endl;
+            for (auto i : int_params)
+                std::cerr << i << ", ";
+            std::cerr << std::endl;
+            for (auto i : uint_params)
+                std::cerr << i << ", ";
+            std::cerr << std::endl;
+            for (auto i : double_params)
+                std::cerr << i << ", ";
+            std::cerr << std::endl;
+            for (auto& i : string_params)
+                std::cerr << i << ", ";
+            std::cerr << std::endl;
+        }
+
+        template<typename T>
+        T get(unsigned) const;
+    };
+
+    template<>
+    inline int64_t routing_params::get<int64_t>(unsigned index) const
+    {
+        return int_params[index];
+    }
+
+    template<>
+    inline uint64_t routing_params::get<uint64_t>(unsigned index) const
+    {
+        return uint_params[index];
+    }
+
+    template<>
+    inline double routing_params::get<double>(unsigned index) const
+    {
+        return double_params[index];
+    }
+
+    template<>
+    inline std::string routing_params::get<std::string>(unsigned index) const
+    {
+        return string_params[index];
+    }
+    /// @endcond
+
+    struct routing_handle_result
+    {
+        uint16_t rule_index;
+        std::vector<uint16_t> blueprint_indices;
+        routing_params r_params;
+        HTTPMethod method;
+
+        routing_handle_result() {}
+
+        routing_handle_result(uint16_t rule_index_, std::vector<uint16_t> blueprint_indices_, routing_params r_params_):
+          rule_index(rule_index_),
+          blueprint_indices(blueprint_indices_),
+          r_params(r_params_) {}
+
+        routing_handle_result(uint16_t rule_index_, std::vector<uint16_t> blueprint_indices_, routing_params r_params_, HTTPMethod method_):
+          rule_index(rule_index_),
+          blueprint_indices(blueprint_indices_),
+          r_params(r_params_),
+          method(method_) {}
+    };
+} // namespace crow
+
+// clang-format off
+#ifndef CROW_MSVC_WORKAROUND
+constexpr crow::HTTPMethod method_from_string(const char* str)
+{
+    return crow::black_magic::is_equ_p(str, "GET", 3)    ? crow::HTTPMethod::Get :
+           crow::black_magic::is_equ_p(str, "DELETE", 6) ? crow::HTTPMethod::Delete :
+           crow::black_magic::is_equ_p(str, "HEAD", 4)   ? crow::HTTPMethod::Head :
+           crow::black_magic::is_equ_p(str, "POST", 4)   ? crow::HTTPMethod::Post :
+           crow::black_magic::is_equ_p(str, "PUT", 3)    ? crow::HTTPMethod::Put :
+
+           crow::black_magic::is_equ_p(str, "OPTIONS", 7) ? crow::HTTPMethod::Options :
+           crow::black_magic::is_equ_p(str, "CONNECT", 7) ? crow::HTTPMethod::Connect :
+           crow::black_magic::is_equ_p(str, "TRACE", 5)   ? crow::HTTPMethod::Trace :
+
+           crow::black_magic::is_equ_p(str, "PATCH", 5)     ? crow::HTTPMethod::Patch :
+           crow::black_magic::is_equ_p(str, "PURGE", 5)     ? crow::HTTPMethod::Purge :
+           crow::black_magic::is_equ_p(str, "COPY", 4)      ? crow::HTTPMethod::Copy :
+           crow::black_magic::is_equ_p(str, "LOCK", 4)      ? crow::HTTPMethod::Lock :
+           crow::black_magic::is_equ_p(str, "MKCOL", 5)     ? crow::HTTPMethod::MkCol :
+           crow::black_magic::is_equ_p(str, "MOVE", 4)      ? crow::HTTPMethod::Move :
+           crow::black_magic::is_equ_p(str, "PROPFIND", 8)  ? crow::HTTPMethod::Propfind :
+           crow::black_magic::is_equ_p(str, "PROPPATCH", 9) ? crow::HTTPMethod::Proppatch :
+           crow::black_magic::is_equ_p(str, "SEARCH", 6)    ? crow::HTTPMethod::Search :
+           crow::black_magic::is_equ_p(str, "UNLOCK", 6)    ? crow::HTTPMethod::Unlock :
+           crow::black_magic::is_equ_p(str, "BIND", 4)      ? crow::HTTPMethod::Bind :
+           crow::black_magic::is_equ_p(str, "REBIND", 6)    ? crow::HTTPMethod::Rebind :
+           crow::black_magic::is_equ_p(str, "UNBIND", 6)    ? crow::HTTPMethod::Unbind :
+           crow::black_magic::is_equ_p(str, "ACL", 3)       ? crow::HTTPMethod::Acl :
+
+           crow::black_magic::is_equ_p(str, "REPORT", 6)      ? crow::HTTPMethod::Report :
+           crow::black_magic::is_equ_p(str, "MKACTIVITY", 10) ? crow::HTTPMethod::MkActivity :
+           crow::black_magic::is_equ_p(str, "CHECKOUT", 8)    ? crow::HTTPMethod::Checkout :
+           crow::black_magic::is_equ_p(str, "MERGE", 5)       ? crow::HTTPMethod::Merge :
+
+           crow::black_magic::is_equ_p(str, "MSEARCH", 7)      ? crow::HTTPMethod::MSearch :
+           crow::black_magic::is_equ_p(str, "NOTIFY", 6)       ? crow::HTTPMethod::Notify :
+           crow::black_magic::is_equ_p(str, "SUBSCRIBE", 9)    ? crow::HTTPMethod::Subscribe :
+           crow::black_magic::is_equ_p(str, "UNSUBSCRIBE", 11) ? crow::HTTPMethod::Unsubscribe :
+
+           crow::black_magic::is_equ_p(str, "MKCALENDAR", 10) ? crow::HTTPMethod::MkCalendar :
+
+           crow::black_magic::is_equ_p(str, "LINK", 4)   ? crow::HTTPMethod::Link :
+           crow::black_magic::is_equ_p(str, "UNLINK", 6) ? crow::HTTPMethod::Unlink :
+
+           crow::black_magic::is_equ_p(str, "SOURCE", 6) ? crow::HTTPMethod::Source :
+                                                           throw std::runtime_error("invalid http method");
+}
+
+constexpr crow::HTTPMethod operator"" _method(const char* str, size_t /*len*/)
+{
+    return method_from_string( str );
+}
+#endif
+// clang-format on
+
+
+#ifdef CROW_USE_BOOST
+#include <boost/asio.hpp>
+#else
+#ifndef ASIO_STANDALONE
+#define ASIO_STANDALONE
+#endif
+#include <asio.hpp>
+#endif
+
+
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+#ifdef CROW_USE_BOOST
+    namespace asio = boost::asio;
+#endif
+
+    /// Find and return the value associated with the key. (returns an empty string if nothing is found)
+    template<typename T>
+    inline const std::string& get_header_value(const T& headers, const std::string& key)
+    {
+        if (headers.count(key))
+        {
+            return headers.find(key)->second;
+        }
+        static std::string empty;
+        return empty;
+    }
+
+    /// An HTTP request.
+    struct request
+    {
+        HTTPMethod method;
+        std::string raw_url;     ///< The full URL containing the `?` and URL parameters.
+        std::string url;         ///< The endpoint without any parameters.
+        query_string url_params; ///< The parameters associated with the request. (everything after the `?` in the URL)
+        ci_map headers;
+        std::string body;
+        std::string remote_ip_address; ///< The IP address from which the request was sent.
+        unsigned char http_ver_major, http_ver_minor;
+        bool keep_alive,    ///< Whether or not the server should send a `connection: Keep-Alive` header to the client.
+          close_connection, ///< Whether or not the server should shut down the TCP connection once a response is sent.
+          upgrade;          ///< Whether or noth the server should change the HTTP connection to a different connection.
+
+        void* middleware_context{};
+        void* middleware_container{};
+        asio::io_service* io_service{};
+
+        /// Construct an empty request. (sets the method to `GET`)
+        request():
+          method(HTTPMethod::Get)
+        {}
+
+        /// Construct a request with all values assigned.
+        request(HTTPMethod method, std::string raw_url, std::string url, query_string url_params, ci_map headers, std::string body, unsigned char http_major, unsigned char http_minor, bool has_keep_alive, bool has_close_connection, bool is_upgrade):
+          method(method), raw_url(std::move(raw_url)), url(std::move(url)), url_params(std::move(url_params)), headers(std::move(headers)), body(std::move(body)), http_ver_major(http_major), http_ver_minor(http_minor), keep_alive(has_keep_alive), close_connection(has_close_connection), upgrade(is_upgrade)
+        {}
+
+        void add_header(std::string key, std::string value)
+        {
+            headers.emplace(std::move(key), std::move(value));
+        }
+
+        const std::string& get_header_value(const std::string& key) const
+        {
+            return crow::get_header_value(headers, key);
+        }
+
+        bool check_version(unsigned char major, unsigned char minor) const
+        {
+            return http_ver_major == major && http_ver_minor == minor;
+        }
+
+        /// Get the body as parameters in QS format.
+
+        ///
+        /// This is meant to be used with requests of type "application/x-www-form-urlencoded"
+        const query_string get_body_params() const
+        {
+            return query_string(body, false);
+        }
+
+        /// Send data to whoever made this request with a completion handler and return immediately.
+        template<typename CompletionHandler>
+        void post(CompletionHandler handler)
+        {
+            io_service->post(handler);
+        }
+
+        /// Send data to whoever made this request with a completion handler.
+        template<typename CompletionHandler>
+        void dispatch(CompletionHandler handler)
+        {
+            io_service->dispatch(handler);
+        }
+    };
+} // namespace crow
+
+
+#include <string>
+#include <vector>
+#include <sstream>
+
+
+namespace crow
+{
+
+    /// Encapsulates anything related to processing and organizing `multipart/xyz` messages
+    namespace multipart
+    {
+
+        const std::string dd = "--";
+
+        /// The first part in a section, contains metadata about the part
+        struct header
+        {
+            std::string value;                                   ///< The first part of the header, usually `Content-Type` or `Content-Disposition`
+            std::unordered_map<std::string, std::string> params; ///< The parameters of the header, come after the `value`
+
+            operator int() const { return std::stoi(value); }    ///< Returns \ref value as integer
+            operator double() const { return std::stod(value); } ///< Returns \ref value as double
+        };
+
+        /// Multipart header map (key is header key).
+        using mph_map = std::unordered_multimap<std::string, header, ci_hash, ci_key_eq>;
+
+        /// Find and return the value object associated with the key. (returns an empty class if nothing is found)
+        template<typename O, typename T>
+        inline const O& get_header_value_object(const T& headers, const std::string& key)
+        {
+            if (headers.count(key))
+            {
+                return headers.find(key)->second;
+            }
+            static O empty;
+            return empty;
+        }
+
+        /// Same as \ref get_header_value_object() but for \ref multipart.header
+        template<typename T>
+        inline const header& get_header_object(const T& headers, const std::string& key)
+        {
+            return get_header_value_object<header>(headers, key);
+        }
+
+        ///One part of the multipart message
+
+        ///
+        /// It is usually separated from other sections by a `boundary`
+        struct part
+        {
+            mph_map headers;  ///< (optional) The first part before the data, Contains information regarding the type of data and encoding
+            std::string body; ///< The actual data in the part
+
+            operator int() const { return std::stoi(body); }    ///< Returns \ref body as integer
+            operator double() const { return std::stod(body); } ///< Returns \ref body as double
+
+            const header& get_header_object(const std::string& key) const
+            {
+                return multipart::get_header_object(headers, key);
+            }
+        };
+
+        /// Multipart map (key is the name parameter).
+        using mp_map = std::unordered_multimap<std::string, part, ci_hash, ci_key_eq>;
+
+        /// The parsed multipart request/response
+        struct message : public returnable
+        {
+            ci_map headers;          ///< The request/response headers
+            std::string boundary;    ///< The text boundary that separates different `parts`
+            std::vector<part> parts; ///< The individual parts of the message
+            mp_map part_map;         ///< The individual parts of the message, organized in a map with the `name` header parameter being the key
+
+            const std::string& get_header_value(const std::string& key) const
+            {
+                return crow::get_header_value(headers, key);
+            }
+
+            part get_part_by_name(const std::string& name)
+            {
+                mp_map::iterator result = part_map.find(name);
+                if (result != part_map.end())
+                    return result->second;
+                else
+                    return {};
+            }
+
+            /// Represent all parts as a string (**does not include message headers**)
+            std::string dump() const override
+            {
+                std::stringstream str;
+                std::string delimiter = dd + boundary;
+
+                for (unsigned i = 0; i < parts.size(); i++)
+                {
+                    str << delimiter << crlf;
+                    str << dump(i);
+                }
+                str << delimiter << dd << crlf;
+                return str.str();
+            }
+
+            /// Represent an individual part as a string
+            std::string dump(int part_) const
+            {
+                std::stringstream str;
+                part item = parts[part_];
+                for (auto& item_h : item.headers)
+                {
+                    str << item_h.first << ": " << item_h.second.value;
+                    for (auto& it : item_h.second.params)
+                    {
+                        str << "; " << it.first << '=' << pad(it.second);
+                    }
+                    str << crlf;
+                }
+                str << crlf;
+                str << item.body << crlf;
+                return str.str();
+            }
+
+            /// Default constructor using default values
+            message(const ci_map& headers, const std::string& boundary, const std::vector<part>& sections):
+              returnable("multipart/form-data; boundary=CROW-BOUNDARY"), headers(headers), boundary(boundary), parts(sections)
+            {
+                if (!boundary.empty())
+                    content_type = "multipart/form-data; boundary=" + boundary;
+                for (auto& item : parts)
+                {
+                    part_map.emplace(
+                      (get_header_object(item.headers, "Content-Disposition").params.find("name")->second),
+                      item);
+                }
+            }
+
+            /// Create a multipart message from a request data
+            message(const request& req):
+              returnable("multipart/form-data; boundary=CROW-BOUNDARY"),
+              headers(req.headers),
+              boundary(get_boundary(get_header_value("Content-Type")))
+            {
+                if (!boundary.empty())
+                    content_type = "multipart/form-data; boundary=" + boundary;
+                parse_body(req.body, parts, part_map);
+            }
+
+        private:
+            std::string get_boundary(const std::string& header) const
+            {
+                constexpr char boundary_text[] = "boundary=";
+                size_t found = header.find(boundary_text);
+                if (found != std::string::npos)
+                {
+                    std::string to_return(header.substr(found + strlen(boundary_text)));
+                    if (to_return[0] == '\"')
+                    {
+                        to_return = to_return.substr(1, to_return.length() - 2);
+                    }
+                    return to_return;
+                }
+                return std::string();
+            }
+
+            void parse_body(std::string body, std::vector<part>& sections, mp_map& part_map)
+            {
+
+                std::string delimiter = dd + boundary;
+
+                // TODO(EDev): Exit on error
+                while (body != (crlf))
+                {
+                    size_t found = body.find(delimiter);
+                    if (found == std::string::npos)
+                    {
+                        // did not find delimiter; probably an ill-formed body; ignore the rest
+                        break;
+                    }
+                    std::string section = body.substr(0, found);
+
+                    // +2 is the CRLF.
+                    // We don't check it and delete it so that the same delimiter can be used for The last delimiter (--delimiter--CRLF).
+                    body.erase(0, found + delimiter.length() + 2);
+                    if (!section.empty())
+                    {
+                        part parsed_section(parse_section(section));
+                        part_map.emplace(
+                          (get_header_object(parsed_section.headers, "Content-Disposition").params.find("name")->second),
+                          parsed_section);
+                        sections.push_back(std::move(parsed_section));
+                    }
+                }
+            }
+
+            part parse_section(std::string& section)
+            {
+                struct part to_return;
+
+                size_t found = section.find(crlf + crlf);
+                std::string head_line = section.substr(0, found + 2);
+                section.erase(0, found + 4);
+
+                parse_section_head(head_line, to_return);
+                to_return.body = section.substr(0, section.length() - 2);
+                return to_return;
+            }
+
+            void parse_section_head(std::string& lines, part& part)
+            {
+                while (!lines.empty())
+                {
+                    header to_add;
+
+                    size_t found = lines.find(crlf);
+                    std::string line = lines.substr(0, found);
+                    std::string key;
+                    lines.erase(0, found + 2);
+                    // Add the header if available
+                    if (!line.empty())
+                    {
+                        size_t found = line.find("; ");
+                        std::string header = line.substr(0, found);
+                        if (found != std::string::npos)
+                            line.erase(0, found + 2);
+                        else
+                            line = std::string();
+
+                        size_t header_split = header.find(": ");
+                        key = header.substr(0, header_split);
+
+                        to_add.value = header.substr(header_split + 2);
+                    }
+
+                    // Add the parameters
+                    while (!line.empty())
+                    {
+                        size_t found = line.find("; ");
+                        std::string param = line.substr(0, found);
+                        if (found != std::string::npos)
+                            line.erase(0, found + 2);
+                        else
+                            line = std::string();
+
+                        size_t param_split = param.find('=');
+
+                        std::string value = param.substr(param_split + 1);
+
+                        to_add.params.emplace(param.substr(0, param_split), trim(value));
+                    }
+                    part.headers.emplace(key, to_add);
+                }
+            }
+
+            inline std::string trim(std::string& string, const char& excess = '"') const
+            {
+                if (string.length() > 1 && string[0] == excess && string[string.length() - 1] == excess)
+                    return string.substr(1, string.length() - 2);
+                return string;
+            }
+
+            inline std::string pad(std::string& string, const char& padding = '"') const
+            {
+                return (padding + string + padding);
+            }
+        };
+    } // namespace multipart
+} // namespace crow
+
+/* merged revision: 5b951d74bd66ec9d38448e0a85b1cf8b85d97db3 */
+/* updated to     : e13b274770da9b82a1085dec29182acfea72e7a7 (beyond v2.9.5) */
+/* commits not included:
+ * 091ebb87783a58b249062540bbea07de2a11e9cf
+ * 6132d1fefa03f769a3979355d1f5da0b8889cad2
+ * 7ba312397c2a6c851a4b5efe6c1603b1e1bda6ff
+ * d7675453a6c03180572f084e95eea0d02df39164
+ * dff604db203986e532e5a679bafd0e7382c6bdd9 (Might be useful to actually add [upgrade requests with a body])
+ * e01811e7f4894d7f0f7f4bd8492cccec6f6b4038 (related to above)
+ * 05525c5fde1fc562481f6ae08fa7056185325daf (also related to above)
+ * 350258965909f249f9c59823aac240313e0d0120 (cannot be implemented due to upgrade)
+ */
+
+// clang-format off
+extern "C" {
+#include <stddef.h>
+#if defined(_WIN32) && !defined(__MINGW32__) && \
+  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
+#include <BaseTsd.h>
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#elif (defined(__sun) || defined(__sun__)) && defined(__SunOS_5_9)
+#include <sys/inttypes.h>
+#else
+#include <stdint.h>
+#endif
+#include <assert.h>
+#include <ctype.h>
+#include <string.h>
+#include <limits.h>
+}
+
+namespace crow
+{
+/* Maximium header size allowed. If the macro is not defined
+ * before including this header then the default is used. To
+ * change the maximum header size, define the macro in the build
+ * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
+ * the effective limit on the size of the header, define the macro
+ * to a very large number (e.g. -DCROW_HTTP_MAX_HEADER_SIZE=0x7fffffff)
+ */
+#ifndef CROW_HTTP_MAX_HEADER_SIZE
+# define CROW_HTTP_MAX_HEADER_SIZE (80*1024)
+#endif
+
+typedef struct http_parser http_parser;
+typedef struct http_parser_settings http_parser_settings;
+
+/* Callbacks should return non-zero to indicate an error. The parser will
+ * then halt execution.
+ *
+ * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
+ * returning '1' from on_headers_complete will tell the parser that it
+ * should not expect a body. This is used when receiving a response to a
+ * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
+ * chunked' headers that indicate the presence of a body.
+ *
+ * Returning `2` from on_headers_complete will tell parser that it should not
+ * expect neither a body nor any futher responses on this connection. This is
+ * useful for handling responses to a CONNECT request which may not contain
+ * `Upgrade` or `Connection: upgrade` headers.
+ *
+ * http_data_cb does not return data chunks. It will be called arbitrarally
+ * many times for each string. E.G. you might get 10 callbacks for "on_url"
+ * each providing just a few characters more data.
+ */
+typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
+typedef int (*http_cb) (http_parser*);
+
+
+/* Flag values for http_parser.flags field */
+enum http_connection_flags // This is basically 7 booleans placed into 1 integer. Uses 4 bytes instead of n bytes (7 currently).
+  { F_CHUNKED               = 1 << 0 // 00000000 00000000 00000000 00000001
+  , F_CONNECTION_KEEP_ALIVE = 1 << 1 // 00000000 00000000 00000000 00000010
+  , F_CONNECTION_CLOSE      = 1 << 2 // 00000000 00000000 00000000 00000100
+  , F_TRAILING              = 1 << 3 // 00000000 00000000 00000000 00001000
+  , F_UPGRADE               = 1 << 4 // 00000000 00000000 00000000 00010000
+  , F_SKIPBODY              = 1 << 5 // 00000000 00000000 00000000 00100000
+  , F_CONTENTLENGTH         = 1 << 6 // 00000000 00000000 00000000 01000000
+  };
+
+
+/* Map for errno-related constants
+ *
+ * The provided argument should be a macro that takes 2 arguments.
+ */
+#define CROW_HTTP_ERRNO_MAP(CROW_XX)                                                    \
+  /* No error */                                                                        \
+  CROW_XX(OK, "success")                                                                \
+                                                                                        \
+  /* Callback-related errors */                                                         \
+  CROW_XX(CB_message_begin, "the on_message_begin callback failed")                     \
+  CROW_XX(CB_method, "the on_method callback failed")                                   \
+  CROW_XX(CB_url, "the \"on_url\" callback failed")                                     \
+  CROW_XX(CB_header_field, "the \"on_header_field\" callback failed")                   \
+  CROW_XX(CB_header_value, "the \"on_header_value\" callback failed")                   \
+  CROW_XX(CB_headers_complete, "the \"on_headers_complete\" callback failed")           \
+  CROW_XX(CB_body, "the \"on_body\" callback failed")                                   \
+  CROW_XX(CB_message_complete, "the \"on_message_complete\" callback failed")           \
+  CROW_XX(CB_status, "the \"on_status\" callback failed")                               \
+                                                                                        \
+  /* Parsing-related errors */                                                          \
+  CROW_XX(INVALID_EOF_STATE, "stream ended at an unexpected time")                      \
+  CROW_XX(HEADER_OVERFLOW, "too many header bytes seen; overflow detected")             \
+  CROW_XX(CLOSED_CONNECTION, "data received after completed connection: close message") \
+  CROW_XX(INVALID_VERSION, "invalid HTTP version")                                      \
+  CROW_XX(INVALID_STATUS, "invalid HTTP status code")                                   \
+  CROW_XX(INVALID_METHOD, "invalid HTTP method")                                        \
+  CROW_XX(INVALID_URL, "invalid URL")                                                   \
+  CROW_XX(INVALID_HOST, "invalid host")                                                 \
+  CROW_XX(INVALID_PORT, "invalid port")                                                 \
+  CROW_XX(INVALID_PATH, "invalid path")                                                 \
+  CROW_XX(INVALID_QUERY_STRING, "invalid query string")                                 \
+  CROW_XX(INVALID_FRAGMENT, "invalid fragment")                                         \
+  CROW_XX(LF_EXPECTED, "LF character expected")                                         \
+  CROW_XX(INVALID_HEADER_TOKEN, "invalid character in header")                          \
+  CROW_XX(INVALID_CONTENT_LENGTH, "invalid character in content-length header")         \
+  CROW_XX(UNEXPECTED_CONTENT_LENGTH, "unexpected content-length header")                \
+  CROW_XX(INVALID_CHUNK_SIZE, "invalid character in chunk size header")                 \
+  CROW_XX(INVALID_CONSTANT, "invalid constant string")                                  \
+  CROW_XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")              \
+  CROW_XX(STRICT, "strict mode assertion failed")                                       \
+  CROW_XX(UNKNOWN, "an unknown error occurred")                                         \
+  CROW_XX(INVALID_TRANSFER_ENCODING, "request has invalid transfer-encoding")           \
+
+
+/* Define CHPE_* values for each errno value above */
+#define CROW_HTTP_ERRNO_GEN(n, s) CHPE_##n,
+enum http_errno {
+  CROW_HTTP_ERRNO_MAP(CROW_HTTP_ERRNO_GEN)
+};
+#undef CROW_HTTP_ERRNO_GEN
+
+
+/* Get an http_errno value from an http_parser */
+#define CROW_HTTP_PARSER_ERRNO(p) ((enum http_errno)(p)->http_errno)
+
+
+    struct http_parser
+    {
+        /** PRIVATE **/
+        unsigned int flags : 7;                  /* F_* values from 'flags' enum; semi-public */
+        unsigned int state : 8;                  /* enum state from http_parser.c */
+        unsigned int header_state : 7;           /* enum header_state from http_parser.c */
+        unsigned int index : 5;                  /* index into current matcher */
+        unsigned int uses_transfer_encoding : 1; /* Transfer-Encoding header is present */
+        unsigned int allow_chunked_length : 1;   /* Allow headers with both `Content-Length` and `Transfer-Encoding: chunked` set */
+        unsigned int lenient_http_headers : 1;
+
+        uint32_t nread;          /* # bytes read in various scenarios */
+        uint64_t content_length; /* # bytes in body. `(uint64_t) -1` (all bits one) if no Content-Length header. */
+        unsigned long qs_point;
+
+        /** READ-ONLY **/
+        unsigned char http_major;
+        unsigned char http_minor;
+        unsigned int method : 8;       /* requests only */
+        unsigned int http_errno : 7;
+
+  /* 1 = Upgrade header was present and the parser has exited because of that.
+   * 0 = No upgrade header present.
+   * Should be checked when http_parser_execute() returns in addition to
+   * error checking.
+   */
+        unsigned int upgrade : 1;
+
+        /** PUBLIC **/
+        void* data; /* A pointer to get hook to the "connection" or "socket" object */
+    };
+
+
+    struct http_parser_settings
+    {
+        http_cb on_message_begin;
+        http_cb on_method;
+        http_data_cb on_url;
+        http_data_cb on_header_field;
+        http_data_cb on_header_value;
+        http_cb on_headers_complete;
+        http_data_cb on_body;
+        http_cb on_message_complete;
+    };
+
+
+
+// SOURCE (.c) CODE
+static uint32_t max_header_size = CROW_HTTP_MAX_HEADER_SIZE;
+
+#ifndef CROW_ULLONG_MAX
+# define CROW_ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
+#endif
+
+#ifndef CROW_MIN
+# define CROW_MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef CROW_ARRAY_SIZE
+# define CROW_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+
+#ifndef CROW_BIT_AT
+# define CROW_BIT_AT(a, i)                                           \
+  (!!((unsigned int) (a)[(unsigned int) (i) >> 3] &                  \
+   (1 << ((unsigned int) (i) & 7))))
+#endif
+
+#define CROW_SET_ERRNO(e)                                            \
+do {                                                                 \
+  parser->nread = nread;                                             \
+  parser->http_errno = (e);                                          \
+} while(0)
+
+/* Run the notify callback FOR, returning ER if it fails */
+#define CROW_CALLBACK_NOTIFY_(FOR, ER)                               \
+do {                                                                 \
+  assert(CROW_HTTP_PARSER_ERRNO(parser) == CHPE_OK);                 \
+                                                                     \
+  if (CROW_LIKELY(settings->on_##FOR)) {                             \
+    if (CROW_UNLIKELY(0 != settings->on_##FOR(parser))) {            \
+      CROW_SET_ERRNO(CHPE_CB_##FOR);                                 \
+    }                                                                \
+                                                                     \
+    /* We either errored above or got paused; get out */             \
+    if (CROW_UNLIKELY(CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK)) {  \
+      return (ER);                                                   \
+    }                                                                \
+  }                                                                  \
+} while (0)
+
+/* Run the notify callback FOR and consume the current byte */
+#define CROW_CALLBACK_NOTIFY(FOR)            CROW_CALLBACK_NOTIFY_(FOR, p - data + 1)
+
+/* Run the notify callback FOR and don't consume the current byte */
+#define CROW_CALLBACK_NOTIFY_NOADVANCE(FOR)  CROW_CALLBACK_NOTIFY_(FOR, p - data)
+
+/* Run data callback FOR with LEN bytes, returning ER if it fails */
+#define CROW_CALLBACK_DATA_(FOR, LEN, ER)                            \
+do {                                                                 \
+  assert(CROW_HTTP_PARSER_ERRNO(parser) == CHPE_OK);                 \
+                                                                     \
+  if (FOR##_mark) {                                                  \
+    if (CROW_LIKELY(settings->on_##FOR)) {                           \
+      if (CROW_UNLIKELY(0 !=                                         \
+          settings->on_##FOR(parser, FOR##_mark, (LEN)))) {          \
+        CROW_SET_ERRNO(CHPE_CB_##FOR);                               \
+      }                                                              \
+                                                                     \
+      /* We either errored above or got paused; get out */           \
+      if (CROW_UNLIKELY(CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK)) {\
+        return (ER);                                                 \
+      }                                                              \
+    }                                                                \
+    FOR##_mark = NULL;                                               \
+  }                                                                  \
+} while (0)
+
+/* Run the data callback FOR and consume the current byte */
+#define CROW_CALLBACK_DATA(FOR)                                      \
+    CROW_CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
+
+/* Run the data callback FOR and don't consume the current byte */
+#define CROW_CALLBACK_DATA_NOADVANCE(FOR)                            \
+    CROW_CALLBACK_DATA_(FOR, p - FOR##_mark, p - data)
+
+/* Set the mark FOR; non-destructive if mark is already set */
+#define CROW_MARK(FOR)                                               \
+do {                                                                 \
+  if (!FOR##_mark) {                                                 \
+    FOR##_mark = p;                                                  \
+  }                                                                  \
+} while (0)
+
+/* Don't allow the total size of the HTTP headers (including the status
+ * line) to exceed max_header_size.  This check is here to protect
+ * embedders against denial-of-service attacks where the attacker feeds
+ * us a never-ending header that the embedder keeps buffering.
+ *
+ * This check is arguably the responsibility of embedders but we're doing
+ * it on the embedder's behalf because most won't bother and this way we
+ * make the web a little safer.  max_header_size is still far bigger
+ * than any reasonable request or response so this should never affect
+ * day-to-day operation.
+ */
+#define CROW_COUNT_HEADER_SIZE(V)                                    \
+do {                                                                 \
+  nread += (uint32_t)(V);                                            \
+  if (CROW_UNLIKELY(nread > max_header_size)) {                      \
+    CROW_SET_ERRNO(CHPE_HEADER_OVERFLOW);                            \
+    goto error;                                                      \
+  }                                                                  \
+} while (0)
+#define CROW_REEXECUTE()                                             \
+  goto reexecute;                                                    \
+
+#define CROW_PROXY_CONNECTION "proxy-connection"
+#define CROW_CONNECTION "connection"
+#define CROW_CONTENT_LENGTH "content-length"
+#define CROW_TRANSFER_ENCODING "transfer-encoding"
+#define CROW_UPGRADE "upgrade"
+#define CROW_CHUNKED "chunked"
+#define CROW_KEEP_ALIVE "keep-alive"
+#define CROW_CLOSE "close"
+
+
+
+    enum state
+    {
+        s_dead = 1 /* important that this is > 0 */
+
+        ,
+        s_start_req
+
+        ,
+        s_req_method,
+        s_req_spaces_before_url,
+        s_req_schema,
+        s_req_schema_slash,
+        s_req_schema_slash_slash,
+        s_req_server_start,
+        s_req_server,             // }
+        s_req_server_with_at,     // |
+        s_req_path,               // | The parser recognizes how to switch between these states,
+        s_req_query_string_start, // | however it doesn't process them any differently.
+        s_req_query_string,       // }
+        s_req_http_start,
+        s_req_http_H,
+        s_req_http_HT,
+        s_req_http_HTT,
+        s_req_http_HTTP,
+        s_req_http_I,
+        s_req_http_IC,
+        s_req_http_major,
+        s_req_http_dot,
+        s_req_http_minor,
+        s_req_http_end,
+        s_req_line_almost_done
+
+        ,
+        s_header_field_start,
+        s_header_field,
+        s_header_value_discard_ws,
+        s_header_value_discard_ws_almost_done,
+        s_header_value_discard_lws,
+        s_header_value_start,
+        s_header_value,
+        s_header_value_lws
+
+        ,
+        s_header_almost_done
+
+        ,
+        s_chunk_size_start,
+        s_chunk_size,
+        s_chunk_parameters,
+        s_chunk_size_almost_done
+
+        ,
+        s_headers_almost_done,
+        s_headers_done
+
+        /* Important: 's_headers_done' must be the last 'header' state. All
+         * states beyond this must be 'body' states. It is used for overflow
+         * checking. See the CROW_PARSING_HEADER() macro.
+         */
+
+        ,
+        s_chunk_data,
+        s_chunk_data_almost_done,
+        s_chunk_data_done
+
+        ,
+        s_body_identity,
+        s_body_identity_eof
+
+        ,
+        s_message_done
+    };
+
+
+#define CROW_PARSING_HEADER(state) (state <= s_headers_done)
+
+
+enum header_states
+  { h_general = 0
+  , h_C
+  , h_CO
+  , h_CON
+
+  , h_matching_connection
+  , h_matching_proxy_connection
+  , h_matching_content_length
+  , h_matching_transfer_encoding
+  , h_matching_upgrade
+
+  , h_connection
+  , h_content_length
+  , h_content_length_num
+  , h_content_length_ws
+  , h_transfer_encoding
+  , h_upgrade
+
+  , h_matching_transfer_encoding_token_start
+  , h_matching_transfer_encoding_chunked
+  , h_matching_transfer_encoding_token
+
+  , h_matching_connection_keep_alive
+  , h_matching_connection_close
+
+  , h_transfer_encoding_chunked
+  , h_connection_keep_alive
+  , h_connection_close
+  };
+
+enum http_host_state
+  {
+    s_http_host_dead = 1
+  , s_http_userinfo_start
+  , s_http_userinfo
+  , s_http_host_start
+  , s_http_host_v6_start
+  , s_http_host
+  , s_http_host_v6
+  , s_http_host_v6_end
+  , s_http_host_v6_zone_start
+  , s_http_host_v6_zone
+  , s_http_host_port_start
+  , s_http_host_port
+};
+
+/* Macros for character classes; depends on strict-mode  */
+#define CROW_LOWER(c)            (unsigned char)(c | 0x20)
+#define CROW_IS_ALPHA(c)         (CROW_LOWER(c) >= 'a' && CROW_LOWER(c) <= 'z')
+#define CROW_IS_NUM(c)           ((c) >= '0' && (c) <= '9')
+#define CROW_IS_ALPHANUM(c)      (CROW_IS_ALPHA(c) || CROW_IS_NUM(c))
+//#define CROW_IS_HEX(c)           (CROW_IS_NUM(c) || (CROW_LOWER(c) >= 'a' && CROW_LOWER(c) <= 'f'))
+#define CROW_IS_MARK(c)          ((c) == '-' || (c) == '_' || (c) == '.' || \
+  (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' ||    \
+  (c) == ')')
+#define CROW_IS_USERINFO_CHAR(c) (CROW_IS_ALPHANUM(c) || CROW_IS_MARK(c) || (c) == '%' || \
+  (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' ||                   \
+  (c) == '$' || (c) == ',')
+
+#define CROW_TOKEN(c)            (tokens[(unsigned char)c])
+#define CROW_IS_URL_CHAR(c)      (CROW_BIT_AT(normal_url_char, (unsigned char)c))
+//#define CROW_IS_HOST_CHAR(c)     (CROW_IS_ALPHANUM(c) || (c) == '.' || (c) == '-')
+
+  /**
+ * Verify that a char is a valid visible (printable) US-ASCII
+ * character or %x80-FF
+ **/
+#define CROW_IS_HEADER_CHAR(ch)                                                     \
+  (ch == cr || ch == lf || ch == 9 || ((unsigned char)ch > 31 && ch != 127))
+
+#define CROW_start_state s_start_req
+
+# define CROW_STRICT_CHECK(cond)                                     \
+do {                                                                 \
+  if (cond) {                                                        \
+    CROW_SET_ERRNO(CHPE_STRICT);                                     \
+    goto error;                                                      \
+  }                                                                  \
+} while (0)
+#define CROW_NEW_MESSAGE() (CROW_start_state)
+
+/* Our URL parser.
+ *
+ * This is designed to be shared by http_parser_execute() for URL validation,
+ * hence it has a state transition + byte-for-byte interface. In addition, it
+ * is meant to be embedded in http_parser_parse_url(), which does the dirty
+ * work of turning state transitions URL components for its API.
+ *
+ * This function should only be invoked with non-space characters. It is
+ * assumed that the caller cares about (and can detect) the transition between
+ * URL and non-URL states by looking for these.
+ */
+inline enum state
+parse_url_char(enum state s, const char ch, http_parser *parser, const char* url_mark, const char* p)
+{
+# define CROW_T(v) 0
+
+
+static const uint8_t normal_url_char[32] = {
+/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+        0    |CROW_T(2)|  0    |   0    |CROW_T(16)| 0    |   0    |   0,
+/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+        0    |   2    |   4    |   0    |   16   |   32   |   64   |  128,
+/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0,
+/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  80  P    81  Q    82  R    83  S    84  CROW_T    85  U    86  V    87  W  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0, };
+
+#undef CROW_T
+
+  if (ch == ' ' || ch == '\r' || ch == '\n') {
+    return s_dead;
+  }
+  if (ch == '\t' || ch == '\f') {
+    return s_dead;
+  }
+
+  switch (s) {
+    case s_req_spaces_before_url:
+      /* Proxied requests are followed by scheme of an absolute URI (alpha).
+       * All methods except CONNECT are followed by '/' or '*'.
+       */
+
+      if (ch == '/' || ch == '*') {
+        return s_req_path;
+      }
+
+      if (CROW_IS_ALPHA(ch)) {
+        return s_req_schema;
+      }
+
+      break;
+
+    case s_req_schema:
+      if (CROW_IS_ALPHA(ch)) {
+        return s;
+      }
+
+      if (ch == ':') {
+        return s_req_schema_slash;
+      }
+
+      break;
+
+    case s_req_schema_slash:
+      if (ch == '/') {
+        return s_req_schema_slash_slash;
+      }
+
+      break;
+
+    case s_req_schema_slash_slash:
+      if (ch == '/') {
+        return s_req_server_start;
+      }
+
+      break;
+
+    case s_req_server_with_at:
+      if (ch == '@') {
+        return s_dead;
+      }
+
+    /* fall through */
+    case s_req_server_start:
+    case s_req_server:
+      if (ch == '/') {
+        return s_req_path;
+      }
+
+      if (ch == '?') {
+          parser->qs_point = p - url_mark;
+        return s_req_query_string_start;
+      }
+
+      if (ch == '@') {
+        return s_req_server_with_at;
+      }
+
+      if (CROW_IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') {
+        return s_req_server;
+      }
+
+      break;
+
+    case s_req_path:
+      if (CROW_IS_URL_CHAR(ch)) {
+        return s;
+      }
+      else if (ch == '?')
+      {
+          parser->qs_point = p - url_mark;
+          return s_req_query_string_start;
+      }
+
+      break;
+
+    case s_req_query_string_start:
+    case s_req_query_string:
+      if (CROW_IS_URL_CHAR(ch)) {
+        return s_req_query_string;
+      }
+      else if (ch == '?')
+      {
+          return s_req_query_string;
+      }
+
+      break;
+
+    default:
+      break;
+  }
+
+  /* We should never fall out of the switch above unless there's an error */
+  return s_dead;
+}
+
+inline size_t http_parser_execute (http_parser *parser,
+                            const http_parser_settings *settings,
+                            const char *data,
+                            size_t len)
+{
+
+/* Tokens as defined by rfc 2616. Also lowercases them.
+ *        token       = 1*<any CHAR except CTLs or separators>
+ *     separators     = "(" | ")" | "<" | ">" | "@"
+ *                    | "," | ";" | ":" | "\" | <">
+ *                    | "/" | "[" | "]" | "?" | "="
+ *                    | "{" | "}" | SP  | HT
+ */
+static const char tokens[256] = {
+/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+        0,      '!',      0,      '#',     '$',     '%',     '&',    '\'',
+/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+        0,       0,      '*',     '+',      0,      '-',     '.',      0,
+/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+       '0',     '1',     '2',     '3',     '4',     '5',     '6',     '7',
+/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+       '8',     '9',      0,       0,       0,       0,       0,       0,
+/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+        0,      'a',     'b',     'c',     'd',     'e',     'f',     'g',
+/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
+/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
+/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+       'x',     'y',     'z',      0,       0,       0,      '^',     '_',
+/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+       '`',     'a',     'b',     'c',     'd',     'e',     'f',     'g',
+/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
+/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
+/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+       'x',     'y',     'z',      0,      '|',      0,      '~',       0 };
+
+
+static const int8_t unhex[256] =
+  {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1
+  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  };
+
+
+
+  char c, ch;
+  int8_t unhex_val;
+  const char *p = data;
+  const char *header_field_mark = 0;
+  const char *header_value_mark = 0;
+  const char *url_mark = 0;
+  const char *url_start_mark = 0;
+  const char *body_mark = 0;
+  const unsigned int lenient = parser->lenient_http_headers;
+  const unsigned int allow_chunked_length = parser->allow_chunked_length;
+  
+  uint32_t nread = parser->nread;
+
+  /* We're in an error state. Don't bother doing anything. */
+  if (CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK) {
+    return 0;
+  }
+
+  if (len == 0) {
+    switch (parser->state) {
+      case s_body_identity_eof:
+        /* Use of CROW_CALLBACK_NOTIFY() here would erroneously return 1 byte read if we got paused. */
+        CROW_CALLBACK_NOTIFY_NOADVANCE(message_complete);
+        return 0;
+
+      case s_dead:
+      case s_start_req:
+        return 0;
+
+      default:
+        CROW_SET_ERRNO(CHPE_INVALID_EOF_STATE);
+        return 1;
+    }
+  }
+
+
+  if (parser->state == s_header_field)
+    header_field_mark = data;
+  if (parser->state == s_header_value)
+    header_value_mark = data;
+  switch (parser->state) {
+  case s_req_path:
+  case s_req_schema:
+  case s_req_schema_slash:
+  case s_req_schema_slash_slash:
+  case s_req_server_start:
+  case s_req_server:
+  case s_req_server_with_at:
+  case s_req_query_string_start:
+  case s_req_query_string:
+    url_mark = data;
+    break;
+  default:
+    break;
+  }
+
+  for (p=data; p != data + len; p++) {
+    ch = *p;
+
+    if (CROW_PARSING_HEADER(parser->state))
+      CROW_COUNT_HEADER_SIZE(1);
+
+reexecute:
+    switch (parser->state) {
+
+      case s_dead:
+        /* this state is used after a 'Connection: close' message
+         * the parser will error out if it reads another message
+         */
+        if (CROW_LIKELY(ch == cr || ch == lf))
+          break;
+
+        CROW_SET_ERRNO(CHPE_CLOSED_CONNECTION);
+        goto error;
+
+      case s_start_req:
+      {
+        if (ch == cr || ch == lf)
+          break;
+        parser->flags = 0;
+        parser->uses_transfer_encoding = 0;
+        parser->content_length = CROW_ULLONG_MAX;
+
+        if (CROW_UNLIKELY(!CROW_IS_ALPHA(ch))) {
+          CROW_SET_ERRNO(CHPE_INVALID_METHOD);
+          goto error;
+        }
+
+        parser->method = 0;
+        parser->index = 1;
+        switch (ch) {
+          case 'A': parser->method = (unsigned)HTTPMethod::Acl;                                                              break;
+          case 'B': parser->method = (unsigned)HTTPMethod::Bind;                                                             break;
+          case 'C': parser->method = (unsigned)HTTPMethod::Connect;   /* or COPY, CHECKOUT */                                break;
+          case 'D': parser->method = (unsigned)HTTPMethod::Delete;                                                           break;
+          case 'G': parser->method = (unsigned)HTTPMethod::Get;                                                              break;
+          case 'H': parser->method = (unsigned)HTTPMethod::Head;                                                             break;
+          case 'L': parser->method = (unsigned)HTTPMethod::Lock;      /* or LINK */                                          break;
+          case 'M': parser->method = (unsigned)HTTPMethod::MkCol;     /* or MOVE, MKACTIVITY, MERGE, M-SEARCH, MKCALENDAR */ break;
+          case 'N': parser->method = (unsigned)HTTPMethod::Notify;                                                           break;
+          case 'O': parser->method = (unsigned)HTTPMethod::Options;                                                          break;
+          case 'P': parser->method = (unsigned)HTTPMethod::Post;      /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */            break;
+          case 'R': parser->method = (unsigned)HTTPMethod::Report;    /* or REBIND */                                        break;
+          case 'S': parser->method = (unsigned)HTTPMethod::Subscribe; /* or SEARCH, SOURCE */                                break;
+          case 'T': parser->method = (unsigned)HTTPMethod::Trace;                                                            break;
+          case 'U': parser->method = (unsigned)HTTPMethod::Unlock;    /* or UNSUBSCRIBE, UNBIND, UNLINK */                   break;
+          default:
+            CROW_SET_ERRNO(CHPE_INVALID_METHOD);
+            goto error;
+        }
+        parser->state = s_req_method;
+
+        CROW_CALLBACK_NOTIFY(message_begin);
+
+        break;
+      }
+
+      case s_req_method:
+      {
+        const char *matcher;
+        if (CROW_UNLIKELY(ch == '\0')) {
+          CROW_SET_ERRNO(CHPE_INVALID_METHOD);
+          goto error;
+        }
+
+        matcher = method_strings[parser->method];
+        if (ch == ' ' && matcher[parser->index] == '\0') {
+          parser->state = s_req_spaces_before_url;
+        } else if (ch == matcher[parser->index]) {
+          ; /* nada */
+        } else if ((ch >= 'A' && ch <= 'Z') || ch == '-') {
+
+          switch (parser->method << 16 | parser->index << 8 | ch) {
+#define CROW_XX(meth, pos, ch, new_meth) \
+            case ((unsigned)HTTPMethod::meth << 16 | pos << 8 | ch): \
+              parser->method = (unsigned)HTTPMethod::new_meth; break;
+
+            CROW_XX(Post,      1, 'U', Put)
+            CROW_XX(Post,      1, 'A', Patch)
+            CROW_XX(Post,      1, 'R', Propfind)
+            CROW_XX(Put,       2, 'R', Purge)
+            CROW_XX(Connect,   1, 'H', Checkout)
+            CROW_XX(Connect,   2, 'P', Copy)
+            CROW_XX(MkCol,     1, 'O', Move)
+            CROW_XX(MkCol,     1, 'E', Merge)
+            CROW_XX(MkCol,     1, '-', MSearch)
+            CROW_XX(MkCol,     2, 'A', MkActivity)
+            CROW_XX(MkCol,     3, 'A', MkCalendar)
+            CROW_XX(Subscribe, 1, 'E', Search)
+            CROW_XX(Subscribe, 1, 'O', Source)
+            CROW_XX(Report,    2, 'B', Rebind)
+            CROW_XX(Propfind,  4, 'P', Proppatch)
+            CROW_XX(Lock,      1, 'I', Link)
+            CROW_XX(Unlock,    2, 'S', Unsubscribe)
+            CROW_XX(Unlock,    2, 'B', Unbind)
+            CROW_XX(Unlock,    3, 'I', Unlink)
+#undef CROW_XX
+            default:
+              CROW_SET_ERRNO(CHPE_INVALID_METHOD);
+              goto error;
+          }
+        } else {
+          CROW_SET_ERRNO(CHPE_INVALID_METHOD);
+          goto error;
+        }
+
+        CROW_CALLBACK_NOTIFY_NOADVANCE(method);
+
+        ++parser->index;
+        break;
+      }
+
+      case s_req_spaces_before_url:
+      {
+        if (ch == ' ') break;
+
+        CROW_MARK(url);
+        CROW_MARK(url_start);
+        if (parser->method == (unsigned)HTTPMethod::Connect) {
+          parser->state = s_req_server_start;
+        }
+
+        parser->state = parse_url_char(static_cast<state>(parser->state), ch, parser, url_start_mark, p);
+        if (CROW_UNLIKELY(parser->state == s_dead)) {
+          CROW_SET_ERRNO(CHPE_INVALID_URL);
+          goto error;
+        }
+
+        break;
+      }
+
+      case s_req_schema:
+      case s_req_schema_slash:
+      case s_req_schema_slash_slash:
+      case s_req_server_start:
+      {
+        switch (ch) {
+          /* No whitespace allowed here */
+          case ' ':
+          case cr:
+          case lf:
+            CROW_SET_ERRNO(CHPE_INVALID_URL);
+            goto error;
+          default:
+            parser->state = parse_url_char(static_cast<state>(parser->state), ch, parser, url_start_mark, p);
+            if (CROW_UNLIKELY(parser->state == s_dead)) {
+              CROW_SET_ERRNO(CHPE_INVALID_URL);
+              goto error;
+            }
+        }
+
+        break;
+      }
+
+      case s_req_server:
+      case s_req_server_with_at:
+      case s_req_path:
+      case s_req_query_string_start:
+      case s_req_query_string:
+      {
+        switch (ch) {
+          case ' ':
+            parser->state = s_req_http_start;
+            CROW_CALLBACK_DATA(url);
+            break;
+          case cr: // No space after URL means no HTTP version. Which means the request is using HTTP/0.9
+          case lf:
+            if (CROW_UNLIKELY(parser->method != (unsigned)HTTPMethod::Get)) // HTTP/0.9 doesn't define any method other than GET
+            {
+              parser->state = s_dead;
+              CROW_SET_ERRNO(CHPE_INVALID_VERSION);
+              goto error;
+            }
+            parser->http_major = 0;
+            parser->http_minor = 9;
+            parser->state = (ch == cr) ?
+              s_req_line_almost_done :
+              s_header_field_start;
+            CROW_CALLBACK_DATA(url);
+            break;
+          default:
+            parser->state = parse_url_char(static_cast<state>(parser->state), ch, parser, url_start_mark, p);
+            if (CROW_UNLIKELY(parser->state == s_dead)) {
+              CROW_SET_ERRNO(CHPE_INVALID_URL);
+              goto error;
+            }
+        }
+        break;
+      }
+
+      case s_req_http_start:
+        switch (ch) {
+          case ' ':
+            break;
+          case 'H':
+            parser->state = s_req_http_H;
+            break;
+          case 'I':
+            if (parser->method == (unsigned)HTTPMethod::Source) {
+              parser->state = s_req_http_I;
+              break;
+            }
+            /* fall through */
+          default:
+            CROW_SET_ERRNO(CHPE_INVALID_CONSTANT);
+            goto error;
+        }
+        break;
+
+      case s_req_http_H:
+        CROW_STRICT_CHECK(ch != 'T');
+        parser->state = s_req_http_HT;
+        break;
+
+      case s_req_http_HT:
+        CROW_STRICT_CHECK(ch != 'T');
+        parser->state = s_req_http_HTT;
+        break;
+
+      case s_req_http_HTT:
+        CROW_STRICT_CHECK(ch != 'P');
+        parser->state = s_req_http_HTTP;
+        break;
+
+      case s_req_http_I:
+        CROW_STRICT_CHECK(ch != 'C');
+        parser->state = s_req_http_IC;
+        break;
+
+      case s_req_http_IC:
+        CROW_STRICT_CHECK(ch != 'E');
+        parser->state = s_req_http_HTTP;  /* Treat "ICE" as "HTTP". */
+        break;
+
+      case s_req_http_HTTP:
+        CROW_STRICT_CHECK(ch != '/');
+        parser->state = s_req_http_major;
+        break;
+
+      /* dot */
+      case s_req_http_major:
+        if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
+          CROW_SET_ERRNO(CHPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major = ch - '0';
+        parser->state = s_req_http_dot;
+        break;
+
+      case s_req_http_dot:
+      {
+        if (CROW_UNLIKELY(ch != '.')) {
+          CROW_SET_ERRNO(CHPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->state = s_req_http_minor;
+        break;
+      }
+
+      /* minor HTTP version */
+      case s_req_http_minor:
+        if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
+          CROW_SET_ERRNO(CHPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor = ch - '0';
+        parser->state = s_req_http_end;
+        break;
+
+      /* end of request line */
+      case s_req_http_end:
+      {
+        if (ch == cr) {
+          parser->state = s_req_line_almost_done;
+          break;
+        }
+
+        if (ch == lf) {
+          parser->state = s_header_field_start;
+          break;
+        }
+
+        CROW_SET_ERRNO(CHPE_INVALID_VERSION);
+        goto error;
+        break;
+      }
+
+      /* end of request line */
+      case s_req_line_almost_done:
+      {
+        if (CROW_UNLIKELY(ch != lf)) {
+          CROW_SET_ERRNO(CHPE_LF_EXPECTED);
+          goto error;
+        }
+
+        parser->state = s_header_field_start;
+        break;
+      }
+
+      case s_header_field_start:
+      {
+        if (ch == cr) {
+          parser->state = s_headers_almost_done;
+          break;
+        }
+
+        if (ch == lf) {
+          /* they might be just sending \n instead of \r\n so this would be
+           * the second \n to denote the end of headers*/
+          parser->state = s_headers_almost_done;
+          CROW_REEXECUTE();
+        }
+
+        c = CROW_TOKEN(ch);
+
+        if (CROW_UNLIKELY(!c)) {
+          CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
+          goto error;
+        }
+
+        CROW_MARK(header_field);
+
+        parser->index = 0;
+        parser->state = s_header_field;
+
+        switch (c) {
+          case 'c':
+            parser->header_state = h_C;
+            break;
+
+          case 'p':
+            parser->header_state = h_matching_proxy_connection;
+            break;
+
+          case 't':
+            parser->header_state = h_matching_transfer_encoding;
+            break;
+
+          case 'u':
+            parser->header_state = h_matching_upgrade;
+            break;
+
+          default:
+            parser->header_state = h_general;
+            break;
+        }
+        break;
+      }
+
+      case s_header_field:
+      {        
+        const char* start = p;
+        for (; p != data + len; p++) {
+          ch = *p;
+          c = CROW_TOKEN(ch);
+
+          if (!c)
+            break;
+          
+          switch (parser->header_state) {
+            case h_general: {
+              size_t left = data + len - p;
+              const char* pe = p + CROW_MIN(left, max_header_size);
+              while (p+1 < pe && CROW_TOKEN(p[1])) {
+                p++;
+              }
+              break;
+            }
+
+            case h_C:
+              parser->index++;
+              parser->header_state = (c == 'o' ? h_CO : h_general);
+              break;
+
+            case h_CO:
+              parser->index++;
+              parser->header_state = (c == 'n' ? h_CON : h_general);
+              break;
+
+            case h_CON:
+              parser->index++;
+              switch (c) {
+                case 'n':
+                  parser->header_state = h_matching_connection;
+                  break;
+                case 't':
+                  parser->header_state = h_matching_content_length;
+                  break;
+                default:
+                  parser->header_state = h_general;
+                  break;
+              }
+              break;
+
+            /* connection */
+
+            case h_matching_connection:
+              parser->index++;
+              if (parser->index > sizeof(CROW_CONNECTION)-1 || c != CROW_CONNECTION[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CROW_CONNECTION)-2) {
+                parser->header_state = h_connection;
+              }
+              break;
+
+            /* proxy-connection */
+
+            case h_matching_proxy_connection:
+              parser->index++;
+              if (parser->index > sizeof(CROW_PROXY_CONNECTION)-1 || c != CROW_PROXY_CONNECTION[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CROW_PROXY_CONNECTION)-2) {
+                parser->header_state = h_connection;
+              }
+              break;
+
+            /* content-length */
+
+            case h_matching_content_length:
+              parser->index++;
+              if (parser->index > sizeof(CROW_CONTENT_LENGTH)-1 || c != CROW_CONTENT_LENGTH[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CROW_CONTENT_LENGTH)-2) {
+                parser->header_state = h_content_length;
+              }
+              break;
+
+            /* transfer-encoding */
+
+            case h_matching_transfer_encoding:
+              parser->index++;
+              if (parser->index > sizeof(CROW_TRANSFER_ENCODING)-1 || c != CROW_TRANSFER_ENCODING[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CROW_TRANSFER_ENCODING)-2) {
+                parser->header_state = h_transfer_encoding;
+                parser->uses_transfer_encoding = 1;
+              }
+              break;
+
+            /* upgrade */
+
+            case h_matching_upgrade:
+              parser->index++;
+              if (parser->index > sizeof(CROW_UPGRADE)-1 || c != CROW_UPGRADE[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CROW_UPGRADE)-2) {
+                parser->header_state = h_upgrade;
+              }
+              break;
+
+            case h_connection:
+            case h_content_length:
+            case h_transfer_encoding:
+            case h_upgrade:
+              if (ch != ' ') parser->header_state = h_general;
+              break;
+
+            default:
+              assert(0 && "Unknown header_state");
+              break;
+          }
+        }
+
+        if (p == data + len) {
+          --p;
+          CROW_COUNT_HEADER_SIZE(p - start);
+          break;
+        }
+
+        CROW_COUNT_HEADER_SIZE(p - start);
+
+        if (ch == ':') {
+          parser->state = s_header_value_discard_ws;
+          CROW_CALLBACK_DATA(header_field);
+          break;
+        }
+/* RFC-7230 Sec 3.2.4 expressly forbids line-folding in header field-names.
+        if (ch == cr) {
+          parser->state = s_header_almost_done;
+          CROW_CALLBACK_DATA(header_field);
+          break;
+        }
+
+        if (ch == lf) {
+          parser->state = s_header_field_start;
+          CROW_CALLBACK_DATA(header_field);
+          break;
+        }
+*/
+        CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
+        goto error;
+      }
+
+      case s_header_value_discard_ws:
+        if (ch == ' ' || ch == '\t') break;
+
+        if (ch == cr) {
+          parser->state = s_header_value_discard_ws_almost_done;
+          break;
+        }
+
+        if (ch == lf) {
+          parser->state = s_header_value_discard_lws;
+          break;
+        }
+
+        /* fall through */
+
+      case s_header_value_start:
+      {
+        CROW_MARK(header_value);
+
+        parser->state = s_header_value;
+        parser->index = 0;
+
+        c = CROW_LOWER(ch);
+
+        switch (parser->header_state) {
+          case h_upgrade:
+            // Crow does not support HTTP/2 at the moment.
+            // According to the RFC https://datatracker.ietf.org/doc/html/rfc7540#section-3.2
+            // "A server that does not support HTTP/2 can respond to the request as though the Upgrade header field were absent"
+            // => `F_UPGRADE` is not set if the header starts by "h2".
+            // This prevents the parser from skipping the request body.
+            if (ch != 'h' || p+1 == (data + len) || *(p+1) != '2') {
+              parser->flags |= F_UPGRADE;
+            }
+            parser->header_state = h_general;
+            break;
+
+          case h_transfer_encoding:
+            /* looking for 'Transfer-Encoding: chunked' */
+            if ('c' == c) {
+              parser->header_state = h_matching_transfer_encoding_chunked;
+            } else {
+              parser->header_state = h_matching_transfer_encoding_token;
+            }
+            break;
+            
+          /* Multi-value `Transfer-Encoding` header */
+          case h_matching_transfer_encoding_token_start:
+            break;
+
+          case h_content_length:
+            if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
+              CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
+              goto error;
+            }
+            
+            if (parser->flags & F_CONTENTLENGTH) {
+              CROW_SET_ERRNO(CHPE_UNEXPECTED_CONTENT_LENGTH);
+              goto error;
+            }
+            parser->flags |= F_CONTENTLENGTH;
+            parser->content_length = ch - '0';
+            parser->header_state = h_content_length_num;
+            break;
+
+          /* when obsolete line folding is encountered for content length
+           * continue to the s_header_value state */
+          case h_content_length_ws:
+            break;
+
+          case h_connection:
+            /* looking for 'Connection: keep-alive' */
+            if (c == 'k') {
+              parser->header_state = h_matching_connection_keep_alive;
+            /* looking for 'Connection: close' */
+            } else if (c == 'c') {
+              parser->header_state = h_matching_connection_close;
+            } else if (c == ' ' || c == '\t') {
+              /* Skip lws */
+            } else {
+              parser->header_state = h_general;
+            }
+            break;
+
+          default:
+            parser->header_state = h_general;
+            break;
+        }
+        break;
+      }
+
+      case s_header_value:
+      {
+        const char* start = p;
+        enum header_states h_state = static_cast<header_states>(parser->header_state);
+        for (; p != data + len; p++) {
+          ch = *p;
+
+          if (ch == cr) {
+            parser->state = s_header_almost_done;
+            parser->header_state = h_state;
+            CROW_CALLBACK_DATA(header_value);
+            break;
+          }
+
+          if (ch == lf) {
+            parser->state = s_header_almost_done;
+            CROW_COUNT_HEADER_SIZE(p - start);
+            parser->header_state = h_state;
+            CROW_CALLBACK_DATA_NOADVANCE(header_value);
+            CROW_REEXECUTE();
+          }
+          
+          if (!lenient && !CROW_IS_HEADER_CHAR(ch)) {
+            CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
+            goto error;
+          }
+          
+          c = CROW_LOWER(ch);
+
+          switch (h_state) {
+            case h_general:
+              {
+                size_t left = data + len - p;
+                const char* pe = p + CROW_MIN(left, max_header_size);
+
+                for (; p != pe; p++) {
+                  ch = *p;
+                  if (ch == cr || ch == lf) {
+                    --p;
+                    break;
+                  }
+                  if (!lenient && !CROW_IS_HEADER_CHAR(ch)) {
+                    CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
+                    goto error;
+                  }
+                }
+                if (p == data + len)
+                  --p;
+                break;
+              }
+
+            case h_connection:
+            case h_transfer_encoding:
+              assert(0 && "Shouldn't get here.");
+              break;
+
+            case h_content_length:
+              if (ch == ' ') break;
+              h_state = h_content_length_num;
+              /* fall through */
+
+            case h_content_length_num:
+            {
+              uint64_t t;
+
+              if (ch == ' ') {
+                h_state = h_content_length_ws;
+                break;
+              }
+
+              if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
+                CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
+                parser->header_state = h_state;
+                goto error;
+              }
+
+              t = parser->content_length;
+              t *= 10;
+              t += ch - '0';
+
+              /* Overflow? Test against a conservative limit for simplicity. */
+              if (CROW_UNLIKELY((CROW_ULLONG_MAX - 10) / 10 < parser->content_length)) {
+                CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
+                parser->header_state = h_state;
+                goto error;
+              }
+
+              parser->content_length = t;
+              break;
+            }
+            
+            case h_content_length_ws:
+              if (ch == ' ') break;
+              CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
+              parser->header_state = h_state;
+              goto error;
+
+            /* Transfer-Encoding: chunked */
+            case h_matching_transfer_encoding_token_start:
+              /* looking for 'Transfer-Encoding: chunked' */
+              if ('c' == c) {
+                h_state = h_matching_transfer_encoding_chunked;
+              } else if (CROW_TOKEN(c)) {
+                /* TODO(indutny): similar code below does this, but why?
+                 * At the very least it seems to be inconsistent given that
+                 * h_matching_transfer_encoding_token does not check for
+                 * `STRICT_TOKEN`
+                 */
+                h_state = h_matching_transfer_encoding_token;
+              } else if (c == ' ' || c == '\t') {
+                /* Skip lws */
+              } else {
+                h_state = h_general;
+              }
+              break;
+
+            case h_matching_transfer_encoding_chunked:
+              parser->index++;
+              if (parser->index > sizeof(CROW_CHUNKED)-1 || c != CROW_CHUNKED[parser->index]) {
+                h_state = h_matching_transfer_encoding_token;
+              } else if (parser->index == sizeof(CROW_CHUNKED)-2) {
+                h_state = h_transfer_encoding_chunked;
+              }
+              break;
+
+            case h_matching_transfer_encoding_token:
+              if (ch == ',') {
+                h_state = h_matching_transfer_encoding_token_start;
+                parser->index = 0;
+              }
+              break;
+
+            /* looking for 'Connection: keep-alive' */
+            case h_matching_connection_keep_alive:
+              parser->index++;
+              if (parser->index > sizeof(CROW_KEEP_ALIVE)-1 || c != CROW_KEEP_ALIVE[parser->index]) {
+                h_state = h_general;
+              } else if (parser->index == sizeof(CROW_KEEP_ALIVE)-2) {
+                h_state = h_connection_keep_alive;
+              }
+              break;
+
+            /* looking for 'Connection: close' */
+            case h_matching_connection_close:
+              parser->index++;
+              if (parser->index > sizeof(CROW_CLOSE)-1 || c != CROW_CLOSE[parser->index]) {
+                h_state = h_general;
+              } else if (parser->index == sizeof(CROW_CLOSE)-2) {
+                h_state = h_connection_close;
+              }
+              break;
+
+              // Edited from original (because of commits that werent included)
+            case h_transfer_encoding_chunked:
+              if (ch != ' ') h_state = h_matching_transfer_encoding_token;
+              break;
+            case h_connection_keep_alive:
+            case h_connection_close:
+              if (ch != ' ') h_state = h_general;
+              break;
+
+            default:
+              parser->state = s_header_value;
+              h_state = h_general;
+              break;
+          }
+        }
+        parser->header_state = h_state;
+        
+        
+        if (p == data + len)
+          --p;
+        
+        CROW_COUNT_HEADER_SIZE(p - start);
+        break;
+      }
+
+      case s_header_almost_done:
+      {
+        if (CROW_UNLIKELY(ch != lf)) {
+          CROW_SET_ERRNO(CHPE_LF_EXPECTED);
+          goto error;
+        }
+
+        parser->state = s_header_value_lws;
+        break;
+      }
+
+      case s_header_value_lws:
+      {
+        if (ch == ' ' || ch == '\t') {
+          if (parser->header_state == h_content_length_num) {
+              /* treat obsolete line folding as space */
+              parser->header_state = h_content_length_ws;
+          }
+          parser->state = s_header_value_start;
+          CROW_REEXECUTE();
+        }
+
+        /* finished the header */
+        switch (parser->header_state) {
+          case h_connection_keep_alive:
+            parser->flags |= F_CONNECTION_KEEP_ALIVE;
+            break;
+          case h_connection_close:
+            parser->flags |= F_CONNECTION_CLOSE;
+            break;
+          case h_transfer_encoding_chunked:
+            parser->flags |= F_CHUNKED;
+            break;
+          default:
+            break;
+        }
+
+        parser->state = s_header_field_start;
+        CROW_REEXECUTE();
+      }
+
+      case s_header_value_discard_ws_almost_done:
+      {
+        CROW_STRICT_CHECK(ch != lf);
+        parser->state = s_header_value_discard_lws;
+        break;
+      }
+
+      case s_header_value_discard_lws:
+      {
+        if (ch == ' ' || ch == '\t') {
+          parser->state = s_header_value_discard_ws;
+          break;
+        } else {
+          /* header value was empty */
+          CROW_MARK(header_value);
+          parser->state = s_header_field_start;
+          CROW_CALLBACK_DATA_NOADVANCE(header_value);
+          CROW_REEXECUTE();
+        }
+      }
+
+      case s_headers_almost_done:
+      {
+        CROW_STRICT_CHECK(ch != lf);
+
+        if (parser->flags & F_TRAILING) {
+          /* End of a chunked request */
+          CROW_CALLBACK_NOTIFY(message_complete);
+          break;
+        }
+        
+        /* Cannot use transfer-encoding and a content-length header together
+           per the HTTP specification. (RFC 7230 Section 3.3.3) */
+        if ((parser->uses_transfer_encoding == 1) &&
+            (parser->flags & F_CONTENTLENGTH)) {
+          /* Allow it for lenient parsing as long as `Transfer-Encoding` is
+           * not `chunked` or allow_length_with_encoding is set
+           */
+          if (parser->flags & F_CHUNKED) {
+            if (!allow_chunked_length) {
+              CROW_SET_ERRNO(CHPE_UNEXPECTED_CONTENT_LENGTH);
+              goto error;
+            }
+          } else if (!lenient) {
+            CROW_SET_ERRNO(CHPE_UNEXPECTED_CONTENT_LENGTH);
+            goto error;
+          }
+        }
+        
+        parser->state = s_headers_done;
+
+        /* Set this here so that on_headers_complete() callbacks can see it */
+        parser->upgrade =
+          (parser->flags & F_UPGRADE || parser->method == (unsigned)HTTPMethod::Connect);
+
+        /* Here we call the headers_complete callback. This is somewhat
+         * different than other callbacks because if the user returns 1, we
+         * will interpret that as saying that this message has no body. This
+         * is needed for the annoying case of recieving a response to a HEAD
+         * request.
+         *
+         * We'd like to use CROW_CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so
+         * we have to simulate it by handling a change in errno below.
+         */
+        if (settings->on_headers_complete) {
+          switch (settings->on_headers_complete(parser)) {
+            case 0:
+              break;
+
+            case 2:
+              parser->upgrade = 1;
+              //break;
+
+            /* fall through */
+            case 1:
+              parser->flags |= F_SKIPBODY;
+              break;
+
+            default:
+              CROW_SET_ERRNO(CHPE_CB_headers_complete);
+              parser->nread = nread;
+              return p - data; /* Error */
+          }
+        }
+
+        if (CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK) {
+          parser->nread = nread;
+          return p - data;
+        }
+
+        CROW_REEXECUTE();
+      }
+
+      case s_headers_done:
+      {
+        CROW_STRICT_CHECK(ch != lf);
+
+        parser->nread = 0;
+        nread = 0;
+
+        /* Exit, the rest of the connect is in a different protocol. */
+        if (parser->upgrade) {
+          CROW_CALLBACK_NOTIFY(message_complete);
+          parser->nread = nread;
+          return (p - data) + 1;
+        }
+
+        if (parser->flags & F_SKIPBODY) {
+          CROW_CALLBACK_NOTIFY(message_complete);
+        } else if (parser->flags & F_CHUNKED) {
+          /* chunked encoding - ignore Content-Length header,
+           * prepare for a chunk */
+            parser->state = s_chunk_size_start;
+        }
+        else if (parser->uses_transfer_encoding == 1)
+        {
+            if (!lenient)
+            {
+                /* RFC 7230 3.3.3 */
+
+                /* If a Transfer-Encoding header field
+             * is present in a request and the chunked transfer coding is not
+             * the final encoding, the message body length cannot be determined
+             * reliably; the server MUST respond with the 400 (Bad Request)
+             * status code and then close the connection.
+             */
+                CROW_SET_ERRNO(CHPE_INVALID_TRANSFER_ENCODING);
+                parser->nread = nread;
+                return (p - data); /* Error */
+            }
+            else
+            {
+                /* RFC 7230 3.3.3 */
+
+                /* If a Transfer-Encoding header field is present in a response and
+             * the chunked transfer coding is not the final encoding, the
+             * message body length is determined by reading the connection until
+             * it is closed by the server.
+             */
+                parser->state = s_body_identity_eof;
+            }
+        }
+        else
+        {
+            if (parser->content_length == 0)
+            {
+                /* Content-Length header given but zero: Content-Length: 0\r\n */
+                CROW_CALLBACK_NOTIFY(message_complete);
+            }
+            else if (parser->content_length != CROW_ULLONG_MAX)
+            {
+                /* Content-Length header given and non-zero */
+                parser->state = s_body_identity;
+            }
+            else
+            {
+                /* Assume content-length 0 - read the next */
+                CROW_CALLBACK_NOTIFY(message_complete);
+            }
+        }
+
+        break;
+      }
+
+      case s_body_identity:
+      {
+        uint64_t to_read = CROW_MIN(parser->content_length,
+                               (uint64_t) ((data + len) - p));
+
+        assert(parser->content_length != 0
+            && parser->content_length != CROW_ULLONG_MAX);
+
+        /* The difference between advancing content_length and p is because
+         * the latter will automaticaly advance on the next loop iteration.
+         * Further, if content_length ends up at 0, we want to see the last
+         * byte again for our message complete callback.
+         */
+        CROW_MARK(body);
+        parser->content_length -= to_read;
+        p += to_read - 1;
+
+        if (parser->content_length == 0) {
+          parser->state = s_message_done;
+
+          /* Mimic CROW_CALLBACK_DATA_NOADVANCE() but with one extra byte.
+           *
+           * The alternative to doing this is to wait for the next byte to
+           * trigger the data callback, just as in every other case. The
+           * problem with this is that this makes it difficult for the test
+           * harness to distinguish between complete-on-EOF and
+           * complete-on-length. It's not clear that this distinction is
+           * important for applications, but let's keep it for now.
+           */
+          CROW_CALLBACK_DATA_(body, p - body_mark + 1, p - data);
+          CROW_REEXECUTE();
+        }
+
+        break;
+      }
+
+      /* read until EOF */
+      case s_body_identity_eof:
+        CROW_MARK(body);
+        p = data + len - 1;
+
+        break;
+
+      case s_message_done:
+        CROW_CALLBACK_NOTIFY(message_complete);
+        break;
+
+      case s_chunk_size_start:
+      {
+        assert(nread == 1);
+        assert(parser->flags & F_CHUNKED);
+
+        unhex_val = unhex[static_cast<unsigned char>(ch)];
+        if (CROW_UNLIKELY(unhex_val == -1)) {
+          CROW_SET_ERRNO(CHPE_INVALID_CHUNK_SIZE);
+          goto error;
+        }
+
+        parser->content_length = unhex_val;
+        parser->state = s_chunk_size;
+        break;
+      }
+
+      case s_chunk_size:
+      {
+        uint64_t t;
+
+        assert(parser->flags & F_CHUNKED);
+
+        if (ch == cr) {
+          parser->state = s_chunk_size_almost_done;
+          break;
+        }
+
+        unhex_val = unhex[static_cast<unsigned char>(ch)];
+
+        if (unhex_val == -1) {
+          if (ch == ';' || ch == ' ') {
+            parser->state = s_chunk_parameters;
+            break;
+          }
+
+          CROW_SET_ERRNO(CHPE_INVALID_CHUNK_SIZE);
+          goto error;
+        }
+
+        t = parser->content_length;
+        t *= 16;
+        t += unhex_val;
+
+        /* Overflow? Test against a conservative limit for simplicity. */
+        if (CROW_UNLIKELY((CROW_ULLONG_MAX - 16) / 16 < parser->content_length)) {
+          CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
+          goto error;
+        }
+
+        parser->content_length = t;
+        break;
+      }
+
+      case s_chunk_parameters:
+      {
+        assert(parser->flags & F_CHUNKED);
+        /* just ignore this shit. TODO check for overflow */
+        if (ch == cr) {
+          parser->state = s_chunk_size_almost_done;
+          break;
+        }
+        break;
+      }
+
+      case s_chunk_size_almost_done:
+      {
+        assert(parser->flags & F_CHUNKED);
+        CROW_STRICT_CHECK(ch != lf);
+
+        parser->nread = 0;
+        nread = 0;
+
+        if (parser->content_length == 0) {
+          parser->flags |= F_TRAILING;
+          parser->state = s_header_field_start;
+        } else {
+          parser->state = s_chunk_data;
+        }
+        break;
+      }
+
+      case s_chunk_data:
+      {
+        uint64_t to_read = CROW_MIN(parser->content_length,
+                               (uint64_t) ((data + len) - p));
+
+        assert(parser->flags & F_CHUNKED);
+        assert(parser->content_length != 0
+            && parser->content_length != CROW_ULLONG_MAX);
+
+        /* See the explanation in s_body_identity for why the content
+         * length and data pointers are managed this way.
+         */
+        CROW_MARK(body);
+        parser->content_length -= to_read;
+        p += to_read - 1;
+
+        if (parser->content_length == 0) {
+          parser->state = s_chunk_data_almost_done;
+        }
+
+        break;
+      }
+
+      case s_chunk_data_almost_done:
+        assert(parser->flags & F_CHUNKED);
+        assert(parser->content_length == 0);
+        CROW_STRICT_CHECK(ch != cr);
+        parser->state = s_chunk_data_done;
+        CROW_CALLBACK_DATA(body);
+        break;
+
+      case s_chunk_data_done:
+        assert(parser->flags & F_CHUNKED);
+        CROW_STRICT_CHECK(ch != lf);
+        parser->nread = 0;
+        nread = 0;
+        parser->state = s_chunk_size_start;
+        break;
+
+      default:
+        assert(0 && "unhandled state");
+        CROW_SET_ERRNO(CHPE_INVALID_INTERNAL_STATE);
+        goto error;
+    }
+  }
+
+  /* Run callbacks for any marks that we have leftover after we ran out of
+   * bytes. There should be at most one of these set, so it's OK to invoke
+   * them in series (unset marks will not result in callbacks).
+   *
+   * We use the NOADVANCE() variety of callbacks here because 'p' has already
+   * overflowed 'data' and this allows us to correct for the off-by-one that
+   * we'd otherwise have (since CROW_CALLBACK_DATA() is meant to be run with a 'p'
+   * value that's in-bounds).
+   */
+
+  assert(((header_field_mark ? 1 : 0) +
+          (header_value_mark ? 1 : 0) +
+          (url_mark ? 1 : 0)  +
+          (body_mark ? 1 : 0)) <= 1);
+
+  CROW_CALLBACK_DATA_NOADVANCE(header_field);
+  CROW_CALLBACK_DATA_NOADVANCE(header_value);
+  CROW_CALLBACK_DATA_NOADVANCE(url);
+  CROW_CALLBACK_DATA_NOADVANCE(body);
+
+  parser->nread = nread;
+  return len;
+
+error:
+  if (CROW_HTTP_PARSER_ERRNO(parser) == CHPE_OK) {
+    CROW_SET_ERRNO(CHPE_UNKNOWN);
+  }
+
+  parser->nread = nread;
+  return (p - data);
+}
+
+inline void
+  http_parser_init(http_parser* parser)
+{
+  void *data = parser->data; /* preserve application data */
+  memset(parser, 0, sizeof(*parser));
+  parser->data = data;
+  parser->state = s_start_req;
+  parser->http_errno = CHPE_OK;
+}
+
+/* Return a string name of the given error */
+inline const char *
+http_errno_name(enum http_errno err) {
+/* Map errno values to strings for human-readable output */
+#define CROW_HTTP_STRERROR_GEN(n, s) { "CHPE_" #n, s },
+static struct {
+  const char *name;
+  const char *description;
+} http_strerror_tab[] = {
+  CROW_HTTP_ERRNO_MAP(CROW_HTTP_STRERROR_GEN)
+};
+#undef CROW_HTTP_STRERROR_GEN
+  assert(((size_t) err) < CROW_ARRAY_SIZE(http_strerror_tab));
+  return http_strerror_tab[err].name;
+}
+
+/* Return a string description of the given error */
+inline const char *
+http_errno_description(enum http_errno err) {
+/* Map errno values to strings for human-readable output */
+#define CROW_HTTP_STRERROR_GEN(n, s) { "CHPE_" #n, s },
+static struct {
+  const char *name;
+  const char *description;
+} http_strerror_tab[] = {
+  CROW_HTTP_ERRNO_MAP(CROW_HTTP_STRERROR_GEN)
+};
+#undef CROW_HTTP_STRERROR_GEN
+  assert(((size_t) err) < CROW_ARRAY_SIZE(http_strerror_tab));
+  return http_strerror_tab[err].description;
+}
+
+/* Checks if this is the final chunk of the body. */
+inline int
+http_body_is_final(const struct http_parser *parser) {
+    return parser->state == s_message_done;
+}
+
+/* Change the maximum header size provided at compile time. */
+inline void
+http_parser_set_max_header_size(uint32_t size) {
+  max_header_size = size;
+}
+
+#undef CROW_HTTP_ERRNO_MAP
+#undef CROW_SET_ERRNO
+#undef CROW_CALLBACK_NOTIFY_
+#undef CROW_CALLBACK_NOTIFY
+#undef CROW_CALLBACK_NOTIFY_NOADVANCE
+#undef CROW_CALLBACK_DATA_
+#undef CROW_CALLBACK_DATA
+#undef CROW_CALLBACK_DATA_NOADVANCE
+#undef CROW_MARK
+#undef CROW_PROXY_CONNECTION
+#undef CROW_CONNECTION
+#undef CROW_CONTENT_LENGTH
+#undef CROW_TRANSFER_ENCODING
+#undef CROW_UPGRADE
+#undef CROW_CHUNKED
+#undef CROW_KEEP_ALIVE
+#undef CROW_CLOSE
+#undef CROW_PARSING_HEADER
+#undef CROW_LOWER
+#undef CROW_IS_ALPHA
+#undef CROW_IS_NUM
+#undef CROW_IS_ALPHANUM
+//#undef CROW_IS_HEX
+#undef CROW_IS_MARK
+#undef CROW_IS_USERINFO_CHAR
+#undef CROW_TOKEN
+#undef CROW_IS_URL_CHAR
+//#undef CROW_IS_HOST_CHAR
+#undef CROW_STRICT_CHECK
+
+}
+
+// clang-format on
+
+
+#include <string>
+#include <unordered_map>
+#include <algorithm>
+
+
+namespace crow
+{
+    /// A wrapper for `nodejs/http-parser`.
+
+    ///
+    /// Used to generate a \ref crow.request from the TCP socket buffer.
+    template<typename Handler>
+    struct HTTPParser : public http_parser
+    {
+        static int on_message_begin(http_parser*)
+        {
+            return 0;
+        }
+        static int on_method(http_parser* self_)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+            self->req.method = static_cast<HTTPMethod>(self->method);
+
+            return 0;
+        }
+        static int on_url(http_parser* self_, const char* at, size_t length)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+            self->req.raw_url.insert(self->req.raw_url.end(), at, at + length);
+            self->req.url_params = query_string(self->req.raw_url);
+            self->req.url = self->req.raw_url.substr(0, self->qs_point != 0 ? self->qs_point : std::string::npos);
+
+            self->process_url();
+
+            return 0;
+        }
+        static int on_header_field(http_parser* self_, const char* at, size_t length)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+            switch (self->header_building_state)
+            {
+                case 0:
+                    if (!self->header_value.empty())
+                    {
+                        self->req.headers.emplace(std::move(self->header_field), std::move(self->header_value));
+                    }
+                    self->header_field.assign(at, at + length);
+                    self->header_building_state = 1;
+                    break;
+                case 1:
+                    self->header_field.insert(self->header_field.end(), at, at + length);
+                    break;
+            }
+            return 0;
+        }
+        static int on_header_value(http_parser* self_, const char* at, size_t length)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+            switch (self->header_building_state)
+            {
+                case 0:
+                    self->header_value.insert(self->header_value.end(), at, at + length);
+                    break;
+                case 1:
+                    self->header_building_state = 0;
+                    self->header_value.assign(at, at + length);
+                    break;
+            }
+            return 0;
+        }
+        static int on_headers_complete(http_parser* self_)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+            if (!self->header_field.empty())
+            {
+                self->req.headers.emplace(std::move(self->header_field), std::move(self->header_value));
+            }
+
+            self->set_connection_parameters();
+
+            self->process_header();
+            return 0;
+        }
+        static int on_body(http_parser* self_, const char* at, size_t length)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+            self->req.body.insert(self->req.body.end(), at, at + length);
+            return 0;
+        }
+        static int on_message_complete(http_parser* self_)
+        {
+            HTTPParser* self = static_cast<HTTPParser*>(self_);
+
+            self->message_complete = true;
+            self->process_message();
+            return 0;
+        }
+        HTTPParser(Handler* handler):
+          handler_(handler)
+        {
+            http_parser_init(this);
+        }
+
+        // return false on error
+        /// Parse a buffer into the different sections of an HTTP request.
+        bool feed(const char* buffer, int length)
+        {
+            if (message_complete)
+                return true;
+
+            const static http_parser_settings settings_{
+              on_message_begin,
+              on_method,
+              on_url,
+              on_header_field,
+              on_header_value,
+              on_headers_complete,
+              on_body,
+              on_message_complete,
+            };
+
+            int nparsed = http_parser_execute(this, &settings_, buffer, length);
+            if (http_errno != CHPE_OK)
+            {
+                return false;
+            }
+            return nparsed == length;
+        }
+
+        bool done()
+        {
+            return feed(nullptr, 0);
+        }
+
+        void clear()
+        {
+            req = crow::request();
+            header_field.clear();
+            header_value.clear();
+            header_building_state = 0;
+            qs_point = 0;
+            message_complete = false;
+            state = CROW_NEW_MESSAGE();
+        }
+
+        inline void process_url()
+        {
+            handler_->handle_url();
+        }
+
+        inline void process_header()
+        {
+            handler_->handle_header();
+        }
+
+        inline void process_message()
+        {
+            handler_->handle();
+        }
+
+        inline void set_connection_parameters()
+        {
+            req.http_ver_major = http_major;
+            req.http_ver_minor = http_minor;
+
+            //NOTE(EDev): it seems that the problem is with crow's policy on closing the connection for HTTP_VERSION < 1.0, the behaviour for that in crow is "don't close the connection, but don't send a keep-alive either"
+
+            // HTTP1.1 = always send keep_alive, HTTP1.0 = only send if header exists, HTTP?.? = never send
+            req.keep_alive = (http_major == 1 && http_minor == 0) ?
+                               ((flags & F_CONNECTION_KEEP_ALIVE) ? true : false) :
+                               ((http_major == 1 && http_minor == 1) ? true : false);
+
+            // HTTP1.1 = only close if close header exists, HTTP1.0 = always close unless keep_alive header exists, HTTP?.?= never close
+            req.close_connection = (http_major == 1 && http_minor == 0) ?
+                                     ((flags & F_CONNECTION_KEEP_ALIVE) ? false : true) :
+                                     ((http_major == 1 && http_minor == 1) ? ((flags & F_CONNECTION_CLOSE) ? true : false) : false);
+            req.upgrade = static_cast<bool>(upgrade);
+        }
+
+        /// The final request that this parser outputs.
+        ///
+        /// Data parsed is put directly into this object as soon as the related callback returns. (e.g. the request will have the cooorect method as soon as on_method() returns)
+        request req;
+
+    private:
+        int header_building_state = 0;
+        bool message_complete = false;
+        std::string header_field;
+        std::string header_value;
+
+        Handler* handler_; ///< This is currently an HTTP connection object (\ref crow.Connection).
+    };
+} // namespace crow
+
+#undef CROW_NEW_MESSAGE
+#undef CROW_start_state
+
+
+
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <iostream>
+#include <sstream>
+#include <string>
+
+namespace crow
+{
+    enum class LogLevel
+    {
+#ifndef ERROR
+#ifndef DEBUG
+        DEBUG = 0,
+        INFO,
+        WARNING,
+        ERROR,
+        CRITICAL,
+#endif
+#endif
+
+        Debug = 0,
+        Info,
+        Warning,
+        Error,
+        Critical,
+    };
+
+    class ILogHandler
+    {
+    public:
+        virtual ~ILogHandler() = default;
+
+        virtual void log(std::string message, LogLevel level) = 0;
+    };
+
+    class CerrLogHandler : public ILogHandler
+    {
+    public:
+        void log(std::string message, LogLevel level) override
+        {
+            std::string prefix;
+            switch (level)
+            {
+                case LogLevel::Debug:
+                    prefix = "DEBUG   ";
+                    break;
+                case LogLevel::Info:
+                    prefix = "INFO    ";
+                    break;
+                case LogLevel::Warning:
+                    prefix = "WARNING ";
+                    break;
+                case LogLevel::Error:
+                    prefix = "ERROR   ";
+                    break;
+                case LogLevel::Critical:
+                    prefix = "CRITICAL";
+                    break;
+            }
+            std::cerr << std::string("(") + timestamp() + std::string(") [") + prefix + std::string("] ") + message << std::endl;
+        }
+
+    private:
+        static std::string timestamp()
+        {
+            char date[32];
+            time_t t = time(0);
+
+            tm my_tm;
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#ifdef CROW_USE_LOCALTIMEZONE
+            localtime_s(&my_tm, &t);
+#else
+            gmtime_s(&my_tm, &t);
+#endif
+#else
+#ifdef CROW_USE_LOCALTIMEZONE
+            localtime_r(&t, &my_tm);
+#else
+            gmtime_r(&t, &my_tm);
+#endif
+#endif
+
+            size_t sz = strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", &my_tm);
+            return std::string(date, date + sz);
+        }
+    };
+
+    class logger
+    {
+    public:
+        logger(LogLevel level):
+          level_(level)
+        {}
+        ~logger()
+        {
+#ifdef CROW_ENABLE_LOGGING
+            if (level_ >= get_current_log_level())
+            {
+                get_handler_ref()->log(stringstream_.str(), level_);
+            }
+#endif
+        }
+
+        //
+        template<typename T>
+        logger& operator<<(T const& value)
+        {
+#ifdef CROW_ENABLE_LOGGING
+            if (level_ >= get_current_log_level())
+            {
+                stringstream_ << value;
+            }
+#endif
+            return *this;
+        }
+
+        //
+        static void setLogLevel(LogLevel level) { get_log_level_ref() = level; }
+
+        static void setHandler(ILogHandler* handler) { get_handler_ref() = handler; }
+
+        static LogLevel get_current_log_level() { return get_log_level_ref(); }
+
+    private:
+        //
+        static LogLevel& get_log_level_ref()
+        {
+            static LogLevel current_level = static_cast<LogLevel>(CROW_LOG_LEVEL);
+            return current_level;
+        }
+        static ILogHandler*& get_handler_ref()
+        {
+            static CerrLogHandler default_handler;
+            static ILogHandler* current_handler = &default_handler;
+            return current_handler;
+        }
+
+        //
+        std::ostringstream stringstream_;
+        LogLevel level_;
+    };
+} // namespace crow
+
+#define CROW_LOG_CRITICAL                                                  \
+    if (crow::logger::get_current_log_level() <= crow::LogLevel::Critical) \
+    crow::logger(crow::LogLevel::Critical)
+#define CROW_LOG_ERROR                                                  \
+    if (crow::logger::get_current_log_level() <= crow::LogLevel::Error) \
+    crow::logger(crow::LogLevel::Error)
+#define CROW_LOG_WARNING                                                  \
+    if (crow::logger::get_current_log_level() <= crow::LogLevel::Warning) \
+    crow::logger(crow::LogLevel::Warning)
+#define CROW_LOG_INFO                                                  \
+    if (crow::logger::get_current_log_level() <= crow::LogLevel::Info) \
+    crow::logger(crow::LogLevel::Info)
+#define CROW_LOG_DEBUG                                                  \
+    if (crow::logger::get_current_log_level() <= crow::LogLevel::Debug) \
+    crow::logger(crow::LogLevel::Debug)
+
+
+//#define CROW_JSON_NO_ERROR_CHECK
+//#define CROW_JSON_USE_MAP
+
+#include <string>
+#ifdef CROW_JSON_USE_MAP
+#include <map>
+#else
+#include <unordered_map>
+#endif
+#include <iostream>
+#include <algorithm>
+#include <memory>
+#include <vector>
+#include <cmath>
+#include <cfloat>
+
+
+using std::isinf;
+using std::isnan;
+
+
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+    namespace mustache
+    {
+        class template_t;
+    }
+
+    namespace json
+    {
+        inline void escape(const std::string& str, std::string& ret)
+        {
+            ret.reserve(ret.size() + str.size() + str.size() / 4);
+            for (auto c : str)
+            {
+                switch (c)
+                {
+                    case '"': ret += "\\\""; break;
+                    case '\\': ret += "\\\\"; break;
+                    case '\n': ret += "\\n"; break;
+                    case '\b': ret += "\\b"; break;
+                    case '\f': ret += "\\f"; break;
+                    case '\r': ret += "\\r"; break;
+                    case '\t': ret += "\\t"; break;
+                    default:
+                        if (c >= 0 && c < 0x20)
+                        {
+                            ret += "\\u00";
+                            auto to_hex = [](char c) {
+                                c = c & 0xf;
+                                if (c < 10)
+                                    return '0' + c;
+                                return 'a' + c - 10;
+                            };
+                            ret += to_hex(c / 16);
+                            ret += to_hex(c % 16);
+                        }
+                        else
+                            ret += c;
+                        break;
+                }
+            }
+        }
+        inline std::string escape(const std::string& str)
+        {
+            std::string ret;
+            escape(str, ret);
+            return ret;
+        }
+
+        enum class type : char
+        {
+            Null,
+            False,
+            True,
+            Number,
+            String,
+            List,
+            Object,
+            Function
+        };
+
+        inline const char* get_type_str(type t)
+        {
+            switch (t)
+            {
+                case type::Number: return "Number";
+                case type::False: return "False";
+                case type::True: return "True";
+                case type::List: return "List";
+                case type::String: return "String";
+                case type::Object: return "Object";
+                case type::Function: return "Function";
+                default: return "Unknown";
+            }
+        }
+
+        enum class num_type : char
+        {
+            Signed_integer,
+            Unsigned_integer,
+            Floating_point,
+            Null,
+            Double_precision_floating_point
+        };
+
+        class rvalue;
+        rvalue load(const char* data, size_t size);
+
+        namespace detail
+        {
+            /// A read string implementation with comparison functionality.
+            struct r_string
+            {
+                r_string(){};
+                r_string(char* s, char* e):
+                  s_(s), e_(e){};
+                ~r_string()
+                {
+                    if (owned_)
+                        delete[] s_;
+                }
+
+                r_string(const r_string& r)
+                {
+                    *this = r;
+                }
+
+                r_string(r_string&& r)
+                {
+                    *this = r;
+                }
+
+                r_string& operator=(r_string&& r)
+                {
+                    s_ = r.s_;
+                    e_ = r.e_;
+                    owned_ = r.owned_;
+                    if (r.owned_)
+                        r.owned_ = 0;
+                    return *this;
+                }
+
+                r_string& operator=(const r_string& r)
+                {
+                    s_ = r.s_;
+                    e_ = r.e_;
+                    owned_ = 0;
+                    return *this;
+                }
+
+                operator std::string() const
+                {
+                    return std::string(s_, e_);
+                }
+
+
+                const char* begin() const { return s_; }
+                const char* end() const { return e_; }
+                size_t size() const { return end() - begin(); }
+
+                using iterator = const char*;
+                using const_iterator = const char*;
+
+                char* s_;         ///< Start.
+                mutable char* e_; ///< End.
+                uint8_t owned_{0};
+                friend std::ostream& operator<<(std::ostream& os, const r_string& s)
+                {
+                    os << static_cast<std::string>(s);
+                    return os;
+                }
+
+            private:
+                void force(char* s, uint32_t length)
+                {
+                    s_ = s;
+                    e_ = s_ + length;
+                    owned_ = 1;
+                }
+                friend rvalue crow::json::load(const char* data, size_t size);
+
+                friend bool operator==(const r_string& l, const r_string& r);
+                friend bool operator==(const std::string& l, const r_string& r);
+                friend bool operator==(const r_string& l, const std::string& r);
+
+                template<typename T, typename U>
+                inline static bool equals(const T& l, const U& r)
+                {
+                    if (l.size() != r.size())
+                        return false;
+
+                    for (size_t i = 0; i < l.size(); i++)
+                    {
+                        if (*(l.begin() + i) != *(r.begin() + i))
+                            return false;
+                    }
+
+                    return true;
+                }
+            };
+
+            inline bool operator<(const r_string& l, const r_string& r)
+            {
+                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
+            }
+
+            inline bool operator<(const r_string& l, const std::string& r)
+            {
+                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
+            }
+
+            inline bool operator<(const std::string& l, const r_string& r)
+            {
+                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
+            }
+
+            inline bool operator>(const r_string& l, const r_string& r)
+            {
+                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
+            }
+
+            inline bool operator>(const r_string& l, const std::string& r)
+            {
+                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
+            }
+
+            inline bool operator>(const std::string& l, const r_string& r)
+            {
+                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
+            }
+
+            inline bool operator==(const r_string& l, const r_string& r)
+            {
+                return r_string::equals(l, r);
+            }
+
+            inline bool operator==(const r_string& l, const std::string& r)
+            {
+                return r_string::equals(l, r);
+            }
+
+            inline bool operator==(const std::string& l, const r_string& r)
+            {
+                return r_string::equals(l, r);
+            }
+
+            inline bool operator!=(const r_string& l, const r_string& r)
+            {
+                return !(l == r);
+            }
+
+            inline bool operator!=(const r_string& l, const std::string& r)
+            {
+                return !(l == r);
+            }
+
+            inline bool operator!=(const std::string& l, const r_string& r)
+            {
+                return !(l == r);
+            }
+        } // namespace detail
+
+        /// JSON read value.
+
+        ///
+        /// Value can mean any json value, including a JSON object.
+        /// Read means this class is used to primarily read strings into a JSON value.
+        class rvalue
+        {
+            static const int cached_bit = 2;
+            static const int error_bit = 4;
+
+        public:
+            rvalue() noexcept:
+              option_{error_bit}
+            {
+            }
+            rvalue(type t) noexcept:
+              lsize_{}, lremain_{}, t_{t}
+            {
+            }
+            rvalue(type t, char* s, char* e) noexcept:
+              start_{s}, end_{e}, t_{t}
+            {
+                determine_num_type();
+            }
+
+            rvalue(const rvalue& r):
+              start_(r.start_), end_(r.end_), key_(r.key_), t_(r.t_), nt_(r.nt_), option_(r.option_)
+            {
+                copy_l(r);
+            }
+
+            rvalue(rvalue&& r) noexcept
+            {
+                *this = std::move(r);
+            }
+
+            rvalue& operator=(const rvalue& r)
+            {
+                start_ = r.start_;
+                end_ = r.end_;
+                key_ = r.key_;
+                t_ = r.t_;
+                nt_ = r.nt_;
+                option_ = r.option_;
+                copy_l(r);
+                return *this;
+            }
+            rvalue& operator=(rvalue&& r) noexcept
+            {
+                start_ = r.start_;
+                end_ = r.end_;
+                key_ = std::move(r.key_);
+                l_ = std::move(r.l_);
+                lsize_ = r.lsize_;
+                lremain_ = r.lremain_;
+                t_ = r.t_;
+                nt_ = r.nt_;
+                option_ = r.option_;
+                return *this;
+            }
+
+            explicit operator bool() const noexcept
+            {
+                return (option_ & error_bit) == 0;
+            }
+
+            explicit operator int64_t() const
+            {
+                return i();
+            }
+
+            explicit operator uint64_t() const
+            {
+                return u();
+            }
+
+            explicit operator int() const
+            {
+                return static_cast<int>(i());
+            }
+
+            /// Return any json value (not object or list) as a string.
+            explicit operator std::string() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() == type::Object || t() == type::List)
+                    throw std::runtime_error("json type container");
+#endif
+                switch (t())
+                {
+                    case type::String:
+                        return std::string(s());
+                    case type::Null:
+                        return std::string("null");
+                    case type::True:
+                        return std::string("true");
+                    case type::False:
+                        return std::string("false");
+                    default:
+                        return std::string(start_, end_ - start_);
+                }
+            }
+
+            /// The type of the JSON value.
+            type t() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (option_ & error_bit)
+                {
+                    throw std::runtime_error("invalid json object");
+                }
+#endif
+                return t_;
+            }
+
+            /// The number type of the JSON value.
+            num_type nt() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (option_ & error_bit)
+                {
+                    throw std::runtime_error("invalid json object");
+                }
+#endif
+                return nt_;
+            }
+
+            /// The integer value.
+            int64_t i() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                switch (t())
+                {
+                    case type::Number:
+                    case type::String:
+                        return utility::lexical_cast<int64_t>(start_, end_ - start_);
+                    default:
+                        const std::string msg = "expected number, got: " + std::string(get_type_str(t()));
+                        throw std::runtime_error(msg);
+                }
+#endif
+                return utility::lexical_cast<int64_t>(start_, end_ - start_);
+            }
+
+            /// The unsigned integer value.
+            uint64_t u() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                switch (t())
+                {
+                    case type::Number:
+                    case type::String:
+                        return utility::lexical_cast<uint64_t>(start_, end_ - start_);
+                    default:
+                        throw std::runtime_error(std::string("expected number, got: ") + get_type_str(t()));
+                }
+#endif
+                return utility::lexical_cast<uint64_t>(start_, end_ - start_);
+            }
+
+            /// The double precision floating-point number value.
+            double d() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Number)
+                    throw std::runtime_error("value is not number");
+#endif
+                return utility::lexical_cast<double>(start_, end_ - start_);
+            }
+
+            /// The boolean value.
+            bool b() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::True && t() != type::False)
+                    throw std::runtime_error("value is not boolean");
+#endif
+                return t() == type::True;
+            }
+
+            /// The string value.
+            detail::r_string s() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::String)
+                    throw std::runtime_error("value is not string");
+#endif
+                unescape();
+                return detail::r_string{start_, end_};
+            }
+
+            /// The list or object value
+            std::vector<rvalue> lo()
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Object && t() != type::List)
+                    throw std::runtime_error("value is not a container");
+#endif
+                std::vector<rvalue> ret;
+                ret.reserve(lsize_);
+                for (uint32_t i = 0; i < lsize_; i++)
+                {
+                    ret.emplace_back(l_[i]);
+                }
+                return ret;
+            }
+
+            /// Convert escaped string character to their original form ("\\n" -> '\n').
+            void unescape() const
+            {
+                if (*(start_ - 1))
+                {
+                    char* head = start_;
+                    char* tail = start_;
+                    while (head != end_)
+                    {
+                        if (*head == '\\')
+                        {
+                            switch (*++head)
+                            {
+                                case '"': *tail++ = '"'; break;
+                                case '\\': *tail++ = '\\'; break;
+                                case '/': *tail++ = '/'; break;
+                                case 'b': *tail++ = '\b'; break;
+                                case 'f': *tail++ = '\f'; break;
+                                case 'n': *tail++ = '\n'; break;
+                                case 'r': *tail++ = '\r'; break;
+                                case 't': *tail++ = '\t'; break;
+                                case 'u':
+                                {
+                                    auto from_hex = [](char c) {
+                                        if (c >= 'a')
+                                            return c - 'a' + 10;
+                                        if (c >= 'A')
+                                            return c - 'A' + 10;
+                                        return c - '0';
+                                    };
+                                    unsigned int code =
+                                      (from_hex(head[1]) << 12) +
+                                      (from_hex(head[2]) << 8) +
+                                      (from_hex(head[3]) << 4) +
+                                      from_hex(head[4]);
+                                    if (code >= 0x800)
+                                    {
+                                        *tail++ = 0xE0 | (code >> 12);
+                                        *tail++ = 0x80 | ((code >> 6) & 0x3F);
+                                        *tail++ = 0x80 | (code & 0x3F);
+                                    }
+                                    else if (code >= 0x80)
+                                    {
+                                        *tail++ = 0xC0 | (code >> 6);
+                                        *tail++ = 0x80 | (code & 0x3F);
+                                    }
+                                    else
+                                    {
+                                        *tail++ = code;
+                                    }
+                                    head += 4;
+                                }
+                                break;
+                            }
+                        }
+                        else
+                            *tail++ = *head;
+                        head++;
+                    }
+                    end_ = tail;
+                    *end_ = 0;
+                    *(start_ - 1) = 0;
+                }
+            }
+
+            /// Check if the json object has the passed string as a key.
+            bool has(const char* str) const
+            {
+                return has(std::string(str));
+            }
+
+            bool has(const std::string& str) const
+            {
+                struct Pred
+                {
+                    bool operator()(const rvalue& l, const rvalue& r) const
+                    {
+                        return l.key_ < r.key_;
+                    };
+                    bool operator()(const rvalue& l, const std::string& r) const
+                    {
+                        return l.key_ < r;
+                    };
+                    bool operator()(const std::string& l, const rvalue& r) const
+                    {
+                        return l < r.key_;
+                    };
+                };
+                if (!is_cached())
+                {
+                    std::sort(begin(), end(), Pred());
+                    set_cached();
+                }
+                auto it = lower_bound(begin(), end(), str, Pred());
+                return it != end() && it->key_ == str;
+            }
+
+            int count(const std::string& str)
+            {
+                return has(str) ? 1 : 0;
+            }
+
+            rvalue* begin() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Object && t() != type::List)
+                    throw std::runtime_error("value is not a container");
+#endif
+                return l_.get();
+            }
+            rvalue* end() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Object && t() != type::List)
+                    throw std::runtime_error("value is not a container");
+#endif
+                return l_.get() + lsize_;
+            }
+
+            const detail::r_string& key() const
+            {
+                return key_;
+            }
+
+            size_t size() const
+            {
+                if (t() == type::String)
+                    return s().size();
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Object && t() != type::List)
+                    throw std::runtime_error("value is not a container");
+#endif
+                return lsize_;
+            }
+
+            const rvalue& operator[](int index) const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::List)
+                    throw std::runtime_error("value is not a list");
+                if (index >= static_cast<int>(lsize_) || index < 0)
+                    throw std::runtime_error("list out of bound");
+#endif
+                return l_[index];
+            }
+
+            const rvalue& operator[](size_t index) const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::List)
+                    throw std::runtime_error("value is not a list");
+                if (index >= lsize_)
+                    throw std::runtime_error("list out of bound");
+#endif
+                return l_[index];
+            }
+
+            const rvalue& operator[](const char* str) const
+            {
+                return this->operator[](std::string(str));
+            }
+
+            const rvalue& operator[](const std::string& str) const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Object)
+                    throw std::runtime_error("value is not an object");
+#endif
+                struct Pred
+                {
+                    bool operator()(const rvalue& l, const rvalue& r) const
+                    {
+                        return l.key_ < r.key_;
+                    };
+                    bool operator()(const rvalue& l, const std::string& r) const
+                    {
+                        return l.key_ < r;
+                    };
+                    bool operator()(const std::string& l, const rvalue& r) const
+                    {
+                        return l < r.key_;
+                    };
+                };
+                if (!is_cached())
+                {
+                    std::sort(begin(), end(), Pred());
+                    set_cached();
+                }
+                auto it = lower_bound(begin(), end(), str, Pred());
+                if (it != end() && it->key_ == str)
+                    return *it;
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                throw std::runtime_error("cannot find key");
+#else
+                static rvalue nullValue;
+                return nullValue;
+#endif
+            }
+
+            void set_error()
+            {
+                option_ |= error_bit;
+            }
+
+            bool error() const
+            {
+                return (option_ & error_bit) != 0;
+            }
+
+            std::vector<std::string> keys() const
+            {
+#ifndef CROW_JSON_NO_ERROR_CHECK
+                if (t() != type::Object)
+                    throw std::runtime_error("value is not an object");
+#endif
+                std::vector<std::string> ret;
+                ret.reserve(lsize_);
+                for (uint32_t i = 0; i < lsize_; i++)
+                {
+                    ret.emplace_back(std::string(l_[i].key()));
+                }
+                return ret;
+            }
+
+        private:
+            bool is_cached() const
+            {
+                return (option_ & cached_bit) != 0;
+            }
+            void set_cached() const
+            {
+                option_ |= cached_bit;
+            }
+            void copy_l(const rvalue& r)
+            {
+                if (r.t() != type::Object && r.t() != type::List)
+                    return;
+                lsize_ = r.lsize_;
+                lremain_ = 0;
+                l_.reset(new rvalue[lsize_]);
+                std::copy(r.begin(), r.end(), begin());
+            }
+
+            void emplace_back(rvalue&& v)
+            {
+                if (!lremain_)
+                {
+                    int new_size = lsize_ + lsize_;
+                    if (new_size - lsize_ > 60000)
+                        new_size = lsize_ + 60000;
+                    if (new_size < 4)
+                        new_size = 4;
+                    rvalue* p = new rvalue[new_size];
+                    rvalue* p2 = p;
+                    for (auto& x : *this)
+                        *p2++ = std::move(x);
+                    l_.reset(p);
+                    lremain_ = new_size - lsize_;
+                }
+                l_[lsize_++] = std::move(v);
+                lremain_--;
+            }
+
+            /// Determines num_type from the string.
+            void determine_num_type()
+            {
+                if (t_ != type::Number)
+                {
+                    nt_ = num_type::Null;
+                    return;
+                }
+
+                const std::size_t len = end_ - start_;
+                const bool has_minus = std::memchr(start_, '-', len) != nullptr;
+                const bool has_e = std::memchr(start_, 'e', len) != nullptr || std::memchr(start_, 'E', len) != nullptr;
+                const bool has_dec_sep = std::memchr(start_, '.', len) != nullptr;
+                if (has_dec_sep || has_e)
+                    nt_ = num_type::Floating_point;
+                else if (has_minus)
+                    nt_ = num_type::Signed_integer;
+                else
+                    nt_ = num_type::Unsigned_integer;
+            }
+
+            mutable char* start_;
+            mutable char* end_;
+            detail::r_string key_;
+            std::unique_ptr<rvalue[]> l_;
+            uint32_t lsize_;
+            uint16_t lremain_;
+            type t_;
+            num_type nt_{num_type::Null};
+            mutable uint8_t option_{0};
+
+            friend rvalue load_nocopy_internal(char* data, size_t size);
+            friend rvalue load(const char* data, size_t size);
+            friend std::ostream& operator<<(std::ostream& os, const rvalue& r)
+            {
+                switch (r.t_)
+                {
+
+                    case type::Null: os << "null"; break;
+                    case type::False: os << "false"; break;
+                    case type::True: os << "true"; break;
+                    case type::Number:
+                    {
+                        switch (r.nt())
+                        {
+                            case num_type::Floating_point: os << r.d(); break;
+                            case num_type::Double_precision_floating_point: os << r.d(); break;
+                            case num_type::Signed_integer: os << r.i(); break;
+                            case num_type::Unsigned_integer: os << r.u(); break;
+                            case num_type::Null: throw std::runtime_error("Number with num_type Null");
+                        }
+                    }
+                    break;
+                    case type::String: os << '"' << r.s() << '"'; break;
+                    case type::List:
+                    {
+                        os << '[';
+                        bool first = true;
+                        for (auto& x : r)
+                        {
+                            if (!first)
+                                os << ',';
+                            first = false;
+                            os << x;
+                        }
+                        os << ']';
+                    }
+                    break;
+                    case type::Object:
+                    {
+                        os << '{';
+                        bool first = true;
+                        for (auto& x : r)
+                        {
+                            if (!first)
+                                os << ',';
+                            os << '"' << escape(x.key_) << "\":";
+                            first = false;
+                            os << x;
+                        }
+                        os << '}';
+                    }
+                    break;
+                    case type::Function: os << "custom function"; break;
+                }
+                return os;
+            }
+        };
+        namespace detail
+        {
+        }
+
+        inline bool operator==(const rvalue& l, const std::string& r)
+        {
+            return l.s() == r;
+        }
+
+        inline bool operator==(const std::string& l, const rvalue& r)
+        {
+            return l == r.s();
+        }
+
+        inline bool operator!=(const rvalue& l, const std::string& r)
+        {
+            return l.s() != r;
+        }
+
+        inline bool operator!=(const std::string& l, const rvalue& r)
+        {
+            return l != r.s();
+        }
+
+        inline bool operator==(const rvalue& l, double r)
+        {
+            return l.d() == r;
+        }
+
+        inline bool operator==(double l, const rvalue& r)
+        {
+            return l == r.d();
+        }
+
+        inline bool operator!=(const rvalue& l, double r)
+        {
+            return l.d() != r;
+        }
+
+        inline bool operator!=(double l, const rvalue& r)
+        {
+            return l != r.d();
+        }
+
+
+        inline rvalue load_nocopy_internal(char* data, size_t size)
+        {
+            // Defend against excessive recursion
+            static constexpr unsigned max_depth = 10000;
+
+            //static const char* escaped = "\"\\/\b\f\n\r\t";
+            struct Parser
+            {
+                Parser(char* data, size_t /*size*/):
+                  data(data)
+                {
+                }
+
+                bool consume(char c)
+                {
+                    if (CROW_UNLIKELY(*data != c))
+                        return false;
+                    data++;
+                    return true;
+                }
+
+                void ws_skip()
+                {
+                    while (*data == ' ' || *data == '\t' || *data == '\r' || *data == '\n')
+                        ++data;
+                };
+
+                rvalue decode_string()
+                {
+                    if (CROW_UNLIKELY(!consume('"')))
+                        return {};
+                    char* start = data;
+                    uint8_t has_escaping = 0;
+                    while (1)
+                    {
+                        if (CROW_LIKELY(*data != '"' && *data != '\\' && *data != '\0'))
+                        {
+                            data++;
+                        }
+                        else if (*data == '"')
+                        {
+                            *data = 0;
+                            *(start - 1) = has_escaping;
+                            data++;
+                            return {type::String, start, data - 1};
+                        }
+                        else if (*data == '\\')
+                        {
+                            has_escaping = 1;
+                            data++;
+                            switch (*data)
+                            {
+                                case 'u':
+                                {
+                                    auto check = [](char c) {
+                                        return ('0' <= c && c <= '9') ||
+                                               ('a' <= c && c <= 'f') ||
+                                               ('A' <= c && c <= 'F');
+                                    };
+                                    if (!(check(*(data + 1)) &&
+                                          check(*(data + 2)) &&
+                                          check(*(data + 3)) &&
+                                          check(*(data + 4))))
+                                        return {};
+                                }
+                                    data += 5;
+                                    break;
+                                case '"':
+                                case '\\':
+                                case '/':
+                                case 'b':
+                                case 'f':
+                                case 'n':
+                                case 'r':
+                                case 't':
+                                    data++;
+                                    break;
+                                default:
+                                    return {};
+                            }
+                        }
+                        else
+                            return {};
+                    }
+                    return {};
+                }
+
+                rvalue decode_list(unsigned depth)
+                {
+                    rvalue ret(type::List);
+                    if (CROW_UNLIKELY(!consume('[')) || CROW_UNLIKELY(depth > max_depth))
+                    {
+                        ret.set_error();
+                        return ret;
+                    }
+                    ws_skip();
+                    if (CROW_UNLIKELY(*data == ']'))
+                    {
+                        data++;
+                        return ret;
+                    }
+
+                    while (1)
+                    {
+                        auto v = decode_value(depth + 1);
+                        if (CROW_UNLIKELY(!v))
+                        {
+                            ret.set_error();
+                            break;
+                        }
+                        ws_skip();
+                        ret.emplace_back(std::move(v));
+                        if (*data == ']')
+                        {
+                            data++;
+                            break;
+                        }
+                        if (CROW_UNLIKELY(!consume(',')))
+                        {
+                            ret.set_error();
+                            break;
+                        }
+                        ws_skip();
+                    }
+                    return ret;
+                }
+
+                rvalue decode_number()
+                {
+                    char* start = data;
+
+                    enum NumberParsingState
+                    {
+                        Minus,
+                        AfterMinus,
+                        ZeroFirst,
+                        Digits,
+                        DigitsAfterPoints,
+                        E,
+                        DigitsAfterE,
+                        Invalid,
+                    } state{Minus};
+                    while (CROW_LIKELY(state != Invalid))
+                    {
+                        switch (*data)
+                        {
+                            case '0':
+                                state = static_cast<NumberParsingState>("\2\2\7\3\4\6\6"[state]);
+                                /*if (state == NumberParsingState::Minus || state == NumberParsingState::AfterMinus)
+                                {
+                                    state = NumberParsingState::ZeroFirst;
+                                }
+                                else if (state == NumberParsingState::Digits ||
+                                    state == NumberParsingState::DigitsAfterE ||
+                                    state == NumberParsingState::DigitsAfterPoints)
+                                {
+                                    // ok; pass
+                                }
+                                else if (state == NumberParsingState::E)
+                                {
+                                    state = NumberParsingState::DigitsAfterE;
+                                }
+                                else
+                                    return {};*/
+                                break;
+                            case '1':
+                            case '2':
+                            case '3':
+                            case '4':
+                            case '5':
+                            case '6':
+                            case '7':
+                            case '8':
+                            case '9':
+                                state = static_cast<NumberParsingState>("\3\3\7\3\4\6\6"[state]);
+                                while (*(data + 1) >= '0' && *(data + 1) <= '9')
+                                    data++;
+                                /*if (state == NumberParsingState::Minus || state == NumberParsingState::AfterMinus)
+                                {
+                                    state = NumberParsingState::Digits;
+                                }
+                                else if (state == NumberParsingState::Digits ||
+                                    state == NumberParsingState::DigitsAfterE ||
+                                    state == NumberParsingState::DigitsAfterPoints)
+                                {
+                                    // ok; pass
+                                }
+                                else if (state == NumberParsingState::E)
+                                {
+                                    state = NumberParsingState::DigitsAfterE;
+                                }
+                                else
+                                    return {};*/
+                                break;
+                            case '.':
+                                state = static_cast<NumberParsingState>("\7\7\4\4\7\7\7"[state]);
+                                /*
+                                if (state == NumberParsingState::Digits || state == NumberParsingState::ZeroFirst)
+                                {
+                                    state = NumberParsingState::DigitsAfterPoints;
+                                }
+                                else
+                                    return {};
+                                */
+                                break;
+                            case '-':
+                                state = static_cast<NumberParsingState>("\1\7\7\7\7\6\7"[state]);
+                                /*if (state == NumberParsingState::Minus)
+                                {
+                                    state = NumberParsingState::AfterMinus;
+                                }
+                                else if (state == NumberParsingState::E)
+                                {
+                                    state = NumberParsingState::DigitsAfterE;
+                                }
+                                else
+                                    return {};*/
+                                break;
+                            case '+':
+                                state = static_cast<NumberParsingState>("\7\7\7\7\7\6\7"[state]);
+                                /*if (state == NumberParsingState::E)
+                                {
+                                    state = NumberParsingState::DigitsAfterE;
+                                }
+                                else
+                                    return {};*/
+                                break;
+                            case 'e':
+                            case 'E':
+                                state = static_cast<NumberParsingState>("\7\7\7\5\5\7\7"[state]);
+                                /*if (state == NumberParsingState::Digits ||
+                                    state == NumberParsingState::DigitsAfterPoints)
+                                {
+                                    state = NumberParsingState::E;
+                                }
+                                else
+                                    return {};*/
+                                break;
+                            default:
+                                if (CROW_LIKELY(state == NumberParsingState::ZeroFirst ||
+                                                state == NumberParsingState::Digits ||
+                                                state == NumberParsingState::DigitsAfterPoints ||
+                                                state == NumberParsingState::DigitsAfterE))
+                                    return {type::Number, start, data};
+                                else
+                                    return {};
+                        }
+                        data++;
+                    }
+
+                    return {};
+                }
+
+
+                rvalue decode_value(unsigned depth)
+                {
+                    switch (*data)
+                    {
+                        case '[':
+                            return decode_list(depth + 1);
+                        case '{':
+                            return decode_object(depth + 1);
+                        case '"':
+                            return decode_string();
+                        case 't':
+                            if ( //e-data >= 4 &&
+                              data[1] == 'r' &&
+                              data[2] == 'u' &&
+                              data[3] == 'e')
+                            {
+                                data += 4;
+                                return {type::True};
+                            }
+                            else
+                                return {};
+                        case 'f':
+                            if ( //e-data >= 5 &&
+                              data[1] == 'a' &&
+                              data[2] == 'l' &&
+                              data[3] == 's' &&
+                              data[4] == 'e')
+                            {
+                                data += 5;
+                                return {type::False};
+                            }
+                            else
+                                return {};
+                        case 'n':
+                            if ( //e-data >= 4 &&
+                              data[1] == 'u' &&
+                              data[2] == 'l' &&
+                              data[3] == 'l')
+                            {
+                                data += 4;
+                                return {type::Null};
+                            }
+                            else
+                                return {};
+                        //case '1': case '2': case '3':
+                        //case '4': case '5': case '6':
+                        //case '7': case '8': case '9':
+                        //case '0': case '-':
+                        default:
+                            return decode_number();
+                    }
+                    return {};
+                }
+
+                rvalue decode_object(unsigned depth)
+                {
+                    rvalue ret(type::Object);
+                    if (CROW_UNLIKELY(!consume('{')) || CROW_UNLIKELY(depth > max_depth))
+                    {
+                        ret.set_error();
+                        return ret;
+                    }
+
+                    ws_skip();
+
+                    if (CROW_UNLIKELY(*data == '}'))
+                    {
+                        data++;
+                        return ret;
+                    }
+
+                    while (1)
+                    {
+                        auto t = decode_string();
+                        if (CROW_UNLIKELY(!t))
+                        {
+                            ret.set_error();
+                            break;
+                        }
+
+                        ws_skip();
+                        if (CROW_UNLIKELY(!consume(':')))
+                        {
+                            ret.set_error();
+                            break;
+                        }
+
+                        // TODO(ipkn) caching key to speed up (flyweight?)
+                        // I have no idea how flyweight could apply here, but maybe some speedup can happen if we stopped checking type since decode_string returns a string anyway
+                        auto key = t.s();
+
+                        ws_skip();
+                        auto v = decode_value(depth + 1);
+                        if (CROW_UNLIKELY(!v))
+                        {
+                            ret.set_error();
+                            break;
+                        }
+                        ws_skip();
+
+                        v.key_ = std::move(key);
+                        ret.emplace_back(std::move(v));
+                        if (CROW_UNLIKELY(*data == '}'))
+                        {
+                            data++;
+                            break;
+                        }
+                        if (CROW_UNLIKELY(!consume(',')))
+                        {
+                            ret.set_error();
+                            break;
+                        }
+                        ws_skip();
+                    }
+                    return ret;
+                }
+
+                rvalue parse()
+                {
+                    ws_skip();
+                    auto ret = decode_value(0); // or decode object?
+                    ws_skip();
+                    if (ret && *data != '\0')
+                        ret.set_error();
+                    return ret;
+                }
+
+                char* data;
+            };
+            return Parser(data, size).parse();
+        }
+        inline rvalue load(const char* data, size_t size)
+        {
+            char* s = new char[size + 1];
+            memcpy(s, data, size);
+            s[size] = 0;
+            auto ret = load_nocopy_internal(s, size);
+            if (ret)
+                ret.key_.force(s, size);
+            else
+                delete[] s;
+            return ret;
+        }
+
+        inline rvalue load(const char* data)
+        {
+            return load(data, strlen(data));
+        }
+
+        inline rvalue load(const std::string& str)
+        {
+            return load(str.data(), str.size());
+        }
+
+        struct wvalue_reader;
+
+        /// JSON write value.
+
+        ///
+        /// Value can mean any json value, including a JSON object.<br>
+        /// Write means this class is used to primarily assemble JSON objects using keys and values and export those into a string.
+        class wvalue : public returnable
+        {
+            friend class crow::mustache::template_t;
+            friend struct wvalue_reader;
+
+        public:
+            using object =
+#ifdef CROW_JSON_USE_MAP
+              std::map<std::string, wvalue>;
+#else
+              std::unordered_map<std::string, wvalue>;
+#endif
+
+            using list = std::vector<wvalue>;
+
+            type t() const { return t_; }
+
+            /// Create an empty json value (outputs "{}" instead of a "null" string)
+            static crow::json::wvalue empty_object() { return crow::json::wvalue::object(); }
+
+        private:
+            type t_{type::Null};         ///< The type of the value.
+            num_type nt{num_type::Null}; ///< The specific type of the number if \ref t_ is a number.
+            union number
+            {
+                double d;
+                int64_t si;
+                uint64_t ui;
+
+            public:
+                constexpr number() noexcept:
+                  ui() {} /* default constructor initializes unsigned integer. */
+                constexpr number(std::uint64_t value) noexcept:
+                  ui(value) {}
+                constexpr number(std::int64_t value) noexcept:
+                  si(value) {}
+                explicit constexpr number(double value) noexcept:
+                  d(value) {}
+                explicit constexpr number(float value) noexcept:
+                  d(value) {}
+            } num;                                      ///< Value if type is a number.
+            std::string s;                              ///< Value if type is a string.
+            std::unique_ptr<list> l;                    ///< Value if type is a list.
+            std::unique_ptr<object> o;                  ///< Value if type is a JSON object.
+            std::function<std::string(std::string&)> f; ///< Value if type is a function (C++ lambda)
+
+        public:
+            wvalue():
+              returnable("application/json") {}
+
+            wvalue(std::nullptr_t):
+              returnable("application/json"), t_(type::Null) {}
+
+            wvalue(bool value):
+              returnable("application/json"), t_(value ? type::True : type::False) {}
+
+            wvalue(std::uint8_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
+            wvalue(std::uint16_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
+            wvalue(std::uint32_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
+            wvalue(std::uint64_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
+
+            wvalue(std::int8_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
+            wvalue(std::int16_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
+            wvalue(std::int32_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
+            wvalue(std::int64_t value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
+
+            wvalue(float value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Floating_point), num(static_cast<double>(value)) {}
+            wvalue(double value):
+              returnable("application/json"), t_(type::Number), nt(num_type::Double_precision_floating_point), num(static_cast<double>(value)) {}
+
+            wvalue(char const* value):
+              returnable("application/json"), t_(type::String), s(value) {}
+
+            wvalue(std::string const& value):
+              returnable("application/json"), t_(type::String), s(value) {}
+            wvalue(std::string&& value):
+              returnable("application/json"), t_(type::String), s(std::move(value)) {}
+
+            wvalue(std::initializer_list<std::pair<std::string const, wvalue>> initializer_list):
+              returnable("application/json"), t_(type::Object), o(new object(initializer_list)) {}
+
+            wvalue(object const& value):
+              returnable("application/json"), t_(type::Object), o(new object(value)) {}
+            wvalue(object&& value):
+              returnable("application/json"), t_(type::Object), o(new object(std::move(value))) {}
+
+            wvalue(const list& r):
+              returnable("application/json")
+            {
+                t_ = type::List;
+                l = std::unique_ptr<list>(new list{});
+                l->reserve(r.size());
+                for (auto it = r.begin(); it != r.end(); ++it)
+                    l->emplace_back(*it);
+            }
+            wvalue(list& r):
+              returnable("application/json")
+            {
+                t_ = type::List;
+                l = std::unique_ptr<list>(new list{});
+                l->reserve(r.size());
+                for (auto it = r.begin(); it != r.end(); ++it)
+                    l->emplace_back(*it);
+            }
+
+            /// Create a write value from a read value (useful for editing JSON strings).
+            wvalue(const rvalue& r):
+              returnable("application/json")
+            {
+                t_ = r.t();
+                switch (r.t())
+                {
+                    case type::Null:
+                    case type::False:
+                    case type::True:
+                    case type::Function:
+                        return;
+                    case type::Number:
+                        nt = r.nt();
+                        if (nt == num_type::Floating_point || nt == num_type::Double_precision_floating_point)
+                            num.d = r.d();
+                        else if (nt == num_type::Signed_integer)
+                            num.si = r.i();
+                        else
+                            num.ui = r.u();
+                        return;
+                    case type::String:
+                        s = r.s();
+                        return;
+                    case type::List:
+                        l = std::unique_ptr<list>(new list{});
+                        l->reserve(r.size());
+                        for (auto it = r.begin(); it != r.end(); ++it)
+                            l->emplace_back(*it);
+                        return;
+                    case type::Object:
+                        o = std::unique_ptr<object>(new object{});
+                        for (auto it = r.begin(); it != r.end(); ++it)
+                            o->emplace(it->key(), *it);
+                        return;
+                }
+            }
+
+            wvalue(const wvalue& r):
+              returnable("application/json")
+            {
+                t_ = r.t();
+                switch (r.t())
+                {
+                    case type::Null:
+                    case type::False:
+                    case type::True:
+                        return;
+                    case type::Number:
+                        nt = r.nt;
+                        if (nt == num_type::Floating_point || nt == num_type::Double_precision_floating_point)
+                            num.d = r.num.d;
+                        else if (nt == num_type::Signed_integer)
+                            num.si = r.num.si;
+                        else
+                            num.ui = r.num.ui;
+                        return;
+                    case type::String:
+                        s = r.s;
+                        return;
+                    case type::List:
+                        l = std::unique_ptr<list>(new list{});
+                        l->reserve(r.size());
+                        for (auto it = r.l->begin(); it != r.l->end(); ++it)
+                            l->emplace_back(*it);
+                        return;
+                    case type::Object:
+                        o = std::unique_ptr<object>(new object{});
+                        o->insert(r.o->begin(), r.o->end());
+                        return;
+                    case type::Function:
+                        f = r.f;
+                }
+            }
+
+            wvalue(wvalue&& r):
+              returnable("application/json")
+            {
+                *this = std::move(r);
+            }
+
+            wvalue& operator=(wvalue&& r)
+            {
+                t_ = r.t_;
+                nt = r.nt;
+                num = r.num;
+                s = std::move(r.s);
+                l = std::move(r.l);
+                o = std::move(r.o);
+                return *this;
+            }
+
+            /// Used for compatibility, same as \ref reset()
+            void clear()
+            {
+                reset();
+            }
+
+            void reset()
+            {
+                t_ = type::Null;
+                l.reset();
+                o.reset();
+            }
+
+            wvalue& operator=(std::nullptr_t)
+            {
+                reset();
+                return *this;
+            }
+            wvalue& operator=(bool value)
+            {
+                reset();
+                if (value)
+                    t_ = type::True;
+                else
+                    t_ = type::False;
+                return *this;
+            }
+
+            wvalue& operator=(float value)
+            {
+                reset();
+                t_ = type::Number;
+                num.d = value;
+                nt = num_type::Floating_point;
+                return *this;
+            }
+
+            wvalue& operator=(double value)
+            {
+                reset();
+                t_ = type::Number;
+                num.d = value;
+                nt = num_type::Double_precision_floating_point;
+                return *this;
+            }
+
+            wvalue& operator=(unsigned short value)
+            {
+                reset();
+                t_ = type::Number;
+                num.ui = value;
+                nt = num_type::Unsigned_integer;
+                return *this;
+            }
+
+            wvalue& operator=(short value)
+            {
+                reset();
+                t_ = type::Number;
+                num.si = value;
+                nt = num_type::Signed_integer;
+                return *this;
+            }
+
+            wvalue& operator=(long long value)
+            {
+                reset();
+                t_ = type::Number;
+                num.si = value;
+                nt = num_type::Signed_integer;
+                return *this;
+            }
+
+            wvalue& operator=(long value)
+            {
+                reset();
+                t_ = type::Number;
+                num.si = value;
+                nt = num_type::Signed_integer;
+                return *this;
+            }
+
+            wvalue& operator=(int value)
+            {
+                reset();
+                t_ = type::Number;
+                num.si = value;
+                nt = num_type::Signed_integer;
+                return *this;
+            }
+
+            wvalue& operator=(unsigned long long value)
+            {
+                reset();
+                t_ = type::Number;
+                num.ui = value;
+                nt = num_type::Unsigned_integer;
+                return *this;
+            }
+
+            wvalue& operator=(unsigned long value)
+            {
+                reset();
+                t_ = type::Number;
+                num.ui = value;
+                nt = num_type::Unsigned_integer;
+                return *this;
+            }
+
+            wvalue& operator=(unsigned int value)
+            {
+                reset();
+                t_ = type::Number;
+                num.ui = value;
+                nt = num_type::Unsigned_integer;
+                return *this;
+            }
+
+            wvalue& operator=(const char* str)
+            {
+                reset();
+                t_ = type::String;
+                s = str;
+                return *this;
+            }
+
+            wvalue& operator=(const std::string& str)
+            {
+                reset();
+                t_ = type::String;
+                s = str;
+                return *this;
+            }
+
+            wvalue& operator=(list&& v)
+            {
+                if (t_ != type::List)
+                    reset();
+                t_ = type::List;
+                if (!l)
+                    l = std::unique_ptr<list>(new list{});
+                l->clear();
+                l->resize(v.size());
+                size_t idx = 0;
+                for (auto& x : v)
+                {
+                    (*l)[idx++] = std::move(x);
+                }
+                return *this;
+            }
+
+            template<typename T>
+            wvalue& operator=(const std::vector<T>& v)
+            {
+                if (t_ != type::List)
+                    reset();
+                t_ = type::List;
+                if (!l)
+                    l = std::unique_ptr<list>(new list{});
+                l->clear();
+                l->resize(v.size());
+                size_t idx = 0;
+                for (auto& x : v)
+                {
+                    (*l)[idx++] = x;
+                }
+                return *this;
+            }
+
+            wvalue& operator=(std::initializer_list<std::pair<std::string const, wvalue>> initializer_list)
+            {
+                if (t_ != type::Object)
+                {
+                    reset();
+                    t_ = type::Object;
+                    o = std::unique_ptr<object>(new object(initializer_list));
+                }
+                else
+                {
+#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(_LIBCPP_VERSION)
+                    o = std::unique_ptr<object>(new object(initializer_list));
+#else
+                    (*o) = initializer_list;
+#endif
+                }
+                return *this;
+            }
+
+            wvalue& operator=(object const& value)
+            {
+                if (t_ != type::Object)
+                {
+                    reset();
+                    t_ = type::Object;
+                    o = std::unique_ptr<object>(new object(value));
+                }
+                else
+                {
+#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(_LIBCPP_VERSION)
+                    o = std::unique_ptr<object>(new object(value));
+#else
+                    (*o) = value;
+#endif
+                }
+                return *this;
+            }
+
+            wvalue& operator=(object&& value)
+            {
+                if (t_ != type::Object)
+                {
+                    reset();
+                    t_ = type::Object;
+                    o = std::unique_ptr<object>(new object(std::move(value)));
+                }
+                else
+                {
+                    (*o) = std::move(value);
+                }
+                return *this;
+            }
+
+            wvalue& operator=(std::function<std::string(std::string&)>&& func)
+            {
+                reset();
+                t_ = type::Function;
+                f = std::move(func);
+                return *this;
+            }
+
+            wvalue& operator[](unsigned index)
+            {
+                if (t_ != type::List)
+                    reset();
+                t_ = type::List;
+                if (!l)
+                    l = std::unique_ptr<list>(new list{});
+                if (l->size() < index + 1)
+                    l->resize(index + 1);
+                return (*l)[index];
+            }
+
+            const wvalue& operator[](unsigned index) const
+            {
+                return const_cast<wvalue*>(this)->operator[](index);
+            }
+
+            int count(const std::string& str) const
+            {
+                if (t_ != type::Object)
+                    return 0;
+                if (!o)
+                    return 0;
+                return o->count(str);
+            }
+
+            wvalue& operator[](const std::string& str)
+            {
+                if (t_ != type::Object)
+                    reset();
+                t_ = type::Object;
+                if (!o)
+                    o = std::unique_ptr<object>(new object{});
+                return (*o)[str];
+            }
+
+            const wvalue& operator[](const std::string& str) const
+            {
+                return const_cast<wvalue*>(this)->operator[](str);
+            }
+
+            std::vector<std::string> keys() const
+            {
+                if (t_ != type::Object)
+                    return {};
+                std::vector<std::string> result;
+                for (auto& kv : *o)
+                {
+                    result.push_back(kv.first);
+                }
+                return result;
+            }
+
+            std::string execute(std::string txt = "") const //Not using reference because it cannot be used with a default rvalue
+            {
+                if (t_ != type::Function)
+                    return "";
+                return f(txt);
+            }
+
+            /// If the wvalue is a list, it returns the length of the list, otherwise it returns 1.
+            std::size_t size() const
+            {
+                if (t_ != type::List)
+                    return 1;
+                return l->size();
+            }
+
+            /// Returns an estimated size of the value in bytes.
+            size_t estimate_length() const
+            {
+                switch (t_)
+                {
+                    case type::Null: return 4;
+                    case type::False: return 5;
+                    case type::True: return 4;
+                    case type::Number: return 30;
+                    case type::String: return 2 + s.size() + s.size() / 2;
+                    case type::List:
+                    {
+                        size_t sum{};
+                        if (l)
+                        {
+                            for (auto& x : *l)
+                            {
+                                sum += 1;
+                                sum += x.estimate_length();
+                            }
+                        }
+                        return sum + 2;
+                    }
+                    case type::Object:
+                    {
+                        size_t sum{};
+                        if (o)
+                        {
+                            for (auto& kv : *o)
+                            {
+                                sum += 2;
+                                sum += 2 + kv.first.size() + kv.first.size() / 2;
+                                sum += kv.second.estimate_length();
+                            }
+                        }
+                        return sum + 2;
+                    }
+                    case type::Function:
+                        return 0;
+                }
+                return 1;
+            }
+
+        private:
+            inline void dump_string(const std::string& str, std::string& out) const
+            {
+                out.push_back('"');
+                escape(str, out);
+                out.push_back('"');
+            }
+
+            inline void dump_indentation_part(std::string& out, const int indent, const char separator, const int indent_level) const
+            {
+                out.push_back('\n');
+                out.append(indent_level * indent, separator);
+            }
+
+
+            inline void dump_internal(const wvalue& v, std::string& out, const int indent, const char separator, const int indent_level = 0) const
+            {
+                switch (v.t_)
+                {
+                    case type::Null: out += "null"; break;
+                    case type::False: out += "false"; break;
+                    case type::True: out += "true"; break;
+                    case type::Number:
+                    {
+                        if (v.nt == num_type::Floating_point || v.nt == num_type::Double_precision_floating_point)
+                        {
+                            if (isnan(v.num.d) || isinf(v.num.d))
+                            {
+                                out += "null";
+                                CROW_LOG_WARNING << "Invalid JSON value detected (" << v.num.d << "), value set to null";
+                                break;
+                            }
+                            enum
+                            {
+                                start,
+                                decp, // Decimal point
+                                zero
+                            } f_state;
+                            char outbuf[128];
+                            if (v.nt == num_type::Double_precision_floating_point)
+                            {
+#ifdef _MSC_VER
+                                sprintf_s(outbuf, sizeof(outbuf), "%.*g", DECIMAL_DIG, v.num.d);
+#else
+                                snprintf(outbuf, sizeof(outbuf), "%.*g", DECIMAL_DIG, v.num.d);
+#endif
+                            }
+                            else
+                            {
+#ifdef _MSC_VER
+                                sprintf_s(outbuf, sizeof(outbuf), "%f", v.num.d);
+#else
+                                snprintf(outbuf, sizeof(outbuf), "%f", v.num.d);
+#endif 
+                            }
+                            char *p = &outbuf[0], *o = nullptr; // o is the position of the first trailing 0
+                            f_state = start;
+                            while (*p != '\0')
+                            {
+                                //std::cout << *p << std::endl;
+                                char ch = *p;
+                                switch (f_state)
+                                {
+                                    case start: // Loop and lookahead until a decimal point is found
+                                        if (ch == '.')
+                                        {
+                                            char fch = *(p + 1);
+                                            // if the first character is 0, leave it be (this is so that "1.00000" becomes "1.0" and not "1.")
+                                            if (fch != '\0' && fch == '0') p++;
+                                            f_state = decp;
+                                        }
+                                        p++;
+                                        break;
+                                    case decp: // Loop until a 0 is found, if found, record its position
+                                        if (ch == '0')
+                                        {
+                                            f_state = zero;
+                                            o = p;
+                                        }
+                                        p++;
+                                        break;
+                                    case zero: // if a non 0 is found (e.g. 1.00004) remove the earlier recorded 0 position and look for more trailing 0s
+                                        if (ch != '0')
+                                        {
+                                            o = nullptr;
+                                            f_state = decp;
+                                        }
+                                        p++;
+                                        break;
+                                }
+                            }
+                            if (o != nullptr) // if any trailing 0s are found, terminate the string where they begin
+                                *o = '\0';
+                            out += outbuf;
+                        }
+                        else if (v.nt == num_type::Signed_integer)
+                        {
+                            out += std::to_string(v.num.si);
+                        }
+                        else
+                        {
+                            out += std::to_string(v.num.ui);
+                        }
+                    }
+                    break;
+                    case type::String: dump_string(v.s, out); break;
+                    case type::List:
+                    {
+                        out.push_back('[');
+
+                        if (indent >= 0)
+                        {
+                            dump_indentation_part(out, indent, separator, indent_level + 1);
+                        }
+
+                        if (v.l)
+                        {
+                            bool first = true;
+                            for (auto& x : *v.l)
+                            {
+                                if (!first)
+                                {
+                                    out.push_back(',');
+
+                                    if (indent >= 0)
+                                    {
+                                        dump_indentation_part(out, indent, separator, indent_level + 1);
+                                    }
+                                }
+                                first = false;
+                                dump_internal(x, out, indent, separator, indent_level + 1);
+                            }
+                        }
+
+                        if (indent >= 0)
+                        {
+                            dump_indentation_part(out, indent, separator, indent_level);
+                        }
+
+                        out.push_back(']');
+                    }
+                    break;
+                    case type::Object:
+                    {
+                        out.push_back('{');
+
+                        if (indent >= 0)
+                        {
+                            dump_indentation_part(out, indent, separator, indent_level + 1);
+                        }
+
+                        if (v.o)
+                        {
+                            bool first = true;
+                            for (auto& kv : *v.o)
+                            {
+                                if (!first)
+                                {
+                                    out.push_back(',');
+                                    if (indent >= 0)
+                                    {
+                                        dump_indentation_part(out, indent, separator, indent_level + 1);
+                                    }
+                                }
+                                first = false;
+                                dump_string(kv.first, out);
+                                out.push_back(':');
+
+                                if (indent >= 0)
+                                {
+                                    out.push_back(' ');
+                                }
+
+                                dump_internal(kv.second, out, indent, separator, indent_level + 1);
+                            }
+                        }
+
+                        if (indent >= 0)
+                        {
+                            dump_indentation_part(out, indent, separator, indent_level);
+                        }
+
+                        out.push_back('}');
+                    }
+                    break;
+
+                    case type::Function:
+                        out += "custom function";
+                        break;
+                }
+            }
+
+        public:
+            std::string dump(const int indent, const char separator = ' ') const
+            {
+                std::string ret;
+                ret.reserve(estimate_length());
+                dump_internal(*this, ret, indent, separator);
+                return ret;
+            }
+
+            std::string dump() const
+            {
+                static constexpr int DontIndent = -1;
+
+                return dump(DontIndent);
+            }
+        };
+
+        // Used for accessing the internals of a wvalue
+        struct wvalue_reader
+        {
+            int64_t get(int64_t fallback)
+            {
+                if (ref.t() != type::Number || ref.nt == num_type::Floating_point || 
+                    ref.nt == num_type::Double_precision_floating_point)
+                    return fallback;
+                return ref.num.si;
+            }
+
+            double get(double fallback)
+            {
+                if (ref.t() != type::Number || ref.nt != num_type::Floating_point ||
+                    ref.nt == num_type::Double_precision_floating_point)
+                    return fallback;
+                return ref.num.d;
+            }
+
+            bool get(bool fallback)
+            {
+                if (ref.t() == type::True) return true;
+                if (ref.t() == type::False) return false;
+                return fallback;
+            }
+
+            std::string get(const std::string& fallback)
+            {
+                if (ref.t() != type::String) return fallback;
+                return ref.s;
+            }
+
+            const wvalue& ref;
+        };
+
+        //std::vector<asio::const_buffer> dump_ref(wvalue& v)
+        //{
+        //}
+    } // namespace json
+} // namespace crow
+
+#include <string>
+#include <unordered_map>
+#include <ios>
+#include <fstream>
+#include <sstream>
+// S_ISREG is not defined for windows
+// This defines it like suggested in https://stackoverflow.com/a/62371749
+#if defined(_MSC_VER)
+#define _CRT_INTERNAL_NONSTDC_NAMES 1
+#endif
+#include <sys/stat.h>
+#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
+#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
+#endif
+
+
+
+namespace crow
+{
+    template<typename Adaptor, typename Handler, typename... Middlewares>
+    class Connection;
+
+    class Router;
+
+    /// HTTP response
+    struct response
+    {
+        template<typename Adaptor, typename Handler, typename... Middlewares>
+        friend class crow::Connection;
+
+        friend class Router;
+
+        int code{200};    ///< The Status code for the response.
+        std::string body; ///< The actual payload containing the response data.
+        ci_map headers;   ///< HTTP headers.
+
+#ifdef CROW_ENABLE_COMPRESSION
+        bool compressed = true; ///< If compression is enabled and this is false, the individual response will not be compressed.
+#endif
+        bool skip_body = false;            ///< Whether this is a response to a HEAD request.
+        bool manual_length_header = false; ///< Whether Crow should automatically add a "Content-Length" header.
+
+        /// Set the value of an existing header in the response.
+        void set_header(std::string key, std::string value)
+        {
+            headers.erase(key);
+            headers.emplace(std::move(key), std::move(value));
+        }
+
+        /// Add a new header to the response.
+        void add_header(std::string key, std::string value)
+        {
+            headers.emplace(std::move(key), std::move(value));
+        }
+
+        const std::string& get_header_value(const std::string& key)
+        {
+            return crow::get_header_value(headers, key);
+        }
+
+        // naive validation of a mime-type string
+        static bool validate_mime_type(const std::string& candidate) noexcept
+        {
+            // Here we simply check that the candidate type starts with
+            // a valid parent type, and has at least one character afterwards.
+            std::array<std::string, 10> valid_parent_types = {
+              "application/", "audio/", "font/", "example/",
+              "image/", "message/", "model/", "multipart/",
+              "text/", "video/"};
+            for (const std::string& parent : valid_parent_types)
+            {
+                // ensure the candidate is *longer* than the parent,
+                // to avoid unnecessary string comparison and to
+                // reject zero-length subtypes.
+                if (candidate.size() <= parent.size())
+                {
+                    continue;
+                }
+                // strncmp is used rather than substr to avoid allocation,
+                // but a string_view approach would be better if Crow
+                // migrates to C++17.
+                if (strncmp(parent.c_str(), candidate.c_str(), parent.size()) == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        // Find the mime type from the content type either by lookup,
+        // or by the content type itself, if it is a valid a mime type.
+        // Defaults to text/plain.
+        static std::string get_mime_type(const std::string& contentType)
+        {
+            const auto mimeTypeIterator = mime_types.find(contentType);
+            if (mimeTypeIterator != mime_types.end())
+            {
+                return mimeTypeIterator->second;
+            }
+            else if (validate_mime_type(contentType))
+            {
+                return contentType;
+            }
+            else
+            {
+                CROW_LOG_WARNING << "Unable to interpret mime type for content type '" << contentType << "'. Defaulting to text/plain.";
+                return "text/plain";
+            }
+        }
+
+
+        // clang-format off
+        response() {}
+        explicit response(int code) : code(code) {}
+        response(std::string body) : body(std::move(body)) {}
+        response(int code, std::string body) : code(code), body(std::move(body)) {}
+        // clang-format on
+        response(returnable&& value)
+        {
+            body = value.dump();
+            set_header("Content-Type", value.content_type);
+        }
+        response(returnable& value)
+        {
+            body = value.dump();
+            set_header("Content-Type", value.content_type);
+        }
+        response(int code, returnable& value):
+          code(code)
+        {
+            body = value.dump();
+            set_header("Content-Type", value.content_type);
+        }
+        response(int code, returnable&& value):
+          code(code), body(value.dump())
+        {
+            set_header("Content-Type", std::move(value.content_type));
+        }
+
+        response(response&& r)
+        {
+            *this = std::move(r);
+        }
+
+        response(std::string contentType, std::string body):
+          body(std::move(body))
+        {
+            set_header("Content-Type", get_mime_type(contentType));
+        }
+
+        response(int code, std::string contentType, std::string body):
+          code(code), body(std::move(body))
+        {
+            set_header("Content-Type", get_mime_type(contentType));
+        }
+
+        response& operator=(const response& r) = delete;
+
+        response& operator=(response&& r) noexcept
+        {
+            body = std::move(r.body);
+            code = r.code;
+            headers = std::move(r.headers);
+            completed_ = r.completed_;
+            file_info = std::move(r.file_info);
+            return *this;
+        }
+
+        /// Check if the response has completed (whether response.end() has been called)
+        bool is_completed() const noexcept
+        {
+            return completed_;
+        }
+
+        void clear()
+        {
+            body.clear();
+            code = 200;
+            headers.clear();
+            completed_ = false;
+            file_info = static_file_info{};
+        }
+
+        /// Return a "Temporary Redirect" response.
+
+        ///
+        /// Location can either be a route or a full URL.
+        void redirect(const std::string& location)
+        {
+            code = 307;
+            set_header("Location", location);
+        }
+
+        /// Return a "Permanent Redirect" response.
+
+        ///
+        /// Location can either be a route or a full URL.
+        void redirect_perm(const std::string& location)
+        {
+            code = 308;
+            set_header("Location", location);
+        }
+
+        /// Return a "Found (Moved Temporarily)" response.
+
+        ///
+        /// Location can either be a route or a full URL.
+        void moved(const std::string& location)
+        {
+            code = 302;
+            set_header("Location", location);
+        }
+
+        /// Return a "Moved Permanently" response.
+
+        ///
+        /// Location can either be a route or a full URL.
+        void moved_perm(const std::string& location)
+        {
+            code = 301;
+            set_header("Location", location);
+        }
+
+        void write(const std::string& body_part)
+        {
+            body += body_part;
+        }
+
+        /// Set the response completion flag and call the handler (to send the response).
+        void end()
+        {
+            if (!completed_)
+            {
+                completed_ = true;
+                if (skip_body)
+                {
+                    set_header("Content-Length", std::to_string(body.size()));
+                    body = "";
+                    manual_length_header = true;
+                }
+                if (complete_request_handler_)
+                {
+                    complete_request_handler_();
+                    manual_length_header = false;
+                    skip_body = false;
+                }
+            }
+        }
+
+        /// Same as end() except it adds a body part right before ending.
+        void end(const std::string& body_part)
+        {
+            body += body_part;
+            end();
+        }
+
+        /// Check if the connection is still alive (usually by checking the socket status).
+        bool is_alive()
+        {
+            return is_alive_helper_ && is_alive_helper_();
+        }
+
+        /// Check whether the response has a static file defined.
+        bool is_static_type()
+        {
+            return file_info.path.size();
+        }
+
+        /// This constains metadata (coming from the `stat` command) related to any static files associated with this response.
+
+        ///
+        /// Either a static file or a string body can be returned as 1 response.
+        struct static_file_info
+        {
+            std::string path = "";
+            struct stat statbuf;
+            int statResult;
+        };
+
+        /// Return a static file as the response body
+        void set_static_file_info(std::string path)
+        {
+            utility::sanitize_filename(path);
+            set_static_file_info_unsafe(path);
+        }
+
+        /// Return a static file as the response body without sanitizing the path (use set_static_file_info instead)
+        void set_static_file_info_unsafe(std::string path)
+        {
+            file_info.path = path;
+            file_info.statResult = stat(file_info.path.c_str(), &file_info.statbuf);
+#ifdef CROW_ENABLE_COMPRESSION
+            compressed = false;
+#endif
+            if (file_info.statResult == 0 && S_ISREG(file_info.statbuf.st_mode))
+            {
+                std::size_t last_dot = path.find_last_of(".");
+                std::string extension = path.substr(last_dot + 1);
+                code = 200;
+                this->add_header("Content-Length", std::to_string(file_info.statbuf.st_size));
+
+                if (!extension.empty())
+                {
+                    this->add_header("Content-Type", get_mime_type(extension));
+                }
+            }
+            else
+            {
+                code = 404;
+                file_info.path.clear();
+            }
+        }
+
+    private:
+        bool completed_{};
+        std::function<void()> complete_request_handler_;
+        std::function<bool()> is_alive_helper_;
+        static_file_info file_info;
+    };
+} // namespace crow
+
+
+namespace crow
+{
+
+    struct UTF8
+    {
+        struct context
+        {};
+
+        void before_handle(request& /*req*/, response& /*res*/, context& /*ctx*/)
+        {}
+
+        void after_handle(request& /*req*/, response& res, context& /*ctx*/)
+        {
+            if (get_header_value(res.headers, "Content-Type").empty())
+            {
+                res.set_header("Content-Type", "text/plain; charset=utf-8");
+            }
+        }
+    };
+
+} // namespace crow
+
+#include <iomanip>
+#include <memory>
+
+namespace crow
+{
+    // Any middleware requires following 3 members:
+
+    // struct context;
+    //      storing data for the middleware; can be read from another middleware or handlers
+
+    // before_handle
+    //      called before handling the request.
+    //      if res.end() is called, the operation is halted.
+    //      (still call after_handle of this middleware)
+    //      2 signatures:
+    //      void before_handle(request& req, response& res, context& ctx)
+    //          if you only need to access this middlewares context.
+    //      template <typename AllContext>
+    //      void before_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    //          you can access another middlewares' context by calling `all_ctx.template get<MW>()'
+    //          ctx == all_ctx.template get<CurrentMiddleware>()
+
+    // after_handle
+    //      called after handling the request.
+    //      void after_handle(request& req, response& res, context& ctx)
+    //      template <typename AllContext>
+    //      void after_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+
+    struct CookieParser
+    {
+        // Cookie stores key, value and attributes
+        struct Cookie
+        {
+            enum class SameSitePolicy
+            {
+                Strict,
+                Lax,
+                None
+            };
+
+            template<typename U>
+            Cookie(const std::string& key, U&& value):
+              Cookie()
+            {
+                key_ = key;
+                value_ = std::forward<U>(value);
+            }
+
+            Cookie(const std::string& key):
+              Cookie(key, "") {}
+
+            // format cookie to HTTP header format
+            std::string dump() const
+            {
+                const static char* HTTP_DATE_FORMAT = "%a, %d %b %Y %H:%M:%S GMT";
+
+                std::stringstream ss;
+                ss << key_ << '=';
+                ss << (value_.empty() ? "\"\"" : value_);
+                dumpString(ss, !domain_.empty(), "Domain=", domain_);
+                dumpString(ss, !path_.empty(), "Path=", path_);
+                dumpString(ss, secure_, "Secure");
+                dumpString(ss, httponly_, "HttpOnly");
+                if (expires_at_)
+                {
+                    ss << DIVIDER << "Expires="
+                       << std::put_time(expires_at_.get(), HTTP_DATE_FORMAT);
+                }
+                if (max_age_)
+                {
+                    ss << DIVIDER << "Max-Age=" << *max_age_;
+                }
+                if (same_site_)
+                {
+                    ss << DIVIDER << "SameSite=";
+                    switch (*same_site_)
+                    {
+                        case SameSitePolicy::Strict:
+                            ss << "Strict";
+                            break;
+                        case SameSitePolicy::Lax:
+                            ss << "Lax";
+                            break;
+                        case SameSitePolicy::None:
+                            ss << "None";
+                            break;
+                    }
+                }
+                return ss.str();
+            }
+
+            const std::string& name()
+            {
+                return key_;
+            }
+
+            template<typename U>
+            Cookie& value(U&& value)
+            {
+                value_ = std::forward<U>(value);
+                return *this;
+            }
+
+            // Expires attribute
+            Cookie& expires(const std::tm& time)
+            {
+                expires_at_ = std::unique_ptr<std::tm>(new std::tm(time));
+                return *this;
+            }
+
+            // Max-Age attribute
+            Cookie& max_age(long long seconds)
+            {
+                max_age_ = std::unique_ptr<long long>(new long long(seconds));
+                return *this;
+            }
+
+            // Domain attribute
+            Cookie& domain(const std::string& name)
+            {
+                domain_ = name;
+                return *this;
+            }
+
+            // Path attribute
+            Cookie& path(const std::string& path)
+            {
+                path_ = path;
+                return *this;
+            }
+
+            // Secured attribute
+            Cookie& secure()
+            {
+                secure_ = true;
+                return *this;
+            }
+
+            // HttpOnly attribute
+            Cookie& httponly()
+            {
+                httponly_ = true;
+                return *this;
+            }
+
+            // SameSite attribute
+            Cookie& same_site(SameSitePolicy ssp)
+            {
+                same_site_ = std::unique_ptr<SameSitePolicy>(new SameSitePolicy(ssp));
+                return *this;
+            }
+
+            Cookie(const Cookie& c):
+              key_(c.key_),
+              value_(c.value_),
+              domain_(c.domain_),
+              path_(c.path_),
+              secure_(c.secure_),
+              httponly_(c.httponly_)
+            {
+                if (c.max_age_)
+                    max_age_ = std::unique_ptr<long long>(new long long(*c.max_age_));
+
+                if (c.expires_at_)
+                    expires_at_ = std::unique_ptr<std::tm>(new std::tm(*c.expires_at_));
+
+                if (c.same_site_)
+                    same_site_ = std::unique_ptr<SameSitePolicy>(new SameSitePolicy(*c.same_site_));
+            }
+
+        private:
+            Cookie() = default;
+
+            static void dumpString(std::stringstream& ss, bool cond, const char* prefix,
+                                   const std::string& value = "")
+            {
+                if (cond)
+                {
+                    ss << DIVIDER << prefix << value;
+                }
+            }
+
+        private:
+            std::string key_;
+            std::string value_;
+            std::unique_ptr<long long> max_age_{};
+            std::string domain_ = "";
+            std::string path_ = "";
+            bool secure_ = false;
+            bool httponly_ = false;
+            std::unique_ptr<std::tm> expires_at_{};
+            std::unique_ptr<SameSitePolicy> same_site_{};
+
+            static constexpr const char* DIVIDER = "; ";
+        };
+
+
+        struct context
+        {
+            std::unordered_map<std::string, std::string> jar;
+
+            std::string get_cookie(const std::string& key) const
+            {
+                auto cookie = jar.find(key);
+                if (cookie != jar.end())
+                    return cookie->second;
+                return {};
+            }
+
+            template<typename U>
+            Cookie& set_cookie(const std::string& key, U&& value)
+            {
+                cookies_to_add.emplace_back(key, std::forward<U>(value));
+                return cookies_to_add.back();
+            }
+
+            Cookie& set_cookie(Cookie cookie)
+            {
+                cookies_to_add.push_back(std::move(cookie));
+                return cookies_to_add.back();
+            }
+
+        private:
+            friend struct CookieParser;
+            std::vector<Cookie> cookies_to_add;
+        };
+
+        void before_handle(request& req, response& res, context& ctx)
+        {
+            // TODO(dranikpg): remove copies, use string_view with c++17
+            int count = req.headers.count("Cookie");
+            if (!count)
+                return;
+            if (count > 1)
+            {
+                res.code = 400;
+                res.end();
+                return;
+            }
+            std::string cookies = req.get_header_value("Cookie");
+            size_t pos = 0;
+            while (pos < cookies.size())
+            {
+                size_t pos_equal = cookies.find('=', pos);
+                if (pos_equal == cookies.npos)
+                    break;
+                std::string name = cookies.substr(pos, pos_equal - pos);
+                name = utility::trim(name);
+                pos = pos_equal + 1;
+                if (pos == cookies.size())
+                    break;
+
+                size_t pos_semicolon = cookies.find(';', pos);
+                std::string value = cookies.substr(pos, pos_semicolon - pos);
+
+                value = utility::trim(value);
+                if (value[0] == '"' && value[value.size() - 1] == '"')
+                {
+                    value = value.substr(1, value.size() - 2);
+                }
+
+                ctx.jar.emplace(std::move(name), std::move(value));
+
+                pos = pos_semicolon;
+                if (pos == cookies.npos)
+                    break;
+                pos++;
+            }
+        }
+
+        void after_handle(request& /*req*/, response& res, context& ctx)
+        {
+            for (const auto& cookie : ctx.cookies_to_add)
+            {
+                res.add_header("Set-Cookie", cookie.dump());
+            }
+        }
+    };
+
+    /*
+    App<CookieParser, AnotherJarMW> app;
+    A B C
+    A::context
+        int aa;
+
+    ctx1 : public A::context
+    ctx2 : public ctx1, public B::context
+    ctx3 : public ctx2, public C::context
+
+    C depends on A
+
+    C::handle
+        context.aaa
+
+    App::context : private CookieParser::context, ...
+    {
+        jar
+
+    }
+
+    SimpleApp
+    */
+} // namespace crow
+
+
+
+#include <unordered_map>
+#include <unordered_set>
+#include <set>
+#include <queue>
+
+#include <memory>
+#include <string>
+#include <cstdio>
+#include <mutex>
+
+#include <fstream>
+#include <sstream>
+
+#include <type_traits>
+#include <functional>
+#include <chrono>
+
+#ifdef CROW_CAN_USE_CPP17
+#include <variant>
+#endif
+
+namespace
+{
+    // convert all integer values to int64_t
+    template<typename T>
+    using wrap_integral_t = typename std::conditional<
+      std::is_integral<T>::value && !std::is_same<bool, T>::value
+        // except for uint64_t because that could lead to overflow on conversion
+        && !std::is_same<uint64_t, T>::value,
+      int64_t, T>::type;
+
+    // convert char[]/char* to std::string
+    template<typename T>
+    using wrap_char_t = typename std::conditional<
+      std::is_same<typename std::decay<T>::type, char*>::value,
+      std::string, T>::type;
+
+    // Upgrade to correct type for multi_variant use
+    template<typename T>
+    using wrap_mv_t = wrap_char_t<wrap_integral_t<T>>;
+} // namespace
+
+namespace crow
+{
+    namespace session
+    {
+
+#ifdef CROW_CAN_USE_CPP17
+        using multi_value_types = black_magic::S<bool, int64_t, double, std::string>;
+
+        /// A multi_value is a safe variant wrapper with json conversion support
+        struct multi_value
+        {
+            json::wvalue json() const
+            {
+                // clang-format off
+                return std::visit([](auto arg) {
+                    return json::wvalue(arg);
+                }, v_);
+                // clang-format on
+            }
+
+            static multi_value from_json(const json::rvalue&);
+
+            std::string string() const
+            {
+                // clang-format off
+                return std::visit([](auto arg) {
+                    if constexpr (std::is_same_v<decltype(arg), std::string>)
+                        return arg;
+                    else
+                        return std::to_string(arg);
+                }, v_);
+                // clang-format on
+            }
+
+            template<typename T, typename RT = wrap_mv_t<T>>
+            RT get(const T& fallback)
+            {
+                if (const RT* val = std::get_if<RT>(&v_)) return *val;
+                return fallback;
+            }
+
+            template<typename T, typename RT = wrap_mv_t<T>>
+            void set(T val)
+            {
+                v_ = RT(std::move(val));
+            }
+
+            typename multi_value_types::rebind<std::variant> v_;
+        };
+
+        inline multi_value multi_value::from_json(const json::rvalue& rv)
+        {
+            using namespace json;
+            switch (rv.t())
+            {
+                case type::Number:
+                {
+                    if (rv.nt() == num_type::Floating_point || rv.nt() == num_type::Double_precision_floating_point)
+                        return multi_value{rv.d()};
+                    else if (rv.nt() == num_type::Unsigned_integer)
+                        return multi_value{int64_t(rv.u())};
+                    else
+                        return multi_value{rv.i()};
+                }
+                case type::False: return multi_value{false};
+                case type::True: return multi_value{true};
+                case type::String: return multi_value{std::string(rv)};
+                default: return multi_value{false};
+            }
+        }
+#else
+        // Fallback for C++11/14 that uses a raw json::wvalue internally.
+        // This implementation consumes significantly more memory
+        // than the variant-based version
+        struct multi_value
+        {
+            json::wvalue json() const { return v_; }
+
+            static multi_value from_json(const json::rvalue&);
+
+            std::string string() const { return v_.dump(); }
+
+            template<typename T, typename RT = wrap_mv_t<T>>
+            RT get(const T& fallback)
+            {
+                return json::wvalue_reader{v_}.get((const RT&)(fallback));
+            }
+
+            template<typename T, typename RT = wrap_mv_t<T>>
+            void set(T val)
+            {
+                v_ = RT(std::move(val));
+            }
+
+            json::wvalue v_;
+        };
+
+        inline multi_value multi_value::from_json(const json::rvalue& rv)
+        {
+            return {rv};
+        }
+#endif
+
+        /// Expiration tracker keeps track of soonest-to-expire keys
+        struct ExpirationTracker
+        {
+            using DataPair = std::pair<uint64_t /*time*/, std::string /*key*/>;
+
+            /// Add key with time to tracker.
+            /// If the key is already present, it will be updated
+            void add(std::string key, uint64_t time)
+            {
+                auto it = times_.find(key);
+                if (it != times_.end()) remove(key);
+                times_[key] = time;
+                queue_.insert({time, std::move(key)});
+            }
+
+            void remove(const std::string& key)
+            {
+                auto it = times_.find(key);
+                if (it != times_.end())
+                {
+                    queue_.erase({it->second, key});
+                    times_.erase(it);
+                }
+            }
+
+            /// Get expiration time of soonest-to-expire entry
+            uint64_t peek_first() const
+            {
+                if (queue_.empty()) return std::numeric_limits<uint64_t>::max();
+                return queue_.begin()->first;
+            }
+
+            std::string pop_first()
+            {
+                auto it = times_.find(queue_.begin()->second);
+                auto key = it->first;
+                times_.erase(it);
+                queue_.erase(queue_.begin());
+                return key;
+            }
+
+            using iterator = typename std::set<DataPair>::const_iterator;
+
+            iterator begin() const { return queue_.cbegin(); }
+
+            iterator end() const { return queue_.cend(); }
+
+        private:
+            std::set<DataPair> queue_;
+            std::unordered_map<std::string, uint64_t> times_;
+        };
+
+        /// CachedSessions are shared across requests
+        struct CachedSession
+        {
+            std::string session_id;
+            std::string requested_session_id; // session hasn't been created yet, but a key was requested
+
+            std::unordered_map<std::string, multi_value> entries;
+            std::unordered_set<std::string> dirty; // values that were changed after last load
+
+            void* store_data;
+            bool requested_refresh;
+
+            // number of references held - used for correctly destroying the cache.
+            // No need to be atomic, all SessionMiddleware accesses are synchronized
+            int referrers;
+            std::recursive_mutex mutex;
+        };
+    } // namespace session
+
+    // SessionMiddleware allows storing securely and easily small snippets of user information
+    template<typename Store>
+    struct SessionMiddleware
+    {
+#ifdef CROW_CAN_USE_CPP17
+        using lock = std::scoped_lock<std::mutex>;
+        using rc_lock = std::scoped_lock<std::recursive_mutex>;
+#else
+        using lock = std::lock_guard<std::mutex>;
+        using rc_lock = std::lock_guard<std::recursive_mutex>;
+#endif
+
+        struct context
+        {
+            // Get a mutex for locking this session
+            std::recursive_mutex& mutex()
+            {
+                check_node();
+                return node->mutex;
+            }
+
+            // Check whether this session is already present
+            bool exists() { return bool(node); }
+
+            // Get a value by key or fallback if it doesn't exist or is of another type
+            template<typename F>
+            auto get(const std::string& key, const F& fallback = F())
+              // This trick lets the multi_value deduce the return type from the fallback
+              // which allows both:
+              //   context.get<std::string>("key")
+              //   context.get("key", "") -> char[] is transformed into string by multivalue
+              // to return a string
+              -> decltype(std::declval<session::multi_value>().get<F>(std::declval<F>()))
+            {
+                if (!node) return fallback;
+                rc_lock l(node->mutex);
+
+                auto it = node->entries.find(key);
+                if (it != node->entries.end()) return it->second.get<F>(fallback);
+                return fallback;
+            }
+
+            // Set a value by key
+            template<typename T>
+            void set(const std::string& key, T value)
+            {
+                check_node();
+                rc_lock l(node->mutex);
+
+                node->dirty.insert(key);
+                node->entries[key].set(std::move(value));
+            }
+
+            bool contains(const std::string& key)
+            {
+                if (!node) return false;
+                return node->entries.find(key) != node->entries.end();
+            }
+
+            // Atomically mutate a value with a function
+            template<typename Func>
+            void apply(const std::string& key, const Func& f)
+            {
+                using traits = utility::function_traits<Func>;
+                using arg = typename std::decay<typename traits::template arg<0>>::type;
+                using retv = typename std::decay<typename traits::result_type>::type;
+                check_node();
+                rc_lock l(node->mutex);
+                node->dirty.insert(key);
+                node->entries[key].set<retv>(f(node->entries[key].get(arg{})));
+            }
+
+            // Remove a value from the session
+            void remove(const std::string& key)
+            {
+                if (!node) return;
+                rc_lock l(node->mutex);
+                node->dirty.insert(key);
+                node->entries.erase(key);
+            }
+
+            // Format value by key as a string
+            std::string string(const std::string& key)
+            {
+                if (!node) return "";
+                rc_lock l(node->mutex);
+
+                auto it = node->entries.find(key);
+                if (it != node->entries.end()) return it->second.string();
+                return "";
+            }
+
+            // Get a list of keys present in session
+            std::vector<std::string> keys()
+            {
+                if (!node) return {};
+                rc_lock l(node->mutex);
+
+                std::vector<std::string> out;
+                for (const auto& p : node->entries)
+                    out.push_back(p.first);
+                return out;
+            }
+
+            // Delay expiration by issuing another cookie with an updated expiration time
+            // and notifying the store
+            void refresh_expiration()
+            {
+                if (!node) return;
+                node->requested_refresh = true;
+            }
+
+        private:
+            friend struct SessionMiddleware;
+
+            void check_node()
+            {
+                if (!node) node = std::make_shared<session::CachedSession>();
+            }
+
+            std::shared_ptr<session::CachedSession> node;
+        };
+
+        template<typename... Ts>
+        SessionMiddleware(
+          CookieParser::Cookie cookie,
+          int id_length,
+          Ts... ts):
+          id_length_(id_length),
+          cookie_(cookie),
+          store_(std::forward<Ts>(ts)...), mutex_(new std::mutex{})
+        {}
+
+        template<typename... Ts>
+        SessionMiddleware(Ts... ts):
+          SessionMiddleware(
+            CookieParser::Cookie("session").path("/").max_age(/*month*/ 30 * 24 * 60 * 60),
+            /*id_length */ 20, // around 10^34 possible combinations, but small enough to fit into SSO
+            std::forward<Ts>(ts)...)
+        {}
+
+        template<typename AllContext>
+        void before_handle(request& /*req*/, response& /*res*/, context& ctx, AllContext& all_ctx)
+        {
+            lock l(*mutex_);
+
+            auto& cookies = all_ctx.template get<CookieParser>();
+            auto session_id = load_id(cookies);
+            if (session_id == "") return;
+
+            // search entry in cache
+            auto it = cache_.find(session_id);
+            if (it != cache_.end())
+            {
+                it->second->referrers++;
+                ctx.node = it->second;
+                return;
+            }
+
+            // check this is a valid entry before loading
+            if (!store_.contains(session_id)) return;
+
+            auto node = std::make_shared<session::CachedSession>();
+            node->session_id = session_id;
+            node->referrers = 1;
+
+            try
+            {
+                store_.load(*node);
+            }
+            catch (...)
+            {
+                CROW_LOG_ERROR << "Exception occurred during session load";
+                return;
+            }
+
+            ctx.node = node;
+            cache_[session_id] = node;
+        }
+
+        template<typename AllContext>
+        void after_handle(request& /*req*/, response& /*res*/, context& ctx, AllContext& all_ctx)
+        {
+            lock l(*mutex_);
+            if (!ctx.node || --ctx.node->referrers > 0) return;
+            ctx.node->requested_refresh |= ctx.node->session_id == "";
+
+            // generate new id
+            if (ctx.node->session_id == "")
+            {
+                // check for requested id
+                ctx.node->session_id = std::move(ctx.node->requested_session_id);
+                if (ctx.node->session_id == "")
+                {
+                    ctx.node->session_id = utility::random_alphanum(id_length_);
+                }
+            }
+            else
+            {
+                cache_.erase(ctx.node->session_id);
+            }
+
+            if (ctx.node->requested_refresh)
+            {
+                auto& cookies = all_ctx.template get<CookieParser>();
+                store_id(cookies, ctx.node->session_id);
+            }
+
+            try
+            {
+                store_.save(*ctx.node);
+            }
+            catch (...)
+            {
+                CROW_LOG_ERROR << "Exception occurred during session save";
+                return;
+            }
+        }
+
+    private:
+        std::string next_id()
+        {
+            std::string id;
+            do
+            {
+                id = utility::random_alphanum(id_length_);
+            } while (store_.contains(id));
+            return id;
+        }
+
+        std::string load_id(const CookieParser::context& cookies)
+        {
+            return cookies.get_cookie(cookie_.name());
+        }
+
+        void store_id(CookieParser::context& cookies, const std::string& session_id)
+        {
+            cookie_.value(session_id);
+            cookies.set_cookie(cookie_);
+        }
+
+    private:
+        int id_length_;
+
+        // prototype for cookie
+        CookieParser::Cookie cookie_;
+
+        Store store_;
+
+        // mutexes are immovable
+        std::unique_ptr<std::mutex> mutex_;
+        std::unordered_map<std::string, std::shared_ptr<session::CachedSession>> cache_;
+    };
+
+    /// InMemoryStore stores all entries in memory
+    struct InMemoryStore
+    {
+        // Load a value into the session cache.
+        // A load is always followed by a save, no loads happen consecutively
+        void load(session::CachedSession& cn)
+        {
+            // load & stores happen sequentially, so moving is safe
+            cn.entries = std::move(entries[cn.session_id]);
+        }
+
+        // Persist session data
+        void save(session::CachedSession& cn)
+        {
+            entries[cn.session_id] = std::move(cn.entries);
+            // cn.dirty is a list of changed keys since the last load
+        }
+
+        bool contains(const std::string& key)
+        {
+            return entries.count(key) > 0;
+        }
+
+        std::unordered_map<std::string, std::unordered_map<std::string, session::multi_value>> entries;
+    };
+
+    // FileStore stores all data as json files in a folder.
+    // Files are deleted after expiration. Expiration refreshes are automatically picked up.
+    struct FileStore
+    {
+        FileStore(const std::string& folder, uint64_t expiration_seconds = /*month*/ 30 * 24 * 60 * 60):
+          path_(folder), expiration_seconds_(expiration_seconds)
+        {
+            std::ifstream ifs(get_filename(".expirations", false));
+
+            auto current_ts = chrono_time();
+            std::string key;
+            uint64_t time;
+            while (ifs >> key >> time)
+            {
+                if (current_ts > time)
+                {
+                    evict(key);
+                }
+                else if (contains(key))
+                {
+                    expirations_.add(key, time);
+                }
+            }
+        }
+
+        ~FileStore()
+        {
+            std::ofstream ofs(get_filename(".expirations", false), std::ios::trunc);
+            for (const auto& p : expirations_)
+                ofs << p.second << " " << p.first << "\n";
+        }
+
+        // Delete expired entries
+        // At most 3 to prevent freezes
+        void handle_expired()
+        {
+            int deleted = 0;
+            auto current_ts = chrono_time();
+            while (current_ts > expirations_.peek_first() && deleted < 3)
+            {
+                evict(expirations_.pop_first());
+                deleted++;
+            }
+        }
+
+        void load(session::CachedSession& cn)
+        {
+            handle_expired();
+
+            std::ifstream file(get_filename(cn.session_id));
+
+            std::stringstream buffer;
+            buffer << file.rdbuf() << std::endl;
+
+            for (const auto& p : json::load(buffer.str()))
+                cn.entries[p.key()] = session::multi_value::from_json(p);
+        }
+
+        void save(session::CachedSession& cn)
+        {
+            if (cn.requested_refresh)
+                expirations_.add(cn.session_id, chrono_time() + expiration_seconds_);
+            if (cn.dirty.empty()) return;
+
+            std::ofstream file(get_filename(cn.session_id));
+            json::wvalue jw;
+            for (const auto& p : cn.entries)
+                jw[p.first] = p.second.json();
+            file << jw.dump() << std::flush;
+        }
+
+        std::string get_filename(const std::string& key, bool suffix = true)
+        {
+            return utility::join_path(path_, key + (suffix ? ".json" : ""));
+        }
+
+        bool contains(const std::string& key)
+        {
+            std::ifstream file(get_filename(key));
+            return file.good();
+        }
+
+        void evict(const std::string& key)
+        {
+            std::remove(get_filename(key).c_str());
+        }
+
+        uint64_t chrono_time() const
+        {
+            return std::chrono::duration_cast<std::chrono::seconds>(
+                     std::chrono::system_clock::now().time_since_epoch())
+              .count();
+        }
+
+        std::string path_;
+        uint64_t expiration_seconds_;
+        session::ExpirationTracker expirations_;
+    };
+
+} // namespace crow
+
+
+
+#include <tuple>
+#include <type_traits>
+#include <iostream>
+#include <utility>
+
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+
+    /// Local middleware should extend ILocalMiddleware
+    struct ILocalMiddleware
+    {
+        using call_global = std::false_type;
+    };
+
+    namespace detail
+    {
+        template<typename MW>
+        struct check_before_handle_arity_3_const
+        {
+            template<typename T, void (T::*)(request&, response&, typename MW::context&) const = &T::before_handle>
+            struct get
+            {};
+        };
+
+        template<typename MW>
+        struct check_before_handle_arity_3
+        {
+            template<typename T, void (T::*)(request&, response&, typename MW::context&) = &T::before_handle>
+            struct get
+            {};
+        };
+
+        template<typename MW>
+        struct check_after_handle_arity_3_const
+        {
+            template<typename T, void (T::*)(request&, response&, typename MW::context&) const = &T::after_handle>
+            struct get
+            {};
+        };
+
+        template<typename MW>
+        struct check_after_handle_arity_3
+        {
+            template<typename T, void (T::*)(request&, response&, typename MW::context&) = &T::after_handle>
+            struct get
+            {};
+        };
+
+        template<typename MW>
+        struct check_global_call_false
+        {
+            template<typename T, typename std::enable_if<T::call_global::value == false, bool>::type = true>
+            struct get
+            {};
+        };
+
+        template<typename T>
+        struct is_before_handle_arity_3_impl
+        {
+            template<typename C>
+            static std::true_type f(typename check_before_handle_arity_3_const<T>::template get<C>*);
+
+            template<typename C>
+            static std::true_type f(typename check_before_handle_arity_3<T>::template get<C>*);
+
+            template<typename C>
+            static std::false_type f(...);
+
+        public:
+            static const bool value = decltype(f<T>(nullptr))::value;
+        };
+
+        template<typename T>
+        struct is_after_handle_arity_3_impl
+        {
+            template<typename C>
+            static std::true_type f(typename check_after_handle_arity_3_const<T>::template get<C>*);
+
+            template<typename C>
+            static std::true_type f(typename check_after_handle_arity_3<T>::template get<C>*);
+
+            template<typename C>
+            static std::false_type f(...);
+
+        public:
+            static constexpr bool value = decltype(f<T>(nullptr))::value;
+        };
+
+        template<typename MW>
+        struct is_middleware_global
+        {
+            template<typename C>
+            static std::false_type f(typename check_global_call_false<MW>::template get<C>*);
+
+            template<typename C>
+            static std::true_type f(...);
+
+            static const bool value = decltype(f<MW>(nullptr))::value;
+        };
+
+        template<typename MW, typename Context, typename ParentContext>
+        typename std::enable_if<!is_before_handle_arity_3_impl<MW>::value>::type
+          before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
+        {
+            mw.before_handle(req, res, ctx.template get<MW>(), ctx);
+        }
+
+        template<typename MW, typename Context, typename ParentContext>
+        typename std::enable_if<is_before_handle_arity_3_impl<MW>::value>::type
+          before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
+        {
+            mw.before_handle(req, res, ctx.template get<MW>());
+        }
+
+        template<typename MW, typename Context, typename ParentContext>
+        typename std::enable_if<!is_after_handle_arity_3_impl<MW>::value>::type
+          after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
+        {
+            mw.after_handle(req, res, ctx.template get<MW>(), ctx);
+        }
+
+        template<typename MW, typename Context, typename ParentContext>
+        typename std::enable_if<is_after_handle_arity_3_impl<MW>::value>::type
+          after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
+        {
+            mw.after_handle(req, res, ctx.template get<MW>());
+        }
+
+
+        template<typename CallCriteria,
+                 int N, typename Context, typename Container>
+        typename std::enable_if<(N < std::tuple_size<typename std::remove_reference<Container>::type>::value), bool>::type
+          middleware_call_helper(const CallCriteria& cc, Container& middlewares, request& req, response& res, Context& ctx)
+        {
+
+            using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type;
+
+            if (!cc.template enabled<CurrentMW>(N))
+            {
+                return middleware_call_helper<CallCriteria, N + 1, Context, Container>(cc, middlewares, req, res, ctx);
+            }
+
+            using parent_context_t = typename Context::template partial<N - 1>;
+            before_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
+            if (res.is_completed())
+            {
+                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
+                return true;
+            }
+
+            if (middleware_call_helper<CallCriteria, N + 1, Context, Container>(cc, middlewares, req, res, ctx))
+            {
+                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
+                return true;
+            }
+
+            return false;
+        }
+
+        template<typename CallCriteria, int N, typename Context, typename Container>
+        typename std::enable_if<(N >= std::tuple_size<typename std::remove_reference<Container>::type>::value), bool>::type
+          middleware_call_helper(const CallCriteria& /*cc*/, Container& /*middlewares*/, request& /*req*/, response& /*res*/, Context& /*ctx*/)
+        {
+            return false;
+        }
+
+        template<typename CallCriteria, int N, typename Context, typename Container>
+        typename std::enable_if<(N < 0)>::type
+          after_handlers_call_helper(const CallCriteria& /*cc*/, Container& /*middlewares*/, Context& /*context*/, request& /*req*/, response& /*res*/)
+        {
+        }
+
+        template<typename CallCriteria, int N, typename Context, typename Container>
+        typename std::enable_if<(N == 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res)
+        {
+            using parent_context_t = typename Context::template partial<N - 1>;
+            using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type;
+            if (cc.template enabled<CurrentMW>(N))
+            {
+                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
+            }
+        }
+
+        template<typename CallCriteria, int N, typename Context, typename Container>
+        typename std::enable_if<(N > 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res)
+        {
+            using parent_context_t = typename Context::template partial<N - 1>;
+            using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type;
+            if (cc.template enabled<CurrentMW>(N))
+            {
+                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
+            }
+            after_handlers_call_helper<CallCriteria, N - 1, Context, Container>(cc, middlewares, ctx, req, res);
+        }
+
+        // A CallCriteria that accepts only global middleware
+        struct middleware_call_criteria_only_global
+        {
+            template<typename MW>
+            constexpr bool enabled(int) const
+            {
+                return is_middleware_global<MW>::value;
+            }
+        };
+
+        template<typename F, typename... Args>
+        typename std::enable_if<black_magic::CallHelper<F, black_magic::S<Args...>>::value, void>::type
+          wrapped_handler_call(crow::request& /*req*/, crow::response& res, const F& f, Args&&... args)
+        {
+            static_assert(!std::is_same<void, decltype(f(std::declval<Args>()...))>::value,
+                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
+
+            res = crow::response(f(std::forward<Args>(args)...));
+            res.end();
+        }
+
+        template<typename F, typename... Args>
+        typename std::enable_if<
+          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
+            black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value,
+          void>::type
+          wrapped_handler_call(crow::request& req, crow::response& res, const F& f, Args&&... args)
+        {
+            static_assert(!std::is_same<void, decltype(f(std::declval<crow::request>(), std::declval<Args>()...))>::value,
+                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
+
+            res = crow::response(f(req, std::forward<Args>(args)...));
+            res.end();
+        }
+
+        template<typename F, typename... Args>
+        typename std::enable_if<
+          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
+            !black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value &&
+            black_magic::CallHelper<F, black_magic::S<crow::response&, Args...>>::value,
+          void>::type
+          wrapped_handler_call(crow::request& /*req*/, crow::response& res, const F& f, Args&&... args)
+        {
+            static_assert(std::is_same<void, decltype(f(std::declval<crow::response&>(), std::declval<Args>()...))>::value,
+                          "Handler function with response argument should have void return type");
+
+            f(res, std::forward<Args>(args)...);
+        }
+
+        template<typename F, typename... Args>
+        typename std::enable_if<
+          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
+            !black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value &&
+            !black_magic::CallHelper<F, black_magic::S<crow::response&, Args...>>::value &&
+            black_magic::CallHelper<F, black_magic::S<const crow::request&, crow::response&, Args...>>::value,
+          void>::type
+          wrapped_handler_call(crow::request& req, crow::response& res, const F& f, Args&&... args)
+        {
+            static_assert(std::is_same<void, decltype(f(std::declval<crow::request&>(), std::declval<crow::response&>(), std::declval<Args>()...))>::value,
+                          "Handler function with response argument should have void return type");
+
+            f(req, res, std::forward<Args>(args)...);
+        }
+
+        // wrapped_handler_call transparently wraps a handler call behind (req, res, args...)
+        template<typename F, typename... Args>
+        typename std::enable_if<
+          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
+            !black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value &&
+            !black_magic::CallHelper<F, black_magic::S<crow::response&, Args...>>::value &&
+            !black_magic::CallHelper<F, black_magic::S<const crow::request&, crow::response&, Args...>>::value,
+          void>::type
+          wrapped_handler_call(crow::request& req, crow::response& res, const F& f, Args&&... args)
+        {
+            static_assert(std::is_same<void, decltype(f(std::declval<crow::request&>(), std::declval<crow::response&>(), std::declval<Args>()...))>::value,
+                          "Handler function with response argument should have void return type");
+
+            f(req, res, std::forward<Args>(args)...);
+        }
+
+        template<bool Reversed>
+        struct middleware_call_criteria_dynamic
+        {};
+
+        template<>
+        struct middleware_call_criteria_dynamic<false>
+        {
+            middleware_call_criteria_dynamic(const std::vector<int>& indices):
+              indices(indices), slider(0) {}
+
+            template<typename>
+            bool enabled(int mw_index) const
+            {
+                if (slider < int(indices.size()) && indices[slider] == mw_index)
+                {
+                    slider++;
+                    return true;
+                }
+                return false;
+            }
+
+        private:
+            const std::vector<int>& indices;
+            mutable int slider;
+        };
+
+        template<>
+        struct middleware_call_criteria_dynamic<true>
+        {
+            middleware_call_criteria_dynamic(const std::vector<int>& indices):
+              indices(indices), slider(int(indices.size()) - 1) {}
+
+            template<typename>
+            bool enabled(int mw_index) const
+            {
+                if (slider >= 0 && indices[slider] == mw_index)
+                {
+                    slider--;
+                    return true;
+                }
+                return false;
+            }
+
+        private:
+            const std::vector<int>& indices;
+            mutable int slider;
+        };
+
+    } // namespace detail
+} // namespace crow
+
+
+
+namespace crow
+{
+    namespace detail
+    {
+
+
+        template<typename... Middlewares>
+        struct partial_context : public black_magic::pop_back<Middlewares...>::template rebind<partial_context>, public black_magic::last_element_type<Middlewares...>::type::context
+        {
+            using parent_context = typename black_magic::pop_back<Middlewares...>::template rebind<::crow::detail::partial_context>;
+            template<int N>
+            using partial = typename std::conditional<N == sizeof...(Middlewares) - 1, partial_context, typename parent_context::template partial<N>>::type;
+
+            template<typename T>
+            typename T::context& get()
+            {
+                return static_cast<typename T::context&>(*this);
+            }
+        };
+
+
+
+        template<>
+        struct partial_context<>
+        {
+            template<int>
+            using partial = partial_context;
+        };
+
+
+        template<typename... Middlewares>
+        struct context : private partial_context<Middlewares...>
+        //struct context : private Middlewares::context... // simple but less type-safe
+        {
+            template<typename CallCriteria, int N, typename Context, typename Container>
+            friend typename std::enable_if<(N == 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res);
+            template<typename CallCriteria, int N, typename Context, typename Container>
+            friend typename std::enable_if<(N > 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res);
+
+            template<typename CallCriteria, int N, typename Context, typename Container>
+            friend typename std::enable_if<(N < std::tuple_size<typename std::remove_reference<Container>::type>::value), bool>::type
+              middleware_call_helper(const CallCriteria& cc, Container& middlewares, request& req, response& res, Context& ctx);
+
+            template<typename T>
+            typename T::context& get()
+            {
+                return static_cast<typename T::context&>(*this);
+            }
+
+            template<int N>
+            using partial = typename partial_context<Middlewares...>::template partial<N>;
+        };
+    } // namespace detail
+} // namespace crow
+
+
+#ifdef CROW_USE_BOOST
+#include <boost/asio.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#else
+#ifndef ASIO_STANDALONE
+#define ASIO_STANDALONE
+#endif
+#include <asio.hpp>
+#include <asio/basic_waitable_timer.hpp>
+#endif
+
+#include <chrono>
+#include <functional>
+#include <map>
+#include <vector>
+
+
+namespace crow
+{
+#ifdef CROW_USE_BOOST
+    namespace asio = boost::asio;
+    using error_code = boost::system::error_code;
+#else
+    using error_code = asio::error_code;
+#endif
+    namespace detail
+    {
+
+        /// A class for scheduling functions to be called after a specific amount of ticks. A tick is equal to 1 second.
+        class task_timer
+        {
+        public:
+            using task_type = std::function<void()>;
+            using identifier_type = size_t;
+
+        private:
+            using clock_type = std::chrono::steady_clock;
+            using time_type = clock_type::time_point;
+
+        public:
+            task_timer(asio::io_service& io_service):
+              io_service_(io_service), timer_(io_service_)
+            {
+                timer_.expires_after(std::chrono::seconds(1));
+                timer_.async_wait(
+                  std::bind(&task_timer::tick_handler, this, std::placeholders::_1));
+            }
+
+            ~task_timer() { timer_.cancel(); }
+
+            void cancel(identifier_type id)
+            {
+                tasks_.erase(id);
+                CROW_LOG_DEBUG << "task_timer cancelled: " << this << ' ' << id;
+            }
+
+            /// Schedule the given task to be executed after the default amount of ticks.
+
+            ///
+            /// \return identifier_type Used to cancel the thread.
+            /// It is not bound to this task_timer instance and in some cases could lead to
+            /// undefined behavior if used with other task_timer objects or after the task
+            /// has been successfully executed.
+            identifier_type schedule(const task_type& task)
+            {
+                tasks_.insert(
+                  {++highest_id_,
+                   {clock_type::now() + std::chrono::seconds(get_default_timeout()),
+                    task}});
+                CROW_LOG_DEBUG << "task_timer scheduled: " << this << ' ' << highest_id_;
+                return highest_id_;
+            }
+
+            /// Schedule the given task to be executed after the given time.
+
+            ///
+            /// \param timeout The amount of ticks (seconds) to wait before execution.
+            ///
+            /// \return identifier_type Used to cancel the thread.
+            /// It is not bound to this task_timer instance and in some cases could lead to
+            /// undefined behavior if used with other task_timer objects or after the task
+            /// has been successfully executed.
+            identifier_type schedule(const task_type& task, std::uint8_t timeout)
+            {
+                tasks_.insert({++highest_id_,
+                               {clock_type::now() + std::chrono::seconds(timeout), task}});
+                CROW_LOG_DEBUG << "task_timer scheduled: " << this << ' ' << highest_id_;
+                return highest_id_;
+            }
+
+            /// Set the default timeout for this task_timer instance. (Default: 5)
+
+            ///
+            /// \param timeout The amount of ticks (seconds) to wait before execution.
+            void set_default_timeout(std::uint8_t timeout) { default_timeout_ = timeout; }
+
+            /// Get the default timeout. (Default: 5)
+            std::uint8_t get_default_timeout() const { return default_timeout_; }
+
+        private:
+            void process_tasks()
+            {
+                time_type current_time = clock_type::now();
+                std::vector<identifier_type> finished_tasks;
+
+                for (const auto& task : tasks_)
+                {
+                    if (task.second.first < current_time)
+                    {
+                        (task.second.second)();
+                        finished_tasks.push_back(task.first);
+                        CROW_LOG_DEBUG << "task_timer called: " << this << ' ' << task.first;
+                    }
+                }
+
+                for (const auto& task : finished_tasks)
+                    tasks_.erase(task);
+
+                // If no task is currently scheduled, reset the issued ids back to 0.
+                if (tasks_.empty()) highest_id_ = 0;
+            }
+
+            void tick_handler(const error_code& ec)
+            {
+                if (ec) return;
+
+                process_tasks();
+
+                timer_.expires_after(std::chrono::seconds(1));
+                timer_.async_wait(
+                  std::bind(&task_timer::tick_handler, this, std::placeholders::_1));
+            }
+
+        private:
+            std::uint8_t default_timeout_{5};
+            asio::io_service& io_service_;
+            asio::basic_waitable_timer<clock_type> timer_;
+            std::map<identifier_type, std::pair<time_type, task_type>> tasks_;
+
+            // A continuosly increasing number to be issued to threads to identify them.
+            // If no tasks are scheduled, it will be reset to 0.
+            identifier_type highest_id_{0};
+        };
+    } // namespace detail
+} // namespace crow
+
+
+#ifdef CROW_USE_BOOST
+#include <boost/asio.hpp>
+#else
+#ifndef ASIO_STANDALONE
+#define ASIO_STANDALONE
+#endif
+#include <asio.hpp>
+#endif
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <memory>
+#include <vector>
+
+
+namespace crow
+{
+#ifdef CROW_USE_BOOST
+    namespace asio = boost::asio;
+    using error_code = boost::system::error_code;
+#else
+    using error_code = asio::error_code;
+#endif
+    using tcp = asio::ip::tcp;
+
+#ifdef CROW_ENABLE_DEBUG
+    static std::atomic<int> connectionCount;
+#endif
+
+    /// An HTTP connection.
+    template<typename Adaptor, typename Handler, typename... Middlewares>
+    class Connection: public std::enable_shared_from_this<Connection<Adaptor, Handler, Middlewares...>>
+    {
+        friend struct crow::response;
+
+    public:
+        Connection(
+          asio::io_service& io_service,
+          Handler* handler,
+          const std::string& server_name,
+          std::tuple<Middlewares...>* middlewares,
+          std::function<std::string()>& get_cached_date_str_f,
+          detail::task_timer& task_timer,
+          typename Adaptor::context* adaptor_ctx_,
+          std::atomic<unsigned int>& queue_length):
+          adaptor_(io_service, adaptor_ctx_),
+          handler_(handler),
+          parser_(this),
+          req_(parser_.req),
+          server_name_(server_name),
+          middlewares_(middlewares),
+          get_cached_date_str(get_cached_date_str_f),
+          task_timer_(task_timer),
+          res_stream_threshold_(handler->stream_threshold()),
+          queue_length_(queue_length)
+        {
+#ifdef CROW_ENABLE_DEBUG
+            connectionCount++;
+            CROW_LOG_DEBUG << "Connection (" << this << ") allocated, total: " << connectionCount;
+#endif
+        }
+
+        ~Connection()
+        {
+#ifdef CROW_ENABLE_DEBUG
+            connectionCount--;
+            CROW_LOG_DEBUG << "Connection (" << this << ") freed, total: " << connectionCount;
+#endif
+        }
+
+        /// The TCP socket on top of which the connection is established.
+        decltype(std::declval<Adaptor>().raw_socket())& socket()
+        {
+            return adaptor_.raw_socket();
+        }
+
+        void start()
+        {
+            auto self = this->shared_from_this();
+            adaptor_.start([self](const error_code& ec) {
+                if (!ec)
+                {
+                    self->start_deadline();
+                    self->parser_.clear();
+
+                    self->do_read();
+                }
+                else
+                {
+                    CROW_LOG_ERROR << "Could not start adaptor: " << ec.message();
+                }
+            });
+        }
+
+        void handle_url()
+        {
+            routing_handle_result_ = handler_->handle_initial(req_, res);
+            // if no route is found for the request method, return the response without parsing or processing anything further.
+            if (!routing_handle_result_->rule_index)
+            {
+                parser_.done();
+                need_to_call_after_handlers_ = true;
+                complete_request();
+            }
+        }
+
+        void handle_header()
+        {
+            // HTTP 1.1 Expect: 100-continue
+            if (req_.http_ver_major == 1 && req_.http_ver_minor == 1 && get_header_value(req_.headers, "expect") == "100-continue")
+            {
+                continue_requested = true;
+                buffers_.clear();
+                static std::string expect_100_continue = "HTTP/1.1 100 Continue\r\n\r\n";
+                buffers_.emplace_back(expect_100_continue.data(), expect_100_continue.size());
+                do_write();
+            }
+        }
+
+        void handle()
+        {
+            // TODO(EDev): cancel_deadline_timer should be looked into, it might be a good idea to add it to handle_url() and then restart the timer once everything passes
+            cancel_deadline_timer();
+            bool is_invalid_request = false;
+            add_keep_alive_ = false;
+
+            // Create context
+            ctx_ = detail::context<Middlewares...>();
+            req_.middleware_context = static_cast<void*>(&ctx_);
+            req_.middleware_container = static_cast<void*>(middlewares_);
+            req_.io_service = &adaptor_.get_io_service();
+            
+            req_.remote_ip_address = adaptor_.remote_endpoint().address().to_string();
+
+            add_keep_alive_ = req_.keep_alive;
+            close_connection_ = req_.close_connection;
+
+            if (req_.check_version(1, 1)) // HTTP/1.1
+            {
+                if (!req_.headers.count("host"))
+                {
+                    is_invalid_request = true;
+                    res = response(400);
+                }
+                else if (req_.upgrade)
+                {
+                    // h2 or h2c headers
+                    if (req_.get_header_value("upgrade").substr(0, 2) == "h2")
+                    {
+                        // TODO(ipkn): HTTP/2
+                        // currently, ignore upgrade header
+                    }
+                    else
+                    {
+                
+                        detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
+                                                       0, decltype(ctx_), decltype(*middlewares_)>({}, *middlewares_, req_, res, ctx_);
+                        close_connection_ = true;
+                        handler_->handle_upgrade(req_, res, std::move(adaptor_));
+                        return;
+                    }
+                }
+            }
+
+            CROW_LOG_INFO << "Request: " << utility::lexical_cast<std::string>(adaptor_.remote_endpoint()) << " " << this << " HTTP/" << (char)(req_.http_ver_major + '0') << "." << (char)(req_.http_ver_minor + '0') << ' ' << method_name(req_.method) << " " << req_.url;
+
+
+            need_to_call_after_handlers_ = false;
+            if (!is_invalid_request)
+            {
+                res.complete_request_handler_ = nullptr;
+                auto self = this->shared_from_this();
+                res.is_alive_helper_ = [self]() -> bool {
+                    return self->adaptor_.is_open();
+                };
+                
+                detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
+                                               0, decltype(ctx_), decltype(*middlewares_)>({}, *middlewares_, req_, res, ctx_);
+
+                if (!res.completed_)
+                {
+                    auto self = this->shared_from_this();
+                    res.complete_request_handler_ = [self] {
+                        self->complete_request();
+                    };
+                    need_to_call_after_handlers_ = true;
+                    handler_->handle(req_, res, routing_handle_result_);
+                    if (add_keep_alive_)
+                        res.set_header("connection", "Keep-Alive");
+                }
+                else
+                {
+                    complete_request();
+                }
+            }
+            else
+            {
+                complete_request();
+            }
+        }
+
+        /// Call the after handle middleware and send the write the response to the connection.
+        void complete_request()
+        {
+            CROW_LOG_INFO << "Response: " << this << ' ' << req_.raw_url << ' ' << res.code << ' ' << close_connection_;
+            res.is_alive_helper_ = nullptr;
+
+            if (need_to_call_after_handlers_)
+            {
+                need_to_call_after_handlers_ = false;
+
+                // call all after_handler of middlewares
+                detail::after_handlers_call_helper<
+                  detail::middleware_call_criteria_only_global,
+                  (static_cast<int>(sizeof...(Middlewares)) - 1),
+                  decltype(ctx_),
+                  decltype(*middlewares_)>({}, *middlewares_, ctx_, req_, res);
+            }
+#ifdef CROW_ENABLE_COMPRESSION
+            if (handler_->compression_used())
+            {
+                std::string accept_encoding = req_.get_header_value("Accept-Encoding");
+                if (!accept_encoding.empty() && res.compressed)
+                {
+                    switch (handler_->compression_algorithm())
+                    {
+                        case compression::DEFLATE:
+                            if (accept_encoding.find("deflate") != std::string::npos)
+                            {
+                                res.body = compression::compress_string(res.body, compression::algorithm::DEFLATE);
+                                res.set_header("Content-Encoding", "deflate");
+                            }
+                            break;
+                        case compression::GZIP:
+                            if (accept_encoding.find("gzip") != std::string::npos)
+                            {
+                                res.body = compression::compress_string(res.body, compression::algorithm::GZIP);
+                                res.set_header("Content-Encoding", "gzip");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+#endif
+            //if there is a redirection with a partial URL, treat the URL as a route.
+            std::string location = res.get_header_value("Location");
+            if (!location.empty() && location.find("://", 0) == std::string::npos)
+            {
+#ifdef CROW_ENABLE_SSL
+                if (handler_->ssl_used())
+                    location.insert(0, "https://" + req_.get_header_value("Host"));
+                else
+#endif
+                    location.insert(0, "http://" + req_.get_header_value("Host"));
+                res.set_header("location", location);
+            }
+
+            prepare_buffers();
+
+            if (res.is_static_type())
+            {
+                do_write_static();
+            }
+            else
+            {
+                do_write_general();
+            }
+        }
+
+    private:
+        void prepare_buffers()
+        {
+            res.complete_request_handler_ = nullptr;
+            res.is_alive_helper_ = nullptr;
+
+            if (!adaptor_.is_open())
+            {
+                //CROW_LOG_DEBUG << this << " delete (socket is closed) " << is_reading << ' ' << is_writing;
+                //delete this;
+                return;
+            }
+            // TODO(EDev): HTTP version in status codes should be dynamic
+            // Keep in sync with common.h/status
+            static std::unordered_map<int, std::string> statusCodes = {
+              {status::CONTINUE, "HTTP/1.1 100 Continue\r\n"},
+              {status::SWITCHING_PROTOCOLS, "HTTP/1.1 101 Switching Protocols\r\n"},
+
+              {status::OK, "HTTP/1.1 200 OK\r\n"},
+              {status::CREATED, "HTTP/1.1 201 Created\r\n"},
+              {status::ACCEPTED, "HTTP/1.1 202 Accepted\r\n"},
+              {status::NON_AUTHORITATIVE_INFORMATION, "HTTP/1.1 203 Non-Authoritative Information\r\n"},
+              {status::NO_CONTENT, "HTTP/1.1 204 No Content\r\n"},
+              {status::RESET_CONTENT, "HTTP/1.1 205 Reset Content\r\n"},
+              {status::PARTIAL_CONTENT, "HTTP/1.1 206 Partial Content\r\n"},
+
+              {status::MULTIPLE_CHOICES, "HTTP/1.1 300 Multiple Choices\r\n"},
+              {status::MOVED_PERMANENTLY, "HTTP/1.1 301 Moved Permanently\r\n"},
+              {status::FOUND, "HTTP/1.1 302 Found\r\n"},
+              {status::SEE_OTHER, "HTTP/1.1 303 See Other\r\n"},
+              {status::NOT_MODIFIED, "HTTP/1.1 304 Not Modified\r\n"},
+              {status::TEMPORARY_REDIRECT, "HTTP/1.1 307 Temporary Redirect\r\n"},
+              {status::PERMANENT_REDIRECT, "HTTP/1.1 308 Permanent Redirect\r\n"},
+
+              {status::BAD_REQUEST, "HTTP/1.1 400 Bad Request\r\n"},
+              {status::UNAUTHORIZED, "HTTP/1.1 401 Unauthorized\r\n"},
+              {status::FORBIDDEN, "HTTP/1.1 403 Forbidden\r\n"},
+              {status::NOT_FOUND, "HTTP/1.1 404 Not Found\r\n"},
+              {status::METHOD_NOT_ALLOWED, "HTTP/1.1 405 Method Not Allowed\r\n"},
+              {status::NOT_ACCEPTABLE, "HTTP/1.1 406 Not Acceptable\r\n"},
+              {status::PROXY_AUTHENTICATION_REQUIRED, "HTTP/1.1 407 Proxy Authentication Required\r\n"},
+              {status::CONFLICT, "HTTP/1.1 409 Conflict\r\n"},
+              {status::GONE, "HTTP/1.1 410 Gone\r\n"},
+              {status::PAYLOAD_TOO_LARGE, "HTTP/1.1 413 Payload Too Large\r\n"},
+              {status::UNSUPPORTED_MEDIA_TYPE, "HTTP/1.1 415 Unsupported Media Type\r\n"},
+              {status::RANGE_NOT_SATISFIABLE, "HTTP/1.1 416 Range Not Satisfiable\r\n"},
+              {status::EXPECTATION_FAILED, "HTTP/1.1 417 Expectation Failed\r\n"},
+              {status::PRECONDITION_REQUIRED, "HTTP/1.1 428 Precondition Required\r\n"},
+              {status::TOO_MANY_REQUESTS, "HTTP/1.1 429 Too Many Requests\r\n"},
+              {status::UNAVAILABLE_FOR_LEGAL_REASONS, "HTTP/1.1 451 Unavailable For Legal Reasons\r\n"},
+
+              {status::INTERNAL_SERVER_ERROR, "HTTP/1.1 500 Internal Server Error\r\n"},
+              {status::NOT_IMPLEMENTED, "HTTP/1.1 501 Not Implemented\r\n"},
+              {status::BAD_GATEWAY, "HTTP/1.1 502 Bad Gateway\r\n"},
+              {status::SERVICE_UNAVAILABLE, "HTTP/1.1 503 Service Unavailable\r\n"},
+              {status::GATEWAY_TIMEOUT, "HTTP/1.1 504 Gateway Timeout\r\n"},
+              {status::VARIANT_ALSO_NEGOTIATES, "HTTP/1.1 506 Variant Also Negotiates\r\n"},
+            };
+
+            static const std::string seperator = ": ";
+
+            buffers_.clear();
+            buffers_.reserve(4 * (res.headers.size() + 5) + 3);
+
+            if (!statusCodes.count(res.code))
+            {
+                CROW_LOG_WARNING << this << " status code "
+                                 << "(" << res.code << ")"
+                                 << " not defined, returning 500 instead";
+                res.code = 500;
+            }
+
+            auto& status = statusCodes.find(res.code)->second;
+            buffers_.emplace_back(status.data(), status.size());
+
+            if (res.code >= 400 && res.body.empty())
+                res.body = statusCodes[res.code].substr(9);
+
+            for (auto& kv : res.headers)
+            {
+                buffers_.emplace_back(kv.first.data(), kv.first.size());
+                buffers_.emplace_back(seperator.data(), seperator.size());
+                buffers_.emplace_back(kv.second.data(), kv.second.size());
+                buffers_.emplace_back(crlf.data(), crlf.size());
+            }
+
+            if (!res.manual_length_header && !res.headers.count("content-length"))
+            {
+                content_length_ = std::to_string(res.body.size());
+                static std::string content_length_tag = "Content-Length: ";
+                buffers_.emplace_back(content_length_tag.data(), content_length_tag.size());
+                buffers_.emplace_back(content_length_.data(), content_length_.size());
+                buffers_.emplace_back(crlf.data(), crlf.size());
+            }
+            if (!res.headers.count("server"))
+            {
+                static std::string server_tag = "Server: ";
+                buffers_.emplace_back(server_tag.data(), server_tag.size());
+                buffers_.emplace_back(server_name_.data(), server_name_.size());
+                buffers_.emplace_back(crlf.data(), crlf.size());
+            }
+            if (!res.headers.count("date"))
+            {
+                static std::string date_tag = "Date: ";
+                date_str_ = get_cached_date_str();
+                buffers_.emplace_back(date_tag.data(), date_tag.size());
+                buffers_.emplace_back(date_str_.data(), date_str_.size());
+                buffers_.emplace_back(crlf.data(), crlf.size());
+            }
+            if (add_keep_alive_)
+            {
+                static std::string keep_alive_tag = "Connection: Keep-Alive";
+                buffers_.emplace_back(keep_alive_tag.data(), keep_alive_tag.size());
+                buffers_.emplace_back(crlf.data(), crlf.size());
+            }
+
+            buffers_.emplace_back(crlf.data(), crlf.size());
+        }
+
+        void do_write_static()
+        {
+            asio::write(adaptor_.socket(), buffers_);
+
+            if (res.file_info.statResult == 0)
+            {
+                std::ifstream is(res.file_info.path.c_str(), std::ios::in | std::ios::binary);
+                std::vector<asio::const_buffer> buffers{1};
+                char buf[16384];
+                is.read(buf, sizeof(buf));
+                while (is.gcount() > 0)
+                {
+                    buffers[0] = asio::buffer(buf, is.gcount());
+                    do_write_sync(buffers);
+                    is.read(buf, sizeof(buf));
+                }
+            }
+            if (close_connection_)
+            {
+                adaptor_.shutdown_readwrite();
+                adaptor_.close();
+                CROW_LOG_DEBUG << this << " from write (static)";
+            }
+
+            res.end();
+            res.clear();
+            buffers_.clear();
+            parser_.clear();
+        }
+
+        void do_write_general()
+        {
+            if (res.body.length() < res_stream_threshold_)
+            {
+                res_body_copy_.swap(res.body);
+                buffers_.emplace_back(res_body_copy_.data(), res_body_copy_.size());
+
+                do_write();
+
+                if (need_to_start_read_after_complete_)
+                {
+                    need_to_start_read_after_complete_ = false;
+                    start_deadline();
+                    do_read();
+                }
+            }
+            else
+            {
+                asio::write(adaptor_.socket(), buffers_); // Write the response start / headers
+                cancel_deadline_timer();
+                if (res.body.length() > 0)
+                {
+                    std::vector<asio::const_buffer> buffers{1};
+                    const uint8_t *data = reinterpret_cast<const uint8_t*>(res.body.data());
+                    size_t length = res.body.length();
+                    for(size_t transferred = 0; transferred < length;)
+                    {
+                        size_t to_transfer = CROW_MIN(16384UL, length-transferred);
+                        buffers[0] = asio::const_buffer(data+transferred, to_transfer);
+                        do_write_sync(buffers);
+                        transferred += to_transfer;
+                    }
+                }
+                if (close_connection_)
+                {
+                    adaptor_.shutdown_readwrite();
+                    adaptor_.close();
+                    CROW_LOG_DEBUG << this << " from write (res_stream)";
+                }
+
+                res.end();
+                res.clear();
+                buffers_.clear();
+                parser_.clear();
+            }
+        }
+
+        void do_read()
+        {
+            auto self = this->shared_from_this();
+            adaptor_.socket().async_read_some(
+              asio::buffer(buffer_),
+              [self](const error_code& ec, std::size_t bytes_transferred) {
+                  bool error_while_reading = true;
+                  if (!ec)
+                  {
+                      bool ret = self->parser_.feed(self->buffer_.data(), bytes_transferred);
+                      if (ret && self->adaptor_.is_open())
+                      {
+                          error_while_reading = false;
+                      }
+                  }
+
+                  if (error_while_reading)
+                  {
+                      self->cancel_deadline_timer();
+                      self->parser_.done();
+                      self->adaptor_.shutdown_read();
+                      self->adaptor_.close();
+                      CROW_LOG_DEBUG << self << " from read(1) with description: \"" << http_errno_description(static_cast<http_errno>(self->parser_.http_errno)) << '\"';
+                  }
+                  else if (self->close_connection_)
+                  {
+                      self->cancel_deadline_timer();
+                      self->parser_.done();
+                      // adaptor will close after write
+                  }
+                  else if (!self->need_to_call_after_handlers_)
+                  {
+                      self->start_deadline();
+                      self->do_read();
+                  }
+                  else
+                  {
+                      // res will be completed later by user
+                      self->need_to_start_read_after_complete_ = true;
+                  }
+              });
+        }
+
+        void do_write()
+        {
+            auto self = this->shared_from_this();
+            asio::async_write(
+              adaptor_.socket(), buffers_,
+              [self](const error_code& ec, std::size_t /*bytes_transferred*/) {
+                  self->res.clear();
+                  self->res_body_copy_.clear();                  
+                  if (!self->continue_requested)
+                  {
+                      self->parser_.clear();
+                  }
+                  else
+                  {
+                      self->continue_requested = false;
+                  }
+                  
+                  if (!ec)
+                  {
+                      if (self->close_connection_)
+                      {
+                          self->adaptor_.shutdown_write();
+                          self->adaptor_.close();
+                          CROW_LOG_DEBUG << self << " from write(1)";
+                      }
+                  }
+                  else
+                  {
+                      CROW_LOG_DEBUG << self << " from write(2)";
+                  }
+              });
+        }
+
+        inline void do_write_sync(std::vector<asio::const_buffer>& buffers)
+        {
+
+            asio::write(adaptor_.socket(), buffers, [&](error_code ec, std::size_t) {
+                if (!ec)
+                {
+                    return false;
+                }
+                else
+                {
+                    CROW_LOG_ERROR << ec << " - happened while sending buffers";
+                    CROW_LOG_DEBUG << this << " from write (sync)(2)";
+                    return true;
+                }
+            });
+        }
+
+        void cancel_deadline_timer()
+        {
+            CROW_LOG_DEBUG << this << " timer cancelled: " << &task_timer_ << ' ' << task_id_;
+            task_timer_.cancel(task_id_);
+        }
+
+        void start_deadline(/*int timeout = 5*/)
+        {
+            cancel_deadline_timer();
+
+            auto self = this->shared_from_this();
+            task_id_ = task_timer_.schedule([self] {
+                if (!self->adaptor_.is_open())
+                {
+                    return;
+                }
+                self->adaptor_.shutdown_readwrite();
+                self->adaptor_.close();
+            });
+            CROW_LOG_DEBUG << this << " timer added: " << &task_timer_ << ' ' << task_id_;
+        }
+
+    private:
+        Adaptor adaptor_;
+        Handler* handler_;
+
+        std::array<char, 4096> buffer_;
+
+        HTTPParser<Connection> parser_;
+        std::unique_ptr<routing_handle_result> routing_handle_result_;
+        request& req_;
+        response res;
+
+        bool close_connection_ = false;
+
+        const std::string& server_name_;
+        std::vector<asio::const_buffer> buffers_;
+
+        std::string content_length_;
+        std::string date_str_;
+        std::string res_body_copy_;
+
+        detail::task_timer::identifier_type task_id_{};
+
+        bool continue_requested{};
+        bool need_to_call_after_handlers_{};
+        bool need_to_start_read_after_complete_{};
+        bool add_keep_alive_{};
+
+        std::tuple<Middlewares...>* middlewares_;
+        detail::context<Middlewares...> ctx_;
+
+        std::function<std::string()>& get_cached_date_str;
+        detail::task_timer& task_timer_;
+
+        size_t res_stream_threshold_;
+
+        std::atomic<unsigned int>& queue_length_;
+    };
+
+} // namespace crow
+
+#include <array>
+
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+#ifdef CROW_USE_BOOST
+    namespace asio = boost::asio;
+    using error_code = boost::system::error_code;
+#else
+    using error_code = asio::error_code;
+#endif
+
+    /**
+     * \namespace crow::websocket
+     * \brief Namespace that includes the \ref Connection class
+     * and \ref connection struct. Useful for WebSockets connection.
+     *
+     * Used specially in crow/websocket.h, crow/app.h and crow/routing.h
+     */
+    namespace websocket
+    {
+        enum class WebSocketReadState
+        {
+            MiniHeader,
+            Len16,
+            Len64,
+            Mask,
+            Payload,
+        };
+
+        /// A base class for websocket connection.
+        struct connection
+        {
+            virtual void send_binary(std::string msg) = 0;
+            virtual void send_text(std::string msg) = 0;
+            virtual void send_ping(std::string msg) = 0;
+            virtual void send_pong(std::string msg) = 0;
+            virtual void close(std::string const& msg = "quit") = 0;
+            virtual std::string get_remote_ip() = 0;
+            virtual ~connection() = default;
+
+            void userdata(void* u) { userdata_ = u; }
+            void* userdata() { return userdata_; }
+
+        private:
+            void* userdata_;
+        };
+
+        // Modified version of the illustration in RFC6455 Section-5.2
+        //
+        //
+        //  0               1               2               3               -byte
+        //  0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 -bit
+        // +-+-+-+-+-------+-+-------------+-------------------------------+
+        // |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
+        // |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
+        // |N|V|V|V|       |S|             |   (if payload len==126/127)   |
+        // | |1|2|3|       |K|             |                               |
+        // +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
+        // |     Extended payload length continued, if payload len == 127  |
+        // + - - - - - - - - - - - - - - - +-------------------------------+
+        // |                               |Masking-key, if MASK set to 1  |
+        // +-------------------------------+-------------------------------+
+        // | Masking-key (continued)       |          Payload Data         |
+        // +-------------------------------- - - - - - - - - - - - - - - - +
+        // :                     Payload Data continued ...                :
+        // + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+        // |                     Payload Data continued ...                |
+        // +---------------------------------------------------------------+
+        //
+
+        /// A websocket connection.
+
+        template<typename Adaptor, typename Handler>
+        class Connection : public connection
+        {
+        public:
+            /// Constructor for a connection.
+
+            ///
+            /// Requires a request with an "Upgrade: websocket" header.<br>
+            /// Automatically handles the handshake.
+            Connection(const crow::request& req, Adaptor&& adaptor, Handler* handler, uint64_t max_payload,
+                       std::function<void(crow::websocket::connection&)> open_handler,
+                       std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler,
+                       std::function<void(crow::websocket::connection&, const std::string&)> close_handler,
+                       std::function<void(crow::websocket::connection&, const std::string&)> error_handler,
+                       std::function<bool(const crow::request&, void**)> accept_handler):
+              adaptor_(std::move(adaptor)),
+              handler_(handler),
+              max_payload_bytes_(max_payload),
+              open_handler_(std::move(open_handler)),
+              message_handler_(std::move(message_handler)),
+              close_handler_(std::move(close_handler)),
+              error_handler_(std::move(error_handler)),
+              accept_handler_(std::move(accept_handler))
+            {
+                if (!utility::string_equals(req.get_header_value("upgrade"), "websocket"))
+                {
+                    adaptor_.close();
+                    handler_->remove_websocket(this);
+                    delete this;
+                    return;
+                }
+
+                if (accept_handler_)
+                {
+                    void* ud = nullptr;
+                    if (!accept_handler_(req, &ud))
+                    {
+                        adaptor_.close();
+                        handler_->remove_websocket(this);
+                        delete this;
+                        return;
+                    }
+                    userdata(ud);
+                }
+
+                // Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
+                // Sec-WebSocket-Version: 13
+                std::string magic = req.get_header_value("Sec-WebSocket-Key") + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+                sha1::SHA1 s;
+                s.processBytes(magic.data(), magic.size());
+                uint8_t digest[20];
+                s.getDigestBytes(digest);
+
+                start(crow::utility::base64encode((unsigned char*)digest, 20));
+            }
+
+            ~Connection() noexcept override
+            {
+                // Do not modify anchor_ here since writing shared_ptr is not atomic.
+                auto watch = std::weak_ptr<void>{anchor_};
+
+                // Wait until all unhandled asynchronous operations to join.
+                // As the deletion occurs inside 'check_destroy()', which already locks
+                //  anchor, use count can be 1 on valid deletion context.
+                while (watch.use_count() > 2) // 1 for 'check_destroy() routine', 1 for 'this->anchor_'
+                {
+                    std::this_thread::yield();
+                }
+            }
+
+            template<typename Callable>
+            struct WeakWrappedMessage
+            {
+                Callable callable;
+                std::weak_ptr<void> watch;
+
+                void operator()()
+                {
+                    if (auto anchor = watch.lock())
+                    {
+                        std::move(callable)();
+                    }
+                }
+            };
+
+            /// Send data through the socket.
+            template<typename CompletionHandler>
+            void dispatch(CompletionHandler&& handler)
+            {
+                asio::dispatch(adaptor_.get_io_service(),
+                               WeakWrappedMessage<typename std::decay<CompletionHandler>::type>{
+                                 std::forward<CompletionHandler>(handler), anchor_});
+            }
+
+            /// Send data through the socket and return immediately.
+            template<typename CompletionHandler>
+            void post(CompletionHandler&& handler)
+            {
+                asio::post(adaptor_.get_io_service(),
+                           WeakWrappedMessage<typename std::decay<CompletionHandler>::type>{
+                             std::forward<CompletionHandler>(handler), anchor_});
+            }
+
+            /// Send a "Ping" message.
+
+            ///
+            /// Usually invoked to check if the other point is still online.
+            void send_ping(std::string msg) override
+            {
+                send_data(0x9, std::move(msg));
+            }
+
+            /// Send a "Pong" message.
+
+            ///
+            /// Usually automatically invoked as a response to a "Ping" message.
+            void send_pong(std::string msg) override
+            {
+                send_data(0xA, std::move(msg));
+            }
+
+            /// Send a binary encoded message.
+            void send_binary(std::string msg) override
+            {
+                send_data(0x2, std::move(msg));
+            }
+
+            /// Send a plaintext message.
+            void send_text(std::string msg) override
+            {
+                send_data(0x1, std::move(msg));
+            }
+
+            /// Send a close signal.
+
+            ///
+            /// Sets a flag to destroy the object once the message is sent.
+            void close(std::string const& msg) override
+            {
+                dispatch([this, msg]() mutable {
+                    has_sent_close_ = true;
+                    if (has_recv_close_ && !is_close_handler_called_)
+                    {
+                        is_close_handler_called_ = true;
+                        if (close_handler_)
+                            close_handler_(*this, msg);
+                    }
+                    auto header = build_header(0x8, msg.size());
+                    write_buffers_.emplace_back(std::move(header));
+                    write_buffers_.emplace_back(msg);
+                    do_write();
+                });
+            }
+
+            std::string get_remote_ip() override
+            {
+                return adaptor_.remote_endpoint().address().to_string();
+            }
+
+            void set_max_payload_size(uint64_t payload)
+            {
+                max_payload_bytes_ = payload;
+            }
+
+        protected:
+            /// Generate the websocket headers using an opcode and the message size (in bytes).
+            std::string build_header(int opcode, size_t size)
+            {
+                char buf[2 + 8] = "\x80\x00";
+                buf[0] += opcode;
+                if (size < 126)
+                {
+                    buf[1] += static_cast<char>(size);
+                    return {buf, buf + 2};
+                }
+                else if (size < 0x10000)
+                {
+                    buf[1] += 126;
+                    *(uint16_t*)(buf + 2) = htons(static_cast<uint16_t>(size));
+                    return {buf, buf + 4};
+                }
+                else
+                {
+                    buf[1] += 127;
+                    *reinterpret_cast<uint64_t*>(buf + 2) = ((1 == htonl(1)) ? static_cast<uint64_t>(size) : (static_cast<uint64_t>(htonl((size)&0xFFFFFFFF)) << 32) | htonl(static_cast<uint64_t>(size) >> 32));
+                    return {buf, buf + 10};
+                }
+            }
+
+            /// Send the HTTP upgrade response.
+
+            ///
+            /// Finishes the handshake process, then starts reading messages from the socket.
+            void start(std::string&& hello)
+            {
+                static const std::string header =
+                  "HTTP/1.1 101 Switching Protocols\r\n"
+                  "Upgrade: websocket\r\n"
+                  "Connection: Upgrade\r\n"
+                  "Sec-WebSocket-Accept: ";
+                write_buffers_.emplace_back(header);
+                write_buffers_.emplace_back(std::move(hello));
+                write_buffers_.emplace_back(crlf);
+                write_buffers_.emplace_back(crlf);
+                do_write();
+                if (open_handler_)
+                    open_handler_(*this);
+                do_read();
+            }
+
+            /// Read a websocket message.
+
+            ///
+            /// Involves:<br>
+            /// Handling headers (opcodes, size).<br>
+            /// Unmasking the payload.<br>
+            /// Reading the actual payload.<br>
+            void do_read()
+            {
+                if (has_sent_close_ && has_recv_close_)
+                {
+                    close_connection_ = true;
+                    adaptor_.shutdown_readwrite();
+                    adaptor_.close();
+                    check_destroy();
+                    return;
+                }
+
+                is_reading = true;
+                switch (state_)
+                {
+                    case WebSocketReadState::MiniHeader:
+                    {
+                        mini_header_ = 0;
+                        //asio::async_read(adaptor_.socket(), asio::buffer(&mini_header_, 1),
+                        adaptor_.socket().async_read_some(
+                          asio::buffer(&mini_header_, 2),
+                          [this](const error_code& ec, std::size_t
+#ifdef CROW_ENABLE_DEBUG
+                                                               bytes_transferred
+#endif
+                          )
+
+                          {
+                              is_reading = false;
+                              mini_header_ = ntohs(mini_header_);
+#ifdef CROW_ENABLE_DEBUG
+
+                              if (!ec && bytes_transferred != 2)
+                              {
+                                  throw std::runtime_error("WebSocket:MiniHeader:async_read fail:asio bug?");
+                              }
+#endif
+
+                              if (!ec)
+                              {
+                                  if ((mini_header_ & 0x80) == 0x80)
+                                      has_mask_ = true;
+                                  else //if the websocket specification is enforced and the message isn't masked, terminate the connection
+                                  {
+#ifndef CROW_ENFORCE_WS_SPEC
+                                      has_mask_ = false;
+#else
+                                      close_connection_ = true;
+                                      adaptor_.shutdown_readwrite();
+                                      adaptor_.close();
+                                      if (error_handler_)
+                                          error_handler_(*this, "Client connection not masked.");
+                                      check_destroy();
+#endif
+                                  }
+
+                                  if ((mini_header_ & 0x7f) == 127)
+                                  {
+                                      state_ = WebSocketReadState::Len64;
+                                  }
+                                  else if ((mini_header_ & 0x7f) == 126)
+                                  {
+                                      state_ = WebSocketReadState::Len16;
+                                  }
+                                  else
+                                  {
+                                      remaining_length_ = mini_header_ & 0x7f;
+                                      state_ = WebSocketReadState::Mask;
+                                  }
+                                  do_read();
+                              }
+                              else
+                              {
+                                  close_connection_ = true;
+                                  adaptor_.shutdown_readwrite();
+                                  adaptor_.close();
+                                  if (error_handler_)
+                                      error_handler_(*this, ec.message());
+                                  check_destroy();
+                              }
+                          });
+                    }
+                    break;
+                    case WebSocketReadState::Len16:
+                    {
+                        remaining_length_ = 0;
+                        remaining_length16_ = 0;
+                        asio::async_read(
+                          adaptor_.socket(), asio::buffer(&remaining_length16_, 2),
+                          [this](const error_code& ec, std::size_t
+#ifdef CROW_ENABLE_DEBUG
+                                                               bytes_transferred
+#endif
+                          ) {
+                              is_reading = false;
+                              remaining_length16_ = ntohs(remaining_length16_);
+                              remaining_length_ = remaining_length16_;
+#ifdef CROW_ENABLE_DEBUG
+                              if (!ec && bytes_transferred != 2)
+                              {
+                                  throw std::runtime_error("WebSocket:Len16:async_read fail:asio bug?");
+                              }
+#endif
+
+                              if (!ec)
+                              {
+                                  state_ = WebSocketReadState::Mask;
+                                  do_read();
+                              }
+                              else
+                              {
+                                  close_connection_ = true;
+                                  adaptor_.shutdown_readwrite();
+                                  adaptor_.close();
+                                  if (error_handler_)
+                                      error_handler_(*this, ec.message());
+                                  check_destroy();
+                              }
+                          });
+                    }
+                    break;
+                    case WebSocketReadState::Len64:
+                    {
+                        asio::async_read(
+                          adaptor_.socket(), asio::buffer(&remaining_length_, 8),
+                          [this](const error_code& ec, std::size_t
+#ifdef CROW_ENABLE_DEBUG
+                                                               bytes_transferred
+#endif
+                          ) {
+                              is_reading = false;
+                              remaining_length_ = ((1 == ntohl(1)) ? (remaining_length_) : (static_cast<uint64_t>(ntohl((remaining_length_)&0xFFFFFFFF)) << 32) | ntohl((remaining_length_) >> 32));
+#ifdef CROW_ENABLE_DEBUG
+                              if (!ec && bytes_transferred != 8)
+                              {
+                                  throw std::runtime_error("WebSocket:Len16:async_read fail:asio bug?");
+                              }
+#endif
+
+                              if (!ec)
+                              {
+                                  state_ = WebSocketReadState::Mask;
+                                  do_read();
+                              }
+                              else
+                              {
+                                  close_connection_ = true;
+                                  adaptor_.shutdown_readwrite();
+                                  adaptor_.close();
+                                  if (error_handler_)
+                                      error_handler_(*this, ec.message());
+                                  check_destroy();
+                              }
+                          });
+                    }
+                    break;
+                    case WebSocketReadState::Mask:
+                        if (remaining_length_ > max_payload_bytes_)
+                        {
+                            close_connection_ = true;
+                            adaptor_.close();
+                            if (error_handler_)
+                                error_handler_(*this, "Message length exceeds maximum payload.");
+                            check_destroy();
+                        }
+                        else if (has_mask_)
+                        {
+                            asio::async_read(
+                              adaptor_.socket(), asio::buffer((char*)&mask_, 4),
+                              [this](const error_code& ec, std::size_t
+#ifdef CROW_ENABLE_DEBUG
+                                                                   bytes_transferred
+#endif
+                              ) {
+                                  is_reading = false;
+#ifdef CROW_ENABLE_DEBUG
+                                  if (!ec && bytes_transferred != 4)
+                                  {
+                                      throw std::runtime_error("WebSocket:Mask:async_read fail:asio bug?");
+                                  }
+#endif
+
+                                  if (!ec)
+                                  {
+                                      state_ = WebSocketReadState::Payload;
+                                      do_read();
+                                  }
+                                  else
+                                  {
+                                      close_connection_ = true;
+                                      if (error_handler_)
+                                          error_handler_(*this, ec.message());
+                                      adaptor_.shutdown_readwrite();
+                                      adaptor_.close();
+                                      check_destroy();
+                                  }
+                              });
+                        }
+                        else
+                        {
+                            state_ = WebSocketReadState::Payload;
+                            do_read();
+                        }
+                        break;
+                    case WebSocketReadState::Payload:
+                    {
+                        auto to_read = static_cast<std::uint64_t>(buffer_.size());
+                        if (remaining_length_ < to_read)
+                            to_read = remaining_length_;
+                        adaptor_.socket().async_read_some(
+                          asio::buffer(buffer_, static_cast<std::size_t>(to_read)),
+                          [this](const error_code& ec, std::size_t bytes_transferred) {
+                              is_reading = false;
+
+                              if (!ec)
+                              {
+                                  fragment_.insert(fragment_.end(), buffer_.begin(), buffer_.begin() + bytes_transferred);
+                                  remaining_length_ -= bytes_transferred;
+                                  if (remaining_length_ == 0)
+                                  {
+                                      if (handle_fragment())
+                                      {
+                                          state_ = WebSocketReadState::MiniHeader;
+                                          do_read();
+                                      }
+                                  }
+                                  else
+                                      do_read();
+                              }
+                              else
+                              {
+                                  close_connection_ = true;
+                                  if (error_handler_)
+                                      error_handler_(*this, ec.message());
+                                  adaptor_.shutdown_readwrite();
+                                  adaptor_.close();
+                                  check_destroy();
+                              }
+                          });
+                    }
+                    break;
+                }
+            }
+
+            /// Check if the FIN bit is set.
+            bool is_FIN()
+            {
+                return mini_header_ & 0x8000;
+            }
+
+            /// Extract the opcode from the header.
+            int opcode()
+            {
+                return (mini_header_ & 0x0f00) >> 8;
+            }
+
+            /// Process the payload fragment.
+
+            ///
+            /// Unmasks the fragment, checks the opcode, merges fragments into 1 message body, and calls the appropriate handler.
+            bool handle_fragment()
+            {
+                if (has_mask_)
+                {
+                    for (decltype(fragment_.length()) i = 0; i < fragment_.length(); i++)
+                    {
+                        fragment_[i] ^= ((char*)&mask_)[i % 4];
+                    }
+                }
+                switch (opcode())
+                {
+                    case 0: // Continuation
+                    {
+                        message_ += fragment_;
+                        if (is_FIN())
+                        {
+                            if (message_handler_)
+                                message_handler_(*this, message_, is_binary_);
+                            message_.clear();
+                        }
+                    }
+                    break;
+                    case 1: // Text
+                    {
+                        is_binary_ = false;
+                        message_ += fragment_;
+                        if (is_FIN())
+                        {
+                            if (message_handler_)
+                                message_handler_(*this, message_, is_binary_);
+                            message_.clear();
+                        }
+                    }
+                    break;
+                    case 2: // Binary
+                    {
+                        is_binary_ = true;
+                        message_ += fragment_;
+                        if (is_FIN())
+                        {
+                            if (message_handler_)
+                                message_handler_(*this, message_, is_binary_);
+                            message_.clear();
+                        }
+                    }
+                    break;
+                    case 0x8: // Close
+                    {
+                        has_recv_close_ = true;
+                        if (!has_sent_close_)
+                        {
+                            close(fragment_);
+                        }
+                        else
+                        {
+                            adaptor_.shutdown_readwrite();
+                            adaptor_.close();
+                            close_connection_ = true;
+                            if (!is_close_handler_called_)
+                            {
+                                if (close_handler_)
+                                    close_handler_(*this, fragment_);
+                                is_close_handler_called_ = true;
+                            }
+                            check_destroy();
+                            return false;
+                        }
+                    }
+                    break;
+                    case 0x9: // Ping
+                    {
+                        send_pong(fragment_);
+                    }
+                    break;
+                    case 0xA: // Pong
+                    {
+                        pong_received_ = true;
+                    }
+                    break;
+                }
+
+                fragment_.clear();
+                return true;
+            }
+
+            /// Send the buffers' data through the socket.
+
+            ///
+            /// Also destroys the object if the Close flag is set.
+            void do_write()
+            {
+                if (sending_buffers_.empty())
+                {
+                    sending_buffers_.swap(write_buffers_);
+                    std::vector<asio::const_buffer> buffers;
+                    buffers.reserve(sending_buffers_.size());
+                    for (auto& s : sending_buffers_)
+                    {
+                        buffers.emplace_back(asio::buffer(s));
+                    }
+                    auto watch = std::weak_ptr<void>{anchor_};
+                    asio::async_write(
+                      adaptor_.socket(), buffers,
+                      [&, watch](const error_code& ec, std::size_t /*bytes_transferred*/) {
+                          if (!ec && !close_connection_)
+                          {
+                              sending_buffers_.clear();
+                              if (!write_buffers_.empty())
+                                  do_write();
+                              if (has_sent_close_)
+                                  close_connection_ = true;
+                          }
+                          else
+                          {
+                              auto anchor = watch.lock();
+                              if (anchor == nullptr) { return; }
+
+                              sending_buffers_.clear();
+                              close_connection_ = true;
+                              check_destroy();
+                          }
+                      });
+                }
+            }
+
+            /// Destroy the Connection.
+            void check_destroy()
+            {
+                //if (has_sent_close_ && has_recv_close_)
+                if (!is_close_handler_called_)
+                    if (close_handler_)
+                        close_handler_(*this, "uncleanly");
+                handler_->remove_websocket(this);
+                if (sending_buffers_.empty() && !is_reading)
+                    delete this;
+            }
+
+
+            struct SendMessageType
+            {
+                std::string payload;
+                Connection* self;
+                int opcode;
+
+                void operator()()
+                {
+                    self->send_data_impl(this);
+                }
+            };
+
+            void send_data_impl(SendMessageType* s)
+            {
+                auto header = build_header(s->opcode, s->payload.size());
+                write_buffers_.emplace_back(std::move(header));
+                write_buffers_.emplace_back(std::move(s->payload));
+                do_write();
+            }
+
+            void send_data(int opcode, std::string&& msg)
+            {
+                SendMessageType event_arg{
+                  std::move(msg),
+                  this,
+                  opcode};
+
+                post(std::move(event_arg));
+            }
+
+        private:
+            Adaptor adaptor_;
+            Handler* handler_;
+
+            std::vector<std::string> sending_buffers_;
+            std::vector<std::string> write_buffers_;
+
+            std::array<char, 4096> buffer_;
+            bool is_binary_;
+            std::string message_;
+            std::string fragment_;
+            WebSocketReadState state_{WebSocketReadState::MiniHeader};
+            uint16_t remaining_length16_{0};
+            uint64_t remaining_length_{0};
+            uint64_t max_payload_bytes_{UINT64_MAX};
+            bool close_connection_{false};
+            bool is_reading{false};
+            bool has_mask_{false};
+            uint32_t mask_;
+            uint16_t mini_header_;
+            bool has_sent_close_{false};
+            bool has_recv_close_{false};
+            bool error_occurred_{false};
+            bool pong_received_{false};
+            bool is_close_handler_called_{false};
+
+            std::shared_ptr<void> anchor_ = std::make_shared<int>(); // Value is just for placeholding
+
+            std::function<void(crow::websocket::connection&)> open_handler_;
+            std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler_;
+            std::function<void(crow::websocket::connection&, const std::string&)> close_handler_;
+            std::function<void(crow::websocket::connection&, const std::string&)> error_handler_;
+            std::function<bool(const crow::request&, void**)> accept_handler_;
+        };
+    } // namespace websocket
+} // namespace crow
+
+
+namespace crow
+{
+    constexpr const char VERSION[] = "master";
+}
+
+
+#ifdef CROW_USE_BOOST
+#include <boost/asio.hpp>
+#ifdef CROW_ENABLE_SSL
+#include <boost/asio/ssl.hpp>
+#endif
+#else
+#ifndef ASIO_STANDALONE
+#define ASIO_STANDALONE
+#endif
+#include <asio.hpp>
+#ifdef CROW_ENABLE_SSL
+#include <asio/ssl.hpp>
+#endif
+#endif
+
+#include <atomic>
+#include <chrono>
+#include <cstdint>
+#include <future>
+#include <memory>
+#include <vector>
+
+
+
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+#ifdef CROW_USE_BOOST
+    namespace asio = boost::asio;
+    using error_code = boost::system::error_code;
+#else
+    using error_code = asio::error_code;
+#endif
+    using tcp = asio::ip::tcp;
+
+    template<typename Handler, typename Adaptor = SocketAdaptor, typename... Middlewares>
+    class Server
+    {
+    public:
+        Server(Handler* handler, std::string bindaddr, uint16_t port, std::string server_name = std::string("Crow/") + VERSION, std::tuple<Middlewares...>* middlewares = nullptr, uint16_t concurrency = 1, uint8_t timeout = 5, typename Adaptor::context* adaptor_ctx = nullptr):
+          acceptor_(io_service_, tcp::endpoint(asio::ip::address::from_string(bindaddr), port)),
+          signals_(io_service_),
+          tick_timer_(io_service_),
+          handler_(handler),
+          concurrency_(concurrency),
+          timeout_(timeout),
+          server_name_(server_name),
+          port_(port),
+          bindaddr_(bindaddr),
+          task_queue_length_pool_(concurrency_ - 1),
+          middlewares_(middlewares),
+          adaptor_ctx_(adaptor_ctx)
+        {}
+
+        void set_tick_function(std::chrono::milliseconds d, std::function<void()> f)
+        {
+            tick_interval_ = d;
+            tick_function_ = f;
+        }
+
+        void on_tick()
+        {
+            tick_function_();
+            tick_timer_.expires_after(std::chrono::milliseconds(tick_interval_.count()));
+            tick_timer_.async_wait([this](const error_code& ec) {
+                if (ec)
+                    return;
+                on_tick();
+            });
+        }
+
+        void run()
+        {
+            uint16_t worker_thread_count = concurrency_ - 1;
+            for (int i = 0; i < worker_thread_count; i++)
+                io_service_pool_.emplace_back(new asio::io_service());
+            get_cached_date_str_pool_.resize(worker_thread_count);
+            task_timer_pool_.resize(worker_thread_count);
+
+            std::vector<std::future<void>> v;
+            std::atomic<int> init_count(0);
+            for (uint16_t i = 0; i < worker_thread_count; i++)
+                v.push_back(
+                  std::async(
+                    std::launch::async, [this, i, &init_count] {
+                        // thread local date string get function
+                        auto last = std::chrono::steady_clock::now();
+
+                        std::string date_str;
+                        auto update_date_str = [&] {
+                            auto last_time_t = time(0);
+                            tm my_tm;
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+                            gmtime_s(&my_tm, &last_time_t);
+#else
+                            gmtime_r(&last_time_t, &my_tm);
+#endif
+                            date_str.resize(100);
+                            size_t date_str_sz = strftime(&date_str[0], 99, "%a, %d %b %Y %H:%M:%S GMT", &my_tm);
+                            date_str.resize(date_str_sz);
+                        };
+                        update_date_str();
+                        get_cached_date_str_pool_[i] = [&]() -> std::string {
+                            if (std::chrono::steady_clock::now() - last >= std::chrono::seconds(1))
+                            {
+                                last = std::chrono::steady_clock::now();
+                                update_date_str();
+                            }
+                            return date_str;
+                        };
+
+                        // initializing task timers
+                        detail::task_timer task_timer(*io_service_pool_[i]);
+                        task_timer.set_default_timeout(timeout_);
+                        task_timer_pool_[i] = &task_timer;
+                        task_queue_length_pool_[i] = 0;
+
+                        init_count++;
+                        while (1)
+                        {
+                            try
+                            {
+                                if (io_service_pool_[i]->run() == 0)
+                                {
+                                    // when io_service.run returns 0, there are no more works to do.
+                                    break;
+                                }
+                            }
+                            catch (std::exception& e)
+                            {
+                                CROW_LOG_ERROR << "Worker Crash: An uncaught exception occurred: " << e.what();
+                            }
+                        }
+                    }));
+
+            if (tick_function_ && tick_interval_.count() > 0)
+            {
+                tick_timer_.expires_after(std::chrono::milliseconds(tick_interval_.count()));
+                tick_timer_.async_wait(
+                  [this](const error_code& ec) {
+                      if (ec)
+                          return;
+                      on_tick();
+                  });
+            }
+
+            port_ = acceptor_.local_endpoint().port();
+            handler_->port(port_);
+
+
+            CROW_LOG_INFO << server_name_ << " server is running at " << (handler_->ssl_used() ? "https://" : "http://") << bindaddr_ << ":" << acceptor_.local_endpoint().port() << " using " << concurrency_ << " threads";
+            CROW_LOG_INFO << "Call `app.loglevel(crow::LogLevel::Warning)` to hide Info level logs.";
+
+            signals_.async_wait(
+              [&](const error_code& /*error*/, int /*signal_number*/) {
+                  stop();
+              });
+
+            while (worker_thread_count != init_count)
+                std::this_thread::yield();
+
+            do_accept();
+
+            std::thread(
+              [this] {
+                  notify_start();
+                  io_service_.run();
+                  CROW_LOG_INFO << "Exiting.";
+              })
+              .join();
+        }
+
+        void stop()
+        {
+            shutting_down_ = true; // Prevent the acceptor from taking new connections
+            for (auto& io_service : io_service_pool_)
+            {
+                if (io_service != nullptr)
+                {
+                    CROW_LOG_INFO << "Closing IO service " << &io_service;
+                    io_service->stop(); // Close all io_services (and HTTP connections)
+                }
+            }
+
+            CROW_LOG_INFO << "Closing main IO service (" << &io_service_ << ')';
+            io_service_.stop(); // Close main io_service
+        }
+
+        /// Wait until the server has properly started
+        void wait_for_start()
+        {
+            std::unique_lock<std::mutex> lock(start_mutex_);
+            if (!server_started_)
+                cv_started_.wait(lock);
+        }
+
+        void signal_clear()
+        {
+            signals_.clear();
+        }
+
+        void signal_add(int signal_number)
+        {
+            signals_.add(signal_number);
+        }
+
+    private:
+        uint16_t pick_io_service_idx()
+        {
+            uint16_t min_queue_idx = 0;
+
+            // TODO improve load balancing
+            // size_t is used here to avoid the security issue https://codeql.github.com/codeql-query-help/cpp/cpp-comparison-with-wider-type/
+            // even though the max value of this can be only uint16_t as concurrency is uint16_t.
+            for (size_t i = 1; i < task_queue_length_pool_.size() && task_queue_length_pool_[min_queue_idx] > 0; i++)
+            // No need to check other io_services if the current one has no tasks
+            {
+                if (task_queue_length_pool_[i] < task_queue_length_pool_[min_queue_idx])
+                    min_queue_idx = i;
+            }
+            return min_queue_idx;
+        }
+
+        void do_accept()
+        {
+            if (!shutting_down_)
+            {
+                uint16_t service_idx = pick_io_service_idx();
+                asio::io_service& is = *io_service_pool_[service_idx];
+                task_queue_length_pool_[service_idx]++;
+                CROW_LOG_DEBUG << &is << " {" << service_idx << "} queue length: " << task_queue_length_pool_[service_idx];
+
+                auto p = std::make_shared<Connection<Adaptor, Handler, Middlewares...>>(
+                  is, handler_, server_name_, middlewares_,
+                  get_cached_date_str_pool_[service_idx], *task_timer_pool_[service_idx], adaptor_ctx_, task_queue_length_pool_[service_idx]);
+
+                acceptor_.async_accept(
+                  p->socket(),
+                  [this, p, &is, service_idx](error_code ec) {
+                      if (!ec)
+                      {
+                          is.post(
+                            [p] {
+                                p->start();
+                            });
+                      }
+                      else
+                      {
+                          task_queue_length_pool_[service_idx]--;
+                          CROW_LOG_DEBUG << &is << " {" << service_idx << "} queue length: " << task_queue_length_pool_[service_idx];
+                      }
+                      do_accept();
+                  });
+            }
+        }
+
+        /// Notify anything using `wait_for_start()` to proceed
+        void notify_start()
+        {
+            std::unique_lock<std::mutex> lock(start_mutex_);
+            server_started_ = true;
+            cv_started_.notify_all();
+        }
+
+    private:
+        std::vector<std::unique_ptr<asio::io_service>> io_service_pool_;
+        asio::io_service io_service_;
+        std::vector<detail::task_timer*> task_timer_pool_;
+        std::vector<std::function<std::string()>> get_cached_date_str_pool_;
+        tcp::acceptor acceptor_;
+        bool shutting_down_ = false;
+        bool server_started_{false};
+        std::condition_variable cv_started_;
+        std::mutex start_mutex_;
+        asio::signal_set signals_;
+
+        asio::basic_waitable_timer<std::chrono::high_resolution_clock> tick_timer_;
+
+        Handler* handler_;
+        uint16_t concurrency_{2};
+        std::uint8_t timeout_;
+        std::string server_name_;
+        uint16_t port_;
+        std::string bindaddr_;
+        std::vector<std::atomic<unsigned int>> task_queue_length_pool_;
+
+        std::chrono::milliseconds tick_interval_;
+        std::function<void()> tick_function_;
+
+        std::tuple<Middlewares...>* middlewares_;
+
+        typename Adaptor::context* adaptor_ctx_;
+    };
+} // namespace crow
+
+#include <string>
+#include <vector>
+#include <fstream>
+#include <iterator>
+#include <functional>
+
+namespace crow
+{
+    namespace mustache
+    {
+        using context = json::wvalue;
+
+        template_t load(const std::string& filename);
+
+        class invalid_template_exception : public std::exception
+        {
+        public:
+            invalid_template_exception(const std::string& msg):
+              msg("crow::mustache error: " + msg)
+            {}
+            virtual const char* what() const throw()
+            {
+                return msg.c_str();
+            }
+            std::string msg;
+        };
+
+        struct rendered_template : returnable
+        {
+            rendered_template():
+              returnable("text/html") {}
+
+            rendered_template(std::string& body):
+              returnable("text/html"), body_(std::move(body)) {}
+
+            std::string body_;
+
+            std::string dump() const override
+            {
+                return body_;
+            }
+        };
+
+        enum class ActionType
+        {
+            Ignore,
+            Tag,
+            UnescapeTag,
+            OpenBlock,
+            CloseBlock,
+            ElseBlock,
+            Partial,
+        };
+
+        struct Action
+        {
+            int start;
+            int end;
+            int pos;
+            ActionType t;
+            Action(ActionType t, size_t start, size_t end, size_t pos = 0):
+              start(static_cast<int>(start)), end(static_cast<int>(end)), pos(static_cast<int>(pos)), t(t)
+            {
+            }
+        };
+
+        /// A mustache template object.
+        class template_t
+        {
+        public:
+            template_t(std::string body):
+              body_(std::move(body))
+            {
+                // {{ {{# {{/ {{^ {{! {{> {{=
+                parse();
+            }
+
+        private:
+            std::string tag_name(const Action& action) const
+            {
+                return body_.substr(action.start, action.end - action.start);
+            }
+            auto find_context(const std::string& name, const std::vector<const context*>& stack, bool shouldUseOnlyFirstStackValue = false) const -> std::pair<bool, const context&>
+            {
+                if (name == ".")
+                {
+                    return {true, *stack.back()};
+                }
+                static json::wvalue empty_str;
+                empty_str = "";
+
+                int dotPosition = name.find(".");
+                if (dotPosition == static_cast<int>(name.npos))
+                {
+                    for (auto it = stack.rbegin(); it != stack.rend(); ++it)
+                    {
+                        if ((*it)->t() == json::type::Object)
+                        {
+                            if ((*it)->count(name))
+                                return {true, (**it)[name]};
+                        }
+                    }
+                }
+                else
+                {
+                    std::vector<int> dotPositions;
+                    dotPositions.push_back(-1);
+                    while (dotPosition != static_cast<int>(name.npos))
+                    {
+                        dotPositions.push_back(dotPosition);
+                        dotPosition = name.find(".", dotPosition + 1);
+                    }
+                    dotPositions.push_back(name.size());
+                    std::vector<std::string> names;
+                    names.reserve(dotPositions.size() - 1);
+                    for (int i = 1; i < static_cast<int>(dotPositions.size()); i++)
+                        names.emplace_back(name.substr(dotPositions[i - 1] + 1, dotPositions[i] - dotPositions[i - 1] - 1));
+
+                    for (auto it = stack.rbegin(); it != stack.rend(); ++it)
+                    {
+                        const context* view = *it;
+                        bool found = true;
+                        for (auto jt = names.begin(); jt != names.end(); ++jt)
+                        {
+                            if (view->t() == json::type::Object &&
+                                view->count(*jt))
+                            {
+                                view = &(*view)[*jt];
+                            }
+                            else
+                            {
+                                if (shouldUseOnlyFirstStackValue)
+                                {
+                                    return {false, empty_str};
+                                }
+                                found = false;
+                                break;
+                            }
+                        }
+                        if (found)
+                            return {true, *view};
+                    }
+                }
+
+                return {false, empty_str};
+            }
+
+            void escape(const std::string& in, std::string& out) const
+            {
+                out.reserve(out.size() + in.size());
+                for (auto it = in.begin(); it != in.end(); ++it)
+                {
+                    switch (*it)
+                    {
+                        case '&': out += "&amp;"; break;
+                        case '<': out += "&lt;"; break;
+                        case '>': out += "&gt;"; break;
+                        case '"': out += "&quot;"; break;
+                        case '\'': out += "&#39;"; break;
+                        case '/': out += "&#x2F;"; break;
+                        case '`': out += "&#x60;"; break;
+                        case '=': out += "&#x3D;"; break;
+                        default: out += *it; break;
+                    }
+                }
+            }
+
+            bool isTagInsideObjectBlock(const int& current, const std::vector<const context*>& stack) const
+            {
+                int openedBlock = 0;
+                for (int i = current; i > 0; --i)
+                {
+                    auto& action = actions_[i - 1];
+
+                    if (action.t == ActionType::OpenBlock)
+                    {
+                        if (openedBlock == 0 && (*stack.rbegin())->t() == json::type::Object)
+                        {
+                            return true;
+                        }
+                        --openedBlock;
+                    }
+                    else if (action.t == ActionType::CloseBlock)
+                    {
+                        ++openedBlock;
+                    }
+                }
+
+                return false;
+            }
+
+            void render_internal(int actionBegin, int actionEnd, std::vector<const context*>& stack, std::string& out, int indent) const
+            {
+                int current = actionBegin;
+
+                if (indent)
+                    out.insert(out.size(), indent, ' ');
+
+                while (current < actionEnd)
+                {
+                    auto& fragment = fragments_[current];
+                    auto& action = actions_[current];
+                    render_fragment(fragment, indent, out);
+                    switch (action.t)
+                    {
+                        case ActionType::Ignore:
+                            // do nothing
+                            break;
+                        case ActionType::Partial:
+                        {
+                            std::string partial_name = tag_name(action);
+                            auto partial_templ = load(partial_name);
+                            int partial_indent = action.pos;
+                            partial_templ.render_internal(0, partial_templ.fragments_.size() - 1, stack, out, partial_indent ? indent + partial_indent : 0);
+                        }
+                        break;
+                        case ActionType::UnescapeTag:
+                        case ActionType::Tag:
+                        {
+                            bool shouldUseOnlyFirstStackValue = false;
+                            if (isTagInsideObjectBlock(current, stack))
+                            {
+                                shouldUseOnlyFirstStackValue = true;
+                            }
+                            auto optional_ctx = find_context(tag_name(action), stack, shouldUseOnlyFirstStackValue);
+                            auto& ctx = optional_ctx.second;
+                            switch (ctx.t())
+                            {
+                                case json::type::False:
+                                case json::type::True:
+                                case json::type::Number:
+                                    out += ctx.dump();
+                                    break;
+                                case json::type::String:
+                                    if (action.t == ActionType::Tag)
+                                        escape(ctx.s, out);
+                                    else
+                                        out += ctx.s;
+                                    break;
+                                case json::type::Function:
+                                {
+                                    std::string execute_result = ctx.execute();
+                                    while (execute_result.find("{{") != std::string::npos)
+                                    {
+                                        template_t result_plug(execute_result);
+                                        execute_result = result_plug.render_string(*(stack[0]));
+                                    }
+
+                                    if (action.t == ActionType::Tag)
+                                        escape(execute_result, out);
+                                    else
+                                        out += execute_result;
+                                }
+                                break;
+                                default:
+                                    throw std::runtime_error("not implemented tag type" + utility::lexical_cast<std::string>(static_cast<int>(ctx.t())));
+                            }
+                        }
+                        break;
+                        case ActionType::ElseBlock:
+                        {
+                            static context nullContext;
+                            auto optional_ctx = find_context(tag_name(action), stack);
+                            if (!optional_ctx.first)
+                            {
+                                stack.emplace_back(&nullContext);
+                                break;
+                            }
+
+                            auto& ctx = optional_ctx.second;
+                            switch (ctx.t())
+                            {
+                                case json::type::List:
+                                    if (ctx.l && !ctx.l->empty())
+                                        current = action.pos;
+                                    else
+                                        stack.emplace_back(&nullContext);
+                                    break;
+                                case json::type::False:
+                                case json::type::Null:
+                                    stack.emplace_back(&nullContext);
+                                    break;
+                                default:
+                                    current = action.pos;
+                                    break;
+                            }
+                            break;
+                        }
+                        case ActionType::OpenBlock:
+                        {
+                            auto optional_ctx = find_context(tag_name(action), stack);
+                            if (!optional_ctx.first)
+                            {
+                                current = action.pos;
+                                break;
+                            }
+
+                            auto& ctx = optional_ctx.second;
+                            switch (ctx.t())
+                            {
+                                case json::type::List:
+                                    if (ctx.l)
+                                        for (auto it = ctx.l->begin(); it != ctx.l->end(); ++it)
+                                        {
+                                            stack.push_back(&*it);
+                                            render_internal(current + 1, action.pos, stack, out, indent);
+                                            stack.pop_back();
+                                        }
+                                    current = action.pos;
+                                    break;
+                                case json::type::Number:
+                                case json::type::String:
+                                case json::type::Object:
+                                case json::type::True:
+                                    stack.push_back(&ctx);
+                                    break;
+                                case json::type::False:
+                                case json::type::Null:
+                                    current = action.pos;
+                                    break;
+                                default:
+                                    throw std::runtime_error("{{#: not implemented context type: " + utility::lexical_cast<std::string>(static_cast<int>(ctx.t())));
+                                    break;
+                            }
+                            break;
+                        }
+                        case ActionType::CloseBlock:
+                            stack.pop_back();
+                            break;
+                        default:
+                            throw std::runtime_error("not implemented " + utility::lexical_cast<std::string>(static_cast<int>(action.t)));
+                    }
+                    current++;
+                }
+                auto& fragment = fragments_[actionEnd];
+                render_fragment(fragment, indent, out);
+            }
+            void render_fragment(const std::pair<int, int> fragment, int indent, std::string& out) const
+            {
+                if (indent)
+                {
+                    for (int i = fragment.first; i < fragment.second; i++)
+                    {
+                        out += body_[i];
+                        if (body_[i] == '\n' && i + 1 != static_cast<int>(body_.size()))
+                            out.insert(out.size(), indent, ' ');
+                    }
+                }
+                else
+                    out.insert(out.size(), body_, fragment.first, fragment.second - fragment.first);
+            }
+
+        public:
+            /// Output a returnable template from this mustache template
+            rendered_template render() const
+            {
+                context empty_ctx;
+                std::vector<const context*> stack;
+                stack.emplace_back(&empty_ctx);
+
+                std::string ret;
+                render_internal(0, fragments_.size() - 1, stack, ret, 0);
+                return rendered_template(ret);
+            }
+
+            /// Apply the values from the context provided and output a returnable template from this mustache template
+            rendered_template render(const context& ctx) const
+            {
+                std::vector<const context*> stack;
+                stack.emplace_back(&ctx);
+
+                std::string ret;
+                render_internal(0, fragments_.size() - 1, stack, ret, 0);
+                return rendered_template(ret);
+            }
+
+            /// Apply the values from the context provided and output a returnable template from this mustache template
+            rendered_template render(const context&& ctx) const
+            {
+                return render(ctx);
+            }
+
+            /// Output a returnable template from this mustache template
+            std::string render_string() const
+            {
+                context empty_ctx;
+                std::vector<const context*> stack;
+                stack.emplace_back(&empty_ctx);
+
+                std::string ret;
+                render_internal(0, fragments_.size() - 1, stack, ret, 0);
+                return ret;
+            }
+
+            /// Apply the values from the context provided and output a returnable template from this mustache template
+            std::string render_string(const context& ctx) const
+            {
+                std::vector<const context*> stack;
+                stack.emplace_back(&ctx);
+
+                std::string ret;
+                render_internal(0, fragments_.size() - 1, stack, ret, 0);
+                return ret;
+            }
+
+        private:
+            void parse()
+            {
+                std::string tag_open = "{{";
+                std::string tag_close = "}}";
+
+                std::vector<int> blockPositions;
+
+                size_t current = 0;
+                while (1)
+                {
+                    size_t idx = body_.find(tag_open, current);
+                    if (idx == body_.npos)
+                    {
+                        fragments_.emplace_back(static_cast<int>(current), static_cast<int>(body_.size()));
+                        actions_.emplace_back(ActionType::Ignore, 0, 0);
+                        break;
+                    }
+                    fragments_.emplace_back(static_cast<int>(current), static_cast<int>(idx));
+
+                    idx += tag_open.size();
+                    size_t endIdx = body_.find(tag_close, idx);
+                    if (endIdx == idx)
+                    {
+                        throw invalid_template_exception("empty tag is not allowed");
+                    }
+                    if (endIdx == body_.npos)
+                    {
+                        // error, no matching tag
+                        throw invalid_template_exception("not matched opening tag");
+                    }
+                    current = endIdx + tag_close.size();
+                    switch (body_[idx])
+                    {
+                        case '#':
+                            idx++;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            blockPositions.emplace_back(static_cast<int>(actions_.size()));
+                            actions_.emplace_back(ActionType::OpenBlock, idx, endIdx);
+                            break;
+                        case '/':
+                            idx++;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            {
+                                auto& matched = actions_[blockPositions.back()];
+                                if (body_.compare(idx, endIdx - idx,
+                                                  body_, matched.start, matched.end - matched.start) != 0)
+                                {
+                                    throw invalid_template_exception("not matched {{# {{/ pair: " +
+                                                                     body_.substr(matched.start, matched.end - matched.start) + ", " +
+                                                                     body_.substr(idx, endIdx - idx));
+                                }
+                                matched.pos = actions_.size();
+                            }
+                            actions_.emplace_back(ActionType::CloseBlock, idx, endIdx, blockPositions.back());
+                            blockPositions.pop_back();
+                            break;
+                        case '^':
+                            idx++;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            blockPositions.emplace_back(static_cast<int>(actions_.size()));
+                            actions_.emplace_back(ActionType::ElseBlock, idx, endIdx);
+                            break;
+                        case '!':
+                            // do nothing action
+                            actions_.emplace_back(ActionType::Ignore, idx + 1, endIdx);
+                            break;
+                        case '>': // partial
+                            idx++;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            actions_.emplace_back(ActionType::Partial, idx, endIdx);
+                            break;
+                        case '{':
+                            if (tag_open != "{{" || tag_close != "}}")
+                                throw invalid_template_exception("cannot use triple mustache when delimiter changed");
+
+                            idx++;
+                            if (body_[endIdx + 2] != '}')
+                            {
+                                throw invalid_template_exception("{{{: }}} not matched");
+                            }
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            actions_.emplace_back(ActionType::UnescapeTag, idx, endIdx);
+                            current++;
+                            break;
+                        case '&':
+                            idx++;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            actions_.emplace_back(ActionType::UnescapeTag, idx, endIdx);
+                            break;
+                        case '=':
+                            // tag itself is no-op
+                            idx++;
+                            actions_.emplace_back(ActionType::Ignore, idx, endIdx);
+                            endIdx--;
+                            if (body_[endIdx] != '=')
+                                throw invalid_template_exception("{{=: not matching = tag: " + body_.substr(idx, endIdx - idx));
+                            endIdx--;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx] == ' ')
+                                endIdx--;
+                            endIdx++;
+                            {
+                                bool succeeded = false;
+                                for (size_t i = idx; i < endIdx; i++)
+                                {
+                                    if (body_[i] == ' ')
+                                    {
+                                        tag_open = body_.substr(idx, i - idx);
+                                        while (body_[i] == ' ')
+                                            i++;
+                                        tag_close = body_.substr(i, endIdx - i);
+                                        if (tag_open.empty())
+                                            throw invalid_template_exception("{{=: empty open tag");
+                                        if (tag_close.empty())
+                                            throw invalid_template_exception("{{=: empty close tag");
+
+                                        if (tag_close.find(" ") != tag_close.npos)
+                                            throw invalid_template_exception("{{=: invalid open/close tag: " + tag_open + " " + tag_close);
+                                        succeeded = true;
+                                        break;
+                                    }
+                                }
+                                if (!succeeded)
+                                    throw invalid_template_exception("{{=: cannot find space between new open/close tags");
+                            }
+                            break;
+                        default:
+                            // normal tag case;
+                            while (body_[idx] == ' ')
+                                idx++;
+                            while (body_[endIdx - 1] == ' ')
+                                endIdx--;
+                            actions_.emplace_back(ActionType::Tag, idx, endIdx);
+                            break;
+                    }
+                }
+
+                // removing standalones
+                for (int i = actions_.size() - 2; i >= 0; i--)
+                {
+                    if (actions_[i].t == ActionType::Tag || actions_[i].t == ActionType::UnescapeTag)
+                        continue;
+                    auto& fragment_before = fragments_[i];
+                    auto& fragment_after = fragments_[i + 1];
+                    bool is_last_action = i == static_cast<int>(actions_.size()) - 2;
+                    bool all_space_before = true;
+                    int j, k;
+                    for (j = fragment_before.second - 1; j >= fragment_before.first; j--)
+                    {
+                        if (body_[j] != ' ')
+                        {
+                            all_space_before = false;
+                            break;
+                        }
+                    }
+                    if (all_space_before && i > 0)
+                        continue;
+                    if (!all_space_before && body_[j] != '\n')
+                        continue;
+                    bool all_space_after = true;
+                    for (k = fragment_after.first; k < static_cast<int>(body_.size()) && k < fragment_after.second; k++)
+                    {
+                        if (body_[k] != ' ')
+                        {
+                            all_space_after = false;
+                            break;
+                        }
+                    }
+                    if (all_space_after && !is_last_action)
+                        continue;
+                    if (!all_space_after &&
+                        !(
+                          body_[k] == '\n' ||
+                          (body_[k] == '\r' &&
+                           k + 1 < static_cast<int>(body_.size()) &&
+                           body_[k + 1] == '\n')))
+                        continue;
+                    if (actions_[i].t == ActionType::Partial)
+                    {
+                        actions_[i].pos = fragment_before.second - j - 1;
+                    }
+                    fragment_before.second = j + 1;
+                    if (!all_space_after)
+                    {
+                        if (body_[k] == '\n')
+                            k++;
+                        else
+                            k += 2;
+                        fragment_after.first = k;
+                    }
+                }
+            }
+
+            std::vector<std::pair<int, int>> fragments_;
+            std::vector<Action> actions_;
+            std::string body_;
+        };
+
+        inline template_t compile(const std::string& body)
+        {
+            return template_t(body);
+        }
+        namespace detail
+        {
+            inline std::string& get_template_base_directory_ref()
+            {
+                static std::string template_base_directory = "templates";
+                return template_base_directory;
+            }
+
+            /// A base directory not related to any blueprint
+            inline std::string& get_global_template_base_directory_ref()
+            {
+                static std::string template_base_directory = "templates";
+                return template_base_directory;
+            }
+        } // namespace detail
+
+        inline std::string default_loader(const std::string& filename)
+        {
+            std::string path = detail::get_template_base_directory_ref();
+            std::ifstream inf(utility::join_path(path, filename));
+            if (!inf)
+            {
+                CROW_LOG_WARNING << "Template \"" << filename << "\" not found.";
+                return {};
+            }
+            return {std::istreambuf_iterator<char>(inf), std::istreambuf_iterator<char>()};
+        }
+
+        namespace detail
+        {
+            inline std::function<std::string(std::string)>& get_loader_ref()
+            {
+                static std::function<std::string(std::string)> loader = default_loader;
+                return loader;
+            }
+        } // namespace detail
+
+        inline void set_base(const std::string& path)
+        {
+            auto& base = detail::get_template_base_directory_ref();
+            base = path;
+            if (base.back() != '\\' &&
+                base.back() != '/')
+            {
+                base += '/';
+            }
+        }
+
+        inline void set_global_base(const std::string& path)
+        {
+            auto& base = detail::get_global_template_base_directory_ref();
+            base = path;
+            if (base.back() != '\\' &&
+                base.back() != '/')
+            {
+                base += '/';
+            }
+        }
+
+        inline void set_loader(std::function<std::string(std::string)> loader)
+        {
+            detail::get_loader_ref() = std::move(loader);
+        }
+
+        inline std::string load_text(const std::string& filename)
+        {
+            std::string filename_sanitized(filename);
+            utility::sanitize_filename(filename_sanitized);
+            return detail::get_loader_ref()(filename_sanitized);
+        }
+
+        inline std::string load_text_unsafe(const std::string& filename)
+        {
+            return detail::get_loader_ref()(filename);
+        }
+
+        inline template_t load(const std::string& filename)
+        {
+            std::string filename_sanitized(filename);
+            utility::sanitize_filename(filename_sanitized);
+            return compile(detail::get_loader_ref()(filename_sanitized));
+        }
+
+        inline template_t load_unsafe(const std::string& filename)
+        {
+            return compile(detail::get_loader_ref()(filename));
+        }
+    } // namespace mustache
+} // namespace crow
+
+
+#include <cstdint>
+#include <utility>
+#include <tuple>
+#include <unordered_map>
+#include <memory>
+#include <vector>
+#include <algorithm>
+#include <type_traits>
+
+
+namespace crow // NOTE: Already documented in "crow/app.h"
+{
+
+    constexpr const uint16_t INVALID_BP_ID{((uint16_t)-1)};
+
+    namespace detail
+    {
+        /// Typesafe wrapper for storing lists of middleware as their indices in the App
+        struct middleware_indices
+        {
+            template<typename App>
+            void push()
+            {}
+
+            template<typename App, typename MW, typename... Middlewares>
+            void push()
+            {
+                using MwContainer = typename App::mw_container_t;
+                static_assert(black_magic::has_type<MW, MwContainer>::value, "Middleware must be present in app");
+                static_assert(std::is_base_of<crow::ILocalMiddleware, MW>::value, "Middleware must extend ILocalMiddleware");
+                int idx = black_magic::tuple_index<MW, MwContainer>::value;
+                indices_.push_back(idx);
+                push<App, Middlewares...>();
+            }
+
+            void merge_front(const detail::middleware_indices& other)
+            {
+                indices_.insert(indices_.begin(), other.indices_.cbegin(), other.indices_.cend());
+            }
+
+            void merge_back(const detail::middleware_indices& other)
+            {
+                indices_.insert(indices_.end(), other.indices_.cbegin(), other.indices_.cend());
+            }
+
+            void pop_back(const detail::middleware_indices& other)
+            {
+                indices_.resize(indices_.size() - other.indices_.size());
+            }
+
+            bool empty() const
+            {
+                return indices_.empty();
+            }
+
+            // Sorts indices and filters out duplicates to allow fast lookups with traversal
+            void pack()
+            {
+                std::sort(indices_.begin(), indices_.end());
+                indices_.erase(std::unique(indices_.begin(), indices_.end()), indices_.end());
+            }
+
+            const std::vector<int>& indices()
+            {
+                return indices_;
+            }
+
+        private:
+            std::vector<int> indices_;
+        };
+    } // namespace detail
+
+    /// A base class for all rules.
+
+    ///
+    /// Used to provide a common interface for code dealing with different types of rules.<br>
+    /// A Rule provides a URL, allowed HTTP methods, and handlers.
+    class BaseRule
+    {
+    public:
+        BaseRule(std::string rule):
+          rule_(std::move(rule))
+        {}
+
+        virtual ~BaseRule()
+        {}
+
+        virtual void validate() = 0;
+        
+        void set_added() {
+            added_ = true;
+        }
+
+        bool is_added() {
+            return added_;
+        }
+
+        std::unique_ptr<BaseRule> upgrade()
+        {
+            if (rule_to_upgrade_)
+                return std::move(rule_to_upgrade_);
+            return {};
+        }
+
+        virtual void handle(request&, response&, const routing_params&) = 0;
+        virtual void handle_upgrade(const request&, response& res, SocketAdaptor&&)
+        {
+            res = response(404);
+            res.end();
+        }
+#ifdef CROW_ENABLE_SSL
+        virtual void handle_upgrade(const request&, response& res, SSLAdaptor&&)
+        {
+            res = response(404);
+            res.end();
+        }
+#endif
+
+        uint32_t get_methods()
+        {
+            return methods_;
+        }
+
+        template<typename F>
+        void foreach_method(F f)
+        {
+            for (uint32_t method = 0, method_bit = 1; method < static_cast<uint32_t>(HTTPMethod::InternalMethodCount); method++, method_bit <<= 1)
+            {
+                if (methods_ & method_bit)
+                    f(method);
+            }
+        }
+
+        std::string custom_templates_base;
+
+        const std::string& rule() { return rule_; }
+
+    protected:
+        uint32_t methods_{1 << static_cast<int>(HTTPMethod::Get)};
+
+        std::string rule_;
+        std::string name_;
+        bool added_{false};
+
+        std::unique_ptr<BaseRule> rule_to_upgrade_;
+
+        detail::middleware_indices mw_indices_;
+
+        friend class Router;
+        friend class Blueprint;
+        template<typename T>
+        friend struct RuleParameterTraits;
+    };
+
+
+    namespace detail
+    {
+        namespace routing_handler_call_helper
+        {
+            template<typename T, int Pos>
+            struct call_pair
+            {
+                using type = T;
+                static const int pos = Pos;
+            };
+
+            template<typename H1>
+            struct call_params
+            {
+                H1& handler;
+                const routing_params& params;
+                request& req;
+                response& res;
+            };
+
+            template<typename F, int NInt, int NUint, int NDouble, int NString, typename S1, typename S2>
+            struct call
+            {};
+
+            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
+            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<int64_t, Args1...>, black_magic::S<Args2...>>
+            {
+                void operator()(F cparams)
+                {
+                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<int64_t, NInt>>;
+                    call<F, NInt + 1, NUint, NDouble, NString, black_magic::S<Args1...>, pushed>()(cparams);
+                }
+            };
+
+            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
+            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<uint64_t, Args1...>, black_magic::S<Args2...>>
+            {
+                void operator()(F cparams)
+                {
+                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<uint64_t, NUint>>;
+                    call<F, NInt, NUint + 1, NDouble, NString, black_magic::S<Args1...>, pushed>()(cparams);
+                }
+            };
+
+            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
+            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<double, Args1...>, black_magic::S<Args2...>>
+            {
+                void operator()(F cparams)
+                {
+                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<double, NDouble>>;
+                    call<F, NInt, NUint, NDouble + 1, NString, black_magic::S<Args1...>, pushed>()(cparams);
+                }
+            };
+
+            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
+            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<std::string, Args1...>, black_magic::S<Args2...>>
+            {
+                void operator()(F cparams)
+                {
+                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<std::string, NString>>;
+                    call<F, NInt, NUint, NDouble, NString + 1, black_magic::S<Args1...>, pushed>()(cparams);
+                }
+            };
+
+            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1>
+            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<>, black_magic::S<Args1...>>
+            {
+                void operator()(F cparams)
+                {
+                    cparams.handler(
+                      cparams.req,
+                      cparams.res,
+                      cparams.params.template get<typename Args1::type>(Args1::pos)...);
+                }
+            };
+
+            template<typename Func, typename... ArgsWrapped>
+            struct Wrapped
+            {
+                template<typename... Args>
+                void set_(Func f, typename std::enable_if<!std::is_same<typename std::tuple_element<0, std::tuple<Args..., void>>::type, const request&>::value, int>::type = 0)
+                {
+                    handler_ = (
+#ifdef CROW_CAN_USE_CPP14
+                      [f = std::move(f)]
+#else
+                      [f]
+#endif
+                      (const request&, response& res, Args... args) {
+                          res = response(f(args...));
+                          res.end();
+                      });
+                }
+
+                template<typename Req, typename... Args>
+                struct req_handler_wrapper
+                {
+                    req_handler_wrapper(Func f):
+                      f(std::move(f))
+                    {
+                    }
+
+                    void operator()(const request& req, response& res, Args... args)
+                    {
+                        res = response(f(req, args...));
+                        res.end();
+                    }
+
+                    Func f;
+                };
+
+                template<typename... Args>
+                void set_(Func f, typename std::enable_if<
+                                    std::is_same<typename std::tuple_element<0, std::tuple<Args..., void>>::type, const request&>::value &&
+                                      !std::is_same<typename std::tuple_element<1, std::tuple<Args..., void, void>>::type, response&>::value,
+                                    int>::type = 0)
+                {
+                    handler_ = req_handler_wrapper<Args...>(std::move(f));
+                    /*handler_ = (
+                        [f = std::move(f)]
+                        (const request& req, response& res, Args... args){
+                             res = response(f(req, args...));
+                             res.end();
+                        });*/
+                }
+
+                template<typename... Args>
+                void set_(Func f, typename std::enable_if<
+                                    std::is_same<typename std::tuple_element<0, std::tuple<Args..., void>>::type, const request&>::value &&
+                                      std::is_same<typename std::tuple_element<1, std::tuple<Args..., void, void>>::type, response&>::value,
+                                    int>::type = 0)
+                {
+                    handler_ = std::move(f);
+                }
+
+                template<typename... Args>
+                struct handler_type_helper
+                {
+                    using type = std::function<void(const crow::request&, crow::response&, Args...)>;
+                    using args_type = black_magic::S<typename black_magic::promote_t<Args>...>;
+                };
+
+                template<typename... Args>
+                struct handler_type_helper<const request&, Args...>
+                {
+                    using type = std::function<void(const crow::request&, crow::response&, Args...)>;
+                    using args_type = black_magic::S<typename black_magic::promote_t<Args>...>;
+                };
+
+                template<typename... Args>
+                struct handler_type_helper<const request&, response&, Args...>
+                {
+                    using type = std::function<void(const crow::request&, crow::response&, Args...)>;
+                    using args_type = black_magic::S<typename black_magic::promote_t<Args>...>;
+                };
+
+                typename handler_type_helper<ArgsWrapped...>::type handler_;
+
+                void operator()(request& req, response& res, const routing_params& params)
+                {
+                    detail::routing_handler_call_helper::call<
+                      detail::routing_handler_call_helper::call_params<
+                        decltype(handler_)>,
+                      0, 0, 0, 0,
+                      typename handler_type_helper<ArgsWrapped...>::args_type,
+                      black_magic::S<>>()(
+                      detail::routing_handler_call_helper::call_params<
+                        decltype(handler_)>{handler_, params, req, res});
+                }
+            };
+
+        } // namespace routing_handler_call_helper
+    }     // namespace detail
+
+
+    class CatchallRule
+    {
+    public:
+        /// @cond SKIP
+        CatchallRule() {}
+
+        template<typename Func>
+        typename std::enable_if<black_magic::CallHelper<Func, black_magic::S<>>::value, void>::type
+          operator()(Func&& f)
+        {
+            static_assert(!std::is_same<void, decltype(f())>::value,
+                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
+
+            handler_ = (
+#ifdef CROW_CAN_USE_CPP14
+              [f = std::move(f)]
+#else
+              [f]
+#endif
+              (const request&, response& res) {
+                  res = response(f());
+                  res.end();
+              });
+        }
+
+        template<typename Func>
+        typename std::enable_if<
+          !black_magic::CallHelper<Func, black_magic::S<>>::value &&
+            black_magic::CallHelper<Func, black_magic::S<crow::request>>::value,
+          void>::type
+          operator()(Func&& f)
+        {
+            static_assert(!std::is_same<void, decltype(f(std::declval<crow::request>()))>::value,
+                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
+
+            handler_ = (
+#ifdef CROW_CAN_USE_CPP14
+              [f = std::move(f)]
+#else
+              [f]
+#endif
+              (const crow::request& req, crow::response& res) {
+                  res = response(f(req));
+                  res.end();
+              });
+        }
+
+        template<typename Func>
+        typename std::enable_if<
+          !black_magic::CallHelper<Func, black_magic::S<>>::value &&
+            !black_magic::CallHelper<Func, black_magic::S<crow::request>>::value &&
+            black_magic::CallHelper<Func, black_magic::S<crow::response&>>::value,
+          void>::type
+          operator()(Func&& f)
+        {
+            static_assert(std::is_same<void, decltype(f(std::declval<crow::response&>()))>::value,
+                          "Handler function with response argument should have void return type");
+            handler_ = (
+#ifdef CROW_CAN_USE_CPP14
+              [f = std::move(f)]
+#else
+              [f]
+#endif
+              (const crow::request&, crow::response& res) {
+                  f(res);
+              });
+        }
+
+        template<typename Func>
+        typename std::enable_if<
+          !black_magic::CallHelper<Func, black_magic::S<>>::value &&
+            !black_magic::CallHelper<Func, black_magic::S<crow::request>>::value &&
+            !black_magic::CallHelper<Func, black_magic::S<crow::response&>>::value,
+          void>::type
+          operator()(Func&& f)
+        {
+            static_assert(std::is_same<void, decltype(f(std::declval<crow::request>(), std::declval<crow::response&>()))>::value,
+                          "Handler function with response argument should have void return type");
+
+            handler_ = std::move(f);
+        }
+        /// @endcond
+        bool has_handler()
+        {
+            return (handler_ != nullptr);
+        }
+
+    protected:
+        friend class Router;
+
+    private:
+        std::function<void(const crow::request&, crow::response&)> handler_;
+    };
+
+
+    /// A rule dealing with websockets.
+
+    ///
+    /// Provides the interface for the user to put in the necessary handlers for a websocket to work.
+    template<typename App>
+    class WebSocketRule : public BaseRule
+    {
+        using self_t = WebSocketRule;
+
+    public:
+        WebSocketRule(std::string rule, App* app):
+          BaseRule(std::move(rule)),
+          app_(app),
+          max_payload_(UINT64_MAX)
+        {}
+
+        void validate() override
+        {}
+
+        void handle(request&, response& res, const routing_params&) override
+        {
+            res = response(404);
+            res.end();
+        }
+
+        void handle_upgrade(const request& req, response&, SocketAdaptor&& adaptor) override
+        {
+            max_payload_ = max_payload_override_ ? max_payload_ : app_->websocket_max_payload();
+            new crow::websocket::Connection<SocketAdaptor, App>(req, std::move(adaptor), app_, max_payload_, open_handler_, message_handler_, close_handler_, error_handler_, accept_handler_);
+        }
+#ifdef CROW_ENABLE_SSL
+        void handle_upgrade(const request& req, response&, SSLAdaptor&& adaptor) override
+        {
+            new crow::websocket::Connection<SSLAdaptor, App>(req, std::move(adaptor), app_, max_payload_, open_handler_, message_handler_, close_handler_, error_handler_, accept_handler_);
+        }
+#endif
+
+        /// Override the global payload limit for this single WebSocket rule
+        self_t& max_payload(uint64_t max_payload)
+        {
+            max_payload_ = max_payload;
+            max_payload_override_ = true;
+            return *this;
+        }
+
+        template<typename Func>
+        self_t& onopen(Func f)
+        {
+            open_handler_ = f;
+            return *this;
+        }
+
+        template<typename Func>
+        self_t& onmessage(Func f)
+        {
+            message_handler_ = f;
+            return *this;
+        }
+
+        template<typename Func>
+        self_t& onclose(Func f)
+        {
+            close_handler_ = f;
+            return *this;
+        }
+
+        template<typename Func>
+        self_t& onerror(Func f)
+        {
+            error_handler_ = f;
+            return *this;
+        }
+
+        template<typename Func>
+        self_t& onaccept(Func f)
+        {
+            accept_handler_ = f;
+            return *this;
+        }
+
+    protected:
+        App* app_;
+        std::function<void(crow::websocket::connection&)> open_handler_;
+        std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler_;
+        std::function<void(crow::websocket::connection&, const std::string&)> close_handler_;
+        std::function<void(crow::websocket::connection&, const std::string&)> error_handler_;
+        std::function<bool(const crow::request&, void**)> accept_handler_;
+        uint64_t max_payload_;
+        bool max_payload_override_ = false;
+    };
+
+    /// Allows the user to assign parameters using functions.
+
+    ///
+    /// `rule.name("name").methods(HTTPMethod::POST)`
+    template<typename T>
+    struct RuleParameterTraits
+    {
+        using self_t = T;
+
+        template<typename App>
+        WebSocketRule<App>& websocket(App* app)
+        {
+            auto p = new WebSocketRule<App>(static_cast<self_t*>(this)->rule_, app);
+            static_cast<self_t*>(this)->rule_to_upgrade_.reset(p);
+            return *p;
+        }
+
+        self_t& name(std::string name) noexcept
+        {
+            static_cast<self_t*>(this)->name_ = std::move(name);
+            return static_cast<self_t&>(*this);
+        }
+
+        self_t& methods(HTTPMethod method)
+        {
+            static_cast<self_t*>(this)->methods_ = 1 << static_cast<int>(method);
+            return static_cast<self_t&>(*this);
+        }
+
+        template<typename... MethodArgs>
+        self_t& methods(HTTPMethod method, MethodArgs... args_method)
+        {
+            methods(args_method...);
+            static_cast<self_t*>(this)->methods_ |= 1 << static_cast<int>(method);
+            return static_cast<self_t&>(*this);
+        }
+
+        /// Enable local middleware for this handler
+        template<typename App, typename... Middlewares>
+        self_t& middlewares()
+        {
+            static_cast<self_t*>(this)->mw_indices_.template push<App, Middlewares...>();
+            return static_cast<self_t&>(*this);
+        }
+    };
+
+    /// A rule that can change its parameters during runtime.
+    class DynamicRule : public BaseRule, public RuleParameterTraits<DynamicRule>
+    {
+    public:
+        DynamicRule(std::string rule):
+          BaseRule(std::move(rule))
+        {}
+
+        void validate() override
+        {
+            if (!erased_handler_)
+            {
+                throw std::runtime_error(name_ + (!name_.empty() ? ": " : "") + "no handler for url " + rule_);
+            }
+        }
+
+        void handle(request& req, response& res, const routing_params& params) override
+        {
+            if (!custom_templates_base.empty())
+                mustache::set_base(custom_templates_base);
+            else if (mustache::detail::get_template_base_directory_ref() != "templates")
+                mustache::set_base("templates");
+            erased_handler_(req, res, params);
+        }
+
+        template<typename Func>
+        void operator()(Func f)
+        {
+#ifdef CROW_MSVC_WORKAROUND
+            using function_t = utility::function_traits<decltype(&Func::operator())>;
+#else
+            using function_t = utility::function_traits<Func>;
+#endif
+            erased_handler_ = wrap(std::move(f), black_magic::gen_seq<function_t::arity>());
+        }
+
+        // enable_if Arg1 == request && Arg2 == response
+        // enable_if Arg1 == request && Arg2 != resposne
+        // enable_if Arg1 != request
+#ifdef CROW_MSVC_WORKAROUND
+        template<typename Func, size_t... Indices>
+#else
+        template<typename Func, unsigned... Indices>
+#endif
+        std::function<void(request&, response&, const routing_params&)>
+          wrap(Func f, black_magic::seq<Indices...>)
+        {
+#ifdef CROW_MSVC_WORKAROUND
+            using function_t = utility::function_traits<decltype(&Func::operator())>;
+#else
+            using function_t = utility::function_traits<Func>;
+#endif
+            if (!black_magic::is_parameter_tag_compatible(
+                  black_magic::get_parameter_tag_runtime(rule_.c_str()),
+                  black_magic::compute_parameter_tag_from_args_list<
+                    typename function_t::template arg<Indices>...>::value))
+            {
+                throw std::runtime_error("route_dynamic: Handler type is mismatched with URL parameters: " + rule_);
+            }
+            auto ret = detail::routing_handler_call_helper::Wrapped<Func, typename function_t::template arg<Indices>...>();
+            ret.template set_<
+              typename function_t::template arg<Indices>...>(std::move(f));
+            return ret;
+        }
+
+        template<typename Func>
+        void operator()(std::string name, Func&& f)
+        {
+            name_ = std::move(name);
+            (*this).template operator()<Func>(std::forward(f));
+        }
+
+    private:
+        std::function<void(request&, response&, const routing_params&)> erased_handler_;
+    };
+
+    /// Default rule created when CROW_ROUTE is called.
+    template<typename... Args>
+    class TaggedRule : public BaseRule, public RuleParameterTraits<TaggedRule<Args...>>
+    {
+    public:
+        using self_t = TaggedRule<Args...>;
+
+        TaggedRule(std::string rule):
+          BaseRule(std::move(rule))
+        {}
+
+        void validate() override
+        {
+            if (rule_.at(0) != '/')
+                throw std::runtime_error("Internal error: Routes must start with a '/'");
+
+            if (!handler_)
+            {
+                throw std::runtime_error(name_ + (!name_.empty() ? ": " : "") + "no handler for url " + rule_);
+            }
+        }
+
+        template<typename Func>
+        void operator()(Func&& f)
+        {
+            handler_ = (
+#ifdef CROW_CAN_USE_CPP14
+              [f = std::move(f)]
+#else
+              [f]
+#endif
+              (crow::request& req, crow::response& res, Args... args) {
+                  detail::wrapped_handler_call(req, res, f, std::forward<Args>(args)...);
+              });
+        }
+
+        template<typename Func>
+        void operator()(std::string name, Func&& f)
+        {
+            name_ = std::move(name);
+            (*this).template operator()<Func>(std::forward(f));
+        }
+
+        void handle(request& req, response& res, const routing_params& params) override
+        {
+            if (!custom_templates_base.empty())
+                mustache::set_base(custom_templates_base);
+            else if (mustache::detail::get_template_base_directory_ref() != mustache::detail::get_global_template_base_directory_ref())
+                mustache::set_base(mustache::detail::get_global_template_base_directory_ref());
+
+            detail::routing_handler_call_helper::call<
+              detail::routing_handler_call_helper::call_params<decltype(handler_)>,
+              0, 0, 0, 0,
+              black_magic::S<Args...>,
+              black_magic::S<>>()(
+              detail::routing_handler_call_helper::call_params<decltype(handler_)>{handler_, params, req, res});
+        }
+
+    private:
+        std::function<void(crow::request&, crow::response&, Args...)> handler_;
+    };
+
+    const int RULE_SPECIAL_REDIRECT_SLASH = 1;
+
+
+    /// A search tree.
+    class Trie
+    {
+    public:
+        struct Node
+        {
+            uint16_t rule_index{};
+            // Assign the index to the maximum 32 unsigned integer value by default so that any other number (specifically 0) is a valid BP id.
+            uint16_t blueprint_index{INVALID_BP_ID};
+            std::string key;
+            ParamType param = ParamType::MAX; // MAX = No param.
+            std::vector<Node> children;
+
+            bool IsSimpleNode() const
+            {
+                return !rule_index &&
+                       blueprint_index == INVALID_BP_ID &&
+                       children.size() < 2 &&
+                       param == ParamType::MAX &&
+                       std::all_of(std::begin(children), std::end(children), [](const Node& x) {
+                           return x.param == ParamType::MAX;
+                       });
+            }
+
+            Node& add_child_node()
+            {
+                children.emplace_back();
+                return children.back();
+            }
+        };
+
+
+        Trie()
+        {}
+
+        /// Check whether or not the trie is empty.
+        bool is_empty()
+        {
+            return head_.children.empty();
+        }
+
+        void optimize()
+        {
+            for (auto& child : head_.children)
+            {
+                optimizeNode(child);
+            }
+        }
+
+
+    private:
+        void optimizeNode(Node& node)
+        {
+            if (node.children.empty())
+                return;
+            if (node.IsSimpleNode())
+            {
+                auto children_temp = std::move(node.children);
+                auto& child_temp = children_temp[0];
+                node.key += child_temp.key;
+                node.rule_index = child_temp.rule_index;
+                node.blueprint_index = child_temp.blueprint_index;
+                node.children = std::move(child_temp.children);
+                optimizeNode(node);
+            }
+            else
+            {
+                for (auto& child : node.children)
+                {
+                    optimizeNode(child);
+                }
+            }
+        }
+
+        void debug_node_print(const Node& node, int level)
+        {
+            if (node.param != ParamType::MAX)
+            {
+                switch (node.param)
+                {
+                    case ParamType::INT:
+                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
+                                       << "<int>";
+                        break;
+                    case ParamType::UINT:
+                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
+                                       << "<uint>";
+                        break;
+                    case ParamType::DOUBLE:
+                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
+                                       << "<double>";
+                        break;
+                    case ParamType::STRING:
+                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
+                                       << "<string>";
+                        break;
+                    case ParamType::PATH:
+                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
+                                       << "<path>";
+                        break;
+                    default:
+                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
+                                       << "<ERROR>";
+                        break;
+                }
+            }
+            else
+                CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� " << node.key;
+
+            for (const auto& child : node.children)
+            {
+                debug_node_print(child, level + 1);
+            }
+        }
+
+    public:
+        void debug_print()
+        {
+            CROW_LOG_DEBUG << "└➙ ROOT";
+            for (const auto& child : head_.children)
+                debug_node_print(child, 1);
+        }
+
+        void validate()
+        {
+            if (!head_.IsSimpleNode())
+                throw std::runtime_error("Internal error: Trie header should be simple!");
+            optimize();
+        }
+
+        //Rule_index, Blueprint_index, routing_params
+        routing_handle_result find(const std::string& req_url, const Node& node, unsigned pos = 0, routing_params* params = nullptr, std::vector<uint16_t>* blueprints = nullptr) const
+        {
+            //start params as an empty struct
+            routing_params empty;
+            if (params == nullptr)
+                params = &empty;
+            //same for blueprint vector
+            std::vector<uint16_t> MT;
+            if (blueprints == nullptr)
+                blueprints = &MT;
+
+            uint16_t found{};               //The rule index to be found
+            std::vector<uint16_t> found_BP; //The Blueprint indices to be found
+            routing_params match_params;    //supposedly the final matched parameters
+
+            auto update_found = [&found, &found_BP, &match_params](routing_handle_result& ret) {
+                found_BP = std::move(ret.blueprint_indices);
+                if (ret.rule_index && (!found || found > ret.rule_index))
+                {
+                    found = ret.rule_index;
+                    match_params = std::move(ret.r_params);
+                }
+            };
+
+            //if the function was called on a node at the end of the string (the last recursion), return the nodes rule index, and whatever params were passed to the function
+            if (pos == req_url.size())
+            {
+                found_BP = std::move(*blueprints);
+                return routing_handle_result{node.rule_index, *blueprints, *params};
+            }
+
+            bool found_fragment = false;
+
+            for (const auto& child : node.children)
+            {
+                if (child.param != ParamType::MAX)
+                {
+                    if (child.param == ParamType::INT)
+                    {
+                        char c = req_url[pos];
+                        if ((c >= '0' && c <= '9') || c == '+' || c == '-')
+                        {
+                            char* eptr;
+                            errno = 0;
+                            long long int value = strtoll(req_url.data() + pos, &eptr, 10);
+                            if (errno != ERANGE && eptr != req_url.data() + pos)
+                            {
+                                found_fragment = true;
+                                params->int_params.push_back(value);
+                                if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
+                                auto ret = find(req_url, child, eptr - req_url.data(), params, blueprints);
+                                update_found(ret);
+                                params->int_params.pop_back();
+                                if (!blueprints->empty()) blueprints->pop_back();
+                            }
+                        }
+                    }
+
+                    else if (child.param == ParamType::UINT)
+                    {
+                        char c = req_url[pos];
+                        if ((c >= '0' && c <= '9') || c == '+')
+                        {
+                            char* eptr;
+                            errno = 0;
+                            unsigned long long int value = strtoull(req_url.data() + pos, &eptr, 10);
+                            if (errno != ERANGE && eptr != req_url.data() + pos)
+                            {
+                                found_fragment = true;
+                                params->uint_params.push_back(value);
+                                if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
+                                auto ret = find(req_url, child, eptr - req_url.data(), params, blueprints);
+                                update_found(ret);
+                                params->uint_params.pop_back();
+                                if (!blueprints->empty()) blueprints->pop_back();
+                            }
+                        }
+                    }
+
+                    else if (child.param == ParamType::DOUBLE)
+                    {
+                        char c = req_url[pos];
+                        if ((c >= '0' && c <= '9') || c == '+' || c == '-' || c == '.')
+                        {
+                            char* eptr;
+                            errno = 0;
+                            double value = strtod(req_url.data() + pos, &eptr);
+                            if (errno != ERANGE && eptr != req_url.data() + pos)
+                            {
+                                found_fragment = true;
+                                params->double_params.push_back(value);
+                                if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
+                                auto ret = find(req_url, child, eptr - req_url.data(), params, blueprints);
+                                update_found(ret);
+                                params->double_params.pop_back();
+                                if (!blueprints->empty()) blueprints->pop_back();
+                            }
+                        }
+                    }
+
+                    else if (child.param == ParamType::STRING)
+                    {
+                        size_t epos = pos;
+                        for (; epos < req_url.size(); epos++)
+                        {
+                            if (req_url[epos] == '/')
+                                break;
+                        }
+
+                        if (epos != pos)
+                        {
+                            found_fragment = true;
+                            params->string_params.push_back(req_url.substr(pos, epos - pos));
+                            if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
+                            auto ret = find(req_url, child, epos, params, blueprints);
+                            update_found(ret);
+                            params->string_params.pop_back();
+                            if (!blueprints->empty()) blueprints->pop_back();
+                        }
+                    }
+
+                    else if (child.param == ParamType::PATH)
+                    {
+                        size_t epos = req_url.size();
+
+                        if (epos != pos)
+                        {
+                            found_fragment = true;
+                            params->string_params.push_back(req_url.substr(pos, epos - pos));
+                            if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
+                            auto ret = find(req_url, child, epos, params, blueprints);
+                            update_found(ret);
+                            params->string_params.pop_back();
+                            if (!blueprints->empty()) blueprints->pop_back();
+                        }
+                    }
+                }
+
+                else
+                {
+                    const std::string& fragment = child.key;
+                    if (req_url.compare(pos, fragment.size(), fragment) == 0)
+                    {
+                        found_fragment = true;
+                        if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
+                        auto ret = find(req_url, child, pos + fragment.size(), params, blueprints);
+                        update_found(ret);
+                        if (!blueprints->empty()) blueprints->pop_back();
+                    }
+                }
+            }
+
+            if (!found_fragment)
+                found_BP = std::move(*blueprints);
+
+            return routing_handle_result{found, found_BP, match_params}; //Called after all the recursions have been done
+        }
+
+        routing_handle_result find(const std::string& req_url) const
+        {
+            return find(req_url, head_);
+        }
+
+        //This functions assumes any blueprint info passed is valid
+        void add(const std::string& url, uint16_t rule_index, unsigned bp_prefix_length = 0, uint16_t blueprint_index = INVALID_BP_ID)
+        {
+            auto idx = &head_;
+
+            bool has_blueprint = bp_prefix_length != 0 && blueprint_index != INVALID_BP_ID;
+
+            for (unsigned i = 0; i < url.size(); i++)
+            {
+                char c = url[i];
+                if (c == '<')
+                {
+                    static struct ParamTraits
+                    {
+                        ParamType type;
+                        std::string name;
+                    } paramTraits[] =
+                      {
+                        {ParamType::INT, "<int>"},
+                        {ParamType::UINT, "<uint>"},
+                        {ParamType::DOUBLE, "<float>"},
+                        {ParamType::DOUBLE, "<double>"},
+                        {ParamType::STRING, "<str>"},
+                        {ParamType::STRING, "<string>"},
+                        {ParamType::PATH, "<path>"},
+                      };
+
+                    for (const auto& x : paramTraits)
+                    {
+                        if (url.compare(i, x.name.size(), x.name) == 0)
+                        {
+                            bool found = false;
+                            for (auto& child : idx->children)
+                            {
+                                if (child.param == x.type)
+                                {
+                                    idx = &child;
+                                    i += x.name.size();
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            if (found)
+                                break;
+
+                            auto new_node_idx = &idx->add_child_node();
+                            new_node_idx->param = x.type;
+                            idx = new_node_idx;
+                            i += x.name.size();
+                            break;
+                        }
+                    }
+
+                    i--;
+                }
+                else
+                {
+                    //This part assumes the tree is unoptimized (every node has a max 1 character key)
+                    bool piece_found = false;
+                    for (auto& child : idx->children)
+                    {
+                        if (child.key[0] == c)
+                        {
+                            idx = &child;
+                            piece_found = true;
+                            break;
+                        }
+                    }
+                    if (!piece_found)
+                    {
+                        auto new_node_idx = &idx->add_child_node();
+                        new_node_idx->key = c;
+                        //The assumption here is that you'd only need to add a blueprint index if the tree didn't have the BP prefix.
+                        if (has_blueprint && i == bp_prefix_length)
+                            new_node_idx->blueprint_index = blueprint_index;
+                        idx = new_node_idx;
+                    }
+                }
+            }
+
+            //check if the last node already has a value (exact url already in Trie)
+            if (idx->rule_index)
+                throw std::runtime_error("handler already exists for " + url);
+            idx->rule_index = rule_index;
+        }
+
+    private:
+        Node head_;
+    };
+
+    /// A blueprint can be considered a smaller section of a Crow app, specifically where the router is conecerned.
+
+    ///
+    /// You can use blueprints to assign a common prefix to rules' prefix, set custom static and template folders, and set a custom catchall route.
+    /// You can also assign nest blueprints for maximum Compartmentalization.
+    class Blueprint
+    {
+    public:
+        Blueprint(const std::string& prefix):
+          prefix_(prefix){};
+
+        Blueprint(const std::string& prefix, const std::string& static_dir):
+          prefix_(prefix), static_dir_(static_dir){};
+
+        Blueprint(const std::string& prefix, const std::string& static_dir, const std::string& templates_dir):
+          prefix_(prefix), static_dir_(static_dir), templates_dir_(templates_dir){};
+
+        /*
+        Blueprint(Blueprint& other)
+        {
+            prefix_ = std::move(other.prefix_);
+            all_rules_ = std::move(other.all_rules_);
+        }
+
+        Blueprint(const Blueprint& other)
+        {
+            prefix_ = other.prefix_;
+            all_rules_ = other.all_rules_;
+        }
+*/
+        Blueprint(Blueprint&& value)
+        {
+            *this = std::move(value);
+        }
+
+        Blueprint& operator=(const Blueprint& value) = delete;
+
+        Blueprint& operator=(Blueprint&& value) noexcept
+        {
+            prefix_ = std::move(value.prefix_);
+            static_dir_ = std::move(value.static_dir_);
+            templates_dir_ = std::move(value.templates_dir_);
+            all_rules_ = std::move(value.all_rules_);
+            catchall_rule_ = std::move(value.catchall_rule_);
+            blueprints_ = std::move(value.blueprints_);
+            mw_indices_ = std::move(value.mw_indices_);
+            return *this;
+        }
+
+        bool operator==(const Blueprint& value)
+        {
+            return value.prefix() == prefix_;
+        }
+
+        bool operator!=(const Blueprint& value)
+        {
+            return value.prefix() != prefix_;
+        }
+
+        std::string prefix() const
+        {
+            return prefix_;
+        }
+
+        std::string static_dir() const
+        {
+            return static_dir_;
+        }
+
+        void set_added() {
+            added_ = true;
+        }
+
+        bool is_added() {
+            return added_;
+        }
+
+        DynamicRule& new_rule_dynamic(const std::string& rule)
+        {
+            std::string new_rule = '/' + prefix_ + rule;
+            auto ruleObject = new DynamicRule(std::move(new_rule));
+            ruleObject->custom_templates_base = templates_dir_;
+            all_rules_.emplace_back(ruleObject);
+
+            return *ruleObject;
+        }
+
+        template<uint64_t N>
+        typename black_magic::arguments<N>::type::template rebind<TaggedRule>& new_rule_tagged(const std::string& rule)
+        {
+            std::string new_rule = '/' + prefix_ + rule;
+            using RuleT = typename black_magic::arguments<N>::type::template rebind<TaggedRule>;
+
+            auto ruleObject = new RuleT(std::move(new_rule));
+            ruleObject->custom_templates_base = templates_dir_;
+            all_rules_.emplace_back(ruleObject);
+
+            return *ruleObject;
+        }
+
+        void register_blueprint(Blueprint& blueprint)
+        {
+            if (blueprints_.empty() || std::find(blueprints_.begin(), blueprints_.end(), &blueprint) == blueprints_.end())
+            {
+                apply_blueprint(blueprint);
+                blueprints_.emplace_back(&blueprint);
+            }
+            else
+                throw std::runtime_error("blueprint \"" + blueprint.prefix_ + "\" already exists in blueprint \"" + prefix_ + '\"');
+        }
+
+
+        CatchallRule& catchall_rule()
+        {
+            return catchall_rule_;
+        }
+
+        template<typename App, typename... Middlewares>
+        void middlewares()
+        {
+            mw_indices_.push<App, Middlewares...>();
+        }
+
+    private:
+        void apply_blueprint(Blueprint& blueprint)
+        {
+
+            blueprint.prefix_ = prefix_ + '/' + blueprint.prefix_;
+            blueprint.static_dir_ = static_dir_ + '/' + blueprint.static_dir_;
+            blueprint.templates_dir_ = templates_dir_ + '/' + blueprint.templates_dir_;
+            for (auto& rule : blueprint.all_rules_)
+            {
+                std::string new_rule = '/' + prefix_ + rule->rule_;
+                rule->rule_ = new_rule;
+            }
+            for (Blueprint* bp_child : blueprint.blueprints_)
+            {
+                Blueprint& bp_ref = *bp_child;
+                apply_blueprint(bp_ref);
+            }
+        }
+
+        std::string prefix_;
+        std::string static_dir_;
+        std::string templates_dir_;
+        std::vector<std::unique_ptr<BaseRule>> all_rules_;
+        CatchallRule catchall_rule_;
+        std::vector<Blueprint*> blueprints_;
+        detail::middleware_indices mw_indices_;
+        bool added_{false};
+
+        friend class Router;
+    };
+
+    /// Handles matching requests to existing rules and upgrade requests.
+    class Router
+    {
+    public:
+        Router()
+        {}
+
+        DynamicRule& new_rule_dynamic(const std::string& rule)
+        {
+            auto ruleObject = new DynamicRule(rule);
+            all_rules_.emplace_back(ruleObject);
+
+            return *ruleObject;
+        }
+
+        template<uint64_t N>
+        typename black_magic::arguments<N>::type::template rebind<TaggedRule>& new_rule_tagged(const std::string& rule)
+        {
+            using RuleT = typename black_magic::arguments<N>::type::template rebind<TaggedRule>;
+
+            auto ruleObject = new RuleT(rule);
+            all_rules_.emplace_back(ruleObject);
+
+            return *ruleObject;
+        }
+
+        CatchallRule& catchall_rule()
+        {
+            return catchall_rule_;
+        }
+
+        void internal_add_rule_object(const std::string& rule, BaseRule* ruleObject)
+        {
+            internal_add_rule_object(rule, ruleObject, INVALID_BP_ID, blueprints_);
+        }
+
+        void internal_add_rule_object(const std::string& rule, BaseRule* ruleObject, const uint16_t& BP_index, std::vector<Blueprint*>& blueprints)
+        {
+            bool has_trailing_slash = false;
+            std::string rule_without_trailing_slash;
+            if (rule.size() > 1 && rule.back() == '/')
+            {
+                has_trailing_slash = true;
+                rule_without_trailing_slash = rule;
+                rule_without_trailing_slash.pop_back();
+            }
+
+            ruleObject->mw_indices_.pack();
+
+            ruleObject->foreach_method([&](int method) {
+                per_methods_[method].rules.emplace_back(ruleObject);
+                per_methods_[method].trie.add(rule, per_methods_[method].rules.size() - 1, BP_index != INVALID_BP_ID ? blueprints[BP_index]->prefix().length() : 0, BP_index);
+
+                // directory case:
+                //   request to '/about' url matches '/about/' rule
+                if (has_trailing_slash)
+                {
+                    per_methods_[method].trie.add(rule_without_trailing_slash, RULE_SPECIAL_REDIRECT_SLASH, BP_index != INVALID_BP_ID ? blueprints[BP_index]->prefix().length() : 0, BP_index);
+                }
+            });
+
+            ruleObject->set_added();
+        }
+
+        void register_blueprint(Blueprint& blueprint)
+        {
+            if (std::find(blueprints_.begin(), blueprints_.end(), &blueprint) == blueprints_.end())
+            {
+                blueprints_.emplace_back(&blueprint);
+            }
+            else
+                throw std::runtime_error("blueprint \"" + blueprint.prefix_ + "\" already exists in router");
+        }
+
+        void get_recursive_child_methods(Blueprint* blueprint, std::vector<HTTPMethod>& methods)
+        {
+            //we only need to deal with children if the blueprint has absolutely no methods (meaning its index won't be added to the trie)
+            if (blueprint->static_dir_.empty() && blueprint->all_rules_.empty())
+            {
+                for (Blueprint* bp : blueprint->blueprints_)
+                {
+                    get_recursive_child_methods(bp, methods);
+                }
+            }
+            else if (!blueprint->static_dir_.empty())
+                methods.emplace_back(HTTPMethod::Get);
+            for (auto& rule : blueprint->all_rules_)
+            {
+                rule->foreach_method([&methods](unsigned method) {
+                    HTTPMethod method_final = static_cast<HTTPMethod>(method);
+                    if (std::find(methods.begin(), methods.end(), method_final) == methods.end())
+                        methods.emplace_back(method_final);
+                });
+            }
+        }
+
+        void validate_bp() {
+            //Take all the routes from the registered blueprints and add them to `all_rules_` to be processed.
+            detail::middleware_indices blueprint_mw;
+            validate_bp(blueprints_, blueprint_mw);
+        }
+
+        void validate_bp(std::vector<Blueprint*> blueprints, detail::middleware_indices& current_mw)
+        {
+            for (unsigned i = 0; i < blueprints.size(); i++)
+            {
+                Blueprint* blueprint = blueprints[i];
+
+                if (blueprint->is_added()) continue;
+
+                if (blueprint->static_dir_ == "" && blueprint->all_rules_.empty())
+                {
+                    std::vector<HTTPMethod> methods;
+                    get_recursive_child_methods(blueprint, methods);
+                    for (HTTPMethod x : methods)
+                    {
+                        int i = static_cast<int>(x);
+                        per_methods_[i].trie.add(blueprint->prefix(), 0, blueprint->prefix().length(), i);
+                    }
+                }
+
+                current_mw.merge_back(blueprint->mw_indices_);
+                for (auto& rule : blueprint->all_rules_)
+                {
+                    if (rule && !rule->is_added())
+                    {
+                        auto upgraded = rule->upgrade();
+                        if (upgraded)
+                            rule = std::move(upgraded);
+                        rule->validate();
+                        rule->mw_indices_.merge_front(current_mw);
+                        internal_add_rule_object(rule->rule(), rule.get(), i, blueprints);
+                    }
+                }
+                validate_bp(blueprint->blueprints_, current_mw);
+                current_mw.pop_back(blueprint->mw_indices_);
+                blueprint->set_added();
+            }
+        }
+
+        void validate()
+        {
+            for (auto& rule : all_rules_)
+            {
+                if (rule && !rule->is_added())
+                {
+                    auto upgraded = rule->upgrade();
+                    if (upgraded)
+                        rule = std::move(upgraded);
+                    rule->validate();
+                    internal_add_rule_object(rule->rule(), rule.get());
+                }
+            }
+            for (auto& per_method : per_methods_)
+            {
+                per_method.trie.validate();
+            }
+        }
+
+        // TODO maybe add actual_method
+        template<typename Adaptor>
+        void handle_upgrade(const request& req, response& res, Adaptor&& adaptor)
+        {
+            if (req.method >= HTTPMethod::InternalMethodCount)
+                return;
+
+            auto& per_method = per_methods_[static_cast<int>(req.method)];
+            auto& rules = per_method.rules;
+            unsigned rule_index = per_method.trie.find(req.url).rule_index;
+
+            if (!rule_index)
+            {
+                for (auto& per_method : per_methods_)
+                {
+                    if (per_method.trie.find(req.url).rule_index)
+                    {
+                        CROW_LOG_DEBUG << "Cannot match method " << req.url << " " << method_name(req.method);
+                        res = response(405);
+                        res.end();
+                        return;
+                    }
+                }
+
+                CROW_LOG_INFO << "Cannot match rules " << req.url;
+                res = response(404);
+                res.end();
+                return;
+            }
+
+            if (rule_index >= rules.size())
+                throw std::runtime_error("Trie internal structure corrupted!");
+
+            if (rule_index == RULE_SPECIAL_REDIRECT_SLASH)
+            {
+                CROW_LOG_INFO << "Redirecting to a url with trailing slash: " << req.url;
+                res = response(301);
+
+                // TODO(ipkn) absolute url building
+                if (req.get_header_value("Host").empty())
+                {
+                    res.add_header("Location", req.url + "/");
+                }
+                else
+                {
+                    res.add_header("Location", "http://" + req.get_header_value("Host") + req.url + "/");
+                }
+                res.end();
+                return;
+            }
+
+            CROW_LOG_DEBUG << "Matched rule (upgrade) '" << rules[rule_index]->rule_ << "' " << static_cast<uint32_t>(req.method) << " / " << rules[rule_index]->get_methods();
+
+            try
+            {
+                rules[rule_index]->handle_upgrade(req, res, std::move(adaptor));
+            }
+            catch (...)
+            {
+                exception_handler_(res);
+                res.end();
+                return;
+            }
+        }
+
+        void get_found_bp(std::vector<uint16_t>& bp_i, std::vector<Blueprint*>& blueprints, std::vector<Blueprint*>& found_bps, uint16_t index = 0)
+        {
+            // This statement makes 3 assertions:
+            // 1. The index is above 0.
+            // 2. The index does not lie outside the given blueprint list.
+            // 3. The next blueprint we're adding has a prefix that starts the same as the already added blueprint + a slash (the rest is irrelevant).
+            //
+            // This is done to prevent a blueprint that has a prefix of "bp_prefix2" to be assumed as a child of one that has "bp_prefix".
+            //
+            // If any of the assertions is untrue, we delete the last item added, and continue using the blueprint list of the blueprint found before, the topmost being the router's list
+            auto verify_prefix = [&bp_i, &index, &blueprints, &found_bps]() {
+                return index > 0 &&
+                       bp_i[index] < blueprints.size() &&
+                       blueprints[bp_i[index]]->prefix().substr(0, found_bps[index - 1]->prefix().length() + 1).compare(std::string(found_bps[index - 1]->prefix() + '/')) == 0;
+            };
+            if (index < bp_i.size())
+            {
+
+                if (verify_prefix())
+                {
+                    found_bps.push_back(blueprints[bp_i[index]]);
+                    get_found_bp(bp_i, found_bps.back()->blueprints_, found_bps, ++index);
+                }
+                else
+                {
+                    if (found_bps.size() < 2)
+                    {
+                        found_bps.clear();
+                        found_bps.push_back(blueprints_[bp_i[index]]);
+                    }
+                    else
+                    {
+                        found_bps.pop_back();
+                        Blueprint* last_element = found_bps.back();
+                        found_bps.push_back(last_element->blueprints_[bp_i[index]]);
+                    }
+                    get_found_bp(bp_i, found_bps.back()->blueprints_, found_bps, ++index);
+                }
+            }
+        }
+
+        /// Is used to handle errors, you insert the error code, found route, request, and response. and it'll either call the appropriate catchall route (considering the blueprint system) and send you a status string (which is mainly used for debug messages), or just set the response code to the proper error code.
+        std::string get_error(unsigned short code, routing_handle_result& found, const request& req, response& res)
+        {
+            res.code = code;
+            std::vector<Blueprint*> bps_found;
+            get_found_bp(found.blueprint_indices, blueprints_, bps_found);
+            for (int i = bps_found.size() - 1; i > 0; i--)
+            {
+                std::vector<uint16_t> bpi = found.blueprint_indices;
+                if (bps_found[i]->catchall_rule().has_handler())
+                {
+                    try
+                    {
+                        bps_found[i]->catchall_rule().handler_(req, res);
+                    }
+                    catch (...)
+                    {
+                        exception_handler_(res);
+                    }
+#ifdef CROW_ENABLE_DEBUG
+                    return std::string("Redirected to Blueprint \"" + bps_found[i]->prefix() + "\" Catchall rule");
+#else
+                    return std::string();
+#endif
+                }
+            }
+            if (catchall_rule_.has_handler())
+            {
+                try
+                {
+                    catchall_rule_.handler_(req, res);
+                }
+                catch (...)
+                {
+                    exception_handler_(res);
+                }
+#ifdef CROW_ENABLE_DEBUG
+                return std::string("Redirected to global Catchall rule");
+#else
+                return std::string();
+#endif
+            }
+            return std::string();
+        }
+
+        std::unique_ptr<routing_handle_result> handle_initial(request& req, response& res)
+        {
+            HTTPMethod method_actual = req.method;
+
+            std::unique_ptr<routing_handle_result> found{
+              new routing_handle_result(
+                0,
+                std::vector<uint16_t>(),
+                routing_params(),
+                HTTPMethod::InternalMethodCount)}; // This is always returned to avoid a null pointer dereference.
+
+            // NOTE(EDev): This most likely will never run since the parser should handle this situation and close the connection before it gets here.
+            if (CROW_UNLIKELY(req.method >= HTTPMethod::InternalMethodCount))
+                return found;
+            else if (req.method == HTTPMethod::Head)
+            {
+                *found = per_methods_[static_cast<int>(method_actual)].trie.find(req.url);
+                // support HEAD requests using GET if not defined as method for the requested URL
+                if (!found->rule_index)
+                {
+                    method_actual = HTTPMethod::Get;
+                    *found = per_methods_[static_cast<int>(method_actual)].trie.find(req.url);
+                    if (!found->rule_index) // If a route is still not found, return a 404 without executing the rest of the HEAD specific code.
+                    {
+                        CROW_LOG_DEBUG << "Cannot match rules " << req.url;
+                        res = response(404); //TODO(EDev): Should this redirect to catchall?
+                        res.end();
+                        return found;
+                    }
+                }
+
+                res.skip_body = true;
+                found->method = method_actual;
+                return found;
+            }
+            else if (req.method == HTTPMethod::Options)
+            {
+                std::string allow = "OPTIONS, HEAD, ";
+
+                if (req.url == "/*")
+                {
+                    for (int i = 0; i < static_cast<int>(HTTPMethod::InternalMethodCount); i++)
+                    {
+                        if (static_cast<int>(HTTPMethod::Head) == i)
+                            continue; // HEAD is always allowed
+
+                        if (!per_methods_[i].trie.is_empty())
+                        {
+                            allow += method_name(static_cast<HTTPMethod>(i)) + ", ";
+                        }
+                    }
+                    allow = allow.substr(0, allow.size() - 2);
+                    res = response(204);
+                    res.set_header("Allow", allow);
+                    res.end();
+                    found->method = method_actual;
+                    return found;
+                }
+                else
+                {
+                    bool rules_matched = false;
+                    for (int i = 0; i < static_cast<int>(HTTPMethod::InternalMethodCount); i++)
+                    {
+                        if (per_methods_[i].trie.find(req.url).rule_index)
+                        {
+                            rules_matched = true;
+
+                            if (static_cast<int>(HTTPMethod::Head) == i)
+                                continue; // HEAD is always allowed
+
+                            allow += method_name(static_cast<HTTPMethod>(i)) + ", ";
+                        }
+                    }
+                    if (rules_matched)
+                    {
+                        allow = allow.substr(0, allow.size() - 2);
+                        res = response(204);
+                        res.set_header("Allow", allow);
+                        res.end();
+                        found->method = method_actual;
+                        return found;
+                    }
+                    else
+                    {
+                        CROW_LOG_DEBUG << "Cannot match rules " << req.url;
+                        res = response(404); //TODO(EDev): Should this redirect to catchall?
+                        res.end();
+                        return found;
+                    }
+                }
+            }
+            else // Every request that isn't a HEAD or OPTIONS request
+            {
+                *found = per_methods_[static_cast<int>(method_actual)].trie.find(req.url);
+                // TODO(EDev): maybe ending the else here would allow the requests coming from above (after removing the return statement) to be checked on whether they actually point to a route
+                if (!found->rule_index)
+                {
+                    for (auto& per_method : per_methods_)
+                    {
+                        if (per_method.trie.find(req.url).rule_index) //Route found, but in another method
+                        {
+                            const std::string error_message(get_error(405, *found, req, res));
+                            CROW_LOG_DEBUG << "Cannot match method " << req.url << " " << method_name(method_actual) << ". " << error_message;
+                            res.end();
+                            return found;
+                        }
+                    }
+                    //Route does not exist anywhere
+
+                    const std::string error_message(get_error(404, *found, req, res));
+                    CROW_LOG_DEBUG << "Cannot match rules " << req.url << ". " << error_message;
+                    res.end();
+                    return found;
+                }
+
+                found->method = method_actual;
+                return found;
+            }
+        }
+
+        template<typename App>
+        void handle(request& req, response& res, routing_handle_result found)
+        {
+            HTTPMethod method_actual = found.method;
+            auto& rules = per_methods_[static_cast<int>(method_actual)].rules;
+            unsigned rule_index = found.rule_index;
+
+            if (rule_index >= rules.size())
+                throw std::runtime_error("Trie internal structure corrupted!");
+
+            if (rule_index == RULE_SPECIAL_REDIRECT_SLASH)
+            {
+                CROW_LOG_INFO << "Redirecting to a url with trailing slash: " << req.url;
+                res = response(301);
+
+                // TODO(ipkn) absolute url building
+                if (req.get_header_value("Host").empty())
+                {
+                    res.add_header("Location", req.url + "/");
+                }
+                else
+                {
+                    res.add_header("Location", "http://" + req.get_header_value("Host") + req.url + "/");
+                }
+                res.end();
+                return;
+            }
+
+            CROW_LOG_DEBUG << "Matched rule '" << rules[rule_index]->rule_ << "' " << static_cast<uint32_t>(req.method) << " / " << rules[rule_index]->get_methods();
+
+            try
+            {
+                auto& rule = rules[rule_index];
+                handle_rule<App>(rule, req, res, found.r_params);
+            }
+            catch (...)
+            {
+                exception_handler_(res);
+                res.end();
+                return;
+            }
+        }
+
+        template<typename App>
+        typename std::enable_if<std::tuple_size<typename App::mw_container_t>::value != 0, void>::type
+          handle_rule(BaseRule* rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
+        {
+            if (!rule->mw_indices_.empty())
+            {
+                auto& ctx = *reinterpret_cast<typename App::context_t*>(req.middleware_context);
+                auto& container = *reinterpret_cast<typename App::mw_container_t*>(req.middleware_container);
+                detail::middleware_call_criteria_dynamic<false> crit_fwd(rule->mw_indices_.indices());
+
+                auto glob_completion_handler = std::move(res.complete_request_handler_);
+                res.complete_request_handler_ = [] {};
+
+                detail::middleware_call_helper<decltype(crit_fwd),
+                                               0, typename App::context_t, typename App::mw_container_t>(crit_fwd, container, req, res, ctx);
+
+                if (res.completed_)
+                {
+                    glob_completion_handler();
+                    return;
+                }
+
+                res.complete_request_handler_ = [&rule, &ctx, &container, &req, &res, glob_completion_handler] {
+                    detail::middleware_call_criteria_dynamic<true> crit_bwd(rule->mw_indices_.indices());
+
+                    detail::after_handlers_call_helper<
+                      decltype(crit_bwd),
+                      std::tuple_size<typename App::mw_container_t>::value - 1,
+                      typename App::context_t,
+                      typename App::mw_container_t>(crit_bwd, container, ctx, req, res);
+                    glob_completion_handler();
+                };
+            }
+            rule->handle(req, res, rp);
+        }
+
+        template<typename App>
+        typename std::enable_if<std::tuple_size<typename App::mw_container_t>::value == 0, void>::type
+          handle_rule(BaseRule* rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
+        {
+            rule->handle(req, res, rp);
+        }
+
+        void debug_print()
+        {
+            for (int i = 0; i < static_cast<int>(HTTPMethod::InternalMethodCount); i++)
+            {
+                Trie& trie_ = per_methods_[i].trie;
+                if (!trie_.is_empty())
+                {
+                    CROW_LOG_DEBUG << method_name(static_cast<HTTPMethod>(i));
+                    trie_.debug_print();
+                }
+            }
+        }
+
+        std::vector<Blueprint*>& blueprints()
+        {
+            return blueprints_;
+        }
+
+        std::function<void(crow::response&)>& exception_handler()
+        {
+            return exception_handler_;
+        }
+
+        static void default_exception_handler(response& res)
+        {
+            // any uncaught exceptions become 500s
+            res = response(500);
+
+            try
+            {
+                throw;
+            }
+            catch (const std::exception& e)
+            {
+                CROW_LOG_ERROR << "An uncaught exception occurred: " << e.what();
+            }
+            catch (...)
+            {
+                CROW_LOG_ERROR << "An uncaught exception occurred. The type was unknown so no information was available.";
+            }
+        }
+
+    private:
+        CatchallRule catchall_rule_;
+
+        struct PerMethod
+        {
+            std::vector<BaseRule*> rules;
+            Trie trie;
+
+            // rule index 0, 1 has special meaning; preallocate it to avoid duplication.
+            PerMethod():
+              rules(2) {}
+        };
+        std::array<PerMethod, static_cast<int>(HTTPMethod::InternalMethodCount)> per_methods_;
+        std::vector<std::unique_ptr<BaseRule>> all_rules_;
+        std::vector<Blueprint*> blueprints_;
+        std::function<void(crow::response&)> exception_handler_ = &default_exception_handler;
+    };
+} // namespace crow
+
+
+namespace crow
+{
+    struct CORSHandler;
+
+    /// Used for tuning CORS policies
+    struct CORSRules
+    {
+        friend struct crow::CORSHandler;
+
+        /// Set Access-Control-Allow-Origin. Default is "*"
+        CORSRules& origin(const std::string& origin)
+        {
+            origin_ = origin;
+            return *this;
+        }
+
+        /// Set Access-Control-Allow-Methods. Default is "*"
+        CORSRules& methods(crow::HTTPMethod method)
+        {
+            add_list_item(methods_, crow::method_name(method));
+            return *this;
+        }
+
+        /// Set Access-Control-Allow-Methods. Default is "*"
+        template<typename... Methods>
+        CORSRules& methods(crow::HTTPMethod method, Methods... method_list)
+        {
+            add_list_item(methods_, crow::method_name(method));
+            methods(method_list...);
+            return *this;
+        }
+
+        /// Set Access-Control-Allow-Headers. Default is "*"
+        CORSRules& headers(const std::string& header)
+        {
+            add_list_item(headers_, header);
+            return *this;
+        }
+
+        /// Set Access-Control-Allow-Headers. Default is "*"
+        template<typename... Headers>
+        CORSRules& headers(const std::string& header, Headers... header_list)
+        {
+            add_list_item(headers_, header);
+            headers(header_list...);
+            return *this;
+        }
+
+        /// Set Access-Control-Max-Age. Default is none
+        CORSRules& max_age(int max_age)
+        {
+            max_age_ = std::to_string(max_age);
+            return *this;
+        }
+
+        /// Enable Access-Control-Allow-Credentials
+        CORSRules& allow_credentials()
+        {
+            allow_credentials_ = true;
+            return *this;
+        }
+
+        /// Ignore CORS and don't send any headers
+        void ignore()
+        {
+            ignore_ = true;
+        }
+
+        /// Handle CORS on specific prefix path
+        CORSRules& prefix(const std::string& prefix);
+
+        /// Handle CORS for specific blueprint
+        CORSRules& blueprint(const Blueprint& bp);
+
+        /// Global CORS policy
+        CORSRules& global();
+
+    private:
+        CORSRules() = delete;
+        CORSRules(CORSHandler* handler):
+          handler_(handler) {}
+
+        /// build comma separated list
+        void add_list_item(std::string& list, const std::string& val)
+        {
+            if (list == "*") list = "";
+            if (list.size() > 0) list += ", ";
+            list += val;
+        }
+
+        /// Set header `key` to `value` if it is not set
+        void set_header_no_override(const std::string& key, const std::string& value, crow::response& res)
+        {
+            if (value.size() == 0) return;
+            if (!get_header_value(res.headers, key).empty()) return;
+            res.add_header(key, value);
+        }
+
+        /// Set response headers
+        void apply(crow::response& res)
+        {
+            if (ignore_) return;
+            set_header_no_override("Access-Control-Allow-Origin", origin_, res);
+            set_header_no_override("Access-Control-Allow-Methods", methods_, res);
+            set_header_no_override("Access-Control-Allow-Headers", headers_, res);
+            set_header_no_override("Access-Control-Max-Age", max_age_, res);
+            if (allow_credentials_) set_header_no_override("Access-Control-Allow-Credentials", "true", res);
+        }
+
+        bool ignore_ = false;
+        // TODO: support multiple origins that are dynamically selected
+        std::string origin_ = "*";
+        std::string methods_ = "*";
+        std::string headers_ = "*";
+        std::string max_age_;
+        bool allow_credentials_ = false;
+
+        CORSHandler* handler_;
+    };
+
+    /// CORSHandler is a global middleware for setting CORS headers.
+
+    ///
+    /// By default, it sets Access-Control-Allow-Origin/Methods/Headers to "*".
+    /// The default behaviour can be changed with the `global()` cors rule.
+    /// Additional rules for prexies can be added with `prefix()`.
+    struct CORSHandler
+    {
+        struct context
+        {};
+
+        void before_handle(crow::request& /*req*/, crow::response& /*res*/, context& /*ctx*/)
+        {}
+
+        void after_handle(crow::request& req, crow::response& res, context& /*ctx*/)
+        {
+            auto& rule = find_rule(req.url);
+            rule.apply(res);
+        }
+
+        /// Handle CORS on a specific prefix path
+        CORSRules& prefix(const std::string& prefix)
+        {
+            rules.emplace_back(prefix, CORSRules(this));
+            return rules.back().second;
+        }
+
+        /// Handle CORS for a specific blueprint
+        CORSRules& blueprint(const Blueprint& bp)
+        {
+            rules.emplace_back(bp.prefix(), CORSRules(this));
+            return rules.back().second;
+        }
+
+        /// Get the global CORS policy
+        CORSRules& global()
+        {
+            return default_;
+        }
+
+    private:
+        CORSRules& find_rule(const std::string& path)
+        {
+            // TODO: use a trie in case of many rules
+            for (auto& rule : rules)
+            {
+                // Check if path starts with a rules prefix
+                if (path.rfind(rule.first, 0) == 0)
+                {
+                    return rule.second;
+                }
+            }
+            return default_;
+        }
+
+        std::vector<std::pair<std::string, CORSRules>> rules;
+        CORSRules default_ = CORSRules(this);
+    };
+
+    inline CORSRules& CORSRules::prefix(const std::string& prefix)
+    {
+        return handler_->prefix(prefix);
+    }
+
+    inline CORSRules& CORSRules::blueprint(const Blueprint& bp)
+    {
+        return handler_->blueprint(bp);
+    }
+
+    inline CORSRules& CORSRules::global()
+    {
+        return handler_->global();
+    }
+
+} // namespace crow
+
+/**
+ * \file crow/app.h
+ * \brief This file includes the definition of the crow::Crow class,
+ * the crow::App and crow::SimpleApp aliases, and some macros.
+ *
+ * In this file are defined:
+ * - crow::Crow
+ * - crow::App
+ * - crow::SimpleApp
+ * - \ref CROW_ROUTE
+ * - \ref CROW_BP_ROUTE
+ * - \ref CROW_WEBSOCKET_ROUTE
+ * - \ref CROW_MIDDLEWARES
+ * - \ref CROW_CATCHALL_ROUTE
+ * - \ref CROW_BP_CATCHALL_ROUTE
+ */
+
+
+#include <chrono>
+#include <string>
+#include <functional>
+#include <memory>
+#include <future>
+#include <cstdint>
+#include <type_traits>
+#include <thread>
+#include <condition_variable>
+
+#ifdef CROW_ENABLE_COMPRESSION
+#endif // #ifdef CROW_ENABLE_COMPRESSION
+
+
+#ifdef CROW_MSVC_WORKAROUND
+
+#define CROW_ROUTE(app, url) app.route_dynamic(url) // See the documentation in the comment below.
+#define CROW_BP_ROUTE(blueprint, url) blueprint.new_rule_dynamic(url) // See the documentation in the comment below.
+
+#else // #ifdef CROW_MSVC_WORKAROUND
+
+/**
+ * \def CROW_ROUTE(app, url)
+ * \brief Creates a route for app using a rule.
+ *
+ * It use crow::Crow::route_dynamic or crow::Crow::route to define
+ * a rule for your application. It's usage is like this:
+ *
+ * ```cpp
+ * auto app = crow::SimpleApp(); // or crow::App()
+ * CROW_ROUTE(app, "/")
+ * ([](){
+ *     return "<h1>Hello, world!</h1>";
+ * });
+ * ```
+ *
+ * This is the recommended way to define routes in a crow application.
+ * \see [Page of guide "Routes"](https://crowcpp.org/master/guides/routes/).
+ */
+#define CROW_ROUTE(app, url) app.template route<crow::black_magic::get_parameter_tag(url)>(url)
+
+/**
+ * \def CROW_BP_ROUTE(blueprint, url)
+ * \brief Creates a route for a blueprint using a rule.
+ *
+ * It may use crow::Blueprint::new_rule_dynamic or
+ * crow::Blueprint::new_rule_tagged to define a new rule for
+ * an given blueprint. It's usage is similar
+ * to CROW_ROUTE macro:
+ *
+ * ```cpp
+ * crow::Blueprint my_bp();
+ * CROW_BP_ROUTE(my_bp, "/")
+ * ([](){
+ *     return "<h1>Hello, world!</h1>";
+ * });
+ * ```
+ *
+ * This is the recommended way to define routes in a crow blueprint
+ * because of its compile-time capabilities.
+ *
+ * \see [Page of the guide "Blueprints"](https://crowcpp.org/master/guides/blueprints/).
+ */
+#define CROW_BP_ROUTE(blueprint, url) blueprint.new_rule_tagged<crow::black_magic::get_parameter_tag(url)>(url)
+
+/**
+ * \def CROW_WEBSOCKET_ROUTE(app, url)
+ * \brief Defines WebSocket route for app.
+ *
+ * It binds a WebSocket route to app. Easy solution to implement
+ * WebSockets in your app. The usage syntax of this macro is
+ * like this:
+ *
+ * ```cpp
+ * auto app = crow::SimpleApp(); // or crow::App()
+ * CROW_WEBSOCKET_ROUTE(app, "/ws")
+ *     .onopen([&](crow::websocket::connection& conn){
+ *                do_something();
+ *            })
+ *     .onclose([&](crow::websocket::connection& conn, const std::string& reason){
+ *                 do_something();
+ *             })
+ *     .onmessage([&](crow::websocket::connection&, const std::string& data, bool is_binary){
+ *                   if (is_binary)
+ *                       do_something(data);
+ *                   else
+ *                       do_something_else(data);
+ *               });
+ * ```
+ *
+ * \see [Page of the guide "WebSockets"](https://crowcpp.org/master/guides/websockets/).
+ */
+#define CROW_WEBSOCKET_ROUTE(app, url) app.route<crow::black_magic::get_parameter_tag(url)>(url).websocket<std::remove_reference<decltype(app)>::type>(&app)
+
+/**
+ * \def CROW_MIDDLEWARES(app, ...)
+ * \brief Enable a Middleware for an specific route in app
+ * or blueprint.
+ *
+ * It defines the usage of a Middleware in one route. And it
+ * can be used in both crow::SimpleApp (and crow::App) instances and
+ * crow::Blueprint. Its usage syntax is like this:
+ *
+ * ```cpp
+ * auto app = crow::SimpleApp(); // or crow::App()
+ * CROW_ROUTE(app, "/with_middleware")
+ * .CROW_MIDDLEWARES(app, LocalMiddleware) // Can be used more than one
+ * ([]() {                                 // middleware.
+ *     return "Hello world!";
+ * });
+ * ```
+ *
+ * \see [Page of the guide "Middlewares"](https://crowcpp.org/master/guides/middleware/).
+ */
+#define CROW_MIDDLEWARES(app, ...) template middlewares<typename std::remove_reference<decltype(app)>::type, __VA_ARGS__>()
+
+#endif // #ifdef CROW_MSVC_WORKAROUND
+
+/**
+ * \def CROW_CATCHALL_ROUTE(app)
+ * \brief Defines a custom catchall route for app using a
+ * custom rule.
+ *
+ * It defines a handler when the client make a request for an
+ * undefined route. Instead of just reply with a `404` status
+ * code (default behavior), you can define a custom handler
+ * using this macro.
+ *
+ * \see [Page of the guide "Routes" (Catchall routes)](https://crowcpp.org/master/guides/routes/#catchall-routes).
+ */ 
+#define CROW_CATCHALL_ROUTE(app) app.catchall_route()
+
+/**
+ * \def CROW_BP_CATCHALL_ROUTE(blueprint)
+ * \brief Defines a custom catchall route for blueprint
+ * using a custom rule.
+ *
+ * It defines a handler when the client make a request for an
+ * undefined route in the blueprint.
+ *
+ * \see [Page of the guide "Blueprint" (Define a custom Catchall route)](https://crowcpp.org/master/guides/blueprints/#define-a-custom-catchall-route).
+ */ 
+#define CROW_BP_CATCHALL_ROUTE(blueprint) blueprint.catchall_rule()
+
+
+/**
+ * \namespace crow
+ * \brief The main namespace of the library. In this namespace
+ * is defined the most important classes and functions of the
+ * library.
+ * 
+ * Within this namespace, the Crow class, Router class, Connection
+ * class, and other are defined.
+ */
+namespace crow
+{
+#ifdef CROW_ENABLE_SSL
+    using ssl_context_t = asio::ssl::context;
+#endif
+    /**
+     * \class Crow
+     * \brief The main server application class.
+     *
+     * Use crow::SimpleApp or crow::App<Middleware1, Middleware2, etc...> instead of
+     * directly instantiate this class.
+     */
+    template<typename... Middlewares>
+    class Crow
+    {
+    public:
+        /// \brief This is the crow application
+        using self_t = Crow;
+
+        /// \brief The HTTP server
+        using server_t = Server<Crow, SocketAdaptor, Middlewares...>;
+
+#ifdef CROW_ENABLE_SSL
+        /// \brief An HTTP server that runs on SSL with an SSLAdaptor
+        using ssl_server_t = Server<Crow, SSLAdaptor, Middlewares...>;
+#endif
+        Crow()
+        {}
+
+        /// \brief Construct Crow with a subset of middleware
+        template<typename... Ts>
+        Crow(Ts&&... ts):
+          middlewares_(make_middleware_tuple(std::forward<Ts>(ts)...))
+        {}
+
+        /// \brief Process an Upgrade request
+        ///
+        /// Currently used to upgrade an HTTP connection to a WebSocket connection
+        template<typename Adaptor>
+        void handle_upgrade(const request& req, response& res, Adaptor&& adaptor)
+        {
+            router_.handle_upgrade(req, res, adaptor);
+        }
+
+        /// \brief Process only the method and URL of a request and provide a route (or an error response)
+        std::unique_ptr<routing_handle_result> handle_initial(request& req, response& res)
+        {
+            return router_.handle_initial(req, res);
+        }
+
+        /// \brief Process the fully parsed request and generate a response for it
+        void handle(request& req, response& res, std::unique_ptr<routing_handle_result>& found)
+        {
+            router_.handle<self_t>(req, res, *found);
+        }
+
+        /// \brief Process a fully parsed request from start to finish (primarily used for debugging)
+        void handle_full(request& req, response& res)
+        {
+            auto found = handle_initial(req, res);
+            if (found->rule_index)
+                handle(req, res, found);
+        }
+
+        /// \brief Create a dynamic route using a rule (**Use CROW_ROUTE instead**)
+        DynamicRule& route_dynamic(const std::string& rule)
+        {
+            return router_.new_rule_dynamic(rule);
+        }
+
+        /// \brief Create a route using a rule (**Use CROW_ROUTE instead**)
+        template<uint64_t Tag>
+#ifdef CROW_GCC83_WORKAROUND
+        auto& route(const std::string& rule)
+#else
+        auto route(const std::string& rule)
+#endif
+#if defined CROW_CAN_USE_CPP17 && !defined CROW_GCC83_WORKAROUND
+          -> typename std::invoke_result<decltype(&Router::new_rule_tagged<Tag>), Router, const std::string&>::type
+#elif !defined CROW_GCC83_WORKAROUND
+          -> typename std::result_of<decltype (&Router::new_rule_tagged<Tag>)(Router, const std::string&)>::type
+#endif
+        {
+            return router_.new_rule_tagged<Tag>(rule);
+        }
+
+        /// \brief Create a route for any requests without a proper route (**Use CROW_CATCHALL_ROUTE instead**)
+        CatchallRule& catchall_route()
+        {
+            return router_.catchall_rule();
+        }
+
+        /// \brief Set the default max payload size for websockets
+        self_t& websocket_max_payload(uint64_t max_payload)
+        {
+            max_payload_ = max_payload;
+            return *this;
+        }
+
+        /// \brief Get the default max payload size for websockets
+        uint64_t websocket_max_payload()
+        {
+            return max_payload_;
+        }
+
+        self_t& signal_clear()
+        {
+            signals_.clear();
+            return *this;
+        }
+
+        self_t& signal_add(int signal_number)
+        {
+            signals_.push_back(signal_number);
+            return *this;
+        }
+
+        std::vector<int> signals()
+        {
+            return signals_;
+        }
+
+        /// \brief Set the port that Crow will handle requests on
+        self_t& port(std::uint16_t port)
+        {
+            port_ = port;
+            return *this;
+        }
+
+        /// \brief Get the port that Crow will handle requests on
+        std::uint16_t port()
+        {
+            return port_;
+        }
+
+        /// \brief Set the connection timeout in seconds (default is 5)
+        self_t& timeout(std::uint8_t timeout)
+        {
+            timeout_ = timeout;
+            return *this;
+        }
+
+        /// \brief Set the server name
+        self_t& server_name(std::string server_name)
+        {
+            server_name_ = server_name;
+            return *this;
+        }
+
+        /// \brief The IP address that Crow will handle requests on (default is 0.0.0.0)
+        self_t& bindaddr(std::string bindaddr)
+        {
+            bindaddr_ = bindaddr;
+            return *this;
+        }
+
+        /// \brief Get the address that Crow will handle requests on
+        std::string bindaddr()
+        {
+            return bindaddr_;
+        }
+
+        /// \brief Run the server on multiple threads using all available threads
+        self_t& multithreaded()
+        {
+            return concurrency(std::thread::hardware_concurrency());
+        }
+
+        /// \brief Run the server on multiple threads using a specific number
+        self_t& concurrency(std::uint16_t concurrency)
+        {
+            if (concurrency < 2) // Crow can have a minimum of 2 threads running
+                concurrency = 2;
+            concurrency_ = concurrency;
+            return *this;
+        }
+
+        /// \brief Get the number of threads that server is using
+        std::uint16_t concurrency()
+        {
+            return concurrency_;
+        }
+
+        /// \brief Set the server's log level
+        ///
+        /// Possible values are:
+        /// - crow::LogLevel::Debug       (0)
+        /// - crow::LogLevel::Info        (1)
+        /// - crow::LogLevel::Warning     (2)
+        /// - crow::LogLevel::Error       (3)
+        /// - crow::LogLevel::Critical    (4)
+        self_t& loglevel(LogLevel level)
+        {
+            crow::logger::setLogLevel(level);
+            return *this;
+        }
+
+        /// \brief Set the response body size (in bytes) beyond which Crow automatically streams responses (Default is 1MiB)
+        ///
+        /// Any streamed response is unaffected by Crow's timer, and therefore won't timeout before a response is fully sent.
+        self_t& stream_threshold(size_t threshold)
+        {
+            res_stream_threshold_ = threshold;
+            return *this;
+        }
+
+        /// \brief Get the response body size (in bytes) beyond which Crow automatically streams responses
+        size_t& stream_threshold()
+        {
+            return res_stream_threshold_;
+        }
+
+        
+        self_t& register_blueprint(Blueprint& blueprint)
+        {
+            router_.register_blueprint(blueprint);
+            return *this;
+        }
+
+        /// \brief Set the function to call to handle uncaught exceptions generated in routes (Default generates error 500).
+        ///
+        /// The function must have the following signature: void(crow::response&).
+        /// It must set the response passed in argument to the function, which will be sent back to the client.
+        /// See Router::default_exception_handler() for the default implementation.
+        template<typename Func>
+        self_t& exception_handler(Func&& f)
+        {
+            router_.exception_handler() = std::forward<Func>(f);
+            return *this;
+        }
+
+        std::function<void(crow::response&)>& exception_handler()
+        {
+            return router_.exception_handler();
+        }
+
+        /// \brief Set a custom duration and function to run on every tick
+        template<typename Duration, typename Func>
+        self_t& tick(Duration d, Func f)
+        {
+            tick_interval_ = std::chrono::duration_cast<std::chrono::milliseconds>(d);
+            tick_function_ = f;
+            return *this;
+        }
+
+#ifdef CROW_ENABLE_COMPRESSION
+        
+        self_t& use_compression(compression::algorithm algorithm)
+        {
+            comp_algorithm_ = algorithm;
+            compression_used_ = true;
+            return *this;
+        }
+
+        compression::algorithm compression_algorithm()
+        {
+            return comp_algorithm_;
+        }
+
+        bool compression_used() const
+        {
+            return compression_used_;
+        }
+#endif
+
+        /// \brief Apply blueprints
+        void add_blueprint()
+        {
+#if defined(__APPLE__) || defined(__MACH__)
+            if (router_.blueprints().empty()) return;
+#endif
+
+            for (Blueprint* bp : router_.blueprints())
+            {
+                if (bp->static_dir().empty()) continue;
+
+                auto static_dir_ = crow::utility::normalize_path(bp->static_dir());
+
+                bp->new_rule_tagged<crow::black_magic::get_parameter_tag(CROW_STATIC_ENDPOINT)>(CROW_STATIC_ENDPOINT)([static_dir_](crow::response& res, std::string file_path_partial) {
+                    utility::sanitize_filename(file_path_partial);
+                    res.set_static_file_info_unsafe(static_dir_ + file_path_partial);
+                    res.end();
+                });
+            }
+
+            router_.validate_bp();
+        }
+
+        /// \brief Go through the rules, upgrade them if possible, and add them to the list of rules
+        void add_static_dir()
+        {
+            if (are_static_routes_added()) return;
+            auto static_dir_ = crow::utility::normalize_path(CROW_STATIC_DIRECTORY);
+
+            route<crow::black_magic::get_parameter_tag(CROW_STATIC_ENDPOINT)>(CROW_STATIC_ENDPOINT)([static_dir_](crow::response& res, std::string file_path_partial) {
+                utility::sanitize_filename(file_path_partial);
+                res.set_static_file_info_unsafe(static_dir_ + file_path_partial);
+                res.end();
+            });
+            set_static_routes_added();
+        }
+
+        /// \brief A wrapper for `validate()` in the router
+        void validate()
+        {
+            router_.validate();
+        }
+
+        /// \brief Run the server
+        void run()
+        {
+#ifndef CROW_DISABLE_STATIC_DIR
+            add_blueprint();
+            add_static_dir();
+#endif
+            validate();
+
+#ifdef CROW_ENABLE_SSL
+            if (ssl_used_)
+            {
+                ssl_server_ = std::move(std::unique_ptr<ssl_server_t>(new ssl_server_t(this, bindaddr_, port_, server_name_, &middlewares_, concurrency_, timeout_, &ssl_context_)));
+                ssl_server_->set_tick_function(tick_interval_, tick_function_);
+                ssl_server_->signal_clear();
+                for (auto snum : signals_)
+                {
+                    ssl_server_->signal_add(snum);
+                }
+                notify_server_start();
+                ssl_server_->run();
+            }
+            else
+#endif
+            {
+                server_ = std::move(std::unique_ptr<server_t>(new server_t(this, bindaddr_, port_, server_name_, &middlewares_, concurrency_, timeout_, nullptr)));
+                server_->set_tick_function(tick_interval_, tick_function_);
+                for (auto snum : signals_)
+                {
+                    server_->signal_add(snum);
+                }
+                notify_server_start();
+                server_->run();
+            }
+        }
+
+        /// \brief Non-blocking version of \ref run()
+        ///
+        /// The output from this method needs to be saved into a variable!
+        /// Otherwise the call will be made on the same thread.
+        std::future<void> run_async()
+        {
+            return std::async(std::launch::async, [&] {
+                this->run();
+            });
+        }
+
+        /// \brief Stop the server
+        void stop()
+        {
+#ifdef CROW_ENABLE_SSL
+            if (ssl_used_)
+            {
+                if (ssl_server_) { ssl_server_->stop(); }
+            }
+            else
+#endif
+            {
+                // TODO(EDev): Move these 6 lines to a method in http_server.
+                std::vector<crow::websocket::connection*> websockets_to_close = websockets_;
+                for (auto websocket : websockets_to_close)
+                {
+                    CROW_LOG_INFO << "Quitting Websocket: " << websocket;
+                    websocket->close("Server Application Terminated");
+                }
+                if (server_) { server_->stop(); }
+            }
+        }
+
+        void add_websocket(crow::websocket::connection* conn)
+        {
+            websockets_.push_back(conn);
+        }
+
+        void remove_websocket(crow::websocket::connection* conn)
+        {
+            websockets_.erase(std::remove(websockets_.begin(), websockets_.end(), conn), websockets_.end());
+        }
+
+        /// \brief Print the routing paths defined for each HTTP method
+        void debug_print()
+        {
+            CROW_LOG_DEBUG << "Routing:";
+            router_.debug_print();
+        }
+
+
+#ifdef CROW_ENABLE_SSL
+
+        /// \brief Use certificate and key files for SSL
+        self_t& ssl_file(const std::string& crt_filename, const std::string& key_filename)
+        {
+            ssl_used_ = true;
+            ssl_context_.set_verify_mode(asio::ssl::verify_peer);
+            ssl_context_.set_verify_mode(asio::ssl::verify_client_once);
+            ssl_context_.use_certificate_file(crt_filename, ssl_context_t::pem);
+            ssl_context_.use_private_key_file(key_filename, ssl_context_t::pem);
+            ssl_context_.set_options(
+              asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3);
+            return *this;
+        }
+
+        /// \brief Use `.pem` file for SSL
+        self_t& ssl_file(const std::string& pem_filename)
+        {
+            ssl_used_ = true;
+            ssl_context_.set_verify_mode(asio::ssl::verify_peer);
+            ssl_context_.set_verify_mode(asio::ssl::verify_client_once);
+            ssl_context_.load_verify_file(pem_filename);
+            ssl_context_.set_options(
+              asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3);
+            return *this;
+        }
+
+        /// \brief Use certificate chain and key files for SSL
+        self_t& ssl_chainfile(const std::string& crt_filename, const std::string& key_filename)
+        {
+            ssl_used_ = true;
+            ssl_context_.set_verify_mode(asio::ssl::verify_peer);
+            ssl_context_.set_verify_mode(asio::ssl::verify_client_once);
+            ssl_context_.use_certificate_chain_file(crt_filename);
+            ssl_context_.use_private_key_file(key_filename, ssl_context_t::pem);
+            ssl_context_.set_options(
+              asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3);
+            return *this;
+        }
+
+        self_t& ssl(asio::ssl::context&& ctx)
+        {
+            ssl_used_ = true;
+            ssl_context_ = std::move(ctx);
+            return *this;
+        }
+
+        bool ssl_used() const
+        {
+            return ssl_used_;
+        }
+#else
+        
+        template<typename T, typename... Remain>
+        self_t& ssl_file(T&&, Remain&&...)
+        {
+            // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined.
+            static_assert(
+              // make static_assert dependent to T; always false
+              std::is_base_of<T, void>::value,
+              "Define CROW_ENABLE_SSL to enable ssl support.");
+            return *this;
+        }
+
+        template<typename T, typename... Remain>
+        self_t& ssl_chainfile(T&&, Remain&&...)
+        {
+            // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined.
+            static_assert(
+              // make static_assert dependent to T; always false
+              std::is_base_of<T, void>::value,
+              "Define CROW_ENABLE_SSL to enable ssl support.");
+            return *this;
+        }
+
+        template<typename T>
+        self_t& ssl(T&&)
+        {
+            // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined.
+            static_assert(
+              // make static_assert dependent to T; always false
+              std::is_base_of<T, void>::value,
+              "Define CROW_ENABLE_SSL to enable ssl support.");
+            return *this;
+        }
+
+        bool ssl_used() const
+        {
+            return false;
+        }
+#endif
+
+        // middleware
+        using context_t = detail::context<Middlewares...>;
+        using mw_container_t = std::tuple<Middlewares...>;
+        template<typename T>
+        typename T::context& get_context(const request& req)
+        {
+            static_assert(black_magic::contains<T, Middlewares...>::value, "App doesn't have the specified middleware type.");
+            auto& ctx = *reinterpret_cast<context_t*>(req.middleware_context);
+            return ctx.template get<T>();
+        }
+
+        template<typename T>
+        T& get_middleware()
+        {
+            return utility::get_element_by_type<T, Middlewares...>(middlewares_);
+        }
+
+        /// \brief Wait until the server has properly started
+        void wait_for_server_start()
+        {
+            {
+                std::unique_lock<std::mutex> lock(start_mutex_);
+                if (!server_started_)
+                    cv_started_.wait(lock);
+            }
+            if (server_)
+                server_->wait_for_start();
+#ifdef CROW_ENABLE_SSL
+            else if (ssl_server_)
+                ssl_server_->wait_for_start();
+#endif
+        }
+
+    private:
+        template<typename... Ts>
+        std::tuple<Middlewares...> make_middleware_tuple(Ts&&... ts)
+        {
+            auto fwd = std::forward_as_tuple((ts)...);
+            return std::make_tuple(
+              std::forward<Middlewares>(
+                black_magic::tuple_extract<Middlewares, decltype(fwd)>(fwd))...);
+        }
+
+        /// \brief Notify anything using \ref wait_for_server_start() to proceed
+        void notify_server_start()
+        {
+            std::unique_lock<std::mutex> lock(start_mutex_);
+            server_started_ = true;
+            cv_started_.notify_all();
+        }
+
+        void set_static_routes_added() {
+            static_routes_added_ = true;
+        }
+
+        bool are_static_routes_added() {
+            return static_routes_added_;
+        }
+
+    private:
+        std::uint8_t timeout_{5};
+        uint16_t port_ = 80;
+        uint16_t concurrency_ = 2;
+        uint64_t max_payload_{UINT64_MAX};
+        std::string server_name_ = std::string("Crow/") + VERSION;
+        std::string bindaddr_ = "0.0.0.0";
+        size_t res_stream_threshold_ = 1048576;
+        Router router_;
+        bool static_routes_added_{false};
+
+#ifdef CROW_ENABLE_COMPRESSION
+        compression::algorithm comp_algorithm_;
+        bool compression_used_{false};
+#endif
+
+        std::chrono::milliseconds tick_interval_;
+        std::function<void()> tick_function_;
+
+        std::tuple<Middlewares...> middlewares_;
+
+#ifdef CROW_ENABLE_SSL
+        std::unique_ptr<ssl_server_t> ssl_server_;
+        bool ssl_used_{false};
+        ssl_context_t ssl_context_{asio::ssl::context::sslv23};
+#endif
+
+        std::unique_ptr<server_t> server_;
+
+        std::vector<int> signals_{SIGINT, SIGTERM};
+
+        bool server_started_{false};
+        std::condition_variable cv_started_;
+        std::mutex start_mutex_;
+        std::vector<crow::websocket::connection*> websockets_;
+    };
+
+    /// \brief Alias of Crow<Middlewares...>. Useful if you want
+    /// a instance of an Crow application that require Middlewares
+    template<typename... Middlewares>
+    using App = Crow<Middlewares...>;
+
+    /// \brief Alias of Crow<>. Useful if you want a instance of
+    /// an Crow application that doesn't require of Middlewares
+    using SimpleApp = Crow<>;
+} // namespace crow
+
diff --git a/code/cpp-httplib-0.19.0/benchmark/crow/main.cpp b/code/cpp-httplib-0.19.0/benchmark/crow/main.cpp
new file mode 100644
index 00000000..034cf78b
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/crow/main.cpp
@@ -0,0 +1,17 @@
+#include "crow_all.h"
+
+class CustomLogger : public crow::ILogHandler {
+public:
+  void log(std::string, crow::LogLevel) {}
+};
+
+int main() {
+  CustomLogger logger;
+  crow::logger::setHandler(&logger);
+
+  crow::SimpleApp app;
+
+  CROW_ROUTE(app, "/")([]() { return "Hello world!"; });
+
+  app.port(8080).multithreaded().run();
+}
diff --git a/code/cpp-httplib-0.19.0/benchmark/download.sh b/code/cpp-httplib-0.19.0/benchmark/download.sh
new file mode 100644
index 00000000..90c959ed
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/benchmark/download.sh
@@ -0,0 +1,2 @@
+rm -f httplib.h
+wget https://raw.githubusercontent.com/yhirose/cpp-httplib/v$1/httplib.h
diff --git a/code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake b/code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake
new file mode 100644
index 00000000..2048e554
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake
@@ -0,0 +1,168 @@
+# A simple FindBrotli package for Cmake's find_package function.
+# Note: This find package doesn't have version support, as the version file doesn't seem to be installed on most systems.
+#
+# If you want to find the static packages instead of shared (the default), define BROTLI_USE_STATIC_LIBS as TRUE.
+# The targets will have the same names, but it will use the static libs.
+#
+# Valid find_package COMPONENTS names: "decoder", "encoder", and "common"
+# Note that if you're requiring "decoder" or "encoder", then "common" will be automatically added as required.
+#
+# Defines the libraries (if found): Brotli::decoder, Brotli::encoder, Brotli::common
+# and the includes path variable: Brotli_INCLUDE_DIR
+#
+# If it's failing to find the libraries, try setting BROTLI_ROOT_DIR to the folder containing your library & include dir.
+
+# If they asked for a specific version, warn/fail since we don't support it.
+# TODO: if they start distributing the version somewhere, implement finding it.
+# See https://github.com/google/brotli/issues/773#issuecomment-579133187
+if(Brotli_FIND_VERSION)
+	set(_brotli_version_error_msg "FindBrotli.cmake doesn't have version support!")
+	# If the package is required, throw a fatal error
+	# Otherwise, if not running quietly, we throw a warning
+	if(Brotli_FIND_REQUIRED)
+		message(FATAL_ERROR "${_brotli_version_error_msg}")
+	elseif(NOT Brotli_FIND_QUIETLY)
+		message(WARNING "${_brotli_version_error_msg}")
+	endif()
+endif()
+
+# Since both decoder & encoder require the common lib, force its requirement..
+# if the user is requiring either of those other libs.
+if(Brotli_FIND_REQUIRED_decoder OR Brotli_FIND_REQUIRED_encoder)
+	set(Brotli_FIND_REQUIRED_common TRUE)
+endif()
+
+# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
+# Credit to FindOpenSSL.cmake for this
+if(BROTLI_USE_STATIC_LIBS)
+  set(_brotli_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  if(WIN32)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  else()
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+  endif()
+endif()
+
+# Make PkgConfig optional, since some users (mainly Windows) don't have it.
+# But it's a lot more clean than manually using find_library.
+find_package(PkgConfig QUIET)
+
+# Only used if the PkgConfig libraries aren't used.
+find_path(Brotli_INCLUDE_DIR
+	NAMES
+		"brotli/decode.h"
+		"brotli/encode.h"
+	HINTS
+		${BROTLI_ROOT_DIR}
+	PATH_SUFFIXES
+		"include"
+		"includes"
+	DOC "The path to Brotli's include directory."
+)
+# Hides this var from the GUI
+mark_as_advanced(Brotli_INCLUDE_DIR)
+
+# Just used for PkgConfig stuff in the loop below
+set(_brotli_stat_str "")
+if(BROTLI_USE_STATIC_LIBS)
+	set(_brotli_stat_str "_STATIC")
+endif()
+
+# Each string here is "ComponentName;LiteralName" (the semi-colon is a delimiter)
+foreach(_listvar "common;common" "decoder;dec" "encoder;enc")
+	# Split the component name and literal library name from the listvar
+	list(GET _listvar 0 _component_name)
+	list(GET _listvar 1 _libname)
+
+	# NOTE: We can't rely on PkgConf for static libs since the upstream static lib support is broken
+	# See https://github.com/google/brotli/issues/795
+	# TODO: whenever their issue is fixed upstream, remove this "AND NOT BROTLI_USE_STATIC_LIBS" check
+	if(PKG_CONFIG_FOUND AND NOT BROTLI_USE_STATIC_LIBS)
+		# These need to be GLOBAL for MinGW when making ALIAS libraries against them.
+		# Have to postfix _STATIC on the name to tell PkgConfig to find the static libs.
+		pkg_check_modules(Brotli_${_component_name}${_brotli_stat_str} QUIET GLOBAL IMPORTED_TARGET libbrotli${_libname})
+	endif()
+
+	# Check if the target was already found by Pkgconf
+	if(TARGET PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
+		# ALIAS since we don't want the PkgConfig namespace on the Cmake library (for end-users)
+		add_library(Brotli::${_component_name} ALIAS PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
+
+		# Tells HANDLE_COMPONENTS we found the component
+		set(Brotli_${_component_name}_FOUND TRUE)
+		if(Brotli_FIND_REQUIRED_${_component_name})
+			# If the lib is required, we can add its literal path as a required var for FindPackageHandleStandardArgs
+			# Since it won't accept the PkgConfig targets
+			if(BROTLI_USE_STATIC_LIBS)
+				list(APPEND _brotli_req_vars "Brotli_${_component_name}_STATIC_LIBRARIES")
+			else()
+				list(APPEND _brotli_req_vars "Brotli_${_component_name}_LINK_LIBRARIES")
+			endif()
+		endif()
+
+		# Skip searching for the libs with find_library since it was already found by Pkgconf
+		continue()
+	endif()
+
+	if(Brotli_FIND_REQUIRED_${_component_name})
+		# If it's required, we can set the name used in find_library as a required var for FindPackageHandleStandardArgs
+		list(APPEND _brotli_req_vars "Brotli_${_component_name}")
+	endif()
+
+	list(APPEND _brotli_lib_names
+		"brotli${_libname}"
+		"libbrotli${_libname}"
+	)
+	if(BROTLI_USE_STATIC_LIBS)
+		# Postfix "-static" to the libnames since we're looking for static libs
+		list(TRANSFORM _brotli_lib_names APPEND "-static")
+	endif()
+
+	find_library(Brotli_${_component_name}
+		NAMES ${_brotli_lib_names}
+		HINTS ${BROTLI_ROOT_DIR}
+		PATH_SUFFIXES
+			"lib"
+			"lib64"
+			"libs"
+			"libs64"
+			"lib/x86_64-linux-gnu"
+	)
+	# Hide the library variable from the Cmake GUI
+	mark_as_advanced(Brotli_${_component_name})
+
+	# Unset since otherwise it'll stick around for the next loop and break things
+	unset(_brotli_lib_names)
+
+	# Check if find_library found the library
+	if(Brotli_${_component_name})
+		# Tells HANDLE_COMPONENTS we found the component
+		set(Brotli_${_component_name}_FOUND TRUE)
+
+		add_library("Brotli::${_component_name}" UNKNOWN IMPORTED)
+		# Attach the literal library and include dir to the IMPORTED target for the end-user
+		set_target_properties("Brotli::${_component_name}" PROPERTIES
+			INTERFACE_INCLUDE_DIRECTORIES "${Brotli_INCLUDE_DIR}"
+			IMPORTED_LOCATION "${Brotli_${_component_name}}"
+		)
+	else()
+		# Tells HANDLE_COMPONENTS we found the component
+		set(Brotli_${_component_name}_FOUND FALSE)
+	endif()
+endforeach()
+
+include(FindPackageHandleStandardArgs)
+# Sets Brotli_FOUND, and fails the find_package(Brotli) call if it was REQUIRED but missing libs.
+find_package_handle_standard_args(Brotli
+	FOUND_VAR
+		Brotli_FOUND
+	REQUIRED_VARS
+		Brotli_INCLUDE_DIR
+		${_brotli_req_vars}
+	HANDLE_COMPONENTS
+)
+
+# Restore the original find library ordering
+if(BROTLI_USE_STATIC_LIBS)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ${_brotli_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+endif()
diff --git a/code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in b/code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in
new file mode 100644
index 00000000..93dff323
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in
@@ -0,0 +1,84 @@
+# Generates a macro to auto-configure everything
+@PACKAGE_INIT@
+
+# Setting these here so they're accessible after install.
+# Might be useful for some users to check which settings were used.
+set(HTTPLIB_IS_USING_OPENSSL @HTTPLIB_IS_USING_OPENSSL@)
+set(HTTPLIB_IS_USING_ZLIB @HTTPLIB_IS_USING_ZLIB@)
+set(HTTPLIB_IS_COMPILED @HTTPLIB_COMPILE@)
+set(HTTPLIB_IS_USING_BROTLI @HTTPLIB_IS_USING_BROTLI@)
+set(HTTPLIB_VERSION @PROJECT_VERSION@)
+
+include(CMakeFindDependencyMacro)
+
+# We add find_dependency calls here to not make the end-user have to call them.
+find_dependency(Threads)
+if(@HTTPLIB_IS_USING_OPENSSL@)
+	# OpenSSL COMPONENTS were added in Cmake v3.11
+	if(CMAKE_VERSION VERSION_LESS "3.11")
+		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@)
+	else()
+		# Once the COMPONENTS were added, they were made optional when not specified.
+		# Since we use both, we need to search for both.
+		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ COMPONENTS Crypto SSL)
+	endif()
+endif()
+if(@HTTPLIB_IS_USING_ZLIB@)
+	find_dependency(ZLIB)
+endif()
+
+if(@HTTPLIB_IS_USING_BROTLI@)
+	# Needed so we can use our own FindBrotli.cmake in this file.
+	# Note that the FindBrotli.cmake file is installed in the same dir as this file.
+	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+	set(BROTLI_USE_STATIC_LIBS @BROTLI_USE_STATIC_LIBS@)
+	find_dependency(Brotli COMPONENTS common encoder decoder)
+endif()
+
+# Mildly useful for end-users
+# Not really recommended to be used though
+set_and_check(HTTPLIB_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@")
+# Lets the end-user find the header path with the header appended
+# This is helpful if you're using Cmake's pre-compiled header feature
+set_and_check(HTTPLIB_HEADER_PATH "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/httplib.h")
+
+# Consider each library support as a "component"
+set(httplib_OpenSSL_FOUND @HTTPLIB_IS_USING_OPENSSL@)
+set(httplib_ZLIB_FOUND @HTTPLIB_IS_USING_ZLIB@)
+set(httplib_Brotli_FOUND @HTTPLIB_IS_USING_BROTLI@)
+
+check_required_components(httplib)
+
+# Brings in the target library, but only if all required components are found
+if(NOT DEFINED httplib_FOUND OR httplib_FOUND)
+	include("${CMAKE_CURRENT_LIST_DIR}/httplibTargets.cmake")
+endif()
+
+# Outputs a "found httplib /usr/include/httplib.h" message when using find_package(httplib)
+include(FindPackageMessage)
+if(TARGET httplib::httplib)
+	set(HTTPLIB_FOUND TRUE)
+
+	# Since the compiled version has a lib, show that in the message
+	if(@HTTPLIB_COMPILE@)
+		# The list of configurations is most likely just 1 unless they installed a debug & release
+		get_target_property(_httplib_configs httplib::httplib "IMPORTED_CONFIGURATIONS")
+		# Need to loop since the "IMPORTED_LOCATION" property isn't want we want.
+		# Instead, we need to find the IMPORTED_LOCATION_RELEASE or IMPORTED_LOCATION_DEBUG which has the lib path.
+		foreach(_httplib_conf "${_httplib_configs}")
+			# Grab the path to the lib and sets it to HTTPLIB_LIBRARY
+			get_target_property(HTTPLIB_LIBRARY httplib::httplib "IMPORTED_LOCATION_${_httplib_conf}")
+			# Check if we found it
+			if(HTTPLIB_LIBRARY)
+				break()
+			endif()
+		endforeach()
+
+		unset(_httplib_configs)
+		unset(_httplib_conf)
+
+		find_package_message(httplib "Found httplib: ${HTTPLIB_LIBRARY} (found version \"${HTTPLIB_VERSION}\")" "[${HTTPLIB_LIBRARY}][${HTTPLIB_HEADER_PATH}]")
+	else()
+		find_package_message(httplib "Found httplib: ${HTTPLIB_HEADER_PATH} (found version \"${HTTPLIB_VERSION}\")" "[${HTTPLIB_HEADER_PATH}]")
+	endif()
+endif()
diff --git a/code/cpp-httplib-0.19.0/docker-compose.yml b/code/cpp-httplib-0.19.0/docker-compose.yml
new file mode 100644
index 00000000..4a55b0dc
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/docker-compose.yml
@@ -0,0 +1,7 @@
+services:
+  http:
+    build: .
+    ports:
+      - "8080:80"
+    volumes:
+      - ./docker/html:/html
diff --git a/code/cpp-httplib-0.19.0/docker/html/index.html b/code/cpp-httplib-0.19.0/docker/html/index.html
new file mode 100644
index 00000000..1abe9780
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/docker/html/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to cpp-httplib!</title>
+<style>
+html { color-scheme: light dark; }
+body { width: 35em; margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif; }
+</style>
+</head>
+<body>
+<h1>Welcome to cpp-httplib!</h1>
+<p>If you see this page, the cpp-httplib web server is successfully installed and
+working. Further configuration is required.</p>
+
+<p>For online documentation and support please refer to
+<a href="https://github.com/yhirose/cpp-httplib">github.com/yhirose/cpp-httplib</a>.<br/>
+
+<p><em>Thank you for using cpp-httplib.</em></p>
+</body>
+</html>
diff --git a/code/cpp-httplib-0.19.0/docker/main.cc b/code/cpp-httplib-0.19.0/docker/main.cc
new file mode 100644
index 00000000..913275da
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/docker/main.cc
@@ -0,0 +1,81 @@
+//
+//  main.cc
+//
+//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <chrono>
+#include <ctime>
+#include <format>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+
+#include <httplib.h>
+
+constexpr auto error_html = R"(<html>
+<head><title>{} {}</title></head>
+<body>
+<center><h1>404 Not Found</h1></center>
+<hr><center>cpp-httplib/{}</center>
+</body>
+</html>
+)";
+
+void sigint_handler(int s) { exit(1); }
+
+std::string time_local() {
+  auto p = std::chrono::system_clock::now();
+  auto t = std::chrono::system_clock::to_time_t(p);
+
+  std::stringstream ss;
+  ss << std::put_time(std::localtime(&t), "%d/%b/%Y:%H:%M:%S %z");
+  return ss.str();
+}
+
+std::string log(auto &req, auto &res) {
+  auto remote_user = "-"; // TODO:
+  auto request = std::format("{} {} {}", req.method, req.path, req.version);
+  auto body_bytes_sent = res.get_header_value("Content-Length");
+  auto http_referer = "-"; // TODO:
+  auto http_user_agent = req.get_header_value("User-Agent", "-");
+
+  // NOTE: From NGINX defualt access log format
+  // log_format combined '$remote_addr - $remote_user [$time_local] '
+  //                     '"$request" $status $body_bytes_sent '
+  //                     '"$http_referer" "$http_user_agent"';
+  return std::format(R"({} - {} [{}] "{}" {} {} "{}" "{}")", req.remote_addr,
+                     remote_user, time_local(), request, res.status,
+                     body_bytes_sent, http_referer, http_user_agent);
+}
+
+int main(int argc, const char **argv) {
+  signal(SIGINT, sigint_handler);
+
+  auto base_dir = "./html";
+  auto host = "0.0.0.0";
+  auto port = 80;
+
+  httplib::Server svr;
+
+  svr.set_error_handler([](auto & /*req*/, auto &res) {
+    auto body =
+        std::format(error_html, res.status, httplib::status_message(res.status),
+                    CPPHTTPLIB_VERSION);
+
+    res.set_content(body, "text/html");
+  });
+
+  svr.set_logger(
+      [](auto &req, auto &res) { std::cout << log(req, res) << std::endl; });
+
+  svr.set_mount_point("/", base_dir);
+
+  std::cout << std::format("Serving HTTP on {0} port {1} ...", host, port)
+            << std::endl;
+
+  auto ret = svr.listen(host, port);
+
+  return ret ? 0 : 1;
+}
diff --git a/code/cpp-httplib-0.19.0/example/Dockerfile.hello b/code/cpp-httplib-0.19.0/example/Dockerfile.hello
new file mode 100644
index 00000000..d1188aec
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/Dockerfile.hello
@@ -0,0 +1,12 @@
+FROM alpine as builder
+WORKDIR /src/example
+RUN apk add g++ make openssl-dev zlib-dev brotli-dev
+COPY ./httplib.h /src
+COPY ./example/hello.cc /src/example
+COPY ./example/Makefile /src/example
+RUN make hello
+
+FROM alpine
+RUN apk --no-cache add brotli libstdc++
+COPY --from=builder /src/example/hello /bin/hello
+CMD ["/bin/hello"]
diff --git a/code/cpp-httplib-0.19.0/example/Makefile b/code/cpp-httplib-0.19.0/example/Makefile
new file mode 100644
index 00000000..ba683593
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/Makefile
@@ -0,0 +1,64 @@
+#CXX = clang++
+CXXFLAGS = -O2 -std=c++11 -I.. -Wall -Wextra -pthread
+
+PREFIX ?= $(shell brew --prefix)
+
+OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
+
+ifneq ($(OS), Windows_NT)
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S), Darwin)
+		OPENSSL_SUPPORT += -framework CoreFoundation -framework Security
+	endif
+endif
+
+ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
+
+BROTLI_DIR = $(PREFIX)/opt/brotli
+BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
+
+all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark one_time_request server_and_client
+
+server : server.cc ../httplib.h Makefile
+	$(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+client : client.cc ../httplib.h Makefile
+	$(CXX) -o client $(CXXFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+hello : hello.cc ../httplib.h Makefile
+	$(CXX) -o hello $(CXXFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+simplecli : simplecli.cc ../httplib.h Makefile
+	$(CXX) -o simplecli $(CXXFLAGS) simplecli.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+simplesvr : simplesvr.cc ../httplib.h Makefile
+	$(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+upload : upload.cc ../httplib.h Makefile
+	$(CXX) -o upload $(CXXFLAGS) upload.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+redirect : redirect.cc ../httplib.h Makefile
+	$(CXX) -o redirect $(CXXFLAGS) redirect.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+ssesvr : ssesvr.cc ../httplib.h Makefile
+	$(CXX) -o ssesvr $(CXXFLAGS) ssesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+ssecli : ssecli.cc ../httplib.h Makefile
+	$(CXX) -o ssecli $(CXXFLAGS) ssecli.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+benchmark : benchmark.cc ../httplib.h Makefile
+	$(CXX) -o benchmark $(CXXFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+one_time_request : one_time_request.cc ../httplib.h Makefile
+	$(CXX) -o one_time_request $(CXXFLAGS) one_time_request.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+server_and_client : server_and_client.cc ../httplib.h Makefile
+	$(CXX) -o server_and_client $(CXXFLAGS) server_and_client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+
+pem:
+	openssl genrsa 2048 > key.pem
+	openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
+
+clean:
+	rm server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark one_time_request server_and_client *.pem
diff --git a/code/cpp-httplib-0.19.0/example/benchmark.cc b/code/cpp-httplib-0.19.0/example/benchmark.cc
new file mode 100644
index 00000000..433cc675
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/benchmark.cc
@@ -0,0 +1,33 @@
+#include <chrono>
+#include <httplib.h>
+#include <iostream>
+
+using namespace std;
+
+struct StopWatch {
+  StopWatch(const string &label) : label_(label) {
+    start_ = chrono::system_clock::now();
+  }
+  ~StopWatch() {
+    auto end = chrono::system_clock::now();
+    auto diff = end - start_;
+    auto count = chrono::duration_cast<chrono::milliseconds>(diff).count();
+    cout << label_ << ": " << count << " millisec." << endl;
+  }
+  string label_;
+  chrono::system_clock::time_point start_;
+};
+
+int main(void) {
+  string body(1024 * 5, 'a');
+
+  httplib::Client cli("httpbin.org", 80);
+
+  for (int i = 0; i < 3; i++) {
+    StopWatch sw(to_string(i).c_str());
+    auto res = cli.Post("/post", body, "application/octet-stream");
+    assert(res->status == httplib::StatusCode::OK_200);
+  }
+
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/example/ca-bundle.crt b/code/cpp-httplib-0.19.0/example/ca-bundle.crt
new file mode 100644
index 00000000..7d61eb5c
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/ca-bundle.crt
@@ -0,0 +1,3401 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Tue Jan 22 14:14:40 2019 GMT
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: 18372117493b5b7ec006c31d966143fc95a9464a2b5f8d5188e23c5557b2292d
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R6
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GC CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
+9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
+aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
+r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
+LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
+4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
+06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
+3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
+JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
+BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
+d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
+fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
+ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
+gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
+4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
+tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
+pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
+sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
+CFF1pkgl
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
+k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
+7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
+m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
+dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
+ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
+cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
+aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
+5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
+BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
+vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
++YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
+c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
+WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
+n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
+Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
+7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
+gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
+o/DUhgkC
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
+Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
+0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
+glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
+KaqW04MjyaR7YbPMAuhd
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
+6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
+2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
+N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
+zPKwTdb+mciUqXWi4w==
+-----END CERTIFICATE-----
+
+UCA Global G2 Root
+==================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
+
+UCA Extended Validation Root
+============================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
+
+Certigna Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
diff --git a/code/cpp-httplib-0.19.0/example/client.cc b/code/cpp-httplib-0.19.0/example/client.cc
new file mode 100644
index 00000000..a9b0fc0a
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/client.cc
@@ -0,0 +1,41 @@
+//
+//  client.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <httplib.h>
+#include <iostream>
+
+#define CA_CERT_FILE "./ca-bundle.crt"
+
+using namespace std;
+
+int main(void) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  httplib::SSLClient cli("localhost", 8080);
+  // httplib::SSLClient cli("google.com");
+  // httplib::SSLClient cli("www.youtube.com");
+  cli.set_ca_cert_path(CA_CERT_FILE);
+  cli.enable_server_certificate_verification(true);
+#else
+  httplib::Client cli("localhost", 8080);
+#endif
+
+  if (auto res = cli.Get("/hi")) {
+    cout << res->status << endl;
+    cout << res->get_header_value("Content-Type") << endl;
+    cout << res->body << endl;
+  } else {
+    cout << "error code: " << res.error() << std::endl;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    auto result = cli.get_openssl_verify_result();
+    if (result) {
+      cout << "verify error: " << X509_verify_cert_error_string(result) << endl;
+    }
+#endif
+  }
+
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/example/client.vcxproj b/code/cpp-httplib-0.19.0/example/client.vcxproj
new file mode 100644
index 00000000..817847de
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/client.vcxproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6DB1FC63-B153-4279-92B7-D8A11AF285D6}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>client</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="client.cc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/example/example.sln b/code/cpp-httplib-0.19.0/example/example.sln
new file mode 100644
index 00000000..25ca526f
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/example.sln
@@ -0,0 +1,46 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2047
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{864CD288-050A-4C8B-9BEF-3048BD876C5B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcxproj", "{6DB1FC63-B153-4279-92B7-D8A11AF285D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{280E605F-0CB8-4336-8D9F-CE50A9472AE2}"
+	ProjectSection(SolutionItems) = preProject
+		..\README.md = ..\README.md
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.Build.0 = Debug|Win32
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|x64.ActiveCfg = Debug|x64
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|x64.Build.0 = Debug|x64
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.ActiveCfg = Release|Win32
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.Build.0 = Release|Win32
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|x64.ActiveCfg = Release|x64
+		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|x64.Build.0 = Release|x64
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.Build.0 = Debug|Win32
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|x64.ActiveCfg = Debug|x64
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|x64.Build.0 = Debug|x64
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.ActiveCfg = Release|Win32
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.Build.0 = Release|Win32
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|x64.ActiveCfg = Release|x64
+		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7097C9E4-07F8-48C6-A888-BBA9EBB5D17D}
+	EndGlobalSection
+EndGlobal
diff --git a/code/cpp-httplib-0.19.0/example/hello.cc b/code/cpp-httplib-0.19.0/example/hello.cc
new file mode 100644
index 00000000..38d25a62
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/hello.cc
@@ -0,0 +1,19 @@
+//
+//  hello.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <httplib.h>
+using namespace httplib;
+
+int main(void) {
+  Server svr;
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  svr.listen("0.0.0.0", 8080);
+}
diff --git a/code/cpp-httplib-0.19.0/example/one_time_request.cc b/code/cpp-httplib-0.19.0/example/one_time_request.cc
new file mode 100644
index 00000000..9a8ac345
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/one_time_request.cc
@@ -0,0 +1,56 @@
+#include <httplib.h>
+#include <iostream>
+
+using namespace httplib;
+
+const char *HOST = "localhost";
+const int PORT = 1234;
+
+void one_time_request_server(const char *label) {
+  std::thread th;
+  Server svr;
+
+  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
+    res.set_content(std::string("Hello from ") + label, "text/plain");
+
+    // Stop server
+    th = std::thread([&]() { svr.stop(); });
+  });
+
+  svr.listen(HOST, PORT);
+  th.join();
+
+  std::cout << label << " ended..." << std::endl;
+}
+
+void send_request(const char *label) {
+  Client cli(HOST, PORT);
+
+  std::cout << "Send " << label << " request" << std::endl;
+  auto res = cli.Get("/hi");
+
+  if (res) {
+    std::cout << res->body << std::endl;
+  } else {
+    std::cout << "Request error: " + to_string(res.error()) << std::endl;
+  }
+}
+
+int main(void) {
+  auto th1 = std::thread([&]() { one_time_request_server("Server #1"); });
+  auto th2 = std::thread([&]() { one_time_request_server("Server #2"); });
+
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  send_request("1st");
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  send_request("2nd");
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  send_request("3rd");
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  th1.join();
+  th2.join();
+}
diff --git a/code/cpp-httplib-0.19.0/example/redirect.cc b/code/cpp-httplib-0.19.0/example/redirect.cc
new file mode 100644
index 00000000..b1f39396
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/redirect.cc
@@ -0,0 +1,60 @@
+//
+//  redirect.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <httplib.h>
+
+#define SERVER_CERT_FILE "./cert.pem"
+#define SERVER_PRIVATE_KEY_FILE "./key.pem"
+
+using namespace httplib;
+
+int main(void) {
+  // HTTP server
+  Server http;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLServer https(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+#endif
+
+  http.Get("/test", [](const Request & /*req*/, Response &res) {
+    res.set_content("Test\n", "text/plain");
+  });
+
+  http.set_error_handler([](const Request & /*req*/, Response &res) {
+    res.set_redirect("https://localhost:8081/");
+  });
+
+  // HTTPS server
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  https.Get("/", [=](const Request & /*req*/, Response &res) {
+    res.set_redirect("/hi");
+  });
+
+  https.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!\n", "text/plain");
+  });
+
+  https.Get("/stop", [&](const Request & /*req*/, Response & /*res*/) {
+    https.stop();
+    http.stop();
+  });
+#endif
+
+  // Run servers
+  auto httpThread = std::thread([&]() { http.listen("localhost", 8080); });
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto httpsThread = std::thread([&]() { https.listen("localhost", 8081); });
+#endif
+
+  httpThread.join();
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  httpsThread.join();
+#endif
+
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/example/server.cc b/code/cpp-httplib-0.19.0/example/server.cc
new file mode 100644
index 00000000..1c347f5f
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/server.cc
@@ -0,0 +1,113 @@
+//
+//  sample.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <chrono>
+#include <cstdio>
+#include <httplib.h>
+
+#define SERVER_CERT_FILE "./cert.pem"
+#define SERVER_PRIVATE_KEY_FILE "./key.pem"
+
+using namespace httplib;
+
+std::string dump_headers(const Headers &headers) {
+  std::string s;
+  char buf[BUFSIZ];
+
+  for (auto it = headers.begin(); it != headers.end(); ++it) {
+    const auto &x = *it;
+    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
+    s += buf;
+  }
+
+  return s;
+}
+
+std::string log(const Request &req, const Response &res) {
+  std::string s;
+  char buf[BUFSIZ];
+
+  s += "================================\n";
+
+  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
+           req.version.c_str(), req.path.c_str());
+  s += buf;
+
+  std::string query;
+  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
+    const auto &x = *it;
+    snprintf(buf, sizeof(buf), "%c%s=%s",
+             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
+             x.second.c_str());
+    query += buf;
+  }
+  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
+  s += buf;
+
+  s += dump_headers(req.headers);
+
+  s += "--------------------------------\n";
+
+  snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str());
+  s += buf;
+  s += dump_headers(res.headers);
+  s += "\n";
+
+  if (!res.body.empty()) { s += res.body; }
+
+  s += "\n";
+
+  return s;
+}
+
+int main(void) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+#else
+  Server svr;
+#endif
+
+  if (!svr.is_valid()) {
+    printf("server has an error...\n");
+    return -1;
+  }
+
+  svr.Get("/", [=](const Request & /*req*/, Response &res) {
+    res.set_redirect("/hi");
+  });
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!\n", "text/plain");
+  });
+
+  svr.Get("/slow", [](const Request & /*req*/, Response &res) {
+    std::this_thread::sleep_for(std::chrono::seconds(2));
+    res.set_content("Slow...\n", "text/plain");
+  });
+
+  svr.Get("/dump", [](const Request &req, Response &res) {
+    res.set_content(dump_headers(req.headers), "text/plain");
+  });
+
+  svr.Get("/stop",
+          [&](const Request & /*req*/, Response & /*res*/) { svr.stop(); });
+
+  svr.set_error_handler([](const Request & /*req*/, Response &res) {
+    const char *fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
+    char buf[BUFSIZ];
+    snprintf(buf, sizeof(buf), fmt, res.status);
+    res.set_content(buf, "text/html");
+  });
+
+  svr.set_logger([](const Request &req, const Response &res) {
+    printf("%s", log(req, res).c_str());
+  });
+
+  svr.listen("localhost", 8080);
+
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/example/server.vcxproj b/code/cpp-httplib-0.19.0/example/server.vcxproj
new file mode 100644
index 00000000..f18af766
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/server.vcxproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="simplesvr.cc" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{864CD288-050A-4C8B-9BEF-3048BD876C5B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>sample</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/example/server_and_client.cc b/code/cpp-httplib-0.19.0/example/server_and_client.cc
new file mode 100644
index 00000000..34bf8527
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/server_and_client.cc
@@ -0,0 +1,90 @@
+//
+//  server_and_client.cc
+//
+//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <httplib.h>
+#include <iostream>
+#include <string>
+
+using namespace httplib;
+
+std::string dump_headers(const Headers &headers) {
+  std::string s;
+  char buf[BUFSIZ];
+
+  for (auto it = headers.begin(); it != headers.end(); ++it) {
+    const auto &x = *it;
+    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
+    s += buf;
+  }
+
+  return s;
+}
+
+void logger(const Request &req, const Response &res) {
+  std::string s;
+  char buf[BUFSIZ];
+
+  s += "================================\n";
+
+  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
+           req.version.c_str(), req.path.c_str());
+  s += buf;
+
+  std::string query;
+  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
+    const auto &x = *it;
+    snprintf(buf, sizeof(buf), "%c%s=%s",
+             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
+             x.second.c_str());
+    query += buf;
+  }
+  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
+  s += buf;
+
+  s += dump_headers(req.headers);
+
+  s += "--------------------------------\n";
+
+  snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str());
+  s += buf;
+  s += dump_headers(res.headers);
+  s += "\n";
+
+  if (!res.body.empty()) { s += res.body; }
+
+  s += "\n";
+
+  std::cout << s;
+}
+
+int main(void) {
+  // Server
+  Server svr;
+  svr.set_logger(logger);
+
+  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
+    res.set_content("POST", "text/plain");
+  });
+
+  auto th = std::thread([&]() { svr.listen("localhost", 8080); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    th.join();
+  });
+
+  svr.wait_until_ready();
+
+  // Client
+  Client cli{"localhost", 8080};
+
+  std::string body = R"({"hello": "world"})";
+
+  auto res = cli.Post("/post", body, "application/json");
+  std::cout << "--------------------------------" << std::endl;
+  std::cout << to_string(res.error()) << std::endl;
+}
diff --git a/code/cpp-httplib-0.19.0/example/simplecli.cc b/code/cpp-httplib-0.19.0/example/simplecli.cc
new file mode 100644
index 00000000..b005e408
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/simplecli.cc
@@ -0,0 +1,29 @@
+//
+//  simplecli.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <httplib.h>
+#include <iostream>
+
+using namespace std;
+
+int main(void) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto scheme_host_port = "https://localhost:8080";
+#else
+  auto scheme_host_port = "http://localhost:8080";
+#endif
+
+  if (auto res = httplib::Client(scheme_host_port).Get("/hi")) {
+    cout << res->status << endl;
+    cout << res->get_header_value("Content-Type") << endl;
+    cout << res->body << endl;
+  } else {
+    cout << res.error() << endl;
+  }
+
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/example/simplesvr.cc b/code/cpp-httplib-0.19.0/example/simplesvr.cc
new file mode 100644
index 00000000..17a9e985
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/simplesvr.cc
@@ -0,0 +1,135 @@
+//
+//  simplesvr.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <cstdio>
+#include <httplib.h>
+#include <iostream>
+
+#define SERVER_CERT_FILE "./cert.pem"
+#define SERVER_PRIVATE_KEY_FILE "./key.pem"
+
+using namespace httplib;
+using namespace std;
+
+string dump_headers(const Headers &headers) {
+  string s;
+  char buf[BUFSIZ];
+
+  for (const auto &x : headers) {
+    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
+    s += buf;
+  }
+
+  return s;
+}
+
+string dump_multipart_files(const MultipartFormDataMap &files) {
+  string s;
+  char buf[BUFSIZ];
+
+  s += "--------------------------------\n";
+
+  for (const auto &x : files) {
+    const auto &name = x.first;
+    const auto &file = x.second;
+
+    snprintf(buf, sizeof(buf), "name: %s\n", name.c_str());
+    s += buf;
+
+    snprintf(buf, sizeof(buf), "filename: %s\n", file.filename.c_str());
+    s += buf;
+
+    snprintf(buf, sizeof(buf), "content type: %s\n", file.content_type.c_str());
+    s += buf;
+
+    snprintf(buf, sizeof(buf), "text length: %zu\n", file.content.size());
+    s += buf;
+
+    s += "----------------\n";
+  }
+
+  return s;
+}
+
+string log(const Request &req, const Response &res) {
+  string s;
+  char buf[BUFSIZ];
+
+  s += "================================\n";
+
+  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
+           req.version.c_str(), req.path.c_str());
+  s += buf;
+
+  string query;
+  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
+    const auto &x = *it;
+    snprintf(buf, sizeof(buf), "%c%s=%s",
+             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
+             x.second.c_str());
+    query += buf;
+  }
+  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
+  s += buf;
+
+  s += dump_headers(req.headers);
+  s += dump_multipart_files(req.files);
+
+  s += "--------------------------------\n";
+
+  snprintf(buf, sizeof(buf), "%d\n", res.status);
+  s += buf;
+  s += dump_headers(res.headers);
+
+  return s;
+}
+
+int main(int argc, const char **argv) {
+  if (argc > 1 && string("--help") == argv[1]) {
+    cout << "usage: simplesvr [PORT] [DIR]" << endl;
+    return 1;
+  }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+#else
+  Server svr;
+#endif
+
+  svr.Post("/multipart", [](const Request &req, Response &res) {
+    auto body = dump_headers(req.headers) + dump_multipart_files(req.files);
+
+    res.set_content(body, "text/plain");
+  });
+
+  svr.set_error_handler([](const Request & /*req*/, Response &res) {
+    const char *fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
+    char buf[BUFSIZ];
+    snprintf(buf, sizeof(buf), fmt, res.status);
+    res.set_content(buf, "text/html");
+  });
+
+  svr.set_logger(
+      [](const Request &req, const Response &res) { cout << log(req, res); });
+
+  auto port = 8080;
+  if (argc > 1) { port = atoi(argv[1]); }
+
+  auto base_dir = "./";
+  if (argc > 2) { base_dir = argv[2]; }
+
+  if (!svr.set_mount_point("/", base_dir)) {
+    cout << "The specified base directory doesn't exist...";
+    return 1;
+  }
+
+  cout << "The server started at port " << port << "..." << endl;
+
+  svr.listen("localhost", port);
+
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/example/upload.cc b/code/cpp-httplib-0.19.0/example/upload.cc
new file mode 100644
index 00000000..1e4f242a
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/upload.cc
@@ -0,0 +1,61 @@
+//
+//  upload.cc
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#include <fstream>
+#include <httplib.h>
+#include <iostream>
+using namespace httplib;
+using namespace std;
+
+const char *html = R"(
+<form id="formElem">
+  <input type="file" name="image_file" accept="image/*">
+  <input type="file" name="text_file" accept="text/*">
+  <input type="submit">
+</form>
+<script>
+  formElem.onsubmit = async (e) => {
+    e.preventDefault();
+    let res = await fetch('/post', {
+      method: 'POST',
+      body: new FormData(formElem)
+    });
+    console.log(await res.text());
+  };
+</script>
+)";
+
+int main(void) {
+  Server svr;
+
+  svr.Get("/", [](const Request & /*req*/, Response &res) {
+    res.set_content(html, "text/html");
+  });
+
+  svr.Post("/post", [](const Request &req, Response &res) {
+    auto image_file = req.get_file_value("image_file");
+    auto text_file = req.get_file_value("text_file");
+
+    cout << "image file length: " << image_file.content.length() << endl
+         << "image file name: " << image_file.filename << endl
+         << "text file length: " << text_file.content.length() << endl
+         << "text file name: " << text_file.filename << endl;
+
+    {
+      ofstream ofs(image_file.filename, ios::binary);
+      ofs << image_file.content;
+    }
+    {
+      ofstream ofs(text_file.filename);
+      ofs << text_file.content;
+    }
+
+    res.set_content("done", "text/plain");
+  });
+
+  svr.listen("localhost", 1234);
+}
diff --git a/code/cpp-httplib-0.19.0/example/uploader.sh b/code/cpp-httplib-0.19.0/example/uploader.sh
new file mode 100644
index 00000000..4382ae62
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/example/uploader.sh
@@ -0,0 +1,6 @@
+#/usr/bin/env bash
+for i in {1..1000000}
+do
+  echo "#### $i ####"
+  curl -X POST -F image_file=@$1 http://localhost:1234/post > /dev/null
+done
diff --git a/code/cpp-httplib-0.19.0/httplib.h b/code/cpp-httplib-0.19.0/httplib.h
new file mode 100644
index 00000000..e4799dab
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/httplib.h
@@ -0,0 +1,10475 @@
+//
+//  httplib.h
+//
+//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#ifndef CPPHTTPLIB_HTTPLIB_H
+#define CPPHTTPLIB_HTTPLIB_H
+
+#define CPPHTTPLIB_VERSION "0.19.0"
+
+/*
+ * Configuration
+ */
+
+#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND 10000
+#endif
+
+#ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT
+#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 100
+#endif
+
+#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND
+#define CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND 300
+#endif
+
+#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND
+#define CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND
+#define CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND
+#define CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND
+#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND
+#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND
+#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND 300
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND
+#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND
+#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND 5
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND
+#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND
+#define CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_IDLE_INTERVAL_SECOND
+#define CPPHTTPLIB_IDLE_INTERVAL_SECOND 0
+#endif
+
+#ifndef CPPHTTPLIB_IDLE_INTERVAL_USECOND
+#ifdef _WIN32
+#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 10000
+#else
+#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 0
+#endif
+#endif
+
+#ifndef CPPHTTPLIB_REQUEST_URI_MAX_LENGTH
+#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_HEADER_MAX_LENGTH
+#define CPPHTTPLIB_HEADER_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_REDIRECT_MAX_COUNT
+#define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
+#endif
+
+#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
+#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
+#endif
+
+#ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
+#endif
+
+#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
+#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
+#endif
+
+#ifndef CPPHTTPLIB_TCP_NODELAY
+#define CPPHTTPLIB_TCP_NODELAY false
+#endif
+
+#ifndef CPPHTTPLIB_IPV6_V6ONLY
+#define CPPHTTPLIB_IPV6_V6ONLY false
+#endif
+
+#ifndef CPPHTTPLIB_RECV_BUFSIZ
+#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
+#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
+#endif
+
+#ifndef CPPHTTPLIB_THREAD_POOL_COUNT
+#define CPPHTTPLIB_THREAD_POOL_COUNT                                           \
+  ((std::max)(8u, std::thread::hardware_concurrency() > 0                      \
+                      ? std::thread::hardware_concurrency() - 1                \
+                      : 0))
+#endif
+
+#ifndef CPPHTTPLIB_RECV_FLAGS
+#define CPPHTTPLIB_RECV_FLAGS 0
+#endif
+
+#ifndef CPPHTTPLIB_SEND_FLAGS
+#define CPPHTTPLIB_SEND_FLAGS 0
+#endif
+
+#ifndef CPPHTTPLIB_LISTEN_BACKLOG
+#define CPPHTTPLIB_LISTEN_BACKLOG 5
+#endif
+
+/*
+ * Headers
+ */
+
+#ifdef _WIN32
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif //_CRT_SECURE_NO_WARNINGS
+
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif //_CRT_NONSTDC_NO_DEPRECATE
+
+#if defined(_MSC_VER)
+#if _MSC_VER < 1900
+#error Sorry, Visual Studio versions prior to 2015 are not supported
+#endif
+
+#pragma comment(lib, "ws2_32.lib")
+
+#ifdef _WIN64
+using ssize_t = __int64;
+#else
+using ssize_t = long;
+#endif
+#endif // _MSC_VER
+
+#ifndef S_ISREG
+#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
+#endif // S_ISREG
+
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
+#endif // S_ISDIR
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif // NOMINMAX
+
+#include <io.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#ifndef WSA_FLAG_NO_HANDLE_INHERIT
+#define WSA_FLAG_NO_HANDLE_INHERIT 0x80
+#endif
+
+using socket_t = SOCKET;
+#ifdef CPPHTTPLIB_USE_POLL
+#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
+#endif
+
+#else // not _WIN32
+
+#include <arpa/inet.h>
+#if !defined(_AIX) && !defined(__MVS__)
+#include <ifaddrs.h>
+#endif
+#ifdef __MVS__
+#include <strings.h>
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+#endif
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#ifdef __linux__
+#include <resolv.h>
+#endif
+#include <netinet/tcp.h>
+#ifdef CPPHTTPLIB_USE_POLL
+#include <poll.h>
+#endif
+#include <csignal>
+#include <pthread.h>
+#include <sys/mman.h>
+#ifndef __VMS
+#include <sys/select.h>
+#endif
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+using socket_t = int;
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET (-1)
+#endif
+#endif //_WIN32
+
+#include <algorithm>
+#include <array>
+#include <atomic>
+#include <cassert>
+#include <cctype>
+#include <climits>
+#include <condition_variable>
+#include <cstring>
+#include <errno.h>
+#include <exception>
+#include <fcntl.h>
+#include <fstream>
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <regex>
+#include <set>
+#include <sstream>
+#include <string>
+#include <sys/stat.h>
+#include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#ifdef _WIN32
+#include <wincrypt.h>
+
+// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
+// used
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#undef PKCS7_SIGNER_INFO
+
+#ifdef _MSC_VER
+#pragma comment(lib, "crypt32.lib")
+#endif
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#include <TargetConditionals.h>
+#if TARGET_OS_OSX
+#include <CoreFoundation/CoreFoundation.h>
+#include <Security/Security.h>
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+
+#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK)
+#include <openssl/applink.c>
+#endif
+
+#include <iostream>
+#include <sstream>
+
+#if defined(OPENSSL_IS_BORINGSSL) || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010107f
+#error Please use OpenSSL or a current version of BoringSSL
+#endif
+#define SSL_get1_peer_certificate SSL_get_peer_certificate
+#elif OPENSSL_VERSION_NUMBER < 0x30000000L
+#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
+#endif
+
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+#include <zlib.h>
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+#include <brotli/decode.h>
+#include <brotli/encode.h>
+#endif
+
+/*
+ * Declaration
+ */
+namespace httplib {
+
+namespace detail {
+
+/*
+ * Backport std::make_unique from C++14.
+ *
+ * NOTE: This code came up with the following stackoverflow post:
+ * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique
+ *
+ */
+
+template <class T, class... Args>
+typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
+make_unique(Args &&...args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+template <class T>
+typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
+make_unique(std::size_t n) {
+  typedef typename std::remove_extent<T>::type RT;
+  return std::unique_ptr<T>(new RT[n]);
+}
+
+namespace case_ignore {
+
+inline unsigned char to_lower(int c) {
+  const static unsigned char table[256] = {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+      30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+      45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+      60,  61,  62,  63,  64,  97,  98,  99,  100, 101, 102, 103, 104, 105, 106,
+      107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+      122, 91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+      105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+      135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+      150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+      165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+      180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 224, 225, 226,
+      227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+      242, 243, 244, 245, 246, 215, 248, 249, 250, 251, 252, 253, 254, 223, 224,
+      225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+      240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+      255,
+  };
+  return table[(unsigned char)(char)c];
+}
+
+inline bool equal(const std::string &a, const std::string &b) {
+  return a.size() == b.size() &&
+         std::equal(a.begin(), a.end(), b.begin(), [](char ca, char cb) {
+           return to_lower(ca) == to_lower(cb);
+         });
+}
+
+struct equal_to {
+  bool operator()(const std::string &a, const std::string &b) const {
+    return equal(a, b);
+  }
+};
+
+struct hash {
+  size_t operator()(const std::string &key) const {
+    return hash_core(key.data(), key.size(), 0);
+  }
+
+  size_t hash_core(const char *s, size_t l, size_t h) const {
+    return (l == 0) ? h
+                    : hash_core(s + 1, l - 1,
+                                // Unsets the 6 high bits of h, therefore no
+                                // overflow happens
+                                (((std::numeric_limits<size_t>::max)() >> 6) &
+                                 h * 33) ^
+                                    static_cast<unsigned char>(to_lower(*s)));
+  }
+};
+
+} // namespace case_ignore
+
+// This is based on
+// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
+
+struct scope_exit {
+  explicit scope_exit(std::function<void(void)> &&f)
+      : exit_function(std::move(f)), execute_on_destruction{true} {}
+
+  scope_exit(scope_exit &&rhs) noexcept
+      : exit_function(std::move(rhs.exit_function)),
+        execute_on_destruction{rhs.execute_on_destruction} {
+    rhs.release();
+  }
+
+  ~scope_exit() {
+    if (execute_on_destruction) { this->exit_function(); }
+  }
+
+  void release() { this->execute_on_destruction = false; }
+
+private:
+  scope_exit(const scope_exit &) = delete;
+  void operator=(const scope_exit &) = delete;
+  scope_exit &operator=(scope_exit &&) = delete;
+
+  std::function<void(void)> exit_function;
+  bool execute_on_destruction;
+};
+
+} // namespace detail
+
+enum StatusCode {
+  // Information responses
+  Continue_100 = 100,
+  SwitchingProtocol_101 = 101,
+  Processing_102 = 102,
+  EarlyHints_103 = 103,
+
+  // Successful responses
+  OK_200 = 200,
+  Created_201 = 201,
+  Accepted_202 = 202,
+  NonAuthoritativeInformation_203 = 203,
+  NoContent_204 = 204,
+  ResetContent_205 = 205,
+  PartialContent_206 = 206,
+  MultiStatus_207 = 207,
+  AlreadyReported_208 = 208,
+  IMUsed_226 = 226,
+
+  // Redirection messages
+  MultipleChoices_300 = 300,
+  MovedPermanently_301 = 301,
+  Found_302 = 302,
+  SeeOther_303 = 303,
+  NotModified_304 = 304,
+  UseProxy_305 = 305,
+  unused_306 = 306,
+  TemporaryRedirect_307 = 307,
+  PermanentRedirect_308 = 308,
+
+  // Client error responses
+  BadRequest_400 = 400,
+  Unauthorized_401 = 401,
+  PaymentRequired_402 = 402,
+  Forbidden_403 = 403,
+  NotFound_404 = 404,
+  MethodNotAllowed_405 = 405,
+  NotAcceptable_406 = 406,
+  ProxyAuthenticationRequired_407 = 407,
+  RequestTimeout_408 = 408,
+  Conflict_409 = 409,
+  Gone_410 = 410,
+  LengthRequired_411 = 411,
+  PreconditionFailed_412 = 412,
+  PayloadTooLarge_413 = 413,
+  UriTooLong_414 = 414,
+  UnsupportedMediaType_415 = 415,
+  RangeNotSatisfiable_416 = 416,
+  ExpectationFailed_417 = 417,
+  ImATeapot_418 = 418,
+  MisdirectedRequest_421 = 421,
+  UnprocessableContent_422 = 422,
+  Locked_423 = 423,
+  FailedDependency_424 = 424,
+  TooEarly_425 = 425,
+  UpgradeRequired_426 = 426,
+  PreconditionRequired_428 = 428,
+  TooManyRequests_429 = 429,
+  RequestHeaderFieldsTooLarge_431 = 431,
+  UnavailableForLegalReasons_451 = 451,
+
+  // Server error responses
+  InternalServerError_500 = 500,
+  NotImplemented_501 = 501,
+  BadGateway_502 = 502,
+  ServiceUnavailable_503 = 503,
+  GatewayTimeout_504 = 504,
+  HttpVersionNotSupported_505 = 505,
+  VariantAlsoNegotiates_506 = 506,
+  InsufficientStorage_507 = 507,
+  LoopDetected_508 = 508,
+  NotExtended_510 = 510,
+  NetworkAuthenticationRequired_511 = 511,
+};
+
+using Headers =
+    std::unordered_multimap<std::string, std::string, detail::case_ignore::hash,
+                            detail::case_ignore::equal_to>;
+
+using Params = std::multimap<std::string, std::string>;
+using Match = std::smatch;
+
+using Progress = std::function<bool(uint64_t current, uint64_t total)>;
+
+struct Response;
+using ResponseHandler = std::function<bool(const Response &response)>;
+
+struct MultipartFormData {
+  std::string name;
+  std::string content;
+  std::string filename;
+  std::string content_type;
+};
+using MultipartFormDataItems = std::vector<MultipartFormData>;
+using MultipartFormDataMap = std::multimap<std::string, MultipartFormData>;
+
+class DataSink {
+public:
+  DataSink() : os(&sb_), sb_(*this) {}
+
+  DataSink(const DataSink &) = delete;
+  DataSink &operator=(const DataSink &) = delete;
+  DataSink(DataSink &&) = delete;
+  DataSink &operator=(DataSink &&) = delete;
+
+  std::function<bool(const char *data, size_t data_len)> write;
+  std::function<bool()> is_writable;
+  std::function<void()> done;
+  std::function<void(const Headers &trailer)> done_with_trailer;
+  std::ostream os;
+
+private:
+  class data_sink_streambuf final : public std::streambuf {
+  public:
+    explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
+
+  protected:
+    std::streamsize xsputn(const char *s, std::streamsize n) override {
+      sink_.write(s, static_cast<size_t>(n));
+      return n;
+    }
+
+  private:
+    DataSink &sink_;
+  };
+
+  data_sink_streambuf sb_;
+};
+
+using ContentProvider =
+    std::function<bool(size_t offset, size_t length, DataSink &sink)>;
+
+using ContentProviderWithoutLength =
+    std::function<bool(size_t offset, DataSink &sink)>;
+
+using ContentProviderResourceReleaser = std::function<void(bool success)>;
+
+struct MultipartFormDataProvider {
+  std::string name;
+  ContentProviderWithoutLength provider;
+  std::string filename;
+  std::string content_type;
+};
+using MultipartFormDataProviderItems = std::vector<MultipartFormDataProvider>;
+
+using ContentReceiverWithProgress =
+    std::function<bool(const char *data, size_t data_length, uint64_t offset,
+                       uint64_t total_length)>;
+
+using ContentReceiver =
+    std::function<bool(const char *data, size_t data_length)>;
+
+using MultipartContentHeader =
+    std::function<bool(const MultipartFormData &file)>;
+
+class ContentReader {
+public:
+  using Reader = std::function<bool(ContentReceiver receiver)>;
+  using MultipartReader = std::function<bool(MultipartContentHeader header,
+                                             ContentReceiver receiver)>;
+
+  ContentReader(Reader reader, MultipartReader multipart_reader)
+      : reader_(std::move(reader)),
+        multipart_reader_(std::move(multipart_reader)) {}
+
+  bool operator()(MultipartContentHeader header,
+                  ContentReceiver receiver) const {
+    return multipart_reader_(std::move(header), std::move(receiver));
+  }
+
+  bool operator()(ContentReceiver receiver) const {
+    return reader_(std::move(receiver));
+  }
+
+  Reader reader_;
+  MultipartReader multipart_reader_;
+};
+
+using Range = std::pair<ssize_t, ssize_t>;
+using Ranges = std::vector<Range>;
+
+struct Request {
+  std::string method;
+  std::string path;
+  Params params;
+  Headers headers;
+  std::string body;
+
+  std::string remote_addr;
+  int remote_port = -1;
+  std::string local_addr;
+  int local_port = -1;
+
+  // for server
+  std::string version;
+  std::string target;
+  MultipartFormDataMap files;
+  Ranges ranges;
+  Match matches;
+  std::unordered_map<std::string, std::string> path_params;
+  std::function<bool()> is_connection_closed = []() { return true; };
+
+  // for client
+  ResponseHandler response_handler;
+  ContentReceiverWithProgress content_receiver;
+  Progress progress;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  const SSL *ssl = nullptr;
+#endif
+
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, const char *def = "",
+                               size_t id = 0) const;
+  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
+                                size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
+
+  bool has_param(const std::string &key) const;
+  std::string get_param_value(const std::string &key, size_t id = 0) const;
+  size_t get_param_value_count(const std::string &key) const;
+
+  bool is_multipart_form_data() const;
+
+  bool has_file(const std::string &key) const;
+  MultipartFormData get_file_value(const std::string &key) const;
+  std::vector<MultipartFormData> get_file_values(const std::string &key) const;
+
+  // private members...
+  size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
+  size_t content_length_ = 0;
+  ContentProvider content_provider_;
+  bool is_chunked_content_provider_ = false;
+  size_t authorization_count_ = 0;
+  std::chrono::time_point<std::chrono::steady_clock> start_time_ =
+      std::chrono::steady_clock::time_point::min();
+};
+
+struct Response {
+  std::string version;
+  int status = -1;
+  std::string reason;
+  Headers headers;
+  std::string body;
+  std::string location; // Redirect location
+
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, const char *def = "",
+                               size_t id = 0) const;
+  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
+                                size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
+
+  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
+  void set_content(const char *s, size_t n, const std::string &content_type);
+  void set_content(const std::string &s, const std::string &content_type);
+  void set_content(std::string &&s, const std::string &content_type);
+
+  void set_content_provider(
+      size_t length, const std::string &content_type, ContentProvider provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_content_provider(
+      const std::string &content_type, ContentProviderWithoutLength provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_chunked_content_provider(
+      const std::string &content_type, ContentProviderWithoutLength provider,
+      ContentProviderResourceReleaser resource_releaser = nullptr);
+
+  void set_file_content(const std::string &path,
+                        const std::string &content_type);
+  void set_file_content(const std::string &path);
+
+  Response() = default;
+  Response(const Response &) = default;
+  Response &operator=(const Response &) = default;
+  Response(Response &&) = default;
+  Response &operator=(Response &&) = default;
+  ~Response() {
+    if (content_provider_resource_releaser_) {
+      content_provider_resource_releaser_(content_provider_success_);
+    }
+  }
+
+  // private members...
+  size_t content_length_ = 0;
+  ContentProvider content_provider_;
+  ContentProviderResourceReleaser content_provider_resource_releaser_;
+  bool is_chunked_content_provider_ = false;
+  bool content_provider_success_ = false;
+  std::string file_content_path_;
+  std::string file_content_content_type_;
+};
+
+class Stream {
+public:
+  virtual ~Stream() = default;
+
+  virtual bool is_readable() const = 0;
+  virtual bool is_writable() const = 0;
+
+  virtual ssize_t read(char *ptr, size_t size) = 0;
+  virtual ssize_t write(const char *ptr, size_t size) = 0;
+  virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual socket_t socket() const = 0;
+
+  virtual time_t duration() const = 0;
+
+  ssize_t write(const char *ptr);
+  ssize_t write(const std::string &s);
+};
+
+class TaskQueue {
+public:
+  TaskQueue() = default;
+  virtual ~TaskQueue() = default;
+
+  virtual bool enqueue(std::function<void()> fn) = 0;
+  virtual void shutdown() = 0;
+
+  virtual void on_idle() {}
+};
+
+class ThreadPool final : public TaskQueue {
+public:
+  explicit ThreadPool(size_t n, size_t mqr = 0)
+      : shutdown_(false), max_queued_requests_(mqr) {
+    while (n) {
+      threads_.emplace_back(worker(*this));
+      n--;
+    }
+  }
+
+  ThreadPool(const ThreadPool &) = delete;
+  ~ThreadPool() override = default;
+
+  bool enqueue(std::function<void()> fn) override {
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
+        return false;
+      }
+      jobs_.push_back(std::move(fn));
+    }
+
+    cond_.notify_one();
+    return true;
+  }
+
+  void shutdown() override {
+    // Stop all worker threads...
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      shutdown_ = true;
+    }
+
+    cond_.notify_all();
+
+    // Join...
+    for (auto &t : threads_) {
+      t.join();
+    }
+  }
+
+private:
+  struct worker {
+    explicit worker(ThreadPool &pool) : pool_(pool) {}
+
+    void operator()() {
+      for (;;) {
+        std::function<void()> fn;
+        {
+          std::unique_lock<std::mutex> lock(pool_.mutex_);
+
+          pool_.cond_.wait(
+              lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; });
+
+          if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
+
+          fn = pool_.jobs_.front();
+          pool_.jobs_.pop_front();
+        }
+
+        assert(true == static_cast<bool>(fn));
+        fn();
+      }
+
+#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL) &&   \
+    !defined(LIBRESSL_VERSION_NUMBER)
+      OPENSSL_thread_stop();
+#endif
+    }
+
+    ThreadPool &pool_;
+  };
+  friend struct worker;
+
+  std::vector<std::thread> threads_;
+  std::list<std::function<void()>> jobs_;
+
+  bool shutdown_;
+  size_t max_queued_requests_ = 0;
+
+  std::condition_variable cond_;
+  std::mutex mutex_;
+};
+
+using Logger = std::function<void(const Request &, const Response &)>;
+
+using SocketOptions = std::function<void(socket_t sock)>;
+
+void default_socket_options(socket_t sock);
+
+const char *status_message(int status);
+
+std::string get_bearer_token_auth(const Request &req);
+
+namespace detail {
+
+class MatcherBase {
+public:
+  virtual ~MatcherBase() = default;
+
+  // Match request path and populate its matches and
+  virtual bool match(Request &request) const = 0;
+};
+
+/**
+ * Captures parameters in request path and stores them in Request::path_params
+ *
+ * Capture name is a substring of a pattern from : to /.
+ * The rest of the pattern is matched agains the request path directly
+ * Parameters are captured starting from the next character after
+ * the end of the last matched static pattern fragment until the next /.
+ *
+ * Example pattern:
+ * "/path/fragments/:capture/more/fragments/:second_capture"
+ * Static fragments:
+ * "/path/fragments/", "more/fragments/"
+ *
+ * Given the following request path:
+ * "/path/fragments/:1/more/fragments/:2"
+ * the resulting capture will be
+ * {{"capture", "1"}, {"second_capture", "2"}}
+ */
+class PathParamsMatcher final : public MatcherBase {
+public:
+  PathParamsMatcher(const std::string &pattern);
+
+  bool match(Request &request) const override;
+
+private:
+  // Treat segment separators as the end of path parameter capture
+  // Does not need to handle query parameters as they are parsed before path
+  // matching
+  static constexpr char separator = '/';
+
+  // Contains static path fragments to match against, excluding the '/' after
+  // path params
+  // Fragments are separated by path params
+  std::vector<std::string> static_fragments_;
+  // Stores the names of the path parameters to be used as keys in the
+  // Request::path_params map
+  std::vector<std::string> param_names_;
+};
+
+/**
+ * Performs std::regex_match on request path
+ * and stores the result in Request::matches
+ *
+ * Note that regex match is performed directly on the whole request.
+ * This means that wildcard patterns may match multiple path segments with /:
+ * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
+ */
+class RegexMatcher final : public MatcherBase {
+public:
+  RegexMatcher(const std::string &pattern) : regex_(pattern) {}
+
+  bool match(Request &request) const override;
+
+private:
+  std::regex regex_;
+};
+
+ssize_t write_headers(Stream &strm, const Headers &headers);
+
+} // namespace detail
+
+class Server {
+public:
+  using Handler = std::function<void(const Request &, Response &)>;
+
+  using ExceptionHandler =
+      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
+
+  enum class HandlerResponse {
+    Handled,
+    Unhandled,
+  };
+  using HandlerWithResponse =
+      std::function<HandlerResponse(const Request &, Response &)>;
+
+  using HandlerWithContentReader = std::function<void(
+      const Request &, Response &, const ContentReader &content_reader)>;
+
+  using Expect100ContinueHandler =
+      std::function<int(const Request &, Response &)>;
+
+  Server();
+
+  virtual ~Server();
+
+  virtual bool is_valid() const;
+
+  Server &Get(const std::string &pattern, Handler handler);
+  Server &Post(const std::string &pattern, Handler handler);
+  Server &Post(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Put(const std::string &pattern, Handler handler);
+  Server &Put(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Patch(const std::string &pattern, Handler handler);
+  Server &Patch(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Delete(const std::string &pattern, Handler handler);
+  Server &Delete(const std::string &pattern, HandlerWithContentReader handler);
+  Server &Options(const std::string &pattern, Handler handler);
+
+  bool set_base_dir(const std::string &dir,
+                    const std::string &mount_point = std::string());
+  bool set_mount_point(const std::string &mount_point, const std::string &dir,
+                       Headers headers = Headers());
+  bool remove_mount_point(const std::string &mount_point);
+  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                  const std::string &mime);
+  Server &set_default_file_mimetype(const std::string &mime);
+  Server &set_file_request_handler(Handler handler);
+
+  template <class ErrorHandlerFunc>
+  Server &set_error_handler(ErrorHandlerFunc &&handler) {
+    return set_error_handler_core(
+        std::forward<ErrorHandlerFunc>(handler),
+        std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
+  }
+
+  Server &set_exception_handler(ExceptionHandler handler);
+  Server &set_pre_routing_handler(HandlerWithResponse handler);
+  Server &set_post_routing_handler(Handler handler);
+
+  Server &set_expect_100_continue_handler(Expect100ContinueHandler handler);
+  Server &set_logger(Logger logger);
+
+  Server &set_address_family(int family);
+  Server &set_tcp_nodelay(bool on);
+  Server &set_ipv6_v6only(bool on);
+  Server &set_socket_options(SocketOptions socket_options);
+
+  Server &set_default_headers(Headers headers);
+  Server &
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  Server &set_keep_alive_max_count(size_t count);
+  Server &set_keep_alive_timeout(time_t sec);
+
+  Server &set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_idle_interval(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  Server &set_idle_interval(const std::chrono::duration<Rep, Period> &duration);
+
+  Server &set_payload_max_length(size_t length);
+
+  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
+  int bind_to_any_port(const std::string &host, int socket_flags = 0);
+  bool listen_after_bind();
+
+  bool listen(const std::string &host, int port, int socket_flags = 0);
+
+  bool is_running() const;
+  void wait_until_ready() const;
+  void stop();
+  void decommission();
+
+  std::function<TaskQueue *(void)> new_task_queue;
+
+protected:
+  bool process_request(Stream &strm, const std::string &remote_addr,
+                       int remote_port, const std::string &local_addr,
+                       int local_port, bool close_connection,
+                       bool &connection_closed,
+                       const std::function<void(Request &)> &setup_request);
+
+  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
+  size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
+  time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
+  time_t read_timeout_sec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND;
+  time_t read_timeout_usec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND;
+  time_t write_timeout_sec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND;
+  time_t write_timeout_usec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND;
+  time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND;
+  time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND;
+  size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
+
+private:
+  using Handlers =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
+  using HandlersForContentReader =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
+                            HandlerWithContentReader>>;
+
+  static std::unique_ptr<detail::MatcherBase>
+  make_matcher(const std::string &pattern);
+
+  Server &set_error_handler_core(HandlerWithResponse handler, std::true_type);
+  Server &set_error_handler_core(Handler handler, std::false_type);
+
+  socket_t create_server_socket(const std::string &host, int port,
+                                int socket_flags,
+                                SocketOptions socket_options) const;
+  int bind_internal(const std::string &host, int port, int socket_flags);
+  bool listen_internal();
+
+  bool routing(Request &req, Response &res, Stream &strm);
+  bool handle_file_request(const Request &req, Response &res,
+                           bool head = false);
+  bool dispatch_request(Request &req, Response &res,
+                        const Handlers &handlers) const;
+  bool dispatch_request_for_content_reader(
+      Request &req, Response &res, ContentReader content_reader,
+      const HandlersForContentReader &handlers) const;
+
+  bool parse_request_line(const char *s, Request &req) const;
+  void apply_ranges(const Request &req, Response &res,
+                    std::string &content_type, std::string &boundary) const;
+  bool write_response(Stream &strm, bool close_connection, Request &req,
+                      Response &res);
+  bool write_response_with_content(Stream &strm, bool close_connection,
+                                   const Request &req, Response &res);
+  bool write_response_core(Stream &strm, bool close_connection,
+                           const Request &req, Response &res,
+                           bool need_apply_ranges);
+  bool write_content_with_provider(Stream &strm, const Request &req,
+                                   Response &res, const std::string &boundary,
+                                   const std::string &content_type);
+  bool read_content(Stream &strm, Request &req, Response &res);
+  bool
+  read_content_with_content_receiver(Stream &strm, Request &req, Response &res,
+                                     ContentReceiver receiver,
+                                     MultipartContentHeader multipart_header,
+                                     ContentReceiver multipart_receiver);
+  bool read_content_core(Stream &strm, Request &req, Response &res,
+                         ContentReceiver receiver,
+                         MultipartContentHeader multipart_header,
+                         ContentReceiver multipart_receiver) const;
+
+  virtual bool process_and_close_socket(socket_t sock);
+
+  std::atomic<bool> is_running_{false};
+  std::atomic<bool> is_decommisioned{false};
+
+  struct MountPointEntry {
+    std::string mount_point;
+    std::string base_dir;
+    Headers headers;
+  };
+  std::vector<MountPointEntry> base_dirs_;
+  std::map<std::string, std::string> file_extension_and_mimetype_map_;
+  std::string default_file_mimetype_ = "application/octet-stream";
+  Handler file_request_handler_;
+
+  Handlers get_handlers_;
+  Handlers post_handlers_;
+  HandlersForContentReader post_handlers_for_content_reader_;
+  Handlers put_handlers_;
+  HandlersForContentReader put_handlers_for_content_reader_;
+  Handlers patch_handlers_;
+  HandlersForContentReader patch_handlers_for_content_reader_;
+  Handlers delete_handlers_;
+  HandlersForContentReader delete_handlers_for_content_reader_;
+  Handlers options_handlers_;
+
+  HandlerWithResponse error_handler_;
+  ExceptionHandler exception_handler_;
+  HandlerWithResponse pre_routing_handler_;
+  Handler post_routing_handler_;
+  Expect100ContinueHandler expect_100_continue_handler_;
+
+  Logger logger_;
+
+  int address_family_ = AF_UNSPEC;
+  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
+  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
+  SocketOptions socket_options_ = default_socket_options;
+
+  Headers default_headers_;
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+};
+
+enum class Error {
+  Success = 0,
+  Unknown,
+  Connection,
+  BindIPAddress,
+  Read,
+  Write,
+  ExceedRedirectCount,
+  Canceled,
+  SSLConnection,
+  SSLLoadingCerts,
+  SSLServerVerification,
+  SSLServerHostnameVerification,
+  UnsupportedMultipartBoundaryChars,
+  Compression,
+  ConnectionTimeout,
+  ProxyConnection,
+
+  // For internal use only
+  SSLPeerCouldBeClosed_,
+};
+
+std::string to_string(Error error);
+
+std::ostream &operator<<(std::ostream &os, const Error &obj);
+
+class Result {
+public:
+  Result() = default;
+  Result(std::unique_ptr<Response> &&res, Error err,
+         Headers &&request_headers = Headers{})
+      : res_(std::move(res)), err_(err),
+        request_headers_(std::move(request_headers)) {}
+  // Response
+  operator bool() const { return res_ != nullptr; }
+  bool operator==(std::nullptr_t) const { return res_ == nullptr; }
+  bool operator!=(std::nullptr_t) const { return res_ != nullptr; }
+  const Response &value() const { return *res_; }
+  Response &value() { return *res_; }
+  const Response &operator*() const { return *res_; }
+  Response &operator*() { return *res_; }
+  const Response *operator->() const { return res_.get(); }
+  Response *operator->() { return res_.get(); }
+
+  // Error
+  Error error() const { return err_; }
+
+  // Request Headers
+  bool has_request_header(const std::string &key) const;
+  std::string get_request_header_value(const std::string &key,
+                                       const char *def = "",
+                                       size_t id = 0) const;
+  uint64_t get_request_header_value_u64(const std::string &key,
+                                        uint64_t def = 0, size_t id = 0) const;
+  size_t get_request_header_value_count(const std::string &key) const;
+
+private:
+  std::unique_ptr<Response> res_;
+  Error err_ = Error::Unknown;
+  Headers request_headers_;
+};
+
+class ClientImpl {
+public:
+  explicit ClientImpl(const std::string &host);
+
+  explicit ClientImpl(const std::string &host, int port);
+
+  explicit ClientImpl(const std::string &host, int port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path);
+
+  virtual ~ClientImpl();
+
+  virtual bool is_valid() const;
+
+  Result Get(const std::string &path);
+  Result Get(const std::string &path, const Headers &headers);
+  Result Get(const std::string &path, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             Progress progress);
+  Result Get(const std::string &path, ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, ContentReceiver content_receiver,
+             Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver, Progress progress);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler, ContentReceiver content_receiver,
+             Progress progress);
+
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ContentReceiver content_receiver,
+             Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress = nullptr);
+
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const char *body, size_t content_length,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type, Progress progress);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, size_t content_length,
+              ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              size_t content_length, ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params, Progress progress);
+  Result Post(const std::string &path, const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items, const std::string &boundary);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items,
+              const MultipartFormDataProviderItems &provider_items);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type, Progress progress);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, size_t content_length,
+             ContentProvider content_provider, const std::string &content_type);
+  Result Put(const std::string &path,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             size_t content_length, ContentProvider content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params, Progress progress);
+  Result Put(const std::string &path, const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items, const std::string &boundary);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type,
+               Progress progress);
+  Result Patch(const std::string &path, size_t content_length,
+               ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               size_t content_length, ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+
+  Result Delete(const std::string &path);
+  Result Delete(const std::string &path, const Headers &headers);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type,
+                Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type,
+                Progress progress);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
+
+  bool send(Request &req, Response &res, Error &error);
+  Result send(const Request &req);
+
+  void stop();
+
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
+  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
+
+  void set_default_headers(Headers headers);
+
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  void set_address_family(int family);
+  void set_tcp_nodelay(bool on);
+  void set_ipv6_v6only(bool on);
+  void set_socket_options(SocketOptions socket_options);
+
+  void set_connection_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void
+  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_max_timeout(time_t msec);
+  template <class Rep, class Period>
+  void set_max_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
+#endif
+
+  void set_keep_alive(bool on);
+  void set_follow_location(bool on);
+
+  void set_url_encode(bool on);
+
+  void set_compress(bool on);
+
+  void set_decompress(bool on);
+
+  void set_interface(const std::string &intf);
+
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void enable_server_certificate_verification(bool enabled);
+  void enable_server_hostname_verification(bool enabled);
+  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
+#endif
+
+  void set_logger(Logger logger);
+
+protected:
+  struct Socket {
+    socket_t sock = INVALID_SOCKET;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSL *ssl = nullptr;
+#endif
+
+    bool is_open() const { return sock != INVALID_SOCKET; }
+  };
+
+  virtual bool create_and_connect_socket(Socket &socket, Error &error);
+
+  // All of:
+  //   shutdown_ssl
+  //   shutdown_socket
+  //   close_socket
+  // should ONLY be called when socket_mutex_ is locked.
+  // Also, shutdown_ssl and close_socket should also NOT be called concurrently
+  // with a DIFFERENT thread sending requests using that socket.
+  virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
+  void shutdown_socket(Socket &socket) const;
+  void close_socket(Socket &socket);
+
+  bool process_request(Stream &strm, Request &req, Response &res,
+                       bool close_connection, Error &error);
+
+  bool write_content_with_provider(Stream &strm, const Request &req,
+                                   Error &error) const;
+
+  void copy_settings(const ClientImpl &rhs);
+
+  // Socket endpoint information
+  const std::string host_;
+  const int port_;
+  const std::string host_and_port_;
+
+  // Current open socket
+  Socket socket_;
+  mutable std::mutex socket_mutex_;
+  std::recursive_mutex request_mutex_;
+
+  // These are all protected under socket_mutex
+  size_t socket_requests_in_flight_ = 0;
+  std::thread::id socket_requests_are_from_thread_ = std::thread::id();
+  bool socket_should_be_closed_when_request_is_done_ = false;
+
+  // Hostname-IP map
+  std::map<std::string, std::string> addr_map_;
+
+  // Default headers
+  Headers default_headers_;
+
+  // Header writer
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+
+  // Settings
+  std::string client_cert_path_;
+  std::string client_key_path_;
+
+  time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND;
+  time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND;
+  time_t read_timeout_sec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND;
+  time_t read_timeout_usec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND;
+  time_t write_timeout_sec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND;
+  time_t write_timeout_usec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND;
+  time_t max_timeout_msec_ = CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND;
+
+  std::string basic_auth_username_;
+  std::string basic_auth_password_;
+  std::string bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string digest_auth_username_;
+  std::string digest_auth_password_;
+#endif
+
+  bool keep_alive_ = false;
+  bool follow_location_ = false;
+
+  bool url_encode_ = true;
+
+  int address_family_ = AF_UNSPEC;
+  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
+  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
+  SocketOptions socket_options_ = nullptr;
+
+  bool compress_ = false;
+  bool decompress_ = true;
+
+  std::string interface_;
+
+  std::string proxy_host_;
+  int proxy_port_ = -1;
+
+  std::string proxy_basic_auth_username_;
+  std::string proxy_basic_auth_password_;
+  std::string proxy_bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string proxy_digest_auth_username_;
+  std::string proxy_digest_auth_password_;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string ca_cert_file_path_;
+  std::string ca_cert_dir_path_;
+
+  X509_STORE *ca_cert_store_ = nullptr;
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  bool server_certificate_verification_ = true;
+  bool server_hostname_verification_ = true;
+  std::function<bool(SSL *ssl)> server_certificate_verifier_;
+#endif
+
+  Logger logger_;
+
+private:
+  bool send_(Request &req, Response &res, Error &error);
+  Result send_(Request &&req);
+
+  socket_t create_client_socket(Error &error) const;
+  bool read_response_line(Stream &strm, const Request &req,
+                          Response &res) const;
+  bool write_request(Stream &strm, Request &req, bool close_connection,
+                     Error &error);
+  bool redirect(Request &req, Response &res, Error &error);
+  bool handle_request(Stream &strm, Request &req, Response &res,
+                      bool close_connection, Error &error);
+  std::unique_ptr<Response> send_with_content_provider(
+      Request &req, const char *body, size_t content_length,
+      ContentProvider content_provider,
+      ContentProviderWithoutLength content_provider_without_length,
+      const std::string &content_type, Error &error);
+  Result send_with_content_provider(
+      const std::string &method, const std::string &path,
+      const Headers &headers, const char *body, size_t content_length,
+      ContentProvider content_provider,
+      ContentProviderWithoutLength content_provider_without_length,
+      const std::string &content_type, Progress progress);
+  ContentProviderWithoutLength get_multipart_content_provider(
+      const std::string &boundary, const MultipartFormDataItems &items,
+      const MultipartFormDataProviderItems &provider_items) const;
+
+  std::string adjust_host_string(const std::string &host) const;
+
+  virtual bool
+  process_socket(const Socket &socket,
+                 std::chrono::time_point<std::chrono::steady_clock> start_time,
+                 std::function<bool(Stream &strm)> callback);
+  virtual bool is_ssl() const;
+};
+
+class Client {
+public:
+  // Universal interface
+  explicit Client(const std::string &scheme_host_port);
+
+  explicit Client(const std::string &scheme_host_port,
+                  const std::string &client_cert_path,
+                  const std::string &client_key_path);
+
+  // HTTP only interface
+  explicit Client(const std::string &host, int port);
+
+  explicit Client(const std::string &host, int port,
+                  const std::string &client_cert_path,
+                  const std::string &client_key_path);
+
+  Client(Client &&) = default;
+  Client &operator=(Client &&) = default;
+
+  ~Client();
+
+  bool is_valid() const;
+
+  Result Get(const std::string &path);
+  Result Get(const std::string &path, const Headers &headers);
+  Result Get(const std::string &path, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             Progress progress);
+  Result Get(const std::string &path, ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, ContentReceiver content_receiver,
+             Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             ContentReceiver content_receiver, Progress progress);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler,
+             ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
+             ResponseHandler response_handler, ContentReceiver content_receiver,
+             Progress progress);
+  Result Get(const std::string &path, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress);
+
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ContentReceiver content_receiver,
+             Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ResponseHandler response_handler,
+             ContentReceiver content_receiver, Progress progress = nullptr);
+
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const char *body, size_t content_length,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type, Progress progress);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type,
+              Progress progress);
+  Result Post(const std::string &path, size_t content_length,
+              ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              size_t content_length, ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params, Progress progress);
+  Result Post(const std::string &path, const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items, const std::string &boundary);
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items,
+              const MultipartFormDataProviderItems &provider_items);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type, Progress progress);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type,
+             Progress progress);
+  Result Put(const std::string &path, size_t content_length,
+             ContentProvider content_provider, const std::string &content_type);
+  Result Put(const std::string &path,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             size_t content_length, ContentProvider content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params, Progress progress);
+  Result Put(const std::string &path, const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items, const std::string &boundary);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type, Progress progress);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type,
+               Progress progress);
+  Result Patch(const std::string &path, size_t content_length,
+               ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               size_t content_length, ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+
+  Result Delete(const std::string &path);
+  Result Delete(const std::string &path, const Headers &headers);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type,
+                Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type, Progress progress);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type,
+                Progress progress);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
+
+  bool send(Request &req, Response &res, Error &error);
+  Result send(const Request &req);
+
+  void stop();
+
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
+  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
+
+  void set_default_headers(Headers headers);
+
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
+  void set_address_family(int family);
+  void set_tcp_nodelay(bool on);
+  void set_socket_options(SocketOptions socket_options);
+
+  void set_connection_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void
+  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_read_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_write_timeout(time_t sec, time_t usec = 0);
+  template <class Rep, class Period>
+  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_max_timeout(time_t msec);
+  template <class Rep, class Period>
+  void set_max_timeout(const std::chrono::duration<Rep, Period> &duration);
+
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
+#endif
+
+  void set_keep_alive(bool on);
+  void set_follow_location(bool on);
+
+  void set_url_encode(bool on);
+
+  void set_compress(bool on);
+
+  void set_decompress(bool on);
+
+  void set_interface(const std::string &intf);
+
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void enable_server_certificate_verification(bool enabled);
+  void enable_server_hostname_verification(bool enabled);
+  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
+#endif
+
+  void set_logger(Logger logger);
+
+  // SSL
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
+
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
+
+  long get_openssl_verify_result() const;
+
+  SSL_CTX *ssl_context() const;
+#endif
+
+private:
+  std::unique_ptr<ClientImpl> cli_;
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  bool is_ssl_ = false;
+#endif
+};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+class SSLServer : public Server {
+public:
+  SSLServer(const char *cert_path, const char *private_key_path,
+            const char *client_ca_cert_file_path = nullptr,
+            const char *client_ca_cert_dir_path = nullptr,
+            const char *private_key_password = nullptr);
+
+  SSLServer(X509 *cert, EVP_PKEY *private_key,
+            X509_STORE *client_ca_cert_store = nullptr);
+
+  SSLServer(
+      const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback);
+
+  ~SSLServer() override;
+
+  bool is_valid() const override;
+
+  SSL_CTX *ssl_context() const;
+
+  void update_certs(X509 *cert, EVP_PKEY *private_key,
+                    X509_STORE *client_ca_cert_store = nullptr);
+
+private:
+  bool process_and_close_socket(socket_t sock) override;
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+};
+
+class SSLClient final : public ClientImpl {
+public:
+  explicit SSLClient(const std::string &host);
+
+  explicit SSLClient(const std::string &host, int port);
+
+  explicit SSLClient(const std::string &host, int port,
+                     const std::string &client_cert_path,
+                     const std::string &client_key_path,
+                     const std::string &private_key_password = std::string());
+
+  explicit SSLClient(const std::string &host, int port, X509 *client_cert,
+                     EVP_PKEY *client_key,
+                     const std::string &private_key_password = std::string());
+
+  ~SSLClient() override;
+
+  bool is_valid() const override;
+
+  void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
+
+  long get_openssl_verify_result() const;
+
+  SSL_CTX *ssl_context() const;
+
+private:
+  bool create_and_connect_socket(Socket &socket, Error &error) override;
+  void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
+  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
+
+  bool
+  process_socket(const Socket &socket,
+                 std::chrono::time_point<std::chrono::steady_clock> start_time,
+                 std::function<bool(Stream &strm)> callback) override;
+  bool is_ssl() const override;
+
+  bool connect_with_proxy(
+      Socket &sock,
+      std::chrono::time_point<std::chrono::steady_clock> start_time,
+      Response &res, bool &success, Error &error);
+  bool initialize_ssl(Socket &socket, Error &error);
+
+  bool load_certs();
+
+  bool verify_host(X509 *server_cert) const;
+  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
+  bool verify_host_with_common_name(X509 *server_cert) const;
+  bool check_host_name(const char *pattern, size_t pattern_len) const;
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+  std::once_flag initialize_cert_;
+
+  std::vector<std::string> host_components_;
+
+  long verify_result_ = 0;
+
+  friend class ClientImpl;
+};
+#endif
+
+/*
+ * Implementation of template methods.
+ */
+
+namespace detail {
+
+template <typename T, typename U>
+inline void duration_to_sec_and_usec(const T &duration, U callback) {
+  auto sec = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+  auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
+                  duration - std::chrono::seconds(sec))
+                  .count();
+  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
+}
+
+inline bool is_numeric(const std::string &str) {
+  return !str.empty() && std::all_of(str.begin(), str.end(), ::isdigit);
+}
+
+inline uint64_t get_header_value_u64(const Headers &headers,
+                                     const std::string &key, uint64_t def,
+                                     size_t id, bool &is_invalid_value) {
+  is_invalid_value = false;
+  auto rng = headers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) {
+    if (is_numeric(it->second)) {
+      return std::strtoull(it->second.data(), nullptr, 10);
+    } else {
+      is_invalid_value = true;
+    }
+  }
+  return def;
+}
+
+inline uint64_t get_header_value_u64(const Headers &headers,
+                                     const std::string &key, uint64_t def,
+                                     size_t id) {
+  bool dummy = false;
+  return get_header_value_u64(headers, key, def, id, dummy);
+}
+
+} // namespace detail
+
+inline uint64_t Request::get_header_value_u64(const std::string &key,
+                                              uint64_t def, size_t id) const {
+  return detail::get_header_value_u64(headers, key, def, id);
+}
+
+inline uint64_t Response::get_header_value_u64(const std::string &key,
+                                               uint64_t def, size_t id) const {
+  return detail::get_header_value_u64(headers, key, def, id);
+}
+
+inline void default_socket_options(socket_t sock) {
+  int opt = 1;
+#ifdef _WIN32
+  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+             reinterpret_cast<const char *>(&opt), sizeof(opt));
+#else
+#ifdef SO_REUSEPORT
+  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT,
+             reinterpret_cast<const void *>(&opt), sizeof(opt));
+#else
+  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+             reinterpret_cast<const void *>(&opt), sizeof(opt));
+#endif
+#endif
+}
+
+inline const char *status_message(int status) {
+  switch (status) {
+  case StatusCode::Continue_100: return "Continue";
+  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
+  case StatusCode::Processing_102: return "Processing";
+  case StatusCode::EarlyHints_103: return "Early Hints";
+  case StatusCode::OK_200: return "OK";
+  case StatusCode::Created_201: return "Created";
+  case StatusCode::Accepted_202: return "Accepted";
+  case StatusCode::NonAuthoritativeInformation_203:
+    return "Non-Authoritative Information";
+  case StatusCode::NoContent_204: return "No Content";
+  case StatusCode::ResetContent_205: return "Reset Content";
+  case StatusCode::PartialContent_206: return "Partial Content";
+  case StatusCode::MultiStatus_207: return "Multi-Status";
+  case StatusCode::AlreadyReported_208: return "Already Reported";
+  case StatusCode::IMUsed_226: return "IM Used";
+  case StatusCode::MultipleChoices_300: return "Multiple Choices";
+  case StatusCode::MovedPermanently_301: return "Moved Permanently";
+  case StatusCode::Found_302: return "Found";
+  case StatusCode::SeeOther_303: return "See Other";
+  case StatusCode::NotModified_304: return "Not Modified";
+  case StatusCode::UseProxy_305: return "Use Proxy";
+  case StatusCode::unused_306: return "unused";
+  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
+  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
+  case StatusCode::BadRequest_400: return "Bad Request";
+  case StatusCode::Unauthorized_401: return "Unauthorized";
+  case StatusCode::PaymentRequired_402: return "Payment Required";
+  case StatusCode::Forbidden_403: return "Forbidden";
+  case StatusCode::NotFound_404: return "Not Found";
+  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
+  case StatusCode::NotAcceptable_406: return "Not Acceptable";
+  case StatusCode::ProxyAuthenticationRequired_407:
+    return "Proxy Authentication Required";
+  case StatusCode::RequestTimeout_408: return "Request Timeout";
+  case StatusCode::Conflict_409: return "Conflict";
+  case StatusCode::Gone_410: return "Gone";
+  case StatusCode::LengthRequired_411: return "Length Required";
+  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
+  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
+  case StatusCode::UriTooLong_414: return "URI Too Long";
+  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
+  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
+  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
+  case StatusCode::ImATeapot_418: return "I'm a teapot";
+  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
+  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
+  case StatusCode::Locked_423: return "Locked";
+  case StatusCode::FailedDependency_424: return "Failed Dependency";
+  case StatusCode::TooEarly_425: return "Too Early";
+  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
+  case StatusCode::PreconditionRequired_428: return "Precondition Required";
+  case StatusCode::TooManyRequests_429: return "Too Many Requests";
+  case StatusCode::RequestHeaderFieldsTooLarge_431:
+    return "Request Header Fields Too Large";
+  case StatusCode::UnavailableForLegalReasons_451:
+    return "Unavailable For Legal Reasons";
+  case StatusCode::NotImplemented_501: return "Not Implemented";
+  case StatusCode::BadGateway_502: return "Bad Gateway";
+  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
+  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
+  case StatusCode::HttpVersionNotSupported_505:
+    return "HTTP Version Not Supported";
+  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
+  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
+  case StatusCode::LoopDetected_508: return "Loop Detected";
+  case StatusCode::NotExtended_510: return "Not Extended";
+  case StatusCode::NetworkAuthenticationRequired_511:
+    return "Network Authentication Required";
+
+  default:
+  case StatusCode::InternalServerError_500: return "Internal Server Error";
+  }
+}
+
+inline std::string get_bearer_token_auth(const Request &req) {
+  if (req.has_header("Authorization")) {
+    static std::string BearerHeaderPrefix = "Bearer ";
+    return req.get_header_value("Authorization")
+        .substr(BearerHeaderPrefix.length());
+  }
+  return "";
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
+  return *this;
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
+  return *this;
+}
+
+template <class Rep, class Period>
+inline Server &
+Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); });
+  return *this;
+}
+
+inline std::string to_string(const Error error) {
+  switch (error) {
+  case Error::Success: return "Success (no error)";
+  case Error::Connection: return "Could not establish connection";
+  case Error::BindIPAddress: return "Failed to bind IP address";
+  case Error::Read: return "Failed to read connection";
+  case Error::Write: return "Failed to write connection";
+  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
+  case Error::Canceled: return "Connection handling canceled";
+  case Error::SSLConnection: return "SSL connection failed";
+  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
+  case Error::SSLServerVerification: return "SSL server verification failed";
+  case Error::SSLServerHostnameVerification:
+    return "SSL server hostname verification failed";
+  case Error::UnsupportedMultipartBoundaryChars:
+    return "Unsupported HTTP multipart boundary characters";
+  case Error::Compression: return "Compression failed";
+  case Error::ConnectionTimeout: return "Connection timed out";
+  case Error::ProxyConnection: return "Proxy connection failed";
+  case Error::Unknown: return "Unknown";
+  default: break;
+  }
+
+  return "Invalid";
+}
+
+inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
+  os << to_string(obj);
+  os << " (" << static_cast<std::underlying_type<Error>::type>(obj) << ')';
+  return os;
+}
+
+inline uint64_t Result::get_request_header_value_u64(const std::string &key,
+                                                     uint64_t def,
+                                                     size_t id) const {
+  return detail::get_header_value_u64(request_headers_, key, def, id);
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_connection_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) {
+    set_connection_timeout(sec, usec);
+  });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_read_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_write_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  detail::duration_to_sec_and_usec(
+      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
+}
+
+template <class Rep, class Period>
+inline void ClientImpl::set_max_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  auto msec =
+      std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
+  set_max_timeout(msec);
+}
+
+template <class Rep, class Period>
+inline void Client::set_connection_timeout(
+    const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_connection_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_read_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_write_timeout(duration);
+}
+
+template <class Rep, class Period>
+inline void
+Client::set_max_timeout(const std::chrono::duration<Rep, Period> &duration) {
+  cli_->set_max_timeout(duration);
+}
+
+/*
+ * Forward declarations and types that will be part of the .h file if split into
+ * .h + .cc.
+ */
+
+std::string hosted_at(const std::string &hostname);
+
+void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
+
+std::string append_query_params(const std::string &path, const Params &params);
+
+std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
+
+std::pair<std::string, std::string>
+make_basic_authentication_header(const std::string &username,
+                                 const std::string &password,
+                                 bool is_proxy = false);
+
+namespace detail {
+
+#if defined(_WIN32)
+inline std::wstring u8string_to_wstring(const char *s) {
+  std::wstring ws;
+  auto len = static_cast<int>(strlen(s));
+  auto wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, nullptr, 0);
+  if (wlen > 0) {
+    ws.resize(wlen);
+    wlen = ::MultiByteToWideChar(
+        CP_UTF8, 0, s, len,
+        const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(ws.data())), wlen);
+    if (wlen != static_cast<int>(ws.size())) { ws.clear(); }
+  }
+  return ws;
+}
+#endif
+
+struct FileStat {
+  FileStat(const std::string &path);
+  bool is_file() const;
+  bool is_dir() const;
+
+private:
+#if defined(_WIN32)
+  struct _stat st_;
+#else
+  struct stat st_;
+#endif
+  int ret_ = -1;
+};
+
+std::string encode_query_param(const std::string &value);
+
+std::string decode_url(const std::string &s, bool convert_plus_to_space);
+
+void read_file(const std::string &path, std::string &out);
+
+std::string trim_copy(const std::string &s);
+
+void divide(
+    const char *data, std::size_t size, char d,
+    std::function<void(const char *, std::size_t, const char *, std::size_t)>
+        fn);
+
+void divide(
+    const std::string &str, char d,
+    std::function<void(const char *, std::size_t, const char *, std::size_t)>
+        fn);
+
+void split(const char *b, const char *e, char d,
+           std::function<void(const char *, const char *)> fn);
+
+void split(const char *b, const char *e, char d, size_t m,
+           std::function<void(const char *, const char *)> fn);
+
+bool process_client_socket(
+    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &)> callback);
+
+socket_t create_client_socket(const std::string &host, const std::string &ip,
+                              int port, int address_family, bool tcp_nodelay,
+                              bool ipv6_v6only, SocketOptions socket_options,
+                              time_t connection_timeout_sec,
+                              time_t connection_timeout_usec,
+                              time_t read_timeout_sec, time_t read_timeout_usec,
+                              time_t write_timeout_sec,
+                              time_t write_timeout_usec,
+                              const std::string &intf, Error &error);
+
+const char *get_header_value(const Headers &headers, const std::string &key,
+                             const char *def, size_t id);
+
+std::string params_to_query_str(const Params &params);
+
+void parse_query_text(const char *data, std::size_t size, Params &params);
+
+void parse_query_text(const std::string &s, Params &params);
+
+bool parse_multipart_boundary(const std::string &content_type,
+                              std::string &boundary);
+
+bool parse_range_header(const std::string &s, Ranges &ranges);
+
+int close_socket(socket_t sock);
+
+ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
+
+ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
+
+enum class EncodingType { None = 0, Gzip, Brotli };
+
+EncodingType encoding_type(const Request &req, const Response &res);
+
+class BufferStream final : public Stream {
+public:
+  BufferStream() = default;
+  ~BufferStream() override = default;
+
+  bool is_readable() const override;
+  bool is_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+  time_t duration() const override;
+
+  const std::string &get_buffer() const;
+
+private:
+  std::string buffer;
+  size_t position = 0;
+};
+
+class compressor {
+public:
+  virtual ~compressor() = default;
+
+  typedef std::function<bool(const char *data, size_t data_len)> Callback;
+  virtual bool compress(const char *data, size_t data_length, bool last,
+                        Callback callback) = 0;
+};
+
+class decompressor {
+public:
+  virtual ~decompressor() = default;
+
+  virtual bool is_valid() const = 0;
+
+  typedef std::function<bool(const char *data, size_t data_len)> Callback;
+  virtual bool decompress(const char *data, size_t data_length,
+                          Callback callback) = 0;
+};
+
+class nocompressor final : public compressor {
+public:
+  ~nocompressor() override = default;
+
+  bool compress(const char *data, size_t data_length, bool /*last*/,
+                Callback callback) override;
+};
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+class gzip_compressor final : public compressor {
+public:
+  gzip_compressor();
+  ~gzip_compressor() override;
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  bool is_valid_ = false;
+  z_stream strm_;
+};
+
+class gzip_decompressor final : public decompressor {
+public:
+  gzip_decompressor();
+  ~gzip_decompressor() override;
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  bool is_valid_ = false;
+  z_stream strm_;
+};
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+class brotli_compressor final : public compressor {
+public:
+  brotli_compressor();
+  ~brotli_compressor();
+
+  bool compress(const char *data, size_t data_length, bool last,
+                Callback callback) override;
+
+private:
+  BrotliEncoderState *state_ = nullptr;
+};
+
+class brotli_decompressor final : public decompressor {
+public:
+  brotli_decompressor();
+  ~brotli_decompressor();
+
+  bool is_valid() const override;
+
+  bool decompress(const char *data, size_t data_length,
+                  Callback callback) override;
+
+private:
+  BrotliDecoderResult decoder_r;
+  BrotliDecoderState *decoder_s = nullptr;
+};
+#endif
+
+// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
+// to store data. The call can set memory on stack for performance.
+class stream_line_reader {
+public:
+  stream_line_reader(Stream &strm, char *fixed_buffer,
+                     size_t fixed_buffer_size);
+  const char *ptr() const;
+  size_t size() const;
+  bool end_with_crlf() const;
+  bool getline();
+
+private:
+  void append(char c);
+
+  Stream &strm_;
+  char *fixed_buffer_;
+  const size_t fixed_buffer_size_;
+  size_t fixed_buffer_used_size_ = 0;
+  std::string glowable_buffer_;
+};
+
+class mmap {
+public:
+  mmap(const char *path);
+  ~mmap();
+
+  bool open(const char *path);
+  void close();
+
+  bool is_open() const;
+  size_t size() const;
+  const char *data() const;
+
+private:
+#if defined(_WIN32)
+  HANDLE hFile_ = NULL;
+  HANDLE hMapping_ = NULL;
+#else
+  int fd_ = -1;
+#endif
+  size_t size_ = 0;
+  void *addr_ = nullptr;
+  bool is_open_empty_file = false;
+};
+
+// NOTE: https://www.rfc-editor.org/rfc/rfc9110#section-5
+namespace fields {
+
+inline bool is_token_char(char c) {
+  return std::isalnum(c) || c == '!' || c == '#' || c == '$' || c == '%' ||
+         c == '&' || c == '\'' || c == '*' || c == '+' || c == '-' ||
+         c == '.' || c == '^' || c == '_' || c == '`' || c == '|' || c == '~';
+}
+
+inline bool is_token(const std::string &s) {
+  if (s.empty()) { return false; }
+  for (auto c : s) {
+    if (!is_token_char(c)) { return false; }
+  }
+  return true;
+}
+
+inline bool is_field_name(const std::string &s) { return is_token(s); }
+
+inline bool is_vchar(char c) { return c >= 33 && c <= 126; }
+
+inline bool is_obs_text(char c) { return 128 <= static_cast<unsigned char>(c); }
+
+inline bool is_field_vchar(char c) { return is_vchar(c) || is_obs_text(c); }
+
+inline bool is_field_content(const std::string &s) {
+  if (s.empty()) { return true; }
+
+  if (s.size() == 1) {
+    return is_field_vchar(s[0]);
+  } else if (s.size() == 2) {
+    return is_field_vchar(s[0]) && is_field_vchar(s[1]);
+  } else {
+    size_t i = 0;
+
+    if (!is_field_vchar(s[i])) { return false; }
+    i++;
+
+    while (i < s.size() - 1) {
+      auto c = s[i++];
+      if (c == ' ' || c == '\t' || is_field_vchar(c)) {
+      } else {
+        return false;
+      }
+    }
+
+    return is_field_vchar(s[i]);
+  }
+}
+
+inline bool is_field_value(const std::string &s) { return is_field_content(s); }
+
+} // namespace fields
+
+} // namespace detail
+
+// ----------------------------------------------------------------------------
+
+/*
+ * Implementation that will be part of the .cc file if split into .h + .cc.
+ */
+
+namespace detail {
+
+inline bool is_hex(char c, int &v) {
+  if (0x20 <= c && isdigit(c)) {
+    v = c - '0';
+    return true;
+  } else if ('A' <= c && c <= 'F') {
+    v = c - 'A' + 10;
+    return true;
+  } else if ('a' <= c && c <= 'f') {
+    v = c - 'a' + 10;
+    return true;
+  }
+  return false;
+}
+
+inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
+                          int &val) {
+  if (i >= s.size()) { return false; }
+
+  val = 0;
+  for (; cnt; i++, cnt--) {
+    if (!s[i]) { return false; }
+    auto v = 0;
+    if (is_hex(s[i], v)) {
+      val = val * 16 + v;
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+inline std::string from_i_to_hex(size_t n) {
+  static const auto charset = "0123456789abcdef";
+  std::string ret;
+  do {
+    ret = charset[n & 15] + ret;
+    n >>= 4;
+  } while (n > 0);
+  return ret;
+}
+
+inline size_t to_utf8(int code, char *buff) {
+  if (code < 0x0080) {
+    buff[0] = static_cast<char>(code & 0x7F);
+    return 1;
+  } else if (code < 0x0800) {
+    buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
+    buff[1] = static_cast<char>(0x80 | (code & 0x3F));
+    return 2;
+  } else if (code < 0xD800) {
+    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
+    return 3;
+  } else if (code < 0xE000) { // D800 - DFFF is invalid...
+    return 0;
+  } else if (code < 0x10000) {
+    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
+    return 3;
+  } else if (code < 0x110000) {
+    buff[0] = static_cast<char>(0xF0 | ((code >> 18) & 0x7));
+    buff[1] = static_cast<char>(0x80 | ((code >> 12) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
+    buff[3] = static_cast<char>(0x80 | (code & 0x3F));
+    return 4;
+  }
+
+  // NOTREACHED
+  return 0;
+}
+
+// NOTE: This code came up with the following stackoverflow post:
+// https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c
+inline std::string base64_encode(const std::string &in) {
+  static const auto lookup =
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+  std::string out;
+  out.reserve(in.size());
+
+  auto val = 0;
+  auto valb = -6;
+
+  for (auto c : in) {
+    val = (val << 8) + static_cast<uint8_t>(c);
+    valb += 8;
+    while (valb >= 0) {
+      out.push_back(lookup[(val >> valb) & 0x3F]);
+      valb -= 6;
+    }
+  }
+
+  if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); }
+
+  while (out.size() % 4) {
+    out.push_back('=');
+  }
+
+  return out;
+}
+
+inline bool is_valid_path(const std::string &path) {
+  size_t level = 0;
+  size_t i = 0;
+
+  // Skip slash
+  while (i < path.size() && path[i] == '/') {
+    i++;
+  }
+
+  while (i < path.size()) {
+    // Read component
+    auto beg = i;
+    while (i < path.size() && path[i] != '/') {
+      if (path[i] == '\0') {
+        return false;
+      } else if (path[i] == '\\') {
+        return false;
+      }
+      i++;
+    }
+
+    auto len = i - beg;
+    assert(len > 0);
+
+    if (!path.compare(beg, len, ".")) {
+      ;
+    } else if (!path.compare(beg, len, "..")) {
+      if (level == 0) { return false; }
+      level--;
+    } else {
+      level++;
+    }
+
+    // Skip slash
+    while (i < path.size() && path[i] == '/') {
+      i++;
+    }
+  }
+
+  return true;
+}
+
+inline FileStat::FileStat(const std::string &path) {
+#if defined(_WIN32)
+  auto wpath = u8string_to_wstring(path.c_str());
+  ret_ = _wstat(wpath.c_str(), &st_);
+#else
+  ret_ = stat(path.c_str(), &st_);
+#endif
+}
+inline bool FileStat::is_file() const {
+  return ret_ >= 0 && S_ISREG(st_.st_mode);
+}
+inline bool FileStat::is_dir() const {
+  return ret_ >= 0 && S_ISDIR(st_.st_mode);
+}
+
+inline std::string encode_query_param(const std::string &value) {
+  std::ostringstream escaped;
+  escaped.fill('0');
+  escaped << std::hex;
+
+  for (auto c : value) {
+    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
+        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
+        c == ')') {
+      escaped << c;
+    } else {
+      escaped << std::uppercase;
+      escaped << '%' << std::setw(2)
+              << static_cast<int>(static_cast<unsigned char>(c));
+      escaped << std::nouppercase;
+    }
+  }
+
+  return escaped.str();
+}
+
+inline std::string encode_url(const std::string &s) {
+  std::string result;
+  result.reserve(s.size());
+
+  for (size_t i = 0; s[i]; i++) {
+    switch (s[i]) {
+    case ' ': result += "%20"; break;
+    case '+': result += "%2B"; break;
+    case '\r': result += "%0D"; break;
+    case '\n': result += "%0A"; break;
+    case '\'': result += "%27"; break;
+    case ',': result += "%2C"; break;
+    // case ':': result += "%3A"; break; // ok? probably...
+    case ';': result += "%3B"; break;
+    default:
+      auto c = static_cast<uint8_t>(s[i]);
+      if (c >= 0x80) {
+        result += '%';
+        char hex[4];
+        auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
+        assert(len == 2);
+        result.append(hex, static_cast<size_t>(len));
+      } else {
+        result += s[i];
+      }
+      break;
+    }
+  }
+
+  return result;
+}
+
+inline std::string decode_url(const std::string &s,
+                              bool convert_plus_to_space) {
+  std::string result;
+
+  for (size_t i = 0; i < s.size(); i++) {
+    if (s[i] == '%' && i + 1 < s.size()) {
+      if (s[i + 1] == 'u') {
+        auto val = 0;
+        if (from_hex_to_i(s, i + 2, 4, val)) {
+          // 4 digits Unicode codes
+          char buff[4];
+          size_t len = to_utf8(val, buff);
+          if (len > 0) { result.append(buff, len); }
+          i += 5; // 'u0000'
+        } else {
+          result += s[i];
+        }
+      } else {
+        auto val = 0;
+        if (from_hex_to_i(s, i + 1, 2, val)) {
+          // 2 digits hex codes
+          result += static_cast<char>(val);
+          i += 2; // '00'
+        } else {
+          result += s[i];
+        }
+      }
+    } else if (convert_plus_to_space && s[i] == '+') {
+      result += ' ';
+    } else {
+      result += s[i];
+    }
+  }
+
+  return result;
+}
+
+inline void read_file(const std::string &path, std::string &out) {
+  std::ifstream fs(path, std::ios_base::binary);
+  fs.seekg(0, std::ios_base::end);
+  auto size = fs.tellg();
+  fs.seekg(0);
+  out.resize(static_cast<size_t>(size));
+  fs.read(&out[0], static_cast<std::streamsize>(size));
+}
+
+inline std::string file_extension(const std::string &path) {
+  std::smatch m;
+  static auto re = std::regex("\\.([a-zA-Z0-9]+)$");
+  if (std::regex_search(path, m, re)) { return m[1].str(); }
+  return std::string();
+}
+
+inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; }
+
+inline std::pair<size_t, size_t> trim(const char *b, const char *e, size_t left,
+                                      size_t right) {
+  while (b + left < e && is_space_or_tab(b[left])) {
+    left++;
+  }
+  while (right > 0 && is_space_or_tab(b[right - 1])) {
+    right--;
+  }
+  return std::make_pair(left, right);
+}
+
+inline std::string trim_copy(const std::string &s) {
+  auto r = trim(s.data(), s.data() + s.size(), 0, s.size());
+  return s.substr(r.first, r.second - r.first);
+}
+
+inline std::string trim_double_quotes_copy(const std::string &s) {
+  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
+    return s.substr(1, s.size() - 2);
+  }
+  return s;
+}
+
+inline void
+divide(const char *data, std::size_t size, char d,
+       std::function<void(const char *, std::size_t, const char *, std::size_t)>
+           fn) {
+  const auto it = std::find(data, data + size, d);
+  const auto found = static_cast<std::size_t>(it != data + size);
+  const auto lhs_data = data;
+  const auto lhs_size = static_cast<std::size_t>(it - data);
+  const auto rhs_data = it + found;
+  const auto rhs_size = size - lhs_size - found;
+
+  fn(lhs_data, lhs_size, rhs_data, rhs_size);
+}
+
+inline void
+divide(const std::string &str, char d,
+       std::function<void(const char *, std::size_t, const char *, std::size_t)>
+           fn) {
+  divide(str.data(), str.size(), d, std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d,
+                  std::function<void(const char *, const char *)> fn) {
+  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d, size_t m,
+                  std::function<void(const char *, const char *)> fn) {
+  size_t i = 0;
+  size_t beg = 0;
+  size_t count = 1;
+
+  while (e ? (b + i < e) : (b[i] != '\0')) {
+    if (b[i] == d && count < m) {
+      auto r = trim(b, e, beg, i);
+      if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
+      beg = i + 1;
+      count++;
+    }
+    i++;
+  }
+
+  if (i) {
+    auto r = trim(b, e, beg, i);
+    if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
+  }
+}
+
+inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer,
+                                              size_t fixed_buffer_size)
+    : strm_(strm), fixed_buffer_(fixed_buffer),
+      fixed_buffer_size_(fixed_buffer_size) {}
+
+inline const char *stream_line_reader::ptr() const {
+  if (glowable_buffer_.empty()) {
+    return fixed_buffer_;
+  } else {
+    return glowable_buffer_.data();
+  }
+}
+
+inline size_t stream_line_reader::size() const {
+  if (glowable_buffer_.empty()) {
+    return fixed_buffer_used_size_;
+  } else {
+    return glowable_buffer_.size();
+  }
+}
+
+inline bool stream_line_reader::end_with_crlf() const {
+  auto end = ptr() + size();
+  return size() >= 2 && end[-2] == '\r' && end[-1] == '\n';
+}
+
+inline bool stream_line_reader::getline() {
+  fixed_buffer_used_size_ = 0;
+  glowable_buffer_.clear();
+
+#ifndef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+  char prev_byte = 0;
+#endif
+
+  for (size_t i = 0;; i++) {
+    char byte;
+    auto n = strm_.read(&byte, 1);
+
+    if (n < 0) {
+      return false;
+    } else if (n == 0) {
+      if (i == 0) {
+        return false;
+      } else {
+        break;
+      }
+    }
+
+    append(byte);
+
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+    if (byte == '\n') { break; }
+#else
+    if (prev_byte == '\r' && byte == '\n') { break; }
+    prev_byte = byte;
+#endif
+  }
+
+  return true;
+}
+
+inline void stream_line_reader::append(char c) {
+  if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
+    fixed_buffer_[fixed_buffer_used_size_++] = c;
+    fixed_buffer_[fixed_buffer_used_size_] = '\0';
+  } else {
+    if (glowable_buffer_.empty()) {
+      assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
+      glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
+    }
+    glowable_buffer_ += c;
+  }
+}
+
+inline mmap::mmap(const char *path) { open(path); }
+
+inline mmap::~mmap() { close(); }
+
+inline bool mmap::open(const char *path) {
+  close();
+
+#if defined(_WIN32)
+  auto wpath = u8string_to_wstring(path);
+  if (wpath.empty()) { return false; }
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,
+                         OPEN_EXISTING, NULL);
+#else
+  hFile_ = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
+                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
+
+  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
+
+  LARGE_INTEGER size{};
+  if (!::GetFileSizeEx(hFile_, &size)) { return false; }
+  // If the following line doesn't compile due to QuadPart, update Windows SDK.
+  // See:
+  // https://github.com/yhirose/cpp-httplib/issues/1903#issuecomment-2316520721
+  if (static_cast<ULONGLONG>(size.QuadPart) >
+      (std::numeric_limits<decltype(size_)>::max)()) {
+    // `size_t` might be 32-bits, on 32-bits Windows.
+    return false;
+  }
+  size_ = static_cast<size_t>(size.QuadPart);
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  hMapping_ =
+      ::CreateFileMappingFromApp(hFile_, NULL, PAGE_READONLY, size_, NULL);
+#else
+  hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
+#endif
+
+  // Special treatment for an empty file...
+  if (hMapping_ == NULL && size_ == 0) {
+    close();
+    is_open_empty_file = true;
+    return true;
+  }
+
+  if (hMapping_ == NULL) {
+    close();
+    return false;
+  }
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+  addr_ = ::MapViewOfFileFromApp(hMapping_, FILE_MAP_READ, 0, 0);
+#else
+  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
+#endif
+
+  if (addr_ == nullptr) {
+    close();
+    return false;
+  }
+#else
+  fd_ = ::open(path, O_RDONLY);
+  if (fd_ == -1) { return false; }
+
+  struct stat sb;
+  if (fstat(fd_, &sb) == -1) {
+    close();
+    return false;
+  }
+  size_ = static_cast<size_t>(sb.st_size);
+
+  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
+
+  // Special treatment for an empty file...
+  if (addr_ == MAP_FAILED && size_ == 0) {
+    close();
+    is_open_empty_file = true;
+    return false;
+  }
+#endif
+
+  return true;
+}
+
+inline bool mmap::is_open() const {
+  return is_open_empty_file ? true : addr_ != nullptr;
+}
+
+inline size_t mmap::size() const { return size_; }
+
+inline const char *mmap::data() const {
+  return is_open_empty_file ? "" : static_cast<const char *>(addr_);
+}
+
+inline void mmap::close() {
+#if defined(_WIN32)
+  if (addr_) {
+    ::UnmapViewOfFile(addr_);
+    addr_ = nullptr;
+  }
+
+  if (hMapping_) {
+    ::CloseHandle(hMapping_);
+    hMapping_ = NULL;
+  }
+
+  if (hFile_ != INVALID_HANDLE_VALUE) {
+    ::CloseHandle(hFile_);
+    hFile_ = INVALID_HANDLE_VALUE;
+  }
+
+  is_open_empty_file = false;
+#else
+  if (addr_ != nullptr) {
+    munmap(addr_, size_);
+    addr_ = nullptr;
+  }
+
+  if (fd_ != -1) {
+    ::close(fd_);
+    fd_ = -1;
+  }
+#endif
+  size_ = 0;
+}
+inline int close_socket(socket_t sock) {
+#ifdef _WIN32
+  return closesocket(sock);
+#else
+  return close(sock);
+#endif
+}
+
+template <typename T> inline ssize_t handle_EINTR(T fn) {
+  ssize_t res = 0;
+  while (true) {
+    res = fn();
+    if (res < 0 && errno == EINTR) {
+      std::this_thread::sleep_for(std::chrono::microseconds{1});
+      continue;
+    }
+    break;
+  }
+  return res;
+}
+
+inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
+  return handle_EINTR([&]() {
+    return recv(sock,
+#ifdef _WIN32
+                static_cast<char *>(ptr), static_cast<int>(size),
+#else
+                ptr, size,
+#endif
+                flags);
+  });
+}
+
+inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size,
+                           int flags) {
+  return handle_EINTR([&]() {
+    return send(sock,
+#ifdef _WIN32
+                static_cast<const char *>(ptr), static_cast<int>(size),
+#else
+                ptr, size,
+#endif
+                flags);
+  });
+}
+
+template <bool Read>
+inline ssize_t select_impl(socket_t sock, time_t sec, time_t usec) {
+#ifdef CPPHTTPLIB_USE_POLL
+  struct pollfd pfd;
+  pfd.fd = sock;
+  pfd.events = (Read ? POLLIN : POLLOUT);
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  return handle_EINTR([&]() { return poll(&pfd, 1, timeout); });
+#else
+#ifndef _WIN32
+  if (sock >= FD_SETSIZE) { return -1; }
+#endif
+
+  fd_set fds, *rfds, *wfds;
+  FD_ZERO(&fds);
+  FD_SET(sock, &fds);
+  rfds = (Read ? &fds : nullptr);
+  wfds = (Read ? nullptr : &fds);
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  return handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), rfds, wfds, nullptr, &tv);
+  });
+#endif
+}
+
+inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
+  return select_impl<true>(sock, sec, usec);
+}
+
+inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
+  return select_impl<false>(sock, sec, usec);
+}
+
+inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
+                                        time_t usec) {
+#ifdef CPPHTTPLIB_USE_POLL
+  struct pollfd pfd_read;
+  pfd_read.fd = sock;
+  pfd_read.events = POLLIN | POLLOUT;
+
+  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
+
+  auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
+
+  if (poll_res == 0) { return Error::ConnectionTimeout; }
+
+  if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
+    auto error = 0;
+    socklen_t len = sizeof(error);
+    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
+                          reinterpret_cast<char *>(&error), &len);
+    auto successful = res >= 0 && !error;
+    return successful ? Error::Success : Error::Connection;
+  }
+
+  return Error::Connection;
+#else
+#ifndef _WIN32
+  if (sock >= FD_SETSIZE) { return Error::Connection; }
+#endif
+
+  fd_set fdsr;
+  FD_ZERO(&fdsr);
+  FD_SET(sock, &fdsr);
+
+  auto fdsw = fdsr;
+  auto fdse = fdsr;
+
+  timeval tv;
+  tv.tv_sec = static_cast<long>(sec);
+  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
+
+  auto ret = handle_EINTR([&]() {
+    return select(static_cast<int>(sock + 1), &fdsr, &fdsw, &fdse, &tv);
+  });
+
+  if (ret == 0) { return Error::ConnectionTimeout; }
+
+  if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
+    auto error = 0;
+    socklen_t len = sizeof(error);
+    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
+                          reinterpret_cast<char *>(&error), &len);
+    auto successful = res >= 0 && !error;
+    return successful ? Error::Success : Error::Connection;
+  }
+  return Error::Connection;
+#endif
+}
+
+inline bool is_socket_alive(socket_t sock) {
+  const auto val = detail::select_read(sock, 0, 0);
+  if (val == 0) {
+    return true;
+  } else if (val < 0 && errno == EBADF) {
+    return false;
+  }
+  char buf[1];
+  return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0;
+}
+
+class SocketStream final : public Stream {
+public:
+  SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+               time_t write_timeout_sec, time_t write_timeout_usec,
+               time_t max_timeout_msec = 0,
+               std::chrono::time_point<std::chrono::steady_clock> start_time =
+                   std::chrono::steady_clock::time_point::min());
+  ~SocketStream() override;
+
+  bool is_readable() const override;
+  bool is_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+  time_t duration() const override;
+
+private:
+  socket_t sock_;
+  time_t read_timeout_sec_;
+  time_t read_timeout_usec_;
+  time_t write_timeout_sec_;
+  time_t write_timeout_usec_;
+  time_t max_timeout_msec_;
+  const std::chrono::time_point<std::chrono::steady_clock> start_time;
+
+  std::vector<char> read_buff_;
+  size_t read_buff_off_ = 0;
+  size_t read_buff_content_size_ = 0;
+
+  static const size_t read_buff_size_ = 1024l * 4;
+};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+class SSLSocketStream final : public Stream {
+public:
+  SSLSocketStream(
+      socket_t sock, SSL *ssl, time_t read_timeout_sec,
+      time_t read_timeout_usec, time_t write_timeout_sec,
+      time_t write_timeout_usec, time_t max_timeout_msec = 0,
+      std::chrono::time_point<std::chrono::steady_clock> start_time =
+          std::chrono::steady_clock::time_point::min());
+  ~SSLSocketStream() override;
+
+  bool is_readable() const override;
+  bool is_writable() const override;
+  ssize_t read(char *ptr, size_t size) override;
+  ssize_t write(const char *ptr, size_t size) override;
+  void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
+  socket_t socket() const override;
+  time_t duration() const override;
+
+private:
+  socket_t sock_;
+  SSL *ssl_;
+  time_t read_timeout_sec_;
+  time_t read_timeout_usec_;
+  time_t write_timeout_sec_;
+  time_t write_timeout_usec_;
+  time_t max_timeout_msec_;
+  const std::chrono::time_point<std::chrono::steady_clock> start_time;
+};
+#endif
+
+inline bool keep_alive(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                       time_t keep_alive_timeout_sec) {
+  using namespace std::chrono;
+
+  const auto interval_usec =
+      CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND;
+
+  // Avoid expensive `steady_clock::now()` call for the first time
+  if (select_read(sock, 0, interval_usec) > 0) { return true; }
+
+  const auto start = steady_clock::now() - microseconds{interval_usec};
+  const auto timeout = seconds{keep_alive_timeout_sec};
+
+  while (true) {
+    if (svr_sock == INVALID_SOCKET) {
+      break; // Server socket is closed
+    }
+
+    auto val = select_read(sock, 0, interval_usec);
+    if (val < 0) {
+      break; // Ssocket error
+    } else if (val == 0) {
+      if (steady_clock::now() - start > timeout) {
+        break; // Timeout
+      }
+    } else {
+      return true; // Ready for read
+    }
+  }
+
+  return false;
+}
+
+template <typename T>
+inline bool
+process_server_socket_core(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                           size_t keep_alive_max_count,
+                           time_t keep_alive_timeout_sec, T callback) {
+  assert(keep_alive_max_count > 0);
+  auto ret = false;
+  auto count = keep_alive_max_count;
+  while (count > 0 && keep_alive(svr_sock, sock, keep_alive_timeout_sec)) {
+    auto close_connection = count == 1;
+    auto connection_closed = false;
+    ret = callback(close_connection, connection_closed);
+    if (!ret || connection_closed) { break; }
+    count--;
+  }
+  return ret;
+}
+
+template <typename T>
+inline bool
+process_server_socket(const std::atomic<socket_t> &svr_sock, socket_t sock,
+                      size_t keep_alive_max_count,
+                      time_t keep_alive_timeout_sec, time_t read_timeout_sec,
+                      time_t read_timeout_usec, time_t write_timeout_sec,
+                      time_t write_timeout_usec, T callback) {
+  return process_server_socket_core(
+      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
+      [&](bool close_connection, bool &connection_closed) {
+        SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
+                          write_timeout_sec, write_timeout_usec);
+        return callback(strm, close_connection, connection_closed);
+      });
+}
+
+inline bool process_client_socket(
+    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &)> callback) {
+  SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
+                    write_timeout_sec, write_timeout_usec, max_timeout_msec,
+                    start_time);
+  return callback(strm);
+}
+
+inline int shutdown_socket(socket_t sock) {
+#ifdef _WIN32
+  return shutdown(sock, SD_BOTH);
+#else
+  return shutdown(sock, SHUT_RDWR);
+#endif
+}
+
+inline std::string escape_abstract_namespace_unix_domain(const std::string &s) {
+  if (s.size() > 1 && s[0] == '\0') {
+    auto ret = s;
+    ret[0] = '@';
+    return ret;
+  }
+  return s;
+}
+
+inline std::string
+unescape_abstract_namespace_unix_domain(const std::string &s) {
+  if (s.size() > 1 && s[0] == '@') {
+    auto ret = s;
+    ret[0] = '\0';
+    return ret;
+  }
+  return s;
+}
+
+template <typename BindOrConnect>
+socket_t create_socket(const std::string &host, const std::string &ip, int port,
+                       int address_family, int socket_flags, bool tcp_nodelay,
+                       bool ipv6_v6only, SocketOptions socket_options,
+                       BindOrConnect bind_or_connect) {
+  // Get address info
+  const char *node = nullptr;
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = IPPROTO_IP;
+
+  if (!ip.empty()) {
+    node = ip.c_str();
+    // Ask getaddrinfo to convert IP in c-string to address
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_flags = AI_NUMERICHOST;
+  } else {
+    if (!host.empty()) { node = host.c_str(); }
+    hints.ai_family = address_family;
+    hints.ai_flags = socket_flags;
+  }
+
+#ifndef _WIN32
+  if (hints.ai_family == AF_UNIX) {
+    const auto addrlen = host.length();
+    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
+
+#ifdef SOCK_CLOEXEC
+    auto sock = socket(hints.ai_family, hints.ai_socktype | SOCK_CLOEXEC,
+                       hints.ai_protocol);
+#else
+    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
+#endif
+
+    if (sock != INVALID_SOCKET) {
+      sockaddr_un addr{};
+      addr.sun_family = AF_UNIX;
+
+      auto unescaped_host = unescape_abstract_namespace_unix_domain(host);
+      std::copy(unescaped_host.begin(), unescaped_host.end(), addr.sun_path);
+
+      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
+      hints.ai_addrlen = static_cast<socklen_t>(
+          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
+
+#ifndef SOCK_CLOEXEC
+      fcntl(sock, F_SETFD, FD_CLOEXEC);
+#endif
+
+      if (socket_options) { socket_options(sock); }
+
+      bool dummy;
+      if (!bind_or_connect(sock, hints, dummy)) {
+        close_socket(sock);
+        sock = INVALID_SOCKET;
+      }
+    }
+    return sock;
+  }
+#endif
+
+  auto service = std::to_string(port);
+
+  if (getaddrinfo(node, service.c_str(), &hints, &result)) {
+#if defined __linux__ && !defined __ANDROID__
+    res_init();
+#endif
+    return INVALID_SOCKET;
+  }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    // Create a socket
+#ifdef _WIN32
+    auto sock =
+        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
+                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
+    /**
+     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
+     * and above the socket creation fails on older Windows Systems.
+     *
+     * Let's try to create a socket the old way in this case.
+     *
+     * Reference:
+     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
+     *
+     * WSA_FLAG_NO_HANDLE_INHERIT:
+     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
+     * SP1, and later
+     *
+     */
+    if (sock == INVALID_SOCKET) {
+      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    }
+#else
+
+#ifdef SOCK_CLOEXEC
+    auto sock =
+        socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
+#else
+    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+#endif
+
+#endif
+    if (sock == INVALID_SOCKET) { continue; }
+
+#if !defined _WIN32 && !defined SOCK_CLOEXEC
+    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
+      close_socket(sock);
+      continue;
+    }
+#endif
+
+    if (tcp_nodelay) {
+      auto opt = 1;
+#ifdef _WIN32
+      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+                 reinterpret_cast<const char *>(&opt), sizeof(opt));
+#else
+      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+                 reinterpret_cast<const void *>(&opt), sizeof(opt));
+#endif
+    }
+
+    if (rp->ai_family == AF_INET6) {
+      auto opt = ipv6_v6only ? 1 : 0;
+#ifdef _WIN32
+      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                 reinterpret_cast<const char *>(&opt), sizeof(opt));
+#else
+      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                 reinterpret_cast<const void *>(&opt), sizeof(opt));
+#endif
+    }
+
+    if (socket_options) { socket_options(sock); }
+
+    // bind or connect
+    auto quit = false;
+    if (bind_or_connect(sock, *rp, quit)) { return sock; }
+
+    close_socket(sock);
+
+    if (quit) { break; }
+  }
+
+  return INVALID_SOCKET;
+}
+
+inline void set_nonblocking(socket_t sock, bool nonblocking) {
+#ifdef _WIN32
+  auto flags = nonblocking ? 1UL : 0UL;
+  ioctlsocket(sock, FIONBIO, &flags);
+#else
+  auto flags = fcntl(sock, F_GETFL, 0);
+  fcntl(sock, F_SETFL,
+        nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
+#endif
+}
+
+inline bool is_connection_error() {
+#ifdef _WIN32
+  return WSAGetLastError() != WSAEWOULDBLOCK;
+#else
+  return errno != EINPROGRESS;
+#endif
+}
+
+inline bool bind_ip_address(socket_t sock, const std::string &host) {
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+
+  if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  auto ret = false;
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    const auto &ai = *rp;
+    if (!::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
+      ret = true;
+      break;
+    }
+  }
+
+  return ret;
+}
+
+#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
+#define USE_IF2IP
+#endif
+
+#ifdef USE_IF2IP
+inline std::string if2ip(int address_family, const std::string &ifn) {
+  struct ifaddrs *ifap;
+  getifaddrs(&ifap);
+  auto se = detail::scope_exit([&] { freeifaddrs(ifap); });
+
+  std::string addr_candidate;
+  for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
+    if (ifa->ifa_addr && ifn == ifa->ifa_name &&
+        (AF_UNSPEC == address_family ||
+         ifa->ifa_addr->sa_family == address_family)) {
+      if (ifa->ifa_addr->sa_family == AF_INET) {
+        auto sa = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr);
+        char buf[INET_ADDRSTRLEN];
+        if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) {
+          return std::string(buf, INET_ADDRSTRLEN);
+        }
+      } else if (ifa->ifa_addr->sa_family == AF_INET6) {
+        auto sa = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr);
+        if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) {
+          char buf[INET6_ADDRSTRLEN] = {};
+          if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) {
+            // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL
+            auto s6_addr_head = sa->sin6_addr.s6_addr[0];
+            if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) {
+              addr_candidate = std::string(buf, INET6_ADDRSTRLEN);
+            } else {
+              return std::string(buf, INET6_ADDRSTRLEN);
+            }
+          }
+        }
+      }
+    }
+  }
+  return addr_candidate;
+}
+#endif
+
+inline socket_t create_client_socket(
+    const std::string &host, const std::string &ip, int port,
+    int address_family, bool tcp_nodelay, bool ipv6_v6only,
+    SocketOptions socket_options, time_t connection_timeout_sec,
+    time_t connection_timeout_usec, time_t read_timeout_sec,
+    time_t read_timeout_usec, time_t write_timeout_sec,
+    time_t write_timeout_usec, const std::string &intf, Error &error) {
+  auto sock = create_socket(
+      host, ip, port, address_family, 0, tcp_nodelay, ipv6_v6only,
+      std::move(socket_options),
+      [&](socket_t sock2, struct addrinfo &ai, bool &quit) -> bool {
+        if (!intf.empty()) {
+#ifdef USE_IF2IP
+          auto ip_from_if = if2ip(address_family, intf);
+          if (ip_from_if.empty()) { ip_from_if = intf; }
+          if (!bind_ip_address(sock2, ip_from_if)) {
+            error = Error::BindIPAddress;
+            return false;
+          }
+#endif
+        }
+
+        set_nonblocking(sock2, true);
+
+        auto ret =
+            ::connect(sock2, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen));
+
+        if (ret < 0) {
+          if (is_connection_error()) {
+            error = Error::Connection;
+            return false;
+          }
+          error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
+                                             connection_timeout_usec);
+          if (error != Error::Success) {
+            if (error == Error::ConnectionTimeout) { quit = true; }
+            return false;
+          }
+        }
+
+        set_nonblocking(sock2, false);
+
+        {
+#ifdef _WIN32
+          auto timeout = static_cast<uint32_t>(read_timeout_sec * 1000 +
+                                               read_timeout_usec / 1000);
+          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
+                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+          timeval tv;
+          tv.tv_sec = static_cast<long>(read_timeout_sec);
+          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
+          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
+                     reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+        }
+        {
+
+#ifdef _WIN32
+          auto timeout = static_cast<uint32_t>(write_timeout_sec * 1000 +
+                                               write_timeout_usec / 1000);
+          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
+                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+          timeval tv;
+          tv.tv_sec = static_cast<long>(write_timeout_sec);
+          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
+          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
+                     reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+        }
+
+        error = Error::Success;
+        return true;
+      });
+
+  if (sock != INVALID_SOCKET) {
+    error = Error::Success;
+  } else {
+    if (error == Error::Success) { error = Error::Connection; }
+  }
+
+  return sock;
+}
+
+inline bool get_ip_and_port(const struct sockaddr_storage &addr,
+                            socklen_t addr_len, std::string &ip, int &port) {
+  if (addr.ss_family == AF_INET) {
+    port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
+  } else if (addr.ss_family == AF_INET6) {
+    port =
+        ntohs(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_port);
+  } else {
+    return false;
+  }
+
+  std::array<char, NI_MAXHOST> ipstr{};
+  if (getnameinfo(reinterpret_cast<const struct sockaddr *>(&addr), addr_len,
+                  ipstr.data(), static_cast<socklen_t>(ipstr.size()), nullptr,
+                  0, NI_NUMERICHOST)) {
+    return false;
+  }
+
+  ip = ipstr.data();
+  return true;
+}
+
+inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
+inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+
+  if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+#ifndef _WIN32
+    if (addr.ss_family == AF_UNIX) {
+#if defined(__linux__)
+      struct ucred ucred;
+      socklen_t len = sizeof(ucred);
+      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
+        port = ucred.pid;
+      }
+#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__
+      pid_t pid;
+      socklen_t len = sizeof(pid);
+      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
+        port = pid;
+      }
+#endif
+      return;
+    }
+#endif
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
+inline constexpr unsigned int str2tag_core(const char *s, size_t l,
+                                           unsigned int h) {
+  return (l == 0)
+             ? h
+             : str2tag_core(
+                   s + 1, l - 1,
+                   // Unsets the 6 high bits of h, therefore no overflow happens
+                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
+                    h * 33) ^
+                       static_cast<unsigned char>(*s));
+}
+
+inline unsigned int str2tag(const std::string &s) {
+  return str2tag_core(s.data(), s.size(), 0);
+}
+
+namespace udl {
+
+inline constexpr unsigned int operator""_t(const char *s, size_t l) {
+  return str2tag_core(s, l, 0);
+}
+
+} // namespace udl
+
+inline std::string
+find_content_type(const std::string &path,
+                  const std::map<std::string, std::string> &user_data,
+                  const std::string &default_content_type) {
+  auto ext = file_extension(path);
+
+  auto it = user_data.find(ext);
+  if (it != user_data.end()) { return it->second; }
+
+  using udl::operator""_t;
+
+  switch (str2tag(ext)) {
+  default: return default_content_type;
+
+  case "css"_t: return "text/css";
+  case "csv"_t: return "text/csv";
+  case "htm"_t:
+  case "html"_t: return "text/html";
+  case "js"_t:
+  case "mjs"_t: return "text/javascript";
+  case "txt"_t: return "text/plain";
+  case "vtt"_t: return "text/vtt";
+
+  case "apng"_t: return "image/apng";
+  case "avif"_t: return "image/avif";
+  case "bmp"_t: return "image/bmp";
+  case "gif"_t: return "image/gif";
+  case "png"_t: return "image/png";
+  case "svg"_t: return "image/svg+xml";
+  case "webp"_t: return "image/webp";
+  case "ico"_t: return "image/x-icon";
+  case "tif"_t: return "image/tiff";
+  case "tiff"_t: return "image/tiff";
+  case "jpg"_t:
+  case "jpeg"_t: return "image/jpeg";
+
+  case "mp4"_t: return "video/mp4";
+  case "mpeg"_t: return "video/mpeg";
+  case "webm"_t: return "video/webm";
+
+  case "mp3"_t: return "audio/mp3";
+  case "mpga"_t: return "audio/mpeg";
+  case "weba"_t: return "audio/webm";
+  case "wav"_t: return "audio/wave";
+
+  case "otf"_t: return "font/otf";
+  case "ttf"_t: return "font/ttf";
+  case "woff"_t: return "font/woff";
+  case "woff2"_t: return "font/woff2";
+
+  case "7z"_t: return "application/x-7z-compressed";
+  case "atom"_t: return "application/atom+xml";
+  case "pdf"_t: return "application/pdf";
+  case "json"_t: return "application/json";
+  case "rss"_t: return "application/rss+xml";
+  case "tar"_t: return "application/x-tar";
+  case "xht"_t:
+  case "xhtml"_t: return "application/xhtml+xml";
+  case "xslt"_t: return "application/xslt+xml";
+  case "xml"_t: return "application/xml";
+  case "gz"_t: return "application/gzip";
+  case "zip"_t: return "application/zip";
+  case "wasm"_t: return "application/wasm";
+  }
+}
+
+inline bool can_compress_content_type(const std::string &content_type) {
+  using udl::operator""_t;
+
+  auto tag = str2tag(content_type);
+
+  switch (tag) {
+  case "image/svg+xml"_t:
+  case "application/javascript"_t:
+  case "application/json"_t:
+  case "application/xml"_t:
+  case "application/protobuf"_t:
+  case "application/xhtml+xml"_t: return true;
+
+  case "text/event-stream"_t: return false;
+
+  default: return !content_type.rfind("text/", 0);
+  }
+}
+
+inline EncodingType encoding_type(const Request &req, const Response &res) {
+  auto ret =
+      detail::can_compress_content_type(res.get_header_value("Content-Type"));
+  if (!ret) { return EncodingType::None; }
+
+  const auto &s = req.get_header_value("Accept-Encoding");
+  (void)(s);
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+  // TODO: 'Accept-Encoding' has br, not br;q=0
+  ret = s.find("br") != std::string::npos;
+  if (ret) { return EncodingType::Brotli; }
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  // TODO: 'Accept-Encoding' has gzip, not gzip;q=0
+  ret = s.find("gzip") != std::string::npos;
+  if (ret) { return EncodingType::Gzip; }
+#endif
+
+  return EncodingType::None;
+}
+
+inline bool nocompressor::compress(const char *data, size_t data_length,
+                                   bool /*last*/, Callback callback) {
+  if (!data_length) { return true; }
+  return callback(data, data_length);
+}
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+inline gzip_compressor::gzip_compressor() {
+  std::memset(&strm_, 0, sizeof(strm_));
+  strm_.zalloc = Z_NULL;
+  strm_.zfree = Z_NULL;
+  strm_.opaque = Z_NULL;
+
+  is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
+                           Z_DEFAULT_STRATEGY) == Z_OK;
+}
+
+inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); }
+
+inline bool gzip_compressor::compress(const char *data, size_t data_length,
+                                      bool last, Callback callback) {
+  assert(is_valid_);
+
+  do {
+    constexpr size_t max_avail_in =
+        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
+
+    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
+        (std::min)(data_length, max_avail_in));
+    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
+
+    data_length -= strm_.avail_in;
+    data += strm_.avail_in;
+
+    auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
+    auto ret = Z_OK;
+
+    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+    do {
+      strm_.avail_out = static_cast<uInt>(buff.size());
+      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
+
+      ret = deflate(&strm_, flush);
+      if (ret == Z_STREAM_ERROR) { return false; }
+
+      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
+        return false;
+      }
+    } while (strm_.avail_out == 0);
+
+    assert((flush == Z_FINISH && ret == Z_STREAM_END) ||
+           (flush == Z_NO_FLUSH && ret == Z_OK));
+    assert(strm_.avail_in == 0);
+  } while (data_length > 0);
+
+  return true;
+}
+
+inline gzip_decompressor::gzip_decompressor() {
+  std::memset(&strm_, 0, sizeof(strm_));
+  strm_.zalloc = Z_NULL;
+  strm_.zfree = Z_NULL;
+  strm_.opaque = Z_NULL;
+
+  // 15 is the value of wbits, which should be at the maximum possible value
+  // to ensure that any gzip stream can be decoded. The offset of 32 specifies
+  // that the stream type should be automatically detected either gzip or
+  // deflate.
+  is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK;
+}
+
+inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); }
+
+inline bool gzip_decompressor::is_valid() const { return is_valid_; }
+
+inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
+                                          Callback callback) {
+  assert(is_valid_);
+
+  auto ret = Z_OK;
+
+  do {
+    constexpr size_t max_avail_in =
+        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
+
+    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
+        (std::min)(data_length, max_avail_in));
+    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
+
+    data_length -= strm_.avail_in;
+    data += strm_.avail_in;
+
+    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+    while (strm_.avail_in > 0 && ret == Z_OK) {
+      strm_.avail_out = static_cast<uInt>(buff.size());
+      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
+
+      ret = inflate(&strm_, Z_NO_FLUSH);
+
+      assert(ret != Z_STREAM_ERROR);
+      switch (ret) {
+      case Z_NEED_DICT:
+      case Z_DATA_ERROR:
+      case Z_MEM_ERROR: inflateEnd(&strm_); return false;
+      }
+
+      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
+        return false;
+      }
+    }
+
+    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
+
+  } while (data_length > 0);
+
+  return true;
+}
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+inline brotli_compressor::brotli_compressor() {
+  state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
+}
+
+inline brotli_compressor::~brotli_compressor() {
+  BrotliEncoderDestroyInstance(state_);
+}
+
+inline bool brotli_compressor::compress(const char *data, size_t data_length,
+                                        bool last, Callback callback) {
+  std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+
+  auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
+  auto available_in = data_length;
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
+
+  for (;;) {
+    if (last) {
+      if (BrotliEncoderIsFinished(state_)) { break; }
+    } else {
+      if (!available_in) { break; }
+    }
+
+    auto available_out = buff.size();
+    auto next_out = buff.data();
+
+    if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in,
+                                     &available_out, &next_out, nullptr)) {
+      return false;
+    }
+
+    auto output_bytes = buff.size() - available_out;
+    if (output_bytes) {
+      callback(reinterpret_cast<const char *>(buff.data()), output_bytes);
+    }
+  }
+
+  return true;
+}
+
+inline brotli_decompressor::brotli_decompressor() {
+  decoder_s = BrotliDecoderCreateInstance(0, 0, 0);
+  decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT
+                        : BROTLI_DECODER_RESULT_ERROR;
+}
+
+inline brotli_decompressor::~brotli_decompressor() {
+  if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); }
+}
+
+inline bool brotli_decompressor::is_valid() const { return decoder_s; }
+
+inline bool brotli_decompressor::decompress(const char *data,
+                                            size_t data_length,
+                                            Callback callback) {
+  if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
+      decoder_r == BROTLI_DECODER_RESULT_ERROR) {
+    return 0;
+  }
+
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
+  size_t avail_in = data_length;
+  size_t total_out;
+
+  decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
+
+  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
+  while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
+    char *next_out = buff.data();
+    size_t avail_out = buff.size();
+
+    decoder_r = BrotliDecoderDecompressStream(
+        decoder_s, &avail_in, &next_in, &avail_out,
+        reinterpret_cast<uint8_t **>(&next_out), &total_out);
+
+    if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
+
+    if (!callback(buff.data(), buff.size() - avail_out)) { return false; }
+  }
+
+  return decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
+         decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
+}
+#endif
+
+inline bool has_header(const Headers &headers, const std::string &key) {
+  return headers.find(key) != headers.end();
+}
+
+inline const char *get_header_value(const Headers &headers,
+                                    const std::string &key, const char *def,
+                                    size_t id) {
+  auto rng = headers.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second.c_str(); }
+  return def;
+}
+
+template <typename T>
+inline bool parse_header(const char *beg, const char *end, T fn) {
+  // Skip trailing spaces and tabs.
+  while (beg < end && is_space_or_tab(end[-1])) {
+    end--;
+  }
+
+  auto p = beg;
+  while (p < end && *p != ':') {
+    p++;
+  }
+
+  if (p == end) { return false; }
+
+  auto key_end = p;
+
+  if (*p++ != ':') { return false; }
+
+  while (p < end && is_space_or_tab(*p)) {
+    p++;
+  }
+
+  if (p <= end) {
+    auto key_len = key_end - beg;
+    if (!key_len) { return false; }
+
+    auto key = std::string(beg, key_end);
+    // auto val = (case_ignore::equal(key, "Location") ||
+    //             case_ignore::equal(key, "Referer"))
+    //                ? std::string(p, end)
+    //                : decode_url(std::string(p, end), false);
+    auto val = std::string(p, end);
+
+    if (!detail::fields::is_field_value(val)) { return false; }
+
+    if (case_ignore::equal(key, "Location") ||
+        case_ignore::equal(key, "Referer")) {
+      fn(key, val);
+    } else {
+      fn(key, decode_url(val, false));
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+inline bool read_headers(Stream &strm, Headers &headers) {
+  const auto bufsiz = 2048;
+  char buf[bufsiz];
+  stream_line_reader line_reader(strm, buf, bufsiz);
+
+  for (;;) {
+    if (!line_reader.getline()) { return false; }
+
+    // Check if the line ends with CRLF.
+    auto line_terminator_len = 2;
+    if (line_reader.end_with_crlf()) {
+      // Blank line indicates end of headers.
+      if (line_reader.size() == 2) { break; }
+    } else {
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+      // Blank line indicates end of headers.
+      if (line_reader.size() == 1) { break; }
+      line_terminator_len = 1;
+#else
+      continue; // Skip invalid line.
+#endif
+    }
+
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+
+    // Exclude line terminator
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    if (!parse_header(line_reader.ptr(), end,
+                      [&](const std::string &key, const std::string &val) {
+                        headers.emplace(key, val);
+                      })) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+inline bool read_content_with_length(Stream &strm, uint64_t len,
+                                     Progress progress,
+                                     ContentReceiverWithProgress out) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+
+  uint64_t r = 0;
+  while (r < len) {
+    auto read_len = static_cast<size_t>(len - r);
+    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
+    if (n <= 0) { return false; }
+
+    if (!out(buf, static_cast<size_t>(n), r, len)) { return false; }
+    r += static_cast<uint64_t>(n);
+
+    if (progress) {
+      if (!progress(r, len)) { return false; }
+    }
+  }
+
+  return true;
+}
+
+inline void skip_content_with_length(Stream &strm, uint64_t len) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+  uint64_t r = 0;
+  while (r < len) {
+    auto read_len = static_cast<size_t>(len - r);
+    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
+    if (n <= 0) { return; }
+    r += static_cast<uint64_t>(n);
+  }
+}
+
+inline bool read_content_without_length(Stream &strm,
+                                        ContentReceiverWithProgress out) {
+  char buf[CPPHTTPLIB_RECV_BUFSIZ];
+  uint64_t r = 0;
+  for (;;) {
+    auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
+    if (n <= 0) { return false; }
+
+    if (!out(buf, static_cast<size_t>(n), r, 0)) { return false; }
+    r += static_cast<uint64_t>(n);
+  }
+
+  return true;
+}
+
+template <typename T>
+inline bool read_content_chunked(Stream &strm, T &x,
+                                 ContentReceiverWithProgress out) {
+  const auto bufsiz = 16;
+  char buf[bufsiz];
+
+  stream_line_reader line_reader(strm, buf, bufsiz);
+
+  if (!line_reader.getline()) { return false; }
+
+  unsigned long chunk_len;
+  while (true) {
+    char *end_ptr;
+
+    chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16);
+
+    if (end_ptr == line_reader.ptr()) { return false; }
+    if (chunk_len == ULONG_MAX) { return false; }
+
+    if (chunk_len == 0) { break; }
+
+    if (!read_content_with_length(strm, chunk_len, nullptr, out)) {
+      return false;
+    }
+
+    if (!line_reader.getline()) { return false; }
+
+    if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; }
+
+    if (!line_reader.getline()) { return false; }
+  }
+
+  assert(chunk_len == 0);
+
+  // NOTE: In RFC 9112, '7.1 Chunked Transfer Coding' mentiones "The chunked
+  // transfer coding is complete when a chunk with a chunk-size of zero is
+  // received, possibly followed by a trailer section, and finally terminated by
+  // an empty line". https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1
+  //
+  // In '7.1.3. Decoding Chunked', however, the pseudo-code in the section
+  // does't care for the existence of the final CRLF. In other words, it seems
+  // to be ok whether the final CRLF exists or not in the chunked data.
+  // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1.3
+  //
+  // According to the reference code in RFC 9112, cpp-htpplib now allows
+  // chuncked transfer coding data without the final CRLF.
+  if (!line_reader.getline()) { return true; }
+
+  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+
+    // Exclude line terminator
+    constexpr auto line_terminator_len = 2;
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    parse_header(line_reader.ptr(), end,
+                 [&](const std::string &key, const std::string &val) {
+                   x.headers.emplace(key, val);
+                 });
+
+    if (!line_reader.getline()) { return false; }
+  }
+
+  return true;
+}
+
+inline bool is_chunked_transfer_encoding(const Headers &headers) {
+  return case_ignore::equal(
+      get_header_value(headers, "Transfer-Encoding", "", 0), "chunked");
+}
+
+template <typename T, typename U>
+bool prepare_content_receiver(T &x, int &status,
+                              ContentReceiverWithProgress receiver,
+                              bool decompress, U callback) {
+  if (decompress) {
+    std::string encoding = x.get_header_value("Content-Encoding");
+    std::unique_ptr<decompressor> decompressor;
+
+    if (encoding == "gzip" || encoding == "deflate") {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+      decompressor = detail::make_unique<gzip_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    } else if (encoding.find("br") != std::string::npos) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+      decompressor = detail::make_unique<brotli_decompressor>();
+#else
+      status = StatusCode::UnsupportedMediaType_415;
+      return false;
+#endif
+    }
+
+    if (decompressor) {
+      if (decompressor->is_valid()) {
+        ContentReceiverWithProgress out = [&](const char *buf, size_t n,
+                                              uint64_t off, uint64_t len) {
+          return decompressor->decompress(buf, n,
+                                          [&](const char *buf2, size_t n2) {
+                                            return receiver(buf2, n2, off, len);
+                                          });
+        };
+        return callback(std::move(out));
+      } else {
+        status = StatusCode::InternalServerError_500;
+        return false;
+      }
+    }
+  }
+
+  ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off,
+                                        uint64_t len) {
+    return receiver(buf, n, off, len);
+  };
+  return callback(std::move(out));
+}
+
+template <typename T>
+bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
+                  Progress progress, ContentReceiverWithProgress receiver,
+                  bool decompress) {
+  return prepare_content_receiver(
+      x, status, std::move(receiver), decompress,
+      [&](const ContentReceiverWithProgress &out) {
+        auto ret = true;
+        auto exceed_payload_max_length = false;
+
+        if (is_chunked_transfer_encoding(x.headers)) {
+          ret = read_content_chunked(strm, x, out);
+        } else if (!has_header(x.headers, "Content-Length")) {
+          ret = read_content_without_length(strm, out);
+        } else {
+          auto is_invalid_value = false;
+          auto len = get_header_value_u64(
+              x.headers, "Content-Length",
+              (std::numeric_limits<uint64_t>::max)(), 0, is_invalid_value);
+
+          if (is_invalid_value) {
+            ret = false;
+          } else if (len > payload_max_length) {
+            exceed_payload_max_length = true;
+            skip_content_with_length(strm, len);
+            ret = false;
+          } else if (len > 0) {
+            ret = read_content_with_length(strm, len, std::move(progress), out);
+          }
+        }
+
+        if (!ret) {
+          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
+                                             : StatusCode::BadRequest_400;
+        }
+        return ret;
+      });
+}
+
+inline ssize_t write_request_line(Stream &strm, const std::string &method,
+                                  const std::string &path) {
+  std::string s = method;
+  s += " ";
+  s += path;
+  s += " HTTP/1.1\r\n";
+  return strm.write(s.data(), s.size());
+}
+
+inline ssize_t write_response_line(Stream &strm, int status) {
+  std::string s = "HTTP/1.1 ";
+  s += std::to_string(status);
+  s += " ";
+  s += httplib::status_message(status);
+  s += "\r\n";
+  return strm.write(s.data(), s.size());
+}
+
+inline ssize_t write_headers(Stream &strm, const Headers &headers) {
+  ssize_t write_len = 0;
+  for (const auto &x : headers) {
+    std::string s;
+    s = x.first;
+    s += ": ";
+    s += x.second;
+    s += "\r\n";
+
+    auto len = strm.write(s.data(), s.size());
+    if (len < 0) { return len; }
+    write_len += len;
+  }
+  auto len = strm.write("\r\n");
+  if (len < 0) { return len; }
+  write_len += len;
+  return write_len;
+}
+
+inline bool write_data(Stream &strm, const char *d, size_t l) {
+  size_t offset = 0;
+  while (offset < l) {
+    auto length = strm.write(d + offset, l - offset);
+    if (length < 0) { return false; }
+    offset += static_cast<size_t>(length);
+  }
+  return true;
+}
+
+template <typename T>
+inline bool write_content(Stream &strm, const ContentProvider &content_provider,
+                          size_t offset, size_t length, T is_shutting_down,
+                          Error &error) {
+  size_t end_offset = offset + length;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      if (strm.is_writable() && write_data(strm, d, l)) {
+        offset += l;
+      } else {
+        ok = false;
+      }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  while (offset < end_offset && !is_shutting_down()) {
+    if (!strm.is_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
+      error = Error::Canceled;
+      return false;
+    } else if (!ok) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  error = Error::Success;
+  return true;
+}
+
+template <typename T>
+inline bool write_content(Stream &strm, const ContentProvider &content_provider,
+                          size_t offset, size_t length,
+                          const T &is_shutting_down) {
+  auto error = Error::Success;
+  return write_content(strm, content_provider, offset, length, is_shutting_down,
+                       error);
+}
+
+template <typename T>
+inline bool
+write_content_without_length(Stream &strm,
+                             const ContentProvider &content_provider,
+                             const T &is_shutting_down) {
+  size_t offset = 0;
+  auto data_available = true;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      offset += l;
+      if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  data_sink.done = [&](void) { data_available = false; };
+
+  while (data_available && !is_shutting_down()) {
+    if (!strm.is_writable()) {
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      return false;
+    } else if (!ok) {
+      return false;
+    }
+  }
+  return true;
+}
+
+template <typename T, typename U>
+inline bool
+write_content_chunked(Stream &strm, const ContentProvider &content_provider,
+                      const T &is_shutting_down, U &compressor, Error &error) {
+  size_t offset = 0;
+  auto data_available = true;
+  auto ok = true;
+  DataSink data_sink;
+
+  data_sink.write = [&](const char *d, size_t l) -> bool {
+    if (ok) {
+      data_available = l > 0;
+      offset += l;
+
+      std::string payload;
+      if (compressor.compress(d, l, false,
+                              [&](const char *data, size_t data_len) {
+                                payload.append(data, data_len);
+                                return true;
+                              })) {
+        if (!payload.empty()) {
+          // Emit chunked response header and footer for each chunk
+          auto chunk =
+              from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
+          if (!strm.is_writable() ||
+              !write_data(strm, chunk.data(), chunk.size())) {
+            ok = false;
+          }
+        }
+      } else {
+        ok = false;
+      }
+    }
+    return ok;
+  };
+
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  auto done_with_trailer = [&](const Headers *trailer) {
+    if (!ok) { return; }
+
+    data_available = false;
+
+    std::string payload;
+    if (!compressor.compress(nullptr, 0, true,
+                             [&](const char *data, size_t data_len) {
+                               payload.append(data, data_len);
+                               return true;
+                             })) {
+      ok = false;
+      return;
+    }
+
+    if (!payload.empty()) {
+      // Emit chunked response header and footer for each chunk
+      auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
+      if (!strm.is_writable() ||
+          !write_data(strm, chunk.data(), chunk.size())) {
+        ok = false;
+        return;
+      }
+    }
+
+    static const std::string done_marker("0\r\n");
+    if (!write_data(strm, done_marker.data(), done_marker.size())) {
+      ok = false;
+    }
+
+    // Trailer
+    if (trailer) {
+      for (const auto &kv : *trailer) {
+        std::string field_line = kv.first + ": " + kv.second + "\r\n";
+        if (!write_data(strm, field_line.data(), field_line.size())) {
+          ok = false;
+        }
+      }
+    }
+
+    static const std::string crlf("\r\n");
+    if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
+  };
+
+  data_sink.done = [&](void) { done_with_trailer(nullptr); };
+
+  data_sink.done_with_trailer = [&](const Headers &trailer) {
+    done_with_trailer(&trailer);
+  };
+
+  while (data_available && !is_shutting_down()) {
+    if (!strm.is_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      error = Error::Canceled;
+      return false;
+    } else if (!ok) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  error = Error::Success;
+  return true;
+}
+
+template <typename T, typename U>
+inline bool write_content_chunked(Stream &strm,
+                                  const ContentProvider &content_provider,
+                                  const T &is_shutting_down, U &compressor) {
+  auto error = Error::Success;
+  return write_content_chunked(strm, content_provider, is_shutting_down,
+                               compressor, error);
+}
+
+template <typename T>
+inline bool redirect(T &cli, Request &req, Response &res,
+                     const std::string &path, const std::string &location,
+                     Error &error) {
+  Request new_req = req;
+  new_req.path = path;
+  new_req.redirect_count_ -= 1;
+
+  if (res.status == StatusCode::SeeOther_303 &&
+      (req.method != "GET" && req.method != "HEAD")) {
+    new_req.method = "GET";
+    new_req.body.clear();
+    new_req.headers.clear();
+  }
+
+  Response new_res;
+
+  auto ret = cli.send(new_req, new_res, error);
+  if (ret) {
+    req = new_req;
+    res = new_res;
+
+    if (res.location.empty()) { res.location = location; }
+  }
+  return ret;
+}
+
+inline std::string params_to_query_str(const Params &params) {
+  std::string query;
+
+  for (auto it = params.begin(); it != params.end(); ++it) {
+    if (it != params.begin()) { query += "&"; }
+    query += it->first;
+    query += "=";
+    query += encode_query_param(it->second);
+  }
+  return query;
+}
+
+inline void parse_query_text(const char *data, std::size_t size,
+                             Params &params) {
+  std::set<std::string> cache;
+  split(data, data + size, '&', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(std::move(kv));
+
+    std::string key;
+    std::string val;
+    divide(b, static_cast<std::size_t>(e - b), '=',
+           [&](const char *lhs_data, std::size_t lhs_size, const char *rhs_data,
+               std::size_t rhs_size) {
+             key.assign(lhs_data, lhs_size);
+             val.assign(rhs_data, rhs_size);
+           });
+
+    if (!key.empty()) {
+      params.emplace(decode_url(key, true), decode_url(val, true));
+    }
+  });
+}
+
+inline void parse_query_text(const std::string &s, Params &params) {
+  parse_query_text(s.data(), s.size(), params);
+}
+
+inline bool parse_multipart_boundary(const std::string &content_type,
+                                     std::string &boundary) {
+  auto boundary_keyword = "boundary=";
+  auto pos = content_type.find(boundary_keyword);
+  if (pos == std::string::npos) { return false; }
+  auto end = content_type.find(';', pos);
+  auto beg = pos + strlen(boundary_keyword);
+  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
+  return !boundary.empty();
+}
+
+inline void parse_disposition_params(const std::string &s, Params &params) {
+  std::set<std::string> cache;
+  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(kv);
+
+    std::string key;
+    std::string val;
+    split(b, e, '=', [&](const char *b2, const char *e2) {
+      if (key.empty()) {
+        key.assign(b2, e2);
+      } else {
+        val.assign(b2, e2);
+      }
+    });
+
+    if (!key.empty()) {
+      params.emplace(trim_double_quotes_copy((key)),
+                     trim_double_quotes_copy((val)));
+    }
+  });
+}
+
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+inline bool parse_range_header(const std::string &s, Ranges &ranges) {
+#else
+inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
+#endif
+  auto is_valid = [](const std::string &str) {
+    return std::all_of(str.cbegin(), str.cend(),
+                       [](unsigned char c) { return std::isdigit(c); });
+  };
+
+  if (s.size() > 7 && s.compare(0, 6, "bytes=") == 0) {
+    const auto pos = static_cast<size_t>(6);
+    const auto len = static_cast<size_t>(s.size() - 6);
+    auto all_valid_ranges = true;
+    split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
+      if (!all_valid_ranges) { return; }
+
+      const auto it = std::find(b, e, '-');
+      if (it == e) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      const auto lhs = std::string(b, it);
+      const auto rhs = std::string(it + 1, e);
+      if (!is_valid(lhs) || !is_valid(rhs)) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      const auto first =
+          static_cast<ssize_t>(lhs.empty() ? -1 : std::stoll(lhs));
+      const auto last =
+          static_cast<ssize_t>(rhs.empty() ? -1 : std::stoll(rhs));
+      if ((first == -1 && last == -1) ||
+          (first != -1 && last != -1 && first > last)) {
+        all_valid_ranges = false;
+        return;
+      }
+
+      ranges.emplace_back(first, last);
+    });
+    return all_valid_ranges && !ranges.empty();
+  }
+  return false;
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+}
+#else
+} catch (...) { return false; }
+#endif
+
+class MultipartFormDataParser {
+public:
+  MultipartFormDataParser() = default;
+
+  void set_boundary(std::string &&boundary) {
+    boundary_ = boundary;
+    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
+    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
+  }
+
+  bool is_valid() const { return is_valid_; }
+
+  bool parse(const char *buf, size_t n, const ContentReceiver &content_callback,
+             const MultipartContentHeader &header_callback) {
+
+    buf_append(buf, n);
+
+    while (buf_size() > 0) {
+      switch (state_) {
+      case 0: { // Initial boundary
+        buf_erase(buf_find(dash_boundary_crlf_));
+        if (dash_boundary_crlf_.size() > buf_size()) { return true; }
+        if (!buf_start_with(dash_boundary_crlf_)) { return false; }
+        buf_erase(dash_boundary_crlf_.size());
+        state_ = 1;
+        break;
+      }
+      case 1: { // New entry
+        clear_file_info();
+        state_ = 2;
+        break;
+      }
+      case 2: { // Headers
+        auto pos = buf_find(crlf_);
+        if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+        while (pos < buf_size()) {
+          // Empty line
+          if (pos == 0) {
+            if (!header_callback(file_)) {
+              is_valid_ = false;
+              return false;
+            }
+            buf_erase(crlf_.size());
+            state_ = 3;
+            break;
+          }
+
+          const auto header = buf_head(pos);
+
+          if (!parse_header(header.data(), header.data() + header.size(),
+                            [&](const std::string &, const std::string &) {})) {
+            is_valid_ = false;
+            return false;
+          }
+
+          static const std::string header_content_type = "Content-Type:";
+
+          if (start_with_case_ignore(header, header_content_type)) {
+            file_.content_type =
+                trim_copy(header.substr(header_content_type.size()));
+          } else {
+            static const std::regex re_content_disposition(
+                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
+                std::regex_constants::icase);
+
+            std::smatch m;
+            if (std::regex_match(header, m, re_content_disposition)) {
+              Params params;
+              parse_disposition_params(m[1], params);
+
+              auto it = params.find("name");
+              if (it != params.end()) {
+                file_.name = it->second;
+              } else {
+                is_valid_ = false;
+                return false;
+              }
+
+              it = params.find("filename");
+              if (it != params.end()) { file_.filename = it->second; }
+
+              it = params.find("filename*");
+              if (it != params.end()) {
+                // Only allow UTF-8 enconnding...
+                static const std::regex re_rfc5987_encoding(
+                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
+
+                std::smatch m2;
+                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
+                  file_.filename = decode_url(m2[1], false); // override...
+                } else {
+                  is_valid_ = false;
+                  return false;
+                }
+              }
+            }
+          }
+          buf_erase(pos + crlf_.size());
+          pos = buf_find(crlf_);
+        }
+        if (state_ != 3) { return true; }
+        break;
+      }
+      case 3: { // Body
+        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
+        auto pos = buf_find(crlf_dash_boundary_);
+        if (pos < buf_size()) {
+          if (!content_callback(buf_data(), pos)) {
+            is_valid_ = false;
+            return false;
+          }
+          buf_erase(pos + crlf_dash_boundary_.size());
+          state_ = 4;
+        } else {
+          auto len = buf_size() - crlf_dash_boundary_.size();
+          if (len > 0) {
+            if (!content_callback(buf_data(), len)) {
+              is_valid_ = false;
+              return false;
+            }
+            buf_erase(len);
+          }
+          return true;
+        }
+        break;
+      }
+      case 4: { // Boundary
+        if (crlf_.size() > buf_size()) { return true; }
+        if (buf_start_with(crlf_)) {
+          buf_erase(crlf_.size());
+          state_ = 1;
+        } else {
+          if (dash_.size() > buf_size()) { return true; }
+          if (buf_start_with(dash_)) {
+            buf_erase(dash_.size());
+            is_valid_ = true;
+            buf_erase(buf_size()); // Remove epilogue
+          } else {
+            return true;
+          }
+        }
+        break;
+      }
+      }
+    }
+
+    return true;
+  }
+
+private:
+  void clear_file_info() {
+    file_.name.clear();
+    file_.filename.clear();
+    file_.content_type.clear();
+  }
+
+  bool start_with_case_ignore(const std::string &a,
+                              const std::string &b) const {
+    if (a.size() < b.size()) { return false; }
+    for (size_t i = 0; i < b.size(); i++) {
+      if (case_ignore::to_lower(a[i]) != case_ignore::to_lower(b[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  const std::string dash_ = "--";
+  const std::string crlf_ = "\r\n";
+  std::string boundary_;
+  std::string dash_boundary_crlf_;
+  std::string crlf_dash_boundary_;
+
+  size_t state_ = 0;
+  bool is_valid_ = false;
+  MultipartFormData file_;
+
+  // Buffer
+  bool start_with(const std::string &a, size_t spos, size_t epos,
+                  const std::string &b) const {
+    if (epos - spos < b.size()) { return false; }
+    for (size_t i = 0; i < b.size(); i++) {
+      if (a[i + spos] != b[i]) { return false; }
+    }
+    return true;
+  }
+
+  size_t buf_size() const { return buf_epos_ - buf_spos_; }
+
+  const char *buf_data() const { return &buf_[buf_spos_]; }
+
+  std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); }
+
+  bool buf_start_with(const std::string &s) const {
+    return start_with(buf_, buf_spos_, buf_epos_, s);
+  }
+
+  size_t buf_find(const std::string &s) const {
+    auto c = s.front();
+
+    size_t off = buf_spos_;
+    while (off < buf_epos_) {
+      auto pos = off;
+      while (true) {
+        if (pos == buf_epos_) { return buf_size(); }
+        if (buf_[pos] == c) { break; }
+        pos++;
+      }
+
+      auto remaining_size = buf_epos_ - pos;
+      if (s.size() > remaining_size) { return buf_size(); }
+
+      if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; }
+
+      off = pos + 1;
+    }
+
+    return buf_size();
+  }
+
+  void buf_append(const char *data, size_t n) {
+    auto remaining_size = buf_size();
+    if (remaining_size > 0 && buf_spos_ > 0) {
+      for (size_t i = 0; i < remaining_size; i++) {
+        buf_[i] = buf_[buf_spos_ + i];
+      }
+    }
+    buf_spos_ = 0;
+    buf_epos_ = remaining_size;
+
+    if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); }
+
+    for (size_t i = 0; i < n; i++) {
+      buf_[buf_epos_ + i] = data[i];
+    }
+    buf_epos_ += n;
+  }
+
+  void buf_erase(size_t size) { buf_spos_ += size; }
+
+  std::string buf_;
+  size_t buf_spos_ = 0;
+  size_t buf_epos_ = 0;
+};
+
+inline std::string random_string(size_t length) {
+  static const char data[] =
+      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+  // std::random_device might actually be deterministic on some
+  // platforms, but due to lack of support in the c++ standard library,
+  // doing better requires either some ugly hacks or breaking portability.
+  static std::random_device seed_gen;
+
+  // Request 128 bits of entropy for initialization
+  static std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(),
+                                     seed_gen()};
+
+  static std::mt19937 engine(seed_sequence);
+
+  std::string result;
+  for (size_t i = 0; i < length; i++) {
+    result += data[engine() % (sizeof(data) - 1)];
+  }
+  return result;
+}
+
+inline std::string make_multipart_data_boundary() {
+  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
+}
+
+inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
+  auto valid = true;
+  for (size_t i = 0; i < boundary.size(); i++) {
+    auto c = boundary[i];
+    if (!std::isalnum(c) && c != '-' && c != '_') {
+      valid = false;
+      break;
+    }
+  }
+  return valid;
+}
+
+template <typename T>
+inline std::string
+serialize_multipart_formdata_item_begin(const T &item,
+                                        const std::string &boundary) {
+  std::string body = "--" + boundary + "\r\n";
+  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
+  if (!item.filename.empty()) {
+    body += "; filename=\"" + item.filename + "\"";
+  }
+  body += "\r\n";
+  if (!item.content_type.empty()) {
+    body += "Content-Type: " + item.content_type + "\r\n";
+  }
+  body += "\r\n";
+
+  return body;
+}
+
+inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
+
+inline std::string
+serialize_multipart_formdata_finish(const std::string &boundary) {
+  return "--" + boundary + "--\r\n";
+}
+
+inline std::string
+serialize_multipart_formdata_get_content_type(const std::string &boundary) {
+  return "multipart/form-data; boundary=" + boundary;
+}
+
+inline std::string
+serialize_multipart_formdata(const MultipartFormDataItems &items,
+                             const std::string &boundary, bool finish = true) {
+  std::string body;
+
+  for (const auto &item : items) {
+    body += serialize_multipart_formdata_item_begin(item, boundary);
+    body += item.content + serialize_multipart_formdata_item_end();
+  }
+
+  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
+
+  return body;
+}
+
+inline bool range_error(Request &req, Response &res) {
+  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
+    ssize_t contant_len = static_cast<ssize_t>(
+        res.content_length_ ? res.content_length_ : res.body.size());
+
+    ssize_t prev_first_pos = -1;
+    ssize_t prev_last_pos = -1;
+    size_t overwrapping_count = 0;
+
+    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
+    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
+    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
+
+    // Too many ranges
+    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
+
+    for (auto &r : req.ranges) {
+      auto &first_pos = r.first;
+      auto &last_pos = r.second;
+
+      if (first_pos == -1 && last_pos == -1) {
+        first_pos = 0;
+        last_pos = contant_len;
+      }
+
+      if (first_pos == -1) {
+        first_pos = contant_len - last_pos;
+        last_pos = contant_len - 1;
+      }
+
+      // NOTE: RFC-9110 '14.1.2. Byte Ranges':
+      // A client can limit the number of bytes requested without knowing the
+      // size of the selected representation. If the last-pos value is absent,
+      // or if the value is greater than or equal to the current length of the
+      // representation data, the byte range is interpreted as the remainder of
+      // the representation (i.e., the server replaces the value of last-pos
+      // with a value that is one less than the current length of the selected
+      // representation).
+      // https://www.rfc-editor.org/rfc/rfc9110.html#section-14.1.2-6
+      if (last_pos == -1 || last_pos >= contant_len) {
+        last_pos = contant_len - 1;
+      }
+
+      // Range must be within content length
+      if (!(0 <= first_pos && first_pos <= last_pos &&
+            last_pos <= contant_len - 1)) {
+        return true;
+      }
+
+      // Ranges must be in ascending order
+      if (first_pos <= prev_first_pos) { return true; }
+
+      // Request must not have more than two overlapping ranges
+      if (first_pos <= prev_last_pos) {
+        overwrapping_count++;
+        if (overwrapping_count > 2) { return true; }
+      }
+
+      prev_first_pos = (std::max)(prev_first_pos, first_pos);
+      prev_last_pos = (std::max)(prev_last_pos, last_pos);
+    }
+  }
+
+  return false;
+}
+
+inline std::pair<size_t, size_t>
+get_range_offset_and_length(Range r, size_t content_length) {
+  assert(r.first != -1 && r.second != -1);
+  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
+  assert(r.first <= r.second &&
+         r.second < static_cast<ssize_t>(content_length));
+  (void)(content_length);
+  return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
+}
+
+inline std::string make_content_range_header_field(
+    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
+  auto st = offset_and_length.first;
+  auto ed = st + offset_and_length.second - 1;
+
+  std::string field = "bytes ";
+  field += std::to_string(st);
+  field += "-";
+  field += std::to_string(ed);
+  field += "/";
+  field += std::to_string(content_length);
+  return field;
+}
+
+template <typename SToken, typename CToken, typename Content>
+bool process_multipart_ranges_data(const Request &req,
+                                   const std::string &boundary,
+                                   const std::string &content_type,
+                                   size_t content_length, SToken stoken,
+                                   CToken ctoken, Content content) {
+  for (size_t i = 0; i < req.ranges.size(); i++) {
+    ctoken("--");
+    stoken(boundary);
+    ctoken("\r\n");
+    if (!content_type.empty()) {
+      ctoken("Content-Type: ");
+      stoken(content_type);
+      ctoken("\r\n");
+    }
+
+    auto offset_and_length =
+        get_range_offset_and_length(req.ranges[i], content_length);
+
+    ctoken("Content-Range: ");
+    stoken(make_content_range_header_field(offset_and_length, content_length));
+    ctoken("\r\n");
+    ctoken("\r\n");
+
+    if (!content(offset_and_length.first, offset_and_length.second)) {
+      return false;
+    }
+    ctoken("\r\n");
+  }
+
+  ctoken("--");
+  stoken(boundary);
+  ctoken("--");
+
+  return true;
+}
+
+inline void make_multipart_ranges_data(const Request &req, Response &res,
+                                       const std::string &boundary,
+                                       const std::string &content_type,
+                                       size_t content_length,
+                                       std::string &data) {
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data += token; },
+      [&](const std::string &token) { data += token; },
+      [&](size_t offset, size_t length) {
+        assert(offset + length <= content_length);
+        data += res.body.substr(offset, length);
+        return true;
+      });
+}
+
+inline size_t get_multipart_ranges_data_length(const Request &req,
+                                               const std::string &boundary,
+                                               const std::string &content_type,
+                                               size_t content_length) {
+  size_t data_length = 0;
+
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data_length += token.size(); },
+      [&](const std::string &token) { data_length += token.size(); },
+      [&](size_t /*offset*/, size_t length) {
+        data_length += length;
+        return true;
+      });
+
+  return data_length;
+}
+
+template <typename T>
+inline bool
+write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
+                            const std::string &boundary,
+                            const std::string &content_type,
+                            size_t content_length, const T &is_shutting_down) {
+  return process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { strm.write(token); },
+      [&](const std::string &token) { strm.write(token); },
+      [&](size_t offset, size_t length) {
+        return write_content(strm, res.content_provider_, offset, length,
+                             is_shutting_down);
+      });
+}
+
+inline bool expect_content(const Request &req) {
+  if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
+      req.method == "DELETE") {
+    return true;
+  }
+  if (req.has_header("Content-Length") &&
+      req.get_header_value_u64("Content-Length") > 0) {
+    return true;
+  }
+  if (is_chunked_transfer_encoding(req.headers)) { return true; }
+  return false;
+}
+
+inline bool has_crlf(const std::string &s) {
+  auto p = s.c_str();
+  while (*p) {
+    if (*p == '\r' || *p == '\n') { return true; }
+    p++;
+  }
+  return false;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
+  auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>(
+      EVP_MD_CTX_new(), EVP_MD_CTX_free);
+
+  unsigned int hash_length = 0;
+  unsigned char hash[EVP_MAX_MD_SIZE];
+
+  EVP_DigestInit_ex(context.get(), algo, nullptr);
+  EVP_DigestUpdate(context.get(), s.c_str(), s.size());
+  EVP_DigestFinal_ex(context.get(), hash, &hash_length);
+
+  std::stringstream ss;
+  for (auto i = 0u; i < hash_length; ++i) {
+    ss << std::hex << std::setw(2) << std::setfill('0')
+       << static_cast<unsigned int>(hash[i]);
+  }
+
+  return ss.str();
+}
+
+inline std::string MD5(const std::string &s) {
+  return message_digest(s, EVP_md5());
+}
+
+inline std::string SHA_256(const std::string &s) {
+  return message_digest(s, EVP_sha256());
+}
+
+inline std::string SHA_512(const std::string &s) {
+  return message_digest(s, EVP_sha512());
+}
+
+inline std::pair<std::string, std::string> make_digest_authentication_header(
+    const Request &req, const std::map<std::string, std::string> &auth,
+    size_t cnonce_count, const std::string &cnonce, const std::string &username,
+    const std::string &password, bool is_proxy = false) {
+  std::string nc;
+  {
+    std::stringstream ss;
+    ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count;
+    nc = ss.str();
+  }
+
+  std::string qop;
+  if (auth.find("qop") != auth.end()) {
+    qop = auth.at("qop");
+    if (qop.find("auth-int") != std::string::npos) {
+      qop = "auth-int";
+    } else if (qop.find("auth") != std::string::npos) {
+      qop = "auth";
+    } else {
+      qop.clear();
+    }
+  }
+
+  std::string algo = "MD5";
+  if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); }
+
+  std::string response;
+  {
+    auto H = algo == "SHA-256"   ? detail::SHA_256
+             : algo == "SHA-512" ? detail::SHA_512
+                                 : detail::MD5;
+
+    auto A1 = username + ":" + auth.at("realm") + ":" + password;
+
+    auto A2 = req.method + ":" + req.path;
+    if (qop == "auth-int") { A2 += ":" + H(req.body); }
+
+    if (qop.empty()) {
+      response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2));
+    } else {
+      response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce +
+                   ":" + qop + ":" + H(A2));
+    }
+  }
+
+  auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : "";
+
+  auto field = "Digest username=\"" + username + "\", realm=\"" +
+               auth.at("realm") + "\", nonce=\"" + auth.at("nonce") +
+               "\", uri=\"" + req.path + "\", algorithm=" + algo +
+               (qop.empty() ? ", response=\""
+                            : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" +
+                                  cnonce + "\", response=\"") +
+               response + "\"" +
+               (opaque.empty() ? "" : ", opaque=\"" + opaque + "\"");
+
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, field);
+}
+
+inline bool is_ssl_peer_could_be_closed(SSL *ssl, socket_t sock) {
+  detail::set_nonblocking(sock, true);
+  auto se = detail::scope_exit([&]() { detail::set_nonblocking(sock, false); });
+
+  char buf[1];
+  return !SSL_peek(ssl, buf, 1) &&
+         SSL_get_error(ssl, 0) == SSL_ERROR_ZERO_RETURN;
+}
+
+#ifdef _WIN32
+// NOTE: This code came up with the following stackoverflow post:
+// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
+inline bool load_system_certs_on_windows(X509_STORE *store) {
+  auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
+  if (!hStore) { return false; }
+
+  auto result = false;
+  PCCERT_CONTEXT pContext = NULL;
+  while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
+         nullptr) {
+    auto encoded_cert =
+        static_cast<const unsigned char *>(pContext->pbCertEncoded);
+
+    auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded);
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  CertFreeCertificateContext(pContext);
+  CertCloseStore(hStore, 0);
+
+  return result;
+}
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#if TARGET_OS_OSX
+template <typename T>
+using CFObjectPtr =
+    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
+
+inline void cf_object_ptr_deleter(CFTypeRef obj) {
+  if (obj) { CFRelease(obj); }
+}
+
+inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
+  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
+                        kCFBooleanTrue};
+
+  CFObjectPtr<CFDictionaryRef> query(
+      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
+                         sizeof(keys) / sizeof(keys[0]),
+                         &kCFTypeDictionaryKeyCallBacks,
+                         &kCFTypeDictionaryValueCallBacks),
+      cf_object_ptr_deleter);
+
+  if (!query) { return false; }
+
+  CFTypeRef security_items = nullptr;
+  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
+      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
+    return false;
+  }
+
+  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
+  return true;
+}
+
+inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFArrayRef root_security_items = nullptr;
+  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
+    return false;
+  }
+
+  certs.reset(root_security_items);
+  return true;
+}
+
+inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
+  auto result = false;
+  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
+    const auto cert = reinterpret_cast<const __SecCertificate *>(
+        CFArrayGetValueAtIndex(certs, i));
+
+    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
+
+    CFDataRef cert_data = nullptr;
+    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
+        errSecSuccess) {
+      continue;
+    }
+
+    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
+
+    auto encoded_cert = static_cast<const unsigned char *>(
+        CFDataGetBytePtr(cert_data_ptr.get()));
+
+    auto x509 =
+        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
+
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  return result;
+}
+
+inline bool load_system_certs_on_macos(X509_STORE *store) {
+  auto result = false;
+  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
+  if (retrieve_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store);
+  }
+
+  if (retrieve_root_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store) || result;
+  }
+
+  return result;
+}
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+#endif // CPPHTTPLIB_OPENSSL_SUPPORT
+
+#ifdef _WIN32
+class WSInit {
+public:
+  WSInit() {
+    WSADATA wsaData;
+    if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true;
+  }
+
+  ~WSInit() {
+    if (is_valid_) WSACleanup();
+  }
+
+  bool is_valid_ = false;
+};
+
+static WSInit wsinit_;
+#endif
+
+inline bool parse_www_authenticate(const Response &res,
+                                   std::map<std::string, std::string> &auth,
+                                   bool is_proxy) {
+  auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
+  if (res.has_header(auth_key)) {
+    static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
+    auto s = res.get_header_value(auth_key);
+    auto pos = s.find(' ');
+    if (pos != std::string::npos) {
+      auto type = s.substr(0, pos);
+      if (type == "Basic") {
+        return false;
+      } else if (type == "Digest") {
+        s = s.substr(pos + 1);
+        auto beg = std::sregex_iterator(s.begin(), s.end(), re);
+        for (auto i = beg; i != std::sregex_iterator(); ++i) {
+          const auto &m = *i;
+          auto key = s.substr(static_cast<size_t>(m.position(1)),
+                              static_cast<size_t>(m.length(1)));
+          auto val = m.length(2) > 0
+                         ? s.substr(static_cast<size_t>(m.position(2)),
+                                    static_cast<size_t>(m.length(2)))
+                         : s.substr(static_cast<size_t>(m.position(3)),
+                                    static_cast<size_t>(m.length(3)));
+          auth[key] = val;
+        }
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+class ContentProviderAdapter {
+public:
+  explicit ContentProviderAdapter(
+      ContentProviderWithoutLength &&content_provider)
+      : content_provider_(content_provider) {}
+
+  bool operator()(size_t offset, size_t, DataSink &sink) {
+    return content_provider_(offset, sink);
+  }
+
+private:
+  ContentProviderWithoutLength content_provider_;
+};
+
+} // namespace detail
+
+inline std::string hosted_at(const std::string &hostname) {
+  std::vector<std::string> addrs;
+  hosted_at(hostname, addrs);
+  if (addrs.empty()) { return std::string(); }
+  return addrs[0];
+}
+
+inline void hosted_at(const std::string &hostname,
+                      std::vector<std::string> &addrs) {
+  struct addrinfo hints;
+  struct addrinfo *result;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_protocol = 0;
+
+  if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) {
+#if defined __linux__ && !defined __ANDROID__
+    res_init();
+#endif
+    return;
+  }
+  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
+
+  for (auto rp = result; rp; rp = rp->ai_next) {
+    const auto &addr =
+        *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
+    std::string ip;
+    auto dummy = -1;
+    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
+                                dummy)) {
+      addrs.push_back(ip);
+    }
+  }
+}
+
+inline std::string append_query_params(const std::string &path,
+                                       const Params &params) {
+  std::string path_with_query = path;
+  const static std::regex re("[^?]+\\?.*");
+  auto delm = std::regex_match(path, re) ? '&' : '?';
+  path_with_query += delm + detail::params_to_query_str(params);
+  return path_with_query;
+}
+
+// Header utilities
+inline std::pair<std::string, std::string>
+make_range_header(const Ranges &ranges) {
+  std::string field = "bytes=";
+  auto i = 0;
+  for (const auto &r : ranges) {
+    if (i != 0) { field += ", "; }
+    if (r.first != -1) { field += std::to_string(r.first); }
+    field += '-';
+    if (r.second != -1) { field += std::to_string(r.second); }
+    i++;
+  }
+  return std::make_pair("Range", std::move(field));
+}
+
+inline std::pair<std::string, std::string>
+make_basic_authentication_header(const std::string &username,
+                                 const std::string &password, bool is_proxy) {
+  auto field = "Basic " + detail::base64_encode(username + ":" + password);
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, std::move(field));
+}
+
+inline std::pair<std::string, std::string>
+make_bearer_token_authentication_header(const std::string &token,
+                                        bool is_proxy = false) {
+  auto field = "Bearer " + token;
+  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
+  return std::make_pair(key, std::move(field));
+}
+
+// Request implementation
+inline bool Request::has_header(const std::string &key) const {
+  return detail::has_header(headers, key);
+}
+
+inline std::string Request::get_header_value(const std::string &key,
+                                             const char *def, size_t id) const {
+  return detail::get_header_value(headers, key, def, id);
+}
+
+inline size_t Request::get_header_value_count(const std::string &key) const {
+  auto r = headers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Request::set_header(const std::string &key,
+                                const std::string &val) {
+  if (detail::fields::is_field_name(key) &&
+      detail::fields::is_field_value(val)) {
+    headers.emplace(key, val);
+  }
+}
+
+inline bool Request::has_param(const std::string &key) const {
+  return params.find(key) != params.end();
+}
+
+inline std::string Request::get_param_value(const std::string &key,
+                                            size_t id) const {
+  auto rng = params.equal_range(key);
+  auto it = rng.first;
+  std::advance(it, static_cast<ssize_t>(id));
+  if (it != rng.second) { return it->second; }
+  return std::string();
+}
+
+inline size_t Request::get_param_value_count(const std::string &key) const {
+  auto r = params.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline bool Request::is_multipart_form_data() const {
+  const auto &content_type = get_header_value("Content-Type");
+  return !content_type.rfind("multipart/form-data", 0);
+}
+
+inline bool Request::has_file(const std::string &key) const {
+  return files.find(key) != files.end();
+}
+
+inline MultipartFormData Request::get_file_value(const std::string &key) const {
+  auto it = files.find(key);
+  if (it != files.end()) { return it->second; }
+  return MultipartFormData();
+}
+
+inline std::vector<MultipartFormData>
+Request::get_file_values(const std::string &key) const {
+  std::vector<MultipartFormData> values;
+  auto rng = files.equal_range(key);
+  for (auto it = rng.first; it != rng.second; it++) {
+    values.push_back(it->second);
+  }
+  return values;
+}
+
+// Response implementation
+inline bool Response::has_header(const std::string &key) const {
+  return headers.find(key) != headers.end();
+}
+
+inline std::string Response::get_header_value(const std::string &key,
+                                              const char *def,
+                                              size_t id) const {
+  return detail::get_header_value(headers, key, def, id);
+}
+
+inline size_t Response::get_header_value_count(const std::string &key) const {
+  auto r = headers.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+inline void Response::set_header(const std::string &key,
+                                 const std::string &val) {
+  if (detail::fields::is_field_name(key) &&
+      detail::fields::is_field_value(val)) {
+    headers.emplace(key, val);
+  }
+}
+
+inline void Response::set_redirect(const std::string &url, int stat) {
+  if (detail::fields::is_field_value(url)) {
+    set_header("Location", url);
+    if (300 <= stat && stat < 400) {
+      this->status = stat;
+    } else {
+      this->status = StatusCode::Found_302;
+    }
+  }
+}
+
+inline void Response::set_content(const char *s, size_t n,
+                                  const std::string &content_type) {
+  body.assign(s, n);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
+inline void Response::set_content(const std::string &s,
+                                  const std::string &content_type) {
+  set_content(s.data(), s.size(), content_type);
+}
+
+inline void Response::set_content(std::string &&s,
+                                  const std::string &content_type) {
+  body = std::move(s);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
+inline void Response::set_content_provider(
+    size_t in_length, const std::string &content_type, ContentProvider provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = in_length;
+  if (in_length > 0) { content_provider_ = std::move(provider); }
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = false;
+}
+
+inline void Response::set_content_provider(
+    const std::string &content_type, ContentProviderWithoutLength provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = 0;
+  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = false;
+}
+
+inline void Response::set_chunked_content_provider(
+    const std::string &content_type, ContentProviderWithoutLength provider,
+    ContentProviderResourceReleaser resource_releaser) {
+  set_header("Content-Type", content_type);
+  content_length_ = 0;
+  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
+  content_provider_resource_releaser_ = std::move(resource_releaser);
+  is_chunked_content_provider_ = true;
+}
+
+inline void Response::set_file_content(const std::string &path,
+                                       const std::string &content_type) {
+  file_content_path_ = path;
+  file_content_content_type_ = content_type;
+}
+
+inline void Response::set_file_content(const std::string &path) {
+  file_content_path_ = path;
+}
+
+// Result implementation
+inline bool Result::has_request_header(const std::string &key) const {
+  return request_headers_.find(key) != request_headers_.end();
+}
+
+inline std::string Result::get_request_header_value(const std::string &key,
+                                                    const char *def,
+                                                    size_t id) const {
+  return detail::get_header_value(request_headers_, key, def, id);
+}
+
+inline size_t
+Result::get_request_header_value_count(const std::string &key) const {
+  auto r = request_headers_.equal_range(key);
+  return static_cast<size_t>(std::distance(r.first, r.second));
+}
+
+// Stream implementation
+inline ssize_t Stream::write(const char *ptr) {
+  return write(ptr, strlen(ptr));
+}
+
+inline ssize_t Stream::write(const std::string &s) {
+  return write(s.data(), s.size());
+}
+
+namespace detail {
+
+inline void calc_actual_timeout(time_t max_timeout_msec,
+                                time_t duration_msec, time_t timeout_sec,
+                                time_t timeout_usec, time_t &actual_timeout_sec,
+                                time_t &actual_timeout_usec) {
+  auto timeout_msec = (timeout_sec * 1000) + (timeout_usec / 1000);
+
+  auto actual_timeout_msec =
+      std::min(max_timeout_msec - duration_msec, timeout_msec);
+
+  actual_timeout_sec = actual_timeout_msec / 1000;
+  actual_timeout_usec = (actual_timeout_msec % 1000) * 1000;
+}
+
+// Socket stream implementation
+inline SocketStream::SocketStream(
+    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time)
+    : sock_(sock), read_timeout_sec_(read_timeout_sec),
+      read_timeout_usec_(read_timeout_usec),
+      write_timeout_sec_(write_timeout_sec),
+      write_timeout_usec_(write_timeout_usec),
+      max_timeout_msec_(max_timeout_msec), start_time(start_time),
+      read_buff_(read_buff_size_, 0) {}
+
+inline SocketStream::~SocketStream() = default;
+
+inline bool SocketStream::is_readable() const {
+  if (max_timeout_msec_ <= 0) {
+    return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
+  }
+
+  time_t read_timeout_sec;
+  time_t read_timeout_usec;
+  calc_actual_timeout(max_timeout_msec_, duration(), read_timeout_sec_,
+                      read_timeout_usec_, read_timeout_sec, read_timeout_usec);
+
+  return select_read(sock_, read_timeout_sec, read_timeout_usec) > 0;
+}
+
+inline bool SocketStream::is_writable() const {
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_);
+}
+
+inline ssize_t SocketStream::read(char *ptr, size_t size) {
+#ifdef _WIN32
+  size =
+      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
+#else
+  size = (std::min)(size,
+                    static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
+#endif
+
+  if (read_buff_off_ < read_buff_content_size_) {
+    auto remaining_size = read_buff_content_size_ - read_buff_off_;
+    if (size <= remaining_size) {
+      memcpy(ptr, read_buff_.data() + read_buff_off_, size);
+      read_buff_off_ += size;
+      return static_cast<ssize_t>(size);
+    } else {
+      memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size);
+      read_buff_off_ += remaining_size;
+      return static_cast<ssize_t>(remaining_size);
+    }
+  }
+
+  if (!is_readable()) { return -1; }
+
+  read_buff_off_ = 0;
+  read_buff_content_size_ = 0;
+
+  if (size < read_buff_size_) {
+    auto n = read_socket(sock_, read_buff_.data(), read_buff_size_,
+                         CPPHTTPLIB_RECV_FLAGS);
+    if (n <= 0) {
+      return n;
+    } else if (n <= static_cast<ssize_t>(size)) {
+      memcpy(ptr, read_buff_.data(), static_cast<size_t>(n));
+      return n;
+    } else {
+      memcpy(ptr, read_buff_.data(), size);
+      read_buff_off_ = size;
+      read_buff_content_size_ = static_cast<size_t>(n);
+      return static_cast<ssize_t>(size);
+    }
+  } else {
+    return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS);
+  }
+}
+
+inline ssize_t SocketStream::write(const char *ptr, size_t size) {
+  if (!is_writable()) { return -1; }
+
+#if defined(_WIN32) && !defined(_WIN64)
+  size =
+      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
+#endif
+
+  return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
+}
+
+inline void SocketStream::get_remote_ip_and_port(std::string &ip,
+                                                 int &port) const {
+  return detail::get_remote_ip_and_port(sock_, ip, port);
+}
+
+inline void SocketStream::get_local_ip_and_port(std::string &ip,
+                                                int &port) const {
+  return detail::get_local_ip_and_port(sock_, ip, port);
+}
+
+inline socket_t SocketStream::socket() const { return sock_; }
+
+inline time_t SocketStream::duration() const {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::steady_clock::now() - start_time)
+      .count();
+}
+
+// Buffer stream implementation
+inline bool BufferStream::is_readable() const { return true; }
+
+inline bool BufferStream::is_writable() const { return true; }
+
+inline ssize_t BufferStream::read(char *ptr, size_t size) {
+#if defined(_MSC_VER) && _MSC_VER < 1910
+  auto len_read = buffer._Copy_s(ptr, size, size, position);
+#else
+  auto len_read = buffer.copy(ptr, size, position);
+#endif
+  position += static_cast<size_t>(len_read);
+  return static_cast<ssize_t>(len_read);
+}
+
+inline ssize_t BufferStream::write(const char *ptr, size_t size) {
+  buffer.append(ptr, size);
+  return static_cast<ssize_t>(size);
+}
+
+inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
+                                                 int & /*port*/) const {}
+
+inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
+                                                int & /*port*/) const {}
+
+inline socket_t BufferStream::socket() const { return 0; }
+
+inline time_t BufferStream::duration() const { return 0; }
+
+inline const std::string &BufferStream::get_buffer() const { return buffer; }
+
+inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
+  static constexpr char marker[] = "/:";
+
+  // One past the last ending position of a path param substring
+  std::size_t last_param_end = 0;
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+  // Needed to ensure that parameter names are unique during matcher
+  // construction
+  // If exceptions are disabled, only last duplicate path
+  // parameter will be set
+  std::unordered_set<std::string> param_name_set;
+#endif
+
+  while (true) {
+    const auto marker_pos = pattern.find(
+        marker, last_param_end == 0 ? last_param_end : last_param_end - 1);
+    if (marker_pos == std::string::npos) { break; }
+
+    static_fragments_.push_back(
+        pattern.substr(last_param_end, marker_pos - last_param_end + 1));
+
+    const auto param_name_start = marker_pos + 2;
+
+    auto sep_pos = pattern.find(separator, param_name_start);
+    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
+
+    auto param_name =
+        pattern.substr(param_name_start, sep_pos - param_name_start);
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+    if (param_name_set.find(param_name) != param_name_set.cend()) {
+      std::string msg = "Encountered path parameter '" + param_name +
+                        "' multiple times in route pattern '" + pattern + "'.";
+      throw std::invalid_argument(msg);
+    }
+#endif
+
+    param_names_.push_back(std::move(param_name));
+
+    last_param_end = sep_pos + 1;
+  }
+
+  if (last_param_end < pattern.length()) {
+    static_fragments_.push_back(pattern.substr(last_param_end));
+  }
+}
+
+inline bool PathParamsMatcher::match(Request &request) const {
+  request.matches = std::smatch();
+  request.path_params.clear();
+  request.path_params.reserve(param_names_.size());
+
+  // One past the position at which the path matched the pattern last time
+  std::size_t starting_pos = 0;
+  for (size_t i = 0; i < static_fragments_.size(); ++i) {
+    const auto &fragment = static_fragments_[i];
+
+    if (starting_pos + fragment.length() > request.path.length()) {
+      return false;
+    }
+
+    // Avoid unnecessary allocation by using strncmp instead of substr +
+    // comparison
+    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
+                     fragment.length()) != 0) {
+      return false;
+    }
+
+    starting_pos += fragment.length();
+
+    // Should only happen when we have a static fragment after a param
+    // Example: '/users/:id/subscriptions'
+    // The 'subscriptions' fragment here does not have a corresponding param
+    if (i >= param_names_.size()) { continue; }
+
+    auto sep_pos = request.path.find(separator, starting_pos);
+    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
+
+    const auto &param_name = param_names_[i];
+
+    request.path_params.emplace(
+        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
+
+    // Mark everything up to '/' as matched
+    starting_pos = sep_pos + 1;
+  }
+  // Returns false if the path is longer than the pattern
+  return starting_pos >= request.path.length();
+}
+
+inline bool RegexMatcher::match(Request &request) const {
+  request.path_params.clear();
+  return std::regex_match(request.path, request.matches, regex_);
+}
+
+} // namespace detail
+
+// HTTP server implementation
+inline Server::Server()
+    : new_task_queue(
+          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
+#ifndef _WIN32
+  signal(SIGPIPE, SIG_IGN);
+#endif
+}
+
+inline Server::~Server() = default;
+
+inline std::unique_ptr<detail::MatcherBase>
+Server::make_matcher(const std::string &pattern) {
+  if (pattern.find("/:") != std::string::npos) {
+    return detail::make_unique<detail::PathParamsMatcher>(pattern);
+  } else {
+    return detail::make_unique<detail::RegexMatcher>(pattern);
+  }
+}
+
+inline Server &Server::Get(const std::string &pattern, Handler handler) {
+  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Post(const std::string &pattern, Handler handler) {
+  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Post(const std::string &pattern,
+                            HandlerWithContentReader handler) {
+  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                 std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Put(const std::string &pattern, Handler handler) {
+  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Put(const std::string &pattern,
+                           HandlerWithContentReader handler) {
+  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Patch(const std::string &pattern, Handler handler) {
+  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Patch(const std::string &pattern,
+                             HandlerWithContentReader handler) {
+  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                  std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Delete(const std::string &pattern, Handler handler) {
+  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Delete(const std::string &pattern,
+                              HandlerWithContentReader handler) {
+  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                   std::move(handler));
+  return *this;
+}
+
+inline Server &Server::Options(const std::string &pattern, Handler handler) {
+  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
+  return *this;
+}
+
+inline bool Server::set_base_dir(const std::string &dir,
+                                 const std::string &mount_point) {
+  return set_mount_point(mount_point, dir);
+}
+
+inline bool Server::set_mount_point(const std::string &mount_point,
+                                    const std::string &dir, Headers headers) {
+  detail::FileStat stat(dir);
+  if (stat.is_dir()) {
+    std::string mnt = !mount_point.empty() ? mount_point : "/";
+    if (!mnt.empty() && mnt[0] == '/') {
+      base_dirs_.push_back({mnt, dir, std::move(headers)});
+      return true;
+    }
+  }
+  return false;
+}
+
+inline bool Server::remove_mount_point(const std::string &mount_point) {
+  for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
+    if (it->mount_point == mount_point) {
+      base_dirs_.erase(it);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline Server &
+Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                const std::string &mime) {
+  file_extension_and_mimetype_map_[ext] = mime;
+  return *this;
+}
+
+inline Server &Server::set_default_file_mimetype(const std::string &mime) {
+  default_file_mimetype_ = mime;
+  return *this;
+}
+
+inline Server &Server::set_file_request_handler(Handler handler) {
+  file_request_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_error_handler_core(HandlerWithResponse handler,
+                                              std::true_type) {
+  error_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_error_handler_core(Handler handler,
+                                              std::false_type) {
+  error_handler_ = [handler](const Request &req, Response &res) {
+    handler(req, res);
+    return HandlerResponse::Handled;
+  };
+  return *this;
+}
+
+inline Server &Server::set_exception_handler(ExceptionHandler handler) {
+  exception_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) {
+  pre_routing_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_post_routing_handler(Handler handler) {
+  post_routing_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_logger(Logger logger) {
+  logger_ = std::move(logger);
+  return *this;
+}
+
+inline Server &
+Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
+  expect_100_continue_handler_ = std::move(handler);
+  return *this;
+}
+
+inline Server &Server::set_address_family(int family) {
+  address_family_ = family;
+  return *this;
+}
+
+inline Server &Server::set_tcp_nodelay(bool on) {
+  tcp_nodelay_ = on;
+  return *this;
+}
+
+inline Server &Server::set_ipv6_v6only(bool on) {
+  ipv6_v6only_ = on;
+  return *this;
+}
+
+inline Server &Server::set_socket_options(SocketOptions socket_options) {
+  socket_options_ = std::move(socket_options);
+  return *this;
+}
+
+inline Server &Server::set_default_headers(Headers headers) {
+  default_headers_ = std::move(headers);
+  return *this;
+}
+
+inline Server &Server::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+  return *this;
+}
+
+inline Server &Server::set_keep_alive_max_count(size_t count) {
+  keep_alive_max_count_ = count;
+  return *this;
+}
+
+inline Server &Server::set_keep_alive_timeout(time_t sec) {
+  keep_alive_timeout_sec_ = sec;
+  return *this;
+}
+
+inline Server &Server::set_read_timeout(time_t sec, time_t usec) {
+  read_timeout_sec_ = sec;
+  read_timeout_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_write_timeout(time_t sec, time_t usec) {
+  write_timeout_sec_ = sec;
+  write_timeout_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_idle_interval(time_t sec, time_t usec) {
+  idle_interval_sec_ = sec;
+  idle_interval_usec_ = usec;
+  return *this;
+}
+
+inline Server &Server::set_payload_max_length(size_t length) {
+  payload_max_length_ = length;
+  return *this;
+}
+
+inline bool Server::bind_to_port(const std::string &host, int port,
+                                 int socket_flags) {
+  auto ret = bind_internal(host, port, socket_flags);
+  if (ret == -1) { is_decommisioned = true; }
+  return ret >= 0;
+}
+inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
+  auto ret = bind_internal(host, 0, socket_flags);
+  if (ret == -1) { is_decommisioned = true; }
+  return ret;
+}
+
+inline bool Server::listen_after_bind() { return listen_internal(); }
+
+inline bool Server::listen(const std::string &host, int port,
+                           int socket_flags) {
+  return bind_to_port(host, port, socket_flags) && listen_internal();
+}
+
+inline bool Server::is_running() const { return is_running_; }
+
+inline void Server::wait_until_ready() const {
+  while (!is_running_ && !is_decommisioned) {
+    std::this_thread::sleep_for(std::chrono::milliseconds{1});
+  }
+}
+
+inline void Server::stop() {
+  if (is_running_) {
+    assert(svr_sock_ != INVALID_SOCKET);
+    std::atomic<socket_t> sock(svr_sock_.exchange(INVALID_SOCKET));
+    detail::shutdown_socket(sock);
+    detail::close_socket(sock);
+  }
+  is_decommisioned = false;
+}
+
+inline void Server::decommission() { is_decommisioned = true; }
+
+inline bool Server::parse_request_line(const char *s, Request &req) const {
+  auto len = strlen(s);
+  if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
+  len -= 2;
+
+  {
+    size_t count = 0;
+
+    detail::split(s, s + len, ' ', [&](const char *b, const char *e) {
+      switch (count) {
+      case 0: req.method = std::string(b, e); break;
+      case 1: req.target = std::string(b, e); break;
+      case 2: req.version = std::string(b, e); break;
+      default: break;
+      }
+      count++;
+    });
+
+    if (count != 3) { return false; }
+  }
+
+  static const std::set<std::string> methods{
+      "GET",     "HEAD",    "POST",  "PUT",   "DELETE",
+      "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"};
+
+  if (methods.find(req.method) == methods.end()) { return false; }
+
+  if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { return false; }
+
+  {
+    // Skip URL fragment
+    for (size_t i = 0; i < req.target.size(); i++) {
+      if (req.target[i] == '#') {
+        req.target.erase(i);
+        break;
+      }
+    }
+
+    detail::divide(req.target, '?',
+                   [&](const char *lhs_data, std::size_t lhs_size,
+                       const char *rhs_data, std::size_t rhs_size) {
+                     req.path = detail::decode_url(
+                         std::string(lhs_data, lhs_size), false);
+                     detail::parse_query_text(rhs_data, rhs_size, req.params);
+                   });
+  }
+
+  return true;
+}
+
+inline bool Server::write_response(Stream &strm, bool close_connection,
+                                   Request &req, Response &res) {
+  // NOTE: `req.ranges` should be empty, otherwise it will be applied
+  // incorrectly to the error content.
+  req.ranges.clear();
+  return write_response_core(strm, close_connection, req, res, false);
+}
+
+inline bool Server::write_response_with_content(Stream &strm,
+                                                bool close_connection,
+                                                const Request &req,
+                                                Response &res) {
+  return write_response_core(strm, close_connection, req, res, true);
+}
+
+inline bool Server::write_response_core(Stream &strm, bool close_connection,
+                                        const Request &req, Response &res,
+                                        bool need_apply_ranges) {
+  assert(res.status != -1);
+
+  if (400 <= res.status && error_handler_ &&
+      error_handler_(req, res) == HandlerResponse::Handled) {
+    need_apply_ranges = true;
+  }
+
+  std::string content_type;
+  std::string boundary;
+  if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
+
+  // Prepare additional headers
+  if (close_connection || req.get_header_value("Connection") == "close") {
+    res.set_header("Connection", "close");
+  } else {
+    std::string s = "timeout=";
+    s += std::to_string(keep_alive_timeout_sec_);
+    s += ", max=";
+    s += std::to_string(keep_alive_max_count_);
+    res.set_header("Keep-Alive", s);
+  }
+
+  if ((!res.body.empty() || res.content_length_ > 0 || res.content_provider_) &&
+      !res.has_header("Content-Type")) {
+    res.set_header("Content-Type", "text/plain");
+  }
+
+  if (res.body.empty() && !res.content_length_ && !res.content_provider_ &&
+      !res.has_header("Content-Length")) {
+    res.set_header("Content-Length", "0");
+  }
+
+  if (req.method == "HEAD" && !res.has_header("Accept-Ranges")) {
+    res.set_header("Accept-Ranges", "bytes");
+  }
+
+  if (post_routing_handler_) { post_routing_handler_(req, res); }
+
+  // Response line and headers
+  {
+    detail::BufferStream bstrm;
+    if (!detail::write_response_line(bstrm, res.status)) { return false; }
+    if (!header_writer_(bstrm, res.headers)) { return false; }
+
+    // Flush buffer
+    auto &data = bstrm.get_buffer();
+    detail::write_data(strm, data.data(), data.size());
+  }
+
+  // Body
+  auto ret = true;
+  if (req.method != "HEAD") {
+    if (!res.body.empty()) {
+      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
+        ret = false;
+      }
+    } else if (res.content_provider_) {
+      if (write_content_with_provider(strm, req, res, boundary, content_type)) {
+        res.content_provider_success_ = true;
+      } else {
+        ret = false;
+      }
+    }
+  }
+
+  // Log
+  if (logger_) { logger_(req, res); }
+
+  return ret;
+}
+
+inline bool
+Server::write_content_with_provider(Stream &strm, const Request &req,
+                                    Response &res, const std::string &boundary,
+                                    const std::string &content_type) {
+  auto is_shutting_down = [this]() {
+    return this->svr_sock_ == INVALID_SOCKET;
+  };
+
+  if (res.content_length_ > 0) {
+    if (req.ranges.empty()) {
+      return detail::write_content(strm, res.content_provider_, 0,
+                                   res.content_length_, is_shutting_down);
+    } else if (req.ranges.size() == 1) {
+      auto offset_and_length = detail::get_range_offset_and_length(
+          req.ranges[0], res.content_length_);
+
+      return detail::write_content(strm, res.content_provider_,
+                                   offset_and_length.first,
+                                   offset_and_length.second, is_shutting_down);
+    } else {
+      return detail::write_multipart_ranges_data(
+          strm, req, res, boundary, content_type, res.content_length_,
+          is_shutting_down);
+    }
+  } else {
+    if (res.is_chunked_content_provider_) {
+      auto type = detail::encoding_type(req, res);
+
+      std::unique_ptr<detail::compressor> compressor;
+      if (type == detail::EncodingType::Gzip) {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+        compressor = detail::make_unique<detail::gzip_compressor>();
+#endif
+      } else if (type == detail::EncodingType::Brotli) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+        compressor = detail::make_unique<detail::brotli_compressor>();
+#endif
+      } else {
+        compressor = detail::make_unique<detail::nocompressor>();
+      }
+      assert(compressor != nullptr);
+
+      return detail::write_content_chunked(strm, res.content_provider_,
+                                           is_shutting_down, *compressor);
+    } else {
+      return detail::write_content_without_length(strm, res.content_provider_,
+                                                  is_shutting_down);
+    }
+  }
+}
+
+inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
+  MultipartFormDataMap::iterator cur;
+  auto file_count = 0;
+  if (read_content_core(
+          strm, req, res,
+          // Regular
+          [&](const char *buf, size_t n) {
+            if (req.body.size() + n > req.body.max_size()) { return false; }
+            req.body.append(buf, n);
+            return true;
+          },
+          // Multipart
+          [&](const MultipartFormData &file) {
+            if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
+              return false;
+            }
+            cur = req.files.emplace(file.name, file);
+            return true;
+          },
+          [&](const char *buf, size_t n) {
+            auto &content = cur->second.content;
+            if (content.size() + n > content.max_size()) { return false; }
+            content.append(buf, n);
+            return true;
+          })) {
+    const auto &content_type = req.get_header_value("Content-Type");
+    if (!content_type.find("application/x-www-form-urlencoded")) {
+      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
+        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
+        return false;
+      }
+      detail::parse_query_text(req.body, req.params);
+    }
+    return true;
+  }
+  return false;
+}
+
+inline bool Server::read_content_with_content_receiver(
+    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
+    MultipartContentHeader multipart_header,
+    ContentReceiver multipart_receiver) {
+  return read_content_core(strm, req, res, std::move(receiver),
+                           std::move(multipart_header),
+                           std::move(multipart_receiver));
+}
+
+inline bool
+Server::read_content_core(Stream &strm, Request &req, Response &res,
+                          ContentReceiver receiver,
+                          MultipartContentHeader multipart_header,
+                          ContentReceiver multipart_receiver) const {
+  detail::MultipartFormDataParser multipart_form_data_parser;
+  ContentReceiverWithProgress out;
+
+  if (req.is_multipart_form_data()) {
+    const auto &content_type = req.get_header_value("Content-Type");
+    std::string boundary;
+    if (!detail::parse_multipart_boundary(content_type, boundary)) {
+      res.status = StatusCode::BadRequest_400;
+      return false;
+    }
+
+    multipart_form_data_parser.set_boundary(std::move(boundary));
+    out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) {
+      /* For debug
+      size_t pos = 0;
+      while (pos < n) {
+        auto read_size = (std::min)<size_t>(1, n - pos);
+        auto ret = multipart_form_data_parser.parse(
+            buf + pos, read_size, multipart_receiver, multipart_header);
+        if (!ret) { return false; }
+        pos += read_size;
+      }
+      return true;
+      */
+      return multipart_form_data_parser.parse(buf, n, multipart_receiver,
+                                              multipart_header);
+    };
+  } else {
+    out = [receiver](const char *buf, size_t n, uint64_t /*off*/,
+                     uint64_t /*len*/) { return receiver(buf, n); };
+  }
+
+  if (req.method == "DELETE" && !req.has_header("Content-Length")) {
+    return true;
+  }
+
+  if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
+                            out, true)) {
+    return false;
+  }
+
+  if (req.is_multipart_form_data()) {
+    if (!multipart_form_data_parser.is_valid()) {
+      res.status = StatusCode::BadRequest_400;
+      return false;
+    }
+  }
+
+  return true;
+}
+
+inline bool Server::handle_file_request(const Request &req, Response &res,
+                                        bool head) {
+  for (const auto &entry : base_dirs_) {
+    // Prefix match
+    if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
+      std::string sub_path = "/" + req.path.substr(entry.mount_point.size());
+      if (detail::is_valid_path(sub_path)) {
+        auto path = entry.base_dir + sub_path;
+        if (path.back() == '/') { path += "index.html"; }
+
+        detail::FileStat stat(path);
+
+        if (stat.is_dir()) {
+          res.set_redirect(sub_path + "/", StatusCode::MovedPermanently_301);
+          return true;
+        }
+
+        if (stat.is_file()) {
+          for (const auto &kv : entry.headers) {
+            res.set_header(kv.first, kv.second);
+          }
+
+          auto mm = std::make_shared<detail::mmap>(path.c_str());
+          if (!mm->is_open()) { return false; }
+
+          res.set_content_provider(
+              mm->size(),
+              detail::find_content_type(path, file_extension_and_mimetype_map_,
+                                        default_file_mimetype_),
+              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+                sink.write(mm->data() + offset, length);
+                return true;
+              });
+
+          if (!head && file_request_handler_) {
+            file_request_handler_(req, res);
+          }
+
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+
+inline socket_t
+Server::create_server_socket(const std::string &host, int port,
+                             int socket_flags,
+                             SocketOptions socket_options) const {
+  return detail::create_socket(
+      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
+      ipv6_v6only_, std::move(socket_options),
+      [](socket_t sock, struct addrinfo &ai, bool & /*quit*/) -> bool {
+        if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
+          return false;
+        }
+        if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) { return false; }
+        return true;
+      });
+}
+
+inline int Server::bind_internal(const std::string &host, int port,
+                                 int socket_flags) {
+  if (is_decommisioned) { return -1; }
+
+  if (!is_valid()) { return -1; }
+
+  svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
+  if (svr_sock_ == INVALID_SOCKET) { return -1; }
+
+  if (port == 0) {
+    struct sockaddr_storage addr;
+    socklen_t addr_len = sizeof(addr);
+    if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&addr),
+                    &addr_len) == -1) {
+      return -1;
+    }
+    if (addr.ss_family == AF_INET) {
+      return ntohs(reinterpret_cast<struct sockaddr_in *>(&addr)->sin_port);
+    } else if (addr.ss_family == AF_INET6) {
+      return ntohs(reinterpret_cast<struct sockaddr_in6 *>(&addr)->sin6_port);
+    } else {
+      return -1;
+    }
+  } else {
+    return port;
+  }
+}
+
+inline bool Server::listen_internal() {
+  if (is_decommisioned) { return false; }
+
+  auto ret = true;
+  is_running_ = true;
+  auto se = detail::scope_exit([&]() { is_running_ = false; });
+
+  {
+    std::unique_ptr<TaskQueue> task_queue(new_task_queue());
+
+    while (svr_sock_ != INVALID_SOCKET) {
+#ifndef _WIN32
+      if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
+#endif
+        auto val = detail::select_read(svr_sock_, idle_interval_sec_,
+                                       idle_interval_usec_);
+        if (val == 0) { // Timeout
+          task_queue->on_idle();
+          continue;
+        }
+#ifndef _WIN32
+      }
+#endif
+
+#if defined _WIN32
+      // sockets conneced via WASAccept inherit flags NO_HANDLE_INHERIT,
+      // OVERLAPPED
+      socket_t sock = WSAAccept(svr_sock_, nullptr, nullptr, nullptr, 0);
+#elif defined SOCK_CLOEXEC
+      socket_t sock = accept4(svr_sock_, nullptr, nullptr, SOCK_CLOEXEC);
+#else
+      socket_t sock = accept(svr_sock_, nullptr, nullptr);
+#endif
+
+      if (sock == INVALID_SOCKET) {
+        if (errno == EMFILE) {
+          // The per-process limit of open file descriptors has been reached.
+          // Try to accept new connections after a short sleep.
+          std::this_thread::sleep_for(std::chrono::microseconds{1});
+          continue;
+        } else if (errno == EINTR || errno == EAGAIN) {
+          continue;
+        }
+        if (svr_sock_ != INVALID_SOCKET) {
+          detail::close_socket(svr_sock_);
+          ret = false;
+        } else {
+          ; // The server socket was closed by user.
+        }
+        break;
+      }
+
+      {
+#ifdef _WIN32
+        auto timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 +
+                                             read_timeout_usec_ / 1000);
+        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+        timeval tv;
+        tv.tv_sec = static_cast<long>(read_timeout_sec_);
+        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
+        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+                   reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+      }
+      {
+
+#ifdef _WIN32
+        auto timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 +
+                                             write_timeout_usec_ / 1000);
+        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
+#else
+        timeval tv;
+        tv.tv_sec = static_cast<long>(write_timeout_sec_);
+        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_);
+        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+                   reinterpret_cast<const void *>(&tv), sizeof(tv));
+#endif
+      }
+
+      if (!task_queue->enqueue(
+              [this, sock]() { process_and_close_socket(sock); })) {
+        detail::shutdown_socket(sock);
+        detail::close_socket(sock);
+      }
+    }
+
+    task_queue->shutdown();
+  }
+
+  is_decommisioned = !ret;
+  return ret;
+}
+
+inline bool Server::routing(Request &req, Response &res, Stream &strm) {
+  if (pre_routing_handler_ &&
+      pre_routing_handler_(req, res) == HandlerResponse::Handled) {
+    return true;
+  }
+
+  // File handler
+  auto is_head_request = req.method == "HEAD";
+  if ((req.method == "GET" || is_head_request) &&
+      handle_file_request(req, res, is_head_request)) {
+    return true;
+  }
+
+  if (detail::expect_content(req)) {
+    // Content reader handler
+    {
+      ContentReader reader(
+          [&](ContentReceiver receiver) {
+            return read_content_with_content_receiver(
+                strm, req, res, std::move(receiver), nullptr, nullptr);
+          },
+          [&](MultipartContentHeader header, ContentReceiver receiver) {
+            return read_content_with_content_receiver(strm, req, res, nullptr,
+                                                      std::move(header),
+                                                      std::move(receiver));
+          });
+
+      if (req.method == "POST") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                post_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "PUT") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                put_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "PATCH") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                patch_handlers_for_content_reader_)) {
+          return true;
+        }
+      } else if (req.method == "DELETE") {
+        if (dispatch_request_for_content_reader(
+                req, res, std::move(reader),
+                delete_handlers_for_content_reader_)) {
+          return true;
+        }
+      }
+    }
+
+    // Read content into `req.body`
+    if (!read_content(strm, req, res)) { return false; }
+  }
+
+  // Regular handler
+  if (req.method == "GET" || req.method == "HEAD") {
+    return dispatch_request(req, res, get_handlers_);
+  } else if (req.method == "POST") {
+    return dispatch_request(req, res, post_handlers_);
+  } else if (req.method == "PUT") {
+    return dispatch_request(req, res, put_handlers_);
+  } else if (req.method == "DELETE") {
+    return dispatch_request(req, res, delete_handlers_);
+  } else if (req.method == "OPTIONS") {
+    return dispatch_request(req, res, options_handlers_);
+  } else if (req.method == "PATCH") {
+    return dispatch_request(req, res, patch_handlers_);
+  }
+
+  res.status = StatusCode::BadRequest_400;
+  return false;
+}
+
+inline bool Server::dispatch_request(Request &req, Response &res,
+                                     const Handlers &handlers) const {
+  for (const auto &x : handlers) {
+    const auto &matcher = x.first;
+    const auto &handler = x.second;
+
+    if (matcher->match(req)) {
+      handler(req, res);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline void Server::apply_ranges(const Request &req, Response &res,
+                                 std::string &content_type,
+                                 std::string &boundary) const {
+  if (req.ranges.size() > 1 && res.status == StatusCode::PartialContent_206) {
+    auto it = res.headers.find("Content-Type");
+    if (it != res.headers.end()) {
+      content_type = it->second;
+      res.headers.erase(it);
+    }
+
+    boundary = detail::make_multipart_data_boundary();
+
+    res.set_header("Content-Type",
+                   "multipart/byteranges; boundary=" + boundary);
+  }
+
+  auto type = detail::encoding_type(req, res);
+
+  if (res.body.empty()) {
+    if (res.content_length_ > 0) {
+      size_t length = 0;
+      if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
+        length = res.content_length_;
+      } else if (req.ranges.size() == 1) {
+        auto offset_and_length = detail::get_range_offset_and_length(
+            req.ranges[0], res.content_length_);
+
+        length = offset_and_length.second;
+
+        auto content_range = detail::make_content_range_header_field(
+            offset_and_length, res.content_length_);
+        res.set_header("Content-Range", content_range);
+      } else {
+        length = detail::get_multipart_ranges_data_length(
+            req, boundary, content_type, res.content_length_);
+      }
+      res.set_header("Content-Length", std::to_string(length));
+    } else {
+      if (res.content_provider_) {
+        if (res.is_chunked_content_provider_) {
+          res.set_header("Transfer-Encoding", "chunked");
+          if (type == detail::EncodingType::Gzip) {
+            res.set_header("Content-Encoding", "gzip");
+          } else if (type == detail::EncodingType::Brotli) {
+            res.set_header("Content-Encoding", "br");
+          }
+        }
+      }
+    }
+  } else {
+    if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
+      ;
+    } else if (req.ranges.size() == 1) {
+      auto offset_and_length =
+          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
+      auto offset = offset_and_length.first;
+      auto length = offset_and_length.second;
+
+      auto content_range = detail::make_content_range_header_field(
+          offset_and_length, res.body.size());
+      res.set_header("Content-Range", content_range);
+
+      assert(offset + length <= res.body.size());
+      res.body = res.body.substr(offset, length);
+    } else {
+      std::string data;
+      detail::make_multipart_ranges_data(req, res, boundary, content_type,
+                                         res.body.size(), data);
+      res.body.swap(data);
+    }
+
+    if (type != detail::EncodingType::None) {
+      std::unique_ptr<detail::compressor> compressor;
+      std::string content_encoding;
+
+      if (type == detail::EncodingType::Gzip) {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+        compressor = detail::make_unique<detail::gzip_compressor>();
+        content_encoding = "gzip";
+#endif
+      } else if (type == detail::EncodingType::Brotli) {
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+        compressor = detail::make_unique<detail::brotli_compressor>();
+        content_encoding = "br";
+#endif
+      }
+
+      if (compressor) {
+        std::string compressed;
+        if (compressor->compress(res.body.data(), res.body.size(), true,
+                                 [&](const char *data, size_t data_len) {
+                                   compressed.append(data, data_len);
+                                   return true;
+                                 })) {
+          res.body.swap(compressed);
+          res.set_header("Content-Encoding", content_encoding);
+        }
+      }
+    }
+
+    auto length = std::to_string(res.body.size());
+    res.set_header("Content-Length", length);
+  }
+}
+
+inline bool Server::dispatch_request_for_content_reader(
+    Request &req, Response &res, ContentReader content_reader,
+    const HandlersForContentReader &handlers) const {
+  for (const auto &x : handlers) {
+    const auto &matcher = x.first;
+    const auto &handler = x.second;
+
+    if (matcher->match(req)) {
+      handler(req, res, content_reader);
+      return true;
+    }
+  }
+  return false;
+}
+
+inline bool
+Server::process_request(Stream &strm, const std::string &remote_addr,
+                        int remote_port, const std::string &local_addr,
+                        int local_port, bool close_connection,
+                        bool &connection_closed,
+                        const std::function<void(Request &)> &setup_request) {
+  std::array<char, 2048> buf{};
+
+  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
+
+  // Connection has been closed on client
+  if (!line_reader.getline()) { return false; }
+
+  Request req;
+
+  Response res;
+  res.version = "HTTP/1.1";
+  res.headers = default_headers_;
+
+#ifdef _WIN32
+  // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL).
+#else
+#ifndef CPPHTTPLIB_USE_POLL
+  // Socket file descriptor exceeded FD_SETSIZE...
+  if (strm.socket() >= FD_SETSIZE) {
+    Headers dummy;
+    detail::read_headers(strm, dummy);
+    res.status = StatusCode::InternalServerError_500;
+    return write_response(strm, close_connection, req, res);
+  }
+#endif
+#endif
+
+  // Request line and headers
+  if (!parse_request_line(line_reader.ptr(), req) ||
+      !detail::read_headers(strm, req.headers)) {
+    res.status = StatusCode::BadRequest_400;
+    return write_response(strm, close_connection, req, res);
+  }
+
+  // Check if the request URI doesn't exceed the limit
+  if (req.target.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
+    Headers dummy;
+    detail::read_headers(strm, dummy);
+    res.status = StatusCode::UriTooLong_414;
+    return write_response(strm, close_connection, req, res);
+  }
+
+  if (req.get_header_value("Connection") == "close") {
+    connection_closed = true;
+  }
+
+  if (req.version == "HTTP/1.0" &&
+      req.get_header_value("Connection") != "Keep-Alive") {
+    connection_closed = true;
+  }
+
+  req.remote_addr = remote_addr;
+  req.remote_port = remote_port;
+  req.set_header("REMOTE_ADDR", req.remote_addr);
+  req.set_header("REMOTE_PORT", std::to_string(req.remote_port));
+
+  req.local_addr = local_addr;
+  req.local_port = local_port;
+  req.set_header("LOCAL_ADDR", req.local_addr);
+  req.set_header("LOCAL_PORT", std::to_string(req.local_port));
+
+  if (req.has_header("Range")) {
+    const auto &range_header_value = req.get_header_value("Range");
+    if (!detail::parse_range_header(range_header_value, req.ranges)) {
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      return write_response(strm, close_connection, req, res);
+    }
+  }
+
+  if (setup_request) { setup_request(req); }
+
+  if (req.get_header_value("Expect") == "100-continue") {
+    int status = StatusCode::Continue_100;
+    if (expect_100_continue_handler_) {
+      status = expect_100_continue_handler_(req, res);
+    }
+    switch (status) {
+    case StatusCode::Continue_100:
+    case StatusCode::ExpectationFailed_417:
+      detail::write_response_line(strm, status);
+      strm.write("\r\n");
+      break;
+    default:
+      connection_closed = true;
+      return write_response(strm, true, req, res);
+    }
+  }
+
+  // Setup `is_connection_closed` method
+  req.is_connection_closed = [&]() {
+    return !detail::is_socket_alive(strm.socket());
+  };
+
+  // Routing
+  auto routed = false;
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+  routed = routing(req, res, strm);
+#else
+  try {
+    routed = routing(req, res, strm);
+  } catch (std::exception &e) {
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      std::string val;
+      auto s = e.what();
+      for (size_t i = 0; s[i]; i++) {
+        switch (s[i]) {
+        case '\r': val += "\\r"; break;
+        case '\n': val += "\\n"; break;
+        default: val += s[i]; break;
+        }
+      }
+      res.set_header("EXCEPTION_WHAT", val);
+    }
+  } catch (...) {
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
+    }
+  }
+#endif
+  if (routed) {
+    if (res.status == -1) {
+      res.status = req.ranges.empty() ? StatusCode::OK_200
+                                      : StatusCode::PartialContent_206;
+    }
+
+    // Serve file content by using a content provider
+    if (!res.file_content_path_.empty()) {
+      const auto &path = res.file_content_path_;
+      auto mm = std::make_shared<detail::mmap>(path.c_str());
+      if (!mm->is_open()) {
+        res.body.clear();
+        res.content_length_ = 0;
+        res.content_provider_ = nullptr;
+        res.status = StatusCode::NotFound_404;
+        return write_response(strm, close_connection, req, res);
+      }
+
+      auto content_type = res.file_content_content_type_;
+      if (content_type.empty()) {
+        content_type = detail::find_content_type(
+            path, file_extension_and_mimetype_map_, default_file_mimetype_);
+      }
+
+      res.set_content_provider(
+          mm->size(), content_type,
+          [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+            sink.write(mm->data() + offset, length);
+            return true;
+          });
+    }
+
+    if (detail::range_error(req, res)) {
+      res.body.clear();
+      res.content_length_ = 0;
+      res.content_provider_ = nullptr;
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      return write_response(strm, close_connection, req, res);
+    }
+
+    return write_response_with_content(strm, close_connection, req, res);
+  } else {
+    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
+
+    return write_response(strm, close_connection, req, res);
+  }
+}
+
+inline bool Server::is_valid() const { return true; }
+
+inline bool Server::process_and_close_socket(socket_t sock) {
+  std::string remote_addr;
+  int remote_port = 0;
+  detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
+
+  std::string local_addr;
+  int local_port = 0;
+  detail::get_local_ip_and_port(sock, local_addr, local_port);
+
+  auto ret = detail::process_server_socket(
+      svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
+      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_,
+      [&](Stream &strm, bool close_connection, bool &connection_closed) {
+        return process_request(strm, remote_addr, remote_port, local_addr,
+                               local_port, close_connection, connection_closed,
+                               nullptr);
+      });
+
+  detail::shutdown_socket(sock);
+  detail::close_socket(sock);
+  return ret;
+}
+
+// HTTP client implementation
+inline ClientImpl::ClientImpl(const std::string &host)
+    : ClientImpl(host, 80, std::string(), std::string()) {}
+
+inline ClientImpl::ClientImpl(const std::string &host, int port)
+    : ClientImpl(host, port, std::string(), std::string()) {}
+
+inline ClientImpl::ClientImpl(const std::string &host, int port,
+                              const std::string &client_cert_path,
+                              const std::string &client_key_path)
+    : host_(detail::escape_abstract_namespace_unix_domain(host)), port_(port),
+      host_and_port_(adjust_host_string(host_) + ":" + std::to_string(port)),
+      client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
+
+inline ClientImpl::~ClientImpl() {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  shutdown_socket(socket_);
+  close_socket(socket_);
+}
+
+inline bool ClientImpl::is_valid() const { return true; }
+
+inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
+  client_cert_path_ = rhs.client_cert_path_;
+  client_key_path_ = rhs.client_key_path_;
+  connection_timeout_sec_ = rhs.connection_timeout_sec_;
+  read_timeout_sec_ = rhs.read_timeout_sec_;
+  read_timeout_usec_ = rhs.read_timeout_usec_;
+  write_timeout_sec_ = rhs.write_timeout_sec_;
+  write_timeout_usec_ = rhs.write_timeout_usec_;
+  max_timeout_msec_ = rhs.max_timeout_msec_;
+  basic_auth_username_ = rhs.basic_auth_username_;
+  basic_auth_password_ = rhs.basic_auth_password_;
+  bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  digest_auth_username_ = rhs.digest_auth_username_;
+  digest_auth_password_ = rhs.digest_auth_password_;
+#endif
+  keep_alive_ = rhs.keep_alive_;
+  follow_location_ = rhs.follow_location_;
+  url_encode_ = rhs.url_encode_;
+  address_family_ = rhs.address_family_;
+  tcp_nodelay_ = rhs.tcp_nodelay_;
+  ipv6_v6only_ = rhs.ipv6_v6only_;
+  socket_options_ = rhs.socket_options_;
+  compress_ = rhs.compress_;
+  decompress_ = rhs.decompress_;
+  interface_ = rhs.interface_;
+  proxy_host_ = rhs.proxy_host_;
+  proxy_port_ = rhs.proxy_port_;
+  proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
+  proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
+  proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
+  proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
+#endif
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  ca_cert_file_path_ = rhs.ca_cert_file_path_;
+  ca_cert_dir_path_ = rhs.ca_cert_dir_path_;
+  ca_cert_store_ = rhs.ca_cert_store_;
+#endif
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  server_certificate_verification_ = rhs.server_certificate_verification_;
+  server_hostname_verification_ = rhs.server_hostname_verification_;
+  server_certificate_verifier_ = rhs.server_certificate_verifier_;
+#endif
+  logger_ = rhs.logger_;
+}
+
+inline socket_t ClientImpl::create_client_socket(Error &error) const {
+  if (!proxy_host_.empty() && proxy_port_ != -1) {
+    return detail::create_client_socket(
+        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
+        ipv6_v6only_, socket_options_, connection_timeout_sec_,
+        connection_timeout_usec_, read_timeout_sec_, read_timeout_usec_,
+        write_timeout_sec_, write_timeout_usec_, interface_, error);
+  }
+
+  // Check is custom IP specified for host_
+  std::string ip;
+  auto it = addr_map_.find(host_);
+  if (it != addr_map_.end()) { ip = it->second; }
+
+  return detail::create_client_socket(
+      host_, ip, port_, address_family_, tcp_nodelay_, ipv6_v6only_,
+      socket_options_, connection_timeout_sec_, connection_timeout_usec_,
+      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_, interface_, error);
+}
+
+inline bool ClientImpl::create_and_connect_socket(Socket &socket,
+                                                  Error &error) {
+  auto sock = create_client_socket(error);
+  if (sock == INVALID_SOCKET) { return false; }
+  socket.sock = sock;
+  return true;
+}
+
+inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
+                                     bool /*shutdown_gracefully*/) {
+  // If there are any requests in flight from threads other than us, then it's
+  // a thread-unsafe race because individual ssl* objects are not thread-safe.
+  assert(socket_requests_in_flight_ == 0 ||
+         socket_requests_are_from_thread_ == std::this_thread::get_id());
+}
+
+inline void ClientImpl::shutdown_socket(Socket &socket) const {
+  if (socket.sock == INVALID_SOCKET) { return; }
+  detail::shutdown_socket(socket.sock);
+}
+
+inline void ClientImpl::close_socket(Socket &socket) {
+  // If there are requests in flight in another thread, usually closing
+  // the socket will be fine and they will simply receive an error when
+  // using the closed socket, but it is still a bug since rarely the OS
+  // may reassign the socket id to be used for a new socket, and then
+  // suddenly they will be operating on a live socket that is different
+  // than the one they intended!
+  assert(socket_requests_in_flight_ == 0 ||
+         socket_requests_are_from_thread_ == std::this_thread::get_id());
+
+  // It is also a bug if this happens while SSL is still active
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  assert(socket.ssl == nullptr);
+#endif
+  if (socket.sock == INVALID_SOCKET) { return; }
+  detail::close_socket(socket.sock);
+  socket.sock = INVALID_SOCKET;
+}
+
+inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
+                                           Response &res) const {
+  std::array<char, 2048> buf{};
+
+  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
+
+  if (!line_reader.getline()) { return false; }
+
+#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
+  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
+#else
+  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
+#endif
+
+  std::cmatch m;
+  if (!std::regex_match(line_reader.ptr(), m, re)) {
+    return req.method == "CONNECT";
+  }
+  res.version = std::string(m[1]);
+  res.status = std::stoi(std::string(m[2]));
+  res.reason = std::string(m[3]);
+
+  // Ignore '100 Continue'
+  while (res.status == StatusCode::Continue_100) {
+    if (!line_reader.getline()) { return false; } // CRLF
+    if (!line_reader.getline()) { return false; } // next response line
+
+    if (!std::regex_match(line_reader.ptr(), m, re)) { return false; }
+    res.version = std::string(m[1]);
+    res.status = std::stoi(std::string(m[2]));
+    res.reason = std::string(m[3]);
+  }
+
+  return true;
+}
+
+inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
+  std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
+  auto ret = send_(req, res, error);
+  if (error == Error::SSLPeerCouldBeClosed_) {
+    assert(!ret);
+    ret = send_(req, res, error);
+  }
+  return ret;
+}
+
+inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
+  {
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+
+    // Set this to false immediately - if it ever gets set to true by the end of
+    // the request, we know another thread instructed us to close the socket.
+    socket_should_be_closed_when_request_is_done_ = false;
+
+    auto is_alive = false;
+    if (socket_.is_open()) {
+      is_alive = detail::is_socket_alive(socket_.sock);
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      if (is_alive && is_ssl()) {
+        if (detail::is_ssl_peer_could_be_closed(socket_.ssl, socket_.sock)) {
+          is_alive = false;
+        }
+      }
+#endif
+
+      if (!is_alive) {
+        // Attempt to avoid sigpipe by shutting down nongracefully if it seems
+        // like the other side has already closed the connection Also, there
+        // cannot be any requests in flight from other threads since we locked
+        // request_mutex_, so safe to close everything immediately
+        const bool shutdown_gracefully = false;
+        shutdown_ssl(socket_, shutdown_gracefully);
+        shutdown_socket(socket_);
+        close_socket(socket_);
+      }
+    }
+
+    if (!is_alive) {
+      if (!create_and_connect_socket(socket_, error)) { return false; }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      // TODO: refactoring
+      if (is_ssl()) {
+        auto &scli = static_cast<SSLClient &>(*this);
+        if (!proxy_host_.empty() && proxy_port_ != -1) {
+          auto success = false;
+          if (!scli.connect_with_proxy(socket_, req.start_time_, res, success,
+                                       error)) {
+            return success;
+          }
+        }
+
+        if (!scli.initialize_ssl(socket_, error)) { return false; }
+      }
+#endif
+    }
+
+    // Mark the current socket as being in use so that it cannot be closed by
+    // anyone else while this request is ongoing, even though we will be
+    // releasing the mutex.
+    if (socket_requests_in_flight_ > 1) {
+      assert(socket_requests_are_from_thread_ == std::this_thread::get_id());
+    }
+    socket_requests_in_flight_ += 1;
+    socket_requests_are_from_thread_ = std::this_thread::get_id();
+  }
+
+  for (const auto &header : default_headers_) {
+    if (req.headers.find(header.first) == req.headers.end()) {
+      req.headers.insert(header);
+    }
+  }
+
+  auto ret = false;
+  auto close_connection = !keep_alive_;
+
+  auto se = detail::scope_exit([&]() {
+    // Briefly lock mutex in order to mark that a request is no longer ongoing
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    socket_requests_in_flight_ -= 1;
+    if (socket_requests_in_flight_ <= 0) {
+      assert(socket_requests_in_flight_ == 0);
+      socket_requests_are_from_thread_ = std::thread::id();
+    }
+
+    if (socket_should_be_closed_when_request_is_done_ || close_connection ||
+        !ret) {
+      shutdown_ssl(socket_, true);
+      shutdown_socket(socket_);
+      close_socket(socket_);
+    }
+  });
+
+  ret = process_socket(socket_, req.start_time_, [&](Stream &strm) {
+    return handle_request(strm, req, res, close_connection, error);
+  });
+
+  if (!ret) {
+    if (error == Error::Success) { error = Error::Unknown; }
+  }
+
+  return ret;
+}
+
+inline Result ClientImpl::send(const Request &req) {
+  auto req2 = req;
+  return send_(std::move(req2));
+}
+
+inline Result ClientImpl::send_(Request &&req) {
+  auto res = detail::make_unique<Response>();
+  auto error = Error::Success;
+  auto ret = send(req, *res, error);
+  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)};
+}
+
+inline bool ClientImpl::handle_request(Stream &strm, Request &req,
+                                       Response &res, bool close_connection,
+                                       Error &error) {
+  if (req.path.empty()) {
+    error = Error::Connection;
+    return false;
+  }
+
+  auto req_save = req;
+
+  bool ret;
+
+  if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) {
+    auto req2 = req;
+    req2.path = "http://" + host_and_port_ + req.path;
+    ret = process_request(strm, req2, res, close_connection, error);
+    req = req2;
+    req.path = req_save.path;
+  } else {
+    ret = process_request(strm, req, res, close_connection, error);
+  }
+
+  if (!ret) { return false; }
+
+  if (res.get_header_value("Connection") == "close" ||
+      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
+    // TODO this requires a not-entirely-obvious chain of calls to be correct
+    // for this to be safe.
+
+    // This is safe to call because handle_request is only called by send_
+    // which locks the request mutex during the process. It would be a bug
+    // to call it from a different thread since it's a thread-safety issue
+    // to do these things to the socket if another thread is using the socket.
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    shutdown_ssl(socket_, true);
+    shutdown_socket(socket_);
+    close_socket(socket_);
+  }
+
+  if (300 < res.status && res.status < 400 && follow_location_) {
+    req = req_save;
+    ret = redirect(req, res, error);
+  }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if ((res.status == StatusCode::Unauthorized_401 ||
+       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
+      req.authorization_count_ < 5) {
+    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
+    const auto &username =
+        is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
+    const auto &password =
+        is_proxy ? proxy_digest_auth_password_ : digest_auth_password_;
+
+    if (!username.empty() && !password.empty()) {
+      std::map<std::string, std::string> auth;
+      if (detail::parse_www_authenticate(res, auth, is_proxy)) {
+        Request new_req = req;
+        new_req.authorization_count_ += 1;
+        new_req.headers.erase(is_proxy ? "Proxy-Authorization"
+                                       : "Authorization");
+        new_req.headers.insert(detail::make_digest_authentication_header(
+            req, auth, new_req.authorization_count_, detail::random_string(10),
+            username, password, is_proxy));
+
+        Response new_res;
+
+        ret = send(new_req, new_res, error);
+        if (ret) { res = new_res; }
+      }
+    }
+  }
+#endif
+
+  return ret;
+}
+
+inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
+  if (req.redirect_count_ == 0) {
+    error = Error::ExceedRedirectCount;
+    return false;
+  }
+
+  auto location = res.get_header_value("location");
+  if (location.empty()) { return false; }
+
+  const static std::regex re(
+      R"((?:(https?):)?(?://(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
+
+  std::smatch m;
+  if (!std::regex_match(location, m, re)) { return false; }
+
+  auto scheme = is_ssl() ? "https" : "http";
+
+  auto next_scheme = m[1].str();
+  auto next_host = m[2].str();
+  if (next_host.empty()) { next_host = m[3].str(); }
+  auto port_str = m[4].str();
+  auto next_path = m[5].str();
+  auto next_query = m[6].str();
+
+  auto next_port = port_;
+  if (!port_str.empty()) {
+    next_port = std::stoi(port_str);
+  } else if (!next_scheme.empty()) {
+    next_port = next_scheme == "https" ? 443 : 80;
+  }
+
+  if (next_scheme.empty()) { next_scheme = scheme; }
+  if (next_host.empty()) { next_host = host_; }
+  if (next_path.empty()) { next_path = "/"; }
+
+  auto path = detail::decode_url(next_path, true) + next_query;
+
+  if (next_scheme == scheme && next_host == host_ && next_port == port_) {
+    return detail::redirect(*this, req, res, path, location, error);
+  } else {
+    if (next_scheme == "https") {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      SSLClient cli(next_host, next_port);
+      cli.copy_settings(*this);
+      if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); }
+      return detail::redirect(cli, req, res, path, location, error);
+#else
+      return false;
+#endif
+    } else {
+      ClientImpl cli(next_host, next_port);
+      cli.copy_settings(*this);
+      return detail::redirect(cli, req, res, path, location, error);
+    }
+  }
+}
+
+inline bool ClientImpl::write_content_with_provider(Stream &strm,
+                                                    const Request &req,
+                                                    Error &error) const {
+  auto is_shutting_down = []() { return false; };
+
+  if (req.is_chunked_content_provider_) {
+    // TODO: Brotli support
+    std::unique_ptr<detail::compressor> compressor;
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+    if (compress_) {
+      compressor = detail::make_unique<detail::gzip_compressor>();
+    } else
+#endif
+    {
+      compressor = detail::make_unique<detail::nocompressor>();
+    }
+
+    return detail::write_content_chunked(strm, req.content_provider_,
+                                         is_shutting_down, *compressor, error);
+  } else {
+    return detail::write_content(strm, req.content_provider_, 0,
+                                 req.content_length_, is_shutting_down, error);
+  }
+}
+
+inline bool ClientImpl::write_request(Stream &strm, Request &req,
+                                      bool close_connection, Error &error) {
+  // Prepare additional headers
+  if (close_connection) {
+    if (!req.has_header("Connection")) {
+      req.set_header("Connection", "close");
+    }
+  }
+
+  if (!req.has_header("Host")) {
+    if (is_ssl()) {
+      if (port_ == 443) {
+        req.set_header("Host", host_);
+      } else {
+        req.set_header("Host", host_and_port_);
+      }
+    } else {
+      if (port_ == 80) {
+        req.set_header("Host", host_);
+      } else {
+        req.set_header("Host", host_and_port_);
+      }
+    }
+  }
+
+  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
+
+  if (!req.content_receiver) {
+    if (!req.has_header("Accept-Encoding")) {
+      std::string accept_encoding;
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+      accept_encoding = "br";
+#endif
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+      if (!accept_encoding.empty()) { accept_encoding += ", "; }
+      accept_encoding += "gzip, deflate";
+#endif
+      req.set_header("Accept-Encoding", accept_encoding);
+    }
+
+#ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
+    if (!req.has_header("User-Agent")) {
+      auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
+      req.set_header("User-Agent", agent);
+    }
+#endif
+  };
+
+  if (req.body.empty()) {
+    if (req.content_provider_) {
+      if (!req.is_chunked_content_provider_) {
+        if (!req.has_header("Content-Length")) {
+          auto length = std::to_string(req.content_length_);
+          req.set_header("Content-Length", length);
+        }
+      }
+    } else {
+      if (req.method == "POST" || req.method == "PUT" ||
+          req.method == "PATCH") {
+        req.set_header("Content-Length", "0");
+      }
+    }
+  } else {
+    if (!req.has_header("Content-Type")) {
+      req.set_header("Content-Type", "text/plain");
+    }
+
+    if (!req.has_header("Content-Length")) {
+      auto length = std::to_string(req.body.size());
+      req.set_header("Content-Length", length);
+    }
+  }
+
+  if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) {
+    if (!req.has_header("Authorization")) {
+      req.headers.insert(make_basic_authentication_header(
+          basic_auth_username_, basic_auth_password_, false));
+    }
+  }
+
+  if (!proxy_basic_auth_username_.empty() &&
+      !proxy_basic_auth_password_.empty()) {
+    if (!req.has_header("Proxy-Authorization")) {
+      req.headers.insert(make_basic_authentication_header(
+          proxy_basic_auth_username_, proxy_basic_auth_password_, true));
+    }
+  }
+
+  if (!bearer_token_auth_token_.empty()) {
+    if (!req.has_header("Authorization")) {
+      req.headers.insert(make_bearer_token_authentication_header(
+          bearer_token_auth_token_, false));
+    }
+  }
+
+  if (!proxy_bearer_token_auth_token_.empty()) {
+    if (!req.has_header("Proxy-Authorization")) {
+      req.headers.insert(make_bearer_token_authentication_header(
+          proxy_bearer_token_auth_token_, true));
+    }
+  }
+
+  // Request line and headers
+  {
+    detail::BufferStream bstrm;
+
+    const auto &path_with_query =
+        req.params.empty() ? req.path
+                           : append_query_params(req.path, req.params);
+
+    const auto &path =
+        url_encode_ ? detail::encode_url(path_with_query) : path_with_query;
+
+    detail::write_request_line(bstrm, req.method, path);
+
+    header_writer_(bstrm, req.headers);
+
+    // Flush buffer
+    auto &data = bstrm.get_buffer();
+    if (!detail::write_data(strm, data.data(), data.size())) {
+      error = Error::Write;
+      return false;
+    }
+  }
+
+  // Body
+  if (req.body.empty()) {
+    return write_content_with_provider(strm, req, error);
+  }
+
+  if (!detail::write_data(strm, req.body.data(), req.body.size())) {
+    error = Error::Write;
+    return false;
+  }
+
+  return true;
+}
+
+inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
+    Request &req, const char *body, size_t content_length,
+    ContentProvider content_provider,
+    ContentProviderWithoutLength content_provider_without_length,
+    const std::string &content_type, Error &error) {
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  if (compress_ && !content_provider_without_length) {
+    // TODO: Brotli support
+    detail::gzip_compressor compressor;
+
+    if (content_provider) {
+      auto ok = true;
+      size_t offset = 0;
+      DataSink data_sink;
+
+      data_sink.write = [&](const char *data, size_t data_len) -> bool {
+        if (ok) {
+          auto last = offset + data_len == content_length;
+
+          auto ret = compressor.compress(
+              data, data_len, last,
+              [&](const char *compressed_data, size_t compressed_data_len) {
+                req.body.append(compressed_data, compressed_data_len);
+                return true;
+              });
+
+          if (ret) {
+            offset += data_len;
+          } else {
+            ok = false;
+          }
+        }
+        return ok;
+      };
+
+      while (ok && offset < content_length) {
+        if (!content_provider(offset, content_length - offset, data_sink)) {
+          error = Error::Canceled;
+          return nullptr;
+        }
+      }
+    } else {
+      if (!compressor.compress(body, content_length, true,
+                               [&](const char *data, size_t data_len) {
+                                 req.body.append(data, data_len);
+                                 return true;
+                               })) {
+        error = Error::Compression;
+        return nullptr;
+      }
+    }
+  } else
+#endif
+  {
+    if (content_provider) {
+      req.content_length_ = content_length;
+      req.content_provider_ = std::move(content_provider);
+      req.is_chunked_content_provider_ = false;
+    } else if (content_provider_without_length) {
+      req.content_length_ = 0;
+      req.content_provider_ = detail::ContentProviderAdapter(
+          std::move(content_provider_without_length));
+      req.is_chunked_content_provider_ = true;
+      req.set_header("Transfer-Encoding", "chunked");
+    } else {
+      req.body.assign(body, content_length);
+    }
+  }
+
+  auto res = detail::make_unique<Response>();
+  return send(req, *res, error) ? std::move(res) : nullptr;
+}
+
+inline Result ClientImpl::send_with_content_provider(
+    const std::string &method, const std::string &path, const Headers &headers,
+    const char *body, size_t content_length, ContentProvider content_provider,
+    ContentProviderWithoutLength content_provider_without_length,
+    const std::string &content_type, Progress progress) {
+  Request req;
+  req.method = method;
+  req.headers = headers;
+  req.path = path;
+  req.progress = progress;
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  auto error = Error::Success;
+
+  auto res = send_with_content_provider(
+      req, body, content_length, std::move(content_provider),
+      std::move(content_provider_without_length), content_type, error);
+
+  return Result{std::move(res), error, std::move(req.headers)};
+}
+
+inline std::string
+ClientImpl::adjust_host_string(const std::string &host) const {
+  if (host.find(':') != std::string::npos) { return "[" + host + "]"; }
+  return host;
+}
+
+inline bool ClientImpl::process_request(Stream &strm, Request &req,
+                                        Response &res, bool close_connection,
+                                        Error &error) {
+  // Send request
+  if (!write_request(strm, req, close_connection, error)) { return false; }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if (is_ssl()) {
+    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
+    if (!is_proxy_enabled) {
+      if (detail::is_ssl_peer_could_be_closed(socket_.ssl, socket_.sock)) {
+        error = Error::SSLPeerCouldBeClosed_;
+        return false;
+      }
+    }
+  }
+#endif
+
+  // Receive response and headers
+  if (!read_response_line(strm, req, res) ||
+      !detail::read_headers(strm, res.headers)) {
+    error = Error::Read;
+    return false;
+  }
+
+  // Body
+  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
+      req.method != "CONNECT") {
+    auto redirect = 300 < res.status && res.status < 400 &&
+                    res.status != StatusCode::NotModified_304 &&
+                    follow_location_;
+
+    if (req.response_handler && !redirect) {
+      if (!req.response_handler(res)) {
+        error = Error::Canceled;
+        return false;
+      }
+    }
+
+    auto out =
+        req.content_receiver
+            ? static_cast<ContentReceiverWithProgress>(
+                  [&](const char *buf, size_t n, uint64_t off, uint64_t len) {
+                    if (redirect) { return true; }
+                    auto ret = req.content_receiver(buf, n, off, len);
+                    if (!ret) { error = Error::Canceled; }
+                    return ret;
+                  })
+            : static_cast<ContentReceiverWithProgress>(
+                  [&](const char *buf, size_t n, uint64_t /*off*/,
+                      uint64_t /*len*/) {
+                    assert(res.body.size() + n <= res.body.max_size());
+                    res.body.append(buf, n);
+                    return true;
+                  });
+
+    auto progress = [&](uint64_t current, uint64_t total) {
+      if (!req.progress || redirect) { return true; }
+      auto ret = req.progress(current, total);
+      if (!ret) { error = Error::Canceled; }
+      return ret;
+    };
+
+    if (res.has_header("Content-Length")) {
+      if (!req.content_receiver) {
+        auto len = res.get_header_value_u64("Content-Length");
+        if (len > res.body.max_size()) {
+          error = Error::Read;
+          return false;
+        }
+        res.body.reserve(static_cast<size_t>(len));
+      }
+    }
+
+    if (res.status != StatusCode::NotModified_304) {
+      int dummy_status;
+      if (!detail::read_content(strm, res, (std::numeric_limits<size_t>::max)(),
+                                dummy_status, std::move(progress),
+                                std::move(out), decompress_)) {
+        if (error != Error::Canceled) { error = Error::Read; }
+        return false;
+      }
+    }
+  }
+
+  // Log
+  if (logger_) { logger_(req, res); }
+
+  return true;
+}
+
+inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
+    const std::string &boundary, const MultipartFormDataItems &items,
+    const MultipartFormDataProviderItems &provider_items) const {
+  size_t cur_item = 0;
+  size_t cur_start = 0;
+  // cur_item and cur_start are copied to within the std::function and maintain
+  // state between successive calls
+  return [&, cur_item, cur_start](size_t offset,
+                                  DataSink &sink) mutable -> bool {
+    if (!offset && !items.empty()) {
+      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
+      return true;
+    } else if (cur_item < provider_items.size()) {
+      if (!cur_start) {
+        const auto &begin = detail::serialize_multipart_formdata_item_begin(
+            provider_items[cur_item], boundary);
+        offset += begin.size();
+        cur_start = offset;
+        sink.os << begin;
+      }
+
+      DataSink cur_sink;
+      auto has_data = true;
+      cur_sink.write = sink.write;
+      cur_sink.done = [&]() { has_data = false; };
+
+      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
+        return false;
+      }
+
+      if (!has_data) {
+        sink.os << detail::serialize_multipart_formdata_item_end();
+        cur_item++;
+        cur_start = 0;
+      }
+      return true;
+    } else {
+      sink.os << detail::serialize_multipart_formdata_finish(boundary);
+      sink.done();
+      return true;
+    }
+  };
+}
+
+inline bool ClientImpl::process_socket(
+    const Socket &socket,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &strm)> callback) {
+  return detail::process_client_socket(
+      socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+      write_timeout_usec_, max_timeout_msec_, start_time,
+      std::move(callback));
+}
+
+inline bool ClientImpl::is_ssl() const { return false; }
+
+inline Result ClientImpl::Get(const std::string &path) {
+  return Get(path, Headers(), Progress());
+}
+
+inline Result ClientImpl::Get(const std::string &path, Progress progress) {
+  return Get(path, Headers(), std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers) {
+  return Get(path, headers, Progress());
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              Progress progress) {
+  Request req;
+  req.method = "GET";
+  req.path = path;
+  req.headers = headers;
+  req.progress = std::move(progress);
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ContentReceiver content_receiver) {
+  return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, Headers(), nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ContentReceiver content_receiver) {
+  return Get(path, headers, nullptr, std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver) {
+  return Get(path, Headers(), std::move(response_handler),
+             std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver) {
+  return Get(path, headers, std::move(response_handler),
+             std::move(content_receiver), nullptr);
+}
+
+inline Result ClientImpl::Get(const std::string &path,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, Headers(), std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  Request req;
+  req.method = "GET";
+  req.path = path;
+  req.headers = headers;
+  req.response_handler = std::move(response_handler);
+  req.content_receiver =
+      [content_receiver](const char *data, size_t data_length,
+                         uint64_t /*offset*/, uint64_t /*total_length*/) {
+        return content_receiver(data, data_length);
+      };
+  req.progress = std::move(progress);
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers, Progress progress) {
+  if (params.empty()) { return Get(path, headers); }
+
+  std::string path_with_query = append_query_params(path, params);
+  return Get(path_with_query, headers, std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  return Get(path, params, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
+}
+
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
+                              const Headers &headers,
+                              ResponseHandler response_handler,
+                              ContentReceiver content_receiver,
+                              Progress progress) {
+  if (params.empty()) {
+    return Get(path, headers, std::move(response_handler),
+               std::move(content_receiver), std::move(progress));
+  }
+
+  std::string path_with_query = append_query_params(path, params);
+  return Get(path_with_query, headers, std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
+}
+
+inline Result ClientImpl::Head(const std::string &path) {
+  return Head(path, Headers());
+}
+
+inline Result ClientImpl::Head(const std::string &path,
+                               const Headers &headers) {
+  Request req;
+  req.method = "HEAD";
+  req.headers = headers;
+  req.path = path;
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Post(const std::string &path) {
+  return Post(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               const Headers &headers) {
+  return Post(path, headers, nullptr, 0, std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path, const char *body,
+                               size_t content_length,
+                               const std::string &content_type) {
+  return Post(path, Headers(), body, content_length, content_type, nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const char *body, size_t content_length,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const char *body, size_t content_length,
+                               const std::string &content_type,
+                               Progress progress) {
+  return send_with_content_provider("POST", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const std::string &body,
+                               const std::string &content_type) {
+  return Post(path, Headers(), body, content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const std::string &body,
+                               const std::string &content_type,
+                               Progress progress) {
+  return Post(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const std::string &body,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const std::string &body,
+                               const std::string &content_type,
+                               Progress progress) {
+  return send_with_content_provider("POST", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Params &params) {
+  return Post(path, Headers(), params);
+}
+
+inline Result ClientImpl::Post(const std::string &path, size_t content_length,
+                               ContentProvider content_provider,
+                               const std::string &content_type) {
+  return Post(path, Headers(), content_length, std::move(content_provider),
+              content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               ContentProviderWithoutLength content_provider,
+                               const std::string &content_type) {
+  return Post(path, Headers(), std::move(content_provider), content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               size_t content_length,
+                               ContentProvider content_provider,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               ContentProviderWithoutLength content_provider,
+                               const std::string &content_type) {
+  return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Post(path, headers, query, "application/x-www-form-urlencoded");
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const Params &params, Progress progress) {
+  auto query = detail::params_to_query_str(params);
+  return Post(path, headers, query, "application/x-www-form-urlencoded",
+              progress);
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               const MultipartFormDataItems &items) {
+  return Post(path, Headers(), items);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const MultipartFormDataItems &items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type);
+}
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
+                               const MultipartFormDataItems &items,
+                               const std::string &boundary) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type);
+}
+
+inline Result
+ClientImpl::Post(const std::string &path, const Headers &headers,
+                 const MultipartFormDataItems &items,
+                 const MultipartFormDataProviderItems &provider_items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "POST", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path) {
+  return Put(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Put(const std::string &path, const char *body,
+                              size_t content_length,
+                              const std::string &content_type) {
+  return Put(path, Headers(), body, content_length, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const char *body, size_t content_length,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const char *body, size_t content_length,
+                              const std::string &content_type,
+                              Progress progress) {
+  return send_with_content_provider("PUT", path, headers, body, content_length,
+                                    nullptr, nullptr, content_type, progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const std::string &body,
+                              const std::string &content_type) {
+  return Put(path, Headers(), body, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const std::string &body,
+                              const std::string &content_type,
+                              Progress progress) {
+  return Put(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const std::string &body,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const std::string &body,
+                              const std::string &content_type,
+                              Progress progress) {
+  return send_with_content_provider("PUT", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path, size_t content_length,
+                              ContentProvider content_provider,
+                              const std::string &content_type) {
+  return Put(path, Headers(), content_length, std::move(content_provider),
+             content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path,
+                              ContentProviderWithoutLength content_provider,
+                              const std::string &content_type) {
+  return Put(path, Headers(), std::move(content_provider), content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              size_t content_length,
+                              ContentProvider content_provider,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              ContentProviderWithoutLength content_provider,
+                              const std::string &content_type) {
+  return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Params &params) {
+  return Put(path, Headers(), params);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const Params &params) {
+  auto query = detail::params_to_query_str(params);
+  return Put(path, headers, query, "application/x-www-form-urlencoded");
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const Params &params, Progress progress) {
+  auto query = detail::params_to_query_str(params);
+  return Put(path, headers, query, "application/x-www-form-urlencoded",
+             progress);
+}
+
+inline Result ClientImpl::Put(const std::string &path,
+                              const MultipartFormDataItems &items) {
+  return Put(path, Headers(), items);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const MultipartFormDataItems &items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const MultipartFormDataItems &items,
+                              const std::string &boundary) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type);
+}
+
+inline Result
+ClientImpl::Put(const std::string &path, const Headers &headers,
+                const MultipartFormDataItems &items,
+                const MultipartFormDataProviderItems &provider_items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "PUT", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type, nullptr);
+}
+inline Result ClientImpl::Patch(const std::string &path) {
+  return Patch(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const char *body,
+                                size_t content_length,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), body, content_length, content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const char *body,
+                                size_t content_length,
+                                const std::string &content_type,
+                                Progress progress) {
+  return Patch(path, Headers(), body, content_length, content_type, progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const char *body, size_t content_length,
+                                const std::string &content_type) {
+  return Patch(path, headers, body, content_length, content_type, nullptr);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const char *body, size_t content_length,
+                                const std::string &content_type,
+                                Progress progress) {
+  return send_with_content_provider("PATCH", path, headers, body,
+                                    content_length, nullptr, nullptr,
+                                    content_type, progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path,
+                                const std::string &body,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), body, content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path,
+                                const std::string &body,
+                                const std::string &content_type,
+                                Progress progress) {
+  return Patch(path, Headers(), body, content_type, progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const std::string &body,
+                                const std::string &content_type) {
+  return Patch(path, headers, body, content_type, nullptr);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                const std::string &body,
+                                const std::string &content_type,
+                                Progress progress) {
+  return send_with_content_provider("PATCH", path, headers, body.data(),
+                                    body.size(), nullptr, nullptr, content_type,
+                                    progress);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
+                                ContentProvider content_provider,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), content_length, std::move(content_provider),
+               content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path,
+                                ContentProviderWithoutLength content_provider,
+                                const std::string &content_type) {
+  return Patch(path, Headers(), std::move(content_provider), content_type);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                size_t content_length,
+                                ContentProvider content_provider,
+                                const std::string &content_type) {
+  return send_with_content_provider("PATCH", path, headers, nullptr,
+                                    content_length, std::move(content_provider),
+                                    nullptr, content_type, nullptr);
+}
+
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
+                                ContentProviderWithoutLength content_provider,
+                                const std::string &content_type) {
+  return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
+                                    std::move(content_provider), content_type,
+                                    nullptr);
+}
+
+inline Result ClientImpl::Delete(const std::string &path) {
+  return Delete(path, Headers(), std::string(), std::string());
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers) {
+  return Delete(path, headers, std::string(), std::string());
+}
+
+inline Result ClientImpl::Delete(const std::string &path, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type) {
+  return Delete(path, Headers(), body, content_length, content_type);
+}
+
+inline Result ClientImpl::Delete(const std::string &path, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  return Delete(path, Headers(), body, content_length, content_type, progress);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type) {
+  return Delete(path, headers, body, content_length, content_type, nullptr);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  Request req;
+  req.method = "DELETE";
+  req.headers = headers;
+  req.path = path;
+  req.progress = progress;
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
+  req.body.assign(body, content_length);
+
+  return send_(std::move(req));
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const std::string &body,
+                                 const std::string &content_type) {
+  return Delete(path, Headers(), body.data(), body.size(), content_type);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const std::string &body,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  return Delete(path, Headers(), body.data(), body.size(), content_type,
+                progress);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
+                                 const std::string &body,
+                                 const std::string &content_type) {
+  return Delete(path, headers, body.data(), body.size(), content_type);
+}
+
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
+                                 const std::string &body,
+                                 const std::string &content_type,
+                                 Progress progress) {
+  return Delete(path, headers, body.data(), body.size(), content_type,
+                progress);
+}
+
+inline Result ClientImpl::Options(const std::string &path) {
+  return Options(path, Headers());
+}
+
+inline Result ClientImpl::Options(const std::string &path,
+                                  const Headers &headers) {
+  Request req;
+  req.method = "OPTIONS";
+  req.headers = headers;
+  req.path = path;
+  if (max_timeout_msec_ > 0) {
+    req.start_time_ = std::chrono::steady_clock::now();
+  }
+
+  return send_(std::move(req));
+}
+
+inline void ClientImpl::stop() {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+
+  // If there is anything ongoing right now, the ONLY thread-safe thing we can
+  // do is to shutdown_socket, so that threads using this socket suddenly
+  // discover they can't read/write any more and error out. Everything else
+  // (closing the socket, shutting ssl down) is unsafe because these actions are
+  // not thread-safe.
+  if (socket_requests_in_flight_ > 0) {
+    shutdown_socket(socket_);
+
+    // Aside from that, we set a flag for the socket to be closed when we're
+    // done.
+    socket_should_be_closed_when_request_is_done_ = true;
+    return;
+  }
+
+  // Otherwise, still holding the mutex, we can shut everything down ourselves
+  shutdown_ssl(socket_, true);
+  shutdown_socket(socket_);
+  close_socket(socket_);
+}
+
+inline std::string ClientImpl::host() const { return host_; }
+
+inline int ClientImpl::port() const { return port_; }
+
+inline size_t ClientImpl::is_socket_open() const {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  return socket_.is_open();
+}
+
+inline socket_t ClientImpl::socket() const { return socket_.sock; }
+
+inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
+  connection_timeout_sec_ = sec;
+  connection_timeout_usec_ = usec;
+}
+
+inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) {
+  read_timeout_sec_ = sec;
+  read_timeout_usec_ = usec;
+}
+
+inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
+  write_timeout_sec_ = sec;
+  write_timeout_usec_ = usec;
+}
+
+inline void ClientImpl::set_max_timeout(time_t msec) {
+  max_timeout_msec_ = msec;
+}
+
+inline void ClientImpl::set_basic_auth(const std::string &username,
+                                       const std::string &password) {
+  basic_auth_username_ = username;
+  basic_auth_password_ = password;
+}
+
+inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
+  bearer_token_auth_token_ = token;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void ClientImpl::set_digest_auth(const std::string &username,
+                                        const std::string &password) {
+  digest_auth_username_ = username;
+  digest_auth_password_ = password;
+}
+#endif
+
+inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; }
+
+inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
+
+inline void ClientImpl::set_url_encode(bool on) { url_encode_ = on; }
+
+inline void
+ClientImpl::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
+  addr_map_ = std::move(addr_map);
+}
+
+inline void ClientImpl::set_default_headers(Headers headers) {
+  default_headers_ = std::move(headers);
+}
+
+inline void ClientImpl::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+}
+
+inline void ClientImpl::set_address_family(int family) {
+  address_family_ = family;
+}
+
+inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }
+
+inline void ClientImpl::set_ipv6_v6only(bool on) { ipv6_v6only_ = on; }
+
+inline void ClientImpl::set_socket_options(SocketOptions socket_options) {
+  socket_options_ = std::move(socket_options);
+}
+
+inline void ClientImpl::set_compress(bool on) { compress_ = on; }
+
+inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
+
+inline void ClientImpl::set_interface(const std::string &intf) {
+  interface_ = intf;
+}
+
+inline void ClientImpl::set_proxy(const std::string &host, int port) {
+  proxy_host_ = host;
+  proxy_port_ = port;
+}
+
+inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
+                                             const std::string &password) {
+  proxy_basic_auth_username_ = username;
+  proxy_basic_auth_password_ = password;
+}
+
+inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
+  proxy_bearer_token_auth_token_ = token;
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
+                                              const std::string &password) {
+  proxy_digest_auth_username_ = username;
+  proxy_digest_auth_password_ = password;
+}
+
+inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                         const std::string &ca_cert_dir_path) {
+  ca_cert_file_path_ = ca_cert_file_path;
+  ca_cert_dir_path_ = ca_cert_dir_path;
+}
+
+inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (ca_cert_store && ca_cert_store != ca_cert_store_) {
+    ca_cert_store_ = ca_cert_store;
+  }
+}
+
+inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
+                                                    std::size_t size) const {
+  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
+  auto se = detail::scope_exit([&] { BIO_free_all(mem); });
+  if (!mem) { return nullptr; }
+
+  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
+  if (!inf) { return nullptr; }
+
+  auto cts = X509_STORE_new();
+  if (cts) {
+    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
+      auto itmp = sk_X509_INFO_value(inf, i);
+      if (!itmp) { continue; }
+
+      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
+      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
+    }
+  }
+
+  sk_X509_INFO_pop_free(inf, X509_INFO_free);
+  return cts;
+}
+
+inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
+  server_certificate_verification_ = enabled;
+}
+
+inline void ClientImpl::enable_server_hostname_verification(bool enabled) {
+  server_hostname_verification_ = enabled;
+}
+
+inline void ClientImpl::set_server_certificate_verifier(
+    std::function<bool(SSL *ssl)> verifier) {
+  server_certificate_verifier_ = verifier;
+}
+#endif
+
+inline void ClientImpl::set_logger(Logger logger) {
+  logger_ = std::move(logger);
+}
+
+/*
+ * SSL Implementation
+ */
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+namespace detail {
+
+template <typename U, typename V>
+inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex,
+                    U SSL_connect_or_accept, V setup) {
+  SSL *ssl = nullptr;
+  {
+    std::lock_guard<std::mutex> guard(ctx_mutex);
+    ssl = SSL_new(ctx);
+  }
+
+  if (ssl) {
+    set_nonblocking(sock, true);
+    auto bio = BIO_new_socket(static_cast<int>(sock), BIO_NOCLOSE);
+    BIO_set_nbio(bio, 1);
+    SSL_set_bio(ssl, bio, bio);
+
+    if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) {
+      SSL_shutdown(ssl);
+      {
+        std::lock_guard<std::mutex> guard(ctx_mutex);
+        SSL_free(ssl);
+      }
+      set_nonblocking(sock, false);
+      return nullptr;
+    }
+    BIO_set_nbio(bio, 0);
+    set_nonblocking(sock, false);
+  }
+
+  return ssl;
+}
+
+inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, socket_t sock,
+                       bool shutdown_gracefully) {
+  // sometimes we may want to skip this to try to avoid SIGPIPE if we know
+  // the remote has closed the network connection
+  // Note that it is not always possible to avoid SIGPIPE, this is merely a
+  // best-efforts.
+  if (shutdown_gracefully) {
+#ifdef _WIN32
+    (void)(sock);
+    SSL_shutdown(ssl);
+#else
+    timeval tv;
+    tv.tv_sec = 1;
+    tv.tv_usec = 0;
+    setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+               reinterpret_cast<const void *>(&tv), sizeof(tv));
+
+    auto ret = SSL_shutdown(ssl);
+    while (ret == 0) {
+      std::this_thread::sleep_for(std::chrono::milliseconds{100});
+      ret = SSL_shutdown(ssl);
+    }
+#endif
+  }
+
+  std::lock_guard<std::mutex> guard(ctx_mutex);
+  SSL_free(ssl);
+}
+
+template <typename U>
+bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
+                                       U ssl_connect_or_accept,
+                                       time_t timeout_sec,
+                                       time_t timeout_usec) {
+  auto res = 0;
+  while ((res = ssl_connect_or_accept(ssl)) != 1) {
+    auto err = SSL_get_error(ssl, res);
+    switch (err) {
+    case SSL_ERROR_WANT_READ:
+      if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; }
+      break;
+    case SSL_ERROR_WANT_WRITE:
+      if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; }
+      break;
+    default: break;
+    }
+    return false;
+  }
+  return true;
+}
+
+template <typename T>
+inline bool process_server_socket_ssl(
+    const std::atomic<socket_t> &svr_sock, SSL *ssl, socket_t sock,
+    size_t keep_alive_max_count, time_t keep_alive_timeout_sec,
+    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
+    time_t write_timeout_usec, T callback) {
+  return process_server_socket_core(
+      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
+      [&](bool close_connection, bool &connection_closed) {
+        SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
+                             write_timeout_sec, write_timeout_usec);
+        return callback(strm, close_connection, connection_closed);
+      });
+}
+
+template <typename T>
+inline bool process_client_socket_ssl(
+    SSL *ssl, socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time, T callback) {
+  SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
+                       write_timeout_sec, write_timeout_usec,
+                       max_timeout_msec, start_time);
+  return callback(strm);
+}
+
+class SSLInit {
+public:
+  SSLInit() {
+    OPENSSL_init_ssl(
+        OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+  }
+};
+
+// SSL socket stream implementation
+inline SSLSocketStream::SSLSocketStream(
+    socket_t sock, SSL *ssl, time_t read_timeout_sec, time_t read_timeout_usec,
+    time_t write_timeout_sec, time_t write_timeout_usec,
+    time_t max_timeout_msec,
+    std::chrono::time_point<std::chrono::steady_clock> start_time)
+    : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec),
+      read_timeout_usec_(read_timeout_usec),
+      write_timeout_sec_(write_timeout_sec),
+      write_timeout_usec_(write_timeout_usec),
+      max_timeout_msec_(max_timeout_msec), start_time(start_time) {
+  SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
+}
+
+inline SSLSocketStream::~SSLSocketStream() = default;
+
+inline bool SSLSocketStream::is_readable() const {
+  if (max_timeout_msec_ <= 0) {
+    return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
+  }
+
+  time_t read_timeout_sec;
+  time_t read_timeout_usec;
+  calc_actual_timeout(max_timeout_msec_, duration(), read_timeout_sec_,
+                      read_timeout_usec_, read_timeout_sec, read_timeout_usec);
+
+  return select_read(sock_, read_timeout_sec, read_timeout_usec) > 0;
+}
+
+inline bool SSLSocketStream::is_writable() const {
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_) && !is_ssl_peer_could_be_closed(ssl_, sock_);
+}
+
+inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
+  if (SSL_pending(ssl_) > 0) {
+    return SSL_read(ssl_, ptr, static_cast<int>(size));
+  } else if (is_readable()) {
+    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
+#ifdef _WIN32
+      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
+#else
+      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
+#endif
+        if (SSL_pending(ssl_) > 0) {
+          return SSL_read(ssl_, ptr, static_cast<int>(size));
+        } else if (is_readable()) {
+          std::this_thread::sleep_for(std::chrono::microseconds{10});
+          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          return -1;
+        }
+      }
+    }
+    return ret;
+  } else {
+    return -1;
+  }
+}
+
+inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
+  if (is_writable()) {
+    auto handle_size = static_cast<int>(
+        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
+
+    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
+#ifdef _WIN32
+      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
+#else
+      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
+#endif
+        if (is_writable()) {
+          std::this_thread::sleep_for(std::chrono::microseconds{10});
+          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          return -1;
+        }
+      }
+    }
+    return ret;
+  }
+  return -1;
+}
+
+inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
+                                                    int &port) const {
+  detail::get_remote_ip_and_port(sock_, ip, port);
+}
+
+inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
+                                                   int &port) const {
+  detail::get_local_ip_and_port(sock_, ip, port);
+}
+
+inline socket_t SSLSocketStream::socket() const { return sock_; }
+
+inline time_t SSLSocketStream::duration() const {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::steady_clock::now() - start_time)
+      .count();
+}
+
+static SSLInit sslinit_;
+
+} // namespace detail
+
+// SSL HTTP server implementation
+inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
+                            const char *client_ca_cert_file_path,
+                            const char *client_ca_cert_dir_path,
+                            const char *private_key_password) {
+  ctx_ = SSL_CTX_new(TLS_server_method());
+
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+
+    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+    if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_,
+          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
+    }
+
+    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
+            1 ||
+        SSL_CTX_check_private_key(ctx_) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
+      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
+                                    client_ca_cert_dir_path);
+
+      SSL_CTX_set_verify(
+          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
+    }
+  }
+}
+
+inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key,
+                            X509_STORE *client_ca_cert_store) {
+  ctx_ = SSL_CTX_new(TLS_server_method());
+
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+
+    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+    if (SSL_CTX_use_certificate(ctx_, cert) != 1 ||
+        SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_store) {
+      SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
+
+      SSL_CTX_set_verify(
+          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
+    }
+  }
+}
+
+inline SSLServer::SSLServer(
+    const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback) {
+  ctx_ = SSL_CTX_new(TLS_method());
+  if (ctx_) {
+    if (!setup_ssl_ctx_callback(*ctx_)) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLServer::~SSLServer() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+}
+
+inline bool SSLServer::is_valid() const { return ctx_; }
+
+inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
+
+inline void SSLServer::update_certs(X509 *cert, EVP_PKEY *private_key,
+                                    X509_STORE *client_ca_cert_store) {
+
+  std::lock_guard<std::mutex> guard(ctx_mutex_);
+
+  SSL_CTX_use_certificate(ctx_, cert);
+  SSL_CTX_use_PrivateKey(ctx_, private_key);
+
+  if (client_ca_cert_store != nullptr) {
+    SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
+  }
+}
+
+inline bool SSLServer::process_and_close_socket(socket_t sock) {
+  auto ssl = detail::ssl_new(
+      sock, ctx_, ctx_mutex_,
+      [&](SSL *ssl2) {
+        return detail::ssl_connect_or_accept_nonblocking(
+            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_);
+      },
+      [](SSL * /*ssl2*/) { return true; });
+
+  auto ret = false;
+  if (ssl) {
+    std::string remote_addr;
+    int remote_port = 0;
+    detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
+
+    std::string local_addr;
+    int local_port = 0;
+    detail::get_local_ip_and_port(sock, local_addr, local_port);
+
+    ret = detail::process_server_socket_ssl(
+        svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
+        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
+        write_timeout_usec_,
+        [&](Stream &strm, bool close_connection, bool &connection_closed) {
+          return process_request(strm, remote_addr, remote_port, local_addr,
+                                 local_port, close_connection,
+                                 connection_closed,
+                                 [&](Request &req) { req.ssl = ssl; });
+        });
+
+    // Shutdown gracefully if the result seemed successful, non-gracefully if
+    // the connection appeared to be closed.
+    const bool shutdown_gracefully = ret;
+    detail::ssl_delete(ctx_mutex_, ssl, sock, shutdown_gracefully);
+  }
+
+  detail::shutdown_socket(sock);
+  detail::close_socket(sock);
+  return ret;
+}
+
+// SSL HTTP client implementation
+inline SSLClient::SSLClient(const std::string &host)
+    : SSLClient(host, 443, std::string(), std::string()) {}
+
+inline SSLClient::SSLClient(const std::string &host, int port)
+    : SSLClient(host, port, std::string(), std::string()) {}
+
+inline SSLClient::SSLClient(const std::string &host, int port,
+                            const std::string &client_cert_path,
+                            const std::string &client_key_path,
+                            const std::string &private_key_password)
+    : ClientImpl(host, port, client_cert_path, client_key_path) {
+  ctx_ = SSL_CTX_new(TLS_client_method());
+
+  SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(b, e);
+                });
+
+  if (!client_cert_path.empty() && !client_key_path.empty()) {
+    if (!private_key_password.empty()) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_, reinterpret_cast<void *>(
+                    const_cast<char *>(private_key_password.c_str())));
+    }
+
+    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(),
+                                     SSL_FILETYPE_PEM) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(),
+                                    SSL_FILETYPE_PEM) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLClient::SSLClient(const std::string &host, int port,
+                            X509 *client_cert, EVP_PKEY *client_key,
+                            const std::string &private_key_password)
+    : ClientImpl(host, port) {
+  ctx_ = SSL_CTX_new(TLS_client_method());
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(b, e);
+                });
+
+  if (client_cert != nullptr && client_key != nullptr) {
+    if (!private_key_password.empty()) {
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_, reinterpret_cast<void *>(
+                    const_cast<char *>(private_key_password.c_str())));
+    }
+
+    if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 ||
+        SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLClient::~SSLClient() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+  // Make sure to shut down SSL since shutdown_ssl will resolve to the
+  // base function rather than the derived function once we get to the
+  // base class destructor, and won't free the SSL (causing a leak).
+  shutdown_ssl_impl(socket_, true);
+}
+
+inline bool SSLClient::is_valid() const { return ctx_; }
+
+inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (ca_cert_store) {
+    if (ctx_) {
+      if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
+        // Free memory allocated for old cert and use new store `ca_cert_store`
+        SSL_CTX_set_cert_store(ctx_, ca_cert_store);
+      }
+    } else {
+      X509_STORE_free(ca_cert_store);
+    }
+  }
+}
+
+inline void SSLClient::load_ca_cert_store(const char *ca_cert,
+                                          std::size_t size) {
+  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
+}
+
+inline long SSLClient::get_openssl_verify_result() const {
+  return verify_result_;
+}
+
+inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }
+
+inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
+  return is_valid() && ClientImpl::create_and_connect_socket(socket, error);
+}
+
+// Assumes that socket_mutex_ is locked and that there are no requests in flight
+inline bool SSLClient::connect_with_proxy(
+    Socket &socket,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    Response &res, bool &success, Error &error) {
+  success = true;
+  Response proxy_res;
+  if (!detail::process_client_socket(
+          socket.sock, read_timeout_sec_, read_timeout_usec_,
+          write_timeout_sec_, write_timeout_usec_, max_timeout_msec_,
+          start_time, [&](Stream &strm) {
+            Request req2;
+            req2.method = "CONNECT";
+            req2.path = host_and_port_;
+            if (max_timeout_msec_ > 0) {
+              req2.start_time_ = std::chrono::steady_clock::now();
+            }
+            return process_request(strm, req2, proxy_res, false, error);
+          })) {
+    // Thread-safe to close everything because we are assuming there are no
+    // requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
+    success = false;
+    return false;
+  }
+
+  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
+    if (!proxy_digest_auth_username_.empty() &&
+        !proxy_digest_auth_password_.empty()) {
+      std::map<std::string, std::string> auth;
+      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
+        proxy_res = Response();
+        if (!detail::process_client_socket(
+                socket.sock, read_timeout_sec_, read_timeout_usec_,
+                write_timeout_sec_, write_timeout_usec_, max_timeout_msec_,
+                start_time, [&](Stream &strm) {
+                  Request req3;
+                  req3.method = "CONNECT";
+                  req3.path = host_and_port_;
+                  req3.headers.insert(detail::make_digest_authentication_header(
+                      req3, auth, 1, detail::random_string(10),
+                      proxy_digest_auth_username_, proxy_digest_auth_password_,
+                      true));
+                  if (max_timeout_msec_ > 0) {
+                    req3.start_time_ = std::chrono::steady_clock::now();
+                  }
+                  return process_request(strm, req3, proxy_res, false, error);
+                })) {
+          // Thread-safe to close everything because we are assuming there are
+          // no requests in flight
+          shutdown_ssl(socket, true);
+          shutdown_socket(socket);
+          close_socket(socket);
+          success = false;
+          return false;
+        }
+      }
+    }
+  }
+
+  // If status code is not 200, proxy request is failed.
+  // Set error to ProxyConnection and return proxy response
+  // as the response of the request
+  if (proxy_res.status != StatusCode::OK_200) {
+    error = Error::ProxyConnection;
+    res = std::move(proxy_res);
+    // Thread-safe to close everything because we are assuming there are
+    // no requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
+    return false;
+  }
+
+  return true;
+}
+
+inline bool SSLClient::load_certs() {
+  auto ret = true;
+
+  std::call_once(initialize_cert_, [&]() {
+    std::lock_guard<std::mutex> guard(ctx_mutex_);
+    if (!ca_cert_file_path_.empty()) {
+      if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(),
+                                         nullptr)) {
+        ret = false;
+      }
+    } else if (!ca_cert_dir_path_.empty()) {
+      if (!SSL_CTX_load_verify_locations(ctx_, nullptr,
+                                         ca_cert_dir_path_.c_str())) {
+        ret = false;
+      }
+    } else {
+      auto loaded = false;
+#ifdef _WIN32
+      loaded =
+          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#if TARGET_OS_OSX
+      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
+    }
+  });
+
+  return ret;
+}
+
+inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
+  auto ssl = detail::ssl_new(
+      socket.sock, ctx_, ctx_mutex_,
+      [&](SSL *ssl2) {
+        if (server_certificate_verification_) {
+          if (!load_certs()) {
+            error = Error::SSLLoadingCerts;
+            return false;
+          }
+          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
+        }
+
+        if (!detail::ssl_connect_or_accept_nonblocking(
+                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
+                connection_timeout_usec_)) {
+          error = Error::SSLConnection;
+          return false;
+        }
+
+        if (server_certificate_verification_) {
+          if (server_certificate_verifier_) {
+            if (!server_certificate_verifier_(ssl2)) {
+              error = Error::SSLServerVerification;
+              return false;
+            }
+          } else {
+            verify_result_ = SSL_get_verify_result(ssl2);
+
+            if (verify_result_ != X509_V_OK) {
+              error = Error::SSLServerVerification;
+              return false;
+            }
+
+            auto server_cert = SSL_get1_peer_certificate(ssl2);
+            auto se = detail::scope_exit([&] { X509_free(server_cert); });
+
+            if (server_cert == nullptr) {
+              error = Error::SSLServerVerification;
+              return false;
+            }
+
+            if (server_hostname_verification_) {
+              if (!verify_host(server_cert)) {
+                error = Error::SSLServerHostnameVerification;
+                return false;
+              }
+            }
+          }
+        }
+
+        return true;
+      },
+      [&](SSL *ssl2) {
+#if defined(OPENSSL_IS_BORINGSSL)
+        SSL_set_tlsext_host_name(ssl2, host_.c_str());
+#else
+        // NOTE: Direct call instead of using the OpenSSL macro to suppress
+        // -Wold-style-cast warning
+        SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name,
+                 static_cast<void *>(const_cast<char *>(host_.c_str())));
+#endif
+        return true;
+      });
+
+  if (ssl) {
+    socket.ssl = ssl;
+    return true;
+  }
+
+  shutdown_socket(socket);
+  close_socket(socket);
+  return false;
+}
+
+inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) {
+  shutdown_ssl_impl(socket, shutdown_gracefully);
+}
+
+inline void SSLClient::shutdown_ssl_impl(Socket &socket,
+                                         bool shutdown_gracefully) {
+  if (socket.sock == INVALID_SOCKET) {
+    assert(socket.ssl == nullptr);
+    return;
+  }
+  if (socket.ssl) {
+    detail::ssl_delete(ctx_mutex_, socket.ssl, socket.sock,
+                       shutdown_gracefully);
+    socket.ssl = nullptr;
+  }
+  assert(socket.ssl == nullptr);
+}
+
+inline bool SSLClient::process_socket(
+    const Socket &socket,
+    std::chrono::time_point<std::chrono::steady_clock> start_time,
+    std::function<bool(Stream &strm)> callback) {
+  assert(socket.ssl);
+  return detail::process_client_socket_ssl(
+      socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_,
+      write_timeout_sec_, write_timeout_usec_, max_timeout_msec_, start_time,
+      std::move(callback));
+}
+
+inline bool SSLClient::is_ssl() const { return true; }
+
+inline bool SSLClient::verify_host(X509 *server_cert) const {
+  /* Quote from RFC2818 section 3.1 "Server Identity"
+
+     If a subjectAltName extension of type dNSName is present, that MUST
+     be used as the identity. Otherwise, the (most specific) Common Name
+     field in the Subject field of the certificate MUST be used. Although
+     the use of the Common Name is existing practice, it is deprecated and
+     Certification Authorities are encouraged to use the dNSName instead.
+
+     Matching is performed using the matching rules specified by
+     [RFC2459].  If more than one identity of a given type is present in
+     the certificate (e.g., more than one dNSName name, a match in any one
+     of the set is considered acceptable.) Names may contain the wildcard
+     character * which is considered to match any single domain name
+     component or component fragment. E.g., *.a.com matches foo.a.com but
+     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
+
+     In some cases, the URI is specified as an IP address rather than a
+     hostname. In this case, the iPAddress subjectAltName must be present
+     in the certificate and must exactly match the IP in the URI.
+
+  */
+  return verify_host_with_subject_alt_name(server_cert) ||
+         verify_host_with_common_name(server_cert);
+}
+
+inline bool
+SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
+  auto ret = false;
+
+  auto type = GEN_DNS;
+
+  struct in6_addr addr6{};
+  struct in_addr addr{};
+  size_t addr_len = 0;
+
+#ifndef __MINGW32__
+  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in6_addr);
+  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in_addr);
+  }
+#endif
+
+  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
+      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
+
+  if (alt_names) {
+    auto dsn_matched = false;
+    auto ip_matched = false;
+
+    auto count = sk_GENERAL_NAME_num(alt_names);
+
+    for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
+      auto val = sk_GENERAL_NAME_value(alt_names, i);
+      if (val->type == type) {
+        auto name =
+            reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
+        auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
+
+        switch (type) {
+        case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
+
+        case GEN_IPADD:
+          if (!memcmp(&addr6, name, addr_len) ||
+              !memcmp(&addr, name, addr_len)) {
+            ip_matched = true;
+          }
+          break;
+        }
+      }
+    }
+
+    if (dsn_matched || ip_matched) { ret = true; }
+  }
+
+  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
+      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
+  return ret;
+}
+
+inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
+  const auto subject_name = X509_get_subject_name(server_cert);
+
+  if (subject_name != nullptr) {
+    char name[BUFSIZ];
+    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                              name, sizeof(name));
+
+    if (name_len != -1) {
+      return check_host_name(name, static_cast<size_t>(name_len));
+    }
+  }
+
+  return false;
+}
+
+inline bool SSLClient::check_host_name(const char *pattern,
+                                       size_t pattern_len) const {
+  if (host_.size() == pattern_len && host_ == pattern) { return true; }
+
+  // Wildcard match
+  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
+  std::vector<std::string> pattern_components;
+  detail::split(&pattern[0], &pattern[pattern_len], '.',
+                [&](const char *b, const char *e) {
+                  pattern_components.emplace_back(b, e);
+                });
+
+  if (host_components_.size() != pattern_components.size()) { return false; }
+
+  auto itr = pattern_components.begin();
+  for (const auto &h : host_components_) {
+    auto &p = *itr;
+    if (p != h && p != "*") {
+      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
+                            !p.compare(0, p.size() - 1, h));
+      if (!partial_match) { return false; }
+    }
+    ++itr;
+  }
+
+  return true;
+}
+#endif
+
+// Universal client implementation
+inline Client::Client(const std::string &scheme_host_port)
+    : Client(scheme_host_port, std::string(), std::string()) {}
+
+inline Client::Client(const std::string &scheme_host_port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path) {
+  const static std::regex re(
+      R"((?:([a-z]+):\/\/)?(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)");
+
+  std::smatch m;
+  if (std::regex_match(scheme_host_port, m, re)) {
+    auto scheme = m[1].str();
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    if (!scheme.empty() && (scheme != "http" && scheme != "https")) {
+#else
+    if (!scheme.empty() && scheme != "http") {
+#endif
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+      std::string msg = "'" + scheme + "' scheme is not supported.";
+      throw std::invalid_argument(msg);
+#endif
+      return;
+    }
+
+    auto is_ssl = scheme == "https";
+
+    auto host = m[2].str();
+    if (host.empty()) { host = m[3].str(); }
+
+    auto port_str = m[4].str();
+    auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80);
+
+    if (is_ssl) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
+                                            client_key_path);
+      is_ssl_ = is_ssl;
+#endif
+    } else {
+      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                             client_key_path);
+    }
+  } else {
+    // NOTE: Update TEST(UniversalClientImplTest, Ipv6LiteralAddress)
+    // if port param below changes.
+    cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
+                                           client_cert_path, client_key_path);
+  }
+} // namespace detail
+
+inline Client::Client(const std::string &host, int port)
+    : cli_(detail::make_unique<ClientImpl>(host, port)) {}
+
+inline Client::Client(const std::string &host, int port,
+                      const std::string &client_cert_path,
+                      const std::string &client_key_path)
+    : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                           client_key_path)) {}
+
+inline Client::~Client() = default;
+
+inline bool Client::is_valid() const {
+  return cli_ != nullptr && cli_->is_valid();
+}
+
+inline Result Client::Get(const std::string &path) { return cli_->Get(path); }
+inline Result Client::Get(const std::string &path, const Headers &headers) {
+  return cli_->Get(path, headers);
+}
+inline Result Client::Get(const std::string &path, Progress progress) {
+  return cli_->Get(path, std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          Progress progress) {
+  return cli_->Get(path, headers, std::move(progress));
+}
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, headers, std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, headers, std::move(content_receiver),
+                   std::move(progress));
+}
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, std::move(response_handler),
+                   std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver) {
+  return cli_->Get(path, headers, std::move(response_handler),
+                   std::move(content_receiver));
+}
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers, Progress progress) {
+  return cli_->Get(path, params, headers, std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, params, headers, std::move(content_receiver),
+                   std::move(progress));
+}
+inline Result Client::Get(const std::string &path, const Params &params,
+                          const Headers &headers,
+                          ResponseHandler response_handler,
+                          ContentReceiver content_receiver, Progress progress) {
+  return cli_->Get(path, params, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
+}
+
+inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
+inline Result Client::Head(const std::string &path, const Headers &headers) {
+  return cli_->Head(path, headers);
+}
+
+inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
+inline Result Client::Post(const std::string &path, const Headers &headers) {
+  return cli_->Post(path, headers);
+}
+inline Result Client::Post(const std::string &path, const char *body,
+                           size_t content_length,
+                           const std::string &content_type) {
+  return cli_->Post(path, body, content_length, content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const char *body, size_t content_length,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, body, content_length, content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const char *body, size_t content_length,
+                           const std::string &content_type, Progress progress) {
+  return cli_->Post(path, headers, body, content_length, content_type,
+                    progress);
+}
+inline Result Client::Post(const std::string &path, const std::string &body,
+                           const std::string &content_type) {
+  return cli_->Post(path, body, content_type);
+}
+inline Result Client::Post(const std::string &path, const std::string &body,
+                           const std::string &content_type, Progress progress) {
+  return cli_->Post(path, body, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, body, content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type, Progress progress) {
+  return cli_->Post(path, headers, body, content_type, progress);
+}
+inline Result Client::Post(const std::string &path, size_t content_length,
+                           ContentProvider content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, content_length, std::move(content_provider),
+                    content_type);
+}
+inline Result Client::Post(const std::string &path,
+                           ContentProviderWithoutLength content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, std::move(content_provider), content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           size_t content_length,
+                           ContentProvider content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, content_length, std::move(content_provider),
+                    content_type);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           ContentProviderWithoutLength content_provider,
+                           const std::string &content_type) {
+  return cli_->Post(path, headers, std::move(content_provider), content_type);
+}
+inline Result Client::Post(const std::string &path, const Params &params) {
+  return cli_->Post(path, params);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const Params &params) {
+  return cli_->Post(path, headers, params);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const Params &params, Progress progress) {
+  return cli_->Post(path, headers, params, progress);
+}
+inline Result Client::Post(const std::string &path,
+                           const MultipartFormDataItems &items) {
+  return cli_->Post(path, items);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const MultipartFormDataItems &items) {
+  return cli_->Post(path, headers, items);
+}
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const MultipartFormDataItems &items,
+                           const std::string &boundary) {
+  return cli_->Post(path, headers, items, boundary);
+}
+inline Result
+Client::Post(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items) {
+  return cli_->Post(path, headers, items, provider_items);
+}
+inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
+inline Result Client::Put(const std::string &path, const char *body,
+                          size_t content_length,
+                          const std::string &content_type) {
+  return cli_->Put(path, body, content_length, content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const char *body, size_t content_length,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, body, content_length, content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const char *body, size_t content_length,
+                          const std::string &content_type, Progress progress) {
+  return cli_->Put(path, headers, body, content_length, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const std::string &body,
+                          const std::string &content_type) {
+  return cli_->Put(path, body, content_type);
+}
+inline Result Client::Put(const std::string &path, const std::string &body,
+                          const std::string &content_type, Progress progress) {
+  return cli_->Put(path, body, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, body, content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type, Progress progress) {
+  return cli_->Put(path, headers, body, content_type, progress);
+}
+inline Result Client::Put(const std::string &path, size_t content_length,
+                          ContentProvider content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, content_length, std::move(content_provider),
+                   content_type);
+}
+inline Result Client::Put(const std::string &path,
+                          ContentProviderWithoutLength content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, std::move(content_provider), content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          size_t content_length,
+                          ContentProvider content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, content_length, std::move(content_provider),
+                   content_type);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          ContentProviderWithoutLength content_provider,
+                          const std::string &content_type) {
+  return cli_->Put(path, headers, std::move(content_provider), content_type);
+}
+inline Result Client::Put(const std::string &path, const Params &params) {
+  return cli_->Put(path, params);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const Params &params) {
+  return cli_->Put(path, headers, params);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const Params &params, Progress progress) {
+  return cli_->Put(path, headers, params, progress);
+}
+inline Result Client::Put(const std::string &path,
+                          const MultipartFormDataItems &items) {
+  return cli_->Put(path, items);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const MultipartFormDataItems &items) {
+  return cli_->Put(path, headers, items);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const MultipartFormDataItems &items,
+                          const std::string &boundary) {
+  return cli_->Put(path, headers, items, boundary);
+}
+inline Result
+Client::Put(const std::string &path, const Headers &headers,
+            const MultipartFormDataItems &items,
+            const MultipartFormDataProviderItems &provider_items) {
+  return cli_->Put(path, headers, items, provider_items);
+}
+inline Result Client::Patch(const std::string &path) {
+  return cli_->Patch(path);
+}
+inline Result Client::Patch(const std::string &path, const char *body,
+                            size_t content_length,
+                            const std::string &content_type) {
+  return cli_->Patch(path, body, content_length, content_type);
+}
+inline Result Client::Patch(const std::string &path, const char *body,
+                            size_t content_length,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, body, content_length, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const char *body, size_t content_length,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, body, content_length, content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const char *body, size_t content_length,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, headers, body, content_length, content_type,
+                     progress);
+}
+inline Result Client::Patch(const std::string &path, const std::string &body,
+                            const std::string &content_type) {
+  return cli_->Patch(path, body, content_type);
+}
+inline Result Client::Patch(const std::string &path, const std::string &body,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, body, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, body, content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type,
+                            Progress progress) {
+  return cli_->Patch(path, headers, body, content_type, progress);
+}
+inline Result Client::Patch(const std::string &path, size_t content_length,
+                            ContentProvider content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, content_length, std::move(content_provider),
+                     content_type);
+}
+inline Result Client::Patch(const std::string &path,
+                            ContentProviderWithoutLength content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, std::move(content_provider), content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            size_t content_length,
+                            ContentProvider content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, content_length, std::move(content_provider),
+                     content_type);
+}
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            ContentProviderWithoutLength content_provider,
+                            const std::string &content_type) {
+  return cli_->Patch(path, headers, std::move(content_provider), content_type);
+}
+inline Result Client::Delete(const std::string &path) {
+  return cli_->Delete(path);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers) {
+  return cli_->Delete(path, headers);
+}
+inline Result Client::Delete(const std::string &path, const char *body,
+                             size_t content_length,
+                             const std::string &content_type) {
+  return cli_->Delete(path, body, content_length, content_type);
+}
+inline Result Client::Delete(const std::string &path, const char *body,
+                             size_t content_length,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, body, content_length, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const char *body, size_t content_length,
+                             const std::string &content_type) {
+  return cli_->Delete(path, headers, body, content_length, content_type);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const char *body, size_t content_length,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, headers, body, content_length, content_type,
+                      progress);
+}
+inline Result Client::Delete(const std::string &path, const std::string &body,
+                             const std::string &content_type) {
+  return cli_->Delete(path, body, content_type);
+}
+inline Result Client::Delete(const std::string &path, const std::string &body,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, body, content_type, progress);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const std::string &body,
+                             const std::string &content_type) {
+  return cli_->Delete(path, headers, body, content_type);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers,
+                             const std::string &body,
+                             const std::string &content_type,
+                             Progress progress) {
+  return cli_->Delete(path, headers, body, content_type, progress);
+}
+inline Result Client::Options(const std::string &path) {
+  return cli_->Options(path);
+}
+inline Result Client::Options(const std::string &path, const Headers &headers) {
+  return cli_->Options(path, headers);
+}
+
+inline bool Client::send(Request &req, Response &res, Error &error) {
+  return cli_->send(req, res, error);
+}
+
+inline Result Client::send(const Request &req) { return cli_->send(req); }
+
+inline void Client::stop() { cli_->stop(); }
+
+inline std::string Client::host() const { return cli_->host(); }
+
+inline int Client::port() const { return cli_->port(); }
+
+inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
+
+inline socket_t Client::socket() const { return cli_->socket(); }
+
+inline void
+Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
+  cli_->set_hostname_addr_map(std::move(addr_map));
+}
+
+inline void Client::set_default_headers(Headers headers) {
+  cli_->set_default_headers(std::move(headers));
+}
+
+inline void Client::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  cli_->set_header_writer(writer);
+}
+
+inline void Client::set_address_family(int family) {
+  cli_->set_address_family(family);
+}
+
+inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }
+
+inline void Client::set_socket_options(SocketOptions socket_options) {
+  cli_->set_socket_options(std::move(socket_options));
+}
+
+inline void Client::set_connection_timeout(time_t sec, time_t usec) {
+  cli_->set_connection_timeout(sec, usec);
+}
+
+inline void Client::set_read_timeout(time_t sec, time_t usec) {
+  cli_->set_read_timeout(sec, usec);
+}
+
+inline void Client::set_write_timeout(time_t sec, time_t usec) {
+  cli_->set_write_timeout(sec, usec);
+}
+
+inline void Client::set_basic_auth(const std::string &username,
+                                   const std::string &password) {
+  cli_->set_basic_auth(username, password);
+}
+inline void Client::set_bearer_token_auth(const std::string &token) {
+  cli_->set_bearer_token_auth(token);
+}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_digest_auth(const std::string &username,
+                                    const std::string &password) {
+  cli_->set_digest_auth(username, password);
+}
+#endif
+
+inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); }
+inline void Client::set_follow_location(bool on) {
+  cli_->set_follow_location(on);
+}
+
+inline void Client::set_url_encode(bool on) { cli_->set_url_encode(on); }
+
+inline void Client::set_compress(bool on) { cli_->set_compress(on); }
+
+inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
+
+inline void Client::set_interface(const std::string &intf) {
+  cli_->set_interface(intf);
+}
+
+inline void Client::set_proxy(const std::string &host, int port) {
+  cli_->set_proxy(host, port);
+}
+inline void Client::set_proxy_basic_auth(const std::string &username,
+                                         const std::string &password) {
+  cli_->set_proxy_basic_auth(username, password);
+}
+inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
+  cli_->set_proxy_bearer_token_auth(token);
+}
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_proxy_digest_auth(const std::string &username,
+                                          const std::string &password) {
+  cli_->set_proxy_digest_auth(username, password);
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::enable_server_certificate_verification(bool enabled) {
+  cli_->enable_server_certificate_verification(enabled);
+}
+
+inline void Client::enable_server_hostname_verification(bool enabled) {
+  cli_->enable_server_hostname_verification(enabled);
+}
+
+inline void Client::set_server_certificate_verifier(
+    std::function<bool(SSL *ssl)> verifier) {
+  cli_->set_server_certificate_verifier(verifier);
+}
+#endif
+
+inline void Client::set_logger(Logger logger) {
+  cli_->set_logger(std::move(logger));
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                     const std::string &ca_cert_dir_path) {
+  cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
+}
+
+inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
+  if (is_ssl_) {
+    static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
+  } else {
+    cli_->set_ca_cert_store(ca_cert_store);
+  }
+}
+
+inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
+  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
+}
+
+inline long Client::get_openssl_verify_result() const {
+  if (is_ssl_) {
+    return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
+  }
+  return -1; // NOTE: -1 doesn't match any of X509_V_ERR_???
+}
+
+inline SSL_CTX *Client::ssl_context() const {
+  if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); }
+  return nullptr;
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+} // namespace httplib
+
+#if defined(_WIN32) && defined(CPPHTTPLIB_USE_POLL)
+#undef poll
+#endif
+
+#endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/code/cpp-httplib-0.19.0/meson.build b/code/cpp-httplib-0.19.0/meson.build
new file mode 100644
index 00000000..9fa1919c
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/meson.build
@@ -0,0 +1,116 @@
+# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+project(
+  'cpp-httplib',
+  'cpp',
+  license: 'MIT',
+  default_options: [
+    'cpp_std=c++11',
+    'buildtype=release',
+    'b_ndebug=if-release',
+    'b_lto=true',
+    'warning_level=3'
+  ],
+  meson_version: '>=0.62.0'
+)
+
+# Check just in case downstream decides to edit the source
+# and add a project version
+version = meson.project_version()
+if version == 'undefined'
+  cxx = meson.get_compiler('cpp')
+  version = cxx.get_define('CPPHTTPLIB_VERSION',
+    prefix: '#include <httplib.h>',
+    include_directories: include_directories('.')).strip('"')
+  assert(version != '', 'failed to get version from httplib.h')
+endif
+
+deps = [dependency('threads')]
+args = []
+
+openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('cpp-httplib_openssl'))
+if openssl_dep.found()
+  deps += openssl_dep
+  args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
+  if host_machine.system() == 'darwin'
+    macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('cpp-httplib_macosx_keychain'))
+    if macosx_keychain_dep.found()
+        deps += macosx_keychain_dep
+        args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN'
+    endif  
+  endif
+endif
+
+zlib_dep = dependency('zlib', required: get_option('cpp-httplib_zlib'))
+if zlib_dep.found()
+  deps += zlib_dep
+  args += '-DCPPHTTPLIB_ZLIB_SUPPORT'
+endif
+
+brotli_deps = [dependency('libbrotlicommon', required: get_option('cpp-httplib_brotli'))]
+brotli_deps += dependency('libbrotlidec',    required: get_option('cpp-httplib_brotli'))
+brotli_deps += dependency('libbrotlienc',    required: get_option('cpp-httplib_brotli'))
+
+brotli_found_all = true
+foreach brotli_dep : brotli_deps
+  if not brotli_dep.found()
+    brotli_found_all = false
+  endif
+endforeach
+
+if brotli_found_all
+  deps += brotli_deps
+  args += '-DCPPHTTPLIB_BROTLI_SUPPORT'
+endif
+
+cpp_httplib_dep = dependency('', required: false)
+
+if get_option('cpp-httplib_compile')
+  python3 = find_program('python3')
+
+  httplib_ch = custom_target(
+    'split',
+    input: 'httplib.h',
+    output: ['httplib.cc', 'httplib.h'],
+    command: [python3, files('split.py'), '--out', meson.current_build_dir()],
+    install: true,
+    install_dir: [false, get_option('includedir')]
+  )
+  lib = library(
+    'cpp-httplib',
+    sources: httplib_ch,
+    dependencies: deps,
+    cpp_args: args,
+    version: version,
+    soversion: version.split('.')[0] + '.' + version.split('.')[1],
+    install: true
+  )
+  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, link_with: lib, sources: httplib_ch[1])
+
+  import('pkgconfig').generate(
+    lib,
+    description: 'A C++ HTTP/HTTPS server and client library',
+    extra_cflags: args,
+    url: 'https://github.com/yhirose/cpp-httplib',
+    version: version
+  )
+else
+  install_headers('httplib.h')
+  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, include_directories: '.')
+
+  import('pkgconfig').generate(
+    name: 'cpp-httplib',
+    description: 'A C++ HTTP/HTTPS server and client library',
+    install_dir: get_option('datadir')/'pkgconfig',
+    url: 'https://github.com/yhirose/cpp-httplib',
+    version: version
+  )
+endif
+
+meson.override_dependency('cpp-httplib', cpp_httplib_dep)
+
+if get_option('cpp-httplib_test')
+  subdir('test')
+endif
diff --git a/code/cpp-httplib-0.19.0/meson_options.txt b/code/cpp-httplib-0.19.0/meson_options.txt
new file mode 100644
index 00000000..e15847d4
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/meson_options.txt
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+option('cpp-httplib_openssl', type: 'feature', value: 'auto', description: 'Enable OpenSSL support')
+option('cpp-httplib_zlib',    type: 'feature', value: 'auto', description: 'Enable zlib support')
+option('cpp-httplib_brotli',  type: 'feature', value: 'auto', description: 'Enable Brotli support')
+option('cpp-httplib_macosx_keychain', type: 'feature', value: 'auto', description: 'Enable loading certs from the Keychain on Apple devices')
+option('cpp-httplib_compile', type: 'boolean', value: false,  description: 'Split the header into a compilable header & source file (requires python3)')
+option('cpp-httplib_test',    type: 'boolean', value: false,  description: 'Build tests')
diff --git a/code/cpp-httplib-0.19.0/split.py b/code/cpp-httplib-0.19.0/split.py
new file mode 100644
index 00000000..4d8b3074
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/split.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+
+"""This script splits httplib.h into .h and .cc parts."""
+
+import argparse
+import os
+import sys
+
+border = '// ----------------------------------------------------------------------------'
+
+args_parser = argparse.ArgumentParser(description=__doc__)
+args_parser.add_argument(
+    "-e", "--extension", help="extension of the implementation file (default: cc)",
+    default="cc"
+)
+args_parser.add_argument(
+    "-o", "--out", help="where to write the files (default: out)", default="out"
+)
+args = args_parser.parse_args()
+
+cur_dir = os.path.dirname(sys.argv[0])
+lib_name = 'httplib'
+header_name = '/' + lib_name + '.h'
+source_name = '/' + lib_name + '.' + args.extension
+# get the input file
+in_file = cur_dir + header_name
+# get the output file
+h_out = args.out + header_name
+cc_out = args.out + source_name
+
+# if the modification time of the out file is after the in file,
+# don't split (as it is already finished)
+do_split = True
+
+if os.path.exists(h_out):
+    in_time = os.path.getmtime(in_file)
+    out_time = os.path.getmtime(h_out)
+    do_split = in_time > out_time
+
+if do_split:
+    with open(in_file) as f:
+        lines = f.readlines()
+
+    python_version = sys.version_info[0]
+    if python_version < 3:
+        os.makedirs(args.out)
+    else:
+        os.makedirs(args.out, exist_ok=True)
+
+    in_implementation = False
+    cc_out = args.out + source_name
+    with open(h_out, 'w') as fh, open(cc_out, 'w') as fc:
+        fc.write('#include "httplib.h"\n')
+        fc.write('namespace httplib {\n')
+        for line in lines:
+            is_border_line = border in line
+            if is_border_line:
+                in_implementation = not in_implementation
+            elif in_implementation:
+                fc.write(line.replace('inline ', ''))
+            else:
+                fh.write(line)
+        fc.write('} // namespace httplib\n')
+
+    print("Wrote {} and {}".format(h_out, cc_out))
+else:
+    print("{} and {} are up to date".format(h_out, cc_out))
diff --git a/code/cpp-httplib-0.19.0/test/CMakeLists.txt b/code/cpp-httplib-0.19.0/test/CMakeLists.txt
new file mode 100644
index 00000000..a9982b92
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/CMakeLists.txt
@@ -0,0 +1,121 @@
+find_package(GTest)
+
+if(GTest_FOUND)
+    if(NOT TARGET GTest::gtest_main AND TARGET GTest::Main)
+        # CMake <3.20
+        add_library(GTest::gtest_main INTERFACE IMPORTED)
+        target_link_libraries(GTest::gtest_main INTERFACE GTest::Main)
+    endif()
+else()
+    if(POLICY CMP0135)
+        cmake_policy(SET CMP0135 NEW)
+    endif()
+
+    include(FetchContent)
+
+    set(BUILD_GMOCK OFF)
+    set(INSTALL_GTEST OFF)
+    set(gtest_force_shared_crt ON)
+
+    FetchContent_Declare(
+        gtest
+        URL https://github.com/google/googletest/archive/main.tar.gz
+    )
+    FetchContent_MakeAvailable(gtest)
+endif()
+
+find_package(CURL REQUIRED)
+
+add_executable(httplib-test test.cc)
+target_compile_options(httplib-test PRIVATE "$<$<CXX_COMPILER_ID:MSVC>:/utf-8;/bigobj>")
+target_link_libraries(httplib-test PRIVATE httplib GTest::gtest_main CURL::libcurl)
+gtest_discover_tests(httplib-test)
+
+file(
+    COPY www www2 www3 ca-bundle.crt image.jpg
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+if(HTTPLIB_IS_USING_OPENSSL)
+    if (OPENSSL_VERSION VERSION_LESS "3.2.0")
+      set(OPENSSL_X509_FLAG "-x509")
+    else()
+      set(OPENSSL_X509_FLAG "-x509v1")
+    endif()
+    find_program(OPENSSL_COMMAND
+        NAMES openssl
+        PATHS ${OPENSSL_INCLUDE_DIR}/../bin
+        REQUIRED
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa 2048
+        OUTPUT_FILE key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem
+        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key.pem
+        OUTPUT_FILE cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa 2048
+        OUTPUT_FILE rootCA.key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
+        OUTPUT_FILE rootCA.cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa 2048
+        OUTPUT_FILE client.key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client.key.pem
+        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
+        OUTPUT_FILE client.cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa -passout pass:test123! 2048
+        OUTPUT_FILE key_encrypted.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key_encrypted.pem
+        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key_encrypted.pem
+        OUTPUT_FILE cert_encrypted.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa -aes256 -passout pass:test012! 2048
+        OUTPUT_FILE client_encrypted.key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client_encrypted.key.pem -passin pass:test012!
+        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
+        OUTPUT_FILE client_encrypted.cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+endif()
+
+add_subdirectory(fuzzing)
diff --git a/code/cpp-httplib-0.19.0/test/Makefile b/code/cpp-httplib-0.19.0/test/Makefile
new file mode 100644
index 00000000..152f9098
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/Makefile
@@ -0,0 +1,73 @@
+CXX = clang++
+CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
+
+PREFIX ?= $(shell brew --prefix)
+
+OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
+
+ifneq ($(OS), Windows_NT)
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S), Darwin)
+		OPENSSL_SUPPORT += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework CoreFoundation -framework Security
+	endif
+endif
+
+ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
+
+BROTLI_DIR = $(PREFIX)/opt/brotli
+BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
+
+TEST_ARGS = gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread -lcurl
+
+# By default, use standalone_fuzz_target_runner.
+# This runner does no fuzzing, but simply executes the inputs
+# provided via parameters.
+# Run e.g. "make all LIB_FUZZING_ENGINE=/path/to/libFuzzer.a"
+# to link the fuzzer(s) against a real fuzzing engine.
+# OSS-Fuzz will define its own value for LIB_FUZZING_ENGINE.
+LIB_FUZZING_ENGINE ?= standalone_fuzz_target_runner.o
+
+all : test test_split
+	./test
+
+proxy : test_proxy
+	./test_proxy
+
+test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
+	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS)
+
+# Note: The intention of test_split is to verify that it works to compile and
+# link the split httplib.h, so there is normally no need to execute it.
+test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem
+	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS)
+
+check_abi:
+	@./check-shared-library-abi-compatibility.sh
+
+test_proxy : test_proxy.cc ../httplib.h Makefile cert.pem
+	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS)
+
+# Runs server_fuzzer.cc based on value of $(LIB_FUZZING_ENGINE).
+# Usage: make fuzz_test LIB_FUZZING_ENGINE=/path/to/libFuzzer
+fuzz_test: server_fuzzer
+	./server_fuzzer fuzzing/corpus/*
+
+# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
+server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h standalone_fuzz_target_runner.o
+	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) -pthread
+
+# Standalone fuzz runner, which just reads inputs from fuzzing/corpus/ dir and
+# feeds it to server_fuzzer.
+standalone_fuzz_target_runner.o : fuzzing/standalone_fuzz_target_runner.cpp
+	$(CXX) -o $@ -I.. $(CXXFLAGS) -c $<
+
+httplib.cc : ../httplib.h
+	python3 ../split.py -o .
+
+cert.pem:
+	./gen-certs.sh
+
+clean:
+	rm -rf test test_split test_proxy server_fuzzer *.pem *.0 *.o *.1 *.srl httplib.h httplib.cc _build*
+
diff --git a/code/cpp-httplib-0.19.0/test/ca-bundle.crt b/code/cpp-httplib-0.19.0/test/ca-bundle.crt
new file mode 100644
index 00000000..7d61eb5c
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/ca-bundle.crt
@@ -0,0 +1,3401 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Tue Jan 22 14:14:40 2019 GMT
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: 18372117493b5b7ec006c31d966143fc95a9464a2b5f8d5188e23c5557b2292d
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R6
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GC CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
+9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
+aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
+r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
+LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
+4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
+06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
+3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
+JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
+BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
+d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
+fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
+ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
+gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
+4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
+tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
+pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
+sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
+CFF1pkgl
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
+k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
+7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
+m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
+dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
+ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
+cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
+aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
+5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
+BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
+vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
++YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
+c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
+WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
+n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
+Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
+7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
+gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
+o/DUhgkC
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
+Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
+0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
+glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
+KaqW04MjyaR7YbPMAuhd
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
+6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
+2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
+N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
+zPKwTdb+mciUqXWi4w==
+-----END CERTIFICATE-----
+
+UCA Global G2 Root
+==================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
+
+UCA Extended Validation Root
+============================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
+
+Certigna Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt b/code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt
new file mode 100644
index 00000000..7e416c7e
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt
@@ -0,0 +1,10 @@
+file(GLOB HTTPLIB_CORPUS corpus/*)
+add_executable(httplib-test-fuzz
+    server_fuzzer.cc
+    standalone_fuzz_target_runner.cpp
+)
+target_link_libraries(httplib-test-fuzz PRIVATE httplib)
+add_test(
+    NAME httplib-test-fuzz
+    COMMAND httplib-test-fuzz ${HTTPLIB_CORPUS}
+)
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/Makefile b/code/cpp-httplib-0.19.0/test/fuzzing/Makefile
new file mode 100644
index 00000000..d6a3e21b
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/Makefile
@@ -0,0 +1,27 @@
+
+#CXX = clang++
+# Do not add default sanitizer flags here as OSS-fuzz adds its own sanitizer flags.
+CXXFLAGS += -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I../.. -I. -Wall -Wextra -Wtype-limits -Wconversion
+
+OPENSSL_DIR = /usr/local/opt/openssl@1.1
+
+# Using full path to libssl and libcrypto to avoid accidentally picking openssl libs brought in by msan.
+OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -I$(OPENSSL_DIR)/lib  /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a
+
+ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
+
+BROTLI_DIR = /usr/local/opt/brotli
+# BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
+
+# Runs all the tests and also fuzz tests against seed corpus.
+all : server_fuzzer
+	./server_fuzzer corpus/*
+
+# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
+server_fuzzer : server_fuzzer.cc ../../httplib.h
+# 	$(CXX) $(CXXFLAGS) -o $@  $<  -Wl,-Bstatic $(OPENSSL_SUPPORT)  -Wl,-Bdynamic -ldl  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
+	$(CXX) $(CXXFLAGS) -o $@  $<  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
+	zip -q -r server_fuzzer_seed_corpus.zip corpus
+
+clean:
+	rm -f server_fuzzer pem *.0 *.o *.1 *.srl *.zip
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/1 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/1
new file mode 100644
index 00000000..2b9fcc44
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/1
@@ -0,0 +1 @@
+PUT /search/sample?a=12 HTTP/1.1
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/2 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/2
new file mode 100644
index 00000000..bdb9bcce
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/2
@@ -0,0 +1,5 @@
+GET /hello.htm HTTP/1.1
+User-Agent: Mozilla/4.0 (compatible; MSIE5.01; Windows NT)
+Accept-Language: en-us
+Accept-Encoding: gzip, deflate
+Connection: Keep-Alive
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/3 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/3
new file mode 100644
index 0000000000000000000000000000000000000000..878944f52b023cb0b609e3f5173b361d6ab96c67
GIT binary patch
literal 54
zcmWIW4-Qe#SMUf43D7sxGvMWN&d)1J%`4G$%}dTt$;?Z)N=Z%2Ni0d_<>KYC=w)VL
JU|?Wm005?e4gdfE

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088
new file mode 100644
index 0000000000000000000000000000000000000000..0325729036eeef76902e138b0f0edad8fe884429
GIT binary patch
literal 516575
zcmWFt4N<sl&!~1wO-((PT`fyZPR&})S4}|ewAw4R0<|)=e6>=wQ)(P)MQS~2ztv>b
z?yISltEsCkR-2&U5fT!hZ>VR$%N3Mpn;vGB6cFU8VC0&YoS%}J2Vx(FC^678fGRcQ
z<#P7VD@n~O(Zy5-Hpw|3A{|m$kZP4%np2WlkXTfrpO#;gtDBNol9-fVnwOGTRB4;b
z%jG<ft~CJpn<UpleFpV-x>b5rW&tl3FPB9x7X!n8Fydfy{Qv)dR`RWa<PvTMFaU*|
zv2Ji`Nl9j2dNCg_m({21Tvoii5M0V@Vq#)qY-3|nV`BqinwS`CLwGg_kXn?Nn4=J!
zT2z)=q~KaqlwX99v$1JlU|@joBXp5Hr0ZW$l9``Z43V=j0?~^=1Q>Jia_Q>6X5ref
z0n7qL2h@WunZ*V9#hD<zRy;gh2=E^a5(^4)z&>MeyIzr+lbQnJaBy)cb8&$UCQMi&
zlqevWM6xWfs|!vnOVxErEJ?JnA`<K(Qk|6*@hU+^s(}bH@e%U$+2PP;i$k0~!n(#f
zx<)#>W?<4tN7od_HUx_pf<+8<bRk?Lu%M9+NEbv4TncWEDNM1Uj;;w<r71Mcj%G@F
zXG&VvCZw0ow69Ina94h$J9jkYj#ei`6vU&|2{e#K^UDC`7pj!>H0zIymdT?{d}s-Q
zK@s0@CtfAUlF>356be>WR-<L|P%e}4jOCEtoTYv1d$jRAI+g=1chD)~i*Mppg6tT)
z1-&82c|!(|))NC%PuSSl?12xMjt-q-W|+Y_bc*Rts)|%n)ii>J!H1#su_)ETB8Dz>
z7F~dJK0FhE7<9@Aqov+xsYgUg9lVVUA{;-2l#G^opt27GQ+wugwA33d^@u1HMoT>+
z0*MMrMoT@65)ULWTIvm-#X+MzTzuukXb%@(=uk&)w1*2?GCH~>lAcQ<M@v0?d3Utb
z!xuW#ksB@bMoT@=;_uN?4{LrJ?crh#7OD%5_HaQRS`0ke!yWD6;>l~oFN7doCCIwb
zQV$dgw8x{R9!7}=5*RJ@MoT?BnUDCgjChqG>qbjGP$<wIkCu9%LJk9umU^S59-hoc
zd|5`kN|1G<r5-30XpcurJ&Y0$Brsa)jh1?NG9U3}8SyGX){T~WpirPa9xe4ig&YPR
zE%ioAJv^C@__B<6l_2XzOFd91&>oMLdKe`hNMN+o8!h$lWIp1{GU8Q&tQ#%$K%qc;
zJX-333ONisTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^)O02kiclEH(Ki9$$Z3@WyGrl
zSvOkhfkJ`yc(l|56>=DOwA33d_3&gq;>$APRf4P=E%iX5Kzlq|>S2_4Ac4_RZ?x3I
zllh1*%ZOJAvTn501BC+Z@o1?BD&#QmXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)Waz8
zKmwzs-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$NRLEiA(Nb@;)Wehch%d{CR|&FiwA2HI
z0`2i=sfSVGfdocNz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elsF1_Jqov+xsfQ=?5nq-O
zuM%Y4XsHJZ1={1$QV*lV0||_ldZVQtp3FylSw_4{kaeS_9w-!Ok4H;AP$7qbM@zlY
zQV&n&BfcynUM0x7(NYf-3be<gr5;9!2ND=9^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK
zph6A<kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFfJd4<s;J>W!9qcrqXHWf}1*LDr3y
zdZ19CJsvIfK!qFz9xe4oOFcZ9kNC2Tc$FaQMoT?VD9|2{mU<W^9!Oxc)Eh1J@MJ#X
z%QE6sf~*@Y^+2IOdpug|feJYcJX-3FmU?(HAMs@w@hU;qjh1?#P@p{?E%h);JdnU>
zsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^0~K-@c(l|TE%oqZKH|$V;#GpI8!h!fp+I{)
zTIykxcp!n%Qg5`>!;|@lFUyEm39@dq)B}YA?eS=-2P)(+@Mx(wTI%7+e8iV!#H$2Z
zH(Kg}LV@;pwA8~W@jwEjrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4^+ru;L%cVwA90s
z`G_yeh*t@+ZnV?`g#zvIXsL%$;(-K4OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9;lGR
zz@w$!XsL%M^ATT`5w8+t-Ds%?3I*EZ(NYhi!~+S8mU^S59-hocd|5`kN|1G<r5-30
zXpcurJy0Qsfk#Wd(NYgj<|Do=BVHxQy3tY(6biJ*qop23i3buGE%ioAJv^C@__B<6
zl_2XzOFd91&>oMLdZ0oM1CN$^qop36%tw4#M!ZUpb)%&oC=_UqM@v175)ULWTI!9K
zdU!G)@nsqDDnZtbmU^I2pgkTf^+1Ij1|BW-MoT?BnUDCgjChqG>qbjGP$<wIkCu8E
zB_2p%wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>VXP53_M!ujh1?NG9U3}8SyGX){T~W
zpirPa9xe4SN<5IjXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)B_cA7<jbQ8!h$lWIp1{
zGU8Q&tQ#%$K%qc;JX-2u1*4_jXsL%M^ATT`5w8+t-Ds%?3I*EZ(Nb@;)B}e=gsyXb
zUP)?RiEc<`L8`9*XsL%M^ATT`5w8+t-Ds%?3I*EZ(NYhb=h2DLw%%x|hbQw9UzQQC
z5@g+IsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(6biJ*qop3WltU**OTE!j
z4^QSJzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#M!ZUpb)%&oC=_UqM@v0$
zDThvsmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?BnUDCgjChqG>qbjG
zP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguinm_J(Tjh1?NG9U3}
z8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf_0S7EFn_ev
z8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$APRf4P=E%iX5Kzlq|
z>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRDXsI_^>fy<J#Fu5ns{~m$
zTIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z@o1?BF6GdP(Nb@;)Wehc
zh%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$NT*{#n
zqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@OEF)ee$hy%|4-^Wt
z$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8KdZVQtp3FylSw_4{
zkaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}OFi@g56mAe^+roQ
zJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`#~
z9+*E`>W!9qcrqXHWf}1*LDr3ydh`LKr5?DHLnlT{z0pz+PX;8uEF)ee$hy%|4-^Wt
z$D^eldVvS#kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFeKYhfa)^dZVQtp3FylSw_4{
zkaeS_9w-!Ok4H;A^a2meA1(DpOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`e)4xJb+^+roQ
zJeiO9vW$3@AnQg;Jy0mn9*>rK=mj2_KU(UImU?(HAMs@w@hU;qjh1?#P@p{?E%m^q
z96B*t>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;f3(yaE%oqZKH|$V;#GpI8!h!f
zp+I{)TIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p%-{y{%EN;TI%7+e8iV!
z#H$2ZH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^Loe{a{LxZx
zwA90s`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>!;|@lFUyEm39@dq)B}YA?eS=-
zhhE@;`J<)YXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYgw%ApgZrQT?%hbQw9UzQQC5@g+I
zsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(6biJ*qop3WltU**OTE!j4^QSJ
zzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#M!ZUpb)%&oC=_UqM@v0$DThvs
zmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?BnUDCgjChqG>qbjGP$<wI
zkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguinm_J(Tjh1?NG9U3}8SyGX
z){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf_0S7EFn_ev8!h$l
zWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>Y*2S
zVE$;SH(Ki9$$Z3@WyGrlSvOkh(Fcr{df-wHofs|kMoT?B8Ibt0jChqG>qbjGP$<wI
zkCuAq1s<3`TI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^}wYZIx$-6jh1?NG9U3}8SyGX
z){T~WpirPa9xe6I3p_A?wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>VZo+bYisB8!h$l
zWIp1{GU8Q&tQ#%$K%qc;JX-3Z7kFU)XsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)B~4t
z=)`ELH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|*FYv(p(Nb@;)Wehch%d{CR|&FiwA2HI
z0`2i=sRu6Q(23DfZ?x3Illh1*%ZOJAvTn501BC+Z@o1@sUf_ZGqov+xsfQ=?5nq-O
zuM%Y4XsHJZ1={1$QV(3pp%bH}-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$Ny}$$WM@zlY
zQV&n&BfcynUM0x7(NYf-3be<gr5?DHLnlT{z0pz+Pv#@OEF)ee$hy%|4-^Wt$D^el
zdVvS#kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFeKYhfa)^dZVQtp3FylSw_4{kaeS_
z9w-!Ok4H;A^a2meA1(DpOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`e)4xJb+^+roQJeiO9
zvW$3@AnQg;Jy0mn9*>rK=mj2_KU(UImU?(HAMs@w@hU;qjh1?#P@p{?E%m^q96B*t
z>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;f3(yaE%oqZKH|$V;#GpI8!h!fp+I{)
zTIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p%-{y{%EN;TI%7+e8iV!#H$2Z
zH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^Loe{a{LxZxwA90s
z`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>!;|@lFUyEm39@dq)B}YA?eS=-hhE@;
z`J<)YXsL$>5MP!NuM%Y4XsHJZ1={1$QV(3pp%bH}-e{?ZC-V_smJzQKWZh_~2MPt+
z<Iz$Ny}$$WM@zlYQV&n&BfcynUM0x7(NYf-3be<gr5?DHLnlT{z0pz+Pv#@OEF)ee
z$hy%|4-^Wt$D^eldVvS#kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFeKYhfa)^dZVQt
zp3FylSw_4{kaeS_9w-!Ok4H;A^a2meA1(DpOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`e)
z4xJb+^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK=mj2_KU(UImU?(HAMs@w@hU;qjh1?#
zP@p{?E%m^q96B*t>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;f3(yaE%oqZKH|$V
z;#GpI8!h!fp+I{)TIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p%-{y{%EN;
zTI%7+e8iV!#H$2ZH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^
zLoe{a{LxZxwA90s`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>!;|@lFUyEm39@dq
z)B}YA?eS=-hhE@;`J<)YXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYgw%ApgZrQT?%hbQw9
zUzQQC5@g+IsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(6biJ*qop3WltU**
zOTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#M!ZUpb)%&oC=_Uq
zM@v0$DThvsmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?BnUDCgjChqG
z>qbjGP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguinm_J(Tjh1?N
zG9U3}8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf_0S7E
zFn_ev8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$APRf4P=E%iX5
zKzlq|>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRDXsI_^>fy<J#Fu5n
zs{~m$TIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z@o1?BF6GdP(Nb@;
z)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$N
zT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@OEF)ee$hy%|
z4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8KdZVQtp3Fyl
zSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}OFi@g56mAe
z^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQMoT?VD9|2{
zmU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4mU?(HAMs@w@hU;q
zjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|flE1bVzks7E%oqZ
zKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)>VZOm_IR|^1DA5>
z#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@lFUyEm39@dq)B}YA
z?eS=-2QKB%iP2JTwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0rQT?%hbQw9UzQQC
z5@g+IsRs%L+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh+zytF~OTE!j
z4^QSJzAPhNCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQy3tY(6biJ*qop2J
zFk0%3mU?(HAMs@w@hU;qjh1?#P@p{?E%ioAJ#Yv_=sM@;m89mC=!R4lr0V*QmU?(H
zAMs@w@hU;qjh1?#P@p{?E%m^89-SC%>y4IrcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;
zf3(yaE%oqZKH|$V;#GpI8!h!fp+I{)TIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IO
zdpug|p%-{y{%EN;TI%7+e8iV!#H$2ZH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO
z1X(v)>VZOm_IR|^Loe{a{LxZxwA90s`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>
z!;|@lFUyEm39@dq)B}YA?eS=-hhE@;`J<)YXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYgw
z%ApgZrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(
z6biJ*qop3WltU**OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#
zM!ZUpb)%&oC=_UqM@v0$DThvsmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcF
zMoT?BnUDCgjChqG>qbjGP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oML
zdguinm_J(Tjh1?NG9U3}8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtb
zmU^I2pgkTf_0S7EFn_ev8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq
z;>$APRf4P=E%iX5Kzlq|>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRD
zXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z
z@o1?BF6GdP(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQK
zWZh_~2MPt+<Iz$NT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+
zPv#@OEF)ee$hy%|4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L
z2j-8KdZVQtp3FylSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w
z6ljk}OFi@g56mAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2T
zc$FaQMoT?VD9|2{mU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4
zmU?(HAMs@w@hU;qjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|
zflE1bVzks7E%oqZKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)
z>VZOm_IR|^1DA5>#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@l
zFUyEm39@dq)B}YA?eS=-2QKB%iP2JTwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0
zrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ
z(NYh+zytF~OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQ
zy3tY(6biJ*qop2tfd}S~mU^S59-hocd|5`kN|1G<r5-30XpcurJ#Z<9PK=g%qop36
z%tw4#M!ZUpb)%&oC=_UqM@v2Q0uRg|E%ioAJv^C@__B<6l_2XzOFd91&>oMLdf-wH
zofs|kMoT?BnUDCgjChqG>qbjGP$<wIkCuAq1s<3`TI!9KdU!G)@nsqDDnZtbmU^I2
zpgkTf^}wYZIx$-6jh1?NG9U3}8SyGX){T~WpirPa9xe6I3p_A?wA33d_3&gq;>$AP
zRf4P=E%oRFMoT?#DThvsmU^S59-a(Hd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?B
znUDCgjChqG>qbjGP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguin
zm_J(Tjh1?NG9U3}8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2
zpgkTf_0S7EFn_ev8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$AP
zRf4P=E%iX5Kzlq|>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRDXsI_^
z>fy<J#Fu5ns{~m$TIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z@o1?B
zF6GdP(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~
z2MPt+<Iz$NT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@O
zEF)ee$hy%|4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8K
zdZVQtp3FylSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}
zOFi@g56mAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQ
zMoT?VD9|2{mU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4mU?(H
zAMs@w@hU;qjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|flE1b
zVzks7E%oqZKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)>VZOm
z_IR|^1DA5>#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!vlyf%ZOJA
zvTn501BC+Z@o1?BF6GdP(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?Z
zC-V_smJzQKWZh_~2MPt+<Iz$NT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er
z1M^2qz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-
z3be<gr5<{L2j-8KdZVQtp3FylSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dE
zyh@ODqop1w6ljk}OFi@g56mAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZi
zOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf
zz@;2IF<R=4mU?(HAMs@w@hU;qjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y
z^+2IOdpug|flE1bVzks7E%oqZKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&
zmu1AO1X(v)>VZOm_IR|^1DA5>#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}h
zQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2QKB%iP2JTwA90s`G_yeh*t@+ZnV?`g#zvI
zXsL%@;DPz0rQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t
z-Ds%?3I*EZ(NYh+zytF~OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj
z<|Do=BVHxQy3tY(6biJ*qop2tfd}S~mU=^=)WeoLMoSrNp)$~7qooYER6!?3OPL{1
z%AiLY4*njvxCNYr!k~6!Bj@SSQV%&a1`B(%)I-StFb=gdLVjLJYF>%1YhH4GN@iZV
zReDus0WTLXmqjlZ1H*qX;$U<9|Nnnh@~wj85^e@C@CXSBFxCxDEh)*&OE2c*<+A#8
zoy&@s7lKQ9O-xKojBRXeYHVykOcN7hZ3qwM4I3Mq)S|q^9EIT2qO#N?1=pgY{30Yt
zn+6631_(bw*BR=_kjjEoUH{Qi4^I{)zAPhNCCIwb9wjIgXpcurJxHcUBS%ZU(NYgj
z<|Do=BVHxQy3tY(6biJ*qop2Nc?aQ+mU^S59v(n^Sw_4{kaeS_9w-!Ok4H;ANHK>-
zj+T0(r5>KlM|@dEyh@ODqop1w6ljk}OFgvm4#FKR^+roQJeiO9vW$3@AnQg;Jy0mn
z9*>rKkYWyv94+-mOFcZ9kNC2Tc$FaQMoT?VD9|2{mU?LA9fUht>W!9qcrqXHWf}1*
zLDr3ydZ19CJsvIfAjKRSIa=zCmU?(HAMs@w@hU;qjh1?#P@p{?E%ngKI|z5Q)Eh1J
z@MJ#X%QE6sf~*@Y^+2IOdpug|L5evva<tSNE%oqZKH|$V;#GpI8!h!fp+I{)TI!*d
zcM$GqsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^gA{XU<Y=ikTI%7+e8iV!#H$2ZH(Kg}
zLV@;pwA4c@?;zaKQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2Px*z$k9@7wA90s`G_ye
zh*t@+ZnV?`g#zvIXsL%*-a)vdrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4^qsbk)x&F
zXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYhsyn}E@OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R
z9;BE<BS%ZU(NYgj<|Do=BVHxQy3tY(6biJ*qop2Nc?aQ+mU^S59-hocd|5`kN|1G<
zr5-30XpcurJxDQ!Mvj(xqop36%tw4#M!ZUpb)%&oC=_UqM@v1l@(#isE%ioAJv^C@
z__B<6l_2XzOFd91&>oMLdXQocjT|lYMoT?BnUDCgjChqG>qbjGP$<wIkCu99<sF1O
zTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^&rI@8aZ0(jh1?NG9U3}8SyGX){T~WpirPa
z9xe6I$~y>mwA33d_3&gq;>$APRf4P=E%iX5Kzlq|>OqP*G;*}m8!h$lWIp1{GU8Q&
ztQ#%$K%qc;JX-3Zm3I*CXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)PodrXyj<AH(Ki9
z$$Z3@WyGrlSvOkhfkJ`yc(l|*EAJrO(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sRt?M
z(8$qJZ?x3Illh1*%ZOJAvTn501BC+Z@o1@sR^CClqov+xsfQ=?5nq-OuM%Y4XsHJZ
z1={1$QV&whp^>Ad-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$Nt-OP9M@zlYQV&n&Bfcyn
zUM0x7(NYf-3be<gr5>c1LnB8^z0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elT6qWIj+T0(
zr5>KlM|@dEyh@ODqop1w6ljk}OFc+2henQ;dZVQtp3FylSw_4{kaeS_9w-!Ok4H;A
zwDJzZ9WC`nOFcZ9kNC2Tc$FaQMoT?VD9|2{mU@t44vicw^+roQJeiO9vW$3@AnQg;
zJy0mn9*>rKXyqM*J6h_EmU?(HAMs@w@hU;qjh1?#P@p{?E%hM992z-V>W!9qcrqXH
zWf}1*LDr3ydZ19CJsvIf(8@aqceK<SE%oqZKH|$V;#GpI8!h!fp+I{)TIxZHIW%&#
z)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p_O+K?r5nuTI%7+e8iV!#H$2ZH(Kg}LV@;p
zwA6zXb7<sfsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^Lo4qf+|g2RwA90s`G_yeh*t@+
zZnV?`g#zvIXsHJ&=FrH|Qg5`>!;|@lFUyEm39@dq)B}YA?eS=-hgRM}xTB@sXsL%M
z^ATT`5w8+t-Ds%?3I*EZ(NYgm%%PE^rQT?%hbQw9UzQQC5@g+IsRs%L+T+nu53Rg|
za7RnM(NYgj<|Do=BVHxQy3tY(6biJ*qop3Cm_s8+OTE!j4^QSJzAPhNCCIwbQV$dg
zw8x{R9$I+^;f|Jiqop36%tw4#M!ZUpb)%&oC=_UqM@v0OF^5KumU^S59-hocd|5`k
zN|1G<r5-30XpcurJ+$%;!W}L3MoT?BnUDCgjChqG>qbjGP$<wIkCu9nVh)WQE%ioA
zJv^C@__B<6l_2XzOFd91&>oMLdRW0|sW)2c;mLf&mu1AO1X(v)>VZOm_IR|^8!h#~
zArPVKoS#>cnpdJ5Qdy9y>pxoR;mLf&mu1AO1X(v)>VZOm_IR|^1Lt{kVzjL{TI%7+
ze8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2QKB%
ziP2JTwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0rQT?%hbQw9UzQQC5@g+IsRs%L
z+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh+zytF~OTE!j4^QSJzAPhN
zCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQy3tY(6biJ*qop2tfd}S~mU^S5
z9-hocd|5`kN|1G<r5-30XpcurJ#Z<9PK=g%qop36%tw4#M!ZUpb)%&oC=_UqM@v2Q
z0uRg|E%ioAJv^C@__B<6l_2XzOFd91&>oMLdf-wHofs|kMoT?BnUDCgjChqG>qbjG
zP$<wIkCuAq1s<3`TI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^}wYZIx$-6jh1?NG9U3}
z8SyGX){T~WpirPa9xe6I3p_A?wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>VZo+bYisB
z8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-3Z7kFU)XsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`
z)B~4t=)`ELH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|*FYv(p(Nb@;)Wehch%d{CR|&Fi
zwA2HI0`2i=sRu6Q(23DfZ?x3Illh1*%ZOJAvTn501BC+Z@o1@sUf_ZGqov+xsfQ=?
z5nq-OuM%Y4XsHJZ1={1$QV(3pp%bH}-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$Ny}$$W
zM@zlYQV&n&BfcynUM0x7(NYf-3be<gr5?DHLnlT{z0pz+Pv#@OEF)ee$hy%|4-^Wt
z$D^eldVvS#kCu9)r5>KlM|@dEyh@ODqop2wz-XxlF6GdP(Nb@;)Weeji7(5DR|&Fi
zwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$NT*{#nqov+xsfQ=?
z5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elxRgUD
zMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8KdZVQtp3FylSw_4{kaeS_9w-!O
zk4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}OFi@g56mAe^+roQJeiO9vW$3@
zAnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`#~9+*E`>W!9q
zcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4mU?(HAMs@w@hU;qjh1?#P@p{?E%nd~
zJTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|flE1bVzks7E%oqZKH|$V;#GpI8!h!f
zp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)>VZOm_IR|^1DA5>#AvBETI%7+e8iV!
z#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2QKB%iP2JT
zwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0rQT?%hbQw9UzQQC5@g+IsRs%L+T+nu
z4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh+zytF~OTE!j4^QSJzAPhNCCIwb
zQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQy3tY(6biJ*qop2tfd}S~mU^S59-hoc
zd|5`kN|1G<r5-30XpcurJ#Z<9PK=g%qop36%tw4#M!ZUpb)%&oC=_UqM@v2Q0uRg|
zE%oS8>R~2tEleQ{k+T>gBnyD!7)DsY7^w7U5}-#CNKIj2U|`_j;!@_~LJfbMJWGU(
z0)mN`wFfRsr^rT5k)stKa%c<|_GrZi&lAXu(Nb@;)WefSi7(5DR|&Fiw7Cxo1={1$
zQV+SXgR@6Vz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elyre^BjFx(%r5>KlM|@dEyh@OD
zqop1w6ljk}OFiVm4$dAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK@RAOhF<R=4mU?(H
zAMs@w@hU;qjh1?#P@p{?E%lHKJ2-o^)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|!Am-1
z#%QTGTI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c`?BMLtQg5`>!;|@lFUyEm39@dq)B}YA
z?eS=-2QTT68Kb4%XsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh&u!FNlOTE!j4^QSJzAPhN
zCCIwbQV$dgw8x{R9=xPOW{j44qop36%tw4#M!ZUpb)%&oC=_UqM@v2A!Vb<JE%ioA
zJv^C@__B<6l_2XzOFd91&>oMLdhn7CnK4@Gjh1?NG9U3}8SyGX){T~WpirPa9xe5d
z3p+TQ+NB<HMA9%Ld|uGliENdXmDLe6K9O8I9O`Uwhz|?l5ttdsinrksPSRxg9<Iqq
zN7q<K*Gxy(NJrNYj36RLU_n!uh@p<I30S3ReqKpxUWu-2UUGg)W?s5gdR1ltFBdPD
zMK2cv!+$X1U~~Nc|9@8Ut%BqdZqSKD3=AG2Apyp^!Ko!BnR)5Oe7sy%pRRLR@$y1&
zDX)o%iHWg|jZKY>4Tx!CVyq3}!Amn6o7AGb#2kg-)S|M~A_do?qWmHxNt*@+1_lT}
zLf0AU$dJl{RNdjS8^1^Gx0<ZleKoamHFdScY7-PdVXAMaXTZx9lxUkCW|b5W<f&i;
zjTjL7Fhq%go&i*;AupG+KT7<eD&yrs4mqpb(wvgag2bW{{j~g|T-}t!lEkF^(!7+!
zqDtFbUM}Y>H90kFHD5IWwbN>^)C$zf)biCz)lR8#s1>PE!L=qvmL`^F=0=ugyj*J3
zbT>40KtpOY2{X7|uSm_I&*5Q^ED9n=4-bPE!f?jmY_W{ym;WG;SWu7ysm;jFFGH#L
zrE+C4nutJY=sy(_5vcHlU}8^fgs29QqlGTKtc5d13*8z}(tzU;-p;nMu^Bz#6rMS-
zFa~FS!QxPA3JsUx0usUmULb%N!>i&L9b+UR9bhUQftdj_5Qq>NF5xsf#t13`ZAQl!
zhus*X;pos}NoIatF(iH47=h?TAOeiJc)4_SU$by+*Z^jM#(bgOc$duLg8br4kX|bu
z9xem`cXCI2xdbYQ(Uk$v0D>l`(V=*XhZeyZ7EBN|Dny0(87dDD(s(wB%C03P;U*W1
zPJ@C|CN_eM3uq9=46j}(v`mCi!)nzFDfwk|*#IJiW3Zt41(ryxtc(#%WEN_lEhsfD
zwJ5a+qyX3O9Y_unQzsE>!wshC+A9mVHC9#up&<%#kOdG%pfwU9MTvREX{kksl`F{^
srFq$@DWJtGx|W89CPro!hvz06GB7Y?CnFhz#zbEufxajrKQF)-02GHrIsgCw

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5372331946541056 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5372331946541056
new file mode 100644
index 0000000000000000000000000000000000000000..6fca86b02dcbde747d972241990aa90ab281b7d4
GIT binary patch
literal 1041826
zcmWFt4N-7Z@CXSB&^OdG<mGbC&nrpIE71+9EJ(FVEGWpyOinDx%+J%W&@C@7*G<bW
z%GE6`%1O;j&QD2AL8x~H31s@ETcxC?<s_D*@^bNVS@d#Q3V1MRX}|y%7uzZ@=;i9w
zQsC+xg`*)b8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zK$Q?!MH?{MU>yyC(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S^960$wA+m!s>0M?+vV
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhm2hrlrQ+UOBNqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFkm6jHDET6-f%n`
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd72GDg?wwBXl$bMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ON05t^qM|a(fhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjD!&ILfu(3${P)V(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C;TQs5qjQ0yAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFl0ht)o>i18THd>2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb8|e
z1o&uf!;o2sHX0J6Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UiCJ1XhhC&yM<aGz3ONU^E0qLtr!nMnhmU1V%$(Gz2IJ
F0RSV!qs9OL

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5386708825800704 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5386708825800704
new file mode 100644
index 0000000000000000000000000000000000000000..1f1e4aeb8c04180ccd014f54b6e9f48e8054c712
GIT binary patch
literal 787294
zcmWFt4N*{2@CXSB&^OdG<mC!V%=_>k3>0*n^Ycnl^GbAsQ<F=JGD|9T1FCdOQj2Xv
zDhpEc^GftUav_xk+`1qED+NwoE|?CeKw?2bPG)jqNoIbYeuZv%dAV*{eo?M&X;DsU
zUUGg)Y6?upUXV>8|LcF-C;Iq1dk1GaxD_1-0kz}x$DI;W6oOI<OLapO)G9Jca&rv9
z?gJAMx)H&_x&cM`C8^0EYrum44=RA^(2)QCe}h>Lp&@FPMn=ZQ=0*m_W)`L<=H{jr
z29{tsIB{I<cwPy_FS@$Qsv)MlT>t;Gt6CZIa_Q>wYKDYxIhK}W<QHXDfqj&pmYI|K
zU!DsDwi{c>@-TqBp9gY>s-v!BPG(tZPEMu)i>R7rNQj!dnwq*Amu{+VUS717Gy?;}
zMPvXn1A>u7!E9bG12d2RJm<JTrh}uy6%=-vdFfUvDXD2Wi6yE3^$d8qLW&aeiqley
zbm7v;8KrsIsVNKrp&`6nyj+I%|F|r8xr`+|xO$5XdASV1JSzbYBqp*9M9mIfE@QA7
z1CVk@$K>SH;$mG;JQwBX=sM=)<d^F@7p118=9Oe7<`hHJ!j0zY<+9K*)I}fzT^&PY
zKJjcMLx|S|QfXw4S1ZUxcoi7xLV^I~7Z?i?HlWZ%upseAE@?on#-XDRoSfkVC<%cI
zkf6l8^i;Sg@eG8&iPwWuCBiT+E}V*pmjD?@jB1cN2qs1~0W~0l2q*zdgVYh@Nw7LF
z0oFzt0Wyae6F}-9m>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=
z1cSLy0#gJkK`I3@h!{N}br4L9Y65CN1`$v~j5M*vfYd=SF{Tnw12Tw!60kH#9R!29
zlo23<h%o`A4uXkMjZY2O6nqMZlmnSVj8c#~2qs1~0W~0lz)HBmByIwv5Q1^5AzB7x
z5HX5D>L8dH)dbXl3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wg
zgNQK!qz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}
zF$h6&BbXGj!0x&PCUFu7D{v|yTLNS@F`7Z@Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&
z0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYcsfD9tW
z1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)p*oE3;~gN6cH<hYD^t&Z6JjZ
zj9U%SG9ZJ9Q4CTC!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|
zAQ;T0i~t!#j0qrh5KN5fix)v^iBSns2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM
z6Qi1d8jwK*lz^o{>L3`*MJKMJ3*hC048p4bDhW~t!B7E8D3C$K=m)8TU}97gPy;fE
zfD*7YNF4-&xs(wQgFqx@=74n*YYa#obX*h61QTErC?i1T5Mu&J9Rw4jnrJm3BZ*NA
zQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVkgmm1jogG**{L4I*2Xz~!3Qjj>r
zLJ$e!QHY5(2BZ#xDYOuz9b^!QCWJxiAefL!BIH2^5uprR$%52UW%>oDg%BG+Bu*v7
zOQ0Gv+H$=JX)1w&g(|TKGKiSi0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uY|%
zj>aa4TMT3nZdrs3NF4+t#K>lW3?fD|NF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh
z5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXaB*>|fz)!1mJY-O7hDY}%-|fH4B}Lc7ST8Z
z5WmDw4&EWrH5P()-3UhmC@Mya5d7hUCJPEOG$E{9kU9v)DovUo$RJ{LfYcEa`CxTm
zf*4Z?r~#QnKnYkHqz;0?T*?TLLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW
z1QVm07&Rc%h*bwtJ6e(u6IyUJpdf>D@GwB?AQ+D#Vx>R^5u+BQ4uXkMjZF<`HN0Vn
zE7E%SkRnIy%c@~Z*P$!Mb4zndG7A!mO7y`?+*1-u5|i>v^HLIvDs6K?%dee5tH{AD
zD8m@G*jg8~0NaX}%a|*d%L>XiL}Km2B8E+!6)%?ok~S+|R1UI{nA(lFta!172$C2i
zXh9^BAh}FpjRC2HU~+9j(g!jKiHnm7QU}2}l@KohGKd(}AaxK-jB3)<fXpRE2S^<R
z6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pI
zFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW
z1QVkgj~a*}AQF!vVx>@x866QH5hLP%p{WBD`49{hpo9V$M2vorItV64H32msg9s=A
zOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@
zurx>=1cSMh5g>zzF#)6wf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Mm14tK*kZH
z5Tp)*iBU~J4agt@O2E<}br1~Zq7y@6M3%Ub5r{8AB)TWb;1g>MNF4-|VF|hxkU{8T
z*!UoI5R6ThL@|&-#ApGjgJ5D*6Ho&(h=3BXG)Ud(h%7iLpaeKXzywr)5(;DvG5SI3
zAeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpQW%12F_d;!#Ab6sj?!-I)>5oq;6|
zP~<}}OoRd&WDqghLFyow7}W&SfD9s_1S}0w2f<)2Wdz6|VoU(3gJ5D*<5L4R1)l;U
z<v`{TqZFhLf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0
z838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29
zlo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(q
zOBn$&h!_(<>L8dH)!5a5^kbJn6$Pn-U{rCkcp!s_(Fjrp!NjO0O%2FgVswDiK`=3@
z38(=XL_i5x8l(<_!CcA+kU>xrY84*amj=`-e1-B+D3Ce`MiC~D12Tvhogj4(OpIy*
zYCr}NPy&_)se@oJmofrm5HTiz)Il(cYSIS3U|K;2!Pxj{kU9v)r;129kU>N$#iEQ@
z-5_-kjKvUAg+K<8s)sc7#M%H-2f?J7k5x6uAgmH-f*^Gej3z-27i17I`atR+m>AUr
z)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0
zKn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{
z1k`{GBA^61U`ANg=(Y@E!U&5R;v!*i1}~0w5XegqjK#mC3V{qFMh{3G1QVm0fEtiN
z1eAcKLFynF%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@NmBzd
zmlz!&br4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TL
zLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zL~
z8AOZ;AaxK-jA}e;AclZQJc@{wLN#XaO~4ZH2gvylOh6$q(jbF~RR>Z_-0B?yCV~ti
zpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U$M-9Xf
z5Q#?-u~MkU48Gh6avum2>mNMoh&2YJ4ubI*MywRbAY#;l)Il&YstKq88ALz{SQ?}b
zg27y>5+HMlF%YB<f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_
zK`@w0838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#
z9R!29lo23<h%o`A4uXkMjYkc{5D<w+5wTLJ#*9{9(7{Sju#C1HiA_Xcb)X;vGYAkM
zbr4KIAu-Y*gNRiJQacFa6yhupNsLGEsR5Zm%!2icAw`LqIjKb#PtXnEa5l)rIHXX7
zLFynFMVLGe$RJ{Lg497UcGbLA*u}Amf(*hcfhGu22f=6(<ZwX-5u*>J4uXkMO+XFE
zAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl
z3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%
z$RGkrz|tUf5Dey0l>nJbjDa9^5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu
z0U1O<30NAWj*E+{ASDgVrHlX>b}^R-Ge8O<m<Yu<lmvu^Kx9A$L0I@nkU9v)q7EVf
zBC$x4Dul}zqFQJm%@9ngwOG`H48kIeAp}wf!5C5m1wi@;DjMxv5fen%)Qko%dZ>Ux
z1cK3J$l!wvB1RiX9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)
zse@oJm#PHFTw)9ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0Kn=(s0!qNr
zAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;
z4N?ceU@m0@$RJ`&0I7puVpQW%12F_d;!#Ab6sj?UZ#bQRKS0ihU;+w>kp>w=tU8d|
zK{z%`jPs$5T4Iz!d<i0nQB6P%vBrSZK`;RWiID~wM65cHT8iToVhD&N###buP>mUU
zxfA3*5GLRaVx);R2BZ#xi7}Oc8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vK
zmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?TnY%VDWvG9+bq@z9IgVn7>5*!
zFi0H)qX?770U1P$PLMhXCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkr
zz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}W&SfD9s_
z1S}0w2f<)2RSA%}#25%t2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*
zlz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@#YzfJlHyRB^I+#2N!q2f<`n
zgQ^K+5UL1v9!MPoW0xmM6l4%F8bInGm>AWlYC!r>MX>Wg>L3`qJV~M;gNV@pQU}4r
zs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zOLoJ0m0O^lf!
zbr4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TLLByB<
zQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%q5?I7y=^6
zHv_H{)tJFIm<e|%b_U4#5R6@(BvFt-#ApDigJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf8
z0i+IsiBU~J4agt@O2E<}br1~Z5+opMK_o$?gcT5L3`iXW6E>5e3Xnkr6+vf+Kx!$T
z4*^*QG6+Ny!XR}JOh_dW@*snVP<9cd4uXkMjZY2O6nqMZlmnSVj8c#~2&TSj0w#j2
zC7=W>4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFE
zAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl
z3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xl|=U<`QEdNF4+dqndyk
zkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu
z0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6QdfB
z8i*kv5|1KcrBIC-eEn#U`#_jj|KL$atT7;U5RAt#Vx>R^5u+BQ4uXkMO+XFEAOcFj
z(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xx^4gxD|m+!YzxC0jYyvgc#W@
zkU_*~2C0K!VpJ1Q12Tw!60kH#9R!29lo23<2%A8hs=;uSZ$M~>!ejdoH5LVrkdOd<
zLp?)YuAs!c^i->)%97M#TU{MpUarzK17ic#(llcOGu2Y({JfIXyb@i;%7Rp@#DapH
z%w!yT6H7Al^Ykn7N_1WGlJiqC^U|$SQqyu0OHz5cLW&aeiqley5K_q*rFq$@DZE^~
zT!vg0ya7R;T*h2Z{`S0F##{zm7Q9@>hFm*(LyfHjJa~CQd@f@Petv#-ehA>@;{Esk
z|AzlyP>}LJAnm{Ze_l{TfH2`GBdCH{V?gR47^{&uPD;kA7Lq`4NTCQrECi7#!sKy?
zH3p;(g2}T7MHk2*6agF@kU9v)p@0-&kU_+#2dRT#VpJ1Q12Tw!60kH#9R!29lo23<
zh%o`A4mvFjW`YS~G!jq)GKYW?urx>=1cSMh5g>zzF#)6wg0ZR|&9Yd71w2WBT?SPY
z60{%^Rh%pyvBrSZK`>d?plSjcgeroa2T}*Y*yTwQ1sOz)29P>vmc^?atPV`zRYsg7
z$Q)u+g497UF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@Us9ywJzC`^b65s*3vCPp;@
zH6VisC;>}@)Il(qOC&+M4jcx948kFWA`DUo!6?GyaX<zUqZ6bKf{9U0Kn=(s0!qNr
zAaxK7=2DdanM;g;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x
z8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HQ3;3yh(r}9i$|<6AaxK-mNlrF
zKn9_TVCR9<K`?fCl0-oU5u*X54uXkMjj9Hu4^;#^52Ox)vCESr3NnZo4Ip(8OpIy*
zYCr}NPy&_)se@oJmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjO0
zpax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}
z($s*=B}NBG9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ
zmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjO0pax_R0VQB*kU9tk
zb15T01`%TdNF4+dqZ*GIh#?>nk0N5FP>mT~Q!%;%oY<6ut`0RNq01upAaxLo5W{2<
zdty7tBuw3yA|Q1Tj44O52*@B}G=bDXFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4r
zs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zL~8AOZ;AaxK-
zjA{aEKn4*|0xfz8tAdQHgG?OVq(e+-!PS6*49>yB0I7puJc@{w0vSY%T97&j#;SUB
zf);DAj84#E1Pde)fk+G~(glb$2BdCuf)+V^!65=BkVVO4gUlgDD@Yv#6Qi1d8jwK*
zlz^o{>L3`*C7L*hQzghWoRUZqAaxLoBuFk3WDqfWLFyow7}W&SfD9s_1S}0w2f<)2
zWdz6|VoU(3gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~Z
zQbvFbBE|%eItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3c
zE>#JTxx^R<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF
z%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i51X<~JQ
z)Il&F!-$mv8AOa)kU9v)s(Q4)h&5P7`->RC0!c(55<`k~0b-2-sT=JtB8M+HM8E{H
zD4A@KImBoMse@qrs#Ogg@hgDJg3N+4@lqgl5R6wDagrc|h*1er2f@Us#-j#e2#Ca^
zh*&99V@78np~K*yU>P0WCN>d))q#Qx%pgF3)Il%-g~UjM3?fz?NbL}fQ?S#C@h42p
z=v5D}kibTRgA+_(lO<6MWDYS}K<Xfv7}W&SfD9s_1S}0w2f<)2Wdz6|VoU(3gJ5D*
z6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64
zH32msg9s=AOM}!wFqlgj0Wt{5gdtiJK-(us9>K{3c^HCmDj{A1WDqf`LFyow7}W&S
zfDFQ`<TgYWqz-~1e2PerLBtpUQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0
zfEtiN1eAcKLFynF%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@
z38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcB?DDLlj^L|zCJXjKyf<S8X%l}
zkW_$z42g@A2~r2aIF%4D0Wydf)gW~cOpIy*YCr}NPy&_)sl$cA3g}PZat>IW80UZ$
zf(c?&(^w7I9k>W$>_+G%Ml}I7Aj1eK0ZW6_K`@w0838hgToZ`Z3sMKc<l2O!4`dJ$
z7bg>>4uWwiAzlJx5D}_D${?5s#pp^P8bKtw3>kc4jRC2HU@|O0*8(yKT?`u^qz;0y
z$&x4rGKd&0AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x8l(<_
z!Ca~mAajW^5Tp)*iBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64H32msg9s=AOM}!w
zFqlgj0W#=fE)iyc6hbf&ig73j2n~VAfDD4L@RJ~Q5R63~L;^%&kt9_Jt1&k*O#!Kc
zU`#oZML-4-qY0!Af{9U0Kn=(s0!qNrAaxK7=8{B!^bw;0qz;0KQB6P%$RGkrz|tUf
z5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}W&SfD9s_1S}0w
z2f<)2Wdz6|VoU(3gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}
zbr1~ZQk4LiON@aabr4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkH
zqz;0?T*?TLLByB<QU}4rsK%uRc96GAW^qA&aVF@nZd^)1;t&f#B#1{LCe|2`ItZrF
zLXdWlK_HqC2C0K!LMn-n2N^_!GU|5Paass+4Fuy<Lc9dXAcX4C5&O{*dqip=jfI+$
zaO(xBgJ5iGqOl3$76TcCTNWV$QU}2ZF|t`8gNV@#QU}4rs3xEWWDo%*U}=y#2nKU0
zBR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zL~8AOZ;TwGjgAhleh^LfMs7hDY}%-|fH
z4B}Lco)3aE0P#x<<=`C>`@MvS+44i(X5vteQ~aqFU3T#M6y3#G_#jU}FcwKtg+K-o
zqX(o8f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w01p;Im
zF~)$@K`=3@38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z
z5n}>K9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJmofrm
z5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjO0O%2FgVswDiK`=3@38(=X
zL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9Rw4jnt&RR
zK?Ib5r9tW-7|f-VfEWcLDK!Z?N=b|{AnPEQ7}W&SfD9s_1S}0w2f<)2Wdz6|VoU(3
zgJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFbBE|%e
zItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE@cGBAYx1a
zse@o*R1;7GGKhc@urx>=1cSL$B|zp9V<1Q!1QVm0fEtiN1eAcKLFynF%%zL~8AOZ;
zAaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x8l(<_!CX`VA^{>%
z#mV9kYYa#o1e0YAswR*@s3O>TAaxLoU7jRSkU_*~0I7puVpOB50qH{(!OjDzgJA6P
zB#D9yB1Qv99Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ
zmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjP>rUs%LL}HUAQH)q)
zK<XfvL<_Jf2N{G-99;~g4ua8T$l!wvB1RiX9Rw4jnt&RRK?Ib5r9tX&VXy-F6S$lM
z7AM9zV1;0U7}YdZ19k^4f*89IdWlg@Kn=(+0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7
zAcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q
z12Tw!60kH#9R!29=){m%C_&unDTpsYB)TWb;1g>MNF4-|VF|hxkU{8T*!UoI5R6Th
zL@|&-#ApGjgJ5D*6Ho&(h=3BXG)NsWt7O3Hzyw$uWdz6^VoU(3gJ5D*6Ho&(h=3BX
zG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64HL99GWG=)I
z5Q!{GCL7h5(RKIG87)w-5LY+A!ku&-Fr8>L$RIQ!tXz;f2*xT+njpv^VswDiK`=3@
z38(=XL_i5x8l(<_!Ca~mAajW^5Tp)*iBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64
zH32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE-C?$0FkKTWbueK
z2BZ#x$+8Aj6UZP`5$rsWIta!tPm(CeAYwFt)Il&Ys!`Q|^r4Di=YiBgFm`#8L_r1-
zqXDE2f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg
z7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<
zh%o`A4uXkMO_~~zxy0xIse@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0Kn=(s
z0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{G
zBA^5;4N?ceU@m0@$RJ`&0I7puVpQW%12F_d;!#Ab6sj?!;{{}o7vKnR)bPcjXw*`S
zfU&|5!7eZwzUbis3K0lKmmz}>GKd&$AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2
zK`=3@38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcCD2lku&U90`ox407B$30
z!r%<v(dlO_5jvV>umlPyl|wKVNm7MC1`(qNq;7Qj89AiDAp$0lMag7?%ppcANF4+d
zqndykkU<2LfTcm|AQ;RgnmCA4CCD_Kl1LIDbr6gsNG=m(5HWf|>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkr
zz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}W&SfD9s_
z1S}0w2f<)2RSA%}#25%t2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*
zlz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7
zKnWgcVs(SmK`<V}h?N2vM2uRHIta$9dbGcYHCVuh#9@~~6@>&Xh(r}9i$|<6AaxK-
zmNlrFKn9_TVCR9<K`?fCl0-oU5u*X5ZnVFM98%yA0TalgWU@i#5Tg~O4ubKkRyB0Q
zuK+3wG7HMYOM%ouFkWTENrDU_MkPoc1QVkgj~a*}AQF!vVx>@x8J&TIj_HAdg|rpR
zI077G5DqC6VURiqMiC~D12Tvhogj4(OpIy*YCr}NPy&_)se@oJmofrm5HTiz)Il&Y
zstKq88ALz{SQ?}bg27x02(T%n=s!U>fWuWF7vqpZ5eBJ)U=(5UI3R<F(Fsxq!NjO0
zpax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}
z0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@Us
zCZGmn5R#J7+8rq{2s6<_52pr@Ita$8gm?*%L3mZ)hRA}{K`?|*5eYJg7z04+Aeb1{
z1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkM
zO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH
z)dbXl3?iTe+Jhvlipnc}2wRBi_|d*TG^RkoGTIs-oP3Z}fPxH(i<1db2f;X%5HA5T
zh#1u%br4L9Y65CN1`$vKmIkTAg~1BwPvCM6SezK=fE9uXVpP*u4cHyH2x9C;=p{xq
z0W~1Q2q*zdgVaGVm`fP}GKgFgh}8>H2f^gpgrpB-5E2(B6QmA;aVjBR0%Q;oszJ&i
zm<Yw_N+23RB)SY4d}56Ose@oLEJ4=-G6-D^8y}<&g0abxC<Zc!7%d=m5KN3}0%|}8
z5l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW4uZj4suCb`i7^nQ4uXkMO+XFE
zAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&=wdDrW`GnzFcFGz
zC<zD+fyjUig0S$DAaxLoMIA%}L}HO7RS2swH!)2Cse@olIg&*{1`(qPqz;0KQB6P%
z$RGkrz|tUf5Dey$M1b@WqXDE2f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7
zAcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q
z12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYdm0GUgSfgp7dOpIy*
zYCr}NPy&_)se@oJmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjP>
zrN%iwuOv0EMAs#=xFEkcvm`S=50_GqIK)B_3F1+Ri8ThK4uUDP5TqSs5Qrv(LFyow
zkV+!tK?V__47~Ohq?RgUy*Mp|*Z?ANDj{A1)tJ!{`_U15;?oYQO4O8uDu>Jise@o-
zQ5ZWK#vqOc8AOaqkU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;
z4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kHE7nd4HEf-bFc#uh8V+jx-br4KIAu-Y*
zgNRiJQcFjlf~*^)PNVW%`lwIQ;~5kp5R5JZ<`0SeUP468#6o-tBEdeRj3Cw+kU9va
z%s#MgkU?Mu0Rp5Bf(a-jMjB)gvFbo-=~!+-3kM=x2XPpPBtkJECBzy7QU}3=Oe8`c
zWDpU`sM{GDIhKNhcI0?>)TiJGM<PHW0>Mav<T6195u+ER4uXkMO+XFEAOcFj(javZ
z4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTeEDcfz
z!C)>`36QzO7zk1a!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|
zAQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW
z4uZj4$_S7_#Fzk52f@Us#-j#e2#Ca^h*&99V@5~BM@PhoO*!c5P*W1REP@YG2f+w2
zvRNR5h|vsE2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*
zrHlX>M6wCQY67W)V3Mss)c`RBM52n5#X~h_v=kmKg~>`r&|o7*FDS)9FfpnLr~w&7
zKnYkHqz;0?T*?TLLByB<QU}4rsK%!TYzjUF=yG&BG~@)j%}_qb#ZV?*3ZxE#@hT%u
z5@ZlDDnaTXm>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh
z5g>zzF#)6wf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0
z838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29
zR3$*>5@R4p9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ
zmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27x=0wMt-QN_vP5o-)c9R!nQ4XP%PL8v0w
zc_4KVj9s22QIJ7IX&_c1NF4+dWh{P0AcOF$fXIT>K`?|*5eYJg7z04+Aeb1{1k`{G
zBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFE
zAOcFj(javZ4CWF;7~xg~G6}aVLI$J`f)Qe5vp@zBqZy<Qf{9U0Kn=(s0!qNrAaxK7
z=2Aw03?gg-ajKweoj{6-TJ1)_UXVEilz^o{>LB>y#ft%<AqtP}L)2IlJVHVO^bPe4
zdAWiT^U_nTk}6A5i*0pvba}Z-(+rFaR7=y04a`(aVH;%_D+^Ms5(^4)GLv!WO$2SC
z(XYrW(RIyB&QHnAOSei%P0L9vN#*4VDN4*MPD?F9NF`^K=4Gd*@N)5T8FE?h1_XI>
z8FM-L+w*c6a~W`1@NyX&a_#61HMSD);N=DJxr{CN`T5!TA%K^Q_uv2j8~%eqLCXJt
zwEzD9c_IF!|N1qsz2MMBCx*o8OX30y>`5?z?nyHEAajV(22uyX#Hc2q24oNcC17cg
zItT`HDI-7z5n}>K9Rw4jnt&RRK?Ib5r9tYTg%OwuCcrY35g>DjF#)6wf{9U0Kn=(s
z0!qNrAaxK7=Asj$Sr$D+Abe1eL0I@nkU9v)uZ}2LkU_*K1gV2yVpJ1Q12Tw!60kH#
z9R!29lo23<h%o`A4w_~0DhI0r6L^&oCkZl#7?mJ(5KN3}0%|}85l{k_2C0K!Fqbj{
zWDqeXfYd=SF{&YLKVnou%mk6ds3xF>SYtryAeexG#7Kh-B32zpEpe?60w#hCBA^5;
z4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4i_dyKMmC2at>IW
z82i8q!2~g?X{-k94qOB=b|dr>qndykkYNOrfTcm|AQ;TWOI*P#JGw3bOYlH~7DQr^
zBvpu5V?gR4m{c3Es0SH@MHoW}qz-~Hq(~P48AOaOkU9v)s(Q4)fHhda``EC{po&6*
z7DS?olf@&}7?3&$Cd(RBO(26%MX>Wg>L3`qJV~M;gNV@pQa9RPKn^Kzh=2)XQ8L*e
zbBNIjQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVkgRZSo=7h(vAL>48JjcUy3
zx>#sK3KT4(9Wav86e!4u(Ew5h!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqZ*$Y
zuqpTy5Ge;ThZv<Gbr4K_)dWlgSxZ0(SQ?}bg27zM2#`U<m;h1-!NjO0pax_R0VQB*
zkU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_
z2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%
zX^=Vy26L%OfXpSvK#)2JCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkr
zz|tUf5Dey0Mt}?=#srW$2qs1~9yJg{KqMYT#7dzWGujy(?F<r|a?sVGrX+M(1Rtah
zf)Qe5vp@zBqZy<Qf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_
zK`@w0838hg7!yG1Aeb1{U^T{I5-R~R39AH}AV?hqqe+m%1sOz)K9D*HCPp;@H6Vis
zC;>}@)Il(qOBn$&h_DI7se&va0jV9h@w(CF!-QiKq5>385EgzCqz;0ysvDhK#2PH4
zbBh?k0!c(55<`k~0b-2-se{fff|+1~bn7s5fXu-V#3BGv2f<h*NfiPaM2sGgIta$9
zdNj*o4VKX?ixDi4L<Ax+q(~Pa))<gFXqLrm30NJNKvEW=8|vxefh0gA6J!oCN<r!%
zm>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>z*P56!l
zAj>1OL3$w=S(FSm#1IfkhGujvsK$(r3XP5mp{EdH`KT!gw=R%62*#}jMdktu50wKl
z2vr0-52Ox)vCESr3NnZo4Ip(8OpI!LYQU!8Q$VB~$Q)vng497UF{%lu0U1O<30NAW
z4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{
z>L3`*rHlX>M2ra_br4L1Y9l>8J$%YQ2H}&3$$`{CFieC38e|YL+Cl0dm>AUr)PM{k
zpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0ni`O~
z#OMI2gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFb
zBE|%eItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE@cGB
zAYx1ase@o*RO3+tF$6^7QADg1sxhN|%F#Y0u_*^#9coHKmqqYF>L3^)Mm7s%5HXrT
z>L8dH)dbXl3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!
zqz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKjDV
z#HpgqLIVjLfS{{Ej)q`@N(n0f8AMnWZ9;&cy&%UyFhQk+6@UyPtcsvdM`ts!2O^b%
z7rWuOL`N+}4;fI1a9uorE{w?sD+CjmawLm@%ppb-NF4+dqndykkU<2LfTcm|AQ;T0
zi~t!#j0qrh5R6~7s-d}op^2fPg|Ug5fr*)=k+Gq<iGih|ftk6fxv7!4v4w?&p{cQj
zBYtC`vLG9wOuQ6G9R%Z5Mw}$bAYxR4)Il&Ys`03S7y=^kC?Zx0)tJ%#=xBeG*p!2=
z4mBmA%Odz7br6gYBbx;>h#1Wvbr4L9Y65CN1`$vKmIkSVU@(^g0&EH?`bVz^!WUZL
z-~<!+R1ql$GKUzYAaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x
z8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9Rw4jnt&RRK?Ib5
zr9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJmofrm5HTiz)Il&Ys!3A=GM5+~
zAaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x8l(<_!CcA+kU<x7
zi7*4C5Q2$Nj6+F4Xb40GWDtafp9HCcU@Yn&5+D+bB&kBg8Us=X!KB)NMLozMEW#K<
zAaxLoAw{|X$RJ{Lfz&}TF{)A3fb^k?VCR9<K`?fCl0-oU5u*X54uXkMO+XFEAOcFj
z(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB9f}kh#R@
z0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYcsfD9tW
z1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTeEDcfz!C)?B1jry_
zOaQ5aU}99`Q3EjqL}FE>ua8w2hajpkgKr=nhqGbAAm>9cOoRd&WDqghLFyow7}W&S
zfD9s_1S}0w2f<)2Wdz6|VoU(3gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBXM5
z4a5)-iANE!QmDoZzT63N9|#lcA3W-aH3p;(g7FwetQ5!~V$_1vK`=3@38(=XL_i5x
z8l(<_!CcY^^c{L2gNQK!qz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~J~d!d
z@F_r-8=WRY4-sTOI5@!svM8BskU7L?1*wBzVpJ1Q12Tw!60kH#9R!29lo23<h%o`A
z4uXkMO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<
z>L8dH)dbXl3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!
zqz;0KQB9f}kh#R@0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj
z(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qi%LKwKqRU-Sv+Em0jYyvvaCVX
z1TqL!1UnC;4uY}ElOzf<h!_nZbr4L9YE(5KeW)VXc_4KVj9s22QIJ8zXaK2$U}97g
zPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~
z0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}eO+Ky-shY_cSZ5o-)c9R!nT0XF3zgRqIC
zi-FWZFuDvGe2_uJXalK(U}97gPy;fEfD*7YNF6Q=RzQCOmvg}4#5f165KIuGn#O9t
z?!ZM5V>d!CF{%lu0U1U>30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJR
zKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@#Y*
z7~R~79wHDvD99iz{3J*n1mjmnlq|>~VibbZK`=3@38(=XL_i5x8l(<_!CcA+kU_+l
z08&TH5q)5FV1gJ^38(>?LqG{w8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`H
zDI-7z5n}>K9Rw4jnt&RRK?Ib5r9tW-7|bP!7{WK#Lc9zjN%Apm6oZ_B6BA=4LNhU{
z38(=XMnDNz8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9Rw4j
znt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ7o8YwCZdN3gbxZb
z2n#<6QU}5K)e$8NGKd(3AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2jW!dJLkb)s
zU;<f`Og6|IVzh$PK`=3@38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hhxj24V<^#G{B<
zDO6)dmn@E+>_KeGL05;GlF(%le2_W_Mu?Hk0vSY%W{^4vCPp;@H6VisC;>}@)Il(q
zO925kg#!IBtsrw?Y<x6G9R%Z31(SoQ1d%Wi3TR@D0jYyv;w*!x1(C$5M^;6wE|5A1
zM%GOx8)OhMT0!a{m>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=
z1cSMh5g>zzF#)6wf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_
zK`@w0838hg7!yG1Aeb1{q^SX!ON<VXItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9
zm>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6w
zf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml~Ka5JNyD9!11Tp&B#z`icbn0dhVB
z6HrKuG{_)g)q&Iw-0j=MxDuZlkn8cu!{k8fAQ&b>0Sz*U80{c+5KN3}0%|}85l{k_
z2C0K!FqeD+VhD&N-we1;RAUBT?gY6Hgy9Y*pFylKAaxK-zFlygAcNo>JPeRJ2*#s`
zSSgS}#Ha<SgJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~Z
zQb2%BAw~b_=2Lv31rAOyfln2Yav*bvQ3_HA!NjO0pax_R0VQB*kU9tkb15T01`%Td
zNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fqbj{WDqeX
zfYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G
z0!SSM6Qi0mH6U||(E(Bi!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2L
zfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fc+18NPtLGak6;C8Us=X!DLy3
zstIHest9%-NF4-YmnTUSWDqeLK<Xfv7}cn1K>AQcu=7CbAQ-zmNunTwh|vI22f@Us
zCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9
zY65CN1`$vKmIkSV05F#_0%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4r
zs3uJf$XsG{fYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy
z26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSV
zU@(_50%Q;&6Npg*G6SRzf<ZhAF~}fdi~y;FU}97gPy;fEfD*7YNF4-&xs(wggNQK!
zqz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%x
zK<Xfv7}W&SfD9s_1S}0w2f<)2`2@re5J|onaGj{e47NEnxHCr?qaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmwWGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhl}jE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1Jg3%Bd4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=CQ7{?;qaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFbYOPU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V+JV2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQKHo4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVB~
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*U^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(6pV(zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S22B?J!A#g<V^M!{$ZjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz$h3Efzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5EuocAut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsKxznRld54<{b&e`hQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinC>RZa(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7zLvtFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;6Cw1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtqq)
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mg(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fe{h{TwGjS2(Q*5nCL8!LI_5eA%hPxh!|}kbr4L9
zY65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4r
zs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVkgpBk_!_!JN+2Qr5kr66?>Onub^Oaxg=
zKnYkHqz;0?T*?TLLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN
z1eAcKLFynF%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gW!u7FS@&iD5#dExVpM3c!Y!m
z=o{!6@FG>pU=8>PkU{w5VR9gK5DXKcfCd>vjCPPZ2qs1~0W~0l2q*zdgVaGVm`fP}
zGKd%xK<Xfv7}cby0hvpT4v;zsCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl
z3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xmXE^Jcz_9O`0IF#(>m8
zFlpvvRShx-s|1=LNF4;DNsz+@8AOaekU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1
zAeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A
z4uXkMO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp=BYCz@^qXVQ4f{9U0Kn=(s0!qNr
zAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0V*+FoF;;-oK`=3@38(=XL_o>K
zix-Jg1yKi5i#)hU*mN8!KnCHELJ<b3gJ2Y4@;D%ah|vjB2f@UsCZGmn5CJ7%X^=Vy
z26HJRKn4+G0!SSMV^w_>t0*o(kU_ZQki|jjAQ)McOg6|MVzh$PK`=3@38(=XL_i5x
z8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9WjF{V0B=E7*h$T
z0hvQU30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi0K
zH6YW7RR>Z#S`QKvT5vU>AcJ%8FhJ@c7>^=ir9cJ|qZXtNf{9U0Kn=(s0!qNrAaxK7
z=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{#HfLo1|o@3O+XE?
z#(>m8FfIcvEO5zS5eFHCMHoW}qz-~Hq(~P48HA*3wB$qz48lyb(8H+#qz-~{Dj{A1
zWDs7}w;{41br1~UQ$&IcBE|raItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AVq
z)POW&5ylV#se@n)DbfWX27yS@^<wBC))<gF2*xmiGyyIyE@M+(h*2~ss&FsJ;^i80
eDH|3_)Ceb#S;WK?NF4+dqZ&;ONF$mMCKmv{2RjP@

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5667822731132928 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5667822731132928
new file mode 100644
index 0000000000000000000000000000000000000000..b21d1cee9db6fcfd60f780ce92b1c46bed591a41
GIT binary patch
literal 317
zcmWFt4N-7Z@CXSB&^OdG;N?oqD@o+)_3}#Ka?Z~yNzE(Kb<Io8Ps#L4w@OJ(%SkLr
z<>lh#vgl=IU|?Wi1Q84jYZ(||A`A=+n>YLV`1m;a_-qCNpI)wBu2wD(2_`^{UaplO
zN)br_#P8*r%+<@)f*}f#>*Z4H<w{IUv`mc(jnb%qLWl#fkuD9lU0l#5I2jli#Lxxt
X@B`+Ah9F5pEv+cw;_B_?;_3we%icZR

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552
new file mode 100644
index 0000000000000000000000000000000000000000..797165c50b2ce9fd62fc71f5ca322aeac8ac3bf4
GIT binary patch
literal 974479
zcmWFt4N-7Z@CXSB&^OdG;N|LtLR}qQUM}bSypq(s65Wu>f>f*A(wvgag2bW{{j~g|
zT-}t!lEkF^(!7+!qDtFbUM^?0xMfh~uBj>cDXA$4{jPb*`6-!x=~gMJX*r1{sk~gg
zTo%1tmI59OS{hso4FAE1gU#{(|NmLZ$*Bb;x&etL$r-%1R=m7iV9dkIWyJ?#Ye4uQ
z@lsx^9N7{sn4^MS9fO=b{{PQnU~oyzDM{3IN-R!gzyai8;*Lo6fyCThLljIDJV5e>
zdWO7QoEtC!$R3C&7cZBtF39&#ue)Rx7vvXbmSpDVS@H02A;5nK_yiYm%*n|whw;3)
zxVUU=Y-|ETLqL>`jR_nW+t}FDzyzQih?*fxLVPz|d^3b2f*MYLPYpvx%@_@V(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~TC0-A%v8KbTk4S~@R7!85Z5WpS+E}q!M
zM@2_NU^E117Xmu8GkVnI(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC70osOuGi{9@HGMP$MnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(6pV(zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjDpb+7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fl)9T0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*AutL?Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3P$Xb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2A{7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c1*0J_8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqhK@yMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU=)moz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kW!
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S`WG8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiQ~MnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0q!DtAKhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinC>RZa(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7zLvtFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;6Cw1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtqq)hQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mg(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!83@Fd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?3PwX<Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhl}
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1Jg3%Bd4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=CQ7{?;qaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFbYOPU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V+JV2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQKHo4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVB~qaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*U^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
KMnhnvga81b{Bo24

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5942767436562432 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5942767436562432
new file mode 100644
index 0000000000000000000000000000000000000000..a2fedd59cf1bf07854832fbff53d2c2b4f1d7a09
GIT binary patch
literal 395
zcmWFt4N-7Z@CXSB&^OdG;N^18&nrpIE3rx}D9Fi7PP8t`%+J%W&@C@7*G<bW%GE6`
z%1O;j&QD2A;pOV}@=Abd&~*igX8NUDrKG0iB$lKGlw=m9<@0j!a#{2;GcYhPFfuUk
zGB7Z3Sza>|@L&)%;-nQ=)yoBg0>=c72^|BG45CIz;vo5e&=8n9Ef60I&M#4L%P-AK
zv3Q6Z@bYq<w&LaGf?)?M0bZE7T)mFT$*IM~x*)U9f<<{j%w8!l2^IhmT0x0<>8Suf
Cwrtt}

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464
new file mode 100644
index 0000000000000000000000000000000000000000..4c4c57e819e60fbc67e1ecc8a554ad13112ba739
GIT binary patch
literal 452123
zcmWFt@>D2Q@CXSB&^OdG;N^18&nrpIE71+9EJ(G=EzK#(EJ!RW(ND`S%GFItEJ;kt
zFU?CyEUL84MW}VnOU_Tp%uBaQugWao<q8N5QE-GAX^2n;HZrlGASW|9u_QA;PrpL9
zyu4f&Y;<W+PAbTh)D(nzh_Qa@Rw=1zIf*5yyj;9o7QI}S0v-%n8Zf}c#kL9zdbxVF
z6u5e62+@qT;^pOnV_7JhotKM&;s1XI5MYCf!PM!Z@nPZ(3=9k~HV;e<1K4bsFqj5~
zYk`7CD<rNAdAUN067!1FQj2t5^Zu7Gfb9K`1pYzUAZ@j<=m5pAKk+fl%cZNE%gY6h
za*zDtl50?~dGnXeMS1zznNa?<Yu7dxr5;r~s3xUWt0tgUp;o3=z;Q}VO|7&@%{0K*
z7Ze^4?Cb06tD0ng+1}s2#Xi;E+P=;{)jq`jag)6}m@~~j)&4SADAzvPF*!N4xL6mI
zD2wuQbRBbY^2>Fdi&9fk^GY%kbBZBa+Uz0TgC`x=ih|6d)MDKbaJa#OlrA(~ECHtt
zc-o`CCuwTG9Yy}}Ow;wt&r8+yO)N>yAkLjFWW-s7u5*4-QECpjAk+19!RBT|GR(zh
z4qh>c7Z-uR=LHRoAbQbaFo}m)i6jRq9!5)R28PkndbG60o73o#n}?nqqop+|aW-07
zqcx&w*<K$tdo%<_Ltr!nXdMC+7HJe}r?u}!%^wYc(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2cd?5guq8)s$8g<cV2n^>CP&G3i9m5$7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@Rpi>C+(8-?R+>agg+h_=khQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2C73IVIpsrJzj7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVCWArO+8o0*pmJ#XB<C^J1XZ<zROL=9Dp
z#@QeY0gXZErqNt68UmvsFd71*Aut*OqaiR@L!foE<uDooqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Auv=!0CdrFL5Z$QVo7RAW^U?W9f2Bk*JucghQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-R~zz7Xgfs-uFV?j8++(GVC7
zfzc2c4S~@R7!3iuA%ItM@HNUtT{Id3qaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*AuzZ@ARshE!BN2@BqTuJP|uK;%Q-)<BsH%@H>9#4)he-|ASW|9u_QA;
zPrpL9yu4gDEx#yNx3nlHH7_|oB{c=1-W4Q}>6dPmlA4y2Sdz-i#mi;U%VjCx!Jwr9
z16*8etH7X_t5-{5bfjxE1V%$(Gz3ON04)U2xTIDf6ly2cx>5C`Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd72X3jtNb(ZQY35Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5E#-S&^e@CKf2FvGz3ONU^E0qLtr!nMnhmU1ZWikqm87|5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu;sYKH(5t%mbP%^eMa(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!3j1hQMgIV>ARtLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E19hCl*N8QLD2IcoZ72#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb22c2q=^)Y+M}@pl_&W
zz{};FpI4HaSE3tIS&(X#TbfgnS&&#%qMw#ul&hPPSdy5OUz(SaSX617i%{#Dmz<xH
znU`*rUX@wE%M}nBqTs0D5dt#O!o<YP+{DDd+}PZ}($v(@%+OTN5Tf%+Ub<CEYFbWW
zNh&WFFPB9xm!*IQgO&yiaB;C|tO9{vu3jw#ih504R=m6rEDNRCdAS%E{(}(%8&r&!
zHy7j(UEN$>uF^cPry-hPnxQn5f}4q*FODMr4sHkBND_Sn(-%;bn4X&mvXde|Sn*nM
zaq;pZ99a$l1C<Cz?Hvt)(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu;s
z@<M>beY@mYGOBAd1gI4Pt)nS+Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E2i7y?{$w2NBnu1C!o4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
zAU6a?k9Zvofzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC70h)$@s+loO%^zL;Fd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;Gq)AUP_}gLIdV>KF}y(GVC7fzc2c
z4S~@R7!85Z5Eu;sdWXOuX+6{1+oSf4hQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz+epljnNUz(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7&IX;XdE(nRNH6>5EBBeqbYVY1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONVAzI0XhC{WVoIv6XI^n?a%oYjZcu7rX=-sv@v!wVF*D_(YDPm~Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMniyb2yl(=&>szf(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVCxAuxixIyxCT8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?5FwyyW;}Z4)o2KehQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-R~zs}LAgo*CW#Ga3S;Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Ulko1O~}M
zCy&7%PNVJ{4S~@R7!85Z5Eu=C(GVE;5b(<{QSi-A$xO>kO&NICjJjYn1O`b<dNd+N
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0EA)qlje=`~aqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFhoOOh&p@p2(XbF0<EJdb~FS=Ltr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1PFw{=LL=X@r|Q@UeLG$pZuuY
TXb8|O1U@flSVtiJVzV0nN!|%Z

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696
new file mode 100644
index 00000000..6f898364
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696
@@ -0,0 +1,7 @@
+PUT { HTTP/1.0
+Content-Type:multipart/form-databoundary=m
+Range:bytes=-
+
+--m
+C
+c






















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	






























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































ï



















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌







































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































X-Forwarded-Host


























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹












































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































X-Forwarded-Host





































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































ï



















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌







































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































X-Forwarded-Host


























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹









































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































2
























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































+/v+
















































































































































































































































































































































































































































































































































































































































































































































































































































































\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264
new file mode 100644
index 00000000..fd53db5c
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264
@@ -0,0 +1,19 @@
+POST /fform%u008anoÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔãm%u08a�g HTTP/1.0
+DondntGnt-Encodin€z-daExpi%20-Enëv2PUT@ËHTkP/

+Rcnðÿÿÿÿÿÿ ,Cotent-Security-Pz-tes=T“peont.e�µ-Typènt-Ty@n/***ww-form-urlenc…Tÿû?aLO%KSi@FrÇTTP/1.0
+Cofffffffffffffffffffffffntemt�
+�
+�
+�
+�
+�
+Content-Length:dent:applica;tion/x-wsw-form%`00368aogrlencod368angrlencoded
+�JJ`
+o
+
+8�ÿõContent-EncodxNg:deflatePtipfo
+
+8�


+9Ö2H2											ncod368anPOST # HTTP/1.0
Content-Encoding:defPOST / HTTP/1.0
+Content-Encoding:PUT { HTTP/1.0
+Content-Type:Range:bytes=-
multipart/
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc b/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc
new file mode 100644
index 00000000..b1ba3dbf
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc
@@ -0,0 +1,98 @@
+#include <cstdint>
+
+#include <httplib.h>
+
+class FuzzedStream : public httplib::Stream {
+public:
+  FuzzedStream(const uint8_t *data, size_t size)
+      : data_(data), size_(size), read_pos_(0) {}
+
+  ssize_t read(char *ptr, size_t size) override {
+    if (size + read_pos_ > size_) { size = size_ - read_pos_; }
+    memcpy(ptr, data_ + read_pos_, size);
+    read_pos_ += size;
+    return static_cast<ssize_t>(size);
+  }
+
+  ssize_t write(const char *ptr, size_t size) override {
+    response_.append(ptr, size);
+    return static_cast<int>(size);
+  }
+
+  ssize_t write(const char *ptr) { return write(ptr, strlen(ptr)); }
+
+  ssize_t write(const std::string &s) { return write(s.data(), s.size()); }
+
+  bool is_readable() const override { return true; }
+
+  bool is_writable() const override { return true; }
+
+  void get_remote_ip_and_port(std::string &ip, int &port) const override {
+    ip = "127.0.0.1";
+    port = 8080;
+  }
+
+  void get_local_ip_and_port(std::string &ip, int &port) const override {
+    ip = "127.0.0.1";
+    port = 8080;
+  }
+
+  socket_t socket() const override { return 0; }
+
+  time_t duration() const override { return 0; };
+
+private:
+  const uint8_t *data_;
+  size_t size_;
+  size_t read_pos_;
+  std::string response_;
+};
+
+class FuzzableServer : public httplib::Server {
+public:
+  void ProcessFuzzedRequest(FuzzedStream &stream) {
+    bool connection_close = false;
+    process_request(stream,
+                    /*remote_addr=*/"",
+                    /*remote_port =*/0,
+                    /*local_addr=*/"",
+                    /*local_port =*/0,
+                    /*last_connection=*/false, connection_close, nullptr);
+  }
+};
+
+static FuzzableServer g_server;
+
+extern "C" int LLVMFuzzerInitialize(int * /*argc*/, char *** /*argv*/) {
+  g_server.Get(R"(.*)",
+               [&](const httplib::Request & /*req*/, httplib::Response &res) {
+                 res.set_content("response content", "text/plain");
+               });
+  g_server.Post(R"(.*)",
+                [&](const httplib::Request & /*req*/, httplib::Response &res) {
+                  res.set_content("response content", "text/plain");
+                });
+  g_server.Put(R"(.*)",
+               [&](const httplib::Request & /*req*/, httplib::Response &res) {
+                 res.set_content("response content", "text/plain");
+               });
+  g_server.Patch(R"(.*)",
+                 [&](const httplib::Request & /*req*/, httplib::Response &res) {
+                   res.set_content("response content", "text/plain");
+                 });
+  g_server.Delete(
+      R"(.*)", [&](const httplib::Request & /*req*/, httplib::Response &res) {
+        res.set_content("response content", "text/plain");
+      });
+  g_server.Options(
+      R"(.*)", [&](const httplib::Request & /*req*/, httplib::Response &res) {
+        res.set_content("response content", "text/plain");
+      });
+  return 0;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  FuzzedStream stream{data, size};
+  g_server.ProcessFuzzedRequest(stream);
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict b/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict
new file mode 100644
index 00000000..47283dc3
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict
@@ -0,0 +1,224 @@
+# Sources: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
+
+# misc
+"HTTP/1.1"
+
+# verbs
+"CONNECT"
+"DELETE"
+"GET"
+"HEAD"
+"OPTIONS"
+"PATCH"
+"POST"
+"PUT"
+"TRACE"
+
+
+# Webdav/caldav verbs
+"ACL"
+"BASELINE-CONTROL"
+"BIND"
+"CHECKIN"
+"CHECKOUT"
+"COPY"
+"LABEL"
+"LINK"
+"LOCK"
+"MERGE"
+"MKACTIVITY"
+"MKCALENDAR"
+"MKCOL"
+"MKREDIRECTREF"
+"MKWORKSPACE"
+"MOVE"
+"ORDERPATCH"
+"PRI"
+"PROPFIND"
+"PROPPATCH"
+"REBIND"
+"REPORT"
+"SEARCH"
+"UNBIND"
+"UNCHECKOUT"
+"UNLINK"
+"UNLOCK"
+"UPDATE"
+"UPDATEREDIRECTREF"
+"VERSION-CONTROL"
+
+
+# Fields
+"A-IM"
+"Accept"
+"Accept-Charset"
+"Accept-Datetime"
+"Accept-Encoding"
+"Accept-Language"
+"Accept-Patch"
+"Accept-Ranges"
+"Access-Control-Allow-Credentials"
+"Access-Control-Allow-Headers"
+"Access-Control-Allow-Methods"
+"Access-Control-Allow-Origin"
+"Access-Control-Expose-Headers"
+"Access-Control-Max-Age"
+"Access-Control-Request-Headers"
+"Access-Control-Request-Method"
+"Age"
+"Allow"
+"Alt-Svc"
+"Authorization"
+"Cache-Control"
+"Connection"
+"Connection:"
+"Content-Disposition"
+"Content-Encoding"
+"Content-Language"
+"Content-Length"
+"Content-Location"
+"Content-MD5"
+"Content-Range"
+"Content-Security-Policy"
+"Content-Type"
+"Cookie"
+"DNT"
+"Date"
+"Delta-Base"
+"ETag"
+"Expect"
+"Expires"
+"Forwarded"
+"From"
+"Front-End-Https"
+"HTTP2-Settings"
+"Host"
+"IM"
+"If-Match"
+"If-Modified-Since"
+"If-None-Match"
+"If-Range"
+"If-Unmodified-Since"
+"Last-Modified"
+"Link"
+"Location"
+"Max-Forwards"
+"Origin"
+"P3P"
+"Pragma"
+"Proxy-Authenticate"
+"Proxy-Authorization"
+"Proxy-Connection"
+"Public-Key-Pins"
+"Range"
+"Referer"
+"Refresh"
+"Retry-After"
+"Save-Data"
+"Server"
+"Set-Cookie"
+"Status"
+"Strict-Transport-Security"
+"TE"
+"Timing-Allow-Origin"
+"Tk"
+"Trailer"
+"Transfer-Encoding"
+"Upgrade"
+"Upgrade-Insecure-Requests"
+"User-Agent"
+"Vary"
+"Via"
+"WWW-Authenticate"
+"Warning"
+"X-ATT-DeviceId"
+"X-Content-Duration"
+"X-Content-Security-Policy"
+"X-Content-Type-Options"
+"X-Correlation-ID"
+"X-Csrf-Token"
+"X-Forwarded-For"
+"X-Forwarded-Host"
+"X-Forwarded-Proto"
+"X-Frame-Options"
+"X-Http-Method-Override"
+"X-Powered-By"
+"X-Request-ID"
+"X-Requested-With"
+"X-UA-Compatible"
+"X-UIDH"
+"X-Wap-Profile"
+"X-WebKit-CSP"
+"X-XSS-Protection"
+
+# Source: string and character literals in httplib.h
+" "
+"&"
+", "
+"-"
+"--"
+"."
+".."
+":"
+"="
+" = = "
+"0123456789abcdef"
+"%02X"
+"%0A"
+"\\x0a\\x0d"
+"%0D"
+"%20"
+"%27"
+"%2B"
+"%2C"
+"%3A"
+"%3B"
+"application/javascript"
+"application/json"
+"application/pdf"
+"application/xhtml+xml"
+"application/xml"
+"application/x-www-form-urlencoded"
+"Bad Request"
+"boundary="
+"bytes="
+"chunked"
+"close"
+"CONNECT"
+"css"
+"Forbidden"
+"Found"
+"gif"
+"gzip"
+"html"
+"ico"
+"image/gif"
+"image/jpg"
+"image/png"
+"image/svg+xml"
+"image/x-icon"
+"index.html"
+"Internal Server Error"
+"jpeg"
+"js"
+"json"
+"Location"
+"Moved Permanently"
+"multipart/form-data"
+"Not Found"
+"Not Modified"
+"OK"
+"pdf"
+"png"
+"Range"
+"REMOTE_ADDR"
+"See Other"
+"svg"
+"text/"
+"text/css"
+"text/html"
+"text/plain"
+"txt"
+"Unsupported Media Type"
+"xhtml"
+"xml"
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp b/code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp
new file mode 100644
index 00000000..e8bd5ed6
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp
@@ -0,0 +1,35 @@
+// Copyright 2017 Google Inc. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+
+// This runner does not do any fuzzing, but allows us to run the fuzz target
+// on the test corpus or on a single file,
+// e.g. the one that comes from a bug report.
+
+#include <cstdint>
+#include <fstream>
+#include <iostream>
+#include <vector>
+
+// Forward declare the "fuzz target" interface.
+// We deliberately keep this interface simple and header-free.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
+
+// It reads all files passed as parameters and feeds their contents
+// one by one into the fuzz target (LLVMFuzzerTestOneInput).
+int main(int argc, char **argv) {
+  for (int i = 1; i < argc; i++) {
+    std::ifstream in(argv[i]);
+    in.seekg(0, in.end);
+    size_t length = static_cast<size_t>(in.tellg());
+    in.seekg(0, in.beg);
+    std::cout << "Reading " << length << " bytes from " << argv[i] << std::endl;
+    // Allocate exactly length bytes so that we reliably catch buffer overflows.
+    std::vector<char> bytes(length);
+    in.read(bytes.data(), static_cast<std::streamsize>(bytes.size()));
+    LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()),
+                           bytes.size());
+    std::cout << "Execution successful" << std::endl;
+  }
+  std::cout << "Execution finished" << std::endl;
+  return 0;
+}
diff --git a/code/cpp-httplib-0.19.0/test/gen-certs.sh b/code/cpp-httplib-0.19.0/test/gen-certs.sh
new file mode 100644
index 00000000..ee2a2cf3
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/gen-certs.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+if [[ $(openssl version) =~ 3\.[2-9]\.[0-9]+ ]]; then
+	OPENSSL_X509_FLAG='-x509v1'
+else
+	OPENSSL_X509_FLAG='-x509'
+fi
+
+openssl genrsa 2048 > key.pem
+openssl req -new -batch -config test.conf -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
+openssl req -x509 -config test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
+openssl genrsa 2048 > rootCA.key.pem
+openssl req $OPENSSL_X509_FLAG -new -batch -config test.rootCA.conf -key rootCA.key.pem -days 1024 > rootCA.cert.pem
+openssl genrsa 2048 > client.key.pem
+openssl req -new -batch -config test.conf -key client.key.pem | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client.cert.pem
+openssl genrsa -passout pass:test123! 2048 > key_encrypted.pem
+openssl req -new -batch -config test.conf -key key_encrypted.pem | openssl x509 -days 3650 -req -signkey key_encrypted.pem > cert_encrypted.pem
+openssl genrsa -aes256 -passout pass:test012! 2048 > client_encrypted.key.pem
+openssl req -new -batch -config test.conf -key client_encrypted.key.pem -passin pass:test012! | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client_encrypted.cert.pem
diff --git a/code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc b/code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc
new file mode 100644
index 00000000..24e669e1
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc
@@ -0,0 +1,12501 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Google C++ Testing and Mocking Framework (Google Test)
+//
+// Sometimes it's desirable to build Google Test by compiling a single file.
+// This file serves this purpose.
+
+// This line ensures that gtest.h can be compiled on its own, even
+// when it's fused.
+#include "gtest/gtest.h"
+
+// The following lines pull in the real gtest *.cc files.
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Utilities for testing Google Test itself and code that uses Google Test
+// (e.g. frameworks built on top of Google Test).
+
+// GOOGLETEST_CM0004 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
+
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// This helper class can be used to mock out Google Test failure reporting
+// so that we can test Google Test or code that builds on Google Test.
+//
+// An object of this class appends a TestPartResult object to the
+// TestPartResultArray object given in the constructor whenever a Google Test
+// failure is reported. It can either intercept only failures that are
+// generated in the same thread that created this object or it can intercept
+// all generated failures. The scope of this mock object can be controlled with
+// the second argument to the two arguments constructor.
+class GTEST_API_ ScopedFakeTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  // The two possible mocking modes of this object.
+  enum InterceptMode {
+    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
+    INTERCEPT_ALL_THREADS           // Intercepts all failures.
+  };
+
+  // The c'tor sets this object as the test part result reporter used
+  // by Google Test.  The 'result' parameter specifies where to report the
+  // results. This reporter will only catch failures generated in the current
+  // thread. DEPRECATED
+  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
+
+  // Same as above, but you can choose the interception scope of this object.
+  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
+                                   TestPartResultArray* result);
+
+  // The d'tor restores the previous test part result reporter.
+  ~ScopedFakeTestPartResultReporter() override;
+
+  // Appends the TestPartResult object to the TestPartResultArray
+  // received in the constructor.
+  //
+  // This method is from the TestPartResultReporterInterface
+  // interface.
+  void ReportTestPartResult(const TestPartResult& result) override;
+
+ private:
+  void Init();
+
+  const InterceptMode intercept_mode_;
+  TestPartResultReporterInterface* old_reporter_;
+  TestPartResultArray* const result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
+};
+
+namespace internal {
+
+// A helper class for implementing EXPECT_FATAL_FAILURE() and
+// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+class GTEST_API_ SingleFailureChecker {
+ public:
+  // The constructor remembers the arguments.
+  SingleFailureChecker(const TestPartResultArray* results,
+                       TestPartResult::Type type, const std::string& substr);
+  ~SingleFailureChecker();
+ private:
+  const TestPartResultArray* const results_;
+  const TestPartResult::Type type_;
+  const std::string substr_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// A set of macros for testing Google Test assertions or code that's expected
+// to generate Google Test fatal failures.  It verifies that the given
+// statement will cause exactly one fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - 'statement' cannot reference local non-static variables or
+//     non-static members of the current object.
+//   - 'statement' cannot return a value.
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
+// gtest_unittest.cc will fail to compile if we do that.
+#define EXPECT_FATAL_FAILURE(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ALL_THREADS, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+// A macro for testing Google Test assertions or code that's expected to
+// generate Google Test non-fatal failures.  It asserts that the given
+// statement will cause exactly one non-fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// 'statement' is allowed to reference local variables and members of
+// the current object.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  If we do that, the code won't compile when the user gives
+// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
+// expands to code containing an unprotected comma.  The
+// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
+// catches that.
+//
+// For the same reason, we have to write
+//   if (::testing::internal::AlwaysTrue()) { statement; }
+// instead of
+//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+// to avoid an MSVC warning on unreachable code.
+#define EXPECT_NONFATAL_FAILURE(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
+          &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#include <algorithm>
+#include <chrono>  // NOLINT
+#include <cmath>
+#include <cstdint>
+#include <iomanip>
+#include <limits>
+#include <list>
+#include <map>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <vector>
+
+#if GTEST_OS_LINUX
+
+# include <fcntl.h>  // NOLINT
+# include <limits.h>  // NOLINT
+# include <sched.h>  // NOLINT
+// Declares vsnprintf().  This header is not available on Windows.
+# include <strings.h>  // NOLINT
+# include <sys/mman.h>  // NOLINT
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+# include <string>
+
+#elif GTEST_OS_ZOS
+# include <sys/time.h>  // NOLINT
+
+// On z/OS we additionally need strings.h for strcasecmp.
+# include <strings.h>  // NOLINT
+
+#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
+
+# include <windows.h>  // NOLINT
+# undef min
+
+#elif GTEST_OS_WINDOWS  // We are on Windows proper.
+
+# include <windows.h>  // NOLINT
+# undef min
+
+#ifdef _MSC_VER
+# include <crtdbg.h>  // NOLINT
+#endif
+
+# include <io.h>  // NOLINT
+# include <sys/timeb.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+# include <sys/stat.h>  // NOLINT
+
+# if GTEST_OS_WINDOWS_MINGW
+#  include <sys/time.h>  // NOLINT
+# endif  // GTEST_OS_WINDOWS_MINGW
+
+#else
+
+// cpplint thinks that the header is already included, so we want to
+// silence it.
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+# include <sys/socket.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+#endif
+
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Utility functions and classes used by the Google C++ testing framework.//
+// This file contains purely Google Test's internal implementation.  Please
+// DO NOT #INCLUDE IT IN A USER PROGRAM.
+
+#ifndef GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
+#define GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif  // !_WIN32_WCE
+#include <stddef.h>
+#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
+#include <string.h>  // For memmove.
+
+#include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+#endif
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// Declares the flags.
+//
+// We don't want the users to modify this flag in the code, but want
+// Google Test's own unit tests to be able to access it. Therefore we
+// declare it here as opposed to in gtest.h.
+GTEST_DECLARE_bool_(death_test_use_fork);
+
+namespace internal {
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
+const char kBreakOnFailureFlag[] = "break_on_failure";
+const char kCatchExceptionsFlag[] = "catch_exceptions";
+const char kColorFlag[] = "color";
+const char kFailFast[] = "fail_fast";
+const char kFilterFlag[] = "filter";
+const char kListTestsFlag[] = "list_tests";
+const char kOutputFlag[] = "output";
+const char kBriefFlag[] = "brief";
+const char kPrintTimeFlag[] = "print_time";
+const char kPrintUTF8Flag[] = "print_utf8";
+const char kRandomSeedFlag[] = "random_seed";
+const char kRepeatFlag[] = "repeat";
+const char kShuffleFlag[] = "shuffle";
+const char kStackTraceDepthFlag[] = "stack_trace_depth";
+const char kStreamResultToFlag[] = "stream_result_to";
+const char kThrowOnFailureFlag[] = "throw_on_failure";
+const char kFlagfileFlag[] = "flagfile";
+
+// A valid random seed must be in [1, kMaxRandomSeed].
+const int kMaxRandomSeed = 99999;
+
+// g_help_flag is true if and only if the --help flag or an equivalent form
+// is specified on the command line.
+GTEST_API_ extern bool g_help_flag;
+
+// Returns the current time in milliseconds.
+GTEST_API_ TimeInMillis GetTimeInMillis();
+
+// Returns true if and only if Google Test should use colors in the output.
+GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
+
+// Formats the given time in milliseconds as seconds.
+GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
+
+// Converts the given time in milliseconds to a date string in the ISO 8601
+// format, without the timezone information.  N.B.: due to the use the
+// non-reentrant localtime() function, this function is not thread safe.  Do
+// not use it in any code that can be called from multiple threads.
+GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
+
+// Parses a string for an Int32 flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+GTEST_API_ bool ParseInt32Flag(
+    const char* str, const char* flag, int32_t* value);
+
+// Returns a random seed in range [1, kMaxRandomSeed] based on the
+// given --gtest_random_seed flag value.
+inline int GetRandomSeedFromFlag(int32_t random_seed_flag) {
+  const unsigned int raw_seed = (random_seed_flag == 0) ?
+      static_cast<unsigned int>(GetTimeInMillis()) :
+      static_cast<unsigned int>(random_seed_flag);
+
+  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
+  // it's easy to type.
+  const int normalized_seed =
+      static_cast<int>((raw_seed - 1U) %
+                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
+  return normalized_seed;
+}
+
+// Returns the first valid random seed after 'seed'.  The behavior is
+// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
+// considered to be 1.
+inline int GetNextRandomSeed(int seed) {
+  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
+      << "Invalid random seed " << seed << " - must be in [1, "
+      << kMaxRandomSeed << "].";
+  const int next_seed = seed + 1;
+  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
+}
+
+// This class saves the values of all Google Test flags in its c'tor, and
+// restores them in its d'tor.
+class GTestFlagSaver {
+ public:
+  // The c'tor.
+  GTestFlagSaver() {
+    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
+    break_on_failure_ = GTEST_FLAG(break_on_failure);
+    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
+    color_ = GTEST_FLAG(color);
+    death_test_style_ = GTEST_FLAG(death_test_style);
+    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
+    fail_fast_ = GTEST_FLAG(fail_fast);
+    filter_ = GTEST_FLAG(filter);
+    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
+    list_tests_ = GTEST_FLAG(list_tests);
+    output_ = GTEST_FLAG(output);
+    brief_ = GTEST_FLAG(brief);
+    print_time_ = GTEST_FLAG(print_time);
+    print_utf8_ = GTEST_FLAG(print_utf8);
+    random_seed_ = GTEST_FLAG(random_seed);
+    repeat_ = GTEST_FLAG(repeat);
+    shuffle_ = GTEST_FLAG(shuffle);
+    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
+    stream_result_to_ = GTEST_FLAG(stream_result_to);
+    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
+  }
+
+  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
+  ~GTestFlagSaver() {
+    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
+    GTEST_FLAG(break_on_failure) = break_on_failure_;
+    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
+    GTEST_FLAG(color) = color_;
+    GTEST_FLAG(death_test_style) = death_test_style_;
+    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
+    GTEST_FLAG(filter) = filter_;
+    GTEST_FLAG(fail_fast) = fail_fast_;
+    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
+    GTEST_FLAG(list_tests) = list_tests_;
+    GTEST_FLAG(output) = output_;
+    GTEST_FLAG(brief) = brief_;
+    GTEST_FLAG(print_time) = print_time_;
+    GTEST_FLAG(print_utf8) = print_utf8_;
+    GTEST_FLAG(random_seed) = random_seed_;
+    GTEST_FLAG(repeat) = repeat_;
+    GTEST_FLAG(shuffle) = shuffle_;
+    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
+    GTEST_FLAG(stream_result_to) = stream_result_to_;
+    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
+  }
+
+ private:
+  // Fields for saving the original values of flags.
+  bool also_run_disabled_tests_;
+  bool break_on_failure_;
+  bool catch_exceptions_;
+  std::string color_;
+  std::string death_test_style_;
+  bool death_test_use_fork_;
+  bool fail_fast_;
+  std::string filter_;
+  std::string internal_run_death_test_;
+  bool list_tests_;
+  std::string output_;
+  bool brief_;
+  bool print_time_;
+  bool print_utf8_;
+  int32_t random_seed_;
+  int32_t repeat_;
+  bool shuffle_;
+  int32_t stack_trace_depth_;
+  std::string stream_result_to_;
+  bool throw_on_failure_;
+} GTEST_ATTRIBUTE_UNUSED_;
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type UInt32 because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+GTEST_API_ std::string CodePointToUtf8(uint32_t code_point);
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded();
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (e.g., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+GTEST_API_ bool ShouldShard(const char* total_shards_str,
+                            const char* shard_index_str,
+                            bool in_subprocess_for_death_test);
+
+// Parses the environment variable var as a 32-bit integer. If it is unset,
+// returns default_val. If it is not a 32-bit integer, prints an error and
+// and aborts.
+GTEST_API_ int32_t Int32FromEnvOrDie(const char* env_var, int32_t default_val);
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true if and only if the test should be run on this shard. The test id
+// is some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+GTEST_API_ bool ShouldRunTestOnShard(
+    int total_shards, int shard_index, int test_id);
+
+// STL container utilities.
+
+// Returns the number of elements in the given container that satisfy
+// the given predicate.
+template <class Container, typename Predicate>
+inline int CountIf(const Container& c, Predicate predicate) {
+  // Implemented as an explicit loop since std::count_if() in libCstd on
+  // Solaris has a non-standard signature.
+  int count = 0;
+  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
+    if (predicate(*it))
+      ++count;
+  }
+  return count;
+}
+
+// Applies a function/functor to each element in the container.
+template <class Container, typename Functor>
+void ForEach(const Container& c, Functor functor) {
+  std::for_each(c.begin(), c.end(), functor);
+}
+
+// Returns the i-th element of the vector, or default_value if i is not
+// in range [0, v.size()).
+template <typename E>
+inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
+  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value
+                                                    : v[static_cast<size_t>(i)];
+}
+
+// Performs an in-place shuffle of a range of the vector's elements.
+// 'begin' and 'end' are element indices as an STL-style range;
+// i.e. [begin, end) are shuffled, where 'end' == size() means to
+// shuffle to the end of the vector.
+template <typename E>
+void ShuffleRange(internal::Random* random, int begin, int end,
+                  std::vector<E>* v) {
+  const int size = static_cast<int>(v->size());
+  GTEST_CHECK_(0 <= begin && begin <= size)
+      << "Invalid shuffle range start " << begin << ": must be in range [0, "
+      << size << "].";
+  GTEST_CHECK_(begin <= end && end <= size)
+      << "Invalid shuffle range finish " << end << ": must be in range ["
+      << begin << ", " << size << "].";
+
+  // Fisher-Yates shuffle, from
+  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
+  for (int range_width = end - begin; range_width >= 2; range_width--) {
+    const int last_in_range = begin + range_width - 1;
+    const int selected =
+        begin +
+        static_cast<int>(random->Generate(static_cast<uint32_t>(range_width)));
+    std::swap((*v)[static_cast<size_t>(selected)],
+              (*v)[static_cast<size_t>(last_in_range)]);
+  }
+}
+
+// Performs an in-place shuffle of the vector's elements.
+template <typename E>
+inline void Shuffle(internal::Random* random, std::vector<E>* v) {
+  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
+}
+
+// A function for deleting an object.  Handy for being used as a
+// functor.
+template <typename T>
+static void Delete(T* x) {
+  delete x;
+}
+
+// A predicate that checks the key of a TestProperty against a known key.
+//
+// TestPropertyKeyIs is copyable.
+class TestPropertyKeyIs {
+ public:
+  // Constructor.
+  //
+  // TestPropertyKeyIs has NO default constructor.
+  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
+
+  // Returns true if and only if the test name of test property matches on key_.
+  bool operator()(const TestProperty& test_property) const {
+    return test_property.key() == key_;
+  }
+
+ private:
+  std::string key_;
+};
+
+// Class UnitTestOptions.
+//
+// This class contains functions for processing options the user
+// specifies when running the tests.  It has only static members.
+//
+// In most cases, the user can specify an option using either an
+// environment variable or a command line flag.  E.g. you can set the
+// test filter using either GTEST_FILTER or --gtest_filter.  If both
+// the variable and the flag are present, the latter overrides the
+// former.
+class GTEST_API_ UnitTestOptions {
+ public:
+  // Functions for processing the gtest_output flag.
+
+  // Returns the output format, or "" for normal printed output.
+  static std::string GetOutputFormat();
+
+  // Returns the absolute path of the requested output file, or the
+  // default (test_detail.xml in the original working directory) if
+  // none was explicitly specified.
+  static std::string GetAbsolutePathToOutputFile();
+
+  // Functions for processing the gtest_filter flag.
+
+  // Returns true if and only if the user-specified filter matches the test
+  // suite name and the test name.
+  static bool FilterMatchesTest(const std::string& test_suite_name,
+                                const std::string& test_name);
+
+#if GTEST_OS_WINDOWS
+  // Function for supporting the gtest_catch_exception flag.
+
+  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+  // This function is useful as an __except condition.
+  static int GTestShouldProcessSEH(DWORD exception_code);
+#endif  // GTEST_OS_WINDOWS
+
+  // Returns true if "name" matches the ':' separated list of glob-style
+  // filters in "filter".
+  static bool MatchesFilter(const std::string& name, const char* filter);
+};
+
+// Returns the current application's name, removing directory path if that
+// is present.  Used by UnitTestOptions::GetOutputFile.
+GTEST_API_ FilePath GetCurrentExecutableName();
+
+// The role interface for getting the OS stack trace as a string.
+class OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetterInterface() {}
+  virtual ~OsStackTraceGetterInterface() {}
+
+  // Returns the current OS stack trace as an std::string.  Parameters:
+  //
+  //   max_depth  - the maximum number of stack frames to be included
+  //                in the trace.
+  //   skip_count - the number of top frames to be skipped; doesn't count
+  //                against max_depth.
+  virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0;
+
+  // UponLeavingGTest() should be called immediately before Google Test calls
+  // user code. It saves some information about the current stack that
+  // CurrentStackTrace() will use to find and hide Google Test stack frames.
+  virtual void UponLeavingGTest() = 0;
+
+  // This string is inserted in place of stack frames that are part of
+  // Google Test's implementation.
+  static const char* const kElidedFramesMarker;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
+};
+
+// A working implementation of the OsStackTraceGetterInterface interface.
+class OsStackTraceGetter : public OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetter() {}
+
+  std::string CurrentStackTrace(int max_depth, int skip_count) override;
+  void UponLeavingGTest() override;
+
+ private:
+#if GTEST_HAS_ABSL
+  Mutex mutex_;  // Protects all internal state.
+
+  // We save the stack frame below the frame that calls user code.
+  // We do this because the address of the frame immediately below
+  // the user code changes between the call to UponLeavingGTest()
+  // and any calls to the stack trace code from within the user code.
+  void* caller_frame_ = nullptr;
+#endif  // GTEST_HAS_ABSL
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
+};
+
+// Information about a Google Test trace point.
+struct TraceInfo {
+  const char* file;
+  int line;
+  std::string message;
+};
+
+// This is the default global test part result reporter used in UnitTestImpl.
+// This class should only be used by UnitTestImpl.
+class DefaultGlobalTestPartResultReporter
+  : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. Reports the test part
+  // result in the current test.
+  void ReportTestPartResult(const TestPartResult& result) override;
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
+};
+
+// This is the default per thread test part result reporter used in
+// UnitTestImpl. This class should only be used by UnitTestImpl.
+class DefaultPerThreadTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. The implementation just
+  // delegates to the current global test part result reporter of *unit_test_.
+  void ReportTestPartResult(const TestPartResult& result) override;
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
+};
+
+// The private implementation of the UnitTest class.  We don't protect
+// the methods under a mutex, as this class is not accessible by a
+// user and the UnitTest class that delegates work to this class does
+// proper locking.
+class GTEST_API_ UnitTestImpl {
+ public:
+  explicit UnitTestImpl(UnitTest* parent);
+  virtual ~UnitTestImpl();
+
+  // There are two different ways to register your own TestPartResultReporter.
+  // You can register your own repoter to listen either only for test results
+  // from the current thread or for results from all threads.
+  // By default, each per-thread test result repoter just passes a new
+  // TestPartResult to the global test result reporter, which registers the
+  // test part result for the currently running test.
+
+  // Returns the global test part result reporter.
+  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
+
+  // Sets the global test part result reporter.
+  void SetGlobalTestPartResultReporter(
+      TestPartResultReporterInterface* reporter);
+
+  // Returns the test part result reporter for the current thread.
+  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
+
+  // Sets the test part result reporter for the current thread.
+  void SetTestPartResultReporterForCurrentThread(
+      TestPartResultReporterInterface* reporter);
+
+  // Gets the number of successful test suites.
+  int successful_test_suite_count() const;
+
+  // Gets the number of failed test suites.
+  int failed_test_suite_count() const;
+
+  // Gets the number of all test suites.
+  int total_test_suite_count() const;
+
+  // Gets the number of all test suites that contain at least one test
+  // that should run.
+  int test_suite_to_run_count() const;
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of skipped tests.
+  int skipped_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns true if and only if the unit test passed (i.e. all test suites
+  // passed).
+  bool Passed() const { return !Failed(); }
+
+  // Returns true if and only if the unit test failed (i.e. some test suite
+  // failed or something outside of all tests failed).
+  bool Failed() const {
+    return failed_test_suite_count() > 0 || ad_hoc_test_result()->Failed();
+  }
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  const TestSuite* GetTestSuite(int i) const {
+    const int index = GetElementOr(test_suite_indices_, i, -1);
+    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
+  }
+
+  //  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const TestCase* GetTestCase(int i) const { return GetTestSuite(i); }
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  TestSuite* GetMutableSuiteCase(int i) {
+    const int index = GetElementOr(test_suite_indices_, i, -1);
+    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
+  }
+
+  // Provides access to the event listener list.
+  TestEventListeners* listeners() { return &listeners_; }
+
+  // Returns the TestResult for the test that's currently running, or
+  // the TestResult for the ad hoc test if no test is running.
+  TestResult* current_test_result();
+
+  // Returns the TestResult for the ad hoc test.
+  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
+
+  // Sets the OS stack trace getter.
+  //
+  // Does nothing if the input and the current OS stack trace getter
+  // are the same; otherwise, deletes the old getter and makes the
+  // input the current getter.
+  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
+
+  // Returns the current OS stack trace getter if it is not NULL;
+  // otherwise, creates an OsStackTraceGetter, makes it the current
+  // getter, and returns it.
+  OsStackTraceGetterInterface* os_stack_trace_getter();
+
+  // Returns the current OS stack trace as an std::string.
+  //
+  // The maximum number of stack frames to be included is specified by
+  // the gtest_stack_trace_depth flag.  The skip_count parameter
+  // specifies the number of top frames to be skipped, which doesn't
+  // count against the number of frames to be included.
+  //
+  // For example, if Foo() calls Bar(), which in turn calls
+  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
+
+  // Finds and returns a TestSuite with the given name.  If one doesn't
+  // exist, creates one and returns it.
+  //
+  // Arguments:
+  //
+  //   test_suite_name: name of the test suite
+  //   type_param:      the name of the test's type parameter, or NULL if
+  //                    this is not a typed or a type-parameterized test.
+  //   set_up_tc:       pointer to the function that sets up the test suite
+  //   tear_down_tc:    pointer to the function that tears down the test suite
+  TestSuite* GetTestSuite(const char* test_suite_name, const char* type_param,
+                          internal::SetUpTestSuiteFunc set_up_tc,
+                          internal::TearDownTestSuiteFunc tear_down_tc);
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  TestCase* GetTestCase(const char* test_case_name, const char* type_param,
+                        internal::SetUpTestSuiteFunc set_up_tc,
+                        internal::TearDownTestSuiteFunc tear_down_tc) {
+    return GetTestSuite(test_case_name, type_param, set_up_tc, tear_down_tc);
+  }
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Adds a TestInfo to the unit test.
+  //
+  // Arguments:
+  //
+  //   set_up_tc:    pointer to the function that sets up the test suite
+  //   tear_down_tc: pointer to the function that tears down the test suite
+  //   test_info:    the TestInfo object
+  void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
+                   internal::TearDownTestSuiteFunc tear_down_tc,
+                   TestInfo* test_info) {
+#if GTEST_HAS_DEATH_TEST
+    // In order to support thread-safe death tests, we need to
+    // remember the original working directory when the test program
+    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
+    // the user may have changed the current directory before calling
+    // RUN_ALL_TESTS().  Therefore we capture the current directory in
+    // AddTestInfo(), which is called to register a TEST or TEST_F
+    // before main() is reached.
+    if (original_working_dir_.IsEmpty()) {
+      original_working_dir_.Set(FilePath::GetCurrentDir());
+      GTEST_CHECK_(!original_working_dir_.IsEmpty())
+          << "Failed to get the current working directory.";
+    }
+#endif  // GTEST_HAS_DEATH_TEST
+
+    GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
+                 set_up_tc, tear_down_tc)
+        ->AddTestInfo(test_info);
+  }
+
+  // Returns ParameterizedTestSuiteRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry() {
+    return parameterized_test_registry_;
+  }
+
+  std::set<std::string>* ignored_parameterized_test_suites() {
+    return &ignored_parameterized_test_suites_;
+  }
+
+  // Returns TypeParameterizedTestSuiteRegistry object used to keep track of
+  // type-parameterized tests and instantiations of them.
+  internal::TypeParameterizedTestSuiteRegistry&
+  type_parameterized_test_registry() {
+    return type_parameterized_test_registry_;
+  }
+
+  // Sets the TestSuite object for the test that's currently running.
+  void set_current_test_suite(TestSuite* a_current_test_suite) {
+    current_test_suite_ = a_current_test_suite;
+  }
+
+  // Sets the TestInfo object for the test that's currently running.  If
+  // current_test_info is NULL, the assertion results will be stored in
+  // ad_hoc_test_result_.
+  void set_current_test_info(TestInfo* a_current_test_info) {
+    current_test_info_ = a_current_test_info;
+  }
+
+  // Registers all parameterized tests defined using TEST_P and
+  // INSTANTIATE_TEST_SUITE_P, creating regular tests for each test/parameter
+  // combination. This method can be called more then once; it has guards
+  // protecting from registering the tests more then once.  If
+  // value-parameterized tests are disabled, RegisterParameterizedTests is
+  // present but does nothing.
+  void RegisterParameterizedTests();
+
+  // Runs all tests in this UnitTest object, prints the result, and
+  // returns true if all tests are successful.  If any exception is
+  // thrown during a test, this test is considered to be failed, but
+  // the rest of the tests will still be run.
+  bool RunAllTests();
+
+  // Clears the results of all tests, except the ad hoc tests.
+  void ClearNonAdHocTestResult() {
+    ForEach(test_suites_, TestSuite::ClearTestSuiteResult);
+  }
+
+  // Clears the results of ad-hoc test assertions.
+  void ClearAdHocTestResult() {
+    ad_hoc_test_result_.Clear();
+  }
+
+  // Adds a TestProperty to the current TestResult object when invoked in a
+  // context of a test or a test suite, or to the global property set. If the
+  // result already contains a property with the same key, the value will be
+  // updated.
+  void RecordProperty(const TestProperty& test_property);
+
+  enum ReactionToSharding {
+    HONOR_SHARDING_PROTOCOL,
+    IGNORE_SHARDING_PROTOCOL
+  };
+
+  // Matches the full name of each test against the user-specified
+  // filter to decide whether the test should run, then records the
+  // result in each TestSuite and TestInfo object.
+  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
+  // based on sharding variables in the environment.
+  // Returns the number of tests that should run.
+  int FilterTests(ReactionToSharding shard_tests);
+
+  // Prints the names of the tests matching the user-specified filter flag.
+  void ListTestsMatchingFilter();
+
+  const TestSuite* current_test_suite() const { return current_test_suite_; }
+  TestInfo* current_test_info() { return current_test_info_; }
+  const TestInfo* current_test_info() const { return current_test_info_; }
+
+  // Returns the vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*>& environments() { return environments_; }
+
+  // Getters for the per-thread Google Test trace stack.
+  std::vector<TraceInfo>& gtest_trace_stack() {
+    return *(gtest_trace_stack_.pointer());
+  }
+  const std::vector<TraceInfo>& gtest_trace_stack() const {
+    return gtest_trace_stack_.get();
+  }
+
+#if GTEST_HAS_DEATH_TEST
+  void InitDeathTestSubprocessControlInfo() {
+    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
+  }
+  // Returns a pointer to the parsed --gtest_internal_run_death_test
+  // flag, or NULL if that flag was not specified.
+  // This information is useful only in a death test child process.
+  // Must not be called before a call to InitGoogleTest.
+  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
+    return internal_run_death_test_flag_.get();
+  }
+
+  // Returns a pointer to the current death test factory.
+  internal::DeathTestFactory* death_test_factory() {
+    return death_test_factory_.get();
+  }
+
+  void SuppressTestEventsIfInSubprocess();
+
+  friend class ReplaceDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // Initializes the event listener performing XML output as specified by
+  // UnitTestOptions. Must not be called before InitGoogleTest.
+  void ConfigureXmlOutput();
+
+#if GTEST_CAN_STREAM_RESULTS_
+  // Initializes the event listener for streaming test results to a socket.
+  // Must not be called before InitGoogleTest.
+  void ConfigureStreamingOutput();
+#endif
+
+  // Performs initialization dependent upon flag values obtained in
+  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+  // this function is also called from RunAllTests.  Since this function can be
+  // called more than once, it has to be idempotent.
+  void PostFlagParsingInit();
+
+  // Gets the random seed used at the start of the current test iteration.
+  int random_seed() const { return random_seed_; }
+
+  // Gets the random number generator.
+  internal::Random* random() { return &random_; }
+
+  // Shuffles all test suites, and the tests within each test suite,
+  // making sure that death tests are still run first.
+  void ShuffleTests();
+
+  // Restores the test suites and tests to their order before the first shuffle.
+  void UnshuffleTests();
+
+  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
+  // UnitTest::Run() starts.
+  bool catch_exceptions() const { return catch_exceptions_; }
+
+ private:
+  friend class ::testing::UnitTest;
+
+  // Used by UnitTest::Run() to capture the state of
+  // GTEST_FLAG(catch_exceptions) at the moment it starts.
+  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
+
+  // The UnitTest object that owns this implementation object.
+  UnitTest* const parent_;
+
+  // The working directory when the first TEST() or TEST_F() was
+  // executed.
+  internal::FilePath original_working_dir_;
+
+  // The default test part result reporters.
+  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
+  DefaultPerThreadTestPartResultReporter
+      default_per_thread_test_part_result_reporter_;
+
+  // Points to (but doesn't own) the global test part result reporter.
+  TestPartResultReporterInterface* global_test_part_result_repoter_;
+
+  // Protects read and write access to global_test_part_result_reporter_.
+  internal::Mutex global_test_part_result_reporter_mutex_;
+
+  // Points to (but doesn't own) the per-thread test part result reporter.
+  internal::ThreadLocal<TestPartResultReporterInterface*>
+      per_thread_test_part_result_reporter_;
+
+  // The vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*> environments_;
+
+  // The vector of TestSuites in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestSuite*> test_suites_;
+
+  // Provides a level of indirection for the test suite list to allow
+  // easy shuffling and restoring the test suite order.  The i-th
+  // element of this vector is the index of the i-th test suite in the
+  // shuffled order.
+  std::vector<int> test_suite_indices_;
+
+  // ParameterizedTestRegistry object used to register value-parameterized
+  // tests.
+  internal::ParameterizedTestSuiteRegistry parameterized_test_registry_;
+  internal::TypeParameterizedTestSuiteRegistry
+      type_parameterized_test_registry_;
+
+  // The set holding the name of parameterized
+  // test suites that may go uninstantiated.
+  std::set<std::string> ignored_parameterized_test_suites_;
+
+  // Indicates whether RegisterParameterizedTests() has been called already.
+  bool parameterized_tests_registered_;
+
+  // Index of the last death test suite registered.  Initially -1.
+  int last_death_test_suite_;
+
+  // This points to the TestSuite for the currently running test.  It
+  // changes as Google Test goes through one test suite after another.
+  // When no test is running, this is set to NULL and Google Test
+  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestSuite* current_test_suite_;
+
+  // This points to the TestInfo for the currently running test.  It
+  // changes as Google Test goes through one test after another.  When
+  // no test is running, this is set to NULL and Google Test stores
+  // assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestInfo* current_test_info_;
+
+  // Normally, a user only writes assertions inside a TEST or TEST_F,
+  // or inside a function called by a TEST or TEST_F.  Since Google
+  // Test keeps track of which test is current running, it can
+  // associate such an assertion with the test it belongs to.
+  //
+  // If an assertion is encountered when no TEST or TEST_F is running,
+  // Google Test attributes the assertion result to an imaginary "ad hoc"
+  // test, and records the result in ad_hoc_test_result_.
+  TestResult ad_hoc_test_result_;
+
+  // The list of event listeners that can be used to track events inside
+  // Google Test.
+  TestEventListeners listeners_;
+
+  // The OS stack trace getter.  Will be deleted when the UnitTest
+  // object is destructed.  By default, an OsStackTraceGetter is used,
+  // but the user can set this field to use a custom getter if that is
+  // desired.
+  OsStackTraceGetterInterface* os_stack_trace_getter_;
+
+  // True if and only if PostFlagParsingInit() has been called.
+  bool post_flag_parse_init_performed_;
+
+  // The random number seed used at the beginning of the test run.
+  int random_seed_;
+
+  // Our random number generator.
+  internal::Random random_;
+
+  // The time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp_;
+
+  // How long the test took to run, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+#if GTEST_HAS_DEATH_TEST
+  // The decomposed components of the gtest_internal_run_death_test flag,
+  // parsed when RUN_ALL_TESTS is called.
+  std::unique_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
+  std::unique_ptr<internal::DeathTestFactory> death_test_factory_;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
+  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
+
+  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
+  // starts.
+  bool catch_exceptions_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
+};  // class UnitTestImpl
+
+// Convenience function for accessing the global UnitTest
+// implementation object.
+inline UnitTestImpl* GetUnitTestImpl() {
+  return UnitTest::GetInstance()->impl();
+}
+
+#if GTEST_USES_SIMPLE_RE
+
+// Internal helper functions for implementing the simple regular
+// expression matcher.
+GTEST_API_ bool IsInSet(char ch, const char* str);
+GTEST_API_ bool IsAsciiDigit(char ch);
+GTEST_API_ bool IsAsciiPunct(char ch);
+GTEST_API_ bool IsRepeat(char ch);
+GTEST_API_ bool IsAsciiWhiteSpace(char ch);
+GTEST_API_ bool IsAsciiWordChar(char ch);
+GTEST_API_ bool IsValidEscape(char ch);
+GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
+GTEST_API_ bool ValidateRegex(const char* regex);
+GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
+GTEST_API_ bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char ch, char repeat, const char* regex, const char* str);
+GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
+
+#endif  // GTEST_USES_SIMPLE_RE
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
+
+#if GTEST_HAS_DEATH_TEST
+
+// Returns the message describing the last system error, regardless of the
+// platform.
+GTEST_API_ std::string GetLastErrnoDescription();
+
+// Attempts to parse a string into a positive integer pointed to by the
+// number parameter.  Returns true if that is possible.
+// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
+// it here.
+template <typename Integer>
+bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
+  // Fail fast if the given string does not begin with a digit;
+  // this bypasses strtoXXX's "optional leading whitespace and plus
+  // or minus sign" semantics, which are undesirable here.
+  if (str.empty() || !IsDigit(str[0])) {
+    return false;
+  }
+  errno = 0;
+
+  char* end;
+  // BiggestConvertible is the largest integer type that system-provided
+  // string-to-number conversion routines can return.
+  using BiggestConvertible = unsigned long long;  // NOLINT
+
+  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);  // NOLINT
+  const bool parse_success = *end == '\0' && errno == 0;
+
+  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
+
+  const Integer result = static_cast<Integer>(parsed);
+  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
+    *number = result;
+    return true;
+  }
+  return false;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// TestResult contains some private methods that should be hidden from
+// Google Test user but are required for testing. This class allow our tests
+// to access them.
+//
+// This class is supplied only for the purpose of testing Google Test's own
+// constructs. Do not use it in user tests, either directly or indirectly.
+class TestResultAccessor {
+ public:
+  static void RecordProperty(TestResult* test_result,
+                             const std::string& xml_element,
+                             const TestProperty& property) {
+    test_result->RecordProperty(xml_element, property);
+  }
+
+  static void ClearTestPartResults(TestResult* test_result) {
+    test_result->ClearTestPartResults();
+  }
+
+  static const std::vector<testing::TestPartResult>& test_part_results(
+      const TestResult& test_result) {
+    return test_result.test_part_results();
+  }
+};
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Streams test results to the given port on the given host machine.
+class StreamingListener : public EmptyTestEventListener {
+ public:
+  // Abstract base class for writing strings to a socket.
+  class AbstractSocketWriter {
+   public:
+    virtual ~AbstractSocketWriter() {}
+
+    // Sends a string to the socket.
+    virtual void Send(const std::string& message) = 0;
+
+    // Closes the socket.
+    virtual void CloseConnection() {}
+
+    // Sends a string and a newline to the socket.
+    void SendLn(const std::string& message) { Send(message + "\n"); }
+  };
+
+  // Concrete class for actually writing strings to a socket.
+  class SocketWriter : public AbstractSocketWriter {
+   public:
+    SocketWriter(const std::string& host, const std::string& port)
+        : sockfd_(-1), host_name_(host), port_num_(port) {
+      MakeConnection();
+    }
+
+    ~SocketWriter() override {
+      if (sockfd_ != -1)
+        CloseConnection();
+    }
+
+    // Sends a string to the socket.
+    void Send(const std::string& message) override {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "Send() can be called only when there is a connection.";
+
+      const auto len = static_cast<size_t>(message.length());
+      if (write(sockfd_, message.c_str(), len) != static_cast<ssize_t>(len)) {
+        GTEST_LOG_(WARNING)
+            << "stream_result_to: failed to stream to "
+            << host_name_ << ":" << port_num_;
+      }
+    }
+
+   private:
+    // Creates a client socket and connects to the server.
+    void MakeConnection();
+
+    // Closes the socket.
+    void CloseConnection() override {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "CloseConnection() can be called only when there is a connection.";
+
+      close(sockfd_);
+      sockfd_ = -1;
+    }
+
+    int sockfd_;  // socket file descriptor
+    const std::string host_name_;
+    const std::string port_num_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
+  };  // class SocketWriter
+
+  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
+  static std::string UrlEncode(const char* str);
+
+  StreamingListener(const std::string& host, const std::string& port)
+      : socket_writer_(new SocketWriter(host, port)) {
+    Start();
+  }
+
+  explicit StreamingListener(AbstractSocketWriter* socket_writer)
+      : socket_writer_(socket_writer) { Start(); }
+
+  void OnTestProgramStart(const UnitTest& /* unit_test */) override {
+    SendLn("event=TestProgramStart");
+  }
+
+  void OnTestProgramEnd(const UnitTest& unit_test) override {
+    // Note that Google Test current only report elapsed time for each
+    // test iteration, not for the entire test program.
+    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
+
+    // Notify the streaming server to stop.
+    socket_writer_->CloseConnection();
+  }
+
+  void OnTestIterationStart(const UnitTest& /* unit_test */,
+                            int iteration) override {
+    SendLn("event=TestIterationStart&iteration=" +
+           StreamableToString(iteration));
+  }
+
+  void OnTestIterationEnd(const UnitTest& unit_test,
+                          int /* iteration */) override {
+    SendLn("event=TestIterationEnd&passed=" +
+           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
+           StreamableToString(unit_test.elapsed_time()) + "ms");
+  }
+
+  // Note that "event=TestCaseStart" is a wire format and has to remain
+  // "case" for compatibility
+  void OnTestCaseStart(const TestCase& test_case) override {
+    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
+  }
+
+  // Note that "event=TestCaseEnd" is a wire format and has to remain
+  // "case" for compatibility
+  void OnTestCaseEnd(const TestCase& test_case) override {
+    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) +
+           "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) +
+           "ms");
+  }
+
+  void OnTestStart(const TestInfo& test_info) override {
+    SendLn(std::string("event=TestStart&name=") + test_info.name());
+  }
+
+  void OnTestEnd(const TestInfo& test_info) override {
+    SendLn("event=TestEnd&passed=" +
+           FormatBool((test_info.result())->Passed()) +
+           "&elapsed_time=" +
+           StreamableToString((test_info.result())->elapsed_time()) + "ms");
+  }
+
+  void OnTestPartResult(const TestPartResult& test_part_result) override {
+    const char* file_name = test_part_result.file_name();
+    if (file_name == nullptr) file_name = "";
+    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
+           "&line=" + StreamableToString(test_part_result.line_number()) +
+           "&message=" + UrlEncode(test_part_result.message()));
+  }
+
+ private:
+  // Sends the given message and a newline to the socket.
+  void SendLn(const std::string& message) { socket_writer_->SendLn(message); }
+
+  // Called at the start of streaming to notify the receiver what
+  // protocol we are using.
+  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
+
+  std::string FormatBool(bool value) { return value ? "1" : "0"; }
+
+  const std::unique_ptr<AbstractSocketWriter> socket_writer_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
+};  // class StreamingListener
+
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+}  // namespace internal
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
+
+#if GTEST_OS_WINDOWS
+# define vsnprintf _vsnprintf
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_MAC
+#ifndef GTEST_OS_IOS
+#include <crt_externs.h>
+#endif
+#endif
+
+#if GTEST_HAS_ABSL
+#include "absl/debugging/failure_signal_handler.h"
+#include "absl/debugging/stacktrace.h"
+#include "absl/debugging/symbolize.h"
+#include "absl/strings/str_cat.h"
+#endif  // GTEST_HAS_ABSL
+
+namespace testing {
+
+using internal::CountIf;
+using internal::ForEach;
+using internal::GetElementOr;
+using internal::Shuffle;
+
+// Constants.
+
+// A test whose test suite name or test name matches this filter is
+// disabled and not run.
+static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
+
+// A test suite whose name matches this filter is considered a death
+// test suite and will be run before test suites whose name doesn't
+// match this filter.
+static const char kDeathTestSuiteFilter[] = "*DeathTest:*DeathTest/*";
+
+// A test filter that matches everything.
+static const char kUniversalFilter[] = "*";
+
+// The default output format.
+static const char kDefaultOutputFormat[] = "xml";
+// The default output file.
+static const char kDefaultOutputFile[] = "test_detail";
+
+// The environment variable name for the test shard index.
+static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
+// The environment variable name for the total number of test shards.
+static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
+// The environment variable name for the test shard status file.
+static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
+
+namespace internal {
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+const char kStackTraceMarker[] = "\nStack trace:\n";
+
+// g_help_flag is true if and only if the --help flag or an equivalent form
+// is specified on the command line.
+bool g_help_flag = false;
+
+// Utilty function to Open File for Writing
+static FILE* OpenFileForWriting(const std::string& output_file) {
+  FILE* fileout = nullptr;
+  FilePath output_file_path(output_file);
+  FilePath output_dir(output_file_path.RemoveFileName());
+
+  if (output_dir.CreateDirectoriesRecursively()) {
+    fileout = posix::FOpen(output_file.c_str(), "w");
+  }
+  if (fileout == nullptr) {
+    GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file << "\"";
+  }
+  return fileout;
+}
+
+}  // namespace internal
+
+// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY
+// environment variable.
+static const char* GetDefaultFilter() {
+  const char* const testbridge_test_only =
+      internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY");
+  if (testbridge_test_only != nullptr) {
+    return testbridge_test_only;
+  }
+  return kUniversalFilter;
+}
+
+// Bazel passes in the argument to '--test_runner_fail_fast' via the
+// TESTBRIDGE_TEST_RUNNER_FAIL_FAST environment variable.
+static bool GetDefaultFailFast() {
+  const char* const testbridge_test_runner_fail_fast =
+      internal::posix::GetEnv("TESTBRIDGE_TEST_RUNNER_FAIL_FAST");
+  if (testbridge_test_runner_fail_fast != nullptr) {
+    return strcmp(testbridge_test_runner_fail_fast, "1") == 0;
+  }
+  return false;
+}
+
+GTEST_DEFINE_bool_(
+    fail_fast, internal::BoolFromGTestEnv("fail_fast", GetDefaultFailFast()),
+    "True if and only if a test failure should stop further test execution.");
+
+GTEST_DEFINE_bool_(
+    also_run_disabled_tests,
+    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
+    "Run disabled tests too, in addition to the tests normally being run.");
+
+GTEST_DEFINE_bool_(
+    break_on_failure, internal::BoolFromGTestEnv("break_on_failure", false),
+    "True if and only if a failed assertion should be a debugger "
+    "break-point.");
+
+GTEST_DEFINE_bool_(catch_exceptions,
+                   internal::BoolFromGTestEnv("catch_exceptions", true),
+                   "True if and only if " GTEST_NAME_
+                   " should catch exceptions and treat them as test failures.");
+
+GTEST_DEFINE_string_(
+    color,
+    internal::StringFromGTestEnv("color", "auto"),
+    "Whether to use colors in the output.  Valid values: yes, no, "
+    "and auto.  'auto' means to use colors if the output is "
+    "being sent to a terminal and the TERM environment variable "
+    "is set to a terminal type that supports colors.");
+
+GTEST_DEFINE_string_(
+    filter,
+    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
+    "A colon-separated list of glob (not regex) patterns "
+    "for filtering the tests to run, optionally followed by a "
+    "'-' and a : separated list of negative patterns (tests to "
+    "exclude).  A test is run if it matches one of the positive "
+    "patterns and does not match any of the negative patterns.");
+
+GTEST_DEFINE_bool_(
+    install_failure_signal_handler,
+    internal::BoolFromGTestEnv("install_failure_signal_handler", false),
+    "If true and supported on the current platform, " GTEST_NAME_ " should "
+    "install a signal handler that dumps debugging information when fatal "
+    "signals are raised.");
+
+GTEST_DEFINE_bool_(list_tests, false,
+                   "List all tests without running them.");
+
+// The net priority order after flag processing is thus:
+//   --gtest_output command line flag
+//   GTEST_OUTPUT environment variable
+//   XML_OUTPUT_FILE environment variable
+//   ''
+GTEST_DEFINE_string_(
+    output,
+    internal::StringFromGTestEnv("output",
+      internal::OutputFlagAlsoCheckEnvVar().c_str()),
+    "A format (defaults to \"xml\" but can be specified to be \"json\"), "
+    "optionally followed by a colon and an output file name or directory. "
+    "A directory is indicated by a trailing pathname separator. "
+    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
+    "If a directory is specified, output files will be created "
+    "within that directory, with file-names based on the test "
+    "executable's name and, if necessary, made unique by adding "
+    "digits.");
+
+GTEST_DEFINE_bool_(
+    brief, internal::BoolFromGTestEnv("brief", false),
+    "True if only test failures should be displayed in text output.");
+
+GTEST_DEFINE_bool_(print_time, internal::BoolFromGTestEnv("print_time", true),
+                   "True if and only if " GTEST_NAME_
+                   " should display elapsed time in text output.");
+
+GTEST_DEFINE_bool_(print_utf8, internal::BoolFromGTestEnv("print_utf8", true),
+                   "True if and only if " GTEST_NAME_
+                   " prints UTF8 characters as text.");
+
+GTEST_DEFINE_int32_(
+    random_seed,
+    internal::Int32FromGTestEnv("random_seed", 0),
+    "Random number seed to use when shuffling test orders.  Must be in range "
+    "[1, 99999], or 0 to use a seed based on the current time.");
+
+GTEST_DEFINE_int32_(
+    repeat,
+    internal::Int32FromGTestEnv("repeat", 1),
+    "How many times to repeat each test.  Specify a negative number "
+    "for repeating forever.  Useful for shaking out flaky tests.");
+
+GTEST_DEFINE_bool_(show_internal_stack_frames, false,
+                   "True if and only if " GTEST_NAME_
+                   " should include internal stack frames when "
+                   "printing test failure stack traces.");
+
+GTEST_DEFINE_bool_(shuffle, internal::BoolFromGTestEnv("shuffle", false),
+                   "True if and only if " GTEST_NAME_
+                   " should randomize tests' order on every run.");
+
+GTEST_DEFINE_int32_(
+    stack_trace_depth,
+    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
+    "The maximum number of stack frames to print when an "
+    "assertion fails.  The valid range is 0 through 100, inclusive.");
+
+GTEST_DEFINE_string_(
+    stream_result_to,
+    internal::StringFromGTestEnv("stream_result_to", ""),
+    "This flag specifies the host name and the port number on which to stream "
+    "test results. Example: \"localhost:555\". The flag is effective only on "
+    "Linux.");
+
+GTEST_DEFINE_bool_(
+    throw_on_failure,
+    internal::BoolFromGTestEnv("throw_on_failure", false),
+    "When this flag is specified, a failed assertion will throw an exception "
+    "if exceptions are enabled or exit the program with a non-zero code "
+    "otherwise. For use with an external test framework.");
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+GTEST_DEFINE_string_(
+    flagfile,
+    internal::StringFromGTestEnv("flagfile", ""),
+    "This flag specifies the flagfile to read command-line flags from.");
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+namespace internal {
+
+// Generates a random number from [0, range), using a Linear
+// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
+// than kMaxRange.
+uint32_t Random::Generate(uint32_t range) {
+  // These constants are the same as are used in glibc's rand(3).
+  // Use wider types than necessary to prevent unsigned overflow diagnostics.
+  state_ = static_cast<uint32_t>(1103515245ULL*state_ + 12345U) % kMaxRange;
+
+  GTEST_CHECK_(range > 0)
+      << "Cannot generate a number in the range [0, 0).";
+  GTEST_CHECK_(range <= kMaxRange)
+      << "Generation of a number in [0, " << range << ") was requested, "
+      << "but this can only generate numbers in [0, " << kMaxRange << ").";
+
+  // Converting via modulus introduces a bit of downward bias, but
+  // it's simple, and a linear congruential generator isn't too good
+  // to begin with.
+  return state_ % range;
+}
+
+// GTestIsInitialized() returns true if and only if the user has initialized
+// Google Test.  Useful for catching the user mistake of not initializing
+// Google Test before calling RUN_ALL_TESTS().
+static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
+
+// Iterates over a vector of TestSuites, keeping a running sum of the
+// results of calling a given int-returning method on each.
+// Returns the sum.
+static int SumOverTestSuiteList(const std::vector<TestSuite*>& case_list,
+                                int (TestSuite::*method)() const) {
+  int sum = 0;
+  for (size_t i = 0; i < case_list.size(); i++) {
+    sum += (case_list[i]->*method)();
+  }
+  return sum;
+}
+
+// Returns true if and only if the test suite passed.
+static bool TestSuitePassed(const TestSuite* test_suite) {
+  return test_suite->should_run() && test_suite->Passed();
+}
+
+// Returns true if and only if the test suite failed.
+static bool TestSuiteFailed(const TestSuite* test_suite) {
+  return test_suite->should_run() && test_suite->Failed();
+}
+
+// Returns true if and only if test_suite contains at least one test that
+// should run.
+static bool ShouldRunTestSuite(const TestSuite* test_suite) {
+  return test_suite->should_run();
+}
+
+// AssertHelper constructor.
+AssertHelper::AssertHelper(TestPartResult::Type type,
+                           const char* file,
+                           int line,
+                           const char* message)
+    : data_(new AssertHelperData(type, file, line, message)) {
+}
+
+AssertHelper::~AssertHelper() {
+  delete data_;
+}
+
+// Message assignment, for assertion streaming support.
+void AssertHelper::operator=(const Message& message) const {
+  UnitTest::GetInstance()->
+    AddTestPartResult(data_->type, data_->file, data_->line,
+                      AppendUserMessage(data_->message, message),
+                      UnitTest::GetInstance()->impl()
+                      ->CurrentOsStackTraceExceptTop(1)
+                      // Skips the stack frame for this function itself.
+                      );  // NOLINT
+}
+
+namespace {
+
+// When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P
+// to creates test cases for it, a synthetic test case is
+// inserted to report ether an error or a log message.
+//
+// This configuration bit will likely be removed at some point.
+constexpr bool kErrorOnUninstantiatedParameterizedTest = true;
+constexpr bool kErrorOnUninstantiatedTypeParameterizedTest = true;
+
+// A test that fails at a given file/line location with a given message.
+class FailureTest : public Test {
+ public:
+  explicit FailureTest(const CodeLocation& loc, std::string error_message,
+                       bool as_error)
+      : loc_(loc),
+        error_message_(std::move(error_message)),
+        as_error_(as_error) {}
+
+  void TestBody() override {
+    if (as_error_) {
+      AssertHelper(TestPartResult::kNonFatalFailure, loc_.file.c_str(),
+                   loc_.line, "") = Message() << error_message_;
+    } else {
+      std::cout << error_message_ << std::endl;
+    }
+  }
+
+ private:
+  const CodeLocation loc_;
+  const std::string error_message_;
+  const bool as_error_;
+};
+
+
+}  // namespace
+
+std::set<std::string>* GetIgnoredParameterizedTestSuites() {
+  return UnitTest::GetInstance()->impl()->ignored_parameterized_test_suites();
+}
+
+// Add a given test_suit to the list of them allow to go un-instantiated.
+MarkAsIgnored::MarkAsIgnored(const char* test_suite) {
+  GetIgnoredParameterizedTestSuites()->insert(test_suite);
+}
+
+// If this parameterized test suite has no instantiations (and that
+// has not been marked as okay), emit a test case reporting that.
+void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
+                             bool has_test_p) {
+  const auto& ignored = *GetIgnoredParameterizedTestSuites();
+  if (ignored.find(name) != ignored.end()) return;
+
+  const char kMissingInstantiation[] =  //
+      " is defined via TEST_P, but never instantiated. None of the test cases "
+      "will run. Either no INSTANTIATE_TEST_SUITE_P is provided or the only "
+      "ones provided expand to nothing."
+      "\n\n"
+      "Ideally, TEST_P definitions should only ever be included as part of "
+      "binaries that intend to use them. (As opposed to, for example, being "
+      "placed in a library that may be linked in to get other utilities.)";
+
+  const char kMissingTestCase[] =  //
+      " is instantiated via INSTANTIATE_TEST_SUITE_P, but no tests are "
+      "defined via TEST_P . No test cases will run."
+      "\n\n"
+      "Ideally, INSTANTIATE_TEST_SUITE_P should only ever be invoked from "
+      "code that always depend on code that provides TEST_P. Failing to do "
+      "so is often an indication of dead code, e.g. the last TEST_P was "
+      "removed but the rest got left behind.";
+
+  std::string message =
+      "Parameterized test suite " + name +
+      (has_test_p ? kMissingInstantiation : kMissingTestCase) +
+      "\n\n"
+      "To suppress this error for this test suite, insert the following line "
+      "(in a non-header) in the namespace it is defined in:"
+      "\n\n"
+      "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");";
+
+  std::string full_name = "UninstantiatedParameterizedTestSuite<" + name + ">";
+  RegisterTest(  //
+      "GoogleTestVerification", full_name.c_str(),
+      nullptr,  // No type parameter.
+      nullptr,  // No value parameter.
+      location.file.c_str(), location.line, [message, location] {
+        return new FailureTest(location, message,
+                               kErrorOnUninstantiatedParameterizedTest);
+      });
+}
+
+void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
+                                        CodeLocation code_location) {
+  GetUnitTestImpl()->type_parameterized_test_registry().RegisterTestSuite(
+      test_suite_name, code_location);
+}
+
+void RegisterTypeParameterizedTestSuiteInstantiation(const char* case_name) {
+  GetUnitTestImpl()
+      ->type_parameterized_test_registry()
+      .RegisterInstantiation(case_name);
+}
+
+void TypeParameterizedTestSuiteRegistry::RegisterTestSuite(
+    const char* test_suite_name, CodeLocation code_location) {
+  suites_.emplace(std::string(test_suite_name),
+                 TypeParameterizedTestSuiteInfo(code_location));
+}
+
+void TypeParameterizedTestSuiteRegistry::RegisterInstantiation(
+        const char* test_suite_name) {
+  auto it = suites_.find(std::string(test_suite_name));
+  if (it != suites_.end()) {
+    it->second.instantiated = true;
+  } else {
+    GTEST_LOG_(ERROR) << "Unknown type parameterized test suit '"
+                      << test_suite_name << "'";
+  }
+}
+
+void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
+  const auto& ignored = *GetIgnoredParameterizedTestSuites();
+  for (const auto& testcase : suites_) {
+    if (testcase.second.instantiated) continue;
+    if (ignored.find(testcase.first) != ignored.end()) continue;
+
+    std::string message =
+        "Type parameterized test suite " + testcase.first +
+        " is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated "
+        "via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run."
+        "\n\n"
+        "Ideally, TYPED_TEST_P definitions should only ever be included as "
+        "part of binaries that intend to use them. (As opposed to, for "
+        "example, being placed in a library that may be linked in to get other "
+        "utilities.)"
+        "\n\n"
+        "To suppress this error for this test suite, insert the following line "
+        "(in a non-header) in the namespace it is defined in:"
+        "\n\n"
+        "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" +
+        testcase.first + ");";
+
+    std::string full_name =
+        "UninstantiatedTypeParameterizedTestSuite<" + testcase.first + ">";
+    RegisterTest(  //
+        "GoogleTestVerification", full_name.c_str(),
+        nullptr,  // No type parameter.
+        nullptr,  // No value parameter.
+        testcase.second.code_location.file.c_str(),
+        testcase.second.code_location.line, [message, testcase] {
+          return new FailureTest(testcase.second.code_location, message,
+                                 kErrorOnUninstantiatedTypeParameterizedTest);
+        });
+  }
+}
+
+// A copy of all command line arguments.  Set by InitGoogleTest().
+static ::std::vector<std::string> g_argvs;
+
+::std::vector<std::string> GetArgvs() {
+#if defined(GTEST_CUSTOM_GET_ARGVS_)
+  // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or
+  // ::string. This code converts it to the appropriate type.
+  const auto& custom = GTEST_CUSTOM_GET_ARGVS_();
+  return ::std::vector<std::string>(custom.begin(), custom.end());
+#else   // defined(GTEST_CUSTOM_GET_ARGVS_)
+  return g_argvs;
+#endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
+}
+
+// Returns the current application's name, removing directory path if that
+// is present.
+FilePath GetCurrentExecutableName() {
+  FilePath result;
+
+#if GTEST_OS_WINDOWS || GTEST_OS_OS2
+  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
+#else
+  result.Set(FilePath(GetArgvs()[0]));
+#endif  // GTEST_OS_WINDOWS
+
+  return result.RemoveDirectoryName();
+}
+
+// Functions for processing the gtest_output flag.
+
+// Returns the output format, or "" for normal printed output.
+std::string UnitTestOptions::GetOutputFormat() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  const char* const colon = strchr(gtest_output_flag, ':');
+  return (colon == nullptr)
+             ? std::string(gtest_output_flag)
+             : std::string(gtest_output_flag,
+                           static_cast<size_t>(colon - gtest_output_flag));
+}
+
+// Returns the name of the requested output file, or the default if none
+// was explicitly specified.
+std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+
+  std::string format = GetOutputFormat();
+  if (format.empty())
+    format = std::string(kDefaultOutputFormat);
+
+  const char* const colon = strchr(gtest_output_flag, ':');
+  if (colon == nullptr)
+    return internal::FilePath::MakeFileName(
+        internal::FilePath(
+            UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(kDefaultOutputFile), 0,
+        format.c_str()).string();
+
+  internal::FilePath output_name(colon + 1);
+  if (!output_name.IsAbsolutePath())
+    output_name = internal::FilePath::ConcatPaths(
+        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(colon + 1));
+
+  if (!output_name.IsDirectory())
+    return output_name.string();
+
+  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
+      output_name, internal::GetCurrentExecutableName(),
+      GetOutputFormat().c_str()));
+  return result.string();
+}
+
+// Returns true if and only if the wildcard pattern matches the string. Each
+// pattern consists of regular characters, single-character wildcards (?), and
+// multi-character wildcards (*).
+//
+// This function implements a linear-time string globbing algorithm based on
+// https://research.swtch.com/glob.
+static bool PatternMatchesString(const std::string& name_str,
+                                 const char* pattern, const char* pattern_end) {
+  const char* name = name_str.c_str();
+  const char* const name_begin = name;
+  const char* const name_end = name + name_str.size();
+
+  const char* pattern_next = pattern;
+  const char* name_next = name;
+
+  while (pattern < pattern_end || name < name_end) {
+    if (pattern < pattern_end) {
+      switch (*pattern) {
+        default:  // Match an ordinary character.
+          if (name < name_end && *name == *pattern) {
+            ++pattern;
+            ++name;
+            continue;
+          }
+          break;
+        case '?':  // Match any single character.
+          if (name < name_end) {
+            ++pattern;
+            ++name;
+            continue;
+          }
+          break;
+        case '*':
+          // Match zero or more characters. Start by skipping over the wildcard
+          // and matching zero characters from name. If that fails, restart and
+          // match one more character than the last attempt.
+          pattern_next = pattern;
+          name_next = name + 1;
+          ++pattern;
+          continue;
+      }
+    }
+    // Failed to match a character. Restart if possible.
+    if (name_begin < name_next && name_next <= name_end) {
+      pattern = pattern_next;
+      name = name_next;
+      continue;
+    }
+    return false;
+  }
+  return true;
+}
+
+bool UnitTestOptions::MatchesFilter(const std::string& name_str,
+                                    const char* filter) {
+  // The filter is a list of patterns separated by colons (:).
+  const char* pattern = filter;
+  while (true) {
+    // Find the bounds of this pattern.
+    const char* const next_sep = strchr(pattern, ':');
+    const char* const pattern_end =
+        next_sep != nullptr ? next_sep : pattern + strlen(pattern);
+
+    // Check if this pattern matches name_str.
+    if (PatternMatchesString(name_str, pattern, pattern_end)) {
+      return true;
+    }
+
+    // Give up on this pattern. However, if we found a pattern separator (:),
+    // advance to the next pattern (skipping over the separator) and restart.
+    if (next_sep == nullptr) {
+      return false;
+    }
+    pattern = next_sep + 1;
+  }
+  return true;
+}
+
+// Returns true if and only if the user-specified filter matches the test
+// suite name and the test name.
+bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
+                                        const std::string& test_name) {
+  const std::string& full_name = test_suite_name + "." + test_name.c_str();
+
+  // Split --gtest_filter at '-', if there is one, to separate into
+  // positive filter and negative filter portions
+  const char* const p = GTEST_FLAG(filter).c_str();
+  const char* const dash = strchr(p, '-');
+  std::string positive;
+  std::string negative;
+  if (dash == nullptr) {
+    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
+    negative = "";
+  } else {
+    positive = std::string(p, dash);   // Everything up to the dash
+    negative = std::string(dash + 1);  // Everything after the dash
+    if (positive.empty()) {
+      // Treat '-test1' as the same as '*-test1'
+      positive = kUniversalFilter;
+    }
+  }
+
+  // A filter is a colon-separated list of patterns.  It matches a
+  // test if any pattern in it matches the test.
+  return (MatchesFilter(full_name, positive.c_str()) &&
+          !MatchesFilter(full_name, negative.c_str()));
+}
+
+#if GTEST_HAS_SEH
+// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+// This function is useful as an __except condition.
+int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
+  // Google Test should handle a SEH exception if:
+  //   1. the user wants it to, AND
+  //   2. this is not a breakpoint exception, AND
+  //   3. this is not a C++ exception (VC++ implements them via SEH,
+  //      apparently).
+  //
+  // SEH exception code for C++ exceptions.
+  // (see http://support.microsoft.com/kb/185294 for more information).
+  const DWORD kCxxExceptionCode = 0xe06d7363;
+
+  bool should_handle = true;
+
+  if (!GTEST_FLAG(catch_exceptions))
+    should_handle = false;
+  else if (exception_code == EXCEPTION_BREAKPOINT)
+    should_handle = false;
+  else if (exception_code == kCxxExceptionCode)
+    should_handle = false;
+
+  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
+}
+#endif  // GTEST_HAS_SEH
+
+}  // namespace internal
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results. Intercepts only failures from the current thread.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    TestPartResultArray* result)
+    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
+      result_(result) {
+  Init();
+}
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    InterceptMode intercept_mode, TestPartResultArray* result)
+    : intercept_mode_(intercept_mode),
+      result_(result) {
+  Init();
+}
+
+void ScopedFakeTestPartResultReporter::Init() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    old_reporter_ = impl->GetGlobalTestPartResultReporter();
+    impl->SetGlobalTestPartResultReporter(this);
+  } else {
+    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
+    impl->SetTestPartResultReporterForCurrentThread(this);
+  }
+}
+
+// The d'tor restores the test part result reporter used by Google Test
+// before.
+ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    impl->SetGlobalTestPartResultReporter(old_reporter_);
+  } else {
+    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
+  }
+}
+
+// Increments the test part result count and remembers the result.
+// This method is from the TestPartResultReporterInterface interface.
+void ScopedFakeTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  result_->Append(result);
+}
+
+namespace internal {
+
+// Returns the type ID of ::testing::Test.  We should always call this
+// instead of GetTypeId< ::testing::Test>() to get the type ID of
+// testing::Test.  This is to work around a suspected linker bug when
+// using Google Test as a framework on Mac OS X.  The bug causes
+// GetTypeId< ::testing::Test>() to return different values depending
+// on whether the call is from the Google Test framework itself or
+// from user test code.  GetTestTypeId() is guaranteed to always
+// return the same value, as it always calls GetTypeId<>() from the
+// gtest.cc, which is within the Google Test framework.
+TypeId GetTestTypeId() {
+  return GetTypeId<Test>();
+}
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
+
+// This predicate-formatter checks that 'results' contains a test part
+// failure of the given type and that the failure message contains the
+// given substring.
+static AssertionResult HasOneFailure(const char* /* results_expr */,
+                                     const char* /* type_expr */,
+                                     const char* /* substr_expr */,
+                                     const TestPartResultArray& results,
+                                     TestPartResult::Type type,
+                                     const std::string& substr) {
+  const std::string expected(type == TestPartResult::kFatalFailure ?
+                        "1 fatal failure" :
+                        "1 non-fatal failure");
+  Message msg;
+  if (results.size() != 1) {
+    msg << "Expected: " << expected << "\n"
+        << "  Actual: " << results.size() << " failures";
+    for (int i = 0; i < results.size(); i++) {
+      msg << "\n" << results.GetTestPartResult(i);
+    }
+    return AssertionFailure() << msg;
+  }
+
+  const TestPartResult& r = results.GetTestPartResult(0);
+  if (r.type() != type) {
+    return AssertionFailure() << "Expected: " << expected << "\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  if (strstr(r.message(), substr.c_str()) == nullptr) {
+    return AssertionFailure() << "Expected: " << expected << " containing \""
+                              << substr << "\"\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  return AssertionSuccess();
+}
+
+// The constructor of SingleFailureChecker remembers where to look up
+// test part results, what type of failure we expect, and what
+// substring the failure message should contain.
+SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results,
+                                           TestPartResult::Type type,
+                                           const std::string& substr)
+    : results_(results), type_(type), substr_(substr) {}
+
+// The destructor of SingleFailureChecker verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+SingleFailureChecker::~SingleFailureChecker() {
+  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
+}
+
+DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->current_test_result()->AddTestPartResult(result);
+  unit_test_->listeners()->repeater()->OnTestPartResult(result);
+}
+
+DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
+}
+
+// Returns the global test part result reporter.
+TestPartResultReporterInterface*
+UnitTestImpl::GetGlobalTestPartResultReporter() {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  return global_test_part_result_repoter_;
+}
+
+// Sets the global test part result reporter.
+void UnitTestImpl::SetGlobalTestPartResultReporter(
+    TestPartResultReporterInterface* reporter) {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  global_test_part_result_repoter_ = reporter;
+}
+
+// Returns the test part result reporter for the current thread.
+TestPartResultReporterInterface*
+UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
+  return per_thread_test_part_result_reporter_.get();
+}
+
+// Sets the test part result reporter for the current thread.
+void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
+    TestPartResultReporterInterface* reporter) {
+  per_thread_test_part_result_reporter_.set(reporter);
+}
+
+// Gets the number of successful test suites.
+int UnitTestImpl::successful_test_suite_count() const {
+  return CountIf(test_suites_, TestSuitePassed);
+}
+
+// Gets the number of failed test suites.
+int UnitTestImpl::failed_test_suite_count() const {
+  return CountIf(test_suites_, TestSuiteFailed);
+}
+
+// Gets the number of all test suites.
+int UnitTestImpl::total_test_suite_count() const {
+  return static_cast<int>(test_suites_.size());
+}
+
+// Gets the number of all test suites that contain at least one test
+// that should run.
+int UnitTestImpl::test_suite_to_run_count() const {
+  return CountIf(test_suites_, ShouldRunTestSuite);
+}
+
+// Gets the number of successful tests.
+int UnitTestImpl::successful_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::successful_test_count);
+}
+
+// Gets the number of skipped tests.
+int UnitTestImpl::skipped_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::skipped_test_count);
+}
+
+// Gets the number of failed tests.
+int UnitTestImpl::failed_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::failed_test_count);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTestImpl::reportable_disabled_test_count() const {
+  return SumOverTestSuiteList(test_suites_,
+                              &TestSuite::reportable_disabled_test_count);
+}
+
+// Gets the number of disabled tests.
+int UnitTestImpl::disabled_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::disabled_test_count);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTestImpl::reportable_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::reportable_test_count);
+}
+
+// Gets the number of all tests.
+int UnitTestImpl::total_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::total_test_count);
+}
+
+// Gets the number of tests that should run.
+int UnitTestImpl::test_to_run_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::test_to_run_count);
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
+  return os_stack_trace_getter()->CurrentStackTrace(
+      static_cast<int>(GTEST_FLAG(stack_trace_depth)),
+      skip_count + 1
+      // Skips the user-specified number of frames plus this function
+      // itself.
+      );  // NOLINT
+}
+
+// A helper class for measuring elapsed times.
+class Timer {
+ public:
+  Timer() : start_(std::chrono::steady_clock::now()) {}
+
+  // Return time elapsed in milliseconds since the timer was created.
+  TimeInMillis Elapsed() {
+    return std::chrono::duration_cast<std::chrono::milliseconds>(
+               std::chrono::steady_clock::now() - start_)
+        .count();
+  }
+
+ private:
+  std::chrono::steady_clock::time_point start_;
+};
+
+// Returns a timestamp as milliseconds since the epoch. Note this time may jump
+// around subject to adjustments by the system, to measure elapsed time use
+// Timer instead.
+TimeInMillis GetTimeInMillis() {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::system_clock::now() -
+             std::chrono::system_clock::from_time_t(0))
+      .count();
+}
+
+// Utilities
+
+// class String.
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Creates a UTF-16 wide string from the given ANSI string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the wide string, or NULL if the
+// input is NULL.
+LPCWSTR String::AnsiToUtf16(const char* ansi) {
+  if (!ansi) return nullptr;
+  const int length = strlen(ansi);
+  const int unicode_length =
+      MultiByteToWideChar(CP_ACP, 0, ansi, length, nullptr, 0);
+  WCHAR* unicode = new WCHAR[unicode_length + 1];
+  MultiByteToWideChar(CP_ACP, 0, ansi, length,
+                      unicode, unicode_length);
+  unicode[unicode_length] = 0;
+  return unicode;
+}
+
+// Creates an ANSI string from the given wide string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the ANSI string, or NULL if the
+// input is NULL.
+const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
+  if (!utf16_str) return nullptr;
+  const int ansi_length = WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, nullptr,
+                                              0, nullptr, nullptr);
+  char* ansi = new char[ansi_length + 1];
+  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, ansi, ansi_length, nullptr,
+                      nullptr);
+  ansi[ansi_length] = 0;
+  return ansi;
+}
+
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Compares two C strings.  Returns true if and only if they have the same
+// content.
+//
+// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CStringEquals(const char * lhs, const char * rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+
+  if (rhs == nullptr) return false;
+
+  return strcmp(lhs, rhs) == 0;
+}
+
+#if GTEST_HAS_STD_WSTRING
+
+// Converts an array of wide chars to a narrow string using the UTF-8
+// encoding, and streams the result to the given Message object.
+static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
+                                     Message* msg) {
+  for (size_t i = 0; i != length; ) {  // NOLINT
+    if (wstr[i] != L'\0') {
+      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
+      while (i != length && wstr[i] != L'\0')
+        i++;
+    } else {
+      *msg << '\0';
+      i++;
+    }
+  }
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+void SplitString(const ::std::string& str, char delimiter,
+                 ::std::vector< ::std::string>* dest) {
+  ::std::vector< ::std::string> parsed;
+  ::std::string::size_type pos = 0;
+  while (::testing::internal::AlwaysTrue()) {
+    const ::std::string::size_type colon = str.find(delimiter, pos);
+    if (colon == ::std::string::npos) {
+      parsed.push_back(str.substr(pos));
+      break;
+    } else {
+      parsed.push_back(str.substr(pos, colon - pos));
+      pos = colon + 1;
+    }
+  }
+  dest->swap(parsed);
+}
+
+}  // namespace internal
+
+// Constructs an empty Message.
+// We allocate the stringstream separately because otherwise each use of
+// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
+// stack frame leading to huge stack frames in some cases; gcc does not reuse
+// the stack space.
+Message::Message() : ss_(new ::std::stringstream) {
+  // By default, we want there to be enough precision when printing
+  // a double to a Message.
+  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
+}
+
+// These two overloads allow streaming a wide C string to a Message
+// using the UTF-8 encoding.
+Message& Message::operator <<(const wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+Message& Message::operator <<(wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+
+#if GTEST_HAS_STD_WSTRING
+// Converts the given wide string to a narrow string using the UTF-8
+// encoding, and streams the result to this Message object.
+Message& Message::operator <<(const ::std::wstring& wstr) {
+  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
+  return *this;
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Gets the text streamed to this object so far as an std::string.
+// Each '\0' character in the buffer is replaced with "\\0".
+std::string Message::GetString() const {
+  return internal::StringStreamToString(ss_.get());
+}
+
+// AssertionResult constructors.
+// Used in EXPECT_TRUE/FALSE(assertion_result).
+AssertionResult::AssertionResult(const AssertionResult& other)
+    : success_(other.success_),
+      message_(other.message_.get() != nullptr
+                   ? new ::std::string(*other.message_)
+                   : static_cast< ::std::string*>(nullptr)) {}
+
+// Swaps two AssertionResults.
+void AssertionResult::swap(AssertionResult& other) {
+  using std::swap;
+  swap(success_, other.success_);
+  swap(message_, other.message_);
+}
+
+// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+AssertionResult AssertionResult::operator!() const {
+  AssertionResult negation(!success_);
+  if (message_.get() != nullptr) negation << *message_;
+  return negation;
+}
+
+// Makes a successful assertion result.
+AssertionResult AssertionSuccess() {
+  return AssertionResult(true);
+}
+
+// Makes a failed assertion result.
+AssertionResult AssertionFailure() {
+  return AssertionResult(false);
+}
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << message.
+AssertionResult AssertionFailure(const Message& message) {
+  return AssertionFailure() << message;
+}
+
+namespace internal {
+
+namespace edit_distance {
+std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
+                                            const std::vector<size_t>& right) {
+  std::vector<std::vector<double> > costs(
+      left.size() + 1, std::vector<double>(right.size() + 1));
+  std::vector<std::vector<EditType> > best_move(
+      left.size() + 1, std::vector<EditType>(right.size() + 1));
+
+  // Populate for empty right.
+  for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
+    costs[l_i][0] = static_cast<double>(l_i);
+    best_move[l_i][0] = kRemove;
+  }
+  // Populate for empty left.
+  for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
+    costs[0][r_i] = static_cast<double>(r_i);
+    best_move[0][r_i] = kAdd;
+  }
+
+  for (size_t l_i = 0; l_i < left.size(); ++l_i) {
+    for (size_t r_i = 0; r_i < right.size(); ++r_i) {
+      if (left[l_i] == right[r_i]) {
+        // Found a match. Consume it.
+        costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
+        best_move[l_i + 1][r_i + 1] = kMatch;
+        continue;
+      }
+
+      const double add = costs[l_i + 1][r_i];
+      const double remove = costs[l_i][r_i + 1];
+      const double replace = costs[l_i][r_i];
+      if (add < remove && add < replace) {
+        costs[l_i + 1][r_i + 1] = add + 1;
+        best_move[l_i + 1][r_i + 1] = kAdd;
+      } else if (remove < add && remove < replace) {
+        costs[l_i + 1][r_i + 1] = remove + 1;
+        best_move[l_i + 1][r_i + 1] = kRemove;
+      } else {
+        // We make replace a little more expensive than add/remove to lower
+        // their priority.
+        costs[l_i + 1][r_i + 1] = replace + 1.00001;
+        best_move[l_i + 1][r_i + 1] = kReplace;
+      }
+    }
+  }
+
+  // Reconstruct the best path. We do it in reverse order.
+  std::vector<EditType> best_path;
+  for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
+    EditType move = best_move[l_i][r_i];
+    best_path.push_back(move);
+    l_i -= move != kAdd;
+    r_i -= move != kRemove;
+  }
+  std::reverse(best_path.begin(), best_path.end());
+  return best_path;
+}
+
+namespace {
+
+// Helper class to convert string into ids with deduplication.
+class InternalStrings {
+ public:
+  size_t GetId(const std::string& str) {
+    IdMap::iterator it = ids_.find(str);
+    if (it != ids_.end()) return it->second;
+    size_t id = ids_.size();
+    return ids_[str] = id;
+  }
+
+ private:
+  typedef std::map<std::string, size_t> IdMap;
+  IdMap ids_;
+};
+
+}  // namespace
+
+std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<std::string>& left,
+    const std::vector<std::string>& right) {
+  std::vector<size_t> left_ids, right_ids;
+  {
+    InternalStrings intern_table;
+    for (size_t i = 0; i < left.size(); ++i) {
+      left_ids.push_back(intern_table.GetId(left[i]));
+    }
+    for (size_t i = 0; i < right.size(); ++i) {
+      right_ids.push_back(intern_table.GetId(right[i]));
+    }
+  }
+  return CalculateOptimalEdits(left_ids, right_ids);
+}
+
+namespace {
+
+// Helper class that holds the state for one hunk and prints it out to the
+// stream.
+// It reorders adds/removes when possible to group all removes before all
+// adds. It also adds the hunk header before printint into the stream.
+class Hunk {
+ public:
+  Hunk(size_t left_start, size_t right_start)
+      : left_start_(left_start),
+        right_start_(right_start),
+        adds_(),
+        removes_(),
+        common_() {}
+
+  void PushLine(char edit, const char* line) {
+    switch (edit) {
+      case ' ':
+        ++common_;
+        FlushEdits();
+        hunk_.push_back(std::make_pair(' ', line));
+        break;
+      case '-':
+        ++removes_;
+        hunk_removes_.push_back(std::make_pair('-', line));
+        break;
+      case '+':
+        ++adds_;
+        hunk_adds_.push_back(std::make_pair('+', line));
+        break;
+    }
+  }
+
+  void PrintTo(std::ostream* os) {
+    PrintHeader(os);
+    FlushEdits();
+    for (std::list<std::pair<char, const char*> >::const_iterator it =
+             hunk_.begin();
+         it != hunk_.end(); ++it) {
+      *os << it->first << it->second << "\n";
+    }
+  }
+
+  bool has_edits() const { return adds_ || removes_; }
+
+ private:
+  void FlushEdits() {
+    hunk_.splice(hunk_.end(), hunk_removes_);
+    hunk_.splice(hunk_.end(), hunk_adds_);
+  }
+
+  // Print a unified diff header for one hunk.
+  // The format is
+  //   "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
+  // where the left/right parts are omitted if unnecessary.
+  void PrintHeader(std::ostream* ss) const {
+    *ss << "@@ ";
+    if (removes_) {
+      *ss << "-" << left_start_ << "," << (removes_ + common_);
+    }
+    if (removes_ && adds_) {
+      *ss << " ";
+    }
+    if (adds_) {
+      *ss << "+" << right_start_ << "," << (adds_ + common_);
+    }
+    *ss << " @@\n";
+  }
+
+  size_t left_start_, right_start_;
+  size_t adds_, removes_, common_;
+  std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
+};
+
+}  // namespace
+
+// Create a list of diff hunks in Unified diff format.
+// Each hunk has a header generated by PrintHeader above plus a body with
+// lines prefixed with ' ' for no change, '-' for deletion and '+' for
+// addition.
+// 'context' represents the desired unchanged prefix/suffix around the diff.
+// If two hunks are close enough that their contexts overlap, then they are
+// joined into one hunk.
+std::string CreateUnifiedDiff(const std::vector<std::string>& left,
+                              const std::vector<std::string>& right,
+                              size_t context) {
+  const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
+
+  size_t l_i = 0, r_i = 0, edit_i = 0;
+  std::stringstream ss;
+  while (edit_i < edits.size()) {
+    // Find first edit.
+    while (edit_i < edits.size() && edits[edit_i] == kMatch) {
+      ++l_i;
+      ++r_i;
+      ++edit_i;
+    }
+
+    // Find the first line to include in the hunk.
+    const size_t prefix_context = std::min(l_i, context);
+    Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
+    for (size_t i = prefix_context; i > 0; --i) {
+      hunk.PushLine(' ', left[l_i - i].c_str());
+    }
+
+    // Iterate the edits until we found enough suffix for the hunk or the input
+    // is over.
+    size_t n_suffix = 0;
+    for (; edit_i < edits.size(); ++edit_i) {
+      if (n_suffix >= context) {
+        // Continue only if the next hunk is very close.
+        auto it = edits.begin() + static_cast<int>(edit_i);
+        while (it != edits.end() && *it == kMatch) ++it;
+        if (it == edits.end() ||
+            static_cast<size_t>(it - edits.begin()) - edit_i >= context) {
+          // There is no next edit or it is too far away.
+          break;
+        }
+      }
+
+      EditType edit = edits[edit_i];
+      // Reset count when a non match is found.
+      n_suffix = edit == kMatch ? n_suffix + 1 : 0;
+
+      if (edit == kMatch || edit == kRemove || edit == kReplace) {
+        hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
+      }
+      if (edit == kAdd || edit == kReplace) {
+        hunk.PushLine('+', right[r_i].c_str());
+      }
+
+      // Advance indices, depending on edit type.
+      l_i += edit != kAdd;
+      r_i += edit != kRemove;
+    }
+
+    if (!hunk.has_edits()) {
+      // We are done. We don't want this hunk.
+      break;
+    }
+
+    hunk.PrintTo(&ss);
+  }
+  return ss.str();
+}
+
+}  // namespace edit_distance
+
+namespace {
+
+// The string representation of the values received in EqFailure() are already
+// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
+// characters the same.
+std::vector<std::string> SplitEscapedString(const std::string& str) {
+  std::vector<std::string> lines;
+  size_t start = 0, end = str.size();
+  if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
+    ++start;
+    --end;
+  }
+  bool escaped = false;
+  for (size_t i = start; i + 1 < end; ++i) {
+    if (escaped) {
+      escaped = false;
+      if (str[i] == 'n') {
+        lines.push_back(str.substr(start, i - start - 1));
+        start = i + 1;
+      }
+    } else {
+      escaped = str[i] == '\\';
+    }
+  }
+  lines.push_back(str.substr(start, end - start));
+  return lines;
+}
+
+}  // namespace
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   lhs_expression: "foo"
+//   rhs_expression: "bar"
+//   lhs_value:      "5"
+//   rhs_value:      "6"
+//
+// The ignoring_case parameter is true if and only if the assertion is a
+// *_STRCASEEQ*.  When it's true, the string "Ignoring case" will
+// be inserted into the message.
+AssertionResult EqFailure(const char* lhs_expression,
+                          const char* rhs_expression,
+                          const std::string& lhs_value,
+                          const std::string& rhs_value,
+                          bool ignoring_case) {
+  Message msg;
+  msg << "Expected equality of these values:";
+  msg << "\n  " << lhs_expression;
+  if (lhs_value != lhs_expression) {
+    msg << "\n    Which is: " << lhs_value;
+  }
+  msg << "\n  " << rhs_expression;
+  if (rhs_value != rhs_expression) {
+    msg << "\n    Which is: " << rhs_value;
+  }
+
+  if (ignoring_case) {
+    msg << "\nIgnoring case";
+  }
+
+  if (!lhs_value.empty() && !rhs_value.empty()) {
+    const std::vector<std::string> lhs_lines =
+        SplitEscapedString(lhs_value);
+    const std::vector<std::string> rhs_lines =
+        SplitEscapedString(rhs_value);
+    if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
+      msg << "\nWith diff:\n"
+          << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
+    }
+  }
+
+  return AssertionFailure() << msg;
+}
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value) {
+  const char* actual_message = assertion_result.message();
+  Message msg;
+  msg << "Value of: " << expression_text
+      << "\n  Actual: " << actual_predicate_value;
+  if (actual_message[0] != '\0')
+    msg << " (" << actual_message << ")";
+  msg << "\nExpected: " << expected_predicate_value;
+  return msg.GetString();
+}
+
+// Helper function for implementing ASSERT_NEAR.
+AssertionResult DoubleNearPredFormat(const char* expr1,
+                                     const char* expr2,
+                                     const char* abs_error_expr,
+                                     double val1,
+                                     double val2,
+                                     double abs_error) {
+  const double diff = fabs(val1 - val2);
+  if (diff <= abs_error) return AssertionSuccess();
+
+  // Find the value which is closest to zero.
+  const double min_abs = std::min(fabs(val1), fabs(val2));
+  // Find the distance to the next double from that value.
+  const double epsilon =
+      nextafter(min_abs, std::numeric_limits<double>::infinity()) - min_abs;
+  // Detect the case where abs_error is so small that EXPECT_NEAR is
+  // effectively the same as EXPECT_EQUAL, and give an informative error
+  // message so that the situation can be more easily understood without
+  // requiring exotic floating-point knowledge.
+  // Don't do an epsilon check if abs_error is zero because that implies
+  // that an equality check was actually intended.
+  if (!(std::isnan)(val1) && !(std::isnan)(val2) && abs_error > 0 &&
+      abs_error < epsilon) {
+    return AssertionFailure()
+           << "The difference between " << expr1 << " and " << expr2 << " is "
+           << diff << ", where\n"
+           << expr1 << " evaluates to " << val1 << ",\n"
+           << expr2 << " evaluates to " << val2 << ".\nThe abs_error parameter "
+           << abs_error_expr << " evaluates to " << abs_error
+           << " which is smaller than the minimum distance between doubles for "
+              "numbers of this magnitude which is "
+           << epsilon
+           << ", thus making this EXPECT_NEAR check equivalent to "
+              "EXPECT_EQUAL. Consider using EXPECT_DOUBLE_EQ instead.";
+  }
+  return AssertionFailure()
+      << "The difference between " << expr1 << " and " << expr2
+      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
+      << expr1 << " evaluates to " << val1 << ",\n"
+      << expr2 << " evaluates to " << val2 << ", and\n"
+      << abs_error_expr << " evaluates to " << abs_error << ".";
+}
+
+
+// Helper template for implementing FloatLE() and DoubleLE().
+template <typename RawType>
+AssertionResult FloatingPointLE(const char* expr1,
+                                const char* expr2,
+                                RawType val1,
+                                RawType val2) {
+  // Returns success if val1 is less than val2,
+  if (val1 < val2) {
+    return AssertionSuccess();
+  }
+
+  // or if val1 is almost equal to val2.
+  const FloatingPoint<RawType> lhs(val1), rhs(val2);
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  // Note that the above two checks will both fail if either val1 or
+  // val2 is NaN, as the IEEE floating-point standard requires that
+  // any predicate involving a NaN must return false.
+
+  ::std::stringstream val1_ss;
+  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val1;
+
+  ::std::stringstream val2_ss;
+  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val2;
+
+  return AssertionFailure()
+      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
+      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
+      << StringStreamToString(&val2_ss);
+}
+
+}  // namespace internal
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult FloatLE(const char* expr1, const char* expr2,
+                        float val1, float val2) {
+  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
+}
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                         double val1, double val2) {
+  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
+}
+
+namespace internal {
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
+                               const char* rhs_expression,
+                               const char* lhs,
+                               const char* rhs) {
+  if (String::CStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   false);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
+                                   const char* rhs_expression,
+                                   const char* lhs,
+                                   const char* rhs) {
+  if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   true);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const char* s1,
+                               const char* s2) {
+  if (!String::CStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                              << s2_expression << "), actual: \""
+                              << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                   const char* s2_expression,
+                                   const char* s1,
+                                   const char* s2) {
+  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure()
+        << "Expected: (" << s1_expression << ") != ("
+        << s2_expression << ") (ignoring case), actual: \""
+        << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+}  // namespace internal
+
+namespace {
+
+// Helper functions for implementing IsSubString() and IsNotSubstring().
+
+// This group of overloaded functions return true if and only if needle
+// is a substring of haystack.  NULL is considered a substring of
+// itself only.
+
+bool IsSubstringPred(const char* needle, const char* haystack) {
+  if (needle == nullptr || haystack == nullptr) return needle == haystack;
+
+  return strstr(haystack, needle) != nullptr;
+}
+
+bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
+  if (needle == nullptr || haystack == nullptr) return needle == haystack;
+
+  return wcsstr(haystack, needle) != nullptr;
+}
+
+// StringType here can be either ::std::string or ::std::wstring.
+template <typename StringType>
+bool IsSubstringPred(const StringType& needle,
+                     const StringType& haystack) {
+  return haystack.find(needle) != StringType::npos;
+}
+
+// This function implements either IsSubstring() or IsNotSubstring(),
+// depending on the value of the expected_to_be_substring parameter.
+// StringType here can be const char*, const wchar_t*, ::std::string,
+// or ::std::wstring.
+template <typename StringType>
+AssertionResult IsSubstringImpl(
+    bool expected_to_be_substring,
+    const char* needle_expr, const char* haystack_expr,
+    const StringType& needle, const StringType& haystack) {
+  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
+    return AssertionSuccess();
+
+  const bool is_wide_string = sizeof(needle[0]) > 1;
+  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
+  return AssertionFailure()
+      << "Value of: " << needle_expr << "\n"
+      << "  Actual: " << begin_string_quote << needle << "\"\n"
+      << "Expected: " << (expected_to_be_substring ? "" : "not ")
+      << "a substring of " << haystack_expr << "\n"
+      << "Which is: " << begin_string_quote << haystack << "\"";
+}
+
+}  // namespace
+
+// IsSubstring() and IsNotSubstring() check whether needle is a
+// substring of haystack (NULL is considered a substring of itself
+// only), and return an appropriate error message when they fail.
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+#if GTEST_HAS_STD_WSTRING
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+
+namespace {
+
+// Helper function for IsHRESULT{SuccessFailure} predicates
+AssertionResult HRESULTFailureHelper(const char* expr,
+                                     const char* expected,
+                                     long hr) {  // NOLINT
+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
+
+  // Windows CE doesn't support FormatMessage.
+  const char error_text[] = "";
+
+# else
+
+  // Looks up the human-readable system message for the HRESULT code
+  // and since we're not passing any params to FormatMessage, we don't
+  // want inserts expanded.
+  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS;
+  const DWORD kBufSize = 4096;
+  // Gets the system's human readable message string for this HRESULT.
+  char error_text[kBufSize] = { '\0' };
+  DWORD message_length = ::FormatMessageA(kFlags,
+                                          0,   // no source, we're asking system
+                                          static_cast<DWORD>(hr),  // the error
+                                          0,   // no line width restrictions
+                                          error_text,  // output buffer
+                                          kBufSize,    // buf size
+                                          nullptr);  // no arguments for inserts
+  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
+  for (; message_length && IsSpace(error_text[message_length - 1]);
+          --message_length) {
+    error_text[message_length - 1] = '\0';
+  }
+
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+  const std::string error_hex("0x" + String::FormatHexInt(hr));
+  return ::testing::AssertionFailure()
+      << "Expected: " << expr << " " << expected << ".\n"
+      << "  Actual: " << error_hex << " " << error_text << "\n";
+}
+
+}  // namespace
+
+AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
+  if (SUCCEEDED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "succeeds", hr);
+}
+
+AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
+  if (FAILED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "fails", hr);
+}
+
+#endif  // GTEST_OS_WINDOWS
+
+// Utility functions for encoding Unicode text (wide strings) in
+// UTF-8.
+
+// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
+// like this:
+//
+// Code-point length   Encoding
+//   0 -  7 bits       0xxxxxxx
+//   8 - 11 bits       110xxxxx 10xxxxxx
+//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
+//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+
+// The maximum code-point a one-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint1 = (static_cast<uint32_t>(1) <<  7) - 1;
+
+// The maximum code-point a two-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint2 = (static_cast<uint32_t>(1) << (5 + 6)) - 1;
+
+// The maximum code-point a three-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint3 = (static_cast<uint32_t>(1) << (4 + 2*6)) - 1;
+
+// The maximum code-point a four-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint4 = (static_cast<uint32_t>(1) << (3 + 3*6)) - 1;
+
+// Chops off the n lowest bits from a bit pattern.  Returns the n
+// lowest bits.  As a side effect, the original bit pattern will be
+// shifted to the right by n bits.
+inline uint32_t ChopLowBits(uint32_t* bits, int n) {
+  const uint32_t low_bits = *bits & ((static_cast<uint32_t>(1) << n) - 1);
+  *bits >>= n;
+  return low_bits;
+}
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type uint32_t because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+std::string CodePointToUtf8(uint32_t code_point) {
+  if (code_point > kMaxCodePoint4) {
+    return "(Invalid Unicode 0x" + String::FormatHexUInt32(code_point) + ")";
+  }
+
+  char str[5];  // Big enough for the largest valid code point.
+  if (code_point <= kMaxCodePoint1) {
+    str[1] = '\0';
+    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
+  } else if (code_point <= kMaxCodePoint2) {
+    str[2] = '\0';
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
+  } else if (code_point <= kMaxCodePoint3) {
+    str[3] = '\0';
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
+  } else {  // code_point <= kMaxCodePoint4
+    str[4] = '\0';
+    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
+  }
+  return str;
+}
+
+// The following two functions only make sense if the system
+// uses UTF-16 for wide string encoding. All supported systems
+// with 16 bit wchar_t (Windows, Cygwin) do use UTF-16.
+
+// Determines if the arguments constitute UTF-16 surrogate pair
+// and thus should be combined into a single Unicode code point
+// using CreateCodePointFromUtf16SurrogatePair.
+inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
+  return sizeof(wchar_t) == 2 &&
+      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
+}
+
+// Creates a Unicode code point from UTF16 surrogate pair.
+inline uint32_t CreateCodePointFromUtf16SurrogatePair(wchar_t first,
+                                                      wchar_t second) {
+  const auto first_u = static_cast<uint32_t>(first);
+  const auto second_u = static_cast<uint32_t>(second);
+  const uint32_t mask = (1 << 10) - 1;
+  return (sizeof(wchar_t) == 2)
+             ? (((first_u & mask) << 10) | (second_u & mask)) + 0x10000
+             :
+             // This function should not be called when the condition is
+             // false, but we provide a sensible default in case it is.
+             first_u;
+}
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
+  if (num_chars == -1)
+    num_chars = static_cast<int>(wcslen(str));
+
+  ::std::stringstream stream;
+  for (int i = 0; i < num_chars; ++i) {
+    uint32_t unicode_code_point;
+
+    if (str[i] == L'\0') {
+      break;
+    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
+      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
+                                                                 str[i + 1]);
+      i++;
+    } else {
+      unicode_code_point = static_cast<uint32_t>(str[i]);
+    }
+
+    stream << CodePointToUtf8(unicode_code_point);
+  }
+  return StringStreamToString(&stream);
+}
+
+// Converts a wide C string to an std::string using the UTF-8 encoding.
+// NULL will be converted to "(null)".
+std::string String::ShowWideCString(const wchar_t * wide_c_str) {
+  if (wide_c_str == nullptr) return "(null)";
+
+  return internal::WideStringToUtf8(wide_c_str, -1);
+}
+
+// Compares two wide C strings.  Returns true if and only if they have the
+// same content.
+//
+// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+
+  if (rhs == nullptr) return false;
+
+  return wcscmp(lhs, rhs) == 0;
+}
+
+// Helper function for *_STREQ on wide strings.
+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
+                               const char* rhs_expression,
+                               const wchar_t* lhs,
+                               const wchar_t* rhs) {
+  if (String::WideCStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   false);
+}
+
+// Helper function for *_STRNE on wide strings.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const wchar_t* s1,
+                               const wchar_t* s2) {
+  if (!String::WideCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  }
+
+  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                            << s2_expression << "), actual: "
+                            << PrintToString(s1)
+                            << " vs " << PrintToString(s2);
+}
+
+// Compares two C strings, ignoring case.  Returns true if and only if they have
+// the same content.
+//
+// Unlike strcasecmp(), this function can handle NULL argument(s).  A
+// NULL C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+  if (rhs == nullptr) return false;
+  return posix::StrCaseCmp(lhs, rhs) == 0;
+}
+
+// Compares two wide C strings, ignoring case.  Returns true if and only if they
+// have the same content.
+//
+// Unlike wcscasecmp(), this function can handle NULL argument(s).
+// A NULL C string is considered different to any non-NULL wide C string,
+// including the empty string.
+// NB: The implementations on different platforms slightly differ.
+// On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+// environment variable. On GNU platform this method uses wcscasecmp
+// which compares according to LC_CTYPE category of the current locale.
+// On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+// current locale.
+bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                              const wchar_t* rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+
+  if (rhs == nullptr) return false;
+
+#if GTEST_OS_WINDOWS
+  return _wcsicmp(lhs, rhs) == 0;
+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
+  return wcscasecmp(lhs, rhs) == 0;
+#else
+  // Android, Mac OS X and Cygwin don't define wcscasecmp.
+  // Other unknown OSes may not define it either.
+  wint_t left, right;
+  do {
+    left = towlower(static_cast<wint_t>(*lhs++));
+    right = towlower(static_cast<wint_t>(*rhs++));
+  } while (left && left == right);
+  return left == right;
+#endif  // OS selector
+}
+
+// Returns true if and only if str ends with the given suffix, ignoring case.
+// Any string is considered to end with an empty suffix.
+bool String::EndsWithCaseInsensitive(
+    const std::string& str, const std::string& suffix) {
+  const size_t str_len = str.length();
+  const size_t suffix_len = suffix.length();
+  return (str_len >= suffix_len) &&
+         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
+                                      suffix.c_str());
+}
+
+// Formats an int value as "%02d".
+std::string String::FormatIntWidth2(int value) {
+  return FormatIntWidthN(value, 2);
+}
+
+// Formats an int value to given width with leading zeros.
+std::string String::FormatIntWidthN(int value, int width) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(width) << value;
+  return ss.str();
+}
+
+// Formats an int value as "%X".
+std::string String::FormatHexUInt32(uint32_t value) {
+  std::stringstream ss;
+  ss << std::hex << std::uppercase << value;
+  return ss.str();
+}
+
+// Formats an int value as "%X".
+std::string String::FormatHexInt(int value) {
+  return FormatHexUInt32(static_cast<uint32_t>(value));
+}
+
+// Formats a byte as "%02X".
+std::string String::FormatByte(unsigned char value) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
+     << static_cast<unsigned int>(value);
+  return ss.str();
+}
+
+// Converts the buffer in a stringstream to an std::string, converting NUL
+// bytes to "\\0" along the way.
+std::string StringStreamToString(::std::stringstream* ss) {
+  const ::std::string& str = ss->str();
+  const char* const start = str.c_str();
+  const char* const end = start + str.length();
+
+  std::string result;
+  result.reserve(static_cast<size_t>(2 * (end - start)));
+  for (const char* ch = start; ch != end; ++ch) {
+    if (*ch == '\0') {
+      result += "\\0";  // Replaces NUL with "\\0";
+    } else {
+      result += *ch;
+    }
+  }
+
+  return result;
+}
+
+// Appends the user-supplied message to the Google-Test-generated message.
+std::string AppendUserMessage(const std::string& gtest_msg,
+                              const Message& user_msg) {
+  // Appends the user message if it's non-empty.
+  const std::string user_msg_string = user_msg.GetString();
+  if (user_msg_string.empty()) {
+    return gtest_msg;
+  }
+  if (gtest_msg.empty()) {
+    return user_msg_string;
+  }
+  return gtest_msg + "\n" + user_msg_string;
+}
+
+}  // namespace internal
+
+// class TestResult
+
+// Creates an empty TestResult.
+TestResult::TestResult()
+    : death_test_count_(0), start_timestamp_(0), elapsed_time_(0) {}
+
+// D'tor.
+TestResult::~TestResult() {
+}
+
+// Returns the i-th test part result among all the results. i can
+// range from 0 to total_part_count() - 1. If i is not in that range,
+// aborts the program.
+const TestPartResult& TestResult::GetTestPartResult(int i) const {
+  if (i < 0 || i >= total_part_count())
+    internal::posix::Abort();
+  return test_part_results_.at(static_cast<size_t>(i));
+}
+
+// Returns the i-th test property. i can range from 0 to
+// test_property_count() - 1. If i is not in that range, aborts the
+// program.
+const TestProperty& TestResult::GetTestProperty(int i) const {
+  if (i < 0 || i >= test_property_count())
+    internal::posix::Abort();
+  return test_properties_.at(static_cast<size_t>(i));
+}
+
+// Clears the test part results.
+void TestResult::ClearTestPartResults() {
+  test_part_results_.clear();
+}
+
+// Adds a test part result to the list.
+void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
+  test_part_results_.push_back(test_part_result);
+}
+
+// Adds a test property to the list. If a property with the same key as the
+// supplied property is already represented, the value of this test_property
+// replaces the old value for that key.
+void TestResult::RecordProperty(const std::string& xml_element,
+                                const TestProperty& test_property) {
+  if (!ValidateTestProperty(xml_element, test_property)) {
+    return;
+  }
+  internal::MutexLock lock(&test_properties_mutex_);
+  const std::vector<TestProperty>::iterator property_with_matching_key =
+      std::find_if(test_properties_.begin(), test_properties_.end(),
+                   internal::TestPropertyKeyIs(test_property.key()));
+  if (property_with_matching_key == test_properties_.end()) {
+    test_properties_.push_back(test_property);
+    return;
+  }
+  property_with_matching_key->SetValue(test_property.value());
+}
+
+// The list of reserved attributes used in the <testsuites> element of XML
+// output.
+static const char* const kReservedTestSuitesAttributes[] = {
+  "disabled",
+  "errors",
+  "failures",
+  "name",
+  "random_seed",
+  "tests",
+  "time",
+  "timestamp"
+};
+
+// The list of reserved attributes used in the <testsuite> element of XML
+// output.
+static const char* const kReservedTestSuiteAttributes[] = {
+    "disabled", "errors", "failures",  "name",
+    "tests",    "time",   "timestamp", "skipped"};
+
+// The list of reserved attributes used in the <testcase> element of XML output.
+static const char* const kReservedTestCaseAttributes[] = {
+    "classname",   "name", "status", "time",  "type_param",
+    "value_param", "file", "line"};
+
+// Use a slightly different set for allowed output to ensure existing tests can
+// still RecordProperty("result") or "RecordProperty(timestamp")
+static const char* const kReservedOutputTestCaseAttributes[] = {
+    "classname",   "name", "status", "time",   "type_param",
+    "value_param", "file", "line",   "result", "timestamp"};
+
+template <size_t kSize>
+std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
+  return std::vector<std::string>(array, array + kSize);
+}
+
+static std::vector<std::string> GetReservedAttributesForElement(
+    const std::string& xml_element) {
+  if (xml_element == "testsuites") {
+    return ArrayAsVector(kReservedTestSuitesAttributes);
+  } else if (xml_element == "testsuite") {
+    return ArrayAsVector(kReservedTestSuiteAttributes);
+  } else if (xml_element == "testcase") {
+    return ArrayAsVector(kReservedTestCaseAttributes);
+  } else {
+    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
+  }
+  // This code is unreachable but some compilers may not realizes that.
+  return std::vector<std::string>();
+}
+
+// TODO(jdesprez): Merge the two getReserved attributes once skip is improved
+static std::vector<std::string> GetReservedOutputAttributesForElement(
+    const std::string& xml_element) {
+  if (xml_element == "testsuites") {
+    return ArrayAsVector(kReservedTestSuitesAttributes);
+  } else if (xml_element == "testsuite") {
+    return ArrayAsVector(kReservedTestSuiteAttributes);
+  } else if (xml_element == "testcase") {
+    return ArrayAsVector(kReservedOutputTestCaseAttributes);
+  } else {
+    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
+  }
+  // This code is unreachable but some compilers may not realizes that.
+  return std::vector<std::string>();
+}
+
+static std::string FormatWordList(const std::vector<std::string>& words) {
+  Message word_list;
+  for (size_t i = 0; i < words.size(); ++i) {
+    if (i > 0 && words.size() > 2) {
+      word_list << ", ";
+    }
+    if (i == words.size() - 1) {
+      word_list << "and ";
+    }
+    word_list << "'" << words[i] << "'";
+  }
+  return word_list.GetString();
+}
+
+static bool ValidateTestPropertyName(
+    const std::string& property_name,
+    const std::vector<std::string>& reserved_names) {
+  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
+          reserved_names.end()) {
+    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
+                  << " (" << FormatWordList(reserved_names)
+                  << " are reserved by " << GTEST_NAME_ << ")";
+    return false;
+  }
+  return true;
+}
+
+// Adds a failure if the key is a reserved attribute of the element named
+// xml_element.  Returns true if the property is valid.
+bool TestResult::ValidateTestProperty(const std::string& xml_element,
+                                      const TestProperty& test_property) {
+  return ValidateTestPropertyName(test_property.key(),
+                                  GetReservedAttributesForElement(xml_element));
+}
+
+// Clears the object.
+void TestResult::Clear() {
+  test_part_results_.clear();
+  test_properties_.clear();
+  death_test_count_ = 0;
+  elapsed_time_ = 0;
+}
+
+// Returns true off the test part was skipped.
+static bool TestPartSkipped(const TestPartResult& result) {
+  return result.skipped();
+}
+
+// Returns true if and only if the test was skipped.
+bool TestResult::Skipped() const {
+  return !Failed() && CountIf(test_part_results_, TestPartSkipped) > 0;
+}
+
+// Returns true if and only if the test failed.
+bool TestResult::Failed() const {
+  for (int i = 0; i < total_part_count(); ++i) {
+    if (GetTestPartResult(i).failed())
+      return true;
+  }
+  return false;
+}
+
+// Returns true if and only if the test part fatally failed.
+static bool TestPartFatallyFailed(const TestPartResult& result) {
+  return result.fatally_failed();
+}
+
+// Returns true if and only if the test fatally failed.
+bool TestResult::HasFatalFailure() const {
+  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
+}
+
+// Returns true if and only if the test part non-fatally failed.
+static bool TestPartNonfatallyFailed(const TestPartResult& result) {
+  return result.nonfatally_failed();
+}
+
+// Returns true if and only if the test has a non-fatal failure.
+bool TestResult::HasNonfatalFailure() const {
+  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
+}
+
+// Gets the number of all test parts.  This is the sum of the number
+// of successful test parts and the number of failed test parts.
+int TestResult::total_part_count() const {
+  return static_cast<int>(test_part_results_.size());
+}
+
+// Returns the number of the test properties.
+int TestResult::test_property_count() const {
+  return static_cast<int>(test_properties_.size());
+}
+
+// class Test
+
+// Creates a Test object.
+
+// The c'tor saves the states of all flags.
+Test::Test()
+    : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
+}
+
+// The d'tor restores the states of all flags.  The actual work is
+// done by the d'tor of the gtest_flag_saver_ field, and thus not
+// visible here.
+Test::~Test() {
+}
+
+// Sets up the test fixture.
+//
+// A sub-class may override this.
+void Test::SetUp() {
+}
+
+// Tears down the test fixture.
+//
+// A sub-class may override this.
+void Test::TearDown() {
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, const std::string& value) {
+  UnitTest::GetInstance()->RecordProperty(key, value);
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, int value) {
+  Message value_message;
+  value_message << value;
+  RecordProperty(key, value_message.GetString().c_str());
+}
+
+namespace internal {
+
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message) {
+  // This function is a friend of UnitTest and as such has access to
+  // AddTestPartResult.
+  UnitTest::GetInstance()->AddTestPartResult(
+      result_type,
+      nullptr,  // No info about the source file where the exception occurred.
+      -1,       // We have no info on which line caused the exception.
+      message,
+      "");  // No stack trace, either.
+}
+
+}  // namespace internal
+
+// Google Test requires all tests in the same test suite to use the same test
+// fixture class.  This function checks if the current test has the
+// same fixture class as the first test in the current test suite.  If
+// yes, it returns true; otherwise it generates a Google Test failure and
+// returns false.
+bool Test::HasSameFixtureClass() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  const TestSuite* const test_suite = impl->current_test_suite();
+
+  // Info about the first test in the current test suite.
+  const TestInfo* const first_test_info = test_suite->test_info_list()[0];
+  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
+  const char* const first_test_name = first_test_info->name();
+
+  // Info about the current test.
+  const TestInfo* const this_test_info = impl->current_test_info();
+  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
+  const char* const this_test_name = this_test_info->name();
+
+  if (this_fixture_id != first_fixture_id) {
+    // Is the first test defined using TEST?
+    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
+    // Is this test defined using TEST?
+    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
+
+    if (first_is_TEST || this_is_TEST) {
+      // Both TEST and TEST_F appear in same test suite, which is incorrect.
+      // Tell the user how to fix this.
+
+      // Gets the name of the TEST and the name of the TEST_F.  Note
+      // that first_is_TEST and this_is_TEST cannot both be true, as
+      // the fixture IDs are different for the two tests.
+      const char* const TEST_name =
+          first_is_TEST ? first_test_name : this_test_name;
+      const char* const TEST_F_name =
+          first_is_TEST ? this_test_name : first_test_name;
+
+      ADD_FAILURE()
+          << "All tests in the same test suite must use the same test fixture\n"
+          << "class, so mixing TEST_F and TEST in the same test suite is\n"
+          << "illegal.  In test suite " << this_test_info->test_suite_name()
+          << ",\n"
+          << "test " << TEST_F_name << " is defined using TEST_F but\n"
+          << "test " << TEST_name << " is defined using TEST.  You probably\n"
+          << "want to change the TEST to TEST_F or move it to another test\n"
+          << "case.";
+    } else {
+      // Two fixture classes with the same name appear in two different
+      // namespaces, which is not allowed. Tell the user how to fix this.
+      ADD_FAILURE()
+          << "All tests in the same test suite must use the same test fixture\n"
+          << "class.  However, in test suite "
+          << this_test_info->test_suite_name() << ",\n"
+          << "you defined test " << first_test_name << " and test "
+          << this_test_name << "\n"
+          << "using two different test fixture classes.  This can happen if\n"
+          << "the two classes are from different namespaces or translation\n"
+          << "units and have the same name.  You should probably rename one\n"
+          << "of the classes to put the tests into different test suites.";
+    }
+    return false;
+  }
+
+  return true;
+}
+
+#if GTEST_HAS_SEH
+
+// Adds an "exception thrown" fatal failure to the current test.  This
+// function returns its result via an output parameter pointer because VC++
+// prohibits creation of objects with destructors on stack in functions
+// using __try (see error C2712).
+static std::string* FormatSehExceptionMessage(DWORD exception_code,
+                                              const char* location) {
+  Message message;
+  message << "SEH exception with code 0x" << std::setbase(16) <<
+    exception_code << std::setbase(10) << " thrown in " << location << ".";
+
+  return new std::string(message.GetString());
+}
+
+#endif  // GTEST_HAS_SEH
+
+namespace internal {
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Adds an "exception thrown" fatal failure to the current test.
+static std::string FormatCxxExceptionMessage(const char* description,
+                                             const char* location) {
+  Message message;
+  if (description != nullptr) {
+    message << "C++ exception with description \"" << description << "\"";
+  } else {
+    message << "Unknown C++ exception";
+  }
+  message << " thrown in " << location << ".";
+
+  return message.GetString();
+}
+
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result);
+
+GoogleTestFailureException::GoogleTestFailureException(
+    const TestPartResult& failure)
+    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// We put these helper functions in the internal namespace as IBM's xlC
+// compiler rejects the code if they were declared static.
+
+// Runs the given method and handles SEH exceptions it throws, when
+// SEH is supported; returns the 0-value for type Result in case of an
+// SEH exception.  (Microsoft compilers cannot handle SEH and C++
+// exceptions in the same function.  Therefore, we provide a separate
+// wrapper function for handling SEH exceptions.)
+template <class T, typename Result>
+Result HandleSehExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+#if GTEST_HAS_SEH
+  __try {
+    return (object->*method)();
+  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
+      GetExceptionCode())) {
+    // We create the exception message on the heap because VC++ prohibits
+    // creation of objects with destructors on stack in functions using __try
+    // (see error C2712).
+    std::string* exception_message = FormatSehExceptionMessage(
+        GetExceptionCode(), location);
+    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
+                                             *exception_message);
+    delete exception_message;
+    return static_cast<Result>(0);
+  }
+#else
+  (void)location;
+  return (object->*method)();
+#endif  // GTEST_HAS_SEH
+}
+
+// Runs the given method and catches and reports C++ and/or SEH-style
+// exceptions, if they are supported; returns the 0-value for type
+// Result in case of an SEH exception.
+template <class T, typename Result>
+Result HandleExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+  // NOTE: The user code can affect the way in which Google Test handles
+  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
+  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
+  // after the exception is caught and either report or re-throw the
+  // exception based on the flag's value:
+  //
+  // try {
+  //   // Perform the test method.
+  // } catch (...) {
+  //   if (GTEST_FLAG(catch_exceptions))
+  //     // Report the exception as failure.
+  //   else
+  //     throw;  // Re-throws the original exception.
+  // }
+  //
+  // However, the purpose of this flag is to allow the program to drop into
+  // the debugger when the exception is thrown. On most platforms, once the
+  // control enters the catch block, the exception origin information is
+  // lost and the debugger will stop the program at the point of the
+  // re-throw in this function -- instead of at the point of the original
+  // throw statement in the code under test.  For this reason, we perform
+  // the check early, sacrificing the ability to affect Google Test's
+  // exception handling in the method where the exception is thrown.
+  if (internal::GetUnitTestImpl()->catch_exceptions()) {
+#if GTEST_HAS_EXCEPTIONS
+    try {
+      return HandleSehExceptionsInMethodIfSupported(object, method, location);
+    } catch (const AssertionException&) {  // NOLINT
+      // This failure was reported already.
+    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
+      // This exception type can only be thrown by a failed Google
+      // Test assertion with the intention of letting another testing
+      // framework catch it.  Therefore we just re-throw it.
+      throw;
+    } catch (const std::exception& e) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(e.what(), location));
+    } catch (...) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(nullptr, location));
+    }
+    return static_cast<Result>(0);
+#else
+    return HandleSehExceptionsInMethodIfSupported(object, method, location);
+#endif  // GTEST_HAS_EXCEPTIONS
+  } else {
+    return (object->*method)();
+  }
+}
+
+}  // namespace internal
+
+// Runs the test and updates the test result.
+void Test::Run() {
+  if (!HasSameFixtureClass()) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
+  // We will run the test only if SetUp() was successful and didn't call
+  // GTEST_SKIP().
+  if (!HasFatalFailure() && !IsSkipped()) {
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        this, &Test::TestBody, "the test body");
+  }
+
+  // However, we want to clean up as much as possible.  Hence we will
+  // always call TearDown(), even if SetUp() or the test body has
+  // failed.
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &Test::TearDown, "TearDown()");
+}
+
+// Returns true if and only if the current test has a fatal failure.
+bool Test::HasFatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
+}
+
+// Returns true if and only if the current test has a non-fatal failure.
+bool Test::HasNonfatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->
+      HasNonfatalFailure();
+}
+
+// Returns true if and only if the current test was skipped.
+bool Test::IsSkipped() {
+  return internal::GetUnitTestImpl()->current_test_result()->Skipped();
+}
+
+// class TestInfo
+
+// Constructs a TestInfo object. It assumes ownership of the test factory
+// object.
+TestInfo::TestInfo(const std::string& a_test_suite_name,
+                   const std::string& a_name, const char* a_type_param,
+                   const char* a_value_param,
+                   internal::CodeLocation a_code_location,
+                   internal::TypeId fixture_class_id,
+                   internal::TestFactoryBase* factory)
+    : test_suite_name_(a_test_suite_name),
+      name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
+      value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
+      location_(a_code_location),
+      fixture_class_id_(fixture_class_id),
+      should_run_(false),
+      is_disabled_(false),
+      matches_filter_(false),
+      is_in_another_shard_(false),
+      factory_(factory),
+      result_() {}
+
+// Destructs a TestInfo object.
+TestInfo::~TestInfo() { delete factory_; }
+
+namespace internal {
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_suite_name:  name of the test suite
+//   name:             name of the test
+//   type_param:       the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param:      text representation of the test's value parameter,
+//                     or NULL if this is not a value-parameterized test.
+//   code_location:    code location where the test is defined
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test suite
+//   tear_down_tc:     pointer to the function that tears down the test suite
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+TestInfo* MakeAndRegisterTestInfo(
+    const char* test_suite_name, const char* name, const char* type_param,
+    const char* value_param, CodeLocation code_location,
+    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
+    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory) {
+  TestInfo* const test_info =
+      new TestInfo(test_suite_name, name, type_param, value_param,
+                   code_location, fixture_class_id, factory);
+  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
+  return test_info;
+}
+
+void ReportInvalidTestSuiteType(const char* test_suite_name,
+                                CodeLocation code_location) {
+  Message errors;
+  errors
+      << "Attempted redefinition of test suite " << test_suite_name << ".\n"
+      << "All tests in the same test suite must use the same test fixture\n"
+      << "class.  However, in test suite " << test_suite_name << ", you tried\n"
+      << "to define a test using a fixture class different from the one\n"
+      << "used earlier. This can happen if the two fixture classes are\n"
+      << "from different namespaces and have the same name. You should\n"
+      << "probably rename one of the classes to put the tests into different\n"
+      << "test suites.";
+
+  GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(),
+                                          code_location.line)
+                    << " " << errors.GetString();
+}
+}  // namespace internal
+
+namespace {
+
+// A predicate that checks the test name of a TestInfo against a known
+// value.
+//
+// This is used for implementation of the TestSuite class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestNameIs is copyable.
+class TestNameIs {
+ public:
+  // Constructor.
+  //
+  // TestNameIs has NO default constructor.
+  explicit TestNameIs(const char* name)
+      : name_(name) {}
+
+  // Returns true if and only if the test name of test_info matches name_.
+  bool operator()(const TestInfo * test_info) const {
+    return test_info && test_info->name() == name_;
+  }
+
+ private:
+  std::string name_;
+};
+
+}  // namespace
+
+namespace internal {
+
+// This method expands all parameterized tests registered with macros TEST_P
+// and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
+// This will be done just once during the program runtime.
+void UnitTestImpl::RegisterParameterizedTests() {
+  if (!parameterized_tests_registered_) {
+    parameterized_test_registry_.RegisterTests();
+    type_parameterized_test_registry_.CheckForInstantiations();
+    parameterized_tests_registered_ = true;
+  }
+}
+
+}  // namespace internal
+
+// Creates the test object, runs it, records its result, and then
+// deletes it.
+void TestInfo::Run() {
+  if (!should_run_) return;
+
+  // Tells UnitTest where to store test result.
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_info(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Notifies the unit test event listeners that a test is about to start.
+  repeater->OnTestStart(*this);
+
+  result_.set_start_timestamp(internal::GetTimeInMillis());
+  internal::Timer timer;
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+
+  // Creates the test object.
+  Test* const test = internal::HandleExceptionsInMethodIfSupported(
+      factory_, &internal::TestFactoryBase::CreateTest,
+      "the test fixture's constructor");
+
+  // Runs the test if the constructor didn't generate a fatal failure or invoke
+  // GTEST_SKIP().
+  // Note that the object will not be null
+  if (!Test::HasFatalFailure() && !Test::IsSkipped()) {
+    // This doesn't throw as all user code that can throw are wrapped into
+    // exception handling code.
+    test->Run();
+  }
+
+  if (test != nullptr) {
+    // Deletes the test object.
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        test, &Test::DeleteSelf_, "the test fixture's destructor");
+  }
+
+  result_.set_elapsed_time(timer.Elapsed());
+
+  // Notifies the unit test event listener that a test has just finished.
+  repeater->OnTestEnd(*this);
+
+  // Tells UnitTest to stop associating assertion results to this
+  // test.
+  impl->set_current_test_info(nullptr);
+}
+
+// Skip and records a skipped test result for this object.
+void TestInfo::Skip() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_info(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Notifies the unit test event listeners that a test is about to start.
+  repeater->OnTestStart(*this);
+
+  const TestPartResult test_part_result =
+      TestPartResult(TestPartResult::kSkip, this->file(), this->line(), "");
+  impl->GetTestPartResultReporterForCurrentThread()->ReportTestPartResult(
+      test_part_result);
+
+  // Notifies the unit test event listener that a test has just finished.
+  repeater->OnTestEnd(*this);
+  impl->set_current_test_info(nullptr);
+}
+
+// class TestSuite
+
+// Gets the number of successful tests in this test suite.
+int TestSuite::successful_test_count() const {
+  return CountIf(test_info_list_, TestPassed);
+}
+
+// Gets the number of successful tests in this test suite.
+int TestSuite::skipped_test_count() const {
+  return CountIf(test_info_list_, TestSkipped);
+}
+
+// Gets the number of failed tests in this test suite.
+int TestSuite::failed_test_count() const {
+  return CountIf(test_info_list_, TestFailed);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int TestSuite::reportable_disabled_test_count() const {
+  return CountIf(test_info_list_, TestReportableDisabled);
+}
+
+// Gets the number of disabled tests in this test suite.
+int TestSuite::disabled_test_count() const {
+  return CountIf(test_info_list_, TestDisabled);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int TestSuite::reportable_test_count() const {
+  return CountIf(test_info_list_, TestReportable);
+}
+
+// Get the number of tests in this test suite that should run.
+int TestSuite::test_to_run_count() const {
+  return CountIf(test_info_list_, ShouldRunTest);
+}
+
+// Gets the number of all tests.
+int TestSuite::total_test_count() const {
+  return static_cast<int>(test_info_list_.size());
+}
+
+// Creates a TestSuite with the given name.
+//
+// Arguments:
+//
+//   a_name:       name of the test suite
+//   a_type_param: the name of the test suite's type parameter, or NULL if
+//                 this is not a typed or a type-parameterized test suite.
+//   set_up_tc:    pointer to the function that sets up the test suite
+//   tear_down_tc: pointer to the function that tears down the test suite
+TestSuite::TestSuite(const char* a_name, const char* a_type_param,
+                     internal::SetUpTestSuiteFunc set_up_tc,
+                     internal::TearDownTestSuiteFunc tear_down_tc)
+    : name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
+      set_up_tc_(set_up_tc),
+      tear_down_tc_(tear_down_tc),
+      should_run_(false),
+      start_timestamp_(0),
+      elapsed_time_(0) {}
+
+// Destructor of TestSuite.
+TestSuite::~TestSuite() {
+  // Deletes every Test in the collection.
+  ForEach(test_info_list_, internal::Delete<TestInfo>);
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+const TestInfo* TestSuite::GetTestInfo(int i) const {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+TestInfo* TestSuite::GetMutableTestInfo(int i) {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
+}
+
+// Adds a test to this test suite.  Will delete the test upon
+// destruction of the TestSuite object.
+void TestSuite::AddTestInfo(TestInfo* test_info) {
+  test_info_list_.push_back(test_info);
+  test_indices_.push_back(static_cast<int>(test_indices_.size()));
+}
+
+// Runs every test in this TestSuite.
+void TestSuite::Run() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_suite(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteStart(*this);
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseStart(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()");
+
+  start_timestamp_ = internal::GetTimeInMillis();
+  internal::Timer timer;
+  for (int i = 0; i < total_test_count(); i++) {
+    GetMutableTestInfo(i)->Run();
+    if (GTEST_FLAG(fail_fast) && GetMutableTestInfo(i)->result()->Failed()) {
+      for (int j = i + 1; j < total_test_count(); j++) {
+        GetMutableTestInfo(j)->Skip();
+      }
+      break;
+    }
+  }
+  elapsed_time_ = timer.Elapsed();
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestSuite::RunTearDownTestSuite, "TearDownTestSuite()");
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteEnd(*this);
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseEnd(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  impl->set_current_test_suite(nullptr);
+}
+
+// Skips all tests under this TestSuite.
+void TestSuite::Skip() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_suite(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteStart(*this);
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseStart(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  for (int i = 0; i < total_test_count(); i++) {
+    GetMutableTestInfo(i)->Skip();
+  }
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteEnd(*this);
+  // Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseEnd(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  impl->set_current_test_suite(nullptr);
+}
+
+// Clears the results of all tests in this test suite.
+void TestSuite::ClearResult() {
+  ad_hoc_test_result_.Clear();
+  ForEach(test_info_list_, TestInfo::ClearTestResult);
+}
+
+// Shuffles the tests in this test suite.
+void TestSuite::ShuffleTests(internal::Random* random) {
+  Shuffle(random, &test_indices_);
+}
+
+// Restores the test order to before the first shuffle.
+void TestSuite::UnshuffleTests() {
+  for (size_t i = 0; i < test_indices_.size(); i++) {
+    test_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Formats a countable noun.  Depending on its quantity, either the
+// singular form or the plural form is used. e.g.
+//
+// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
+// FormatCountableNoun(5, "book", "books") returns "5 books".
+static std::string FormatCountableNoun(int count,
+                                       const char * singular_form,
+                                       const char * plural_form) {
+  return internal::StreamableToString(count) + " " +
+      (count == 1 ? singular_form : plural_form);
+}
+
+// Formats the count of tests.
+static std::string FormatTestCount(int test_count) {
+  return FormatCountableNoun(test_count, "test", "tests");
+}
+
+// Formats the count of test suites.
+static std::string FormatTestSuiteCount(int test_suite_count) {
+  return FormatCountableNoun(test_suite_count, "test suite", "test suites");
+}
+
+// Converts a TestPartResult::Type enum to human-friendly string
+// representation.  Both kNonFatalFailure and kFatalFailure are translated
+// to "Failure", as the user usually doesn't care about the difference
+// between the two when viewing the test result.
+static const char * TestPartResultTypeToString(TestPartResult::Type type) {
+  switch (type) {
+    case TestPartResult::kSkip:
+      return "Skipped\n";
+    case TestPartResult::kSuccess:
+      return "Success";
+
+    case TestPartResult::kNonFatalFailure:
+    case TestPartResult::kFatalFailure:
+#ifdef _MSC_VER
+      return "error: ";
+#else
+      return "Failure\n";
+#endif
+    default:
+      return "Unknown result type";
+  }
+}
+
+namespace internal {
+namespace {
+enum class GTestColor { kDefault, kRed, kGreen, kYellow };
+}  // namespace
+
+// Prints a TestPartResult to an std::string.
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result) {
+  return (Message()
+          << internal::FormatFileLocation(test_part_result.file_name(),
+                                          test_part_result.line_number())
+          << " " << TestPartResultTypeToString(test_part_result.type())
+          << test_part_result.message()).GetString();
+}
+
+// Prints a TestPartResult.
+static void PrintTestPartResult(const TestPartResult& test_part_result) {
+  const std::string& result =
+      PrintTestPartResultToString(test_part_result);
+  printf("%s\n", result.c_str());
+  fflush(stdout);
+  // If the test program runs in Visual Studio or a debugger, the
+  // following statements add the test part result message to the Output
+  // window such that the user can double-click on it to jump to the
+  // corresponding source code location; otherwise they do nothing.
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  // We don't call OutputDebugString*() on Windows Mobile, as printing
+  // to stdout is done by OutputDebugString() there already - we don't
+  // want the same message printed twice.
+  ::OutputDebugStringA(result.c_str());
+  ::OutputDebugStringA("\n");
+#endif
+}
+
+// class PrettyUnitTestResultPrinter
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
+    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
+
+// Returns the character attribute for the given color.
+static WORD GetColorAttribute(GTestColor color) {
+  switch (color) {
+    case GTestColor::kRed:
+      return FOREGROUND_RED;
+    case GTestColor::kGreen:
+      return FOREGROUND_GREEN;
+    case GTestColor::kYellow:
+      return FOREGROUND_RED | FOREGROUND_GREEN;
+    default:           return 0;
+  }
+}
+
+static int GetBitOffset(WORD color_mask) {
+  if (color_mask == 0) return 0;
+
+  int bitOffset = 0;
+  while ((color_mask & 1) == 0) {
+    color_mask >>= 1;
+    ++bitOffset;
+  }
+  return bitOffset;
+}
+
+static WORD GetNewColor(GTestColor color, WORD old_color_attrs) {
+  // Let's reuse the BG
+  static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN |
+                                      BACKGROUND_RED | BACKGROUND_INTENSITY;
+  static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN |
+                                      FOREGROUND_RED | FOREGROUND_INTENSITY;
+  const WORD existing_bg = old_color_attrs & background_mask;
+
+  WORD new_color =
+      GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY;
+  static const int bg_bitOffset = GetBitOffset(background_mask);
+  static const int fg_bitOffset = GetBitOffset(foreground_mask);
+
+  if (((new_color & background_mask) >> bg_bitOffset) ==
+      ((new_color & foreground_mask) >> fg_bitOffset)) {
+    new_color ^= FOREGROUND_INTENSITY;  // invert intensity
+  }
+  return new_color;
+}
+
+#else
+
+// Returns the ANSI color code for the given color. GTestColor::kDefault is
+// an invalid input.
+static const char* GetAnsiColorCode(GTestColor color) {
+  switch (color) {
+    case GTestColor::kRed:
+      return "1";
+    case GTestColor::kGreen:
+      return "2";
+    case GTestColor::kYellow:
+      return "3";
+    default:
+      return nullptr;
+  }
+}
+
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+
+// Returns true if and only if Google Test should use colors in the output.
+bool ShouldUseColor(bool stdout_is_tty) {
+  const char* const gtest_color = GTEST_FLAG(color).c_str();
+
+  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+    // On Windows the TERM variable is usually not set, but the
+    // console there does support colors.
+    return stdout_is_tty;
+#else
+    // On non-Windows platforms, we rely on the TERM variable.
+    const char* const term = posix::GetEnv("TERM");
+    const bool term_supports_color =
+        String::CStringEquals(term, "xterm") ||
+        String::CStringEquals(term, "xterm-color") ||
+        String::CStringEquals(term, "xterm-256color") ||
+        String::CStringEquals(term, "screen") ||
+        String::CStringEquals(term, "screen-256color") ||
+        String::CStringEquals(term, "tmux") ||
+        String::CStringEquals(term, "tmux-256color") ||
+        String::CStringEquals(term, "rxvt-unicode") ||
+        String::CStringEquals(term, "rxvt-unicode-256color") ||
+        String::CStringEquals(term, "linux") ||
+        String::CStringEquals(term, "cygwin");
+    return stdout_is_tty && term_supports_color;
+#endif  // GTEST_OS_WINDOWS
+  }
+
+  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
+      String::CStringEquals(gtest_color, "1");
+  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
+  // value is neither one of these nor "auto", we treat it as "no" to
+  // be conservative.
+}
+
+// Helpers for printing colored strings to stdout. Note that on Windows, we
+// cannot simply emit special characters and have the terminal change colors.
+// This routine must actually emit the characters rather than return a string
+// that would be colored when printed, as can be done on Linux.
+
+GTEST_ATTRIBUTE_PRINTF_(2, 3)
+static void ColoredPrintf(GTestColor color, const char *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
+    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
+  const bool use_color = AlwaysFalse();
+#else
+  static const bool in_color_mode =
+      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
+  const bool use_color = in_color_mode && (color != GTestColor::kDefault);
+#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS
+
+  if (!use_color) {
+    vprintf(fmt, args);
+    va_end(args);
+    return;
+  }
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
+    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
+  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+  // Gets the current text color.
+  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
+  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
+  const WORD old_color_attrs = buffer_info.wAttributes;
+  const WORD new_color = GetNewColor(color, old_color_attrs);
+
+  // We need to flush the stream buffers into the console before each
+  // SetConsoleTextAttribute call lest it affect the text that is already
+  // printed but has not yet reached the console.
+  fflush(stdout);
+  SetConsoleTextAttribute(stdout_handle, new_color);
+
+  vprintf(fmt, args);
+
+  fflush(stdout);
+  // Restores the text color.
+  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
+#else
+  printf("\033[0;3%sm", GetAnsiColorCode(color));
+  vprintf(fmt, args);
+  printf("\033[m");  // Resets the terminal to default.
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  va_end(args);
+}
+
+// Text printed in Google Test's text output and --gtest_list_tests
+// output to label the type parameter and value parameter for a test.
+static const char kTypeParamLabel[] = "TypeParam";
+static const char kValueParamLabel[] = "GetParam()";
+
+static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
+  const char* const type_param = test_info.type_param();
+  const char* const value_param = test_info.value_param();
+
+  if (type_param != nullptr || value_param != nullptr) {
+    printf(", where ");
+    if (type_param != nullptr) {
+      printf("%s = %s", kTypeParamLabel, type_param);
+      if (value_param != nullptr) printf(" and ");
+    }
+    if (value_param != nullptr) {
+      printf("%s = %s", kValueParamLabel, value_param);
+    }
+  }
+}
+
+// This class implements the TestEventListener interface.
+//
+// Class PrettyUnitTestResultPrinter is copyable.
+class PrettyUnitTestResultPrinter : public TestEventListener {
+ public:
+  PrettyUnitTestResultPrinter() {}
+  static void PrintTestName(const char* test_suite, const char* test) {
+    printf("%s.%s", test_suite, test);
+  }
+
+  // The following methods override what's in the TestEventListener class.
+  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
+  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestCase& test_case) override;
+#else
+  void OnTestSuiteStart(const TestSuite& test_suite) override;
+#endif  // OnTestCaseStart
+
+  void OnTestStart(const TestInfo& test_info) override;
+
+  void OnTestPartResult(const TestPartResult& result) override;
+  void OnTestEnd(const TestInfo& test_info) override;
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& test_case) override;
+#else
+  void OnTestSuiteEnd(const TestSuite& test_suite) override;
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
+
+ private:
+  static void PrintFailedTests(const UnitTest& unit_test);
+  static void PrintFailedTestSuites(const UnitTest& unit_test);
+  static void PrintSkippedTests(const UnitTest& unit_test);
+};
+
+  // Fired before each iteration of tests starts.
+void PrettyUnitTestResultPrinter::OnTestIterationStart(
+    const UnitTest& unit_test, int iteration) {
+  if (GTEST_FLAG(repeat) != 1)
+    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
+
+  const char* const filter = GTEST_FLAG(filter).c_str();
+
+  // Prints the filter if it's not *.  This reminds the user that some
+  // tests may be skipped.
+  if (!String::CStringEquals(filter, kUniversalFilter)) {
+    ColoredPrintf(GTestColor::kYellow, "Note: %s filter = %s\n", GTEST_NAME_,
+                  filter);
+  }
+
+  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
+    const int32_t shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
+    ColoredPrintf(GTestColor::kYellow, "Note: This is test shard %d of %s.\n",
+                  static_cast<int>(shard_index) + 1,
+                  internal::posix::GetEnv(kTestTotalShards));
+  }
+
+  if (GTEST_FLAG(shuffle)) {
+    ColoredPrintf(GTestColor::kYellow,
+                  "Note: Randomizing tests' orders with a seed of %d .\n",
+                  unit_test.random_seed());
+  }
+
+  ColoredPrintf(GTestColor::kGreen, "[==========] ");
+  printf("Running %s from %s.\n",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("Global test environment set-up.\n");
+  fflush(stdout);
+}
+
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s", counts.c_str(), test_case.name());
+  if (test_case.type_param() == nullptr) {
+    printf("\n");
+  } else {
+    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
+  }
+  fflush(stdout);
+}
+#else
+void PrettyUnitTestResultPrinter::OnTestSuiteStart(
+    const TestSuite& test_suite) {
+  const std::string counts =
+      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s", counts.c_str(), test_suite.name());
+  if (test_suite.type_param() == nullptr) {
+    printf("\n");
+  } else {
+    printf(", where %s = %s\n", kTypeParamLabel, test_suite.type_param());
+  }
+  fflush(stdout);
+}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
+  ColoredPrintf(GTestColor::kGreen, "[ RUN      ] ");
+  PrintTestName(test_info.test_suite_name(), test_info.name());
+  printf("\n");
+  fflush(stdout);
+}
+
+// Called after an assertion failure.
+void PrettyUnitTestResultPrinter::OnTestPartResult(
+    const TestPartResult& result) {
+  switch (result.type()) {
+    // If the test part succeeded, we don't need to do anything.
+    case TestPartResult::kSuccess:
+      return;
+    default:
+      // Print failure message from the assertion
+      // (e.g. expected this and got that).
+      PrintTestPartResult(result);
+      fflush(stdout);
+  }
+}
+
+void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
+  if (test_info.result()->Passed()) {
+    ColoredPrintf(GTestColor::kGreen, "[       OK ] ");
+  } else if (test_info.result()->Skipped()) {
+    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+  } else {
+    ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+  }
+  PrintTestName(test_info.test_suite_name(), test_info.name());
+  if (test_info.result()->Failed())
+    PrintFullTestCommentIfPresent(test_info);
+
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms)\n", internal::StreamableToString(
+           test_info.result()->elapsed_time()).c_str());
+  } else {
+    printf("\n");
+  }
+  fflush(stdout);
+}
+
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
+  if (!GTEST_FLAG(print_time)) return;
+
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_case.name(),
+         internal::StreamableToString(test_case.elapsed_time()).c_str());
+  fflush(stdout);
+}
+#else
+void PrettyUnitTestResultPrinter::OnTestSuiteEnd(const TestSuite& test_suite) {
+  if (!GTEST_FLAG(print_time)) return;
+
+  const std::string counts =
+      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_suite.name(),
+         internal::StreamableToString(test_suite.elapsed_time()).c_str());
+  fflush(stdout);
+}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("Global test environment tear-down\n");
+  fflush(stdout);
+}
+
+// Internal helper for printing the list of failed tests.
+void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
+  const int failed_test_count = unit_test.failed_test_count();
+  ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+  printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
+
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    if (!test_suite.should_run() || (test_suite.failed_test_count() == 0)) {
+      continue;
+    }
+    for (int j = 0; j < test_suite.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_suite.GetTestInfo(j);
+      if (!test_info.should_run() || !test_info.result()->Failed()) {
+        continue;
+      }
+      ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+      printf("%s.%s", test_suite.name(), test_info.name());
+      PrintFullTestCommentIfPresent(test_info);
+      printf("\n");
+    }
+  }
+  printf("\n%2d FAILED %s\n", failed_test_count,
+         failed_test_count == 1 ? "TEST" : "TESTS");
+}
+
+// Internal helper for printing the list of test suite failures not covered by
+// PrintFailedTests.
+void PrettyUnitTestResultPrinter::PrintFailedTestSuites(
+    const UnitTest& unit_test) {
+  int suite_failure_count = 0;
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    if (!test_suite.should_run()) {
+      continue;
+    }
+    if (test_suite.ad_hoc_test_result().Failed()) {
+      ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+      printf("%s: SetUpTestSuite or TearDownTestSuite\n", test_suite.name());
+      ++suite_failure_count;
+    }
+  }
+  if (suite_failure_count > 0) {
+    printf("\n%2d FAILED TEST %s\n", suite_failure_count,
+           suite_failure_count == 1 ? "SUITE" : "SUITES");
+  }
+}
+
+// Internal helper for printing the list of skipped tests.
+void PrettyUnitTestResultPrinter::PrintSkippedTests(const UnitTest& unit_test) {
+  const int skipped_test_count = unit_test.skipped_test_count();
+  if (skipped_test_count == 0) {
+    return;
+  }
+
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    if (!test_suite.should_run() || (test_suite.skipped_test_count() == 0)) {
+      continue;
+    }
+    for (int j = 0; j < test_suite.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_suite.GetTestInfo(j);
+      if (!test_info.should_run() || !test_info.result()->Skipped()) {
+        continue;
+      }
+      ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+      printf("%s.%s", test_suite.name(), test_info.name());
+      printf("\n");
+    }
+  }
+}
+
+void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                     int /*iteration*/) {
+  ColoredPrintf(GTestColor::kGreen, "[==========] ");
+  printf("%s from %s ran.",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms total)",
+           internal::StreamableToString(unit_test.elapsed_time()).c_str());
+  }
+  printf("\n");
+  ColoredPrintf(GTestColor::kGreen, "[  PASSED  ] ");
+  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
+
+  const int skipped_test_count = unit_test.skipped_test_count();
+  if (skipped_test_count > 0) {
+    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+    printf("%s, listed below:\n", FormatTestCount(skipped_test_count).c_str());
+    PrintSkippedTests(unit_test);
+  }
+
+  if (!unit_test.Passed()) {
+    PrintFailedTests(unit_test);
+    PrintFailedTestSuites(unit_test);
+  }
+
+  int num_disabled = unit_test.reportable_disabled_test_count();
+  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+    if (unit_test.Passed()) {
+      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
+    }
+    ColoredPrintf(GTestColor::kYellow, "  YOU HAVE %d DISABLED %s\n\n",
+                  num_disabled, num_disabled == 1 ? "TEST" : "TESTS");
+  }
+  // Ensure that Google Test output is printed before, e.g., heapchecker output.
+  fflush(stdout);
+}
+
+// End PrettyUnitTestResultPrinter
+
+// This class implements the TestEventListener interface.
+//
+// Class BriefUnitTestResultPrinter is copyable.
+class BriefUnitTestResultPrinter : public TestEventListener {
+ public:
+  BriefUnitTestResultPrinter() {}
+  static void PrintTestName(const char* test_suite, const char* test) {
+    printf("%s.%s", test_suite, test);
+  }
+
+  // The following methods override what's in the TestEventListener class.
+  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                            int /*iteration*/) override {}
+  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
+#else
+  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
+#endif  // OnTestCaseStart
+
+  void OnTestStart(const TestInfo& /*test_info*/) override {}
+
+  void OnTestPartResult(const TestPartResult& result) override;
+  void OnTestEnd(const TestInfo& test_info) override;
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
+#else
+  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
+};
+
+// Called after an assertion failure.
+void BriefUnitTestResultPrinter::OnTestPartResult(
+    const TestPartResult& result) {
+  switch (result.type()) {
+    // If the test part succeeded, we don't need to do anything.
+    case TestPartResult::kSuccess:
+      return;
+    default:
+      // Print failure message from the assertion
+      // (e.g. expected this and got that).
+      PrintTestPartResult(result);
+      fflush(stdout);
+  }
+}
+
+void BriefUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
+  if (test_info.result()->Failed()) {
+    ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+    PrintTestName(test_info.test_suite_name(), test_info.name());
+    PrintFullTestCommentIfPresent(test_info);
+
+    if (GTEST_FLAG(print_time)) {
+      printf(" (%s ms)\n",
+             internal::StreamableToString(test_info.result()->elapsed_time())
+                 .c_str());
+    } else {
+      printf("\n");
+    }
+    fflush(stdout);
+  }
+}
+
+void BriefUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                    int /*iteration*/) {
+  ColoredPrintf(GTestColor::kGreen, "[==========] ");
+  printf("%s from %s ran.",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms total)",
+           internal::StreamableToString(unit_test.elapsed_time()).c_str());
+  }
+  printf("\n");
+  ColoredPrintf(GTestColor::kGreen, "[  PASSED  ] ");
+  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
+
+  const int skipped_test_count = unit_test.skipped_test_count();
+  if (skipped_test_count > 0) {
+    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+    printf("%s.\n", FormatTestCount(skipped_test_count).c_str());
+  }
+
+  int num_disabled = unit_test.reportable_disabled_test_count();
+  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+    if (unit_test.Passed()) {
+      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
+    }
+    ColoredPrintf(GTestColor::kYellow, "  YOU HAVE %d DISABLED %s\n\n",
+                  num_disabled, num_disabled == 1 ? "TEST" : "TESTS");
+  }
+  // Ensure that Google Test output is printed before, e.g., heapchecker output.
+  fflush(stdout);
+}
+
+// End BriefUnitTestResultPrinter
+
+// class TestEventRepeater
+//
+// This class forwards events to other event listeners.
+class TestEventRepeater : public TestEventListener {
+ public:
+  TestEventRepeater() : forwarding_enabled_(true) {}
+  ~TestEventRepeater() override;
+  void Append(TestEventListener *listener);
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled() const { return forwarding_enabled_; }
+  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
+
+  void OnTestProgramStart(const UnitTest& unit_test) override;
+  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
+  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) override;
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestSuite& parameter) override;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestSuiteStart(const TestSuite& parameter) override;
+  void OnTestStart(const TestInfo& test_info) override;
+  void OnTestPartResult(const TestPartResult& result) override;
+  void OnTestEnd(const TestInfo& test_info) override;
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& parameter) override;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestSuiteEnd(const TestSuite& parameter) override;
+  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) override;
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void OnTestProgramEnd(const UnitTest& unit_test) override;
+
+ private:
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled_;
+  // The list of listeners that receive events.
+  std::vector<TestEventListener*> listeners_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
+};
+
+TestEventRepeater::~TestEventRepeater() {
+  ForEach(listeners_, Delete<TestEventListener>);
+}
+
+void TestEventRepeater::Append(TestEventListener *listener) {
+  listeners_.push_back(listener);
+}
+
+TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
+  for (size_t i = 0; i < listeners_.size(); ++i) {
+    if (listeners_[i] == listener) {
+      listeners_.erase(listeners_.begin() + static_cast<int>(i));
+      return listener;
+    }
+  }
+
+  return nullptr;
+}
+
+// Since most methods are very similar, use macros to reduce boilerplate.
+// This defines a member that forwards the call to all listeners.
+#define GTEST_REPEATER_METHOD_(Name, Type) \
+void TestEventRepeater::Name(const Type& parameter) { \
+  if (forwarding_enabled_) { \
+    for (size_t i = 0; i < listeners_.size(); i++) { \
+      listeners_[i]->Name(parameter); \
+    } \
+  } \
+}
+// This defines a member that forwards the call to all listeners in reverse
+// order.
+#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type)      \
+  void TestEventRepeater::Name(const Type& parameter) { \
+    if (forwarding_enabled_) {                          \
+      for (size_t i = listeners_.size(); i != 0; i--) { \
+        listeners_[i - 1]->Name(parameter);             \
+      }                                                 \
+    }                                                   \
+  }
+
+GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
+GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REPEATER_METHOD_(OnTestCaseStart, TestSuite)
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REPEATER_METHOD_(OnTestSuiteStart, TestSuite)
+GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
+GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
+GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestSuite)
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REVERSE_REPEATER_METHOD_(OnTestSuiteEnd, TestSuite)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
+
+#undef GTEST_REPEATER_METHOD_
+#undef GTEST_REVERSE_REPEATER_METHOD_
+
+void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
+                                             int iteration) {
+  if (forwarding_enabled_) {
+    for (size_t i = 0; i < listeners_.size(); i++) {
+      listeners_[i]->OnTestIterationStart(unit_test, iteration);
+    }
+  }
+}
+
+void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
+                                           int iteration) {
+  if (forwarding_enabled_) {
+    for (size_t i = listeners_.size(); i > 0; i--) {
+      listeners_[i - 1]->OnTestIterationEnd(unit_test, iteration);
+    }
+  }
+}
+
+// End TestEventRepeater
+
+// This class generates an XML output file.
+class XmlUnitTestResultPrinter : public EmptyTestEventListener {
+ public:
+  explicit XmlUnitTestResultPrinter(const char* output_file);
+
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void ListTestsMatchingFilter(const std::vector<TestSuite*>& test_suites);
+
+  // Prints an XML summary of all unit tests.
+  static void PrintXmlTestsList(std::ostream* stream,
+                                const std::vector<TestSuite*>& test_suites);
+
+ private:
+  // Is c a whitespace character that is normalized to a space character
+  // when it appears in an XML attribute value?
+  static bool IsNormalizableWhitespace(char c) {
+    return c == 0x9 || c == 0xA || c == 0xD;
+  }
+
+  // May c appear in a well-formed XML document?
+  static bool IsValidXmlCharacter(char c) {
+    return IsNormalizableWhitespace(c) || c >= 0x20;
+  }
+
+  // Returns an XML-escaped copy of the input string str.  If
+  // is_attribute is true, the text is meant to appear as an attribute
+  // value, and normalizable whitespace is preserved by replacing it
+  // with character references.
+  static std::string EscapeXml(const std::string& str, bool is_attribute);
+
+  // Returns the given string with all characters invalid in XML removed.
+  static std::string RemoveInvalidXmlCharacters(const std::string& str);
+
+  // Convenience wrapper around EscapeXml when str is an attribute value.
+  static std::string EscapeXmlAttribute(const std::string& str) {
+    return EscapeXml(str, true);
+  }
+
+  // Convenience wrapper around EscapeXml when str is not an attribute value.
+  static std::string EscapeXmlText(const char* str) {
+    return EscapeXml(str, false);
+  }
+
+  // Verifies that the given attribute belongs to the given element and
+  // streams the attribute as XML.
+  static void OutputXmlAttribute(std::ostream* stream,
+                                 const std::string& element_name,
+                                 const std::string& name,
+                                 const std::string& value);
+
+  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
+
+  // Streams a test suite XML stanza containing the given test result.
+  //
+  // Requires: result.Failed()
+  static void OutputXmlTestSuiteForTestResult(::std::ostream* stream,
+                                              const TestResult& result);
+
+  // Streams an XML representation of a TestResult object.
+  static void OutputXmlTestResult(::std::ostream* stream,
+                                  const TestResult& result);
+
+  // Streams an XML representation of a TestInfo object.
+  static void OutputXmlTestInfo(::std::ostream* stream,
+                                const char* test_suite_name,
+                                const TestInfo& test_info);
+
+  // Prints an XML representation of a TestSuite object
+  static void PrintXmlTestSuite(::std::ostream* stream,
+                                const TestSuite& test_suite);
+
+  // Prints an XML summary of unit_test to output stream out.
+  static void PrintXmlUnitTest(::std::ostream* stream,
+                               const UnitTest& unit_test);
+
+  // Produces a string representing the test properties in a result as space
+  // delimited XML attributes based on the property key="value" pairs.
+  // When the std::string is not empty, it includes a space at the beginning,
+  // to delimit this attribute from prior attributes.
+  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
+
+  // Streams an XML representation of the test properties of a TestResult
+  // object.
+  static void OutputXmlTestProperties(std::ostream* stream,
+                                      const TestResult& result);
+
+  // The output file.
+  const std::string output_file_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
+};
+
+// Creates a new XmlUnitTestResultPrinter.
+XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
+    : output_file_(output_file) {
+  if (output_file_.empty()) {
+    GTEST_LOG_(FATAL) << "XML output file may not be null";
+  }
+}
+
+// Called after the unit test ends.
+void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                  int /*iteration*/) {
+  FILE* xmlout = OpenFileForWriting(output_file_);
+  std::stringstream stream;
+  PrintXmlUnitTest(&stream, unit_test);
+  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
+  fclose(xmlout);
+}
+
+void XmlUnitTestResultPrinter::ListTestsMatchingFilter(
+    const std::vector<TestSuite*>& test_suites) {
+  FILE* xmlout = OpenFileForWriting(output_file_);
+  std::stringstream stream;
+  PrintXmlTestsList(&stream, test_suites);
+  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
+  fclose(xmlout);
+}
+
+// Returns an XML-escaped copy of the input string str.  If is_attribute
+// is true, the text is meant to appear as an attribute value, and
+// normalizable whitespace is preserved by replacing it with character
+// references.
+//
+// Invalid XML characters in str, if any, are stripped from the output.
+// It is expected that most, if not all, of the text processed by this
+// module will consist of ordinary English text.
+// If this module is ever modified to produce version 1.1 XML output,
+// most invalid characters can be retained using character references.
+std::string XmlUnitTestResultPrinter::EscapeXml(
+    const std::string& str, bool is_attribute) {
+  Message m;
+
+  for (size_t i = 0; i < str.size(); ++i) {
+    const char ch = str[i];
+    switch (ch) {
+      case '<':
+        m << "&lt;";
+        break;
+      case '>':
+        m << "&gt;";
+        break;
+      case '&':
+        m << "&amp;";
+        break;
+      case '\'':
+        if (is_attribute)
+          m << "&apos;";
+        else
+          m << '\'';
+        break;
+      case '"':
+        if (is_attribute)
+          m << "&quot;";
+        else
+          m << '"';
+        break;
+      default:
+        if (IsValidXmlCharacter(ch)) {
+          if (is_attribute && IsNormalizableWhitespace(ch))
+            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
+              << ";";
+          else
+            m << ch;
+        }
+        break;
+    }
+  }
+
+  return m.GetString();
+}
+
+// Returns the given string with all characters invalid in XML removed.
+// Currently invalid characters are dropped from the string. An
+// alternative is to replace them with certain characters such as . or ?.
+std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
+    const std::string& str) {
+  std::string output;
+  output.reserve(str.size());
+  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+    if (IsValidXmlCharacter(*it))
+      output.push_back(*it);
+
+  return output;
+}
+
+// The following routines generate an XML representation of a UnitTest
+// object.
+// GOOGLETEST_CM0009 DO NOT DELETE
+//
+// This is how Google Test concepts map to the DTD:
+//
+// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
+//   <testsuite name="testcase-name">  <-- corresponds to a TestSuite object
+//     <testcase name="test-name">     <-- corresponds to a TestInfo object
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//                                     <-- individual assertion failures
+//     </testcase>
+//   </testsuite>
+// </testsuites>
+
+// Formats the given time in milliseconds as seconds.
+std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
+  ::std::stringstream ss;
+  ss << (static_cast<double>(ms) * 1e-3);
+  return ss.str();
+}
+
+static bool PortableLocaltime(time_t seconds, struct tm* out) {
+#if defined(_MSC_VER)
+  return localtime_s(out, &seconds) == 0;
+#elif defined(__MINGW32__) || defined(__MINGW64__)
+  // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
+  // Windows' localtime(), which has a thread-local tm buffer.
+  struct tm* tm_ptr = localtime(&seconds);  // NOLINT
+  if (tm_ptr == nullptr) return false;
+  *out = *tm_ptr;
+  return true;
+#elif defined(__STDC_LIB_EXT1__)
+  // Uses localtime_s when available as localtime_r is only available from
+  // C23 standard.
+  return localtime_s(&seconds, out) != nullptr;
+#else
+  return localtime_r(&seconds, out) != nullptr;
+#endif
+}
+
+// Converts the given epoch time in milliseconds to a date string in the ISO
+// 8601 format, without the timezone information.
+std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
+  struct tm time_struct;
+  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
+    return "";
+  // YYYY-MM-DDThh:mm:ss.sss
+  return StreamableToString(time_struct.tm_year + 1900) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
+      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
+      String::FormatIntWidth2(time_struct.tm_min) + ":" +
+      String::FormatIntWidth2(time_struct.tm_sec) + "." +
+      String::FormatIntWidthN(static_cast<int>(ms % 1000), 3);
+}
+
+// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
+                                                     const char* data) {
+  const char* segment = data;
+  *stream << "<![CDATA[";
+  for (;;) {
+    const char* const next_segment = strstr(segment, "]]>");
+    if (next_segment != nullptr) {
+      stream->write(
+          segment, static_cast<std::streamsize>(next_segment - segment));
+      *stream << "]]>]]&gt;<![CDATA[";
+      segment = next_segment + strlen("]]>");
+    } else {
+      *stream << segment;
+      break;
+    }
+  }
+  *stream << "]]>";
+}
+
+void XmlUnitTestResultPrinter::OutputXmlAttribute(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    const std::string& value) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedOutputAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Attribute " << name << " is not allowed for element <" << element_name
+      << ">.";
+
+  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
+}
+
+// Streams a test suite XML stanza containing the given test result.
+void XmlUnitTestResultPrinter::OutputXmlTestSuiteForTestResult(
+    ::std::ostream* stream, const TestResult& result) {
+  // Output the boilerplate for a minimal test suite with one test.
+  *stream << "  <testsuite";
+  OutputXmlAttribute(stream, "testsuite", "name", "NonTestSuiteFailure");
+  OutputXmlAttribute(stream, "testsuite", "tests", "1");
+  OutputXmlAttribute(stream, "testsuite", "failures", "1");
+  OutputXmlAttribute(stream, "testsuite", "disabled", "0");
+  OutputXmlAttribute(stream, "testsuite", "skipped", "0");
+  OutputXmlAttribute(stream, "testsuite", "errors", "0");
+  OutputXmlAttribute(stream, "testsuite", "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(
+      stream, "testsuite", "timestamp",
+      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
+  *stream << ">";
+
+  // Output the boilerplate for a minimal test case with a single test.
+  *stream << "    <testcase";
+  OutputXmlAttribute(stream, "testcase", "name", "");
+  OutputXmlAttribute(stream, "testcase", "status", "run");
+  OutputXmlAttribute(stream, "testcase", "result", "completed");
+  OutputXmlAttribute(stream, "testcase", "classname", "");
+  OutputXmlAttribute(stream, "testcase", "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(
+      stream, "testcase", "timestamp",
+      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
+
+  // Output the actual test result.
+  OutputXmlTestResult(stream, result);
+
+  // Complete the test suite.
+  *stream << "  </testsuite>\n";
+}
+
+// Prints an XML representation of a TestInfo object.
+void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
+                                                 const char* test_suite_name,
+                                                 const TestInfo& test_info) {
+  const TestResult& result = *test_info.result();
+  const std::string kTestsuite = "testcase";
+
+  if (test_info.is_in_another_shard()) {
+    return;
+  }
+
+  *stream << "    <testcase";
+  OutputXmlAttribute(stream, kTestsuite, "name", test_info.name());
+
+  if (test_info.value_param() != nullptr) {
+    OutputXmlAttribute(stream, kTestsuite, "value_param",
+                       test_info.value_param());
+  }
+  if (test_info.type_param() != nullptr) {
+    OutputXmlAttribute(stream, kTestsuite, "type_param",
+                       test_info.type_param());
+  }
+  if (GTEST_FLAG(list_tests)) {
+    OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
+    OutputXmlAttribute(stream, kTestsuite, "line",
+                       StreamableToString(test_info.line()));
+    *stream << " />\n";
+    return;
+  }
+
+  OutputXmlAttribute(stream, kTestsuite, "status",
+                     test_info.should_run() ? "run" : "notrun");
+  OutputXmlAttribute(stream, kTestsuite, "result",
+                     test_info.should_run()
+                         ? (result.Skipped() ? "skipped" : "completed")
+                         : "suppressed");
+  OutputXmlAttribute(stream, kTestsuite, "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(
+      stream, kTestsuite, "timestamp",
+      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
+  OutputXmlAttribute(stream, kTestsuite, "classname", test_suite_name);
+
+  OutputXmlTestResult(stream, result);
+}
+
+void XmlUnitTestResultPrinter::OutputXmlTestResult(::std::ostream* stream,
+                                                   const TestResult& result) {
+  int failures = 0;
+  int skips = 0;
+  for (int i = 0; i < result.total_part_count(); ++i) {
+    const TestPartResult& part = result.GetTestPartResult(i);
+    if (part.failed()) {
+      if (++failures == 1 && skips == 0) {
+        *stream << ">\n";
+      }
+      const std::string location =
+          internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                          part.line_number());
+      const std::string summary = location + "\n" + part.summary();
+      *stream << "      <failure message=\""
+              << EscapeXmlAttribute(summary)
+              << "\" type=\"\">";
+      const std::string detail = location + "\n" + part.message();
+      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
+      *stream << "</failure>\n";
+    } else if (part.skipped()) {
+      if (++skips == 1 && failures == 0) {
+        *stream << ">\n";
+      }
+      const std::string location =
+          internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                          part.line_number());
+      const std::string summary = location + "\n" + part.summary();
+      *stream << "      <skipped message=\""
+              << EscapeXmlAttribute(summary.c_str()) << "\">";
+      const std::string detail = location + "\n" + part.message();
+      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
+      *stream << "</skipped>\n";
+    }
+  }
+
+  if (failures == 0 && skips == 0 && result.test_property_count() == 0) {
+    *stream << " />\n";
+  } else {
+    if (failures == 0 && skips == 0) {
+      *stream << ">\n";
+    }
+    OutputXmlTestProperties(stream, result);
+    *stream << "    </testcase>\n";
+  }
+}
+
+// Prints an XML representation of a TestSuite object
+void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
+                                                 const TestSuite& test_suite) {
+  const std::string kTestsuite = "testsuite";
+  *stream << "  <" << kTestsuite;
+  OutputXmlAttribute(stream, kTestsuite, "name", test_suite.name());
+  OutputXmlAttribute(stream, kTestsuite, "tests",
+                     StreamableToString(test_suite.reportable_test_count()));
+  if (!GTEST_FLAG(list_tests)) {
+    OutputXmlAttribute(stream, kTestsuite, "failures",
+                       StreamableToString(test_suite.failed_test_count()));
+    OutputXmlAttribute(
+        stream, kTestsuite, "disabled",
+        StreamableToString(test_suite.reportable_disabled_test_count()));
+    OutputXmlAttribute(stream, kTestsuite, "skipped",
+                       StreamableToString(test_suite.skipped_test_count()));
+
+    OutputXmlAttribute(stream, kTestsuite, "errors", "0");
+
+    OutputXmlAttribute(stream, kTestsuite, "time",
+                       FormatTimeInMillisAsSeconds(test_suite.elapsed_time()));
+    OutputXmlAttribute(
+        stream, kTestsuite, "timestamp",
+        FormatEpochTimeInMillisAsIso8601(test_suite.start_timestamp()));
+    *stream << TestPropertiesAsXmlAttributes(test_suite.ad_hoc_test_result());
+  }
+  *stream << ">\n";
+  for (int i = 0; i < test_suite.total_test_count(); ++i) {
+    if (test_suite.GetTestInfo(i)->is_reportable())
+      OutputXmlTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
+  }
+  *stream << "  </" << kTestsuite << ">\n";
+}
+
+// Prints an XML summary of unit_test to output stream out.
+void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
+                                                const UnitTest& unit_test) {
+  const std::string kTestsuites = "testsuites";
+
+  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+  *stream << "<" << kTestsuites;
+
+  OutputXmlAttribute(stream, kTestsuites, "tests",
+                     StreamableToString(unit_test.reportable_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "failures",
+                     StreamableToString(unit_test.failed_test_count()));
+  OutputXmlAttribute(
+      stream, kTestsuites, "disabled",
+      StreamableToString(unit_test.reportable_disabled_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
+  OutputXmlAttribute(stream, kTestsuites, "time",
+                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
+  OutputXmlAttribute(
+      stream, kTestsuites, "timestamp",
+      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
+
+  if (GTEST_FLAG(shuffle)) {
+    OutputXmlAttribute(stream, kTestsuites, "random_seed",
+                       StreamableToString(unit_test.random_seed()));
+  }
+  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
+
+  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
+  *stream << ">\n";
+
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0)
+      PrintXmlTestSuite(stream, *unit_test.GetTestSuite(i));
+  }
+
+  // If there was a test failure outside of one of the test suites (like in a
+  // test environment) include that in the output.
+  if (unit_test.ad_hoc_test_result().Failed()) {
+    OutputXmlTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
+  }
+
+  *stream << "</" << kTestsuites << ">\n";
+}
+
+void XmlUnitTestResultPrinter::PrintXmlTestsList(
+    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
+  const std::string kTestsuites = "testsuites";
+
+  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+  *stream << "<" << kTestsuites;
+
+  int total_tests = 0;
+  for (auto test_suite : test_suites) {
+    total_tests += test_suite->total_test_count();
+  }
+  OutputXmlAttribute(stream, kTestsuites, "tests",
+                     StreamableToString(total_tests));
+  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
+  *stream << ">\n";
+
+  for (auto test_suite : test_suites) {
+    PrintXmlTestSuite(stream, *test_suite);
+  }
+  *stream << "</" << kTestsuites << ">\n";
+}
+
+// Produces a string representing the test properties in a result as space
+// delimited XML attributes based on the property key="value" pairs.
+std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
+    const TestResult& result) {
+  Message attributes;
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    attributes << " " << property.key() << "="
+        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
+  }
+  return attributes.GetString();
+}
+
+void XmlUnitTestResultPrinter::OutputXmlTestProperties(
+    std::ostream* stream, const TestResult& result) {
+  const std::string kProperties = "properties";
+  const std::string kProperty = "property";
+
+  if (result.test_property_count() <= 0) {
+    return;
+  }
+
+  *stream << "<" << kProperties << ">\n";
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    *stream << "<" << kProperty;
+    *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
+    *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
+    *stream << "/>\n";
+  }
+  *stream << "</" << kProperties << ">\n";
+}
+
+// End XmlUnitTestResultPrinter
+
+// This class generates an JSON output file.
+class JsonUnitTestResultPrinter : public EmptyTestEventListener {
+ public:
+  explicit JsonUnitTestResultPrinter(const char* output_file);
+
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+
+  // Prints an JSON summary of all unit tests.
+  static void PrintJsonTestList(::std::ostream* stream,
+                                const std::vector<TestSuite*>& test_suites);
+
+ private:
+  // Returns an JSON-escaped copy of the input string str.
+  static std::string EscapeJson(const std::string& str);
+
+  //// Verifies that the given attribute belongs to the given element and
+  //// streams the attribute as JSON.
+  static void OutputJsonKey(std::ostream* stream,
+                            const std::string& element_name,
+                            const std::string& name,
+                            const std::string& value,
+                            const std::string& indent,
+                            bool comma = true);
+  static void OutputJsonKey(std::ostream* stream,
+                            const std::string& element_name,
+                            const std::string& name,
+                            int value,
+                            const std::string& indent,
+                            bool comma = true);
+
+  // Streams a test suite JSON stanza containing the given test result.
+  //
+  // Requires: result.Failed()
+  static void OutputJsonTestSuiteForTestResult(::std::ostream* stream,
+                                               const TestResult& result);
+
+  // Streams a JSON representation of a TestResult object.
+  static void OutputJsonTestResult(::std::ostream* stream,
+                                   const TestResult& result);
+
+  // Streams a JSON representation of a TestInfo object.
+  static void OutputJsonTestInfo(::std::ostream* stream,
+                                 const char* test_suite_name,
+                                 const TestInfo& test_info);
+
+  // Prints a JSON representation of a TestSuite object
+  static void PrintJsonTestSuite(::std::ostream* stream,
+                                 const TestSuite& test_suite);
+
+  // Prints a JSON summary of unit_test to output stream out.
+  static void PrintJsonUnitTest(::std::ostream* stream,
+                                const UnitTest& unit_test);
+
+  // Produces a string representing the test properties in a result as
+  // a JSON dictionary.
+  static std::string TestPropertiesAsJson(const TestResult& result,
+                                          const std::string& indent);
+
+  // The output file.
+  const std::string output_file_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
+};
+
+// Creates a new JsonUnitTestResultPrinter.
+JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file)
+    : output_file_(output_file) {
+  if (output_file_.empty()) {
+    GTEST_LOG_(FATAL) << "JSON output file may not be null";
+  }
+}
+
+void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                  int /*iteration*/) {
+  FILE* jsonout = OpenFileForWriting(output_file_);
+  std::stringstream stream;
+  PrintJsonUnitTest(&stream, unit_test);
+  fprintf(jsonout, "%s", StringStreamToString(&stream).c_str());
+  fclose(jsonout);
+}
+
+// Returns an JSON-escaped copy of the input string str.
+std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) {
+  Message m;
+
+  for (size_t i = 0; i < str.size(); ++i) {
+    const char ch = str[i];
+    switch (ch) {
+      case '\\':
+      case '"':
+      case '/':
+        m << '\\' << ch;
+        break;
+      case '\b':
+        m << "\\b";
+        break;
+      case '\t':
+        m << "\\t";
+        break;
+      case '\n':
+        m << "\\n";
+        break;
+      case '\f':
+        m << "\\f";
+        break;
+      case '\r':
+        m << "\\r";
+        break;
+      default:
+        if (ch < ' ') {
+          m << "\\u00" << String::FormatByte(static_cast<unsigned char>(ch));
+        } else {
+          m << ch;
+        }
+        break;
+    }
+  }
+
+  return m.GetString();
+}
+
+// The following routines generate an JSON representation of a UnitTest
+// object.
+
+// Formats the given time in milliseconds as seconds.
+static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) {
+  ::std::stringstream ss;
+  ss << (static_cast<double>(ms) * 1e-3) << "s";
+  return ss.str();
+}
+
+// Converts the given epoch time in milliseconds to a date string in the
+// RFC3339 format, without the timezone information.
+static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) {
+  struct tm time_struct;
+  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
+    return "";
+  // YYYY-MM-DDThh:mm:ss
+  return StreamableToString(time_struct.tm_year + 1900) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
+      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
+      String::FormatIntWidth2(time_struct.tm_min) + ":" +
+      String::FormatIntWidth2(time_struct.tm_sec) + "Z";
+}
+
+static inline std::string Indent(size_t width) {
+  return std::string(width, ' ');
+}
+
+void JsonUnitTestResultPrinter::OutputJsonKey(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    const std::string& value,
+    const std::string& indent,
+    bool comma) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedOutputAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Key \"" << name << "\" is not allowed for value \"" << element_name
+      << "\".";
+
+  *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\"";
+  if (comma)
+    *stream << ",\n";
+}
+
+void JsonUnitTestResultPrinter::OutputJsonKey(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    int value,
+    const std::string& indent,
+    bool comma) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedOutputAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Key \"" << name << "\" is not allowed for value \"" << element_name
+      << "\".";
+
+  *stream << indent << "\"" << name << "\": " << StreamableToString(value);
+  if (comma)
+    *stream << ",\n";
+}
+
+// Streams a test suite JSON stanza containing the given test result.
+void JsonUnitTestResultPrinter::OutputJsonTestSuiteForTestResult(
+    ::std::ostream* stream, const TestResult& result) {
+  // Output the boilerplate for a new test suite.
+  *stream << Indent(4) << "{\n";
+  OutputJsonKey(stream, "testsuite", "name", "NonTestSuiteFailure", Indent(6));
+  OutputJsonKey(stream, "testsuite", "tests", 1, Indent(6));
+  if (!GTEST_FLAG(list_tests)) {
+    OutputJsonKey(stream, "testsuite", "failures", 1, Indent(6));
+    OutputJsonKey(stream, "testsuite", "disabled", 0, Indent(6));
+    OutputJsonKey(stream, "testsuite", "skipped", 0, Indent(6));
+    OutputJsonKey(stream, "testsuite", "errors", 0, Indent(6));
+    OutputJsonKey(stream, "testsuite", "time",
+                  FormatTimeInMillisAsDuration(result.elapsed_time()),
+                  Indent(6));
+    OutputJsonKey(stream, "testsuite", "timestamp",
+                  FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
+                  Indent(6));
+  }
+  *stream << Indent(6) << "\"testsuite\": [\n";
+
+  // Output the boilerplate for a new test case.
+  *stream << Indent(8) << "{\n";
+  OutputJsonKey(stream, "testcase", "name", "", Indent(10));
+  OutputJsonKey(stream, "testcase", "status", "RUN", Indent(10));
+  OutputJsonKey(stream, "testcase", "result", "COMPLETED", Indent(10));
+  OutputJsonKey(stream, "testcase", "timestamp",
+                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
+                Indent(10));
+  OutputJsonKey(stream, "testcase", "time",
+                FormatTimeInMillisAsDuration(result.elapsed_time()),
+                Indent(10));
+  OutputJsonKey(stream, "testcase", "classname", "", Indent(10), false);
+  *stream << TestPropertiesAsJson(result, Indent(10));
+
+  // Output the actual test result.
+  OutputJsonTestResult(stream, result);
+
+  // Finish the test suite.
+  *stream << "\n" << Indent(6) << "]\n" << Indent(4) << "}";
+}
+
+// Prints a JSON representation of a TestInfo object.
+void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
+                                                   const char* test_suite_name,
+                                                   const TestInfo& test_info) {
+  const TestResult& result = *test_info.result();
+  const std::string kTestsuite = "testcase";
+  const std::string kIndent = Indent(10);
+
+  *stream << Indent(8) << "{\n";
+  OutputJsonKey(stream, kTestsuite, "name", test_info.name(), kIndent);
+
+  if (test_info.value_param() != nullptr) {
+    OutputJsonKey(stream, kTestsuite, "value_param", test_info.value_param(),
+                  kIndent);
+  }
+  if (test_info.type_param() != nullptr) {
+    OutputJsonKey(stream, kTestsuite, "type_param", test_info.type_param(),
+                  kIndent);
+  }
+  if (GTEST_FLAG(list_tests)) {
+    OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
+    OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
+    *stream << "\n" << Indent(8) << "}";
+    return;
+  }
+
+  OutputJsonKey(stream, kTestsuite, "status",
+                test_info.should_run() ? "RUN" : "NOTRUN", kIndent);
+  OutputJsonKey(stream, kTestsuite, "result",
+                test_info.should_run()
+                    ? (result.Skipped() ? "SKIPPED" : "COMPLETED")
+                    : "SUPPRESSED",
+                kIndent);
+  OutputJsonKey(stream, kTestsuite, "timestamp",
+                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
+                kIndent);
+  OutputJsonKey(stream, kTestsuite, "time",
+                FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent);
+  OutputJsonKey(stream, kTestsuite, "classname", test_suite_name, kIndent,
+                false);
+  *stream << TestPropertiesAsJson(result, kIndent);
+
+  OutputJsonTestResult(stream, result);
+}
+
+void JsonUnitTestResultPrinter::OutputJsonTestResult(::std::ostream* stream,
+                                                     const TestResult& result) {
+  const std::string kIndent = Indent(10);
+
+  int failures = 0;
+  for (int i = 0; i < result.total_part_count(); ++i) {
+    const TestPartResult& part = result.GetTestPartResult(i);
+    if (part.failed()) {
+      *stream << ",\n";
+      if (++failures == 1) {
+        *stream << kIndent << "\"" << "failures" << "\": [\n";
+      }
+      const std::string location =
+          internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                          part.line_number());
+      const std::string message = EscapeJson(location + "\n" + part.message());
+      *stream << kIndent << "  {\n"
+              << kIndent << "    \"failure\": \"" << message << "\",\n"
+              << kIndent << "    \"type\": \"\"\n"
+              << kIndent << "  }";
+    }
+  }
+
+  if (failures > 0)
+    *stream << "\n" << kIndent << "]";
+  *stream << "\n" << Indent(8) << "}";
+}
+
+// Prints an JSON representation of a TestSuite object
+void JsonUnitTestResultPrinter::PrintJsonTestSuite(
+    std::ostream* stream, const TestSuite& test_suite) {
+  const std::string kTestsuite = "testsuite";
+  const std::string kIndent = Indent(6);
+
+  *stream << Indent(4) << "{\n";
+  OutputJsonKey(stream, kTestsuite, "name", test_suite.name(), kIndent);
+  OutputJsonKey(stream, kTestsuite, "tests", test_suite.reportable_test_count(),
+                kIndent);
+  if (!GTEST_FLAG(list_tests)) {
+    OutputJsonKey(stream, kTestsuite, "failures",
+                  test_suite.failed_test_count(), kIndent);
+    OutputJsonKey(stream, kTestsuite, "disabled",
+                  test_suite.reportable_disabled_test_count(), kIndent);
+    OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent);
+    OutputJsonKey(
+        stream, kTestsuite, "timestamp",
+        FormatEpochTimeInMillisAsRFC3339(test_suite.start_timestamp()),
+        kIndent);
+    OutputJsonKey(stream, kTestsuite, "time",
+                  FormatTimeInMillisAsDuration(test_suite.elapsed_time()),
+                  kIndent, false);
+    *stream << TestPropertiesAsJson(test_suite.ad_hoc_test_result(), kIndent)
+            << ",\n";
+  }
+
+  *stream << kIndent << "\"" << kTestsuite << "\": [\n";
+
+  bool comma = false;
+  for (int i = 0; i < test_suite.total_test_count(); ++i) {
+    if (test_suite.GetTestInfo(i)->is_reportable()) {
+      if (comma) {
+        *stream << ",\n";
+      } else {
+        comma = true;
+      }
+      OutputJsonTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
+    }
+  }
+  *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
+}
+
+// Prints a JSON summary of unit_test to output stream out.
+void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
+                                                  const UnitTest& unit_test) {
+  const std::string kTestsuites = "testsuites";
+  const std::string kIndent = Indent(2);
+  *stream << "{\n";
+
+  OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(),
+                kIndent);
+  OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(),
+                kIndent);
+  OutputJsonKey(stream, kTestsuites, "disabled",
+                unit_test.reportable_disabled_test_count(), kIndent);
+  OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
+  if (GTEST_FLAG(shuffle)) {
+    OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
+                  kIndent);
+  }
+  OutputJsonKey(stream, kTestsuites, "timestamp",
+                FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()),
+                kIndent);
+  OutputJsonKey(stream, kTestsuites, "time",
+                FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent,
+                false);
+
+  *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent)
+          << ",\n";
+
+  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
+  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
+
+  bool comma = false;
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0) {
+      if (comma) {
+        *stream << ",\n";
+      } else {
+        comma = true;
+      }
+      PrintJsonTestSuite(stream, *unit_test.GetTestSuite(i));
+    }
+  }
+
+  // If there was a test failure outside of one of the test suites (like in a
+  // test environment) include that in the output.
+  if (unit_test.ad_hoc_test_result().Failed()) {
+    OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
+  }
+
+  *stream << "\n" << kIndent << "]\n" << "}\n";
+}
+
+void JsonUnitTestResultPrinter::PrintJsonTestList(
+    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
+  const std::string kTestsuites = "testsuites";
+  const std::string kIndent = Indent(2);
+  *stream << "{\n";
+  int total_tests = 0;
+  for (auto test_suite : test_suites) {
+    total_tests += test_suite->total_test_count();
+  }
+  OutputJsonKey(stream, kTestsuites, "tests", total_tests, kIndent);
+
+  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
+  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
+
+  for (size_t i = 0; i < test_suites.size(); ++i) {
+    if (i != 0) {
+      *stream << ",\n";
+    }
+    PrintJsonTestSuite(stream, *test_suites[i]);
+  }
+
+  *stream << "\n"
+          << kIndent << "]\n"
+          << "}\n";
+}
+// Produces a string representing the test properties in a result as
+// a JSON dictionary.
+std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
+    const TestResult& result, const std::string& indent) {
+  Message attributes;
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    attributes << ",\n" << indent << "\"" << property.key() << "\": "
+               << "\"" << EscapeJson(property.value()) << "\"";
+  }
+  return attributes.GetString();
+}
+
+// End JsonUnitTestResultPrinter
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
+// replaces them by "%xx" where xx is their hexadecimal value. For
+// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
+// in both time and space -- important as the input str may contain an
+// arbitrarily long test failure message and stack trace.
+std::string StreamingListener::UrlEncode(const char* str) {
+  std::string result;
+  result.reserve(strlen(str) + 1);
+  for (char ch = *str; ch != '\0'; ch = *++str) {
+    switch (ch) {
+      case '%':
+      case '=':
+      case '&':
+      case '\n':
+        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
+        break;
+      default:
+        result.push_back(ch);
+        break;
+    }
+  }
+  return result;
+}
+
+void StreamingListener::SocketWriter::MakeConnection() {
+  GTEST_CHECK_(sockfd_ == -1)
+      << "MakeConnection() can't be called when there is already a connection.";
+
+  addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
+  hints.ai_socktype = SOCK_STREAM;
+  addrinfo* servinfo = nullptr;
+
+  // Use the getaddrinfo() to get a linked list of IP addresses for
+  // the given host name.
+  const int error_num = getaddrinfo(
+      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
+  if (error_num != 0) {
+    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
+                        << gai_strerror(error_num);
+  }
+
+  // Loop through all the results and connect to the first we can.
+  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != nullptr;
+       cur_addr = cur_addr->ai_next) {
+    sockfd_ = socket(
+        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
+    if (sockfd_ != -1) {
+      // Connect the client socket to the server socket.
+      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
+        close(sockfd_);
+        sockfd_ = -1;
+      }
+    }
+  }
+
+  freeaddrinfo(servinfo);  // all done with this structure
+
+  if (sockfd_ == -1) {
+    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
+                        << host_name_ << ":" << port_num_;
+  }
+}
+
+// End of class Streaming Listener
+#endif  // GTEST_CAN_STREAM_RESULTS__
+
+// class OsStackTraceGetter
+
+const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
+    "... " GTEST_NAME_ " internal frames ...";
+
+std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+#if GTEST_HAS_ABSL
+  std::string result;
+
+  if (max_depth <= 0) {
+    return result;
+  }
+
+  max_depth = std::min(max_depth, kMaxStackTraceDepth);
+
+  std::vector<void*> raw_stack(max_depth);
+  // Skips the frames requested by the caller, plus this function.
+  const int raw_stack_size =
+      absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1);
+
+  void* caller_frame = nullptr;
+  {
+    MutexLock lock(&mutex_);
+    caller_frame = caller_frame_;
+  }
+
+  for (int i = 0; i < raw_stack_size; ++i) {
+    if (raw_stack[i] == caller_frame &&
+        !GTEST_FLAG(show_internal_stack_frames)) {
+      // Add a marker to the trace and stop adding frames.
+      absl::StrAppend(&result, kElidedFramesMarker, "\n");
+      break;
+    }
+
+    char tmp[1024];
+    const char* symbol = "(unknown)";
+    if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) {
+      symbol = tmp;
+    }
+
+    char line[1024];
+    snprintf(line, sizeof(line), "  %p: %s\n", raw_stack[i], symbol);
+    result += line;
+  }
+
+  return result;
+
+#else  // !GTEST_HAS_ABSL
+  static_cast<void>(max_depth);
+  static_cast<void>(skip_count);
+  return "";
+#endif  // GTEST_HAS_ABSL
+}
+
+void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
+#if GTEST_HAS_ABSL
+  void* caller_frame = nullptr;
+  if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
+    caller_frame = nullptr;
+  }
+
+  MutexLock lock(&mutex_);
+  caller_frame_ = caller_frame;
+#endif  // GTEST_HAS_ABSL
+}
+
+// A helper class that creates the premature-exit file in its
+// constructor and deletes the file in its destructor.
+class ScopedPrematureExitFile {
+ public:
+  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
+      : premature_exit_filepath_(premature_exit_filepath ?
+                                 premature_exit_filepath : "") {
+    // If a path to the premature-exit file is specified...
+    if (!premature_exit_filepath_.empty()) {
+      // create the file with a single "0" character in it.  I/O
+      // errors are ignored as there's nothing better we can do and we
+      // don't want to fail the test because of this.
+      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
+      fwrite("0", 1, 1, pfile);
+      fclose(pfile);
+    }
+  }
+
+  ~ScopedPrematureExitFile() {
+#if !defined GTEST_OS_ESP8266
+    if (!premature_exit_filepath_.empty()) {
+      int retval = remove(premature_exit_filepath_.c_str());
+      if (retval) {
+        GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \""
+                          << premature_exit_filepath_ << "\" with error "
+                          << retval;
+      }
+    }
+#endif
+  }
+
+ private:
+  const std::string premature_exit_filepath_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
+};
+
+}  // namespace internal
+
+// class TestEventListeners
+
+TestEventListeners::TestEventListeners()
+    : repeater_(new internal::TestEventRepeater()),
+      default_result_printer_(nullptr),
+      default_xml_generator_(nullptr) {}
+
+TestEventListeners::~TestEventListeners() { delete repeater_; }
+
+// Returns the standard listener responsible for the default console
+// output.  Can be removed from the listeners list to shut down default
+// console output.  Note that removing this object from the listener list
+// with Release transfers its ownership to the user.
+void TestEventListeners::Append(TestEventListener* listener) {
+  repeater_->Append(listener);
+}
+
+// Removes the given event listener from the list and returns it.  It then
+// becomes the caller's responsibility to delete the listener. Returns
+// NULL if the listener is not found in the list.
+TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
+  if (listener == default_result_printer_)
+    default_result_printer_ = nullptr;
+  else if (listener == default_xml_generator_)
+    default_xml_generator_ = nullptr;
+  return repeater_->Release(listener);
+}
+
+// Returns repeater that broadcasts the TestEventListener events to all
+// subscribers.
+TestEventListener* TestEventListeners::repeater() { return repeater_; }
+
+// Sets the default_result_printer attribute to the provided listener.
+// The listener is also added to the listener list and previous
+// default_result_printer is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
+  if (default_result_printer_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_result_printer_);
+    default_result_printer_ = listener;
+    if (listener != nullptr) Append(listener);
+  }
+}
+
+// Sets the default_xml_generator attribute to the provided listener.  The
+// listener is also added to the listener list and previous
+// default_xml_generator is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
+  if (default_xml_generator_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_xml_generator_);
+    default_xml_generator_ = listener;
+    if (listener != nullptr) Append(listener);
+  }
+}
+
+// Controls whether events will be forwarded by the repeater to the
+// listeners in the list.
+bool TestEventListeners::EventForwardingEnabled() const {
+  return repeater_->forwarding_enabled();
+}
+
+void TestEventListeners::SuppressEventForwarding() {
+  repeater_->set_forwarding_enabled(false);
+}
+
+// class UnitTest
+
+// Gets the singleton UnitTest object.  The first time this method is
+// called, a UnitTest object is constructed and returned.  Consecutive
+// calls will return the same object.
+//
+// We don't protect this under mutex_ as a user is not supposed to
+// call this before main() starts, from which point on the return
+// value will never change.
+UnitTest* UnitTest::GetInstance() {
+  // CodeGear C++Builder insists on a public destructor for the
+  // default implementation.  Use this implementation to keep good OO
+  // design with private destructor.
+
+#if defined(__BORLANDC__)
+  static UnitTest* const instance = new UnitTest;
+  return instance;
+#else
+  static UnitTest instance;
+  return &instance;
+#endif  // defined(__BORLANDC__)
+}
+
+// Gets the number of successful test suites.
+int UnitTest::successful_test_suite_count() const {
+  return impl()->successful_test_suite_count();
+}
+
+// Gets the number of failed test suites.
+int UnitTest::failed_test_suite_count() const {
+  return impl()->failed_test_suite_count();
+}
+
+// Gets the number of all test suites.
+int UnitTest::total_test_suite_count() const {
+  return impl()->total_test_suite_count();
+}
+
+// Gets the number of all test suites that contain at least one test
+// that should run.
+int UnitTest::test_suite_to_run_count() const {
+  return impl()->test_suite_to_run_count();
+}
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+int UnitTest::successful_test_case_count() const {
+  return impl()->successful_test_suite_count();
+}
+int UnitTest::failed_test_case_count() const {
+  return impl()->failed_test_suite_count();
+}
+int UnitTest::total_test_case_count() const {
+  return impl()->total_test_suite_count();
+}
+int UnitTest::test_case_to_run_count() const {
+  return impl()->test_suite_to_run_count();
+}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// Gets the number of successful tests.
+int UnitTest::successful_test_count() const {
+  return impl()->successful_test_count();
+}
+
+// Gets the number of skipped tests.
+int UnitTest::skipped_test_count() const {
+  return impl()->skipped_test_count();
+}
+
+// Gets the number of failed tests.
+int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTest::reportable_disabled_test_count() const {
+  return impl()->reportable_disabled_test_count();
+}
+
+// Gets the number of disabled tests.
+int UnitTest::disabled_test_count() const {
+  return impl()->disabled_test_count();
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTest::reportable_test_count() const {
+  return impl()->reportable_test_count();
+}
+
+// Gets the number of all tests.
+int UnitTest::total_test_count() const { return impl()->total_test_count(); }
+
+// Gets the number of tests that should run.
+int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
+
+// Gets the time of the test program start, in ms from the start of the
+// UNIX epoch.
+internal::TimeInMillis UnitTest::start_timestamp() const {
+    return impl()->start_timestamp();
+}
+
+// Gets the elapsed time, in milliseconds.
+internal::TimeInMillis UnitTest::elapsed_time() const {
+  return impl()->elapsed_time();
+}
+
+// Returns true if and only if the unit test passed (i.e. all test suites
+// passed).
+bool UnitTest::Passed() const { return impl()->Passed(); }
+
+// Returns true if and only if the unit test failed (i.e. some test suite
+// failed or something outside of all tests failed).
+bool UnitTest::Failed() const { return impl()->Failed(); }
+
+// Gets the i-th test suite among all the test suites. i can range from 0 to
+// total_test_suite_count() - 1. If i is not in that range, returns NULL.
+const TestSuite* UnitTest::GetTestSuite(int i) const {
+  return impl()->GetTestSuite(i);
+}
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+const TestCase* UnitTest::GetTestCase(int i) const {
+  return impl()->GetTestCase(i);
+}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// Returns the TestResult containing information on test failures and
+// properties logged outside of individual test suites.
+const TestResult& UnitTest::ad_hoc_test_result() const {
+  return *impl()->ad_hoc_test_result();
+}
+
+// Gets the i-th test suite among all the test suites. i can range from 0 to
+// total_test_suite_count() - 1. If i is not in that range, returns NULL.
+TestSuite* UnitTest::GetMutableTestSuite(int i) {
+  return impl()->GetMutableSuiteCase(i);
+}
+
+// Returns the list of event listeners that can be used to track events
+// inside Google Test.
+TestEventListeners& UnitTest::listeners() {
+  return *impl()->listeners();
+}
+
+// Registers and returns a global test environment.  When a test
+// program is run, all global test environments will be set-up in the
+// order they were registered.  After all tests in the program have
+// finished, all global test environments will be torn-down in the
+// *reverse* order they were registered.
+//
+// The UnitTest object takes ownership of the given environment.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+Environment* UnitTest::AddEnvironment(Environment* env) {
+  if (env == nullptr) {
+    return nullptr;
+  }
+
+  impl_->environments().push_back(env);
+  return env;
+}
+
+// Adds a TestPartResult to the current TestResult object.  All Google Test
+// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
+// this to report their results.  The user code should use the
+// assertion macros instead of calling this directly.
+void UnitTest::AddTestPartResult(
+    TestPartResult::Type result_type,
+    const char* file_name,
+    int line_number,
+    const std::string& message,
+    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
+  Message msg;
+  msg << message;
+
+  internal::MutexLock lock(&mutex_);
+  if (impl_->gtest_trace_stack().size() > 0) {
+    msg << "\n" << GTEST_NAME_ << " trace:";
+
+    for (size_t i = impl_->gtest_trace_stack().size(); i > 0; --i) {
+      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
+      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
+          << " " << trace.message;
+    }
+  }
+
+  if (os_stack_trace.c_str() != nullptr && !os_stack_trace.empty()) {
+    msg << internal::kStackTraceMarker << os_stack_trace;
+  }
+
+  const TestPartResult result = TestPartResult(
+      result_type, file_name, line_number, msg.GetString().c_str());
+  impl_->GetTestPartResultReporterForCurrentThread()->
+      ReportTestPartResult(result);
+
+  if (result_type != TestPartResult::kSuccess &&
+      result_type != TestPartResult::kSkip) {
+    // gtest_break_on_failure takes precedence over
+    // gtest_throw_on_failure.  This allows a user to set the latter
+    // in the code (perhaps in order to use Google Test assertions
+    // with another testing framework) and specify the former on the
+    // command line for debugging.
+    if (GTEST_FLAG(break_on_failure)) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+      // Using DebugBreak on Windows allows gtest to still break into a debugger
+      // when a failure happens and both the --gtest_break_on_failure and
+      // the --gtest_catch_exceptions flags are specified.
+      DebugBreak();
+#elif (!defined(__native_client__)) &&            \
+    ((defined(__clang__) || defined(__GNUC__)) && \
+     (defined(__x86_64__) || defined(__i386__)))
+      // with clang/gcc we can achieve the same effect on x86 by invoking int3
+      asm("int3");
+#else
+      // Dereference nullptr through a volatile pointer to prevent the compiler
+      // from removing. We use this rather than abort() or __builtin_trap() for
+      // portability: some debuggers don't correctly trap abort().
+      *static_cast<volatile int*>(nullptr) = 1;
+#endif  // GTEST_OS_WINDOWS
+    } else if (GTEST_FLAG(throw_on_failure)) {
+#if GTEST_HAS_EXCEPTIONS
+      throw internal::GoogleTestFailureException(result);
+#else
+      // We cannot call abort() as it generates a pop-up in debug mode
+      // that cannot be suppressed in VC 7.1 or below.
+      exit(1);
+#endif
+    }
+  }
+}
+
+// Adds a TestProperty to the current TestResult object when invoked from
+// inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
+// from SetUpTestSuite or TearDownTestSuite, or to the global property set
+// when invoked elsewhere.  If the result already contains a property with
+// the same key, the value will be updated.
+void UnitTest::RecordProperty(const std::string& key,
+                              const std::string& value) {
+  impl_->RecordProperty(TestProperty(key, value));
+}
+
+// Runs all tests in this UnitTest object and prints the result.
+// Returns 0 if successful, or 1 otherwise.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+int UnitTest::Run() {
+  const bool in_death_test_child_process =
+      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
+
+  // Google Test implements this protocol for catching that a test
+  // program exits before returning control to Google Test:
+  //
+  //   1. Upon start, Google Test creates a file whose absolute path
+  //      is specified by the environment variable
+  //      TEST_PREMATURE_EXIT_FILE.
+  //   2. When Google Test has finished its work, it deletes the file.
+  //
+  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
+  // running a Google-Test-based test program and check the existence
+  // of the file at the end of the test execution to see if it has
+  // exited prematurely.
+
+  // If we are in the child process of a death test, don't
+  // create/delete the premature exit file, as doing so is unnecessary
+  // and will confuse the parent process.  Otherwise, create/delete
+  // the file upon entering/leaving this function.  If the program
+  // somehow exits before this function has a chance to return, the
+  // premature-exit file will be left undeleted, causing a test runner
+  // that understands the premature-exit-file protocol to report the
+  // test as having failed.
+  const internal::ScopedPrematureExitFile premature_exit_file(
+      in_death_test_child_process
+          ? nullptr
+          : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
+
+  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
+  // used for the duration of the program.
+  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
+
+#if GTEST_OS_WINDOWS
+  // Either the user wants Google Test to catch exceptions thrown by the
+  // tests or this is executing in the context of death test child
+  // process. In either case the user does not want to see pop-up dialogs
+  // about crashes - they are expected.
+  if (impl()->catch_exceptions() || in_death_test_child_process) {
+# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+    // SetErrorMode doesn't exist on CE.
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
+                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
+# endif  // !GTEST_OS_WINDOWS_MOBILE
+
+# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
+    // Death test children can be terminated with _abort().  On Windows,
+    // _abort() can show a dialog with a warning message.  This forces the
+    // abort message to go to stderr instead.
+    _set_error_mode(_OUT_TO_STDERR);
+# endif
+
+# if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
+    // In the debug version, Visual Studio pops up a separate dialog
+    // offering a choice to debug the aborted program. We need to suppress
+    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
+    // executed. Google Test will notify the user of any unexpected
+    // failure via stderr.
+    if (!GTEST_FLAG(break_on_failure))
+      _set_abort_behavior(
+          0x0,                                    // Clear the following flags:
+          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
+
+    // In debug mode, the Windows CRT can crash with an assertion over invalid
+    // input (e.g. passing an invalid file descriptor).  The default handling
+    // for these assertions is to pop up a dialog and wait for user input.
+    // Instead ask the CRT to dump such assertions to stderr non-interactively.
+    if (!IsDebuggerPresent()) {
+      (void)_CrtSetReportMode(_CRT_ASSERT,
+                              _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+      (void)_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+    }
+# endif
+  }
+#endif  // GTEST_OS_WINDOWS
+
+  return internal::HandleExceptionsInMethodIfSupported(
+      impl(),
+      &internal::UnitTestImpl::RunAllTests,
+      "auxiliary test code (environments or event listeners)") ? 0 : 1;
+}
+
+// Returns the working directory when the first TEST() or TEST_F() was
+// executed.
+const char* UnitTest::original_working_dir() const {
+  return impl_->original_working_dir_.c_str();
+}
+
+// Returns the TestSuite object for the test that's currently running,
+// or NULL if no test is running.
+const TestSuite* UnitTest::current_test_suite() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_suite();
+}
+
+// Legacy API is still available but deprecated
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+const TestCase* UnitTest::current_test_case() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_suite();
+}
+#endif
+
+// Returns the TestInfo object for the test that's currently running,
+// or NULL if no test is running.
+const TestInfo* UnitTest::current_test_info() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_info();
+}
+
+// Returns the random seed used at the start of the current test run.
+int UnitTest::random_seed() const { return impl_->random_seed(); }
+
+// Returns ParameterizedTestSuiteRegistry object used to keep track of
+// value-parameterized tests and instantiate and register them.
+internal::ParameterizedTestSuiteRegistry&
+UnitTest::parameterized_test_registry() GTEST_LOCK_EXCLUDED_(mutex_) {
+  return impl_->parameterized_test_registry();
+}
+
+// Creates an empty UnitTest.
+UnitTest::UnitTest() {
+  impl_ = new internal::UnitTestImpl(this);
+}
+
+// Destructor of UnitTest.
+UnitTest::~UnitTest() {
+  delete impl_;
+}
+
+// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+// Google Test trace stack.
+void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().push_back(trace);
+}
+
+// Pops a trace from the per-thread Google Test trace stack.
+void UnitTest::PopGTestTrace()
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().pop_back();
+}
+
+namespace internal {
+
+UnitTestImpl::UnitTestImpl(UnitTest* parent)
+    : parent_(parent),
+      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
+          default_global_test_part_result_reporter_(this),
+      default_per_thread_test_part_result_reporter_(this),
+      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
+          &default_global_test_part_result_reporter_),
+      per_thread_test_part_result_reporter_(
+          &default_per_thread_test_part_result_reporter_),
+      parameterized_test_registry_(),
+      parameterized_tests_registered_(false),
+      last_death_test_suite_(-1),
+      current_test_suite_(nullptr),
+      current_test_info_(nullptr),
+      ad_hoc_test_result_(),
+      os_stack_trace_getter_(nullptr),
+      post_flag_parse_init_performed_(false),
+      random_seed_(0),  // Will be overridden by the flag before first use.
+      random_(0),       // Will be reseeded before first use.
+      start_timestamp_(0),
+      elapsed_time_(0),
+#if GTEST_HAS_DEATH_TEST
+      death_test_factory_(new DefaultDeathTestFactory),
+#endif
+      // Will be overridden by the flag before first use.
+      catch_exceptions_(false) {
+  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
+}
+
+UnitTestImpl::~UnitTestImpl() {
+  // Deletes every TestSuite.
+  ForEach(test_suites_, internal::Delete<TestSuite>);
+
+  // Deletes every Environment.
+  ForEach(environments_, internal::Delete<Environment>);
+
+  delete os_stack_trace_getter_;
+}
+
+// Adds a TestProperty to the current TestResult object when invoked in a
+// context of a test, to current test suite's ad_hoc_test_result when invoke
+// from SetUpTestSuite/TearDownTestSuite, or to the global property set
+// otherwise.  If the result already contains a property with the same key,
+// the value will be updated.
+void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
+  std::string xml_element;
+  TestResult* test_result;  // TestResult appropriate for property recording.
+
+  if (current_test_info_ != nullptr) {
+    xml_element = "testcase";
+    test_result = &(current_test_info_->result_);
+  } else if (current_test_suite_ != nullptr) {
+    xml_element = "testsuite";
+    test_result = &(current_test_suite_->ad_hoc_test_result_);
+  } else {
+    xml_element = "testsuites";
+    test_result = &ad_hoc_test_result_;
+  }
+  test_result->RecordProperty(xml_element, test_property);
+}
+
+#if GTEST_HAS_DEATH_TEST
+// Disables event forwarding if the control is currently in a death test
+// subprocess. Must not be called before InitGoogleTest.
+void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
+  if (internal_run_death_test_flag_.get() != nullptr)
+    listeners()->SuppressEventForwarding();
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Initializes event listeners performing XML output as specified by
+// UnitTestOptions. Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureXmlOutput() {
+  const std::string& output_format = UnitTestOptions::GetOutputFormat();
+  if (output_format == "xml") {
+    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
+  } else if (output_format == "json") {
+    listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
+  } else if (output_format != "") {
+    GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
+                        << output_format << "\" ignored.";
+  }
+}
+
+#if GTEST_CAN_STREAM_RESULTS_
+// Initializes event listeners for streaming test results in string form.
+// Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureStreamingOutput() {
+  const std::string& target = GTEST_FLAG(stream_result_to);
+  if (!target.empty()) {
+    const size_t pos = target.find(':');
+    if (pos != std::string::npos) {
+      listeners()->Append(new StreamingListener(target.substr(0, pos),
+                                                target.substr(pos+1)));
+    } else {
+      GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target
+                          << "\" ignored.";
+    }
+  }
+}
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+// Performs initialization dependent upon flag values obtained in
+// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+// this function is also called from RunAllTests.  Since this function can be
+// called more than once, it has to be idempotent.
+void UnitTestImpl::PostFlagParsingInit() {
+  // Ensures that this function does not execute more than once.
+  if (!post_flag_parse_init_performed_) {
+    post_flag_parse_init_performed_ = true;
+
+#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
+    // Register to send notifications about key process state changes.
+    listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
+#endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
+
+#if GTEST_HAS_DEATH_TEST
+    InitDeathTestSubprocessControlInfo();
+    SuppressTestEventsIfInSubprocess();
+#endif  // GTEST_HAS_DEATH_TEST
+
+    // Registers parameterized tests. This makes parameterized tests
+    // available to the UnitTest reflection API without running
+    // RUN_ALL_TESTS.
+    RegisterParameterizedTests();
+
+    // Configures listeners for XML output. This makes it possible for users
+    // to shut down the default XML output before invoking RUN_ALL_TESTS.
+    ConfigureXmlOutput();
+
+    if (GTEST_FLAG(brief)) {
+      listeners()->SetDefaultResultPrinter(new BriefUnitTestResultPrinter);
+    }
+
+#if GTEST_CAN_STREAM_RESULTS_
+    // Configures listeners for streaming test results to the specified server.
+    ConfigureStreamingOutput();
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+#if GTEST_HAS_ABSL
+    if (GTEST_FLAG(install_failure_signal_handler)) {
+      absl::FailureSignalHandlerOptions options;
+      absl::InstallFailureSignalHandler(options);
+    }
+#endif  // GTEST_HAS_ABSL
+  }
+}
+
+// A predicate that checks the name of a TestSuite against a known
+// value.
+//
+// This is used for implementation of the UnitTest class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestSuiteNameIs is copyable.
+class TestSuiteNameIs {
+ public:
+  // Constructor.
+  explicit TestSuiteNameIs(const std::string& name) : name_(name) {}
+
+  // Returns true if and only if the name of test_suite matches name_.
+  bool operator()(const TestSuite* test_suite) const {
+    return test_suite != nullptr &&
+           strcmp(test_suite->name(), name_.c_str()) == 0;
+  }
+
+ private:
+  std::string name_;
+};
+
+// Finds and returns a TestSuite with the given name.  If one doesn't
+// exist, creates one and returns it.  It's the CALLER'S
+// RESPONSIBILITY to ensure that this function is only called WHEN THE
+// TESTS ARE NOT SHUFFLED.
+//
+// Arguments:
+//
+//   test_suite_name: name of the test suite
+//   type_param:      the name of the test suite's type parameter, or NULL if
+//                    this is not a typed or a type-parameterized test suite.
+//   set_up_tc:       pointer to the function that sets up the test suite
+//   tear_down_tc:    pointer to the function that tears down the test suite
+TestSuite* UnitTestImpl::GetTestSuite(
+    const char* test_suite_name, const char* type_param,
+    internal::SetUpTestSuiteFunc set_up_tc,
+    internal::TearDownTestSuiteFunc tear_down_tc) {
+  // Can we find a TestSuite with the given name?
+  const auto test_suite =
+      std::find_if(test_suites_.rbegin(), test_suites_.rend(),
+                   TestSuiteNameIs(test_suite_name));
+
+  if (test_suite != test_suites_.rend()) return *test_suite;
+
+  // No.  Let's create one.
+  auto* const new_test_suite =
+      new TestSuite(test_suite_name, type_param, set_up_tc, tear_down_tc);
+
+  // Is this a death test suite?
+  if (internal::UnitTestOptions::MatchesFilter(test_suite_name,
+                                               kDeathTestSuiteFilter)) {
+    // Yes.  Inserts the test suite after the last death test suite
+    // defined so far.  This only works when the test suites haven't
+    // been shuffled.  Otherwise we may end up running a death test
+    // after a non-death test.
+    ++last_death_test_suite_;
+    test_suites_.insert(test_suites_.begin() + last_death_test_suite_,
+                        new_test_suite);
+  } else {
+    // No.  Appends to the end of the list.
+    test_suites_.push_back(new_test_suite);
+  }
+
+  test_suite_indices_.push_back(static_cast<int>(test_suite_indices_.size()));
+  return new_test_suite;
+}
+
+// Helpers for setting up / tearing down the given environment.  They
+// are for use in the ForEach() function.
+static void SetUpEnvironment(Environment* env) { env->SetUp(); }
+static void TearDownEnvironment(Environment* env) { env->TearDown(); }
+
+// Runs all tests in this UnitTest object, prints the result, and
+// returns true if all tests are successful.  If any exception is
+// thrown during a test, the test is considered to be failed, but the
+// rest of the tests will still be run.
+//
+// When parameterized tests are enabled, it expands and registers
+// parameterized tests first in RegisterParameterizedTests().
+// All other functions called from RunAllTests() may safely assume that
+// parameterized tests are ready to be counted and run.
+bool UnitTestImpl::RunAllTests() {
+  // True if and only if Google Test is initialized before RUN_ALL_TESTS() is
+  // called.
+  const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized();
+
+  // Do not run any test if the --help flag was specified.
+  if (g_help_flag)
+    return true;
+
+  // Repeats the call to the post-flag parsing initialization in case the
+  // user didn't call InitGoogleTest.
+  PostFlagParsingInit();
+
+  // Even if sharding is not on, test runners may want to use the
+  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
+  // protocol.
+  internal::WriteToShardStatusFileIfNeeded();
+
+  // True if and only if we are in a subprocess for running a thread-safe-style
+  // death test.
+  bool in_subprocess_for_death_test = false;
+
+#if GTEST_HAS_DEATH_TEST
+  in_subprocess_for_death_test =
+      (internal_run_death_test_flag_.get() != nullptr);
+# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
+  if (in_subprocess_for_death_test) {
+    GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
+  }
+# endif  // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
+#endif  // GTEST_HAS_DEATH_TEST
+
+  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
+                                        in_subprocess_for_death_test);
+
+  // Compares the full test names with the filter to decide which
+  // tests to run.
+  const bool has_tests_to_run = FilterTests(should_shard
+                                              ? HONOR_SHARDING_PROTOCOL
+                                              : IGNORE_SHARDING_PROTOCOL) > 0;
+
+  // Lists the tests and exits if the --gtest_list_tests flag was specified.
+  if (GTEST_FLAG(list_tests)) {
+    // This must be called *after* FilterTests() has been called.
+    ListTestsMatchingFilter();
+    return true;
+  }
+
+  random_seed_ = GTEST_FLAG(shuffle) ?
+      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
+
+  // True if and only if at least one test has failed.
+  bool failed = false;
+
+  TestEventListener* repeater = listeners()->repeater();
+
+  start_timestamp_ = GetTimeInMillis();
+  repeater->OnTestProgramStart(*parent_);
+
+  // How many times to repeat the tests?  We don't want to repeat them
+  // when we are inside the subprocess of a death test.
+  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
+  // Repeats forever if the repeat count is negative.
+  const bool gtest_repeat_forever = repeat < 0;
+  for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
+    // We want to preserve failures generated by ad-hoc test
+    // assertions executed before RUN_ALL_TESTS().
+    ClearNonAdHocTestResult();
+
+    Timer timer;
+
+    // Shuffles test suites and tests if requested.
+    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
+      random()->Reseed(static_cast<uint32_t>(random_seed_));
+      // This should be done before calling OnTestIterationStart(),
+      // such that a test event listener can see the actual test order
+      // in the event.
+      ShuffleTests();
+    }
+
+    // Tells the unit test event listeners that the tests are about to start.
+    repeater->OnTestIterationStart(*parent_, i);
+
+    // Runs each test suite if there is at least one test to run.
+    if (has_tests_to_run) {
+      // Sets up all environments beforehand.
+      repeater->OnEnvironmentsSetUpStart(*parent_);
+      ForEach(environments_, SetUpEnvironment);
+      repeater->OnEnvironmentsSetUpEnd(*parent_);
+
+      // Runs the tests only if there was no fatal failure or skip triggered
+      // during global set-up.
+      if (Test::IsSkipped()) {
+        // Emit diagnostics when global set-up calls skip, as it will not be
+        // emitted by default.
+        TestResult& test_result =
+            *internal::GetUnitTestImpl()->current_test_result();
+        for (int j = 0; j < test_result.total_part_count(); ++j) {
+          const TestPartResult& test_part_result =
+              test_result.GetTestPartResult(j);
+          if (test_part_result.type() == TestPartResult::kSkip) {
+            const std::string& result = test_part_result.message();
+            printf("%s\n", result.c_str());
+          }
+        }
+        fflush(stdout);
+      } else if (!Test::HasFatalFailure()) {
+        for (int test_index = 0; test_index < total_test_suite_count();
+             test_index++) {
+          GetMutableSuiteCase(test_index)->Run();
+          if (GTEST_FLAG(fail_fast) &&
+              GetMutableSuiteCase(test_index)->Failed()) {
+            for (int j = test_index + 1; j < total_test_suite_count(); j++) {
+              GetMutableSuiteCase(j)->Skip();
+            }
+            break;
+          }
+        }
+      } else if (Test::HasFatalFailure()) {
+        // If there was a fatal failure during the global setup then we know we
+        // aren't going to run any tests. Explicitly mark all of the tests as
+        // skipped to make this obvious in the output.
+        for (int test_index = 0; test_index < total_test_suite_count();
+             test_index++) {
+          GetMutableSuiteCase(test_index)->Skip();
+        }
+      }
+
+      // Tears down all environments in reverse order afterwards.
+      repeater->OnEnvironmentsTearDownStart(*parent_);
+      std::for_each(environments_.rbegin(), environments_.rend(),
+                    TearDownEnvironment);
+      repeater->OnEnvironmentsTearDownEnd(*parent_);
+    }
+
+    elapsed_time_ = timer.Elapsed();
+
+    // Tells the unit test event listener that the tests have just finished.
+    repeater->OnTestIterationEnd(*parent_, i);
+
+    // Gets the result and clears it.
+    if (!Passed()) {
+      failed = true;
+    }
+
+    // Restores the original test order after the iteration.  This
+    // allows the user to quickly repro a failure that happens in the
+    // N-th iteration without repeating the first (N - 1) iterations.
+    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
+    // case the user somehow changes the value of the flag somewhere
+    // (it's always safe to unshuffle the tests).
+    UnshuffleTests();
+
+    if (GTEST_FLAG(shuffle)) {
+      // Picks a new random seed for each iteration.
+      random_seed_ = GetNextRandomSeed(random_seed_);
+    }
+  }
+
+  repeater->OnTestProgramEnd(*parent_);
+
+  if (!gtest_is_initialized_before_run_all_tests) {
+    ColoredPrintf(
+        GTestColor::kRed,
+        "\nIMPORTANT NOTICE - DO NOT IGNORE:\n"
+        "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_
+        "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
+        " will start to enforce the valid usage. "
+        "Please fix it ASAP, or IT WILL START TO FAIL.\n");  // NOLINT
+#if GTEST_FOR_GOOGLE_
+    ColoredPrintf(GTestColor::kRed,
+                  "For more details, see http://wiki/Main/ValidGUnitMain.\n");
+#endif  // GTEST_FOR_GOOGLE_
+  }
+
+  return !failed;
+}
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded() {
+  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
+  if (test_shard_file != nullptr) {
+    FILE* const file = posix::FOpen(test_shard_file, "w");
+    if (file == nullptr) {
+      ColoredPrintf(GTestColor::kRed,
+                    "Could not write to the test shard status file \"%s\" "
+                    "specified by the %s environment variable.\n",
+                    test_shard_file, kTestShardStatusFile);
+      fflush(stdout);
+      exit(EXIT_FAILURE);
+    }
+    fclose(file);
+  }
+}
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (i.e., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+bool ShouldShard(const char* total_shards_env,
+                 const char* shard_index_env,
+                 bool in_subprocess_for_death_test) {
+  if (in_subprocess_for_death_test) {
+    return false;
+  }
+
+  const int32_t total_shards = Int32FromEnvOrDie(total_shards_env, -1);
+  const int32_t shard_index = Int32FromEnvOrDie(shard_index_env, -1);
+
+  if (total_shards == -1 && shard_index == -1) {
+    return false;
+  } else if (total_shards == -1 && shard_index != -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestShardIndex << " = " << shard_index
+      << ", but have left " << kTestTotalShards << " unset.\n";
+    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (total_shards != -1 && shard_index == -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestTotalShards << " = " << total_shards
+      << ", but have left " << kTestShardIndex << " unset.\n";
+    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (shard_index < 0 || shard_index >= total_shards) {
+    const Message msg = Message()
+      << "Invalid environment variables: we require 0 <= "
+      << kTestShardIndex << " < " << kTestTotalShards
+      << ", but you have " << kTestShardIndex << "=" << shard_index
+      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
+    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  }
+
+  return total_shards > 1;
+}
+
+// Parses the environment variable var as an Int32. If it is unset,
+// returns default_val. If it is not an Int32, prints an error
+// and aborts.
+int32_t Int32FromEnvOrDie(const char* var, int32_t default_val) {
+  const char* str_val = posix::GetEnv(var);
+  if (str_val == nullptr) {
+    return default_val;
+  }
+
+  int32_t result;
+  if (!ParseInt32(Message() << "The value of environment variable " << var,
+                  str_val, &result)) {
+    exit(EXIT_FAILURE);
+  }
+  return result;
+}
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true if and only if the test should be run on this shard. The test id
+// is some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
+  return (test_id % total_shards) == shard_index;
+}
+
+// Compares the name of each test with the user-specified filter to
+// decide whether the test should be run, then records the result in
+// each TestSuite and TestInfo object.
+// If shard_tests == true, further filters tests based on sharding
+// variables in the environment - see
+// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
+// . Returns the number of tests that should run.
+int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
+  const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
+  const int32_t shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
+
+  // num_runnable_tests are the number of tests that will
+  // run across all shards (i.e., match filter and are not disabled).
+  // num_selected_tests are the number of tests to be run on
+  // this shard.
+  int num_runnable_tests = 0;
+  int num_selected_tests = 0;
+  for (auto* test_suite : test_suites_) {
+    const std::string& test_suite_name = test_suite->name();
+    test_suite->set_should_run(false);
+
+    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
+      TestInfo* const test_info = test_suite->test_info_list()[j];
+      const std::string test_name(test_info->name());
+      // A test is disabled if test suite name or test name matches
+      // kDisableTestFilter.
+      const bool is_disabled = internal::UnitTestOptions::MatchesFilter(
+                                   test_suite_name, kDisableTestFilter) ||
+                               internal::UnitTestOptions::MatchesFilter(
+                                   test_name, kDisableTestFilter);
+      test_info->is_disabled_ = is_disabled;
+
+      const bool matches_filter = internal::UnitTestOptions::FilterMatchesTest(
+          test_suite_name, test_name);
+      test_info->matches_filter_ = matches_filter;
+
+      const bool is_runnable =
+          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
+          matches_filter;
+
+      const bool is_in_another_shard =
+          shard_tests != IGNORE_SHARDING_PROTOCOL &&
+          !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests);
+      test_info->is_in_another_shard_ = is_in_another_shard;
+      const bool is_selected = is_runnable && !is_in_another_shard;
+
+      num_runnable_tests += is_runnable;
+      num_selected_tests += is_selected;
+
+      test_info->should_run_ = is_selected;
+      test_suite->set_should_run(test_suite->should_run() || is_selected);
+    }
+  }
+  return num_selected_tests;
+}
+
+// Prints the given C-string on a single line by replacing all '\n'
+// characters with string "\\n".  If the output takes more than
+// max_length characters, only prints the first max_length characters
+// and "...".
+static void PrintOnOneLine(const char* str, int max_length) {
+  if (str != nullptr) {
+    for (int i = 0; *str != '\0'; ++str) {
+      if (i >= max_length) {
+        printf("...");
+        break;
+      }
+      if (*str == '\n') {
+        printf("\\n");
+        i += 2;
+      } else {
+        printf("%c", *str);
+        ++i;
+      }
+    }
+  }
+}
+
+// Prints the names of the tests matching the user-specified filter flag.
+void UnitTestImpl::ListTestsMatchingFilter() {
+  // Print at most this many characters for each type/value parameter.
+  const int kMaxParamLength = 250;
+
+  for (auto* test_suite : test_suites_) {
+    bool printed_test_suite_name = false;
+
+    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
+      const TestInfo* const test_info = test_suite->test_info_list()[j];
+      if (test_info->matches_filter_) {
+        if (!printed_test_suite_name) {
+          printed_test_suite_name = true;
+          printf("%s.", test_suite->name());
+          if (test_suite->type_param() != nullptr) {
+            printf("  # %s = ", kTypeParamLabel);
+            // We print the type parameter on a single line to make
+            // the output easy to parse by a program.
+            PrintOnOneLine(test_suite->type_param(), kMaxParamLength);
+          }
+          printf("\n");
+        }
+        printf("  %s", test_info->name());
+        if (test_info->value_param() != nullptr) {
+          printf("  # %s = ", kValueParamLabel);
+          // We print the value parameter on a single line to make the
+          // output easy to parse by a program.
+          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
+        }
+        printf("\n");
+      }
+    }
+  }
+  fflush(stdout);
+  const std::string& output_format = UnitTestOptions::GetOutputFormat();
+  if (output_format == "xml" || output_format == "json") {
+    FILE* fileout = OpenFileForWriting(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
+    std::stringstream stream;
+    if (output_format == "xml") {
+      XmlUnitTestResultPrinter(
+          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
+          .PrintXmlTestsList(&stream, test_suites_);
+    } else if (output_format == "json") {
+      JsonUnitTestResultPrinter(
+          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
+          .PrintJsonTestList(&stream, test_suites_);
+    }
+    fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
+    fclose(fileout);
+  }
+}
+
+// Sets the OS stack trace getter.
+//
+// Does nothing if the input and the current OS stack trace getter are
+// the same; otherwise, deletes the old getter and makes the input the
+// current getter.
+void UnitTestImpl::set_os_stack_trace_getter(
+    OsStackTraceGetterInterface* getter) {
+  if (os_stack_trace_getter_ != getter) {
+    delete os_stack_trace_getter_;
+    os_stack_trace_getter_ = getter;
+  }
+}
+
+// Returns the current OS stack trace getter if it is not NULL;
+// otherwise, creates an OsStackTraceGetter, makes it the current
+// getter, and returns it.
+OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
+  if (os_stack_trace_getter_ == nullptr) {
+#ifdef GTEST_OS_STACK_TRACE_GETTER_
+    os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
+#else
+    os_stack_trace_getter_ = new OsStackTraceGetter;
+#endif  // GTEST_OS_STACK_TRACE_GETTER_
+  }
+
+  return os_stack_trace_getter_;
+}
+
+// Returns the most specific TestResult currently running.
+TestResult* UnitTestImpl::current_test_result() {
+  if (current_test_info_ != nullptr) {
+    return &current_test_info_->result_;
+  }
+  if (current_test_suite_ != nullptr) {
+    return &current_test_suite_->ad_hoc_test_result_;
+  }
+  return &ad_hoc_test_result_;
+}
+
+// Shuffles all test suites, and the tests within each test suite,
+// making sure that death tests are still run first.
+void UnitTestImpl::ShuffleTests() {
+  // Shuffles the death test suites.
+  ShuffleRange(random(), 0, last_death_test_suite_ + 1, &test_suite_indices_);
+
+  // Shuffles the non-death test suites.
+  ShuffleRange(random(), last_death_test_suite_ + 1,
+               static_cast<int>(test_suites_.size()), &test_suite_indices_);
+
+  // Shuffles the tests inside each test suite.
+  for (auto& test_suite : test_suites_) {
+    test_suite->ShuffleTests(random());
+  }
+}
+
+// Restores the test suites and tests to their order before the first shuffle.
+void UnitTestImpl::UnshuffleTests() {
+  for (size_t i = 0; i < test_suites_.size(); i++) {
+    // Unshuffles the tests in each test suite.
+    test_suites_[i]->UnshuffleTests();
+    // Resets the index of each test suite.
+    test_suite_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
+                                            int skip_count) {
+  // We pass skip_count + 1 to skip this wrapper function in addition
+  // to what the user really wants to skip.
+  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
+}
+
+// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
+// suppress unreachable code warnings.
+namespace {
+class ClassUniqueToAlwaysTrue {};
+}
+
+bool IsTrue(bool condition) { return condition; }
+
+bool AlwaysTrue() {
+#if GTEST_HAS_EXCEPTIONS
+  // This condition is always false so AlwaysTrue() never actually throws,
+  // but it makes the compiler think that it may throw.
+  if (IsTrue(false))
+    throw ClassUniqueToAlwaysTrue();
+#endif  // GTEST_HAS_EXCEPTIONS
+  return true;
+}
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+bool SkipPrefix(const char* prefix, const char** pstr) {
+  const size_t prefix_len = strlen(prefix);
+  if (strncmp(*pstr, prefix, prefix_len) == 0) {
+    *pstr += prefix_len;
+    return true;
+  }
+  return false;
+}
+
+// Parses a string as a command line flag.  The string should have
+// the format "--flag=value".  When def_optional is true, the "=value"
+// part can be omitted.
+//
+// Returns the value of the flag, or NULL if the parsing failed.
+static const char* ParseFlagValue(const char* str, const char* flag,
+                                  bool def_optional) {
+  // str and flag must not be NULL.
+  if (str == nullptr || flag == nullptr) return nullptr;
+
+  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
+  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
+  const size_t flag_len = flag_str.length();
+  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
+
+  // Skips the flag name.
+  const char* flag_end = str + flag_len;
+
+  // When def_optional is true, it's OK to not have a "=value" part.
+  if (def_optional && (flag_end[0] == '\0')) {
+    return flag_end;
+  }
+
+  // If def_optional is true and there are more characters after the
+  // flag name, or if def_optional is false, there must be a '=' after
+  // the flag name.
+  if (flag_end[0] != '=') return nullptr;
+
+  // Returns the string after "=".
+  return flag_end + 1;
+}
+
+// Parses a string for a bool flag, in the form of either
+// "--flag=value" or "--flag".
+//
+// In the former case, the value is taken as true as long as it does
+// not start with '0', 'f', or 'F'.
+//
+// In the latter case, the value is taken as true.
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Converts the string value to a bool.
+  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
+  return true;
+}
+
+// Parses a string for an int32_t flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Sets *value to the value of the flag.
+  return ParseInt32(Message() << "The value of flag --" << flag,
+                    value_str, value);
+}
+
+// Parses a string for a string flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+template <typename String>
+static bool ParseStringFlag(const char* str, const char* flag, String* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Sets *value to the value of the flag.
+  *value = value_str;
+  return true;
+}
+
+// Determines whether a string has a prefix that Google Test uses for its
+// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
+// If Google Test detects that a command line flag has its prefix but is not
+// recognized, it will print its help message. Flags starting with
+// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
+// internal flags and do not trigger the help message.
+static bool HasGoogleTestFlagPrefix(const char* str) {
+  return (SkipPrefix("--", &str) ||
+          SkipPrefix("-", &str) ||
+          SkipPrefix("/", &str)) &&
+         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
+         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
+          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
+}
+
+// Prints a string containing code-encoded text.  The following escape
+// sequences can be used in the string to control the text color:
+//
+//   @@    prints a single '@' character.
+//   @R    changes the color to red.
+//   @G    changes the color to green.
+//   @Y    changes the color to yellow.
+//   @D    changes to the default terminal text color.
+//
+static void PrintColorEncoded(const char* str) {
+  GTestColor color = GTestColor::kDefault;  // The current color.
+
+  // Conceptually, we split the string into segments divided by escape
+  // sequences.  Then we print one segment at a time.  At the end of
+  // each iteration, the str pointer advances to the beginning of the
+  // next segment.
+  for (;;) {
+    const char* p = strchr(str, '@');
+    if (p == nullptr) {
+      ColoredPrintf(color, "%s", str);
+      return;
+    }
+
+    ColoredPrintf(color, "%s", std::string(str, p).c_str());
+
+    const char ch = p[1];
+    str = p + 2;
+    if (ch == '@') {
+      ColoredPrintf(color, "@");
+    } else if (ch == 'D') {
+      color = GTestColor::kDefault;
+    } else if (ch == 'R') {
+      color = GTestColor::kRed;
+    } else if (ch == 'G') {
+      color = GTestColor::kGreen;
+    } else if (ch == 'Y') {
+      color = GTestColor::kYellow;
+    } else {
+      --str;
+    }
+  }
+}
+
+static const char kColorEncodedHelpMessage[] =
+    "This program contains tests written using " GTEST_NAME_
+    ". You can use the\n"
+    "following command line flags to control its behavior:\n"
+    "\n"
+    "Test Selection:\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "list_tests@D\n"
+    "      List the names of all tests instead of running them. The name of\n"
+    "      TEST(Foo, Bar) is \"Foo.Bar\".\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "filter=@YPOSITIVE_PATTERNS"
+    "[@G-@YNEGATIVE_PATTERNS]@D\n"
+    "      Run only the tests whose name matches one of the positive patterns "
+    "but\n"
+    "      none of the negative patterns. '?' matches any single character; "
+    "'*'\n"
+    "      matches any substring; ':' separates two patterns.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "also_run_disabled_tests@D\n"
+    "      Run all disabled tests too.\n"
+    "\n"
+    "Test Execution:\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "repeat=@Y[COUNT]@D\n"
+    "      Run the tests repeatedly; use a negative count to repeat forever.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "shuffle@D\n"
+    "      Randomize tests' orders on every iteration.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "random_seed=@Y[NUMBER]@D\n"
+    "      Random number seed to use for shuffling test orders (between 1 and\n"
+    "      99999, or 0 to use a seed based on the current time).\n"
+    "\n"
+    "Test Output:\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
+    "      Enable/disable colored output. The default is @Gauto@D.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "brief=1@D\n"
+    "      Only print test failures.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "print_time=0@D\n"
+    "      Don't print the elapsed time of each test.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" GTEST_PATH_SEP_
+    "@Y|@G:@YFILE_PATH]@D\n"
+    "      Generate a JSON or XML report in the given directory or with the "
+    "given\n"
+    "      file name. @YFILE_PATH@D defaults to @Gtest_detail.xml@D.\n"
+# if GTEST_CAN_STREAM_RESULTS_
+    "  @G--" GTEST_FLAG_PREFIX_
+    "stream_result_to=@YHOST@G:@YPORT@D\n"
+    "      Stream test results to the given server.\n"
+# endif  // GTEST_CAN_STREAM_RESULTS_
+    "\n"
+    "Assertion Behavior:\n"
+# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+    "  @G--" GTEST_FLAG_PREFIX_
+    "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
+    "      Set the default death test style.\n"
+# endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+    "  @G--" GTEST_FLAG_PREFIX_
+    "break_on_failure@D\n"
+    "      Turn assertion failures into debugger break-points.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "throw_on_failure@D\n"
+    "      Turn assertion failures into C++ exceptions for use by an external\n"
+    "      test framework.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "catch_exceptions=0@D\n"
+    "      Do not report exceptions as test failures. Instead, allow them\n"
+    "      to crash the program or throw a pop-up (on Windows).\n"
+    "\n"
+    "Except for @G--" GTEST_FLAG_PREFIX_
+    "list_tests@D, you can alternatively set "
+    "the corresponding\n"
+    "environment variable of a flag (all letters in upper-case). For example, "
+    "to\n"
+    "disable colored text output, you can either specify "
+    "@G--" GTEST_FLAG_PREFIX_
+    "color=no@D or set\n"
+    "the @G" GTEST_FLAG_PREFIX_UPPER_
+    "COLOR@D environment variable to @Gno@D.\n"
+    "\n"
+    "For more information, please read the " GTEST_NAME_
+    " documentation at\n"
+    "@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_
+    "\n"
+    "(not one in your own code or tests), please report it to\n"
+    "@G<" GTEST_DEV_EMAIL_ ">@D.\n";
+
+static bool ParseGoogleTestFlag(const char* const arg) {
+  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
+                       &GTEST_FLAG(also_run_disabled_tests)) ||
+         ParseBoolFlag(arg, kBreakOnFailureFlag,
+                       &GTEST_FLAG(break_on_failure)) ||
+         ParseBoolFlag(arg, kCatchExceptionsFlag,
+                       &GTEST_FLAG(catch_exceptions)) ||
+         ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
+         ParseStringFlag(arg, kDeathTestStyleFlag,
+                         &GTEST_FLAG(death_test_style)) ||
+         ParseBoolFlag(arg, kDeathTestUseFork,
+                       &GTEST_FLAG(death_test_use_fork)) ||
+         ParseBoolFlag(arg, kFailFast, &GTEST_FLAG(fail_fast)) ||
+         ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
+         ParseStringFlag(arg, kInternalRunDeathTestFlag,
+                         &GTEST_FLAG(internal_run_death_test)) ||
+         ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
+         ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
+         ParseBoolFlag(arg, kBriefFlag, &GTEST_FLAG(brief)) ||
+         ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
+         ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
+         ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
+         ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
+         ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
+         ParseInt32Flag(arg, kStackTraceDepthFlag,
+                        &GTEST_FLAG(stack_trace_depth)) ||
+         ParseStringFlag(arg, kStreamResultToFlag,
+                         &GTEST_FLAG(stream_result_to)) ||
+         ParseBoolFlag(arg, kThrowOnFailureFlag, &GTEST_FLAG(throw_on_failure));
+}
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+static void LoadFlagsFromFile(const std::string& path) {
+  FILE* flagfile = posix::FOpen(path.c_str(), "r");
+  if (!flagfile) {
+    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
+                      << "\"";
+  }
+  std::string contents(ReadEntireFile(flagfile));
+  posix::FClose(flagfile);
+  std::vector<std::string> lines;
+  SplitString(contents, '\n', &lines);
+  for (size_t i = 0; i < lines.size(); ++i) {
+    if (lines[i].empty())
+      continue;
+    if (!ParseGoogleTestFlag(lines[i].c_str()))
+      g_help_flag = true;
+  }
+}
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.  The type parameter CharType can be
+// instantiated to either char or wchar_t.
+template <typename CharType>
+void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
+  for (int i = 1; i < *argc; i++) {
+    const std::string arg_string = StreamableToString(argv[i]);
+    const char* const arg = arg_string.c_str();
+
+    using internal::ParseBoolFlag;
+    using internal::ParseInt32Flag;
+    using internal::ParseStringFlag;
+
+    bool remove_flag = false;
+    if (ParseGoogleTestFlag(arg)) {
+      remove_flag = true;
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
+      LoadFlagsFromFile(GTEST_FLAG(flagfile));
+      remove_flag = true;
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+    } else if (arg_string == "--help" || arg_string == "-h" ||
+               arg_string == "-?" || arg_string == "/?" ||
+               HasGoogleTestFlagPrefix(arg)) {
+      // Both help flag and unrecognized Google Test flags (excluding
+      // internal ones) trigger help display.
+      g_help_flag = true;
+    }
+
+    if (remove_flag) {
+      // Shift the remainder of the argv list left by one.  Note
+      // that argv has (*argc + 1) elements, the last one always being
+      // NULL.  The following loop moves the trailing NULL element as
+      // well.
+      for (int j = i; j != *argc; j++) {
+        argv[j] = argv[j + 1];
+      }
+
+      // Decrements the argument count.
+      (*argc)--;
+
+      // We also need to decrement the iterator as we just removed
+      // an element.
+      i--;
+    }
+  }
+
+  if (g_help_flag) {
+    // We print the help here instead of in RUN_ALL_TESTS(), as the
+    // latter may not be called at all if the user is using Google
+    // Test with another testing framework.
+    PrintColorEncoded(kColorEncodedHelpMessage);
+  }
+}
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+
+  // Fix the value of *_NSGetArgc() on macOS, but if and only if
+  // *_NSGetArgv() == argv
+  // Only applicable to char** version of argv
+#if GTEST_OS_MAC
+#ifndef GTEST_OS_IOS
+  if (*_NSGetArgv() == argv) {
+    *_NSGetArgc() = *argc;
+  }
+#endif
+#endif
+}
+void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+}
+
+// The internal implementation of InitGoogleTest().
+//
+// The type parameter CharType can be instantiated to either char or
+// wchar_t.
+template <typename CharType>
+void InitGoogleTestImpl(int* argc, CharType** argv) {
+  // We don't want to run the initialization code twice.
+  if (GTestIsInitialized()) return;
+
+  if (*argc <= 0) return;
+
+  g_argvs.clear();
+  for (int i = 0; i != *argc; i++) {
+    g_argvs.push_back(StreamableToString(argv[i]));
+  }
+
+#if GTEST_HAS_ABSL
+  absl::InitializeSymbolizer(g_argvs[0].c_str());
+#endif  // GTEST_HAS_ABSL
+
+  ParseGoogleTestFlagsOnly(argc, argv);
+  GetUnitTestImpl()->PostFlagParsingInit();
+}
+
+}  // namespace internal
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+void InitGoogleTest(int* argc, char** argv) {
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+void InitGoogleTest(int* argc, wchar_t** argv) {
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+void InitGoogleTest() {
+  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
+  int argc = 1;
+  const auto arg0 = "dummy";
+  char* argv0 = const_cast<char*>(arg0);
+  char** argv = &argv0;
+
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(&argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(&argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+std::string TempDir() {
+#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
+  return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
+#elif GTEST_OS_WINDOWS_MOBILE
+  return "\\temp\\";
+#elif GTEST_OS_WINDOWS
+  const char* temp_dir = internal::posix::GetEnv("TEMP");
+  if (temp_dir == nullptr || temp_dir[0] == '\0') {
+    return "\\temp\\";
+  } else if (temp_dir[strlen(temp_dir) - 1] == '\\') {
+    return temp_dir;
+  } else {
+    return std::string(temp_dir) + "\\";
+  }
+#elif GTEST_OS_LINUX_ANDROID
+  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
+  if (temp_dir == nullptr || temp_dir[0] == '\0') {
+    return "/data/local/tmp/";
+  } else {
+    return temp_dir;
+  }
+#elif GTEST_OS_LINUX
+  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
+  if (temp_dir == nullptr || temp_dir[0] == '\0') {
+    return "/tmp/";
+  } else {
+    return temp_dir;
+  }
+#else
+  return "/tmp/";
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Class ScopedTrace
+
+// Pushes the given source file location and message onto a per-thread
+// trace stack maintained by Google Test.
+void ScopedTrace::PushTrace(const char* file, int line, std::string message) {
+  internal::TraceInfo trace;
+  trace.file = file;
+  trace.line = line;
+  trace.message.swap(message);
+
+  UnitTest::GetInstance()->PushGTestTrace(trace);
+}
+
+// Pops the info pushed by the c'tor.
+ScopedTrace::~ScopedTrace()
+    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
+  UnitTest::GetInstance()->PopGTestTrace();
+}
+
+}  // namespace testing
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// This file implements death tests.
+
+
+#include <functional>
+#include <utility>
+
+
+#if GTEST_HAS_DEATH_TEST
+
+# if GTEST_OS_MAC
+#  include <crt_externs.h>
+# endif  // GTEST_OS_MAC
+
+# include <errno.h>
+# include <fcntl.h>
+# include <limits.h>
+
+# if GTEST_OS_LINUX
+#  include <signal.h>
+# endif  // GTEST_OS_LINUX
+
+# include <stdarg.h>
+
+# if GTEST_OS_WINDOWS
+#  include <windows.h>
+# else
+#  include <sys/mman.h>
+#  include <sys/wait.h>
+# endif  // GTEST_OS_WINDOWS
+
+# if GTEST_OS_QNX
+#  include <spawn.h>
+# endif  // GTEST_OS_QNX
+
+# if GTEST_OS_FUCHSIA
+#  include <lib/fdio/fd.h>
+#  include <lib/fdio/io.h>
+#  include <lib/fdio/spawn.h>
+#  include <lib/zx/channel.h>
+#  include <lib/zx/port.h>
+#  include <lib/zx/process.h>
+#  include <lib/zx/socket.h>
+#  include <zircon/processargs.h>
+#  include <zircon/syscalls.h>
+#  include <zircon/syscalls/policy.h>
+#  include <zircon/syscalls/port.h>
+# endif  // GTEST_OS_FUCHSIA
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+
+namespace testing {
+
+// Constants.
+
+// The default death test style.
+//
+// This is defined in internal/gtest-port.h as "fast", but can be overridden by
+// a definition in internal/custom/gtest-port.h. The recommended value, which is
+// used internally at Google, is "threadsafe".
+static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
+
+GTEST_DEFINE_string_(
+    death_test_style,
+    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
+    "Indicates how to run a death test in a forked child process: "
+    "\"threadsafe\" (child process re-executes the test binary "
+    "from the beginning, running only the specific death test) or "
+    "\"fast\" (child process runs the death test immediately "
+    "after forking).");
+
+GTEST_DEFINE_bool_(
+    death_test_use_fork,
+    internal::BoolFromGTestEnv("death_test_use_fork", false),
+    "Instructs to use fork()/_exit() instead of clone() in death tests. "
+    "Ignored and always uses fork() on POSIX systems where clone() is not "
+    "implemented. Useful when running under valgrind or similar tools if "
+    "those do not support clone(). Valgrind 3.3.1 will just fail if "
+    "it sees an unsupported combination of clone() flags. "
+    "It is not recommended to use this flag w/o valgrind though it will "
+    "work in 99% of the cases. Once valgrind is fixed, this flag will "
+    "most likely be removed.");
+
+namespace internal {
+GTEST_DEFINE_string_(
+    internal_run_death_test, "",
+    "Indicates the file, line number, temporal index of "
+    "the single death test to run, and a file descriptor to "
+    "which a success code may be sent, all separated by "
+    "the '|' characters.  This flag is specified if and only if the "
+    "current process is a sub-process launched for running a thread-safe "
+    "death test.  FOR INTERNAL USE ONLY.");
+}  // namespace internal
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Valid only for fast death tests. Indicates the code is running in the
+// child process of a fast style death test.
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+static bool g_in_fast_death_test_child = false;
+# endif
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+bool InDeathTestChild() {
+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  // On Windows and Fuchsia, death tests are thread-safe regardless of the value
+  // of the death_test_style flag.
+  return !GTEST_FLAG(internal_run_death_test).empty();
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe")
+    return !GTEST_FLAG(internal_run_death_test).empty();
+  else
+    return g_in_fast_death_test_child;
+#endif
+}
+
+}  // namespace internal
+
+// ExitedWithCode constructor.
+ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
+}
+
+// ExitedWithCode function-call operator.
+bool ExitedWithCode::operator()(int exit_status) const {
+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  return exit_status == exit_code_;
+
+# else
+
+  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
+
+# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+}
+
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+// KilledBySignal constructor.
+KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
+}
+
+// KilledBySignal function-call operator.
+bool KilledBySignal::operator()(int exit_status) const {
+#  if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
+  {
+    bool result;
+    if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
+      return result;
+    }
+  }
+#  endif  // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
+  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
+}
+# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+
+namespace internal {
+
+// Utilities needed for death tests.
+
+// Generates a textual description of a given exit code, in the format
+// specified by wait(2).
+static std::string ExitSummary(int exit_code) {
+  Message m;
+
+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  m << "Exited with exit status " << exit_code;
+
+# else
+
+  if (WIFEXITED(exit_code)) {
+    m << "Exited with exit status " << WEXITSTATUS(exit_code);
+  } else if (WIFSIGNALED(exit_code)) {
+    m << "Terminated by signal " << WTERMSIG(exit_code);
+  }
+#  ifdef WCOREDUMP
+  if (WCOREDUMP(exit_code)) {
+    m << " (core dumped)";
+  }
+#  endif
+# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  return m.GetString();
+}
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+bool ExitedUnsuccessfully(int exit_status) {
+  return !ExitedWithCode(0)(exit_status);
+}
+
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+// Generates a textual failure message when a death test finds more than
+// one thread running, or cannot determine the number of threads, prior
+// to executing the given statement.  It is the responsibility of the
+// caller not to pass a thread_count of 1.
+static std::string DeathTestThreadWarning(size_t thread_count) {
+  Message msg;
+  msg << "Death tests use fork(), which is unsafe particularly"
+      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
+  if (thread_count == 0) {
+    msg << "couldn't detect the number of threads.";
+  } else {
+    msg << "detected " << thread_count << " threads.";
+  }
+  msg << " See "
+         "https://github.com/google/googletest/blob/master/docs/"
+         "advanced.md#death-tests-and-threads"
+      << " for more explanation and suggested solutions, especially if"
+      << " this is the last message you see before your test times out.";
+  return msg.GetString();
+}
+# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+
+// Flag characters for reporting a death test that did not die.
+static const char kDeathTestLived = 'L';
+static const char kDeathTestReturned = 'R';
+static const char kDeathTestThrew = 'T';
+static const char kDeathTestInternalError = 'I';
+
+#if GTEST_OS_FUCHSIA
+
+// File descriptor used for the pipe in the child process.
+static const int kFuchsiaReadPipeFd = 3;
+
+#endif
+
+// An enumeration describing all of the possible ways that a death test can
+// conclude.  DIED means that the process died while executing the test
+// code; LIVED means that process lived beyond the end of the test code;
+// RETURNED means that the test statement attempted to execute a return
+// statement, which is not allowed; THREW means that the test statement
+// returned control by throwing an exception.  IN_PROGRESS means the test
+// has not yet concluded.
+enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
+
+// Routine for aborting the program which is safe to call from an
+// exec-style death test child process, in which case the error
+// message is propagated back to the parent process.  Otherwise, the
+// message is simply printed to stderr.  In either case, the program
+// then exits with status 1.
+static void DeathTestAbort(const std::string& message) {
+  // On a POSIX system, this function may be called from a threadsafe-style
+  // death test child process, which operates on a very small stack.  Use
+  // the heap for any additional non-minuscule memory requirements.
+  const InternalRunDeathTestFlag* const flag =
+      GetUnitTestImpl()->internal_run_death_test_flag();
+  if (flag != nullptr) {
+    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
+    fputc(kDeathTestInternalError, parent);
+    fprintf(parent, "%s", message.c_str());
+    fflush(parent);
+    _exit(1);
+  } else {
+    fprintf(stderr, "%s", message.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+
+// A replacement for CHECK that calls DeathTestAbort if the assertion
+// fails.
+# define GTEST_DEATH_TEST_CHECK_(expression) \
+  do { \
+    if (!::testing::internal::IsTrue(expression)) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
+// evaluating any system call that fulfills two conditions: it must return
+// -1 on failure, and set errno to EINTR when it is interrupted and
+// should be tried again.  The macro expands to a loop that repeatedly
+// evaluates the expression as long as it evaluates to -1 and sets
+// errno to EINTR.  If the expression evaluates to -1 but errno is
+// something other than EINTR, DeathTestAbort is called.
+# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
+  do { \
+    int gtest_retval; \
+    do { \
+      gtest_retval = (expression); \
+    } while (gtest_retval == -1 && errno == EINTR); \
+    if (gtest_retval == -1) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression + " != -1"); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// Returns the message describing the last system error in errno.
+std::string GetLastErrnoDescription() {
+    return errno == 0 ? "" : posix::StrError(errno);
+}
+
+// This is called from a death test parent process to read a failure
+// message from the death test child process and log it with the FATAL
+// severity. On Windows, the message is read from a pipe handle. On other
+// platforms, it is read from a file descriptor.
+static void FailFromInternalError(int fd) {
+  Message error;
+  char buffer[256];
+  int num_read;
+
+  do {
+    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
+      buffer[num_read] = '\0';
+      error << buffer;
+    }
+  } while (num_read == -1 && errno == EINTR);
+
+  if (num_read == 0) {
+    GTEST_LOG_(FATAL) << error.GetString();
+  } else {
+    const int last_error = errno;
+    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
+                      << GetLastErrnoDescription() << " [" << last_error << "]";
+  }
+}
+
+// Death test constructor.  Increments the running death test count
+// for the current test.
+DeathTest::DeathTest() {
+  TestInfo* const info = GetUnitTestImpl()->current_test_info();
+  if (info == nullptr) {
+    DeathTestAbort("Cannot run a death test outside of a TEST or "
+                   "TEST_F construct");
+  }
+}
+
+// Creates and returns a death test by dispatching to the current
+// death test factory.
+bool DeathTest::Create(const char* statement,
+                       Matcher<const std::string&> matcher, const char* file,
+                       int line, DeathTest** test) {
+  return GetUnitTestImpl()->death_test_factory()->Create(
+      statement, std::move(matcher), file, line, test);
+}
+
+const char* DeathTest::LastMessage() {
+  return last_death_test_message_.c_str();
+}
+
+void DeathTest::set_last_death_test_message(const std::string& message) {
+  last_death_test_message_ = message;
+}
+
+std::string DeathTest::last_death_test_message_;
+
+// Provides cross platform implementation for some death functionality.
+class DeathTestImpl : public DeathTest {
+ protected:
+  DeathTestImpl(const char* a_statement, Matcher<const std::string&> matcher)
+      : statement_(a_statement),
+        matcher_(std::move(matcher)),
+        spawned_(false),
+        status_(-1),
+        outcome_(IN_PROGRESS),
+        read_fd_(-1),
+        write_fd_(-1) {}
+
+  // read_fd_ is expected to be closed and cleared by a derived class.
+  ~DeathTestImpl() override { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
+
+  void Abort(AbortReason reason) override;
+  bool Passed(bool status_ok) override;
+
+  const char* statement() const { return statement_; }
+  bool spawned() const { return spawned_; }
+  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
+  int status() const { return status_; }
+  void set_status(int a_status) { status_ = a_status; }
+  DeathTestOutcome outcome() const { return outcome_; }
+  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
+  int read_fd() const { return read_fd_; }
+  void set_read_fd(int fd) { read_fd_ = fd; }
+  int write_fd() const { return write_fd_; }
+  void set_write_fd(int fd) { write_fd_ = fd; }
+
+  // Called in the parent process only. Reads the result code of the death
+  // test child process via a pipe, interprets it to set the outcome_
+  // member, and closes read_fd_.  Outputs diagnostics and terminates in
+  // case of unexpected codes.
+  void ReadAndInterpretStatusByte();
+
+  // Returns stderr output from the child process.
+  virtual std::string GetErrorLogs();
+
+ private:
+  // The textual content of the code this object is testing.  This class
+  // doesn't own this string and should not attempt to delete it.
+  const char* const statement_;
+  // A matcher that's expected to match the stderr output by the child process.
+  Matcher<const std::string&> matcher_;
+  // True if the death test child process has been successfully spawned.
+  bool spawned_;
+  // The exit status of the child process.
+  int status_;
+  // How the death test concluded.
+  DeathTestOutcome outcome_;
+  // Descriptor to the read end of the pipe to the child process.  It is
+  // always -1 in the child process.  The child keeps its write end of the
+  // pipe in write_fd_.
+  int read_fd_;
+  // Descriptor to the child's write end of the pipe to the parent process.
+  // It is always -1 in the parent process.  The parent keeps its end of the
+  // pipe in read_fd_.
+  int write_fd_;
+};
+
+// Called in the parent process only. Reads the result code of the death
+// test child process via a pipe, interprets it to set the outcome_
+// member, and closes read_fd_.  Outputs diagnostics and terminates in
+// case of unexpected codes.
+void DeathTestImpl::ReadAndInterpretStatusByte() {
+  char flag;
+  int bytes_read;
+
+  // The read() here blocks until data is available (signifying the
+  // failure of the death test) or until the pipe is closed (signifying
+  // its success), so it's okay to call this in the parent before
+  // the child process has exited.
+  do {
+    bytes_read = posix::Read(read_fd(), &flag, 1);
+  } while (bytes_read == -1 && errno == EINTR);
+
+  if (bytes_read == 0) {
+    set_outcome(DIED);
+  } else if (bytes_read == 1) {
+    switch (flag) {
+      case kDeathTestReturned:
+        set_outcome(RETURNED);
+        break;
+      case kDeathTestThrew:
+        set_outcome(THREW);
+        break;
+      case kDeathTestLived:
+        set_outcome(LIVED);
+        break;
+      case kDeathTestInternalError:
+        FailFromInternalError(read_fd());  // Does not return.
+        break;
+      default:
+        GTEST_LOG_(FATAL) << "Death test child process reported "
+                          << "unexpected status byte ("
+                          << static_cast<unsigned int>(flag) << ")";
+    }
+  } else {
+    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
+                      << GetLastErrnoDescription();
+  }
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
+  set_read_fd(-1);
+}
+
+std::string DeathTestImpl::GetErrorLogs() {
+  return GetCapturedStderr();
+}
+
+// Signals that the death test code which should have exited, didn't.
+// Should be called only in a death test child process.
+// Writes a status byte to the child's status file descriptor, then
+// calls _exit(1).
+void DeathTestImpl::Abort(AbortReason reason) {
+  // The parent process considers the death test to be a failure if
+  // it finds any data in our pipe.  So, here we write a single flag byte
+  // to the pipe, then exit.
+  const char status_ch =
+      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
+      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
+
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
+  // We are leaking the descriptor here because on some platforms (i.e.,
+  // when built as Windows DLL), destructors of global objects will still
+  // run after calling _exit(). On such systems, write_fd_ will be
+  // indirectly closed from the destructor of UnitTestImpl, causing double
+  // close if it is also closed here. On debug configurations, double close
+  // may assert. As there are no in-process buffers to flush here, we are
+  // relying on the OS to close the descriptor after the process terminates
+  // when the destructors are not run.
+  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
+}
+
+// Returns an indented copy of stderr output for a death test.
+// This makes distinguishing death test output lines from regular log lines
+// much easier.
+static ::std::string FormatDeathTestOutput(const ::std::string& output) {
+  ::std::string ret;
+  for (size_t at = 0; ; ) {
+    const size_t line_end = output.find('\n', at);
+    ret += "[  DEATH   ] ";
+    if (line_end == ::std::string::npos) {
+      ret += output.substr(at);
+      break;
+    }
+    ret += output.substr(at, line_end + 1 - at);
+    at = line_end + 1;
+  }
+  return ret;
+}
+
+// Assesses the success or failure of a death test, using both private
+// members which have previously been set, and one argument:
+//
+// Private data members:
+//   outcome:  An enumeration describing how the death test
+//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
+//             fails in the latter three cases.
+//   status:   The exit status of the child process. On *nix, it is in the
+//             in the format specified by wait(2). On Windows, this is the
+//             value supplied to the ExitProcess() API or a numeric code
+//             of the exception that terminated the program.
+//   matcher_: A matcher that's expected to match the stderr output by the child
+//             process.
+//
+// Argument:
+//   status_ok: true if exit_status is acceptable in the context of
+//              this particular death test, which fails if it is false
+//
+// Returns true if and only if all of the above conditions are met.  Otherwise,
+// the first failing condition, in the order given above, is the one that is
+// reported. Also sets the last death test message string.
+bool DeathTestImpl::Passed(bool status_ok) {
+  if (!spawned())
+    return false;
+
+  const std::string error_message = GetErrorLogs();
+
+  bool success = false;
+  Message buffer;
+
+  buffer << "Death test: " << statement() << "\n";
+  switch (outcome()) {
+    case LIVED:
+      buffer << "    Result: failed to die.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case THREW:
+      buffer << "    Result: threw an exception.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case RETURNED:
+      buffer << "    Result: illegal return in test statement.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case DIED:
+      if (status_ok) {
+        if (matcher_.Matches(error_message)) {
+          success = true;
+        } else {
+          std::ostringstream stream;
+          matcher_.DescribeTo(&stream);
+          buffer << "    Result: died but not with expected error.\n"
+                 << "  Expected: " << stream.str() << "\n"
+                 << "Actual msg:\n"
+                 << FormatDeathTestOutput(error_message);
+        }
+      } else {
+        buffer << "    Result: died but not with expected exit code:\n"
+               << "            " << ExitSummary(status()) << "\n"
+               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
+      }
+      break;
+    case IN_PROGRESS:
+    default:
+      GTEST_LOG_(FATAL)
+          << "DeathTest::Passed somehow called before conclusion of test";
+  }
+
+  DeathTest::set_last_death_test_message(buffer.GetString());
+  return success;
+}
+
+# if GTEST_OS_WINDOWS
+// WindowsDeathTest implements death tests on Windows. Due to the
+// specifics of starting new processes on Windows, death tests there are
+// always threadsafe, and Google Test considers the
+// --gtest_death_test_style=fast setting to be equivalent to
+// --gtest_death_test_style=threadsafe there.
+//
+// A few implementation notes:  Like the Linux version, the Windows
+// implementation uses pipes for child-to-parent communication. But due to
+// the specifics of pipes on Windows, some extra steps are required:
+//
+// 1. The parent creates a communication pipe and stores handles to both
+//    ends of it.
+// 2. The parent starts the child and provides it with the information
+//    necessary to acquire the handle to the write end of the pipe.
+// 3. The child acquires the write end of the pipe and signals the parent
+//    using a Windows event.
+// 4. Now the parent can release the write end of the pipe on its side. If
+//    this is done before step 3, the object's reference count goes down to
+//    0 and it is destroyed, preventing the child from acquiring it. The
+//    parent now has to release it, or read operations on the read end of
+//    the pipe will not return when the child terminates.
+// 5. The parent reads child's output through the pipe (outcome code and
+//    any possible error messages) from the pipe, and its stderr and then
+//    determines whether to fail the test.
+//
+// Note: to distinguish Win32 API calls from the local method and function
+// calls, the former are explicitly resolved in the global namespace.
+//
+class WindowsDeathTest : public DeathTestImpl {
+ public:
+  WindowsDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
+                   const char* file, int line)
+      : DeathTestImpl(a_statement, std::move(matcher)),
+        file_(file),
+        line_(line) {}
+
+  // All of these virtual functions are inherited from DeathTest.
+  virtual int Wait();
+  virtual TestRole AssumeRole();
+
+ private:
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+  // Handle to the write end of the pipe to the child process.
+  AutoHandle write_handle_;
+  // Child process handle.
+  AutoHandle child_handle_;
+  // Event the child process uses to signal the parent that it has
+  // acquired the handle to the write end of the pipe. After seeing this
+  // event the parent can release its own handles to make sure its
+  // ReadFile() calls return when the child terminates.
+  AutoHandle event_handle_;
+};
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int WindowsDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  // Wait until the child either signals that it has acquired the write end
+  // of the pipe or it dies.
+  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
+  switch (::WaitForMultipleObjects(2,
+                                   wait_handles,
+                                   FALSE,  // Waits for any of the handles.
+                                   INFINITE)) {
+    case WAIT_OBJECT_0:
+    case WAIT_OBJECT_0 + 1:
+      break;
+    default:
+      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
+  }
+
+  // The child has acquired the write end of the pipe or exited.
+  // We release the handle on our side and continue.
+  write_handle_.Reset();
+  event_handle_.Reset();
+
+  ReadAndInterpretStatusByte();
+
+  // Waits for the child process to exit if it haven't already. This
+  // returns immediately if the child has already exited, regardless of
+  // whether previous calls to WaitForMultipleObjects synchronized on this
+  // handle or not.
+  GTEST_DEATH_TEST_CHECK_(
+      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
+                                             INFINITE));
+  DWORD status_code;
+  GTEST_DEATH_TEST_CHECK_(
+      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
+  child_handle_.Reset();
+  set_status(static_cast<int>(status_code));
+  return status();
+}
+
+// The AssumeRole process for a Windows death test.  It creates a child
+// process with the same executable as the current process to run the
+// death test.  The child process is given the --gtest_filter and
+// --gtest_internal_run_death_test flags such that it knows to run the
+// current death test only.
+DeathTest::TestRole WindowsDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != nullptr) {
+    // ParseInternalRunDeathTestFlag() has performed all the necessary
+    // processing.
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  // WindowsDeathTest uses an anonymous pipe to communicate results of
+  // a death test.
+  SECURITY_ATTRIBUTES handles_are_inheritable = {sizeof(SECURITY_ATTRIBUTES),
+                                                 nullptr, TRUE};
+  HANDLE read_handle, write_handle;
+  GTEST_DEATH_TEST_CHECK_(
+      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
+                   0)  // Default buffer size.
+      != FALSE);
+  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
+                                O_RDONLY));
+  write_handle_.Reset(write_handle);
+  event_handle_.Reset(::CreateEvent(
+      &handles_are_inheritable,
+      TRUE,       // The event will automatically reset to non-signaled state.
+      FALSE,      // The initial state is non-signalled.
+      nullptr));  // The even is unnamed.
+  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr);
+  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
+                                  kFilterFlag + "=" + info->test_suite_name() +
+                                  "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
+      "=" + file_ + "|" + StreamableToString(line_) + "|" +
+      StreamableToString(death_test_index) + "|" +
+      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
+      // size_t has the same width as pointers on both 32-bit and 64-bit
+      // Windows platforms.
+      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
+      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
+      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
+
+  char executable_path[_MAX_PATH + 1];  // NOLINT
+  GTEST_DEATH_TEST_CHECK_(_MAX_PATH + 1 != ::GetModuleFileNameA(nullptr,
+                                                                executable_path,
+                                                                _MAX_PATH));
+
+  std::string command_line =
+      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
+      internal_flag + "\"";
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // Flush the log buffers since the log streams are shared with the child.
+  FlushInfoLog();
+
+  // The child process will share the standard handles with the parent.
+  STARTUPINFOA startup_info;
+  memset(&startup_info, 0, sizeof(STARTUPINFO));
+  startup_info.dwFlags = STARTF_USESTDHANDLES;
+  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
+  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
+  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
+
+  PROCESS_INFORMATION process_info;
+  GTEST_DEATH_TEST_CHECK_(
+      ::CreateProcessA(
+          executable_path, const_cast<char*>(command_line.c_str()),
+          nullptr,  // Retuned process handle is not inheritable.
+          nullptr,  // Retuned thread handle is not inheritable.
+          TRUE,  // Child inherits all inheritable handles (for write_handle_).
+          0x0,   // Default creation flags.
+          nullptr,  // Inherit the parent's environment.
+          UnitTest::GetInstance()->original_working_dir(), &startup_info,
+          &process_info) != FALSE);
+  child_handle_.Reset(process_info.hProcess);
+  ::CloseHandle(process_info.hThread);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+# elif GTEST_OS_FUCHSIA
+
+class FuchsiaDeathTest : public DeathTestImpl {
+ public:
+  FuchsiaDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
+                   const char* file, int line)
+      : DeathTestImpl(a_statement, std::move(matcher)),
+        file_(file),
+        line_(line) {}
+
+  // All of these virtual functions are inherited from DeathTest.
+  int Wait() override;
+  TestRole AssumeRole() override;
+  std::string GetErrorLogs() override;
+
+ private:
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+  // The stderr data captured by the child process.
+  std::string captured_stderr_;
+
+  zx::process child_process_;
+  zx::channel exception_channel_;
+  zx::socket stderr_socket_;
+};
+
+// Utility class for accumulating command-line arguments.
+class Arguments {
+ public:
+  Arguments() { args_.push_back(nullptr); }
+
+  ~Arguments() {
+    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
+         ++i) {
+      free(*i);
+    }
+  }
+  void AddArgument(const char* argument) {
+    args_.insert(args_.end() - 1, posix::StrDup(argument));
+  }
+
+  template <typename Str>
+  void AddArguments(const ::std::vector<Str>& arguments) {
+    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
+         i != arguments.end();
+         ++i) {
+      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
+    }
+  }
+  char* const* Argv() {
+    return &args_[0];
+  }
+
+  int size() {
+    return static_cast<int>(args_.size()) - 1;
+  }
+
+ private:
+  std::vector<char*> args_;
+};
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int FuchsiaDeathTest::Wait() {
+  const int kProcessKey = 0;
+  const int kSocketKey = 1;
+  const int kExceptionKey = 2;
+
+  if (!spawned())
+    return 0;
+
+  // Create a port to wait for socket/task/exception events.
+  zx_status_t status_zx;
+  zx::port port;
+  status_zx = zx::port::create(0, &port);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  // Register to wait for the child process to terminate.
+  status_zx = child_process_.wait_async(
+      port, kProcessKey, ZX_PROCESS_TERMINATED, 0);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  // Register to wait for the socket to be readable or closed.
+  status_zx = stderr_socket_.wait_async(
+      port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED, 0);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  // Register to wait for an exception.
+  status_zx = exception_channel_.wait_async(
+      port, kExceptionKey, ZX_CHANNEL_READABLE, 0);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  bool process_terminated = false;
+  bool socket_closed = false;
+  do {
+    zx_port_packet_t packet = {};
+    status_zx = port.wait(zx::time::infinite(), &packet);
+    GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+    if (packet.key == kExceptionKey) {
+      // Process encountered an exception. Kill it directly rather than
+      // letting other handlers process the event. We will get a kProcessKey
+      // event when the process actually terminates.
+      status_zx = child_process_.kill();
+      GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+    } else if (packet.key == kProcessKey) {
+      // Process terminated.
+      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
+      GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
+      process_terminated = true;
+    } else if (packet.key == kSocketKey) {
+      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
+      if (packet.signal.observed & ZX_SOCKET_READABLE) {
+        // Read data from the socket.
+        constexpr size_t kBufferSize = 1024;
+        do {
+          size_t old_length = captured_stderr_.length();
+          size_t bytes_read = 0;
+          captured_stderr_.resize(old_length + kBufferSize);
+          status_zx = stderr_socket_.read(
+              0, &captured_stderr_.front() + old_length, kBufferSize,
+              &bytes_read);
+          captured_stderr_.resize(old_length + bytes_read);
+        } while (status_zx == ZX_OK);
+        if (status_zx == ZX_ERR_PEER_CLOSED) {
+          socket_closed = true;
+        } else {
+          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_ERR_SHOULD_WAIT);
+          status_zx = stderr_socket_.wait_async(
+              port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED, 0);
+          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+        }
+      } else {
+        GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_SOCKET_PEER_CLOSED);
+        socket_closed = true;
+      }
+    }
+  } while (!process_terminated && !socket_closed);
+
+  ReadAndInterpretStatusByte();
+
+  zx_info_process_t buffer;
+  status_zx = child_process_.get_info(ZX_INFO_PROCESS, &buffer, sizeof(buffer),
+                                      nullptr, nullptr);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  GTEST_DEATH_TEST_CHECK_(buffer.flags & ZX_INFO_PROCESS_FLAG_EXITED);
+  set_status(static_cast<int>(buffer.return_code));
+  return status();
+}
+
+// The AssumeRole process for a Fuchsia death test.  It creates a child
+// process with the same executable as the current process to run the
+// death test.  The child process is given the --gtest_filter and
+// --gtest_internal_run_death_test flags such that it knows to run the
+// current death test only.
+DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != nullptr) {
+    // ParseInternalRunDeathTestFlag() has performed all the necessary
+    // processing.
+    set_write_fd(kFuchsiaReadPipeFd);
+    return EXECUTE_TEST;
+  }
+
+  // Flush the log buffers since the log streams are shared with the child.
+  FlushInfoLog();
+
+  // Build the child process command line.
+  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
+                                  kFilterFlag + "=" + info->test_suite_name() +
+                                  "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
+      + file_ + "|"
+      + StreamableToString(line_) + "|"
+      + StreamableToString(death_test_index);
+  Arguments args;
+  args.AddArguments(GetInjectableArgvs());
+  args.AddArgument(filter_flag.c_str());
+  args.AddArgument(internal_flag.c_str());
+
+  // Build the pipe for communication with the child.
+  zx_status_t status;
+  zx_handle_t child_pipe_handle;
+  int child_pipe_fd;
+  status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+  set_read_fd(child_pipe_fd);
+
+  // Set the pipe handle for the child.
+  fdio_spawn_action_t spawn_actions[2] = {};
+  fdio_spawn_action_t* add_handle_action = &spawn_actions[0];
+  add_handle_action->action = FDIO_SPAWN_ACTION_ADD_HANDLE;
+  add_handle_action->h.id = PA_HND(PA_FD, kFuchsiaReadPipeFd);
+  add_handle_action->h.handle = child_pipe_handle;
+
+  // Create a socket pair will be used to receive the child process' stderr.
+  zx::socket stderr_producer_socket;
+  status =
+      zx::socket::create(0, &stderr_producer_socket, &stderr_socket_);
+  GTEST_DEATH_TEST_CHECK_(status >= 0);
+  int stderr_producer_fd = -1;
+  status =
+      fdio_fd_create(stderr_producer_socket.release(), &stderr_producer_fd);
+  GTEST_DEATH_TEST_CHECK_(status >= 0);
+
+  // Make the stderr socket nonblocking.
+  GTEST_DEATH_TEST_CHECK_(fcntl(stderr_producer_fd, F_SETFL, 0) == 0);
+
+  fdio_spawn_action_t* add_stderr_action = &spawn_actions[1];
+  add_stderr_action->action = FDIO_SPAWN_ACTION_CLONE_FD;
+  add_stderr_action->fd.local_fd = stderr_producer_fd;
+  add_stderr_action->fd.target_fd = STDERR_FILENO;
+
+  // Create a child job.
+  zx_handle_t child_job = ZX_HANDLE_INVALID;
+  status = zx_job_create(zx_job_default(), 0, & child_job);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+  zx_policy_basic_t policy;
+  policy.condition = ZX_POL_NEW_ANY;
+  policy.policy = ZX_POL_ACTION_ALLOW;
+  status = zx_job_set_policy(
+      child_job, ZX_JOB_POL_RELATIVE, ZX_JOB_POL_BASIC, &policy, 1);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+
+  // Create an exception channel attached to the |child_job|, to allow
+  // us to suppress the system default exception handler from firing.
+  status =
+      zx_task_create_exception_channel(
+          child_job, 0, exception_channel_.reset_and_get_address());
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+
+  // Spawn the child process.
+  status = fdio_spawn_etc(
+      child_job, FDIO_SPAWN_CLONE_ALL, args.Argv()[0], args.Argv(), nullptr,
+      2, spawn_actions, child_process_.reset_and_get_address(), nullptr);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+std::string FuchsiaDeathTest::GetErrorLogs() {
+  return captured_stderr_;
+}
+
+#else  // We are neither on Windows, nor on Fuchsia.
+
+// ForkingDeathTest provides implementations for most of the abstract
+// methods of the DeathTest interface.  Only the AssumeRole method is
+// left undefined.
+class ForkingDeathTest : public DeathTestImpl {
+ public:
+  ForkingDeathTest(const char* statement, Matcher<const std::string&> matcher);
+
+  // All of these virtual functions are inherited from DeathTest.
+  int Wait() override;
+
+ protected:
+  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
+
+ private:
+  // PID of child process during death test; 0 in the child process itself.
+  pid_t child_pid_;
+};
+
+// Constructs a ForkingDeathTest.
+ForkingDeathTest::ForkingDeathTest(const char* a_statement,
+                                   Matcher<const std::string&> matcher)
+    : DeathTestImpl(a_statement, std::move(matcher)), child_pid_(-1) {}
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int ForkingDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  ReadAndInterpretStatusByte();
+
+  int status_value;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
+  set_status(status_value);
+  return status_value;
+}
+
+// A concrete death test class that forks, then immediately runs the test
+// in the child process.
+class NoExecDeathTest : public ForkingDeathTest {
+ public:
+  NoExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher)
+      : ForkingDeathTest(a_statement, std::move(matcher)) {}
+  TestRole AssumeRole() override;
+};
+
+// The AssumeRole process for a fork-and-run death test.  It implements a
+// straightforward fork, with a simple pipe to transmit the status byte.
+DeathTest::TestRole NoExecDeathTest::AssumeRole() {
+  const size_t thread_count = GetThreadCount();
+  if (thread_count != 1) {
+    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+
+  DeathTest::set_last_death_test_message("");
+  CaptureStderr();
+  // When we fork the process below, the log file buffers are copied, but the
+  // file descriptors are shared.  We flush all log files here so that closing
+  // the file descriptors in the child process doesn't throw off the
+  // synchronization between descriptors and buffers in the parent process.
+  // This is as close to the fork as possible to avoid a race condition in case
+  // there are multiple threads running before the death test, and another
+  // thread writes to the log file.
+  FlushInfoLog();
+
+  const pid_t child_pid = fork();
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  set_child_pid(child_pid);
+  if (child_pid == 0) {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
+    set_write_fd(pipe_fd[1]);
+    // Redirects all logging to stderr in the child process to prevent
+    // concurrent writes to the log files.  We capture stderr in the parent
+    // process and append the child process' output to a log.
+    LogToStderr();
+    // Event forwarding to the listeners of event listener API mush be shut
+    // down in death test subprocesses.
+    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
+    g_in_fast_death_test_child = true;
+    return EXECUTE_TEST;
+  } else {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+    set_read_fd(pipe_fd[0]);
+    set_spawned(true);
+    return OVERSEE_TEST;
+  }
+}
+
+// A concrete death test class that forks and re-executes the main
+// program from the beginning, with command-line flags set that cause
+// only this specific death test to be run.
+class ExecDeathTest : public ForkingDeathTest {
+ public:
+  ExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
+                const char* file, int line)
+      : ForkingDeathTest(a_statement, std::move(matcher)),
+        file_(file),
+        line_(line) {}
+  TestRole AssumeRole() override;
+
+ private:
+  static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() {
+    ::std::vector<std::string> args = GetInjectableArgvs();
+#  if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
+    ::std::vector<std::string> extra_args =
+        GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
+    args.insert(args.end(), extra_args.begin(), extra_args.end());
+#  endif  // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
+    return args;
+  }
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+};
+
+// Utility class for accumulating command-line arguments.
+class Arguments {
+ public:
+  Arguments() { args_.push_back(nullptr); }
+
+  ~Arguments() {
+    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
+         ++i) {
+      free(*i);
+    }
+  }
+  void AddArgument(const char* argument) {
+    args_.insert(args_.end() - 1, posix::StrDup(argument));
+  }
+
+  template <typename Str>
+  void AddArguments(const ::std::vector<Str>& arguments) {
+    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
+         i != arguments.end();
+         ++i) {
+      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
+    }
+  }
+  char* const* Argv() {
+    return &args_[0];
+  }
+
+ private:
+  std::vector<char*> args_;
+};
+
+// A struct that encompasses the arguments to the child process of a
+// threadsafe-style death test process.
+struct ExecDeathTestArgs {
+  char* const* argv;  // Command-line arguments for the child's call to exec
+  int close_fd;       // File descriptor to close; the read end of a pipe
+};
+
+#  if GTEST_OS_QNX
+extern "C" char** environ;
+#  else  // GTEST_OS_QNX
+// The main function for a threadsafe-style death test child process.
+// This function is called in a clone()-ed process and thus must avoid
+// any potentially unsafe operations like malloc or libc functions.
+static int ExecDeathTestChildMain(void* child_arg) {
+  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
+
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  // We can safely call execv() as it's almost a direct system call. We
+  // cannot use execvp() as it's a libc function and thus potentially
+  // unsafe.  Since execv() doesn't search the PATH, the user must
+  // invoke the test program via a valid path that contains at least
+  // one path separator.
+  execv(args->argv[0], args->argv);
+  DeathTestAbort(std::string("execv(") + args->argv[0] + ", ...) in " +
+                 original_dir + " failed: " +
+                 GetLastErrnoDescription());
+  return EXIT_FAILURE;
+}
+#  endif  // GTEST_OS_QNX
+
+#  if GTEST_HAS_CLONE
+// Two utility routines that together determine the direction the stack
+// grows.
+// This could be accomplished more elegantly by a single recursive
+// function, but we want to guard against the unlikely possibility of
+// a smart compiler optimizing the recursion away.
+//
+// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
+// StackLowerThanAddress into StackGrowsDown, which then doesn't give
+// correct answer.
+static void StackLowerThanAddress(const void* ptr,
+                                  bool* result) GTEST_NO_INLINE_;
+// Make sure sanitizers do not tamper with the stack here.
+// Ideally, we want to use `__builtin_frame_address` instead of a local variable
+// address with sanitizer disabled, but it does not work when the
+// compiler optimizes the stack frame out, which happens on PowerPC targets.
+// HWAddressSanitizer add a random tag to the MSB of the local variable address,
+// making comparison result unpredictable.
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+static void StackLowerThanAddress(const void* ptr, bool* result) {
+  int dummy = 0;
+  *result = std::less<const void*>()(&dummy, ptr);
+}
+
+// Make sure AddressSanitizer does not tamper with the stack here.
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+static bool StackGrowsDown() {
+  int dummy = 0;
+  bool result;
+  StackLowerThanAddress(&dummy, &result);
+  return result;
+}
+#  endif  // GTEST_HAS_CLONE
+
+// Spawns a child process with the same executable as the current process in
+// a thread-safe manner and instructs it to run the death test.  The
+// implementation uses fork(2) + exec.  On systems where clone(2) is
+// available, it is used instead, being slightly more thread-safe.  On QNX,
+// fork supports only single-threaded environments, so this function uses
+// spawn(2) there instead.  The function dies with an error message if
+// anything goes wrong.
+static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
+  ExecDeathTestArgs args = { argv, close_fd };
+  pid_t child_pid = -1;
+
+#  if GTEST_OS_QNX
+  // Obtains the current directory and sets it to be closed in the child
+  // process.
+  const int cwd_fd = open(".", O_RDONLY);
+  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  int fd_flags;
+  // Set close_fd to be closed after spawn.
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
+                                        fd_flags | FD_CLOEXEC));
+  struct inheritance inherit = {0};
+  // spawn is a system call.
+  child_pid = spawn(args.argv[0], 0, nullptr, &inherit, args.argv, environ);
+  // Restores the current working directory.
+  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
+
+#  else   // GTEST_OS_QNX
+#   if GTEST_OS_LINUX
+  // When a SIGPROF signal is received while fork() or clone() are executing,
+  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
+  // it after the call to fork()/clone() is complete.
+  struct sigaction saved_sigprof_action;
+  struct sigaction ignore_sigprof_action;
+  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
+  sigemptyset(&ignore_sigprof_action.sa_mask);
+  ignore_sigprof_action.sa_handler = SIG_IGN;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
+      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
+#   endif  // GTEST_OS_LINUX
+
+#   if GTEST_HAS_CLONE
+  const bool use_fork = GTEST_FLAG(death_test_use_fork);
+
+  if (!use_fork) {
+    static const bool stack_grows_down = StackGrowsDown();
+    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
+    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+    void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
+                             MAP_ANON | MAP_PRIVATE, -1, 0);
+    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
+
+    // Maximum stack alignment in bytes:  For a downward-growing stack, this
+    // amount is subtracted from size of the stack space to get an address
+    // that is within the stack space and is aligned on all systems we care
+    // about.  As far as I know there is no ABI with stack alignment greater
+    // than 64.  We assume stack and stack_size already have alignment of
+    // kMaxStackAlignment.
+    const size_t kMaxStackAlignment = 64;
+    void* const stack_top =
+        static_cast<char*>(stack) +
+            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
+    GTEST_DEATH_TEST_CHECK_(
+        static_cast<size_t>(stack_size) > kMaxStackAlignment &&
+        reinterpret_cast<uintptr_t>(stack_top) % kMaxStackAlignment == 0);
+
+    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
+
+    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
+  }
+#   else
+  const bool use_fork = true;
+#   endif  // GTEST_HAS_CLONE
+
+  if (use_fork && (child_pid = fork()) == 0) {
+      ExecDeathTestChildMain(&args);
+      _exit(0);
+  }
+#  endif  // GTEST_OS_QNX
+#  if GTEST_OS_LINUX
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(
+      sigaction(SIGPROF, &saved_sigprof_action, nullptr));
+#  endif  // GTEST_OS_LINUX
+
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  return child_pid;
+}
+
+// The AssumeRole process for a fork-and-exec death test.  It re-executes the
+// main program from the beginning, setting the --gtest_filter
+// and --gtest_internal_run_death_test flags to cause only the current
+// death test to be re-run.
+DeathTest::TestRole ExecDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != nullptr) {
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+  // Clear the close-on-exec flag on the write end of the pipe, lest
+  // it be closed when the child process does an exec:
+  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
+
+  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
+                                  kFilterFlag + "=" + info->test_suite_name() +
+                                  "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
+      + file_ + "|" + StreamableToString(line_) + "|"
+      + StreamableToString(death_test_index) + "|"
+      + StreamableToString(pipe_fd[1]);
+  Arguments args;
+  args.AddArguments(GetArgvsForDeathTestChildProcess());
+  args.AddArgument(filter_flag.c_str());
+  args.AddArgument(internal_flag.c_str());
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // See the comment in NoExecDeathTest::AssumeRole for why the next line
+  // is necessary.
+  FlushInfoLog();
+
+  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+  set_child_pid(child_pid);
+  set_read_fd(pipe_fd[0]);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+# endif  // !GTEST_OS_WINDOWS
+
+// Creates a concrete DeathTest-derived class that depends on the
+// --gtest_death_test_style flag, and sets the pointer pointed to
+// by the "test" argument to its address.  If the test should be
+// skipped, sets that pointer to NULL.  Returns true, unless the
+// flag is set to an invalid value.
+bool DefaultDeathTestFactory::Create(const char* statement,
+                                     Matcher<const std::string&> matcher,
+                                     const char* file, int line,
+                                     DeathTest** test) {
+  UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const int death_test_index = impl->current_test_info()
+      ->increment_death_test_count();
+
+  if (flag != nullptr) {
+    if (death_test_index > flag->index()) {
+      DeathTest::set_last_death_test_message(
+          "Death test count (" + StreamableToString(death_test_index)
+          + ") somehow exceeded expected maximum ("
+          + StreamableToString(flag->index()) + ")");
+      return false;
+    }
+
+    if (!(flag->file() == file && flag->line() == line &&
+          flag->index() == death_test_index)) {
+      *test = nullptr;
+      return true;
+    }
+  }
+
+# if GTEST_OS_WINDOWS
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
+      GTEST_FLAG(death_test_style) == "fast") {
+    *test = new WindowsDeathTest(statement, std::move(matcher), file, line);
+  }
+
+# elif GTEST_OS_FUCHSIA
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
+      GTEST_FLAG(death_test_style) == "fast") {
+    *test = new FuchsiaDeathTest(statement, std::move(matcher), file, line);
+  }
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe") {
+    *test = new ExecDeathTest(statement, std::move(matcher), file, line);
+  } else if (GTEST_FLAG(death_test_style) == "fast") {
+    *test = new NoExecDeathTest(statement, std::move(matcher));
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
+    DeathTest::set_last_death_test_message(
+        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
+        + "\" encountered");
+    return false;
+  }
+
+  return true;
+}
+
+# if GTEST_OS_WINDOWS
+// Recreates the pipe and event handles from the provided parameters,
+// signals the event, and returns a file descriptor wrapped around the pipe
+// handle. This function is called in the child process only.
+static int GetStatusFileDescriptor(unsigned int parent_process_id,
+                            size_t write_handle_as_size_t,
+                            size_t event_handle_as_size_t) {
+  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
+                                                   FALSE,  // Non-inheritable.
+                                                   parent_process_id));
+  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
+    DeathTestAbort("Unable to open parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
+
+  const HANDLE write_handle =
+      reinterpret_cast<HANDLE>(write_handle_as_size_t);
+  HANDLE dup_write_handle;
+
+  // The newly initialized handle is accessible only in the parent
+  // process. To obtain one accessible within the child, we need to use
+  // DuplicateHandle.
+  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
+                         ::GetCurrentProcess(), &dup_write_handle,
+                         0x0,    // Requested privileges ignored since
+                                 // DUPLICATE_SAME_ACCESS is used.
+                         FALSE,  // Request non-inheritable handler.
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
+  HANDLE dup_event_handle;
+
+  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
+                         ::GetCurrentProcess(), &dup_event_handle,
+                         0x0,
+                         FALSE,
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the event handle " +
+                   StreamableToString(event_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const int write_fd =
+      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
+  if (write_fd == -1) {
+    DeathTestAbort("Unable to convert pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " to a file descriptor");
+  }
+
+  // Signals the parent that the write end of the pipe has been acquired
+  // so the parent can release its own write end.
+  ::SetEvent(dup_event_handle);
+
+  return write_fd;
+}
+# endif  // GTEST_OS_WINDOWS
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
+  if (GTEST_FLAG(internal_run_death_test) == "") return nullptr;
+
+  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
+  // can use it here.
+  int line = -1;
+  int index = -1;
+  ::std::vector< ::std::string> fields;
+  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
+  int write_fd = -1;
+
+# if GTEST_OS_WINDOWS
+
+  unsigned int parent_process_id = 0;
+  size_t write_handle_as_size_t = 0;
+  size_t event_handle_as_size_t = 0;
+
+  if (fields.size() != 6
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &parent_process_id)
+      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
+      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
+                   GTEST_FLAG(internal_run_death_test));
+  }
+  write_fd = GetStatusFileDescriptor(parent_process_id,
+                                     write_handle_as_size_t,
+                                     event_handle_as_size_t);
+
+# elif GTEST_OS_FUCHSIA
+
+  if (fields.size() != 3
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
+        + GTEST_FLAG(internal_run_death_test));
+  }
+
+# else
+
+  if (fields.size() != 4
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &write_fd)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
+        + GTEST_FLAG(internal_run_death_test));
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
+}
+
+}  // namespace internal
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace testing
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include <stdlib.h>
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>
+#elif GTEST_OS_WINDOWS
+# include <direct.h>
+# include <io.h>
+#else
+# include <limits.h>
+# include <climits>  // Some Linux distributions define PATH_MAX here.
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_MAX_ _MAX_PATH
+#elif defined(PATH_MAX)
+# define GTEST_PATH_MAX_ PATH_MAX
+#elif defined(_XOPEN_PATH_MAX)
+# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
+#else
+# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
+#endif  // GTEST_OS_WINDOWS
+
+namespace testing {
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+// On Windows, '\\' is the standard path separator, but many tools and the
+// Windows API also accept '/' as an alternate path separator. Unless otherwise
+// noted, a file path can contain either kind of path separators, or a mixture
+// of them.
+const char kPathSeparator = '\\';
+const char kAlternatePathSeparator = '/';
+const char kAlternatePathSeparatorString[] = "/";
+# if GTEST_OS_WINDOWS_MOBILE
+// Windows CE doesn't have a current directory. You should not use
+// the current directory in tests on Windows CE, but this at least
+// provides a reasonable fallback.
+const char kCurrentDirectoryString[] = "\\";
+// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
+const DWORD kInvalidFileAttributes = 0xffffffff;
+# else
+const char kCurrentDirectoryString[] = ".\\";
+# endif  // GTEST_OS_WINDOWS_MOBILE
+#else
+const char kPathSeparator = '/';
+const char kCurrentDirectoryString[] = "./";
+#endif  // GTEST_OS_WINDOWS
+
+// Returns whether the given character is a valid path separator.
+static bool IsPathSeparator(char c) {
+#if GTEST_HAS_ALT_PATH_SEP_
+  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
+#else
+  return c == kPathSeparator;
+#endif
+}
+
+// Returns the current working directory, or "" if unsuccessful.
+FilePath FilePath::GetCurrentDir() {
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||         \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_ESP32 || \
+    GTEST_OS_XTENSA
+  // These platforms do not have a current directory, so we just return
+  // something reasonable.
+  return FilePath(kCurrentDirectoryString);
+#elif GTEST_OS_WINDOWS
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
+#else
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  char* result = getcwd(cwd, sizeof(cwd));
+# if GTEST_OS_NACL
+  // getcwd will likely fail in NaCl due to the sandbox, so return something
+  // reasonable. The user may have provided a shim implementation for getcwd,
+  // however, so fallback only when failure is detected.
+  return FilePath(result == nullptr ? kCurrentDirectoryString : cwd);
+# endif  // GTEST_OS_NACL
+  return FilePath(result == nullptr ? "" : cwd);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns a copy of the FilePath with the case-insensitive extension removed.
+// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+// FilePath("dir/file"). If a case-insensitive extension is not
+// found, returns a copy of the original FilePath.
+FilePath FilePath::RemoveExtension(const char* extension) const {
+  const std::string dot_extension = std::string(".") + extension;
+  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
+    return FilePath(pathname_.substr(
+        0, pathname_.length() - dot_extension.length()));
+  }
+  return *this;
+}
+
+// Returns a pointer to the last occurrence of a valid path separator in
+// the FilePath. On Windows, for example, both '/' and '\' are valid path
+// separators. Returns NULL if no path separator was found.
+const char* FilePath::FindLastPathSeparator() const {
+  const char* const last_sep = strrchr(c_str(), kPathSeparator);
+#if GTEST_HAS_ALT_PATH_SEP_
+  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
+  // Comparing two pointers of which only one is NULL is undefined.
+  if (last_alt_sep != nullptr &&
+      (last_sep == nullptr || last_alt_sep > last_sep)) {
+    return last_alt_sep;
+  }
+#endif
+  return last_sep;
+}
+
+// Returns a copy of the FilePath with the directory part removed.
+// Example: FilePath("path/to/file").RemoveDirectoryName() returns
+// FilePath("file"). If there is no directory part ("just_a_file"), it returns
+// the FilePath unmodified. If there is no file part ("just_a_dir/") it
+// returns an empty FilePath ("").
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveDirectoryName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  return last_sep ? FilePath(last_sep + 1) : *this;
+}
+
+// RemoveFileName returns the directory path with the filename removed.
+// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveFileName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  std::string dir;
+  if (last_sep) {
+    dir = std::string(c_str(), static_cast<size_t>(last_sep + 1 - c_str()));
+  } else {
+    dir = kCurrentDirectoryString;
+  }
+  return FilePath(dir);
+}
+
+// Helper functions for naming files in a directory for xml output.
+
+// Given directory = "dir", base_name = "test", number = 0,
+// extension = "xml", returns "dir/test.xml". If number is greater
+// than zero (e.g., 12), returns "dir/test_12.xml".
+// On Windows platform, uses \ as the separator rather than /.
+FilePath FilePath::MakeFileName(const FilePath& directory,
+                                const FilePath& base_name,
+                                int number,
+                                const char* extension) {
+  std::string file;
+  if (number == 0) {
+    file = base_name.string() + "." + extension;
+  } else {
+    file = base_name.string() + "_" + StreamableToString(number)
+        + "." + extension;
+  }
+  return ConcatPaths(directory, FilePath(file));
+}
+
+// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
+// On Windows, uses \ as the separator rather than /.
+FilePath FilePath::ConcatPaths(const FilePath& directory,
+                               const FilePath& relative_path) {
+  if (directory.IsEmpty())
+    return relative_path;
+  const FilePath dir(directory.RemoveTrailingPathSeparator());
+  return FilePath(dir.string() + kPathSeparator + relative_path.string());
+}
+
+// Returns true if pathname describes something findable in the file-system,
+// either a file, directory, or whatever.
+bool FilePath::FileOrDirectoryExists() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  return attributes != kInvalidFileAttributes;
+#else
+  posix::StatStruct file_stat{};
+  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns true if pathname describes a directory in the file-system
+// that exists.
+bool FilePath::DirectoryExists() const {
+  bool result = false;
+#if GTEST_OS_WINDOWS
+  // Don't strip off trailing separator if path is a root directory on
+  // Windows (like "C:\\").
+  const FilePath& path(IsRootDirectory() ? *this :
+                                           RemoveTrailingPathSeparator());
+#else
+  const FilePath& path(*this);
+#endif
+
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  if ((attributes != kInvalidFileAttributes) &&
+      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
+    result = true;
+  }
+#else
+  posix::StatStruct file_stat{};
+  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
+      posix::IsDir(file_stat);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  return result;
+}
+
+// Returns true if pathname describes a root directory. (Windows has one
+// root directory per disk drive.)
+bool FilePath::IsRootDirectory() const {
+#if GTEST_OS_WINDOWS
+  return pathname_.length() == 3 && IsAbsolutePath();
+#else
+  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
+#endif
+}
+
+// Returns true if pathname describes an absolute path.
+bool FilePath::IsAbsolutePath() const {
+  const char* const name = pathname_.c_str();
+#if GTEST_OS_WINDOWS
+  return pathname_.length() >= 3 &&
+     ((name[0] >= 'a' && name[0] <= 'z') ||
+      (name[0] >= 'A' && name[0] <= 'Z')) &&
+     name[1] == ':' &&
+     IsPathSeparator(name[2]);
+#else
+  return IsPathSeparator(name[0]);
+#endif
+}
+
+// Returns a pathname for a file that does not currently exist. The pathname
+// will be directory/base_name.extension or
+// directory/base_name_<number>.extension if directory/base_name.extension
+// already exists. The number will be incremented until a pathname is found
+// that does not already exist.
+// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+// There could be a race condition if two or more processes are calling this
+// function at the same time -- they could both pick the same filename.
+FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
+                                          const FilePath& base_name,
+                                          const char* extension) {
+  FilePath full_pathname;
+  int number = 0;
+  do {
+    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
+  } while (full_pathname.FileOrDirectoryExists());
+  return full_pathname;
+}
+
+// Returns true if FilePath ends with a path separator, which indicates that
+// it is intended to represent a directory. Returns false otherwise.
+// This does NOT check that a directory (or file) actually exists.
+bool FilePath::IsDirectory() const {
+  return !pathname_.empty() &&
+         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
+}
+
+// Create directories so that path exists. Returns true if successful or if
+// the directories already exist; returns false if unable to create directories
+// for any reason.
+bool FilePath::CreateDirectoriesRecursively() const {
+  if (!this->IsDirectory()) {
+    return false;
+  }
+
+  if (pathname_.length() == 0 || this->DirectoryExists()) {
+    return true;
+  }
+
+  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
+  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
+}
+
+// Create the directory so that path exists. Returns true if successful or
+// if the directory already exists; returns false if unable to create the
+// directory for any reason, including if the parent directory does not
+// exist. Not named "CreateDirectory" because that's a macro on Windows.
+bool FilePath::CreateFolder() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  FilePath removed_sep(this->RemoveTrailingPathSeparator());
+  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
+  int result = CreateDirectory(unicode, nullptr) ? 0 : -1;
+  delete [] unicode;
+#elif GTEST_OS_WINDOWS
+  int result = _mkdir(pathname_.c_str());
+#elif GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+  // do nothing
+  int result = 0;
+#else
+  int result = mkdir(pathname_.c_str(), 0777);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  if (result == -1) {
+    return this->DirectoryExists();  // An error is OK if the directory exists.
+  }
+  return true;  // No error.
+}
+
+// If input name has a trailing separator character, remove it and return the
+// name, otherwise return the name string unmodified.
+// On Windows platform, uses \ as the separator, other platforms use /.
+FilePath FilePath::RemoveTrailingPathSeparator() const {
+  return IsDirectory()
+      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
+      : *this;
+}
+
+// Removes any redundant separators that might be in the pathname.
+// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+// redundancies that might be in a pathname involving "." or "..".
+void FilePath::Normalize() {
+  auto out = pathname_.begin();
+
+  for (const char character : pathname_) {
+    if (!IsPathSeparator(character)) {
+      *(out++) = character;
+    } else if (out == pathname_.begin() || *std::prev(out) != kPathSeparator) {
+      *(out++) = kPathSeparator;
+    } else {
+      continue;
+    }
+  }
+
+  pathname_.erase(out, pathname_.end());
+}
+
+}  // namespace internal
+}  // namespace testing
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This file implements just enough of the matcher interface to allow
+// EXPECT_DEATH and friends to accept a matcher argument.
+
+
+#include <string>
+
+namespace testing {
+
+// Constructs a matcher that matches a const std::string& whose value is
+// equal to s.
+Matcher<const std::string&>::Matcher(const std::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a const std::string& whose value is
+// equal to s.
+Matcher<const std::string&>::Matcher(const char* s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a std::string whose value is equal to
+// s.
+Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a std::string whose value is equal to
+// s.
+Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); }
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// Constructs a matcher that matches a const StringView& whose value is
+// equal to s.
+Matcher<const internal::StringView&>::Matcher(const std::string& s) {
+  *this = Eq(s);
+}
+
+// Constructs a matcher that matches a const StringView& whose value is
+// equal to s.
+Matcher<const internal::StringView&>::Matcher(const char* s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a const StringView& whose value is
+// equal to s.
+Matcher<const internal::StringView&>::Matcher(internal::StringView s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a StringView whose value is equal to
+// s.
+Matcher<internal::StringView>::Matcher(const std::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a StringView whose value is equal to
+// s.
+Matcher<internal::StringView>::Matcher(const char* s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a StringView whose value is equal to
+// s.
+Matcher<internal::StringView>::Matcher(internal::StringView s) {
+  *this = Eq(std::string(s));
+}
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+}  // namespace testing
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <cstdint>
+#include <fstream>
+#include <memory>
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>
+# include <io.h>
+# include <sys/stat.h>
+# include <map>  // Used in ThreadLocal.
+# ifdef _MSC_VER
+#  include <crtdbg.h>
+# endif  // _MSC_VER
+#else
+# include <unistd.h>
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_MAC
+# include <mach/mach_init.h>
+# include <mach/task.h>
+# include <mach/vm_map.h>
+#endif  // GTEST_OS_MAC
+
+#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
+    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+# include <sys/sysctl.h>
+# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
+#  include <sys/user.h>
+# endif
+#endif
+
+#if GTEST_OS_QNX
+# include <devctl.h>
+# include <fcntl.h>
+# include <sys/procfs.h>
+#endif  // GTEST_OS_QNX
+
+#if GTEST_OS_AIX
+# include <procinfo.h>
+# include <sys/types.h>
+#endif  // GTEST_OS_AIX
+
+#if GTEST_OS_FUCHSIA
+# include <zircon/process.h>
+# include <zircon/syscalls.h>
+#endif  // GTEST_OS_FUCHSIA
+
+
+namespace testing {
+namespace internal {
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
+const int kStdOutFileno = 1;
+const int kStdErrFileno = 2;
+#else
+const int kStdOutFileno = STDOUT_FILENO;
+const int kStdErrFileno = STDERR_FILENO;
+#endif  // _MSC_VER
+
+#if GTEST_OS_LINUX
+
+namespace {
+template <typename T>
+T ReadProcFileField(const std::string& filename, int field) {
+  std::string dummy;
+  std::ifstream file(filename.c_str());
+  while (field-- > 0) {
+    file >> dummy;
+  }
+  T output = 0;
+  file >> output;
+  return output;
+}
+}  // namespace
+
+// Returns the number of active threads, or 0 when there is an error.
+size_t GetThreadCount() {
+  const std::string filename =
+      (Message() << "/proc/" << getpid() << "/stat").GetString();
+  return ReadProcFileField<size_t>(filename, 19);
+}
+
+#elif GTEST_OS_MAC
+
+size_t GetThreadCount() {
+  const task_t task = mach_task_self();
+  mach_msg_type_number_t thread_count;
+  thread_act_array_t thread_list;
+  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
+  if (status == KERN_SUCCESS) {
+    // task_threads allocates resources in thread_list and we need to free them
+    // to avoid leaks.
+    vm_deallocate(task,
+                  reinterpret_cast<vm_address_t>(thread_list),
+                  sizeof(thread_t) * thread_count);
+    return static_cast<size_t>(thread_count);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
+      GTEST_OS_NETBSD
+
+#if GTEST_OS_NETBSD
+#undef KERN_PROC
+#define KERN_PROC KERN_PROC2
+#define kinfo_proc kinfo_proc2
+#endif
+
+#if GTEST_OS_DRAGONFLY
+#define KP_NLWP(kp) (kp.kp_nthreads)
+#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
+#define KP_NLWP(kp) (kp.ki_numthreads)
+#elif GTEST_OS_NETBSD
+#define KP_NLWP(kp) (kp.p_nlwps)
+#endif
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  int mib[] = {
+    CTL_KERN,
+    KERN_PROC,
+    KERN_PROC_PID,
+    getpid(),
+#if GTEST_OS_NETBSD
+    sizeof(struct kinfo_proc),
+    1,
+#endif
+  };
+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
+  struct kinfo_proc info;
+  size_t size = sizeof(info);
+  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
+    return 0;
+  }
+  return static_cast<size_t>(KP_NLWP(info));
+}
+#elif GTEST_OS_OPENBSD
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  int mib[] = {
+    CTL_KERN,
+    KERN_PROC,
+    KERN_PROC_PID | KERN_PROC_SHOW_THREADS,
+    getpid(),
+    sizeof(struct kinfo_proc),
+    0,
+  };
+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
+
+  // get number of structs
+  size_t size;
+  if (sysctl(mib, miblen, NULL, &size, NULL, 0)) {
+    return 0;
+  }
+
+  mib[5] = static_cast<int>(size / static_cast<size_t>(mib[4]));
+
+  // populate array of structs
+  struct kinfo_proc info[mib[5]];
+  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
+    return 0;
+  }
+
+  // exclude empty members
+  size_t nthreads = 0;
+  for (size_t i = 0; i < size / static_cast<size_t>(mib[4]); i++) {
+    if (info[i].p_tid != -1)
+      nthreads++;
+  }
+  return nthreads;
+}
+
+#elif GTEST_OS_QNX
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  const int fd = open("/proc/self/as", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+  procfs_info process_info;
+  const int status =
+      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), nullptr);
+  close(fd);
+  if (status == EOK) {
+    return static_cast<size_t>(process_info.num_threads);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_AIX
+
+size_t GetThreadCount() {
+  struct procentry64 entry;
+  pid_t pid = getpid();
+  int status = getprocs64(&entry, sizeof(entry), nullptr, 0, &pid, 1);
+  if (status == 1) {
+    return entry.pi_thcount;
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_FUCHSIA
+
+size_t GetThreadCount() {
+  int dummy_buffer;
+  size_t avail;
+  zx_status_t status = zx_object_get_info(
+      zx_process_self(),
+      ZX_INFO_PROCESS_THREADS,
+      &dummy_buffer,
+      0,
+      nullptr,
+      &avail);
+  if (status == ZX_OK) {
+    return avail;
+  } else {
+    return 0;
+  }
+}
+
+#else
+
+size_t GetThreadCount() {
+  // There's no portable way to detect the number of threads, so we just
+  // return 0 to indicate that we cannot detect it.
+  return 0;
+}
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
+
+void SleepMilliseconds(int n) {
+  ::Sleep(static_cast<DWORD>(n));
+}
+
+AutoHandle::AutoHandle()
+    : handle_(INVALID_HANDLE_VALUE) {}
+
+AutoHandle::AutoHandle(Handle handle)
+    : handle_(handle) {}
+
+AutoHandle::~AutoHandle() {
+  Reset();
+}
+
+AutoHandle::Handle AutoHandle::Get() const {
+  return handle_;
+}
+
+void AutoHandle::Reset() {
+  Reset(INVALID_HANDLE_VALUE);
+}
+
+void AutoHandle::Reset(HANDLE handle) {
+  // Resetting with the same handle we already own is invalid.
+  if (handle_ != handle) {
+    if (IsCloseable()) {
+      ::CloseHandle(handle_);
+    }
+    handle_ = handle;
+  } else {
+    GTEST_CHECK_(!IsCloseable())
+        << "Resetting a valid handle to itself is likely a programmer error "
+            "and thus not allowed.";
+  }
+}
+
+bool AutoHandle::IsCloseable() const {
+  // Different Windows APIs may use either of these values to represent an
+  // invalid handle.
+  return handle_ != nullptr && handle_ != INVALID_HANDLE_VALUE;
+}
+
+Notification::Notification()
+    : event_(::CreateEvent(nullptr,     // Default security attributes.
+                           TRUE,        // Do not reset automatically.
+                           FALSE,       // Initially unset.
+                           nullptr)) {  // Anonymous event.
+  GTEST_CHECK_(event_.Get() != nullptr);
+}
+
+void Notification::Notify() {
+  GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
+}
+
+void Notification::WaitForNotification() {
+  GTEST_CHECK_(
+      ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
+}
+
+Mutex::Mutex()
+    : owner_thread_id_(0),
+      type_(kDynamic),
+      critical_section_init_phase_(0),
+      critical_section_(new CRITICAL_SECTION) {
+  ::InitializeCriticalSection(critical_section_);
+}
+
+Mutex::~Mutex() {
+  // Static mutexes are leaked intentionally. It is not thread-safe to try
+  // to clean them up.
+  if (type_ == kDynamic) {
+    ::DeleteCriticalSection(critical_section_);
+    delete critical_section_;
+    critical_section_ = nullptr;
+  }
+}
+
+void Mutex::Lock() {
+  ThreadSafeLazyInit();
+  ::EnterCriticalSection(critical_section_);
+  owner_thread_id_ = ::GetCurrentThreadId();
+}
+
+void Mutex::Unlock() {
+  ThreadSafeLazyInit();
+  // We don't protect writing to owner_thread_id_ here, as it's the
+  // caller's responsibility to ensure that the current thread holds the
+  // mutex when this is called.
+  owner_thread_id_ = 0;
+  ::LeaveCriticalSection(critical_section_);
+}
+
+// Does nothing if the current thread holds the mutex. Otherwise, crashes
+// with high probability.
+void Mutex::AssertHeld() {
+  ThreadSafeLazyInit();
+  GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
+      << "The current thread is not holding the mutex @" << this;
+}
+
+namespace {
+
+#ifdef _MSC_VER
+// Use the RAII idiom to flag mem allocs that are intentionally never
+// deallocated. The motivation is to silence the false positive mem leaks
+// that are reported by the debug version of MS's CRT which can only detect
+// if an alloc is missing a matching deallocation.
+// Example:
+//    MemoryIsNotDeallocated memory_is_not_deallocated;
+//    critical_section_ = new CRITICAL_SECTION;
+//
+class MemoryIsNotDeallocated
+{
+ public:
+  MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
+    old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+    // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
+    // doesn't report mem leak if there's no matching deallocation.
+    _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
+  }
+
+  ~MemoryIsNotDeallocated() {
+    // Restore the original _CRTDBG_ALLOC_MEM_DF flag
+    _CrtSetDbgFlag(old_crtdbg_flag_);
+  }
+
+ private:
+  int old_crtdbg_flag_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
+};
+#endif  // _MSC_VER
+
+}  // namespace
+
+// Initializes owner_thread_id_ and critical_section_ in static mutexes.
+void Mutex::ThreadSafeLazyInit() {
+  // Dynamic mutexes are initialized in the constructor.
+  if (type_ == kStatic) {
+    switch (
+        ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
+      case 0:
+        // If critical_section_init_phase_ was 0 before the exchange, we
+        // are the first to test it and need to perform the initialization.
+        owner_thread_id_ = 0;
+        {
+          // Use RAII to flag that following mem alloc is never deallocated.
+#ifdef _MSC_VER
+          MemoryIsNotDeallocated memory_is_not_deallocated;
+#endif  // _MSC_VER
+          critical_section_ = new CRITICAL_SECTION;
+        }
+        ::InitializeCriticalSection(critical_section_);
+        // Updates the critical_section_init_phase_ to 2 to signal
+        // initialization complete.
+        GTEST_CHECK_(::InterlockedCompareExchange(
+                          &critical_section_init_phase_, 2L, 1L) ==
+                      1L);
+        break;
+      case 1:
+        // Somebody else is already initializing the mutex; spin until they
+        // are done.
+        while (::InterlockedCompareExchange(&critical_section_init_phase_,
+                                            2L,
+                                            2L) != 2L) {
+          // Possibly yields the rest of the thread's time slice to other
+          // threads.
+          ::Sleep(0);
+        }
+        break;
+
+      case 2:
+        break;  // The mutex is already initialized and ready for use.
+
+      default:
+        GTEST_CHECK_(false)
+            << "Unexpected value of critical_section_init_phase_ "
+            << "while initializing a static mutex.";
+    }
+  }
+}
+
+namespace {
+
+class ThreadWithParamSupport : public ThreadWithParamBase {
+ public:
+  static HANDLE CreateThread(Runnable* runnable,
+                             Notification* thread_can_start) {
+    ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
+    DWORD thread_id;
+    HANDLE thread_handle = ::CreateThread(
+        nullptr,  // Default security.
+        0,        // Default stack size.
+        &ThreadWithParamSupport::ThreadMain,
+        param,        // Parameter to ThreadMainStatic
+        0x0,          // Default creation flags.
+        &thread_id);  // Need a valid pointer for the call to work under Win98.
+    GTEST_CHECK_(thread_handle != nullptr)
+        << "CreateThread failed with error " << ::GetLastError() << ".";
+    if (thread_handle == nullptr) {
+      delete param;
+    }
+    return thread_handle;
+  }
+
+ private:
+  struct ThreadMainParam {
+    ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
+        : runnable_(runnable),
+          thread_can_start_(thread_can_start) {
+    }
+    std::unique_ptr<Runnable> runnable_;
+    // Does not own.
+    Notification* thread_can_start_;
+  };
+
+  static DWORD WINAPI ThreadMain(void* ptr) {
+    // Transfers ownership.
+    std::unique_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
+    if (param->thread_can_start_ != nullptr)
+      param->thread_can_start_->WaitForNotification();
+    param->runnable_->Run();
+    return 0;
+  }
+
+  // Prohibit instantiation.
+  ThreadWithParamSupport();
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
+};
+
+}  // namespace
+
+ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
+                                         Notification* thread_can_start)
+      : thread_(ThreadWithParamSupport::CreateThread(runnable,
+                                                     thread_can_start)) {
+}
+
+ThreadWithParamBase::~ThreadWithParamBase() {
+  Join();
+}
+
+void ThreadWithParamBase::Join() {
+  GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
+      << "Failed to join the thread with error " << ::GetLastError() << ".";
+}
+
+// Maps a thread to a set of ThreadIdToThreadLocals that have values
+// instantiated on that thread and notifies them when the thread exits.  A
+// ThreadLocal instance is expected to persist until all threads it has
+// values on have terminated.
+class ThreadLocalRegistryImpl {
+ public:
+  // Registers thread_local_instance as having value on the current thread.
+  // Returns a value that can be used to identify the thread from other threads.
+  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance) {
+#ifdef _MSC_VER
+    MemoryIsNotDeallocated memory_is_not_deallocated;
+#endif  // _MSC_VER
+    DWORD current_thread = ::GetCurrentThreadId();
+    MutexLock lock(&mutex_);
+    ThreadIdToThreadLocals* const thread_to_thread_locals =
+        GetThreadLocalsMapLocked();
+    ThreadIdToThreadLocals::iterator thread_local_pos =
+        thread_to_thread_locals->find(current_thread);
+    if (thread_local_pos == thread_to_thread_locals->end()) {
+      thread_local_pos = thread_to_thread_locals->insert(
+          std::make_pair(current_thread, ThreadLocalValues())).first;
+      StartWatcherThreadFor(current_thread);
+    }
+    ThreadLocalValues& thread_local_values = thread_local_pos->second;
+    ThreadLocalValues::iterator value_pos =
+        thread_local_values.find(thread_local_instance);
+    if (value_pos == thread_local_values.end()) {
+      value_pos =
+          thread_local_values
+              .insert(std::make_pair(
+                  thread_local_instance,
+                  std::shared_ptr<ThreadLocalValueHolderBase>(
+                      thread_local_instance->NewValueForCurrentThread())))
+              .first;
+    }
+    return value_pos->second.get();
+  }
+
+  static void OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance) {
+    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
+    // Clean up the ThreadLocalValues data structure while holding the lock, but
+    // defer the destruction of the ThreadLocalValueHolderBases.
+    {
+      MutexLock lock(&mutex_);
+      ThreadIdToThreadLocals* const thread_to_thread_locals =
+          GetThreadLocalsMapLocked();
+      for (ThreadIdToThreadLocals::iterator it =
+          thread_to_thread_locals->begin();
+          it != thread_to_thread_locals->end();
+          ++it) {
+        ThreadLocalValues& thread_local_values = it->second;
+        ThreadLocalValues::iterator value_pos =
+            thread_local_values.find(thread_local_instance);
+        if (value_pos != thread_local_values.end()) {
+          value_holders.push_back(value_pos->second);
+          thread_local_values.erase(value_pos);
+          // This 'if' can only be successful at most once, so theoretically we
+          // could break out of the loop here, but we don't bother doing so.
+        }
+      }
+    }
+    // Outside the lock, let the destructor for 'value_holders' deallocate the
+    // ThreadLocalValueHolderBases.
+  }
+
+  static void OnThreadExit(DWORD thread_id) {
+    GTEST_CHECK_(thread_id != 0) << ::GetLastError();
+    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
+    // Clean up the ThreadIdToThreadLocals data structure while holding the
+    // lock, but defer the destruction of the ThreadLocalValueHolderBases.
+    {
+      MutexLock lock(&mutex_);
+      ThreadIdToThreadLocals* const thread_to_thread_locals =
+          GetThreadLocalsMapLocked();
+      ThreadIdToThreadLocals::iterator thread_local_pos =
+          thread_to_thread_locals->find(thread_id);
+      if (thread_local_pos != thread_to_thread_locals->end()) {
+        ThreadLocalValues& thread_local_values = thread_local_pos->second;
+        for (ThreadLocalValues::iterator value_pos =
+            thread_local_values.begin();
+            value_pos != thread_local_values.end();
+            ++value_pos) {
+          value_holders.push_back(value_pos->second);
+        }
+        thread_to_thread_locals->erase(thread_local_pos);
+      }
+    }
+    // Outside the lock, let the destructor for 'value_holders' deallocate the
+    // ThreadLocalValueHolderBases.
+  }
+
+ private:
+  // In a particular thread, maps a ThreadLocal object to its value.
+  typedef std::map<const ThreadLocalBase*,
+                   std::shared_ptr<ThreadLocalValueHolderBase> >
+      ThreadLocalValues;
+  // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
+  // thread's ID.
+  typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
+
+  // Holds the thread id and thread handle that we pass from
+  // StartWatcherThreadFor to WatcherThreadFunc.
+  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
+
+  static void StartWatcherThreadFor(DWORD thread_id) {
+    // The returned handle will be kept in thread_map and closed by
+    // watcher_thread in WatcherThreadFunc.
+    HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
+                                 FALSE,
+                                 thread_id);
+    GTEST_CHECK_(thread != nullptr);
+    // We need to pass a valid thread ID pointer into CreateThread for it
+    // to work correctly under Win98.
+    DWORD watcher_thread_id;
+    HANDLE watcher_thread = ::CreateThread(
+        nullptr,  // Default security.
+        0,        // Default stack size
+        &ThreadLocalRegistryImpl::WatcherThreadFunc,
+        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
+        CREATE_SUSPENDED, &watcher_thread_id);
+    GTEST_CHECK_(watcher_thread != nullptr);
+    // Give the watcher thread the same priority as ours to avoid being
+    // blocked by it.
+    ::SetThreadPriority(watcher_thread,
+                        ::GetThreadPriority(::GetCurrentThread()));
+    ::ResumeThread(watcher_thread);
+    ::CloseHandle(watcher_thread);
+  }
+
+  // Monitors exit from a given thread and notifies those
+  // ThreadIdToThreadLocals about thread termination.
+  static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
+    const ThreadIdAndHandle* tah =
+        reinterpret_cast<const ThreadIdAndHandle*>(param);
+    GTEST_CHECK_(
+        ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
+    OnThreadExit(tah->first);
+    ::CloseHandle(tah->second);
+    delete tah;
+    return 0;
+  }
+
+  // Returns map of thread local instances.
+  static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
+    mutex_.AssertHeld();
+#ifdef _MSC_VER
+    MemoryIsNotDeallocated memory_is_not_deallocated;
+#endif  // _MSC_VER
+    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
+    return map;
+  }
+
+  // Protects access to GetThreadLocalsMapLocked() and its return value.
+  static Mutex mutex_;
+  // Protects access to GetThreadMapLocked() and its return value.
+  static Mutex thread_map_mutex_;
+};
+
+Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);  // NOLINT
+Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);  // NOLINT
+
+ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance) {
+  return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
+      thread_local_instance);
+}
+
+void ThreadLocalRegistry::OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance) {
+  ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
+}
+
+#endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
+
+#if GTEST_USES_POSIX_RE
+
+// Implements RE.  Currently only needed for death tests.
+
+RE::~RE() {
+  if (is_valid_) {
+    // regfree'ing an invalid regex might crash because the content
+    // of the regex is undefined. Since the regex's are essentially
+    // the same, one cannot be valid (or invalid) without the other
+    // being so too.
+    regfree(&partial_regex_);
+    regfree(&full_regex_);
+  }
+  free(const_cast<char*>(pattern_));
+}
+
+// Returns true if and only if regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
+}
+
+// Returns true if and only if regular expression re matches a substring of
+// str (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = posix::StrDup(regex);
+
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match.
+  const size_t full_regex_len = strlen(regex) + 10;
+  char* const full_pattern = new char[full_regex_len];
+
+  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
+  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
+  // We want to call regcomp(&partial_regex_, ...) even if the
+  // previous expression returns false.  Otherwise partial_regex_ may
+  // not be properly initialized can may cause trouble when it's
+  // freed.
+  //
+  // Some implementation of POSIX regex (e.g. on at least some
+  // versions of Cygwin) doesn't accept the empty string as a valid
+  // regex.  We change it to an equivalent form "()" to be safe.
+  if (is_valid_) {
+    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
+    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
+  }
+  EXPECT_TRUE(is_valid_)
+      << "Regular expression \"" << regex
+      << "\" is not a valid POSIX Extended regular expression.";
+
+  delete[] full_pattern;
+}
+
+#elif GTEST_USES_SIMPLE_RE
+
+// Returns true if and only if ch appears anywhere in str (excluding the
+// terminating '\0' character).
+bool IsInSet(char ch, const char* str) {
+  return ch != '\0' && strchr(str, ch) != nullptr;
+}
+
+// Returns true if and only if ch belongs to the given classification.
+// Unlike similar functions in <ctype.h>, these aren't affected by the
+// current locale.
+bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
+bool IsAsciiPunct(char ch) {
+  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
+}
+bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
+bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
+bool IsAsciiWordChar(char ch) {
+  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
+      ('0' <= ch && ch <= '9') || ch == '_';
+}
+
+// Returns true if and only if "\\c" is a supported escape sequence.
+bool IsValidEscape(char c) {
+  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
+}
+
+// Returns true if and only if the given atom (specified by escaped and
+// pattern) matches ch.  The result is undefined if the atom is invalid.
+bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
+  if (escaped) {  // "\\p" where p is pattern_char.
+    switch (pattern_char) {
+      case 'd': return IsAsciiDigit(ch);
+      case 'D': return !IsAsciiDigit(ch);
+      case 'f': return ch == '\f';
+      case 'n': return ch == '\n';
+      case 'r': return ch == '\r';
+      case 's': return IsAsciiWhiteSpace(ch);
+      case 'S': return !IsAsciiWhiteSpace(ch);
+      case 't': return ch == '\t';
+      case 'v': return ch == '\v';
+      case 'w': return IsAsciiWordChar(ch);
+      case 'W': return !IsAsciiWordChar(ch);
+    }
+    return IsAsciiPunct(pattern_char) && pattern_char == ch;
+  }
+
+  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
+}
+
+// Helper function used by ValidateRegex() to format error messages.
+static std::string FormatRegexSyntaxError(const char* regex, int index) {
+  return (Message() << "Syntax error at index " << index
+          << " in simple regular expression \"" << regex << "\": ").GetString();
+}
+
+// Generates non-fatal failures and returns false if regex is invalid;
+// otherwise returns true.
+bool ValidateRegex(const char* regex) {
+  if (regex == nullptr) {
+    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
+    return false;
+  }
+
+  bool is_valid = true;
+
+  // True if and only if ?, *, or + can follow the previous atom.
+  bool prev_repeatable = false;
+  for (int i = 0; regex[i]; i++) {
+    if (regex[i] == '\\') {  // An escape sequence
+      i++;
+      if (regex[i] == '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "'\\' cannot appear at the end.";
+        return false;
+      }
+
+      if (!IsValidEscape(regex[i])) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "invalid escape sequence \"\\" << regex[i] << "\".";
+        is_valid = false;
+      }
+      prev_repeatable = true;
+    } else {  // Not an escape sequence.
+      const char ch = regex[i];
+
+      if (ch == '^' && i > 0) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'^' can only appear at the beginning.";
+        is_valid = false;
+      } else if (ch == '$' && regex[i + 1] != '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'$' can only appear at the end.";
+        is_valid = false;
+      } else if (IsInSet(ch, "()[]{}|")) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' is unsupported.";
+        is_valid = false;
+      } else if (IsRepeat(ch) && !prev_repeatable) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' can only follow a repeatable token.";
+        is_valid = false;
+      }
+
+      prev_repeatable = !IsInSet(ch, "^$?*+");
+    }
+  }
+
+  return is_valid;
+}
+
+// Matches a repeated regex atom followed by a valid simple regular
+// expression.  The regex atom is defined as c if escaped is false,
+// or \c otherwise.  repeat is the repetition meta character (?, *,
+// or +).  The behavior is undefined if str contains too many
+// characters to be indexable by size_t, in which case the test will
+// probably time out anyway.  We are fine with this limitation as
+// std::string has it too.
+bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char c, char repeat, const char* regex,
+    const char* str) {
+  const size_t min_count = (repeat == '+') ? 1 : 0;
+  const size_t max_count = (repeat == '?') ? 1 :
+      static_cast<size_t>(-1) - 1;
+  // We cannot call numeric_limits::max() as it conflicts with the
+  // max() macro on Windows.
+
+  for (size_t i = 0; i <= max_count; ++i) {
+    // We know that the atom matches each of the first i characters in str.
+    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
+      // We have enough matches at the head, and the tail matches too.
+      // Since we only care about *whether* the pattern matches str
+      // (as opposed to *how* it matches), there is no need to find a
+      // greedy match.
+      return true;
+    }
+    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
+      return false;
+  }
+  return false;
+}
+
+// Returns true if and only if regex matches a prefix of str. regex must
+// be a valid simple regular expression and not start with "^", or the
+// result is undefined.
+bool MatchRegexAtHead(const char* regex, const char* str) {
+  if (*regex == '\0')  // An empty regex matches a prefix of anything.
+    return true;
+
+  // "$" only matches the end of a string.  Note that regex being
+  // valid guarantees that there's nothing after "$" in it.
+  if (*regex == '$')
+    return *str == '\0';
+
+  // Is the first thing in regex an escape sequence?
+  const bool escaped = *regex == '\\';
+  if (escaped)
+    ++regex;
+  if (IsRepeat(regex[1])) {
+    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
+    // here's an indirect recursion.  It terminates as the regex gets
+    // shorter in each recursion.
+    return MatchRepetitionAndRegexAtHead(
+        escaped, regex[0], regex[1], regex + 2, str);
+  } else {
+    // regex isn't empty, isn't "$", and doesn't start with a
+    // repetition.  We match the first atom of regex with the first
+    // character of str and recurse.
+    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
+        MatchRegexAtHead(regex + 1, str + 1);
+  }
+}
+
+// Returns true if and only if regex matches any substring of str.  regex must
+// be a valid simple regular expression, or the result is undefined.
+//
+// The algorithm is recursive, but the recursion depth doesn't exceed
+// the regex length, so we won't need to worry about running out of
+// stack space normally.  In rare cases the time complexity can be
+// exponential with respect to the regex length + the string length,
+// but usually it's must faster (often close to linear).
+bool MatchRegexAnywhere(const char* regex, const char* str) {
+  if (regex == nullptr || str == nullptr) return false;
+
+  if (*regex == '^')
+    return MatchRegexAtHead(regex + 1, str);
+
+  // A successful match can be anywhere in str.
+  do {
+    if (MatchRegexAtHead(regex, str))
+      return true;
+  } while (*str++ != '\0');
+  return false;
+}
+
+// Implements the RE class.
+
+RE::~RE() {
+  free(const_cast<char*>(pattern_));
+  free(const_cast<char*>(full_pattern_));
+}
+
+// Returns true if and only if regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
+}
+
+// Returns true if and only if regular expression re matches a substring of
+// str (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = full_pattern_ = nullptr;
+  if (regex != nullptr) {
+    pattern_ = posix::StrDup(regex);
+  }
+
+  is_valid_ = ValidateRegex(regex);
+  if (!is_valid_) {
+    // No need to calculate the full pattern when the regex is invalid.
+    return;
+  }
+
+  const size_t len = strlen(regex);
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match: we need space to prepend a '^', append a '$', and
+  // terminate the string with '\0'.
+  char* buffer = static_cast<char*>(malloc(len + 3));
+  full_pattern_ = buffer;
+
+  if (*regex != '^')
+    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
+
+  // We don't use snprintf or strncpy, as they trigger a warning when
+  // compiled with VC++ 8.0.
+  memcpy(buffer, regex, len);
+  buffer += len;
+
+  if (len == 0 || regex[len - 1] != '$')
+    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
+
+  *buffer = '\0';
+}
+
+#endif  // GTEST_USES_POSIX_RE
+
+const char kUnknownFile[] = "unknown file";
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
+  const std::string file_name(file == nullptr ? kUnknownFile : file);
+
+  if (line < 0) {
+    return file_name + ":";
+  }
+#ifdef _MSC_VER
+  return file_name + "(" + StreamableToString(line) + "):";
+#else
+  return file_name + ":" + StreamableToString(line) + ":";
+#endif  // _MSC_VER
+}
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+// Note that FormatCompilerIndependentFileLocation() does NOT append colon
+// to the file location it produces, unlike FormatFileLocation().
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
+    const char* file, int line) {
+  const std::string file_name(file == nullptr ? kUnknownFile : file);
+
+  if (line < 0)
+    return file_name;
+  else
+    return file_name + ":" + StreamableToString(line);
+}
+
+GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
+    : severity_(severity) {
+  const char* const marker =
+      severity == GTEST_INFO ?    "[  INFO ]" :
+      severity == GTEST_WARNING ? "[WARNING]" :
+      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
+  GetStream() << ::std::endl << marker << " "
+              << FormatFileLocation(file, line).c_str() << ": ";
+}
+
+// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+GTestLog::~GTestLog() {
+  GetStream() << ::std::endl;
+  if (severity_ == GTEST_FATAL) {
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+
+// Disable Microsoft deprecation warnings for POSIX functions called from
+// this class (creat, dup, dup2, and close)
+GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Object that captures an output stream (stdout/stderr).
+class CapturedStream {
+ public:
+  // The ctor redirects the stream to a temporary file.
+  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
+# if GTEST_OS_WINDOWS
+    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+
+    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
+    const UINT success = ::GetTempFileNameA(temp_dir_path,
+                                            "gtest_redir",
+                                            0,  // Generate unique file name.
+                                            temp_file_path);
+    GTEST_CHECK_(success != 0)
+        << "Unable to create a temporary file in " << temp_dir_path;
+    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
+    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
+                                    << temp_file_path;
+    filename_ = temp_file_path;
+# else
+    // There's no guarantee that a test has write access to the current
+    // directory, so we create the temporary file in a temporary directory.
+    std::string name_template;
+
+#  if GTEST_OS_LINUX_ANDROID
+    // Note: Android applications are expected to call the framework's
+    // Context.getExternalStorageDirectory() method through JNI to get
+    // the location of the world-writable SD Card directory. However,
+    // this requires a Context handle, which cannot be retrieved
+    // globally from native code. Doing so also precludes running the
+    // code as part of a regular standalone executable, which doesn't
+    // run in a Dalvik process (e.g. when running it through 'adb shell').
+    //
+    // The location /data/local/tmp is directly accessible from native code.
+    // '/sdcard' and other variants cannot be relied on, as they are not
+    // guaranteed to be mounted, or may have a delay in mounting.
+    name_template = "/data/local/tmp/";
+#  elif GTEST_OS_IOS
+    char user_temp_dir[PATH_MAX + 1];
+
+    // Documented alternative to NSTemporaryDirectory() (for obtaining creating
+    // a temporary directory) at
+    // https://developer.apple.com/library/archive/documentation/Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html#//apple_ref/doc/uid/TP40002585-SW10
+    //
+    // _CS_DARWIN_USER_TEMP_DIR (as well as _CS_DARWIN_USER_CACHE_DIR) is not
+    // documented in the confstr() man page at
+    // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/confstr.3.html#//apple_ref/doc/man/3/confstr
+    // but are still available, according to the WebKit patches at
+    // https://trac.webkit.org/changeset/262004/webkit
+    // https://trac.webkit.org/changeset/263705/webkit
+    //
+    // The confstr() implementation falls back to getenv("TMPDIR"). See
+    // https://opensource.apple.com/source/Libc/Libc-1439.100.3/gen/confstr.c.auto.html
+    ::confstr(_CS_DARWIN_USER_TEMP_DIR, user_temp_dir, sizeof(user_temp_dir));
+
+    name_template = user_temp_dir;
+    if (name_template.back() != GTEST_PATH_SEP_[0])
+      name_template.push_back(GTEST_PATH_SEP_[0]);
+#  else
+    name_template = "/tmp/";
+#  endif
+    name_template.append("gtest_captured_stream.XXXXXX");
+
+    // mkstemp() modifies the string bytes in place, and does not go beyond the
+    // string's length. This results in well-defined behavior in C++17.
+    //
+    // The const_cast is needed below C++17. The constraints on std::string
+    // implementations in C++11 and above make assumption behind the const_cast
+    // fairly safe.
+    const int captured_fd = ::mkstemp(const_cast<char*>(name_template.data()));
+    if (captured_fd == -1) {
+      GTEST_LOG_(WARNING)
+          << "Failed to create tmp file " << name_template
+          << " for test; does the test have access to the /tmp directory?";
+    }
+    filename_ = std::move(name_template);
+# endif  // GTEST_OS_WINDOWS
+    fflush(nullptr);
+    dup2(captured_fd, fd_);
+    close(captured_fd);
+  }
+
+  ~CapturedStream() {
+    remove(filename_.c_str());
+  }
+
+  std::string GetCapturedString() {
+    if (uncaptured_fd_ != -1) {
+      // Restores the original stream.
+      fflush(nullptr);
+      dup2(uncaptured_fd_, fd_);
+      close(uncaptured_fd_);
+      uncaptured_fd_ = -1;
+    }
+
+    FILE* const file = posix::FOpen(filename_.c_str(), "r");
+    if (file == nullptr) {
+      GTEST_LOG_(FATAL) << "Failed to open tmp file " << filename_
+                        << " for capturing stream.";
+    }
+    const std::string content = ReadEntireFile(file);
+    posix::FClose(file);
+    return content;
+  }
+
+ private:
+  const int fd_;  // A stream to capture.
+  int uncaptured_fd_;
+  // Name of the temporary file holding the stderr output.
+  ::std::string filename_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
+};
+
+GTEST_DISABLE_MSC_DEPRECATED_POP_()
+
+static CapturedStream* g_captured_stderr = nullptr;
+static CapturedStream* g_captured_stdout = nullptr;
+
+// Starts capturing an output stream (stdout/stderr).
+static void CaptureStream(int fd, const char* stream_name,
+                          CapturedStream** stream) {
+  if (*stream != nullptr) {
+    GTEST_LOG_(FATAL) << "Only one " << stream_name
+                      << " capturer can exist at a time.";
+  }
+  *stream = new CapturedStream(fd);
+}
+
+// Stops capturing the output stream and returns the captured string.
+static std::string GetCapturedStream(CapturedStream** captured_stream) {
+  const std::string content = (*captured_stream)->GetCapturedString();
+
+  delete *captured_stream;
+  *captured_stream = nullptr;
+
+  return content;
+}
+
+// Starts capturing stdout.
+void CaptureStdout() {
+  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
+}
+
+// Starts capturing stderr.
+void CaptureStderr() {
+  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
+}
+
+// Stops capturing stdout and returns the captured string.
+std::string GetCapturedStdout() {
+  return GetCapturedStream(&g_captured_stdout);
+}
+
+// Stops capturing stderr and returns the captured string.
+std::string GetCapturedStderr() {
+  return GetCapturedStream(&g_captured_stderr);
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+
+
+
+
+size_t GetFileSize(FILE* file) {
+  fseek(file, 0, SEEK_END);
+  return static_cast<size_t>(ftell(file));
+}
+
+std::string ReadEntireFile(FILE* file) {
+  const size_t file_size = GetFileSize(file);
+  char* const buffer = new char[file_size];
+
+  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
+  size_t bytes_read = 0;       // # of bytes read so far
+
+  fseek(file, 0, SEEK_SET);
+
+  // Keeps reading the file until we cannot read further or the
+  // pre-determined file size is reached.
+  do {
+    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
+    bytes_read += bytes_last_read;
+  } while (bytes_last_read > 0 && bytes_read < file_size);
+
+  const std::string content(buffer, bytes_read);
+  delete[] buffer;
+
+  return content;
+}
+
+#if GTEST_HAS_DEATH_TEST
+static const std::vector<std::string>* g_injected_test_argvs =
+    nullptr;  // Owned.
+
+std::vector<std::string> GetInjectableArgvs() {
+  if (g_injected_test_argvs != nullptr) {
+    return *g_injected_test_argvs;
+  }
+  return GetArgvs();
+}
+
+void SetInjectableArgvs(const std::vector<std::string>* new_argvs) {
+  if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs;
+  g_injected_test_argvs = new_argvs;
+}
+
+void SetInjectableArgvs(const std::vector<std::string>& new_argvs) {
+  SetInjectableArgvs(
+      new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
+}
+
+void ClearInjectableArgvs() {
+  delete g_injected_test_argvs;
+  g_injected_test_argvs = nullptr;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+#if GTEST_OS_WINDOWS_MOBILE
+namespace posix {
+void Abort() {
+  DebugBreak();
+  TerminateProcess(GetCurrentProcess(), 1);
+}
+}  // namespace posix
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Returns the name of the environment variable corresponding to the
+// given flag.  For example, FlagToEnvVar("foo") will return
+// "GTEST_FOO" in the open-source version.
+static std::string FlagToEnvVar(const char* flag) {
+  const std::string full_flag =
+      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
+
+  Message env_var;
+  for (size_t i = 0; i != full_flag.length(); i++) {
+    env_var << ToUpper(full_flag.c_str()[i]);
+  }
+
+  return env_var.GetString();
+}
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes
+// the result to *value and returns true; otherwise leaves *value
+// unchanged and returns false.
+bool ParseInt32(const Message& src_text, const char* str, int32_t* value) {
+  // Parses the environment variable as a decimal integer.
+  char* end = nullptr;
+  const long long_value = strtol(str, &end, 10);  // NOLINT
+
+  // Has strtol() consumed all characters in the string?
+  if (*end != '\0') {
+    // No - an invalid character was encountered.
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value \"" << str << "\".\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  // Is the parsed value in the range of an int32_t?
+  const auto result = static_cast<int32_t>(long_value);
+  if (long_value == LONG_MAX || long_value == LONG_MIN ||
+      // The parsed value overflows as a long.  (strtol() returns
+      // LONG_MAX or LONG_MIN when the input overflows.)
+      result != long_value
+      // The parsed value overflows as an int32_t.
+      ) {
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value " << str << ", which overflows.\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  *value = result;
+  return true;
+}
+
+// Reads and returns the Boolean environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+//
+// The value is considered true if and only if it's not "0".
+bool BoolFromGTestEnv(const char* flag, bool default_value) {
+#if defined(GTEST_GET_BOOL_FROM_ENV_)
+  return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
+#else
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  return string_value == nullptr ? default_value
+                                 : strcmp(string_value, "0") != 0;
+#endif  // defined(GTEST_GET_BOOL_FROM_ENV_)
+}
+
+// Reads and returns a 32-bit integer stored in the environment
+// variable corresponding to the given flag; if it isn't set or
+// doesn't represent a valid 32-bit integer, returns default_value.
+int32_t Int32FromGTestEnv(const char* flag, int32_t default_value) {
+#if defined(GTEST_GET_INT32_FROM_ENV_)
+  return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
+#else
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  if (string_value == nullptr) {
+    // The environment variable is not set.
+    return default_value;
+  }
+
+  int32_t result = default_value;
+  if (!ParseInt32(Message() << "Environment variable " << env_var,
+                  string_value, &result)) {
+    printf("The default value %s is used.\n",
+           (Message() << default_value).GetString().c_str());
+    fflush(stdout);
+    return default_value;
+  }
+
+  return result;
+#endif  // defined(GTEST_GET_INT32_FROM_ENV_)
+}
+
+// As a special case for the 'output' flag, if GTEST_OUTPUT is not
+// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
+// system.  The value of XML_OUTPUT_FILE is a filename without the
+// "xml:" prefix of GTEST_OUTPUT.
+// Note that this is meant to be called at the call site so it does
+// not check that the flag is 'output'
+// In essence this checks an env variable called XML_OUTPUT_FILE
+// and if it is set we prepend "xml:" to its value, if it not set we return ""
+std::string OutputFlagAlsoCheckEnvVar(){
+  std::string default_value_for_output_flag = "";
+  const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
+  if (nullptr != xml_output_file_env) {
+    default_value_for_output_flag = std::string("xml:") + xml_output_file_env;
+  }
+  return default_value_for_output_flag;
+}
+
+// Reads and returns the string environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+const char* StringFromGTestEnv(const char* flag, const char* default_value) {
+#if defined(GTEST_GET_STRING_FROM_ENV_)
+  return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
+#else
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const value = posix::GetEnv(env_var.c_str());
+  return value == nullptr ? default_value : value;
+#endif  // defined(GTEST_GET_STRING_FROM_ENV_)
+}
+
+}  // namespace internal
+}  // namespace testing
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Test - The Google C++ Testing and Mocking Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// It uses the << operator when possible, and prints the bytes in the
+// object otherwise.  A user can override its behavior for a class
+// type Foo by defining either operator<<(::std::ostream&, const Foo&)
+// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
+// defines Foo.
+
+
+#include <stdio.h>
+
+#include <cctype>
+#include <cstdint>
+#include <cwchar>
+#include <ostream>  // NOLINT
+#include <string>
+#include <type_traits>
+
+
+namespace testing {
+
+namespace {
+
+using ::std::ostream;
+
+// Prints a segment of bytes in the given object.
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
+                                size_t count, ostream* os) {
+  char text[5] = "";
+  for (size_t i = 0; i != count; i++) {
+    const size_t j = start + i;
+    if (i != 0) {
+      // Organizes the bytes into groups of 2 for easy parsing by
+      // human.
+      if ((j % 2) == 0)
+        *os << ' ';
+      else
+        *os << '-';
+    }
+    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
+    *os << text;
+  }
+}
+
+// Prints the bytes in the given value to the given ostream.
+void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
+                              ostream* os) {
+  // Tells the user how big the object is.
+  *os << count << "-byte object <";
+
+  const size_t kThreshold = 132;
+  const size_t kChunkSize = 64;
+  // If the object size is bigger than kThreshold, we'll have to omit
+  // some details by printing only the first and the last kChunkSize
+  // bytes.
+  if (count < kThreshold) {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
+  } else {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
+    *os << " ... ";
+    // Rounds up to 2-byte boundary.
+    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
+    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
+  }
+  *os << ">";
+}
+
+// Helpers for widening a character to char32_t. Since the standard does not
+// specify if char / wchar_t is signed or unsigned, it is important to first
+// convert it to the unsigned type of the same width before widening it to
+// char32_t.
+template <typename CharType>
+char32_t ToChar32(CharType in) {
+  return static_cast<char32_t>(
+      static_cast<typename std::make_unsigned<CharType>::type>(in));
+}
+
+}  // namespace
+
+namespace internal {
+
+// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
+// given object.  The delegation simplifies the implementation, which
+// uses the << operator and thus is easier done outside of the
+// ::testing::internal namespace, which contains a << operator that
+// sometimes conflicts with the one in STL.
+void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
+                          ostream* os) {
+  PrintBytesInObjectToImpl(obj_bytes, count, os);
+}
+
+// Depending on the value of a char (or wchar_t), we print it in one
+// of three formats:
+//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
+//   - as a hexadecimal escape sequence (e.g. '\x7F'), or
+//   - as a special escape sequence (e.g. '\r', '\n').
+enum CharFormat {
+  kAsIs,
+  kHexEscape,
+  kSpecialEscape
+};
+
+// Returns true if c is a printable ASCII character.  We test the
+// value of c directly instead of calling isprint(), which is buggy on
+// Windows Mobile.
+inline bool IsPrintableAscii(char32_t c) { return 0x20 <= c && c <= 0x7E; }
+
+// Prints c (of type char, char8_t, char16_t, char32_t, or wchar_t) as a
+// character literal without the quotes, escaping it when necessary; returns how
+// c was formatted.
+template <typename Char>
+static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
+  const char32_t u_c = ToChar32(c);
+  switch (u_c) {
+    case L'\0':
+      *os << "\\0";
+      break;
+    case L'\'':
+      *os << "\\'";
+      break;
+    case L'\\':
+      *os << "\\\\";
+      break;
+    case L'\a':
+      *os << "\\a";
+      break;
+    case L'\b':
+      *os << "\\b";
+      break;
+    case L'\f':
+      *os << "\\f";
+      break;
+    case L'\n':
+      *os << "\\n";
+      break;
+    case L'\r':
+      *os << "\\r";
+      break;
+    case L'\t':
+      *os << "\\t";
+      break;
+    case L'\v':
+      *os << "\\v";
+      break;
+    default:
+      if (IsPrintableAscii(u_c)) {
+        *os << static_cast<char>(c);
+        return kAsIs;
+      } else {
+        ostream::fmtflags flags = os->flags();
+        *os << "\\x" << std::hex << std::uppercase << static_cast<int>(u_c);
+        os->flags(flags);
+        return kHexEscape;
+      }
+  }
+  return kSpecialEscape;
+}
+
+// Prints a char32_t c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(char32_t c, ostream* os) {
+  switch (c) {
+    case L'\'':
+      *os << "'";
+      return kAsIs;
+    case L'"':
+      *os << "\\\"";
+      return kSpecialEscape;
+    default:
+      return PrintAsCharLiteralTo(c, os);
+  }
+}
+
+static const char* GetCharWidthPrefix(char) {
+  return "";
+}
+
+static const char* GetCharWidthPrefix(signed char) {
+  return "";
+}
+
+static const char* GetCharWidthPrefix(unsigned char) {
+  return "";
+}
+
+#ifdef __cpp_char8_t
+static const char* GetCharWidthPrefix(char8_t) {
+  return "u8";
+}
+#endif
+
+static const char* GetCharWidthPrefix(char16_t) {
+  return "u";
+}
+
+static const char* GetCharWidthPrefix(char32_t) {
+  return "U";
+}
+
+static const char* GetCharWidthPrefix(wchar_t) {
+  return "L";
+}
+
+// Prints a char c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+
+#ifdef __cpp_char8_t
+static CharFormat PrintAsStringLiteralTo(char8_t c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+#endif
+
+static CharFormat PrintAsStringLiteralTo(char16_t c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+
+static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+
+// Prints a character c (of type char, char8_t, char16_t, char32_t, or wchar_t)
+// and its code. '\0' is printed as "'\\0'", other unprintable characters are
+// also properly escaped using the standard C++ escape sequence.
+template <typename Char>
+void PrintCharAndCodeTo(Char c, ostream* os) {
+  // First, print c as a literal in the most readable form we can find.
+  *os << GetCharWidthPrefix(c) << "'";
+  const CharFormat format = PrintAsCharLiteralTo(c, os);
+  *os << "'";
+
+  // To aid user debugging, we also print c's code in decimal, unless
+  // it's 0 (in which case c was printed as '\\0', making the code
+  // obvious).
+  if (c == 0)
+    return;
+  *os << " (" << static_cast<int>(c);
+
+  // For more convenience, we print c's code again in hexadecimal,
+  // unless c was already printed in the form '\x##' or the code is in
+  // [1, 9].
+  if (format == kHexEscape || (1 <= c && c <= 9)) {
+    // Do nothing.
+  } else {
+    *os << ", 0x" << String::FormatHexInt(static_cast<int>(c));
+  }
+  *os << ")";
+}
+
+void PrintTo(unsigned char c, ::std::ostream* os) { PrintCharAndCodeTo(c, os); }
+void PrintTo(signed char c, ::std::ostream* os) { PrintCharAndCodeTo(c, os); }
+
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
+void PrintTo(wchar_t wc, ostream* os) { PrintCharAndCodeTo(wc, os); }
+
+// TODO(dcheng): Consider making this delegate to PrintCharAndCodeTo() as well.
+void PrintTo(char32_t c, ::std::ostream* os) {
+  *os << std::hex << "U+" << std::uppercase << std::setfill('0') << std::setw(4)
+      << static_cast<uint32_t>(c);
+}
+
+// Prints the given array of characters to the ostream.  CharType must be either
+// char, char8_t, char16_t, char32_t, or wchar_t.
+// The array starts at begin, the length is len, it may include '\0' characters
+// and may not be NUL-terminated.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+static CharFormat PrintCharsAsStringTo(
+    const CharType* begin, size_t len, ostream* os) {
+  const char* const quote_prefix = GetCharWidthPrefix(*begin);
+  *os << quote_prefix << "\"";
+  bool is_previous_hex = false;
+  CharFormat print_format = kAsIs;
+  for (size_t index = 0; index < len; ++index) {
+    const CharType cur = begin[index];
+    if (is_previous_hex && IsXDigit(cur)) {
+      // Previous character is of '\x..' form and this character can be
+      // interpreted as another hexadecimal digit in its number. Break string to
+      // disambiguate.
+      *os << "\" " << quote_prefix << "\"";
+    }
+    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
+    // Remember if any characters required hex escaping.
+    if (is_previous_hex) {
+      print_format = kHexEscape;
+    }
+  }
+  *os << "\"";
+  return print_format;
+}
+
+// Prints a (const) char/wchar_t array of 'len' elements, starting at address
+// 'begin'.  CharType must be either char or wchar_t.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+static void UniversalPrintCharArray(
+    const CharType* begin, size_t len, ostream* os) {
+  // The code
+  //   const char kFoo[] = "foo";
+  // generates an array of 4, not 3, elements, with the last one being '\0'.
+  //
+  // Therefore when printing a char array, we don't print the last element if
+  // it's '\0', such that the output matches the string literal as it's
+  // written in the source code.
+  if (len > 0 && begin[len - 1] == '\0') {
+    PrintCharsAsStringTo(begin, len - 1, os);
+    return;
+  }
+
+  // If, however, the last element in the array is not '\0', e.g.
+  //    const char kFoo[] = { 'f', 'o', 'o' };
+  // we must print the entire array.  We also print a message to indicate
+  // that the array is not NUL-terminated.
+  PrintCharsAsStringTo(begin, len, os);
+  *os << " (no terminating NUL)";
+}
+
+// Prints a (const) char array of 'len' elements, starting at address 'begin'.
+void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+#ifdef __cpp_char8_t
+// Prints a (const) char8_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const char8_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+#endif
+
+// Prints a (const) char16_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const char16_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints a (const) char32_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const char32_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints a (const) wchar_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+namespace {
+
+// Prints a null-terminated C-style string to the ostream.
+template <typename Char>
+void PrintCStringTo(const Char* s, ostream* os) {
+  if (s == nullptr) {
+    *os << "NULL";
+  } else {
+    *os << ImplicitCast_<const void*>(s) << " pointing to ";
+    PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
+  }
+}
+
+}  // anonymous namespace
+
+void PrintTo(const char* s, ostream* os) { PrintCStringTo(s, os); }
+
+#ifdef __cpp_char8_t
+void PrintTo(const char8_t* s, ostream* os) { PrintCStringTo(s, os); }
+#endif
+
+void PrintTo(const char16_t* s, ostream* os) { PrintCStringTo(s, os); }
+
+void PrintTo(const char32_t* s, ostream* os) { PrintCStringTo(s, os); }
+
+// MSVC compiler can be configured to define whar_t as a typedef
+// of unsigned short. Defining an overload for const wchar_t* in that case
+// would cause pointers to unsigned shorts be printed as wide strings,
+// possibly accessing more memory than intended and causing invalid
+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
+// wchar_t is implemented as a native type.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Prints the given wide C string to the ostream.
+void PrintTo(const wchar_t* s, ostream* os) { PrintCStringTo(s, os); }
+#endif  // wchar_t is native
+
+namespace {
+
+bool ContainsUnprintableControlCodes(const char* str, size_t length) {
+  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
+
+  for (size_t i = 0; i < length; i++) {
+    unsigned char ch = *s++;
+    if (std::iscntrl(ch)) {
+        switch (ch) {
+        case '\t':
+        case '\n':
+        case '\r':
+          break;
+        default:
+          return true;
+        }
+      }
+  }
+  return false;
+}
+
+bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; }
+
+bool IsValidUTF8(const char* str, size_t length) {
+  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
+
+  for (size_t i = 0; i < length;) {
+    unsigned char lead = s[i++];
+
+    if (lead <= 0x7f) {
+      continue;  // single-byte character (ASCII) 0..7F
+    }
+    if (lead < 0xc2) {
+      return false;  // trail byte or non-shortest form
+    } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) {
+      ++i;  // 2-byte character
+    } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length &&
+               IsUTF8TrailByte(s[i]) &&
+               IsUTF8TrailByte(s[i + 1]) &&
+               // check for non-shortest form and surrogate
+               (lead != 0xe0 || s[i] >= 0xa0) &&
+               (lead != 0xed || s[i] < 0xa0)) {
+      i += 2;  // 3-byte character
+    } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length &&
+               IsUTF8TrailByte(s[i]) &&
+               IsUTF8TrailByte(s[i + 1]) &&
+               IsUTF8TrailByte(s[i + 2]) &&
+               // check for non-shortest form
+               (lead != 0xf0 || s[i] >= 0x90) &&
+               (lead != 0xf4 || s[i] < 0x90)) {
+      i += 3;  // 4-byte character
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
+  if (!ContainsUnprintableControlCodes(str, length) &&
+      IsValidUTF8(str, length)) {
+    *os << "\n    As Text: \"" << str << "\"";
+  }
+}
+
+}  // anonymous namespace
+
+void PrintStringTo(const ::std::string& s, ostream* os) {
+  if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
+    if (GTEST_FLAG(print_utf8)) {
+      ConditionalPrintAsText(s.data(), s.size(), os);
+    }
+  }
+}
+
+#ifdef __cpp_char8_t
+void PrintU8StringTo(const ::std::u8string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif
+
+void PrintU16StringTo(const ::std::u16string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+
+void PrintU32StringTo(const ::std::u32string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+
+#if GTEST_HAS_STD_WSTRING
+void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+}  // namespace internal
+
+}  // namespace testing
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+
+
+
+namespace testing {
+
+using internal::GetUnitTestImpl;
+
+// Gets the summary of the failure message by omitting the stack trace
+// in it.
+std::string TestPartResult::ExtractSummary(const char* message) {
+  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
+  return stack_trace == nullptr ? message : std::string(message, stack_trace);
+}
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
+  return os << internal::FormatFileLocation(result.file_name(),
+                                            result.line_number())
+            << " "
+            << (result.type() == TestPartResult::kSuccess
+                    ? "Success"
+                    : result.type() == TestPartResult::kSkip
+                          ? "Skipped"
+                          : result.type() == TestPartResult::kFatalFailure
+                                ? "Fatal failure"
+                                : "Non-fatal failure")
+            << ":\n"
+            << result.message() << std::endl;
+}
+
+// Appends a TestPartResult to the array.
+void TestPartResultArray::Append(const TestPartResult& result) {
+  array_.push_back(result);
+}
+
+// Returns the TestPartResult at the given index (0-based).
+const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
+  if (index < 0 || index >= size()) {
+    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
+    internal::posix::Abort();
+  }
+
+  return array_[static_cast<size_t>(index)];
+}
+
+// Returns the number of TestPartResult objects in the array.
+int TestPartResultArray::size() const {
+  return static_cast<int>(array_.size());
+}
+
+namespace internal {
+
+HasNewFatalFailureHelper::HasNewFatalFailureHelper()
+    : has_new_fatal_failure_(false),
+      original_reporter_(GetUnitTestImpl()->
+                         GetTestPartResultReporterForCurrentThread()) {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
+}
+
+HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
+      original_reporter_);
+}
+
+void HasNewFatalFailureHelper::ReportTestPartResult(
+    const TestPartResult& result) {
+  if (result.fatally_failed())
+    has_new_fatal_failure_ = true;
+  original_reporter_->ReportTestPartResult(result);
+}
+
+}  // namespace internal
+
+}  // namespace testing
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+namespace testing {
+namespace internal {
+
+// Skips to the first non-space char in str. Returns an empty string if str
+// contains only whitespace characters.
+static const char* SkipSpaces(const char* str) {
+  while (IsSpace(*str))
+    str++;
+  return str;
+}
+
+static std::vector<std::string> SplitIntoTestNames(const char* src) {
+  std::vector<std::string> name_vec;
+  src = SkipSpaces(src);
+  for (; src != nullptr; src = SkipComma(src)) {
+    name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
+  }
+  return name_vec;
+}
+
+// Verifies that registered_tests match the test names in
+// registered_tests_; returns registered_tests if successful, or
+// aborts the program otherwise.
+const char* TypedTestSuitePState::VerifyRegisteredTestNames(
+    const char* test_suite_name, const char* file, int line,
+    const char* registered_tests) {
+  RegisterTypeParameterizedTestSuite(test_suite_name, CodeLocation(file, line));
+
+  typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
+  registered_ = true;
+
+  std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
+
+  Message errors;
+
+  std::set<std::string> tests;
+  for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
+       name_it != name_vec.end(); ++name_it) {
+    const std::string& name = *name_it;
+    if (tests.count(name) != 0) {
+      errors << "Test " << name << " is listed more than once.\n";
+      continue;
+    }
+
+    if (registered_tests_.count(name) != 0) {
+      tests.insert(name);
+    } else {
+      errors << "No test named " << name
+             << " can be found in this test suite.\n";
+    }
+  }
+
+  for (RegisteredTestIter it = registered_tests_.begin();
+       it != registered_tests_.end();
+       ++it) {
+    if (tests.count(it->first) == 0) {
+      errors << "You forgot to list test " << it->first << ".\n";
+    }
+  }
+
+  const std::string& errors_str = errors.GetString();
+  if (errors_str != "") {
+    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
+            errors_str.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+
+  return registered_tests;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/code/cpp-httplib-0.19.0/test/gtest/gtest.h b/code/cpp-httplib-0.19.0/test/gtest/gtest.h
new file mode 100644
index 00000000..e7490573
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/gtest/gtest.h
@@ -0,0 +1,12377 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the public API for Google Test.  It should be
+// included by any test program that uses Google Test.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+//
+// Acknowledgment: Google Test borrowed the idea of automatic test
+// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
+// easyUnit framework.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_H_
+
+#include <cstddef>
+#include <limits>
+#include <memory>
+#include <ostream>
+#include <type_traits>
+#include <vector>
+
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file declares functions and macros used internally by
+// Google Test.  They are subject to change without notice.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Low-level types and utilities for porting Google Test to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Test's public API and can be used by
+// code outside Google Test.
+//
+// This file is fundamental to Google Test.  All other Google Test source
+// files are expected to #include this.  Therefore, it cannot #include
+// any other Google Test header.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+
+// Environment-describing macros
+// -----------------------------
+//
+// Google Test can be used in many different environments.  Macros in
+// this section tell Google Test what kind of environment it is being
+// used in, such that Google Test can provide environment-specific
+// features and implementations.
+//
+// Google Test tries to automatically detect the properties of its
+// environment, so users usually don't need to worry about these
+// macros.  However, the automatic detection is not perfect.
+// Sometimes it's necessary for a user to define some of the following
+// macros in the build script to override Google Test's decisions.
+//
+// If the user doesn't define a macro in the list, Google Test will
+// provide a default definition.  After this header is #included, all
+// macros in this list will be defined to either 1 or 0.
+//
+// Notes to maintainers:
+//   - Each macro here is a user-tweakable knob; do not grow the list
+//     lightly.
+//   - Use #if to key off these macros.  Don't use #ifdef or "#if
+//     defined(...)", which will not work as these macros are ALWAYS
+//     defined.
+//
+//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
+//                              is/isn't available.
+//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
+//                              are enabled.
+//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
+//                              expressions are/aren't available.
+//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
+//                              is/isn't available.
+//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
+//                              enabled.
+//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
+//                              std::wstring does/doesn't work (Google Test can
+//                              be used where std::wstring is unavailable).
+//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
+//                              compiler supports Microsoft's "Structured
+//                              Exception Handling".
+//   GTEST_HAS_STREAM_REDIRECTION
+//                            - Define it to 1/0 to indicate whether the
+//                              platform supports I/O stream redirection using
+//                              dup() and dup2().
+//   GTEST_LINKED_AS_SHARED_LIBRARY
+//                            - Define to 1 when compiling tests that use
+//                              Google Test as a shared library (known as
+//                              DLL on Windows).
+//   GTEST_CREATE_SHARED_LIBRARY
+//                            - Define to 1 when compiling Google Test itself
+//                              as a shared library.
+//   GTEST_DEFAULT_DEATH_TEST_STYLE
+//                            - The default value of --gtest_death_test_style.
+//                              The legacy default has been "fast" in the open
+//                              source version since 2008. The recommended value
+//                              is "threadsafe", and can be set in
+//                              custom/gtest-port.h.
+
+// Platform-indicating macros
+// --------------------------
+//
+// Macros indicating the platform on which Google Test is being used
+// (a macro is defined to 1 if compiled on the given platform;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+//   GTEST_OS_AIX      - IBM AIX
+//   GTEST_OS_CYGWIN   - Cygwin
+//   GTEST_OS_DRAGONFLY - DragonFlyBSD
+//   GTEST_OS_FREEBSD  - FreeBSD
+//   GTEST_OS_FUCHSIA  - Fuchsia
+//   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
+//   GTEST_OS_HAIKU    - Haiku
+//   GTEST_OS_HPUX     - HP-UX
+//   GTEST_OS_LINUX    - Linux
+//     GTEST_OS_LINUX_ANDROID - Google Android
+//   GTEST_OS_MAC      - Mac OS X
+//     GTEST_OS_IOS    - iOS
+//   GTEST_OS_NACL     - Google Native Client (NaCl)
+//   GTEST_OS_NETBSD   - NetBSD
+//   GTEST_OS_OPENBSD  - OpenBSD
+//   GTEST_OS_OS2      - OS/2
+//   GTEST_OS_QNX      - QNX
+//   GTEST_OS_SOLARIS  - Sun Solaris
+//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
+//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
+//     GTEST_OS_WINDOWS_MINGW    - MinGW
+//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
+//     GTEST_OS_WINDOWS_PHONE    - Windows Phone
+//     GTEST_OS_WINDOWS_RT       - Windows Store App/WinRT
+//   GTEST_OS_ZOS      - z/OS
+//
+// Among the platforms, Cygwin, Linux, Mac OS X, and Windows have the
+// most stable support.  Since core members of the Google Test project
+// don't have access to other platforms, support for them may be less
+// stable.  If you notice any problems on your platform, please notify
+// googletestframework@googlegroups.com (patches for fixing them are
+// even more welcome!).
+//
+// It is possible that none of the GTEST_OS_* macros are defined.
+
+// Feature-indicating macros
+// -------------------------
+//
+// Macros indicating which Google Test features are available (a macro
+// is defined to 1 if the corresponding feature is supported;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+// These macros are public so that portable tests can be written.
+// Such tests typically surround code using a feature with an #if
+// which controls that code.  For example:
+//
+// #if GTEST_HAS_DEATH_TEST
+//   EXPECT_DEATH(DoSomethingDeadly());
+// #endif
+//
+//   GTEST_HAS_DEATH_TEST   - death tests
+//   GTEST_HAS_TYPED_TEST   - typed tests
+//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
+//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
+//   GOOGLETEST_CM0007 DO NOT DELETE
+//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
+//                            GTEST_HAS_POSIX_RE (see above) which users can
+//                            define themselves.
+//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
+//                            the above RE\b(s) are mutually exclusive.
+
+// Misc public macros
+// ------------------
+//
+//   GTEST_FLAG(flag_name)  - references the variable corresponding to
+//                            the given Google Test flag.
+
+// Internal utilities
+// ------------------
+//
+// The following macros and utilities are for Google Test's INTERNAL
+// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
+//
+// Macros for basic C++ coding:
+//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
+//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
+//                              variable don't have to be used.
+//   GTEST_DISALLOW_ASSIGN_   - disables copy operator=.
+//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
+//   GTEST_DISALLOW_MOVE_ASSIGN_   - disables move operator=.
+//   GTEST_DISALLOW_MOVE_AND_ASSIGN_ - disables move ctor and operator=.
+//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
+//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
+//                                        suppressed (constant conditional).
+//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
+//                                        is suppressed.
+//   GTEST_INTERNAL_HAS_ANY - for enabling UniversalPrinter<std::any> or
+//                            UniversalPrinter<absl::any> specializations.
+//   GTEST_INTERNAL_HAS_OPTIONAL - for enabling UniversalPrinter<std::optional>
+//   or
+//                                 UniversalPrinter<absl::optional>
+//                                 specializations.
+//   GTEST_INTERNAL_HAS_STRING_VIEW - for enabling Matcher<std::string_view> or
+//                                    Matcher<absl::string_view>
+//                                    specializations.
+//   GTEST_INTERNAL_HAS_VARIANT - for enabling UniversalPrinter<std::variant> or
+//                                UniversalPrinter<absl::variant>
+//                                specializations.
+//
+// Synchronization:
+//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
+//                            - synchronization primitives.
+//
+// Regular expressions:
+//   RE             - a simple regular expression class using the POSIX
+//                    Extended Regular Expression syntax on UNIX-like platforms
+//                    GOOGLETEST_CM0008 DO NOT DELETE
+//                    or a reduced regular exception syntax on other
+//                    platforms, including Windows.
+// Logging:
+//   GTEST_LOG_()   - logs messages at the specified severity level.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+//
+// Stdout and stderr capturing:
+//   CaptureStdout()     - starts capturing stdout.
+//   GetCapturedStdout() - stops capturing stdout and returns the captured
+//                         string.
+//   CaptureStderr()     - starts capturing stderr.
+//   GetCapturedStderr() - stops capturing stderr and returns the captured
+//                         string.
+//
+// Integer types:
+//   TypeWithSize   - maps an integer to a int type.
+//   TimeInMillis   - integers of known sizes.
+//   BiggestInt     - the biggest signed integer type.
+//
+// Command-line utilities:
+//   GTEST_DECLARE_*()  - declares a flag.
+//   GTEST_DEFINE_*()   - defines a flag.
+//   GetInjectableArgvs() - returns the command line as a vector of strings.
+//
+// Environment variable utilities:
+//   GetEnv()             - gets the value of an environment variable.
+//   BoolFromGTestEnv()   - parses a bool environment variable.
+//   Int32FromGTestEnv()  - parses an int32_t environment variable.
+//   StringFromGTestEnv() - parses a string environment variable.
+//
+// Deprecation warnings:
+//   GTEST_INTERNAL_DEPRECATED(message) - attribute marking a function as
+//                                        deprecated; calling a marked function
+//                                        should generate a compiler warning
+
+#include <ctype.h>   // for isspace, etc
+#include <stddef.h>  // for ptrdiff_t
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cerrno>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+
+#ifndef _WIN32_WCE
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif  // !_WIN32_WCE
+
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+# include <TargetConditionals.h>
+#endif
+
+#include <iostream>  // NOLINT
+#include <locale>
+#include <memory>
+#include <string>  // NOLINT
+#include <tuple>
+#include <vector>  // NOLINT
+
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the GTEST_OS_* macro.
+// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+
+// Determines the platform on which Google Test is compiled.
+#ifdef __CYGWIN__
+# define GTEST_OS_CYGWIN 1
+# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
+#  define GTEST_OS_WINDOWS_MINGW 1
+#  define GTEST_OS_WINDOWS 1
+#elif defined _WIN32
+# define GTEST_OS_WINDOWS 1
+# ifdef _WIN32_WCE
+#  define GTEST_OS_WINDOWS_MOBILE 1
+# elif defined(WINAPI_FAMILY)
+#  include <winapifamily.h>
+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#   define GTEST_OS_WINDOWS_DESKTOP 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
+#   define GTEST_OS_WINDOWS_PHONE 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#   define GTEST_OS_WINDOWS_RT 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
+#   define GTEST_OS_WINDOWS_PHONE 1
+#   define GTEST_OS_WINDOWS_TV_TITLE 1
+#  else
+    // WINAPI_FAMILY defined but no known partition matched.
+    // Default to desktop.
+#   define GTEST_OS_WINDOWS_DESKTOP 1
+#  endif
+# else
+#  define GTEST_OS_WINDOWS_DESKTOP 1
+# endif  // _WIN32_WCE
+#elif defined __OS2__
+# define GTEST_OS_OS2 1
+#elif defined __APPLE__
+# define GTEST_OS_MAC 1
+# include <TargetConditionals.h>
+# if TARGET_OS_IPHONE
+#  define GTEST_OS_IOS 1
+# endif
+#elif defined __DragonFly__
+# define GTEST_OS_DRAGONFLY 1
+#elif defined __FreeBSD__
+# define GTEST_OS_FREEBSD 1
+#elif defined __Fuchsia__
+# define GTEST_OS_FUCHSIA 1
+#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
+# define GTEST_OS_GNU_KFREEBSD 1
+#elif defined __linux__
+# define GTEST_OS_LINUX 1
+# if defined __ANDROID__
+#  define GTEST_OS_LINUX_ANDROID 1
+# endif
+#elif defined __MVS__
+# define GTEST_OS_ZOS 1
+#elif defined(__sun) && defined(__SVR4)
+# define GTEST_OS_SOLARIS 1
+#elif defined(_AIX)
+# define GTEST_OS_AIX 1
+#elif defined(__hpux)
+# define GTEST_OS_HPUX 1
+#elif defined __native_client__
+# define GTEST_OS_NACL 1
+#elif defined __NetBSD__
+# define GTEST_OS_NETBSD 1
+#elif defined __OpenBSD__
+# define GTEST_OS_OPENBSD 1
+#elif defined __QNX__
+# define GTEST_OS_QNX 1
+#elif defined(__HAIKU__)
+#define GTEST_OS_HAIKU 1
+#elif defined ESP8266
+#define GTEST_OS_ESP8266 1
+#elif defined ESP32
+#define GTEST_OS_ESP32 1
+#elif defined(__XTENSA__)
+#define GTEST_OS_XTENSA 1
+#endif  // __CYGWIN__
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+
+#if !defined(GTEST_DEV_EMAIL_)
+# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
+# define GTEST_FLAG_PREFIX_ "gtest_"
+# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
+# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
+# define GTEST_NAME_ "Google Test"
+# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
+#endif  // !defined(GTEST_DEV_EMAIL_)
+
+#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
+# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
+#endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
+
+// Determines the version of gcc that is used to compile this.
+#ifdef __GNUC__
+// 40302 means version 4.3.2.
+# define GTEST_GCC_VER_ \
+    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+#endif  // __GNUC__
+
+// Macros for disabling Microsoft Visual C++ warnings.
+//
+//   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
+//   /* code that triggers warnings C4800 and C4385 */
+//   GTEST_DISABLE_MSC_WARNINGS_POP_()
+#if defined(_MSC_VER)
+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
+    __pragma(warning(push))                        \
+    __pragma(warning(disable: warnings))
+# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
+    __pragma(warning(pop))
+#else
+// Not all compilers are MSVC
+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
+# define GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+// Clang on Windows does not understand MSVC's pragma warning.
+// We need clang-specific way to disable function deprecation warning.
+#ifdef __clang__
+# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                         \
+    _Pragma("clang diagnostic push")                                  \
+    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
+    _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
+#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
+    _Pragma("clang diagnostic pop")
+#else
+# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
+# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+// Brings in definitions for functions used in the testing::internal::posix
+// namespace (read, write, close, chdir, isatty, stat). We do not currently
+// use them on Windows Mobile.
+#if GTEST_OS_WINDOWS
+# if !GTEST_OS_WINDOWS_MOBILE
+#  include <direct.h>
+#  include <io.h>
+# endif
+// In order to avoid having to include <windows.h>, use forward declaration
+#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
+// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
+// separate (equivalent) structs, instead of using typedef
+typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
+#else
+// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
+// This assumption is verified by
+// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
+typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
+#endif
+#elif GTEST_OS_XTENSA
+#include <unistd.h>
+// Xtensa toolchains define strcasecmp in the string.h header instead of
+// strings.h. string.h is already included.
+#else
+// This assumes that non-Windows OSes provide unistd.h. For OSes where this
+// is not the case, we need to include headers that provide the functions
+// mentioned above.
+# include <unistd.h>
+# include <strings.h>
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_LINUX_ANDROID
+// Used to define __ANDROID_API__ matching the target NDK API level.
+#  include <android/api-level.h>  // NOLINT
+#endif
+
+// Defines this to true if and only if Google Test can use POSIX regular
+// expressions.
+#ifndef GTEST_HAS_POSIX_RE
+# if GTEST_OS_LINUX_ANDROID
+// On Android, <regex.h> is only available starting with Gingerbread.
+#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
+# else
+#define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS && !GTEST_OS_XTENSA)
+# endif
+#endif
+
+#if GTEST_USES_PCRE
+// The appropriate headers have already been included.
+
+#elif GTEST_HAS_POSIX_RE
+
+// On some platforms, <regex.h> needs someone to define size_t, and
+// won't compile otherwise.  We can #include it here as we already
+// included <stdlib.h>, which is guaranteed to define size_t through
+// <stddef.h>.
+# include <regex.h>  // NOLINT
+
+# define GTEST_USES_POSIX_RE 1
+
+#elif GTEST_OS_WINDOWS
+
+// <regex.h> is not available on Windows.  Use our own simple regex
+// implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#else
+
+// <regex.h> may not be available on this platform.  Use our own
+// simple regex implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#endif  // GTEST_USES_PCRE
+
+#ifndef GTEST_HAS_EXCEPTIONS
+// The user didn't tell us whether exceptions are enabled, so we need
+// to figure it out.
+# if defined(_MSC_VER) && defined(_CPPUNWIND)
+// MSVC defines _CPPUNWIND to 1 if and only if exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__BORLANDC__)
+// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
+// macro to enable exceptions, so we'll do the same.
+// Assumes that exceptions are enabled by default.
+#  ifndef _HAS_EXCEPTIONS
+#   define _HAS_EXCEPTIONS 1
+#  endif  // _HAS_EXCEPTIONS
+#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
+# elif defined(__clang__)
+// clang defines __EXCEPTIONS if and only if exceptions are enabled before clang
+// 220714, but if and only if cleanups are enabled after that. In Obj-C++ files,
+// there can be cleanups for ObjC exceptions which also need cleanups, even if
+// C++ exceptions are disabled. clang has __has_feature(cxx_exceptions) which
+// checks for C++ exceptions starting at clang r206352, but which checked for
+// cleanups prior to that. To reliably check for C++ exception availability with
+// clang, check for
+// __EXCEPTIONS && __has_feature(cxx_exceptions).
+#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
+# elif defined(__GNUC__) && __EXCEPTIONS
+// gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__SUNPRO_CC)
+// Sun Pro CC supports exceptions.  However, there is no compile-time way of
+// detecting whether they are enabled or not.  Therefore, we assume that
+// they are enabled unless the user tells us otherwise.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__IBMCPP__) && __EXCEPTIONS
+// xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__HP_aCC)
+// Exception handling is in effect by default in HP aCC compiler. It has to
+// be turned of by +noeh compiler option if desired.
+#  define GTEST_HAS_EXCEPTIONS 1
+# else
+// For other compilers, we assume exceptions are disabled to be
+// conservative.
+#  define GTEST_HAS_EXCEPTIONS 0
+# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#ifndef GTEST_HAS_STD_WSTRING
+// The user didn't tell us whether ::std::wstring is available, so we need
+// to figure it out.
+// Cygwin 1.7 and below doesn't support ::std::wstring.
+// Solaris' libc++ doesn't support it either.  Android has
+// no support for it at least as recent as Froyo (2.2).
+#define GTEST_HAS_STD_WSTRING                                         \
+  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
+     GTEST_OS_HAIKU || GTEST_OS_ESP32 || GTEST_OS_ESP8266 || GTEST_OS_XTENSA))
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Determines whether RTTI is available.
+#ifndef GTEST_HAS_RTTI
+// The user didn't tell us whether RTTI is enabled, so we need to
+// figure it out.
+
+# ifdef _MSC_VER
+
+#ifdef _CPPRTTI  // MSVC defines this macro if and only if RTTI is enabled.
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+// Starting with version 4.3.2, gcc defines __GXX_RTTI if and only if RTTI is
+// enabled.
+# elif defined(__GNUC__)
+
+#  ifdef __GXX_RTTI
+// When building against STLport with the Android NDK and with
+// -frtti -fno-exceptions, the build fails at link time with undefined
+// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
+// so disable RTTI when detected.
+#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
+       !defined(__EXCEPTIONS)
+#    define GTEST_HAS_RTTI 0
+#   else
+#    define GTEST_HAS_RTTI 1
+#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif  // __GXX_RTTI
+
+// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
+// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
+// first version with C++ support.
+# elif defined(__clang__)
+
+#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
+
+// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
+// both the typeid and dynamic_cast features are present.
+# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
+
+#  ifdef __RTTI_ALL__
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+# else
+
+// For all other compilers, we assume RTTI is enabled.
+#  define GTEST_HAS_RTTI 1
+
+# endif  // _MSC_VER
+
+#endif  // GTEST_HAS_RTTI
+
+// It's this header's responsibility to #include <typeinfo> when RTTI
+// is enabled.
+#if GTEST_HAS_RTTI
+# include <typeinfo>
+#endif
+
+// Determines whether Google Test can use the pthreads library.
+#ifndef GTEST_HAS_PTHREAD
+// The user didn't tell us explicitly, so we make reasonable assumptions about
+// which platforms have pthreads support.
+//
+// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+// to your compiler flags.
+#define GTEST_HAS_PTHREAD                                                      \
+  (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||          \
+   GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
+   GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||          \
+   GTEST_OS_HAIKU)
+#endif  // GTEST_HAS_PTHREAD
+
+#if GTEST_HAS_PTHREAD
+// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
+// true.
+# include <pthread.h>  // NOLINT
+
+// For timespec and nanosleep, used below.
+# include <time.h>  // NOLINT
+#endif
+
+// Determines whether clone(2) is supported.
+// Usually it will only be available on Linux, excluding
+// Linux on the Itanium architecture.
+// Also see http://linux.die.net/man/2/clone.
+#ifndef GTEST_HAS_CLONE
+// The user didn't tell us, so we need to figure it out.
+
+# if GTEST_OS_LINUX && !defined(__ia64__)
+#  if GTEST_OS_LINUX_ANDROID
+// On Android, clone() became available at different API levels for each 32-bit
+// architecture.
+#    if defined(__LP64__) || \
+        (defined(__arm__) && __ANDROID_API__ >= 9) || \
+        (defined(__mips__) && __ANDROID_API__ >= 12) || \
+        (defined(__i386__) && __ANDROID_API__ >= 17)
+#     define GTEST_HAS_CLONE 1
+#    else
+#     define GTEST_HAS_CLONE 0
+#    endif
+#  else
+#   define GTEST_HAS_CLONE 1
+#  endif
+# else
+#  define GTEST_HAS_CLONE 0
+# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+
+#endif  // GTEST_HAS_CLONE
+
+// Determines whether to support stream redirection. This is used to test
+// output correctness and to implement death tests.
+#ifndef GTEST_HAS_STREAM_REDIRECTION
+// By default, we assume that stream redirection is supported on all
+// platforms except known mobile ones.
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+#  define GTEST_HAS_STREAM_REDIRECTION 0
+# else
+#  define GTEST_HAS_STREAM_REDIRECTION 1
+# endif  // !GTEST_OS_WINDOWS_MOBILE
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Determines whether to support death tests.
+// pops up a dialog window that cannot be suppressed programmatically.
+#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS ||             \
+     (GTEST_OS_MAC && !GTEST_OS_IOS) ||                                   \
+     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW ||  \
+     GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
+     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
+     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
+# define GTEST_HAS_DEATH_TEST 1
+#endif
+
+// Determines whether to support type-driven tests.
+
+// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
+// Sun Pro CC, IBM Visual Age, and HP aCC support.
+#if defined(__GNUC__) || defined(_MSC_VER) || defined(__SUNPRO_CC) || \
+    defined(__IBMCPP__) || defined(__HP_aCC)
+# define GTEST_HAS_TYPED_TEST 1
+# define GTEST_HAS_TYPED_TEST_P 1
+#endif
+
+// Determines whether the system compiler uses UTF-16 for encoding wide strings.
+#define GTEST_WIDE_STRING_USES_UTF16_ \
+  (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
+
+// Determines whether test results can be streamed to a socket.
+#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
+    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+# define GTEST_CAN_STREAM_RESULTS_ 1
+#endif
+
+// Defines some utility macros.
+
+// The GNU compiler emits a warning if nested "if" statements are followed by
+// an "else" statement and braces are not used to explicitly disambiguate the
+// "else" binding.  This leads to problems with code like:
+//
+//   if (gate)
+//     ASSERT_*(condition) << "Some message";
+//
+// The "switch (0) case 0:" idiom is used to suppress this.
+#ifdef __INTEL_COMPILER
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
+#else
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
+#endif
+
+// Use this annotation at the end of a struct/class definition to
+// prevent the compiler from optimizing away instances that are never
+// used.  This is useful when all interesting logic happens inside the
+// c'tor and / or d'tor.  Example:
+//
+//   struct Foo {
+//     Foo() { ... }
+//   } GTEST_ATTRIBUTE_UNUSED_;
+//
+// Also use it after a variable or parameter declaration to tell the
+// compiler the variable/parameter does not have to be used.
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+#elif defined(__clang__)
+# if __has_attribute(unused)
+#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+# endif
+#endif
+#ifndef GTEST_ATTRIBUTE_UNUSED_
+# define GTEST_ATTRIBUTE_UNUSED_
+#endif
+
+// Use this annotation before a function that takes a printf format string.
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
+# if defined(__MINGW_PRINTF_FORMAT)
+// MinGW has two different printf implementations. Ensure the format macro
+// matches the selected implementation. See
+// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
+#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+       __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
+                                 first_to_check)))
+# else
+#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+       __attribute__((__format__(__printf__, string_index, first_to_check)))
+# endif
+#else
+# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
+#endif
+
+
+// A macro to disallow copy operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_ASSIGN_(type) \
+  type& operator=(type const &) = delete
+
+// A macro to disallow copy constructor and operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
+  type(type const&) = delete;                 \
+  type& operator=(type const&) = delete
+
+// A macro to disallow move operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_MOVE_ASSIGN_(type) \
+  type& operator=(type &&) noexcept = delete
+
+// A macro to disallow move constructor and operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
+  type(type&&) noexcept = delete;             \
+  type& operator=(type&&) noexcept = delete
+
+// Tell the compiler to warn about unused return values for functions declared
+// with this macro.  The macro should be used on function declarations
+// following the argument list:
+//
+//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
+#else
+# define GTEST_MUST_USE_RESULT_
+#endif  // __GNUC__ && !COMPILER_ICC
+
+// MS C++ compiler emits warning when a conditional expression is compile time
+// constant. In some contexts this warning is false positive and needs to be
+// suppressed. Use the following two macros in such cases:
+//
+// GTEST_INTENTIONAL_CONST_COND_PUSH_()
+// while (true) {
+// GTEST_INTENTIONAL_CONST_COND_POP_()
+// }
+# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
+# define GTEST_INTENTIONAL_CONST_COND_POP_() \
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+// Determine whether the compiler supports Microsoft's Structured Exception
+// Handling.  This is supported by several Windows compilers but generally
+// does not exist on any other system.
+#ifndef GTEST_HAS_SEH
+// The user didn't tell us, so we need to figure it out.
+
+# if defined(_MSC_VER) || defined(__BORLANDC__)
+// These two compilers are known to support SEH.
+#  define GTEST_HAS_SEH 1
+# else
+// Assume no SEH.
+#  define GTEST_HAS_SEH 0
+# endif
+
+#endif  // GTEST_HAS_SEH
+
+#ifndef GTEST_IS_THREADSAFE
+
+#define GTEST_IS_THREADSAFE                                                 \
+  (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                                     \
+   (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) || \
+   GTEST_HAS_PTHREAD)
+
+#endif  // GTEST_IS_THREADSAFE
+
+// GTEST_API_ qualifies all symbols that must be exported. The definitions below
+// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
+// gtest/internal/custom/gtest-port.h
+#ifndef GTEST_API_
+
+#ifdef _MSC_VER
+# if GTEST_LINKED_AS_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllimport)
+# elif GTEST_CREATE_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllexport)
+# endif
+#elif __GNUC__ >= 4 || defined(__clang__)
+# define GTEST_API_ __attribute__((visibility ("default")))
+#endif  // _MSC_VER
+
+#endif  // GTEST_API_
+
+#ifndef GTEST_API_
+# define GTEST_API_
+#endif  // GTEST_API_
+
+#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
+# define GTEST_DEFAULT_DEATH_TEST_STYLE  "fast"
+#endif  // GTEST_DEFAULT_DEATH_TEST_STYLE
+
+#ifdef __GNUC__
+// Ask the compiler to never inline a given function.
+# define GTEST_NO_INLINE_ __attribute__((noinline))
+#else
+# define GTEST_NO_INLINE_
+#endif
+
+// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
+#if !defined(GTEST_HAS_CXXABI_H_)
+# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
+#  define GTEST_HAS_CXXABI_H_ 1
+# else
+#  define GTEST_HAS_CXXABI_H_ 0
+# endif
+#endif
+
+// A function level attribute to disable checking for use of uninitialized
+// memory when built with MemorySanitizer.
+#if defined(__clang__)
+# if __has_feature(memory_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
+       __attribute__((no_sanitize_memory))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+# endif  // __has_feature(memory_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+#endif  // __clang__
+
+// A function level attribute to disable AddressSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(address_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
+       __attribute__((no_sanitize_address))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+# endif  // __has_feature(address_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+#endif  // __clang__
+
+// A function level attribute to disable HWAddressSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(hwaddress_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
+       __attribute__((no_sanitize("hwaddress")))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+# endif  // __has_feature(hwaddress_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+#endif  // __clang__
+
+// A function level attribute to disable ThreadSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(thread_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
+       __attribute__((no_sanitize_thread))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+# endif  // __has_feature(thread_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+#endif  // __clang__
+
+namespace testing {
+
+class Message;
+
+// Legacy imports for backwards compatibility.
+// New code should use std:: names directly.
+using std::get;
+using std::make_tuple;
+using std::tuple;
+using std::tuple_element;
+using std::tuple_size;
+
+namespace internal {
+
+// A secret type that Google Test users don't know about.  It has no
+// definition on purpose.  Therefore it's impossible to create a
+// Secret object, which is what we want.
+class Secret;
+
+// The GTEST_COMPILE_ASSERT_ is a legacy macro used to verify that a compile
+// time expression is true (in new code, use static_assert instead). For
+// example, you could use it to verify the size of a static array:
+//
+//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
+//                         names_incorrect_size);
+//
+// The second argument to the macro must be a valid C++ identifier. If the
+// expression is false, compiler will issue an error containing this identifier.
+#define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
+
+// A helper for suppressing warnings on constant condition.  It just
+// returns 'condition'.
+GTEST_API_ bool IsTrue(bool condition);
+
+// Defines RE.
+
+#if GTEST_USES_PCRE
+// if used, PCRE is injected by custom/gtest-port.h
+#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
+
+// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
+// Regular Expression syntax.
+class GTEST_API_ RE {
+ public:
+  // A copy constructor is required by the Standard to initialize object
+  // references from r-values.
+  RE(const RE& other) { Init(other.pattern()); }
+
+  // Constructs an RE from a string.
+  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
+
+  RE(const char* regex) { Init(regex); }  // NOLINT
+  ~RE();
+
+  // Returns the string representation of the regex.
+  const char* pattern() const { return pattern_; }
+
+  // FullMatch(str, re) returns true if and only if regular expression re
+  // matches the entire str.
+  // PartialMatch(str, re) returns true if and only if regular expression re
+  // matches a substring of str (including str itself).
+  static bool FullMatch(const ::std::string& str, const RE& re) {
+    return FullMatch(str.c_str(), re);
+  }
+  static bool PartialMatch(const ::std::string& str, const RE& re) {
+    return PartialMatch(str.c_str(), re);
+  }
+
+  static bool FullMatch(const char* str, const RE& re);
+  static bool PartialMatch(const char* str, const RE& re);
+
+ private:
+  void Init(const char* regex);
+  const char* pattern_;
+  bool is_valid_;
+
+# if GTEST_USES_POSIX_RE
+
+  regex_t full_regex_;     // For FullMatch().
+  regex_t partial_regex_;  // For PartialMatch().
+
+# else  // GTEST_USES_SIMPLE_RE
+
+  const char* full_pattern_;  // For FullMatch();
+
+# endif
+};
+
+#endif  // GTEST_USES_PCRE
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
+                                                               int line);
+
+// Defines logging utilities:
+//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
+//                          message itself is streamed into the macro.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+
+enum GTestLogSeverity {
+  GTEST_INFO,
+  GTEST_WARNING,
+  GTEST_ERROR,
+  GTEST_FATAL
+};
+
+// Formats log entry severity, provides a stream object for streaming the
+// log message, and terminates the message with a newline when going out of
+// scope.
+class GTEST_API_ GTestLog {
+ public:
+  GTestLog(GTestLogSeverity severity, const char* file, int line);
+
+  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+  ~GTestLog();
+
+  ::std::ostream& GetStream() { return ::std::cerr; }
+
+ private:
+  const GTestLogSeverity severity_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
+};
+
+#if !defined(GTEST_LOG_)
+
+# define GTEST_LOG_(severity) \
+    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
+                                  __FILE__, __LINE__).GetStream()
+
+inline void LogToStderr() {}
+inline void FlushInfoLog() { fflush(nullptr); }
+
+#endif  // !defined(GTEST_LOG_)
+
+#if !defined(GTEST_CHECK_)
+// INTERNAL IMPLEMENTATION - DO NOT USE.
+//
+// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
+// is not satisfied.
+//  Synopsys:
+//    GTEST_CHECK_(boolean_condition);
+//     or
+//    GTEST_CHECK_(boolean_condition) << "Additional message";
+//
+//    This checks the condition and if the condition is not satisfied
+//    it prints message about the condition violation, including the
+//    condition itself, plus additional message streamed into it, if any,
+//    and then it aborts the program. It aborts the program irrespective of
+//    whether it is built in the debug mode or not.
+# define GTEST_CHECK_(condition) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::IsTrue(condition)) \
+      ; \
+    else \
+      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
+#endif  // !defined(GTEST_CHECK_)
+
+// An all-mode assert to verify that the given POSIX-style function
+// call returns 0 (indicating success).  Known limitation: this
+// doesn't expand to a balanced 'if' statement, so enclose the macro
+// in {} if you need to use it as the only statement in an 'if'
+// branch.
+#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
+  if (const int gtest_error = (posix_call)) \
+    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
+                      << gtest_error
+
+// Transforms "T" into "const T&" according to standard reference collapsing
+// rules (this is only needed as a backport for C++98 compilers that do not
+// support reference collapsing). Specifically, it transforms:
+//
+//   char         ==> const char&
+//   const char   ==> const char&
+//   char&        ==> char&
+//   const char&  ==> const char&
+//
+// Note that the non-const reference will not have "const" added. This is
+// standard, and necessary so that "T" can always bind to "const T&".
+template <typename T>
+struct ConstRef { typedef const T& type; };
+template <typename T>
+struct ConstRef<T&> { typedef T& type; };
+
+// The argument T must depend on some template parameters.
+#define GTEST_REFERENCE_TO_CONST_(T) \
+  typename ::testing::internal::ConstRef<T>::type
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Use ImplicitCast_ as a safe version of static_cast for upcasting in
+// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
+// const Foo*).  When you use ImplicitCast_, the compiler checks that
+// the cast is safe.  Such explicit ImplicitCast_s are necessary in
+// surprisingly many situations where C++ demands an exact type match
+// instead of an argument type convertable to a target type.
+//
+// The syntax for using ImplicitCast_ is the same as for static_cast:
+//
+//   ImplicitCast_<ToType>(expr)
+//
+// ImplicitCast_ would have been part of the C++ standard library,
+// but the proposal was submitted too late.  It will probably make
+// its way into the language in the future.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., implicit_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To>
+inline To ImplicitCast_(To x) { return x; }
+
+// When you upcast (that is, cast a pointer from type Foo to type
+// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
+// always succeed.  When you downcast (that is, cast a pointer from
+// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
+// how do you know the pointer is really of type SubclassOfFoo?  It
+// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
+// when you downcast, you should use this macro.  In debug mode, we
+// use dynamic_cast<> to double-check the downcast is legal (we die
+// if it's not).  In normal mode, we do the efficient static_cast<>
+// instead.  Thus, it's important to test in debug mode to make sure
+// the cast is legal!
+//    This is the only place in the code we should use dynamic_cast<>.
+// In particular, you SHOULDN'T be using dynamic_cast<> in order to
+// do RTTI (eg code like this:
+//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
+//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
+// You should design the code some other way not to need this.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., down_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
+inline To DownCast_(From* f) {  // so we only accept pointers
+  // Ensures that To is a sub-type of From *.  This test is here only
+  // for compile-time type checking, and has no overhead in an
+  // optimized build at run-time, as it will be optimized away
+  // completely.
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (false) {
+  GTEST_INTENTIONAL_CONST_COND_POP_()
+  const To to = nullptr;
+  ::testing::internal::ImplicitCast_<From*>(to);
+  }
+
+#if GTEST_HAS_RTTI
+  // RTTI: debug mode only!
+  GTEST_CHECK_(f == nullptr || dynamic_cast<To>(f) != nullptr);
+#endif
+  return static_cast<To>(f);
+}
+
+// Downcasts the pointer of type Base to Derived.
+// Derived must be a subclass of Base. The parameter MUST
+// point to a class of type Derived, not any subclass of it.
+// When RTTI is available, the function performs a runtime
+// check to enforce this.
+template <class Derived, class Base>
+Derived* CheckedDowncastToActualType(Base* base) {
+#if GTEST_HAS_RTTI
+  GTEST_CHECK_(typeid(*base) == typeid(Derived));
+#endif
+
+#if GTEST_HAS_DOWNCAST_
+  return ::down_cast<Derived*>(base);
+#elif GTEST_HAS_RTTI
+  return dynamic_cast<Derived*>(base);  // NOLINT
+#else
+  return static_cast<Derived*>(base);  // Poor man's downcast.
+#endif
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Defines the stderr capturer:
+//   CaptureStdout     - starts capturing stdout.
+//   GetCapturedStdout - stops capturing stdout and returns the captured string.
+//   CaptureStderr     - starts capturing stderr.
+//   GetCapturedStderr - stops capturing stderr and returns the captured string.
+//
+GTEST_API_ void CaptureStdout();
+GTEST_API_ std::string GetCapturedStdout();
+GTEST_API_ void CaptureStderr();
+GTEST_API_ std::string GetCapturedStderr();
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+// Returns the size (in bytes) of a file.
+GTEST_API_ size_t GetFileSize(FILE* file);
+
+// Reads the entire content of a file as a string.
+GTEST_API_ std::string ReadEntireFile(FILE* file);
+
+// All command line arguments.
+GTEST_API_ std::vector<std::string> GetArgvs();
+
+#if GTEST_HAS_DEATH_TEST
+
+std::vector<std::string> GetInjectableArgvs();
+// Deprecated: pass the args vector by value instead.
+void SetInjectableArgvs(const std::vector<std::string>* new_argvs);
+void SetInjectableArgvs(const std::vector<std::string>& new_argvs);
+void ClearInjectableArgvs();
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Defines synchronization primitives.
+#if GTEST_IS_THREADSAFE
+# if GTEST_HAS_PTHREAD
+// Sleeps for (roughly) n milliseconds.  This function is only for testing
+// Google Test's own constructs.  Don't use it in user tests, either
+// directly or indirectly.
+inline void SleepMilliseconds(int n) {
+  const timespec time = {
+    0,                  // 0 seconds.
+    n * 1000L * 1000L,  // And n ms.
+  };
+  nanosleep(&time, nullptr);
+}
+# endif  // GTEST_HAS_PTHREAD
+
+# if GTEST_HAS_NOTIFICATION_
+// Notification has already been imported into the namespace.
+// Nothing to do here.
+
+# elif GTEST_HAS_PTHREAD
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class Notification {
+ public:
+  Notification() : notified_(false) {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
+  }
+  ~Notification() {
+    pthread_mutex_destroy(&mutex_);
+  }
+
+  // Notifies all threads created with this notification to start. Must
+  // be called from the controller thread.
+  void Notify() {
+    pthread_mutex_lock(&mutex_);
+    notified_ = true;
+    pthread_mutex_unlock(&mutex_);
+  }
+
+  // Blocks until the controller thread notifies. Must be called from a test
+  // thread.
+  void WaitForNotification() {
+    for (;;) {
+      pthread_mutex_lock(&mutex_);
+      const bool notified = notified_;
+      pthread_mutex_unlock(&mutex_);
+      if (notified)
+        break;
+      SleepMilliseconds(10);
+    }
+  }
+
+ private:
+  pthread_mutex_t mutex_;
+  bool notified_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+
+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+GTEST_API_ void SleepMilliseconds(int n);
+
+// Provides leak-safe Windows kernel handle ownership.
+// Used in death tests and in threading support.
+class GTEST_API_ AutoHandle {
+ public:
+  // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
+  // avoid including <windows.h> in this header file. Including <windows.h> is
+  // undesirable because it defines a lot of symbols and macros that tend to
+  // conflict with client code. This assumption is verified by
+  // WindowsTypesTest.HANDLEIsVoidStar.
+  typedef void* Handle;
+  AutoHandle();
+  explicit AutoHandle(Handle handle);
+
+  ~AutoHandle();
+
+  Handle Get() const;
+  void Reset();
+  void Reset(Handle handle);
+
+ private:
+  // Returns true if and only if the handle is a valid handle object that can be
+  // closed.
+  bool IsCloseable() const;
+
+  Handle handle_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
+};
+
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class GTEST_API_ Notification {
+ public:
+  Notification();
+  void Notify();
+  void WaitForNotification();
+
+ private:
+  AutoHandle event_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+# endif  // GTEST_HAS_NOTIFICATION_
+
+// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
+// defined, but we don't want to use MinGW's pthreads implementation, which
+// has conformance problems with some versions of the POSIX standard.
+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
+
+// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
+// Consequently, it cannot select a correct instantiation of ThreadWithParam
+// in order to call its Run(). Introducing ThreadWithParamBase as a
+// non-templated base class for ThreadWithParam allows us to bypass this
+// problem.
+class ThreadWithParamBase {
+ public:
+  virtual ~ThreadWithParamBase() {}
+  virtual void Run() = 0;
+};
+
+// pthread_create() accepts a pointer to a function type with the C linkage.
+// According to the Standard (7.5/1), function types with different linkages
+// are different even if they are otherwise identical.  Some compilers (for
+// example, SunStudio) treat them as different types.  Since class methods
+// cannot be defined with C-linkage we need to define a free C-function to
+// pass into pthread_create().
+extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
+  static_cast<ThreadWithParamBase*>(thread)->Run();
+  return nullptr;
+}
+
+// Helper class for testing Google Test's multi-threading constructs.
+// To use it, write:
+//
+//   void ThreadFunc(int param) { /* Do things with param */ }
+//   Notification thread_can_start;
+//   ...
+//   // The thread_can_start parameter is optional; you can supply NULL.
+//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
+//   thread_can_start.Notify();
+//
+// These classes are only for testing Google Test's own constructs. Do
+// not use them in user tests, either directly or indirectly.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void UserThreadFunc(T);
+
+  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
+      : func_(func),
+        param_(param),
+        thread_can_start_(thread_can_start),
+        finished_(false) {
+    ThreadWithParamBase* const base = this;
+    // The thread can be created only after all fields except thread_
+    // have been initialized.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_create(&thread_, nullptr, &ThreadFuncWithCLinkage, base));
+  }
+  ~ThreadWithParam() override { Join(); }
+
+  void Join() {
+    if (!finished_) {
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, nullptr));
+      finished_ = true;
+    }
+  }
+
+  void Run() override {
+    if (thread_can_start_ != nullptr) thread_can_start_->WaitForNotification();
+    func_(param_);
+  }
+
+ private:
+  UserThreadFunc* const func_;  // User-supplied thread function.
+  const T param_;  // User-supplied parameter to the thread function.
+  // When non-NULL, used to block execution until the controller thread
+  // notifies.
+  Notification* const thread_can_start_;
+  bool finished_;  // true if and only if we know that the thread function has
+                   // finished.
+  pthread_t thread_;  // The native thread object.
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
+         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+// Mutex and ThreadLocal have already been imported into the namespace.
+// Nothing to do here.
+
+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+// Mutex implements mutex on Windows platforms.  It is used in conjunction
+// with class MutexLock:
+//
+//   Mutex mutex;
+//   ...
+//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the
+//                            // end of the current scope.
+//
+// A static Mutex *must* be defined or declared using one of the following
+// macros:
+//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
+//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
+//
+// (A non-static Mutex is defined/declared in the usual way).
+class GTEST_API_ Mutex {
+ public:
+  enum MutexType { kStatic = 0, kDynamic = 1 };
+  // We rely on kStaticMutex being 0 as it is to what the linker initializes
+  // type_ in static mutexes.  critical_section_ will be initialized lazily
+  // in ThreadSafeLazyInit().
+  enum StaticConstructorSelector { kStaticMutex = 0 };
+
+  // This constructor intentionally does nothing.  It relies on type_ being
+  // statically initialized to 0 (effectively setting it to kStatic) and on
+  // ThreadSafeLazyInit() to lazily initialize the rest of the members.
+  explicit Mutex(StaticConstructorSelector /*dummy*/) {}
+
+  Mutex();
+  ~Mutex();
+
+  void Lock();
+
+  void Unlock();
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld();
+
+ private:
+  // Initializes owner_thread_id_ and critical_section_ in static mutexes.
+  void ThreadSafeLazyInit();
+
+  // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503,
+  // we assume that 0 is an invalid value for thread IDs.
+  unsigned int owner_thread_id_;
+
+  // For static mutexes, we rely on these members being initialized to zeros
+  // by the linker.
+  MutexType type_;
+  long critical_section_init_phase_;  // NOLINT
+  GTEST_CRITICAL_SECTION* critical_section_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+    extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  Mutex* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Base class for ValueHolder<T>.  Allows a caller to hold and delete a value
+// without knowing its type.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Provides a way for a thread to send notifications to a ThreadLocal
+// regardless of its parameter type.
+class ThreadLocalBase {
+ public:
+  // Creates a new ValueHolder<T> object holding a default value passed to
+  // this ThreadLocal<T>'s constructor and returns it.  It is the caller's
+  // responsibility not to call this when the ThreadLocal<T> instance already
+  // has a value on the current thread.
+  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
+
+ protected:
+  ThreadLocalBase() {}
+  virtual ~ThreadLocalBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
+};
+
+// Maps a thread to a set of ThreadLocals that have values instantiated on that
+// thread and notifies them when the thread exits.  A ThreadLocal instance is
+// expected to persist until all threads it has values on have terminated.
+class GTEST_API_ ThreadLocalRegistry {
+ public:
+  // Registers thread_local_instance as having value on the current thread.
+  // Returns a value that can be used to identify the thread from other threads.
+  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance);
+
+  // Invoked when a ThreadLocal instance is destroyed.
+  static void OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance);
+};
+
+class GTEST_API_ ThreadWithParamBase {
+ public:
+  void Join();
+
+ protected:
+  class Runnable {
+   public:
+    virtual ~Runnable() {}
+    virtual void Run() = 0;
+  };
+
+  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
+  virtual ~ThreadWithParamBase();
+
+ private:
+  AutoHandle thread_;
+};
+
+// Helper class for testing Google Test's multi-threading constructs.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void UserThreadFunc(T);
+
+  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
+      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
+  }
+  virtual ~ThreadWithParam() {}
+
+ private:
+  class RunnableImpl : public Runnable {
+   public:
+    RunnableImpl(UserThreadFunc* func, T param)
+        : func_(func),
+          param_(param) {
+    }
+    virtual ~RunnableImpl() {}
+    virtual void Run() {
+      func_(param_);
+    }
+
+   private:
+    UserThreadFunc* const func_;
+    const T param_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
+  };
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+
+// Implements thread-local storage on Windows systems.
+//
+//   // Thread 1
+//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
+//
+//   // Thread 2
+//   tl.set(150);  // Changes the value for thread 2 only.
+//   EXPECT_EQ(150, tl.get());
+//
+//   // Thread 1
+//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
+//   tl.set(200);
+//   EXPECT_EQ(200, tl.get());
+//
+// The template type argument T must have a public copy constructor.
+// In addition, the default ThreadLocal constructor requires T to have
+// a public default constructor.
+//
+// The users of a TheadLocal instance have to make sure that all but one
+// threads (including the main one) using that instance have exited before
+// destroying it. Otherwise, the per-thread objects managed for them by the
+// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
+//
+// Google Test only uses global ThreadLocal objects.  That means they
+// will die after main() has returned.  Therefore, no per-thread
+// object managed by Google Test will be leaked as long as all threads
+// using Google Test have exited when main() returns.
+template <typename T>
+class ThreadLocal : public ThreadLocalBase {
+ public:
+  ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
+  explicit ThreadLocal(const T& value)
+      : default_factory_(new InstanceValueHolderFactory(value)) {}
+
+  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of T.  Can be deleted via its base class without the caller
+  // knowing the type of T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    ValueHolder() : value_() {}
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+
+  T* GetOrCreateValue() const {
+    return static_cast<ValueHolder*>(
+        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
+  }
+
+  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
+    return default_factory_->MakeNewHolder();
+  }
+
+  class ValueHolderFactory {
+   public:
+    ValueHolderFactory() {}
+    virtual ~ValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const = 0;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+  };
+
+  class DefaultValueHolderFactory : public ValueHolderFactory {
+   public:
+    DefaultValueHolderFactory() {}
+    ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+  };
+
+  class InstanceValueHolderFactory : public ValueHolderFactory {
+   public:
+    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
+    ValueHolder* MakeNewHolder() const override {
+      return new ValueHolder(value_);
+    }
+
+   private:
+    const T value_;  // The value for each thread.
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+  };
+
+  std::unique_ptr<ValueHolderFactory> default_factory_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# elif GTEST_HAS_PTHREAD
+
+// MutexBase and Mutex implement mutex on pthreads-based platforms.
+class MutexBase {
+ public:
+  // Acquires this mutex.
+  void Lock() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
+    owner_ = pthread_self();
+    has_owner_ = true;
+  }
+
+  // Releases this mutex.
+  void Unlock() {
+    // Since the lock is being released the owner_ field should no longer be
+    // considered valid. We don't protect writing to has_owner_ here, as it's
+    // the caller's responsibility to ensure that the current thread holds the
+    // mutex when this is called.
+    has_owner_ = false;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
+  }
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld() const {
+    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
+        << "The current thread is not holding the mutex @" << this;
+  }
+
+  // A static mutex may be used before main() is entered.  It may even
+  // be used before the dynamic initialization stage.  Therefore we
+  // must be able to initialize a static mutex object at link time.
+  // This means MutexBase has to be a POD and its member variables
+  // have to be public.
+ public:
+  pthread_mutex_t mutex_;  // The underlying pthread mutex.
+  // has_owner_ indicates whether the owner_ field below contains a valid thread
+  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
+  // accesses to the owner_ field should be protected by a check of this field.
+  // An alternative might be to memset() owner_ to all zeros, but there's no
+  // guarantee that a zero'd pthread_t is necessarily invalid or even different
+  // from pthread_self().
+  bool has_owner_;
+  pthread_t owner_;  // The thread holding the mutex.
+};
+
+// Forward-declares a static mutex.
+#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+     extern ::testing::internal::MutexBase mutex
+
+// Defines and statically (i.e. at link time) initializes a static mutex.
+// The initialization list here does not explicitly initialize each field,
+// instead relying on default initialization for the unspecified fields. In
+// particular, the owner_ field (a pthread_t) is not explicitly initialized.
+// This allows initialization to work whether pthread_t is a scalar or struct.
+// The flag -Wmissing-field-initializers must not be specified for this to work.
+#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+  ::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
+
+// The Mutex class can only be used for mutexes created at runtime. It
+// shares its API with MutexBase otherwise.
+class Mutex : public MutexBase {
+ public:
+  Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
+    has_owner_ = false;
+  }
+  ~Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(MutexBase* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  MutexBase* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Helpers for ThreadLocal.
+
+// pthread_key_create() requires DeleteThreadLocalValue() to have
+// C-linkage.  Therefore it cannot be templatized to access
+// ThreadLocal<T>.  Hence the need for class
+// ThreadLocalValueHolderBase.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Called by pthread to delete thread-local data stored by
+// pthread_setspecific().
+extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
+  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
+}
+
+// Implements thread-local storage on pthreads-based systems.
+template <typename T>
+class GTEST_API_ ThreadLocal {
+ public:
+  ThreadLocal()
+      : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
+  explicit ThreadLocal(const T& value)
+      : key_(CreateKey()),
+        default_factory_(new InstanceValueHolderFactory(value)) {}
+
+  ~ThreadLocal() {
+    // Destroys the managed object for the current thread, if any.
+    DeleteThreadLocalValue(pthread_getspecific(key_));
+
+    // Releases resources associated with the key.  This will *not*
+    // delete managed objects for other threads.
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
+  }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of type T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    ValueHolder() : value_() {}
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+  static pthread_key_t CreateKey() {
+    pthread_key_t key;
+    // When a thread exits, DeleteThreadLocalValue() will be called on
+    // the object managed for that thread.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_key_create(&key, &DeleteThreadLocalValue));
+    return key;
+  }
+
+  T* GetOrCreateValue() const {
+    ThreadLocalValueHolderBase* const holder =
+        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
+    if (holder != nullptr) {
+      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
+    }
+
+    ValueHolder* const new_holder = default_factory_->MakeNewHolder();
+    ThreadLocalValueHolderBase* const holder_base = new_holder;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
+    return new_holder->pointer();
+  }
+
+  class ValueHolderFactory {
+   public:
+    ValueHolderFactory() {}
+    virtual ~ValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const = 0;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+  };
+
+  class DefaultValueHolderFactory : public ValueHolderFactory {
+   public:
+    DefaultValueHolderFactory() {}
+    ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+  };
+
+  class InstanceValueHolderFactory : public ValueHolderFactory {
+   public:
+    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
+    ValueHolder* MakeNewHolder() const override {
+      return new ValueHolder(value_);
+    }
+
+   private:
+    const T value_;  // The value for each thread.
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+  };
+
+  // A key pthreads uses for looking up per-thread values.
+  const pthread_key_t key_;
+  std::unique_ptr<ValueHolderFactory> default_factory_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+#else  // GTEST_IS_THREADSAFE
+
+// A dummy implementation of synchronization primitives (mutex, lock,
+// and thread-local variable).  Necessary for compiling Google Test where
+// mutex is not supported - using Google Test in multiple threads is not
+// supported on such platforms.
+
+class Mutex {
+ public:
+  Mutex() {}
+  void Lock() {}
+  void Unlock() {}
+  void AssertHeld() const {}
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+  extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex*) {}  // NOLINT
+};
+
+typedef GTestMutexLock MutexLock;
+
+template <typename T>
+class GTEST_API_ ThreadLocal {
+ public:
+  ThreadLocal() : value_() {}
+  explicit ThreadLocal(const T& value) : value_(value) {}
+  T* pointer() { return &value_; }
+  const T* pointer() const { return &value_; }
+  const T& get() const { return value_; }
+  void set(const T& value) { value_ = value; }
+ private:
+  T value_;
+};
+
+#endif  // GTEST_IS_THREADSAFE
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+GTEST_API_ size_t GetThreadCount();
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_SEP_ "\\"
+# define GTEST_HAS_ALT_PATH_SEP_ 1
+#else
+# define GTEST_PATH_SEP_ "/"
+# define GTEST_HAS_ALT_PATH_SEP_ 0
+#endif  // GTEST_OS_WINDOWS
+
+// Utilities for char.
+
+// isspace(int ch) and friends accept an unsigned char or EOF.  char
+// may be signed, depending on the compiler (or compiler flags).
+// Therefore we need to cast a char to unsigned char before calling
+// isspace(), etc.
+
+inline bool IsAlpha(char ch) {
+  return isalpha(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsAlNum(char ch) {
+  return isalnum(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsDigit(char ch) {
+  return isdigit(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsLower(char ch) {
+  return islower(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsSpace(char ch) {
+  return isspace(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsUpper(char ch) {
+  return isupper(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsXDigit(char ch) {
+  return isxdigit(static_cast<unsigned char>(ch)) != 0;
+}
+#ifdef __cpp_char8_t
+inline bool IsXDigit(char8_t ch) {
+  return isxdigit(static_cast<unsigned char>(ch)) != 0;
+}
+#endif
+inline bool IsXDigit(char16_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+inline bool IsXDigit(char32_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+inline bool IsXDigit(wchar_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+
+inline char ToLower(char ch) {
+  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
+}
+inline char ToUpper(char ch) {
+  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
+}
+
+inline std::string StripTrailingSpaces(std::string str) {
+  std::string::iterator it = str.end();
+  while (it != str.begin() && IsSpace(*--it))
+    it = str.erase(it);
+  return str;
+}
+
+// The testing::internal::posix namespace holds wrappers for common
+// POSIX functions.  These wrappers hide the differences between
+// Windows/MSVC and POSIX systems.  Since some compilers define these
+// standard functions as macros, the wrapper cannot have the same name
+// as the wrapped function.
+
+namespace posix {
+
+// Functions with a different name on Windows.
+
+#if GTEST_OS_WINDOWS
+
+typedef struct _stat StatStruct;
+
+# ifdef __BORLANDC__
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+# else  // !__BORLANDC__
+#  if GTEST_OS_WINDOWS_MOBILE
+inline int DoIsATTY(int /* fd */) { return 0; }
+#  else
+inline int DoIsATTY(int fd) { return _isatty(fd); }
+#  endif  // GTEST_OS_WINDOWS_MOBILE
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return _stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return _strdup(src); }
+# endif  // __BORLANDC__
+
+# if GTEST_OS_WINDOWS_MOBILE
+inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
+// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
+// time and thus not defined there.
+# else
+inline int FileNo(FILE* file) { return _fileno(file); }
+inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
+inline int RmDir(const char* dir) { return _rmdir(dir); }
+inline bool IsDir(const StatStruct& st) {
+  return (_S_IFDIR & st.st_mode) != 0;
+}
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+#elif GTEST_OS_ESP8266
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) {
+  // stat function not implemented on ESP8266
+  return 0;
+}
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return strcasecmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+
+#else
+
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return strcasecmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+
+#endif  // GTEST_OS_WINDOWS
+
+inline int IsATTY(int fd) {
+  // DoIsATTY might change errno (for example ENOTTY in case you redirect stdout
+  // to a file on Linux), which is unexpected, so save the previous value, and
+  // restore it after the call.
+  int savedErrno = errno;
+  int isAttyValue = DoIsATTY(fd);
+  errno = savedErrno;
+
+  return isAttyValue;
+}
+
+// Functions deprecated by MSVC 8.0.
+
+GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
+
+// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
+// StrError() aren't needed on Windows CE at this time and thus not
+// defined there.
+
+#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
+    !GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA
+inline int ChDir(const char* dir) { return chdir(dir); }
+#endif
+inline FILE* FOpen(const char* path, const char* mode) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+  struct wchar_codecvt : public std::codecvt<wchar_t, char, std::mbstate_t> {};
+  std::wstring_convert<wchar_codecvt> converter;
+  std::wstring wide_path = converter.from_bytes(path);
+  std::wstring wide_mode = converter.from_bytes(mode);
+  return _wfopen(wide_path.c_str(), wide_mode.c_str());
+#else  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+  return fopen(path, mode);
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+}
+#if !GTEST_OS_WINDOWS_MOBILE
+inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
+  return freopen(path, mode, stream);
+}
+inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
+#endif
+inline int FClose(FILE* fp) { return fclose(fp); }
+#if !GTEST_OS_WINDOWS_MOBILE
+inline int Read(int fd, void* buf, unsigned int count) {
+  return static_cast<int>(read(fd, buf, count));
+}
+inline int Write(int fd, const void* buf, unsigned int count) {
+  return static_cast<int>(write(fd, buf, count));
+}
+inline int Close(int fd) { return close(fd); }
+inline const char* StrError(int errnum) { return strerror(errnum); }
+#endif
+inline const char* GetEnv(const char* name) {
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+  // We are on an embedded platform, which has no environment variables.
+  static_cast<void>(name);  // To prevent 'unused argument' warning.
+  return nullptr;
+#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
+  // Environment variables which we programmatically clear will be set to the
+  // empty string rather than unset (NULL).  Handle that case.
+  const char* const env = getenv(name);
+  return (env != nullptr && env[0] != '\0') ? env : nullptr;
+#else
+  return getenv(name);
+#endif
+}
+
+GTEST_DISABLE_MSC_DEPRECATED_POP_()
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Windows CE has no C library. The abort() function is used in
+// several places in Google Test. This implementation provides a reasonable
+// imitation of standard behaviour.
+[[noreturn]] void Abort();
+#else
+[[noreturn]] inline void Abort() { abort(); }
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+}  // namespace posix
+
+// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
+// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
+// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
+// function in order to achieve that.  We use macro definition here because
+// snprintf is a variadic function.
+#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
+// MSVC 2005 and above support variadic macros.
+# define GTEST_SNPRINTF_(buffer, size, format, ...) \
+     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
+#elif defined(_MSC_VER)
+// Windows CE does not define _snprintf_s
+# define GTEST_SNPRINTF_ _snprintf
+#else
+# define GTEST_SNPRINTF_ snprintf
+#endif
+
+// The biggest signed integer type the compiler supports.
+//
+// long long is guaranteed to be at least 64-bits in C++11.
+using BiggestInt = long long;  // NOLINT
+
+// The maximum number a BiggestInt can represent.
+constexpr BiggestInt kMaxBiggestInt = (std::numeric_limits<BiggestInt>::max)();
+
+// This template class serves as a compile-time function from size to
+// type.  It maps a size in bytes to a primitive type with that
+// size. e.g.
+//
+//   TypeWithSize<4>::UInt
+//
+// is typedef-ed to be unsigned int (unsigned integer made up of 4
+// bytes).
+//
+// Such functionality should belong to STL, but I cannot find it
+// there.
+//
+// Google Test uses this class in the implementation of floating-point
+// comparison.
+//
+// For now it only handles UInt (unsigned int) as that's all Google Test
+// needs.  Other types can be easily added in the future if need
+// arises.
+template <size_t size>
+class TypeWithSize {
+ public:
+  // This prevents the user from using TypeWithSize<N> with incorrect
+  // values of N.
+  using UInt = void;
+};
+
+// The specialization for size 4.
+template <>
+class TypeWithSize<4> {
+ public:
+  using Int = std::int32_t;
+  using UInt = std::uint32_t;
+};
+
+// The specialization for size 8.
+template <>
+class TypeWithSize<8> {
+ public:
+  using Int = std::int64_t;
+  using UInt = std::uint64_t;
+};
+
+// Integer types of known sizes.
+using TimeInMillis = int64_t;  // Represents time in milliseconds.
+
+// Utilities for command line flags and environment variables.
+
+// Macro for referencing flags.
+#if !defined(GTEST_FLAG)
+# define GTEST_FLAG(name) FLAGS_gtest_##name
+#endif  // !defined(GTEST_FLAG)
+
+#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
+#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+
+#if !defined(GTEST_DECLARE_bool_)
+# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
+
+// Macros for declaring flags.
+# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
+# define GTEST_DECLARE_int32_(name) \
+    GTEST_API_ extern std::int32_t GTEST_FLAG(name)
+# define GTEST_DECLARE_string_(name) \
+    GTEST_API_ extern ::std::string GTEST_FLAG(name)
+
+// Macros for defining flags.
+# define GTEST_DEFINE_bool_(name, default_val, doc) \
+    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
+# define GTEST_DEFINE_int32_(name, default_val, doc) \
+    GTEST_API_ std::int32_t GTEST_FLAG(name) = (default_val)
+# define GTEST_DEFINE_string_(name, default_val, doc) \
+    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
+
+#endif  // !defined(GTEST_DECLARE_bool_)
+
+// Thread annotations
+#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
+# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
+# define GTEST_LOCK_EXCLUDED_(locks)
+#endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
+// to *value and returns true; otherwise leaves *value unchanged and returns
+// false.
+GTEST_API_ bool ParseInt32(const Message& src_text, const char* str,
+                           int32_t* value);
+
+// Parses a bool/int32_t/string from the environment variable
+// corresponding to the given Google Test flag.
+bool BoolFromGTestEnv(const char* flag, bool default_val);
+GTEST_API_ int32_t Int32FromGTestEnv(const char* flag, int32_t default_val);
+std::string OutputFlagAlsoCheckEnvVar();
+const char* StringFromGTestEnv(const char* flag, const char* default_val);
+
+}  // namespace internal
+}  // namespace testing
+
+#if !defined(GTEST_INTERNAL_DEPRECATED)
+
+// Internal Macro to mark an API deprecated, for googletest usage only
+// Usage: class GTEST_INTERNAL_DEPRECATED(message) MyClass or
+// GTEST_INTERNAL_DEPRECATED(message) <return_type> myFunction(); Every usage of
+// a deprecated entity will trigger a warning when compiled with
+// `-Wdeprecated-declarations` option (clang, gcc, any __GNUC__ compiler).
+// For msvc /W3 option will need to be used
+// Note that for 'other' compilers this macro evaluates to nothing to prevent
+// compilations errors.
+#if defined(_MSC_VER)
+#define GTEST_INTERNAL_DEPRECATED(message) __declspec(deprecated(message))
+#elif defined(__GNUC__)
+#define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message)))
+#else
+#define GTEST_INTERNAL_DEPRECATED(message)
+#endif
+
+#endif  // !defined(GTEST_INTERNAL_DEPRECATED)
+
+#if GTEST_HAS_ABSL
+// Always use absl::any for UniversalPrinter<> specializations if googletest
+// is built with absl support.
+#define GTEST_INTERNAL_HAS_ANY 1
+#include "absl/types/any.h"
+namespace testing {
+namespace internal {
+using Any = ::absl::any;
+}  // namespace internal
+}  // namespace testing
+#else
+#ifdef __has_include
+#if __has_include(<any>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::any for UniversalPrinter<>
+// specializations.
+#define GTEST_INTERNAL_HAS_ANY 1
+#include <any>
+namespace testing {
+namespace internal {
+using Any = ::std::any;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::any is not
+// supported.
+#endif  // __has_include(<any>) && __cplusplus >= 201703L
+#endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#if GTEST_HAS_ABSL
+// Always use absl::optional for UniversalPrinter<> specializations if
+// googletest is built with absl support.
+#define GTEST_INTERNAL_HAS_OPTIONAL 1
+#include "absl/types/optional.h"
+namespace testing {
+namespace internal {
+template <typename T>
+using Optional = ::absl::optional<T>;
+}  // namespace internal
+}  // namespace testing
+#else
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::optional for UniversalPrinter<>
+// specializations.
+#define GTEST_INTERNAL_HAS_OPTIONAL 1
+#include <optional>
+namespace testing {
+namespace internal {
+template <typename T>
+using Optional = ::std::optional<T>;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::optional is not
+// supported.
+#endif  // __has_include(<optional>) && __cplusplus >= 201703L
+#endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#if GTEST_HAS_ABSL
+// Always use absl::string_view for Matcher<> specializations if googletest
+// is built with absl support.
+# define GTEST_INTERNAL_HAS_STRING_VIEW 1
+#include "absl/strings/string_view.h"
+namespace testing {
+namespace internal {
+using StringView = ::absl::string_view;
+}  // namespace internal
+}  // namespace testing
+#else
+# ifdef __has_include
+#   if __has_include(<string_view>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::string_view for Matcher<>
+// specializations.
+#   define GTEST_INTERNAL_HAS_STRING_VIEW 1
+#include <string_view>
+namespace testing {
+namespace internal {
+using StringView = ::std::string_view;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::string_view is not
+// supported.
+#  endif  // __has_include(<string_view>) && __cplusplus >= 201703L
+# endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#if GTEST_HAS_ABSL
+// Always use absl::variant for UniversalPrinter<> specializations if googletest
+// is built with absl support.
+#define GTEST_INTERNAL_HAS_VARIANT 1
+#include "absl/types/variant.h"
+namespace testing {
+namespace internal {
+template <typename... T>
+using Variant = ::absl::variant<T...>;
+}  // namespace internal
+}  // namespace testing
+#else
+#ifdef __has_include
+#if __has_include(<variant>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::variant for UniversalPrinter<>
+// specializations.
+#define GTEST_INTERNAL_HAS_VARIANT 1
+#include <variant>
+namespace testing {
+namespace internal {
+template <typename... T>
+using Variant = ::std::variant<T...>;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::variant is not supported.
+#endif  // __has_include(<variant>) && __cplusplus >= 201703L
+#endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+
+#if GTEST_OS_LINUX
+# include <stdlib.h>
+# include <sys/types.h>
+# include <sys/wait.h>
+# include <unistd.h>
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#include <ctype.h>
+#include <float.h>
+#include <string.h>
+#include <cstdint>
+#include <iomanip>
+#include <limits>
+#include <map>
+#include <set>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the Message class.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+
+#include <limits>
+#include <memory>
+#include <sstream>
+
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+// Ensures that there is at least one operator<< in the global namespace.
+// See Message& operator<<(...) below for why.
+void operator<<(const testing::internal::Secret&, int);
+
+namespace testing {
+
+// The Message class works like an ostream repeater.
+//
+// Typical usage:
+//
+//   1. You stream a bunch of values to a Message object.
+//      It will remember the text in a stringstream.
+//   2. Then you stream the Message object to an ostream.
+//      This causes the text in the Message to be streamed
+//      to the ostream.
+//
+// For example;
+//
+//   testing::Message foo;
+//   foo << 1 << " != " << 2;
+//   std::cout << foo;
+//
+// will print "1 != 2".
+//
+// Message is not intended to be inherited from.  In particular, its
+// destructor is not virtual.
+//
+// Note that stringstream behaves differently in gcc and in MSVC.  You
+// can stream a NULL char pointer to it in the former, but not in the
+// latter (it causes an access violation if you do).  The Message
+// class hides this difference by treating a NULL char pointer as
+// "(null)".
+class GTEST_API_ Message {
+ private:
+  // The type of basic IO manipulators (endl, ends, and flush) for
+  // narrow streams.
+  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
+
+ public:
+  // Constructs an empty Message.
+  Message();
+
+  // Copy constructor.
+  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
+    *ss_ << msg.GetString();
+  }
+
+  // Constructs a Message from a C-string.
+  explicit Message(const char* str) : ss_(new ::std::stringstream) {
+    *ss_ << str;
+  }
+
+  // Streams a non-pointer value to this object.
+  template <typename T>
+  inline Message& operator <<(const T& val) {
+    // Some libraries overload << for STL containers.  These
+    // overloads are defined in the global namespace instead of ::std.
+    //
+    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
+    // overloads are visible in either the std namespace or the global
+    // namespace, but not other namespaces, including the testing
+    // namespace which Google Test's Message class is in.
+    //
+    // To allow STL containers (and other types that has a << operator
+    // defined in the global namespace) to be used in Google Test
+    // assertions, testing::Message must access the custom << operator
+    // from the global namespace.  With this using declaration,
+    // overloads of << defined in the global namespace and those
+    // visible via Koenig lookup are both exposed in this function.
+    using ::operator <<;
+    *ss_ << val;
+    return *this;
+  }
+
+  // Streams a pointer value to this object.
+  //
+  // This function is an overload of the previous one.  When you
+  // stream a pointer to a Message, this definition will be used as it
+  // is more specialized.  (The C++ Standard, section
+  // [temp.func.order].)  If you stream a non-pointer, then the
+  // previous definition will be used.
+  //
+  // The reason for this overload is that streaming a NULL pointer to
+  // ostream is undefined behavior.  Depending on the compiler, you
+  // may get "0", "(nil)", "(null)", or an access violation.  To
+  // ensure consistent result across compilers, we always treat NULL
+  // as "(null)".
+  template <typename T>
+  inline Message& operator <<(T* const& pointer) {  // NOLINT
+    if (pointer == nullptr) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+    return *this;
+  }
+
+  // Since the basic IO manipulators are overloaded for both narrow
+  // and wide streams, we have to provide this specialized definition
+  // of operator <<, even though its body is the same as the
+  // templatized version above.  Without this definition, streaming
+  // endl or other basic IO manipulators to Message will confuse the
+  // compiler.
+  Message& operator <<(BasicNarrowIoManip val) {
+    *ss_ << val;
+    return *this;
+  }
+
+  // Instead of 1/0, we want to see true/false for bool values.
+  Message& operator <<(bool b) {
+    return *this << (b ? "true" : "false");
+  }
+
+  // These two overloads allow streaming a wide C string to a Message
+  // using the UTF-8 encoding.
+  Message& operator <<(const wchar_t* wide_c_str);
+  Message& operator <<(wchar_t* wide_c_str);
+
+#if GTEST_HAS_STD_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::std::wstring& wstr);
+#endif  // GTEST_HAS_STD_WSTRING
+
+  // Gets the text streamed to this object so far as an std::string.
+  // Each '\0' character in the buffer is replaced with "\\0".
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  std::string GetString() const;
+
+ private:
+  // We'll hold the text streamed to this object here.
+  const std::unique_ptr< ::std::stringstream> ss_;
+
+  // We declare (but don't implement) this to prevent the compiler
+  // from implementing the assignment operator.
+  void operator=(const Message&);
+};
+
+// Streams a Message to an ostream.
+inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
+  return os << sb.GetString();
+}
+
+namespace internal {
+
+// Converts a streamable value to an std::string.  A NULL pointer is
+// converted to "(null)".  When the input value is a ::string,
+// ::std::string, ::wstring, or ::std::wstring object, each NUL
+// character in it is replaced with "\\0".
+template <typename T>
+std::string StreamableToString(const T& streamable) {
+  return (Message() << streamable).GetString();
+}
+
+}  // namespace internal
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Google Test filepath utilities
+//
+// This header file declares classes and functions used internally by
+// Google Test.  They are subject to change without notice.
+//
+// This file is #included in gtest/internal/gtest-internal.h.
+// Do not include this header file separately!
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file declares the String class and functions used internally by
+// Google Test.  They are subject to change without notice. They should not used
+// by code external to Google Test.
+//
+// This header file is #included by gtest-internal.h.
+// It should not be #included by other files.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+
+#ifdef __BORLANDC__
+// string.h is not guaranteed to provide strcpy on C++ Builder.
+# include <mem.h>
+#endif
+
+#include <string.h>
+#include <cstdint>
+#include <string>
+
+
+namespace testing {
+namespace internal {
+
+// String - an abstract class holding static string utilities.
+class GTEST_API_ String {
+ public:
+  // Static utility methods
+
+  // Clones a 0-terminated C string, allocating memory using new.  The
+  // caller is responsible for deleting the return value using
+  // delete[].  Returns the cloned string, or NULL if the input is
+  // NULL.
+  //
+  // This is different from strdup() in string.h, which allocates
+  // memory using malloc().
+  static const char* CloneCString(const char* c_str);
+
+#if GTEST_OS_WINDOWS_MOBILE
+  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
+  // able to pass strings to Win32 APIs on CE we need to convert them
+  // to 'Unicode', UTF-16.
+
+  // Creates a UTF-16 wide string from the given ANSI string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the wide string, or NULL if the
+  // input is NULL.
+  //
+  // The wide string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static LPCWSTR AnsiToUtf16(const char* c_str);
+
+  // Creates an ANSI string from the given wide string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the ANSI string, or NULL if the
+  // input is NULL.
+  //
+  // The returned string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
+#endif
+
+  // Compares two C strings.  Returns true if and only if they have the same
+  // content.
+  //
+  // Unlike strcmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CStringEquals(const char* lhs, const char* rhs);
+
+  // Converts a wide C string to a String using the UTF-8 encoding.
+  // NULL will be converted to "(null)".  If an error occurred during
+  // the conversion, "(failed to convert from wide string)" is
+  // returned.
+  static std::string ShowWideCString(const wchar_t* wide_c_str);
+
+  // Compares two wide C strings.  Returns true if and only if they have the
+  // same content.
+  //
+  // Unlike wcscmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
+
+  // Compares two C strings, ignoring case.  Returns true if and only if
+  // they have the same content.
+  //
+  // Unlike strcasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CaseInsensitiveCStringEquals(const char* lhs,
+                                           const char* rhs);
+
+  // Compares two wide C strings, ignoring case.  Returns true if and only if
+  // they have the same content.
+  //
+  // Unlike wcscasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL wide C string,
+  // including the empty string.
+  // NB: The implementations on different platforms slightly differ.
+  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+  // environment variable. On GNU platform this method uses wcscasecmp
+  // which compares according to LC_CTYPE category of the current locale.
+  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+  // current locale.
+  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                               const wchar_t* rhs);
+
+  // Returns true if and only if the given string ends with the given suffix,
+  // ignoring case. Any string is considered to end with an empty suffix.
+  static bool EndsWithCaseInsensitive(
+      const std::string& str, const std::string& suffix);
+
+  // Formats an int value as "%02d".
+  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
+
+  // Formats an int value to given width with leading zeros.
+  static std::string FormatIntWidthN(int value, int width);
+
+  // Formats an int value as "%X".
+  static std::string FormatHexInt(int value);
+
+  // Formats an int value as "%X".
+  static std::string FormatHexUInt32(uint32_t value);
+
+  // Formats a byte as "%02X".
+  static std::string FormatByte(unsigned char value);
+
+ private:
+  String();  // Not meant to be instantiated.
+};  // class String
+
+// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
+// character in the buffer is replaced with "\\0".
+GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+namespace internal {
+
+// FilePath - a class for file and directory pathname manipulation which
+// handles platform-specific conventions (like the pathname separator).
+// Used for helper functions for naming files in a directory for xml output.
+// Except for Set methods, all methods are const or static, which provides an
+// "immutable value object" -- useful for peace of mind.
+// A FilePath with a value ending in a path separator ("like/this/") represents
+// a directory, otherwise it is assumed to represent a file. In either case,
+// it may or may not represent an actual file or directory in the file system.
+// Names are NOT checked for syntax correctness -- no checking for illegal
+// characters, malformed paths, etc.
+
+class GTEST_API_ FilePath {
+ public:
+  FilePath() : pathname_("") { }
+  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
+
+  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
+    Normalize();
+  }
+
+  FilePath& operator=(const FilePath& rhs) {
+    Set(rhs);
+    return *this;
+  }
+
+  void Set(const FilePath& rhs) {
+    pathname_ = rhs.pathname_;
+  }
+
+  const std::string& string() const { return pathname_; }
+  const char* c_str() const { return pathname_.c_str(); }
+
+  // Returns the current working directory, or "" if unsuccessful.
+  static FilePath GetCurrentDir();
+
+  // Given directory = "dir", base_name = "test", number = 0,
+  // extension = "xml", returns "dir/test.xml". If number is greater
+  // than zero (e.g., 12), returns "dir/test_12.xml".
+  // On Windows platform, uses \ as the separator rather than /.
+  static FilePath MakeFileName(const FilePath& directory,
+                               const FilePath& base_name,
+                               int number,
+                               const char* extension);
+
+  // Given directory = "dir", relative_path = "test.xml",
+  // returns "dir/test.xml".
+  // On Windows, uses \ as the separator rather than /.
+  static FilePath ConcatPaths(const FilePath& directory,
+                              const FilePath& relative_path);
+
+  // Returns a pathname for a file that does not currently exist. The pathname
+  // will be directory/base_name.extension or
+  // directory/base_name_<number>.extension if directory/base_name.extension
+  // already exists. The number will be incremented until a pathname is found
+  // that does not already exist.
+  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+  // There could be a race condition if two or more processes are calling this
+  // function at the same time -- they could both pick the same filename.
+  static FilePath GenerateUniqueFileName(const FilePath& directory,
+                                         const FilePath& base_name,
+                                         const char* extension);
+
+  // Returns true if and only if the path is "".
+  bool IsEmpty() const { return pathname_.empty(); }
+
+  // If input name has a trailing separator character, removes it and returns
+  // the name, otherwise return the name string unmodified.
+  // On Windows platform, uses \ as the separator, other platforms use /.
+  FilePath RemoveTrailingPathSeparator() const;
+
+  // Returns a copy of the FilePath with the directory part removed.
+  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
+  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
+  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
+  // returns an empty FilePath ("").
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveDirectoryName() const;
+
+  // RemoveFileName returns the directory path with the filename removed.
+  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveFileName() const;
+
+  // Returns a copy of the FilePath with the case-insensitive extension removed.
+  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+  // FilePath("dir/file"). If a case-insensitive extension is not
+  // found, returns a copy of the original FilePath.
+  FilePath RemoveExtension(const char* extension) const;
+
+  // Creates directories so that path exists. Returns true if successful or if
+  // the directories already exist; returns false if unable to create
+  // directories for any reason. Will also return false if the FilePath does
+  // not represent a directory (that is, it doesn't end with a path separator).
+  bool CreateDirectoriesRecursively() const;
+
+  // Create the directory so that path exists. Returns true if successful or
+  // if the directory already exists; returns false if unable to create the
+  // directory for any reason, including if the parent directory does not
+  // exist. Not named "CreateDirectory" because that's a macro on Windows.
+  bool CreateFolder() const;
+
+  // Returns true if FilePath describes something in the file-system,
+  // either a file, directory, or whatever, and that something exists.
+  bool FileOrDirectoryExists() const;
+
+  // Returns true if pathname describes a directory in the file-system
+  // that exists.
+  bool DirectoryExists() const;
+
+  // Returns true if FilePath ends with a path separator, which indicates that
+  // it is intended to represent a directory. Returns false otherwise.
+  // This does NOT check that a directory (or file) actually exists.
+  bool IsDirectory() const;
+
+  // Returns true if pathname describes a root directory. (Windows has one
+  // root directory per disk drive.)
+  bool IsRootDirectory() const;
+
+  // Returns true if pathname describes an absolute path.
+  bool IsAbsolutePath() const;
+
+ private:
+  // Replaces multiple consecutive separators with a single separator.
+  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+  // redundancies that might be in a pathname involving "." or "..".
+  //
+  // A pathname with multiple consecutive separators may occur either through
+  // user error or as a result of some scripts or APIs that generate a pathname
+  // with a trailing separator. On other platforms the same API or script
+  // may NOT generate a pathname with a trailing "/". Then elsewhere that
+  // pathname may have another "/" and pathname components added to it,
+  // without checking for the separator already being there.
+  // The script language and operating system may allow paths like "foo//bar"
+  // but some of the functions in FilePath will not handle that correctly. In
+  // particular, RemoveTrailingPathSeparator() only removes one separator, and
+  // it is called in CreateDirectoriesRecursively() assuming that it will change
+  // a pathname from directory syntax (trailing separator) to filename syntax.
+  //
+  // On Windows this method also replaces the alternate path separator '/' with
+  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
+  // "bar\\foo".
+
+  void Normalize();
+
+  // Returns a pointer to the last occurrence of a valid path separator in
+  // the FilePath. On Windows, for example, both '/' and '\' are valid path
+  // separators. Returns NULL if no path separator was found.
+  const char* FindLastPathSeparator() const;
+
+  std::string pathname_;
+};  // class FilePath
+
+}  // namespace internal
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Type utilities needed for implementing typed and type-parameterized
+// tests.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+
+// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
+// libstdc++ (which is where cxxabi.h comes from).
+# if GTEST_HAS_CXXABI_H_
+#  include <cxxabi.h>
+# elif defined(__HP_aCC)
+#  include <acxx_demangle.h>
+# endif  // GTEST_HASH_CXXABI_H_
+
+namespace testing {
+namespace internal {
+
+// Canonicalizes a given name with respect to the Standard C++ Library.
+// This handles removing the inline namespace within `std` that is
+// used by various standard libraries (e.g., `std::__1`).  Names outside
+// of namespace std are returned unmodified.
+inline std::string CanonicalizeForStdLibVersioning(std::string s) {
+  static const char prefix[] = "std::__";
+  if (s.compare(0, strlen(prefix), prefix) == 0) {
+    std::string::size_type end = s.find("::", strlen(prefix));
+    if (end != s.npos) {
+      // Erase everything between the initial `std` and the second `::`.
+      s.erase(strlen("std"), end - strlen("std"));
+    }
+  }
+  return s;
+}
+
+#if GTEST_HAS_RTTI
+// GetTypeName(const std::type_info&) returns a human-readable name of type T.
+inline std::string GetTypeName(const std::type_info& type) {
+  const char* const name = type.name();
+#if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
+  int status = 0;
+  // gcc's implementation of typeid(T).name() mangles the type name,
+  // so we have to demangle it.
+#if GTEST_HAS_CXXABI_H_
+  using abi::__cxa_demangle;
+#endif  // GTEST_HAS_CXXABI_H_
+  char* const readable_name = __cxa_demangle(name, nullptr, nullptr, &status);
+  const std::string name_str(status == 0 ? readable_name : name);
+  free(readable_name);
+  return CanonicalizeForStdLibVersioning(name_str);
+#else
+  return name;
+#endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
+}
+#endif  // GTEST_HAS_RTTI
+
+// GetTypeName<T>() returns a human-readable name of type T if and only if
+// RTTI is enabled, otherwise it returns a dummy type name.
+// NB: This function is also used in Google Mock, so don't move it inside of
+// the typed-test-only section below.
+template <typename T>
+std::string GetTypeName() {
+#if GTEST_HAS_RTTI
+  return GetTypeName(typeid(T));
+#else
+  return "<type>";
+#endif  // GTEST_HAS_RTTI
+}
+
+// A unique type indicating an empty node
+struct None {};
+
+# define GTEST_TEMPLATE_ template <typename T> class
+
+// The template "selector" struct TemplateSel<Tmpl> is used to
+// represent Tmpl, which must be a class template with one type
+// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
+// as the type Tmpl<T>.  This allows us to actually instantiate the
+// template "selected" by TemplateSel<Tmpl>.
+//
+// This trick is necessary for simulating typedef for class templates,
+// which C++ doesn't support directly.
+template <GTEST_TEMPLATE_ Tmpl>
+struct TemplateSel {
+  template <typename T>
+  struct Bind {
+    typedef Tmpl<T> type;
+  };
+};
+
+# define GTEST_BIND_(TmplSel, T) \
+  TmplSel::template Bind<T>::type
+
+template <GTEST_TEMPLATE_ Head_, GTEST_TEMPLATE_... Tail_>
+struct Templates {
+  using Head = TemplateSel<Head_>;
+  using Tail = Templates<Tail_...>;
+};
+
+template <GTEST_TEMPLATE_ Head_>
+struct Templates<Head_> {
+  using Head = TemplateSel<Head_>;
+  using Tail = None;
+};
+
+// Tuple-like type lists
+template <typename Head_, typename... Tail_>
+struct Types {
+  using Head = Head_;
+  using Tail = Types<Tail_...>;
+};
+
+template <typename Head_>
+struct Types<Head_> {
+  using Head = Head_;
+  using Tail = None;
+};
+
+// Helper metafunctions to tell apart a single type from types
+// generated by ::testing::Types
+template <typename... Ts>
+struct ProxyTypeList {
+  using type = Types<Ts...>;
+};
+
+template <typename>
+struct is_proxy_type_list : std::false_type {};
+
+template <typename... Ts>
+struct is_proxy_type_list<ProxyTypeList<Ts...>> : std::true_type {};
+
+// Generator which conditionally creates type lists.
+// It recognizes if a requested type list should be created
+// and prevents creating a new type list nested within another one.
+template <typename T>
+struct GenerateTypeList {
+ private:
+  using proxy = typename std::conditional<is_proxy_type_list<T>::value, T,
+                                          ProxyTypeList<T>>::type;
+
+ public:
+  using type = typename proxy::type;
+};
+
+}  // namespace internal
+
+template <typename... Ts>
+using Types = internal::ProxyTypeList<Ts...>;
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+// Due to C++ preprocessor weirdness, we need double indirection to
+// concatenate two tokens when one of them is __LINE__.  Writing
+//
+//   foo ## __LINE__
+//
+// will result in the token foo__LINE__, instead of foo followed by
+// the current line number.  For more details, see
+// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
+#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
+#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
+
+// Stringifies its argument.
+// Work around a bug in visual studio which doesn't accept code like this:
+//
+//   #define GTEST_STRINGIFY_(name) #name
+//   #define MACRO(a, b, c) ... GTEST_STRINGIFY_(a) ...
+//   MACRO(, x, y)
+//
+// Complaining about the argument to GTEST_STRINGIFY_ being empty.
+// This is allowed by the spec.
+#define GTEST_STRINGIFY_HELPER_(name, ...) #name
+#define GTEST_STRINGIFY_(...) GTEST_STRINGIFY_HELPER_(__VA_ARGS__, )
+
+namespace proto2 {
+class MessageLite;
+}
+
+namespace testing {
+
+// Forward declarations.
+
+class AssertionResult;                 // Result of an assertion.
+class Message;                         // Represents a failure message.
+class Test;                            // Represents a test.
+class TestInfo;                        // Information about a test.
+class TestPartResult;                  // Result of a test part.
+class UnitTest;                        // A collection of test suites.
+
+template <typename T>
+::std::string PrintToString(const T& value);
+
+namespace internal {
+
+struct TraceInfo;                      // Information about a trace point.
+class TestInfoImpl;                    // Opaque implementation of TestInfo
+class UnitTestImpl;                    // Opaque implementation of UnitTest
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+GTEST_API_ extern const char kStackTraceMarker[];
+
+// An IgnoredValue object can be implicitly constructed from ANY value.
+class IgnoredValue {
+  struct Sink {};
+ public:
+  // This constructor template allows any value to be implicitly
+  // converted to IgnoredValue.  The object has no data member and
+  // doesn't try to remember anything about the argument.  We
+  // deliberately omit the 'explicit' keyword in order to allow the
+  // conversion to be implicit.
+  // Disable the conversion if T already has a magical conversion operator.
+  // Otherwise we get ambiguity.
+  template <typename T,
+            typename std::enable_if<!std::is_convertible<T, Sink>::value,
+                                    int>::type = 0>
+  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
+};
+
+// Appends the user-supplied message to the Google-Test-generated message.
+GTEST_API_ std::string AppendUserMessage(
+    const std::string& gtest_msg, const Message& user_msg);
+
+#if GTEST_HAS_EXCEPTIONS
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4275 \
+/* an exported class was derived from a class that was not exported */)
+
+// This exception is thrown by (and only by) a failed Google Test
+// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
+// are enabled).  We derive it from std::runtime_error, which is for
+// errors presumably detectable only at run time.  Since
+// std::runtime_error inherits from std::exception, many testing
+// frameworks know how to extract and print the message inside it.
+class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
+ public:
+  explicit GoogleTestFailureException(const TestPartResult& failure);
+};
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4275
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+namespace edit_distance {
+// Returns the optimal edits to go from 'left' to 'right'.
+// All edits cost the same, with replace having lower priority than
+// add/remove.
+// Simple implementation of the Wagner-Fischer algorithm.
+// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
+enum EditType { kMatch, kAdd, kRemove, kReplace };
+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<size_t>& left, const std::vector<size_t>& right);
+
+// Same as above, but the input is represented as strings.
+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<std::string>& left,
+    const std::vector<std::string>& right);
+
+// Create a diff of the input strings in Unified diff format.
+GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
+                                         const std::vector<std::string>& right,
+                                         size_t context = 2);
+
+}  // namespace edit_distance
+
+// Calculate the diff between 'left' and 'right' and return it in unified diff
+// format.
+// If not null, stores in 'total_line_count' the total number of lines found
+// in left + right.
+GTEST_API_ std::string DiffStrings(const std::string& left,
+                                   const std::string& right,
+                                   size_t* total_line_count);
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   expected_expression: "foo"
+//   actual_expression:   "bar"
+//   expected_value:      "5"
+//   actual_value:        "6"
+//
+// The ignoring_case parameter is true if and only if the assertion is a
+// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
+// be inserted into the message.
+GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
+                                     const char* actual_expression,
+                                     const std::string& expected_value,
+                                     const std::string& actual_value,
+                                     bool ignoring_case);
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+GTEST_API_ std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value);
+
+// This template class represents an IEEE floating-point number
+// (either single-precision or double-precision, depending on the
+// template parameters).
+//
+// The purpose of this class is to do more sophisticated number
+// comparison.  (Due to round-off error, etc, it's very unlikely that
+// two floating-points will be equal exactly.  Hence a naive
+// comparison by the == operation often doesn't work.)
+//
+// Format of IEEE floating-point:
+//
+//   The most-significant bit being the leftmost, an IEEE
+//   floating-point looks like
+//
+//     sign_bit exponent_bits fraction_bits
+//
+//   Here, sign_bit is a single bit that designates the sign of the
+//   number.
+//
+//   For float, there are 8 exponent bits and 23 fraction bits.
+//
+//   For double, there are 11 exponent bits and 52 fraction bits.
+//
+//   More details can be found at
+//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+template <typename RawType>
+class FloatingPoint {
+ public:
+  // Defines the unsigned integer type that has the same size as the
+  // floating point number.
+  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
+
+  // Constants.
+
+  // # of bits in a number.
+  static const size_t kBitCount = 8*sizeof(RawType);
+
+  // # of fraction bits in a number.
+  static const size_t kFractionBitCount =
+    std::numeric_limits<RawType>::digits - 1;
+
+  // # of exponent bits in a number.
+  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
+
+  // The mask for the sign bit.
+  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
+
+  // The mask for the fraction bits.
+  static const Bits kFractionBitMask =
+    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
+
+  // The mask for the exponent bits.
+  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
+
+  // How many ULP's (Units in the Last Place) we want to tolerate when
+  // comparing two numbers.  The larger the value, the more error we
+  // allow.  A 0 value means that two numbers must be exactly the same
+  // to be considered equal.
+  //
+  // The maximum error of a single floating-point operation is 0.5
+  // units in the last place.  On Intel CPU's, all floating-point
+  // calculations are done with 80-bit precision, while double has 64
+  // bits.  Therefore, 4 should be enough for ordinary use.
+  //
+  // See the following article for more details on ULP:
+  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
+  static const uint32_t kMaxUlps = 4;
+
+  // Constructs a FloatingPoint from a raw floating-point number.
+  //
+  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
+  // around may change its bits, although the new value is guaranteed
+  // to be also a NAN.  Therefore, don't expect this constructor to
+  // preserve the bits in x when x is a NAN.
+  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
+
+  // Static methods
+
+  // Reinterprets a bit pattern as a floating-point number.
+  //
+  // This function is needed to test the AlmostEquals() method.
+  static RawType ReinterpretBits(const Bits bits) {
+    FloatingPoint fp(0);
+    fp.u_.bits_ = bits;
+    return fp.u_.value_;
+  }
+
+  // Returns the floating-point number that represent positive infinity.
+  static RawType Infinity() {
+    return ReinterpretBits(kExponentBitMask);
+  }
+
+  // Returns the maximum representable finite floating-point number.
+  static RawType Max();
+
+  // Non-static methods
+
+  // Returns the bits that represents this number.
+  const Bits &bits() const { return u_.bits_; }
+
+  // Returns the exponent bits of this number.
+  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
+
+  // Returns the fraction bits of this number.
+  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
+
+  // Returns the sign bit of this number.
+  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
+
+  // Returns true if and only if this is NAN (not a number).
+  bool is_nan() const {
+    // It's a NAN if the exponent bits are all ones and the fraction
+    // bits are not entirely zeros.
+    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
+  }
+
+  // Returns true if and only if this number is at most kMaxUlps ULP's away
+  // from rhs.  In particular, this function:
+  //
+  //   - returns false if either number is (or both are) NAN.
+  //   - treats really large numbers as almost equal to infinity.
+  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
+  bool AlmostEquals(const FloatingPoint& rhs) const {
+    // The IEEE standard says that any comparison operation involving
+    // a NAN must return false.
+    if (is_nan() || rhs.is_nan()) return false;
+
+    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
+        <= kMaxUlps;
+  }
+
+ private:
+  // The data type used to store the actual floating-point number.
+  union FloatingPointUnion {
+    RawType value_;  // The raw floating-point number.
+    Bits bits_;      // The bits that represent the number.
+  };
+
+  // Converts an integer from the sign-and-magnitude representation to
+  // the biased representation.  More precisely, let N be 2 to the
+  // power of (kBitCount - 1), an integer x is represented by the
+  // unsigned number x + N.
+  //
+  // For instance,
+  //
+  //   -N + 1 (the most negative number representable using
+  //          sign-and-magnitude) is represented by 1;
+  //   0      is represented by N; and
+  //   N - 1  (the biggest number representable using
+  //          sign-and-magnitude) is represented by 2N - 1.
+  //
+  // Read http://en.wikipedia.org/wiki/Signed_number_representations
+  // for more details on signed number representations.
+  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
+    if (kSignBitMask & sam) {
+      // sam represents a negative number.
+      return ~sam + 1;
+    } else {
+      // sam represents a positive number.
+      return kSignBitMask | sam;
+    }
+  }
+
+  // Given two numbers in the sign-and-magnitude representation,
+  // returns the distance between them as an unsigned number.
+  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
+                                                     const Bits &sam2) {
+    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
+    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
+    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
+  }
+
+  FloatingPointUnion u_;
+};
+
+// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
+// macro defined by <windows.h>.
+template <>
+inline float FloatingPoint<float>::Max() { return FLT_MAX; }
+template <>
+inline double FloatingPoint<double>::Max() { return DBL_MAX; }
+
+// Typedefs the instances of the FloatingPoint template class that we
+// care to use.
+typedef FloatingPoint<float> Float;
+typedef FloatingPoint<double> Double;
+
+// In order to catch the mistake of putting tests that use different
+// test fixture classes in the same test suite, we need to assign
+// unique IDs to fixture classes and compare them.  The TypeId type is
+// used to hold such IDs.  The user should treat TypeId as an opaque
+// type: the only operation allowed on TypeId values is to compare
+// them for equality using the == operator.
+typedef const void* TypeId;
+
+template <typename T>
+class TypeIdHelper {
+ public:
+  // dummy_ must not have a const type.  Otherwise an overly eager
+  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
+  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
+  static bool dummy_;
+};
+
+template <typename T>
+bool TypeIdHelper<T>::dummy_ = false;
+
+// GetTypeId<T>() returns the ID of type T.  Different values will be
+// returned for different types.  Calling the function twice with the
+// same type argument is guaranteed to return the same ID.
+template <typename T>
+TypeId GetTypeId() {
+  // The compiler is required to allocate a different
+  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
+  // the template.  Therefore, the address of dummy_ is guaranteed to
+  // be unique.
+  return &(TypeIdHelper<T>::dummy_);
+}
+
+// Returns the type ID of ::testing::Test.  Always call this instead
+// of GetTypeId< ::testing::Test>() to get the type ID of
+// ::testing::Test, as the latter may give the wrong result due to a
+// suspected linker bug when compiling Google Test as a Mac OS X
+// framework.
+GTEST_API_ TypeId GetTestTypeId();
+
+// Defines the abstract factory interface that creates instances
+// of a Test object.
+class TestFactoryBase {
+ public:
+  virtual ~TestFactoryBase() {}
+
+  // Creates a test instance to run. The instance is both created and destroyed
+  // within TestInfoImpl::Run()
+  virtual Test* CreateTest() = 0;
+
+ protected:
+  TestFactoryBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
+};
+
+// This class provides implementation of TeastFactoryBase interface.
+// It is used in TEST and TEST_F macros.
+template <class TestClass>
+class TestFactoryImpl : public TestFactoryBase {
+ public:
+  Test* CreateTest() override { return new TestClass; }
+};
+
+#if GTEST_OS_WINDOWS
+
+// Predicate-formatters for implementing the HRESULT checking macros
+// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
+// We pass a long instead of HRESULT to avoid causing an
+// include dependency for the HRESULT type.
+GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
+                                            long hr);  // NOLINT
+GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
+                                            long hr);  // NOLINT
+
+#endif  // GTEST_OS_WINDOWS
+
+// Types of SetUpTestSuite() and TearDownTestSuite() functions.
+using SetUpTestSuiteFunc = void (*)();
+using TearDownTestSuiteFunc = void (*)();
+
+struct CodeLocation {
+  CodeLocation(const std::string& a_file, int a_line)
+      : file(a_file), line(a_line) {}
+
+  std::string file;
+  int line;
+};
+
+//  Helper to identify which setup function for TestCase / TestSuite to call.
+//  Only one function is allowed, either TestCase or TestSute but not both.
+
+// Utility functions to help SuiteApiResolver
+using SetUpTearDownSuiteFuncType = void (*)();
+
+inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
+    SetUpTearDownSuiteFuncType a, SetUpTearDownSuiteFuncType def) {
+  return a == def ? nullptr : a;
+}
+
+template <typename T>
+//  Note that SuiteApiResolver inherits from T because
+//  SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
+//  SuiteApiResolver can access them.
+struct SuiteApiResolver : T {
+  // testing::Test is only forward declared at this point. So we make it a
+  // dependend class for the compiler to be OK with it.
+  using Test =
+      typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
+
+  static SetUpTearDownSuiteFuncType GetSetUpCaseOrSuite(const char* filename,
+                                                        int line_num) {
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+    SetUpTearDownSuiteFuncType test_case_fp =
+        GetNotDefaultOrNull(&T::SetUpTestCase, &Test::SetUpTestCase);
+    SetUpTearDownSuiteFuncType test_suite_fp =
+        GetNotDefaultOrNull(&T::SetUpTestSuite, &Test::SetUpTestSuite);
+
+    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
+        << "Test can not provide both SetUpTestSuite and SetUpTestCase, please "
+           "make sure there is only one present at "
+        << filename << ":" << line_num;
+
+    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
+#else
+    (void)(filename);
+    (void)(line_num);
+    return &T::SetUpTestSuite;
+#endif
+  }
+
+  static SetUpTearDownSuiteFuncType GetTearDownCaseOrSuite(const char* filename,
+                                                           int line_num) {
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+    SetUpTearDownSuiteFuncType test_case_fp =
+        GetNotDefaultOrNull(&T::TearDownTestCase, &Test::TearDownTestCase);
+    SetUpTearDownSuiteFuncType test_suite_fp =
+        GetNotDefaultOrNull(&T::TearDownTestSuite, &Test::TearDownTestSuite);
+
+    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
+        << "Test can not provide both TearDownTestSuite and TearDownTestCase,"
+           " please make sure there is only one present at"
+        << filename << ":" << line_num;
+
+    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
+#else
+    (void)(filename);
+    (void)(line_num);
+    return &T::TearDownTestSuite;
+#endif
+  }
+};
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_suite_name:  name of the test suite
+//   name:             name of the test
+//   type_param:       the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param:      text representation of the test's value parameter,
+//                     or NULL if this is not a type-parameterized test.
+//   code_location:    code location where the test is defined
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test suite
+//   tear_down_tc:     pointer to the function that tears down the test suite
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
+    const char* test_suite_name, const char* name, const char* type_param,
+    const char* value_param, CodeLocation code_location,
+    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
+    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory);
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+// State of the definition of a type-parameterized test suite.
+class GTEST_API_ TypedTestSuitePState {
+ public:
+  TypedTestSuitePState() : registered_(false) {}
+
+  // Adds the given test name to defined_test_names_ and return true
+  // if the test suite hasn't been registered; otherwise aborts the
+  // program.
+  bool AddTestName(const char* file, int line, const char* case_name,
+                   const char* test_name) {
+    if (registered_) {
+      fprintf(stderr,
+              "%s Test %s must be defined before "
+              "REGISTER_TYPED_TEST_SUITE_P(%s, ...).\n",
+              FormatFileLocation(file, line).c_str(), test_name, case_name);
+      fflush(stderr);
+      posix::Abort();
+    }
+    registered_tests_.insert(
+        ::std::make_pair(test_name, CodeLocation(file, line)));
+    return true;
+  }
+
+  bool TestExists(const std::string& test_name) const {
+    return registered_tests_.count(test_name) > 0;
+  }
+
+  const CodeLocation& GetCodeLocation(const std::string& test_name) const {
+    RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
+    GTEST_CHECK_(it != registered_tests_.end());
+    return it->second;
+  }
+
+  // Verifies that registered_tests match the test names in
+  // defined_test_names_; returns registered_tests if successful, or
+  // aborts the program otherwise.
+  const char* VerifyRegisteredTestNames(const char* test_suite_name,
+                                        const char* file, int line,
+                                        const char* registered_tests);
+
+ private:
+  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
+
+  bool registered_;
+  RegisteredTestsMap registered_tests_;
+};
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+using TypedTestCasePState = TypedTestSuitePState;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// Skips to the first non-space char after the first comma in 'str';
+// returns NULL if no comma is found in 'str'.
+inline const char* SkipComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  if (comma == nullptr) {
+    return nullptr;
+  }
+  while (IsSpace(*(++comma))) {}
+  return comma;
+}
+
+// Returns the prefix of 'str' before the first comma in it; returns
+// the entire string if it contains no comma.
+inline std::string GetPrefixUntilComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  return comma == nullptr ? str : std::string(str, comma);
+}
+
+// Splits a given string on a given delimiter, populating a given
+// vector with the fields.
+void SplitString(const ::std::string& str, char delimiter,
+                 ::std::vector< ::std::string>* dest);
+
+// The default argument to the template below for the case when the user does
+// not provide a name generator.
+struct DefaultNameGenerator {
+  template <typename T>
+  static std::string GetName(int i) {
+    return StreamableToString(i);
+  }
+};
+
+template <typename Provided = DefaultNameGenerator>
+struct NameGeneratorSelector {
+  typedef Provided type;
+};
+
+template <typename NameGenerator>
+void GenerateNamesRecursively(internal::None, std::vector<std::string>*, int) {}
+
+template <typename NameGenerator, typename Types>
+void GenerateNamesRecursively(Types, std::vector<std::string>* result, int i) {
+  result->push_back(NameGenerator::template GetName<typename Types::Head>(i));
+  GenerateNamesRecursively<NameGenerator>(typename Types::Tail(), result,
+                                          i + 1);
+}
+
+template <typename NameGenerator, typename Types>
+std::vector<std::string> GenerateNames() {
+  std::vector<std::string> result;
+  GenerateNamesRecursively<NameGenerator>(Types(), &result, 0);
+  return result;
+}
+
+// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
+// registers a list of type-parameterized tests with Google Test.  The
+// return value is insignificant - we just need to return something
+// such that we can call this function in a namespace scope.
+//
+// Implementation note: The GTEST_TEMPLATE_ macro declares a template
+// template parameter.  It's defined in gtest-type-util.h.
+template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
+class TypeParameterizedTest {
+ public:
+  // 'index' is the index of the test in the type list 'Types'
+  // specified in INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, TestSuite,
+  // Types).  Valid values for 'index' are [0, N - 1] where N is the
+  // length of Types.
+  static bool Register(const char* prefix, const CodeLocation& code_location,
+                       const char* case_name, const char* test_names, int index,
+                       const std::vector<std::string>& type_names =
+                           GenerateNames<DefaultNameGenerator, Types>()) {
+    typedef typename Types::Head Type;
+    typedef Fixture<Type> FixtureClass;
+    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
+
+    // First, registers the first type-parameterized test in the type
+    // list.
+    MakeAndRegisterTestInfo(
+        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
+         "/" + type_names[static_cast<size_t>(index)])
+            .c_str(),
+        StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
+        GetTypeName<Type>().c_str(),
+        nullptr,  // No value parameter.
+        code_location, GetTypeId<FixtureClass>(),
+        SuiteApiResolver<TestClass>::GetSetUpCaseOrSuite(
+            code_location.file.c_str(), code_location.line),
+        SuiteApiResolver<TestClass>::GetTearDownCaseOrSuite(
+            code_location.file.c_str(), code_location.line),
+        new TestFactoryImpl<TestClass>);
+
+    // Next, recurses (at compile time) with the tail of the type list.
+    return TypeParameterizedTest<Fixture, TestSel,
+                                 typename Types::Tail>::Register(prefix,
+                                                                 code_location,
+                                                                 case_name,
+                                                                 test_names,
+                                                                 index + 1,
+                                                                 type_names);
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, class TestSel>
+class TypeParameterizedTest<Fixture, TestSel, internal::None> {
+ public:
+  static bool Register(const char* /*prefix*/, const CodeLocation&,
+                       const char* /*case_name*/, const char* /*test_names*/,
+                       int /*index*/,
+                       const std::vector<std::string>& =
+                           std::vector<std::string>() /*type_names*/) {
+    return true;
+  }
+};
+
+GTEST_API_ void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
+                                                   CodeLocation code_location);
+GTEST_API_ void RegisterTypeParameterizedTestSuiteInstantiation(
+    const char* case_name);
+
+// TypeParameterizedTestSuite<Fixture, Tests, Types>::Register()
+// registers *all combinations* of 'Tests' and 'Types' with Google
+// Test.  The return value is insignificant - we just need to return
+// something such that we can call this function in a namespace scope.
+template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
+class TypeParameterizedTestSuite {
+ public:
+  static bool Register(const char* prefix, CodeLocation code_location,
+                       const TypedTestSuitePState* state, const char* case_name,
+                       const char* test_names,
+                       const std::vector<std::string>& type_names =
+                           GenerateNames<DefaultNameGenerator, Types>()) {
+    RegisterTypeParameterizedTestSuiteInstantiation(case_name);
+    std::string test_name = StripTrailingSpaces(
+        GetPrefixUntilComma(test_names));
+    if (!state->TestExists(test_name)) {
+      fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
+              case_name, test_name.c_str(),
+              FormatFileLocation(code_location.file.c_str(),
+                                 code_location.line).c_str());
+      fflush(stderr);
+      posix::Abort();
+    }
+    const CodeLocation& test_location = state->GetCodeLocation(test_name);
+
+    typedef typename Tests::Head Head;
+
+    // First, register the first test in 'Test' for each type in 'Types'.
+    TypeParameterizedTest<Fixture, Head, Types>::Register(
+        prefix, test_location, case_name, test_names, 0, type_names);
+
+    // Next, recurses (at compile time) with the tail of the test list.
+    return TypeParameterizedTestSuite<Fixture, typename Tests::Tail,
+                                      Types>::Register(prefix, code_location,
+                                                       state, case_name,
+                                                       SkipComma(test_names),
+                                                       type_names);
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, typename Types>
+class TypeParameterizedTestSuite<Fixture, internal::None, Types> {
+ public:
+  static bool Register(const char* /*prefix*/, const CodeLocation&,
+                       const TypedTestSuitePState* /*state*/,
+                       const char* /*case_name*/, const char* /*test_names*/,
+                       const std::vector<std::string>& =
+                           std::vector<std::string>() /*type_names*/) {
+    return true;
+  }
+};
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
+    UnitTest* unit_test, int skip_count);
+
+// Helpers for suppressing warnings on unreachable code or constant
+// condition.
+
+// Always returns true.
+GTEST_API_ bool AlwaysTrue();
+
+// Always returns false.
+inline bool AlwaysFalse() { return !AlwaysTrue(); }
+
+// Helper for suppressing false warning from Clang on a const char*
+// variable declared in a conditional expression always being NULL in
+// the else branch.
+struct GTEST_API_ ConstCharPtr {
+  ConstCharPtr(const char* str) : value(str) {}
+  operator bool() const { return true; }
+  const char* value;
+};
+
+// Helper for declaring std::string within 'if' statement
+// in pre C++17 build environment.
+struct TrueWithString {
+  TrueWithString() = default;
+  explicit TrueWithString(const char* str) : value(str) {}
+  explicit TrueWithString(const std::string& str) : value(str) {}
+  explicit operator bool() const { return true; }
+  std::string value;
+};
+
+// A simple Linear Congruential Generator for generating random
+// numbers with a uniform distribution.  Unlike rand() and srand(), it
+// doesn't use global state (and therefore can't interfere with user
+// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
+// but it's good enough for our purposes.
+class GTEST_API_ Random {
+ public:
+  static const uint32_t kMaxRange = 1u << 31;
+
+  explicit Random(uint32_t seed) : state_(seed) {}
+
+  void Reseed(uint32_t seed) { state_ = seed; }
+
+  // Generates a random number from [0, range).  Crashes if 'range' is
+  // 0 or greater than kMaxRange.
+  uint32_t Generate(uint32_t range);
+
+ private:
+  uint32_t state_;
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
+};
+
+// Turns const U&, U&, const U, and U all into U.
+#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
+  typename std::remove_const<typename std::remove_reference<T>::type>::type
+
+// HasDebugStringAndShortDebugString<T>::value is a compile-time bool constant
+// that's true if and only if T has methods DebugString() and ShortDebugString()
+// that return std::string.
+template <typename T>
+class HasDebugStringAndShortDebugString {
+ private:
+  template <typename C>
+  static auto CheckDebugString(C*) -> typename std::is_same<
+      std::string, decltype(std::declval<const C>().DebugString())>::type;
+  template <typename>
+  static std::false_type CheckDebugString(...);
+
+  template <typename C>
+  static auto CheckShortDebugString(C*) -> typename std::is_same<
+      std::string, decltype(std::declval<const C>().ShortDebugString())>::type;
+  template <typename>
+  static std::false_type CheckShortDebugString(...);
+
+  using HasDebugStringType = decltype(CheckDebugString<T>(nullptr));
+  using HasShortDebugStringType = decltype(CheckShortDebugString<T>(nullptr));
+
+ public:
+  static constexpr bool value =
+      HasDebugStringType::value && HasShortDebugStringType::value;
+};
+
+template <typename T>
+constexpr bool HasDebugStringAndShortDebugString<T>::value;
+
+// When the compiler sees expression IsContainerTest<C>(0), if C is an
+// STL-style container class, the first overload of IsContainerTest
+// will be viable (since both C::iterator* and C::const_iterator* are
+// valid types and NULL can be implicitly converted to them).  It will
+// be picked over the second overload as 'int' is a perfect match for
+// the type of argument 0.  If C::iterator or C::const_iterator is not
+// a valid type, the first overload is not viable, and the second
+// overload will be picked.  Therefore, we can determine whether C is
+// a container class by checking the type of IsContainerTest<C>(0).
+// The value of the expression is insignificant.
+//
+// In C++11 mode we check the existence of a const_iterator and that an
+// iterator is properly implemented for the container.
+//
+// For pre-C++11 that we look for both C::iterator and C::const_iterator.
+// The reason is that C++ injects the name of a class as a member of the
+// class itself (e.g. you can refer to class iterator as either
+// 'iterator' or 'iterator::iterator').  If we look for C::iterator
+// only, for example, we would mistakenly think that a class named
+// iterator is an STL container.
+//
+// Also note that the simpler approach of overloading
+// IsContainerTest(typename C::const_iterator*) and
+// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
+typedef int IsContainer;
+template <class C,
+          class Iterator = decltype(::std::declval<const C&>().begin()),
+          class = decltype(::std::declval<const C&>().end()),
+          class = decltype(++::std::declval<Iterator&>()),
+          class = decltype(*::std::declval<Iterator>()),
+          class = typename C::const_iterator>
+IsContainer IsContainerTest(int /* dummy */) {
+  return 0;
+}
+
+typedef char IsNotContainer;
+template <class C>
+IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
+
+// Trait to detect whether a type T is a hash table.
+// The heuristic used is that the type contains an inner type `hasher` and does
+// not contain an inner type `reverse_iterator`.
+// If the container is iterable in reverse, then order might actually matter.
+template <typename T>
+struct IsHashTable {
+ private:
+  template <typename U>
+  static char test(typename U::hasher*, typename U::reverse_iterator*);
+  template <typename U>
+  static int test(typename U::hasher*, ...);
+  template <typename U>
+  static char test(...);
+
+ public:
+  static const bool value = sizeof(test<T>(nullptr, nullptr)) == sizeof(int);
+};
+
+template <typename T>
+const bool IsHashTable<T>::value;
+
+template <typename C,
+          bool = sizeof(IsContainerTest<C>(0)) == sizeof(IsContainer)>
+struct IsRecursiveContainerImpl;
+
+template <typename C>
+struct IsRecursiveContainerImpl<C, false> : public std::false_type {};
+
+// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
+// obey the same inconsistencies as the IsContainerTest, namely check if
+// something is a container is relying on only const_iterator in C++11 and
+// is relying on both const_iterator and iterator otherwise
+template <typename C>
+struct IsRecursiveContainerImpl<C, true> {
+  using value_type = decltype(*std::declval<typename C::const_iterator>());
+  using type =
+      std::is_same<typename std::remove_const<
+                       typename std::remove_reference<value_type>::type>::type,
+                   C>;
+};
+
+// IsRecursiveContainer<Type> is a unary compile-time predicate that
+// evaluates whether C is a recursive container type. A recursive container
+// type is a container type whose value_type is equal to the container type
+// itself. An example for a recursive container type is
+// boost::filesystem::path, whose iterator has a value_type that is equal to
+// boost::filesystem::path.
+template <typename C>
+struct IsRecursiveContainer : public IsRecursiveContainerImpl<C>::type {};
+
+// Utilities for native arrays.
+
+// ArrayEq() compares two k-dimensional native arrays using the
+// elements' operator==, where k can be any integer >= 0.  When k is
+// 0, ArrayEq() degenerates into comparing a single pair of values.
+
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
+  return internal::ArrayEq(lhs, N, rhs);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous ArrayEq() function, arrays with different sizes would
+// lead to different copies of the template code.
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
+  for (size_t i = 0; i != size; i++) {
+    if (!internal::ArrayEq(lhs[i], rhs[i]))
+      return false;
+  }
+  return true;
+}
+
+// Finds the first element in the iterator range [begin, end) that
+// equals elem.  Element may be a native array type itself.
+template <typename Iter, typename Element>
+Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
+  for (Iter it = begin; it != end; ++it) {
+    if (internal::ArrayEq(*it, elem))
+      return it;
+  }
+  return end;
+}
+
+// CopyArray() copies a k-dimensional native array using the elements'
+// operator=, where k can be any integer >= 0.  When k is 0,
+// CopyArray() degenerates into copying a single value.
+
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline void CopyArray(const T& from, U* to) { *to = from; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline void CopyArray(const T(&from)[N], U(*to)[N]) {
+  internal::CopyArray(from, N, *to);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous CopyArray() function, arrays with different sizes
+// would lead to different copies of the template code.
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to) {
+  for (size_t i = 0; i != size; i++) {
+    internal::CopyArray(from[i], to + i);
+  }
+}
+
+// The relation between an NativeArray object (see below) and the
+// native array it represents.
+// We use 2 different structs to allow non-copyable types to be used, as long
+// as RelationToSourceReference() is passed.
+struct RelationToSourceReference {};
+struct RelationToSourceCopy {};
+
+// Adapts a native array to a read-only STL-style container.  Instead
+// of the complete STL container concept, this adaptor only implements
+// members useful for Google Mock's container matchers.  New members
+// should be added as needed.  To simplify the implementation, we only
+// support Element being a raw type (i.e. having no top-level const or
+// reference modifier).  It's the client's responsibility to satisfy
+// this requirement.  Element can be an array type itself (hence
+// multi-dimensional arrays are supported).
+template <typename Element>
+class NativeArray {
+ public:
+  // STL-style container typedefs.
+  typedef Element value_type;
+  typedef Element* iterator;
+  typedef const Element* const_iterator;
+
+  // Constructs from a native array. References the source.
+  NativeArray(const Element* array, size_t count, RelationToSourceReference) {
+    InitRef(array, count);
+  }
+
+  // Constructs from a native array. Copies the source.
+  NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
+    InitCopy(array, count);
+  }
+
+  // Copy constructor.
+  NativeArray(const NativeArray& rhs) {
+    (this->*rhs.clone_)(rhs.array_, rhs.size_);
+  }
+
+  ~NativeArray() {
+    if (clone_ != &NativeArray::InitRef)
+      delete[] array_;
+  }
+
+  // STL-style container methods.
+  size_t size() const { return size_; }
+  const_iterator begin() const { return array_; }
+  const_iterator end() const { return array_ + size_; }
+  bool operator==(const NativeArray& rhs) const {
+    return size() == rhs.size() &&
+        ArrayEq(begin(), size(), rhs.begin());
+  }
+
+ private:
+  static_assert(!std::is_const<Element>::value, "Type must not be const");
+  static_assert(!std::is_reference<Element>::value,
+                "Type must not be a reference");
+
+  // Initializes this object with a copy of the input.
+  void InitCopy(const Element* array, size_t a_size) {
+    Element* const copy = new Element[a_size];
+    CopyArray(array, a_size, copy);
+    array_ = copy;
+    size_ = a_size;
+    clone_ = &NativeArray::InitCopy;
+  }
+
+  // Initializes this object with a reference of the input.
+  void InitRef(const Element* array, size_t a_size) {
+    array_ = array;
+    size_ = a_size;
+    clone_ = &NativeArray::InitRef;
+  }
+
+  const Element* array_;
+  size_t size_;
+  void (NativeArray::*clone_)(const Element*, size_t);
+};
+
+// Backport of std::index_sequence.
+template <size_t... Is>
+struct IndexSequence {
+  using type = IndexSequence;
+};
+
+// Double the IndexSequence, and one if plus_one is true.
+template <bool plus_one, typename T, size_t sizeofT>
+struct DoubleSequence;
+template <size_t... I, size_t sizeofT>
+struct DoubleSequence<true, IndexSequence<I...>, sizeofT> {
+  using type = IndexSequence<I..., (sizeofT + I)..., 2 * sizeofT>;
+};
+template <size_t... I, size_t sizeofT>
+struct DoubleSequence<false, IndexSequence<I...>, sizeofT> {
+  using type = IndexSequence<I..., (sizeofT + I)...>;
+};
+
+// Backport of std::make_index_sequence.
+// It uses O(ln(N)) instantiation depth.
+template <size_t N>
+struct MakeIndexSequenceImpl
+    : DoubleSequence<N % 2 == 1, typename MakeIndexSequenceImpl<N / 2>::type,
+                     N / 2>::type {};
+
+template <>
+struct MakeIndexSequenceImpl<0> : IndexSequence<> {};
+
+template <size_t N>
+using MakeIndexSequence = typename MakeIndexSequenceImpl<N>::type;
+
+template <typename... T>
+using IndexSequenceFor = typename MakeIndexSequence<sizeof...(T)>::type;
+
+template <size_t>
+struct Ignore {
+  Ignore(...);  // NOLINT
+};
+
+template <typename>
+struct ElemFromListImpl;
+template <size_t... I>
+struct ElemFromListImpl<IndexSequence<I...>> {
+  // We make Ignore a template to solve a problem with MSVC.
+  // A non-template Ignore would work fine with `decltype(Ignore(I))...`, but
+  // MSVC doesn't understand how to deal with that pack expansion.
+  // Use `0 * I` to have a single instantiation of Ignore.
+  template <typename R>
+  static R Apply(Ignore<0 * I>..., R (*)(), ...);
+};
+
+template <size_t N, typename... T>
+struct ElemFromList {
+  using type =
+      decltype(ElemFromListImpl<typename MakeIndexSequence<N>::type>::Apply(
+          static_cast<T (*)()>(nullptr)...));
+};
+
+struct FlatTupleConstructTag {};
+
+template <typename... T>
+class FlatTuple;
+
+template <typename Derived, size_t I>
+struct FlatTupleElemBase;
+
+template <typename... T, size_t I>
+struct FlatTupleElemBase<FlatTuple<T...>, I> {
+  using value_type = typename ElemFromList<I, T...>::type;
+  FlatTupleElemBase() = default;
+  template <typename Arg>
+  explicit FlatTupleElemBase(FlatTupleConstructTag, Arg&& t)
+      : value(std::forward<Arg>(t)) {}
+  value_type value;
+};
+
+template <typename Derived, typename Idx>
+struct FlatTupleBase;
+
+template <size_t... Idx, typename... T>
+struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
+    : FlatTupleElemBase<FlatTuple<T...>, Idx>... {
+  using Indices = IndexSequence<Idx...>;
+  FlatTupleBase() = default;
+  template <typename... Args>
+  explicit FlatTupleBase(FlatTupleConstructTag, Args&&... args)
+      : FlatTupleElemBase<FlatTuple<T...>, Idx>(FlatTupleConstructTag{},
+                                                std::forward<Args>(args))... {}
+
+  template <size_t I>
+  const typename ElemFromList<I, T...>::type& Get() const {
+    return FlatTupleElemBase<FlatTuple<T...>, I>::value;
+  }
+
+  template <size_t I>
+  typename ElemFromList<I, T...>::type& Get() {
+    return FlatTupleElemBase<FlatTuple<T...>, I>::value;
+  }
+
+  template <typename F>
+  auto Apply(F&& f) -> decltype(std::forward<F>(f)(this->Get<Idx>()...)) {
+    return std::forward<F>(f)(Get<Idx>()...);
+  }
+
+  template <typename F>
+  auto Apply(F&& f) const -> decltype(std::forward<F>(f)(this->Get<Idx>()...)) {
+    return std::forward<F>(f)(Get<Idx>()...);
+  }
+};
+
+// Analog to std::tuple but with different tradeoffs.
+// This class minimizes the template instantiation depth, thus allowing more
+// elements than std::tuple would. std::tuple has been seen to require an
+// instantiation depth of more than 10x the number of elements in some
+// implementations.
+// FlatTuple and ElemFromList are not recursive and have a fixed depth
+// regardless of T...
+// MakeIndexSequence, on the other hand, it is recursive but with an
+// instantiation depth of O(ln(N)).
+template <typename... T>
+class FlatTuple
+    : private FlatTupleBase<FlatTuple<T...>,
+                            typename MakeIndexSequence<sizeof...(T)>::type> {
+  using Indices = typename FlatTupleBase<
+      FlatTuple<T...>, typename MakeIndexSequence<sizeof...(T)>::type>::Indices;
+
+ public:
+  FlatTuple() = default;
+  template <typename... Args>
+  explicit FlatTuple(FlatTupleConstructTag tag, Args&&... args)
+      : FlatTuple::FlatTupleBase(tag, std::forward<Args>(args)...) {}
+
+  using FlatTuple::FlatTupleBase::Apply;
+  using FlatTuple::FlatTupleBase::Get;
+};
+
+// Utility functions to be called with static_assert to induce deprecation
+// warnings.
+GTEST_INTERNAL_DEPRECATED(
+    "INSTANTIATE_TEST_CASE_P is deprecated, please use "
+    "INSTANTIATE_TEST_SUITE_P")
+constexpr bool InstantiateTestCase_P_IsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "TYPED_TEST_CASE_P is deprecated, please use "
+    "TYPED_TEST_SUITE_P")
+constexpr bool TypedTestCase_P_IsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "TYPED_TEST_CASE is deprecated, please use "
+    "TYPED_TEST_SUITE")
+constexpr bool TypedTestCaseIsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "REGISTER_TYPED_TEST_CASE_P is deprecated, please use "
+    "REGISTER_TYPED_TEST_SUITE_P")
+constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "INSTANTIATE_TYPED_TEST_CASE_P is deprecated, please use "
+    "INSTANTIATE_TYPED_TEST_SUITE_P")
+constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
+
+}  // namespace internal
+}  // namespace testing
+
+namespace std {
+// Some standard library implementations use `struct tuple_size` and some use
+// `class tuple_size`. Clang warns about the mismatch.
+// https://reviews.llvm.org/D55466
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template <typename... Ts>
+struct tuple_size<testing::internal::FlatTuple<Ts...>>
+    : std::integral_constant<size_t, sizeof...(Ts)> {};
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}  // namespace std
+
+#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
+  ::testing::internal::AssertHelper(result_type, file, line, message) \
+    = ::testing::Message()
+
+#define GTEST_MESSAGE_(message, result_type) \
+  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
+
+#define GTEST_FATAL_FAILURE_(message) \
+  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
+
+#define GTEST_NONFATAL_FAILURE_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
+
+#define GTEST_SUCCESS_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
+
+#define GTEST_SKIP_(message) \
+  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kSkip)
+
+// Suppress MSVC warning 4072 (unreachable code) for the code following
+// statement if it returns or throws (or doesn't return or throw in some
+// situations).
+// NOTE: The "else" is important to keep this expansion to prevent a top-level
+// "else" from attaching to our "if".
+#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
+  if (::testing::internal::AlwaysTrue()) {                        \
+    statement;                                                    \
+  } else                     /* NOLINT */                         \
+    static_assert(true, "")  // User must have a semicolon after expansion.
+
+#if GTEST_HAS_EXCEPTIONS
+
+namespace testing {
+namespace internal {
+
+class NeverThrown {
+ public:
+  const char* what() const noexcept {
+    return "this exception should never be thrown";
+  }
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#if GTEST_HAS_RTTI
+
+#define GTEST_EXCEPTION_TYPE_(e) ::testing::internal::GetTypeName(typeid(e))
+
+#else  // GTEST_HAS_RTTI
+
+#define GTEST_EXCEPTION_TYPE_(e) \
+  std::string { "an std::exception-derived error" }
+
+#endif  // GTEST_HAS_RTTI
+
+#define GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)   \
+  catch (typename std::conditional<                                            \
+         std::is_same<typename std::remove_cv<typename std::remove_reference<  \
+                          expected_exception>::type>::type,                    \
+                      std::exception>::value,                                  \
+         const ::testing::internal::NeverThrown&, const std::exception&>::type \
+             e) {                                                              \
+    gtest_msg.value = "Expected: " #statement                                  \
+                      " throws an exception of type " #expected_exception      \
+                      ".\n  Actual: it throws ";                               \
+    gtest_msg.value += GTEST_EXCEPTION_TYPE_(e);                               \
+    gtest_msg.value += " with description \"";                                 \
+    gtest_msg.value += e.what();                                               \
+    gtest_msg.value += "\".";                                                  \
+    goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);                \
+  }
+
+#else  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_THROW_(statement, expected_exception, fail)              \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                             \
+  if (::testing::internal::TrueWithString gtest_msg{}) {                    \
+    bool gtest_caught_expected = false;                                     \
+    try {                                                                   \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);            \
+    } catch (expected_exception const&) {                                   \
+      gtest_caught_expected = true;                                         \
+    }                                                                       \
+    GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)    \
+    catch (...) {                                                           \
+      gtest_msg.value = "Expected: " #statement                             \
+                        " throws an exception of type " #expected_exception \
+                        ".\n  Actual: it throws a different type.";         \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);           \
+    }                                                                       \
+    if (!gtest_caught_expected) {                                           \
+      gtest_msg.value = "Expected: " #statement                             \
+                        " throws an exception of type " #expected_exception \
+                        ".\n  Actual: it throws nothing.";                  \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);           \
+    }                                                                       \
+  } else /*NOLINT*/                                                         \
+    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__)                   \
+        : fail(gtest_msg.value.c_str())
+
+#if GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_()                \
+  catch (std::exception const& e) {                               \
+    gtest_msg.value = "it throws ";                               \
+    gtest_msg.value += GTEST_EXCEPTION_TYPE_(e);                  \
+    gtest_msg.value += " with description \"";                    \
+    gtest_msg.value += e.what();                                  \
+    gtest_msg.value += "\".";                                     \
+    goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
+  }
+
+#else  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_()
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_NO_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::TrueWithString gtest_msg{}) { \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_() \
+    catch (...) { \
+      gtest_msg.value = "it throws."; \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
+      fail(("Expected: " #statement " doesn't throw an exception.\n" \
+            "  Actual: " + gtest_msg.value).c_str())
+
+#define GTEST_TEST_ANY_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    bool gtest_caught_any = false; \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (...) { \
+      gtest_caught_any = true; \
+    } \
+    if (!gtest_caught_any) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
+      fail("Expected: " #statement " throws an exception.\n" \
+           "  Actual: it doesn't.")
+
+
+// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
+// either a boolean expression or an AssertionResult. text is a textual
+// representation of expression as it was passed into the EXPECT_TRUE.
+#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar_ = \
+      ::testing::AssertionResult(expression)) \
+    ; \
+  else \
+    fail(::testing::internal::GetBoolAssertionFailureMessage(\
+        gtest_ar_, text, #actual, #expected).c_str())
+
+#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
+      fail("Expected: " #statement " doesn't generate new fatal " \
+           "failures in the current thread.\n" \
+           "  Actual: it does.")
+
+// Expands to the name of the class that implements the given test.
+#define GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
+  test_suite_name##_##test_name##_Test
+
+// Helper macro for defining tests.
+#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)      \
+  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                \
+                "test_suite_name must not be empty");                         \
+  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                      \
+                "test_name must not be empty");                               \
+  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                    \
+      : public parent_class {                                                 \
+   public:                                                                    \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;           \
+    ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
+                                                           test_name));       \
+    GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
+                                                           test_name));       \
+                                                                              \
+   private:                                                                   \
+    void TestBody() override;                                                 \
+    static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;     \
+  };                                                                          \
+                                                                              \
+  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,          \
+                                                    test_name)::test_info_ =  \
+      ::testing::internal::MakeAndRegisterTestInfo(                           \
+          #test_suite_name, #test_name, nullptr, nullptr,                     \
+          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \
+          ::testing::internal::SuiteApiResolver<                              \
+              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),         \
+          ::testing::internal::SuiteApiResolver<                              \
+              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),      \
+          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(    \
+              test_suite_name, test_name)>);                                  \
+  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the public API for death tests.  It is
+// #included by gtest.h so a user doesn't need to include this
+// directly.
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines internal utilities needed for implementing
+// death tests.  They are subject to change without notice.
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This file implements just enough of the matcher interface to allow
+// EXPECT_DEATH and friends to accept a matcher argument.
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
+
+#include <atomic>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <type_traits>
+
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Test - The Google C++ Testing and Mocking Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// A user can teach this function how to print a class type T by
+// defining either operator<<() or PrintTo() in the namespace that
+// defines T.  More specifically, the FIRST defined function in the
+// following list will be used (assuming T is defined in namespace
+// foo):
+//
+//   1. foo::PrintTo(const T&, ostream*)
+//   2. operator<<(ostream&, const T&) defined in either foo or the
+//      global namespace.
+//
+// However if T is an STL-style container then it is printed element-wise
+// unless foo::PrintTo(const T&, ostream*) is defined. Note that
+// operator<<() is ignored for container types.
+//
+// If none of the above is defined, it will print the debug string of
+// the value if it is a protocol buffer, or print the raw bytes in the
+// value otherwise.
+//
+// To aid debugging: when T is a reference type, the address of the
+// value is also printed; when T is a (const) char pointer, both the
+// pointer value and the NUL-terminated string it points to are
+// printed.
+//
+// We also provide some convenient wrappers:
+//
+//   // Prints a value to a string.  For a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   std::string ::testing::PrintToString(const T& value);
+//
+//   // Prints a value tersely: for a reference type, the referenced
+//   // value (but not the address) is printed; for a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
+//
+//   // Prints value using the type inferred by the compiler.  The difference
+//   // from UniversalTersePrint() is that this function prints both the
+//   // pointer and the NUL-terminated string for a (const or not) char pointer.
+//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
+//
+//   // Prints the fields of a tuple tersely to a string vector, one
+//   // element for each field. Tuple support must be enabled in
+//   // gtest-port.h.
+//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
+//       const Tuple& value);
+//
+// Known limitation:
+//
+// The print primitives print the elements of an STL-style container
+// using the compiler-inferred type of *iter where iter is a
+// const_iterator of the container.  When const_iterator is an input
+// iterator but not a forward iterator, this inferred type may not
+// match value_type, and the print output may be incorrect.  In
+// practice, this is rarely a problem as for most containers
+// const_iterator is a forward iterator.  We'll fix this if there's an
+// actual need for it.  Note that this fix cannot rely on value_type
+// being defined as many user-defined container types don't have
+// value_type.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+
+#include <functional>
+#include <memory>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+
+namespace testing {
+
+// Definitions in the internal* namespaces are subject to change without notice.
+// DO NOT USE THEM IN USER CODE!
+namespace internal {
+
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os);
+
+// Used to print an STL-style container when the user doesn't define
+// a PrintTo() for it.
+struct ContainerPrinter {
+  template <typename T,
+            typename = typename std::enable_if<
+                (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
+                !IsRecursiveContainer<T>::value>::type>
+  static void PrintValue(const T& container, std::ostream* os) {
+    const size_t kMaxCount = 32;  // The maximum number of elements to print.
+    *os << '{';
+    size_t count = 0;
+    for (auto&& elem : container) {
+      if (count > 0) {
+        *os << ',';
+        if (count == kMaxCount) {  // Enough has been printed.
+          *os << " ...";
+          break;
+        }
+      }
+      *os << ' ';
+      // We cannot call PrintTo(elem, os) here as PrintTo() doesn't
+      // handle `elem` being a native array.
+      internal::UniversalPrint(elem, os);
+      ++count;
+    }
+
+    if (count > 0) {
+      *os << ' ';
+    }
+    *os << '}';
+  }
+};
+
+// Used to print a pointer that is neither a char pointer nor a member
+// pointer, when the user doesn't define PrintTo() for it.  (A member
+// variable pointer or member function pointer doesn't really point to
+// a location in the address space.  Their representation is
+// implementation-defined.  Therefore they will be printed as raw
+// bytes.)
+struct FunctionPointerPrinter {
+  template <typename T, typename = typename std::enable_if<
+                            std::is_function<T>::value>::type>
+  static void PrintValue(T* p, ::std::ostream* os) {
+    if (p == nullptr) {
+      *os << "NULL";
+    } else {
+      // T is a function type, so '*os << p' doesn't do what we want
+      // (it just prints p as bool).  We want to print p as a const
+      // void*.
+      *os << reinterpret_cast<const void*>(p);
+    }
+  }
+};
+
+struct PointerPrinter {
+  template <typename T>
+  static void PrintValue(T* p, ::std::ostream* os) {
+    if (p == nullptr) {
+      *os << "NULL";
+    } else {
+      // T is not a function type.  We just call << to print p,
+      // relying on ADL to pick up user-defined << for their pointer
+      // types, if any.
+      *os << p;
+    }
+  }
+};
+
+namespace internal_stream_operator_without_lexical_name_lookup {
+
+// The presence of an operator<< here will terminate lexical scope lookup
+// straight away (even though it cannot be a match because of its argument
+// types). Thus, the two operator<< calls in StreamPrinter will find only ADL
+// candidates.
+struct LookupBlocker {};
+void operator<<(LookupBlocker, LookupBlocker);
+
+struct StreamPrinter {
+  template <typename T,
+            // Don't accept member pointers here. We'd print them via implicit
+            // conversion to bool, which isn't useful.
+            typename = typename std::enable_if<
+                !std::is_member_pointer<T>::value>::type,
+            // Only accept types for which we can find a streaming operator via
+            // ADL (possibly involving implicit conversions).
+            typename = decltype(std::declval<std::ostream&>()
+                                << std::declval<const T&>())>
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    // Call streaming operator found by ADL, possibly with implicit conversions
+    // of the arguments.
+    *os << value;
+  }
+};
+
+}  // namespace internal_stream_operator_without_lexical_name_lookup
+
+struct ProtobufPrinter {
+  // We print a protobuf using its ShortDebugString() when the string
+  // doesn't exceed this many characters; otherwise we print it using
+  // DebugString() for better readability.
+  static const size_t kProtobufOneLinerMaxLength = 50;
+
+  template <typename T,
+            typename = typename std::enable_if<
+                internal::HasDebugStringAndShortDebugString<T>::value>::type>
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    std::string pretty_str = value.ShortDebugString();
+    if (pretty_str.length() > kProtobufOneLinerMaxLength) {
+      pretty_str = "\n" + value.DebugString();
+    }
+    *os << ("<" + pretty_str + ">");
+  }
+};
+
+struct ConvertibleToIntegerPrinter {
+  // Since T has no << operator or PrintTo() but can be implicitly
+  // converted to BiggestInt, we print it as a BiggestInt.
+  //
+  // Most likely T is an enum type (either named or unnamed), in which
+  // case printing it as an integer is the desired behavior.  In case
+  // T is not an enum, printing it as an integer is the best we can do
+  // given that it has no user-defined printer.
+  static void PrintValue(internal::BiggestInt value, ::std::ostream* os) {
+    *os << value;
+  }
+};
+
+struct ConvertibleToStringViewPrinter {
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  static void PrintValue(internal::StringView value, ::std::ostream* os) {
+    internal::UniversalPrint(value, os);
+  }
+#endif
+};
+
+
+// Prints the given number of bytes in the given object to the given
+// ostream.
+GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
+                                     size_t count,
+                                     ::std::ostream* os);
+struct RawBytesPrinter {
+  // SFINAE on `sizeof` to make sure we have a complete type.
+  template <typename T, size_t = sizeof(T)>
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    PrintBytesInObjectTo(
+        static_cast<const unsigned char*>(
+            // Load bearing cast to void* to support iOS
+            reinterpret_cast<const void*>(std::addressof(value))),
+        sizeof(value), os);
+  }
+};
+
+struct FallbackPrinter {
+  template <typename T>
+  static void PrintValue(const T&, ::std::ostream* os) {
+    *os << "(incomplete type)";
+  }
+};
+
+// Try every printer in order and return the first one that works.
+template <typename T, typename E, typename Printer, typename... Printers>
+struct FindFirstPrinter : FindFirstPrinter<T, E, Printers...> {};
+
+template <typename T, typename Printer, typename... Printers>
+struct FindFirstPrinter<
+    T, decltype(Printer::PrintValue(std::declval<const T&>(), nullptr)),
+    Printer, Printers...> {
+  using type = Printer;
+};
+
+// Select the best printer in the following order:
+//  - Print containers (they have begin/end/etc).
+//  - Print function pointers.
+//  - Print object pointers.
+//  - Use the stream operator, if available.
+//  - Print protocol buffers.
+//  - Print types convertible to BiggestInt.
+//  - Print types convertible to StringView, if available.
+//  - Fallback to printing the raw bytes of the object.
+template <typename T>
+void PrintWithFallback(const T& value, ::std::ostream* os) {
+  using Printer = typename FindFirstPrinter<
+      T, void, ContainerPrinter, FunctionPointerPrinter, PointerPrinter,
+      internal_stream_operator_without_lexical_name_lookup::StreamPrinter,
+      ProtobufPrinter, ConvertibleToIntegerPrinter,
+      ConvertibleToStringViewPrinter, RawBytesPrinter, FallbackPrinter>::type;
+  Printer::PrintValue(value, os);
+}
+
+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
+// value of type ToPrint that is an operand of a comparison assertion
+// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
+// the comparison, and is used to help determine the best way to
+// format the value.  In particular, when the value is a C string
+// (char pointer) and the other operand is an STL string object, we
+// want to format the C string as a string, since we know it is
+// compared by value with the string object.  If the value is a char
+// pointer but the other operand is not an STL string object, we don't
+// know whether the pointer is supposed to point to a NUL-terminated
+// string, and thus want to print it as a pointer to be safe.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// The default case.
+template <typename ToPrint, typename OtherOperand>
+class FormatForComparison {
+ public:
+  static ::std::string Format(const ToPrint& value) {
+    return ::testing::PrintToString(value);
+  }
+};
+
+// Array.
+template <typename ToPrint, size_t N, typename OtherOperand>
+class FormatForComparison<ToPrint[N], OtherOperand> {
+ public:
+  static ::std::string Format(const ToPrint* value) {
+    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
+  }
+};
+
+// By default, print C string as pointers to be safe, as we don't know
+// whether they actually point to a NUL-terminated string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
+  template <typename OtherOperand>                                      \
+  class FormatForComparison<CharType*, OtherOperand> {                  \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(static_cast<const void*>(value)); \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
+#ifdef __cpp_char8_t
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char8_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char8_t);
+#endif
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char16_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char16_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char32_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char32_t);
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
+
+// If a C string is compared with an STL string object, we know it's meant
+// to point to a NUL-terminated string, and thus can print it as a string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
+  template <>                                                           \
+  class FormatForComparison<CharType*, OtherStringType> {               \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(value);                           \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
+#ifdef __cpp_char8_t
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char8_t, ::std::u8string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char8_t, ::std::u8string);
+#endif
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char16_t, ::std::u16string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char16_t, ::std::u16string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char32_t, ::std::u32string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char32_t, ::std::u32string);
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
+#endif
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
+
+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
+// operand to be used in a failure message.  The type (but not value)
+// of the other operand may affect the format.  This allows us to
+// print a char* as a raw pointer when it is compared against another
+// char* or void*, and print it as a C string when it is compared
+// against an std::string object, for example.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename T1, typename T2>
+std::string FormatForComparisonFailureMessage(
+    const T1& value, const T2& /* other_operand */) {
+  return FormatForComparison<T1, T2>::Format(value);
+}
+
+// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
+// value to the given ostream.  The caller must ensure that
+// 'ostream_ptr' is not NULL, or the behavior is undefined.
+//
+// We define UniversalPrinter as a class template (as opposed to a
+// function template), as we need to partially specialize it for
+// reference types, which cannot be done with function templates.
+template <typename T>
+class UniversalPrinter;
+
+// Prints the given value using the << operator if it has one;
+// otherwise prints the bytes in it.  This is what
+// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
+// or overloaded for type T.
+//
+// A user can override this behavior for a class type Foo by defining
+// an overload of PrintTo() in the namespace where Foo is defined.  We
+// give the user this option as sometimes defining a << operator for
+// Foo is not desirable (e.g. the coding style may prevent doing it,
+// or there is already a << operator but it doesn't do what the user
+// wants).
+template <typename T>
+void PrintTo(const T& value, ::std::ostream* os) {
+  internal::PrintWithFallback(value, os);
+}
+
+// The following list of PrintTo() overloads tells
+// UniversalPrinter<T>::Print() how to print standard types (built-in
+// types, strings, plain arrays, and pointers).
+
+// Overloads for various char types.
+GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
+GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
+inline void PrintTo(char c, ::std::ostream* os) {
+  // When printing a plain char, we always treat it as unsigned.  This
+  // way, the output won't be affected by whether the compiler thinks
+  // char is signed or not.
+  PrintTo(static_cast<unsigned char>(c), os);
+}
+
+// Overloads for other simple built-in types.
+inline void PrintTo(bool x, ::std::ostream* os) {
+  *os << (x ? "true" : "false");
+}
+
+// Overload for wchar_t type.
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its decimal code (except for L'\0').
+// The L'\0' char is printed as "L'\\0'". The decimal code is printed
+// as signed integer when wchar_t is implemented by the compiler
+// as a signed type and is printed as an unsigned integer when wchar_t
+// is implemented as an unsigned type.
+GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
+
+GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os);
+inline void PrintTo(char16_t c, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<char32_t>(c), os);
+}
+#ifdef __cpp_char8_t
+inline void PrintTo(char8_t c, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<char32_t>(c), os);
+}
+#endif
+
+// Overloads for C strings.
+GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
+inline void PrintTo(char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char*>(s), os);
+}
+
+// signed/unsigned char is often used for representing binary data, so
+// we print pointers to it as void* to be safe.
+inline void PrintTo(const signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+#ifdef __cpp_char8_t
+// Overloads for u8 strings.
+GTEST_API_ void PrintTo(const char8_t* s, ::std::ostream* os);
+inline void PrintTo(char8_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char8_t*>(s), os);
+}
+#endif
+// Overloads for u16 strings.
+GTEST_API_ void PrintTo(const char16_t* s, ::std::ostream* os);
+inline void PrintTo(char16_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char16_t*>(s), os);
+}
+// Overloads for u32 strings.
+GTEST_API_ void PrintTo(const char32_t* s, ::std::ostream* os);
+inline void PrintTo(char32_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char32_t*>(s), os);
+}
+
+// MSVC can be configured to define wchar_t as a typedef of unsigned
+// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
+// type.  When wchar_t is a typedef, defining an overload for const
+// wchar_t* would cause unsigned short* be printed as a wide string,
+// possibly causing invalid memory accesses.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Overloads for wide C strings
+GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
+inline void PrintTo(wchar_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
+}
+#endif
+
+// Overload for C arrays.  Multi-dimensional arrays are printed
+// properly.
+
+// Prints the given number of elements in an array, without printing
+// the curly braces.
+template <typename T>
+void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
+  UniversalPrint(a[0], os);
+  for (size_t i = 1; i != count; i++) {
+    *os << ", ";
+    UniversalPrint(a[i], os);
+  }
+}
+
+// Overloads for ::std::string.
+GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
+inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+
+// Overloads for ::std::u8string
+#ifdef __cpp_char8_t
+GTEST_API_ void PrintU8StringTo(const ::std::u8string& s, ::std::ostream* os);
+inline void PrintTo(const ::std::u8string& s, ::std::ostream* os) {
+  PrintU8StringTo(s, os);
+}
+#endif
+
+// Overloads for ::std::u16string
+GTEST_API_ void PrintU16StringTo(const ::std::u16string& s, ::std::ostream* os);
+inline void PrintTo(const ::std::u16string& s, ::std::ostream* os) {
+  PrintU16StringTo(s, os);
+}
+
+// Overloads for ::std::u32string
+GTEST_API_ void PrintU32StringTo(const ::std::u32string& s, ::std::ostream* os);
+inline void PrintTo(const ::std::u32string& s, ::std::ostream* os) {
+  PrintU32StringTo(s, os);
+}
+
+// Overloads for ::std::wstring.
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// Overload for internal::StringView.
+inline void PrintTo(internal::StringView sp, ::std::ostream* os) {
+  PrintTo(::std::string(sp), os);
+}
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
+
+template <typename T>
+void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) {
+  UniversalPrinter<T&>::Print(ref.get(), os);
+}
+
+inline const void* VoidifyPointer(const void* p) { return p; }
+inline const void* VoidifyPointer(volatile const void* p) {
+  return const_cast<const void*>(p);
+}
+
+template <typename T, typename Ptr>
+void PrintSmartPointer(const Ptr& ptr, std::ostream* os, char) {
+  if (ptr == nullptr) {
+    *os << "(nullptr)";
+  } else {
+    // We can't print the value. Just print the pointer..
+    *os << "(" << (VoidifyPointer)(ptr.get()) << ")";
+  }
+}
+template <typename T, typename Ptr,
+          typename = typename std::enable_if<!std::is_void<T>::value &&
+                                             !std::is_array<T>::value>::type>
+void PrintSmartPointer(const Ptr& ptr, std::ostream* os, int) {
+  if (ptr == nullptr) {
+    *os << "(nullptr)";
+  } else {
+    *os << "(ptr = " << (VoidifyPointer)(ptr.get()) << ", value = ";
+    UniversalPrinter<T>::Print(*ptr, os);
+    *os << ")";
+  }
+}
+
+template <typename T, typename D>
+void PrintTo(const std::unique_ptr<T, D>& ptr, std::ostream* os) {
+  (PrintSmartPointer<T>)(ptr, os, 0);
+}
+
+template <typename T>
+void PrintTo(const std::shared_ptr<T>& ptr, std::ostream* os) {
+  (PrintSmartPointer<T>)(ptr, os, 0);
+}
+
+// Helper function for printing a tuple.  T must be instantiated with
+// a tuple type.
+template <typename T>
+void PrintTupleTo(const T&, std::integral_constant<size_t, 0>,
+                  ::std::ostream*) {}
+
+template <typename T, size_t I>
+void PrintTupleTo(const T& t, std::integral_constant<size_t, I>,
+                  ::std::ostream* os) {
+  PrintTupleTo(t, std::integral_constant<size_t, I - 1>(), os);
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (I > 1) {
+    GTEST_INTENTIONAL_CONST_COND_POP_()
+    *os << ", ";
+  }
+  UniversalPrinter<typename std::tuple_element<I - 1, T>::type>::Print(
+      std::get<I - 1>(t), os);
+}
+
+template <typename... Types>
+void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
+  *os << "(";
+  PrintTupleTo(t, std::integral_constant<size_t, sizeof...(Types)>(), os);
+  *os << ")";
+}
+
+// Overload for std::pair.
+template <typename T1, typename T2>
+void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
+  *os << '(';
+  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
+  // a reference type.  The same for printing value.second.
+  UniversalPrinter<T1>::Print(value.first, os);
+  *os << ", ";
+  UniversalPrinter<T2>::Print(value.second, os);
+  *os << ')';
+}
+
+// Implements printing a non-reference type T by letting the compiler
+// pick the right overload of PrintTo() for T.
+template <typename T>
+class UniversalPrinter {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  // Note: we deliberately don't call this PrintTo(), as that name
+  // conflicts with ::testing::internal::PrintTo in the body of the
+  // function.
+  static void Print(const T& value, ::std::ostream* os) {
+    // By default, ::testing::internal::PrintTo() is used for printing
+    // the value.
+    //
+    // Thanks to Koenig look-up, if T is a class and has its own
+    // PrintTo() function defined in its namespace, that function will
+    // be visible here.  Since it is more specific than the generic ones
+    // in ::testing::internal, it will be picked by the compiler in the
+    // following statement - exactly what we want.
+    PrintTo(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// Remove any const-qualifiers before passing a type to UniversalPrinter.
+template <typename T>
+class UniversalPrinter<const T> : public UniversalPrinter<T> {};
+
+#if GTEST_INTERNAL_HAS_ANY
+
+// Printer for std::any / absl::any
+
+template <>
+class UniversalPrinter<Any> {
+ public:
+  static void Print(const Any& value, ::std::ostream* os) {
+    if (value.has_value()) {
+      *os << "value of type " << GetTypeName(value);
+    } else {
+      *os << "no value";
+    }
+  }
+
+ private:
+  static std::string GetTypeName(const Any& value) {
+#if GTEST_HAS_RTTI
+    return internal::GetTypeName(value.type());
+#else
+    static_cast<void>(value);  // possibly unused
+    return "<unknown_type>";
+#endif  // GTEST_HAS_RTTI
+  }
+};
+
+#endif  // GTEST_INTERNAL_HAS_ANY
+
+#if GTEST_INTERNAL_HAS_OPTIONAL
+
+// Printer for std::optional / absl::optional
+
+template <typename T>
+class UniversalPrinter<Optional<T>> {
+ public:
+  static void Print(const Optional<T>& value, ::std::ostream* os) {
+    *os << '(';
+    if (!value) {
+      *os << "nullopt";
+    } else {
+      UniversalPrint(*value, os);
+    }
+    *os << ')';
+  }
+};
+
+#endif  // GTEST_INTERNAL_HAS_OPTIONAL
+
+#if GTEST_INTERNAL_HAS_VARIANT
+
+// Printer for std::variant / absl::variant
+
+template <typename... T>
+class UniversalPrinter<Variant<T...>> {
+ public:
+  static void Print(const Variant<T...>& value, ::std::ostream* os) {
+    *os << '(';
+#if GTEST_HAS_ABSL
+    absl::visit(Visitor{os, value.index()}, value);
+#else
+    std::visit(Visitor{os, value.index()}, value);
+#endif  // GTEST_HAS_ABSL
+    *os << ')';
+  }
+
+ private:
+  struct Visitor {
+    template <typename U>
+    void operator()(const U& u) const {
+      *os << "'" << GetTypeName<U>() << "(index = " << index
+          << ")' with value ";
+      UniversalPrint(u, os);
+    }
+    ::std::ostream* os;
+    std::size_t index;
+  };
+};
+
+#endif  // GTEST_INTERNAL_HAS_VARIANT
+
+// UniversalPrintArray(begin, len, os) prints an array of 'len'
+// elements, starting at address 'begin'.
+template <typename T>
+void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
+  if (len == 0) {
+    *os << "{}";
+  } else {
+    *os << "{ ";
+    const size_t kThreshold = 18;
+    const size_t kChunkSize = 8;
+    // If the array has more than kThreshold elements, we'll have to
+    // omit some details by printing only the first and the last
+    // kChunkSize elements.
+    if (len <= kThreshold) {
+      PrintRawArrayTo(begin, len, os);
+    } else {
+      PrintRawArrayTo(begin, kChunkSize, os);
+      *os << ", ..., ";
+      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
+    }
+    *os << " }";
+  }
+}
+// This overload prints a (const) char array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const char* begin, size_t len, ::std::ostream* os);
+
+#ifdef __cpp_char8_t
+// This overload prints a (const) char8_t array compactly.
+GTEST_API_ void UniversalPrintArray(const char8_t* begin, size_t len,
+                                    ::std::ostream* os);
+#endif
+
+// This overload prints a (const) char16_t array compactly.
+GTEST_API_ void UniversalPrintArray(const char16_t* begin, size_t len,
+                                    ::std::ostream* os);
+
+// This overload prints a (const) char32_t array compactly.
+GTEST_API_ void UniversalPrintArray(const char32_t* begin, size_t len,
+                                    ::std::ostream* os);
+
+// This overload prints a (const) wchar_t array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const wchar_t* begin, size_t len, ::std::ostream* os);
+
+// Implements printing an array type T[N].
+template <typename T, size_t N>
+class UniversalPrinter<T[N]> {
+ public:
+  // Prints the given array, omitting some elements when there are too
+  // many.
+  static void Print(const T (&a)[N], ::std::ostream* os) {
+    UniversalPrintArray(a, N, os);
+  }
+};
+
+// Implements printing a reference type T&.
+template <typename T>
+class UniversalPrinter<T&> {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  static void Print(const T& value, ::std::ostream* os) {
+    // Prints the address of the value.  We use reinterpret_cast here
+    // as static_cast doesn't compile when T is a function type.
+    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
+
+    // Then prints the value itself.
+    UniversalPrint(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// Prints a value tersely: for a reference type, the referenced value
+// (but not the address) is printed; for a (const) char pointer, the
+// NUL-terminated string (but not the pointer) is printed.
+
+template <typename T>
+class UniversalTersePrinter {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T>
+class UniversalTersePrinter<T&> {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T, size_t N>
+class UniversalTersePrinter<T[N]> {
+ public:
+  static void Print(const T (&value)[N], ::std::ostream* os) {
+    UniversalPrinter<T[N]>::Print(value, os);
+  }
+};
+template <>
+class UniversalTersePrinter<const char*> {
+ public:
+  static void Print(const char* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(std::string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char*> : public UniversalTersePrinter<const char*> {
+};
+
+#ifdef __cpp_char8_t
+template <>
+class UniversalTersePrinter<const char8_t*> {
+ public:
+  static void Print(const char8_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::u8string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char8_t*>
+    : public UniversalTersePrinter<const char8_t*> {};
+#endif
+
+template <>
+class UniversalTersePrinter<const char16_t*> {
+ public:
+  static void Print(const char16_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::u16string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char16_t*>
+    : public UniversalTersePrinter<const char16_t*> {};
+
+template <>
+class UniversalTersePrinter<const char32_t*> {
+ public:
+  static void Print(const char32_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::u32string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char32_t*>
+    : public UniversalTersePrinter<const char32_t*> {};
+
+#if GTEST_HAS_STD_WSTRING
+template <>
+class UniversalTersePrinter<const wchar_t*> {
+ public:
+  static void Print(const wchar_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::wstring(str), os);
+    }
+  }
+};
+#endif
+
+template <>
+class UniversalTersePrinter<wchar_t*> {
+ public:
+  static void Print(wchar_t* str, ::std::ostream* os) {
+    UniversalTersePrinter<const wchar_t*>::Print(str, os);
+  }
+};
+
+template <typename T>
+void UniversalTersePrint(const T& value, ::std::ostream* os) {
+  UniversalTersePrinter<T>::Print(value, os);
+}
+
+// Prints a value using the type inferred by the compiler.  The
+// difference between this and UniversalTersePrint() is that for a
+// (const) char pointer, this prints both the pointer and the
+// NUL-terminated string.
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os) {
+  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
+  // UniversalPrinter with T directly.
+  typedef T T1;
+  UniversalPrinter<T1>::Print(value, os);
+}
+
+typedef ::std::vector< ::std::string> Strings;
+
+  // Tersely prints the first N fields of a tuple to a string vector,
+  // one element for each field.
+template <typename Tuple>
+void TersePrintPrefixToStrings(const Tuple&, std::integral_constant<size_t, 0>,
+                               Strings*) {}
+template <typename Tuple, size_t I>
+void TersePrintPrefixToStrings(const Tuple& t,
+                               std::integral_constant<size_t, I>,
+                               Strings* strings) {
+  TersePrintPrefixToStrings(t, std::integral_constant<size_t, I - 1>(),
+                            strings);
+  ::std::stringstream ss;
+  UniversalTersePrint(std::get<I - 1>(t), &ss);
+  strings->push_back(ss.str());
+}
+
+// Prints the fields of a tuple tersely to a string vector, one
+// element for each field.  See the comment before
+// UniversalTersePrint() for how we define "tersely".
+template <typename Tuple>
+Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
+  Strings result;
+  TersePrintPrefixToStrings(
+      value, std::integral_constant<size_t, std::tuple_size<Tuple>::value>(),
+      &result);
+  return result;
+}
+
+}  // namespace internal
+
+template <typename T>
+::std::string PrintToString(const T& value) {
+  ::std::stringstream ss;
+  internal::UniversalTersePrinter<T>::Print(value, &ss);
+  return ss.str();
+}
+
+}  // namespace testing
+
+// Include any custom printer added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This file provides an injection point for custom printers in a local
+// installation of gTest.
+// It will be included from gtest-printers.h and the overrides in this file
+// will be visible to everyone.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+
+// MSVC warning C5046 is new as of VS2017 version 15.8.
+#if defined(_MSC_VER) && _MSC_VER >= 1915
+#define GTEST_MAYBE_5046_ 5046
+#else
+#define GTEST_MAYBE_5046_
+#endif
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(
+    4251 GTEST_MAYBE_5046_ /* class A needs to have dll-interface to be used by
+                              clients of class B */
+    /* Symbol involving type with internal linkage not defined */)
+
+namespace testing {
+
+// To implement a matcher Foo for type T, define:
+//   1. a class FooMatcherMatcher that implements the matcher interface:
+//     using is_gtest_matcher = void;
+//     bool MatchAndExplain(const T&, std::ostream*);
+//       (MatchResultListener* can also be used instead of std::ostream*)
+//     void DescribeTo(std::ostream*);
+//     void DescribeNegationTo(std::ostream*);
+//
+//   2. a factory function that creates a Matcher<T> object from a
+//      FooMatcherMatcher.
+
+class MatchResultListener {
+ public:
+  // Creates a listener object with the given underlying ostream.  The
+  // listener does not own the ostream, and does not dereference it
+  // in the constructor or destructor.
+  explicit MatchResultListener(::std::ostream* os) : stream_(os) {}
+  virtual ~MatchResultListener() = 0;  // Makes this class abstract.
+
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x) {
+    if (stream_ != nullptr) *stream_ << x;
+    return *this;
+  }
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream() { return stream_; }
+
+  // Returns true if and only if the listener is interested in an explanation
+  // of the match result.  A matcher's MatchAndExplain() method can use
+  // this information to avoid generating the explanation when no one
+  // intends to hear it.
+  bool IsInterested() const { return stream_ != nullptr; }
+
+ private:
+  ::std::ostream* const stream_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
+};
+
+inline MatchResultListener::~MatchResultListener() {
+}
+
+// An instance of a subclass of this knows how to describe itself as a
+// matcher.
+class GTEST_API_ MatcherDescriberInterface {
+ public:
+  virtual ~MatcherDescriberInterface() {}
+
+  // Describes this matcher to an ostream.  The function should print
+  // a verb phrase that describes the property a value matching this
+  // matcher should have.  The subject of the verb phrase is the value
+  // being matched.  For example, the DescribeTo() method of the Gt(7)
+  // matcher prints "is greater than 7".
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.  For
+  // example, if the description of this matcher is "is greater than
+  // 7", the negated description could be "is not greater than 7".
+  // You are not required to override this when implementing
+  // MatcherInterface, but it is highly advised so that your matcher
+  // can produce good error messages.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "not (";
+    DescribeTo(os);
+    *os << ")";
+  }
+};
+
+// The implementation of a matcher.
+template <typename T>
+class MatcherInterface : public MatcherDescriberInterface {
+ public:
+  // Returns true if and only if the matcher matches x; also explains the
+  // match result to 'listener' if necessary (see the next paragraph), in
+  // the form of a non-restrictive relative clause ("which ...",
+  // "whose ...", etc) that describes x.  For example, the
+  // MatchAndExplain() method of the Pointee(...) matcher should
+  // generate an explanation like "which points to ...".
+  //
+  // Implementations of MatchAndExplain() should add an explanation of
+  // the match result *if and only if* they can provide additional
+  // information that's not already present (or not obvious) in the
+  // print-out of x and the matcher's description.  Whether the match
+  // succeeds is not a factor in deciding whether an explanation is
+  // needed, as sometimes the caller needs to print a failure message
+  // when the match succeeds (e.g. when the matcher is used inside
+  // Not()).
+  //
+  // For example, a "has at least 10 elements" matcher should explain
+  // what the actual element count is, regardless of the match result,
+  // as it is useful information to the reader; on the other hand, an
+  // "is empty" matcher probably only needs to explain what the actual
+  // size is when the match fails, as it's redundant to say that the
+  // size is 0 when the value is already known to be empty.
+  //
+  // You should override this method when defining a new matcher.
+  //
+  // It's the responsibility of the caller (Google Test) to guarantee
+  // that 'listener' is not NULL.  This helps to simplify a matcher's
+  // implementation when it doesn't care about the performance, as it
+  // can talk to 'listener' without checking its validity first.
+  // However, in order to implement dummy listeners efficiently,
+  // listener->stream() may be NULL.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Inherits these methods from MatcherDescriberInterface:
+  //   virtual void DescribeTo(::std::ostream* os) const = 0;
+  //   virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+
+namespace internal {
+
+struct AnyEq {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a == b; }
+};
+struct AnyNe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a != b; }
+};
+struct AnyLt {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a < b; }
+};
+struct AnyGt {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a > b; }
+};
+struct AnyLe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a <= b; }
+};
+struct AnyGe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a >= b; }
+};
+
+// A match result listener that ignores the explanation.
+class DummyMatchResultListener : public MatchResultListener {
+ public:
+  DummyMatchResultListener() : MatchResultListener(nullptr) {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
+};
+
+// A match result listener that forwards the explanation to a given
+// ostream.  The difference between this and MatchResultListener is
+// that the former is concrete.
+class StreamMatchResultListener : public MatchResultListener {
+ public:
+  explicit StreamMatchResultListener(::std::ostream* os)
+      : MatchResultListener(os) {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
+};
+
+struct SharedPayloadBase {
+  std::atomic<int> ref{1};
+  void Ref() { ref.fetch_add(1, std::memory_order_relaxed); }
+  bool Unref() { return ref.fetch_sub(1, std::memory_order_acq_rel) == 1; }
+};
+
+template <typename T>
+struct SharedPayload : SharedPayloadBase {
+  explicit SharedPayload(const T& v) : value(v) {}
+  explicit SharedPayload(T&& v) : value(std::move(v)) {}
+
+  static void Destroy(SharedPayloadBase* shared) {
+    delete static_cast<SharedPayload*>(shared);
+  }
+
+  T value;
+};
+
+// An internal class for implementing Matcher<T>, which will derive
+// from it.  We put functionalities common to all Matcher<T>
+// specializations here to avoid code duplication.
+template <typename T>
+class MatcherBase : private MatcherDescriberInterface {
+ public:
+  // Returns true if and only if the matcher matches x; also explains the
+  // match result to 'listener'.
+  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
+    GTEST_CHECK_(vtable_ != nullptr);
+    return vtable_->match_and_explain(*this, x, listener);
+  }
+
+  // Returns true if and only if this matcher matches x.
+  bool Matches(const T& x) const {
+    DummyMatchResultListener dummy;
+    return MatchAndExplain(x, &dummy);
+  }
+
+  // Describes this matcher to an ostream.
+  void DescribeTo(::std::ostream* os) const final {
+    GTEST_CHECK_(vtable_ != nullptr);
+    vtable_->describe(*this, os, false);
+  }
+
+  // Describes the negation of this matcher to an ostream.
+  void DescribeNegationTo(::std::ostream* os) const final {
+    GTEST_CHECK_(vtable_ != nullptr);
+    vtable_->describe(*this, os, true);
+  }
+
+  // Explains why x matches, or doesn't match, the matcher.
+  void ExplainMatchResultTo(const T& x, ::std::ostream* os) const {
+    StreamMatchResultListener listener(os);
+    MatchAndExplain(x, &listener);
+  }
+
+  // Returns the describer for this matcher object; retains ownership
+  // of the describer, which is only guaranteed to be alive when
+  // this matcher object is alive.
+  const MatcherDescriberInterface* GetDescriber() const {
+    if (vtable_ == nullptr) return nullptr;
+    return vtable_->get_describer(*this);
+  }
+
+ protected:
+  MatcherBase() : vtable_(nullptr) {}
+
+  // Constructs a matcher from its implementation.
+  template <typename U>
+  explicit MatcherBase(const MatcherInterface<U>* impl) {
+    Init(impl);
+  }
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  MatcherBase(M&& m) {  // NOLINT
+    Init(std::forward<M>(m));
+  }
+
+  MatcherBase(const MatcherBase& other)
+      : vtable_(other.vtable_), buffer_(other.buffer_) {
+    if (IsShared()) buffer_.shared->Ref();
+  }
+
+  MatcherBase& operator=(const MatcherBase& other) {
+    if (this == &other) return *this;
+    Destroy();
+    vtable_ = other.vtable_;
+    buffer_ = other.buffer_;
+    if (IsShared()) buffer_.shared->Ref();
+    return *this;
+  }
+
+  MatcherBase(MatcherBase&& other)
+      : vtable_(other.vtable_), buffer_(other.buffer_) {
+    other.vtable_ = nullptr;
+  }
+
+  MatcherBase& operator=(MatcherBase&& other) {
+    if (this == &other) return *this;
+    Destroy();
+    vtable_ = other.vtable_;
+    buffer_ = other.buffer_;
+    other.vtable_ = nullptr;
+    return *this;
+  }
+
+  ~MatcherBase() override { Destroy(); }
+
+ private:
+  struct VTable {
+    bool (*match_and_explain)(const MatcherBase&, const T&,
+                              MatchResultListener*);
+    void (*describe)(const MatcherBase&, std::ostream*, bool negation);
+    // Returns the captured object if it implements the interface, otherwise
+    // returns the MatcherBase itself.
+    const MatcherDescriberInterface* (*get_describer)(const MatcherBase&);
+    // Called on shared instances when the reference count reaches 0.
+    void (*shared_destroy)(SharedPayloadBase*);
+  };
+
+  bool IsShared() const {
+    return vtable_ != nullptr && vtable_->shared_destroy != nullptr;
+  }
+
+  // If the implementation uses a listener, call that.
+  template <typename P>
+  static auto MatchAndExplainImpl(const MatcherBase& m, const T& value,
+                                  MatchResultListener* listener)
+      -> decltype(P::Get(m).MatchAndExplain(value, listener->stream())) {
+    return P::Get(m).MatchAndExplain(value, listener->stream());
+  }
+
+  template <typename P>
+  static auto MatchAndExplainImpl(const MatcherBase& m, const T& value,
+                                  MatchResultListener* listener)
+      -> decltype(P::Get(m).MatchAndExplain(value, listener)) {
+    return P::Get(m).MatchAndExplain(value, listener);
+  }
+
+  template <typename P>
+  static void DescribeImpl(const MatcherBase& m, std::ostream* os,
+                           bool negation) {
+    if (negation) {
+      P::Get(m).DescribeNegationTo(os);
+    } else {
+      P::Get(m).DescribeTo(os);
+    }
+  }
+
+  template <typename P>
+  static const MatcherDescriberInterface* GetDescriberImpl(
+      const MatcherBase& m) {
+    // If the impl is a MatcherDescriberInterface, then return it.
+    // Otherwise use MatcherBase itself.
+    // This allows us to implement the GetDescriber() function without support
+    // from the impl, but some users really want to get their impl back when
+    // they call GetDescriber().
+    // We use std::get on a tuple as a workaround of not having `if constexpr`.
+    return std::get<(
+        std::is_convertible<decltype(&P::Get(m)),
+                            const MatcherDescriberInterface*>::value
+            ? 1
+            : 0)>(std::make_tuple(&m, &P::Get(m)));
+  }
+
+  template <typename P>
+  const VTable* GetVTable() {
+    static constexpr VTable kVTable = {&MatchAndExplainImpl<P>,
+                                       &DescribeImpl<P>, &GetDescriberImpl<P>,
+                                       P::shared_destroy};
+    return &kVTable;
+  }
+
+  union Buffer {
+    // Add some types to give Buffer some common alignment/size use cases.
+    void* ptr;
+    double d;
+    int64_t i;
+    // And add one for the out-of-line cases.
+    SharedPayloadBase* shared;
+  };
+
+  void Destroy() {
+    if (IsShared() && buffer_.shared->Unref()) {
+      vtable_->shared_destroy(buffer_.shared);
+    }
+  }
+
+  template <typename M>
+  static constexpr bool IsInlined() {
+    return sizeof(M) <= sizeof(Buffer) && alignof(M) <= alignof(Buffer) &&
+           std::is_trivially_copy_constructible<M>::value &&
+           std::is_trivially_destructible<M>::value;
+  }
+
+  template <typename M, bool = MatcherBase::IsInlined<M>()>
+  struct ValuePolicy {
+    static const M& Get(const MatcherBase& m) {
+      // When inlined along with Init, need to be explicit to avoid violating
+      // strict aliasing rules.
+      const M *ptr = static_cast<const M*>(
+          static_cast<const void*>(&m.buffer_));
+      return *ptr;
+    }
+    static void Init(MatcherBase& m, M impl) {
+      ::new (static_cast<void*>(&m.buffer_)) M(impl);
+    }
+    static constexpr auto shared_destroy = nullptr;
+  };
+
+  template <typename M>
+  struct ValuePolicy<M, false> {
+    using Shared = SharedPayload<M>;
+    static const M& Get(const MatcherBase& m) {
+      return static_cast<Shared*>(m.buffer_.shared)->value;
+    }
+    template <typename Arg>
+    static void Init(MatcherBase& m, Arg&& arg) {
+      m.buffer_.shared = new Shared(std::forward<Arg>(arg));
+    }
+    static constexpr auto shared_destroy = &Shared::Destroy;
+  };
+
+  template <typename U, bool B>
+  struct ValuePolicy<const MatcherInterface<U>*, B> {
+    using M = const MatcherInterface<U>;
+    using Shared = SharedPayload<std::unique_ptr<M>>;
+    static const M& Get(const MatcherBase& m) {
+      return *static_cast<Shared*>(m.buffer_.shared)->value;
+    }
+    static void Init(MatcherBase& m, M* impl) {
+      m.buffer_.shared = new Shared(std::unique_ptr<M>(impl));
+    }
+
+    static constexpr auto shared_destroy = &Shared::Destroy;
+  };
+
+  template <typename M>
+  void Init(M&& m) {
+    using MM = typename std::decay<M>::type;
+    using Policy = ValuePolicy<MM>;
+    vtable_ = GetVTable<Policy>();
+    Policy::Init(*this, std::forward<M>(m));
+  }
+
+  const VTable* vtable_;
+  Buffer buffer_;
+};
+
+}  // namespace internal
+
+// A Matcher<T> is a copyable and IMMUTABLE (except by assignment)
+// object that can check whether a value of type T matches.  The
+// implementation of Matcher<T> is just a std::shared_ptr to const
+// MatcherInterface<T>.  Don't inherit from Matcher!
+template <typename T>
+class Matcher : public internal::MatcherBase<T> {
+ public:
+  // Constructs a null matcher.  Needed for storing Matcher objects in STL
+  // containers.  A default-constructed matcher is not yet initialized.  You
+  // cannot use it until a valid value has been assigned to it.
+  explicit Matcher() {}  // NOLINT
+
+  // Constructs a matcher from its implementation.
+  explicit Matcher(const MatcherInterface<const T&>* impl)
+      : internal::MatcherBase<T>(impl) {}
+
+  template <typename U>
+  explicit Matcher(
+      const MatcherInterface<U>* impl,
+      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
+          nullptr)
+      : internal::MatcherBase<T>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m) : internal::MatcherBase<T>(std::forward<M>(m)) {}  // NOLINT
+
+  // Implicit constructor here allows people to write
+  // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes
+  Matcher(T value);  // NOLINT
+};
+
+// The following two specializations allow the user to write str
+// instead of Eq(str) and "foo" instead of Eq("foo") when a std::string
+// matcher is expected.
+template <>
+class GTEST_API_ Matcher<const std::string&>
+    : public internal::MatcherBase<const std::string&> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const std::string&>* impl)
+      : internal::MatcherBase<const std::string&>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<const std::string&>(std::forward<M>(m)) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a std::string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+};
+
+template <>
+class GTEST_API_ Matcher<std::string>
+    : public internal::MatcherBase<std::string> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const std::string&>* impl)
+      : internal::MatcherBase<std::string>(impl) {}
+  explicit Matcher(const MatcherInterface<std::string>* impl)
+      : internal::MatcherBase<std::string>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<std::string>(std::forward<M>(m)) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+};
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// The following two specializations allow the user to write str
+// instead of Eq(str) and "foo" instead of Eq("foo") when a absl::string_view
+// matcher is expected.
+template <>
+class GTEST_API_ Matcher<const internal::StringView&>
+    : public internal::MatcherBase<const internal::StringView&> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
+      : internal::MatcherBase<const internal::StringView&>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<const internal::StringView&>(std::forward<M>(m)) {
+  }
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a std::string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+
+  // Allows the user to pass absl::string_views or std::string_views directly.
+  Matcher(internal::StringView s);  // NOLINT
+};
+
+template <>
+class GTEST_API_ Matcher<internal::StringView>
+    : public internal::MatcherBase<internal::StringView> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
+      : internal::MatcherBase<internal::StringView>(impl) {}
+  explicit Matcher(const MatcherInterface<internal::StringView>* impl)
+      : internal::MatcherBase<internal::StringView>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<internal::StringView>(std::forward<M>(m)) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a std::string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+
+  // Allows the user to pass absl::string_views or std::string_views directly.
+  Matcher(internal::StringView s);  // NOLINT
+};
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+// Prints a matcher in a human-readable format.
+template <typename T>
+std::ostream& operator<<(std::ostream& os, const Matcher<T>& matcher) {
+  matcher.DescribeTo(&os);
+  return os;
+}
+
+// The PolymorphicMatcher class template makes it easy to implement a
+// polymorphic matcher (i.e. a matcher that can match values of more
+// than one type, e.g. Eq(n) and NotNull()).
+//
+// To define a polymorphic matcher, a user should provide an Impl
+// class that has a DescribeTo() method and a DescribeNegationTo()
+// method, and define a member function (or member function template)
+//
+//   bool MatchAndExplain(const Value& value,
+//                        MatchResultListener* listener) const;
+//
+// See the definition of NotNull() for a complete example.
+template <class Impl>
+class PolymorphicMatcher {
+ public:
+  explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {}
+
+  // Returns a mutable reference to the underlying matcher
+  // implementation object.
+  Impl& mutable_impl() { return impl_; }
+
+  // Returns an immutable reference to the underlying matcher
+  // implementation object.
+  const Impl& impl() const { return impl_; }
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new MonomorphicImpl<const T&>(impl_));
+  }
+
+ private:
+  template <typename T>
+  class MonomorphicImpl : public MatcherInterface<T> {
+   public:
+    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      impl_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+      return impl_.MatchAndExplain(x, listener);
+    }
+
+   private:
+    const Impl impl_;
+  };
+
+  Impl impl_;
+};
+
+// Creates a matcher from its implementation.
+// DEPRECATED: Especially in the generic code, prefer:
+//   Matcher<T>(new MyMatcherImpl<const T&>(...));
+//
+// MakeMatcher may create a Matcher that accepts its argument by value, which
+// leads to unnecessary copies & lack of support for non-copyable types.
+template <typename T>
+inline Matcher<T> MakeMatcher(const MatcherInterface<T>* impl) {
+  return Matcher<T>(impl);
+}
+
+// Creates a polymorphic matcher from its implementation.  This is
+// easier to use than the PolymorphicMatcher<Impl> constructor as it
+// doesn't require you to explicitly write the template argument, e.g.
+//
+//   MakePolymorphicMatcher(foo);
+// vs
+//   PolymorphicMatcher<TypeOfFoo>(foo);
+template <class Impl>
+inline PolymorphicMatcher<Impl> MakePolymorphicMatcher(const Impl& impl) {
+  return PolymorphicMatcher<Impl>(impl);
+}
+
+namespace internal {
+// Implements a matcher that compares a given value with a
+// pre-supplied value using one of the ==, <=, <, etc, operators.  The
+// two values being compared don't have to have the same type.
+//
+// The matcher defined here is polymorphic (for example, Eq(5) can be
+// used to match an int, a short, a double, etc).  Therefore we use
+// a template type conversion operator in the implementation.
+//
+// The following template definition assumes that the Rhs parameter is
+// a "bare" type (i.e. neither 'const T' nor 'T&').
+template <typename D, typename Rhs, typename Op>
+class ComparisonBase {
+ public:
+  explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {}
+
+  using is_gtest_matcher = void;
+
+  template <typename Lhs>
+  bool MatchAndExplain(const Lhs& lhs, std::ostream*) const {
+    return Op()(lhs, Unwrap(rhs_));
+  }
+  void DescribeTo(std::ostream* os) const {
+    *os << D::Desc() << " ";
+    UniversalPrint(Unwrap(rhs_), os);
+  }
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << D::NegatedDesc() << " ";
+    UniversalPrint(Unwrap(rhs_), os);
+  }
+
+ private:
+  template <typename T>
+  static const T& Unwrap(const T& v) {
+    return v;
+  }
+  template <typename T>
+  static const T& Unwrap(std::reference_wrapper<T> v) {
+    return v;
+  }
+
+  Rhs rhs_;
+};
+
+template <typename Rhs>
+class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
+ public:
+  explicit EqMatcher(const Rhs& rhs)
+      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) { }
+  static const char* Desc() { return "is equal to"; }
+  static const char* NegatedDesc() { return "isn't equal to"; }
+};
+template <typename Rhs>
+class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
+ public:
+  explicit NeMatcher(const Rhs& rhs)
+      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) { }
+  static const char* Desc() { return "isn't equal to"; }
+  static const char* NegatedDesc() { return "is equal to"; }
+};
+template <typename Rhs>
+class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
+ public:
+  explicit LtMatcher(const Rhs& rhs)
+      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) { }
+  static const char* Desc() { return "is <"; }
+  static const char* NegatedDesc() { return "isn't <"; }
+};
+template <typename Rhs>
+class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
+ public:
+  explicit GtMatcher(const Rhs& rhs)
+      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) { }
+  static const char* Desc() { return "is >"; }
+  static const char* NegatedDesc() { return "isn't >"; }
+};
+template <typename Rhs>
+class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
+ public:
+  explicit LeMatcher(const Rhs& rhs)
+      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) { }
+  static const char* Desc() { return "is <="; }
+  static const char* NegatedDesc() { return "isn't <="; }
+};
+template <typename Rhs>
+class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
+ public:
+  explicit GeMatcher(const Rhs& rhs)
+      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) { }
+  static const char* Desc() { return "is >="; }
+  static const char* NegatedDesc() { return "isn't >="; }
+};
+
+template <typename T, typename = typename std::enable_if<
+                          std::is_constructible<std::string, T>::value>::type>
+using StringLike = T;
+
+// Implements polymorphic matchers MatchesRegex(regex) and
+// ContainsRegex(regex), which can be used as a Matcher<T> as long as
+// T can be converted to a string.
+class MatchesRegexMatcher {
+ public:
+  MatchesRegexMatcher(const RE* regex, bool full_match)
+      : regex_(regex), full_match_(full_match) {}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  bool MatchAndExplain(const internal::StringView& s,
+                       MatchResultListener* listener) const {
+    return MatchAndExplain(std::string(s), listener);
+  }
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != nullptr && MatchAndExplain(std::string(s), listener);
+  }
+
+  // Matches anything that can convert to std::string.
+  //
+  // This is a template, not just a plain function with const std::string&,
+  // because absl::string_view has some interfering non-explicit constructors.
+  template <class MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const std::string& s2(s);
+    return full_match_ ? RE::FullMatch(s2, *regex_)
+                       : RE::PartialMatch(s2, *regex_);
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << (full_match_ ? "matches" : "contains") << " regular expression ";
+    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't " << (full_match_ ? "match" : "contain")
+        << " regular expression ";
+    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
+  }
+
+ private:
+  const std::shared_ptr<const RE> regex_;
+  const bool full_match_;
+};
+}  // namespace internal
+
+// Matches a string that fully matches regular expression 'regex'.
+// The matcher takes ownership of 'regex'.
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
+    const internal::RE* regex) {
+  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, true));
+}
+template <typename T = std::string>
+PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
+    const internal::StringLike<T>& regex) {
+  return MatchesRegex(new internal::RE(std::string(regex)));
+}
+
+// Matches a string that contains regular expression 'regex'.
+// The matcher takes ownership of 'regex'.
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
+    const internal::RE* regex) {
+  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, false));
+}
+template <typename T = std::string>
+PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
+    const internal::StringLike<T>& regex) {
+  return ContainsRegex(new internal::RE(std::string(regex)));
+}
+
+// Creates a polymorphic matcher that matches anything equal to x.
+// Note: if the parameter of Eq() were declared as const T&, Eq("foo")
+// wouldn't compile.
+template <typename T>
+inline internal::EqMatcher<T> Eq(T x) { return internal::EqMatcher<T>(x); }
+
+// Constructs a Matcher<T> from a 'value' of type T.  The constructed
+// matcher matches any value that's equal to 'value'.
+template <typename T>
+Matcher<T>::Matcher(T value) { *this = Eq(value); }
+
+// Creates a monomorphic matcher that matches anything with type Lhs
+// and equal to rhs.  A user may need to use this instead of Eq(...)
+// in order to resolve an overloading ambiguity.
+//
+// TypedEq<T>(x) is just a convenient short-hand for Matcher<T>(Eq(x))
+// or Matcher<T>(x), but more readable than the latter.
+//
+// We could define similar monomorphic matchers for other comparison
+// operations (e.g. TypedLt, TypedGe, and etc), but decided not to do
+// it yet as those are used much less than Eq() in practice.  A user
+// can always write Matcher<T>(Lt(5)) to be explicit about the type,
+// for example.
+template <typename Lhs, typename Rhs>
+inline Matcher<Lhs> TypedEq(const Rhs& rhs) { return Eq(rhs); }
+
+// Creates a polymorphic matcher that matches anything >= x.
+template <typename Rhs>
+inline internal::GeMatcher<Rhs> Ge(Rhs x) {
+  return internal::GeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything > x.
+template <typename Rhs>
+inline internal::GtMatcher<Rhs> Gt(Rhs x) {
+  return internal::GtMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything <= x.
+template <typename Rhs>
+inline internal::LeMatcher<Rhs> Le(Rhs x) {
+  return internal::LeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything < x.
+template <typename Rhs>
+inline internal::LtMatcher<Rhs> Lt(Rhs x) {
+  return internal::LtMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything != x.
+template <typename Rhs>
+inline internal::NeMatcher<Rhs> Ne(Rhs x) {
+  return internal::NeMatcher<Rhs>(x);
+}
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
+
+#include <stdio.h>
+#include <memory>
+
+namespace testing {
+namespace internal {
+
+GTEST_DECLARE_string_(internal_run_death_test);
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kDeathTestStyleFlag[] = "death_test_style";
+const char kDeathTestUseFork[] = "death_test_use_fork";
+const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
+
+#if GTEST_HAS_DEATH_TEST
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+// DeathTest is a class that hides much of the complexity of the
+// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
+// returns a concrete class that depends on the prevailing death test
+// style, as defined by the --gtest_death_test_style and/or
+// --gtest_internal_run_death_test flags.
+
+// In describing the results of death tests, these terms are used with
+// the corresponding definitions:
+//
+// exit status:  The integer exit information in the format specified
+//               by wait(2)
+// exit code:    The integer code passed to exit(3), _exit(2), or
+//               returned from main()
+class GTEST_API_ DeathTest {
+ public:
+  // Create returns false if there was an error determining the
+  // appropriate action to take for the current death test; for example,
+  // if the gtest_death_test_style flag is set to an invalid value.
+  // The LastMessage method will return a more detailed message in that
+  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
+  // argument is set.  If the death test should be skipped, the pointer
+  // is set to NULL; otherwise, it is set to the address of a new concrete
+  // DeathTest object that controls the execution of the current test.
+  static bool Create(const char* statement, Matcher<const std::string&> matcher,
+                     const char* file, int line, DeathTest** test);
+  DeathTest();
+  virtual ~DeathTest() { }
+
+  // A helper class that aborts a death test when it's deleted.
+  class ReturnSentinel {
+   public:
+    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
+    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
+   private:
+    DeathTest* const test_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
+  } GTEST_ATTRIBUTE_UNUSED_;
+
+  // An enumeration of possible roles that may be taken when a death
+  // test is encountered.  EXECUTE means that the death test logic should
+  // be executed immediately.  OVERSEE means that the program should prepare
+  // the appropriate environment for a child process to execute the death
+  // test, then wait for it to complete.
+  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
+
+  // An enumeration of the three reasons that a test might be aborted.
+  enum AbortReason {
+    TEST_ENCOUNTERED_RETURN_STATEMENT,
+    TEST_THREW_EXCEPTION,
+    TEST_DID_NOT_DIE
+  };
+
+  // Assumes one of the above roles.
+  virtual TestRole AssumeRole() = 0;
+
+  // Waits for the death test to finish and returns its status.
+  virtual int Wait() = 0;
+
+  // Returns true if the death test passed; that is, the test process
+  // exited during the test, its exit status matches a user-supplied
+  // predicate, and its stderr output matches a user-supplied regular
+  // expression.
+  // The user-supplied predicate may be a macro expression rather
+  // than a function pointer or functor, or else Wait and Passed could
+  // be combined.
+  virtual bool Passed(bool exit_status_ok) = 0;
+
+  // Signals that the death test did not die as expected.
+  virtual void Abort(AbortReason reason) = 0;
+
+  // Returns a human-readable outcome message regarding the outcome of
+  // the last death test.
+  static const char* LastMessage();
+
+  static void set_last_death_test_message(const std::string& message);
+
+ private:
+  // A string containing a description of the outcome of the last death test.
+  static std::string last_death_test_message_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
+};
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// Factory interface for death tests.  May be mocked out for testing.
+class DeathTestFactory {
+ public:
+  virtual ~DeathTestFactory() { }
+  virtual bool Create(const char* statement,
+                      Matcher<const std::string&> matcher, const char* file,
+                      int line, DeathTest** test) = 0;
+};
+
+// A concrete DeathTestFactory implementation for normal use.
+class DefaultDeathTestFactory : public DeathTestFactory {
+ public:
+  bool Create(const char* statement, Matcher<const std::string&> matcher,
+              const char* file, int line, DeathTest** test) override;
+};
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
+
+// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
+// and interpreted as a regex (rather than an Eq matcher) for legacy
+// compatibility.
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    ::testing::internal::RE regex) {
+  return ContainsRegex(regex.pattern());
+}
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
+  return ContainsRegex(regex);
+}
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    const ::std::string& regex) {
+  return ContainsRegex(regex);
+}
+
+// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
+// used directly.
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    Matcher<const ::std::string&> matcher) {
+  return matcher;
+}
+
+// Traps C++ exceptions escaping statement and reports them as test
+// failures. Note that trapping SEH exceptions is not implemented here.
+# if GTEST_HAS_EXCEPTIONS
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  try { \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+  } catch (const ::std::exception& gtest_exception) { \
+    fprintf(\
+        stderr, \
+        "\n%s: Caught std::exception-derived exception escaping the " \
+        "death test statement. Exception message: %s\n", \
+        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
+        gtest_exception.what()); \
+    fflush(stderr); \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  } catch (...) { \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  }
+
+# else
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+
+# endif
+
+// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
+// ASSERT_EXIT*, and EXPECT_EXIT*.
+#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)        \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
+  if (::testing::internal::AlwaysTrue()) {                                     \
+    ::testing::internal::DeathTest* gtest_dt;                                  \
+    if (!::testing::internal::DeathTest::Create(                               \
+            #statement,                                                        \
+            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),       \
+            __FILE__, __LINE__, &gtest_dt)) {                                  \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
+    }                                                                          \
+    if (gtest_dt != nullptr) {                                                 \
+      std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
+      switch (gtest_dt->AssumeRole()) {                                        \
+        case ::testing::internal::DeathTest::OVERSEE_TEST:                     \
+          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                \
+            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                  \
+          }                                                                    \
+          break;                                                               \
+        case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
+          ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
+              gtest_dt);                                                       \
+          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
+          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
+          break;                                                               \
+        }                                                                      \
+        default:                                                               \
+          break;                                                               \
+      }                                                                        \
+    }                                                                          \
+  } else                                                                       \
+    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                \
+        : fail(::testing::internal::DeathTest::LastMessage())
+// The symbol "fail" here expands to something into which a message
+// can be streamed.
+
+// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
+// NDEBUG mode. In this case we need the statements to be executed and the macro
+// must accept a streamed message even though the message is never printed.
+// The regex object is not evaluated, but it is used to prevent "unused"
+// warnings and to avoid an expression that doesn't compile in debug mode.
+#define GTEST_EXECUTE_STATEMENT_(statement, regex_or_matcher)    \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                  \
+  if (::testing::internal::AlwaysTrue()) {                       \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);   \
+  } else if (!::testing::internal::AlwaysTrue()) {               \
+    ::testing::internal::MakeDeathTestMatcher(regex_or_matcher); \
+  } else                                                         \
+    ::testing::Message()
+
+// A class representing the parsed contents of the
+// --gtest_internal_run_death_test flag, as it existed when
+// RUN_ALL_TESTS was called.
+class InternalRunDeathTestFlag {
+ public:
+  InternalRunDeathTestFlag(const std::string& a_file,
+                           int a_line,
+                           int an_index,
+                           int a_write_fd)
+      : file_(a_file), line_(a_line), index_(an_index),
+        write_fd_(a_write_fd) {}
+
+  ~InternalRunDeathTestFlag() {
+    if (write_fd_ >= 0)
+      posix::Close(write_fd_);
+  }
+
+  const std::string& file() const { return file_; }
+  int line() const { return line_; }
+  int index() const { return index_; }
+  int write_fd() const { return write_fd_; }
+
+ private:
+  std::string file_;
+  int line_;
+  int index_;
+  int write_fd_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
+};
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+
+namespace testing {
+
+// This flag controls the style of death tests.  Valid values are "threadsafe",
+// meaning that the death test child process will re-execute the test binary
+// from the start, running only a single death test, or "fast",
+// meaning that the child process will execute the test logic immediately
+// after forking.
+GTEST_DECLARE_string_(death_test_style);
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+GTEST_API_ bool InDeathTestChild();
+
+}  // namespace internal
+
+// The following macros are useful for writing death tests.
+
+// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
+// executed:
+//
+//   1. It generates a warning if there is more than one active
+//   thread.  This is because it's safe to fork() or clone() only
+//   when there is a single thread.
+//
+//   2. The parent process clone()s a sub-process and runs the death
+//   test in it; the sub-process exits with code 0 at the end of the
+//   death test, if it hasn't exited already.
+//
+//   3. The parent process waits for the sub-process to terminate.
+//
+//   4. The parent process checks the exit code and error message of
+//   the sub-process.
+//
+// Examples:
+//
+//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
+//   for (int i = 0; i < 5; i++) {
+//     EXPECT_DEATH(server.ProcessRequest(i),
+//                  "Invalid request .* in ProcessRequest()")
+//                  << "Failed to die on request " << i;
+//   }
+//
+//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
+//
+//   bool KilledBySIGHUP(int exit_code) {
+//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
+//   }
+//
+//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
+//
+// The final parameter to each of these macros is a matcher applied to any data
+// the sub-process wrote to stderr.  For compatibility with existing tests, a
+// bare string is interpreted as a regular expression matcher.
+//
+// On the regular expressions used in death tests:
+//
+//   GOOGLETEST_CM0005 DO NOT DELETE
+//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
+//   which uses the POSIX extended regex syntax.
+//
+//   On other platforms (e.g. Windows or Mac), we only support a simple regex
+//   syntax implemented as part of Google Test.  This limited
+//   implementation should be enough most of the time when writing
+//   death tests; though it lacks many features you can find in PCRE
+//   or POSIX extended regex syntax.  For example, we don't support
+//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
+//   repetition count ("x{5,7}"), among others.
+//
+//   Below is the syntax that we do support.  We chose it to be a
+//   subset of both PCRE and POSIX extended regex, so it's easy to
+//   learn wherever you come from.  In the following: 'A' denotes a
+//   literal character, period (.), or a single \\ escape sequence;
+//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
+//   natural numbers.
+//
+//     c     matches any literal character c
+//     \\d   matches any decimal digit
+//     \\D   matches any character that's not a decimal digit
+//     \\f   matches \f
+//     \\n   matches \n
+//     \\r   matches \r
+//     \\s   matches any ASCII whitespace, including \n
+//     \\S   matches any character that's not a whitespace
+//     \\t   matches \t
+//     \\v   matches \v
+//     \\w   matches any letter, _, or decimal digit
+//     \\W   matches any character that \\w doesn't match
+//     \\c   matches any literal character c, which must be a punctuation
+//     .     matches any single character except \n
+//     A?    matches 0 or 1 occurrences of A
+//     A*    matches 0 or many occurrences of A
+//     A+    matches 1 or many occurrences of A
+//     ^     matches the beginning of a string (not that of each line)
+//     $     matches the end of a string (not that of each line)
+//     xy    matches x followed by y
+//
+//   If you accidentally use PCRE or POSIX extended regex features
+//   not implemented by us, you will get a run-time failure.  In that
+//   case, please try to rewrite your regular expression within the
+//   above syntax.
+//
+//   This implementation is *not* meant to be as highly tuned or robust
+//   as a compiled regex library, but should perform well enough for a
+//   death test, which already incurs significant overhead by launching
+//   a child process.
+//
+// Known caveats:
+//
+//   A "threadsafe" style death test obtains the path to the test
+//   program from argv[0] and re-executes it in the sub-process.  For
+//   simplicity, the current implementation doesn't search the PATH
+//   when launching the sub-process.  This means that the user must
+//   invoke the test program via a path that contains at least one
+//   path separator (e.g. path/to/foo_test and
+//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
+//   is rarely a problem as people usually don't put the test binary
+//   directory in PATH.
+//
+
+// Asserts that a given `statement` causes the program to exit, with an
+// integer exit status that satisfies `predicate`, and emitting error output
+// that matches `matcher`.
+# define ASSERT_EXIT(statement, predicate, matcher) \
+    GTEST_DEATH_TEST_(statement, predicate, matcher, GTEST_FATAL_FAILURE_)
+
+// Like `ASSERT_EXIT`, but continues on to successive tests in the
+// test suite, if any:
+# define EXPECT_EXIT(statement, predicate, matcher) \
+    GTEST_DEATH_TEST_(statement, predicate, matcher, GTEST_NONFATAL_FAILURE_)
+
+// Asserts that a given `statement` causes the program to exit, either by
+// explicitly exiting with a nonzero exit code or being killed by a
+// signal, and emitting error output that matches `matcher`.
+# define ASSERT_DEATH(statement, matcher) \
+    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, matcher)
+
+// Like `ASSERT_DEATH`, but continues on to successive tests in the
+// test suite, if any:
+# define EXPECT_DEATH(statement, matcher) \
+    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, matcher)
+
+// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
+
+// Tests that an exit code describes a normal exit with a given exit code.
+class GTEST_API_ ExitedWithCode {
+ public:
+  explicit ExitedWithCode(int exit_code);
+  ExitedWithCode(const ExitedWithCode&) = default;
+  void operator=(const ExitedWithCode& other) = delete;
+  bool operator()(int exit_status) const;
+ private:
+  const int exit_code_;
+};
+
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+// Tests that an exit code describes an exit due to termination by a
+// given signal.
+// GOOGLETEST_CM0006 DO NOT DELETE
+class GTEST_API_ KilledBySignal {
+ public:
+  explicit KilledBySignal(int signum);
+  bool operator()(int exit_status) const;
+ private:
+  const int signum_;
+};
+# endif  // !GTEST_OS_WINDOWS
+
+// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
+// The death testing framework causes this to have interesting semantics,
+// since the sideeffects of the call are only visible in opt mode, and not
+// in debug mode.
+//
+// In practice, this can be used to test functions that utilize the
+// LOG(DFATAL) macro using the following style:
+//
+// int DieInDebugOr12(int* sideeffect) {
+//   if (sideeffect) {
+//     *sideeffect = 12;
+//   }
+//   LOG(DFATAL) << "death";
+//   return 12;
+// }
+//
+// TEST(TestSuite, TestDieOr12WorksInDgbAndOpt) {
+//   int sideeffect = 0;
+//   // Only asserts in dbg.
+//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
+//
+// #ifdef NDEBUG
+//   // opt-mode has sideeffect visible.
+//   EXPECT_EQ(12, sideeffect);
+// #else
+//   // dbg-mode no visible sideeffect.
+//   EXPECT_EQ(0, sideeffect);
+// #endif
+// }
+//
+// This will assert that DieInDebugReturn12InOpt() crashes in debug
+// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
+// appropriate fallback value (12 in this case) in opt mode. If you
+// need to test that a function has appropriate side-effects in opt
+// mode, include assertions against the side-effects.  A general
+// pattern for this is:
+//
+// EXPECT_DEBUG_DEATH({
+//   // Side-effects here will have an effect after this statement in
+//   // opt mode, but none in debug mode.
+//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
+// }, "death");
+//
+# ifdef NDEBUG
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+# else
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  EXPECT_DEATH(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  ASSERT_DEATH(statement, regex)
+
+# endif  // NDEBUG for EXPECT_DEBUG_DEATH
+#endif  // GTEST_HAS_DEATH_TEST
+
+// This macro is used for implementing macros such as
+// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
+// death tests are not supported. Those macros must compile on such systems
+// if and only if EXPECT_DEATH and ASSERT_DEATH compile with the same parameters
+// on systems that support death tests. This allows one to write such a macro on
+// a system that does not support death tests and be sure that it will compile
+// on a death-test supporting system. It is exposed publicly so that systems
+// that have death-tests with stricter requirements than GTEST_HAS_DEATH_TEST
+// can write their own equivalent of EXPECT_DEATH_IF_SUPPORTED and
+// ASSERT_DEATH_IF_SUPPORTED.
+//
+// Parameters:
+//   statement -  A statement that a macro such as EXPECT_DEATH would test
+//                for program termination. This macro has to make sure this
+//                statement is compiled but not executed, to ensure that
+//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
+//                parameter if and only if EXPECT_DEATH compiles with it.
+//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
+//                the output of statement.  This parameter has to be
+//                compiled but not evaluated by this macro, to ensure that
+//                this macro only accepts expressions that a macro such as
+//                EXPECT_DEATH would accept.
+//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
+//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
+//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
+//                compile inside functions where ASSERT_DEATH doesn't
+//                compile.
+//
+//  The branch that has an always false condition is used to ensure that
+//  statement and regex are compiled (and thus syntactically correct) but
+//  never executed. The unreachable code macro protects the terminator
+//  statement from generating an 'unreachable code' warning in case
+//  statement unconditionally returns or throws. The Message constructor at
+//  the end allows the syntax of streaming additional messages into the
+//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
+# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::AlwaysTrue()) { \
+      GTEST_LOG_(WARNING) \
+          << "Death tests are not supported on this platform.\n" \
+          << "Statement '" #statement "' cannot be verified."; \
+    } else if (::testing::internal::AlwaysFalse()) { \
+      ::testing::internal::RE::PartialMatch(".*", (regex)); \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+      terminator; \
+    } else \
+      ::testing::Message()
+
+// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
+// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
+// death tests are supported; otherwise they just issue a warning.  This is
+// useful when you are combining death test assertions with normal test
+// assertions in one test.
+#if GTEST_HAS_DEATH_TEST
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    EXPECT_DEATH(statement, regex)
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    ASSERT_DEATH(statement, regex)
+#else
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
+#endif
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing and Mocking Framework (Google Test)
+//
+// GOOGLETEST_CM0001 DO NOT DELETE
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_SUITE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test suite
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_SUITE_P(InstantiationName,
+                         FooTest,
+                         Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more than once) the first argument to the
+// INSTANTIATE_TEST_SUITE_P macro is a prefix that will be added to the
+// actual test suite name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_SUITE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_SUITE_P will instantiate all tests
+// in the given test suite, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_SUITE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include <iterator>
+#include <utility>
+
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Type and function utilities for implementing parameterized tests.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+
+#include <ctype.h>
+
+#include <cassert>
+#include <iterator>
+#include <memory>
+#include <set>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+
+#include <iosfwd>
+#include <vector>
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// A copyable object representing the result of a test part (i.e. an
+// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
+//
+// Don't inherit from TestPartResult as its destructor is not virtual.
+class GTEST_API_ TestPartResult {
+ public:
+  // The possible outcomes of a test part (i.e. an assertion or an
+  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
+  enum Type {
+    kSuccess,          // Succeeded.
+    kNonFatalFailure,  // Failed but the test can continue.
+    kFatalFailure,     // Failed and the test should be terminated.
+    kSkip              // Skipped.
+  };
+
+  // C'tor.  TestPartResult does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestPartResult object.
+  TestPartResult(Type a_type, const char* a_file_name, int a_line_number,
+                 const char* a_message)
+      : type_(a_type),
+        file_name_(a_file_name == nullptr ? "" : a_file_name),
+        line_number_(a_line_number),
+        summary_(ExtractSummary(a_message)),
+        message_(a_message) {}
+
+  // Gets the outcome of the test part.
+  Type type() const { return type_; }
+
+  // Gets the name of the source file where the test part took place, or
+  // NULL if it's unknown.
+  const char* file_name() const {
+    return file_name_.empty() ? nullptr : file_name_.c_str();
+  }
+
+  // Gets the line in the source file where the test part took place,
+  // or -1 if it's unknown.
+  int line_number() const { return line_number_; }
+
+  // Gets the summary of the failure message.
+  const char* summary() const { return summary_.c_str(); }
+
+  // Gets the message associated with the test part.
+  const char* message() const { return message_.c_str(); }
+
+  // Returns true if and only if the test part was skipped.
+  bool skipped() const { return type_ == kSkip; }
+
+  // Returns true if and only if the test part passed.
+  bool passed() const { return type_ == kSuccess; }
+
+  // Returns true if and only if the test part non-fatally failed.
+  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
+
+  // Returns true if and only if the test part fatally failed.
+  bool fatally_failed() const { return type_ == kFatalFailure; }
+
+  // Returns true if and only if the test part failed.
+  bool failed() const { return fatally_failed() || nonfatally_failed(); }
+
+ private:
+  Type type_;
+
+  // Gets the summary of the failure message by omitting the stack
+  // trace in it.
+  static std::string ExtractSummary(const char* message);
+
+  // The name of the source file where the test part took place, or
+  // "" if the source file is unknown.
+  std::string file_name_;
+  // The line in the source file where the test part took place, or -1
+  // if the line number is unknown.
+  int line_number_;
+  std::string summary_;  // The test failure summary.
+  std::string message_;  // The test failure message.
+};
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
+
+// An array of TestPartResult objects.
+//
+// Don't inherit from TestPartResultArray as its destructor is not
+// virtual.
+class GTEST_API_ TestPartResultArray {
+ public:
+  TestPartResultArray() {}
+
+  // Appends the given TestPartResult to the array.
+  void Append(const TestPartResult& result);
+
+  // Returns the TestPartResult at the given index (0-based).
+  const TestPartResult& GetTestPartResult(int index) const;
+
+  // Returns the number of TestPartResult objects in the array.
+  int size() const;
+
+ private:
+  std::vector<TestPartResult> array_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
+};
+
+// This interface knows how to report a test part result.
+class GTEST_API_ TestPartResultReporterInterface {
+ public:
+  virtual ~TestPartResultReporterInterface() {}
+
+  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
+};
+
+namespace internal {
+
+// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
+// statement generates new fatal failures. To do so it registers itself as the
+// current test part result reporter. Besides checking if fatal failures were
+// reported, it only delegates the reporting to the former result reporter.
+// The original result reporter is restored in the destructor.
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+class GTEST_API_ HasNewFatalFailureHelper
+    : public TestPartResultReporterInterface {
+ public:
+  HasNewFatalFailureHelper();
+  ~HasNewFatalFailureHelper() override;
+  void ReportTestPartResult(const TestPartResult& result) override;
+  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
+ private:
+  bool has_new_fatal_failure_;
+  TestPartResultReporterInterface* original_reporter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+
+namespace testing {
+// Input to a parameterized test name generator, describing a test parameter.
+// Consists of the parameter value and the integer parameter index.
+template <class ParamType>
+struct TestParamInfo {
+  TestParamInfo(const ParamType& a_param, size_t an_index) :
+    param(a_param),
+    index(an_index) {}
+  ParamType param;
+  size_t index;
+};
+
+// A builtin parameterized test name generator which returns the result of
+// testing::PrintToString.
+struct PrintToStringParamName {
+  template <class ParamType>
+  std::string operator()(const TestParamInfo<ParamType>& info) const {
+    return PrintToString(info.param);
+  }
+};
+
+namespace internal {
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+// Utility Functions
+
+// Outputs a message explaining invalid registration of different
+// fixture class for the same test suite. This may happen when
+// TEST_P macro is used to define two tests with the same name
+// but in different namespaces.
+GTEST_API_ void ReportInvalidTestSuiteType(const char* test_suite_name,
+                                           CodeLocation code_location);
+
+template <typename> class ParamGeneratorInterface;
+template <typename> class ParamGenerator;
+
+// Interface for iterating over elements provided by an implementation
+// of ParamGeneratorInterface<T>.
+template <typename T>
+class ParamIteratorInterface {
+ public:
+  virtual ~ParamIteratorInterface() {}
+  // A pointer to the base generator instance.
+  // Used only for the purposes of iterator comparison
+  // to make sure that two iterators belong to the same generator.
+  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
+  // Advances iterator to point to the next element
+  // provided by the generator. The caller is responsible
+  // for not calling Advance() on an iterator equal to
+  // BaseGenerator()->End().
+  virtual void Advance() = 0;
+  // Clones the iterator object. Used for implementing copy semantics
+  // of ParamIterator<T>.
+  virtual ParamIteratorInterface* Clone() const = 0;
+  // Dereferences the current iterator and provides (read-only) access
+  // to the pointed value. It is the caller's responsibility not to call
+  // Current() on an iterator equal to BaseGenerator()->End().
+  // Used for implementing ParamGenerator<T>::operator*().
+  virtual const T* Current() const = 0;
+  // Determines whether the given iterator and other point to the same
+  // element in the sequence generated by the generator.
+  // Used for implementing ParamGenerator<T>::operator==().
+  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
+};
+
+// Class iterating over elements provided by an implementation of
+// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
+// and implements the const forward iterator concept.
+template <typename T>
+class ParamIterator {
+ public:
+  typedef T value_type;
+  typedef const T& reference;
+  typedef ptrdiff_t difference_type;
+
+  // ParamIterator assumes ownership of the impl_ pointer.
+  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
+  ParamIterator& operator=(const ParamIterator& other) {
+    if (this != &other)
+      impl_.reset(other.impl_->Clone());
+    return *this;
+  }
+
+  const T& operator*() const { return *impl_->Current(); }
+  const T* operator->() const { return impl_->Current(); }
+  // Prefix version of operator++.
+  ParamIterator& operator++() {
+    impl_->Advance();
+    return *this;
+  }
+  // Postfix version of operator++.
+  ParamIterator operator++(int /*unused*/) {
+    ParamIteratorInterface<T>* clone = impl_->Clone();
+    impl_->Advance();
+    return ParamIterator(clone);
+  }
+  bool operator==(const ParamIterator& other) const {
+    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
+  }
+  bool operator!=(const ParamIterator& other) const {
+    return !(*this == other);
+  }
+
+ private:
+  friend class ParamGenerator<T>;
+  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
+  std::unique_ptr<ParamIteratorInterface<T> > impl_;
+};
+
+// ParamGeneratorInterface<T> is the binary interface to access generators
+// defined in other translation units.
+template <typename T>
+class ParamGeneratorInterface {
+ public:
+  typedef T ParamType;
+
+  virtual ~ParamGeneratorInterface() {}
+
+  // Generator interface definition
+  virtual ParamIteratorInterface<T>* Begin() const = 0;
+  virtual ParamIteratorInterface<T>* End() const = 0;
+};
+
+// Wraps ParamGeneratorInterface<T> and provides general generator syntax
+// compatible with the STL Container concept.
+// This class implements copy initialization semantics and the contained
+// ParamGeneratorInterface<T> instance is shared among all copies
+// of the original object. This is possible because that instance is immutable.
+template<typename T>
+class ParamGenerator {
+ public:
+  typedef ParamIterator<T> iterator;
+
+  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
+  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
+
+  ParamGenerator& operator=(const ParamGenerator& other) {
+    impl_ = other.impl_;
+    return *this;
+  }
+
+  iterator begin() const { return iterator(impl_->Begin()); }
+  iterator end() const { return iterator(impl_->End()); }
+
+ private:
+  std::shared_ptr<const ParamGeneratorInterface<T> > impl_;
+};
+
+// Generates values from a range of two comparable values. Can be used to
+// generate sequences of user-defined types that implement operator+() and
+// operator<().
+// This class is used in the Range() function.
+template <typename T, typename IncrementT>
+class RangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  RangeGenerator(T begin, T end, IncrementT step)
+      : begin_(begin), end_(end),
+        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
+  ~RangeGenerator() override {}
+
+  ParamIteratorInterface<T>* Begin() const override {
+    return new Iterator(this, begin_, 0, step_);
+  }
+  ParamIteratorInterface<T>* End() const override {
+    return new Iterator(this, end_, end_index_, step_);
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
+             IncrementT step)
+        : base_(base), value_(value), index_(index), step_(step) {}
+    ~Iterator() override {}
+
+    const ParamGeneratorInterface<T>* BaseGenerator() const override {
+      return base_;
+    }
+    void Advance() override {
+      value_ = static_cast<T>(value_ + step_);
+      index_++;
+    }
+    ParamIteratorInterface<T>* Clone() const override {
+      return new Iterator(*this);
+    }
+    const T* Current() const override { return &value_; }
+    bool Equals(const ParamIteratorInterface<T>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const int other_index =
+          CheckedDowncastToActualType<const Iterator>(&other)->index_;
+      return index_ == other_index;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : ParamIteratorInterface<T>(),
+          base_(other.base_), value_(other.value_), index_(other.index_),
+          step_(other.step_) {}
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<T>* const base_;
+    T value_;
+    int index_;
+    const IncrementT step_;
+  };  // class RangeGenerator::Iterator
+
+  static int CalculateEndIndex(const T& begin,
+                               const T& end,
+                               const IncrementT& step) {
+    int end_index = 0;
+    for (T i = begin; i < end; i = static_cast<T>(i + step))
+      end_index++;
+    return end_index;
+  }
+
+  // No implementation - assignment is unsupported.
+  void operator=(const RangeGenerator& other);
+
+  const T begin_;
+  const T end_;
+  const IncrementT step_;
+  // The index for the end() iterator. All the elements in the generated
+  // sequence are indexed (0-based) to aid iterator comparison.
+  const int end_index_;
+};  // class RangeGenerator
+
+
+// Generates values from a pair of STL-style iterators. Used in the
+// ValuesIn() function. The elements are copied from the source range
+// since the source can be located on the stack, and the generator
+// is likely to persist beyond that stack frame.
+template <typename T>
+class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  template <typename ForwardIterator>
+  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
+      : container_(begin, end) {}
+  ~ValuesInIteratorRangeGenerator() override {}
+
+  ParamIteratorInterface<T>* Begin() const override {
+    return new Iterator(this, container_.begin());
+  }
+  ParamIteratorInterface<T>* End() const override {
+    return new Iterator(this, container_.end());
+  }
+
+ private:
+  typedef typename ::std::vector<T> ContainerType;
+
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base,
+             typename ContainerType::const_iterator iterator)
+        : base_(base), iterator_(iterator) {}
+    ~Iterator() override {}
+
+    const ParamGeneratorInterface<T>* BaseGenerator() const override {
+      return base_;
+    }
+    void Advance() override {
+      ++iterator_;
+      value_.reset();
+    }
+    ParamIteratorInterface<T>* Clone() const override {
+      return new Iterator(*this);
+    }
+    // We need to use cached value referenced by iterator_ because *iterator_
+    // can return a temporary object (and of type other then T), so just
+    // having "return &*iterator_;" doesn't work.
+    // value_ is updated here and not in Advance() because Advance()
+    // can advance iterator_ beyond the end of the range, and we cannot
+    // detect that fact. The client code, on the other hand, is
+    // responsible for not calling Current() on an out-of-range iterator.
+    const T* Current() const override {
+      if (value_.get() == nullptr) value_.reset(new T(*iterator_));
+      return value_.get();
+    }
+    bool Equals(const ParamIteratorInterface<T>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      return iterator_ ==
+          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+          // The explicit constructor call suppresses a false warning
+          // emitted by gcc when supplied with the -Wextra option.
+        : ParamIteratorInterface<T>(),
+          base_(other.base_),
+          iterator_(other.iterator_) {}
+
+    const ParamGeneratorInterface<T>* const base_;
+    typename ContainerType::const_iterator iterator_;
+    // A cached value of *iterator_. We keep it here to allow access by
+    // pointer in the wrapping iterator's operator->().
+    // value_ needs to be mutable to be accessed in Current().
+    // Use of std::unique_ptr helps manage cached value's lifetime,
+    // which is bound by the lifespan of the iterator itself.
+    mutable std::unique_ptr<const T> value_;
+  };  // class ValuesInIteratorRangeGenerator::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const ValuesInIteratorRangeGenerator& other);
+
+  const ContainerType container_;
+};  // class ValuesInIteratorRangeGenerator
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Default parameterized test name generator, returns a string containing the
+// integer test parameter index.
+template <class ParamType>
+std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
+  Message name_stream;
+  name_stream << info.index;
+  return name_stream.GetString();
+}
+
+template <typename T = int>
+void TestNotEmpty() {
+  static_assert(sizeof(T) == 0, "Empty arguments are not allowed.");
+}
+template <typename T = int>
+void TestNotEmpty(const T&) {}
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Stores a parameter value and later creates tests parameterized with that
+// value.
+template <class TestClass>
+class ParameterizedTestFactory : public TestFactoryBase {
+ public:
+  typedef typename TestClass::ParamType ParamType;
+  explicit ParameterizedTestFactory(ParamType parameter) :
+      parameter_(parameter) {}
+  Test* CreateTest() override {
+    TestClass::SetParam(&parameter_);
+    return new TestClass();
+  }
+
+ private:
+  const ParamType parameter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactoryBase is a base class for meta-factories that create
+// test factories for passing into MakeAndRegisterTestInfo function.
+template <class ParamType>
+class TestMetaFactoryBase {
+ public:
+  virtual ~TestMetaFactoryBase() {}
+
+  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactory creates test factories for passing into
+// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
+// ownership of test factory pointer, same factory object cannot be passed
+// into that method twice. But ParameterizedTestSuiteInfo is going to call
+// it for each Test/Parameter value combination. Thus it needs meta factory
+// creator class.
+template <class TestSuite>
+class TestMetaFactory
+    : public TestMetaFactoryBase<typename TestSuite::ParamType> {
+ public:
+  using ParamType = typename TestSuite::ParamType;
+
+  TestMetaFactory() {}
+
+  TestFactoryBase* CreateTestFactory(ParamType parameter) override {
+    return new ParameterizedTestFactory<TestSuite>(parameter);
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestSuiteInfoBase is a generic interface
+// to ParameterizedTestSuiteInfo classes. ParameterizedTestSuiteInfoBase
+// accumulates test information provided by TEST_P macro invocations
+// and generators provided by INSTANTIATE_TEST_SUITE_P macro invocations
+// and uses that information to register all resulting test instances
+// in RegisterTests method. The ParameterizeTestSuiteRegistry class holds
+// a collection of pointers to the ParameterizedTestSuiteInfo objects
+// and calls RegisterTests() on each of them when asked.
+class ParameterizedTestSuiteInfoBase {
+ public:
+  virtual ~ParameterizedTestSuiteInfoBase() {}
+
+  // Base part of test suite name for display purposes.
+  virtual const std::string& GetTestSuiteName() const = 0;
+  // Test suite id to verify identity.
+  virtual TypeId GetTestSuiteTypeId() const = 0;
+  // UnitTest class invokes this method to register tests in this
+  // test suite right before running them in RUN_ALL_TESTS macro.
+  // This method should not be called more than once on any single
+  // instance of a ParameterizedTestSuiteInfoBase derived class.
+  virtual void RegisterTests() = 0;
+
+ protected:
+  ParameterizedTestSuiteInfoBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfoBase);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Report a the name of a test_suit as safe to ignore
+// as the side effect of construction of this type.
+struct GTEST_API_ MarkAsIgnored {
+  explicit MarkAsIgnored(const char* test_suite);
+};
+
+GTEST_API_ void InsertSyntheticTestCase(const std::string& name,
+                                        CodeLocation location, bool has_test_p);
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestSuiteInfo accumulates tests obtained from TEST_P
+// macro invocations for a particular test suite and generators
+// obtained from INSTANTIATE_TEST_SUITE_P macro invocations for that
+// test suite. It registers tests with all values generated by all
+// generators when asked.
+template <class TestSuite>
+class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
+ public:
+  // ParamType and GeneratorCreationFunc are private types but are required
+  // for declarations of public methods AddTestPattern() and
+  // AddTestSuiteInstantiation().
+  using ParamType = typename TestSuite::ParamType;
+  // A function that returns an instance of appropriate generator type.
+  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
+  using ParamNameGeneratorFunc = std::string(const TestParamInfo<ParamType>&);
+
+  explicit ParameterizedTestSuiteInfo(const char* name,
+                                      CodeLocation code_location)
+      : test_suite_name_(name), code_location_(code_location) {}
+
+  // Test suite base name for display purposes.
+  const std::string& GetTestSuiteName() const override {
+    return test_suite_name_;
+  }
+  // Test suite id to verify identity.
+  TypeId GetTestSuiteTypeId() const override { return GetTypeId<TestSuite>(); }
+  // TEST_P macro uses AddTestPattern() to record information
+  // about a single test in a LocalTestInfo structure.
+  // test_suite_name is the base name of the test suite (without invocation
+  // prefix). test_base_name is the name of an individual test without
+  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
+  // test suite base name and DoBar is test base name.
+  void AddTestPattern(const char* test_suite_name, const char* test_base_name,
+                      TestMetaFactoryBase<ParamType>* meta_factory,
+                      CodeLocation code_location) {
+    tests_.push_back(std::shared_ptr<TestInfo>(new TestInfo(
+        test_suite_name, test_base_name, meta_factory, code_location)));
+  }
+  // INSTANTIATE_TEST_SUITE_P macro uses AddGenerator() to record information
+  // about a generator.
+  int AddTestSuiteInstantiation(const std::string& instantiation_name,
+                                GeneratorCreationFunc* func,
+                                ParamNameGeneratorFunc* name_func,
+                                const char* file, int line) {
+    instantiations_.push_back(
+        InstantiationInfo(instantiation_name, func, name_func, file, line));
+    return 0;  // Return value used only to run this method in namespace scope.
+  }
+  // UnitTest class invokes this method to register tests in this test suite
+  // right before running tests in RUN_ALL_TESTS macro.
+  // This method should not be called more than once on any single
+  // instance of a ParameterizedTestSuiteInfoBase derived class.
+  // UnitTest has a guard to prevent from calling this method more than once.
+  void RegisterTests() override {
+    bool generated_instantiations = false;
+
+    for (typename TestInfoContainer::iterator test_it = tests_.begin();
+         test_it != tests_.end(); ++test_it) {
+      std::shared_ptr<TestInfo> test_info = *test_it;
+      for (typename InstantiationContainer::iterator gen_it =
+               instantiations_.begin(); gen_it != instantiations_.end();
+               ++gen_it) {
+        const std::string& instantiation_name = gen_it->name;
+        ParamGenerator<ParamType> generator((*gen_it->generator)());
+        ParamNameGeneratorFunc* name_func = gen_it->name_func;
+        const char* file = gen_it->file;
+        int line = gen_it->line;
+
+        std::string test_suite_name;
+        if ( !instantiation_name.empty() )
+          test_suite_name = instantiation_name + "/";
+        test_suite_name += test_info->test_suite_base_name;
+
+        size_t i = 0;
+        std::set<std::string> test_param_names;
+        for (typename ParamGenerator<ParamType>::iterator param_it =
+                 generator.begin();
+             param_it != generator.end(); ++param_it, ++i) {
+          generated_instantiations = true;
+
+          Message test_name_stream;
+
+          std::string param_name = name_func(
+              TestParamInfo<ParamType>(*param_it, i));
+
+          GTEST_CHECK_(IsValidParamName(param_name))
+              << "Parameterized test name '" << param_name
+              << "' is invalid, in " << file
+              << " line " << line << std::endl;
+
+          GTEST_CHECK_(test_param_names.count(param_name) == 0)
+              << "Duplicate parameterized test name '" << param_name
+              << "', in " << file << " line " << line << std::endl;
+
+          test_param_names.insert(param_name);
+
+          if (!test_info->test_base_name.empty()) {
+            test_name_stream << test_info->test_base_name << "/";
+          }
+          test_name_stream << param_name;
+          MakeAndRegisterTestInfo(
+              test_suite_name.c_str(), test_name_stream.GetString().c_str(),
+              nullptr,  // No type parameter.
+              PrintToString(*param_it).c_str(), test_info->code_location,
+              GetTestSuiteTypeId(),
+              SuiteApiResolver<TestSuite>::GetSetUpCaseOrSuite(file, line),
+              SuiteApiResolver<TestSuite>::GetTearDownCaseOrSuite(file, line),
+              test_info->test_meta_factory->CreateTestFactory(*param_it));
+        }  // for param_it
+      }  // for gen_it
+    }  // for test_it
+
+    if (!generated_instantiations) {
+      // There are no generaotrs, or they all generate nothing ...
+      InsertSyntheticTestCase(GetTestSuiteName(), code_location_,
+                              !tests_.empty());
+    }
+  }    // RegisterTests
+
+ private:
+  // LocalTestInfo structure keeps information about a single test registered
+  // with TEST_P macro.
+  struct TestInfo {
+    TestInfo(const char* a_test_suite_base_name, const char* a_test_base_name,
+             TestMetaFactoryBase<ParamType>* a_test_meta_factory,
+             CodeLocation a_code_location)
+        : test_suite_base_name(a_test_suite_base_name),
+          test_base_name(a_test_base_name),
+          test_meta_factory(a_test_meta_factory),
+          code_location(a_code_location) {}
+
+    const std::string test_suite_base_name;
+    const std::string test_base_name;
+    const std::unique_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
+    const CodeLocation code_location;
+  };
+  using TestInfoContainer = ::std::vector<std::shared_ptr<TestInfo> >;
+  // Records data received from INSTANTIATE_TEST_SUITE_P macros:
+  //  <Instantiation name, Sequence generator creation function,
+  //     Name generator function, Source file, Source line>
+  struct InstantiationInfo {
+      InstantiationInfo(const std::string &name_in,
+                        GeneratorCreationFunc* generator_in,
+                        ParamNameGeneratorFunc* name_func_in,
+                        const char* file_in,
+                        int line_in)
+          : name(name_in),
+            generator(generator_in),
+            name_func(name_func_in),
+            file(file_in),
+            line(line_in) {}
+
+      std::string name;
+      GeneratorCreationFunc* generator;
+      ParamNameGeneratorFunc* name_func;
+      const char* file;
+      int line;
+  };
+  typedef ::std::vector<InstantiationInfo> InstantiationContainer;
+
+  static bool IsValidParamName(const std::string& name) {
+    // Check for empty string
+    if (name.empty())
+      return false;
+
+    // Check for invalid characters
+    for (std::string::size_type index = 0; index < name.size(); ++index) {
+      if (!IsAlNum(name[index]) && name[index] != '_')
+        return false;
+    }
+
+    return true;
+  }
+
+  const std::string test_suite_name_;
+  CodeLocation code_location_;
+  TestInfoContainer tests_;
+  InstantiationContainer instantiations_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfo);
+};  // class ParameterizedTestSuiteInfo
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+template <class TestCase>
+using ParameterizedTestCaseInfo = ParameterizedTestSuiteInfo<TestCase>;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestSuiteRegistry contains a map of
+// ParameterizedTestSuiteInfoBase classes accessed by test suite names. TEST_P
+// and INSTANTIATE_TEST_SUITE_P macros use it to locate their corresponding
+// ParameterizedTestSuiteInfo descriptors.
+class ParameterizedTestSuiteRegistry {
+ public:
+  ParameterizedTestSuiteRegistry() {}
+  ~ParameterizedTestSuiteRegistry() {
+    for (auto& test_suite_info : test_suite_infos_) {
+      delete test_suite_info;
+    }
+  }
+
+  // Looks up or creates and returns a structure containing information about
+  // tests and instantiations of a particular test suite.
+  template <class TestSuite>
+  ParameterizedTestSuiteInfo<TestSuite>* GetTestSuitePatternHolder(
+      const char* test_suite_name, CodeLocation code_location) {
+    ParameterizedTestSuiteInfo<TestSuite>* typed_test_info = nullptr;
+    for (auto& test_suite_info : test_suite_infos_) {
+      if (test_suite_info->GetTestSuiteName() == test_suite_name) {
+        if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
+          // Complain about incorrect usage of Google Test facilities
+          // and terminate the program since we cannot guaranty correct
+          // test suite setup and tear-down in this case.
+          ReportInvalidTestSuiteType(test_suite_name, code_location);
+          posix::Abort();
+        } else {
+          // At this point we are sure that the object we found is of the same
+          // type we are looking for, so we downcast it to that type
+          // without further checks.
+          typed_test_info = CheckedDowncastToActualType<
+              ParameterizedTestSuiteInfo<TestSuite> >(test_suite_info);
+        }
+        break;
+      }
+    }
+    if (typed_test_info == nullptr) {
+      typed_test_info = new ParameterizedTestSuiteInfo<TestSuite>(
+          test_suite_name, code_location);
+      test_suite_infos_.push_back(typed_test_info);
+    }
+    return typed_test_info;
+  }
+  void RegisterTests() {
+    for (auto& test_suite_info : test_suite_infos_) {
+      test_suite_info->RegisterTests();
+    }
+  }
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  template <class TestCase>
+  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
+      const char* test_case_name, CodeLocation code_location) {
+    return GetTestSuitePatternHolder<TestCase>(test_case_name, code_location);
+  }
+
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+ private:
+  using TestSuiteInfoContainer = ::std::vector<ParameterizedTestSuiteInfoBase*>;
+
+  TestSuiteInfoContainer test_suite_infos_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteRegistry);
+};
+
+// Keep track of what type-parameterized test suite are defined and
+// where as well as which are intatiated. This allows susequently
+// identifying suits that are defined but never used.
+class TypeParameterizedTestSuiteRegistry {
+ public:
+  // Add a suite definition
+  void RegisterTestSuite(const char* test_suite_name,
+                         CodeLocation code_location);
+
+  // Add an instantiation of a suit.
+  void RegisterInstantiation(const char* test_suite_name);
+
+  // For each suit repored as defined but not reported as instantiation,
+  // emit a test that reports that fact (configurably, as an error).
+  void CheckForInstantiations();
+
+ private:
+  struct TypeParameterizedTestSuiteInfo {
+    explicit TypeParameterizedTestSuiteInfo(CodeLocation c)
+        : code_location(c), instantiated(false) {}
+
+    CodeLocation code_location;
+    bool instantiated;
+  };
+
+  std::map<std::string, TypeParameterizedTestSuiteInfo> suites_;
+};
+
+}  // namespace internal
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container);
+
+namespace internal {
+// Used in the Values() function to provide polymorphic capabilities.
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4100)
+#endif
+
+template <typename... Ts>
+class ValueArray {
+ public:
+  explicit ValueArray(Ts... v) : v_(FlatTupleConstructTag{}, std::move(v)...) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {  // NOLINT
+    return ValuesIn(MakeVector<T>(MakeIndexSequence<sizeof...(Ts)>()));
+  }
+
+ private:
+  template <typename T, size_t... I>
+  std::vector<T> MakeVector(IndexSequence<I...>) const {
+    return std::vector<T>{static_cast<T>(v_.template Get<I>())...};
+  }
+
+  FlatTuple<Ts...> v_;
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+template <typename... T>
+class CartesianProductGenerator
+    : public ParamGeneratorInterface<::std::tuple<T...>> {
+ public:
+  typedef ::std::tuple<T...> ParamType;
+
+  CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
+      : generators_(g) {}
+  ~CartesianProductGenerator() override {}
+
+  ParamIteratorInterface<ParamType>* Begin() const override {
+    return new Iterator(this, generators_, false);
+  }
+  ParamIteratorInterface<ParamType>* End() const override {
+    return new Iterator(this, generators_, true);
+  }
+
+ private:
+  template <class I>
+  class IteratorImpl;
+  template <size_t... I>
+  class IteratorImpl<IndexSequence<I...>>
+      : public ParamIteratorInterface<ParamType> {
+   public:
+    IteratorImpl(const ParamGeneratorInterface<ParamType>* base,
+             const std::tuple<ParamGenerator<T>...>& generators, bool is_end)
+        : base_(base),
+          begin_(std::get<I>(generators).begin()...),
+          end_(std::get<I>(generators).end()...),
+          current_(is_end ? end_ : begin_) {
+      ComputeCurrentValue();
+    }
+    ~IteratorImpl() override {}
+
+    const ParamGeneratorInterface<ParamType>* BaseGenerator() const override {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    void Advance() override {
+      assert(!AtEnd());
+      // Advance the last iterator.
+      ++std::get<sizeof...(T) - 1>(current_);
+      // if that reaches end, propagate that up.
+      AdvanceIfEnd<sizeof...(T) - 1>();
+      ComputeCurrentValue();
+    }
+    ParamIteratorInterface<ParamType>* Clone() const override {
+      return new IteratorImpl(*this);
+    }
+
+    const ParamType* Current() const override { return current_value_.get(); }
+
+    bool Equals(const ParamIteratorInterface<ParamType>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const IteratorImpl* typed_other =
+          CheckedDowncastToActualType<const IteratorImpl>(&other);
+
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      if (AtEnd() && typed_other->AtEnd()) return true;
+
+      bool same = true;
+      bool dummy[] = {
+          (same = same && std::get<I>(current_) ==
+                              std::get<I>(typed_other->current_))...};
+      (void)dummy;
+      return same;
+    }
+
+   private:
+    template <size_t ThisI>
+    void AdvanceIfEnd() {
+      if (std::get<ThisI>(current_) != std::get<ThisI>(end_)) return;
+
+      bool last = ThisI == 0;
+      if (last) {
+        // We are done. Nothing else to propagate.
+        return;
+      }
+
+      constexpr size_t NextI = ThisI - (ThisI != 0);
+      std::get<ThisI>(current_) = std::get<ThisI>(begin_);
+      ++std::get<NextI>(current_);
+      AdvanceIfEnd<NextI>();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = std::make_shared<ParamType>(*std::get<I>(current_)...);
+    }
+    bool AtEnd() const {
+      bool at_end = false;
+      bool dummy[] = {
+          (at_end = at_end || std::get<I>(current_) == std::get<I>(end_))...};
+      (void)dummy;
+      return at_end;
+    }
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    std::tuple<typename ParamGenerator<T>::iterator...> begin_;
+    std::tuple<typename ParamGenerator<T>::iterator...> end_;
+    std::tuple<typename ParamGenerator<T>::iterator...> current_;
+    std::shared_ptr<ParamType> current_value_;
+  };
+
+  using Iterator = IteratorImpl<typename MakeIndexSequence<sizeof...(T)>::type>;
+
+  std::tuple<ParamGenerator<T>...> generators_;
+};
+
+template <class... Gen>
+class CartesianProductHolder {
+ public:
+  CartesianProductHolder(const Gen&... g) : generators_(g...) {}
+  template <typename... T>
+  operator ParamGenerator<::std::tuple<T...>>() const {
+    return ParamGenerator<::std::tuple<T...>>(
+        new CartesianProductGenerator<T...>(generators_));
+  }
+
+ private:
+  std::tuple<Gen...> generators_;
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test suite is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test suite FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_SUITE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test suite StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_SUITE_P(StringSequence, StringTest, ValuesIn(strings));
+//
+// This instantiates tests from test suite StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_SUITE_P(CharSequence,
+//                          StlStringTest,
+//                          ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_SUITE_P(CharSequence2,
+//                          CharTest,
+//                          ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+    typename std::iterator_traits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename std::iterator_traits<ForwardIterator>::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test suite BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_SUITE_P(NumSequence,
+//                          BarTest,
+//                          Values("one", "two", "three"));
+//
+// This instantiates tests from test suite BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_SUITE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+//
+template <typename... T>
+internal::ValueArray<T...> Values(T... v) {
+  return internal::ValueArray<T...>(std::move(v)...);
+}
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test suite FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_SUITE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     std::tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Example:
+//
+// This will instantiate tests in test suite AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<std::tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
+//                          Combine(Values("cat", "dog"),
+//                                  Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<std::tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     std::tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_SUITE_P(TwoBoolSequence, FlagDependentTest,
+//                          Combine(Bool(), Bool()));
+//
+template <typename... Generator>
+internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
+  return internal::CartesianProductHolder<Generator...>(g...);
+}
+
+#define TEST_P(test_suite_name, test_name)                                     \
+  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
+      : public test_suite_name {                                               \
+   public:                                                                     \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
+    void TestBody() override;                                                  \
+                                                                               \
+   private:                                                                    \
+    static int AddToRegistry() {                                               \
+      ::testing::UnitTest::GetInstance()                                       \
+          ->parameterized_test_registry()                                      \
+          .GetTestSuitePatternHolder<test_suite_name>(                         \
+              GTEST_STRINGIFY_(test_suite_name),                               \
+              ::testing::internal::CodeLocation(__FILE__, __LINE__))           \
+          ->AddTestPattern(                                                    \
+              GTEST_STRINGIFY_(test_suite_name), GTEST_STRINGIFY_(test_name),  \
+              new ::testing::internal::TestMetaFactory<GTEST_TEST_CLASS_NAME_( \
+                  test_suite_name, test_name)>(),                              \
+              ::testing::internal::CodeLocation(__FILE__, __LINE__));          \
+      return 0;                                                                \
+    }                                                                          \
+    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
+                                                           test_name));        \
+  };                                                                           \
+  int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
+                             test_name)::gtest_registering_dummy_ =            \
+      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry();     \
+  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
+
+// The last argument to INSTANTIATE_TEST_SUITE_P allows the user to specify
+// generator and an optional function or functor that generates custom test name
+// suffixes based on the test parameters. Such a function or functor should
+// accept one argument of type testing::TestParamInfo<class ParamType>, and
+// return std::string.
+//
+// testing::PrintToStringParamName is a builtin test suffix generator that
+// returns the value of testing::PrintToString(GetParam()).
+//
+// Note: test names must be non-empty, unique, and may only contain ASCII
+// alphanumeric characters or underscore. Because PrintToString adds quotes
+// to std::string and C strings, it won't work for these types.
+
+#define GTEST_EXPAND_(arg) arg
+#define GTEST_GET_FIRST_(first, ...) first
+#define GTEST_GET_SECOND_(first, second, ...) second
+
+#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)                \
+  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>      \
+      gtest_##prefix##test_suite_name##_EvalGenerator_() {                    \
+    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));        \
+  }                                                                           \
+  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(   \
+      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {     \
+    if (::testing::internal::AlwaysFalse()) {                                 \
+      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(      \
+          __VA_ARGS__,                                                        \
+          ::testing::internal::DefaultParamName<test_suite_name::ParamType>,  \
+          DUMMY_PARAM_)));                                                    \
+      auto t = std::make_tuple(__VA_ARGS__);                                  \
+      static_assert(std::tuple_size<decltype(t)>::value <= 2,                 \
+                    "Too Many Args!");                                        \
+    }                                                                         \
+    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                 \
+        __VA_ARGS__,                                                          \
+        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,    \
+        DUMMY_PARAM_))))(info);                                               \
+  }                                                                           \
+  static int gtest_##prefix##test_suite_name##_dummy_                         \
+      GTEST_ATTRIBUTE_UNUSED_ =                                               \
+          ::testing::UnitTest::GetInstance()                                  \
+              ->parameterized_test_registry()                                 \
+              .GetTestSuitePatternHolder<test_suite_name>(                    \
+                  GTEST_STRINGIFY_(test_suite_name),                          \
+                  ::testing::internal::CodeLocation(__FILE__, __LINE__))      \
+              ->AddTestSuiteInstantiation(                                    \
+                  GTEST_STRINGIFY_(prefix),                                   \
+                  &gtest_##prefix##test_suite_name##_EvalGenerator_,          \
+                  &gtest_##prefix##test_suite_name##_EvalGenerateName_,       \
+                  __FILE__, __LINE__)
+
+
+// Allow Marking a Parameterized test class as not needing to be instantiated.
+#define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T)                   \
+  namespace gtest_do_not_use_outside_namespace_scope {}                   \
+  static const ::testing::internal::MarkAsIgnored gtest_allow_ignore_##T( \
+      GTEST_STRINGIFY_(T))
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define INSTANTIATE_TEST_CASE_P                                            \
+  static_assert(::testing::internal::InstantiateTestCase_P_IsDeprecated(), \
+                "");                                                       \
+  INSTANTIATE_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Google C++ Testing and Mocking Framework definitions useful in production code.
+// GOOGLETEST_CM0003 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
+
+// When you need to test the private or protected members of a class,
+// use the FRIEND_TEST macro to declare your tests as friends of the
+// class.  For example:
+//
+// class MyClass {
+//  private:
+//   void PrivateMethod();
+//   FRIEND_TEST(MyClassTest, PrivateMethodWorks);
+// };
+//
+// class MyClassTest : public testing::Test {
+//   // ...
+// };
+//
+// TEST_F(MyClassTest, PrivateMethodWorks) {
+//   // Can call MyClass::PrivateMethod() here.
+// }
+//
+// Note: The test class must be in the same namespace as the class being tested.
+// For example, putting MyClassTest in an anonymous namespace will not work.
+
+#define FRIEND_TEST(test_case_name, test_name)\
+friend class test_case_name##_##test_name##_Test
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+
+// This header implements typed tests and type-parameterized tests.
+
+// Typed (aka type-driven) tests repeat the same test for types in a
+// list.  You must know which types you want to test with when writing
+// typed tests. Here's how you do it:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+
+// Next, associate a list of types with the test suite, which will be
+// repeated for each type in the list.  The typedef is necessary for
+// the macro to parse correctly.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_SUITE(FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   TYPED_TEST_SUITE(FooTest, int);
+
+// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
+// tests for this test suite as you want.
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to the special name TypeParam to get the type
+  // parameter.  Since we are inside a derived class template, C++ requires
+  // us to visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the TestFixture::
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the "typename
+  // TestFixture::" prefix.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+
+// TYPED_TEST_SUITE takes an optional third argument which allows to specify a
+// class that generates custom test name suffixes based on the type. This should
+// be a class which has a static template function GetName(int index) returning
+// a string for each type. The provided integer index equals the index of the
+// type in the provided type list. In many cases the index can be ignored.
+//
+// For example:
+//   class MyTypeNames {
+//    public:
+//     template <typename T>
+//     static std::string GetName(int) {
+//       if (std::is_same<T, char>()) return "char";
+//       if (std::is_same<T, int>()) return "int";
+//       if (std::is_same<T, unsigned int>()) return "unsignedInt";
+//     }
+//   };
+//   TYPED_TEST_SUITE(FooTest, MyTypes, MyTypeNames);
+
+#endif  // 0
+
+// Type-parameterized tests are abstract test patterns parameterized
+// by a type.  Compared with typed tests, type-parameterized tests
+// allow you to define the test pattern without knowing what the type
+// parameters are.  The defined pattern can be instantiated with
+// different types any number of times, in any number of translation
+// units.
+//
+// If you are designing an interface or concept, you can define a
+// suite of type-parameterized tests to verify properties that any
+// valid implementation of the interface/concept should have.  Then,
+// each implementation can easily instantiate the test suite to verify
+// that it conforms to the requirements, without having to write
+// similar tests repeatedly.  Here's an example:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+  ...
+};
+
+// Next, declare that you will define a type-parameterized test suite
+// (the _P suffix is for "parameterized" or "pattern", whichever you
+// prefer):
+TYPED_TEST_SUITE_P(FooTest);
+
+// Then, use TYPED_TEST_P() to define as many type-parameterized tests
+// for this type-parameterized test suite as you want.
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+
+// Now the tricky part: you need to register all test patterns before
+// you can instantiate them.  The first argument of the macro is the
+// test suite name; the rest are the names of the tests in this test
+// case.
+REGISTER_TYPED_TEST_SUITE_P(FooTest,
+                            DoesBlah, HasPropertyA);
+
+// Finally, you are free to instantiate the pattern with the types you
+// want.  If you put the above code in a header file, you can #include
+// it in multiple C++ source files and instantiate it multiple times.
+//
+// To distinguish different instances of the pattern, the first
+// argument to the INSTANTIATE_* macro is a prefix that will be added
+// to the actual test suite name.  Remember to pick unique prefixes for
+// different instances.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, int);
+//
+// Similar to the optional argument of TYPED_TEST_SUITE above,
+// INSTANTIATE_TEST_SUITE_P takes an optional fourth argument which allows to
+// generate custom names.
+//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes, MyTypeNames);
+
+#endif  // 0
+
+
+// Implements typed tests.
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the typedef for the type parameters of the
+// given test suite.
+#define GTEST_TYPE_PARAMS_(TestSuiteName) gtest_type_params_##TestSuiteName##_
+
+// Expands to the name of the typedef for the NameGenerator, responsible for
+// creating the suffixes of the name.
+#define GTEST_NAME_GENERATOR_(TestSuiteName) \
+  gtest_type_params_##TestSuiteName##_NameGenerator
+
+#define TYPED_TEST_SUITE(CaseName, Types, ...)                          \
+  typedef ::testing::internal::GenerateTypeList<Types>::type            \
+      GTEST_TYPE_PARAMS_(CaseName);                                     \
+  typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type \
+      GTEST_NAME_GENERATOR_(CaseName)
+
+#define TYPED_TEST(CaseName, TestName)                                        \
+  static_assert(sizeof(GTEST_STRINGIFY_(TestName)) > 1,                       \
+                "test-name must not be empty");                               \
+  template <typename gtest_TypeParam_>                                        \
+  class GTEST_TEST_CLASS_NAME_(CaseName, TestName)                            \
+      : public CaseName<gtest_TypeParam_> {                                   \
+   private:                                                                   \
+    typedef CaseName<gtest_TypeParam_> TestFixture;                           \
+    typedef gtest_TypeParam_ TypeParam;                                       \
+    void TestBody() override;                                                 \
+  };                                                                          \
+  static bool gtest_##CaseName##_##TestName##_registered_                     \
+      GTEST_ATTRIBUTE_UNUSED_ = ::testing::internal::TypeParameterizedTest<   \
+          CaseName,                                                           \
+          ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName,   \
+                                                                  TestName)>, \
+          GTEST_TYPE_PARAMS_(                                                 \
+              CaseName)>::Register("",                                        \
+                                   ::testing::internal::CodeLocation(         \
+                                       __FILE__, __LINE__),                   \
+                                   GTEST_STRINGIFY_(CaseName),                \
+                                   GTEST_STRINGIFY_(TestName), 0,             \
+                                   ::testing::internal::GenerateNames<        \
+                                       GTEST_NAME_GENERATOR_(CaseName),       \
+                                       GTEST_TYPE_PARAMS_(CaseName)>());      \
+  template <typename gtest_TypeParam_>                                        \
+  void GTEST_TEST_CLASS_NAME_(CaseName,                                       \
+                              TestName)<gtest_TypeParam_>::TestBody()
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define TYPED_TEST_CASE                                                \
+  static_assert(::testing::internal::TypedTestCaseIsDeprecated(), ""); \
+  TYPED_TEST_SUITE
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// Implements type-parameterized tests.
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the namespace name that the type-parameterized tests for
+// the given type-parameterized test suite are defined in.  The exact
+// name of the namespace is subject to change without notice.
+#define GTEST_SUITE_NAMESPACE_(TestSuiteName) gtest_suite_##TestSuiteName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the variable used to remember the names of
+// the defined tests in the given test suite.
+#define GTEST_TYPED_TEST_SUITE_P_STATE_(TestSuiteName) \
+  gtest_typed_test_suite_p_state_##TestSuiteName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
+//
+// Expands to the name of the variable used to remember the names of
+// the registered tests in the given test suite.
+#define GTEST_REGISTERED_TEST_NAMES_(TestSuiteName) \
+  gtest_registered_test_names_##TestSuiteName##_
+
+// The variables defined in the type-parameterized test macros are
+// static as typically these macros are used in a .h file that can be
+// #included in multiple translation units linked together.
+#define TYPED_TEST_SUITE_P(SuiteName)              \
+  static ::testing::internal::TypedTestSuitePState \
+      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define TYPED_TEST_CASE_P                                                 \
+  static_assert(::testing::internal::TypedTestCase_P_IsDeprecated(), ""); \
+  TYPED_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+#define TYPED_TEST_P(SuiteName, TestName)                             \
+  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                       \
+    template <typename gtest_TypeParam_>                              \
+    class TestName : public SuiteName<gtest_TypeParam_> {             \
+     private:                                                         \
+      typedef SuiteName<gtest_TypeParam_> TestFixture;                \
+      typedef gtest_TypeParam_ TypeParam;                             \
+      void TestBody() override;                                       \
+    };                                                                \
+    static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
+        GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName(       \
+            __FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName),          \
+            GTEST_STRINGIFY_(TestName));                              \
+  }                                                                   \
+  template <typename gtest_TypeParam_>                                \
+  void GTEST_SUITE_NAMESPACE_(                                        \
+      SuiteName)::TestName<gtest_TypeParam_>::TestBody()
+
+// Note: this won't work correctly if the trailing arguments are macros.
+#define REGISTER_TYPED_TEST_SUITE_P(SuiteName, ...)                         \
+  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                             \
+    typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_;    \
+  }                                                                         \
+  static const char* const GTEST_REGISTERED_TEST_NAMES_(                    \
+      SuiteName) GTEST_ATTRIBUTE_UNUSED_ =                                  \
+      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).VerifyRegisteredTestNames( \
+          GTEST_STRINGIFY_(SuiteName), __FILE__, __LINE__, #__VA_ARGS__)
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define REGISTER_TYPED_TEST_CASE_P                                           \
+  static_assert(::testing::internal::RegisterTypedTestCase_P_IsDeprecated(), \
+                "");                                                         \
+  REGISTER_TYPED_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+#define INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, SuiteName, Types, ...)       \
+  static_assert(sizeof(GTEST_STRINGIFY_(Prefix)) > 1,                       \
+                "test-suit-prefix must not be empty");                      \
+  static bool gtest_##Prefix##_##SuiteName GTEST_ATTRIBUTE_UNUSED_ =        \
+      ::testing::internal::TypeParameterizedTestSuite<                      \
+          SuiteName, GTEST_SUITE_NAMESPACE_(SuiteName)::gtest_AllTests_,    \
+          ::testing::internal::GenerateTypeList<Types>::type>::             \
+          Register(GTEST_STRINGIFY_(Prefix),                                \
+                   ::testing::internal::CodeLocation(__FILE__, __LINE__),   \
+                   &GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName),             \
+                   GTEST_STRINGIFY_(SuiteName),                             \
+                   GTEST_REGISTERED_TEST_NAMES_(SuiteName),                 \
+                   ::testing::internal::GenerateNames<                      \
+                       ::testing::internal::NameGeneratorSelector<          \
+                           __VA_ARGS__>::type,                              \
+                       ::testing::internal::GenerateTypeList<Types>::type>())
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define INSTANTIATE_TYPED_TEST_CASE_P                                      \
+  static_assert(                                                           \
+      ::testing::internal::InstantiateTypedTestCase_P_IsDeprecated(), ""); \
+  INSTANTIATE_TYPED_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// Silence C4100 (unreferenced formal parameter) and 4805
+// unsafe mix of type 'const int' and type 'const bool'
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4805)
+# pragma warning(disable:4100)
+#endif
+
+
+// Declares the flags.
+
+// This flag temporary enables the disabled tests.
+GTEST_DECLARE_bool_(also_run_disabled_tests);
+
+// This flag brings the debugger on an assertion failure.
+GTEST_DECLARE_bool_(break_on_failure);
+
+// This flag controls whether Google Test catches all test-thrown exceptions
+// and logs them as failures.
+GTEST_DECLARE_bool_(catch_exceptions);
+
+// This flag enables using colors in terminal output. Available values are
+// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
+// to let Google Test decide.
+GTEST_DECLARE_string_(color);
+
+// This flag controls whether the test runner should continue execution past
+// first failure.
+GTEST_DECLARE_bool_(fail_fast);
+
+// This flag sets up the filter to select by name using a glob pattern
+// the tests to run. If the filter is not given all tests are executed.
+GTEST_DECLARE_string_(filter);
+
+// This flag controls whether Google Test installs a signal handler that dumps
+// debugging information when fatal signals are raised.
+GTEST_DECLARE_bool_(install_failure_signal_handler);
+
+// This flag causes the Google Test to list tests. None of the tests listed
+// are actually run if the flag is provided.
+GTEST_DECLARE_bool_(list_tests);
+
+// This flag controls whether Google Test emits a detailed XML report to a file
+// in addition to its normal textual output.
+GTEST_DECLARE_string_(output);
+
+// This flags control whether Google Test prints only test failures.
+GTEST_DECLARE_bool_(brief);
+
+// This flags control whether Google Test prints the elapsed time for each
+// test.
+GTEST_DECLARE_bool_(print_time);
+
+// This flags control whether Google Test prints UTF8 characters as text.
+GTEST_DECLARE_bool_(print_utf8);
+
+// This flag specifies the random number seed.
+GTEST_DECLARE_int32_(random_seed);
+
+// This flag sets how many times the tests are repeated. The default value
+// is 1. If the value is -1 the tests are repeating forever.
+GTEST_DECLARE_int32_(repeat);
+
+// This flag controls whether Google Test includes Google Test internal
+// stack frames in failure stack traces.
+GTEST_DECLARE_bool_(show_internal_stack_frames);
+
+// When this flag is specified, tests' order is randomized on every iteration.
+GTEST_DECLARE_bool_(shuffle);
+
+// This flag specifies the maximum number of stack frames to be
+// printed in a failure message.
+GTEST_DECLARE_int32_(stack_trace_depth);
+
+// When this flag is specified, a failed assertion will throw an
+// exception if exceptions are enabled, or exit the program with a
+// non-zero code otherwise. For use with an external test framework.
+GTEST_DECLARE_bool_(throw_on_failure);
+
+// When this flag is set with a "host:port" string, on supported
+// platforms test results are streamed to the specified port on
+// the specified host machine.
+GTEST_DECLARE_string_(stream_result_to);
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+GTEST_DECLARE_string_(flagfile);
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+// The upper limit for valid stack trace depths.
+const int kMaxStackTraceDepth = 100;
+
+namespace internal {
+
+class AssertHelper;
+class DefaultGlobalTestPartResultReporter;
+class ExecDeathTest;
+class NoExecDeathTest;
+class FinalSuccessChecker;
+class GTestFlagSaver;
+class StreamingListenerTest;
+class TestResultAccessor;
+class TestEventListenersAccessor;
+class TestEventRepeater;
+class UnitTestRecordPropertyTestHelper;
+class WindowsDeathTest;
+class FuchsiaDeathTest;
+class UnitTestImpl* GetUnitTestImpl();
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message);
+std::set<std::string>* GetIgnoredParameterizedTestSuites();
+
+}  // namespace internal
+
+// The friend relationship of some of these classes is cyclic.
+// If we don't forward declare them the compiler might confuse the classes
+// in friendship clauses with same named classes on the scope.
+class Test;
+class TestSuite;
+
+// Old API is still available but deprecated
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+using TestCase = TestSuite;
+#endif
+class TestInfo;
+class UnitTest;
+
+// A class for indicating whether an assertion was successful.  When
+// the assertion wasn't successful, the AssertionResult object
+// remembers a non-empty message that describes how it failed.
+//
+// To create an instance of this class, use one of the factory functions
+// (AssertionSuccess() and AssertionFailure()).
+//
+// This class is useful for two purposes:
+//   1. Defining predicate functions to be used with Boolean test assertions
+//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
+//   2. Defining predicate-format functions to be
+//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
+//
+// For example, if you define IsEven predicate:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
+// will print the message
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false (5 is odd)
+//   Expected: true
+//
+// instead of a more opaque
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false
+//   Expected: true
+//
+// in case IsEven is a simple Boolean predicate.
+//
+// If you expect your predicate to be reused and want to support informative
+// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
+// about half as often as positive ones in our tests), supply messages for
+// both success and failure cases:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess() << n << " is even";
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
+//
+//   Value of: IsEven(Fib(6))
+//     Actual: true (8 is even)
+//   Expected: false
+//
+// NB: Predicates that support negative Boolean assertions have reduced
+// performance in positive ones so be careful not to use them in tests
+// that have lots (tens of thousands) of positive Boolean assertions.
+//
+// To use this class with EXPECT_PRED_FORMAT assertions such as:
+//
+//   // Verifies that Foo() returns an even number.
+//   EXPECT_PRED_FORMAT1(IsEven, Foo());
+//
+// you need to define:
+//
+//   testing::AssertionResult IsEven(const char* expr, int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure()
+//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
+//   }
+//
+// If Foo() returns 5, you will see the following message:
+//
+//   Expected: Foo() is even
+//     Actual: it's 5
+//
+class GTEST_API_ AssertionResult {
+ public:
+  // Copy constructor.
+  // Used in EXPECT_TRUE/FALSE(assertion_result).
+  AssertionResult(const AssertionResult& other);
+
+// C4800 is a level 3 warning in Visual Studio 2015 and earlier.
+// This warning is not emitted in Visual Studio 2017.
+// This warning is off by default starting in Visual Studio 2019 but can be
+// enabled with command-line options.
+#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
+#endif
+
+  // Used in the EXPECT_TRUE/FALSE(bool_expression).
+  //
+  // T must be contextually convertible to bool.
+  //
+  // The second parameter prevents this overload from being considered if
+  // the argument is implicitly convertible to AssertionResult. In that case
+  // we want AssertionResult's copy constructor to be used.
+  template <typename T>
+  explicit AssertionResult(
+      const T& success,
+      typename std::enable_if<
+          !std::is_convertible<T, AssertionResult>::value>::type*
+      /*enabler*/
+      = nullptr)
+      : success_(success) {}
+
+#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+  // Assignment operator.
+  AssertionResult& operator=(AssertionResult other) {
+    swap(other);
+    return *this;
+  }
+
+  // Returns true if and only if the assertion succeeded.
+  operator bool() const { return success_; }  // NOLINT
+
+  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+  AssertionResult operator!() const;
+
+  // Returns the text streamed into this AssertionResult. Test assertions
+  // use it when they fail (i.e., the predicate's outcome doesn't match the
+  // assertion's expectation). When nothing has been streamed into the
+  // object, returns an empty string.
+  const char* message() const {
+    return message_.get() != nullptr ? message_->c_str() : "";
+  }
+  // Deprecated; please use message() instead.
+  const char* failure_message() const { return message(); }
+
+  // Streams a custom failure message into this object.
+  template <typename T> AssertionResult& operator<<(const T& value) {
+    AppendMessage(Message() << value);
+    return *this;
+  }
+
+  // Allows streaming basic output manipulators such as endl or flush into
+  // this object.
+  AssertionResult& operator<<(
+      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
+    AppendMessage(Message() << basic_manipulator);
+    return *this;
+  }
+
+ private:
+  // Appends the contents of message to message_.
+  void AppendMessage(const Message& a_message) {
+    if (message_.get() == nullptr) message_.reset(new ::std::string);
+    message_->append(a_message.GetString().c_str());
+  }
+
+  // Swap the contents of this AssertionResult with other.
+  void swap(AssertionResult& other);
+
+  // Stores result of the assertion predicate.
+  bool success_;
+  // Stores the message describing the condition in case the expectation
+  // construct is not satisfied with the predicate's outcome.
+  // Referenced via a pointer to avoid taking too much stack frame space
+  // with test assertions.
+  std::unique_ptr< ::std::string> message_;
+};
+
+// Makes a successful assertion result.
+GTEST_API_ AssertionResult AssertionSuccess();
+
+// Makes a failed assertion result.
+GTEST_API_ AssertionResult AssertionFailure();
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << msg.
+GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
+
+}  // namespace testing
+
+// Includes the auto-generated header that implements a family of generic
+// predicate assertion macros. This include comes late because it relies on
+// APIs declared above.
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This file is AUTOMATICALLY GENERATED on 01/02/2019 by command
+// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
+//
+// Implements a family of generic predicate assertion macros.
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+
+
+namespace testing {
+
+// This header implements a family of generic predicate assertion
+// macros:
+//
+//   ASSERT_PRED_FORMAT1(pred_format, v1)
+//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
+//   ...
+//
+// where pred_format is a function or functor that takes n (in the
+// case of ASSERT_PRED_FORMATn) values and their source expression
+// text, and returns a testing::AssertionResult.  See the definition
+// of ASSERT_EQ in gtest.h for an example.
+//
+// If you don't care about formatting, you can use the more
+// restrictive version:
+//
+//   ASSERT_PRED1(pred, v1)
+//   ASSERT_PRED2(pred, v1, v2)
+//   ...
+//
+// where pred is an n-ary function or functor that returns bool,
+// and the values v1, v2, ..., must support the << operator for
+// streaming to std::ostream.
+//
+// We also define the EXPECT_* variations.
+//
+// For now we only support predicates whose arity is at most 5.
+// Please email googletestframework@googlegroups.com if you need
+// support for higher arities.
+
+// GTEST_ASSERT_ is the basic statement to which all of the assertions
+// in this file reduce.  Don't use this in your code.
+
+#define GTEST_ASSERT_(expression, on_failure) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar = (expression)) \
+    ; \
+  else \
+    on_failure(gtest_ar.failure_message())
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1>
+AssertionResult AssertPred1Helper(const char* pred_text,
+                                  const char* e1,
+                                  Pred pred,
+                                  const T1& v1) {
+  if (pred(v1)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, v1), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+#define GTEST_PRED1_(pred, v1, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
+                                             #v1, \
+                                             pred, \
+                                             v1), on_failure)
+
+// Unary predicate assertion macros.
+#define EXPECT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2>
+AssertionResult AssertPred2Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2) {
+  if (pred(v1, v2)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2
+         << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+#define GTEST_PRED2_(pred, v1, v2, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             pred, \
+                                             v1, \
+                                             v2), on_failure)
+
+// Binary predicate assertion macros.
+#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3>
+AssertionResult AssertPred3Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3) {
+  if (pred(v1, v2, v3)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2 << ", " << e3
+         << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
+         << e3 << " evaluates to " << ::testing::PrintToString(v3);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3), on_failure)
+
+// Ternary predicate assertion macros.
+#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4>
+AssertionResult AssertPred4Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4) {
+  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
+         << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
+         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
+         << e4 << " evaluates to " << ::testing::PrintToString(v4);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4), on_failure)
+
+// 4-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4,
+          typename T5>
+AssertionResult AssertPred5Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  const char* e5,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4,
+                                  const T5& v5) {
+  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
+         << ", " << e5 << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
+         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
+         << e4 << " evaluates to " << ::testing::PrintToString(v4) << "\n"
+         << e5 << " evaluates to " << ::testing::PrintToString(v5);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             #v5, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4, \
+                                             v5), on_failure)
+
+// 5-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+
+
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+
+namespace testing {
+
+// The abstract class that all tests inherit from.
+//
+// In Google Test, a unit test program contains one or many TestSuites, and
+// each TestSuite contains one or many Tests.
+//
+// When you define a test using the TEST macro, you don't need to
+// explicitly derive from Test - the TEST macro automatically does
+// this for you.
+//
+// The only time you derive from Test is when defining a test fixture
+// to be used in a TEST_F.  For example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     void SetUp() override { ... }
+//     void TearDown() override { ... }
+//     ...
+//   };
+//
+//   TEST_F(FooTest, Bar) { ... }
+//   TEST_F(FooTest, Baz) { ... }
+//
+// Test is not copyable.
+class GTEST_API_ Test {
+ public:
+  friend class TestInfo;
+
+  // The d'tor is virtual as we intend to inherit from Test.
+  virtual ~Test();
+
+  // Sets up the stuff shared by all tests in this test suite.
+  //
+  // Google Test will call Foo::SetUpTestSuite() before running the first
+  // test in test suite Foo.  Hence a sub-class can define its own
+  // SetUpTestSuite() method to shadow the one defined in the super
+  // class.
+  static void SetUpTestSuite() {}
+
+  // Tears down the stuff shared by all tests in this test suite.
+  //
+  // Google Test will call Foo::TearDownTestSuite() after running the last
+  // test in test suite Foo.  Hence a sub-class can define its own
+  // TearDownTestSuite() method to shadow the one defined in the super
+  // class.
+  static void TearDownTestSuite() {}
+
+  // Legacy API is deprecated but still available. Use SetUpTestSuite and
+  // TearDownTestSuite instead.
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  static void TearDownTestCase() {}
+  static void SetUpTestCase() {}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Returns true if and only if the current test has a fatal failure.
+  static bool HasFatalFailure();
+
+  // Returns true if and only if the current test has a non-fatal failure.
+  static bool HasNonfatalFailure();
+
+  // Returns true if and only if the current test was skipped.
+  static bool IsSkipped();
+
+  // Returns true if and only if the current test has a (either fatal or
+  // non-fatal) failure.
+  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
+
+  // Logs a property for the current test, test suite, or for the entire
+  // invocation of the test program when used outside of the context of a
+  // test suite.  Only the last value for a given key is remembered.  These
+  // are public static so they can be called from utility functions that are
+  // not members of the test fixture.  Calls to RecordProperty made during
+  // lifespan of the test (from the moment its constructor starts to the
+  // moment its destructor finishes) will be output in XML as attributes of
+  // the <testcase> element.  Properties recorded from fixture's
+  // SetUpTestSuite or TearDownTestSuite are logged as attributes of the
+  // corresponding <testsuite> element.  Calls to RecordProperty made in the
+  // global context (before or after invocation of RUN_ALL_TESTS and from
+  // SetUp/TearDown method of Environment objects registered with Google
+  // Test) will be output as attributes of the <testsuites> element.
+  static void RecordProperty(const std::string& key, const std::string& value);
+  static void RecordProperty(const std::string& key, int value);
+
+ protected:
+  // Creates a Test object.
+  Test();
+
+  // Sets up the test fixture.
+  virtual void SetUp();
+
+  // Tears down the test fixture.
+  virtual void TearDown();
+
+ private:
+  // Returns true if and only if the current test has the same fixture class
+  // as the first test in the current test suite.
+  static bool HasSameFixtureClass();
+
+  // Runs the test after the test fixture has been set up.
+  //
+  // A sub-class must implement this to define the test logic.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
+  // Instead, use the TEST or TEST_F macro.
+  virtual void TestBody() = 0;
+
+  // Sets up, executes, and tears down the test.
+  void Run();
+
+  // Deletes self.  We deliberately pick an unusual name for this
+  // internal method to avoid clashing with names used in user TESTs.
+  void DeleteSelf_() { delete this; }
+
+  const std::unique_ptr<GTEST_FLAG_SAVER_> gtest_flag_saver_;
+
+  // Often a user misspells SetUp() as Setup() and spends a long time
+  // wondering why it is never called by Google Test.  The declaration of
+  // the following method is solely for catching such an error at
+  // compile time:
+  //
+  //   - The return type is deliberately chosen to be not void, so it
+  //   will be a conflict if void Setup() is declared in the user's
+  //   test fixture.
+  //
+  //   - This method is private, so it will be another compiler error
+  //   if the method is called from the user's test fixture.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION.
+  //
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
+
+  // We disallow copying Tests.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
+};
+
+typedef internal::TimeInMillis TimeInMillis;
+
+// A copyable object representing a user specified test property which can be
+// output as a key/value string pair.
+//
+// Don't inherit from TestProperty as its destructor is not virtual.
+class TestProperty {
+ public:
+  // C'tor.  TestProperty does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestProperty object.
+  TestProperty(const std::string& a_key, const std::string& a_value) :
+    key_(a_key), value_(a_value) {
+  }
+
+  // Gets the user supplied key.
+  const char* key() const {
+    return key_.c_str();
+  }
+
+  // Gets the user supplied value.
+  const char* value() const {
+    return value_.c_str();
+  }
+
+  // Sets a new value, overriding the one supplied in the constructor.
+  void SetValue(const std::string& new_value) {
+    value_ = new_value;
+  }
+
+ private:
+  // The key supplied by the user.
+  std::string key_;
+  // The value supplied by the user.
+  std::string value_;
+};
+
+// The result of a single Test.  This includes a list of
+// TestPartResults, a list of TestProperties, a count of how many
+// death tests there are in the Test, and how much time it took to run
+// the Test.
+//
+// TestResult is not copyable.
+class GTEST_API_ TestResult {
+ public:
+  // Creates an empty TestResult.
+  TestResult();
+
+  // D'tor.  Do not inherit from TestResult.
+  ~TestResult();
+
+  // Gets the number of all test parts.  This is the sum of the number
+  // of successful test parts and the number of failed test parts.
+  int total_part_count() const;
+
+  // Returns the number of the test properties.
+  int test_property_count() const;
+
+  // Returns true if and only if the test passed (i.e. no test part failed).
+  bool Passed() const { return !Skipped() && !Failed(); }
+
+  // Returns true if and only if the test was skipped.
+  bool Skipped() const;
+
+  // Returns true if and only if the test failed.
+  bool Failed() const;
+
+  // Returns true if and only if the test fatally failed.
+  bool HasFatalFailure() const;
+
+  // Returns true if and only if the test has a non-fatal failure.
+  bool HasNonfatalFailure() const;
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Gets the time of the test case start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Returns the i-th test part result among all the results. i can range from 0
+  // to total_part_count() - 1. If i is not in that range, aborts the program.
+  const TestPartResult& GetTestPartResult(int i) const;
+
+  // Returns the i-th test property. i can range from 0 to
+  // test_property_count() - 1. If i is not in that range, aborts the
+  // program.
+  const TestProperty& GetTestProperty(int i) const;
+
+ private:
+  friend class TestInfo;
+  friend class TestSuite;
+  friend class UnitTest;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::ExecDeathTest;
+  friend class internal::TestResultAccessor;
+  friend class internal::UnitTestImpl;
+  friend class internal::WindowsDeathTest;
+  friend class internal::FuchsiaDeathTest;
+
+  // Gets the vector of TestPartResults.
+  const std::vector<TestPartResult>& test_part_results() const {
+    return test_part_results_;
+  }
+
+  // Gets the vector of TestProperties.
+  const std::vector<TestProperty>& test_properties() const {
+    return test_properties_;
+  }
+
+  // Sets the start time.
+  void set_start_timestamp(TimeInMillis start) { start_timestamp_ = start; }
+
+  // Sets the elapsed time.
+  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
+
+  // Adds a test property to the list. The property is validated and may add
+  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
+  // key names). If a property is already recorded for the same key, the
+  // value will be updated, rather than storing multiple values for the same
+  // key.  xml_element specifies the element for which the property is being
+  // recorded and is used for validation.
+  void RecordProperty(const std::string& xml_element,
+                      const TestProperty& test_property);
+
+  // Adds a failure if the key is a reserved attribute of Google Test
+  // testsuite tags.  Returns true if the property is valid.
+  // FIXME: Validate attribute names are legal and human readable.
+  static bool ValidateTestProperty(const std::string& xml_element,
+                                   const TestProperty& test_property);
+
+  // Adds a test part result to the list.
+  void AddTestPartResult(const TestPartResult& test_part_result);
+
+  // Returns the death test count.
+  int death_test_count() const { return death_test_count_; }
+
+  // Increments the death test count, returning the new count.
+  int increment_death_test_count() { return ++death_test_count_; }
+
+  // Clears the test part results.
+  void ClearTestPartResults();
+
+  // Clears the object.
+  void Clear();
+
+  // Protects mutable state of the property vector and of owned
+  // properties, whose values may be updated.
+  internal::Mutex test_properties_mutex_;
+
+  // The vector of TestPartResults
+  std::vector<TestPartResult> test_part_results_;
+  // The vector of TestProperties
+  std::vector<TestProperty> test_properties_;
+  // Running count of death tests.
+  int death_test_count_;
+  // The start time, in milliseconds since UNIX Epoch.
+  TimeInMillis start_timestamp_;
+  // The elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+  // We disallow copying TestResult.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
+};  // class TestResult
+
+// A TestInfo object stores the following information about a test:
+//
+//   Test suite name
+//   Test name
+//   Whether the test should be run
+//   A function pointer that creates the test object when invoked
+//   Test result
+//
+// The constructor of TestInfo registers itself with the UnitTest
+// singleton such that the RUN_ALL_TESTS() macro knows which tests to
+// run.
+class GTEST_API_ TestInfo {
+ public:
+  // Destructs a TestInfo object.  This function is not virtual, so
+  // don't inherit from TestInfo.
+  ~TestInfo();
+
+  // Returns the test suite name.
+  const char* test_suite_name() const { return test_suite_name_.c_str(); }
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const char* test_case_name() const { return test_suite_name(); }
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Returns the test name.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a typed
+  // or a type-parameterized test.
+  const char* type_param() const {
+    if (type_param_.get() != nullptr) return type_param_->c_str();
+    return nullptr;
+  }
+
+  // Returns the text representation of the value parameter, or NULL if this
+  // is not a value-parameterized test.
+  const char* value_param() const {
+    if (value_param_.get() != nullptr) return value_param_->c_str();
+    return nullptr;
+  }
+
+  // Returns the file name where this test is defined.
+  const char* file() const { return location_.file.c_str(); }
+
+  // Returns the line where this test is defined.
+  int line() const { return location_.line; }
+
+  // Return true if this test should not be run because it's in another shard.
+  bool is_in_another_shard() const { return is_in_another_shard_; }
+
+  // Returns true if this test should run, that is if the test is not
+  // disabled (or it is disabled but the also_run_disabled_tests flag has
+  // been specified) and its full name matches the user-specified filter.
+  //
+  // Google Test allows the user to filter the tests by their full names.
+  // The full name of a test Bar in test suite Foo is defined as
+  // "Foo.Bar".  Only the tests that match the filter will run.
+  //
+  // A filter is a colon-separated list of glob (not regex) patterns,
+  // optionally followed by a '-' and a colon-separated list of
+  // negative patterns (tests to exclude).  A test is run if it
+  // matches one of the positive patterns and does not match any of
+  // the negative patterns.
+  //
+  // For example, *A*:Foo.* is a filter that matches any string that
+  // contains the character 'A' or starts with "Foo.".
+  bool should_run() const { return should_run_; }
+
+  // Returns true if and only if this test will appear in the XML report.
+  bool is_reportable() const {
+    // The XML report includes tests matching the filter, excluding those
+    // run in other shards.
+    return matches_filter_ && !is_in_another_shard_;
+  }
+
+  // Returns the result of the test.
+  const TestResult* result() const { return &result_; }
+
+ private:
+#if GTEST_HAS_DEATH_TEST
+  friend class internal::DefaultDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+  friend class Test;
+  friend class TestSuite;
+  friend class internal::UnitTestImpl;
+  friend class internal::StreamingListenerTest;
+  friend TestInfo* internal::MakeAndRegisterTestInfo(
+      const char* test_suite_name, const char* name, const char* type_param,
+      const char* value_param, internal::CodeLocation code_location,
+      internal::TypeId fixture_class_id, internal::SetUpTestSuiteFunc set_up_tc,
+      internal::TearDownTestSuiteFunc tear_down_tc,
+      internal::TestFactoryBase* factory);
+
+  // Constructs a TestInfo object. The newly constructed instance assumes
+  // ownership of the factory object.
+  TestInfo(const std::string& test_suite_name, const std::string& name,
+           const char* a_type_param,   // NULL if not a type-parameterized test
+           const char* a_value_param,  // NULL if not a value-parameterized test
+           internal::CodeLocation a_code_location,
+           internal::TypeId fixture_class_id,
+           internal::TestFactoryBase* factory);
+
+  // Increments the number of death tests encountered in this test so
+  // far.
+  int increment_death_test_count() {
+    return result_.increment_death_test_count();
+  }
+
+  // Creates the test object, runs it, records its result, and then
+  // deletes it.
+  void Run();
+
+  // Skip and records the test result for this object.
+  void Skip();
+
+  static void ClearTestResult(TestInfo* test_info) {
+    test_info->result_.Clear();
+  }
+
+  // These fields are immutable properties of the test.
+  const std::string test_suite_name_;    // test suite name
+  const std::string name_;               // Test name
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const std::unique_ptr<const ::std::string> type_param_;
+  // Text representation of the value parameter, or NULL if this is not a
+  // value-parameterized test.
+  const std::unique_ptr<const ::std::string> value_param_;
+  internal::CodeLocation location_;
+  const internal::TypeId fixture_class_id_;  // ID of the test fixture class
+  bool should_run_;           // True if and only if this test should run
+  bool is_disabled_;          // True if and only if this test is disabled
+  bool matches_filter_;       // True if this test matches the
+                              // user-specified filter.
+  bool is_in_another_shard_;  // Will be run in another shard.
+  internal::TestFactoryBase* const factory_;  // The factory that creates
+                                              // the test object
+
+  // This field is mutable and needs to be reset before running the
+  // test for the second time.
+  TestResult result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
+};
+
+// A test suite, which consists of a vector of TestInfos.
+//
+// TestSuite is not copyable.
+class GTEST_API_ TestSuite {
+ public:
+  // Creates a TestSuite with the given name.
+  //
+  // TestSuite does NOT have a default constructor.  Always use this
+  // constructor to create a TestSuite object.
+  //
+  // Arguments:
+  //
+  //   name:         name of the test suite
+  //   a_type_param: the name of the test's type parameter, or NULL if
+  //                 this is not a type-parameterized test.
+  //   set_up_tc:    pointer to the function that sets up the test suite
+  //   tear_down_tc: pointer to the function that tears down the test suite
+  TestSuite(const char* name, const char* a_type_param,
+            internal::SetUpTestSuiteFunc set_up_tc,
+            internal::TearDownTestSuiteFunc tear_down_tc);
+
+  // Destructor of TestSuite.
+  virtual ~TestSuite();
+
+  // Gets the name of the TestSuite.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a
+  // type-parameterized test suite.
+  const char* type_param() const {
+    if (type_param_.get() != nullptr) return type_param_->c_str();
+    return nullptr;
+  }
+
+  // Returns true if any test in this test suite should run.
+  bool should_run() const { return should_run_; }
+
+  // Gets the number of successful tests in this test suite.
+  int successful_test_count() const;
+
+  // Gets the number of skipped tests in this test suite.
+  int skipped_test_count() const;
+
+  // Gets the number of failed tests in this test suite.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests in this test suite.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Get the number of tests in this test suite that should run.
+  int test_to_run_count() const;
+
+  // Gets the number of all tests in this test suite.
+  int total_test_count() const;
+
+  // Returns true if and only if the test suite passed.
+  bool Passed() const { return !Failed(); }
+
+  // Returns true if and only if the test suite failed.
+  bool Failed() const {
+    return failed_test_count() > 0 || ad_hoc_test_result().Failed();
+  }
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Gets the time of the test suite start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  const TestInfo* GetTestInfo(int i) const;
+
+  // Returns the TestResult that holds test properties recorded during
+  // execution of SetUpTestSuite and TearDownTestSuite.
+  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
+
+ private:
+  friend class Test;
+  friend class internal::UnitTestImpl;
+
+  // Gets the (mutable) vector of TestInfos in this TestSuite.
+  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
+
+  // Gets the (immutable) vector of TestInfos in this TestSuite.
+  const std::vector<TestInfo*>& test_info_list() const {
+    return test_info_list_;
+  }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  TestInfo* GetMutableTestInfo(int i);
+
+  // Sets the should_run member.
+  void set_should_run(bool should) { should_run_ = should; }
+
+  // Adds a TestInfo to this test suite.  Will delete the TestInfo upon
+  // destruction of the TestSuite object.
+  void AddTestInfo(TestInfo * test_info);
+
+  // Clears the results of all tests in this test suite.
+  void ClearResult();
+
+  // Clears the results of all tests in the given test suite.
+  static void ClearTestSuiteResult(TestSuite* test_suite) {
+    test_suite->ClearResult();
+  }
+
+  // Runs every test in this TestSuite.
+  void Run();
+
+  // Skips the execution of tests under this TestSuite
+  void Skip();
+
+  // Runs SetUpTestSuite() for this TestSuite.  This wrapper is needed
+  // for catching exceptions thrown from SetUpTestSuite().
+  void RunSetUpTestSuite() {
+    if (set_up_tc_ != nullptr) {
+      (*set_up_tc_)();
+    }
+  }
+
+  // Runs TearDownTestSuite() for this TestSuite.  This wrapper is
+  // needed for catching exceptions thrown from TearDownTestSuite().
+  void RunTearDownTestSuite() {
+    if (tear_down_tc_ != nullptr) {
+      (*tear_down_tc_)();
+    }
+  }
+
+  // Returns true if and only if test passed.
+  static bool TestPassed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Passed();
+  }
+
+  // Returns true if and only if test skipped.
+  static bool TestSkipped(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Skipped();
+  }
+
+  // Returns true if and only if test failed.
+  static bool TestFailed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Failed();
+  }
+
+  // Returns true if and only if the test is disabled and will be reported in
+  // the XML report.
+  static bool TestReportableDisabled(const TestInfo* test_info) {
+    return test_info->is_reportable() && test_info->is_disabled_;
+  }
+
+  // Returns true if and only if test is disabled.
+  static bool TestDisabled(const TestInfo* test_info) {
+    return test_info->is_disabled_;
+  }
+
+  // Returns true if and only if this test will appear in the XML report.
+  static bool TestReportable(const TestInfo* test_info) {
+    return test_info->is_reportable();
+  }
+
+  // Returns true if the given test should run.
+  static bool ShouldRunTest(const TestInfo* test_info) {
+    return test_info->should_run();
+  }
+
+  // Shuffles the tests in this test suite.
+  void ShuffleTests(internal::Random* random);
+
+  // Restores the test order to before the first shuffle.
+  void UnshuffleTests();
+
+  // Name of the test suite.
+  std::string name_;
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const std::unique_ptr<const ::std::string> type_param_;
+  // The vector of TestInfos in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestInfo*> test_info_list_;
+  // Provides a level of indirection for the test list to allow easy
+  // shuffling and restoring the test order.  The i-th element in this
+  // vector is the index of the i-th test in the shuffled test list.
+  std::vector<int> test_indices_;
+  // Pointer to the function that sets up the test suite.
+  internal::SetUpTestSuiteFunc set_up_tc_;
+  // Pointer to the function that tears down the test suite.
+  internal::TearDownTestSuiteFunc tear_down_tc_;
+  // True if and only if any test in this test suite should run.
+  bool should_run_;
+  // The start time, in milliseconds since UNIX Epoch.
+  TimeInMillis start_timestamp_;
+  // Elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+  // Holds test properties recorded during execution of SetUpTestSuite and
+  // TearDownTestSuite.
+  TestResult ad_hoc_test_result_;
+
+  // We disallow copying TestSuites.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestSuite);
+};
+
+// An Environment object is capable of setting up and tearing down an
+// environment.  You should subclass this to define your own
+// environment(s).
+//
+// An Environment object does the set-up and tear-down in virtual
+// methods SetUp() and TearDown() instead of the constructor and the
+// destructor, as:
+//
+//   1. You cannot safely throw from a destructor.  This is a problem
+//      as in some cases Google Test is used where exceptions are enabled, and
+//      we may want to implement ASSERT_* using exceptions where they are
+//      available.
+//   2. You cannot use ASSERT_* directly in a constructor or
+//      destructor.
+class Environment {
+ public:
+  // The d'tor is virtual as we need to subclass Environment.
+  virtual ~Environment() {}
+
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+ private:
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
+};
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Exception which can be thrown from TestEventListener::OnTestPartResult.
+class GTEST_API_ AssertionException
+    : public internal::GoogleTestFailureException {
+ public:
+  explicit AssertionException(const TestPartResult& result)
+      : GoogleTestFailureException(result) {}
+};
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// The interface for tracing execution of tests. The methods are organized in
+// the order the corresponding events are fired.
+class TestEventListener {
+ public:
+  virtual ~TestEventListener() {}
+
+  // Fired before any test activity starts.
+  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
+
+  // Fired before each iteration of tests starts.  There may be more than
+  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
+  // index, starting from 0.
+  virtual void OnTestIterationStart(const UnitTest& unit_test,
+                                    int iteration) = 0;
+
+  // Fired before environment set-up for each iteration of tests starts.
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment set-up for each iteration of tests ends.
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
+
+  // Fired before the test suite starts.
+  virtual void OnTestSuiteStart(const TestSuite& /*test_suite*/) {}
+
+  //  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Fired before the test starts.
+  virtual void OnTestStart(const TestInfo& test_info) = 0;
+
+  // Fired after a failed assertion or a SUCCEED() invocation.
+  // If you want to throw an exception from this function to skip to the next
+  // TEST, it must be AssertionException defined above, or inherited from it.
+  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
+
+  // Fired after the test ends.
+  virtual void OnTestEnd(const TestInfo& test_info) = 0;
+
+  // Fired after the test suite ends.
+  virtual void OnTestSuiteEnd(const TestSuite& /*test_suite*/) {}
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Fired before environment tear-down for each iteration of tests starts.
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment tear-down for each iteration of tests ends.
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
+
+  // Fired after each iteration of tests finishes.
+  virtual void OnTestIterationEnd(const UnitTest& unit_test,
+                                  int iteration) = 0;
+
+  // Fired after all test activities have ended.
+  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
+};
+
+// The convenience class for users who need to override just one or two
+// methods and are not concerned that a possible change to a signature of
+// the methods they override will not be caught during the build.  For
+// comments about each method please see the definition of TestEventListener
+// above.
+class EmptyTestEventListener : public TestEventListener {
+ public:
+  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                            int /*iteration*/) override {}
+  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnTestStart(const TestInfo& /*test_info*/) override {}
+  void OnTestPartResult(const TestPartResult& /*test_part_result*/) override {}
+  void OnTestEnd(const TestInfo& /*test_info*/) override {}
+  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationEnd(const UnitTest& /*unit_test*/,
+                          int /*iteration*/) override {}
+  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
+};
+
+// TestEventListeners lets users add listeners to track events in Google Test.
+class GTEST_API_ TestEventListeners {
+ public:
+  TestEventListeners();
+  ~TestEventListeners();
+
+  // Appends an event listener to the end of the list. Google Test assumes
+  // the ownership of the listener (i.e. it will delete the listener when
+  // the test program finishes).
+  void Append(TestEventListener* listener);
+
+  // Removes the given event listener from the list and returns it.  It then
+  // becomes the caller's responsibility to delete the listener. Returns
+  // NULL if the listener is not found in the list.
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Returns the standard listener responsible for the default console
+  // output.  Can be removed from the listeners list to shut down default
+  // console output.  Note that removing this object from the listener list
+  // with Release transfers its ownership to the caller and makes this
+  // function return NULL the next time.
+  TestEventListener* default_result_printer() const {
+    return default_result_printer_;
+  }
+
+  // Returns the standard listener responsible for the default XML output
+  // controlled by the --gtest_output=xml flag.  Can be removed from the
+  // listeners list by users who want to shut down the default XML output
+  // controlled by this flag and substitute it with custom one.  Note that
+  // removing this object from the listener list with Release transfers its
+  // ownership to the caller and makes this function return NULL the next
+  // time.
+  TestEventListener* default_xml_generator() const {
+    return default_xml_generator_;
+  }
+
+ private:
+  friend class TestSuite;
+  friend class TestInfo;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::NoExecDeathTest;
+  friend class internal::TestEventListenersAccessor;
+  friend class internal::UnitTestImpl;
+
+  // Returns repeater that broadcasts the TestEventListener events to all
+  // subscribers.
+  TestEventListener* repeater();
+
+  // Sets the default_result_printer attribute to the provided listener.
+  // The listener is also added to the listener list and previous
+  // default_result_printer is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultResultPrinter(TestEventListener* listener);
+
+  // Sets the default_xml_generator attribute to the provided listener.  The
+  // listener is also added to the listener list and previous
+  // default_xml_generator is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultXmlGenerator(TestEventListener* listener);
+
+  // Controls whether events will be forwarded by the repeater to the
+  // listeners in the list.
+  bool EventForwardingEnabled() const;
+  void SuppressEventForwarding();
+
+  // The actual list of listeners.
+  internal::TestEventRepeater* repeater_;
+  // Listener responsible for the standard result output.
+  TestEventListener* default_result_printer_;
+  // Listener responsible for the creation of the XML output file.
+  TestEventListener* default_xml_generator_;
+
+  // We disallow copying TestEventListeners.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
+};
+
+// A UnitTest consists of a vector of TestSuites.
+//
+// This is a singleton class.  The only instance of UnitTest is
+// created when UnitTest::GetInstance() is first called.  This
+// instance is never deleted.
+//
+// UnitTest is not copyable.
+//
+// This class is thread-safe as long as the methods are called
+// according to their specification.
+class GTEST_API_ UnitTest {
+ public:
+  // Gets the singleton UnitTest object.  The first time this method
+  // is called, a UnitTest object is constructed and returned.
+  // Consecutive calls will return the same object.
+  static UnitTest* GetInstance();
+
+  // Runs all tests in this UnitTest object and prints the result.
+  // Returns 0 if successful, or 1 otherwise.
+  //
+  // This method can only be called from the main thread.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  int Run() GTEST_MUST_USE_RESULT_;
+
+  // Returns the working directory when the first TEST() or TEST_F()
+  // was executed.  The UnitTest object owns the string.
+  const char* original_working_dir() const;
+
+  // Returns the TestSuite object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestSuite* current_test_suite() const GTEST_LOCK_EXCLUDED_(mutex_);
+
+// Legacy API is still available but deprecated
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const TestCase* current_test_case() const GTEST_LOCK_EXCLUDED_(mutex_);
+#endif
+
+  // Returns the TestInfo object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestInfo* current_test_info() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Returns the random seed used at the start of the current test run.
+  int random_seed() const;
+
+  // Returns the ParameterizedTestSuiteRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Gets the number of successful test suites.
+  int successful_test_suite_count() const;
+
+  // Gets the number of failed test suites.
+  int failed_test_suite_count() const;
+
+  // Gets the number of all test suites.
+  int total_test_suite_count() const;
+
+  // Gets the number of all test suites that contain at least one test
+  // that should run.
+  int test_suite_to_run_count() const;
+
+  //  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  int successful_test_case_count() const;
+  int failed_test_case_count() const;
+  int total_test_case_count() const;
+  int test_case_to_run_count() const;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of skipped tests.
+  int skipped_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const;
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const;
+
+  // Returns true if and only if the unit test passed (i.e. all test suites
+  // passed).
+  bool Passed() const;
+
+  // Returns true if and only if the unit test failed (i.e. some test suite
+  // failed or something outside of all tests failed).
+  bool Failed() const;
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  const TestSuite* GetTestSuite(int i) const;
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const TestCase* GetTestCase(int i) const;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Returns the TestResult containing information on test failures and
+  // properties logged outside of individual test suites.
+  const TestResult& ad_hoc_test_result() const;
+
+  // Returns the list of event listeners that can be used to track events
+  // inside Google Test.
+  TestEventListeners& listeners();
+
+ private:
+  // Registers and returns a global test environment.  When a test
+  // program is run, all global test environments will be set-up in
+  // the order they were registered.  After all tests in the program
+  // have finished, all global test environments will be torn-down in
+  // the *reverse* order they were registered.
+  //
+  // The UnitTest object takes ownership of the given environment.
+  //
+  // This method can only be called from the main thread.
+  Environment* AddEnvironment(Environment* env);
+
+  // Adds a TestPartResult to the current TestResult object.  All
+  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
+  // eventually call this to report their results.  The user code
+  // should use the assertion macros instead of calling this directly.
+  void AddTestPartResult(TestPartResult::Type result_type,
+                         const char* file_name,
+                         int line_number,
+                         const std::string& message,
+                         const std::string& os_stack_trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Adds a TestProperty to the current TestResult object when invoked from
+  // inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
+  // from SetUpTestSuite or TearDownTestSuite, or to the global property set
+  // when invoked elsewhere.  If the result already contains a property with
+  // the same key, the value will be updated.
+  void RecordProperty(const std::string& key, const std::string& value);
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  TestSuite* GetMutableTestSuite(int i);
+
+  // Accessors for the implementation object.
+  internal::UnitTestImpl* impl() { return impl_; }
+  const internal::UnitTestImpl* impl() const { return impl_; }
+
+  // These classes and functions are friends as they need to access private
+  // members of UnitTest.
+  friend class ScopedTrace;
+  friend class Test;
+  friend class internal::AssertHelper;
+  friend class internal::StreamingListenerTest;
+  friend class internal::UnitTestRecordPropertyTestHelper;
+  friend Environment* AddGlobalTestEnvironment(Environment* env);
+  friend std::set<std::string>* internal::GetIgnoredParameterizedTestSuites();
+  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
+  friend void internal::ReportFailureInUnknownLocation(
+      TestPartResult::Type result_type,
+      const std::string& message);
+
+  // Creates an empty UnitTest.
+  UnitTest();
+
+  // D'tor
+  virtual ~UnitTest();
+
+  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+  // Google Test trace stack.
+  void PushGTestTrace(const internal::TraceInfo& trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Pops a trace from the per-thread Google Test trace stack.
+  void PopGTestTrace()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Protects mutable state in *impl_.  This is mutable as some const
+  // methods need to lock it too.
+  mutable internal::Mutex mutex_;
+
+  // Opaque implementation object.  This field is never changed once
+  // the object is constructed.  We don't mark it as const here, as
+  // doing so will cause a warning in the constructor of UnitTest.
+  // Mutable state in *impl_ is protected by mutex_.
+  internal::UnitTestImpl* impl_;
+
+  // We disallow copying UnitTest.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
+};
+
+// A convenient wrapper for adding an environment for the test
+// program.
+//
+// You should call this before RUN_ALL_TESTS() is called, probably in
+// main().  If you use gtest_main, you need to call this before main()
+// starts for it to take effect.  For example, you can define a global
+// variable like this:
+//
+//   testing::Environment* const foo_env =
+//       testing::AddGlobalTestEnvironment(new FooEnvironment);
+//
+// However, we strongly recommend you to write your own main() and
+// call AddGlobalTestEnvironment() there, as relying on initialization
+// of global variables makes the code harder to read and may cause
+// problems when you register multiple environments from different
+// translation units and the environments have dependencies among them
+// (remember that the compiler doesn't guarantee the order in which
+// global variables from different translation units are initialized).
+inline Environment* AddGlobalTestEnvironment(Environment* env) {
+  return UnitTest::GetInstance()->AddEnvironment(env);
+}
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+GTEST_API_ void InitGoogleTest(int* argc, char** argv);
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
+
+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+GTEST_API_ void InitGoogleTest();
+
+namespace internal {
+
+// Separate the error generating code from the code path to reduce the stack
+// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
+// when calling EXPECT_* in a tight loop.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQFailure(const char* lhs_expression,
+                                   const char* rhs_expression,
+                                   const T1& lhs, const T2& rhs) {
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   FormatForComparisonFailureMessage(lhs, rhs),
+                   FormatForComparisonFailureMessage(rhs, lhs),
+                   false);
+}
+
+// This block of code defines operator==/!=
+// to block lexical scope lookup.
+// It prevents using invalid operator==/!= defined at namespace scope.
+struct faketype {};
+inline bool operator==(faketype, faketype) { return true; }
+inline bool operator!=(faketype, faketype) { return false; }
+
+// The helper function for {ASSERT|EXPECT}_EQ.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQ(const char* lhs_expression,
+                            const char* rhs_expression,
+                            const T1& lhs,
+                            const T2& rhs) {
+  if (lhs == rhs) {
+    return AssertionSuccess();
+  }
+
+  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
+}
+
+class EqHelper {
+ public:
+  // This templatized version is for the general case.
+  template <
+      typename T1, typename T2,
+      // Disable this overload for cases where one argument is a pointer
+      // and the other is the null pointer constant.
+      typename std::enable_if<!std::is_integral<T1>::value ||
+                              !std::is_pointer<T2>::value>::type* = nullptr>
+  static AssertionResult Compare(const char* lhs_expression,
+                                 const char* rhs_expression, const T1& lhs,
+                                 const T2& rhs) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+
+  // With this overloaded version, we allow anonymous enums to be used
+  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
+  // enums can be implicitly cast to BiggestInt.
+  //
+  // Even though its body looks the same as the above version, we
+  // cannot merge the two, as it will make anonymous enums unhappy.
+  static AssertionResult Compare(const char* lhs_expression,
+                                 const char* rhs_expression,
+                                 BiggestInt lhs,
+                                 BiggestInt rhs) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+
+  template <typename T>
+  static AssertionResult Compare(
+      const char* lhs_expression, const char* rhs_expression,
+      // Handle cases where '0' is used as a null pointer literal.
+      std::nullptr_t /* lhs */, T* rhs) {
+    // We already know that 'lhs' is a null pointer.
+    return CmpHelperEQ(lhs_expression, rhs_expression, static_cast<T*>(nullptr),
+                       rhs);
+  }
+};
+
+// Separate the error generating code from the code path to reduce the stack
+// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
+// when calling EXPECT_OP in a tight loop.
+template <typename T1, typename T2>
+AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
+                                   const T1& val1, const T2& val2,
+                                   const char* op) {
+  return AssertionFailure()
+         << "Expected: (" << expr1 << ") " << op << " (" << expr2
+         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
+         << " vs " << FormatForComparisonFailureMessage(val2, val1);
+}
+
+// A macro for implementing the helper functions needed to implement
+// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
+// of similar code.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
+template <typename T1, typename T2>\
+AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
+                                   const T1& val1, const T2& val2) {\
+  if (val1 op val2) {\
+    return AssertionSuccess();\
+  } else {\
+    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
+  }\
+}
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// Implements the helper function for {ASSERT|EXPECT}_NE
+GTEST_IMPL_CMP_HELPER_(NE, !=)
+// Implements the helper function for {ASSERT|EXPECT}_LE
+GTEST_IMPL_CMP_HELPER_(LE, <=)
+// Implements the helper function for {ASSERT|EXPECT}_LT
+GTEST_IMPL_CMP_HELPER_(LT, <)
+// Implements the helper function for {ASSERT|EXPECT}_GE
+GTEST_IMPL_CMP_HELPER_(GE, >=)
+// Implements the helper function for {ASSERT|EXPECT}_GT
+GTEST_IMPL_CMP_HELPER_(GT, >)
+
+#undef GTEST_IMPL_CMP_HELPER_
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+
+// Helper function for *_STREQ on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+// Helper function for *_STRNE on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+}  // namespace internal
+
+// IsSubstring() and IsNotSubstring() are intended to be used as the
+// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
+// themselves.  They check whether needle is a substring of haystack
+// (NULL is considered a substring of itself only), and return an
+// appropriate error message when they fail.
+//
+// The {needle,haystack}_expr arguments are the stringified
+// expressions that generated the two real arguments.
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+// Helper template function for comparing floating-points.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename RawType>
+AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
+                                         const char* rhs_expression,
+                                         RawType lhs_value,
+                                         RawType rhs_value) {
+  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
+
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  ::std::stringstream lhs_ss;
+  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+         << lhs_value;
+
+  ::std::stringstream rhs_ss;
+  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+         << rhs_value;
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   StringStreamToString(&lhs_ss),
+                   StringStreamToString(&rhs_ss),
+                   false);
+}
+
+// Helper function for implementing ASSERT_NEAR.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
+                                                const char* expr2,
+                                                const char* abs_error_expr,
+                                                double val1,
+                                                double val2,
+                                                double abs_error);
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+// A class that enables one to stream messages to assertion macros
+class GTEST_API_ AssertHelper {
+ public:
+  // Constructor.
+  AssertHelper(TestPartResult::Type type,
+               const char* file,
+               int line,
+               const char* message);
+  ~AssertHelper();
+
+  // Message assignment is a semantic trick to enable assertion
+  // streaming; see the GTEST_MESSAGE_ macro below.
+  void operator=(const Message& message) const;
+
+ private:
+  // We put our data in a struct so that the size of the AssertHelper class can
+  // be as small as possible.  This is important because gcc is incapable of
+  // re-using stack space even for temporary variables, so every EXPECT_EQ
+  // reserves stack space for another AssertHelper.
+  struct AssertHelperData {
+    AssertHelperData(TestPartResult::Type t,
+                     const char* srcfile,
+                     int line_num,
+                     const char* msg)
+        : type(t), file(srcfile), line(line_num), message(msg) { }
+
+    TestPartResult::Type const type;
+    const char* const file;
+    int const line;
+    std::string const message;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
+  };
+
+  AssertHelperData* const data_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
+};
+
+}  // namespace internal
+
+// The pure interface class that all value-parameterized tests inherit from.
+// A value-parameterized class must inherit from both ::testing::Test and
+// ::testing::WithParamInterface. In most cases that just means inheriting
+// from ::testing::TestWithParam, but more complicated test hierarchies
+// may need to inherit from Test and WithParamInterface at different levels.
+//
+// This interface has support for accessing the test parameter value via
+// the GetParam() method.
+//
+// Use it with one of the parameter generator defining functions, like Range(),
+// Values(), ValuesIn(), Bool(), and Combine().
+//
+// class FooTest : public ::testing::TestWithParam<int> {
+//  protected:
+//   FooTest() {
+//     // Can use GetParam() here.
+//   }
+//   ~FooTest() override {
+//     // Can use GetParam() here.
+//   }
+//   void SetUp() override {
+//     // Can use GetParam() here.
+//   }
+//   void TearDown override {
+//     // Can use GetParam() here.
+//   }
+// };
+// TEST_P(FooTest, DoesBar) {
+//   // Can use GetParam() method here.
+//   Foo foo;
+//   ASSERT_TRUE(foo.DoesBar(GetParam()));
+// }
+// INSTANTIATE_TEST_SUITE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
+
+template <typename T>
+class WithParamInterface {
+ public:
+  typedef T ParamType;
+  virtual ~WithParamInterface() {}
+
+  // The current parameter value. Is also available in the test fixture's
+  // constructor.
+  static const ParamType& GetParam() {
+    GTEST_CHECK_(parameter_ != nullptr)
+        << "GetParam() can only be called inside a value-parameterized test "
+        << "-- did you intend to write TEST_P instead of TEST_F?";
+    return *parameter_;
+  }
+
+ private:
+  // Sets parameter value. The caller is responsible for making sure the value
+  // remains alive and unchanged throughout the current test.
+  static void SetParam(const ParamType* parameter) {
+    parameter_ = parameter;
+  }
+
+  // Static value used for accessing parameter during a test lifetime.
+  static const ParamType* parameter_;
+
+  // TestClass must be a subclass of WithParamInterface<T> and Test.
+  template <class TestClass> friend class internal::ParameterizedTestFactory;
+};
+
+template <typename T>
+const T* WithParamInterface<T>::parameter_ = nullptr;
+
+// Most value-parameterized classes can ignore the existence of
+// WithParamInterface, and can just inherit from ::testing::TestWithParam.
+
+template <typename T>
+class TestWithParam : public Test, public WithParamInterface<T> {
+};
+
+// Macros for indicating success/failure in test code.
+
+// Skips test in runtime.
+// Skipping test aborts current function.
+// Skipped tests are neither successful nor failed.
+#define GTEST_SKIP() GTEST_SKIP_("")
+
+// ADD_FAILURE unconditionally adds a failure to the current test.
+// SUCCEED generates a success - it doesn't automatically make the
+// current test successful, as a test is only successful when it has
+// no failure.
+//
+// EXPECT_* verifies that a certain condition is satisfied.  If not,
+// it behaves like ADD_FAILURE.  In particular:
+//
+//   EXPECT_TRUE  verifies that a Boolean condition is true.
+//   EXPECT_FALSE verifies that a Boolean condition is false.
+//
+// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
+// that they will also abort the current function on failure.  People
+// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
+// writing data-driven tests often find themselves using ADD_FAILURE
+// and EXPECT_* more.
+
+// Generates a nonfatal failure with a generic message.
+#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
+
+// Generates a nonfatal failure at the given source file location with
+// a generic message.
+#define ADD_FAILURE_AT(file, line) \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kNonFatalFailure)
+
+// Generates a fatal failure with a generic message.
+#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
+
+// Like GTEST_FAIL(), but at the given source file location.
+#define GTEST_FAIL_AT(file, line)         \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kFatalFailure)
+
+// Define this macro to 1 to omit the definition of FAIL(), which is a
+// generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_FAIL
+# define FAIL() GTEST_FAIL()
+#endif
+
+// Generates a success with a generic message.
+#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
+
+// Define this macro to 1 to omit the definition of SUCCEED(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_SUCCEED
+# define SUCCEED() GTEST_SUCCEED()
+#endif
+
+// Macros for testing exceptions.
+//
+//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
+//         Tests that the statement throws the expected exception.
+//    * {ASSERT|EXPECT}_NO_THROW(statement):
+//         Tests that the statement doesn't throw any exception.
+//    * {ASSERT|EXPECT}_ANY_THROW(statement):
+//         Tests that the statement throws an exception.
+
+#define EXPECT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
+#define ASSERT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
+#define ASSERT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
+
+// Boolean assertions. Condition can be either a Boolean expression or an
+// AssertionResult. For more information on how to use AssertionResult with
+// these macros see comments on that class.
+#define GTEST_EXPECT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
+                      GTEST_NONFATAL_FAILURE_)
+#define GTEST_EXPECT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_NONFATAL_FAILURE_)
+#define GTEST_ASSERT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
+                      GTEST_FATAL_FAILURE_)
+#define GTEST_ASSERT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_FATAL_FAILURE_)
+
+// Define these macros to 1 to omit the definition of the corresponding
+// EXPECT or ASSERT, which clashes with some users' own code.
+
+#if !GTEST_DONT_DEFINE_EXPECT_TRUE
+#define EXPECT_TRUE(condition) GTEST_EXPECT_TRUE(condition)
+#endif
+
+#if !GTEST_DONT_DEFINE_EXPECT_FALSE
+#define EXPECT_FALSE(condition) GTEST_EXPECT_FALSE(condition)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_TRUE
+#define ASSERT_TRUE(condition) GTEST_ASSERT_TRUE(condition)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_FALSE
+#define ASSERT_FALSE(condition) GTEST_ASSERT_FALSE(condition)
+#endif
+
+// Macros for testing equalities and inequalities.
+//
+//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
+//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
+//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
+//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
+//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
+//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
+//
+// When they are not, Google Test prints both the tested expressions and
+// their actual values.  The values must be compatible built-in types,
+// or you will get a compiler error.  By "compatible" we mean that the
+// values can be compared by the respective operator.
+//
+// Note:
+//
+//   1. It is possible to make a user-defined type work with
+//   {ASSERT|EXPECT}_??(), but that requires overloading the
+//   comparison operators and is thus discouraged by the Google C++
+//   Usage Guide.  Therefore, you are advised to use the
+//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
+//   equal.
+//
+//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
+//   pointers (in particular, C strings).  Therefore, if you use it
+//   with two C strings, you are testing how their locations in memory
+//   are related, not how their content is related.  To compare two C
+//   strings by content, use {ASSERT|EXPECT}_STR*().
+//
+//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
+//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
+//   what the actual value is when it fails, and similarly for the
+//   other comparisons.
+//
+//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
+//   evaluate their arguments, which is undefined.
+//
+//   5. These macros evaluate their arguments exactly once.
+//
+// Examples:
+//
+//   EXPECT_NE(Foo(), 5);
+//   EXPECT_EQ(a_pointer, NULL);
+//   ASSERT_LT(i, array_size);
+//   ASSERT_GT(records.size(), 0) << "There is no record left.";
+
+#define EXPECT_EQ(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
+#define EXPECT_NE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define EXPECT_LE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define EXPECT_LT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define EXPECT_GE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define EXPECT_GT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+#define GTEST_ASSERT_EQ(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
+#define GTEST_ASSERT_NE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define GTEST_ASSERT_LE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define GTEST_ASSERT_LT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define GTEST_ASSERT_GE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define GTEST_ASSERT_GT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
+// ASSERT_XY(), which clashes with some users' own code.
+
+#if !GTEST_DONT_DEFINE_ASSERT_EQ
+# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_NE
+# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LE
+# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LT
+# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GE
+# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GT
+# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
+#endif
+
+// C-string Comparisons.  All tests treat NULL and any non-NULL string
+// as different.  Two NULLs are equal.
+//
+//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
+//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
+//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
+//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
+//
+// For wide or narrow string objects, you can use the
+// {ASSERT|EXPECT}_??() macros.
+//
+// Don't depend on the order in which the arguments are evaluated,
+// which is undefined.
+//
+// These macros evaluate their arguments exactly once.
+
+#define EXPECT_STREQ(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define EXPECT_STRNE(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define EXPECT_STRCASEEQ(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define EXPECT_STRCASENE(s1, s2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+#define ASSERT_STREQ(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define ASSERT_STRNE(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define ASSERT_STRCASEEQ(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define ASSERT_STRCASENE(s1, s2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+// Macros for comparing floating-point numbers.
+//
+//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
+//         Tests that two float values are almost equal.
+//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
+//         Tests that two double values are almost equal.
+//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
+//         Tests that v1 and v2 are within the given distance to each other.
+//
+// Google Test uses ULP-based comparison to automatically pick a default
+// error bound that is appropriate for the operands.  See the
+// FloatingPoint template class in gtest-internal.h if you are
+// interested in the implementation details.
+
+#define EXPECT_FLOAT_EQ(val1, val2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      val1, val2)
+
+#define EXPECT_DOUBLE_EQ(val1, val2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      val1, val2)
+
+#define ASSERT_FLOAT_EQ(val1, val2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      val1, val2)
+
+#define ASSERT_DOUBLE_EQ(val1, val2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      val1, val2)
+
+#define EXPECT_NEAR(val1, val2, abs_error)\
+  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+#define ASSERT_NEAR(val1, val2, abs_error)\
+  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+// These predicate format functions work on floating-point values, and
+// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
+//
+//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
+                                   float val1, float val2);
+GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                                    double val1, double val2);
+
+
+#if GTEST_OS_WINDOWS
+
+// Macros that test for HRESULT failure and success, these are only useful
+// on Windows, and rely on Windows SDK macros and APIs to compile.
+//
+//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
+//
+// When expr unexpectedly fails or succeeds, Google Test prints the
+// expected result and the actual result with both a human-readable
+// string representation of the error, if available, as well as the
+// hex result code.
+# define EXPECT_HRESULT_SUCCEEDED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define ASSERT_HRESULT_SUCCEEDED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define EXPECT_HRESULT_FAILED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+# define ASSERT_HRESULT_FAILED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+#endif  // GTEST_OS_WINDOWS
+
+// Macros that execute statement and check that it doesn't generate new fatal
+// failures in the current thread.
+//
+//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
+//
+// Examples:
+//
+//   EXPECT_NO_FATAL_FAILURE(Process());
+//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
+//
+#define ASSERT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
+#define EXPECT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
+
+// Causes a trace (including the given source file path and line number,
+// and the given message) to be included in every test failure message generated
+// by code in the scope of the lifetime of an instance of this class. The effect
+// is undone with the destruction of the instance.
+//
+// The message argument can be anything streamable to std::ostream.
+//
+// Example:
+//   testing::ScopedTrace trace("file.cc", 123, "message");
+//
+class GTEST_API_ ScopedTrace {
+ public:
+  // The c'tor pushes the given source file location and message onto
+  // a trace stack maintained by Google Test.
+
+  // Template version. Uses Message() to convert the values into strings.
+  // Slow, but flexible.
+  template <typename T>
+  ScopedTrace(const char* file, int line, const T& message) {
+    PushTrace(file, line, (Message() << message).GetString());
+  }
+
+  // Optimize for some known types.
+  ScopedTrace(const char* file, int line, const char* message) {
+    PushTrace(file, line, message ? message : "(null)");
+  }
+
+  ScopedTrace(const char* file, int line, const std::string& message) {
+    PushTrace(file, line, message);
+  }
+
+  // The d'tor pops the info pushed by the c'tor.
+  //
+  // Note that the d'tor is not virtual in order to be efficient.
+  // Don't inherit from ScopedTrace!
+  ~ScopedTrace();
+
+ private:
+  void PushTrace(const char* file, int line, std::string message);
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
+} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
+                            // c'tor and d'tor.  Therefore it doesn't
+                            // need to be used otherwise.
+
+// Causes a trace (including the source file path, the current line
+// number, and the given message) to be included in every test failure
+// message generated by code in the current scope.  The effect is
+// undone when the control leaves the current scope.
+//
+// The message argument can be anything streamable to std::ostream.
+//
+// In the implementation, we include the current line number as part
+// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
+// to appear in the same block - as long as they are on different
+// lines.
+//
+// Assuming that each thread maintains its own stack of traces.
+// Therefore, a SCOPED_TRACE() would (correctly) only affect the
+// assertions in its own thread.
+#define SCOPED_TRACE(message) \
+  ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
+    __FILE__, __LINE__, (message))
+
+// Compile-time assertion for type equality.
+// StaticAssertTypeEq<type1, type2>() compiles if and only if type1 and type2
+// are the same type.  The value it returns is not interesting.
+//
+// Instead of making StaticAssertTypeEq a class template, we make it a
+// function template that invokes a helper class template.  This
+// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
+// defining objects of that type.
+//
+// CAVEAT:
+//
+// When used inside a method of a class template,
+// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
+// instantiated.  For example, given:
+//
+//   template <typename T> class Foo {
+//    public:
+//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
+//   };
+//
+// the code:
+//
+//   void Test1() { Foo<bool> foo; }
+//
+// will NOT generate a compiler error, as Foo<bool>::Bar() is never
+// actually instantiated.  Instead, you need:
+//
+//   void Test2() { Foo<bool> foo; foo.Bar(); }
+//
+// to cause a compiler error.
+template <typename T1, typename T2>
+constexpr bool StaticAssertTypeEq() noexcept {
+  static_assert(std::is_same<T1, T2>::value, "T1 and T2 are not the same type");
+  return true;
+}
+
+// Defines a test.
+//
+// The first parameter is the name of the test suite, and the second
+// parameter is the name of the test within the test suite.
+//
+// The convention is to end the test suite name with "Test".  For
+// example, a test suite for the Foo class can be named FooTest.
+//
+// Test code should appear between braces after an invocation of
+// this macro.  Example:
+//
+//   TEST(FooTest, InitializesCorrectly) {
+//     Foo foo;
+//     EXPECT_TRUE(foo.StatusIsOK());
+//   }
+
+// Note that we call GetTestTypeId() instead of GetTypeId<
+// ::testing::Test>() here to get the type ID of testing::Test.  This
+// is to work around a suspected linker bug when using Google Test as
+// a framework on Mac OS X.  The bug causes GetTypeId<
+// ::testing::Test>() to return different values depending on whether
+// the call is from the Google Test framework itself or from user test
+// code.  GetTestTypeId() is guaranteed to always return the same
+// value, as it always calls GetTypeId<>() from the Google Test
+// framework.
+#define GTEST_TEST(test_suite_name, test_name)             \
+  GTEST_TEST_(test_suite_name, test_name, ::testing::Test, \
+              ::testing::internal::GetTestTypeId())
+
+// Define this macro to 1 to omit the definition of TEST(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_TEST
+#define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
+#endif
+
+// Defines a test that uses a test fixture.
+//
+// The first parameter is the name of the test fixture class, which
+// also doubles as the test suite name.  The second parameter is the
+// name of the test within the test suite.
+//
+// A test fixture class must be declared earlier.  The user should put
+// the test code between braces after using this macro.  Example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     void SetUp() override { b_.AddElement(3); }
+//
+//     Foo a_;
+//     Foo b_;
+//   };
+//
+//   TEST_F(FooTest, InitializesCorrectly) {
+//     EXPECT_TRUE(a_.StatusIsOK());
+//   }
+//
+//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
+//     EXPECT_EQ(a_.size(), 0);
+//     EXPECT_EQ(b_.size(), 1);
+//   }
+//
+// GOOGLETEST_CM0011 DO NOT DELETE
+#if !GTEST_DONT_DEFINE_TEST
+#define TEST_F(test_fixture, test_name)\
+  GTEST_TEST_(test_fixture, test_name, test_fixture, \
+              ::testing::internal::GetTypeId<test_fixture>())
+#endif  // !GTEST_DONT_DEFINE_TEST
+
+// Returns a path to temporary directory.
+// Tries to determine an appropriate directory for the platform.
+GTEST_API_ std::string TempDir();
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
+
+// Dynamically registers a test with the framework.
+//
+// This is an advanced API only to be used when the `TEST` macros are
+// insufficient. The macros should be preferred when possible, as they avoid
+// most of the complexity of calling this function.
+//
+// The `factory` argument is a factory callable (move-constructible) object or
+// function pointer that creates a new instance of the Test object. It
+// handles ownership to the caller. The signature of the callable is
+// `Fixture*()`, where `Fixture` is the test fixture class for the test. All
+// tests registered with the same `test_suite_name` must return the same
+// fixture type. This is checked at runtime.
+//
+// The framework will infer the fixture class from the factory and will call
+// the `SetUpTestSuite` and `TearDownTestSuite` for it.
+//
+// Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is
+// undefined.
+//
+// Use case example:
+//
+// class MyFixture : public ::testing::Test {
+//  public:
+//   // All of these optional, just like in regular macro usage.
+//   static void SetUpTestSuite() { ... }
+//   static void TearDownTestSuite() { ... }
+//   void SetUp() override { ... }
+//   void TearDown() override { ... }
+// };
+//
+// class MyTest : public MyFixture {
+//  public:
+//   explicit MyTest(int data) : data_(data) {}
+//   void TestBody() override { ... }
+//
+//  private:
+//   int data_;
+// };
+//
+// void RegisterMyTests(const std::vector<int>& values) {
+//   for (int v : values) {
+//     ::testing::RegisterTest(
+//         "MyFixture", ("Test" + std::to_string(v)).c_str(), nullptr,
+//         std::to_string(v).c_str(),
+//         __FILE__, __LINE__,
+//         // Important to use the fixture type as the return type here.
+//         [=]() -> MyFixture* { return new MyTest(v); });
+//   }
+// }
+// ...
+// int main(int argc, char** argv) {
+//   std::vector<int> values_to_test = LoadValuesFromConfig();
+//   RegisterMyTests(values_to_test);
+//   ...
+//   return RUN_ALL_TESTS();
+// }
+//
+template <int&... ExplicitParameterBarrier, typename Factory>
+TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
+                       const char* type_param, const char* value_param,
+                       const char* file, int line, Factory factory) {
+  using TestT = typename std::remove_pointer<decltype(factory())>::type;
+
+  class FactoryImpl : public internal::TestFactoryBase {
+   public:
+    explicit FactoryImpl(Factory f) : factory_(std::move(f)) {}
+    Test* CreateTest() override { return factory_(); }
+
+   private:
+    Factory factory_;
+  };
+
+  return internal::MakeAndRegisterTestInfo(
+      test_suite_name, test_name, type_param, value_param,
+      internal::CodeLocation(file, line), internal::GetTypeId<TestT>(),
+      internal::SuiteApiResolver<TestT>::GetSetUpCaseOrSuite(file, line),
+      internal::SuiteApiResolver<TestT>::GetTearDownCaseOrSuite(file, line),
+      new FactoryImpl{std::move(factory)});
+}
+
+}  // namespace testing
+
+// Use this function in main() to run all tests.  It returns 0 if all
+// tests are successful, or 1 otherwise.
+//
+// RUN_ALL_TESTS() should be invoked after the command line has been
+// parsed by InitGoogleTest().
+//
+// This function was formerly a macro; thus, it is in the global
+// namespace and has an all-caps name.
+int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
+
+inline int RUN_ALL_TESTS() {
+  return ::testing::UnitTest::GetInstance()->Run();
+}
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_H_
diff --git a/code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc b/code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc
new file mode 100644
index 00000000..46b27c3d
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc
@@ -0,0 +1,54 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <cstdio>
+#include "gtest/gtest.h"
+
+#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
+#if GTEST_OS_ESP8266
+extern "C" {
+#endif
+void setup() {
+  testing::InitGoogleTest();
+}
+
+void loop() { RUN_ALL_TESTS(); }
+
+#if GTEST_OS_ESP8266
+}
+#endif
+
+#else
+
+GTEST_API_ int main(int argc, char **argv) {
+  printf("Running main() from %s\n", __FILE__);
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+#endif
diff --git a/code/cpp-httplib-0.19.0/test/image.jpg b/code/cpp-httplib-0.19.0/test/image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f74b495328f3cf26a12dd2c4843484cc6a13561c
GIT binary patch
literal 33653
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq}t>f#LsK2AzP6{F40Q
zjQj!xV?6@~3nx!s7FDn&0WgU~{C~&5=a`b8l**8DfPsO5@&9dx76vvJ78X_(Hda<P
zPBvCHPHql1HV$qcE-r2^E*=3MFc9G3;}_uP;}I4X5fK)ak(QR0k%t3Dc6N4N9$pCn
z0SPHlK~X8V1hI_&2N(o7n6@*`Wo8s)U=n0x7G(T?gmDoA0|PrF2*5nR!ph9V#>l|V
z!O6wV$iT$J43cDo$}%!AF|)9;fh7ePm>8LvnOK<E*qK?F*qDkLnV1Dx7+4jB3>^d6
zgcFqt8%2yJE@T(o=%jow=;A|Tv7`?wMNJ=7olSx#E!vb^e8|*Aee&YXX5t|!C5JCP
z;!tbm<dTqVnd0iUWJ}oPPz|Y1k3S!|^5jcuY3tObTaR9S`ZcYrZQ8PJ$F4p5X6_!I
zUfw=^`S#=2pMSUTh{&kun6YBVi5o9|Xj*zkW>$92T)Fe)&6hv5th}PKs=8*a+I8yI
zt6zc)OiYYS%&e>|tZXbC%*?rr3`~N|EFc%N1_~!Cu@yE>G+MavgUG>)50#xngOZ9q
z8mpK%H;GLOR$Y|5=@5JICDTVP&Eg@GIY3TTGjo+vPbmpC|Fn4XVGYg8k3Y9eS+WJy
z$!=i?N8@xe9w-05#lXW1cBUYMJ;PT&tv8`JR&NYXT6Z+IYqw|_9`2sUpXZ-T_q=$l
zJ6&DYIVkwmrdbkiU%T0VzWk;?>)GYaCU=S++bsUR=RZS!_8*-(nYxvKo4<Yfxg;+5
zv)y95iTQ=Bmlv;iXvDVavu|(soA=jWo(tbv=<mI9N|HzCo$CHqPrlVQuWZ}y&UuE}
z@a6P9bsOCuom#u+{VG>SEB6BHNfze!cGpSv^Ibk+d9ip?S(x#O3A1ngeC{);>5--G
z?VZ1~zxV!U;5pNt`Pk+lpP1jN6Lyoh3Nu%~oL(aK-Eg;DXO#IL&V^^rRP_`;ac-XM
zJ4rsoOJ6S&pNH`W2W@0m_{N8BzEpC0uGiNe(NPO0Ip5D~sNQ&^`pL(~#uGZ8MQwi8
zry+TILe2VTwpE|wuC3b|z4`a;_Ek%>1ldk>zgfMl^hP01fuO9s>D8>%*@|;^PI-Sq
zYWmVj-RA8F3oMWDe_n8hf7ZV>&uv#+{P<AP-J<xr{H?F|j+C{xub9SEcEar6hQCSw
z9Ouq?Fh4Y#De7q8wq4g&XZkz6a$#OH`DFcrsKt71%T+9eE>8CDs}FI?&whT^%Zj@r
zd9Hh5Nb;Ai{=>$Kw<gO6upT;j)8hOkkKe(w<859FUGUo!y}ju0q`$9&f28GD`%6Ag
zJb3bEq`TIn;_Q_#uP4+-J+t)uJ2mn2KlXKL&L-+#CdA0hQ0HGE(0Mv)E`dZzn^?e-
z8TQzJ-hFO<^uBoAn|pKDO4xqZ{2hGxq3>=5>;DW>Kb`&0kot0mdq?HGxaYm!+T)Mv
zv)L>@fB)`>-+#|*o!xy_`{rHm%yQ8)Zj+oIUccAAaC!37XGdiw7);mX%Dw!2n#{zL
z@~cz?KUBTld!*d#VvI|+%nDil&0Ia7eBC&cPHK41@wNNA<jQe7jVJw=4Y>X+Jee(8
zcwpMbus+S``%KHk<|SOq)ll3$LE}YF<@!5U&-7I7nebHUamvL<^DSB)UH;7US3_^@
z<C*m{IeYg%PW+LUXLohRuLk?%*2x<m)J<}~H8-mAxy!7kVAaj_)3(O%txQX^yL?oy
zOonIf)M+-WJg=@>m|UWrTPSny#DV!sct4v-CfYA)dhq11MXf_?&BnDv79g~WtBCv0
z*k>nwIzByZFN^fe`r>5Cdz&`=4*B5tQGWNn)Qm6xbY3qHkH1xQaru$dKkkX||Mt&N
zofWyXa%r*3Cc{eE-pHA~o+{tftu|-`)I1APx%q56m-JDd-zTD`uU&pJ>G|Vrd4c~K
zj+vYOk=kEZu<y!?A4TpOPj&nE)NTB3xA={D#>a=#=DAno*{`bn)Bk%};GEg_OuKeG
z@QzsRF0%H(TA9$rT~QW74?Gl_ovZ}AmW9nryPlh&yt^#$w^7}P`orNyg|CZ_PucI?
zJ=wXf=8@f#SC>EYz0J^j8{~L*u`2(a%CtPYYZHF8?vS*WQhzzM`tojjn+$UiA&+lo
zs=b!Yulgikm-hIrP0+LKdk>zxS#$A;#om)=x4vC^>C?7(meY6kHrK5=+vailrNR#3
zqZ+jitvR#Vi74!85LZ5@Rz-G%1_t>ZVC<UobMa^MbGpy+4LwzK{AQ*{<b-cz_!Crf
z=by;A<<84KEZl#ka$ohWTkp@LZv5h&`0JmJOIr4-e9?RnwRzE3_Pf6p@HsZo^2;)n
z3k9{S{5LNAWgL5Jm;IT{r~Hqe**^a0_jp6K^QT!mQtW-N>|a&+XXhWerSn35FOFDx
zoGI#Pl*Q6K){IAMWr8jqn4S>2Tx3gOc!GD<yB<l2)qFj?9KScR^m!=AWiFjR+w^x7
z%kE5(x-(lQ)V|&ScxJ`dpNs#5zrTCr<jo)H=S<(-wBGXP_>6$KDD8?pKH>jFch>DW
zd;He(AB#T~7?o-KldQSC+upje?os2i>@xe!Mic)t@L1|Uo_XW9H_xu?dk>tvS-JSq
z-;-Cw&8~BvyB9LkewG=J-N%_5=cMRJ7pQZ(Txr!xnL&f7z*pZtn?JX%_^<d9UaoUq
z@mXHAMOI6<X4F4Pl&K3nyFM**$J1k#?(ZxA-M{{$;*Z7O;OFoD?qB<0=7l}pZ5p8X
zG4I;zd|GPy^)D4EX=^U>d*!~WR4@K4V)-m~@8S=pM(dZwE&TZW+rH~>_Gi?ky9@cR
zlbihE>1WZ8zQ#UZ{49j7X<a<3U7+nQn(=5_AIom0wH8YkckO11vREAfk~^^WxXwn4
zin)smFHV_I_p!yJInl>aq})&E&(mkpQH(`tj=zl={xf_y{^(D!v3$m}{^;*JBCX9?
z{xh`gy<K<Y)A`RTZ}fBi<#X2`Tl=5EG_B0;#=nv}zy112^+xgb$6xsC?0Nb0^(y`~
zzxe9Y5`zCpzxii5w|`5)>9y5&c=pbmC#!$=$ChWB3uiJPRyxtXSP>Lk6DKGg+|Cwg
zXyU4W(vU9giGZkc>r)rMEVr8bx?tN@XXSa%=8D$dcw_siV&lvcF2%Z*pWQ`xo}RD^
z`^>kqa@}k5sI?FOem(u^aa2p-CWUXI4C(Rh0>=dfFMiGqTNJrT^7KsaPsiGM0`6(u
z)5sT1x#x0aFR$mDJOAFjtdmc7@c4bSp69vkvWq`vSRB9F|IX$=gJZRP(r@>JS7qE^
zp3?sFaK~TeN0Q$vAHVJ+BK~B8E*{lQ2-~1qV=gZC{v2nV`oEN<<?kgm&Kxhu>{%$u
zrF40<y-j7;t%h@Y0(ECjN&k~5%s*~i_-$Us*ZtMa(>HDKUs^r+w*HwDy{vC%>vtbI
zxc_0){Es^4j^9@PvG`Nz&uX6k3@rOHzfPZ1v%B13d$#cW8?!cEewp9?@ywsvg>Cgm
z<NnSqi#vOs|Ka|!mwSrbmDqcm7rr><$o^7t28VS!$B|~&G7)RME#ci1%6`~??mvT-
z^j+7Qo$2bobi0f8rdr#4xoH>J|091|iR|=c5BnvbRaVb4zr|ZG^GD;a;q&)@=U1OL
z&iS1CXr08uJ)wI7?rE)Lx#Vb4>{4-3nBDnWtFN283d^IUO4*r@PU{p4cdm4~@x6U*
z#NFeS>AY9!lT!HDTdSJ=9xtm@+w4=2I?ecx`ft1A_jlVz%KCAn_G@<kO@2@oX4&;@
zYuA=SuRB~9L51YvM!f^8{WLQktvfKSPwN`X)~+oD+U_D-3cVvl*KlS$nzk`)gX)^l
zs9WDYUHy66UxoLvwCG=VRh~(mJ0?l^i==5eh`c+0{$A3y1(iWh+25R5wEu(mk-tCZ
z_HQkApZVzf4#{d|mYsa^MYX9v=Vn|H-<B`medOTrbG^sr*QGyxyJG$-(|4setNEN?
zOtAa%@ATPyv3nNueHH9~;~jCf#?Fd=xADi<AI?u{Kb{^tee>qSbNmn2?=%Yw3pnMh
zc}H-E<uu+MDZv#1M0amUh}4MV&(vo>{&al0+U_9UKVRDp8ShO^{MG?&aJ+ytIAT#6
z94eDMQ!-PMK3R*ECkI8$n&kPecs0{}n~5qnv&D1~k@_a!oK5S>s%e)q-_>dOuN3&t
zpxA$e{p9|*Lc6OkUIm`9`sM%PPo>?=H|iO8(w9&F@N4nA*Wa$6*>reL@r&G~wK755
znYI*$^=W22@ZO+xxhu+I^#;|&U0WM<lh(>`T|BBQ6LgI=n<>g->6*|roY|sftWkyD
z?o7KyR^Q5sYMmW+?U@JvpRlKnKO2fFKKsdgDy~+O@PEay{962sd5PN>%v`)H@ZX;(
zQ@hOLpv<&>md&fU@A1<&Za6*l_}$;Zzva*TwSBRD+a`zlSw<@H%l7cUKHH{utMS(&
z_gk+weG@r;QK9y?`Zv4GPk-OCh+q6<D|mj{{o;@7FV6h2^+x(B=XbyFmc_E=)I6&D
z&#=>!MKExOEnn)6Jc1ol5@If@+{LXtVa0-JNf`{%lRS^G2>Z|Y&tSCY$-nf^B9mQ?
zf5}~%xWQk9{n6y-iua#7-nLpRHv3R(z2LK--?LutH=K6-f|>mKM@QMxtd4zju2>DL
z@^*`;Nr^2g`5VMN>yp8p)Yspn(_TKjZm`?k!&E}Gf2DNwFKfNy*XOFOlB{Ch|JCpK
zo8NIOqq_QLJ~<+gvG2PilTJ}Kvs#~KbYqmoYIl(>1*$hhGmq-Zgx(Okcr*&!&SwSH
zhnm?;TN^=f2+oX<%CRxFE9$`NLhlXQ?jnoUY^@DC(wteUqfmFslKabg=V_0xq_kgF
zk}7)n@yV}6+zOlioV@;E!4AP#{i4?g_kCIL$JkyxC#~OV^19PEW~6?(Q!kg(bo#Ts
z=d`9z_oCBmBQurwmp{xuY-X`LTk=<<eD>PYHzL_Dx$HaUnEcF_?brOUeVsGDxaINx
zXJGmh{o!nzZkpy_Bfjl=-DdWyRE^F|7o|$qV9)W-+t1BkT(b0n&Xc9@7H!?7RqmbF
zQh(lg`>CB<-|RIP*>PUu?|+7k&v#eHK0JJ=|EgZy`&%D;Uc~8c?AqQXeKf|<xngz2
z!abok7VZgsX%}>*Zs%eb>EE~W@9aP6eyILI=DgguV*LlN%;aBIx4u7qdwuttdnd};
zpP3}7zdHKT?)}5xW<S&|7gkN9Jc{61QRB62b>xNxTlP#-l@&15{LjFUwZARCJ9M)A
zWhI%KT|SX^E1FK|)EjR-k)gM!>uvR{s{HTk5C3Q2p3M`xb((#E&~JNr_2}svHhRBQ
zv(JD0>_kqz@fXV#+XKC`j;{{zXnq;r{ZAYeZ-T!X`)~jFX?16B>oj{$kTx^d<n=GM
ze-WF$;neX(Y>fXI9`H(o;x0_{uMz9D)Jv(yzq+*4rC7Y9Am^=+EsorDv1Inzpszb_
z-&$DqG5KO>?adWzk=>GWTHK8;uQ)FgU_4#nXK?(r_oZi(UWe{6o%iyz=qu4GE&WYv
z8P4tIQ|wbxUi|FWT$jx$#?y_aKkeo10oQvEyQGgsALV_t?kMl0HSH&(I<{V|WjE=1
zQ*f`LIQH_7{^cfe7hn9zHJtEk<NFV<fBoYRe^Z|EFFr!Sf3g1Z$A9ee?u##YK6~E@
z0_{wAJ7sZK6gUrtgL?`E+8eziMDsMuKp7HL`z>w+m8PHy^Qf*2r_Y+2)9WJwqV9Wj
z?N!!2%l@1F$^N#KN7qu1e>t&ZXNg5oZ6MENpFiiWHLnQ|yBJ$PWozfYNtXJ5^l~<o
zU5j4HsK4>j>)q;X8ZvX-6l&__&6h^qIa-`6dc<wxnZ^sh4c3)xm@&nrUFq|re$J&n
zlf}vF$bF~>H9zVmTopfkttjlge_nWMmF-c@<4+|_{xd}Fle|zCH@nRyedg1575DC6
zFFb#!|FT@&e})^M?%cL{U9k{Lo+>G_Dbks^G2BT~qLf9d$v}W((To#En#>em-OBwG
zAK_Rwn=?d=c{A^fTK1ezaThMh+EpgMv##D%+rRId-=3^57tYvs<iCGXcg6FJc?y|T
z*w)6dN7EC+`ZPfUS5X$Ci@Tygo$ocEPF~W=-WD0*D~TWN{S#+aC_3E}zomEKqftfR
zuf+4`;x~WYtA0Xi`r1U*?)iN;ce?*)khpXGL)PENR(5C378=;vJ^meAXIYrczB~ED
z({HtBR-1K_)65Uk{n`JV<Ino1C-agMe>pwda6|DwL!IF6%Lm#1GZeg^S*2^<ZS}%(
z*Sjm%dhL|luawF6tDoUlKB?@fEMBfUw{xY+J5S52jsEi{S5Musa8JMuNH&1A2j2wT
z(|Qv+^Cy4cs`JZt-mS0ZFnv*0`2E7)pU11i7jKj~{A>A_y6G2do8L+qU-tOV;ALO3
z-|^?B$8)@2X5;H{k(Uv|wlrUzUcX`Y_AjRmojZ2TyYZI)bfQXa(T%$OO<BgapSyi)
zwy&(~yQVOAc8^Z2=6T11-&B5UF0PfFxb*bHCqgf;-~Dm-^u^OxlK;Hlzx>sYy}?%H
zs-)K?Ydw|RdR2M^1;onK8W?w~JYroiODtahUrOaMf0N3-=ovTu^=(^Y#*yvsBYSV2
zk?g+^+0CmjX714l|0tI~ziio-S4NZUCT{psxiRN-={it&W0pbdjt0*1{Tz{H5X*Zc
z_hY}PwZVUeM$6u{mwA4q_WWlM_;-Hm**AAHFTGNnQP23>s=uRZ(WYH&L0lVFP28dI
zeBwDaBSV|RU)Xde&T(0kXC!8ObWO8apBAXC#tCVjiI%Z!DFnB)!DS6NT_<?Ei);nA
z>(+sr=nuk^rftx=6Z8hu$V&hXJu!is>5IFzcEvjRvOW1Cu_%Zk^2w~*hm<<>>(<nM
zwwAGQeztezI;%Oy;t!ei@BX%`XXCYXM-{HU5BRih>DRwv;>nQ<|DHL%@<~I${IAp6
zt$fAuY?6NVc5k2fXeIxn`(OXA+?Tq6<b3dS|2(;pzw%4hPhaz7>9YlU)}5Mr>E4#d
zpC@$Hua1|wT^2XHD<*xy)AyD4?q4r(hE?S`FXT-3gx*+<weY#Ix+36<zWOWss7qq%
zS*NpVjkL56uac_S_RIL(-enhmMD-bdd2;{p^{;>86Tj(isi{?OSAKOQ`_KJ{f0ZB1
zOE>$*3mu|+!?oqnv_7pjoEeYS!o$#AWNTy8foXl3*`lC=CAKkaPSC{z>yGLsgzi{+
z16<00#$j1A9!=Yz?Jk-vvgl31>Z&zn()#C*>mTMe`}FVPw|15qiMda|R`1?tU%pp%
zroYIIL#sD>t9?>i`nA?~&E1u<xBi&Ee5LmIz33m~<eN7uiVD6=zxVuQYN6q~J9YCf
ze%s4#eiqA+G`@Ck(0>Ml?6N4i{?b+Vq#UzaPkqt3D=L0>RzvEHLYYZ|vQeg%kJ}~Z
z>|{Sx^=@nR+E?GBmcB09v8(6}yQ{3I_|33}^w@5J78iGgpXV0aY&vr;<`lC|M!sm7
z);*1!q_vOQK8C}_3(7RW!XoPP0<P4pT&<FmDSG|gjC?=$H&Qj<eieJ({$(%kll`iF
zMUCa(e(yK)GyX+KOWXC#oBZ+Vx4+ZA=zJExEk#kQ7v7}OO$h7Lx>Gn)M&tc`9@kkJ
zS6?MJOP<to{^+?%Bb3XGIdSGk5zSA3em<R+R`gu;M$~MH&@#=Crc8xdmWymsJDV4N
zNHvx3^AO_gOWe%o$Jtq@z5d46)7&T4=Pcaa{l=&9z-y<f=68HIuRJ=TE~t3*rk_b>
zyiO8H9n25*=iXb@O}aYWVe_PIQN>{|R^EJ9CHSAg=Gc9!=gv2)@+3aaOMh2!?%wr^
z$sZPfIX-{?H=Dy|>+K+gJB~7ck48*SXtSnb;|k>!7F>62ojvx6-zpK0-}3rn-;~15
zb;>r2x0cjTzv3lp*<bkd*Zk@?dKdoOn<QD^wJQFawEXptu5+$ir;*-i#8KnQrt`Br
ztGissY_#D}>mL0rvI`$Q`SAFQ^IQAP)6WVSeV>~znv)oMW9i1$$m37{Ej@Ry*7E#O
z!LNz(PYf3`e#-qf=T2E#Y!AQh@t1!pciRL#I>sOI_SgRKgVWP)>Ji@}4O9O){kh7g
z{nJ(EsmU){x0<&}ZqJDyOP04J*Ux3IIdd^{PvrFveR<orn(m)|#N$`r;je$>4L0xI
zZM`u)$=lFWW$sCp=ON6`kKB$}z0tX1^~SJ|&dH+rBIaE?lG;9ofjWN>;SUQpHb$mT
zEafvgpYS~W@0(b=3pd;Q9?dT+io5#a$HwCZ&t>~}eEMDYeg8N9Efq$m{gt=;4gB6$
zZ}{)&44H@WL7;vewsB4ptKHSP;w#nuGo+SV+7xVhRh_=YUbj7eT{Qpo4?b*Z`-*NH
zTKi~ikJfIHZ3e6CU9R}eT@`(I^6xEKJ~qj@v)@TSy<zmDSm@pFIcsHJ)!3iA{k3*~
z^3{VZAtmP)o+7%44?C?===SN<LFFE?@?-}Qu1TJ63>q_37*jvJf2Kc2<+J-twcSCk
zEuw9QjJGNUf9v>{ZZG(IcY5gJ%Rd6v?Txp6Ynyo`)##t#hVOOP^o(_{Z|~YIV&1h|
zG+)Hb5FFr$-Zog6OIkuyc=<ig^lIKqwJT<rT7{I$d)(H%@}MuL=(t{x$deaai!MLw
zi}>8g{;j6c*3D8V;*!USlmbbK5{0hjdCt>CHl8^Y^C<HdKU>Dr<C4cKPB7W&&RM&Y
z$YC!?7oF=(&^6ZRu2^s{fHPY(;{j;&g~^va__CPMgbtNYoIQpekGb#f{C;Ln;ewy*
zv$Fe^8&3c5N$#o7#_MJVOZS9sYz<GEc1$#%Yp?dnThp(bL|p7m+xqwPpD8u$|JdgH
zl}PdIsW|Xjc7O1;DLW3#|Ge+t{`HUMKFcPy?f+^0d3~$D?tbxlkte-(KYd<xs@%Kk
z&3sFa{|t>kpWWW{<xbFJn|A%`bKk!0ZjuwJJUxH+w>`>M?0p4CqmRaRNgs^`b)hA|
z-RHw1<{%DCxRtku>&BtB$|rXn?qn{zdp2cjp7Qz|x!2cUGCsd|<;4$alJ1&+AAbwK
z_3QqIyNe&a?30uaQ{Mj7|CRYS_2ZW1J2FTdq{1w30>vigzmlKy^v2?=Pxmf<%O~-}
z@LApZ^77*!&x#o<KDvEqZI33rw23~nrun4R^sA<Y%(Gl8Y>ofzxXb@Kez|dpWQ9?<
zXYQ~4a(QKw!g%bIzx<v3N3MG=b1}YY5_n^D>Aj@uIa_4KUWe|n-?_~%Cfn&vnTy<;
zBRt#rlqWeUuXbA=C}VNv=?S}lYhSzXribpl@;-j<*~`<5Z<KLu{X12J`L@-ah$Bi$
zmh9(>pG}LLd3vVf(_TG^)fI%xooI=G**}y1GrX$W<Jzk{`@2#7CTsa0T4~F-ZK<De
z*-QDA+`{+rYjWQ2o%vS&RCc2B7w^mZg@4_;FPy7Pez#VJvi9Y+j@YKYzkUKbm;2XT
zb!Sta6l-^1rD{b0!wajl1d*R@HJ45sTNY1x*t&9$){R5cK876=jqQq-2;HN#%e<tt
zBxzlXk-;ktQ}!1Yzh@h!7)+S(;_F<kzoxua+*=oX4G;^wdF;%7XC~tn2d5utm|nek
zj)Qg4%XcrjPDc<kHvjoQ!}IdF^<LS`j+-ZKlggG~BTzQ!*%W)1gpWV3TgjcdT;SgG
zdHS7?b9b-%sQ&Qy%YOU%H-Gbu&aPgNFJh6j7Cg9sv%MdEsO=bQPNH+g!k1BU3%~v~
zl03O)%VTq|&#|2*A79T4za3?N`c<mnm$}Dx{9EV0`?vWm``H%{rTlsfUDeWOxw8Bm
zxY<r%WF1!#6B4_pCVb*=-(Q=RMY7AAzcp{MiJ2$kzeqmw@0_Wdp3l!oTKh2Un8^07
zZ3e5}1l>3U;%S}P)3`FfaJl7whVF-dM329+ugl$StoMxlp1t>`!+JV(g|{D6*3I8I
zGwtqVg6V#Z^Jn{W-B0WFJXLt?J@17{v%Zt)?~1B$<E<+>bCz%R(Ru$FJf6L_4v+m=
z6K1zF$3FhxXKrI-v82cuS7*HQv^`g<&*Z&f;hunpUBr~~8(VoFwfR1o>wJ0Fw4>(_
z8$1_ScjrnT!}s{BbGC1_va?avc+OY%_;<bc-D>Vzc4CVnRBA2V?q8E%6Mw>3d0x%0
z+a!&JqZBjYhvm&zzOZ_-P+D*Cwrb~3KgxbR-SAia;rGRCsdgpzM6m{S_oesq4hJ;7
z&HlZd^}xIKG<mPd(~?dkD(XE~_coNg_*8el++)|*94}sg@&Ic@iNZU+QidBFo(VWE
zx<_E@Y3;0xg{{wK9w~HL`eb6SXsD~F$~R^Xu?!^_#`MWg=by2+@P0Pm$iIqH%&_hm
zq@rE<=Ukog_p)>AJ(qu27+bZk_Eyy46{k}FC?~#4ww&_%_R;90e8d(v_cTJc?3{G#
znRUnc<HBrlTTI?$-gp|h(Orc{^_0`>FSj}qPs&XAwa8JPeTAb*@nM;ZvyN-EJHI)!
z*rqwSDWb?r=((`}g<ZBGr4q^0?0pVse`;4HXP|p)qaMR#$19JH6$`S=ZE!u-C^o+?
z<&cTI$y?pRE6<Go$vNNIlX8dc!|G(we6DRMwd^*-un(&*{F%DqZ?=cnyKLQ=U(Wsh
zm0n`6Rb%g#Uu~@~W+%7t_pZA2&D$P5?wDV1U-A6cKb>ad8~8d~v0Z!Sf4+R~e(;8P
z-AGUG*+=>7PL+Gur<%Q2eErY=yxHIB%O2S&KC!I6SG;}e9m5Zc&&B+`zxAQz{z`F3
zW3o-_o)&>7eojKzF%k1F83S#zPq9Cy9es1-Pua7Tm)}^fzwEZIpzi96A4Tp4;8iK-
zcYcje*zMlWv*r05et~~0pMSD{H&d)ge}OLgTsm=W%qW(>o4=&aczpG#?c%q5f)9?*
zychSbG2TedbYoZap|w4sd(g`F8%LuLt-L>_RDWf*;c6-8(%&;}w2nWp{}5ekIepRT
zgA>YS_lMv9zVnu6?BPeYkH5vAuvNAadyZ!;b5-QC*t*lFf2m$uTTx${Gc{x__s*Mw
zwKun&E_h_Arew7xYpdYlo^!GC>aV4?zFWU4=2iLnbFW@GtF&+X%kV95!?$z0<qSDG
z`W!#6xw&*wTG6wBnP$sL4|%Qhr@#L*tavryl)uEBU&X=>7Tb$zd-<|=N4x**wORNl
z=J=jE%{$-NGyeHU^0dF)HT|o<{dD{0i^V7J*F+VlqOM~gBJ8JYP0OnN(U^MdTGrxb
z!IOIPGhG=N7Q8T4;i@@omYFhh&b~#vRj%DQs{1hPnASbfoJ8-6)yZ7zj_US+c%VAq
zXtk8wk<z1^WzM9iShlaqsOq?4vb%bb`-;<^4!0)hAG%$0?B2~wFE{;|ab(xO>FEY~
z$CY=ur@oQJz3A?I{oH+JfA!b$@}2W~`72t`kUdkc%J4tKy!w>t>sES*igo9@k46=R
zzY@RyJ3fo&mX+AYaMA-@J6W_!fBO1=yO%mE3#Il{1x*gB)GzXn>XP})cmLuKshQ!I
z?E`*%{vBWVEqF`4>7w5GarTZsihg$exRp@s@ntQ^6KJcC%yIP(o}S!mBcA`Qy?1((
zy^G!D>tD4}`x^IX;S1<vBAd=DX4&YeU%vClm_JPLUsRXDudw-LIlIkuJr3`$KmK^}
zhJ$)KrPu5W|GK|VySXzB*RVlE{<GzC*{9iTdv^Ebs`#R&Bjv&VeevHI-oA57dr@*v
z=ld^r^T=Df?lX(skJ%=_{=v_d&BkI$-oinCPbSZGJ}3q%BtZS9?Oig4Vc<XyPg?t^
z?HG7%N5N6vN8rJmq_&UYNoyZECo^p`09C_{(GshbKBa!_`ukSmk2rVee}-7|{|p`1
zKb*_IRV&}U{IPtP?LYSUudD5otlbY@{o(SfsOvw2MbTg7Cuh!8o_>={T2O1fxVCKh
zf|G7$vG%!T?N2{ksoR-j?-?#x{k->K*oW20BHLS|C0192Zfw<sbz4EaE|73g$EMwr
z&V7>J@x4OELQbJH{+rWcRn8eFJc@aL<un<KpLkPyfAj3C4`*3E?91racpC8Hp4OoS
z&;2Di8Qhhgol=pq6@M}TTj+;QKF_;H$lto-VW;<LWhvHB(Io!{2?v!6E=w3TpRf!2
zbMSM`z0A)l-@huIv%ho0rR*`++)nv3{~0o#hcCI@6TrMa{QPeBh*C+P{q4(l_V%1A
zhz5<#gXSDbY3Q``aNRf>sxbB8EX&0v6*sKr?OwU!#5txwLz})cA5*7Ub{@|Jt?gJA
zb?10#uIQ2aq);BV+u<9R7tV8Dds#+uY0rNK&VT1O{*vCjb>r2{hqG*!OaJ&P&%9~j
znQ&7Q=95<j`|zY2O3ajP2n%%d*{9U}Z0_Q<R&$o6PxmkSIH@2S+^E#d=K|NK$z0J#
zqd}u-If<a?gH^ioeo6;^{c?SCaip&F!~YCD`9b>&SNse%kDWX1LGqvbJ9azjS#Z|y
zAO048?50`{_N5vV>#8g7zuK1lv|Ih}-%FjQV!^u(M=hy0S6Y7i`Ru;amm@#&`}tem
zzV%MxN8q!{-@EtebD#Zu(#$aI7-(D)yd;f;2K`~CZJ@CRgHNgd8LTsP=KKkmSJ?L_
zdWF2&-^wG^k&7409A3ZVU;m|F?Hgnl7tWg%Ya95zUi`NEqZ8)}`xhgxQzKBmhxFEG
zzdL!Lw9-H0w^Mtg-0ss~_%H3(t$2DEl=cs;?FquswuF@Pt8$<AI=`|yB4oHEXuezg
z*O)H(g)8bJCoesHaDrTW{`|MaCPjA+|GZ!ENAP1+T!}B1sobS;8J~HlPv4@wHtNkE
zv6mrzTZ}wF9oPHUbq}^YnbGm;@he!Zn)Pe#yR|Ftyb53cDmK<5W$NDZi4PcV@bkRh
z_*kH$<B7b@*=dn#sd}lLle2P?*7krVqQHyEh#o@t=-kE%8dh$p>#qH(>n3?}Ny5kJ
z>u==t9bRkoOg!Ty+hUfD-+TA|wY#2uW7p>;SDp1e=Kg0`Rc4=j(fGtuAzr!s3x*RW
zY&@}B=_E0$UA8tx1qS;#Y!{DS-8Wxw=F4wW1E)9qoR+icq_SqQ?!)XDL+=Vus|HWa
z3hG^LcW`81__}Sfq{IYwgD>y(vf`JRbf~30HRAWHm&@F!{x{L>SMkD2sgI9wK0oo#
z?s~SB-NIAR|7?$^oHoMj#n!z4dGmSxWvd$(*F1T;>}5`v)ACHcD(jlbZ~B)Xx3W8X
zxxl&OZ_w{~#@oK$)AQr_Yw-I&L-N_;v=_6FMoX+t1`U;ofQDyCE%qxGRz1*JbiQV1
z_1Cp}c5a)Te=q;fkYp$PpMlxub9}~^I=&?*YAwxweEnN5e(P`lTlq5?M?Aki`trxV
z{mtzMGoRai&6NQ!CV~uofu=zsgf1S{O#;uMKzd%HH<qs9+Uv@`FH+z`?A}{)W^o*U
z1%CU-U%7E|m)M6@4?*q7hhfJE6ek;7Bkd<{m3RB+EpE?x;i<%bhHioI{I8S0rXAkA
z>BIT<pZ6>N&M)3@*}IFS-n_o?`M2w5HqW_hj5dIo7(ZLCR4($<?e6r)t6s@0+_XGI
z<nNRHZy0a?S!8VOxa?#4{!5m-_FcR7Lt-1Kua`gLmEZHCsyVOZ1lI)I)4Fk#{8Byo
zDED>7RFU7OwlCuT&*0iC^nmpZyWy^{zuYg+`OmPW%3j(h#coB_KH0jn|M-*NlxNh%
zM=1F(hb~(XOP!bX8#KiPUcwBTd9ql#hU*#&Xrd3iIu<g2#agCW)cd+k>8^S1xAvzW
zL+W<EvG<HKx_&;!FpPwt4$XZ&?Ow$@C6j4ld~;hvuC?Fzen=%Lr<nIv%^YEtPp{v-
z`kL)MW8K=MogLRKCs<uyD-m8_^K#=EKPBgh#n0u0oYwhvBaI_0FDzu;x@WsMpHh=(
zrYgAS8Zr5eL4)UlV?lyqmF%bH)qgJem-$)s*rKd$tADSS=zrt1<l~Bu`CDqwmCo|D
zILauuH{Sj&Z{+zYr<eN|%bc0c3948(c5MT#?EwwNS1dd%nlB2SjnV*>CRiq^%nY=X
zxulQsNr-}0F^I2YI;C~d`q-%#Ub`loI=n);ph$?JOV7;`oT013rd4xS9~M?A=a7tO
zJ~FR`$zd&rvd!!*CF%aN0$%Xld)L3O%x_QDmJg?|1>V1Z{cTJ!>rK-}0!!`0jAyj?
zEZxA}7Qt$lc}wc>ic@KoC7*bECbvB7+TI$@6Lb$$dx8p}jgaQfJuUETVKNt}@dIiF
zLE1$3w9fwNTv0V`a)jlNwYTTQzw*d(zi{>UvE1M0y3Ks=FaNIlp3Yf#KyGpJFT1n*
zcov&wA+>q-)PH__?%BP&HfvK=)pjt&dQN$_@vFzSfAw4LUHN$Sc<ReFKiVIBuHCzK
z;Y0VC&wtI6oc(+XBy1@w-&<cdZ0f3ia$nc~nQqyAzrNL+Ki(~s-^lfM@n>81oo8~x
z3cJ|+&Trn*9yr0F==Hl=&HVK2+)UXehO45Tnk*hMKjc`{5Nzo=Ps#J%eYfL+3@l}g
zjFnGo+1@Slc5$=cF8=QPA6>>@#r$gRB0rBm-8{EHewNJA&v%vg{MorJYqs_Fo^PHG
zh2Pi9U!4(Ytz>^#fA;+TZA<?I{!}TS=YIX|t02`Kf%nu{{xcldE<D51+T5fne&>zk
zw=qV~Dr#S<o?Uu%bHR?*hxwc$EB_R;RXmkTn)4#1XL~2B%M)oS?0K=^q>Ih+Ewu}s
z4|IN>{z88FlN%@ZR6T434ey2)fT|Zlja^XeuYI(#t#w6R|J8(@$sVf@72m#G+iCym
z&3(7nX8m?Uy}7mbd+(f;*&Abj?)R^{_1%|0FUg0Oc`N;A{W+fg^eo%!uw8c(;_tdg
zNvh^fWIyxwaLsNu;Ymq~$FIIhZkL?-;-_)QmG`E;UXKI!)(5?M<u)z+dvX*%gB9b$
zxj72Tf`TXPDyQpg@;DW9N?h$4WVC|vqEP(8e}<{|0{=2DSaV(Tc+h@s-J?~Df*<t1
zU|W9Yx#9XNKPE5y(thE$xZ{JQowY@G{xzK0%z6hh{+l!LxYCq~&I@0yVPt<{!NHz1
z!Q+mq_`HBmf3JE+t?{eR5=#EVe)vb4n&0`u`VZF^&+gw+?EGW>{ax<WKXWBlZrY>$
zV6txg!)fzB${aX(<MEHw&t($3bN(~P)Oqs0pHy==H%LL8!#+!l_df$y#{IU0CvWat
zd|CHAv3sk5|Jv$Hk#FBA)CnK?X#Z)~RQtj+k`6~Miad8KoUkF+<4Lp>V!_yMap72S
zBjZQqv`q(o&hwcxr)Npdv}3y2Z6Z68);<g+uD!Q9nQMF3_Ul}Z%NPHQ4m7`I<9ar&
z`Mc4Ns|*Y6O%<N~cAefYu`fCQ_`zFeK8Cb^%>VW8%6+37kdV5u`nmnN_16F9T(5Vz
zdGfT+r5h`imrR$H{d?%|)L%8li{IQeXR+wNs=xEm@9fw|PagDNmf!naa#P8=L!eG#
z+sCkDS~sBU?bbeO=Lv-@qr|fq<HmutJsSBU773tX361poQ|kP!u5B}wUb1fXa)D=y
zGu2*oeyLsd%ceN`R@8hx8Rb{g@4Wxby!lVgo}yoh-{v)c+56ja`#yLQhOB&uG!Z!0
zX1O>r;Hx`h`<)`AjtPr&r=%t2NO`WWnfmnhs`;y{`0BHSg8zw^{xRlPPkT7s>$~NR
z-N80i_xFFy<bD2habC`P#}A&<=6^W-pTXoAo8Pg2Is5Vsi|5tb+3O#F>7idU^O<(k
z<g7Hu-vJX<>u>aTe>lT4ckV3v!*y@(_UT<dX#Z$^-TjSf(=?NcCM|Y*ylR7%`-Nhz
zK;@+8#~iw)*PK|Ic~n=PX97Rt?Y#>hKYh@Dk$=lqy^~gE$Fz1Ndbera6D6`)xy@j8
z#j1y`I?X4m+OK|f&UrR5cD>+#21%i%b)hotcW3V6*<-1_WZ!>=qdRX!#_&{cmtX#+
zrrY-H<79As8)5(K{@neC<DxU(raWGqWwUV0!XFbef1j+s(d_unEj`2Jp3e7Q&a2+$
z<~Me=U)PIY`&q8!J<mO@H_-kPB_;fdxmJf>2kdJ)cG1>*_H@A`&ASbk-<>$;h@<+1
z^lp(&K5jOrU;by%{#kYX^e@?M)ARQ)**YsK;G}lmySnt{+isqCWh}GVNPl_8mWh`i
zNgVgzvTUdKG^A<^X$*E%xY)Gqnui{V%(S28%47F<!aR!;A+4L+JYDX1a;m<cXtTRC
zXv5ac^KZ3w{AXy*^Zt=0=6CwA-qd%+AIr8?ls@{tVZK>q(rsr!iTAeYGv)~x1vd4q
z@vuK^vg<BS!BwyKi*?iUPaiU5TCTV4I9tM=$rYg+yVgkrky=OZNc4K~WRkh3vQ0{F
z^Rat8%U0EWY&&tMIQQ`6Ca3tW*WYaY{rB{JJH@@?TjT_DdFH$RJFL?^yA|fRw1?Xj
zF81iz2x>&FpK5PZdNw}#v+dDu3v*4E#NUm$eXgff!TH0R!>hw5ez&}m!DiUQA*lDu
zeD}e!c`-AMX8Nhw9_YH+&2zT&>?5jV<ZtmO?bUw;?4Ox0{C!eew_n(sxhm8DPQNL4
z_2XIjtXDZdk{^AOJ6BfAFBe<Z|I&WpYssZm$8nG8`aOCiU7<2BjZ?%c_Qp3Zts?Mb
zIfq*7p6s}5YFEE{u2)$RW|Qduw5N9B-`dX;uROO*ONkBh{3z{xEO`TH*dg>V7ilfp
z=%e90n)zIt`IWLn`)X~^z5M;c{in*s;}@>j`{i1j>s!>ggI1jA6hT*<c>FLrb4z<;
zc+#5ukWKB^r*S4nD%N+nJusS@cV(%WspR?B3WcdV-d6ACQSlQgPntFV>GsL_ug))D
zx~F~dZDC&f8|x4LXW*VGVO<>BKjlaJm+gP|XE)B@P%_iLx#d5Dd;W&pZ-%!1pPYol
zE`3#t=U5kDT7Pr7{ExQ0g6fF+Q_g?&U)is{^vZUU{FCSZX4FmmHDlTGpRv!S8P4dk
zKFPlNHp2c+dr$j6cJrwE43n8=j~?1zy8ZU)w_U#On{Vxj{_v6i#rto?za`FIo%?jj
zGU**E+ozQFg`^~YF<>|Q@#$F7BbWAR@8+v%I$UY&{Cv}0Cp#ZBmqljZ-T%+zr<H$B
zu0ObZY1o~*PwxVM3#`9oZ~V=D=b75D1xbz5<NC_eGy0YrG(5e2=U3jXTinqVYu8?I
zWzkaZGQFX-Vgd6L<4IFG%_{fJ<ltx&+`u(M5>|JC%QTdu3D$6bmOmq(?zTOjeUI{c
zm;VgC{TFB1UAtO8Szi9i!>mp990`$&3ua3!1r6DT^Jo?vjXt!xO*0?dfCdYKW-XA{
z1t8C1<cr1_EZw8kb7}qAwuP+s-yFNYSNgql&R^SJ_kEGw>MSk0_q|&eHYwCjZW4Hz
z%oRqKkUW0pxyqn1#Z~cZ4xVG3QrhwU`kQTc_r9DVySTes_G|aVWpllDU#huaE!M}H
z%@ndOH+Nl9MqZNV!~Cr>U9$dXOx?UBRhbJ_<kch%k0rM`2;M1AwwnHQ`sDRH&9CfR
ztz5rbcgAu5N%``B^l~>;JFY(dC&u|#^xr-It_QC8R_!_cM}_~Fvfq}qJ>fxrCg*o<
zIqM<+wCkzn_Y?C!yX9^9cdh@^gda!#HUGM+w)iIVd69oY@=NNLX|Jq{t~_*T$&J}F
zj{n|tqci(c;K%<Ahn~Inzx~T+|M5fhOSj)X{kEj4KmBXP{^pK)_xjEAZyZnGzGM4@
zqlLnUHC|2943l>}yGLD;yOX8Ts`K#_UJrqqYbi6VNgao{abW$T{|wrD=KquX^y_5N
zoKovw-lc&bl`cQ%{@Y>wd-9z98Cf-vZ^2E$&Hown+n#<sUHpsL=!|#~_Syl|WLWy^
z-$uTPOV3uSa%(*1syAtW)BpPIj9+sei|};Ed44!{&#<u2^vEZFWASNWdT*+ynOdIk
za&wt{X4j&eTW2_OlBR)X4`U3L9v02#S_eu@paD6sAl50xWXKTcp3s6rU`18zQ%w2S
zW^xKkozAEg`_B+k+x(w_dHb2P_m0!MWlQ_+ue^0C#=-yR{rdRpAN@X?Hg61D;yO`M
zA~ZrY@lDwQ*DkGNOL`woTwK4UrFpBi-+u<bqMI8(_#EGPJ9)YQYvQSyTO0L`Mx9t4
zvGj&0e|d6hrTo(JeAzSc?{@~q);(iMow3<pa)+?+lg#yc5-Fk<o&1J5=|O+ie`<Z9
zsypkP^UmsY?f(p1cP_t+xs&;K@zuxA^$h<i{&JPydO6E>_NCOP!pwh#fARKj?9Q^E
z^j-Vpmb<Ph|0322Ed0;V>=*i<q4Dg!`L|xof3M*F)%S1PzVGfUzS%j~1hb!V+IO+O
zSo})8{-3*v!D{n9EBxJE<-@;MXzll&yDxv2drqHn!2Z(h_ct$QS+hrW&*7B6__g--
z-%gf^p29PpI8D+!)5D?gyLooR36F?7Rx@3WToeiGnGBgdB4Q%ri~K2m^}3nY_It%H
zEqQC&%uwZN9}-`%KjW{Q<(jv;{wx;mSM_(^|HhvF<7SO#t-x>p$L0H;n|%i*7^Kz(
zDtAid^E2{GO`TbEqph8StV+`VF8{~;yLkFr-SAE;d7s#{#rlE^PZ;jGZerdV4N56D
zKs60n#m<eR!TU8{$%kCMW@gg$rpou>`8Db9SN&($bY`zu98dGE=(_b+KNfG<v?1}M
z{PH*VAAI4tw+&QMPRTYXoT|>$<lnlBzoX>mmAW;Tzs=JN{$V*Q@-t`VS?5{TSayqM
zE3HkM4%&KqV|9e+ai)OnyYlAN%+b$H+Ua*FBz*bl36^=Xem-swmE{YU&AC-m>FTHC
zd?s4*%6{#d<>g^rk~(v~H=fo0xB9busd4G@Z}Y?ZX9~+-l3z7fZSl=sH9v;~{~28V
zHRr?!{h7VrYuns<na4lXgC&0!#U=cc+;jPNe9wP|N@n@8{|u|Y?9%n$c$58mu+YD4
z_e=k^>96=He>SQ@t=7uT@!y-aNo#HD%cAD{<(vH7zU1_mC*sey-+QrDwte-{ugNNv
zRr{VyoI15@gVuoy%^TUx8ty&3Di|#WT1|p=N5mct@YK1|mb+H(gRbbl(G|Y3b7!H9
z_q*dOKQOPf<e4ncIq`|K!J}!O9qu!0ouBsW-^!3u-8MaU*P;D;ChtCRd-wdAf6UIg
z+a*s*bNzBxZkmN5PvOgNQ!Z;3&BZxS8fN@_zd>EkWxKV^L7zT|I$5nMN&CnA+c^4G
z)OtP<yOkEddiE%_8-1EM=kVHm#DEW3Elh7v+jJW@6W7Kt>D7D-dJoF$L_-!-efg{Q
zH~-5Ey<^8*e_ScyvlEwhW}Yj@vrmO(ZqFme+td9EpLB!PQw8pAzP_#E_^qYE+mDz_
zKaKoYc;M(9)kBWSQ`h}GEf{T`kh`WUwrlIeu#Mguv?GMxgs$Ow+^CxnF2i+AGvh&s
z?6-+a@2{7>?UCo6tfejZNhKuphiPTOe}-~R_d78)zkDM1@99Z>FLtby|I~i%J6CS6
z+2&U+H~CZ4e}>iS_6K_IW&T}t_3*2QGd|0&nk%>Xrmvd+@-Frh|8^%^wLfKBEgN;{
zlXmNyP0hkJ+n(+3IQwk=Z62fBDys5jkH3gJulQzdQonmn>igSY|Fs#fsI)(GtI|I5
z^3w-aCndfH&9hnjg#GgDx8^yS#kG>kwa1e`nY<{q?OuKOYx4BNh2NqA9NF5Fta@%*
zZBK&ltcI?{fTSDS#h?679^)?itotY^@?gJznDm-jIsb35>|1M!op0@$Z71>a?3>y-
zZ~h5B_MZ8x_U?ZM`QzrRpUr%QJ8^_s&z_OH_Q{U9P0m8o%WNA&EhW#m2vxEOJDond
z^=(paeDJJqvCUF0^G{3s*8W@jxgXN__4EAbb%9wU;U0K)A6&_hUp?h>MaEAo<?^(f
z_dM<IAA3XB!v73{_H{Yc*1E#{{jdMZXKy$RSrk^E`?qJm*-21$T;a+CgS&g}&ditk
z`u<Az^Eux$k{+C_Re4i#dB^o4VFQ`zNo!L=*95)c0+%*SpfgZJk27uUin0)0!}W#}
zw1XnRs;zzTE9SpurzCH0-o<qI$^DGlpHr7#e}4Gyou~4B_x1eL7CSbZf1l8^_i_Df
z$^Cy;e|mb<ceQWY-6nIBU(TQMf8^YI`FHJA=huQWz6bs``z_12_@=DNzdnuX-u`Xp
zZykI8pFwl$jI5k@3wOn{t?{dCK3V^8bM^9XhyC^6D{Itml3(z*uRZWh-Xi<Er;PtI
zB-MNTj=1`tVd|g5iNU4I&vaSsT5lr%=JKR}misP$+cw?&;w1G`FaGqsYYx0AwZ=Zq
zlE1Zo#)fHW2d}{wu7TDePxvW)>T>1uGX@b{Yd8J-_9^hU!AhBx@9w8m&pCGW6`O`+
z>5J!Oc^$8cIqLb1-_=^?vzUEw&u8Lz*y-dd^+q%#fbo;$$w{7@euX3{F~~Ii;lZ7H
z!sq`>scfID*PC~n%l4t1ZJ_<*<S%LMTerqPIez@Bh1Ht<ha|)@?x=xhs3@<Gq7O}R
zZGC(*?qJ#M88U{<E93g?rmCbYH0I>wo8Q0l#HI6XC6(UEKR%hn&3}FPMQ!qoFBZS%
zEv=IiS+DgY*vd{Z{Nm{c=CR>VX6zPqcrEsC>Gl=uM+Mja7T#PRzt~{wj~yTH2kx$$
zS7Y>jN#!|fbHWKI7Q7or>kX&(`ak;@Wr><kGdS~nO{+uw4@0*<#peFEs(R$_o^vRV
zyRYZRw|sNS&;Ja2T2iWC*UvXIUr`tO!uaZ1)mayJ>(;vbp8e=QL)+PJvv2eI*zXaX
zf1~c~zT=K7zgc_RFE}Ni@w@zY#Jz<-Bi9|^j`9}0)z=;Gd;Y?G{y%2<TkhS+T)xdw
zqjvF|`)^95<|mgL+?QEw|4sev?YGI>|HWN<qm}n2turL#M97r?49!vNAJ6`4o|*ai
zKSR02iSKd$8T9h)SH9Wn$N%2&1mCaQ&&<3xn;yvLk`C}(aA#gK)4mCRHhil1^nCi1
zJL<B2zk9AveYLwruzmx3eNplB>#sl!;XeO`-^`jn{V4zSbmw2@hu=5z94x~!#S3lG
ztcrdno24u7HSObzm>L7O`YgBK%0K4k9KV{yrXeZczIVNzpTzB>&*nvUKAD%Mud^o3
z-PYT1rRDKcZf@s|UU_cLHqrpEEdtdupsrJB!J+9qp?kD;fZE7#L2RqQpv$krK87CV
z0_)tPnd_+55Hhb>H2waf_w|S7Fa9}y%`cnG?OxX}zw|2nVO;va`@n<O@r}P^r+4bF
z{;~S)y1IY+zPvXMcoVuTG*#=+Dpw9$4vW=N^OSkc3+Dw~+MQ?ByuIVTWvrV%Uz*-+
zksph=<^|oj<{EWW@4(sw?~P#_wEI}LHpUcaM=V|37<FJBXgB=^)f?agEY=;Ewn2M?
zc7*5+p{e(OW;^U(e{D@-nYAR-hx#9;i|Z^mUM}0Wn*ZV?=TmQLdfQ`HzL~36zh1`k
z{VIFI-7@?CthxAf<>npJZuYxoc{IPUiT)>T{;NLctKh#+hVy?5|8l?a!qo0q=JS1)
zUh;3+U;hsOssHJjuKAe__p`nWo=wgEeM8habQ$}DXIpOQ-+EPkcA0<nhScMSgIfCQ
z^*4XDkn&F{dU!@%S@Mu|-|z2r*Eb(7&$a&^wE8!b_V-kYtrnkZjacuWmsxy9>**Oh
z3$`XzK0jl>v@}?RH(J|kNyv+{zx}^_k-K^7Ti@!VbNQF)Z4R8?6<x$rkhb?YXr;V&
z1!#(?3mjRLL~}}=|0TQ4CHbjQhx6(fs!ZnYe^B+TuAN<EN58_|HnH5<&mNuzRVg=C
z1+P8m)>nA{LH;%SzO3qC-bTZB#U_*QP1<v5=UGCv3A`}KX4=iPwK29)SB498z(s7=
zqJ*pZ5B|L?TmEVL5xd7Rr;px}{P@?%zW&}-TN~9g$`3!=9=hNwwBuvc%72y{kKX>t
zeqEsUcHMTd+WEpKE+w+h*z(e>=%W0mR`+|_vu$FxH^scO`_FLWvA^?#qPz0EXZIZ1
z=&`AOmE+lIIv-AcIU!%%t5ei(=ruE&9ev1aP4xMDiGQV+)dsOGefmI4^Q!WTvtPc*
z-<);s^3{rhhw>r&o=XQ$ZwYu77d+?iTF|s5IMaYexWElN@|%RKZ{G4PFO}V*w8<mG
zc8}-Jl#d5aG)THcE?;&d(m6F#c8l|ao}j%a-}#?;?%FTW;=osv>@@Wg<V3_(Q?D>p
zmv?+k{4n`~;128Rr<H}BM~-|=<qX_r;>gw_;2uz>Z0YIJ?0UO7>DCEV{B=I=SOT49
z!F7#g8z<X>3w`YjCM#B$_IgRN&h3z$|46>K*jzmGmEos}Ki+@e;_uxTb10F0R+_Xw
z*Y=+tUjNv3Za(^!ryUk;bL?A|2~>9bPERZA_+jx+X|Y*Fb-uq{%JKWZWinqB@tYjd
zd@v(SQ_S(v68WpMZ7LTU7ApLn6X|e##?qh3u)Q=vyLUBRx)nY1hKj+;N{Md_;mVdB
zM^1d=n8*-Wv25q+^Q*Ip<4y;jxn%OsMLxCu{Jz3nbDry*>0WWtSTl-QGXd27h?WSV
zO8YGBp6?}F>Eab$`}fWW5~x=1|E+&@b}bv1jQh-@4~JSe#oX8qE!|gd3~3MD{$<^1
zMwjW2<wXCkKVHAwM0RO=TTQIWo082tt`~8e_IZPb3D$6yX<cJ21QmLHtl1)43cw}b
zHLYtbpv(h4ZsZzk87n9+fm>{lRvd`Q2@;KMj5@LO)R{Gso?)^aHy#Qp+;9}@ZH~V3
z@TFnlgZ~WTkIK*diCw$m_^I&scaP7TEVE0^pmOc8%Ln+o6_-EA{`EPt{g&~cf}eHk
zZ#_D{+5N+mL;MDrMVB^7%=k7T_@k(NU#`Kod$a0~9;*4zAoA$E>m*xUgT9ERae=#b
z{aDFTC%L)J<4lZ)^2uXUJf3Nm`F5WJo!fHwoa@E4w;y`h-juz)YWc-0e<c^Z%?+K;
zQ&S(@xcc-T#m1hCJA5B{CyP?4Y+E_6ajDtTx`_g{EI*#-e{#>C`EsUIj-ATt<zZ(E
z9_f38h6b!+2o+%{VMupio&(yD58Wpe5Vb{a>0*oDfi=lb?5;oDm-u?a$H%sh%iah-
zoa8*`^p<Q9P#owTjXJQ-LI@N|Ym=sd#tL_X7JD23_u9ehhYzefur?t)!P}h)v@Ll$
zXps$w39jrmXh(`{?b@xhHo<#?_9Rc`JddN&M?Kj;oOCPd+%ZeTkbRaFZ+&P>fbW?K
z56e2+dYKy!-_G^3fAmPM`rmb_DxIR2{uX=8+1@1=9DS~LEX>whc;~O8b9VOO)ko4A
zd(Nbu5moGtt_Y%5GQT3^z_jEI!y(a^cCnY-W-ni5@SnkB^5Z$b=XL)(ZvHFAPDXq6
z+&&pa<1^DxClVxgH5@GXSQh-@>u>eKo!`zyhqoU-;qIQ>RujnTZa5oM+<*cmT!u57
zX~%=Gjo`qF1ue_~1q^6$QY@(Vnh>@@dxI*dQ2=QufSKTsz9G7%E9z+M#4u1pA&<3;
zW#fLsTLn9#TjhBc_5R!RpCK*%WqQ)?dEwhl{#ddc*Q|Z0E;;4J?L*U!X@TbJr+ox1
zf&{JOlUPOiT>t7ekxlVxFa9$`>@vTso4DP6H~Y6G{~2Z%CoVX6R8RSY`GeNk>5@B(
z?xGGp1ntecw`w|<xjgfqUCm$Qug_X{<#3_!yP_|X7stM|%b44YrRNR~0MJQLpzIAk
zD{2kb8?I}tWh~&b0bE{ynL^+$9n;o{-Vv)efy;}v2i6^!BDXsG>ugD7rgiKp{~03d
z*ZXYd`H{lidP}NaoU=bJ`JP0@+0}>5TXlOvLE9X4AFYM0@d_n<?j}&otT-<AcrM49
zNwfGFtS5hxOtX+Y!FY8_a@xFw$?3dPmy})TQb}q)GVjTsb0rlYJ6ssvC`*Z~pX`k~
zgRpAu5p5HG;gUkHOIvLFFBC~Cs0s^TH8jcXG1{~-Oe9ss;I)&PvZdyMBNM8uXPi2^
zb%Hm>hzEt?Hf@8p;MKQvYipGnUFv)7+<zBmHq``H%)5N~M`Xu~at@ol2dL5xI9D@$
z@h`Ds|5E>cc{Gvvmc9J9_|@iCJTl51pY_r>0=D_i7W<CgTv>NCNH>k&?}dlmnM3>E
zOi%t}?0joRR+97T4VV0mmMa*CJOz(CQ>m2Fx&s;(U|MRIxb>^9%PBhzzyA!cwjDPr
z*}O8mdfD5(_HufL=j@B6&rUuGT9*sn(*{}w1)jwrd1}YEX7>`a<tub@_^&<&mEQH!
z|4vJJSx_-~-P~wH=Z?L)AzH10u1pPl4LmQL=V6;!2+>=am$tcpHP+6QX|H>r<Mpg(
zdYkz>d-~SyNI$F)@vi9HO>m~6u##O9dQ&u;DYh}}L3o09glJC3CbtuZRvlQ)pWI=R
z+w(wGSop+--5pY#Pg-{^RQ_FD$XUn`$8M+Gm&U#@!YJ4G5hX3i)e|E-LPe7@7+!fE
z5`8%@_L8{I<w<7pFNJD~xBqnC{#$P5g_i{t1?%?4{3&?IIWJ`!X!sdRSV`^M{%h~$
zW30lf>Q_|-KfP>OTPDx1D9iWmy1$*q!q2>WA%oDM`c4#dMi01Fi&z~2E^5FBvPOvB
z01q2wJP3o9U7R2$xbIfRnyoZ#V|YsF8qPA-Xi&o+R4K}TmR&Cy^wjPA2m3Q6e~j%t
zZF}O<x0ifXoKSk>pS{ea#F^{uC@Y{(*-Twr^<6z+W_>Z^5{2)RkN@p|eRf(iyWnG+
z=7~*WxpSU9g>-AM9I3uCZD;-|)j6fkM}O5$d->zvo@-^x<TMKT3X8UEUKw8HJ?HZ#
z%G+mXN#}-8+ZEl`vr8t{T@>~I+V)tztHy}+=(U%BV%%)2s&CYCsK|DlJ$*>v9tAyo
zmm873)s>=alpjyIw721%|B2KYpkqi&QzdRLUwJd~aC)Zb7Nv<t_PFowv^U;YGUI`w
z0K0pl#D%3fvry)BktSVM-As;5s<{1ThgRnG+D*nC6BIsavh{9Eck8_=|5j1!%FBSv
zIejr{LWZ`oXH<_cMo--Ys_DH!vl=L)ji9Cg_(T^_n--;i2<>@*8(jz1rUYHndegNP
zblzow_6Ak(U?pRi?wVV_#LqY^^8UE~%-27~*~?BI<u5)~wr&35GuczN|ILs&QQ8aI
zUrttEP3QB;DD$gpegB;HT*v;d@zuuv3}<iddh<ud@R7~=JI@kYxl?X#M6BaO3LIF{
zS~BbIe(u&8{B415_D}Whcl?c9^fty+(eCe@zcSwpy^8~$fyO;lL1Xn%N5LKAG8WL8
zLEyHcyJ#5;C_um?BA|vQq*w>HIYFT|Jt1t9X0~XVYZT~+<Q<|ngh0)LtqrT9*WIq#
zR<}T2Mt%Bkx&I8;jZ9`*q{hBmzOCd>MMb+s{)bn`HfMc&OJ=y3f4bIJYU>)<{>vn!
z^8EJH{|u=!qkQC4{<NFj33#OM!=S;y#khfaf#gL?+~ZxK09ujjcKfwhUqk5eqw-##
z<U~KdobhXootm-Onc#;Lbh0gt-pMw`6i_>Gt_7S5Z4K!Xd{Yps6vz^o_`U4ey=NZ&
zZ)E#BUfJ{9eLP>pu|hYDxm&UEMaZ#;3#9iHLr<(ZBkGuz?8;o^d5CrC%YSj;@>z&|
z-G2s|xBmj)ev&m_eCff5hp|;Ve>^-SY;!UPJjwzJ5-dpw)P+3uRlDBl<CWTJKdwKy
ze>>)xwKG3k@SXCqS(zW*@3fu~S3J%{)j~RgYipyX{EXcFyLSfubN;t+<}aN&k3P@c
zyZq^d>i!p=Z8>s<dk~v1h+I0iX8lPi{q+T<lGDEjNICFV+SK3px98@!x_Rd%pIBO2
zC{}NtbJvpaNuo<{-Q8JT3SGZ(eEDAE*jp79AMZ!(w2Hj4dau&C+?&|uG(h=<{8DCv
zs?)nWG0~o!e;022VC(*P(s4UUri-f%7(F(yjhGm;WTl95lI`az?gJAX7rhC9FG3({
z>Ss~OZOQfPleV_MJ(U@Epj72g8|3`Ou)y9~Ra>VnF)P~`?W8H=C0gU(Y4_YJr$C^C
zdGW@cjG%44gpb<U@?u?2kJcKF#7BI`85z2?xJ75FwS{-?yClT<GQNKKx+2MsGR21P
z$}OHB6$q1Ax{<mC5opH)Yx1nS+m}|PFh7`4Byaa~+r=l3TFY(fb6)<jx#K+L`;V{Q
zpEa+L)?QrmpW&pH{?(kbUru|zbANa6)y7i!53zM`?v>TeZ?kcq`FqYCfrUA<&2;e>
zKd`(u>Gifhsoo7{^^L!37w-6er*6%qvTbs~a*v*8JU^!yc~*HI75e(nR`hPBr~{yl
zI7|ylyYr*YcF4=bOZ?>9-<FbDRB-;@YwKwLM~N!Meg7HO_NG02EDhUZwwmxl<dw&#
zeo0>WN^70{#l*$uYTUuaa+R%pr|nO^+!+gx#LZz~YEH1?d2zQHwX=n@*a_IX{nybo
zpjL_BeStfvRy}blJk>WJ&*y1OX18S0PI~9KZIfo<0SX5}&;w?RgHro4)@7R2dAaYF
zbboVP^`Bu?x#XV1llv6*$Zhw3@N`O5$#;#X=d_cF>%6b)mAxCtn4ZM6;?ATphLnb_
zRnw<$X}R>}N<-u8{l~5O-c{GM`@AgKVPg><x9+fvg{xZSgd14e%Gd*K<K3t`hbxZo
zH~IJa{q?^kYWMSO**rO(X_lV1GSds!JrT=}nGTtOr@TM9L3Isl6lh>@gO>mL+o3`a
zc&|UKpZM~}v$}S*XL`-sOTG(ED7o>k|M)EL+2%8HKodX7poMby7e_@ui50&#=T))(
zyN5Qp2jBg@{kQ-1&$R2Cw|uKO@8{>oQ<gh7?Iq6kGAs`v1=s@9)%8J_uP{Guf3*Im
z`diQxqP07}oN~<L-4mD1=lT1l-m*OFaU=DbJK$2Lj5TOSYg+50ygtn~;fE7!&sKiu
znP6b+EL@UO<|dM=BKXdDLFdNA2kOj1NtNw9Iz&vKxW1fKbF1}B*o40;dAZ9%-yMHq
zbjPCSiIU_Yv&`3GWfN{i9nEEUEaD~V{?YEaRZW3lN5>P{9#^iglS`okinyB2$XV_g
zq&Xr`B~YjsvGxobcc-HD2NU+aR!y02=hUs{Z=Z1V&ZGGvjzN}vH$W>nsF{wmBZa0k
zM{ob~&SgQ3QSX0-YqG`p3r`lVdp_yyUVFAU!&C89F~+8sK`W+K;U6UX;;-^ze(<JW
zZ%%u6FZ|GaHTjkOgI#}b?tAmso~5GS_`Br|!wcKIv5sZn3#65Hd-L~{GygN(|2qEh
zti0=o6MRZ;?A&GfE@_I)1#31cj2eR4*SZOyv$`8WW9L&AeD$u6J9|L1<j3`A_M7!D
zJ$W$Wo!<T}U;gO{u^aA4PBvdJ1ghTg70Ao$LN59(U#T%6>>8KN^Ns&P{xhWh+HCB)
z{G<B*OP1RnwhMl$s$k&an|a9^V<rkqegd`s;Mpr=-2-v4Pfqn2IsQrJ?D;k8%?vFh
z=B-(%C&Vq9aA3lL)x2Hv7Ce{Mm@$dpy;L~q)`?A^?l`Es1nz}{j+I{x?mH1bf(V*^
zg_k_qkwVipXiHwv{mZ@GL1XzN|A}Y6%~qFTtjN1?`A1|=Rk7To_A~9A_}1a?v$*Fe
zW^rZnPOeo}lgbzp874bAU){5J@v^DQj^}TjxzF-OdGYlZvTP;4V&r7B*M}$f$tX?M
zIYF?E3=bnjf|9$I`&WC@gFrQzcE^u(*T4QMp8Yn)#?oS!=gmy@!gWvBvhExM^{dDo
zz(=pUb~A0AsF}^Qbk@`T8exgojNN|9zdiGp&1+(R_2Rc@?M2ue|JWCL8s~jl+k<C*
zKKY5Q@YR`HJ+FT+6x#OSd)?cA$Cv+(-1_FO?L6bllP51fesylz+cSi^3|N9=V~E(s
z{MV7289yHV*gxTSd|P7nhl&~f6?gah+ex-r&RM*j28l)MW^$x*#_cy76#iNyDhqME
zIIL%AF=L*KVWx7%lZ@MMH5L9!UOeRFAb9nG(PM*&ozJ)~PRhp7a9(V()+*QSpSDNc
zmG(z@rxuqbf0E3TaaU<^ws7ybeC@4n;+Ab)w^+et^64LQUL`V0G+45y3OY?K$|NVe
z!jsnIz4qSK=KfH!VpWCFpLqVP@8{w}7o3!wCvm4{?mAf)53zDb1BD5$9IyDYJJ#iS
zfW|ODN0Ec4C`g(N!jYDCGX?qP-S0VVAZ@X@=J>a?`<p-A@u>#SY8Xqhf2@7{O?9yu
zUnh=b0AK1=GU|gi{CaZQd-ej3^`ZT%`oG2cU!2RH{_=<Nk;>EWia#VTtbH?`*rqbJ
zL=`&8nP<@?r5*nnG?*vM(>VW%VN=hECjmt-rs;ok?D@|yslIVtLdu&pMo(XUH$NV3
z_^fI6>C3#2rbgdv7yeVste)&qYs7x<iF=e)i^#3qFY#Go%17%If28f#Yd5hx^7oxj
z@u8S5fhJ!5m?OI9K<h=w9TtJM6S9?pK*J;p*T4N+9qyoYpvZs5=`A-a)R5*xjvXt}
z=h=}Mj=6xw_S3Y^U%^3au4|X>m8)m|v-02RuW4oN{*V0YmlWq6?(g_%>ulwofGwPe
zxxNvptY1}h`=G(!H(CFlFcqztk!Zhy>74PDN)eG;yp#X-1<EG}{<v;n^vzAOXvaUB
zI~}jpEZ;TGKE0iLPmp#$^N0D5XZ_jRZTMwE-Ek$W7xR)P7-wGJ@OMX4^A4Hzd)l+!
z?9#dLT<FPR8`TpFH;Zlsjn9G;E@%lLwh3j70n2Mlpo0TIW51o=pp`in53H#U-2Nr+
z4*#bA3_^eHZ_oa#7H7ftar2RH%jO?C<L<n}ndemLJBig5$UADo4~tAXG0|=5lQOO@
zt4Y2LhXp(r%-X)TvfjPl>vHlo5u^Ei<+69a{$h8W>o=X@D1+74GK+_YG!4(Rq0Tj8
zZ<-^8CB9lURCBFv+P`nA$&cLrGt|c{SDP*KZ$;BN%Tzg6X7lN9=2x6{sbO64r~FTG
z?DUNry<hIwX>jdK@m)sq>3P?GFOOtzziHohzb|{!H$BHM6ZJQL{9Kf{uJf5DqiO3C
z`+J8@*<=QO@7)|b-E+G9RUw%fX)QZNd5-3S%UST06`|pB&`6AKLU=;hCRGsS?as9H
z*AbbwM;dAZ=l*kFmtIyEC;8#~uDsiqKR$Xa^Z2{UV)J|z^c`?Be=<9NRmlx2{h_R?
z+xYIT<i5UUv%fQ!ZGI%*Jazf;KR)lx^B@}&5p^d;feK6O0ke*s%YUC3roLCB?&H4X
z)JsVxzq*K>NSjkB!g4QWOYNhwo*%Uff4u+kY`1>mBYRK7-}Un5YEm!xk}e2WmVGtv
zS+jTpd*`3BKgH40HyXRYTv<E6fA&<~5`NoBKi|B2uzt0$!bj!&{mZh8UKS<)TI4*L
zXXA9G#WUXaLMGqAqo~L;?l=qCC=1c-RlBAph9)}M_9?kY^Q1E>I6jHEa?vDcPx`7^
z>E3-wg+j7%>~_MC37lioJ|IrSaC<40@@v{c(K)s$_R?jc@|pc7Qg0Z{nJmcjP)^xD
zcFWebYqzX3#CrlYLgWrx?Qn2muw+kR<qADX#%cNZk}@pR!ByQVsamsR_3ssf{NFMj
z`TJ;Q=XB?G^{ay4YtLRdZ}CZk^Uvm-+lQ6iYWR=XH=fOlJ9w;aro`WMKBk{!jxPQD
zvpAr?;>RiblP30s%d(Bj)GGd(>K})O{L8g@3HEzCC*N&ket$MC*3PFs#G`28B%>#}
z-WqA(bt<S+&{!IfkSYC8&1(sZ*Br>X&s}re=XP0MG@HKZ?Ojz9PFTIEcZx91_<R;=
z>-CrQDjD?wm;Y@yy7cM|+rn2HzlQ#*n)70}weLYb<*(k<sL4>m54n$qQJf!P(x^&W
z;rV5*RsMFSrt0;F>K|s#h^)3|^DC6+-S_NAR+0Ne@8_Sk@CLJ-nRkYn|Ip0Ur{DbH
zzo=yU``>ac*~NMb_2!@6HKkNzwZ?x2h4<g3($<?NWhtKEtlpnJmAB0Je9FG;>JDGE
z-o^G$ne5}TK0TOc9K=$6XT>>CC~Ku*&VxW3^)5?6^CF<)MKo}Ci!bx>JN@m?tWtN?
z>=70!+&ZgXT(CcG-ZyI}UjCSuaUAW5(5>w&zfb;Rf2nFhX4tlAS1MOu?0>WT@~_S2
zj>|w@7U>U<AKCc_otp{Yt4@`&0h~(lgz}?>jXaF(D=auz0s{hqU+l`cpT!#dXg>d|
zGdy>vE<brrp?cfzIUQM>+*ifgPfap4@C!c}!~CNwZMFI4jrJ}b-**PQ75?K03g<bY
ziY$wd^42pu&suZ0b49!2(RW1;*Bz_66t83KawpZz?L&h5>$7n_!Hp}K_-9X*>?|@{
zI@Jg=_k!Fv1ostXxUMm+O$nO#s-P;|rSZebkNop%UYJ-`eC+$U`B>S$`G?PVJk|Zr
z5G8CJ8wENuXZ6D_&!rxVf<Ad140I3jTp+1&WU`||^z{;6C0lKuuB#a-zk_%DU2g0D
zLGo(m2A%-HpSx`e9*WF(=4_5R?@#688A}u_cPV}JO42{T)y*wXNW`_J$z6r_SnJZW
zJ6n`1j(_;aoPXH#=5Bf4$v-lF=KhwMk!|F@_V=aR{hEB+K3_hVBKpVu%UQqtwDzBt
zfBrK>{Phd5_WpVJ$+SC_)gkTm-d6(e8K3^}`bXMw`=nQe{~7oNKHdNJw=czX$J1+j
zU)D_YlrEgeW!}uh|9IA(8Bc|SSme#sjMyigS+gk{G{13RZHgCcE{rj3lcwXV302dM
zw%_W1^vn8LdHU0bCu3D!Rj2zuN_-^qaR1>|p0mIAf%o&zu8Yrzxw|#<`a`d!D{OBs
zw!e6x)^g{Yy{7*@{E^vfX8%ZsRuv$Y5XL?>6n0XiNMBOG>OX@vgF9%a{F#sj<+Fwp
zWhVXZ*LxWp@+)q(+{amU(*1``XYLmEo&2Ms_IBO*ji=gn>r~y}tGnY<b6)N{#t)IK
z_7B^?oVBY@<A+5-jJ5yI!%wE($&gxOx`y>i-IaRr2j+i_1LtonwfN7_c6{1@hOKAX
zwu|h#zL(*}i=(k#8(wiNJR9>MDWgj-K;cvL1Wj1mkTvSW(nX9cvIk!o?lNm)6p8qH
zL``y@@o)9~={c_qQXV%<uRic<gG{6<-=htwYdPMEd(RHJlC-%yFKv_krv<-#r@#CF
zsuVvS?znvYZSKOY+xzZ`J{Iv36u*%k$-&XUuJGo-La&`FL^j-rFRihMIR3m8=FK9k
zFPR)Eez3uQz4pmANmdWe>Z6-_&QwZy=h<vt>Kn9iM#T4?%O6Z7SDwEil{2TY^OOC$
z!_#@|BEIggiY$Ec)75wHq3umOw10Fxn{U7All<K?@^$yuo^H?Lf5e%3taa7FplfeV
z|2g^bKf{r%V&C~2zefB#Fu&|SL-9=BG|eInwxA_#BFZZ)*C_OMPvN@L8MaBYjA>=s
zM)n&s>Q~)AY<740>^b~<pIcY^pH}!Te_>kB9h=9O_w+BU>%Y8jtI?%*Z`e$sb>vHH
zYu|^5JN^d!p7YnvPO#Qn<!m=-BQ&0}7o)->CkXKeFpBJ|;9Ix-G)+7e{xfJg{;l-O
zwX<njE~sCT&NHcB*)#X})GaHs0;9zKGbp_MZd&X=|K?efpUnJ)f6Ja8-codY-pknY
zlh=hUyH`4)!a}Q_FLK%WH|re#-Z`@Ocinb#`7D>ePLo#86%N_Ha?;&X{kQyk>JMEv
znbmjV%A;QkvQO9VJac^YalIh#b%{bpKAK$>`6+Yg@Px-RrWci3xW%N&KK?EBDX*ba
zH+atLf880*KKyQ3e>DHrZr<_ct$nxlKY<TFHcZyCm0LR3n)I7?XdJAt#$xlnSjBzP
z_nnq6Ulk(1VD9JmHGNaw&Tjtm>aXq(zrZhrHL^>cm%1{qo0V+vt0%?KpzxJc*s|qy
lGs`APEao~IBj@(-+Dz$*>T}<}cS{SxvyTD2!dn0TCIHqs{51do

literal 0
HcmV?d00001

diff --git a/code/cpp-httplib-0.19.0/test/include_httplib.cc b/code/cpp-httplib-0.19.0/test/include_httplib.cc
new file mode 100644
index 00000000..fd38cb82
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/include_httplib.cc
@@ -0,0 +1,5 @@
+// The sole purpose of this file is to include httplib.h in a separate
+// compilation unit, thus verifying that inline keywords have not been forgotten
+// when linked together with test.cc.
+
+#include <httplib.h>
diff --git a/code/cpp-httplib-0.19.0/test/make-shared-library.sh b/code/cpp-httplib-0.19.0/test/make-shared-library.sh
new file mode 100644
index 00000000..04f2fc08
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/make-shared-library.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 build_dir"
+    exit 1
+fi
+
+BUILD_DIR=$1
+
+# Make the build directory
+rm -rf $BUILD_DIR
+mkdir -p $BUILD_DIR/out
+
+cd $BUILD_DIR
+
+# Build the version
+git checkout $BUILD_DIR -q
+
+cmake \
+  -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_CXX_FLAGS="-g -Og" \
+  -DBUILD_SHARED_LIBS=ON \
+  -DHTTPLIB_COMPILE=ON \
+  -DCMAKE_INSTALL_PREFIX=./out \
+  ../..
+
+cmake --build . --target install
+cmake --build . --target clean
+
diff --git a/code/cpp-httplib-0.19.0/test/meson.build b/code/cpp-httplib-0.19.0/test/meson.build
new file mode 100644
index 00000000..80621d30
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/meson.build
@@ -0,0 +1,144 @@
+# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+gtest_dep = dependency('gtest', main: true)
+libcurl_dep = dependency('libcurl')
+openssl = find_program('openssl')
+test_conf = files('test.conf')
+req_x509_flag = openssl.version().version_compare('>=3.2.0') ? '-x509v1' : '-x509'
+
+key_pem = custom_target(
+  'key_pem',
+  output: 'key.pem',
+  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
+)
+
+temp_req = custom_target(
+  'temp_req',
+  input: key_pem,
+  output: 'temp_req',
+  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-out', '@OUTPUT@']
+)
+
+cert_pem = custom_target(
+  'cert_pem',
+  input: [temp_req, key_pem],
+  output: 'cert.pem',
+  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '3650', '-req', '-signkey', '@INPUT1@', '-out', '@OUTPUT@']
+)
+
+cert2_pem = custom_target(
+  'cert2_pem',
+  input: key_pem,
+  output: 'cert2.pem',
+  command: [openssl, 'req', req_x509_flag, '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
+)
+
+key_encrypted_pem = custom_target(
+  'key_encrypted_pem',
+  output: 'key_encrypted.pem',
+  command: [openssl, 'genrsa', '-passout', 'pass:test123!', '-out', '@OUTPUT@', '2048']
+)
+
+cert_encrypted_pem = custom_target(
+  'cert_encrypted_pem',
+  input: key_encrypted_pem,
+  output: 'cert_encrypted.pem',
+  command: [openssl, 'req', req_x509_flag, '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
+)
+
+rootca_key_pem = custom_target(
+  'rootca_key_pem',
+  output: 'rootCA.key.pem',
+  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
+)
+
+rootca_cert_pem = custom_target(
+  'rootca_cert_pem',
+  input: rootca_key_pem,
+  output: 'rootCA.cert.pem',
+  command: [openssl, 'req', req_x509_flag, '-new', '-batch', '-config', files('test.rootCA.conf'), '-key', '@INPUT@', '-days', '1024', '-out', '@OUTPUT@']
+)
+
+client_key_pem = custom_target(
+  'client_key_pem',
+  output: 'client.key.pem',
+  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
+)
+
+client_temp_req = custom_target(
+  'client_temp_req',
+  input: client_key_pem,
+  output: 'client_temp_req',
+  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-out', '@OUTPUT@']
+)
+
+client_cert_pem = custom_target(
+  'client_cert_pem',
+  input: [client_temp_req, rootca_cert_pem, rootca_key_pem],
+  output: 'client.cert.pem',
+  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '370', '-req', '-CA', '@INPUT1@', '-CAkey', '@INPUT2@', '-CAcreateserial', '-out', '@OUTPUT@']
+)
+
+client_encrypted_key_pem = custom_target(
+  'client_encrypted_key_pem',
+  output: 'client_encrypted.key.pem',
+  command: [openssl, 'genrsa', '-aes256', '-passout', 'pass:test012!', '-out', '@OUTPUT@', '2048']
+)
+
+client_encrypted_temp_req = custom_target(
+  'client_encrypted_temp_req',
+  input: client_encrypted_key_pem,
+  output: 'client_encrypted_temp_req',
+  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-passin', 'pass:test012!', '-out', '@OUTPUT@']
+)
+
+client_encrypted_cert_pem = custom_target(
+  'client_encrypted_cert_pem',
+  input: [client_encrypted_temp_req, rootca_cert_pem, rootca_key_pem],
+  output: 'client_encrypted.cert.pem',
+  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '370', '-req', '-CA', '@INPUT1@', '-CAkey', '@INPUT2@', '-CAcreateserial', '-out', '@OUTPUT@']
+)
+
+# Copy test files to the build directory
+configure_file(input: 'ca-bundle.crt', output: 'ca-bundle.crt', copy: true)
+configure_file(input: 'image.jpg',     output: 'image.jpg',     copy: true)
+subdir('www')
+subdir('www2'/'dir')
+subdir('www3'/'dir')
+
+# GoogleTest 1.13.0 requires C++14
+test_options = []
+if gtest_dep.version().version_compare('>=1.13.0')
+  test_options += 'cpp_std=c++14'
+endif
+
+test(
+  'main',
+  executable(
+    'main',
+    'test.cc',
+    dependencies: [
+      cpp_httplib_dep,
+      gtest_dep,
+      libcurl_dep
+    ],
+    override_options: test_options
+  ),
+  depends: [
+    key_pem,
+    cert_pem,
+    cert2_pem,
+    key_encrypted_pem,
+    cert_encrypted_pem,
+    rootca_key_pem,
+    rootca_cert_pem,
+    client_key_pem,
+    client_cert_pem,
+    client_encrypted_key_pem,
+    client_encrypted_cert_pem
+  ],
+  workdir: meson.current_build_dir(),
+  timeout: 300
+)
diff --git a/code/cpp-httplib-0.19.0/test/proxy/Dockerfile b/code/cpp-httplib-0.19.0/test/proxy/Dockerfile
new file mode 100644
index 00000000..cd20938b
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/proxy/Dockerfile
@@ -0,0 +1,13 @@
+FROM centos:7
+
+ARG auth="basic"
+ARG port="3128"
+
+RUN yum install -y squid
+
+COPY ./${auth}_squid.conf /etc/squid/squid.conf
+COPY ./${auth}_passwd /etc/squid/passwd
+
+EXPOSE ${port}
+
+CMD ["/usr/sbin/squid", "-N"]
diff --git a/code/cpp-httplib-0.19.0/test/proxy/basic_passwd b/code/cpp-httplib-0.19.0/test/proxy/basic_passwd
new file mode 100644
index 00000000..bb1b7091
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/proxy/basic_passwd
@@ -0,0 +1 @@
+hello:$apr1$O6S28OBL$8dr3ixl4Mohf97hgsYvLy/
diff --git a/code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf b/code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf
new file mode 100644
index 00000000..f97f09a4
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf
@@ -0,0 +1,81 @@
+#
+# Recommended minimum configuration:
+#
+
+# Example rule allowing access from your local networks.
+# Adapt to list your (internal) IP networks from where browsing
+# should be allowed
+acl localnet src 0.0.0.1-0.255.255.255	# RFC 1122 "this" network (LAN)
+acl localnet src 10.0.0.0/8		# RFC 1918 local private network (LAN)
+acl localnet src 100.64.0.0/10		# RFC 6598 shared address space (CGN)
+acl localnet src 169.254.0.0/16 	# RFC 3927 link-local (directly plugged) machines
+acl localnet src 172.16.0.0/12		# RFC 1918 local private network (LAN)
+acl localnet src 192.168.0.0/16		# RFC 1918 local private network (LAN)
+acl localnet src fc00::/7       	# RFC 4193 local private network range
+acl localnet src fe80::/10      	# RFC 4291 link-local (directly plugged) machines
+
+acl SSL_ports port 443
+acl Safe_ports port 80		# http
+acl Safe_ports port 21		# ftp
+acl Safe_ports port 443		# https
+acl Safe_ports port 70		# gopher
+acl Safe_ports port 210		# wais
+acl Safe_ports port 1025-65535	# unregistered ports
+acl Safe_ports port 280		# http-mgmt
+acl Safe_ports port 488		# gss-http
+acl Safe_ports port 591		# filemaker
+acl Safe_ports port 777		# multiling http
+acl CONNECT method CONNECT
+
+auth_param basic program /usr/lib64/squid/basic_ncsa_auth /etc/squid/passwd
+auth_param basic realm proxy
+acl authenticated proxy_auth REQUIRED
+http_access allow authenticated
+
+#
+# Recommended minimum Access Permission configuration:
+#
+# Deny requests to certain unsafe ports
+http_access deny !Safe_ports
+
+# Deny CONNECT to other than secure SSL ports
+http_access deny CONNECT !SSL_ports
+
+# Only allow cachemgr access from localhost
+http_access allow localhost manager
+http_access deny manager
+
+# We strongly recommend the following be uncommented to protect innocent
+# web applications running on the proxy server who think the only
+# one who can access services on "localhost" is a local user
+#http_access deny to_localhost
+
+#
+# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+#
+
+# Example rule allowing access from your local networks.
+# Adapt localnet in the ACL section to list your (internal) IP networks
+# from where browsing should be allowed
+http_access allow localnet
+http_access allow localhost
+
+# And finally deny all other access to this proxy
+http_access deny all
+
+# Squid normally listens to port 3128
+http_port 3128
+
+# Uncomment and adjust the following to add a disk cache directory.
+#cache_dir ufs /var/spool/squid 100 16 256
+
+# Leave coredumps in the first cache dir
+coredump_dir /var/spool/squid
+
+#
+# Add any of your own refresh_pattern entries above these.
+#
+refresh_pattern ^ftp:		1440	20%	10080
+refresh_pattern ^gopher:	1440	0%	1440
+refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+refresh_pattern .		0	20%	4320
diff --git a/code/cpp-httplib-0.19.0/test/proxy/digest_passwd b/code/cpp-httplib-0.19.0/test/proxy/digest_passwd
new file mode 100644
index 00000000..d45615f5
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/proxy/digest_passwd
@@ -0,0 +1 @@
+hello:world
diff --git a/code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf b/code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf
new file mode 100644
index 00000000..050c5da1
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf
@@ -0,0 +1,81 @@
+#
+# Recommended minimum configuration:
+#
+
+# Example rule allowing access from your local networks.
+# Adapt to list your (internal) IP networks from where browsing
+# should be allowed
+acl localnet src 0.0.0.1-0.255.255.255	# RFC 1122 "this" network (LAN)
+acl localnet src 10.0.0.0/8		# RFC 1918 local private network (LAN)
+acl localnet src 100.64.0.0/10		# RFC 6598 shared address space (CGN)
+acl localnet src 169.254.0.0/16 	# RFC 3927 link-local (directly plugged) machines
+acl localnet src 172.16.0.0/12		# RFC 1918 local private network (LAN)
+acl localnet src 192.168.0.0/16		# RFC 1918 local private network (LAN)
+acl localnet src fc00::/7       	# RFC 4193 local private network range
+acl localnet src fe80::/10      	# RFC 4291 link-local (directly plugged) machines
+
+acl SSL_ports port 443
+acl Safe_ports port 80		# http
+acl Safe_ports port 21		# ftp
+acl Safe_ports port 443		# https
+acl Safe_ports port 70		# gopher
+acl Safe_ports port 210		# wais
+acl Safe_ports port 1025-65535	# unregistered ports
+acl Safe_ports port 280		# http-mgmt
+acl Safe_ports port 488		# gss-http
+acl Safe_ports port 591		# filemaker
+acl Safe_ports port 777		# multiling http
+acl CONNECT method CONNECT
+
+auth_param digest program /usr/lib64/squid/digest_file_auth /etc/squid/passwd
+auth_param digest realm proxy
+acl authenticated proxy_auth REQUIRED
+http_access allow authenticated
+
+#
+# Recommended minimum Access Permission configuration:
+#
+# Deny requests to certain unsafe ports
+http_access deny !Safe_ports
+
+# Deny CONNECT to other than secure SSL ports
+http_access deny CONNECT !SSL_ports
+
+# Only allow cachemgr access from localhost
+http_access allow localhost manager
+http_access deny manager
+
+# We strongly recommend the following be uncommented to protect innocent
+# web applications running on the proxy server who think the only
+# one who can access services on "localhost" is a local user
+#http_access deny to_localhost
+
+#
+# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+#
+
+# Example rule allowing access from your local networks.
+# Adapt localnet in the ACL section to list your (internal) IP networks
+# from where browsing should be allowed
+http_access allow localnet
+http_access allow localhost
+
+# And finally deny all other access to this proxy
+http_access deny all
+
+# Squid normally listens to port 3128
+http_port 3129
+
+# Uncomment and adjust the following to add a disk cache directory.
+#cache_dir ufs /var/spool/squid 100 16 256
+
+# Leave coredumps in the first cache dir
+coredump_dir /var/spool/squid
+
+#
+# Add any of your own refresh_pattern entries above these.
+#
+refresh_pattern ^ftp:		1440	20%	10080
+refresh_pattern ^gopher:	1440	0%	1440
+refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+refresh_pattern .		0	20%	4320
diff --git a/code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml b/code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml
new file mode 100644
index 00000000..67a9e9b6
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '2'
+
+services:
+  squid_basic:
+    image: squid_basic
+    restart: always
+    ports:
+      - "3128:3128"
+    build:
+      context: ./
+      args:
+        auth: basic
+
+  squid_digest:
+    image: squid_digest
+    restart: always
+    ports:
+      - "3129:3129"
+    build:
+      context: ./
+      args:
+        auth: digest
diff --git a/code/cpp-httplib-0.19.0/test/test.cc b/code/cpp-httplib-0.19.0/test/test.cc
new file mode 100644
index 00000000..82648b95
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/test.cc
@@ -0,0 +1,8458 @@
+// NOTE: This file should be saved as UTF-8 w/ BOM
+#include <httplib.h>
+#include <signal.h>
+
+#ifndef _WIN32
+#include <curl/curl.h>
+#endif
+#include <gtest/gtest.h>
+
+#include <atomic>
+#include <chrono>
+#include <future>
+#include <limits>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <thread>
+#include <type_traits>
+#include <vector>
+
+#define SERVER_CERT_FILE "./cert.pem"
+#define SERVER_CERT2_FILE "./cert2.pem"
+#define SERVER_PRIVATE_KEY_FILE "./key.pem"
+#define CA_CERT_FILE "./ca-bundle.crt"
+#define CLIENT_CA_CERT_FILE "./rootCA.cert.pem"
+#define CLIENT_CA_CERT_DIR "."
+#define CLIENT_CERT_FILE "./client.cert.pem"
+#define CLIENT_PRIVATE_KEY_FILE "./client.key.pem"
+#define CLIENT_ENCRYPTED_CERT_FILE "./client_encrypted.cert.pem"
+#define CLIENT_ENCRYPTED_PRIVATE_KEY_FILE "./client_encrypted.key.pem"
+#define CLIENT_ENCRYPTED_PRIVATE_KEY_PASS "test012!"
+#define SERVER_ENCRYPTED_CERT_FILE "./cert_encrypted.pem"
+#define SERVER_ENCRYPTED_PRIVATE_KEY_FILE "./key_encrypted.pem"
+#define SERVER_ENCRYPTED_PRIVATE_KEY_PASS "test123!"
+
+using namespace std;
+using namespace httplib;
+
+const char *HOST = "localhost";
+const int PORT = 1234;
+
+const string LONG_QUERY_VALUE = string(25000, '@');
+const string LONG_QUERY_URL = "/long-query-value?key=" + LONG_QUERY_VALUE;
+
+const std::string JSON_DATA = "{\"hello\":\"world\"}";
+
+const string LARGE_DATA = string(1024 * 1024 * 100, '@'); // 100MB
+
+MultipartFormData &get_file_value(MultipartFormDataItems &files,
+                                  const char *key) {
+  auto it = std::find_if(
+      files.begin(), files.end(),
+      [&](const MultipartFormData &file) { return file.name == key; });
+#ifdef CPPHTTPLIB_NO_EXCEPTIONS
+  return *it;
+#else
+  if (it != files.end()) { return *it; }
+  throw std::runtime_error("invalid multipart form data name error");
+#endif
+}
+
+#ifndef _WIN32
+class UnixSocketTest : public ::testing::Test {
+protected:
+  void TearDown() override { std::remove(pathname_.c_str()); }
+
+  void client_GET(const std::string &addr) {
+    httplib::Client cli{addr};
+    cli.set_address_family(AF_UNIX);
+    ASSERT_TRUE(cli.is_valid());
+
+    const auto &result = cli.Get(pattern_);
+    ASSERT_TRUE(result) << "error: " << result.error();
+
+    const auto &resp = result.value();
+    EXPECT_EQ(resp.status, StatusCode::OK_200);
+    EXPECT_EQ(resp.body, content_);
+  }
+
+  const std::string pathname_{"./httplib-server.sock"};
+  const std::string pattern_{"/hi"};
+  const std::string content_{"Hello World!"};
+};
+
+TEST_F(UnixSocketTest, pathname) {
+  httplib::Server svr;
+  svr.Get(pattern_, [&](const httplib::Request &, httplib::Response &res) {
+    res.set_content(content_, "text/plain");
+  });
+
+  std::thread t{[&] {
+    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(pathname_, 80));
+  }};
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ASSERT_TRUE(svr.is_running());
+
+  client_GET(pathname_);
+}
+
+#if defined(__linux__) ||                                                      \
+    /* __APPLE__ */ (defined(SOL_LOCAL) && defined(SO_PEERPID))
+TEST_F(UnixSocketTest, PeerPid) {
+  httplib::Server svr;
+  std::string remote_port_val;
+  svr.Get(pattern_, [&](const httplib::Request &req, httplib::Response &res) {
+    res.set_content(content_, "text/plain");
+    remote_port_val = req.get_header_value("REMOTE_PORT");
+  });
+
+  std::thread t{[&] {
+    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(pathname_, 80));
+  }};
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ASSERT_TRUE(svr.is_running());
+
+  client_GET(pathname_);
+  EXPECT_EQ(std::to_string(getpid()), remote_port_val);
+}
+#endif
+
+#ifdef __linux__
+TEST_F(UnixSocketTest, abstract) {
+  constexpr char svr_path[]{"\x00httplib-server.sock"};
+  const std::string abstract_addr{svr_path, sizeof(svr_path) - 1};
+
+  httplib::Server svr;
+  svr.Get(pattern_, [&](const httplib::Request &, httplib::Response &res) {
+    res.set_content(content_, "text/plain");
+  });
+
+  std::thread t{[&] {
+    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(abstract_addr, 80));
+  }};
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ASSERT_TRUE(svr.is_running());
+
+  client_GET(abstract_addr);
+}
+#endif
+
+TEST(SocketStream, is_writable_UNIX) {
+  int fds[2];
+  ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_STREAM, 0, fds));
+
+  const auto asSocketStream = [&](socket_t fd,
+                                  std::function<bool(Stream &)> func) {
+    return detail::process_client_socket(
+        fd, 0, 0, 0, 0, 0, std::chrono::steady_clock::time_point::min(), func);
+  };
+  asSocketStream(fds[0], [&](Stream &s0) {
+    EXPECT_EQ(s0.socket(), fds[0]);
+    EXPECT_TRUE(s0.is_writable());
+
+    EXPECT_EQ(0, close(fds[1]));
+    EXPECT_FALSE(s0.is_writable());
+
+    return true;
+  });
+  EXPECT_EQ(0, close(fds[0]));
+}
+
+TEST(SocketStream, is_writable_INET) {
+  sockaddr_in addr;
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(PORT + 1);
+  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+  int disconnected_svr_sock = -1;
+  std::thread svr{[&] {
+    const int s = socket(AF_INET, SOCK_STREAM, 0);
+    ASSERT_LE(0, s);
+    ASSERT_EQ(0, ::bind(s, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)));
+    ASSERT_EQ(0, listen(s, 1));
+    ASSERT_LE(0, disconnected_svr_sock = accept(s, nullptr, nullptr));
+    ASSERT_EQ(0, close(s));
+  }};
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  std::thread cli{[&] {
+    const int s = socket(AF_INET, SOCK_STREAM, 0);
+    ASSERT_LE(0, s);
+    ASSERT_EQ(0, connect(s, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)));
+    ASSERT_EQ(0, close(s));
+  }};
+  cli.join();
+  svr.join();
+  ASSERT_NE(disconnected_svr_sock, -1);
+
+  const auto asSocketStream = [&](socket_t fd,
+                                  std::function<bool(Stream &)> func) {
+    return detail::process_client_socket(
+        fd, 0, 0, 0, 0, 0, std::chrono::steady_clock::time_point::min(), func);
+  };
+  asSocketStream(disconnected_svr_sock, [&](Stream &ss) {
+    EXPECT_EQ(ss.socket(), disconnected_svr_sock);
+    EXPECT_FALSE(ss.is_writable());
+
+    return true;
+  });
+
+  ASSERT_EQ(0, close(disconnected_svr_sock));
+}
+#endif // #ifndef _WIN32
+
+TEST(ClientTest, MoveConstructible) {
+  EXPECT_FALSE(std::is_copy_constructible<Client>::value);
+  EXPECT_TRUE(std::is_nothrow_move_constructible<Client>::value);
+}
+
+TEST(ClientTest, MoveAssignable) {
+  EXPECT_FALSE(std::is_copy_assignable<Client>::value);
+  EXPECT_TRUE(std::is_nothrow_move_assignable<Client>::value);
+}
+
+#ifdef _WIN32
+TEST(StartupTest, WSAStartup) {
+  WSADATA wsaData;
+  int ret = WSAStartup(0x0002, &wsaData);
+  ASSERT_EQ(0, ret);
+}
+#endif
+
+TEST(DecodeURLTest, PercentCharacter) {
+  EXPECT_EQ(
+      detail::decode_url(
+          R"(descrip=Gastos%20%C3%A1%C3%A9%C3%AD%C3%B3%C3%BA%C3%B1%C3%91%206)",
+          false),
+      u8"descrip=Gastos áéíóúñÑ 6");
+}
+
+TEST(DecodeURLTest, PercentCharacterNUL) {
+  string expected;
+  expected.push_back('x');
+  expected.push_back('\0');
+  expected.push_back('x');
+
+  EXPECT_EQ(detail::decode_url("x%00x", false), expected);
+}
+
+TEST(EncodeQueryParamTest, ParseUnescapedChararactersTest) {
+  string unescapedCharacters = "-_.!~*'()";
+
+  EXPECT_EQ(detail::encode_query_param(unescapedCharacters), "-_.!~*'()");
+}
+
+TEST(EncodeQueryParamTest, ParseReservedCharactersTest) {
+  string reservedCharacters = ";,/?:@&=+$";
+
+  EXPECT_EQ(detail::encode_query_param(reservedCharacters),
+            "%3B%2C%2F%3F%3A%40%26%3D%2B%24");
+}
+
+TEST(EncodeQueryParamTest, TestUTF8Characters) {
+  string chineseCharacters = u8"中国語";
+  string russianCharacters = u8"дом";
+  string brazilianCharacters = u8"óculos";
+
+  EXPECT_EQ(detail::encode_query_param(chineseCharacters),
+            "%E4%B8%AD%E5%9B%BD%E8%AA%9E");
+
+  EXPECT_EQ(detail::encode_query_param(russianCharacters),
+            "%D0%B4%D0%BE%D0%BC");
+
+  EXPECT_EQ(detail::encode_query_param(brazilianCharacters), "%C3%B3culos");
+}
+
+TEST(TrimTests, TrimStringTests) {
+  EXPECT_EQ("abc", detail::trim_copy("abc"));
+  EXPECT_EQ("abc", detail::trim_copy("  abc  "));
+  EXPECT_TRUE(detail::trim_copy("").empty());
+}
+
+TEST(DivideTest, DivideStringTests) {
+  auto divide = [](const std::string &str, char d) {
+    std::string lhs;
+    std::string rhs;
+
+    detail::divide(str, d,
+                   [&](const char *lhs_data, std::size_t lhs_size,
+                       const char *rhs_data, std::size_t rhs_size) {
+                     lhs.assign(lhs_data, lhs_size);
+                     rhs.assign(rhs_data, rhs_size);
+                   });
+
+    return std::make_pair(std::move(lhs), std::move(rhs));
+  };
+
+  {
+    const auto res = divide("", '=');
+    EXPECT_EQ(res.first, "");
+    EXPECT_EQ(res.second, "");
+  }
+
+  {
+    const auto res = divide("=", '=');
+    EXPECT_EQ(res.first, "");
+    EXPECT_EQ(res.second, "");
+  }
+
+  {
+    const auto res = divide(" ", '=');
+    EXPECT_EQ(res.first, " ");
+    EXPECT_EQ(res.second, "");
+  }
+
+  {
+    const auto res = divide("a", '=');
+    EXPECT_EQ(res.first, "a");
+    EXPECT_EQ(res.second, "");
+  }
+
+  {
+    const auto res = divide("a=", '=');
+    EXPECT_EQ(res.first, "a");
+    EXPECT_EQ(res.second, "");
+  }
+
+  {
+    const auto res = divide("=b", '=');
+    EXPECT_EQ(res.first, "");
+    EXPECT_EQ(res.second, "b");
+  }
+
+  {
+    const auto res = divide("a=b", '=');
+    EXPECT_EQ(res.first, "a");
+    EXPECT_EQ(res.second, "b");
+  }
+
+  {
+    const auto res = divide("a=b=", '=');
+    EXPECT_EQ(res.first, "a");
+    EXPECT_EQ(res.second, "b=");
+  }
+
+  {
+    const auto res = divide("a=b=c", '=');
+    EXPECT_EQ(res.first, "a");
+    EXPECT_EQ(res.second, "b=c");
+  }
+}
+
+TEST(SplitTest, ParseQueryString) {
+  string s = "key1=val1&key2=val2&key3=val3";
+  Params dic;
+
+  detail::split(s.c_str(), s.c_str() + s.size(), '&',
+                [&](const char *b, const char *e) {
+                  string key, val;
+                  detail::split(b, e, '=', [&](const char *b2, const char *e2) {
+                    if (key.empty()) {
+                      key.assign(b2, e2);
+                    } else {
+                      val.assign(b2, e2);
+                    }
+                  });
+                  dic.emplace(key, val);
+                });
+
+  EXPECT_EQ("val1", dic.find("key1")->second);
+  EXPECT_EQ("val2", dic.find("key2")->second);
+  EXPECT_EQ("val3", dic.find("key3")->second);
+}
+
+TEST(SplitTest, ParseInvalidQueryTests) {
+
+  {
+    string s = " ";
+    Params dict;
+    detail::parse_query_text(s, dict);
+    EXPECT_TRUE(dict.empty());
+  }
+
+  {
+    string s = " = =";
+    Params dict;
+    detail::parse_query_text(s, dict);
+    EXPECT_TRUE(dict.empty());
+  }
+}
+
+TEST(ParseQueryTest, ParseQueryString) {
+  {
+    std::string s = "key1=val1&key2=val2&key3=val3";
+    Params dic;
+
+    detail::parse_query_text(s, dic);
+
+    EXPECT_EQ("val1", dic.find("key1")->second);
+    EXPECT_EQ("val2", dic.find("key2")->second);
+    EXPECT_EQ("val3", dic.find("key3")->second);
+  }
+
+  {
+    std::string s = "key1&key2=val1&key3=val1=val2&key4=val1=val2=val3";
+    Params dic;
+
+    detail::parse_query_text(s, dic);
+
+    EXPECT_EQ("", dic.find("key1")->second);
+    EXPECT_EQ("val1", dic.find("key2")->second);
+    EXPECT_EQ("val1=val2", dic.find("key3")->second);
+    EXPECT_EQ("val1=val2=val3", dic.find("key4")->second);
+  }
+}
+
+TEST(ParamsToQueryTest, ConvertParamsToQuery) {
+  Params dic;
+
+  EXPECT_EQ(detail::params_to_query_str(dic), "");
+
+  dic.emplace("key1", "val1");
+
+  EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1");
+
+  dic.emplace("key2", "val2");
+  dic.emplace("key3", "val3");
+
+  EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1&key2=val2&key3=val3");
+}
+
+TEST(ParseMultipartBoundaryTest, DefaultValue) {
+  string content_type = "multipart/form-data; boundary=something";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "something");
+}
+
+TEST(ParseMultipartBoundaryTest, ValueWithQuote) {
+  string content_type = "multipart/form-data; boundary=\"gc0pJq0M:08jU534c0p\"";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "gc0pJq0M:08jU534c0p");
+}
+
+TEST(ParseMultipartBoundaryTest, ValueWithCharset) {
+  string content_type =
+      "multipart/mixed; boundary=THIS_STRING_SEPARATES;charset=UTF-8";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "THIS_STRING_SEPARATES");
+}
+
+TEST(ParseMultipartBoundaryTest, ValueWithQuotesAndCharset) {
+  string content_type =
+      "multipart/mixed; boundary=\"cpp-httplib-multipart-data\"; charset=UTF-8";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "cpp-httplib-multipart-data");
+}
+
+TEST(GetHeaderValueTest, DefaultValue) {
+  Headers headers = {{"Dummy", "Dummy"}};
+  auto val = detail::get_header_value(headers, "Content-Type", "text/plain", 0);
+  EXPECT_STREQ("text/plain", val);
+}
+
+TEST(GetHeaderValueTest, DefaultValueInt) {
+  Headers headers = {{"Dummy", "Dummy"}};
+  auto val = detail::get_header_value_u64(headers, "Content-Length", 100, 0);
+  EXPECT_EQ(100ull, val);
+}
+
+TEST(GetHeaderValueTest, RegularValue) {
+  Headers headers = {{"Content-Type", "text/html"}, {"Dummy", "Dummy"}};
+  auto val = detail::get_header_value(headers, "Content-Type", "text/plain", 0);
+  EXPECT_STREQ("text/html", val);
+}
+
+TEST(GetHeaderValueTest, RegularValueWithDifferentCase) {
+  Headers headers = {{"Content-Type", "text/html"}, {"Dummy", "Dummy"}};
+  auto val = detail::get_header_value(headers, "content-type", "text/plain", 0);
+  EXPECT_STREQ("text/html", val);
+}
+
+TEST(GetHeaderValueTest, SetContent) {
+  Response res;
+
+  res.set_content("html", "text/html");
+  EXPECT_EQ("text/html", res.get_header_value("Content-Type"));
+
+  res.set_content("text", "text/plain");
+  EXPECT_EQ(1U, res.get_header_value_count("Content-Type"));
+  EXPECT_EQ("text/plain", res.get_header_value("Content-Type"));
+}
+
+TEST(GetHeaderValueTest, RegularValueInt) {
+  Headers headers = {{"Content-Length", "100"}, {"Dummy", "Dummy"}};
+  auto val = detail::get_header_value_u64(headers, "Content-Length", 0, 0);
+  EXPECT_EQ(100ull, val);
+}
+
+TEST(GetHeaderValueTest, RegularInvalidValueInt) {
+  Headers headers = {{"Content-Length", "x"}};
+  auto is_invalid_value = false;
+  auto val = detail::get_header_value_u64(headers, "Content-Length", 0, 0,
+                                          is_invalid_value);
+  EXPECT_EQ(0ull, val);
+  EXPECT_TRUE(is_invalid_value);
+}
+
+TEST(GetHeaderValueTest, Range) {
+  {
+    Headers headers = {make_range_header({{1, -1}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=1-", val);
+  }
+
+  {
+    Headers headers = {make_range_header({{-1, 1}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=-1", val);
+  }
+
+  {
+    Headers headers = {make_range_header({{1, 10}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=1-10", val);
+  }
+
+  {
+    Headers headers = {make_range_header({{1, 10}, {100, -1}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=1-10, 100-", val);
+  }
+
+  {
+    Headers headers = {make_range_header({{1, 10}, {100, 200}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=1-10, 100-200", val);
+  }
+
+  {
+    Headers headers = {make_range_header({{0, 0}, {-1, 1}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=0-0, -1", val);
+  }
+}
+
+TEST(ParseHeaderValueTest, Range) {
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=1-", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(1u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(-1, ranges[0].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=-1", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(1u, ranges.size());
+    EXPECT_EQ(-1, ranges[0].first);
+    EXPECT_EQ(1u, ranges[0].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=1-10", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(1u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(10u, ranges[0].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=10-1", ranges);
+    EXPECT_FALSE(ret);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=1-10, 100-", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(2u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(10u, ranges[0].second);
+    EXPECT_EQ(100u, ranges[1].first);
+    EXPECT_EQ(-1, ranges[1].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret =
+        detail::parse_range_header("bytes=1-10, 100-200, 300-400", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(3u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(10u, ranges[0].second);
+    EXPECT_EQ(100u, ranges[1].first);
+    EXPECT_EQ(200u, ranges[1].second);
+    EXPECT_EQ(300u, ranges[2].first);
+    EXPECT_EQ(400u, ranges[2].second);
+  }
+
+  {
+    Ranges ranges;
+
+    EXPECT_FALSE(detail::parse_range_header("bytes", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=0", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=-", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes= ", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=,", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=,,", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=,,,", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=a-b", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=1-0", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=0--1", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=0- 1", ranges));
+    EXPECT_FALSE(detail::parse_range_header("bytes=0 -1", ranges));
+    EXPECT_TRUE(ranges.empty());
+  }
+}
+
+TEST(ParseAcceptEncoding1, AcceptEncoding) {
+  Request req;
+  req.set_header("Accept-Encoding", "gzip");
+
+  Response res;
+  res.set_header("Content-Type", "text/plain");
+
+  auto ret = detail::encoding_type(req, res);
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+  EXPECT_TRUE(ret == detail::EncodingType::Gzip);
+#else
+  EXPECT_TRUE(ret == detail::EncodingType::None);
+#endif
+}
+
+TEST(ParseAcceptEncoding2, AcceptEncoding) {
+  Request req;
+  req.set_header("Accept-Encoding", "gzip, deflate, br");
+
+  Response res;
+  res.set_header("Content-Type", "text/plain");
+
+  auto ret = detail::encoding_type(req, res);
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+  EXPECT_TRUE(ret == detail::EncodingType::Brotli);
+#elif CPPHTTPLIB_ZLIB_SUPPORT
+  EXPECT_TRUE(ret == detail::EncodingType::Gzip);
+#else
+  EXPECT_TRUE(ret == detail::EncodingType::None);
+#endif
+}
+
+TEST(ParseAcceptEncoding3, AcceptEncoding) {
+  Request req;
+  req.set_header("Accept-Encoding", "br;q=1.0, gzip;q=0.8, *;q=0.1");
+
+  Response res;
+  res.set_header("Content-Type", "text/plain");
+
+  auto ret = detail::encoding_type(req, res);
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+  EXPECT_TRUE(ret == detail::EncodingType::Brotli);
+#elif CPPHTTPLIB_ZLIB_SUPPORT
+  EXPECT_TRUE(ret == detail::EncodingType::Gzip);
+#else
+  EXPECT_TRUE(ret == detail::EncodingType::None);
+#endif
+}
+
+TEST(BufferStreamTest, read) {
+  detail::BufferStream strm1;
+  Stream &strm = strm1;
+
+  EXPECT_EQ(5, strm.write("hello"));
+
+  char buf[512];
+  EXPECT_EQ(2, strm.read(buf, 2));
+  EXPECT_EQ('h', buf[0]);
+  EXPECT_EQ('e', buf[1]);
+
+  EXPECT_EQ(2, strm.read(buf, 2));
+  EXPECT_EQ('l', buf[0]);
+  EXPECT_EQ('l', buf[1]);
+
+  EXPECT_EQ(1, strm.read(buf, 1));
+  EXPECT_EQ('o', buf[0]);
+
+  EXPECT_EQ(0, strm.read(buf, 1));
+}
+
+TEST(ChunkedEncodingTest, FromHTTPWatch_Online) {
+  auto host = "www.httpwatch.com";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(2);
+
+  auto res =
+      cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137");
+  ASSERT_TRUE(res);
+
+  std::string out;
+  detail::read_file("./image.jpg", out);
+
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(out, res->body);
+}
+
+TEST(HostnameToIPConversionTest, HTTPWatch_Online) {
+  auto host = "www.httpwatch.com";
+
+  auto ip = hosted_at(host);
+  EXPECT_EQ("23.96.13.243", ip);
+
+  std::vector<std::string> addrs;
+  hosted_at(host, addrs);
+  EXPECT_EQ(1u, addrs.size());
+}
+
+#if 0 // It depends on each test environment...
+TEST(HostnameToIPConversionTest, YouTube_Online) {
+  auto host = "www.youtube.com";
+
+  std::vector<std::string> addrs;
+  hosted_at(host, addrs);
+
+  EXPECT_EQ(20u, addrs.size());
+
+  auto it = std::find(addrs.begin(), addrs.end(), "2607:f8b0:4006:809::200e");
+  EXPECT_TRUE(it != addrs.end());
+}
+#endif
+
+TEST(ChunkedEncodingTest, WithContentReceiver_Online) {
+  auto host = "www.httpwatch.com";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(2);
+
+  std::string body;
+  auto res =
+      cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
+              [&](const char *data, size_t data_length) {
+                body.append(data, data_length);
+                return true;
+              });
+  ASSERT_TRUE(res);
+
+  std::string out;
+  detail::read_file("./image.jpg", out);
+
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(out, body);
+}
+
+TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver_Online) {
+  auto host = "www.httpwatch.com";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(2);
+
+  std::string body;
+  auto res = cli.Get(
+      "/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
+      [&](const Response &response) {
+        EXPECT_EQ(StatusCode::OK_200, response.status);
+        return true;
+      },
+      [&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+  ASSERT_TRUE(res);
+
+  std::string out;
+  detail::read_file("./image.jpg", out);
+
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(out, body);
+}
+
+TEST(RangeTest, FromHTTPBin_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(5);
+
+  {
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    Headers headers = {make_range_header({{1, -1}})};
+    auto res = cli.Get(path, headers);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("bcdefghijklmnopqrstuvwxyzabcdef", res->body);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  }
+
+  {
+    Headers headers = {make_range_header({{1, 10}})};
+    auto res = cli.Get(path, headers);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("bcdefghijk", res->body);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  }
+
+  {
+    Headers headers = {make_range_header({{0, 31}})};
+    auto res = cli.Get(path, headers);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    Headers headers = {make_range_header({{0, -1}})};
+    auto res = cli.Get(path, headers);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    Headers headers = {make_range_header({{0, 32}})};
+    auto res = cli.Get(path, headers);
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  }
+}
+
+TEST(ConnectionErrorTest, InvalidHost) {
+  auto host = "-abcde.com";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(2));
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Connection, res.error());
+}
+
+TEST(ConnectionErrorTest, InvalidHost2) {
+  auto host = "httpbin.org/";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(2));
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Connection, res.error());
+}
+
+TEST(ConnectionErrorTest, InvalidHostCheckResultErrorToString) {
+  auto host = "httpbin.org/";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(2));
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  stringstream s;
+  s << "error code: " << res.error();
+  EXPECT_EQ("error code: Could not establish connection (2)", s.str());
+}
+
+TEST(ConnectionErrorTest, InvalidPort) {
+  auto host = "localhost";
+  auto port = 44380;
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host, port);
+#else
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(2));
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  EXPECT_TRUE(Error::Connection == res.error() ||
+              Error::ConnectionTimeout == res.error());
+}
+
+TEST(ConnectionErrorTest, Timeout_Online) {
+  auto host = "google.com";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 44380;
+  SSLClient cli(host, port);
+#else
+  auto port = 8080;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(2));
+
+  // only probe one address type so that the error reason
+  // correlates to the timed-out IPv4, not the unsupported
+  // IPv6 connection attempt
+  cli.set_address_family(AF_INET);
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::ConnectionTimeout, res.error());
+}
+
+TEST(CancelTest, NoCancel_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res = cli.Get(path, [](uint64_t, uint64_t) { return true; });
+  ASSERT_TRUE(res);
+  EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(CancelTest, WithCancelSmallPayload_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+
+  auto res = cli.Get(path, [](uint64_t, uint64_t) { return false; });
+  cli.set_connection_timeout(std::chrono::seconds(5));
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, WithCancelLargePayload_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/range/65536"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/65536"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  uint32_t count = 0;
+  auto res =
+      cli.Get(path, [&count](uint64_t, uint64_t) { return (count++ == 0); });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, NoCancelPost) {
+  Server svr;
+
+  svr.Post("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Post("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+               "application/json", [](uint64_t, uint64_t) { return true; });
+  ASSERT_TRUE(res);
+  EXPECT_EQ("Hello World!", res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(CancelTest, WithCancelSmallPayloadPost) {
+  Server svr;
+
+  svr.Post("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Post("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+               "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, WithCancelLargePayloadPost) {
+  Server svr;
+
+  svr.Post("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content(LARGE_DATA, "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Post("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+               "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, NoCancelPut) {
+  Server svr;
+
+  svr.Put("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Put("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+              "application/json", [](uint64_t, uint64_t) { return true; });
+  ASSERT_TRUE(res);
+  EXPECT_EQ("Hello World!", res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(CancelTest, WithCancelSmallPayloadPut) {
+  Server svr;
+
+  svr.Put("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Put("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+              "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, WithCancelLargePayloadPut) {
+  Server svr;
+
+  svr.Put("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content(LARGE_DATA, "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Put("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+              "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, NoCancelPatch) {
+  Server svr;
+
+  svr.Patch("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Patch("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+                "application/json", [](uint64_t, uint64_t) { return true; });
+  ASSERT_TRUE(res);
+  EXPECT_EQ("Hello World!", res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(CancelTest, WithCancelSmallPayloadPatch) {
+  Server svr;
+
+  svr.Patch("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Patch("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+                "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, WithCancelLargePayloadPatch) {
+  Server svr;
+
+  svr.Patch("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content(LARGE_DATA, "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Patch("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+                "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, NoCancelDelete) {
+  Server svr;
+
+  svr.Delete("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Delete("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+                 "application/json", [](uint64_t, uint64_t) { return true; });
+  ASSERT_TRUE(res);
+  EXPECT_EQ("Hello World!", res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(CancelTest, WithCancelSmallPayloadDelete) {
+  Server svr;
+
+  svr.Delete("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Delete("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+                 "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(CancelTest, WithCancelLargePayloadDelete) {
+  Server svr;
+
+  svr.Delete("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content(LARGE_DATA, "text/plain");
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_connection_timeout(std::chrono::seconds(5));
+
+  auto res =
+      cli.Delete("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
+                 "application/json", [](uint64_t, uint64_t) { return false; });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST(BaseAuthTest, FromHTTPWatch_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/basic-auth/hello/world"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/basic-auth/hello/world"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+
+  {
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+
+  {
+    auto res =
+        cli.Get(path, {make_basic_authentication_header("hello", "world")});
+    ASSERT_TRUE(res);
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
+              res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    cli.set_basic_auth("hello", "world");
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
+              res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    cli.set_basic_auth("hello", "bad");
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+
+  {
+    cli.set_basic_auth("bad", "world");
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(DigestAuthTest, FromHTTPWatch_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto unauth_path = std::string{"/digest-auth/auth/hello/world"};
+  auto paths = std::vector<std::string>{
+      "/digest-auth/auth/hello/world/MD5",
+      "/digest-auth/auth/hello/world/SHA-256",
+      "/digest-auth/auth/hello/world/SHA-512",
+      "/digest-auth/auth-int/hello/world/MD5",
+  };
+#else
+  auto host = "nghttp2.org";
+  auto unauth_path = std::string{"/httpbin/digest-auth/auth/hello/world"};
+  auto paths = std::vector<std::string>{
+      "/httpbin/digest-auth/auth/hello/world/MD5",
+      "/httpbin/digest-auth/auth/hello/world/SHA-256",
+      "/httpbin/digest-auth/auth/hello/world/SHA-512",
+      "/httpbin/digest-auth/auth-int/hello/world/MD5",
+  };
+#endif
+
+  auto port = 443;
+  SSLClient cli(host, port);
+
+  {
+    auto res = cli.Get(unauth_path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+
+  {
+
+    cli.set_digest_auth("hello", "world");
+    for (const auto &path : paths) {
+      auto res = cli.Get(path.c_str());
+      ASSERT_TRUE(res);
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
+                res->body);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    cli.set_digest_auth("hello", "bad");
+    for (const auto &path : paths) {
+      auto res = cli.Get(path.c_str());
+      ASSERT_TRUE(res);
+      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    }
+
+    // NOTE: Until httpbin.org fixes issue #46, the following test is commented
+    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
+    // cli.set_digest_auth("bad", "world");
+    // for (const auto& path : paths) {
+    //   auto res = cli.Get(path.c_str());
+    //   ASSERT_TRUE(res);
+    //   EXPECT_EQ(StatusCode::BadRequest_400, res->status);
+    // }
+  }
+}
+#endif
+
+TEST(SpecifyServerIPAddressTest, AnotherHostname_Online) {
+  auto host = "google.com";
+  auto another_host = "example.com";
+  auto wrong_ip = "0.0.0.0";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_hostname_addr_map({{another_host, wrong_ip}});
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SpecifyServerIPAddressTest, RealHostname_Online) {
+  auto host = "google.com";
+  auto wrong_ip = "0.0.0.0";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_hostname_addr_map({{host, wrong_ip}});
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Connection, res.error());
+}
+
+TEST(AbsoluteRedirectTest, Redirect_Online) {
+  auto host = "nghttp2.org";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_follow_location(true);
+  auto res = cli.Get("/httpbin/absolute-redirect/3");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(RedirectTest, Redirect_Online) {
+  auto host = "nghttp2.org";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_follow_location(true);
+  auto res = cli.Get("/httpbin/redirect/3");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(RelativeRedirectTest, Redirect_Online) {
+  auto host = "nghttp2.org";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_follow_location(true);
+  auto res = cli.Get("/httpbin/relative-redirect/3");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(TooManyRedirectTest, Redirect_Online) {
+  auto host = "nghttp2.org";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_follow_location(true);
+  auto res = cli.Get("/httpbin/redirect/21");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::ExceedRedirectCount, res.error());
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(YahooRedirectTest, Redirect_Online) {
+  Client cli("yahoo.com");
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+
+  cli.set_follow_location(true);
+  res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("https://www.yahoo.com/", res->location);
+}
+
+TEST(HttpsToHttpRedirectTest, Redirect_Online) {
+  SSLClient cli("nghttp2.org");
+  cli.set_follow_location(true);
+  auto res = cli.Get(
+      "/httpbin/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HttpsToHttpRedirectTest2, Redirect_Online) {
+  SSLClient cli("nghttp2.org");
+  cli.set_follow_location(true);
+
+  Params params;
+  params.emplace("url", "http://www.google.com");
+  params.emplace("status_code", "302");
+
+  auto res = cli.Get("/httpbin/redirect-to", params, Headers{});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HttpsToHttpRedirectTest3, Redirect_Online) {
+  SSLClient cli("nghttp2.org");
+  cli.set_follow_location(true);
+
+  Params params;
+  params.emplace("url", "http://www.google.com");
+
+  auto res = cli.Get("/httpbin/redirect-to?status_code=302", params, Headers{});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(UrlWithSpace, Redirect_Online) {
+  SSLClient cli("edge.forgecdn.net");
+  cli.set_follow_location(true);
+
+  auto res = cli.Get("/files/2595/310/Neat 1.4-17.jar");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(18527U, res->get_header_value_u64("Content-Length"));
+}
+
+#endif
+
+#if !defined(_WIN32) && !defined(_WIN64)
+TEST(ReceiveSignals, Signal) {
+  auto setupSignalHandlers = []() {
+    struct sigaction act;
+
+    sigemptyset(&act.sa_mask);
+    act.sa_flags = SA_SIGINFO;
+    act.sa_sigaction = [](int sig, siginfo_t *, void *) {
+      switch (sig) {
+      case SIGINT:
+      default: break;
+      }
+    };
+    ::sigaction(SIGINT, &act, nullptr);
+  };
+
+  Server svr;
+  int port = 0;
+  auto thread = std::thread([&]() {
+    setupSignalHandlers();
+    port = svr.bind_to_any_port("localhost");
+    svr.listen_after_bind();
+  });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  ASSERT_TRUE(svr.is_running());
+  pthread_kill(thread.native_handle(), SIGINT);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+  ASSERT_TRUE(svr.is_running());
+}
+#endif
+
+TEST(RedirectToDifferentPort, Redirect) {
+  Server svr1;
+  svr1.Get("/1", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  int svr1_port = 0;
+  auto thread1 = std::thread([&]() {
+    svr1_port = svr1.bind_to_any_port("localhost");
+    svr1.listen_after_bind();
+  });
+
+  Server svr2;
+  svr2.Get("/2", [&](const Request & /*req*/, Response &res) {
+    res.set_redirect("http://localhost:" + std::to_string(svr1_port) + "/1");
+  });
+
+  int svr2_port = 0;
+  auto thread2 = std::thread([&]() {
+    svr2_port = svr2.bind_to_any_port("localhost");
+    svr2.listen_after_bind();
+  });
+  auto se = detail::scope_exit([&] {
+    svr2.stop();
+    thread2.join();
+    svr1.stop();
+    thread1.join();
+    ASSERT_FALSE(svr2.is_running());
+    ASSERT_FALSE(svr1.is_running());
+  });
+
+  svr1.wait_until_ready();
+  svr2.wait_until_ready();
+
+  Client cli("localhost", svr2_port);
+  cli.set_follow_location(true);
+
+  auto res = cli.Get("/2");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("Hello World!", res->body);
+}
+
+TEST(RedirectFromPageWithContent, Redirect) {
+  Server svr;
+
+  svr.Get("/1", [&](const Request & /*req*/, Response &res) {
+    res.set_content("___", "text/plain");
+    res.set_redirect("/2");
+  });
+
+  svr.Get("/2", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto th = std::thread([&]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    th.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli("localhost", PORT);
+    cli.set_follow_location(true);
+
+    std::string body;
+    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
+      body.append(data, data_length);
+      return true;
+    });
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("Hello World!", body);
+  }
+
+  {
+    Client cli("localhost", PORT);
+
+    std::string body;
+    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
+      body.append(data, data_length);
+      return true;
+    });
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::Found_302, res->status);
+    EXPECT_EQ("___", body);
+  }
+}
+
+TEST(RedirectFromPageWithContentIP6, Redirect) {
+  Server svr;
+
+  svr.Get("/1", [&](const Request & /*req*/, Response &res) {
+    res.set_content("___", "text/plain");
+    // res.set_redirect("/2");
+    res.set_redirect("http://[::1]:1234/2");
+  });
+
+  svr.Get("/2", [&](const Request &req, Response &res) {
+    auto host_header = req.headers.find("Host");
+    ASSERT_TRUE(host_header != req.headers.end());
+    EXPECT_EQ("[::1]:1234", host_header->second);
+
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto th = std::thread([&]() { svr.listen("::1", 1234); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    th.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  // When IPV6 support isn't available svr.listen("::1", 1234) never
+  // actually starts anything, so the condition !svr.is_running() will
+  // always remain true, and the loop never stops.
+  // This basically counts how many milliseconds have passed since the
+  // call to svr.listen(), and if after 5 seconds nothing started yet
+  // aborts the test.
+  for (unsigned int milliseconds = 0; !svr.is_running(); milliseconds++) {
+    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    ASSERT_LT(milliseconds, 5000U);
+  }
+
+  {
+    Client cli("http://[::1]:1234");
+    cli.set_follow_location(true);
+
+    std::string body;
+    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
+      body.append(data, data_length);
+      return true;
+    });
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("Hello World!", body);
+  }
+
+  {
+    Client cli("http://[::1]:1234");
+
+    std::string body;
+    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
+      body.append(data, data_length);
+      return true;
+    });
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::Found_302, res->status);
+    EXPECT_EQ("___", body);
+  }
+}
+
+TEST(PathUrlEncodeTest, PathUrlEncode) {
+  Server svr;
+
+  svr.Get("/foo", [](const Request &req, Response &res) {
+    auto a = req.params.find("a");
+    if (a != req.params.end()) {
+      res.set_content((*a).second, "text/plain");
+      res.status = StatusCode::OK_200;
+    } else {
+      res.status = StatusCode::BadRequest_400;
+    }
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+    cli.set_url_encode(false);
+
+    auto res = cli.Get("/foo?a=explicitly+encoded");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    // This expects it back with a space, as the `+` won't have been
+    // url-encoded, and server-side the params get decoded turning `+`
+    // into spaces.
+    EXPECT_EQ("explicitly encoded", res->body);
+  }
+}
+
+TEST(PathUrlEncodeTest, IncludePercentEncodingLF) {
+  Server svr;
+
+  svr.Get("/", [](const Request &req, Response &) {
+    EXPECT_EQ("\x0A", req.get_param_value("something"));
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+    cli.set_url_encode(false);
+
+    auto res = cli.Get("/?something=%0A");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(BindServerTest, DISABLED_BindDualStack) {
+  Server svr;
+
+  svr.Get("/1", [&](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen("::", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli("127.0.0.1", PORT);
+
+    auto res = cli.Get("/1");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("Hello World!", res->body);
+  }
+  {
+    Client cli("::1", PORT);
+
+    auto res = cli.Get("/1");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("Hello World!", res->body);
+  }
+}
+
+TEST(BindServerTest, BindAndListenSeparately) {
+  Server svr;
+  int port = svr.bind_to_any_port("0.0.0.0");
+  ASSERT_TRUE(svr.is_valid());
+  ASSERT_TRUE(port > 0);
+  svr.stop();
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(BindServerTest, BindAndListenSeparatelySSL) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
+                CLIENT_CA_CERT_DIR);
+  int port = svr.bind_to_any_port("0.0.0.0");
+  ASSERT_TRUE(svr.is_valid());
+  ASSERT_TRUE(port > 0);
+  svr.stop();
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(BindServerTest, BindAndListenSeparatelySSLEncryptedKey) {
+  SSLServer svr(SERVER_ENCRYPTED_CERT_FILE, SERVER_ENCRYPTED_PRIVATE_KEY_FILE,
+                nullptr, nullptr, SERVER_ENCRYPTED_PRIVATE_KEY_PASS);
+  int port = svr.bind_to_any_port("0.0.0.0");
+  ASSERT_TRUE(svr.is_valid());
+  ASSERT_TRUE(port > 0);
+  svr.stop();
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+X509 *readCertificate(const std::string &strFileName) {
+  std::ifstream inStream(strFileName);
+  std::string strCertPEM((std::istreambuf_iterator<char>(inStream)),
+                         std::istreambuf_iterator<char>());
+
+  if (strCertPEM.empty()) return (nullptr);
+
+  BIO *pbCert = BIO_new(BIO_s_mem());
+  BIO_write(pbCert, strCertPEM.c_str(), (int)strCertPEM.size());
+  X509 *pCert = PEM_read_bio_X509(pbCert, NULL, 0, NULL);
+  BIO_free(pbCert);
+
+  return (pCert);
+}
+
+EVP_PKEY *readPrivateKey(const std::string &strFileName) {
+  std::ifstream inStream(strFileName);
+  std::string strPrivateKeyPEM((std::istreambuf_iterator<char>(inStream)),
+                               std::istreambuf_iterator<char>());
+
+  if (strPrivateKeyPEM.empty()) return (nullptr);
+
+  BIO *pbPrivKey = BIO_new(BIO_s_mem());
+  BIO_write(pbPrivKey, strPrivateKeyPEM.c_str(), (int)strPrivateKeyPEM.size());
+  EVP_PKEY *pPrivateKey = PEM_read_bio_PrivateKey(pbPrivKey, NULL, NULL, NULL);
+  BIO_free(pbPrivKey);
+
+  return (pPrivateKey);
+}
+
+TEST(BindServerTest, UpdateCerts) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE);
+  int port = svr.bind_to_any_port("0.0.0.0");
+  ASSERT_TRUE(svr.is_valid());
+  ASSERT_TRUE(port > 0);
+
+  X509 *cert = readCertificate(SERVER_CERT_FILE);
+  X509 *ca_cert = readCertificate(CLIENT_CA_CERT_FILE);
+  EVP_PKEY *key = readPrivateKey(SERVER_PRIVATE_KEY_FILE);
+
+  ASSERT_TRUE(cert != nullptr);
+  ASSERT_TRUE(ca_cert != nullptr);
+  ASSERT_TRUE(key != nullptr);
+
+  X509_STORE *cert_store = X509_STORE_new();
+
+  X509_STORE_add_cert(cert_store, ca_cert);
+
+  svr.update_certs(cert, key, cert_store);
+
+  ASSERT_TRUE(svr.is_valid());
+  svr.stop();
+
+  X509_free(cert);
+  X509_free(ca_cert);
+  EVP_PKEY_free(key);
+}
+#endif
+
+TEST(ErrorHandlerTest, ContentLength) {
+  Server svr;
+
+  svr.set_error_handler([](const Request & /*req*/, Response &res) {
+    res.status = StatusCode::OK_200;
+    res.set_content("abcdefghijklmnopqrstuvwxyz",
+                    "text/html"); // <= Content-Length still 13
+  });
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!\n", "text/plain");
+    res.status = 524;
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/hi", {{"Accept-Encoding", ""}});
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+    EXPECT_EQ("26", res->get_header_value("Content-Length"));
+    EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
+  }
+}
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+TEST(ExceptionTest, WithoutExceptionHandler) {
+  Server svr;
+
+  svr.Get("/exception", [&](const Request & /*req*/, Response & /*res*/) {
+    throw std::runtime_error("exception...");
+  });
+
+  svr.Get("/unknown", [&](const Request & /*req*/, Response & /*res*/) {
+    throw std::runtime_error("exception\r\n...");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  {
+    auto res = cli.Get("/exception");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+    ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
+    EXPECT_EQ("exception...", res->get_header_value("EXCEPTION_WHAT"));
+  }
+
+  {
+    auto res = cli.Get("/unknown");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+    ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
+    EXPECT_EQ("exception\\r\\n...", res->get_header_value("EXCEPTION_WHAT"));
+  }
+}
+
+TEST(ExceptionTest, WithExceptionHandler) {
+  Server svr;
+
+  svr.set_exception_handler([](const Request & /*req*/, Response &res,
+                               std::exception_ptr ep) {
+    EXPECT_FALSE(ep == nullptr);
+    try {
+      std::rethrow_exception(ep);
+    } catch (std::exception &e) {
+      EXPECT_EQ("abc", std::string(e.what()));
+    } catch (...) {}
+    res.status = StatusCode::InternalServerError_500;
+    res.set_content("abcdefghijklmnopqrstuvwxyz",
+                    "text/html"); // <= Content-Length still 13 at this point
+  });
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!\n", "text/plain");
+    throw std::runtime_error("abc");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  for (size_t i = 0; i < 10; i++) {
+    Client cli(HOST, PORT);
+
+    for (size_t j = 0; j < 100; j++) {
+      auto res = cli.Get("/hi", {{"Accept-Encoding", ""}});
+      ASSERT_TRUE(res);
+      EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+      EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+      EXPECT_EQ("26", res->get_header_value("Content-Length"));
+      EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
+    }
+
+    cli.set_keep_alive(true);
+
+    for (size_t j = 0; j < 100; j++) {
+      auto res = cli.Get("/hi", {{"Accept-Encoding", ""}});
+      ASSERT_TRUE(res);
+      EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+      EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+      EXPECT_EQ("26", res->get_header_value("Content-Length"));
+      EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
+    }
+  }
+}
+
+TEST(ExceptionTest, AndErrorHandler) {
+  Server svr;
+
+  svr.set_error_handler([](const Request & /*req*/, Response &res) {
+    if (res.body.empty()) { res.set_content("NOT_FOUND", "text/html"); }
+  });
+
+  svr.set_exception_handler(
+      [](const Request & /*req*/, Response &res, std::exception_ptr ep) {
+        EXPECT_FALSE(ep == nullptr);
+        try {
+          std::rethrow_exception(ep);
+        } catch (std::exception &e) {
+          res.set_content(e.what(), "text/html");
+        } catch (...) {}
+        res.status = StatusCode::InternalServerError_500;
+      });
+
+  svr.Get("/exception", [](const Request & /*req*/, Response & /*res*/) {
+    throw std::runtime_error("EXCEPTION");
+  });
+
+  svr.Get("/error", [](const Request & /*req*/, Response &res) {
+    res.set_content("ERROR", "text/html");
+    res.status = StatusCode::InternalServerError_500;
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+
+  {
+    auto res = cli.Get("/exception");
+    ASSERT_TRUE(res);
+    EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+    EXPECT_EQ("EXCEPTION", res->body);
+  }
+
+  {
+    auto res = cli.Get("/error");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+    EXPECT_EQ("ERROR", res->body);
+  }
+
+  {
+    auto res = cli.Get("/invalid");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::NotFound_404, res->status);
+    EXPECT_EQ("NOT_FOUND", res->body);
+  }
+}
+#endif
+
+TEST(NoContentTest, ContentLength) {
+  Server svr;
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.status = StatusCode::NoContent_204;
+  });
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/hi");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::NoContent_204, res->status);
+    EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  }
+}
+
+TEST(RoutingHandlerTest, PreRoutingHandler) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+#else
+  Server svr;
+#endif
+
+  svr.set_pre_routing_handler([](const Request &req, Response &res) {
+    if (req.path == "/routing_handler") {
+      res.set_header("PRE_ROUTING", "on");
+      res.set_content("Routing Handler", "text/plain");
+      return httplib::Server::HandlerResponse::Handled;
+    }
+    return httplib::Server::HandlerResponse::Unhandled;
+  });
+
+  svr.set_error_handler([](const Request & /*req*/, Response &res) {
+    res.set_content("Error", "text/html");
+  });
+
+  svr.set_post_routing_handler([](const Request &req, Response &res) {
+    if (req.path == "/routing_handler") {
+      res.set_header("POST_ROUTING", "on");
+    }
+  });
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!\n", "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSLClient cli(HOST, PORT);
+    cli.enable_server_certificate_verification(false);
+#else
+    Client cli(HOST, PORT);
+#endif
+
+    auto res = cli.Get("/routing_handler");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("Routing Handler", res->body);
+    EXPECT_EQ(1U, res->get_header_value_count("PRE_ROUTING"));
+    EXPECT_EQ("on", res->get_header_value("PRE_ROUTING"));
+    EXPECT_EQ(1U, res->get_header_value_count("POST_ROUTING"));
+    EXPECT_EQ("on", res->get_header_value("POST_ROUTING"));
+  }
+
+  {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSLClient cli(HOST, PORT);
+    cli.enable_server_certificate_verification(false);
+#else
+    Client cli(HOST, PORT);
+#endif
+
+    auto res = cli.Get("/hi");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("Hello World!\n", res->body);
+    EXPECT_EQ(0U, res->get_header_value_count("PRE_ROUTING"));
+    EXPECT_EQ(0U, res->get_header_value_count("POST_ROUTING"));
+  }
+
+  {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSLClient cli(HOST, PORT);
+    cli.enable_server_certificate_verification(false);
+#else
+    Client cli(HOST, PORT);
+#endif
+
+    auto res = cli.Get("/aaa");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::NotFound_404, res->status);
+    EXPECT_EQ("Error", res->body);
+    EXPECT_EQ(0U, res->get_header_value_count("PRE_ROUTING"));
+    EXPECT_EQ(0U, res->get_header_value_count("POST_ROUTING"));
+  }
+}
+
+TEST(InvalidFormatTest, StatusCode) {
+  Server svr;
+
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello World!\n", "text/plain");
+    res.status = 9999; // Status should be a three-digit code...
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/hi");
+    ASSERT_FALSE(res);
+  }
+}
+
+TEST(URLFragmentTest, WithFragment) {
+  Server svr;
+
+  svr.Get("/hi", [](const Request &req, Response & /*res*/) {
+    EXPECT_TRUE(req.target == "/hi");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/hi#key1=val1=key2=val2");
+    EXPECT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+
+    res = cli.Get("/hi%23key1=val1=key2=val2");
+    EXPECT_TRUE(res);
+    EXPECT_EQ(StatusCode::NotFound_404, res->status);
+  }
+}
+
+TEST(HeaderWriter, SetHeaderWriter) {
+  Server svr;
+
+  svr.set_header_writer([](Stream &strm, Headers &hdrs) {
+    hdrs.emplace("CustomServerHeader", "CustomServerValue");
+    return detail::write_headers(strm, hdrs);
+  });
+  svr.Get("/hi", [](const Request &req, Response &res) {
+    auto it = req.headers.find("CustomClientHeader");
+    EXPECT_TRUE(it != req.headers.end());
+    EXPECT_EQ(it->second, "CustomClientValue");
+    res.set_content("Hello World!\n", "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+    cli.set_header_writer([](Stream &strm, Headers &hdrs) {
+      hdrs.emplace("CustomClientHeader", "CustomClientValue");
+      return detail::write_headers(strm, hdrs);
+    });
+
+    auto res = cli.Get("/hi");
+    EXPECT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+
+    auto it = res->headers.find("CustomServerHeader");
+    EXPECT_TRUE(it != res->headers.end());
+    EXPECT_EQ(it->second, "CustomServerValue");
+  }
+}
+
+class ServerTest : public ::testing::Test {
+protected:
+  ServerTest()
+      : cli_(HOST, PORT)
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+        ,
+        svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE)
+#endif
+  {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    cli_.enable_server_certificate_verification(false);
+#endif
+  }
+
+  virtual void SetUp() {
+    svr_.set_mount_point("/", "./www");
+    svr_.set_mount_point("/mount", "./www2");
+    svr_.set_file_extension_and_mimetype_mapping("abcde", "text/abcde");
+
+    svr_.Get("/hi",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content("Hello World!", "text/plain");
+             })
+        .Get("/file_content",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_file_content("./www/dir/test.html");
+             })
+        .Get("/file_content_with_content_type",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_file_content("./www/file", "text/plain");
+             })
+        .Get("/invalid_file_content",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_file_content("./www/dir/invalid_file_path");
+             })
+        .Get("/http_response_splitting",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_header("a", "1\r\nSet-Cookie: a=1");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("a"));
+
+               res.set_header("a", "1\nSet-Cookie: a=1");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("a"));
+
+               res.set_header("a", "1\rSet-Cookie: a=1");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("a"));
+
+               res.set_header("a\r\nb", "0");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("a"));
+
+               res.set_header("a\rb", "0");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("a"));
+
+               res.set_header("a\nb", "0");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("a"));
+
+               res.set_redirect("1\r\nSet-Cookie: a=1");
+               EXPECT_EQ(0U, res.headers.size());
+               EXPECT_FALSE(res.has_header("Location"));
+             })
+        .Get("/slow",
+             [&](const Request & /*req*/, Response &res) {
+               std::this_thread::sleep_for(std::chrono::seconds(2));
+               res.set_content("slow", "text/plain");
+             })
+#if 0
+        .Post("/slowpost",
+              [&](const Request & /*req*/, Response &res) {
+                std::this_thread::sleep_for(std::chrono::seconds(2));
+                res.set_content("slow", "text/plain");
+              })
+#endif
+        .Get("/remote_addr",
+             [&](const Request &req, Response &res) {
+               auto remote_addr = req.headers.find("REMOTE_ADDR")->second;
+               EXPECT_TRUE(req.has_header("REMOTE_PORT"));
+               EXPECT_EQ(req.remote_addr, req.get_header_value("REMOTE_ADDR"));
+               EXPECT_EQ(req.remote_port,
+                         std::stoi(req.get_header_value("REMOTE_PORT")));
+               res.set_content(remote_addr.c_str(), "text/plain");
+             })
+        .Get("/local_addr",
+             [&](const Request &req, Response &res) {
+               EXPECT_TRUE(req.has_header("LOCAL_PORT"));
+               EXPECT_TRUE(req.has_header("LOCAL_ADDR"));
+               auto local_addr = req.get_header_value("LOCAL_ADDR");
+               auto local_port = req.get_header_value("LOCAL_PORT");
+               EXPECT_EQ(req.local_addr, local_addr);
+               EXPECT_EQ(req.local_port, std::stoi(local_port));
+               res.set_content(local_addr.append(":").append(local_port),
+                               "text/plain");
+             })
+        .Get("/endwith%",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content("Hello World!", "text/plain");
+             })
+        .Get("/a\\+\\+b",
+             [&](const Request &req, Response &res) {
+               ASSERT_TRUE(req.has_param("a +b"));
+               auto val = req.get_param_value("a +b");
+               res.set_content(val, "text/plain");
+             })
+        .Get("/", [&](const Request & /*req*/,
+                      Response &res) { res.set_redirect("/hi"); })
+        .Post("/1",
+              [](const Request & /*req*/, Response &res) {
+                res.set_redirect("/2", StatusCode::SeeOther_303);
+              })
+        .Get("/2",
+             [](const Request & /*req*/, Response &res) {
+               res.set_content("redirected.", "text/plain");
+               res.status = StatusCode::OK_200;
+             })
+        .Post("/person",
+              [&](const Request &req, Response &res) {
+                if (req.has_param("name") && req.has_param("note")) {
+                  persons_[req.get_param_value("name")] =
+                      req.get_param_value("note");
+                } else {
+                  res.status = StatusCode::BadRequest_400;
+                }
+              })
+        .Put("/person",
+             [&](const Request &req, Response &res) {
+               if (req.has_param("name") && req.has_param("note")) {
+                 persons_[req.get_param_value("name")] =
+                     req.get_param_value("note");
+               } else {
+                 res.status = StatusCode::BadRequest_400;
+               }
+             })
+        .Get("/person/(.*)",
+             [&](const Request &req, Response &res) {
+               string name = req.matches[1];
+               if (persons_.find(name) != persons_.end()) {
+                 auto note = persons_[name];
+                 res.set_content(note, "text/plain");
+               } else {
+                 res.status = StatusCode::NotFound_404;
+               }
+             })
+        .Post("/x-www-form-urlencoded-json",
+              [&](const Request &req, Response &res) {
+                auto json = req.get_param_value("json");
+                ASSERT_EQ(JSON_DATA, json);
+                res.set_content(json, "appliation/json");
+                res.status = StatusCode::OK_200;
+              })
+        .Get("/streamed-chunked",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_chunked_content_provider(
+                   "text/plain", [](size_t /*offset*/, DataSink &sink) {
+                     sink.os << "123";
+                     sink.os << "456";
+                     sink.os << "789";
+                     sink.done();
+                     return true;
+                   });
+             })
+        .Get("/streamed-chunked2",
+             [&](const Request & /*req*/, Response &res) {
+               auto i = new int(0);
+               res.set_chunked_content_provider(
+                   "text/plain",
+                   [i](size_t /*offset*/, DataSink &sink) {
+                     switch (*i) {
+                     case 0: sink.os << "123"; break;
+                     case 1: sink.os << "456"; break;
+                     case 2: sink.os << "789"; break;
+                     case 3: sink.done(); break;
+                     }
+                     (*i)++;
+                     return true;
+                   },
+                   [i](bool success) {
+                     EXPECT_TRUE(success);
+                     delete i;
+                   });
+             })
+        .Get("/streamed-chunked-with-trailer",
+             [&](const Request & /*req*/, Response &res) {
+               auto i = new int(0);
+               res.set_header("Trailer", "Dummy1, Dummy2");
+               res.set_chunked_content_provider(
+                   "text/plain",
+                   [i](size_t /*offset*/, DataSink &sink) {
+                     switch (*i) {
+                     case 0: sink.os << "123"; break;
+                     case 1: sink.os << "456"; break;
+                     case 2: sink.os << "789"; break;
+                     case 3: {
+                       sink.done_with_trailer(
+                           {{"Dummy1", "DummyVal1"}, {"Dummy2", "DummyVal2"}});
+                     } break;
+                     }
+                     (*i)++;
+                     return true;
+                   },
+                   [i](bool success) {
+                     EXPECT_TRUE(success);
+                     delete i;
+                   });
+             })
+        .Get("/streamed",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content_provider(
+                   6, "text/plain",
+                   [](size_t offset, size_t /*length*/, DataSink &sink) {
+                     sink.os << (offset < 3 ? "a" : "b");
+                     return true;
+                   });
+             })
+        .Get("/streamed-with-range",
+             [&](const Request &req, Response &res) {
+               auto data = new std::string("abcdefg");
+               res.set_content_provider(
+                   data->size(), "text/plain",
+                   [data](size_t offset, size_t length, DataSink &sink) {
+                     size_t DATA_CHUNK_SIZE = 4;
+                     const auto &d = *data;
+                     auto out_len =
+                         std::min(static_cast<size_t>(length), DATA_CHUNK_SIZE);
+                     auto ret =
+                         sink.write(&d[static_cast<size_t>(offset)], out_len);
+                     EXPECT_TRUE(ret);
+                     return true;
+                   },
+                   [data, &req](bool success) {
+                     EXPECT_EQ(success, !req.has_param("error"));
+                     delete data;
+                   });
+             })
+        .Get("/streamed-cancel",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content_provider(
+                   size_t(-1), "text/plain",
+                   [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+                     sink.os << "data_chunk";
+                     return true;
+                   });
+             })
+        .Get("/regex-with-delimiter",
+             [&](const Request &req, Response & /*res*/) {
+               ASSERT_TRUE(req.has_param("key"));
+               EXPECT_EQ("^(?.*(value))", req.get_param_value("key"));
+             })
+        .Get("/with-range",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content("abcdefg", "text/plain");
+             })
+        .Get("/with-range-customized-response",
+             [&](const Request & /*req*/, Response &res) {
+               res.status = StatusCode::BadRequest_400;
+               res.set_content(JSON_DATA, "application/json");
+             })
+        .Post("/chunked",
+              [&](const Request &req, Response & /*res*/) {
+                EXPECT_EQ(req.body, "dechunked post body");
+              })
+        .Post("/large-chunked",
+              [&](const Request &req, Response & /*res*/) {
+                std::string expected(6 * 30 * 1024u, 'a');
+                EXPECT_EQ(req.body, expected);
+              })
+        .Post("/multipart",
+              [&](const Request &req, Response & /*res*/) {
+                EXPECT_EQ(6u, req.files.size());
+                ASSERT_TRUE(!req.has_file("???"));
+                ASSERT_TRUE(req.body.empty());
+
+                {
+                  const auto &file = req.get_file_value("text1");
+                  EXPECT_TRUE(file.filename.empty());
+                  EXPECT_EQ("text default", file.content);
+                }
+
+                {
+                  const auto &file = req.get_file_value("text2");
+                  EXPECT_TRUE(file.filename.empty());
+                  EXPECT_EQ("aωb", file.content);
+                }
+
+                {
+                  const auto &file = req.get_file_value("file1");
+                  EXPECT_EQ("hello.txt", file.filename);
+                  EXPECT_EQ("text/plain", file.content_type);
+                  EXPECT_EQ("h\ne\n\nl\nl\no\n", file.content);
+                }
+
+                {
+                  const auto &file = req.get_file_value("file3");
+                  EXPECT_TRUE(file.filename.empty());
+                  EXPECT_EQ("application/octet-stream", file.content_type);
+                  EXPECT_EQ(0u, file.content.size());
+                }
+
+                {
+                  const auto &file = req.get_file_value("file4");
+                  EXPECT_TRUE(file.filename.empty());
+                  EXPECT_EQ(0u, file.content.size());
+                  EXPECT_EQ("application/json  tmp-string", file.content_type);
+                }
+              })
+        .Post("/multipart/multi_file_values",
+              [&](const Request &req, Response & /*res*/) {
+                EXPECT_EQ(5u, req.files.size());
+                ASSERT_TRUE(!req.has_file("???"));
+                ASSERT_TRUE(req.body.empty());
+
+                {
+                  const auto &text_value = req.get_file_values("text");
+                  EXPECT_EQ(1u, text_value.size());
+                  auto &text = text_value[0];
+                  EXPECT_TRUE(text.filename.empty());
+                  EXPECT_EQ("default text", text.content);
+                }
+                {
+                  const auto &text1_values = req.get_file_values("multi_text1");
+                  EXPECT_EQ(2u, text1_values.size());
+                  EXPECT_EQ("aaaaa", text1_values[0].content);
+                  EXPECT_EQ("bbbbb", text1_values[1].content);
+                }
+
+                {
+                  const auto &file1_values = req.get_file_values("multi_file1");
+                  EXPECT_EQ(2u, file1_values.size());
+                  auto file1 = file1_values[0];
+                  EXPECT_EQ(file1.filename, "hello.txt");
+                  EXPECT_EQ(file1.content_type, "text/plain");
+                  EXPECT_EQ("h\ne\n\nl\nl\no\n", file1.content);
+
+                  auto file2 = file1_values[1];
+                  EXPECT_EQ(file2.filename, "world.json");
+                  EXPECT_EQ(file2.content_type, "application/json");
+                  EXPECT_EQ("{\n  \"world\", true\n}\n", file2.content);
+                }
+              })
+        .Post("/empty",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, "");
+                EXPECT_EQ("text/plain", req.get_header_value("Content-Type"));
+                EXPECT_EQ("0", req.get_header_value("Content-Length"));
+                res.set_content("empty", "text/plain");
+              })
+        .Post("/empty-no-content-type",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, "");
+                EXPECT_FALSE(req.has_header("Content-Type"));
+                EXPECT_EQ("0", req.get_header_value("Content-Length"));
+                res.set_content("empty-no-content-type", "text/plain");
+              })
+        .Post("/path-only",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, "");
+                EXPECT_EQ("", req.get_header_value("Content-Type"));
+                EXPECT_EQ("0", req.get_header_value("Content-Length"));
+                res.set_content("path-only", "text/plain");
+              })
+        .Post("/path-headers-only",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, "");
+                EXPECT_EQ("", req.get_header_value("Content-Type"));
+                EXPECT_EQ("0", req.get_header_value("Content-Length"));
+                EXPECT_EQ("world", req.get_header_value("hello"));
+                EXPECT_EQ("world2", req.get_header_value("hello2"));
+                res.set_content("path-headers-only", "text/plain");
+              })
+        .Post("/post-large",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, LARGE_DATA);
+                res.set_content(req.body, "text/plain");
+              })
+        .Put("/empty-no-content-type",
+             [&](const Request &req, Response &res) {
+               EXPECT_EQ(req.body, "");
+               EXPECT_FALSE(req.has_header("Content-Type"));
+               EXPECT_EQ("0", req.get_header_value("Content-Length"));
+               res.set_content("empty-no-content-type", "text/plain");
+             })
+        .Put("/put",
+             [&](const Request &req, Response &res) {
+               EXPECT_EQ(req.body, "PUT");
+               res.set_content(req.body, "text/plain");
+             })
+        .Put("/put-large",
+             [&](const Request &req, Response &res) {
+               EXPECT_EQ(req.body, LARGE_DATA);
+               res.set_content(req.body, "text/plain");
+             })
+        .Patch("/patch",
+               [&](const Request &req, Response &res) {
+                 EXPECT_EQ(req.body, "PATCH");
+                 res.set_content(req.body, "text/plain");
+               })
+        .Delete("/delete",
+                [&](const Request & /*req*/, Response &res) {
+                  res.set_content("DELETE", "text/plain");
+                })
+        .Delete("/delete-body",
+                [&](const Request &req, Response &res) {
+                  EXPECT_EQ(req.body, "content");
+                  res.set_content(req.body, "text/plain");
+                })
+        .Options(R"(\*)",
+                 [&](const Request & /*req*/, Response &res) {
+                   res.set_header("Allow", "GET, POST, HEAD, OPTIONS");
+                 })
+        .Get("/request-target",
+             [&](const Request &req, Response & /*res*/) {
+               EXPECT_EQ("/request-target?aaa=bbb&ccc=ddd", req.target);
+               EXPECT_EQ("bbb", req.get_param_value("aaa"));
+               EXPECT_EQ("ddd", req.get_param_value("ccc"));
+             })
+        .Get("/long-query-value",
+             [&](const Request &req, Response & /*res*/) {
+               EXPECT_EQ(LONG_QUERY_URL, req.target);
+               EXPECT_EQ(LONG_QUERY_VALUE, req.get_param_value("key"));
+             })
+        .Get("/array-param",
+             [&](const Request &req, Response & /*res*/) {
+               EXPECT_EQ(3u, req.get_param_value_count("array"));
+               EXPECT_EQ("value1", req.get_param_value("array", 0));
+               EXPECT_EQ("value2", req.get_param_value("array", 1));
+               EXPECT_EQ("value3", req.get_param_value("array", 2));
+             })
+        .Post("/validate-no-multiple-headers",
+              [&](const Request &req, Response & /*res*/) {
+                EXPECT_EQ(1u, req.get_header_value_count("Content-Length"));
+                EXPECT_EQ("5", req.get_header_value("Content-Length"));
+              })
+        .Post("/content_receiver",
+              [&](const Request &req, Response &res,
+                  const ContentReader &content_reader) {
+                if (req.is_multipart_form_data()) {
+                  MultipartFormDataItems files;
+                  content_reader(
+                      [&](const MultipartFormData &file) {
+                        files.push_back(file);
+                        return true;
+                      },
+                      [&](const char *data, size_t data_length) {
+                        files.back().content.append(data, data_length);
+                        return true;
+                      });
+
+                  EXPECT_EQ(5u, files.size());
+
+                  {
+                    const auto &file = get_file_value(files, "text1");
+                    EXPECT_TRUE(file.filename.empty());
+                    EXPECT_EQ("text default", file.content);
+                  }
+
+                  {
+                    const auto &file = get_file_value(files, "text2");
+                    EXPECT_TRUE(file.filename.empty());
+                    EXPECT_EQ("aωb", file.content);
+                  }
+
+                  {
+                    const auto &file = get_file_value(files, "file1");
+                    EXPECT_EQ("hello.txt", file.filename);
+                    EXPECT_EQ("text/plain", file.content_type);
+                    EXPECT_EQ("h\ne\n\nl\nl\no\n", file.content);
+                  }
+
+                  {
+                    const auto &file = get_file_value(files, "file3");
+                    EXPECT_TRUE(file.filename.empty());
+                    EXPECT_EQ("application/octet-stream", file.content_type);
+                    EXPECT_EQ(0u, file.content.size());
+                  }
+                } else {
+                  std::string body;
+                  content_reader([&](const char *data, size_t data_length) {
+                    EXPECT_EQ(7U, data_length);
+                    body.append(data, data_length);
+                    return true;
+                  });
+                  EXPECT_EQ(body, "content");
+                  res.set_content(body, "text/plain");
+                }
+              })
+        .Put("/content_receiver",
+             [&](const Request & /*req*/, Response &res,
+                 const ContentReader &content_reader) {
+               std::string body;
+               content_reader([&](const char *data, size_t data_length) {
+                 body.append(data, data_length);
+                 return true;
+               });
+               EXPECT_EQ(body, "content");
+               res.set_content(body, "text/plain");
+             })
+        .Patch("/content_receiver",
+               [&](const Request & /*req*/, Response &res,
+                   const ContentReader &content_reader) {
+                 std::string body;
+                 content_reader([&](const char *data, size_t data_length) {
+                   body.append(data, data_length);
+                   return true;
+                 });
+                 EXPECT_EQ(body, "content");
+                 res.set_content(body, "text/plain");
+               })
+        .Post("/query-string-and-body",
+              [&](const Request &req, Response & /*res*/) {
+                ASSERT_TRUE(req.has_param("key"));
+                EXPECT_EQ(req.get_param_value("key"), "value");
+                EXPECT_EQ(req.body, "content");
+              })
+        .Get("/last-request",
+             [&](const Request &req, Response & /*res*/) {
+               EXPECT_EQ("close", req.get_header_value("Connection"));
+             })
+        .Get(R"(/redirect/(\d+))",
+             [&](const Request &req, Response &res) {
+               auto num = std::stoi(req.matches[1]) + 1;
+               std::string url = "/redirect/" + std::to_string(num);
+               res.set_redirect(url);
+             })
+        .Post("/binary",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(4U, req.body.size());
+                EXPECT_EQ("application/octet-stream",
+                          req.get_header_value("Content-Type"));
+                EXPECT_EQ("4", req.get_header_value("Content-Length"));
+                res.set_content(req.body, "application/octet-stream");
+              })
+        .Put("/binary",
+             [&](const Request &req, Response &res) {
+               EXPECT_EQ(4U, req.body.size());
+               EXPECT_EQ("application/octet-stream",
+                         req.get_header_value("Content-Type"));
+               EXPECT_EQ("4", req.get_header_value("Content-Length"));
+               res.set_content(req.body, "application/octet-stream");
+             })
+        .Patch("/binary",
+               [&](const Request &req, Response &res) {
+                 EXPECT_EQ(4U, req.body.size());
+                 EXPECT_EQ("application/octet-stream",
+                           req.get_header_value("Content-Type"));
+                 EXPECT_EQ("4", req.get_header_value("Content-Length"));
+                 res.set_content(req.body, "application/octet-stream");
+               })
+        .Delete("/binary",
+                [&](const Request &req, Response &res) {
+                  EXPECT_EQ(4U, req.body.size());
+                  EXPECT_EQ("application/octet-stream",
+                            req.get_header_value("Content-Type"));
+                  EXPECT_EQ("4", req.get_header_value("Content-Length"));
+                  res.set_content(req.body, "application/octet-stream");
+                })
+        .Get("/issue1772",
+             [&](const Request & /*req*/, Response &res) {
+               res.status = 401;
+               res.set_header("WWW-Authenticate", "Basic realm=123456");
+             })
+        .Delete("/issue609",
+                [](const httplib::Request &, httplib::Response &res,
+                   const httplib::ContentReader &) {
+                  res.set_content("ok", "text/plain");
+                })
+#if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT)
+        .Get("/compress",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content(
+                   "12345678901234567890123456789012345678901234567890123456789"
+                   "01234567890123456789012345678901234567890",
+                   "text/plain");
+             })
+        .Get("/nocompress",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content(
+                   "12345678901234567890123456789012345678901234567890123456789"
+                   "01234567890123456789012345678901234567890",
+                   "application/octet-stream");
+             })
+        .Post("/compress-multipart",
+              [&](const Request &req, Response & /*res*/) {
+                EXPECT_EQ(2u, req.files.size());
+                ASSERT_TRUE(!req.has_file("???"));
+
+                {
+                  const auto &file = req.get_file_value("key1");
+                  EXPECT_TRUE(file.filename.empty());
+                  EXPECT_EQ("test", file.content);
+                }
+
+                {
+                  const auto &file = req.get_file_value("key2");
+                  EXPECT_TRUE(file.filename.empty());
+                  EXPECT_EQ("--abcdefg123", file.content);
+                }
+              })
+#endif
+        ;
+
+    persons_["john"] = "programmer";
+
+    t_ = thread([&]() { ASSERT_TRUE(svr_.listen(HOST, PORT)); });
+
+    svr_.wait_until_ready();
+  }
+
+  virtual void TearDown() {
+    svr_.stop();
+    if (!request_threads_.empty()) {
+      std::this_thread::sleep_for(std::chrono::seconds(1));
+      for (auto &t : request_threads_) {
+        t.join();
+      }
+    }
+    t_.join();
+  }
+
+  map<string, string> persons_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli_;
+  SSLServer svr_;
+#else
+  Client cli_;
+  Server svr_;
+#endif
+  thread t_;
+  std::vector<thread> request_threads_;
+};
+
+TEST_F(ServerTest, GetMethod200) {
+  auto res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ("HTTP/1.1", res->version);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("OK", res->reason);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ(1U, res->get_header_value_count("Content-Type"));
+  EXPECT_EQ("Hello World!", res->body);
+}
+
+TEST_F(ServerTest, GetEmptyFile) {
+  auto res = cli_.Get("/empty_file");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
+  EXPECT_EQ(0, std::stoi(res->get_header_value("Content-Length")));
+  EXPECT_EQ("", res->body);
+}
+
+TEST_F(ServerTest, GetFileContent) {
+  auto res = cli_.Get("/file_content");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ(9, std::stoi(res->get_header_value("Content-Length")));
+  EXPECT_EQ("test.html", res->body);
+}
+
+TEST_F(ServerTest, GetFileContentWithRange) {
+  auto res = cli_.Get("/file_content", {{make_range_header({{1, 3}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ("bytes 1-3/9", res->get_header_value("Content-Range"));
+  EXPECT_EQ(3, std::stoi(res->get_header_value("Content-Length")));
+  EXPECT_EQ("est", res->body);
+}
+
+TEST_F(ServerTest, GetFileContentWithContentType) {
+  auto res = cli_.Get("/file_content_with_content_type");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ(5, std::stoi(res->get_header_value("Content-Length")));
+  EXPECT_EQ("file\n", res->body);
+}
+
+TEST_F(ServerTest, GetInvalidFileContent) {
+  auto res = cli_.Get("/invalid_file_content");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethod200withPercentEncoding) {
+  auto res = cli_.Get("/%68%69"); // auto res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ("HTTP/1.1", res->version);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ(1U, res->get_header_value_count("Content-Type"));
+  EXPECT_EQ("Hello World!", res->body);
+}
+
+TEST_F(ServerTest, GetMethod302) {
+  auto res = cli_.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::Found_302, res->status);
+  EXPECT_EQ("/hi", res->get_header_value("Location"));
+}
+
+TEST_F(ServerTest, GetMethod302Redirect) {
+  cli_.set_follow_location(true);
+  auto res = cli_.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("Hello World!", res->body);
+  EXPECT_EQ("/hi", res->location);
+}
+
+TEST_F(ServerTest, GetMethod404) {
+  auto res = cli_.Get("/invalid");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, HeadMethod200) {
+  auto res = cli_.Head("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_TRUE(res->body.empty());
+}
+
+TEST_F(ServerTest, HeadMethod200Static) {
+  auto res = cli_.Head("/mount/dir/index.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ(104, std::stoi(res->get_header_value("Content-Length")));
+  EXPECT_TRUE(res->body.empty());
+}
+
+TEST_F(ServerTest, HeadMethod404) {
+  auto res = cli_.Head("/invalid");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+  EXPECT_TRUE(res->body.empty());
+}
+
+TEST_F(ServerTest, GetMethodPersonJohn) {
+  auto res = cli_.Get("/person/john");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("programmer", res->body);
+}
+
+TEST_F(ServerTest, PostMethod1) {
+  auto res = cli_.Get("/person/john1");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::NotFound_404, res->status);
+
+  res = cli_.Post("/person", "name=john1&note=coder",
+                  "application/x-www-form-urlencoded");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+
+  res = cli_.Get("/person/john1");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
+  ASSERT_EQ("coder", res->body);
+}
+
+TEST_F(ServerTest, PostMethod2) {
+  auto res = cli_.Get("/person/john2");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::NotFound_404, res->status);
+
+  Params params;
+  params.emplace("name", "john2");
+  params.emplace("note", "coder");
+
+  res = cli_.Post("/person", params);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+
+  res = cli_.Get("/person/john2");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
+  ASSERT_EQ("coder", res->body);
+}
+
+TEST_F(ServerTest, PutMethod3) {
+  auto res = cli_.Get("/person/john3");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::NotFound_404, res->status);
+
+  Params params;
+  params.emplace("name", "john3");
+  params.emplace("note", "coder");
+
+  res = cli_.Put("/person", params);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+
+  res = cli_.Get("/person/john3");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
+  ASSERT_EQ("coder", res->body);
+}
+
+TEST_F(ServerTest, PostWwwFormUrlEncodedJson) {
+  Params params;
+  params.emplace("json", JSON_DATA);
+
+  auto res = cli_.Post("/x-www-form-urlencoded-json", params);
+
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(JSON_DATA, res->body);
+}
+
+TEST_F(ServerTest, PostEmptyContent) {
+  auto res = cli_.Post("/empty", "", "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("empty", res->body);
+}
+
+TEST_F(ServerTest, PostEmptyContentWithNoContentType) {
+  auto res = cli_.Post("/empty-no-content-type");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("empty-no-content-type", res->body);
+}
+
+TEST_F(ServerTest, PostPathOnly) {
+  auto res = cli_.Post("/path-only");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("path-only", res->body);
+}
+
+TEST_F(ServerTest, PostPathAndHeadersOnly) {
+  auto res = cli_.Post("/path-headers-only",
+                       Headers({{"hello", "world"}, {"hello2", "world2"}}));
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("path-headers-only", res->body);
+}
+
+TEST_F(ServerTest, PostLarge) {
+  auto res = cli_.Post("/post-large", LARGE_DATA, "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(LARGE_DATA, res->body);
+}
+
+TEST_F(ServerTest, PutEmptyContentWithNoContentType) {
+  auto res = cli_.Put("/empty-no-content-type");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("empty-no-content-type", res->body);
+}
+
+TEST_F(ServerTest, GetMethodDir) {
+  auto res = cli_.Get("/dir/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+
+  auto body = R"(<html>
+<head>
+</head>
+<body>
+  <a href="/dir/test.html">Test</a>
+  <a href="/hi">hi</a>
+</body>
+</html>
+)";
+  EXPECT_EQ(body, res->body);
+}
+
+TEST_F(ServerTest, GetMethodDirTest) {
+  auto res = cli_.Get("/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ("test.html", res->body);
+}
+
+TEST_F(ServerTest, GetMethodDirTestWithDoubleDots) {
+  auto res = cli_.Get("/dir/../dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ("test.html", res->body);
+}
+
+TEST_F(ServerTest, GetMethodInvalidPath) {
+  auto res = cli_.Get("/dir/../test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodOutOfBaseDir) {
+  auto res = cli_.Get("/../www/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodOutOfBaseDir2) {
+  auto res = cli_.Get("/dir/../../www/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodDirMountTest) {
+  auto res = cli_.Get("/mount/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ("test.html", res->body);
+}
+
+TEST_F(ServerTest, GetMethodDirMountTestWithDoubleDots) {
+  auto res = cli_.Get("/mount/dir/../dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
+  EXPECT_EQ("test.html", res->body);
+}
+
+TEST_F(ServerTest, GetMethodInvalidMountPath) {
+  auto res = cli_.Get("/mount/dir/../test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodEmbeddedNUL) {
+  auto res = cli_.Get("/mount/dir/test.html%00.js");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodOutOfBaseDirMount) {
+  auto res = cli_.Get("/mount/../www2/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodOutOfBaseDirMount2) {
+  auto res = cli_.Get("/mount/dir/../../www2/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodOutOfBaseDirMountWithBackslash) {
+  auto res = cli_.Get("/mount/%2e%2e%5c/www2/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, PostMethod303) {
+  auto res = cli_.Post("/1", "body", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::SeeOther_303, res->status);
+  EXPECT_EQ("/2", res->get_header_value("Location"));
+}
+
+TEST_F(ServerTest, PostMethod303Redirect) {
+  cli_.set_follow_location(true);
+  auto res = cli_.Post("/1", "body", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("redirected.", res->body);
+  EXPECT_EQ("/2", res->location);
+}
+
+TEST_F(ServerTest, UserDefinedMIMETypeMapping) {
+  auto res = cli_.Get("/dir/test.abcde");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
+  EXPECT_EQ("abcde", res->body);
+}
+
+TEST_F(ServerTest, StaticFileRange) {
+  auto res = cli_.Get("/dir/test.abcde", {{make_range_header({{2, 3}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 2-3/5", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("cd"), res->body);
+}
+
+TEST_F(ServerTest, StaticFileRanges) {
+  auto res =
+      cli_.Get("/dir/test.abcde", {{make_range_header({{1, 2}, {4, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_TRUE(
+      res->get_header_value("Content-Type")
+          .find(
+              "multipart/byteranges; boundary=--cpp-httplib-multipart-data-") ==
+      0);
+  EXPECT_EQ("266", res->get_header_value("Content-Length"));
+}
+
+TEST_F(ServerTest, StaticFileRangeHead) {
+  auto res = cli_.Head("/dir/test.abcde", {{make_range_header({{2, 3}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 2-3/5", res->get_header_value("Content-Range"));
+}
+
+TEST_F(ServerTest, StaticFileRangeBigFile) {
+  auto res = cli_.Get("/dir/1MB.txt", {{make_range_header({{-1, 5}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("5", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1048571-1048575/1048576",
+            res->get_header_value("Content-Range"));
+  EXPECT_EQ("LAST\n", res->body);
+}
+
+TEST_F(ServerTest, StaticFileRangeBigFile2) {
+  auto res = cli_.Get("/dir/1MB.txt", {{make_range_header({{1, 4097}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("4097", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1-4097/1048576", res->get_header_value("Content-Range"));
+}
+
+TEST_F(ServerTest, StaticFileBigFile) {
+  auto res = cli_.Get("/dir/1MB.txt");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("1048576", res->get_header_value("Content-Length"));
+}
+
+TEST_F(ServerTest, InvalidBaseDirMount) {
+  EXPECT_EQ(false, svr_.set_mount_point("invalid_mount_point", "./www3"));
+}
+
+TEST_F(ServerTest, Binary) {
+  std::vector<char> binary{0x00, 0x01, 0x02, 0x03};
+
+  auto res = cli_.Post("/binary", binary.data(), binary.size(),
+                       "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+
+  res = cli_.Put("/binary", binary.data(), binary.size(),
+                 "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+
+  res = cli_.Patch("/binary", binary.data(), binary.size(),
+                   "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+
+  res = cli_.Delete("/binary", binary.data(), binary.size(),
+                    "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+}
+
+TEST_F(ServerTest, BinaryString) {
+  auto binary = std::string("\x00\x01\x02\x03", 4);
+
+  auto res = cli_.Post("/binary", binary, "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+
+  res = cli_.Put("/binary", binary, "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+
+  res = cli_.Patch("/binary", binary, "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+
+  res = cli_.Delete("/binary", binary, "application/octet-stream");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ(4U, res->body.size());
+}
+
+TEST_F(ServerTest, EmptyRequest) {
+  auto res = cli_.Get("");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Connection, res.error());
+}
+
+TEST_F(ServerTest, LongRequest) {
+  std::string request;
+  for (size_t i = 0; i < 545; i++) {
+    request += "/TooLongRequest";
+  }
+  request += "OK";
+
+  auto res = cli_.Get(request.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, TooLongRequest) {
+  std::string request;
+  for (size_t i = 0; i < 546; i++) {
+    request += "/TooLongRequest";
+  }
+  request += "_NG";
+
+  auto res = cli_.Get(request.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::UriTooLong_414, res->status);
+}
+
+TEST_F(ServerTest, AlmostTooLongRequest) {
+  // test for #2046 - URI length check shouldn't include other content on req line
+  // URI is max URI length, minus 14 other chars in req line (GET, space, leading /, space, HTTP/1.1)
+  std::string request = "/" + string(CPPHTTPLIB_REQUEST_URI_MAX_LENGTH - 14, 'A');
+
+  auto res = cli_.Get(request.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, LongHeader) {
+  Request req;
+  req.method = "GET";
+  req.path = "/hi";
+
+  std::string host_and_port;
+  host_and_port += HOST;
+  host_and_port += ":";
+  host_and_port += std::to_string(PORT);
+
+  req.headers.emplace("Host", host_and_port.c_str());
+  req.headers.emplace("Accept", "*/*");
+  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
+
+  req.headers.emplace(
+      "Header-Name",
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@");
+
+  auto res = std::make_shared<Response>();
+  auto error = Error::Success;
+  auto ret = cli_.send(req, *res, error);
+
+  ASSERT_TRUE(ret);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, LongQueryValue) {
+  auto res = cli_.Get(LONG_QUERY_URL.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::UriTooLong_414, res->status);
+}
+
+TEST_F(ServerTest, TooLongHeader) {
+  Request req;
+  req.method = "GET";
+  req.path = "/hi";
+
+  std::string host_and_port;
+  host_and_port += HOST;
+  host_and_port += ":";
+  host_and_port += std::to_string(PORT);
+
+  req.headers.emplace("Host", host_and_port.c_str());
+  req.headers.emplace("Accept", "*/*");
+  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
+
+  req.headers.emplace(
+      "Header-Name",
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+      "@@@@@@@@@@@@@@@@@");
+
+  auto res = std::make_shared<Response>();
+  auto error = Error::Success;
+  auto ret = cli_.send(req, *res, error);
+
+  ASSERT_TRUE(ret);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, PercentEncoding) {
+  auto res = cli_.Get("/e%6edwith%");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, PercentEncodingUnicode) {
+  auto res = cli_.Get("/e%u006edwith%");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, InvalidPercentEncoding) {
+  auto res = cli_.Get("/%endwith%");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, InvalidPercentEncodingUnicode) {
+  auto res = cli_.Get("/%uendwith%");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, EndWithPercentCharacterInQuery) {
+  auto res = cli_.Get("/hello?aaa=bbb%");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, PlusSignEncoding) {
+  auto res = cli_.Get("/a+%2Bb?a %2bb=a %2Bb");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("a +b", res->body);
+}
+
+TEST_F(ServerTest, MultipartFormData) {
+  MultipartFormDataItems items = {
+      {"text1", "text default", "", ""},
+      {"text2", "aωb", "", ""},
+      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
+      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
+      {"file3", "", "", "application/octet-stream"},
+      {"file4", "", "", "   application/json  tmp-string    "}};
+
+  auto res = cli_.Post("/multipart", items);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, MultipartFormDataMultiFileValues) {
+  MultipartFormDataItems items = {
+      {"text", "default text", "", ""},
+
+      {"multi_text1", "aaaaa", "", ""},
+      {"multi_text1", "bbbbb", "", ""},
+
+      {"multi_file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
+      {"multi_file1", "{\n  \"world\", true\n}\n", "world.json",
+       "application/json"},
+  };
+
+  auto res = cli_.Post("/multipart/multi_file_values", items);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, CaseInsensitiveHeaderName) {
+  auto res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("content-type"));
+  EXPECT_EQ("Hello World!", res->body);
+}
+
+TEST_F(ServerTest, CaseInsensitiveTransferEncoding) {
+  Request req;
+  req.method = "POST";
+  req.path = "/chunked";
+
+  std::string host_and_port;
+  host_and_port += HOST;
+  host_and_port += ":";
+  host_and_port += std::to_string(PORT);
+
+  req.headers.emplace("Host", host_and_port.c_str());
+  req.headers.emplace("Accept", "*/*");
+  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
+  req.headers.emplace("Content-Type", "text/plain");
+  req.headers.emplace("Content-Length", "0");
+  req.headers.emplace(
+      "Transfer-Encoding",
+      "Chunked"); // Note, "Chunked" rather than typical "chunked".
+
+  // Client does not chunk, so make a chunked body manually.
+  req.body = "4\r\ndech\r\nf\r\nunked post body\r\n0\r\n\r\n";
+
+  auto res = std::make_shared<Response>();
+  auto error = Error::Success;
+  auto ret = cli_.send(req, *res, error);
+
+  ASSERT_TRUE(ret);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, GetStreamed2) {
+  auto res = cli_.Get("/streamed", {{make_range_header({{2, 3}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 2-3/6", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("ab"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamed) {
+  auto res = cli_.Get("/streamed");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("6", res->get_header_value("Content-Length"));
+  EXPECT_EQ(std::string("aaabbb"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRange1) {
+  auto res = cli_.Get("/streamed-with-range", {{make_range_header({{3, 5}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("3", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 3-5/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("def"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRange2) {
+  auto res = cli_.Get("/streamed-with-range", {{make_range_header({{1, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("6", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1-6/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("bcdefg"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRangeSuffix1) {
+  auto res = cli_.Get("/streamed-with-range", {{"Range", "bytes=-3"}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("3", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 4-6/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("efg"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRangeSuffix2) {
+  auto res = cli_.Get("/streamed-with-range?error", {{"Range", "bytes=-9999"}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithRangeError) {
+  auto res = cli_.Get("/streamed-with-range",
+                      {{"Range", "bytes=92233720368547758079223372036854775806-"
+                                 "92233720368547758079223372036854775807"}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetRangeWithMaxLongLength) {
+  auto res = cli_.Get(
+      "/with-range",
+      {{"Range", "bytes=0-" + std::to_string(std::numeric_limits<long>::max())},
+       {"Accept-Encoding", ""}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("7", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 0-6/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("abcdefg"), res->body);
+}
+
+TEST_F(ServerTest, GetRangeWithZeroToInfinite) {
+  auto res = cli_.Get("/with-range", {
+                                         {"Range", "bytes=0-"},
+                                         {"Accept-Encoding", ""},
+                                     });
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("7", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 0-6/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("abcdefg"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRangeMultipart) {
+  auto res =
+      cli_.Get("/streamed-with-range", {{make_range_header({{1, 2}, {4, 5}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("267", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(267U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithTooManyRanges) {
+  Ranges ranges;
+  for (size_t i = 0; i < CPPHTTPLIB_RANGE_MAX_COUNT + 1; i++) {
+    ranges.emplace_back(0, -1);
+  }
+
+  auto res =
+      cli_.Get("/streamed-with-range?error", {{make_range_header(ranges)}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithNonAscendingRanges) {
+  auto res = cli_.Get("/streamed-with-range?error",
+                      {{make_range_header({{0, -1}, {0, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithRangesMoreThanTwoOverwrapping) {
+  auto res = cli_.Get("/streamed-with-range?error",
+                      {{make_range_header({{0, 1}, {1, 2}, {2, 3}, {3, 4}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedEndless) {
+  uint64_t offset = 0;
+  auto res = cli_.Get("/streamed-cancel",
+                      [&](const char * /*data*/, uint64_t data_length) {
+                        if (offset < 100) {
+                          offset += data_length;
+                          return true;
+                        }
+                        return false;
+                      });
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST_F(ServerTest, ClientStop) {
+  std::atomic_size_t count{4};
+  std::vector<std::thread> threads;
+
+  for (auto i = count.load(); i != 0; --i) {
+    threads.emplace_back([&]() {
+      auto res = cli_.Get("/streamed-cancel",
+                          [&](const char *, uint64_t) { return true; });
+
+      --count;
+
+      ASSERT_TRUE(!res);
+      EXPECT_TRUE(res.error() == Error::Canceled ||
+                  res.error() == Error::Read || res.error() == Error::Write);
+    });
+  }
+
+  std::this_thread::sleep_for(std::chrono::seconds(2));
+  while (count != 0) {
+    cli_.stop();
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+  }
+  for (auto &t : threads) {
+    t.join();
+  }
+}
+
+TEST_F(ServerTest, GetWithRange1) {
+  auto res = cli_.Get("/with-range", {
+                                         make_range_header({{3, 5}}),
+                                         {"Accept-Encoding", ""},
+                                     });
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("3", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 3-5/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("def"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRange2) {
+  auto res = cli_.Get("/with-range", {
+                                         make_range_header({{1, -1}}),
+                                         {"Accept-Encoding", ""},
+                                     });
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("6", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1-6/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("bcdefg"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRange3) {
+  auto res = cli_.Get("/with-range", {
+                                         make_range_header({{0, 0}}),
+                                         {"Accept-Encoding", ""},
+                                     });
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("1", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 0-0/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("a"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRange4) {
+  auto res = cli_.Get("/with-range", {
+                                         make_range_header({{-1, 2}}),
+                                         {"Accept-Encoding", ""},
+                                     });
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 5-6/7", res->get_header_value("Content-Range"));
+  EXPECT_EQ(std::string("fg"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRangeOffsetGreaterThanContent) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{10000, 20000}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+}
+
+TEST_F(ServerTest, GetWithRangeMultipart) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{1, 2}, {4, 5}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("267", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(267U, res->body.size());
+}
+
+TEST_F(ServerTest, GetWithRangeMultipartOffsetGreaterThanContent) {
+  auto res =
+      cli_.Get("/with-range", {{make_range_header({{-1, 2}, {10000, 30000}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+}
+
+TEST_F(ServerTest, GetWithRangeCustomizedResponse) {
+  auto res = cli_.Get("/with-range-customized-response",
+                      {{make_range_header({{1, 2}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
+  EXPECT_EQ(true, res->has_header("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(JSON_DATA, res->body);
+}
+
+TEST_F(ServerTest, GetWithRangeMultipartCustomizedResponseMultipleRange) {
+  auto res = cli_.Get("/with-range-customized-response",
+                      {{make_range_header({{1, 2}, {4, 5}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
+  EXPECT_EQ(true, res->has_header("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(JSON_DATA, res->body);
+}
+
+TEST_F(ServerTest, Issue1772) {
+  auto res = cli_.Get("/issue1772", {{make_range_header({{1000, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+}
+
+TEST_F(ServerTest, Issue609) {
+  auto res = cli_.Delete("/issue609");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("ok"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunked) {
+  auto res = cli_.Get("/streamed-chunked");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunked2) {
+  auto res = cli_.Get("/streamed-chunked2");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunkedWithTrailer) {
+  auto res = cli_.Get("/streamed-chunked-with-trailer");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+  EXPECT_EQ(std::string("DummyVal1"), res->get_header_value("Dummy1"));
+  EXPECT_EQ(std::string("DummyVal2"), res->get_header_value("Dummy2"));
+}
+
+TEST_F(ServerTest, LargeChunkedPost) {
+  Request req;
+  req.method = "POST";
+  req.path = "/large-chunked";
+
+  std::string host_and_port;
+  host_and_port += HOST;
+  host_and_port += ":";
+  host_and_port += std::to_string(PORT);
+
+  req.headers.emplace("Host", host_and_port.c_str());
+  req.headers.emplace("Accept", "*/*");
+  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
+  req.headers.emplace("Content-Type", "text/plain");
+  req.headers.emplace("Content-Length", "0");
+  req.headers.emplace("Transfer-Encoding", "chunked");
+
+  std::string long_string(30 * 1024u, 'a');
+  std::string chunk = "7800\r\n" + long_string + "\r\n";
+
+  // Attempt to make a large enough post to exceed OS buffers, to test that
+  // the server handles short reads if the full chunk data isn't available.
+  req.body = chunk + chunk + chunk + chunk + chunk + chunk + "0\r\n\r\n";
+
+  auto res = std::make_shared<Response>();
+  auto error = Error::Success;
+  auto ret = cli_.send(req, *res, error);
+
+  ASSERT_TRUE(ret);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, GetMethodRemoteAddr) {
+  auto res = cli_.Get("/remote_addr");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1");
+}
+
+TEST_F(ServerTest, GetMethodLocalAddr) {
+  auto res = cli_.Get("/local_addr");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_TRUE(res->body == std::string("::1:").append(to_string(PORT)) ||
+              res->body == std::string("127.0.0.1:").append(to_string(PORT)));
+}
+
+TEST_F(ServerTest, HTTPResponseSplitting) {
+  auto res = cli_.Get("/http_response_splitting");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, SlowRequest) {
+  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
+  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
+  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
+}
+
+#if 0
+TEST_F(ServerTest, SlowPost) {
+  char buffer[64 * 1024];
+  memset(buffer, 0x42, sizeof(buffer));
+
+  auto res = cli_.Post(
+      "/slowpost", 64 * 1024 * 1024,
+      [&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        auto ret = sink.write(buffer, sizeof(buffer));
+        EXPECT_TRUE(ret);
+        return true;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, SlowPostFail) {
+  char buffer[64 * 1024];
+  memset(buffer, 0x42, sizeof(buffer));
+
+  cli_.set_write_timeout(std::chrono::seconds(0));
+  auto res = cli_.Post(
+      "/slowpost", 64 * 1024 * 1024,
+      [&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        sink.write(buffer, sizeof(buffer));
+        return true;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Write, res.error());
+}
+#endif
+
+TEST_F(ServerTest, Put) {
+  auto res = cli_.Put("/put", "PUT", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PUT", res->body);
+}
+
+TEST_F(ServerTest, PutWithContentProvider) {
+  auto res = cli_.Put(
+      "/put", 3,
+      [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        sink.os << "PUT";
+        return true;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PUT", res->body);
+}
+
+TEST_F(ServerTest, PostWithContentProviderAbort) {
+  auto res = cli_.Post(
+      "/post", 42,
+      [](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
+        return false;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST_F(ServerTest, PutWithContentProviderWithoutLength) {
+  auto res = cli_.Put(
+      "/put",
+      [](size_t /*offset*/, DataSink &sink) {
+        sink.os << "PUT";
+        sink.done();
+        return true;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PUT", res->body);
+}
+
+TEST_F(ServerTest, PostWithContentProviderWithoutLengthAbort) {
+  auto res = cli_.Post(
+      "/post", [](size_t /*offset*/, DataSink & /*sink*/) { return false; },
+      "text/plain");
+
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+TEST_F(ServerTest, PutWithContentProviderWithGzip) {
+  cli_.set_compress(true);
+  auto res = cli_.Put(
+      "/put", 3,
+      [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        sink.os << "PUT";
+        return true;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PUT", res->body);
+}
+
+TEST_F(ServerTest, PostWithContentProviderWithGzipAbort) {
+  cli_.set_compress(true);
+  auto res = cli_.Post(
+      "/post", 42,
+      [](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
+        return false;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST_F(ServerTest, PutWithContentProviderWithoutLengthWithGzip) {
+  cli_.set_compress(true);
+  auto res = cli_.Put(
+      "/put",
+      [](size_t /*offset*/, DataSink &sink) {
+        sink.os << "PUT";
+        sink.done();
+        return true;
+      },
+      "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PUT", res->body);
+}
+
+TEST_F(ServerTest, PostWithContentProviderWithoutLengthWithGzipAbort) {
+  cli_.set_compress(true);
+  auto res = cli_.Post(
+      "/post", [](size_t /*offset*/, DataSink & /*sink*/) { return false; },
+      "text/plain");
+
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::Canceled, res.error());
+}
+
+TEST_F(ServerTest, PutLargeFileWithGzip) {
+  cli_.set_compress(true);
+  auto res = cli_.Put("/put-large", LARGE_DATA, "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(LARGE_DATA, res->body);
+}
+
+TEST_F(ServerTest, PutLargeFileWithGzip2) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  std::string s = std::string("https://") + HOST + ":" + std::to_string(PORT);
+  Client cli(s.c_str());
+  cli.enable_server_certificate_verification(false);
+#else
+  std::string s = std::string("http://") + HOST + ":" + std::to_string(PORT);
+  Client cli(s.c_str());
+#endif
+  cli.set_compress(true);
+
+  auto res = cli.Put("/put-large", LARGE_DATA, "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(LARGE_DATA, res->body);
+  // The compressed size should be less than a 10th of the original. May vary
+  // depending on the zlib library.
+  EXPECT_LT(res.get_request_header_value_u64("Content-Length"),
+            static_cast<uint64_t>(10 * 1024 * 1024));
+  EXPECT_EQ("gzip", res.get_request_header_value("Content-Encoding"));
+}
+
+TEST_F(ServerTest, PutContentWithDeflate) {
+  cli_.set_compress(false);
+  Headers headers;
+  headers.emplace("Content-Encoding", "deflate");
+  // PUT in deflate format:
+  auto res = cli_.Put("/put", headers,
+                      "\170\234\013\010\015\001\0\001\361\0\372", "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PUT", res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunkedWithGzip) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+
+  auto res = cli_.Get("/streamed-chunked", headers);
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunkedWithGzip2) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+
+  auto res = cli_.Get("/streamed-chunked2", headers);
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+
+TEST_F(ServerTest, SplitDelimiterInPathRegex) {
+  auto res = cli_.Get("/regex-with-delimiter?key=^(?.*(value))");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(GzipDecompressor, ChunkedDecompression) {
+  std::string data;
+  for (size_t i = 0; i < 32 * 1024; ++i) {
+    data.push_back(static_cast<char>('a' + i % 26));
+  }
+
+  std::string compressed_data;
+  {
+    httplib::detail::gzip_compressor compressor;
+    bool result = compressor.compress(
+        data.data(), data.size(),
+        /*last=*/true,
+        [&](const char *compressed_data_chunk, size_t compressed_data_size) {
+          compressed_data.insert(compressed_data.size(), compressed_data_chunk,
+                                 compressed_data_size);
+          return true;
+        });
+    ASSERT_TRUE(result);
+  }
+
+  std::string decompressed_data;
+  {
+    httplib::detail::gzip_decompressor decompressor;
+
+    // Chunk size is chosen specifically to have a decompressed chunk size equal
+    // to 16384 bytes 16384 bytes is the size of decompressor output buffer
+    size_t chunk_size = 130;
+    for (size_t chunk_begin = 0; chunk_begin < compressed_data.size();
+         chunk_begin += chunk_size) {
+      size_t current_chunk_size =
+          std::min(compressed_data.size() - chunk_begin, chunk_size);
+      bool result = decompressor.decompress(
+          compressed_data.data() + chunk_begin, current_chunk_size,
+          [&](const char *decompressed_data_chunk,
+              size_t decompressed_data_chunk_size) {
+            decompressed_data.insert(decompressed_data.size(),
+                                     decompressed_data_chunk,
+                                     decompressed_data_chunk_size);
+            return true;
+          });
+      ASSERT_TRUE(result);
+    }
+  }
+  ASSERT_EQ(data, decompressed_data);
+}
+
+TEST(GzipDecompressor, DeflateDecompression) {
+  std::string original_text = "Raw deflate without gzip";
+  unsigned char data[32] = {0x78, 0x9C, 0x0B, 0x4A, 0x2C, 0x57, 0x48, 0x49,
+                            0x4D, 0xCB, 0x49, 0x2C, 0x49, 0x55, 0x28, 0xCF,
+                            0x2C, 0xC9, 0xC8, 0x2F, 0x2D, 0x51, 0x48, 0xAF,
+                            0xCA, 0x2C, 0x00, 0x00, 0x6F, 0x98, 0x09, 0x2E};
+  std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
+
+  std::string decompressed_data;
+  {
+    httplib::detail::gzip_decompressor decompressor;
+
+    bool result = decompressor.decompress(
+        compressed_data.data(), compressed_data.size(),
+        [&](const char *decompressed_data_chunk,
+            size_t decompressed_data_chunk_size) {
+          decompressed_data.insert(decompressed_data.size(),
+                                   decompressed_data_chunk,
+                                   decompressed_data_chunk_size);
+          return true;
+        });
+    ASSERT_TRUE(result);
+  }
+  ASSERT_EQ(original_text, decompressed_data);
+}
+
+TEST(GzipDecompressor, DeflateDecompressionTrailingBytes) {
+  std::string original_text = "Raw deflate without gzip";
+  unsigned char data[40] = {0x78, 0x9C, 0x0B, 0x4A, 0x2C, 0x57, 0x48, 0x49,
+                            0x4D, 0xCB, 0x49, 0x2C, 0x49, 0x55, 0x28, 0xCF,
+                            0x2C, 0xC9, 0xC8, 0x2F, 0x2D, 0x51, 0x48, 0xAF,
+                            0xCA, 0x2C, 0x00, 0x00, 0x6F, 0x98, 0x09, 0x2E,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
+
+  std::string decompressed_data;
+  {
+    httplib::detail::gzip_decompressor decompressor;
+
+    bool result = decompressor.decompress(
+        compressed_data.data(), compressed_data.size(),
+        [&](const char *decompressed_data_chunk,
+            size_t decompressed_data_chunk_size) {
+          decompressed_data.insert(decompressed_data.size(),
+                                   decompressed_data_chunk,
+                                   decompressed_data_chunk_size);
+          return true;
+        });
+    ASSERT_TRUE(result);
+  }
+  ASSERT_EQ(original_text, decompressed_data);
+}
+
+#ifdef _WIN32
+TEST(GzipDecompressor, LargeRandomData) {
+
+  // prepare large random data that is difficult to be compressed and is
+  // expected to have large size even when compressed
+  std::random_device seed_gen;
+  std::mt19937 random(seed_gen());
+  constexpr auto large_size_byte = 4294967296UL;            // 4GiB
+  constexpr auto data_size = large_size_byte + 134217728UL; // + 128MiB
+  std::vector<std::uint32_t> data(data_size / sizeof(std::uint32_t));
+  std::generate(data.begin(), data.end(), [&]() { return random(); });
+
+  // compress data over 4GiB
+  std::string compressed_data;
+  compressed_data.reserve(large_size_byte + 536870912UL); // + 512MiB reserved
+  httplib::detail::gzip_compressor compressor;
+  auto result = compressor.compress(reinterpret_cast<const char *>(data.data()),
+                                    data.size() * sizeof(std::uint32_t), true,
+                                    [&](const char *data, size_t size) {
+                                      compressed_data.insert(
+                                          compressed_data.size(), data, size);
+                                      return true;
+                                    });
+  ASSERT_TRUE(result);
+
+  // FIXME: compressed data size is expected to be greater than 4GiB,
+  // but there is no guarantee
+  // ASSERT_TRUE(compressed_data.size() >= large_size_byte);
+
+  // decompress data over 4GiB
+  std::string decompressed_data;
+  decompressed_data.reserve(data_size);
+  httplib::detail::gzip_decompressor decompressor;
+  result = decompressor.decompress(
+      compressed_data.data(), compressed_data.size(),
+      [&](const char *data, size_t size) {
+        decompressed_data.insert(decompressed_data.size(), data, size);
+        return true;
+      });
+  ASSERT_TRUE(result);
+
+  // compare
+  ASSERT_EQ(data_size, decompressed_data.size());
+  ASSERT_TRUE(std::memcmp(data.data(), decompressed_data.data(), data_size) ==
+              0);
+}
+#endif
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+TEST_F(ServerTest, GetStreamedChunkedWithBrotli) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "br");
+
+  auto res = cli_.Get("/streamed-chunked", headers);
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunkedWithBrotli2) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "br");
+
+  auto res = cli_.Get("/streamed-chunked2", headers);
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+#endif
+
+TEST_F(ServerTest, Patch) {
+  auto res = cli_.Patch("/patch", "PATCH", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("PATCH", res->body);
+}
+
+TEST_F(ServerTest, Delete) {
+  auto res = cli_.Delete("/delete");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("DELETE", res->body);
+}
+
+TEST_F(ServerTest, DeleteContentReceiver) {
+  auto res = cli_.Delete("/delete-body", "content", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("content", res->body);
+}
+
+TEST_F(ServerTest, Options) {
+  auto res = cli_.Options("*");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("GET, POST, HEAD, OPTIONS", res->get_header_value("Allow"));
+  EXPECT_TRUE(res->body.empty());
+}
+
+TEST_F(ServerTest, URL) {
+  auto res = cli_.Get("/request-target?aaa=bbb&ccc=ddd");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, ArrayParam) {
+  auto res = cli_.Get("/array-param?array=value1&array=value2&array=value3");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, NoMultipleHeaders) {
+  Headers headers = {{"Content-Length", "5"}};
+  auto res = cli_.Post("/validate-no-multiple-headers", headers, "hello",
+                       "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, PostContentReceiver) {
+  auto res = cli_.Post("/content_receiver", "content", "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("content", res->body);
+}
+
+TEST_F(ServerTest, PostMultipartFileContentReceiver) {
+  MultipartFormDataItems items = {
+      {"text1", "text default", "", ""},
+      {"text2", "aωb", "", ""},
+      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
+      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
+      {"file3", "", "", "application/octet-stream"},
+  };
+
+  auto res = cli_.Post("/content_receiver", items);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, PostMultipartPlusBoundary) {
+  MultipartFormDataItems items = {
+      {"text1", "text default", "", ""},
+      {"text2", "aωb", "", ""},
+      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
+      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
+      {"file3", "", "", "application/octet-stream"},
+  };
+
+  auto boundary = std::string("+++++");
+
+  std::string body;
+
+  for (const auto &item : items) {
+    body += "--" + boundary + "\r\n";
+    body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
+    if (!item.filename.empty()) {
+      body += "; filename=\"" + item.filename + "\"";
+    }
+    body += "\r\n";
+    if (!item.content_type.empty()) {
+      body += "Content-Type: " + item.content_type + "\r\n";
+    }
+    body += "\r\n";
+    body += item.content + "\r\n";
+  }
+  body += "--" + boundary + "--\r\n";
+
+  std::string content_type = "multipart/form-data; boundary=" + boundary;
+  auto res = cli_.Post("/content_receiver", body, content_type.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, PostContentReceiverGzip) {
+  cli_.set_compress(true);
+  auto res = cli_.Post("/content_receiver", "content", "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("content", res->body);
+}
+
+TEST_F(ServerTest, PutContentReceiver) {
+  auto res = cli_.Put("/content_receiver", "content", "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("content", res->body);
+}
+
+TEST_F(ServerTest, PatchContentReceiver) {
+  auto res = cli_.Patch("/content_receiver", "content", "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("content", res->body);
+}
+
+TEST_F(ServerTest, PostQueryStringAndBody) {
+  auto res =
+      cli_.Post("/query-string-and-body?key=value", "content", "text/plain");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, HTTP2Magic) {
+  Request req;
+  req.method = "PRI";
+  req.path = "*";
+  req.body = "SM";
+
+  auto res = std::make_shared<Response>();
+  auto error = Error::Success;
+  auto ret = cli_.send(req, *res, error);
+
+  ASSERT_TRUE(ret);
+  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
+}
+
+TEST_F(ServerTest, KeepAlive) {
+  auto res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("Hello World!", res->body);
+
+  res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("Hello World!", res->body);
+
+  res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("Hello World!", res->body);
+
+  res = cli_.Get("/not-exist");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+
+  res = cli_.Post("/empty", "", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("empty", res->body);
+  EXPECT_EQ("close", res->get_header_value("Connection"));
+
+  res = cli_.Post(
+      "/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
+      "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("empty", res->body);
+
+  cli_.set_keep_alive(false);
+  res = cli_.Get("/last-request");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("close", res->get_header_value("Connection"));
+}
+
+TEST_F(ServerTest, TooManyRedirect) {
+  cli_.set_follow_location(true);
+  auto res = cli_.Get("/redirect/0");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::ExceedRedirectCount, res.error());
+}
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+TEST_F(ServerTest, Gzip) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+  auto res = cli_.Get("/compress", headers);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("33", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, GzipWithoutAcceptEncoding) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "");
+  auto res = cli_.Get("/compress", headers);
+
+  ASSERT_TRUE(res);
+  EXPECT_TRUE(res->get_header_value("Content-Encoding").empty());
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("100", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, GzipWithContentReceiver) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+  std::string body;
+  auto res = cli_.Get("/compress", headers,
+                      [&](const char *data, uint64_t data_length) {
+                        EXPECT_EQ(100U, data_length);
+                        body.append(data, data_length);
+                        return true;
+                      });
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("33", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, GzipWithoutDecompressing) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+
+  cli_.set_decompress(false);
+  auto res = cli_.Get("/compress", headers);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("33", res->get_header_value("Content-Length"));
+  EXPECT_EQ(33U, res->body.size());
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, GzipWithContentReceiverWithoutAcceptEncoding) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "");
+
+  std::string body;
+  auto res = cli_.Get("/compress", headers,
+                      [&](const char *data, uint64_t data_length) {
+                        EXPECT_EQ(100U, data_length);
+                        body.append(data, data_length);
+                        return true;
+                      });
+
+  ASSERT_TRUE(res);
+  EXPECT_TRUE(res->get_header_value("Content-Encoding").empty());
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("100", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, NoGzip) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+  auto res = cli_.Get("/nocompress", headers);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(false, res->has_header("Content-Encoding"));
+  EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
+  EXPECT_EQ("100", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, NoGzipWithContentReceiver) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "gzip, deflate");
+  std::string body;
+  auto res = cli_.Get("/nocompress", headers,
+                      [&](const char *data, uint64_t data_length) {
+                        EXPECT_EQ(100U, data_length);
+                        body.append(data, data_length);
+                        return true;
+                      });
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(false, res->has_header("Content-Encoding"));
+  EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
+  EXPECT_EQ("100", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, MultipartFormDataGzip) {
+  MultipartFormDataItems items = {
+      {"key1", "test", "", ""},
+      {"key2", "--abcdefg123", "", ""},
+  };
+
+  cli_.set_compress(true);
+  auto res = cli_.Post("/compress-multipart", items);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+#endif
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+TEST_F(ServerTest, Brotli) {
+  Headers headers;
+  headers.emplace("Accept-Encoding", "br");
+  auto res = cli_.Get("/compress", headers);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ("br", res->get_header_value("Content-Encoding"));
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("19", res->get_header_value("Content-Length"));
+  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
+            "7890123456789012345678901234567890",
+            res->body);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+#endif
+
+// Sends a raw request to a server listening at HOST:PORT.
+static bool send_request(time_t read_timeout_sec, const std::string &req,
+                         std::string *resp = nullptr) {
+  auto error = Error::Success;
+
+  auto client_sock = detail::create_client_socket(
+      HOST, "", PORT, AF_UNSPEC, false, false, nullptr,
+      /*connection_timeout_sec=*/5, 0,
+      /*read_timeout_sec=*/5, 0,
+      /*write_timeout_sec=*/5, 0, std::string(), error);
+
+  if (client_sock == INVALID_SOCKET) { return false; }
+
+  auto ret = detail::process_client_socket(
+      client_sock, read_timeout_sec, 0, 0, 0, 0,
+      std::chrono::steady_clock::time_point::min(), [&](Stream &strm) {
+        if (req.size() !=
+            static_cast<size_t>(strm.write(req.data(), req.size()))) {
+          return false;
+        }
+
+        char buf[512];
+
+        detail::stream_line_reader line_reader(strm, buf, sizeof(buf));
+        while (line_reader.getline()) {
+          if (resp) { *resp += line_reader.ptr(); }
+        }
+        return true;
+      });
+
+  detail::close_socket(client_sock);
+
+  return ret;
+}
+
+TEST(ServerRequestParsingTest, TrimWhitespaceFromHeaderValues) {
+  Server svr;
+  std::string header_value;
+  svr.Get("/validate-ws-in-headers", [&](const Request &req, Response &res) {
+    header_value = req.get_header_value("foo");
+    res.set_content("ok", "text/plain");
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  // Only space and horizontal tab are whitespace. Make sure other whitespace-
+  // like characters are not treated the same - use vertical tab and escape.
+  const std::string req = "GET /validate-ws-in-headers HTTP/1.1\r\n"
+                          "foo: \t \v bar \x1B\t \r\n"
+                          "Connection: close\r\n"
+                          "\r\n";
+
+  std::string res;
+  ASSERT_TRUE(send_request(5, req, &res));
+  EXPECT_EQ(header_value, "");
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", res.substr(0, 24));
+}
+
+// Sends a raw request and verifies that there isn't a crash or exception.
+static void test_raw_request(const std::string &req,
+                             std::string *out = nullptr) {
+  Server svr;
+  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+  svr.Put("/put_hi", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+  svr.Get("/header_field_value_check",
+          [&](const Request & /*req*/, Response &res) {
+            res.set_content("ok", "text/plain");
+          });
+
+  // Server read timeout must be longer than the client read timeout for the
+  // bug to reproduce, probably to force the server to process a request
+  // without a trailing blank line.
+  const time_t client_read_timeout_sec = 1;
+  svr.set_read_timeout(std::chrono::seconds(client_read_timeout_sec + 1));
+  bool listen_thread_ok = false;
+  thread t = thread([&] { listen_thread_ok = svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    EXPECT_TRUE(listen_thread_ok);
+  });
+
+  svr.wait_until_ready();
+
+  ASSERT_TRUE(send_request(client_read_timeout_sec, req, out));
+}
+
+TEST(ServerRequestParsingTest, ReadHeadersRegexComplexity) {
+  // A certain header line causes an exception if the header property is parsed
+  // naively with a single regex. This occurs with libc++ but not libstdc++.
+  test_raw_request(
+      "GET /hi HTTP/1.1\r\n"
+      " :                                                                      "
+      "                                                                      "
+      " ");
+}
+
+TEST(ServerRequestParsingTest, ReadHeadersRegexComplexity2) {
+  // A certain header line causes an exception if the header property *name* is
+  // parsed with a regular expression starting with "(.+?):" - this is a non-
+  // greedy matcher and requires backtracking when there are a lot of ":"
+  // characters.
+  // This occurs with libc++ but not libstdc++.
+  test_raw_request(
+      "GET /hi HTTP/1.1\r\n"
+      ":-:::::::::::::::::::::::::::-::::::::::::::::::::::::@-&&&&&&&&&&&"
+      "--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&"
+      "&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-:::::"
+      "::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-::::::::::::::::::::::::"
+      ":::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::"
+      "::::::::-:::::::::::::::::@-&&&&&&&--:::::::-::::::::::::::::::::::"
+      ":::::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::"
+      "::::::::::-:::::::::::::::::@-&&&&&::::::::::::-:::::::::::::::::@-"
+      "&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::::::::::::"
+      ":@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::"
+      "::::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::@-&&"
+      "&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@"
+      "::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&"
+      "--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&"
+      "&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&"
+      "&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&"
+      "&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@"
+      "-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::"
+      "::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::::::::"
+      ":::::@-&&&&&&&&&&&::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-::::::"
+      ":::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-:::"
+      "::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-"
+      ":::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&---&&:&"
+      "&&.0------------:-:::::::::::::::::::::::::::::-:::::::::::::::::@-"
+      "&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::::::::::::"
+      ":@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::"
+      "::::@-&&&&&&&&&&&---&&:&&&.0------------O--------\rH PUTHTTP/1.1\r\n"
+      "&&&%%%");
+}
+
+TEST(ServerRequestParsingTest, ExcessiveWhitespaceInUnparsableHeaderLine) {
+  // Make sure this doesn't crash the server.
+  // In a previous version of the header line regex, the "\r" rendered the line
+  // unparsable and the regex engine repeatedly backtracked, trying to look for
+  // a new position where the leading white space ended and the field value
+  // began.
+  // The crash occurs with libc++ but not libstdc++.
+  test_raw_request("GET /hi HTTP/1.1\r\n"
+                   "a:" +
+                   std::string(2000, ' ') + '\r' + std::string(20, 'z') +
+                   "\r\n"
+                   "\r\n");
+}
+
+TEST(ServerRequestParsingTest, InvalidFirstChunkLengthInRequest) {
+  std::string out;
+
+  test_raw_request("PUT /put_hi HTTP/1.1\r\n"
+                   "Content-Type: text/plain\r\n"
+                   "Transfer-Encoding: chunked\r\n"
+                   "\r\n"
+                   "nothex\r\n",
+                   &out);
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
+}
+
+TEST(ServerRequestParsingTest, InvalidSecondChunkLengthInRequest) {
+  std::string out;
+
+  test_raw_request("PUT /put_hi HTTP/1.1\r\n"
+                   "Content-Type: text/plain\r\n"
+                   "Transfer-Encoding: chunked\r\n"
+                   "\r\n"
+                   "3\r\n"
+                   "xyz\r\n"
+                   "NaN\r\n",
+                   &out);
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
+}
+
+TEST(ServerRequestParsingTest, ChunkLengthTooHighInRequest) {
+  std::string out;
+
+  test_raw_request("PUT /put_hi HTTP/1.1\r\n"
+                   "Content-Type: text/plain\r\n"
+                   "Transfer-Encoding: chunked\r\n"
+                   "\r\n"
+                   // Length is too large for 64 bits.
+                   "1ffffffffffffffff\r\n"
+                   "xyz\r\n",
+                   &out);
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
+}
+
+TEST(ServerRequestParsingTest, InvalidHeaderTextWithExtraCR) {
+  test_raw_request("GET /hi HTTP/1.1\r\n"
+                   "Content-Type: text/plain\r\n\r");
+}
+
+TEST(ServerRequestParsingTest, InvalidSpaceInURL) {
+  std::string out;
+  test_raw_request("GET /h i HTTP/1.1\r\n\r\n", &out);
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
+}
+
+TEST(ServerRequestParsingTest, InvalidFieldValueContains_CR_LF_NUL) {
+  std::string out;
+  std::string request(
+      "GET /header_field_value_check HTTP/1.1\r\nTest: [\r\x00\n]\r\n\r\n", 55);
+  test_raw_request(request, &out);
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
+}
+
+TEST(ServerRequestParsingTest, InvalidFieldValueContains_LF) {
+  std::string out;
+  std::string request(
+      "GET /header_field_value_check HTTP/1.1\r\nTest: [\n\n\n]\r\n\r\n", 55);
+  test_raw_request(request, &out);
+  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
+}
+
+TEST(ServerRequestParsingTest, EmptyFieldValue) {
+  std::string out;
+
+  test_raw_request("GET /header_field_value_check HTTP/1.1\r\n"
+                   "Test: \r\n\r\n",
+                   &out);
+  EXPECT_EQ("HTTP/1.1 200 OK", out.substr(0, 15));
+}
+
+TEST(ServerStopTest, StopServerWithChunkedTransmission) {
+  Server svr;
+
+  svr.Get("/events", [](const Request & /*req*/, Response &res) {
+    res.set_header("Cache-Control", "no-cache");
+    res.set_chunked_content_provider(
+        "text/event-stream", [](size_t offset, DataSink &sink) {
+          std::string s = "data:";
+          s += std::to_string(offset);
+          s += "\n\n";
+          auto ret = sink.write(s.data(), s.size());
+          EXPECT_TRUE(ret);
+          std::this_thread::sleep_for(std::chrono::seconds(1));
+          return true;
+        });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  svr.wait_until_ready();
+
+  Client client(HOST, PORT);
+  const Headers headers = {{"Accept", "text/event-stream"}};
+
+  auto get_thread = std::thread([&client, &headers]() {
+    auto res = client.Get(
+        "/events", headers,
+        [](const char * /*data*/, size_t /*len*/) -> bool { return true; });
+  });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    get_thread.join();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  // Give GET time to get a few messages.
+  std::this_thread::sleep_for(std::chrono::seconds(2));
+}
+
+TEST(ServerStopTest, ClientAccessAfterServerDown) {
+  httplib::Server svr;
+  svr.Post("/hi",
+           [&](const httplib::Request & /*req*/, httplib::Response &res) {
+             res.status = StatusCode::OK_200;
+           });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+
+  auto res = cli.Post("/hi", "data", "text/plain");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+
+  svr.stop();
+  thread.join();
+  ASSERT_FALSE(svr.is_running());
+
+  res = cli.Post("/hi", "data", "text/plain");
+  ASSERT_FALSE(res);
+}
+
+TEST(ServerStopTest, ListenFailure) {
+  Server svr;
+  auto t = thread([&]() {
+    auto ret = svr.listen("????", PORT);
+    EXPECT_FALSE(ret);
+  });
+  svr.wait_until_ready();
+  svr.stop();
+  t.join();
+}
+
+TEST(ServerStopTest, Decommision) {
+  Server svr;
+
+  svr.Get("/hi", [&](const Request &, Response &res) { res.body = "hi..."; });
+
+  for (int i = 0; i < 4; i++) {
+    auto is_even = !(i % 2);
+
+    std::thread t{[&] {
+      try {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+        if (is_even) {
+          throw std::runtime_error("Some thing that happens to go wrong.");
+        }
+
+        svr.listen(HOST, PORT);
+      } catch (...) { svr.decommission(); }
+    }};
+
+    svr.wait_until_ready();
+
+    // Server is up
+    {
+      Client cli(HOST, PORT);
+      auto res = cli.Get("/hi");
+      if (is_even) {
+        EXPECT_FALSE(res);
+      } else {
+        EXPECT_TRUE(res);
+        EXPECT_EQ("hi...", res->body);
+      }
+    }
+
+    svr.stop();
+    t.join();
+
+    // Server is down...
+    {
+      Client cli(HOST, PORT);
+      auto res = cli.Get("/hi");
+      EXPECT_FALSE(res);
+    }
+  }
+}
+
+TEST(StreamingTest, NoContentLengthStreaming) {
+  Server svr;
+
+  svr.Get("/stream", [](const Request & /*req*/, Response &res) {
+    res.set_content_provider("text/plain", [](size_t offset, DataSink &sink) {
+      if (offset < 6) {
+        sink.os << (offset < 3 ? "a" : "b");
+      } else {
+        sink.done();
+      }
+      return true;
+    });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto listen_se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client client(HOST, PORT);
+
+  auto get_thread = std::thread([&client]() {
+    std::string s;
+    auto res =
+        client.Get("/stream", [&s](const char *data, size_t len) -> bool {
+          s += std::string(data, len);
+          return true;
+        });
+    EXPECT_EQ("aaabbb", s);
+  });
+  auto get_se = detail::scope_exit([&] { get_thread.join(); });
+
+  // Give GET time to get a few messages.
+  std::this_thread::sleep_for(std::chrono::milliseconds(500));
+}
+
+TEST(MountTest, Unmount) {
+  Server svr;
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  svr.set_mount_point("/mount2", "./www2");
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+
+  res = cli.Get("/mount2/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+
+  svr.set_mount_point("/", "./www");
+
+  res = cli.Get("/dir/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+
+  svr.remove_mount_point("/");
+  res = cli.Get("/dir/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+
+  svr.remove_mount_point("/mount2");
+  res = cli.Get("/mount2/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST(MountTest, Redicect) {
+  Server svr;
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.set_mount_point("/", "./www");
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  auto res = cli.Get("/dir/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+
+  res = cli.Get("/dir");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+
+  res = cli.Get("/file");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+
+  res = cli.Get("/file/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+
+  cli.set_follow_location(true);
+  res = cli.Get("/dir");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(MountTest, MultibytesPathName) {
+  Server svr;
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.set_mount_point("/", "./www");
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  auto res = cli.Get(u8"/日本語Dir/日本語File.txt");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(u8"日本語コンテンツ", res->body);
+}
+
+TEST(KeepAliveTest, ReadTimeout) {
+  Server svr;
+
+  svr.Get("/a", [&](const Request & /*req*/, Response &res) {
+    std::this_thread::sleep_for(std::chrono::seconds(2));
+    res.set_content("a", "text/plain");
+  });
+
+  svr.Get("/b", [&](const Request & /*req*/, Response &res) {
+    res.set_content("b", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+  cli.set_keep_alive(true);
+  cli.set_read_timeout(std::chrono::seconds(1));
+
+  auto resa = cli.Get("/a");
+  ASSERT_FALSE(resa);
+  EXPECT_EQ(Error::Read, resa.error());
+
+  auto resb = cli.Get("/b");
+  ASSERT_TRUE(resb);
+  EXPECT_EQ(StatusCode::OK_200, resb->status);
+  EXPECT_EQ("b", resb->body);
+}
+
+TEST(KeepAliveTest, Issue1041) {
+  Server svr;
+  svr.set_keep_alive_timeout(3);
+
+  svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.set_keep_alive(true);
+
+  auto result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  std::this_thread::sleep_for(std::chrono::seconds(5));
+
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+}
+
+TEST(KeepAliveTest, Issue1959) {
+  Server svr;
+  svr.set_keep_alive_timeout(5);
+
+  svr.Get("/a", [&](const Request & /*req*/, Response &res) {
+    res.set_content("a", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    if (!svr.is_running()) return;
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+  cli.set_keep_alive(true);
+
+  using namespace std::chrono;
+  auto start = steady_clock::now();
+
+  cli.Get("/a");
+
+  svr.stop();
+  listen_thread.join();
+
+  auto end = steady_clock::now();
+  auto elapsed = duration_cast<milliseconds>(end - start).count();
+
+  EXPECT_LT(elapsed, 5000);
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(KeepAliveTest, SSLClientReconnection) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+  svr.set_keep_alive_timeout(1);
+
+  svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT);
+  cli.enable_server_certificate_verification(false);
+  cli.set_keep_alive(true);
+
+  auto result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  std::this_thread::sleep_for(std::chrono::seconds(2));
+
+  // Recoonect
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+}
+
+TEST(KeepAliveTest, SSLClientReconnectionPost) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+  svr.set_keep_alive_timeout(1);
+  std::string content = "reconnect";
+
+  svr.Post("/hi", [](const httplib::Request &, httplib::Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT);
+  cli.enable_server_certificate_verification(false);
+  cli.set_keep_alive(true);
+
+  auto result = cli.Post(
+      "/hi", content.size(),
+      [&content](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        sink.write(content.c_str(), content.size());
+        return true;
+      },
+      "text/plain");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(200, result->status);
+
+  std::this_thread::sleep_for(std::chrono::seconds(2));
+
+  // Recoonect
+  result = cli.Post(
+      "/hi", content.size(),
+      [&content](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        sink.write(content.c_str(), content.size());
+        return true;
+      },
+      "text/plain");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(200, result->status);
+
+  result = cli.Post(
+      "/hi", content.size(),
+      [&content](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
+        sink.write(content.c_str(), content.size());
+        return true;
+      },
+      "text/plain");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(200, result->status);
+}
+#endif
+
+TEST(ClientProblemDetectionTest, ContentProvider) {
+  Server svr;
+
+  size_t content_length = 1024 * 1024;
+
+  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
+    res.set_content_provider(
+        content_length, "text/plain",
+        [&](size_t offset, size_t length, DataSink &sink) {
+          auto out_len = std::min(length, static_cast<size_t>(1024));
+          std::string out(out_len, '@');
+          sink.write(out.data(), out_len);
+          return offset < 4096;
+        },
+        [](bool success) { ASSERT_FALSE(success); });
+  });
+
+  svr.Get("/empty", [&](const Request & /*req*/, Response &res) {
+    res.set_content_provider(
+        0, "text/plain",
+        [&](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) -> bool {
+          EXPECT_TRUE(false);
+          return true;
+        },
+        [](bool success) { ASSERT_FALSE(success); });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  {
+    auto res = cli.Get("/hi", [&](const char * /*data*/,
+                                  size_t /*data_length*/) { return false; });
+    ASSERT_FALSE(res);
+  }
+
+  {
+    auto res = cli.Get("/empty", [&](const char * /*data*/,
+                                     size_t /*data_length*/) { return false; });
+    ASSERT_TRUE(res);
+  }
+}
+
+TEST(ErrorHandlerWithContentProviderTest, ErrorHandler) {
+  Server svr;
+
+  svr.set_error_handler([](Request const &, Response &res) -> void {
+    res.set_chunked_content_provider(
+        "text/plain", [](std::size_t const, DataSink &sink) -> bool {
+          sink.os << "hello";
+          sink.os << "world";
+          sink.done();
+          return true;
+        });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+  EXPECT_EQ("helloworld", res->body);
+}
+
+TEST(LongPollingTest, ClientCloseDetection) {
+  Server svr;
+
+  svr.Get("/events", [&](const Request & /*req*/, Response &res) {
+    res.set_chunked_content_provider(
+        "text/plain", [](std::size_t const, DataSink &sink) -> bool {
+          EXPECT_TRUE(sink.is_writable()); // the socket is alive
+          sink.os << "hello";
+
+          auto count = 10;
+          while (count > 0 && sink.is_writable()) {
+            this_thread::sleep_for(chrono::milliseconds(10));
+            count--;
+          }
+          EXPECT_FALSE(sink.is_writable()); // the socket is closed
+          return true;
+        });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  auto res = cli.Get("/events", [&](const char *data, size_t data_length) {
+    EXPECT_EQ("hello", string(data, data_length));
+    return false; // close the socket immediately.
+  });
+
+  ASSERT_FALSE(res);
+}
+
+TEST(GetWithParametersTest, GetWithParameters) {
+  Server svr;
+
+  svr.Get("/", [&](const Request &req, Response &) {
+    EXPECT_EQ("world", req.get_param_value("hello"));
+    EXPECT_EQ("world2", req.get_param_value("hello2"));
+    EXPECT_EQ("world3", req.get_param_value("hello3"));
+  });
+
+  svr.Get("/params", [&](const Request &req, Response &) {
+    EXPECT_EQ("world", req.get_param_value("hello"));
+    EXPECT_EQ("world2", req.get_param_value("hello2"));
+    EXPECT_EQ("world3", req.get_param_value("hello3"));
+  });
+
+  svr.Get(R"(/resources/([a-z0-9\\-]+))", [&](const Request &req, Response &) {
+    EXPECT_EQ("resource-id", req.matches[1]);
+    EXPECT_EQ("foo", req.get_param_value("param1"));
+    EXPECT_EQ("bar", req.get_param_value("param2"));
+  });
+
+  svr.Get("/users/:id", [&](const Request &req, Response &) {
+    EXPECT_EQ("user-id", req.path_params.at("id"));
+    EXPECT_EQ("foo", req.get_param_value("param1"));
+    EXPECT_EQ("bar", req.get_param_value("param2"));
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    Params params;
+    params.emplace("hello", "world");
+    params.emplace("hello2", "world2");
+    params.emplace("hello3", "world3");
+    auto res = cli.Get("/", params, Headers{});
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/params?hello=world&hello2=world2&hello3=world3");
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/resources/resource-id?param1=foo&param2=bar");
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/users/user-id?param1=foo&param2=bar");
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(GetWithParametersTest, GetWithParameters2) {
+  Server svr;
+
+  svr.Get("/", [&](const Request &req, Response &res) {
+    auto text = req.get_param_value("hello");
+    res.set_content(text, "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  Params params;
+  params.emplace("hello", "world");
+
+  std::string body;
+  auto res = cli.Get("/", params, Headers{},
+                     [&](const char *data, size_t data_length) {
+                       body.append(data, data_length);
+                       return true;
+                     });
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("world", body);
+}
+
+TEST(ClientDefaultHeadersTest, DefaultHeaders_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
+  cli.set_default_headers({make_range_header({{1, 10}})});
+  cli.set_connection_timeout(5);
+
+  {
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("bcdefghijk", res->body);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  }
+
+  {
+    auto res = cli.Get(path);
+    ASSERT_TRUE(res);
+    EXPECT_EQ("bcdefghijk", res->body);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  }
+}
+
+TEST(ServerDefaultHeadersTest, DefaultHeaders) {
+  Server svr;
+  svr.set_default_headers({{"Hello", "World"}});
+
+  svr.Get("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  auto res = cli.Get("/");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("ok", res->body);
+  EXPECT_EQ("World", res->get_header_value("Hello"));
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(KeepAliveTest, ReadTimeoutSSL) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/a", [&](const Request & /*req*/, Response &res) {
+    std::this_thread::sleep_for(std::chrono::seconds(2));
+    res.set_content("a", "text/plain");
+  });
+
+  svr.Get("/b", [&](const Request & /*req*/, Response &res) {
+    res.set_content("b", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli("localhost", PORT);
+  cli.enable_server_certificate_verification(false);
+  cli.set_keep_alive(true);
+  cli.set_read_timeout(std::chrono::seconds(1));
+
+  auto resa = cli.Get("/a");
+  ASSERT_TRUE(!resa);
+  EXPECT_EQ(Error::Read, resa.error());
+
+  auto resb = cli.Get("/b");
+  ASSERT_TRUE(resb);
+  EXPECT_EQ(StatusCode::OK_200, resb->status);
+  EXPECT_EQ("b", resb->body);
+}
+#endif
+
+class ServerTestWithAI_PASSIVE : public ::testing::Test {
+protected:
+  ServerTestWithAI_PASSIVE()
+      : cli_(HOST, PORT)
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+        ,
+        svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE)
+#endif
+  {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    cli_.enable_server_certificate_verification(false);
+#endif
+  }
+
+  virtual void SetUp() {
+    svr_.Get("/hi", [&](const Request & /*req*/, Response &res) {
+      res.set_content("Hello World!", "text/plain");
+    });
+
+    t_ = thread(
+        [&]() { ASSERT_TRUE(svr_.listen(std::string(), PORT, AI_PASSIVE)); });
+
+    svr_.wait_until_ready();
+  }
+
+  virtual void TearDown() {
+    svr_.stop();
+    t_.join();
+  }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli_;
+  SSLServer svr_;
+#else
+  Client cli_;
+  Server svr_;
+#endif
+  thread t_;
+};
+
+TEST_F(ServerTestWithAI_PASSIVE, GetMethod200) {
+  auto res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("Hello World!", res->body);
+}
+
+class ServerUpDownTest : public ::testing::Test {
+protected:
+  ServerUpDownTest() : cli_(HOST, PORT) {}
+
+  virtual void SetUp() {
+    t_ = thread([&]() {
+      svr_.bind_to_any_port(HOST);
+      std::this_thread::sleep_for(std::chrono::milliseconds(500));
+      ASSERT_TRUE(svr_.listen_after_bind());
+    });
+
+    svr_.wait_until_ready();
+  }
+
+  virtual void TearDown() {
+    svr_.stop();
+    t_.join();
+  }
+
+  Client cli_;
+  Server svr_;
+  thread t_;
+};
+
+TEST_F(ServerUpDownTest, QuickStartStop) {
+  // Should not crash, especially when run with
+  // --gtest_filter=ServerUpDownTest.QuickStartStop --gtest_repeat=1000
+}
+
+class PayloadMaxLengthTest : public ::testing::Test {
+protected:
+  PayloadMaxLengthTest()
+      : cli_(HOST, PORT)
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+        ,
+        svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE)
+#endif
+  {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    cli_.enable_server_certificate_verification(false);
+#endif
+  }
+
+  virtual void SetUp() {
+    svr_.set_payload_max_length(8);
+
+    svr_.Post("/test", [&](const Request & /*req*/, Response &res) {
+      res.set_content("test", "text/plain");
+    });
+
+    t_ = thread([&]() { ASSERT_TRUE(svr_.listen(HOST, PORT)); });
+
+    svr_.wait_until_ready();
+  }
+
+  virtual void TearDown() {
+    svr_.stop();
+    t_.join();
+  }
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli_;
+  SSLServer svr_;
+#else
+  Client cli_;
+  Server svr_;
+#endif
+  thread t_;
+};
+
+TEST_F(PayloadMaxLengthTest, ExceedLimit) {
+  auto res = cli_.Post("/test", "123456789", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PayloadTooLarge_413, res->status);
+
+  res = cli_.Post("/test", "12345678", "text/plain");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HostAndPortPropertiesTest, NoSSL) {
+  httplib::Client cli("www.google.com", 1234);
+  ASSERT_EQ("www.google.com", cli.host());
+  ASSERT_EQ(1234, cli.port());
+}
+
+TEST(HostAndPortPropertiesTest, NoSSLWithSimpleAPI) {
+  httplib::Client cli("www.google.com:1234");
+  ASSERT_EQ("www.google.com", cli.host());
+  ASSERT_EQ(1234, cli.port());
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(HostAndPortPropertiesTest, SSL) {
+  httplib::SSLClient cli("www.google.com");
+  ASSERT_EQ("www.google.com", cli.host());
+  ASSERT_EQ(443, cli.port());
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(SSLClientTest, UpdateCAStore) {
+  httplib::SSLClient httplib_client("www.google.com");
+  auto ca_store_1 = X509_STORE_new();
+  X509_STORE_load_locations(ca_store_1, "/etc/ssl/certs/ca-certificates.crt",
+                            nullptr);
+  httplib_client.set_ca_cert_store(ca_store_1);
+
+  auto ca_store_2 = X509_STORE_new();
+  X509_STORE_load_locations(ca_store_2, "/etc/ssl/certs/ca-certificates.crt",
+                            nullptr);
+  httplib_client.set_ca_cert_store(ca_store_2);
+}
+
+TEST(SSLClientTest, ServerNameIndication_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/get"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/get"};
+#endif
+
+  SSLClient cli(host, 443);
+  auto res = cli.Get(path);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(SSLClientTest, ServerCertificateVerification1_Online) {
+  Client cli("https://google.com");
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SSLClientTest, ServerCertificateVerification2_Online) {
+  SSLClient cli("google.com");
+  cli.enable_server_certificate_verification(true);
+  cli.set_ca_cert_path("hello");
+  auto res = cli.Get("/");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::SSLLoadingCerts, res.error());
+}
+
+TEST(SSLClientTest, ServerCertificateVerification3_Online) {
+  SSLClient cli("google.com");
+  cli.set_ca_cert_path(CA_CERT_FILE);
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SSLClientTest, ServerCertificateVerification4) {
+  SSLServer svr(SERVER_CERT2_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &, Response &res) {
+    res.set_content("test", "text/plain");
+    svr.stop();
+    ASSERT_TRUE(true);
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen("127.0.0.1", PORT)); });
+  auto se = detail::scope_exit([&] {
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli("127.0.0.1", PORT);
+  cli.set_ca_cert_path(SERVER_CERT2_FILE);
+  cli.enable_server_certificate_verification(true);
+  cli.set_connection_timeout(30);
+
+  auto res = cli.Get("/test");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(SSLClientTest, ServerCertificateVerification5_Online) {
+  std::string cert;
+  detail::read_file(CA_CERT_FILE, cert);
+
+  SSLClient cli("google.com");
+  cli.load_ca_cert_store(cert.data(), cert.size());
+  const auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SSLClientTest, ServerCertificateVerification6_Online) {
+  // clang-format off
+  static constexpr char cert[] =
+    "GlobalSign Root CA\n"
+    "==================\n"
+    "-----BEGIN CERTIFICATE-----\n"
+    "MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx\n"
+    "GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds\n"
+    "b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV\n"
+    "BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD\n"
+    "VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa\n"
+    "DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc\n"
+    "THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb\n"
+    "Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP\n"
+    "c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX\n"
+    "gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\n"
+    "HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF\n"
+    "AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj\n"
+    "Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG\n"
+    "j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH\n"
+    "hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC\n"
+    "X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\n"
+    "-----END CERTIFICATE-----\n";
+  // clang-format on
+
+  SSLClient cli("google.com");
+  cli.load_ca_cert_store(cert, sizeof(cert));
+  const auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SSLClientTest, WildcardHostNameMatch_Online) {
+  SSLClient cli("www.youtube.com");
+
+  cli.set_ca_cert_path(CA_CERT_FILE);
+  cli.enable_server_certificate_verification(true);
+  cli.set_follow_location(true);
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(SSLClientTest, Issue2004_Online) {
+  Client client("https://google.com");
+  client.set_follow_location(true);
+
+  auto res = client.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+
+  auto body = res->body;
+  EXPECT_EQ(body.substr(0, 15), "<!doctype html>");
+}
+
+#if 0
+TEST(SSLClientTest, SetInterfaceWithINET6) {
+  auto cli = std::make_shared<httplib::Client>("https://httpbin.org");
+  ASSERT_TRUE(cli != nullptr);
+
+  cli->set_address_family(AF_INET6);
+  cli->set_interface("en0");
+
+  auto res = cli->Get("/get");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+#endif
+
+void ClientCertPresent(
+    const std::string &client_cert_file,
+    const std::string &client_private_key_file,
+    const std::string &client_encrypted_private_key_pass = std::string()) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
+                CLIENT_CA_CERT_DIR);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &req, Response &res) {
+    res.set_content("test", "text/plain");
+
+    auto peer_cert = SSL_get_peer_certificate(req.ssl);
+    ASSERT_TRUE(peer_cert != nullptr);
+
+    auto subject_name = X509_get_subject_name(peer_cert);
+    ASSERT_TRUE(subject_name != nullptr);
+
+    std::string common_name;
+    {
+      char name[BUFSIZ];
+      auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                                name, sizeof(name));
+      common_name.assign(name, static_cast<size_t>(name_len));
+    }
+
+    EXPECT_EQ("Common Name", common_name);
+
+    X509_free(peer_cert);
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT, client_cert_file, client_private_key_file,
+                client_encrypted_private_key_pass);
+  cli.enable_server_certificate_verification(false);
+  cli.set_connection_timeout(30);
+
+  auto res = cli.Get("/test");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(SSLClientServerTest, ClientCertPresent) {
+  ClientCertPresent(CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
+}
+
+TEST(SSLClientServerTest, ClientEncryptedCertPresent) {
+  ClientCertPresent(CLIENT_ENCRYPTED_CERT_FILE,
+                    CLIENT_ENCRYPTED_PRIVATE_KEY_FILE,
+                    CLIENT_ENCRYPTED_PRIVATE_KEY_PASS);
+}
+
+#if !defined(_WIN32) || defined(OPENSSL_USE_APPLINK)
+void MemoryClientCertPresent(
+    const std::string &client_cert_file,
+    const std::string &client_private_key_file,
+    const std::string &client_encrypted_private_key_pass = std::string()) {
+  auto f = fopen(SERVER_CERT_FILE, "r+");
+  auto server_cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
+  fclose(f);
+
+  f = fopen(SERVER_PRIVATE_KEY_FILE, "r+");
+  auto server_private_key = PEM_read_PrivateKey(f, nullptr, nullptr, nullptr);
+  fclose(f);
+
+  f = fopen(CLIENT_CA_CERT_FILE, "r+");
+  auto client_cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
+  auto client_ca_cert_store = X509_STORE_new();
+  X509_STORE_add_cert(client_ca_cert_store, client_cert);
+  X509_free(client_cert);
+  fclose(f);
+
+  f = fopen(client_cert_file.c_str(), "r+");
+  client_cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
+  fclose(f);
+
+  f = fopen(client_private_key_file.c_str(), "r+");
+  auto client_private_key = PEM_read_PrivateKey(
+      f, nullptr, nullptr, (void *)client_encrypted_private_key_pass.c_str());
+  fclose(f);
+
+  SSLServer svr(server_cert, server_private_key, client_ca_cert_store);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &req, Response &res) {
+    res.set_content("test", "text/plain");
+
+    auto peer_cert = SSL_get_peer_certificate(req.ssl);
+    ASSERT_TRUE(peer_cert != nullptr);
+
+    auto subject_name = X509_get_subject_name(peer_cert);
+    ASSERT_TRUE(subject_name != nullptr);
+
+    std::string common_name;
+    {
+      char name[BUFSIZ];
+      auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                                name, sizeof(name));
+      common_name.assign(name, static_cast<size_t>(name_len));
+    }
+
+    EXPECT_EQ("Common Name", common_name);
+
+    X509_free(peer_cert);
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT, client_cert, client_private_key,
+                client_encrypted_private_key_pass);
+  cli.enable_server_certificate_verification(false);
+  cli.set_connection_timeout(30);
+
+  auto res = cli.Get("/test");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+
+  X509_free(server_cert);
+  EVP_PKEY_free(server_private_key);
+  X509_free(client_cert);
+  EVP_PKEY_free(client_private_key);
+}
+
+TEST(SSLClientServerTest, MemoryClientCertPresent) {
+  MemoryClientCertPresent(CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
+}
+
+TEST(SSLClientServerTest, MemoryClientEncryptedCertPresent) {
+  MemoryClientCertPresent(CLIENT_ENCRYPTED_CERT_FILE,
+                          CLIENT_ENCRYPTED_PRIVATE_KEY_FILE,
+                          CLIENT_ENCRYPTED_PRIVATE_KEY_PASS);
+}
+#endif
+
+TEST(SSLClientServerTest, ClientCertMissing) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
+                CLIENT_CA_CERT_DIR);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &, Response &) { ASSERT_TRUE(false); });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT);
+  auto res = cli.Get("/test");
+  cli.set_connection_timeout(30);
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::SSLServerVerification, res.error());
+}
+
+TEST(SSLClientServerTest, TrustDirOptional) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &, Response &res) {
+    res.set_content("test", "text/plain");
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
+  cli.enable_server_certificate_verification(false);
+  cli.set_connection_timeout(30);
+
+  auto res = cli.Get("/test");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(SSLClientServerTest, SSLConnectTimeout) {
+  class NoListenSSLServer : public SSLServer {
+  public:
+    NoListenSSLServer(const char *cert_path, const char *private_key_path,
+                      const char *client_ca_cert_file_path,
+                      const char *client_ca_cert_dir_path = nullptr)
+        : SSLServer(cert_path, private_key_path, client_ca_cert_file_path,
+                    client_ca_cert_dir_path),
+          stop_(false) {}
+
+    std::atomic_bool stop_;
+
+  private:
+    bool process_and_close_socket(socket_t /*sock*/) override {
+      // Don't create SSL context
+      while (!stop_.load()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+      }
+      return true;
+    }
+  };
+  NoListenSSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE,
+                        CLIENT_CA_CERT_FILE);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &, Response &res) {
+    res.set_content("test", "text/plain");
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  auto se = detail::scope_exit([&] {
+    svr.stop_ = true;
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
+  cli.enable_server_certificate_verification(false);
+  cli.set_connection_timeout(1);
+
+  auto res = cli.Get("/test");
+  ASSERT_TRUE(!res);
+  EXPECT_EQ(Error::SSLConnection, res.error());
+}
+
+TEST(SSLClientServerTest, CustomizeServerSSLCtx) {
+  auto setup_ssl_ctx_callback = [](SSL_CTX &ssl_ctx) {
+    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_COMPRESSION);
+    SSL_CTX_set_options(&ssl_ctx,
+                        SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_SSLv2);
+    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_SSLv3);
+    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_TLSv1);
+    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_TLSv1_1);
+    auto ciphers = "ECDHE-RSA-AES128-SHA256:"
+                   "ECDHE-DSS-AES128-SHA256:"
+                   "ECDHE-RSA-AES256-SHA256:"
+                   "ECDHE-DSS-AES256-SHA256:";
+    SSL_CTX_set_cipher_list(&ssl_ctx, ciphers);
+    if (SSL_CTX_use_certificate_chain_file(&ssl_ctx, SERVER_CERT_FILE) != 1 ||
+        SSL_CTX_use_PrivateKey_file(&ssl_ctx, SERVER_PRIVATE_KEY_FILE,
+                                    SSL_FILETYPE_PEM) != 1) {
+      return false;
+    }
+    SSL_CTX_load_verify_locations(&ssl_ctx, CLIENT_CA_CERT_FILE,
+                                  CLIENT_CA_CERT_DIR);
+    SSL_CTX_set_verify(
+        &ssl_ctx,
+        SSL_VERIFY_PEER |
+            SSL_VERIFY_FAIL_IF_NO_PEER_CERT, // SSL_VERIFY_CLIENT_ONCE,
+        nullptr);
+    return true;
+  };
+
+  SSLServer svr(setup_ssl_ctx_callback);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Get("/test", [&](const Request &req, Response &res) {
+    res.set_content("test", "text/plain");
+
+    auto peer_cert = SSL_get_peer_certificate(req.ssl);
+    ASSERT_TRUE(peer_cert != nullptr);
+
+    auto subject_name = X509_get_subject_name(peer_cert);
+    ASSERT_TRUE(subject_name != nullptr);
+
+    std::string common_name;
+    {
+      char name[BUFSIZ];
+      auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                                name, sizeof(name));
+      common_name.assign(name, static_cast<size_t>(name_len));
+    }
+
+    EXPECT_EQ("Common Name", common_name);
+
+    X509_free(peer_cert);
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
+  cli.enable_server_certificate_verification(false);
+  cli.set_connection_timeout(30);
+
+  auto res = cli.Get("/test");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+// Disabled due to the out-of-memory problem on GitHub Actions Workflows
+TEST(SSLClientServerTest, DISABLED_LargeDataTransfer) {
+
+  // prepare large data
+  std::random_device seed_gen;
+  std::mt19937 random(seed_gen());
+  constexpr auto large_size_byte = 2147483648UL + 1048576UL; // 2GiB + 1MiB
+  std::vector<std::uint32_t> binary(large_size_byte / sizeof(std::uint32_t));
+  std::generate(binary.begin(), binary.end(), [&random]() { return random(); });
+
+  // server
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+
+  svr.Post("/binary", [&](const Request &req, Response &res) {
+    EXPECT_EQ(large_size_byte, req.body.size());
+    EXPECT_EQ(0, std::memcmp(binary.data(), req.body.data(), large_size_byte));
+    res.set_content(req.body, "application/octet-stream");
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  // client POST
+  SSLClient cli("localhost", PORT);
+  cli.enable_server_certificate_verification(false);
+  cli.set_read_timeout(std::chrono::seconds(100));
+  cli.set_write_timeout(std::chrono::seconds(100));
+  auto res = cli.Post("/binary", reinterpret_cast<char *>(binary.data()),
+                      large_size_byte, "application/octet-stream");
+
+  // compare
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(large_size_byte, res->body.size());
+  EXPECT_EQ(0, std::memcmp(binary.data(), res->body.data(), large_size_byte));
+}
+#endif
+
+#ifdef _WIN32
+TEST(CleanupTest, WSACleanup) {
+  int ret = WSACleanup();
+  ASSERT_EQ(0, ret);
+}
+#endif
+
+#ifndef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(NoSSLSupport, SimpleInterface) {
+  ASSERT_ANY_THROW(Client cli("https://yahoo.com"));
+}
+#endif
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+TEST(InvalidScheme, SimpleInterface) {
+  ASSERT_ANY_THROW(Client cli("scheme://yahoo.com"));
+}
+#endif
+
+TEST(NoScheme, SimpleInterface) {
+  Client cli("yahoo.com:80");
+  ASSERT_TRUE(cli.is_valid());
+}
+
+TEST(SendAPI, SimpleInterface_Online) {
+  Client cli("http://yahoo.com");
+
+  Request req;
+  req.method = "GET";
+  req.path = "/";
+  auto res = cli.send(req);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SendAPI, WithParamsInRequest) {
+  Server svr;
+
+  svr.Get("/", [&](const Request &req, Response & /*res*/) {
+    EXPECT_TRUE(req.has_param("test"));
+    EXPECT_EQ("test_value", req.get_param_value("test"));
+  });
+
+  auto t = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+
+  {
+    Request req;
+    req.method = "GET";
+    req.path = "/";
+    req.params.emplace("test", "test_value");
+    auto res = cli.send(req);
+    ASSERT_TRUE(res);
+  }
+  {
+    auto res = cli.Get("/", {{"test", "test_value"}}, Headers{});
+    ASSERT_TRUE(res);
+  }
+}
+
+TEST(ClientImplMethods, GetSocketTest) {
+  httplib::Server svr;
+  svr.Get("/", [&](const httplib::Request & /*req*/, httplib::Response &res) {
+    res.status = StatusCode::OK_200;
+  });
+
+  auto thread = std::thread([&]() { svr.listen("127.0.0.1", 3333); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    httplib::Client cli("http://127.0.0.1:3333");
+    cli.set_keep_alive(true);
+
+    // Use the behavior of cpp-httplib of opening the connection
+    // only when the first request happens. If that changes,
+    // this test would be obsolete.
+
+    EXPECT_EQ(cli.socket(), INVALID_SOCKET);
+
+    // This also implicitly tests the server. But other tests would fail much
+    // earlier than this one to be considered.
+
+    auto res = cli.Get("/");
+    ASSERT_TRUE(res);
+
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    ASSERT_TRUE(cli.socket() != INVALID_SOCKET);
+  }
+}
+
+// Disabled due to out-of-memory problem on GitHub Actions
+#ifdef _WIN64
+TEST(ServerLargeContentTest, DISABLED_SendLargeContent) {
+  // allocate content size larger than 2GB in memory
+  const size_t content_size = 2LL * 1024LL * 1024LL * 1024LL + 1LL;
+  char *content = (char *)malloc(content_size);
+  ASSERT_TRUE(content);
+
+  Server svr;
+  svr.Get("/foo",
+          [=](const httplib::Request & /*req*/, httplib::Response &res) {
+            res.set_content(content, content_size, "application/octet-stream");
+          });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    if (content) free(content);
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  auto res = cli.Get("/foo");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(content_size, res->body.length());
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(YahooRedirectTest2, SimpleInterface_Online) {
+  Client cli("http://yahoo.com");
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+
+  cli.set_follow_location(true);
+  res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("https://www.yahoo.com/", res->location);
+}
+
+TEST(YahooRedirectTest3, SimpleInterface_Online) {
+  Client cli("https://yahoo.com");
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+
+  cli.set_follow_location(true);
+  res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("https://www.yahoo.com/", res->location);
+}
+
+TEST(YahooRedirectTest3, NewResultInterface_Online) {
+  Client cli("https://yahoo.com");
+
+  auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_FALSE(!res);
+  ASSERT_TRUE(res);
+  ASSERT_FALSE(res == nullptr);
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(Error::Success, res.error());
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res.value().status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, (*res).status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+
+  cli.set_follow_location(true);
+  res = cli.Get("/");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(Error::Success, res.error());
+  EXPECT_EQ(StatusCode::OK_200, res.value().status);
+  EXPECT_EQ(StatusCode::OK_200, (*res).status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("https://www.yahoo.com/", res->location);
+}
+
+#ifdef CPPHTTPLIB_BROTLI_SUPPORT
+TEST(DecodeWithChunkedEncoding, BrotliEncoding_Online) {
+  Client cli("https://cdnjs.cloudflare.com");
+  auto res =
+      cli.Get("/ajax/libs/jquery/3.5.1/jquery.js", {{"Accept-Encoding", "br"}});
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(287630U, res->body.size());
+  EXPECT_EQ("application/javascript; charset=utf-8",
+            res->get_header_value("Content-Type"));
+}
+#endif
+
+TEST(HttpsToHttpRedirectTest, SimpleInterface_Online) {
+  Client cli("https://nghttp2.org");
+  cli.set_follow_location(true);
+  auto res =
+      cli.Get("/httpbin/"
+              "redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302");
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HttpsToHttpRedirectTest2, SimpleInterface_Online) {
+  Client cli("https://nghttp2.org");
+  cli.set_follow_location(true);
+
+  Params params;
+  params.emplace("url", "http://www.google.com");
+  params.emplace("status_code", "302");
+
+  auto res = cli.Get("/httpbin/redirect-to", params, Headers{});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HttpsToHttpRedirectTest3, SimpleInterface_Online) {
+  Client cli("https://nghttp2.org");
+  cli.set_follow_location(true);
+
+  Params params;
+  params.emplace("url", "http://www.google.com");
+
+  auto res = cli.Get("/httpbin/redirect-to?status_code=302", params, Headers{});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HttpToHttpsRedirectTest, CertFile) {
+  Server svr;
+  ASSERT_TRUE(svr.is_valid());
+  svr.Get("/index", [&](const Request &, Response &res) {
+    res.set_redirect("https://127.0.0.1:1235/index");
+    svr.stop();
+  });
+
+  SSLServer ssl_svr(SERVER_CERT2_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(ssl_svr.is_valid());
+  ssl_svr.Get("/index", [&](const Request &, Response &res) {
+    res.set_content("test", "text/plain");
+    ssl_svr.stop();
+  });
+
+  thread t = thread([&]() { ASSERT_TRUE(svr.listen("127.0.0.1", PORT)); });
+  thread t2 = thread([&]() { ASSERT_TRUE(ssl_svr.listen("127.0.0.1", 1235)); });
+  auto se = detail::scope_exit([&] {
+    t2.join();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ssl_svr.wait_until_ready();
+
+  Client cli("127.0.0.1", PORT);
+  cli.set_ca_cert_path(SERVER_CERT2_FILE);
+  cli.enable_server_certificate_verification(true);
+  cli.set_follow_location(true);
+  cli.set_connection_timeout(30);
+
+  auto res = cli.Get("/index");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(MultipartFormDataTest, LargeData) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Post("/post", [&](const Request &req, Response & /*res*/,
+                        const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      MultipartFormDataItems files;
+      content_reader(
+          [&](const MultipartFormData &file) {
+            files.push_back(file);
+            return true;
+          },
+          [&](const char *data, size_t data_length) {
+            files.back().content.append(data, data_length);
+            return true;
+          });
+
+      EXPECT_TRUE(std::string(files[0].name) == "document");
+      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+      EXPECT_TRUE(files[0].filename == "2MB_data");
+      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+      EXPECT_TRUE(files[1].name == "hello");
+      EXPECT_TRUE(files[1].content == "world");
+      EXPECT_TRUE(files[1].filename == "");
+      EXPECT_TRUE(files[1].content_type == "");
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '.');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Post("/post", items);
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, DataProviderItems) {
+
+  std::random_device seed_gen;
+  std::mt19937 random(seed_gen());
+
+  std::string rand1;
+  rand1.resize(1000);
+  std::generate(rand1.begin(), rand1.end(), [&]() { return random(); });
+
+  std::string rand2;
+  rand2.resize(3000);
+  std::generate(rand2.begin(), rand2.end(), [&]() { return random(); });
+
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Post("/post-none", [&](const Request &req, Response & /*res*/,
+                             const ContentReader &content_reader) {
+    ASSERT_FALSE(req.is_multipart_form_data());
+
+    std::string body;
+    content_reader([&](const char *data, size_t data_length) {
+      body.append(data, data_length);
+      return true;
+    });
+
+    EXPECT_EQ(body, "");
+  });
+
+  svr.Post("/post-items", [&](const Request &req, Response & /*res*/,
+                              const ContentReader &content_reader) {
+    ASSERT_TRUE(req.is_multipart_form_data());
+    MultipartFormDataItems files;
+    content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+
+    ASSERT_TRUE(files.size() == 2);
+
+    EXPECT_EQ(std::string(files[0].name), "name1");
+    EXPECT_EQ(files[0].content, "Testing123");
+    EXPECT_EQ(files[0].filename, "filename1");
+    EXPECT_EQ(files[0].content_type, "application/octet-stream");
+
+    EXPECT_EQ(files[1].name, "name2");
+    EXPECT_EQ(files[1].content, "Testing456");
+    EXPECT_EQ(files[1].filename, "");
+    EXPECT_EQ(files[1].content_type, "");
+  });
+
+  svr.Post("/post-providers", [&](const Request &req, Response & /*res*/,
+                                  const ContentReader &content_reader) {
+    ASSERT_TRUE(req.is_multipart_form_data());
+    MultipartFormDataItems files;
+    content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+
+    ASSERT_TRUE(files.size() == 2);
+
+    EXPECT_EQ(files[0].name, "name3");
+    EXPECT_EQ(files[0].content, rand1);
+    EXPECT_EQ(files[0].filename, "filename3");
+    EXPECT_EQ(files[0].content_type, "");
+
+    EXPECT_EQ(files[1].name, "name4");
+    EXPECT_EQ(files[1].content, rand2);
+    EXPECT_EQ(files[1].filename, "filename4");
+    EXPECT_EQ(files[1].content_type, "");
+  });
+
+  svr.Post("/post-both", [&](const Request &req, Response & /*res*/,
+                             const ContentReader &content_reader) {
+    ASSERT_TRUE(req.is_multipart_form_data());
+    MultipartFormDataItems files;
+    content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+
+    ASSERT_TRUE(files.size() == 4);
+
+    EXPECT_EQ(std::string(files[0].name), "name1");
+    EXPECT_EQ(files[0].content, "Testing123");
+    EXPECT_EQ(files[0].filename, "filename1");
+    EXPECT_EQ(files[0].content_type, "application/octet-stream");
+
+    EXPECT_EQ(files[1].name, "name2");
+    EXPECT_EQ(files[1].content, "Testing456");
+    EXPECT_EQ(files[1].filename, "");
+    EXPECT_EQ(files[1].content_type, "");
+
+    EXPECT_EQ(files[2].name, "name3");
+    EXPECT_EQ(files[2].content, rand1);
+    EXPECT_EQ(files[2].filename, "filename3");
+    EXPECT_EQ(files[2].content_type, "");
+
+    EXPECT_EQ(files[3].name, "name4");
+    EXPECT_EQ(files[3].content, rand2);
+    EXPECT_EQ(files[3].filename, "filename4");
+    EXPECT_EQ(files[3].content_type, "");
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"name1", "Testing123", "filename1", "application/octet-stream"},
+        {"name2", "Testing456", "", ""}, // not a file
+    };
+
+    {
+      auto res = cli.Post("/post-none", {}, {}, {});
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    MultipartFormDataProviderItems providers;
+
+    {
+      auto res =
+          cli.Post("/post-items", {}, items, providers); // empty providers
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    providers.push_back({"name3",
+                         [&](size_t offset, httplib::DataSink &sink) -> bool {
+                           // test the offset is given correctly at each step
+                           if (!offset)
+                             sink.os.write(rand1.data(), 30);
+                           else if (offset == 30)
+                             sink.os.write(rand1.data() + 30, 300);
+                           else if (offset == 330)
+                             sink.os.write(rand1.data() + 330, 670);
+                           else if (offset == rand1.size())
+                             sink.done();
+                           return true;
+                         },
+                         "filename3",
+                         {}});
+
+    providers.push_back({"name4",
+                         [&](size_t offset, httplib::DataSink &sink) -> bool {
+                           // test the offset is given correctly at each step
+                           if (!offset)
+                             sink.os.write(rand2.data(), 2000);
+                           else if (offset == 2000)
+                             sink.os.write(rand2.data() + 2000, 1);
+                           else if (offset == 2001)
+                             sink.os.write(rand2.data() + 2001, 999);
+                           else if (offset == rand2.size())
+                             sink.done();
+                           return true;
+                         },
+                         "filename4",
+                         {}});
+
+    {
+      auto res = cli.Post("/post-providers", {}, {}, providers);
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    {
+      auto res = cli.Post("/post-both", {}, items, providers);
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+  }
+}
+
+TEST(MultipartFormDataTest, BadHeader) {
+  Server svr;
+  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  const std::string body =
+      "This is the preamble.  It is to be ignored, though it\r\n"
+      "is a handy place for composition agents to include an\r\n"
+      "explanatory note to non-MIME conformant readers.\r\n"
+      "\r\n"
+      "\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field1\"\r\n"
+      ": BAD...\r\n"
+      "\r\n"
+      "value1\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field2\"; "
+      "filename=\"example.txt\"\r\n"
+      "\r\n"
+      "value2\r\n"
+      "--simple boundary--\r\n"
+      "This is the epilogue.  It is also to be ignored.\r\n";
+
+  std::string content_type =
+      R"(multipart/form-data; boundary="simple boundary")";
+
+  Client cli(HOST, PORT);
+  auto res = cli.Post("/post", body, content_type.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
+}
+
+TEST(MultipartFormDataTest, WithPreamble) {
+  Server svr;
+  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  const std::string body =
+      "This is the preamble.  It is to be ignored, though it\r\n"
+      "is a handy place for composition agents to include an\r\n"
+      "explanatory note to non-MIME conformant readers.\r\n"
+      "\r\n"
+      "\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field1\"\r\n"
+      "\r\n"
+      "value1\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field2\"; "
+      "filename=\"example.txt\"\r\n"
+      "\r\n"
+      "value2\r\n"
+      "--simple boundary--\r\n"
+      "This is the epilogue.  It is also to be ignored.\r\n";
+
+  std::string content_type =
+      R"(multipart/form-data; boundary="simple boundary")";
+
+  Client cli(HOST, PORT);
+  auto res = cli.Post("/post", body, content_type.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(MultipartFormDataTest, PostCustomBoundary) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Post("/post_customboundary", [&](const Request &req, Response & /*res*/,
+                                       const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      MultipartFormDataItems files;
+      content_reader(
+          [&](const MultipartFormData &file) {
+            files.push_back(file);
+            return true;
+          },
+          [&](const char *data, size_t data_length) {
+            files.back().content.append(data, data_length);
+            return true;
+          });
+
+      EXPECT_TRUE(std::string(files[0].name) == "document");
+      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+      EXPECT_TRUE(files[0].filename == "2MB_data");
+      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+      EXPECT_TRUE(files[1].name == "hello");
+      EXPECT_TRUE(files[1].content == "world");
+      EXPECT_TRUE(files[1].filename == "");
+      EXPECT_TRUE(files[1].content_type == "");
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '.');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Post("/post_customboundary", {}, items, "abc-abc");
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, PostInvalidBoundaryChars) {
+  std::string data(1024 * 1024 * 2, '&');
+  std::stringstream buffer;
+  buffer << data;
+
+  Client cli("https://localhost:8080");
+
+  MultipartFormDataItems items{
+      {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+      {"hello", "world", "", ""},
+  };
+
+  for (const char &c : " \t\r\n") {
+    auto res =
+        cli.Post("/invalid_boundary", {}, items, string("abc123").append(1, c));
+    ASSERT_EQ(Error::UnsupportedMultipartBoundaryChars, res.error());
+    ASSERT_FALSE(res);
+  }
+}
+
+TEST(MultipartFormDataTest, PutFormData) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Put("/put", [&](const Request &req, const Response & /*res*/,
+                      const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      MultipartFormDataItems files;
+      content_reader(
+          [&](const MultipartFormData &file) {
+            files.push_back(file);
+            return true;
+          },
+          [&](const char *data, size_t data_length) {
+            files.back().content.append(data, data_length);
+            return true;
+          });
+
+      EXPECT_TRUE(std::string(files[0].name) == "document");
+      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+      EXPECT_TRUE(files[0].filename == "2MB_data");
+      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+      EXPECT_TRUE(files[1].name == "hello");
+      EXPECT_TRUE(files[1].content == "world");
+      EXPECT_TRUE(files[1].filename == "");
+      EXPECT_TRUE(files[1].content_type == "");
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '&');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Put("/put", items);
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, PutFormDataCustomBoundary) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Put("/put_customboundary",
+          [&](const Request &req, const Response & /*res*/,
+              const ContentReader &content_reader) {
+            if (req.is_multipart_form_data()) {
+              MultipartFormDataItems files;
+              content_reader(
+                  [&](const MultipartFormData &file) {
+                    files.push_back(file);
+                    return true;
+                  },
+                  [&](const char *data, size_t data_length) {
+                    files.back().content.append(data, data_length);
+                    return true;
+                  });
+
+              EXPECT_TRUE(std::string(files[0].name) == "document");
+              EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+              EXPECT_TRUE(files[0].filename == "2MB_data");
+              EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+              EXPECT_TRUE(files[1].name == "hello");
+              EXPECT_TRUE(files[1].content == "world");
+              EXPECT_TRUE(files[1].filename == "");
+              EXPECT_TRUE(files[1].content_type == "");
+            } else {
+              std::string body;
+              content_reader([&](const char *data, size_t data_length) {
+                body.append(data, data_length);
+                return true;
+              });
+            }
+          });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '&');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Put("/put_customboundary", {}, items, "abc-abc_");
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, PutInvalidBoundaryChars) {
+  std::string data(1024 * 1024 * 2, '&');
+  std::stringstream buffer;
+  buffer << data;
+
+  Client cli("https://localhost:8080");
+  cli.enable_server_certificate_verification(false);
+
+  MultipartFormDataItems items{
+      {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+      {"hello", "world", "", ""},
+  };
+
+  for (const char &c : " \t\r\n") {
+    auto res = cli.Put("/put", {}, items, string("abc123").append(1, c));
+    ASSERT_EQ(Error::UnsupportedMultipartBoundaryChars, res.error());
+    ASSERT_FALSE(res);
+  }
+}
+
+TEST(MultipartFormDataTest, AlternateFilename) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &res) {
+    ASSERT_EQ(3u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("file1", it->second.name);
+    ASSERT_EQ("A.txt", it->second.filename);
+    ASSERT_EQ("text/plain", it->second.content_type);
+    ASSERT_EQ("Content of a.txt.\r\n", it->second.content);
+
+    ++it;
+    ASSERT_EQ("file2", it->second.name);
+    ASSERT_EQ("a.html", it->second.filename);
+    ASSERT_EQ("text/html", it->second.content_type);
+    ASSERT_EQ("<!DOCTYPE html><title>Content of a.html.</title>\r\n",
+              it->second.content);
+
+    ++it;
+    ASSERT_EQ("text", it->second.name);
+    ASSERT_EQ("", it->second.filename);
+    ASSERT_EQ("", it->second.content_type);
+    ASSERT_EQ("text default", it->second.content);
+
+    res.set_content("ok", "text/plain");
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 399\r\n"
+             "\r\n"
+             "----------\r\n"
+             "Content-Disposition: form-data; name=\"text\"\r\n"
+             "\r\n"
+             "text default\r\n"
+             "----------\r\n"
+             "Content-Disposition: form-data; filename*=\"UTF-8''%41.txt\"; "
+             "filename=\"a.txt\"; name=\"file1\"\r\n"
+             "Content-Type: text/plain\r\n"
+             "\r\n"
+             "Content of a.txt.\r\n"
+             "\r\n"
+             "----------\r\n"
+             "Content-Disposition: form-data;  name=\"file2\" ;filename = "
+             "\"a.html\"\r\n"
+             "Content-Type: text/html\r\n"
+             "\r\n"
+             "<!DOCTYPE html><title>Content of a.html.</title>\r\n"
+             "\r\n"
+             "------------\r\n";
+
+  ASSERT_TRUE(send_request(1, req));
+}
+
+TEST(MultipartFormDataTest, CloseDelimiterWithoutCRLF) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &) {
+    ASSERT_EQ(2u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("text1", it->second.name);
+    ASSERT_EQ("text1", it->second.content);
+
+    ++it;
+    ASSERT_EQ("text2", it->second.name);
+    ASSERT_EQ("text2", it->second.content);
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 146\r\n"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text1\"\r\n"
+             "\r\n"
+             "text1"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text2\"\r\n"
+             "\r\n"
+             "text2"
+             "\r\n------------";
+
+  std::string response;
+  ASSERT_TRUE(send_request(1, req, &response));
+  ASSERT_EQ("200", response.substr(9, 3));
+}
+
+TEST(MultipartFormDataTest, ContentLength) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &) {
+    ASSERT_EQ(2u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("text1", it->second.name);
+    ASSERT_EQ("text1", it->second.content);
+
+    ++it;
+    ASSERT_EQ("text2", it->second.name);
+    ASSERT_EQ("text2", it->second.content);
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 167\r\n"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text1\"\r\n"
+             "Content-Length: 5\r\n"
+             "\r\n"
+             "text1"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text2\"\r\n"
+             "\r\n"
+             "text2"
+             "\r\n------------\r\n";
+
+  std::string response;
+  ASSERT_TRUE(send_request(1, req, &response));
+  ASSERT_EQ("200", response.substr(9, 3));
+}
+#endif
+
+TEST(TaskQueueTest, IncreaseAtomicInteger) {
+  static constexpr unsigned int number_of_tasks{1000000};
+  std::atomic_uint count{0};
+  std::unique_ptr<TaskQueue> task_queue{
+      new ThreadPool{CPPHTTPLIB_THREAD_POOL_COUNT}};
+
+  for (unsigned int i = 0; i < number_of_tasks; ++i) {
+    auto queued = task_queue->enqueue(
+        [&count] { count.fetch_add(1, std::memory_order_relaxed); });
+    EXPECT_TRUE(queued);
+  }
+
+  EXPECT_NO_THROW(task_queue->shutdown());
+  EXPECT_EQ(number_of_tasks, count.load());
+}
+
+TEST(TaskQueueTest, IncreaseAtomicIntegerWithQueueLimit) {
+  static constexpr unsigned int number_of_tasks{1000000};
+  static constexpr unsigned int qlimit{2};
+  unsigned int queued_count{0};
+  std::atomic_uint count{0};
+  std::unique_ptr<TaskQueue> task_queue{
+      new ThreadPool{/*num_threads=*/1, qlimit}};
+
+  for (unsigned int i = 0; i < number_of_tasks; ++i) {
+    if (task_queue->enqueue(
+            [&count] { count.fetch_add(1, std::memory_order_relaxed); })) {
+      queued_count++;
+    }
+  }
+
+  EXPECT_NO_THROW(task_queue->shutdown());
+  EXPECT_EQ(queued_count, count.load());
+  EXPECT_TRUE(queued_count <= number_of_tasks);
+  EXPECT_TRUE(queued_count >= qlimit);
+}
+
+TEST(TaskQueueTest, MaxQueuedRequests) {
+  static constexpr unsigned int qlimit{3};
+  std::unique_ptr<TaskQueue> task_queue{new ThreadPool{1, qlimit}};
+  std::condition_variable sem_cv;
+  std::mutex sem_mtx;
+  int credits = 0;
+  bool queued;
+
+  /* Fill up the queue with tasks that will block until we give them credits to
+   * complete. */
+  for (unsigned int n = 0; n <= qlimit;) {
+    queued = task_queue->enqueue([&sem_mtx, &sem_cv, &credits] {
+      std::unique_lock<std::mutex> lock(sem_mtx);
+      while (credits <= 0) {
+        sem_cv.wait(lock);
+      }
+      /* Consume the credit and signal the test code if they are all gone. */
+      if (--credits == 0) { sem_cv.notify_one(); }
+    });
+
+    if (n < qlimit) {
+      /* The first qlimit enqueues must succeed. */
+      EXPECT_TRUE(queued);
+    } else {
+      /* The last one will succeed only when the worker thread
+       * starts and dequeues the first blocking task. Although
+       * not necessary for the correctness of this test, we sleep for
+       * a short while to avoid busy waiting. */
+      std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
+    if (queued) { n++; }
+  }
+
+  /* Further enqueues must fail since the queue is full. */
+  for (auto i = 0; i < 4; i++) {
+    queued = task_queue->enqueue([] {});
+    EXPECT_FALSE(queued);
+  }
+
+  /* Give the credits to allow the previous tasks to complete. */
+  {
+    std::unique_lock<std::mutex> lock(sem_mtx);
+    credits += qlimit + 1;
+  }
+  sem_cv.notify_all();
+
+  /* Wait for all the credits to be consumed. */
+  {
+    std::unique_lock<std::mutex> lock(sem_mtx);
+    while (credits > 0) {
+      sem_cv.wait(lock);
+    }
+  }
+
+  /* Check that we are able again to enqueue at least qlimit tasks. */
+  for (unsigned int i = 0; i < qlimit; i++) {
+    queued = task_queue->enqueue([] {});
+    EXPECT_TRUE(queued);
+  }
+
+  EXPECT_NO_THROW(task_queue->shutdown());
+}
+
+TEST(RedirectTest, RedirectToUrlWithQueryParameters) {
+  Server svr;
+
+  svr.Get("/", [](const Request & /*req*/, Response &res) {
+    res.set_redirect(R"(/hello?key=val%26key2%3Dval2)");
+  });
+
+  svr.Get("/hello", [](const Request &req, Response &res) {
+    res.set_content(req.get_param_value("key"), "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+    cli.set_follow_location(true);
+
+    auto res = cli.Get("/");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("val&key2=val2", res->body);
+  }
+}
+
+TEST(VulnerabilityTest, CRLFInjection) {
+  Server svr;
+
+  svr.Post("/test1", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 1", "text/plain");
+  });
+
+  svr.Delete("/test2", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 2", "text/plain");
+  });
+
+  svr.Put("/test3", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 3", "text/plain");
+  });
+
+  svr.Patch("/test4", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 4", "text/plain");
+  });
+
+  svr.set_logger([](const Request &req, const Response & /*res*/) {
+    for (const auto &x : req.headers) {
+      auto key = x.first;
+      EXPECT_STRNE("evil", key.c_str());
+    }
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    cli.Post("/test1", "A=B",
+             "application/x-www-form-urlencoded\r\nevil: hello1");
+    cli.Delete("/test2", "A=B", "text/plain\r\nevil: hello2");
+    cli.Put("/test3", "text", "text/plain\r\nevil: hello3");
+    cli.Patch("/test4", "content", "text/plain\r\nevil: hello4");
+  }
+}
+
+TEST(PathParamsTest, StaticMatch) {
+  const auto pattern = "/users/all";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/all";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, StaticMismatch) {
+  const auto pattern = "/users/all";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/1";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, SingleParamInTheMiddle) {
+  const auto pattern = "/users/:id/subscriptions";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/subscriptions";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {{"id", "42"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SingleParamInTheEnd) {
+  const auto pattern = "/users/:id";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/24";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {{"id", "24"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SingleParamInTheEndTrailingSlash) {
+  const auto pattern = "/users/:id/";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/";
+  ASSERT_TRUE(matcher.match(request));
+  std::unordered_map<std::string, std::string> expected_params = {{"id", "42"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, EmptyParam) {
+  const auto pattern = "/users/:id/";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users//";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {{"id", ""}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, FragmentMismatch) {
+  const auto pattern = "/users/:id/";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/admins/24/";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, ExtraFragments) {
+  const auto pattern = "/users/:id";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/subscriptions";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, MissingTrailingParam) {
+  const auto pattern = "/users/:id";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, MissingParamInTheMiddle) {
+  const auto pattern = "/users/:id/subscriptions";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/subscriptions";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, MultipleParams) {
+  const auto pattern = "/users/:userid/subscriptions/:subid";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/subscriptions/2";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {
+      {"userid", "42"}, {"subid", "2"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SequenceOfParams) {
+  const auto pattern = "/values/:x/:y/:z";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/values/1/2/3";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {
+      {"x", "1"}, {"y", "2"}, {"z", "3"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SemicolonInTheMiddleIsNotAParam) {
+  const auto pattern = "/prefix:suffix";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/prefix:suffix";
+  ASSERT_TRUE(matcher.match(request));
+
+  const std::unordered_map<std::string, std::string> expected_params = {};
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(UniversalClientImplTest, Ipv6LiteralAddress) {
+  // If ipv6 regex working, regex match codepath is taken.
+  // else port will default to 80 in Client impl
+  int clientImplMagicPort = 80;
+  int port = 4321;
+  // above ports must be different to avoid false negative
+  EXPECT_NE(clientImplMagicPort, port);
+
+  std::string ipV6TestURL = "http://[ff06::c3]";
+
+  Client cli(ipV6TestURL + ":" + std::to_string(port), CLIENT_CERT_FILE,
+             CLIENT_PRIVATE_KEY_FILE);
+  EXPECT_EQ(cli.port(), port);
+}
+
+TEST(FileSystemTest, FileAndDirExistenceCheck) {
+  auto file_path = "./www/dir/index.html";
+  auto dir_path = "./www/dir";
+
+  detail::FileStat stat_file(file_path);
+  EXPECT_TRUE(stat_file.is_file());
+  EXPECT_FALSE(stat_file.is_dir());
+
+  detail::FileStat stat_dir(dir_path);
+  EXPECT_FALSE(stat_dir.is_file());
+  EXPECT_TRUE(stat_dir.is_dir());
+}
+
+TEST(DirtyDataRequestTest, HeadFieldValueContains_CR_LF_NUL) {
+  Server svr;
+
+  svr.Get("/test", [&](const Request & /*req*/, Response &res) {
+    EXPECT_EQ(res.status, 400);
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  cli.Get("/test", {{"Test", "_\n\r_\n\r_"}});
+}
+
+TEST(InvalidHeaderCharsTest, is_field_name) {
+  EXPECT_TRUE(detail::fields::is_field_name("exampleToken"));
+  EXPECT_TRUE(detail::fields::is_field_name("token123"));
+  EXPECT_TRUE(detail::fields::is_field_name("!#$%&'*+-.^_`|~"));
+
+  EXPECT_FALSE(detail::fields::is_field_name("example token"));
+  EXPECT_FALSE(detail::fields::is_field_name(" example_token"));
+  EXPECT_FALSE(detail::fields::is_field_name("example_token "));
+  EXPECT_FALSE(detail::fields::is_field_name("token@123"));
+  EXPECT_FALSE(detail::fields::is_field_name(""));
+  EXPECT_FALSE(detail::fields::is_field_name("example\rtoken"));
+  EXPECT_FALSE(detail::fields::is_field_name("example\ntoken"));
+  EXPECT_FALSE(detail::fields::is_field_name(std::string("\0", 1)));
+  EXPECT_FALSE(detail::fields::is_field_name("example\ttoken"));
+}
+
+TEST(InvalidHeaderCharsTest, is_field_value) {
+  EXPECT_TRUE(detail::fields::is_field_value("exampleToken"));
+  EXPECT_TRUE(detail::fields::is_field_value("token123"));
+  EXPECT_TRUE(detail::fields::is_field_value("!#$%&'*+-.^_`|~"));
+
+  EXPECT_TRUE(detail::fields::is_field_value("example token"));
+  EXPECT_FALSE(detail::fields::is_field_value(" example_token"));
+  EXPECT_FALSE(detail::fields::is_field_value("example_token "));
+  EXPECT_TRUE(detail::fields::is_field_value("token@123"));
+  EXPECT_TRUE(detail::fields::is_field_value(""));
+  EXPECT_FALSE(detail::fields::is_field_value("example\rtoken"));
+  EXPECT_FALSE(detail::fields::is_field_value("example\ntoken"));
+  EXPECT_FALSE(detail::fields::is_field_value(std::string("\0", 1)));
+  EXPECT_TRUE(detail::fields::is_field_value("example\ttoken"));
+
+  EXPECT_TRUE(detail::fields::is_field_value("0"));
+}
+
+TEST(InvalidHeaderCharsTest, OnServer) {
+  Server svr;
+
+  svr.Get("/test_name", [&](const Request &req, Response &res) {
+    std::string header = "Not Set";
+    if (req.has_param("header")) { header = req.get_param_value("header"); }
+
+    res.set_header(header, "value");
+    res.set_content("Page Content Page Content", "text/plain");
+  });
+
+  svr.Get("/test_value", [&](const Request &req, Response &res) {
+    std::string header = "Not Set";
+    if (req.has_param("header")) { header = req.get_param_value("header"); }
+
+    res.set_header("X-Test", header);
+    res.set_content("Page Content Page Content", "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  {
+    auto res = cli.Get(
+        R"(/test_name?header=Value%00%0d%0aHEADER_KEY%3aHEADER_VALUE%0d%0a%0d%0aBODY_BODY_BODY)");
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ("Page Content Page Content", res->body);
+    EXPECT_FALSE(res->has_header("HEADER_KEY"));
+  }
+  {
+    auto res = cli.Get(
+        R"(/test_value?header=Value%00%0d%0aHEADER_KEY%3aHEADER_VALUE%0d%0a%0d%0aBODY_BODY_BODY)");
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ("Page Content Page Content", res->body);
+    EXPECT_FALSE(res->has_header("HEADER_KEY"));
+  }
+}
+
+TEST(InvalidHeaderValueTest, InvalidContentLength) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &, Response &) { handled = true; });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_FALSE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Length: x\r\n"
+             "\r\n";
+
+  std::string response;
+  ASSERT_TRUE(send_request(1, req, &response));
+  ASSERT_EQ("HTTP/1.1 400 Bad Request",
+            response.substr(0, response.find("\r\n")));
+}
+
+#ifndef _WIN32
+TEST(Expect100ContinueTest, ServerClosesConnection) {
+  static constexpr char reject[] = "Unauthorized";
+  static constexpr char accept[] = "Upload accepted";
+  constexpr size_t total_size = 10 * 1024 * 1024 * 1024ULL;
+
+  Server svr;
+
+  svr.set_expect_100_continue_handler(
+      [](const Request & /*req*/, Response &res) {
+        res.status = StatusCode::Unauthorized_401;
+        res.set_content(reject, "text/plain");
+        return res.status;
+      });
+  svr.Post("/", [&](const Request & /*req*/, Response &res) {
+    res.set_content(accept, "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    const auto curl = std::unique_ptr<CURL, decltype(&curl_easy_cleanup)>{
+        curl_easy_init(), &curl_easy_cleanup};
+    ASSERT_NE(curl, nullptr);
+
+    curl_easy_setopt(curl.get(), CURLOPT_URL, HOST);
+    curl_easy_setopt(curl.get(), CURLOPT_PORT, PORT);
+    curl_easy_setopt(curl.get(), CURLOPT_POST, 1L);
+    auto list = std::unique_ptr<curl_slist, decltype(&curl_slist_free_all)>{
+        curl_slist_append(nullptr, "Content-Type: application/octet-stream"),
+        &curl_slist_free_all};
+    ASSERT_NE(list, nullptr);
+    curl_easy_setopt(curl.get(), CURLOPT_HTTPHEADER, list.get());
+
+    struct read_data {
+      size_t read_size;
+      size_t total_size;
+    } data = {0, total_size};
+    using read_callback_t =
+        size_t (*)(char *ptr, size_t size, size_t nmemb, void *userdata);
+    read_callback_t read_callback = [](char *ptr, size_t size, size_t nmemb,
+                                       void *userdata) -> size_t {
+      read_data *data = (read_data *)userdata;
+
+      if (!userdata || data->read_size >= data->total_size) { return 0; }
+
+      std::fill_n(ptr, size * nmemb, 'A');
+      data->read_size += size * nmemb;
+      return size * nmemb;
+    };
+    curl_easy_setopt(curl.get(), CURLOPT_READDATA, data);
+    curl_easy_setopt(curl.get(), CURLOPT_READFUNCTION, read_callback);
+
+    std::vector<char> buffer;
+    curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, &buffer);
+    using write_callback_t =
+        size_t (*)(char *ptr, size_t size, size_t nmemb, void *userdata);
+    write_callback_t write_callback = [](char *ptr, size_t size, size_t nmemb,
+                                         void *userdata) -> size_t {
+      std::vector<char> *buffer = (std::vector<char> *)userdata;
+      buffer->reserve(buffer->size() + size * nmemb + 1);
+      buffer->insert(buffer->end(), (char *)ptr, (char *)ptr + size * nmemb);
+      return size * nmemb;
+    };
+    curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, write_callback);
+
+    {
+      const auto res = curl_easy_perform(curl.get());
+      ASSERT_EQ(res, CURLE_OK);
+    }
+
+    {
+      auto response_code = long{};
+      const auto res =
+          curl_easy_getinfo(curl.get(), CURLINFO_RESPONSE_CODE, &response_code);
+      ASSERT_EQ(res, CURLE_OK);
+      ASSERT_EQ(response_code, StatusCode::Unauthorized_401);
+    }
+
+    {
+      auto dl = curl_off_t{};
+      const auto res =
+          curl_easy_getinfo(curl.get(), CURLINFO_SIZE_DOWNLOAD_T, &dl);
+      ASSERT_EQ(res, CURLE_OK);
+      ASSERT_EQ(dl, (curl_off_t)sizeof reject - 1);
+    }
+
+    {
+      buffer.push_back('\0');
+      ASSERT_STRCASEEQ(buffer.data(), reject);
+    }
+  }
+}
+#endif
+
+TEST(MaxTimeoutTest, ContentStream) {
+  Server svr;
+
+  svr.Get("/stream", [&](const Request &, Response &res) {
+    auto data = new std::string("01234567890123456789");
+
+    res.set_content_provider(
+        data->size(), "text/plain",
+        [&, data](size_t offset, size_t length, DataSink &sink) {
+          const size_t DATA_CHUNK_SIZE = 4;
+          const auto &d = *data;
+          std::this_thread::sleep_for(std::chrono::seconds(1));
+          sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
+          return true;
+        },
+        [data](bool success) {
+          EXPECT_FALSE(success);
+          delete data;
+        });
+  });
+
+  svr.Get("/stream_without_length", [&](const Request &, Response &res) {
+    auto i = new size_t(0);
+
+    res.set_content_provider(
+        "text/plain",
+        [i](size_t, DataSink &sink) {
+          if (*i < 5) {
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+            sink.write("abcd", 4);
+            (*i)++;
+          } else {
+            sink.done();
+          }
+          return true;
+        },
+        [i](bool success) {
+          EXPECT_FALSE(success);
+          delete i;
+        });
+  });
+
+  svr.Get("/chunked", [&](const Request &, Response &res) {
+    auto i = new size_t(0);
+
+    res.set_chunked_content_provider(
+        "text/plain",
+        [i](size_t, DataSink &sink) {
+          if (*i < 5) {
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+            sink.os << "abcd";
+            (*i)++;
+          } else {
+            sink.done();
+          }
+          return true;
+        },
+        [i](bool success) {
+          EXPECT_FALSE(success);
+          delete i;
+        });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  const time_t timeout = 2000;
+  const time_t threshold = 200;
+
+  Client cli("localhost", PORT);
+  cli.set_max_timeout(std::chrono::milliseconds(timeout));
+
+
+  {
+    auto start = std::chrono::steady_clock::now();
+
+    auto res = cli.Get("/stream");
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::steady_clock::now() - start)
+                       .count();
+
+    ASSERT_FALSE(res);
+    EXPECT_EQ(Error::Read, res.error());
+    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
+  }
+
+  {
+    auto start = std::chrono::steady_clock::now();
+
+    auto res = cli.Get("/stream_without_length");
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::steady_clock::now() - start)
+                       .count();
+
+    ASSERT_FALSE(res);
+    EXPECT_EQ(Error::Read, res.error());
+    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
+  }
+
+  {
+    auto start = std::chrono::steady_clock::now();
+
+    auto res = cli.Get("/chunked", [&](const char *data, size_t data_length) {
+      EXPECT_EQ("abcd", string(data, data_length));
+      return true;
+    });
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::steady_clock::now() - start)
+                       .count();
+
+    ASSERT_FALSE(res);
+    EXPECT_EQ(Error::Read, res.error());
+    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
+  }
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(MaxTimeoutTest, ContentStreamSSL) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Get("/stream", [&](const Request &, Response &res) {
+    auto data = new std::string("01234567890123456789");
+
+    res.set_content_provider(
+        data->size(), "text/plain",
+        [&, data](size_t offset, size_t length, DataSink &sink) {
+          const size_t DATA_CHUNK_SIZE = 4;
+          const auto &d = *data;
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+          sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
+          return true;
+        },
+        [data](bool success) {
+          EXPECT_FALSE(success);
+          delete data;
+        });
+  });
+
+  svr.Get("/stream_without_length", [&](const Request &, Response &res) {
+    auto i = new size_t(0);
+
+    res.set_content_provider(
+        "text/plain",
+        [i](size_t, DataSink &sink) {
+          if (*i < 5) {
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+            sink.write("abcd", 4);
+            (*i)++;
+          } else {
+            sink.done();
+          }
+          return true;
+        },
+        [i](bool success) {
+          EXPECT_FALSE(success);
+          delete i;
+        });
+  });
+
+  svr.Get("/chunked", [&](const Request &, Response &res) {
+    auto i = new size_t(0);
+
+    res.set_chunked_content_provider(
+        "text/plain",
+        [i](size_t, DataSink &sink) {
+          if (*i < 5) {
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+            sink.os << "abcd";
+            (*i)++;
+          } else {
+            sink.done();
+          }
+          return true;
+        },
+        [i](bool success) {
+          EXPECT_FALSE(success);
+          delete i;
+        });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  const time_t timeout = 2000;
+  const time_t threshold = 1000; // SSL_shutdown is slow...
+
+  SSLClient cli("localhost", PORT);
+  cli.enable_server_certificate_verification(false);
+  cli.set_max_timeout(std::chrono::milliseconds(timeout));
+
+  {
+    auto start = std::chrono::steady_clock::now();
+
+    auto res = cli.Get("/stream");
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::steady_clock::now() - start)
+                       .count();
+
+    ASSERT_FALSE(res);
+    EXPECT_EQ(Error::Read, res.error());
+    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
+  }
+
+  {
+    auto start = std::chrono::steady_clock::now();
+
+    auto res = cli.Get("/stream_without_length");
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::steady_clock::now() - start)
+                       .count();
+
+    ASSERT_FALSE(res);
+    EXPECT_EQ(Error::Read, res.error());
+    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
+  }
+
+  {
+    auto start = std::chrono::steady_clock::now();
+
+    auto res = cli.Get("/chunked", [&](const char *data, size_t data_length) {
+      EXPECT_EQ("abcd", string(data, data_length));
+      return true;
+    });
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::steady_clock::now() - start)
+                       .count();
+
+    ASSERT_FALSE(res);
+    EXPECT_EQ(Error::Read, res.error());
+    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
+  }
+}
+#endif
diff --git a/code/cpp-httplib-0.19.0/test/test.conf b/code/cpp-httplib-0.19.0/test/test.conf
new file mode 100644
index 00000000..1cf7d639
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/test.conf
@@ -0,0 +1,21 @@
+[req]
+default_bits           = 2048
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+output_password        = mypass
+
+[req_distinguished_name]
+C                      = US
+ST                     = Test State or Province
+L                      = Test Locality
+O                      = Organization Name
+OU                     = Organizational Unit Name
+CN                     = Common Name
+emailAddress           = test@email.address
+
+[req_attributes]
+challengePassword              = 1234
+
+[SAN]
+subjectAltName=IP:127.0.0.1
diff --git a/code/cpp-httplib-0.19.0/test/test.rootCA.conf b/code/cpp-httplib-0.19.0/test/test.rootCA.conf
new file mode 100644
index 00000000..9d7037dd
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/test.rootCA.conf
@@ -0,0 +1,18 @@
+[req]
+default_bits           = 2048
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+output_password        = mypass
+
+[req_distinguished_name]
+C                      = US
+ST                     = Test State or Province
+L                      = Test Locality
+O                      = Organization Name
+OU                     = Organizational Unit Name
+CN                     = Root CA Name
+emailAddress           = test@email.address
+
+[req_attributes]
+challengePassword              = 1234
diff --git a/code/cpp-httplib-0.19.0/test/test.sln b/code/cpp-httplib-0.19.0/test/test.sln
new file mode 100644
index 00000000..f7b3ae3b
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/test.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.20617.1 PREVIEW
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcxproj", "{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|Win32.Build.0 = Debug|Win32
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|x64.ActiveCfg = Debug|x64
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|x64.Build.0 = Debug|x64
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|Win32.ActiveCfg = Release|Win32
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|Win32.Build.0 = Release|Win32
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|x64.ActiveCfg = Release|x64
+		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/cpp-httplib-0.19.0/test/test.vcxproj b/code/cpp-httplib-0.19.0/test/test.vcxproj
new file mode 100644
index 00000000..c4dca390
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/test.vcxproj
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>test</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>
+      </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>
+      </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>
+      </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>
+      </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="gtest\gtest-all.cc" />
+    <ClCompile Include="gtest\gtest_main.cc" />
+    <ClCompile Include="test.cc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/test_proxy.cc b/code/cpp-httplib-0.19.0/test/test_proxy.cc
new file mode 100644
index 00000000..88a8ba96
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/test_proxy.cc
@@ -0,0 +1,288 @@
+#include <future>
+#include <gtest/gtest.h>
+#include <httplib.h>
+
+using namespace std;
+using namespace httplib;
+
+template <typename T>
+void ProxyTest(T& cli, bool basic) {
+  cli.set_proxy("localhost", basic ? 3128 : 3129);
+  auto res = cli.Get("/httpbin/get");
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(StatusCode::ProxyAuthenticationRequired_407, res->status);
+}
+
+TEST(ProxyTest, NoSSLBasic) {
+  Client cli("nghttp2.org");
+  ProxyTest(cli, true);
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(ProxyTest, SSLBasic) {
+  SSLClient cli("nghttp2.org");
+  ProxyTest(cli, true);
+}
+
+TEST(ProxyTest, NoSSLDigest) {
+  Client cli("nghttp2.org");
+  ProxyTest(cli, false);
+}
+
+TEST(ProxyTest, SSLDigest) {
+  SSLClient cli("nghttp2.org");
+  ProxyTest(cli, false);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+template <typename T>
+void RedirectProxyText(T& cli, const char *path, bool basic) {
+  cli.set_proxy("localhost", basic ? 3128 : 3129);
+  if (basic) {
+    cli.set_proxy_basic_auth("hello", "world");
+  } else {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    cli.set_proxy_digest_auth("hello", "world");
+#endif
+  }
+  cli.set_follow_location(true);
+
+  auto res = cli.Get(path);
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(RedirectTest, HTTPBinNoSSLBasic) {
+  Client cli("nghttp2.org");
+  RedirectProxyText(cli, "/httpbin/redirect/2", true);
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(RedirectTest, HTTPBinNoSSLDigest) {
+  Client cli("nghttp2.org");
+  RedirectProxyText(cli, "/httpbin/redirect/2", false);
+}
+
+TEST(RedirectTest, HTTPBinSSLBasic) {
+  SSLClient cli("nghttp2.org");
+  RedirectProxyText(cli, "/httpbin/redirect/2", true);
+}
+
+TEST(RedirectTest, HTTPBinSSLDigest) {
+  SSLClient cli("nghttp2.org");
+  RedirectProxyText(cli, "/httpbin/redirect/2", false);
+}
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(RedirectTest, YouTubeNoSSLBasic) {
+  Client cli("youtube.com");
+  RedirectProxyText(cli, "/", true);
+}
+
+TEST(RedirectTest, DISABLED_YouTubeNoSSLDigest) {
+  Client cli("youtube.com");
+  RedirectProxyText(cli, "/", false);
+}
+
+TEST(RedirectTest, YouTubeSSLBasic) {
+  SSLClient cli("youtube.com");
+  RedirectProxyText(cli, "/", true);
+}
+
+TEST(RedirectTest, YouTubeSSLDigest) {
+  SSLClient cli("youtube.com");
+  RedirectProxyText(cli, "/", false);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+template <typename T>
+void BaseAuthTestFromHTTPWatch(T& cli) {
+  cli.set_proxy("localhost", 3128);
+  cli.set_proxy_basic_auth("hello", "world");
+
+  {
+    auto res = cli.Get("/basic-auth/hello/world");
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+
+  {
+    auto res =
+        cli.Get("/basic-auth/hello/world",
+                {make_basic_authentication_header("hello", "world")});
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    cli.set_basic_auth("hello", "world");
+    auto res = cli.Get("/basic-auth/hello/world");
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    cli.set_basic_auth("hello", "bad");
+    auto res = cli.Get("/basic-auth/hello/world");
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+
+  {
+    cli.set_basic_auth("bad", "world");
+    auto res = cli.Get("/basic-auth/hello/world");
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+}
+
+TEST(BaseAuthTest, NoSSL) {
+  Client cli("httpbin.org");
+  BaseAuthTestFromHTTPWatch(cli);
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(BaseAuthTest, SSL) {
+  SSLClient cli("httpbin.org");
+  BaseAuthTestFromHTTPWatch(cli);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+template <typename T>
+void DigestAuthTestFromHTTPWatch(T& cli) {
+  cli.set_proxy("localhost", 3129);
+  cli.set_proxy_digest_auth("hello", "world");
+
+  {
+    auto res = cli.Get("/digest-auth/auth/hello/world");
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+  }
+
+  {
+    std::vector<std::string> paths = {
+        "/digest-auth/auth/hello/world/MD5",
+        "/digest-auth/auth/hello/world/SHA-256",
+        "/digest-auth/auth/hello/world/SHA-512",
+        "/digest-auth/auth-int/hello/world/MD5",
+    };
+
+    cli.set_digest_auth("hello", "world");
+    for (auto path : paths) {
+      auto res = cli.Get(path.c_str());
+      ASSERT_TRUE(res != nullptr);
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    cli.set_digest_auth("hello", "bad");
+    for (auto path : paths) {
+      auto res = cli.Get(path.c_str());
+      ASSERT_TRUE(res != nullptr);
+      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    }
+
+    // NOTE: Until httpbin.org fixes issue #46, the following test is commented
+    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
+    // cli.set_digest_auth("bad", "world");
+    // for (auto path : paths) {
+    //   auto res = cli.Get(path.c_str());
+    //   ASSERT_TRUE(res != nullptr);
+    //   EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    // }
+  }
+}
+
+TEST(DigestAuthTest, SSL) {
+  SSLClient cli("httpbin.org");
+  DigestAuthTestFromHTTPWatch(cli);
+}
+
+TEST(DigestAuthTest, NoSSL) {
+  Client cli("httpbin.org");
+  DigestAuthTestFromHTTPWatch(cli);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+template <typename T>
+void KeepAliveTest(T& cli, bool basic) {
+  cli.set_proxy("localhost", basic ? 3128 : 3129);
+  if (basic) {
+    cli.set_proxy_basic_auth("hello", "world");
+  } else {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    cli.set_proxy_digest_auth("hello", "world");
+#endif
+  }
+
+  cli.set_follow_location(true);
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  cli.set_digest_auth("hello", "world");
+#endif
+
+  {
+    auto res = cli.Get("/httpbin/get");
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+  {
+    auto res = cli.Get("/httpbin/redirect/2");
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
+
+  {
+    std::vector<std::string> paths = {
+        "/httpbin/digest-auth/auth/hello/world/MD5",
+        "/httpbin/digest-auth/auth/hello/world/SHA-256",
+        "/httpbin/digest-auth/auth/hello/world/SHA-512",
+        "/httpbin/digest-auth/auth-int/hello/world/MD5",
+    };
+
+    for (auto path: paths) {
+      auto res = cli.Get(path.c_str());
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
+    }
+  }
+
+  {
+    int count = 10;
+    while (count--) {
+      auto res = cli.Get("/httpbin/get");
+      EXPECT_EQ(StatusCode::OK_200, res->status);
+    }
+  }
+}
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(KeepAliveTest, NoSSLWithBasic) {
+  Client cli("nghttp2.org");
+  KeepAliveTest(cli, true);
+}
+
+TEST(KeepAliveTest, SSLWithBasic) {
+  SSLClient cli("nghttp2.org");
+  KeepAliveTest(cli, true);
+}
+
+TEST(KeepAliveTest, NoSSLWithDigest) {
+  Client cli("nghttp2.org");
+  KeepAliveTest(cli, false);
+}
+
+TEST(KeepAliveTest, SSLWithDigest) {
+  SSLClient cli("nghttp2.org");
+  KeepAliveTest(cli, false);
+}
+#endif
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/1MB.txt b/code/cpp-httplib-0.19.0/test/www/dir/1MB.txt
new file mode 100644
index 00000000..f5a9c204
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/dir/1MB.txt
@@ -0,0 +1,8192 @@
+9254835974458887629672873635789957411886024698554157393849494864228024962939550688297074527198420261051675205999609689838587412
+7948702662533481896767559573369920938242346354580061545409242090168773727371802699309443935396635866263937828773324526334321892
+7929250312741837331511829643632683169694074912332726993582394725302853411901337696207186358524323117172520907433878952968176465
+9486937364148093931718552300016332142708943190856638524388888569011747617956915519539025796115901484762122047712200094207683584
+0703675740855407318047361595661595146837376373951978537785605481083388906490085533348547865459237835407372374738389274773789264
+3524314516560200536698529022539598732463389124803873184044464663165630452635665559603483233341839268186056673186867104904449866
+3388466377320953222057779182433549144340237502432464295061371141084500222833875925546082542869030852833895137466510262849050187
+2359980877010447170873386178573828860442255448874794721230413368694441497441338856684036949118353204002591974711928301953002372
+6372613557152801003023836434406997863096739346637849381675791163293956729985652182807911615231198696051411047800847064484769940
+4555399892730282159333189930818248844009737851281434494736943722577947684829017806688345340403991974811107725657399196027995602
+3976607710681047393460981746843991626375149576917517874980586155555711990727221948467045177979554215577477183785345135535682148
+8981224019853812859833307577420310576654838103212699667682513798088777109119729024038590682109547975734687407898816774007038892
+9017123764104410282402525387418186790830943654104676998756681754083664849203556615995024922746652778319099999725942494552746687
+4602993085345245279681119328539229356959910969065035141679707233267342542524482900839390718291823532073464112692162110160887576
+8646564120617234541914353449310981315044240998894442066188871011899825887695202156119273906958004776559173081177243291448706570
+4866033151494706872899672197703352421058356661105030485577210664650513250767511742264039882291373723618030276740280451621184372
+9438899492601727676139376045138079061355198567322008270344297244790265795845160675322685239683610065522225253070076549915962270
+8389935622999431104891971065250599273560270041530059453015141663393829191008304620453278274234791447194116642959854046669653221
+4390066870930359126190473237338490788280116222078414392005864878004044572924012489353108185972058375678318527434060575546457283
+0571024164252835918003185534087097269093594036226831977994875139354124615791501602629221816855731144878875700135493432353006251
+5927821910139360288795697248742701824779517711136895716699422565064551330393130338804982871980774254446227613970394730940420871
+3742377272014443550088749485134437400845098911378170974616143540710504172620523980130687874417124218036934374655684373965565750
+1478423915766121994159683752043056020433068572256778826939436280481378432842397489866548450027752963017529841096517341127140258
+8566764493817154363962092792522076892737665735147823735202597353071978920287229637466345140359899735477359400126088124931881468
+8940255760337363163978793913265843793885760290540433771518954295210648595347128727773745692808704267887587662204824695198843990
+0899757006576147578169404543275069681042994730814241204020586377450354179962282687398746645565905502250948590090052580759060254
+6486974981051360582508378437652320531515639324364424491392656403886587101611394285202791775180181840494403192370521504242888310
+0832863857962097233772304981176182241414796661234070317886749751979535621508014316193777356696545211120669034308685700669047575
+1601920560631092775469657814901382577801938745924198963515833985856042317888652481510158158143597978988591350058772254540887509
+2132235148831014717469033542114409228818750252221985002159849994061876844567039235968616101425307518401162305005282076459564485
+3749005491254116003221964938075605607977980187695543266859111481060871108661145469674590183816636520815523589998805144183387552
+3454557776795930937812464849331806246436437524220402821725671887519345824588678830784061509096255092713692879753496348543679698
+6604711892156464428503873379368266697844691398807542828869396127474509499861163107833096454590997165019449027223124752455672795
+1464056065563451406292025100441586772081609300298880665395988771146415490692648836974652685280576941091682396423173897267646839
+0355383165630525414486907132932207574564820206814521900700480593494653392345246480522618317569197186894847097184780188176595384
+2234714652935409724403164799544553996270776652429105659472464101488105672623286713328942045106946821859926624587221567145826782
+0309935578008890373154226142294034025862773115052182464935233315361839771441799453095926400038395389556682588458216003237653863
+1061156071932484650516913321439215405043703716040614962270232640142284681169472791577978618224769535957766957086206741391709970
+7647351716205014294072195135184469100518783539374945598848168573993875333505334011212625117442647232720744618603822330582078365
+6190042304849971211815384939288709598033150233044255711655989057889996862762413082297341687788607689416591830790638752880761817
+3350993967482666602170935703513835999165561197161777938477157925978429670778105685120890113130859239045083522459241247368307415
+5460081669964922086720150722963115784946235169601550836667474277946931369187925788894576312382075479577915204545165252523196796
+9483728931707116749644793319165741326903913011722074179317419072713429472369240811255731316334667969479890293999075667048649131
+3479265891282260862086967904220845208360231245372151218473448305464967324382299780822943482467600298687513476936031155077963601
+5358607166888753271639287331221882667306965170073890751994864930247242443182503197751744519602399141153643026523167858853130538
+7454234112327473005509721991333469328638161495819890863131852055720398755713433050343878076412540696773945682790587599473898772
+1829500286670935139918198012253669665196719074234685642111242009658467409729732638466770339415767564217863874440642300491597266
+5585497029761221358413402963546931530898077983556347511671398790492531247609197801647309393017719703556474420667077635431137035
+8446511749461154540070308470454488783535318141900958816289412388611370858697615498746416636102261400237788596935028958347787028
+3125589335242227429164632721324285385335478344437654660712476162463759322956724441170491898597020350367163787012219584863841888
+6802337989299969519242898184367047999251583706804577726542893830886334416591927545136810611568115854449708934129157129519681281
+4502536799805954583144549032621959969753071050956941684132891200046324576389173182566153807220810192479638581311891427849367417
+6325541021938064574977797529368876421571303611445571554655335842928934553745122110842178236045825160364424732178843094315127909
+7416551206319999579172591987511489686313571898121634456963111089610744020435972487389528243640299599133169203384400119064268257
+5942558924368052900576494867848083529988242331335385049200017447913990221665638834941940132033114280719741451021709322013495656
+3034267296680277379429583962288582457402893052674209528241394670330734634693333770067544918231098413897817493181756172191761769
+4462568735945386723562623780129364617626340957792264088426814103842409805756856047587770203362285297182877719759239486173167134
+8181657858983878076788365457679611406051878073922935400724071002626732091440173091689286855430601190105542880854867957669944342
+1682764258327911438109776589215105175058720345720016147450773913501679216877023673201387960875767306750352156509386560915532694
+4168453046768399507263930483191895109159119018724369742162771101927944398681984030667327651300421681200981291741743361136642792
+5961214949092908589726506803431211408890378633711553535211419472586275853572210445315467622414789208830684013971300686277675328
+9269710543143964341467182430089608998710751826481978504336310277969086698368677287182389959721242273938854619109417313330166529
+8486459999966843090378171773263091325696386996545517566407679424699279968298703891528397394384066258625248890398189881141241156
+1449849546688513154852662654151484110306993368687380709636409815697889872688403677017676988174939843342948688833489247136945501
+3026821425662283243215241228426396875362999466310497066906176240972976192127107346129568606866349374029240104708104443230866441
+4888599832610923002904596161762304764008702325429097763470366526898011656507069583771589908698710318907474941536590688671464002
+2187786798670885931014137550230451723811271617853032443909991254363190383287294838940424051082728434647528986018234698035977262
+4010150476565439429491060857277549534561616385054516756344772776300804281913985317098584407945908254666687113999982299034911916
+9543106789274635042741853569705907409683466986445551664737067041728196021666244823741197574167419992584104093228192902092720801
+1102588771206288521669854794170734776396759389699841902844928003578465247527168100807066013305698109312645455547945036883046986
+3363256734764708042924448420459037705906529627671525144633382899415555101340497992824046104327698365969273385304329013580634534
+5814024400502542484138080303093675479908925878015957334513036393579080542663814740530799226052633254072603206379019404756963615
+8568459878266889844587337958272179244147420281407959235700418194754222652142770182396574372220705526302797889629403089542338729
+8226364273353855713782831639652716359809735693921459950536413341806490125092787610897542413754704628839004798504470781343226879
+9564108089806303912196187245286576464060313163695650258929860024346682416259472890719900060340274063102211811727469052257146328
+0723807096388817245239864356681843226170736144832701238842559718295427226555369395998370081796589238415142792914737246512392617
+4241424816471283201248965000004171003042756134627995493041482479770591013182623840449510466593158465328399081296605282376713554
+9973513220590332519460381924338347505856779256581376567327469745338170108702340101128824216183825500136464452346025348049667485
+8383897971629124447860057453350337067099519586684049058435585462779736095630666963739484221218567448740285624710665297561214099
+9964116268591382706460872763874878534297946361217165257274977145088020502651470013064060961213429959898581048432243027406481577
+4824315082578790346775943088343852549806522479147355182415674805204204673847884219703487656256651056490611337757236524094938348
+7062382447597254598729362880233858271292436951748099256624309342834053225940366427538355199347489811241328865453894894705029296
+9735693411211619628088603452483215272175364970550497151583596541206523461527332458408984429879086514102509879665768932131692226
+6961688387629152540756216546017259642317857065168508958573052496210655276891659756089714383999813015316305245290357709870563638
+3863034723721495784723589237391107262786771026496285596990386769945707595340965195448259401890929565886615037974745228156868323
+3287577904832967842610714371567414265151412481754216777139400930821306278453396427971928947503983582862250196984342590738386627
+1791128295449101351282899590128118669109794265058849951756999066974826947872800232214872176234126177766951584517353226892319930
+8805052099840613606036822579273082344123139982418321238213526119536401574939527633217151490658267375799590895845553195225375174
+1355928510541796297379079857922955866076933929404227257481153317061720856509437585235189609477388103725696248255380889259925943
+1402201875930840177564779603131963190398447445546273482826943610197406605496467698637182093544726028048446184407465904504733488
+1834037129267281181848805100644706716446934703366578946950288560270548606368029542736413168537166947783032181537827321728818305
+2399588088866368871684803227983829485917501647912319399696731866908470118289600881964063135888922021379521028829404789266368968
+5637489977535077950426899162426475829892339881113388204978816994197921201698140466319573566765752657389499556451516488232245559
+6112692169213605381302831305889438504096793315962284966459192757358537426473374519814657784899843476819443537896967951107338491
+7895505461382759098793722523795396339534176000429147383719128841803883949006205025948100090981495836498310874463726230844486437
+9522042614500829901321795525603265978871144309432521198633117362072879318547949126425751870262081563243482328537146079314556599
+5093542621599279420676140514142072884094585996707002095359240117940447064308608734332029368110977503867431654445743620282821742
+2074818355004815481495949283111185240895061522427508730372487670815127557063465146879286952537668866636765956480834805349247418
+0982616183770170277896101663961256388046096956303414645662042291995673037815635718874781061367093483701372208717092453548930045
+3197990341408426456860501773717322183556963874016603497159407408857792270849795326742052795163483613191779561704529979153717213
+0442381165605136382176204027769856937910886725474913822447353042136166362618403395513606165988761350028767809916274534709139581
+1546533500647539778292217072989397950692244341857345231008319214990106951110301762058019968223873956867021450221558460837271796
+1089583682950702039719953402978240768135379617758154644301927987331573523265837746123630494418924793748993674977892210713791382
+2010498095473532597719948269554932451554991652103201520706494302534512806373772862577948592827967992187111665796229241795272327
+4495947525239030494005205359163320911969546009892986032715554824732415447400580445227801191434206229755544175085033640445463730
+5799343664533857261737308836915890943267341995945607000250119768647338018370977116150224513412795224930773162810128318361091070
+2845165641335198012087900200223115487995666447653144922411381435396653532150893427712002942030941647409112450887593516206623257
+5995936189970345951128332927675055555031225056766626864377451946716279426300206796784320339236602175243416848009874418064376734
+2751388225971927284674719275737386426623723915170272496656834116124167598744380632642578314683658323664087930294748983479134152
+4463890675024338744201454760164930410895360686852249316115526602608580347281230566360947860956394767605509297995646286805155429
+3902535272296902694906404269870261097232828009262961508419387381919670436136425912908116240583462930917866834873246313946702767
+0171550221706917129701789274673785241823132172160837286626181116666263103300493781986590027327174868610919833041462749008446670
+1233446436949798212579086729206735034953949556045481891487880919889748751337486349345808929953562851746791383784762700811827813
+3273320169223863915019571833988285591541029709234409949795661766708317004888223115613777281294607726043777706813741640111212754
+2476840221289778122524588163601454015024966289209119530584971298419043747426874336591254749329149388984462650479516131162264547
+8321322112340265706034027413610131445579234122444443539849216325832257070066442940612976748450142222873158683339615189385385401
+2845301295555610107931163495080379964949955895954082606347174241430747973616106979000794362756653542557197433894470866065773098
+7002289110540946230118386265586199860767183813803128176222583812066464632835592487506968002253203796340562076570806978606547027
+0518614265711371822209002835579969441398099868205035333550662371029236766960492501859441092496004547436756442048667962205035734
+4662742623053069471722274771033535333247780680117662494001501801076484609461801093095512629224389725470873708072969419161134986
+8879423231727024904174405990021786946862967043559824446453539979244586561718968470449066018656109597862462444251052806647222165
+2462868109247823087920350263249330583062507248433983310105749602411182363633125913535849740456631462938827755069526554867046297
+0556317986368239387236732047607114173950737209007825151623731055762898522619516377121452352573813859619423710420648830645140602
+0693502619716624171936460417629499350461603844160041861287075322351538559343745415528939056080652464222483749575581089457335292
+4766904028429523888256867990946783862212788485169555738269492360138212802976905819698072914952002888319407814152289904290372830
+3063149485419553279766015944554584134585112055860455417890621924246024514671960271622075351843821409825893454426591239346175825
+4138071925467858356596514010874840756148724225545969356853427243328235466057330927837715365449101436095007553412409485033663473
+1718208277388066697955637942282188804022877425156297722332673824998500535568426990569492133060260476735245935911435663031104540
+7259896781146483425619092546253937377799155709431757305830799439617510543866635784180461435471514956432054478723110546701399601
+4212208190748800869765878332993087846354727233690197986460622890272309218632979045510485708917467310543076772888886969650697402
+5830555875156620379814707898244277917838097196097913596741388644704517369937389656755811401456911697429799824431768975340394565
+5218384019129708961023696421751573471619498755822698446106554346210228582416782419196987283985815988033363104751364948821321736
+1511408675805990625863697514171112598891753956197059919478438005392395089087719396999097527167894172833319566356364163919692543
+6760864061185222844062388472607262118669410742190580800609818458141651702885176634837319000673951554557807668749868767849900633
+4624693982782044541974663953840367719217355838087352148000020445830027606519679992919499646684217452676557562945022247829061975
+2885293059896283301736153794239325555898371313303885556968069349802848506212069388120502744705750493536808390340479824477084109
+4742565846910523167821445663540712005957374896244507720218360942226085109738527921622092099772083368812073433747682045449511884
+6164131243427554092783794384838205105688550227514505179310025715143470000166045228305059905780171994193190773288044579516190413
+6196746209214286300600159852801523856096528659384736317041341206058064233216653841144231397934288134905891354902685060365011048
+5888543435289034798476752259935453803961756168693460157400272434328483248778988626059542292033153708506682448981834226044225475
+3520105979519175798851693163134966793094384503981145911295918784323346445102768597120762535638265452619900970085082259502423098
+6023108133594199401032707688284772080067633191011227704160888217224741219472651134131857620995953537078628999627600457859691029
+7135355737374006279317910328897677569526320656280275576870747086734764513800879537763010892690268998504415888806085447064856828
+7067645951048993310751362481424429404370974532580270127897680271443323793244595619510531091473812713032955994538657114149409819
+4429631547566328842887647552139562050329710358137821590185444827892759275367380722401524911377817064992340751082835810723755618
+7949457580263990600187866192739809055130641391600646169338376355962933757309772135951086682561238922534649604316450790162767470
+6778696718174528127426896010544648198065903564137512038147927254912585276060875391066341248912566730098691603844487954144583289
+9567988530970013733492869819764508889770837509952069384446637448211216157716267753953316429209184585653933599673133926099458608
+3413492966631743395005504952764856687552734825362970605800032693220033767913422924066513158712050177343306017113090503548595910
+6782760373416377101401788671756172877579108677684185994928623883970442286211028728581037425407354811624955553337741266271223038
+4228769569080076083693265874897262718489495320015615486943453828550003614854151710616339504422293141400194809493593482338761720
+1275749976017493214306625272092330580872354604747422498275624636561377503079831465248194508227879655351358840776762816388383155
+4044611547062276323077587550347056464054608166550263311750875441257836393920920323092209759398994038142599127607649577377981910
+4521255521824521693676238300467676986666555950395922139641083951517880343036286546664953201729241686129223651162600610883998263
+4053431348518058012397818472045875672812077824208246071436792077005700411785602017912645840401853632467140385402691379589989961
+5296228207351306866595027867237475870719440724477597041700391443928732836085081541635185416372585087892465757549359102233343361
+5753047891155830333399279611743974102446066339908340811693445790222472707295688908858729491663915472040238337620182908302697924
+1508699849153464593476010736879669905272623521348097908417836104685217230447793112158735284635375208948973376371517941685224649
+0333224377446486130711894052961084313686306998844675785828086842465862992758130724435712277355911443550657464532883107599718794
+6835605634916383199967953082993703931572871914916373072477880100548805151438790628235173925034028725412169450381473208146789756
+5647596797800233744008641095874820885871714922036190240494729749620603436690380840330661337877272707920476284213555812599419547
+5513261332211064956118510684223202485323331553849116007081552356506786559518794150443263231676076605407451231256028775857402194
+0513233346964413426058663133294017428893643801135629939987380889256710071523164000264715556002787400893978524476668487881682249
+2238557041006601823583800792379249859430190860772025645499651325329407777431099926158122243379494002959281894688702064542524790
+5329597914788889055993063859757359411515855405549076867209561054324585069797183524577493085961561532791013967475565456058906425
+1727267651465421481105710991587303136944086691165624660300683125601416772368166283177444892976868345022274558919475820725390404
+9723590243421203442884921434798664645968065479222983928276913077586527562214486087189922112591555037425227530771384194025142882
+2491150360749458092334991769156796313818947278756674701926505201943095015129003490350920079450451251986198697962197375931585963
+3288323311745586996701741630221983319300390047571862205264349777484027201608059718085154305903308263735198400749807369566973087
+1513669962911297058622557295345513797998471626294474435337069062590410594233688469673875484253912558586263976338954760252676149
+5698941909248281308488717883921117273305117757034931046904729563167368375307728972002962702645828488935279252804415118514787991
+4226862654077359109954473957002792990601772994320272543965433892756039129932073592057677191275583708907760929447157089919000104
+5013015202975115790118348806423060224599193301855272198220793587287609415484559416236588999749109103840932649489845113026318936
+0096212754630289886604076288072412229982106747320501739034720205607227829189554712104511341545586461792092663001971581276075105
+1400830012525551115910295470153382076377587383792342868236429581401216573706230071139732339253271088253819425521718399148426972
+8130329129443141149308342972871751834898890054061408002066328617017958243761248655943163660366018684672224076482931610024551435
+1612470444029502611969134698674683976299405806211129021898957209691274647456212891723004609478869086828079731180673443147282673
+2207763612557030174078525394691981763423880246207823469307642881721011975478949627177448531469379452033830830547116487954748579
+8943550014526152971159374128630625318393391528677655228099671641521821415999666028671716937719971706453115362098995997004338463
+6633791090761145650463177053061879817237525424207069349153087084514135819202898699531517360951263097509259970351913296855368085
+3253556229437227815840782322932038842610282009077575504105765620857277275220518640524545781112378703944765595787111117088536490
+3612778048987899240807648365404713381232983899393777316948941796158037305227415310986733359795685540845368139757679718651388721
+0329656082303032301035960655149116897998069813522388783445067885544697734848160954106786926689147778838221235161040983098545023
+4949145925422482842946072091038603570358418034882170359973918018079551251028978485799644769497234033416966830413282850538365544
+9688715528548523732988559882524759509039740049260246259447423254924760566724656561201075170029641287177630144231062011355479091
+9326655743860681005816798142139776662356020296561383131825601205038606699757827396575776760705487871722516625005501108342115046
+4862493770761711413231246894538240278199950440029797832691068222332648670966923316771267216815856555063431665762362373752681261
+7759348913324715341816977430054410931106803880118579894939051307627827449748451051704548335839341424354678283555009009093334643
+5035504534504599464259968803145065603468459325562475588547886212145426779673200191888479107787688352706387961887120658923163596
+7064143605981003619608323632499268464142806140873807593464533126484595249138527994250140164063377300752448939069709418760740581
+3405460804222472492156715297971710492718005664789725902179902462523655008185987881883912400930038752420707768027434069222517179
+6201754337957471374021641947490208688904315801118730053700597398632018696041671232277781587402859428981324544384470959282694488
+6581501955752939978682011949909110724289175482558070539947143137365139752819830357605189104362596510417675677952395485738392629
+5415386438105335984223237131949793153812658394744575126207919072784736846230789712179591745207901814607314375532066326818332653
+3916132472388884065768704630042622537625667251509691545801542090771247404318802955070620862627476301969800427094218570764969521
+4673296443835065767694158631727161041961301871016507435883528289555722603890069782368970629525870136617529702747543702356107980
+3969736866659860369283152300636814307559050510391015595957669034065148689817184431746719346979216411505522453887905503375134993
+2033209673996359127998948182294581452192221728807476998740417776019537129643269360367751767407520936424856588589036363660084548
+8920359577043563701436228560312778025314413146903691717334802285060730546542075837699964573276987471415144914980259764316759773
+3627657012409360919929372833162804983136382545072275729679633045374976939117136265913209976809144657411039862524163682772934353
+7062667690768603813766580397495981633020198031283191319322060508875443418955017187814158494951274114076243932640382433951906100
+7089164714588749807180199878456232640504233132283953906601030144605887922753172274055475279148519962245834295034899100856266109
+6314588522281633268271129575999011547246790816567972537919142521521537511380072338334215014034228037819143744053883142669885047
+1533466041592069230562893355289214460798489775583299853132986367560533284715718053651634282346811547110422080041794519104713892
+4512970626101824923414591998781160477443695022763348614143799819070327746195782058463430126505518264262282025424239196981682678
+0616389983515682792619586855106396642118585620436668809283536133165065564894495800101984339481469054418070569566522216534870046
+3480404934288007401354060197932800798509063792079011642804930003377191431422069063134440047889535881274567178940747418743011151
+6923077833597121569133964233884887129884707102983051918568192593065049229148460460606709813558966649828440283419826988551789494
+7928629618912970441223379654942167876674509009329326197500704752789973531185610595644942798244043453568923441723724834770288101
+5686916225325175369639383018669733714398867749909229151589872339897763998251848983094518391124033198227341074940345064217565274
+6976813108342658294069521014494920511978448452850030848500379855545152314960261910035283177013574685072898109220517966532820914
+1235440485859974578507661524414185881273494203471328032423655298610228309217218895796957468358842309363210353318874365415441005
+4775757215064448647761305923181381380005564211124254441169985896444461359377488533806177746993363765363744834471832298666899659
+6549502546484198000053617666533373457701974326516846596770901748191355355442117405686714513545060992856554971022392931918431672
+7550521620433789157641377352042796699563142807992890238677899811145361588800069593324309664156547033893582449253982866608790396
+8335832703903786234598337454771069254394148676210696718885661839587950139009136903487221685179093872236368600881697661914186761
+6081423646547430855633909798819189360248786532594620983774708429259122445948885539867620755942089483824811916664871291112367965
+6763010129734054857751250818823088329080234337202140258490696882947562857997890963039131549439624749888135285626495741851799125
+3823814359862336359300824370629334246257087407174522366323576913384874982113357872199582879993086251942490130349296563220714459
+5201936494493880745125428463676510521663426683417020693977788479860674628237207703884747094987717754212968764024565059007572287
+5656800692578264688131164439239627529022443380780216659445516384845610830241501827976377913518196568744298647947111534785980646
+1465035810576162949068709350012676100595272189178329025511241633720229686245517256992739629981296918245960598907587127807526613
+3498649092457065189914681277177637039326561250640746889454833842625621406771442705555721525931725554548176228818511280348712812
+1526903631217370487596090586369687092431736602852047414002552907015226570166585529226164536775440508494117144839832365340311216
+7172800070700446830268660237981558246985408200103623671258540515214258800554645764441093416997150958224932045592907480540349584
+8145891984169127686107656905169532154735243264685794264058843466267191409417280492627793038318403119617408184518297221316412215
+3733585102819835157576236492205872180664881259553134950516961350305063296415930019908542524245430548400901559537444244647471710
+8919107817519795022023748231546623121376187758240479239499900553296636944913506176758776881811178925344276782657634277574411018
+0087408240115194690559689367771085179492160150159772172117583670772068640711181227707347785373406551286722418977845204918371862
+4087671496873156369239006050995430210075877655341012369255927938969111714405072240508066221092434986016434496634246773638497705
+3997764933956408083465951727938645280914517402927065500370134817839436837421504452664821784855528363909858322652715776945384928
+6358034140171396799781808478643680937510756584505346662094931360684566558016245219693809041873394197337373027746374913052226841
+3523525169184690915788330052438367441556380178099903982632705234888141866441214930597392851790874812046196446764134474357280196
+7912390044622498326943727559828557263667260605437809865126129166669886288145038860031004268429510310452514645934110806061259377
+8350389661397820495902304825219183306686077590455378114318515252557794852940943308375379300282537760761994418165168215848774199
+4335948571309322083199073879107610257555821153883090762370374143145191005083410872058977433580493717339726072170334542991808382
+0741068478360850873822704930167309345230781173492590875420659162725013692793497218747184011101436665668426379299561926131540226
+9684119382210299933488533355753954403421331470099036025961973755235128720357457186896140454721156015369426494838464841418224574
+2606550410151415944627360045368428365343042196701567415760981599314167562524281114850783881875311867997694821988388783550617647
+3906118902121264712371873625367711895188485445955724568729752600563482629569914020509331709891753567605376276818895453947988485
+1946035303735634882855442231649687139100528774921727985325887697840697252312164193587116219630593036960739462878472488751794288
+7553042934057050700594030020764349497635594011506182646429625749401961796662698874719407015328877341348471848266936805626731614
+3965083773308342246671432838925759649742042738645731254867213711401607696364783002153346490446057228458139827872431818981641456
+6290917282609648173484002432007182859707772380995362779354118181323028872604689080381882966273198128487451758287389558544864092
+5135412345654409193398015818933242323380089276961210614666090376540312839620184116491698184580875294639581135409937430385452967
+7814752714924949029739912516676992468879575093818117912716084850528773868618697654019734174399226706840162753982136880421595798
+8344230549785765490790122830425599688553302815508985004520791080241214227127540251939234623642895839337504147995870998311297157
+1312261536153577576475501063559792340822581967430971162124952202625290357772475691141555237352878643256411801046597748593662978
+5420113078044378326245454890074054926337548530109656935414953837202844128511917486560998089330806876653700112974245139455110655
+1446316293204894461498438056975498718142802987046646526458433588790266320884188848067627056955062757523352642280099730639892974
+8768410207973700878297712434460869178087366365740643368423050061014329802628323539796504787700469737820946806556379851425348409
+6903484946126406722104799612810275531016737884354336960835748710713062889887930835389522081146458095107803234373499389860789149
+6113798456809198989364723468291582407592480139088852307707256783165897446795918270682937158869421622443360894104220836046672216
+1297180429334742843324101908319081257574325368096788573404226330238491288173549545719251363488582787945804486932260991191153289
+6310060489009039954463983763054135671085760401926391779699811819750329003225671390731075907159344886944959170333579705985011394
+8928332308562582665591113793712076278529561597438667031252620919756801258278599576959931680328088876910755153375346545987026059
+6122799394738485298698282219069449469308864175448069521079405422190290510333027132055402559422290946776150886848955390869348557
+3298127120443406100122108547957183131539174057790900079286455780159808161628252012286085211125545510059619150351442374519647873
+7895547723969636832110890595697353438517639756208042458909186966958825057542753856885651750056062715953653156961335641588198051
+7242277604059435612451710438360700839539630420328128639238629662384680381167202360792624305492770524378775130253064094350170239
+6328910744252096963453975544360333319092492567496656064841933375445672717827688660311871137666274201081402086421470543791139037
+1263075806974163649200998435369614522606717804984408053096263479824896274273438278637073802016955266073407127338686266295417138
+3380472791463934939167548524939273036820154830243043930199471181363843017057589926197441097934643398001941245455025305275718778
+6053039097745341259474392045998222000183392630902077243215225896980913571132934688432219430448989534298905581203790323081204451
+9398618592749592673582297312578194153271726432191886003886455601016177152460729663034185278967994135744387261240974218700552874
+5660578626067455796320901716488860867842597868415619043285914590213707161427735661103212503097888685177044222466862770614738888
+7523554669658437443860955048187147707950298396691077287510802686031319997279006079308577219459278947413769480723164988814047848
+7728230896579900984081254526628677638403672817908586482917564357430378814260695955826428360637353362697491648099319657648279806
+1471506063396451021205086178083016198973053283515072407397794280863574093292850961361893442271480652011908263493969049518154719
+1271663389268841465526530211516124798508874084299647641127612963439336172485890973748223056840291177210000865573662838724859865
+1558003045612329244947071838328209194658672648215862136590055290358556159847830215232765640226279624286079243381635121169856392
+5235686772055013347630127336838697764880220575101940207293906989459723943700375632099865606791689918944793971999840022845627855
+3362608893556970872086765317357229622168187942063554148251194799624231946317410456787560024770536041305554794440402555379048363
+5400711312343982155393978124014413441498824140561950458826861214386401267011236483424009049988004220217832202185519723172983734
+4739966966771226209909624912450025675969022747113454805529677743180928548967947375791545038561055048316262023987945828187738406
+8806383430961455857801815047901978280522034447065757458634887588704123408758546678452281010485610787173222519794754395918755668
+1313032694820263690081002684124072214508820793025272277314613304407858220279657882431787747545642867929558977205831435007980692
+3821423807029286765485523471547535800355065560255771366935624333716101960889324812432465967939307158664437101875808531730514686
+0552828401027435473969844207309352000803571913860014776373394805498998489404828887974801011916107676224063398083299850490285852
+3252785594630414326772320135663653623232974740345887923006984684749440127689169558676316478796812920656203083787608388272541143
+0886829100701462879464273672433682081314775699581471366939184918943997271841997863805609882688632845996559926289731733309941773
+1588621110929737275611330049699746179538000510503020090443485760166202124848757232989323035029655555830280894064603577880623924
+9460393092105077041540924186306320293949908924617136654677663794806814239207321566509608838781326729111423409256038330560254768
+2457234134203393682333223194421969884096521962196051357781698196280191186003044231263105047089066125824374037625184294564841726
+1139020355104202113948476242624526315291276395095210708873598278111336130644448701938653730158050834519082575031500159059606323
+5508845274116902540996666349891489554638610844733883825695366107090243640688502082955261760220172087743405531646494097110373564
+6139164128879727447485151113660365410811051772254913947601863445614936478465117644061091010800284725353254306320280311126282508
+3691867968556520735423213939515627425003649240791159831598564334907098275550400308993911728901273767070664323401959466199812550
+4385285527314360012494827503644449196670340936661875727271329351754418864846693134514944138823292825239723190822861243721969511
+3358507325257641984977160116136111658256532073729689685425144586604492783647635836225848095839938544002404873700622644589011676
+0802250613087293781581129847507424374630865942136402236774163044580066760450481644654868348223850714885941401523519942001370346
+4033651642172702525694267019009943272304377112789600524789052835595443304754361088227651039992096267114223436584457492049115625
+1008702122009370555007456522799161340685826326521804374437361823776598365128302875870953921955751574077453333491368066562183540
+8297016982983877478208126579509560908805708870139177751490524014204560610778740303237644832086788493774257972604784310184677682
+6595999611158451837934955382339066842486744152636969464066220937412139592293869816659174158028425151865523439443968468476337116
+8189453034430471397425280708179774110697730501130625090567026833440338110187758034977661201862518966699911402128869207946665922
+2967301009332385012982602845125958037212145265901920840751275900004234804254302792404413397360100212415586648851954797337031843
+4621309795646253111797549932297844132545282162620476457572874699573469126157531277320612819758228011208417228396419529928921453
+8015689409373876308149147646698419734053674168732622753328286778805854267784590171527922720365829353861437404497654095122385810
+3928532819894452405285805315911246752486216644456327155370715615309647716023031992277092232949890587556921144870096925641170977
+8706990895052933118940892301863446619427769704201470123344557113277628075518257745853511560735206426541219526593186205677069195
+9323565048038756996967463636608859147371871703253988562924960678047445864387523330892542610569708364248757858563962167618047606
+7400110024724615888960177029937719273668926142229826804752461957263527604940620456908940268767529855383328656980509173310228171
+2961079316835291946492496420673777366632570317335815018560521820389694972648667220189874230520964455139599084822803458488491752
+2053325276467463411017022059798270225751157375504499399426618848961341529109405849259510473132610506746820731096435354555540869
+8022085653261752864363248353443911714595466837953116893617432029480864961559617145874891482509931363773686667586008577729590619
+9511531059462330034969446429670396910393858411286019648142180898913734931062268324002479006487407711948954747504728441451817299
+2402899664016344765585783952968436864461868976736500943447165022135283244224710415767003722013469693233516880183011359108783628
+3912070384615994999455640965424049848090544713337811655011624123059617272139004908000480810430015004300019350285545631530421459
+7040129421344930471792157420616841533490962354840490248534268666426427664847776443733801972606800005209711387678959754783758169
+4514744752921544867887197341433819468485319076219844212297689345457872671062595496333380534044033301910072934964202067332750929
+7744301249953061021059801665718252827169031698368805857673827901657376462120738712603816558346872095129968009454819539063410887
+6694959951385441493938996005094705323326365638007625755937236084671116883434472854253964886004560210329640317017985931432992507
+9830755088107356428137960573336610521897465624860840691251416368635190221352342520096074021567053917840102300469951496094532646
+0386151915867137989482068036180096232759486104299898530934407665433761886348452364475713105652919177827149093478062390353337982
+5026237611119968967543921268886408485214827943839163757065518470886816959612437396882015040264309844556286249899479340530273455
+3790585606726228419436731177762295480034329918020969162076958086843994331135466429174339242003665276457867681590462499745066166
+2010072822988771442333707800353630624045735130580706054631404185963369356383377732515576219388977808173711224814572042638811746
+7799862036041836103498954213010085023304912197271099528776247085017591855736447939941510010043072233516636490128682332435837718
+5444031310957599380550217779540801553000957068137470959947071825380695799288846148959315246034349773291226461068837384267657314
+2720831922046271298345192916201975278989464655822747470522487119845175483171802764985807888092086888555468865508558747670561030
+5037268239030155207644532217893862758398321608270496665238719184860604497280537678204406616537105359104541182047680859111844623
+4406453518829809819978030558459040108565356220631255519247977687593573153889331324518157228436273334635625807524985686484922311
+7999885151695902136577261421847256015439589971601084977870060297320803728853045230722764838994142711659330991658042253610623719
+7149325976325848648664235796296763337498794913699316628172271388813068172391895353748736320858783488531575015143960860926515250
+9988100123929774124197265328008141820710758495752123486181540545695574140507942678614702580850949656109084164982037643220132234
+0375655311441060929515636645306301671876166021260474227545267428349070029167644989380583812184485451805574601129180998157634256
+2128590561140195400524100610776393812855470570049174388092975612532917892277799041074366790055894057834557983976227857050864930
+3547444389508771568810075527864526064121655767293193457033048336615284399475478737509966968763107403398079684015244980874035979
+8519927849602061794266560801914694036469483013102023144973737181284943231700919734522079332185384045910178109811932848109276138
+3567893790780435626536700059643971391023938979188277544418757492427060624484762199641583855650960393640504524655219454811384399
+1735108417168233650163860054247929680595797171838825452321119827231787146560622246912322232224942016739093046379276365165998295
+2756695873865903361436041234030623662053438358924238813701743016813195378135003338279782291211315013357508842537428877943825850
+6550701509812921278785065189524058197762485207459987155095767921276575821627138362297358879947692406013849533700244092475658064
+1746417294003960060064872265575781963057635907396407260460748957479942537372418296161245217676807862873866767635894044939661427
+2752800199195253529712854754798642118106991591404644917342058968657791030752834046050164301961614256798982226629143783613672100
+0156432932446788502003627727688728508740309980174215347673828299641766130526832968939502574943042109833631744090112189289099293
+3949539215662926707735521667894130134427486982796357220482855624651559957655963754443694394481228836760254413314867991125537370
+0833694740794893624914563726494064663925162779653035815936273173351045298468454290966312347207985664544908635066940292067018215
+0068104260838913669470167249521001975928318786418160510709377212045134485178004263296128628173776672447600907854928188803969244
+5213186606414124173974080816812650470078589656434215381413340547874523982782714789910645183938314140377172417321651847315127943
+3831079213870153648590263375611549325132489817138611364392701108960231363751036773655982850004119077364131468986709426279928740
+0816735516514168218608953096598217254388061619583961807831532937684267549690578384517226873045647249368898189499267589557763196
+7614683199694761607567513771357320522896560891215582525317620218466204798420014498841517198000714225395529432437408592988810647
+6493791813371800888731383040408467219612486147146096499615909931691397312978653723829961950808111958324158561777510444489457609
+4673680562966535580522867179325650694242060572148395328716350087210015917993916484085808071728589768362522840828065262726854285
+9484597285206848463033004828740831651691831183702931423669671299973340807479819361399029066256705512283915649297270684923293120
+1714285317558703325551063623439102862882087552524008272992080310001454376923262343097189280399813634553559119888320098054640112
+6878492562141548781762151287184309582512789444294394903670308453724775992147414690794148922865626436020007876554089383158780819
+9151911784071444893456939300122542765400868095022473582458690303654492910301968711120089416900205538880607052645783814509878005
+1882377638793327163743947324933816937365677683669086577608915703348630259888777501270806753764247220631643679580537815123548411
+6272056421434812628524453496821198676269890972424881983781819205395093370536909259477553372703891212584194254740307122112225533
+9681870026283102041075727337579428100736459914910652574617863758549452931286799490040297351890738617979595875678774646214173033
+4185695124550535533485860637896723654154834853472854068710912474987668413470803105179616610921355620666097149488574561869489797
+3333789216162396397679204330436931257560768258425513267401621836728579265694014546537584859527037491359360764924746663506919770
+2081504393567373511045831331064517139188352171030907247345004840816407938277996907076471099879274974679268216987024065310558333
+4237450865130692858281322184224268516039222037739605355087614033374925113958908332718451900205100215886486089988991485524969556
+7929075290163499129098877300162688469599528046726233844196457006510599251899484746828484574667591829570772351512078305736672654
+9048657921163013454470683806356852138380411128268107788272256300715016144618475970710912738205043728268553865691241054834233600
+7029431095139361764456603528202380622931434502522594214209499225882330762428652317267948702623321489577844016464692915246359712
+1105356646640216883904536505154508223476242075189032231521222657818953039915135319911079058876034135094530224254031516149971890
+9040945596327638323723931073336767619159273652642403035784821558395849500879059623038153539774239738033911626241510146918039749
+5283073188137753905883236902928531799079492225443087557262624838420087547899455213109577396225125545248301841891417389453351792
+7168518951278682051937542342148124215459196543677153007216757499379420036959725544058917170458823956258437616459586004329579552
+5203183504391078070063471026373757432195663011756522268894506479810617330340549685777010011742133881536309636471645529762659089
+4854999787239813251707701121392165868052289429676407362096901868531485589830231940346048063593475645736706551014468995600111842
+4955763538748975069385515923948951672972674499411759026560381765340448515748581186486358853253830173480680063909301824002408127
+9640228631714593257928903905827590703526290377038235443447387587380382054598578561742893844220053769466029427853174638397427339
+7206862882358947361070854137919196014699723353543071743024301192848154276186984110546320724917862537765542130378492262094573104
+9132037902884622149627426018038745128067438979528182768862440252858820253995972446342211888009471423051493159698724414795710825
+4044729478097558603438562691316366082632115863305337165834502683246949426265600257894877978230675496217762990369003197560692400
+1914819988622085254720645203900712417397542695171367605811941681178792903669629925720096971822910923986744641852805301639652708
+2489879698662595408916009150319958484334649360641536805110449468835050783501013718256899380316883895243102069697127104742796718
+4988423693542042725154817443015091705766869067613353141088272355694386531680806067437655514967029170154529196712934789617792274
+9999952996574987268331116423939940247569869095269736111023291772144901858552922926558494336795934151397996022792048113880115874
+1453279672186008281192597269984891593458554070326190463606379023362133764652707672957322700161490484448540753367821464532839504
+8011800610118047251507565848810514239096971840458570325653839372359200258329325658866372171001058138732560340444368314621028592
+8193050742913890615185212677939019076499475354863399017606329114085259623153218920828787136128272822531407941969673998134066236
+6165032662878134088891598296730315347615307351518186514382605872591152954913301540364688295560996800081490449469152762525841628
+6574519924837827479315694440706135165231391744110344384147108151733208482344899812368417803491072197299164648305134049390042783
+4020778253016163495293946067531529520938183648436344477015365877950549136205835548741134429268197026979922853216037833912140076
+2560367110629307999607135522026567041549325633921424597293236948045008668100091755427842685667533245402093886980655601060106544
+8546203408136109675436916166218885966337393842202215612854795887800951672240495314500504099192631873269330473780375743830861472
+9788815056490265802740571039729926738317636325182129335295512619052159101153870121975439793577984106855088335077085584239297075
+0607830196004382404188902942190311303589870612777737359147435465863424442529799140567063628056860095478745600686399779891523221
+6451811221617351847394635729026502559474989696391694472537910902735717543356566711060840045900392940941333171363021277998101010
+5131780001821762931334985227662541898093578808808129086254438607279239181340438600040947973426848418990057822839591824881359023
+1781431927220093804299065870243095263893435123368341056371775420733487563878765425465471958566683414339834418118022714155686281
+7855784526694976383147640552245153733193000678558101047345867400675345449097722230036412101539440443445801673442840764573276547
+7277064664195765848534013590019916383557749169375559963951776576181466602296914352536749809247940247872302329782226925806468043
+7192135649991318277247808266477765244997880386860464765070023950465490749600254005312168230797058556941811885358619067264540155
+7745942254017380214048240376624237449522972214173349323588251697136718540827110673334670762835744617609275818957162829921297194
+9308025524075793350930587214905796399488049433256186463627589329393236892726854692113712455277309297788479077266643487682416715
+0884436213404481146144542589017779230742715119840784000653264872459751590076369675379177572780987987657953814990135600852985178
+3730124530298931373240431341115710398974380360265132276809345755075936226833617497570877144367390338090832665519341170114016004
+4487614165841966483390809601332500844989818602599615930254525814591372642009685306021109318297597415196166334778397096512192919
+9738135052767202788355804851260065753666213740432424577877433994081030576175406007197406894692674226624886870624390536370450115
+4972079333970854412711805268652812255100648740561624233549801666164086630826247751458218621070591048081789263645429911196722042
+6264477153602121971771346665126521727114186506364463613567938860398188315590497953212091430368302124372365408850328299694402187
+7096923163132078408222622634338258654575603652287595704602066710353019363339205986259588116309830845020074124235604674290929803
+8620319232582906151287500817533307221837336344013921731345438451489042597967502976685688377786979657248449082964352894633940456
+2338290774645460787964275902190755185934483199622353782037807590665967507775691698706742149485822727584225845398159573488959138
+9690411512559467787285374715845943612220011261976368220307963458032917206195128934924351124238497339947198608551639030163894645
+2522942273087160899325601687017261599086953489151039944965907240532011926664847298253352884442034273091440472287878013270485552
+1149024375555901235741559582840384810679491209306220816791833779666244374445454015124428345163452944670223052356961455086641846
+4911582198911887147216938492382715818668300238279079306283822841054803949022104243393368739761683072273825914099989412306146198
+9386705286204083264591504191247314048641049210231970001783669995174466309042384199881382505454205575494098905658585266777083412
+6597181522016787958122306510209743227930379650431716531860926286813430719462209935654406493573792531684209677728726902971780496
+7454713877871827759953186012939103462107245349313356776395316754209733644734837949073664445059496108161795213098031298387675255
+8608951097824554197185243937211248657800767047324365682759725200979621123783045604563185385990004228189141941283634284151650878
+5110742662179788336448957887870922104701629467080657819437644833165127617594897707891497065965495615130086622172410875337801320
+2393400609667414757827986008711153834467770780863121443973568354701559598965757992398836770293536284505657099974035105460765424
+5696578078800033701889220099620389665546740070731873354278406253021517777757298261519059116566359233204858968015644380662525991
+0719487243613892918578289524307174160805716406329931625803050285847534463223682481335815436403441752588538391995273084423051287
+6507583132575286651290896026205391515246827860101127710478694329951379556419208073957900692792049817183622267407642643093594278
+1377392380718866307096826670910831948575020464783957275980748872622490677834200043136176315679139636646826582155786548373039619
+6270395893591295820132189201839068186418319333704429754904087462921395570639063307809781688462251183623162844581418406608429879
+5043135604579355727135840436265306254474995931628655768285052525690960177800386175175072542969753822246288489006113161219380471
+2468870042718971405890990067722938578347935929978019468025646064389136067817188723296206441343678326386730657242344326326352583
+4850753963828793552300794217123706294629474328454245842829452531896699931041364932772984481884556840376569123447688057207356583
+7057042541510451935323810217032483925746383540989928451101483213770975125680075200108338616874937924879361446516778250185550748
+0832810498555353548220097752070786325088219810053096162098021215047558250904896030368053916311890910240442204298949146112466005
+6040761853883330139655359121858985041009457655416978338162675746762113717003221699855200571002086517873586911211646864010901906
+7256461701161490507120388412005575681572262509069280090655692691681966297281536854053796037221572903258227405845942489932658062
+8784119159896217889610742272823513831023300901198251714365380671379756902059751391678189474782942687418296669663414454093527211
+1713004342725426977027637006978967397759795215758374886596544583647960566243025979142738914314172995528789806147213520151545065
+6148932160477331319836946915602714548850688076504811022908366977684207197869071392739615383347277286078886115107459496844571114
+2443445647690017845788068401719782165485185661849045242867722200580611203950026796072201135775981201642969396670605705878495845
+1294371619212953132417647548708472622197636506856370676160451382994700324005284453279834375908065277166478082791508699598722770
+0053575986014268796134989286247216849523870686352637864684792640382519878279886269694672196689841813884729761559800125789968281
+4079017492141445585825743793710894771763718871198578437956220555470157513268225528361787107561094227364687598864249537846090985
+3335615421853085612471428388452383268898317706526014807014690533942186796242785098624189594771605450015209158202436565395838528
+6313851017796457232684831975868577197008285743175695149676285515896251363246115689779921987378115615609824156064808941150859547
+2765806218554516717364886537785391971358807028025829434420213828068755277959823238847926003687327479957197440099922200245318093
+0743837871847609090197592779267491068691643664874076633968061486254606691482824855693172784961663018432092989740850414577990750
+6025684120312451259686658587433694029989987324349789159690905104220972232002229613273265979326232104213906084669828970966380427
+6946689887211552778830098495751925653354785324514999092963991842666284889259310987400348941690948665027526678850288865496058905
+6762732711489921976841952967909655635081188142889946182277259409310226741889437458160117435942945024450654816897944448992096154
+5422044978529069360644478126257492572807446085424868838210351520631277115650603746786970481265582987466949165123354295111201812
+4211276624640084315612918421177060204230299421803486633824592006573340606615889580523464227765304350439006450951838160825473751
+1889210243603037535646067281045805960008570285172891727145769267831573879630019508324069996866828486890146852983707941528252170
+6433944896458400005722683036542919674416232401927258992043251760109983309622060221449241884161395267285324969554809613236559401
+5926828496890530602862162152396620975722541268836002211191264684743325984168877494942640619948750726132999624105124012640906283
+8437529190279374121273890161340277025282882572337700420322280964590810755716568643364840307879983400203857287989101011632690781
+5802276041061620122710926329386353739806320420710281218622737558209391349689462899753335081329268758815057487656715890733084223
+8915069186666442083922633115688459542249351209368361689010535548757066038294153139851377020698884275592572198938097053313533421
+3618393873597153740469607428584632822338908997205070091595456519416863149036488990139674096344263132753025929808588767591996177
+8414765535715090848046152050822658084473018911692025473276058620384118863100457752482347145023516317250246454398495927754913591
+4409298010504839698734131748484717641239465901635152376312170896985346043211365815426588368753012122770591860188057761705660735
+5937603186684235090583457539320837412342393238618817530913846014346149555309319385019839106489932216877734882102311404478731716
+7896182092904946306296521788524236999972318921384942071102716941043024956484573567729385887708261561271188936395359650621440543
+9381772394748371157597820184835066654518409316544350915121960781236322808659004922335381181699829103134517372303100027463245782
+2615260350961768130102419692323579521155005867350775325462551282112894826272075572040191002407099324856614539494210810480930402
+1838597774381264536500359028476517592435681239463143604712064430411599943084702827260512914320943321785685269655653280527187527
+6303497221483801786682166005068915785511014637493079986822276972242808097676862236960849777047832121671397043713182928176830651
+4198254431094795957177601291882860974299955452519675630067202852553365287181631847719984611318356336562220811004590160639271651
+2089050062014249099555113392986787327862396528284354504971691665000330719435672605372528268724943691397193582081997337212460855
+8717657741330116057938366732697730717547522872552360477855457981234742653137379848417305649320084599648948083741462795882532206
+9986804236567371664160082803763334644507241277854017370156980387812678877717978239570818728942909512587707736901227099845780710
+1187012467446764171881903676699687486363209718049359334271085642494010609014855350532206473984262423560106107436149534409159662
+2848539362765385732985316450544140366071147981646641820740677994697597799634870260463776941968992688323272637389950097251845343
+2181340059702615616436136969810778034448257219485660110664564303142589278244498041564775661983269433643752893242421364842071587
+6511475958145031560867412663572535560224504744829799500512261131519166232318015397419472829178929843115481631831351152969869230
+5907563295429072630722334129008428981723806690819380400545768764609783317272102244876794754684900328466037092277858030276039049
+6371121545042724094475375695524854871280733127714683231595927748253222937280791764025222016369882957071507439090065827190758754
+1326490274618829941454831367643360383905788459550667904893538378442057279259437234426288871318674319032806392619399812416955409
+2775275011488829091588325070565060813564196841900611728756018532857865700574781000487644896468359788252916194701281784442869238
+5475404321259151425741175250657761031096608313986258427026901467928877964154516924617882931075782136380173762818340243425882456
+8098506275539721604499982773326806644420333816118778369209316210417120818431663778002427348509174034183157653013145092651819004
+3184928471078890543345386093573923680647427432807794321314997911033358058808825224490515008557540951525337845495688169454435522
+2663993815050031607786993170355950506772886776860845172901406916363156294602197804936561148186445731375733299997098917913770308
+9652206542382536216286608096098963262843138133196068261154952924480494400928138047212132673039123404498669742532274932056703877
+0803886057269071094490544437295692503919136095718722047240291609927251689451657849380414877514143018375735518559305335464120670
+0151936480170888759767939879997438315844081206201757776198680712499035405650084830184555439755477818487911581690050566831394218
+6229367230673286153903588882341483871782570684557378319370079577894075314574849976163949953230620503498800993353619885098682722
+0775734990307483598683533921005381003594918538823910337693583925400749988570440308274068133400598419503446320537735625031687287
+2279164484478563946971740937436182665660391281989609876479617857522997660917074445342075564734477309946731477007826609533166522
+3758123683039815493345731508244661356741376276550143129350958441510802897891765417564525850067802663207435432004216770694226804
+5619370786333060777254420771287566622455383721762137194440628363338996839313233289419808657699323597544032060605130001017679348
+1117350732097568268814555936831091979923626150476679569711035279777989299558634893220687598099570940599334574372587146302188862
+7465078440908857228369280211059007709404158916443923372217270156208307015594931088483508995735817533317081734115339967063512432
+0277551433478001259984748926007853394677528181409165584238991766092184666080139589261333280556946872045412337141801061054086949
+0700754560549557192840941960533883683916477333049889110496053434388836650044089728945956844381845980096615663986249384912038818
+1729833498846421646108320742580046475400334773592611265395391377127688594599285540845684396076777993728243626683212706942573378
+4323511472129830807288869567946309250674678068275114664508496611904796208234885435751853338278854135085398181237686024172180393
+1312943548505486065871582599174831836548648084308970713256187466678464307897110260321658188877464727357499093515658589884692245
+7139584610276191442567513021000360376560327542398104492743671139951823728316211591532169872633220764756742780779371664542606277
+8013300125828426771757381146217871760111879193645766888697436656318066675243280906292568248974540959337990973627561398675008197
+5419373124232954726590126551016645137142696380830673731392642951542537238565961064580394978042654467730915963421765890733361548
+8922925533382884854249653772799918390864697404746308525228860651400300505857310156341812355891928439789989969029099008533806665
+0128219411137135309941467559688405403979836275303036131774092714874831957845954239946311223981403764141665925425006138193699503
+4023035360745761142363755560440975222622652382698883967356728120684964102122995320575139970015373461400690787473496703365503109
+2193654449177213661881030975620088565679413977376323484863510871705861613106991010472484286534395967108522932664799263272973605
+1651932770511765948726250021128129739307128956256839990590743197977037091662728274789578774568077274689428101918180304889077378
+5017924617218629587957879829522315523692604428645809008208520226544692314383658761425382226132125228054011492055441635314272210
+6749666157481037578188762106676697225815856020636806090419991079970372071289788209874954711658011019178097283297120172931963024
+3867624578607959056494862536265389313506274108084087969185322137028561490827818437756426384470803080867883480797295503488443754
+0266755732085811371635896735784706558323514361613693558482118358007540674486152236347627273339110326422500120960164943514979392
+5851591583094022546650594344855608619956936942520965617453776819147723734709318492888126759979035908706037791854416714517089588
+7488779820804386679237327683610073367094612676999550051056279635818725821831859618176236859057491859294403215135785905001415728
+3397867405536078184923760377846341551636533657104459673180071634565287960125731400588939475716477977856211995657191117602660471
+6368419292461966253403926350187375212915416793685707098775001247308325202429711397391995493844090131420300451991006099818565158
+3171884061798508018743336874067220372374917564318502076615548912819919624484325005878069566693150527749974672352053137075239471
+6765298415501192506923578604075674679460732604669110708523132941578157177568853063216936080050749029655642031375231708316371762
+3941656184595817536876952668926168956461631341364895778129612449325569155094729678326528659230305783051788455638170048468709384
+9344704062107618220092102502671070488066523904860951808964071896990152691743696929206393427492236495869384495623953241985933433
+2329954473357680885309244441022618801570174231106127708621760839070677029891079166854592191885991850284207932518637882898896696
+2253197905988134418498970803242763736997197997987724202146481273276883471048373064146605033007993208986500108914474101742235859
+4471673346443282932636516218151183887721959139730007987788845685281052854907139082610271978365656275535187015151917676999391516
+1490454357895502187362105850833658593130025904397280081248261243837433753996643256759896119495710470799362993945917928340275859
+4187480193910225053682324326478852139878506761849860931936128187212907303727615513834095500089467988300420504891523377586019041
+2552835341088538861109696869815032626256269959324139802181242249722241877212898021098564840649196902417063584333206994390607317
+1538928060054617317449920025668989345408124114562616395808759769278572186743963855933221653177548947045222630757626854233433755
+5185848360760696218717214816135397052477034052026614446970415328439572221368707488898468973353428786860987024947961924953899839
+2985590716831731870038599668250152561736463733069492744631154471689685148003517537536069537952391933185169671069870236035572482
+0858819385615354860719000425698572982937868475649379251912477519089804489107469755432874178918458772943168929318750385686530082
+4333886362870957848081259613648289163828064171655224322239708870842553708643760011978783227657321411272976905508646641961780912
+2833169683733846355069467452629978104797868384861004576520122658047677739451418977045812632716306848990938028931383957425588061
+6045777379942977654526927417023844498064089452756699867598470436037381168815462649457696613017471951809000988548875034178737874
+9160331824383077463591927113486291567227954453778702317129507491730495740733772073822607464672707613182092741352901404225499494
+2171629178354382148962537134449119312001738349076684871759101972177169632459401670960405086152157843086489006781537667287047896
+5465718260392150704046827088996611582230320415786650066647900151553492798388495126103785840394545507668150495076747239741124643
+1419544523318047856148530079232229449051190304992694484547233964026124081035121194889038106213961089629592355710172833338936041
+5735074574334557161220421706612819925561806730824425800383474349667304718298810588448596848386045836391940535442755152772209476
+4477743831927353467775816826229193246462805293097367869721250682503407993182691455177890744118461259199550137591872314970843570
+9614009267031215091375702771630372739884751484563943485109876681877458872527820916316860531787616767154557713108421464243252888
+5725244451595751926785755645396186934606833650722629688279447836080615920686865486122499155337740847620671316549690747377719416
+9886724243384291436035548475563689452903302006875551792856774087989888845839795026561561511158603968657727537570783565987096483
+4338269257625836943750609173139824275314999458619895874921046346622761766613817248643045610302260828228899586867769128173831852
+1927251435241586742325643335703829021262110618516121300640702167056777723519853174450793473043913595814696522118527504244796457
+3599578411448167894106533981801012494310659214850381649569414007781396645447499689729938374104814729448345077680781325687345087
+6129529633831819171439689515282408943585760656344118595138870514119273973014358876594274788901442968142994742135926265337385656
+2522744449484255252321589542733596606602045925005526885282459116039248444399754430448309551058351839870771919853241700908753171
+8095397674156020153025647112643503525783203561945051043117484225509753196255050991995918313572389826508756030729780202503607157
+0514732746209410237098921106270758705122238404358107693018072790601247661147289735400790334022315641411924147791473123654604067
+2183481353624169330708810250088442996270202852800382852132922090252387617856118236197486397057001588957700864557493511482566082
+0159554686938426672550427425422201760923684567404107605954807954862252513544057244716697622930133085009155635119267747535809775
+1603870374074406842079458547774759610733574985005768921583657069449807861035511349884403260777475545081121567326386609338253275
+2866478551802452645398860404273568244013340206033503958336009745540839717584645607628126532817660071722429335530485083943886111
+4372806755879104949087031501622642625790498233747556727536449464577828956704936323795941826197457122033168971930280473743209480
+3510521745467987614604622504324811929598409501462197588604391588467606320835512728358214802216357643065451820237801293132895101
+8869176817884529359989957422435201680723727230870849702923220814297956988224073755455624237386035731957272496882413670632312027
+4987041709615070926110617696999725204352784063869478762637421619822949085893727644701242995534552198616152209092394050930669848
+7400973738218421741284556096408600962957422728138542260382229658265717929340410249216494966480842797114656043729408022372140555
+5357622280419421430680077268491817179160449030679507850055675685514803114136633487732178706581280425610186327901499849008080553
+2063614935667238312237638365326101007587181929899519898020565403780654677915752203035463564958973934599571280127628650025231204
+7510339610097271890758575355760181313472729121504677949019841665976993380277166759244310422659174282752504901557558455360101043
+6704624590746564335785852066839780043541376118703961641315331313655337920280405840841448353766789935381787637277026193365826955
+5718584531080420228299782199614112550723022759714938401551695221278973774269123526563402857239118115571007974128747966574892058
+7406616537246908705363274038771943716880888382315653131428051669734785136535017075892856676521312977758275400592055721561155447
+8191030503034523458658590430731690106155340044400945735308786298326190302983231623869556707507267012762969572969229893222326020
+2781627756283482808592633115010135954787388098836449433663074354764942592857302479394320001436105974173300167981736974256889069
+0749889909665269146510382674032370824445149525831032970035921874308716508078712017288693000420564774687445800320014347768102977
+9500582955080504298493442003839451470653349230762999448413032412395803444854529134420395637374428892260393652466859653474793248
+5578683404816116099839255848388989533623282136956100112356341602163894219640627502458957004434668830525937659394378712613593339
+1328818081682559186294868249152029912791110338139114004470380993085670292745974492137182403037306610656137695392960137614180452
+9752978688889728250401766859342517990190156836045937377483717028864519242478723992053825465496992411244434140736698055778811865
+5764034558119091657996034001136138512460220698471156208113839665880299241195462026376651406117658603193270831455055313097779290
+8887190533917978952783942478895262358255953083684956216049958401478271139454139129915935858174062762845986202401574727546757519
+9965112384492455902741039666831644918325589401840520355227650968749201419553213336728867559952057316374095495633674649247673155
+6547477349678905420240149432846633096396537735337479158019850832661246628844505249719392841713290257003652108726047676880419068
+4709595063724483081528398865202332209399887790016225322294096330311019868576291990108551198704968033034014495019187100300731545
+3677983555491782274707240632393630038558613476413675438434221141668472183743225033730344641440692723378405837243484642959062746
+5604991163272359834040422515862505640037839519050818603112192411600677144216422234215431187611787844494127075718764452791848799
+4854476179924301594123281798645361490338402536310431288082224776520403651635476604940174850365038818289755315902382966023203577
+0810744335357702561567797304986145218660883831691187353402861163846458499952189536879044115452318681728624510324860015033788398
+3979771283995380891938289539381044182171976827997056764348788204187193621090041996206584024348644400402675325221299998818648561
+8560553235856018013965529605400965645682933039991913219712272084018424710938107420465401522172404020985846364794336906931979136
+4463662321945447989909156167276620401617659159053053338198477063314745749076987397606793494767276193523264007206178167936213596
+6945045570777520341473278974105523918485559285787445842507870137014286454851350178004328369233461521852484045058748849569462881
+7175394733133381132769602280613000317015438488548919976504824538838731947546613872200764083627777984989422833194236427886436510
+6841401583932488101726607361270514543381198032082148492961394207816779730163687527133913837138426969504533356370971942113680465
+7438297763442758000905394998453798098283316097089007654200747461809281986645383560583766595972712154827834692097585224878349332
+9365726487547590990433290508632050107564671461069290060500347861396555664994103630437491491318643117772003180597703910105848664
+6611643426610581687045714856705413399193072506247927181637882082436528718891021527134176567154185837899481317325358321239700678
+1557904502034099580005949862058754523860889792700842593217321816597173581797908357156234792521428404814333336278006477527454771
+5551300020237036342120897324580866490216118116991149735001002790662102209629270626643498774459628186650438561401066616780089887
+6490963755355736580386978526346909059361347064280111211229508805478817906115930155049278075845715671257641653870466615953910939
+5214778972551839841667874021257601195235129654518890488743898996335333591775608284908553206841411120044347642321931257964395096
+5963500480745033263837415489981452116756935833729630104233601643805643301868453891208377454731826714298746739883158478178624208
+8078825488224820778954240186836158374373671746556003072588357835036884385547573916766540198508057742745190671930027702184464479
+7807519854130748159210155879811678899722270728200599689770154189194726372412310007746266228667023082290285051427818296004435318
+8849779730758648974379073101178990211676693852201291929217145528640734853429497077571161674011066495817276757324157483849716817
+3827352998411927949530005101476246283441759897176637008058185334546170312583858564041585383266413483217734023667361663656510262
+4989459887640993845875939547459055523785574975836774839383442442772727790780196274204446558595371067248953971633261788681833422
+1430260652446882399259326117845029992780579944482914613560754920430392419419801174119306529200876322246749783122971752437529985
+1073402550916699040362018956704245437401832452382196705545206547444352132288265525961915924743830388330363555452775455714221746
+1446616034452999060536906307198084433181209978784238878045014349105221877679941993115397416711191417693894301857690745032510836
+2955390019036983033546377278387952218996955027373523655965784118029086980123579985775681000785897246210289721704232358897262443
+1116899333926038276430989136011993311064835969966384464160468735201645112827713375177166600414004561963808951457633980244174631
+3365167597668328545027411315066184915713562624842225290359331084124729347322094220584503855828183282959730835678676639554531692
+3703132630286521554741077336255711977522731641435705473997030102644612053700886241315456330580773390018414386585814426113751822
+9217494111509421272989272558690493322060649433443466464859990829891612802636240902558280843106767641519024486333577210250455758
+1991150751561946927232491146002439007601543254992434751580119323409611022604175456900099304707614992483865118197257172247468485
+4718289269042762658615396540607439436267108037664826892947523927247548349191063673761417193077849996352799507438421286155035753
+3670003174685490297784963434080516316824119943018705327982929605778412196093833118187456471893403114829335230172542023511761918
+3530299462397538994353624879221057016014513591355266971800473995195599575301873296387357918288523036075230002667564181209941862
+5652465756063919538830640228613516853681348031923008502389424015416629283480087157633179737963541694567718976270634283296698772
+0628398273786061322495772855081114777882254155541640367813109541283460927308493462443462004237680494256941289350455650052190389
+6530923425528750248516830645859529161548508001636146477492907827739674571658452569696309864671893300056851989854105052764500328
+6377838408857911124605696723808145124469491655188029699697020610066790779133275460162800601521823852930699312176096876169139587
+0939964825101402137367079294180090650010316165686145129739428563266232844352675969324123159076365905057635263730951535508592474
+1811804823447992196520518580949056544426238843325335935996032408627339563545875884333166832898448807558706376176980463476019811
+1853671195949445539340843650229575714750539986544526174232405759132358558190475375028485355385394868549681406717987759935904458
+0905656451763972780540932190579104438556329939472118207647554428546869843074735432587357981463196272333295652269129883611649971
+8081235587163561191593283995607470950948702816215035438010567011848029435878836700192088876498542980088266248768136664360732349
+9048395346539903256416069243232533610069691095414640231288922049229368354092313481960519237230458713935632653201847905841902926
+3586899375981532151071970206889742452371614510846757239619094223086588901204291404135214382914427118575565088049023826713070734
+2259183814776114935570816268571424671175423119794189492522671432476564901966405647187984087627618260356094922535155595764746633
+8775939779211866982932257974707044029673787248018990390269181484731175023868082868637570701885688930003111950730117366747034776
+7292037040878433775921745075599110933471784681597260046655966261287697859339714368407310137037826533774841074326027111292219013
+0255740507228750627788675142293353045696200562639503837065555027761345191438643278181859657112500994447007605647817675710357329
+2976075331061106900800437561657304517961915727589721564040507512613786451696450429048216474153539650176719572123959448008900012
+3408433706045747990792868143612079234278596536479367304972783738238238625919742682436942402201332632706821698633101418726786131
+8375660756604324838036937822438189146692980841058943655646096987446498055875487503182581651007976496878268593478897138465125407
+0302161625788138941756180586844882835162635784547013096553214201480525116709804815394793585124634598219195269074280104207728072
+4667838900407600665351205946634451166183916253892825653381319301710998507256107777186848085957403008238368100522944303632213848
+0568234978451633682200113830676859774853569376506354250671989943595147694543341125278943952146653132296950198184251693558754266
+0837997184654618266464229835853893240382511414642926848175904359357425914225875122515607126936089890130506925127703951001817058
+7698607971927804322206607636649779969047920064098738740542516881736563449825854806194526365935192809082449412467250570813092077
+7597321887811111154968364298503454292989382990719881362442172931187037500402048057328677657705369081382090672410230632333022578
+5702691344767100466202486216169170905325756285673048601355109036801723677816257513289352210067825399512675664902709627155754391
+9534899164623786842509061739505443727104012615679366121874758009252764781464695793453679090140639672566086270483355150124722338
+3629599380125790239429932208245186801604452556987851483665390481177058173633973798236252529147955843797090679456499291551397899
+1654839141753372209578242837530384383897899016697607163271741042796206564645006293555562819243718356635356102675076651792712069
+0330578183767799422174048823749345411130436371482070584047136107077445803065143356378310883097325525812461948426463818958359831
+0535837083229949247061916351323305805073161284351843348700635104127671026579915150619625693973299904452300157134992421628495782
+9135533592025422741289488252334208635046166354163256661447685205945401888767478319569656787569357811074256962118550453119004362
+9301751134736346294356523345255306657038167822211402293117443464784840025659169376501953957672727051530179579688902595680131766
+2105969846665539329882900056874716520798786759023512793122449365556804018453805656203040461898429839786920406056455733868681013
+8994359707951012841246179634189829024194191300675090705148350390247850109295388787831386650321294752877084504137894482370739618
+9241947230769626839032573755018849701961689378840022528468670515360403514925600595045782712624516468191893178057825723173315417
+0398704518600034083166938112120280977963993296425790225059839016038745051472686938943167918298644018861694001602670324180907739
+2829253174521666979009820015551029220993105373115142695444414232286946938928961493390386858301002697320226848958500348592987936
+4933376341875898717948810316592654389756790528913140902980810511129982071300880573916140408222881362220907631175682400695211957
+2728405831786952505365442116971677026094675638127255014104635321119617454191227198408175192550442007477181962648595382032863011
+3335513609023390087365324523236604049358730860336918649941016742564809500323096143070248679219333226141951672644858949079743290
+2564143013685722767288600853878709769356311565059463598251742499173323941411533573854915762183775988798690410191696639340413240
+0493448733483595346076056156947860868081377709049727106924154044343435604871736849228001533150906569243527614792377672885378205
+5757247991130415486385859064419869200094851432494013487858837812428585929428086640566084149796652609672519627454844564932256297
+4669558478660881121021903646645372020041434507907448258764267056511994202274610206718051374682457426295364768694292186976277202
+1564360996091464350826834839280932166253903015206256531264131271209638480781609315412345487344374301996139188255108960560840234
+9176534815648639973257109408451729832095062649822000160147163265683826755303899059727567592934572490764864402347275743547218198
+1866055495605517210298107031806201932208987305284317169767415130763125409722583393741250961695800822861253047933789380082578910
+7563809612558319699283127796207634523042191451596228205984495682290513031662522019531400901314878626864267750108819514332947951
+6013217317646435086018804719571761416592333129643806900438788455325630320446510012694647580590342912656641492584092556696246675
+0844610636935384963725961540456988648961187114742364338486232200258126457044861826644153851981432318719173242496404738484829592
+3080829363782082227074488901159023270312983944302028828324523976099006110195688729810726298266450333348633619065288392022236229
+8005690472921247866581261895577036104640057531331680489329654614207889686295106419176764455962025382611644995861348654828098933
+8502321967575148172006469677676125932579572402208147927471694132908710196626265784804209764246638587086749717612279459712731943
+8253507041283227562754413288994720899007749153170225893148651683553291625294974124954074490050789574119491844797138467527966227
+0130509196073119104402816135401821552059355465255575401457469499625193746950815086568670490180348072693785487568778765124602003
+0665248124119376664057125582265850335568981888916788294854156077917276025925880496268355143677289608433935345978812154208855268
+8995137970182597573167629723687168196388018417038021858197249313810312106750976993518701591284371821222304917627037046364482239
+3380163047424234535936046961259910243886634603953810906816744443879125914109276466757734603864050055610106148478096732039481501
+0050863632424997195774488430947153709833716798293363139764056905080948883372556055175360309201107604690863026027029304809129018
+3159045522676282622055741762907017038764983291766901157880220174438440331565498671114637842462602216932285417970008975756029800
+3552237063449291059014349162828946704972597219745549772402644156576458713144836954411568696563098211658803621586740322438123527
+8553792749167921622407818214329886287689794104816641507269131593430918574387850051670847355476478466155909359159406347347073422
+4529077230987714405406119382703861571668341576429308147647968381984164008665288474312273798880569173169482210427510225857144151
+6873466267196323702969428729542596817149488353193513581368049814798979078196465830515246880993440065883452528995023407220294628
+3423764900702625807926494346022071251875105005653050523263476206366063134157656968651581937910705560688575444683225925304492434
+2952113637739291573792177591055762311484591345740602655920022962868733639951191003783483933798477891209504511076833970415208477
+5918285063915228730571970492875778946493408022023485280196322884176264848374770469091671934052402742006902024842930375953314997
+0188283754328437589051211543538670804314085522712102214064193375644277314824255259794129098802312806481056628400349306174297818
+7400374465412082001463306963438819366261869661341067811137716763449961651069723995940239925017934226230532596999220744932707685
+6210672490680638537370704393760193333970297977253365672997212980801329671424210333810500664050546692669173806880821364438329547
+0441850655848799432631375117017035628999017015487913470494267041654835295714453029034648907258088418618148803149605119491595378
+0667709470097778550996561398901373747557627918533058120957567808028277879620594852014529739234370013800886373620787541449928329
+3125515897530266841998191196333295200100578758020333846745697177799969213733901430202219148194889600422499239512275441137216920
+5650415027342249979224454839045392096843643602822206652387425455763721764312986203030589819856297909492941454232871627676382600
+9334860923952422719693805188600329744718934283065130982713900165662458916981874159673444880197331666542991521443060535788337790
+2260464469972488038180467803562022523783671731570132720326212442908194344858555602668263231905684505806559421525279834670049624
+7792295078720351079690690721334629651981883246931635344717773193932081371713539221551527543695110154112122644215377568071412160
+9195473483543180179899660415512485164196998646076213127620507751563271324222304453084630241541418631528227182134165081602418516
+6107199131518105376224811112336028754695240510430182476876463353393744511821873843541677824666782764783493452855094114804483949
+4681701662176678506643507046144062278379351438997367570137464357422720669913574736380880061893275748247043675527436431955366100
+7149553832033242764660394022295041894654956152213899886346680985491273200086975419330405272293533518246991447255727068177450390
+3655198436587622677364860349928319378663047397528676907239140945275682820405657108502041392682979560846597921188888907265931036
+6476533442276806500783053564071177712515831376234094631885310570178318133342242810813665266902989059805523937906419013727894188
+5431372487274298724777517697230193875880937677668764659986523658830811826735084723524757461022654674192380627828684371745612348
+3820846618376083469895407196241963862417850743410179248545973893510278183277393709562656195366243761330452232662018800107769440
+2069720833072682115347026542393190511365870201586051736004598121210837565385863777323843786272509797134422300430192141780468920
+0442031082909423594641218252063553777303614020588281829250848330051744891712248697144729676289337492695365177253047051776547762
+7268639820077382077506959745238922291525171731315329144119549984484846531136030620064784882237444115815092112452964098100945835
+9872606636855509027099907122315750101939814965155251567403611737103452272009598076995597635176083234788901670535978209531433759
+1085327638195333244518594079295886331726523118261222009427508754702667381643585015276186491128806622593525832828640622269002176
+8000558812466886549021793247340135947691306446427709528028498200426365682563584527832696795214569479985794618339152398807896264
+6187988847312530289136504030984674599402925257102785831329312431749794271223626066515601194350356075536808657593446997124519277
+8221593778261506773470868068030158332034878924556789236087379527748372902142937754401272228850387450354124993708739623158789162
+0522225048132576688432285718958345124544338046135042578516691967468794904627442698787375554323557096004260191198734997094093259
+2462493092358156921232365706546429643442698260566011347797207644508552329524610339812245114706710736520675636593241151933904714
+8168806409481440220552654041925492552985114821706878419857282323004033916474011864732600044228285384350058041710798941857144196
+8456183927145192331984325229219292792322346278563254801756089348717336352552507588302857665733398806159165657708323657950532344
+7959027432654889449179694030583164431534165468437531025326379868797173494533488353046359898220027884040904102921916878818230634
+1572671474039612214962772842653777925720919829404267236601529791378862012346769450214240286963754895280462160430824808649254296
+2713235643749557564532205594282964657763877791499599519104896455051738725475670902079776954156280521778944415643098383791627273
+6105964254598123007279257593697900824845572590247120355844905046052760198392683039070579501029336629655707492386250995234644336
+2615762358163929247483738668566291188631481608731204506773561888479176007728316484171079619334578564058039995926257045933155309
+9915284962226636771930258072321745421222389817234966851925987744510291810977458517680205953227386190750476782698954854970577352
+5673578687374046860672064496277781044455548859373704110716891640260365042726694184132711815871762240294031220477588483951772686
+8668728817231201425334885333412781573848400038328099971193361147160493544335456580227648349461318031327984792185171580102807503
+0169567182553246331404084202997183149669206523460201655479386533242862563036582654644409484005992680312894606697548079677284436
+2408634459821807360135371085559754639951676453609356475891807606645289547821918227592956096670383760258316085039325249167270345
+0639753426126492725051857242781368140995333223012553263382165242568922620303770347983405643905206504900791961601071942284936427
+0871588895354801816598052309754202243843057099627863238724184518284044817748295192358320828895054008513930794283973928514112196
+9798654324310664456635488952439998180995428408476235283937134417681364575355417817510233366035067348678178856527757300827180944
+0038123007290989063863175985592778519488056333171045377703085872568160778246582018586168915869948568385646644298618780983546355
+7869384600764512734048062223566504717806018441987433044570169614606144975153300488119826197625737171672582011169222743563965980
+6977293818241046999651425289984525444775996710580402650890897413638457082477468109575400763448366802872239506128418904706794072
+5799904603862986594106662322483455329279349540532965537255861860553280872874108710364305979053889159756036410545175996560632213
+1905113425852351684154357685504469533745516493501062212340862826870385326709406031686063551224557399310052952422838419329227931
+7546871961833002037605725905779115533289685288706841277287949763530450546184456445185142124516259820881277398739985868903009290
+5390552777664596373149764240028438950449670876087502765011571015373476441820757391918243018050536384628502031771242890575429423
+5602898175403670523511959645093602460733826479169195731008780332981500631244059144423791577718260284080812356359230721779826632
+0282070388225563293057775488479437333861437827295440192975141284220068554470734762243654683900921775316128776798676828649464561
+7044919729960370651911034098935618095727733916533962937362197410606374931103363062973825850629444853848346339446960413652519614
+7923852433886365419446901963455158024361204561948757781294971510735411634498000899993250692952771388573089449720039510778006556
+6448339128502198442312788117252393804187619178631365039260121533649897690132658417974431016238776431953884429473283621621760928
+4796673454480093007496675559950785558242785307210144883418877108437084521237518409035829359990440607609053004656855467826840969
+2539967222010309449705096804270772495367746726394308555148839954759386392982542739753442093370829925036983594533194718249508227
+5349079635800249074525176724894658939051245265345143033311987922668779171808073614407324686649849960572890952798590407394876104
+8881074380416317599148271017700792806364855765066986663556628051754736630602571628284291106232498605571402693983906331712030753
+9874937506608818776772074340810498838067037288381814044995123846119534641571274807743575095446827709625774292925956993651483030
+1351712538266765203986454072646816009684736475838189392745470191271779327758375268068178391759551780428792430541942252314370156
+8407859484892460620078868667802179357348492180685724246644370230014476781983275135684947107880402240406891839259873980451085903
+4906163533191850256268583682454988749837419823578079473319346296433799092047235338380155019552271132115175763259341940167374009
+0058465924482070913500147064727037054124622100326796664614046484792704959337155884709332716325316023891570424872580884952438266
+2436800291590505288180953642913700972896437288014085488105811040747638787748114199225450616098949678241069300416404785919318926
+1934599170792002326313718708164205938810092585230289681773510059324899654472028348104884160918328871998687720554532160558923223
+2833310668093246151983045850009608661418327316614685260920047242208439507520352050936476946684777115573214252016051709311522733
+5806306154432125296361988853844471579270461201267503074861984238054921903008010783021332277527690547871326604862832931571535476
+6953887201338700880983597387777946758689636635028887005208234910693065403037992011989492126099118102129494636864406808581750418
+8449828487903174265578895543349223421139970247142747092518020699819810023484608128979286359504168816826179123882092074937458466
+8429190917143583035383484835202769619898592015997875633392860989349020465819040052129531463007708159553740489427112502433350259
+0015541288911157030703391088218525575081861192862772160417721389983310098584001488671913042391958271599517521875772879817883670
+8715721723667422477987285388090627370795114420296274720333968016528373376502351404697409435351445641183117232448408900877983999
+8085119600169893659072473239891529571989304915800525658372770589231187553832358134049724486998092398100951195327740893124363904
+6825971614998820258858203237294363381385260403003703481866209020749805588161211696398124406863222077112906818160524737133236376
+4791287439396340287050946270382309108183116290058907007033269789030152170762597022242414148156450382489069745048352057183456698
+7699407910303700018163871163387977417734630895740976320842794125644044206230844211892365927545147294624099819954065586859396532
+3131672188768311610064467750350104984282723151135474654890501043106825950749943883966630006426594607652504022624213316206819824
+2381097970942205624530028578508606408894416081148567879895026246182144217645044116693226312513033539646866882479709987958089969
+8906558060289356651604127285059333055318644242901255378341192868378040612451560944688746385088366187655524363293058496259834503
+6045783943499511329380195312503328218913377235931966010737751685331040259612353101709972563764048165640905281453608759750462107
+2697778235378791219808122722229257971170129904297461026446932149333464400232434190909889478146390656698937276924878791295257123
+2803907707992452534631676946969649948134841465957319668276815925648168701088565169944440306293458637327427324437179025248962792
+4731713616143649458304003973798123909714421863335575637937266819992047643342146589405067966192841049385855050988705354679370809
+5372002945727744156997261317197525282324231196500161732336217784763019914950265863384886596392669097800628799874734609235337063
+0503789478310331174915570738552836640716185310681333898360502850585012405514745303614418697185463616197057663173866523087604838
+0675037169916204490298120588020089851962810662807481941976840354009840553886735946987601156791667665686995459100468477453975696
+6834794049663185275577105102245452812771387897018848470724588835525127031721746222497385677737902506111966509521044773531500357
+5329174285407427305661763207997349560549428910454568831186538339414510256938492615597532037011523362904523476314189986503671291
+2718934812220309630578226399896956440076865897466517017205703733213982937662658920267819470286608114781834913036578565065677437
+0292082835411024840424424503720769844545589088751119682651139453690649901159394940442554457210310520610468908232856172200322893
+2168944494860484191151489757452268440986053558799687398611861491809004454116677153114993411395893222172780575772632409234094898
+0022046237220608888434835342573839194475118566063006131560443847533169495969846042538404623478526559762435571079702487933385421
+2451919192203771937523596048769324041291130793137730493766482430142235410357050813575163787479425148259744336129889104511577631
+4142550759732390528563707063152034344178846568888223418447224601319163578533878251799463243956174732623278426810354689051255154
+3970640202120158350260730117870456696154229567633606514596475612129033212370234978048801831781364493706668262862093481931515716
+6561924140099494620364526936808552193114041143469574838371934269300545161105733392695711211423415123016324534422409169998476243
+2456534483029530345127697481939835893243537886692901492470290039455511175154304300500928667293566968811328935461117311498383274
+7770989718625939764088550940976599710169478296655836026852130278698487150688281647540447530622442916288092929799874814879443957
+9848763764198437026743206591847265528425238321090574928951078930719540533808196681934811602035009442951951047723353414154858302
+5787946077159159168774450433330444862738778849768023490388074911496672265084989382578533753038885946437129868548176233233930301
+8580017107399342108923739552269357825947129658651850931301283981215557531809779053507136238066452267893979878894161383251981836
+9913766525707178278575810543038685579648619267169136094328824697618419625108889858389235878109542078438921757522374605654744287
+4829229647563208502985033637245591132219509835319418276937992741995767258780935271942567981080789563695276467555561800638017448
+1643138233933525491385701115282638884356620775214978523597941747167932566311974729439511528404991306505854174907409034566035713
+6143827997778747391148759316186369744390378766441792907186485522361511087226349625577289271875444080879557771349971812896783921
+8151037464162282243454432112145953184331053916340169687740205103102595400733446898088691425582734935373310066807019088114280263
+8729904943075565576008704186063345542320788733990798433124383054387825974302546390620173375209936756748717665874520884924479185
+9888909645307351789982700065033105216388788398262734159940626037880383673919937047828435841493103609687935677331602519191613414
+8850737384099163846794178899558085730334694261907207404022320796803770107876986360807427894048245601008966306481139963465178636
+9603978263464022093387313902323305847024620528667574592309994157800256182557220046954796119376040712963053063896476690374286989
+3405947975994172973640043088019552492100802303545308377567580689104604977659913539104938989315677959717470803854511462658064563
+3191162645413432233404183050706031855638390349798393321645475424393193065096426473922012746067572812705091078572123464528104522
+5754070330806062132016998542325199869791387417374085617357171312577717425296247007640670351991232446756043415004205160478899347
+1725194535387949369475223998736399458938442651506418282232173272224426998356393475616690357433350683532939697909185050724112276
+1531609961298179460965979011464443408544699180131732903518616680630569852510445519164321486062756903290742218453214665562625462
+4277461038526097907874522581743597670466704734455633690080575913829222964025366450929288253518473640288917518499198469245997685
+7420143434734074307744766434941598412413533864920547945213441905542326713457623437002740516606230037868321117285609425877483514
+5509703411252690324400121230820675240247540075031296148576782911392574907974824839505516956261324207298130826703943230789524466
+6235427271350178310739006810179034776823843871399578101065895786301705049659021548642844679899589499916930305008178597329009228
+8708376738514576473422684695199014327164139367786002985515660277291737951903297112627302613852418677997201436504553518932602363
+9576506417537859055584148204389221076679317163739081159093922729562344633399336320523856409926599959155324451664857304036979342
+7821519375657055506931717396389844553686714012907465431386872822303418480617283652851337727643122589592938283893016029851450741
+4046931470136635022512650864971382510668763279223722442081085741561189482186827034926915081819290103926309450155161557982601266
+4715454308438516658794722092196206636934007267582801367477453071665674490724227142539801920570519231994847446963269786268119916
+9168041401535492095223153393392138627537574429611826175866774713151956729343684934892542983754029148830727112711391973335239513
+6515970901191127073416539618442535739664555006336299291335206114647465786032988393861387837528101930282563813184667131516357399
+6965025115159934457674823672748261872585621777883115554117585206762204650484234255271173958058407125541367807442514328611570278
+4831064230665616198380860322957982656881003885916660535633639193463684058409926839010861838915803748651536627056017889319571392
+2850377483892889368048618651662404196455568541580082178826055899571765132140934322132515590245447090853398672580050380575567268
+3835035801788676880902622563977805200108581423258706942731469718506605351522050771195525463348620059942550507473397926975656075
+8170641249931936194409801838731827726032358290235160889838261562910412201128942409820711534658779929527668900047257962358847821
+3914141889006189906618830872826326907793134446571712010041037077410013305523598603376182060668984447359850821728080727595426748
+0524288363005399115153078597028593878897064055724890623451683531614421839812503951731500983120346087995189240459208148107096125
+4155453406508028056687037448768955586471685200246991147018630064209861444093780513311415335160348800209398873165630411940689888
+6507947702834259046810555837139361937816955993601288388902706347465220128545880169696095175041923698015462911423095653174399855
+3762547022058799188111929405215622052455625552628888943381861262479627747983891009023031983537685246888772136743333720092806316
+1214549690057757944760791464294073960482795674578197576015074847454616235022841464586043262062684847644609779311315421146732973
+8541338437296411555067873828147460205050118794445175546707442427376724688646895066999337376018755680130878200128406968859847082
+9053903102817499105181101245913670467308052365562812081988351351621302283720868904030918069105268441314194378171102376175885834
+7390879175657202991792721024454048282348887367327525251428650799473344325817058656761335824140200255463527106801978883972849023
+9114858631082305511415208423205161099795092979957887353079774012813446208145355233313207283275642795951235302177270570702859527
+9437270466650300884205636449007422609778006468400075137707364599220020468818147412256802671321760977139033664343323597425197602
+0302618076580610803854795974063518981909366239035024103586093127902225268380234904318024257226627138837362185766291678782029207
+3947830739969480621126671162942463986987058328256455824368521897685045168203062702288692030759860685197940546125045250168790201
+0514803654436570370324022741742361761085767189089724981006110323674867393784988265456553747645514420643289677440464150052019123
+5223236088122199447858422156052424410894574207990368063564291905403412016110145065374098953504598451976662453874666981008325424
+8373293703798267046749026333095880042002196112554036817370313956674653924174972808775910245525212215059736970917924397257890308
+2688275927997288192485396746573266295779844438202521819272050705543165472702597009969819708658965256689368204413111379773538064
+5084094239742086467203807611090720704742678798346329233433650521401666169943202745736920597870661200400002701183019652790391816
+9022357095836768187469229301323281507939417769215045474272231522798590708421786910823915726035891376298601448255283206715063088
+7293988737791411397897393109492140546674166871313197493347838700746175919251207836436115320719048184023218823514733017767389387
+7188783211699643174822974868235729901402276203893157987109644622416046761772620967723823455916506713613144614196470266830456333
+3793370001173936142455344055973062003252783611956485218268240522116090384604646513391487197827194186399975132117817107687082668
+3534299426891086746037016872943029880008565862091417500370811850667508670706496943938696062708498042156433801209832903518387378
+3612904603444715041436728628573199366360323396870491816934924984624193337784171063290043144432026274325167439913901462851257791
+8301153338470277907154944290430893973748596163892611069628643761048471308522954471189690031882490684526895423581669049412645780
+9532276724709021001315582137581907800630208033706211952374871095930264465397182584969831143514075753862615083949416688307055905
+8388236378283440896890187881320950399116639874885181013806820276432717798539692296166413239097562927693580121835296266376329989
+7227163697631743317865706478603326970676879690725149096075601615664615649563621319796915072035936935656249230727588009066864898
+4030193127531435008439718127581289588778728561167418433131262502679346011703797827534339742404719888498611315489306325294200918
+0822596041854995877122241367357937629640300673554434225279391124715516842541288461765835730255187409409295964047110843143360218
+8020810762143625695211304403500380226297593451193440072241550883222759127723312388393491431821749019440262383840735943032001195
+8318237479489554100626369597427649553987985282444811016365279010859228891440704149689826185729924642137537603090218575037482996
+5366847590778547088514990246112762636619967032116058526965593868078207507263589910269699995373744003756645473632293041062685541
+9610845056170949836472700450287286628803643135098265884778110832410350875689137416100768678349522724998316556986352522714663266
+1503726130267377258411268772164465860231491482249362263232011498460531343555282835085236658598989040170763967052694908347332552
+9494811816089738912922010509947751572303760145536902984045309394480942411502821839970060527331347541450194445987076121267053844
+0578064800062529101700072602908332148334858119123936457716348054959136175842817084891684097218981249238233949488256020176601607
+8655837084859592004656876506460130727405913211331057771278893395802267144808219629460783237220481671207469404413079770236276202
+2474357024202046544233057042050406320202093782109005795759352430295741395906001878748884723478079164300747108788119563090468194
+9729275772864119080887672349769974091030926766697899488139685369926038289554489717497100438993101868557613700320201349470541544
+9690121476368923069792412981332423045488814436625785624017824621004713254286195984412682695459029135822031307061078889173619865
+7378777371791906660635984844468930766958298884404755753328140351948727806677530013266236008432182713748064589578467419387451399
+5958115863312505525587296099572988051567717080297066945899741469832877228284562546192870097158128338501540449059947967484049806
+1525360297576645372782766370344139731393001666478941675207716176663153356185352097531952067180451056483850877049391450796637643
+0957180541118429393622724140553758348088782996643755097821436674434023381251140872906157549968145359578492278555879752671991774
+6216547228847936682579390485586625009476953902113956539812453553726263850745606267922068236416232274799633682965858910518609181
+9364762411101864870815658017284551581396524871993598349274914322101521556813705161096159781789698091708777511072561306773711005
+9372502462001712636254133123395734859574314940832644465721405982847453658518168263698099694805090947049141539874161892364044592
+2081215406680382103751369362572309567943724594570823605875011736925225634106628852644577321897191396835476563249653975626106030
+4349971249994089684132392481061788229278189139063384564147513903173876133019427848009965641301113400947275878225261721625731279
+0221661121010559617008273964451895647239826707650461656354872916410348912631911913485548662828141859786059545072528125011374221
+4423053386826713852263693496635804173362348029571154806846975163821408623542798104298751000786068795017683260714515841078366993
+8161127671355970070573405532186939626037976009760161070135615665381704277318637283166773287886342633146869956929128780714287331
+4724406673554759228867043031026142833731777584308969100843251135369865682593955020981079390823701606661557011686336153922127671
+6320174341401698137531688064847461308245007114188039688579142931690284251799997677320348583442367762054912291140917964811725137
+8202757825011219494192886746445679726841310275929718330630078072572216660349917135633404881654966136524906313940172149175596901
+4973259052196790674213907468121479716985489021755170094314094085515986880378978689367545392713051595516162518064260512413271805
+1589006020451052603264805726624921702203140540281094471735610296632014298925191276086205769087410850492910589262019474771202876
+5301512438781961299615681939122770744864098845659058825055415852695585895078281739508660406939859772275150311279745599614771126
+4288153404604175490400855789649207035885124038840820254085618553577028061229192741635233861987354455133991517534727391845052478
+6258955556704090814031626148938140929500657324155298474719121746871071846048890688770977276676240866370191127535467056926311394
+9986426460698287989606477786579619338308357811140009068302509875335795457387693847614672598016435455104290716649294340111672025
+5987575195605597807571132149058303080863960035941811196802177359118666488648716460574884370433012992324776906424681910784438914
+3212828929093079665577584834614675181147027766122500255332258719353578136517199306847607401381636227698622152320466280962873067
+4298697726297500762842637031315949284066464528353792900058970168170276550530718742305480231641988165044232612666352048235992340
+6528595274852601267138855685497658048124785482783676783853867479073934060681129115971059226209525138395957477851256838662435594
+6333253678417649760854615241319608105505866305579272971991684020242948061790638726814427247631657265086447512599362760504729659
+0050552281101516551597310571530814588813676939570968218933911952205870242379775297989531959401920856446210979962385790387518282
+8767289958783485919140054170755933223361121752964753574235200401049015889601531517259131960751322512615901642287582440268512260
+3451721805339224609531183820195682695971871204396323817335046115539455320833063731322682287797699412707522241064736997253801427
+9838095438421652946093122030638044112929662006537527680294782737078006325003341225082530500978086841673076833294743067222781678
+9343880589742192946487883613246357871516859764774916328816004546765194900049207055237803648799342279688804719689248327413730472
+0721971662815930264205326239766135366858450956630362245585637639859898001993676716328053273905567456704608882800064784850223773
+0571787432542029050900323916790197508546510517976343882254348928206749045986326975042209032481347983325984442399998495068210198
+6252008138898607709468342620809002496223471138515742069863151888069692871096460617937300581107228988473399264367167623204729419
+2797770513682558101443641688720044042871553905410373246365721075390692021825457052959920292945148726156660506042073326859993576
+9943199450035463537495910614331149365062244685626306093678223057245690588586113869249388996930139917906887631260478153521760102
+1950460426985566320913113822097771379876492753786278737646554639417059453209917138732302032256017931681335738155323404263671794
+2838332702415027792861677040542052438018840283865010592299818970494138350530560217854544968425238656792859418734080761867272852
+6010463746369529626569768506440616846423788144981864845682008740038225629815725166282753185272670640607060429451038753678650440
+3603428316928538153550803942955541314085414603075220414550257874931378714081625009020301955524753074400211685480928675879412454
+9843069053870715332522840750526561812419932672015609424516373833579891793837439080150576601064726524016745608185730860593580037
+4790338120349419657809887950279987231778879709683733319593125286240898651454362025515251496405484678061036071464115462928635106
+4812436174990135339020055889098969606774850114068102256726271424987296420443648067709292253692100724695627779636510134753572039
+8737165463831035630144985978697481580718872897801411679391604620458063323095158841009595789901639579062186093555920948550517282
+6684194497843892923374409974962663409557384721186689597945008117535697913915795350771799536776499659499378233933827449930665824
+7081582116471192658574426394048422901610749624872891986363877792779389085331435286663561611309448994925468965045010492951543901
+3680646340800173339218788077063204059241257097481947777145409084202800888856762009180382127277534304230302616826742040805136435
+8971885064485253090204122142512764196490013452340872579790701372873179615012971724582237981895972101835369658929642000295179467
+3378697466160221993719637822345980287088027594206423215053076460092623235649859970956549802453476198188280999027211336510921505
+2652711751748836279015697510746966396333400935969997511167766407036252126460465825405459671454621493581082715193532241502957665
+0853017906034458377960386056517204258262136080721053029202866891152909200067791240221407899628896204792320935757942824137109755
+1860549007099165197284140872678756594535459353075535851412365063078974696027557562375802944288504306767016261985686187927040312
+6976439902255838121317145194266076485068757990450059106045155783172858632535344129113251970702093415466811410640476211193415639
+0223864295074452283847305560600110714424512989818888930888094361164360320952698546375108408821282297940103191521862113682311023
+1062349856533324628662077342594233105268417141054370232872638557841382516201012169119621084906023902818960772903834214834404456
+6774964345965594961633616650657071025352025214474328041017041037485163730502274877992356272868337521422636796698369213270452116
+3863759791559426852045781221052728648632252466126078672480213084512794723010528131976170544126507023866299598547784848361822975
+6029193859923289086357438220756059069241393076481467455226491973473927966812070493726378405565631775752820893408930243604143389
+8322645429369121872596731546622494472770504292226778137537611049076304139170096181584862462563435300455143882748092410271989379
+5326365807733260201580801629433084263428632745627040818781791453399164548163815232430786017320082301681273560908524949863305250
+0127708812120756378948747377847983639315742195284498126386446424753766099623540522826797908737477298768890173160498925727449025
+2938525448223494002554985481215274772014195861665818544594199880542548809977177276693721985173829796357491362226406805154130568
+8969218337326188250536163628581836759650127208671515917790854163363077352794417610106050375787449708519147175922505361662892084
+9818570904194161360123724397774706465600642465735373239577049512865171271762814912171304543676985961805640424586977875904966200
+5504575938770959529220023577243022588499122259144158193746005510614090936240126010183628014128216077152330048541538274583951558
+1040854914239994126791549056393295346381943572230033663200164558894293446713116407420635913349055999596494259230893231105260703
+2206196014061006612340848198814409910794456229071521204012047591463330479752534343609457402515951279901699854399989958952429475
+7726196843265136180636204555752895156585913253117092477574090168474904085406088453119889514918675712220848883891583790692329162
+2932979781809321279966736276684170473868093894960203921581294390763273096543783962941941740885305313552176422059326344349963187
+7716303606885535604492911546074803956458411462697046763121884171908019143640932002882802971285171891988638807617682091180833424
+6415461043036191035529625558425951185907448251833755623616264167570352631169542482639741527208649286390063877760359771911261699
+2470130258381358062929085215957585938262216089039199788226601264737025509814505817029779107756588940453410080897136093992799084
+8707632659399021754985431789449236853018112947892026429638184953314257900880019675773825490255337783864219014358786450842397851
+5533932851049276649253727477601106534672571299541307151668502286973847937896722437084410916259029864044870523541806218077954614
+7765554877085157744714903505492619912731173476480412564678818534684847115861709661320561820994876787782948571629974821128726525
+4958648468242228861341995358858962307381366972784922066788447146487993304134477988625345942386711833780639553271598395688961584
+1195610154724201767373227499183087873970044260009821201260837039944092568903479517438262374212926002997007192595185854104973828
+1619364472726153539242937799692428699593667255284692675884347709702639988899768923848970457805127213116307471608615036594270036
+9983245059851562634241554611084024908123182475839572134087792577459483664336562817481606414919540980247553055009390347181343478
+6678203813070191242843917525205623295811411258351922528980269188922471356248950351834938277372740881478275242174992792567496074
+4143356634732380642139347869145766266914672583108623737574556686979737703412637109328384991661662700191639112734811399558605096
+1208518184191671627470570937029456222980556566946874634805220009038965108642318793927711482497435062563764442708954406150308502
+9023312095876743701169506435873830799968604505754154998579861924311377960500475654542205202570979796896262463835446621504771900
+1307938351217139321342488304983730107947723886674861520928741265078308049241789485663045316829261201640722069914290181463616514
+3662774552959414495906707805907185396346911240417542898771207054497319717662592108767592192807181086654802759806348618578837674
+1314737004679848142363776160351558775692327407524329957179113590512266999745499877585915362625510835561292623778541138597816039
+0237557760056059081432345998516737302912533244471786164779569231630397999149258259824248258872090314272651220971111732309368883
+6627477978424025488072609778273019056422203214910145966781125727030515618065001832071393756745595983343475497495207623260839724
+3342966216908293442342817978848639488604191273604917723840719378411000753792919755939336669416561658839344042868764649850515740
+4843734023345647692176295441180249482639581287413972097837107583698158034620661397371501344888180961705583629809207419852455696
+4443380077789857586353070023335893700728665808003439355680624696628418230215872552816714310195766329481088338871468994321119252
+9699439754749964974015300163681954912050318298048480045612220669380962262620582805353459791375378214164628533298845978013550599
+5105714350835688155081910384711576767489399113130569825483778697383765314872304014753426304269107388256780976698871683305123430
+7876749639965180153007689268468639912304158853044482532644498399416286758021429281245070574658924487014301816203665832428101533
+0785808281226435244861112112960701400035860271883263300268756398080488577467688265527817734331234380039587960227981962626600939
+3364281430281513574894870100381156896475296131097244720576919647275082387947394192830802845871083057512101147458345259973497437
+2352548478260815071941762637203003924467368412816659772061510861905396984310747338352315940227937768901334141297190271981978620
+7421497155149250772882271160825127041610751435166048440557936723442915599683580765855387190581730147042311189334715395286473607
+9469405090355283185848987802133089556363626275612421572132540664555746805117424373802421917096772214790891162942671883468819382
+1589417274385691408452755936967864047060787328586473526198572660582234669906554955441129992972950187613542002387015080229290084
+6570356377915672505761938151404215475617807815543585573009407518371861507851745477702147309937407690084987324419699405440825645
+0612011361559116532371585728822626979903698606786712794256913394582020905043090461211508518273342883931278463866340432838401156
+6760882395086214518227285005993629709889190889508417455761844997600135276044719721514847763212602718036483323892756763864051034
+9188515996754462022639889466629680669832215175040501200558563344456278764716592388326318156786971890684957626542747491478209927
+8987779229113917038185012511339563267826387201889188999106457112243660191988731669456871109523244231764354533555547239773405699
+6489667993193399907320056380302219372587627376810666191791189051092938301013845696380002825207303265588504074647639636023424359
+5972299897263342080767319345606033144822159869746010125714876643532020183420706758750193523599953077555495726481141414611132824
+5084488926501974380578938135730935789462111699625550813110845128956753975680460172778115855586076226024263960948204752675321380
+2481196609759725214010722486828189087368975741750919937794099496934509151874334791821893377695611203497436421390537165843568949
+5731231776297026471145248406339411301301972034255825750883890535679456779763247607668575953175369910078981695492172415999716775
+4579188403021146726016160128342968838235818738719371073259844121400672340573224465598262036627730489472180977859344538916635018
+4072803135751982897056486221080699066662076832459383392956264311706786163956015331215770418998634239350534320417157397046765970
+1201062381226118587752910736476250954770728984407318744902312031409265281863798225473350200683876473994417794886956931818743554
+4970302735301544243501924330552682090042743013078749961722848840311456198559231934700094783625178641374367971636230883796585194
+7528520099930871600504738859526542685454459947737830229008160696355714649737859829804718726706633142812661022345510571151124118
+8421496990755255433515708880870288195255467739826209142506221198099596830401844825962275951060431553735295340571732198670724017
+8936767354220444343191661460546264683941090169583805460925893859976635128662736335459378982086771782291262296836018682528094985
+2091822408378038044344571653062122443897076701230437493508375904957950547708046448886825832044918141237713293307448531246301325
+3809577056439308352524023850120731400555497421961772257434416551729487887916281181723448155709611102047050048200739035199609339
+3691135325949817192195090067443211343266627775946016712851865749742799362777412328641698096396095788341581675313236780103509391
+7728571205866997785438131913054881617576104163904406501238204339704104937888486853321561284077020503299289883355914615218277880
+1111888880906892863133264981628224969781528602979570581183128605546822078255116005933260161155631478832277334536041066268750461
+0079412603436706091984459336642210703864450821510237108480924013766858888811236465849216492858539373276328300134023520401083981
+9032711135936968864615808603415924938529404508326233015998723558019026312135753805702013665081865026922455487474085399902382380
+1925270181168851392094205156290625337733809503843149282248914199479920984244708969137863994130437975788618973591803506088013062
+5670224338144189138135191184201868809626683864671529567267492650290228767102161777058656146469480714765930525720049680179040530
+7230690280352425636146176530879993888167423730080287061127174186402752375468464868170738182852209838339454679149339529988407952
+5792512066685362806154726245973930382853685512688261188341000372263049656702777229779863118583825044769296407053427341340382043
+9064288699746230367766305172967912478546347888349770026780079432939827599619309710342120385387650986045115258506762134679333064
+0440596074705090759141142692292577561658123037036520266673482910698027486128518652316613594364723726387332531338654819095216165
+6586405699035556181676379611570196812319147084489164717015394853295535428378692362698265567241807453037131148384149957093387466
+9613627657031243653069021006489437859522461371334813124213550061172753326963975967858093098270917873153645156857962187738174651
+1136920419639517807349446907609250529925657860858085930986434051082566457439789550530915328824048952555143480521491002977432620
+9723285190605612751574356382595987410097040493290287438645066768564593720132821343589116869402530302205558307160327389977244390
+9364492329019171456987187525681281472110463501074399197748223709921114091308897093844593961700969890959904837552334397994454560
+3052838056301761186571362672662664380662089189821373489289767638693120179754848616628936578638481820222476538767896516701765186
+5650968841999476243265351662185220984505585094177664675790716289996388896832182868460012463094065416068468660526498381293391126
+9133890615055659775962704691788335028541094043193982847019337250184246131745395473435608325229593796115617156815138186553076713
+2129458246410892733861841029801352092648607760367150219892460311630359921628868730343711772190656001417014669173768985351029224
+1665772830534776231474157241609092342166046079774561656411248463883336203142778691223352454530469529359343352214726777533890124
+8331713345182730719576279806483123633260411891324365421657390996528436543606816818186451009421810586108827795803801756029033502
+1364037207944391495829014284717167206349222584053304291053816472070825719135329033244226893785498596526306122826589748158594087
+5166290726387661882217520391175991236803942524737711932725364262567914513184343152964650814367428507369519194246642124353850820
+0827084375654733169383428093676562471650179031999648254047083978351359301318312364388282400723012984805620892215650029052432539
+3941456090006715583530315193770635520541951076921761324088412023106545476103418543330517872032796586561611105128147089091776975
+1738857734263197422168561159954861725900337109733462635773133902960240600973009046170223803445433108730659547191448827977753217
+2930699447354813297267803165810088809944869393780407968089194813574507757841359950100327174854511476594508709317805723583889020
+7143123510044372032973820765560757174132206252079849711539375893206623268969901549499791778646394614259993009419795504303081399
+1805751816651443729216778302694093259724338799262345264750249439983832664270852123252647682716640466581767974713902148881103321
+8726470726559295990593930464431140413396151555993515614244807290113117258035592083195115356107951148992883803789239385817695980
+3921614672869622892796645795274584202330027636891305986908354816884938844639467554178364479042973665199423978535726526806853994
+1879696934764137925030122852767473404168885624623810742903886724883175975872670995314600387454933128918537822599476294544895031
+6035100939350635436051361083289099777664034736094529995818610825799950536521416106176327389907566363175789821848187634785837579
+9000534727303607788183270598866205796784604375642000912263136681354291802540390456321071569535579301082240092546052754082125140
+1036718094258942656960699558474884940333329012199962569808690163604756147670835128428656230386743308384472157735698077816035891
+6071364091704432824311172611510490775020204802190669441798310247002139209451209194509056421614671635249279135552841468497623698
+4388935023201010068076632458613446034376062184128689428896319432854524321580911853120662708261911385263651607882193115809188251
+7169742597495615052582018265793684790742777650121858370707225197495242787747124696863007018741360971574027831332907655096436810
+0422401456149077117264566129183248282220685815602963735110673297177754943137791219212563311879171990788150209340116758159767140
+2965862835354985730344339045722772376955873793360410786309094363480176270871774839639924049136780870709007238189898961666868275
+2861817902533679195525000340605947416733205573982037034681250485524002724047643727596821058644083422061496633576063860945664624
+2693808963859011255454082437160794171986401169181404558686995397058453911479501396355062702756373669284391335723793677898504528
+7653550559325583799147678302921854984957213549656349312970370601725315750255349048113259251600824306253788257181726835044331139
+2669198588461532129599972595504488308041821964826043635029559596161652526633086414778498340817442875389328897830361220046753460
+2464008866849845585427596306460289186014718930150794200485697147420894155928351507966633760981788686260275637265508592186109230
+8485080800308772606343366155948976547130610312843499421865489766584635822710314441085925235277117540126323440360094147819765072
+3284154124684872982729898726330863362356401302174583854830959819131037571458234265917476543549149369136036055331113709805046443
+6448518117737425864310082406263081225358862769781154236900286043306718901307704827192440877547054996291784365092391305036785917
+6937932081779624691771675203207782587255392167526245881985222450132700822827458180664476166098376639952639111122762216172733126
+4351428226863320079499951081487882664115198758192473811033557945313783704183329712942802900894464150489698398293843181571708391
+4008673285830233165375165239225902635382169451174378889470574573298752951780171507430341658864697744996790183195739971709305547
+3512291497844318467447674406573948587271898370849211096489030445902905335005315909627516994616160913716819045790842998532630215
+5522629798725110629827671497041697233370597035945650285606531591280806838835367751631589755667302233305861288279338186531242009
+4038072792258238775154639697267095650759428219766235775721809805667537846787229698544718121429627243715285966487077144477541907
+5934583620628679989854657650575271470278836721346368661646073065566282621355114101575479793022577251192819889432201758294108462
+4480564984351469882094948004921988867959440174254223793056014056869119031094103106976186436427858310194322489736576393894678612
+6908132113303990201784965196474475898344897609537622286517498106001289334026874927830753197509682053509801560482547631691338408
+9319954675495203754314132567507992211027517777636008035159464490278748417535817989110579370702464528694578198640300697978306801
+4761479515872183180982458008106034482409223233605055754850233921649363735633967021409784641062684672780275455212963103609820201
+2564622328254102204752883685136476152747302286902963024211546476863845751873654900973840371931652957066788857238841473470464835
+0397866053032166080589875219701391296400993039583315649582052801128849941725263617220137826074241870851980225112051857130648469
+8173011294494728142605327204039773210726054522101869637370867240485919811250566145341338527471719086407653593120324797075262800
+9276563059829040598662749592867289249306923572562392127787551507493862417784430100714677869547866344355462003505196714057035937
+3281114518664069193538073304543737277406653201799960331850340753228936196208065150992985287938425817855366760648223669372651097
+2101840795886669078503855800666686104431608113029414404488344962534581805317909553125776693807861855300451192405993773968098583
+6961316934095858314386858284332606626453618369372169846037717301254036577518610498824984225850477019844523165578520651885370736
+5674574044356298030636615794164061879134353864364329335297710010416084563498871752753647964277918366926080825456181880254954413
+1539836063070409136278143569348758593204080100329208721008698517483741296128676983168524689365145284941105915339931290444395066
+5870435438526474510831874542069716476806976094126759545431524918894521691790318139213265279009865120135936482961615836310836321
+2764563926650270576320235999861005882574146665848294584476765322933617549606955812826398821817999980232276039438569048353472002
+4681622264311366983045853037646736891614380849223091345272419576321258005567715693518336948951455962926248349277346106557405718
+8956877856487148384136234859130353374642270367915456930125213227196134161996004529594088595345226945903651779962975528996861250
+8929969605933523152819203271238663371252277051363612117118809528465712440154903065164514629518743371367297353604095710696093004
+7157581534746462952501632250334837099070591121491848742704449306300549604064489388204805910975177833999231196480535164260229721
+0485019965651431731437912577838502867419408108382589212055345268265256532718527981331506279373063176342764821347791812231845829
+7209745175723014456091749043194092299024100594164185069424964912279120968460389124726898963864775282217153874785467678332297469
+6065725443439620053836394925815928161931638271242410865193688681337289422879252019985383178533022928491349413174307090957339832
+4700128875271375466912640968373319232662860319940601106545249660353269122104137983304514576260940899048020820371598690778056227
+7730285573414592054013879878236163258148114953801223831916249666510471398921760574945529246282567489263612670937049902168944246
+9130285817898813367964618316152272977147568779205131506356566544347370722993791917334237866531951886887339933938523558239665651
+6324176517408834364349803908520408107012550850560156082064698531696664057881361151779666150135225685603149038329558618588277296
+8952307375129199935262885586527056730554419885668513403462367686079193825971303716999017662160537275706617381132201851911575059
+9097939471326158030329763386527360778246814576714519406324120582675890884898234797792200042538307916074737348191079713801271431
+3543558395840050080153435933135880595590305720081325097084551423268599148459068228435603649060705649929053840511309887473304515
+9764838954490408335606543556024437767253488401288444187782685927977837265995938637882104106333802927203512151240662538609957779
+2886694819124240943375973107339251767858923004989669776842476259662336587537006376705925903350515688363082070599436191295014286
+4373652465925317661858189411340138062597385913063993168012584788091469995881494867908911062927314918797351706279530078724029778
+2064997451678388426343449295809472909654204980492286328038224332702407992526584281413262450071832225709127884717383554674100721
+7539736814358108443787011442956856478411159063433502735600777534624427911961386455371172130290891500709946519469882478498227746
+6726050228227536316385485897543745820479149980410361188284581130022635250330849613983713225572081803265842903422696226592604564
+7194667876267325769087238008916325523655281922437602110657822708321617107090571364990182422106391457560890252879023326941272951
+8084067244599983014933199534424787256031530896533024441147175887371345390886210891424383817784357384520863399170708018540336261
+6756491974545573085147283999623619067108143004190487704098038956692693217789059190015343978239812814528286370354978428552071154
+7449780712548692282752907313327411787266027754878897309843460775599392567392973717717866266635813723308899529146352109375925165
+4589899290541494280337702591008141258629373350544520604291218705671399173981123075630121451176103241759370092474254377359262199
+6674505740657078583031897307527013973936077370107324719073133704686647880878285508608449940595668407790459295575945823755660650
+4398342537751131171214988271811959189579782716426212830903406974442463464257365397952526980356187741927953055943122410685033921
+0094907389935032343867848721405008172219352354700721989014087040463745373039712419507660947640188922848825854691917677041514246
+1508958586684510982818262867790308592204381251380001158886369026776930843982561684403451614590888186936500388011892045824866501
+5793657116945434882250299286723935630635472763043771513002492162136250578168782159984593375232995341440779322489270838200480406
+1528263927376996749090311110890532617677357745138138771708962614857985706783193215918275341078100860497124422089882672715412665
+8047862045380193284671628316345513578527766132655289631199372572297400350940186548315099505461109159626804827405877434015762079
+4497649985437114106619275583585240709212568170308750996103273375973255643809512987167799126855604592582070720993954457629607433
+4115202807426887388976298359856110123402007311986746450130132490988863002251413157990023529650615874660044346489668889392287152
+6927862701563682169262409452072639909156413247108366389659864970583248090206725794860315733927719571533833830245401473668394282
+6642155549542044431836970672852504846515539364245490047433571110732970388069323446548403285359639096781185191635964711812010789
+3758505500262572544806847683378518452890545811878275350915244958015902281380798955282380990829046266914505428380626717794710699
+8543173740869008063671194651581188030729498726094049008714991031352383511909957936902571701241692397622133551499445586152966454
+8558201709766887626106558682087493174247508346751479027758498057382070135663052096489680200478789301589881335174285636803583368
+4021046412548985259286576563116974009718144433360698911802741759233868394233863822972297994024437477811572624976113883122932672
+5381918891212001167216621281602456221735226414991801854696667000136111863626404844152191631832767778925457352443210000412625595
+5545489652781686362831418324972755141214447870296324256972282335912548489681306938005662008761939913552064594595349128397481698
+1089524707879456280414931183450523776892076608328015438392554074880142678157014194242067164456688702421957600153913700978618426
+8305117650117364060258714900356625435051024551440455926273115470939757929013176898347131589373525848240533670222323888613399302
+8471548092796793462446437655496090111004563242834114582368336961549825665258690557364306703617109594457055331363141186121145408
+2838670852038846380823335210551520468349670239701607224866707358833084563155287946007354912983177147283657585469121005219622389
+5789402261399916318681167359698620197070246205566424633235135391148334480479925501535906551354569207810065959398048065712057919
+7261986944279592176600370192037825062903228830667505762121478097517284917101606104242575975523312739096999493662697366954853560
+9155879998783130488358931786153797296783212124287955652349632245457365996542148509944356865191456587886152913113892875578626974
+9514039241881963923397516312505696923391431643577404694192615351139994947842245479233801981061807552927418310904314043203688694
+4614887134561403862531573523675942563015366589167507205886559178959551755768826801165790017789960028672209846259757000436195062
+6712756378314975481834508159845487505561014170818191973740730433116802799842074666829329785272494733308089058087919052323067808
+4343294134478763284253795500389053885558601278822120237277266312668433120502431917455874080753529426382802888951317455320771924
+2376278290758786366787499337556544479743289945243171688237218372051181305516529407353834157305915645651032848895215696121925178
+3277461207520288197080048258823569914990769314412444872094153856107817656040287107340131396038173497845042121242427193089822818
+0292406985223320173089591545488895576256166382750650552107291481212988120961054843360076945546651513119822979777064017606102333
+4155585975612603215642148373485509667928447809166188682093526614287990594479841858693261264552895318696996233565563963262273017
+3435051958110889869116245172555488932493678104217964596210912258968214519860568648927109250277169274770553939366194092044056400
+5580589234840522431968399852060022338678890148720329696753155804394492049184529967776995091977565256891476404577309506725891693
+7335500310521157522656023934693183042792687707804385279531540473816692277059506917018062802407212114266734977379325447178574076
+1771613660964024539818471437377426571013833744798577093945387086328616540439686380471290881092187502982926867793090143460960995
+2854310614938011180157233734163443946405910506035197343508210254223120818772340019254546366421372519708012585990732220553479817
+1257049653581939929259306981138171825335308854774522129783756061113569283775667916315356572397505175426434698580681752134340583
+0335808023777690523056395860773496290527877864032944037336174082899748170635967157534100283308552217210895819668943595660390141
+0793041940236886441234025927232106929006722186357450970274155143635586525537995503752589941375247670685666954666533793877981889
+5778831921482018016340449172209749049865029154730502990831586948434948616688177219302113345681124510479338999307531273610240254
+0006855309162866716967524960032543880915882390415328777432560766307982993890466192334347172872288555702927609941028091228916549
+7852480060739012387300892561223523799609034777867042713542472004721462831725545348869852796577495340595446292276187383478785958
+7959977096587753530877434044450370650017598273016702141156049535064683872702373865885204993323178473693440316927580843350832264
+5711255434828429627433858416873855046302807982520306738509536092504233877047237492422270856933123651986965389822895956478482440
+6861826464075028721520622101929991628946998804166738863536077306024363695385475918930843524639833318710346078946645157384213109
+3481268732060383732986016495680958177849607099558634081654518008026716403239770966732475944721762791451888118885285069414233963
+8027947110287197529845522807009685886470194904262452476975443162530080660974564750582146126181908103247560999247950332233807322
+7124796294345362297022824568300955114164662928041497399401450052218863148267186902693402640989732333727359655944286809966607247
+6673207022195790654496166749745020173181219341922393697843282922354805033819231485054350962234180921218558256719281039871046137
+9465616068877625982160091084356867655695114307535279252535857794074660077470905649500203254845487633889884403918357791957962609
+5439735864176545493786682348080515776951063552894497267405045766639566000474520462761676673185451169867195127044329565448901474
+4077128683528317505947720920671307017612997849640361880751590889728513950754717072470243203246494346250198972938371059265537757
+1744350487793132663117639969909905883135140378094636348689423577493817809958662291757247314354678873465246383300244542531431911
+4940086036767442787655065360411221974038277063722727918083568388107313711402640446340277014461054034344740215045925518041320283
+6681118829208967331321877862087707476476072276521025702668676229506021840555589912885589031283416146794110309804988142636941186
+2405582757418961820523544833021078187732693088350227346014916968640935524755515218365262141583526578487828351593275991676198367
+2826944841325179084380122395615301242526065149184196022148551459509194360014728846066978997793718470140240650758184827065285092
+2993193263125920746329597500608467852384071869621346018318097029329594882972558366328973665134862355812606060309541457130668022
+4276324020092753413044519728088179483413580580809338027992824022071273342649903541028827269643668077697566268171224024282173079
+3298668219738409681902878367215423318085688425654045440812819269643490157963034537370434474347979142141704582114328144364074548
+3331207723416487218945222041751113899922244456772815194220564328760009807415143846017951460454941724943113249362066483407691380
+6952116171208702291147492954583173797003314720166450613568401114973391179929136073418264108322111138297086137222772204563421106
+7600975435069311874768177860666996344740802287521757586619300995824931951698677022696322801985871429773970218124919477206966901
+3780912628061324155929062282119787356103921261553217430966183645130255649596951891774470507549609157651291460007364039518971745
+3378164561008341242097804088752883493567850412617992500593780122329644848355808639540910546811625908951376798420135130564695711
+1010690664052506424047390590878204998037797666671722315517689809912733797153349697357764209138638827429140983606619452818262145
+9300376547277559089699722018353829113301128665766029981150643108015654465357713345760938255089553063389045170395343438086345129
+5388574617722177598048137212627225252667251794017646238607267836072085293351506292982031628145496634572585511875570432312724337
+2949102931084425964911707872142235444671368657598878661624977383342922503912907622387561510392479663939836372865380891249214191
+4125450850629924708967370485579795410196136664949644795471576226816969360966521409006096786481214505471016659590219454123795063
+1052876846080196429866636468392224678653280363636952881423630013978399548705549755495939234226751546533383899311389616571394812
+4742555980388054447437326569075723750771475897619661025765632486508214470920970384046022812610698865095434736181621465694089157
+8053089116717921661140443537567547341019450706571788438437303262785839761518407332728972316994708287799676864196511854612689905
+9729609228443111962917503361177873795233721041675657438816948255161968110343038443890530223545306466481706693430767571885086143
+5688308264781028505036247702821583514666470671292172916350280224873269657299593653174145005772915708578064978186214186153683267
+2204744465132776025498386899741825318473763441099667987231878067919021578886769657107832299974638025812458213339029056421384587
+2941505567992035598339903647769230684834003209355669548196807243023989038563917277881744820709582631259852618961087166384306292
+8258024223124059927265905619693379087206675705618331236606891852566067360854244728445479329673501981619440816785961582356678690
+6012067901366243313604096658402361049393912691496270752442176761357212025454418262374116671287518874273805796136109140975751742
+1773101052368269774971707329316287503544657412042811119480548137588711677240886794469483314479010931714923252443537409707971115
+6673163431438354320152064250744844641052080216051967752388682876816416999627859168211126178210239748498710723469312339914116142
+5806996877521195102255361656866436538966669931939141317697197556942791721788110932577145668299881351690980272915197702021298156
+3837290410389303517128116353347856259353484969554892124616182205192313287433755106122400179494690010200326668121477882253979202
+4517266820218197081941589722796747209204288657893693887244618207431797169277035145695561271253339157663193312460041285285239201
+9619778362364427885644889878069243475033064627573715740274290928496163757241181156603865800841856421952950186816149922823346976
+2573799739461267334017539893388809186322465134575561495883735717608135099991766507451755547789018617434096932254961072365198882
+5105319049917763260343536285268328841500875349287045804710455434303605043562842410645690374572514107603618866501621709959657187
+7151556358315357415841531703618215410583915203575998268810030381640117079961254114904804786046065507943854733690644791284850608
+8204760879007736798651157366669090166543821998311590636584404376075249452086719646757979910467231964531015916233682304625227803
+7147573127581292166990486442215222962358403851938571275150035153036061725108691622876773795056511233146161151053768550862751540
+6784559304983902886590174698622574195988266824149602039534916660889368814614010342767085921580402597291566274193343471685906410
+7880113249001482900851888199979393787162065292926067710104923584703156779327643300580458887132435255065678627456912854660490039
+1350749751135031413626228320025567623412283741939627729115634082906593503710519533248918652855496972010878915554543211009367225
+0004322455171197190670578109680045148889288778920452116958832375230435697820421502377733900228528866659062527967209953101213734
+2911494504322931801753348544419729543749078880072226980969166346711819931480214331433779640233877327672317049984114641749562870
+2396528513460618041259531318301991286281693049268735199694175803321673323893916691134629842475605991446026813330356086230228330
+8981164060702124227875449453939249569083280933393885800497807219622718057632147355043854391102180378987437281964171835261740700
+4207084959173122310540889440071390175078165835125695056930143838697501277302913507401666310496334451392319525169760616015349520
+1210081234448921940981378280200458404260945592669718748037205896059223823726981351910671794263375996276697272684781727338912271
+0029168415827572351727213122061796310780992187543596747141643738703113178475108090159020344233281790182332311601803329178285993
+3777296404075934053174216751857062118469565443797038517380817156541529651488369770373411767683949249420334108704951789531604654
+0677478972172417855596910438873967997191564526032435944553932413671467038312980120163881839182106666575810117448701361229089668
+2906070251543291085920125260549397785656115356661440571177943054793731483489419102892567240649669779614310761600563474068066656
+8852394653036692892038076417261650066148179764783605637155006560905389777668215992491194523484007340075319390767759607804494192
+5467138831557823428775541689197797741887498255851810682591799669249141593216801183262480761866825456541084229589715596536290776
+7751352765591319462216158866914539056239902442050723154683435064019845231969816008347645334022334350198037412040594819924724593
+3021915992015948439763471750840891829476672656242373621059864369709314486194930162083489346397306741461969474457136306652660884
+3810149798323432950565012468358334053474435740399651150333513841619654716521117976746459459286758520929133377210685994781661011
+4783431510440557379639204082385220913253340902177656244399207972984745234341006126872839573292250089207868222847639289722379753
+7370438575710728204326451494061012215276912157251877502908542289047363288154325283991522374002173371912625950441590135539908011
+3066350412780717315157416276543477507139338679594873856557881443518665559120844101586947952288770461228629756299270909156776058
+0225437513080408599402290104732039265518603222598728765215485627157659513804399230415740373980117223389491501554877516067224969
+6906447098674865317783282853291741419024882827886344308680586123738306172623618313185104401579759220967002703474556768483264969
+7905688354362418737693115373990150326675244455866285863285017259126406290824772728738190085605025791061658351412473817132182003
+0647939692176384124068167344966453433916156302209336971942526032217331539621915101096729732974008611758025821638418841239335586
+8207612011209373495228760846993905535758093646702045474203894639020884032055233069612162464709714659219943117947340234145019206
+6685510574753704984128082407027684573335104766797904438216667655851315902097650094638260466258758906563426639941626773728838182
+2859725751851113943873234212381842264933438665075493160334098268584252964692288511136721035397358821669241681360772178239556283
+5410817225831141636647896001039576920297438613631278187702231335198482845481821124632157811564428311298381077638390915142518664
+5603082383902365441423743060726658870177085955695406252400018823076710944733837738608757044351867174051742821082475300834328708
+8478410686281696423470828758415498795393164508886616098722313596122431017415306773664281061410625509783895380848928242909573156
+1195618788186485122683528679683670597289650244657656876407897279500115335276331331011520690820997358881740005917663903217514124
+1469313024861648921401247135353735958071127626605430535836717325791385228578496115248025350543355198105506645012545576867598396
+4272483837056013890177205566878534986867897273483516131338967706119399325076036529394304714161849476343886942682280685872295940
+6971223873405564611431588388181753597862284579604627783908270991876509853907693857394999066866716324481756490631331601939564088
+8692753456851589867469578350330459046916706027508903379244973723114291207510039578602992677933126396343784500936297228340222600
+3596764762533798756045077959160866048043299983905049607435425529900440769757414376919342785743646389458775443875643589233861301
+9939277922617044929198368291152778217422406940588205287822196961674791811253436361915620783243520085430696637802610907731339802
+9987990017965498772438500667174890865212624587022291536612477503056361052627799082687991851074848222861818981269823302761583997
+8147838382210431535807715103935094271794068054691587562868334683152631170314268604516246803968415953907592500669227061338962852
+5229815249263579089803694020966160885001383014770540554119854860763174611534378849807683267399405523325826175066050422465261245
+3718808810539902175097435162693814660278935973946526145133557384972950132995651178561319774914749271123710684959722970432994100
+9959643168956842935132972702456973644474462349184166563719137832114600377784944150813295076399096859538689536653676932352320454
+3562313742471254053603374767998733448940422800590796399248016870732131873285978468485675936836421845482343165519443520207502472
+6212070810123317420939860915076451492474105989853395883410582273920108061505858814970010182505273303507369510379631126623445635
+0255217936242316574157324758578917396184805700986741727460755136645033816635143639164644674079087020280816581372010788765004026
+8089847944137656769780273194285160566134507215012061013579883469551314461311271302478380193931275275686279445049118291696625976
+5717365181365376852569097535965171977412985242766246364289767242179344339616335652390309582781287529277190209039953388689399517
+7041440160561255381091312862643936475613988744385378977312543669992877553324112750381702041222192086102659343479767405018249915
+2110051683946677346707980171411807954606467103478530131043035978033107947826868347943468663705645386376022529329242653151632937
+3379574154524802337331393517730441276946707038997138141465007355281465799683250899916025487713716291942082244114027843952458642
+5030312724644064165890328712593254449923448331621966613833157539215136234997090424298061395610381815885285290455631522924868317
+4994969373293084869354149476773798201740005462072247291096910619119410509333790774262072570461057954016819195195682237016634823
+4014617100181465701775054953697719420102573860376968588430229723536957418028396409863878695628364581200214130204435051219695552
+9995923662150908682939564279380158287700441111607726222291472481672861788611478655050339588555615320984584521234687823576281254
+7451463346941792082220143976579354392136627715379752529027471716966012381538802459409604897867012386933986500209811720725405141
+5447700282385988297313347229401494009078606483625633850809103068410968238448493407439403040224936061985927544263475630989480459
+1276956495071860259959641422731621493130581830343261790000300846232499293476144299954615667025912420799180581171607386310558493
+5072567626180671481702538305209899197776259094898315797269647260887831166441294066368414302707370453117631015362578331461379694
+1152681127657219064376008724117880126055071670561685874051473152694654802783634954044854697360607744867225915714681210070391625
+4963921877303857727536312369203728666152509364270556408792999159107647346567121427484742607873371889230959069964077737186080579
+2539117036539210376394880318723799879677288248068497337514544989379323165067241670457629058952981263712005132132192204500173772
+6813760519782616773952896216661044250831393786872842763541388164566337619519250295645333112400558661044316307967715017816016933
+2537593940009216399181185307950727066601997003943463162691283637037387944868769661465346762713541328987499170590124382561225808
+2775885197315288545943935069058879566010060299863101752754477420864624440405321494564586899592105748495227288314078895511070581
+5073590254176183749859074321316849201765757369989203202482670238574028719679448337609628523768999643298161243528454637871645997
+4654524903507892912886995134469509913539767744116890388991007614902224668150391846827264198768560243067636303891131378158227338
+0324734826151939630626306117202466456571054839140771329647402994885021118469683547773949974151585727386291916309232652285623776
+1825578079957905035730446040937650014976367810409736691475746813209385827351129150863065044732028040265416217520597270250595073
+3855654215693196726130528392601924163490164258356468808028166928343554047073423362885338439044483545871577569335583661986547054
+7793570955613127244841652451443245937038624291178210631123294830620894480548406463322651814043971289378075631025886964612359732
+2535751039273171851827163526482017707846468207349048105786558968816006070754676314714316763865097547820424829616783998998577881
+2844480806501005182020568712353744447818200854387376634450572497810731969576672980314852204195217762355809650187750497828976590
+0779679209849300532787708183193857610170295918273464149221680774855800423860839661690361920242424552243626034568783063475060030
+0715723560396890811677256708000602036818903166537471742271498254161510038321801193648871563911124555662395779532361864351019488
+0796637275901473841659277764647010680246421160415288649143217531307967149087210418850695712273237810379507829287822942082290828
+2503374558287484037225872566037347531382781922322502069198289211129714070730191986360007963273941619249637438751324038507743444
+1257552500220289953409007738059857241268432142060119245938800646680659562080913958426385782354999183544917531229451796428251407
+0627725746927523912542272514587614535547975158991752064909670083277315643027595358743280831654266470167938798514468394097718636
+8318980485800264189777412075113224818829974167411737699158537404003402647667510002613635249834073904159437111364326870286724933
+8736390761693005617348059895960699070609999931133577397987040270060440645814471436005094800905267014783073740415604380803498206
+5542024002024944354928529036523594800851472969896531771028010643441490945234844042008320398276632902810470392426566175025658836
+7031032484519885828134561441713514585691824451116624144085217816423547864679125010423917860268671111391465300826171047260397179
+8220783551779338773320989765886440391559510492663544076020535514257589749352990988564034320388602959557187208585104844145026439
+8020438087951116022977373383495534674635129594766601601387483705748972280627013851396530590121458524210171753315286548207527820
+8153810125605918943918826453140421737748512940456044065444292520385926730447939082216173702077609971171912049413332448203544586
+0886669881112435179401237673978622874656264303143999122578352317897806033193993865036799045024203333380525337357889563568831448
+3748676570310585965679075167577833926365276411040601559021494474638574451420952356408036362315997810486031449429712897242856220
+0680179178809075888645900355703866665848623566100723748395628721560414660071214664781095082893581316152736759533950009932003975
+0830073511229116156443164078334884149650348116571315260656550335371524295132896582152314795929439939447827419494358066689706173
+3038785789686019127115381229380791436051546935860047229508729818282744657378118473627065099573727853891404083449592265655152693
+7387679714798835215773140865910355708661822160467627107526217765214393654304740207983760504979185513943991488603347106187504836
+4959345618457216694880885929572868404119594959297665383045694122211724921300914575522725438253647266552305439505601459584619177
+0467037747326795908961510775114924268777468775918327644966642534544042676564308146590029193764372898938024544197186375500357840
+8285890907673262212647988009259010379723054727978121814340184295658072413264615156697842474728575585169324914900743103535246719
+8911662589073033021628854642652750279152366994152376376433694906661951714454207190114956328995857009825646477784015810868978338
+6105850627169563438884040914539421660727931317710596144077279839188308966168911142486835009941100149861369756674171355191560490
+2993431983320455272922883788672722733898158280538086533775288120030297726075605253307507669239723828996651212708874872223213527
+2383871203918607138972250186349539349163142546547549565946027359258489597478748862408648058675393278207850385093331126182621573
+9149363763947487276724850656041160743708661373179229186384365572255499194358074217364047819850970764281787263423869876082053909
+5827019270739581666492975342346328261479975112685223225619643483040396563898673337995672909483700478627244101352870984979237732
+6998285824391825859392150613924432428270654497491969804735086552708299672203935039153979762171440238901122660133544046138761976
+9253330844439113156612382643124565174653829532487393981769888635312756386927331059248556801164857640315799609889660186200071275
+5612390497528583434894505132668347409216226770741805847223173711771542665456899372500390460954330204857624315915587829701045748
+3597132578062559495102590042788395347495253649400865738509995118091093608521019322954235222572297567318636643867386469580449507
+8425515407736939284693677162137557410259923224830338231554842919234034510500493129925331580967001474100531060588153614511993338
+9601991297057389436503665001505251866564553593237174176487901010113004032749058341666775216970685449376017846133214652240838962
+1863773381844384208184694104858797647539515137932214592371546918752008772143433088976967184397882651789039128762093118018510138
+8436667156247339295567342218063358078249911156583296510351786615409192064411950727914656163850098232887122260394676405120111886
+7683313388786537579802951656666063632278774842670516448032010207156251926218292168775800210222391153956472045994503212219850049
+8209641417161775663979384085179876713787424866821458112247475298894421880117371699371735285979992519666751909878379569083863705
+5145614759445599831570000861590726100099887859826097034388914355367729544959518374514940678332048394297378845981970826760413852
+8761767120217732947982706113384060618324856798940745761981931692821487049372786616858603289668185012412091827806837321112104047
+9255297129664160944098264261547065105677964568103165093339743646349513755899758152316922927563473869566225326724560456097296052
+8120768832977744822631836021474402079390526097477803448973026451821196612519143995594879311933463926655409414749552006489267940
+7017154772060236322937445448043347707331947096778317016923510498198624836901896034874919545286197554142622789268469355512048260
+4180409321511968885143370514200618650235742405287713769661977834572569077057120974054874981770237845015640851329981775003008191
+2674007147813616401003929214576628097932821870524475792725335810151140502429235053500438517449175945097953478389066531072308154
+2478433215760250770512406042154394331540911914042172939884164584979797404189940441889258451913067147217070836370940898306980314
+1416691061574950251933857581530784660502363969157027453652188159283670553356947339926944472421121743170291855577403109297001923
+9846364489252978228078702013876774947354134510165101268064021721322665802683013959144338916544348159574015107727356473797086745
+5487580365242793847184389294498037980764980441864399341257536426029899353090372478661527651346349015000812904186890490170512422
+0317001187750772629199900746610544979042670580491329322209673449299816557793150957519344382208574308527216206006597313873698350
+3641287214039996737900834675182665853779449596351604582635503134884649233644728626688852457677654231608768591360986911023898427
+6414868015450446904060895609231719309486232701910101120865147273052264604064433289410480856555673255517305129013544577242362891
+0524147637426415811762515415524550268148125432394280267631328443360400295790051752698236429135771292548014257090019134991791562
+9227410989021340348714125220582535723860559138846179511512191891037914244234245126229571603923532773311387103298341477228375501
+4041581080402587294355936437638145699274625343476210354812865278292813236740766242635378473283614144250925302804707242340663339
+0724867859827673965725683173043844289022888248735884487800477685080844896245015920731492673699852061747889861151283779392092379
+5909276888786182094219448158615991460321912732697015860009933234510620643391119454097956755043612428806923128306819132701862789
+5863973408297121204616907602368353757254965361693796331036727921299882051062544545347637276552415740930878434572627384251645258
+2609867181490019825132280383807303218611438271972259358234476006167125808789720811193408861105326321587061359193074883011503250
+2053550365140441314774770422273440770268402358845803831349391590570354084402287239858709867448417600167758148787965827714400727
+7156914133575985423380170082307013620095209686338890246264669241382877333719091759478776099336392938215841439510174135934515390
+4831194527648288858829733221197151800308714018772578642206404911045931696147282373784233544435117870290316107286565703640910861
+3300965303400428799995252612196866095687126018105212822125411581947708785019993474053195560005697252054488325120896486904066095
+5685043938431323336868482886553258817526871549549389321696880672458619872963868160503420041705844727261813948644337640127844475
+8437858633093280150489850618743229089133908480393577494682517449743840953324665700848231841040716763791338769325607594504384201
+5092632498177396936492730922026153200701191354311511401621705191001018224605697557158822145660532720002740219521243300566753090
+0884695364629948365817606370132571392316227842180869160712531089788912972870842630687441550199592940590099216041036498458331435
+7030125885795773170445439886698551870214797580800884149092936799091801845209138388276070168782087225547258102113578759536143915
+8807215865608701057987377248776702944861046260230342503936276411275965656745488818885694005475308409675094846381271540973613956
+6869008153507650455021791206721217199858946589909935757514740552973399919912521587008600090842850454930346920106313925959869436
+8747302342382237757458390343882591560184411401946674013753631245032512422678856746902092711874356365404625893572768808561925896
+1816616401614372016489584185015076832989812362352963164309054653174766477426767816672229374164734973950570074316503361323429424
+1677262729710288413972124464110274430459973064690910792449284824422312855723898793069294265613363135307936039462077553033385323
+0904814204574628728334178723557725337676246503641550973591704771295724843533583760990530372617065538876854581885105724368370399
+5318034405787225786821497050581659615205871549939335953839157390829611482749151979571742480565357809673956661177238715716708421
+5050974915162203984880371984109598616980412684284404767484126024659745317958728060034806278671739980663056141392010690752871879
+3910704359349884254016812391071406772666793577154924194799659346664635964157482006918898999240501149700799097400684650477119203
+0922138102426301243886965897610590765176893150415296968278489084200960754236095696787157337789651225430707548067049568646321905
+9034532106902339573322445743023271918597056331210862099117907113669633072759130199009133076195985791779283506809079562559701881
+8961339360352958868430789580169262538709387737102199957461921100064868143051486287683576990974108237901843716454745741895109283
+3895519300319620380905559168583475674843131617139726705719237185238119833221024548683898215318859806049104445070815116282206901
+3205107673082159654286800880087962054713784047147807335322961266542952563116519811400145837980005316237797804651103815235446781
+4645211086556795731679627686638624553276782440503123281227932461374131645478394881186841410205689089468850242938656791425398127
+8527652116361873059872046061450470630778597394637649835734537239971727675715042761592888819669786191505268650105293343814467234
+4729851960520632361339165114787166123924351946142914574237488059076517558856540707604936767815825051810582920267228276662907034
+4922524498676764577221603274496474839043188887553906964245432382389882944444308052516105844797654740378920402689234115734188908
+5209597697295900954976185802188459574638626316316754990028635919463918798002460967253179124238772322245122243876066379489508079
+4508289933039159505453489164861720999217265104842659882479905333119333431390108947303039851217725991104705191344280222412086293
+8069168568134508776661939124641765187854999589971548041638843098203486147656735371454412494419404765242018465434846607552127178
+2927086453284193065980223266739988186690361081906781869605569767794118257589865157784413584255650425147523732344110338440580815
+1748049647890769557692421227727549481557775151410048868814718985045151061237011017099100528551045245586497019590105694556854099
+5925541326979395577276086387515399363166724218914221343444459910602377753889752768375789640169881596578910501727353216027189265
+0670300499827706283025120061244353545380543254798985391943205942681540582832008582661334249048815794102101737939011541318568554
+1807401946172440506670841188965007674553832019157741404977051650612570825055419487071388288683499429125090172081236081328128795
+1574208400432062514192736694804153587958619698259830513687209529110862276181211516095950235354568516040903749851761677661305637
+4121149896620030430814848794433445919918770329319490730619096312332656236065824412598168467443676868836685315118978623516376785
+7498488621509709129976594981432727530944618723741457356588286547102533914121132990321805599546945869002131411100756554367181741
+2582026542886480869734858959495104201677107827620049653093381222272376273695750172303884972292405628020932588645381010082785621
+4289447606077369793749546092089501817143072386741950941157247080345113014329756464038358626070033871947884567651488044623905631
+2542825564877135509885226287724296817068865459213301536696178082552402072123707396192496897302967815948042943248544343979991813
+2226470997115317096784601264496380718265218871198752715837658374418501244345114451866417686910079224568758319235433015428196960
+8662720543840647608329817530425275416788291903848716280076563958924728751343578053506896388100895823567897044421928057610378475
+4719351914296817015503837199703117466548446025449281302558021903566930798786374684451211437854302542934198900108681526080958767
+3447640954611982803365820977016952430036387460526610055495899354375691830575753318086903113772624764685535267168082007345740305
+1797213012073375178436558221355605782112077809669165249433528557235690262339894762165301931035587761808175461223039297448962130
+6950060736132243209446984212914140861957832417030579738364918001660026811196800334571314378298274260059705895036596817108824926
+9243829747951735931284002210476722019445511064984030772651417194277223668272106134988724834976681779756839767862454568373306618
+4177035873387789691442645602142232402697759139202124087044601161733861189197322918438352811683833924407803890384828993570282474
+4594126055178872656922618774167034354795564094725497124745719061896909861368756961278327080697512762579612758334700763137442983
+5295668887669717485226390123467973887358507953479829153694623729169375830523050788966597377361980793027344718171019365784257200
+9888285370457729318303943315282858750583399490083047557333008218529891417381026015175475841289968239416942724745429537867737999
+3215943066766119309004524839024701086312759322446215895076113158100056596170634794503064752363481133827922180405978563689758589
+5959944414411467463305736849422386192090664596675188756343645002538240622043092367067855848705606619349233737685916244645398642
+3415921462522850660711019463447810831161516098186857649733922254277645246597288489872824421913456035668900907466154510857353878
+0820770271351282269897729773480908180216209552917101530859717823023591831191252679348064887785178954716044181664367902784712050
+4837078657362119194233933526772924288995857318513107274934487922952892071107573280347076419494020490239809987105400407903583211
+4566520950673320089105623215464822027247924240083971798563728505499902175676964769999078225165976694000667473401833118202304025
+6860738161875565205941822290237567447513259073024464364524976929966835518792473395436546988594137222229184152759954076791794830
+3322947265984158060992158624663708425488918876383348951122905125836522038089874259881383269124957101134232722838965307585611944
+2514815461210894795746476799700740431234580399243562016925036790171527515771508119826976806830254109945111480181093741053447775
+5733504011133442490826886677777865571712956442700084777358932735387221216646199198889278425501261656719619101527490023033629983
+6816820665025994462583833453804933866931009904653183983658207938144775757074429801900721418490709180940459786270732207357575723
+8952696642268346283355069787962809893365964014926493914452473794524489554221368619837559042723108457610361497745820672215991860
+4686726618791630599619015305428791046600757619220375372642195506961581791667069381025833026424470965152344317512976704970780861
+7817535100493702359961847958187008692676255354707895369219620793484182638707169828174557995935583658475438688352992259510602626
+7874029548817067666626239631331985390475404826024086339339243583071276348104332609325698630718922399423989995185805657290031135
+2250809137006081215712604683009748641626154723738138936917095298080941105465629041740614734952469019573555032467949707456686827
+9015780860040863502309304151201467772727168204445161990634325579174702838004535428730659838209979201561616665321137059277802195
+7650185512550554196643188069669262493680280748343975919639135449289335914799374871448334387269516977974949025899212288538454112
+8893662379603774306702720358700430713868475310661351513479439829552220384722225613968805831874918699875259504799262267715048953
+6970047041565543406988313458814942522252185061892588920654751003945616453031191382091583403673677641380943374412110595010134653
+9871101512999920825593895837672777862350486799080847951285270490204712290524251977042420133385216867854292673426124017430550114
+4761750275074356557669956909154179090706612051478635506091941757942400068895124161242203046266249256221284982009220935209300242
+8708015446206142670623126732884105024418284851295914904738375122444129503796268180002105711502782904456582492253779456800326918
+0613210293625239057781585677639979950255289284707390038337154693725678298193172844000279478330485593483147704265272812526895779
+2716164189514060813320272610067774089300292554132648786501937337701166054949053895064937132503546260829302791728809439780621266
+7313188607076954454240146509025347232689443993903699487707438769611328865209183398377855897661913914996316621615825549781446347
+1784361684093575880030474001414660619024654155783784777347697077774197795864389624206377564266630250281594010870492871026068899
+1515638387019036333906018359538519902111800466842577317066502746814101599618916383605825219038858550204877062732542814333739145
+9220084992150752811004335287492444508585899566926596972214201784424729857471199982968054884285888711269768545472118962801716609
+3225729665605184922610258057387753797602084282592399424014307116412082926636660405157448703031528431483170813038850013412917589
+0896837209572767267939653527113544043129466184693048843785638628896239995824306624383959725609177449846462355536652421863726297
+6350549459745687058464464835566280558244152696093628407065101518502946110700562358545869437041517797874386126356678480069546762
+7437438880206605630925397821472561939196877744334362718590301519068712375301433711985727209285202108430567240861306104506294438
+3997013218626793371442945794751768102167128014691257491799130532817890787884088430906840628465718832537193051422942089432586522
+5767261809159521411906210527732505137517003452232973525892796163942363843586179566469412536807588910846358095073973053136806664
+3610420406657475104037145580225980872688624964111041381549594329404718245302720059446156211318636072750134363504069278172819616
+6203445793416289171078116228949526537345367573758934511473904862922585007326728074024526181186924979509692268351022430367531902
+6396903617968213357545062076755915835538061764765669442173658896006627193712410945197598872950553456423579139305216599382954077
+0380250815827704962815549731957552434336266476872009617222288199268494650352751383734703683895685962764217150385921949138345511
+8687569627504118278687806727964146837523838460065586633962532325989849682060922414609471208083225295893531164710651416235932804
+7419608622045901350837303269139752477969857182975189849619797931283834755645259685017775129366698872709262322484867769237487261
+2446574648357299934768068561355356119075191099390351323266829442188920299959413380468532819783426950868690325166385302101461953
+4690378580819708064900475904899019106498140395743178471011674929320871266333196561704778715716963538368801024314408279647276339
+2089232113041890885410086998151297290297216269518414003124742833718798363559663862672468722436254498875698485622178498338429914
+6550115139019878137719854465346267455296956376622672210869101826618943385242099068657285404811000189142469975735597865828978322
+5550336328979484745931555695487878550858216320770924583332798110114879836414978841309407295358874518788123614542792919395667790
+0067101966073227418786203809533671075851186310058420930636457857938955159488144881158165188969895896949949174391923269110027161
+8258211496051765933329722240348370716824091139227581167499651455166693356343053246387421021603939871942981451611393932490380081
+1143232998448167618984488431281685110452032295577636699995232387576558530063365443650214541186195345336376561664260667081107636
+9153874053518331378425571758003432585952239206770799268110257888073536748287123822972824857968518689632999374391956653833541643
+5746454771428065810576182766708428737462219904665952012954717596322305804801076045993811560187169208752861306869132853087960769
+9312948167988600676884786283729313554222793557251794907465964089218336400060941052967060271657136677975942167674352571570304004
+6999898093303477247632176216594681728525645905467929567402604064471637964034911185817952376210008390273053006469300379255866531
+1000632388106711156678341302292429215991586500122697419661097904387224375829260375948304920442750157857268831027577641937349960
+0561600453741069995026478401094735925203677529242298315347820295756013844421038599646676315356655360880496025651231310731701615
+2967967299264819933654047107088552569694325550743639578846283279457367587777819171468331383302126179626852498959303153806267304
+0993137404276474214149260182488025202243237418254946278036864473980040065830274036040054866953015031416924556900973301250401325
+0611401987313671825312920644599670850377089684826838922442681491359233283306670402386279700142617583474055662080523345059224691
+5939710996631567268204735821745742750433473750474145824948890280584535509141301239485088599010310179272128880118496394992466934
+3357460688499765569727929892732936606129832020628130664357730146150594561279515636082352905831482949527411745350155774277195108
+7138561333287682465057643618887421608272303910896561253448290571853039520359195699641420904384787139962581486218527455895010235
+5098065276517497532201660511210544476729427289544804994012760004734407796257346283172974549503877915741488118551582294732680387
+9918245303994525211620190522775746453648980603544567886385199869862202445674868474533709002221515555801308081350907650459178667
+8721390287975913893819238889792260446828081274233551710328471981963516819510944667867602212793558775770710289206007250029862895
+1280952122455041043530594319244152931145497436315530258653194357643115496210565410757613267156777417895715618326341142914815577
+7155758483619829149138641241642134167637824757268284393191488835351550697663275036059641871170325362834558782380774852273848821
+9812670602301209189800121141901793479005817704022886493550881027819499284489381378125534965938777548562514868791510874667018247
+0362874203793328000664031717659796956361927785166994482222033051420000873310315385500469809294516134684467763731164514267312822
+5076794324739899424289073581881385172449093717540058394689713271226423655501988369216296397971568827556688651950460247532081671
+2211691279142831153117347297369818334578478434502829176759746633980926915557525626263924160377780019382684610945724739361356924
+9219339881449560885105533284707871200679261887421531149034514599874409542178946360778835736536874753087132328398630153344208176
+1738323078966650030040964282424869456011617229198020575179773319844636313591780039750411848469791355249483448877218482996481058
+7662725242856974627520011178425574682734942204257582618062074645522175607162830607624141450906516065750218377963070171888324843
+4118042284044277227029777215730052173836438075783336538165120621022353806541561734384066342123951846452650796265263415816226504
+9577454228253953925531431429190317095770965424733462598360193026659796995068726322946365945449373804244913417484873047389958047
+2530447003714965976379236094037411278014717964765934254550861704945379408174897820528178412885512242072953354276409893858269606
+8161920683332117194434729439905850512943519462231619259091383414069915670154194411541846032268055950920748136328515080957772524
+4455001394112823835403683958904433147118332238523201500644925421808301905477707785391327088921953707802405649821266420465223561
+6446522347006213132203935166470869874136295692811490433897687621265910913874552752126752166818595258011990560857727236113871905
+9408818174849694926607806886600067803753381428797382723099805698620415041534972953179055866017711870699147517868454045402246335
+4135626065428509052074741682443536368971147858952760160985560880547769122981012756994845114634562103177568847660082033374741355
+6629483302659977998713743227246471116209038004192175569114510152669193408163108052671223081581651955384894038833735367319970945
+2019914369819713476232512996482094786229436696697562766992595975532622307992117773104105916821954959122045124593739046172932273
+1444770368011659028126820519729159232409884803442212877208399135578736969682832974964729860145229172744181374244786183467104294
+5285602663449673777986234552062489192832103368544537902433053581936823853505740285888319749907423551259460167786803225430704894
+0644806832972865011089771228494426041526498427256197014809301589227000243312341210098122668991020924989347084902763173739593342
+8397927825150753855181618641584202156450292633924809550510911217351590362959737037094558684222129548773410325105794129798697578
+2130742130526719507540424131716191473755652175799405630787752600339151530661377691130274509280084673031861647779131553466473489
+8949445645797314751748458206320095870152672752275260151260265707878555413048057771903238190200758654160960860864191150393477626
+1150155207111417862229200794999414320488018094694431946879621916439109486610009948685634866137188097525670175207351289611083094
+3459879841467541763732336521769192414341573430800023957612803685733924880739274791648569413015334203212412056584388583105695911
+4207107909576145869607620085461426361544959409669769028641359260476393776996951928885197026584290166920423018039379739461412804
+2471437021597594937922441016847924078362096363319644062767483944790539470640965768192086646725793415577156194561524796709562342
+2281835051710898850388364318434644955789879751829726732802303436684019874264646806723409567549761608858039525219541663231620839
+2007932711287625313296243751903200023005400873291491556838807519342296983784742524733445763971687078693207166472588686547509634
+7628738900800911617227705711930133205924637233313615650647097515124961199263711780307927527262674727498690057241315682922136505
+0493387404859274797132212785618181333173806092520644500400240017059008198178246301124430115868753110589721037771703980382573162
+1169775643061410030855660308847307357939679557417322697395889694976054211267593984893969933792226845025198715121269754643254572
+1728088919686607770305974714811474045083911324960307426887087611368014116902540202262357011208475439646884185432232498389602471
+9413509858059972641349538923181108900150612516616095667778909942463828217847216087159443807284569471198894585206492715160193699
+6728843665008266563029199158801993529576549886997200057517865461162768723429256920925422142043184781462681238742660537092344889
+1931599731390297037090231505612731169969829636622229470099002019655957459951531223643763907113518395449915860761987492535032339
+5034107674301251502545019517381773020837552557746624579624919732008873147762835295630900229992866373514578020722517390727520774
+8983019600230774694685639778625463724553591351398381775880431832781553934906986888770789153951456721760712116772577734503027958
+0722579888130638672105073329597090462417149082738030373661949401575813793082783579270436569787902655097641040401368636813371427
+7854245354370422693429496181630052949425191073877308843275368739572310979470712820505147110988781661197587183674125970895995542
+9743873036934859621564820909920160132335721185173809848423866981847229831790016569684947679721801847602901060080188329396305906
+3397337816832712119749817143233767742905059889912076656163289731022283191890667300707504214144077245819520343407565716275839778
+1635431146179533618869624816029047896887367730042516939278216433734900869272992829571445669607086349418935403567352277456520703
+6762725385281999872315155129365300727718531348063401770341896591345777984146395511533572557918080490707700609701643325567678181
+4555558906784569913680220888302706502231120206554070127879841389783669163314482027219519085496782129580409038602612227824819543
+4625553964652973015688630098326028308371988997070002772661734916972323600534194087341555003249709049635157603584665553841867805
+5469615145572204179649517877754736243473051237336198742915870594247954290354530866927776592105619674425818013502199456960100742
+0688295929947456127268347042202884584629259939771429635850789571181349570944477662818026788804604769581716692572546910654441173
+1781053017263760670442837500622338443773255350157040419311002126378320391255428265011649731680948453211623587016944241093429272
+4424881884807343597741531983608658269276205760340198024603987236049280398955549067330598233254907076437393855435114528768763737
+6402747544261459973943024136936806092529416389402993987239813694282531255632557296852083229095761340348625572700195393957513287
+1528386320984169104784676953231416483588713316281109988780398093348714641247346320098277064757682809088330401558069087928359793
+4836620934876383780592087107373057072272745160875663949786761387509864704698529847777036861011698566433232612309834845364039380
+3575337583851040701388845815054721473930456788213430385395140774983959957647809720764167375524924858966015899435919948180069180
+3727628368963430480869218342563326331182798677393171005831460902561217359479597768311004931085102290184621530025879576836660947
+3475800984573188366693910563609274312878602294132115102801727644998770488363543862638723091471157432089891694987852322137790631
+5023683657353497036212732071088147337120821028934424904568945720202766911488162370473709710449329167955152043455364639983165681
+4313458074953427422966761496213154547288857367926863109897916806997328848306557928981283734566043834603735209469550380544603011
+4769534552591442528339142072463485535584209788041390319662187991947284630203143273451030277553655546597381665676996289780792291
+8029659403865541723176070298858179302484672898090770785814054293418165410123040143090326214914018331298053460618863938939353357
+2504331261837289138046426704519324433487258219679900506483638261532541113835978749947580235779347318410118894160450785891787503
+9154332931976583483472163920590162126815140207546760699499178902132160947370072538150136322051659957346811166868803166980109050
+0222142484013400331297859576897114613785020913334195683798252363342695111135735081039945217905782047137997143182303582893239120
+9813120425348259494442258981684713118897639132890990099359593568005985530954284388860261356040562648449500126432442951864251191
+9491055336614888264152467342246996843863880300943314768116172425467094897669780084992632583894436406804533915530813948074710378
+5125880262000217074108251922916601396846452955978383367381037097928649700928330600429463193168987527289334840125068384753709726
+3250963913544985283516074025079436289530032965000091704733601456641384410110473920750483277883697522865698072624602352586775278
+6909533273650494192857472271669762600062165210442469141500817398520087420757013742072500281461753556164642072928308813935348280
+4807129228896091173010215184046472764333315290810434138260279373142369497015166184160402673619706065463269358547161491925056454
+7992119117554165493880872181423830045252323577778753354174393490633929436643377607848377532573742197373252323683113537849603683
+8841806293434459100805456108210596607134914383853585818153512788887296784056237782465358856155449499271949927041469376892328564
+1632152697497520229603928059316997370226452543375632335002549957119486189260078571706186257203470953055703949967851861921520731
+5864396596718182058160283419308429964136934231008821382389697128204242562370820069167753381761875728312424003987892871207159646
+3666084774918882500462621483992172725824109862896378199142479129987559328773744933469602552905906375001745899273316469658254151
+3498338535962144862096688449703329334091149790999664223656029226119319000718124150843673811902580542556051470065598276315050434
+2588642538822153267060185463367170199110995449008021906678609426788891572594252587471982661988824671301251499893937578926745391
+9319707795744627065170409664872689583830132047201026242383522246999299133923376128562725383185342894837098008031828134646969110
+0671702811161136021518386108886822361915633677386996222331112492876474384896788653692739997207795179082317779078270838374606210
+0529680562308620614160670757652951824510508056181488035417621544956335930822186390269360882386498654576366806627786546389748223
+7121344007162987446407144751532917923911603613369296361423444081791345960568825786153422255467670330488573438324604236300940295
+7856126749900534423962976560155869500794418586760356971148877729423323229897743690930063998855496652306786264023420507384957613
+1115472217398806310578221635364703110916537667405172225846214402717552527160481181622222803507823937807179294058810167262993525
+7733396618045594337624445678237438829647882527257597412143681872681853625778555809127382419530057648275810262641644934924071181
+3613929384294435871056622853422519700112176582857461049491276578382237331260522744886532614099866550813707901946900039411643678
+2471863854966531804604197010815017888282961247506056635263741803813648407515388558830396273074055989597305977778886391310447068
+5772682018682680181055188634541777077934406094474845232952841473576584969574909042981622739932442934509311768673906919851347223
+1971820335809415226886329944736554280331033759806916931583970783266805147633904060778157532814909009520404718412464333929846412
+9304789467519446866413824868897777103238294214707967726874145548954743749977770022421296628566823077488711722686581183789601459
+4520829387352906480220193366391017100275344244933837568936172706668016811057327408759076674979685576296077953383462420493700931
+8246906431343919288012465266462141639350962646993227082304804964566869105156074039984736745415005176673660764795387467919402546
+0186162998111273052854513690953012281012706484313894676418003816742150384731546652072390520748548343581415404883693106949598503
+7407453409468893649012012693295080963235028162714227398127099455397823529445343521263605978197734068303737481555026299674237511
+1229395187707069269668822522188040767339600015117257223444650130799671208076697307072988709360546665590067811729152682754853792
+2543283984004058807502208094435749036903952553879602762556029245920852075326946498509084553554503835502118795067551626235164267
+2007797747581357604343336945727914338356814330722751353631792234077965818274628997502349441503414970786616526353391356822676384
+5194656346701670632084824377074289402109258239302810982753490912710811175011533673266509733689435108026608580234617657393376969
+9037146495591802460947583581948869619219502922722697707400434384802310554421740985009894719409552319891457897233615461251631720
+3990697080273078766162376909117528749470352764935216917028329174981312070290561402015804824976866738329336998564205666524939715
+7848352778978178394189920640395834604512765967920164240559275230242580756053219581598506048812354481467677378211973577424576951
+9532477816991813127692436491685156204938010748592475096875883131377908630365761647389532075843048673325944084338736570456096797
+6164242821944626959915759190590818947629953857895701779138738262444662644883838599728736964664029753263536337011632748825080378
+2817015241236739478928849304183816788634913242150862112550226668153792859950263630837585979285928908928017849179569989536100198
+3188299380080735588065637018955883708261980780287989654193640067585824757814983887808561472404025858752559638368589207857289458
+2148159553153805396206627740954877447246881212999958661604167091735503989349952300666940107138834649908131455364478740204253214
+5183812867943299697018327767670320460762394440257519747758147645570356514775758990004394658301628734229570022912960712413921130
+2264795742893091605616321707447640168594382931899898384410937459110317820561426704161424031904340033048159158399357351652777596
+2139572365125527551258839222311219599103367463992672950511023648604600231272790630354961828455031402437496547839035832950304233
+5563173043827945218120288721053385228256759107947287607765533263965688120561373605092351078219345874822210656978425318969319770
+8518350618323036588967937820117667974812517069373788130975907844737917546000454481446588184420492343516807727330574227463796535
+2208092079415381688598883619322045535433174373692220944523386140424053570720154062384759984606718110454232154813303857905183459
+0403764445312406400743177177292964855962834587085077838226697948324657642954983884229554291774482754430895940798928630071520949
+1218078030268093244894387180566099112644808636942463725970271185753041625812549630461585448271241111674252623627152709755765524
+4640249030477405125378434884747349008061139769305596841781606951188241867017869136729477063722445205619856063985162910427240398
+2909590245662898324814954125183873527735419113049232565629860534526664160220755933343864533662307471463902405211409478015729764
+1532024154051612895466466141175266647835257739963433595273778351297990606120134172421391748505385924656782899507982823237116066
+7625676430217706141880242765715903813773188383257526213002250997251341961521914541749167347954676286972265765550795698115431540
+3971204449523415473814450392924406717851351635913252062373246080376997499866289003353070967905385783507116089156113219681812229
+7080951492315882179871809720207741914174481310077398153033680591523295504167580131795931815413662606081970038126846874489797367
+2964040579217611595547760234190477290346436427835968877980338437548172752209833653855504469466390943293257324156532489625950388
+3972616808815375498057586682316341344883202169607183819718037286789995473261003288017415010063837288806976576286819527639032681
+1290138051725002391039102512231630818525813814320415691425261417707087230623051869853213472687397101016144678883680930245168423
+3850834662586016207855419987088023334696460550057253060411826174208076438814838201928582833181083830814307068201908029863175971
+7944749902703521228274612063687297856087416799604592533936372400167341391775276233906976252493497295192482610468181988345091916
+7011096175582468584236690812621406307216715768647084636075068364924266221366474623044001441060540006895424513815585241978347109
+9612362696533734373153334851655466254197093486211639205861389987966709302035551682330490724447416578042696870553662285651851441
+0111552534765233442760444257765948564305822466469203165903339169326584537556214779726091179725355707166736526121645211226756106
+5885039259881836616302187141071464709494663689251644989212209295897461744225634984400183422383926438027326803031066696585257111
+5396579069429715251643225942479087285188610492026082322649552644481241838275988175206718743351678720472794668564948833054357449
+8688233606386980591001497882755114729508367160997540301693192893291539036951478433163921320714186025327605130043325851253234451
+4872214673472278544834646890891722960548978190052377730643946484747055518801507106492936171927846554906068388153908514485343068
+7214840374326612339276352609419398397127314205763710059777054421447567554750695002090543962570373028396055745121721373269382936
+4524482436241914482911352925071095921316760701089039169544052169552093783128384931032814298463081577630793680822839743941613795
+4223734008339327317027315036935919017365387705335808468598641390301926191406305147914145568155445735877807426352454856646393111
+5101170944379204574558835956241764204898906557725918071785044288986731351021322301083120247570462572136590876553271594974477165
+1498954940338463049076496039744592188429182308195708965464178219513192666612550201124332096109168498851228361187923717360547190
+2838593784210615507907908324852279814008797652951109874718831612968151452611605913542110950712021617053098075818112497307624799
+9381906333865113269293243176861228537211612376105763917319466803899016867981408631123044887142147183129506705177986309824780722
+5409043531218283220619747469806558139995337403975277796517573718341286548125289716392847076083882092014379916668361163684338425
+1904893321014375227674131798347455361695847285890504332145250525132622615658888584205703776156043946440538442055020240373771823
+1351830991497076875181168528408533516757044944191964801761366476485666222599596030732870772285002472325833568217236712614883027
+7315021210616605619597435420913698876375528968662848736161937624720303296895982028335232063555260929924269983942028091369465040
+5072200871530059327653441988927547294080741487165355628851444397293608964873155978474929308924899776875776153220999350338874781
+7297806144047991652107617589673777407092234699017295323732250434070279346790076112443512292202647551871470787944370705490593514
+8338680194506251068070541345811382066184901866943035469419313397753521282182668152084983612781310002659403231835343007351253055
+6114581775690037701739519471149107309520083450078485755172388779153808947468636573364766942355736298359796132744647242525151199
+7574059840087355237287159427555431111919013708861023222908038566164641505519732443177083128309239177653941203870945389834998157
+0673474392377001399825892148070125779937209491690893896089896421739180565135864053866800087116893052683453216209088258021309774
+4693630023596081716394525302256706650097913048822663453433130852833930985337805085115332988734054335391426675730296735748012109
+1093024463171151726057935490277564245957695353097684106836395483499057575855912524860400186656839768087931489404973303617192884
+7635877951810419014091014411375539957398983529537012020519286943703105851379947162885419241335326379003488660213681674994537920
+7313912009934610962402221459721660669217906503605255214027757570091733853488694769091622366303142874602414314687218525998341547
+1566050559171006939210753283371737704974135991991141945660050193578931524036467433476181347487862613613591250793557188528520720
+8176429431061693107924500762483197651311460029641913001176379201100638867103309766025948024030323914130084770751860668764418979
+1729648696441840023063291425166270194908270401060650039064514332458826292034060316832564595611388754933869606578691497545240684
+5096948893204927421293649874213362565576773971352082850459718459918977951318599802521678656926223913450782713343578245294043312
+3086541714606171194181739777107223773075014101828171109460641650405365226657056099487143258905930679574237317845176027548390939
+7740302926757091096782313708390498469422515280866564744352174072524950077317896546008807496266670386420521998084434771204151893
+5027934064208470666653625072824590692528078583512194513874229573957257382460729248431045517338285948895199087965965424240384379
+4571860754401274665671127939865476298997613160622025616980368067727347277864838846767268485621173877779887690613158095362529635
+6944876714447267999239762443038959101083236381747476636643523496718859843462703424789350147757356429745707937022796547995361159
+1608685279655308172831370710312433300754386599666997983340912162248117716366440489547493562293368632280675661325251959965144367
+0470115155279779686716584895721905617913807392365128663764858517955975388392843450401077964641050043314321327171303982059553970
+6215103349524529478271694130462996515027440018395285605756916821272681672383831564950333676633547276622946473458222960324229716
+5752661076880540890733587009248458903926085507327954333035749203073156883894621881819872469950016600034383209674501094959670531
+1945586770541986321354980385963397070039734408942633942296911586196737659678600361467268366772660352728384921986880900512427348
+0224298460720490332231265716874929497392701347632450314627063512555464017409367105505507132766860559659364230297395631822230539
+1702023132625842749699356356536784362975613947059773629978196487288877402990298821674431326788769352305708774873068640207819256
+0837874454109632180336808361233189153201698197837194960277668995755988025271886650717010166150668262322432532297058508033324759
+3169311626099247379274799980132948823347592107280599635475818048919814215035606030291543579920124429871014029266938736200412702
+1914619565140979302991699155094170839054951976790499833713849411741065459327090513567799966465721776223514774008243762437394273
+0284830262288056137733605741424808121279641702537891966081045603173960192239888264018200262442793489277094386722616393425116590
+1173151387211465492751444105592198529015440250049757464822160661232074007786672709170841572180341360083386765961004042180282066
+2747834197332941363146926817441453515366505571978984487189489275517487274745916049268403158626553738640115381387510687487708488
+1958762131814281375452347210594453320648975262319481726099981862965271971390001963271654018154213822420613244796687794506233768
+5861590138913305751605474142329109238465204802867089486028021810232894377402829167243953763417451369079334074531476305390636648
+6931736509544684644323440543056340368361669695138186889701847677102848670844548402669049251722131793379128120867567738961962646
+6821092152578736586590175476051687813270318648206546383329391485549308897384882743702278026541948728683530021908873051239269012
+3127870261792191598343155115866595959890760429348459173942873213248004394755219777755565345896164898508858847846745938219558572
+4104690546998169355396414252792133064383123628337383872945199098541769741499506855287626343383400914652705990644014540006261236
+8792100596328961741396764802811919634888917999468524631681735602589600555328679349075778614192998476904702613310979642799638155
+6734793674993705010403616483433595873080508573310753327845752574399663353072797746592366100412052447212721125322772808600316385
+0099515723538668132596125963466202152817452490708599517233532239221132293841708379481396652887673374586403485713968074564071453
+0083805755888358130747915433250146084164753782259744459712819051842998158461581619972310157769421457011089633907439164606444507
+7652876608005273562462370933960187647117519619868786042595158425921249718553500241273244226393132978251127763667423654542879946
+4405249132813172389850479368504130884719811118887711374371841091799443512801595585892341132692059703325567321860246290919547167
+6941199045895501309914547487559727954258599982156757774973817213033640726217789962907551298312065690327505399614397188477788050
+5358645453073717607933338901589045055393757684759513577031387645637409945004898936885098068574782470685593557377991753572387018
+4706013177574137609818422036943485331576839280415982210652357962891328244924452137995064340517319656166353370990119146719861836
+6329505987385677903166233247184756000826411332850477352758018273420949926789280244169127178212529891658087198774279941207714390
+1511370436371213645604523617727839098695940567432172783593724006252095799407942743832278211803447800402891197805298593983426545
+3022464264863164058488714249339098231034997516428008392896433897781383885524218363385806736382055438093644340647396074293733782
+4501101178543767329620885826562169899606635544112652117620964836027885674519772391619599940633712271697963657935450955634525900
+6375010018855545330452050093482150077359764898798182405456683026765532905675606074372556178229924063905296358938093169081598198
+8483257277634207523851089755598501951207216079577367620523344599612671928857960638762403403726285770712060711385777082614045533
+8256451384331378443868986535492407706512110875647453641525322621598498933275339800741719049869908400644823204415096675208523961
+9398321546440720870569872262936542811668490033035472870984698676634686438176528523891161540254323161470512628073841436944062388
+7797071423711013392162710663609589623668119033549706301015274145920933018984092472146696838533855941884096071158160204252589379
+4261414209517939560365542448209082777049757262017603674203052224119028323101718025778556206926756191607192650438859403548542695
+1466289085237622991161102650836935979121797669268051582725264475273671975785294342068745493084363600896894177743687712147368123
+9181597431483593985916614200861015600827448233462428138664038851972627461175903260548893373194383862378492912625568875647273959
+9257826929421951643418775488431746425388390160227055490497812088985726596130954189607412047036836095076045019637105980229125135
+0051088814685847441269344262748461773674703937437029964258894662753422844953047676499113437643607083551852374126649110465539183
+9719703193787962011022241398606941751940065229976379345648357311141518661729448144028369831751739729767389915436519514302519528
+4754705205114290966030322546625592332320235853494013451121235653943274561055976709436804717429731588488742125670116982095506624
+7915307785043160782062481393173682663021526076353055172054644485732609943157735268019683657488875580064373381138013382280006724
+1348120551409342824081918999927191374394809490457882851229963796819461455853157081977254041113267197827298870478281259789531341
+3812065821388690082091959389908490155933727232741583927718485507099116748923648769090644447688804257458798099398350465758474495
+2937863476645119756329442458144939324030284617554341982278719802555921010666415523070911564773110585363083165465312366738827231
+9179756558387423308702990244249813252311594585173041207944901196092166608366163256489844497165091829615643175666074910233765563
+6459378049219057988171618077989915820678435345205197081776728544947416949166191536837274889454949606246062308000247423136050336
+9590694274127077084581072678020481871509177233838867384578103147792423645131300534630220077747270144036126808318115046320973761
+0633314308759908977900550446703882605141401119276147159777634200043370016079844602659915203435729306675829065339742126589258345
+1889317316284541412519941066954231638054475095114130395821846044209964998882207473650227876029465587838652109009674311273487678
+1491201614697119361909884499515016131285970573442170426537294317539659125369759905519191669796894139802704690179128614455530965
+7312991894729010255958350913145958890797364015827373553097639087944419042322472672141767845335817123220952073258598944857610720
+1824787410780276399243095677626477613009119292679764840577779945279669981000204638159164277233130499426714911295485793124165881
+3599221696151384019695918691913331345308102473844702422853474390767392532790500021180165318933884607342905862054572886894689533
+7797578535955366187957171752724494492272818965402286074464704517072955420112819202222670121573771410655986788904078893257371168
+3476992235872213742357632857624847275225481432286353014243838356580086497628026465199448029895990288276361657184717108337186384
+7666621551208709893696388991140973902647787737649797506777580191326933697405674502023865297304974748640809764705859758691017754
+6544825495307606554357924631329747091007811292348124154567821317868772060770803350068486092232254680993513246201748613742385991
+6866165375349816659160016479507285079045466715841081115993221601429358066993308321907376618487248492349626318569998572862307928
+2954124850369537534496609519161469912394832203382444510628904117251662671751490677012621979800464348066614680001698354593940135
+0193499508454379205949576005154484505543366786538069430200252986165917146991374529470556848495722371613024998552648030029385354
+6300091436093722524653066330745577837674427424963685925900231612998930766803747751089009018089480544176580489192755004987058784
+0521904612577648015929532704786690696377674858853171421019639025087849558650954768145265982042719739087464082587058116910545924
+2995811242507764873679857631100733041164546962708369112790103328792294311269786039292022283070742012101949352297665947227182231
+0598910805263795572231168128611351576632001399408367899641814748409013513401170040370795100905848171920487777572798457368620639
+5688904469919555388263250672582090539068694827337359228605791133091700320455439594271216798892203930514646320638691425342088585
+8515424974655688512862245643897078195523156507477939116050565619183311712594098054858317849757764852624936019665610738326843069
+5113156995533534391502169817952742278838176530218998980784387996273419179922080679783505603663683376521615832986618021979492127
+1086319824275441488370793880965889728722603318901376609034648244802721809098732997770252918945517263258021059460064891744542026
+1590099478966776519298307952043122519324124336024594288380180094489716784777893529727657815697554594607079223393500535902031225
+7357641282650721485620638312466056185406173433791953981763404688139736645500991900862738958018055032882772556895285743906215162
+1650489828204176805947705046005072475080530548765982426627534295084219207983407930870882583588364915870597364960371942080426209
+4961456796449042167841011430036294492463136865448894885627513655748299627165496853898722132001299392052298889154231937053221092
+9292679093929935825812492666003758036634836903177775163898869080980492856814299385978432904050294518519563887081873640579238706
+3011512315941368814678516363524198263828364895022582836616309022291899256400386653229758118495144379060943664767132561955347093
+7994582030787878507087359159314617931782658556072425334054967106060186618004693028010903789497198319676911594575116984344480865
+6353605238667338186351983657599555627480760430658384201616896420757729940462911589836581183482303716623193619087127242146945823
+5587627832512661518234488087236957525879895860979271923639746468639388295216331627000259398878042734326931204663332399636686573
+0672965511904852366825996694902980930309250905369947812120763277890579450585046143580711709629358309790006863408567461111578107
+7579999047873643551313574662014234072727914277127742448350969386406545430650595860664380236476144348769728322529154001617830780
+7768720905776990806878980911933213548469388055876623124525549575902760321680062870410042191450149173795942693780209583496274718
+7500581851674961002356261345542689400915034872242480502581980604450197467020488142845109390383270729947278076491900579496982299
+2129690101587171429651661009917402506767801016536968984813683892465052790569498753467876499730105980696506174974591421872344509
+7047018820490212289369541715584056487037206133357581281018603240803633328043751106808274944483601431153046581012102597333076902
+8327884098495349573228357110403653478827808473415101824363258200250596339218554185491862934594792362506926494486378909931564949
+1740056330174856891125669279294923651309763604203532765617783458152533228430452541997637109088581841891669514331609715059758968
+4197367157825328214419156751555885819747937310581379204615061923091469679845199014292435432070508700023932922581376409143095993
+2165125379005342133424590972755612895768392827051354709297231877589314385116008084334202246281649011825694669304551295469244979
+4509728839111272144692019658264673559690649474179262646699331625117318888277703635865926266976720285188867979085670193580891875
+7275477166128052446741208082801962510905074668975005769114065221711777393514237422266031434604625793424024653464475330291262873
+0817046411197027445752205700663441451626769878011224256767794721900542448009071309280703954949009199107668829370562168637408040
+9787763619368655981881242490879775693879040221802840519661369579710229328600940826654427779387311550329699789056384531195194998
+2723448594543172549888888596962814780076107260643457934204621584814413545214573904777806106803313154411323713368897701260407449
+8000951726014956095448794689858919573269714659606606617498924039765372767236447524498222062645212525371056330185170891625286898
+7400634580995643373473457408678165048789850829161271772842260046851336944770097590727744202976687517001530085639423877373364847
+6131960772116097152434381501203781193864171006504601138647645912125860654370952251962787439280635180850121164508129160794934976
+8194796768491845741394186667260815254416308027847649620467735109219757947751470402197659639068665099777922925932497275155739813
+5209664008657449547795035193830830788192397569777052795318568835532699855624203558168754541268446171707037486010417690857467487
+8377976554519991606329945190868959375772837211176688945495596448296939525690240337764633216663866800325009183616688088580000528
+5192787146614999641495067302066620692218333148024412938301229255333067720338121642154391246693289222550082295681213541896998006
+8136852204722481664059335120578115477689164853072624921786692464359828604653937695373728935390680120663294293493176103289690254
+1144435038869128719771735108732844672639943553994309593207501141582954078007058121278827020008994616209652065957537243296195065
+0970656298377136326223895516660489631269402730038663872646787518014244370067321464425302758563853474605729399708299081361238244
+0240779629525661769222180612134943092596901392802155389763359378856115803129803025504659400407739325825079102512268146609621569
+1920020849630289059227598433172661405103577932866917079329997842631426173495463282180424424558897910324932519322784595681717233
+1144193327801538649747431966846093543676528159861420323208804005782998653152702827377592130780075570401214786834816747288844424
+7672000694647648348909906701159130777349487715893771185782393615180543175659863092467698777377397102350383295634648499503885338
+0495630306491592179663093479474155305629241895069310776977867647781537028272341913619281785471238537339471770501056143359192572
+7308837601725546836619910084602280257935558569169920782961917685472285154488319168403367545336906857013748237755825054290532894
+9661814404701500878628706398803486793202614438164625925828662516099882010742067149392493627954571934045651513234013334682059852
+0312168977557161126723210896500911203207572745509229840888786198868413208045541779692684493190694384662556740715047630385587973
+8520266389063839477339561111091620930884162729262785462465146299021058533677470756448900131157092740484913244873616221850614852
+2366892600338849323238354679971377016007007696850190096980341739336594207986799037588279474367471064265784394163814443326245256
+4911325423638475961054407270474262985635705119625522856108931080012973303196967168739739944802380176010145279834846779349851937
+4257810389850148158544144932315012034020829622092429506782620637342284858172415547207765264086812199822149360687311593339577078
+9708659858477940738903030251204629213359548332123829955153191520032561522000846708640602917979387525987407975336034837147466054
+8086930623135121532860695594083516763569498334428501641151038532550501591735570621442476271723263173645629791905305955098548029
+2777352200022791503781001509067591047738954816120020121065054036180446105221458464420759433938919480637654297994424050557216733
+4557327979787779116307153599001198923403057470538783746410924085722270113118125208362788921890249447415394699853853075390237309
+4365884384429048241521760483369109759203884801440475321881130286288789565265074980716663859447668954490193155283240957032437631
+2400761044210689572007006009552492603834440745618264315468884643834376009957185817870038205575856137576307667033965516109840180
+9737040417279915834911486990827520959476936502177184234720809847197612305989565105760154340868284644203521456078055612096029018
+9781808678278846885397125652129297898882169803910679237997846224593685450165476495607070948013373905740079438009246883252169515
+7739852920294363425633218123401420673829295163516060432640021373043583962110762867984429100483394773437741380363822754539046324
+0883431115446791272406513984118239461183841794345923431236238292749873478934884995894017966307053473725524062094771916898837907
+6139386014396316197310075826416043562421564641768733346779156742528616231256212666391070181857228107399708720583287723130892055
+8564495834035892079724353995520557131026025067703760714350598180164418444716168502414005579666385014431317699567383147791141861
+2311406885413424305003701677451722846677377710768986204839545491722958560065098823523147478261771908820851989126482817082569115
+9602340226869859614696378992497033778548537442058541618817057710375353486743749797455027651809309416058045995383235110379798461
+9628709222162680949961060074815226201933096277151174310696525731658668144988286362519156716805236829848685383992849148064465103
+9735346812240729849346428396581006547963793149866858949294858741576251512791660305611651687839731531035722282235292660633788691
+9538042061855430905977346502656421504814621398394569363683719060626568625659708532699356988708790883640172621307887407813836364
+6305019984976325257337569429166547690694053229542307273781369534773313407694544352991644928363693848808898178142342306260087117
+1805704646504085604801764484506100460470712673185793035853367748681894021658904030806253312188697070560965442489042489792077571
+2490985236219600794455119570755743690829793064352980492197865586952595298856978623488801799239792633697972577551080842006688049
+4451839628325290929728145285465077829042998419941805433824084767085375358192064592570165051059371791323138480645291403839150350
+2979438318932849641805788421308077401361414307061802172300131888869924632094305534351210554801463479850767128364891176166829465
+8872921500436141106816138238492673770588860037153870977927285412564501357209059187194899313386454964167921543412282921398037659
+7636485131279033828460677166640282160440679145358607334279812434544494120552175807283800350790566307285400625724030248887429340
+4680751592769547019498010899871228144441828285042700998685644394131763248290312908027689367430340488843863114128754770298553903
+7371408142591796865710653973046215109255786437157352313924442478531290092820677548020730647005559727973069973416903159076053104
+0296204614919758433624657596498376245793058852298819735885655373134544548701918947319286620768915718576221199382936906689136966
+4514861015660728180490886079334753171354215683899059435960727947953401618302867137487819801076786142685334483700384896695954037
+2862199178730357056510866292501440152986864077701674864131708177930481209373944027435441136206079828523990989033623289788521958
+3232125855905003070647322986167904784829417211608519129888545490992306400854811324029764732798696566611533605039116218287211064
+3328048087467522304174357185558580322486932881453149442008314359000540253074863751401069345083176437332910631591438430165816043
+6086110405144344067589331082608930355326779125945673110136783179380891079747539440654925994890579005806127474614509336396435324
+7215091301714414443069868776064064504395207482808517829405383379414684365187710912963053526301972343897304816484149722894728342
+2436471129882505774580140273945136647748090634204279933544155848974105586771383680141377892142181597367201114241681187884944773
+2048644482475865853030326358622959819676030401734261133906361439604280224652350627125083350512410927294034793877892580606553735
+3602935472072437248748601211519488988169731855279575778400706577254567463123219123896535430970244921999769114868734160215986062
+7783657628040022836086246510234417653915945131795351860293548640058155931582229824232337815003665382949403984933860425849161499
+7472148054410673792713655531708222900140217409627089428063743914621052166172358563633841329724840401144427912925448192355476917
+0347053733535476550133949622008506766494989314867137093489295258193336447136204549399148001892481820212852414088927422900419709
+9639078047884835538046942482094804161605891002036742318046907668105442784580061293938476627159719249453272549683221805416505790
+1032786228200415283294994910054729118848671075845281886209463073179728081317785205722424406468440642562912784973899656483223098
+6968595178017412521208376863115552570593292656764798517030930445070380603195697501931025439581550142699705302804245618724490111
+5453654356413064906966652124099905267347821364144623020142756809037695527255942562866173971391249170311659304510623511853516154
+2732536262071170918681622064325048337837520111884271935643287214208402090379942906531363266640024631740298714867728868944222573
+3147285446615157276563228822132897878376378847350594831988142529113309891139340761458000809351957235529902167556281922497506368
+4354478919601617063477169153215969873898414180925342349186710519974948744199229908589593712396666250201617868945303106857533139
+6882511013607261756622150246671069745871933132400620002505947164316958006187665439907383822926483113411891198332966708317599278
+5134964407461253261959522854559873663187547708050982034442691200555341283933873911454057728258698109359806239057894517156699836
+6450666103279081547887551782344908272320062944069880747023544207556937435206656509659651679103507702121341392065845820245893429
+0369780371537429488949966165797604230927289652620569227359744404503741546226260737989821878745670653730192856868459952515531054
+3093345869807819730548713734544643718538694047498494322996726007960107180939172720629651622711868833028333458719243526925076960
+7989599203565850572942150442657633965818968052176208211383992661670496993990824695668976291478797155039216428981397014999174383
+1307119242405531123217610464790254600437026788611070015681427406612197589802556879143899518155467294982590879340815458735590885
+7771734336463859132744468610337712969586326511610847632572701236574882685603506834926412287387742247547804989759024383729486919
+5271411219228882208040644078382620627789689028134461694434130394862996168758457553833289759810275955726724366779012750280404286
+9512730467284947060387240979546511277358650894416265360099607348235188428440048072383761268322342324845297508884228837212297345
+5520192598997086640709924048681358015575115024163991652287513881247554854286841200564378110057343645081513230448973403055902132
+7020240592700662201858752560247475343913953666111892278775820432145603140381127320826667055090149454135269196723432849201394471
+5046712344141591199667738249797803701007407397593500840656021101416075518278507896267944040576213675962509419570331142339223528
+5009173314040221242742971167778009936788547416346651832329001334847054317513290947080798012432976916063888435394522306337209156
+1366848096908460688950147484431870925661107449748979391978321496249695501280906214711588783547789400280700153426360634008817145
+5032320677216082097266187853807984797656213614647275198101803139086954569491022740666386321968921335192817122277500443048900363
+5004785469025981206660221297903847696398366951138307001168655587727211921402639926973173862035209940308951165885978641411045411
+8785398824958308479147867520302086574154227898640917802025901098713415060910391722736844682709559806414137007346900318504025652
+4829177039724412998798470463159506613910620057768809973408365008034259886542242550978070824664073713620021235802691404413458167
+9261226904113620784725763761828029554734562287674270893824453948307773514334280989553881807221303459863642843519335273228474128
+3311573735232406552245381370523373424363177967581228254334269537766809380288366330679697723673023553333593300509406940840178257
+5850353980111617800710390835159343131583882096987317262767588967118575624615788759557354550955443154249258491730584290096574346
+6058742867661098727133777961247323273097355895095662383648934730004254372357455111922489913009492093823561131792526688980983778
+7068373836217667990225856363415691473206022105532884987579074277226993152918608006384495892970483440333181267244554192632887695
+0375929236714973683664267906774009903162875936131255110025871545553310661098253000439303508717945000859600253447780364023263921
+3589236909622208939924919255987333064134666511205037102476749734554331712415072770445515704120917930961110839990243914307170158
+6795584768746356073781978623124211251870230688353778395309754364333319536742360245765209901147398777468379230149142523181377411
+2729948487677410474357762288343380948554393380782338431844676175646578459942584025062978984890983296713845183696219799180782039
+8853156389861615819589926505138052323380550759364020828050387019448769426662074170464533329827565869171293278882331249180195752
+5354617268287092363055229579924827016859348547054043349609066878817933385065188678139799271936447212380584467570750380867131343
+6669574812003056132820086160683395897628895296098843871784268115803999250621428898234509785779912888254113882189729913124138323
+1094710833263258542617692112795417986473641110466966207723302828445199198995397058382901854029835381782441946019335577334721714
+7084654187809403875061887873785967514836739155665927380077234732823032340675248478794617424267309726934964316167994411232825813
+8586810770368457480021270214945101098418804122645991758117744041940927633232985858835902473466474854825024480648895385708401183
+5596898921066046808429836093228050083092077217562084369964360104846761170405526779538921555848456229448715495096371173722462344
+5660195590159993019077789825004164832246820538076625410586718868028600352830449932992980717485232030870587444549082470943172077
+0821935416600837395349048851468072663127356309332941980901438793730151587795962214031501434310617749617534269164881521735791175
+3042072934705160703532059769445721283937901499649463824595439982424043872605434635393216517511777007087089174560510963232009367
+5464155662396168936608488040261163576038165196682279135320764015816698209508887367606848299565138365679605265583581996112669276
+6753095562768549798586933346781184629087517744898743057935941129179204236737611864578907720852163937289062427955626269555922129
+5716541079272109791401178359438691238957049044014297693164836859127158377764717929820749372762244199830728156908190474636597721
+6048348633690063166546832299456572409599753235001536610146572139811087134501881675589119526672410909520126024302026020371798099
+1171674402450497762501699459068107617561003253876215131387056282446344211385618131395030296408469586922564210025675216461987907
+9312371022806876440175927558224158477356755411023006311819103124252221341547172708634888791607917037276394431911343613744399883
+0922159956723896116809200304280546821592880397796462717485456950002852867129487923589665229233372270334774238944990617682919310
+7658709241655408916654408381196074058493866541161875193933692025333882777349795393761970679827330490202099389041851596493234215
+9234545178442642967566968436599668141535683259923279950462781030512766827071494181783393026832191674347556257505316419663487762
+0041257342453564273568929735796453624713683399848511617479340816490608890963355058355974856413150349382759095918170362098854394
+9592779304960316507865578967321355607760068698329045954497816675023927602619347677723250166350520531047186145206536424990428337
+4299316161376269795506896486995922307501710625151467203920818965364151628354223037516185750241653836563366411298238504451597789
+8841671421275735676647633262528681899530392131503705721695449652045887039670882496194478043622621695748874619557992717633215233
+2073059696519439089739646800449388322820261958926389800326850308700850275001529873409140035288149114816334962577827586268363961
+2490360047432436143344657376283381577226551875079136121637392911221073093866166045906272906769849919522908370281254710635409730
+4974848754591262059988003622570276863287575164608170178580822963208162146400835022943896925242423440936618793540028102479004702
+4372126595413379264526984770633204109208673880518625238463206225086878596008443858616399507133771134539070683384873925072702058
+0639171273649854719051709551224607779261350414555233764709993649110326667200717789312129165461963429321431418833445603440663689
+7186962822361873750181210266660607397813719262382253059434948056476254707273143420389570046116876618519383113357898774377253891
+4319529017033432347952439153798524883464591210553274851928717915148566352954737293867412627976883192261494139098284868083014649
+2622939111808623590774562258070588172127827495395694013730379591966886930134915200669202327099882207686441261515920355425526638
+1200973651071533307294108492132851108586204275141332635739794068695424575790972361088170979623763207458716935295604008671317983
+1251374850775260697268191392326213755565839271682628582402356668458562455145193885654924842502488021956636839087993338831884363
+2092679910172237700017761223090447686346621171455515944807634834063707579619074178681232780539980362324148874096831135359068248
+7059799025589703414119220067452626516006331839767724497907056535882707433149950178268364082722639297792594500281095862497786970
+4542905544332920101592075397986385645511891063856851014878633174032148021231620025882083670673312205077519194573640381350698919
+1312255205389657370322617251904525722465432117955235178041221031184821368449334584954069933722375723026079372281725777733909489
+8940234530803425309074547064952811642951856360280155612932727691967562499759113316867977300723413954039644096858319695187621995
+1667713304364140592650059312268785120415368020836414159057787321290823207568631669529330852196553357371986318924246623685192637
+0422089184234642438098080557484372830069143118691288742408958852833389685002956551956492581208496774233386094905265339874099483
+1677835356907666147956557529262732608196197501168021350247232245111279150809917571509855702652690905689682229523319549019678024
+3645155615476272052329623583943381582821256380614894465459876556622453836730749021655688760168012160726745987877981868221817319
+5647755640891329597098392215119820185325320967799221680909508299218493251878104661039386657485694867555315346235424508828545406
+2249500944046395955203873004372279572553883458895334843433140571043474669708074473381457065865063499709405786900325552248426583
+1230511579171467602223112925195512272958191569060831817009891427720423564097069405239471201694564617244826682098552152177059273
+8469866721000791525531110152439789939013289745066720962189402891838096512969001059723536174778699525713458075138245336864075519
+1296905270266717168150361331577154511349585629938472384230294812334459038517468323643620870384471376627488513753063864443527971
+8484849516117452587091720711551100043539596219785764133452403530020825880462282298393651618450654255243582938022557870602084123
+1944353914349184905366261486479354722961723711488366658700425467290309892874206605011693831609609440448499484127167958439545979
+1904342525350793098590501390656028964534129323617049186915074724786886755773131382892183343708636631327982725884104881408443775
+4047731221209068512782993439144246721190758070966515666060478086425710216870076434550244885851035049595368742260028400195490338
+3375747312957348876639595293489234210411377963219380216708693519698209655124852272292375830483071612875799792380567345928238534
+5110079232697543396393866568868109799067673989898575725771625847005572590499345721422620239447760726870678880204127450730489419
+1892883230935369730591390745517921975081616548082333381141791553938700817410468926449238904528671037503779324573001732065035519
+8395077376884962568002904176016991329810132526312963614723727626088091850321489438757392596606168596638103913778878129196298132
+3938927636631738411085232552592623008752473475775738216360990000223836611551924314564820835426069886741001153829625505334993487
+1299692449183332553204542348863840181665273246414104121624684776356638436277872632132123576236177751436546351690643540205371844
+9194356489958293805818668234623245496942584158879649161401045859846964460358471563904833418667460716546730472435403875780613403
+9275256836090272445757731146730052254532930338266683064726986679677894399506235508548851649563290194895324537517696553037056936
+6401315045565945782629076626066813595555038611734944119511046358367624104666208828448443470577765348785145599426526721185590575
+0586738484454531185743029468713911469676776854865676690022624209621140076731906638884334409090253652724218159918793965233464039
+3171209020852465810305033445747086308509991604961680580404820907479024353374887015602705890939142087700418451581794807689385348
+9424311150932643701645157338987499029528852262438813754400403069738023146915551968014972578206454343730343122265559473474927849
+7742146609950233423816671939328483772283214892322537597846916524424589673152890736557038920458731659652032921748569241119859976
+6687533180189782962288035952098447575892236672807319984532899523336137857362773056256776453970744401322852572058367357860586750
+5112973080188345114036362904396465766939815911981737447433859679102909113460170044475876180448426521815838110280974934802651453
+0141366660566071877771992446357332649851216791119528638672163150044856967323023760152081614645879961910911227845879654515023475
+2214123760185353539707121031098580866690882823675580600794715047520486504684525675655152270550399135886572417008928998130462848
+9223973656232181173590003292639341133004977532862200821270596930208889426180465089396056658959981954090935260888619248916061940
+6623578698318166136431412779326115216613003933902509874343492190835346614403255698238178964137991654202739789058288364219841871
+8291158969189181550110191401002122993337707939239499805961356987899937471416091612952104089354586248344316163672726189677077009
+2569911973118347742318591298716009672334442600647034815935927622454202539592391699029450660978546827587095337413939180709898411
+0899648100113650188435064875802395140965508050973328163902047496526339571954451436627138016940395531683176282436292339394573885
+3218116539223354243511329358754444736017570099304122222814440304223163469524526595019625005310578387024223128529473465323727623
+2903847495538482030544840551895363794476928236443136637630260470246965452066473119820100467512281726986329810864283236603867046
+4226586385557184936270267709088518321173404628666811633771213904835009960571786348833009556180773685058946093743512399598902672
+8536593915600232712348175092402812063615932808932457150254760365196790780020038688785606653890320304533826035350207715944668272
+7207307332779658122899268750088169215451053148485733154400660830345046074837509653982716901490942833776007996597381089382249055
+7354364139715042807616100729619187431380023428907586266528433249618278407719620456619422594117403277614144426686677487237152240
+7463017222778211045789643242204755641148330540930800826901784405753146374489626927527265867849180494980902054821139633747003818
+5151230162674659769071431499839596583910959703956345024479063722159584629356540852497161935430481786349464090482420412307760810
+9834488101241849496636150547202745300929538510953947644624667132590235877398283748992791388091916279125999482122365178401663101
+3799117737061812716778711014651789301773605485731280987694315010080752800132070053513995645594283497896886041897544784262244652
+7787706667573783951864085352707088626343810856713494836743287556709150843482692271254078127357988781374166954894723733919964351
+3850833609175684557920955809259004150766406752693874551692602542748508158101511651908521148570349768720243116655926752800025156
+0542333256075861408967459343438031423694963841751597298639419078331767590705140401244001636510150856151990464720632445051520472
+6303430699933496407768275797041897577889994294810383735293345544688537126863233465001327982318529841153751728223029693637728347
+5397568768462052741831355049132795323985421528118062025164276988946171985642590654143451292287062379578161283874235728279748519
+4640901822963272018953105436900070403241616145463711907565248533620946580204196365483196723416387548557874992063706490486368853
+2187665586968675889547896116950223441017696539693810802819756256217188102291391477467930773393197219210849036472348714939348493
+0530870138541801269405772003173391922440292694411582576482977240988452402062182324365937231322664832700142793000599915699446377
+3232764179605713808662558293727950897506959582972158149863534091415959234408922619772945504672047855130269189456164558749700864
+7976387712997851037838832161690498586021679479533477214488890351913481087239877288703362839723676811186594991567854176580725967
+8767096970476797579593159059506720944428573124512821132135870916546309651522551842044412513318859523946351494542237948488449896
+0718064204159475781113170590472579807866358541733298234646266805452325502205676982790448617382183104529620072495546016035798369
+6656888096932816475747398102488120987337320254949271905969490909227960204913812078261626642629009104843808070570261399892364887
+7197928827518406319220242665874355187232953000643123084932578105682719648228431872207900564999025910692470162420939628457406240
+9390054304943829673541677221189814900027963471043254648597886086990795714249446234111674340418457357710907778877224567169903636
+3047190706971324195888140547475741620358462920833528017528636158028581644462796976018091635090361132164631234849610385434473088
+1299169151001233913629789222426928990506746164121889744635941525381099603593944992448532482489564134843216370953945058018816372
+8022886634541463283701288620853613352158026264893049477075544241214340204041747957155846007535087712499320675089565208063975842
+8518974453812680488184297781261482966404248280615326837256707090751389480480211355208009414536208955423929547041219391948623885
+3604467721690594055924832819820324481035373705830034807313911053016213471052470202123999030910736617997566930544442854033269439
+0783963633104292458209399376532444272248160361826344666316224873723641667255667675127680227315908535163742986352235015659049712
+4004639628899564002311837850986616952858773518487977784208052701702476955042845648511721265262737849283604073030798668836277183
+0862408653011082563803132060254754932254909982790619138767168477417959797920610077885997837256974272446346326081237570982197007
+0940886136952306043500899870090754863364443344376526643707265847999796477272121932881155662360934605500536289044543909420287159
+9325468416880604404675394196786101658805312863903480479928341990160539724867416343519113232899201923506345096672360143197907320
+7602604379899247751883206653536848520843218205588950289513511227638017895858870330990465204694386615676242643330003217066315632
+0851199846447079085502271034855714656668178101657497639831079366789502032474686387227843449343312220724903806454747746782689424
+4098848471040002241791388735422021963275960354775258076923928679254165040693087908221190070756034164623860222301010088075103056
+3055192757629057465255631284293545235726639464473675957498678493846951810733281325747646636144880693592596312740548434768830767
+6731474905682791005984276464714844713588718904361218261812425686803684106123652431919970410078795392818111582997268429659349585
+7924410389518202685905806688713577803625532077879713115752972677622209346192681858566234259911076164694414416704969551453021886
+9355683562980634479815919874568756218379958083872036318959815690363034752884522901587704723069489938561066700856799286608658620
+0543220462343036193244858851552821480362000689940188453022451557344919396300863983139599553360452940548134852258624017234867371
+1067014527356580183151961289434647684360706506035600010429135039073802230973345888131418619960777100132646812026883383699827970
+5359069383361932605007503288578185157851793814788353694181498218990573049785293883804780055838358139459377587968253742572072043
+4573719136273381835268729540845328454994954362222395612112318303745157807658681724375200294326161779060096534923740884933625708
+3514458846264455850674231783280205705825729759163794635971944702176098831501306476593168602881301267771422854514181550204581778
+2814589926430879599930014687698610766303495462811227979670379853246555977897078815634814137435467174275073493314846601851573261
+9109412328394243903990091864894855454386078755925003658916610663445020722891205775398782367407839761338086985543481077581229638
+1491723826525165284311575346657279958318121038102570973778417404071686643040506005133105712555305338320966176072017676784923629
+5488218241739200538202629320385686355121297434909655261539604247574676965715827475716615737941607238002608903015929093309168488
+6222350309549145806267049598652344478433516262239158892817022906333942210072994901250459132730572231739319182532518293889630019
+8044072077285353283240535057997955717161542654506209603492744952552847242899140500411096612225095709028876598587942929972397072
+1885954490526928165806858149219735696470308645981279734404025197278823077339850867123073835557226495747843398970587652389656636
+3636990744440216604699149114584326945110057025978680402356462092308935861145193409488632679598241716104734129398885084544095857
+6069902893386332364062130016921517943943574898468298687528180638591233629526536463888804022514538460226447545474670300837773440
+0715242925233223925302043184620521073165032928562060926764419538572558168218946544243657541925010495652673050247406203961490742
+4163377094941935791929068796922863289449570870715728363127254502097952823099544701660693419650850191571787642058768071578191335
+2362149372830570291861457450525257727016337864275693314681112878356465000993320675510813633779009823896594571255519867010367760
+9335339409871128425332395511671431500329529218909754194982323897857550540930935004728114503428724192561034251245345901549129065
+0756506273973719264925319448914314432556471353593665242663682345436151888535592338801660197397976918922142540903105362128344221
+7296939654818049488767067190718755957947538340790260392001857532393622868997477129188922872359726386124323878376837617352814907
+4078579999111217939011699307760285871218819333972182125286903838312055662520500719903656687016759241817857273468272683917688574
+8726333004719198815434960721386959090224338905967680668744954339106442434132414526246207631805974218944345895924595868424575128
+8809968439523768418749746186037611280882890683322020074536396621763557542013569567593054212148112921735580176883820120783267348
+2537069038616920940158973428724068585048795501013293376681740631186566951229973336427931288891824421015980577224523633941036996
+7974808176187279818828936860482106588007126950454089943602952411737485839990023098877207814888492767150658782003308086338815157
+1588659669715002646102364063331711646691061797936643322785359527528662208821134749050337274899095692843563066296876088924734707
+4549130202526685872258479111021810868210332005793914145311147798812593113617843971880716197778981371491177307945521311901222788
+8560297570244477829694687977784621455987068942424983136944870380427057052887779787702603030649524780263375021654142024115901877
+2048774313776039429808088171712835186320571466269472744364892701622816406146475324290364012640387008030349061922998372137187474
+1958983930518040048400877463606239970518078952389442564587925608445408847664043055091202257080066087803944336882062127350978604
+4065348283423540496042896789726757274478123900698244046915478972359449728574613924262102889566496871444268574144572205450579978
+3629438124450409423602990222911509881985430704078927765904795404045938118161221397917848075421341126252805098426191320837834521
+8085534923914835313209677375813349364458599796275600866316693139878003025545882010477316042716780306226946838431532163667037127
+9898915134568321964545103764074604849670802062543079353666823915979509779221620608508897413582424170944308180311897168957048017
+5385323115399849956058889239701492340513864492761797303099763383900112373871513361204005145800948160917012448658958645510687464
+8637322858113048873422361029279103210946558131854412009103898341572774795544194370639320402689943405658836056138282160542993169
+3301482949893831756487465487869018898293856072780727019945397657149862423574816057140762598392679733606145316506298182753363157
+1989885295563430148607778298379580655148124775805236404809749482897588166275331919278290911157248463196182871139898936725797368
+8850340804158989499571102548588275214111587736824329752538481445797164191835592201791780416442465525643066854658921528683230761
+1421812723062059588410998478367550671697961940333154251595442093624642651562126033425248558504164225223871598921143098979968917
+2477995193068866106116650832975646638319811948342255800290956070421894468168681224145709091760495793451121243995417375669474096
+3150729646482352886032550446062928871539222609285098660402450856512727724053427921573737445175821849100475781418189174380995632
+7046750620615596575236877490285020288321290904270312430965440858488622217217317102253600290127052465317624607416177498383288106
+9945695686299042380678429305385240697039293151977430358157956385467140053019250720885367675692664936064594234820657654969335744
+5571751022714308898152825948152037875574841245733361004625842517428626308101356793475497881525020804091668118665745094943275801
+8608762448666074656196662829963227928222015907465782465504699762597437156318531429585635263586424089541092855892902609967867982
+1978685830753176969518395838040278058667840236176435782603960672407003909222439483538760352906908927302768494238355233209217253
+7074071920319953536604510843365153876170171633349491568232092272150542222706006804946809770825099582766752656052960983718114235
+3280496115751440895543554193849398007467023324006497516116534251153591572725745514291959829061315518724947165745450390160259001
+0601737046591989613120616719919874653529282948250689745032606820130735453268070027901333295387220734852357272804293331117523997
+6136958737937467562116926228263651346592589988767235293060122410789132148757897567424381946719333849272080001742385628150689944
+1891595701639675010992493605507619576155702842803896050077803395482631144748035073236453571286662875633494080865014296782405059
+6994138350962374748911276067098522195781999897499082597900135054301540799702368264182765273926228557006482725202228009397664985
+7788023609935244035749201882811852725625300846793646185552122933557882704452555648205100150340311907075711931570895497802594450
+2197653103798752067286172607092220822596982226247423576487125070944191009560709583893589326623076734376750057424185701225493266
+8863132327252007877822761700057804325184406486939470443703245734365105772001424789573894937476178130538608010471355446757855177
+8174190110749058109791874932401725786307915411703003043709908238217181652029602262116068758446055873309569311805547464496642142
+2490958747068677929992898459199669839140241121204680850335549077174567238373970308977898462513690749136086901700597984427253536
+5982357462083434284507903055152940486985159078049952746161034961672224995628192794860546561549979398991180455860037140923248338
+8926976775587697462174304166383030496921336111150196335640267063653243971405939737115496867091474614902122111713955464436671112
+2328015592752422584686538755738383160041067711192111211555671470860520931401458590260603642848665758765427324349701633338120285
+3238367054704111120178059574962944110115171398341904274585267575082605150464279484097073060481753901121878225454945359042570553
+3450237761306126967240618521993384597368444622149529677366929462149782561575513795963740446321127465963106959992420775690369312
+3448814725588587245567368751607825271329254275986408132599484784341832975302652140521158378926626072460485474580935278488412601
+9150780220021887436734602033408383688852530542191765389359753381850912455739194414678686576674855611507802645590418679170889751
+4835292344245385826099978982021385208338079311915794842181613685383986799333650292340449601221579759524765161463912861431586003
+8364091375971775721571844301438463624297900164446658688640976105663184901553656708363187917609334998277021278755741801258289094
+7084708048206234641953289421943297010794421803966656094223814335341165874897678668246105857901156960186097878571917343164253048
+1580091826012825586670694920435572709977363754508123881333362672498821977048126176623956391025928031884064853593246953559407401
+1343143393297933839473552543351834063051545756389274017156011730389906161525821950360013682370064447544881706475110217230969461
+3302514538150761859786668968377489515133804300482090273478961905590177116881654275768644498073647264106408418864420104945624333
+1455642109436975199690456185370628722356663838058282076416293074142932077562024273500214654758558303856335007961702080005015078
+8063031532965823241531821249811544926127012157501395220835632529512891602224510304171587094059291180949555426978545235398053558
+6792060710713434110654251175014016166953632439786838514140951524356192499726146571336067500056531834668571621898017480292338282
+1437695510093265077864080367192602710341444418961408220405302548941539890702354912153612054318858614633735009858764482449040861
+5181414865532338468286437374705876616670683310417100729198121447458573292151625305538384979133781114543503822301014850960361423
+0442509889959385737920714766510641471461284309092021412176656794047214218226892073311469169814612693044014585717564971417728218
+2325595356223658506960436649084028083363095352384800259697237546709925440654926883086116058532378827751785516901620186132035077
+5272017869427934924377297497212161665902064352062568107159660976294283182349751217848859566575424801083760720335160297859673425
+4927647302447341405487506286250768152116103802235113601574433911840768325925117428685709060725568588745725091307806563183578704
+6009173829226300709392490503960716312095637543299322573027471284752881663572097511651811613598957587604124624018835545870558611
+9874256128717490827444943646188644499417848153072863603454092200052312279880710501340245614763095671533551439274986414901802322
+0712116664532492284027602515056442554560965687688409213710573265303359796914199163349296608736358741384041138558244053035969858
+9693983191087651982342027390681525334777714170455444776207288727295047097906322701667199571113890318007616548536163726817679168
+6706523778360875477183129443881169868743369990013775836046887154518569535610947164990958856446973388802060554267647855673512269
+5862057420569669693068391429181291253874208771601116624815603880238130385298427887023332027652265710135551985724073597417285974
+1151313997638402328677281725415458206631525714244607205307139347412188214659490398369065819541976622293080801350270699351750349
+5489131825943276548129703872359273308252153537674522058679810049913479398153870812359217912596783251244700635734540612732369203
+3810123181289945953628771451906051867522552261199661987069529884844103683969181491185606510174695973406830793843872394354042162
+3346242314263710422512316433607417431578705396179309838772547308651613774189871178285455805352015354652802479496815910335754476
+5032059944587174601615131788722847272253927881072336845872496308794095355330608135957953660775615970673613290442946086962710905
+3407385896995114869865346803277241560730078573870063366755416777507927736959074993460049742600768481558296737228998922109024099
+0049052520096863687692070927701978011226142548782375715516453178031755305702747877694502859869129537906539333534520649523091710
+0991259574063512483397592194908683392249793361680299501959035992654866098958575700878621835330177239453007223378603834381079687
+1103177507554459538813745204571902700244177530864339036101223775180048578597548931452670546251696214644617674818880606435247986
+4019388020763636749355438098141001952281422670022244785922521428313256185545192914769702955966048643204981030086298329088086717
+1549239391810219717095199987772454895177623386763902046734720379092060908409042895882464384442634362486868518995850543330943745
+5263274887172899674152253042181056688293450964020128773142784973127071891058343458622006778652971493625047746423062870250661196
+2492300927820520335243072396524887229850551524757145264574209619185242101186100663595852135831547431534587842715149723823788454
+0239821705984933412196203741296576026949577895980132509651253316722691651055934018399445089497754941402505430183658650264000569
+4454480470480799484331207273048645656468167612178274351303856622687362159020726843169180682079344623827123515453025370828135970
+6142817374030811769491227966611452974299687874240073880283247099440633899922286466254504368749938286010203764066551001971357963
+9169371099648374900400474139097217260717487967105154156622253602791903705738661081630850020115390238371457432815879031763979788
+5560591117813511863922620504148281644660212448276865905578433181502848473767100143776780656617049797235772123812344362645447507
+7125601127543091335948203843174929841142906765885076202058923049770681372235738838189576737300366872775686393117885907972185950
+3813261893105186097817193647097680347436595910522013775725325978428043833139417789267610377229028363642103442485430761044994912
+3166100516390908023193075423476442023657276364366869002050485177701831320339505415669888608102030204859429175627661908828955978
+9494583112215459385851845969134725676775320276319447511947728695272882901489693777569547667119292451041697329224102769821139225
+7691777515996491255498611230620011375291757353871825879292337748953866037150788019954259501731583992956846734646612549716437169
+4674403391449814677760084246730522440833433795684947826674440906657230316614951017230444639014782979009506122819959837960185292
+0124355369267161692186629219979251945207193338015531285271750882020294586168274943975716404048435047057151424920598922068881892
+4259039872889979839195103377532319383985569925201669042943584292754218542022884377759029683915124413393419307275904131879991019
+1735669223208908684334277224397343396336961848404316449603849894027168642444303310792840158007116435560970914275701222063897926
+4461905512399641675513869110628312166872040099906116555152852234330620387342830937229572832948858700069818699059571737043133655
+2317566091257832110561031578973018527337285656514910017567896208598685109912802746001639928928505435442403312983994465299665281
+7100315234971800925514182498331922330287575769352512401970636582041663941571732261396082519132641394516031353060487765740093218
+9334108345710950934819716799864030596011645738530063495673802842261253827926601866855793893356025796840470669373855061371630452
+9938632519142602121728449903028585427271086908360215670337654867014624403654411514574585082225609074457979619906343109374814363
+8543685485409092161128411354085800792705928451605723409112677460751012429082851977989992688721655128865875431794910678786635771
+7286092726668793850700794820169050814700948490519583438078010079869324333131287831724247406778611721612540484173599614481822185
+4574626770701467258525092815137010178678255624898097602082268698327798870150981485054197815103745515005378748184630266101601233
+6996566956298539914158437280054873330111337840249130739283399579411421525420812145476940206933841167306808654076518530796691101
+8418268977140865314494741099167445020028244920345037125932530888607409097769183652295273473400544354104335924214164055029523702
+8653179301531871439574603212631671179611383475494609355467328013854637990353997237551580336715104250041179882078593885288177498
+6757096834181706624090949791934584516326051126444323415129234296822035888300651545387936037901447054120865724936805272897353272
+3719471070090385271298581540906250911443020297189549719410313905300350268160333497598330190662838247612158675798074496367653467
+7420546839654007142424912212795950734732168508855699265941182387494625335487354878640173067010282119575715050167662820992299427
+8999971488927790060730948508800281979058687995045352068109470869864835768781397747295222955822196732634803342790733054201967597
+6576480323890189237090109618880316708942469888066595108911237671288781962755118036472198419023002661197238821372958077703913188
+0030541257153278168215715641021711922462243607936192442241352641161941478602829260934238679472069149540374325351015851641339748
+2308535064234691761213175923993413124441933619616103905759452431159366446936203305785164404138919753229165645626046227853031827
+9274311478528593074600453989280243110143811549871941292371158642466286143077576823957560727090752083042241440289345317446749500
+1173344584450748636805732688311608479601983149113524409946668094326431976475189882181347248492781101482302481266734427266149348
+6919145353409181506683417908661000530570384104910516382895650835980412723990294313264588477866084060873540703108364930450237118
+5325748279790493246685409745464007302387808804042056122442284885720787803880628218787879564860434934892913815793329423983574457
+6453232382761168189611119093517182812167138336965744983593436983776900497001902946217406040709180061277827817549237791463409689
+5084186690867471312419665514325307095801242831316185457562663155798586037028408988187703062546161289787145296742552136882463426
+8870611874224684584815641540909217473850820482485529973916085066540438294865034479488663791703681082228740535939513197426568394
+3829342886981207956995705990631766515300196466846957375041259104048073176049856454632700433183856168388096468289412653196954791
+5561500767524576355366009997865394697845244227185393733933754620619491997202491015533470742012384145261633852618565246889880329
+6777844984653507188325486982839438152297369628419739121210603276755667853986365800165693953505799574103492924940759456778294070
+2214788746856145315547663790110177531050862742765653751073730521273798413515040644084618990342819820992718598911810035213540952
+8641245540354058813605493935866324134857506571449379897541736929598327494870227097960497570120553215541706501704428439721082223
+1700972466803583171420254007427289345043866532653318330426834471075577492940413011600530531542381075895357213715112384747031546
+4123673880740060770118806009141779021375877044026069684883815887385967786493701519196377144556351001736897028481481645941513408
+2662387772790420942409426074953672031980544055539694698764834339968798663047095391766181294233657281432203121874861027827377503
+3000685337077147654086746625753896686864534986031835702363775205640514651662788785826457436508900020141827996232430281971022030
+3024908258360292259670809665500668877816383415506517420287409766113445399746700536527732408780456759980633419485517682977905050
+7609884167715679957397855272558744514159873182477148797463658401514781751802711120892880095270644173320069885204433134067923423
+0014100455158046473463596055055311019866188559065450226001282429179589867255611231640796556419411721523548855378235369309657647
+9633011209397874287442661801560684815176053929256216322999478244794557838852723961384875065741787167826618848105863793521919749
+5428219888294008773249094303237486065991730028127620139643719301859855449270217745813940272539972852306476328220561773494939103
+4521537632739898925531910531504909038824924540851609471635849282948417316063275786486909546139512668787750779344864961591530650
+0285764732059028849862258838048464137495797174589639632732738487543884739338580280553036435526582504329979148309470441850901993
+3193744331770081476790157034764887938574991726583896870321256839758584043852505285610942913104942834651377543523173599555843275
+7417116084257040522072018694176431604709041564144995596676144624737792695410277079523480490262409478745371723464489814999444924
+0087200564277539488709914626916914001557170500699327915642055990350944184767970585140183066326636283502929299531353689075738930
+9142572663076266551791245195307340496553949814370587843903642543965453293671993338189766065010527351493298615638788367806472270
+3051117521339185890745759762693550854894691691802102995243849634880012010573871449566457109934687770743470466412945533888196288
+4158491602681925772695910708467090530134341332595220736564785569416215771589193350272179369165509097131151416084829009479740145
+1103853287929082360008599627015884781258703830958532256506076724299192350494313751000293453841630584783094561339455205657099017
+6669316988454995197629701325242327637911706551201433838323166461015137492273818007712193923739461699066479249555708713191227011
+2113634008934694195638896909191311796132499125975665209093925839375449400491235035672664100786917876149509780668632265414075514
+0126792384563810279878665722622429577480527747103593555729429055584348852183674740137123973052149872227487163624179929217676754
+0429035865573402523285948804441336965668748085575713483346016033116457998360922288296258888389027618101688101669309692510329301
+4327425318090553450075452219201170395108911828576562899226660479453870050953529030012653173886753094327406771671224243820895023
+5520772008782057192477714645125967892355088889936328957302124838926954775059515639556003228522011635026617680256545865946919398
+5091701805891827972817338370300267783615596474978619035655959815481776653782092336443749908777349150397039742672328322075757599
+5790089502501043722549854203882262801131152082075103693079735744546403353282880501020065196803852275180952587214373981006637291
+9796322418193084084142426874342342820014220995329829353218013607479946651207097461896332568716316883980489998209799290426511423
+2380307550005537574650358548246683232060877572246000949898947779365886734692122861965160733025000170093436288569747823376036955
+1082935962455046112099818942036953428151667543776795511944294244788427450015296441783391903107987172541886534905100146388519657
+8380489382633120509090625034073608336127658262734309778765867742476489991527857117594934853404329609845740341120593238746572358
+0633586457978329098387174811695256037738146638558272816343120362030421967763476640034051908578551893496813666553354240880945358
+5373098216766144042601726925416970539214195693276289721208185447267076741060153916852700809475592729479267755151190925441394762
+0437558873199426030384531618231327018631366219163826316141114912440580402838580312314548478509711368795320884000345769917178052
+5639423930316613774685180001977671844817204570499797609653987640525926925309564084656003072725353558374445587925969239833796829
+1210135977251946489323174272650887900867086890978166723808871820517325894679293066521051888521481265231417131690626664853728495
+0539462898410401286175566033379657439604282033567012883413399478842279156974842259796901368805265470365140797961756617874554244
+8867613639089241484274514628778139575529407010929548231466056716290533770512410612299882134379199476168691871070113322417352240
+4833451141363445314543208606007459133355986460223413209331799936622495058516670427933156376684533870032838911569984108849259357
+4227813092685468088212208364841572112496680733745196711345105782294865361331232982776705201607924522572931046426758698077037314
+3298920484699256928312414816543062270280813072616261084031990462638788100585936907797010649601422888227353971911450080527103430
+8677297821634129486433214400771371293863980023792460946229497228182272173859417196509074761854532992353908622744248599410546426
+6781620363930103389596792660725581404654123168036180688431615736861252151699433810032668453228299140054818608750957825124796595
+8122906022184441989524946520995601380863784338127264956306250128205898953341684941467474429559908562531894365353100792345598520
+0411240004527716081891095406341655736648076045216518268298111043258024354531159970495009766409513979584877788837540685928510096
+8110610731150417715423694936324187409013994345563727775716872413402896219029394300366269945656385788061342489896665541029423618
+3755150141442065122724114186286854845339699980415816422951602029278923264626041281480497555316143381278936597056953084064028022
+9997198501283363781790158682287440631540353151583792163912187892594225150451760679251039984200332891341466144376776153588743411
+8117278660244194155818259161232321467141273951036898758016163015261776236723767428479024530348209694127274271155128147667928805
+0936167378563389999940015556970429817708525142859666613441735283201399969921725036498088504412772933143791841603758820099231969
+1224164983307664154773003073878449221074064106296765689183370554165942272977254560731754387603794592725273703193699452227243648
+0945223186347621257574665017745770814803043072264123465865881332861490934432664674134678310921895127370062396231037904388566491
+5578757540264948131008953288936928142006135647005490612913881156326258717861846071301620618495929699330750590715333343381570370
+8766152138213724166896984751062466183413369758646701425025924527217037621942282338912065834670044626031344011383552551288896568
+3053487311706357675549287442389024758844523549667853410498690516184480612259764698839374235801509026206625335813997095967736808
+0878702145089270046099454388880300081151816870001049594773880813882330822460954086402671799804568587855965385027526964053573154
+4675804956846633737319204649690805027179329770063541964923158992410097311744090492573918964775287855196910884200372242948299414
+9493162547793763389979831614732404846665474684277822658912090008789913594349007683276852208398902139951370774691434150042517692
+7345730422542157756414350209374237744157462270676494668123673800976571405254566784526649041229590418069453350314530822807850416
+1964598394787617389494252382959463826235528571672258679974212194662236832005305369294264438079751870505403383373187745093885686
+8249944446042573821740194113388700642890510755384482816288425486723007601353010761537384611960083168099219424928983664383056396
+3337126174819661239061831213486837993026986769690178323635308622147431003839607372786324521326222541843059384926020501381139876
+3550125336344588588098791695947139914704682212688259894589141433972450950443922835504195392482891358587151935390940488550833886
+7749712101826086175922145824388719830543614893730681609524662863877518177721578349626789661635402530736054829364302745002369020
+7052231140791673822400576065079175225485411488088090330405642998541294857834801823806307475957421894499261138427284899379872160
+1843292586638145520787104685467083303977045950130084986120058743550949902430669077350548793220932862849879063881005931348774482
+1487754184031131275500703273842524528318488976791651801275003631033587218395976230647938697685183895874331282612016119932243681
+9443865463893265996646234621765924400556069796282223873874118161895663217586723720163197972926787252465189277090874867985305943
+0897354453697180183636362963351299526862015366834373289147517835099724224465741319067052046603751698502499127219361448464402391
+5704747041899601180624074915530540633028597706644514489974845238123048510465569828429534100611326273262355319658327363672387706
+8316996307878784269659645906887598359322978350217418291053466278096200407791776549885681670136754711514051366460206315185892069
+4722848610616728633370187439001656108169740264355894513804107426599369076853462061213905264840303368831514494760256744683488217
+3692367810726295806823047818393633700597950772879297341267237845287738595298116096169937443486203130496785989216239853131904645
+2667811751880900529395751251780403233472004508704751605995052039171718893677809009851286227285227934697321953881347551922850785
+6909280644240056221753293916337855667825910341176418724960272141306897770589964342155201798900696411923242239316269753447770119
+0999650808847959816984860421127802079006195715319055574680057716511026426618826912583374854994252722086849395905477181959336308
+6682428165643537701794115175085151859549462586484758294772142985146427091765603916714315410145159899524436580396471513525615313
+0287601495196877948543109041275994870460190783889596253917385102642407519701386785758190101150573237633840832279432894588540853
+8953039640516871936098610139590123074456039528834700886251621001651688622097083336798736244961699802438533721144359429291546962
+9090712409265567652916908423800558494486073728012853735882650836864723820428807816418262790577395429269519877994493798687893365
+1660175388130474812877157640023025667491901812382385258466335889928876299301453437354017152844077297406456989761054934994390342
+9934657654239690864626478281461559020855371564678749001531999572350068313050489634121119934441378970500982348402296361517516343
+6359086489575862410458280767790738382982543594459454924194612177893193423779790100018577922756855011303081967830570557786235066
+9627300155446988370785806212844429529453154177930814144914555470252140016234923123986998575098139584073958387735640106379021856
+1431322355214385540867355391544675004031897330982334142717560574603867105320387323557316017902469957357722433291210791176477230
+2894506203039713875024969465668820869708991702780944843854568441944017095189870471544531770235169544173059692732034123691090895
+9985087463071783533894010510378579436608410386134175083499511116916575290748570942191993555978994826375337547024070760036740444
+6261306132531269467443124232293674590069389935930085698373191334535132795190967480627467212037239181698443751352939224782894445
+2120942222786996279924477488386308186164427794112389492451650285444010405583566731254920895180572589153915684428013418667038463
+1430800636064677716455907326084896393465425867531959255704442690767435730899236888138775592453451717734356391997983296892276722
+6245887023168571979343600695324609549057431178812999538431044619282851448174071578424122279044132430998592688952289021834131681
+9674276988668745718949139392247616305459443871778443070291211471809698194880071407948810420513382171773670397147925755783987072
+8396960072488524616931349500116793025065793132740236508100883299116095620726458675309257154864629749532773543158061852267047338
+4708002781694658659895872218532749075225884113621393683821853677375696999740077965880387656889715948194663339565410394344347289
+5555870327192777337829881158886331270254424879662205835411641384434648950116158681537009743933205450514200494453854527945997900
+7477629425593340948832945986684831020436243430891488737957650425170704516063535499519492960538931301090427592749932503236484184
+8423876423875909116240287411777889735748877901032042101830839646783823015629217546200038215020201848216827890202734808048558954
+0807456230133883710789676060781653192722644571250120561750361830812875165496905115518629620725251203869040049714454953862738741
+5303451865971911125648060457840129182131488705975454818569283523145391216818437057554152537823305765736049257100852046148635621
+1261116302127532039373528605959266607418243283938981652100937053779793268699698358833723678904084230346993115051100507293779300
+8426944066403361349421019695464969608724905091684569968020665596067769625988182192985084507208329554219894020546830342373194912
+9836620096551496246720748973842622026481410313119306152287268352751048064398407415273133860155815754408933010180348795503748753
+4609338756911699625776639967309034003047928015509904888467025680057353339055998784262880963136510735792422530687128803685177960
+3794220657491630690779260465220147420857430753103256706506076703567632175129351004805264212916552247643663829004772139169350940
+7434241221131032055118140342385838086277269231509234123959703170231052929402882172699084758826526485094213048561191825363736939
+0904036155468367437756029547852649525568053491591721559536888529587622171812488273446127650656057211625693401063929504404510727
+8594239813337093390867462989975908087174105244731466049861585875653241923202495711120654077327719056153590078128352003621088112
+6550980939146114945715655019872060022635651047970499718424015515740106255804720532248662461951505100400404921280927158680583839
+6741404050546354494349489969507458195999859785965336806692031040435145352201853821004643353403220778871762826594034649052903693
+5050161106286616149825562707832775275340760357578872487646716309800665185049903572794595588208600449320559114964177323489795050
+7988668426398349050514452498533331732900030359537800440340518464659495823291497139184592287414133272356549392805616744235453149
+9266075338762306748845630416478232159198106165396768656800162018036519950819645985549720852139273704724379986117806399232175170
+5556988932197330115132604542704979085477903108338527639954740461587257180160289420796745117217674397152069207476864049579397740
+2173348172420527062990485233356407054265180085263061116024667765176353870469789794863489543966815025332527451848905334447400043
+2653295629344700441742575198328366052220017722996829827117810780652298604720896185508927603921863120335461979927552660891307644
+0066285895594775046166427188466940243950248922228033222148293913898651489477743932715196100030572189599370661700468278120150796
+9557220581453859816276169005234368536133383160153382159372481458293494645221000658600106273797363754949138070903261376602472730
+3805492311138707905865671027330890704509145113408439234581134791375788711343962876719164349282530634198140214550594966178264550
+1436926045326544742314469119616902325996600826173849367078861191857896132772006881206929709595222480758410968732831090627983535
+1444386260983859263563013696700221044836992640755935489313754181471481261753184503838050091200730279031416065367564840157446166
+2902149047863838396186395637335864504592375088936920775765866174611877001827681253531321463980847446832448377620176627133555161
+4791558390249335499772225358752569718358080171845842601137108723166037557543519329054572216953276760772287383669070062122544693
+3653096889815826831439877436629034472435210543189243295673175535474384447647824085044069839822212271287638158109858092072312186
+0748574544351788265285261914954044165932622710335856937231283900552445994528620171010664109729214838117784033934235805145199914
+5275894527081180465946457660332530286653207667782652877623355615488795343761394166684000047525776778529177571402318083997867530
+6467109418857304686760026137696284413841248686101454431645726165291910757652786986378480149853820055715870646485922893256858093
+6676215878298696393785441082359744916852977084427450114208277030042915360587042453548139647735771416607502451093388273522788649
+7671054706470997891661682369520143839129305382788490682363534839812789784359519127806453517900921204537766515545890569275307893
+1361042207361371441527086792533736691205317414847988400835638938786015770536113548366581806919926001472840811854920801842703777
+3513103534581691803636903931367504112887620002748826537288400922168108606124444688399865918353400722960622289440592437281395265
+7889386408564819031497565924192895193912656422791697412472168255473833561450568882333025985344661645666990267705103860364236866
+4138536431654239332667925068305482627915123154662709208870044077990559363503200410357003059370208164876016094801255094919175222
+8463391696176344840026735185830036495571599978819527559041511392555529527154011417043582657075386914403021244017762572439715299
+6162318218961162791019379824579408557803275130662824155987476456514181881477682742571553987831058318649000691189597142635269772
+0762970133488857814721372272166424064692356325030921377174309564434883115428450738561984323237757935361350713032425828308741123
+4714351982559489932236335028957017819906944707422172680018267561533474486226912008423131335876195206249325093723564894293512080
+2816500946584950779938046762589915909515704971018715869504032011106342871269261795583577290967260307340084652876419981696310087
+2895004364486838513889537109545822827678603850445221912466809759993491507875666091568956682275842225830234855225383245575493552
+2650099647818037615116956954341655646634963643235750472739733468509790968870462418042203958941068786618484819431710507936599802
+7533481270625343830151159727689285867369942408696652407015806894633372367355011778476566950994358633971847804532262002525341326
+6932860309305588424128816753568417315152512711756820693574982607856846643933251360676478873401876049759834996395397442053366771
+6368418934202491624332453410763014824694322271983857287392943327020965722037743354197029665328443075456374222598320483575376742
+4282586458471797802238473382178433687724169447427314412337761093512867942490521429740324461721167516599618126259885014134320111
+6677394682606606653900300409179091142196198876169170096213616729601352901860163965806655227312385454363306654134273762118341113
+7643573234932937551595703701897895283801028602846877296702625125220327139117379468939484216431057135643790896852072143295568124
+7835389220407382114018498622358193237717282193191181508848234026347203068182480302817923964772670420825100195578203841958774014
+0034680494236515185913110737330886189937723492058708152408147979713114102686546086347368499582981596157232052021983733385897893
+9959931900795867812310134476649406402976231824404571628106712844354935633442704883886435745579659139240624317737165693276684021
+7687653483916295211948300957846886688394120859824086212655110896478780014654869246794209169764271870284569926071280986536129686
+5389201304796699165935771717834181664385244359824248801827481372360749339940576454594000410357902778074011200874064037958889186
+2726930691205319100949599707692925525547420349048657283658532712722412081334373160958039199607974848481872853703890943042973921
+7254087398978104571457211604241039805468739560240953011032729779871018385163199958508492807104550542120182914215024552352099374
+0577915788776618918085672242537299536604399259342051743390425673863630842390420280176568564228989365174973256614738413491070038
+6830892093137210682654019600696831217364160874783778871977883927322860408992703263164973180938595498029716242874574648385670449
+5774283228582139254923100205140724149936447963980034063069342493084827233283799090727386532026590721266521634433539903773672657
+8489342339836233604189107412549422519166707342446243631744337172427688799797300485425305108241084447320396355017099790987982304
+5579039086144583780301772101084268454284211524135896968194358624225126732215388025582474957280102865197930121676550220972263090
+3389908879281737422526309759732063914252217622801815648828128392852505613143446838612931228798897371072027044252222238376051988
+3571583131629499703290168358948884937302565954157189422433659984916252703476429662770576623285862465399735505261324990848316694
+9423186355018278041568884367207433805709684366572651006506138520185260823230823570755489649379382727052958581331266615555167678
+6126444225712076374139461277391085492256424369818965208777930082776462483927136117628590877335005615182912506580467844672001776
+2323186582401204627524733122349298471005163415025134564249126647383086521203590734419048262603709759435997087128843414545136629
+1421280371866708001926278928901318288694248295906455469958649830300570517830927222281187526547437638030692046413330135004977193
+4201689423423687675024635448407327285565295542200018160703811061939134316388397382336397162201256369493787936488029791585101767
+1265877778847130342563633758037018164444481581498122824054055477037485608751037801526946223069038643514687690116234164514587643
+6465410554863527094647350795029177204941109231775452235798798372912591022108733306213831496272836341289051922220644943607370174
+4555709604071919166868299016817656945294419168762671940808165674695761877170460702219178063962280901485563918842254363745508105
+0013210837712837766354170359690869396554185818181209225721015219925108353810498389109811284979505591805687297968690234266672264
+3540066879463905504617792447842885657986052603128773981944573151451301111933677250259888942146768184470087035596773903177095378
+5526250295384032490751656419926139482444274162610961490517202317645513359417017299610996672882236901128269120411948696682951298
+1147928498844392902179227619628807696892271738030552398135463750372457058220840887917423404648021366673468670510142397314290816
+2022158104950164034675577261500173802135526124382488977804744045573154829053227880877248106935421683250032295002832455111826392
+8408395848784043250462314109208469565763023368052967204488715596813441318603486322106989843882974610129619714497130039489786739
+0214994088989310972413925550111779902382656332396702390689823464515504633177056625665996413210331231059059122014949611785985118
+5638643037266704666895115401268842632588292722777701463135298698439281447394022408579092978979422708178801226855288373349007705
+8326215915178072795379523340039085009563169070517125775679474479863606678664704404360480187047960485640111421757696617713004548
+7011793090984794876958820884434550749243106407550272966012525399145703465211673094494166304978135466245182409167311669917812035
+0646616697055433264306514791141300386873739412778313053422926573847874849306566154499488632029298944379782617421929711377514401
+9297384752555069074761141370510516463922575237795983591479132397584337422724053423993525662073888857524562744276272922807488244
+1675900193060201503933483483504265157956265823054822690157216718534136770295979836197494827206847083365905242438375193125219057
+1431083489513661032602020638770515681536739853677363483613015298018233407875797334225693452983166033993589897236847768729569036
+3412842920266990322594256412420427432972591970945387529406395749977856430023496367881365081011414676715347811993981995507454759
+5814144158348481510698013052752762134884248303529348153673229587940320030719465454064415732294560941869034046035698546780721067
+3694293937312762744233869259702927434016315955447360677690945403418821029256532787548058243155743890295919743842535871205350185
+8704385056392271497806649473016369833786145282019863224686988090496033200166054190979749241314009880507707963024916288921654292
+3157093902990992972624660747840907228349704051194371097267625916545775966277296334446546102566702460108399894331979790861994643
+6211141708601791603941445199717151439636201237385208163393264036156546491266459438443028650233309419884755515206198073403412631
+7609935217879726233731421923555596716242460372189351557516117275999330506730738459524772217152788164129973955538645698104965588
+9847824808961328798019186709647321679530290047204083126132050648182784705034270305452693472108814807665149578959595630309221057
+2336424726766825888588931956562955321343032371214572623650620016457504060828907233038750693736196960807811513112341914628133531
+9997503724107344142689181995651896815056436454295876248977561163594537358114242360861284248276610577578928061231272901007371912
+2013755472268039887671228509805013770238575064767125406070391538875450803622634669600191763159687914916440803301533482646017516
+5799981996920369911160876482866900908859555470100550461338722440379485926728401393736777675182480925560316384661340355950830168
+4131746820931543634876854491169439418699998977639325418048790558796894160516876451374044889060607036066881936080985211558198717
+8071462893187814119459304307555930509471933902061826760709069595504601694208191737856286699434878770893482761009503838844594596
+7181730908337307386590819037242463777795080011670425589895801753553643404874388537396185083285326538843075531064088612600268485
+7874226918011033625880877484768842271536701038369116084490113476976040281425980324472775723714911411152630252812320962593721057
+0414263983887707664017378501754926805713789236380580564348508099662975168539697702344553508537455836440798954696577079098427990
+5498272997168152869729083312401990047724554350008563240202328869525129660589507428406050419409546123885174117080636577540661417
+2321805983098426879552953451815149973073351984882483766093075912871745174124737636496091875961776384678278562342333189413446156
+7532047930885191527458749856036064187500060909405487710845907268217223665450938676158247000950256593423837838865029236735406065
+4326287344295297838879679103933460283015103512394382866450845885799711951741393486898208614864273534333346921541450681108663424
+8567495767845161425037712088656492510273651099963049803480674659806775332933320452431001042997191274150089937218301268747409008
+1892491166044214033213915009098534855928106088594182060850901874215590307570900626843004514029616915218847005161443909006676086
+3105173474201156958194039816160955452881468075916368040511971709028208813038518932050264340243550030216756906608101248802881284
+5437478863331533890468364414134511741947560918971502005022258558696334726057777326125552089511046269814814736730962698056311073
+4951554244048858298258123156812226947705933314291630536799208713986095914743504621255604040168912151175487398095913442501527517
+1612279415688868683265625113331706654838561784474685978138326507909792993504451472859581305912676732125668231491237540161852687
+1352117401098609459260904440848555453118498774861101544577811081137171667682199549961162875051222443028292136608108908775783291
+4668566015341904293075901042719184643021339885314119600028221153413672044545251474917661767760069310540295768155060202109602728
+2520334200236839012091693839792035322503068072072460065591632021254758742371667902074341537861212278319285847598815912703706243
+3175268051143981660033747106123282192419159048635214903634052864839951778255031756400562020446144172393222917501787673701002700
+6674523291734748122422773809147614700484318146175088254981107335895144969807349660283900516719746118645468637821636061386059378
+4188188277626583767786502184322569089569789412892621297176431619545847378700138574560707680259428721989759555839556974186233480
+7390532896972001905316907714622971854007628170763072962479615247643615622571558632228493177244362089074929594584800973845536848
+9849264610200952816901406520106384682505741852721568226048835135789532787094701294801848704745256861395407908649513920150263639
+7854370986367091444291966220372693018093730764321979930716154354135718272983430773038337101141108835455952869661500155683833074
+9808115836250545782744528663456612751035343126746511715032833222650951208562936847133894670903159578406935434899681616157157677
+5449933772771897148631641377562540641640474848389783754029100557570032554566006191465792063723092795517702238425793412416470001
+2937905058909924731783049378468003437910238645835264792097079136587087350442777867813702093887200643761896159097869017005937395
+7717133729012763683884090295651337537034023162131283487583227409327777370699292346651312872193008211062413650051860746533410200
+4095695950110108518764643338298928366182339223897361738328378044503564041168430011712729973754089101835569129650304327287404972
+1174584897511466194183788253926349029362049505536254582209201338252575420290164983455933289840278231035884030712260894346134552
+7761765877961955439161913415420485543948776016504802146528406434389546215574979243086360938551004600037990661153084242444222743
+4353062554304250531566068529474211745999775668076123932253052153101156786485645664269792342453816897835171506547074839704777091
+8193385707206057241016991296332616186095885707895014417445978963635638843413167453713147741250557894417823842378892716883564383
+4414701258878541571780503656512173574547903536405524255843710113697817741762054938128322216548020454736882148058230445988304376
+8363544420911047180282206501238156287142986596377518728647856328365181602387822102287895774281073353368828111014956911375392578
+5780430022747871965685716392391425352083934583867099701698503567269032511748940082003282777645389137257025389413017452674572537
+2606024393701221307694529871431154164540614164993497271619958131424791186768644684669356636777831879397734272673335705649633002
+4789715983933276471694982923444249864558464851612286765926229253919876317314926011029164829296322542092827015562884359904206642
+4213428153587165381335521523932052241841163300973801287138253226845490672931816978773941803990440278669979647051465348624079105
+3419168581475572983260190361701934633564914249990805271700921787735379441310149748846950460105295646015883522763651311765718139
+0643017584581435034370880134992336308617187531872808223433939732921528795419567765739615646487503731718827467059811489514462708
+8240926821672036119484675230474136343520006840157742512260506574754560864426113591474981060698558545401924390339201368669580151
+2180431409945375285121040004138946753923265119496541829137171528887590486854621739462433884861201148650039065347599969036034946
+1220794484575763660002325630268586558185893116790653322219525972500497727914800636242536069684827121496593553311794674511534108
+1435781606190730034271758074654507450242292934136120417582018758847558210750517197211614624177861297537749923102696299059068262
+0472496196020370020276610485121224239313415267755759579734483426439502592786733423472402917351281201878422928096327388672118427
+5664545446808704741371688000935805171339458791507069541059893057148797349299303009996748288669321167515451714205892864440743408
+3539189653746007637884781151821846130210806166359445842675385724193537198834368015119520365512286626859121785638758771673116936
+7228747311262908816869990638505266862436414983330364594232199408818881369887998094729811275091341031498735810192826600585848478
+0205817711643909986528303579098875467050350065610591795091066174715779956393527864740830714556714738435192795203670003124014759
+9197293866434029742096641108142225947219962019182256790387923893087254917713809995074288755692595202295289706002058647970706318
+5801028709225408662416729985040929435165270531028696258985082752391299922713342941633843800570338856731347298583819618303436452
+8554584149353583626116529209271190042567689752495849141906628210792514969913837494587223513509196504949988416482688661169416704
+1402557567228850127015457900783688564010064141030969351494178978419198543363884975731636660451573493841983931009293074401767946
+3030096749835569373371333947576923588432247404291305005146406298391452901679290153566364898274791521766815033709118309495674776
+5711698251707518922789190956913393869735623141004406498318629780886567378932420667481352170410684788247915724815490088304482484
+3076891999474110399724898312925906240059216711193634437769661170118805829580169752019184852464954183024109801959695130678652316
+5549698831705307512844145517641207234201273500862193514468462342310564088815360136277681192006596458241962992029526454841238730
+6411622599480809121036108851843289420809827360922656655734346202711742438003990222191272251022816208079113097900823895134384085
+8642218596518127375568301272202091207693967578318544987425186514107159773089906580986790334784827799489119999185876094206749612
+0920817351118635692704580562112859516048707763068110821230955827967708140350064043987570026933663880446183554485511010170742288
+6208781018246003491238792622187493762169792217017386868912187285653248963115594278272915569084370195923738619149855997663765716
+2725282513427928049648973662146630492856487618068183730067763515357833597788940914019736675580475997314248706127026547890194380
+0912098065082008833983417148631289829848433926717155189805055489641556714887595710925279228500591899600062727405015074732933183
+5895616117549258380703685066950990019495929210886386708101945826998030626417636766877015647925822567530097432835311405452851781
+3061662816058323226135782103379493145683394691280827163116839270882202901941521202335712663514020076981153846416619848715503675
+3704213022599283410938645199398840870678548274677230864636710751729466573816253072905154246398964963820890925958414003660031502
+4630926004977081614276851598024033198734821505047735799361816301169717640380369512425102474864033576302498992022080746889954455
+8300690807062719013236716321873014112140959900671073008576129360776883572345888774946590273926184154530838752149268349654124927
+3447912234767016528327462063192808290048544233618790028527492173810076784214345126091690768646666027973848294720038771161886178
+5457890600658613094704911994422834789695852986406564746776631261869186614541778685993675186223192485017919263967183543307324819
+5220338990377375643418843097310570471194246573225298484773451484736001523372710934922163010657077255170019875356114982042678628
+3627624529201855124798528837400884425278033564368552915095248122583917121126951781145851039073704399808416096566055979179720996
+6138215215437842405346946457258803271828305596332127664808930703097188386621950424243497121232196129953435128118553466623324068
+5920381194124220091735356882290501723032521874921419228504863143247804084726835859796865644318358484363167764149683837216715113
+9615036434361215242420376195665243628638184799766269042140156331651635843944014951375098750172039065463946417568449326243598402
+2848169979084951950982695318867752277301100025960923376831113692149385936857810916874319944880663028251022532340529140647508871
+9496200698078244875645144567349529530108679183666387943211721642572053750534478253516851058589093730399207634528878897274151362
+2928780676487223500661310045048476864951396027388478482164226318809641027170548978608486524888062863065934362652787878241515138
+6280140376322091582258435509210383633979192424770386485640747341583226684971908322655364759264755383681296473387197771187476598
+7993834385710389281257683754961049197160221786960013125265044154150064439440391405850545737192660609079271627770663100625583357
+6072190114323511020360786591498148692349156157375850747362774972374185937176303811511475665210532862701141979885066767496308496
+6809986728266957224821129384937931767139546739620244968569547174693124128355961928311295430759387663715690541708892900136725621
+8713302194814326105418406542612287987228114780045964567511737165272440568730052294690749670110950977545749571399774020053301568
+7216372973252354647766828421771297596834262561708247359782436050128141372353679212726164448161015103612893738264244644610968102
+5490158565324437536585310937019467679460278414170537463829112562515850928229747475007728895628087831498962809803771938282971625
+7508575669851979183836777758657815365989035447083239066619058708444094473391492540134970134555418935400444033568972945852753572
+2681051665685441434594259287440247146082524888648989023037549139977692642794573123372272447282566487899476245382067369090850227
+3516664349028783594652935471979981657724225297147289075312362875423752912404004312370632615551263897637065247961679885605652690
+9466216134195188009940680229231563219004828730503835830166900891639648098483491041893870240357033427709041628218884025561211450
+4848574180102172215721912201870496816515688173491866267900855346017402326765363320124474261873980008204988494006538252079431490
+0175523216285771758146998384814407339456495403123042145864725622594607160861096627528216923235632801268714390775921555811885643
+3472489136602420352765486727018974617090254641528435634640334942425890346384541194932965110314503859645146781896767507525832148
+3797532143892746774112201800929601204074380314303366575611389855222496601937222584569281001864863917059035591510412512996095572
+6540831912166873834974788036724952907724341969947205585823842409980011722639587514582627960169448155988074691268777322159243577
+8665277823830969067856126267665294223334216725032631778088124483157924821285251588520602045895388804877588758409591955378022156
+6073508435137376529408576041907918073738449051031545977935509368280423831551346121480713109837860058648169729195905582970167345
+3067341878979134838523394919669124325563435281537910461171499830549480992384643061189946199980549578258740383418503347009079843
+6535435940186811905537955923044494920097170641355108274375772163581055863892145187878626476077935978473720854007118125956368393
+7039488100826115931812511833016243383119511518291750301509797980336012158668128482275262947277553272940357496952990711563149829
+6786417640541461059254040553435360397444650993725507452127477820766859236159070974204514281362156361495968903161994222700825800
+2231234046323964842602361033236684311038633571563965762668970125159431168316364793191351729000958068187715242930876778118365126
+0967020148060045963966458121640283348948132407097784342111426011211692372274414489985481236783110642969061229593384194970583663
+0518863000584387454760957529314643812512823643579550158516331617073251164731368407116086238782619225015253603821594850218277314
+9500480699512272865605970060364505765826990178852739273720908237913877224017867775678563171957729835114722642208632758208282247
+9138815300684460564222550599375232818221500256241474012816587003367381334232108533309664763635997507997023730828738583077664669
+8788277264997082732015978733262501251796460091814731315709354222338224334551918351172940509755714499856609104221032539934398062
+5201268981606265439495692981057225390935909458631770334121087316181673897848115792408678690299457980695904707677321358225662858
+1753894444989509786731779001286291244699622264775676367978135041545186928742736879462156569826451402964970455781449463407937916
+0502111951096040580120210611615484977765606052460541731989539917916976249725653281972573849533515652151626503088059881052346467
+3880078154575290219658231687424062098862063067654268460424536569017374872824177081255701341783967148208402475928724455704261768
+4392256036256639333393028072709593018903870460743710545351823219115495656631234924513636506499865017761998475934414247147614073
+9879823269518650692917107025520590107178762204459762006129828636469652976104262657652867426597078219790167485035259125893130526
+4491505097353181156857564911252591317148670618490859288558887139051313551147429010258650026546020137477020225229299116254389267
+6985649712270923660498384674089852650962875340575045596604964662128408959309248980968270692814095597628820086983662450615030773
+6856393844414418123694511010327503283724147879193562418774164993500731367874976787177535887228795026180482876909284579667315939
+6933319890504711538399213021011090982613851985557386817639509779738587337666166285748238443831950809951451700040304637246662798
+8972237565184004138743415214250280650420991574154677063216686873786654244381615346208802365774879184715316421935088510122029692
+6620712954831004627906209308475373401688370427674946161939930227860450185388905612087218953668667006558048824549749639289702982
+2252979368901033426647735610872049783979382409247439935969647741186385842273253355085952551816588123321471149874812539836048112
+4296535534263007024565979896369915411490254323267398694533004344505948807352166933785377686738429645888455485219163542489241753
+3740204196364178691705296568637646938043711157073683455458837069839389554673644717418013786210053159123354215579725572298341488
+9402853270709855032434056268150751702914142055269816941745088351607954708943354365301302743628246326922883750858759728646811815
+7702984283703968225748705248163911320353463996186650929366431271533557842658056577524133407573715263399635592058138266058468047
+0714364441200044139354320382443415251209148277388628504182113543224388038221246572844030594506529807381529435302712895155562998
+0439249856337395882945730885613068512496256701244515252923706394988734280606704794447812748091162906835016774939625011625452587
+8701684848748737861671752322431955447724661967607517009813604790923987516158908955881849157986515334551799664962438730731109340
+1331695486624815425190823239475277990544123745272288937823732446789801006674641059010522745250663013852871097862751638189259629
+0016943722810447477028299392663967547809929491638369830715943306970577569121839921705532284065788504261357162084070598074698898
+8301370408134947453196729774027640676030589016291539644959237246218491449189371838582480346507102754824929019477369849852385466
+2141296007314745921128534279212951822200061786556429858733058886029876384472876002241385397319110771995753216118435172891077520
+9778033995372614700099511429265411943800576787023724043391866778854759353346452408608492285235768924255415140931221126895275706
+6825951183619818611745057594180574765846145064255544523604725057011807870654883273137368630387060066151211603237021909384345606
+6330524686796934177420756525152826921339672339044318925623881985016143335928837573713885535605018904858579244102576335089585010
+6476163553560279805504121578981537068558170447489713068606370855078339092366601341950660196338341527489856914865088585338744059
+9336566578276542977779339876759708356666986167810967015943735975240831465492474205336898814725322385265950743359319117386285955
+1003736656415305664502391530550831810874960043692083942495595913831106487788016650162073804988081719551806867379947943364891966
+4573789346107222063252149996048100164143705560186510044433851243141510350751823081763496713992637129016266999061673393254758192
+0532366470306788734368951439658028825164454629260106890282620855033982533015451546843353901652120510130789111458392221784617757
+3253852880221087799999614626290882768972817659832607861376923098885595639154736935283503251479471872499871522284582447822302040
+6285682722317206257124522813577367514121775302484636697810948128394195942996079881830875566043123925277038343926112033315427349
+3775226925665315936530276286731605375257672911376828473612175726312446039948354980701402997357293119532073936998664168131452515
+9033989479402366425600648174316259705202840220576987680353222246016330572206033521947195443476632332503203414941943726000075449
+3497459952076058462828783375726894554577596495151945532419592454939988268844456907659575363299273992966202955633347460395801503
+3425070812671430759768577458384150050234482462127557226191091262303333548668785285283704391650036078067518873006221217224813250
+1772566105841430765131974198596141137685703304393653624186537427347991201369580105964338526460016536799639038488848966636423096
+6770176829068426450217510320589346020757715335312260267538371974073805419798173049507293562584393319422383700569196675270010649
+8817107380879373164458511189191184591118659927137093795839429896643513855977855984835472389317216929700259038397397174527984545
+9182176191236023496232040243155433201447895622909243154991531577802143936144665255362367572046313372242799588041424257757065202
+6776868876338528332502171518394602792217092464624165442452676081627495348032268487133922812426314590277917132179444733559137458
+2894505940700668608956696393712351416879091173479440509500831009675626499007967467374789971290965256917798968433095199887640804
+2933556414955828193417995654373126786599609721238527340939127371332396349156901995803794360944816870450892560704118441975220867
+8553706670591731040619297656286157301262507708170329674504933402137245881090232925455937213553504830839742590855235282434383116
+9795978189578883639204205303262814903090980902741535992637415797011196591002116065669674171784371634354111486560182744790314795
+4119132103638186216017314646897106719838984255536083613903341238051086509058863316947216192276628486590741349320633205188806897
+5670698885913664671019828424294908157556037863822378418679559826760134301152250392322845741422553340998938758664406467756180798
+7800330341660310724142951110753435998016854748165017611258286920601003037645494210716339815788133485140202482683448446213209716
+8180605035942700911937960726293062276511453378796626425148211321573098417580088171144007867547815289216240544844126601589466966
+7821272307041782298994133562164496850666805515425583415056198384421212580796187662587737326754702942280674718201253410570348983
+1042240816866808878998548317060777151321655529169893824595029339588028328148179827446446643616423322057981572730612868764050015
+1252481771070461052389437601673649482439048233841755345725688472923079857771939132303119904339949419801565589936559095363036112
+9690992931777916802696331919514208983516033826094247916936120742724743873182994969726283601645253015955852055017097669830871832
+5020330232719825823684760306159154637346729706124058199917604069885798242234996370123942691457916122474221663868046994104598933
+3075139912987034850456516141324884611162536977850304751997334983975217864864834605427571083113425269670859785386338318467147612
+0588929507981854517277972648054247858977149919377574480251256787460673116218337687478964763305472549592601599187647039007311159
+8091499973422866102588159323886136790375349337327388200287148626779716184548302459458465936817938524771802569873742301251650117
+7114931231277684778417144640504976098202413303636808727117937611520910337365455884518757181692362707318939628346107928380267487
+4950235887683950624565704360578955553783208046483127644086525832912071037741169842458625817412278583829306158758057435134618696
+8199425955265652644399992914133529916068954186792582922740480043066932022166380883075792995446339961281184510898029007416993672
+9600726548050421231768431078919064425306219469503912968092554459127359674333330276775477837154780938957377807571696713004700625
+7295599369136487293154800206051955319915985280570186743302107975100582206721744471004980480977594771538574498512856521123216578
+6297798457301239668561079936581574605258366525996359269984364801565322122584365843225724581654618783605926367931879918225442452
+6533005631078137948109852121400341144965267577414971222703110484819122046478368287561575133762804019638669026806894198861867537
+9875087635268237028446411260770380453643015454432015279985047995719605753073640336797720945754884595273185611911133456865738261
+1289442162696753398201423924491482730765830984320927644525084976853458311031303193411990973143614781325043459014068347046089289
+5407587059442212092113638721767282263392344800170580359252927060347500966261590384053868270413268344224069405566567860000139705
+8360711621827142923632844470555921440996634627172367848310520969393805873503222609811062308946619951688125101610027026987846081
+0944723049476073716566027637737569127176067300129222186002435041592350356420231369282460258580648007773781925508162225156920162
+8475983626059931171149310298021646566523963848825823192493400102745845807108661239544077702836139330088359628977689491846874286
+9167471361458822389556369913209606973474148790242038515231761016355472551050907573614312829544645064709238887157780557241782741
+7014298247554687536486236050770971039248187073536082362810060976896826815113357515444053263548215504897920396644014795535941249
+0560999088691723682614108804238530988595549473233071643241045493910124491974900926784898185428410219894939857122959475910314078
+0706992135879838500099998224229773341412566822617554024599579881313516475013871821845580144033844736871959630619808210884015298
+3257284534077293882786787542863570138992146936142087051892058183105267975351672517356758026095332624891123361507959805527300464
+4074440343205139647276844490970010808052229358468787479224053850708044118534407822903344480715673998402733320764968913814756460
+7541792444051749131437550370667287159419463038893712135130829128921018730253201583423068101308427818790061823168162915307740555
+1517558628903132612936551305596370414201320454890625631435775037687907085643182588609436062805330988597026150223859036793476645
+6591140085443467002438387440547002194892167702007183254656681949652141186889776360123350307460795672547510863464622633652798129
+7586611318404573147896264171755514255213812732114705872658268827371541849326158561820698871403138855140301594042187495345343587
+8296969079616469879346007981374601146907653922591351081026313152884017339179855411584129459367820354848581380738645777750515335
+8731520753126192088044684618604970364839081511006806274832524720914395021711036520236353757973882463981033460910456305044738117
+8522729809358153390546384877141395094866223397312997581315815377215593011496352023911920483284381829852239261360027871178466434
+1761342609588366253125631150586581982113849076981180786682830283076537811478367306351425774976563602440271445970009753618288192
+2190966255981782407270090701820316391321596233574351800067587131465490412933509752425381764960420707947936543904169527628499764
+9513655081411394282745221856716659032453348163674130701896927299389413958771625248039619427975826651601280801943472380714643137
+0617514295978753057337209914173385759751936634152085643157967813155609425512280471102235144051790721763863647958187237685008587
+3639355491023500583172147594486316367021278514106274611239107265098592491987675254836995000835549078267373162122839134981244694
+3032030608995234928881439477961757003027720355891764881759463215674265954842081986273329762678139617217680974433220699552082278
+1162323720318256232198753258939220028085022540772566418699150206741508982674558652349158167206478285853624098497667218452569282
+5449383863141380776369123912608347050738601579475359170938129811063143046219515664348459639566915361115334890006657006031842097
+0352577524785516785715741803748070461694324222115473415680064156677430016348738412256655844328208932407174179588633693022145069
+3240824351920886083704779764410813380504193208597077988968552959949184540967132284829781189340533621232738907229081350464536533
+9963137564898255760485048365009768861444430624328428769392562608655048396702090989488644412080235346086820241525013306324575413
+6313120896902229376551555163469139342705609183907471905448131939609829452611107992213294654747615543541094148280055017927542670
+2193326928610645174628017287211712211408683079421721839813537852939457890561997238125898536070007981217325358023811789787011723
+8243869736268481951401784440593310926754240433539070013976127357814953175386685024013642745787559590618261612069606519053423542
+0179110493828168312231149822817828204338127248358983471224771340698766448231962762617835559498180861959832229135237920163613151
+4787386815157272287656433720722356482569671165537977997843012106191355180546649834098738516604856452092754246704403258051505371
+0634701773994997694376147550495812360818423051628930021511577756465075343321034591427451854134383867627150784580620161049855432
+0766676598258381037189024267219785521248498516810290597640526034223344261052531930836169758828566004912961881921058343147697444
+6482511785125094948376527886610692241647293945078604787929517099856009510498982203730650348969745313708621728477885759515338493
+5205196085155489849560658125068733947071196666550006357643461400687947338189762369344420067691692171235090223284004207347050790
+9809626775201561107404043309301598988061425083419682730787633868247584100867048954636838021112840948572297116645919603622359907
+0822943415366943321888436141210445288839456758217953163265370657515497810970631795622846252681104767475177503937782564413276889
+0099794234571476050102251924980186262893747705880229668101192044145818046711997376029940219465691893053496893208450200931362078
+7338980161503676399103395907119988361285887220551606875942870878016149229490400212073840391368478482151725734739290023095487410
+7899326915683751786630813196982092775796371026481722729931635095642264999233728389534905015911812126591048864589797672830096696
+2751118177471534985294175817313968889734356500489672942275914873801559720503551024017816293024629330339229860581633938440765263
+2579409952433198069628120504384999886282779583918285844878077794508256550262226622072460752726666294025165627679376513073930940
+1557518549380248705140615993858146675367318700594928368305022009826106738355680320673267541599976659073767016002316705812605118
+0706655774414337358133841048392051795234166451755892548200847217249090290629891786004054678210061272314883459040459769608941760
+1894242091014594788195514987048397793320863358408872612791768967887371355399390803287124928045545098723504490408131463760999333
+3060272094521186414251733828941054176318890330197109603090531231771409739699564694060282342629340263255630493316904735659002049
+1028815907660526325417480678219858187627208188992524766305787455603486273947607751634385261335594552079352038645485771077029993
+0683468157651545576501200944305620051155390867906355388005127965874177601579306536442110166029928489048442610212141268455617318
+0988081700313980006604864032962026305268670102163784987963985127384885587927642407664223367758558519122248185218742873483956807
+8435692954315269375984976106264988536738299966701776101047442064080401887709348151446333391726616352591853741366988778921917957
+8956328839854159854532673749984321247777028190876411555620913589749860701945785300696279975495557163768982684990843868186778431
+2520325381475441756157721367873710939223796803781885424158254911912476533014496257166233162377942526340788173572154209732321202
+8180099306765466453860728219641256442389031828386563717730489464926442454808958172470108839488494541309400369186661157251374638
+0628247148382602252920534144240581556722670156430583076620252695866327968997749969112676595494827895760196984828212360640034869
+1083401588117745555669152288505435653771338944376475705488767101152826312238533625308441022273664874833693060276780849703095095
+1156085057274283778724094356821366624982478225088443694900412624860954703963723162086763699442272343649549404340286403255643105
+7910121814653271873529362722249047841930063953194714561480180469523505989148782328178679381325533730833709002539304255163521040
+1625855113537607234401449098110230513476322963277630854102799933050565678807805089239388422442620697922678611315082884292068865
+4371620713456528072846857825011777710835705836437187394614071662418465730864540826899869210260117229659041798505650538477261368
+8985576750846387981996728278040998786610281073838965731512714567426037576813755214228497693635971824751946973019990502558550741
+3401249486943615979298276104790818107736649764729969044884395409904447217117866856126816079991915988836153438356752147841144170
+4762938795985970542856369222277414531064648102624695688826552014393694646959714635482411149329964264665288374841117934547255987
+8266183745098026650707351627828760547702165330658530132998099760473617506446329738701905894912433667123567916471538563863907720
+1749733602645901685261363936495062217041689057898136406969925562689807608184144495204588063954048062251421026224871438707736424
+8548102168448428644279598842714118177587767821370906237000294038845928905112282335030976267725288843840126116450813362024012439
+5938499597145637343173003399875431713125443282016722261731991805628239317480073706051380874344456692406363674536084190692646142
+0730500561374089587897509875647211800809704761282604727960645054003482860298243507208373227297725664305984934399424216469588628
+8419154111597746163254112932894914530620901371133608712199806376981269451117389112518987662727134188058972066300128519445766440
+7937806580759161251998478953470159484262859343028238192145225348422179576900021837242945100592904945106701907680168893307572302
+7516873429370795478978284132360296301129718931677825172903818753611017830921544550227392257770205145640364461713731347634995836
+4812445494938381664839724186613091405433366166945041207304600303147241282114042034521353097954231266436563888803937496834589712
+3378087498752524611421562976032943128888258876939559646852575538636633313807640898785156463287303741217790696080003514700600687
+2916828602935343245489574829087284839505734067476926451104496434541582983914416281292812699388088495707067652976139900162078153
+1962925444708479245069456050692574860960690835458249514553536707157865617717301444683893731781098151767222498616081872995504896
+8173903682609218746993851247188524280631112843215665762250628484523471921122641923241385617676960635551184550463145418449684690
+2919933149036430836155770474842583951453613631150982113752681626101371527818957365564134323888669717562193735500885632774199608
+1609040194815030093545138643057865379099082109649230423000768558709693305039551156969735710643672277845208035827493067182565724
+6908049177553254273158603203912637795720376483171212869602699514186725461068506421013630496115516175113680573200157037543353536
+7096806396941038667344905110986317666939904573544009284947400783005195693194103701914010433669991415780015087815639572682791514
+3680756978168727352707707927350530897842094443052210887958488018513662258743146529661558086974070289076864455883890457256934114
+1990854389059420349848505548169668954938843880071111806085356892226974097003547436768393216697877346132002814225746150600875921
+4374492277982018508835930955357380285574652568017468028145914088210165891776161047538281175076369924948661559170128551211440651
+6393090046195615488795758266312386404911848462625030168594274415704463604586947949625250757933039912135660379167156550736214014
+5728243934436503311699358540925223297549609990942386098315769782770878982264993140803173130768644963918006938211060093506696811
+8242993502087208931436768299544970974899425557012952209431499521399155627662162396837380424393929443574272383673835625796387465
+2907417733054963303298412175669470571774232019901402324926626651661243360954715973085766036500273697051651414938093042950467378
+6785894337286818807967188916007632157799934091531302525882785328964971157321099749451607078727217297793573097237856806946698841
+2698558719450879861393803875387234736047009367170703129862250880475805397892793129358764218650002148641764709592993056227677164
+0081971305438865752091446464085352177755237063190907377734114566649793616356658589817576855323559323530686449621884731840150788
+1826939540243947080817186653825740075444935631469715645767626335326860305087307127848152820195439244125563274241365606473310540
+8086243883958240578268878611599696204485799969418845316458163879163274209827292559109804125366908746820981499563030997204003905
+0386391010049409963011357239704626669689746915426124197111331235480408669200583724344735150698143659880232480059746405028850204
+7070621356175994235487518719187218494861976025281218293612423462113181646903473241591007825352754630207984555163787848738511210
+5746214941035113394857005157649321493185603337720914119128667915231061424163637568324581504110784614852811094476768652380182856
+9112517888906528267503001049949573135127874375506725576149307826638851599758326023611417494647191891545342374452874064341534379
+2427813650814077661287436979575407398921688136831196702246080880472345267198382221158754713144173467705458354166291752011017130
+3427037443878854401716449891823089902160247151232344993329995686205840347612271617101573796125148445827775208799719717001561364
+6663271105359323644532079372626792834540392816461024173260479629489907065371009161907255452160867279588979514640773444750654047
+5973386387254971355387042682264494417370956942797373987206113528047687059080572493246240752693790196755839336183495531383520500
+0786113322119991260636829390212550532753074849695602064584008995135867708856455125847634381213436388672553141147016113632022246
+5315245540985412852477846866194175059739189599584743384794049685678013782286205098025299864897730658726559776885622145372207093
+2947046237055804495388214736381241294012375243250351412075115454784594240484997746146442841037234277389231586332048832314609602
+4940560326735767175083614737052886039378277408442894735731934794992054788139312451587128497131293085948245032106415584594528368
+0132772291233611554088929401128017045937329980274933241381990578374018596495898631586186020586965351932668997510872004538098971
+6387651070790112849045385204698059096706128798635300671169181792420546539133767532896269735055635232257735434930885609585584847
+9016459024097607724588041340562451108743288014737496316921528251742165151671257409207041532182399287641327587310586187223956817
+7534883738445463926481692970148340291005837757179973259685921796789142441810657257829230854362459214897426800925224271446152113
+0560193061957298132549489635518745231685759631661778699250394638322691452161479836232887573811183208096513244778566157714733211
+1547430295477490963534296984638628258877576273566145152920369666682577588376652374130208299869130148553971805471715526321961195
+6131510592032893543765491267410178707297913936975805122290905928404238596549066769665229727337467790389337961037867643489553699
+0609065177988688342181444376437189336384085173474299503743870199156371216381879438127542687917993261590322648797772549606051885
+5486486858037007564853644084702405129390388809213365108089374357918264647019430516503970264903210163964653753490047274772902330
+0461300174226405350596681300475321223682365336534045385167141718398138848125986935473489411898994178547406946367385725330213907
+1293509274626976153463652826393079169386713361776443893666230924263947932847701762953659799461100689690446626123374959253884277
+1306373580520533113454583490110255646387329350405309931889447247185635126485724261288069862689556565591921946727772549017471108
+4575946994632942954732825619796920704805541065043930109567542878956936210283544264617080903536339854736947121491562648913229061
+3705434044613436537344272909123399762720035093491390444488810776264889843570633561219106570438196072991495500597843887820183050
+9436774296203905562085230110417550251074216179370977223886873788396051869595539699599654175540263842606847704783570758848289347
+8739544541060559735321933455321086474549444477666793232318769795339438758735396350156993223591143789407202109979058296632555075
+4292457420547255026544250001229816943682894619632431862491477990869504856164569154248439119907994750443837979614731379296026483
+7759359950784829354681821925764141180511597239315053998175532245470389364554510124781233539932768390441633522487434841829277108
+6460068597420725351564334958788443977520626552046510044910725038151710003467025913052244964411427404827820741380296783360351862
+5211054158075000733081570753562084145801231533068994378093380973748015206056523195741701721944088905307131000364624646104412959
+5581089920926259625216459931700561828077094118449960988240945610479754976194870306805076133937666171790939426378434449418282506
+6039057527913534217575393813423847928955750038761332266774182283692275076570170104686335201401167177077211434292507428463611621
+0405115165537284758792010216853186661681734615099607405177733845109910013152569350731884598363743840624814198617754273927011515
+1407618016023682414983073935592618659194377480743081488662206405541839291934958759003119610099774589701968015068594030177949217
+0790315691986911016674475309797543936300728937674591920985541138152579574295860682375269717640514911824203818306809998011275060
+4382117983381412972994275528147432373242673418215434465602805780063289348278856395267652713597654578622689358031371373016193682
+4971203890127140128708179164505005602256484886747097346823610758765747601150832737555748482400760746795103492345268624660081193
+1238474101549902789927134668369786012288633703563425355984226013256465916402333622807942597885223175366854363298056733781480165
+2475056989181989715935840837103963570756393472493139600699839539995767516688497969127775142807367604482540314805881080534085920
+5110483916952128964226635567750120557932419254741576165448818621280817929369091427028028668168593266857526132988629197479499338
+7382097529770364245616319813419439630747996451787212372784898440040645194051307376865641947314145623284843530906118562837024282
+1180719306858134644273288620402473339088866088558646666749328622134176944113672979075244216767608666882416653166422367766359934
+7454692494850748528168077614552490356358640467830959916873691009192683520419187156489031520981784955116022176529954332656159900
+5703126531777606205672012335960434796458742284617167876316278828807209603472901804370309819783462306443611963348173237324352923
+7622935915352142387734818536448742013947936195902370636105913778439778154319304174619967238291501475263405722167671985219327033
+4192469391918128902822325360387297654953797790226858555687025028458729211895927349803665945095655786671449147679921097155626406
+2780677237649339975622761955036413080116980723465856549727438471457957358521359815258203894427475417964365478268462653223640340
+6384355742271287800278025268983527483432389226283229170112845354988683227778986191910815226499442938779725664362022274661446656
+8983529286956750153487719136198257278584599062333134754547317517831680020077715886321603644059583997509690986046227389994861108
+7329782796097322937140185361853575699691754834694652931632748528792770060065607908729085140248378226282625852546158156687855610
+7542858690282896923167331772353246169388345238738453225427851985834084721866947550098641275435407170332769801857389664211235898
+5799583185812386717849837795175430854770749931463501139883970148364355569591352178627597816164651268936590016366615235430971843
+1626691744466309451182517845050907803525893409042451069687831523577743242687080029262942742968372360368621788807914146915526880
+5318459023686131069631243003764992320489381131276662425282581511713606116289353391248019203404378565007089996278162834011328054
+2940914263304203321901619997487124198689066488749388375440671721678381773728920019056941032982814050260828373786697860844945937
+0935106263610485636127316359361586585062460943315331019818757835533567856247177900197592421873824025425985298148601575872003838
+7678845567273084139170475285839065925039600025616987691701666903861540800590513965950744386259900437461673353720707990879400851
+8954549187260534626790030686600472676242184422173770737899202674956746463128211733652450269429272431346452882295888511514249530
+2678743312277245350760231139022995628706226321476561623183303095250671287742041881664219630594695703026351221927214229218759706
+8754746770599874955073426285210045733061478934256278154824723752843570542480374148666553082213624470594178380618511944338556770
+1258342170448502309847524118053510267304683961421264512188294654208652383435713573419843151024833136714917076044792376946554552
+2686790894179727162588194653073820095034068415445717821765878768235572220948743946189649565838289653662296142578461681042115408
+4979975702994756010947392018214486397764251254586716632357033001934850295130508675410334819960903160411122706650159720668896818
+3588969475934951426055953320940144471459990302441248110905750552714828775127383961567862284258836730043491152173444309138622805
+0885835602018492226235865580484440117123283431801851414462459989105042310153202450298431895243159623304698553633960555968674076
+2495404637338396778354332975443524901010204103490577360377282407257576116606492214532864036869380580423420924036214250605437552
+0273823801820228766960129999040441972228765926389245168282516822705610151382079832776017382538534107323345050070717318572440468
+3719693296470114077607298610532514071278447231443437795910351532332738448270051379404482177889663554053263746637709700053641967
+9828951429348008059079973550469791268813640030847883313731919419849614743360559828672182938947231250356355114573949483277719010
+8160147790535337222916241165963603517851503563087426894556730214593005608351479878086372777584308199478067490440060949884647159
+2948684894394971841029364986618911826288588400559264365297543464936912860908849309130216792677280193265598685884468366012698447
+3139146768567604514882268160880542261286448423327913447026774946542138981930662613526814753066924945383435581070740645979592320
+2648770517875200683345474598491811627153093170689853703611806314466352414707945002443742160480066256003350127740349411901099140
+3308592816806695381210143529051488111319581220479904092647583948868369653515446635908476209492392955841254295107008775348098134
+9546057832057661112548846778480873064251831646186943320977718022174333455691510572548784701482794043711785251965805930805124302
+9797598220825240487337675580868560618123083511865310119111306172185132317065154479238514833175902325985968356007574306322665172
+6169700545459665615556940263207457415925074513750097043236324790451429771342105725243301487094857682554118664272164353388631072
+2065773265591123476370674843120027879502951065822173174917589895449890375502164860452910893685397468281488262706240927914630538
+1707471421521563472417257512298478800552951214730430454446551411959701879859928077389843110236600965268158074916952323108191254
+2504020366275453319690764881376901720307904782764373433647976640867427413961893744590272111954111461916745192557787193817126040
+1588579151481338108756894573873934357158704669830936720767495898488860812251579113152660788061419535504615986627104261122375990
+7331623622011754370645778091243569467777379728540842719407347993337611435365175147413009114962875879124181378102542276566594108
+7484609326756980072187285780841286543812762762534587441056462410575222582806689121646585229111979073490526305371963936438467919
+5706586317647554978296224372749817614542161459685489294484897802898801747536653246958762657311576344225567199024088879682797895
+7982416710167868709570332702438980645861985176457876981357976675349506324625350574864591977896798566893422693217353865223434242
+4612810517637816971256206727690640808547458195070320671241318078156152911173576755031013652809873321281227880993755057868636257
+5869566853914426396407700744200965755799089377206196772845889331869496057116760154715122075783787728423594874902542137832225559
+9589225721722482637458883619679136109478999500918895037360018469933679740571642521146059558547268528193088694289457407297389417
+8114608149302113225536168603740452239048816211285413122470267658232185443153634579198429078537401989102386028340268733889611123
+1658771744647637356624539664960206812688702241127922503053926273465214516451739790546967335354319444825617690989800359892589856
+0053465651697302095039711511050038742810220818349852842019182724663703883278427036626489847521335203092583455303768771456368837
+9461783935995459315552854731516681231226811974225458662840484653357703794689886592991537310946084831023202899386375997693481512
+4533585921481186000403378289480817856084298244494770175994273545179036968044114231324393781909984894250047249639320078105176941
+0088337423065130496692628858394850230047403024636567775158827661121094757863694577077324592397639708861018849419374525563390572
+9433907825695888321692655143225283986904641901823924591220365135713855259383744336203797993519930945597887702113356326830645826
+6988446116797840398450853279454162958768243775646820798515687585868046231740714350466068297160555230698894793181661331483900976
+3228255598385373641636782196372646263654896275851591790742732186929071139789500558984105284755563028281035328678092579289714000
+4681011094010579149015425103883784622081638214345888273901960768244903621448040859732301956914911242855175944393888342553563087
+2560980412018398873410432462155957943116348971819529996430919042949095207925589612393187400930103605496273814170584912659092382
+9069469616610979589154787060025562176784632650316733720274832314981371020706161084351225782272365506817110974959084699634535788
+6765587755549143676480283034752182178980320308874937062805295265849032617917049285075020134633510431916668093086266525800515736
+1987129393090049213521579473208927794007157494973792406906256045288699283419276005662236119067885571670938877198469481410429981
+3722619269607651225319072582934109199126677644296125933160645018724047938190291886105626593185859522559253131444513872231301882
+3878903450400959596968323921819162239731394330071230682797573061816799122019281619186466630116704421984435128057686311537024574
+2171772674581440679441147914828465322671796713303729214917204516452594596558898159147461291026535836576291138961274078954494387
+1278996875658664588862768319875101010284199226028473900312140448349990579106956212227946883352757991736474264479730037979113425
+8251737524782800721142346398693390112514424073577724343296177123905498209033583895128953063498814237667366732979745537429555278
+0896743149526940034664390783553213882383502205749882093466354195761918368893140199641725113693740413564898871253806941096124190
+7796854830589872123486600630498401268330698814798157768931103798808711643064916232366065296644778046047073412187780619253278677
+6500537503531609708551372800808683958268146390074367413801774325497534682441389495398023074938743544207866592122064463211672009
+8374007659269318743410884141200642883663626493756879447578129358932170292700541285549708569643545027306452528039696051958912164
+5461313220523803049639223578843432913631643532704665479011316367050573380692644563882130994146341345324086855525040200238888685
+8089200828994642111859047971321583377842360402699515255215765930754030446170133309029861283548123601950771958367816928039501979
+4921861981592932540366839797291842409375656173168252866766746284441002285941098783812692417408647250610811303546299712956961745
+9167799975366484899208629064327399424255199740686280222254809555146344897012896217389558240697588684347940576269967072665683864
+9259388885200851860744997606520800745929512006692275733677005833780389985037437438896650034386964970221299725643606029624930990
+1923555984126235140744073661251739569863134027553494228555366490941034788475845541690058986834251129830243447779754071605873640
+8546321296959618681680784347875855095908171158196021873844044080735403609307093046577378976184646301996038465275795577308210631
+0292841602799520083981301964025702228115813520124006499666068950846030422607104364257191751077960220252620197225981403964787782
+1502322992487049171872430148257934075524270686852895414785698734102981748355080650539194240735935759095611779799454232906920170
+7645673745116807956634247517521534891766878215315481669195796109233157590171328181080639943010458633508897705148841450600988472
+5372622766288568973430030404326811200585106334044292931194542876927622884286129265334479806408440904927200146880239590676743160
+9737852886366125426992930022076166695307759649277919719824038921587655496096287480936269368326605698820270793854355939980396762
+3180790631743853089037422811844405317287386545411386410379668362987107109358079426452748318127402761332147799830440163526016129
+9051792458167155549317710812956107571797762247756516089487421498534083002847984096816239076561386593955153876706013822381927681
+4173095560231171732875361485159122658902814416236442472154640300288401422165407659115651941434514022078384640403200843998671972
+5966470556331046673745430553457883526280940892044422560744252802816860579980940340917982940500224988618235941234788610789509168
+0789375239650015659257828854233372959702664651151444414363942452653680312005125741160555543069598467797693116222658921071003474
+8906623899466461239060702070337224569185523906567051838309830757794131815206179504935357263945463042333252081048931892858013514
+2565946185596833054040544913117114680329109501977878093743966290348734278988799428312347727405020457211698124070822545220367599
+7887639027440626642608258462581197685627001806341140783071773706310063459682140433859377089948217599328491885205500920242752765
+9105042785087589492163764806502467978793005126850254340679666786999523605304678430709511644540488408967072195820451312364898977
+4806602335002501148210169758225301946374240051070758860058332659173580299590222924023022260764063882929324416573334085874519685
+8860484115578005776711551777005731510087855975894724843956874006078066036507250577776451260714027733005242056180700853839120022
+9972510062716845450929888769682540876602068670550887529330503339523242901354677312818632650357341649500497585776441604969459550
+2623606137079639076047135393717143616094073824102105929404170935516181957666178130675618698894069752882863773580174806425770058
+4036671892720176871088682314351824213287902597131301780764439176800136663620269901795969751693427552587437595932156820043424392
+0677294124292240149296066696637747776445858679559483174535961774585189431151122220911414705647847144029722579499169874681984001
+3515611659295600392682520429928899147250410034409210806506732173247308027181439461299331344368884698174936563300497600474483708
+0063773420552619484426050490136425686777123343387056930411442496315945289353053161802745807953399447036489317450479861853401831
+1025437802898670603956439520711493780674154126180902484921242469929281393551385642769157018539956452797615106532069322627218483
+8759796578568398063968102679425317647163292357375418469803494058822777510870684874739268000355169575539187937262850844553141671
+0520130761108166376660600783005143635657232142524978468353606381401953088627097253750920455395288123559132491257402067683088919
+2890887289996966535342242107315365601206035014159576380219737883962373302977227719789793402712556663655879816814402801231940391
+7075049290134330330911964129274745947329781151686133509827045508476840011833420977165532815261601339404747681713954176358695787
+4190862513692697255977164180664759574127822507052658315853043337010650269787647027656260221445450941719360532423677717036461514
+6908155746961875390092893184110336543104604423996158420042649680420697682015958655453176718660496277341803127921088518280061343
+8331309328194407889735199978235437818800306669005429636917360222653217191676841870581785131998034245906906399415366961802496511
+4025301862689940996141896458524993405457637230423945068131717803505952316603722440206101338781745994056920279938566008667957974
+8407156560172061727221211500538117499687747789630891734019549331980906693172176957439813668311313041124185359330130579817813671
+7466416959132373028000515440426004927338552129675365950832267054293724597329240325990928091976976797329108528262309484406803795
+7029882344252063506996455416881601769204928489785629548747090770306190718064516950313796925310576174715934481881905681054628070
+6880642279419324327941511209000580929409891074059158709439715032933825582097408872913695012908119133558817540571147731630417054
+0450976304961807996926719984418185237945644387146277128118939816965978556618267349869880710186417738649005061794411263100794703
+7430304052534898545934660709004803179571319216041424124846029027406133093839979267839656729246840664461817790155804024698154985
+7645544772776077953527747512204638297554270388027111651502874795299134795410937797070656228161921719694817879801901345933313665
+1313410076049663998827811921356048583498283359569530324863158193199961087225704771561935232487625934010979224924950123845221938
+5542450907649094312430747916423053695607417672358828335758664117685424978394617325307248658166202146920547925646776725087468720
+8125710483678181819120321493187443931435742819361342552711290450551262872707443639793745995943576289709507020621251828473114770
+5808995455056792083922234742431742082106369821885564948694790039533752228468465967393391425326441602867483086230714643155046641
+2407915004627569028579526596926110527896052886334582385573230907225818330304996992697006735418150830862621130034997989250568103
+4747836691209220024929494385208567863244371223110054782899030754719240501536232821233744154670656379727685527957774155672319475
+9632183735133215405359145903218054467186662532650851575633645907886287911612022173510068469813052313582577723168904869118582615
+1758443894147315526858202229285381300192667883978558926059924490571584269631902778078169815289434853467255533171050775547788250
+6827379725903576619807972215479471705793002981926808670091729392075163455575073588508765374074600361763199064144608650998814612
+1139348883195112842120618191199370895634072657781661691958053236883789482321308598352679539450892103726749423679416567117182472
+5628380449503846780627597266237186381426941668768981275727365655268389180764025467621494196092237996217033830813378898293373834
+6249982118767143075646051931844250281862161753132641089322013640269043322260625061753846454820580624883961230554153956989845603
+1506389246361534372134008198497771836659467625678409854914006570144648661265229365915719554541771143877999578976720337073985818
+7005263179523699177762675340194056182817188450058666203568903779623473238455975919469726862072009578002483873154457672262756142
+2974648493466373909300392298493641388947991203930909247567333382267233769728042131150238686456747730553128288781731025800074389
+5103801198075821222369482103926218823537252278659224466101143285542928579893855240568803378461857010249847636234366813910593321
+8255444368358914408018189587539831385866661807993390145935560791507824844153502737089683973595182396850151415917641412882278385
+6994623624086457510788033568938511176649748143257081559534249807952079088004873263643117220080770572410226081636499222544341556
+5868861827549149829709753995576140261303291609060728919357591890769431437067208298630183272025511291993873213366101172628545169
+3536668590020988868465523872067378130539719812107645831862475320339405404292929655894962610265222780223832442563481658864747632
+3855559579815655284020206856324714890689773172461142431850331038157366681406979208119201701019291754639995462477549126425391350
+8450291792039621077539436402960450989801386738795258875543765926494042577259109968714035988972694939518009619956412673656801521
+9433075795122748111293126771649210779744396506362417079033687912993766618349565561906099136133480366162159291355560623721579187
+3378797875509332216281558051343681937584540368139917115626876588840206579792879445323063696609803160334574023091211019696117960
+8286659856511129135392256673984667705469454940089344874655311260297659378259031305125448870028720171028350742267966605006358033
+1559883131888908511800248016547342952257309383028102249271256078844439208862517563884780187208616611438790446776997799461384713
+9213000700276768725565441947730287329227888200262127732583001595805481558214719061412862292967561082950848644790833398460564723
+1237463356367627789252505343790157426584837476951882453112990120548575795054118752744721410491509448371890573822392145256573546
+0705282244277315586839396249472907788988824858086668101214804950902161992883203183045693099700874860748969961552066568180233875
+3649804362910298143091615106831740058421008356128934335979284102172120855125136327683861035088765145754792315464262726624806783
+9434730144784579817482674138286237679514020123482574946846405367389289759453442305761634017866345369865209680919734485563877769
+7735810389258589718835809442124950108708303704945904199371845065484839372522859566124912994258804441548671551838820818437896075
+7383779025406555287701082383561184897642996999173556341153509465466385364878232088945280693653997350128318569872380406482923450
+0873625836034957145587001580511059464110231294763738687292419746897783167632026738408026265866915946594910670670203196220111099
+7591072259741426420367322902499121885937012842290323842004604562106110626665272233088406003591488022718144482545987747891823870
+9175117307974364573779518417573849521480439605413624062061689756346227400155445091604379572899069013192269044493766848399848392
+5240204070345240378009455038862456326732346785249576960346569277468135720674493354585769115025511723751059422380004118585409709
+3349173998694448270286501817135410477702569648480525937208264068896413487832339295364105296137401893118290448960552591536754124
+2721855377073042117183109540215181252714104113649070283807754222580162122302324470826848007123339852921541117150545915474905734
+4442237467667117475961916917266329385273400917266015718314637687934575915917583933649989627896013912399205012102463085560527584
+4091026285900629392132231811067909337191049861336953793421590084466340471776345574531068461460044327698926685026108185944785273
+5202568174541673346987530914965105932805689677456919213224331168071054852507039901870720345655716025476685968559834858758422493
+0614858796890361150654138608860068135509273139791153876597516417474596470901950497034522305572817639212080825359999795816120790
+4690019462662785935463711750437540580321430169890806355137538513325878535253326703788253684313085653375194280379587086774403636
+1192297531414960747356858854539457018921020998476941206542822005080405209643807598603349026957600933047420780702135587594220420
+6385879114957936148095665992720513226197859511089355764654052901972661068207137358088876405026746758171573905075146612191621724
+7225256074560068850195651541217829216290435321680622077492940113765770295891334808874940394348277026794361425754981697514840551
+6579386119350941004072171940171520374772062901476128261790580552298150743389764668933362002827319670377285437400224631386514541
+8225060930462866114265671430768226751533399557663700459188510439035058277166158167696828360029527807376628848000272330091576713
+0060985472860653127812993949032906458731116791182858234879179245998734711417931089452148679024170798661176089885161196837664106
+3722805008939449259124307009136610112592018063781886320098372656598331954054355261215122816645348365251690431718100984807641151
+7671563753475866652087409998956658850991352510305691362750704516857124752942784347614592502287785972007339688267613862027066735
+1058283061155393934892259910225706182663785747481861117691921311446649045132526185682558542054377226003665649454406375422089246
+9732227956822666337303879201449758438032098745926653063569926833474234804332766368153105341066282800778041496886005184241210550
+3671076559003594556531982936604847786145732585941552091406028722895252734130685947197552543811727116647815405252804851390263345
+6932108260738047486627928786730592183240725916073436786293871274003576099287405402166418657664483313714856186223383473022466647
+3109816045417430083537878210451471667742535838802468841651352736464574926057073048472886864367560530408263557356129708697457730
+5131047990674797494394562345612521219564146779615283892037401029449518064490250135341621616256327661631926681344727899774392825
+9793560539429965156147946048811944830887554283992612919784433839525971829092056423046384752108153956186882584119526879128063725
+4848894438740997315189560856906795393017681147097928684567412396811955257068230623390617279746246419592475583485164533349133972
+9247196347885177565475533963701634576057917406510305607776085697222055528129649096213092034549229625900854393776713393006598014
+0895574299458423626122169092017122327940337399418681543962293182652716019527292869659349372977261887962838657423721599638764034
+8069818312801265892359056947805299813404068292205524125399036272188934298155723014962611157660369164361085013693243392717540968
+1746313469892957608005716135870516847580996237870651257913684437466577959076954626426758903637186057505535214913540381448786350
+0826130380070802481888865468100577235559992056039751752075537240976306665243883422413804381659448597324700429367218879041686316
+8783969310605138136810926575209117557352903553802462523920408350875226887462880478648547408932195087998226093346126517623953622
+3655963588132204550439064715232312197339282921758181601943083078440247650220106399066615678880555199248431536315260442825292972
+2898418712339146920156618115849473564647025888554958680753487875973131958912468912448106432964749351366422577093050105438712807
+1852498129286540733225557917645869957332090278845330056842464816843083325044360873406582227952116884337704935341689726805650922
+3976284069253193914079828201683985526108157492968673193265258027640406409120387997580216531505549000204500196895696438933985023
+7344227386409800578949975082890327124630045606308364332447462178940410322375677488036092734345158152279018751575711953710675611
+1365860719506143953539467521806358327791893587420884033512557356449628421974197081525171097681451739962654458105945042338824044
+7339951041651291336434788317295707347631976285149811926440821662705811682404836418364754712250487175296474328282212659994274238
+0212161973979980092408896174977830808566631947896643996545492647236993898876722578200269918604906863319277003087190525085408577
+4872695328272197013637039406318385585335721591609046713028487734545081008963689929406578869624586103965589484238888590831714070
+3093781382852235095749474972285903266360882836791963595009076006750220113661602476802687021999748113402446232401462878936110934
+6435034693320558902105688910308538965196623309949466683973971294957981775446228096356658904951613108961843850602970532678592796
+9900412913465232057825708257994535036127184304885007026505543104350741668197223958911527343764741682299736861152999772201279599
+0514985184283479308437214277006973884479296109534451984897036545588323471166529442587769709637302971344236763633165248653048272
+2548677505362732783025625571327094753804197898599649990120724885114160782630110803234921618274764179324553264262464188071111602
+1490102219572319216164107062405778780633273426833137366869390517112371874174117264586848123441331500645236212846316718716883477
+6374557134532066647778099833443353940716636987739316642710720220881882944339283639205849477871629369917099561362221287484469397
+5537933700604880504714026554029166587597577826204845542181354963551493735767539318268321221914383282788245529093887530478824907
+4539736948571324006868573970323898689460869616752573795437663232396854974783326373421982301397494963660135114656842200560632231
+5417628879269942844019831356484605118567348015685889718110291011794547506306795984565230200245047127434730978214554859175571386
+5244295129306313578981901753289283565322938724988065200258490956019375699629296714989839545066652554067148655850643910689520282
+2971836240187409511885225271973597558472371014435493899110877817281998758924278138897958733963027723716372919312791817550414257
+3718036377547310037822620295119160273747183347935451508155041258644862468137971759991204189248362267356043409939280563151645203
+2059403653814048643066476915696010105560937121353588493219472721117585709084500577027269061641086537899045745026346755806963182
+4321247098580397470005864122314116779988792921164422171095663365610591552259489098505982208555327107941284015766148898178511334
+4129075760977557106793231123557041651779523250483585239932004312719534628408382643294636229121610127684366632908893383504173184
+2529072874533404417364878145806482135038499775952105421793815591456627903830117948809720387389717200574623969207051170720940841
+8319746694698707336604137199806790228573013581807699678418425604568242103303802544153333753105945256725487631110225791990763711
+3880160358558853965367146276153313624158725831047412244380280879089394407413109649993209520904697096729360273647396579418687376
+2091906829462709596208568404663223009844823381264480008433097662223468678702122339891481765380241818468489069582210313140199504
+7634167069455911451763369770809802453049016134384625283172635485682336911180471943157282346432504400241673963332048163371168819
+6945528084709716553738011980160563280642542751055915815221655609127228922438332498633425574184424076324567457335614537707491118
+6855985221224698806898182154405013337026345633363958698774698699505064139860586968819626692305575161911369355200549282693239574
+9661995161189339321012455875057211575581587182476156883528607442238967236926672903199283225630412167629967841892682077069456544
+5556977126081270383421853880021926196747677623279360503448724398127284807443362608046943892392030345708092629807650879718315338
+2008556770184273576766805643194174770708191017610672185545130733621276522353464775534219302741371801405182864900478774809576537
+3865082900785088869003731961311138273432940384506242628178208362272250891137755623037615929981020628600026015312604846649871045
+1810271541153370013506194385701474067688519311563701121092950023460871685900667973434789085894353689769155959515852286976707125
+9220855281244525680311255117572398240118776083069705246489217127641378521494501271090294888487837045515780398860147999941580644
+7341485956164711767365322167960284966203049807458284565556017984048646824943506319395879136232290301571995491168074801397213067
+5371405547126368328180403806382396944697802094247261778722922120527093199887586224288144259646007747572032786762234373440343768
+9641998676406552363362334096338343938226513712459780071504106769464358782102176567281764333076640338559714360625098972864983029
+5780224793125175832096440772460219675603258721147649221639684097269727175225573293185628479999177881598175668238919939024400140
+5871315749737173437146622211284749783435729572078139529891438562616324259909214610231102730312223921245301659630109254504380334
+6697637358599635782137313649853967748604644159075078379860391872979880640358744386814475406235163749464766557762029498100317344
+9260432917913444420430985635427292687992391436924828756222785655924726309271829922076362876173530631675597755661167920958784469
+8008272163146127952220122593079694523591964786341879588418492633364085713190449203278430539536800444410958318893570820694596913
+5865771428552651226808077349460469511350507824410126508014924137043903316541107301501243645730254790431504727160432598689746741
+0797866504326277547835398517451743711623314102885283925539211029404096358855485908679412360891989483761400122402649553985042303
+6315338269917337190802305575034003552890761126872174385267928282692687307003769845400327640284655468895977857113820663582843212
+5883143761391732179613778683464000760776952507578651405618216504779945736760856433526347237980076786027307666785673805176780505
+2608019170724255979187609288672429113478903050968752935506997075853793110328285209939065370268834945095553185289660445134585271
+5934178091636548622002305410563118241322636012045119794891759960583808782939464117247149044590174301040963274743429124451974081
+9822212841254646950102433569804383682318140936706127266382165162763534213426673482380144302560262856995513292329891211427952322
+4939074943058922639133209628604240951813644498408022254626546671648111368884617471264005460319454857408802054462873323814596304
+3567851550694955955743156890344607975932611999373517821856035756405925438219730313496771878294219292907299376903706456079314724
+4355891716120089571168867921156570013309057339164893294310027619061553640293850173132141828093723591781265620877693908024633891
+3432150765823697928455051347308237232788126878764759364421680111689906395962403729413891780224106047993476140159348719814489238
+0234684991575714928121012708547654894568292786765465546202194583822334911755447378931758555122045328265456840620648627956740582
+6213762564459648735386518381734716590458385722741140951208497160837103126054522292981022939593107580769282971517719856277138950
+9795430658880195944561326976463238641719113418421451290008508454179670774519228875316092692131997401436104108663905564902246214
+9652373982485787988119955149332007099514930250170109206849474570844779657182243727422415156736246473756296181666403081597210612
+6363221919442807657179269261813196315614323943076172547080772762082497876523976444410926957078802241443845971487934887307740781
+8442538716705496485993660458983193034639571775952652456130115624584796446966906201307091498198760859970990751619599499849168922
+7540755071266549940783200519568012630337075342163311989445430751720634069245959298519839175642543857453232073106471321794307960
+1699245059009156264426959609151370644710641713396754020166970217700932248280718651485571836633670709702375632170998942628345680
+0816396190588432801059693946646313280382672711087244012208759747817406868034578850546787526313820913242493648577159472787123381
+0759322746357530465987827894614798343895157467747058744481984104257507440485290934854164189380366013210043776529824930881371048
+6385658080000822018084506735695449199723297410443658699992360702264595362859622022028092450523165950738306668328519968101921178
+9290969633149036611961423129438616262578501454017560337962795366936304454531175225394994520495848281893733418969823834849646325
+4866905011511861701376543806753349151579844197278285044705460570867283644779510401658626041128258372474841328027560368075591684
+4097340967374048459759351247293757377219970623863320131555594933368226711740987383236414710324945367020743532195606500683770435
+8777289231702354648686196142357855572861820397757772835817870476148855333166772599103631182225390962911857675993162562793056451
+1643701292272316612682496492137369576459996136135417810378930005125534965897227946840522877611416279622753205256995171831362038
+0366738891350724663780781742018384952618867530073606447030185424566647732433327301660674858875240792034393577096349757765316310
+8289591408206074373434407333542355057011414872348953466323958988208406535831896578204946085981588003478321397316316325936083627
+9704718565559121039339280928457498417206123777131839564784077774260566019404908403357317188872113841441577298919813210986548633
+9293886303171570837540716535349361584600602170148405662530496205079833641395026663688854207586823003823193883976384903470625532
+1727675041270249998973772127828169098733155135266069947499638944765750528948036161984830730668217006998355034769138526948886812
+0092789759212121413625842309085282315688319684507180858726957280563112424218015623004324904038907228951254860936129174811193610
+7248502251808372373101361237612617365642190393287142805878594705588056326330546884029678052177636399750149538893582015648656691
+3367150919108114535725714981888781359653934702237037159199343298241562681613327166427987327289684634196866794561168570101129576
+3376393226054192039386172081865991731275655717454440752850294664224843539838937920883445641690602345087514795742186569107517414
+3623971382393048718491241619316545941650237621831224965329865224908967972818626887372855949653336237529478398264567160685068577
+4052813893095863733367924664141451148648087387776942749014403408537141959668060633169208644494300366994545481397333067992909358
+0667669402093903159518564734675653958529086910570255872008713355774046040785518290333034404789497402572158389475386895486868259
+7468963766629011848413788837165962853506507117471181320045844652746289086413801588758664510368868946415159144280007188633881726
+7244685543653493127669292847190750279258471265994953355225441242455255911176450067019362851931161106818923851255323971731656588
+5234890473800747514454607303289634698091529945347698407177688996229422965619449293992367330399443066079751703944482713291326343
+6459044264277571164204689989304404957960666476059760392612837445978755062781098058819661144475485054149528425812865761888665230
+4335062014272927898970122302854052906295227383275313276798239957308395793035503825814636802802824167294443473540831595897555019
+7272548964073946058176039524239703608785612474858328053422538963447385787828187985994849316214926394617015487472147004996421715
+5996250931763812814551030631847429127490485716717613966608339966170653265360723312151608339298980087240888475983661731432872181
+2297536852364764322872184823063403907099469015512172454623275616030363118664676670421610327708607480232788374190290021972622793
+6341746181410744070773088966325798253704849845010112635545932402181743821794042899160348845322610793015131752714444557452077603
+0974929188283489944704823132680006629007254931129889666199080416689925517182595848963795936091170595822025233402048475030835352
+6345563891720858751435127759306670956633219054037703933137927110019397801896389210768937954353107771885376564624836527498565777
+7406605189056950050564580620487220225704555865872099535962165458171814654057503675391062376917680202395298499820248250031013118
+9646002186451042668001138188414741520592517338749162144757726571293411846579111672780359450504540363461450479439757376293399965
+5620887367929571798109873216776069586763980872092222280624201174614361433514239488022226011723867237579885237366697226018636145
+7658816676965243906096876039909445364177324988679848256414790985301032302828151276736018655718069421805321528401722943260148087
+3504531887253350368429518151187892137924735559724530027941664978322897818820489478004391185810494126054267658700325358193119630
+6476950573687760010199531144942136546086284325150545828401223666989902218958065517474495615521528611225439578736181496123291235
+8141273699960775743878136458997315091877968088833966155435545803714212437024032432947661397098373986850161208575249088483734667
+7526564869781879172205819920641629162261070844597301726270751056013595355206013946667713217060767795442616244184317275433955181
+6807778755059399042252363801724898729347456888637350665052001794960468288523356956423878794195125458046129085019792922364372832
+9606605635909164393346308754559022246397895156754911940817409436883533684563312856180585298884265000503280045621922703129043223
+1353282688124152832117904166784884443448057703427122162928095824570260033806131301099883014390489674198929314751517488130229287
+3941712694041861559776002423763440625536805158907454771393762216105225325673929237051966211204216493810015246774275044495594616
+3694132772158289887311123798026659094603586436166517150338257882694213224057803554027693325965893134619716724281180373864668897
+0965421930380580362871564338408316626579345707567981028006568747619015807088576948951469852219385041334895298633260796214042764
+4365061209195177145333592267894941789748549729388820653503884365772532158665492262305741107905299439181875779535940222413616201
+7002692668339856374514202085788525299569973429859432424389034479629705876996023622182434169328690891870930429505413389490533136
+4295933444463189433951574721728951160043627069745406122977006157620687110134601604174649175489421916452229565760756130297102064
+1960368933597422050626608328849588309269037647433491188814133197810733941601294848194060829957660144812059760171213031036827489
+5163673581923411040228773859014781426438397455478270422462230943695383387244412044104565525899545629313341781559828594738866880
+9340062964014870509227099698887936675774112546104074153547361150335199188541340855227153532746778775047019132401967059701871242
+3486224254115155530038741441994666898680466167832566881940775772365423817200581937154559007068187829334117784945473428671685916
+6007443619236946702946484250753989318115938165448366527641686620981129998037010871500824063178061129082786722904909804168031283
+5077049104333703032159256335893142225775472800145797927383645074150506549583979834771372332786212436563421519736302401896553214
+9328253090460566002578048864828230612968529907510194421722878024618561333479693530779323192843841998003032594026649617397117033
+6902940885468724446328665796554679901999854957523032465138455983570952184108442966984143957137952183112915545991326476857170678
+1147940566264959316051371696041947904637481710293264721589819021588178200143221071704512368347198312678908673679523259812561827
+1664627873674389755627490418493705966611982979380988314739579220409030725477944088566536789756067951060713524593551031845158984
+3598081566704365022254984411009080907751257030857437625615151390400729972784657938585703465777027605245686537246903748184890274
+3743523412032108137414706768919475408652123860125336712812291505493576913938367683595349130153523703056997225766687176144402340
+0831940301479210349558229457276992358900461281585291044594812536347699257011182959431429011534075284989504481274394019519138849
+5294182590907051056305209676408046536522421503936187377406071503791132907536141109384530248717758304915645762984125835020638228
+2925263782209751558565689180869492270244285946019041108330056058905348740666223484108200048676063426609063511425234359377856803
+5066811579460770402822516077692569897555102184861090248580603480179709451447581598869819018321983813091599472628576647298283510
+6074763977940235151776420120127969582510026900568916108091774893522283047922950769687105424389690185426520673414305707753060144
+1829809239775426957360751626081187328513913192137296926783947378382044283754109795780048763911203026361961183033933012273700578
+6256148707335785289325167505290076615535370263567053348838880542975561767345020465640090418173271179915907484593965695502745441
+2416400711412329501943051474827325196149637971289654356289167838113336024091716837472756809029018726324544210527893716549434408
+2077670900805210878733285491095692143052856294682669529394939361462198474814099442765549871744436963471806447226559851872954947
+9082929602325709346337243734095265641562540772131425161193766826203999287761238275537747088073534676484013517045928815906520421
+5721840157618684926859754448303249283214882375060250302441861554867804071849460117284782240184817225436567120551507130457965054
+3640323862784940017360312940091490694469989530945043763136591022334344797040629558445856236949010602808244365211211804494530091
+6701192226260174575156745632984043284760428280836716963199179332091776863302070789290228857289693019520852953529236479717683160
+7117865720410815041230240613271283107726446255341876904224653305719269008887983911844926604802435682901331270611392890319564523
+6692783449614566649026808017316150504276465383033625466313163064737973819404507236614011588134611220037079763294452798973884759
+0914820111491787540225084826895277018554164459289529667607470230351077932208310255555375301186238522549530796497320559115264320
+5836662613656654780353360816866098001238641884282152191319830259179620144977780872729828947449487560906147944637380292807461055
+6561572680280173994959056296932010485999239763428796091258639640337313710982242786240160248574519338042692530967139936885572234
+2825509566854748807330632140109077953768464116764873006974740017020211637781546586566316927017884251448954820201170637677959988
+0832497323156260043765386414739221132824464852853436205409279663532624738981652928962852787063322728977472723705113895939816648
+3887836720640005567311856937351200913471468555895780989932698604802967755682558413334239668009044766569135994431992317817193615
+9488541867758126379374062288207207762501971013768400508156207999323493728384215408284344930017408986904527951285518045057193770
+1193456086093196883061110691053041347131507623254475732487481683124957212918787096719880296652189465479161772651216902388161935
+9023602670135872848924155417498176225830627494225163432154996996459879170929691453342113731711303819248475466023815067381174572
+2080493294756115922317931111866355542145263306791051695700043555158422272380979294286809277064163627702612725392431921737967789
+5506584820111354803017904304944193794950330337626863953844116710622843699200721933361001889997152111163384731679702997569228667
+4453953407265344555661480951607569587119336749659238396970668832430048807500071385571032957421002113212240607304287845329689873
+9400568404300352678168177542306869394633571699501805048687025644577243527012594817839631515308187464636399822139186673563109194
+0383996386779379889997394025888104236940479474160100383602505977089098334042031033748699121508022116963448387393566265472288965
+0847531693445140037287515174964594859379085364324835476807557964238229721804605800683718605401718393447954937423707976551995646
+8901279644569224520056558762822223149315014455057454435980383798016264269841766056870811144787284148299586773970705052525539895
+0256120889703056267161520334600912740468642740690884187820554569479971860126461193414499951106260376564440623032634236822171234
+9700910582776001785061958742334821043319568168457980526939228569330951842352229610659307009566518307187068255993195333178816924
+8084009439471986482548298108494644279210299285939700414080731141355145274821687079465639330167799278714667429384500519830074150
+7502762255088959326392982513450122047410180131292434743496089993750128169949631240918611287380175422097126458912263961350683605
+9825024574318602570230904976205086057242856859840660113304499069379218541308171998260227484149937812807157987838492362751492073
+5236013621279011602439272005713397632062733928777510296548649421999353087528124960783236699168282936749555076309059950538448044
+6316174264399599155501461815935271957641181470379962431535756895151732821144407472754664303419949275610161730902538833181412620
+4057262138394989003315257406621046570918156102356055537411042166653273066886196141130782850554134831168704085162214611295749827
+1728494807516097505065593608124398864640297391491113562997206711322054216710834884111534067711304959653237337706486015754839628
+5402941401919360128506367871554679221289967323748328989926516006333132440966780154068277893259475878724270654107817685397502294
+5331749302510962305291613004333202326722920832094875206002590142911609625146433305314091631233538797653208605364527924132244946
+6532771118816432093996083328883576769019322364788699903259151365484388584381218032915424365355589731770063912720956702509258388
+3882789530639893098899335537330679624810372563783381211488557543067129370526059579061942074775015254040779746533167078485769900
+3805020437690986060459807837031266916198079638277454221416718947378635541609908151334933790442634344916435987118766221380030868
+1492873283652410067454455812350782971829174602968575413579966330593167559586103530053302924740897504468176712345572924410751989
+1402681422012394852214397745855323854981769611609240399129690457712558487768725787104039715649959552365787249656873757201153712
+7034615208236270834171130441362610841044504351389336191409989539270321328989800821619371048375553928712514470949748975085093770
+4290878195796201049040671016672715493368576254144716365945552067883559930088219118750514982822693100430367769784775351909372687
+4911033872681823931983855759969195568792322301570737362071175550474999508803728901587248248809147697357896852570255543589500900
+1706971004869558605860088419347382200967993695904618287963224847080176675951145483137675636512072408162582506993137174472960694
+5573663486380813348973168761749599259962367833751791115712074445847171992391927789752756447549332777671869328971664763925290830
+3549115232652328982096333522858191070453865857146234126898896140406643330756492575988127393599824952457257137615690188707592890
+1525981890012719417710592274397314151142262744434946961995671692595224961001445969622314797497698000523423663899015096913051877
+5058249696800337974138653960205886721218275906496709288754537792787671454609339328245451684579097878838116584542322616579053187
+8462720851869420776547815997374420654356793047547706068426425982466357700923014078111329124212863212450480733486009748682342594
+8687099289779458763026259506520765785275805315714163404563447144528065795533004752634001703743154416316364697795177031670571395
+7862389886797621228571167458335190181377137309906389411269247283889070732381228453233824760431622453252798014077600435024553202
+9884611862481302466807813924732912660462964877829202613446787892509006450191623119538981968974508042576824347741032177030382425
+3275371888164672951716608075300420614160898739974183834737152799222716640347298255880801705875381815950138367820787575063612645
+9756093031018363423853254508819810837905492342390007409090686184553436757595124339753724654015162734521998021981012802729263275
+3427616385168365599989752741868814273183927471411894804297652680678085002922251517971806076560284843234235639397961184180625624
+1126099034992853577542894567722591646934072315106827450408752081909824273574814734547622072209980280969251694858199479989346866
+8324744163428589301098203537736106384602289116499145216551769186060030444438336222899526023763743834415207190662514180019708518
+9860319477002084962218177584666884101089885263708103715532250072465740590415811526551340778700948662719303811079801949032990730
+9442895797928578191430950680716135775881506952099465712614129706777971670822951940768332168877767587109595551931372470789023062
+9676406861977772053008009279919036888396717196766804819265649832410502497794545528956267262992497398344695416980354321065043902
+3430450368036376703613028439245508507778168871582511449294099014869582746432398446542812126358198966694091267937409209466063739
+3928978146389085853115437005111689057451518521401216175319263947818787743509560003599577334399518674836615112723186476720359894
+4447676769726440097553180938842032872197723469668279942479093598413513198335476789357764400869873866217837103053672831807359964
+9438439139166494727711797686854076602382501450775000543946895474100528401256910882752544466058353451178988269998012104071279388
+6796506900519353467866660536525382267232333410870940350598284296015115345501330091034294987205096937204489666809908368374224287
+2156069024262468587697645236488193119228612123037868983120993219205723939445417381491095019098927648926035392978843470867760614
+7821524721406495642677263766762922840188657758664683038649201210659149304382137313140079079190066786903508941027377579459577045
+2846438208088991099137843881611431007996513901288343001595074297103385844197112994321057890476648269334831505632974358825733750
+1231729513446989718094794150861322831069880594276720936717092445853573977523050237490193119260788535329095088882720971495287598
+6552792304258966749461747651069123750999083956204720301600561922121624443601785058830034234673249878353748610370038504030736047
+4350618220429461920496227812205841572163867546971596032105207072905191109123570652010474485250661135080242831754570708916683989
+3648963905128198988374985403745574043149005801382728738825016196793544318399117519577715497903566248991289200713376389062963733
+9079224255192675318799042558252967439629275533715026478752109034505102371733784051667760885774671501306079109448761994271014212
+1512159183483513720286072997122368280567403105173759926916954869853277451339001028186617037332009159449259382498277868408842981
+5560323178755830694146107056035341050323807669577457330458808700666012312546070466530820114714620579338594279601664840585122075
+1503852393417110615057020185323349829356846940778480270527833679702648854699330937650632301666517518142397830288536621388668145
+3710500442232649775196536006291799614616427004022039024161898799546077671371127704078583325133930080437162856065176543455363091
+9667028302235222877392627005222715604718844825560371250888081705125248380997161235203510947690674677658525524540413177350345055
+1651124581699981562124791312861972388295643691956825406823017359302629847041679857625842731954319702741028762561310737659882575
+7234973146912955319568057648697281752581304980681832088301794847222733894976160526360976917273669474157112988773823160903919773
+7236452528456462658486826400719408745377253190375111579049732814880300278553197889206203166333133501206064778109147665779882391
+7682375338032730875672864027350071637472437979382544031201751667224513438710165103834022186623616196654886225240056588996350179
+0853897451837131243025169955161135908558413022976148659863288496875873894764829106676107357256982339087954980489000376844916919
+8360603574420141848805577433559168689130304284043047944444385048148193572183817853604188280975779635124804366554607129505815592
+5620546941760373757081442569363535705009166704002199788324439031196454334794954999272772623824166956059123197810751221134756232
+8439866566091270892187388961159863817415914847036125600694319372852752155914048990490541073567566380258061226260248539927574844
+3029318850407273236073024405659942071591211229297986931569472429177060698779317028894343293006454758184946754805713329630249820
+2687678405796666588388227397973494711846620655765600330508932225839545844068520955016865194693435829894249625192750034081363961
+0826642719445444861688478619229100303043863369218122546764063288271554588608667295145429271395132923307142550915748046259216532
+0468573883399305338589054269280928735368128284996899601120318736730996079626128417354949909634397399033464297120851931573621836
+3410567460401768661525344506338831729399382001213762232285178082217011433200810491330007874531405259479829710109345021089321397
+4652171379208756546308171186440327278368902304830062446989533198226580273246735128676055302820200408293662986737676930578153746
+2150739333645551554065559172680067798805779396460259578671413082802669062176930977818789038399646027209326563780688854879437364
+5947149323195596075203471654735880096964253215673415065855952449622950653788545812330777657299303345667765138612882163698466977
+2308935140239438613941108953213493640813697893782475635075053824082277617694735156671731366529539638010664196515846143425205110
+8579861845970706058547725114635120976593327222009873742050798971923964666256857891243866172081317410728590091574945331275284201
+6824605749924142731964725200957618055202505975317938345133949930752079669713432776367891693447902213677009365812998801001720273
+9233059182009261025428591058709759978362385968915457411652886788541048883340218037203772730667179361924214082717915090369829831
+2313518106392278036401430877932921941234750269539064717318812526416633477902124303231275087598527988161235948020286385526463743
+3838476810771838510370563675061364260967203242139687527568417240328961372800287193798489828795160993501686735937478711295496291
+1519858055532723186083206022574209495517859134830555261865370844903580200999194798031588523243896559267197627522165919682799739
+9373974604821907639636032716761671130085088834596447375314712571767917652624045445822422980937123575808022402072804691330745798
+1179538903767384713618264919378659303577920743409425206952169277638505227558099310711226481165660388253070855325241107221381882
+1789290788643749161623308260296145948321831584631161915478987224126348775962249568727630631570400533850489485693171250304745466
+6433974998050768158826396562741859990471614366251286876757878787725794466582791436968613297526831824776182286993388108679611273
+6110623308937612049537824555231489221014173246666865428966654501963681680683054782880195354576356714786682961340119163196471017
+7065396261977852039518801715732959486507529242741135438482938793950709913003256496248997903954928882444470989824659787821204683
+9252764834270969572461432198412629509667322770306467304657216423067070489844755342237360066917220335677138645076622463524222641
+2863822477918798068216749348395676325852006154849615936810666235080045937062299799315963185719888255745874252084645488043646414
+7004033498629565919058730350299817723186869899372617107591275993421694639356397475575742082851089041949288607800654160534708316
+4190299271083535674187523239133194914262331993315335908926599556351517813335151871562105201268635100775530492262605262924734429
+9412474523205479108160235037378746252342301320435142535429384588026050874475919119800213524490595720796240406073642925771858154
+2913084106745765525951041794109785827673640207212541754087108553407118981892598453634040675583256537303820724542193091642590800
+6534476025728340988278166932729090239881218889572681282009000341783806869952125287383734393447529192404697677486779298438469322
+2829214412991708861478313576349293840205174852775802339069812401323737815710652651384534932732051408295532745074816386764349267
+7099631393624915897100017625766879968866232677413779562258136847735611193368355358377164844416154018729080207420593111993431521
+9679117084184583456113996444214687961259734088670459741393316532022602071869803421115792325270648228861169427886111180946003583
+9793622141632553469977231970499144123659775068372909299552862631976151882730222347477076919808461706462627308819362671717147651
+8286017842303147776294340423265613507963077365773181170674484922475010476392279295555883161702991597407378465228254838715678283
+7139981166981912432328248939664037584747665029041762831645786266577343138070260044935844528507385472563673503510303215480074901
+6952789894317576895242795097137355300336216988450939924501915977563360873810170551299455217264567889345472118057178061331257728
+1694193485067381935776175208128377412895577843695434073687471815717642677045054952476930977756497488385115713913555764776948263
+2231234433522295956531798985522781927112508008839457523109337600193193052076325806292222155384767900607744680674492935529295805
+7875818939048046279625548208487559794494231792862975497567734812838016356460114239167085114060525364762528245992233228644094327
+5021327908105698731349894818836329218148701613108177279681910593746940136925470307141167410364253643713010143547929247739518061
+9070977175221547245640857484222877237472955055880739878012461158071643167060432840330043982130511367475881160956788509827952621
+3413847694252380420294340031416724229995257917239755969134460592475590887547733435481300484633477930736275363875263891668995643
+6581430213176248276716948697514387283511867935196454364984608140452221982505162813367283133818168866214263555481101556955727420
+0078360325719735185976311476426092189177189796469613813653608015870137963763116020948507804890688620493269983909621885486957143
+5618073667256477516793467657312199638612399475873899685969826531992817695372605952175192740133201709617218497592077143464993595
+9686528263740598514413702973825670801929614448327903726180967797157579946183718568106283503561970266617924646393019216381949796
+7239480687825534075396618625255444191589146664116441837547061247242846107878949219756732241373337771333630723471570758001480280
+2126415066562760335451168640052256439621013367706107505889219639609857343988288214828754545448713238798703235273922756046005812
+0281498418252644767093639973704165385252675952065796869316299823450944375075913221341612192647317518382010547568017829174497579
+1057968057525848488438423398887379257534282986505898261044295544509349907137424691109525427205047296410961152317113953498675027
+8037990675600906293845109738467043233236225877257801109348395466430705164075214123065322814006154190811607337254708305938085250
+7210750787555252394437778367913891376849871377061775971887348544361550409572803722815881181222850658661431069707417398802536368
+3948215469610248733031315237243553696794016591253408216711885250561262516305255457076505242344244633141474145222490778655694723
+6617637025342831507631846476937783337058482960397621355078541340935495458638237325584632545957068938913331687735591931648307374
+8523372206558862816505119548118888594916440410353297374883874035661877591624592793870237386066600870369847319996357899821848884
+2706665246531670922861049993051412169291896643639078882262700663889473964251112689202969447822598990637782956377227324903867608
+4848299459820567898610921948177867341511272056149848749209193175952272681698383112955078617288403697439760095671946801857673079
+1356542472568516852079785586485413072353853487441642185000260635680413178133480855130718255056119475830508178140915142512386038
+6695877448601376560251771173382757011161242171039619918232438391997384640483554361477105518555170292200647684746099630559477876
+3728050473071484393708670159181207753885192509059591605951929761162380613874243004953769191772521075466929499282741107419333117
+7606734018487546777450475520310398974869459655169606480072758933265326533542081878074199816338268783853568241202511239916973258
+1633835831994903654810299535109070687398984404650301845605445387393310102422388713024846802629758902868815270339924811537344859
+8928571046801342106880818013492293682607259787490363620233716285093685649713330924728743681650501355104561967670012038426873625
+9125730098479474089046067867529096250921613432172766348896492595710398358975815806788579245423344223729093128465048555061302778
+3282236766431701005576011421891586267683372954054171332350103840612998244535378427127331925639537865313201470923709392166490250
+0060953065190643840375181038485605085116833098863859869877736596835368776079089936760138916464834786551291455693169964704950417
+7199761056487159527818318808980388404160177710661891595418127883387542011797165555082211982772990941128288012248134317959535274
+3151702008500412396300814816932022272142827209737059555958537947102106965289850740478085447869942031637107833939492398930644696
+5466978918720768258413199259613003866496795654264247159666752558539556973496507886748391341566752558990139978324598436936793928
+7875629494705039695595741518975797423129800053333398650746169290789301147238968164288511049704954808998463415048261417058627843
+3675014761845381637345570687526385375856012330298649384510964329070850231207976330807099687112778366295062201878036276787748707
+4186642715813159153197640948334883431130155154184492235081536887094317988019087470651733545171824399201735161775652002448517265
+4661100517204949080442753518341612732523752379970048081237708561434446413436675964518402865361477156495973338379138615279891674
+3104047228288563492721376497746751756302186258285396146017997376211045579689813619459200950120798719227167890408329425880640799
+8361120737152440781721610389840480574105404073477545436637229579684528270718993412816918987324414005130598864358095704485655816
+2635022304411690520549036888248912012839104866750669849182202670549996591599148236127250813538958602763034624939004690945598644
+7161693686069093177957527866565203934639363610988615731752113714098234889877144865056494208717095238090181742851725619039913679
+7926731919437873880030756176008264549114452715998481120029937345677673326677605995613852123446385084312717926880869469763207023
+2138495852046091769881664603146562927499752742224823433380060312750362684368906102817542844818392822621059272739767561472497448
+3487585927757204836571198808541456058695288628326581580540815649602826692062251298954681717253220499784757374087955966951533070
+4467286406109149470022526422047665420981641926169730080064026643952810388751979407214952628713107539097869076094466606508205808
+0329251645328585224993793572099403208481085245076448698022757086335438075955415420248533451214205820043135499362946801092902796
+0976117055234786919615481110380099853162437989837673156044051970682580784609511428623279845514623277521398030431160849037450740
+8697358783561542570626868871304762629606530282055602229180460161462702998318108546783149370269213126706148977779508293460733304
+5685401232626893164468498498310349947377219975132662081047738432680920912627837266028376099158214591714411685177672935669560017
+1991014855525662209159171891334726717439346791115150429082237201563017187579488089876803702248258879215762021955798945536843228
+3358779497231258973228903279307787602968091467986183211284685640196892409994105852728310998830904989480714242762651865855421586
+5348281152141939663360571564939207399533427205490276937846050282692131755481373457167966144301656498283646918663467663563230116
+0442219576879355438661813222738756969322895770177941048443578213219939881424295242319200710244313116242014329915750902609753298
+6880215129386746871145799105266743824027120004725079746962555401718867449525806260178086747751584880447035314395435465651034570
+5590819486053989106201536213480377379276227468376756122798396628016810991489235173054754920663273388709967201645610835786499004
+9939124283008389379680409146709896607754411605235108861950292912142332714272148567105156028757875660670111321491114463297009230
+2097548826892083113543893580713808393001576983724545670281722041343097928800752617116438879952016563025042978404320211936405203
+6082731184886898638758782020161455765775544117220425974704422223842521161418889571069655363278462600259872240060382048674290190
+2889620681353481574769346958935531281292735580442822115141047535414968598234054161580569343948696497621906027825367798221210232
+0975609392326975398368477771498401808897612300017559800926232766502316691201583773217274029458304062931758320244725915302928993
+2656060793106179140097207671393073878144623719159743370358884637219392258120064605880204498430784571518779561821815030688040645
+5261532754299991261842655852754335348627643855237017342819255089240352732014055394202970458645445920979909498339363437891353307
+2437642062562451324051185886722830951326647012880268770841964036842838215823451274151497274115272960818748924818830295293023164
+6427726746699539771500247174272715628837777269348318525014112099038948379809971189523179740600410427829712055609005231760641337
+2123549160662241455227582001148252334968910254759170985955722387116765936697038502260200822286774138322324033501219326909463806
+0821193700130194457116090490985590394866182284594574006494500813138155877966705322490599457628280712279954157952750704655060385
+3280391474844631197279842080980749627555722515522776772617462578270115902754706089142103829738218939451926197117850790818482759
+1294311329582945102206118794968530880988413255047180804846373165792608079444603588122636074961065406623564621335429415769062656
+8977139076449153307860216027207885939587708357239425724499000050811065643249463642868728678159848609219920477201880783130814232
+6033248813331250043643381559597258568598550852601730339407737331740193572873459479638405202147132462334764720678461849283231967
+5244706826495860145056785602766589976181173320167438082817365766859974115630195914700440671364272919565408159761417527099133015
+5244648245024168084347025892989203801674105350823195087890804798433093162301085522657402786073312465657131861678950736152896502
+7020998265858326008838932594312667517103689364315007929663379806725932670838335332530002316590322181497959301133051038639381171
+3173858772156448895864459261457987925785493055610741437909826143835126197998316368571824712159171580331713288750535891179500215
+2461289349520625956975133669730507522155477555105599302736241191876700580974296813158063100071375109901417730679844357856593047
+7673877787687493268983420698315905381260558449663590054448103444553449366277579160597491777336624754840213430260072450113764481
+2114017564926717940676432504294232477129802350412122813350795229854770687737407776153546967564248142801354985562159014016660409
+7639567903574424627121988012936196690968952173335045547572877439937623104537739475753166073603089257419976655666993295754279243
+5512010810515840583007802011584440810442039388430026796415104195890917308156926213851922793907826473532250186114497099571038088
+1090443322487112398586196562777035714693242567109619766467418285811180453954969091778067062185341924208029182725946749209676264
+9663462321929487207790152045012463956298339314526151434668136673612071349597053270833334450801647517402244793354108502290993012
+7465047517200443480317342789716535487720038254767800382013521445375492608318405493546080410946096145404154482214436078102318897
+3241343339884810074493047134584332154632775327907375423171218727031001503885369275032870180181698599353279959939076928392091092
+3566208126745756363429701058439360596278930537654250601183842796400352091131220495755538686838579076983412474092980588063067246
+4135280622573899686743659033428766204732217042537180031329938266218979406566474637509065330050474399644477629470645922989131608
+7243489726801527985565622807882110752891684081535249425920277363697188485817835521822988850811873532635201983418016593214492469
+8143017528502801938786431108109170005870927726570176129291655180782741998755590156671788445329312481442984040900285747284336895
+5565100360014106030272353666080827357535103165363399802552515662750922553611500390854921288593734087100792149327574407938377815
+4240318921296779247997230590857031671134516419731819431863267883435154179769593315054293181367248263035923946261410558920492931
+3065344926131172598974832603770803242453631170305261893085619634353617662701712503317939637731383890741691116709803904180847998
+9640635307154881695674450558215122808610162087865073261126743708282066313632270460083280371892143332906784831299555537946109939
+0645039315913940793949968013785570770789031780794104310782057130859521600859343415595288573910289771410236190253921849657190998
+2817116940059523621717397073394274259776453515913607417038665482821641102656240840561075406926383495205691566077252073640483438
+6876828215210014803339974347992473188369840859181281062746399956666218336920552262054357048613213862945863515439475503711072752
+1206178405392180823761458212656703549891855527651389518191357531805984535259972031066177734136716154598488260571189715523538978
+4990265766954047391630449528696946350646833442858182431131915610086870866589089866607870181211091256487223226710174280311854030
+6161821498017905298626518871081902325899313379230902725132275803649959728622670760552023317532682229232464170889758455581169141
+2416184842590677978922625659052895162548385411298782741233394356631320019382233371212037232115448059660819419247622831630454503
+8975030577721689746153882576268854827896373568358085985637110827886139292888578025729952622899410488518168089967179203288999038
+0077221628423351964468120440528719933928163566191359047160562478933063353123985611799118577768774930246047770557959247998776831
+1721135782157358288734205102478591394569267133297228431858377971925993589071779657700502192679741782178657102555324869244446359
+7869917278483084269980405860197759252589350638010408763257025389708116328761797581159680452123249311643134587279719495772936617
+8130672462738712860454774853313086658312258840823449860002088944658955778609509469061098214154416089413962879973327200377762688
+8704019840879290058261002736123709853095591291334597972059260229183193853550672628813904508834589255323455601476677738648315934
+3234707347670711573887321944356094703845291499731243740116195333742959154260950396149564697796845304852992191344817095433298019
+4556001053283765367945967785584518418747873282740299536406596053579536242035383267115157980628785476579854884310834210027387315
+3952399660098012461635956108592408478331533765191761940733106633178973207757390760027945616808844645166556348572120907508405281
+9620717181599113391181876705169833156639227504083941308593882555592005786644351550764764616222603704206370090556397818828816448
+1082150428965180471148236660642979232846204673076692680655912004876027643170213363695294926023526278443457817518033465638673749
+5350172689969152071949149368789531895369178652578561324968877842847433493285130074155790255799028895045897756190837543509860775
+8482306198938020753154634340975595193686061652677880586337892305604321362120530299145893988789835870281018804163394448979511499
+7488870885383052769468046156937025798795341295237597526911841052145121608390932943180983640617731865473642038426653712735002335
+9011612227214170561522052833657180847394409367216727282193072678838450183604374539578667642858779645471672950276478435834423943
+0042627888400396166577808028511674909710254329416152368725303977021338640330576476481308582201268866056584880471857573435293178
+9268879578435020158729300163317051184609265956929202720052876516659404370185319984314639348524347471621091689443144604058655054
+5852357719309697687694316961668030847489545691322959818739069805501234210837740692288860145679956618287254425865421435945272722
+7947183003454715593442541393266684657719476151125892217474788448864376694397034056195614730803146207684810002655419508268188406
+0212392708824827732017576889397138488570370042723523923833128481673477500325568912519958461261978143669880070457987816169424188
+1965090700335288348865794109082688653306331467742286624350702924857750689705564771477934006408695884251431946386364556639034176
+6475202723487206164676214732339055881658522754087991356304799053722702797567004357975452415295767243300651018833595864642447417
+4933751846153559955643592816488612142322342560545913045826692544542626150928640726729092043333739064265750508139974673275834713
+2427576527067163076789990338481516933446902541780767233056948866977560689363984682741766823172377515643032993191346658956321461
+7240324801931427740710853207105854320415521035336023346171992089619399728628105888007254180361185035803733126321368733856723085
+1503702321045090573654976317248889826950138261936742489712456263150062608622387827772363799121813242734818379753299053724286228
+5076095412377646585652542244868299631686826272014334350505998081702990345584728215380800687580035780236658004071510394469994071
+9933250676927268802066614172669848689165401909644815070604643321993975291059605403370117318954869373816750869659405704139511279
+1490487519262534395623800813247168885091994099496258142463552140723866858712657283749576144012562970919330051773400199590563572
+8265606609996094143464919138293434901647769730550988047626306005465014764814728223656959001378552960458572921902571777313119856
+0301901698751025073371353819870024706444286250847057963018585025053110220589734085318599463450687736352183212884401020231957087
+4456959908526601850236631528599915374848039675582388183944917813443948321814362879113998039695208714072018715891598727749400184
+7983572039054110543265312946188122716587941443406593149730482849110607363599698686119685785597056173835119438876589991354302327
+0157777305454082280716591110467065838967277498987788761274920512893356487762316080383017175970582934458813655903151031833258038
+6820568297362586686149767416323236376371752928724979488399337093603770184434877480032885947231535650930077949030676059598788698
+8108972963805156390445400882624903314064494634772981427763122632358977184343156109534055951999238879890515883719506599847044143
+5178486334616508289086769240536520705517396788807705586482419714104331671474772634945045486037353039747544411584344166691513962
+8343543694892040940224135766807400138072678909751563547074645700842179499138145819361180694589974178543789544801347334713872045
+9708545131525935820756667264787954116125739691093797584888706242100925330533736446977764101332858478855148268301440155677807429
+8363906279880507853775707450188819239306527160717217937065519073363784713378967477694756526571005707114651691767780955073859818
+5651083308096512159550753176200623584419958971162109603579598590262428369134046173758247656339396228143231420340091898293104843
+4302402395996304257050404831355580727247848379655438560342120245630874884033522016540414633929586663157231554069390318916865498
+2822530065271711681487170629161962249557718383135273443686990757846857063424817696146359531243469019949939521304535035359286967
+4074330918579124906980668220696463605660380759667033381676449310911291881680221895239419422515427861193964219305035700436309668
+3698935243696912496491762756802269973014707849066246048122302860046406677238810686973357352423777172732249145383686882436002629
+2170964033471347644711273905006241361125626168342597916481066003694402986372839549149179850327741026797871619199281396638967050
+3740578777458341247832731137954141104761544067127564384269992513879476807275980026551471675919580563967451050762083496336212971
+7234069436162575416758566662736313504628826119312240011212647893254386199394411434394192850902621006968244175625150393585420756
+0819505443586556219267270131584242241933754418772049304646166400049758424842433111724173775260453475529050201556290830854251309
+8694504279853225298817987700209881068598742151871017058490633074185456825579641586256200310473031416146096103034054724162968499
+1678422417003132262043356103744836118876129032014712571839148276942048121918851516621273265839886300177612597618998212159348375
+2526979362189085413641977979132635792430656327264789820332281372901762624494315668746921549021511066663733746233883697857770994
+0998995661761657851385372991367035240872501467476816162857262794643509591735415040438155899974797001865973911239317650890930815
+0189734426599237495702149267240934080052773268635893422129378135841786547348314154856133018855495625125449892981908291205858083
+1077322089308800545276469380562276682750368988122928137210856581036772006900205486477908581832538965073059726766472615915649559
+7595664231420716081656297104542741477179939201745233207227457362234020070465865805626851389405073254933773440235630530654929440
+4561326689796974026193323140357607026602878702428514108628434286473624453127013395116455824218643518830181373377505009554553648
+5175104916514700448781338224183451234036582197678358641053766734457042147404203339056493172875783393464733980674769043154128903
+9625053130166787806916253108452498110678784874573415439254136465274322837153616892957540974054903367967131773174510386204520192
+4708907023698793329968287054491892003035884220479471761449794976142360667172403302792534515419470234070842851218805657152102504
+5165815294615880424810698811972894519218327570376404414484865603951627216319921021460205245622341179697179353800333764741713858
+3375832459808523959735342163302977206974789134934574309888193442489681770595931407566150654834927560855722717629843449379732533
+0696873250701946777504053721122628669489758761941472800177248115996803185013999823071443413470671100299081264402635064626229095
+8025269049201568533557667082941257090329107268081485134499591411578665111542402290969079825247733361568938034890137999482482426
+8413571137578802277713985161717245739847221863546744280234586017009016274669615970285654793200770322063367655004275873714400764
+0799707402410991916198286689965775278824664119744877317308731118045964149958722032731308079677323234905411311426216785693702443
+4397846375057495792019955808977919911307473873070308655227892822037825751568866737076516050806909779275729314309462325310751161
+5878515311252357335941687228452716020488777361851148660668041257248641752627888839374533734775241618706657533250097255962909759
+7924103963089477116974416014956752830485444377913838660792557425488769129517146048639663168698011387132583363962130759916380103
+8854627858331158799334753893263279859800213644437374816465531701511843970386899153300191498875238863924442400115037208900760391
+6931077305054934679510399257137017692212293765671016977117885559987800112104522229358688690556795828786584220491722127422607686
+1161689224772384204986305992766453244735906304538266466175104130240871760142886069723737054629941552777930420547825827115890782
+1184882323411827620265622192040661772065557335415769691870166844416649885380327832148533301202237904520864333379649271453239928
+2427936123038564183450762355240415926776086706660362490151633725587501086167861442974904906015877742003232322938651897499721504
+7575735828907721001810713381085000197583517056663976862531026160720187808215284714716227545242555746984605470134836970810868686
+7690274030579086519662066594780770842382679015250578750543674207604336237491570959207826549369435808803521562398005006071237827
+1591235570232351829740515082573934645171861807176059621044839781347865804129548447089911918892970375115928184446756254541226685
+2615960213766977626603096139489045595459731295282305420627566186367919926990597793979775395219871115824222384407322704217828184
+7269890378837649922156673232477845852726935996940584696490442582150880559450498906939124023442999694271016368614887466665480687
+2492299648986452580995323839604907135499552296977074591849011346778726414701224990442027943081442825619102646860492552917507521
+1791849743502515995886083914654782544108637930226038487802556564179211481768559160141129157276978288393204371047755590042629364
+2476979194376897909780308753936290021359131405027064825271771828980164040364357335094434041723555965477129434483174161190644661
+8416023154844136801169958073248822091441560069684654659045233353502161929981208692256561137140555110119558013208216615513472071
+8088260724856516409808086622373800856820389920242427841076949364650960501816473316120878023138924750918248626057879988336142195
+8686116426096280530843620941389111299655341997827197141570086674404151699053951971920289530070752071000490045958486626799786432
+6549357623845124371617655875408646869879278421775346320373177073222854384021377119568271293703313232299103659136776571632693838
+6591886804108118051730248844194375009874244915537509136047158661056246282742880964703031154340229700891206754898355101039366979
+7268446901106376070498745112524561027602391892725887518917435705098580461006376837385629028194839014124169131891549609455012171
+2285131899533028794555938374512548939747904214953588004250694538667660139983891321230034509152717542342156366790660293952707870
+7433656872059365457021513060668191880971221287545847083471271690608548455879533083319220177538857519457319889888751900959653068
+9242848205306926609548172769597825608518368367889673409305233019839916718283755877093610440755381268416027885226989117854626319
+8543014996495123544046729990961256012932771211075541381188839964005105738775284593953696325073738652709607173130510895811417458
+1100281056074250163495442070917233405800039282178047058927490789657980634481405379098411400723381012395226453993698124096414583
+1497707784106353163476884094382224594079935684207379351580860836917141337699813295106036949622008098195962892923132082743352822
+0227639803444432864090266134712772762851750164363159986164200332551145986599690734005702172852457747000704439537884708919681464
+3297805927942628853699179019515733067501114704121488080361171310117107236329567894778609250864163044875868270159183178936230020
+5632160100910553597455671868785895773407892040726468337688933116567628214043646404787040937392191211462332257825317687874338725
+2296104873433207092085115555734422123208784998029195153841807872132818719198275132977492788603520666575735728468601968901331765
+8507664661851267844375807200747151263758160914796423476220162799279781135476440706809418288627923653896822426541736985486808537
+8804577755163112469882477676592666556395113447285604375941404675578061757730014398552781158003833295830499727417346600077947853
+5831914326747916706642066586312780276779650520761789440673709492335505292573240738337240722730985752273930258542997960743098240
+0068020053146252182779250786628431011150801984991349353593228652822215156799328870412166924618702218796377703357100331644399678
+8109188902158713215146842638263856459757440491023323555585167449490157093903282451159411558188534514053282926080246371635200972
+1083689238510925211444565358062724034393858074119865447872227462830480815166007221130324188970568012551002420122076677588668537
+8348566408824119448641450955381151117598257925347235252204110951120532544649854733446808547885490496232547849386772180981787081
+4560676276145414580213909440734926632475864478909927595616312861612204269485671554044668485757818928586611911258131650112268582
+6442754729881254198230970045300311192828701003356370115227215491493010569367089158620723231028014912810350816540331381099940995
+2865041663295338237509904105995789610569727200605222728767332785967873952215814407401152907766797309671425581760149058652925760
+4017820912206849712695013871311183547029336150750415340954915312119753021914893470116876327839429907255892388374033828544982922
+6915440546354439943941953788638484102813214756761743923515532313884486004173505190595536349294404018810183152351908266279594331
+2928244470990795144278024903861617956853603900951440210459677120550845092043556188794480813102688176816346489991301120405759270
+1186435866287315352826686449165308561598819563912734578580650689933009781657638259105653726859937343022833693021987646952723005
+8712542566252718904406054272317438859093977264257379132707981296910101101713844533871886378161442772031073848272459192591830784
+1058110999534770164492882010801967465978671453250245066874219221865094533085057504007502380425647847612715483754244102708112443
+1742666667868535721098914454487184166505673192687612783065836658057498575235907333228055857705494275550823062941047285844371213
+4854496575428807093051119901176270909165842784911651361479733219811770760153017103816762799215219103460967340988812865617828044
+1917561105792307812885764646858740340976693913696981626941718101122829669609931847477816007131803415395929587982744622533841587
+9667546614449025826471505952967761841638682554759010436234535597997076544716136876213634826200883843816631177929989595634824997
+9075236896089146108414434690485647098336762127620316996183949539422311636347004018452729032082455756224021955521110115243171929
+7022352504520236787549133408418756692328586206498166126138700604093881377702931259764322041155662852059678496015745189492835117
+7091800587591451755394603236816915477651467511713772374848670866752841854518597403280700140135675063538245814642015579501650431
+3475133641567131461159293976535068676192194831897897611380261311134218099223461446586431446131415308645022873899564559364425282
+3789965382702942084656483383865958903699057640653956948168423022124988840895696969117651267238844593486453639829783832289036588
+1651772364049655351227109534629863148340655489696054950189023140607819232747963074764923819690470465024081626771998338862194589
+8535421442026745607190566634422441543153174467912420591988970152959270609189415618141521453452531554132027545470737271909694248
+4266576066028018898848004953928316732798903447774832407967130237423961865629656870579836679541833228863492849112635373253768730
+9318620813778397458907750295204099889575365028367626038475757355404525059311775107234951920852829456542067713455662881377001712
+9660563316063581065664074432670545816492979485719464785114250983280531864483884025594604925138921571079067953012249664289286107
+4733006686229685087965270923863015490601420365854224908680910247314401508516820945614321593880289181386292705522860502467700146
+9595467875394655716250868523623848001720836247002935008259127820208612390799061964695134992188932480652490964335096936081240148
+1812489955447149372964288932685703059456499125726325849419752698359991222537673326627718506868098338620828381688669635638529284
+2277365318750471576552640984213353147488350298228497735938404810800516562727031985237579073707417430708173600319624539956749453
+8558865515990107426689500711926656694092773040192992037548490908808858324669008603563963750417300374317505710614289622964156217
+2457409596680804630516887336784028949728779145781319560216200606134423822190318186800036885710141555957030479473061434184735920
+9100569805069607595713477651532945125488629510591455102444809609662844669593112401315706794492448332303051585825039449951564890
+2934068975480357331702373570405176114572488785747724819226534222897314789801301206100799457068445592290174980265109976510186964
+6974436264361115896790352170073260547419486352304459996628335808264941225228110927615548124284539746249063361590443246656233810
+2022987197590236256417410387584617910709314684989417286318087666015073752226802244527631727840148104686143554769788772100971964
+3931314203567669848668014170818609543271827823841957939988437792149776879965413983671414699512124596470803895106449229017252962
+1646897058572253319802460817369397398067528887800488520057974357980724071070615260303277654527720835652573050782049698374251316
+0612949136289175984348022991134845911118529208723293255584972808307452158666230105816460375784187988904522880654792018341929152
+6230320383294577758148209875436786980246088588555018398742402423700033755813061790265512976391765915810238317924960933176044915
+6724326703636717615730930803229989144709304487765743249773045992631205387565818549594275877262188712201760168274734486308418567
+9793449160017973876181891146468573134118620184336387033315592292444997748610681437980592831049932965491128002640896459624743912
+4292773888056347657265747923515456543197563688072118373801968694939175467616839381912904118459023550508906592936405878500629369
+0726575398511990054804247570050536297610421442312874646372000460857738421341575986454091454129764640046210072544927787587872609
+6223497359073574286258812426783136238045789247117981734256875260415121593723556039489844073919163685845325053278772517808357882
+4805353931456319684552807410713836603840908704132137938671395582768618313934438378980539779778185823334069713366782891327854771
+6127074671224214243978383308821083055917752075116334068237357481944923919216084154202678626979129283869929664457025576182992309
+9095642603811777857467738034071749226163187428061948529437320054852470403172207781014210493833697169288095448800181203251014035
+4736481344099852996408105951657679269262847981157582390462101509329835494113215114942443801348682136828613264161536188227115466
+4003055863718708771225642500990071025833297545571403747979992978828908605722348616364122656556369792934466258936918430294297508
+0884716108700884651920742851823456839844922966806960079344733214332219603718719129110850475334654765668025057309956984350345154
+4885236271502923816983822161323233481126598003985902081480145736364185121032980985643061033399360057443356862260970037248156868
+9095109506937315402103438551736664529148909771957666146775454439817301965157339466426336556934667643823128218330998524081566484
+9554172468178139926024925040064147501158211448170728837042601105476806693933691272219558658718966118313273471191896511638062325
+9954369358233682690458005171274421730241048095790588467590844502525588085948164312745806267036443692262270244497152879755376313
+8540761990884030057918282213961331175575293790886064372121411245265558611444044299259702033859938015653338871057063134186390567
+2937295853774855369815055903708691070046531641376115545763368983982874877046797588826386810643172084809422213611867667864377575
+7456129086242673800167308357557286842740029636829456648911252509981444991813390655015368895052836323823418477931875989888413494
+7619903401290202996353920197163165845104216512134977822317453208086977782938058360962563863616931222677006031494617743246676098
+8619837607929254793532399964916863199570819754247459608169557658376643077622610923724449371091028101105519894212018425361113161
+0198232737234871539712619394554173033293046636313472444724663228704935678432306609229598127499957898688691002287353410535746129
+9160344825935915883479808009630827527538308033068458669327511758149831271072074138691690968888119139014429832927001663077896093
+6075520157463461341098226057137016444093714810741234441217965271334334440753561468859945005901907007749818800609799068435785758
+0546092246435123497159753904346692263278071121042508101131684892541656872975812647089730436015791483195690674123772749878087282
+6758449872382291050831212201949792798424861556134983601310627614120558124555112900385099751123167702480059628861813816928572678
+2294380967592455168636104873737766456888729486890507823276579714836828251933669783531511408873018452811541618386657467835047578
+9771964953738092240932562360117185595020635073758269035209960005817272212266420970453644822258523689081214708732161974226486482
+2078896042427351080221479050978223463317038184395717248909464597626365437809427793625231151897894098417132582150723722131356816
+2733651127665461066112679225653017158187022844835577848138599970119201959393371465576981148627618500453766449113619920556794832
+3098796406035170187586479893078215549068777188615428168013041309627717475700524281634638706348659216956344427373631234955931788
+8266607652077744997152631910857696622624195835857414262086680438204284388121731692389911117940177851680318293050972437430080491
+5263662912508589659968304863826115756592152285582835871560573052117732379831943224939230850768149596127803763098910581308889239
+1399259544384714811458348148272122374447108528351486026748375991519038080289258112233626298579932128994892803010854830711867003
+0120562601270662181088525907457246972630366755109340652778459673777734310903812432648671068725042051752322546900077059823883777
+1071975377081858251465844724729282629412278512504579575631776161691808267150394386844729953211628319505799528227342615586982667
+5142190253907427483211782117002935160362621628506088192922092212154140185826659904555543974037176549370222198088358512119912742
+7709122677369521964052899819214134971313049580616225982506654419124826044743127724976092244678406630989264402052401911579629855
+5241083294500875288635504487164898666527862404520007162909767182104068330196614730977680503144106835763690135404371824827295654
+6210246422372066059297630639990103921525353988425004032130811899385175353438423745075299078297982811812894692845392714907314914
+6639687154171290857100923298064297354897427312066201467165805288117452112109293854180789331988821851079333157010919824197308857
+2725453575267288288994357675260613771455378866560128031996095809604727908410382843600101001039972876558637948184365207490031492
+3022829447684501701771651529957077694566855215179433255048106574130176149607854191690519660804326926806696105896923466573489014
+2276500150756721393101309310240889850130747890241895231090329328679796493201088708899083812272168509412763541079565359287160502
+0441480433094880222135017379174984153891031352882663477623197838966247123264644246447696041370087767283894667315757217159981846
+6600209627389381111032923919248323966625789375205223637463959729585017236548352912218466643214096190786355523902607233701011308
+0879209770503108176937425508560832114089876275039410069927508813642206128497418765988069857902212785710790868994707145334746457
+1573213691519886100372421851125709104684878670999887084420803400476797705625591520633797149282934213606570900108998582064311163
+8676807063736715112005822408555267407647050728641117839753641320386536310057649950460984214505375532528456592558681408856748600
+0458633214841398749014431880145127111888700604235741500367092065118505389545560189317863466505700948103428117858933891140917600
+5132202176401630576193346962510769965520088034746560321030328807272795203005246723655044384670879356197070618995577734499503916
+6506939563329550580672846170456665825955418030610189100857896112174782009029170826779986506077333681379230762539236049071683000
+6370393487113254502942284063528147627172601717639450424195980075047464787096908959060881173708540962987133431304917906118868338
+9267746888420071021500735075663336736361717345091433424161991124952838871022030399503645263408791327784786086730026429717318657
+1672147391408891002327479016767689503494648768717682253138108661180075426978036916352251329255918145397491166698770599594009604
+1973656522713866421729264353952482643307862403936073686775977710379738331755646451684387173747099995521827339722863619385237499
+5408235756969453434913224193378329404979503566466468217232986076880098924660185616188785089771941834979789440134998311199906069
+2232778818840350786605080110308895419763433233707234872571290509162878857914634432096414764357358087088039057924071148091731175
+6015400792410124384152213047000568844879712268022351230585299428537516602169557527154990684330404034064121063393300034030430905
+2306055374539312465651241264233074065955242079361211680462145344554747450796349210759636113482252702608031612245403353997125476
+3803253691034432130798363413192595243576410393487613462409388440991106589264853952016023685661448176427389232941666704057678369
+8628747721532797463638681268551173019525973277356279608142072485533442125834239673920151827309537064739870526314899247429664781
+9025827660968538606553886333865132013576294269585884802265251611104643759277860774328243246331432389944537967831541391858902940
+1930816587488360252688732499160213070813273038333861895643529140656993608246150830322861238139209540926180077253222099793719072
+8959519042048720068153629627140256241685908963439182993973204720950662335620899080859042503691987552467007737450276337233761755
+6288965328635383011799009079228464765004787324704548708119617161002013632986577780042057914052383556753286042031709306907755664
+9921350932285357024268612614215975988614776231803905241441720250462994526451363159473639866331342141233807338499617054943944238
+0578049360816576019800945237402222592171684814088734743903979539564400529178521960883785173251341874550331866956766247772470369
+6083904254700701911630159329372053705191987684688500636724033475465777760911461588784110437867357713431148790643538763108521995
+0296263770538400456769346062348737783795801732870097577376952964730500440617573963135158364912865598645263299913463769215039071
+9483488255991073328145731534454837990839423394416473517085030613349147333787972449423197209621559003595529788900553100012406747
+6566884594766054381929553636693829055015384572992260492476307544253448277903698366356427152189807274375674035466963843196695551
+6323074679661834194813723642658721376145252523971723277400835325217197190050897668239821693181091121061162219401288326146881306
+1808318984353930429816050257400279035517547964016766257303295002919848213345027516727642354899576468006486504355233740324100211
+0373421583654094261005790222006220690243740321608605292144463259644370384862300052723119124037021639917903672109294422220446746
+0968367458627898019517765631253210766036998155063276402536135475040822567588712196840514962484791203840216962030611173316284918
+6730753402413401318179055308056338575836289967262947906669540139949663260817034924092055901733213326920487904492973772740252118
+6813399504142772729322264698007839309738863435169195740088479397131114450638902610593694986422730992468798340242051077542153965
+9094257292692469011371694239749935666279240094911204646416349941755315640280190692332906803301138668428433338486284139761451437
+4927696735702519573953727266824755919361553550569177388087634691983381789617481807188380885676894329271297374663349552211867549
+6214976348118306656535007501010457882239285954427884872811741042673638154912694956412208130004776408704809831151781445974935728
+0120629582751291565009219505554682954747176012178127728953108970378564330824283571745236870527703343674549433801104649142185888
+3235814158776446629647585300745371840827518705724793256416163401064594247074494980560274282618040988687418212805930332830675213
+9481691238337366800610093527436128723725108303743340453678113695806808341554588638276662497395500403037304969340369996972707032
+4082676737625354210464419813293767706297361241754982481007296169725698649583516782177058747437891980516222464440989464874961596
+6461961406394849542189779035893533584829634128015156718397540384299215958366542622049511074988966488475073248255117221338638960
+0142933164629079463406544918744481398396204306933357431841214352733485790844296470933212820449310522157583393441447538375216436
+3436698506912676403242337919492000906428711269510381173399936468041047249569064777837314598565623718618433285256806067639636763
+8460415932660725184337524946121929924205499042071794021186039050613143778222559008526610557979170270365704047948250328090311884
+8815703597819948360630939744751577068004694199231149936335126538352407733636909351409964233765563167198074923729461436493523959
+0713926842635856417640343723268323797389202591360887205782568996458244122502082280450763638212538223700620622044815212320168684
+9492871418408066338755969200124883796242190267635257673723366249954282292979482645457308347074754036142876356477739278675875440
+2183538168589813954235091042917215997797441009968993171615399263341109892414323128649997905799043937988646881424204624530006049
+7733957096488341212048475007904035717627062565794383079540365496869348281433928986222996400495215587152772750589584231009322321
+6967167721546910451512704467642578730007590171739084668065616508498732163764275594573615283985791091469103384452900988352107000
+6807413612465354023458660940481659053886101973060578770973513038430471528121342377174140575232152423951725002933862875035962993
+5491625968951170241792359320698419197951622254963187269169519754789130928703155856710378168285319433421425146672702276206900357
+6582314544521282948303668171056488977803778991914594073284490075274341682398796202525053587573368003492350674264590216915743030
+0229180917308822559423399370500197589688253700875858499871606888817412759424516191276640847554118760685723541416666202243509736
+9274208984682823732942979222927492539292245964003720945726994325795924579380001664666341956208236538074900737136200088724900215
+5814292572624892701632682972030886871485930705868231267185916589385811869703139406294452824977282139608709779376891002163708313
+4033763100173660376690182575379995726083861081926510802579785312647154456013703372795547129639766049095465742696104516613357933
+2568315805640894925038031436747677782703800879694535494046794349191040639680313707242709239136167699797774023104845097743799234
+6763080953224487156488442945555613963349180931811315907436001825754710792409694328952798340996992622252003347436512459358128857
+3954533989335010638156841066648473526011867397359480295694595402042037502438174479721797977373598413288286342098814213128179837
+2396433612158432510452891115965816912823381888049756989510546093247222344511226918341455435352327199403241839439420506108676964
+0795850610161143815844607948060775881656537958435083754755508315612517655376939244238451149176008256028242905067513932423707050
+3517402986146524008574508829340726577308717530546869694363472906429850377209335971237767032862995433224020904386089476753728648
+7922151222682324169544546785791039508552110735905147311483313421452486749631056709157326288104257728264776617306059521303067262
+9433265821676424821718658733270406951796862690935463256100330389699577509374904038151899940074906081844482171701461900939078601
+6186077218855804555456232441080881439587655776678203701080218698681846807414980313213113823373021577317623820418853903404980853
+2057729858963790488672801591735476430626710017313638370400064539747700089967564851982820372204387613607305955240060602392589527
+0383881550897793438940267029950019121382581949345028853214775595378737481122241954444306274659828618843592228475107234699152687
+5284798962706326315885441962112759776606317588723708150855167126722288961236786090248841992912344949773249220873179712041971922
+9678187960541674562218790198419395947752158216709587927827286969325482868753908887434457039802709422399284864987575179916747347
+5327838914777072714692085263368643404584146218804037383216974773265161119155906542869845216416813947477024304569196702936579095
+6268003933265575972147374394617649572960257762413423428779104569461013465964897200866208582709538990234194911357542427621601938
+8074876525846270711334089333528645517621667077382560706349198812216415510664481057225472908752257947691952856523071940619013694
+8017368030459649790293701927587307177007662644838805113977690349437913275410750363651007980050566471766249753077608880102272532
+1982797159364965178888531580373430260986522031868350608333752657707407931000254944024943348168140524874484514493735113742249981
+6288538584949755098193652659249807271937205648283720864311553381239244146100739200355642491916783137202534161705603274089556521
+9354739749045138253043275273268328367815186805183694069007675806235940663397422177024952828447038786641822001541524569479714913
+7698528117160783953905420058390896481011235446749390616223922774275291430828661119528466868454607218473820114505896776059375354
+1619019266174818706077047840193129831420498197596777970098691437675408999864116292704117680089265101055969410774137278714249866
+3704870678985840970113166302795462489950063082099943547515245655672648446079824717316402600594084559028770660910436751665528235
+4429408197253611572221699160867353954702111945889329273311821911416970564822252007768702453855504730931208682912670990901446785
+5056501125351085290367349611566587022633517744283896529455313187439470673480194626772000636195743336806541403680260332379718964
+4062991551971333412504544251310884322830607074386974123640580284992839293238984564989258127209764459890435786526862148574118080
+2625522665812777011614768650094518338934467618573508691312860257788451631146950375887371627144471854275002143114396671788841878
+2226696461215179698643658067033045890658991544538880319431666117259518073995053382607108900045909290904771038098705696699068324
+6726532088338857549906950143621062126429461929145317128221035122460444306074528944822699784500814789341052158726046904507897034
+6793037164285887325166583356411787362893236497739544799385622176244058491240539097656877256235845151279052346581850041111149908
+4093573044381701004333825958081420923185855648955716595548583153752167241574306747073123301312447687906770815027018933422227596
+6707271839374572454938209957923490292030537274459728356418336773458317286912917431092307541994164910938497543069009665010432516
+7241600538166073336929364870095691302789706058064621204209320909673557421090888354529446748882788614331747011940455844576764284
+7137143302702161225320499515565654830535431434870632910006167776519433451398361978770695152191140156154509207190258738746324525
+7177837461622149136708945368215880972643302158259696018853584758017706472295497707280871705217770629770641478542481671610250773
+5554013978114456033660343221358867604345109625580200393288313536168463029481940254044728394046188030569648323861618169629477000
+8748988786120543881188413407361779739580428614335192009085939766971185616502526635854198592751325209395171686208426924544564152
+6617729010736669611153048037379873649289970538055287963581277014784710903080627770559078145423490012308690390159447385760636617
+1396112919025930755072794022535421762089970913319020087082933809741223660404657644541118861471741622430838236195432385726159361
+7249197652757615950334012535738132798576509936889286629270864681020298782574659494783085110319815705595177485744225974776618676
+4858557343521566530159783491610288461205535017137620369901510860776505101408698469561089138749268742702921025433191359814405089
+1405508073047405874902803040100792069570430571449445778558936794822787960786336616853548170322337310425822658832018643837559079
+7255075818431908394615699437073631405701119134607024097267578921840611418622682373870814723883284591259922905738590072345115516
+4240694967339735201081972989105259182809574142617805837465112261091318429255228721568810181664317538777929819157212160575829023
+2748237669200464565992816533713130419647283186413179673011963172187269272224647869974262327569585442612854368077691269344188871
+1222760335817459965853292578856201576938118519312855304508610105281112231513426234814422228921425942855517206703964421120719762
+5224765636718330925202872259803187360837016560225525039097597027027310508724003400835919326880989701929146674585353105826375662
+4608686356759945389820261327877835956104857982859971343770150256738677287345081654437248462809898624047205228119203349515135144
+6762635128848980939500701402251709503914581106728361156687648893186497005364492516596632908393739083848785619442884628144162198
+9408219837678921746467927680318487696309519621970987584546154535257273988915610716263345779849862915767049642549659017655936977
+2878461866210176159858735856155729710212544372367962529421415383498942572742627275020994117127943578105501057737118382232121164
+6202970140395425040275648643808519609153095822076099220917958127812733404125781257612941188098229102786208245263355552763155862
+3412899983063072356219645639174430993848691176774827540248823520470123385464397586328853608924297363157128484769714643392030260
+7516335187749776239975100738544129195651952155894618035351972235899711941435830137791970183095848641340212385537760526454996975
+9326117473414458915105300842976184452176417489508025383214692364884363250764059076859137855740438113389750789393201920849913143
+8213713819060950631004232834986002902474872793703875917119551478078092258435100422531909399249521481966638648761188280089875780
+4759150755939784604117474362263502288999681621525995527689733138120086197663894427404346527959682389904515329738583325486736756
+9325978425209872464237977527958499931962722888446298443732493719892549369851302316811008601401750818556435135705126450083049922
+6347121675883203194927076244218929133933870815129366063255106247006180593262999464959953693728515646161688550961478583928288648
+1770297585530292141472219789662846895032928913171250259285237148388628954759446094661658933173846573153793706711301693991850474
+0792606603197595851399011444059807607822829889531316870539398964731417122727677982590799094547174678976545309066723508642538395
+7542251187115005568283732133757451228935803355815247833157647444961116649664568241618566131440468159056245333148920222556848970
+1686590915600101341570938724862037843381611006851337958368672209742162426192678307570447318588843817286911928534762475716887889
+5985898442600265569905129276649109155018541224177922670883691334985077196371351903258301592600475229763499481236752268688794381
+9908334038229937596478744640386393429233365920050089472460888907538665294038594595567391991275514366380037563916695381509760722
+6697176988394487279550132960940875716670256744139528862226095599316038741474608986574869723524996958686407456560239747388319182
+5272345146409276991368562911742268892736319679968918454777104809692672080906197146972033144703725807051487037561295160467451538
+3361581138752178146561886363234614574825214993383047665369152075131490893168140965966229773832573946751662445845244243875117807
+8497747825333018837277204487016088859935993376161231128402571833027091271675038762646104326773996163504827534262519513030402352
+2850247104178367791237021165640248127529302018809122924281078393572312164207913339929888292707995450264033189457174311609184073
+8924909933371581642458243436549195910810805622486372258791244747556044533591204446068293714215938334798650520367000310196349472
+4508128384366452869820524778886955415968833938807781198993008689473057745756213279992800316467476453813822465284911857999907387
+2023953430847273884483235864052375615320236609720705596526699723117087569499174093607783752368506950667179330339328300764225536
+2114055767363508202672868934173997107264743852817603394956504753530153541861401139621693806395357957937922300502759889840467545
+0621018093521434841220357944235687355230152336239627344725027296978480489999738827553268628247847786834042126152054295485896741
+1728177905254640772617413047936979080771772313470023078251325162582234445493894126314939244900306139362255151328277418578396047
+1792422884816727055970087290849551106652457784152258102530082023142369893647618177451355631227247379577671860849853688299849551
+1175037347149672092098074310747361251964753674884333700769847744830036555394374700856740987145924794681060765600644641697283847
+9174589667717240975144336198616364140632445180996668524271118863864525314244946497799850056518633949293612226613509484575056441
+3024489420602308444377762407441001512681502589345978196662197798484057230208048085644756143263157845710447555275495197040972213
+5990095737215350840694710792788564049039561363466293476205766559255673678361573392948770517450420686662337759686497763541080151
+5536095650185550909008740808818202276021308469567387829730017248451381382214473271435330569988489076831395673641296020100168963
+8691489605876605176450990544960425812802030262532258796192840475047025803288315858498575542856190938582743335067317105863072855
+8766959566097551451268355313989562707945501704157509911384107284566676448181401117485715830603954518469086610851712800284373857
+2622452939630203014872224939693671859800249164641618680985148159351811785234412541320836473437263872332827932949209391274805175
+6798235720998149184680985250493187047397164050502295623889415695762080775856311836882958794525078302171514915009308220188324579
+7404140736104785086437030648484406734008243907361526117865122472043884228991384547907143497695706699559582484787176857952820522
+8804256451428134606481551907263647977538193140987930551038510575189609463453621867637464848455610801693723759700181203650436839
+2454914648531519297448584075603475998203868332048006750382533505496359960760723675619846780966293281981298326598027774066580197
+7995861529357273876737015678397822856184868318896981667361295506177063218216975663372922918478316465965515092121524544927046347
+7075516111646427841984461388320881450094372462158722036978724530408790912720869813138049436688811195541657354372228803333585071
+6429445107361977048898774220057765467210817429170612447918756002833100352538329968035564836996813252177717820091122268457886430
+7174078917945962391527335388096356842601813618444449251961003226992399982772853124625379285502923443657958530018722098893816397
+4966136548214340660067711135963960273659031432856630667889996071606345454141323196469871177597395097849304859547230071866679596
+3726141431238995322616590363658851982624885785492321657227849247981548495242247508727680411775990290110420891478204977360853532
+1644317907061571688813615690182418379232646792079005297020445585096706983621152261491067330546246215457831060764875633375743540
+0260037498619368766791619780583839981870124397870392302778118229013764892065306663721631976910781105530817819103416467777655922
+1257160865985307861172892171513923812618825522832093610372208245587343312911128848417617475098350804052464802003464019493811163
+3766028847159301257741274325560482246090419451830573366629957679849625493927009484554531296839025641820596875488169323390321224
+8232388226007759579919663974563407506786051531271638328419810743863932368666194478382016978871056258046863096095307264426924960
+4549834654287891305590680957281622094960361243150054432811463994295196664383435297694301203486327605844830810715344529812950660
+5753311902123482227347291010505867923405362170620911512612976729652957268599586765352146177919457594239032123428411979879139233
+1756522666058959488542110121660842887596621268641851969762507171503624064440144225359791257651455405971257235743672383114242117
+3669744927951794530124706132421697781115421405857509254735757547057701496218013526040546290811670945415111481766033696065077908
+3743986898663416455838782244658330408591406810811925113737418608085893951934341548820971030074613077943621026895167359064570606
+9471978412930979202834282673808363212715221979769900548835760002508328425519756934140019511728229374555172954389643589129389588
+9455543651731906114795743817911783078297338344457513508249293073101170733009370971042675747320086133963697038647918247059612888
+8987238012717473365026512535048463787033301244418231940438539856074603360903070483058902057658066015083363248256775852399567354
+3364502373064620236820638615612559600453180311037005397530277541350185917242503038852432559174885033399595723295543954546558084
+9899331087165498351833150053347482195081440704956752507876144131532942935103436324218551370249739155812929164520262875021494783
+6908904643032400627041773579937621950623563067061899745276566450404645141582156514162192031414915906603166745603027411059622640
+6495757281070400862553880509625330137059949973388167457480215447233006890221821337932185784669081820552176614865399261551583475
+5214987707999082292941559306056717820096495439266384956685554643672988468125971218644583921446293636673793845912080991022068721
+9098075542650837679681095355197850211686123726685262897042587789900344672369748441583193738857149324437982999889236683375639656
+3454737499177458611505297150687929879276146562076664745364918792408073476880967147036390541767431864129948395331642282070602239
+6878237499611110425456520778926623547629857959652095556385934261653929146175223058776396057712180642186976052559776640567287939
+9117825842497962507655739795549675536045986355442960959176637564697703951624943028930326642942379066897205661256857648338706258
+5607249824040048715831055763915681630425710558796489860046207669351392908027930067134903067626066854044057840603625024212216072
+6132093035960157469992103741008683953459144927130308314821395510817197195888871912314613073270790771658400690547770532514734857
+2289766523163076031024159344583085122839051296194651927355671209701571188590931542840886950235609126079848243347538568462648984
+5766639281060869652151900461538022230554309323803322083408453315192390160247383316259588161796028371801133887539960085255308323
+9483650441565836194775795637439945189737766569777908677905305601319160962603730861873961369931413625520373523170442339205096446
+6397277751314562067770288602692729550017088466152598972362685935373861021657565974015373030623318967239986491125515528075018887
+5402601339014610197678055292860126657475597634829577844878918241260173909075027791997352414032212153167271561905364752619385786
+8491863948995147633786778542070447298998068007279647829967199136460489001972567744945790789456373114064713748773853626265799228
+2370209092117301003097542080527068882722669167429990641325299940901538545419032212913930826834352316812337709858765794889107909
+1398631884718147949515763634548480975677014453715972288924837802795200463595978496786857308537512388719226166051585776739717368
+6941189534316796817726911487247546420252712714875639017653467949442416805399033991555627055669486555645886651826109264153186819
+4940516166674720818220542130511334825103331157208156275492549414655335399338455554953498955587141484886410449146234826660024826
+6659792948006838082450272697160209259339168888357685416533244048793279607628259013570705943914832132649302220555803191155769678
+3450607770354143996892622745433805449122734203977711922327068576407370897444833149206827486642681899060356549533970828759001934
+5727275520263633514968976110225542746359061074870472786303946464842833869445090010825025879958856002949152638295200941043841906
+1327175710840731608371208629917959139504834096615996636184118498113010168900528468440699292352911245996048410672241669829930509
+5804872329617982647538232786144744032881485213965459136524837612293635959247462464117508493059931748287964717902656930987863246
+4277723315738568098484054986328302182182023008609946701266751039890388797338292226205365731416488922689962862442504898912370823
+0169167783207015850910326779335592201489472916428336283983741331168324385837589731443211700684040249551018329769335204931232483
+5298537282274168905097783252545295159931996045324669229561719918373117774516092756810950028198012718738992851067743291059615923
+9444851345487696935698137109913963152214976022384665735269814043959675847649595558507091607437770303094115672250928216923641250
+2149472592686716079768844857346451000286201002122320769034758020998927559101579776094371380910427183625784710226757782544230415
+0647876642293735785152692483992423954470320088754545909378609961100700126777198798362991474951795873563734734785888619665299138
+5849838488444430649533263787538811331357728938722568950445006777515651519234515285808516388251516110101450462227962034131202241
+7276104739525907372419126181186384546119321638501786879645354354875497667502927550069197442007577146458961731206493061524033007
+9422217503140335187736221742892478886207544102369268483447607791356773560830807813772377547585429918129160635826252418480968692
+4951724274446263780114357613049442315030582695389596800003586264063614032462365896162651936067640252887621519671734335954108739
+7454566191860852039559843736923834077952568697550937244831873949705841445761551247253789687164216518186201016215799884228535871
+8439893371971012000885553951535059948361302183174942319645796198457357286423328894929588756597087846522596101434099524110623679
+2208231333330844864465745363677908966068876448934931718761801046807820975248234034617078513450119384012451530340905431793537946
+2305572597375584599916270867173159433891169944691281508143382202813205881528811308590035206333627177252785229699333403132814188
+6581817307307772248849032636830370028521484024024459152842727518740380359881146898101434552487760886134249651169919754088451088
+9972253499037895070298514770518285390402914258598519025675691003304065496834156654347189749182550625905099172508363395356804877
+5758008808025624632351941198979018660594929305107322792450818499652772086629264781844489198081813129733546688788720899531192457
+2745675328488913480621264293304705435951452309540398654081411328496424730516137398740590505211615977997709945823736263422098774
+4319217301030265407335508264753089155109074707762624338354639950177679811707826932551029618948153019495825747590381756914645981
+9125342547489286004121333337059776054538539726153714180036823804029952720452919240063140345998373975940156807239544138619226508
+7242675874264000704878339896544038336920890771642735504973073959953113142490324395737352393349120127057115852252907686376626747
+3473321596354209308933007945651010752129252885281924230373167976919072240297072208573755175225599946410500654362886750707794528
+5727589543974524706691693259117706864773673979587751324354353742658357813584415514973239116989629743388388478173856874552697761
+1142418605095869987288446285147568178401344806595851658792922110020211362874700057924021743582095514290749364426026381491938886
+7017216586801442390706943294273005287782115442259090512088524168970016375416554459606914186390125156135455842825317699271637907
+0211233315441242280840462166926685973850749956345775689925242698347596240183158491250150173733543845430700552741593194555804750
+1797724078344241125893042060239537330994558786922162379383591805537659608535521283089375039292199790021670953442916099772863332
+6130652679697033488878720295305832453720948952785209088953761883766005724826476556165454243473790630572440696210857988190704713
+4744821686581324503785124383460438165434233854467259677279955943920755162775872557500679297287992727542016808831027373389642811
+8818850180176632238377551894120301699425047464434209428644888921239546400810384063448594908229208386662084553428371435016786566
+2565402723149127183692936818466510584042955514361987237908845951130503356391102529543147109435545190864583265738886354448729716
+2555888389438655691918145095510314610669012618591908132566801282747594112804817710376968735883323783155393749243633468461076212
+4037970808854790499072817736929400553034907676890898900783090149602127450205466513482819048073679969106848951996174948205730701
+0816030875372524859030697931442206128673990318458281042368684773151576092499288971063578724086458233384930941299441451767263066
+1664521612180858396451529620088930659358500352782541669595817923485051339758066634536721977274523994998146473981701939017205602
+2524104027099484717563367769361246592695182470261402965977193164101572566284710942794698915634141627566609476347965721168530986
+4359025426573155220274777012266852482447049345363636421786714781355224872652596955092178684933842367455487342490049229104686636
+1405127824749409497462184480237538519293466992317964479311951604897323056429690265101169427550747026874617333157171121236924703
+6018076627013550295381656119236991061160617457180144979226462876301063552180250667955529552359828561142316939674528337208856344
+4374830018868998904944977293261195517662546966324518234611103690143089662138017933662034152841911712239931096922875112835748433
+0236447221655510600424621887641222992324877860049632049076965940501963553949996895966286320389211270787434721126820780971624253
+1124118658886218410732481795333541469161905682578320893049989427979158879370075562912903672274463984603712619157580009287344826
+1490073439715132975375184719480763004789606934374075237219980119217402660147346676094869754304392997432951402325274930204871342
+7507088153751893726167389642050254715794421419546083151335746591084804700733010001661585164038391983336305667211157845088930512
+9454605864819889656904342091511833717539963300409957365660591244004512939427858955522107791635547956216918186634105330346773979
+0658593516322846162016300446203238142166026181710436615937557978420890524597354295972144917810824199008158678995080211427722929
+8980589661160288330719076634082892363742482807739228207426629330991685667550752678607146578792931470069849286956087928508404855
+0981420843325337105199162550260043516249035154228170027681913983488364730292863723816365277728171439162179656110789246164875870
+7235989772218476249654125554327002628917857770756363184283174214585030441232386973067535578285982100385381595377232095167172355
+8531968481709055316167180990447601481938541581517577911736493317452245372585792259012856477270057051421673563226983021870172320
+3966519268023261060863087111821082801296148611252172465597370204173800451852480272015584093876590792853690848377385063421097933
+4667059194375637666825712724740535719642601441210189891690016272378550854485280624499553958549215837331920055819015130335235748
+5180652276625067336617174370015460185337302241346649852510792894228685353669611675801310899772318114006268028233834332313504023
+1941303813100529733477333374209673305915978659212933725574700988773740701325826021523545062039757705261878074707241548966802269
+2746067443336418197240323253838643666106109625323987238695096142699993722607024221029583744572542375113816178166737688431737737
+1790082381839115387609873262982695752275538347088304949304931589485737690198187441832377091589179048950816796427590616885843542
+5552689266955858826481326722121453449315123458065490624658389457610909531278210069460670951157478754958271396713130819467585412
+8161144774814776141255994752061769287038765060690866140571952344698969957192475271081186838639007943816699743960034503332953194
+8789192141356424274503562578603345033063547574284980009602843989229909463071658256259561315235167835094522110712803401150014304
+2269120125327746733199585385420581800688978135760399189023545691870920243025811096318243711254873352522759304218250492540601301
+3220660009367443347579325094663071621014417170436158246461857082697811419327408184450532404128001876815109034413458694764955526
+4236810019612678173215181621403086283786465950563987195979676317579127299901400746488219293603220797858502005948349760508971512
+0842456999754267165377711495312735495780613161991580964945616998690779002045181519007002606802172925174094502143404195978695837
+4416749583760585438101952975396064089728080431113199590836008764153005621794368480547875309689843049490843783015113705286745691
+0795274682904383996694242263473123412015847505963674606830368047427506205910859669522416907398900276339485220277009294111636658
+0726660439712285671104280059752886748116228091939311944983809111670167487220776456879193368274819545300958924106260054971842623
+8150764216086897115298219326429987785009191738597276238467913392040684511353140756968540557235239878544391001829270153861846092
+4383222134341106409110971398373626248863354871646454326385144812872101996077996725153807549596115873770116755372384144360289549
+8170673501302124114120744895395545744756695363267571023745570418014263093634951684729982428233593809293841917967048459961199699
+9763136038244743451806991825890314924556837135102471133555361059824564665398157293669951119702184740695499289874076409711970682
+1422421956968116348857989939957276677533229421063047970708284154758036180433546990214632661390471026182712000805513222171655488
+0790454789270387069048408785812014404576158995323548751958890039523932351478622587142638056133836919868045535455845844392024399
+6828229983228262659292226957969701095193296498963956591476120614340834793473477949399153199148731691820887892496627505449096093
+8624492093374718033878604413583151815223479591147786368391299257097621796393142945746725700896309907581595691253852161958930992
+7107729406703783687280485106218574382700030054257355689626925093581880354626104182184797971451190514868852721286584413091561305
+8741987234103316893377380144344514006198840745678799814654988835056150781397439910157073114301452768509065135515533734967678598
+2735043292667576626222020726140529203825880750760734206750175908534901067729659839678099054130592189468939769616706044680647240
+2763006819383647925527431911808115681683993973822624367816274873450252222984650251537326892288304742295886859351709349425297650
+7134753100395351301348083365117683812003850761712390745630056031799089854945233811860729771699517948808663082113548033370410055
+2156718353193091760663949540389192861228968135157606923907872289234299014121301709409557692508414639141148641363055713300497167
+9323046502608972228620000366263176485575290223984881067717695579312796433503231136630486297616245185739116228913473000321724069
+3402413948021099348085449161508115950805641814124236561124067595528674925736958070838477983849773356429271615279624883406948406
+2586362309829746055325863292755259087415528960697154410026073785183365372343620398551768197389974234910915413966255239135166137
+6948141006945340339297784658800718813009858499271702100629421441689482806248257882748211373263608811093415305500022007093455945
+0842258683716404942736428616895358695656655266518974938995151040768012671515151979466768515865903424648012383400333040320383895
+5049269512019956300105561497239010604854186206683961343893764070138734690927147819767835829400814779254514025647466904224213470
+9569948375696342652641662102284605174592869950745185014008552719701570802715911338264166097617707320465336842190177333964575034
+9428680684767284183633020532362541285325879314896297017757679938122092115670160403478099811406505218708402491047782860144041267
+2048668363875460097326211666406188941409324970507852534507916458181293600129195542233794471499710031501087442970014489278431811
+3405993437193068750979763065800204417948705854493241428660974718747020128492308645680153785966021095932035295060527677641892559
+2814589083509652662902787080397228682431174828014560598681492336798258054680671382857806718386021239491601389601875295478518945
+5986699496572944083337074930929834075993621216590713141225309670719782429561351058677320246208472110574056384475102009208825158
+3701143845992716374497567663523592738178836225177899343548036997338523733500001300643656167477000925420983129066143726434092701
+7423291379038754262185514882391794604313384501082737513845672893062736061561920457702887522180551612186897189287428790772663945
+8038882462960387008399150903931548842040303337569963977574310341965170156166264463639669524288945874943197641758694114087360524
+6755427287648373311476510042437767363082433235534497669444705172475485394287772438817148371693824101932257743465051113814804574
+3302584529244780057393036854445554623243089576362550605055694156880682183315829897197741778897975736012282052319045886108088033
+8087176493289867561968800923375092924482419715512093174473694625106772042668885277666098646361898523510402733964872800445131037
+8320007995921770348498605128869111626930267035943426816435809551556518111290098800524644244409358410267473862764842446130048523
+1436098828025610017328979458386153232076446194265248731690143382189291992244935737904603822794261840119592775301158595671929956
+1859896675014716704798696047818739852245706249557223427847334266658566082156593745460337399765187932861285602937611319183698837
+8695387218535720582564065835479455701900416698839376472323627804365945785468346621682197696163783828936362978547295808542269445
+8279752484506847142094417985544033613129823835703913986703044915444548737906032583690923865665220094573089105884291792454719678
+1316169725449877686068579181522410565098719766530274437681078973112896904796812316498589687674134438686508004774642199962324204
+4690063619499878869524791692206588255254568407388459022366711747832387099104508881401463078787110967721065394141648606132537550
+1451429470869671002057789223158518659342906175930490990163086609677315590447420960904216338864582531646704745882645257996753003
+3594769224483393076962577578336775804994360716705648101110515582304099946203974654110102114903083901640907564773113403226112614
+7842811390980512417623967516307862595714647209118659868698680060437058188686064362842966029195804418885454481156401460457680810
+1353730331240432284758809177395482784888827256712163440645440749728289433010840369051942073911490213001477219496896397735829211
+4601945158211709423733169616586120219445506544455684681994448828365740758425856347182450418912396580393258871768216932273389644
+7546606883962070377792485250777570864737360035965255716590780907370097846008363755114568550428189781279182714576817370377989913
+5909871699164748481388103916215854782263584875652627145927520783000462057342075067627629231607264735052014948668522278967261465
+7789853062938105623444363261994088544665616630390123445507860288440231593034911635167838522597643333127458708364830418263896184
+1286144438352596484065325500754944308173042437315362632781599996019422261591416810474894175619846059414717720198222378370653571
+6971462477582470633206125394932199429053380382783796898399516803651438673139498531736021776634684941580638746309619120992683170
+8629432822993724963855361987882118654589234693568266212440633573606219295689682039033133123609808063033145394447533709295411896
+0281594967652261579794466637274919984182923757681634332365968310833409307348568763974412665592870158544818035335013012421932763
+7655826860692715418764005666669293766929001138134358352328235302135813053504743107776878655717896623753934484760219931500298692
+9290168663678775972562133999711785783179036668870829240738642007250789936063529444287722257668245891843786516368999364205453698
+1388094089899362163718773572230079214466119375080348978705038480095898940916060131319234067470176587422484787467679366538347868
+8017293664803927630769729168954945146012294840940686008911896485848777037133106837925465110245874730110174759001141830380040038
+0120439722450454617928179479243857705288134086458602893871161972846537382451740227055242495699985657918659780373398590814158015
+9185549346791665800883510913273745072991047690371888044204398878541170797025220849684634548447569944177523688037116487344544844
+3983330147768673814424552255794031561316294164196820680509267685360230979960997521617397764375675161021883986966830273621436840
+5559819786199323213875219658620019627595340113429135282821726501703289978583492131096279542835050405087347140325687712807079487
+9787946090092230362250195573096660493646419587912974580035697132589473417918325240116393969464922906025196729087774385693764553
+9860355320714920060965670358032280168554148297437945180860387882403591842300282814921233640661490871801402207762626482522032047
+3097025361491117451005377278198487212237099544908247111077372764356886263791448989161160949762415522639831639294698581458345985
+7119461403366321455704765813404706513096376229662175435103856904757065360840168635845572631764671801632765978886309611217770123
+2355725108730791813146700353437818727398062989969964100944171032459233591148110740093249920429111285758187817891195538479372333
+7717147589069034365041184332554553609756818941590171329038369697464604453126540943732615622700321916184110353125350100127752260
+5400719243883713007355805618610788516934976237500923767706894033322172234355015854525038569883308926393709084041999484656996753
+1283666031444516796129629651038339271512674202354596553588525167158551065999313761923723647718179391480101442800341777895133996
+0753973775383179955400385390016380992296547654995782315767306424246762945687075752145691419815405005932537449947304486849576643
+2979180958396224767297581462043320034127704743702992357878029772922817116999851784773690688789215232089766369127969016032601856
+3851573261415488209314332793330099314068046066211719044146103127781354079770099732602779302176734228288014045681315375260376275
+5613084622744138175415292879907528314309988380989805830104342547726499059288400078772029464667932988421246953056079406071204771
+4586730576036740853854978952480253788859203002939257757392716256983049436420156853771221502897572109716517239674204969203181474
+0982119350191052441755943123327258611832950316806139591389360751863567226397368531779203766930988225110737707276225086269268083
+1166609927459152345242074308503846915870742513191815496448329154263550697382001973332037653901875197894977220232463712982961473
+8742250538546251559619529217497793362557849446641056066254726761640756859174902719692841027963345440941200289292587371677456563
+1787473730619074666648808301286212846168364513813858291223488226257956569272198811926719725754005926219281926579718279777830444
+9964885779070155802556863992597887379404305287991864566420006473195804170299129414259096081893003248613986369776375193541122827
+8679261717535638702784929128089835277682571491318590535314932208130153018789998592505582846756436233025096155853923159667457622
+0064101062279216730164192200983393569735835140706754353527254528463606619322108164129797836707319607352924077829068257856221565
+4098966914598730293864163204728437998349124344700052324246741119119244973881766239805489297351925527481613098094358252765642656
+3256631812453399632987567720287450907847236484423613740997675264597104916297183865029408528402827703543717537820987540612308827
+9763193844988062420108359297687488837148328286540087218373263127565810612066788312087172343604520200144217517124505185828378183
+0839169941798971803467138716750724876136916222233258526467257984594030393990037357389464526262272705365500201964650768865692587
+6552250604997641261294087071350242489522328429130222914193744223497369981001341679952214443941383946458063259049876349424028513
+2213974436158368636025109248174911312580051245505113315795959437260475388392500593400331863318219524296806654096778830779216940
+4878685599516319690797457606707664358483790224825508827231099632903629838432588023623129489722939201221165328880348763488094404
+4425772854689128756512183299147748549960529805463272504802739617344094375960651486501133996216955411590283887952698362709773340
+3400068591062085249345178361745959828363146278918068111168494145377017234716441154409189698261322125169944980545699464089750536
+8846865398199885991570109728269877331973845988335052515573008133676441111176443077214835337189028637762538757833593083011292020
+5146028640720658045073881058022137119722140728994381646856170548927402303281330627742305686994941764560406751703346767750713886
+7209258975092391507951817856714755923161856176501059139093203502102911025009832983122251947751287786516716014787221574638939756
+4031047248735708744857275535082996528246946792080390060989384866585501142477546435169883331570932498501313613151748523824910672
+5636536308963660510951867259797466984603129916969819578084787382312187680895777499152465628258228314680156051454804934741689251
+0512085879302345402847429395015269085320583560263939898103230391420972595529857458723736782481282792113866713373594735837816637
+7989131244460061235927200538684991689192443600011394251966967305334141431951393722271395226793607939272662478632186079903315157
+4105861225129127048237596511466748710669457275423951266966241892139141936555720690437418563605034436351637331842274069357984239
+7714780490538701008702866992517751463558344819912101444037343071198346617249265664311758101747127784897043351442589412949637554
+0794058900554049165331519254294841158439399536633260010261808293322453935679510287405960977887161196498223064393352481611148599
+1300801876528225731545729262391681879452425698425569733040068970789105907778300649408653356394071182530765139660697696280006682
+9500403460028711452841481826687628011337250118712797471026118134978473459279189369396543791538899643830373887355243212938105191
+0873118171200026341001915337132116843336126642682077009436271005094613931653248785836179383736770204896797782028704969977499350
+0015763840495758341501065058600781266869591393444306380925176998016954972799133300711081355008885083487358653288976991291458433
+1182038281534129680784410839850542254891681906855217404657576532842299794168911463577129652659153953666202320168343676218151354
+4489515205537483086890747806185147028159038841561163491305751443503026033718219551299657596422184541173585136713789948319572208
+5427049518844513938239013971033113865769356316346953363872557559769111015332419532829697997722648255367995610629118024243751562
+2407474388820183495631279695253839995841338363502759887550630065930650395810552864219034911688436057782562693639597408091177372
+6597246835826333390472023469934087393575305915386587464255626374910540525559513620612895257369286541372428722814356277369790926
+0540482329932732167361734686964636330198342028336626252732092257904785101659859937597352536082164206650257784256989122547150860
+6958569549047812907458129176134743095874743438183862052347741885494624143736509130890665487847350948675120079666371405006768737
+8780431675373547960195603385932928721012510177772630104840609721475744144915357267790854338213160647630650329373129575638594956
+9496521524390891252020171500116808958864975665633521384560269916937417268750283135245520953900937858745308291830904258244389317
+0015367958131832930196538448945414897381505579147872992058659675192664335486653438990141847260783598099119731774723267313420147
+7668586967951300028516829535113315808229408687973080784960696295388250987543953394689424360452251573606982659417899250410280988
+0855610169950498351316129660470090096789046559977941298373823170600445713232790694833343261118257499105417238723309775430866295
+2330553865870284141777533356762036585595078938692432368606760459748846645365953536258322870084801797022785593339163737467833147
+6997226216417469287126591633487052682393389785830401431520389186301156111690874765557617527284900760279233718743071166517225051
+9560345000426728260399841368953209835209100487337639538936954570820031680886090876109665021023200759147113373797389077298422122
+8175155068276335352679806117326566700814346009488428499581701401590558929437455938924635624938224553855781741120788865291783407
+2295536946679503673362429092591476438921243024065802176610048872694278802256805275897901963915809617356852239830206442834187860
+1980560976965565165140981488552352620248220002599581191144636050647934285203553865821505084561426414945738261567792216102403148
+1151908591260497769379834919810177114427370448525005415075150280396616811812913926897078347185577604045023394052213732465977204
+5152624009308747654657296667409633669797187558140762249677298229159695566185953786763883703575683368256625993695568514289670471
+5898396239237604417219674285036697981388707533386023577734556605753254850219222927862511398982564982295186931657039590148578018
+5932796785525089331274908323688642021701636412080489905006446995970747450915290182470813258134915840332610387871533886024451368
+8138194206803987511384906150527820013265474338857553899093509868964543274546783521373587071739152356855552276377502435950664343
+6671221923018976396144288089085545597962326938710922261699996323322275457923099268605292778087753199123847741515682942101433343
+0553836973054122354894964985734607674790792609106461042226839499946875666977767744836458472114784382708675816804952000351499560
+2364997010884637465860014885474868656892220025469289156670808481103243684995557245150848863996066555128792257705475749161690025
+4110649532154387762250909130921439734079690118528643911754202049214907597563788601359791270067268169269560624171237553348861595
+5940616224028249469894892261151683448506705471885912971357007128279832881479611563158245452847817654715394431167451576558923691
+2701950548115303007534807474569747157173002064876638265966317419898895957065042960548048125830083650783906003217529190210069108
+9448438509033254495362865744281724512323137198768884725254104680523096628653622761003126111128301647813853623032837646549389708
+8800961571279179907403520239170262557803310568213744508717356574441764473623277516011904000012404016704294869157929203333991614
+5621867976685621217499877201966531190154493625522363719922688125680349437187226891224242675375445798588375405091275415995993660
+6776602064451444697704536229609651834393352676778641614610712731028707328894803760218379598569050464723477953936124087430950917
+8609350069628812265374110081821823052163446196500492527833170210965201939797385205224718774402651526872691305286672629217382035
+8488697066441224751559631066164022076293716903983024132971083317225244640782734589625800094058649006568726351629980984900472989
+5845746441409288197669763941632849306888745439411555999404218596367981143977695990224865577494042079971012624349908586273448094
+3944731944003065116712174476397673714373918870846441482703374457072218866041336694655582361341131880499845103050687313792470342
+7857292237476195260600973001695477364449307421802939526518179464787823934178232688755800049682688090660718430541383983270572304
+0611341821464316878794523833266573224644012837504558841156871904475125652999503438286924058574554384509785291956022252381864357
+0405626679943651292212678664558286589975871490755359605369624889948784641951887207653741241486219388021477385980747033128784838
+0349563685997861866328510113314436119201124870929479544327167409917885140426561670911266619220856732660355093308773694213795936
+3842271417777258599324767675283259950186722960735488702869088413460362934496727774403713216022454808579752649987147082209915211
+7262086846799716572297263071380322488276591389406786696601706848938742607301811413241169596156442149745813064652698654676224030
+5774876540806221409456713575924968982273367206175097023050483195829231424480633395579433434537883182331511499750784779245974304
+6819745509357317439429415625378554567362388569070215909977624507836378437106698876357999443207523376055325643289588788312580731
+7833148656904363694334569121139758945904938915660261426660062808527488257575416983895078937523942074734502850315306918181450849
+0874641305830980547277712020017148651915548171250649493853510014278214375521776229277631115079740388430042785920214556466053488
+8302249778400205215684880334891997915871809162392886542987069548288428411471154533517912205528047987025944754683578880543791606
+0358320982227642668267885208147099122293592290139450664586369209811129197752858004803010616081626472750567559363814707696436535
+0313506752837594147209139665385131531998918025147449755897149885365821721038971422038604629058413601987368885444084132780675032
+8698373618661979252204221364880007737028947769589369624595251994724054095272484618585409406539000761630748495654887039290015310
+0800818173175869261167775704612174999230343952148568401102639665953327107535357309312915124706207238389207300777172747117401698
+0640073150863859675544943154734483059715378564796905159762945298307365280446171698542814284025032267504158534248530901828343035
+0873201504993233632733239057534034773053022444340692497950449652566396669145334447109018793398061041589027430348848568737315985
+0702523531880691374404054678759180464956226260133696133658291458560416403819468440250477647013266610552428012647058409477074911
+2679888054788444461424298005407130238905755507645631966764120317200939342102226493489457200513433158963725232826211305616759400
+6659241756332251314783750854468182797311328498121933543014291040088680657858265588241030117849346100683667795040402222839296842
+8277427249362157833641670896337597700968219737912856460330555628526942419632625557211562429343845027815601523792180592076379859
+9754404607631948362062894438912954500557072195072644550642458309860663622333701157823267362150209715197912528880882392701349340
+9392967484360182578733939528902161701930343748675665636284278981486199253820383071398887821347218338053979003089742707812914379
+2904235361284953393462862403685101898073830804299574939556200135991635904384199077467177409693740584708928799458835571980205648
+8121614185438088992376830836290018683875444583668400234525664787649173577729566744205001928280399848363250846307170382670891227
+1379156561645180509829419293369128655964653490776933715927876086576622995107120980971557236204092369803081979966524323872401105
+8210634652239640140303181717302977441319086010060056823202877048062527278336721358234059108992008083109338742139836036323492605
+7384031376893772770300054085703713950658765604751229388016547464754511995220292088356538057488534591958960218276518555883565725
+4074775956662864334941163174462487475635543748972688834049926463696503634025310758502751556398690346342648412837461668031647927
+6365750302288055740676475554487791055706610049861824646116595120976061102018119073494765991803213702717674747175954421813209939
+8009331937511328151001411154015547213063838109162601512214845406533014265983012161008264010599651427488015290161524354573353234
+6470978945561557225050621564665550894387519941185513668617316911095236397590508616848692919250154411755818493336504839734750031
+3525111855377922515708294426372763399105358667430235504503228627410198905334837234851992023849271193012460177555030458178964902
+2832205291216922852095126506355099210740893308816704635379794133382523761361826241501772732710458333973916837834880210080414250
+9084082447350749526849475397900892283815818083030975632291741303292925823304366055091504295072069505478412237935230243114270458
+8733240614953524515745727759843129756538792646920469274157284227528661937418719037781765126256474601006075476554791323844619684
+1035243868690685092085007530104395247063420667025726455865466535541087734271159372906562129287612463548495628710375386966180600
+5440542501876451157868698528285357586655663503645304099842630588650168915815059917415278238955617758631802903768822104984447821
+2018849475721498910886528030895133588236820109040257215930892013189827568406433756483461049360024443491773721292902184969255790
+8822875627013591731684908728396697952056849491038175568000507526035874582989907019189676297477355884544173196568562596540184740
+6207027832469439408465681825635058880584562540284002435337574271598044807397129809411607354965616450909115426381853724556891033
+7221658030059861817521753782741366902139395897501991336285575875528980544038829626149666345302799699624831576475243396464744984
+1649540253799052538081391692469181324705607910980425515252483873483980593877409055481936471747872491282539042199279780879543216
+4236145733824367590860331474571745015558798839670826761096891349398910243527132904379844441054007921880393265550231971508677926
+9325201276405157061556423958329163005949768823959483768715570931105074676418085399720398268434277889429566019457186074673651582
+1556755082109554008455021604947841187746491317217027281220528571996910808491743715098726471698066342041982149950618417860098084
+9612051527440619756444098523237719085720236857461176953239899550769256325996619384467815272576473677824512425753715748473823644
+3293706412332532029368150574309147409666660955800738909802362577371939197344269404239579009973609254902956047445459161013030585
+3889810572293351817285095560307955387570122899356894847953368306309169743185951491528192204482516204225431961214922057114411745
+2466537795850541088028557343809549480793529110899163252329393397207265339963882361084755962562912216879860134066671514387618346
+7860354854395803331508980945959835169783983572284248855654573657487835485311040917221652836888254950796354469715116733559514443
+9649687850645361629683896013084952406507914922578933911589068814423571506614639956792270631464418346423540206296752844238915237
+6020288012912630828121914201273847417936995938147436941121877369382021368921214557882494996867880498498027992143690818597132057
+7464732232055318247290946075477625177092427701352448918522702341636498386700884661390140882325113012278493389309349523351396213
+9696483275515491260944768055252019253491922403588385357522280969636691193420388846988546363998678336385777443993831313531774583
+6282522032399446565965739736752150396232120722412203505719106262036358824681398508892551567229346012725815333843066908465157756
+9407628149379572734413508114861082667244920525693627019900560538557779908157912341364139167913811711711544677292025506854245811
+3464634373606321375959043076084467134891991975403488809906777158185809859079955799214529934428440394715803296141747865907907489
+9423993889790762040142434803114305323935291193328498665927373291227929076575533913306444776443880643225751481031179680675214923
+3368470912062297700011980465345274304044785588310672874869214201316579834207228249128013243107286248089143869069547088156308777
+1414590222708121116814503748513196371955339806257298864789960510451079590735116383580469454857965360874314128844784304143454069
+8766678394720390254448078037404671513243310605018703312189431738938607517130277658972087080448195787216475306011123823302381254
+3391550184839202307004590614178501644771630600861096494601392733266531850599404613838770697571965897048614790913072319558856284
+7803230787138777594218452988887094396749088370117209351285801556001096168575241228759515079363186428923678980339871398190852582
+4019696628533985636279505759337532628472390302841917324608852947709111244515112700445738982371253756187679740389512024539739520
+4770847899134941839230668652175028834007538603739876886601634289336067458758592877494727624461743546957277223347887135182085175
+9704365765485920770156655545282270424007413902597806432869012806155483311798101235310454409760720811406614955012826140011450968
+0313480515097495573412839063893028999786645804567919951099814820194282264604422806064547777371073192487100289094441987847150568
+1657543112009039941765308947835121413396501421019711136903259340105124014460634621836811024214292779775980478293474663062122820
+9705767650372955367904858685510440746508331239334572782478185604370866609254504064506288513924921428844442806366648997093161941
+3489214963851233247024856358669087681654387218345765317192165484089902190489810844772030255183904855574220071570304690043795231
+2065091959221855386411960322245401320421129454685844655947550889456851989959823948526569728196088066488438899595441765150072821
+4429114819428348855107669954324003559235452502739679008927728613312163086830142833511895866448006257958165946765071157730382695
+9882679827690443780755577550740154748999710142655073573245474660654485200341800425388615819101330831466686148830980748666684090
+7163405135812565179670235235614927720441373285793867065291904861238349709700184831060873375476942470039510660809272264903320798
+4462917767939061046448018044214701368685457860623889616757211734619696932095108903120448131130054208365085745531785639497736359
+8218165839330532616994196742532527473553555966673141549749982047712150106818828620285541917373915693522694719282613944281399835
+8674485087809037160526520795860814268331241546826667372648249043039257847644579120849321232434718628926179993145231262359579173
+6402705380929919120941181769537062173912605142768108201761013755197467816367902585985810911153925853453654100594647121313245913
+0666872833826033632401371436548685693080139022484100159022033636174658329127466366162032910540421919446428986161784748017789598
+4723199613767942411247930612753447325541505390129994382585659648148388692327147276519250190560063905452973361339890280400124358
+6913416888336681958297148217827338479648390575317941960750631878321348332412104016113215430987661026879407929196484877377640061
+8494663204235300224243052398541725825482919073092074355975063032796596426605495082752541621103997044605964809112021627153615430
+1932408491193512375077001954464823146678231602554522550896013165127235920096414910813761330938337552089472955671775628068540474
+8216732019553272236739723100215131535386354969462704414412180804694918899617675023795044921436432605559415902678545425651517812
+8025247190590822148102225680479409002058106823871348717740963812585351667254545007307100968605826752214724522314039708032085185
+2898242245907570507615621864533672777989484514162394933849338212142607118088404798508269488444104500180113716320167923336719325
+6087711919535546884547342110103435389748847458344462232091767124995184518172878034781269231230242533893228603793308922587510107
+4591474660599204864799066811331150365409997858447042372594886218949250820247279474918230135657009456785941687614114216570961562
+0712145092385555182611993058740320634997625075753366666542910024626577807784857468873721417913984050547176339602792705731039726
+5904226911569176720780206777188612328120845124057780320649670149526594811111907198960857717925291216166167928639613716137663067
+4307416456452371611701931195073322788105756639763524372948315105493615715372579618838296610933712476520491005806495650421658587
+8328103991782890592563008949384942150246156275152343753139757736003563406755966669814359044466955928045317799518086337670918431
+0138083133435376046718367707916060720252112445257291714225747183751131216668718597844623190537189131972377334685833227229634752
+6238721382625606157004023423898943602807707672999152909288657052128785368828226605301253816178238566671806542598902348311422328
+8320139586923410723937149546492213794676826048701166669784481756530412597915193651538414740148097847037639468257092287852640305
+5479022830982203377478476331811758576901670233527290215872232363518816501458927070562308753377018843087767143244104321568604135
+7369186061703793181459759961931363593408835426106781211446368072605366366571248851597783995945722926222426820630491316650527779
+8828573417201809585216027386210261861298732060253123609864528252840272478045882739663756003736716392199489082689850824432511971
+8111646983909651153366476446390221276039522740932580204249319217339578537772918571217444956420257260371077236650618481206170288
+2935054551970379324008798030984106801055948226939968902171687217907155340893582643366397894579369212912093597160438593641683669
+2485378257568528389277310889609277386833678172566456312002344737328227016110453362502908568225831332260414575845627976066579941
+3482852162228716106007258452673841400279159876124086723321209861347673279139378292982201754962295388660515249705755465339980807
+8586012495756212505119149505421333725699491270326513988475156468533804482583378661782959257850441126447111003717332538997317723
+1776086627675735007130894098661445494477133237650830139159997474669449285984774365441233470966013545796673243563388041724650925
+4871204375981896728514583939521811481161849278118060344334503543763509824336823270998963842004711517359429526921820434423765506
+4949119417418804810189631493303008698556136954410752013975187350631734375598695358460132019129899037320268439555839944615572946
+2352205983666568424098911534581381260867463768189900460175744875437666192115066390019086651996365032553554531097825841729484867
+6396761821871154925250940721334814793716957966097731930384514803099552848004844714015522077211735687647117734547230837853524693
+1596031648179998000220637673943792334209148422484797868537888852196932416293373918035158752836265069893009384789762509582269339
+9695024706050496247098862490788952376578622083442656866053965079277898118236124486093149364786379996025483226916387856904200464
+5207178534801739733741859262250257717063345689422848102283865760573174574242830519134626672907219548945944321186449133371889496
+8091522599148708961675484538617588113615426169855145369191110338586586013267131819054886276010519517578355159744969858769754154
+1409888192657898889323633959345553144675637666158270953101126274823625732454329591205013981131246606853736622675628645701807371
+9520905296639004266979383969455080705361676763621326243504360544161563837353776252465278766865244727756979870759572455920688699
+9581386171160687133121725147597447299189214610587624098233087649334093755829602691095533964193964555227483958747057992036054166
+8721053344317784071933338712749304229416314171955616978192540365793299631623144229526476496982594982691261090976385827573975900
+7821592310703338108652726889016577851582851275588755649801212540201927028394346407971389167170778763825909054893860501536766294
+1680216758688189041294684581042122535978201496230771039365667061380634389195094311357702877874169983055267901138828354564408227
+3161070157288336465271541894601581266294703722546655378330486847268915166615856440605517140340676687703279431660743947236511822
+7741994422834194190860106225475557703581613419594307564273066500384493526007784089212735294217591917854424698645245431154845570
+7453435530259083182485810144347944810673614929556646679467919668579911140259730381818980942598880746925296760172341499274790409
+2328005309406832991426090784212693827689769275846169654962563240745452602435209585710235753460014401490458336687380630135023071
+5366592739312999644456849006548399917819901894358497737731098338943033079178655254808256654806548883980302404456845406302737523
+7903862311453131512315977712627346676478344399846058399879029101474967706599628983635802084695117268292559579897221003598626395
+1226042367447825280036345293351132154926212820976803484997329381495188404459278925205516668444497544901886948777923893344531981
+6856828147900151315527595804653628550631963940129883617356848115429626055627960941822258407367220366681493979858804129725050531
+5342427449777364357294403483728929672993293331804282077540029002773232860603723492768689779320843055290078442091489307669129440
+2646993961014124319764296539370434958358249722078956842849671467698536721940846395173191197670777284048312934901527571955362838
+0198542559113109732314309858412233715215167131228324026800689688315670022802995393900835564840785241774828835077665262843753444
+9550183762744591451958276893980778053478437092327149970098767098796188062615518630585477187237482484844353645352242801527565339
+4554133259430221270883589344804016824319680145988501368070988742027201586296359667866696516024912143872664381709357471736498210
+5093801098192097809224518282804541968783581829389873304181998214634779593308644761544892301474532546795113168811568716153209669
+1410860371073926432124196875939453572716037044352794395231284292433400177009767688979893244784882963302195811252949131002020348
+1963827673323077855623143768105648991600618303185458508264555147286917125868559346485583695956446151749324530132278047444739067
+6874456031627491486993438537612795741124963717273593326065380547768578196708046010574823669488232340781667689355939847002297664
+9059011156256654537948571823030159169978023672567790424242785131594034312912382632898662220373433122635586320057460971136026042
+4324851680908243245093083193503431558790765585803419091388697495752260988154385332510991556891584925155976792883412406678432776
+5169890219592441180988843355694784180780002217839745830787310928598719082559628331291213329365294364549008762394123896795514907
+4029304916499522070046006091292088087865888798317559803991873835903034439822636248876206336683085957754970026069257438125567024
+5122833726152490145361691490840338977240905109443464507374230617046450541939205551391476680636725777819582830317640677472291259
+8887879121383290774133008351057610071339235010888965861277804156037797773751958774639837524541250075316907358014661336099985243
+8039061153806899718406603277773464956989757949717475056088907096202984062415028201715624897091896396812284772715615886727140592
+0697572299245622972158982736674917157478112408603912440899066443377237594315710291599368603222944799827489902803052151032150505
+7013603271652485049620063445001242816749693945247727354086779497318820787447165373787134099987577277741625609459410605718145900
+0792184428093364028147126779227116462983472771162905140500152025984437549037622220978921623538498863508150200422542729027788614
+4411728159030287378714419332373354590292666051672346415137756916116829485503628039118411108736302251425180386282192968531233608
+3508034331771430567756401746605566004814192531598982097023747313496871602413228109505959309225451717487757635602112764447022631
+3428939513944422073187530514913804210377096901814387277664055693937327821063211837805670103207586535472844416128884599982345779
+3765013258236529201610750246167509469405857415384290132571908547691847116538830356937781623544344792657443940779980096189839626
+9024565602139835552337325332903285437411134785405743434839219379066510469685518924233636921521087402359934033983973385991471002
+2649847962568274167726165208946386788572121523811142222528040146116227215917720262618074588389904637062666528544746561556536935
+2620030538510199023964637151697713281829456055441798954059894139613970616409824903577033806155241943903044175681019965795785283
+6461188416880024087073825761424480883587286299792763357082205040327994699188993856940062456204962545880583868705703598889787721
+5944413986797134250694896844973795638537262177510549522817774683727110576630405084332924025735617088037709220742387561124513292
+1615973751057225002195236737059699517585264539200525680337988614003524501832730480276366257598203042140690301023569755795697899
+9008200222469601333665860661780983941015300488620597776980944258674129973552734738060885268066420909348372616142102733523433267
+5003598890783029733738430164315966147920008508177297711130783619606431201578483617231981134136392404255762575061631480099367673
+4714080230392459893569173674100327560113467502678424574866012722633975629063693151545366570327641280682622355521718987259238801
+4739385038824895235096103000674296240229268577109938375885209481939108319170129231324096236414336990925757528939018270228944966
+2361210030668060864499350273214477998565800871680472680681932947260121232176894643185754378295528202618772690219192407686919753
+5156059412217536746848726448056144396547837914584560922069735882550291341190213498634134528385275982127813806960692781201779053
+7966885142214723811725348168549783205309168240872140544601559983829401790243561220385975487819401267336194223205730538148703619
+2086985085185073545036414851529838204481235650803097024838796015231330542654233028002529608154776678617456164886732320375739646
+0833105952434512974899609076351921948939569136092110228925816092118172001373677700416412487399777738494320581470807407424704877
+8185614688665309617727123329966574828512583312557787490171669059879359795468437113583190694186011613831079902014081217754134725
+7131783601536200912167420913195076409694857630710552837087267662216383925992631278943851251589580445676689967886327863559646484
+9888310805734900531289699098784350167801387862535778038559729898236704661594447329313866535642213694637004811239940871137589762
+8123715241748226553144892581245052850529932097715696995932059624924557269075540247991049472713937530723957720713793716760718395
+6093034172460809629440737053209815131819638726936540787299401716655839213840485847609031890782549934060830350478366179240604434
+6633327894940509763972045245237235718323112502675490128278367355639972323817271838806709048068724517131782516093900913433491465
+5582353019666679291426183344951264862654895560952921265198755899160545875749490172299073507227437486882523588711701507976499572
+7489002650231525223980434094738594856401532028510616419177773329613390523750901433006132084090755184848290450781826037290985462
+0539323854296447671459242043430937704073386171637825236119340677027183609466820564020370547139050173937355911835070350187485451
+6965582154750741810065288181652685394941853476132562873871859640024361243300296805283748325817168878484565585632754351908511680
+2886210467566660836736517150078351812871682359935951946868379376912994012664524203941072154686353570579681603704825530456774626
+9665362335544365210262820037867343620764616695075643840510926473275049084133707571284177399685539645626628023165977084111958392
+0177820463043321585863992470028736425683626513381632161117010851699245594406701811450201210813697392240877275493182279748367019
+7250981623715632368538564967386387747576695271655268440119068242579103997269027655460321699463398768768277613166901925556040578
+2730921762116366900155596821064099866827590787028023864778747307107976624095851829841563684215591447795700215410952638220148923
+8642501753068607515960160175361362264643558443610150876742595480796702902130477857992388072241713968623856298400849938588555032
+1187308644994319305723690746675187962892871980887310999328792568364489164541385679772588717510375815217942384186220430941913143
+7605854751867100384861067666196612302899049367936234596159545293447341885894031370313641111815396044152641244256403303821921174
+8006560725678932454993887223171401960145271946857211912769628951507047840598467703395747670926287903550867839502877316151413748
+5747061868485506527664044246509977629632520838572005928929416857628593497937173916677705472302579778727680532363758751491026938
+3023153622006915734476058970896478596388304728569523091701672491484313935627044876208043141561946195882862365574965158147452289
+8540852691422877019070250316861163162391778272197273383387116022030059687803664857766804536240988573448290819394431972776651275
+9021443311810736715901066501558981319880316837771114344162148017989800388690774710489918382047318311988709068050500771418272212
+7599513906333939122554708100671399521304710290565461919067937465641955962609388316053120501043224440969693966990639899533003437
+3190313864768728595063193176469208637792413542897116168001394022157595453909893711585707042678368387735204900683732630413423309
+6043003917729256108805619361421477310316625655437814740309514638761344462517487426501249646525209961899684542352037279524879981
+6813035487710494491438894246146083397270552071559892438473910394670225142289451782904407545380437720612171136664498766583513111
+5704425501897608539934816199146825064755643795555188152948142674213138361295684789361927194878162187162220359319096077044697338
+1170042273866788055113160203247185045523345121557337349823787766288071325865947069357672811750151752362658390610542086745537803
+0182650295086344086825098102966797093995388649163271139864646408250278380402342942834021881070263294572807189069134900984272374
+0906668841731928141540118014775032666661994283184008007242068962044782267000273516374045366478779586459658472979356032532424400
+9941559950477797261120283165043361871515058911345852440301289987592080477208449029732297262652194811701835630896804400526302181
+9586422168434769367306983212903836891536506488360440148109923788291834492143450307170521991049310812325101209435949795579328604
+8845618327364168114007785559410459235882830447965260478796725064238526247677648804067848274177910485949526784938820751326532317
+2508842138180368207641530038974478572707059622379262380563191970615374835570345785749767510398007047615953484581417608147080414
+6150921916969845997446844026937752931358496152526223613349123080269156525204842351030887676736715854630790139383298746726376238
+0031087628812333418550306049252849828620365883770156880965318518371047868891562748685920081560624079882621440888924178323074068
+8556547813934656680983629186991073869359264408784267940961601835440468005712703124932656473056207782384291231611143830784642169
+4764006946356475094019331519107580885428818699148255825445877812529420751612646315832517900095651843319599421976422128038327435
+6209251031135205676846184796239439073588798115331056299413787815047447544760251266043212878984345103105431840273907195809002871
+3654931993884850780377252970969582655676559449815451929264323578834644743068604576736541418957979028943061560532360261664725787
+1145330876015831126155307819990268909839073491920596329763420311698726840745194869089228905040694957988171983477254803375572985
+8257437969668449439729079801079379205727147223003815670652927114347162605507272520770488283403449339977650008075057150876981627
+8526350745722665602676982911174850303165259851752432760991481586280102205346134401601648981884690319798225175260769925489404224
+4638271898447020123724423300538195550321048052825314720561544239062181964769986570926083174181155377779882057584541395809301918
+6106817249634524848855511452769182264081765291797239837907787970553958190403210902425419707216288535844322802242224844682625560
+0987012833422099095295557450557916850795807069003361331869709388270541973078686998103429124404642889230735965872322730527661759
+0637705394090134454432592452488278594036085049343720666733736875565892704518648963039960363828210137149300479545174722900885474
+0438909745910598389431226270312843755719991811348892485728211852221096700168476622881940496574796916264512821293932878797623865
+5429545451401418793893535526425687987849470147455674595433976709030225358630706349020692453458568350635883987698939555558472630
+1147145098629672646090540159437091576295858909288901226882948677153091610088843747423989951237804279634707873305141146001310035
+1453067258355914230711608884942303119909820139748995292741299997309447939834224950618749891034712331269306844559292626045946290
+0350632260797112269078999525007760708741928859358707432624911128337604559525225243942115958112015615876335010570860522898738781
+1402978628312279477469329446037732401120697968328000813953667479029085290308524043626235410022744559135665074491331563473370347
+9337757755044278436081677756600946862635252212939271849678018763209718297572192696470355304192247185638719953361091249281203364
+5405880207322161294391822123973103190408090878564615457135856917654118957703067143223083955082019279925860379183853717628861577
+7799366841975673356259200026023839542055869990618462031135739235438635258865047764693545067810235010528954960166478294307447628
+2027467028086256924839310527875817129214597755080392073496545377860632428440004957401492609606750537328284161904594401425287572
+0946928415702129545673169191304792948477302426781915513863540380482590408165885780307409257801864775225156808756934724074392504
+6885597618942836774284752567772379904321306380471869189416734595292130350179577547119957964477389742383246612250778027835962842
+8375378564184742787926400597138354486910116541106048723078444753508902260690644823241797242756355368838174606975331846084479482
+3212968824505986851162688090961261899834237009593445525206396148505570975743205626589129717163778397732428341839974826649188402
+6250784433605236331523177619946160387836454523224441645894992796160653797716355919979290100324224314406791061386652716371890152
+4400989435392530316607884601954369502551234892963245103254821300716613610559994576020035792556553491043544497572846045958494663
+5437689141597501417826982456539318735177994543195003033035189307876601341936559142966278723819207128349590261078232012690448383
+2240565515565951781099043148895044873938264025267367187036427905278273314523689584565134739736805096906657362307932608184624022
+3576329018410785775670826940638079688618282322990520892260090365771287681416891560096002562633570097542699787911417555916230717
+2453291822907103982064112069025122300625453433920178638265846617355201994938801382944512864303440296743023682910689965580508346
+3275346241221900813564939920509014369583021411699796257800366335780055834288641882272217012847000156622653258224710526325808198
+1761823047477639207496107226016946214853880512328754599996142453344143869395811453079561049784458849323538032761380820785136205
+2258773098932947134988484220635633194802789720564239663961212480883691013756304617477696306260192353528126108628749643695576613
+6833244981505084786837439890389565039428783638198451342774797405426073205683183254178026538685346206428799444442723636136435573
+9080842459252171303872018490896413638818633597602353810855257937546412235233854346618680040369752485990328489156699457496819504
+5734956183309699603857071255358660306282081929816419207249476965467352584050195709593369245076183392383809049796820142290983389
+0663950400843838925251438784404925348605007257769726864605575147487057019983649102686292523010863667700171976798290888401737766
+3133554911232814826547253321321519762370231796859406653514455605268584403622162920523841843001241629651167179835787795168834729
+9915875102181929094696545619337694209374642713183714372607433054204210229685880508097695696888633628128273726076768020385810595
+2987095117021662238907432053186678763052465613665295736124815230360572136345177452861949998291445717212884676001873754746660396
+2589155650613427623626563286829473395485125944790254164155482476888221798281733050713864337019212875437294907722695910181965531
+8195108479458493218118347693154287549401864008165971140576262020179031350059154171267408221692360825699802778787719114529741055
+2994227854778559135194271668156980433699910463754412118741685322605625614010496732911474348010716497147621915462772990056635740
+9885103937597375812527288674502022238204092589207503781840088970784707532373479354579114899440649532568358342845263798451171893
+1120400390759648596081862269355864764100400822617213332109125827310532445408926542692499006220714769552811438530408840934868695
+9637352403752939344901814991765254063329438135234927589317161742716459240954818619945185528105201605559036407476820639345279573
+0967725725520221343652248725994878515580037117626550685849684690414565200284452932891511103030564811419601323232328459974123969
+5151667166514928638097099027082126182546856178488195923185506331245117707219875304117100373941938587261574361349595466933901648
+3122056019614029244775838489907181693402454194031630939340884628769127341314464687448572665248434305566402372170442289658220344
+7261444332642187051262725693834547125915901896179000263992637439997458766108204237403853459573909864356641282495892771557042023
+6977452997091657310159593635773017261586291897746068707373152247429150821576531204588421265308077483457611680883539505380780214
+3922860418447742388907173493206552834918162458673611316176697519544920126038326376534410690399328547067085820148163398020288911
+4131844303372153660043567296613439825919900174540571926796003444468128320273120297033737036976412016725245066800816469650561843
+0565592489986925533018758592782811877964316768421296500160427160146511217146432195095933744734673635804950107620352420106654863
+6645406729317349776240373018557665618972564221260681309297356903494539710063100566543717860365197783559220679304253096607594218
+8395581134093404449211217585032937525052183907591091053649490577579801329664352206258963567937765723904612138153463659172391420
+2858367788679710677058155486700833423902690944634848842142528244040019800469662248189870722506296487688337321695524703236140988
+9562335938642263288699025637860876864417622879634601222106055965060418025394207515941236354344664880329773638937529679471456359
+3869629127425084307826072099872319475018151572502025420028453624372211412720817771154291359747053407476074728284771551844057529
+1190185706672366345077026144989614660307994733718658435474012628808621940611349704306495070342196599139286091306151010932970462
+9675509101851273861946201556462769919002921112388488480221448504521451553534147109710141587683279463216951321945573166307639217
+6672697005271871616738575015318763914957713525828413258526916822948066768551357315714715932196912191677461856418144576263544333
+4907150429612203297659855554908990742757537394357200499303314336795187732766056993269698914296065846201908473023132752908744956
+6150083396086150456609926582054844276634569272470435640456573226419822868710777542210573165448531019738194685407995076708226492
+2678786284405544977160356904372320894983311525398796027674382539921414318300162458602130818377816924569056780073177178248997811
+1585303840969268907598807940355932272770894001504038659615940425154386157294260258784536698627961267225191113300660353374029144
+4866449090853757246935294981633041248861600653432843768265539085865624263955878975774708775312072236190746445124355521953038339
+0619885412382828558999175920193016334591402367369763220140054897008235791975355396141026004273210423619062237213937060537525842
+8976484958039104695613723977251336268561215466702146950426183444969792826975925369611735319989524615202694816932040830397174311
+9564951821673710247264553143623225237946783695563652359502341538660577772441234930760198015851060420035149363908475167289811549
+6152784468367404157734119802017549287296220448855141063864170092034156049229526992205564211402819767239639089903951267480899195
+1084349314003385023967647400823528491190700765335630550586981662116778098851626565057148602128362406840285312235675524872617927
+5940674859942896006453306875133525569054425493267698876245403823203215376527985578976643008721792339745957322665402353157011446
+1029563432263058113381593903721587363928336506888785654392441615160711392515188910321841843403492466442469739247826795396883496
+7172639941661127457144015058984534581536740542737103665437103773621233103380626067034160263026558390443198760839727420004712631
+9914873013707039718441199896815680469326923849342274027255430706708553663676894461369886145860075954707988128252410758852549672
+1551922530995012072301491677655182006822391780785787705916872826260151900149221019724939267128249948853451126842232399605725462
+6980483373104508461112547210954800274259585332622017453698311994963928004018795768275261593898964198667538969022507330787533788
+8940619208645823836214853361748146283829606466502798396069751370937123229891589445495370452889766339397264192786388083894708555
+7956574006856378561036342289467521536334236359576203113726730817643632648603038458281607027513534064039819509732524551295593096
+5939647576077639500586029620496592494701352335060993013958711501324112331829653462612315976140447947573865479895456805542744172
+8296423959232512165579460974983453693457497491285869113279013506974543084139634238126476293873284263151589338438860044240330996
+3782355276288558083473518137834514003242038994143031796041577911531844210313799581374155317783854201414730465792201716701206550
+7105406465035531748842630956573813909293101829709167100331101814849787778408887961527614275809837033921260676349397115972110690
+9643615107680266865840715334731751157919061855580521203957602157773380969437003086918579100512932764454793288187949797876169125
+3320437252833110321043772044039248321368660878095814104499448998676046985620748260108371162632325229365624907230743947154301806
+3552088981131531046172808385452694435204741530370783735986679874877536428004908486014008409001068550950540888673128998784481805
+7440503329453373467657006789991046671852958451887155184801369224781302834630349870843861530093008719949904514151022786314021716
+2709390621195321800279652002200952192418979261420927427122958490897500556999549527116421814590121223682055231817153659082402135
+8861992826208042869383343763880314283402643395875744203109296333659792215641368608715044344315779183133340656043459727198349780
+2734853139703811794155039071217208536677070354393864907407146911703003457454092806351920281851834356124440898064979131802059323
+1762234053491518617088128044036706357776327020285634889111113700954005526394521483443227952188980642686375398780347144135711592
+4027397751732022026309364751091606371427768246571192961054471672221120559486812200168063013361795376094462318094221786026438363
+0392038021743121561693528064882454352142444617962196680006981383051817202169379782864384242280286939946138589599414498933359730
+0182070858522164858867574874421689046928982559988292189961850204180007351631664423841067686122468503764793368632417463823286265
+0700191191614031195459835157848968083002627564348814468750050055060620960050671214092145749062318287857521361265309131257106421
+0309993332034066779054757057884677047198784197094514566927373158826040214788501636945490789604082561095662632988383214277496388
+8146430655840989789550968117320096504739356599535135443521661785643633703575650679430439992282453217709233862686803968241138826
+7498984628272507825242938050646337866580174070972879570659031107873223367860364402212183428942145402115290592836227443279445979
+6978276114539892419020829624768340474210713091442435775100177879638010349673639613552216581396012901447719087628078745824194120
+8522095336564609176473140966826492093656451125709888847406519188859548795021576488451306844892007565711047730272408121668647900
+8524767921694471514347227180326839537161579546977834075174921433329341884828393393398191832645952423890037661848882505051151043
+2944580067530192277404349067174032715610611074091485944569506105415953050308842454649185132382815370040650599793085560858695708
+1141032332340176333446374984947231196716478639118202128308413932621313966803046203929215874583358851861354789012133869833074749
+9480985593249065406361871874582636508161948209786505592954264261087303579799611153927773325602584185048591266936288024303976476
+7322835259534879703369663910307964057121123765236316839734559189401161415410496300232441653039670294405632163031483814775087095
+7887660928641822340331849719497888363217187995951806289777062854449559129016492535377000453799053164705981391283757823729876400
+6020813393115291018308864451756852473844549771230553274019875173525511163873500444811237248088951714603052752360262642567865853
+6201967072308522428055969416019910663232530141827188975690227560728650829855364963013282370083361622353100870401742620986225707
+2869802657723987122733883328526226736949680510879014974422147235169606191520933028844627505009715152702759247026991603640320467
+4241131697918560404418795016499808486429648304834823604182336854359989655705275261891160035233666029073733408580774645759107173
+6464198087662041784095710258475229347049766003901523983606673438365749432588484287371422883288614656304912471987516429205303532
+2029089639113957845701115097046043607676790299218866434022020078360708383436488957906770062559366765186955585351813372430895635
+6464504289920784076224333417714908863182256990967502428628619515039237321418833968508382684390570422398059844256244914931448759
+6529784435502409492045275382927262616866859838773431100600230894559679830532230924353989524323228472158682810144077054469603044
+1378563204070129032409938042343154208174485755861395799608824865872543930138962034925792279431758568493941395394754047686715676
+8867499345143102872671197738475892292486346568581939250404454964808538362896520373387072413955104371842316500056740851235207639
+2274346030168140429762079586632175197653839654847793978202115595048824365507532766797058257757822432716594523867292474757570615
+8116418268033688475580223253494948603537184329744599083311334953737050247127839879240255833527455107807664847505065047983484396
+2629458032033571400314592548790506246485500676837502841162113579334258598171571921210523629971864377357109335285657941548264619
+0524276024669364832317266608416143775893545796330992023551256594493130557067547024156422646526989759981543218213803553279470269
+7049845656048970965053022592938828183548869262256486091586477018991837255857719144475359084653581143521408001578287580561915936
+9529610539570129132154472887914287431871889778678946943105713104741010716248000242330469610192173796870030679714772937881344366
+0545264556901297919417188117578751509627881737016436472816406518703771084849520268761391513510275790321817000658619656930708957
+1126630442325657535785952978581421903165028332745161812379117711348541046986438165712940213350699237254925482467553006850919218
+5721411832634196862603413999653849373180502518946059378586343176647830400545625593156677745062236816423794840646924829283523696
+9566889818345214089079695756528442838502922581513940730675014653702918250796815796276266282500947845827720283326159797147319082
+9317560741024728849503640154852784294588264197172188120649331980986731376355567665746330692183280397742589194244588569542845631
+3577828329965372354724624706136258680035391223875847298805321085928193394693686066077198681054782793606636920380474314204706128
+3316822771568615892652610314018713244424614540516258058981790879447066097870072989300359291800915299516058342141748356513095635
+5061676595203394978368391202469283356586340799916518917181619890218937093078654617621002548811013022192072875054917226111499567
+2293159175827100175340065081112035701753220885751903235819929349733241991099088182499008327172200193308932710369190557345577793
+7287877879088510408061450710486988984638957628372307246581657037353807145126249736162916823230146250853818942298633104586163230
+7832024984477944259180948598164959684871867948848537597567339850852013498502229835859692193114794153895539003144519694217709429
+8852158774260606249546637223424939759148603134570091996953512424441839401422606873114052812717989308319825300637980593162367504
+4443868737007280155976070920335648272365458102007219456742917706885599061474160397874769568586074099945991122357965710810304405
+6905794745598083595623675442819199614676323588131811003338385631872023890221085694977414242799825541355735846812034684719203047
+0457011399186690441251124301781521567240706876614307067167646882762698974983127872249705063133235031055532098528898796399551640
+9652581539551646223682272835407450811885069347498654352393131589816331647166209087054200913809824196442611900896852634745826036
+6159069172552131589074592658415752799244670288018595097465086916954714517572062029793973193555030320732773860687445556056374048
+5349001165930930982732148212936887040004758525708856986464739067246746909509060364496603927468208068059374896651091078566710130
+6254982141720413268677308357696628123925721390150502950572640806864637896561429156063059840807574455370484872143372214422469569
+2175489787129382942852202790241971823638922108920609980574885762787573196139571654120370722438096597478384547338469999448759583
+5779677161907195059713244890541696081649739347821725617254499816041573948157136918495996244811587574062062152794567408848302587
+2529817818204143798110200493373689828340608796471631850589769739013205825657411890682974212480864416875107897957894840172709126
+8663943826538718474564967927014748693701498556781723819074861406711142155938775092841806948205850959520646877840367557220520678
+7792447422465445177106699668289442956655097062959653482152033676820332098951332376110889269353539366684304599313150351375802284
+0121046685822850120961765570267263832452267770816505513149214924261156051159905321694021977473033018289683251782668439030324894
+8869657128937432079954235872959567283205921860119040052090516147170061627077989260167387744379514761600478703309504193576305611
+5381561915778733491108127139487324618000049052071735127115368151009776782599438434551832876965146125033956869670863387976299721
+0949362683385697791271115461446907297573048650262795825751967646029677499691298037462050809938530416641818484223928338242122429
+9766820839983470977275951789763019956067562051439591397901411073621068841669094149499180916451056538781312613407170881646764399
+6524347269748594984863393554929474287488214701192085748591350202439606866037583191335302568028741994749726846505035406608976877
+2807315518903493816008029815670675803410749049697801438415798820359073479308467800153777926573033244523898966885887408576598556
+2253435971693966005243248611373406144205306206628977772254035623423592393288603285157497164481644751059433660694427679833172764
+2802621839144263944769655055452576122669485060013276462140874654840615169333830556593045220363613387004343762888697682047116295
+6079893975072940528060570984236651746363761678873252309931727588216926947288076839743652207728678149523270862367475616321714661
+6924992946415404337508448250054422067066309322273329866764351438985216249046429085623842949432537700067268248539671410894502789
+8240333706088312915806196572306355577223650119535205051323962302240268709606481125217437426747720173549677961990418013172593155
+6781963827534077258276934309689853954408488415498885594714929736965951139633336078246485722224486449322009472875775669311469575
+9358007010281073437748629060353526682504603164238126641900438090676758229061250503441387135871208008336678965627603224246244049
+5356708068957856933330346985639541006539430131114293957097055267024756313531830324556261486697384925986987181884646073628504968
+6088781492829096627570053299366443750840538654491246720498646497885473443660031433479078885663560146413659899024021823265546612
+4698755327188359177076358836200498034389012684305157808211750883923932482111066086636126223845187785757048164121301047675382008
+4187475464845783395113764420886751702440050366103999318308171948006157647282740757274766917041519563322385269555023048099709528
+0571195389552617367126852668538451980401879674162973150705011024259186076369903231002763667511763488135226006543931654677750804
+0619275562362999032336486727097255819748979447931027384044606019902431591438640635467977566427621673095319535200747603235302696
+4867604449981342383768009732025809614182230646572537976384930951101533738349930256172344711040076994914315737263468451025930022
+9527865696943210023342715736597334765710291291516121893348495349788313734498145749015674214471321122949483123539062028956769641
+9765176523721839937410174251025970316488964877877371126040698433360574265827174483074565633308845572364434646203497713132542776
+7378651477723436227947997821691317672343016210083663443777377182287912898006288444888091959123188074922030160615537818420033213
+8447189492947088531974966589067358589089364485475991918412867217338548681050492469752464750298772894247076136639226285280041834
+5454360318746876235873485912565983134779435530640178745325450114100396790737296942281564432762776663339965033474759509011312252
+1273643557029602462258772262515086262035743506025601400592823850215645680844288819770466248021756708616474262140257830085882080
+3749316335624058049683001015861489646556394155367973498744773935515065243970160613827515488862189910777219950612111041830333142
+8451480666232257772267491027370674681436846933893722515862731717525412660342458091112720313220482317659721562206466780128741773
+6590252632454850440238194247507400433748088629955607174486085725118788995595732312569896819608944355538496441101640124949497789
+1257684894384392174484251124503854845960148691603301944875996738800826596693185375085047729958430171553740436704869195063748372
+5735178593590752060263331193146970071579446804835972630866651058153595857973419849597143669821080829676089777998056446703836684
+9360907310859244502541304513473974522087020370096397612021384703925636952795854616525882877878108950663963286923299046586524224
+4736748114460524678435616682271235781989815828869520783049700875658488695718736121600271316948975177628944650186309894116256839
+0122265134749874764508072046641714144031116931952372994620287753392883858943809994533079487667165865233880719017940897178306317
+7314139776044966808676160030164847624119585864721750026892048897546015469276703858536945215709271741054424782569701147500084232
+7758065860697872155705967293772173137656465001477901257876428931468366029449777184812467116641975319314916341175480998066511678
+8213787357873005347083763974187729721493820664650580516006337664286359010259386041876040802392491656717630783835571533641496104
+1539726264552952565436503783866624559510200362458151625173082533487696535010112807775556729174429917223668593210128877186508887
+8321470309679685999475535888469479559195982218922599887296055650137375133750432460874145869352229391171673429325865805622380834
+2056541359048531447828515960692963929079449940672170706409337197174760052966541653050946881379320800572898168412293068662723053
+6860373992960297640329729816572073853997874011764757398797944036292846733897735820446934726176024024757470895603256455220029335
+4569926110072668348278664329257941057438032693980297647417188505086076585913708391932628924011735966680243663432137597450444007
+4011230494392556854932236273332089389934747612548401261998294903567663125297736568382740395489945640372131150054623072337132335
+6844595318925439547616931848005923901307170686601327728283791660587722758968622818978597514280133292570491476960507397213932185
+3642313707941792113315508020910489195204450745180517492522873324890987317406946100562361363175345008151634614618218325839525506
+2427692898230648928178646301964171781644216637535917410571457842164951317391990752953058484915364895813865613835337731245388877
+7010431184482412816244666073504621100130866578971286677458525711336280431605171233723698610913008947422033976946085031938114793
+0877515916454772093488878527862660314336276524158489551235818954456016892617227185085470522620693855915519816376238143161430319
+8799443736799287358483938545063592502641553678820618531061987381595925735003006045937462381053795139314188939327005235192961861
+6759340733723316487592044207138087167698990178309899096979902164464364089126370344350744470572331313727851480014896363857798812
+7052560097987652474276867365814450520379120040581256992867022098643876725081745248682691582583629292763400638018100065591005268
+3106774405492401515494177672517042073837303505772295474776502959089196445416987270369786947855131616223965006450641692994332025
+5855582574286277020845503779828089079164761761910842413066849248818854888626393445367304058754822066188520015897444131019700263
+9198472044843711981048071735258326011544302082682349755642269651044020224003915379747598044212429909878394016016714106491656407
+7815377808589332772544290119723706266101079820396212755543706404343739006942558946534655221133089320660150834947988585978442816
+5845893139549225714132593150193123229669033684893833205775336633241518807901847649594321897137880458298454663559120194776464523
+0400879116612606005027575801357996533825782630360057558670923510328348895013335023158934967383007297478557740608358705255176983
+7266683495403368714481550525556638200455893453737443660389337826017810731088543589057015038655883579293647540385262180527785917
+9515154749550773405200793344557941722519749405852747512969927332977178984307036495472318127241347248808326472175619457986406723
+9518368191888409210468669956186116750302181387390597344128917877355951593149853095697850106850745402883068932235000062455347402
+6771238670568019918070196745624606843885430053371888544619960477580892136283363206743364325496202732003423537704812210825777485
+6482929731992099113054720411204927077100453390882438863808021020983016716953161187024589380636187873278841457216002930842647147
+9086580408882584727439595283961649388079282398490521121307077379799427026353954996467076132654318458754445407020982965846766574
+9211933498567658239813690464315557516873798138696846826984940696375072209871675004339676866312551085733908702422475770451671522
+8116601759554721517887607233127079564923984623323605008410478991117346586220447102577578587384958136197341044972808673740184098
+7135146663669772129679997894669791690347234150535985440597324857772792781041329129123706810764665585549577867626836104138395091
+6171338134734949666403237923355751356314985925381428193696582138260452767497882006262979715518886220518431969713213052164146287
+0631430030464172255146123719714749762611746753803707576735960990848350628824677285326419791772891874510486806367078208015683527
+9792995724212035781617488647953282247761468865566020082106220151676123008979512284726786406279413459522157229217252165905352918
+2536766618340462486482122665210247152075138704341907443423031644884751559830028648873890163595496896608683668686938870179657834
+4207985050934314372862959059606329918091261977012574425026916852113090691158385845006538026326042605485030114114277066770366995
+0403083121980863784638665369135497943380554934143397132755814677874063414921737247611566476833724738395380308234640207731607371
+3017035318366003181883008020161130977715784016586015636467061595058652062869875350107267130020471568933409734170464250203156306
+7978597058687788859694752086622825044743069638461579429486476003366615826282892684888720644513019714307671128574626623134255754
+3225178060856930853571262377435203804205020419212526191171244624283460959473575918723283729545170705498401123341048944419740415
+9391613362743685159686501403436221835235931626375947101387495019232220333271032937655938586143908770909065649064710101953494614
+6134742532053652776330925214492259910738874571044952830222662538392022245336085949987893286559101791675451325204933710093660895
+3150091954112952712726674404458997796890860249938694466648235513572474974162093062356467502005784802581269257972393197375619808
+5518818055326965608441276354480052128774778908643152331498791242682676747511171669510551698928872813137576082004507231113018234
+1869442353797750668263237704646436989107574039444714294394574053634166211680018322567901718394177095139221750525981664718345874
+6533895638718548550755018968962814261467954303937753456123595613702977896395623181616704065331577434094624992851719491928609615
+0190398690201868871739512766894228210227318255924906586297140986714101681237768762073978231156784378903908446734627746278198818
+7031625744207762150055633900029138852849133531239672839021846058540394772383588961074862090538883314417964060795273709151209027
+9458808924606129446923894166510777560369040702494184195952257501705875876785777050661631817125173124207320372163502777664965913
+3571992627283246607384090417534713518631913006344389649603958134572814682981286787015904497353080342805307719694940285614675633
+2468021847965102322233545270789228088801077254585303970545296705237224231512698609584385993582329483075661032700231251161660423
+0192713398720255736106913269405387578211504390721637672765578917354808072397586108294538148319234789867624965197532780016350565
+3634551422633123938462201786680417505451646469018713382722643171537409460426340292141021655461958038710203141816197429713424286
+2547844227738650654059981449340163279595536790994781981453043554676804995664853696521066106987131049223085671186846778658607485
+8528870512517578936416926762107480564174061090150629794502095506665701012457777925443164598343164919674568006002249856403680494
+2627259489744462745552373437029184782032929858142986221112288622061305496355657681071521590855144706970497835664724912122006599
+6545391156443312660152544214378226475642958908136790116192718647739147551525217967757101506789062053773824320749961986081365820
+9807243716856995753119727006541625638999515827040154011379764506202860312616961954158869599676568905867509226176218277805150630
+2073942766462908233406965969896132634247796801676354098426177499898295515362604488579021522583028021857262554533983809115858178
+8347131968232485092731301472083865394183193666260253997648555077371404915951205500140212998582177455804377214724298329527661383
+1594405101691517143629153539833183982495777310394687166385933138800061962945009756356701243200756906586574077923344666352145020
+0197245967822981167194710233250484229803417371108743341686105467298388178153158024123847938905011673366872874417478036778662336
+7258512385396982458981727808434299320938547592708453258132441101938548683407696744955847650770224320115020029123283233005466171
+5842172497719189784583681309409508840094316855599405125810349460717428156132068389884811129531014665690641559952450142631134435
+3120882941134196144363251034342986015603525881548802680508329909569735321266175483509995349121263055144465010373367684170785550
+4158635639323481056067212351252293942485312028596582540399759383658505450921291350114073361212206891492359937785370602986743900
+3248674367436665982259747983227106329784209726320992248877150489251570771053020539956408865849029873307934125408634817191607873
+5454247998356721456240658773994350865596498454154991883699218368604475173834985657275975908620474089305230670921518592231403386
+7351062162946891390363227270397968233004651810177775309863584286429947693132180002624305405957468154601633114090431896806560396
+8578733043161456354664012245929168398575757646163138337526746639222181428391936995137008559247216584486677942670927998985802859
+9200314360845834380351667184778736242928721806415925103242410837162869501355174790557366226463713207146043374288777068201363073
+1884840380691470035098733943006470724355475360919052895346183170077857886208887006329282319454011758272954888828936243319780379
+5906121108044999002595816055500975401842454091232971454535066145382445630442880279299409925299375855072691591936952415415855608
+7427547736672177870270669416923472904176994726042270600865769556468182342137641250127961474267696372215125069986572926580684930
+1283565631209283359581543095011894542058022145233771315616803743285668523226044837411757706026740916352039927306329889089649349
+4270078841384513763036784211367232205576108266657423596077336951308763566593324577257390215814671195914760219863020884678789417
+1094797252284852472558752948074017934025826602284347674097641546447667688812462875419412834529814608042996511263599028929742238
+1967645060681138182820884931078366878249535027007771792225806188604957386423876036386080705880427884926800392921951044407013636
+3181566611581199324907272529442720663293855144200609139564151757908337725071341353176155541142076746946246524270499526229012582
+6539374062743440091085243475167651698361455560983223707251591133463685518000037795208788191244350973724875956194617703899137414
+1430821502040369247348912270128694893351423782952149316135243013570919313886614565161358637079094402119428463930234964822013013
+2907845492061431274313604396416192334514224786448855288597321564420931438182778758210128537309848899766746069430202195659612336
+4975634130177816916191624410591783555638901610254745557743055701024321622685828565315892206810167787457147305784539222040470909
+3426187794037654633853814952285180680406547839298481434679476618025289610702493051123252356926166123963245694601391065308079166
+1560694708414872555648575097110162943981198563540849019446854403562264846931619983425916923587136273462584821828465235074422917
+9261979271695865979574032703343588466946379682055875729180379739323087400969273393174411780309814669530363099378105348978942035
+6060070323917526453062047842877465074776912567111669196792162790002591482979059554932579116312700674668070694919873464603223754
+1894071532823340571620020715489409265478540234593867913381245139145940908648942949383027523114581382713294341230059675979933347
+0475001838386962980608799805753326787172142674741106499743819708928855603482127536974433291922816520616537305575646417283646800
+1407873654137191433607314317494815145886982224527312502679184216570574189580738684704012553837521804108283635888649341886347674
+0746298331021251518403002440748995086111379224255590828431961727677994867561042572035686044830391992128329363200090117946273786
+3394767633292754355096521352490384715569381533683416319072637548165685703657478638050012390155682264692286629389917053497837436
+4659095138863302858042866246863612004771584058240848977405503610643181773657781348444480569875240316081167661626347187543347285
+7911879124009359945066105568437670726515538210712672838972140937144499494198784053146413298370949806905102557089313540518536047
+2387001299041180490187017325756798839893484841126540625119691321202951445764540357103908077323391792392357443606419429134662703
+1311387664343269938420538390428981548672980222893983525849983661962674897972783374663857036358464131799985348402057774789061484
+8274461005931054626156020913275021215007841002783185917701579638808358640962009486666957046897388731341995785176631521816719220
+0104967747699292212229371707417874791998945791320492326714053322534677090261456035102963665329391198512545240166335302214953529
+6438295329258114463806507486440728873144766916788136148990852634546220929994618127547833759089567150425084541257262887419748944
+0763510822819190844430827630471119922358130707131670435790654181644862502449964467386506947657809851105256327118765427086936245
+2850131634530202363427136221800593088389014446941597649063703366121196898996686256705732620416208851855006823708510518951595042
+8751603030878422139220116631069675693727662503215348707642267571256820475012856064445690912370994140681017385311381651837184429
+8337808674514385942347760110022916345088925240957432454452424792146056100857933925448423669501901023480223134384961261737051238
+4413770733662528673309544847059059161282542697670213119975814848684886926540572546980353008826625285683672206383376561174283585
+2470179376522057019705141639334564346002921054122405868536589549939044185327352857788406922050956188186959812914331458433168181
+2179183768538040087965101925166314083741211822328135691819236749579736222030235331381929418960851621953749706426251383153679388
+6697638737127992949029219495456980219928837272379992149835670720157263752765848341694925460132961677719444757263352390287952092
+4093217437367696270862739890376907333913414784572650839225342564140670817115158483271922969611210426005659701735005263854191680
+0504868284114293941201391805305848644129473248052919285116546768968370400211720819698688057290313111673099410825833594935299522
+2193387285480585675810105037896679125123370546559641586098343943853768828725430307316784909701983568646060993578149869405653861
+2934591075689506327550526527978208181872636707486069235044785075612292358262482648814374144402086535106182407978781842722397427
+3764043018357659628728101790307107498150768318990432916850503907920600389618490690749145152636599605594698036095369786495988258
+6957155927715716313765479257750780421880426026172174055737331392383266819616843853222801559499877374057106670897236097150948636
+5427827682310804721340200045877249335498355065518235785095376215323629999016684789788057540796773407165234965827360566567682463
+0931247633662980846735922260231265500967979148521116776842985570907612389971711829938070907548905323760203422391349321697221760
+7882789193682587165711403864901445874796286061561018238012019307540878080647271091752229028944021330264150343818926048069144244
+3829234846305757977743751433953176195429230057570537421684266250781148509555390682508579644164157541082064669789683815095364787
+7604939164496265670478495045765555257915418238903189606069500034604107925625520169975834751123093859423683572718773062691097465
+9536565688839857043404968751102502068918401627692404156712144798677665827278179931457967293092502383995754188611043728483106278
+9597088053951878542145390264364113151329590157432302502341917977233379257169202042072712802096599668573120272798291944153363375
+7607153187541747861933137718609189822023639083176590969309128534131402001720049300131597786926920331444518080594310667529269598
+1927075329456693896562301483770530596686903351047943440879405951056391325510081534440975417269136288862213745763314617080452571
+4793088300460286258221203503876214260288694619740795021100096527276740956582412254816142704747725930689538001063488725674114094
+9964651944235263688993656306565044507502459642744800444126035956827838480470927964887269362894767336619648517065502062761621016
+6129875810846273188094595526245494198400294797450838878997940481886389039479255372079045644823922532826285987109316717080651452
+1158870497644577891842220310991400298247186591687353490986090963675370236688750155704648708257105452733670085922368068618952508
+3951586474153083065442516047977847063483146004542723388081748533379792081337808607910165722930346295608653437371334690508592931
+1348798137260798951844725481726752185101778730990513125012632961668430932041485231492712161518123487434868038690945449294611190
+6621726374054578571840509185550584952608718450715584685612358931363303426238432883301985179247942967408291991891183249754595852
+4638603540391846589823234253913403535906012903538328082937776681713183362324668976651509798060188640593955628086698902190682737
+1314136004568121579468174164410670114683609747309631647110337083615027244209788221757184880343776037559026360829925134683110860
+2743916110589248861852284646250771021137678508599837301158835778690463663553082493519868901155377573114305779992715972859595723
+2324106156194950900453760356879741607730365869344607490682695136931314492042609961479060353962654666877592314030242319785217157
+7037168535189901999950898708785124945709252827963059451445136357835564541820565609455192709322939082485154440865255543678569770
+9896528396971770400160528156211153078421941311469208430939294234515837583618887123400678449175339595403746664662044325400329517
+8261684885541466594581605303831216257932122772017718190045767780517645346911853652853978624682959833140344555022435113362676062
+7591075563360347900183625940068873872381827943795851765368024187038497412028598183964746465300474453614206176090307713158346489
+3374371123832409332000144159517441149498304308931146086397279524284139118811410468196667079250510555507523645907234786379143531
+0501327353064942573752656984727083020738199901757943687656464477159443799349546909245912076525128236088399431523118269843367482
+8613396151458427790408589367894556692924575676708650976493092298687011565830641071449135943255849354462437020422889320020232241
+9743887743932345248629409670762729564753828800124861494449000192569258881214737190612239921652995520457700328791744959299446113
+7181302058928852380763877100101757115044093853940723929209952955676211472249441292704903663335543383186649963257659728968301134
+0388255348661563721653151594456333702528830265445870529546222473972548233646402200780627751622560467191291529956825231887562559
+3526669851709736895997935055319638614407522325558293993145073133898821442020970359820377176459127571138998803488194418913023474
+8960318055715147737928173496291103297340011637615159200331936657806625012838282253984371770704650788787874077528191805071976481
+7124181681951361717176138891836878456339953961111533220751215226320942283255447821785246102801554680118941275936544271258524058
+6005709566240667298294089625210827175355499791073268532752944587487068732200218887976443970173147332812756704491687536620579417
+8523733324824779870890616722944885692254782796148238417811553337420218355790067774624307813310722411932853894530043351212104621
+4208314480849782328920489549263981924145677154566910149000272410262683233827903445768177081248117495913152923052663893776265183
+9942787773857699223811513925994334863462094677096830079955240744467436994912827703793978101340756041298804409547081408298801222
+9436460738640015479585458718857778968516432654013043215917075749663128588920464616671554576564466134592276012302780087016944245
+5682263919237157166619832653999221365676490237394196490562353201595416072759662040168607378605240879904649331264075658653944374
+3188760460625654041085468641256306887215807672289682883500357801180231951265973876967365453175824452139544361480252271534860563
+3489612971636788170285039991175495323686795856259626029428439316305263410995491370010061781397716962628385590075791887118786041
+5311327330508694662530309261695611418858308192623059112240071130884198746415297821301302430358551661316850076909001762997643991
+7081644935973288072050639441580584025029531691351232277986672643518925684337072256344249262810387549624475090299911463668556533
+2269997305729536278296569991307939885225827949212711278683260974334694618965859001446604029046584493463719653785353337281283459
+5669018591396191702482439366148219818778884802332484502882028894694251543216632761518648364549018220678109701293026473478656784
+5216611642715035439533559692613121139357309471021194983124318134640525984115565217254793009252347891534891058775512107043759248
+2075136627102497321632846769129196363043810766007725332614332304423370092169449259610020916402169233919813196199842388493441962
+5246508710864902175515674209765293421695856922741891032048768583212886538286815573096956696932708558353574597425799726517739782
+8036312671737074585001040104552777443725646270711497123342871845885341214930320018750607319709014145767035316932229927380726251
+0928548556204438876091471205246192546298228533150898999146677973522875037893164503792472130409496157160476844265385841682474739
+9233703771903675834839283547585483443926383504808637869079921199402511859863654798938168359018632590649252624952570683979540091
+1817221547279336881324191918747916105439761395909101897519754743532665651720607836479601826466707285601138161807075561528644357
+6507813758533570073431536118758351858756886547831285242021547001802317103965340085013359438004591048652288218222633904693766526
+5939230267672950104631374960137514687520839197558900123956846637455545802654473302741665702939840951606373658402834814254928601
+8899091999774572904211301414279903590789989799671058329810205159495566404297154849221520843334449344645035156970528552300030222
+6795649886498390391442973828383660673784035290138239807079635557460618362207456840361649348840778636144683493328779008559160150
+2312967328418841937893181097506584921132253955130661944022425054340098558673444397656011485902801524597729549862183491017801616
+8364392130149044788968141245875416756772094094121947877022476352773253705820364822300001844264751712000950605882778006252697459
+3173455702957684349309232875767407323242741753471239292204928826580888927330167241766284958168551480352850879501139241966892452
+3677753858072439789438100033278254013052115660199724677408997086225534466921024361672151595117485386004966423349406051295735713
+1033555069901179500855772626876468463729168610634688507726870943003645664213844575844814874933857419440136881531279514876328051
+6902431911053955232595350941009434993084829394137562877137241909400659809326832785642273291709998822359902244140526746390924526
+3598394230231172238038637497155035177663453584383356974229908339909881383831792443286626244348781344679035766390554002582686748
+1986522033280153369322100953745103819643767567342601672718065640720320991063977205827436045236651592119137181084201370425284749
+6005671239600468501156161076186950720461257574394357624099400895752471978287422522141370855745760936595412914180235254380961690
+1248432656688783102677099988123915947205672369413239452092262942922895352363751338938332396260328925306803441684111264080959934
+7043361968005295354938534781857472787124249512274641194624952254981027355960086055922235901916884500390183949326239914435749876
+5900769760705257904732141569222453308536443186947518812790214535222294555869866712002026766787105689583023017833746154510155688
+5602689240796761919744677404697558271913792067417789140292202440216539736230658588620970781000844620550456371994946471279052637
+6983815257060123566373254198705908764725007305820906210985164414734561111049679088421536404461082246253221142258100082860407483
+9787291977224975917546280204714841440857941451156318425600052380180319358748436390813045531423344721155836168161085909646309385
+4242317405737007113338681399774018133792533519976132559943781717607228562711266632582303687475696334211416518106220430942562440
+8001103370755032373531777436355301854609759653124445242732075706459884158212645376386153155459030396899392086527430085304137547
+7061352207839212087427452963168038388774060848015551117972221521512460122751953993512403134647980990954916284061921026824432536
+2639034110356917513777636397443311536328136804898636889890450733741495575783711662670202058347655591164148410498512181752116112
+8649347704311634713230582416874077536749261618798919119607870454970552954421518115988625118329175121493449500857931770229652333
+7998158841528743978260913418602919615786831528127648656825638874370061930628233997562266898051264651939263641927874506380487439
+1169319905978231587648398211672101766334393172127691275996797499245406750863796639040056909542250284633880406494091612313210866
+0317572128063301907416088057966656497607301508200217804677889135103287897506118599601843251561058377858126583470533794642274814
+4690147674695890988264540020570125563698789420115878750835681272646540842126992805764557197985389253255527910197264650144295636
+5798557941192958990661384529989091262630978788566879170732007097819131006336590152363030155153413704404260928053167322809868601
+6850987001199817141644762090308087270676753863496477045191783385382914059759989907264265980509298271071343239640773196627310409
+4389027546704283892663222266104915372633460042956234973983464977451929104395584092104280081159181521725125037452942372440981206
+6675905477554320026243055974304148345728455542853879050278442548087322107774875373656985055242105650999387599625064478196226162
+5421451962648003632206646262643905337837657920982111146977004270602922886008501562566012949545116457517171981566495094457953170
+2653749527617823956383177123455781619052217065408026747322738616321944929384445431993242259268884094539560852964142946672208945
+8593461023191475746268918563613277494098559522521079968069246435865433845367704112809898386514701303501214965468624316127309978
+1864190494247307693037266993358200097794635502447995520938928657994547718890764619887745240985736437934807473704761456024575292
+4959121097171972205063831718099245216438006228886790229146916547085014590026042332430672777678300137100806650898573540666242384
+3655898393459642632004541036291612193425851747783279795401104056847304510228417238922574433467131806129145867390315264166063875
+3665579208506648402815517926487551967245716952452342336509872884242496327353828450388024010049265610889985970803926589219237453
+1676400095916770050334175293677803863116549153471866784271105726012628596876429530293900006500470621643237024986843048814960581
+6303887230138382981362522022235864197895867379102358980372057655831897690287262572451017096062107356032913949946624176978299116
+5005151176823509060156202781958197462286719252108370751542425598689093613819219880986961622340717811406826396835254749852492414
+9810879199072089316354376552239141698257935918222963398002559226752773027118660428719265494441568442234264661966547139854597318
+7873099218250455002270603753696336287379126088262705830929170584620542532170428705348694262962278699570554235741942919271113853
+0853097378201921331418681617335834926523454159799372408812168044016229123296540289846574743942294543985242874224122532498334672
+1490594866688679908867416614545427520723745911612132408696699789261886952468259502210832466240663473598353736119026236378375966
+7870513434223037902717553793135590258545562641705185546860782749440609431080399391577848963291799745623426666134231053217546405
+9446201870461219368892707181895875357863356844636097852807754420432074309846001997057609966109454410826649254380546761753175861
+2761057480832813584246237846523502525922933474798627724801784019360724008460215340269094831023982649184534291701279975122991786
+6747259709148196213568727070749193520741364779274424639307959421349714799461578583982498969579857164144199424813392167578660320
+2903178417498559526330742642780679790900780361831699904848420604973586382034364851787093357442413598696765925470890327590522104
+1850819839601928427102795504066478105300817488452603819717168073205087377109510653761519361878295067555599575161123548496116519
+4527800014440544203257680309603709183834604758224679743597378438522340853371773245388147497516647805604078269186299047096706230
+6498133304861002880698895980139890714606455707071690798907848409609045542981039802321508092873754941535671659985239738644320953
+5988405032666743320254142929561597654494413403431947291535930103688912359712380841156852022207805099821357330225186728532082090
+5547768444839618341918220237864475011631317876613320699268333350020360283617553420136149953194413589978795210753934389762807735
+1597329107893662665482951708145282526843200385584016605115945831916977370397498490572333755725067314085934032787782477551454989
+8425608912417288932359069001529317862434139520899814966998471303722622773872512411876898983545914085663888123444680470167948505
+0434379133165396213883414761877309648582182115178764180968488658223225128338783723464562383576437566308911246233632408447704048
+9663996367177301008227471941256368607999821009483324708241288407336982656214907935931597532047696000543001055538357367423684843
+1080054249718909513852149584485289714580193379500564799748250805755830508642143351393106365614646908548224506838553676335276275
+3599779694595660288226660287150289204263669082115248096828431008225170485272045909181946378454893228880239576553739907190878426
+5885850036699891408378122906193395367309415591691241926759692588330412581784093438940668271882079466692153184239937668982303474
+7878175454828248795271539884473981581982185106585811627218428403581816331240364769920118073711196193240357920319448764087086718
+9383157433735677366088538314691739001878394272868474296524756761536638899101995873845026009993980779305151574599223381548532836
+3668859832227797331952981131294963911962283005597571432352599223356213488863688452877543275627906341710804574808946808990599277
+4561238331796792049632393877616772107198692076748218412457533127281687506143050581347703755397549089646358464889763941628738646
+4287040673613995225940479030356811166110299081667864088662964809883579567473005653984288637714354335572597312336813053771357145
+7067167172790181728147512916597493867072803164173683458648511730308061884633961295638170464699169569357249648229427546009552241
+2411562579887913980455816507682929933659712945876292627871263596090842188654178242939374681016381916432972311121058175582055725
+4171582020877122298082911042822107332503076877376941726903575210668249614607891518640837866322224789915987615341840992350582413
+4400620040237405249285698955673350511161843009038833792839643496604322064832266848854377214512824709405806535993728236489108631
+0795420398459113177519012283723869747981824916722015034363766243369266801152099213940570568038081676315926730528271844090048984
+8736235449371678977947912073661875499227319547901313273871106645387069884378420956151320072268281471236296252518071417869812398
+7190598905022008877003332225740349664805580192380729307470319849086922459614014566654582713365646665851557294353631593510036953
+6381552204220558217529826167930690334372579521383903206328505035888174852614555542283456959315756641772011982607288085297853686
+1349874783384878827773365548625629981523061054390679273761674753812182403462337719746346989770142792526923785272095298042279054
+8890444037528702976987014556298735324481383261103576223990679497009263015064472090831542516594399577027449370238294863246623636
+0336415324118608522678012840335823229090847361254516690870558705257294993006716462941193893800422308988102399798523789694443112
+1923359529945753787122624465725573807149022119989195390997561541611804328914617110055244794800371476974622186846094996027068986
+6556505900937451676724626863029277508817962303859724405355623034880805936586542708527460464895044273023827975806326940478307069
+8592969583414428893231495897818982129258755657382413367672348099201190652878055544751096757376276397486791497622706985221853529
+2908214067134856191896613437551307015999440525676444599333628882928075642102806483213033250837448355509306721853006604031173677
+5140214739575524129341946985893116412008106149871779041808900801409064849278864166852383463573647719274024968463791254976359299
+8847571119606652336355242986018768524604507411735194803338041421026584303361841828532589747052208612636774062068296366532983021
+8655354613872561646045351810915955927958378666435016019460717328781560793954138282423423334855186987151419088975164710160358441
+0049260799204162100696414303845623303274803491195157588921793903647526766706979672202295037308810197036167390246126788340972486
+6425819895447745350399433314412535917516434906996482513931003678441923085763619185652238830813722611071936854791527455947241273
+1522067822697883751451720158852174772439898925807262503934468921130385503850561421474472046621939053613032754307326343494446468
+0373529669975958588899685583408106767873002561071952257411549791159364132364256139331134266337194556486549929770686277721381623
+8699593258141567800940600698126100601323395696274203924322395263563919165964829715731584976772134953809087705318959395613991572
+4912970610760196588068419702343479920035578132234944550622679160245214714573304402887577273891607583288099465093463035431694610
+3905758432785910691737893861264914959634002377051354781210095863851654985098474884630562136246052330525659496807184083910344772
+6004796506916845030772132724200525430268203485146341239363234592583508467825890468047631822102162429469995405739029446103026786
+2936254882880449606977442748506803270167246097479977977827447584435796513203817330397221813580364844509174311882193765156654656
+6587840516915974691152625347076034414185867253449830309514472874859872212804040804281552578684775759016088925401886242253588410
+2136162082678649695650433358835719979490577896244051036608023014229544782516370023231616157535453095718156293168346470255374077
+7531511647981041419067438947595659704304601529630424537788677553031920743289991068705064547597248153946867352942473723492529159
+0056165493810107660174271077633956520600765977621759777545425851195592595759244720831020706108951012298629188421930844092200174
+6642191140454110070088900972029229475358599582028206307088525106506003848087788102905904900131739063517620939825620312143365317
+0312737363283798477941966380713988316123472457978241774897278441026567305606285826664686434652740990763564567342068867452842418
+0562084816143782025599524978888894444210155619376771675521151554796594041637061218094181094152665322539245369886205219847245940
+0029405789079825038952711651290857359659229927344229997950428696846444420150303484487905236128836752670607196713086924265912777
+9562937968844743614454574043893713056224816312429825464738549426759328345347674841205841958347360767579803402491577142236137115
+0533906692397009484027899629862953135204910641799594877569760336943034406380230261140675352675702660262675371335224685084951739
+1782949915965578201764231201307179274400901440982114344774078855036237671988151622145580473895458193522528339933303018706591388
+2624100076711766326191346479084275280944607050965314374143191066314104835834695035041295363869510686680641979042639548470149337
+7092183008459177550878010123635992307868170928762105253223870251579666192277376903965022436031647547645865700232025464698571152
+3958091554628717576397311569044621708700856680671753736603162545139430701751294444844592994780440200375396353670083705904818899
+1158314027781793782715830446196630725174972102720930236759032571130842037840584037988906905557214975416804249578167992887315936
+9206031432141826113994005343808438088835006886050009647865275969654889753018433197685269199002634601456210696285807629459472336
+4978328489062061200804108082671938204870858983057488740461332416429168822452529945581949038775475758752323372301506063733079805
+7738055653647518591404108351211994677622659177154884456890162864455435902069510745121823508583748140331565330826498449431014143
+0674653178829590152076432119041481195951363053106794226287750227106636545367810520707295978843237959311321898828560534345440055
+8038620990007430479290370430002421271720574168054663731040351369363896772189503927548376910184417619479114290519008175905383545
+7118330213438952390733597389988833345665275766596109498963112726494459652684601428898616858980054673653547857404417055361966561
+1587037091185968630608431240360245295772438686943763646925036642543820946055469856983284464996007864493360253900748905383563580
+8745104358873817076497065734218673552778861792932465886098953358042048623712145278501699290745480384052380874247143800362538370
+6251997645750683187872814541336341689788360883547457593458471177846675162375769376759272289262293759496680413378317765946726569
+9307054144320271279835934039640502070988256340708987512314880763049398513262419383032058404111149286657762258132166819869740391
+6208679111601546062938461491996426928719837110414091479969117767614499297075986816870114797028327349760763930021316392342344670
+6195338739848107103644806413130142942032473433624064988762100818410644021199176248704887358790343589713845228788844183335779186
+1206612776301905227273380391656909985775786692526546380296204581461396277505352115889617471623174433491331255641939009226704644
+2188221413330256108594133828534885890151834345250541767462459786862391647167810214086311680548340646481922395107065550293841987
+0422053725280997492804556037165046616311376881740818579026242231815216233417949738101116086586716392810175144442461269235250030
+1446402688506317648015492449267953446562377233978895904366659114613140191253374875252211719488638375761957759777329556920444079
+4742234209552120961058674900214350131325585573620862943651827639544267432934381233345762116672659741592229252195548093031985971
+2686838533752676886446680927399440863720061868372851834815109578907201299828776117754439315722227995606329153759209194448678185
+3375830903591078788002755338696975595441586005976260188707036346541857769978992173498220429575524475532930877665817876092460756
+9351987353933462923395374235495972847763917223789357531623204700947268441087397398182190787387926517802157283116535834305980686
+9492332135897364643664989358260446062172464533880475533980243165095186005367740562491795933632109829107385087893207785894397713
+6433768862702582156901779207532027093153001807004150434114821705300991777142257598550961217676112326241485864463713890885328141
+4370423630135664116118217486548726531069411489498186055038679029605744527511210064431632487827249384739496221986798075711280160
+4424010886610887880437216748921409021429656729228727372446155715321241952848523185619209556774687672654909818027324033748491821
+5647085557243826965464774431484515106691575517669395491646712200606275072075247550415886971532904779039992053369051837694948246
+4648536696394853995288135284563546131345084094639405448329957974626886591260968153163248670156108903690012016896947562864068947
+9335817025706673645248672808655206936988229988506868855512246059364735571373658692183981236508753893624162179393300884572562525
+8454550045708811850843967602772364889207411447386933113146884803720821905371224276398839301167373376393299604166530531671536817
+9469613971479940226446065344175803391558840869442680476409858979317446638566865770776832153252927434674599753345041690804354354
+6652209314699751202444785726308628207785053079762876873537555813669271605409315256570040001991644970781331622466129179499281915
+1961444894849498696928429106294385830964606511500699941607840002024216695044414216800293243595307021832292431154543081449089313
+1962091622249577961316459709116638715944104552499484128514903058588880092425282180366103208523455810521574844650965568635887113
+4368421159409460609897114428104781398719260897374658539676968461604386468189383954460163078825080336107872167576349496495408685
+9649536539795842583228826048018046721092374785553431643665884938389496673231436870435149786802809160883735413992798925929876704
+5235671264707293479931013726706891341489539237837731840177933783526465474894432047982015526419973235553573918270319559547403086
+4039735888376366609018757028506161014783678583356813250677778613982578318008203758267120384291005999279443777316382864592311739
+1217739163779382661260606469702245656794710548611797988738048091846590739807732824364552075368990683393959928284317293320069867
+4916615035875154768600732328677330949063202236875210951540534956404960395079564144372822026855682749788976197007630147709880516
+6877745432713411450666647170018266444463633969867263093231179811756276204043142296040101066040921365338143870829243201412736978
+5181332217031028793650384590762724542630876907198977592730043310368021901782721530053394250577461993296684728562642042745578204
+8059743569954838104598948856222744875810352375978155248926213114786009876969666524615446586588275065587752809296977777941299366
+4960623850950107986976011274245247425368704858396317272530283837294761704449561833295704741998045363670811422098828233894939307
+3391941685834457637274247913999521308752675840541536848418544996656831007389255133631777457133457716285009673478699826403200309
+4519130151833287959851246691876615538787874185186936205145712978930546123861640155395430711723899715676633532061887829247109590
+1676546877970973940392277995447472865522499015178996256227821980732651914936762181112328377073844485649563827098289006561421904
+4935465846415256812459944886042442740776629289289624483798607070666905637221701286036356829140962976615020452048228461943046845
+5324252244416512745242538847575585469682159371913734134263569496276780441518422322618507872746192259540742513974372774167973337
+4061947105362693262133270759088934938816594942342421443896871674922874493598103930292152723174036554995062078161445343075609331
+2764956618470182052214734830103729160245043907968784028181813618886443201986039333396356809943270121754709713915646568740151206
+3370863211220134665256513439944166456784396566762502427753466744044215577692010267595936563128872570057590311781066772952724628
+1434093271982951335221748052776429614044261679575670437872151960576974124250079774604982905427771724749469647670243244251475834
+1955236107353798168181042526280355939682930522521300010742221556820749544725933966041624888393993154502962490618839145486969576
+6290416028546495661266540757687391083370341491184427521635724821327522535027514382783824919995740288516481937621675853899158115
+1271233716574270260984632585239413670925887252984501086126979534236923438493445631129740540692858583194337904806381657298903618
+3300535021488010384891010505876121956740827701335944021678777354223576529240510607458801670448052514469687591418109583216371899
+3485417441989301906542262637698405742722722240100485896839477201597733807155335120248775000837222824525999750714790729423644465
+3411348746879651113262757268624543364109755847832677598538228869268434533167862688737780726486206863057323257234642767012961381
+2165814758833781311422742619981746792464126525574786109619341095871177233773859607236931880493129178559812250332066463408514532
+7726034975123054527871123751165334996022991283473243555448093241244802428165706217812562663617393968824053366244173854470750856
+6095264928940472527983481330401867205683258753243162756860090551147348417813873221392674935402798968661528287131244490650915944
+4846998428123345187768488062434480479219313046695253889842680691405315693254169660178067961065703759896641710892485894972873800
+1685615608144031413476448920807056587474093195656920132969415782126007882727463216577625078022336565533036012495150175153154793
+3655761747568001155088833871531145294046756206587264284578974630056937095900549928662096625015556765632408742933996850251895951
+0111954704076325038375601656210245491836721039674987643056715722213989286056097567862156918863302428121309646750177612394901330
+8415584072851574023474900634488379027144152280913594573298990276864512420566377677406310761330579752357658832083046689763512425
+5360991991088493887837058948075647761797269956784924198250160336333432026534756149206974204145691725795668303825556473066440146
+6308534942697410882776557732300657800112150355078878291669302663342797528117730903433654703116183867380240849386640798032108726
+1472159005438778436757327262797064431019220263757862409221343714482887707767271424863105342534371712556647665588514796238299461
+7911386503568215258552458522450938485043355503569972624134133652411157539448177529209200030556438822689089819514432813580599189
+2365679543813190286281972504483805742897733392239676734466218958339246807222637911353738424980809257547217933600526785327528737
+8206666715147505843269892459203855284050942439891047557154055608815102510800979065603928242478158845237310517156379667384978425
+8564365639950704666389094627317673103441553979461958229265682055180735168285879029143428791049454750378104825426147990982959332
+4829102499976584107337249497306375535937865662615510579219221293219668812136853030161705938471830225621587949094705819774556069
+5123783679768692703321434015951275136482214434898378095577232958805557078721200098045359198446613744587543829867662788092598136
+6929950567989350660377223378484336709625123004431484409297585830087971734242391343301362221372782329683381841402343240854937627
+3027430314645534840941417243615965839776590781088050407903488696621208213787375420065466391992905505392720776395628578270203968
+5561557545896908531566696290176040220677116087315281719465429326728445015278079287297460019260738872427151255654689514071849986
+1828538379287013993210377215462458395873947138158932974395044262987261065763556796656318930386507150893214229366028840942649836
+2063121041445493166725834460800448260568700963104181570946402318291105228818528098805135391601388005156357001178185451101272800
+3370800872347836800855502143109732296211615709327616533336180819117537969874343031967516246129400847851680499950308763513532698
+2261251707986576560067694894090522658489287994163408241552992222074332750687259975120713193581210288235466997453538082950570613
+5547333609592722700682015971929817349283991994515812388316385424977175852402318951978198762120074865379726347089860459367729850
+0402544338102912384265553136946539662518389179790301064640333604344279296879018653656722109731114774692564467347146643170192535
+8993673525857276993127971955065805434826324155448624528360859774191561165506877746667502530039089420897916681025323026574636061
+3901599392791219781553830625484740571991825540511807354859441733493239937466053566374517381465227962291796387571020809725382544
+7574422026948740113868646418886560822423385797395522913481336942061412395775696211559412859927044430059903817069457531153931671
+3666927872751409403909634814246127285265889024700225210198280286825210509773750861772507551910169158603017385059974490577083038
+6432266277247351230987806521470687675699096976848067098507903096237956371518053276015484587153777797643144785970196659271124201
+8805175031746648720776866745620376390338985825396413633102505797368825729966186841638401277578013322523402620704692665720430906
+8623786671348700175861755678175427019767971457395145977447813890266721740858466375677681653108760786751356531141090929913781526
+3195648380237469630693855838585465684458789117617495694729011729035913248141836338293691788762707190185659273515849140203833275
+0597402941284234251455344083137079916499435796408338558567042346638713911874856299057564768580158647502818908352952487514100356
+0970868650564875484386825809898953941148685658470222784359891344183429634142985332602653810091182805015332286021467238333362385
+4744217325804259157671625823323830396696824326946849733799160663706608011805733632306227156863544912264884279245494044730337851
+0084125575216079610672037870038502647338343776533232876650551512543864312081271558094734273891229896844012952524148474639077490
+3953838752044271045872553760612072547541462596253868540540395181295139378941954659771594736894686221229277026890071243182491089
+1570455075037097901528554345355410026197839647129067342374536771901052967778273115724862482455356615889491970844930623438114267
+1113425143150646440502818701009316634243943336310155606852136330886016200376990719743484314150050963993583980070237708157561869
+2850497678307680310432965409960545878246397108725852340253836659713228648432015357639072103145170515437738478376685162370275788
+3326664187179079200022042294919767104163644624649594061308737509813605056856101998334843842071022724849290393928923994480353310
+5498899160503467457596940573659595416916940383633806231810327042150722695852999362605105557507669885448657908253818192962915295
+7340742801283937313388827545354690848045358633204829321755059875964474925792234042792682433581007092726558257928146358188938017
+3788737611929951605093399738060446796551970972956586328702617346062935531918635358396384018139217900704517134300111877098173771
+6556088236400468643295262663772005261144129747959817416429151644418457406109514416151746327186627985567345268051259611187659664
+9265455725916581745797982714801820234080260053210177213938914050671185571980281286595729366143889579286214314682943150406601728
+0316466611292764222191535471075816173597528297677167091929792260801201488249926367457821134968651224754973624583045814966898991
+7240870813182642979734405654373311183972717838426383954790596720674570866884378092938010438980361304392635321123093916926377699
+1098769261784660364965755629864526449156402293650490776352458745073647855811975287018649518441512140869999035534937655163547223
+7318570673563180482204840468935262794048795191854962451038993504158655689641517360974735911839513301305317748540458018312631163
+0444738341332226086089060414609016104084271113844087095538006211914540457624942221411569773470678982159365460154412977671269730
+7214452687225977763650799051005862709711542484791447215218763058978813997928801482608042879518784727437915756166238817248827266
+6180378877242192988083619217841832407955378736448569454941330027911152317402955093457538120111385592095583433817050629741079340
+5629107620334905196700840557766414405147144002648539402508824797133924214385476958587576623195377053042403089302692454844253984
+3318554062977863170044352262420619308431178765567333623647941692615442475752129139395428889369180754179899164103774056228855177
+1724684496632837895268448877487345538070342201067523252247951553639414362390924781555578381060846820725528271757795755177666280
+3668536899528123873671104403554809934477255454000919778770432207141030247047304569687086172422809626838419879927821205317757198
+4281376208790055629568334266876725167967493231201019877577819781783383068774238210201096426961674885308966481435486534817275888
+7577712459257967273487604669410934219901389126865013214764147583539515778668315529487762810385482472159142915583111160208903283
+2092476036780853093515438486821087167147843243339127524062892009959789660882873649427006559335981769826686296878365166850602867
+3343172251567689761041900651298644580155321777412234282871319882978374041565615637937824367712999898962026386244164131814440583
+2523107617535787966332348997625949033914601433430397210697903069041012073594953603672415272693571514416319482962732360550203007
+2354311337820780136418582226046355285087018441007811818178174630131348892691010862349686382003869512529793089372921566890105315
+1170999065500729991421364651545352790769082161371433138736113416719659099975772914182032395782369105406892855739430280792570755
+1474708015575641879072739292610329996968899496702225715923818519908679748009454327877467225863186123383312506444593821059541320
+2519230317068471671990663024614062738285094805102560284217361596105049865919692357067522503590280759438003713619649669926160819
+8477593117311192072667283113407927363527106554972169624278711433088640030184820529565097341512033077210672824164404101920707697
+5928625658638382607550288328629457639763193426953494665267869864411489469568811023649446369996193687172148618677078694284120641
+1646459774821145583534736023501469753322215654392655710781868598002276354678420510784519315703507997622744075405271188494799548
+5604976454282399594837769165955324714117059445288436250408738807427315530171196984735484375626981702836635871509821590209332491
+1535805646302302016352504827863133089568000814854822798689081283591430708834238105002833054643250911507660006657799194089124227
+5554971708100609197716368094861383459498089313293558900360605415466184945588159656825590482066432370186681671169454435798038380
+3849073431364569441656271420494005561747519609440641325324675204133825604638188550112139476449622000662627992498117594394096623
+4191048491581987672722516757004987334900086209495744999112552193520096404679809481469054957100693375905822779214877756331765654
+3967826927260531495518865955487463010124395050606347758705435971911583515293152693887305102817702226005465633434328368776552721
+0431488077940753541035965504802229919911746684489825460131664577839381215244988219702491643455403072485117531612606199932108314
+9410075360076281631174487118204030545727872004911310355915647215932318325233997786962419782803117783722823043531791703707719546
+9979899286512850189031098302495325193753351855488331350658951722090011555997930787556662797780665452620638874492236108755984250
+0652520709290586245394513350104966676213533639227604453023649959625928591554435452582297988094318689720723128469217871904823318
+5154138924950867908591044177967760020371009497593629645137446770819235001454567589699623753759581616298742234368099793781827967
+3473470305718567484348272233839660441345062709145235638650446308235096448960992127705010353860654270452060145032963280540290644
+0926811026419214969150491345419181845874142492157134486078145329290631845342202476471135442659122079092431512088292118497802805
+9354612782399796245605885928858715130206027789349453872862552261402417530015360315458931199778666063128483794096976323329377872
+9050549362931470711847062862659110650055274307045585443522892077774880073956334195774718662309192081402741882514069042809280212
+3388599022582995822369209018970901943500870352576118339149315315976479926966165136544818295802570738444044829469770910136539354
+6564372944547448237407512632251508379320872549342100765184348768929229061655816110427490635344170087149155652249787176557737086
+9304726910793034348084164624446844756267779275838929154374342302538079381563499255177774157465080422281305646532991405754916981
+5079495135477953063596578815549589683659295982170939553637877137130071575921564130005951724009912627770427858856970687414583660
+6190459320672966822341653503087470382689354052580606552329874275327388332913948910878502521194902477705810238260537165258752153
+1741863988657791139389205030367955495311579034712194218460880036525975053623461402320730996642095747448443229185546281279794016
+4885628580837209961221029576497258511104739050257941549091025711288015307691459924906488083252587010968968824529177652581775801
+0763397108119317156892696282929270919177456927168774057189218655020688126030914415663313590555442617356391166888501048989509961
+5152773773826793584772678203560374056030587370542989568481592013810907285435722199937156448541686535030998055918516459522290076
+1305239048493423602262076973364789510528152271858803400583562336066393859447415629511735131940444974630579121650398527184965704
+6991327733592729480669828930382613428226140528036104065114673331048967012900401318314500711300298883332334369070527930012816139
+3452427216705740390119289172699570798671134046758624232397496740015824965414235594660630239994200610360038450127723765597890208
+5175730522105055786800808015853823181610779386663930878893825884556056314059074930365519187914921351319328315180621551748091601
+5714910102916106131414571159732353736678835156815504392107562506650484480968671954066774178137781734638792008562430877641109527
+5369362810620715036409904025968522864824364325482506902964133711312038294053559282742499233287959154156854383883148516152426070
+0230923585180985083743915234845529953134912525464096240500757424789301872897111680226897303301395426146920411464973830228585960
+2828878183082532630135919486366960583430058092282156338048743819662184574743797715878229822611358535700802659064501248149009579
+8877808967697355352896283886616902601338873980280498803907441157295597934158728665206373488691687917104704283343745205639622462
+3315755549989540644308207351384163575736340700335343877848915517455194885659684732058284726257857232622941934453881121004726782
+3002928241602670019659934407449689182082678896433504272332382719662522606641231869982252041696766531509399818750721950486163498
+7932472000788041651204426873094409270765907861252426634561030946897515784875744395710037381070458145660220907030271894709835605
+0606375828713960156150750275120802286593052131450659403286977242629895839703700510410871815684746087294738637398861554742127265
+0927164114710800842124744207418934599056137681039495980981311410777428870205405129624149605463522859752503128770836084491952252
+2931015631747347657009129018143774038849625686108045440606651923845534431071983109500879593401459457270781303275371634919948465
+0387570468949867854454498257661547651091256802128345749601432500529628510635061338338862610989893855279059054348321900538486115
+8602609964344200881430293688135456245345432239342905412584133371544661893209862399991442865006457440325878578391699643241518820
+0476780634258919055579958686158323045730786320160920071950074973087521728400869220442510810405620758553467843454120670874658001
+4611389884432116865691971525430161735365815156176932740053507703667082841676421694566703484160697073157865364859324160407900243
+7848340394578239725877088114075619051748487906575872632940285638137907126466280399912812673908953355586620975122613901023009092
+9989300098497815617534003740634757576144040056489564419015441642507944260710401355749819839918602861170379515547533183230261689
+2978159531889967729748526061427217809996789425967856884930963977509421860822261926488518659963801830737928324899351448743506636
+7739373703546853709971163541284486539624807396328266253157406157316793793115843617866707276779926556010088380028395990807722966
+5262595518780890084621315703653759393744008415536932695809891522083236025326969192829600448033930003810949789949558452866508165
+6709958307107045609075677759152351429582355756238261042407300818561928024091909129169346687529817528488405441096301840942497835
+7939846806218683995681953891663100594898796616302246789629809345268814966245162531052163166438108697094692065750286916247302592
+6376737923232528630569024819762238692074089057479592609265302063789788269041103846131589957468529143458603367428237467202691677
+1164704135075482622437354706246898083995113224930951841406301203169957259318901636559771075096487643893444519082342460614778341
+7571486167299822050740707597065176588093664070641995447134130614103674235649546121137008292829783010870775335672457433796269838
+0786000364088666248224822824647357946129181563136369891309362023665749511277214956791187825832905762312557124459238096857752088
+0224756578418586950260891776975306306690545499717256072289157907934175802791666439540405671709869057148319796761025632922961188
+4317800666800783644393485986576298736917563650897164304571720738720115271226750820847348337143207594067034889090129746637573061
+4992035733871695023603260755794332051946719932307664611429871720394241080075351265170984927835215008078524349098428854934511014
+7791275210894880460866040577708447085440157107534047266197077167838868317086743808903866856598023308194718747427381845326367182
+9440053603247145332820937897067937394376812799936768352012215925676355028026697201409962671443788824047418146714929473243964178
+4694097429621088759426437344831944205038778311615485599880533035443309753228841592516038076111818420993913946554412796041546011
+0591550477943256220239415601324460355602248522402154416815822080226505160015237485088369250676462054718340071691237191715854643
+3754782628510988470286589139121850755775569961153502324797466418949716647077195388880488321524207926209705534645689175931304390
+4293579894293631845176289384983754244067774813502510037057302019611329180738850594681778906215406264239719011424001198377631320
+9407877792875650325539404181214900230679005444970369243950847777718535539213759142124477926938032002586130641694624396314012506
+2378295522687601357905408069624354294555654221781438340067666919648970200524898545019520189688682193849864964964428853699551465
+7923565501350073769051751525297874085786148453411032926127268603914648170142127584914619282268063761170983684501064629044484389
+9840829700300902841805899697228329095218443610475399628627070805326825976451593789370050027841655892248443960659103428515769018
+7131899325280315528312838930296738263099442057104969325259438333829573217299432626262718217616786664813337230788868035555543551
+1613365891642882106953566519548821305418260262459032678151796367238313756913498686906585565640299870573937524634136703149075431
+9289249177275626622021358990349141206245802827466686634188302681734388914438573274476670571970132658340810522019108097685976679
+1999547679043388007539431538024419806104005321474063902499212939182657952169737390109212206767202350076020372910741798343053860
+0796380798378956338026387089364560910203624767639137927998294096484424294854533260048523991232484163916572752125119143647479084
+3312139471300109845789877486922941094495320192955690413961709171195278169767812527830359720778178037462244636938901054061989359
+6446495700380140348116004473224522745585963020017740642418321329101387653563805874445580561212083040164396327873544239022001568
+8221316129071405562026280838341093594207054207388991782744751735089766826502781865742057843922709134454840546015717044077633360
+8884079984504038495190808918953678045353356097676798230492279289061735280457857280913457619377057884683523850527395740839623992
+7553178237304616708890828475106185796221210507905405468874982714460646413397054645663825587287675092464040250385703334315092608
+4773590965589763472535194103574470410955536365729704648777555516672917330870335268784268577673152078292448804242825553568245947
+6215819528050303270969774851839361036143312160025453398613079612450766506304878967542263517886001609950018287965333798559597461
+2170641880151969257726247627112079520687196427192459411452224132231427774555020194976266757454256306589376845325708061001674166
+0808706168526831621497924679232450195651965661724083005213398910330404632324992737223126731122399064939390308377239660504899222
+3551818900906904056676616710573047283299775444456072812898768689067250392820375890588789819477340760813736549269624861064751893
+0906163675906901070688176210778473069828249578452605511950224714556564390138087101450788624170738723043479291100038259738176381
+8078282667536765535434830984808011662048300628237758542292327990288591220497965448597597894673766538440553768610799486540893085
+4239348796188542060619155351521608241401936444825596707153268722768490308653700045149495791462321531911996176024726025953987339
+4599085925561530429435581768120454911625188723603840101001827808010649207159239374191781479981311865586606666121770067310616172
+7104627786436327756821840719455701887978236563257187943017156401785911149438142292942970899875188032869983742209547431350943402
+3524068403178617373975067637980111980036408360680020858787573852832862969725456560160112278450433733839443039332972392923338691
+7361417128175114993261450629674608141894725708171510038678649037487846100911817687890240766440318417379790915067480509929873884
+4192563045095005960884279637612799513276543500165975164906153877957210268650229031342852943158004290795716146485254485943610979
+5527495850605424448537975358841328894172810067249914112763981461492106207569150714303562508512966364997576085520454249415595925
+7749567920199753428291369733514893066123672937987655345561072264405494064545300253825630928142777746597418333809686090132329222
+2347190729828800374979423249344630750463633445579902195914226451238506679798785890126552693482294276302768079721653123608475225
+0152265832264604743532240505688517479981918489770686750786602858928368893549157302414453807821089110756269039234757397043529808
+6533482130565176488100655388961819118126865617901005108218775489706817843329452026358354168685608881349897826461107138466301657
+1298673036456454794414764858082769061588499493558362877721489608505337579335664200621558841720543957496547716133300368539580407
+6422724558120550176442233652100893764139597343252110471726917934375351595018103999311490022927771281873120822851829841201522060
+8271532119297676915199374389042651216528118441258413260870365096855873207948565556782103615860771982841168346920959540519710060
+6184875439923588759440136066343058630113336838104030510817176224460276957688775424874821399346650313045479118572616668489003296
+2897490483936533080760701381789308980122333755911815060695347160990990030052801534871717538234667743972256918252210649169228903
+3655303333861985799802708736697214310308014845445976122762735834979387407451810326226050509201808567673064245381176975037733147
+9657194682720093768010430501297373816646166065617291768151706574173498067197264972548166688571305758669319121229890115185819057
+3103510865220902456203344829140970552995511866958564974902239021728149583173073409170941518663482580344763138822732758130711321
+2350688930344799523350604942490602629624759567547933020887009924743050812335493964555189623547661668513628841842940808414417517
+7886476590659571641831046458439879022628434419829165109717986460127979081642839919400368933401267954441646768446103515126565637
+1110171943300926097143589488105661141081024879644220948038639183302967863702059520939356184545779690411373217502283638534283105
+6427345179711846867068806487631152636131101160079927489950186169690439565446479010213897921064107507425078506360801250554414400
+9449471539328516576998441231176991412965843783160858329264144663894049487064693073174535162944480509103362252131259963289347661
+6448977729584408680822098278848838996541448014927561863895692613238880261580223887644439627676547583170203035028358611234118545
+5113424393568423046116537671317616837784363459294529414397028767453793820041115557136079295159075170242753593066820395440768961
+0357417280340583283641050541304196888459267811242609025317032935293813444330705702581551660482757892548218860632259447912758396
+8759325176891928932295819377731294216097307260061594553902071464538665097894582707057397147529275324299057601238957576630914051
+7741473646777114825234899359211272805439289189063644808522711602498268477174042815308766568204260129647306647359885729554656976
+9309329125552267123498982148765832181281490321112798033562587148057414223743472931562572470841497241968346307379573830843375864
+5689803719011022683494640589564528393539106647783122400405858218032186185463041208001667912281578057825422723357469418158669943
+4135592927602852287576618966571253116928765233133651892018881037343848794704599894714843595981667962009408311650894622157342917
+4255899203623494824224271003677968232634091967503097880844441755720576147137952557139636719564772738964156856519335241825543143
+3626415788714735175257556917344733999894086186508542273673131627361802049868502277018604195271807930087879067221107134172074310
+7958546281467926023449343568661101832138815620051349600621939712639392675220715111033777811540451328852498746778968470255323001
+5507407940398075053567751242109569783310327198481187906287038704370431459121242392319816826310134418784694594320070284603132253
+8500952612124145512973435903996934578404485074378319984371754538530064680891506823775364453662506914230333187130946894042814136
+0265665148790173017555028894292865406694173385138855281737615651927882128657965562089006870021634293021436977249028055567123606
+5915024874219893422458723773331806018064564044582475437209765195603359789772265483078502778595048000442697079452809908661825491
+9974005988977051807595272626225779862046223804794634926553502843630881070875123298869912614128545778960915871587536819171698115
+4134066090737503736509722416899089791584075227377094759873530554067748069082533106208531237181423743510501202120010884006504203
+2130661127717575197825945847274376219456565491166146558949366985214290031939401399735403160414646904595040915898139346351713694
+6324612167251656207707087624536097155449639896731425226748776831598133504224173609907231060039276944120772510687900080346884581
+6779168745096711200457711019042996058420593520557512225066879514823155886446534991145884583182566717602534510076749929656585763
+2645365584973687585388329644555202088022989110607367050144776537693714417352526613252012599647340542087230486009799844093446266
+3564846704113295525583758182164662009216216712683832484187612989237709031101278092921642250525269665257513687371728284688457875
+4269555170494408895577906466689197972679804550565920918614809933468304708581306933698168463484178291731316450813136298166976686
+7026547610376955852909877173580002842485362728362791349023862313373489864426541187364755041770087263084268647054320360965911322
+5647079585282992247752748756022346611926842984561046976951468976647765336240687959117772104657541464074764281634923169020133548
+6986017692163536989579104384975828200486159266813636401205178471888697579916647226641294586286142850042407781409124499578432265
+7557633520998487338874304841131912835862129914096167258884138035045133191763280844957441725806050932560746430226219247549692154
+2059549946818227720943211781526111003981250924876459433602235222747377311088585283118957625555745513105052583294040713888376552
+6312790236548842295363447664682859100743206688687480099078223631017589800121679494388116457487107923554186562511797306252062729
+9341961249268388400507893558690543848588537117611908256806356375473026278316829039260672100995233732139958201591529357001905122
+7622440629036046952745648171252074362090378664664601861125598525510174413032785951294400218362705244805632366004605852186841943
+5591402799903315324575404129541681549710964981665090508369906992078809669693743879553048600144250375936726479837822625004211533
+0078063724382242661885925388201522364426479724179540766386042648425409841158873221737967588237291116048440934261723138640261227
+7668975572438016377259095768317171394189060199749631603972553612209575383312005377253743770387375624576792404785414546299669225
+6702311775340274741303788836209727482858012234498189667215083952930215080983474097496335600683835003845218991908331419228161974
+5844861014709438146848025778890120727743982063500046236695299463240688553674143271469625051120980545361183599015488717404464199
+1417923931690244544999340897859985367002505948231379127672256195312588278402509195472407043750082438215262579893876014989408706
+0852865918577980935645894147403286685964996381094297648429648506192278067863183038777421574419694387317777907505729693297708412
+1477876485508630104652801640230580883493634454785840756974806839665717736338880683347432665781835143575902380330089255654038083
+1333574195103318490380293307280457872559202823396902837942959887393577658742570521479101307298105809134466724699237489092865507
+8231986011655928132234768712876079867027010505901813055232448036254614645338353115984374755578779894249199293331904818734171378
+5291198257745669262198453729172996916240029288161181812810389503650167962679364773038871747909175248874112616641407342566234542
+9827656930274121781454100476261391707245667711266140909114058056141317855910068833712824192869630959336254369672357008292856548
+5323877306540282063144065009953089367459505720096157841731259977506672262970125862602619551379971955654409939177527714243403057
+3533286954907536500237907021493132000340867715658050587581466366920687545465498963798769329374590369604149184427380755601882748
+2772451245387121398103687673837186367345979531432828052838695364605611707914643359500610696276887453665009271796449018655863587
+0698238146791660163022661497107232088142858713995181413650802098858185207125972232613318849001183174321522406825869523281989408
+8598554632732565974534400037249824032956321514858885348539735224820260572526802963756049116642833599682551125312131721936464816
+8777244479719589766354029439548567013317807112981262942768196141952117452742612964786718669561362298781178596889656657857438059
+5923903176580798552139931019374192553986137461354795191944498128759243022494357593594711086051327159717361960027267213667050902
+7713620888965717050672864796196500874403820011858648932283473719914877636081597753296264071668416201048071423687724652867885227
+1226026168424754948160701743250583052114587429759744035821120491264623002950973529144113414105707200986835221503669020815368719
+4301615723202468195623453039744894794833018107887889921748034816356630393443669846540007477652862272296203141137911353369865567
+3701305132741529846291547614776780687562767296077648285050793745319685122361946265802267010089656480989090754766793951985030256
+8873911333836369977427224870430320356503521006657767633627578973429639446804587551411591770027775298708856911679457385890346605
+1569544828599021231532143176442191013631066377985711192575263159095165119051577468547654466026788861257476052155683756383480477
+1570683253965182842006010673097287497172850525327662453055182206979693937570550092128731857505346441332074707878996538911947435
+7826422261424373910786428920393564290525228206911026303685173218951588837324122530045948404629473803092607834231045937648966971
+2638900097751822798368796230240210897707934867384226561665436456581464223307579261127638844885560109562036790807667670390644417
+4192581432555251427389363044896326951734847648428400345150360499669512737809145524003991223977279428592712065139442479960445332
+3942282183806384991949767715266661401310060486291440972343510267352817495541237489262806877081824812836064827724828303648923419
+9223072015234086234796090436383818568296143232241955872923081786551697504279591818923391084950971313678554302938168053766302337
+5040295146817500973605556893314901715843407186937767008367308307925199801486021624397893053770707845409279496052311813731054362
+1647014082822566848815080638989025226353949427396868720941862068805915405636344175116957293867502515550210403185422186297987101
+2299194118400856813156210708210682041625725297454205612569506042325388570654000072012600316753710747599029554756191357595113351
+9406123252615695607363852828573549803486496914881699175306276755265739836369938313041363024110056929623864023133434302918217876
+4012400092952627260881136088985623398889677549475347950880378929158923209470729028820934081657587476645444580153423943137551662
+7552074556799764537114289715930906335072549730926411552458159805302034148895295264056331531618830126090300007948842259905560480
+2034810936658458335936482208711459668407533754842615732173788255099444966005654249703291665433879743623245887203502319367176453
+2055826854912228554738248289886125490164761646368783638608966701408500405439745351176591154838568604792386814062201460103196028
+1704883259604470302949798965476058273811653448846315941108597287428362004683627667421915628743842382745845960365444382205614441
+8276093407998769926806805283999661528492618490261728950220171409852969042576745011296912080496971648424710213822281461166346433
+7954055459730823465679899905176049956104235683646988019468094197473567154076726095028250041409673376986848760985312614035795365
+3541288526820871183022785627606776202868249144458419432875958263707872906136295450220559956136362126175679096582857639739948725
+4938942457166622758688764402917253914836669353169972138509951712963418233559611193066044779423979184123891151058275415387004481
+0186693532983400032989768484986211599974215771878040648121115240600011282719832395142348174280309789242173034859607865458058836
+9693011226500711160574222437812022981161460007590617976243921827767353835606291414448435195278815539213466555449489307049996549
+9509118537609881549110785870137427018215479109414974529881125038407426313589072435487055670013225428915901526956102119247020213
+7469585110154725916486236087220807528982687428584047123899577899339622871539124688449741918490207266633825962457784296958609358
+2301098947514645707894405697878233655395086728296961354861714139621104988822145498752087551938260818588440041204929785479253335
+7195002791628422640170129886701270065601981205842819128758172220230767271007555891989535523140754390046908600193906165109046248
+2903714800754690075212414752414239844419261581404644710369810146988392192489474219249291646325601976712417376991598429990116224
+6657841194866308789835186691755481781807363317310203480516610021219245717136441915610841540149737012207330154276656421683007775
+6496393167312732418345038041143115847682160487308598451735321809667649213873941020106124895016322422646066096706495173559340273
+6190352286444996698010567042083025249630998980474746852300834243586692391358290885793710964591096599205367697354040455225748995
+3808084112830212575642888231806203048547309288414193348028410780142000603799742289999737003393558049032105240979729430950416734
+2055001806906934446231057752350125761310442613239626005937018173389749155377417284662314193484961591256165582045826903566815287
+1770910475516651085946142895420353886980271498962773028208448011256576219469415630937607816862320717646276543446021775437024856
+7317728070174544541281155663261784538153312462326658626789839195595942323601274570763560759947639040733318592217361764664122267
+5163497922629734181478583586735139172337995385407882365183581289857390438660661367597010604158349602523776584737697559311077546
+1232290524053006728473192557288773310853272463002083064021874545276391652038777534156787659533007696087737660972241935746823998
+4820797373925070252089423136204599368358477176708061478789645953897583587905165644362770501568086914083487441612509546270070041
+2710844937068669762717114936914428075765570984673461573362652998653398467217253506007120061287151708786386990808903587499291676
+1722239692416177387037629004556867021409013954231954955946248469232703827805268278720272112690685704443311442687874485358911812
+0696442461522918873003473056316397138103158503920758588244927506442635208935867088943853508413143951321019830428306333251201396
+5237490053651269730925587281174140512120043151663340911938612562084343250088788816613613533254540244890538135550921235569055235
+3652159735685467737870844804342436795620955533935479356452033442056822975104591188103222254197338188275216408256009062112739968
+7134994798879023357613115067249723046493042657115745023241318111461450746096281739377465898982050597074346498759749836646750845
+5435539953004427145646816313257688146440880667736243466005411373421754461366941715230523658976477672479751504847483760926576034
+1189232066364746161715297654667683387924489405288055983423309925216635045159783671997425077719999713937624968743960815866938439
+3458042402161473455431554634378956977066496820341904422146434258908727947177474383440746332129391825690966243498723403254667650
+8583588769346353411734495459871858141713721510897174001175951449320360912321580651780695549218819369972998610310409490019288172
+9334204527475060600189111850610268775609506754404225935699578359127242186303638934810994186504201384645847184324944047027889017
+9180203944559928543575350648779851174917364441299737433952437533215087774057147807226819191868491441590442039396662591808502513
+2164065534579878437699757090955883471447031879403082053258427608568820018565147466627486801491876503507730663614122066321703246
+1913587358432681308736116815399127159387589682764288441702400713256228014611237877207779478537639968530764623959147519370506561
+6235255735630858442517033591935698933960554844760005512206225607812740106611830794710056776637176558829867814913080368920324943
+5410646760661322485781048142156629014814968811323925705022272475371023640394527122828545405831491808608741154836760565505004928
+2033787078461763925201661733809116559798197426225447373091087213252755823492809148960852025727421510534412088471340160144342242
+4053406317407103820908867515275579307068390637321468991384194322089645112923727349244540751951979469134053290718220589958599078
+3285805403257089050405641613610899794397383496324785340103859171172319440876039603408630922409574370487373867533449326075083340
+2983815868763252323303322070522064853273357744420576029234853609842229699640881843769482230526051119476446187157115583149336835
+2361402646872012433986880843871560611945683230864891757700569780134284216871106221826645632387373922861192629580123373279881156
+3429998671996373176825887742582100895464377776504251588052739302345778540285554961799280437565093922440989079226166655301999596
+0886198944491737540229136497483278400920360475905860689648388002698383026711966163612310598810941558644533048630182341670726792
+3224790998309426141510868353814679975103849323867287287851298934668662832191399524482143116612939771691776186144211021701423317
+4793327096193585617231688937441621332297850907599875602232326960040073326201864681000919760060752937975322888247984232424151851
+0809471069558103959275275538388584472907830398322459954494433179596574461777867507710018713571052848608078849868820600263934936
+8295056327643509778568235977901421687599218957335038414287972297917509776356464814745628543893936365866982215021206066423916526
+0069175389099655621827463771703163016234772278712340002459468537149630573879420643113985870282366118625694647368265400040980694
+0185330675548785458492267177712810772887558224559469934081174511045410475070695699952516120170917198086628352522241811643698589
+3432240470257950810314775679834800845473620978487244838484905235351184086387166599707527028976915030731776500593580501517198631
+7221196580395629622683771151068414253703527355840765726766691589948635031125477445246126627685840897423930890628894585553998214
+0691851299476896761562326144030082656664005132402228246129440862040530711922127884942717942941321981606132599740710622690829340
+6387805954414104944165651355643971413515987568344486496225929165033526273702557885861628429072595508259134031569932407466556139
+1855370060311355098279801028503699206359780131940779590143641110125855998712927294283001777864930865688001454553164651367990176
+3395026397066375956526282504048669461521946610830298850923781230518236171386053536666469499692151678856847055919172630657325178
+3046849923385707165827109497171128710135811605592578271326373856764418443760349195924655728319788343802029428671675457416769456
+5261821042279220321036999746346900717107895012894353289951489320917708733388530368251182473743527841343292751660664418023250390
+8824252317744508579970406643025576979363288136493464811540150480851485119103480579103156985795448940762007262203877811330652870
+3204055616321408250954812676138625194951030184386810613892670161995606664768252471283913135456955545480933087872315934450481826
+0110599619290339021324056958678493559294456117665436489672772960474962839844256174658530179997209334133515553960451214172384426
+3123165163841681474367010429491835679876709672710839983993762107872490425945162980229932665274102783110995818120564672709048084
+2232035395926446390712487234338471590552947684994788621710474575654186707905435367680711475885293815543060949577152083169955046
+3350028292251658928286123588620947938740352179851517866242963626384508167950485172272074373493999323206780786225244298185666999
+4138239667749081340443940138823062129167164095346506708209137890234837357780622504863833649209158347489730999565991588612008781
+4664217286110698633018092758084011823559493288270590581425742146586929149871453186482768470820080489858199024057046533515257475
+1359038127174952081563588721035499113638671173404164924825530484539148472501653910385502837523160916070082537168043390775386612
+1436923728210391122200372504366645991744778858443244990595402772009992024820412617754275410349299293608939703285522116131987750
+7070475686255460177418547021473687579971194688396164244442299931146128832803904423667313289561781005593542663645306028982529133
+8234121263247251924212841508107137520536152642698580769661242285329043039771966387613256643214231439403217580461965950616775878
+5413104246474816660429811639531866004425878342745986000581091374331764631199000564830359002609727849512990017018293163945873976
+9271235506027321498393346844536657245544343198147802739604119444238511848559098921026630558834845589124777635275843923942487146
+6915026105020117228571904488841353205308577369931061433915716936274811913573096342546878245443525669417786920642396110509919680
+6739657651695868636149376334284237799146008295879768907577994879004415279621922483186516644311320818173589692203657526672858471
+9876510782436209693056682744986249105883882516043932138260023370268816469981968622627487020614107433825722570906101692145161092
+8947476576936475757290736092762279169953016586726757242391235235637432154172158901821960951603571049760362400377076037216546585
+2735502157822565784279289258228694712999190257163908804541511707522385665999422960150232894155188313507493238330302410605425296
+7940101946087505879550405973067848188833812225296523952905032878875050817047074123446017999571197850004230072472112763344801201
+6857142063692961406887982913011490273637829211932192499375592176104274764580285681098203860236999583984675192011342612589287803
+2211465020826460764614937570329924717346527293528447660776999654426823206473097384092520163892337570587601913303602876478051786
+5272016532080322083507311689593741698084734458418980219100525429302190098183573551213250917695957795596851135451614813138939428
+5194225250639639525068156399214932189538746207985167145356511964074580667075083175359149568969997574350520456153735083289658446
+1455560636188297319680331471565963722123437735473357325582592487841750254758281060767877781711667628353861132757458093517522296
+9590937580052253974622159164858580322392765535712215396895455529996073185392085906968002802221878982904887664044332656986715431
+9536212991471446618363328764237863492326635377747715439634427901843465449556160996406079848698687609807559175166455209276718369
+0962150554158891455114948237812845566152678283675857088563676954226626094608713709080121062121158536561703886898127526222898762
+8414892749163551177217490205399965970236826061221918459810953818518538232318451456451553658102845761329243527433596909757880804
+9825158812532083534774503272169600063323718458433952873310136391419269694767849055513012348666684447456130828029837154887287827
+4062509382360859964541627147185929761392475832974190883249337770970320052156457280268514718326951417528373787461693447362886601
+9802384514195519930363615938594105163103928246792737359775050266251933928460657553568168049147890604569802307087230082628479583
+5935332407364708394968146809867463424837289762388992341535259500067286459397511377634976747563308326968703921946360640378185893
+4569961338778055670213869684862788995924625160473819440389284613604453202763523485241482845106528449769880720371645531620509281
+4202560683681703431369153262516802980502196714639887848169937613326674387122996761898343353693436995583214395894151975156893071
+5332713363776927366695888962587179393484799105075109946348286416315933464459810857879632369155531524704654845441581407617245460
+1504145331569763505220832523847632508529957830567158287689592530569297300966404712183597770247546234814056520028432048220079902
+1149483717724666058290549158624685899733135096369862966589441778195807957291623190196664952975922610237417399523101511538417768
+0036082673459241242094083136368293175771615652653244493296672289353318399016588588663275146926170769838811055155231491519921092
+2671555423322348703897548437846131134228893160392027737396758641632859270434645917320325207654186499204544521705733245689882718
+2041837354468721403869880661989984614132154115011011100068745419042193490192096797533733270459341389726436281948139045659902298
+6287265676207191576589342058985373273830354712920659876843903556929428288343172794038913384089049546744993546672999661244015504
+7671119447680097893124176344032941210873441607294204020878536819662836852561652631058964593184756766213107639235733279668108014
+1503597944873319896726432783506968518844581130482208284211813252594573116879179483819354129815885419312761420721174077013349076
+2090575099698794920755209276799477214063322134870825766478922887601572992873375806104725864045048652936083491870937541080699093
+4276983494146036588052551210478424032928358829122542012906258904015903858342990969060460111480318597431250609578131562003677515
+9113189915457840484343399644582165727880755692052210886524470220995792925869536099894161015143779391596346691130912281801612173
+9319631208845800137369253760266414764140198516858735371828537522929558300406662683159046086394078157278265484925694452296859315
+8349237034176302850857262350204638637311808275176159745110236526981407472953488387189243977498778789698586980560479570319641349
+4582085067641332005668306046922050438876194786256238539902378554139808224133740244623740910175342259941720827473284689401445459
+7345697903120299815105938454414060402797077914470248272961589951135290709800128402376384567445478103311791196342258909767408438
+1687450542289596593441156541948105976556022804241843599203672068561696047317558154471118174352593930389361496742548511304322359
+6498489819476221747377877067530863799486747795199009866503783070729160667495759546595972752749803505545796148381282603736838562
+1116947692218975950285800049524721556053629253858269322416639882955425601685355611062823222776368062359326543474366782696365362
+1876190167722031024686917347027779070009896358771654643412669083054810506078866218417271851286420021860907338434817211204686529
+7526344148737332091666585836660697055361931941977353720336283268157952341498338628673162826343734542380046878989163995116270895
+0881257474139601407433704222324056930283355591807454770810061687372318085122818010133000433045729252354366007849932042280735696
+5414676249451280636930231638752958380804768673433252210159619334608464253621441055450445428123593855381938626029786836437726558
+1472864902858611995686957469529408189014561042091105708978737612763064100403995245584630738467933358860436751349270719679653915
+4154741684647123464440327863242393005522818718477064168160551024239993656696764829360125195215986845682299044548790324197334138
+3620127277527314655388754016922253350206555973782560191527034271929722748456430219013528002841930398470078939445946816067765376
+1722243978849829693580351795930973604730338879610427564825410468950337347468265193351290232895574144876817631258161159766300943
+7560827667474386459711757237346751568066838129529407855307314365209698298457841298119589066095648716960974765231576411494919727
+8647954673176727645450541867878958992452684388452058871232181090099976607265059152633077058376469186824930991444056731009872982
+2534991973200933430036026714058825873362205723979737750638944916727241098322793656977758591967127159597583155643556576943448135
+7155096296084695428953865082662825849460303226866978634425536379072621988021237204615220061198468810868414563936757985215986294
+0328355158636181420325206501518296045012302259181045466662110690600154986730477840865756276397313811576274178347247630894639601
+6488666618858920723988680761139802965152715427776544103393791345032803457282545151397254870010332315293514763142030945537580212
+8490792796508337321795619849060108983218521200268617175020002271232501077412217793566906763151880182142093233096870432790215644
+6497520222357920618391446425720257029473583117356819552842063897560547456381395533477059429635070000008137772848031720176668971
+8337012837324253697188573699623123203170708166950795276999966009577648906818828342730326847639721034032786616971040641824194318
+8936005757600971054320025253057644372313238443033194219596927715787049581460393528422411161050154583706800554645719354006707835
+4215727593152764210346931899527305466845340439034432649923099270817579403876601746194619933095404333412889852431784452755466843
+2088097487158522551752685495115047141137278634729729587648195891955992392424399063377394353752520259570862609415201408164480501
+3544474831228092443689968228780611679861586419457086393251353177701671796943515744580842421181721325756988105402798156643588821
+9778536795257051681439799124663145890473401144931092912457976024515106053860305458288529123695426810921506064347775651216836501
+8629179794286699832017474082041208054529672919556607496647432513709724969762646139135868191228785586347557306843431128687158014
+7106456703557605702232569911033196736598272397024373712296482733842097318351505429979256730289847489156750506335880609744614597
+9660558924487542734143121356331540689398560467085012517453390341732092436780513934245365179678624863881161450471818695381011735
+3612453516034902143796136205048511802780802772294479133906585232123112871839607661282061340027850740910859483338299107807956460
+7138724118583930096084405139356471004624454913317962414308274669136174812224878197906201370412577330455805945128690650516949333
+1730291821726950196206552159924266720782365385611242853448279354949948923432277012453511172303822029259754519038931979427529263
+0548575047242616318508715072515332204278272517306960109310804996719916332590161894788700070468159978743034429043329057033741956
+6780889499085964528861899269034340070621419803779139024411147795371750105312955245739852543595775978340360773771494478163557276
+8779458235824687171901362922249920581085853186181780124486013927395708657432957030172044779093473433280766667409407392636463029
+6492579411705822845905066201120652601308459859010659739650561022388466983198156117882306744218369432413488854001765063909641296
+8476320260631331607201248389753502857961661494677170435281685503191366884817616726638971291309647117085069726218509290967362859
+0810139343653776833125734038676243930878414416044335363929863448842581458674823745747264416650503948061405425537368655356993636
+5246772266327550199529567399996744188644213516458735587639817991224447177904904043235549503266714688854194981790228117033924563
+5461999291173972450770635507697104176866762020802521790899644748842731393628432841194003711839701487245460386154522697276378209
+5508101058683508523829079387008807816663732920071304290119836347773461806818814318630035261732455767269492882409702742637950576
+4599609444549117705097045766405200220153090927581307100167391516722145681413981100426906534790499705750570830947858845925010025
+1009651634984508835728715571045793550385433404603846489058904184111368085059460823145504327889561854662565906194985160507019989
+9357881999324778923494272780697498659881414033472270442304085245770043338219929173021287371666801815069695486701740310076529915
+4608279080766236606674170110085478654830337635040537744779366742642067739517988003498779451425063495418123468371481260706586708
+2700839483986172436829409192485873721128692643705335631914640430691426436305173498220746572777225402080014675196382731227699368
+0086136702746607717078625347234495013215002090165872533540039551264212687781885399476155438281141614343873696580481400589706298
+1705902722746414058890369373242227296762941970919549616605978259694120130539911344963309277369189903126883321693536398430654697
+5704737347400443449757566987270236468633966314353505101478851263083176174429030344023607680553018559157482487272502931014168203
+0929253853547791644998906236759598501768018124990991199353184644473283908513254590068607924929473380232470364424573291631346278
+7114456427076321654054593005258016944651062956332800845969220254804995756234489111294820165405880256529733135691041245584370134
+8553075127747556822577563288536391683930679292906640525736392953226223500696613649419343205087984527799731174525862937043354377
+7195787380049689624114711568372766827743368052980829823446372539589421589808988393401756593651612425875577606936738214349475949
+0181544697505469142362834711903740140759734959010974977126438624042186356553593244884210506676336566524109269413687671228874205
+2896686735795141476730158554607522934103668703053995570782216706155323744964613382384967846986182100960586040580173953854307263
+0286768549279297394586785263108063892918942908459235186623403809969114153282154910435594392237358132752498428484045697160025994
+5955615832427009939764606346259378692931215536161617155986791397037887173705219219646647075071165536665651942885935717666403172
+4276536421804556864922554676992233459439755861177568827029918375612999063128068548901725736512083925758415949098712083242055096
+1725062474106111957956927114735687646594918046204634711666975260667778901437761819647914937715436330233142512856404865653199627
+1291532637755334170692403451392823323540177224847012033326608939686606026939972956526341007272336243309559194347525857345975521
+4741600004754011316928740091902596508371266808717732973936254941000335221943249074812743110404969466723162046697491974991225004
+9085942759791031775731739206062635146158396893656161608173687371708987211298821225045306367484626014700868922039873009889166761
+2541340395518961317950998826785729636172355473248648132541946680948357368185423797382627281741493372551999786014593359188997484
+5815863362546532185070737662568520327034674676319716730206859041401224197894669598892125005912741187360523778711460345399659500
+5019261584110255017064950229895215051849707546749811603776445037494938571872346104053773024040213974077890562979334359709174595
+8333959703819799129975411673347762248495046754138982930023526377690018754531518740079491735091275401960400702618787889510076010
+4581333314409607030057543494344952121287231730028937956224706941567517833092451729648212810249480493474654543033507398453170912
+7852221502784071535646166335599143402394637641678513241517161191111016811759837825114453186940577300367319815188600287295217212
+2010730508881189649006207896145313350898015140508068016693226343978406558747353752836658017965545008809220423091595161424950648
+0496642867065050893136545829132837570390366632826974250747266589629788809643453838849392317508541173149110672931572489980731531
+5044656574615736195246481865299114510211631762807229391764826087155637720268154669986339615396192306621947657967460512382581862
+3895441416167225879629472693046552479446299590678533650004819143386099678646479751244788463147638567925169013110241886917506841
+2313203706796269432481996570645174678020808456857425673026366797683548661197668493887407113195800476443548512276825541513285096
+8842881585797604763305986235159142379357301472286513544030211227645270193019240287343188528847284806872333232004379253392212209
+2688409746134847438143178885250323822851284371547861492401669288415720100963691981973327453125586959600245064339903637953701615
+2157845883601129857682095395770985605599007238545319703595004924079346833281510603116153010794429037127659368861617341676777914
+4401447994414721274888256152671021736338924549726141907269816501834171190194745666679544881448528084111510223352357146390678748
+1598441987414496519030297478102458680201205753852279934039229453001433839642149793337137629917651258040708764206181523433254292
+8502235049697025555092849971402076674867464110183607528142090872909056796241616598564935589465706229822069262366265937628292137
+0055816249709410284431305701461181450452686881595061600026629505373443676670339321519731346337868758756244867546936430600344835
+2653221234894262976174352794968903515069018957828772393070009300269049849197795885320787480595346792949215526978359438371233230
+2573198395480105527983836130766181207518943018866225650015829519188519988960108721260257064720088842555685468531102293009893766
+7692694226464861550196190446675400547348832497307906496613188251375658889565533214610868096123194257835553142178169804139054021
+7725637998171173785445603097719118044612631181543666841703322233562489202164880099839601175940461517268783567897496005081890093
+1623476912740353658966890439792885600281612076194740147557413318421891935617196959684345685434629547787219047616918564873155095
+7025393340892141498709286165315521796432685307146924561201314330411100254047950443336104515273461423562157427134079178986568513
+3037051173501455568382307906695636378996155638857317043809314274578391987572790382804869815651855972786188467330565714827922500
+4074893387854201023525918388726764794855730871461446351512218023803177488574497502040250654764531910469820302411970861290475346
+4505685142400586418253034395353236203805450253479017801928704774791824048811941055335303586560686324885362705510247805420001343
+3089154219080968310703760534064569831009505236913263817236675143668487294264949278958590434251398242365729091805726174530517140
+0036394729791915199963247134854987262729782792900430729405932713576759938708525288045097625035200406357341027793528833641758308
+6352067888617175431411674423431768301646476262241768575619045274936408735985350498083851711439785845206739316196883719103192098
+4796246905383107193048562525408958439687461541231738438567101188983088993969984494129981508412118318349184613817013959589269737
+6278309646817389075935268193490507135536415367887824086765490270943493340352420279233033265958209197334685770879485799469719026
+6501644826983757753799478095020135205854302975462551896895597291920140799672078608383168757287535179491461326280401680688209269
+6878526040144420355891683769364803589616260114471471935609824723068550467740012749917856656207461894693384857525476785223522600
+9913533038664755944016342494625355616351591218888135528544319832829890186060691211822484503271002284261557646472978467535245524
+6548210843247451049422320528853823425570998217119732063096360026534131251690098102596630502775298567714836475115745947762170767
+8887884056401989307352068428168695321737823154308274924885994114161224059109503941221400198439058269599476104839310697936760947
+1499621302434101869959148741723191678491689696644090274728115214408462354277075304721665902694379966811617179086736989510478453
+4472180192689505631132593579798684787021607827033405644669077356547531106428251322335834054519860462918400592332567647993370324
+9048351300356674084399149618697303904545693491523593398209411550081390607196236295352104843258693200555492607047645055200473684
+3904033119579621911938196032662442953927339169769049079015529114126726770405396769752836907821633197786728940414757447592836029
+5698177775039384194905994353296325732870874582783505440992449252246418852133705888017732270642203555475460239299507823556669568
+4584762886535479770675275444567493237009137069030861149601485784515963297935895153471843170037858613325007001549210631837023209
+2986230798529869904729567059889517914570160421964137879893497645563877292347055745496295096825111567999357916375574494934291205
+7206470066816931559279891084092643447735267681920960477832257393262206090265312234429580381825327805715755696980240563671249333
+4975196191021868367044398019078519059684387790904063324517862970957096304027938042892083911602143438683752393325035772333502998
+1316065614559478287404397163400580119624302865064035828659428240183667221604845265166461282189820016614382937134407772850983969
+6172722824726265969836224691170018753182037736393837492582066024393428721754417142086323296047227886511163988288746175386143366
+3150098340574634288363424590978979671688129464997330011306067549875063142531548626552657667362582081599069751262734236839198246
+7320831408674583797739325661435931815687746601771458516299735930183747747803369077854960129285952199586802721391111341133770000
+9781649076575876416834626425635920411598588075542620127671675851163249442163030188821293485762987388143543674662920406406559708
+5939935563329383384304248329695829758747483676028520127505271048590567171170009956748249750276404393523654234793402435394531559
+0252668408043754647206021991183069125065854666835585971567158743285135342908676173306885768974453965943775589652707957703958897
+6941205372351396701250517551254482102589310971175662401605631499693168133844709297036538928165453987035113124871313193061665449
+9276802658913609967848115344605249848453532699908586062377147315012593156326148344297014110306443933718879254374138651819351013
+9358073205389217401007942156414789371666731131537345827743121944929460937083473364444624266082970336996459723671391030112788573
+1765411908158890001229050208942988203575712050271091972655376675898080722954958732806828573013490785204118792568609729781493352
+2380302146221749454886974990613671789801805162408638634096879268990438108120689272991357553079627023448340790990962415597084280
+4048096687228528057040549427950909321059124104059954691594133361792928522598487445722858314871353602305792037504518403367795101
+8791402885580812697264727719699410880547796108771833960539902147827417638408675493518018213254819498104814348795878620396366601
+0903924261354725492168290232167217374559865613331033632981304605379493456181688182582298294804821827770454840207003173905889439
+2319227785834038175693137220680318778454701304164120192954225359327542167556566637258412033259709183354710843065358146305555525
+8673917622829080548174920911891769587355766435165634787328419281721579009044997104872530471989859299305155593643127267879722422
+6682290955279007939673997760490906289041187907827046608623932479656002087546101920096135789193088482019418559812270396482968185
+2423495240985101912282160197226440146044901932777702865325863608790152621900419953459804469566930950992382020196553029673452779
+3436610407681610128962456711300906610774647139359864663150800708313215865508716982334525964257676579485350065609743793059790523
+8492723526317024179966715344536215615681812917282255110526575184184812878258269018344255337700911624857617809339928700208173945
+3637336636381056356070802698487403636259922727330027710606038599582455818066875278487848716217844022297313070587219989978367370
+0060775392327016214743079646392570709223503152196217613938079763344036433088567530057235155273916070612559581478927578508356337
+2980025169096765222953776328674278356394573802596587538549701911336821174109269755308129020228887624742741743790423872778133411
+4050821812671715448039700197323622949979651733365312936187264385591443824448095216098907529899820693216629857601750862463957125
+3142033473651787251598564785166706147991399595143208797800693772522221250290172822723884818192653997830457442015732513857367482
+2434227934816021841461320189923052035591521089170168079786149675686974463633607305584810474242944486308070058500812306124076610
+7715099107942733927512136192299373968619398158672679676087995950860231222104112656659877314698556942502196127845551909712373108
+4069114461731658732633727592893010579600135097271095735648535688306732518715682620335083055144068477571815102417990371455419096
+4513648336048758526599148974167943082379478315281923441623546714332454634302169701041016212788185513022911448815223921787570792
+3624469067047527512170727298754069896031789622645772484827952155406739967506695954077541651367850929296976343602998185574427928
+7941267068022945446692718780586230511573764935339043083147537297266971720289420223564631007244922385010298582167405543731618295
+6806852318072988521804655880278600099719660787055120319799397720389095148995402664025461591174050670273042539667806005860061500
+7207008027571345636661751333090766740919387017591058445443344334627123396031143577924484316316865139392646603641126628696936857
+3077564139261564206167503001531356981773542928052096642681673223984499732941393025220000573381152245673838328811500670802459159
+0948542799001533682410297780373013799791748346265940949566539377367731087302452174028989049580452869089162990037685957268273937
+0880681561126138584261480022891283215404751141789014380796409952816321543905013512146286826522138659411899727000462608467450535
+5880091566261256557011783504868257620770129211977999169370084785384096209807922714348396458806443353193445034311369641072095970
+0556656033549253864960039890721015883335372132680590369609602226419085993403091634173432095151442616233244407104672122152816903
+0104165883408627525444104591380562545622183558159751831249938218150151310276941351661814981521482974647621742382874619909936820
+7313501231477817301767451446702735705428503662442130539627888646852578831768325107739301527824363969429357121983438884878755269
+4393819179422351389843662394835319603450398553466130430331252873486799616761474948216299677793061438633632338236018231007238273
+7068094772817742176160590443426997804722265949259567119852638283512544860402755698118178658952516755701578554245375512654131546
+1929058509678608173068953824208364147161581285515961193245483567752314654578018433833005722739540799467152027333949229966280869
+6336730057716861143854645697201406300653307680945816167555425942108475384088151314617817926634797063108952284581676269870141278
+6513049997339587705695549544072595339278305253913271901919825663866146612507671581432953692087570028664604274026412331620371074
+8287494858287111672511595795429201499531492727612182441663719617940686643391436311349735908431637719847434127985592417043341276
+3683439281027866311263196237695664936547654237370870765012602749829825808040000867227133823847412406422822451359747985192576292
+8080745720999988790691750589159999510681935221965279452806039652949988754070864815196625235801191787296756531552141564212907151
+7193959478339407643118308465039555507133342674876808586706138734909756613087265895500010160295176435656450676824231321652261709
+0364925287385399527025737739685585498448664221812361858587254459582955070942164513804426958941634994463722930608065187062143205
+1510248350334956246451724384468817066713416535078509857129529545180481755289335535116009464206553367625156566677354615817653859
+7881465671702288772143540937915254400157725015862757578041600213873551218117006116952755764443062859739372284691117745149958234
+9088672142145404730278835893039966187590126325943635642412358143475145374782213403246198035026788070070178049812453881844272867
+0338668401687420146135473027030982411204915710337406365921420685513130184588295184291465724202435316806267038332889397443572598
+0839432579664022013756612378573508309364105293988945101718659897497738253028464952712017100629220365209543091962896609529479679
+3205960596777307708890129013560513946330763313564335478005273643120628824046289255031118424365183741647820073945909472936879735
+4620269579622752421433383654982653678424583328146692271652411473449919421964392617935515652881545262048907644967697133592449864
+4910971218311134291321139032124590602851436712963785978946343853100496072075735946195731359706831946181264874128557978861454843
+1011713617018211148846555458691095625992954032111035185714620653734574566700313717404927859717431081627049246861417661324499234
+5786110524543942705885896839017534087003537095772880970962648591315518710892525409209474091669813346069319857029093908507508520
+8853954861830714292944628596393329384568570114810794672937003168548384708307820733820193722197605410037476744326684584534487320
+8506177470614128104032179365484641505802789779285846461790237297261018747968281039195118146388862647365824837138881138267868859
+0627387322960768524871037409484459085875896325439489116621528742302285368082254073124593119410595219290194886865353532781155425
+6809698357496328576273024691628485594217747112697681983376999200098136183929376787562599199562809870612840417370015973807170130
+4180345838072561608049345847198586105129570485513244519517878528919531649387592676465860801665435795014078048815567745274248672
+3354246532695167434429089502120887783749962531689888071529106417054905309204892456124468634666345233412562908228212778433482865
+8025350198646920310690370174859009390241456508358264258699021020277939851249666503547743318751810595431556900870080845029269395
+5024287042925036023658377259430412863334903203075207016434236014370755084100466996153432751138550920390967655897565334875107985
+5140055633415509862050689677756134057716739901647883241169162784527852235725792016297971735177502489661133426961482215258022336
+8037402896490266221826083726250897311919802495381754225581047474087034884706618427848292889662240224463663278752931604522244404
+7043755425948194930791058610151488175614282166409617670305934153837246327320668633959913213103337798602482509159766659520973014
+8270324793209592396753604357772106280615543278837901728489074421806486555551552367821526140160754356205673704266414947144922428
+1799358966488711764366695558613904123247231097498677269788824167860157320461004934898696811210735916673092405907643647942161633
+2879051334510139198581358891368404052755328890835533066541217913121822938905792625249238474950146832344471977043224365781135389
+4792241156268785166424579695585412116561708898561202729978503519790831983242726846466172154727854320602695467825448826562117055
+6892572380716177090374320438112277052543379149328749706362112028296715205065873069869487739216648881329625482801871208985853567
+6373214964682547847971295488976163394711102004330268920420740567984995588029489900437674583804505907280376076761512694288533949
+5155665472119733684583254908202345934203146938766729952819115305923223221786312083916415057710647121628060022705929366547804604
+4979219068691159117673733260174579718275355270622127824048810725346461586407079827993239800649367405496829848031012026874839047
+5453326819721439241285068650662264327283806902040744362117833297041970217611203752467289267570303110513926750426867300123044678
+0552826491452886926336136137608744868267813981244854176639767832954709406334434073383918878421433694185303125198608436174948723
+8232804838617139276458679276053642834353480357742672915996943482707728711707722990226821986645110256211853787080947091570985448
+4530019597199416503606666321373773776661468897805635174486648284631882284913728030703703554479870389738113486662451982640555230
+7993338222145807140991352100542338400006637591961344296816299971822252698512532704506078851263452743784059409504687946969377470
+7050536882923788373466054136459774772814292349043369279413441771827357318562815124739087054575308713882488227553010491099772197
+6089909596225409017825449105685851204483516303044569069782656841637982677940745207225513250507661349031619934115869792030545534
+5623878938475449105483656355950820776480123283684344289877071474158657289092937164564108821983834915760732145489786160801928029
+4816804046415869731980026155380698391293302660706933603124933543082802974288753245590234004708950597141938648083597306991959548
+6285742091945356496670113754904503990748375484181907762641311090270050878330341468974330973619534202556739616012441626266016429
+9943182264167678058972498083665971330560261159232616995578303066019814909746442924781284268163340228187122534568268386331093065
+7152421562633124939028810156815250340969816324770306713467508016775028986746579511353296216202084745909078793312626258806625843
+1270211232086431110376182218366306020098067244906289836262668331857252429211967620796216066094322098532350592071668917821894836
+3845983140880841145716906938062904326623489852177531923802141898083667738472813358868563811996856141869924840103531518902763682
+6718003149619307421590918630236184183948486678786725981990313301354204177947073223184765980604578217913950986068011309908008603
+0928467335337181093723613708048071495790652643180583079182628211576154222901059273081503840088736880283912228917857747961420216
+2166551801482676965109266503314605693500879290753119500152110927158165273225738493344045059814681043424105403563256277265130147
+5602984870377735940956944951929383106107020907201382858387070933315397423879633043403789726957228735509198228676824257307906832
+4033785332705686886894233935205324983504447579271074658738235607798108047836471901273736322254888901735575902110174004577938609
+3402493343952267342344754443371491773245869528553143427384549726736187617570093360565939837511071410896535571400200988988962479
+0467384270228802505542012448307525976842449031499613137353277852822620338697586513075361354863064717799164245330603052561106892
+8842259346260183856170976867586760896719736933276441816021638614978497367736310097708762890208045248689587229972592272876387473
+3259167318440772369838882122021007960375389506141034220872992638686407702750133638151910546511598120704345383522282582904780462
+5442641858108090041720094339574637116216554948307838544047344475741751117118100567565238848037532377180455225898883679663375089
+9577142779120614628627441392665993338561362305904130927688924256501300629907368310744468665785794738752761659537261334710214003
+8036648554081009787955952496618722107214483438085877494384608581966978660817589075759692849806559360759821555215575625537328994
+6018332837847583031691963477349319171451400074031373390713717042745436212897138228273237021196246257873177739985799453366628180
+2105213797394649680881845019293842601907281739434203168302170068885354441461289080251599722778415734193180238772976142195797481
+8846734820754645249343903444980443492288225807913782286509632765370978666435328327850741457922220028478728899676269184885886857
+6241211337754447826883159708571545245319208827655835686933251362672810423079630739434073408653288828495537708526658804579257936
+6272761641480084516721023070052621557056643754854336674557368573875689625068313256900499409409105292963555938180247719262631692
+3370472297661265053196085477234369632895929368519546792630928565306505801718550038387422423219452220411081683199640562587649457
+3951837878713231474233482132735598466639480024677257398672432796607337555329635538613813318615303256000562507502749357845826125
+4701181391450803850270234592090970559917694412710413114961034587689766035663731463069166460549538653431143701866309605231883521
+5130066101866721176356898240445132440597653755333619647577387320361484004480200635865792415170670027337193740214918631143418262
+0808586953125247209833845490228639118624854066699258124848785165048528440583631961380212929557758370252911013779599196305478822
+5521493745858166529682225371969453760228060851280399420192708176554476472315839318021751905690807649055065100259488774569707365
+6158697507308922777896716663452883986126333631244914987739404979553039259206951208801722656773710392910263349735278566679339104
+5235852402635719195587338866742022182421541295397761869128302452896058848115769056351269147058952464962337808384290518791915445
+1541410356265877277120453080537595028913680044162125110791583969590059857305994592466475393255534238742387386696685456308459612
+0685998205305456113478494375669069867507303172663122574416432766684294168665147860680796606372059541989820238442687325132846277
+1106867923762001975234815885590982053876420748926951108789589029118783643675464846081587064829483161231369554788911064379449191
+5812396650186976221479400172298188629572727898176974211003232401377793666992976058114854815038333629709686365618467427463150786
+1384329026943982531591592399085803625354634016228493888015194258739954993856952956641410330220082208258103940975869674221124275
+0959625394390538490258630101489160874897384983747423071388118372125410613424612801559234232776779480366009970965890340120701045
+2667599636961907870724269931710369308622554291093494631427897956168577372077593727180133140549717498300507170013965255252092132
+1737339475235603869117715688789198413446311276950893765017909814539886259628403094769733766342691082854440546058895772248646612
+9197218961185262852748275379196855788331061390003979168135259363646749693751540875250641291188297420332987544882702271806564544
+5155345846357272505381130365306178806560153732924148036950818502559878423925856638459435711194956693467002588044226649914787035
+0339515088331009475687588955523954567747189933073011102332237830656095392839856108022616789694653613303860633782147528467869258
+0130375935586298049775383191407798098669127243484570035128574481514435908283974501169023065679639597582504503336586846159045241
+7077631278309415202815413204154287337150040264985085284229097360757947744868068694211304208527582045828778373828218901884299318
+9750268301116713110151838109753966293343621088077855224277949045570521139532153236249008822916991091102238861514323117478408697
+7155195645472829181908341253643812659814915997068241585467987778740169901860636348467280424257966646686476472265113081410661304
+3489215851493494198992712587668351276298911212514851702684901497030382245009336388185220072052801963314343348536393431861793824
+7433750102437336219240711853055477575713689475760799540383502439038522399381791672647025184537779822386053913810580122038174879
+3818754166719135070632269620576055650986227950584996452818776818068696309115722467830916362575260788613336625118633863774586835
+2178221238069038687341161131798367556148830622561463128345189400786005116148867892392990638096974925106944221425159061603022670
+5524790379877915422325982255364820388029995625235481186060304010456803568052174332647747736403777805245458180638361448671813038
+2561932270943099179760490101865479784716200934807733561691561384108933097340199742932516818080682737612322848740218966854945307
+9080116601255117121383041648878380955264484146894062161454022932953200141179550531168588724355886537447858132714146647197563370
+5582470235237288151308759910566681678927176948236130886004032182125845977161600117740547183580925791449145036400529238606663420
+7837033717084727015977259234033008100455368360038870286352550514822219714510463917848677542164460976523276256801252857727025894
+7130094419267655355009949375142847444276972876916939298289507233195397404513990497114810662137361054915518609388753530456478940
+5388394232615483120266638817714522427995662494049561316381620397442848359037023023824190702655956805505137789130807808295750670
+7728487145979981298300914926600023112696314252375455071809186812868701327870915067718357028716612327551252066278398582389353164
+7289773656445897637637801900198614044295973498998341687324987147175709042706190580765940871231724558042584698396691392833921161
+8657047381454227627618374146397069336202044856822409754902332810974380485722671719214725867693990943072348305834409116868276317
+2768386266640115552548464265203598491327266098674766891714414339959283543826573869249667218521183972556730897770799418342118136
+8189160219232646049490114563802577964294955901129433201250836705921020927053769046687178122894793267915461627258608458791264898
+0219476902780453916709467789696795567878369111867867605857135264741583700268708214119151342234570678050700247598575853332533925
+1642635008587172832360657829315478456525706956941480551250122576528755981779071461911390584857611720174162647873804473942063599
+4967685799379026281672422049403080588839491839093762962697369896023527084701530700159221622072624944257435732610627292851813751
+2044450251147619884660437582513822729870849508689036347657931033634388064328200140554626737296767003665386040440053850111272335
+9965191238699562685527207327106427173242624391995490667681457409129351701642801367806048618652102824703936861574242876103982267
+8167136500949575593721265813173669081199030452059803613088300447991271804667292549385675921231605005292459008477827396828396980
+6509840801282604124983554742769070687886591529251914833953844029743868619125159895774188014042708540332420119945175514865123729
+3692321786307153306613998657737637076488435978265420180472674598878806315670458550057067811482012301407908299677656750462270208
+3553454561634700149917505664871758279230385607072819176680565522193204640320948453398810380708601224770333475704117532694153974
+9739801831118688634434296635463933483606562392700839399728340475392493400599816097076262424865867680957927823749646379318466788
+8207485786494651396331129651303688013258032982874538569357681541288542572016965208057337584986821728683984473782485195031290559
+8109594698571552972881573904540885927360173123269475341745160895931951290769944326526035760450300948152494775976334153020903866
+1739268973385061826289687149889229189956753685868472054090051279828873221786295847959246538258862203254463138510475016160891729
+6472588945675080220223551738194925153786626106262423384260557370130433634861152559973124770729011313810073811203315002214957767
+6317904094534761856637133735479679945651270156668746266850573869850630241143818143990553888552953747865302101114447970138765661
+6050111904910844217007312990287283030132792651432799525258590083326102644255354794948740529248987597130140253327270495396985608
+7218279207220544832644649289313013019030346375149234023654949206605352146548635130815666273562950986058561700625454917451118233
+4591089295985815819108775507988478501559092837715809067331448086286924500664248339776158516774620654659269297333948779421651033
+0402389695369287676425439165311946884646996933164719659142031175373351707836712648952147263228223229642458870791042562919539663
+1663280408606348818705021370639699925355411336760403455952690546859354756234316710656534265824067538349235703012760994218438928
+7331947252166763395452202287514396143003916184577374680861816449247026988630652041781591100537950521820855164931956884346869156
+0167992341341885278124354492799177573677966259864026035120911925009272011711402759093945175436356249669782240856162554344304896
+4307297970448548637044676901410933338328417297377294558704310254387943692431491233869228400552419559003867252598836554809147959
+0400912691036342469718967629054695345164844205186330491298158594966799688436822836744333087245877645780438275466738783338029984
+1522719795609161172147875781283157496792619720043728981895906145341666050986634594495047649741152246939806507306609930123284981
+2105358148148398274033567712304765375367909977448660123752729616799410712586037852322616433905738649313626209308187391551045434
+8184050603718152729487919051152176341217780682835043432591401578282222377677030156609712538101741280977544353648960619498088312
+9780539921497865045552480951265192490326869876857256607893887668594821322177012473373977135212994227092237257692716960309499930
+8387530951877561556746885813088050059098237284649866946622347108029066952894002584214015925808803683837814966224683534722188788
+0980315065961365338422640630321175434205379462185984915822930473041804521924781482514510231643402826027992447752984590090815631
+8885215984427616592965846360943654237762984211426187791836287528989189066470173789608783423601639354776027707428728361921725733
+1713545761488733797112097100438352878478186093850974631628293903780866218943733017611561596620119895299713346283509695880279900
+7056694123692100328413045552536384469910897094450012862955826233283495356986105417266885152765210669772149818027501922143072697
+5044288331991180937483810266252299436099022518584143328384527105505463981298174129945339074070183868941494344473296478243433481
+4945558387028214187495664309036767910507538072289226775563326183770144119596728765797237537898375774364456608274929793323186859
+2322622760682958787774419794236441627708513520567224931868094563846705540632720743482044172976408519449985880794628778392723979
+7704734167762682724779119792543440260650654515136102295412021984201525761889238911775278953009856036983484297176809989345351898
+7538438504892134535588424111693601136717057553968849287415515571796218046474942306436018172239215803280193264125771352664266396
+7105221455394922182238669063185805229847494225913363125711170315190206996126469146603174629254473614090501455991736786538113046
+8157168667432314271904818365481089200297683424381896431649087725330131885687876217074390326660020019876852812089717929283102567
+5370154297245853419804188360942032243192631168128880436140877705786486797146832449934263947276552080089455965696884234934971523
+8611893045023888017310198960086212752413461499017699656702018998940525757023063840379418108573223175879013713671744193748767015
+1169024393509843272061563781622978325016779395605303924999369153283788827391502842037817134058668089767959752756676201396896441
+7712715405049463369575317556974267677998279848759269048895603544096481338768211601218741510541248300317436674252540127015114391
+4834430831243295519098671812863396000922057166207709070811235493720931115916983299692520931163380069504267039634742271991229413
+9287385557045725218161176454965763264083042136444478713449129334549410452033352200798030615759042237027156709457224173930955024
+9440754327156472541302944326043902553561785824204549770748860453197398189036670911169331773914895138408417009555757899645501252
+5832453847611197719596117303718224745254716796559500451686231076822545459079358621425609803998655831572289152307921157534370594
+6716617297863540993457906819123068181321563782640587142663699479729095230755403564453694626863314955875318305864016967285927449
+6751752585208130882471772146338918033811645841373896388668212294917320582400645793013617832138799866544853495551795042553770974
+7292062075462511235154219336433250111030971448383048960076039173673865773457243289124490997622252180509835724029497464904686356
+1703189532838988444479300672213603786659157307392869303094005510273480520540799882625565441527626460538592793551679614793917597
+5131469474921792991086626550504407821816558283404370799177646663722782715758886649389166252871185413421418269585717891891693033
+7009640276492618793739187876608008054508113875022453329081433650929497189681068056166559133270910556458288747450052550799593778
+3775026817449250262071158797005661647517869545017156045641434181332078515755353689003930497030264487465467676524742489128433074
+9510101337115987091584562788637829217924129844325702143952753831115106454935897717213086048464400730491846668741988349250815009
+0460642398157894924642248578767274436367563791950971068099635643161955689433389352445513881354534070645863359289997626236597102
+7422701275758347504612869999447090197900987293675125648746188541872170309069628366658720207642452150511782301406643296921604925
+5722148742542704368310731836532013521833785510008023772247459847917061172721772791747731176316362682231389997934194900072780568
+6833294401022288062004523032063979096666714062815023108654665205678873446818506366372748896978903704125253114795333767006805633
+0409503844899480726742485372066289542014116663615248040053134473634302073503009858583019797024883588714394669118201212140331049
+0801167094699960082079962007695468661043658656967418331551197267388919434693010620339366679098731235659707521841235334772751876
+6325143950028159251006278830542343903327924750282184108026273734472327418765244935721260982532015689685569244807990908472766627
+7594072557268049752783928609937336033485545218183637235406635759394992632389014311377829965838907592318760198667367240484412343
+5995370105199099659966025879437447340499996959986818273399469349454086733538293008250823125200112169460372394345464200255398128
+0278006855752348475839798168839058164956107248521078548181749550904031782397298429598863198195066959241173235250539525076363890
+2434406818995447305231609382502170967538696884871023912846712870860599713914006479152902091530717543673744437190057705732209450
+2049303158709878586595288112356673888760379702189055053773161541139894881284696826212357934526729889089168985110486922861784281
+1480496657855804936389615128385812000095228481966854328817796490269872553734151219601055960998715934877799282526137718284428232
+8638224569717329657108787802886111345753795000064618991042853502960039658407299390014418474102137277340588865538873397922966731
+2915504391345921079597753766165614369426311302871553494239227907927104755401277811135239511652090480469130728548314080193845714
+4662543498990058418814498281187250236958894998429926084397929019382124044722273292092351973221932689481754974738766719140738353
+4190409245555651289372817877351684664080842342410487693494611165285252514427042631380484145603968868053004939443493512729765220
+0119636369629430093021488300230179969441757666478935315483114992540843688913867607317956666306088259979412209337113112892142162
+0522344915049743379719646407210766405374162220565183535557053495876729008927029380341012939110046953015244548503515867668213581
+5545277258914067549098676802369675716209629211229823278440028400844384130766676038181293025311537464968008032689589725571813893
+7241917831784954432887951874113610869422570389407469506150472467208362227227524708480496950010505902724279188045395824562149045
+4536217193131427845613009167815485956442321803951137596941709381463070724725318338865720453796245623311051568325407640234609643
+4950000863730017668562367944404823933355943718044346155630933481082791520987136962663882167172001786426520967022022083855046918
+9948462347102121864710644896101448735320408682918327475914042821856145185407258575043429392954988610306816855047216892742882375
+7607463192368539597117886391111127498537601742711656094819081284338644518509840706151881140781291037342960935079170415736099697
+8170547034180787962131392617751093115453333934584190242119875787080041916215989194964046994229463391170868877473670939015394600
+4967067863801616048208692428984726982425267929231942089387972467090049190181520316912402532109719978404281158192349591335918000
+0182827511598856652325488782019351042712700704721955971553105284410000877214479216605042256842199795133210940783113951447780445
+2845448586343352856456977029480170139895515001400772533947791028664521178270989590999530566461508232129548565121491303912378773
+3186958087525040737796735368369363073980409705399259078085185801788329795473492605756831924612159181775569516279264645527914405
+3736227582287369825938099577236266512057139246043733096797986415476742434871074557767615701953628932757311718425644125724233706
+7173052386737821682078985950554267597062731307233678638341260916391599502956775154905191238402444341035490900454688563799626952
+5147641961470238255748645042116320141678230506441721302812017771332190399762353180889095100320685446894708468194573746305094928
+3469096230652662675602711465325424276546888133056279141284661309882996606616677713056958440903862720614419241163546636652676601
+4000176045790898594283018168562878609386243501149259496688481941480198035420169390431588952838073985685288362095448469635565752
+9472291341301030094187025146867336563674988987757598438413852630025766068250538948297399599973328446303590662904124689712678759
+5558918453683884045568116648619640982031099812596210893142179251292478971547413993326289821580230193948481450670535256195029562
+4928975689440726890177460501590676962108712941853309133182477027909307432937071388936253714931106477057738446899643424898539007
+8940244387920877438974129853648880036120882337129881652544245505645048735775452951748876363983239868801033134946650378020657016
+3701058033103724656733182793045707161803086804756890720227008032425755334349001190669627279911430274518624636020186433616060892
+5795048614649402340472644254299779685615196268626556186825992241948964494636129874107575230767378691185971658847979564205979820
+1236133846548113964258787812605512858795064801453710507748252434757524711761598464790831987938492943750974650361247007836117825
+8985069765244610015917016588371467517920803422724008738355002305222843175513547415525425623310272808519127269635589538855868669
+4866637881580384758530553032050127301271010383021829168699459836736308865544704254424297016793922754172114529453114659796809124
+3421197137282279783180092595776656118340512425979400729754872785822827951114365899638513626864234673281733350488813180030409671
+6116540261589173059806435182727298140303534088364505375974117730218290182662177594123794279119735348291936701406861588485281875
+0383388028538445842643371054045990749985217056001543711456417105050188186522673179186319252532355654228417953034579705914850138
+3589398737652268493665223622209314271095213796466114005222254738357264490629049957974234088293478306962011737255628545244120278
+9242006644961491221804556688452952473719954034253935879343918188942010496090705258446852742963029458182305909452754390287793730
+8783068031607497439341603800503578168008017096526972920750091440007773022446775696934539156855822636256531074692478856955931965
+8800823547223548709312492609422799167744315137636030763502283934241170303284109496261288800964950861563894408561284405190045969
+0236871653896771373931349637525093015261721424149322538581449425146949187109336492808412768678305259961228548229258526615055933
+6808296006076261647807027264924130647898638203490518417736498838185026931804266322409312178542687977048973852811639981510309567
+6711783212313531503601350937924384067635440627869411288664439772524317458074685185346606914709019186196743715338064452022403271
+1329461726620692353133812940387503225279782302791789101276394351197294472993751698133198738485236134603208512597461992464092534
+7712409812790062450698418919781788475967301395142101015147156004348821394973951402124816517835984222889123201533407163528809483
+8878866193884252627688867520926767781102452754391877549372235240772045942305940402248699505448319900090404392151869967674502128
+2483008370299951549301955588790277512316664972307031593695383033586616221934522732614016251454351893271188672805879216575868904
+8930668992950485150931537517355790279447532793020359504907584544928499659083716918240980733762266979363328381222043500384239731
+5449783313063957701679502215046202754515996947849788011011244404372242125949053935941173427778943061308870747330558976279745268
+0087442866677315281344307628368254568290685263159851300491709072441620656219856549470063530059686910247545618397733080267966459
+4275923776467144475919672663054261638444876359385278313589184049205522647886045588220547740175271213225571694335593813888699266
+5631076970562565479284442184748121529273149320713280238168313146627141356684124916604998541431548094125068927278902251637629771
+4049873854233479495273404123122985718709224211298472591495302249456292201698069758048348513785824572699432884088465158829077277
+6601450724720706904135791943277181797939378581152182984849501639363583354753791712537234399122836156611327530479415218232099189
+5823047280117680731777259023254262177630139266484401163220777646941723211983561493087099972956890435877152661438838138706007958
+3871525096685339470645850417153350859644241363604522957863652066029739101996436761253594694922069548250943637910124220796682359
+3789021225120290908842849945791566951268040039302726617891236371450848884685584694857899475642048623621033883942963333740640913
+3413392907322042998743788130668642581010260731658079311951196515199970920919298587850590756579979416052745401954692899254629962
+1834576186290812892686277778078188491493029363265052305832102758282145333131211542287672262899869561233857209736661910966320185
+8640618069436548861856298762841794920426604496493168277782652390652529026370866518863711574378563335650089395301480857411365309
+1062855694706861343683613721473054277513151272875708166067829305351279095564881057460121748427296483260938003342506900294399166
+6708351271129793412643921214770696882147428525507519544681246954889801321262715754608536636546303081680171501901796848282715773
+8170065360748835664225539865399039511547738151434626699419911223518847738407528346693417347838281049824633463358386526323379557
+9773283803239608948889044323843524447778250704201869489766199362127854167469574262448141201863158740882252497005327174568985690
+9629170341829493159540502281159419978757497174339132063688621315745991750554750919122418499757801567167615195540686775308036772
+6813737486648360157997154949184994770910737848857708594705159108226498818076724620595499835896899658135344576077658527954169440
+4916163367448740109143119472115171909713176429892100499193749017654102572161123098799425438195950481418848253249246794538567213
+1943648585194380435794184207380836831419456414164714608475465257187830071751668999365832434059345210749956754565801799757863175
+3687162724713568040156043932976576841434569787909011626375244300886516755159434297033774573216110685196819615175124148320455479
+3344419757198679638351706919063941845054040199124828713172593196435249592482470220242606177271518431150127043364815791934444495
+1400008065520008098162065199768125759577818782918099045365313282741980846275621548204708560469294053250492025107214712766610441
+4165080021198705915210786508550601653226551217888163799551833017968067846988341804528031533804959471453060256667445828562593413
+0316539921143167379344751397929218943090424282667061717675506492829683232765044382831375540458280475310930354270466628024378573
+4617204749069035253813713597661824629929473681227979210717594546338035842018470292109616982725985026372103084242143325201934501
+7628437040946835252535863570081482725836702391432238382009021257963849956941583278276159017021059243802411805222128391491555532
+7118276592277047948538579672067937116293934455417400255981648387252807293008272125197089405857447395662820745517911550198420495
+4817641036360381588057889324736649206689772293316553388319983835732003282890192751493367420760022776216834345866178180918425947
+4046762929816361002114402224273088310438847474234192226897299571581711857975564268312621600137920668387355607049886008638057179
+9349209580226030857313156556379575691164723527464611358492523658913876021766102463374095835678962118324213355237312840525047153
+4458386832215216090846608267034928117933000209670619365236847239547649406543272314067052926849866069213065858041288568227157782
+0323889725674406704675299432615839196837602006707700866051572397447613281818928460518366859474985370527579091269025122957262918
+8693066533952054034279975214015256982660363796184125831239795876267900616583623647519579472331003311428117914837252346650454796
+6978896914173575690746678387000060698232734806725458177123404206650082946025871125219582890983005045333389163168584620102734094
+0208343185195645077429621338459120990032615146936965171481121547620265509203707449471143882951101626839387108073423291107985197
+3806694565547588080124701297594558579857621291153844744163973871845300036486064506978169189349641947450555475680771354116721127
+7571370673293744335868791633492268450482890329783462471218711903016708619390949407758233183647172103050542587791975330523548939
+6895867004702083992837053115350359081392183348123057432804437516085126480426796559419343457573809103554769814374422319272987621
+0493741336702343083547043049060106406621621423866156744878463280624931631638757753907480473151395705318815364246326098575320029
+6546610394497897246218305493409122075422636049647756434404729742804710870898441487104017723846320578576625101570540009682146545
+1011863982645118776769923031005075048502898177517353081584252680645039932448249490068383719149012492191034530578466311073324350
+0940022141946663679361628444591959010381878575634668757912852707910261260983582304441366347012174417975464831931140858093450475
+0648068206853955526969735294213923796512233785864528730934169006767896899020079186828212231303729771906306615698951701782896040
+7705404267837637281673906483600597132329707232579985805240515664780686649377686946124141035632716982723408330472426681691722063
+5719449931034079305356439666263973565128713593058013796099786122163872295053911196817120195135137786906005302955333296169099953
+1565007759742421563846584208111412785562612780177121771600395311757381072903942514964351796547320888609281738762831301074727155
+4840914538717807330571774867536594427640229999158918266573255879619306849868398528582717693006558964074770743956975947230605506
+8434170706163547151705112191666162854461320116071520338539133193324696905732424568076770881016026396766250345270611437134977029
+7078829392513262023910437193357139649522860536333445198136202621793588265321546711781743395796073320028953300954811115494631443
+0358109781392845465184944557313417160881340633391419971812545527651450314512749202620144080637491419201752326439158460989691315
+6502021443239860929638929077452949976769441697009577432157105021271893283919677666379901876413440307841861569738215346309784385
+3775582600443257869423701993595504734055924868316007937741523410145241997102735147790121190918364977637486443176097526249923371
+4637116062887697972788560169232687166734847960365006931173635513798426534363094553967229788862861423059133919581108100325100963
+7530945856385218994386045042760138610248296085030904585153248074916348965900743636913197206787899808540051760130445456596005975
+0082651589864980975976353455996961471089119847766125021188045871260940417581575204228376995886410553255809049908515562710519369
+1760176651046607404619158827695196639809040360410321347276093208667279377323033464221881041272072298115933348047136279306992189
+4449900653089574942697877619922022124081013931968320543380925350254859461377805018823478776678186127822712476112142520129506611
+5360537273314488942383696459647239094488670283840872805432523968819547360255856276619301822761467290415157270983258323381158842
+4069470180647648022724489031315390330623675246416531426538288357194889582860078070141817901349890459635960185352818352346101741
+7844251807909360860529020528005655952345376045413861757127236316061244993838373872852044455049706576181912407467785016013363013
+9052782242469623627138305243693885375972159761715793565717369599576257075617300500868041008633881912456191819467065232604757474
+6257367548773919654525538912712606831341580701967173140576682703453195979358288347264315572356542410824096892368844905848969800
+0225531033632269859821449136659749178099595609866207288912288428688139123199517309089785003185562015618879502978274246919977195
+3412420395378666741269488926730591786905587902546167052955793049551854045851796515140844301739953615780488764468845360750173095
+5314569125098157310473890637519564038989130593324658307078574903372187794019987998391252363359372204089006276213106238012887639
+6663953749875926737127213800088216077686383881272422931892106536521390323291590624983492836817664288184016273391511477345251544
+8638673096407867791116469531963581105938614830552680798696429006418115851082700139624263097469936097502648484256024821946642846
+3261638416472717635495620507090713763983290274773473746283045337514051847664087913092670813304318998742601034170158553214610079
+8880759198069479182867513797991706527425937623927208476182273090404608783390855357409578977746370113730628533384722500327769010
+7964841863629197861004282115308229708980836184692237168958174288698996726561927516939282475998327300490824455643829853959878546
+4078550144875137620442196894251820235783690433882002285566789090860837373159507997956136455505729693351610325429624900264497493
+6050282912476085926950954499140111563620447106769829012752567207785593165136710295523078591701424407957863045561973215300362256
+7166661176552788865443610475451627720514979209097163741564119254519710530732032781304320231265321064373366029789454524964576034
+5731838949398822830420671258681703806386818639376155723888774861742977966282701086517327314375297715355669245126118723701881276
+1224558805186365369295742263213010659311742471260411491616914473284160243356280450620150570408750609913288411042993040473195864
+3965363040687291139829734658431286318462224708522925124414942719604612215357576250193871596416258769483377169469309016314582237
+6893425774786606424591335564336597467021697313261577560777519605605111465025332099784940659090512446671447989183060023172745349
+4463023117754025492704298169088346276715292811942385607520313996627188228077675005968319409041724080200894220147117291796736469
+2838367610734769148543248796176416656292040941138404572575878998139182976355595776291061040689581132913463002164503763638521768
+3585007037968899533646050958305472231296473689572926896126127396786068936357337467731293075452760614111507010520769025993887156
+3025256134722351463444782906552873128386686368275305328178049328442606382059696387241124580313700815579068965097895955058791706
+4888785355196252887855666442682481926655016587897905441501499624695729356509071382797002137717002280304447105900656692938689937
+7373767636755443505506466024295128010399690845976961083809222125377563226037530095320414396885247587842781981216438439176626761
+1467040097296217610154727986310524824930119662672041177376733844872215017687323322767179584613934704188382812120901100084067248
+0055261010703792927114582278798343530536332871891286962151403775103518820096790537756954678439988840466572934380472009105374277
+8745186553258777370952969850546252235196298235316976663904366268611878480055244838332857644576178557847556193922108941720480963
+7310291886872239579954842039199219595404202222951474277713284211951970030467647252785199038918806323250107496561396165925992981
+0269739665100112200470147709926216131752562563116766321854129961314938822821859829783043904077776487245854331065090150597583869
+6022034598022521394602277250974332652859372516801989113143038045232940829875622476147452690929605127893923207935810728978176813
+8336719184987758081413476270877983896287998313373933528191759149653154025750363065606417948489184358633308380877845477894994394
+2211461131853873156810302948765499385999974459433061226146423964769287619911252503115962272972255899290410107199334224556606196
+1402532784763926313823670409002705225482185592078872442217786835593632982577282903273472588503956076522785281354947952227775013
+4429564170373891691353053299293858952840011672714332817264920331107567378250030393312486800497701640449816183190591793478209061
+6696515680454660415306312055092012435204898424655900246268144415272389485588150485707845045690614308427142660270754614963190500
+2858971388307084324374434247865554208042477256400063151868591675576690659860039137955754547923321131572573666015058716528677560
+8082431519645786853787074095747644469767343409908775777981556502295146873300678603062293673505033125364497124824045616025095406
+7796338540952910648733467788030865929612271961440794230689497348772551503718356824778119200166125356293580937006896521596909494
+6623286777262305838866280436574493459341503722464731387299068764367690003490556552997864648359791608273875942027789979081747901
+2820762823681177751588883983434913077317012385982082727245344446265775140411273692313089468167013918322825570599659499017461253
+8261747834117161824733335000918969440857899686470868022119901936951959497914248555296472517607486195543086996762943719289544222
+9801799673583374329577712601117604429044210658931033348348701101269055569381455391166077387776701104476767458640618577366620088
+4812671524372167827325442166901095131227009588677251478248615586184246419258110774327904940522040756539440861199193515869861850
+8664636186261176234317788607818904273283245654628256017166703040583397980518196864696741148650137946657712844496351414683354360
+9233785042626900594870398424394786589093845861107111076865742457098507103631392813148996022790966610376381301013746723765671101
+5599585345939628248728616861490756773613146232759270658252490655694524473642364799716984131253156192355158951050342077829511934
+1018115413367504225955575347257464735373797464835594482025360169817251469418319729479090655145106287600720398462808509722342523
+6277929810316831402715379663360019513470321307271888286707156176722601290897267704973159272389968049881611196311224142002818283
+3935507653397356468132051961271044279593473480413318195705016813924079917284710536189206698836513833423232062305170527285530270
+5930541214728728710514258849354991541204981028873011695299038161284051747700208580498162480391834623057628739847088944321070540
+2131178112490366896971016249779880442716420462976316622931349965957507940779710818286842266030393060843328131735676772739856028
+5339433698747921036431228649318038784378241814872129036313002907877189828316605458939009159662654429547906907634851960924867766
+2725144295031618884966653121214453016640389429569724950019640175004023672074204183536974715285043574870846234625695507751624691
+1101023040899658835128880208200979236233784480432079242348382094125974376887755928733596001730428491870299057160651502141598807
+7529805201863368482438225714843876867695794742159176187308623091428831090441762886002331398279108448588579520003248961018841987
+8520639531359520492110038481387012497220545183327686786319255787574425654228049283708164761318908288816634942299623177967850311
+6808287068903794688768313922352685578188040716704660250946776133077382541811421559714303292759615754217647905753791800896114429
+5661937959933192849164004778980526700005624355990312125795014118394734147334017327033918908976463421944496702296931260093163478
+6866390898079223822127023182717821447021210719486206672090868302561371850042810557962915762631762160188811564644765871940463260
+1983784957124576912722518060888269293020694751991232003856484645400501387457614453894654158242083061986108255912461168024044362
+5023757063288290577909452112558045920010016969071712896564748738667312129264760935144195712725562634643903560619975222875598092
+0140266427651227095088902077296483470532188392053269670883135265668245606745264278532552540957167938303029227319042084398428852
+7212818706985477890259174108784143029357600406814727037979412733984989889987109358055090912357026404921211609781959966663957665
+3885309358663398776897062600124335478996053317484403001725157655044282776168453835403175508740651996708988152698983678588345737
+3549561496006579864153172902480324325137781423364931522958523431287424861594425297230970169266435951937028485126756644018421959
+2100522734881499893473520957404272588614489603694208305341205355969403603944823313607027770883562580199458807047182736184431355
+3558566826776678787162145637003470985297896846344237649664211727912542844807936273529611661291547660198761650362176216275159276
+1697273051970401823436818435327916444246809126780823246257873146180484087471375537086616586114897794676638646530157453530809297
+1877141731822379123458355749374949833686834219493808460922026220049948042459289931477172440353720942293259692771867444391010663
+0596114677690135744062023310258035439858771664427542203238516588128327906442218908975480077474481540939986337760369812161668739
+7140350695399428116941903267710113882542083290951701275369344655927910523637037185426739245384522097331905044898640671070017500
+7453482207139204385313210256702640687353020750058344407280878423180101848431141829884177527114462939147014281506261604724365378
+5747051408867537658614820169384534962462911220360124367460201651929905485919878430356918185750947336103425001412723806012420037
+7672418158298677361496394053891368709542765466425399242228084774006250993472472890952527381058062695609973430135097018848485375
+2721910797057123953879416244095325096151158592383520642643416351496904866623597785985406941433201519864328401275343395705908857
+0642983563496035432630122777955167888076028823131047975325063367604577001605053104073667764503079932854743114362110563627584697
+1737450520589955785122525243234607141022634008326290553045379074437558301788691892914015378729774742647378096844792864200227145
+8049477947243449894011256046326611511617306926576503154750985615770186729781372043096871431456514521234719945343529143211616132
+4060930164560164022219102032312173710730634459253495956116881900466752536260684001258460015562183214690371015163609148581576715
+4339672054138260157605312889148304084301210593319661500758836115820325521753635857005220500312010112221791048318710925629489360
+9098118884517110952549620567550824645268745886275953112452963794466205654973301959016969502644339312155829940467386423970146851
+2030422710629305679756784568188030405053813130034967510951876362126306529129246017456183221963883892572064857246348841309902207
+4014325197777088687588337561652558142332091500654763031260105487352116429628561906919380099545877339112314250562226830515084041
+3366554959465306038343578751837494403196208574534790117389855546409717054044483042532146409499847066640874035730246190276785027
+7784874865116514506998867941821004659533959527747303526874272093224628939120659783314979799979608075209344316698881835617720838
+6440603777916554902557821762272317634207749152011454338456295029524399535728380230269435936275288518444494136138485427687743672
+3697767429372731488197371169546304182440802429138205900920907076873491237616407487249087243231746614255961699354564621444166710
+1737116215657118949418096366707426664676852506304031637797388892083081543972250240515279155087924413491083737598642466601038186
+5943501997584026886556269657780895221836455524956899348998644491412008841758015117023754182242908647650511196372757530427844200
+7126098691386230123347928604422159107062602585844839531380975985325229120484080904014468470157441597070403077589128617082084491
+0277414078111008949169676840880976444791578133697866086476338429943906280786246925904505101785927908752510981120731146336711732
+5011921703942318242688882518650473013576715256957336272842712546671709676486379489552317943731327342059730625728957322661925103
+0879272542563908841343149899911945430473689164183260890378649854294324088836226655479509126988786763035689227450447066454969580
+3635797692910230406460094517526461454920959082159212413377990917407487877377494660930246389887432321322711771671714018210018244
+5496909568572645176488382324921312621177838539677336553279411765862833091060541060811106495286938550448561214644311877956532326
+1372848285800862888898722477263959718622329488994306400315469392140836614515990231729283982778367781183582185203884353672168533
+6002585963544294141850925971586001726265376264686412361898087738304610666926697454083310088708743790359728974336913706461189057
+9544994601782264143680659072037087516325897282651078850550946582804440990613134903404213391711941451230258293606634693846961977
+4294296739368718314807261871407488388139897913896057193551518458028526780686105950168593279489650803151515173510050942218207014
+4440222769538547178501749374936219442687195706297985586916321673062155148432380676822216859833618467359812508595764374585042802
+7090291929148830504311787542972555491835675686001439326827409601590115100758667523079283454747571560861565934370463671494879471
+6306207613636744929606340131323412825985507087453258431275338612289333774848983021189785244607159387364635876091430264215902551
+6978625947059991073203270373760209952614062079324674488242868605448441131389947105750784088354616643566884781392969415722350013
+6876895254868693830649346298281314621651851243964761424180528331393082774872122268180557991527876049313013835528942921722633863
+7994555257251266617368145187318488777925218911343096210380569645729516845387191015748935661281511118325824054860678678241487526
+0561712487759666786219959935849355827031795611802441457990195006279656115907452353501575006228849649556626967066612451740817401
+3065700444272921097020103095032561392189274167240364636985217260309148382438375007728649942200430100798750588348282135626863041
+6418290958339960432209597429802884987767056126860829761197583897408153172039938420304452769552704862796110442336483929988890230
+8411149220304441269312528476234638082926201849344380193272700895522547783655344727512614476846755120115181365390739989354909216
+0361827006206843386504436443633849307138803846456656207910374387223474485947474439419270873842802147250905121223284959187002960
+4561901942869500550331725452244098638243866570298342595884556094097612128702524209824571526031229091793929079092201659156014426
+2569784663225002575851412395224946857021846888745089626571792624047307039913201999491767773809090290291368272189546699726924662
+6874345054057523806453164208085928558404937408086499251394158950058605789150302667994062909598865360566447853006716951800116507
+1806892347177795837940597487685027448543886249836281858785204813002880073746279096873385938335081449362375954555853598273582800
+7280197984136582079744511307894765629896405494228558457447110951049222331477610433641974978714281803792968381573777298819652746
+1797088044067027854938520030542484156979879022746379761147066454374087806486473993175758842146367406488679492927645706548068169
+7653106688789014002295870215309142445613718219291306854675259348422471093504331308963443794325054200760084750801107789128152322
+9003923022817082834921721240788410357242843286036977355497738812382673303415071169601837346379966066053060156517838544048108090
+8927903196351477482460887787174517966173931425526452434853205934174795153124436599267973662874006233354646357728472499860554504
+3649137050137288600334652169002894564926317935052375328874723351133720379648102007752831671041946276927861278960706248758820299
+7881676548153486303936365019720006418330263108526672450012829414081940012783530554845066547004930367871816825750941800388750747
+5617499751970255706526710234532717339068075364068621300856559435412791685014748892438638038434662792832126729610856601828058978
+3609505162338640897172019393757051075698357002384746777463891780931828353562474692966266497051217520058712600221078906316845512
+4218942164849049619324701770389240864171286359070468568203895572380950389773235867347931266228357895243861158024586703415416725
+3286877811857113758575603255834974713137243819997694752214133530728139390482439967896436662426005413536915227299430206070281748
+2197090522718698504657769582076344098155286933671656794750871593655253531647336100969432683359373204499872727545324036411875127
+9266329520011965890398156813860326403682885444460637962832683571266360623432333340007962893574859386016733773045469648300215724
+9360218780816808197711206028145267393233058010562551036732947883280144516446467977991400621686114194941533328336858706301853920
+7975466727102526807928730597288066888928449183473417942716701022737828267407136547666947638756923213101355014521544864295487342
+5529807372773853881156331115996145600478892095295063408262502214227819442322854320893250029815358897498644974831455098851752144
+5217677466571168103885153319146030362086428120742099054171064034691470505077333070394007756131235288630142015715989289401952345
+3238751872112411965525172279795754140090657968922574492232135102357083597107656178253770512768121887161690539858563177051498031
+0621143235328817027584926551312004300826256116914067938452329926333908173348351478521275486940271058902772821984682443421901374
+8675029994765542582556780936437230200725353322681947577235834861538086815882331325782379515826004655685444830286018743065534290
+9009226484124905023296329465126310425464799999137557622919308471018246198151834136297559364600044830857980861753679005100073906
+4026810600660421971978121050945152770853655639964897333811108395111596792046176724058242259398267547036042717629901672105588823
+1701174760060091817941457573061071686086097383906657079983926029247083644956175901708832562604741667581501354921250883246878076
+9360121868675405580012858168094642670756925814930958722345840360155035939830719501362830202256115680429221284715437831407183230
+7627384360887381611002122676157337577850291681707758128451482725333215128574377639863228270429176470896652784523071172226399208
+5924717495388805188609979501739528551778957144375491268555383034743525334962407264117945701829683575948250702090310348063964292
+7285038571762987494406954123411340680613165769286304746181220668099890216085869650378284432589286853709759806525223094629118994
+9108371459503424585162428035918267612861106220506440110173672498423384456764491877643881942033565719022603374698498258614890281
+2119544835856779238923121210216240209691871364625727861760840643200609817224777039142791222829730821468075117365482012776292615
+0287625006985324113383256843550124431381565006783532108722669073077586017057966762263289920449445173729525567088605286164318499
+3802234646726929017573814267132203009806257343348973659561216577528599490870752429375293883854127262090614163544620710283467000
+7574267833171812189998339587827378487203820258567218738257171370030553714438406356225807045913475052445364294909346459733645424
+7057209974818106332836072380332490777736818456915022774135091028181738711236811811377666386715288877847647340595585098875240481
+9197215476954479756497624010576859326493604058234153493216522641384431342823687635555610194191608220091909666730522341780147856
+1119537820044774998504706322100346395055393450296026673688711639572331613882591716507869222690391102545737433635859812821586270
+2028121903848368987212538442391618102128444213522329584551212886903253244685970973210284229639689302832127513289597893485709871
+1139101840913818162477340055623563542434178020287614160741421605723686784042526943742745792272929328869556547712709877327596063
+9107408768006237961652791681788083610784715577214377191666576416371990600318918309907846332307177843177765073709224406749447169
+6733725726008450978073741092474719053157935773438091672305982444490248804288080650618594239161482780330596854243463318510550141
+4618707611170337857871421415147893285747404164961249246066409955331826510336908541776726066361511390478520619795261534651528646
+0029871423726184455790317017373341560382122160829511677232857909382425970016570928985722750518023888742942482674353399294113016
+5851677764630543407742209257890179166834894877003624901201481696534056706522332095998210032002750686323425734736641298781343895
+9906317458124808949504199178481097664951999312281141056844360268819241235749855328929404804574246937697891911753442746410513511
+0301178939436270473741478421267690206733306236983147974561800903978683929049444127508643906957999471564453966363638317098479091
+5695590670680910148994003236516725327853434675592633044599651978504490768012904279502213144296250305384458215615813612885360699
+1739488113025246606429350291878905105006718514335177675021282668693092738324431010591942084632165356255063331639570681777622822
+0452464599884896996261376953519588463160916217402746423924422154683861260191652961898971705302933158251417160490178433853439776
+4496351983750730650624656965901956261109512227868877661440793378743454026849129576683511149685514643006637302234104714172349199
+0650873766138283576167959756442091757660353703079228843249388294567585567331488037468607523624545996431350612623181744202876623
+9217884841612782253645748182653936757610046223059439143748083525756745987386187135434504743166765496977544377259895573270803669
+5233343431863155649799928568730055354198316775389815272387174921789883067246402571006054994197016258947251698092729387460016002
+6222471188835586754619063338314127078684770466144889169048987130424673328124774962008878054843463980934491177848530073946295466
+6092983987521059016788973113331515120050882840886284842856803861355854867424082016223127983920367739842939341557083529339357539
+9152847423135593002663232861455632334026991039822394086654099188131348343461957860123922177650787602787823148319677335222779269
+0688837540315420699495154888659745629289164825587079409113672585691726485783954257060693018031835646491154074592682796993759642
+1560331745546205131052821650865965767504353088368099838110467887791087910699782310016063819056506494246788726522788847044002972
+9843063757395851013539217226262322774482770252168515327930783086524549572291277963238718919614771432829552926078930464389873382
+5165503350814374626462147517304790280393184056104578516266158383058163824599464967401146483647756651293496532192439439145458877
+3334882919381143165661074051363092147447735703148534066554968559573383084492917940343234309775642206678952812922080261015609561
+4150090892422827778476783958648862075260361082863595155851728025658354185826522324370827070485157038772970922137249416500335139
+2270729610239360993359408455484013545432335012129825782822705159183112780581412024925958595707332590452541348227573704213342055
+8812698543571227460191878467610741003808872140196791243938096775905061169632652370417102797369863591037024610630210903737953654
+4650850571724314687005845773201562588529522607481288290365062000530992710204626283641702861862037299641210309359904939817933700
+1541143632255817063903213640253364698002930217355939377060114361273809860644552941254027110592936933650281526566113066201345129
+4904443218069061051090074486584977672087200091073688866301081198367118241651115030647481869824608967401802054144740280994709964
+6714819600988123781424031251846423957142678675252652218273564424036686308763026328451858255344930462603371376203101104448466961
+9509079835837547622180222314290215064732353288206452347849664411672496172109171750484558066698591320017336090478613367662057930
+4411722606999341112288605914814611482715323396030160357274723566603030739104369997016486251468461541345322418772128759607222696
+2948183785699572384084816055776039138878581148811752092336317365102276231176457487558011884744609026187961229782054619496985034
+6425095624545385534119498681567553265889108179726785664829530547971892685921754372850536788921833807429343926950424016846919855
+3908326069100657803588698889883675042505627231337237747168653314558267673583632726264839565017058848634863075879312565153073799
+0321367266050720934662774520376532661682212427124263069420126600109509081952403933716651001460064949865799766176759028464538738
+9741038058065551330442704073919666652946527397570055939551345839830820648016177629571594906346803356773604688620184511211636838
+5025402557710775296650014515224591309232698067998266520271098024189399721692010614452489061642157793190304607388980065831660161
+3865371756663396962706440110406172511579502225888432146828231479035598172810500698253040173626514931478221885791112009689705108
+2972286823839979161832311952971045738890113686974537517223372452946515286365656547601871718080007574659696313592727664057554794
+3671238913457833340723922452738592109309375009714705044237276003225833183922594035143870946960395880735557105535062577056078657
+5639824224660978396027300014663032753936090244783494976851962014859592152013834741021570506331633866559318037963618148063022083
+9565507482964988994686034476299289689477300610763650942914931588839058915298408270882723496065586551944274748829842524532900569
+2950174215698554483745941905548644387438215825109435969023495189379067472134512077000118600012988374494816155364721054534508820
+9518525904194943790633186346738672276318778362232864095452323156494968062204689793145701834333799109246633884847638921045253621
+6777489268860937675801194897856962853781999286279373198884776447439334574892992495036091872659389999472183722596570197112840487
+6940178173947556103657708676822035069381549630078448878860057242455764188710473335746627500154960475546070307022636234086868814
+9329686102999304427635999138246997518586345169303923543680994865014159368545564362656579126189568984209672180187596509411904289
+8400290546843033015441275084455799605870040808860666105081155326036596425585507607789010815662662324838353003534213828215099749
+6262731155067666934829202231823905666280056341904107277513506385716411353609764416145090669300953084810469016331307248958077392
+0982572667217714967858091868055542854621721843072461742877828288780619596753823464439165581485796328231801786913442847252641526
+4848655976411335420584575046674979122655105315200347515565901735274063028061587092460808297171218521824980966675211293241764354
+2938658446761945214970070404972488238286005305727629688975307477962234711112158327154676636619409638849544823620779316735831746
+9233723105727772276287999774922758635916582468201648663126732610340191585232715185516172590941978497752196971596838962424314214
+0715690795433694724565717518703035300373548926507910938888351542625042732566820561320308097626791527666632661894798286702091403
+4964320219506572216963601199129841376254539941692757336784083929771858734782219556315822673159169808692321828354292775097642159
+0335559611733921504268377474272853207366325430567729920137620204884173222566965027114331948190426982554186105784631841860371363
+8033508558384267940900957170710292773682470738089554833769290979485707252598489360936633550982291403202103393568639544279214517
+9104033203529399347159766145704434677301867369574628242547881760927798205454869510642633732888078982477565192220841911379788216
+7987660031763621257245807669247102344394837687835695594169011679441270384265326170270019240149525684618010449694008041756350062
+8151902440733357075969965129856431003770185569733670086864031515027203169324745948550070082363039150127359144961399154724592013
+3790327961179853157835883754649149214290489479319422066362773172577179735157530589191336297098156970651227770438081844185734307
+0727046673630137406560803707058042940068228879956058420026237531511228698088255979495039662974032046384364026969019919437568764
+4204578688546460366354226690592321231974552743860907666913839079477111780605991648504857092410645662298682793993079551732419876
+3756294405429570395559614676089322871628319405115443082409818445213875343993774082306018456892013141571878129826624772129903802
+1915879655542608031603048228973067523323417771894628549592585367737979812887089684899398996853836990904295238545782994463736003
+1862917064901509743356712523964887969381684280627429777002084722985720739317294453681605121270099743339673719320682461749376518
+5235629358000506017419756442938714321316730985284287276160530781176188912088650998156658168743552720877268116184356043543445755
+9443882656574676998601479646029201608533720364834332155558897088411735201080867283586900504743773546108777074700728937687647870
+1677493272605889337983961765432999426943110889282768474699096119469883217687878946342929523139815961885455260346054616901453447
+9942749715588817104901581207188857800673119328816832808571244811062495461360073125883981969697016073423707659358263862951164461
+7589849154636259255662987558451236625196817855393407896633655975124730683842916268495164065502043203437031707489979618651602416
+4877537573726160052953215845080536556910640218250727320033197474127755187683283945624270057808449225177808596236183681916214308
+6307674309759482316304083895463219733480617515657742063182272951154632706337489064696789783685482205360435876431996285794642684
+8643739931017169670588941204387320679922643218218094561807636190505893287798227669018730741719908408353128973453099243266062517
+9595878873331613803340153742041195527735780444717553915355354609332848505998881213100337678158719821578770031967558080136888152
+9826258075448305567391906666815695574763625260042694682673443923778013491658161518721464450500242508138338760627120693213553580
+5553946281220024617384962807582191448987025563460515052097885240434443584003120884005027893320006209592895012188176773812824397
+5351207991648894581591662853877103686069327469518295438143903554689747912914341445196157967066587607931175822601224101946313543
+4718020971952950496510335972370616351651238578779144226177776993578212091520634237018822715136461197024637982739115303152147863
+9502456279815158271330961578383078627663170821879138142148906444928946168505151984176109046790336568113096829851051335078064246
+6953240969636903319954311768057533966261755313567448194782711138760563765547507739230406557393058730942539222575666804143511119
+2069936646276438376676948110321617772893399556260252358509335079746651069969820285929369016951090713864814429938558082689945968
+1521371174145731236232976467624651809029170086344894245707746268123154057519935873219521049882236870962226595226944947282873198
+7819821085451992801895188229558460134173236266804505398682944828070031878272264470195089873005628963880175293100970223151449714
+5581893838568192200692899357118035029378571475716773858918510887575125236858310172913692992079179964473799145336381338174573764
+4769245956084317711076182507252518842194925936437279722455907758875435914157274173921143663890367325067229935879996805150485626
+3134946076248319258593699700301770098983689499295660906642311982752703674969335911328913636983282731424392564971128071529792186
+4653454953851844259383149899336223085116998954459207141602572224661191223836954928657358541085552778110770329785385935394034672
+1848527104180913477755119395683294511819189869818050532796513348646616780772576901429766012659310230873210004958312011164035296
+2958092156871189322732011639055425235756904126336215793291675441374713359747361020499385226744232860514052551561041374928704972
+2212834863497329670476581032210400927271310708293108228424935554688407632484416285274174812931270321948680850009808218617859705
+5759858970411718249018834966145654061840913712087092866138009251429104683711023685469060131756225674409696442152891897372343886
+9744590632172501257249804338242668855862458498369585009073080663432870189779358421204658237236159348444067179731646552147785093
+1487302286960634890703793800583916358993694233181958170067964772301899115902690629049952516027344747956086526751455372742400915
+8338876525824289493587802849949027999302785007312125533604872964433845704867828931952315117389601715858805797176205231916978863
+9771708561966315440823738672686475996359300091791133612159610896088743156170335643885163215910168604808694162494306049091846493
+4260246980990607411798428730055796631495823134395302589335824515261468702425017396399121744052394058025204383900792732372609031
+9971700068769073722960546542881880186840993544233005529300285659415785115249158554970710339057479784757811267863305208596232681
+2366740530644754206054437467535946438364093779279894170145358386159026725061074970741778654202207224942319105808241561149108640
+2131299570746273126264570482316141085118510380774029845237350007337531371596475771574171940133305454244596824947855809667756017
+5149174518393308544163272712602730988826876495407743839625377436405836969824290538418225557277170446225596736304939253815552458
+4121823510749511107366436348094783330267428964699228112245771169272372131739184081655990835742337126629817378548166241761588650
+7681892302838328396599913751062470874471102029977403036886581893796472818466025775981658918091981433719370508505357431231485600
+4066251794397726082230815863792863498887502338665772599923859722198014368910671442996024261604600584351270667582157099044750647
+2453319243126941865196218141928398513931210505017908632678271906294188175528244273588712226403525451579574075491526959814201424
+2165992720884571403675858895697135732268260556618466022757708781513389984131289376166641651464163701439701648503883511692095752
+0809953098069693344801057772787094818934098518685172639722513866511171301116371082267224802273430384579466957516125344869179896
+5481982401939122614289521472353637017126771394148320518526784723238206085981641590886685015768028048372274104457267692145673344
+2306442226244080959840391166046824665212018683995806330612693877379188175903847065416666586796553782166003940513860649019698449
+7839622245401117642004314710277578314230150041129278793586315748881510113272583096733556513373523207978534603403670731996254473
+8688617881383905361473235374450468814839809922748795968256897565635364988983320676159901781893744135189821124712699202769736139
+4654535121453878305432208653573696687720659331945282280482164376466643366264403854440410004602377849435849425047260830549050573
+5901354141130553186089991532215523080159611047438619487077531580624462005235622602720033994742060589665151566143947383285531360
+4404189049080879563477017517544794830939312853525609682809863259313640891722874703005379977055110211171023836236430564193209703
+7229494566794585131912570254848123871703487763830158261455284479338860024826943524410960337002804517176829321597236274083343832
+3895863444104818475102160062282466733057017625695711453552783055209411033854956586687106898952724582542873871156820426292736090
+8900114835631317986947314833806014993742344316565623294563018259706162592235301529753004421871816938486470617127313453996556895
+0571759514976034692556387423658377978720336611483511537576020419517170544073326612329641870061597096528288442406290336718658618
+5351965547349291678130305501394296379111242594063885471825143788366715324130022316640730177505334429253870301505302005277723169
+3916717817342560503418340716556896773392571317597234277462755462162266315055085507027881148045053452399408688937434362014420860
+1395787899840181514485743703752177228078579014380638280483962491760489212783979634460850686798659390084425828810746413759168217
+2135670387347630269927889910568863392759999570308499518950101510541542088393000686133918165399672601047703855590903413630319231
+5402756885639965603367270976348755948712799599490635951531639604227412641095043036804481527401401591963544493042050777198305908
+8529853370862945970036024025436607369800687358272778049961830381455619066198750162208786259673987188349784621840620855238037708
+0287160171661419657676846666977667625410411272514035315874978763125830094141664498713238305106795904657260444752711842879767089
+2429466318667908141926838367968922957966923427083942277132655834855250930739506120606993470384477050842837546690187842884625651
+0859078343456062742869073421013869747003592646292364644445549193378529859368317830004107789688729965524376290149979489394466571
+8035239664854439337661491633430612363668270550373199092404545748888325504908156365529288450637845828980854077097067322982777549
+3141023341289995552305686646515529412648513395018325323202158482204644747543553961230472458295893311161675174437937559470576749
+0847147233703839410907356117466248368234947493218430919253855840473886381053247491509943700747999091387943188137392889875056078
+9027561924408681103294230082697546064172946790782404069187548612190839473120786175725940158419889526634026805571973842865999326
+0264435567708660940819192568711718952454625290701063992984178907184987617554072919582117061061638475508286749372288750484810591
+3758876219081855315432362136232140221117526750802434000370402808679995451358803624973049460963970344708478212627401394392324314
+0737438132749076462394577606428117744360361527711020670066707010174337101948368515240770186600234895342764130573542724774509423
+9073624026312594849755836859839861773390790206872160912057185754009883091290659157623485315161215679742322663821620022079418138
+9512292856680689427009039672717710424584681275009917377139164236516131951125126982668253717705356666975977684408510117347264524
+1614244135791303269397434529358056292497647554306953362312956458703923199969180084694524758403500654442416064508250070732846804
+2519174085201627296034372830011366838603028175377849633378995386798621551863828217907888881997187873208215147973680227021049086
+1003834843003895903348617625671797354229539053440753237068065646834526921585552402882071062806329627104734866652786788079565348
+9629790405359972301542148043545627855421437234097522244411526361848299030888697549739412058687417924390455152178947938956747613
+1220334555078453153775416863741025226449115088431256895031662080047877074330240958104951191074477627437218425259277775462127879
+5330046177874455391020429152325102772616525806909792370732670726443060748075990477694277944732782581654693994482617923050984272
+3673634429035216620140695806733909073383802026068407079504394523147664262305135669486209989893714484828370038683949845972371071
+3708115456116104837959577481370904415573625213784335620684326306607428751455492651914598239687297810388689807875911114963544682
+6275078866641136241403805509431449819259498303907303571719921144438991991012377399643498948247855847742996423485083104296357966
+4819771171509939007698439213480827086866218725106376148904562704537146213203839362150271333692094168029380425896012121918182027
+2363813324380838896838697582331955348538206296702138518105826516120031079298034769024454364560040544650658193748994518844922761
+3584004325313624962617797426518359904557846265454464840046448902633251444504148633006804302389871871448461320891471777760471406
+7015140209188781023966520963877943044151556490498938297548114159848752913311985584190436463500622710986698476383835553548754022
+1839528400463687701674829536257273749291910270980698644016289075485436646251865330303505791679775487148849253452040305315948402
+3145765566550173415234672570838174821210069239627979798684879235063388281638855085067234894023172727303768990495108093511731814
+1483336663514861984292197260930161194717688304395281475857151745194230301582456092278030099203677396095385627051965960418965869
+2854504524032911241727059077016541586716790096641727786446371669834231656716324311341476302384390592511402123780357675520817756
+1896892000036214095213174483595939108751482199845439848320000109938495152786801921343185996467957081886861283697079441114823751
+1013835470696140967938560803552257866025556771879993212750495494783316985507407134125075415195171213975980403552113090097922014
+7515529295471634503543767654884408021479006972212507337901526368761975637401627838535557010674676502841359449244736451534979277
+6386148785910089568558317754358991974549956833481352102962872492406026696207774586778061183616357702706148878186924821100084521
+0786007793408177523760641643227040330556706874975301831960943949711205745890553620154847773954039608277686547389729917607939287
+6601065186724585869718286730900507361468222773067014813540248318802263981782312642062065066278538284353552795463948608367617264
+8710458632884006689061619016115234211820116439477889276589203755014121466655765492211482958675286327074722685854832241409593748
+9721061962175462432000129864627652688757814948302475172688435098625740068901878583888711851475071264973226898929358873311316683
+4174366427344989068552152924708427538956427143878190827546384412926545762544478791156448578168011030464548344644597978114749995
+7360922452061081711320164728509310349083463549987726136205083770590452623618881507969241810844776231293351721107321616807591790
+2550845118266461695500217220306235111000226441822451555820123914245682646337932826709632824811050296875427929721177340139400066
+0537242786569134793043366211458572528023713869510543400208763370329672141795438795279424345734151680580842314157723144187850297
+3691971167907808375655388036762185591921761050859435693988855587355710680373549562866421201047569372572737260475884900803372055
+1007691946206878968978529598838997374929069152901229662680626003917658157134099448777326028788327501120348629153653344792265032
+6789665338488546383152814125714262232923477122140534949024472459646083579525928155625268840134301323030935772657800235228310313
+4868298684968408834649240926318299142611007662477773878693177513443928825272512719998804017438032952107625783388477428012876908
+4309202213419885445857524725380221565049288409243087159437144931986513177158450201360308556789291053726105045930369784581421376
+4918602058560708246713982614793257938660065153424340512931090185661823200932451770267967499779255156975310512692435013776152000
+1110183674703280644653992907629380068789930715341891132020648458097673681456412608084277373854376969813158591776142390000280900
+0445144418946628205657456424237128264942955311965086380583598212294732021966933151948426543613378750502788733253601313302851775
+2374366628960975291734051077636704217339955444337088817734748627762386830985963672836557693273405067738105684469127912825361938
+2027506449534260776940737096467772483868296281393345078755987162674894542324936567113913899614190563606092238595769318736510014
+4601609459626193748838141934701193459914056226332390088463312165368986927729066528661188656389710831973546586554245180984726395
+8820641417137341791284188339243013012221967809583302454529489453970560570507033795822714618813232104921926392983794422966946716
+0917599289793082450351085959141123440985146982836878988204562375158569611940037966919396385952791842444219407364739497415459949
+9477416265026706394163032606799526520617258416558453349947010427060666346412817629143427886670549081801335758913070396959720115
+0666704035859146354165211453275694040361967505403921624893044875089069215309652369723945012113209887458307287755360555234673115
+0255440161315757825615697585801039525106439960924827488627325282298838888854341592966844608858745754258454784788330547612148950
+0874980077738428750262349348089941932765130462263947980854368723919615602845763694707934084120416138718231554631967803081258409
+8981164868907222146030105839525610946849494940635627162577865021292617220051659027789888586435753051650333546661672096178778980
+2620946901150871449077949420947077759285135192780733116251997439655441528374111538899479815498280668657556929167956071921060805
+9030260608320606358567118378046750979991657572292125217943471649264668431650823749458443029769965695844134676138947512285494656
+7911546964476705302214543959264572361084543166660831362636246720337948370592526588629297565497381903059061404007654352003582699
+8922075574627020723499343655693848239182605712427393497956424335482790840429881008002039906918138130808630673506435738463196394
+1030007563952008786387120762737476786971644512140825923263748032598127575949995761019498818566016398257609354069772389656925099
+4044422726596923902940860834745051450250943536191821985629944194928632102239101274072099618807513448554296724965250996986364924
+2354577685813636309146827729776859816069210424412883327405297035176569137490665953223528983078628177275666747947529655966331575
+5477299131598928984485290428357889109417137134680518227595002407302611193611761790018230013945563583265000510580955975339191446
+1619521324601562573756521193045609645344126519940152032470378539517720502293336186421186366939997498341179560168270447355950110
+4230306307869293075421899272149696843537151044956328729562855283491975528896006550623263787552206307775364239158496535813468780
+1611641802461249957884380478543784809385839965522996094364642447223105495756896318541934272292804367584843894271046287233761298
+1709756805199283313621618096481348781674012787506990084789188511001769795898381723775624988249883268986469361054705514036409475
+4042054305280705588082843156563390558519428096353822906407664058875561059644605482196547535261726903242582076817607377960964154
+4253860999746516433043460107715275174182573491654972680242324213294530205657678192111601960601634649905585928529798955700154076
+6676179068384501343541631038132044675296273720164020679619589492139981245074167783663095317254579357724910508792547067262588017
+6293884180622784793929874980896521285454501177558249542530377203281315652064795385736617567836645686619617679168909645709168097
+7743521550856066318163410468235782415369091035062393314878499152138458241235674642599783367386177248502506902767835896501146443
+0483794093371674252980588779386498050198274197464907995529503130294921702208337296889908183028360175355797035085155032755797134
+7360019231801705667141478490298073274830800662389220682649304818227754575701335947775670426238672520023046096705399683924718657
+1560373958818879850684156471739380073353650802319300382801718291634025935869130174150899754981641558303334317282125650661935271
+5092493350585336373714086054348812631829949972662091014907535609939068169965945723736778889287001972766703372105697934518100296
+4734257102525392916687039288087104774233931626636454683584533774360103845888157407165794111547584642769928525653912147278806542
+8822290823497972283964354496248019949369662678090787983018405519062148805449317563743875081526769207312318307346979280704726453
+8280283626279949899078861531461602097441638970306234787225062938541682486544091938804453769368426982357391305981842832099966845
+2217356720554468128605404764499852161966456502338368106620715847133295711653095826628517163144372167241765382757784888551945323
+3293984824292108860635484259719926152739335450946748798660592468126259449417195090268999500256639254414418461654750409028017288
+1675306289991237206693384004427250238261655808453706438418460194044272886240166511333039026240609926117492662156547022216935277
+3798683710262055280473341604637975853707715733359848491914615475081846941708688479067522988710484836724298291195075742855018190
+4581874216800089134728449476207100847781237572690983431502108191722970308605570690039979318708286697553630513952137757229594209
+9413803628857147469961583711007745023208883952507321209502032469098964348049914806057645578293300641835023243516073565578336233
+3421265017714445796604621284137835957308268098924387669789495349357687107880833828961898545436375036341306978848338980923182467
+9343222636188028392447876071807038373006670961664292112334770077234449906744690005047749541517081971030139237186089097495754677
+3197112368581263984569948101844452284212008325999133835851189833940770803601768180655910037983634430639371254776873860967944989
+7762428156063656052457140048976461668407455298961839410706956245596539166362271685772723545123147978715000469199290892122691240
+4878440976953031234401260269958754462435834653516282136155912652234992770322924693740152133726104201502258366755195941397981349
+5410566039278422394352444668313290032035427902945347706947962717669034134093986739640503933965401015646443482046077453432046184
+4739388878693555231586220110918786353416678121114400297535390976972658914130824675010539898056712966138526147925359029678913230
+5886358316255011245098615464017615182438190446564591019394412368509357681569397482568515821423340665852760995420364289038278484
+6311541503127681976206070117236931568310981280275285971795790489631417369196648946460067342315632515195328396495936094906795027
+8224055001487992245066819015245704964683485501844381492046566836373072408682020849321689488337660828971885175876650163928646965
+0254578793821590283140178222280457619069765363934967602749676534057099985483967828656474230988014165618526645571684624945648693
+0109665916508637725280874977575865530242997110923401414431409335639376452646452851515568924163798404754643876369338378812431753
+1218315801760060263870530314784967603071899867258461326183988209146000243519324558810891158838383484826158948667409186010480817
+7903203377696988414945216232421892536173370183150633896237853253925354364816894136252089105545529048726749085139508534886223860
+8148078797101770523716078377874332667044042558325146665083596936734559299430024125955358519934955785765198216278595449870598677
+1116539363983086722722201448783346777178486858969772190694450961667734803002682120934093453206868817575132463247817949468716367
+1637275206589839665316460804048412011573846372603155744795091025936193454883889805228527990919468358500076576823231506244498699
+0027621847956067398935694606560509614067216464874695482321462823676120479915649013012054108931749591716879497574932046754706928
+4550965358813639986179681154209780873107404530149950214180601478806568724333935291072801881538682786052141302073521529721130768
+1636835808005913985865949033373364692120504151732972595493618693947796782831116462924175961942781719381911750675622713009187832
+8144555119970713260660826605512619993205968791014438812251863090080817574324870955751027471809521051989383021792494139844493682
+1585931821612292754292414253292528827165768965683611240737666722015320896218326640019860760530517054982970340862863680710846055
+6536681595996347954437568694119184759342070677456835801973881107420392523103849305532249049602562479138323295711575175876515640
+3486443061013741439479986438866229511864021882422370923187276377158037668029544320414759066219016776345013936686773434186071692
+8652668214037751054395752355562459984977103091936105931037362668574357365575540736744748684242434859190554622399068882473374610
+8580093375714553964201167764812992676992679093090175449230495342109288752328986692009639151993677096258635370756684860954291469
+9964866699458956436463452444822527184213143978744043079921280767307287341419726065990023057954791661193301961189038570454182768
+5099791381798674690627429376704901489902412978407791536768610182213492340739402802196624950327768967894658802241237435134810216
+2644824029820305111520479567245295948221720974051912855629977767969256584700072624737697630748957013069006968156707232150642177
+4694014156265815259320275858444952794733981468869946419687206201356067556770447737925027827372686022309398793525531551762030508
+0692322520193661664579545021783669513925271024381519716157761278129858733071273401229450196329877841294994307214799190419756421
+2529925924690763185785959066401191385349387731434107358942442763904987402826148766868356311114428295259838898928666272489020921
+2079494677073945124622995106365273958525412410850501502163733379133554803716983972906533166904636077433873959124786425510691812
+5600448283577862312179623155268824754692832396408303848264207707120544301021495705368104362648456117090809527815889327217546635
+2343977389207774815138566905589371213682572216665369482458860895527700507201800331270809726620829481769123927780354816652809008
+3857604203317914309286408408516621032904248756858927009945259813983765983907916658284682954733130678932128039594166445571290526
+7783506576165023166951251072092917407173251744876214934915430447355544209919802690055207660666887916247859978935839016078615261
+7480703460843227445195199879222716960672528809567298037159358077924188280933697924269515298429095424116709060884750185401083226
+8717064476124069485152260308142874514219920880901182710267169211713742088964956637523570820108183570127357202528608391772392065
+0183762641286324428853776063863402233453633712505217167155150999046272831538702513532943824820006210590058738974696140094824531
+9112496681140545311761452054846654072950289614507391281868179377997604366151409215985425553727631766796511079991043874131555557
+4848466672408480575274846878733482332783913190570793476048801496992752228173129813319287139570412963303092066006377899503587208
+2004264846825219154033402067536124920004600149381068226608766267724446119288301005499297409144197426544971420258082942394022997
+0140320078386067723015618497818762945156815014583969278200840575341177014900417018827299383394638626203285185921061940008032865
+5962478195492396384491797383201234602669716423445444477699550016949258636112731978273213688262995924599283114955724957765374843
+8311990015515249068920407871121923281094596878515199867380540740586492915851905851867276732161963585489156521545932776243150499
+4592710682075197276504754152068206668838563346968654451648904363538719952128821973082368544846718432978965867108316589932428817
+3552163482893373255049569753046229304178905562057146740570805257427023711941189943044300807285165026750415508222049580394911287
+4596021173135544782173915901528349195173147664807647330846216356295629295015969380040305219923049284417801673254103299322068397
+3943524404368165203936926893260166313850279802117822440456770151714171409778904837544726372346574716859663114202887576413543801
+2969116285326615235890680734637608834483184611588075027596448992877129841445196831709848480423954210927050978003235143506132046
+0153071245386120635128957595884412738484038627307517440237760302728984006580096280602129668935036883924996553872412205753013658
+5621357475787817996023091217050008449865559719579810787563038126520104376758261418798236153692393962370203265309058313384060120
+5031974571476436448786217419749048851015183003367752606459920605017140928435866977820091890996541266633748940714886983142086133
+4562696779266374687250665129144508120768763103068669726719903362264420017240549417302081941962780048493798236161080017811934325
+4744441027688831600256636793504579543928756869184371127623452884135869811364793667736493944686083992892480103958881983194171487
+3993112528998853349337977120649249691278774025202103634228484270608254195748299845801769708524194520077695532568068092195962254
+2329576931503118880223192095103946522402558163495818627264589763485690044385772668639064805859345298816707780560479994433943363
+3218849814933855133187785331003935806771232881004238706522431511966088657254108552621744793383328388740747036182217129765309790
+7924052825089429554499360417535494167874442982520963688982831955472793462543386236218475310833559387701937594241052466519691317
+3120730387098471204669336934308519377296835486747153400369971745719675185172869103202802955453713945706425356726081359191431362
+5436861304614177525957519069526164638577548380287496823470807113570761415650401959363470580496567502232543408020661206474053266
+3120249944908567907826123413136257067078494146549111473184473022022655595636232845880738387277254397911665634549126629364411401
+4035843002062617386757564723259476788690970258752656414372739557004284974159497458955655696811845766981760932359601002427208626
+0779143969819344348002577455948300927630939121921547040685880544649850641595729872650264658050333293212488609440422250520307515
+1460705203029148369614787086632962281691805758071437499284040866802949156450922963941143029043912074471289441815938231327288667
+1549240739672667607945860219999638499322190035348564953406860715951588472937396572245559080251322668950418605324345241657646723
+6681600989234088565629106267156100053645378516406056877177467623317919074902879430656553383602319342476881970725454244483233156
+0192568263169645194866570376494013537343370202553601755904593727729559768993904298684689230055250228064310566719259142616384584
+2226698070135175270997371657677443976168753242911675302780266617573092075405498205119010526964247236701457645067756244640039560
+2411523124866541301070099168413071292074360672744530325093983003307829914552999628543032410966968534244029432252498124255869721
+2032148958117324274615176859919802414958436537913396718375158773684001583339324493639015775574550405787223527127839505198335838
+7873829779466960857655228261450384972633464601331098096364008012962199690499598210503782863578580915221775299630382906076523471
+1033617798236208613493443460691499481184470043787180389655899698166528830636916915480716417683921961582857940369278335021557721
+3570877773431086041166388678403654768190776468384892784896107473099172280071916265352211077124176187206981633533447143541466428
+9162337956051462461244081308639454192982414597589520706270659960902459420484545944118766172576927213645046647438580806130370976
+1679386001024741318115842266812215689927333532837813069949968390429571894735964678235628716093113797167330012932695772923859921
+8804168783787089493714870963570663419696958001331927763315516123670935571014222651056237882407840332672169785104960709919825245
+0497455776366854139775882322268590872937081090128717394425875756408043314452495438785765312873239203328867278937236653265323056
+6042409906538241575209979144212026252259767618647784026916367882392586982801406891358315499203056053321982052638011533498889270
+5665573721287635790869699668106163302621832934471963587290594671222971786422361537494624465628017639194877871599798228379718225
+7432584741479817366719910925645646541846360875945358928938495570674893693392242341873215005147647843928108951666723535877703443
+9626429137239096178611195842928172193314671253797016055524388530347610194243157336306488458466944807366840872517364192307199510
+8872554743012955139567705170988677634651238832225827058388116110755496007697973600003490415480515644505946637930188314840631970
+3992491991103767989877164315291928453885661238942961179632807297112992978760631966972677658662459086278724019257889314597469958
+6669007755891601840756776309575869340114031142955328946684465711503263349456097268207290469828978418533272473362080110971119500
+8033630970428066315841260643530102154382783569132687157611513276699429626479061706898110708339849619210276811595853043955446869
+9768070537230217029438684537825935225327148348372819431279340284261370618005491965480298943126300044774337991256135794900355667
+3657498279192720768668603975934793465689868735015232170607621866439453389115795388712792645934981304662545764256708338815562273
+4841652997648921227154354900004136760485517640549167386012657306424618486993618255961405066483542868908453734101505226047480448
+4390654153631921147807124887078770782524389315313338172327932505555766712042126014521672948387933863420403298182271156860089870
+3083699675349781049946715849913203260143681249018875435801318149856990157414011015651215483550403032096067120964528627647289771
+8136660832504574374548878451558509361941048418373428464399511971079202695299106137651197289051575362091446283996841312766684810
+3676236989934685487277460614965631287879882167402767160319121856718994264197563392677953816932994293095294646864998371569945650
+3049112960977618674809680978004704430920799039334511606915199457270782728770389854739859266964607398443304578468934206463864162
+4020319901840360451062762075624924661391286802372025413278593393390727656336661248466535685907382226627976102440776444559861524
+0166268182450996578449973258577137477283861283683233635300267518223499975003192269667287508860009509128730943175015750710725727
+1027094337033962463834235326303117245639527702316027545974140882034976571260270032549979726479017186330571896766878727628563084
+3735720519280562035416027535373646170800608954405500868661244053278717672230128154298018261865339340499855937060742071802179228
+4620909442780453001381207438741771581539126274686674694429903202199824281873555557550181182902700089108021432193493732079872184
+9458342180011256500005493355500078007350011604607303307732963471459637499551951642174991940916434214889720629725398539493831562
+1757418742866953045608344774690257090125548479597625280633090790836185148048976878560947512134108931123436802430288121604450838
+3439908217353866705662826605127180864607977834354266960510252404933627640585873170058624018410480482791416937234522273135497031
+2172788248827330880258621512418568877495834091216163584166603056260778255791670347944634914745463656259805211952460022859276063
+7062821874356395565274839950114991325558841496177484931811683058289009845398038339874364587482418953564120109998982642304471400
+3698346712015383293895452263862425925615594845734737899372976339855075694671913339207356770288208509103055437248670557197975416
+5731723926926739876475885511154531945948200793682997616742493659519964588297814245753251250515716831733713917292045440536017047
+2326213034490494256432217527368652272393723129996987975280491971552239548286262875444742346718137588580994530639159848308302488
+9664053981063208567695237243202681506536792559295775868533828506782791916794818915656227027388965683683700700077078525885858163
+5667625010472277345606381058073451841188387271842197689932469281333817846476853011214737420944488058943262260113307982047560323
+0376867635943376210756229949512175221086640268169558374511241311647850185329038766762763270981601390818540680562189733654333764
+4491518223112590691196826611428935302844272864063278173063473168207705976253698032183297470010465109985370388667131449602003018
+8802699827748011182168113988637297474486522040228085650948530427329245143454181410142916723537434758973564869412497956238710891
+0653015424586307910784932154517633495234468902775642895621562573878654050393509111804824221865060266482583193591594511748836623
+4094703884414114132180304529532880233548615595688135936066808466092184620343793991343848249436804401054149903884653644876865628
+2718370374189505315521628763517179672356494682994180239553818915110898807872150301279550476267769560111595428023012737770277809
+0983429088572418894311039932871928790123994971756838750348015397853262244219489154464202472581023076365814977799205726076421849
+2244581657719291754700709306659618001196719303854922152332583798578459941542447742263613733064435246505660395020395510382351759
+2371191845917148718985406337649548363315059193935226677398831831786300690640380203874437098924585872141781137278459673035181084
+6868095538827304671263059227883616117642085424440799227282508929248920781388666797060697845611588551792908329555898460456707821
+1192043306305230972108032344493739345654505538181410336224627870081996078504793311999388842368948858806146981869977786056189228
+1263564157432629856155576816827336520937607635620996781728277895852539790604285849253279394716497232033008275892868545867382681
+2337190119883945387644191032300914026172189976929618448527119917727894462635110227775485639758673866947701176216601761844984677
+1541725580846818676211322948610609824222332361334426723507920844056410476870968277509960759021044456134551342168799278225221031
+5808026746515835625867232790523509089624770846326913802756163972740615072842822135746471264238978131846218179577994033108366459
+7209194492748333961784669338759539252535168061991620450390411453076684475148292681430958283119646863377618784660018401847206388
+8164592842234101218973444204368622348477154717654721601252474279965258123105673927507866232148031414671644959483263113289777725
+9536506697075295060127905565119738004002490249111193299408907722018709064690369235720344207608369516256550493184611556526526774
+4560017960261564009218990204461419858845480963206874732488142599183336196461705771053123771553268404282868440226650446328616213
+0784979620602852570679351917990832385632423349482355239911158425540111723754138128518596135522138872178079847769857439148437200
+3065506422221326046922349934844525141835749289303921189806839691414799095653902814723672937020068076690809012734952484971091424
+7531639556490305149862508189711238391327019426642515502558468392326082589336113833462268524671249515158066960751008937821736410
+6252414527138677204351141055246475557495876614593229376289610072418141564580640343324426668169327302426458833085549654617933468
+8091658367794443766667336494599463493723421496560610375457662742614878721712215614199388402972271203457264117746009414601292472
+4908066830822438120188614160836549308604180994779262747990121233555704249867768081188552478880193430879502515548138613493765732
+5079293880539371206967935767115987717076965982796395512686484284292191272158775216705810765026584234552773076439527278292069704
+5164216628992440501162199298685532131413675395537593848742057924552014924010292705113677909421661221880801679108009584398377793
+4121418969859257717214261444608216079650826208617995799712962734646420115576080668425510442736110574190180643945326397724337600
+9884581544962427545759780318699856274991305713483502351242287264905051143111943618139482715140793163760250713362251924403750737
+5001181429052612807248790060512136898354370778167327719757330132811615985502470639866207141577372460429670627788129417134404406
+6178770653157619944192283152223652702640541977712224400210339303510432403323032560310805508239002669348396267104479169736023331
+1565506146888751623012576320991779119855864177643274705087893960131150916233068282254723459661688282729513190349028463435804527
+6845488200397241399013882436401994250911820745822241059508913459645459567274421896167243282273985655453126249904632199335837792
+6040683797579452107027216845343063524780614029426886935760791257030864245182939630838108471908303610357161096840181118609152193
+5867358422344899058837359139467062379239965703229659786120062948805736192330007221916713426793575162507137089954539396331620247
+9120519760679588392286105798236021559061854045122019266108300186277736886734969411204978788065566311792204801446141473355188648
+9729762487738362702158800023376627553944314549674371461896299198497056817939283617350417487984379973531521250384859390378780952
+5278728682099899168824382639886768910340224230494671557124611921288793461227571446099109231672351187529971910075105296077357641
+1730149007222759960804235202582288759192771252526372328644840575023003569331571124411309306137954892577214909905859437364845514
+6359722384817229880817656694157685568966235098606153131789136445509767178564237103959982917552413501317717319150118113725281168
+8331881891680259180368288807257087972744816443005083134263401722243486734946708091896751081947017218318643507133088446490502898
+1564672123742228001093857696640500357335628593848961899541997547484403147074041514838330205353223636545525633021798226061157975
+7577934224848992516208537526305362086756191009198436224096722971843979917310448903629548517759776409320845391838217575441202030
+5842023675100545856824292093806577194777854067803726567456782139496624136800515010149246416535077787552986449619329516458032493
+0373167808153255052885634740314278397690578953752487856466779556596486994777425942109945709709335720717497273570846620327341193
+5952530704523306889233492671665454303269886039975987299656234612350738474857467451882170147036566336312226535534145167519693735
+9607859559588540690534618223279700864577721437927651039992456828233467681820892987538385235563873550538138831743319323285816092
+1624406727909111147099641441681559414299104318980440722709754783222151032344202663364762643657625463452804121615256537142718557
+4340315496406729909696728430969897055002939519672286841554008064322610667892226345008617230358420658804502966997298469146129669
+0210625023915241926959138868143886129423564883883556915150345946486026490910420790564346970440390087533686122782420012907572301
+4721491005031549006749404748103949153294842924575427991607317267682247725581223721840333859898813958860082395329629494670433269
+8089333321693829301610669436388430107322213493559809633043551047784093889175488034859221042528763690657356439399119706918708269
+0081737607011167672164816311361636636595718748621290008823635691873373600228901339494989909273621908199424676593460415730887285
+4160520455923507310701763781457568843470746581847988497318956296776248312754405407533119008905656107514741346097573287623338123
+5386718227154603611476662828982111704301478482540378612558078862521675877095588029121004214011721936617184276464093409939658461
+1979208081789258362592059412017416272899419903367802069424612928998858612300695288310086571610845555893261171864325093713786916
+7319139333841813731995304531194319105663469219744020376897814143833856662869242932535917521586466923358318419175396557400347006
+5043921771833079685531325825310432807800223715751775658072562091646020835717475241682115604301178255769370561929846716138929898
+5795009540103191080406839616053879828656176434583781287476876321448232920090228345539065457933826027880057345811966575002039185
+8576153060956850521311077608763009793771506275720974549550420722202837108735329754654396372138014747847396055096136010954168085
+0509043015950572569270166347532451603412568949379675617083809175396443490772874366901432037667793377607725671409709046037414839
+5757807520296047868933446233650750653295440658940733452331643306076758589809542688132352958487696630197185077693771148210415488
+3493366273573202706880963127674882710949035853748406509260478202136097703296547394474710548706092731416204930859887260446245253
+1707539941222225775800658254639655291940922607284340086831234164821348634212665200587884346716985605251686416602230060503804746
+7119373075229566064030462457605177717171013246215489918839015056056006164706313041702800263980277171617607329962257981016326162
+6663813052725497188713444974040320318581428866821251405183260930030389032259911879414867761739508256774997369921307923003380224
+8543233997255243697045277479565692227756699494957952164631865806868110331658332715068585534381871375140656787606232565908699795
+1127161017080656837915924804407883971278108801828959672411183897706979458144168384325785293840525608900932906069101189576035960
+7746884054099676741518894156142307630763897600710799726835033615686726465390861737711082117067758069961050536090277623500309130
+5637631551447663652036022243883777403508274485804348060822361386569981574710776219228289288499523332852532323527986372935987772
+4799128874055082677319044677884361786887526377254867769810507962743180135340211433750487850964619355570684078365963703331785531
+0073682589254914802156389462761084682583678912826358978335933715271645287806405047356166648799977142475160038979372628423949010
+5037559719886724670132444119093240447382541873564218599313650731701908225623880448841585926824993839038111972019595929993742491
+3846935441857871521862191302228658206156991884533871767438656661539104499878809823997230034119838267962065754111334791148146756
+1506245754838722163589450414720903186576980445131544657545019758753225527419416112605350003805887953770147934624442363883801265
+7711965724693431682894274811945992120534708309601562503539815868676726704850890815034768784240539682384600476706665486329906626
+5956050270087533659778978762952993742209890928275529257391035690977242967921950083594415755279086778292240063613624273000623384
+5061387982251874414971585573609892535056862802605728035065909921406395624271235709374930413322182966464210152496167481038893673
+7793264955081367428964822852138933334974506780923885826935088471472828950440677885279984646325294353993045156334916727728658382
+1917731844388737433964393775321834810791126648863902100900130682254900663770885502300591056044829585219310561565900983432788348
+3993621103753371559559083065225969001381490024230870158740460349214225265354617541796726739208926003200650331011617584531364466
+6446975200293349558151403162258385505474942322796455463090381985898884153879810666921247678344495019592171989327800934238087607
+1116773012813841761179870425820266292137052144431441290909627977940969824030291459806507439794936788928214828707352139273391574
+6029232735235425403035383736905446200540026716844974571516139411975848154720481565143793111521425975198184192780712740114138327
+3438200310045736349450654856319455355471806503450945057852390828051199118282010495739738213447341204668213941183921897766832892
+9512957847613586351781261772535091586107882959218997758350989715296118346024725200133884012765597340862400507624462524830866480
+9478843365776113648646455826476363854336443473601804016310466451767185956320296981753166811182992550179769973329037834636002638
+1745421142947154461000688129964181745046963595109768527672990383210124171587972151958957748633651595231193536560491908213623383
+8381825139460307549572877031135183947681591383140425137518397676071788098018785187454915609863724531998066262732015118963304139
+9818630925621801216199389879103728134389152002296761687336537102178195168590959317811012194485775439363610537061412149495648268
+5576817033233193054333141148999572966012541792116109714940451926593836005748304065707002129553500879663495665687664101078961830
+4255249811578737819490016920102133439336759727576849642889727534022902117660385461887412305323198051682727105599743797538768483
+5664318936157823403995526721241574938566862585452228404066914834889748254113822291330168260243598542768358287033612921584775608
+0493408359374626915181620402845179233550927620380852963377274566085358451742815682206366209318504599243115355217504587070160767
+5099926458337087971802835525020183140934847289656680603935783200084783016975906879446974951582977123093907468193624294378414602
+4993211036037539293757401608261712055642333911428904305517543773653002323722539705273891988338327482438288308063770111207012273
+8875724448927612453412899117913683062983270974383158999932195926949387111141855398745328636343443301765332909049991525667183004
+6179446485196106673286301271613059516541037127280321853066460858041150601008945716021915010720764523897185471929927560029444239
+7849437984569538042541347312104898444874295714765888754190517892771505925662567504469022216257045253341087785885957187833718309
+9972288762936380366686950714951282499790474803745721728891585856096753079311064364081796195123806475478622506713826868777638697
+5194143783169339034131894869316961917794611019135131983101366014715857076410377619181633332553598229324447853163042312520962414
+7850854551539305001687198329060780010579189214774936469033426991594801002823836027328068965959941131816419243666581830678041716
+2062179831972241107526467338284038440066567441767013516710832064119073030278681905009991848241324570216334414105094116172288746
+4795251857046503954973485018229646234695366724410250031504983138843493652944866619750102836093665932368212191653037534272918686
+1825362974498797050137125577095725107017850998954189361286965048355333973664280494182300562942448127524039989758648090694962142
+7512994410145549835156679857014752505125401506747737470958447208937721056830032278112608932324610937928836512547690813007773206
+4386958625254464154906642431853347789932184826155599439488217117827733831342079710541861559451261895702289359997911170346503767
+9160582845194443225222601665399912946931088757458941216770145834719498890068834370787508728005299127862046720974369218083539582
+4881031377785621947067985825999914746359269429111016243690638440462655472434228579718379181809439967478754245522265321625889814
+7583391301685587265357562950095622866121830355803288828241373074939869852539741493888550714334780322503664271906152272539287229
+3706056275918240737054417094100085374094932331005897520832184041773254725650156202489186855782648043533132404772816727073155235
+8593562217884076811451277453364735377701544569033315203869164836320799479709306444027657854268527295924524538225997862678112859
+4570537859634341717395527618756161556420569519217630387646444203036568601265546935410843254883517475649241288633895824882290087
+1279603976070610116464640212199310166444520867245963242449012132718994226744403248200981139871780434324112903659101791778621066
+8744850384566117283317344846157583437411072049976031321951124766354609384768681179440522110424899002915456603055956128713981139
+2086242661312485180876173221212851654741063402662853918748324706267356051777749583559232529239969008936507197332763290031477120
+5741215520375853751719868036345389495144698592395029595732821924732143612679143914116460149908254801423378398341400612840255578
+3112678009802694849286559093313827681147182296039209347542924704088172807791962585025279313952354773038812296501897230865202710
+2464335074070148432312036647984428094369519448454963043288725321796755075626414550577697084871002645789785381682654641241100283
+4946700365473689782081952042866282556327651210752194953923594323433725250140138447685850292340132652464859222629234697220377811
+4116813834263078090553178959891950239969717708797371397856902146227502290357214553371450093318491311749632101080525636146301695
+2152016442288947698443136330933042135184223974200115803798042702098262975256411368585240157169341361695851434355296732786801088
+9469700239580500443632308541309983452163906017765379912144038775472527920834490565234287360219977902823838503195349727039831496
+2028576502159755428471922748239092215954614499408923132851493814161260002491760119779606365853853991681827617094579573055586297
+3640678920108595929213187711839271941417061119448282180155978731064884982006841462863880420761509974612500984423805360525276222
+9057118337335912039094779552592972943649024122835147704439083152493402341167911887606112405528052285968546122798145084807566159
+4304613049097528789015322647077710992450848025235239429386820053371823148160964657760192249248892087179211556970604610852657330
+1245963067779593226119382101475675796217312455063935339967592594066075071514347181089457321147516518204553844378465193273590500
+3560863140415397624008978961463819965678362699058645101497391867248986869781266285523093686811424022579360460735505488281520907
+2803810314481228865478572362393166113955034570401397318410902932552817985751479490450351950758398971928389088057335245044158094
+6904347745025056517093981246275608711548205826384671869194152526627350920208727208140128575295910227390194690418706771705356517
+6784445719916791606648643520294851397681933118673503958741728387886357271190905065762821681465016058740202568162846967243295973
+1820495748778970925066926664077661706850366307799032827973753165199895444172414611070770446635902894354703969177838887030507999
+0792366480532040444153327711554056488308633552915589047332411364711058132183546270866868018652349880999177379420796287072716088
+2231884404962985945388134094475613555762253572694848559208422137166239633417739879274457716224035685193748560132590653034477542
+9227302311116220471908055555125965124068362598930072116668063472712158786276348904469695948132587468164071579543544049342283942
+9611661683770276849635190630772488322125598419492636769106569145188958898006930644639421498885045868655337164693651551682789719
+8113170194159795409724804157277970216585110875118496676005194638884485314135820103479833056690555003499859437927213123666961409
+6776248629614262117061005539488708741664752240716973399951870993215840911122617246729216135676971155075389185544568368200715006
+8136621653681348621828391620654330376833126244814473075974634681828022721817501734663865372891778488609175456672709780494092424
+7509035477896901683836806362847630551058479464889625032860924968434340014421918549778761662492676219077042005549667470710873708
+2649270641258444022173705146602820338815565069036316996296828717613516424116147690610506944602495068800321856748967379303431711
+5231537094318273489411666006633698888790246462698166129109823556983405782712006150780252324827311704109848150151626541203089319
+5293239066624699492800648051071066181862007268310279648019183315312315154420858012591159812489763989269552995744386956174038764
+5180720261104219765835445462051189983679962609760132661239453035110340712611783326617205712026077627868902275865901764502746369
+4450386186789754245435591998462910276602998139642701382886884245787698610667584456364442583085157908011542453439257529663938908
+5226947020891494666123742174916211157087031239651884379910014927950876644487562604700114503798045681730239237952766587287565756
+3462320891328376981719619778327669975981463699579856289946252639770341221258397441894692753073255239973756891174514808164393544
+9266128730309970612623389424292152551017956433451773715730990286170012828117563840968654996015507568606746254308032751484010172
+9555122523637838569715536561794279389081447703619598960381475663155959964617699927258813445644496349054324074619586132556815203
+5221901221258703935673357600398356681976947446424967337708716326590353253394660639230448040100077013280765926948098493319213488
+7738313289310543436800301466124075949448435224583670124694327098481119456888840896351512543815188557251685118660772588456625224
+6115002819234894874533900222654850689485882307323315708374429887345170183105778321445910604513739852020875884337203588872923125
+4481043241227156956639553841037732426965917364470043436075190174090995043087977394594850901991029121373900633832712403510778230
+1122190232976475343331179295988355035324572960682589565916578492624347219825791452145522290660285362795514899273106419997278153
+1419535386080392454227188259532485710914908620105317213100011817889875764632911121751593887025644393163109071422951719422847110
+4026612711274029089236246041114948354793310083266181854689070097597525414068795108775947050469531123122537281180760454160254035
+2729212202223251132035733428110959851887971832113712091873626429082924950281013969697115103891338579818898846568239238607918122
+3944336153317752913161793886424178237035722936447760222478425805766217641600209813232221230340238786982394323446453582721990048
+7389193916919980057221104426235427350670234767999865432553198312811347361703697530913350075859737082487587469312736993623735804
+3544483515704686277538264527506961791275819582201516681389283444580314635355964056417380225809498367162186604237676145482322561
+8044600252747925830317760868421526571377975782889497428302869692743382713250361972424374300944696385157823203594995989063758674
+3762181316198228161833937930845505733610147834846550265056669736693282801787541130363631664735877621678425882651996823896571197
+4895759837384473598984792357851123553619562828621778670882704444499813426092540279529447104250292800981220546692084253328082420
+4664284555514464728238600094152484535233997991752935740228264651440639886242409459644164822259574135218995760166441434144147387
+3498021732532747332097779512063273078194846290742584872890698856916194513341236677884416300942002054144602101645686192153654576
+8855689629475186087358536061769600329981635356231999344927571715122048450556630571843667383074529954198709235538731487573715687
+0984316998018946399866843104618259659452795653432490384229487374720689309493558506727485555071518696965289338830868013877431679
+0444954460337393289812378506420855357215741077375742703669752012654590715324153275679920752247842054109194186158654335712157841
+2806861505564373354176276173563926841713871053400626160801979041772088503472612997224598155147542728678254353573523697935567654
+6201924274245126686318859488923564788418058568530778365444195042057133158737326264356888205129275667061366349202778458019010774
+2825177079603097543301363195546845866777243546459927001122927276132658961336248692066215766333309788747162494346240324193946246
+7328522607444197904276536531669234484641234327006749709725328245867037809150903161226855351918234564454937188245329779811527397
+1625377992337069927288579727970280388115743434164021261444485502332859966787759877144357204976585729746356637542057830900380879
+4756314028565636147037500545330319143265189233753100563686689461353510356901840785161069243491300815016067752040583292254841464
+0425017333645387838654294817531355494569985613245897735076448718279104158222119913920255342054852667882224523660815046839280651
+9062897569747184612738179958208393387812077029581124581459197624411283206076395360970022007778409057996215320186949888642491834
+2577588591174250273899408593063983438617592453792302359558473005206418002455294336176016723332413815891373160708758731967049062
+3790766334026767123109787766877375184100806711868340730414046922950551256206928850545228229670325982658231736019892656930961551
+5274543406306956723055597804421123472449821052046299950205504470231963135543548703265039753201973863356153745730092781664650899
+1020617263114480064430348590768589835423732129147820366131428529210137664442462332795234431300140813802687903923031421483099298
+3305606503022918455845722586154193433226668761115620627747430416848925633688922763380741392673785175993422375485098655310345526
+2853130953848078288453311632699255400113689129756388559283548184844635112023417531659479267970268571040812683475165664822794180
+2783222167931397034746003825257822695087707764404029816076797619920932960124572983887919479900468345097640119343412470086673322
+5063459185940735886394343828328918625032505938760162817991123725871771735016474675217009872180054875341819281047070252038306775
+0743585397605286027482664572990290216960312219499687628442325704541075906118067163819053997876546874075941147761887253181403133
+6865060056069818696891296915545023370983419980885799857058396262667622091719201948407642987224698259796247084724028705854417594
+5103827826152310417357275607217586307830343393236258610369278200854730301259212109525027296782910788706655437239982908254923137
+2959652192735329005701145454769790852470342092444456431448859896236135922540005403226570654335981197446157556763871319983952696
+0906069491801564153648838254163601062811138002404571553190646376754817601328289018602749191681199089353060650264442584766903530
+3785962322135501816792718661619323345882587573641791662855806452191640690223489872037123172150522718319643946771618053874607301
+2342704599377336428681571005102144288192803466969307063516540780329331225964749753260124769353818714585772490856102378132713276
+4346236542835966635872778222659462346707942811767870117146806978169322604045750387880280187005012616459999816635343308178563646
+2604219260434304257671433967264369756269802345023491459538543248359901859356108205297353830910989444923284454022447613985397264
+1822281949178892000423296707942037651472365683251029280064728588016134363373058610506594311454908111460545368768742973357987311
+2329670499086760430314104242828210716854904379725565610986919473143807393666799098016719544449077169306161547903571473642324181
+8934928646320239275117990276319738648757543739070170895539210951333884142223117539519009532014319073300363829125825739466521964
+5363386211310899141728954217940413318460520197666536176317994465965648033515827854532405714333529319178360920611572195490491843
+6452281693971710923703852296775814957821367584399432406445144322839651572894248840082293918339020670715780310479909368596480688
+6791949317913799774656284904153563675547018432823443924016298235065082832647707880299401729868016947630432394689913082273372425
+2712968598557679357916581334926350397464524640833937031346811806334561647348253048938805411658427143226876519485429485016393766
+3501555543617126115194082213265703065410803089224710636262686284845574699295863975355551722711478618786950261560124771603773061
+4778106677024357003045486275897639115668057170330533010873096634039731123238801834051871842868704307554039712015191582514954442
+5218459195255301650149970279364690486331464065970810654696223977244841051824600951397161627678662117382548039349844217280375193
+6369806374093253248520031657537241583648618465123745039819043766572718344368140639003289414418211436811709774570097952888487167
+3212569840247911007598018387084803647762488058555511319640016886915147136497977845568137947542869347226726490373484609221240787
+8115733543956480787117884715874295702599005706164646884593210924736152784838359510894224199377258864940900115663844969555460182
+2035968818201814843503316301816877369650620471604903993852843829395302301918155158237168629501277731356144310878037185323999107
+7016895419441126229181619830275636225832821520441765441532992753638148826237793875874434736200782222141244213180375828740996801
+5879711152250078980107885067914386728437059276590755707069830533352692084569773933300266007591174281283361187767672358396078896
+2103537195144138796197574043874859185879649977538344432422677102393984939164145250471907596342652013494773096173424264207508962
+0637450827987698515011845992398093937196147180755217329303542644463406470700019971836100495535322254679390620873420862364850762
+2242509562912546291760696517385259786276250406593124098460913531494124669973775469757781521279236307631066606896102762073078153
+8737688554624301439839538446862017884613896797755819281023174101498754986747558403862071766932594675733495440363990431783540137
+3643542527592425148722339107873667468772709136145667446671572809454163340131116640859776867285040887038441378816294697995941474
+4072206008606547388536544456067257224875289444010744788037863160664893445070574937489602184055019861155649531412106370948013649
+6183624181311379076807905566573341779391313360549851142539899794930473883081910943750299100861533261211231956101452244671916467
+4790552691647255291761946345206897704211085378644313837821311423673070233392146600975258580259558879486034230540380014801626096
+8493966397430159495762611418791059378501633459275242578770822154956094389019127421733416568122031957966837378624113082091125501
+0539497663700011903785013114734351822728368447618541431249895153026462750771721023669565811790420914410370442390790070707245463
+2527965030066432300857015457970368291786471653036513592059650961230415181073725654607900007084498257528783224577191374901431098
+5466092963804647249090725375187844347347973252108137441562290526430827908072841935677879142427224945383497721669674256500195118
+9408447458584058076150017650238543964665522204847767119461148283020725314993208318241105785737923682521127890161621980525163933
+7752816476751548314213662757572297632611588857400086488089795605852388674435780461993562784936271707018785480608983595358835686
+1627393802741824989025898363620676709684659912421866285079664625171969200262501658717867654051389804050637814037774619076628490
+9122449665202107140311875578301366613855230050319765976709818479408721612162782387682958793989254712472790259401394162587792903
+9264559273820216137804057886666471549044481178190332632113699758788705141611700544482989913381964978281793867160157791927781162
+7442806842403069859300613325533104981898816922110133255013384334075830779759933886533885733793824024671542171085144755776119332
+7374346360629846250873248611855740390376331086859870274251856769041575442564535703086946429812945653348220186072122845016274001
+8100158244663714389704533217051390472696914158612218153906542802690978033894796544874039962095788720080152937661496672600961913
+8620241055478925684985952252838411836616234675852362577897905957450930653087681187667293254151875334644179085362678160756183911
+7978254875299875225763061871403474457110245655385719997304830996169804380424203018555208820048813202142753962116252594621406974
+1364681806031729655441460904058555518845771287158086951978113218142925356256811479736849256168552051145501834683683179144053582
+2064837061784377038174422796078941972546986123715738128334902017019689407784830561790843652346745495974010607663653352384636987
+9087616048769273749416367719522093035127707930211676277159029972485006678648961483209994033836189245748110099847024086616545737
+2425064383233144306141397196556964739088709046393835346029594675076399505634895487000914867003535813058158157320486332684663652
+3641097021982425901903299759975001000185954507785071466003606303822049570876073457705939373716255467071337231807741213874106729
+2074354309025181421785407070622306037112442163872375219312465679573739444271473076859615411141496918260111756219972558400237414
+9209218175245343776137887607783882100053568632353169828579551734386860768832081473967959877027533280331064368843953279403791000
+7265829914895705780556070716875430476662014009364335116363868273301526498001345684876869560767489114942311375190271613882803603
+9073891388696315073189212242611726526377243973277573301675482213008892303352424672983354043608654230919446999369674504952411077
+2313808555572186833151976371065120343070868637724954931470642187595688232146689299510744666262728998553432846824564736716304195
+3769895001051711590090397709284289543423142627611293076964116196325536683515731394758243179761144577336943990391686351744541117
+1964012423430274286597296893918822905314758106425920575603004465793377045724816176059995632780349523671266024041147016652652055
+0559141307894322726836380567121144490621939523042182901839217710526781776038951549469639294413748250130589664480237146063632821
+2784427615240187672159066907559581170138189996990499287132279332580644422377771338142338877270406145886924306247277891647319839
+2650622840124168882146785089864582520075975814107450314378337065910303739372347881027629224527453006767239445485125470798573294
+3280112665923668502905138798645913537592166171499662307256909576761808318862002890184471250591748083711310397550032446473077789
+4839123297739060737950671029462682374736375690549900393153725695518603231578972526440776594614418742798429193873047497505681792
+2160244025080490634108186799676843921536142621408043650219395075800794132235618687434126288996783749492148526728267890467762275
+1151778651927614305188542555589072273825319471951036866487051470913760762080070986450018226884129812856690672034368570260461972
+9126667808863381235489349849691246557114377306076458702232805159967351257175416964221955677360994319567614203175199799743819984
+2789442446232943685597991603590204183390799819475475321518636276804097467590827293001641282750302064255269776064371623832516088
+9048597881455099698450226466082784483581892839976853703691711348479752784919013613635237082895964344395914096977829703979539035
+8807651873851261763689740610852384724724967281185663138373836249447037268804159569417135422054907833329936731832253007919797504
+9682114913920055259992108818897312911322686928213632559659016546514207889796765657343025470035022686294498921433293889021982807
+8817906539189722113102359692407543788732651010055394962852526688290033541790486992705883840600079101359528027208567808930305163
+9801041923433800395009066327257582729179435202758752590945790035180893649947139262456916818609204478389874916889421571462394032
+7712450051093466464431798727528046026835894856944238434402423528849559439733559946888997104896406027931037956349309616326923736
+7381318701427430852131274547674285844624653982181746045743742319196948480723763005752758284784444958915729789741525394299696626
+8012218598270213765952492120607042939337977067878086380794314818747633639449994732495580724511274417714861329582888877331906442
+2523903559053376560461999356914800460953183047966595580074070441846526092785101396532452282664986312641571216344907286853277587
+1243980803716723402043316042450038929890705999070870015541470833748745344879737850504389676782666386423839519311757255510240006
+0284528532586136580475966266604417479884520212063362364900502892825693493079279816397630592037794996982087214380723458893748385
+8491272727902175551882935376152929301347887913314101691264776996119552678466629354884721510455050616404890619695271496162337915
+4545341965713318896843475698632445949069586135305533687841423447686352614650216106958803696792920165610566274323872801678178779
+8253568664915132158211550322533453124118327929548882623091786963905677622475126883200587876894319717512008420758223683547396925
+4320222323998014931144025979173468123790086139354433220062005544015035220976182446830891814234515809043692298378909223491021578
+6069959232219660879097232566121384126364624848136634056377125102029351039021829959177114631501219753707218086851316623762802248
+1243816089430429483661271140945607300465854350055161784219266668283907250544685294916674983006906835039612884905549454140955379
+2940117682598404016293743763452820571055836767681621549318648097809089905651411870200800086998457828557152804031061902717793951
+0887454608619720066585775426385076124950271424460822511049331848391671487328356192926497422819817241814088663154002962024098217
+9444111199203225196678001748854632792810817288744330344130819478809411416720197937516411714390009340089903953898652786438479523
+7598508564858904067093707855688285940754985295788676773297431147947757643127210193954685014018553421494459901761944702436530765
+5554085843289054481441810390185341385291272744398367506999297552891321596456006697431455499740285520112057597547672427356435569
+0013578994633080338189924814677511395910036898885609486453589361725442884886155382037285922038189976648035996103250646536792347
+1883418355117695192895288397176362340054382375638457044029914555409870529840507997093953867543753807297378240486101911704147190
+2990020394219301141282427939313186733000711509741075546302432127423255702951507832353089573401235669455023017949653420450062207
+8315834094959817998047438269545055161942585493293325815723771181252407447320553420868080424394122133699301368250012158017016770
+9114429395330391270070591803725103499827663830583921855069504046749255370339126443177002479229837662039928889147633055859281868
+0939693955047378469672103416236905988750384823305338476710533963327706820167318110473623797427088982971507090747733464699600155
+8097749323633489883895572126941411948413387610953411492455863784508332803867377054591645781447379503035057961144435257072818355
+9192774536491861553570480071143726445650506118482951514380572367117987602662371433431531020944047345411439555055616659122572444
+2538272673224446791161100046059076794348690288664907501420986291128393194698926073716590796828226666658940692534781574652080599
+2296719356672708630298340102476096286223198315529342168688227248665999468122934752834636542066357602969267253948955801596039200
+6907553929212877794229661239340340054507529389112502857484240836627584226292443778415389852020999685448069205241033372399261985
+6092552080660661596415004237982747843962036754844362941207857067711980933061648692291784758051313128780610506614569982941900763
+6594390851938570829005416110125258734178056235062424322731777215369780823020661620803238711218728587137816612075854867828598400
+2369696331217866566447853409278304508453286888356285386844080814982619783652943626843027594633000036437577975836948042581832383
+0948885007237584172710171695745820012612068700229335944852613395850206862454317862915465465928827325249777743488489409096560811
+5495911603990067019527969794975740716100732404562122420639048240417867412633964511077857983711654955131598842753406211465747911
+5938576990907415666730959973171116867930776870120598849297289380213982472240243585128799882672536952585668000017332908127868142
+0055033948608802263653030525631019632385167453147504582749896613855370979829552517051177850239757173815628192095505002356755838
+1575006377951552426189315697593571157901434403253801500948115475871805154047796850271348643125694619380221648554282326550822126
+5246972276283601394823321357823533983734860648197127606415601325852813899044500843947933650765212255657169653289842270182408561
+2963795283400693969427927841410518920229478373496996799858803689356286312942605835353285929732637824507016592351551689198434905
+4524116354075005325609861714463374588743076763717669989113993414649241279740839454455938573607498636902929162122468763846383424
+2179849115762842803410844590988059861418931490923531363860515702620355825744742928541840867928398829472206209785674120570623101
+1132410047750617625576007081275570045071771592714539836172004355577617397790511943990307565673693827096029990088810389666652957
+3079203667265148591706387956264742397674809071114000619637965798572137055721279282178439992636758230593462657176883252897846130
+5344900606236775949063632708480760988922321343844454792539062870953446557548709705912512202634518627191679599405320534739710674
+4862620838291477498931509821859436769537924979388766030614053473312195673928520927507333262772931790461823017698325114264269689
+0377879474949535999373402143435358728101597553950835828260875850446040578864121150552326559433858342085551900119266465442357108
+4145382952202338626169521528905963930174893641795335885386219002691641231007259917968036502863440853204735639598211642320126801
+0053580536687636415170048134719028636721663473814357492351910729926031799390889508364212752500797332425619171871273560570543315
+8050888999124989277531284920879308536986968026163965044507397321505480674446271580916011349473678101309289578265591746813517726
+9127557909914237400136577868957543371638044740008283166851799275961511059368672159330761617818453900045874047935222126146402161
+4101481561011635460925901510238481810190290058999387022386961480571796642806735909558855831574016730200955930521599776711652022
+7452149234766310409197279968867850647491580237728049077688692166936015804308350068889158066597960097627065379539367797830770392
+6879895654050303365324517468233477011666079944449521630351405739029720149442284020545119121309386081120398471736260643772075320
+5115668578180735659993042798673877885823921120201277569914715190894516855160960884928665814998466370463245773786729580361126788
+8473676321663825127148201234179810956242584805477442480418075610556509294721684997709018216961441699698479559880791844442850980
+2548233794760268816189190401306088756408880212519056730724214290704225280819394151931727397286420914387903845669497115561372625
+3358354482836700948199493625980064917823071542164808097350543961229800125334834517703864655364546055166975880935305435123088821
+4029969129548193511513014303632741396672093205336941776475040363815521979058565558783096959704099250216961508907068930707743800
+1178228259948098596059380680409565881553234195364086559565498076952409655440130991639052974945372324956190156780171629355058755
+3717169015464986627001032179838523927735142460855957466743630432390818286505306791995379349323709241837876168544133279436428880
+0351514453291951960472553858319673428002898082287147987459621016579844258976392337653325512601241626465492005157367458123795393
+9131757913676253650480410533013952331883655576543674109012844727933443442812463625615079052305206439748070329783436962037461924
+2344960044770585240104572826430912626099098553793285442582298302002106108601045902079657749391794040816491373923940544837370962
+9188063701594180602103941124399234673973525989100931802175158910488942922514429931243842291939057260146437903218286048586526737
+3095726475590315515951883606439041451987645791724176078005404488548116509110488969805623639698399122683827452715501916665020036
+3403203657780121846439527513421356719526606981096988845264774034545984754667811956286997210908649753612024363260420418331459837
+6454363503953069085653959466382547762654112282647446898596667543948487517796676159860624750118940186171824534509979950086899125
+5534857215488234005757824538224541774649888325359087056984429790126545819871211147018201409980430263764262297169187413523924493
+9520167452539794941218775260774423444492261204451489938948286717754151689428746487424118400020813014135629700319029471552190487
+7649753857278617517384047446362214242830920706961544783469693002591616096695611398984815665331683937899607935227857197308530722
+7670636468635321903676766861271780561993826318676409654225250617146887843176296360469702345236373355189175304203166464435492803
+5456942248296553684603690989598415553795292969337585462669697131930121000520692716176831920728412650435826182698878423955991084
+2896202227362420166816298936702205787111522693592087473120377589659651412246131193859654870409149102874068068052947526362484606
+6206499177988103420772046456006763763163890633653756586913836205106440292257489426046140931638490258992453397047593430476263734
+8271727426541847240045919975482895895407596972876222349935866226855009736203327632117757403576107132386631830517560425145954967
+4982163925157138555939635994371164500846077564198212229817459032427881591645290463697023178851238007473163893076170963474781460
+5340106261127351887331618946742533731988940154583287036382074049074320856289664772105865760586792346984849386692407381048942810
+8539587910802062328556477423232706345676834247983911515809748455837801552264721412722228887311117555317778442883915233779797479
+1727978384302123967727306531882414560603798977850417620003458650086712045078303090511550979287673387880893466154163854646269635
+3674694578655904749986580598395421685146833662087197374056652325798896836233778806349388223093547068287833955056912724333066803
+2847637229990901535043145484946473452323017593046078412652932709449735113175295374406245481235052704111601101677970510368326922
+2791471564967916436181421827384161108238141389611296884460017859614820709694863977807620407661790121758211278587753750388535470
+1311682212671438808292446213587823526675524926735249896308087156166254699859676499961522597030531906137578453887072208144785351
+8861987970713845651946125749765842589051394459161283498525078704659636051445265425124710568264660637581231331333166906616781773
+3433773030784699549858220921642631039795495279596839707512577767723632096893086622754554818674187555230885034907077860457028892
+0456580053379968368017945695164763479833506838952019851181545387562584359601036032261663315698690958554540494006314322814695152
+0089934480486704619783110767294727013349926542271497056296250118282426029001430520413060977864809649544418723152448749796245164
+6374218433638081986774399897692332350976246009622586461188714603950733284096247572024844313234627483374886751903785440297788166
+1964624071497448806005939877571581081852368682713329198774704389508439970356078811686024907131424792844471710419031994307710495
+0920647722499203428391025133284362175932945797352824069655533852410541721344987923656955005597638885921881748026281505225146701
+3234051414875467310335184839402728147911090604477636334326355603404083470772369446633927746336105082555084803709873030579813182
+0797776807854225896647327655002411099428092825155001834564019066984990634531216819521296497699004639732085677368728818595315930
+7917485162442064658421046487728607879599371289976088757626588362451318559683586821768061531908102225442474938214076282479553260
+3281219759953705660325535461460598775637270570011648848817233301493712654518786509665608881437564458093540417006933366539835720
+1421309961668710980725741781573712344943061720229290458895090456489735933725778071381711038599743236066437961925604705889777444
+5346018484213473348778149540609702140487404833149084935132956734625173249282732560039608351835971014828152667004296001672327334
+7640982015534543149522949001287972675835062998825649759593191032854308472369740597155188057572429051521288244481472576347709112
+9082197142126709759172581677046792938596869866773476159806997279087695007866672568094682918889951065921351285356324461616422296
+1936662836367636814393593918150500159197921407091608653457518897602784067757706017281722377124420704953813373267377728149707235
+6165532554189463034890275736530147346375384892741034329027227244542906540148716547806611470041759808947343102903725834811540237
+9921590940060069893953324679767980790622906014798953371116800849894891003273141853411016879477894602450403366892842855960933978
+7315523767557595011955152358473653019805790165086637876204849356737581570450280098237545014539966107468231674446113357850428012
+0791096311925956512226765013630421811573099687378388596324590465120594475232654312603704526616319090075205150090415360289991719
+6209585520294606187513003055352209151687938901113926217849214203137326771247519247105616300171713950372822794825746012319922943
+9070419207282434237195104895273960005868745134822958234433238365905514670266360172103212277318139495451964580465731804042546085
+0338167338157532972668177758079386489083653270128069387600686406564818006155678752863600080494279043355117187180589834925431100
+6075857929007054805987361298779916735419742025429402324367885856941288459616727309405216361897524393233989298288583563658786859
+8295608945048628864124667559446303925571884604451666719475562297491635918267804843940029802361638899118153382320671609177821037
+2582167131471095203583988388775565537112236568527071226697464466863969482609071992299656322827744545682290545625251014139439495
+6711594101773826530320065101211025715415340393938808536071030195055575879765597974028194836866850448633781263352118203830334159
+1911464166497757327229347266491166768994040887477045432967042061773419808596553435219059712816623298485611786304164577509711093
+3950559965553312195375204426888631697136007142008473612408896359608938295800221018496826509159015008898585495437881710932385623
+9874188189105976892158996129334251306053998794609627074731940358792016931428037315501950874633599120688188498035110487709165641
+4173410887164627415991784444779118017795312676797160939963018529923226506062126935003504945358174169319649592822030532548902364
+8585536437904001642599877592181317351676828771494354438414987542591562928890147892012194379909967644778402105597291718886776458
+3150820435297838229930820366686733000243384455249980345366643081949584071763731857162948259797374460060553393333323596509856155
+2746510308210106138913961915766655928022321725147254596535903741506128248245569457512888067134893515592196316478265340857967148
+6054837822399734332369250046782008884610626357811684106025662192613352002782118381922758419491552146516596733810475017566505975
+6253444244691352274570036070483313882748278795425532524034702609588633374333913295809727607310412619066512211586460777396607177
+3167935626890486882612342937895694862011472784369829386553959207681859657350791878067764914715082125859929851130735487337849909
+5973912099248621614115761320919410184939653960557823675647875630413749948258747675478750350454945866579601771984960798194388016
+9736525221109913891380740014791803647462175891768280453619965529263318350088005137408675181210618289125588737889391858187625884
+5353369021308107059796622691343010568879776199002760578714065302617216068310095438159704609241785014319825155619864292170880710
+0495180914933316707105009248960814921465681956792191416760665299694180526760284922837494706424443747428740900047510907222820027
+4261167178860446527279234457781216359164057184535569399549566971774741437839602392078186827336187328588770123788484074481402098
+3638667122645479534954458961543608733857643210245423464371257036918768143627288762652953247716922315676522443004771243444008790
+3924515546743559568892457871009003770852048769643235894176832052809028875813896140562020415910166599360845331504914716199418304
+9539930208848580218543922990732130838884473458954810662182599563214576790823089949536669626168272941913640024171496275351316441
+6014586121604715045014833563011298445249992633905973084716393755263990314978408352185626630254184110544304520462563363100889663
+1480056209827971737404379030390423810733649879094610502529510552900145205746169635070607870308190199905737823014183804945008242
+0269907341608215559877018486447313197581053179139277368261940240899846162645640750726730556726252880111678045833842135360488520
+9452683639389882051701960541518755636274003173728067144992243393027569642308110984514593826650393132965688544590683455796310124
+7380252617100440281579567534384005518334110526934315682916800234325208500512344342386934373532140277510905603770493859349394883
+1640841298979540048287075269187639921568678590871873233480612103263772909669941767642148108401983790040311768132667513845995891
+0797228841202589730512673576721011566549518209931565777081305309555092032097475454967752699515363312040210695622598933787975405
+8668051227922162902176856358741680893763627061240389531754672702747011947735221029021238076999742096989024601711374129582948446
+1940517877834907351003862153234670764674347412348064152632718218140233582465116935278604919054339813155764852687263384383689198
+1258507121750424356317899666874328759136117897322624713333775442411946490404548479399911860814088039900005338783292400154353212
+3215026566497194921100428678498475477212368831513037002482731701747625115899231609161962690257412946823057745227816040916263135
+5553936624046126710513840693074241292678003250027162357678547764315313001417556750343221645935609713903330012474781806462752509
+0087160096352464233135718030584278086059148140723626725159134239250134423251753319043440628036779710209805517160099782393064078
+9318218498563579335348341700906218700126032521018782542069807548617891695409073329049001835630809969460708500370067751685336992
+4208076385552541906663566236770990347477457147392506695455104977958316161334777343709329582406111068678972797895379263213969728
+6469519015224118923867472889765223881558607274601638396572334489644055785283085612422941306760043896876352796674858662547224493
+7581545382840053688960159322695550231110088020621219817091426507061324686155465441741816208389678694769740607167732243171488972
+4513458865704194161496940570841680853750653077515467382681747134693802486964790650970100691348806372555667204130083389487834234
+8611747863343669889389552604708894518837779002018609033906535124466043777729170830388281007572831090596749539330676454829092268
+2614980773184238784409092097541705502166871511835967598046040179529035245968990886914099394023190993075959231506769917989928255
+5078404017663690714097396036195442424905417384596337491669874839339606038090162958546298191413554764614281624619030688715839038
+2641999347004416078674706237266340276545528202969242926658631976187485588763571283416465910176657402769591804490385811120607894
+1022069138109039758566977843736614783843237277066124548095396035264485535383579339344672494958836028783883577568562124831488748
+5036220302308126851203910148295691777409108647096999242270479109438402097077523126876642469999412297820631461204592271671208573
+3765990012871705693020962224239694872611037068970786438641717866334183625110030788667653078611800346467240202316395411589819234
+3782933301188992583378339987527190128332463154672014687853873904582770103495961273158433396887983077621367280840979561172209874
+3749199929332536186794255922364823419316096604597225233951718116228041916547239168206812159635533832324993459328359641335851160
+0949078067861678051433564861906686233060038981581529250289577929864989790385982845786299381823508035058298434160670694386088772
+8589603171909191258961043702444348933790044242468360895051180975009846570524502293795875915077460542906777905339916008769533025
+4696790001285278712597004232911565273828035212555295118585512821803987256554356248161862945364958160311031123882054615472804301
+2136763839544335242427199077661794515629181187002289822787279783807001282765862055208820154228904904403489678312786030757766407
+9614871264207972090235920749815254428999808582182551807788105640461738443833466880592889986393806973211194934814261892282034345
+1053682892737737957362804191027861071649489484546703968499730625323764928679998205513025454613668271807284174919717885935584552
+0107677739834015517323287238318659939175109001778305487593186279160892671682768468572465735391214037913879126299875773890935302
+1453192783717188719965961795655288342172822178539274975297334507529484119848624649135862288188339473719284880061285948938876451
+1104549929363155396273207050870222760506597442331198500643525825130190102095717730285667006432704158844993996831311067931052472
+0828794534801481162296313627002145147495573308897739685396596733882610495059540555269595443659894160127867987587635803471525887
+9824022973580621392509031573913634949593512565298787398230994893915219176490569710003371534856099636970419816555736516423169506
+9878869772576948330900142931880528301401489012367453237909670821957956278129934157555287021598067976133621454184066239649408611
+9449658706952732276667554753119961137301412966671524990966931464264571223338509226807775956572226631814170860570478467598493299
+6650524655470467246688640367290038855618731841663664529545949374735107916410687959478366394614227095766286594581538618985047713
+6086084723895749993359399578577946854255073324766404400181960974843071723540051597517023301307855898898894953430083847202358708
+4753978848939024247917094291054930385042551054372444060172056724142258138979831515270370976027807892767076899036493276499539268
+4888375835344223898032733332908158386194226863203069893727606532739301723911436149446573440019514355993413403576684311443713663
+8296174705195869577823179373277139184472357378750746123040139737885926265459733919518384739329034183096218738593256149149459218
+8744604285228489074099091055498838353604537087151030264581202847750393201247650508352763633370859358894270796201667489608183108
+4803757550419070833057341387873914307394706611793081307683075761521436160450412298883575182283341357874191269212976379223012176
+4435149804710266828206094765772134040146772381477199506975830561360349698395986931196641173574221626045221904844792851097031410
+0140901477445628979104022134212056527853288372076077175566962012356161842830489257088195443545165486451856025672191097292162212
+0064993358872969642733510540028442337052528489493327308542431944612538748472046808937048692371405185247438306806803215040744971
+5863180250517768423942955033295423284494978569038179153339219650484893674393537942959738721683811008504606623434622402463074587
+1057835094428515977317637880823368056821605598124838652727786262421298250352722448869673429472764531868054225289565474229567344
+3983238067434669068143443350182793359210352492378691479389127933138449974060689160199725860332928925347596191014918077016053014
+9909206404814481317875154662284644158413522012241871567063512207157398398808577747347614035401411443650498361772558269985219726
+7744531085141281581884696688318667987388073192993652661160923279555067568241657394706279105517300977887168465546838484164576246
+9611748410338839797298552575152326071882814435353560145135335186607329942289657269580962404267932188572721339477733166705898691
+7946378873728294158344802516673294879896454520313415594420541327407109273815189756012820920103635963852069701484919842956064247
+4874591841062298195410390631359369161750834793590724525846541010552709961171248502344146476896644307714211419632056930049968152
+0852013636597020207693222771451991722621240083418836922565030460173149090294177983564964216327697927947088353859239269055188074
+2400549504774664967997419613371907388057256285629514767888950107220270166626488534296499500671373046737811115964349503266901011
+7846949189277918675793279134349974486913260503583373441600579959916070999842932572749268240452265295033063113981992389359199980
+1807261813286492446582855762770791231541210822077548388510880369998042947014204967053843960432445968862263380028288322991265906
+2762645433260880544005259370505499891003063278739034550726117946384596067905756389481622864019774830490639904899687312014368603
+0877598939078117695418432932115534755404639291467885726434445252435059379183430846339103652602297046524638381772417363883263654
+8359730049870608112690328069372460928467332597727838745244400830648941526818883943362511766258737811338084111308530830389543560
+2410247474136168092178004494614768123474893065682802068994067272461583528237284734448787471492174143726629957921201303786784836
+3419244084207146670255645738668183101897287707313517219103923810981141387894446864639750358126083692639837682548305250192071549
+3436195357834369331471914469743643722462664355231433520254139779344070714371148189113613561574794491575113019678653016828154505
+4439128393642435861391888228862161582205771186938296499633571218847225435482241772976029740807151825694346388408247223423817081
+4171338859609192030035030504936231948955422469935021643277709598491047020926862755743386040228384976638566676326191183360208322
+3510862362886970176404175491659583359746924395962009940383204211293131363439339555697993521569537948812781342292800263161257581
+5726969821251892647951678196842942528264097032325730950425154233756415408461741348237674984518538018983212811201588754756679009
+4778823499024627173529601893322692810338013854983738107737211008580929848242105038076828712411467725165215358148210018424891037
+1496776225022474894349628318466731097093204838845621769757160832213029122420309244726997275518899114578190401052089674878889558
+2150627813505105989559012023523240177523105542484058646465606833626398767902073791909228024464129808047176621447241995834760361
+6052017973982660323612282677894938232580284277106494794233888932365369180563831962638387127741187828046331415436706723759407894
+5180894648613337149931873741726031450761346316713499884971063033267583243155357639761188673059015634957451632776491096066497095
+7359097724129074389636668836328680896804756391700054500433769926703593431467797993796585602417512809374217324038244052246360155
+0320127339112689809171849857331267778192107524355671645529083978652864384633410979534318842451250352236642968028403645196181521
+4118883887076525329129847815663385510560303081843081502700312066224535446821931779450723308317216723461024137619749777688133771
+6860925861993428345905718490095572908986315074234835981417267582301259888782018674341030424958141289788351602467046638469818924
+0143824935249223588362256342022083873670928848969341583470612068807101099916137780686058304339569283167254333748135808339800772
+9845042645815548051061661959342234028016893229602886364367950621055704775648720419681077874002883738984453187494339471937282961
+6185757617018491828131168967624272567910874050935111978401025105754755523134728391834040088198125315748002405260114662632225537
+0001356522238346600683651153474644012974963965580249070955634679932657691126596449770936543341015260416997826513343646145044283
+4828874167962259991499503673600129164632862005208870245173240873585329607224314026307889603968799682624300985376989091014318333
+4168596789573195113960639290119776051474016854378309232971533989042184885619296187870057410925857690307120789952188315701548184
+7815816015467871136014863206025674274535612873638378381437080759117487117954420502148760971346576864484963796596882357424854163
+7278776070084196458814159988413439534481041061939764299982929635630954177993909110795537307351830954498765311432170571984412940
+4866643127910829515007652463394937334032003939291631862785106424516937511685939908344347334073225050202328398177347110978277589
+8801678473026832588217149008639268101698714830248585119117348101801713106570301483277093069752495633755950440945309944552577536
+9617526174545226424763055218268088790352736241937230497521917254797890205799826169553805927031554132395993133419267021828416925
+0588595739388380595646159745519694245103070425108579498054959496392270944865180508024017295767451162258748775694293117545535076
+8702772928743292051022384687311462236447455075709507160040356608423402093661525464261088741775321017969842598962589897299430978
+6237136476697160214138655273076686746008630927947783830802379210660809805387482347921808311217785296709410669748246476297410657
+4956721962293257951828094615247811594706401567441027963919853253912294488061757086648296894406025064932611868738979275806148213
+9236140986639524620047147846000572917224921424609362686790157846221057427556655153843449488971368941339909014048314921826442675
+5366378038534835924469785482056822213525701444985254633404597205774596447015868437597513680309327466710395924280351223623339183
+9261759487436784234076954133371789265925256106206142125748755816777807349896143234487553341181444300315188799020606387261852065
+6449231339989879656134113568400091770993505914272783860814830316499113207580889761456971111735531955653301180535329421263128180
+9593132987957417462820592468596242875901632353771559986709766159903387546786798526051530972235857175987208754226458183961092508
+7166010270941368051527588903270384190676373547534758318035208065713808112773649467017099455130795910402044915843292687098488409
+1937469715418217414858420673158652244798733546985659728265347906685952080207655697652213278741491999837300249957163250199620558
+8228542398195856592161847035652366519403982135370687548941385579105164032051119406009514327346290711302155896619001736994882959
+3637688922930586118891425546901071630399830689323382607140358997300211646909715463890915726479319114588493474688432142961034974
+3846092487931514115420051603659542019430636869539365331821500084544038227936250365288930517356505814134292254191756084661422225
+7491630641568207270697424777290522332626816338241009039782131614678232351819731901409187134000842000166738975995925878926795417
+7070750968877352578247753117115107850387026880348329157736320326010941179590211312594408978595708610843851283204781916328035469
+9579425490712849875219973084577346692279033275981940434988363957383909743141776369454560267346747976256694629456374012164182136
+5715566001611830336152118124700907641876141203182109095013901373890817946278609009427237417191831719001170380251629245333691467
+3777911831700858846402803605902436628175309291503492499557547037759922326055839219601687167716391664999501580752878380637519910
+2345655297190543682328955031766959976133728834616422943753268441547260728586436316967787919247613972239277147037959837372479832
+1264917138428370036605146743753527478105136932962495735773676134552135849746496312485051160777893753074748519890909181403083444
+1019752269689676763134331558096188560591351764633604225395078892173960817806638672836991960044167937282088675278982806967963563
+1646009447412568269213391779579827953653829284427738902923460839464242874336523939561058096952551188341759036552715805796071087
+4514073980834947668053426086988984219335479873558292410478690803080693664498437799009591988658726439726875547569087833595254435
+9375888306479510358575648650751703046541164954438171217850843228076528589259852655316343249086105052230853543970799873699798265
+0497165101239642555970983822927664186264700494353584434852254137560612395432178721562325965038387864052788810184396252265391565
+9637587742861000445296706995627451301787108835157787393998256171661400401789319408568582769562951011299994449045177879050273430
+2769638085862574311449284998834663396793439445498698446119611616703979283028314824805123683773362437290195603306996434216889157
+9746240352274295235857973544138134283682808329702423798784675201114018293748073782256043515882634590777226313897991318556273667
+4701746730536780180098002090253702648694901490740529266632381315672027202981413355374788940709298520432491519903507229198264330
+8070148149525433117389602780506057744721609297582112109576333690538110175139908485162827329907610365996630627743121137187293998
+5104791573207818901442004558359267736381147580646586301522698902268860041597652832411905302035950359208853670857974818287006889
+8341316079342584982610662915730694074266548963632208359785240542883719157226848170269734749166834340935627403531307648991671361
+0980972555646214322144321439065894684434469993258702669138171566031352957356377641038155398195278908409758982420498643103410893
+4371601001168990355540734973104369357289155288304862691393888938344400557230712070949783924178880475136899894295722616103660902
+2650480054074532640486048424756932242389804525662345983096982594522899748828272298964877383316038674083325253436014966605240140
+3856519566975050055663208955514019483009113366052382153385562181732228724721105677879336134186949728875130780075511950816508916
+8078373724394599222427487550133729616625008462045077201670397039714132392823230257154531053190372696559721189464062559107218427
+5533555275076610788085420797340154399319379967237990930040901555785674670104205199936906742420190549652702261090687000720033243
+6220111323366364001766649253557628713894497231901067623752708357435827393686138195041002675760831950319558894058730884453262921
+2672277003207147557184524907281442713352109540367339513087567600977008089227949901291846746947778742548425956666175882640922513
+1341364992092721464190832131115386139839119999152547728030982443332120739263533376607896512917871745789498861904805336640005368
+7658494769549719799407250503812834345058648333149043237321838262779633765459673785919568562329102220327192186018538985265090758
+9891469225677893167626557199385256479464450147340948798817312917938176509424351376822942297600700655298360387396846679746727135
+5585419624514115780086956162546737430419445855772977848266264876064891998070796161296726855803937113862539594644902156882096859
+9369735292641205270247208512449851304357935258980017450069350537303506725253901558161348011161752800022469320895146408450548005
+0250792460158595347750598522833094847081172052676835161342784300572879217498951077354750791561533069799550859447965317570533329
+2215924262194811929293333565918894008757945953561673129802085846175034801490539407544733104736094736753035909391436637603434211
+3003828547025999647155773214469770001753156334255534694689533941988376812539304881256890976599139258146884644045613614613975749
+6800289970404751783592624836999186310592737935219914459902710041374388930994677919752362443845898391179354567028930335795630336
+8505759963363966237797610984127231223565214326257640335015223496586184791131912377414208061741646388077399037761412502229212389
+2367769534630970786705110465175915418118488516256049569042500049966228999665875815493320452276993289094558376973109778079159470
+6740493910513290939463082366133739451516673396242163998658427933891438988618879026121788841470475041492666218138874169322768351
+0357303411110414929271994301686020384849443986791255124503432672170825267728337655437754688169388290097504447359015466216468554
+8192240142847884347063706580178899765888936207019662263339819670804657575316021484690040614562949295841542317355852873318646994
+6622263158780477778507038872483270954479088649415292887077869603719840994025710565546888311161500807362774885446004022146890733
+5176307819234962298055575706826929453118700498832781969398229886642207165799263179818071674130902753482145042794765741675062383
+2751302275326116756435072977812989216925193208517438463427139377868288067976273977283764655073728859395428187073500573181560080
+1845833119022235738677681522695682631533441089840982284202257527507809093077654733824218731845673599302802574363126193666185391
+3166900131346963127277355530406427740614776135936937104096485949875917688047955787215898240293170537866227146364747857832752126
+4669645223062976703005533676266421855057200556768903274559944244985743499257659816488004923631139517399183550005987669212203452
+6297157628559223790562907965128004350109267209905657347407682698178194211365899319173140023292544735908289515011446104226422300
+8502054721545809152280155719799579471628904200160322267901551608506906168294064129630324866997658363940456422902104004108177137
+8611455694956943077268590839116881863962149614279260195002902444128093061737269752861412765172102748566330731758569318211290162
+2118077432186424807711637317365270035214176328074110410477259086405158562676552653953649314850972984909614735542131768665131395
+9130318975369645829745860603018652270421321400871933193989890358079853776989047665775272263249474986926107253991947206182591757
+4325629926598371530112760898633445089584186304063488458578614511450976053503391266403574144006236271752461276059535144816112805
+9310962691558816998084824217608875970240851404516558899699931821439837002656912679683111747809512293159335274051955163666587739
+3902386789985655245291475443305453851903636698632422663873769701394003436882941095444088054500028643416504275287739285414766428
+6731684059779922460344447840778233714899809573570342484286950672469381242333715669289828470432847009362616600780028432025743033
+2276600041430073716292091375271727222342465787797822281415644677410001912257463959430983836963509288786612692459635796134586826
+9782224784159961526251458006646854715817922665126779115397720973464372703397941849152840323345005890646175543131277561028472366
+6526167561528291467123805366888888939086346365110568387291388627679455761130295567840390067905361907699677554800553539940686367
+5318634933920742765367288875699774586510799452591417236786364826083325845867157040527831875773026806940962750032015566117391953
+7493598975572064199793468603272146721884132503560554819191261369489899329392181449153306365084506335645635211479940033483680033
+5666857577286998209607341637144223997808492861427974015972123407497307671199006287616123632355515817115708130939568369663610192
+1205647133800994070282776117664323692713443344045889466640364601504907846992739340462456897562574412472399343745023522153250853
+3330319212199788930516095800858918371890861157149091660451404495244272634139073531985568539542425087248882661841548689414190274
+9339962909966865014181214015249254327772461905399600921043142492498857240896128334661531817157722725029302364254696461600120855
+0275915123664954327692393323944686811113159039391999178218124646929218008261416648150717574114279175738099624550954907847794987
+7571438595941848638134927452374529897917662628583906227103605014116793319790628080501185855732090732338304609688113595225239617
+9130230309512350610529542991215174872450882806867068241227281773112095423160023040208987280292016395893990306260033588936149291
+3745658203217218584383948667226718968580182712181973947156555599253392240064780457939033740602796118129681262618905670233538489
+4412418271808065273371380680584774737632471892264742468899650839254371362867805781616736426407895133489629389395846145646724319
+8489210495984684333844268191310832723383161085211929007986759567690696951893569242504292424131665261321552489038411809330750578
+6574010925786704765333558400961864682658986685222505394734228960816617397028634600968531515638569668302469579752350128387282475
+7078834237219808682337835724461339925697109440081470255808977861161896407485691000442893960515108700590859410043250399284457162
+6826005017559754965121660973424054878627050600950197534543970583792709158920574211453104472613133226055927030752116724686804441
+3714997658728942284217722016417944347609973564690519305766123183125986230197933675112901682033357194516255841107152642532141304
+1057671755594723253182271537993425618933500230542903348744403011513962182314508888904498037845069539547674219152154472098348463
+4167698979868847784276420293320039606112408368549434641654634849595716003611837153708427260322734964264330233981684490094968636
+5842205187892994596332543353231430273153910962730263311288493948447613898642287416656513718409931065308355871917064045665758537
+9483067464396684153711784947324331651250593602460374159868530726671454450164268258494437853338327466263116015842104260460184775
+9918327983152500807062535153855232542858746567492036007943220587038833257219577445237712255513226337182088357385642452970244677
+7796979178949646284046620756567408638628381588842960380640158418933607236535455721736245193350129856456748190582611676103108397
+7474868470568488770868160856619425486013084529184753412392811134951027143914884376770407337322922148422893409126222728159404831
+4025970172900887552972543571216650363430374550536726543515591505239084581125341961497432836939375430662456975979411649814396281
+1376673671354389313333179969625064091561856231653660770117134131024861451548997992193443491241771601133879416546391689721119253
+7812382563778834433247309068407407067582779720037171842393136498269365501469642413788690972515921121053433102407538535462479581
+9706575053071949026852790205126415890557321745536935615519559505631029223517371185086529237733348358256190743027438758336144576
+9006414531022472111125196202814342278375571427110180645405421603811535358205031055882679708681076022342218218061708622772715466
+7014411937404524372862470846165036293398376604107823885481595132489354330681978934995519374885800444029796119672180751145597990
+2217635875626883098820646597303117864519547801664674186453314965253480085119898512655154794357106383983041271503641895125251110
+3512252235837181461231288315033867607629725036297297118913502488196313074376766607719647753171764776345290627421411392489636355
+9367329989873888631983207743830247822211335192876356701620415814984875713241717521999471919347104942898869901044085358319426464
+3886932632919049176756333953836633255259101098478704964812325499313834184343270599669768380535271527046781188364512125103089728
+9085400532850996923140563913725057699601728324308946983801623506065312434754540522710960789580013319731801582815683477412184104
+0482120489559053393661539069411739064074531226478250805786509477678364657275374151794004014104036094940006833641747026194721664
+6223030054108461763808112515000136243498515799834948548188322786124370768805042850586372228996897524679407164853720521651414447
+2045659821087414454414430804224189873085215197748925231475200893842348103097879724089151789730563882183249354356129862099874841
+1315828776287414001746118239879779806183081196189658013775774856212674965726153082362347461854112895332344854176341904165597409
+1213515137476784596057537684608135941219538557595828609988436459029859804112595309586038750020095414785054256852539919216535980
+4484140865975650257767631970278524142097436320367062170812973468859967284286099661751054315067110058820945519136720185944895374
+7742692644036659798892433853855040190699363942257261289132684570773772398269153067661790938476854192452194252168071064023197248
+0852041937859186893599452942342756186406516322350714595377388609314520833365297395472603829432190992959559426685189491282347057
+5433185143289951693194250541689460837628217616946850778491455755537650206858581434235195035172795441448516354831307931147174885
+0450942348007827481803050062279398301950579282155758680606572572109484512358059858330484516434220157350961537316843651345720503
+4380803663067690067136823238680695720389449212682650668097530448778728543739620300359368766106338322729357455486494754904098461
+3264642960305581246967575470210497486665490038206044077023048630121578302316138939937893860519106763145890200076403810118822241
+7107639168089983991587862527040150737165433796689810859573435301169366192576251898692883826389304101824844158348543802249127582
+0669598166832510431109943775944521732861864105283325341271770704933734103372804558821648326293865298432780241079718755089452707
+3568107971104085428061715527742724933050823192969880425640410593395489624255402189258495659521212800172822796344882503818407485
+4194972547530169348356862971069263077075953903800152306693089832494384056021498593498576727061441507427007792270872575143948044
+1172788991936383893646302947517752222941032857029795292428946787677455477081292410506859204482638074930525197495818984377516119
+8708727404823062734669585099177621030117278743659596151369099005394128728746425149879168020045121622056893025422397438542352826
+5536557575335193916360622332260209029723091397745281648820143235533928946294383911963312581783465260511469849131842805230470062
+9799128949323644060685917638538635211442541566486657515013727896653746677089071768007544683389875228688476415065723679786222857
+5615573863935839938823973115950563644124889855629743447770458847381603667537087961954383608440966294356327727154342428403717584
+6135719365304945156195903748702135001035781887797234160617684449358873860897697192990886253607384422197173334101390229305548708
+7355386834242660296627412137907269283682869702323709426719706244145140528071269497974044139621935732608883353990706800769609401
+4117824188478783409286690916041542923147052848706784080198351893505523979781915688089182588499549735693880215954821551279637108
+4670168752285459430877011145545186817108898834243886734027847064654587388165854257852169040893626949216503073312235415138548138
+8311486748387427946913806861679281620866414231742557923760474181682196182819449180979395793050862114181314437692082443568986323
+8048322367949325657177291617359572925594555792044926031542356556453504106573058251613848469630469333674263842694166478603019606
+2241419420107086119951172130953831261301246015464350985640311185360710868324911647982596380951605647282292847958812174415734380
+0207875370509633314857109554449234589264638078127939118196136645009058962335018366740029205503954796978369681506112588271652726
+5224125202089733016629542238144949897132285324338195131993745529968240465385054246763922445031407439625787648928055552616882109
+2793536617404132317781661381899391556171029177272445009604125493001682989300317084296686416290208482553512764370697922889547543
+8188433691033017668731418898412943576673580084814405684350547059200277266867531820522833168888834691511550304066275553413432816
+6069781060072723977215798057681530374205235352090719032425665651313169145801463663003622748057443073337332287692516062915866474
+0991144941963456299854456491439712458220412985735998277280486665724362417204461793739331274746630407706323572187551658131522029
+1128985384630705817449509424373236680198643102398192723995214101875334517122923435752591437827690137749416921444994412824571229
+0933149859869844034267514737213635247382994476023098139584524288805316943149032915781109345152673212416893459588048333327424649
+8431499800476711779747358632413776057189971388402676768615975922425552726845845057116844980552680355154340958763735731899549226
+8999746969039035522234132566990886859367771300359825363759150761208120895977530444860283076544729935781975800213516901282765869
+8578384564148446021966192696855640744733543364607326875346561423047230035981121889907856300901288650704791837601613641976512860
+4782737185453902550739147496508870329447551421595794641391271174654998339963075546317914475664543351090858707240517793471880344
+0532832780888888968522715514533732512924561999915854959906252640056974250958067417634581049729155174966017949852499049433553005
+1013570953208696598838952288133824762193269724513979589866416713036164401176767184475902330276700096926543877198993766233942302
+1558731482683686439823710758826362624215320659618968974586082717778992330445630506757688512508423035162517304559268454636939287
+0350643207571320038261933704850349754594287810435189119965241800581118358691680807766625340717143030794170306528880710869836401
+7542021244067320014248296046012617744009265286583021536650506535157160764351137973007620114482584140630719966828687210278471738
+3972594767241483050839240086921327315906881022442251582254034730627668558044239515436332898375100074941146541911588915186647677
+0697122022586499143860386882839929813751234590790881003673047769341255221587898768035294711863803910391010620206350075218304635
+0915512582808181894140392610882201933416172227163788895549745243551406730258634514282881847090763083210060265428731131498145196
+1501512625884967191270103224021116637844888067197984181082849059840793925774486252348044423174920237439188586936474269289045183
+9546757728181045784907692074408445085975750656689918729547020741600264958315888287557582915125013916814828453001978125724956413
+3762013269830490722798916645093224443451891592652341999436840113601558507630551284115296518475712532341410529593546552381421688
+0535075660768315265313017230395001783344059304089071262026544062275821507449160749765605530180854702975356649517426392492153632
+4462229922158652059017569592409947967925255644154395071833612619360534506981545280294824268624971434641426791536487863590137885
+4122860079882835156235088149203967906043976190683635109983922591971046404170885166646247578979128875141127938069850765269247014
+1129866849265718274907637855113066201183196338524085201233097892015346569822121339489136356302467977157281536251430774161642528
+4989929495806193845801738597980701228751796772240750395477795189154079611747433960930484756810247462060407330702869333431213592
+2584408285550889731205066850550890247663800179003073740079409662955268984464235081016863796902152306425169108972643255331837648
+1846495490902027499953838660575831876113795963871581292212984733841932116361051031722680807069640515568611052917719380714508500
+4730368154761060853591867016650935034777443474265562879400822197268954342492544791524055284219250660710445080227842874954141063
+2999165237216316240588784731941187402326266210523501276042349025855852110771327522344504598981978041650966736224822421754899433
+2237345937661408885897695793709671176319094949111986436639240560063478917538944076082940836147591761497957719533329126550091001
+7598999755791735199200904311392506066249434460145555306422386713523721542555336766166589674039359217816140532997872100172694264
+6085462229902194135463330821695657542854346332891821785703935541518889566865952336969577854576497261635473651422862788436766766
+9330926718781006335569837395334762725138935227106710853342363931868717426383038886351253414292607302835343171708502682390162568
+2759725885383603903963134803626246023341697535265756560586925977858745569648871684971845885034365173610581864076735566479105747
+1316975221277998480665738247654385735782940591833339656446094875845628844928541054371377477189441032462815404076598890156931227
+5084047857098057061549088214576495134500797236087647217879151791731034614882352668503598335757353547259171118367223224526235321
+0797097525215466425082977546510079918770199122108187284931098479825643355771575695825936128687263528517399780086601002282738464
+5882108977367740469432474363253310136350409797015594231680654761034810033039280285322415385168502267113255563957206593967018787
+3765499022319437900072126982943230712423709856742749800481145115762174065774560039072882469409389283337021169962653600686979665
+4601581997618072107980461792417647044978305789885381659804666757198975786036139854382381412304035407153678163339829269303413079
+4804720639771780250811522331538529037693400650190090078194406321327819886301852415216493527923345326577327202798642624789731981
+1262413264233591997549583133381940611046336903584987787247990058376502498817637376736904140547566821566316367905947287384644751
+5776817509537024183629053964111738625804577685331848301319393405578215972673272833105126341165662081776587402862223607527237841
+3028857137505052452119497280084550108942293030946862851209526606327291674235480503744471700882929025765105260116471991605614081
+9340100683840148792620022922546803909003134351687693370396127613819896251128556322124687119185535407506368947843781106277912265
+5837860085277971472343245356960717599185735265281223333386501908378356024658012834775741482445665420888316355875215276412206400
+1493889817668204302273257693995210600140074382228307911629842034054862116792315868260039297702147104111933826341459504324514560
+4753667010660505615221578575743422389046538837003732162433830910088895626144829160559920876420293005201234062697339903600869729
+6354021869352141987691776069755076073591529011311969753213483772524805097648788519425735403544963778868397356812064242294599252
+3007002284988957442402223796792807680185699679494949671140500739304141518373349678385232543712822588498429151363366914067465545
+8768505870421737992314357883218463757749966400771061631074878673057982116800200818694276568644501192730861238043718483873582182
+2517111306024948547742611078204983908881805478217286398022649611447119014425201196572509914583877236045184752832586045682283149
+1376425079937583047628837215348969478849396716756967260659465804416943561566523910593617918317955498182529845524570831173841723
+1739036166752846450279902298627287438597800774942709861167238037011909085160508767640035085875297386568223167138576660874567993
+2749444684052418908020211162253183694144723421354516311236418763218072849726536005435788876083510665834462678112083821685346156
+4979778261313034734593447279308534789267778320343662336147199781647935359075816167778411424508493052174895307203375091235720947
+7206632108909493796814807157234843620292819404196257674170712616419318834035027854762640349933755746419728237290445935893359476
+7972523340752476063451026561953128800722191374241698295085331249527419993680680244353440653002242129183827478637542127263140061
+6106361246560664390746249407209413785337414934577733325155578012914242942249188259728108681483189855141297703781608717770284437
+2459983080689617774602481236618573771655193699359105459132425259318658958293509205828433466503731104595644550263940782605577596
+7182234637562052669040625972588934688697821675314146092726738283785184154736418695256280074985786382718815935852352072100348316
+6798709996334119952629721938215622401513286500076236957073743607147857811179119661766817565585334251822559283874472847953361475
+8077368484549177973605286548826253514295310845993496549862916394171225254015547467894554807332772219846678815481086218479850253
+1557723569466563274008492657223419903746768944164337126986375831639044695750746490501676088871281694494821017358352031765251392
+3419994305802489285895038983304368890483549511884971605938842543322203428568381657097437964153561863023468226697072309642108698
+3155924019915150179568158859379848450337436841515789553391587979303261228659176045375192003213895824215877498665997186076059865
+2999137472267175701076913261675494050812219217526275916261893447733447516002165559492227300890776947227359067981526656072673696
+8601098495166116027734424221556221472614130194797807299983947972112789211510616421380969053402247170620773625487954585201101683
+3246912051329707460282887222043348831157339566467828142441386949856139091307353393247884498427787480035549002968948796358423112
+1150576199110861158548115562719716941558388002376600504843363323295796185489468606412792484061811432762347078760084900402466948
+4752997880608034066503743367113742314926769742881109939696550927489876774818149369014784149716022391683583701555271412269098049
+4122947315189371954201913791790379829165934721428116210038908501041491200253464990161405881080768468552171131345401309484164251
+2900730978305956981781132350165898118101889333020350831669690402919195278513062935410969054110767363793161548411520509850489790
+6317140142444713262780353377445709754525526526100220931420853524029521161445026020859823577131205174501439000115119816705181410
+4499991523210057790779337069784661258008182657881453125037535965670105347302421579889956188914279278573529309721593121892469205
+5508146256593369763940336135259800659809619929794178470062048041370071430831208645554427627646035391559292722312680898801625334
+1648967526716449029810215023304697906807519889979105852637730516484206305531886474058371893246706713362439898050285759339179316
+3759482577410685684593596493926547017312369150876917333521714609230709447558843397643743851645851153700140054595127571231949538
+3562024855350127743440468170916592187245116700044293261821848456699166330596624128415577062851344089770503995251522564366175797
+8477766635255068732724822778949890633417123111391309938080502220545229819981424955190249946666498348138015162432180329219887241
+8326147305998052694691664218432203744648063166741259109591553998325744681167769329433557902221338261010505326465825260282053606
+1089081066369978288230079958586716934294819087031912657105656191281125863299636207713663767265987214971817617524167760055475985
+5956659161052521449892118359418646820302358805073751690270525811449427458601574354728795417080178749838253936083489079736869589
+4756040554221482987126925729358987605986625930694194674956898248814661136244491613548633391179640626903451535330197156879634503
+5269657254348772763363513450959859105237330221730828709908803147787150002260299247932869706456162552333441429917744946610133738
+5165094570822740809419687589443353580562603424278039485215120717937567901150913213688361129548604982677760158365547321585786532
+5721986004191270987440236388972839714531938869537328769699467486823118683325371541953906389947764104960444262942308606574783420
+0825423274999976416479179163665065444342056794814403615470874263539258759123358841581177125724615901000777617590704389294753780
+6742419699812742131364238655136167729098672287631443854160975671169256136755724718145831652290376122821890697634805848496276496
+3900848450956356316829187800619138955746586281240305331127062820418337136267131988611645101253214320267600642044789378308027813
+7768142101816225544376840102775693516634889161775441232950103285109025549587962218777853283361116377890977393111956211092720773
+8166062372469258701826599477785259752674604446062893635372304334593302933414637458058589360745838888558751703330971096452276811
+2564850420537564339701047323195837094030546459418840734199428562634836997313660393990033302759129375346102025176996197579767609
+8872870135828449673289983810960029335233706075121561262257287764860415827304140209641297619500143080704997500176861691643727930
+3523914550868909381989245660265536145050317774721868915147125702074806836551953216452075481799528663908105214114354861340552001
+1593559589951778598427586959614078571783195940556392469576085221648989891950185568932203712798348499019366215767685195049047391
+3677450698912939130282894253043150590674429032380702463421683822229640128060377145549638924052619130706857319423374607432012118
+3201722283329551818782298921051193764095244804825793425784091160773607662095205922340014721050275267634431286245410339294369403
+2407761928636596422414810603411396624762992445889584536298033386878386163466235099237586521069756385945437909851885956052776101
+4551892967264629771755662186507262378960508623998075765778878560332855343021946501189553259398537769291592769103084773248272732
+9106997275950792264693136508466046590049216555344492329753333502148103978681698340982507624277442543719542272924397318970160593
+5003643337652703728951291818235842005801228735393820041591928726474748137284662169580644065969190131576241311478203049648965040
+8986752392715741495979561841249049222033021019539768600866686767034142327899022898431650915325022449300084738502689817549514938
+9360763437700859982761849014720209991738148978736994931574590369983794309597034958260372656270656787930070334337332515206838552
+4451175037964641122624713478708404279076794770827862704532161639277525181767823672699083856308324336587319988741595847500500923
+3042463864865181170367979354550819973787820266099597727415684485159423697903917044701020373206808416942704276522208882269559354
+3048080200899219985092787175219925954199186801590258882778436766885446862979938621696230463254471930200991285622531815432909506
+4494465194385245878424876179842789271630946260267264275467756829223006003558035998437034034758226419782837401641627699056717218
+4254906820448949384513753027180628971432660348348526219339979967375196656324459448972917993637121707012531419527163028051764969
+5795056709264059459045347065077313003930925374715251843125468051992798115117609874425243624614071216341941951333443769594712905
+9786422961702175763231201440570153261798473160575498751716552119467779736203318520988291431980397558340560735449110931384906041
+4425505790631864513694023511858116075339628625002969403915799344384754821079679161200533710912237340094421570796695940926114650
+7558163384552078162151051048460153091046870543482529259775071328325205703384361917997334121827387863984861026567298429845774499
+7024151222382954834390823993921385978213128615164507102313528814208567079688499912070171914927156859122712993045849060653099070
+9429307166946990362134229731057708239430020956417601592711428461279614801214510176796114831132813782448589275144006367262952407
+6718941975166588281116323921210724119843734085559061091993083658912394337924185488399990441930203011310984521684045028699686488
+1289068200800732284238439423123562064066343303384293220311845805205731603115472146721163687728630207002750751276592100892794448
+5346713601139175262412572458619231213504622828349869740030359059521925593845499598173510818770588358689016443776827808183107359
+0509643523301353915236067697449265692352443278187907371809463832094767055096167823904552345535023947977150405485951950799761287
+0296312146861071422545805752124301678869184550494728174693762162879350214577985621448093757895707899661121270041521839117379026
+8409726864010205799722565483699810469720898682668219634727965108320651761711145638969114309423068089263623838477654883333920986
+0701982653061769206880551891091640218809670563459796391962611157072335109465122237619770084725609181414534082646884976727487576
+3526106930335563839568672131933814040405238902124634964052890265269753914225841472646860370300002991439661062411618062909298184
+5489284594499017553239845981638823575689673477128445661568350850251951827238826810782941625211567718831490113495662231409070347
+0761858518186015339779421490664354210470217380607247145985104277374945800693689645130689632481933731656998223732805590077884069
+9539065740290512427091282228814664586680546652097563995149483899551962642839270109575078586841792310434801955703204357001468021
+8203312934682104375075307914019684558657139598128081066927393125488596174624606696359883862043330061635166484866461998328167370
+0125977272761404461319903866680344397363067561278546743044165247263103505646656505183679223334371532724158953424891372755170794
+6917119468055808943262561786048361427010843965462318965409483983665658166958859076133376429071237660115286920877219457193653148
+2210582961962854397595552344204221218872408837841098089244290975638461916790216426889841183579823514753626176299268639366257142
+6938938279494808076759108059141376006848614180404742864748925105751439953802762622388768762467629341123548099684486115445621424
+8751508911757378238494838354486964489105407120238937324611137021997266296685725619021335556120419627792798600024754767811910130
+8942964732151281745754352094851080075271176779020939272053185795856508342400932987956154784656391491859464794187568016580758549
+7093803490558017110343856896961686184727738060163871518042243290379067462803909424058805017311424240997471204900355661374314140
+1566736119124005628798032033275204642554171747963659618881718232992872787295516246973812659316873285663747257448232242034285446
+6562507237663679024109994426672469847713139656813945226527911495634070212834050520202668179078431355382392103665110926728808163
+7163337093376914471075674332970801236470473885515009415164064219689152465011362048740380213961234696943727976782304542628115287
+3743855222420028553131853842508021542825305338712873483864679766747424043976484573734764155416545908654414383080932700776375519
+7834242892295013548785979422302177591758705851513681511359120504187140172485698646885346881713211672798953029529425679446990175
+4633893183134377338289855331963450809211760110920084232081216223646405738494934518180959043407239414117561447413964700328518217
+5433662660787097930154056128793373805525457327147412372094936236754711564146018693671222546348461125048100620268398154557791577
+5116486674264823893675387799935762509658389400995246436075653037631158518006706329179420693907432583221559739906432889568752110
+1646689708083793966601961846963380825939768409816872372745312253381435289673316700861369097472435861788080748455563750632269991
+2394913678196583770021969391869849166343366172108313828891776494450171319520427070741615104344197304147604907461161478146821535
+6970220265997137270733854244424832298730380713169130932100655564124041223879414671509531965328454187192449944156019761861229509
+9043786409994994408835814038392730289274231805044666470305971162880140578631950679277309655392115372566040718447348800220519568
+0260472202194716089247619131312603168906540268723365507831041804698080034582459501938467511494620080710391206340388730610940838
+7326118518322238969330571001468796819573761190336351214992854388628577544497438052708919701742914513344327189122670316147267946
+6390506784888882547755768957113718192319906860888999507544967824165514074944084153555022322181782516106164395236293833936377054
+5714641021392941796626276072711028884736425391454865594302431453743809683815572479844749782164523410744380979378894640742103628
+6367297859579910614284261237130263461592389581599593438725404642412171244089574507753692124870352648825973497683300706972608091
+6528879643690843406788232137812536357500339309765626622435903074816275044864634059559694905228929605192781404349845940406623980
+6885914653705063359510874305420852766939519431522048421204491529430787666838710231728773489324489696476746687650429532899868255
+4233440617969212981294448839630057962261459110072028596849512767604956758310477460111261843845740348872559542671712436710774055
+1508618282454022497140169566835479909506224026572100667557407598641042136865104440157420255694196211078208396396117860451776365
+1507239834904105526832362883413042406464314583874137343256081467177503191240584039921334732134114272817444512404536172921303844
+1462051089737008115697275867129401567569051007638125298802754342170903145796642346081652330045536281219892265708368809837219879
+0453685864744973901237027525243434738854537803039815016737120599127474654581496567442710142699846446910049480896669404203340348
+9346689990227089014642019407223078337725269644715473933462904642091284492249290308972584444368741981346317066840314608857364424
+3692842182371137943388889815198380579665396475153546930512504814795832691928659417816231253704717088404598973194431677726441667
+2526815319204901006066476270701860537782781626529137506566276977867530476935375522834441559090476111355166836264357254224488482
+7009126058180938597916312502300245038383750490075362057823728327394777642420436778059817272275806207554818391187127829756177915
+5110816584935888048243109800031765306763187568267294316288420157299418121619714954580527036028226556975389796598626288986624596
+4019814997533165299992337612192568036796309043358811887855691200355299547444919142751489527995336846485123932685995757878474429
+6005599839728025790953582536623365308961400544193243119538823245141014368431208016452105852057876883877763572171550179791872562
+2500356597670124887859667877622171934055903916486360738831160634956448169247221568037938498171280531058898708454833291828495747
+3109569215216409575065435532987897643346725582420896049058159554867798859087403090846590114662541568279219050551516019161353868
+6185483127396494726368946515385004646852626975268477683334752638226219119476553266373574505398051454753329418244962919295715945
+5344724458607009080560091971792387153222793929070066348570583467465266923727598378490443838259560132593811322661974372369019403
+8458407692595863178782843772482279508788218196221474525584418608306184633515880367399229446502766746947115360332883675953446527
+3121980707768424272697486172479450164639268792099956499632892432254994295106673987928794494946432347077043928557939886000171261
+0577050269924549664323393933836052936324274196559262739026908246179444460993650264121746529145829029909925451248158087279201429
+1182711132849414035693613289891027291528838438771406387710865605582990490514444755922132927296236610194750925496351082081251878
+2109102647103389955876851996958955042517697886815050668367645651505615553003883543425993431580868653965842109551601532047774323
+0249085151080461985544466651926919056622702235431604488689367549402288274733008707563604434799848038664792491456040962095929365
+7278999875589390549123015596410656975040860435505974009899756364318118677742869501641184521884257988494124371969275324199080350
+2143525889485226056728303512644071737922673006177865168448238248795782597126416756968158704999395137061079007456174899879867776
+5408947704672811574519430929617541968994408425732774912564950806181733784295540418756875998713610000715279835936333399272549796
+0046618750251923685648324487668060245166359869535034556031423916249395766390348943983259976779662337330101459084587467420377611
+6066406518226332392745642377882173038406100184159399300600456331777383902825125059202230966872433187523955621780460854740743440
+8412271363530715396852912523334867927661153444730211881314493834485030033457029175684264387115709617680689679312093978999879040
+9657869183165570826073481937962858496613310115706782423102371799566041214554100144472536538085009196821977429400245149738069576
+0816241320499554734167424446072196247447636657341202004109886635882777290094614656786148313850718338218604613751038747577375251
+9117319836426478794488912868694112364734778843674655117850629082666869083673489067903986091210347641126774671760575626609401765
+1008118532396406153376026525242599592034858556342525818569312902010080131834952260460690347206525525021427489641699256115948329
+9403478796471636735520877378951136546880804020374976748551718084257630575582778549740221982719791953968237118454633169542490322
+1286802823239946142833722240859834876694232965252258418975725767245437772637447581851118844815831626565504328510567619469003430
+8292609187732000353612944093829468343729520826414837631688769850723905562968822078612443055462285102551209743540366646373935564
+6195307285792520347832027057354006551256656817339152300843201008404344101735346974655890347210090580920518304844457209111402489
+6224596631460367862650134161563558944936031773882670339156933695467888462978309028912902276648283451994600576418116774756356786
+5472438323418087607827579818345851863545677098783823512135936630219825008658803838212318120192887213931109375285743757983871070
+3462295993623789324823077363153428519235539388072977171154971504655245868325675529422838022778549930317329461099449011610221962
+5200838592621585186795894021330350557903923860725207306860907835414568816984390887997385942459848064357524983387010427408109850
+3373256185275744974070989354450321389766066372305525693275351316959271980719451196548752519719437550201627682282540860722912254
+5801613469773755028551251430496692677302091408721986707132740326731209806971448849117149983546378567141073671063743582525928527
+3697803453226110613863663691507092125649804560354539788548901908917360870034087584677937779281144785927759366742473292064354073
+9963717672138768910209602639579145502161357030053667109664830302862052329208650435316813897369377235565986275115675225384254363
+6761344873607397157287860030945733938977023836366529156220217899463330627464716487783276767734588772780285540219618726811099276
+2472361254288850026102274317845905290678407546967989656293686796378605109224367092391377532276351514638630925654015471910946545
+6893284960359512924679289275759756168128756913637757439682764283483027618435659261867805209746618113123871290501000298928987223
+4604230631532001258913408929361874112508575772563457725381109205712576762498230243782724863115387239822706836827854691589225919
+6353180226120522335706585585655463329450214403091956830465201717296254555917557791034667593584676865134148740185250129625269812
+7681527901091326113048786722462348325784769942754780702258059604458735745233803955056030921585788629283445553041509260093245352
+7309220586489676352977698261496440058970947266199089765873965038198042811288461602506269407874212537834374031596895817266480252
+5671380781713371554805278200673327258182545730441250958579106569242653773093761570049297046722445961242199585137608405012572007
+7828486850550976212754252064205756489990487555478160661135559387233240543781534504267534308047400112433806739577979094229507603
+1735652617764383585639984486995149658650155492118012228612717608699086389981358293860866276067465797190676060353147557719908880
+5809608466540093565672420660893504333126497209645992122475383330847359820073574627113129012380682929130905963299348891171922548
+5002869804918377770158242860178234038771989441187910348213084777623351555039769099812484337067510542127104020429900993982081671
+7709207109088318832932845793851072838104821066587277352066221192004565750065851231562111055731251503571280787745188052871173891
+1300675988020851714469995143129598445432183378365444739669948446307812357058373524561004834384315759687175675721550162755500065
+2986343436898030807360652672895860427883496016032784149587776588259863806298337541233639409877580883769111783951961729854269967
+1601823981755766290542611869833989750039385604668769648848238807861573337182702195579127745245081404264493592362053024115769418
+4107102716492675980158632893016973041072334043127798725365792088221597132425309628489541173280546793641323966773146909247868755
+3819683658930608253697914654878640066261793324512623727802178114862630064529284630973855427311675132424529284212748792990550668
+0736093271588205855246000014782826243591602482151161574269309829561758900770381929089531747951679154943426373942743857678907201
+2579391599623221851200754933465381040789651168701188912204464482208095449667962715138795642341183881460864419304811104815352329
+7570162647614550188694961496075537449438462429576197619766568228578156257291119319362788331980002153009584790725962518357588642
+2867301400919047583578998934993306274019943104502333712247027666654628326692485228040996686989047207277332133939435024962426111
+2800118335388070264161106773949228910777957160444174345990380796529948251126974186339060998840435346432168006747571320370538154
+4476893884627071583698402476874552862205711529686822374264860104226019597554331616506435529408791452032863624032022777509172662
+2387360521387922188586138212711962601419570169405135474539424296757638201501368935895796012267512214174579198583111876438042196
+3207944223864976640314026742675529342045001292563111065130367748865114709153385711357232421423093197866403543774881366812947410
+3024015733350974607130082705448223007580421749047845265584744661269361681112069541859763264352543531462633691003101294808859592
+1169692162436061367720119759930066692678060291627161481443668541634202666603165593913992477700731194838349007676531720171279849
+2751165267818731079924541076614810221037738242037928099580658966017244137214097278777683446450716576425458106456674343770827281
+0396856995901845858069688500739423611458585131275613789773338642449531843526049135797567793850609374983112677866381777610197584
+1531087534395262206112602286543697479767208631357778942636385138053327121554947922895001619615466561594121066079313165604153569
+2093692637556395792176696765614996657813671032355821221008345920651772816571893227375691474134293122057079026746734194976675858
+6656377492316720744820927448196522955924434793647944766092359157144753759050894426200065451501628415477521405487862719508590906
+8342026934212011048128231645702815266555959471653323962526192450377377432253217447538860983839942343996469379287531744331673799
+6119650763732836889688973448048471041648065382987440098529987344461076331072134069257926150018448979279801859696456939951283072
+3364756734455969829310248048507921203362218977909063710162344883654504743601191459570909322659994691353369156210663856657262211
+1878353636597017372001364702577584897453891661198546393569651046602221858825228640216854117340540870937305588763063713204215566
+7246416818039080901692045886943289879346943533530756863194707455582283075691686089441132581902594229725501704594144338085541945
+8508829844172609725721048474190455937918008659794137613216237230265268215971845365542440688734702896182248548131537748110574617
+9749837159931616345230389269791318525672049015765330922830030005687071010042562156668767526231766645728311230400611546831340883
+1042438692813477410787838927504883371438184111986343392632454033632895691282059130126453347410816312739668264804223203706756562
+6361009275683200524885847104957823290376975509915625274519396770442677593644815139040216252662268629183385844801360269251220612
+2229763646114181877287927118379174699532585850694835097303121614336315830870465640665166803477820913104310061050902102789844598
+0133060603914382154852269620976632642294770629603193082836985616373167078617561223317446714275063351779922957184196466970884767
+5219496051735919324804049698971068904312201333312370591154056704186542719979874616042547422134608890139798422893654424476506469
+5309445174646633737921041425428020908437429638540244462052129439971214228921839562115695079069371301404828066341916732725724068
+1929599109824380789046935363381838679112048207357698712063450869013602851026654755608800829647182811384855047709407638244169874
+8711156655539521674331213489806723157012020673218852893220562275184063123762927470825532953422135931696172529627131694897868313
+9146092529763359061139625016856546857269473202244951373230403084240273596615596144680054956193346943461881907308435567570589732
+4427806006379233157431109769793014446131865605460452718401487086503103098553754737499082181376863362004474070049162679495304786
+9908319411586467759323529251895892937674894302534759585448543523471481019079407250526711177578259561097423457479183321229451626
+1131371780154610377491766557592293428206914537775417828678921143427727968850975607814254333398412178045797967112746828184963972
+7463947060005178881443883529993444944563705484864960478232839522887114302507061077267547873033859704180182478601068253214443547
+6363654733262110562720880713693267188885990129857236073837004378034866347649760844198517835526780984480422568814264124396245788
+7422184144089713717140409869475766686474514248637954570906655127051840364408955207306296810118720773449322716315645914875117890
+0847277505961582786741295462154437342373825998662718119420520873688904858163025326891259732777158377960920534957757187301680750
+7127332835591365255818677928303920688285753363566564622227243735455708574607542891965353908456436608550001451776173990862992161
+3829054399301597187964270168808949938169540225900414534726047012413120885338161369990845308813286961059592718025627205221770817
+8092148297686870086401035932812080011392424084497972356658952923082172309746025699168011915919281009722984056602687718337362402
+3027398748877048907651150695381083835937725004446873842854430149618594741819924214123640276762016797602129360641044263480412772
+3710143070992584709931252199044234825397803955966283897640299886246679348943101389030142066287790993761176511866201467864299707
+8525777612726675246376342834401281272453399310074719106459898269090225065025922311415205451670630902470074176854745326883762644
+8262544278833799829033118364917993352082125138925496717970983928091600634758984244372250880458595883955890831596406628913521186
+6897853799297275638235876552327431216883341950745982036695977282177864189708565950522537254131161076036929940837531981536512451
+3213748658129585636531039879081929302798794268346651462737129452506002968774313717689240477017446831448952135158407313634350442
+2055874845167569647361541785365745319937172123917988776868257061731415878495755011208403654576322652419771761741735204486134128
+1873586980474608471307789365974467503495691071252149719435658541818854563735190343177059527503193288117651496365565656653307241
+4168177432498780914163093904219938645313613562804544457122557236850377399062589146156364240794704626265205228184552480787389528
+6002548119488363978641919486071068284491204688921592270835983882131004647117906646204653024128798598225163921424999116659512574
+2157407327085931030684434640191280950835140906873052295703366686157391470840100604628128222870118102675339834080247719766902753
+9516075696286688385617312294770633537786940805769023218236327039881513937432194699645278901401806327344576080861704678059497048
+6871189362548323056223946109945917378776965980493422695153032621053464957232674797346887230723234348508681395275248458966927875
+9336780663866116286377027773514857490216582712388958421219481975628619943979311778012113187699153459212550397452631591800634557
+1884225357321516913996913776484184458840279457439252830670922733976854064570789902403772321837879511792814698370553104269506613
+4608342183802630938543364752477985342180204673563980704638103829760160093636516325877632052705116775395863314477370432360214625
+3293602222611238360052445923968119215574068058661794694301159396049393023879006675439325347420522015724464971518661959121953285
+8043528468318108109054413534510021714964009352370382732039845180887830146914560592175998791412497342760924247174793888155615218
+9953136600515251517270114445026178472065320103271749951560132315486968402879259134348096557033081980214662985678737805295776016
+2082425869735558279582276249486763021868424618618158613101945224876744522204200404218768513612549469324132911065247448884834161
+2715300790048270780472694746992029478410340286154036701148546125752257415749783382221561686531788228065371707859970836437758369
+6586934570724918966767618089617174929582836792685611937969070528242452974277966964414407164887044841543253218406757856518905749
+6701113102105341541135759678684819193668388121785636742894877294681466156143067331027856246686661690573758062813040020779144644
+8573371736029851148801112116958518768083768805313811181481300256743484459392633904102235738743377368774016975057841718194084994
+0319902874585606893329741100525933056084182554392753427931707044407179198386674603799910970919558297811591565044725137884178871
+3211448717893811033719443147078575334620516368575812396883003880411447512133976398395409888756416803178312866623025053382610669
+4561353382089346913344316837392847914820218419836561651969690056195804908190155708078402986544580149409461279682788447362287221
+6541324108089851136771616890125941444979071358059045831564141967544312392874032082755961068514362364886944531733042486972382351
+1947537457345366294923388536623305727166280503481566200274732091551547741549840732121496504900782994752246247415294786133670139
+2790662270964346469038082957923935596601670431239525874522807293008957620170868585946546458722568195100218646703049798761457890
+7207291855021167963306163201383620528292099344156171536132565162121580753163039591601562538194503052311054883261440201088776719
+7081508994123346370534091387062163390235318525916429277771533969354167555829004274478142845946719915110847480617275074050516329
+3008933084371763781228021375479207498806120584984898188493731541257384657224732160257247009445015469067201744844463068899016846
+3400853085115213814503196501389761175483359326430453738990669485692964833263969136641748087708764716019323095274097377414065683
+3262060508094820191682139681063256834961825192399541866597766579614721818676700322392895466758698832928065782064894903472978312
+9760920512587884215163543988536526156574865982745337953096380337326849623081010538502752692990846114093305595114511445577198415
+4534258782640418619628264506406504403447005968106774436451122846867047076694261073542029684272737494317052196031968617018760037
+0005723042928179923030772189645554654702738582913437716383318676665447081003973531059059732707456286646505439805283337167567513
+6867755898727425848664558154624878031288945357600827739272457697556698844756274091214882872082839937589030308224565293706216309
+3727537228724168866963116807318580861851195574160478712150379828696545006021644250770529425526279645439265900826286791538135930
+3153997389799559939607422587882124977791743840140703583207584629133167628782910497529520542920062933572958127405711490497737856
+9067474435390875739488758031979945416769209293461704806750415570467527973320692921500611307072408238071671039355350126215323195
+3397087786775809367683818985726713074834263187298828458889483102002512283284602983872325517586754239568315454503146853407356331
+1156217453455804570907455838506537271360924924818686966590633031323668379608702859282734283827376245634390166587981939981633250
+3412106433453184147582934702569648764561354607002098617356742259624760387826342970038831595863063739528564750876654025034114351
+9541719290749487737141992118412804491779799111981476193385533300689670528815189491502637221085072487226634588032661043056759668
+2892064967147629869694614423619676513067951679311770744515022309616589783655846699918308471661872732172650395986258940991120106
+5144184865919978928920815222171229181997238748998964019938552954342118630154574987629428918689878418879411760377091395290416344
+6885105521575830610256425097707534533542028808834255387318107287078639558846084308180272966744285679093270081574095013341117481
+0825712842225983699546990461215024477130525988490880256409773994103713908818390693122587907689102651005737105310805023272218302
+5661584786775396459681434880691492087318430940497979741425101788956553140338175653002561188152737818909816437963790481976018401
+2333796064755969606150287094100220527676969430567702969130345130599373183629780646448254004373148786027781444947828389799036231
+2370159800594514645060430450080996614777495906387714719376787944968432214762676658329959973122495250133837956302119421564977403
+8812738504000258149359611948440268119800977088619535948947126735318099451090706379617772423943777604512120621890539370786597632
+1363253012488373680482054568974446439190725621429231276569324135313694462859720454323916583978487818838914751980359776090418942
+5309412448985837938866251311974802939648013868273488976753659392241870912692861488024484868367836148433592247524575436350374927
+9969514974899115014452925807661936280550953879875740514792224284344537632692977097082883985126798768022555743127429841568583436
+9127480468310694537875735497900079126170848463529624094796935948030072227221587835070990509651876620138981087391650544865276910
+0663274772751898865701481848764433338510687274568588217413099134231887382122648096865873338497066278774094796953376828006000126
+2223991886894820013487780739895880221686260123953688255289857284508367990146047269272253817887508457566736245360372546074724620
+9022913659536358863270572069247332195356175380482645548420742634480093147625717187780842180713151897503373416116801897541549813
+0040126272697263557284035143648280938089213881029883862911870694532327995219687847437429389232425351493591671711796587562791256
+4017430425461987380494086228031466897556783584467938250558585791601061306591861372175583299944343371927286490389555179774602318
+7872955211264709896492762009841470583148357109101357998512705454425930076065324016499469004837167664624659717653859578461687235
+9667310959423600740682018043806968632350609113790915003388710593533872466670325086871976600837835610439552558719613595783702236
+5280944927395295859052540423240381366808883628148042644568662154130067762884915257137995873057791352572012021048384019627522811
+6995106927652578556591681036413486142384921333996800868230237202393167717311762878194321699747706337864446498735182883503516810
+4894127087101054059360113153040095596503789486674685811347198640008673703554343464924312512011781208631600506972544379180978661
+3653914862578195810106428140030210938175294156340298752901536901851573154592330206774109827394766622168822827213223926407598523
+1752287994131637967328932739154812431240663561508299992489581255396838237199970478414918524473397520840434054432691053868383392
+4475254299662836002489198880413157763837585826054191105485073144949660180125415108179810953128183235091235263489809711965370068
+5618413924400018858280428271296438533254641173714166471746748160577329614446433367969692047250196643164558060988866789634419083
+1976673569829377798715474066924169354140929130742194843186922903877261219583485904128878654906618865153383966440192899927641018
+8533161119710252096705226091491715680664590252842043928311396400578644885931777054299394359376613317844464091496561469756448904
+8685184190096699452877940339075889148354699442923532123110999704074604303853725375307368452619373244845552599196580274471194639
+9829578543429362536437207266353476212156141077734490396691958840205815483098775874456262295189398128556239354143693110486242701
+9970409655619169147931181826146996933740442172396548865369872311637351974239103479278809874040155159335694067867509786798916993
+8934739229131395268686186934227620999682967502345755750450754377980375485746895673108969778424574385778481433357869228670933712
+6403853140387575318798294898252560753364466868740386419346298915926350400035543680556378607221479519818692502368546406996064171
+1053081251212324305626596587814428006013451031378599825941680949090154726066128761151070261252589982556578267160212779194125716
+2889755089191961889036525987804900491217472837363091046321293846058934856253393138783914577483067599584740608242898988136077107
+3871240659195668412257855781781704566864660291767024614816347476774763467463583115867939922590382680508695307915014840948963808
+2822134512303137695995007841922537885648949227095598324952993245073100048846948118672641286579492473549786447729014913418849577
+7115799710686817026544023974604506965289044028358314166807497671714007777434113787389629694840769613243261303424414900494011898
+7392257640112536311638754807439431161718219269700164766558394503991923942217206220355994391249150834799995352874004008637120732
+1738169836253384974782709569139552429502554327170357536474522232448622509720551967534903770682965229229310748674655279819812001
+1013488426299593714852536878758330763717657950972685023529624029812092380027913386862035092137102088651474613519196497838916967
+2365712331332348797178741500614741133803176085015200716152828860157706088237891249512432828832383523202673780925247731837609823
+8343543339820274706718254393402391405027365642281414672601521735599554959777377014041823630157212633295524276413560148004499161
+6041268421639300061742794731401962219148955309257726102832738599350862047986714418077392903665425072627420761149419742624568473
+5903163798089327161860705456299199357142261228683379549747158444438483324626130181126533716219751215937033507622299908730009529
+0388816251038799487192843352437014500990877413652618253793690269472286848421450299377527429839922951807455986611893857644960410
+6747097789593097432933016398117542211434597285816625911203020562919342940284869769635598001370921459163969583961849156409633978
+6058253598655377264266980145151402530578841715801191174134703632064724433621375404185347776838645447066321662228541280092856110
+8706460045506764337863851824656889505997963004840404222919355019179623835893581428684583324979366713626899343900308968866457307
+7217115588869155277775561876870949020701337732105962145058144137569073157203270186719489063643062743100706189008644101702506879
+2134117466607949382162669449831544904500037626615605917490932121868589822502449721652777432598078974018800021624932345792700743
+8772537472143251033025302537735317107162425743475413816038506301465925279856675607449722802889718409431120703912286958510209941
+4868004080038983558128526716248086993854257004538122139718459319434617070817759239833696965506062568522567601751636677225399970
+5772707421791629107161650375371738241195109244751411366251362152446624847548801413381446956815082676765934768156267696685640257
+3337783332137332131442737895629161974159375156476294489620941247396447219121871778030180022268049183913926389862808328015747496
+2718665162373177306261228085712460052227574664675638031209424855973371465310593845908878207798419801473033533102851536608498988
+8594650062259102571664509669089099570629940328720500583665382040942904077679708565306833479512196713193874213822763114277561821
+7763922398020531727099680865423760176807414153322182938644853758445162559723450312367220101572741122819976006288279862925391533
+0609418074163954317311535425632639460543917210847556877142776065667429208580080239400632276304974925905306867007809952150307911
+6324798067968629831501975773028726696101515750158909358262168518496428350181893495977033603403728917956907772455104980623840611
+3585603421384321409739580272281986370246357840985885096013164036482124665391931947880815558360671475167152552411643258730493458
+6674212278514790724079384829207583320586965949581600859999150201711417012504831581096750857003895316139028753798041233239967350
+0724838602272073110730847467620546382405164306488489590470927625949743749910925230346070277479842393578994351426637786933239473
+9758486324598916254826474547605389356962763994905059896268073096288839687527478615702716618454224618511400537520151578922366430
+0912492025822760544865884599694514920137845684369437041888556762598262707248611887100015044910247510922363893211117566916277207
+4970896832680655065722060515676245073680441413700428191825160119923053062012241474629435368642857468208602093702394160800952368
+0401643954061460061469538963715677841733067884978557675498904356226239814257513498478706711931106662782912959490144875688684392
+6427801429230014330280067244320390813250002494116054667882575684276220510978170909405937360209445943389405620264406898441269151
+4513961131947927648793953864754056606418638015682203461287515973198501950396575668694970608763112445843545620657603445132209084
+5756001157040952762796856519600056686459818285012859365932754153307811718432937457957972840218047257233193928872388202493970468
+5745171294650962698731398420701143198082563097452816181021021324846599968746630383827244381072653879098831871344995918422668994
+3440697357810684087609635992103602934958412129332726402190737073092334237927797275626663021730679412659760103153021222137031354
+2561873488408007135940986273685629006346887762950502897998328704241551747655409051903344700915847431066705228403387636950645457
+6677547618819900422307650673816956131536670246263056210725538571359966918216630406962626983531012334568659195035619701341684239
+2420112802529724475156900639848021386946999992189525298915178531829794178899375316321752347503745229384277622075513609101448077
+0978966580118766906719339709431650123507257526495690738543102142511117335171869720713914484644191091368983835287599510980274549
+7253035688826486175835885694607345249760996565501754434755643707038772708239856393717371875268895624588946691881982666455004955
+1229157575767360965832607989363181678043448764770403987112238108580504462888836301106969202711436540526584606392030520555629817
+4303800215068042550679859587110369621335305905151798020996167677493237088394878180209234115765088470219122388293468346691575131
+7160108019683761926270404198160152789263213718306724711634865022789627807005870451606075994736870542860235641292939358601690892
+1281304446363067443221484815128597038007892955460785907630142069752866701460026126386319238710932447939095864553352289508365136
+0314065667002957866858488765937097697311458242916562733459459218151551894102884025238852720369894804551004088501646041028776937
+6071040163745909418176019453877965601147459065352750105116872007917183143758403418504559900007858465882670700927317278238845262
+2057864431401330101261675645065867887669270980722933655585800822914522258771084932227437807465603988558837727049424395413086192
+0838403065062402417019069366493917705353727605973078124319419683057212743574597310780151384502291168595626908520023754345467963
+5237595147390251950945857498093768496867490339391087595954081288707206848402637964670896124834883491892023218043300933428536303
+9038575918527245239784697127935511565993493329345587370301152888215360283868124687096008034911588337723498130857892917083893566
+4326309213195337889918560482484162052931169753291241688638438611871045719430309380350737659700684663483713556511824284273648934
+4109675537859830665204217999322330504340383531423575355281348688917399955785319877102842092110480808916641344634371327017518067
+5976571379562477291805315122658077767583602698526304594638663614898936945525476463455648126285604724437435096863798048639029149
+6805684460338235182637901097297785029718931952225347991353757161498388530429639352729227333463916470311358261242265252454882149
+3713554069757475756235174202220726685159145970448234073615786797869189321230621988473892723703610057245772568034893831333824268
+6384329807418457095553971699330059290079181553384702995369891469896964859336812164228972258241580918221240870171611342340166996
+4238496467737330476039022845048701321182330582443048269767680094107459509184801830653831569366411726902088279531793681281083241
+1389317145760821195180078109186551396173257466092123382087137757380977821227017398905747777928583603397479220222412134551964141
+4172433396133877482307354312025003410197620920424049031355359918529883398507939057731022302176139038905017200234464598134643926
+3776455852500808911518410528880591214453698534859661007977301367112639128608957724121376845610991533136565527742397972171004531
+2169236758277228509207094221732914621136016542832442557119974462763405873279434363734315812872035133971702886820591857401769365
+0469858184126033613406108887661308724723319896168974862654713098974773391394034562612379275030863451007736429954454094411166680
+6170337864185847270755623945219598905895923685556701346236877669819713556924060508835912462997027984549870490684576221788467996
+2684567926478205893568909529013411584469062508988939792621227026970772272619563307265559984083650571137624804538833124458965412
+1535835911469765914801129303385752847166878267150358870063623206823946840223186885612380869419340578863726545596738437580294661
+1159345796279619020659424502037780228138063084481952522217422192474814460650570150288813492963026126513178935693001157815213888
+4115255308469968312956667592729481570942886979872098274544235236610800153069537830562688683755471055934166523033112817689423559
+9188936491751459321231439471707842349428821745374698747871010980962280880750506886802895843191246598782044554283344177438872823
+8347722755763795357915434510354216096329858917788023158970394599943300789945002208151468416849121549451743359325575523192943247
+0386458822265636778073946364464754663546374429692132747455551460488109624863176490317455770854516391720009905789081791014745242
+5441057113825577288143510443291415701276478572336349873718556812697918623782132025707841689574266907977935843620901112527314879
+0138974051576176017602134330816942995720273624834286549509110307443436271222852721817459586302582019304440451903755250893098006
+8714580715983710618302573323538613568787984646210126690769977327196476888780472811559022322326994280966501214045283109750894159
+1238724204438864658817267118920298143255297575901621515081809762078906592560699017605054545611366055292052387838303773046414151
+2117880548683675747162798543936995265803158300313026522266732130084089973850929862579530307924250791678839458713648131052866542
+8688866589649054666206289287368847639201089110726068276561807440633436849032550737263946103998593920752309241137169715090564726
+7992366978913349109203408811669845313806318145335482602504586472079577960741456598112230859758567892658655917499886892820156294
+9269289344377943028314943737975747440225464454099585770665233191895455121597963497469457088101021828673050970000696324467074275
+2620213720505096912466481021388401048520027588680889621938076715558063059090115474427731634806419367474059903683493740456083416
+0419258099585668206386510983923399175364308512576355916179825772896253917529784626455469847416203745543857585138629447495124687
+4926957394763419387802807256844093371043881188012601196274750577103452141865582262123425456983325248975618318937642166941469448
+7745531482212763608085822252151342022701776876422939982991937310338710298056659311711100694774221511805463875602371671771107991
+7622297042918195524581284988624821755976081656742322232878212092814401063399047757727446586120047765852193643525978220488403806
+7694553355731009082341963145016321622315287166497298675517840848325124707270827181601834343475566034855078916693975601380159131
+5691081048224248376219969516692299552551684485812747394911625377626308622713328149116932634160209525550974738125918251287523859
+0467965216958213222976523551707473542482226303543330237484038813545187688169900375790194437313184877958505335015185533760569003
+9313388170020500404223350587859029392425277844920011385363704844190916888907282100497715918895587428711392085764058004531043856
+4805593106127448601646584342013400666164278454947086863410933724954207481882298946080783397578430480735942749099815836074939980
+5829488935963766897295398693976065473334615080031996490066697080972996155867227149556928263586779745098746381741955988476480256
+5145688238158921108920160861540066499070337742408273263858244236306539277333029376512623358171655471201632148566471544471879593
+9921214229435926996318797357630113668084683534980450540625624914828693276400997437801995497337699991160179152196384869788686202
+5452970283364847951628816855350106161884215992345914720345452469417460755112437907196741570679787585797744951997013243245883760
+5291067302501955637725509930308800308821879902449540996764882569862895237545484938003965194362900224359317192536398128214213941
+6161982577027434530385173942460521391267875161999821213546453369930955209737128453903802184733420666743600784696394324963677611
+7259796660195828763104609417030954701404550411856256961919298349416990278446333820166279192694569999689157318159650815071786127
+1409252775006780923895660512761218733793242701073753044161926851887250329246949307610371367921483913476091276544943910212219648
+2024883815854805620725646102396569531338296559295702755514936293184048845778213281077499032309766928238274933799920207837132838
+8210747670883127249029109720500900846638073842072735692712299242482036224417598293305373767651397688387681839834164347629159924
+6849912340362293051521285112884702937904971535989594393302698489020568178389718625627324020502329354706893589619173731210032692
+7043789553739208010357759707009160597258827438739048435319844873364203025319025627611147486361041079291073784131340379802864271
+5630517567000455573262321447961724157507366377593234074637396775521413915860857523966422306759381837353927621547514858375348648
+3907374620037626404876010563369584978900791842626728009855287567645993864184962785602670934980414501849977057712840353440946698
+4146385141059123870591051497280881668008298341992956096236493101498703482256305064373982480667690632647788868461225656591267014
+1968850563894509480587740368883124473858275653505054105229249423142559298770511499954927552803754424222038587228379761857441343
+3593066522032907759239532950409720855609763959255411331452747381650146615224156577229227092417969990679672022642682488460230666
+4777284684581020086703554379926122352924845140673649610422757744893763657846499512591483929572896919893136740342514388775709356
+3278001195584405224574340518455727489287475412287946187833805383833415237459010850315390550944653852931708140442412147400013062
+4193626826135963841422031213601650476649922753686929704940497664287967482680127644394472418039840709944058706759350270065888771
+0496707764123239353916969348556102234417341754509205481354601177831190831135133718891421262586922485229955848858284322651713550
+2364211115463126546765721277139380044647678205497997698025656179147544409871931320460204274120159204240964415234469912669043171
+8252385686403049790333736390573303996823129984313927885511658858105668489196273816414521496403236288238282761677474764476093781
+1249545053006377773498004690990118213356171931577992909398589918937522320753583797192061779831406344206481621920250152295078939
+3709843278222111715104072968292537550135689257500851260250849491755576197121702408117922267107801447424437466479647604658838505
+9854374828488017805142065771759506637983062326803172669751646781389776006196509659848336558123328010610366919010236885546271093
+4449279473317813512456203547757437510023295240020059908269371826627596476653671730054696042131496333128833416321765418914320719
+3406255777740484368806154865989716577772954696365667763046622581695081667791363935783289021366520297269972594689838903064379670
+3971992965532938884360604600128828768832371480402617473079458005449743185395881312301575878592825423836990732749119210579499565
+4964414428994770524920627355735483099389790803639808833122768311697123316450497548024460387672711368021069867385676748771138907
+7272947208705814863061836555172890754692453812368615959884812383294177521377885043762530023437311935454983526848574910569784985
+9715236460972266941105456775641088939352379849288420663874812734503948765928906653066695278788734445614220395365589281481052985
+2219149571492569121653088856413977750911860290899252411873082297287513781665034941515671551141663335672214686872998009233611673
+3252445083210515790502427230581525204628936179674886617751355536540130374691771589975236704266655393863956951833668294842751553
+1066643170812591610511115847160870442604844517253754311969780356590045310298592533473063715395834561034249527692096332630663031
+6094678693574789972643719059293336351890222699519292906160704354339193005774875964485745420773135852897610846364640226020416376
+0078821325017540745977661794444919031229533952549930041702337654768594140134838827623154832919375367293846998623573154781662214
+7359805369711475680734455906157477769170543397898162106347663466476684547058977605857152935135397794083854436364067424905370520
+9053319467618246985715935346228519691376765059011804822695041370567668817595587435020117179808441224160004516561911764361051760
+5279785887324494559284533174001913906340668600486179364934683183133265522486775587610826495582037876134991475823478304604306409
+3941979376926208894324337577802341103192284179207690346815460983649049917703085665853453770292030524017689837132097566609313622
+0874696648882529341619751279943169854047021416531564941329234495433297775450795376776860235960754121606226960482122943806912723
+4403142549129181418798689888112583174439363438245360666469436690361242515845002333293117928704700704567851599171947638983428803
+3086178172887575667595570158882926151846562563832038255451988723965663322118638716096644911129577785347672668155756960077259260
+7016060211620447349613366392265953857687262706207804671997611538526738050334785125634177152240160503249217159499633364839660140
+5489512175142718110444335510020717260552562939322469369407097546446468340557730058147393474938996409762845800786386613781180803
+5316893398694618358236834304108186582233111640280225864142166804368748966281116139163914774116490280764125236118841244780654205
+7528194334785274348270807743401184076977359005808989097790847628594537909545137710117536079654129720175240043680499382931315617
+9670385576675265565821666921824539041489513174876467496206200652157451658908879498586135223489695875901066307973744711118179562
+9293554881752014067237144247792025493783429506129044867060712220683356640982811741139549073541449462843252209357539966735713385
+4766042719100373229390546845449462827735583320023428894346366740071025652090167656518273656932135482003817661060458673642777968
+6301526335239349282461856549816100522037177673330915447520746670914149246304276129215650553527297720437502141660843474787824161
+8981954968443818080133345527259601739419841565729583936192031325311804839597158161812415269217752774138988523259895019553556494
+1375817110090726843596408461202879175175450080051006863993971804570798947994555625585878024069026053117840656838335462247825434
+2951238989342425774096587516368372195370856662387116086488893532196578602234813604266303300411633704142608233959411992656817117
+1078366109359744038481314864313226318060249081213275603047710120330297564750748020015170091244280923403487005151336327967793644
+2590644710984063836471814396137903631095128763841800600303330827770204519245855428525596893191150792386804495821205935562805056
+7587927489845850917488079723623306056569190541982982580007185500509384196528055437763768159799054085157690272308144066104571631
+2716691447638059359782976991714931875589838509515317643963169052633209626064370311932621633892908726622398410656122098501462508
+2187341550744516068766043103052788709422923668066123030675357066234501008353745371362353282261896383609682551818558419836467474
+6386821883063127753430057004971408049021180273353275003607608462963509731380707112452702494852068512020333193164120541304971821
+6414619855917522699462290111082170337250489881403447602549155371621815281167692543542521085921503446688385053019234090686216914
+1514251753750908058132963706101498627247758343884090328099690893144318542740931341743091728225255850843917610568152776796003007
+0586747600603620622562637108763020672642036425806055677095355709416205188154703219135342081900691181922293308472380603914641966
+6943882703466448671671347942866066071729197097929636191832480851465967168936588557508460013143074231989501890259153468168582090
+5106944931177904690443492972535629421878279108027478056702348421231814228319595001969285380236108675594104178148223368821682505
+1013423077468134180344202453328649263556597230333389978398486618230751510288831048067335293062077986298410020248356624260186784
+9609742549854821633067526470397698241682366743287992123678759953855431672859515457048320102063982700799641338555460645670603233
+7227510683690963888209842085118318517866633639207568611885740247627869030070367221673493120062595703412511430540635725690733531
+4166904720216643652362019185541125336279973971095473810174484610634739482031555699998920445667293351815342116856019765913024721
+0204685598907595748165591866024787377707833163733227729761204199756529370097242687722444149797918578951904826714174399654373078
+0029695243252514591043935308120948291772608227171634548103690625246068887952914933102467669452782090604646361027594958463008648
+0606043910237689889945195721316745105694059044358961433889516172023390307325162841023925000976730946622777686367139699337140288
+6532770425227279669614506342121365572660042996371513972011473090716295756052824631404973053818570282987235859556502147507091296
+5784383703297394066201455976072965897350946662861440804630035111722516300582625065762906422553404492330383168345359661866546635
+7755352359361297136322168309187217709956128684689901207140385336402261861792474715981622821266358097679527860080999492143093132
+1766368206837633471921145548103904997241216165904015409300725066451342178028580494490424756975699571333186681161146526160888637
+6435676017243653308531673583521916536301571057843651379516536378840317706213255198563089909258098489728121633860286779010828363
+4431604721944445862183599288814310892377084499055111017374193726585680550914726436314439993180521094601524845475777232173548652
+8838913044786662722923315829866963645973025803566829523066407753524509752981118743428995908031509623037684132020735808440759714
+6831533201518779101708294838185079163952906812726056828622166710833228863087344104415454342957894082410432960146722394394312810
+0026750412265305432804678135281250107474394107101163961158631241381326874456825116424953228542574854725058161235809819422717951
+0530095666016377728309821374273950714947770494099333703734720428753672558560341529622248519497385032763976784920070775745998492
+9988103492323582802831123529566020729884479858348071107686123450154590877464099472518837056085048970237891379355375854402767816
+5730632914573233372640655739395224654373166501801926999740491530052469701082483441902155873112176686047852502749353152358488650
+2570177044053910045946498496953083595646140791798652856797075918041625426521730745013108556438270557756261535076617672897082024
+8070822196216776547306746987791806776779912117872036753101249436897151550298686891155685227497724326515850755173992122017730073
+8834834453446142095731369167693716173639921382555584546233080228430284169771661090869805523170856183199180807458939980812347666
+3374034628848110181967055896853894757362330956181597331342944383294532319770922905892283292682026888125967189041997170645906930
+2816796708896328193169753615809284330192400628212014852560752820595983573685822703155361815716715825780349446395688288981323009
+7068534005360767613192042797492589713014221879034298952445175191916602695770589539510033643533276163270684273301159972772079846
+0851847960381648176955810985408204753982844887706344041815181406997985867444440863020286602964269777581948956459433973575818007
+7244153065545137632239977736639101263396745129055793110973443976621943425823784182900120559207556057714294191011934647831514642
+6220112071917364308442903062123692544853904143920646475613405698807838684964691297033599042267911174717943845099876701146499041
+1997737579617455507368079950355247973464185824287192636611840482334933626092039322468638416062106707636638684831343949569888001
+9056473674062962705649948566947590595122246493016055906506275120659977645801864949778640366697230510631836906881678697914437413
+9851293934933351435860731679561845700615460829332071112719063019501427379839759911846192375852475742108532990355637732868083608
+1981670764831163220456625777162284911174669042984422665330847096514572430663915704539930674009046717718308791910081803605092076
+1436167228645743999726495063433059497403336540806399989879727825522625780324646087140141119024144101040594738802339934675234494
+4511331339256646611464785947970006064997210981736418145964184001849876673693526718038480153571548117761471182638795979792615062
+1795579829237064976093578272496505322533909223281608272636931019121795380635442871500788593701642237770643966129586714071750006
+2259558543726883196265093171148297545202455060457641437680621020678468079454735539167389894892674876922877875836968284903103240
+5190322659532635977759442475453937445078305277952610411039017125942798503797185204729242079034555967093953206391753749025286545
+3346586896166410527904055884469771043579999692960199777847808583456813215611676699557144873569764821207184084966272170201919310
+8492812746065013433267691323002027533207826063607337577540310499920611687417123621076705455447051576454279273880574231655581484
+7963980271743134112154087260650334248257065896933807620141668762775373128572470229135441642876072741306062133796013873900656717
+7155588355012012778870617504567123068873574015355543463865010611682540901252618661459039457810933495173848721472502301449759789
+6250342428228956319030041026630301654869718238658413832351916020529083012909954188736775565330222063260635143292678318707172682
+6306362489099506339243174369018743275045301435603437084640257826344578993743886263071878533536813315686531934206065891475930962
+7256078764576049009416184871748648772794832357694303718710674780587401830972226331756569564368514137449167545781329158975242668
+5137011302637382277771122596368810380574982751431852882121643844964841634725254405565914232138014950212916177841984286676442765
+0130766950573613943351861223297588274240988343477886895038747758639966388317215304568124673651393253970716618528199527580176531
+6359126988671940758748887099156058290162393017636744749307547677028026325587696225823070273928497980385751428178855356190336058
+1262747164602205208071416052898259778064629199619315166088744120423992672210748461774575909144208599043872184758764391922991513
+1637777143251220955861291729128344859755814246044289400356284088474702731048933137147907743901585132956196475715784684303014662
+2779656199507816022148661387875419531355613321583333187996164541556836852609250800638246651009398874732599973734012124894691052
+7354320128684821812105410562348993616339745664287363950112497961551242247169256027249678322546929448755022227225938009677843721
+8972855810687812606653074585753478301824708270260970161604946179349054120962204468271996990113102973342165999101606421899608935
+2427496334389700886512192278170872300796174251105207296701976843139085003204747190192754643836301630137058164840301068688355227
+3959418860712955101125551436177454788270598656333682307048221492143694319890230219738438292220497263359673419823698673057872078
+3013408623490314068776627587135426768753482653895410991590323095157887499728772798489129923069618646593123822639438579269538635
+1908216328408109211109195709992731650405613610224189255235529994289098765621895894667201782074632616819297670322225038809119550
+0817943537763128333901984566290468707429051150902489063403888015248830107015875323502758058360302496764604163625874755344905059
+7334562477121670573355518606105354751505482715112941146764597746549856497547302376364513456936736713783904762299121613461158516
+5283407076162674672773440443861453333470684691925760891504089347363035836279580135355221825821573398468104182485287843330909617
+7205284306122028970211792875328746564733992888131805747056055043004240391649557442465694153748887961289838987106491544764907052
+2500872325568857502281229098611844366313487869502518915819858430987626410127129066096878146872919622682973073559229804271266907
+8295782206872660046903141337058447164373782585028140797785111578071196136068281762757693333793450310851105370333208052458896958
+1725889330426145518489875923548346134621897254499345669060138933732620752098808224545684009099318550221718273960774029508377011
+6086360263760539829227685105382480409473035021789956560069988221518928563686053953426925951987832850158619577369793062706768043
+4352919017742582830329403068368693550555003865896903349651288061511525716234272382256062983241592888339539171693959034050993111
+7316775446918119981332285689855871890517757525471516688406003916733927585058269512316355228173253797483394637476145877140830653
+4449523419101039158408708904430347733804700552814623747680680614331040890499889250979677397459532347731846180044631683772954511
+8775927277284478472403620186389038850970249719140155845452372844321949705137084066166954690611328982193781479003940799798395822
+7036309001309751772232372080817838422988947200353430157955341599997125428100524596360021893214442902724490483771053395386266905
+2526553722458751882973801186174660169500936459737553375965211051557068305755252365586897544315025598670454207459745656417390706
+2637149880243542713228217652476736046313897745886197441813742086881967480415661410956495847064049122729695529600136287474175290
+1793795271658672504903869428016853432949018555098626397052181786382888682206907544219009649133780351002110388824693692103301828
+1084255129975610497399774428514444229695501619744314654316691842636967058501657387850037557822192693461604997872810120193484078
+1690635325513958119210187262311486075808664902577687177132226261921963946973671413085629761815694454894584772804358916692902290
+8584983060051303667121308176671074873807110361225378981139031261855126176018462516372607208578426174357538994152717337719252523
+4278036428830763724403099207458044021754910574858908048715320547117712294990028756794510860977637952837840922253254728458600984
+7883825345262132475931206135018623229949112586397174487649066363051114417355320278795734783658869193239014023523778761960029033
+8695026444117478979408146585926902316341504795145288358653821833800650855569985787340203101735816503203866669795526287437002033
+0245051742430260486282155254132179648064481192529358125651323989892545661828432074084630060930677773108561342125212783387281955
+1156534912244337917835348237158665382209292463641851049571853921423174805869049378131731211644957860891749912005458383867541676
+5778772564492822262562399502030821202632651082331648596186198421567114506013473886361019711381249854838415342169443696628858178
+4018937636066081000726527827443126701548588875106206226537909295887328559668190334839725133746234608966652449462868965060152769
+8173777546154775498367210355738304841393638757271541666703324260466614672029573295838066643359099243819511379078208545782984277
+3894531584135582441443997552974471433572355979512626259310899921004753808626563585592085956971397408889173848312206978387162122
+4249778224435541775834672279093907849532605623442929414275448734738794025759189569362602709330104719867391830325898742293638318
+5618458472230917207115381643121156657396683440299320861523898119230249426608095966989749077626813445096806473183743262392826169
+5141443017081978141752639960290174384446691905687453519079674615609648441987212131402698830771368709970102768419122745998384912
+2946562140012561122001343127839838295167741172616748608003211961781629115805578417306196780198449660660896672943032048541196007
+3488478058250138575080356458275864826075120035949332139371412714212223138848322951784969631050003335580101622399775487873990978
+4317860282593236100733831872685638869277432762005042347567404549772458118340256499688632865717895145858533810557576307974444603
+1928173630042126038543686101259940626688530747112695018229893249219604395612728537717051374474126617790845613836004135628746556
+6994181584676204860202674587876078621483635083475446039294576324194007589602377577833162510613729896861820149258590200450670657
+9591153201889299370958865743889668888080847094554165557463441635078117012681280739489741681606506751718013927402701136203548044
+1780167360508315641369667116901861812842526826720765686979668702075706357523197794146674984683061754983908320058757429657215020
+4621260027453785113729584439569855185620374311773708057945213037359358758689719104605870656508325190409944963614795797144191442
+6611412529823091494357371703456481103154272600004279607488151916951301067639113190114505272247774489140541745738078452548556834
+8106748866753253878302577929999224844368660368702977874939897082451513356653811013795048262545973632043664542271741351318143337
+0778069182951962287178555694626059563658908945272131830094793792647180018850962827338479100883010796179956428416377824203799082
+9473023880877077477396337686061036427727779399244945597262198872743579391652952681609513942805826872165303709494805916573728492
+6294092277154179951451094865452721844277717466377028709711650186357899779470166784063622634966195721705046717157464710442807466
+5804785796886616339545161571917895816310538794711393196665470438339980915686578699904466139950097093535760550147855823745768311
+4727439998296384114816286463820007469707513836075275400610242782096499770391027100262738743742494025582717951675320717526395925
+5770688225429387772370873623458820190254941682623110262393319797303540835367273621810830554446149103975368995431078077876936297
+2405529175616664747550451981407708416427503988134127731468009719622521436517602196339409678849267725633683568413854707742239684
+1747116986005191343502956460687122356601160408668274191052227378815062922961362392926820216609198684542476134407735883221896780
+2662260497987146574078784874203657867733135048405416920171958838688884627100473968981627006284094098910015991752992842055879818
+7034398681569535649106832499610645350629642323049347631261095876814181084980886779188444300173631359422796869708950194760718387
+6836733703618557086120703365229061728453720426186389529699692510071571231710123347703658534972106524417884249218380254553097325
+9819799847270574690752534052463450597318916271469886310284525865231260264874522733678980911253701800076986898602579299994595517
+9135488779985085378045629972341159746040904128068784460666062698063117787215014912137720162075250475265414449002077183911431414
+9809851736195297213683107966811862847637535801414773082875296684360754325074703853487298740359726050853338447561139214515571992
+1029599022890794387902179784268370369360935567144903247409435981421651841889958031240517172069175107596477581973881408689860362
+7400367259185579353010164869469689488102231791643828135531761198096403804156803391787688285965553218505121457658933398225058406
+5220283029470788325194233641742163486977117357701064964101876499830666046451739488161844284719262317454589282938926798508893597
+4856368375624850629404156042966360434746200563963426632219247842217835149470275034357811087591708435161482657165228727592100816
+6253772836778061529203496032750827006398455227451857109564867169437129073006140463432201664058302222335982176666409479667581160
+2936456922664809261586171438046311878472513284135606095783748274074803411461233988794425470611010249655925624921046206975885663
+7903340067868061097623144373319704434575514501755821812557204930865063397777392798291309341112700415633886191910088310537801960
+5573481392684970852911664492959855735295070104374454536083712417507044706607037494482191236686504544140731669546789850452790174
+0904993356742978486159542255719565213826027717277534463338027027906360296595539148861118855418724089346480767402189286985762676
+1005223076106599446960454896515318564456413560395537757983458843931854126284677517864393826744115625918435152244510791809692478
+2164405990650873094086602365842140190819719314893955030230888932507331906676191911961689961891255808931785984896260979975690681
+3253727014960636085246150995307788585817654532411113862158610700251523142672098671368947509829930523262641611496136611155754050
+5927873322526687970315921879739844277763573086829985560339421326548635360045717801382027508629836290928584431149151932663653210
+4760858192547745555268997678117732829237567270192822266668837972286266876280740550930386549524048812443132805094528566843643923
+0552200604353097511107833851418517885398565041104987050582967853637644070929822812409158588536557876274185029987107810161351297
+8488557995995493390642962339468082402922946581115285486581085810242830297673687274512734725802547502660334048415579446341045330
+5709356062023991965872528242196958896198910586431524813751700975464715731688842846588438403790663597080684309160359805580967928
+1809180118084899386382440090650505696513340627765123157216132637785703218992306349927445013022757227491085193637218705876572392
+0750092974015461540416097560544979024242793468547428554110331500932107320102022511854661891492261408877458706999860502548130498
+6089719190070430700600786193146021409101280174362984471307624705342744373049193769815102419864609660529369826990237068799451547
+9880823550824400406858764215681272127616403736552454898294728046365136835488231881807123019108941139138735003722461424915329488
+7529037321181887616470646776506017170053425836736636947752180676382271801340633168596956291990586642144447067879824547939050775
+0702265125795249993652978449111254341598591409462513412644706330823597010310419837016366205284525093508925291114478065520543206
+2486005489914656200352331842636430195667576175939710807407359823751196926836356542172998603833007594132689750457318477364742581
+7540614426291493245957654051180243018629278083258315716499682711339148507426602166172200768552170520220563426401305349960660512
+2404338617929580850851496148983728094122155851959629735499313721174625488662780908166750428714979229469660586277142190041914098
+2734970584167413642829413555542927092036718157943315563661250374551603827984602155759774285156429894221533968500275418633637182
+6560220052859607041833971976550951076186294969188109531953615241005064465315852535875503380591519469842863315620903120851882868
+4362109461838990069490474891539380133820330011017862518437725479693309451782697543824505868730424985500423739583859994419014638
+5084805381905175100929792755321577290419383142651436157340596535511027236705949268189435276570853108955493181266234603455114274
+8408563281709145363110504396918026400160693545535873614031123523353385515760396989543124701606521301192906747319853776998158894
+2312458699599599230972023213413420672303278131983854442962403875724144311681960596932014490316204359247402654596736629024793653
+9839221740989926513947745565345687824749236841443758276831531279631822480088615812410461505184335496692743570654981097859767887
+0148513962240941032376953093608164659349988907238073209903158402845914764726830224719377417036845150993399330628686012123441747
+5919614485617148484720530134538022911021657584302803306902527053421247675384565988567910916387370777305148589468626006026739483
+7159664152823325316769176118475149162428707398939203649766531576459678350978394525441052205823105345184421463902500121849981000
+8288659993085551546441461743163304405139009826361143974328223331967419739647241073571212327801960556484524118468883764120169524
+2246338306775029095975369446186770386599660011384020498379465046982275031718873753405808637548601707969197710675661519594764281
+9599700671171430778834023658375047244787074487357323294015535711745803913257607799601446000833932736200689998469969708376723008
+5081943791810860552689101511523648202214658112058332928346393590013555144813066914194030280115978731407804149764646197662984115
+8801177359464553557557965020150275317953374369713023241680758235462889780964894972416089799047047809594791811478533742030190073
+0665429844750818754679057503636454736605371676903157540119156106676570191787583727649819947468340786574584101743147082806534991
+3657977605543416424987117022654696293608374996078959363230667155054631271871981115488592293902083994811357408917297410729122498
+1862650934481731910956432936712254764601612734362801048040108459535230079759939514256093409449391542317896091270323008227781776
+6653398313274972684240408723778161592189390653041468423088421653090661249171357282254451145484842067919237970412388771640682294
+4059821256052393643115972017853583376641290368154419793622859038067932722073228138326697082834080833163668963795873824307443161
+4885945116785653293180979216652517189039102100870721593874386070396567484340764036310998065513336640289679790609291581823883333
+3428604720660372157112193405611757297738411485553283296939642822708738180393410023516446689646065368009275111140421244624003704
+5562960052258931350563961074454414104687746794788022658055770332756970270739126216170694306943534685894930524814764997593650416
+3008384543733504706776478261526614225467564069116098586935957253917385357687398588155803265872788670839186222042335779464643037
+3618994828725096012458832876031499829184389279845891008599618731986280732307102787004526300770299430819579608003697211024173693
+9217086377524454012913218100708405723232921242597498783314818967648121936298190307693812351239182876627690699979858904402641018
+6156985750875948360548164905855940506817600324843389599811157633619677210306664432514278405659673075559217581592839918628085400
+4764772987507938088705673246656764726283775492007659316410580014942504090614797117731679264296150069410102991752421283871178501
+9088021494611622294962362961658529846402973311983387998125910749644155422299932240783260368601058914444067830424352644504379196
+7142168355025888186137900382975205885091374237093915396552747486547739152007548268368634296637427030850473757422944218387854757
+7616183325502874293153395715965826837360328123096242771948215374071981140320994435687149135694129364024023152186261051421982087
+2832792230789485819847349814552874874835409931161612591863141976920380812857719621635320076324767599038119716738981834869773741
+2754959867605262800904073710237512445047870616662855713005574347858126481109562377143573312098011061313182520482126994274243272
+5944572495216446034342198294744331850728989442478427239279385418283344155306850003896073771784045248648249808863649089110085745
+4935039678346741118281854023639235666178336524231495974905785711915838245296715638301791203620715851604930385744033263165263809
+7601373980902035512868636064609722029939023536705525076519976556652492714730630698715244783359777077548960439099573621098774644
+6788103237769355632318040401274560065924878241545893694505228598734431875252964572555463844283713282670737691866931493869606535
+0416187164312031460323292595651046052380878338516759425813027437945468646970166296000101963391062426079829338723963248745406623
+0923089990664161924027191610177696764629811421643542437939862866986835556859764272302075103487218202328441244550298063164681875
+2019867260237068480077811032787819165579411546914115220954604696377168121100888419574969311251245311564544879246746582842436916
+6868613732260412990938531237301911324073055318005385120355972354500615925738636280898984348888758911483752216818128353784893125
+4877207978980281193491650735689287510067435635758992016711009033554062927257985428856499572775171602494384045603122508003854191
+5729531014485818371423575856151555802439384687195667542811436864469460636476071341511650757925855405897036006697261458329928553
+5460991959983883494783035364470651652782232918135295761659407906592669701830570881217510435070790362298581095301898060905173789
+7646351028988526172675924552809872541181626761125500157109077472362508995981523449708391893239705562284235588614429905027555758
+1619134181392874715654091932556140391724453901036282239744719175838602787922700433547863998561669814541630538374359332841359124
+0642132589359772875036014752032306706353508991088875094683831897858049315214902256977825841683325136398731544129046064024590934
+8005838235188541103906355513876550842936138467720245485620712847710339766152168792765762537490548824247757795430623230546063661
+1739498737086961685166983125262113774813358028871712079307291894391835363168962025939984050181882718770421839433587670806624476
+4755044069459609604971745446900378189205860081010611662569670882836262612421135453240273781870602310532514360568130085933991129
+7924290416111768289187834903766663006016528601174525638099383915633909474617753311810491476284105443999724682875652267118724896
+5850681695306617855936614324554272763867627188224507120915540200480120428647332751636414058742508052557803594703673781795569627
+5161939368398633733681924028671740682293310854421624725144685852406527972897380355105818239535806432392343196805358469063293155
+8819559114109771559602841216196553885494830284200973490048941610619985614867118986891106961906280843338752508763555675909702206
+6241566490588598271025864796744098875607062200785043619624462705052447512034382219094774621478633751781359662848610200184361678
+8704633729839925740538038689681271982506814499991016892558765319948519205733093865854380442216165127136281006009985719211033451
+5874590475603382790640233559612673482775953839089864470737210616394894296028059828241641608622138456309335058488482647911816483
+8528577480552717173959823507749229677977069134280953275629509898562844929982109573639706635205828305920402590508711781395835713
+0089930344552012906619817966789113931607542416094931145768127062728799915073397115668423507229674038044945322045301649766598530
+0236619236986319774758924493517372212562285619369190213778360087721105343106507409406716723533090029620699768530871602210981580
+4900295631035231554608058112293217835929574133906243363911069130644679986177379278388410792340109628431007635443781281483062060
+4988368133324357435318270787600078029431686121284484541827394881261897104701243599451161363480613963194743733844807088688115634
+5178871803932196297861340370803170767481272576611956494376594793113965439245117335478620700378039639755713637510132362926267306
+1973846871626730910248052978143950536530975380151232887509932339881071793647054810578672393058114957563604971882394961817835491
+8978209292630747251522017252062343300917165930874691119490642832557026684811610939173618238354559097444010525631775837097840951
+8326182506155413337881369137900095820346248710691175947937982923048432643166491650906416257503450243786283464120124419550826667
+6090914463028322098876359782808759824243499333411218847428154348072847658504046701534863522297418259623151406625685618209367317
+4253745664431692653592530190665547218310374995530293912340336697232683775175851639464892393461388136647485464789810252552522056
+9182156878387604674503124667923684369744370052287701241975705851689429509464670883347575783846313229293967680582071694204051095
+3321006971958449910630372247668837211034782309154572655303854890011708581736868651280877351904031869989741999700057554577154390
+1273067298313752548096207203603148138418750927315375729523637857281549085842436944573932481003443446922848528006413314412427332
+1441821872672191871420138772481289303458305298682170739045298765824678050356023853590500427850176428627107627730008396343350473
+1052326101498218606100898713263447573551827490516947668567656571319040829379674136592743558516074455124317265474909140902458087
+7834541971992916704455016525869622512851276565353916338983507230882585013003793323808346566693345857527479053033593116284574877
+6838252895614149905894777313466208709968773989472894570857815422084908815232548928189324969136065895039808122393702760781384523
+2929303794620328740393974372454877708805842222813897741603177439187185228877406834374147233014054610369299556729412885884560745
+4370856078387921623155622787671852014805409807299060561419288539719819906697663945124473843579383816264514077377269614977581685
+3394601383138607507974293429184042736065549935759370359893007688911547744095191909676349245026886870781533913476330551278360831
+5351259816322765307961191402595778339300322026355376338266384698585109900534462235764152505801492032987502080039176402011160649
+6015860540766825761905783450339596728965747988413885573654798343784315606643443103943694670901175274103478596479365688106195479
+9733596316022892971509096088392032363480840038385290255713310540683102401152243848292964926264212842555582110823197263253672828
+1062515708221923559386659794495097841198809034454364525085442636233669203446069926961726048176600711294973993391741061849180079
+9806127623797585819585111237146636415904332057123217989550966977692535517011996512651123910136604576120833852264076101548649068
+0894752723723477938861483316019471992063859736335516787664755140329957520633060255798252299793172160680450787189861312439796670
+3913142052442456614486902320774033281367626065329089488796925098543116615817296515061149179999137691128957532263158924327442783
+4918858536678070436088759702284980929577025191565900433342638171236644159755504144947154030057873677997786393398810399270491800
+8872734106335380929798217774610094691386997739307412068494969134661496618521118209935954632189343140189392135323738890270473225
+1245647673515237131109490917571703008777281273557596852732435015863930630266628924061119974383584899927931767742330245961719796
+6852379757973100072309834676038484260260899346508201154263890305770366822928200041404900931901074539015449894481478124870846606
+5288592940348602075775045536917167753748198797428454287343716300518081003013742004598309648467119358078992444950790157070897622
+6178224434793312241397484872165819485491096197408141733026367177440768594738187232231600889719889461459739097869779145699996070
+2192775687835295828387187709692569714086691619295450894879843196267448458847228413092057333128571855124524447189613776196209305
+6242914540023653075456224110675459930237745861318742551814072907467664681202170417286866153184100097311858010110265935844444511
+5209497239417620919469741474768380931492201661270471587341653498268177621359803201248700031595849957309397980724999380306103922
+0556894331856087053327675958304000445533946185075415894264871473185811965493131424842414390488954096468377128994425485984798739
+0196159676818515225003292466076872625799134390488404188280002687542570342770954127173812843410476595231005479765885421327808255
+2605242865388848411850848235973559236245406311003883744452617685164124063273300160172061005325886640047067612731170493761853684
+3723865217540793835273126631505051186346898929963194134815240955269409964826180214819749886514216356192979128714223656587784030
+1612652380049586827710856241890765244152817303616193799144244842589626119110544403111366867458976947676427002814778923808924618
+3631721504060950588384351554676808360758437911729833313655406741373502411393332262640744499827573245395519111703225362606878417
+1363409383247041202382518900846037480203513170344097014906470642027432914804792692599759592956926861572014354287205548305433650
+9938363167455625445680112095072694438021204263665499289036436205115409602435745285690360330318532747799997172095972559600945294
+3849224957526742255789376070484796163223388025899309472042686406132560940455845848040737742829859477224469824421878404438255777
+9153640594267832855398773722288983227094747426234571630063269545219291207342356377829705537624593717193629488670483397161337722
+4742683466675948276596206085950351177248268507712030644980189541847011659976997997291786802803131893537147312873666734632318013
+0962031832358588577470495716330583413563622072795533159442347186921867618325791765612531566938977664106322136330634216330706485
+3562792846227123177501866289549655646263423972314841727623087546398961182987448990222751356418413165373556965561892665216006475
+0506481362115739578595809306613922949438046074388531145186498774188751322860892046433870735773039483261252104554347599292426213
+6629076659887419139215806756640799939588104500582964705062365481405718348479866775939471858338157222844571173771380330117254323
+9427611277124624517129218643055712610406848999072749557192128496185603527876575966140152280783898310639896801498077008734557576
+4949349263979842274642964286301282439502057095606102606822710846752651420038445554041921101778203644249576817202379962365236644
+9000537778793090403522534841735088671708809700351632320108127651758914457761194719832533167517277944390073544087779452376879039
+2179620974987315833763764525622394287879156162214632089232065378247731638836108414730685627306496030775755582279275263164338314
+9850178620109230660864047257606734366763600031327072575073099542439779650618140023637464021494877439885488556217335419454669846
+7274436451730146692806124202594474275423757115268107978580315116832524063995327727093500514697813597360878942124695394787220781
+8077050800020141873083229149343719418506939350096709806686454834234546620350690053797423042331890117409969910833834635664137578
+4222569085314829230694422189066171115029353200770994620763730497186499678980036529016196644500138184587387164123266827728301061
+9140763168998745887384781477877234025340780171338591152461030018239430263211801503428946233869503372300942372235304400820946852
+8437399467538616927457301639250511729312614497619431195080809960619969552298634956256648869707957943168309430154835637684617202
+9927888920815679261894236713565064562156846670872463967287481642034739020192858148286147625951137420641797396365115772980951219
+3655403238951645285818609634851118279549531888817205406539748497770277166060720853420241694457643803188820531391415953932633187
+8096429698574955422724412934129163958768439154851606366794537099440778504483170647334793461803467077456150095540043989710581777
+2365201968161103470136827409580883843970089911974172408580391996075540014445987053836291636308746569551411995558157351658739831
+6950345059892537018933018077820506883809089865363951638996552650340293111131388149509355326175519823347067351884531383182623006
+9729692983578755541105852708900437725294440871971817004794137742625651321002377622365955498287088740364399525852759257372235252
+4593851734614428386795483124618557640086184414899615960895693770722697765927766996280493365204591488466719654529288305662919475
+0122479598904859751605583470001521191650223688479671370454989314043303051942287523649808609527628133476925823025842389422672084
+3056608819600468295745423499468437706122458751753728982506585826980159252966514250379765257256312249132321573973154317443215255
+1261003464887189939919598811711885508553376196973665253914113359871227784508364309872766800569364687529405313394507842277777341
+3335595614255964343357224505993110214988297629416503148121404268247459966936550735839779347369294370575468296662036041463516505
+7279136021331762991558929156754763672783232261635376259854674650491435829901582103560659803340084857348232939069746185793481086
+7001312755863777334623418958360382433258119385097977803059882470820602915102809159265450380632894446941317444541503087066649605
+8796169740654134032665098260784549928283316353597416172219489498769356834724310846396610790766934291348253075369200618334478026
+8802831163686839169667839421840117736653893219551959966388948111069365662007487678001136916755953605936920644573768537311349838
+9739545132806507773311726139940569054566559814706558048797461242055138311352937387308888484537481230253759123043684421386096698
+0953084370435253065135920609321712138864781756707944630525539032264477854921495176982483322151742604869890730064964430072465893
+8563889642871990807691809483723365775240608384031148556634799934500723149755352447233079304887498827996963939978814660785015524
+4422068594927829463105462477608520539620307156466022889708603842952278355035865136962605151617935839688034493508879959012432457
+1797597440197984699879058451944014171742351115567915351330880426124733117964473476818687526048324044778050824433512831279314278
+3544880014006914530017330247894174199038635755809673971423695196336512713364189925640866570283506889971990951009729565756092473
+7989020444450139152190142450813270776908916050703362005761467814560672206433992898775383186508883181569920382329721780736328572
+5963607248916565843748383716251646836534350100847190837736559193434644723784998135363197913246364668420334826697708573880522965
+3263484959293045146013061177283236124170085863131765193651484251463844732711431227375764646336930721004123585223994485289918901
+0583029668150873954157367992526151571563606918837234329358185868795166989340614129979830550547132857672143145949742222265113600
+7440572366306644814358767338023644569585694763643144805041668167574800647065193962831865616870056333413559981420227280146948103
+7295355536699420073390947523011459995035076225978883439577116325646324872851036992256964558891639573786018094493982547872559135
+7129457262838894246866292831053823350947068553550051302734533231301531811721807950765452389323781067242015285235015915373253500
+7003661686534989695171145431734885832337556123063280208162395256598378269110597151277334587048349487450140097618803853206266757
+9082217774055830430004211027285925285344275476747121049534781396260863522010542259349559050699781590339007899734612452403479287
+3191667292995301649109040619271406402727834137378627737752393244791408796163577067403946973388491815614922007647090321324522320
+2949712664738909367012483650928320008049914477514031653686312257788502415066119921871956279807885221949190218605724017500310920
+3169525625766817202209440542641629818384859195018848363928308881901815336912072399651202491194626625193357131514851165636605801
+7255316665553834762495164950088245569336300767957000036188227515262775800565384194139225891768802813443198621045801692291233140
+2574872647913296219947966169138393924496399035916640976364671914696565353222749621284958305509352891507065537978150518314618840
+1953749417768878991833661315137426428652077503145679920658786397955780176167247358992933014357557538701378753423037285649046608
+4668877807427263578702242652781568611601647436182495270690516771196062145719412914253392449657363828299691513193636571040444936
+6886803557429783411232920271165325523458164084362409904470754437138270784982746722601116409545759719688367256037780110379647023
+2300356518881462544550334413932731049376257074071686920169237332025867743966470152553906187385400688773328478685498436856277618
+3440412356699057087611095963196908710039931495043446625996426055839433344899946522222609944936452224313579344290272586318016202
+8993953982184479368753437594218699447584551919428710623167603425460525558734552005471227418138809891695708393142992004433396157
+1641364290874900167201473644758505077028954784718448987507776152112958786620272578580374033281627136838108776465262593788494546
+7335791534524477898748563122556395894974284747735359153516999217809354333772921832279669823385048414976444462237355621384907691
+2772845418405555209223672772048928810050444241654554863085813477997024445507615114437302354148041362541497074784257678291599777
+7178588655224708624898385615582303156928858845044700179599109039474166324676359828675085010955238472718587302252391630153958817
+7714350463980300266933000010667914572625520828229727411680133017980270989103849220980928606661613727680746076907445089175447948
+8959804988970943750240542329725780454835670277149205665534383835852603494258686925800889072070906952377561912949333090450610435
+9127584427822125708186685340454898072189100248623017561567872674357247419856515640720894591586135918230623264124957308938825903
+8565660274882658423962595807578322116479785809616786494557353542161430392650520437776730973491703217016387298185714704526578560
+9055899627055835280579204790473134990779700561942294557075688923514759353053304752653692669704340622777026507467115119994712711
+6401990429555126633982558874714554382951718476795179895512968275571839503381782370343773457772170386412634133151122279458473043
+0293309378136412704813380987793756861154395548470319616928895806731980671468030021029452883570696897386186564749939824907170573
+1417717547255789991707004411151265689787923836241613415526707758612724058279277154586299713815047231145490533591839466123670638
+8468716387126244026336620863493031193083664955579994896168486675960587844522828676215258682659462698160621004514607084416783102
+1449640886898263771104309544234611139764719954279503593908340282487665393419611852384397377672021450701130079538845214864162053
+8048887383017701836654298226594900075026630240187365178333016065699848058831083230977644940244574444820285738121188435273257549
+7734838976170306869973081121181660448148530318134255364556117593964696552501147168845028313551613495459270535042160362667658266
+1546639029308273692114824601121738207436726090786353640928151613146720401120659236951025944213817893334993036938357931276755092
+3794363877794105698247622335925064622343924657500773158672876932260234127197098205417204884907008074223982761704004122962430390
+2332227732674259579606138447783556533770663844706548255581644643545209413054398521429945056259218551425238380035190336407512204
+2377559578117061565563176922758264522313042429970112963159461355099505172026291216364090521544160711259708331105724128544891227
+6832428920554567726830569490691102432470549042227057932067103955101428247157515420358182404777567376342028775513115385366928419
+4241634693879583625259038169292585038330173637743744110426172931636984875802849325805759410994995655688205543970012859415471525
+4435409455307673255925091284402380740900794676435449835586381572908519616958395334196299914509777009013685912584824599000928046
+3987500940366892833785739644668889848240740024168650731790637517228616861342434915208852629849188021280517196274460956387434019
+9025408507685643206458885320228075047871187183125968258455419735129168110055303698970042275578099161589116560991845557669784646
+3366934559408606275260397226783303207383085083713447307195484607017198247596814686470103165356557218941037264416211493596219700
+9986983198296827970312097410216841561044999906047830934706495494099795173682393665158233220314878778675703926172446242051213291
+7327936388263057744394340969867975674336916032235104437222484250956772949755115175068343392125983148796915268153189466560134516
+4505129238068974615562203042384229709458199180125982048735704933556566236123385106774238252165050271569657572461570289000767894
+3255121682739504137653843468184029546420570010142268916658213975683507187608005044348538495082520951103601067607492368878206287
+4806852545996927533787451480123813559737763425204966730971472301392243492249231539770928832609537982396509758149828504617903683
+3852759316339548366895421554002413138488562983328873969801625973328318967409411308340716647240522981188392227872470754156065273
+9712297766053304902554018245083167928441148337025924749085910105658941917341095233228980927774840543348243226033787592995988515
+5229452832882947701986160360761878773430032426431930521890318903440689202842760168592576826646125537090631410703061420763990796
+9492775501530308620829606600311339640855706549659904872171618766544922435708097161505981598338090549562866490651446857290681656
+1678808597459616937537502211249586561665053229525645425138896011542471614595178170509581277828163045626690556829964393718215591
+7053324203154477437019031580603162546890080238913915157646559489429803976541625693989468806549155901365763128179885048681463067
+8903137465669354155616857417689085085205927330249024040964205952230818210265737328326102255377329508350857922236822007786665553
+2734904576394968648887628638128862963608976988414917192020797115239688653336018428937106985737003652208275177709699892675605393
+2387808386702882349280874532643852585858561738093225119093657885192947905905747402618285721157837466909047447734685099503267111
+4222155360968520550560237616569205752212233789555461181069785768415048417477169723562149137809030351670058489971512620085540222
+4298243051299268952240909211177826836030583513734437502197104884602882464340255753900393068054947046141922743129752936688868680
+1061375462364377985228292590232948700810225069864185759076897910654198361668411325978825417457852278989472721657536588031658991
+3940469338205826791620626804680412258933163753767218044848985297248760060861868407223928680948167632232230076213403901155993516
+4300489987649264460199719443525675282990880539122997731272161031062934060033770185574543151609533413639501738216215062848675971
+2177118188977585453528133388279985990921229278769939253605657684059131396416486258985713207176129279519783451725740599907936598
+5468202247459866994978249422059052436184697608003427416719037990135361500297493876720017894883453685240892163318994013086288251
+0775391987748089844439257445352687468561143051750745275017026626096588861151466861293340177217020485953364933966278607508804835
+1628141832107584076506487704333155316297016420320945282094351104594402285535278391969212402643994113779520387919087141691462578
+4568389047366302665905669107740203378971862242851210284195394536420153604497510004787197852478898999690840962496286253318550921
+5915870003274717803413556085627698745281531034825477926175968946204463905051355885851004345422507537344854894128229093755738123
+3106488353902440267975241920861283331388536648597182081274348906670754514090626662608509624737135193693712779860188833406087992
+7845555194352577902505815561879589158643398041086893321684441920278495085775044919835855368307051779503838399479822915036806084
+1432352323824143885623247262050454612927281487774810795510104248803405617391180050263987964438216016361064912733157137057008420
+8930414578064185485247400714821333921221435324501439994244285682760117301820424406392510602828280562393052749013520039103061655
+3173670884438194788166911165081056822054430147218290866655074231005149200684080014396687574505239932587314443974144267617007284
+1527450743968461168931869720925121234258369083166801029927251949358618661922498099466741377608784560458426370545741910023312926
+3234042028371733121222497619662259149254047701278276017559926645765011785573767542697475259020390524937117767929011666715323342
+4704564242794556338739787095791826301668604024597313082723259898622680965079684337190731792129157208207454560161440807617595099
+0586578102694447320030978034126807967366576180034644346378206991116172450484663474175770472979363179024738326934451423318607575
+6711140559239053730606360957739329179929007703740765446432207582934464258439308670322228705839599858462219965901802441668368441
+8135099406701400995240439771871466473527799329781080913941715241663698683730014850012873125772974693072458542177139084387995864
+6568179602365017697198231075678811557245910639538778108917663715366214082022315024791477373317009595760696873073681125441512291
+7907116539452577187506381898980888332568593365733396512784485641208492339371509014105839017197673863709466309379039960962534849
+4750829188061091962181509528044851805549096285740983094887975885868844208625379458016822827359147295255429793714493083753502809
+7458122759750053134279494636824383187336514214679539541415555708799139748870593845560799552363619897719534116667792275265497323
+5164505983084622666859401822913429103147582979952129213026773147211467590148787858747588041796556975884830210299871356341343674
+3017622046748766474496658478936400050960631692047289817971683454103138868538745678486924385845403439475522996310311537377432294
+4414433427221551082351019813726625491301604743637648323980649889708459225496111765515476857080238229389480546313915805440388154
+7128048414711368158025433805098117535633079017719775105234085215317610434688668866637527464933292899758107458405969861125706230
+3650863400245738680980130673926472854780296246906056457846071189797804208159343552552140320987399388241880735463419185645329289
+3725491818789741913366698889863185159632846810598378698135320769928269090296785595628838126516727088490704926873118733305049981
+1156989564178115063843077403158558596361694573121010738084003904783088187504126348616809589260761446819325657369704310082822306
+3039078554378698516122693013852039986103065748081512292985255853944982748397274910996825923066426171066912792454508578589756672
+1894849971820554276778681262205130604407309897326530536792905116831412406644096303796353324894146354102174288891383230945427806
+6519430441043631674771677332934701069341868125297788424647970576482950339536231483156528606063230103167532910086072700422834732
+5003294909621810744051481544451641763277370208048653102677095428677725528287642449117886584959778219864346164599848968697364087
+6751096317004399279893854072583230132666460132819591435600170059086840170914605351655306551416965997517899522960511150518237562
+5960953398400790636904166620422410033200069198453455057858306095484024517953196610901762809189095112424175853725058162186086849
+2378590573214575182954920757796313474094094261522041549359071498710995391605164191319908953433331128043052410209542459403183882
+6967512166626834760387377091334566417667045028443096775043889705526174743033818006933449908412813794430186357687977532151972724
+6459437209781961727829502811704779207375810741393525593812033931653583330049048561114949732748301604240502210577065589268424394
+5485945220569893838677587873427380906709988368671130490257845675526326075411511740051320570135507392241324306058959038656611327
+9867804575762976412063217986099462524791020332282964702449941371619543236717809914141667173375719858685004628965511347280443141
+2110798992334306839358051076527899985588107686694616660268331099137978416904137377280100977825535315137051402200610861241845328
+0363449860601942956031660094586702469467050513998615147930502263169980700379643465968570908871332692146680759419252634341789329
+4178175171299653546801324512595807182660716928201014996433033979566075147588628538125142107342090640143892070802843256418010103
+0456138779092213905930697158012877976499848878257289818896704580464918962127445564050766970246810568260512090191166877529968532
+5482828669997339487166576516726609979104834674845622909875424783106655102257236764736990686408975204793086071837965911886835119
+0267535380044835507754251971519271244598217325940244403179333727723642934577686643739339224195755654907218801997476469074206459
+0065138464529181013506268966674037435955704351830301533242369638335168171139259359713958529701206344946001165594755646272160394
+9247709545287060822576712084519151900147438436096859182537437687606226004692040127414633767616557761740535046385163645108196795
+3057714321815816843173779617852754091940306380163712243160807705160943819438940855547343479788687898931661575785126108832716960
+9533193667848378687611829528479562728893899352573352696025950207316753012731502558223567081292045437196069989946207141541601008
+2746003049129497733856902406986044430147897422219852413496236136281848127325893646312380454532608491203709112537348345922832907
+5956088319437370932773128721138395583820924421370173711672367829016504396575639303752597289231640106298414733655039838766441635
+6180360982212734271044173784836239476693843516863507994881855803639383910953492384867775507310386199169825014966152355545690080
+3474612962133776522839849256217894365224998226219581308883384099107152737580490415337430321380267679764659802341675603080689884
+8385214883553973286697705130178868327520836907858212929553123995458539418552809580075802670275820221517432874193060009661810485
+7635870550202301972338809565930908660230248958179738819097744222123891965883613360999839391218647211336772299291193850385713932
+0223196991899819000674224598203238140866873922543961390070945675722542943959098310960399662895718004978803705167927661114684329
+1353039351866220611077365279049149758286033094828313328435837478853295648033377121231092341833142961745552118705722131187887027
+0630837254454720024736805497864487627874608261900388501662821043624883721807437900259240409899471051510920617085099514167842832
+1988240186121860008928979530309334258534723646976027619874403865209331775508112215956780097468860667994721263707215073620406836
+6148969112241707992551262221756342003961909547272415999992255159101022681539848421608837594935060720460495066842999521680449846
+3457737254497423194650056810264127963010085423288394333781451846227050135758357730754076741230565869445804248143832527389323252
+9790762908682747953438433738621860423268309500095630988326150834401786630708761812852217486714179905608190957461442085387864531
+1522476382145618120242675473759696978079648715587754580423057134915914494338656294472760447616089310947302406703031809581038470
+0171535968526973835184507085581755238300981407341777890096801351412273999921818828858705625413157216884807494772810429053662454
+8619996360469711195123911341155232797961140155492488752604043466908848244534955186766472286479836154777737654804742176595782417
+0442287907416054215425872961111123258314536732740500399960690027024024360050777203631279476105577959878524421999307563248792796
+5348313098484066077132466864776966488466415145151104355092278471837179740560502130988667962911672913331290100002597980514807384
+6973148695771873711809347394667364106588642004523762177909283034839940053425839430616152779752491636974036365528618662576277264
+7738896628379276240988497456223829719984420682404133841162697625994660783140799400756439398245883415372300490612168611754778835
+2968155785628016494964773780830380372616577140688533547628672148913272007307142811840952334174750520152544790354169079912774158
+6160810488767205184519228782587106677087830138711937806611950216229418417002136640356986986424817853470899640679854298647927259
+7389645808720792658628388654675620007991152874617887911936239398213102595897949513877377839509375811277492184373982237380291082
+1922598786894089615133138929724905768857077536113336665514173213408958842847812824030198485744051056380839435865339196791176969
+2136038443877769241444454895223211664298720250012371885167260344691881420934862218782035849576910341176642258076960704001222187
+3619101830106431706477720342582912973276053324213930842322321478885278765764844239473581443510550046154371836075105045519367692
+6632620878175338782391713943229145276164648915620343082760668528508249819030769842115080099804055533615175586509178038716739002
+6375633941128896351976814553047937414266141967344986676911841486068926852092747499580940682140408121435982416523093436110154753
+3222139045759943847229548540511800241253979460730316619733573541964096618975921352811299052448712030457862855059140594007137487
+5542934473211875603591035637674955693033630753758706551752052733350020451305012112157194134893565133530552290159364523539238466
+9616750069420348886409611437053219761816707838644591613686536212537661191394262393089971240329521480448880783267163369576343597
+7663178436164222857814082876400941903973450706396969842174499622842764650335956819817450043712545807776915977745377365681672284
+2935635454175721831517097628434415466056776136240049950596242823574086540015840252558304179235526092054789562977490616481745276
+2672225222323108279006574534254983148801337991382313626787322270855974712894468368216489102586460739019744587910470428744488347
+4456074219727400675373619105257416175699861456100136151468602175897841754789156021282927447724373220233266891662271346817093855
+1945491471112632720796456775261728821202881302996527116048267476118823402662922873934255261349533307722895013671219044843545536
+3793064262773487395195026532854447589979023796935998929027789654646824047287035198327952786992674028615601422606183219879793442
+1630579923384492024946757118026605898057464509351571155868933384841116903091820066294965297665314366667361460313869589402652652
+5439801899827848778232404947415524928188533947410081530624338414230329436826968163987544645598294181482211511249572440955572589
+9020302797433585342712570197932059030880158484733343798115491391574065623327717092645488738835390428206014044345059915068656197
+6778633319862050630189473515487955936852231827578947650626369925629640725543661083890077620427798703103241551925751730707081567
+2865799458475868282589650599779702798567688820803000453419899694057649460056145012638522245118862822941880894081107383763766480
+9848357801406244621888791600769552120182014301160477310095737436308083268418063998275870777119923015945538580745005505737103338
+7945415897343252007659617183211493332054610541474762203740026194193724624943127621999433384183901217893204226254420212426063638
+7076158492133875552332779907935346207685056687613427451355599366014714317865416656614209291512293922523145859007589727797381122
+9946333250403836274494116934757202951674758307883028448572093526467181950556672615580772027423711017988838817957391185266051907
+2671612744740733351071730789204383122286756475831821553120581637533315869945628262846596800538216358815764391197830622296989405
+6992508792590965425974849365498446258624365117468171476061738700582645427331625361075430086525639161565604855405377972628830548
+1767000101633223839049666007882398066097691088797110243675124836228262533287561681535331091157763899063838214576189418367103407
+6457110670443987985620843280548984156731527065461755656723700576735027138342545097213504695717743645364185206786138748271882473
+1596890724976137980689991632152444686110535638170408866300049744279882252913535065665891060859035882361321345023887058337830307
+3373623078064203672049256820541947607511438489025503639693977760706696248117065715718091918113311545970967574977708709494235026
+3986923221612406956343410179388036231285096894778891156497956823154793926342464675477516471934158222112337889492119504249964378
+8383359661494890362436075780531143970408529612575647080037096675346333712031003814298042719987791032534165077846901212886629083
+1031714454907840175775311491859630739967098843327841882994334085317927475102526174618259645090436553276509976956833748682136561
+9064443423702201811261101290439334315411997283217810869669829733471939988609585312109817796812433049198581074521140984709783531
+1643172980645376942250431938106354165389537074459078140489244293256765030797030616074547245248075610258161012282504441637098927
+1963449744475973480042625489273145165780544076999525577661332442838969621507452441516783367746336168024894911875794707697541031
+7478540879501049129571343735300770536436533927260315165717247241849652331693508424305277324109605811185754598081962423629189840
+6683599827684293037220931133813347833193703737280727037200969748489983084498274135581120006138983726589125846483814619896382039
+1059986341689241962791022654106008362005402932907446471177268388894146241093638783546170660638544503679877547754823916693779241
+6066567318288101759879455792419222471083652734422111018558539534478864130071102091839803023165372816119391124984955696131849946
+6509143418752724874347225367749147359005862337831645120532349014908613153135844609402649987007336422813208143055617331460906483
+3354213199998376189921305928077126664201462525396049040175801721488556837349266500704234038852235700461088952452452884233498199
+4256488814582093977539133655050527294580364706253926894156976648375809383013472871520377935537449640402956782630405195205364082
+4477841383190587477839953144802218475017581377483593956131465077901385252056389226406917609350544701283827958845981175691165035
+9675317500791142255855936241556896374576355116352110763482014692288089584642987642868701466081788634493767773533747361856594926
+1789275548140948127853887574961649444778475578058016075475638253177323030087374164983465707068923303558558151943477905316462894
+6521653020185636533316557444077296865023590390333185648729621716717902230175881569862122737390334951189041533339830180227274093
+2241738740799072036341573074248811436322223477169424669409308388622966605065590062245566692647119962939155999944641570918974529
+1928105019305194521974392400885274260434232105024551451106931113484210411868649822559924165796213171984543031754090678126105970
+7223691850432923916423525460668413682740557862272946646859452084367199412001020057846809103738751744440123325432522452656213927
+3644451389904659220831784890291126628998096321970481352017638587386823902603865110497499248782547323024785254006989249949637036
+2368125490914853885015667449603549765164883918157991257417554348691174190395500642639268158971914968315411160008374937535704060
+2009275459811984599922767470947284560232970282990047819179940733002227635796160576632463265974978503386125557611307429312063703
+5284668210801338637743489600143584813073507148578726973558859500688227447435508050513188287747750741584385175252456997688110085
+3073679804770516059033436419747376347125944073396261678398209865762812539120718854779696622769273119321506920635555831381282691
+7090364017219499874566644997354338979508197792775841533060988865177458368657219876491035282278982441665265219245626731000939486
+0475155794230569303711742143247875808031690475413279208626652350784369479556492756708347931041817323940692567675398118277710202
+5987347394026084150071478790424131834854554229261815024383846088465079695373324503305612702444122591068763896541604539174335033
+4436269510455092220918525983424623113381645210225340601560482106077382634781965165780342556554085651205866195116920957396275838
+3995168889104032757269451494854524514321628575817645123299310077893411388042092201792884422861886303896708749182469953549119697
+4535001242830034769362884028681925364864771844433940737375296944979919237869503095436572944940055711115231301447509402025904715
+1800925216578304292056694261819970660613390371844516635237968892926502845404165792819051199273212724458326926182758338001776015
+5370775490948607047730587515100674887605918594533934598837391246334643161422435117919064366778561014958058716726561922586618810
+4628995498127197780734498354535034114170874670064085395510892816542000534421254922356138052258209965701576585535292854686090278
+3177671938008077658853731628156335766651218454783739782004804667103681002183460703859644141290605438413899770795832449230476552
+3025608055188815266778993615750176656164484757488579062995887277096944086284232725973634996318024169760316516668522315338538984
+6602875499695059755336245084768806035216324561236127708770615233130804510875618781547430556541215471796577953669434492812681721
+7882550875891690926234268000498082339514970368440072348061964280285302475222074394484586936518612822244399239424272459493452968
+5181563270479719492880854609815755784042683606603220498202601700410969538595041484423412424024708099469125521786037119075251369
+1248580037503075406711823500465872772309344548541150892813671393177549861436277865197182621221456420646870403987260426109411933
+8643731351640151069976036541617610531794845092323107755413601880551863223421905943669090586959614825141812500194544006658912658
+9742463384500880801343550699245637258131793581488832729126778269174701627529245091838528797596704702724365423027345604418154777
+1491976930735419986039574314558277854162840810698202905470921161004472351694186257157283632042119485754805929863758038770286999
+8776957710513013252382046879914405882388509080000643024892306629178763000752942096488188622280178608686752194263930907107345039
+7700223390484500013939160057722983340948636861897585123716556883603506625380447610584051517968188462287828774879778811063488262
+2795184513732482674790613434841545867779716565739406351364662664736206685645328526381352909903916053024580749353932896630696063
+4740510819037498201511535054658680017511924766740460699058893969064394902765714052038187304179100787141754044221407272788215435
+0593548885409678785621622325583756109305462458590848222639139506641697602853829884986982801690179238753218240401694408881886033
+7410128478642788707381845999570686789659413433178313527394929430353749262597920022866973734073910557598880611659693295671936482
+4050137980096982959463694663632299864309583041246448456720658864445243964035849113054975666938514766051492807225377478267946248
+9230953430893702870077668677812927912187053690817849571057339797969486866950088035191626753948056471063994773880460982770051756
+3412034824969056166032815703553100561028200933063775986905919463873509475321843375830242381162225467967586471609115452917543492
+2276619135566337663226716925555717587888015126203959605452287702197704113342129180746061351411545746680564903503675372305630554
+0286134594910134037086879568380122070111392862199290853114304309332761209262076794099989915249949904726721530928297666077629849
+4661032688517145326760870540723245614758880946406315180541283633369882854109153204199703802230512566561461752474068428161370873
+9985206963338598229560272298952476210547736996017303976951734650959079279082066159408637306110242916656383381032701493580216738
+5913923322753424774114001206375448829014685918194637698592895629614872898525330558761701771138709572823367430917528581806962699
+9424883011486160624035588850742276732199499002202807230209412116053419259700106808447590894864084149744926170960405759460241951
+0111713605391910548623870259046900302961074850779853822097709685279966809633918351283533571183917553534326378996150978977861347
+1050239621857569309671883851470643478606629045329299864518009651449122046063366124913574153087650803586812245327770871382994089
+7338464051366649209011968493386794592783056535912533194525947811637756396164788969037121048254365052840678648300844862166030403
+8244368111563457237764184604100489524090599993135317160344204589670504422777317128963386304474615794833181756194674508984426359
+6271679168658661069189900053139794326069244916803991726466041535821018909664293827288937825025439753702650278433431356713529954
+5346852690092871593686894605405997962260976572140748476453131018042391268683407218753909113662935434807662980531252367452071209
+0705634605741863631683627483540085543041836023190103343436641588904884705166081263630037435630150915106908441737355700766586129
+2154922713467232816471312647563953292047715226865590918846184574044421063130666383320555928376617359704955430293171097080231031
+6735370005980738361139146789749484206639522950848455336267649778629028940168072161013843975973729190308856690607301961044761977
+9897723534911105404785432577277586147477026587182509778621368216939584671433875920453602299697242616307976245807249371547062253
+3864808728722705732544842322660134226278752025136368637744919793216576700939583871247088670783610602247097814787263304145508390
+6389663947104499816842871432275844541634180937582381422116532840275365272420061136044394514594368541860114545782560162829849217
+6461508204689611076377900958964324912439197085219708917353896453831247651446957118893020342996847989755084869372230374673491989
+8433851389135866749479827490565035784654953912616746305746664585754447284795963325019971006496729330088735987747297399102902166
+1771497470275815103247219843409878702558703790756432271114114625912471360708464566558219993340028146304118900320024587821960404
+5976617030473732204037553918438169303047012033263099608437162902327180494837554619833899125897762143660304278719895133912883606
+7761343244919347585259429796353568917054332343654064758967248953925035366120514799510920191615767532119958355777106600079597516
+3095394058128591553990850297147880385815415033833458376807751479083131186229720635268920776120415936997418185983635572280182597
+6753076258298533536576760943150454522971260918131318703703785217592559654671733288977408306810194844570204346184368392179063403
+6769837756043399718259982003405678775173052005969429887545845745194588303371446514765027612890020128811539282517812340583382742
+1145447512453860943574015365970108349103036202936884373965378227317332374230149559079576915215507294569467043944303098203606050
+8331961563901986606916925958427127071602998579210529763507751756811409645017688889813292902535048662887095342609935463489041490
+9736668802244229960622339427799905563413901438749725163782080129777353814116461004513305940715905434522181472880934497720795747
+8089231465924779558459413345521275018800849869822143818873965081853887737597561843190118386215028657051186337416427295963183576
+5419828194392698210106536176184087551774670922454148544855468554475299499312061306599825835773673050247207685913286844665654322
+2029050617375681673334265164512497368276347055093268045529145666800867914194334235145959975127160210970603920222624846997715913
+3338289728310358326423356618856438897910927180875153967318427145237491006914876971227986916804404786999082347353908985698677388
+7003592673799641258705037230618030712653838166741113566125031462959628644295056269826492276245790120809269461415827782914919523
+7933808111352753578305022191116925704616734794703884497922451694274860316351759525772713769181944674741861315056661705956786856
+8984597543198443392303548683602615735750098545443867287028649374064105213301110278127297110019939173598045760404284726471910865
+7750264118815211285409646722851047280505065647360902845736489925465867330208651476223128001763893620074546763783343802324668030
+7948487261322735741590287466404743224701011374099821413313798593806289098955840277566381979282309078179393391191764372912784048
+2031963937573607333606298955675833689352959686316425308916957187087489102352532079680910868716368077096336327451835608150057007
+8744303746009770077282182559273953960324245388355803375849588763883535017206175431068707914836359928021715134879810455899706000
+5908433402194706392948327209167569206279605516036898586828659659699407482487006764800996251885333845684403771593097852947347762
+3484375963559500648211146100726353736952008101895174614070329067925003079219669004928157370633196400836866091467437872364498774
+2081484205640426298611707106538905461885148824043568864528394387116332857339440668358439402474410629912663441714724196706517933
+3644343088909312558175950443352757850056547896271926536743829402725583986356025290388997593791573353364649376090870755738159871
+3017618967565343354488657372318982952747583634309941675726567297969538505603943497976312767045820564276791044673865996984930840
+6755211147212352533715490737391598930938409102322563339784308800982635726297552669891177376792489264858203303571448544969284885
+7207413969560628720009738274631537646543552986672220301640499255496422838738773705028096119936179105477192211718065255929107570
+3952347918324244189239309810051132796520311457058379135751168560732193370931728585607246787585935133034431471433154073599431184
+5948122133173804973271249039138486246462418117000640467153032385374427588683813496957187641107568040808210363510174360369854945
+6331834561201934486343354906308493614367011264274134644391474781936706762560771237417922164625963715633624786284367782142544668
+7058988605827353891060874777352863740110376065711990117582066617633614262447752203022541270469488891576938820572417323582324874
+7650494373012942929901692837674976301695625545739424778268284160337186164992467580080040539595408395037645199431241659430435207
+8656919176134694488026966726643058582704520649434961668466021566505602068958240292321141423966866142697100141650705135865554164
+6074242737126300341900975693876422564450176547153341379638414445501488034596312318816964962988094532520846350286682968373824742
+4534503855120241805255426868718961329975641710164649957599487128347011734954984504486944932371682996864451326051197976215900771
+6630007989276431575068445405328391722701879448701430734576747641331918162377214794008905979133776103351215776077151862759310804
+6329412106193202180915032816114091690804553056071102324935636935651606678882718350090015499101515918794964067433252126478982521
+1507488089191785086302341745012119227252927110062837567351191646939013086128950794430586208439605756178768284242079693463131834
+5134585587442274519690540303774472196006421738851673713532054649167344075465437753885506375501473079004259777595528824429150142
+0167920777588082886922742091652852786107461336681294679615598036369318540905949328746327769828031291675250740935570893774610363
+0038129096989223899832722064059115068115632289006675498997130267266081648211647293457692956590546845542631469315045748487379716
+2520900382745986244596184110700770194581607346454171538723932383294827821673322365898338493511029865949821494463508742106545267
+0565722884026288308442559359348206336146522003909225136977382087745807490609842307769964489536237904153503877870475885643050177
+2879720936866676112852941496983745298612873646677215750883429056007867869583163799946103524454641087004812983861736126233920563
+2682472400392268500328620582825275316785330033129835929951831594780666869418979561874633816166907302039950903765570878767521214
+6000673278648346135978034734234778737168645117288730828023574501322757674622590092065551189918194137651428146720102471591456653
+5327338501961495043879408610895757013526179026139024561532644668711391863557108491473051168562266679950416482721536337117909482
+5138678303997976985493577927432562758408369467781462054517017307284536794110651849922852301352432225552398279721808418546811336
+5942090618633537593070786933293193872947689557210874049534803895058142797994756021217906395785182382696435144831868446840701054
+0805866230785777399683174946303367253262058687100298157860323746012789121984620953083069679370163347105957163924550067110548159
+4041789012854867563385153833627178486269852350526357948901776390770563029842109776450416321004402898078350462398525384367774030
+2665510818821145216742821558285899523213916502258403631925403804385199376750878427488901928524046342897043307449003184422505729
+2048478041171475190266068119919204384149581828382571880806118238802367751477551342088588974943077841775978105590373879036044712
+2582550167003327483543334770578776146465326561660371559249486818965320307377862762238777770099168908851119806663382875070424505
+5444680706893164832113072218288281376031594555136022935125966599054561592735752631698479935094668438169179747421550309847079353
+7876386229779167984882703960774028877296085268097204654180082218579776041301150186998163564389835397054336008319799363495236122
+3595623959964323543031266473552625582982574960453793645874949571464306599166850005238654688725079784506108930071723727021644099
+9904805562100105780931661247162991156577135587825115134266116050943890998432158388576995701892214120245792294717827415173723116
+3198902109416772023345787207073949684308452839612518670096056433197360112721221131290963458888501686457236376124484894557704239
+1439923839664744053843985184599889045003833780920311682293838839176055898856807867213644378338290067096258257324765963896543835
+5700918940980369141639579109635400284102047501766736959067637462699617150713985354772825179670276479720622682613542577452843978
+5832673606644924997743952540484980626339060224968813632527031664879549813855034184500405400404100621140495713672255224298990414
+7192889419886464319914820529555240869091567523179106161721958129392253172606561099507740238957725006168387598704764060094854671
+3309479510962185342022955705280901753250343720767822070179996628541199963151640899372621594086084748660799272108092321615608962
+4880909425016446720046143938905942262706584339160340379312192206890240470343647456683169242925461208146677458242299921836024115
+9112782389287307875231265914118831295892615090298799256818943475243201711378213965480178556028607894090008691361256922857338305
+7878997196220126636517126620736341433150726102479409458917297307599211520723041036260833938983460239182766740060701211352201191
+8683094774314359941970056128495804368612258860699432526379799515947600345795062224586289908023772808639146020665057226162935485
+9660235891943541046373003698737146580202165968722595524291168751596799140752064994627768069683240083731174671310320210501136516
+3952299801633659008575843631974719807086212606583728034228268635353770341290150958327244666611228164923899770204672751927925499
+1681865396625682674685451758504759903079794185779114689381923935911799262023419094458049787998569136087163049641052695527707434
+7051981372339577512946597699315700689964039969082898958542940125278978182609047860935808672479205043611404976983579300374284797
+9494276685604001130980581987978951663125638076896908522150813094023439651488500315910058707670482621722763754582892271598798239
+2297480620143752383199993430862475021936852109466853279971476608874530008450195147642064323768140191491557557914372058492369456
+3210874548598055876505562103390094444210433165591830328725710043504607452200463576289609058990598342445857989436858490154233543
+8132507672542987199374049904308113523835831443354290371614453927015873910762212637250354565826616538395197156337073925141693484
+6828640682510305462478950222772217556425645114511993512248969567524785308290443499084010706135805334321921588360262285590883409
+2594395457778771868965633838538089838472114546447151674569430202509411063873470113459762471547280714167783037132473173267526307
+1601839698883476534179701757004074668031433379390884724016658551011492507080285489891017007383477491584644025888213433125759305
+7523532561560703539946099285117454732843364985652611667389407913314960693543811095755855340427962780551780192610470189512825524
+0348247544916136977309530119407469259627024645454634138436438519986158560867875479423449700625816301245511994796229708771223160
+3917296084877555076938742844381232454610347414176454495292235478841999037736204668770470759408859717947445502249268193464913498
+9942815514474689741504492308012003642347161752400872994567873248383495234578303317585084447735662421098893789187005435875125952
+7400181919019490047282686705057224403673442901199627215721287263528829739748034312624985655044437343710362758307470148179539661
+8008829134593470730958751998114225068506458584106597781009501241738039124829892755451932663527484529522803117480503191650035801
+3220127286757997144992978308357689318213671314902934383221575508818519767526663815112777913873690474000419949051472231014820267
+1399894109901863236068753449286869832068943284626949416147238270002784106062189067937811371979896380361397172738949505933506481
+4254902873234171699063619785819122642732788292824537159169433666069361612397840595910726633660384383938078177403483650975568259
+2209368179438159444309719519784098123505334554409147220881995692904711982790135929098654648473758048308424437091906340638974131
+8784927854050511928452505266509077489186830632833630361379070849447072741785156478899585449175370978549268898176795868437582718
+3231975833056135924558298656515294400028803078329218944207863428380011023399283981167261222531969361122301223500410734344217228
+0958925958615134583645559459986109673563012970906230471133763988818583110841341249599399387466204289301186261815920165156578985
+1991110694748693828675086932988793084291818416422390423728768580762059411945640551530823790024178761601499474873560699371792162
+5361696020245404957765470178767621215479647553935020898244576640893571391546565492142211775010405579641149396961911772636411704
+5933641384834122776049822258585947581244135364908556513226296636775905866481756079367435635748095205281573764949264635941006411
+5041011491795017405240846374877784042033437774313006536528316953327476960247723830386371163515353865121506304361011426783525735
+5488997063517475914229301557438267886673740763412117613628897204796477231021684048588313466034859903879245472327441120566103502
+8530760385580859337137628786690355170400764087907594224462686544107056072485919968752489909254263413225447887894153248109175652
+6157903578937685041336967794345564722166007100607239958562466608483279980200607600350161886932405833906442195659498278360919430
+9828873150674702059652960737024831945705458855872859591267757719944168191278626072224244567244295799804168245158850647976515767
+6733614592966966657616990010769041211313964384427177615958783894640954404002730067938048093833284287697173874637222402450231077
+0815239310564450548270963278380227549898803833625140660969258768879529883774142739151346026790443492061196604908528916004363340
+4528891650268490704421594911777184311417838640306057034638291330148034732863406008674812263692977851302665645685305101437279625
+3233475352967519524983898638596372885741145463145393518228460271054338502613983364910024616107499752355701791207046590492672193
+1607766030654760272868975035371747266369258074306005268123601506826295532939956628851683606599198929232644016608548496393286833
+0164998823596400554560038697981327950512161089142533974519294883428101099674224630562022297926592367086936345609705271926077768
+7913025882622995728679690258052758137385077334095212932668418477051379462440145509778953697224292738907994604706710137743620276
+5951558921066718365814901585239666946472249768608440652585316569506390348051275814890810652375791805564478189249435436637972574
+9602716095164159166038408316037910403855288603710934148506742938423062837375851102966449162297207365844156933403348477083451353
+4627498098319599205600533412615626896664838788638148524473652142820739172777284703948483540298530565794965460580139030303425684
+1565284739336025065162908150482205331120001945515224141600855715524039864305366369748820024483450351626491054274468986093516231
+5340418952181086209554963565801571626818882174630725995663438985529129315572417340527118943747399687973820656682726051844769221
+4320926831481382140838060220194555123790396897025705923345941235597539508677805522059012930976097312217637965288298799051778479
+0908830534451543414307140854781014820685341080782566962124152921948070095677549807088847640541631088209567823713325266131951427
+6110373879023562027503964302970937405830359276112650695138428936697834271328145752116000081078410010751317037848623862138058557
+8822703971093401247422493922044598594234342733457558225718617586744418222085876701060696882821515543129744401944915912235798465
+6594559520819849307838207390295967732653907650649027886332594421647601798566341345946992510422578734064164433073111139225071621
+6354737391657731503659719583497860062575481051328877369003533126272128322177145084735337788672157007937391387995919117571678161
+6945608633872227095639320829071216249131553642307083427955811490415705093929385003029105106248578633207939138356220965510578956
+8875904572434922005652897358604531384916362396100014485333372047722658292461442588088931849935109173016445065149146280103138497
+6344250852997852406467930596512109372720069308708153172074632971208643949842907827125891877283714403480777088075917332714430078
+2141088112696908575603884902935424862191062652660730968192553423838776572288261313561512545353202622522229101786236940604077536
+5420581455921312988453042096323962394005097705232943223301112814607176607418563604729931333417412031473023307632699354685035657
+4904931609893963364651740622632458671635349731291306084872673976452365611310080979515796567705432384020374827307261624382593308
+4292701172515433578998040448234672894273087795215109333668233787741983605782088266764474905796649724673659270602807201042559641
+0405892711593975173584006410022813365106426354541842020523033260675160988528765885253376470412464249071597201808795790920249321
+2969506372363457771265917606965665281965775472879910780113511573805868748553670687571273946389007257215130433994049155446244186
+9422294818781445710760638755747391659377594672815933259737267891227254986222671631563563954141355946614955207418080860505944166
+0087286626782644309557643177400304492693387991339358406695023215774476540471075851900070969889709559625262772196723374356067617
+5897279697608188221125456894430238474410213921346239465846675042270793388259552491229704041982502727376305057500585797419096572
+9629126678093091084216993559586337141715599917690951379809444249525710962700663884823083705316885810747054287541385125785199583
+7595346119985543253389563272070967517963948640714499895302628870263490256644647992172402145011433583359949875045014139097383990
+7523156213061115787711878716816595972617134587220608008483487762219572353605120083032766155082751752855610567994430397014253895
+3701919959515768374982789437891830642750960645657994589236832995980797844253496076657711645006752860088626834982056251575040225
+0979950855271929320767873941275718754278787090305240807928650242101643623835476811933436063479233606315724201732634520101994785
+8113983065740845934933526321338302277547952641828910682131706421618856976337728051411744765715349602385454916896966865817502458
+3541043147303624444017398708391616664010004834339935228226187248791543655458437287589626370079460316930365464946671005586907844
+6467142906481062672351612846421358624595986748030105764102127849419935691001942740215832120384833855662335231988116688960608695
+2788530799703761722379561161257911074841314957231380008835616333860526518888348729384930186986891972631716493196919384541563044
+9960151488910951179842583784111062968107086150565586865326760613018375413860020781154310137687104793480739369654379775885629180
+5757125618091793590015555342485911625792045336449768530669665131967481618933921507464033442861020327590807013639300157233850794
+0108561117599044904729443235325450727345789731582292014742872599813512719247096059598721914318005872025916402947088829272312140
+0248866797650825595958204057508507830807476195084664283762933417519142347075582529326241506715718869000199121666869916905668032
+8723343677864688450245361288384636252992454056026441166941292835836423200070814147349431308408145782824860695919605646719597656
+4679974361161727145100641660878503281476844268161393833161261969965276371391589006952925603728082872969549646978882403423923010
+1471039994683623569789873331804012722815466719684852070254837711074357511238693361592620597284807521864906755820794891745584020
+0746324287724173135220206601559184495263174825463472438325932765982783597938536871848298666533763661034332204209283999095134727
+8847622479138729829083277482843135313544249094572861179333595590622772221061675396437819003622647477864448706978670376179646671
+2102601933270120920559135994545418775337484717153198432612404295706149728016561442479718981277683958181059597372600330224769132
+1259053282379608711992970881977405077810774056106800273103144031624467658496517236458989974966732962924668833215016485379965273
+8337096778081104941132624055977594869352911917306275484469902456879306916808789684303864335821138065913931420528939044385046271
+4299368276599609244497481316123376963837008957992736164808101728168540138407838646916364855310221850303575133697274394091619868
+2713682765289699129061431150379322274699877403663503040025037596762253721290401208216082436415144118858632156119324419976312546
+2881609371673910343032291044465003849815028985591391451188131927898325558643746240832264615980161723347980750483187867525894824
+1267916226042826987257806754004440337824069605413162886825139485042850988829975658205470396562194892003670768255291562747373670
+9234220033570807048609309912547070817083287541492891357818324994480536846132188820055694019487542207004276192292369053562016777
+0261127578143197454905032632100124793899615216318941692486325853609952184783830755458121912666549923939667928989436426770649961
+5323045993412285553048451071174802746049476412795340271320920389475261483664749025686760199917517732942380222819936015551403774
+9891352074356975839408670998973900071675970495889358565662068888386887973659152279951010618083877084169404988201568384833942255
+3238050166229051707803832286590198074734858215255713288528844554284335600396367554775218985201346513397387400209397068796825742
+5728107211476180762511967972657147473012924183544027968479506893336809289253531374220504641466496667214723927677602095165464315
+9011192930379184487659969643233786997863887173759888022579642343995986799605176120033884333316312893660726740709366636155465721
+8537171701432226276253255188614622965933151059377811653184802609155191205285178705789524447418786231655055288040171432169049130
+2707936970837574068569629371931407362409248401030806380356720552870356587923391333211272591561747393382939386843280495661244314
+1175509422804438381892148322240590701277543376729396595323849510597370466005945680426336918977914561211300792916203174309654171
+4042805192423544654158411198004453353597731647696727421911837745446359133507547657475484034048732290037678198364742205283336338
+9337695707833044354501853716373623356235483326284612569311911355595616206369186001725088755459930335959640295675396477063274478
+5056639209721879485672408789757891131387617511313947970994081160678454602320697412448491839531065552976208944273555314142041880
+4822378866853898824086257862623541730929040197220702007762078231078349736989651940081080724932828161588263934616036801731107678
+7042616549110273896023934480613769270956663187245804271172698934235574549161064775406631472230169390486643998381840493803484843
+4432695989367708020512810012276065008453086786966931783819054126557051679306430656639833606398733688366162720200084451796967553
+5350105131227057106985599834342048762794186401151883770272342638155104883645396726235498798575148882718582404327490926780130044
+5764192533929612390344710894456047465905143834205988681215996081613514814903908502795919703880401811242594826105306055481784823
+3081736917550671392293064759141270028494719167332097201455667940386826052104961288882027240309372922868375595753000121957263246
+4989894866974583276238356566258521642610551259726323252743986766553600472233437943119765905133915493843897768279428421555764861
+6801273161353076961494549671635819940275013580673219344227796480147357333556424794612960445706828140206119824948840749240399787
+1573785648039077385334262023034272384935398204989144292167011651539471971703585283557377107933951650497678725581455181207346698
+4874698339219730333194095651462069186623435369684882832433815952523247766685863473588031370751632910706819521148264821690235129
+1745856207579350369947762735836875634021204626000569901414064309006844235664625468595115296405455194740314530759379861609679354
+1263339035301388606388533163722497011371588322482095769750979879436887231718408664779720990691297703089437248834586600555339842
+6251850491772376275294393458209471528965471290147918965218220499155230361216164967212789860144972751525815583122397986208096706
+3484214175754929920259118693783510869997218078047468018854269713219002531566539459352397848678904622285083238008575450746485192
+5035485477939887603964624838580376893177633857009639663967781579876337080786152281286836780643711497334038142643551235377859312
+5770990490009748551131841465407612077195558195928231585911499648608018583508169531801015305515399706824738442071885239921251502
+5505962701249607762425096231287734763141665342862391398728642501706701840207749211087529147723821274132607543767155647569233366
+9531752996646776228330405381959650186056935054844849148234315573131250892996644098435195362019426286916985576819912113865830014
+1606555436659451432978242703284043412347220692073799660822918397493666695089541486316957331014765996271479614514099842437809535
+0289392478723841946498232349165923942701150815142311799644394965419544149980499852640646717021478951519649059011872310248139100
+5511032978947425845575588456445816057377640214105339473284188761415785249565799756251192934762389301520020016150949209737931857
+8405804800314504366659749363367231268121943183966514746661384830649579675620136873178912503421474419998605051121952540207826204
+7505457456876976664571641545260379929258562329503538400546169325488895767917670975295980264182906923671943997046060564087753548
+1274387949977098682446892314563863257816052408410571422114222854885606494860672338931736657657635104187063013087549529686451859
+5042755850832972022663213277248439000831269961224227718932272498745376713860758630276016079020855254056636945995345396441383249
+6344700532270890968181465829707309620564725384105716449055864407328703719779390283415257182087348958918979888739066384714906447
+2478502268884223599964876320836160710993832544375139942095572555604343446400261859797019349052899588226956407340248510969084412
+2858479499626608853379284122587510516464864248784114135053508629608620108109543831989223100900685873301894882329747241764687394
+3516073975240799285196283516667224035786957693305024409405170967493899593072209653378675045399225752043351688237909816464332488
+7045960591955279992811051225021192695063962021956994060992139199430008815112575669363055918094781304106258599283195179624447775
+8303548637737456436395221856298882133107004338700669993457647426042442520873552718504789607522324772936205923889075833787877983
+4528959091848677214793256254827374251508317477836642431769535470979890535339665561280184226951752824749258073794415152803073480
+1459998553825438645486213601892946519503789985188491129629213533576249295139024141113828276369687768834808863007813942900737363
+7827507025285847290454033855290419493832906414032145098230761761828468254431382777807611448800062745765313713732689219610038574
+3538625159483449646940178756166257692080479081424585343862543469052182432934925669284445293824171233112956439604122644220734705
+8884093066755275809492142335471176239144329953772128474695403479470145379846983260079920680227191033324315471442379828977213518
+8161874018859891048210600302227335518426279312266158906257386817733776024570411483770025016852705510503728654494429243801612182
+6746947553453295308964010256393213729923189009745905892535754926116629620973613924884980514744338995975237628963272677038960017
+2316979912101253225038374374358240155041996499533280966926264100171569427093110935120513047386276224147665309331079377719563345
+5252039218101191323619349210669314090591183299132043388783600602372822313158646436097466384432429894279310347011205483804258365
+8849078102378497326534646727789474466302897639756078400720546541976326397706257168948381071970398216623030217390426497155999023
+3271457271229858454657827770335612567349224212240695221407152662225083082143775459834013524692150107287815992741275927112028076
+6697268153473360409230969649314429281006253608637773637800129431557004336600687209561833649108523766841818697796052616713524406
+1264023927267188505910887476294511895228887727108862538027310305679469919872644028196540981088809214448552558389500274219570341
+2341820289505149961074855375132511787200836031120337305514546465652487797619606591322268017233923749079200060539286691098575276
+7095345917502068750136490067362248249806291619173145831611517423916491683475780750592775740226681145459237438975249038494918255
+5854207316691383141245954956380735287065353365324788816174156724268585661703068556010195412645633774843480772404581791184447848
+5983572806554767884384691619553163176913927916522767085440008009887977162986441335924089064521714048589756802500400756006764546
+8749074908864079527865640561432569820363365495585933467014689209329639785755338623694144042638210864919006966920756182400308068
+1488418928276481402385931315882264463640479342727038934158474806015143604448429971536086762337574137961555181782018130291223711
+7647631250366260770657650732694263292505761395977741171841175592881623563088242488954360090722844918014816525013438918815206919
+1155451667283610662459850201212152183408308503418856279359708202057227744768180593554527508439246428232801124311275672977637096
+3703563826897681685685127020250312031591544945988953353941140195645214477592978106315927871524898358121653801020581142274555566
+0502532594831295067422782714984502485832073390165137849670240378837997996971720348493993863606290066187249274244662460276318689
+0152755194697776938435286119441290637386200629628199446127743622173851669645911455169432495002024405765718643210153464143701889
+2562249212763374000591086405147643148598332714850654045728093130807693494090674026473297812238167578278207216049055667059931109
+1802942091998951751764726262310843905210614073350123667768202638105831131108058708767584753018377136585264570210097378501497188
+9619747156993809984322106521027559385156110152742577368251988283361064503255508785410345421538190771023025825991060075397692057
+7975279398046115700291300736456549463218759811012712333893946746580558137896237287869240420636891089058025806023431754219781359
+4988421426405962855719392598321200928497349040850013918965781094541442225330283536616202634976088463128589329235150833173556905
+8706200507172140856416642848813849966143817717503023224834106896623433469273328907429832511563972309658830234487588093651045739
+1804318877742597644565913208808319750885352430439083436497378247283858616368363127977363367800390625897013789449450637875537399
+6640589174553589654051256599633381120024749952650719727219130629373315456037578535279963334633963259335915488696463449646684320
+8032272830450718870582856393550555068150335019058461099968557096935808325051772579016403379075019846185741776197086257884683319
+9863845517847573376326098832507232200317675290516210661300649571154879306959674077908278504743343209243187243262639791806186829
+8260961262731301702271912238265956345814430445731867024044874570864287595912998480366912356847572447005441275362156399624494941
+9393142035376317879394642824057024278760474627041377093083443136837548371844421180440200277690935722486852916560800667873141543
+2707649253179074679795746660619684282278565191941032558500021642302377918384225264159606437430918854686420568233535916210590247
+3653446714468860199818770176822269463628134871277975181151133360475139855607198727163601307481114241837610243765527921963130342
+7740886414228885927181817969815506430494309276878003524396743847692333838266397442280441863182363662933711077420022986422070281
+1048387053761801939044385077721021658809540040018134673396554017098633248966461113346771441179046101247543088625644697892282167
+8354720955462557218106068480057094392968433715936618376234382444557134795213907950353329761280756136821666440990155365084581402
+3688937719186699342108738462217437423679733279917547383863629404136782590007047571508080094271518356483515978166149181632884691
+9910698753207335191315666777695731726998145344199523600464027456153460564479006998462380767579651598842317204792886070420998182
+9896983218119310999564732404427002821382477892511011450905458994448002735795600011464506066851494867367124445888153203962666112
+0874480478255387464724872537442210377291532518746867402289144019512477208223281547993390653821697806118478800205575150577662857
+4918888004811316598554705337363884151483714153627256672377291874950758530975380513235648385297027498654040181963476939202925535
+2944953053399838723025577285199841577289179795119166022276762443360574684698180143394617215098184693212410119796009072687729739
+9732016373361334253176297777291060712041712200359193577310902701783613655008446771602140682798342306314527926659629849329119883
+6451043591004466592393679872228794008130850294984708968342075888842891418002758594861642712850414025146690654543853793479725972
+3268929657246764345075224814644064768187234583627518324258659649632755014931180023989253455291331973610627056888949488127145955
+4261926089033087120812284628614836440477048559583788705295941729615760122728002946792084729956587080892613331345225489314812847
+1986796721026437522158295162217239471552249715846680613750709615232262912940447904521346670150883469709041492285328187488804299
+6628012528405245613161440847234508491425287943434287101928325272535635664307751412665147263964282878231211570769131706300759265
+7377088066364420743764402212273540338705138073396342307947494852950818207406971919647576428347904811456431944019834650692515506
+4705138654618320095006319217530505261916581737627651424491878629844356338877632449493703212698711863106207638016952512058495841
+3297864919576913522726817303334406976314952205292550373391722910736512885151802773872849953849211298237482028668331950499038336
+8974669281536290012748118151506739167431258730634523888446083432703773451432089051580445107667501300580071396777438663916505890
+6676388335245038478835892287014370527286751599266433016127479958260673956274510190770236842963946164980795747343439314929899367
+9777763357901635768971296015139054097237772494695148781717193551641896481882800982585569826367439263979611639005318235314749057
+2006174408272512048656262525906502452313110102817338015892638328650570498699472308145823254807565718645774486952361348150134146
+8820513608849516349458467726176340280776183307750894733331062785346417632047203675211923303269854905166452369376623717371465515
+0487090344893360730368974812186113379856699749061983876927406730979994152222167896194935782650684486995334925005887216364226178
+4428212757677682587368912604936275746129828292671231661463255473216528603314371364809318568990891647756504476074694167225494387
+6438298664776502895176225722692218937876815974395529173364685280466577427859435428997212680686584089016477667080112002827762955
+5372837358048305432426520203755641518748461432567909426155727245524828496289926253694681592910381964428484012886894327170000564
+0966786693488185832806410657062413915673905612790978639242251067404941406079608751238017548545457392976940768385484687626020964
+7081334569477079676309855956739406608641536536529136201573794386634730088085065014162237881535086131012737674806790302926845508
+3849506256608406770319555639552727023819412680964197246748248202159679944624779483651489821124252171233790787024388338169387126
+1220350189747959004534763654451835109235619957413590127042747161319131890755258681890420398880573552502186079819673130304226319
+7793578559294710797103985830517016163667215076322029333261233893714376644214340079810529332625249572639110330515277641165833848
+3375779071080037456833323971305312807921291040172365572121296035080033198190386403786992644365488916964829938879099337521148544
+2151885079681150752124200634430960212055491111062153428630936693865872096334814997531820067268121582290646921550422149642030109
+8613181778258533141158145972750085504588401393903967265445772834337987637418600396630528732934239316047591685154760079805548066
+6810794208813864500809678470319323448087878028803605043954670396669190693495990898866714597544374154361810960387728955757997027
+3780694542345726440651447280692129044592214402723296549397501233597057657590741164054767713089063618201384926245188297986421050
+8252358803202927045538322743598848427122577241918805031148056119515867274399187693181758263084888023518690338982779085780404769
+2424326538477152923084594002081423911440158206786241827087394911592939363042513317947630468078474296989628062484584400644343448
+6293560419015354447114147053377323271370974957505862615433195073799026219744354293045028357502721448147460831465672262899873109
+7387532795839583928982541818961799651808690944192536299119649406867938059084796080728700163640618737891537102681397327040310310
+8646371766907348023824656340748360066056892200614557523317897955392332090329097835097131487719957799594533173582638863081864212
+4986100049536290446290958993632891990045407747006838784207732735249166707023914891375926737812449203630774188546578985599909811
+1084402346707970131458723746814930784514195757804466199671002857316090262762516878154322011683754629425143857675752082486603247
+8761838577711280264766083372187992430863964477324546898292032760669740251929185543394862067810777754782525582117312630882437464
+0771509220114585291617227270613376384799093204219724418023916278133523270037263368542243169870229505561283586085433377009674011
+9820385787390786107677870809083528732710164474423943477332838364565199183957564959608617849089060421328797474250989472544417321
+7919326323563029775076417955118634250595776343877190502902725431786697484594693383405493496141691115991728752796848704617855725
+2558255581109821405634179872876958166347174474348761073684217931689004048682704410888017280103004988712033725528911209075578017
+9160863221896162516421424469589930231499714756713528296148018288586763465400454214603217797926981201646940396481239125062147650
+9840316514604720267572846195066141632646978531870664811024154364403354983561787177052598257504070314131100093324913554509718449
+9311775701841172266095504345180054522901312438857477399185382790126084433098439433269362739881218978298243657480689874068996355
+3022781945908762278768811002699224365141074026805076790548873962428543441756247033480754889441799694147133688175673557083134054
+5661203741867036406194178717036861247199166773801082533375613708479585773697108277538910907988050442661518792070910621436071059
+0690138478379736786396005725249615711997663990048585261495921831819669914145515073403200894318211855461357229650824823305525133
+1751585791160648049215935161043755494836647727651069321059714784747155745680573976254930604344088093264307898664770655705644210
+7624145261014687805152488774841289678583856425221410365164555890159519557132962343799732888357700797774204345288024762788982261
+7890710552868121263477187455194185399264846143513087916598365744278210315488246993448630198352186843484020444533061474327432896
+8206909625120146564482691781469049022430111838502858582644125909195387775957182358764356323550045553074686821737193044914677910
+8204337650424296695493149708468179951960014630538528111508141341188662936175939750414398867506644825258652647525390439239752201
+1219359010151342200692679606063626284788399861632782010310804100495631217242235430375489322644648855854345633079496117764048987
+6653697464408607985860924202927606340854610960203650555980002938739009437996650927711204711526682854187368829518663287620378635
+9615765538591556297112167827891749863300345638363300995749126057833117511099109253123549891887992882557489784541036449471882403
+5919028352049694001658038819829671235731815415745829048231249060308117257367536285634944658365311943856716917740139982945041953
+5779687741861700152585779009366027675558545586949850924189709461217199740749305528005166461978008407813915390937008493360553115
+5834977903061566139099870190655547716966444068581774636647968617674813198281268006404303675453751976888820043577600761967333881
+6972326585063978838443446520453713997506879344217941897803906052743968972254016142258731934881056702957790715642228115030783951
+1362425902796546798395679404782769752464205460307818179674687205006891103510168328363308032810297518997174255427908231022445396
+1509825900031470252867573280977984303757520410764668672441796612789584482854046983756780462029600563288455226754517497700564660
+7759844224301976256343546717305935453950775711909213261546888518009701479912670689049983757648821113680742909226880646315005569
+8295567234561669944338275143058695909726066802894545455268764288094686590468443329734647916141835949923568889966174907115365925
+8847804451408263609187211738763773284048172606546780028907522556324927271519705281526806470352840988271648499699486513703844773
+6679160425612818347335886820513491773906491628651444000288856405322740614920289642723221399498209432232637228104522990852837747
+4111012689294616788593607591102956684483592350971102538317426326909441395344097833084048144520705500574792401000355907792380226
+8347617047251388711302856164567942061715329050448779661635598992241168749527006373179435024773116055832951174916423963970112173
+9055087726497472517559694026453105136312139238988721622285684818285622456138820844308772825216777711338810456475617988242424162
+4197863232696784218000746661193362219301917851338032677667264033511098062281872897803087758355321546501532794013889570222549856
+6115749894285255554690322957000949336927917916709996337643587065466062558943015944180187981070089004992789679317730749848395116
+4787717685054333694149897473720745326568218218182852236278365043324649884567032268831086174748464582606382556519285049880278120
+3971535819215057024510844131306800637142690099398881617684362973207491682213220003762765264571054110883901103595485168757504333
+3733461701846483183011223494998710865469936261566419212369452729547931045469934427223536598514620405179798084202385746863975487
+6787515125117652836269017536232648894348703796120091034388135038967463209181552965632410604353037772756879239864709539921500366
+6197228209653401639582453147092770443022867307115583008238408014093437109999520308757528533277994723967340185717046004119026260
+0327403058251198538854684801262565688227840370906858688450070334229654311591524491257725374686504434311374381373826709761897189
+6320800720313217016667089641041343357180293991403820786439200978809209918586099663595021544518755767970175732723433500537775215
+8586605557740559261081287090127076957830333678084994220662406403052293892606977228772765289631860524156764537528844813070064403
+8457029064238615286786107279460798384585105993306593540395560420933072225512825677840166549704827482169925869109982598418898944
+0346460363516674840943211123653705144516811133167773396076974206411386351987012791478690845256647926914987854519697980693850902
+4071039292859550793054081697582930309815712485519665021072773643984757349601035844973218854642152867868823320985485836576692696
+3566944195916064023455915853671413519744116499257428302391059795726588226281448949481887857567458305547585518788070366283222643
+4475630384874509141748841479483575783195093285020751153893790442309506156006253308563119939383816229293457633418322795791651798
+2534236711768923060748330398823973796625511107263972895904532310389295669901143468746002992855700338033513519817927059960082258
+3266833442506157497412341209730995861476441931081314990884968759007025722755350805078872002993770048685210269397083340942969079
+3325013293836474893127556216824859727670678446693115589979109778870903809827936806876988266059842178470200459657153466761585276
+9339215768239697841992780261560272323641382940735693971437349481277136632058838727826902049882698280374121176916226254815769890
+0579266322319718076679029381516879866920214093645961826097287139995438556892638562807533592029177968784950961959651824138364712
+6905593271581094882293836027956049322801541013654133342099776388830151131142904625837046121178740403372359293970069573073460036
+1334657560229091661514767192486484034874814804158436588838115645203542626667263606421481459341052191296393864355597357106139612
+8983996484498008491962652081920903788269022697096829121085293173454864230335343930546161539206227982332409686050424799265682960
+5979943191308039044837616371196377606973368879788064283861010090419804092295381096855027541458106648574572073809903498794247525
+5748223869403535883463902896159174890497470441638233019825678773597770107171367867175754297335334571074534607008535043181405194
+8795353535341345876592035589428503364517129250540037247550521782811791666374510791517112671288737422099652323046937343991337828
+1845836116381331085732349956975527066319503790930145646064646988078457512408200058689118375881261700543344729871472397774510391
+9908840174753246368222566017712326787176851291551010131314349894185604484963390215007002796394968662213178018411586445058609354
+3648708782366479438386590662421575557958786432758515733410030956830742717789884410593667200352894830011183921069426063462365103
+0863636445701114598272155058937842933641739192649108654968863927721554489981493578009581287965498827240184001075889430327826948
+4493294744917241293353606762738125798775389304371272784848161045309965481110981617696456977856845295663146310544856961560395701
+5828350063875380289041787243953420472517640405923728557572182762701021146981223831971084235740009591348792854248246191617472390
+8142911427486019533916938360973756294199899650632305767565787069658787674361642673323286198646595884519076147156672045347769575
+6919034458315451231488534732525157456948587079445950850088410378838535977516348080551775162637211781455681436512037018188409356
+4896222628077283599302550538329307529265839416312577475209070966536398530653252477467412899117369638571925172776374288534229909
+2854126939661606237890723618332733028245947026454912620083338662672080884075389624244778233027185136679702658181696482687520771
+5486768970237811447646114465006645965128132304833174901323446834886512598955526763233636026886751282286763353050412483339880879
+9146149867375327619762240148102487012789152939324347118132416925423213349620444217738724989375651879154078406666532230695010261
+6432289704281535683765846177747137478857199113830933135896448323481180075359182281747819927805855289891296771338965010648932514
+3498778884149977137993362603088225708342761654666600988476000304267323094698652989046529561743798096047380169014973930605911712
+1555513950736376520645091335370846495268353191373549111643901821633347913274787967705297774512956543219272395543943905097818713
+9824515005207942672277682844175672734608049189360837751069564229080983682875340351162730595292836110710458156809584248318311829
+8644392801319979903321539224060850887494189887888933968978507838319574610389051812420770840579282228222004146980291262806411960
+7170669714045362254284955377287230002812263383500586848752066007279901210618595185664394253569437180949208007446172620486446640
+1197418824383226696240145317846075038217263309407432715400718235690780656588433075117078422196797078588171900080472556706089444
+6058081175983404316870378185108517992309376387807189465675421456144616633676191879370638648087281836756096354696164358804958793
+7175300097350528879964995120589418404250514397730435804307880003642423238815219743208925752113332762492815676234753855313749687
+2216821005143022212418811965038884804162533171952178272981773050431225972337066809470007006624527746167477143326209744916009321
+2874879795494394023670916234680048368860577149936343642623399857065876920729230526286990908222249218870734087284012928821855198
+4892669237695278094261059350844729450055740052868656916863083244548039117228735586420221099748057054754127348342899320517500476
+4913533064284953905878883623486045020791418669162484614426142342087782118817607434327885376004285685360966673400518425200903095
+5236853047264130432207807874987854720636307899392809936830966680235406253508899133299685304059306299982669510153104336419138281
+2635729217127660380760950574877790788724558832203965184259818062945607402185371541729168619518031385767332811305256686570812707
+2508693777459660048221434065348386546516873503781056818039736884680690592725066422073878336659156014383855199604525567079024098
+2527847075125720859307217125972603526269724367871881994978039745425984811500976939283305909268477371136914408464862183620857832
+0690848798245605847434249059051242459537031098176625887386313497201621005955291382938621297556760277294613833001841927601417783
+7028637829951952641999762601338035213911204478792655772152455046625599760300329777350980475951284319951538433620056110253564781
+6305383937871208842219397097772665248616270756493102017303010524320362272253687689906320569651514870191751716750048983549016387
+2503753802832702119325330648883246982515086513140942076923304514033686102637700160768687271319427097046984664384031053585769263
+8859227992404387206024381418823288245956367455432601449940099288001162654396819305512052575309088805570615034227083337938687529
+4650804026596773751781171691707686499798853858855531297662807643678150070418762900082986264876734988853277036828880591174772676
+9388499761915323706082278918760363181675840316081077581226482199990184463308418161663917171550066696858396843063924348798640785
+1339519437101345180144205804260788988338143185013195486237509665528555982435461459049630103016492555659996037806521222234571639
+4775406178328515482958996000719481194780201067828314313954411507309766697327602402398592936844052573242705274081653994583193860
+3528381321380368083594961454997422094241837847317957074543832643804670074418168234251527826193469648447514505161752970468032251
+5644398364843284455563221983222109730803753471463129763873997470655511240512635865533704491564823907699160432034740568090163512
+2019394829622861074339274739867648100223183661088275367604560854273519173101761322314118755022999112270121442893766921444175618
+1024961245677370458394203192048216519899540056189972652416007572725591801341729111029393594712226889998156435621046992279746041
+0271013842729391960551828591764938026380238772791709945105208575380084459912538928688891874547881085895537996185248760341022722
+6443644163751965239785936903668129878996022934136734635016147841655906985263150160687560568016130320940069489352717984945617017
+3980979401244807308375088961101007696165282732048547089807678715095196311609438432458589671418362252711116197050123998645160718
+5029882228039159089170628100687054725011048437854579104323727026278151658455314659996721845525056734089399419451901797673293081
+6285409273407838783004808714400055644398911907669583936293776767386307697838130877184976183405711337976463042849151509723365986
+3789116449777854153143327216807443418065067164460291516731014023725079965308205893342647719238044202553135045734641879985943779
+8298817649314977181973643591691453651364965447794449764965615478663842601481733390271221156996231579991946480360911957202482419
+9923477919534528913583979154285960230181626227828624997322864558028580882337999440750509388244247586570466385544276236851986673
+6266991152224272268084343794242067444247144028060688211987908624847699372423422643841707689624467016900013832905272766427426840
+1355067343839251713050029297274635544953158759007585898844352763675665452680269506694090597773786276467200134181329183129591894
+1203185079814519449730972616794089846681228932967991544425024262788862162483806670387321965112895932667954720701857303315356633
+3010223406691406448732071777784917670640450961064883921707223591238303897553076936064137492313930301276184114003498965768546700
+5055662053584872171686392213754554115803665951484341184481678793730256377197108916198950525496472627926989148952673813222574403
+9135301836957832126464142557708338619444651703425091454666943559384577035607172295502116858050756179608799326777436914985064677
+7849895476822416074994849352092796372963487124157171056152173017480389097568380804863683908585558640345480249639539155208814003
+9261731284405809837137712563712141454654064296465941789875748814378776568326711784539691121352690345339673695586510989770974288
+9504548640513288992288616894826847158596027709105403654435535528958145029279713253496007210603612311147571118952157286120765811
+3172019293671644099810154685400878900781863310226630973663196219151877477083273521217193649999031944551410361083160211498456657
+4584835039206895266033291139088493090671186991332152100943013968139485825629047583367832339953098893263224674847060194281239454
+0086703131238762939716791409510475698044261061184491246815071586146930458568320808697308895974335329174951890370629879266697586
+4531479959438670471013925537723663881523195629756820131576957595320119441034946472734403049979337927590688920672812290238838992
+4555784600301091463114748695085394421438230893318590726172334093673394223159678897396878630225087240466235943323892469006400425
+3181295825258212728965331361945064921751996326740368121061708410146864334211196041567878993280564094949434554682791503673171658
+0842856419453623298809261289857239402872945556557159985688775020115214582384781860334689651493902766220136835999359515682473907
+9925790212755349035787540271290598847673187935010889467948737594198142964082798741209190025028872359505393133888993203341623719
+6881035084279659821037463368291359288972809796102439700962259394869871767171237148065599497261891353342041591198086826562479936
+3071229176011336182119446125694433597177517266017496957596892485297788477134388949109492032269677674633006492819820954408939636
+2158505696670981583492100994722239785061126885782859457540392078035784726890160616966602169759722004423370966068470851220475055
+1608442432121043588281125489656099832629914426535320512741673998725277196703980523715247319219104260826637474643734228192860916
+4370675331345005605018147797477139808981239675873728794694700612511771169428567641131258023552337644203474230406734637422278712
+0072859216860622480346667080043679784914202926542586524758456470894276035984569755855670540260788837234221463158700441389231519
+5908942320852274627106540557811105888610228644494103402263750822407154871367868699882023311506835501899157241704189414346964284
+1936077419723541310264634055462791796583876957815065743467706393867078774982042343936087382789908364464848533080889495741496533
+7254584486083999860932338903788745031776193198150907253247533783144266741445178920158676792459480942978555519260352341102863868
+2324388659990555102109355727630603564463003730580206681960957998377155433799099008210231393030776738444219722412702108302468947
+9926613338642730749665937063588945780266089547872794933113744630542358661411190558266352099886620858549171525338223571617167711
+8986318093141580580876428982707764579287478469073583981696234648037808185140269756651566921560785874161230201920488349770275568
+1902800771331526181562098287158829944843731017880219524960324079005886150803168559590390474829249427791824941894802034999528722
+3088584384403360990907891602519470935005839028378253171884990772710302832296914348751708792698002306050160936562533914379396209
+1408310312115069530150233048818331378284637723150482392301602795737916335332815872089409379843010863320155338585218615794879180
+9677693345069319403701934383954872660888681515065440356051840106884171038792426226463129841417745680354406721408968771559961954
+4557539513449236642758101806291205473048350296831633561735117237579593752211878576489139742035316348287283326781007355249045447
+0883189604094854361797387824593448971971447378881204753543909216846733915206018358578418844775503490330084862478510316277108659
+4392550432502243314906975265564518025479113098902169136391369512817565837562370156090165943691065253900876426946219189578736203
+8435865573452195078786548417341611434423772217538030617156223901185493595765324312422048299670372764076523094427788078350076588
+8758192779916285126332006796232045283091922027709795938540004604312898200544114013208612412744965934919541932903174519980041254
+1905758872835083202758499042134848212716811095613617523820839042848090697442064092232729193928479222578050789364469898951584433
+2042272602260087723772848808702134767220173723358646135775389214656797340171301999623954978758165595263461874252751080813852370
+6274949154731112794816216220066048303875986872572001517499070940234617966182507743418989487331756345308613913050407521686762445
+6252730979488500452149052167583298496816203113490366754560247487872848255355376484138619549701240217905711665471993273764649239
+2281622687072260169420599936083131206454896277499378500769391609676460024680767553958496006032193910593446808391535507538458599
+2191010913898494379461759294973512837440625801801770581499807998348601134363013493664904191350527640096566620000395093356134597
+1660938804470213933500623938584649317535645503810385086838104030744441292813013981381095457570526776722828297499568794267530527
+0049591878181449823254506571309609592366697654558586847111232650386057621118329999460228856081046031697258812551653592183584022
+6258688415014551491572224840400910043380364244249549379338382107530054462860121947719561782286604468083436850199239844591653106
+2286199429292183729722721966817924988059655688863458946473056847154314312282407066615331874808857982581754086039286737461422747
+9602373046472185399409121350660074121130363291629972502459350277036971026440212505022927430609191673069989761094096992091670991
+7527879946650183351260678785085159093046180958175365176059942440628342275638429735328061936632746613485734744234236065653841137
+0853905941635849403951594887838110573652181835969202362039487221504242797299698627659839204874816529447544114385531980406666739
+8062623009337523311886378539061039298966733017052114071143987228104904834551295397466673191503750551657795489921304516776700376
+9007862096833941572335165844081198462047136819292917564132567522715598859947138927117299956642745110763969251319858190814717852
+8138958664951405431541453825461330550794221363483549976099721937150607149588852431715285804748382531904426919820630714135461983
+2082397885435139903190314072146037819079478576247984221600827812796545457214101194496220097049368103574832514769701472385466387
+6896832416290927778053721602166743175733725992261187904101998561355457754417056692268681305083190893002118259512241765998122185
+2636968504609327449982531058224266443456972154252698660084884189652857349507395676672582020179531698016039374573532855093674020
+1136026577034357822803043248989730467073666295507784903395493121839773911132783532427651934810756742564183961335402101819870313
+4917099632663820977131969667158301701831087873930909603855469814730542409624643679930249460380846245995843352815176947927777445
+7319944731827475004706218777611396753968431393783636860295774463198452128755272715443101250558014321901313052738593050746571261
+1707391395815003284391913583753339859531852184651610466904418403752429242924142601415582143805388089376849781779454300111958363
+9869108151029888337540428241180238714963181644033868424652184814249832670934245802862990793758097055499023243559198701686575666
+0187337650771748598070996214382876748717075026419386245187486192182726086987036097255846930650043060886509574171932845313409481
+6310275245723435456702127325230222604362757109683102954203602714184216564293906952316506569915992137104170152492029578927512300
+2305363922251604346990506838961419388192179030700159072409204210540634525740072656419492493606787180195424067534096459265589672
+9014680664163948601215499948895470475969838465633327315676059364457476028555130517706511356929094761498786703750352514595140558
+9277484889618105650227338993928615130344847104186489285414725102606461111639517477747291575877009412511989063198428666104065406
+5967555124952181729420151522869271680843682059283488086279627160865021360567069797183031645357984651583784813809428355166017913
+3607122306789653495447270140672966362274565501229973599229667563911606772081598572491953192767189192005766778789005815828610262
+2082222249317420567583150769393704141643717042001944511315146960110297197944325284159980684280693676403148609684883994123930097
+8731372124960991940185405379357412214932260280623846110357067671501251533776628907031655983387403452673941318358548346602760124
+1976021347697640428375581819297827333264016242688348297392388997119461967525771833238891591593742490277240125530759579876491077
+6072466888350935400785328899402008544459154165636826625026958037650740601926412225205263947146298128779293383020953022202454362
+8044034560774166401511114766914479073842481064943729623980836043134237110449322364783254518711575480004977127696613076710220521
+0564017571074921724777748862479718313010297525498781712387929033234996773668361156592993020275412793744070740135811199115493778
+8419964042103133610587792208097044601548949029168486670192222439144702607241592021192461521821947279760550828661220709620486303
+1088814982734131440185884327578226836944316287501836068430921447613687229952034388566585290882851495307655765844223170274340586
+9005799435401477659962899657617685769970912656575731463413483835844226203192655446200112583102919467583122082891247399200176783
+1851901588702515045318382295536798092875597244431065042731697266394552848998020859370638943554279437980607960337319274852691748
+4157648096188098267490705839256314766006302678665206847589272557754575914579199683296869793220703658904894112352768597742132369
+8723572441033421822131850984144065793127526826673880856427241209325971643349588168485181604003549286943794523645867631822180512
+9961788999122788832400015923298335447164102572685865228181427272076170219015236471640964326542574283167180040163937092128142732
+4937228274511747775697611764578391450794749466871545726021901964860582325608076362650424934625277209649989981489750831225970741
+5984541310271980053712817247539372152339967892775462123252335196274653874061592183413734875908267266920758029830479031847869228
+3871371830143074933411065987051697909188835376373962685096571028998970101211924718499411402849248202339306457377199877126871389
+0586547099952007576979285722825771295071780721616176263387445055392095793671230602073249233658371312728279604207471382798903479
+8923577166944872998618492077791653391106848257807366227129544881151900203904339062941439729248722161475876280041042987870134297
+6237224656556330445619379055992474217471454724969182529987949872722998015945413515067495314489889032179791415649686011073157477
+3003735334796840694489912665109880649358659073702150516968523096869480344821929684468744926264579118587187974938771984262183130
+9005753590334142936036827167253181517255166676962390793299722321456204920350620126047032582007457817410580787154332130609567063
+6768747081081207028623866855036005032042045118427663709885224327750939144410815093506371403873404919815687844934325487062884410
+9939375834444884922802271908890569123942112471025359287053666892829043053920922878243233005965596366467035614279935114942794959
+4228677728256796231027207112191813165638914358249269082781564785198933238543379292199026489661901488181239514397059686005148486
+9858539705692720243176916548886314393535919032096542151105543882501065636878211469917818253828853172821658378951042353768012326
+4422150194025015880156761058170304509425792379790006321176948407538912546088068547813798000277530779888405928477531694464231990
+9405650213736879289008838391184069127301195712710013925801226563743554996233482554161918019454022970208565224871459380574639835
+9130794172100568378934252595907690555743933712658951585006391044055921485334952756122241280828770097902109351842319381201019204
+5387985013440379266230518099534711152536460959269911655397255034626367231069408969413762813968064236154692333107664286960252886
+0837118680763800551465069959598175835527467398611671504215567143391659195926190188250898459493898805547983688580472819756799921
+3903220661160023222988830014776994424185300024466935537043911148899196047568212527843430862631973366330579525805431481011727438
+6908486037368642919233388174527626955887348839535505480142124695672332446751550909649591921180619995217291566458925431968029596
+5922782959375057616516378703156580986104482212435661177276107010237081047649806919032851751263569965116169589560831643100864715
+9530369870366296156375956282332841862206458152569867266578623568655520592049072587837930649946891321926334502571392866551701600
+2244120737959672078726164762991283327806243441107419508409939471693616693409630730506528517088302223393878360169050233927904848
+1173648771365582895309968552846929556758030253414605906336548466169612035971381029462786542081116525705113252983939162686385109
+3234155840835288921699357747660762996672264982174457829675917923339715647526557875639742064383339589189545825487931401530995501
+6887665436803180794927923177816956708553785264323074693008344374916559316617894764427215802134641031792988573701240438184249750
+3839539179042881405914564139952865952209303008409731497507386952470654995467985010268759732897359668659271914262252626200604099
+3901076984640950131960333781644223983532267536121313347358475229440208418673453842347657506344090138736051557656821297434982077
+1623302641135870181311409682200177224901019997404700215147219379739297672524540935209651730504196225871915072497095486880839456
+8525315354478812852093356397223120386907828133392270722811606375757983394361481913342296750609970915686272616757634461450159831
+1758237483830901977324883248068822612744747099358422855339260889327800667524049577373525949059825015390160043063670312221072626
+0817646239152869131112173902854770980862701701464607169211772950069653293230684510278012053087035337608494974396015461535406222
+8646346589715796030816122730522353992998487085588488148264344066530587174128544229529685414458831257128748560990578804587360715
+4892783957104711928531643465336739867007712821809759300577073458900066680389265377353301997705565938884080611069388312576416304
+2814927389151100129042633757615682635990656949553591616128856450443418496471442467646240189440950521511107482659253501599167684
+6135116334119022986012296077975055833220297155080260438551907096128989879928867449175546615606752828933549694825257606317586967
+7016532424149169529714586507287588315821039767281860867212525388739062009398857291177966375322314074508942295009826535646980545
+1130704846522761465358987904002837038112315864342341500267273512280490182439691698104185495677754466174462509539951393350430049
+6239545452060864474289817540605900770875649791603624701849860428246844860967392240963173839859434643202570338001444647069601535
+2892256768296868079082781775690843873409200886346998104928582896183217369070621962623861890767458984640863725872163427837396161
+1015987233236680540127175130575507867333440719260832000405122222181144252353002520085749044160442813319007733231316952017735844
+9207122991749764391450668652103974356514593013095625877412964336676292277200308352297929615022995501002585354045748416214004090
+5010570807508645991981283973843421015013551379801238469792061968346208698033924105198332080219826873915414042770997813678587105
+7079764317445013461353198084076807018884451655619023138435629015461147032511308684817994462582990789356614515379970417351047112
+9725881506883451817378068264565401988152381111185798791532824098438029254469346518084626414715068349480830207550031462251028658
+1504691090829009028694497048664643697386279163491642380984787314683252474807267403308118309227599112336474348292331546087385709
+8374045238326514850352601439525770150385106432876360117179641265901618172845807500617241643296725102357385086749024223414320695
+8751924711372854963768655608131773099674117966941670496696797649406607434691461307943445287152706412809962107879642575743136123
+0303974873561466480968743445273196900705427451656962370162651211903195479518829395352847623644931113876694882674530035776397562
+7062275706646629882491960277069009716984996924439240397590784333436313250958554553224460478301293892351431447612983420608299779
+4021998564670601304459878729468539224393130081394097452696802435298562203672631426231047502881058781296871522825905804208338252
+6603870763394362689777694406864771464497251023441752146535341971346977029094361489321326128197028616266687437237475295317363781
+9156020188117437220553660891624641158468448699614504995148457693527457205903178159270764484168386506020072977552224361333700137
+6800793585132251294965485406539737210356860431874461572263005112556102550605119443415354337340356018964066943951864924412299915
+9176918467253843792621229869758475550809947953676328982327607776920014653501974832672677357939313552991103607402118582223524673
+9686597280549256712036750220654564584483912204263497709158167656617008449221355316543489486938189978195357412962551710086697028
+0388429487175354035020158054103632924527177834523214082900849111108930893956355794346651605160826522047668675831813135358949190
+4345101694469873179969332042811556018423606297108948984557961826035019597070396285751114257989897953296299318364378614357933290
+4949793892609892089229851776026934561460317731511255552266868980253783700717106802153694611663582999276204920297363252094371934
+3674663375108601609896202396621130718019413744942494222052103933540452779973933501106619925311069127219850907767043719608829470
+2702622493254040904859153876396184987380395898007693621320399251663876437827374821903867019473977298529862021085159803043642262
+7628804430192406674682789691745692230306369379190920544277057351743344722619473702262372514469670378356778783948762245486971339
+0209360041654178829792127599208780855624409037374530019447406585398770659754872987726192651460619482209256452092276066423476738
+4709783672042319775995641852494077105915433063897114034300326610462577068371066683331006070063551265931785531029670403665686700
+4587667003896460717120912220270889981167563292172474600789871114756272885374551741764032376074283701965139574996577462686971467
+3848976224442081690472022609003207496720929495444016043645809920259850317579964113261377231461428538754038582648249855596427337
+6172335672098748490848298205075949543310509985651798361629655073050078700179132155025462638010290501496311312192593367695422649
+5726384573393389957861087954363684393648224844030047057212547523809090733733447320925926719918185564312722906061784825834541657
+4665490918503684461998203394016725914244105391374685986007968106627529172068516391306150797382538751326421691707344779240051404
+2641961236056444783029513171308212582932163735856854734301365261361011265730957017358847540597925397759304056715637265630175924
+3143119314616534179607705689766936638499515116711864605104806787742064610741185862931157231900890917045797092416341390041404007
+3447931172643093407899075956016941324761309449689246711224867235309324518097331543836073039264012951510199018054862544697302228
+1563566785164424421738528286186718541346261171578886688118979569809183215506908080307606078120020216388497864724764057557754295
+8570889786931244194585660557574434060147391448332058484468219132867607862446662006468299620134301595151046310252336800694251427
+0217713452224504960721091364387786965013258053103569599886166960333008816549340813042469646283329089138949995982273574974215868
+5241363057936964400802812697301682184281492778601196784957952838829973528993067785327299171845639921011068758599950934223980914
+3238619506166339720940794008445086813283016112070588367871958447351766426343723002443074101469688320695818179265745434758910694
+6296789680362763149161376071869217199662771928863547592423030630832336241218625794010606091635986342053359908043568336874619758
+5796450483018638379674081988788071939094611782491186354599577562913830254367966241420426194905385522339051453836242132016154075
+7739106134294761084702741107955615651072406250165155261201936784282832131480551569227393410480076418655073059966098939360374229
+2971567365547701845803783070635993312664824380381023912535236337973918393748125160984639017693662692774791712740599492208482304
+2270720904622266004044552929046382853488397030569658054130832432158967100326401536494483965188041727224259066348964879067583812
+3443273270836744114169351145812281297836105568675664537098362750380900035541986757124762712416133474277811013584828903165701857
+5742987445704693742780012691654778768416076035850059897986267208927114643299349752186944079949266040605774961616317552910045136
+1240573283641630694358812830029096031820509750547875205950719721469746524236951030334909216603563649107173637973757255912252238
+1182181309135378156725140117731218230316055150298076621940456444204177883491865113883523054776801063888819486505485385264913416
+5069068146388574137237425212952037225400371744975152454660711335647864580574001943714998326035983681508282903233341771279568745
+8467943310622656536228892538026964919357667642832630682651110048817452858559725652837991052187308635773654812551494387013316194
+6440134083862480163392226300450457593962112666903507568451147153007397865298280740371802995538252604177619078977124651051346524
+0537206772933648445348418297957633068071300723364120286017796847418742109018037795201017609886014503958468715621463005263787770
+3432430202920291906940764640954727327787760258258401409130943189103009317398784374181000619017547537895364515789076658241461815
+5914935373373404632064261928025631881068410722283620043865276873695737002786518062855969064577740316535280772509182462064465423
+4663807875203623784262624547123565729447932492414543360035449489544264792983057557527120665531457725601958452570287012086637115
+0847474551270439717567791117916716520890209772268515126243374020404961236068669964591032312120458856151122774707229179093256702
+2728583785414355071386563956562688209782901746373262288816864290881579324219562028197868974414398025024344306680144426091625030
+0910829767068265611067617086376443471268114912189289789288578161296371552096260414590275441364898692653660772972831143055685254
+6907552020126899986435407709381912657932246467804972165765350364308400598137400904853881086873855469475626923756560878726730206
+9692227748520363042215131444256441345425607520902904049752565589636006403442938604002826527897011684910364030121356648587505405
+4764025506989776287250936345001157192241256998927684892678268726606209680040843191546472014984020704327316352200558172668843000
+0564503985848436331698791790813182963520559967441699554268886929254925633860614440306175833628563304317763920599751129071094309
+0175566287557279025857970584297243285600759435104151831150200001725607992873593941524916608511725999483859291253760003734973775
+3039168535120967789573627753936889933310390638519872912077737282540474993630496322839461848810678646381314301370434612679202453
+5290955424609618789728513231303753525180260090737043547498273247450093929519045624882089783253628274100484171694237532423254859
+8186844862044986653314802892230697717326617551815053423012041608272398516591496440428962043914698069230013270892802838135287280
+2942112717174269473287862314996229628874313075502005461595688743732840097634991389852224318945641142059923309434297254976695326
+2444525231843962298275031069381314438305678331941237253189959661616931936428403908777740475422459580996785256969423138340880864
+3680179310627154010609137293613898326769365871171324366981855057912989303388559760676270131578093527806064422528032847530674921
+9355461118722504639190973677696806900807813249020915988601326357024391608006515894656601520223498473406143763133984605551760635
+2692839783034034225135191314183486878688437669767719161941937422862653760924569831725084821460846216076710658987697058689127356
+3364076178555288032798058397361297765867389733546080821420688209714329880465424718281983378741966307965647446727248970877582835
+5097154920011309551648620026419749934729546113147672841385317729841476832905993191729886098778334663461209723905553676387326787
+7544038203057755483948118938898802083672133837458011190981229303171157034238018580240354203030584798053880317332961525265980136
+1511152526450600575245224610801100379737911240153008627074626764499468695975779959724757934622234502314480579416277867481722879
+9208761275469748679977983637248710137550354113725122267268928582906191386758550109656015747293931779066403562806751200098816649
+2774371960428126935364571996703554555526862912399267217503390978028481995519553561409174881144281743002477593997449474113614320
+3283118387697337618913008345214573134792212133551845640272542182183565756097005950085429574121104212579366752791246087630740431
+2251626647794796903046417171601708089033102353726791435541243544024082843362831636356376144988414260766152555993385246920667885
+4120430579803988192186052185336786436260523534744839109920724061087523726726856003315563861271636470368332064799342319979701963
+1178460847308168095740461067148790390275190816124283621727277092177096823111400887004927669450338704196432823728793780107282726
+6147466566392578561700534815888328209861843963585876273190658740165656380640111544922854734365367040797352367883442096872576161
+0655254149992445465845820920429897376775083347655359252308973271695549200271712623988532809944592500421544522541040542744651771
+8895306524774577797925949127567789976094837338117657136712633080384090456221881872243825996086082147423517476054977573177854050
+4943011385246149882784947556915542478920754812582717541224558316858308474902436139789610336015128572291595765038163819815572793
+0059519490142292292642467486355644357871443222407272677363258010549846343690410511589487255437861629574221414317395258487976995
+6701428890977392343133134256358135045673673123158832116303929634062094950503008501398110339118434776130231986975400156621462276
+4809112204042804726404274446015570840535663272343219408139885535879522105193162064034829419212674983141334515042809663864776730
+3339872236842534294842100648778519220364381792736266281427277880995347117460315427394400908444602067720779504370559025897150525
+0666515892628240976196163023835072227181720931267205367481763695114784962335391370607825220441784558120081030826294430035145825
+5990171621923618467399400881105334235398291318764791324436841208478784739274728174080402657482105706012062680090302017358495564
+5800215155555227538662802534678916888507797284554941341847639680300462071370712985768701847640442454877861723356457893345549450
+0044372835991682943791367236860846326267985956993372513320157207230356385776345982286545530591945027191940491720657627496371424
+3896431871159669144163572836324937737933585239956934241358540063356296466656555165061326841756648545874963895216091891197215432
+1150436121846416639357239779525130732656046114770001886098939931426129354428928259723637803567803101198938817466591948073654097
+3680333838160206864509221215320873122528703603282455751545397796927467717336094169326962640299653768153008615924472102530867643
+6770050643269265320774249712789524649226429216132578192388680218997460246361157967129125548877818859824163987287642561738796200
+5254046150685030619784205850259746232647288005274167276588953501245671262327906633892459399349248665683674586756619925085832749
+8138659441098017401153449742392984232024716079021347321627336986000612605589176674195767657558188526805373912850372987580206973
+8191739475819996816485468724355025309335206345790673864079265551398839303546015301031614690697079405116794058344817857751170058
+5907733664187032783992586304169841870946162957846844623230375351751398150941213221188521406317499729525031329275753209552972135
+9176007624492506072188440485436086995355405038611315169617103420795642254487038087275622057368505174049950711687063028236514019
+2054382102455304130470152360854926810408620809647732343016107388521668970316223874173994646760209951211428665814705542349614124
+6010507266966547829863386841978029050310064720150129583679215294838434102788460967870976228374996605588773396271433676057289822
+7051841412308687295953020826737760628903413518500966433370038504670238126933304749517485860557144247313921158680957030845329616
+2360033770199629503223807832521648961131842719239878810835014788911969787608442436353630358920568228223028658040834409931217202
+8400997693934004696590555410764211165674028575041130093079293183383749718414250933932351869983505392135593326730456694681893830
+9601966479081797142729057700273038016579775812303462568369987589932810195102540708796028133906200420900692102185183676170434137
+3162497370959471401670744764602103343725945241209609871641803759642428128312023652491828868062451307296471228615569464816843941
+8764436487815154921343571706294950245330020417561336192910050884197950522678946771691143370350696790098631293864395203215663546
+2103973531056753606278933160819590888661208989653023859755262642075600795082475977389553769715231157147229187302967554388198370
+5511263147464601148510010944839861149087736327442223343582633059022202904665113422199247896714934045390179111585670544907398745
+6503691628140930095878935309503466424485388886339832328600458315631288162890181616057639363435222140281269282576385033650710680
+8454254370393439429040009560609022779619788056284224520991161927353411842168395626223590494290282053470410540843450407987926472
+1336825679355920509182270187363852809609898538144457557442453481966013998014732868105005901821373796606751500831791325616529203
+5075118330341336536977717509239821947081842843667207368538939749602952519028901304254002381236022047524790390418089280097834547
+7087002693940685994858725839374363930880942852293359924965925052590869503751762743229260822706873201650092697209849276502693145
+7306083000612674447155484200177291509744727003567573915026132438684216504412932709214471251820240604475149792423248249870477794
+1828750345492089414352178700274996717656637631789061874232476374372589026121784200003799632748786969419729627555600483655428983
+1419038605582900945308948756881180557106644399148478031842482768934058982366460243721966998715761966320233275607842960609086807
+8995674775072395937621113944922442969450956475559169579744736615353848691595206952225921509080923588771792361528472949801095259
+8071164393093218807836177998870397618178243287174730595843254576188688725044187468313573761652235487642008727514328298453902298
+0249472421551084408818726321837167660068433212182140863918498142778473568559604363644028430498972834010437189971676814372359835
+6326215711122626023900879284642848379045342532983675870120785391214889560676166670449442675798343547201651587376372310330260972
+7721128349367234491190961548434288775058240627555576639847795303346657927088312538298685663289068965153779510427872075661840307
+6404054826004851129562529146035965093659305313594131922007840749997852785915480413483418179403471734301385082608331943522033365
+9733723661694274986939415998932370600151791965983225598026282848806043753357041009447678948117256393500635321688798336983220809
+3023589135170563869561312040343087996767334919517638058142422305672311345678035221436322642357974773060658747505711133889241231
+1715152441111565992971519735514891973779991073609482568950260394204089469526267416519043590653468197703445241031998318436540928
+2571161687670398639649025206286059219618343667065497532146361041751088315806996390315937024865023472982359206847895714744923905
+5104856285757044366877940768642231044057490201353054349716001939164041109356173546969025877651803874584635636362767779008126317
+3656921864783698643075571406752016536758441120671704957195627803118074461526120679475816346733176098378409722349965248254591396
+1131443502066788861338718815939549028179403039813213172777877033453234020243883715396074872970863142546452822669185069959899184
+3828769910844736669658151259692028871696603091005326667495981150974845310134146991259645265882236097619326183020932698293809389
+4299190605742357746915386971343055529972124390299804481008342198376182446383261925929177219506772125075974364335839610948010146
+1147666764087177430198110110312435274731031579695008275499991697667495238558041459480531076474591001063866865437151222907417625
+3118583599222787818632900781019308738830040805599161996484071877144944130661026998282751748208682924005109173737574254051272267
+7248376535827628635806240316333585049198937287552863170331727642858039762809709721675292461634836370227092107000659180675306750
+5306506627623780068062337884640840561088552876565604494700675337745509144650468822636638698294453362040534422173031206225551013
+4252579308534696009946359817557643262143167696605231236359117810698816646524895198187607892477097108960784373761400944824549798
+6045449932335488814802338206074710052382801251742328755176048705595171441928353779134497634248965450262069632636038949744898591
+5048702418591439721957110373280102402968469372594873031440576890966279374555142674908990757259647232567240212811527932452059539
+6445116473158402926922663638150560761537491240522157144544441504700466911488897981059188305240921784775901100861995605851341634
+6426302952753103378949324692632848243080208624864503932730319385221633332864218296337728836033257029589381148577572779689079838
+8323351033213327371073881110283228611521471023685177945561596153462821296338506612181495253533007296541471850977144060198153791
+8612240193336900124220751825865213792796718254928148410457543169565765686381156512821242185857562689521331372459681870446271120
+2190046770619246800670427384048126037985607253433475697587520496744179478706647309818755439429545326720329201172200607765064227
+3736184856673482672738889087427014657874110745468152414492168023597661163943017362999706603380493625843592458433287608755926735
+4182865681401614720438201427164757077032257161772988732629306857669039790289782177374506368443513627759379215518499475202046737
+0697566863573366009839193988358046426820897141853585923998497091914817356341676241151406963597520055377063092845547594101697448
+9770510287164808256026738019695567751276805483623280478598925336381177794945569958800804342768914035606587017994256909693642474
+7259755154611086941695255874435534803016372667978524879504844920733928636400671846029963027849546724083520281554956394251995619
+1834558695670914755649864898844629047200426021450454765139131674876570357846943407935142270035129746721137853801869970041785717
+1163596604514706992103337640896730977362836499853948987124318776421720842943109071494096297915872890046802390417171851693498985
+6696873506860390067654571204036998680608912603658516851469732917336706912396900863519518863153116679969409193499475151912748965
+5772630153097284117632752487886616553301227224710840592032831301443809681968538716385350119500103381352429438906070006049324510
+7255320449590155185339594353774382542901912346562333365165993746566717810379624006716063017965110258762932735063223456498216112
+6248309487192090873881009634314790029246770378814629258114526635202683322798948006269443152846896870196478753064865917440440787
+1079237303256511529274839846470858035223497145513826461412560940325017754834231423361883666751693338383865225187216612119160015
+4861549012935871901840283860561328549067295489644918336638431557892707608901138017599623121810750153111482390969696067122547247
+2439131148441383234199376711842415663942174805857098114579871600691759196917341291603802573327405138562282722593414751206457843
+1973359935209045256671529911507316084304214657632392500349841226204006608244837820483129185333807659672251730206136609040933140
+8184943256874541309753395121370721662620513066937352652876771594490437810449353276322830929392380590748672786848276069239565457
+3348707026381104836690412750227080237859968000391150025633563394577801401905026748085615086352851413067595432050498561008571529
+1877075667972855586652155165911443897166143801340467259805712033287524340520335275436517702758812944056177253493418193171478211
+3774854369590560985587771159245595691913575127970445498501177157738494672527414527162836050852813684096791146417973149365483037
+6704552131555310027219368793280881514598163193897955852905718685913917573430057096937340959824715120372466589909944315684960960
+1012314375846207604646749185426484171598374093369935297204972798525329648052886568477644707532784462941904877487489747098535818
+7985674284714583813663198777955800874049562438949351977791559431711873042288148908962573859023348239888106006645129281470473018
+9254850687404139400561382825175974131012329412859199274634520950110017567085977669352012785318630525841745235957179742713982397
+5097303689162257167085390435448404263178199429357071875772715774544733708487138600770119134943129539543347602041901144161660698
+6953181183113203630678272715731094392489433607360104735402092320971396494926265205286840279679199637087859730680473846380532205
+7565033230336604389926974822292700950491849340699150720775179860790531037997637976970549940150909535407513425455328335706561853
+5335368312471755733760541805372968424193070274491865313428788002453279122401760512494622819480016105587606929438634932015824839
+5559016338160351661853688320039654018084969722536423822579994200012801736919709694310831609907486201946501673508356764142877308
+7309191546539260723637253628477957548575327772499530308454034050815650925443083418507106015799454347735223841084017225944595226
+4885590707691548323545253419048477650698836445425272829459034786263150039138385336170173040262385017882023012446601786508537725
+3159300795992899648874466508404624507417341674483549750138299511054547355595935184376005929821246479521411349307469101710751249
+2708412392547375974662585574062716099744667256888486220537125770970468132844596575936704205294434437646542619212125911160088350
+7671842861670510559275736664436986661209239228900436842961873275642777838933287515196746049787877411927981310119576400549956135
+8080578380146388148902757671260230173280743467984486835312292349158474503715607238743382799824745964056080082925917323860644616
+2120225379169780135148292573265658608927358543522142151484031366388491618786494744941370627406622031907792989518445311039563243
+6616422310981362438162790258221845503573731451992162868203601740290116853659138924079987226446597241351646843845278977024986205
+3662517640661488061073964114703410205367685498808240378692251201166863090113025726146269622096930731719426952075506480919216671
+4823643457908716999726557603223790753609939423361772712423018042932577115436095139459068730410826645568806300379584835433450946
+7837676208477360145796134097352072195957133041368812408314333472555459775670645841696822521516557015970698046160780950308863139
+5015658403765286649459660652152764801017680991103667912937430519322186712931073677796456215078436603241360959178629806771058487
+9139921128024002577938454673706047243620589115000240242563021016654786832806633509254081676514023612790990852595917560180876986
+9308821204883025320496874045455981233709125160954382611635568126874562312377547977111739040746530325193651004237373402504537024
+1600821697316131396065115975797494969376263815891380490449703227459763844691726208596151555303610430036532384862800860173068687
+1677749011530966588655330008218462556189908006964342216676682876215290543872066380630113889263010720992320394875173725292986311
+6989579261987669045792589013853182107944124182584456537044269091571439065320682853599165887592383283334586801282099984394392022
+9970108676029913047954776468886108937529661369633484559390003673582932372797656385704195055160295258401674267521236080828952316
+3273802761420937902459164150004835781371893878839475301617292925707508874975102558388990001315786419341804043737604037226331752
+6423865093791333509337877707981916567162340796885934470115945789596479789320653277617641131277451340371426117129794514423620761
+7417609321834214164793102707841568625675868448913528641242723253295495191476269874558175687931888576975179732585669568870748778
+5922089337143793314961512325922930026645734559888635155138481555659443901618808201784727019382947895019140665125084159195324704
+2832300412363246058905063308416630201890917641050411420603351067801736891124820850891397186056454796477918095532199343583413766
+3842538349880871712437577001398701888177344881522702272474861972439339253087204797211344636084653095826769076765966355059432859
+9877839498202302366738674681533509411775934456542381162185787945980551914209016996885507489310451917077029188324180322160260432
+2738878897545393488539641042595991720479279596803533846602159358145022104838297930283221202267258855473584700375502341592186375
+9062102173051107870783580788794675784912283028909776152369743147402812551267763802726764393893702046520930303504745751378996798
+1890158543698671287785156969862722836025364759849336645190863408137034806850238192071351320453303572785270717307117565718365448
+7734822410504169526033583218346170435610106103279145679136488844339942839493180608845290017442034674025577300763459944350044123
+6105040904995754702216898271414142776115817083443246834852579568391309141621714380298793479424942862844759389997283360409266478
+8207744090633188685115276563756960203356370566871533095111186389044186232441179082078908516925531610020829064403059153715127765
+4543411669625489070844963508370766554494552051662899693726257799474616282059274838670819153036396550543481066774790569529843561
+6679799651036598201198464287278166599830430479287605906552407498711145045497296895091710143423667516678729308766311555682391918
+9060618446032966067396024483927774799271013972963401931215359008050857228820472502367068320857075813753280582206475097498167537
+1091834892775689353192772704190529392359261014072163618697328287354942394830079331974933337512857161868992496906607708010073398
+5364177554337994653512816619520240821994073186844625407311661314696382001907220045017648487411581430791143507856735567122196867
+0716761726451434192525856251744493844256079661428358229774069510316066898590543756088198375973992063361152435222465923662351366
+0043075513893517349925411233398957648025096112448548886678072991181902374596438596256297098774636238148028169588473828501924259
+3228516645884143195864667466124866845099402543607000135666586926382976262509368071827459582454935921975303881150829096536404067
+4761157693052962556888050028734514069905365690844215214316263823173976897101122538440327270223709317772895230031391498145736860
+6385041084622772519780334652630409495229736116311103527030831268982936563366735822928512879378203876837625284271193343076105495
+8825229991999801614347782438381474867852878074358430022437396713162807802543161593009219312576950358519990247724194904234397934
+7703801976947027234960802861233790319790676821468496141323682139060568458559647230530529267618724263639883376817372167884440632
+1726382143017323548108870010820096752312836426102452450577004449101845698867822824844060001600494219691513701486376765683162295
+8567344046439933818792026021934172754782928648841755910876641284145941585066904498876784179002951113808421135227067381608911653
+2236981696764483162752804813037353468784452076739585261632267090804876266610444767882886160729217192498345880705115733282372008
+1313046830998564657547840785183730714291004250275503590948256987454019097344722968276149211207582987088443854985798581722550023
+9063006406664758572850022859344148370428972822517076773683529207252067208935050546823673576957790680951020623419459032466629849
+7938928170423206022080881849589066531884975323736816185913375521669990715327020849225286810140422793741838143465182856377816749
+1265756842388175742586708059491362377918488379984875832030848543287918941984050070389106581268802594158962582407355351035627049
+5900221712437059899622129468224343840497771816212975521659975058333318690798732737341876177817630804815720469182652538833483463
+5823081639915099173836211725045578069819187508359785075471465778986260818861591546963352470179514396250583548650281488440780418
+7451048170517299540822354367273854496577812259623792325601325690996083083112151683648900535783537568629739368276233311118065909
+9084734714613092289461178939653038690130944168935857129538400432419569476969252314501208058863985767404598559353985694589773895
+6277214607560240011967714168838143750302367595949536752213657372427124984199709048837186130780108450270594932950252051594320147
+3499572321088417920853211811454866152496225537457554175697449661675274675801653044218258736968600625898775131530277707042339508
+9914225219653958408220404955503421597988800462882509224240059485399789816322467527449242209991095322026817971575335077154317985
+5278081500892846628897442768350495212681297210154604830667333056587120720522354514329460517681155334733974540010110756237411297
+8210591237075811936724693019310304435150990235368637778807792760313222154371335709089813727563208995319466715986861635780866968
+7932415587435911762210037637958044637519791039364219987373646146500303943912999127265553435145017969397164413915816752545161718
+5633226031400350789184112011648210881013020831437183038308240362781644283374155015679893305443987813011631237184023671550613020
+5811978080228290171238069706605813947244025818423549831774560590994763911374360626408512454006214897383037052649605527910939842
+1578662832737601740265954708879993575835470810729170613732770615041114798158887175252200232752097837948350852301754510131346245
+6068409444406865116594371496646576550470605636603063539678037419994055698404550683594340710909264161990867009969259182486360989
+3207255402572128867597708386762297362519921843080894171603067736003753278183424031926979188196805787920726466251458690002582913
+5008569364534625206093594865389861974491057988729642501378201086357626134901180260883065306275795854872408871966970358994916566
+5260870280380960692056382943423819321600456629197713258529958092905135072192290151897612011642141070383635146934909632500071674
+5103943101344555719687493820066438065019249811470335254469779344109290667032018362593087359223818942995619770011635033602760781
+6090182191502983738438010896590866621707943859659299906860770756177151013807688207972939771298998138528654622092955429850905653
+1626336772125369872523005387925612023085181385255260458074393235131647700974860337649978590067937668268507156384372177447503498
+0983088220975640726485831380650348574527016263360984693517646111104451963030529155545125362875373684368744288268392996464031787
+1886577864886560438915496753180364296870396016073972814584707172757602216484353054194841318491639088652070784986581587056423963
+5791295955798452846006486957884980659241458306340044696019455166134558465794056766142717707049752847050948964499027310212291201
+3920118159051788842792018209898781792646763214510193250573669914454162275192491103856842226701566784572791940951044194717542411
+5568425247114245514540844570366702834465456557122445652286286614869534230920871827766118797945440453053831301603663599611151007
+9132285049335898106348530191639824752961756612096827245060794650887002292087021431444313048295402370831165699527783501924024187
+9094264576555332744996979181892440388769625070877328456545115444598432716233979462060670021904359658071557042696819752714761359
+2624335032983933790947468174067700780434730280286305837296068262033116687738482347338258135450536831314508366201724139587815922
+8450751384747855334597310320588125802084226440657572189418133991724784364158225409421748567123411489197359560319327166452150553
+0217315146965805878176534045386582646736519057669936823885725039838691917663928104666774688631639185290691596050519297245051431
+7940957013433199012061114563562278128253591876081307949974283942244584406336676182042124767131849195077146222822951756668914757
+6589005956437167623060683298552386150740712051896264556502825752701728084586373026820140301271827258402697782005508526864025995
+3287288894211530920495178421618385358928209601522908652144815977173646436635300032777312309529559530424309089857544514218168330
+6097483328468004536631471410495796391660358670051698715076410248502303660016161800128810231929174703618080502422800241933644130
+2956392224013095847029227680428083425620941588942686433369479814315411693725173853101111802188051631515982053459377355277916857
+3065681935968907368748287973480293783213808382487086015879418794067438804225330554229750223350574245985145312570124344685276455
+3489772935059313564818602631010215526615299221297140830316899208960430528821219213991899112889288129943720176337014173173174332
+4169981630658215328566362976636435099613640630157506404256612156966851420692144492745499377619802506248375541742742014068421649
+3723697831339666759125999969874386488250045997138226100381868783065151573396084764792101954730971063666073382268822664370648202
+7695739092394145422409597895972497681500338948172798211529024633083754418602669479252615594701113082363308526566375385313538692
+0362024243582700927996091721261779876357892824920462321831613846936511858949877169168914710103805138231321626700946199996026230
+0910370398336603134902288593437904852970471827636244578441003561376156126397047213862430430449454667576391124197185148345471598
+5028346423876572027639326365391106837855425740087158529449602646500698308039624506892347711322718143846562617911464289132024496
+9181010776426759091535139982513243227866023899159123168014651495554175929065144279128447458894513674919834462361991122972799428
+6472902683846165829490192503189706567753176937559527683694767361120216602239730653948099377610225798683453077405631209096231256
+0512986051426035486790488833906991553793296020140460296126591780195814787329857676072922129878562425136025882880600984983973989
+8577540121631192413042201337007929873227061283325668352988181356692287167551269236062168964313569524237889901244379824573640154
+5738145734013901847027973765976787682776812683421111101939034836663608749968365412229382487929512185391212964474327857768911300
+7562207836356806317921677823535902895646261255973726228824124734902468677105214682457780953879753523764199156291556619449942205
+6685144408630396033374384521831023348395708816803320958823787110609396335187767019703187308157675845831700883961350733812554544
+7576609828782901349340272529157644117188745883108516505970478068227119245704450471362770646680973620118556831550370068906691429
+7387998131808587529731801781598911046784196725282943998624870759033897379214694560999940160160935915403688360574784745832951209
+6248576464881189569842693329569180599977760906738941622134746107827192298531798906163755685774369390363347404463590563452485459
+0534570888244129725519284614466994594106901806409139995601464274045789187815608635654309801136434736637205014712781222746921224
+7852721958335248170761829133326246797700730414740667697834509581576475365734827900004460335634027879413672459976734498386195835
+5088370360545200433735093090688791665393907039059272593032100436084501418577206986549399579720624028466951070544585214365207165
+6435187129368614449937580538296933531792687165143536181239511296901417188887649499928950174527974591005214327286330726199831884
+5864261175041853165789209708620714822361777843032399821785843235985913827357647540975103877312914819841724359018056154229990484
+1936832320986190570216413377747783409617074645446275675504398782817281167330026961325947267465552277788937638823143961712338389
+6643014994016028760819796829700070956205113377466899907953033114796754643995517690305975245695734383895488045495784881027449542
+9277149772110266765516542199009389979979428729803481968242094114554310414335680714665255584623073310801300516821617747378223514
+5122582985363185134103472499467534154970594419472963412571152321765481331992341844237099548533622925469977982035402603376599366
+5702039170472823969912601643296899307773750835106819267275831078282467998094066465029472821615682366477091470622470049719032042
+0671010358945492991105729283517652015315441687350701252921272273957729883415005085140318681745681298665587818639399209287652478
+8504952151973256765543113775190946452315557877268395630007206112950274261280515123602637574614066439170518948486082023049534264
+8318785147359309244073883391968368385030412213804815219561275632927036049996919071912768810313118985299449822580618372563128123
+5447965794084022881336224721150430474622954063445132529997642171980649882452452874371660709010271333178089011623650142945593513
+7498570392070031176556263724838104407401975655807188803601068318852915004571680712468602581133705435004279673319305506280782318
+4235251770160613000830130983063100984485301111420207302571915861863284245935054969687285090784775829404258632032504825073887582
+6407248272722201582954889873840796724288126199508498948167917317499903480984445960848498060154084891463403285778107348687889003
+4953941330396268815099409977237615027521463257528034758197037642240947224961515275989640733601052280398818164960445717239008728
+4426630124553142687273205330644281511721380282097626819427510520776002629092574526215543555846304555626987349130475830717662512
+2679622415503744585776560549326024439456730222065789254179516934309405880579097989297964155354764447981652276792153719461894070
+6549452078295195952851972101892868752466073329081552637836554870868329745518970415001754631788228704301414087107528862687179382
+3095714010946058367115405111675588241660359378724218257897889232511664785827286570897205547229279697287663245465265895194075831
+9805465298621739062011152177896594580714703932025865262409510756369094551491315344002976208292437754134178483455044310999687172
+5635853083465443752399385809613532628000929554168679920157180193163062291041706935484519604033746044464716659982230583915172977
+1397085494342438160066950214161726216316797535747161972858218528442291370670389809452231490128596440810108729216233152926963393
+8718938957831579949398261083744948669476176529513240710990560722588644755296402086806852345746538236347718030640062631744819555
+9204989031916871283227517942830744003831314993547893753197955379403077174291901637842637655437310798500528596483721526174221178
+4510621681082500438705444746385938892179962383128718253236867948364044872547102979732643922151263657382171953178711857903512864
+3434625913079139632847162412927858083774910063803492872036606235419074389757800463882617655159555904544646003283714069095719127
+9422478480758793975004764634088848124200701219293815383644557399151474644429876593122326476162568364525117348282565684006439054
+6415412788931044743766779624337137193856769272687596658353208728053926044570228051289974744446738511898266628888688489033821326
+3857187055764486798882511807937125159502970249818799519647825055901143034107396715341111836431533491237288074873324479254847609
+1944275217447109672414805304798039892872048551668309961639053276921203694927946551682999672834794575568139407200344761188832584
+9228691574818073805866351085919567356330517627511140717776424135867621344167516969731782408297076690641510925488519425339786231
+2831239904815704920016412032913992948413502229392159186483640311971384616648328934218616172408437024641339341534952850417631408
+7800709599423404547224077175920136421077429331304204846667623312748910375272177983791546978316206296185604509872479031731294077
+6784795879386865023891006814459422181459242147354385223330262696056730516247499993593952360113613078289229711721789291466201911
+1558378948527819137236700414103122090944390583763494240148255786716027072401897565958932034145583789267171948650451004479200278
+5903365269957297061267790413012843976619330012086443873201405355132327717135407147467813950090532723390786355726062359803253439
+7629287528827946090011668159293077488731123501345393936384022425933097863996545653037874008416991412735073016080615679561676815
+3237960418959875052085168366152912866396485668534444686608623522780325138572281373258421046475238324527598957994900036953588632
+9883457218912143598750744649289916045155230666253998012127292069605955397882251577278616463161982956480851083203582599294132885
+8739605725967415654345383552272209454198363876790394143551885453633595477692847087747048445889713841117432214889427740276964122
+1808274594398149686259653460592417452536265711085053636183889817336547379067581749366999937190487929782077243956107305394452893
+2858306534503555758138192142342374976569912519114070071304001216131565171144485590883323767986065555672710513575942087665489357
+4757258115582473299797872077008431880804766429204591994348523186470015406253571125582684142251809933836340635261386229168816736
+9918555292750664784762306372865895993392873092492120139178044227677315162874458415577767229742354738329991177067335396671747156
+9915416169565774505455198608946138326580556663002878103141442158950284935423931276623631554768708518659417736110868144091121408
+7485024844800932215930566743200643612646843426043824587026297306446562930746643938917961270550045568670866510426684185886721448
+4920398501344484751530060228048138752162844188260697740262204586350188489261031255952257367650241279996726021255197979400713310
+0983903945365766675649828378701431579004857069167244696371192650313930100887222144395396003002837274898192175630515559492616368
+3277569441388072350944394279081011821982637576381780324461779633187405677617459795408379063310477462661505822241372624056397980
+2796195339856562934096874382820282192099707799004934067504550995736513197478848274092619553245513516215920528915358178045259427
+3947135872153511247151284668940911981933985156149720562664695031030349744372110088157223178406720212021960705751648342245477823
+8276198303392861443910819050105767637970397653898744484200995946877348235373325786715347188697829025445506211703973576651655150
+5882576032689008918318143363475006909501115410116941599853261283394744451901101910507633092078494500214632287815925595536310673
+7269241743888980922214944937348603959760552838607959592411748713582006971089673926445144319837129979120595791416170081356544964
+3311215693514569183444297282757452024106434743342415838798070572517431245405339373780763180400593713529558089381582197573125752
+4556878108283717136754864320383151773421100605854818531410424407658443836201366417280243912680383714161438889747985913112617159
+3825283938152818066103999819485641639048153915591788440799327104545750772861261496085802570014233362502408220258846139854490942
+3543037705426699624325696485612282411023745859388735341967646420985563945181345313960301854453402790876180716518598169356488497
+0055015399759018591540911328290609447855851641187622864276870240973176403939507548117764594583218172186919643238977138111158956
+2302146157347717928300258596580246250649908644352652697865369736710811431250945078622499892640698932203651495464626034751579299
+0465216581077322245370388400939469195489616593652097640401043603078806904801413336072374703228412879808024013691780444525050754
+9151727760868811886689437563229171390965138504950138407176506255752456724326383897323049258585289255126700265024238726662681731
+0098281899254404044904741984338800905867702052389334861534065540083641450439874866038625038945827791603161398328731872690722059
+6264530562489216043969280034408943083142765136686187837798682491792210809601751533837187815038112873969767271421029102693650921
+7670518311894906730059859298650685509520663627502700465860614043829130684092155123515969024766529965326820247830045239762876384
+1971827918374425559499103800305418434180845901819771222995898394549615763182780848478726307902754377493105414864115497763562067
+7293146824231836764324358936471102982745003549454252992884038807314576844595566006507289403671236553892547396334547842381936455
+3707012658412106034610065750021436552038057251146149724375405389299956024255098042568008242870114719254029045709055991603654930
+4543749521242879802728408392725236169206369176046813175364511678612424177154836269263324760122983569594445005273913013269664551
+5817700093174352547416009939112502133121085536020612539401905269863944981266637678387919942591042471679114800424206674615903746
+9928390417067700668674925186060124842260894166668581468768675095262594932684909013159566891337437296287921942274275342136808279
+1720526807320641693668140417766107453595978158154018754776221360462162393984770342801365549647871062173743896063916005240392253
+5161802386530577435326894842370519298812054283209695964545050386222673476579184628919106024296128426895608065795872894836272477
+9269809290510364760281346041981538977140734635535715877861564862122154561230471413453427434440292536928348809500100637413855174
+0657501300841813074935854851050163894991818276164751987873048063138250805404584707419292446697964047248725308217946641983844311
+8063478785147013188508380911686106501438761736788881545360437305874844044022285005421389985126661063912349587081288388003345466
+5080385912620164034274035663131591931589292314684519240800453976434478145811035864455399019210261903984106215732682395895799522
+0939020059406813121907073513079575778716665344964094359764782266431575550874973231091097656538411338304404129653958312868999842
+6732798933518323978985303323091966916070134400750942228988862433672654847071015762525448860254590537863809085645618465872667306
+0427846766351683194895724811056690695837239230026578986973494357639196637007765612283664140977141629336513743191474504552821790
+3228155682944358310924291228796943417467684350283874136741330013804595358442242749651649995689037646356343539795964269040555905
+6826145487746532059740843858150338835296508366342272235981293613561407683050389559856243442342524690245207486156018191382164551
+1327436225221742602074234993619036983345996345216008664910823535986496447271949044534929738194453356131648251656209560053354614
+0407290886807276555505472513777566509192309345071661761386510676177956004136233159240180697853305064135526857625954524710679122
+1431829687708285619275876929673787963838663779016128696006658789855078135858492072768308764926825429711165034052613724177837083
+7028553048202580189681827868563421125284289066186493489485470631057243002992982744971998313406439308961352814738730662842546474
+1661580089658576037549874036611720164076275368701553799369961428692585978010787204558502174932891500734632543309652429899761996
+9575856899639421670892327891209797029282817824375074240277705275435359082312316792956844954585652271368228646822716619012170165
+4690146795978834583378953218274128128954879679834962721495470431115747652300230454490265247933455376976025418712883919785265770
+4032584676449148273007032590154174755542691092611500872882432669889260868344191769763590664159630537010368972815582431630162563
+5692592732110530293190433213941741940871216528267789341138499704212959459631375151781937020467215223500973204249438057106028338
+1541214818072382006149334712979978351719934230083959861254175062060206728245934867359880240685020444293227864055618527079589472
+1439159705776204064690488345048299759772753492079024651663143703086754589449249599931908249754660757813918172727140178033198709
+7752381183500066741893133463291861429042158260704598873907314527361438231014952758222297919601552459311683576335125432073345960
+4158788096315630807867178963280856579732177587633674289101034755608242832707107748491269005626588055241208204418618388578035469
+1184416032139115028602210049000593619116279959516862765906011705138739437332038056873961010636018153261556031158803924660448426
+9834587809319862013631879808865489908412831755556199315250744409755028410760389172898604230817719091796600511778684843691064279
+7878372956127669698977302339079670592653146391325443980293253311254734925614678750486528888944734310378404782150993544089766813
+4482271911480681906845899905802627519765113355182171607609262740960268207890619067150293516596923655844247586174848972864721468
+9552003526630991149245651109495761934587784128507108647124483752936558263106644305431230364441437558819641682185001628863763328
+9406159315820904843204929487522677107941937076263988953382649335050929875295580457118791755887589396355358703932935557257606830
+2969493527901243167542109903168828628101917337300403325039813279857934939104326409957807201457446262732489661524241158979368142
+1833967145487476098973136162241392322964264292952490319901422154921305200229075272133864200487657774340560812039475075659326308
+1445298822625141627089594319278576573094647719202883678449230305616300998398218250958603519589651710614887336894157702428315107
+8911019753589361230572967964751571906635823516517521975275494263948066958905939807605210390275340148405377313480598158489558111
+3183749609096747980513864052412964607501407465024842349303716927046134047076464086834827581454812880653390898896534483223922702
+2047220404370553586495348686661844320582343653984119122227275984849504305399708851775077220602618170548438073982557547603633042
+5484875538490583169391720574953649919139069950121342298729189319935008363006908499817188567294646844902804708973781249800855552
+7421001424990409022663446235185073936721530809635245828159482916215742480785440259606637437758227633658889520747280770098045723
+6510075506635860479703887783619213078585799368504850589990946726994909109916359460180863720392604659818835051505356439580781411
+0959165291367850253561235537386721365762207442766902579631829064237987397582522884081947056330594794737026301952693630585102680
+6267281924773054128920399667616892395906931391070201721710734680164804934661829697133693962106573047827000567454860592220102084
+6351225785373403775734572811446819619019190839393144125015360556285521375890386016901082233720031340998488590003458019399286006
+8086983669350678861956334882898616321436714400384547300867927315159417274826609618496301870293049853960758679069277021904136960
+9865037759852510085988938641077600576537641357106366728530348981390205491195956901092388717027996104357442748303975082427786786
+7507248774842522159480897459767378325396763974897420116495369220388118224704985677597657612836164641593242643705906198310715923
+6020323897854469493762019753971728667497338537420217765895884555350482562903234559598367966289598307357713584270039680501758042
+2970682482901424731104641663111768757582340710358846705532647449734646971482108058532929343635001949578504462729212526976463810
+8406644630764947233594179128313043631264609165757699872474368034583055609364865453910940072958562666156078109884350362008700655
+9106501316131398908994689175684333822574784889714347654697727209736986308940910431037486363365667132654371414795819563310659169
+0137910472839714679161637852622472509459014895991142745425159229935069751019575455036034662579025492228994125955644298201357138
+2263663590472781654218931217059804728469684174302359039764853349702219977113201315914188584584955078222068657185984247622363558
+5695450824338155861977114741562006985207639935376048162114526556989656274727076392276059583216303897816482298413238883403403632
+0038975862485843345228895776545691226502347548540923009663654944132545600827380276828701039586345737400863528654887451057233197
+1285772332269416234665537910079978608222632602148452508934499816027147308767944385913555512454637610386856292966968437445496548
+1261330191618765210009782014085845073559775965093415001665110717532374517158996315004359428915981278340620344383170562473911188
+0755483943667647640579099438554263999127548734337936583257964438443463208543269429173892355146856191237124938489437234962714824
+9129303544439064208938552091032859116474732583566245269345387009587018850752964356086348467165770868170114265169858965115946288
+7279622065007376862875602615836848329672073134886504804366938182665036461895999032293214820132094992897811456738921945565996030
+4834236494451378286976564913106384851412866607459667235230175488097172277734513000370973157558689076209485032473704000163914074
+2906852713508769108670361019771730001144071549164484831831379004788411810506441972725735257048988599402331202363984166872400551
+4374843284474261559922201408952633150671870157517305411040726961843624607898601648184347808307024923212656070285299487288795732
+8117441033938778257340076295628604371272466046790715921004843853378457388333862596453687093388500288301007959254642621709441228
+8336419205482595246714478040728678515920231077940527413442313540990859460129785367310524821300597125039005330560255760446207185
+3407569957745240672748410048085824476146107644741791845367520753456514888607145322239479922742610070735465164422006326154369011
+8894279996606564122245246476739025836636961740221798143384506169709797876615015522415620193119156094455114077417058486277270353
+7131151035004395224877087554662361771017971918239145723682405673667071436258453271309611849685373102636336093172827546720740657
+8432145665345782054212385521456100690288045272048653500410117161030682916822394178179943934653293870095835416016828701651397729
+9807379993673315841883406823522043062628694861759093682354411179777001696451399181533177926653740164108712792568617753057780749
+7552198060883514609633356358462724322863739238474217533806217264897669042731651388657558396154686026363774639912794923252267503
+6291771443785740732590982981719905524567339994411151615939323485160260431350712239547320702908777027534814334898810771281406391
+8383725943909858701756050979518960102350055348726092344362770497395426060226252186716626586574811491995835598427931237638307288
+8507265667315900242180544608612147833573934012185340789193936346356941286917069481442515796977733286907179390046007293777378415
+8688298391307343027481331662068268845813946664921272848764804887244314914603468930763919183778517730411504413547554154855526591
+5310568546507610904043747230819248926074837842921381365456929822505503792963441504203788828448597610860322974517666735027993699
+8190512204618058514563016675739391233696406975567198996502543146118326981238682542313301537034074950744994938638623004424018628
+5962797353210542352910227068452267455627736914233254078275501019026029219977380762852165264848013890176220808626487330453830607
+1392715231741123546207682784414187261145744424815836598165304144212321073536110482416294352751979189695534837507189501132643925
+9547196873348778230662094351866444409683500705986806451682346762409749401895555972393170493498341109191510645940668680160665767
+9096955810744288162025152776265225979561511052982298941267330985571152782374720461772752985049704669084322641186449467889515212
+4360617959299125510229120098324080014685874269740158186892010379118371918256414709312045505595343772662619039003425826619680875
+8242651081630156918805572079983037638369031262141838260427869758050055377235638965872717517504788429694521145838583513263909672
+4433259455372438105974775408627724880736064277338137893108385178827104479149305047828800826485922049778207824411348676510055718
+8718825984885049258859271868511156347573558547616835487996237695354831720772501296121171500663173314753159506044722718279173640
+2709996430110563394535123371054969016136174141380219513450493806426805948941155396288218826477132071568170532718023856256400877
+4412955918580719390710872526700485018418160226844433869987075876676044792011973789419662798626013873183203506118837233134120481
+8772819562426148199715932002776622117594716096791960417797687467419822085071157480539482033047913473604918965910085487367720357
+4625085282706988812822930138218466374524023159847349699030998731244290316248877616127354994943514784160430249591960166158827428
+3012297335233487487686932791672504848939891571342804916267615897166810277253170819233520663757428230248104405100538854660927429
+9123919446207336590235297840044149569787830675448852079217813254125078565940555357151112153929694801251132171203795549941163920
+7476175369012980559938118310990110840174599144325883878065361105628152837782089093135806082805172562067617245231771061838879589
+4768469919871257284902195592516344833223851928691778696654759047583702848545509080899254152913598427216007302226235522358460750
+5223927757227044947866784478462919350895723643402842384138354740120256079056226884847266693352002580953694527348195695223607106
+4705073558122375415417200921965563405533347843275197814453910296613637292816403322858277400213988846375567124674868467361795016
+4745728385156852832029629080429064757351207656991841817680115495315482039644479548944488439788311653187692817074819840714497361
+5386314847182104599263810424039609228765878994123179215715094367283327303020988006589792974721368333841513658700314945433634456
+3685020221252259142980926069027074077129168059113331677771782227727933843623094566219277157186574916058687802285827552124321505
+0794558617931775588320039074320252238014802597836590634824227249703483529574186006183975509386000848443692647358501225142361167
+3942679708028160995866607265771564423203677879968679929985370044267348240320617033379072586756373490054605230219409903866795469
+7536599276764983130315949383875187945686502994166320326189211280377933687730984141460802381512939077916932152569652666724046409
+0292377825630966235158683241512971091944539929600065707699283877623772501033680549048220288927590692487589517712276010516389098
+4141777627623117777410741182897322646935774432337593489702909715834793849902052358894916963594941828827118210427424755222982593
+0263099400776234259640984881940007947968250580544744304077736076557953616095573458814306253535718606350692981623255928091096507
+0588327094996262431505059042095661828596107333578122924612340170790916991622052806671333685104366780235136494027277232872825498
+1523246308282008538061408160202517775966824053244715248653671495274650673682535042749033828795099010214859776685551489176975506
+5811209762314534687747281829159103097186141033482266881873367741901377849867980657673782571505747169485443159028925476795003998
+963436785863456565690613348237130676523955561372248056220702510606833697646989872355666869136182759934340379879840576201228LAST
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/index.html b/code/cpp-httplib-0.19.0/test/www/dir/index.html
new file mode 100644
index 00000000..be3c05f7
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/dir/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+</head>
+<body>
+  <a href="/dir/test.html">Test</a>
+  <a href="/hi">hi</a>
+</body>
+</html>
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/meson.build b/code/cpp-httplib-0.19.0/test/www/dir/meson.build
new file mode 100644
index 00000000..e88ec79f
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/dir/meson.build
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+configure_file(input: 'index.html', output: 'index.html', copy: true)
+configure_file(input: 'test.abcde', output: 'test.abcde', copy: true)
+configure_file(input: 'test.html',  output: 'test.html',  copy: true)
+configure_file(input: '1MB.txt',    output: '1MB.txt',    copy: true)
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/test.abcde b/code/cpp-httplib-0.19.0/test/www/dir/test.abcde
new file mode 100644
index 00000000..6a816546
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/dir/test.abcde
@@ -0,0 +1 @@
+abcde
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/test.html b/code/cpp-httplib-0.19.0/test/www/dir/test.html
new file mode 100644
index 00000000..6d70cd0e
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/dir/test.html
@@ -0,0 +1 @@
+test.html
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www/empty_file b/code/cpp-httplib-0.19.0/test/www/empty_file
new file mode 100644
index 00000000..e69de29b
diff --git a/code/cpp-httplib-0.19.0/test/www/file b/code/cpp-httplib-0.19.0/test/www/file
new file mode 100644
index 00000000..f73f3093
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/file
@@ -0,0 +1 @@
+file
diff --git a/code/cpp-httplib-0.19.0/test/www/meson.build b/code/cpp-httplib-0.19.0/test/www/meson.build
new file mode 100644
index 00000000..ed3d3577
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/meson.build
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2024 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+configure_file(input: 'empty_file', output: 'empty_file', copy: true)
+configure_file(input: 'file',       output: 'file',       copy: true)
+subdir('dir')
diff --git a/code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt b/code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt
new file mode 100644
index 00000000..3cc1ce7c
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt
@@ -0,0 +1 @@
+日本語コンテンツ
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www2/dir/index.html b/code/cpp-httplib-0.19.0/test/www2/dir/index.html
new file mode 100644
index 00000000..be3c05f7
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www2/dir/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+</head>
+<body>
+  <a href="/dir/test.html">Test</a>
+  <a href="/hi">hi</a>
+</body>
+</html>
diff --git a/code/cpp-httplib-0.19.0/test/www2/dir/meson.build b/code/cpp-httplib-0.19.0/test/www2/dir/meson.build
new file mode 100644
index 00000000..74fe7834
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www2/dir/meson.build
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+configure_file(input: 'index.html', output: 'index.html', copy: true)
+configure_file(input: 'test.html',  output: 'test.html',  copy: true)
diff --git a/code/cpp-httplib-0.19.0/test/www2/dir/test.html b/code/cpp-httplib-0.19.0/test/www2/dir/test.html
new file mode 100644
index 00000000..6d70cd0e
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www2/dir/test.html
@@ -0,0 +1 @@
+test.html
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www3/dir/index.html b/code/cpp-httplib-0.19.0/test/www3/dir/index.html
new file mode 100644
index 00000000..be3c05f7
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www3/dir/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+</head>
+<body>
+  <a href="/dir/test.html">Test</a>
+  <a href="/hi">hi</a>
+</body>
+</html>
diff --git a/code/cpp-httplib-0.19.0/test/www3/dir/meson.build b/code/cpp-httplib-0.19.0/test/www3/dir/meson.build
new file mode 100644
index 00000000..74fe7834
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www3/dir/meson.build
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
+#
+# SPDX-License-Identifier: MIT
+
+configure_file(input: 'index.html', output: 'index.html', copy: true)
+configure_file(input: 'test.html',  output: 'test.html',  copy: true)
diff --git a/code/cpp-httplib-0.19.0/test/www3/dir/test.html b/code/cpp-httplib-0.19.0/test/www3/dir/test.html
new file mode 100644
index 00000000..6d70cd0e
--- /dev/null
+++ b/code/cpp-httplib-0.19.0/test/www3/dir/test.html
@@ -0,0 +1 @@
+test.html
\ No newline at end of file
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 64c46a3e..c4520f0f 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -127,6 +127,7 @@ cvar_t	*precache;
 cvar_t	*com_target_game;
 cvar_t	*com_target_version;
 cvar_t	*com_target_demo;
+cvar_t	*com_updateCheckInterval;
 
 int protocol_version_demo;
 int protocol_version_full;
@@ -1918,6 +1919,9 @@ void Com_Init( char *commandLine ) {
 #ifdef LEGACY_PROTOCOL
 	com_legacyprotocol = Cvar_Get("com_legacyprotocol", va("%i", PROTOCOL_LEGACY_VERSION), CVAR_INIT);
 
+	com_updateCheckInterval = Cvar_Get("com_updateCheckInterval", "15", 0);
+    Cvar_CheckRange(com_updateCheckInterval, 5, 240, qtrue);
+
 	// Keep for compatibility with old mods / mods that haven't updated yet.
 	if(com_legacyprotocol->integer > 0)
 		Cvar_Get("protocol", com_legacyprotocol->string, CVAR_SERVERINFO | CVAR_ROM);
@@ -2455,6 +2459,8 @@ void Com_Frame( void ) {
 
 	Com_ReadFromPipe();
 
+    Sys_ProcessBackgroundTasks();
+
 	com_frameNumber++;
 }
 
@@ -3103,8 +3109,6 @@ int QDECL Com_strCompare( const void *a, const void *b )
 
 void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 {
-	const char* protocol;
-
     switch (target_game)
     {
     case TG_MOH:
diff --git a/code/qcommon/json.hpp b/code/qcommon/json.hpp
new file mode 100644
index 00000000..06da8153
--- /dev/null
+++ b/code/qcommon/json.hpp
@@ -0,0 +1,22875 @@
+/*
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.7.3
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3
+#define NLOHMANN_JSON_VERSION_MINOR 7
+#define NLOHMANN_JSON_VERSION_PATCH 3
+
+#include <algorithm> // all_of, find, for_each
+#include <cassert> // assert
+#include <ciso646> // and, not, or
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#include <iosfwd> // istream, ostream
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <numeric> // accumulate
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+
+
+#include <utility>
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <ciso646> // and, not
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+
+#include <exception> // exception
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+
+#include <cstddef> // size_t
+
+namespace nlohmann
+{
+namespace detail
+{
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#include <utility> // pair
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ *
+ * To the extent possible under law, the author(s) have dedicated all
+ * copyright and related and neighboring rights to this software to
+ * the public domain worldwide. This software is distributed without
+ * any warranty.
+ *
+ * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * SPDX-License-Identifier: CC0-1.0
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 11)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 11
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(__COMPCERT__)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus) && JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#  define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#else
+#  define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,3,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(__cplusplus) && (__cplusplus >= 201703L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(17,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_UNREACHABLE() __assume(0)
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_UNREACHABLE() std::_nassert(0)
+    #else
+        #define JSON_HEDLEY_UNREACHABLE() _nassert(0)
+    #endif
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return value
+#elif defined(EXIT_FAILURE)
+    #define JSON_HEDLEY_UNREACHABLE() abort()
+#else
+    #define JSON_HEDLEY_UNREACHABLE()
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return value
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+#endif
+
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#elif \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && !defined(JSON_HEDLEY_ARM_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
+    #define JSON_HEDLEY_ASSUME(expr) ((void) ((expr) ? 1 : (__builtin_unreachable(), 1)))
+#else
+    #define JSON_HEDLEY_ASSUME(expr) ((void) (expr))
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable(!!(expr))
+#endif
+#if \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(expr, value, probability)
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1, probability)
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0, probability)
+#  define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#if !defined(JSON_HEDLEY_BUILTIN_UNPREDICTABLE)
+    #define JSON_HEDLEY_BUILTIN_UNPREDICTABLE(expr) __builtin_expect_with_probability(!!(expr), 1, 0.5)
+#endif
+#elif \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect(!!(expr), (expected)) : (((void) (expected)), !!(expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        JSON_HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        JSON_HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (((void) (expected)), !!(expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+    #define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0)
+    #define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif JSON_HEDLEY_TI_VERSION_CHECK(7,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+    #define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+    #define JSON_HEDLEY_PRIVATE
+    #define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+    #define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+    #if \
+        JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+        JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+        JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+        JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+        JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+        JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+        JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+        (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_EABI__) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+        #define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+        #define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+    #else
+        #define JSON_HEDLEY_PRIVATE
+        #define JSON_HEDLEY_PUBLIC
+    #endif
+    #define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(fallthrough,7,0,0) && !defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && !defined(JSON_HEDLEY_SUNPRO_VERSION) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+       JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  (defined(__cplusplus) && JSON_HEDLEY_TI_VERSION_CHECK(8,3,0))
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (*((T*) &(expr)))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_CPP_CAST(T, expr) static_cast<T>(expr)
+#else
+    #define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum)
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+    #define JSON_HAS_CPP_14
+#endif
+
+// disable float-equal warnings on GCC/clang
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+// allow to disable exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/*!
+@brief general exception of the @ref basic_json class
+
+This class is an extension of `std::exception` objects with a member @a id for
+exception ids. It is used as the base class for all exceptions thrown by the
+@ref basic_json class. This class can hence be used as "wildcard" to catch
+exceptions.
+
+Subclasses:
+- @ref parse_error for exceptions indicating a parse error
+- @ref invalid_iterator for exceptions indicating errors with iterators
+- @ref type_error for exceptions indicating executing a member function with
+                  a wrong type
+- @ref out_of_range for exceptions indicating access out of the defined range
+- @ref other_error for exceptions indicating other library errors
+
+@internal
+@note To have nothrow-copy-constructible exceptions, we internally use
+      `std::runtime_error` which can cope with arbitrary-length error messages.
+      Intermediate strings are built with static functions and then passed to
+      the actual constructor.
+@endinternal
+
+@liveexample{The following code shows how arbitrary library exceptions can be
+caught.,exception}
+
+@since version 3.0.0
+*/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id;
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/*!
+@brief exception indicating a parse error
+
+This exception is thrown by the library when a parse error occurs. Parse errors
+can occur during the deserialization of JSON text, CBOR, MessagePack, as well
+as when using JSON Patch.
+
+Member @a byte holds the byte index of the last read character in the input
+file.
+
+Exceptions have ids 1xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
+json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
+json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
+json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
+json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
+json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
+json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
+json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
+json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
+json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
+
+@note For an input with n bytes, 1 is the index of the first character and n+1
+      is the index of the terminating null byte or the end of file. This also
+      holds true when reading a byte vector (CBOR or MessagePack).
+
+@liveexample{The following code shows how a `parse_error` exception can be
+caught.,parse_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        position_string(pos) + ": " + what_arg;
+        return parse_error(id_, pos.chars_read_total, w.c_str());
+    }
+
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
+                        ": " + what_arg;
+        return parse_error(id_, byte_, w.c_str());
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return " at line " + std::to_string(pos.lines_read + 1) +
+               ", column " + std::to_string(pos.chars_read_current_line);
+    }
+};
+
+/*!
+@brief exception indicating errors with iterators
+
+This exception is thrown if iterators passed to a library function do not match
+the expected semantics.
+
+Exceptions have ids 2xx.
+
+name / id                           | example message | description
+----------------------------------- | --------------- | -------------------------
+json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
+json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
+json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
+json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
+json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
+json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
+json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
+json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
+json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
+
+@liveexample{The following code shows how an `invalid_iterator` exception can be
+caught.,invalid_iterator}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class invalid_iterator : public exception
+{
+  public:
+    static invalid_iterator create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("invalid_iterator", id_) + what_arg;
+        return invalid_iterator(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating executing a member function with a wrong type
+
+This exception is thrown in case of a type error; that is, a library function is
+executed on a JSON value whose type does not match the expected semantics.
+
+Exceptions have ids 3xx.
+
+name / id                     | example message | description
+----------------------------- | --------------- | -------------------------
+json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
+json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
+json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
+json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
+json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
+json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
+json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
+json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
+json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
+json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
+json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
+json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
+json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
+json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
+json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
+json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
+
+@liveexample{The following code shows how a `type_error` exception can be
+caught.,type_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class type_error : public exception
+{
+  public:
+    static type_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("type_error", id_) + what_arg;
+        return type_error(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating access out of the defined range
+
+This exception is thrown in case a library function is called on an input
+parameter that exceeds the expected range, for instance in case of array
+indices or nonexisting object keys.
+
+Exceptions have ids 4xx.
+
+name / id                       | example message | description
+------------------------------- | --------------- | -------------------------
+json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
+json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
+json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
+json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
+json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. |
+json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
+json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
+
+@liveexample{The following code shows how an `out_of_range` exception can be
+caught.,out_of_range}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class out_of_range : public exception
+{
+  public:
+    static out_of_range create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("out_of_range", id_) + what_arg;
+        return out_of_range(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating other library errors
+
+This exception is thrown in case of errors that cannot be classified with the
+other exception types.
+
+Exceptions have ids 5xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+
+@liveexample{The following code shows how an `other_error` exception can be
+caught.,other_error}
+
+@since version 3.0.0
+*/
+class other_error : public exception
+{
+  public:
+    static other_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("other_error", id_) + what_arg;
+        return other_error(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+#include <ciso646> // not
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+
+namespace nlohmann
+{
+namespace detail
+{
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+// implementation of C++14 index_sequence and affiliates
+// source: https://stackoverflow.com/a/32223343
+template<std::size_t... Ints>
+struct index_sequence
+{
+    using type = index_sequence;
+    using value_type = std::size_t;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+template<class Sequence1, class Sequence2>
+struct merge_and_renumber;
+
+template<std::size_t... I1, std::size_t... I2>
+struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
+        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
+
+template<std::size_t N>
+struct make_index_sequence
+    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
+      typename make_index_sequence < N - N / 2 >::type > {};
+
+template<> struct make_index_sequence<0> : index_sequence<> {};
+template<> struct make_index_sequence<1> : index_sequence<0> {};
+
+template<typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+#include <ciso646> // not
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template <typename ...Ts> using void_t = typename make_void<Ts...>::type;
+} // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename It, typename = void>
+struct iterator_types {};
+
+template <typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template <typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template <typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template <typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+// http://en.cppreference.com/w/cpp/experimental/is_detected
+namespace nlohmann
+{
+namespace detail
+{
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template <class Default,
+          class AlwaysVoid,
+          template <class...> class Op,
+          class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template <class Default, template <class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template <template <class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template <template <class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template <class Default, template <class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template <class Default, template <class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template <class Expected, template <class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template <class To, template <class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/json_fwd.hpp>
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer>
+class basic_json;
+
+/*!
+@brief JSON Pointer
+
+A JSON pointer defines a string syntax for identifying a specific value
+within a JSON document. It can be used with functions `at` and
+`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+
+@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+
+@since version 2.0.0
+*/
+template<typename BasicJsonType>
+class json_pointer;
+
+/*!
+@brief default JSON class
+
+This type is the default specialization of the @ref basic_json class which
+uses the standard template types.
+
+@since version 1.0.0
+*/
+using json = basic_json<>;
+}  // namespace nlohmann
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+namespace nlohmann
+{
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template <typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template <typename T>
+using key_type_t = typename T::key_type;
+
+template <typename T>
+using value_type_t = typename T::value_type;
+
+template <typename T>
+using difference_type_t = typename T::difference_type;
+
+template <typename T>
+using pointer_t = typename T::pointer;
+
+template <typename T>
+using reference_t = typename T::reference;
+
+template <typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template <typename T>
+using iterator_t = typename T::iterator;
+
+template <typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template <typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template <typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template <typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+template <typename BasicJsonType, typename T>
+struct has_from_json<BasicJsonType, T,
+           enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template <typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template <typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template <typename BasicJsonType, typename T>
+struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+
+///////////////////
+// is_ functions //
+///////////////////
+
+template <typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template <typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+// source: https://stackoverflow.com/a/37193089/4116453
+
+template <typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template <typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template <typename BasicJsonType, typename CompatibleObjectType,
+          typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t<is_detected<mapped_type_t, CompatibleObjectType>::value and
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        std::is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value and
+        std::is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template <typename BasicJsonType, typename ConstructibleObjectType,
+          typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t<is_detected<mapped_type_t, ConstructibleObjectType>::value and
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (std::is_default_constructible<ConstructibleObjectType>::value and
+         (std::is_move_assignable<ConstructibleObjectType>::value or
+          std::is_copy_assignable<ConstructibleObjectType>::value) and
+         (std::is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value and
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) or
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value or
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template <typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template <typename BasicJsonType, typename CompatibleStringType,
+          typename = void>
+struct is_compatible_string_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type_impl <
+    BasicJsonType, CompatibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, CompatibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_compatible_string_type
+    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template <typename BasicJsonType, typename ConstructibleStringType,
+          typename = void>
+struct is_constructible_string_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type_impl <
+    BasicJsonType, ConstructibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, ConstructibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<ConstructibleStringType,
+        typename BasicJsonType::string_t>::value;
+};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template <typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t<is_detected<value_type_t, CompatibleArrayType>::value and
+    is_detected<iterator_t, CompatibleArrayType>::value and
+// This is needed because json_reverse_iterator has a ::iterator type...
+// Therefore it is detected as a CompatibleArrayType.
+// The real fix would be to have an Iterable concept.
+    not is_iterator_traits<
+    iterator_traits<CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        std::is_constructible<BasicJsonType,
+        typename CompatibleArrayType::value_type>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<not std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value and
+    std::is_default_constructible<ConstructibleArrayType>::value and
+(std::is_move_assignable<ConstructibleArrayType>::value or
+ std::is_copy_assignable<ConstructibleArrayType>::value) and
+is_detected<value_type_t, ConstructibleArrayType>::value and
+is_detected<iterator_t, ConstructibleArrayType>::value and
+is_complete_type<
+detected_t<value_type_t, ConstructibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        // This is needed because json_reverse_iterator has a ::iterator type,
+        // furthermore, std::back_insert_iterator (and other iterators) have a
+        // base class `iterator`... Therefore it is detected as a
+        // ConstructibleArrayType. The real fix would be to have an Iterable
+        // concept.
+        not is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value and
+
+        (std::is_same<typename ConstructibleArrayType::value_type,
+         typename BasicJsonType::array_t::value_type>::value or
+         has_from_json<BasicJsonType,
+         typename ConstructibleArrayType::value_type>::value or
+         has_non_default_from_json <
+         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
+};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType,
+          typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t<std::is_integral<RealIntegerType>::value and
+    std::is_integral<CompatibleNumberIntegerType>::value and
+    not std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        std::is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value and
+        CompatibleLimits::is_integer and
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template <typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B1> struct conjunction<B1> : B1 { };
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...>
+: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+template <typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template <typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#include <array> // array
+#include <ciso646> // and
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    discarded         ///< discarded by the the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+
+@since version 1.0.0
+*/
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    static constexpr std::array<std::uint8_t, 8> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+    return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index];
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
+    }
+    n = nullptr;
+}
+
+// overloads for basic_json template parameters
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
+                     not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                     int> = 0>
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename ConstructibleStringType,
+    enable_if_t <
+        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value and
+        not std::is_same<typename BasicJsonType::string_t,
+                         ConstructibleStringType>::value,
+        int > = 0 >
+void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.resize(j.size());
+    std::copy(j.begin(), j.end(), std::begin(l));
+}
+
+template <typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType>
+void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template <typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                          priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template <typename BasicJsonType, typename ConstructibleArrayType,
+          enable_if_t <
+              is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_basic_json<ConstructibleArrayType>::value,
+              int > = 0 >
+
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " +
+                                      std::string(j.type_name())));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
+    }
+
+    ConstructibleObjectType ret;
+    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t <
+             std::is_arithmetic<ArithmeticType>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+             int> = 0>
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+{
+    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+{
+    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+          typename = enable_if_t<not std::is_constructible<
+                                     typename BasicJsonType::string_t, Key>::value>>
+void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template <typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+          typename = enable_if_t<not std::is_constructible<
+                                     typename BasicJsonType::string_t, Key>::value>>
+void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T& val) const
+    noexcept(noexcept(from_json(j, val)))
+    -> decltype(from_json(j, val), void())
+    {
+        return from_json(j, val);
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace
+{
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
+} // namespace
+} // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+
+#include <algorithm> // copy
+#include <ciso646> // or, and, not
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    target = std::to_string(value);
+}
+template <typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type * ;
+    using reference = value_type & ;
+    using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor;
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    const string_type empty_str = "";
+
+  public:
+    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
+
+    /// dereference operator (needed for range-based for)
+    iteration_proxy_value& operator*()
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        assert(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::reference container;
+
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.end());
+    }
+};
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template <std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template <std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template <typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+            : public std::integral_constant<std::size_t, 2> {};
+
+template <std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+} // namespace std
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////
+// constructors //
+//////////////////
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_type = value_t::boolean;
+        j.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleStringType,
+             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_type = value_t::number_float;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_type = value_t::number_unsigned;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_type = value_t::number_integer;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = arr;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleArrayType,
+             enable_if_t<not std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+        j.m_type = value_t::array;
+        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        }
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = obj;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleObjectType,
+             enable_if_t<not std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_type = value_t::object;
+        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template <typename BasicJsonType, typename CompatibleArrayType,
+          enable_if_t<is_compatible_array_type<BasicJsonType,
+                      CompatibleArrayType>::value and
+                      not is_compatible_object_type<
+                          BasicJsonType, CompatibleArrayType>::value and
+                      not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
+                      not is_basic_json<CompatibleArrayType>::value,
+                      int> = 0>
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t<not std::is_constructible<typename BasicJsonType::string_t,
+                const T(&)[N]>::value,
+                int> = 0 >
+void to_json(BasicJsonType& j, const T(&arr)[N])
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template < typename BasicJsonType, typename T,
+           enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `to_json` function
+namespace
+{
+constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
+} // namespace
+} // namespace nlohmann
+
+
+namespace nlohmann
+{
+
+template<typename, typename>
+struct adl_serializer
+{
+    /*!
+    @brief convert a JSON value to any value type
+
+    This function is usually called by the `get()` function of the
+    @ref basic_json class (either explicit or via conversion operators).
+
+    @param[in] j        JSON value to read from
+    @param[in,out] val  value to write to
+    */
+    template<typename BasicJsonType, typename ValueType>
+    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /*!
+    @brief convert any value type to a JSON value
+
+    This function is usually called by the constructors of the @ref basic_json
+    class.
+
+    @param[in,out] j  JSON value to write to
+    @param[in] val    value to read from
+    */
+    template <typename BasicJsonType, typename ValueType>
+    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<ValueType>(val));
+    }
+};
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cassert> // assert
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+#include <array> // array
+#include <cassert> // assert
+#include <cstddef> // size_t
+#include <cstdio> //FILE *
+#include <cstring> // strlen
+#include <istream> // istream
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+
+////////////////////
+// input adapters //
+////////////////////
+
+/*!
+@brief abstract input adapter interface
+
+Produces a stream of std::char_traits<char>::int_type characters from a
+std::istream, a buffer, or some other input type. Accepts the return of
+exactly one non-EOF character for future input. The int_type characters
+returned consist of all valid char values as positive values (typically
+unsigned char), plus an EOF value outside that range, specified by the value
+of the function std::char_traits<char>::eof(). This value is typically -1, but
+could be any arbitrary value which is not a valid char value.
+*/
+struct input_adapter_protocol
+{
+    /// get a character [0,255] or std::char_traits<char>::eof().
+    virtual std::char_traits<char>::int_type get_character() = 0;
+    virtual ~input_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
+
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter : public input_adapter_protocol
+{
+  public:
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f)  noexcept
+        : m_file(f)
+    {}
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = default;
+    ~file_input_adapter() override = default;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter : public input_adapter_protocol
+{
+  public:
+    ~input_stream_adapter() override
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        is.clear(is.rdstate() & std::ios::eofbit);
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(i), sb(*i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter(input_stream_adapter&&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, eg. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character() override
+    {
+        auto res = sb.sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (res == EOF)
+        {
+            is.clear(is.rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream& is;
+    std::streambuf& sb;
+};
+
+/// input adapter for buffer input
+class input_buffer_adapter : public input_adapter_protocol
+{
+  public:
+    input_buffer_adapter(const char* b, const std::size_t l) noexcept
+        : cursor(b), limit(b == nullptr ? nullptr : (b + l))
+    {}
+
+    // delete because of pointer members
+    input_buffer_adapter(const input_buffer_adapter&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
+    input_buffer_adapter(input_buffer_adapter&&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&&) = delete;
+    ~input_buffer_adapter() override = default;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        if (JSON_HEDLEY_LIKELY(cursor < limit))
+        {
+            assert(cursor != nullptr and limit != nullptr);
+            return std::char_traits<char>::to_int_type(*(cursor++));
+        }
+
+        return std::char_traits<char>::eof();
+    }
+
+  private:
+    /// pointer to the current character
+    const char* cursor;
+    /// pointer past the last character
+    const char* const limit;
+};
+
+template<typename WideStringType, size_t T>
+struct wide_string_input_helper
+{
+    // UTF-32
+    static void fill_buffer(const WideStringType& str,
+                            size_t& current_wchar,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (current_wchar == str.size())
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((wc >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename WideStringType>
+struct wide_string_input_helper<WideStringType, 2>
+{
+    // UTF-16
+    static void fill_buffer(const WideStringType& str,
+                            size_t& current_wchar,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (current_wchar == str.size())
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc or wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (current_wchar < str.size())
+                {
+                    const auto wc2 = static_cast<unsigned int>(str[current_wchar++]);
+                    const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    // unknown character
+                    ++current_wchar;
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+template<typename WideStringType>
+class wide_string_input_adapter : public input_adapter_protocol
+{
+  public:
+    explicit wide_string_input_adapter(const WideStringType& w) noexcept
+        : str(w)
+    {}
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(typename WideStringType::value_type)>();
+
+            assert(utf8_bytes_filled > 0);
+            assert(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        assert(utf8_bytes_filled > 0);
+        assert(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<WideStringType, T>::fill_buffer(str, current_wchar, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// the wstring to process
+    const WideStringType& str;
+
+    /// index of the current wchar in str
+    std::size_t current_wchar = 0;
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+class input_adapter
+{
+  public:
+    // native support
+    JSON_HEDLEY_NON_NULL(2)
+    input_adapter(std::FILE* file)
+        : ia(std::make_shared<file_input_adapter>(file)) {}
+    /// input adapter for input stream
+    input_adapter(std::istream& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    /// input adapter for input stream
+    input_adapter(std::istream&& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    input_adapter(const std::wstring& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::wstring>>(ws)) {}
+
+    input_adapter(const std::u16string& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::u16string>>(ws)) {}
+
+    input_adapter(const std::u32string& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::u32string>>(ws)) {}
+
+    /// input adapter for buffer
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b, std::size_t l)
+        : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
+
+    // derived support
+
+    /// input adapter for string literal
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b)
+        : input_adapter(reinterpret_cast<const char*>(b),
+                        std::strlen(reinterpret_cast<const char*>(b))) {}
+
+    /// input adapter for iterator range with contiguous storage
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    input_adapter(IteratorType first, IteratorType last)
+    {
+#ifndef NDEBUG
+        // assertion to check that the iterator range is indeed contiguous,
+        // see http://stackoverflow.com/a/35008842/266378 for more discussion
+        const auto is_contiguous = std::accumulate(
+                                       first, last, std::pair<bool, int>(true, 0),
+                                       [&first](std::pair<bool, int> res, decltype(*first) val)
+        {
+            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
+            return res;
+        }).first;
+        assert(is_contiguous);
+#endif
+
+        // assertion to check that each element is 1 byte long
+        static_assert(
+            sizeof(typename iterator_traits<IteratorType>::value_type) == 1,
+            "each element in the iterator range must have the size of 1 byte");
+
+        const auto len = static_cast<size_t>(std::distance(first, last));
+        if (JSON_HEDLEY_LIKELY(len > 0))
+        {
+            // there is at least one element: use the address of first
+            ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
+        }
+        else
+        {
+            // the address of first cannot be used: use nullptr
+            ia = std::make_shared<input_buffer_adapter>(nullptr, len);
+        }
+    }
+
+    /// input adapter for array
+    template<class T, std::size_t N>
+    input_adapter(T (&array)[N])
+        : input_adapter(std::begin(array), std::end(array)) {}
+
+    /// input adapter for contiguous container
+    template<class ContiguousContainer, typename
+             std::enable_if<not std::is_pointer<ContiguousContainer>::value and
+                            std::is_base_of<std::random_access_iterator_tag, typename iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
+                            int>::type = 0>
+    input_adapter(const ContiguousContainer& c)
+        : input_adapter(std::begin(c), std::end(c)) {}
+
+    operator input_adapter_t()
+    {
+        return ia;
+    }
+
+  private:
+    /// the actual adapter
+    input_adapter_t ia = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+
+#include <cassert> // assert
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    /// type for (signed) integers
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    /// type for unsigned integers
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    /// type for floating-point numbers
+    using number_float_t = typename BasicJsonType::number_float_t;
+    /// type for strings
+    using string_t = typename BasicJsonType::string_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief an floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    virtual ~json_sax() = default;
+};
+
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+    /*!
+    @param[in, out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const detail::exception& ex)
+    {
+        errored = true;
+        if (allow_exceptions)
+        {
+            // determine the proper exception type from the id
+            switch ((ex.id / 100) % 100)
+            {
+                case 1:
+                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
+                case 4:
+                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
+                // LCOV_EXCL_START
+                case 2:
+                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
+                case 3:
+                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
+                case 5:
+                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
+                default:
+                    assert(false);
+                    // LCOV_EXCL_STOP
+            }
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_value.array->back());
+        }
+
+        assert(ref_stack.back()->is_object());
+        assert(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() and JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep and ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back() and not callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+        {
+            // discard object
+            *ref_stack.back() = discarded;
+        }
+
+        assert(not ref_stack.empty());
+        assert(not keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (not ref_stack.empty() and ref_stack.back() and ref_stack.back()->is_object())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() and JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (not keep)
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        assert(not ref_stack.empty());
+        assert(not keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (not keep and not ref_stack.empty() and ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const detail::exception& ex)
+    {
+        errored = true;
+        if (allow_exceptions)
+        {
+            // determine the proper exception type from the id
+            switch ((ex.id / 100) % 100)
+            {
+                case 1:
+                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
+                case 4:
+                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
+                // LCOV_EXCL_START
+                case 2:
+                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
+                case 3:
+                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
+                case 5:
+                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
+                default:
+                    assert(false);
+                    // LCOV_EXCL_STOP
+            }
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        assert(not keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (not keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback or callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (not keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, &root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (not ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->push_back(std::move(value));
+            return {true, &(ref_stack.back()->m_value.array->back())};
+        }
+
+        // object
+        assert(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        assert(not key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (not store_element)
+        {
+            return {false, nullptr};
+        }
+
+        assert(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t  /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t  /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+}  // namespace detail
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template <typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template <typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template <typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template <typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template <typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template <typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template <typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template <typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template <typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template <typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template <typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template <typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t,
+        string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template <typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using json_sax_t = SAX;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        assert(ia);
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default;
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default;
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+
+    @return
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal();
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+                result = parse_ubjson_internal();
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result and strict)
+        {
+            if (format == input_format_t::ubjson)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(),
+                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief determine system byte order
+
+    @return true if and only if system's byte order is little endian
+
+    @note from http://stackoverflow.com/a/1001328/266378
+    */
+    static constexpr bool little_endianess(int num = 1) noexcept
+    {
+        return *reinterpret_cast<char*>(&num) == 1;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size;
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<char>(current);
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) and get() != std::char_traits<char>::eof();
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const int element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number;
+                return get_number<double, true>(input_format_t::bson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len;
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, value) and sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value;
+                return get_number<std::int64_t, true>(input_format_t::bson, value) and sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
+                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+        while (int element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(not get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (not is_array and not sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size;
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char = true)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) and sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(std::size_t(-1));
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(std::size_t(-1));
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const int byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const int byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    assert(0 <= exp and exp <= 32);
+                    assert(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number;
+                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number;
+                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (not get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or std::size_t(-1) for an
+                    array of indefinite size
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal(false)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or std::size_t(-1) for an
+                    object of indefinite size
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) and sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xCA: // float 32
+            {
+                float number;
+                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number;
+                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not get_msgpack_string(key) or not sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(not parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            default:
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
+        }
+    }
+
+    /*!
+    @param[out] result  determined size
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result)
+    {
+        switch (get_ignore_noop())
+        {
+            case 'U':
+            {
+                std::uint8_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
+            }
+        }
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, int>& result)
+    {
+        result.first = string_t::npos; // size
+        result.second = 0; // type
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
+            }
+
+            return get_ubjson_size_value(result.first);
+        }
+
+        if (current == '#')
+        {
+            return get_ubjson_size_value(result.first);
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const int prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char>::eof():  // EOF
+                return unexpect_eof(input_format_t::ubjson, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'd':
+            {
+                float number;
+                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number;
+                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
+                }
+                string_t s(1, static_cast<char>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) and sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, int> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, int> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key, false) or not sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char>::eof()` in that case.
+
+    @return character read from the input
+    */
+    int get()
+    {
+        ++chars_read;
+        return current = ia->get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    int get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianess, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != InputIsLittleEndian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        std::generate_n(std::back_inserter(result), len, [this, &success, &format]()
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(format, "string")))
+            {
+                success = false;
+            }
+            return static_cast<char>(current);
+        });
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+        return error_msg + " " + context + ": " + detail;
+    }
+
+  private:
+    /// input adapter
+    input_adapter_t ia = nullptr;
+
+    /// the current character
+    int current = std::char_traits<char>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////
+// lexer //
+///////////
+
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType>
+class lexer
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case lexer::token_type::value_unsigned:
+            case lexer::token_type::value_integer:
+            case lexer::token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    explicit lexer(detail::input_adapter_t&& adapter)
+        : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = delete;
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = delete;
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto loc = localeconv();
+        assert(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        assert(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' and current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' and current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' and current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<int> ranges)
+    {
+        assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current and current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 7159. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        assert(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' and get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(codepoint);
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<int>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<int>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<int>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 7159.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 7159. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | [error]  | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr;
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        assert(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        assert(current == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(get() != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    std::char_traits<char>::int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia->get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            token_string.push_back(std::char_traits<char>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            assert(not token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(int c)
+    {
+        token_buffer.push_back(std::char_traits<char>::to_char_type(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if ('\x00' <= c and c <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(c);
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB and get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 and not skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        do
+        {
+            get();
+        }
+        while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+                return scan_literal("true", 4, token_type::literal_true);
+            case 'f':
+                return scan_literal("false", 5, token_type::literal_false);
+            case 'n':
+                return scan_literal("null", 4, token_type::literal_null);
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    detail::input_adapter_t ia = nullptr;
+
+    /// the current character
+    std::char_traits<char>::int_type current = std::char_traits<char>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char decimal_point_char = '.';
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/parser.hpp>
+
+
+#include <cassert> // assert
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive decent parser.
+*/
+template<typename BasicJsonType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    enum class parse_event_t : uint8_t
+    {
+        /// the parser read `{` and started to process a JSON object
+        object_start,
+        /// the parser read `}` and finished processing a JSON object
+        object_end,
+        /// the parser read `[` and started to process a JSON array
+        array_start,
+        /// the parser read `]` and finished processing a JSON array
+        array_end,
+        /// the parser read a key of a value in an object
+        key,
+        /// the parser finished reading a JSON value
+        value
+    };
+
+    using parser_callback_t =
+        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
+    /// a parser reading from an input adapter
+    explicit parser(detail::input_adapter_t&& adapter,
+                    const parser_callback_t cb = nullptr,
+                    const bool allow_exceptions_ = true)
+        : callback(cb), m_lexer(std::move(adapter)), allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict and (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict and (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template <typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result and strict and (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(),
+                                            exception_message(token_type::end_of_input, "value")));
+        }
+
+        return result;
+    }
+
+  private:
+    template <typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (not skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(not sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::value_string, "object key")));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(not sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::name_separator, "object separator")));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(not sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(not std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(not sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::uninitialized, "value")));
+                    }
+
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::literal_or_value, "value")));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    assert(not states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_array, "array")));
+            }
+            else  // object
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse key
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::value_string, "object key")));
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(not sax->key(m_lexer.get_string())))
+                    {
+                        return false;
+                    }
+
+                    // parse separator (:)
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::name_separator, "object separator")));
+                    }
+
+                    // parse values
+                    get_token();
+                    continue;
+                }
+
+                // closing }
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not sax->end_object()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this object. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    assert(not states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_object, "object")));
+            }
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (not context.empty())
+        {
+            error_msg += "while parsing " + context + " ";
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+                         m_lexer.get_token_string() + "'";
+        }
+        else
+        {
+            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+namespace nlohmann
+{
+namespace detail
+{
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator++(int) noexcept
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator--(int) noexcept
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+
+
+#include <ciso646> // not
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl
+{
+    /// allow basic_json to access private members
+    friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+
+  public:
+
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    /// default constructor
+    iter_impl() = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  private:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator++(int)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator--(int)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator==(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator!=(const iter_impl& other) const
+    {
+        return not operator==(other);
+    }
+
+    /*!
+    @brief  comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return not other.operator < (*this);
+    }
+
+    /*!
+    @brief  comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return not operator<=(other);
+    }
+
+    /*!
+    @brief  comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return not operator<(other);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief  return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief  access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief  return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        assert(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+    }
+
+    /*!
+    @brief  return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  private:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator const operator++(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator const operator--(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_pointer.hpp>
+
+
+#include <algorithm> // all_of
+#include <cassert> // assert
+#include <cctype> // isdigit
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+template<typename BasicJsonType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+  public:
+    /*!
+    @brief create JSON pointer
+
+    Create a JSON pointer according to the syntax described in
+    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+    @param[in] s  string representing the JSON pointer; if omitted, the empty
+                  string is assumed which references the whole JSON value
+
+    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
+                           not begin with a slash (`/`); see example below
+
+    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
+    not followed by `0` (representing `~`) or `1` (representing `/`); see
+    example below
+
+    @liveexample{The example shows the construction several valid JSON pointers
+    as well as the exceptional behavior.,json_pointer}
+
+    @since version 2.0.0
+    */
+    explicit json_pointer(const std::string& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /*!
+    @brief return a string representation of the JSON pointer
+
+    @invariant For each JSON pointer `ptr`, it holds:
+    @code {.cpp}
+    ptr == json_pointer(ptr.to_string());
+    @endcode
+
+    @return a string representation of the JSON pointer
+
+    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
+
+    @since version 2.0.0
+    */
+    std::string to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               std::string{},
+                               [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + escape(b);
+        });
+    }
+
+    /// @copydoc to_string()
+    operator std::string() const
+    {
+        return to_string();
+    }
+
+    /*!
+    @brief append another JSON pointer at the end of this JSON pointer
+
+    @param[in] ptr  JSON pointer to append
+    @return JSON pointer with @a ptr appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /*!
+    @brief append an unescaped reference token at the end of this JSON pointer
+
+    @param[in] token  reference token to append
+    @return JSON pointer with @a token appended without escaping @a token
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::string token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /*!
+    @brief append an array index at the end of this JSON pointer
+
+    @param[in] array_index  array index to append
+    @return JSON pointer with @a array_index appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::size_t array_index)
+    {
+        return *this /= std::to_string(array_index);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+
+    @param[in] lhs  JSON pointer
+    @param[in] rhs  JSON pointer
+    @return a new JSON pointer with @a rhs appended to @a lhs
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a lhs and @a rhs.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] token  reference token
+    @return a new JSON pointer with unescaped @a token appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::string token)
+    {
+        return json_pointer(ptr) /= std::move(token);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] array_index  array index
+    @return a new JSON pointer with @a array_index appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::size_t) to append an array index
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index)
+    {
+        return json_pointer(ptr) /= array_index;
+    }
+
+    /*!
+    @brief returns the parent of this JSON pointer
+
+    @return parent of this JSON pointer; in case this JSON pointer is the root,
+            the root itself is returned
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @liveexample{The example shows the result of `parent_pointer` for different
+    JSON Pointers.,json_pointer__parent_pointer}
+
+    @since version 3.6.0
+    */
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /*!
+    @brief remove last reference token
+
+    @pre not `empty()`
+
+    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /*!
+    @brief return last reference token
+
+    @pre not `empty()`
+    @return last reference token
+
+    @liveexample{The example shows the usage of `back`.,json_pointer__back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    const std::string& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /*!
+    @brief append an unescaped token at the end of the reference pointer
+
+    @param[in] token  token to add
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows the result of `push_back` for different
+    JSON Pointers.,json_pointer__push_back}
+
+    @since version 3.6.0
+    */
+    void push_back(const std::string& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @copydoc push_back(const std::string&)
+    void push_back(std::string&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /*!
+    @brief return whether pointer points to the root document
+
+    @return true iff the JSON pointer points to the root document
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example shows the result of `empty` for different JSON
+    Pointers.,json_pointer__empty}
+
+    @since version 3.6.0
+    */
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    */
+    static int array_index(const std::string& s)
+    {
+        std::size_t processed_chars = 0;
+        const int res = std::stoi(s, &processed_chars);
+
+        // check if the string was completely read
+        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+        }
+
+        return res;
+    }
+
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        auto result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    JSON_TRY
+                    {
+                        result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums or reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        JSON_TRY
+                        {
+                            ptr = &ptr->operator[](
+                                static_cast<size_type>(array_index(reference_token)));
+                        }
+                        JSON_CATCH(std::invalid_argument&)
+                        {
+                            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                        }
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // note: at performs range check
+                    JSON_TRY
+                    {
+                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // use unchecked array access
+                    JSON_TRY
+                    {
+                        ptr = &ptr->operator[](
+                            static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // note: at performs range check
+                    JSON_TRY
+                    {
+                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    bool contains(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (not ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    JSON_TRY
+                    {
+                        const auto idx = static_cast<size_type>(array_index(reference_token));
+                        if (idx >= ptr->size())
+                        {
+                            // index out of range
+                            return false;
+                        }
+
+                        ptr = &ptr->operator[](idx);
+                        break;
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<std::string> split(const std::string& reference_string)
+    {
+        std::vector<std::string> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1,
+                                                   "JSON pointer must be empty or begin with '/' - was: '" +
+                                                   reference_string + "'"));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == std::string::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == std::string::npos)
+            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != std::string::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                assert(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 or
+                                         (reference_token[pos + 1] != '0' and
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
+                }
+            }
+
+            // finally, store the reference token
+            unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief replace all occurrences of a substring by another string
+
+    @param[in,out] s  the string to manipulate; changed so that all
+                   occurrences of @a f are replaced with @a t
+    @param[in]     f  the substring to replace with @a t
+    @param[in]     t  the string to replace @a f
+
+    @pre The search string @a f must not be empty. **This precondition is
+    enforced with an assertion.**
+
+    @since version 2.0.0
+    */
+    static void replace_substring(std::string& s, const std::string& f,
+                                  const std::string& t)
+    {
+        assert(not f.empty());
+        for (auto pos = s.find(f);                // find first occurrence of f
+                pos != std::string::npos;         // make sure f was found
+                s.replace(pos, f.size(), t),      // replace with t, and
+                pos = s.find(f, pos + t.size()))  // find next occurrence of f
+        {}
+    }
+
+    /// escape "~" to "~0" and "/" to "~1"
+    static std::string escape(std::string s)
+    {
+        replace_substring(s, "~", "~0");
+        replace_substring(s, "/", "~1");
+        return s;
+    }
+
+    /// unescape "~1" to tilde and "~0" to slash (order is important!)
+    static void unescape(std::string& s)
+    {
+        replace_substring(s, "~1", "/");
+        replace_substring(s, "~0", "~");
+    }
+
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    static void flatten(const std::string& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    {
+                        flatten(reference_string + "/" + std::to_string(i),
+                                value.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_value.object)
+                    {
+                        flatten(reference_string + "/" + escape(element.first), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief compares two JSON pointers for equality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is equal to @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator==(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return lhs.reference_tokens == rhs.reference_tokens;
+    }
+
+    /*!
+    @brief compares two JSON pointers for inequality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is not equal @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator!=(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return not (lhs == rhs);
+    }
+
+    /// the reference tokens
+    std::vector<std::string> reference_tokens;
+};
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/json_ref.hpp>
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value)), value_ref(&owned_value), is_rvalue(true)
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(const_cast<value_type*>(&value)), is_rvalue(false)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init), value_ref(&owned_value), is_rvalue(true)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...), value_ref(&owned_value),
+          is_rvalue(true) {}
+
+    // class should be movable only
+    json_ref(json_ref&&) = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (is_rvalue)
+        {
+            return std::move(*value_ref);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return *static_cast<value_type const*>(value_ref);
+    }
+
+    value_type const* operator->() const
+    {
+        return static_cast<value_type const*>(value_ref);
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type* value_ref = nullptr;
+    const bool is_rvalue;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <ios> // streamsize
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <ostream> // basic_ostream
+#include <string> // basic_string
+#include <vector> // vector
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        std::copy(s, s + length, std::back_inserter(v));
+    }
+
+  private:
+    std::vector<CharType>& v;
+};
+
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    output_adapter(std::vector<CharType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    {
+        assert(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_value.object);
+                break;
+            }
+
+            default:
+            {
+                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name())));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                oa->write_character(get_cbor_float_prefix(j.m_value.number_float));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                oa->write_character(get_msgpack_float_prefix(j.m_value.number_float));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type and not j.m_value.array->empty())
+                {
+                    assert(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required);
+                }
+
+                if (not use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type and not j.m_value.object->empty())
+                {
+                    assert(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                }
+
+                if (not use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409,
+                                            "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double, true>(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const std::uint64_t value)
+    {
+        if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64"));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), 0ul, [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_value.array);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            default:
+                assert(false);
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    @return The size of the BSON entry
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_value.array);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j.m_value.number_unsigned);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            default:
+                assert(false);
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul,
+                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_signed<NumberType>::value and
+                 not std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n and n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n));
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n and n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n and n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n and n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n and n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+
+    @note This function does not need to be 100% accurate when it comes to
+          integer limits. In case a number exceeds the limits of int64_t,
+          this will be detected by a later call to function
+          write_number_with_ubjson_prefix. Therefore, we return 'L' for any
+          value that does not fit the previous limits.
+    */
+    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                // no check and assume int64_t (see note above)
+                return 'L';
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                // no check and assume int64_t (see note above)
+                return 'L';
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @tparam NumberType the type of the number
+    @tparam OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+
+    @note This function needs to respect the system's endianess, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool OutputIsLittleEndian = false>
+    void write_number(const NumberType n)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec;
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value and std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value and std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_pod<CharType>::value, "CharType must be POD");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value and
+                   std::is_signed<char>::value and
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianess
+    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // and, or
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+
+
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // or, and, not
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template <typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        assert(x.e == y.e);
+        assert(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        assert(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        assert(delta >= 0);
+        assert(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template <typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    assert(std::isfinite(value));
+    assert(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 and E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    assert(e >= -1500);
+    assert(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    assert(index >= 0);
+    assert(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    assert(kAlpha <= cached.e + e + 64);
+    assert(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    else if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    else if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    else if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    else if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    else if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    else if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    else if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    else if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+    else
+    {
+        pow10 = 1;
+        return 1;
+    }
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    assert(len >= 1);
+    assert(dist <= delta);
+    assert(rest <= delta);
+    assert(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            and delta - rest >= ten_k
+            and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
+    {
+        assert(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    assert(M_plus.e >= kAlpha);
+    assert(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    assert(p1 > 0);
+
+    std::uint32_t pow10;
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        assert(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    assert(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        assert(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        assert(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    assert(m_plus.e == m_minus.e);
+    assert(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template <typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    assert(std::isfinite(value));
+    assert(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    assert(e > -1000);
+    assert(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    assert(min_exp < 0);
+    assert(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n and n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n - k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (n + 2);
+    }
+
+    if (0 < n and n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        assert(k > n);
+
+        std::memmove(buf + (n + 1), buf + n, static_cast<size_t>(k - n));
+        buf[n] = '.';
+        return buf + (k + 1);
+    }
+
+    if (min_exp < n and n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + -n), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2 + (-n) + k);
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k - 1));
+        buf[1] = '.';
+        buf += 1 + k;
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+} // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template <typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    assert(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+
+    assert(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    assert(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    assert(last - first >= kMaxExp + 2);
+    assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+
+    @param[in] val             value to serialize
+    @param[in] pretty_print    whether the output shall be pretty-printed
+    @param[in] indent_step     the indent level
+    @param[in] current_indent  the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val, const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+    }
+
+  private:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint;
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) or (ensure_ascii and (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                    static_cast<std::uint16_t>(codepoint));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            std::string sn(3, '\0');
+                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
+                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            assert(false);  // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (not ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    std::string sn(3, '\0');
+                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
+                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    assert(false);  // LCOV_EXCL_LINE
+            }
+        }
+    }
+
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template<typename NumberType, detail::enable_if_t<
+                 std::is_same<NumberType, number_unsigned_t>::value or
+                 std::is_same<NumberType, number_integer_t>::value,
+                 int> = 0>
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin();
+
+        const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars;
+
+        if (is_negative)
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(x);
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        assert(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (not std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 24 and std::numeric_limits<number_float_t>::max_exponent == 128) or
+              (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 53 and std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        char* begin = number_buffer.data();
+        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        assert(len > 0);
+        // check if buffer was large enough
+        assert(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            const auto end = std::remove(number_buffer.begin(),
+                                         number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            assert((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' and decimal_point != '.')
+        {
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' or c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        state = utf8d[256u + state * 16u + type];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        assert(false); // LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        assert(x < 0 and x < (std::numeric_limits<number_integer_t>::max)());
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+
+/*!
+@brief a class to store JSON values
+
+@tparam ObjectType type for JSON objects (`std::map` by default; will be used
+in @ref object_t)
+@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
+in @ref array_t)
+@tparam StringType type for JSON strings and object keys (`std::string` by
+default; will be used in @ref string_t)
+@tparam BooleanType type for JSON booleans (`bool` by default; will be used
+in @ref boolean_t)
+@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
+default; will be used in @ref number_integer_t)
+@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
+`uint64_t` by default; will be used in @ref number_unsigned_t)
+@tparam NumberFloatType type for JSON floating-point numbers (`double` by
+default; will be used in @ref number_float_t)
+@tparam AllocatorType type of the allocator to use (`std::allocator` by
+default)
+@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
+and `from_json()` (@ref adl_serializer by default)
+
+@requirement The class satisfies the following concept requirements:
+- Basic
+ - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
+   JSON values can be default constructed. The result will be a JSON null
+   value.
+ - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
+   A JSON value can be constructed from an rvalue argument.
+ - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
+   A JSON value can be copy-constructed from an lvalue expression.
+ - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
+   A JSON value van be assigned from an rvalue argument.
+ - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
+   A JSON value can be copy-assigned from an lvalue expression.
+ - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
+   JSON values can be destructed.
+- Layout
+ - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
+   JSON values have
+   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+   All non-static data members are private and standard layout types, the
+   class has no virtual functions or (virtual) base classes.
+- Library-wide
+ - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
+   JSON values can be compared with `==`, see @ref
+   operator==(const_reference,const_reference).
+ - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
+   JSON values can be compared with `<`, see @ref
+   operator<(const_reference,const_reference).
+ - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
+   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
+   other compatible types, using unqualified function call @ref swap().
+ - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
+   JSON values can be compared against `std::nullptr_t` objects which are used
+   to model the `null` value.
+- Container
+ - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
+   JSON values can be used like STL containers and provide iterator access.
+ - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
+   JSON values can be used like STL containers and provide reverse iterator
+   access.
+
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@internal
+@note ObjectType trick from http://stackoverflow.com/a/9860911
+@endinternal
+
+@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
+Format](http://rfc7159.net/rfc7159)
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+    friend ::nlohmann::json_pointer<basic_json>;
+    friend ::nlohmann::detail::parser<basic_json>;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer<basic_json>;
+    using parser = ::nlohmann::detail::parser<basic_json>;
+
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<basic_json>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    /// @copydoc detail::exception
+    using exception = detail::exception;
+    /// @copydoc detail::parse_error
+    using parse_error = detail::parse_error;
+    /// @copydoc detail::invalid_iterator
+    using invalid_iterator = detail::invalid_iterator;
+    /// @copydoc detail::type_error
+    using type_error = detail::type_error;
+    /// @copydoc detail::out_of_range
+    using out_of_range = detail::out_of_range;
+    /// @copydoc detail::other_error
+    using other_error = detail::other_error;
+
+    /// @}
+
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+
+    /*!
+    @brief returns the allocator associated with the container
+    */
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /*!
+    @brief returns version information on the library
+
+    This function returns a JSON object with information about the library,
+    including the version number and information on the platform and compiler.
+
+    @return JSON object holding version information
+    key         | description
+    ----------- | ---------------
+    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
+    `copyright` | The copyright line for the library as string.
+    `name`      | The name of the library as string.
+    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
+    `url`       | The URL of the project as string.
+    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
+
+    @liveexample{The following code shows an example output of the `meta()`
+    function.,meta}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @complexity Constant.
+
+    @since 2.1.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#ifdef __cplusplus
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+#if defined(JSON_HAS_CPP_14)
+    // Use transparent comparator if possible, combined with perfect forwarding
+    // on find() and count() calls prevents unnecessary string construction.
+    using object_comparator_t = std::less<>;
+#else
+    using object_comparator_t = std::less<StringType>;
+#endif
+
+    /*!
+    @brief a type for an object
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
+    > An object is an unordered collection of zero or more name/value pairs,
+    > where a name is a string and a value is a string, number, boolean, null,
+    > object, or array.
+
+    To store objects in C++, a type is defined by the template parameters
+    described below.
+
+    @tparam ObjectType  the container to store objects (e.g., `std::map` or
+    `std::unordered_map`)
+    @tparam StringType the type of the keys or names (e.g., `std::string`).
+    The comparison function `std::less<StringType>` is used to order elements
+    inside the container.
+    @tparam AllocatorType the allocator to use for objects (e.g.,
+    `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ObjectType (`std::map`), @a StringType
+    (`std::string`), and @a AllocatorType (`std::allocator`), the default
+    value for @a object_t is:
+
+    @code {.cpp}
+    std::map<
+      std::string, // key_type
+      basic_json, // value_type
+      std::less<std::string>, // key_compare
+      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
+    >
+    @endcode
+
+    #### Behavior
+
+    The choice of @a object_t influences the behavior of the JSON class. With
+    the default type, objects have the following behavior:
+
+    - When all names are unique, objects will be interoperable in the sense
+      that all software implementations receiving that object will agree on
+      the name-value mappings.
+    - When the names within an object are not unique, it is unspecified which
+      one of the values for a given key will be chosen. For instance,
+      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
+      `{"key": 2}`.
+    - Internally, name/value pairs are stored in lexicographical order of the
+      names. Objects will also be serialized (see @ref dump) in this order.
+      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
+      and serialized as `{"a": 2, "b": 1}`.
+    - When comparing objects, the order of the name/value pairs is irrelevant.
+      This makes objects interoperable in the sense that they will not be
+      affected by these differences. For instance, `{"b": 1, "a": 2}` and
+      `{"a": 2, "b": 1}` will be treated as equal.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the object's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON object.
+
+    #### Storage
+
+    Objects are stored as pointers in a @ref basic_json type. That is, for any
+    access to object values, a pointer of type `object_t*` must be
+    dereferenced.
+
+    @sa @ref array_t -- type for an array value
+
+    @since version 1.0.0
+
+    @note The order name/value pairs are added to the object is *not*
+    preserved by the library. Therefore, iterating an object may return
+    name/value pairs in a different order than they were originally stored. In
+    fact, keys will be traversed in alphabetical order as `std::map` with
+    `std::less` is used by default. Please note this behavior conforms to [RFC
+    7159](http://rfc7159.net/rfc7159), because any order implements the
+    specified "unordered" nature of JSON objects.
+    */
+    using object_t = ObjectType<StringType,
+          basic_json,
+          object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /*!
+    @brief a type for an array
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
+    > An array is an ordered sequence of zero or more values.
+
+    To store objects in C++, a type is defined by the template parameters
+    explained below.
+
+    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
+    `std::list`)
+    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ArrayType (`std::vector`) and @a
+    AllocatorType (`std::allocator`), the default value for @a array_t is:
+
+    @code {.cpp}
+    std::vector<
+      basic_json, // value_type
+      std::allocator<basic_json> // allocator_type
+    >
+    @endcode
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the array's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON array.
+
+    #### Storage
+
+    Arrays are stored as pointers in a @ref basic_json type. That is, for any
+    access to array values, a pointer of type `array_t*` must be dereferenced.
+
+    @sa @ref object_t -- type for an object value
+
+    @since version 1.0.0
+    */
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /*!
+    @brief a type for a string
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
+    > A string is a sequence of zero or more Unicode characters.
+
+    To store objects in C++, a type is defined by the template parameter
+    described below. Unicode values are split by the JSON class into
+    byte-sized characters during deserialization.
+
+    @tparam StringType  the container to store strings (e.g., `std::string`).
+    Note this container is used for keys/names in objects, see @ref object_t.
+
+    #### Default type
+
+    With the default values for @a StringType (`std::string`), the default
+    value for @a string_t is:
+
+    @code {.cpp}
+    std::string
+    @endcode
+
+    #### Encoding
+
+    Strings are stored in UTF-8 encoding. Therefore, functions like
+    `std::string::size()` or `std::string::length()` return the number of
+    bytes in the string rather than the number of characters or glyphs.
+
+    #### String comparison
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > Software implementations are typically required to test names of object
+    > members for equality. Implementations that transform the textual
+    > representation into sequences of Unicode code units and then perform the
+    > comparison numerically, code unit by code unit, are interoperable in the
+    > sense that implementations will agree in all cases on equality or
+    > inequality of two strings. For example, implementations that compare
+    > strings with escaped characters unconverted may incorrectly find that
+    > `"a\\b"` and `"a\u005Cb"` are not equal.
+
+    This implementation is interoperable as it does compare strings code unit
+    by code unit.
+
+    #### Storage
+
+    String values are stored as pointers in a @ref basic_json type. That is,
+    for any access to string values, a pointer of type `string_t*` must be
+    dereferenced.
+
+    @since version 1.0.0
+    */
+    using string_t = StringType;
+
+    /*!
+    @brief a type for a boolean
+
+    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
+    type which differentiates the two literals `true` and `false`.
+
+    To store objects in C++, a type is defined by the template parameter @a
+    BooleanType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a BooleanType (`bool`), the default value for
+    @a boolean_t is:
+
+    @code {.cpp}
+    bool
+    @endcode
+
+    #### Storage
+
+    Boolean values are stored directly inside a @ref basic_json type.
+
+    @since version 1.0.0
+    */
+    using boolean_t = BooleanType;
+
+    /*!
+    @brief a type for a number (integer)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store integer numbers in C++, a type is defined by the template
+    parameter @a NumberIntegerType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberIntegerType (`int64_t`), the default
+    value for @a number_integer_t is:
+
+    @code {.cpp}
+    int64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
+    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
+    that are out of range will yield over/underflow when used in a
+    constructor. During deserialization, too large or small integer numbers
+    will be automatically be stored as @ref number_unsigned_t or @ref
+    number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange of the exactly supported range [INT64_MIN,
+    INT64_MAX], this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_integer_t = NumberIntegerType;
+
+    /*!
+    @brief a type for a number (unsigned)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store unsigned integer numbers in C++, a type is defined by the
+    template parameter @a NumberUnsignedType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberUnsignedType (`uint64_t`), the
+    default value for @a number_unsigned_t is:
+
+    @code {.cpp}
+    uint64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
+    number that can be stored is `0`. Integer numbers that are out of range
+    will yield over/underflow when used in a constructor. During
+    deserialization, too large or small integer numbers will be automatically
+    be stored as @ref number_integer_t or @ref number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange (when considered in conjunction with the
+    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
+    this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @since version 2.0.0
+    */
+    using number_unsigned_t = NumberUnsignedType;
+
+    /*!
+    @brief a type for a number (floating-point)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store floating-point numbers in C++, a type is defined by the template
+    parameter @a NumberFloatType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberFloatType (`double`), the default
+    value for @a number_float_t is:
+
+    @code {.cpp}
+    double
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in floating-point literals will be ignored. Internally,
+      the value will be stored as decimal number. For instance, the C++
+      floating-point literal `01.2` will be serialized to `1.2`. During
+      deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > This specification allows implementations to set limits on the range and
+    > precision of numbers accepted. Since software that implements IEEE
+    > 754-2008 binary64 (double precision) numbers is generally available and
+    > widely used, good interoperability can be achieved by implementations
+    > that expect no more precision or range than these provide, in the sense
+    > that implementations will approximate JSON numbers within the expected
+    > precision.
+
+    This implementation does exactly follow this approach, as it uses double
+    precision floating-point numbers. Note values smaller than
+    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
+    will be stored as NaN internally and be serialized to `null`.
+
+    #### Storage
+
+    Floating-point number values are stored directly inside a @ref basic_json
+    type.
+
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_float_t = NumberFloatType;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * object)
+        {
+            AllocatorTraits::deallocate(alloc, object, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
+        assert(object != nullptr);
+        return object.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = boolean_t(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = number_integer_t(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = number_unsigned_t(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = number_float_t(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.7.3")); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value)
+        {
+            string = create<string_t>(value);
+        }
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value)
+        {
+            string = create<string_t>(std::move(value));
+        }
+
+        /// constructor for objects
+        json_value(const object_t& value)
+        {
+            object = create<object_t>(value);
+        }
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value)
+        {
+            object = create<object_t>(std::move(value));
+        }
+
+        /// constructor for arrays
+        json_value(const array_t& value)
+        {
+            array = create<array_t>(value);
+        }
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value)
+        {
+            array = create<array_t>(std::move(value));
+        }
+
+        void destroy(value_t t) noexcept
+        {
+            // flatten the current json_value to a heap-allocated stack
+            std::vector<basic_json> stack;
+
+            // move the top-level items to stack
+            if (t == value_t::array)
+            {
+                stack.reserve(array->size());
+                std::move(array->begin(), array->end(), std::back_inserter(stack));
+            }
+            else if (t == value_t::object)
+            {
+                stack.reserve(object->size());
+                for (auto&& it : *object)
+                {
+                    stack.push_back(std::move(it.second));
+                }
+            }
+
+            while (not stack.empty())
+            {
+                // move the last item to local variable to be processed
+                basic_json current_item(std::move(stack.back()));
+                stack.pop_back();
+
+                // if current_item is array/object, move
+                // its children to the stack to be processed later
+                if (current_item.is_array())
+                {
+                    std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
+                              std::back_inserter(stack));
+
+                    current_item.m_value.array->clear();
+                }
+                else if (current_item.is_object())
+                {
+                    for (auto&& it : *current_item.m_value.object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+
+                    current_item.m_value.object->clear();
+                }
+
+                // it's now safe that current_item get destructed
+                // since it doesn't have any children
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+    */
+    void assert_invariant() const noexcept
+    {
+        assert(m_type != value_t::object or m_value.object != nullptr);
+        assert(m_type != value_t::array or m_value.array != nullptr);
+        assert(m_type != value_t::string or m_value.string != nullptr);
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /*!
+    @brief parser event types
+
+    The parser callback distinguishes the following events:
+    - `object_start`: the parser read `{` and started to process a JSON object
+    - `key`: the parser read a key of a value in an object
+    - `object_end`: the parser read `}` and finished processing a JSON object
+    - `array_start`: the parser read `[` and started to process a JSON array
+    - `array_end`: the parser read `]` and finished processing a JSON array
+    - `value`: the parser finished reading a JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    @sa @ref parser_callback_t for more information and examples
+    */
+    using parse_event_t = typename parser::parse_event_t;
+
+    /*!
+    @brief per-element parser callback type
+
+    With a parser callback function, the result of parsing a JSON text can be
+    influenced. When passed to @ref parse, it is called on certain events
+    (passed as @ref parse_event_t via parameter @a event) with a set recursion
+    depth @a depth and context JSON value @a parsed. The return value of the
+    callback function is a boolean indicating whether the element that emitted
+    the callback shall be kept or not.
+
+    We distinguish six scenarios (determined by the event type) in which the
+    callback function can be called. The following table describes the values
+    of the parameters @a depth, @a event, and @a parsed.
+
+    parameter @a event | description | parameter @a depth | parameter @a parsed
+    ------------------ | ----------- | ------------------ | -------------------
+    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
+    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
+    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
+    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
+    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
+    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    Discarding a value (i.e., returning `false`) has different effects
+    depending on the context in which function was called:
+
+    - Discarded values in structured types are skipped. That is, the parser
+      will behave as if the discarded value was never read.
+    - In case a value outside a structured type is skipped, it is replaced
+      with `null`. This case happens if the top-level element is skipped.
+
+    @param[in] depth  the depth of the recursion during parsing
+
+    @param[in] event  an event of type parse_event_t indicating the context in
+    the callback function has been called
+
+    @param[in,out] parsed  the current intermediate parse result; note that
+    writing to this value has no effect for parse_event_t::key events
+
+    @return Whether the JSON value which called the function during parsing
+    should be kept (`true`) or not (`false`). In the latter case, it is either
+    skipped completely or replaced by an empty discarded object.
+
+    @sa @ref parse for examples
+
+    @since version 1.0.0
+    */
+    using parser_callback_t = typename parser::parser_callback_t;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /*!
+    @brief create an empty value with a given type
+
+    Create an empty JSON value with a given type. The value will be default
+    initialized with an empty value which depends on the type:
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+
+    @param[in] v  the type of the value to create
+
+    @complexity Constant.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows the constructor for different @ref
+    value_t values,basic_json__value_t}
+
+    @sa @ref clear() -- restores the postcondition of this constructor
+
+    @since version 1.0.0
+    */
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a null object
+
+    Create a `null` JSON value. It either takes a null pointer as parameter
+    (explicitly creating `null`) or no parameter (implicitly creating `null`).
+    The passed null pointer itself is not read -- it is only used to choose
+    the right constructor.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @liveexample{The following code shows the constructor with and without a
+    null pointer parameter.,basic_json__nullptr_t}
+
+    @since version 1.0.0
+    */
+    basic_json(std::nullptr_t = nullptr) noexcept
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value
+
+    This is a "catch all" constructor for all compatible JSON types; that is,
+    types for which a `to_json()` method exists. The constructor forwards the
+    parameter @a val to that method (to `json_serializer<U>::to_json` method
+    with `U = uncvref_t<CompatibleType>`, to be exact).
+
+    Template type @a CompatibleType includes, but is not limited to, the
+    following types:
+    - **arrays**: @ref array_t and all kinds of compatible containers such as
+      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
+      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
+      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
+      which a @ref basic_json value can be constructed.
+    - **objects**: @ref object_t and all kinds of compatible associative
+      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
+      and `std::unordered_multimap` with a `key_type` compatible to
+      @ref string_t and a `value_type` from which a @ref basic_json value can
+      be constructed.
+    - **strings**: @ref string_t, string literals, and all compatible string
+      containers can be used.
+    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
+      @ref number_float_t, and all convertible number types such as `int`,
+      `size_t`, `int64_t`, `float` or `double` can be used.
+    - **boolean**: @ref boolean_t / `bool` can be used.
+
+    See the examples below.
+
+    @tparam CompatibleType a type such that:
+    - @a CompatibleType is not derived from `std::istream`,
+    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
+         constructors),
+    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
+    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
+         @ref json_pointer, @ref iterator, etc ...)
+    - @ref @ref json_serializer<U> has a
+         `to_json(basic_json_t&, CompatibleType&&)` method
+
+    @tparam U = `uncvref_t<CompatibleType>`
+
+    @param[in] val the value to be forwarded to the respective constructor
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @liveexample{The following code shows the constructor with several
+    compatible types.,basic_json__CompatibleType}
+
+    @since version 2.1.0
+    */
+    template <typename CompatibleType,
+              typename U = detail::uncvref_t<CompatibleType>,
+              detail::enable_if_t<
+                  not detail::is_basic_json<U>::value and detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
+    basic_json(CompatibleType && val) noexcept(noexcept(
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value from an existing one
+
+    This is a constructor for existing @ref basic_json types.
+    It does not hijack copy/move constructors, since the parameter has different
+    template arguments than the current ones.
+
+    The constructor tries to convert the internal @ref m_value of the parameter.
+
+    @tparam BasicJsonType a type such that:
+    - @a BasicJsonType is a @ref basic_json type.
+    - @a BasicJsonType has different template arguments than @ref basic_json_t.
+
+    @param[in] val the @ref basic_json value to be converted.
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @since version 3.2.0
+    */
+    template <typename BasicJsonType,
+              detail::enable_if_t<
+                  detail::is_basic_json<BasicJsonType>::value and not std::is_same<basic_json, BasicJsonType>::value, int> = 0>
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a container (array or object) from an initializer list
+
+    Creates a JSON value of type array or object from the passed initializer
+    list @a init. In case @a type_deduction is `true` (default), the type of
+    the JSON value to be created is deducted from the initializer list @a init
+    according to the following rules:
+
+    1. If the list is empty, an empty JSON object value `{}` is created.
+    2. If the list consists of pairs whose first element is a string, a JSON
+       object value is created where the first elements of the pairs are
+       treated as keys and the second elements are as values.
+    3. In all other cases, an array is created.
+
+    The rules aim to create the best fit between a C++ initializer list and
+    JSON values. The rationale is as follows:
+
+    1. The empty initializer list is written as `{}` which is exactly an empty
+       JSON object.
+    2. C++ has no way of describing mapped types other than to list a list of
+       pairs. As JSON requires that keys must be of type string, rule 2 is the
+       weakest constraint one can pose on initializer lists to interpret them
+       as an object.
+    3. In all other cases, the initializer list could not be interpreted as
+       JSON object type, so interpreting it as JSON array type is safe.
+
+    With the rules described above, the following JSON values cannot be
+    expressed by an initializer list:
+
+    - the empty array (`[]`): use @ref array(initializer_list_t)
+      with an empty initializer list in this case
+    - arrays whose elements satisfy rule 2: use @ref
+      array(initializer_list_t) with the same initializer list
+      in this case
+
+    @note When used without parentheses around an empty initializer list, @ref
+    basic_json() is called instead of this function, yielding the JSON null
+    value.
+
+    @param[in] init  initializer list with JSON values
+
+    @param[in] type_deduction internal parameter; when set to `true`, the type
+    of the JSON value is deducted from the initializer list @a init; when set
+    to `false`, the type provided via @a manual_type is forced. This mode is
+    used by the functions @ref array(initializer_list_t) and
+    @ref object(initializer_list_t).
+
+    @param[in] manual_type internal parameter; when @a type_deduction is set
+    to `false`, the created JSON value will use the provided type (only @ref
+    value_t::array and @ref value_t::object are valid); when @a type_deduction
+    is set to `true`, this parameter has no effect
+
+    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
+    `value_t::object`, but @a init contains an element which is not a pair
+    whose first element is a string. In this case, the constructor could not
+    create an object. If @a type_deduction would have be `true`, an array
+    would have been created. See @ref object(initializer_list_t)
+    for an example.
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows how JSON values are created from
+    initializer lists.,basic_json__list_init_t}
+
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            return element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (not type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object and not is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_type = value_t::object;
+            m_value = value_t::object;
+
+            std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
+            });
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_type = value_t::array;
+            m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief explicitly create an array from an initializer list
+
+    Creates a JSON array value from a given initializer list. That is, given a
+    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
+    initializer list is empty, the empty array `[]` is created.
+
+    @note This function is only needed to express two edge cases that cannot
+    be realized with the initializer list constructor (@ref
+    basic_json(initializer_list_t, bool, value_t)). These cases
+    are:
+    1. creating an array whose elements are all pairs whose first element is a
+    string -- in this case, the initializer list constructor would create an
+    object, taking the first elements as keys
+    2. creating an empty array -- passing the empty initializer list to the
+    initializer list constructor yields an empty object
+
+    @param[in] init  initializer list with JSON values to create an array from
+    (optional)
+
+    @return JSON array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `array`
+    function.,array}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /*!
+    @brief explicitly create an object from an initializer list
+
+    Creates a JSON object value from a given initializer list. The initializer
+    lists elements must be pairs, and their first elements must be strings. If
+    the initializer list is empty, the empty object `{}` is created.
+
+    @note This function is only added for symmetry reasons. In contrast to the
+    related function @ref array(initializer_list_t), there are
+    no cases which can only be expressed by this function. That is, any
+    initializer list @a init can also be passed to the initializer list
+    constructor @ref basic_json(initializer_list_t, bool, value_t).
+
+    @param[in] init  initializer list to create an object from (optional)
+
+    @return JSON object value
+
+    @throw type_error.301 if @a init is not a list of pairs whose first
+    elements are strings. In this case, no object can be created. When such a
+    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
+    an array would have been created from the passed initializer list @a init.
+    See example below.
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `object`
+    function.,object}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /*!
+    @brief construct an array with count copies of given value
+
+    Constructs a JSON array value by creating @a cnt copies of a passed value.
+    In case @a cnt is `0`, an empty array is created.
+
+    @param[in] cnt  the number of JSON copies of @a val to create
+    @param[in] val  the JSON value to copy
+
+    @post `std::distance(begin(),end()) == cnt` holds.
+
+    @complexity Linear in @a cnt.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows examples for the @ref
+    basic_json(size_type\, const basic_json&)
+    constructor.,basic_json__size_type_basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(size_type cnt, const basic_json& val)
+        : m_type(value_t::array)
+    {
+        m_value.array = create<array_t>(cnt, val);
+        assert_invariant();
+    }
+
+    /*!
+    @brief construct a JSON container given an iterator range
+
+    Constructs the JSON value with the contents of the range `[first, last)`.
+    The semantics depends on the different types a JSON value can have:
+    - In case of a null type, invalid_iterator.206 is thrown.
+    - In case of other primitive types (number, boolean, or string), @a first
+      must be `begin()` and @a last must be `end()`. In this case, the value is
+      copied. Otherwise, invalid_iterator.204 is thrown.
+    - In case of structured types (array, object), the constructor behaves as
+      similar versions for `std::vector` or `std::map`; that is, a JSON array
+      or object is constructed from the values in the range.
+
+    @tparam InputIT an input iterator type (@ref iterator or @ref
+    const_iterator)
+
+    @param[in] first begin of the range to copy from (included)
+    @param[in] last end of the range to copy from (excluded)
+
+    @pre Iterators @a first and @a last must be initialized. **This
+         precondition is enforced with an assertion (see warning).** If
+         assertions are switched off, a violation of this precondition yields
+         undefined behavior.
+
+    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
+         checked efficiently. Only certain edge cases are detected; see the
+         description of the exceptions below. A violation of this precondition
+         yields undefined behavior.
+
+    @warning A precondition is enforced with a runtime assertion that will
+             result in calling `std::abort` if this precondition is not met.
+             Assertions can be disabled by defining `NDEBUG` at compile time.
+             See https://en.cppreference.com/w/cpp/error/assert for more
+             information.
+
+    @throw invalid_iterator.201 if iterators @a first and @a last are not
+    compatible (i.e., do not belong to the same JSON value). In this case,
+    the range `[first, last)` is undefined.
+    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
+    primitive type (number, boolean, or string), but @a first does not point
+    to the first element any more. In this case, the range `[first, last)` is
+    undefined. See example code below.
+    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
+    null value. In this case, the range `[first, last)` is undefined.
+
+    @complexity Linear in distance between @a first and @a last.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows several ways to create JSON values by
+    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
+
+    @since version 1.0.0
+    */
+    template<class InputIT, typename std::enable_if<
+                 std::is_same<InputIT, typename basic_json_t::iterator>::value or
+                 std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
+    basic_json(InputIT first, InputIT last)
+    {
+        assert(first.m_object != nullptr);
+        assert(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
+        }
+
+        // copy type from first iterator
+        m_type = first.m_object->m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
+                                         or not last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = first.m_object->m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = first.m_object->m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = first.m_object->m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *first.m_object->m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object = create<object_t>(first.m_it.object_iterator,
+                                                  last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
+                                                    std::string(first.m_object->type_name())));
+        }
+
+        assert_invariant();
+    }
+
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    /// @private
+    basic_json(const detail::json_ref<basic_json>& ref)
+        : basic_json(ref.moved_or_copied())
+    {}
+
+    /*!
+    @brief copy constructor
+
+    Creates a copy of a given JSON value.
+
+    @param[in] other  the JSON value to copy
+
+    @post `*this == other`
+
+    @complexity Linear in the size of @a other.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+    - As postcondition, it holds: `other == basic_json(other)`.
+
+    @liveexample{The following code shows an example for the copy
+    constructor.,basic_json__basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(const basic_json& other)
+        : m_type(other.m_type)
+    {
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_type)
+        {
+            case value_t::object:
+            {
+                m_value = *other.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value = *other.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *other.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value = other.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_value = other.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value = other.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value = other.m_value.number_float;
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief move constructor
+
+    Move constructor. Constructs a JSON value with the contents of the given
+    value @a other using move semantics. It "steals" the resources from @a
+    other and leaves it as JSON null value.
+
+    @param[in,out] other  value to move to this object
+
+    @post `*this` has the same value as @a other before the call.
+    @post @a other is a JSON null value.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
+    requirements.
+
+    @liveexample{The code below shows the move constructor explicitly called
+    via std::move.,basic_json__moveconstructor}
+
+    @since version 1.0.0
+    */
+    basic_json(basic_json&& other) noexcept
+        : m_type(std::move(other.m_type)),
+          m_value(std::move(other.m_value))
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        // invalidate payload
+        other.m_type = value_t::null;
+        other.m_value = {};
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief copy assignment
+
+    Copy assignment operator. Copies a JSON value via the "copy and swap"
+    strategy: It is expressed in terms of the copy constructor, destructor,
+    and the `swap()` member function.
+
+    @param[in] other  value to copy from
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+
+    @liveexample{The code below shows and example for the copy assignment. It
+    creates a copy of value `a` which is then swapped with `b`. Finally\, the
+    copy of `a` (which is the null value after the swap) is
+    destroyed.,basic_json__copyassignment}
+
+    @since version 1.0.0
+    */
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value and
+        std::is_nothrow_move_assignable<value_t>::value and
+        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_type, other.m_type);
+        swap(m_value, other.m_value);
+
+        assert_invariant();
+        return *this;
+    }
+
+    /*!
+    @brief destructor
+
+    Destroys the JSON value and frees all allocated memory.
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+    - All stored elements are destroyed and all memory is freed.
+
+    @since version 1.0.0
+    */
+    ~basic_json() noexcept
+    {
+        assert_invariant();
+        m_value.destroy(m_type);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /*!
+    @brief serialization
+
+    Serialization function for JSON values. The function tries to mimic
+    Python's `json.dumps()` function, and currently supports its @a indent
+    and @a ensure_ascii parameters.
+
+    @param[in] indent If indent is nonnegative, then array elements and object
+    members will be pretty-printed with that indent level. An indent level of
+    `0` will only insert newlines. `-1` (the default) selects the most compact
+    representation.
+    @param[in] indent_char The character to use for indentation if @a indent is
+    greater than `0`. The default is ` ` (space).
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] error_handler  how to react on decoding errors; there are three
+    possible values: `strict` (throws and exception in case a decoding error
+    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
+    and `ignore` (ignore invalid UTF-8 sequences during serialization).
+
+    @return string containing the serialization of the JSON value
+
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
+    @complexity Linear.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @liveexample{The following example shows the effect of different @a indent\,
+    @a indent_char\, and @a ensure_ascii parameters to the result of the
+    serialization.,dump}
+
+    @see https://docs.python.org/2/library/json.html#json.dump
+
+    @since version 1.0.0; indentation character @a indent_char, option
+           @a ensure_ascii and exceptions added in version 3.0.0; error
+           handlers added in version 3.4.0.
+    */
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief return the type of the JSON value (explicit)
+
+    Return the type of the JSON value as a value from the @ref value_t
+    enumeration.
+
+    @return the type of the JSON value
+            Value type                | return value
+            ------------------------- | -------------------------
+            null                      | value_t::null
+            boolean                   | value_t::boolean
+            string                    | value_t::string
+            number (integer)          | value_t::number_integer
+            number (unsigned integer) | value_t::number_unsigned
+            number (floating-point)   | value_t::number_float
+            object                    | value_t::object
+            array                     | value_t::array
+            discarded                 | value_t::discarded
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `type()` for all JSON
+    types.,type}
+
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr value_t type() const noexcept
+    {
+        return m_type;
+    }
+
+    /*!
+    @brief return whether type is primitive
+
+    This function returns true if and only if the JSON type is primitive
+    (string, number, boolean, or null).
+
+    @return `true` if type is primitive (string, number, boolean, or null),
+    `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_primitive()` for all JSON
+    types.,is_primitive}
+
+    @sa @ref is_structured() -- returns whether JSON value is structured
+    @sa @ref is_null() -- returns whether JSON value is `null`
+    @sa @ref is_string() -- returns whether JSON value is a string
+    @sa @ref is_boolean() -- returns whether JSON value is a boolean
+    @sa @ref is_number() -- returns whether JSON value is a number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() or is_string() or is_boolean() or is_number();
+    }
+
+    /*!
+    @brief return whether type is structured
+
+    This function returns true if and only if the JSON type is structured
+    (array or object).
+
+    @return `true` if type is structured (array or object), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_structured()` for all JSON
+    types.,is_structured}
+
+    @sa @ref is_primitive() -- returns whether value is primitive
+    @sa @ref is_array() -- returns whether value is an array
+    @sa @ref is_object() -- returns whether value is an object
+
+    @since version 1.0.0
+    */
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() or is_object();
+    }
+
+    /*!
+    @brief return whether value is null
+
+    This function returns true if and only if the JSON value is null.
+
+    @return `true` if type is null, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_null()` for all JSON
+    types.,is_null}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_null() const noexcept
+    {
+        return m_type == value_t::null;
+    }
+
+    /*!
+    @brief return whether value is a boolean
+
+    This function returns true if and only if the JSON value is a boolean.
+
+    @return `true` if type is boolean, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_boolean()` for all JSON
+    types.,is_boolean}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_type == value_t::boolean;
+    }
+
+    /*!
+    @brief return whether value is a number
+
+    This function returns true if and only if the JSON value is a number. This
+    includes both integer (signed and unsigned) and floating-point values.
+
+    @return `true` if type is number (regardless whether integer, unsigned
+    integer or floating-type), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number()` for all JSON
+    types.,is_number}
+
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() or is_number_float();
+    }
+
+    /*!
+    @brief return whether value is an integer number
+
+    This function returns true if and only if the JSON value is a signed or
+    unsigned integer number. This excludes floating-point values.
+
+    @return `true` if type is an integer or unsigned integer number, `false`
+    otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_integer()` for all
+    JSON types.,is_number_integer}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_type == value_t::number_integer or m_type == value_t::number_unsigned;
+    }
+
+    /*!
+    @brief return whether value is an unsigned integer number
+
+    This function returns true if and only if the JSON value is an unsigned
+    integer number. This excludes floating-point and signed integer values.
+
+    @return `true` if type is an unsigned integer number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_unsigned()` for all
+    JSON types.,is_number_unsigned}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 2.0.0
+    */
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_type == value_t::number_unsigned;
+    }
+
+    /*!
+    @brief return whether value is a floating-point number
+
+    This function returns true if and only if the JSON value is a
+    floating-point number. This excludes signed and unsigned integer values.
+
+    @return `true` if type is a floating-point number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_float()` for all
+    JSON types.,is_number_float}
+
+    @sa @ref is_number() -- check if value is number
+    @sa @ref is_number_integer() -- check if value is an integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_type == value_t::number_float;
+    }
+
+    /*!
+    @brief return whether value is an object
+
+    This function returns true if and only if the JSON value is an object.
+
+    @return `true` if type is object, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_object()` for all JSON
+    types.,is_object}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_object() const noexcept
+    {
+        return m_type == value_t::object;
+    }
+
+    /*!
+    @brief return whether value is an array
+
+    This function returns true if and only if the JSON value is an array.
+
+    @return `true` if type is array, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_array()` for all JSON
+    types.,is_array}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_array() const noexcept
+    {
+        return m_type == value_t::array;
+    }
+
+    /*!
+    @brief return whether value is a string
+
+    This function returns true if and only if the JSON value is a string.
+
+    @return `true` if type is string, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_string()` for all JSON
+    types.,is_string}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_string() const noexcept
+    {
+        return m_type == value_t::string;
+    }
+
+    /*!
+    @brief return whether value is discarded
+
+    This function returns true if and only if the JSON value was discarded
+    during parsing with a callback function (see @ref parser_callback_t).
+
+    @note This function will always be `false` for JSON values after parsing.
+    That is, discarded values can only occur during parsing, but will be
+    removed when inside a structured value or replaced by null in other cases.
+
+    @return `true` if type is discarded, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_discarded()` for all JSON
+    types.,is_discarded}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_type == value_t::discarded;
+    }
+
+    /*!
+    @brief return the type of the JSON value (implicit)
+
+    Implicitly return the type of the JSON value as a value from the @ref
+    value_t enumeration.
+
+    @return the type of the JSON value
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies the @ref value_t operator for
+    all JSON types.,operator__value_t}
+
+    @sa @ref type() -- return the type of the JSON value (explicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr operator value_t() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType, detail::enable_if_t<
+                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
+                 int> = 0>
+    basic_json get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @tparam BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template<typename BasicJsonType, detail::enable_if_t<
+                 not std::is_same<BasicJsonType, basic_json>::value and
+                 detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    BasicJsonType get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+             detail::enable_if_t <
+                 not detail::is_basic_json<ValueType>::value and
+                 detail::has_from_json<basic_json_t, ValueType>::value and
+                 not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                 int> = 0>
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(not std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        static_assert(std::is_default_constructible<ValueType>::value,
+                      "types must be DefaultConstructible when used with get()");
+
+        ValueType ret;
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueTypeCV>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+             detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
+                                 detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                                 int> = 0>
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        static_assert(not std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value.
+    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType v;
+    JSONSerializer<ValueType>::from_json(*this, v);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+
+    @tparam ValueType the input parameter type.
+
+    @return the input parameter, allowing chaining calls.
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get_to}
+
+    @since version 3.3.0
+    */
+    template<typename ValueType,
+             detail::enable_if_t <
+                 not detail::is_basic_json<ValueType>::value and
+                 detail::has_from_json<basic_json_t, ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N],
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+
+    /*!
+    @brief get a pointer value (implicit)
+
+    Implicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning Writing data to the pointee of the result yields an undefined
+    state.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+    assertion.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get_ptr}
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (implicit)
+    @copydoc get_ptr()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value and
+                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+
+    Implicit reference access to the internally stored JSON value. No copies
+    are made.
+
+    @warning Writing data to the referee of the result yields an undefined
+    state.
+
+    @tparam ReferenceType reference type; must be a reference to @ref array_t,
+    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
+    @ref number_float_t. Enforced by static assertion.
+
+    @return reference to the internally stored JSON value if the requested
+    reference type @a ReferenceType fits to the JSON value; throws
+    type_error.303 otherwise
+
+    @throw type_error.303 in case passed type @a ReferenceType is incompatible
+    with the stored JSON value; see example below
+
+    @complexity Constant.
+
+    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+
+    @since version 1.1.0
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+    @copydoc get_ref()
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value and
+                 std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   not std::is_pointer<ValueType>::value and
+                   not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
+                   not std::is_same<ValueType, typename string_t::value_type>::value and
+                   not detail::is_basic_json<ValueType>::value
+
+#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
+                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
+                   and not std::is_same<ValueType, typename std::string_view>::value
+#endif
+#endif
+                   and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
+                   , int >::type = 0 >
+    operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @}
+
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a reference to the element at specified location @a idx, with
+    bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__size_type}
+    */
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a const reference to the element at specified location @a idx,
+    with bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__size_type_const}
+    */
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a reference to the element at with specified key @a key, with
+    bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__object_t_key_type}
+    */
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a const reference to the element at with specified key @a key,
+    with bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__object_t_key_type_const}
+    */
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a reference to the element at specified location @a idx.
+
+    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
+    then the array is silently filled up with `null` values to make `idx` a
+    valid reference to the last stored element.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array or null; in that
+    cases, using the [] operator with an index makes no sense.
+
+    @complexity Constant if @a idx is in the range of the array. Otherwise
+    linear in `idx - size()`.
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `[]` operator. Note the addition of `null`
+    values.,operatorarray__size_type}
+
+    @since version 1.0.0
+    */
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_value.array->size())
+            {
+                m_value.array->insert(m_value.array->end(),
+                                      idx - m_value.array->size() + 1,
+                                      basic_json());
+            }
+
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a const reference to the element at specified location @a idx.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array; in that case,
+    using the [] operator with an index makes no sense.
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how array elements can be read using
+    the `[]` operator.,operatorarray__size_type_const}
+
+    @since version 1.0.0
+    */
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    reference operator[](const typename object_t::key_type& key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            assert(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    reference operator[](T* key)
+    {
+        // implicitly convert null to object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    const_reference operator[](T* key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            assert(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(key);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const typename object_t::key_type&), this function
+    does not throw if the given key @a key was not found.
+
+    @note Unlike @ref operator[](const typename object_t::key_type& key), this
+    function does not implicitly add an element to the position defined by @a
+    key. This function is furthermore also applicable to const objects.
+
+    @param[in] key  key of the element to access
+    @param[in] default_value  the value to return if @a key is not found
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a key
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+
+    @since version 1.0.0
+    */
+    template<class ValueType, typename std::enable_if<
+                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return *it;
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
+    */
+    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    {
+        return value(key, string_t(default_value));
+    }
+
+    /*!
+    @brief access specified object element via JSON Pointer with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(ptr);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const json_pointer&), this function does not throw
+    if the given key @a key was not found.
+
+    @param[in] ptr  a JSON pointer to the element to access
+    @param[in] default_value  the value to return if @a ptr found no value
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a ptr
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value_ptr}
+
+    @sa @ref operator[](const json_pointer&) for unchecked access by reference
+
+    @since version 2.0.2
+    */
+    template<class ValueType, typename std::enable_if<
+                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this);
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const json_pointer&, ValueType) const
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    string_t value(const json_pointer& ptr, const char* default_value) const
+    {
+        return value(ptr, string_t(default_value));
+    }
+
+    /*!
+    @brief access the first element
+
+    Returns a reference to the first element in the container. For a JSON
+    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
+
+    @return In case of a structured type (array or object), a reference to the
+    first element is returned. In case of number, string, or boolean values, a
+    reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on `null` value
+
+    @liveexample{The following code shows an example for `front()`.,front}
+
+    @sa @ref back() -- access the last element
+
+    @since version 1.0.0
+    */
+    reference front()
+    {
+        return *begin();
+    }
+
+    /*!
+    @copydoc basic_json::front()
+    */
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /*!
+    @brief access the last element
+
+    Returns a reference to the last element in the container. For a JSON
+    container `c`, the expression `c.back()` is equivalent to
+    @code {.cpp}
+    auto tmp = c.end();
+    --tmp;
+    return *tmp;
+    @endcode
+
+    @return In case of a structured type (array or object), a reference to the
+    last element is returned. In case of number, string, or boolean values, a
+    reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on a `null` value. See example
+    below.
+
+    @liveexample{The following code shows an example for `back()`.,back}
+
+    @sa @ref front() -- access the first element
+
+    @since version 1.0.0
+    */
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @copydoc basic_json::back()
+    */
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @brief remove element given an iterator
+
+    Removes the element specified by iterator @a pos. The iterator @a pos must
+    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
+    but is not dereferenceable) cannot be used as a value for @a pos.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] pos iterator to the element to remove
+    @return Iterator following the last removed element. If the iterator @a
+    pos refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.202 if called on an iterator which does not belong
+    to the current JSON value; example: `"iterator does not fit current
+    value"`
+    @throw invalid_iterator.205 if called on a primitive type with invalid
+    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
+    out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: amortized constant
+    - arrays: linear in distance between @a pos and the end of the container
+    - strings: linear in the length of the string
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType}
+
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+             = 0>
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove elements given an iterator range
+
+    Removes the element specified by the range `[first; last)`. The iterator
+    @a first does not need to be dereferenceable if `first == last`: erasing
+    an empty range is a no-op.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] first iterator to the beginning of the range to remove
+    @param[in] last iterator past the end of the range to remove
+    @return Iterator following the last removed element. If the iterator @a
+    second refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.203 if called on iterators which does not belong
+    to the current JSON value; example: `"iterators do not fit current value"`
+    @throw invalid_iterator.204 if called on a primitive type with invalid
+    iterators (i.e., if `first != begin()` and `last != end()`); example:
+    `"iterators out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: `log(size()) + std::distance(first, last)`
+    - arrays: linear in the distance between @a first and @a last, plus linear
+      in the distance between @a last and end of the container
+    - strings: linear in the length of the string
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType_IteratorType}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+             = 0>
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object or this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_LIKELY(not first.m_it.primitive_iterator.is_begin()
+                                       or not last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove element from a JSON object given a key
+
+    Removes elements from a JSON object with the key value @a key.
+
+    @param[in] key value of the elements to remove
+
+    @return Number of elements removed. If @a ObjectType is the default
+    `std::map` type, the return value will always be `0` (@a key was not
+    found) or `1` (@a key was found).
+
+    @post References and iterators to the erased elements are invalidated.
+    Other references and iterators are not affected.
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+
+    @complexity `log(size()) + count(key)`
+
+    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->erase(key);
+        }
+
+        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief remove element from a JSON array given an index
+
+    Removes element from a JSON array at the index @a idx.
+
+    @param[in] idx index of the element to remove
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
+    is out of range"`
+
+    @complexity Linear in distance between @a idx and the end of the container.
+
+    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+
+    @since version 1.0.0
+    */
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+
+            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /*!
+    @brief find an element in a JSON object
+
+    Finds an element in a JSON object with key equivalent to @a key. If the
+    element is not found or the JSON value is not an object, end() is
+    returned.
+
+    @note This method always returns @ref end() when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value of the element to search for.
+
+    @return Iterator to an element with key equivalent to @a key. If no such
+    element is found or the JSON value is not an object, past-the-end (see
+    @ref end()) iterator is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `find()` is used.,find__key_type}
+
+    @sa @ref contains(KeyT&&) const -- checks whether a key exists
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    iterator find(KeyT&& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief find an element in a JSON object
+    @copydoc find(KeyT&&)
+    */
+    template<typename KeyT>
+    const_iterator find(KeyT&& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief returns the number of occurrences of a key in a JSON object
+
+    Returns the number of elements with key @a key. If ObjectType is the
+    default `std::map` type, the return value will always be `0` (@a key was
+    not found) or `1` (@a key was found).
+
+    @note This method always returns `0` when executed on a JSON type that is
+          not an object.
+
+    @param[in] key key value of the element to count
+
+    @return Number of elements with key @a key. If the JSON value is not an
+    object, the return value will be `0`.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `count()` is used.,count}
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    size_type count(KeyT&& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object
+
+    Check whether an element exists in a JSON object with key equivalent to
+    @a key. If the element is not found or the JSON value is not an object,
+    false is returned.
+
+    @note This method always returns false when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value to check its existence.
+
+    @return true if an element with specified @a key exists. If no such
+    element with such key is found or the JSON value is not an object,
+    false is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains}
+
+    @sa @ref find(KeyT&&) -- returns an iterator to an object element
+    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
+
+    @since version 3.6.0
+    */
+    template<typename KeyT, typename std::enable_if<
+                 not std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int>::type = 0>
+    bool contains(KeyT && key) const
+    {
+        return is_object() and m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object given a JSON pointer
+
+    Check whether the given JSON pointer @a ptr can be resolved in the current
+    JSON value.
+
+    @note This method can be executed on any JSON value type.
+
+    @param[in] ptr JSON pointer to check its existence.
+
+    @return true if the JSON pointer can be resolved to a stored value, false
+    otherwise.
+
+    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
+
+    @sa @ref contains(KeyT &&) const -- checks the existence of a key
+
+    @since version 3.7.0
+    */
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /*!
+    @brief returns an iterator to the first element
+
+    Returns an iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `begin()`.,begin}
+
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cbegin()
+    */
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /*!
+    @brief returns a const iterator to the first element
+
+    Returns a const iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
+
+    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
+
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to one past the last element
+
+    Returns an iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `end()`.,end}
+
+    @sa @ref cend() -- returns a const iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cend()
+    */
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /*!
+    @brief returns a const iterator to one past the last element
+
+    Returns a const iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
+
+    @liveexample{The following code shows an example for `cend()`.,cend}
+
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-beginning
+
+    Returns an iterator to the reverse-beginning; that is, the last element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(end())`.
+
+    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
+
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /*!
+    @copydoc basic_json::crbegin()
+    */
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-end
+
+    Returns an iterator to the reverse-end; that is, one before the first
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(begin())`.
+
+    @liveexample{The following code shows an example for `rend()`.,rend}
+
+    @sa @ref crend() -- returns a const reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /*!
+    @copydoc basic_json::crend()
+    */
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /*!
+    @brief returns a const reverse iterator to the last element
+
+    Returns a const iterator to the reverse-beginning; that is, the last
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
+
+    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
+
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /*!
+    @brief returns a const reverse iterator to one before the first
+
+    Returns a const reverse iterator to the reverse-end; that is, one before
+    the first element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
+
+    @liveexample{The following code shows an example for `crend()`.,crend}
+
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /*!
+    @brief wrapper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without iterator_wrapper:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without iterator proxy:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with iterator proxy:
+
+    @code{cpp}
+    for (auto it : json::iterator_wrapper(j_object))
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example).
+
+    @param[in] ref  reference to a JSON value
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @note The name of this function is not yet final and may change in the
+    future.
+
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use @ref items() instead;
+                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    */
+    JSON_HEDLEY_DEPRECATED(3.1.0)
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /*!
+    @copydoc iterator_wrapper(reference)
+    */
+    JSON_HEDLEY_DEPRECATED(3.1.0)
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /*!
+    @brief helper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without `items()` function:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without `items()` function:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with `items()` function:
+
+    @code{cpp}
+    for (auto& el : j_object.items())
+    {
+        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
+    }
+    @endcode
+
+    The `items()` function also allows to use
+    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
+    (C++17):
+
+    @code{cpp}
+    for (auto& [key, val] : j_object.items())
+    {
+        std::cout << "key: " << key << ", value:" << val << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example). For primitive types (e.g., numbers),
+          `key()` returns an empty string.
+
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the function is used.,items}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 3.1.0, structured bindings support since 3.5.0.
+    */
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /*!
+    @copydoc items()
+    */
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /*!
+    @brief checks whether the container is empty.
+
+    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `true`
+            boolean     | `false`
+            string      | `false`
+            number      | `false`
+            object      | result of function `object_t::empty()`
+            array       | result of function `array_t::empty()`
+
+    @liveexample{The following code uses `empty()` to check if a JSON
+    object contains any elements.,empty}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `empty()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return whether a string stored as JSON value
+    is empty - it returns whether the JSON container itself is empty which is
+    false in the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `begin() == end()`.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    bool empty() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_value.object->empty();
+            }
+
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the number of elements
+
+    Returns the number of elements in a JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0`
+            boolean     | `1`
+            string      | `1`
+            number      | `1`
+            object      | result of function object_t::size()
+            array       | result of function array_t::size()
+
+    @liveexample{The following code calls `size()` on the different value
+    types.,size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their size() functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return the length of a string stored as JSON
+    value - it returns the number of elements in the JSON value which is 1 in
+    the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `std::distance(begin(), end())`.
+
+    @sa @ref empty() -- checks whether the container is empty
+    @sa @ref max_size() -- returns the maximal number of elements
+
+    @since version 1.0.0
+    */
+    size_type size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_value.object->size();
+            }
+
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the maximum possible number of elements
+
+    Returns the maximum number of elements a JSON value is able to hold due to
+    system or library implementation limitations, i.e. `std::distance(begin(),
+    end())` for the JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0` (same as `size()`)
+            boolean     | `1` (same as `size()`)
+            string      | `1` (same as `size()`)
+            number      | `1` (same as `size()`)
+            object      | result of function `object_t::max_size()`
+            array       | result of function `array_t::max_size()`
+
+    @liveexample{The following code calls `max_size()` on the different value
+    types. Note the output is implementation specific.,max_size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `max_size()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of returning `b.size()` where `b` is the largest
+      possible JSON value.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    size_type max_size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_value.object->max_size();
+            }
+
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /*!
+    @brief clears the contents
+
+    Clears the content of a JSON value and resets it to the default value as
+    if @ref basic_json(value_t) would have been called with the current value
+    type from @ref type():
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+
+    @post Has the same effect as calling
+    @code {.cpp}
+    *this = basic_json(type());
+    @endcode
+
+    @liveexample{The example below shows the effect of `clear()` to different
+    JSON types.,clear}
+
+    @complexity Linear in the size of the JSON value.
+
+    @iterators All iterators, pointers and references related to this container
+               are invalidated.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @sa @ref basic_json(value_t) -- constructor that creates an object with the
+        same value than calling `clear()`
+
+    @since version 1.0.0
+    */
+    void clear() noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value.string->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object->clear();
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Appends the given element @a val to the end of the JSON value. If the
+    function is called on a JSON null value, an empty array is created before
+    appending @a val.
+
+    @param[in] val the value to add to the JSON array
+
+    @throw type_error.308 when called on a type other than JSON array or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON array. Note how the `null` value was silently
+    converted to a JSON array.,push_back}
+
+    @since version 1.0.0
+    */
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        m_value.array->push_back(std::move(val));
+        // invalidate object: mark it null so we do not call the destructor
+        // cppcheck-suppress accessMoved
+        val.m_type = value_t::null;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.array->push_back(val);
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    Inserts the given element @a val to the JSON object. If the function is
+    called on a JSON null value, an empty object is created before inserting
+    @a val.
+
+    @param[in] val the value to add to the JSON object
+
+    @throw type_error.308 when called on a type other than JSON object or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON object. Note how the `null` value was silently
+    converted to a JSON object.,push_back__object_t__value}
+
+    @since version 1.0.0
+    */
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_object())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.object->insert(val);
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(const typename object_t::value_type&)
+    */
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    This function allows to use `push_back` with an initializer list. In case
+
+    1. the current value is an object,
+    2. the initializer list @a init contains only two elements, and
+    3. the first element of @a init is a string,
+
+    @a init is converted into an object element and added using
+    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
+    is converted to a JSON value and added using @ref push_back(basic_json&&).
+
+    @param[in] init  an initializer list
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @note This function is required to resolve an ambiguous overload error,
+          because pairs like `{"key", "value"}` can be both interpreted as
+          `object_t::value_type` or `std::initializer_list<basic_json>`, see
+          https://github.com/nlohmann/json/issues/235 for more information.
+
+    @liveexample{The example shows how initializer lists are treated as
+    objects when possible.,push_back__initializer_list}
+    */
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() and init.size() == 2 and (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(initializer_list_t)
+    */
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Creates a JSON value from the passed parameters @a args to the end of the
+    JSON value. If the function is called on a JSON null value, an empty array
+    is created before appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return reference to the inserted element
+
+    @throw type_error.311 when called on a type other than JSON array or
+    null; example: `"cannot use emplace_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` can be used to add
+    elements to a JSON array. Note how the `null` value was silently converted
+    to a JSON array.,emplace_back}
+
+    @since version 2.0.8, returns reference since 3.7.0
+    */
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+#ifdef JSON_HAS_CPP_17
+        return m_value.array->emplace_back(std::forward<Args>(args)...);
+#else
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+        return m_value.array->back();
+#endif
+    }
+
+    /*!
+    @brief add an object to an object if key does not exist
+
+    Inserts a new element into a JSON object constructed in-place with the
+    given @a args if there is no element with the key in the container. If the
+    function is called on a JSON null value, an empty object is created before
+    appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return a pair consisting of an iterator to the inserted element, or the
+            already-existing element if no insertion happened, and a bool
+            denoting whether the insertion took place.
+
+    @throw type_error.311 when called on a type other than JSON object or
+    null; example: `"cannot use emplace() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `emplace()` can be used to add elements
+    to a JSON object. Note how the `null` value was silently converted to a
+    JSON object. Further note how no value is added if there was already one
+    value stored with the same key.,emplace}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_object())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        assert(m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
+        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        return result;
+    }
+
+    /*!
+    @brief inserts element
+
+    Inserts element @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] val element to insert
+    @return iterator pointing to the inserted @a val.
+
+    @throw type_error.309 if called on JSON values other than arrays;
+    example: `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Constant plus linear in the distance between @a pos and end of
+    the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts element
+    @copydoc insert(const_iterator, const basic_json&)
+    */
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts @a cnt copies of @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] cnt number of copies of @a val to insert
+    @param[in] val element to insert
+    @return iterator pointing to the first element inserted, or @a pos if
+    `cnt==0`
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Linear in @a cnt plus linear in the distance between @a pos
+    and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__count}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)` before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+    @throw invalid_iterator.211 if @a first or @a last are iterators into
+    container for which insert is called; example: `"passed iterators may not
+    belong to container"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `first==last`
+
+    @complexity Linear in `std::distance(first, last)` plus linear in the
+    distance between @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(not is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from initializer list @a ilist before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] ilist initializer list to insert the values from
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `ilist` is empty
+
+    @complexity Linear in `ilist.size()` plus linear in the distance between
+    @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__ilist}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(not is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)`.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than objects; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
+    of elements to insert.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range_object}
+
+    @since version 3.0.0
+    */
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(not first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from JSON object @a j and overwrites existing keys.
+
+    @param[in] j  JSON object to read values from
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_reference j)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+        if (JSON_HEDLEY_UNLIKELY(not j.is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
+        }
+
+        for (auto it = j.cbegin(); it != j.cend(); ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from from range `[first, last)` and overwrites existing
+    keys.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used__range.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_iterator first, const_iterator last)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(not first.m_object->is_object()
+                                 or not last.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of the JSON value with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other JSON value to exchange the contents with
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how JSON values can be swapped with
+    `swap()`.,swap__reference}
+
+    @since version 1.0.0
+    */
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value and
+        std::is_nothrow_move_assignable<value_t>::value and
+        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_type, other.m_type);
+        std::swap(m_value, other.m_value);
+        assert_invariant();
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON array with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other array to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an array; example: `"cannot
+    use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how arrays can be swapped with
+    `swap()`.,swap__array_t}
+
+    @since version 1.0.0
+    */
+    void swap(array_t& other)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            std::swap(*(m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON object with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other object to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an object; example:
+    `"cannot use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how objects can be swapped with
+    `swap()`.,swap__object_t}
+
+    @since version 1.0.0
+    */
+    void swap(object_t& other)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            std::swap(*(m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON string with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other string to exchange the contents with
+
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
+    use swap() with boolean"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how strings can be swapped with
+    `swap()`.,swap__string_t}
+
+    @since version 1.0.0
+    */
+    void swap(string_t& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            std::swap(*(m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+  public:
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    /*!
+    @brief comparison: equal
+
+    Compares two JSON values for equality according to the following rules:
+    - Two JSON values are equal if (1) they are from the same type and (2)
+      their stored values are the same according to their respective
+      `operator==`.
+    - Integer and floating-point numbers are automatically converted before
+      comparison. Note than two NaN values are always treated as unequal.
+    - Two JSON null values are equal.
+
+    @note Floating-point inside JSON values numbers are compared with
+    `json::number_float_t::operator==` which is `double::operator==` by
+    default. To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    @code {.cpp}
+    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    @endcode
+
+    @note NaN values never compare equal to themselves or to other NaN values.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are equal
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Linear.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__equal}
+
+    @since version 1.0.0
+    */
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    return *lhs.m_value.array == *rhs.m_value.array;
+
+                case value_t::object:
+                    return *lhs.m_value.object == *rhs.m_value.object;
+
+                case value_t::null:
+                    return true;
+
+                case value_t::string:
+                    return *lhs.m_value.string == *rhs.m_value.string;
+
+                case value_t::boolean:
+                    return lhs.m_value.boolean == rhs.m_value.boolean;
+
+                case value_t::number_integer:
+                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
+
+                case value_t::number_unsigned:
+                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
+
+                case value_t::number_float:
+                    return lhs.m_value.number_float == rhs.m_value.number_float;
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+
+        return false;
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /*!
+    @brief comparison: not equal
+
+    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are not equal
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__notequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs == rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /*!
+    @brief comparison: less than
+
+    Compares whether one JSON value @a lhs is less than another JSON value @a
+    rhs according to the following rules:
+    - If @a lhs and @a rhs have the same type, the values are compared using
+      the default `<` operator.
+    - Integer and floating-point numbers are automatically converted before
+      comparison
+    - In case @a lhs and @a rhs have different types, the values are ignored
+      and the order of the types is considered, see
+      @ref operator<(const value_t, const value_t).
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__less}
+
+    @since version 1.0.0
+    */
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    // note parentheses are necessary, see
+                    // https://github.com/nlohmann/json/issues/1530
+                    return (*lhs.m_value.array) < (*rhs.m_value.array);
+
+                case value_t::object:
+                    return (*lhs.m_value.object) < (*rhs.m_value.object);
+
+                case value_t::null:
+                    return false;
+
+                case value_t::string:
+                    return (*lhs.m_value.string) < (*rhs.m_value.string);
+
+                case value_t::boolean:
+                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
+
+                case value_t::number_integer:
+                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
+
+                case value_t::number_unsigned:
+                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
+
+                case value_t::number_float:
+                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+        }
+
+        // We only reach this line if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        return operator<(lhs_type, rhs_type);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /*!
+    @brief comparison: less than or equal
+
+    Compares whether one JSON value @a lhs is less than or equal to another
+    JSON value by calculating `not (rhs < lhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greater}
+
+    @since version 1.0.0
+    */
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (rhs < lhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /*!
+    @brief comparison: greater than
+
+    Compares whether one JSON value @a lhs is greater than another
+    JSON value by calculating `not (lhs <= rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__lessequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs <= rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+
+    Compares whether one JSON value @a lhs is greater than or equal to another
+    JSON value by calculating `not (lhs < rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greaterequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs < rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+
+    /*!
+    @brief serialize to stream
+
+    Serialize the given JSON value @a j to the output stream @a o. The JSON
+    value will be serialized using the @ref dump member function.
+
+    - The indentation of the output can be controlled with the member variable
+      `width` of the output stream @a o. For instance, using the manipulator
+      `std::setw(4)` on @a o sets the indentation level to `4` and the
+      serialization result is the same as calling `dump(4)`.
+
+    - The indentation character can be controlled with the member variable
+      `fill` of the output stream @a o. For instance, the manipulator
+      `std::setfill('\\t')` sets indentation to use a tab character rather than
+      the default space character.
+
+    @param[in,out] o  stream to serialize to
+    @param[in] j  JSON value to serialize
+
+    @return the stream @a o
+
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
+    @complexity Linear.
+
+    @liveexample{The example below shows the serialization with different
+    parameters to `width` to adjust the indentation level.,operator_serialize}
+
+    @since version 1.0.0; indentation character added in version 3.0.0
+    */
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /*!
+    @brief serialize to stream
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use
+                @ref operator<<(std::ostream&, const basic_json&)
+                instead; that is, replace calls like `j >> o;` with `o << j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_HEDLEY_DEPRECATED(3.0.0)
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+
+    /// @}
+
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /*!
+    @brief deserialize from a compatible input
+
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
+
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an array.,parse__array__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__string__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__istream__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
+
+    @since version 2.0.3 (contiguous containers)
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(detail::input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(i, cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    static bool accept(detail::input_adapter&& i)
+    {
+        return parser(i).accept(true);
+    }
+
+    /*!
+    @brief generate SAX events
+
+    The SAX event lister must follow the interface of @ref json_sax.
+
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
+
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
+    @param[in,out] sax  SAX event listener
+    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
+    @param[in] strict  whether the input has to be consumed completely
+
+    @return return value of the last processed SAX event
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
+    a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `sax_parse()` function
+    reading from string and processing the events with a user-defined SAX
+    event consumer.,sax_parse}
+
+    @since version 3.2.0
+    */
+    template <typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true)
+    {
+        assert(sax);
+        return format == input_format_t::json
+               ? parser(std::move(i)).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, SAX>(std::move(i)).sax_parse(format, sax, strict);
+    }
+
+    /*!
+    @brief deserialize from an iterator range with contiguous storage
+
+    This function reads from an iterator range of a container with contiguous
+    storage of 1-byte values. Compatible container types include
+    `std::vector`, `std::string`, `std::array`, `std::valarray`, and
+    `std::initializer_list`. Furthermore, C-style arrays can be used with
+    `std::begin()`/`std::end()`. User-defined containers can be used as long
+    as they implement random-access iterators and a contiguous storage.
+
+    @pre The iterator range is contiguous. Violating this precondition yields
+    undefined behavior. **This precondition is enforced with an assertion.**
+    @pre Each element in the range has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with noncompliant iterators and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @tparam IteratorType iterator of container with contiguous storage
+    @param[in] first  begin of the range to parse (included)
+    @param[in] last  end of the range to parse (excluded)
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an iterator range.,parse__iteratortype__parser_callback_t}
+
+    @since version 2.0.3
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static basic_json parse(IteratorType first, IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static bool accept(IteratorType first, IteratorType last)
+    {
+        return parser(detail::input_adapter(first, last)).accept(true);
+    }
+
+    template<class IteratorType, class SAX, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax)
+    {
+        return parser(detail::input_adapter(first, last)).sax_parse(sax);
+    }
+
+    /*!
+    @brief deserialize from stream
+    @deprecated This stream operator is deprecated and will be removed in
+                version 4.0.0 of the library. Please use
+                @ref operator>>(std::istream&, basic_json&)
+                instead; that is, replace calls like `j << i;` with `i >> j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_HEDLEY_DEPRECATED(3.0.0)
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /*!
+    @brief deserialize from stream
+
+    Deserializes an input stream to a JSON value.
+
+    @param[in,out] i  input stream to read a serialized JSON value from
+    @param[in,out] j  JSON value to write the deserialized input to
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below shows how a JSON value is constructed by
+    reading a serialization from a stream.,operator_deserialize}
+
+    @sa parse(std::istream&, const parser_callback_t) for a variant with a
+    parser callback function to filter values while parsing
+
+    @since version 1.0.0
+    */
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /*!
+    @brief return the type as string
+
+    Returns the type name as string to be used in error messages - usually to
+    indicate that a function was called on a wrong JSON type.
+
+    @return a string representation of a the @a m_type member:
+            Value type  | return value
+            ----------- | -------------
+            null        | `"null"`
+            boolean     | `"boolean"`
+            string      | `"string"`
+            number      | `"number"` (for all number types)
+            object      | `"object"`
+            array       | `"array"`
+            discarded   | `"discarded"`
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Constant.
+
+    @liveexample{The following code exemplifies `type_name()` for all JSON
+    types.,type_name}
+
+    @sa @ref type() -- return the type of the JSON value
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+
+    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
+    since 3.0.0
+    */
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        {
+            switch (m_type)
+            {
+                case value_t::null:
+                    return "null";
+                case value_t::object:
+                    return "object";
+                case value_t::array:
+                    return "array";
+                case value_t::string:
+                    return "string";
+                case value_t::boolean:
+                    return "boolean";
+                case value_t::discarded:
+                    return "discarded";
+                default:
+                    return "number";
+            }
+        }
+    }
+
+
+  private:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    /// the type of the current element
+    value_t m_type = value_t::null;
+
+    /// the value of the current element
+    json_value m_value = {};
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /*!
+    @brief create a CBOR serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
+    Binary Object Representation) serialization format. CBOR is a binary
+    serialization format which aims to be more compact than JSON itself, yet
+    more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    CBOR types according to the CBOR specification (RFC 7049):
+
+    JSON value type | value/range                                | CBOR type                          | first byte
+    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
+    null            | `null`                                     | Null                               | 0xF6
+    boolean         | `true`                                     | True                               | 0xF5
+    boolean         | `false`                                    | False                              | 0xF4
+    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
+    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
+    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
+    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
+    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
+    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
+    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
+    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_float    | *any value*                                | Double-Precision Float             | 0xFB
+    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
+    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
+    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
+    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
+    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
+    array           | *size*: 0..23                              | array                              | 0x80..0x97
+    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
+    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
+    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
+    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
+    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
+    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
+    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
+    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
+    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a CBOR value.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The following CBOR types are not used in the conversion:
+          - byte strings (0x40..0x5F)
+          - UTF-8 strings terminated by "break" (0x7F)
+          - arrays terminated by "break" (0x9F)
+          - maps terminated by "break" (0xBF)
+          - date/time (0xC0..0xC1)
+          - bignum (0xC2..0xC3)
+          - decimal fraction (0xC4)
+          - bigfloat (0xC5)
+          - tagged items (0xC6..0xD4, 0xD8..0xDB)
+          - expected conversions (0xD5..0xD7)
+          - simple values (0xE0..0xF3, 0xF8)
+          - undefined (0xF7)
+          - half and single-precision floats (0xF9-0xFA)
+          - break (0xFF)
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in CBOR format.,to_cbor}
+
+    @sa http://cbor.io
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_cbor(j);
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /*!
+    @brief create a MessagePack serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the MessagePack
+    serialization format. MessagePack is a binary serialization format which
+    aims to be more compact than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    MessagePack types according to the MessagePack specification:
+
+    JSON value type | value/range                       | MessagePack type | first byte
+    --------------- | --------------------------------- | ---------------- | ----------
+    null            | `null`                            | nil              | 0xC0
+    boolean         | `true`                            | true             | 0xC3
+    boolean         | `false`                           | false            | 0xC2
+    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
+    number_integer  | -2147483648..-32769               | int32            | 0xD2
+    number_integer  | -32768..-129                      | int16            | 0xD1
+    number_integer  | -128..-33                         | int8             | 0xD0
+    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
+    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
+    number_integer  | 128..255                          | uint 8           | 0xCC
+    number_integer  | 256..65535                        | uint 16          | 0xCD
+    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
+    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
+    number_unsigned | 128..255                          | uint 8           | 0xCC
+    number_unsigned | 256..65535                        | uint 16          | 0xCD
+    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
+    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_float    | *any value*                       | float 64         | 0xCB
+    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
+    string          | *length*: 32..255                 | str 8            | 0xD9
+    string          | *length*: 256..65535              | str 16           | 0xDA
+    string          | *length*: 65536..4294967295       | str 32           | 0xDB
+    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
+    array           | *size*: 16..65535                 | array 16         | 0xDC
+    array           | *size*: 65536..4294967295         | array 32         | 0xDD
+    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
+    object          | *size*: 16..65535                 | map 16           | 0xDE
+    object          | *size*: 65536..4294967295         | map 32           | 0xDF
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a MessagePack value.
+
+    @note The following values can **not** be converted to a MessagePack value:
+          - strings with more than 4294967295 bytes
+          - arrays with more than 4294967295 elements
+          - objects with more than 4294967295 elements
+
+    @note The following MessagePack types are not used in the conversion:
+          - bin 8 - bin 32 (0xC4..0xC6)
+          - ext 8 - ext 32 (0xC7..0xC9)
+          - float 32 (0xCA)
+          - fixext 1 - fixext 16 (0xD4..0xD8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in MessagePack format.,to_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref from_msgpack for the analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_msgpack(j);
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /*!
+    @brief create a UBJSON serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the UBJSON
+    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
+    than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    UBJSON types according to the UBJSON specification:
+
+    JSON value type | value/range                       | UBJSON type | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | `Z`
+    boolean         | `true`                            | true        | `T`
+    boolean         | `false`                           | false       | `F`
+    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
+    number_integer  | -2147483648..-32769               | int32       | `l`
+    number_integer  | -32768..-129                      | int16       | `I`
+    number_integer  | -128..127                         | int8        | `i`
+    number_integer  | 128..255                          | uint8       | `U`
+    number_integer  | 256..32767                        | int16       | `I`
+    number_integer  | 32768..2147483647                 | int32       | `l`
+    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
+    number_unsigned | 0..127                            | int8        | `i`
+    number_unsigned | 128..255                          | uint8       | `U`
+    number_unsigned | 256..32767                        | int16       | `I`
+    number_unsigned | 32768..2147483647                 | int32       | `l`
+    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
+    number_float    | *any value*                       | float64     | `D`
+    string          | *with shortest length indicator*  | string      | `S`
+    array           | *see notes on optimized format*   | array       | `[`
+    object          | *see notes on optimized format*   | map         | `{`
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a UBJSON value.
+
+    @note The following values can **not** be converted to a UBJSON value:
+          - strings with more than 9223372036854775807 bytes (theoretical)
+          - unsigned integer numbers above 9223372036854775807
+
+    @note The following markers are not used in the conversion:
+          - `Z`: no-op values are not created.
+          - `C`: single-byte strings are serialized with `S` markers.
+
+    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
+          by @ref from_ubjson.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The optimized formats for containers are supported: Parameter
+          @a use_size adds size information to the beginning of a container and
+          removes the closing marker. Parameter @a use_type further checks
+          whether all elements of a container have the same type and adds the
+          type marker to the beginning of the container. The @a use_type
+          parameter must only be used together with @a use_size = true. Note
+          that @a use_size = true alone may result in larger representations -
+          the benefit of this parameter is that the receiving side is
+          immediately informed on the number of elements of the container.
+
+    @param[in] j  JSON value to serialize
+    @param[in] use_size  whether to add size annotations to container types
+    @param[in] use_type  whether to add type annotations to container types
+                         (must be combined with @a use_size = true)
+    @return UBJSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in UBJSON format.,to_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+
+    @since version 3.1.0
+    */
+    static std::vector<uint8_t> to_ubjson(const basic_json& j,
+                                          const bool use_size = false,
+                                          const bool use_type = false)
+    {
+        std::vector<uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+
+    /*!
+    @brief Serializes the given JSON object `j` to BSON and returns a vector
+           containing the corresponding BSON-representation.
+
+    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
+    stored as a single entity (a so-called document).
+
+    The library uses the following mapping from JSON values types to BSON types:
+
+    JSON value type | value/range                       | BSON type   | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | 0x0A
+    boolean         | `true`, `false`                   | boolean     | 0x08
+    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
+    number_integer  | -2147483648..2147483647           | int32       | 0x10
+    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 0..2147483647                     | int32       | 0x10
+    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
+    number_float    | *any value*                       | double      | 0x01
+    string          | *any value*                       | string      | 0x02
+    array           | *any value*                       | document    | 0x04
+    object          | *any value*                       | document    | 0x03
+
+    @warning The mapping is **incomplete**, since only JSON-objects (and things
+    contained therein) can be serialized to BSON.
+    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
+    and the keys may not contain U+0000, since they are serialized a
+    zero-terminated c-strings.
+
+    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
+    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
+    @throw type_error.317    if `!j.is_object()`
+
+    @pre The input `j` is required to be an object: `j.is_object() == true`.
+
+    @note Any BSON output created via @ref to_bson can be successfully parsed
+          by @ref from_bson.
+
+    @param[in] j  JSON value to serialize
+    @return BSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in BSON format.,to_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
+        analogous deserialization
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+    @sa @ref to_cbor(const basic_json&) for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    */
+    static std::vector<uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /*!
+    @brief Serializes the given JSON object `j` to BSON and forwards the
+           corresponding BSON-representation to the given output_adapter `o`.
+    @param j The JSON object to convert to BSON.
+    @param o The output adapter that receives the binary BSON representation.
+    @pre The input `j` shall be an object: `j.is_object() == true`
+    @sa @ref to_bson(const basic_json&)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_bson(j);
+    }
+
+    /*!
+    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+
+    /*!
+    @brief create a JSON value from an input in CBOR format
+
+    Deserializes a given input @a i to a JSON value using the CBOR (Concise
+    Binary Object Representation) serialization format.
+
+    The library maps CBOR types to JSON value types as follows:
+
+    CBOR type              | JSON value type | first byte
+    ---------------------- | --------------- | ----------
+    Integer                | number_unsigned | 0x00..0x17
+    Unsigned integer       | number_unsigned | 0x18
+    Unsigned integer       | number_unsigned | 0x19
+    Unsigned integer       | number_unsigned | 0x1A
+    Unsigned integer       | number_unsigned | 0x1B
+    Negative integer       | number_integer  | 0x20..0x37
+    Negative integer       | number_integer  | 0x38
+    Negative integer       | number_integer  | 0x39
+    Negative integer       | number_integer  | 0x3A
+    Negative integer       | number_integer  | 0x3B
+    Negative integer       | number_integer  | 0x40..0x57
+    UTF-8 string           | string          | 0x60..0x77
+    UTF-8 string           | string          | 0x78
+    UTF-8 string           | string          | 0x79
+    UTF-8 string           | string          | 0x7A
+    UTF-8 string           | string          | 0x7B
+    UTF-8 string           | string          | 0x7F
+    array                  | array           | 0x80..0x97
+    array                  | array           | 0x98
+    array                  | array           | 0x99
+    array                  | array           | 0x9A
+    array                  | array           | 0x9B
+    array                  | array           | 0x9F
+    map                    | object          | 0xA0..0xB7
+    map                    | object          | 0xB8
+    map                    | object          | 0xB9
+    map                    | object          | 0xBA
+    map                    | object          | 0xBB
+    map                    | object          | 0xBF
+    False                  | `false`         | 0xF4
+    True                   | `true`          | 0xF5
+    Null                   | `null`          | 0xF6
+    Half-Precision Float   | number_float    | 0xF9
+    Single-Precision Float | number_float    | 0xFA
+    Double-Precision Float | number_float    | 0xFB
+
+    @warning The mapping is **incomplete** in the sense that not all CBOR
+             types can be converted to a JSON value. The following CBOR types
+             are not supported and will yield parse errors (parse_error.112):
+             - byte strings (0x40..0x5F)
+             - date/time (0xC0..0xC1)
+             - bignum (0xC2..0xC3)
+             - decimal fraction (0xC4)
+             - bigfloat (0xC5)
+             - tagged items (0xC6..0xD4, 0xD8..0xDB)
+             - expected conversions (0xD5..0xD7)
+             - simple values (0xE0..0xF3, 0xF8)
+             - undefined (0xF7)
+
+    @warning CBOR allows map keys of any type, whereas JSON only allows
+             strings as keys in object values. Therefore, CBOR maps with keys
+             other than UTF-8 strings are rejected (parse_error.113).
+
+    @note Any CBOR output created @ref to_cbor can be successfully parsed by
+          @ref from_cbor.
+
+    @param[in] i  an input in CBOR format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from CBOR were
+    used in the given input @a v or if the input is not valid CBOR
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in CBOR
+    format to a JSON value.,from_cbor}
+
+    @sa http://cbor.io
+    @sa @ref to_cbor(const basic_json&) for the analogous serialization
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
+        related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(detail::input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::cbor, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(A1 && a1, A2 && a2,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::cbor, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in MessagePack format
+
+    Deserializes a given input @a i to a JSON value using the MessagePack
+    serialization format.
+
+    The library maps MessagePack types to JSON value types as follows:
+
+    MessagePack type | JSON value type | first byte
+    ---------------- | --------------- | ----------
+    positive fixint  | number_unsigned | 0x00..0x7F
+    fixmap           | object          | 0x80..0x8F
+    fixarray         | array           | 0x90..0x9F
+    fixstr           | string          | 0xA0..0xBF
+    nil              | `null`          | 0xC0
+    false            | `false`         | 0xC2
+    true             | `true`          | 0xC3
+    float 32         | number_float    | 0xCA
+    float 64         | number_float    | 0xCB
+    uint 8           | number_unsigned | 0xCC
+    uint 16          | number_unsigned | 0xCD
+    uint 32          | number_unsigned | 0xCE
+    uint 64          | number_unsigned | 0xCF
+    int 8            | number_integer  | 0xD0
+    int 16           | number_integer  | 0xD1
+    int 32           | number_integer  | 0xD2
+    int 64           | number_integer  | 0xD3
+    str 8            | string          | 0xD9
+    str 16           | string          | 0xDA
+    str 32           | string          | 0xDB
+    array 16         | array           | 0xDC
+    array 32         | array           | 0xDD
+    map 16           | object          | 0xDE
+    map 32           | object          | 0xDF
+    negative fixint  | number_integer  | 0xE0-0xFF
+
+    @warning The mapping is **incomplete** in the sense that not all
+             MessagePack types can be converted to a JSON value. The following
+             MessagePack types are not supported and will yield parse errors:
+              - bin 8 - bin 32 (0xC4..0xC6)
+              - ext 8 - ext 32 (0xC7..0xC9)
+              - fixext 1 - fixext 16 (0xD4..0xD8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @param[in] i  an input in MessagePack format convertible to an input
+                  adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from MessagePack were
+    used in the given input @a i or if the input is not valid MessagePack
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    MessagePack format to a JSON value.,from_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
+        the related UBJSON format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(detail::input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(A1 && a1, A2 && a2,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in UBJSON format
+
+    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
+    Binary JSON) serialization format.
+
+    The library maps UBJSON types to JSON value types as follows:
+
+    UBJSON type | JSON value type                         | marker
+    ----------- | --------------------------------------- | ------
+    no-op       | *no value, next value is read*          | `N`
+    null        | `null`                                  | `Z`
+    false       | `false`                                 | `F`
+    true        | `true`                                  | `T`
+    float32     | number_float                            | `d`
+    float64     | number_float                            | `D`
+    uint8       | number_unsigned                         | `U`
+    int8        | number_integer                          | `i`
+    int16       | number_integer                          | `I`
+    int32       | number_integer                          | `l`
+    int64       | number_integer                          | `L`
+    string      | string                                  | `S`
+    char        | string                                  | `C`
+    array       | array (optimized values are supported)  | `[`
+    object      | object (optimized values are supported) | `{`
+
+    @note The mapping is **complete** in the sense that any UBJSON value can
+          be converted to a JSON value.
+
+    @param[in] i  an input in UBJSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if a parse error occurs
+    @throw parse_error.113 if a string could not be parsed successfully
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    UBJSON format to a JSON value.,from_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(detail::input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(A1 && a1, A2 && a2,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief Create a JSON value from an input in BSON format
+
+    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
+    serialization format.
+
+    The library maps BSON record types to JSON value types as follows:
+
+    BSON type       | BSON marker byte | JSON value type
+    --------------- | ---------------- | ---------------------------
+    double          | 0x01             | number_float
+    string          | 0x02             | string
+    document        | 0x03             | object
+    array           | 0x04             | array
+    binary          | 0x05             | still unsupported
+    undefined       | 0x06             | still unsupported
+    ObjectId        | 0x07             | still unsupported
+    boolean         | 0x08             | boolean
+    UTC Date-Time   | 0x09             | still unsupported
+    null            | 0x0A             | null
+    Regular Expr.   | 0x0B             | still unsupported
+    DB Pointer      | 0x0C             | still unsupported
+    JavaScript Code | 0x0D             | still unsupported
+    Symbol          | 0x0E             | still unsupported
+    JavaScript Code | 0x0F             | still unsupported
+    int32           | 0x10             | number_integer
+    Timestamp       | 0x11             | still unsupported
+    128-bit decimal float | 0x13       | still unsupported
+    Max Key         | 0x7F             | still unsupported
+    Min Key         | 0xFF             | still unsupported
+
+    @warning The mapping is **incomplete**. The unsupported mappings
+             are indicated in the table above.
+
+    @param[in] i  an input in BSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.114 if an unsupported BSON record type is encountered
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    BSON format to a JSON value.,from_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref to_bson(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(detail::input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(A1 && a1, A2 && a2,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. Similar to @ref operator[](const typename
+    object_t::key_type&), `null` values are created in arrays and objects if
+    necessary.
+
+    In particular:
+    - If the JSON pointer points to an object key that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned.
+    - If the JSON pointer points to an array index that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned. All indices between the current maximum and the given
+      index are also filled with `null`.
+    - The special value `-` is treated as a synonym for the index past the
+      end.
+
+    @param[in] ptr  a JSON pointer
+
+    @return reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
+
+    @since version 2.0.0
+    */
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. The function does not change the JSON
+    value; no `null` values are created. In particular, the the special value
+    `-` yields an exception.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return const reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+
+    @since version 2.0.0
+    */
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a reference to the element at with specified JSON pointer @a ptr,
+    with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer}
+    */
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a const reference to the element at with specified JSON pointer @a
+    ptr, with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
+    */
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief return flattened JSON value
+
+    The function creates a JSON object whose keys are JSON pointers (see [RFC
+    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
+    primitive. The original JSON value can be restored using the @ref
+    unflatten() function.
+
+    @return an object that maps JSON pointers to primitive values
+
+    @note Empty objects and arrays are flattened to `null` and will not be
+          reconstructed correctly by the @ref unflatten() function.
+
+    @complexity Linear in the size the JSON value.
+
+    @liveexample{The following code shows how a JSON object is flattened to an
+    object whose keys consist of JSON pointers.,flatten}
+
+    @sa @ref unflatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /*!
+    @brief unflatten a previously flattened JSON value
+
+    The function restores the arbitrary nesting of a JSON value that has been
+    flattened before using the @ref flatten() function. The JSON value must
+    meet certain constraints:
+    1. The value must be an object.
+    2. The keys must be JSON pointers (see
+       [RFC 6901](https://tools.ietf.org/html/rfc6901))
+    3. The mapped values must be primitive JSON types.
+
+    @return the original JSON from a flattened version
+
+    @note Empty objects and arrays are flattened by @ref flatten() to `null`
+          values and can not unflattened to their original type. Apart from
+          this example, for a JSON value `j`, the following is always true:
+          `j == j.flatten().unflatten()`.
+
+    @complexity Linear in the size the JSON value.
+
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+
+    @liveexample{The following code shows how a flattened JSON object is
+    unflattened into the original nested JSON object.,unflatten}
+
+    @sa @ref flatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON patch
+
+    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
+    expressing a sequence of operations to apply to a JSON) document. With
+    this function, a JSON Patch is applied to the current JSON value by
+    executing all operations from the patch.
+
+    @param[in] json_patch  JSON patch document
+    @return patched document
+
+    @note The application of a patch is atomic: Either all operations succeed
+          and the patched document is returned or an exception is thrown. In
+          any case, the original value is not changed: the patch is applied
+          to a copy of the value.
+
+    @throw parse_error.104 if the JSON patch does not consist of an array of
+    objects
+
+    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
+    attributes are missing); example: `"operation add must have member path"`
+
+    @throw out_of_range.401 if an array index is out of range.
+
+    @throw out_of_range.403 if a JSON pointer inside the patch could not be
+    resolved successfully in the current JSON value; example: `"key baz not
+    found"`
+
+    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
+    "move")
+
+    @throw other_error.501 if "test" operation was unsuccessful
+
+    @complexity Linear in the size of the JSON value and the length of the
+    JSON patch. As usually only a fraction of the JSON value is affected by
+    the patch, the complexity can usually be neglected.
+
+    @liveexample{The following code shows how a JSON patch is applied to a
+    value.,patch}
+
+    @sa @ref diff -- create a JSON patch by comparing two JSON values
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+
+    @since version 2.0.0
+    */
+    basic_json patch(const basic_json& json_patch) const
+    {
+        // make a working copy to apply the patch to
+        basic_json result = *this;
+
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result[ptr];
+
+            switch (parent.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::array_index(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                default:            // LCOV_EXCL_LINE
+                    assert(false);  // LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [&result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(static_cast<size_type>(json_pointer::array_index(last_path)));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(not json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type and not it->second.is_string()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(not val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+            }
+
+            // collect mandatory members
+            const std::string op = get_value("op", "op", true);
+            const std::string path = get_value(op, "path", true);
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const std::string from_path = get_value("move", "from", true);
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const std::string from_path = get_value("copy", "from", true);
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(not success))
+                    {
+                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
+                    }
+
+                    break;
+                }
+
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief creates a diff as a JSON patch
+
+    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
+    be changed into the value @a target by calling @ref patch function.
+
+    @invariant For two JSON values @a source and @a target, the following code
+    yields always `true`:
+    @code {.cpp}
+    source.patch(diff(source, target)) == target;
+    @endcode
+
+    @note Currently, only `remove`, `add`, and `replace` operations are
+          generated.
+
+    @param[in] source  JSON value to compare from
+    @param[in] target  JSON value to compare against
+    @param[in] path    helper value to create JSON pointers
+
+    @return a JSON patch to convert the @a source to @a target
+
+    @complexity Linear in the lengths of @a source and @a target.
+
+    @liveexample{The following code shows how a JSON patch is created as a
+    diff for two JSON values.,diff}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa @ref merge_patch -- apply a JSON Merge Patch
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+
+    @since version 2.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() and i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // i now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", path + "/" + std::to_string(i)}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", path + "/" + std::to_string(i)},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto key = json_pointer::escape(it.key());
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path + "/" + key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto key = json_pointer::escape(it.key());
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path + "/" + key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON Merge Patch
+
+    The merge patch format is primarily intended for use with the HTTP PATCH
+    method as a means of describing a set of modifications to a target
+    resource's content. This function applies a merge patch to the current
+    JSON value.
+
+    The function implements the following algorithm from Section 2 of
+    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
+
+    ```
+    define MergePatch(Target, Patch):
+      if Patch is an Object:
+        if Target is not an Object:
+          Target = {} // Ignore the contents and set it to an empty Object
+        for each Name/Value pair in Patch:
+          if Value is null:
+            if Name exists in Target:
+              remove the Name/Value pair from Target
+          else:
+            Target[Name] = MergePatch(Target[Name], Value)
+        return Target
+      else:
+        return Patch
+    ```
+
+    Thereby, `Target` is the current object; that is, the patch is applied to
+    the current value.
+
+    @param[in] apply_patch  the patch to apply
+
+    @complexity Linear in the lengths of @a patch.
+
+    @liveexample{The following code shows how a JSON Merge Patch is applied to
+    a JSON document.,merge_patch}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
+
+    @since version 3.0.0
+    */
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (not is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/*!
+@brief user-defined to_string function for JSON values
+
+This function implements a user-defined to_string  for JSON objects.
+
+@param[in] j  a JSON object
+@return a std::string object
+*/
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+} // namespace nlohmann
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+// specialization of std::swap, and std::hash
+namespace std
+{
+
+/// hash value for JSON objects
+template<>
+struct hash<nlohmann::json>
+{
+    /*!
+    @brief return a hash value for a JSON object
+
+    @since version 1.0.0
+    */
+    std::size_t operator()(const nlohmann::json& j) const
+    {
+        // a naive hashing via the string representation
+        const auto& h = hash<nlohmann::json::string_t>();
+        return h(j.dump());
+    }
+};
+
+/// specialization for std::less<value_t>
+/// @note: do not remove the space after '<',
+///        see https://github.com/nlohmann/json/pull/679
+template<>
+struct less<::nlohmann::detail::value_t>
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(nlohmann::detail::value_t lhs,
+                    nlohmann::detail::value_t rhs) const noexcept
+    {
+        return nlohmann::detail::operator<(lhs, rhs);
+    }
+};
+
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
+    is_nothrow_move_constructible<nlohmann::json>::value and
+    is_nothrow_move_assignable<nlohmann::json>::value
+)
+{
+    j1.swap(j2);
+}
+
+} // namespace std
+
+/*!
+@brief user-defined string literal for JSON values
+
+This operator implements a user-defined string literal for JSON objects. It
+can be used by adding `"_json"` to a string literal and returns a JSON object
+if no parse error occurred.
+
+@param[in] s  a string representation of a JSON object
+@param[in] n  the length of string @a s
+@return a JSON object
+
+@since version 1.0.0
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/*!
+@brief user-defined string literal for JSON pointer
+
+This operator implements a user-defined string literal for JSON Pointers. It
+can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
+object if no parse error occurred.
+
+@param[in] s  a string representation of a JSON Pointer
+@param[in] n  the length of string @a s
+@return a JSON pointer object
+
+@since version 2.0.0
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+
+
+// restore GCC/clang diagnostic settings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+    #pragma GCC diagnostic pop
+#endif
+
+// clean up
+#undef JSON_INTERNAL_CATCH
+#undef JSON_CATCH
+#undef JSON_THROW
+#undef JSON_TRY
+#undef JSON_HAS_CPP_14
+#undef JSON_HAS_CPP_17
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FALL_THROUGH
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index d1fd7a1e..9c853055 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1060,6 +1060,7 @@ extern  cvar_t* con_autochat;
 extern	cvar_t* com_target_version;
 extern	cvar_t* com_target_game;
 extern	cvar_t* com_target_demo;
+extern	cvar_t* com_updateCheckInterval;
 
 extern	int		protocol_version_demo;
 extern	int		protocol_version_full;
@@ -1463,6 +1464,8 @@ dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *t
 void Sys_RemovePIDFile( const char *gamedir );
 void Sys_InitPIDFile( const char *gamedir );
 
+void Sys_ProcessBackgroundTasks();
+
 /* This is based on the Adaptive Huffman algorithm described in Sayood's Data
  * Compression book.  The ranks are not actually stored, but implicitly defined
  * by the location of a node within a doubly-linked list */
diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 15e6844a..d21624c6 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -35,12 +35,25 @@ if (APPLE)
 	set(SOURCES_PLATFORM_SPECIFIC ${SOURCES_PLATFORM_SPECIFIC} "${CMAKE_SOURCE_DIR}/code/sys/sys_osx.m")
 endif()
 
+set(SOURCES_PLATFORM_COMMON
+    "${CMAKE_SOURCE_DIR}/code/sys/sys_update_checker.cpp"
+)
+
 add_library(syslib INTERFACE)
-target_sources(syslib INTERFACE ${SOURCES_PLATFORM_SPECIFIC})
-target_compile_features(syslib INTERFACE cxx_nullptr)
+target_sources(syslib INTERFACE ${SOURCES_PLATFORM_SPECIFIC} ${SOURCES_PLATFORM_COMMON})
+target_compile_features(syslib INTERFACE cxx_nullptr cxx_std_17)
 target_compile_features(syslib INTERFACE c_variadic_macros)
 target_link_libraries(syslib INTERFACE qcommon)
 
+find_package(OpenSSL)
+
+if (NOT ${OPENSSL_FOUND})
+    message(WARNING "OpenSSL is not available, cpp-httplib won't work with SSL/TLS websites")
+endif()
+
+add_subdirectory("../cpp-httplib-0.19.0" "cpp-httplib-0.19.0")
+target_link_libraries(syslib INTERFACE httplib)
+
 if(WIN32)
 	target_link_libraries(syslib INTERFACE wsock32 ws2_32)
 	target_link_libraries(syslib INTERFACE winmm)
diff --git a/code/sys/new/sys_local_new.h b/code/sys/new/sys_local_new.h
index 581496f4..efb717f4 100644
--- a/code/sys/new/sys_local_new.h
+++ b/code/sys/new/sys_local_new.h
@@ -22,13 +22,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_version.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Setting DEFAULT_BASEDIR to an empty string will make
 // Sys_DefaultInstallPath() return the current directory instead
 // This was the usual behavior in Quake III Arena.
 #define DEFAULT_BASEDIR ""
 
 void Sys_InitEx();
+void Sys_ShutdownEx();
 
 void Sys_PrepareBackTrace();
 void Sys_PrintBackTrace();
-void Sys_PlatformInit_New();
\ No newline at end of file
+void Sys_PlatformInit_New();
+
+void Sys_UpdateChecker_Init();
+void Sys_UpdateChecker_Process();
+void Sys_UpdateChecker_Shutdown();
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index 61159776..1d3fe413 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../sys_local.h"
 #include "../win_localization.h"
 #include "../sys_loadlib.h"
+#include "../sys_update_checker.h"
 
 // a pointer to the last piece of data retrieved from the clipboard is stored here,
 // so that it can be cleaned up when new data is retrieved, preventing memory leaks
@@ -319,4 +320,15 @@ void VM_Forced_Unload_Done(void) {
 void Sys_InitEx()
 {
     Sys_InitLocalization();
+    Sys_UpdateChecker_Init();
+}
+
+void Sys_ShutdownEx()
+{
+    Sys_UpdateChecker_Shutdown();
+}
+
+void Sys_ProcessBackgroundTasks()
+{
+    Sys_UpdateChecker_Process();
 }
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 4a87a5d2..e70649fa 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -268,6 +268,8 @@ Single exit point (regular exit or in case of error)
 */
 static __attribute__ ((noreturn)) void Sys_Exit( int exitCode )
 {
+    Sys_ShutdownEx();
+
 	CON_Shutdown( );
 
 #ifndef DEDICATED
diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
new file mode 100644
index 00000000..70e26cca
--- /dev/null
+++ b/code/sys/sys_update_checker.cpp
@@ -0,0 +1,250 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "sys_update_checker.h"
+#include "../qcommon/q_version.h"
+
+#include <httplib.h>
+#include "../qcommon/json.hpp"
+using json = nlohmann::json;
+
+#include <chrono>
+
+UpdateChecker updateChecker;
+
+void Sys_UpdateChecker_Init()
+{
+    updateChecker.Init();
+}
+
+void Sys_UpdateChecker_Process()
+{
+    updateChecker.Process();
+}
+
+void Sys_UpdateChecker_Shutdown()
+{
+    updateChecker.Shutdown();
+}
+
+UpdateChecker::UpdateChecker()
+{
+    lastMajor = lastMinor = lastPatch = 0;
+    versionChecked                    = false;
+    client                            = NULL;
+    thread                            = NULL;
+}
+
+UpdateChecker::~UpdateChecker()
+{
+    if (client) {
+        Shutdown();
+    }
+}
+
+void UpdateChecker::Init()
+{
+    assert(!client);
+    assert(!thread);
+
+    try {
+        httplib::Client *updateCheckerClient = new httplib::Client("https://api.github.com");
+
+        client = updateCheckerClient;
+        thread = new std::thread(&UpdateChecker::RequestThread, this);
+    } catch (const std::exception& e) {
+        client = NULL;
+        thread = NULL;
+        Com_DPrintf("Failed to create update checker: %s\n", e.what());
+    }
+}
+
+void UpdateChecker::Process()
+{
+    std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
+    if (currentTime < lastMessageTime + std::chrono::milliseconds(std::max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
+        return;
+    }
+
+    if (!CheckNewVersion()) {
+        return;
+    }
+    lastMessageTime = currentTime;
+
+    Com_Printf(
+        "New release v%d.%d.%d published *\\(^ o ^)/*. Your current version is v%s. See www.openmohaa.org\n",
+        lastMajor,
+        lastMinor,
+        lastPatch,
+        PRODUCT_VERSION_NUMBER_STRING
+    );
+}
+
+void UpdateChecker::Shutdown()
+{
+    ShutdownClient();
+    ShutdownThread();
+}
+
+void UpdateChecker::ShutdownClient()
+{
+    std::lock_guard<std::shared_mutex> l(clientMutex);
+
+    if (!client) {
+        return;
+    }
+
+    delete (httplib::Client *)client;
+    client = NULL;
+}
+
+void UpdateChecker::ShutdownThread()
+{
+    if (!thread) {
+        return;
+    }
+
+    thread->join();
+    delete thread;
+    thread = NULL;
+}
+
+bool UpdateChecker::CheckNewVersion() const
+{
+    if (!versionChecked) {
+        return false;
+    }
+
+    if (lastMajor > PRODUCT_VERSION_MAJOR) {
+        return true;
+    } else if (lastMajor < PRODUCT_VERSION_MAJOR) {
+        return false;
+    }
+
+    if (lastMinor > PRODUCT_VERSION_MINOR) {
+        return true;
+    } else if (lastMinor < PRODUCT_VERSION_MINOR) {
+        return false;
+    }
+
+    if (lastPatch > PRODUCT_VERSION_PATCH) {
+        return true;
+    }
+
+    return false;
+}
+
+bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const
+{
+    const char *p  = value;
+    const char *pn = value;
+
+    if (*p != 'v') {
+        return false;
+    }
+
+    //
+    // Parse the major number
+    //
+    p++;
+    for (pn = p; *pn && *pn != '.'; pn++) {};
+
+    if (*pn != '.') {
+        return false;
+    }
+
+    major = std::stoi(std::string(p, pn - p));
+
+    //
+    // Parse the minor number
+    //
+    p = pn + 1;
+    for (pn = p; *pn && *pn != '.'; pn++) {};
+
+    if (*pn != '.') {
+        return false;
+    }
+
+    minor = std::stoi(std::string(p, pn - p));
+
+    //
+    // Parse the patch number
+    //
+    p = pn + 1;
+    for (pn = p; *pn && *pn != '.'; pn++) {};
+
+    if (*pn) {
+        return false;
+    }
+
+    patch = std::stoi(std::string(p, pn - p));
+
+    return true;
+}
+
+void UpdateChecker::DoRequest()
+{
+    std::lock_guard<std::shared_mutex> l(clientMutex);
+
+    httplib::Client *updateCheckerClient = (httplib::Client *)client;
+
+    if (!updateCheckerClient) {
+        return;
+    }
+
+    httplib::Result result = updateCheckerClient->Get("/repos/openmoh/openmohaa/releases/latest");
+    if (result.error() != httplib::Error::Success) {
+        return;
+    }
+    httplib::Response response = result.value();
+    nlohmann::json    data     = nlohmann::json::parse(response.body);
+
+    try {
+        const nlohmann::json::string_t& tagName = data.at("tag_name");
+
+        int major, minor, patch;
+        ParseVersionNumber(tagName.c_str(), major, minor, patch);
+
+        lastMajor = major;
+        lastMinor = minor;
+        lastPatch = patch;
+
+        versionChecked = true;
+    } catch (std::out_of_range&) {}
+}
+
+void UpdateChecker::RequestThread()
+{
+    std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
+    std::chrono::time_point<std::chrono::steady_clock> lastCheckTime;
+
+    while (client) {
+        currentTime = std::chrono::steady_clock::now();
+        if (currentTime >= lastCheckTime + std::chrono::milliseconds(std::max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
+            lastCheckTime = currentTime;
+
+            DoRequest();
+        }
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    }
+}
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
new file mode 100644
index 00000000..7231e096
--- /dev/null
+++ b/code/sys/sys_update_checker.h
@@ -0,0 +1,85 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "sys_local.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    void Sys_UpdateChecker_Init();
+    void Sys_UpdateChecker_Process();
+    void Sys_UpdateChecker_Shutdown();
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+
+#    include <thread>
+#    include <shared_mutex>
+#    include <chrono>
+
+class UpdateChecker
+{
+public:
+    UpdateChecker();
+    ~UpdateChecker();
+
+    void Init();
+    void Process();
+    void Shutdown();
+
+    bool CheckNewVersion() const;
+
+private:
+    void ShutdownClient();
+    void ShutdownThread();
+    void RequestThread();
+    void DoRequest();
+    bool ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const;
+
+private:
+    //
+    // Version information
+    //
+    int  lastMajor;
+    int  lastMinor;
+    int  lastPatch;
+    bool versionChecked;
+
+    std::chrono::time_point<std::chrono::steady_clock> lastMessageTime;
+
+    //
+    // Thread-related variables
+    //
+    void             *client;
+    std::shared_mutex clientMutex;
+    std::thread      *thread;
+};
+
+extern UpdateChecker updateChecker;
+
+#endif
diff --git a/docs/compiling.md b/docs/compiling.md
index 0eb3f76d..5ec809e2 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -6,24 +6,31 @@ The following tools are required for all platforms:
 - CMake >= 3.12
 - Flex (>= 2.6.4) and Bison (>= 3.5.1)
 - A C++11 compiler
-- OpenAL SDK (can be found [here](https://github.com/kcat/openal-soft))
+- [SDL2](https://github.com/libsdl-org/SDL/tree/SDL2)
+- [OpenAL SDK](https://github.com/kcat/openal-soft)
+
+The following tools may be useful:
+- [OpenSSL](https://github.com/openssl/openssl)
 
 The installation directory can be set to the MOHAA directory with `-DCMAKE_INSTALL_PREFIX=/path/to/mohaa`.
 
 Compiling debug binaries will result in a `-dbg` suffix appended to the name of the binaries to avoid mixing debug/release code.
 
+OpenSSL is used to access websites using TLS over HTTP. It is currently used to check for a new release. If OpenSSL is not installed, OpenMoHAA will be unable to check for new updates automatically.
+
 ## Compiling for Linux
 
 These are the tools required on Linux :
 - Clang >= 7.0.1 or GCC >= 9.4.0
 - libsdl2-dev
 - libopenal-dev
+- libssl-dev
 
 **clang-7** and **gcc-9** has been tested to work on Ubuntu 20.04. Although it's best to use the latest versions.
 
 1 line install command with clang:
 ```sh
-sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libopenal-dev
+sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libopenal-dev libssl-dev
 ```
 
 Example with **CMake** and **ninja-build** installed:
@@ -43,6 +50,8 @@ OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases
 
 Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.
 
+Optionally, you can append `-DOPENSSL_ROOT_DIR=path\to\openssl\install` to specify the path to OpenSSL.
+
 ## Tweaking the build
 
 - `-DBUILD_NO_CLIENT=1` Don't build client binaries. This will only build the dedicated server binaries.

From 08d0a378f8b76247e5c04f5d9518e19d62031b64 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:38:33 +0100
Subject: [PATCH 1952/2040] Fix compilation fail when DEBUG_MEM is set (#677)

---
 code/qcommon/lightclass.cpp | 12 ++++++++++++
 code/qcommon/lightclass.h   |  6 ++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/code/qcommon/lightclass.cpp b/code/qcommon/lightclass.cpp
index 8ced7e43..982b50bd 100644
--- a/code/qcommon/lightclass.cpp
+++ b/code/qcommon/lightclass.cpp
@@ -98,6 +98,18 @@ void LightClass::operator delete(void *ptr)
     Z_Free(p);
 #    endif
 }
+#else
+
+void *LightClass::operator new(size_t s)
+{
+    return ::operator new(s);
+}
+
+void LightClass::operator delete(void *ptr)
+{
+    ::operator delete(ptr);
+}
+
 #endif
 
 void* LightClass::operator new(size_t size, void* placement)
diff --git a/code/qcommon/lightclass.h b/code/qcommon/lightclass.h
index 3cd0526b..28b26b70 100644
--- a/code/qcommon/lightclass.h
+++ b/code/qcommon/lightclass.h
@@ -29,9 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 class LightClass
 {
 public:
-#ifndef _DEBUG_MEM
-    void *operator new(size_t);
-    void  operator delete(void *);
+    void *operator new(size_t s);
+    void  operator delete(void *ptr);
 
     void *operator new(size_t size, void *placement);
     void  operator delete(void *ptr, void *placement);
@@ -47,7 +46,6 @@ public:
     {
         return operator delete(ptr, (void *)&placement);
     }
-#endif
 };
 
 void DisplayMemoryUsage();

From 7addef4f5f03b8962bb6f01e44db82be9b03bac7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:44:00 +0100
Subject: [PATCH 1953/2040] Use Windows Server 2025 to compile Windows binaries

---
 .github/workflows/shared-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index e87a802a..fb5bd3e0 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -190,7 +190,7 @@ jobs:
   ##########################
   #
   # Microsoft Windows
-  # Windows Server 2022
+  # Windows Server 2025
   #
   ##########################
   build-platform-windows:
@@ -203,7 +203,7 @@ jobs:
         ]
 
     name: "Building for platform windows-${{matrix.architecture.name}}"
-    runs-on: "windows-2022"
+    runs-on: "windows-2025"
     environment: ${{ inputs.environment }}
 
     steps:

From 59706d46986c3350323b979caa0c64ef4239e0b1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Feb 2025 18:07:17 +0100
Subject: [PATCH 1954/2040] Cache third-party packages to optimize the build
 time

---
 .github/workflows/shared-build.yml | 107 ++++++++++++++++++++++-------
 1 file changed, 83 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index fb5bd3e0..4abd49e2 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -41,6 +41,9 @@ jobs:
     name: "Building for platform linux-${{matrix.architecture.name}}"
     runs-on: "ubuntu-22.04"
     environment: ${{ inputs.environment }}
+    env:
+        openssl-version: '3.4.1'
+        openal-soft-branch: '1.24.2'
 
     steps:
     ###
@@ -86,16 +89,24 @@ jobs:
     ###
     # OpenAL
     ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
 
     # soft-oal setup
     - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.2'
+        ref: '${{ env.openal-soft-branch }}'
 
     - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
         cmake -B ./build \
@@ -107,17 +118,25 @@ jobs:
     ###
     # OpenSSL
     ###
+    - name: Cache OpenSSL
+      id: cache-openssl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/openssl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openssl-${{ env.openssl-version }}-v1
 
     # OpenSSL setup
     - name: Checkout openssl
+      if: steps.cache-openssl.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
         repository: 'openssl/openssl'
         path: 'thirdparties/openssl'
-        ref: 'openssl-3.4.1'
+        ref: 'openssl-${{ env.openssl-version }}'
 
     # OpenSSL build
     - name: Configure and install openssl
+      if: steps.cache-openssl.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/thirdparties/openssl
       run: |
         CC=gcc-12 CFLAGS= ./Configure --prefix=${{github.workspace}}/thirdparties/openssl/install --cross-compile-prefix=${{matrix.architecture.triple}}- ${{matrix.architecture.arch_option}}
@@ -137,7 +156,7 @@ jobs:
         echo "CMAKE_PARAM=--log-level=VERBOSE \
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
-        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' \
         -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' \
         -DHTTPLIB_REQUIRE_OPENSSL=ON \
         -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
@@ -205,24 +224,29 @@ jobs:
     name: "Building for platform windows-${{matrix.architecture.name}}"
     runs-on: "windows-2025"
     environment: ${{ inputs.environment }}
+    env:
+        flexbison-branch: 'v2.5.25'
+        openssl-version: '3.4.1'
+        openal-soft-branch: '1.24.2'
 
     steps:
     ###
     # Packages
     ###
 
-    #
-    # Commented out for now, chocolatey servers started complaining about too many requests
-    #
-    #- name: Install required packages
-    #  run: |
-    #    choco install -y ninja
+    - name: Cache Flex/Bison
+      id: cache-flexbison
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/winflexbison-install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-flexbison-${{ env.flexbison-branch }}-v1
 
     - name: Install Flex/Bison
+      if: steps.cache-flexbison.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}
       run: |
         mkdir thirdparties && cd thirdparties
-        git clone --depth 1 --single-branch --branch v2.5.25 https://github.com/lexxmark/winflexbison.git
+        git clone --depth 1 --single-branch --branch ${{ env.flexbison-branch }} https://github.com/lexxmark/winflexbison.git
         cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
         cmake --build winflexbison-build --config Release --parallel
         cmake --install winflexbison-build --config Release
@@ -243,14 +267,25 @@ jobs:
         }
         popd
 
+    - name: Cache Required Packages
+      id: cache-required-packages
+      uses: actions/cache@v4
+      with:
+        path: 'C:\Packages'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-required-packages-v1
+
     - name: Install required packages
+      if: steps.cache-required-packages.outputs.cache-hit != 'true'
       run: |
         $DownloadPath="$($env:USERPROFILE)\Downloads"
         Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
-        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "$($env:PROGRAMFILES)\ninja"
-        Invoke-WebRequest "http://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
-        Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "$($env:PROGRAMFILES)\jom"
-        $env:PATH += ";$($env:PROGRAMFILES)\ninja;$($env:PROGRAMFILES)\jom"
+        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "C:\Packages\ninja"
+        Invoke-WebRequest "https://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
+        Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "C:\Packages\jom"
+
+    - name: Setup required packages path
+      run: |
+        $env:PATH += ";C:\Packages\ninja;C:\Packages\jom;"
         echo "PATH=$($env:PATH)" >> $env:GITHUB_ENV
 
     ###
@@ -269,18 +304,26 @@ jobs:
     ###
     # OpenAL
     ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
 
     # soft-oal setup
     - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.2'
+        ref: '${{ env.openal-soft-branch }}'
 
     # soft-oal build
     # Statically link the CRT runtime into OAL as a workaround to prevent crashes
     - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
         cmake -B ./build `
@@ -303,17 +346,25 @@ jobs:
     ###
     # OpenSSL
     ###
+    - name: Cache OpenSSL
+      id: cache-openssl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/openssl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openssl-${{ env.openssl-version }}-v1
 
     # OpenSSL setup
     - name: Checkout openssl
+      if: steps.cache-openssl.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
         repository: 'openssl/openssl'
         path: 'thirdparties/openssl'
-        ref: 'openssl-3.4.1'
+        ref: 'openssl-${{ env.openssl-version }}'
 
     # OpenSSL build
     - name: Configure and install openssl
+      if: steps.cache-openssl.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/thirdparties/openssl
       run: |
         perl .\Configure --prefix=${{github.workspace}}/thirdparties/openssl/install no-asm ${{matrix.architecture.arch_option}} /FS
@@ -336,7 +387,7 @@ jobs:
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
-        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/include' `
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' `
         -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' `
         -DHTTPLIB_REQUIRE_OPENSSL=ON `
         -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF `
@@ -414,17 +465,17 @@ jobs:
     name: "Building for platform macos-${{matrix.architecture.name}}"
     runs-on: "macos-15"
     environment: ${{inputs.environment}}
+    env:
+        openal-soft-branch: '1.24.2'
 
     steps:
     ###
     # Packages
     ###
-
-    # Install required packages
-    # Paths on x86_64 and ARM64 are different for homebrew
-    - name: Install required packages
-      run: |
-        brew update && brew install git flex bison ninja cmake llvm ninja perl
+    - uses: tecolicom/actions-use-homebrew-tools@b9c066b79607fa3d71e0be05d7003bb75fd9ff34
+      name: Install required packages
+      with:
+        tools: git flex bison ninja cmake llvm perl
 
     - name: Settings
       working-directory: ${{github.workspace}}
@@ -451,19 +502,27 @@ jobs:
     ###
     # OpenAL
     ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
 
     # soft-oal setup
     # Use GCC instead of Clang because of missing SSE intrinsics
     # It also doesn't enable altivec support on PowerPC by default
     - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
         repository: 'kcat/openal-soft'
         path: 'thirdparties/soft-oal'
-        ref: '1.24.2'
+        ref: '${{ env.openal-soft-branch }}'
 
     # soft-oal build
     - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/thirdparties/soft-oal
       run: |
         cmake -B ./build \

From ad527a703346c66502c6451e3418c9b29a66b785 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Feb 2025 20:29:13 +0100
Subject: [PATCH 1955/2040] Use ubuntu-22.04-arm OS for GitHub Actions to
 improve build time

---
 .github/workflows/shared-build.yml | 34 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 4abd49e2..825eaba9 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -23,23 +23,24 @@ jobs:
   # Linux
   # Ubuntu 22.04
   #
-  # Using this version instead of 24.04 to use a lower GLIBC version (2.34)
+  # Using this version instead of 24.04 to use a lower GLIBC version (2.34).
+  # ARM is used for more efficiency, and x64 is used for legacy architectures like PowerPC.
   ##########################
   build-platform-linux:
     strategy:
       matrix:
         architecture: [
-          {name: 'amd64',    triple: 'x86_64-linux-gnu',        arch_option: 'linux-x86_64'},
-          {name: 'i686',     triple: 'i686-linux-gnu',          arch_option: 'linux-x86'},
-          {name: 'arm64',    triple: 'aarch64-linux-gnu',       arch_option: 'linux-aarch64'},
-          {name: 'armhf',    triple: 'arm-linux-gnueabihf',     arch_option: 'linux-armv4'},
-          {name: 'powerpc',  triple: 'powerpc-linux-gnu',       arch_option: 'linux-ppc'},
-          {name: 'ppc64',    triple: 'powerpc64-linux-gnu',     arch_option: 'linux-ppc64'},
-          {name: 'ppc64el',  triple: 'powerpc64le-linux-gnu',   arch_option: 'linux-ppc64le'}
+          {name: 'amd64',   os: "ubuntu-22.04-arm", package: 'x86-64-linux-gnu',      triple: 'x86_64-linux-gnu',      arch_option: 'linux-x86_64'},
+          {name: 'i686',    os: "ubuntu-22.04-arm", package: 'i686-linux-gnu',        triple: 'i686-linux-gnu',        arch_option: 'linux-x86'},
+          {name: 'arm64',   os: "ubuntu-22.04-arm", package: 'aarch64-linux-gnu',     triple: 'aarch64-linux-gnu',     arch_option: 'linux-aarch64'},
+          {name: 'armhf',   os: "ubuntu-22.04-arm", package: 'arm-linux-gnueabihf',   triple: 'arm-linux-gnueabihf',   arch_option: 'linux-armv4'},
+          {name: 'powerpc', os: "ubuntu-22.04",     package: 'powerpc-linux-gnu',     triple: 'powerpc-linux-gnu',     arch_option: 'linux-ppc'},
+          {name: 'ppc64',   os: "ubuntu-22.04",     package: 'powerpc64-linux-gnu',   triple: 'powerpc64-linux-gnu',   arch_option: 'linux-ppc64'},
+          {name: 'ppc64el', os: "ubuntu-22.04-arm", package: 'powerpc64le-linux-gnu', triple: 'powerpc64le-linux-gnu', arch_option: 'linux-ppc64le'}
         ]
 
     name: "Building for platform linux-${{matrix.architecture.name}}"
-    runs-on: "ubuntu-22.04"
+    runs-on: ${{ matrix.architecture.os }}
     environment: ${{ inputs.environment }}
     env:
         openssl-version: '3.4.1'
@@ -54,14 +55,19 @@ jobs:
       name: Install required packages
       with:
         packages: flex bison ninja-build cmake clang libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
-        version: "0.1"
+        version: "${{ runner.os }}-${{ runner.arch }}-v1"
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "HOST_TRIPLE=$(gcc -dumpmachine)" >> $GITHUB_ENV
 
     - uses: awalsh128/cache-apt-pkgs-action@latest
-      name: Install required cross-platform packages (${{ matrix.architecture.triple }})
-      if: matrix.architecture.name != 'amd64'
+      name: Install required cross-platform packages (${{ matrix.architecture.package }})
+      if: env.HOST_TRIPLE != matrix.architecture.triple
       with:
-        packages: gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
-        version: "0.1"
+        packages: gcc-12-${{ matrix.architecture.package }} g++-12-${{ matrix.architecture.package }}
+        version: "${{ runner.os }}-${{ runner.arch }}-v1"
 
     - name: Settings
       working-directory: ${{github.workspace}}

From e98c725043ed4ed49e0c005c2c02040335bc01b4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Feb 2025 22:11:41 +0100
Subject: [PATCH 1956/2040] Fix player having no damage alpha in mohaas and
 mohaab (#678)

---
 code/fgame/player.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 273fe84c..7b10c5bb 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -6516,18 +6516,15 @@ void Player::DamageFeedback(void)
     //
     damage_blood = 0;
 
-    if (g_target_game >= target_game_e::TG_MOHTA) {
-        //
-        // Added in 2.0
-        //  No more damage angles since MOHTA
-        //
-
-        if (IsSubclassOfPlayer()) {
-            damage_count  = 0;
-            damage_blood  = 0;
-            damage_alpha  = 0;
-            damage_angles = vec_zero;
-        }
+    //
+    // Added in 2.0
+    //  Don't show damage when in god mode
+    //
+    if (flags & FL_GODMODE) {
+        damage_count  = 0;
+        damage_blood  = 0;
+        damage_alpha  = 0;
+        damage_angles = vec_zero;
     }
 }
 

From c1a66bf9e7ee67c1b3afbfc2cdcbf25f1703296b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Feb 2025 23:08:13 +0100
Subject: [PATCH 1957/2040] Update README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 44189e4b..c584f425 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,12 @@ One of the big multiplayer features are bots. They were introduced for testing a
 - [List of new features](docs/features.md)
 - [Scripting](docs/scripting.md)
 
+## Reporting issues
+
+If you encounter a bug, report it by creating a new [issue](https://github.com/openmoh/openmohaa/issues). Make sure to select the `Bug report` template and fill in the appropriate fields.
+
+If you need help or have a problem, you can head over to the [discussions](https://github.com/openmoh/openmohaa/discussions) or join the OpenMoHAA Discord server (the link is at the bottom of this README).
+
 ## Compiling
 
 - See [Compiling OpenMoHAA](docs/compiling.md)

From f89bfba5dc84d04431aeb0cd9a4a827baf71e78b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 28 Feb 2025 18:11:09 +0100
Subject: [PATCH 1958/2040] Replace tabs by spaces

---
 code/gamespy/darray.c      | 392 +++++++--------
 code/gamespy/darray.h      |   4 +-
 code/gamespy/gcrypt.c      |  33 ++
 code/gamespy/gserver.c     | 296 +++++------
 code/gamespy/gserver.h     |  28 +-
 code/gamespy/gserverlist.c | 994 ++++++++++++++++++-------------------
 code/gamespy/gutil.c       |  92 ++--
 code/gamespy/gutil.h       |   2 +-
 code/gamespy/hashtable.c   | 258 +++++-----
 code/gamespy/hashtable.h   |   4 +-
 code/gamespy/md5.h         |   2 +-
 code/gamespy/md5c.c        |  32 +-
 12 files changed, 1085 insertions(+), 1052 deletions(-)

diff --git a/code/gamespy/darray.c b/code/gamespy/darray.c
index 3db363e2..688729fb 100644
--- a/code/gamespy/darray.c
+++ b/code/gamespy/darray.c
@@ -20,30 +20,30 @@
 #define DEF_GROWBY 8
 
 #ifdef _NO_NOPORT_H_
-	#define gsimalloc	malloc
-	#define gsifree		free
-	#define gsirealloc	realloc
-	#include "common/gsAssert.h"
+    #define gsimalloc	malloc
+    #define gsifree		free
+    #define gsirealloc	realloc
+    #include "common/gsAssert.h"
 #else
-	#include "nonport.h" //for gsimalloc/realloc/free/GS_ASSERT
+    #include "nonport.h" //for gsimalloc/realloc/free/GS_ASSERT
 #endif
 
 
 // STRUCTURES
 struct DArrayImplementation
 {
-	int count, capacity;
-	int elemsize;
-	int growby;
-	ArrayElementFreeFn elemfreefn;
-	void *list; //array of elements
+    int count, capacity;
+    int elemsize;
+    int growby;
+    ArrayElementFreeFn elemfreefn;
+    void *list; //array of elements
 };
 
 // PROTOTYPES
 static void *mylsearch(const void *key, void *base, int count, int size,
-					 ArrayCompareFn comparator);
+                     ArrayCompareFn comparator);
 static void *mybsearch(const void *elem, void *base, int num, int elemsize, 
-					   ArrayCompareFn comparator, int *found);
+                       ArrayCompareFn comparator, int *found);
 // FUNCTIONS
 
 /* FreeElement
@@ -51,8 +51,8 @@ static void *mybsearch(const void *elem, void *base, int num, int elemsize,
  */
 static void FreeElement(DArray array, int n)
 {
-	if (array->elemfreefn != NULL)
-		array->elemfreefn(ArrayNth(array,n));
+    if (array->elemfreefn != NULL)
+        array->elemfreefn(ArrayNth(array,n));
 }
 
 /* ArrayGrow
@@ -60,10 +60,10 @@ static void FreeElement(DArray array, int n)
  */
 static void ArrayGrow(DArray array)
 {
-	GS_ASSERT(array->elemsize)	// sanity check -mj Oct 31st
-	array->capacity +=  array->growby;
-	array->list = gsirealloc(array->list, (size_t) array->capacity * array->elemsize);
-	GS_ASSERT(array->list);
+    GS_ASSERT(array->elemsize)	// sanity check -mj Oct 31st
+    array->capacity +=  array->growby;
+    array->list = gsirealloc(array->list, (size_t) array->capacity * array->elemsize);
+    GS_ASSERT(array->list);
 }
 
 /* SetElement
@@ -71,94 +71,94 @@ static void ArrayGrow(DArray array)
  */
 static void SetElement(DArray array, const void *elem, int pos)
 {
-	GS_ASSERT(array)			// safety check -mj Oct 31st
-	GS_ASSERT(elem)	
-	GS_ASSERT(array->elemsize)	
+    GS_ASSERT(array)			// safety check -mj Oct 31st
+    GS_ASSERT(elem)	
+    GS_ASSERT(array->elemsize)	
 
-	memcpy(ArrayNth(array,pos), elem, (size_t)array->elemsize);
+    memcpy(ArrayNth(array,pos), elem, (size_t)array->elemsize);
 }
 
 DArray ArrayNew(int elemSize, int numElemsToAllocate, 
                 ArrayElementFreeFn elemFreeFn)
 {
-	DArray array;
+    DArray array;
 
-	array = (DArray) gsimalloc(sizeof(struct DArrayImplementation));
-	GS_ASSERT(array);
-	GS_ASSERT(elemSize);
-	if (numElemsToAllocate == 0)
-		numElemsToAllocate = DEF_GROWBY;
-	array->count	= 0;
-	array->capacity = numElemsToAllocate;;
-	array->elemsize = elemSize;
-	array->growby	= numElemsToAllocate;
-	array->elemfreefn = elemFreeFn;
-	if (array->capacity != 0)
-	{
-		array->list = gsimalloc((size_t)array->capacity * array->elemsize);
-		GS_ASSERT(array->list);
-	} else
-		array->list = NULL;
+    array = (DArray) gsimalloc(sizeof(struct DArrayImplementation));
+    GS_ASSERT(array);
+    GS_ASSERT(elemSize);
+    if (numElemsToAllocate == 0)
+        numElemsToAllocate = DEF_GROWBY;
+    array->count	= 0;
+    array->capacity = numElemsToAllocate;;
+    array->elemsize = elemSize;
+    array->growby	= numElemsToAllocate;
+    array->elemfreefn = elemFreeFn;
+    if (array->capacity != 0)
+    {
+        array->list = gsimalloc((size_t)array->capacity * array->elemsize);
+        GS_ASSERT(array->list);
+    } else
+        array->list = NULL;
 
-	return array;
+    return array;
 }
 
 void ArrayFree(DArray array)
 {
-	int i;
-	
-	GS_ASSERT(array);
-	for (i = 0; i < array->count; i++)
-	{
-		FreeElement(array, i);
-	}
-	// mj to do: move these asserts into gsi_free.  maybe, depends on whether user overloads them
-	GS_ASSERT(array->list)
-	GS_ASSERT(array)
-	gsifree(array->list);
-	gsifree(array);
+    int i;
+    
+    GS_ASSERT(array);
+    for (i = 0; i < array->count; i++)
+    {
+        FreeElement(array, i);
+    }
+    // mj to do: move these asserts into gsi_free.  maybe, depends on whether user overloads them
+    GS_ASSERT(array->list)
+    GS_ASSERT(array)
+    gsifree(array->list);
+    gsifree(array);
 }
 
 void *ArrayGetDataPtr(DArray array)
 {
-	GS_ASSERT(array);
-	return array->list;
+    GS_ASSERT(array);
+    return array->list;
 }
 
 void ArraySetDataPtr(DArray array, void *ptr, int count, int capacity)
 {
-	int i;
-	
-	GS_ASSERT(array);
-	if (array->list != NULL)
-	{
-		for (i = 0; i < array->count; i++)
-		{
-			FreeElement(array, i);
-		}
-		gsifree(array->list);
-	}
-	array->list = ptr;
-	array->count = count;
-	array->capacity = capacity;
+    int i;
+    
+    GS_ASSERT(array);
+    if (array->list != NULL)
+    {
+        for (i = 0; i < array->count; i++)
+        {
+            FreeElement(array, i);
+        }
+        gsifree(array->list);
+    }
+    array->list = ptr;
+    array->count = count;
+    array->capacity = capacity;
 
 }
 
 
 int ArrayLength(const DArray array)
 {
-	GS_ASSERT(array)
-	return array->count;
+    GS_ASSERT(array)
+    return array->count;
 }
 
 void *ArrayNth(DArray array, int n)
 {
-	// 2004.Nov.16.JED - modified GS_ASSERT to include "if" to add robustness
-	GS_ASSERT( (n >= 0) && (n < array->count));
-	if( ! ((n >= 0) && (n < array->count)) )
-		return NULL;
-	
-	return (char *)array->list + array->elemsize*n;
+    // 2004.Nov.16.JED - modified GS_ASSERT to include "if" to add robustness
+    GS_ASSERT( (n >= 0) && (n < array->count));
+    if( ! ((n >= 0) && (n < array->count)) )
+        return NULL;
+    
+    return (char *)array->list + array->elemsize*n;
 }
 
 /* ArrayAppend
@@ -166,166 +166,166 @@ void *ArrayNth(DArray array, int n)
  */
 void ArrayAppend(DArray array, const void *newElem)
 {
-	GS_ASSERT(array);
-	if(array)
-		ArrayInsertAt(array, newElem, array->count);
+    GS_ASSERT(array);
+    if(array)
+        ArrayInsertAt(array, newElem, array->count);
 }
 
 void ArrayInsertAt(DArray array, const void *newElem, int n)
 {
-	GS_ASSERT (array)
-	GS_ASSERT ( (n >= 0) && (n <= array->count));
+    GS_ASSERT (array)
+    GS_ASSERT ( (n >= 0) && (n <= array->count));
 
-	if (array->count == array->capacity)
-		ArrayGrow(array);
-	array->count++;
-	if (n < array->count - 1) //if we aren't appending
-		memmove(ArrayNth(array, n+1), ArrayNth(array,n), 
-				(size_t)(array->count - 1 - n) * array->elemsize);
-	SetElement(array, newElem, n);
+    if (array->count == array->capacity)
+        ArrayGrow(array);
+    array->count++;
+    if (n < array->count - 1) //if we aren't appending
+        memmove(ArrayNth(array, n+1), ArrayNth(array,n), 
+                (size_t)(array->count - 1 - n) * array->elemsize);
+    SetElement(array, newElem, n);
 }
 
 void ArrayInsertSorted(DArray array, const void *newElem, ArrayCompareFn comparator)
 {
-	int n;
-	void *res;
-	int found;
+    int n;
+    void *res;
+    int found;
 
-	GS_ASSERT (array)
-	GS_ASSERT (comparator);
+    GS_ASSERT (array)
+    GS_ASSERT (comparator);
 
-	res=mybsearch(newElem, array->list,	array->count, array->elemsize, comparator, &found);
-	n = (((char *)res - (char *)array->list) / array->elemsize);
-	ArrayInsertAt(array, newElem, n);
+    res=mybsearch(newElem, array->list,	array->count, array->elemsize, comparator, &found);
+    n = (((char *)res - (char *)array->list) / array->elemsize);
+    ArrayInsertAt(array, newElem, n);
 }
 
 
 void ArrayRemoveAt(DArray array, int n)
 {
- 	GS_ASSERT (array)
-  	GS_ASSERT( (n >= 0) && (n < array->count));
+     GS_ASSERT (array)
+      GS_ASSERT( (n >= 0) && (n < array->count));
 
-	if (n < array->count - 1) //if not last element
-		memmove(ArrayNth(array,n),ArrayNth(array,n+1),
-			    (size_t)(array->count - 1 - n) * array->elemsize);
-	array->count--;
+    if (n < array->count - 1) //if not last element
+        memmove(ArrayNth(array,n),ArrayNth(array,n+1),
+                (size_t)(array->count - 1 - n) * array->elemsize);
+    array->count--;
 }
 
 void ArrayDeleteAt(DArray array, int n)
 {
- 	GS_ASSERT (array)
-   	GS_ASSERT ( (n >= 0) && (n < array->count));
+     GS_ASSERT (array)
+       GS_ASSERT ( (n >= 0) && (n < array->count));
 
-	FreeElement(array,n);
-	ArrayRemoveAt(array, n);
+    FreeElement(array,n);
+    ArrayRemoveAt(array, n);
 }
 
 
 void ArrayReplaceAt(DArray array, const void *newElem, int n)
 {
- 	GS_ASSERT (array)
-	GS_ASSERT ( (n >= 0) && (n < array->count));
+     GS_ASSERT (array)
+    GS_ASSERT ( (n >= 0) && (n < array->count));
 
-	FreeElement(array, n);
-	SetElement(array, newElem,n);
+    FreeElement(array, n);
+    SetElement(array, newElem,n);
 }
 
 
 void ArraySort(DArray array, ArrayCompareFn comparator)
 {
- 	GS_ASSERT (array)
-	qsort(array->list, (size_t)array->count, (size_t)array->elemsize, comparator);
+     GS_ASSERT (array)
+    qsort(array->list, (size_t)array->count, (size_t)array->elemsize, comparator);
 }
 
 //GS_ASSERT will be raised by ArrayNth if fromindex out of range
 int ArraySearch(DArray array, const void *key, ArrayCompareFn comparator, 
                   int fromIndex, int isSorted)
 {
-	void *res;
-	int found = 1;
-	if (!array || array->count == 0)
-		return NOT_FOUND;
+    void *res;
+    int found = 1;
+    if (!array || array->count == 0)
+        return NOT_FOUND;
 
-   	if (isSorted)
-		res=mybsearch(key, ArrayNth(array,fromIndex),
-					array->count - fromIndex, array->elemsize, comparator, &found);
-	else
-		res=mylsearch(key, ArrayNth(array, fromIndex), 
-					  array->count - fromIndex, array->elemsize, comparator);
-	if (res != NULL && found)
-		return (((char *)res - (char *)array->list) / array->elemsize);
-	else
-		return NOT_FOUND;
+       if (isSorted)
+        res=mybsearch(key, ArrayNth(array,fromIndex),
+                    array->count - fromIndex, array->elemsize, comparator, &found);
+    else
+        res=mylsearch(key, ArrayNth(array, fromIndex), 
+                      array->count - fromIndex, array->elemsize, comparator);
+    if (res != NULL && found)
+        return (((char *)res - (char *)array->list) / array->elemsize);
+    else
+        return NOT_FOUND;
 }
 
 
 void ArrayMap(DArray array, ArrayMapFn fn, void *clientData)
 {
-	int i;
+    int i;
 
- 	GS_ASSERT (array)
-	GS_ASSERT(fn);
+     GS_ASSERT (array)
+    GS_ASSERT(fn);
 
-	for (i = 0; i < array->count; i++)
-		fn(ArrayNth(array,i), clientData);
-		
+    for (i = 0; i < array->count; i++)
+        fn(ArrayNth(array,i), clientData);
+        
 }
 
 void ArrayMapBackwards(DArray array, ArrayMapFn fn, void *clientData)
 {
-	int i;
+    int i;
 
-	GS_ASSERT(fn);
+    GS_ASSERT(fn);
 
-	for (i = (array->count - 1) ; i >= 0 ; i--)
-		fn(ArrayNth(array,i), clientData);
-		
+    for (i = (array->count - 1) ; i >= 0 ; i--)
+        fn(ArrayNth(array,i), clientData);
+        
 }
 
 void * ArrayMap2(DArray array, ArrayMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
+    int i;
+    void * pcurr;
 
-	GS_ASSERT(fn);
-	GS_ASSERT(clientData);
+    GS_ASSERT(fn);
+    GS_ASSERT(clientData);
 
-	for (i = 0; i < array->count; i++)
-	{
-		pcurr = ArrayNth(array,i);
-		if(!fn(pcurr, clientData))
-			return pcurr;
-	}
+    for (i = 0; i < array->count; i++)
+    {
+        pcurr = ArrayNth(array,i);
+        if(!fn(pcurr, clientData))
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void * ArrayMapBackwards2(DArray array, ArrayMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
+    int i;
+    void * pcurr;
 
-	GS_ASSERT(fn);
-	GS_ASSERT(clientData);
+    GS_ASSERT(fn);
+    GS_ASSERT(clientData);
 
-	for (i = (array->count - 1) ; i >= 0 ; i--)
-	{
-		pcurr = ArrayNth(array,i);
-		if(!fn(pcurr, clientData))
-			return pcurr;
-	}
+    for (i = (array->count - 1) ; i >= 0 ; i--)
+    {
+        pcurr = ArrayNth(array,i);
+        if(!fn(pcurr, clientData))
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void ArrayClear(DArray array)
 {
-	int i;
+    int i;
 
-	// This could be more optimal!
-	//////////////////////////////
-	for(i = (ArrayLength(array) - 1) ; i >= 0 ; i--)
-		ArrayDeleteAt(array, i);
+    // This could be more optimal!
+    //////////////////////////////
+    for(i = (ArrayLength(array) - 1) ; i >= 0 ; i--)
+        ArrayDeleteAt(array, i);
 }
 
 /* mylsearch
@@ -333,17 +333,17 @@ void ArrayClear(DArray array)
  * couldn't use lfind
  */
 static void *mylsearch(const void *key, void *base, int count, int size,
-					 ArrayCompareFn comparator)
+                     ArrayCompareFn comparator)
 {
-	int i;
-	GS_ASSERT(key);
-	GS_ASSERT(base);
-	for (i = 0; i < count; i++)
-	{
-		if (comparator(key, (char *)base + size*i) == 0)
-			return (char *)base + size*i;
-	}
-	return NULL;
+    int i;
+    GS_ASSERT(key);
+    GS_ASSERT(base);
+    for (i = 0; i < count; i++)
+    {
+        if (comparator(key, (char *)base + size*i) == 0)
+            return (char *)base + size*i;
+    }
+    return NULL;
 }
 
 /* mybsearch
@@ -351,27 +351,27 @@ static void *mylsearch(const void *key, void *base, int count, int size,
  */
 static void *mybsearch(const void *elem, void *base, int num, int elemsize, ArrayCompareFn comparator, int *found)
 {
-	int L, H, I, C;
-	
-	GS_ASSERT(elem);
-	GS_ASSERT(base);
-	GS_ASSERT(found);
+    int L, H, I, C;
+    
+    GS_ASSERT(elem);
+    GS_ASSERT(base);
+    GS_ASSERT(found);
 
-	L = 0;
-	H = num - 1;
-	*found = 0;
-	while (L <= H)
-	{
-		I = (L + H) >> 1;
-		C = comparator(((char *)base) + I * elemsize,elem);
-		if (C == 0)
-			*found = 1;
-		if (C < 0) 
-			L = I + 1;
-		else
-		{
-			H = I - 1;
-		}
-	}
-	return ((char *)base) + L * elemsize;
+    L = 0;
+    H = num - 1;
+    *found = 0;
+    while (L <= H)
+    {
+        I = (L + H) >> 1;
+        C = comparator(((char *)base) + I * elemsize,elem);
+        if (C == 0)
+            *found = 1;
+        if (C < 0) 
+            L = I + 1;
+        else
+        {
+            H = I - 1;
+        }
+    }
+    return ((char *)base) + L * elemsize;
 }
diff --git a/code/gamespy/darray.h b/code/gamespy/darray.h
index ad84b13f..29ed76cc 100644
--- a/code/gamespy/darray.h
+++ b/code/gamespy/darray.h
@@ -43,9 +43,9 @@ typedef struct DArrayImplementation *DArray;
  * If the two elements are "equal", return 0.
  */
 #if defined(WIN32)
-	typedef int (__cdecl *ArrayCompareFn)(const void *elem1, const void *elem2);
+    typedef int (__cdecl *ArrayCompareFn)(const void *elem1, const void *elem2);
 #else
-	typedef int (*ArrayCompareFn)(const void *elem1, const void *elem2);
+    typedef int (*ArrayCompareFn)(const void *elem1, const void *elem2);
 #endif
 
 
diff --git a/code/gamespy/gcrypt.c b/code/gamespy/gcrypt.c
index ed0f6ab4..372e239d 100644
--- a/code/gamespy/gcrypt.c
+++ b/code/gamespy/gcrypt.c
@@ -188,3 +188,36 @@ void crypt_docrypt(GCryptInfo *info, unsigned char *out, int len)
         info->wordPtr++;
     }
 }
+
+int enctype2_encoder(unsigned char *secKey, unsigned char *data, int size)
+{
+    GCryptInfo info = {0};
+    int        i;
+    int        header_size = 8;
+
+    // move the data and put it after the header
+    for (i = size - 1; i >= 0; i--) {
+        data[1 + header_size + i] = data[i];
+    }
+
+    // initialize the header
+    for (i = 0; i < header_size; i++) {
+        data[i + 1] = 0;
+    }
+
+    // initialize the crypt key
+    init_crypt_key(data + 1, header_size, &info);
+
+    for (i = 0; i < 6; i++) {
+        data[1 + header_size + size + i] = 0;
+    }
+    crypt_docrypt(&info, data + 1 + header_size, size + 6);
+
+    for (i = 0; secKey[i]; i++) {
+        data[i + 1] ^= secKey[i];
+    }
+
+    size += 1 + header_size + 6;
+    *data = header_size ^ 0xec;
+    return size;
+}
diff --git a/code/gamespy/gserver.c b/code/gamespy/gserver.c
index d5ccc7fe..13571064 100644
--- a/code/gamespy/gserver.c
+++ b/code/gamespy/gserver.c
@@ -13,17 +13,17 @@ Fax(714)549-0757
 ******
 
 Updated 10-15-99 (BGW)
-	Modified ServerParseKeyVals to actually parse and store empty
-	values for keys (i.e. "\delete\\" adds key="delete" and value="")
+    Modified ServerParseKeyVals to actually parse and store empty
+    values for keys (i.e. "\delete\\" adds key="delete" and value="")
 Updated 6-17-99 (DDW)
-	Added new tokenize function to handle empty values for keys
+    Added new tokenize function to handle empty values for keys
   
-	
+    
 *******/
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
-	#include "::nonport.h"
+    #include "::nonport.h"
 #else
-	#include "../nonport.h"
+    #include "../nonport.h"
 #endif
 #include "goaceng.h"
 #include "gserver.h"
@@ -43,11 +43,11 @@ static char *LookupKey(GServer server, char *k);
 
 void ServerFree(void *elem)
 {
-	//free a server!
-	GServer server = *(GServer *)elem;
-	
-	TableFree(server->keyvals);
-	free(server);
+    //free a server!
+    GServer server = *(GServer *)elem;
+    
+    TableFree(server->keyvals);
+    free(server);
 }
 
 static void ServerSetAddressFromString (GServer server, char *address)
@@ -106,107 +106,107 @@ GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQuery
 
 GServer ServerNew(unsigned long ip, unsigned short port, GQueryType qtype, HashTable keylist)
 {
-	GServer server;
-	int nBuckets, nChains;
+    GServer server;
+    int nBuckets, nChains;
 
-	server = malloc(sizeof(struct GServerImplementation));
-	server->ip = ip;
-	server->port = port;
-	server->ping = 9999;
-	server->querytype = qtype;
-	/* optimize the number of buckets / chains based on query type */
-	switch (qtype)
-	{
-	case qt_basic:
-		nBuckets = 4;
-		nChains = 2;
-		break;
-	case qt_info:
-		nBuckets = 6;
-		nChains = 2;
-		break;
-	case qt_players:
-	case qt_rules:
-		nBuckets = 8;
-		nChains = 2;
-		break;
-	case qt_info_rules:
-	case qt_status:
-	default:
-		nBuckets = 8;
-		nChains=  4;
-		break;
-	}
-	server->keyvals = TableNew2(sizeof(GKeyValuePair),nBuckets,nChains, KeyValHashKeyP, KeyValCompareKeyP, NULL);
-	server->keylist = keylist;
-	return server;
+    server = malloc(sizeof(struct GServerImplementation));
+    server->ip = ip;
+    server->port = port;
+    server->ping = 9999;
+    server->querytype = qtype;
+    /* optimize the number of buckets / chains based on query type */
+    switch (qtype)
+    {
+    case qt_basic:
+        nBuckets = 4;
+        nChains = 2;
+        break;
+    case qt_info:
+        nBuckets = 6;
+        nChains = 2;
+        break;
+    case qt_players:
+    case qt_rules:
+        nBuckets = 8;
+        nChains = 2;
+        break;
+    case qt_info_rules:
+    case qt_status:
+    default:
+        nBuckets = 8;
+        nChains=  4;
+        break;
+    }
+    server->keyvals = TableNew2(sizeof(GKeyValuePair),nBuckets,nChains, KeyValHashKeyP, KeyValCompareKeyP, NULL);
+    server->keylist = keylist;
+    return server;
 }
 
 
 static char *mytok(char *instr, char delim)
 {
-	char *result;
-	static char *thestr;
+    char *result;
+    static char *thestr;
 
-	if (instr)
-		thestr = instr;
-	result=thestr;
-	while (*thestr && *thestr != delim)
-	{
-		thestr++;
-	}
-	if (thestr == result)
-		result = NULL;
-	if (*thestr) //not the null term
-		*thestr++ = '\0';
-	return result;
+    if (instr)
+        thestr = instr;
+    result=thestr;
+    while (*thestr && *thestr != delim)
+    {
+        thestr++;
+    }
+    if (thestr == result)
+        result = NULL;
+    if (*thestr) //not the null term
+        *thestr++ = '\0';
+    return result;
 }
 
 static int CheckValidKey(char *key)
 {
-	const char *InvalidKeys[]={"queryid","final"};
-	int i;
-	for (i = 0; i < sizeof(InvalidKeys)/sizeof(InvalidKeys[0]); i++)
-	{
-		if (strcmp(key,InvalidKeys[i]) == 0)
-			return 0;
-	}
-	return 1;
+    const char *InvalidKeys[]={"queryid","final"};
+    int i;
+    for (i = 0; i < sizeof(InvalidKeys)/sizeof(InvalidKeys[0]); i++)
+    {
+        if (strcmp(key,InvalidKeys[i]) == 0)
+            return 0;
+    }
+    return 1;
 }
 
 
 static char *LookupKey(GServer server, char *k)
 {
-	char **keyindex;
+    char **keyindex;
 
-	keyindex = (char **)TableLookup(server->keylist,&k);
-	if (keyindex != NULL)
-		return *keyindex;
-	k = strdup(k);
-	TableEnter(server->keylist,&k);
-	return k;
+    keyindex = (char **)TableLookup(server->keylist,&k);
+    if (keyindex != NULL)
+        return *keyindex;
+    k = strdup(k);
+    TableEnter(server->keylist,&k);
+    return k;
 }
 
 void ServerParseKeyVals(GServer server, char *keyvals)
 {
-	char *k, *v;
-	GKeyValuePair kvpair;
+    char *k, *v;
+    GKeyValuePair kvpair;
 
-	k = mytok(++keyvals,'\\'); //skip over starting backslash
-	while (k != NULL)
-	{
-		v = mytok(NULL,'\\');
-		if (v == NULL)
-			v = "";
-		if (CheckValidKey(k))
-		{
-			kvpair.key = LookupKey(server, k);
-			kvpair.value = LookupKey(server, v);
-			TableEnter(server->keyvals, &kvpair);
-		}
-		k = mytok(NULL,'\\');
+    k = mytok(++keyvals,'\\'); //skip over starting backslash
+    while (k != NULL)
+    {
+        v = mytok(NULL,'\\');
+        if (v == NULL)
+            v = "";
+        if (CheckValidKey(k))
+        {
+            kvpair.key = LookupKey(server, k);
+            kvpair.value = LookupKey(server, v);
+            TableEnter(server->keyvals, &kvpair);
+        }
+        k = mytok(NULL,'\\');
 
-	}
+    }
 }
 
 
@@ -215,7 +215,7 @@ void ServerParseKeyVals(GServer server, char *keyvals)
 Returns the ping for the specified server. */
 int ServerGetPing(GServer server)
 {
-	return server->ping;
+    return server->ping;
 }
 
 /* ServerGetAddress
@@ -223,7 +223,7 @@ int ServerGetPing(GServer server)
 Returns the string, dotted IP address for the specified server */
 char *ServerGetAddress(GServer server)
 {
-	return (char *)inet_ntoa(*(struct in_addr*)&server->ip);
+    return (char *)inet_ntoa(*(struct in_addr*)&server->ip);
 }
 
 /* ServerGetInetAddress
@@ -231,7 +231,7 @@ char *ServerGetAddress(GServer server)
 Returns the IP address for the specified server */
 unsigned int ServerGetInetAddress(GServer server)
 {
-	return server->ip;
+    return server->ip;
 }
 
 
@@ -240,18 +240,18 @@ unsigned int ServerGetInetAddress(GServer server)
 Returns the "query" port for the specified server. */
 int ServerGetQueryPort(GServer server)
 {
-	return server->port;
+    return server->port;
 }
 
 static GKeyValuePair *ServerRuleLookup(GServer server, char *key)
 {
-	GKeyValuePair kvp;
-	char **keyindex;
-	keyindex = (char **)TableLookup(server->keylist, &key);
-	if (keyindex == NULL)
-		return NULL; //otherwise, the keyindex->keyindex is valid, so use it to lookup
-	kvp.key = *keyindex;
-	return (GKeyValuePair *)TableLookup(server->keyvals, &kvp);
+    GKeyValuePair kvp;
+    char **keyindex;
+    keyindex = (char **)TableLookup(server->keylist, &key);
+    if (keyindex == NULL)
+        return NULL; //otherwise, the keyindex->keyindex is valid, so use it to lookup
+    kvp.key = *keyindex;
+    return (GKeyValuePair *)TableLookup(server->keyvals, &kvp);
 }
 
 /* ServerGet[]Value
@@ -259,60 +259,60 @@ static GKeyValuePair *ServerRuleLookup(GServer server, char *key)
 Returns the value for the specified key. */
 char *ServerGetStringValue(GServer server, char *key, char *sdefault)
 {
-	GKeyValuePair *kv;
+    GKeyValuePair *kv;
 
-	if (strcmp(key,"hostaddr") == 0) //ooh! they want the hostaddr!
-		return ServerGetAddress(server);
-	kv = ServerRuleLookup(server,key);
-	if (!kv)
-		return sdefault;
-	return kv->value;
+    if (strcmp(key,"hostaddr") == 0) //ooh! they want the hostaddr!
+        return ServerGetAddress(server);
+    kv = ServerRuleLookup(server,key);
+    if (!kv)
+        return sdefault;
+    return kv->value;
 }
 
 int ServerGetIntValue(GServer server, char *key, int idefault)
 {
-	GKeyValuePair *kv;
+    GKeyValuePair *kv;
 
-	if (strcmp(key,"ping") == 0) //ooh! they want the ping!
-		return ServerGetPing(server);
-	kv = ServerRuleLookup(server,key);
-	if (!kv)
-		return idefault;
-	return atoi(kv->value);
+    if (strcmp(key,"ping") == 0) //ooh! they want the ping!
+        return ServerGetPing(server);
+    kv = ServerRuleLookup(server,key);
+    if (!kv)
+        return idefault;
+    return atoi(kv->value);
 
 }
 
 double ServerGetFloatValue(GServer server, char *key, double fdefault)
 {
-	GKeyValuePair *kv;
+    GKeyValuePair *kv;
 
-	kv = ServerRuleLookup(server,key);
-	if (!kv)
-		return fdefault;
-	return atof(kv->value);
+    kv = ServerRuleLookup(server,key);
+    if (!kv)
+        return fdefault;
+    return atof(kv->value);
 }
 
 char *ServerGetPlayerStringValue(GServer server, int playernum, char *key, char *sdefault)
 {
-	char newkey[32];
-	
-	sprintf(newkey,"%s_%d",key,playernum);
-	return ServerGetStringValue(server, newkey, sdefault);
+    char newkey[32];
+    
+    sprintf(newkey,"%s_%d",key,playernum);
+    return ServerGetStringValue(server, newkey, sdefault);
 }
 int ServerGetPlayerIntValue(GServer server, int playernum, char *key, int idefault)
 {
-	char newkey[32];
-	
-	sprintf(newkey,"%s_%d",key,playernum);
-	return ServerGetIntValue(server, newkey, idefault);
+    char newkey[32];
+    
+    sprintf(newkey,"%s_%d",key,playernum);
+    return ServerGetIntValue(server, newkey, idefault);
 
 }
 double ServerGetPlayerFloatValue(GServer server, int playernum, char *key, double fdefault)
 {
-	char newkey[32];
-	
-	sprintf(newkey,"%s_%d",key,playernum);
-	return ServerGetFloatValue(server, newkey, fdefault);
+    char newkey[32];
+    
+    sprintf(newkey,"%s_%d",key,playernum);
+    return ServerGetFloatValue(server, newkey, fdefault);
 
 }
 
@@ -324,20 +324,20 @@ key/value. The user-defined instance data will be passed to the KeyFn callback *
 
 static void KeyMapF(void *elem, void *clientData)
 {
-	GKeyValuePair *kv = (GKeyValuePair *)elem;
-	GEnumData *ped = (GEnumData *)clientData;
-	ped->EnumFn(kv->key, kv->value, ped->instance);
+    GKeyValuePair *kv = (GKeyValuePair *)elem;
+    GEnumData *ped = (GEnumData *)clientData;
+    ped->EnumFn(kv->key, kv->value, ped->instance);
 }
 
 
 void ServerEnumKeys(GServer server, KeyEnumFn KeyFn, void *instance)
 {
-	GEnumData ed;
+    GEnumData ed;
 
-	ed.EnumFn = KeyFn;
-	ed.instance = instance;
-	ed.keylist = server->keylist;
-	TableMap(server->keyvals, KeyMapF, &ed);
+    ed.EnumFn = KeyFn;
+    ed.instance = instance;
+    ed.keylist = server->keylist;
+    TableMap(server->keyvals, KeyMapF, &ed);
 }
 
 
@@ -349,21 +349,21 @@ void ServerEnumKeys(GServer server, KeyEnumFn KeyFn, void *instance)
 #define MULTIPLIER -1664117991
 static int StringHash(char *s, int numbuckets)
 {
-	unsigned long hashcode = 0;
-	while (*s != 0)
-		hashcode = hashcode * MULTIPLIER + tolower(*s++);
+    unsigned long hashcode = 0;
+    while (*s != 0)
+        hashcode = hashcode * MULTIPLIER + tolower(*s++);
     return (hashcode % numbuckets);
 
 }
 
 int GStringHash(const void *elem, int numbuckets)
 {
-	return StringHash(*(char **)elem, numbuckets);
+    return StringHash(*(char **)elem, numbuckets);
 }
 
 static int KeyValHashKeyP(const void *elem, int numbuckets)
 {
-	return StringHash(((GKeyValuePair *)elem)->key, numbuckets);
+    return StringHash(((GKeyValuePair *)elem)->key, numbuckets);
 }
 
 
@@ -384,12 +384,12 @@ int GCaseInsensitiveCompare(const void *entry1, const void *entry2)
  */
 static int KeyValCompareKeyP(const void *entry1, const void *entry2)
 {
-   	return ((GKeyValuePair *)entry1)->key - ((GKeyValuePair *)entry2)->key;
+       return ((GKeyValuePair *)entry1)->key - ((GKeyValuePair *)entry2)->key;
 }
 
 void GStringFree(void *elem)
 {
-	free(*(char **)elem);
+    free(*(char **)elem);
 }
 
 /* keyval
@@ -397,8 +397,8 @@ void GStringFree(void *elem)
  *
 static int KeyValCompareKeyA(const void *entry1, const void *entry2)
 {
-   	return CaseInsensitiveCompare(&((GKeyValuePair *)entry1)->key, 
-								  &((GKeyValuePair *)entry2)->key);
+       return CaseInsensitiveCompare(&((GKeyValuePair *)entry1)->key, 
+                                  &((GKeyValuePair *)entry2)->key);
 }
 
 */
\ No newline at end of file
diff --git a/code/gamespy/gserver.h b/code/gamespy/gserver.h
index bfae31b8..b7b9dcf6 100644
--- a/code/gamespy/gserver.h
+++ b/code/gamespy/gserver.h
@@ -27,38 +27,38 @@ extern "C" {
 #endif
 
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
-	#include "::hashtable.h"
+    #include "::hashtable.h"
 #else
-	#include "../hashtable.h"
+    #include "../hashtable.h"
 #endif
 
 struct GServerImplementation
 {
-	unsigned long ip;
-	unsigned short port;
-	short ping;
-	GQueryType querytype;
-	HashTable keyvals;
-	HashTable keylist;
+    unsigned long ip;
+    unsigned short port;
+    short ping;
+    GQueryType querytype;
+    HashTable keyvals;
+    HashTable keylist;
 
 };
 
 typedef struct
 {
-	char *key;
-	char *value;
+    char *key;
+    char *value;
 } GKeyValuePair;
 /*
 typedef struct
 {
-	char *key, *value;
+    char *key, *value;
 } GKeyValuePair;
 */
 typedef struct 
 {
-	KeyEnumFn EnumFn;
-	void *instance;
-	HashTable keylist;
+    KeyEnumFn EnumFn;
+    void *instance;
+    HashTable keylist;
 } GEnumData;
 
 void ServerFree(void *elem);
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 3b089d35..7847838f 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -22,16 +22,16 @@ Fax(714)549-0757
 #include "goaceng.h"
 #include "gserver.h"
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
-	#include "::nonport.h"
+    #include "::nonport.h"
 #else
-	#include "../nonport.h"
+    #include "../nonport.h"
 #endif
 #ifdef _MACOS
-	#include "::darray.h"
-	#include "::hashtable.h"
+    #include "::darray.h"
+    #include "::hashtable.h"
 #else
-	#include "../darray.h"
-	#include "../hashtable.h"
+    #include "../darray.h"
+    #include "../hashtable.h"
 #endif
 #include "common/gsPlatformSocket.h"
 #include "gutil.h"
@@ -63,33 +63,33 @@ extern "C" {
 //todo: check state changes on error
 typedef struct 
 {
-	SOCKET s;
-	GServer currentserver;
-	unsigned long starttime;
-	struct sockaddr_in saddr;
+    SOCKET s;
+    GServer currentserver;
+    unsigned long starttime;
+    struct sockaddr_in saddr;
 } UpdateInfo;
 
 typedef enum { pi_fieldcount, pi_fields, pi_servers } GParseInfoState;
 
 struct GServerListImplementation
 {
-	GServerListState state;
-	DArray servers;
-	UpdateInfo *updatelist; //dynamic array of updateinfos
-	char gamename[32];
-	char seckey[32];
-	char enginename[32];
-	int maxupdates;
-	int nextupdate;
-	int abortupdate;
-	ListCallBackFn CallBackFn;
-	void *instance;
-	char *sortkey;
-	gbool sortascending;
-	SOCKET slsocket;
-	unsigned long lanstarttime;
-	GQueryType querytype;
-	HashTable keylist;
+    GServerListState state;
+    DArray servers;
+    UpdateInfo *updatelist; //dynamic array of updateinfos
+    char gamename[32];
+    char seckey[32];
+    char enginename[32];
+    int maxupdates;
+    int nextupdate;
+    int abortupdate;
+    ListCallBackFn CallBackFn;
+    void *instance;
+    char *sortkey;
+    gbool sortascending;
+    SOCKET slsocket;
+    unsigned long lanstarttime;
+    GQueryType querytype;
+    HashTable keylist;
 
     // Added in 2.0
     int numservers;
@@ -106,7 +106,7 @@ GServerList g_sortserverlist; //global serverlist for sorting info!!
 /* these correspond to the qt_ constants */
 #define NUM_QUERYTYPES 6
 const char *querystrings[NUM_QUERYTYPES] = {"\\basic\\","\\info\\","\\rules\\",
-								"\\players\\","\\info\\\\rules\\","\\status\\"};
+                                "\\players\\","\\info\\\\rules\\","\\status\\"};
 const int querylengths[NUM_QUERYTYPES] = {7,6,7,9,13,8};
 
 static void KeyValFree(void *elem);
@@ -119,31 +119,31 @@ static int KeyValHashKeyA(const void *elem, int numbuckets);
 Creates and returns a new (empty) GServerList. */
 GServerList	ServerListNew(const char *gamename, const char *enginename, const char *seckey, int maxconcupdates, void *CallBackFn, int CallBackFnType, void *instance)
 {
-	GServerList list;
+    GServerList list;
 
-	list = (GServerList) malloc(sizeof(struct GServerListImplementation));
-	assert(list != NULL);
-	list->state = sl_idle;
-	list->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
-	list->keylist = TableNew2(sizeof(char *),LIST_NUMKEYBUCKETS,LIST_NUMKEYCHAINS,GStringHash, GCaseInsensitiveCompare, GStringFree);
-	list->maxupdates = maxconcupdates;
-	list->updatelist = malloc(maxconcupdates * sizeof(UpdateInfo));
-	memset(list->updatelist, 0, maxconcupdates * sizeof(UpdateInfo));
-	assert(list->updatelist != NULL);
-	strcpy(list->gamename, gamename);
-	strcpy(list->seckey, seckey);
-	strcpy(list->enginename, enginename);
-	list->CallBackFn = CallBackFn;
-	assert(CallBackFn != NULL);
-	list->instance = instance;
-	list->sortkey = "";
+    list = (GServerList) malloc(sizeof(struct GServerListImplementation));
+    assert(list != NULL);
+    list->state = sl_idle;
+    list->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
+    list->keylist = TableNew2(sizeof(char *),LIST_NUMKEYBUCKETS,LIST_NUMKEYCHAINS,GStringHash, GCaseInsensitiveCompare, GStringFree);
+    list->maxupdates = maxconcupdates;
+    list->updatelist = malloc(maxconcupdates * sizeof(UpdateInfo));
+    memset(list->updatelist, 0, maxconcupdates * sizeof(UpdateInfo));
+    assert(list->updatelist != NULL);
+    strcpy(list->gamename, gamename);
+    strcpy(list->seckey, seckey);
+    strcpy(list->enginename, enginename);
+    list->CallBackFn = CallBackFn;
+    assert(CallBackFn != NULL);
+    list->instance = instance;
+    list->sortkey = "";
     // Added in 2.0
     list->numservers = 0;
     // Added in OPM
     list->encryptdata = 1;
 
-	SocketStartUp();
-	return list;	
+    SocketStartUp();
+    return list;	
 }
 
 /* ServerListFree
@@ -151,33 +151,33 @@ GServerList	ServerListNew(const char *gamename, const char *enginename, const ch
 Free a GServerList and all internal sturctures and servers */
 void ServerListFree(GServerList serverlist)
 {
-	ArrayFree(serverlist->servers);
-	TableFree(serverlist->keylist);
-	free(serverlist->updatelist);
+    ArrayFree(serverlist->servers);
+    TableFree(serverlist->keylist);
+    free(serverlist->updatelist);
 
-	free(serverlist);
-	SocketShutDown();
+    free(serverlist);
+    SocketShutDown();
 }
 
  //create update sockets and init structures
 static GError InitUpdateList(GServerList serverlist)
 {
-	int i;
+    int i;
 
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-	{
-		serverlist->updatelist[i].s = socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
-		if (serverlist->updatelist[i].s == INVALID_SOCKET)
-		{ //ran out of sockets, just cap maxupdates here, unless we don't have any
-			if (i == 0)
-				return GE_NOSOCKET;
-			serverlist->maxupdates = i;
-			return 0;
-		}
-		serverlist->updatelist[i].currentserver = NULL;
-		serverlist->updatelist[i].starttime = 0;
-	}
-	return 0;
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+    {
+        serverlist->updatelist[i].s = socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
+        if (serverlist->updatelist[i].s == INVALID_SOCKET)
+        { //ran out of sockets, just cap maxupdates here, unless we don't have any
+            if (i == 0)
+                return GE_NOSOCKET;
+            serverlist->maxupdates = i;
+            return 0;
+        }
+        serverlist->updatelist[i].currentserver = NULL;
+        serverlist->updatelist[i].starttime = 0;
+    }
+    return 0;
 
 
 }
@@ -185,12 +185,12 @@ static GError InitUpdateList(GServerList serverlist)
 //free update sockets 
 static GError FreeUpdateList(GServerList serverlist) 
 {
-	int i;
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-	{
-		closesocket(serverlist->updatelist[i].s);
-	}
-	return 0;
+    int i;
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+    {
+        closesocket(serverlist->updatelist[i].s);
+    }
+    return 0;
 
 
 }
@@ -198,30 +198,30 @@ static GError FreeUpdateList(GServerList serverlist)
 //create and connect a server list socket
 static GError CreateServerListSocket(GServerList serverlist)
 {
-	struct   sockaddr_in saddr;
-	struct hostent *hent;
+    struct   sockaddr_in saddr;
+    struct hostent *hent;
 
-	saddr.sin_family = AF_INET;
-	saddr.sin_port = htons(MSPORT);
-	saddr.sin_addr.s_addr = inet_addr(MSHOST);
-	if (saddr.sin_addr.s_addr == INADDR_NONE)
-	{
-		hent = gethostbyname(MSHOST);
-		if (!hent)
-			return GE_NODNS; 
-		saddr.sin_addr.s_addr = *(u_long *)hent->h_addr_list[0];
-	}
-	serverlist->slsocket = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
-	if (serverlist->slsocket == INVALID_SOCKET)
-		return GE_NOSOCKET;
-	if (connect ( serverlist->slsocket, (struct sockaddr *) &saddr, sizeof saddr ) != 0)
-	{
-		closesocket(serverlist->slsocket);
-		return GE_NOCONNECT; 
-	}
+    saddr.sin_family = AF_INET;
+    saddr.sin_port = htons(MSPORT);
+    saddr.sin_addr.s_addr = inet_addr(MSHOST);
+    if (saddr.sin_addr.s_addr == INADDR_NONE)
+    {
+        hent = gethostbyname(MSHOST);
+        if (!hent)
+            return GE_NODNS; 
+        saddr.sin_addr.s_addr = *(u_long *)hent->h_addr_list[0];
+    }
+    serverlist->slsocket = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
+    if (serverlist->slsocket == INVALID_SOCKET)
+        return GE_NOSOCKET;
+    if (connect ( serverlist->slsocket, (struct sockaddr *) &saddr, sizeof saddr ) != 0)
+    {
+        closesocket(serverlist->slsocket);
+        return GE_NOCONNECT; 
+    }
 
-	//else we are connected
-	return 0;
+    //else we are connected
+    return 0;
 
 
 }
@@ -230,16 +230,16 @@ static GError CreateServerListSocket(GServerList serverlist)
 //create and connect a server list socket
 static GError CreateServerListLANSocket(GServerList serverlist)
 {
-	int optval = 1;
+    int optval = 1;
 
-	serverlist->slsocket = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
-	if (serverlist->slsocket == INVALID_SOCKET)
-		return GE_NOSOCKET;
-	if (setsockopt(serverlist->slsocket, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval)) != 0)
-		return GE_NOSOCKET;
+    serverlist->slsocket = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    if (serverlist->slsocket == INVALID_SOCKET)
+        return GE_NOSOCKET;
+    if (setsockopt(serverlist->slsocket, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval)) != 0)
+        return GE_NOSOCKET;
 
-	//else we are ready to broadcast
-	return 0;
+    //else we are ready to broadcast
+    return 0;
 
 
 }
@@ -247,8 +247,8 @@ static GError CreateServerListLANSocket(GServerList serverlist)
 //trigger the callback and set the new mode
 static void ServerListModeChange(GServerList serverlist, GServerListState newstate)
 {
-	serverlist->state = newstate;
-	serverlist->CallBackFn(serverlist, LIST_STATECHANGED, serverlist->instance, NULL, NULL);
+    serverlist->state = newstate;
+    serverlist->CallBackFn(serverlist, LIST_STATECHANGED, serverlist->instance, NULL, NULL);
 
 }
 
@@ -257,28 +257,28 @@ static void ServerListModeChange(GServerList serverlist, GServerListState newsta
 #define SECURE "\\secure\\"
 static GError SendListRequest(GServerList serverlist, char *filter)
 {
-	char data[256], *ptr, result[64];
-	int len;
+    char data[256], *ptr, result[64];
+    int len;
     int i;
     char *modifier;
-	
-	len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
-	if (gsiSocketIsError(len))
-		return GE_NOCONNECT;
-	data[len] = '\0'; //null terminate it
-	
-	ptr = strstr ( data, SECURE );
-	if (!ptr)
-		return GE_DATAERROR;
-	ptr = ptr + strlen(SECURE);
-	gs_encrypt   ( (uchar *) serverlist->seckey, 6, (uchar *)ptr, 6 );
+    
+    len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
+    if (gsiSocketIsError(len))
+        return GE_NOCONNECT;
+    data[len] = '\0'; //null terminate it
+    
+    ptr = strstr ( data, SECURE );
+    if (!ptr)
+        return GE_DATAERROR;
+    ptr = ptr + strlen(SECURE);
+    gs_encrypt   ( (uchar *) serverlist->seckey, 6, (uchar *)ptr, 6 );
     if (serverlist->encryptdata) {
         // Added in 2.0
         for(i = 0; i < 6; i++) {
             ptr[i] ^= serverlist->seckey[i];
         }
     }
-	gs_encode ( (uchar *)ptr, 6, (uchar *) result );
+    gs_encode ( (uchar *)ptr, 6, (uchar *) result );
 
     if (serverlist->encryptdata) {
         // Added in 2.0
@@ -291,10 +291,10 @@ static GError SendListRequest(GServerList serverlist, char *filter)
         sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\final\\\\queryid\\1.1\\",
                 serverlist->enginename, ENGINE_VERSION, result); //validate us	
     }
-	
-	len = send ( serverlist->slsocket, data, strlen(data), 0 );
-	if (gsiSocketIsError(len) || len == 0)
-		return GE_NOCONNECT;
+    
+    len = send ( serverlist->slsocket, data, strlen(data), 0 );
+    if (gsiSocketIsError(len) || len == 0)
+        return GE_NOCONNECT;
 
     if (serverlist->querytype == qt_grouprooms) {
         modifier = "groups";
@@ -309,34 +309,34 @@ static GError SendListRequest(GServerList serverlist, char *filter)
     }
 
     //send the list request
-	if (filter)
-		sprintf(data, "\\list\\%s\\gamename\\%s\\where\\%s\\final\\", modifier, serverlist->gamename, filter);
-	else
-		sprintf(data, "\\list\\%s\\gamename\\%s\\final\\", modifier, serverlist->gamename);
-	len = send ( serverlist->slsocket, data, strlen(data), 0 );
-	if (gsiSocketIsError(len) || len == 0)
-		return GE_NOCONNECT;
+    if (filter)
+        sprintf(data, "\\list\\%s\\gamename\\%s\\where\\%s\\final\\", modifier, serverlist->gamename, filter);
+    else
+        sprintf(data, "\\list\\%s\\gamename\\%s\\final\\", modifier, serverlist->gamename);
+    len = send ( serverlist->slsocket, data, strlen(data), 0 );
+    if (gsiSocketIsError(len) || len == 0)
+        return GE_NOCONNECT;
 
-	ServerListModeChange(serverlist, sl_listxfer);
-	return 0;
+    ServerListModeChange(serverlist, sl_listxfer);
+    return 0;
 }
 
 
 static GError SendBroadcastRequest(GServerList serverlist, int startport, int endport, int delta)
 {
-	struct   sockaddr_in saddr;
-	short i;
+    struct   sockaddr_in saddr;
+    short i;
 
-	saddr.sin_family = AF_INET;
-	saddr.sin_addr.s_addr = 0xFFFFFFFF; //broadcast
-	for (i = startport ; i <= endport ; i += delta)
-	{
-		saddr.sin_port = htons(i);
-		sendto(serverlist->slsocket, "\\status\\",8,0,(struct sockaddr *)&saddr,sizeof(saddr));
-	}
-	ServerListModeChange(serverlist, sl_lanlist);
-	serverlist->lanstarttime = current_time();
-	return 0;
+    saddr.sin_family = AF_INET;
+    saddr.sin_addr.s_addr = 0xFFFFFFFF; //broadcast
+    for (i = startport ; i <= endport ; i += delta)
+    {
+        saddr.sin_port = htons(i);
+        sendto(serverlist->slsocket, "\\status\\",8,0,(struct sockaddr *)&saddr,sizeof(saddr));
+    }
+    ServerListModeChange(serverlist, sl_lanlist);
+    serverlist->lanstarttime = current_time();
+    return 0;
 
 
 
@@ -345,13 +345,13 @@ static GError SendBroadcastRequest(GServerList serverlist, int startport, int en
 //just wait for the server list to become idle
 static void DoSyncLoop(GServerList serverlist)
 {
-	while (serverlist->state != sl_idle)
-	{
-		ServerListThink(serverlist);
-		msleep(10);
-		
-	}
-	
+    while (serverlist->state != sl_idle)
+    {
+        ServerListThink(serverlist);
+        msleep(10);
+        
+    }
+    
 }
 
 /* ServerListUpdate
@@ -359,7 +359,7 @@ static void DoSyncLoop(GServerList serverlist)
 Start updating a GServerList without filters */
 GError ServerListUpdate(GServerList serverlist, gbool async)
 {
-	return ServerListUpdate2(serverlist, async, NULL, qt_status);
+    return ServerListUpdate2(serverlist, async, NULL, qt_status);
 }
 
 /* ServerListUpdate2
@@ -367,28 +367,28 @@ GError ServerListUpdate(GServerList serverlist, gbool async)
 Start updating a GServerList. */
 GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQueryType querytype)
 {
-	GError error;
+    GError error;
 
-	if (serverlist->state != sl_idle)
-		return GE_BUSY;
+    if (serverlist->state != sl_idle)
+        return GE_BUSY;
 
-	serverlist->querytype = querytype;
-	error = CreateServerListSocket(serverlist);
-	if (error) return error;
-	error = SendListRequest(serverlist, filter);
-	if (error) return error;
-	error = InitUpdateList(serverlist);
-	if (error) return error;
-	serverlist->nextupdate = 0;
-	serverlist->abortupdate = 0;
+    serverlist->querytype = querytype;
+    error = CreateServerListSocket(serverlist);
+    if (error) return error;
+    error = SendListRequest(serverlist, filter);
+    if (error) return error;
+    error = InitUpdateList(serverlist);
+    if (error) return error;
+    serverlist->nextupdate = 0;
+    serverlist->abortupdate = 0;
     // Added in 2.0
     serverlist->numservers = ServerListCount(serverlist);
     // Added in 2.0
     serverlist->cryptinfo.offset = -1;
-	if (!async)
-		DoSyncLoop(serverlist);
+    if (!async)
+        DoSyncLoop(serverlist);
 
-	return 0;
+    return 0;
 }
 
 /* ServerListLANUpdate
@@ -396,25 +396,25 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
 Start updating a GServerList from servers on the LAN. */
 GError ServerListLANUpdate(GServerList serverlist, gbool async, int startsearchport, int endsearchport, int searchdelta)
 {
-	GError error;
+    GError error;
 
-	assert(searchdelta > 0);
+    assert(searchdelta > 0);
 
-	if (serverlist->state != sl_idle)
-		return GE_BUSY;
+    if (serverlist->state != sl_idle)
+        return GE_BUSY;
 
-	error = InitUpdateList(serverlist);
-	if (error) return error;
-	error = CreateServerListLANSocket(serverlist);
-	if (error) return error;
-	error = SendBroadcastRequest(serverlist, startsearchport, endsearchport, searchdelta);
-	if (error) return error;
-	serverlist->nextupdate = 0;
-	serverlist->abortupdate = 0;
-	if (!async)
-		DoSyncLoop(serverlist);
+    error = InitUpdateList(serverlist);
+    if (error) return error;
+    error = CreateServerListLANSocket(serverlist);
+    if (error) return error;
+    error = SendBroadcastRequest(serverlist, startsearchport, endsearchport, searchdelta);
+    if (error) return error;
+    serverlist->nextupdate = 0;
+    serverlist->abortupdate = 0;
+    if (!async)
+        DoSyncLoop(serverlist);
 
-	return 0;
+    return 0;
 }
 
 //add a new server based on the data
@@ -430,36 +430,36 @@ static GServer ServerListAddServerData(GServerList serverlist, char **fieldlist,
 //add the server to the list with the given ip, port
 static void ServerListAddServer(GServerList serverlist, unsigned long ip, unsigned short port, GQueryType qtype)
 {
-	GServer server;
-	server =  ServerNew(ip, port, qtype, serverlist->keylist);
-	ArrayAppend(serverlist->servers,&server);
+    GServer server;
+    server =  ServerNew(ip, port, qtype, serverlist->keylist);
+    ArrayAppend(serverlist->servers,&server);
  //printf("%d %s:%d\n",++count, ip,port);
 }
 
 //add the server to the list with the given ip, port
 static void ServerListInsertServer(GServerList serverlist, unsigned long ip, unsigned short port, int pos, GQueryType qtype)
 {
-	GServer server;
-	server =  ServerNew(ip, port, qtype, serverlist->keylist);
-	ArrayInsertAt(serverlist->servers,&server,pos);
+    GServer server;
+    server =  ServerNew(ip, port, qtype, serverlist->keylist);
+    ArrayInsertAt(serverlist->servers,&server,pos);
  //printf("%d %s:%d\n",++count, ip,port);
 }
 
 //find the server in the list, returns -1 if it does not exist
 static int ServerListFindServerMax(GServerList serverlist, unsigned int ip, int port, int count)
 {
-	int i;
-	GServer server;
+    int i;
+    GServer server;
 
-	for (i = 0; i < count ; i++)
-	{
-		server = *(GServer *)ArrayNth(serverlist->servers,i);
-		if (port == ServerGetQueryPort(server) && ServerGetInetAddress(server)==ip)
-		{
-			return i;
-		}
-	}
-	return -1;
+    for (i = 0; i < count ; i++)
+    {
+        server = *(GServer *)ArrayNth(serverlist->servers,i);
+        if (port == ServerGetQueryPort(server) && ServerGetInetAddress(server)==ip)
+        {
+            return i;
+        }
+    }
+    return -1;
 }
 
 //find the server in the list, returns -1 if it does not exist
@@ -472,14 +472,14 @@ static int ServerListFindServer(GServerList serverlist, unsigned int ip, int por
 // returns -1 if it does not exist
 static int ServerListFindServerInUpdateList(GServerList serverlist, GServer server)
 {
-	int i;
+    int i;
 
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-	{
-		if (serverlist->updatelist[i].currentserver == server)
-			return i;
-	}
-	return -1;
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+    {
+        if (serverlist->updatelist[i].currentserver == server)
+            return i;
+    }
+    return -1;
 }
 
 /* ServerListRemoveServer
@@ -487,22 +487,22 @@ static int ServerListFindServerInUpdateList(GServerList serverlist, GServer serv
 Removes a single server from the list. Frees the memory associated with the GServer */
 void ServerListRemoveServer(GServerList serverlist, char *ip, int port)
 {
-	int currentindex = ServerListFindServer(serverlist, inet_addr(ip), port);
-	int updateindex;
+    int currentindex = ServerListFindServer(serverlist, inet_addr(ip), port);
+    int updateindex;
 
-	if (currentindex == -1)
-		return; //can't do anything, it doesn't exist
+    if (currentindex == -1)
+        return; //can't do anything, it doesn't exist
 
-	//check to see whether we need to change the updatelist or move the nextupdate
-	if (serverlist->state != sl_idle && serverlist->nextupdate > currentindex) 
-	{
-		GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
-		updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
-		if (updateindex != -1) //is currently being queried, stop it
-			serverlist->updatelist[updateindex].currentserver = NULL;
-		serverlist->nextupdate--; //decrement the next update, since we are removing a server
-	}
-	ArrayDeleteAt(serverlist->servers, currentindex); 
+    //check to see whether we need to change the updatelist or move the nextupdate
+    if (serverlist->state != sl_idle && serverlist->nextupdate > currentindex) 
+    {
+        GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
+        updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
+        if (updateindex != -1) //is currently being queried, stop it
+            serverlist->updatelist[updateindex].currentserver = NULL;
+        serverlist->nextupdate--; //decrement the next update, since we are removing a server
+    }
+    ArrayDeleteAt(serverlist->servers, currentindex); 
 }
 
 /* ServerListUpdate
@@ -511,100 +511,100 @@ Adds an auxilliary (non-fetched) server to the update list.
 If the engine is idle, the server is added and the engine started. */
 GError ServerListAuxUpdate(GServerList serverlist, const char *ip, int port, gbool async, GQueryType querytype)
 {
-	GError error;
-	int currentindex;
-	int updateindex;
-	unsigned int real_ip = inet_addr(ip);
-	//first, see if the server already exists
-	currentindex = ServerListFindServer(serverlist,real_ip,port);
+    GError error;
+    int currentindex;
+    int updateindex;
+    unsigned int real_ip = inet_addr(ip);
+    //first, see if the server already exists
+    currentindex = ServerListFindServer(serverlist,real_ip,port);
 
 
-	//if we're idle, start things up
-	if (serverlist->state == sl_idle)
-	{
-		//prepare as if we're going to do a normal list fetch,
-		//but skip the call to SendListRequest().
+    //if we're idle, start things up
+    if (serverlist->state == sl_idle)
+    {
+        //prepare as if we're going to do a normal list fetch,
+        //but skip the call to SendListRequest().
 
-		
-		error = InitUpdateList(serverlist);
-		if (error) return error;
-		if (currentindex != -1) //we need to "move" this server to the end of the list
-		{ //move the server to the end of the array
-			GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
-			holdserver->ping = 9999;//clear the ping so it gets recalculated
-			ArrayRemoveAt(serverlist->servers,currentindex);
-			ArrayAppend(serverlist->servers,&holdserver);
-		} else
-		{	//add the aux server
-			ServerListAddServer(serverlist, real_ip, (unsigned short)port, querytype);
-		}
-		
-		serverlist->nextupdate = ArrayLength(serverlist->servers) - 1;
-		serverlist->abortupdate = 0;
+        
+        error = InitUpdateList(serverlist);
+        if (error) return error;
+        if (currentindex != -1) //we need to "move" this server to the end of the list
+        { //move the server to the end of the array
+            GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
+            holdserver->ping = 9999;//clear the ping so it gets recalculated
+            ArrayRemoveAt(serverlist->servers,currentindex);
+            ArrayAppend(serverlist->servers,&holdserver);
+        } else
+        {	//add the aux server
+            ServerListAddServer(serverlist, real_ip, (unsigned short)port, querytype);
+        }
+        
+        serverlist->nextupdate = ArrayLength(serverlist->servers) - 1;
+        serverlist->abortupdate = 0;
 
-		//chane the mode straight to querying
-		ServerListModeChange(serverlist, sl_querying);
-		//is it's a sync call, do it until done
-		if (!async)
-			DoSyncLoop(serverlist);
+        //chane the mode straight to querying
+        ServerListModeChange(serverlist, sl_querying);
+        //is it's a sync call, do it until done
+        if (!async)
+            DoSyncLoop(serverlist);
 
-	}
-	else
-	{
-		//if we're in the middle of an update, we should
-		//be able to just slip the aux server in for querying
-		//ServerListAddServer(serverlist, ip, port);
-		//crt -- make it the next server to be queried
-		//note: this should NEVER be called in a different thread from think!!
-		if (currentindex == -1) //it doesn't exist yet
-			ServerListInsertServer(serverlist, real_ip, (unsigned short)port, serverlist->nextupdate, querytype);
-		else 
-		{ //it exists, find out whats happening to it
-			GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
-			if (currentindex >= serverlist->nextupdate) //hasn't been queried yet!
-				return 0; //it will be queried soon anyway
-			holdserver->ping = 9999;//clear the ping so it gets recalculated
-			updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
-			if (updateindex != -1) //is currently being queried, stop it
-				serverlist->updatelist[updateindex].currentserver = NULL;
-			ArrayInsertAt(serverlist->servers,&holdserver, serverlist->nextupdate); //insert at new place
-			ArrayRemoveAt(serverlist->servers,currentindex); //remove the old one
-			serverlist->nextupdate--; //decrement the next update, since we are removing a server
-		}
-	}
-	return 0;
+    }
+    else
+    {
+        //if we're in the middle of an update, we should
+        //be able to just slip the aux server in for querying
+        //ServerListAddServer(serverlist, ip, port);
+        //crt -- make it the next server to be queried
+        //note: this should NEVER be called in a different thread from think!!
+        if (currentindex == -1) //it doesn't exist yet
+            ServerListInsertServer(serverlist, real_ip, (unsigned short)port, serverlist->nextupdate, querytype);
+        else 
+        { //it exists, find out whats happening to it
+            GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
+            if (currentindex >= serverlist->nextupdate) //hasn't been queried yet!
+                return 0; //it will be queried soon anyway
+            holdserver->ping = 9999;//clear the ping so it gets recalculated
+            updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
+            if (updateindex != -1) //is currently being queried, stop it
+                serverlist->updatelist[updateindex].currentserver = NULL;
+            ArrayInsertAt(serverlist->servers,&holdserver, serverlist->nextupdate); //insert at new place
+            ArrayRemoveAt(serverlist->servers,currentindex); //remove the old one
+            serverlist->nextupdate--; //decrement the next update, since we are removing a server
+        }
+    }
+    return 0;
 }
 
 static GError ServerListLANList(GServerList serverlist)
 {
-	struct timeval timeout = {0,0};
-	fd_set set;
-	char indata[1500];
-	struct   sockaddr_in saddr;
-	int saddrlen = sizeof(saddr);
-	int error;
+    struct timeval timeout = {0,0};
+    fd_set set;
+    char indata[1500];
+    struct   sockaddr_in saddr;
+    int saddrlen = sizeof(saddr);
+    int error;
 
-	while (1) //we break if the select fails
-	{
-		FD_ZERO(&set);
-		FD_SET( serverlist->slsocket, &set);
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (gsiSocketIsError(error) || 0 == error) //no data
-			break;
-		error = recvfrom(serverlist->slsocket, indata, sizeof(indata) - 1, 0, (struct sockaddr *)&saddr, &saddrlen );
-		if (gsiSocketIsError(error))
-			continue; 
-		//we got data, add the server to the list to update
-		if (strstr(indata,"\\final\\") != NULL)
-			ServerListAddServer(serverlist,saddr.sin_addr.s_addr, ntohs(saddr.sin_port), qt_status);
-	}
-	if (current_time() - serverlist->lanstarttime > LAN_SEARCH_TIME) //done waiting for replies
-	{
-		closesocket(serverlist->slsocket);
-		serverlist->slsocket = INVALID_SOCKET;
-		ServerListModeChange(serverlist, sl_querying);
-	}
-	return 0;
+    while (1) //we break if the select fails
+    {
+        FD_ZERO(&set);
+        FD_SET( serverlist->slsocket, &set);
+        error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+        if (gsiSocketIsError(error) || 0 == error) //no data
+            break;
+        error = recvfrom(serverlist->slsocket, indata, sizeof(indata) - 1, 0, (struct sockaddr *)&saddr, &saddrlen );
+        if (gsiSocketIsError(error))
+            continue; 
+        //we got data, add the server to the list to update
+        if (strstr(indata,"\\final\\") != NULL)
+            ServerListAddServer(serverlist,saddr.sin_addr.s_addr, ntohs(saddr.sin_port), qt_status);
+    }
+    if (current_time() - serverlist->lanstarttime > LAN_SEARCH_TIME) //done waiting for replies
+    {
+        closesocket(serverlist->slsocket);
+        serverlist->slsocket = INVALID_SOCKET;
+        ServerListModeChange(serverlist, sl_querying);
+    }
+    return 0;
 }
 
 static int CountSlashOffset(char *data, int len, int slashcount)
@@ -699,35 +699,35 @@ static int ServerListParseInfoList(GServerList serverlist, char *data, int len)
 //reads the server list from the socket and parses it
 static GError ServerListReadList(GServerList serverlist)
 {
-	static char data[2048]; //static input buffer
-	static int oldlen = 0;
-	fd_set set;
-	struct timeval timeout = {0,0};
-	int len, i;
-	char *p;
-	unsigned long ip;
-	unsigned short port;
+    static char data[2048]; //static input buffer
+    static int oldlen = 0;
+    fd_set set;
+    struct timeval timeout = {0,0};
+    int len, i;
+    char *p;
+    unsigned long ip;
+    unsigned short port;
 
-	FD_ZERO(&set);
-	FD_SET(serverlist->slsocket, &set);
+    FD_ZERO(&set);
+    FD_SET(serverlist->slsocket, &set);
 #ifndef KGTRN_ACCESS
-	i = select( FD_SETSIZE, &set, NULL, NULL, &timeout );
-	if (i <= 0)
-		return GE_NOERROR;
+    i = select( FD_SETSIZE, &set, NULL, NULL, &timeout );
+    if (i <= 0)
+        return GE_NOERROR;
 #endif
 
 //append to data
-	len = recv(serverlist->slsocket, data + oldlen, sizeof(data) - oldlen - 1, 0);
-	if (gsiSocketIsError(len) || len == 0)
-	{
-		closesocket(serverlist->slsocket);
-		serverlist->slsocket = INVALID_SOCKET;
-		oldlen = 0; //clear data so it can be used again
-		ServerListHalt(serverlist);
-		ServerListModeChange(serverlist, sl_querying);
-		return GE_NOCONNECT;
+    len = recv(serverlist->slsocket, data + oldlen, sizeof(data) - oldlen - 1, 0);
+    if (gsiSocketIsError(len) || len == 0)
+    {
+        closesocket(serverlist->slsocket);
+        serverlist->slsocket = INVALID_SOCKET;
+        oldlen = 0; //clear data so it can be used again
+        ServerListHalt(serverlist);
+        ServerListModeChange(serverlist, sl_querying);
+        return GE_NOCONNECT;
 
-	}
+    }
 
     if (serverlist->encryptdata && serverlist->cryptinfo.offset != -1) {
         // Added in 2.0
@@ -736,7 +736,7 @@ static GError ServerListReadList(GServerList serverlist)
 
     oldlen += len;
 
-	p = data;
+    p = data;
 
     if (!serverlist->encryptdata) {
         serverlist->cryptinfo.offset = 0;
@@ -790,9 +790,9 @@ static GError ServerListReadList(GServerList serverlist)
             }
         }
     }
-	oldlen = oldlen - (p - data);
-	memmove(data,p,oldlen); //shift it over
-	return 0;
+    oldlen = oldlen - (p - data);
+    memmove(data,p,oldlen); //shift it over
+    return 0;
 
 }
 
@@ -800,96 +800,96 @@ static GError ServerListReadList(GServerList serverlist)
 
 static GError ServerListQueryLoop(GServerList serverlist)
 {
-	int i, scount = 0, error, final;
-	fd_set set;
-	struct timeval timeout = {0,0};
-	char indata[1500];
-	struct sockaddr_in saddr;
-	int saddrlen = sizeof(saddr);
-	GServer server;
+    int i, scount = 0, error, final;
+    fd_set set;
+    struct timeval timeout = {0,0};
+    char indata[1500];
+    struct sockaddr_in saddr;
+    int saddrlen = sizeof(saddr);
+    GServer server;
 
 //first, check for available data
-	FD_ZERO(&set);
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-		if (serverlist->updatelist[i].currentserver != NULL) //there is a server waiting
-		{
-			scount++;
-			FD_SET( serverlist->updatelist[i].s, &set);
+    FD_ZERO(&set);
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+        if (serverlist->updatelist[i].currentserver != NULL) //there is a server waiting
+        {
+            scount++;
+            FD_SET( serverlist->updatelist[i].s, &set);
 
-		}
-	if (scount > 0) //there are sockets to check for data
-	{
+        }
+    if (scount > 0) //there are sockets to check for data
+    {
 
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (!gsiSocketIsError(error) && 0 != error)
-			for (i = 0 ; i < serverlist->maxupdates ; i++)
-				if (serverlist->updatelist[i].currentserver != NULL && FD_ISSET(serverlist->updatelist[i].s, &set) ) //there is a server waiting
-				{ //we can read data!!
-					saddrlen = sizeof(saddr);
-					error = recvfrom(serverlist->updatelist[i].s, indata, sizeof(indata) - 1, 0,(struct sockaddr *)&saddr, &saddrlen);
+        error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+        if (!gsiSocketIsError(error) && 0 != error)
+            for (i = 0 ; i < serverlist->maxupdates ; i++)
+                if (serverlist->updatelist[i].currentserver != NULL && FD_ISSET(serverlist->updatelist[i].s, &set) ) //there is a server waiting
+                { //we can read data!!
+                    saddrlen = sizeof(saddr);
+                    error = recvfrom(serverlist->updatelist[i].s, indata, sizeof(indata) - 1, 0,(struct sockaddr *)&saddr, &saddrlen);
 
-					if (saddr.sin_addr.s_addr != serverlist->updatelist[i].saddr.sin_addr.s_addr ||
-							saddr.sin_port != serverlist->updatelist[i].saddr.sin_port)
-						continue; //it wasn't from this server
+                    if (saddr.sin_addr.s_addr != serverlist->updatelist[i].saddr.sin_addr.s_addr ||
+                            saddr.sin_port != serverlist->updatelist[i].saddr.sin_port)
+                        continue; //it wasn't from this server
 
-					if (!gsiSocketIsError(error)) //we got data
-					{
-						indata[error] = 0; //truncate and parse it
-						final = (strstr(indata,"\\final\\") != NULL);
-						server = serverlist->updatelist[i].currentserver;
-						if (server->ping == 9999) //set the ping
-							server->ping = (short)(current_time() - serverlist->updatelist[i].starttime);
-						ServerParseKeyVals(server, indata); 
-						if (final) //it's all done
-						{
-							serverlist->CallBackFn(serverlist, 
-													LIST_PROGRESS, 
-													serverlist->instance,
-													server,
-													(void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
-							serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
-						} 
-					} else
-						serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
-					
-				}
-	}
-	//kill expired ones
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-		if (serverlist->updatelist[i].currentserver != NULL && current_time() - serverlist->updatelist[i].starttime > SERVER_TIMEOUT ) 
-		{
-			/* serverlist->CallBackFn(serverlist,  //do we want to notify of dead servers? if so, uncomment!
-				LIST_PROGRESS, 
-				serverlist->instance,
-				*(GServer *)serverlist->updatelist[i].currentserver,
-				(void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
-				*/
-			serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
-		}
-		
-	if (serverlist->abortupdate || (serverlist->nextupdate >= ArrayLength(serverlist->servers) && scount == 0)) 
-	{ //we are done!!
-		FreeUpdateList(serverlist);
-		ServerListModeChange(serverlist, sl_idle);
-		return 0;
-	}
-	
+                    if (!gsiSocketIsError(error)) //we got data
+                    {
+                        indata[error] = 0; //truncate and parse it
+                        final = (strstr(indata,"\\final\\") != NULL);
+                        server = serverlist->updatelist[i].currentserver;
+                        if (server->ping == 9999) //set the ping
+                            server->ping = (short)(current_time() - serverlist->updatelist[i].starttime);
+                        ServerParseKeyVals(server, indata); 
+                        if (final) //it's all done
+                        {
+                            serverlist->CallBackFn(serverlist, 
+                                                    LIST_PROGRESS, 
+                                                    serverlist->instance,
+                                                    server,
+                                                    (void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
+                            serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
+                        } 
+                    } else
+                        serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
+                    
+                }
+    }
+    //kill expired ones
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+        if (serverlist->updatelist[i].currentserver != NULL && current_time() - serverlist->updatelist[i].starttime > SERVER_TIMEOUT ) 
+        {
+            /* serverlist->CallBackFn(serverlist,  //do we want to notify of dead servers? if so, uncomment!
+                LIST_PROGRESS, 
+                serverlist->instance,
+                *(GServer *)serverlist->updatelist[i].currentserver,
+                (void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
+                */
+            serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
+        }
+        
+    if (serverlist->abortupdate || (serverlist->nextupdate >= ArrayLength(serverlist->servers) && scount == 0)) 
+    { //we are done!!
+        FreeUpdateList(serverlist);
+        ServerListModeChange(serverlist, sl_idle);
+        return 0;
+    }
+    
 //now, send out queries on available sockets
-	for (i = 0 ; i < serverlist->maxupdates && serverlist->nextupdate < ArrayLength(serverlist->servers) ; i++)
-		if (serverlist->updatelist[i].currentserver == NULL) //it's availalbe
-		{
-			server = *(GServer *)ArrayNth(serverlist->servers,serverlist->nextupdate);
-			serverlist->nextupdate++;
-			serverlist->updatelist[i].currentserver = server;
-			serverlist->updatelist[i].saddr.sin_family = AF_INET;
-			serverlist->updatelist[i].saddr.sin_addr.s_addr = inet_addr(ServerGetAddress(server));
-			serverlist->updatelist[i].saddr.sin_port = htons((short)ServerGetQueryPort(server));
-			sendto(serverlist->updatelist[i].s,querystrings[server->querytype] ,querylengths[server->querytype],0,(struct sockaddr *)&serverlist->updatelist[i].saddr,sizeof(struct sockaddr_in));
-			serverlist->updatelist[i].starttime = current_time();
-		}
+    for (i = 0 ; i < serverlist->maxupdates && serverlist->nextupdate < ArrayLength(serverlist->servers) ; i++)
+        if (serverlist->updatelist[i].currentserver == NULL) //it's availalbe
+        {
+            server = *(GServer *)ArrayNth(serverlist->servers,serverlist->nextupdate);
+            serverlist->nextupdate++;
+            serverlist->updatelist[i].currentserver = server;
+            serverlist->updatelist[i].saddr.sin_family = AF_INET;
+            serverlist->updatelist[i].saddr.sin_addr.s_addr = inet_addr(ServerGetAddress(server));
+            serverlist->updatelist[i].saddr.sin_port = htons((short)ServerGetQueryPort(server));
+            sendto(serverlist->updatelist[i].s,querystrings[server->querytype] ,querylengths[server->querytype],0,(struct sockaddr *)&serverlist->updatelist[i].saddr,sizeof(struct sockaddr_in));
+            serverlist->updatelist[i].starttime = current_time();
+        }
 
 
-	return 0;
+    return 0;
 }
 
 /* ServerListThink
@@ -899,23 +899,23 @@ updating to occur during async server list updates */
 GError ServerListThink(GServerList serverlist)
 {
 
-	switch (serverlist->state)
-	{
-		case sl_idle: return 0;
-		case sl_listxfer:
-				 //read the data
-				return ServerListReadList(serverlist);
-				break;
-		case sl_lanlist:
-				return ServerListLANList(serverlist);
-		case sl_querying: 
-				//do some queries
-				return ServerListQueryLoop(serverlist);
-				break;
-	}
+    switch (serverlist->state)
+    {
+        case sl_idle: return 0;
+        case sl_listxfer:
+                 //read the data
+                return ServerListReadList(serverlist);
+                break;
+        case sl_lanlist:
+                return ServerListLANList(serverlist);
+        case sl_querying: 
+                //do some queries
+                return ServerListQueryLoop(serverlist);
+                break;
+    }
 
 
-	return 0;
+    return 0;
 }
 
 /* ServerListHalt
@@ -923,10 +923,10 @@ GError ServerListThink(GServerList serverlist)
 Halts the current update batch */
 GError ServerListHalt(GServerList serverlist)
 {
-	if (serverlist->state != sl_idle)
-		serverlist->abortupdate = 1;
+    if (serverlist->state != sl_idle)
+        serverlist->abortupdate = 1;
 
-	return 0;
+    return 0;
 }
 
 /* ServerListClear
@@ -935,13 +935,13 @@ Clear and free all of the servers from the server list.
 List must be in the sl_idle state */
 GError ServerListClear(GServerList serverlist)
 {
-	
-	if (serverlist->state != sl_idle)
-		return GE_BUSY;
-	//fastest way to clear is kill and recreate
-	ArrayFree(serverlist->servers);
-	serverlist->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
-	return 0;
+    
+    if (serverlist->state != sl_idle)
+        return GE_BUSY;
+    //fastest way to clear is kill and recreate
+    ArrayFree(serverlist->servers);
+    serverlist->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
+    return 0;
 }
 
 /* ServerListState
@@ -949,7 +949,7 @@ GError ServerListClear(GServerList serverlist)
 Returns the current state of the server list */
 GServerListState ServerListState(GServerList serverlist)
 {
-	return serverlist->state;
+    return serverlist->state;
 }
 
 /* ServerListErrorDesc
@@ -957,16 +957,16 @@ GServerListState ServerListState(GServerList serverlist)
 Returns a static string description of the specified error */
 char *ServerListErrorDesc(GServerList serverlist, GError error)
 {
-	switch (error)
-	{
-	case GE_NOERROR: return "";
-	case GE_NOSOCKET: return "Unable to create socket";
-	case GE_NODNS: return "Unable to resolve master";
-	case GE_NOCONNECT: return "Connection to master reset";
-	case GE_BUSY: return "Server List is busy";
-	case GE_DATAERROR: return "Unexpected data in server list";
-	}
-	return "UNKNOWN ERROR CODE";
+    switch (error)
+    {
+    case GE_NOERROR: return "";
+    case GE_NOSOCKET: return "Unable to create socket";
+    case GE_NODNS: return "Unable to resolve master";
+    case GE_NOCONNECT: return "Connection to master reset";
+    case GE_BUSY: return "Server List is busy";
+    case GE_DATAERROR: return "Unexpected data in server list";
+    }
+    return "UNKNOWN ERROR CODE";
 
 }
 
@@ -975,9 +975,9 @@ char *ServerListErrorDesc(GServerList serverlist, GError error)
 Returns the server at the specified index, or NULL if the index is out of bounds */
 GServer ServerListGetServer(GServerList serverlist, int index)
 {
-	if (index < 0 || index >= ArrayLength(serverlist->servers))
-		return NULL;
-	return *(GServer *)ArrayNth(serverlist->servers,index);
+    if (index < 0 || index >= ArrayLength(serverlist->servers))
+        return NULL;
+    return *(GServer *)ArrayNth(serverlist->servers,index);
 }
 
 /* ServerListCount
@@ -986,7 +986,7 @@ Returns the number of servers on the specified list. Indexing is 0 based, so
 the actual server indexes are 0 <= valid index < Count */
 int ServerListCount(GServerList serverlist)
 {
-	return ArrayLength(serverlist->servers);
+    return ArrayLength(serverlist->servers);
 }
 
 /****
@@ -994,50 +994,50 @@ Comparision Functions
 ***/
 static int IntKeyCompare(const void *entry1, const void *entry2)
 {
-	GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
-	int diff;
-	diff = ServerGetIntValue(server1, g_sortserverlist->sortkey, 0) - 
-			ServerGetIntValue(server2, g_sortserverlist->sortkey, 0);
-	if (!g_sortserverlist->sortascending) 
-		diff = -diff;
-	return diff;
-	
+    GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
+    int diff;
+    diff = ServerGetIntValue(server1, g_sortserverlist->sortkey, 0) - 
+            ServerGetIntValue(server2, g_sortserverlist->sortkey, 0);
+    if (!g_sortserverlist->sortascending) 
+        diff = -diff;
+    return diff;
+    
 }
 
 static int FloatKeyCompare(const void *entry1, const void *entry2)
 {
     GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
-	double f = ServerGetFloatValue(server1, g_sortserverlist->sortkey, 0) - 
-			ServerGetFloatValue(server2, g_sortserverlist->sortkey, 0);
-	if (!g_sortserverlist->sortascending) 
-		f = -f;
-	if ((float)f > (float)0.0) 
-		return 1;
-	else if ((float)f < (float)0.0) 
-		return -1; 
-	else 
-		return 0;
+    double f = ServerGetFloatValue(server1, g_sortserverlist->sortkey, 0) - 
+            ServerGetFloatValue(server2, g_sortserverlist->sortkey, 0);
+    if (!g_sortserverlist->sortascending) 
+        f = -f;
+    if ((float)f > (float)0.0) 
+        return 1;
+    else if ((float)f < (float)0.0) 
+        return -1; 
+    else 
+        return 0;
 }
 
 static int StrCaseKeyCompare(const void *entry1, const void *entry2)
 {
-	
+    
     GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
     int diff = strcmp(ServerGetStringValue(server1, g_sortserverlist->sortkey, ""),
-				ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
-	if (!g_sortserverlist->sortascending) 
-		diff = -diff;
-	return diff;
+                ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
+    if (!g_sortserverlist->sortascending) 
+        diff = -diff;
+    return diff;
 }
 
 static int StrNoCaseKeyCompare(const void *entry1, const void *entry2)
 {
-	GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
-	int diff = strcasecmp(ServerGetStringValue(server1, g_sortserverlist->sortkey, ""),
-				ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
-	if (!g_sortserverlist->sortascending) 
-		diff = -diff;
-	return diff;
+    GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
+    int diff = strcasecmp(ServerGetStringValue(server1, g_sortserverlist->sortkey, ""),
+                ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
+    if (!g_sortserverlist->sortascending) 
+        diff = -diff;
+    return diff;
 }
 
 /* ServerListSort
@@ -1047,22 +1047,22 @@ specified comparemode.
 sortkey can be a normal server key, or "ping" or "hostaddr" */
 void ServerListSort(GServerList serverlist, gbool ascending, char *sortkey, GCompareMode comparemode)
 {
-	ArrayCompareFn comparator;
-	switch (comparemode)
-	{
-	case cm_int: comparator = IntKeyCompare;
-		break;
-	case cm_float: comparator = FloatKeyCompare;
-		break;
-	case cm_strcase: comparator = StrCaseKeyCompare;
-		break;
-	case cm_stricase: comparator = StrNoCaseKeyCompare;
-		break;
-	}
-	serverlist->sortkey = sortkey;
-	serverlist->sortascending = ascending;
-	g_sortserverlist = serverlist;
-	ArraySort(serverlist->servers,comparator);
+    ArrayCompareFn comparator;
+    switch (comparemode)
+    {
+    case cm_int: comparator = IntKeyCompare;
+        break;
+    case cm_float: comparator = FloatKeyCompare;
+        break;
+    case cm_strcase: comparator = StrCaseKeyCompare;
+        break;
+    case cm_stricase: comparator = StrNoCaseKeyCompare;
+        break;
+    }
+    serverlist->sortkey = sortkey;
+    serverlist->sortascending = ascending;
+    g_sortserverlist = serverlist;
+    ArraySort(serverlist->servers,comparator);
 
 }
 
diff --git a/code/gamespy/gutil.c b/code/gamespy/gutil.c
index 698aa946..136c2c77 100644
--- a/code/gamespy/gutil.c
+++ b/code/gamespy/gutil.c
@@ -18,68 +18,68 @@ typedef unsigned char uchar;
 
 static void swap_byte(uchar* a, uchar* b)
 {
-	uchar swapByte;
+    uchar swapByte;
 
-	swapByte = *a;
-	*a = *b;
-	*b = swapByte;
+    swapByte = *a;
+    *a = *b;
+    *b = swapByte;
 }
 
 static uchar encode_ct(uchar c)
 {
-	if (c < 26) return (uchar)('A' + c);
-	if (c < 52) return (uchar)('a' + c - 26);
-	if (c < 62) return (uchar)('0' + c - 52);
-	if (c == 62) return (uchar)('+');
-	if (c == 63) return (uchar)('/');
+    if (c < 26) return (uchar)('A' + c);
+    if (c < 52) return (uchar)('a' + c - 26);
+    if (c < 62) return (uchar)('0' + c - 52);
+    if (c == 62) return (uchar)('+');
+    if (c == 63) return (uchar)('/');
 
-	return 0;
+    return 0;
 }
 
 void gs_encode(uchar* ins, int size, uchar* result)
 {
-	int    i, pos;
-	uchar  trip[3];
-	uchar  kwart[4];
+    int    i, pos;
+    uchar  trip[3];
+    uchar  kwart[4];
 
-	i = 0;
-	while (i < size)
-	{
-		for (pos = 0; pos <= 2; pos++, i++)
-			if (i < size) trip[pos] = *ins++;
-			else trip[pos] = '\0';
-		kwart[0] = (unsigned char)((trip[0]) >> 2);
-		kwart[1] = (unsigned char)((((trip[0]) & 3) << 4) + ((trip[1]) >> 4));
-		kwart[2] = (unsigned char)((((trip[1]) & 15) << 2) + ((trip[2]) >> 6));
-		kwart[3] = (unsigned char)((trip[2]) & 63);
-		for (pos = 0; pos <= 3; pos++) *result++ = encode_ct(kwart[pos]);
-	}
-	*result = '\0';
+    i = 0;
+    while (i < size)
+    {
+        for (pos = 0; pos <= 2; pos++, i++)
+            if (i < size) trip[pos] = *ins++;
+            else trip[pos] = '\0';
+        kwart[0] = (unsigned char)((trip[0]) >> 2);
+        kwart[1] = (unsigned char)((((trip[0]) & 3) << 4) + ((trip[1]) >> 4));
+        kwart[2] = (unsigned char)((((trip[1]) & 15) << 2) + ((trip[2]) >> 6));
+        kwart[3] = (unsigned char)((trip[2]) & 63);
+        for (pos = 0; pos <= 3; pos++) *result++ = encode_ct(kwart[pos]);
+    }
+    *result = '\0';
 }
 
 void gs_encrypt(uchar* key, int key_len, uchar* buffer_ptr, int buffer_len)
 {
-	int counter;
-	uchar x, y, xorIndex;
-	uchar state[256];
+    int counter;
+    uchar x, y, xorIndex;
+    uchar state[256];
 
-	for (counter = 0; counter < 256; counter++) state[counter] = (uchar)counter;
+    for (counter = 0; counter < 256; counter++) state[counter] = (uchar)counter;
 
-	x = 0; y = 0;
-	for (counter = 0; counter < 256; counter++)
-	{
-		y = (uchar)((key[x] + state[counter] + y) % 256);
-		x = (uchar)((x + 1) % key_len);
-		swap_byte(&state[counter], &state[y]);
-	}
+    x = 0; y = 0;
+    for (counter = 0; counter < 256; counter++)
+    {
+        y = (uchar)((key[x] + state[counter] + y) % 256);
+        x = (uchar)((x + 1) % key_len);
+        swap_byte(&state[counter], &state[y]);
+    }
 
-	x = 0; y = 0;
-	for (counter = 0; counter < buffer_len; counter++)
-	{
-		x = (uchar)((x + buffer_ptr[counter] + 1) % 256);
-		y = (uchar)((state[x] + y) % 256);
-		swap_byte(&state[x], &state[y]);
-		xorIndex = (uchar)((state[x] + state[y]) % 256);
-		buffer_ptr[counter] ^= state[xorIndex];
-	}
+    x = 0; y = 0;
+    for (counter = 0; counter < buffer_len; counter++)
+    {
+        x = (uchar)((x + buffer_ptr[counter] + 1) % 256);
+        y = (uchar)((state[x] + y) % 256);
+        swap_byte(&state[x], &state[y]);
+        xorIndex = (uchar)((state[x] + state[y]) % 256);
+        buffer_ptr[counter] ^= state[xorIndex];
+    }
 }
diff --git a/code/gamespy/gutil.h b/code/gamespy/gutil.h
index b35d0f6c..f1889513 100644
--- a/code/gamespy/gutil.h
+++ b/code/gamespy/gutil.h
@@ -27,7 +27,7 @@ size: size of the buffer
 OUT
 ---  
 result: pointer to buffer to store result. Size should be (4 * size) / 3 + 1
-	result will be null terminated.
+    result will be null terminated.
 **********/
 void gs_encode(uchar* ins, int size, uchar* result);
 
diff --git a/code/gamespy/hashtable.c b/code/gamespy/hashtable.c
index 9313e503..84ad6275 100644
--- a/code/gamespy/hashtable.c
+++ b/code/gamespy/hashtable.c
@@ -22,208 +22,208 @@
 
 
 #ifdef _NO_NOPORT_H_
-	#define gsimalloc malloc
-	#define gsifree free
-	#define gsirealloc realloc
-	#include <assert.h>
+    #define gsimalloc malloc
+    #define gsifree free
+    #define gsirealloc realloc
+    #include <assert.h>
 #else
-	#include "nonport.h" //for gsimalloc/realloc/free/assert
+    #include "nonport.h" //for gsimalloc/realloc/free/assert
 #endif
 
 
 struct HashImplementation 
 {
-	DArray *buckets;
-	int nbuckets;
-	TableElementFreeFn freefn;
-	TableHashFn hashfn;
-	TableCompareFn compfn;
+    DArray *buckets;
+    int nbuckets;
+    TableElementFreeFn freefn;
+    TableHashFn hashfn;
+    TableCompareFn compfn;
 };
 
 HashTable TableNew(int elemSize, int nBuckets, 
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn)
+                      TableElementFreeFn freeFn)
 {
-	return TableNew2(elemSize, nBuckets, 4, hashFn, compFn, freeFn);
+    return TableNew2(elemSize, nBuckets, 4, hashFn, compFn, freeFn);
 }
 HashTable TableNew2(int elemSize, int nBuckets, int nChains,
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn)
+                      TableElementFreeFn freeFn)
 {
-	HashTable table;
-	int i;
+    HashTable table;
+    int i;
 
-	assert(hashFn);
-	assert(compFn);
-	assert(elemSize);
-	assert(nBuckets);
+    assert(hashFn);
+    assert(compFn);
+    assert(elemSize);
+    assert(nBuckets);
 
-	table = (HashTable)gsimalloc(sizeof(struct HashImplementation));
-	assert(table);
-	
-	table->buckets = (DArray *)gsimalloc(nBuckets * sizeof(DArray));
-	assert(table->buckets);
-	for (i = 0; i < nBuckets; i++) //ArrayNew will assert if allocation fails
-		table->buckets[i] = ArrayNew(elemSize, nChains, freeFn);
-	table->nbuckets = nBuckets;
-	table->freefn = freeFn;
-	table->compfn = compFn;
-	table->hashfn = hashFn;
+    table = (HashTable)gsimalloc(sizeof(struct HashImplementation));
+    assert(table);
+    
+    table->buckets = (DArray *)gsimalloc(nBuckets * sizeof(DArray));
+    assert(table->buckets);
+    for (i = 0; i < nBuckets; i++) //ArrayNew will assert if allocation fails
+        table->buckets[i] = ArrayNew(elemSize, nChains, freeFn);
+    table->nbuckets = nBuckets;
+    table->freefn = freeFn;
+    table->compfn = compFn;
+    table->hashfn = hashFn;
 
-	return table;
+    return table;
 }
 
 
 void TableFree(HashTable table)
 {
-	int i;
-	
-	assert(table);
+    int i;
+    
+    assert(table);
 
-	if (NULL == table )
-		return;
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayFree(table->buckets[i]);
-	gsifree(table->buckets);
-	gsifree(table);
+    if (NULL == table )
+        return;
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayFree(table->buckets[i]);
+    gsifree(table->buckets);
+    gsifree(table);
 }
 
 
 int TableCount(HashTable table)
 {
-	int i, count = 0;
-	
-	assert(table);
+    int i, count = 0;
+    
+    assert(table);
 
-	if (NULL == table )
-		return count;
+    if (NULL == table )
+        return count;
 
-	for (i = 0 ; i < table->nbuckets ; i++)
-		count += ArrayLength(table->buckets[i]);
-	
-	return count;
+    for (i = 0 ; i < table->nbuckets ; i++)
+        count += ArrayLength(table->buckets[i]);
+    
+    return count;
 }
 
 
 void TableEnter(HashTable table, const void *newElem)
 {
-	int hash, itempos;
-	
-	assert(table);
+    int hash, itempos;
+    
+    assert(table);
 
-	if (NULL == table )
-		return;
+    if (NULL == table )
+        return;
 
-	hash = table->hashfn(newElem, table->nbuckets);
-	itempos = ArraySearch(table->buckets[hash], newElem, table->compfn, 0,0);
-	if (itempos == NOT_FOUND)
-		ArrayAppend(table->buckets[hash], newElem);
-	else
-		ArrayReplaceAt(table->buckets[hash], newElem, itempos);
+    hash = table->hashfn(newElem, table->nbuckets);
+    itempos = ArraySearch(table->buckets[hash], newElem, table->compfn, 0,0);
+    if (itempos == NOT_FOUND)
+        ArrayAppend(table->buckets[hash], newElem);
+    else
+        ArrayReplaceAt(table->buckets[hash], newElem, itempos);
 }
 
 int TableRemove(HashTable table, const void *delElem)
 {
-	int hash, itempos;
-	
-	assert(table);
+    int hash, itempos;
+    
+    assert(table);
 
-	if (NULL == table )
-		return 0;
+    if (NULL == table )
+        return 0;
 
-	hash = table->hashfn(delElem, table->nbuckets);
-	itempos = ArraySearch(table->buckets[hash], delElem, table->compfn, 0,0);
-	if (itempos == NOT_FOUND)
-		return 0;
-	else
-		ArrayDeleteAt(table->buckets[hash], itempos);
-	return 1;
+    hash = table->hashfn(delElem, table->nbuckets);
+    itempos = ArraySearch(table->buckets[hash], delElem, table->compfn, 0,0);
+    if (itempos == NOT_FOUND)
+        return 0;
+    else
+        ArrayDeleteAt(table->buckets[hash], itempos);
+    return 1;
 }
 
 void *TableLookup(HashTable table, const void *elemKey)
 {
-	int hash, itempos;
-	
-	assert(table);
+    int hash, itempos;
+    
+    assert(table);
 
-	if (NULL == table )
-		return NULL;
+    if (NULL == table )
+        return NULL;
 
-	hash = table->hashfn(elemKey, table->nbuckets);
-	itempos = ArraySearch(table->buckets[hash], elemKey, table->compfn, 0,
-						  0);
-	if (itempos == NOT_FOUND)
-		return NULL;
-	else
-		return ArrayNth(table->buckets[hash], itempos);
+    hash = table->hashfn(elemKey, table->nbuckets);
+    itempos = ArraySearch(table->buckets[hash], elemKey, table->compfn, 0,
+                          0);
+    if (itempos == NOT_FOUND)
+        return NULL;
+    else
+        return ArrayNth(table->buckets[hash], itempos);
 }
 
 
 void TableMap(HashTable table, TableMapFn fn, void *clientData)
 {
-	int i;
-	
-	assert(table);
-	assert(fn);
+    int i;
+    
+    assert(table);
+    assert(fn);
 
-	if (NULL == table || NULL == fn)
-		return;
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayMap(table->buckets[i], fn, clientData);
-	
+    if (NULL == table || NULL == fn)
+        return;
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayMap(table->buckets[i], fn, clientData);
+    
 }
 
 void TableMapSafe(HashTable table, TableMapFn fn, void *clientData)
 {
-	int i;
-	
-	assert(fn);
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayMapBackwards(table->buckets[i], fn, clientData);
-	
+    int i;
+    
+    assert(fn);
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayMapBackwards(table->buckets[i], fn, clientData);
+    
 }
 
 void * TableMap2(HashTable table, TableMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
-	
-	assert(fn);
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-	{
-		pcurr = ArrayMap2(table->buckets[i], fn, clientData);
-		if(pcurr)
-			return pcurr;
-	}
+    int i;
+    void * pcurr;
+    
+    assert(fn);
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+    {
+        pcurr = ArrayMap2(table->buckets[i], fn, clientData);
+        if(pcurr)
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void * TableMapSafe2(HashTable table, TableMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
-	
-	assert(fn);
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-	{
-		pcurr = ArrayMapBackwards2(table->buckets[i], fn, clientData);
-		if(pcurr)
-			return pcurr;
-	}
+    int i;
+    void * pcurr;
+    
+    assert(fn);
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+    {
+        pcurr = ArrayMapBackwards2(table->buckets[i], fn, clientData);
+        if(pcurr)
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void TableClear(HashTable table)
 {
-	int i;
+    int i;
 
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayClear(table->buckets[i]);
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayClear(table->buckets[i]);
 }
diff --git a/code/gamespy/hashtable.h b/code/gamespy/hashtable.h
index d6c8a4a3..fa00c2ec 100644
--- a/code/gamespy/hashtable.h
+++ b/code/gamespy/hashtable.h
@@ -126,11 +126,11 @@ extern "C" {
 
 HashTable TableNew(int elemSize, int nBuckets, 
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn);
+                      TableElementFreeFn freeFn);
 
 HashTable TableNew2(int elemSize, int nBuckets, int nChains,
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn);
+                      TableElementFreeFn freeFn);
 
 
  /* TableFree
diff --git a/code/gamespy/md5.h b/code/gamespy/md5.h
index 0fccee0c..0d324291 100644
--- a/code/gamespy/md5.h
+++ b/code/gamespy/md5.h
@@ -38,7 +38,7 @@ The following makes PROTOTYPES default to 0 if it has not already
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+    
 #ifndef PROTOTYPES
 #define PROTOTYPES 1
 #endif
diff --git a/code/gamespy/md5c.c b/code/gamespy/md5c.c
index de31fc6a..8383e62f 100644
--- a/code/gamespy/md5c.c
+++ b/code/gamespy/md5c.c
@@ -305,7 +305,7 @@ static void Decode (UINT4 *output, unsigned char *input, unsigned int len)
  */
 static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
 {
-	memcpy(output, input, len);
+    memcpy(output, input, len);
 /*  unsigned int i;
   
   for (i = 0; i < len; i++)
@@ -316,7 +316,7 @@ static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
  */
 static void MD5_memset (POINTER output, int value, unsigned int len)
 {
-	memset(output, value, len);
+    memset(output, value, len);
  /* unsigned int i;
   
   for (i = 0; i < len; i++)
@@ -327,26 +327,26 @@ static void MD5_memset (POINTER output, int value, unsigned int len)
 
 void MD5Print (unsigned char digest[16], char output[33])
 {
-	static const char hex_digits[] = "0123456789abcdef";
-	unsigned int i;
+    static const char hex_digits[] = "0123456789abcdef";
+    unsigned int i;
 
-	for (i = 0; i < 16; i++)
-	{
-		output[i*2  ] = hex_digits[digest[i] / 16];
-		output[i*2+1] = hex_digits[digest[i] % 16];
-	}
-	output[32] = '\0';
+    for (i = 0; i < 16; i++)
+    {
+        output[i*2  ] = hex_digits[digest[i] / 16];
+        output[i*2+1] = hex_digits[digest[i] % 16];
+    }
+    output[32] = '\0';
 }
 
 void MD5Digest (unsigned char *input, unsigned int len, char output[33])
 {
-	MD5_CTX ctx;
-	unsigned char digest[16];
+    MD5_CTX ctx;
+    unsigned char digest[16];
 
-	MD5Init(&ctx);
-	MD5Update(&ctx, input, len);
-	MD5Final(digest, &ctx);
-	MD5Print(digest, output);
+    MD5Init(&ctx);
+    MD5Update(&ctx, input, len);
+    MD5Final(digest, &ctx);
+    MD5Print(digest, output);
 
 }
 #ifdef __cplusplus

From c1c70a53becb9ee7e8a0d58abef3a075e054c457 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 28 Feb 2025 18:12:34 +0100
Subject: [PATCH 1959/2040] Transition to idle after grouprooms or masterinfo
 requests are finished

---
 code/gamespy/gserverlist.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 7847838f..30fc4fd2 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -763,7 +763,11 @@ static GError ServerListReadList(GServerList serverlist)
                 closesocket(serverlist->slsocket);
                 serverlist->slsocket = INVALID_SOCKET;
                 oldlen = 0; //clear data so it can be used again
-                ServerListModeChange(serverlist, sl_querying);
+                if (serverlist->querytype == qt_grouprooms || serverlist->querytype == qt_masterinfo) {
+                    ServerListModeChange(serverlist, sl_idle);
+                } else {
+                    ServerListModeChange(serverlist, sl_querying);
+                }
                 return 0; //get out!!
             }
             if (oldlen < 6) //no way it could be a full IP, quit

From 70f6ede7b8609348da12e5825ed2bc3d78e20e86 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 1 Mar 2025 00:09:29 +0100
Subject: [PATCH 1960/2040] Add GAMESPY_PORT environment variable

---
 docker/server/base/Dockerfile    | 1 +
 docker/server/base/entrypoint.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/server/base/Dockerfile b/docker/server/base/Dockerfile
index d476b786..bf63cff2 100644
--- a/docker/server/base/Dockerfile
+++ b/docker/server/base/Dockerfile
@@ -38,6 +38,7 @@ RUN useradd -m openmohaa
 USER openmohaa
 
 ENV GAME_PORT=12203
+ENV GAMESPY_PORT=12300
 
 COPY "entrypoint.sh" "/usr/local/bin/entrypoint.sh"
 WORKDIR "/usr/local/share/mohaa"
diff --git a/docker/server/base/entrypoint.sh b/docker/server/base/entrypoint.sh
index 1ba9b5ee..a5d26623 100644
--- a/docker/server/base/entrypoint.sh
+++ b/docker/server/base/entrypoint.sh
@@ -2,4 +2,4 @@
 
 # It's amazing that with Docker, one can't put environment variables in the array of the ENTRYPOINT command
 
-/usr/local/games/openmohaa/lib/openmohaa/omohaaded +set fs_homepath home +set dedicated 2 +set net_port $GAME_PORT:-12203 $@
+/usr/local/games/openmohaa/lib/openmohaa/omohaaded +set fs_homepath home +set dedicated 2 +set net_port $GAME_PORT:-12203 +set net_gamespy_port $GAMESPY_PORT:-12300 $@

From d08027360f441feeabbdc9966bd69f94bbe83cbd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 1 Mar 2025 23:34:24 +0100
Subject: [PATCH 1961/2040] Formatting

---
 code/gamespy/sv_gamespy.c         | 103 +++++++++++++++++-------------
 code/gamespy/sv_gamespy.h         |  22 +++++++
 code/gamespy/sv_gqueryreporting.c |  29 +++++----
 code/gamespy/sv_gqueryreporting.h |   2 +-
 4 files changed, 101 insertions(+), 55 deletions(-)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 472b2da7..0d0f4ebd 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -29,9 +29,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "common/gsCommon.h"
 #include "common/gsAvailable.h"
 
-static char     gamemode[128];
-static qboolean gcdInitialized = qfalse;
-static qboolean gcdValid = qfalse;
+static char        gamemode[128];
+static qboolean    gcdInitialized = qfalse;
+static qboolean    gcdValid       = qfalse;
 extern GSIACResult __GSIACResult;
 
 static const char *SECRET_GS_KEYS[] =
@@ -84,10 +84,10 @@ void qr_process_queries(qr_t qrec);
 
 int qr_init(
     qr_t              *qrec,
-    const char         *ip,
+    const char        *ip,
     int                baseport,
-    const char         *gamename,
-    const char         *secret_key,
+    const char        *gamename,
+    const char        *secret_key,
     qr_querycallback_t qr_basic_callback,
     qr_querycallback_t qr_info_callback,
     qr_querycallback_t qr_rules_callback,
@@ -95,23 +95,28 @@ int qr_init(
     void              *userdata
 );
 
-const char* GS_GetGameKey(unsigned int index) {
+const char *GS_GetGameKey(unsigned int index)
+{
     return SECRET_GS_KEYS[index];
 }
 
-const char* GS_GetCurrentGameKey() {
+const char *GS_GetCurrentGameKey()
+{
     return GS_GetGameKey(com_target_game->integer);
 }
 
-unsigned int GS_GetGameID(unsigned int index) {
+unsigned int GS_GetGameID(unsigned int index)
+{
     return GCD_GAME_IDS[index];
 }
 
-unsigned int GS_GetCurrentGameID() {
+unsigned int GS_GetCurrentGameID()
+{
     return GS_GetGameID(com_target_game->integer);
 }
 
-const char* GS_GetGameName(unsigned int index) {
+const char *GS_GetGameName(unsigned int index)
+{
     if (!com_target_demo->integer) {
         return GS_GAME_NAME[index];
     } else {
@@ -119,11 +124,13 @@ const char* GS_GetGameName(unsigned int index) {
     }
 }
 
-const char* GS_GetCurrentGameName() {
+const char *GS_GetCurrentGameName()
+{
     return GS_GetGameName(com_target_game->integer);
 }
 
-const char* GS_GetGameVersion(unsigned int index) {
+const char *GS_GetGameVersion(unsigned int index)
+{
     if (!com_target_demo->integer) {
         return GS_GAME_VERSION[index];
     } else {
@@ -131,7 +138,8 @@ const char* GS_GetGameVersion(unsigned int index) {
     }
 }
 
-const char* GS_GetCurrentGameVersion() {
+const char *GS_GetCurrentGameVersion()
+{
     return GS_GetGameVersion(com_target_game->integer);
 }
 
@@ -363,7 +371,7 @@ qboolean SV_InitGamespy()
     return qtrue;
 }
 
-void SV_CreateGamespyChallenge(char* challenge)
+void SV_CreateGamespyChallenge(char *challenge)
 {
     int i;
 
@@ -373,10 +381,10 @@ void SV_CreateGamespyChallenge(char* challenge)
     challenge[i] = 0;
 }
 
-challenge_t* FindChallengeById(int gameid)
+challenge_t *FindChallengeById(int gameid)
 {
-    challenge_t* challenge;
-    int i;
+    challenge_t *challenge;
+    int          i;
 
     for (i = 0; i < MAX_CHALLENGES; i++) {
         challenge = &svs.challenges[i];
@@ -388,32 +396,37 @@ challenge_t* FindChallengeById(int gameid)
     return NULL;
 }
 
-void AuthenticateCallback(int gameid, int localid, int authenticated, char* errmsg, void* instance)
+void AuthenticateCallback(int gameid, int localid, int authenticated, char *errmsg, void *instance)
 {
-    challenge_t* challenge;
-    qboolean valid = qfalse;
+    challenge_t *challenge;
+    qboolean     valid = qfalse;
 
     if (localid || !Q_stricmp(errmsg, "CD Key in use")) {
         valid = qtrue;
     }
 
     challenge = FindChallengeById(gameid);
-    if (valid)
-    {
+    if (valid) {
         challenge->cdkeyState = 2;
-        challenge->pingTime = svs.time;
+        challenge->pingTime   = svs.time;
 
         SV_NET_OutOfBandPrint(&svs.netprofile, challenge->adr, "challengeResponse %i", challenge->challenge);
-    }
-    else
-    {
+    } else {
         char buf[32];
 
         if (!challenge) {
             return;
         }
 
-        Com_sprintf(buf, sizeof(buf), "%d.%d.%d.%d", challenge->adr.ip[0], challenge->adr.ip[1], challenge->adr.ip[2], challenge->adr.ip[3]);
+        Com_sprintf(
+            buf,
+            sizeof(buf),
+            "%d.%d.%d.%d",
+            challenge->adr.ip[0],
+            challenge->adr.ip[1],
+            challenge->adr.ip[2],
+            challenge->adr.ip[3]
+        );
         Com_Printf("%s failed cdkey authorization\n", buf);
         challenge->cdkeyState = 3;
         // tell the client about the reason
@@ -421,28 +434,25 @@ void AuthenticateCallback(int gameid, int localid, int authenticated, char* errm
     }
 }
 
-void RefreshAuthCallback(int gameid, int localid, int hint, char* challenge, void* instance)
-{
-}
+void RefreshAuthCallback(int gameid, int localid, int hint, char *challenge, void *instance) {}
 
-void SV_GamespyAuthorize(netadr_t from, const char* response)
+void SV_GamespyAuthorize(netadr_t from, const char *response)
 {
-    char buf[64];
-    challenge_t* challenge = FindChallenge(from, qtrue);
+    char         buf[64];
+    challenge_t *challenge = FindChallenge(from, qtrue);
     if (!challenge) {
         return;
     }
 
-    switch (challenge->cdkeyState)
-    {
+    switch (challenge->cdkeyState) {
     case CDKS_NONE:
         challenge->cdkeyState = CDKS_AUTHENTICATING;
-        challenge->firstTime = svs.time;
+        challenge->firstTime  = svs.time;
 
         gcd_authenticate_user(
             GS_GetCurrentGameID(),
             challenge->gamespyId,
-            LittleLong(*(unsigned int*)from.ip),
+            LittleLong(*(unsigned int *)from.ip),
             challenge->gsChallenge,
             response,
             AuthenticateCallback,
@@ -453,11 +463,10 @@ void SV_GamespyAuthorize(netadr_t from, const char* response)
     case CDKS_AUTHENTICATING:
         // the server can't reach the authentication server
         // let the client connect
-        if (svs.time - challenge->firstTime > 5000)
-        {
+        if (svs.time - challenge->firstTime > 5000) {
             Com_DPrintf("authorize server timed out\n");
             challenge->cdkeyState = CDKS_AUTHENTICATED;
-            challenge->pingTime = svs.time;
+            challenge->pingTime   = svs.time;
             SV_NET_OutOfBandPrint(&svs.netprofile, from, "challengeResponse %i", challenge->challenge);
         }
         break;
@@ -466,7 +475,15 @@ void SV_GamespyAuthorize(netadr_t from, const char* response)
         break;
     case CDKS_FAILED:
         // authentication server told the cdkey was invalid
-        Com_sprintf(buf, sizeof(buf), "%d.%d.%d.%d", challenge->adr.ip[0], challenge->adr.ip[1], challenge->adr.ip[2], challenge->adr.ip[3]);
+        Com_sprintf(
+            buf,
+            sizeof(buf),
+            "%d.%d.%d.%d",
+            challenge->adr.ip[0],
+            challenge->adr.ip[1],
+            challenge->adr.ip[2],
+            challenge->adr.ip[3]
+        );
         Com_Printf("%s failed cdkey authorization\n", buf);
         // reject the client
         SV_NET_OutOfBandPrint(&svs.netprofile, from, "droperror\nServer rejected connection:\nInvalid CD Key");
diff --git a/code/gamespy/sv_gamespy.h b/code/gamespy/sv_gamespy.h
index 3ceb293a..ff524699 100644
--- a/code/gamespy/sv_gamespy.h
+++ b/code/gamespy/sv_gamespy.h
@@ -1,3 +1,25 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
 #pragma once
 
 #ifdef __cplusplus
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index af05144f..7eb6131a 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -294,10 +294,10 @@ static void send_echo(qr_t qrec, struct sockaddr *sender, char *outbuf, const ch
 
 static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *validation)
 {
-    char keyvalue[256];
+    char  keyvalue[256];
     uchar encrypted_val[128];
     uchar encoded_val[200];
-    int  keylen;
+    int   keylen;
 
     if (*validation) {
         keylen = (int)strlen(validation);
@@ -306,7 +306,7 @@ static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *v
             return;
         }
 
-        strcpy((char*)encrypted_val, validation);
+        strcpy((char *)encrypted_val, validation);
 
         gs_encrypt((uchar *)qrec->secret_key, (int)strlen(qrec->secret_key), encrypted_val, keylen);
         gs_encode(encrypted_val, keylen, encoded_val);
@@ -322,7 +322,7 @@ static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *v
 
 static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
 {
-    query_t     querytype    = qtunknown;
+    query_t     querytype                    = qtunknown;
     char        buffer[MAX_KEYVALUES_LENGTH] = {0};
     const char *value;
     char        validation[256] = {0};
@@ -402,7 +402,14 @@ static void send_heartbeat(qr_t qrec, int statechanged)
         sprintf(buf + strlen(buf), "\\statechanged\\%d", statechanged);
     }
 
-    sendto((SOCKET)qrec->hbsock, buf, (int)strlen(buf), 0, (const struct sockaddr *)&qrec->master_saddr, sizeof(qrec->master_saddr));
+    sendto(
+        (SOCKET)qrec->hbsock,
+        buf,
+        (int)strlen(buf),
+        0,
+        (const struct sockaddr *)&qrec->master_saddr,
+        sizeof(qrec->master_saddr)
+    );
     qrec->lastheartbeat = current_time();
 }
 
@@ -417,8 +424,8 @@ void init_qrec(
     int                baseport,
     SOCKET             hbsock,
     SOCKET             querysock,
-    const char         *gamename,
-    const char         *secret_key,
+    const char        *gamename,
+    const char        *secret_key,
     qr_querycallback_t qr_basic_callback,
     qr_querycallback_t qr_info_callback,
     qr_querycallback_t qr_rules_callback,
@@ -457,10 +464,10 @@ void init_qrec(
 
 int qr_init(
     qr_t              *qrec,
-    const char         *ip,
+    const char        *ip,
     int                baseport,
-    const char         *gamename,
-    const char         *secret_key,
+    const char        *gamename,
+    const char        *secret_key,
     qr_querycallback_t qr_basic_callback,
     qr_querycallback_t qr_info_callback,
     qr_querycallback_t qr_rules_callback,
diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index e143b599..2a116609 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 

From d3d16ab7b6bf9ced26fb57517386c316d57f8901 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:14:43 +0100
Subject: [PATCH 1962/2040] Use the index of the entry in the player list,
 rather than the client number

---
 code/gamespy/sv_gamespy.c | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 0d0f4ebd..2e647307 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -220,35 +220,40 @@ static void rules_callback(char *outbuf, int maxlen, void *userdata)
 
 static void players_callback(char *outbuf, int maxlen, void *userdata)
 {
-    int    i;
-    char   infostring[128];
-    size_t infolen;
-    size_t currlen = 0;
+    client_t      *cl;
+    playerState_t *ps;
+    size_t         infolen;
+    size_t         currlen = 0;
+    int            i;
+    int            index;
+    char           infostring[128];
 
     if (!svs.clients) {
         return;
     }
 
-    for (i = 0; i < svs.iNumClients; i++) {
-        if (svs.clients[i].state == CS_FREE) {
+    for (i = 0, index = 0; i < svs.iNumClients; i++) {
+        cl = &svs.clients[i];
+
+        if (cl->state == CS_FREE) {
             // ignore inactive clients
             continue;
         }
 
-        playerState_t *ps = SV_GameClientNum(i);
+        ps = SV_GameClientNum(i);
 
         Com_sprintf(
             infostring,
-            128,
+            sizeof(infostring),
             "\\player_%d\\%s\\frags_%d\\%d\\deaths_%d\\%d\\ping_%d\\%d",
-            i,
-            svs.clients[i].name,
-            i,
+            index,
+            cl->name,
+            index,
             ps->stats[STAT_KILLS],
-            i,
+            index,
             ps->stats[STAT_DEATHS],
-            i,
-            svs.clients[i].ping
+            index,
+            cl->ping
         );
 
         infolen = strlen(infostring);
@@ -256,6 +261,12 @@ static void players_callback(char *outbuf, int maxlen, void *userdata)
             strcat(outbuf, infostring);
             currlen += infolen;
         }
+
+        //
+        // Fixed in OPM
+        //  Some programs enumerate by testing indexes, and stop iterating if the index doesn't exist
+        //
+        index++;
     }
 }
 

From 515a531abf1aba8ad06254c3636234cb68d14079 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:26:47 +0100
Subject: [PATCH 1963/2040] Use the length returned by Com_sprintf

---
 code/gamespy/sv_gamespy.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 2e647307..a3353110 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -242,7 +242,7 @@ static void players_callback(char *outbuf, int maxlen, void *userdata)
 
         ps = SV_GameClientNum(i);
 
-        Com_sprintf(
+        infolen = Com_sprintf(
             infostring,
             sizeof(infostring),
             "\\player_%d\\%s\\frags_%d\\%d\\deaths_%d\\%d\\ping_%d\\%d",
@@ -255,8 +255,7 @@ static void players_callback(char *outbuf, int maxlen, void *userdata)
             index,
             cl->ping
         );
-
-        infolen = strlen(infostring);
+        
         if (currlen + infolen < maxlen) {
             strcat(outbuf, infostring);
             currlen += infolen;

From 9963a99868ae459232b74a69d93ebf8c1421f0bb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:40:36 +0100
Subject: [PATCH 1964/2040] Fix a stack overflow issue (#686)

The length check now include the null-terminated character
---
 code/qcommon/alias.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index 94c2889c..9dcc402a 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -549,7 +549,7 @@ void Alias_ListFindRandomRange(
 
     length = strlen(alias);
 
-    if (length > MAX_ALIASLIST_NAME_LENGTH) {
+    if (length + 1 > MAX_ALIASLIST_NAME_LENGTH) {
         return;
     }
 

From 5c0adf9a28348c9234f3ebe328d8c145e3655fdd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:49:01 +0100
Subject: [PATCH 1965/2040] Refactor Alias_FindRandomRange

---
 code/qcommon/alias.c | 108 +++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index 9dcc402a..d7451d2b 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -553,69 +553,69 @@ void Alias_ListFindRandomRange(
         return;
     }
 
-    for (index = 0; index < length; index++) {
-        convalias[index] = tolower(alias[index]);
+    for (i = 0; i < length; i++) {
+        convalias[i] = tolower(alias[i]);
     }
 
     convalias[length] = 0;
 
     l = 0;
     r = list->num_in_list - 1;
-    if (r >= 0) {
-        do {
-            index = (l + r) >> 1;
-            diff  = strncmp(convalias, list->sorted_list[index]->alias_name, length);
+    while (r >= l) {
+        index = (l + r) >> 1;
+        diff  = strncmp(convalias, list->sorted_list[index]->alias_name, length);
 
-            if (diff == 0) {
-                break;
-            } else if (diff > 0) {
-                l = index + 1;
-            } else {
-                r = index - 1;
-            }
-        } while (r >= l);
-
-        if (r >= l) {
-            numfound         = 0;
-            *min_index       = index;
-            *max_index       = index;
-            totalfoundweight = 0.f;
-
-            ptr = &list->sorted_list[index];
-            for (i = index + 1; i > 0; i--, ptr--) {
-                if (strncmp(convalias, (*ptr)->alias_name, length)) {
-                    break;
-                }
-
-                if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
-                    foundlist[numfound++] = *ptr;
-                    totalfoundweight += (*ptr)->weight;
-                    *min_index = i - 1;
-                }
-            }
-
-            ptr = &list->sorted_list[index + 1];
-
-            for (i = index + 1; i < list->num_in_list; i++, ptr++) {
-                if (strncmp(convalias, (*ptr)->alias_name, length)) {
-                    break;
-                }
-
-                if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
-                    foundlist[numfound++] = *ptr;
-                    totalfoundweight += (*ptr)->weight;
-                    *max_index = i;
-                }
-            }
-
-            if (numfound) {
-                *total_weight = totalfoundweight;
-            } else {
-                *min_index = -1;
-                *max_index = -1;
-            }
+        if (diff == 0) {
+            break;
+        } else if (diff > 0) {
+            l = index + 1;
+        } else {
+            r = index - 1;
         }
     }
+
+    if (r < l) {
+        return;
+    }
+
+    numfound         = 0;
+    *min_index       = index;
+    *max_index       = index;
+    totalfoundweight = 0.f;
+
+    ptr = &list->sorted_list[index];
+    for (i = index + 1; i > 0; i--, ptr--) {
+        if (strncmp(convalias, (*ptr)->alias_name, length)) {
+            break;
+        }
+
+        if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
+            foundlist[numfound++] = *ptr;
+            totalfoundweight += (*ptr)->weight;
+            *min_index = i - 1;
+        }
+    }
+
+    ptr = &list->sorted_list[index + 1];
+    for (i = index + 1; i < list->num_in_list; i++, ptr++) {
+        if (strncmp(convalias, (*ptr)->alias_name, length)) {
+            break;
+        }
+
+        if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
+            foundlist[numfound++] = *ptr;
+            totalfoundweight += (*ptr)->weight;
+            *max_index = i;
+        }
+    }
+
+    if (!numfound) {
+        *min_index = -1;
+        *max_index = -1;
+        return;
+    }
+
+    *total_weight = totalfoundweight;
 }
 
 void Alias_ListDump(AliasList_t *list)

From aac91e8763a036d849e10cfa8bf24a8dfa9c3cf8 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:55:44 +0100
Subject: [PATCH 1966/2040] Refactor and simplify Alias_ListSort

---
 code/qcommon/alias.c | 63 +++++++++++---------------------------------
 1 file changed, 16 insertions(+), 47 deletions(-)

diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index d7451d2b..f420a229 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -353,69 +353,38 @@ qboolean Alias_ListAdd(AliasList_t *list, const char *alias, const char *name, c
     return qtrue;
 }
 
+static int Alias_ListCompareNodes(const void *a1, const void *a2)
+{
+    const AliasListNode_t *ptr1 = *(const AliasListNode_t **)a1;
+    const AliasListNode_t *ptr2 = *(const AliasListNode_t **)a2;
+
+    return strcmp(ptr1->alias_name, ptr2->alias_name);
+}
+
 void Alias_ListSort(AliasList_t *list)
 {
-    int              num;
-    int              size;
-    int              i;
-    AliasListNode_t *root;
     AliasListNode_t *ptr;
-    AliasListNode_t *smallest = NULL;
-    AliasListNode_t *prev;
-    AliasListNode_t *smallprev;
-    AliasListNode_t *last = NULL;
+    int              num;
+    int              i;
 
     if (!list->dirty) {
         return;
     }
 
-    num = 0;
-
-    root            = list->data_list;
-    list->data_list = NULL;
     if (list->sorted_list) {
         Z_Free(list->sorted_list);
     }
 
-    size              = list->num_in_list * sizeof(AliasListNode_t *);
-    list->sorted_list = Z_TagMalloc(size, TAG_TIKI);
-    memset(list->sorted_list, 0, size);
+    num = list->num_in_list;
 
-    for (i = 0; i < list->num_in_list; i++) {
-        prev      = root;
-        smallprev = root;
+    list->sorted_list = Z_TagMalloc(num * sizeof(AliasListNode_t *), TAG_TIKI);
 
-        for (ptr = root->next; ptr != NULL; ptr = ptr->next) {
-            if (strcmp(ptr->alias_name, smallprev->alias_name) < 0) {
-                smallest  = prev;
-                smallprev = ptr;
-            }
-
-            prev = ptr;
-        }
-
-        if (smallprev == root) {
-            root = smallprev->next;
-        } else {
-            smallest->next = smallprev->next;
-        }
-
-        if (!last || strcmp(last->alias_name, smallprev->alias_name)) {
-            list->sorted_list[num++] = smallprev;
-            smallprev->next          = list->data_list;
-            list->data_list          = smallprev;
-            last                     = smallprev;
-        } else {
-            if (strcmp(last->real_name, smallprev->real_name)) {
-                Com_DPrintf("Duplicate Aliases for %s in list %s  Last: %p.\n", last->alias_name, list->name, last);
-            }
-
-            Z_Free(smallprev);
-        }
+    for (i = 0, ptr = list->data_list; i < num; i++, ptr = ptr->next) {
+        list->sorted_list[i] = ptr;
     }
 
-    list->dirty       = 0;
-    list->num_in_list = num;
+    qsort(list->sorted_list, num, sizeof(AliasListNode_t *), Alias_ListCompareNodes);
+    list->dirty = 0;
 }
 
 const char *Alias_ListFind(AliasList_t *list, const char *alias)

From 0080f55ef8aaaa5834de10220bcab6c5132f9d85 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:12:54 +0100
Subject: [PATCH 1967/2040] Round to integer to avoid blurry text

---
 code/uilib/uifont.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 51ac1328..ca19df92 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -313,7 +313,8 @@ void UIFont::Print(float x, float y, const char *text, size_t maxlen, const floa
     }
 
     uii.Rend_SetColor(color);
-    uii.Rend_DrawString(m_font, text, x, y, maxlen, virtualScreen);
+    // Round to integer to avoid blurry text
+    uii.Rend_DrawString(m_font, text, (int)x, (int)y, maxlen, virtualScreen);
 }
 
 void UIFont::PrintJustified(

From 9538dcb6e75395fd132fcc1e89ad419bd5413955 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 3 Mar 2025 22:36:46 +0100
Subject: [PATCH 1968/2040] Print network name change

---
 code/fgame/g_client.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index 5d7f9775..3a69d78d 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -757,6 +757,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
     char      *s;
     gclient_t *client;
     int        clientnum;
+    char       oldname[MAX_NAME_LENGTH];
 
     if (!ent) {
         return;
@@ -772,10 +773,19 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
 
     clientnum = ent - g_entities;
 
+    Q_strncpyz(oldname, client->pers.netname, sizeof(oldname));
     if (gi.SanitizeName(s, client->pers.netname, sizeof(client->pers.netname))) {
         gi.Printf("WARNING: had to sanitize the name for client %i\n", clientnum);
     }
 
+    if (strcmp(oldname, client->pers.netname)) {
+        //
+        // Added in OPM
+        //  Print name changes
+        //
+        gi.Printf("Client %i changed name from '%s' to '%s'\n", clientnum, oldname, client->pers.netname);
+    }
+
     s = Info_ValueForKey(u, "dm_playermodel");
 
     if (!s) {

From 58f7e6f1fe145056dbacd772a82f2ab9d2af3e2e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 4 Mar 2025 23:48:20 +0100
Subject: [PATCH 1969/2040] Use cURL instead of cpp-httplib

---
 .github/workflows/shared-build.yml | 216 ++++++++++++++++++++++-------
 code/sys/CMakeLists.txt            |  12 +-
 code/sys/sys_update_checker.cpp    |  95 +++++++++----
 code/sys/sys_update_checker.h      |   2 +-
 docs/compiling.md                  |  21 ++-
 5 files changed, 258 insertions(+), 88 deletions(-)

diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index 825eaba9..c1fa5419 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -43,7 +43,8 @@ jobs:
     runs-on: ${{ matrix.architecture.os }}
     environment: ${{ inputs.environment }}
     env:
-        openssl-version: '3.4.1'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
         openal-soft-branch: '1.24.2'
 
     steps:
@@ -122,32 +123,72 @@ jobs:
         cmake --install ./build --config Release
 
     ###
-    # OpenSSL
+    # WolfSSL
     ###
-    - name: Cache OpenSSL
-      id: cache-openssl
+    - name: Cache WolfSSL
+      id: cache-wolfssl
       uses: actions/cache@v4
       with:
-        path: 'thirdparties/openssl/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openssl-${{ env.openssl-version }}-v1
+        path: 'thirdparties/wolfssl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
 
-    # OpenSSL setup
-    - name: Checkout openssl
-      if: steps.cache-openssl.outputs.cache-hit != 'true'
+    # WolfSSL setup
+    - name: Checkout WolfSSL
+      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
-        repository: 'openssl/openssl'
-        path: 'thirdparties/openssl'
-        ref: 'openssl-${{ env.openssl-version }}'
+        repository: 'wolfssl/wolfssl'
+        path: 'thirdparties/wolfssl'
+        ref: '${{ env.wolfssl-version }}'
 
-    # OpenSSL build
-    - name: Configure and install openssl
-      if: steps.cache-openssl.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/openssl
+    # WolfSSL build
+    - name: Configure and install wolfssl
+      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/wolfssl
       run: |
-        CC=gcc-12 CFLAGS= ./Configure --prefix=${{github.workspace}}/thirdparties/openssl/install --cross-compile-prefix=${{matrix.architecture.triple}}- ${{matrix.architecture.arch_option}}
-        make -j$(nproc)
-        make install
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl/install' \
+            -DCMAKE_C_FLAGS="$CFLAGS -fPIC" \
+            -DCMAKE_CXX_FLAGS="$CFLAGS -fPIC" \
+            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # cURL
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
+            -DCURL_USE_LIBPSL=OFF \
+            -DCURL_USE_WOLFSSL=ON \
+            -DCURL_ZLIB="" \
+            -DCURL_BROTLI="" \
+            -DCURL_ZSTD="" \
+            -DCMAKE_SHARED_LINKER_FLAGS="-lm" \
+            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl/install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
 
     ###
     # Project
@@ -163,9 +204,7 @@ jobs:
         -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' \
-        -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' \
-        -DHTTPLIB_REQUIRE_OPENSSL=ON \
-        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
         -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
 
@@ -196,8 +235,7 @@ jobs:
         mkdir ${{github.workspace}}/package
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
-        cp -l ${{github.workspace}}/thirdparties/openssl/install/lib*/libcrypto.so.3 '${{github.workspace}}/package/'
-        cp -l ${{github.workspace}}/thirdparties/openssl/install/lib*/libssl.so.3 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.so.4 '${{github.workspace}}/package/'
         if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
         if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
 
@@ -232,7 +270,8 @@ jobs:
     environment: ${{ inputs.environment }}
     env:
         flexbison-branch: 'v2.5.25'
-        openssl-version: '3.4.1'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
         openal-soft-branch: '1.24.2'
 
     steps:
@@ -350,32 +389,37 @@ jobs:
         if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
 
     ###
-    # OpenSSL
+    # cURL
+    #
+    # Uses Schannel as SSL backend, native CAs are used
     ###
-    - name: Cache OpenSSL
-      id: cache-openssl
+    - name: Cache cURL
+      id: cache-curl
       uses: actions/cache@v4
       with:
-        path: 'thirdparties/openssl/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openssl-${{ env.openssl-version }}-v1
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
 
-    # OpenSSL setup
-    - name: Checkout openssl
-      if: steps.cache-openssl.outputs.cache-hit != 'true'
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
-        repository: 'openssl/openssl'
-        path: 'thirdparties/openssl'
-        ref: 'openssl-${{ env.openssl-version }}'
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
 
-    # OpenSSL build
-    - name: Configure and install openssl
-      if: steps.cache-openssl.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/openssl
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
       run: |
-        perl .\Configure --prefix=${{github.workspace}}/thirdparties/openssl/install no-asm ${{matrix.architecture.arch_option}} /FS
-        jom -j($(Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors)
-        nmake install
+        cmake -B ./build `
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' `
+            -DCURL_USE_LIBPSL=OFF `
+            -DCURL_USE_SCHANNEL=ON
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
 
     ###
     # Project
@@ -394,9 +438,7 @@ jobs:
         -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' `
-        -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' `
-        -DHTTPLIB_REQUIRE_OPENSSL=ON `
-        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF `
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' `
         -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
         -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
 
@@ -426,7 +468,7 @@ jobs:
         New-Item -ItemType Directory '${{github.workspace}}/package'
         Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
         Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
-        Copy-Item '${{github.workspace}}/thirdparties/openssl/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/curl/install/bin/*.dll' -Destination '${{github.workspace}}/package'
         if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
         if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
 
@@ -473,6 +515,8 @@ jobs:
     environment: ${{inputs.environment}}
     env:
         openal-soft-branch: '1.24.2'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
 
     steps:
     ###
@@ -538,6 +582,79 @@ jobs:
         cmake --build ./build --config Release --parallel
         cmake --install ./build --config Release
 
+    ###
+    # WolfSSL
+    ###
+# FIXME: Figure out how to compile WolfSSL cross-architecture
+#
+#    - name: Cache WolfSSL
+#      id: cache-wolfssl
+#      uses: actions/cache@v4
+#      with:
+#        path: 'thirdparties/wolfssl_install'
+#        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
+#
+#    # WolfSSL setup
+#    - name: Checkout WolfSSL
+#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+#      uses: actions/checkout@v4
+#      with:
+#        repository: 'wolfssl/wolfssl'
+#        path: 'thirdparties/wolfssl'
+#        ref: '${{ env.wolfssl-version }}'
+#
+#    # WolfSSL build
+#    - name: Configure and install wolfssl
+#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+#      working-directory: ${{github.workspace}}/thirdparties/wolfssl
+#      run: |
+#        cmake -B ./build \
+#            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl_install' \
+#            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+#            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
+#        cmake --build ./build --config Release --parallel
+#        cmake --install ./build --config Release
+
+    ###
+    # cURL
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
+            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+            -DCURL_USE_LIBPSL=OFF \
+            -DCURL_USE_WOLFSSL=OFF \
+            -DCURL_USE_LIBSSH2=OFF \
+            -DUSE_LIBIDN2=OFF \
+            -DUSE_NGHTTP2=OFF \
+            -DCURL_ENABLE_SSL=OFF \
+            -DCURL_ZLIB="" \
+            -DCURL_BROTLI="" \
+            -DCURL_ZSTD="" \
+            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl_install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
     ###
     # Project
     ###
@@ -554,9 +671,7 @@ jobs:
         -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
         -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
         -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
-        -DOPENSSL_ROOT_DIR='${{github.workspace}}/thirdparties/openssl/install' \
-        -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF \
-        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
         -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
         -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
 
@@ -587,6 +702,7 @@ jobs:
         mkdir ${{github.workspace}}/package
         cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/package/'
         cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.4.dylib '${{github.workspace}}/package/'
         if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
         if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
 
diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index d21624c6..96419859 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -45,15 +45,15 @@ target_compile_features(syslib INTERFACE cxx_nullptr cxx_std_17)
 target_compile_features(syslib INTERFACE c_variadic_macros)
 target_link_libraries(syslib INTERFACE qcommon)
 
-find_package(OpenSSL)
+find_package(CURL)
 
-if (NOT ${OPENSSL_FOUND})
-    message(WARNING "OpenSSL is not available, cpp-httplib won't work with SSL/TLS websites")
+if (CURL_FOUND)
+    target_link_libraries(syslib INTERFACE CURL::libcurl)
+    target_compile_definitions(syslib INTERFACE HAS_LIBCURL=1)
+else()
+    message(WARNING "CURL is not available, update checking will not work")
 endif()
 
-add_subdirectory("../cpp-httplib-0.19.0" "cpp-httplib-0.19.0")
-target_link_libraries(syslib INTERFACE httplib)
-
 if(WIN32)
 	target_link_libraries(syslib INTERFACE wsock32 ws2_32)
 	target_link_libraries(syslib INTERFACE winmm)
diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index 70e26cca..813050ee 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -23,7 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "sys_update_checker.h"
 #include "../qcommon/q_version.h"
 
-#include <httplib.h>
+#ifdef HAS_LIBCURL
+
+#include <curl/curl.h>
+
+//#include <httplib.h>
 #include "../qcommon/json.hpp"
 using json = nlohmann::json;
 
@@ -50,38 +54,49 @@ UpdateChecker::UpdateChecker()
 {
     lastMajor = lastMinor = lastPatch = 0;
     versionChecked                    = false;
-    client                            = NULL;
+    handle                            = NULL;
     thread                            = NULL;
 }
 
 UpdateChecker::~UpdateChecker()
 {
-    if (client) {
+    if (handle) {
         Shutdown();
     }
 }
 
 void UpdateChecker::Init()
 {
-    assert(!client);
+    CURLcode result;
+
+    assert(!handle);
     assert(!thread);
 
-    try {
-        httplib::Client *updateCheckerClient = new httplib::Client("https://api.github.com");
-
-        client = updateCheckerClient;
-        thread = new std::thread(&UpdateChecker::RequestThread, this);
-    } catch (const std::exception& e) {
-        client = NULL;
-        thread = NULL;
-        Com_DPrintf("Failed to create update checker: %s\n", e.what());
+    handle = curl_easy_init();
+    if (!handle) {
+        Com_DPrintf("Failed to create curl client\n");
+        return;
     }
+
+    result = curl_easy_setopt(handle, CURLOPT_URL, "https://api.github.com/repos/openmoh/openmohaa/releases/latest");
+
+    if (result != CURLE_OK) {
+        Com_DPrintf("Failed to set curl URL: %s\n", curl_easy_strerror(result));
+        curl_easy_cleanup(handle);
+        handle = NULL;
+        return;
+    }
+
+    curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
+
+    thread = new std::thread(&UpdateChecker::RequestThread, this);
 }
 
 void UpdateChecker::Process()
 {
     std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
-    if (currentTime < lastMessageTime + std::chrono::milliseconds(std::max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
+    if (currentTime
+        < lastMessageTime + std::chrono::milliseconds(Q_max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
         return;
     }
 
@@ -109,12 +124,12 @@ void UpdateChecker::ShutdownClient()
 {
     std::lock_guard<std::shared_mutex> l(clientMutex);
 
-    if (!client) {
+    if (!handle) {
         return;
     }
 
-    delete (httplib::Client *)client;
-    client = NULL;
+    curl_easy_cleanup(handle);
+    handle = NULL;
 }
 
 void UpdateChecker::ShutdownThread()
@@ -201,22 +216,35 @@ bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor
     return true;
 }
 
+size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
+{
+    std::string& responseString = *(std::string *)userp;
+    responseString.append(contents, size * nmemb);
+
+    return size * nmemb;
+}
+
 void UpdateChecker::DoRequest()
 {
     std::lock_guard<std::shared_mutex> l(clientMutex);
+    CURLcode                           result;
+    std::string                        responseString;
 
-    httplib::Client *updateCheckerClient = (httplib::Client *)client;
+    curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback);
+    curl_easy_setopt(handle, CURLOPT_WRITEDATA, &responseString);
 
-    if (!updateCheckerClient) {
+    result = curl_easy_perform(handle);
+    if (result != CURLE_OK) {
         return;
     }
 
-    httplib::Result result = updateCheckerClient->Get("/repos/openmoh/openmohaa/releases/latest");
-    if (result.error() != httplib::Error::Success) {
+    nlohmann::json data;
+    
+    try {
+        data = nlohmann::json::parse(responseString);
+    } catch(const std::exception& e) {
         return;
     }
-    httplib::Response response = result.value();
-    nlohmann::json    data     = nlohmann::json::parse(response.body);
 
     try {
         const nlohmann::json::string_t& tagName = data.at("tag_name");
@@ -237,9 +265,10 @@ void UpdateChecker::RequestThread()
     std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
     std::chrono::time_point<std::chrono::steady_clock> lastCheckTime;
 
-    while (client) {
+    while (handle) {
         currentTime = std::chrono::steady_clock::now();
-        if (currentTime >= lastCheckTime + std::chrono::milliseconds(std::max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
+        if (currentTime
+            >= lastCheckTime + std::chrono::milliseconds(Q_max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
             lastCheckTime = currentTime;
 
             DoRequest();
@@ -248,3 +277,19 @@ void UpdateChecker::RequestThread()
         std::this_thread::sleep_for(std::chrono::milliseconds(500));
     }
 }
+
+#else
+
+void Sys_UpdateChecker_Init()
+{
+}
+
+void Sys_UpdateChecker_Process()
+{
+}
+
+void Sys_UpdateChecker_Shutdown()
+{
+}
+
+#endif
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
index 7231e096..9142da22 100644
--- a/code/sys/sys_update_checker.h
+++ b/code/sys/sys_update_checker.h
@@ -75,7 +75,7 @@ private:
     //
     // Thread-related variables
     //
-    void             *client;
+    void             *handle;
     std::shared_mutex clientMutex;
     std::thread      *thread;
 };
diff --git a/docs/compiling.md b/docs/compiling.md
index 5ec809e2..19f6a704 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -10,13 +10,13 @@ The following tools are required for all platforms:
 - [OpenAL SDK](https://github.com/kcat/openal-soft)
 
 The following tools may be useful:
-- [OpenSSL](https://github.com/openssl/openssl)
+- [cURL](https://github.com/curl/curl)
 
 The installation directory can be set to the MOHAA directory with `-DCMAKE_INSTALL_PREFIX=/path/to/mohaa`.
 
 Compiling debug binaries will result in a `-dbg` suffix appended to the name of the binaries to avoid mixing debug/release code.
 
-OpenSSL is used to access websites using TLS over HTTP. It is currently used to check for a new release. If OpenSSL is not installed, OpenMoHAA will be unable to check for new updates automatically.
+cURL is used to access websites. It is currently used to check for a new release. If the project is compiled without cURL, OpenMoHAA will be unable to check for new updates automatically.
 
 ## Compiling for Linux
 
@@ -25,12 +25,13 @@ These are the tools required on Linux :
 - libsdl2-dev
 - libopenal-dev
 - libssl-dev
+- libcurl4-openssl-dev
 
 **clang-7** and **gcc-9** has been tested to work on Ubuntu 20.04. Although it's best to use the latest versions.
 
 1 line install command with clang:
 ```sh
-sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libopenal-dev libssl-dev
+sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libopenal-dev libcurl4-openssl-dev
 ```
 
 Example with **CMake** and **ninja-build** installed:
@@ -45,12 +46,20 @@ Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compi
 
 Visual Studio (2019 or 2022) is generally preferred.
 
-Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/latest
-OpenAL can be downloaded from here: https://github.com/kcat/openal-soft/releases/latest rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
+- Get Flex/Bison: https://github.com/lexxmark/winflexbison/releases/latest
+- Get OpenAL: https://github.com/kcat/openal-soft/releases/latest rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
+- Get cURL: https://github.com/curl/curl
 
 Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.
 
-Optionally, you can append `-DOPENSSL_ROOT_DIR=path\to\openssl\install` to specify the path to OpenSSL.
+Optionally, The cURL library can be compiled with the following CMake commands:
+```
+cmake -DCMAKE_INSTALL_PREFIX="E:\Src\openmoh\openmohaa\thirdparty\curl\build\install" -DCURL_USE_LIBPSL=OFF -DCURL_USE_SCHANNEL=ON -B build
+cmake --build build --config Release
+cmake --install build --config Release
+```
+
+afterwards you can can append `-DCURL_ROOT=path\to\curl\install` to specify the install path to cURL.
 
 ## Tweaking the build
 

From 5b9efaa2a014f8774b2f13afd8adc5a6c3b2282c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 6 Mar 2025 20:21:23 +0100
Subject: [PATCH 1970/2040] Remove cpp-httplib

---
 code/cpp-httplib-0.19.0/.gitattributes        |     2 -
 code/cpp-httplib-0.19.0/CMakeLists.txt        |   309 -
 code/cpp-httplib-0.19.0/Dockerfile            |    11 -
 code/cpp-httplib-0.19.0/LICENSE               |    22 -
 code/cpp-httplib-0.19.0/README.md             |   979 --
 code/cpp-httplib-0.19.0/benchmark/Makefile    |    62 -
 .../benchmark/cpp-httplib-base/httplib.h      | 10154 -----------
 .../benchmark/cpp-httplib-base/main.cpp       |    12 -
 .../benchmark/cpp-httplib/main.cpp            |    12 -
 .../benchmark/crow/crow_all.h                 | 14316 ----------------
 .../benchmark/crow/main.cpp                   |    17 -
 code/cpp-httplib-0.19.0/benchmark/download.sh |     2 -
 .../cpp-httplib-0.19.0/cmake/FindBrotli.cmake |   168 -
 .../cmake/httplibConfig.cmake.in              |    84 -
 code/cpp-httplib-0.19.0/docker-compose.yml    |     7 -
 .../cpp-httplib-0.19.0/docker/html/index.html |    21 -
 code/cpp-httplib-0.19.0/docker/main.cc        |    81 -
 .../example/Dockerfile.hello                  |    12 -
 code/cpp-httplib-0.19.0/example/Makefile      |    64 -
 code/cpp-httplib-0.19.0/example/benchmark.cc  |    33 -
 code/cpp-httplib-0.19.0/example/ca-bundle.crt |  3401 ----
 code/cpp-httplib-0.19.0/example/client.cc     |    41 -
 .../cpp-httplib-0.19.0/example/client.vcxproj |   160 -
 code/cpp-httplib-0.19.0/example/example.sln   |    46 -
 code/cpp-httplib-0.19.0/example/hello.cc      |    19 -
 .../example/one_time_request.cc               |    56 -
 code/cpp-httplib-0.19.0/example/redirect.cc   |    60 -
 code/cpp-httplib-0.19.0/example/server.cc     |   113 -
 .../cpp-httplib-0.19.0/example/server.vcxproj |   160 -
 .../example/server_and_client.cc              |    90 -
 code/cpp-httplib-0.19.0/example/simplecli.cc  |    29 -
 code/cpp-httplib-0.19.0/example/simplesvr.cc  |   135 -
 code/cpp-httplib-0.19.0/example/upload.cc     |    61 -
 code/cpp-httplib-0.19.0/example/uploader.sh   |     6 -
 code/cpp-httplib-0.19.0/httplib.h             | 10475 -----------
 code/cpp-httplib-0.19.0/meson.build           |   116 -
 code/cpp-httplib-0.19.0/meson_options.txt     |    10 -
 code/cpp-httplib-0.19.0/split.py              |    67 -
 code/cpp-httplib-0.19.0/test/CMakeLists.txt   |   121 -
 code/cpp-httplib-0.19.0/test/Makefile         |    73 -
 code/cpp-httplib-0.19.0/test/ca-bundle.crt    |  3401 ----
 .../test/fuzzing/CMakeLists.txt               |    10 -
 code/cpp-httplib-0.19.0/test/fuzzing/Makefile |    27 -
 code/cpp-httplib-0.19.0/test/fuzzing/corpus/1 |     1 -
 code/cpp-httplib-0.19.0/test/fuzzing/corpus/2 |     5 -
 code/cpp-httplib-0.19.0/test/fuzzing/corpus/3 |   Bin 54 -> 0 bytes
 ...e-minimized-server_fuzzer-5042094968537088 |   Bin 516575 -> 0 bytes
 ...e-minimized-server_fuzzer-5372331946541056 |   Bin 1041826 -> 0 bytes
 ...e-minimized-server_fuzzer-5386708825800704 |   Bin 787294 -> 0 bytes
 ...e-minimized-server_fuzzer-5667822731132928 |   Bin 317 -> 0 bytes
 ...e-minimized-server_fuzzer-5886572146327552 |   Bin 974479 -> 0 bytes
 ...e-minimized-server_fuzzer-5942767436562432 |   Bin 395 -> 0 bytes
 ...e-minimized-server_fuzzer-6007379124158464 |   Bin 452123 -> 0 bytes
 ...e-minimized-server_fuzzer-6508706672541696 |     7 -
 .../test/fuzzing/corpus/issue1264             |    19 -
 .../test/fuzzing/server_fuzzer.cc             |    98 -
 .../test/fuzzing/server_fuzzer.dict           |   224 -
 .../fuzzing/standalone_fuzz_target_runner.cpp |    35 -
 code/cpp-httplib-0.19.0/test/gen-certs.sh     |    18 -
 .../test/gtest/gtest-all.cc                   | 12501 --------------
 code/cpp-httplib-0.19.0/test/gtest/gtest.h    | 12377 -------------
 .../test/gtest/gtest_main.cc                  |    54 -
 code/cpp-httplib-0.19.0/test/image.jpg        |   Bin 33653 -> 0 bytes
 .../test/include_httplib.cc                   |     5 -
 .../test/make-shared-library.sh               |    28 -
 code/cpp-httplib-0.19.0/test/meson.build      |   144 -
 code/cpp-httplib-0.19.0/test/proxy/Dockerfile |    13 -
 .../test/proxy/basic_passwd                   |     1 -
 .../test/proxy/basic_squid.conf               |    81 -
 .../test/proxy/digest_passwd                  |     1 -
 .../test/proxy/digest_squid.conf              |    81 -
 .../test/proxy/docker-compose.yml             |    22 -
 code/cpp-httplib-0.19.0/test/test.cc          |  8458 ---------
 code/cpp-httplib-0.19.0/test/test.conf        |    21 -
 code/cpp-httplib-0.19.0/test/test.rootCA.conf |    18 -
 code/cpp-httplib-0.19.0/test/test.sln         |    28 -
 code/cpp-httplib-0.19.0/test/test.vcxproj     |   180 -
 code/cpp-httplib-0.19.0/test/test_proxy.cc    |   288 -
 code/cpp-httplib-0.19.0/test/www/dir/1MB.txt  |  8192 ---------
 .../test/www/dir/index.html                   |     8 -
 .../test/www/dir/meson.build                  |     8 -
 .../test/www/dir/test.abcde                   |     1 -
 .../cpp-httplib-0.19.0/test/www/dir/test.html |     1 -
 code/cpp-httplib-0.19.0/test/www/empty_file   |     0
 code/cpp-httplib-0.19.0/test/www/file         |     1 -
 code/cpp-httplib-0.19.0/test/www/meson.build  |     7 -
 .../test/www/日本語Dir/日本語File.txt         |     1 -
 .../test/www2/dir/index.html                  |     8 -
 .../test/www2/dir/meson.build                 |     6 -
 .../test/www2/dir/test.html                   |     1 -
 .../test/www3/dir/index.html                  |     8 -
 .../test/www3/dir/meson.build                 |     6 -
 .../test/www3/dir/test.html                   |     1 -
 93 files changed, 88002 deletions(-)
 delete mode 100644 code/cpp-httplib-0.19.0/.gitattributes
 delete mode 100644 code/cpp-httplib-0.19.0/CMakeLists.txt
 delete mode 100644 code/cpp-httplib-0.19.0/Dockerfile
 delete mode 100644 code/cpp-httplib-0.19.0/LICENSE
 delete mode 100644 code/cpp-httplib-0.19.0/README.md
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/Makefile
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/crow/main.cpp
 delete mode 100644 code/cpp-httplib-0.19.0/benchmark/download.sh
 delete mode 100644 code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake
 delete mode 100644 code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in
 delete mode 100644 code/cpp-httplib-0.19.0/docker-compose.yml
 delete mode 100644 code/cpp-httplib-0.19.0/docker/html/index.html
 delete mode 100644 code/cpp-httplib-0.19.0/docker/main.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/Dockerfile.hello
 delete mode 100644 code/cpp-httplib-0.19.0/example/Makefile
 delete mode 100644 code/cpp-httplib-0.19.0/example/benchmark.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/ca-bundle.crt
 delete mode 100644 code/cpp-httplib-0.19.0/example/client.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/client.vcxproj
 delete mode 100644 code/cpp-httplib-0.19.0/example/example.sln
 delete mode 100644 code/cpp-httplib-0.19.0/example/hello.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/one_time_request.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/redirect.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/server.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/server.vcxproj
 delete mode 100644 code/cpp-httplib-0.19.0/example/server_and_client.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/simplecli.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/simplesvr.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/upload.cc
 delete mode 100644 code/cpp-httplib-0.19.0/example/uploader.sh
 delete mode 100644 code/cpp-httplib-0.19.0/httplib.h
 delete mode 100644 code/cpp-httplib-0.19.0/meson.build
 delete mode 100644 code/cpp-httplib-0.19.0/meson_options.txt
 delete mode 100644 code/cpp-httplib-0.19.0/split.py
 delete mode 100644 code/cpp-httplib-0.19.0/test/CMakeLists.txt
 delete mode 100644 code/cpp-httplib-0.19.0/test/Makefile
 delete mode 100644 code/cpp-httplib-0.19.0/test/ca-bundle.crt
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/Makefile
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/1
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/2
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/3
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5372331946541056
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5386708825800704
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5667822731132928
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5942767436562432
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict
 delete mode 100644 code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp
 delete mode 100644 code/cpp-httplib-0.19.0/test/gen-certs.sh
 delete mode 100644 code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc
 delete mode 100644 code/cpp-httplib-0.19.0/test/gtest/gtest.h
 delete mode 100644 code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc
 delete mode 100644 code/cpp-httplib-0.19.0/test/image.jpg
 delete mode 100644 code/cpp-httplib-0.19.0/test/include_httplib.cc
 delete mode 100644 code/cpp-httplib-0.19.0/test/make-shared-library.sh
 delete mode 100644 code/cpp-httplib-0.19.0/test/meson.build
 delete mode 100644 code/cpp-httplib-0.19.0/test/proxy/Dockerfile
 delete mode 100644 code/cpp-httplib-0.19.0/test/proxy/basic_passwd
 delete mode 100644 code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf
 delete mode 100644 code/cpp-httplib-0.19.0/test/proxy/digest_passwd
 delete mode 100644 code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf
 delete mode 100644 code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml
 delete mode 100644 code/cpp-httplib-0.19.0/test/test.cc
 delete mode 100644 code/cpp-httplib-0.19.0/test/test.conf
 delete mode 100644 code/cpp-httplib-0.19.0/test/test.rootCA.conf
 delete mode 100644 code/cpp-httplib-0.19.0/test/test.sln
 delete mode 100644 code/cpp-httplib-0.19.0/test/test.vcxproj
 delete mode 100644 code/cpp-httplib-0.19.0/test/test_proxy.cc
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/dir/1MB.txt
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/dir/index.html
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/dir/meson.build
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/dir/test.abcde
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/dir/test.html
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/empty_file
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/file
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/meson.build
 delete mode 100644 code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt
 delete mode 100644 code/cpp-httplib-0.19.0/test/www2/dir/index.html
 delete mode 100644 code/cpp-httplib-0.19.0/test/www2/dir/meson.build
 delete mode 100644 code/cpp-httplib-0.19.0/test/www2/dir/test.html
 delete mode 100644 code/cpp-httplib-0.19.0/test/www3/dir/index.html
 delete mode 100644 code/cpp-httplib-0.19.0/test/www3/dir/meson.build
 delete mode 100644 code/cpp-httplib-0.19.0/test/www3/dir/test.html

diff --git a/code/cpp-httplib-0.19.0/.gitattributes b/code/cpp-httplib-0.19.0/.gitattributes
deleted file mode 100644
index f8184834..00000000
--- a/code/cpp-httplib-0.19.0/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-/test/www*/dir/*.html text eol=lf
-/test/www*/dir/*.txt text eol=lf
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/CMakeLists.txt b/code/cpp-httplib-0.19.0/CMakeLists.txt
deleted file mode 100644
index 61419c63..00000000
--- a/code/cpp-httplib-0.19.0/CMakeLists.txt
+++ /dev/null
@@ -1,309 +0,0 @@
-#[[
-	Build options:
-	* BUILD_SHARED_LIBS (default off) builds as a shared library (if HTTPLIB_COMPILE is ON)
-	* HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on)
-	* HTTPLIB_USE_ZLIB_IF_AVAILABLE (default on)
-	* HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on)
-	* HTTPLIB_REQUIRE_OPENSSL (default off)
-	* HTTPLIB_REQUIRE_ZLIB (default off)
-	* HTTPLIB_REQUIRE_BROTLI (default off)
-	* HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN (default on)
-	* HTTPLIB_COMPILE (default off)
-	* HTTPLIB_INSTALL (default on)
-	* HTTPLIB_TEST (default off)
-	* BROTLI_USE_STATIC_LIBS - tells Cmake to use the static Brotli libs (only works if you have them installed).
-	* OPENSSL_USE_STATIC_LIBS - tells Cmake to use the static OpenSSL libs (only works if you have them installed).
-
-	-------------------------------------------------------------------------------
-
-	After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL ZLIB Brotli) is available.
-	This creates a httplib::httplib target (if found and if listed components are supported).
-	It can be linked like so:
-
-	target_link_libraries(your_exe httplib::httplib)
-
-	The following will build & install for later use.
-
-	Linux/macOS:
-
-	mkdir -p build
-	cd build
-	cmake -DCMAKE_BUILD_TYPE=Release ..
-	sudo cmake --build . --target install
-
-	Windows:
-
-	mkdir build
-	cd build
-	cmake ..
-	runas /user:Administrator "cmake --build . --config Release --target install"
-
-	-------------------------------------------------------------------------------
-
-	These variables are available after you run find_package(httplib)
-	* HTTPLIB_HEADER_PATH - this is the full path to the installed header (e.g. /usr/include/httplib.h).
-	* HTTPLIB_IS_USING_OPENSSL - a bool for if OpenSSL support is enabled.
-	* HTTPLIB_IS_USING_ZLIB - a bool for if ZLIB support is enabled.
-	* HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled.
-	* HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN - a bool for if support of loading system certs from the Apple Keychain is enabled.
-	* HTTPLIB_IS_COMPILED - a bool for if the library is compiled, or otherwise header-only.
-	* HTTPLIB_INCLUDE_DIR - the root path to httplib's header (e.g. /usr/include).
-	* HTTPLIB_LIBRARY - the full path to the library if compiled (e.g. /usr/lib/libhttplib.so).
-	* httplib_VERSION or HTTPLIB_VERSION - the project's version string.
-	* HTTPLIB_FOUND - a bool for if the target was found.
-
-	Want to use precompiled headers (Cmake feature since v3.16)?
-	It's as simple as doing the following (before linking):
-
-	target_precompile_headers(httplib::httplib INTERFACE "${HTTPLIB_HEADER_PATH}")
-
-	-------------------------------------------------------------------------------
-
-	ARCH_INDEPENDENT option of write_basic_package_version_file() requires Cmake v3.14
-]]
-cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
-
-# Get the CPPHTTPLIB_VERSION value and use it as a version
-# This gets the string with the CPPHTTPLIB_VERSION value from the header.
-# This is so the maintainer doesn't actually need to update this manually.
-file(STRINGS httplib.h _raw_version_string REGEX "CPPHTTPLIB_VERSION \"([0-9]+\\.[0-9]+\\.[0-9]+)\"")
-
-# Extracts just the version string itself from the whole string contained in _raw_version_string
-# since _raw_version_string would contain the entire line of code where it found the version string
-string(REGEX MATCH "([0-9]+\\.?)+" _httplib_version "${_raw_version_string}")
-
-project(httplib
-	VERSION ${_httplib_version}
-	LANGUAGES CXX
-	DESCRIPTION "A C++ header-only HTTP/HTTPS server and client library."
-	HOMEPAGE_URL "https://github.com/yhirose/cpp-httplib"
-)
-
-# Change as needed to set an OpenSSL minimum version.
-# This is used in the installed Cmake config file.
-set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0")
-
-# Lets you disable C++ exception during CMake configure time.
-# The value is used in the install CMake config file.
-option(HTTPLIB_NO_EXCEPTIONS "Disable the use of C++ exceptions" OFF)
-# Allow for a build to require OpenSSL to pass, instead of just being optional
-option(HTTPLIB_REQUIRE_OPENSSL "Requires OpenSSL to be found & linked, or fails build." OFF)
-option(HTTPLIB_REQUIRE_ZLIB "Requires ZLIB to be found & linked, or fails build." OFF)
-# Allow for a build to casually enable OpenSSL/ZLIB support, but silently continue if not found.
-# Make these options so their automatic use can be specifically disabled (as needed)
-option(HTTPLIB_USE_OPENSSL_IF_AVAILABLE "Uses OpenSSL (if available) to enable HTTPS support." ON)
-option(HTTPLIB_USE_ZLIB_IF_AVAILABLE "Uses ZLIB (if available) to enable Zlib compression support." ON)
-# Lets you compile the program as a regular library instead of header-only
-option(HTTPLIB_COMPILE "If ON, uses a Python script to split the header into a compilable header & source file (requires Python v3)." OFF)
-# Lets you disable the installation (useful when fetched from another CMake project)
-option(HTTPLIB_INSTALL "Enables the installation target" ON)
-option(HTTPLIB_TEST "Enables testing and builds tests" OFF)
-option(HTTPLIB_REQUIRE_BROTLI "Requires Brotli to be found & linked, or fails build." OFF)
-option(HTTPLIB_USE_BROTLI_IF_AVAILABLE "Uses Brotli (if available) to enable Brotli decompression support." ON)
-option(HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN "Enable feature to load system certs from the Apple Keychain." ON)
-# Defaults to static library
-option(BUILD_SHARED_LIBS "Build the library as a shared library instead of static. Has no effect if using header-only." OFF)
-if (BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
-	# Necessary for Windows if building shared libs
-	# See https://stackoverflow.com/a/40743080
-	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
-# Set some variables that are used in-tree and while building based on our options
-set(HTTPLIB_IS_COMPILED ${HTTPLIB_COMPILE})
-set(HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN ${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN})
-
-# Threads needed for <thread> on some systems, and for <pthread.h> on Linux
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads REQUIRED)
-# Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
-if(HTTPLIB_REQUIRE_OPENSSL)
-	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
-	set(HTTPLIB_IS_USING_OPENSSL TRUE)
-elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
-	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
-	# Avoid a rare circumstance of not finding all components but the end-user did their
-	# own call for OpenSSL, which might trick us into thinking we'd otherwise have what we wanted
-	if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
-		set(HTTPLIB_IS_USING_OPENSSL ${OPENSSL_FOUND})
-	else()
-		set(HTTPLIB_IS_USING_OPENSSL FALSE)
-	endif()
-endif()
-
-if(HTTPLIB_REQUIRE_ZLIB)
-	find_package(ZLIB REQUIRED)
-	set(HTTPLIB_IS_USING_ZLIB TRUE)
-elseif(HTTPLIB_USE_ZLIB_IF_AVAILABLE)
-	find_package(ZLIB QUIET)
-	# FindZLIB doesn't have a ZLIB_FOUND variable, so check the target.
-	if(TARGET ZLIB::ZLIB)
-		set(HTTPLIB_IS_USING_ZLIB TRUE)
-	endif()
-endif()
-
-# Adds our cmake folder to the search path for find_package
-# This is so we can use our custom FindBrotli.cmake
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if(HTTPLIB_REQUIRE_BROTLI)
-	find_package(Brotli COMPONENTS encoder decoder common REQUIRED)
-	set(HTTPLIB_IS_USING_BROTLI TRUE)
-elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
-	find_package(Brotli COMPONENTS encoder decoder common QUIET)
-	set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
-endif()
-
-# Used for default, common dirs that the end-user can change (if needed)
-# like CMAKE_INSTALL_INCLUDEDIR or CMAKE_INSTALL_DATADIR
-include(GNUInstallDirs)
-
-if(HTTPLIB_COMPILE)
-	# Put the split script into the build dir
-	configure_file(split.py "${CMAKE_CURRENT_BINARY_DIR}/split.py"
-		COPYONLY
-	)
-	# Needs to be in the same dir as the python script
-	configure_file(httplib.h "${CMAKE_CURRENT_BINARY_DIR}/httplib.h"
-		COPYONLY
-	)
-
-	# Used outside of this if-else
-	set(_INTERFACE_OR_PUBLIC PUBLIC)
-	# Brings in the Python3_EXECUTABLE path we can use.
-	find_package(Python3 REQUIRED)
-	# Actually split the file
-	# Keeps the output in the build dir to not pollute the main dir
-	execute_process(COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/split.py"
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		ERROR_VARIABLE _httplib_split_error
-	)
-	if(_httplib_split_error)
-		message(FATAL_ERROR "Failed when trying to split cpp-httplib with the Python script.\n${_httplib_split_error}")
-	endif()
-
-	# split.py puts output in "out"
-	set(_httplib_build_includedir "${CMAKE_CURRENT_BINARY_DIR}/out")
-	# This will automatically be either static or shared based on the value of BUILD_SHARED_LIBS
-	add_library(${PROJECT_NAME} "${_httplib_build_includedir}/httplib.cc")
-	target_sources(${PROJECT_NAME}
-		PUBLIC
-			$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
-			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
-	)
-	set_target_properties(${PROJECT_NAME}
-		PROPERTIES
-			VERSION ${${PROJECT_NAME}_VERSION}
-			SOVERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}"
-			OUTPUT_NAME cpp-httplib
-	)
-else()
-	# This is for header-only.
-	set(_INTERFACE_OR_PUBLIC INTERFACE)
-	add_library(${PROJECT_NAME} INTERFACE)
-	set(_httplib_build_includedir "${CMAKE_CURRENT_SOURCE_DIR}")
-endif()
-# Lets you address the target with httplib::httplib
-# Only useful if building in-tree, versus using it from an installation.
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-# Require C++11
-target_compile_features(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} cxx_std_11)
-
-target_include_directories(${PROJECT_NAME} SYSTEM ${_INTERFACE_OR_PUBLIC}
-    $<BUILD_INTERFACE:${_httplib_build_includedir}>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-# Always require threads
-target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
-		Threads::Threads
-		# Needed for Windows libs on Mingw, as the pragma comment(lib, "xyz") aren't triggered.
-		$<$<PLATFORM_ID:Windows>:ws2_32>
-		$<$<PLATFORM_ID:Windows>:crypt32>
-		# Needed for API from MacOS Security framework
-		"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
-		# Can't put multiple targets in a single generator expression or it bugs out.
-		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::common>
-		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
-		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::decoder>
-		$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
-		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
-		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
-)
-
-# Set the definitions to enable optional features
-target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
-	$<$<BOOL:${HTTPLIB_NO_EXCEPTIONS}>:CPPHTTPLIB_NO_EXCEPTIONS>
-	$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:CPPHTTPLIB_BROTLI_SUPPORT>
-	$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:CPPHTTPLIB_ZLIB_SUPPORT>
-	$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT>
-	$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN>
-)
-
-# CMake configuration files installation directory
-set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-include(CMakePackageConfigHelpers)
-
-# Configures the meta-file httplibConfig.cmake.in to replace variables with paths/values/etc.
-configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in"
-	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-	INSTALL_DESTINATION "${_TARGET_INSTALL_CMAKEDIR}"
-	# Passes the includedir install path
-	PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
-)
-
-if(HTTPLIB_COMPILE)
-	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-		# Example: if you find_package(httplib 0.5.4)
-		# then anything >= 0.5.4 and < 0.6 is accepted
-		COMPATIBILITY SameMinorVersion
-	)
-else()
-	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-		# Example: if you find_package(httplib 0.5.4)
-		# then anything >= 0.5.4 and < 0.6 is accepted
-		COMPATIBILITY SameMinorVersion
-		# Tells Cmake that it's a header-only lib
-		# Mildly useful for end-users :)
-		ARCH_INDEPENDENT
-	)
-endif()
-
-if(HTTPLIB_INSTALL)
-	# Creates the export httplibTargets.cmake
-	# This is strictly what holds compilation requirements
-	# and linkage information (doesn't find deps though).
-	install(TARGETS ${PROJECT_NAME} EXPORT httplibTargets)
-
-	install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE)
-
-	install(FILES
-		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-		# Install it so it can be used later by the httplibConfig.cmake file.
-		# Put it in the same dir as our config file instead of a global path so we don't potentially stomp on other packages.
-		"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindBrotli.cmake"
-		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
-	)
-
-	# NOTE: This path changes depending on if it's on Windows or Linux
-	install(EXPORT httplibTargets
-		# Puts the targets into the httplib namespace
-		# So this makes httplib::httplib linkable after doing find_package(httplib)
-		NAMESPACE ${PROJECT_NAME}::
-		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
-	)
-
-	# Install documentation & license
-	# ex: /usr/share/doc/httplib/README.md and /usr/share/licenses/httplib/LICENSE
-	install(FILES "README.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-	install(FILES "LICENSE" DESTINATION "${CMAKE_INSTALL_DATADIR}/licenses/${PROJECT_NAME}")
-
-	include(CPack)
-endif()
-
-if(HTTPLIB_TEST)
-    include(CTest)
-    add_subdirectory(test)
-endif()
diff --git a/code/cpp-httplib-0.19.0/Dockerfile b/code/cpp-httplib-0.19.0/Dockerfile
deleted file mode 100644
index 654845b2..00000000
--- a/code/cpp-httplib-0.19.0/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM yhirose4dockerhub/ubuntu-builder AS builder
-WORKDIR /build
-COPY httplib.h .
-COPY docker/main.cc .
-RUN g++ -std=c++23 -static -o server -O2 -I. -DCPPHTTPLIB_USE_POLL main.cc && strip server
-
-FROM scratch
-COPY --from=builder /build/server /server
-COPY docker/html/index.html /html/index.html
-EXPOSE 80
-CMD ["/server"]
diff --git a/code/cpp-httplib-0.19.0/LICENSE b/code/cpp-httplib-0.19.0/LICENSE
deleted file mode 100644
index 3e5ed359..00000000
--- a/code/cpp-httplib-0.19.0/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 yhirose
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/code/cpp-httplib-0.19.0/README.md b/code/cpp-httplib-0.19.0/README.md
deleted file mode 100644
index fc4b537f..00000000
--- a/code/cpp-httplib-0.19.0/README.md
+++ /dev/null
@@ -1,979 +0,0 @@
-cpp-httplib
-===========
-
-[![](https://github.com/yhirose/cpp-httplib/workflows/test/badge.svg)](https://github.com/yhirose/cpp-httplib/actions)
-
-A C++11 single-file header-only cross platform HTTP/HTTPS library.
-
-It's extremely easy to setup. Just include the **httplib.h** file in your code!
-
-> [!IMPORTANT]
-> This library uses 'blocking' socket I/O. If you are looking for a library with 'non-blocking' socket I/O, this is not the one that you want.
-
-Simple examples
----------------
-
-#### Server (Multi-threaded)
-
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "path/to/httplib.h"
-
-// HTTP
-httplib::Server svr;
-
-// HTTPS
-httplib::SSLServer svr;
-
-svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
-  res.set_content("Hello World!", "text/plain");
-});
-
-svr.listen("0.0.0.0", 8080);
-```
-
-#### Client
-
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "path/to/httplib.h"
-
-// HTTP
-httplib::Client cli("http://yhirose.github.io");
-
-// HTTPS
-httplib::Client cli("https://yhirose.github.io");
-
-auto res = cli.Get("/hi");
-res->status;
-res->body;
-```
-
-SSL Support
------------
-
-SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
-
-> [!NOTE]
-> cpp-httplib currently supports only version 3.0 or later. Please see [this page](https://www.openssl.org/policies/releasestrat.html) to get more information.
-
-> [!TIP]
-> For macOS: cpp-httplib now can use system certs with `CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN`. `CoreFoundation` and `Security` should be linked with `-framework`.
-
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "path/to/httplib.h"
-
-// Server
-httplib::SSLServer svr("./cert.pem", "./key.pem");
-
-// Client
-httplib::Client cli("https://localhost:1234"); // scheme + host
-httplib::SSLClient cli("localhost:1234"); // host
-httplib::SSLClient cli("localhost", 1234); // host, port
-
-// Use your CA bundle
-cli.set_ca_cert_path("./ca-bundle.crt");
-
-// Disable cert verification
-cli.enable_server_certificate_verification(false);
-
-// Disable host verification
-cli.enable_server_hostname_verification(false);
-```
-
-> [!NOTE]
-> When using SSL, it seems impossible to avoid SIGPIPE in all cases, since on some operating systems, SIGPIPE can only be suppressed on a per-message basis, but there is no way to make the OpenSSL library do so for its internal communications. If your program needs to avoid being terminated on SIGPIPE, the only fully general way might be to set up a signal handler for SIGPIPE to handle or ignore it yourself.
-
-Server
-------
-
-```c++
-#include <httplib.h>
-
-int main(void)
-{
-  using namespace httplib;
-
-  Server svr;
-
-  svr.Get("/hi", [](const Request& req, Response& res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  // Match the request path against a regular expression
-  // and extract its captures
-  svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) {
-    auto numbers = req.matches[1];
-    res.set_content(numbers, "text/plain");
-  });
-
-  // Capture the second segment of the request path as "id" path param
-  svr.Get("/users/:id", [&](const Request& req, Response& res) {
-    auto user_id = req.path_params.at("id");
-    res.set_content(user_id, "text/plain");
-  });
-
-  // Extract values from HTTP headers and URL query params
-  svr.Get("/body-header-param", [](const Request& req, Response& res) {
-    if (req.has_header("Content-Length")) {
-      auto val = req.get_header_value("Content-Length");
-    }
-    if (req.has_param("key")) {
-      auto val = req.get_param_value("key");
-    }
-    res.set_content(req.body, "text/plain");
-  });
-
-  // If the handler takes time to finish, you can also poll the connection state
-  svr.Get("/task", [&](const Request& req, Response& res) {
-    const char * result = nullptr;
-    process.run(); // for example, starting an external process
-    while (result == nullptr) {
-      sleep(1);
-      if (req.is_connection_closed()) {
-        process.kill(); // kill the process
-        return;
-      }
-      result = process.stdout(); // != nullptr if the process finishes
-    }
-    res.set_content(result, "text/plain");
-  });
-
-  svr.Get("/stop", [&](const Request& req, Response& res) {
-    svr.stop();
-  });
-
-  svr.listen("localhost", 1234);
-}
-```
-
-`Post`, `Put`, `Delete` and `Options` methods are also supported.
-
-### Bind a socket to multiple interfaces and any available port
-
-```cpp
-int port = svr.bind_to_any_port("0.0.0.0");
-svr.listen_after_bind();
-```
-
-### Static File Server
-
-```cpp
-// Mount / to ./www directory
-auto ret = svr.set_mount_point("/", "./www");
-if (!ret) {
-  // The specified base directory doesn't exist...
-}
-
-// Mount /public to ./www directory
-ret = svr.set_mount_point("/public", "./www");
-
-// Mount /public to ./www1 and ./www2 directories
-ret = svr.set_mount_point("/public", "./www1"); // 1st order to search
-ret = svr.set_mount_point("/public", "./www2"); // 2nd order to search
-
-// Remove mount /
-ret = svr.remove_mount_point("/");
-
-// Remove mount /public
-ret = svr.remove_mount_point("/public");
-```
-
-```cpp
-// User defined file extension and MIME type mappings
-svr.set_file_extension_and_mimetype_mapping("cc", "text/x-c");
-svr.set_file_extension_and_mimetype_mapping("cpp", "text/x-c");
-svr.set_file_extension_and_mimetype_mapping("hh", "text/x-h");
-```
-
-The followings are built-in mappings:
-
-| Extension  |          MIME Type          | Extension  |          MIME Type          |
-| :--------- | :-------------------------- | :--------- | :-------------------------- |
-| css        | text/css                    | mpga       | audio/mpeg                  |
-| csv        | text/csv                    | weba       | audio/webm                  |
-| txt        | text/plain                  | wav        | audio/wave                  |
-| vtt        | text/vtt                    | otf        | font/otf                    |
-| html, htm  | text/html                   | ttf        | font/ttf                    |
-| apng       | image/apng                  | woff       | font/woff                   |
-| avif       | image/avif                  | woff2      | font/woff2                  |
-| bmp        | image/bmp                   | 7z         | application/x-7z-compressed |
-| gif        | image/gif                   | atom       | application/atom+xml        |
-| png        | image/png                   | pdf        | application/pdf             |
-| svg        | image/svg+xml               | mjs, js    | application/javascript      |
-| webp       | image/webp                  | json       | application/json            |
-| ico        | image/x-icon                | rss        | application/rss+xml         |
-| tif        | image/tiff                  | tar        | application/x-tar           |
-| tiff       | image/tiff                  | xhtml, xht | application/xhtml+xml       |
-| jpeg, jpg  | image/jpeg                  | xslt       | application/xslt+xml        |
-| mp4        | video/mp4                   | xml        | application/xml             |
-| mpeg       | video/mpeg                  | gz         | application/gzip            |
-| webm       | video/webm                  | zip        | application/zip             |
-| mp3        | audio/mp3                   | wasm       | application/wasm            |
-
-> [!WARNING]
-> These static file server methods are not thread-safe.
-
-### File request handler
-
-```cpp
-// The handler is called right before the response is sent to a client
-svr.set_file_request_handler([](const Request &req, Response &res) {
-  ...
-});
-```
-
-### Logging
-
-```cpp
-svr.set_logger([](const auto& req, const auto& res) {
-  your_logger(req, res);
-});
-```
-
-### Error handler
-
-```cpp
-svr.set_error_handler([](const auto& req, auto& res) {
-  auto fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
-  char buf[BUFSIZ];
-  snprintf(buf, sizeof(buf), fmt, res.status);
-  res.set_content(buf, "text/html");
-});
-```
-
-### Exception handler
-The exception handler gets called if a user routing handler throws an error.
-
-```cpp
-svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) {
-  auto fmt = "<h1>Error 500</h1><p>%s</p>";
-  char buf[BUFSIZ];
-  try {
-    std::rethrow_exception(ep);
-  } catch (std::exception &e) {
-    snprintf(buf, sizeof(buf), fmt, e.what());
-  } catch (...) { // See the following NOTE
-    snprintf(buf, sizeof(buf), fmt, "Unknown Exception");
-  }
-  res.set_content(buf, "text/html");
-  res.status = StatusCode::InternalServerError_500;
-});
-```
-
-> [!CAUTION]
-> if you don't provide the `catch (...)` block for a rethrown exception pointer, an uncaught exception will end up causing the server crash. Be careful!
-
-### Pre routing handler
-
-```cpp
-svr.set_pre_routing_handler([](const auto& req, auto& res) {
-  if (req.path == "/hello") {
-    res.set_content("world", "text/html");
-    return Server::HandlerResponse::Handled;
-  }
-  return Server::HandlerResponse::Unhandled;
-});
-```
-
-### Post routing handler
-
-```cpp
-svr.set_post_routing_handler([](const auto& req, auto& res) {
-  res.set_header("ADDITIONAL_HEADER", "value");
-});
-```
-
-### 'multipart/form-data' POST data
-
-```cpp
-svr.Post("/multipart", [&](const auto& req, auto& res) {
-  auto size = req.files.size();
-  auto ret = req.has_file("name1");
-  const auto& file = req.get_file_value("name1");
-  // file.filename;
-  // file.content_type;
-  // file.content;
-});
-```
-
-### Receive content with a content receiver
-
-```cpp
-svr.Post("/content_receiver",
-  [&](const Request &req, Response &res, const ContentReader &content_reader) {
-    if (req.is_multipart_form_data()) {
-      // NOTE: `content_reader` is blocking until every form data field is read
-      MultipartFormDataItems files;
-      content_reader(
-        [&](const MultipartFormData &file) {
-          files.push_back(file);
-          return true;
-        },
-        [&](const char *data, size_t data_length) {
-          files.back().content.append(data, data_length);
-          return true;
-        });
-    } else {
-      std::string body;
-      content_reader([&](const char *data, size_t data_length) {
-        body.append(data, data_length);
-        return true;
-      });
-    }
-  });
-```
-
-### Send content with the content provider
-
-```cpp
-const size_t DATA_CHUNK_SIZE = 4;
-
-svr.Get("/stream", [&](const Request &req, Response &res) {
-  auto data = new std::string("abcdefg");
-
-  res.set_content_provider(
-    data->size(), // Content length
-    "text/plain", // Content type
-    [&, data](size_t offset, size_t length, DataSink &sink) {
-      const auto &d = *data;
-      sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
-      return true; // return 'false' if you want to cancel the process.
-    },
-    [data](bool success) { delete data; });
-});
-```
-
-Without content length:
-
-```cpp
-svr.Get("/stream", [&](const Request &req, Response &res) {
-  res.set_content_provider(
-    "text/plain", // Content type
-    [&](size_t offset, DataSink &sink) {
-      if (/* there is still data */) {
-        std::vector<char> data;
-        // prepare data...
-        sink.write(data.data(), data.size());
-      } else {
-        sink.done(); // No more data
-      }
-      return true; // return 'false' if you want to cancel the process.
-    });
-});
-```
-
-### Chunked transfer encoding
-
-```cpp
-svr.Get("/chunked", [&](const Request& req, Response& res) {
-  res.set_chunked_content_provider(
-    "text/plain",
-    [](size_t offset, DataSink &sink) {
-      sink.write("123", 3);
-      sink.write("345", 3);
-      sink.write("789", 3);
-      sink.done(); // No more data
-      return true; // return 'false' if you want to cancel the process.
-    }
-  );
-});
-```
-
-With trailer:
-
-```cpp
-svr.Get("/chunked", [&](const Request& req, Response& res) {
-  res.set_header("Trailer", "Dummy1, Dummy2");
-  res.set_chunked_content_provider(
-    "text/plain",
-    [](size_t offset, DataSink &sink) {
-      sink.write("123", 3);
-      sink.write("345", 3);
-      sink.write("789", 3);
-      sink.done_with_trailer({
-        {"Dummy1", "DummyVal1"},
-        {"Dummy2", "DummyVal2"}
-      });
-      return true;
-    }
-  );
-});
-```
-
-### Send file content
-
-```cpp
-svr.Get("/content", [&](const Request &req, Response &res) {
-  res.set_file_content("./path/to/conent.html");
-});
-
-svr.Get("/content", [&](const Request &req, Response &res) {
-  res.set_file_content("./path/to/conent", "text/html");
-});
-```
-
-### 'Expect: 100-continue' handler
-
-By default, the server sends a `100 Continue` response for an `Expect: 100-continue` header.
-
-```cpp
-// Send a '417 Expectation Failed' response.
-svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return StatusCode::ExpectationFailed_417;
-});
-```
-
-```cpp
-// Send a final status without reading the message body.
-svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return res.status = StatusCode::Unauthorized_401;
-});
-```
-
-### Keep-Alive connection
-
-```cpp
-svr.set_keep_alive_max_count(2); // Default is 5
-svr.set_keep_alive_timeout(10);  // Default is 5
-```
-
-### Timeout
-
-```c++
-svr.set_read_timeout(5, 0); // 5 seconds
-svr.set_write_timeout(5, 0); // 5 seconds
-svr.set_idle_interval(0, 100000); // 100 milliseconds
-```
-
-### Set maximum payload length for reading a request body
-
-```c++
-svr.set_payload_max_length(1024 * 1024 * 512); // 512MB
-```
-
-> [!NOTE]
-> When the request body content type is 'www-form-urlencoded', the actual payload length shouldn't exceed `CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH`.
-
-### Server-Sent Events
-
-Please see [Server example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssesvr.cc) and [Client example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssecli.cc).
-
-### Default thread pool support
-
-`ThreadPool` is used as a **default** task queue, and the default thread count is 8, or `std::thread::hardware_concurrency()`. You can change it with `CPPHTTPLIB_THREAD_POOL_COUNT`.
-
-If you want to set the thread count at runtime, there is no convenient way... But here is how.
-
-```cpp
-svr.new_task_queue = [] { return new ThreadPool(12); };
-```
-
-You can also provide an optional parameter to limit the maximum number
-of pending requests, i.e. requests `accept()`ed by the listener but
-still waiting to be serviced by worker threads.
-
-```cpp
-svr.new_task_queue = [] { return new ThreadPool(/*num_threads=*/12, /*max_queued_requests=*/18); };
-```
-
-Default limit is 0 (unlimited). Once the limit is reached, the listener
-will shutdown the client connection.
-
-### Override the default thread pool with yours
-
-You can supply your own thread pool implementation according to your need.
-
-```cpp
-class YourThreadPoolTaskQueue : public TaskQueue {
-public:
-  YourThreadPoolTaskQueue(size_t n) {
-    pool_.start_with_thread_count(n);
-  }
-
-  virtual bool enqueue(std::function<void()> fn) override {
-    /* Return true if the task was actually enqueued, or false
-     * if the caller must drop the corresponding connection. */
-    return pool_.enqueue(fn);
-  }
-
-  virtual void shutdown() override {
-    pool_.shutdown_gracefully();
-  }
-
-private:
-  YourThreadPool pool_;
-};
-
-svr.new_task_queue = [] {
-  return new YourThreadPoolTaskQueue(12);
-};
-```
-
-Client
-------
-
-```c++
-#include <httplib.h>
-#include <iostream>
-
-int main(void)
-{
-  httplib::Client cli("localhost", 1234);
-
-  if (auto res = cli.Get("/hi")) {
-    if (res->status == StatusCode::OK_200) {
-      std::cout << res->body << std::endl;
-    }
-  } else {
-    auto err = res.error();
-    std::cout << "HTTP error: " << httplib::to_string(err) << std::endl;
-  }
-}
-```
-
-> [!TIP]
-> Constructor with scheme-host-port string is now supported!
-
-```c++
-httplib::Client cli("localhost");
-httplib::Client cli("localhost:8080");
-httplib::Client cli("http://localhost");
-httplib::Client cli("http://localhost:8080");
-httplib::Client cli("https://localhost");
-httplib::SSLClient cli("localhost");
-```
-
-### Error code
-
-Here is the list of errors from `Result::error()`.
-
-```c++
-enum Error {
-  Success = 0,
-  Unknown,
-  Connection,
-  BindIPAddress,
-  Read,
-  Write,
-  ExceedRedirectCount,
-  Canceled,
-  SSLConnection,
-  SSLLoadingCerts,
-  SSLServerVerification,
-  UnsupportedMultipartBoundaryChars,
-  Compression,
-  ConnectionTimeout,
-};
-```
-
-### GET with HTTP headers
-
-```c++
-httplib::Headers headers = {
-  { "Hello", "World!" }
-};
-auto res = cli.Get("/hi", headers);
-```
-or
-```c++
-auto res = cli.Get("/hi", {{"Hello", "World!"}});
-```
-or
-```c++
-cli.set_default_headers({
-  { "Hello", "World!" }
-});
-auto res = cli.Get("/hi");
-```
-
-### POST
-
-```c++
-res = cli.Post("/post", "text", "text/plain");
-res = cli.Post("/person", "name=john1&note=coder", "application/x-www-form-urlencoded");
-```
-
-### POST with parameters
-
-```c++
-httplib::Params params;
-params.emplace("name", "john");
-params.emplace("note", "coder");
-
-auto res = cli.Post("/post", params);
-```
- or
-
-```c++
-httplib::Params params{
-  { "name", "john" },
-  { "note", "coder" }
-};
-
-auto res = cli.Post("/post", params);
-```
-
-### POST with Multipart Form Data
-
-```c++
-httplib::MultipartFormDataItems items = {
-  { "text1", "text default", "", "" },
-  { "text2", "aωb", "", "" },
-  { "file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain" },
-  { "file2", "{\n  \"world\", true\n}\n", "world.json", "application/json" },
-  { "file3", "", "", "application/octet-stream" },
-};
-
-auto res = cli.Post("/multipart", items);
-```
-
-### PUT
-
-```c++
-res = cli.Put("/resource/foo", "text", "text/plain");
-```
-
-### DELETE
-
-```c++
-res = cli.Delete("/resource/foo");
-```
-
-### OPTIONS
-
-```c++
-res = cli.Options("*");
-res = cli.Options("/resource/foo");
-```
-
-### Timeout
-
-```c++
-cli.set_connection_timeout(0, 300000); // 300 milliseconds
-cli.set_read_timeout(5, 0); // 5 seconds
-cli.set_write_timeout(5, 0); // 5 seconds
-
-// This method works the same as curl's `--max-timeout` option
-svr.set_max_timeout(5000); // 5 seconds
-```
-
-### Receive content with a content receiver
-
-```c++
-std::string body;
-
-auto res = cli.Get("/large-data",
-  [&](const char *data, size_t data_length) {
-    body.append(data, data_length);
-    return true;
-  });
-```
-
-```cpp
-std::string body;
-
-auto res = cli.Get(
-  "/stream", Headers(),
-  [&](const Response &response) {
-    EXPECT_EQ(StatusCode::OK_200, response.status);
-    return true; // return 'false' if you want to cancel the request.
-  },
-  [&](const char *data, size_t data_length) {
-    body.append(data, data_length);
-    return true; // return 'false' if you want to cancel the request.
-  });
-```
-
-### Send content with a content provider
-
-```cpp
-std::string body = ...;
-
-auto res = cli.Post(
-  "/stream", body.size(),
-  [](size_t offset, size_t length, DataSink &sink) {
-    sink.write(body.data() + offset, length);
-    return true; // return 'false' if you want to cancel the request.
-  },
-  "text/plain");
-```
-
-### Chunked transfer encoding
-
-```cpp
-auto res = cli.Post(
-  "/stream",
-  [](size_t offset, DataSink &sink) {
-    sink.os << "chunked data 1";
-    sink.os << "chunked data 2";
-    sink.os << "chunked data 3";
-    sink.done();
-    return true; // return 'false' if you want to cancel the request.
-  },
-  "text/plain");
-```
-
-### With Progress Callback
-
-```cpp
-httplib::Client cli(url, port);
-
-// prints: 0 / 000 bytes => 50% complete
-auto res = cli.Get("/", [](uint64_t len, uint64_t total) {
-  printf("%lld / %lld bytes => %d%% complete\n",
-    len, total,
-    (int)(len*100/total));
-  return true; // return 'false' if you want to cancel the request.
-}
-);
-```
-
-![progress](https://user-images.githubusercontent.com/236374/33138910-495c4ecc-cf86-11e7-8693-2fc6d09615c4.gif)
-
-### Authentication
-
-```cpp
-// Basic Authentication
-cli.set_basic_auth("user", "pass");
-
-// Digest Authentication
-cli.set_digest_auth("user", "pass");
-
-// Bearer Token Authentication
-cli.set_bearer_token_auth("token");
-```
-
-> [!NOTE]
-> OpenSSL is required for Digest Authentication.
-
-### Proxy server support
-
-```cpp
-cli.set_proxy("host", port);
-
-// Basic Authentication
-cli.set_proxy_basic_auth("user", "pass");
-
-// Digest Authentication
-cli.set_proxy_digest_auth("user", "pass");
-
-// Bearer Token Authentication
-cli.set_proxy_bearer_token_auth("pass");
-```
-
-> [!NOTE]
-> OpenSSL is required for Digest Authentication.
-
-### Range
-
-```cpp
-httplib::Client cli("httpbin.org");
-
-auto res = cli.Get("/range/32", {
-  httplib::make_range_header({{1, 10}}) // 'Range: bytes=1-10'
-});
-// res->status should be 206.
-// res->body should be "bcdefghijk".
-```
-
-```cpp
-httplib::make_range_header({{1, 10}, {20, -1}})      // 'Range: bytes=1-10, 20-'
-httplib::make_range_header({{100, 199}, {500, 599}}) // 'Range: bytes=100-199, 500-599'
-httplib::make_range_header({{0, 0}, {-1, 1}})        // 'Range: bytes=0-0, -1'
-```
-
-### Keep-Alive connection
-
-```cpp
-httplib::Client cli("localhost", 1234);
-
-cli.Get("/hello");         // with "Connection: close"
-
-cli.set_keep_alive(true);
-cli.Get("/world");
-
-cli.set_keep_alive(false);
-cli.Get("/last-request");  // with "Connection: close"
-```
-
-### Redirect
-
-```cpp
-httplib::Client cli("yahoo.com");
-
-auto res = cli.Get("/");
-res->status; // 301
-
-cli.set_follow_location(true);
-res = cli.Get("/");
-res->status; // 200
-```
-
-### Use a specific network interface
-
-> [!NOTE]
-> This feature is not available on Windows, yet.
-
-```cpp
-cli.set_interface("eth0"); // Interface name, IP address or host name
-```
-
-Compression
------------
-
-The server can apply compression to the following MIME type contents:
-
-  * all text types except text/event-stream
-  * image/svg+xml
-  * application/javascript
-  * application/json
-  * application/xml
-  * application/xhtml+xml
-
-### Zlib Support
-
-'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`. `libz` should be linked.
-
-### Brotli Support
-
-Brotli compression is available with `CPPHTTPLIB_BROTLI_SUPPORT`. Necessary libraries should be linked.
-Please see https://github.com/google/brotli for more detail.
-
-### Default `Accept-Encoding` value
-
-The default `Acdcept-Encoding` value contains all possible compression types. So, the following two examples are same.
-
-```c++
-res = cli.Get("/resource/foo");
-res = cli.Get("/resource/foo", {{"Accept-Encoding", "gzip, deflate, br"}});
-```
-
-If we don't want a response without compression, we have to set `Accept-Encoding` to an empty string. This behavior is similar to curl.
-
-```c++
-res = cli.Get("/resource/foo", {{"Accept-Encoding", ""}});
-```
-
-### Compress request body on client
-
-```c++
-cli.set_compress(true);
-res = cli.Post("/resource/foo", "...", "text/plain");
-```
-
-### Compress response body on client
-
-```c++
-cli.set_decompress(false);
-res = cli.Get("/resource/foo");
-res->body; // Compressed data
-
-```
-
-Use `poll` instead of `select`
-------------------------------
-
-`select` system call is used as default since it's more widely supported. If you want to let cpp-httplib use `poll` instead, you can do so with `CPPHTTPLIB_USE_POLL`.
-
-Unix Domain Socket Support
---------------------------
-
-Unix Domain Socket support is available on Linux and macOS.
-
-```c++
-// Server
-httplib::Server svr("./my-socket.sock");
-svr.set_address_family(AF_UNIX).listen("./my-socket.sock", 80);
-
-// Client
-httplib::Client cli("./my-socket.sock");
-cli.set_address_family(AF_UNIX);
-```
-
-"my-socket.sock" can be a relative path or an absolute path. You application must have the appropriate permissions for the path. You can also use an abstract socket address on Linux. To use an abstract socket address, prepend a null byte ('\x00') to the path.
-
-
-Split httplib.h into .h and .cc
--------------------------------
-
-```console
-$ ./split.py -h
-usage: split.py [-h] [-e EXTENSION] [-o OUT]
-
-This script splits httplib.h into .h and .cc parts.
-
-optional arguments:
-  -h, --help            show this help message and exit
-  -e EXTENSION, --extension EXTENSION
-                        extension of the implementation file (default: cc)
-  -o OUT, --out OUT     where to write the files (default: out)
-
-$ ./split.py
-Wrote out/httplib.h and out/httplib.cc
-```
-
-Dockerfile for Static HTTP Server
----------------------------------
-
-Dockerfile for static HTTP server is available. Port number of this HTTP server is 80, and it serves static files from `/html` directory in the container.
-
-```bash
-> docker build -t cpp-httplib-server .
-...
-
-> docker run --rm -it -p 8080:80 -v ./docker/html:/html cpp-httplib-server
-Serving HTTP on 0.0.0.0 port 80 ...
-192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
-```
-
-From Docker Hub
-
-```bash
-> docker run --rm -it -p 8080:80 -v ./docker/html:/html yhirose4dockerhub/cpp-httplib-server
-Serving HTTP on 0.0.0.0 port 80 ...
-192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
-```
-
-NOTE
-----
-
-### g++
-
-g++ 4.8 and below cannot build this library since `<regex>` in the versions are [broken](https://stackoverflow.com/questions/12530406/is-gcc-4-8-or-earlier-buggy-about-regular-expressions).
-
-### Windows
-
-Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32_LEAN_AND_MEAN` beforehand.
-
-```cpp
-#include <httplib.h>
-#include <Windows.h>
-```
-
-```cpp
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <httplib.h>
-```
-
-> [!NOTE]
-> cpp-httplib officially supports only the latest Visual Studio. It might work with former versions of Visual Studio, but I can no longer verify it. Pull requests are always welcome for the older versions of Visual Studio unless they break the C++11 conformance.
-
-> [!NOTE]
-> Windows 8 or lower, Visual Studio 2015 or lower, and Cygwin and MSYS2 including MinGW are neither supported nor tested.
-
-License
--------
-
-MIT license (© 2025 Yuji Hirose)
-
-Special Thanks To
------------------
-
-[These folks](https://github.com/yhirose/cpp-httplib/graphs/contributors) made great contributions to polish this library to totally another level from a simple toy!
diff --git a/code/cpp-httplib-0.19.0/benchmark/Makefile b/code/cpp-httplib-0.19.0/benchmark/Makefile
deleted file mode 100644
index 5107664c..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-CXXFLAGS = -std=c++11 -O2 -I..
-
-CPPHTTPLIB_FLAGS = -DCPPHTTPLIB_THREAD_POOL_COUNT=16
-
-BENCH = bombardier -c 10 -d 5s localhost:8080
-MONITOR = ali http://localhost:8080
-
-# cpp-httplib
-bench: server
-	@echo "--------------------\n cpp-httplib latest\n--------------------\n"
-	@./server & export PID=$$!; $(BENCH); kill $${PID}
-	@echo ""
-
-monitor: server
-	@./server & export PID=$$!; $(MONITOR); kill $${PID}
-
-run : server
-	@./server
-
-server : cpp-httplib/main.cpp ../httplib.h
-	g++ -o $@ $(CXXFLAGS) $(CPPHTTPLIB_FLAGS) cpp-httplib/main.cpp
-
-# cpp-httplib
-bench-base: server-base
-	@echo "---------------------\n cpp-httplib v0.18.0\n---------------------\n"
-	@./server-base & export PID=$$!; $(BENCH); kill $${PID}
-	@echo ""
-
-monitor-base: server-base
-	@./server-base & export PID=$$!; $(MONITOR); kill $${PID}
-
-run-base : server-base
-	@./server-base
-
-server-base : cpp-httplib-base/main.cpp cpp-httplib-base/httplib.h
-	g++ -o $@ $(CXXFLAGS) $(CPPHTTPLIB_FLAGS) cpp-httplib-base/main.cpp
-
-# crow
-bench-crow: server-crow
-	@echo "-------------\n Crow v1.2.0\n-------------\n"
-	@./server-crow & export PID=$$!; $(BENCH); kill $${PID}
-	@echo ""
-
-monitor-crow: server-crow
-	@./server-crow & export PID=$$!; $(MONITOR); kill $${PID}
-
-run-crow : server-crow
-	@./server-crow
-
-server-crow : crow/main.cpp
-	g++ -o $@ $(CXXFLAGS) crow/main.cpp
-
-# misc
-build: server server-base server-crow
-
-bench-all: bench-crow bench bench-base
-
-issue:
-	bombardier -c 10 -d 30s localhost:8080
-
-clean:
-	rm -rf server*
diff --git a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h
deleted file mode 100644
index 3e28fcff..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/httplib.h
+++ /dev/null
@@ -1,10154 +0,0 @@
-//
-//  httplib.h
-//
-//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#ifndef CPPHTTPLIB_HTTPLIB_H
-#define CPPHTTPLIB_HTTPLIB_H
-
-#define CPPHTTPLIB_VERSION "0.18.0"
-
-/*
- * Configuration
- */
-
-#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND
-#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT
-#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 100
-#endif
-
-#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND
-#define CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND 300
-#endif
-
-#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND
-#define CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND
-#define CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND
-#define CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND
-#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND
-#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND
-#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND 300
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND
-#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND
-#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND
-#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_IDLE_INTERVAL_SECOND
-#define CPPHTTPLIB_IDLE_INTERVAL_SECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_IDLE_INTERVAL_USECOND
-#ifdef _WIN32
-#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 10000
-#else
-#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 0
-#endif
-#endif
-
-#ifndef CPPHTTPLIB_REQUEST_URI_MAX_LENGTH
-#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_HEADER_MAX_LENGTH
-#define CPPHTTPLIB_HEADER_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_REDIRECT_MAX_COUNT
-#define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
-#endif
-
-#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
-#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
-#endif
-
-#ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
-#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
-#endif
-
-#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
-#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
-#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
-#endif
-
-#ifndef CPPHTTPLIB_TCP_NODELAY
-#define CPPHTTPLIB_TCP_NODELAY false
-#endif
-
-#ifndef CPPHTTPLIB_IPV6_V6ONLY
-#define CPPHTTPLIB_IPV6_V6ONLY false
-#endif
-
-#ifndef CPPHTTPLIB_RECV_BUFSIZ
-#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
-#endif
-
-#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
-#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
-#endif
-
-#ifndef CPPHTTPLIB_THREAD_POOL_COUNT
-#define CPPHTTPLIB_THREAD_POOL_COUNT                                           \
-  ((std::max)(8u, std::thread::hardware_concurrency() > 0                      \
-                      ? std::thread::hardware_concurrency() - 1                \
-                      : 0))
-#endif
-
-#ifndef CPPHTTPLIB_RECV_FLAGS
-#define CPPHTTPLIB_RECV_FLAGS 0
-#endif
-
-#ifndef CPPHTTPLIB_SEND_FLAGS
-#define CPPHTTPLIB_SEND_FLAGS 0
-#endif
-
-#ifndef CPPHTTPLIB_LISTEN_BACKLOG
-#define CPPHTTPLIB_LISTEN_BACKLOG 5
-#endif
-
-/*
- * Headers
- */
-
-#ifdef _WIN32
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif //_CRT_SECURE_NO_WARNINGS
-
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE
-#endif //_CRT_NONSTDC_NO_DEPRECATE
-
-#if defined(_MSC_VER)
-#if _MSC_VER < 1900
-#error Sorry, Visual Studio versions prior to 2015 are not supported
-#endif
-
-#pragma comment(lib, "ws2_32.lib")
-
-#ifdef _WIN64
-using ssize_t = __int64;
-#else
-using ssize_t = long;
-#endif
-#endif // _MSC_VER
-
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
-#endif // S_ISREG
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
-#endif // S_ISDIR
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif // NOMINMAX
-
-#include <io.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-#ifndef WSA_FLAG_NO_HANDLE_INHERIT
-#define WSA_FLAG_NO_HANDLE_INHERIT 0x80
-#endif
-
-using socket_t = SOCKET;
-#ifdef CPPHTTPLIB_USE_POLL
-#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
-#endif
-
-#else // not _WIN32
-
-#include <arpa/inet.h>
-#if !defined(_AIX) && !defined(__MVS__)
-#include <ifaddrs.h>
-#endif
-#ifdef __MVS__
-#include <strings.h>
-#ifndef NI_MAXHOST
-#define NI_MAXHOST 1025
-#endif
-#endif
-#include <net/if.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef __linux__
-#include <resolv.h>
-#endif
-#include <netinet/tcp.h>
-#ifdef CPPHTTPLIB_USE_POLL
-#include <poll.h>
-#endif
-#include <csignal>
-#include <pthread.h>
-#include <sys/mman.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-using socket_t = int;
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET (-1)
-#endif
-#endif //_WIN32
-
-#include <algorithm>
-#include <array>
-#include <atomic>
-#include <cassert>
-#include <cctype>
-#include <climits>
-#include <condition_variable>
-#include <cstring>
-#include <errno.h>
-#include <exception>
-#include <fcntl.h>
-#include <fstream>
-#include <functional>
-#include <iomanip>
-#include <iostream>
-#include <list>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <regex>
-#include <set>
-#include <sstream>
-#include <string>
-#include <sys/stat.h>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-#ifdef _WIN32
-#include <wincrypt.h>
-
-// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
-// used
-#undef X509_NAME
-#undef X509_CERT_PAIR
-#undef X509_EXTENSIONS
-#undef PKCS7_SIGNER_INFO
-
-#ifdef _MSC_VER
-#pragma comment(lib, "crypt32.lib")
-#endif
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#include <TargetConditionals.h>
-#if TARGET_OS_OSX
-#include <CoreFoundation/CoreFoundation.h>
-#include <Security/Security.h>
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-#include <openssl/x509v3.h>
-
-#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK)
-#include <openssl/applink.c>
-#endif
-
-#include <iostream>
-#include <sstream>
-
-#if defined(OPENSSL_IS_BORINGSSL) || defined(LIBRESSL_VERSION_NUMBER)
-#if OPENSSL_VERSION_NUMBER < 0x1010107f
-#error Please use OpenSSL or a current version of BoringSSL
-#endif
-#define SSL_get1_peer_certificate SSL_get_peer_certificate
-#elif OPENSSL_VERSION_NUMBER < 0x30000000L
-#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
-#endif
-
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-#include <zlib.h>
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-#include <brotli/decode.h>
-#include <brotli/encode.h>
-#endif
-
-/*
- * Declaration
- */
-namespace httplib {
-
-namespace detail {
-
-/*
- * Backport std::make_unique from C++14.
- *
- * NOTE: This code came up with the following stackoverflow post:
- * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique
- *
- */
-
-template <class T, class... Args>
-typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(Args &&...args) {
-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-template <class T>
-typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(std::size_t n) {
-  typedef typename std::remove_extent<T>::type RT;
-  return std::unique_ptr<T>(new RT[n]);
-}
-
-namespace case_ignore {
-
-inline unsigned char to_lower(int c) {
-  const static unsigned char table[256] = {
-      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
-      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
-      30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
-      45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
-      60,  61,  62,  63,  64,  97,  98,  99,  100, 101, 102, 103, 104, 105, 106,
-      107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
-      122, 91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
-      105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
-      135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-      150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-      165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-      180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 224, 225, 226,
-      227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
-      242, 243, 244, 245, 246, 215, 248, 249, 250, 251, 252, 253, 254, 223, 224,
-      225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-      240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
-      255,
-  };
-  return table[(unsigned char)(char)c];
-}
-
-inline bool equal(const std::string &a, const std::string &b) {
-  return a.size() == b.size() &&
-         std::equal(a.begin(), a.end(), b.begin(),
-                    [](char ca, char cb) { return to_lower(ca) == to_lower(cb); });
-}
-
-struct equal_to {
-  bool operator()(const std::string &a, const std::string &b) const {
-    return equal(a, b);
-  }
-};
-
-struct hash {
-  size_t operator()(const std::string &key) const {
-    return hash_core(key.data(), key.size(), 0);
-  }
-
-  size_t hash_core(const char *s, size_t l, size_t h) const {
-    return (l == 0) ? h
-                    : hash_core(s + 1, l - 1,
-                                // Unsets the 6 high bits of h, therefore no
-                                // overflow happens
-                                (((std::numeric_limits<size_t>::max)() >> 6) &
-                                 h * 33) ^
-                                    static_cast<unsigned char>(to_lower(*s)));
-  }
-};
-
-}; // namespace case_ignore
-
-// This is based on
-// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
-
-struct scope_exit {
-  explicit scope_exit(std::function<void(void)> &&f)
-      : exit_function(std::move(f)), execute_on_destruction{true} {}
-
-  scope_exit(scope_exit &&rhs) noexcept
-      : exit_function(std::move(rhs.exit_function)),
-        execute_on_destruction{rhs.execute_on_destruction} {
-    rhs.release();
-  }
-
-  ~scope_exit() {
-    if (execute_on_destruction) { this->exit_function(); }
-  }
-
-  void release() { this->execute_on_destruction = false; }
-
-private:
-  scope_exit(const scope_exit &) = delete;
-  void operator=(const scope_exit &) = delete;
-  scope_exit &operator=(scope_exit &&) = delete;
-
-  std::function<void(void)> exit_function;
-  bool execute_on_destruction;
-};
-
-} // namespace detail
-
-enum StatusCode {
-  // Information responses
-  Continue_100 = 100,
-  SwitchingProtocol_101 = 101,
-  Processing_102 = 102,
-  EarlyHints_103 = 103,
-
-  // Successful responses
-  OK_200 = 200,
-  Created_201 = 201,
-  Accepted_202 = 202,
-  NonAuthoritativeInformation_203 = 203,
-  NoContent_204 = 204,
-  ResetContent_205 = 205,
-  PartialContent_206 = 206,
-  MultiStatus_207 = 207,
-  AlreadyReported_208 = 208,
-  IMUsed_226 = 226,
-
-  // Redirection messages
-  MultipleChoices_300 = 300,
-  MovedPermanently_301 = 301,
-  Found_302 = 302,
-  SeeOther_303 = 303,
-  NotModified_304 = 304,
-  UseProxy_305 = 305,
-  unused_306 = 306,
-  TemporaryRedirect_307 = 307,
-  PermanentRedirect_308 = 308,
-
-  // Client error responses
-  BadRequest_400 = 400,
-  Unauthorized_401 = 401,
-  PaymentRequired_402 = 402,
-  Forbidden_403 = 403,
-  NotFound_404 = 404,
-  MethodNotAllowed_405 = 405,
-  NotAcceptable_406 = 406,
-  ProxyAuthenticationRequired_407 = 407,
-  RequestTimeout_408 = 408,
-  Conflict_409 = 409,
-  Gone_410 = 410,
-  LengthRequired_411 = 411,
-  PreconditionFailed_412 = 412,
-  PayloadTooLarge_413 = 413,
-  UriTooLong_414 = 414,
-  UnsupportedMediaType_415 = 415,
-  RangeNotSatisfiable_416 = 416,
-  ExpectationFailed_417 = 417,
-  ImATeapot_418 = 418,
-  MisdirectedRequest_421 = 421,
-  UnprocessableContent_422 = 422,
-  Locked_423 = 423,
-  FailedDependency_424 = 424,
-  TooEarly_425 = 425,
-  UpgradeRequired_426 = 426,
-  PreconditionRequired_428 = 428,
-  TooManyRequests_429 = 429,
-  RequestHeaderFieldsTooLarge_431 = 431,
-  UnavailableForLegalReasons_451 = 451,
-
-  // Server error responses
-  InternalServerError_500 = 500,
-  NotImplemented_501 = 501,
-  BadGateway_502 = 502,
-  ServiceUnavailable_503 = 503,
-  GatewayTimeout_504 = 504,
-  HttpVersionNotSupported_505 = 505,
-  VariantAlsoNegotiates_506 = 506,
-  InsufficientStorage_507 = 507,
-  LoopDetected_508 = 508,
-  NotExtended_510 = 510,
-  NetworkAuthenticationRequired_511 = 511,
-};
-
-using Headers =
-    std::unordered_multimap<std::string, std::string, detail::case_ignore::hash,
-                            detail::case_ignore::equal_to>;
-
-using Params = std::multimap<std::string, std::string>;
-using Match = std::smatch;
-
-using Progress = std::function<bool(uint64_t current, uint64_t total)>;
-
-struct Response;
-using ResponseHandler = std::function<bool(const Response &response)>;
-
-struct MultipartFormData {
-  std::string name;
-  std::string content;
-  std::string filename;
-  std::string content_type;
-};
-using MultipartFormDataItems = std::vector<MultipartFormData>;
-using MultipartFormDataMap = std::multimap<std::string, MultipartFormData>;
-
-class DataSink {
-public:
-  DataSink() : os(&sb_), sb_(*this) {}
-
-  DataSink(const DataSink &) = delete;
-  DataSink &operator=(const DataSink &) = delete;
-  DataSink(DataSink &&) = delete;
-  DataSink &operator=(DataSink &&) = delete;
-
-  std::function<bool(const char *data, size_t data_len)> write;
-  std::function<bool()> is_writable;
-  std::function<void()> done;
-  std::function<void(const Headers &trailer)> done_with_trailer;
-  std::ostream os;
-
-private:
-  class data_sink_streambuf final : public std::streambuf {
-  public:
-    explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
-
-  protected:
-    std::streamsize xsputn(const char *s, std::streamsize n) override {
-      sink_.write(s, static_cast<size_t>(n));
-      return n;
-    }
-
-  private:
-    DataSink &sink_;
-  };
-
-  data_sink_streambuf sb_;
-};
-
-using ContentProvider =
-    std::function<bool(size_t offset, size_t length, DataSink &sink)>;
-
-using ContentProviderWithoutLength =
-    std::function<bool(size_t offset, DataSink &sink)>;
-
-using ContentProviderResourceReleaser = std::function<void(bool success)>;
-
-struct MultipartFormDataProvider {
-  std::string name;
-  ContentProviderWithoutLength provider;
-  std::string filename;
-  std::string content_type;
-};
-using MultipartFormDataProviderItems = std::vector<MultipartFormDataProvider>;
-
-using ContentReceiverWithProgress =
-    std::function<bool(const char *data, size_t data_length, uint64_t offset,
-                       uint64_t total_length)>;
-
-using ContentReceiver =
-    std::function<bool(const char *data, size_t data_length)>;
-
-using MultipartContentHeader =
-    std::function<bool(const MultipartFormData &file)>;
-
-class ContentReader {
-public:
-  using Reader = std::function<bool(ContentReceiver receiver)>;
-  using MultipartReader = std::function<bool(MultipartContentHeader header,
-                                             ContentReceiver receiver)>;
-
-  ContentReader(Reader reader, MultipartReader multipart_reader)
-      : reader_(std::move(reader)),
-        multipart_reader_(std::move(multipart_reader)) {}
-
-  bool operator()(MultipartContentHeader header,
-                  ContentReceiver receiver) const {
-    return multipart_reader_(std::move(header), std::move(receiver));
-  }
-
-  bool operator()(ContentReceiver receiver) const {
-    return reader_(std::move(receiver));
-  }
-
-  Reader reader_;
-  MultipartReader multipart_reader_;
-};
-
-using Range = std::pair<ssize_t, ssize_t>;
-using Ranges = std::vector<Range>;
-
-struct Request {
-  std::string method;
-  std::string path;
-  Headers headers;
-  std::string body;
-
-  std::string remote_addr;
-  int remote_port = -1;
-  std::string local_addr;
-  int local_port = -1;
-
-  // for server
-  std::string version;
-  std::string target;
-  Params params;
-  MultipartFormDataMap files;
-  Ranges ranges;
-  Match matches;
-  std::unordered_map<std::string, std::string> path_params;
-
-  // for client
-  ResponseHandler response_handler;
-  ContentReceiverWithProgress content_receiver;
-  Progress progress;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  const SSL *ssl = nullptr;
-#endif
-
-  bool has_header(const std::string &key) const;
-  std::string get_header_value(const std::string &key, const char *def = "",
-                               size_t id = 0) const;
-  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
-                                size_t id = 0) const;
-  size_t get_header_value_count(const std::string &key) const;
-  void set_header(const std::string &key, const std::string &val);
-
-  bool has_param(const std::string &key) const;
-  std::string get_param_value(const std::string &key, size_t id = 0) const;
-  size_t get_param_value_count(const std::string &key) const;
-
-  bool is_multipart_form_data() const;
-
-  bool has_file(const std::string &key) const;
-  MultipartFormData get_file_value(const std::string &key) const;
-  std::vector<MultipartFormData> get_file_values(const std::string &key) const;
-
-  // private members...
-  size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
-  size_t content_length_ = 0;
-  ContentProvider content_provider_;
-  bool is_chunked_content_provider_ = false;
-  size_t authorization_count_ = 0;
-};
-
-struct Response {
-  std::string version;
-  int status = -1;
-  std::string reason;
-  Headers headers;
-  std::string body;
-  std::string location; // Redirect location
-
-  bool has_header(const std::string &key) const;
-  std::string get_header_value(const std::string &key, const char *def = "",
-                               size_t id = 0) const;
-  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
-                                size_t id = 0) const;
-  size_t get_header_value_count(const std::string &key) const;
-  void set_header(const std::string &key, const std::string &val);
-
-  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
-  void set_content(const char *s, size_t n, const std::string &content_type);
-  void set_content(const std::string &s, const std::string &content_type);
-  void set_content(std::string &&s, const std::string &content_type);
-
-  void set_content_provider(
-      size_t length, const std::string &content_type, ContentProvider provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_content_provider(
-      const std::string &content_type, ContentProviderWithoutLength provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_chunked_content_provider(
-      const std::string &content_type, ContentProviderWithoutLength provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_file_content(const std::string &path,
-                        const std::string &content_type);
-  void set_file_content(const std::string &path);
-
-  Response() = default;
-  Response(const Response &) = default;
-  Response &operator=(const Response &) = default;
-  Response(Response &&) = default;
-  Response &operator=(Response &&) = default;
-  ~Response() {
-    if (content_provider_resource_releaser_) {
-      content_provider_resource_releaser_(content_provider_success_);
-    }
-  }
-
-  // private members...
-  size_t content_length_ = 0;
-  ContentProvider content_provider_;
-  ContentProviderResourceReleaser content_provider_resource_releaser_;
-  bool is_chunked_content_provider_ = false;
-  bool content_provider_success_ = false;
-  std::string file_content_path_;
-  std::string file_content_content_type_;
-};
-
-class Stream {
-public:
-  virtual ~Stream() = default;
-
-  virtual bool is_readable() const = 0;
-  virtual bool is_writable() const = 0;
-
-  virtual ssize_t read(char *ptr, size_t size) = 0;
-  virtual ssize_t write(const char *ptr, size_t size) = 0;
-  virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
-  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
-  virtual socket_t socket() const = 0;
-
-  ssize_t write(const char *ptr);
-  ssize_t write(const std::string &s);
-};
-
-class TaskQueue {
-public:
-  TaskQueue() = default;
-  virtual ~TaskQueue() = default;
-
-  virtual bool enqueue(std::function<void()> fn) = 0;
-  virtual void shutdown() = 0;
-
-  virtual void on_idle() {}
-};
-
-class ThreadPool final : public TaskQueue {
-public:
-  explicit ThreadPool(size_t n, size_t mqr = 0)
-      : shutdown_(false), max_queued_requests_(mqr) {
-    while (n) {
-      threads_.emplace_back(worker(*this));
-      n--;
-    }
-  }
-
-  ThreadPool(const ThreadPool &) = delete;
-  ~ThreadPool() override = default;
-
-  bool enqueue(std::function<void()> fn) override {
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
-      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
-        return false;
-      }
-      jobs_.push_back(std::move(fn));
-    }
-
-    cond_.notify_one();
-    return true;
-  }
-
-  void shutdown() override {
-    // Stop all worker threads...
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
-      shutdown_ = true;
-    }
-
-    cond_.notify_all();
-
-    // Join...
-    for (auto &t : threads_) {
-      t.join();
-    }
-  }
-
-private:
-  struct worker {
-    explicit worker(ThreadPool &pool) : pool_(pool) {}
-
-    void operator()() {
-      for (;;) {
-        std::function<void()> fn;
-        {
-          std::unique_lock<std::mutex> lock(pool_.mutex_);
-
-          pool_.cond_.wait(
-              lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; });
-
-          if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
-
-          fn = pool_.jobs_.front();
-          pool_.jobs_.pop_front();
-        }
-
-        assert(true == static_cast<bool>(fn));
-        fn();
-      }
-
-#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL) &&   \
-    !defined(LIBRESSL_VERSION_NUMBER)
-      OPENSSL_thread_stop();
-#endif
-    }
-
-    ThreadPool &pool_;
-  };
-  friend struct worker;
-
-  std::vector<std::thread> threads_;
-  std::list<std::function<void()>> jobs_;
-
-  bool shutdown_;
-  size_t max_queued_requests_ = 0;
-
-  std::condition_variable cond_;
-  std::mutex mutex_;
-};
-
-using Logger = std::function<void(const Request &, const Response &)>;
-
-using SocketOptions = std::function<void(socket_t sock)>;
-
-void default_socket_options(socket_t sock);
-
-const char *status_message(int status);
-
-std::string get_bearer_token_auth(const Request &req);
-
-namespace detail {
-
-class MatcherBase {
-public:
-  virtual ~MatcherBase() = default;
-
-  // Match request path and populate its matches and
-  virtual bool match(Request &request) const = 0;
-};
-
-/**
- * Captures parameters in request path and stores them in Request::path_params
- *
- * Capture name is a substring of a pattern from : to /.
- * The rest of the pattern is matched agains the request path directly
- * Parameters are captured starting from the next character after
- * the end of the last matched static pattern fragment until the next /.
- *
- * Example pattern:
- * "/path/fragments/:capture/more/fragments/:second_capture"
- * Static fragments:
- * "/path/fragments/", "more/fragments/"
- *
- * Given the following request path:
- * "/path/fragments/:1/more/fragments/:2"
- * the resulting capture will be
- * {{"capture", "1"}, {"second_capture", "2"}}
- */
-class PathParamsMatcher final : public MatcherBase {
-public:
-  PathParamsMatcher(const std::string &pattern);
-
-  bool match(Request &request) const override;
-
-private:
-  // Treat segment separators as the end of path parameter capture
-  // Does not need to handle query parameters as they are parsed before path
-  // matching
-  static constexpr char separator = '/';
-
-  // Contains static path fragments to match against, excluding the '/' after
-  // path params
-  // Fragments are separated by path params
-  std::vector<std::string> static_fragments_;
-  // Stores the names of the path parameters to be used as keys in the
-  // Request::path_params map
-  std::vector<std::string> param_names_;
-};
-
-/**
- * Performs std::regex_match on request path
- * and stores the result in Request::matches
- *
- * Note that regex match is performed directly on the whole request.
- * This means that wildcard patterns may match multiple path segments with /:
- * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
- */
-class RegexMatcher final : public MatcherBase {
-public:
-  RegexMatcher(const std::string &pattern) : regex_(pattern) {}
-
-  bool match(Request &request) const override;
-
-private:
-  std::regex regex_;
-};
-
-ssize_t write_headers(Stream &strm, const Headers &headers);
-
-} // namespace detail
-
-class Server {
-public:
-  using Handler = std::function<void(const Request &, Response &)>;
-
-  using ExceptionHandler =
-      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
-
-  enum class HandlerResponse {
-    Handled,
-    Unhandled,
-  };
-  using HandlerWithResponse =
-      std::function<HandlerResponse(const Request &, Response &)>;
-
-  using HandlerWithContentReader = std::function<void(
-      const Request &, Response &, const ContentReader &content_reader)>;
-
-  using Expect100ContinueHandler =
-      std::function<int(const Request &, Response &)>;
-
-  Server();
-
-  virtual ~Server();
-
-  virtual bool is_valid() const;
-
-  Server &Get(const std::string &pattern, Handler handler);
-  Server &Post(const std::string &pattern, Handler handler);
-  Server &Post(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Put(const std::string &pattern, Handler handler);
-  Server &Put(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Patch(const std::string &pattern, Handler handler);
-  Server &Patch(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Delete(const std::string &pattern, Handler handler);
-  Server &Delete(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Options(const std::string &pattern, Handler handler);
-
-  bool set_base_dir(const std::string &dir,
-                    const std::string &mount_point = std::string());
-  bool set_mount_point(const std::string &mount_point, const std::string &dir,
-                       Headers headers = Headers());
-  bool remove_mount_point(const std::string &mount_point);
-  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
-                                                  const std::string &mime);
-  Server &set_default_file_mimetype(const std::string &mime);
-  Server &set_file_request_handler(Handler handler);
-
-  template <class ErrorHandlerFunc>
-  Server &set_error_handler(ErrorHandlerFunc &&handler) {
-    return set_error_handler_core(
-        std::forward<ErrorHandlerFunc>(handler),
-        std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
-  }
-
-  Server &set_exception_handler(ExceptionHandler handler);
-  Server &set_pre_routing_handler(HandlerWithResponse handler);
-  Server &set_post_routing_handler(Handler handler);
-
-  Server &set_expect_100_continue_handler(Expect100ContinueHandler handler);
-  Server &set_logger(Logger logger);
-
-  Server &set_address_family(int family);
-  Server &set_tcp_nodelay(bool on);
-  Server &set_ipv6_v6only(bool on);
-  Server &set_socket_options(SocketOptions socket_options);
-
-  Server &set_default_headers(Headers headers);
-  Server &
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  Server &set_keep_alive_max_count(size_t count);
-  Server &set_keep_alive_timeout(time_t sec);
-
-  Server &set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_idle_interval(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_idle_interval(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_payload_max_length(size_t length);
-
-  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
-  int bind_to_any_port(const std::string &host, int socket_flags = 0);
-  bool listen_after_bind();
-
-  bool listen(const std::string &host, int port, int socket_flags = 0);
-
-  bool is_running() const;
-  void wait_until_ready() const;
-  void stop();
-  void decommission();
-
-  std::function<TaskQueue *(void)> new_task_queue;
-
-protected:
-  bool process_request(Stream &strm, const std::string &remote_addr,
-                       int remote_port, const std::string &local_addr,
-                       int local_port, bool close_connection,
-                       bool &connection_closed,
-                       const std::function<void(Request &)> &setup_request);
-
-  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
-  size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
-  time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
-  time_t read_timeout_sec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND;
-  time_t read_timeout_usec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND;
-  time_t write_timeout_sec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND;
-  time_t write_timeout_usec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND;
-  time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND;
-  time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND;
-  size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
-
-private:
-  using Handlers =
-      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
-  using HandlersForContentReader =
-      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
-                            HandlerWithContentReader>>;
-
-  static std::unique_ptr<detail::MatcherBase>
-  make_matcher(const std::string &pattern);
-
-  Server &set_error_handler_core(HandlerWithResponse handler, std::true_type);
-  Server &set_error_handler_core(Handler handler, std::false_type);
-
-  socket_t create_server_socket(const std::string &host, int port,
-                                int socket_flags,
-                                SocketOptions socket_options) const;
-  int bind_internal(const std::string &host, int port, int socket_flags);
-  bool listen_internal();
-
-  bool routing(Request &req, Response &res, Stream &strm);
-  bool handle_file_request(const Request &req, Response &res,
-                           bool head = false);
-  bool dispatch_request(Request &req, Response &res,
-                        const Handlers &handlers) const;
-  bool dispatch_request_for_content_reader(
-      Request &req, Response &res, ContentReader content_reader,
-      const HandlersForContentReader &handlers) const;
-
-  bool parse_request_line(const char *s, Request &req) const;
-  void apply_ranges(const Request &req, Response &res,
-                    std::string &content_type, std::string &boundary) const;
-  bool write_response(Stream &strm, bool close_connection, Request &req,
-                      Response &res);
-  bool write_response_with_content(Stream &strm, bool close_connection,
-                                   const Request &req, Response &res);
-  bool write_response_core(Stream &strm, bool close_connection,
-                           const Request &req, Response &res,
-                           bool need_apply_ranges);
-  bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Response &res, const std::string &boundary,
-                                   const std::string &content_type);
-  bool read_content(Stream &strm, Request &req, Response &res);
-  bool
-  read_content_with_content_receiver(Stream &strm, Request &req, Response &res,
-                                     ContentReceiver receiver,
-                                     MultipartContentHeader multipart_header,
-                                     ContentReceiver multipart_receiver);
-  bool read_content_core(Stream &strm, Request &req, Response &res,
-                         ContentReceiver receiver,
-                         MultipartContentHeader multipart_header,
-                         ContentReceiver multipart_receiver) const;
-
-  virtual bool process_and_close_socket(socket_t sock);
-
-  std::atomic<bool> is_running_{false};
-  std::atomic<bool> is_decommisioned{false};
-
-  struct MountPointEntry {
-    std::string mount_point;
-    std::string base_dir;
-    Headers headers;
-  };
-  std::vector<MountPointEntry> base_dirs_;
-  std::map<std::string, std::string> file_extension_and_mimetype_map_;
-  std::string default_file_mimetype_ = "application/octet-stream";
-  Handler file_request_handler_;
-
-  Handlers get_handlers_;
-  Handlers post_handlers_;
-  HandlersForContentReader post_handlers_for_content_reader_;
-  Handlers put_handlers_;
-  HandlersForContentReader put_handlers_for_content_reader_;
-  Handlers patch_handlers_;
-  HandlersForContentReader patch_handlers_for_content_reader_;
-  Handlers delete_handlers_;
-  HandlersForContentReader delete_handlers_for_content_reader_;
-  Handlers options_handlers_;
-
-  HandlerWithResponse error_handler_;
-  ExceptionHandler exception_handler_;
-  HandlerWithResponse pre_routing_handler_;
-  Handler post_routing_handler_;
-  Expect100ContinueHandler expect_100_continue_handler_;
-
-  Logger logger_;
-
-  int address_family_ = AF_UNSPEC;
-  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
-  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
-  SocketOptions socket_options_ = default_socket_options;
-
-  Headers default_headers_;
-  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
-      detail::write_headers;
-};
-
-enum class Error {
-  Success = 0,
-  Unknown,
-  Connection,
-  BindIPAddress,
-  Read,
-  Write,
-  ExceedRedirectCount,
-  Canceled,
-  SSLConnection,
-  SSLLoadingCerts,
-  SSLServerVerification,
-  SSLServerHostnameVerification,
-  UnsupportedMultipartBoundaryChars,
-  Compression,
-  ConnectionTimeout,
-  ProxyConnection,
-
-  // For internal use only
-  SSLPeerCouldBeClosed_,
-};
-
-std::string to_string(Error error);
-
-std::ostream &operator<<(std::ostream &os, const Error &obj);
-
-class Result {
-public:
-  Result() = default;
-  Result(std::unique_ptr<Response> &&res, Error err,
-         Headers &&request_headers = Headers{})
-      : res_(std::move(res)), err_(err),
-        request_headers_(std::move(request_headers)) {}
-  // Response
-  operator bool() const { return res_ != nullptr; }
-  bool operator==(std::nullptr_t) const { return res_ == nullptr; }
-  bool operator!=(std::nullptr_t) const { return res_ != nullptr; }
-  const Response &value() const { return *res_; }
-  Response &value() { return *res_; }
-  const Response &operator*() const { return *res_; }
-  Response &operator*() { return *res_; }
-  const Response *operator->() const { return res_.get(); }
-  Response *operator->() { return res_.get(); }
-
-  // Error
-  Error error() const { return err_; }
-
-  // Request Headers
-  bool has_request_header(const std::string &key) const;
-  std::string get_request_header_value(const std::string &key,
-                                       const char *def = "",
-                                       size_t id = 0) const;
-  uint64_t get_request_header_value_u64(const std::string &key,
-                                        uint64_t def = 0, size_t id = 0) const;
-  size_t get_request_header_value_count(const std::string &key) const;
-
-private:
-  std::unique_ptr<Response> res_;
-  Error err_ = Error::Unknown;
-  Headers request_headers_;
-};
-
-class ClientImpl {
-public:
-  explicit ClientImpl(const std::string &host);
-
-  explicit ClientImpl(const std::string &host, int port);
-
-  explicit ClientImpl(const std::string &host, int port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path);
-
-  virtual ~ClientImpl();
-
-  virtual bool is_valid() const;
-
-  Result Get(const std::string &path);
-  Result Get(const std::string &path, const Headers &headers);
-  Result Get(const std::string &path, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             Progress progress);
-  Result Get(const std::string &path, ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress);
-
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ContentReceiver content_receiver,
-             Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress = nullptr);
-
-  Result Head(const std::string &path);
-  Result Head(const std::string &path, const Headers &headers);
-
-  Result Post(const std::string &path);
-  Result Post(const std::string &path, const Headers &headers);
-  Result Post(const std::string &path, const char *body, size_t content_length,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type, Progress progress);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, size_t content_length,
-              ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              size_t content_length, ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params, Progress progress);
-  Result Post(const std::string &path, const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items, const std::string &boundary);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items,
-              const MultipartFormDataProviderItems &provider_items);
-
-  Result Put(const std::string &path);
-  Result Put(const std::string &path, const char *body, size_t content_length,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type, Progress progress);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, size_t content_length,
-             ContentProvider content_provider, const std::string &content_type);
-  Result Put(const std::string &path,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             size_t content_length, ContentProvider content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params, Progress progress);
-  Result Put(const std::string &path, const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items);
-
-  Result Patch(const std::string &path);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type,
-               Progress progress);
-  Result Patch(const std::string &path, size_t content_length,
-               ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               size_t content_length, ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-
-  Result Delete(const std::string &path);
-  Result Delete(const std::string &path, const Headers &headers);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type,
-                Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type,
-                Progress progress);
-
-  Result Options(const std::string &path);
-  Result Options(const std::string &path, const Headers &headers);
-
-  bool send(Request &req, Response &res, Error &error);
-  Result send(const Request &req);
-
-  void stop();
-
-  std::string host() const;
-  int port() const;
-
-  size_t is_socket_open() const;
-  socket_t socket() const;
-
-  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
-
-  void set_default_headers(Headers headers);
-
-  void
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  void set_address_family(int family);
-  void set_tcp_nodelay(bool on);
-  void set_ipv6_v6only(bool on);
-  void set_socket_options(SocketOptions socket_options);
-
-  void set_connection_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void
-  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_basic_auth(const std::string &username, const std::string &password);
-  void set_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const std::string &username,
-                       const std::string &password);
-#endif
-
-  void set_keep_alive(bool on);
-  void set_follow_location(bool on);
-
-  void set_url_encode(bool on);
-
-  void set_compress(bool on);
-
-  void set_decompress(bool on);
-
-  void set_interface(const std::string &intf);
-
-  void set_proxy(const std::string &host, int port);
-  void set_proxy_basic_auth(const std::string &username,
-                            const std::string &password);
-  void set_proxy_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const std::string &username,
-                             const std::string &password);
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const std::string &ca_cert_file_path,
-                        const std::string &ca_cert_dir_path = std::string());
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void enable_server_certificate_verification(bool enabled);
-  void enable_server_hostname_verification(bool enabled);
-  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
-#endif
-
-  void set_logger(Logger logger);
-
-protected:
-  struct Socket {
-    socket_t sock = INVALID_SOCKET;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    SSL *ssl = nullptr;
-#endif
-
-    bool is_open() const { return sock != INVALID_SOCKET; }
-  };
-
-  virtual bool create_and_connect_socket(Socket &socket, Error &error);
-
-  // All of:
-  //   shutdown_ssl
-  //   shutdown_socket
-  //   close_socket
-  // should ONLY be called when socket_mutex_ is locked.
-  // Also, shutdown_ssl and close_socket should also NOT be called concurrently
-  // with a DIFFERENT thread sending requests using that socket.
-  virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
-  void shutdown_socket(Socket &socket) const;
-  void close_socket(Socket &socket);
-
-  bool process_request(Stream &strm, Request &req, Response &res,
-                       bool close_connection, Error &error);
-
-  bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Error &error) const;
-
-  void copy_settings(const ClientImpl &rhs);
-
-  // Socket endpoint information
-  const std::string host_;
-  const int port_;
-  const std::string host_and_port_;
-
-  // Current open socket
-  Socket socket_;
-  mutable std::mutex socket_mutex_;
-  std::recursive_mutex request_mutex_;
-
-  // These are all protected under socket_mutex
-  size_t socket_requests_in_flight_ = 0;
-  std::thread::id socket_requests_are_from_thread_ = std::thread::id();
-  bool socket_should_be_closed_when_request_is_done_ = false;
-
-  // Hostname-IP map
-  std::map<std::string, std::string> addr_map_;
-
-  // Default headers
-  Headers default_headers_;
-
-  // Header writer
-  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
-      detail::write_headers;
-
-  // Settings
-  std::string client_cert_path_;
-  std::string client_key_path_;
-
-  time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND;
-  time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND;
-  time_t read_timeout_sec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND;
-  time_t read_timeout_usec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND;
-  time_t write_timeout_sec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND;
-  time_t write_timeout_usec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND;
-
-  std::string basic_auth_username_;
-  std::string basic_auth_password_;
-  std::string bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string digest_auth_username_;
-  std::string digest_auth_password_;
-#endif
-
-  bool keep_alive_ = false;
-  bool follow_location_ = false;
-
-  bool url_encode_ = true;
-
-  int address_family_ = AF_UNSPEC;
-  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
-  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
-  SocketOptions socket_options_ = nullptr;
-
-  bool compress_ = false;
-  bool decompress_ = true;
-
-  std::string interface_;
-
-  std::string proxy_host_;
-  int proxy_port_ = -1;
-
-  std::string proxy_basic_auth_username_;
-  std::string proxy_basic_auth_password_;
-  std::string proxy_bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string proxy_digest_auth_username_;
-  std::string proxy_digest_auth_password_;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string ca_cert_file_path_;
-  std::string ca_cert_dir_path_;
-
-  X509_STORE *ca_cert_store_ = nullptr;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  bool server_certificate_verification_ = true;
-  bool server_hostname_verification_ = true;
-  std::function<bool(SSL *ssl)> server_certificate_verifier_;
-#endif
-
-  Logger logger_;
-
-private:
-  bool send_(Request &req, Response &res, Error &error);
-  Result send_(Request &&req);
-
-  socket_t create_client_socket(Error &error) const;
-  bool read_response_line(Stream &strm, const Request &req,
-                          Response &res) const;
-  bool write_request(Stream &strm, Request &req, bool close_connection,
-                     Error &error);
-  bool redirect(Request &req, Response &res, Error &error);
-  bool handle_request(Stream &strm, Request &req, Response &res,
-                      bool close_connection, Error &error);
-  std::unique_ptr<Response> send_with_content_provider(
-      Request &req, const char *body, size_t content_length,
-      ContentProvider content_provider,
-      ContentProviderWithoutLength content_provider_without_length,
-      const std::string &content_type, Error &error);
-  Result send_with_content_provider(
-      const std::string &method, const std::string &path,
-      const Headers &headers, const char *body, size_t content_length,
-      ContentProvider content_provider,
-      ContentProviderWithoutLength content_provider_without_length,
-      const std::string &content_type, Progress progress);
-  ContentProviderWithoutLength get_multipart_content_provider(
-      const std::string &boundary, const MultipartFormDataItems &items,
-      const MultipartFormDataProviderItems &provider_items) const;
-
-  std::string adjust_host_string(const std::string &host) const;
-
-  virtual bool process_socket(const Socket &socket,
-                              std::function<bool(Stream &strm)> callback);
-  virtual bool is_ssl() const;
-};
-
-class Client {
-public:
-  // Universal interface
-  explicit Client(const std::string &scheme_host_port);
-
-  explicit Client(const std::string &scheme_host_port,
-                  const std::string &client_cert_path,
-                  const std::string &client_key_path);
-
-  // HTTP only interface
-  explicit Client(const std::string &host, int port);
-
-  explicit Client(const std::string &host, int port,
-                  const std::string &client_cert_path,
-                  const std::string &client_key_path);
-
-  Client(Client &&) = default;
-  Client &operator=(Client &&) = default;
-
-  ~Client();
-
-  bool is_valid() const;
-
-  Result Get(const std::string &path);
-  Result Get(const std::string &path, const Headers &headers);
-  Result Get(const std::string &path, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             Progress progress);
-  Result Get(const std::string &path, ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress);
-
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ContentReceiver content_receiver,
-             Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress = nullptr);
-
-  Result Head(const std::string &path);
-  Result Head(const std::string &path, const Headers &headers);
-
-  Result Post(const std::string &path);
-  Result Post(const std::string &path, const Headers &headers);
-  Result Post(const std::string &path, const char *body, size_t content_length,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type, Progress progress);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, size_t content_length,
-              ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              size_t content_length, ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params, Progress progress);
-  Result Post(const std::string &path, const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items, const std::string &boundary);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items,
-              const MultipartFormDataProviderItems &provider_items);
-
-  Result Put(const std::string &path);
-  Result Put(const std::string &path, const char *body, size_t content_length,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type, Progress progress);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, size_t content_length,
-             ContentProvider content_provider, const std::string &content_type);
-  Result Put(const std::string &path,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             size_t content_length, ContentProvider content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params, Progress progress);
-  Result Put(const std::string &path, const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items);
-
-  Result Patch(const std::string &path);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type,
-               Progress progress);
-  Result Patch(const std::string &path, size_t content_length,
-               ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               size_t content_length, ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-
-  Result Delete(const std::string &path);
-  Result Delete(const std::string &path, const Headers &headers);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type,
-                Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type,
-                Progress progress);
-
-  Result Options(const std::string &path);
-  Result Options(const std::string &path, const Headers &headers);
-
-  bool send(Request &req, Response &res, Error &error);
-  Result send(const Request &req);
-
-  void stop();
-
-  std::string host() const;
-  int port() const;
-
-  size_t is_socket_open() const;
-  socket_t socket() const;
-
-  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
-
-  void set_default_headers(Headers headers);
-
-  void
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  void set_address_family(int family);
-  void set_tcp_nodelay(bool on);
-  void set_socket_options(SocketOptions socket_options);
-
-  void set_connection_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void
-  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_basic_auth(const std::string &username, const std::string &password);
-  void set_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const std::string &username,
-                       const std::string &password);
-#endif
-
-  void set_keep_alive(bool on);
-  void set_follow_location(bool on);
-
-  void set_url_encode(bool on);
-
-  void set_compress(bool on);
-
-  void set_decompress(bool on);
-
-  void set_interface(const std::string &intf);
-
-  void set_proxy(const std::string &host, int port);
-  void set_proxy_basic_auth(const std::string &username,
-                            const std::string &password);
-  void set_proxy_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const std::string &username,
-                             const std::string &password);
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void enable_server_certificate_verification(bool enabled);
-  void enable_server_hostname_verification(bool enabled);
-  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
-#endif
-
-  void set_logger(Logger logger);
-
-  // SSL
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const std::string &ca_cert_file_path,
-                        const std::string &ca_cert_dir_path = std::string());
-
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  void load_ca_cert_store(const char *ca_cert, std::size_t size);
-
-  long get_openssl_verify_result() const;
-
-  SSL_CTX *ssl_context() const;
-#endif
-
-private:
-  std::unique_ptr<ClientImpl> cli_;
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  bool is_ssl_ = false;
-#endif
-};
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLServer : public Server {
-public:
-  SSLServer(const char *cert_path, const char *private_key_path,
-            const char *client_ca_cert_file_path = nullptr,
-            const char *client_ca_cert_dir_path = nullptr,
-            const char *private_key_password = nullptr);
-
-  SSLServer(X509 *cert, EVP_PKEY *private_key,
-            X509_STORE *client_ca_cert_store = nullptr);
-
-  SSLServer(
-      const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback);
-
-  ~SSLServer() override;
-
-  bool is_valid() const override;
-
-  SSL_CTX *ssl_context() const;
-
-  void update_certs(X509 *cert, EVP_PKEY *private_key,
-                    X509_STORE *client_ca_cert_store = nullptr);
-
-private:
-  bool process_and_close_socket(socket_t sock) override;
-
-  SSL_CTX *ctx_;
-  std::mutex ctx_mutex_;
-};
-
-class SSLClient final : public ClientImpl {
-public:
-  explicit SSLClient(const std::string &host);
-
-  explicit SSLClient(const std::string &host, int port);
-
-  explicit SSLClient(const std::string &host, int port,
-                     const std::string &client_cert_path,
-                     const std::string &client_key_path,
-                     const std::string &private_key_password = std::string());
-
-  explicit SSLClient(const std::string &host, int port, X509 *client_cert,
-                     EVP_PKEY *client_key,
-                     const std::string &private_key_password = std::string());
-
-  ~SSLClient() override;
-
-  bool is_valid() const override;
-
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  void load_ca_cert_store(const char *ca_cert, std::size_t size);
-
-  long get_openssl_verify_result() const;
-
-  SSL_CTX *ssl_context() const;
-
-private:
-  bool create_and_connect_socket(Socket &socket, Error &error) override;
-  void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
-  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
-
-  bool process_socket(const Socket &socket,
-                      std::function<bool(Stream &strm)> callback) override;
-  bool is_ssl() const override;
-
-  bool connect_with_proxy(Socket &sock, Response &res, bool &success,
-                          Error &error);
-  bool initialize_ssl(Socket &socket, Error &error);
-
-  bool load_certs();
-
-  bool verify_host(X509 *server_cert) const;
-  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
-  bool verify_host_with_common_name(X509 *server_cert) const;
-  bool check_host_name(const char *pattern, size_t pattern_len) const;
-
-  SSL_CTX *ctx_;
-  std::mutex ctx_mutex_;
-  std::once_flag initialize_cert_;
-
-  std::vector<std::string> host_components_;
-
-  long verify_result_ = 0;
-
-  friend class ClientImpl;
-};
-#endif
-
-/*
- * Implementation of template methods.
- */
-
-namespace detail {
-
-template <typename T, typename U>
-inline void duration_to_sec_and_usec(const T &duration, U callback) {
-  auto sec = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
-  auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
-                  duration - std::chrono::seconds(sec))
-                  .count();
-  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
-}
-
-inline uint64_t get_header_value_u64(const Headers &headers,
-                                     const std::string &key, uint64_t def,
-                                     size_t id) {
-  auto rng = headers.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) {
-    return std::strtoull(it->second.data(), nullptr, 10);
-  }
-  return def;
-}
-
-} // namespace detail
-
-inline uint64_t Request::get_header_value_u64(const std::string &key,
-                                              uint64_t def, size_t id) const {
-  return detail::get_header_value_u64(headers, key, def, id);
-}
-
-inline uint64_t Response::get_header_value_u64(const std::string &key,
-                                               uint64_t def, size_t id) const {
-  return detail::get_header_value_u64(headers, key, def, id);
-}
-
-inline void default_socket_options(socket_t sock) {
-  int opt = 1;
-#ifdef _WIN32
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-             reinterpret_cast<const char *>(&opt), sizeof(opt));
-  setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-             reinterpret_cast<const char *>(&opt), sizeof(opt));
-#else
-#ifdef SO_REUSEPORT
-  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT,
-             reinterpret_cast<const void *>(&opt), sizeof(opt));
-#else
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-             reinterpret_cast<const void *>(&opt), sizeof(opt));
-#endif
-#endif
-}
-
-inline const char *status_message(int status) {
-  switch (status) {
-  case StatusCode::Continue_100: return "Continue";
-  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
-  case StatusCode::Processing_102: return "Processing";
-  case StatusCode::EarlyHints_103: return "Early Hints";
-  case StatusCode::OK_200: return "OK";
-  case StatusCode::Created_201: return "Created";
-  case StatusCode::Accepted_202: return "Accepted";
-  case StatusCode::NonAuthoritativeInformation_203:
-    return "Non-Authoritative Information";
-  case StatusCode::NoContent_204: return "No Content";
-  case StatusCode::ResetContent_205: return "Reset Content";
-  case StatusCode::PartialContent_206: return "Partial Content";
-  case StatusCode::MultiStatus_207: return "Multi-Status";
-  case StatusCode::AlreadyReported_208: return "Already Reported";
-  case StatusCode::IMUsed_226: return "IM Used";
-  case StatusCode::MultipleChoices_300: return "Multiple Choices";
-  case StatusCode::MovedPermanently_301: return "Moved Permanently";
-  case StatusCode::Found_302: return "Found";
-  case StatusCode::SeeOther_303: return "See Other";
-  case StatusCode::NotModified_304: return "Not Modified";
-  case StatusCode::UseProxy_305: return "Use Proxy";
-  case StatusCode::unused_306: return "unused";
-  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
-  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
-  case StatusCode::BadRequest_400: return "Bad Request";
-  case StatusCode::Unauthorized_401: return "Unauthorized";
-  case StatusCode::PaymentRequired_402: return "Payment Required";
-  case StatusCode::Forbidden_403: return "Forbidden";
-  case StatusCode::NotFound_404: return "Not Found";
-  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
-  case StatusCode::NotAcceptable_406: return "Not Acceptable";
-  case StatusCode::ProxyAuthenticationRequired_407:
-    return "Proxy Authentication Required";
-  case StatusCode::RequestTimeout_408: return "Request Timeout";
-  case StatusCode::Conflict_409: return "Conflict";
-  case StatusCode::Gone_410: return "Gone";
-  case StatusCode::LengthRequired_411: return "Length Required";
-  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
-  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
-  case StatusCode::UriTooLong_414: return "URI Too Long";
-  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
-  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
-  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
-  case StatusCode::ImATeapot_418: return "I'm a teapot";
-  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
-  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
-  case StatusCode::Locked_423: return "Locked";
-  case StatusCode::FailedDependency_424: return "Failed Dependency";
-  case StatusCode::TooEarly_425: return "Too Early";
-  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
-  case StatusCode::PreconditionRequired_428: return "Precondition Required";
-  case StatusCode::TooManyRequests_429: return "Too Many Requests";
-  case StatusCode::RequestHeaderFieldsTooLarge_431:
-    return "Request Header Fields Too Large";
-  case StatusCode::UnavailableForLegalReasons_451:
-    return "Unavailable For Legal Reasons";
-  case StatusCode::NotImplemented_501: return "Not Implemented";
-  case StatusCode::BadGateway_502: return "Bad Gateway";
-  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
-  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
-  case StatusCode::HttpVersionNotSupported_505:
-    return "HTTP Version Not Supported";
-  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
-  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
-  case StatusCode::LoopDetected_508: return "Loop Detected";
-  case StatusCode::NotExtended_510: return "Not Extended";
-  case StatusCode::NetworkAuthenticationRequired_511:
-    return "Network Authentication Required";
-
-  default:
-  case StatusCode::InternalServerError_500: return "Internal Server Error";
-  }
-}
-
-inline std::string get_bearer_token_auth(const Request &req) {
-  if (req.has_header("Authorization")) {
-    static std::string BearerHeaderPrefix = "Bearer ";
-    return req.get_header_value("Authorization")
-        .substr(BearerHeaderPrefix.length());
-  }
-  return "";
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
-  return *this;
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
-  return *this;
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); });
-  return *this;
-}
-
-inline std::string to_string(const Error error) {
-  switch (error) {
-  case Error::Success: return "Success (no error)";
-  case Error::Connection: return "Could not establish connection";
-  case Error::BindIPAddress: return "Failed to bind IP address";
-  case Error::Read: return "Failed to read connection";
-  case Error::Write: return "Failed to write connection";
-  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
-  case Error::Canceled: return "Connection handling canceled";
-  case Error::SSLConnection: return "SSL connection failed";
-  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
-  case Error::SSLServerVerification: return "SSL server verification failed";
-  case Error::SSLServerHostnameVerification:
-    return "SSL server hostname verification failed";
-  case Error::UnsupportedMultipartBoundaryChars:
-    return "Unsupported HTTP multipart boundary characters";
-  case Error::Compression: return "Compression failed";
-  case Error::ConnectionTimeout: return "Connection timed out";
-  case Error::ProxyConnection: return "Proxy connection failed";
-  case Error::Unknown: return "Unknown";
-  default: break;
-  }
-
-  return "Invalid";
-}
-
-inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
-  os << to_string(obj);
-  os << " (" << static_cast<std::underlying_type<Error>::type>(obj) << ')';
-  return os;
-}
-
-inline uint64_t Result::get_request_header_value_u64(const std::string &key,
-                                                     uint64_t def,
-                                                     size_t id) const {
-  return detail::get_header_value_u64(request_headers_, key, def, id);
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_connection_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) {
-    set_connection_timeout(sec, usec);
-  });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_read_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_write_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
-}
-
-template <class Rep, class Period>
-inline void Client::set_connection_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_connection_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_read_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_write_timeout(duration);
-}
-
-/*
- * Forward declarations and types that will be part of the .h file if split into
- * .h + .cc.
- */
-
-std::string hosted_at(const std::string &hostname);
-
-void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
-
-std::string append_query_params(const std::string &path, const Params &params);
-
-std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
-
-std::pair<std::string, std::string>
-make_basic_authentication_header(const std::string &username,
-                                 const std::string &password,
-                                 bool is_proxy = false);
-
-namespace detail {
-
-struct FileStat {
-  FileStat(const std::string &path);
-  bool is_file() const;
-  bool is_dir() const;
-
-private:
-  struct stat st_;
-  int ret_ = -1;
-};
-
-std::string encode_query_param(const std::string &value);
-
-std::string decode_url(const std::string &s, bool convert_plus_to_space);
-
-void read_file(const std::string &path, std::string &out);
-
-std::string trim_copy(const std::string &s);
-
-void divide(
-    const char *data, std::size_t size, char d,
-    std::function<void(const char *, std::size_t, const char *, std::size_t)>
-        fn);
-
-void divide(
-    const std::string &str, char d,
-    std::function<void(const char *, std::size_t, const char *, std::size_t)>
-        fn);
-
-void split(const char *b, const char *e, char d,
-           std::function<void(const char *, const char *)> fn);
-
-void split(const char *b, const char *e, char d, size_t m,
-           std::function<void(const char *, const char *)> fn);
-
-bool process_client_socket(socket_t sock, time_t read_timeout_sec,
-                           time_t read_timeout_usec, time_t write_timeout_sec,
-                           time_t write_timeout_usec,
-                           std::function<bool(Stream &)> callback);
-
-socket_t create_client_socket(const std::string &host, const std::string &ip,
-                              int port, int address_family, bool tcp_nodelay,
-                              bool ipv6_v6only, SocketOptions socket_options,
-                              time_t connection_timeout_sec,
-                              time_t connection_timeout_usec,
-                              time_t read_timeout_sec, time_t read_timeout_usec,
-                              time_t write_timeout_sec,
-                              time_t write_timeout_usec,
-                              const std::string &intf, Error &error);
-
-const char *get_header_value(const Headers &headers, const std::string &key,
-                             const char *def, size_t id);
-
-std::string params_to_query_str(const Params &params);
-
-void parse_query_text(const char *data, std::size_t size, Params &params);
-
-void parse_query_text(const std::string &s, Params &params);
-
-bool parse_multipart_boundary(const std::string &content_type,
-                              std::string &boundary);
-
-bool parse_range_header(const std::string &s, Ranges &ranges);
-
-int close_socket(socket_t sock);
-
-ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
-
-ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
-
-enum class EncodingType { None = 0, Gzip, Brotli };
-
-EncodingType encoding_type(const Request &req, const Response &res);
-
-class BufferStream final : public Stream {
-public:
-  BufferStream() = default;
-  ~BufferStream() override = default;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-
-  const std::string &get_buffer() const;
-
-private:
-  std::string buffer;
-  size_t position = 0;
-};
-
-class compressor {
-public:
-  virtual ~compressor() = default;
-
-  typedef std::function<bool(const char *data, size_t data_len)> Callback;
-  virtual bool compress(const char *data, size_t data_length, bool last,
-                        Callback callback) = 0;
-};
-
-class decompressor {
-public:
-  virtual ~decompressor() = default;
-
-  virtual bool is_valid() const = 0;
-
-  typedef std::function<bool(const char *data, size_t data_len)> Callback;
-  virtual bool decompress(const char *data, size_t data_length,
-                          Callback callback) = 0;
-};
-
-class nocompressor final : public compressor {
-public:
-  ~nocompressor() override = default;
-
-  bool compress(const char *data, size_t data_length, bool /*last*/,
-                Callback callback) override;
-};
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-class gzip_compressor final : public compressor {
-public:
-  gzip_compressor();
-  ~gzip_compressor() override;
-
-  bool compress(const char *data, size_t data_length, bool last,
-                Callback callback) override;
-
-private:
-  bool is_valid_ = false;
-  z_stream strm_;
-};
-
-class gzip_decompressor final : public decompressor {
-public:
-  gzip_decompressor();
-  ~gzip_decompressor() override;
-
-  bool is_valid() const override;
-
-  bool decompress(const char *data, size_t data_length,
-                  Callback callback) override;
-
-private:
-  bool is_valid_ = false;
-  z_stream strm_;
-};
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-class brotli_compressor final : public compressor {
-public:
-  brotli_compressor();
-  ~brotli_compressor();
-
-  bool compress(const char *data, size_t data_length, bool last,
-                Callback callback) override;
-
-private:
-  BrotliEncoderState *state_ = nullptr;
-};
-
-class brotli_decompressor final : public decompressor {
-public:
-  brotli_decompressor();
-  ~brotli_decompressor();
-
-  bool is_valid() const override;
-
-  bool decompress(const char *data, size_t data_length,
-                  Callback callback) override;
-
-private:
-  BrotliDecoderResult decoder_r;
-  BrotliDecoderState *decoder_s = nullptr;
-};
-#endif
-
-// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
-// to store data. The call can set memory on stack for performance.
-class stream_line_reader {
-public:
-  stream_line_reader(Stream &strm, char *fixed_buffer,
-                     size_t fixed_buffer_size);
-  const char *ptr() const;
-  size_t size() const;
-  bool end_with_crlf() const;
-  bool getline();
-
-private:
-  void append(char c);
-
-  Stream &strm_;
-  char *fixed_buffer_;
-  const size_t fixed_buffer_size_;
-  size_t fixed_buffer_used_size_ = 0;
-  std::string glowable_buffer_;
-};
-
-class mmap {
-public:
-  mmap(const char *path);
-  ~mmap();
-
-  bool open(const char *path);
-  void close();
-
-  bool is_open() const;
-  size_t size() const;
-  const char *data() const;
-
-private:
-#if defined(_WIN32)
-  HANDLE hFile_ = NULL;
-  HANDLE hMapping_ = NULL;
-#else
-  int fd_ = -1;
-#endif
-  size_t size_ = 0;
-  void *addr_ = nullptr;
-  bool is_open_empty_file = false;
-};
-
-} // namespace detail
-
-// ----------------------------------------------------------------------------
-
-/*
- * Implementation that will be part of the .cc file if split into .h + .cc.
- */
-
-namespace detail {
-
-inline bool is_hex(char c, int &v) {
-  if (0x20 <= c && isdigit(c)) {
-    v = c - '0';
-    return true;
-  } else if ('A' <= c && c <= 'F') {
-    v = c - 'A' + 10;
-    return true;
-  } else if ('a' <= c && c <= 'f') {
-    v = c - 'a' + 10;
-    return true;
-  }
-  return false;
-}
-
-inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
-                          int &val) {
-  if (i >= s.size()) { return false; }
-
-  val = 0;
-  for (; cnt; i++, cnt--) {
-    if (!s[i]) { return false; }
-    auto v = 0;
-    if (is_hex(s[i], v)) {
-      val = val * 16 + v;
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-inline std::string from_i_to_hex(size_t n) {
-  static const auto charset = "0123456789abcdef";
-  std::string ret;
-  do {
-    ret = charset[n & 15] + ret;
-    n >>= 4;
-  } while (n > 0);
-  return ret;
-}
-
-inline size_t to_utf8(int code, char *buff) {
-  if (code < 0x0080) {
-    buff[0] = static_cast<char>(code & 0x7F);
-    return 1;
-  } else if (code < 0x0800) {
-    buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
-    buff[1] = static_cast<char>(0x80 | (code & 0x3F));
-    return 2;
-  } else if (code < 0xD800) {
-    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
-    return 3;
-  } else if (code < 0xE000) { // D800 - DFFF is invalid...
-    return 0;
-  } else if (code < 0x10000) {
-    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
-    return 3;
-  } else if (code < 0x110000) {
-    buff[0] = static_cast<char>(0xF0 | ((code >> 18) & 0x7));
-    buff[1] = static_cast<char>(0x80 | ((code >> 12) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[3] = static_cast<char>(0x80 | (code & 0x3F));
-    return 4;
-  }
-
-  // NOTREACHED
-  return 0;
-}
-
-// NOTE: This code came up with the following stackoverflow post:
-// https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c
-inline std::string base64_encode(const std::string &in) {
-  static const auto lookup =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  std::string out;
-  out.reserve(in.size());
-
-  auto val = 0;
-  auto valb = -6;
-
-  for (auto c : in) {
-    val = (val << 8) + static_cast<uint8_t>(c);
-    valb += 8;
-    while (valb >= 0) {
-      out.push_back(lookup[(val >> valb) & 0x3F]);
-      valb -= 6;
-    }
-  }
-
-  if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); }
-
-  while (out.size() % 4) {
-    out.push_back('=');
-  }
-
-  return out;
-}
-
-inline bool is_valid_path(const std::string &path) {
-  size_t level = 0;
-  size_t i = 0;
-
-  // Skip slash
-  while (i < path.size() && path[i] == '/') {
-    i++;
-  }
-
-  while (i < path.size()) {
-    // Read component
-    auto beg = i;
-    while (i < path.size() && path[i] != '/') {
-      if (path[i] == '\0') {
-        return false;
-      } else if (path[i] == '\\') {
-        return false;
-      }
-      i++;
-    }
-
-    auto len = i - beg;
-    assert(len > 0);
-
-    if (!path.compare(beg, len, ".")) {
-      ;
-    } else if (!path.compare(beg, len, "..")) {
-      if (level == 0) { return false; }
-      level--;
-    } else {
-      level++;
-    }
-
-    // Skip slash
-    while (i < path.size() && path[i] == '/') {
-      i++;
-    }
-  }
-
-  return true;
-}
-
-inline FileStat::FileStat(const std::string &path) {
-  ret_ = stat(path.c_str(), &st_);
-}
-inline bool FileStat::is_file() const {
-  return ret_ >= 0 && S_ISREG(st_.st_mode);
-}
-inline bool FileStat::is_dir() const {
-  return ret_ >= 0 && S_ISDIR(st_.st_mode);
-}
-
-inline std::string encode_query_param(const std::string &value) {
-  std::ostringstream escaped;
-  escaped.fill('0');
-  escaped << std::hex;
-
-  for (auto c : value) {
-    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
-        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
-        c == ')') {
-      escaped << c;
-    } else {
-      escaped << std::uppercase;
-      escaped << '%' << std::setw(2)
-              << static_cast<int>(static_cast<unsigned char>(c));
-      escaped << std::nouppercase;
-    }
-  }
-
-  return escaped.str();
-}
-
-inline std::string encode_url(const std::string &s) {
-  std::string result;
-  result.reserve(s.size());
-
-  for (size_t i = 0; s[i]; i++) {
-    switch (s[i]) {
-    case ' ': result += "%20"; break;
-    case '+': result += "%2B"; break;
-    case '\r': result += "%0D"; break;
-    case '\n': result += "%0A"; break;
-    case '\'': result += "%27"; break;
-    case ',': result += "%2C"; break;
-    // case ':': result += "%3A"; break; // ok? probably...
-    case ';': result += "%3B"; break;
-    default:
-      auto c = static_cast<uint8_t>(s[i]);
-      if (c >= 0x80) {
-        result += '%';
-        char hex[4];
-        auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
-        assert(len == 2);
-        result.append(hex, static_cast<size_t>(len));
-      } else {
-        result += s[i];
-      }
-      break;
-    }
-  }
-
-  return result;
-}
-
-inline std::string decode_url(const std::string &s,
-                              bool convert_plus_to_space) {
-  std::string result;
-
-  for (size_t i = 0; i < s.size(); i++) {
-    if (s[i] == '%' && i + 1 < s.size()) {
-      if (s[i + 1] == 'u') {
-        auto val = 0;
-        if (from_hex_to_i(s, i + 2, 4, val)) {
-          // 4 digits Unicode codes
-          char buff[4];
-          size_t len = to_utf8(val, buff);
-          if (len > 0) { result.append(buff, len); }
-          i += 5; // 'u0000'
-        } else {
-          result += s[i];
-        }
-      } else {
-        auto val = 0;
-        if (from_hex_to_i(s, i + 1, 2, val)) {
-          // 2 digits hex codes
-          result += static_cast<char>(val);
-          i += 2; // '00'
-        } else {
-          result += s[i];
-        }
-      }
-    } else if (convert_plus_to_space && s[i] == '+') {
-      result += ' ';
-    } else {
-      result += s[i];
-    }
-  }
-
-  return result;
-}
-
-inline void read_file(const std::string &path, std::string &out) {
-  std::ifstream fs(path, std::ios_base::binary);
-  fs.seekg(0, std::ios_base::end);
-  auto size = fs.tellg();
-  fs.seekg(0);
-  out.resize(static_cast<size_t>(size));
-  fs.read(&out[0], static_cast<std::streamsize>(size));
-}
-
-inline std::string file_extension(const std::string &path) {
-  std::smatch m;
-  static auto re = std::regex("\\.([a-zA-Z0-9]+)$");
-  if (std::regex_search(path, m, re)) { return m[1].str(); }
-  return std::string();
-}
-
-inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; }
-
-inline std::pair<size_t, size_t> trim(const char *b, const char *e, size_t left,
-                                      size_t right) {
-  while (b + left < e && is_space_or_tab(b[left])) {
-    left++;
-  }
-  while (right > 0 && is_space_or_tab(b[right - 1])) {
-    right--;
-  }
-  return std::make_pair(left, right);
-}
-
-inline std::string trim_copy(const std::string &s) {
-  auto r = trim(s.data(), s.data() + s.size(), 0, s.size());
-  return s.substr(r.first, r.second - r.first);
-}
-
-inline std::string trim_double_quotes_copy(const std::string &s) {
-  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
-    return s.substr(1, s.size() - 2);
-  }
-  return s;
-}
-
-inline void
-divide(const char *data, std::size_t size, char d,
-       std::function<void(const char *, std::size_t, const char *, std::size_t)>
-           fn) {
-  const auto it = std::find(data, data + size, d);
-  const auto found = static_cast<std::size_t>(it != data + size);
-  const auto lhs_data = data;
-  const auto lhs_size = static_cast<std::size_t>(it - data);
-  const auto rhs_data = it + found;
-  const auto rhs_size = size - lhs_size - found;
-
-  fn(lhs_data, lhs_size, rhs_data, rhs_size);
-}
-
-inline void
-divide(const std::string &str, char d,
-       std::function<void(const char *, std::size_t, const char *, std::size_t)>
-           fn) {
-  divide(str.data(), str.size(), d, std::move(fn));
-}
-
-inline void split(const char *b, const char *e, char d,
-                  std::function<void(const char *, const char *)> fn) {
-  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
-}
-
-inline void split(const char *b, const char *e, char d, size_t m,
-                  std::function<void(const char *, const char *)> fn) {
-  size_t i = 0;
-  size_t beg = 0;
-  size_t count = 1;
-
-  while (e ? (b + i < e) : (b[i] != '\0')) {
-    if (b[i] == d && count < m) {
-      auto r = trim(b, e, beg, i);
-      if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
-      beg = i + 1;
-      count++;
-    }
-    i++;
-  }
-
-  if (i) {
-    auto r = trim(b, e, beg, i);
-    if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
-  }
-}
-
-inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer,
-                                              size_t fixed_buffer_size)
-    : strm_(strm), fixed_buffer_(fixed_buffer),
-      fixed_buffer_size_(fixed_buffer_size) {}
-
-inline const char *stream_line_reader::ptr() const {
-  if (glowable_buffer_.empty()) {
-    return fixed_buffer_;
-  } else {
-    return glowable_buffer_.data();
-  }
-}
-
-inline size_t stream_line_reader::size() const {
-  if (glowable_buffer_.empty()) {
-    return fixed_buffer_used_size_;
-  } else {
-    return glowable_buffer_.size();
-  }
-}
-
-inline bool stream_line_reader::end_with_crlf() const {
-  auto end = ptr() + size();
-  return size() >= 2 && end[-2] == '\r' && end[-1] == '\n';
-}
-
-inline bool stream_line_reader::getline() {
-  fixed_buffer_used_size_ = 0;
-  glowable_buffer_.clear();
-
-#ifndef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-  char prev_byte = 0;
-#endif
-
-  for (size_t i = 0;; i++) {
-    char byte;
-    auto n = strm_.read(&byte, 1);
-
-    if (n < 0) {
-      return false;
-    } else if (n == 0) {
-      if (i == 0) {
-        return false;
-      } else {
-        break;
-      }
-    }
-
-    append(byte);
-
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-    if (byte == '\n') { break; }
-#else
-    if (prev_byte == '\r' && byte == '\n') { break; }
-    prev_byte = byte;
-#endif
-  }
-
-  return true;
-}
-
-inline void stream_line_reader::append(char c) {
-  if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
-    fixed_buffer_[fixed_buffer_used_size_++] = c;
-    fixed_buffer_[fixed_buffer_used_size_] = '\0';
-  } else {
-    if (glowable_buffer_.empty()) {
-      assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
-      glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
-    }
-    glowable_buffer_ += c;
-  }
-}
-
-inline mmap::mmap(const char *path) {
-  open(path);
-}
-
-inline mmap::~mmap() { close(); }
-
-inline bool mmap::open(const char *path) {
-  close();
-
-#if defined(_WIN32)
-  std::wstring wpath;
-  for (size_t i = 0; i < strlen(path); i++) {
-    wpath += path[i];
-  }
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-  hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,
-                         OPEN_EXISTING, NULL);
-#else
-  hFile_ = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
-                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#endif
-
-  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
-
-  LARGE_INTEGER size{};
-  if (!::GetFileSizeEx(hFile_, &size)) { return false; }
-  // If the following line doesn't compile due to QuadPart, update Windows SDK.
-  // See:
-  // https://github.com/yhirose/cpp-httplib/issues/1903#issuecomment-2316520721
-  if (static_cast<ULONGLONG>(size.QuadPart) >
-      (std::numeric_limits<decltype(size_)>::max)()) {
-    // `size_t` might be 32-bits, on 32-bits Windows.
-    return false;
-  }
-  size_ = static_cast<size_t>(size.QuadPart);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-  hMapping_ =
-      ::CreateFileMappingFromApp(hFile_, NULL, PAGE_READONLY, size_, NULL);
-#else
-  hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
-#endif
-
-  // Special treatment for an empty file...
-  if (hMapping_ == NULL && size_ == 0) {
-    close();
-    is_open_empty_file = true;
-    return true;
-  }
-
-  if (hMapping_ == NULL) {
-    close();
-    return false;
-  }
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-  addr_ = ::MapViewOfFileFromApp(hMapping_, FILE_MAP_READ, 0, 0);
-#else
-  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
-#endif
-
-  if (addr_ == nullptr) {
-    close();
-    return false;
-  }
-#else
-  fd_ = ::open(path, O_RDONLY);
-  if (fd_ == -1) { return false; }
-
-  struct stat sb;
-  if (fstat(fd_, &sb) == -1) {
-    close();
-    return false;
-  }
-  size_ = static_cast<size_t>(sb.st_size);
-
-  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
-
-  // Special treatment for an empty file...
-  if (addr_ == MAP_FAILED && size_ == 0) {
-    close();
-    is_open_empty_file = true;
-    return false;
-  }
-#endif
-
-  return true;
-}
-
-inline bool mmap::is_open() const {
-  return is_open_empty_file ? true : addr_ != nullptr;
-}
-
-inline size_t mmap::size() const { return size_; }
-
-inline const char *mmap::data() const {
-  return is_open_empty_file ? "" : static_cast<const char *>(addr_);
-}
-
-inline void mmap::close() {
-#if defined(_WIN32)
-  if (addr_) {
-    ::UnmapViewOfFile(addr_);
-    addr_ = nullptr;
-  }
-
-  if (hMapping_) {
-    ::CloseHandle(hMapping_);
-    hMapping_ = NULL;
-  }
-
-  if (hFile_ != INVALID_HANDLE_VALUE) {
-    ::CloseHandle(hFile_);
-    hFile_ = INVALID_HANDLE_VALUE;
-  }
-
-  is_open_empty_file = false;
-#else
-  if (addr_ != nullptr) {
-    munmap(addr_, size_);
-    addr_ = nullptr;
-  }
-
-  if (fd_ != -1) {
-    ::close(fd_);
-    fd_ = -1;
-  }
-#endif
-  size_ = 0;
-}
-inline int close_socket(socket_t sock) {
-#ifdef _WIN32
-  return closesocket(sock);
-#else
-  return close(sock);
-#endif
-}
-
-template <typename T> inline ssize_t handle_EINTR(T fn) {
-  ssize_t res = 0;
-  while (true) {
-    res = fn();
-    if (res < 0 && errno == EINTR) {
-      std::this_thread::sleep_for(std::chrono::microseconds{1});
-      continue;
-    }
-    break;
-  }
-  return res;
-}
-
-inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
-  return handle_EINTR([&]() {
-    return recv(sock,
-#ifdef _WIN32
-                static_cast<char *>(ptr), static_cast<int>(size),
-#else
-                ptr, size,
-#endif
-                flags);
-  });
-}
-
-inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size,
-                           int flags) {
-  return handle_EINTR([&]() {
-    return send(sock,
-#ifdef _WIN32
-                static_cast<const char *>(ptr), static_cast<int>(size),
-#else
-                ptr, size,
-#endif
-                flags);
-  });
-}
-
-inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLIN;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return -1; }
-#endif
-
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(sock, &fds);
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  return handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), &fds, nullptr, nullptr, &tv);
-  });
-#endif
-}
-
-inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLOUT;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return -1; }
-#endif
-
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(sock, &fds);
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  return handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), nullptr, &fds, nullptr, &tv);
-  });
-#endif
-}
-
-inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
-                                        time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLIN | POLLOUT;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-
-  if (poll_res == 0) { return Error::ConnectionTimeout; }
-
-  if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
-    auto error = 0;
-    socklen_t len = sizeof(error);
-    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
-                          reinterpret_cast<char *>(&error), &len);
-    auto successful = res >= 0 && !error;
-    return successful ? Error::Success : Error::Connection;
-  }
-
-  return Error::Connection;
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return Error::Connection; }
-#endif
-
-  fd_set fdsr;
-  FD_ZERO(&fdsr);
-  FD_SET(sock, &fdsr);
-
-  auto fdsw = fdsr;
-  auto fdse = fdsr;
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  auto ret = handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), &fdsr, &fdsw, &fdse, &tv);
-  });
-
-  if (ret == 0) { return Error::ConnectionTimeout; }
-
-  if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
-    auto error = 0;
-    socklen_t len = sizeof(error);
-    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
-                          reinterpret_cast<char *>(&error), &len);
-    auto successful = res >= 0 && !error;
-    return successful ? Error::Success : Error::Connection;
-  }
-  return Error::Connection;
-#endif
-}
-
-inline bool is_socket_alive(socket_t sock) {
-  const auto val = detail::select_read(sock, 0, 0);
-  if (val == 0) {
-    return true;
-  } else if (val < 0 && errno == EBADF) {
-    return false;
-  }
-  char buf[1];
-  return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0;
-}
-
-class SocketStream final : public Stream {
-public:
-  SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-               time_t write_timeout_sec, time_t write_timeout_usec);
-  ~SocketStream() override;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-
-private:
-  socket_t sock_;
-  time_t read_timeout_sec_;
-  time_t read_timeout_usec_;
-  time_t write_timeout_sec_;
-  time_t write_timeout_usec_;
-
-  std::vector<char> read_buff_;
-  size_t read_buff_off_ = 0;
-  size_t read_buff_content_size_ = 0;
-
-  static const size_t read_buff_size_ = 1024l * 4;
-};
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLSocketStream final : public Stream {
-public:
-  SSLSocketStream(socket_t sock, SSL *ssl, time_t read_timeout_sec,
-                  time_t read_timeout_usec, time_t write_timeout_sec,
-                  time_t write_timeout_usec);
-  ~SSLSocketStream() override;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-
-private:
-  socket_t sock_;
-  SSL *ssl_;
-  time_t read_timeout_sec_;
-  time_t read_timeout_usec_;
-  time_t write_timeout_sec_;
-  time_t write_timeout_usec_;
-};
-#endif
-
-template <typename T>
-inline bool
-process_server_socket_core(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                           size_t keep_alive_max_count,
-                           time_t keep_alive_timeout_sec, T callback) {
-  assert(keep_alive_max_count > 0);
-  auto ret = false;
-  auto count = keep_alive_max_count;
-  while (svr_sock != INVALID_SOCKET && count > 0 &&
-         select_read(sock, keep_alive_timeout_sec, 0) > 0) {
-    auto close_connection = count == 1;
-    auto connection_closed = false;
-    ret = callback(close_connection, connection_closed);
-    if (!ret || connection_closed) { break; }
-    count--;
-  }
-  return ret;
-}
-
-template <typename T>
-inline bool
-process_server_socket(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                      size_t keep_alive_max_count,
-                      time_t keep_alive_timeout_sec, time_t read_timeout_sec,
-                      time_t read_timeout_usec, time_t write_timeout_sec,
-                      time_t write_timeout_usec, T callback) {
-  return process_server_socket_core(
-      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
-      [&](bool close_connection, bool &connection_closed) {
-        SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
-                          write_timeout_sec, write_timeout_usec);
-        return callback(strm, close_connection, connection_closed);
-      });
-}
-
-inline bool process_client_socket(socket_t sock, time_t read_timeout_sec,
-                                  time_t read_timeout_usec,
-                                  time_t write_timeout_sec,
-                                  time_t write_timeout_usec,
-                                  std::function<bool(Stream &)> callback) {
-  SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
-                    write_timeout_sec, write_timeout_usec);
-  return callback(strm);
-}
-
-inline int shutdown_socket(socket_t sock) {
-#ifdef _WIN32
-  return shutdown(sock, SD_BOTH);
-#else
-  return shutdown(sock, SHUT_RDWR);
-#endif
-}
-
-inline std::string escape_abstract_namespace_unix_domain(const std::string &s) {
-  if (s.size() > 1 && s[0] == '\0') {
-    auto ret = s;
-    ret[0] = '@';
-    return ret;
-  }
-  return s;
-}
-
-inline std::string
-unescape_abstract_namespace_unix_domain(const std::string &s) {
-  if (s.size() > 1 && s[0] == '@') {
-    auto ret = s;
-    ret[0] = '\0';
-    return ret;
-  }
-  return s;
-}
-
-template <typename BindOrConnect>
-socket_t create_socket(const std::string &host, const std::string &ip, int port,
-                       int address_family, int socket_flags, bool tcp_nodelay,
-                       bool ipv6_v6only, SocketOptions socket_options,
-                       BindOrConnect bind_or_connect) {
-  // Get address info
-  const char *node = nullptr;
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = IPPROTO_IP;
-
-  if (!ip.empty()) {
-    node = ip.c_str();
-    // Ask getaddrinfo to convert IP in c-string to address
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_flags = AI_NUMERICHOST;
-  } else {
-    if (!host.empty()) { node = host.c_str(); }
-    hints.ai_family = address_family;
-    hints.ai_flags = socket_flags;
-  }
-
-#ifndef _WIN32
-  if (hints.ai_family == AF_UNIX) {
-    const auto addrlen = host.length();
-    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
-
-#ifdef SOCK_CLOEXEC
-    auto sock = socket(hints.ai_family, hints.ai_socktype | SOCK_CLOEXEC,
-                       hints.ai_protocol);
-#else
-    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
-#endif
-
-    if (sock != INVALID_SOCKET) {
-      sockaddr_un addr{};
-      addr.sun_family = AF_UNIX;
-
-      auto unescaped_host = unescape_abstract_namespace_unix_domain(host);
-      std::copy(unescaped_host.begin(), unescaped_host.end(), addr.sun_path);
-
-      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
-      hints.ai_addrlen = static_cast<socklen_t>(
-          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
-
-#ifndef SOCK_CLOEXEC
-      fcntl(sock, F_SETFD, FD_CLOEXEC);
-#endif
-
-      if (socket_options) { socket_options(sock); }
-
-      bool dummy;
-      if (!bind_or_connect(sock, hints, dummy)) {
-        close_socket(sock);
-        sock = INVALID_SOCKET;
-      }
-    }
-    return sock;
-  }
-#endif
-
-  auto service = std::to_string(port);
-
-  if (getaddrinfo(node, service.c_str(), &hints, &result)) {
-#if defined __linux__ && !defined __ANDROID__
-    res_init();
-#endif
-    return INVALID_SOCKET;
-  }
-  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
-
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    // Create a socket
-#ifdef _WIN32
-    auto sock =
-        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
-                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
-    /**
-     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
-     * and above the socket creation fails on older Windows Systems.
-     *
-     * Let's try to create a socket the old way in this case.
-     *
-     * Reference:
-     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
-     *
-     * WSA_FLAG_NO_HANDLE_INHERIT:
-     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
-     * SP1, and later
-     *
-     */
-    if (sock == INVALID_SOCKET) {
-      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    }
-#else
-
-#ifdef SOCK_CLOEXEC
-    auto sock =
-        socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
-#else
-    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-#endif
-
-#endif
-    if (sock == INVALID_SOCKET) { continue; }
-
-#if !defined _WIN32 && !defined SOCK_CLOEXEC
-    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
-      close_socket(sock);
-      continue;
-    }
-#endif
-
-    if (tcp_nodelay) {
-      auto opt = 1;
-#ifdef _WIN32
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const char *>(&opt), sizeof(opt));
-#else
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const void *>(&opt), sizeof(opt));
-#endif
-    }
-
-    if (rp->ai_family == AF_INET6) {
-      auto opt = ipv6_v6only ? 1 : 0;
-#ifdef _WIN32
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const char *>(&opt), sizeof(opt));
-#else
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const void *>(&opt), sizeof(opt));
-#endif
-    }
-
-    if (socket_options) { socket_options(sock); }
-
-    // bind or connect
-    auto quit = false;
-    if (bind_or_connect(sock, *rp, quit)) { return sock; }
-
-    close_socket(sock);
-
-    if (quit) { break; }
-  }
-
-  return INVALID_SOCKET;
-}
-
-inline void set_nonblocking(socket_t sock, bool nonblocking) {
-#ifdef _WIN32
-  auto flags = nonblocking ? 1UL : 0UL;
-  ioctlsocket(sock, FIONBIO, &flags);
-#else
-  auto flags = fcntl(sock, F_GETFL, 0);
-  fcntl(sock, F_SETFL,
-        nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
-#endif
-}
-
-inline bool is_connection_error() {
-#ifdef _WIN32
-  return WSAGetLastError() != WSAEWOULDBLOCK;
-#else
-  return errno != EINPROGRESS;
-#endif
-}
-
-inline bool bind_ip_address(socket_t sock, const std::string &host) {
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; }
-  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
-
-  auto ret = false;
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    const auto &ai = *rp;
-    if (!::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
-      ret = true;
-      break;
-    }
-  }
-
-  return ret;
-}
-
-#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
-#define USE_IF2IP
-#endif
-
-#ifdef USE_IF2IP
-inline std::string if2ip(int address_family, const std::string &ifn) {
-  struct ifaddrs *ifap;
-  getifaddrs(&ifap);
-  auto se = detail::scope_exit([&] { freeifaddrs(ifap); });
-
-  std::string addr_candidate;
-  for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr && ifn == ifa->ifa_name &&
-        (AF_UNSPEC == address_family ||
-         ifa->ifa_addr->sa_family == address_family)) {
-      if (ifa->ifa_addr->sa_family == AF_INET) {
-        auto sa = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr);
-        char buf[INET_ADDRSTRLEN];
-        if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) {
-          return std::string(buf, INET_ADDRSTRLEN);
-        }
-      } else if (ifa->ifa_addr->sa_family == AF_INET6) {
-        auto sa = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr);
-        if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) {
-          char buf[INET6_ADDRSTRLEN] = {};
-          if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) {
-            // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL
-            auto s6_addr_head = sa->sin6_addr.s6_addr[0];
-            if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) {
-              addr_candidate = std::string(buf, INET6_ADDRSTRLEN);
-            } else {
-              return std::string(buf, INET6_ADDRSTRLEN);
-            }
-          }
-        }
-      }
-    }
-  }
-  return addr_candidate;
-}
-#endif
-
-inline socket_t create_client_socket(
-    const std::string &host, const std::string &ip, int port,
-    int address_family, bool tcp_nodelay, bool ipv6_v6only,
-    SocketOptions socket_options, time_t connection_timeout_sec,
-    time_t connection_timeout_usec, time_t read_timeout_sec,
-    time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, const std::string &intf, Error &error) {
-  auto sock = create_socket(
-      host, ip, port, address_family, 0, tcp_nodelay, ipv6_v6only,
-      std::move(socket_options),
-      [&](socket_t sock2, struct addrinfo &ai, bool &quit) -> bool {
-        if (!intf.empty()) {
-#ifdef USE_IF2IP
-          auto ip_from_if = if2ip(address_family, intf);
-          if (ip_from_if.empty()) { ip_from_if = intf; }
-          if (!bind_ip_address(sock2, ip_from_if)) {
-            error = Error::BindIPAddress;
-            return false;
-          }
-#endif
-        }
-
-        set_nonblocking(sock2, true);
-
-        auto ret =
-            ::connect(sock2, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen));
-
-        if (ret < 0) {
-          if (is_connection_error()) {
-            error = Error::Connection;
-            return false;
-          }
-          error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
-                                             connection_timeout_usec);
-          if (error != Error::Success) {
-            if (error == Error::ConnectionTimeout) { quit = true; }
-            return false;
-          }
-        }
-
-        set_nonblocking(sock2, false);
-
-        {
-#ifdef _WIN32
-          auto timeout = static_cast<uint32_t>(read_timeout_sec * 1000 +
-                                               read_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
-                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-          timeval tv;
-          tv.tv_sec = static_cast<long>(read_timeout_sec);
-          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
-                     reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-        }
-        {
-
-#ifdef _WIN32
-          auto timeout = static_cast<uint32_t>(write_timeout_sec * 1000 +
-                                               write_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
-                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-          timeval tv;
-          tv.tv_sec = static_cast<long>(write_timeout_sec);
-          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
-                     reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-        }
-
-        error = Error::Success;
-        return true;
-      });
-
-  if (sock != INVALID_SOCKET) {
-    error = Error::Success;
-  } else {
-    if (error == Error::Success) { error = Error::Connection; }
-  }
-
-  return sock;
-}
-
-inline bool get_ip_and_port(const struct sockaddr_storage &addr,
-                            socklen_t addr_len, std::string &ip, int &port) {
-  if (addr.ss_family == AF_INET) {
-    port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
-  } else if (addr.ss_family == AF_INET6) {
-    port =
-        ntohs(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_port);
-  } else {
-    return false;
-  }
-
-  std::array<char, NI_MAXHOST> ipstr{};
-  if (getnameinfo(reinterpret_cast<const struct sockaddr *>(&addr), addr_len,
-                  ipstr.data(), static_cast<socklen_t>(ipstr.size()), nullptr,
-                  0, NI_NUMERICHOST)) {
-    return false;
-  }
-
-  ip = ipstr.data();
-  return true;
-}
-
-inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
-  struct sockaddr_storage addr;
-  socklen_t addr_len = sizeof(addr);
-  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
-                   &addr_len)) {
-    get_ip_and_port(addr, addr_len, ip, port);
-  }
-}
-
-inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
-  struct sockaddr_storage addr;
-  socklen_t addr_len = sizeof(addr);
-
-  if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
-                   &addr_len)) {
-#ifndef _WIN32
-    if (addr.ss_family == AF_UNIX) {
-#if defined(__linux__)
-      struct ucred ucred;
-      socklen_t len = sizeof(ucred);
-      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
-        port = ucred.pid;
-      }
-#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__
-      pid_t pid;
-      socklen_t len = sizeof(pid);
-      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
-        port = pid;
-      }
-#endif
-      return;
-    }
-#endif
-    get_ip_and_port(addr, addr_len, ip, port);
-  }
-}
-
-inline constexpr unsigned int str2tag_core(const char *s, size_t l,
-                                           unsigned int h) {
-  return (l == 0)
-             ? h
-             : str2tag_core(
-                   s + 1, l - 1,
-                   // Unsets the 6 high bits of h, therefore no overflow happens
-                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
-                    h * 33) ^
-                       static_cast<unsigned char>(*s));
-}
-
-inline unsigned int str2tag(const std::string &s) {
-  return str2tag_core(s.data(), s.size(), 0);
-}
-
-namespace udl {
-
-inline constexpr unsigned int operator"" _t(const char *s, size_t l) {
-  return str2tag_core(s, l, 0);
-}
-
-} // namespace udl
-
-inline std::string
-find_content_type(const std::string &path,
-                  const std::map<std::string, std::string> &user_data,
-                  const std::string &default_content_type) {
-  auto ext = file_extension(path);
-
-  auto it = user_data.find(ext);
-  if (it != user_data.end()) { return it->second; }
-
-  using udl::operator""_t;
-
-  switch (str2tag(ext)) {
-  default: return default_content_type;
-
-  case "css"_t: return "text/css";
-  case "csv"_t: return "text/csv";
-  case "htm"_t:
-  case "html"_t: return "text/html";
-  case "js"_t:
-  case "mjs"_t: return "text/javascript";
-  case "txt"_t: return "text/plain";
-  case "vtt"_t: return "text/vtt";
-
-  case "apng"_t: return "image/apng";
-  case "avif"_t: return "image/avif";
-  case "bmp"_t: return "image/bmp";
-  case "gif"_t: return "image/gif";
-  case "png"_t: return "image/png";
-  case "svg"_t: return "image/svg+xml";
-  case "webp"_t: return "image/webp";
-  case "ico"_t: return "image/x-icon";
-  case "tif"_t: return "image/tiff";
-  case "tiff"_t: return "image/tiff";
-  case "jpg"_t:
-  case "jpeg"_t: return "image/jpeg";
-
-  case "mp4"_t: return "video/mp4";
-  case "mpeg"_t: return "video/mpeg";
-  case "webm"_t: return "video/webm";
-
-  case "mp3"_t: return "audio/mp3";
-  case "mpga"_t: return "audio/mpeg";
-  case "weba"_t: return "audio/webm";
-  case "wav"_t: return "audio/wave";
-
-  case "otf"_t: return "font/otf";
-  case "ttf"_t: return "font/ttf";
-  case "woff"_t: return "font/woff";
-  case "woff2"_t: return "font/woff2";
-
-  case "7z"_t: return "application/x-7z-compressed";
-  case "atom"_t: return "application/atom+xml";
-  case "pdf"_t: return "application/pdf";
-  case "json"_t: return "application/json";
-  case "rss"_t: return "application/rss+xml";
-  case "tar"_t: return "application/x-tar";
-  case "xht"_t:
-  case "xhtml"_t: return "application/xhtml+xml";
-  case "xslt"_t: return "application/xslt+xml";
-  case "xml"_t: return "application/xml";
-  case "gz"_t: return "application/gzip";
-  case "zip"_t: return "application/zip";
-  case "wasm"_t: return "application/wasm";
-  }
-}
-
-inline bool can_compress_content_type(const std::string &content_type) {
-  using udl::operator""_t;
-
-  auto tag = str2tag(content_type);
-
-  switch (tag) {
-  case "image/svg+xml"_t:
-  case "application/javascript"_t:
-  case "application/json"_t:
-  case "application/xml"_t:
-  case "application/protobuf"_t:
-  case "application/xhtml+xml"_t: return true;
-
-  case "text/event-stream"_t: return false;
-
-  default: return !content_type.rfind("text/", 0);
-  }
-}
-
-inline EncodingType encoding_type(const Request &req, const Response &res) {
-  auto ret =
-      detail::can_compress_content_type(res.get_header_value("Content-Type"));
-  if (!ret) { return EncodingType::None; }
-
-  const auto &s = req.get_header_value("Accept-Encoding");
-  (void)(s);
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-  // TODO: 'Accept-Encoding' has br, not br;q=0
-  ret = s.find("br") != std::string::npos;
-  if (ret) { return EncodingType::Brotli; }
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  // TODO: 'Accept-Encoding' has gzip, not gzip;q=0
-  ret = s.find("gzip") != std::string::npos;
-  if (ret) { return EncodingType::Gzip; }
-#endif
-
-  return EncodingType::None;
-}
-
-inline bool nocompressor::compress(const char *data, size_t data_length,
-                                   bool /*last*/, Callback callback) {
-  if (!data_length) { return true; }
-  return callback(data, data_length);
-}
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-inline gzip_compressor::gzip_compressor() {
-  std::memset(&strm_, 0, sizeof(strm_));
-  strm_.zalloc = Z_NULL;
-  strm_.zfree = Z_NULL;
-  strm_.opaque = Z_NULL;
-
-  is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
-                           Z_DEFAULT_STRATEGY) == Z_OK;
-}
-
-inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); }
-
-inline bool gzip_compressor::compress(const char *data, size_t data_length,
-                                      bool last, Callback callback) {
-  assert(is_valid_);
-
-  do {
-    constexpr size_t max_avail_in =
-        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
-
-    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
-        (std::min)(data_length, max_avail_in));
-    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
-
-    data_length -= strm_.avail_in;
-    data += strm_.avail_in;
-
-    auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
-    auto ret = Z_OK;
-
-    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    do {
-      strm_.avail_out = static_cast<uInt>(buff.size());
-      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
-
-      ret = deflate(&strm_, flush);
-      if (ret == Z_STREAM_ERROR) { return false; }
-
-      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
-        return false;
-      }
-    } while (strm_.avail_out == 0);
-
-    assert((flush == Z_FINISH && ret == Z_STREAM_END) ||
-           (flush == Z_NO_FLUSH && ret == Z_OK));
-    assert(strm_.avail_in == 0);
-  } while (data_length > 0);
-
-  return true;
-}
-
-inline gzip_decompressor::gzip_decompressor() {
-  std::memset(&strm_, 0, sizeof(strm_));
-  strm_.zalloc = Z_NULL;
-  strm_.zfree = Z_NULL;
-  strm_.opaque = Z_NULL;
-
-  // 15 is the value of wbits, which should be at the maximum possible value
-  // to ensure that any gzip stream can be decoded. The offset of 32 specifies
-  // that the stream type should be automatically detected either gzip or
-  // deflate.
-  is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK;
-}
-
-inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); }
-
-inline bool gzip_decompressor::is_valid() const { return is_valid_; }
-
-inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
-                                          Callback callback) {
-  assert(is_valid_);
-
-  auto ret = Z_OK;
-
-  do {
-    constexpr size_t max_avail_in =
-        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
-
-    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
-        (std::min)(data_length, max_avail_in));
-    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
-
-    data_length -= strm_.avail_in;
-    data += strm_.avail_in;
-
-    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    while (strm_.avail_in > 0 && ret == Z_OK) {
-      strm_.avail_out = static_cast<uInt>(buff.size());
-      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
-
-      ret = inflate(&strm_, Z_NO_FLUSH);
-
-      assert(ret != Z_STREAM_ERROR);
-      switch (ret) {
-      case Z_NEED_DICT:
-      case Z_DATA_ERROR:
-      case Z_MEM_ERROR: inflateEnd(&strm_); return false;
-      }
-
-      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
-        return false;
-      }
-    }
-
-    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
-
-  } while (data_length > 0);
-
-  return true;
-}
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-inline brotli_compressor::brotli_compressor() {
-  state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
-}
-
-inline brotli_compressor::~brotli_compressor() {
-  BrotliEncoderDestroyInstance(state_);
-}
-
-inline bool brotli_compressor::compress(const char *data, size_t data_length,
-                                        bool last, Callback callback) {
-  std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-
-  auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
-  auto available_in = data_length;
-  auto next_in = reinterpret_cast<const uint8_t *>(data);
-
-  for (;;) {
-    if (last) {
-      if (BrotliEncoderIsFinished(state_)) { break; }
-    } else {
-      if (!available_in) { break; }
-    }
-
-    auto available_out = buff.size();
-    auto next_out = buff.data();
-
-    if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in,
-                                     &available_out, &next_out, nullptr)) {
-      return false;
-    }
-
-    auto output_bytes = buff.size() - available_out;
-    if (output_bytes) {
-      callback(reinterpret_cast<const char *>(buff.data()), output_bytes);
-    }
-  }
-
-  return true;
-}
-
-inline brotli_decompressor::brotli_decompressor() {
-  decoder_s = BrotliDecoderCreateInstance(0, 0, 0);
-  decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT
-                        : BROTLI_DECODER_RESULT_ERROR;
-}
-
-inline brotli_decompressor::~brotli_decompressor() {
-  if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); }
-}
-
-inline bool brotli_decompressor::is_valid() const { return decoder_s; }
-
-inline bool brotli_decompressor::decompress(const char *data,
-                                            size_t data_length,
-                                            Callback callback) {
-  if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
-      decoder_r == BROTLI_DECODER_RESULT_ERROR) {
-    return 0;
-  }
-
-  auto next_in = reinterpret_cast<const uint8_t *>(data);
-  size_t avail_in = data_length;
-  size_t total_out;
-
-  decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
-
-  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-  while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
-    char *next_out = buff.data();
-    size_t avail_out = buff.size();
-
-    decoder_r = BrotliDecoderDecompressStream(
-        decoder_s, &avail_in, &next_in, &avail_out,
-        reinterpret_cast<uint8_t **>(&next_out), &total_out);
-
-    if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
-
-    if (!callback(buff.data(), buff.size() - avail_out)) { return false; }
-  }
-
-  return decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
-         decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
-}
-#endif
-
-inline bool has_header(const Headers &headers, const std::string &key) {
-  return headers.find(key) != headers.end();
-}
-
-inline const char *get_header_value(const Headers &headers,
-                                    const std::string &key, const char *def,
-                                    size_t id) {
-  auto rng = headers.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) { return it->second.c_str(); }
-  return def;
-}
-
-template <typename T>
-inline bool parse_header(const char *beg, const char *end, T fn) {
-  // Skip trailing spaces and tabs.
-  while (beg < end && is_space_or_tab(end[-1])) {
-    end--;
-  }
-
-  auto p = beg;
-  while (p < end && *p != ':') {
-    p++;
-  }
-
-  if (p == end) { return false; }
-
-  auto key_end = p;
-
-  if (*p++ != ':') { return false; }
-
-  while (p < end && is_space_or_tab(*p)) {
-    p++;
-  }
-
-  if (p < end) {
-    auto key_len = key_end - beg;
-    if (!key_len) { return false; }
-
-    auto key = std::string(beg, key_end);
-    auto val = case_ignore::equal(key, "Location")
-                   ? std::string(p, end)
-                   : decode_url(std::string(p, end), false);
-
-    // NOTE: From RFC 9110:
-    // Field values containing CR, LF, or NUL characters are
-    // invalid and dangerous, due to the varying ways that
-    // implementations might parse and interpret those
-    // characters; a recipient of CR, LF, or NUL within a field
-    // value MUST either reject the message or replace each of
-    // those characters with SP before further processing or
-    // forwarding of that message.
-    static const std::string CR_LF_NUL("\r\n\0", 3);
-    if (val.find_first_of(CR_LF_NUL) != std::string::npos) { return false; }
-
-    fn(key, val);
-    return true;
-  }
-
-  return false;
-}
-
-inline bool read_headers(Stream &strm, Headers &headers) {
-  const auto bufsiz = 2048;
-  char buf[bufsiz];
-  stream_line_reader line_reader(strm, buf, bufsiz);
-
-  for (;;) {
-    if (!line_reader.getline()) { return false; }
-
-    // Check if the line ends with CRLF.
-    auto line_terminator_len = 2;
-    if (line_reader.end_with_crlf()) {
-      // Blank line indicates end of headers.
-      if (line_reader.size() == 2) { break; }
-    } else {
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-      // Blank line indicates end of headers.
-      if (line_reader.size() == 1) { break; }
-      line_terminator_len = 1;
-#else
-      continue; // Skip invalid line.
-#endif
-    }
-
-    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-
-    // Exclude line terminator
-    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
-
-    if (!parse_header(line_reader.ptr(), end,
-                      [&](const std::string &key, std::string &val) {
-                        headers.emplace(key, val);
-                      })) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-inline bool read_content_with_length(Stream &strm, uint64_t len,
-                                     Progress progress,
-                                     ContentReceiverWithProgress out) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-
-  uint64_t r = 0;
-  while (r < len) {
-    auto read_len = static_cast<size_t>(len - r);
-    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
-    if (n <= 0) { return false; }
-
-    if (!out(buf, static_cast<size_t>(n), r, len)) { return false; }
-    r += static_cast<uint64_t>(n);
-
-    if (progress) {
-      if (!progress(r, len)) { return false; }
-    }
-  }
-
-  return true;
-}
-
-inline void skip_content_with_length(Stream &strm, uint64_t len) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-  uint64_t r = 0;
-  while (r < len) {
-    auto read_len = static_cast<size_t>(len - r);
-    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
-    if (n <= 0) { return; }
-    r += static_cast<uint64_t>(n);
-  }
-}
-
-inline bool read_content_without_length(Stream &strm,
-                                        ContentReceiverWithProgress out) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-  uint64_t r = 0;
-  for (;;) {
-    auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
-    if (n <= 0) { return true; }
-
-    if (!out(buf, static_cast<size_t>(n), r, 0)) { return false; }
-    r += static_cast<uint64_t>(n);
-  }
-
-  return true;
-}
-
-template <typename T>
-inline bool read_content_chunked(Stream &strm, T &x,
-                                 ContentReceiverWithProgress out) {
-  const auto bufsiz = 16;
-  char buf[bufsiz];
-
-  stream_line_reader line_reader(strm, buf, bufsiz);
-
-  if (!line_reader.getline()) { return false; }
-
-  unsigned long chunk_len;
-  while (true) {
-    char *end_ptr;
-
-    chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16);
-
-    if (end_ptr == line_reader.ptr()) { return false; }
-    if (chunk_len == ULONG_MAX) { return false; }
-
-    if (chunk_len == 0) { break; }
-
-    if (!read_content_with_length(strm, chunk_len, nullptr, out)) {
-      return false;
-    }
-
-    if (!line_reader.getline()) { return false; }
-
-    if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; }
-
-    if (!line_reader.getline()) { return false; }
-  }
-
-  assert(chunk_len == 0);
-
-  // NOTE: In RFC 9112, '7.1 Chunked Transfer Coding' mentiones "The chunked
-  // transfer coding is complete when a chunk with a chunk-size of zero is
-  // received, possibly followed by a trailer section, and finally terminated by
-  // an empty line". https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1
-  //
-  // In '7.1.3. Decoding Chunked', however, the pseudo-code in the section
-  // does't care for the existence of the final CRLF. In other words, it seems
-  // to be ok whether the final CRLF exists or not in the chunked data.
-  // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1.3
-  //
-  // According to the reference code in RFC 9112, cpp-htpplib now allows
-  // chuncked transfer coding data without the final CRLF.
-  if (!line_reader.getline()) { return true; }
-
-  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
-    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-
-    // Exclude line terminator
-    constexpr auto line_terminator_len = 2;
-    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
-
-    parse_header(line_reader.ptr(), end,
-                 [&](const std::string &key, const std::string &val) {
-                   x.headers.emplace(key, val);
-                 });
-
-    if (!line_reader.getline()) { return false; }
-  }
-
-  return true;
-}
-
-inline bool is_chunked_transfer_encoding(const Headers &headers) {
-  return case_ignore::equal(
-      get_header_value(headers, "Transfer-Encoding", "", 0), "chunked");
-}
-
-template <typename T, typename U>
-bool prepare_content_receiver(T &x, int &status,
-                              ContentReceiverWithProgress receiver,
-                              bool decompress, U callback) {
-  if (decompress) {
-    std::string encoding = x.get_header_value("Content-Encoding");
-    std::unique_ptr<decompressor> decompressor;
-
-    if (encoding == "gzip" || encoding == "deflate") {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-      decompressor = detail::make_unique<gzip_decompressor>();
-#else
-      status = StatusCode::UnsupportedMediaType_415;
-      return false;
-#endif
-    } else if (encoding.find("br") != std::string::npos) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-      decompressor = detail::make_unique<brotli_decompressor>();
-#else
-      status = StatusCode::UnsupportedMediaType_415;
-      return false;
-#endif
-    }
-
-    if (decompressor) {
-      if (decompressor->is_valid()) {
-        ContentReceiverWithProgress out = [&](const char *buf, size_t n,
-                                              uint64_t off, uint64_t len) {
-          return decompressor->decompress(buf, n,
-                                          [&](const char *buf2, size_t n2) {
-                                            return receiver(buf2, n2, off, len);
-                                          });
-        };
-        return callback(std::move(out));
-      } else {
-        status = StatusCode::InternalServerError_500;
-        return false;
-      }
-    }
-  }
-
-  ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off,
-                                        uint64_t len) {
-    return receiver(buf, n, off, len);
-  };
-  return callback(std::move(out));
-}
-
-template <typename T>
-bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
-                  Progress progress, ContentReceiverWithProgress receiver,
-                  bool decompress) {
-  return prepare_content_receiver(
-      x, status, std::move(receiver), decompress,
-      [&](const ContentReceiverWithProgress &out) {
-        auto ret = true;
-        auto exceed_payload_max_length = false;
-
-        if (is_chunked_transfer_encoding(x.headers)) {
-          ret = read_content_chunked(strm, x, out);
-        } else if (!has_header(x.headers, "Content-Length")) {
-          ret = read_content_without_length(strm, out);
-        } else {
-          auto len = get_header_value_u64(x.headers, "Content-Length", 0, 0);
-          if (len > payload_max_length) {
-            exceed_payload_max_length = true;
-            skip_content_with_length(strm, len);
-            ret = false;
-          } else if (len > 0) {
-            ret = read_content_with_length(strm, len, std::move(progress), out);
-          }
-        }
-
-        if (!ret) {
-          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
-                                             : StatusCode::BadRequest_400;
-        }
-        return ret;
-      });
-}
-
-inline ssize_t write_request_line(Stream &strm, const std::string &method,
-                                  const std::string &path) {
-  std::string s = method;
-  s += " ";
-  s += path;
-  s += " HTTP/1.1\r\n";
-  return strm.write(s.data(), s.size());
-}
-
-inline ssize_t write_response_line(Stream &strm, int status) {
-  std::string s = "HTTP/1.1 ";
-  s += std::to_string(status);
-  s += " ";
-  s += httplib::status_message(status);
-  s += "\r\n";
-  return strm.write(s.data(), s.size());
-}
-
-inline ssize_t write_headers(Stream &strm, const Headers &headers) {
-  ssize_t write_len = 0;
-  for (const auto &x : headers) {
-    std::string s;
-    s = x.first;
-    s += ": ";
-    s += x.second;
-    s += "\r\n";
-
-    auto len = strm.write(s.data(), s.size());
-    if (len < 0) { return len; }
-    write_len += len;
-  }
-  auto len = strm.write("\r\n");
-  if (len < 0) { return len; }
-  write_len += len;
-  return write_len;
-}
-
-inline bool write_data(Stream &strm, const char *d, size_t l) {
-  size_t offset = 0;
-  while (offset < l) {
-    auto length = strm.write(d + offset, l - offset);
-    if (length < 0) { return false; }
-    offset += static_cast<size_t>(length);
-  }
-  return true;
-}
-
-template <typename T>
-inline bool write_content(Stream &strm, const ContentProvider &content_provider,
-                          size_t offset, size_t length, T is_shutting_down,
-                          Error &error) {
-  size_t end_offset = offset + length;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      if (strm.is_writable() && write_data(strm, d, l)) {
-        offset += l;
-      } else {
-        ok = false;
-      }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  while (offset < end_offset && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      error = Error::Write;
-      return false;
-    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
-      error = Error::Canceled;
-      return false;
-    } else if (!ok) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  error = Error::Success;
-  return true;
-}
-
-template <typename T>
-inline bool write_content(Stream &strm, const ContentProvider &content_provider,
-                          size_t offset, size_t length,
-                          const T &is_shutting_down) {
-  auto error = Error::Success;
-  return write_content(strm, content_provider, offset, length, is_shutting_down,
-                       error);
-}
-
-template <typename T>
-inline bool
-write_content_without_length(Stream &strm,
-                             const ContentProvider &content_provider,
-                             const T &is_shutting_down) {
-  size_t offset = 0;
-  auto data_available = true;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      offset += l;
-      if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  data_sink.done = [&](void) { data_available = false; };
-
-  while (data_available && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      return false;
-    } else if (!content_provider(offset, 0, data_sink)) {
-      return false;
-    } else if (!ok) {
-      return false;
-    }
-  }
-  return true;
-}
-
-template <typename T, typename U>
-inline bool
-write_content_chunked(Stream &strm, const ContentProvider &content_provider,
-                      const T &is_shutting_down, U &compressor, Error &error) {
-  size_t offset = 0;
-  auto data_available = true;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      data_available = l > 0;
-      offset += l;
-
-      std::string payload;
-      if (compressor.compress(d, l, false,
-                              [&](const char *data, size_t data_len) {
-                                payload.append(data, data_len);
-                                return true;
-                              })) {
-        if (!payload.empty()) {
-          // Emit chunked response header and footer for each chunk
-          auto chunk =
-              from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-          if (!strm.is_writable() ||
-              !write_data(strm, chunk.data(), chunk.size())) {
-            ok = false;
-          }
-        }
-      } else {
-        ok = false;
-      }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  auto done_with_trailer = [&](const Headers *trailer) {
-    if (!ok) { return; }
-
-    data_available = false;
-
-    std::string payload;
-    if (!compressor.compress(nullptr, 0, true,
-                             [&](const char *data, size_t data_len) {
-                               payload.append(data, data_len);
-                               return true;
-                             })) {
-      ok = false;
-      return;
-    }
-
-    if (!payload.empty()) {
-      // Emit chunked response header and footer for each chunk
-      auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-      if (!strm.is_writable() ||
-          !write_data(strm, chunk.data(), chunk.size())) {
-        ok = false;
-        return;
-      }
-    }
-
-    static const std::string done_marker("0\r\n");
-    if (!write_data(strm, done_marker.data(), done_marker.size())) {
-      ok = false;
-    }
-
-    // Trailer
-    if (trailer) {
-      for (const auto &kv : *trailer) {
-        std::string field_line = kv.first + ": " + kv.second + "\r\n";
-        if (!write_data(strm, field_line.data(), field_line.size())) {
-          ok = false;
-        }
-      }
-    }
-
-    static const std::string crlf("\r\n");
-    if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
-  };
-
-  data_sink.done = [&](void) { done_with_trailer(nullptr); };
-
-  data_sink.done_with_trailer = [&](const Headers &trailer) {
-    done_with_trailer(&trailer);
-  };
-
-  while (data_available && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      error = Error::Write;
-      return false;
-    } else if (!content_provider(offset, 0, data_sink)) {
-      error = Error::Canceled;
-      return false;
-    } else if (!ok) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  error = Error::Success;
-  return true;
-}
-
-template <typename T, typename U>
-inline bool write_content_chunked(Stream &strm,
-                                  const ContentProvider &content_provider,
-                                  const T &is_shutting_down, U &compressor) {
-  auto error = Error::Success;
-  return write_content_chunked(strm, content_provider, is_shutting_down,
-                               compressor, error);
-}
-
-template <typename T>
-inline bool redirect(T &cli, Request &req, Response &res,
-                     const std::string &path, const std::string &location,
-                     Error &error) {
-  Request new_req = req;
-  new_req.path = path;
-  new_req.redirect_count_ -= 1;
-
-  if (res.status == StatusCode::SeeOther_303 &&
-      (req.method != "GET" && req.method != "HEAD")) {
-    new_req.method = "GET";
-    new_req.body.clear();
-    new_req.headers.clear();
-  }
-
-  Response new_res;
-
-  auto ret = cli.send(new_req, new_res, error);
-  if (ret) {
-    req = new_req;
-    res = new_res;
-
-    if (res.location.empty()) { res.location = location; }
-  }
-  return ret;
-}
-
-inline std::string params_to_query_str(const Params &params) {
-  std::string query;
-
-  for (auto it = params.begin(); it != params.end(); ++it) {
-    if (it != params.begin()) { query += "&"; }
-    query += it->first;
-    query += "=";
-    query += encode_query_param(it->second);
-  }
-  return query;
-}
-
-inline void parse_query_text(const char *data, std::size_t size,
-                             Params &params) {
-  std::set<std::string> cache;
-  split(data, data + size, '&', [&](const char *b, const char *e) {
-    std::string kv(b, e);
-    if (cache.find(kv) != cache.end()) { return; }
-    cache.insert(std::move(kv));
-
-    std::string key;
-    std::string val;
-    divide(b, static_cast<std::size_t>(e - b), '=',
-           [&](const char *lhs_data, std::size_t lhs_size, const char *rhs_data,
-               std::size_t rhs_size) {
-             key.assign(lhs_data, lhs_size);
-             val.assign(rhs_data, rhs_size);
-           });
-
-    if (!key.empty()) {
-      params.emplace(decode_url(key, true), decode_url(val, true));
-    }
-  });
-}
-
-inline void parse_query_text(const std::string &s, Params &params) {
-  parse_query_text(s.data(), s.size(), params);
-}
-
-inline bool parse_multipart_boundary(const std::string &content_type,
-                                     std::string &boundary) {
-  auto boundary_keyword = "boundary=";
-  auto pos = content_type.find(boundary_keyword);
-  if (pos == std::string::npos) { return false; }
-  auto end = content_type.find(';', pos);
-  auto beg = pos + strlen(boundary_keyword);
-  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
-  return !boundary.empty();
-}
-
-inline void parse_disposition_params(const std::string &s, Params &params) {
-  std::set<std::string> cache;
-  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
-    std::string kv(b, e);
-    if (cache.find(kv) != cache.end()) { return; }
-    cache.insert(kv);
-
-    std::string key;
-    std::string val;
-    split(b, e, '=', [&](const char *b2, const char *e2) {
-      if (key.empty()) {
-        key.assign(b2, e2);
-      } else {
-        val.assign(b2, e2);
-      }
-    });
-
-    if (!key.empty()) {
-      params.emplace(trim_double_quotes_copy((key)),
-                     trim_double_quotes_copy((val)));
-    }
-  });
-}
-
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-inline bool parse_range_header(const std::string &s, Ranges &ranges) {
-#else
-inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
-#endif
-  auto is_valid = [](const std::string &str) {
-    return std::all_of(str.cbegin(), str.cend(),
-                       [](unsigned char c) { return std::isdigit(c); });
-  };
-
-  if (s.size() > 7 && s.compare(0, 6, "bytes=") == 0) {
-    const auto pos = static_cast<size_t>(6);
-    const auto len = static_cast<size_t>(s.size() - 6);
-    auto all_valid_ranges = true;
-    split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
-      if (!all_valid_ranges) { return; }
-
-      const auto it = std::find(b, e, '-');
-      if (it == e) {
-        all_valid_ranges = false;
-        return;
-      }
-
-      const auto lhs = std::string(b, it);
-      const auto rhs = std::string(it + 1, e);
-      if (!is_valid(lhs) || !is_valid(rhs)) {
-        all_valid_ranges = false;
-        return;
-      }
-
-      const auto first =
-          static_cast<ssize_t>(lhs.empty() ? -1 : std::stoll(lhs));
-      const auto last =
-          static_cast<ssize_t>(rhs.empty() ? -1 : std::stoll(rhs));
-      if ((first == -1 && last == -1) ||
-          (first != -1 && last != -1 && first > last)) {
-        all_valid_ranges = false;
-        return;
-      }
-
-      ranges.emplace_back(first, last);
-    });
-    return all_valid_ranges && !ranges.empty();
-  }
-  return false;
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-}
-#else
-} catch (...) { return false; }
-#endif
-
-class MultipartFormDataParser {
-public:
-  MultipartFormDataParser() = default;
-
-  void set_boundary(std::string &&boundary) {
-    boundary_ = boundary;
-    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
-    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
-  }
-
-  bool is_valid() const { return is_valid_; }
-
-  bool parse(const char *buf, size_t n, const ContentReceiver &content_callback,
-             const MultipartContentHeader &header_callback) {
-
-    buf_append(buf, n);
-
-    while (buf_size() > 0) {
-      switch (state_) {
-      case 0: { // Initial boundary
-        buf_erase(buf_find(dash_boundary_crlf_));
-        if (dash_boundary_crlf_.size() > buf_size()) { return true; }
-        if (!buf_start_with(dash_boundary_crlf_)) { return false; }
-        buf_erase(dash_boundary_crlf_.size());
-        state_ = 1;
-        break;
-      }
-      case 1: { // New entry
-        clear_file_info();
-        state_ = 2;
-        break;
-      }
-      case 2: { // Headers
-        auto pos = buf_find(crlf_);
-        if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-        while (pos < buf_size()) {
-          // Empty line
-          if (pos == 0) {
-            if (!header_callback(file_)) {
-              is_valid_ = false;
-              return false;
-            }
-            buf_erase(crlf_.size());
-            state_ = 3;
-            break;
-          }
-
-          const auto header = buf_head(pos);
-
-          if (!parse_header(header.data(), header.data() + header.size(),
-                            [&](const std::string &, const std::string &) {})) {
-            is_valid_ = false;
-            return false;
-          }
-
-          static const std::string header_content_type = "Content-Type:";
-
-          if (start_with_case_ignore(header, header_content_type)) {
-            file_.content_type =
-                trim_copy(header.substr(header_content_type.size()));
-          } else {
-            static const std::regex re_content_disposition(
-                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
-                std::regex_constants::icase);
-
-            std::smatch m;
-            if (std::regex_match(header, m, re_content_disposition)) {
-              Params params;
-              parse_disposition_params(m[1], params);
-
-              auto it = params.find("name");
-              if (it != params.end()) {
-                file_.name = it->second;
-              } else {
-                is_valid_ = false;
-                return false;
-              }
-
-              it = params.find("filename");
-              if (it != params.end()) { file_.filename = it->second; }
-
-              it = params.find("filename*");
-              if (it != params.end()) {
-                // Only allow UTF-8 enconnding...
-                static const std::regex re_rfc5987_encoding(
-                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
-
-                std::smatch m2;
-                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
-                  file_.filename = decode_url(m2[1], false); // override...
-                } else {
-                  is_valid_ = false;
-                  return false;
-                }
-              }
-            }
-          }
-          buf_erase(pos + crlf_.size());
-          pos = buf_find(crlf_);
-        }
-        if (state_ != 3) { return true; }
-        break;
-      }
-      case 3: { // Body
-        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
-        auto pos = buf_find(crlf_dash_boundary_);
-        if (pos < buf_size()) {
-          if (!content_callback(buf_data(), pos)) {
-            is_valid_ = false;
-            return false;
-          }
-          buf_erase(pos + crlf_dash_boundary_.size());
-          state_ = 4;
-        } else {
-          auto len = buf_size() - crlf_dash_boundary_.size();
-          if (len > 0) {
-            if (!content_callback(buf_data(), len)) {
-              is_valid_ = false;
-              return false;
-            }
-            buf_erase(len);
-          }
-          return true;
-        }
-        break;
-      }
-      case 4: { // Boundary
-        if (crlf_.size() > buf_size()) { return true; }
-        if (buf_start_with(crlf_)) {
-          buf_erase(crlf_.size());
-          state_ = 1;
-        } else {
-          if (dash_.size() > buf_size()) { return true; }
-          if (buf_start_with(dash_)) {
-            buf_erase(dash_.size());
-            is_valid_ = true;
-            buf_erase(buf_size()); // Remove epilogue
-          } else {
-            return true;
-          }
-        }
-        break;
-      }
-      }
-    }
-
-    return true;
-  }
-
-private:
-  void clear_file_info() {
-    file_.name.clear();
-    file_.filename.clear();
-    file_.content_type.clear();
-  }
-
-  bool start_with_case_ignore(const std::string &a,
-                              const std::string &b) const {
-    if (a.size() < b.size()) { return false; }
-    for (size_t i = 0; i < b.size(); i++) {
-      if (case_ignore::to_lower(a[i]) != case_ignore::to_lower(b[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  const std::string dash_ = "--";
-  const std::string crlf_ = "\r\n";
-  std::string boundary_;
-  std::string dash_boundary_crlf_;
-  std::string crlf_dash_boundary_;
-
-  size_t state_ = 0;
-  bool is_valid_ = false;
-  MultipartFormData file_;
-
-  // Buffer
-  bool start_with(const std::string &a, size_t spos, size_t epos,
-                  const std::string &b) const {
-    if (epos - spos < b.size()) { return false; }
-    for (size_t i = 0; i < b.size(); i++) {
-      if (a[i + spos] != b[i]) { return false; }
-    }
-    return true;
-  }
-
-  size_t buf_size() const { return buf_epos_ - buf_spos_; }
-
-  const char *buf_data() const { return &buf_[buf_spos_]; }
-
-  std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); }
-
-  bool buf_start_with(const std::string &s) const {
-    return start_with(buf_, buf_spos_, buf_epos_, s);
-  }
-
-  size_t buf_find(const std::string &s) const {
-    auto c = s.front();
-
-    size_t off = buf_spos_;
-    while (off < buf_epos_) {
-      auto pos = off;
-      while (true) {
-        if (pos == buf_epos_) { return buf_size(); }
-        if (buf_[pos] == c) { break; }
-        pos++;
-      }
-
-      auto remaining_size = buf_epos_ - pos;
-      if (s.size() > remaining_size) { return buf_size(); }
-
-      if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; }
-
-      off = pos + 1;
-    }
-
-    return buf_size();
-  }
-
-  void buf_append(const char *data, size_t n) {
-    auto remaining_size = buf_size();
-    if (remaining_size > 0 && buf_spos_ > 0) {
-      for (size_t i = 0; i < remaining_size; i++) {
-        buf_[i] = buf_[buf_spos_ + i];
-      }
-    }
-    buf_spos_ = 0;
-    buf_epos_ = remaining_size;
-
-    if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); }
-
-    for (size_t i = 0; i < n; i++) {
-      buf_[buf_epos_ + i] = data[i];
-    }
-    buf_epos_ += n;
-  }
-
-  void buf_erase(size_t size) { buf_spos_ += size; }
-
-  std::string buf_;
-  size_t buf_spos_ = 0;
-  size_t buf_epos_ = 0;
-};
-
-inline std::string random_string(size_t length) {
-  static const char data[] =
-      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-  // std::random_device might actually be deterministic on some
-  // platforms, but due to lack of support in the c++ standard library,
-  // doing better requires either some ugly hacks or breaking portability.
-  static std::random_device seed_gen;
-
-  // Request 128 bits of entropy for initialization
-  static std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(),
-                                     seed_gen()};
-
-  static std::mt19937 engine(seed_sequence);
-
-  std::string result;
-  for (size_t i = 0; i < length; i++) {
-    result += data[engine() % (sizeof(data) - 1)];
-  }
-  return result;
-}
-
-inline std::string make_multipart_data_boundary() {
-  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
-}
-
-inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
-  auto valid = true;
-  for (size_t i = 0; i < boundary.size(); i++) {
-    auto c = boundary[i];
-    if (!std::isalnum(c) && c != '-' && c != '_') {
-      valid = false;
-      break;
-    }
-  }
-  return valid;
-}
-
-template <typename T>
-inline std::string
-serialize_multipart_formdata_item_begin(const T &item,
-                                        const std::string &boundary) {
-  std::string body = "--" + boundary + "\r\n";
-  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
-  if (!item.filename.empty()) {
-    body += "; filename=\"" + item.filename + "\"";
-  }
-  body += "\r\n";
-  if (!item.content_type.empty()) {
-    body += "Content-Type: " + item.content_type + "\r\n";
-  }
-  body += "\r\n";
-
-  return body;
-}
-
-inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
-
-inline std::string
-serialize_multipart_formdata_finish(const std::string &boundary) {
-  return "--" + boundary + "--\r\n";
-}
-
-inline std::string
-serialize_multipart_formdata_get_content_type(const std::string &boundary) {
-  return "multipart/form-data; boundary=" + boundary;
-}
-
-inline std::string
-serialize_multipart_formdata(const MultipartFormDataItems &items,
-                             const std::string &boundary, bool finish = true) {
-  std::string body;
-
-  for (const auto &item : items) {
-    body += serialize_multipart_formdata_item_begin(item, boundary);
-    body += item.content + serialize_multipart_formdata_item_end();
-  }
-
-  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
-
-  return body;
-}
-
-inline bool range_error(Request &req, Response &res) {
-  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
-    ssize_t contant_len = static_cast<ssize_t>(
-        res.content_length_ ? res.content_length_ : res.body.size());
-
-    ssize_t prev_first_pos = -1;
-    ssize_t prev_last_pos = -1;
-    size_t overwrapping_count = 0;
-
-    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
-    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
-    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
-
-    // Too many ranges
-    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
-
-    for (auto &r : req.ranges) {
-      auto &first_pos = r.first;
-      auto &last_pos = r.second;
-
-      if (first_pos == -1 && last_pos == -1) {
-        first_pos = 0;
-        last_pos = contant_len;
-      }
-
-      if (first_pos == -1) {
-        first_pos = contant_len - last_pos;
-        last_pos = contant_len - 1;
-      }
-
-      if (last_pos == -1) { last_pos = contant_len - 1; }
-
-      // Range must be within content length
-      if (!(0 <= first_pos && first_pos <= last_pos &&
-            last_pos <= contant_len - 1)) {
-        return true;
-      }
-
-      // Ranges must be in ascending order
-      if (first_pos <= prev_first_pos) { return true; }
-
-      // Request must not have more than two overlapping ranges
-      if (first_pos <= prev_last_pos) {
-        overwrapping_count++;
-        if (overwrapping_count > 2) { return true; }
-      }
-
-      prev_first_pos = (std::max)(prev_first_pos, first_pos);
-      prev_last_pos = (std::max)(prev_last_pos, last_pos);
-    }
-  }
-
-  return false;
-}
-
-inline std::pair<size_t, size_t>
-get_range_offset_and_length(Range r, size_t content_length) {
-  assert(r.first != -1 && r.second != -1);
-  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
-  assert(r.first <= r.second &&
-         r.second < static_cast<ssize_t>(content_length));
-  (void)(content_length);
-  return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
-}
-
-inline std::string make_content_range_header_field(
-    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
-  auto st = offset_and_length.first;
-  auto ed = st + offset_and_length.second - 1;
-
-  std::string field = "bytes ";
-  field += std::to_string(st);
-  field += "-";
-  field += std::to_string(ed);
-  field += "/";
-  field += std::to_string(content_length);
-  return field;
-}
-
-template <typename SToken, typename CToken, typename Content>
-bool process_multipart_ranges_data(const Request &req,
-                                   const std::string &boundary,
-                                   const std::string &content_type,
-                                   size_t content_length, SToken stoken,
-                                   CToken ctoken, Content content) {
-  for (size_t i = 0; i < req.ranges.size(); i++) {
-    ctoken("--");
-    stoken(boundary);
-    ctoken("\r\n");
-    if (!content_type.empty()) {
-      ctoken("Content-Type: ");
-      stoken(content_type);
-      ctoken("\r\n");
-    }
-
-    auto offset_and_length =
-        get_range_offset_and_length(req.ranges[i], content_length);
-
-    ctoken("Content-Range: ");
-    stoken(make_content_range_header_field(offset_and_length, content_length));
-    ctoken("\r\n");
-    ctoken("\r\n");
-
-    if (!content(offset_and_length.first, offset_and_length.second)) {
-      return false;
-    }
-    ctoken("\r\n");
-  }
-
-  ctoken("--");
-  stoken(boundary);
-  ctoken("--");
-
-  return true;
-}
-
-inline void make_multipart_ranges_data(const Request &req, Response &res,
-                                       const std::string &boundary,
-                                       const std::string &content_type,
-                                       size_t content_length,
-                                       std::string &data) {
-  process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { data += token; },
-      [&](const std::string &token) { data += token; },
-      [&](size_t offset, size_t length) {
-        assert(offset + length <= content_length);
-        data += res.body.substr(offset, length);
-        return true;
-      });
-}
-
-inline size_t get_multipart_ranges_data_length(const Request &req,
-                                               const std::string &boundary,
-                                               const std::string &content_type,
-                                               size_t content_length) {
-  size_t data_length = 0;
-
-  process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { data_length += token.size(); },
-      [&](const std::string &token) { data_length += token.size(); },
-      [&](size_t /*offset*/, size_t length) {
-        data_length += length;
-        return true;
-      });
-
-  return data_length;
-}
-
-template <typename T>
-inline bool
-write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
-                            const std::string &boundary,
-                            const std::string &content_type,
-                            size_t content_length, const T &is_shutting_down) {
-  return process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { strm.write(token); },
-      [&](const std::string &token) { strm.write(token); },
-      [&](size_t offset, size_t length) {
-        return write_content(strm, res.content_provider_, offset, length,
-                             is_shutting_down);
-      });
-}
-
-inline bool expect_content(const Request &req) {
-  if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
-      req.method == "PRI" || req.method == "DELETE") {
-    return true;
-  }
-  // TODO: check if Content-Length is set
-  return false;
-}
-
-inline bool has_crlf(const std::string &s) {
-  auto p = s.c_str();
-  while (*p) {
-    if (*p == '\r' || *p == '\n') { return true; }
-    p++;
-  }
-  return false;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
-  auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>(
-      EVP_MD_CTX_new(), EVP_MD_CTX_free);
-
-  unsigned int hash_length = 0;
-  unsigned char hash[EVP_MAX_MD_SIZE];
-
-  EVP_DigestInit_ex(context.get(), algo, nullptr);
-  EVP_DigestUpdate(context.get(), s.c_str(), s.size());
-  EVP_DigestFinal_ex(context.get(), hash, &hash_length);
-
-  std::stringstream ss;
-  for (auto i = 0u; i < hash_length; ++i) {
-    ss << std::hex << std::setw(2) << std::setfill('0')
-       << static_cast<unsigned int>(hash[i]);
-  }
-
-  return ss.str();
-}
-
-inline std::string MD5(const std::string &s) {
-  return message_digest(s, EVP_md5());
-}
-
-inline std::string SHA_256(const std::string &s) {
-  return message_digest(s, EVP_sha256());
-}
-
-inline std::string SHA_512(const std::string &s) {
-  return message_digest(s, EVP_sha512());
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-#ifdef _WIN32
-// NOTE: This code came up with the following stackoverflow post:
-// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
-inline bool load_system_certs_on_windows(X509_STORE *store) {
-  auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
-  if (!hStore) { return false; }
-
-  auto result = false;
-  PCCERT_CONTEXT pContext = NULL;
-  while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
-         nullptr) {
-    auto encoded_cert =
-        static_cast<const unsigned char *>(pContext->pbCertEncoded);
-
-    auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded);
-    if (x509) {
-      X509_STORE_add_cert(store, x509);
-      X509_free(x509);
-      result = true;
-    }
-  }
-
-  CertFreeCertificateContext(pContext);
-  CertCloseStore(hStore, 0);
-
-  return result;
-}
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#if TARGET_OS_OSX
-template <typename T>
-using CFObjectPtr =
-    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
-
-inline void cf_object_ptr_deleter(CFTypeRef obj) {
-  if (obj) { CFRelease(obj); }
-}
-
-inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
-  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
-  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
-                        kCFBooleanTrue};
-
-  CFObjectPtr<CFDictionaryRef> query(
-      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
-                         sizeof(keys) / sizeof(keys[0]),
-                         &kCFTypeDictionaryKeyCallBacks,
-                         &kCFTypeDictionaryValueCallBacks),
-      cf_object_ptr_deleter);
-
-  if (!query) { return false; }
-
-  CFTypeRef security_items = nullptr;
-  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
-      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
-    return false;
-  }
-
-  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
-  return true;
-}
-
-inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
-  CFArrayRef root_security_items = nullptr;
-  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
-    return false;
-  }
-
-  certs.reset(root_security_items);
-  return true;
-}
-
-inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
-  auto result = false;
-  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
-    const auto cert = reinterpret_cast<const __SecCertificate *>(
-        CFArrayGetValueAtIndex(certs, i));
-
-    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
-
-    CFDataRef cert_data = nullptr;
-    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
-        errSecSuccess) {
-      continue;
-    }
-
-    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
-
-    auto encoded_cert = static_cast<const unsigned char *>(
-        CFDataGetBytePtr(cert_data_ptr.get()));
-
-    auto x509 =
-        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
-
-    if (x509) {
-      X509_STORE_add_cert(store, x509);
-      X509_free(x509);
-      result = true;
-    }
-  }
-
-  return result;
-}
-
-inline bool load_system_certs_on_macos(X509_STORE *store) {
-  auto result = false;
-  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
-  if (retrieve_certs_from_keychain(certs) && certs) {
-    result = add_certs_to_x509_store(certs.get(), store);
-  }
-
-  if (retrieve_root_certs_from_keychain(certs) && certs) {
-    result = add_certs_to_x509_store(certs.get(), store) || result;
-  }
-
-  return result;
-}
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-#endif // CPPHTTPLIB_OPENSSL_SUPPORT
-
-#ifdef _WIN32
-class WSInit {
-public:
-  WSInit() {
-    WSADATA wsaData;
-    if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true;
-  }
-
-  ~WSInit() {
-    if (is_valid_) WSACleanup();
-  }
-
-  bool is_valid_ = false;
-};
-
-static WSInit wsinit_;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline std::pair<std::string, std::string> make_digest_authentication_header(
-    const Request &req, const std::map<std::string, std::string> &auth,
-    size_t cnonce_count, const std::string &cnonce, const std::string &username,
-    const std::string &password, bool is_proxy = false) {
-  std::string nc;
-  {
-    std::stringstream ss;
-    ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count;
-    nc = ss.str();
-  }
-
-  std::string qop;
-  if (auth.find("qop") != auth.end()) {
-    qop = auth.at("qop");
-    if (qop.find("auth-int") != std::string::npos) {
-      qop = "auth-int";
-    } else if (qop.find("auth") != std::string::npos) {
-      qop = "auth";
-    } else {
-      qop.clear();
-    }
-  }
-
-  std::string algo = "MD5";
-  if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); }
-
-  std::string response;
-  {
-    auto H = algo == "SHA-256"   ? detail::SHA_256
-             : algo == "SHA-512" ? detail::SHA_512
-                                 : detail::MD5;
-
-    auto A1 = username + ":" + auth.at("realm") + ":" + password;
-
-    auto A2 = req.method + ":" + req.path;
-    if (qop == "auth-int") { A2 += ":" + H(req.body); }
-
-    if (qop.empty()) {
-      response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2));
-    } else {
-      response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce +
-                   ":" + qop + ":" + H(A2));
-    }
-  }
-
-  auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : "";
-
-  auto field = "Digest username=\"" + username + "\", realm=\"" +
-               auth.at("realm") + "\", nonce=\"" + auth.at("nonce") +
-               "\", uri=\"" + req.path + "\", algorithm=" + algo +
-               (qop.empty() ? ", response=\""
-                            : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" +
-                                  cnonce + "\", response=\"") +
-               response + "\"" +
-               (opaque.empty() ? "" : ", opaque=\"" + opaque + "\"");
-
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, field);
-}
-#endif
-
-inline bool parse_www_authenticate(const Response &res,
-                                   std::map<std::string, std::string> &auth,
-                                   bool is_proxy) {
-  auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
-  if (res.has_header(auth_key)) {
-    static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
-    auto s = res.get_header_value(auth_key);
-    auto pos = s.find(' ');
-    if (pos != std::string::npos) {
-      auto type = s.substr(0, pos);
-      if (type == "Basic") {
-        return false;
-      } else if (type == "Digest") {
-        s = s.substr(pos + 1);
-        auto beg = std::sregex_iterator(s.begin(), s.end(), re);
-        for (auto i = beg; i != std::sregex_iterator(); ++i) {
-          const auto &m = *i;
-          auto key = s.substr(static_cast<size_t>(m.position(1)),
-                              static_cast<size_t>(m.length(1)));
-          auto val = m.length(2) > 0
-                         ? s.substr(static_cast<size_t>(m.position(2)),
-                                    static_cast<size_t>(m.length(2)))
-                         : s.substr(static_cast<size_t>(m.position(3)),
-                                    static_cast<size_t>(m.length(3)));
-          auth[key] = val;
-        }
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-class ContentProviderAdapter {
-public:
-  explicit ContentProviderAdapter(
-      ContentProviderWithoutLength &&content_provider)
-      : content_provider_(content_provider) {}
-
-  bool operator()(size_t offset, size_t, DataSink &sink) {
-    return content_provider_(offset, sink);
-  }
-
-private:
-  ContentProviderWithoutLength content_provider_;
-};
-
-} // namespace detail
-
-inline std::string hosted_at(const std::string &hostname) {
-  std::vector<std::string> addrs;
-  hosted_at(hostname, addrs);
-  if (addrs.empty()) { return std::string(); }
-  return addrs[0];
-}
-
-inline void hosted_at(const std::string &hostname,
-                      std::vector<std::string> &addrs) {
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) {
-#if defined __linux__ && !defined __ANDROID__
-    res_init();
-#endif
-    return;
-  }
-  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
-
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    const auto &addr =
-        *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
-    std::string ip;
-    auto dummy = -1;
-    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
-                                dummy)) {
-      addrs.push_back(ip);
-    }
-  }
-}
-
-inline std::string append_query_params(const std::string &path,
-                                       const Params &params) {
-  std::string path_with_query = path;
-  const static std::regex re("[^?]+\\?.*");
-  auto delm = std::regex_match(path, re) ? '&' : '?';
-  path_with_query += delm + detail::params_to_query_str(params);
-  return path_with_query;
-}
-
-// Header utilities
-inline std::pair<std::string, std::string>
-make_range_header(const Ranges &ranges) {
-  std::string field = "bytes=";
-  auto i = 0;
-  for (const auto &r : ranges) {
-    if (i != 0) { field += ", "; }
-    if (r.first != -1) { field += std::to_string(r.first); }
-    field += '-';
-    if (r.second != -1) { field += std::to_string(r.second); }
-    i++;
-  }
-  return std::make_pair("Range", std::move(field));
-}
-
-inline std::pair<std::string, std::string>
-make_basic_authentication_header(const std::string &username,
-                                 const std::string &password, bool is_proxy) {
-  auto field = "Basic " + detail::base64_encode(username + ":" + password);
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, std::move(field));
-}
-
-inline std::pair<std::string, std::string>
-make_bearer_token_authentication_header(const std::string &token,
-                                        bool is_proxy = false) {
-  auto field = "Bearer " + token;
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, std::move(field));
-}
-
-// Request implementation
-inline bool Request::has_header(const std::string &key) const {
-  return detail::has_header(headers, key);
-}
-
-inline std::string Request::get_header_value(const std::string &key,
-                                             const char *def, size_t id) const {
-  return detail::get_header_value(headers, key, def, id);
-}
-
-inline size_t Request::get_header_value_count(const std::string &key) const {
-  auto r = headers.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline void Request::set_header(const std::string &key,
-                                const std::string &val) {
-  if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
-    headers.emplace(key, val);
-  }
-}
-
-inline bool Request::has_param(const std::string &key) const {
-  return params.find(key) != params.end();
-}
-
-inline std::string Request::get_param_value(const std::string &key,
-                                            size_t id) const {
-  auto rng = params.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) { return it->second; }
-  return std::string();
-}
-
-inline size_t Request::get_param_value_count(const std::string &key) const {
-  auto r = params.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline bool Request::is_multipart_form_data() const {
-  const auto &content_type = get_header_value("Content-Type");
-  return !content_type.rfind("multipart/form-data", 0);
-}
-
-inline bool Request::has_file(const std::string &key) const {
-  return files.find(key) != files.end();
-}
-
-inline MultipartFormData Request::get_file_value(const std::string &key) const {
-  auto it = files.find(key);
-  if (it != files.end()) { return it->second; }
-  return MultipartFormData();
-}
-
-inline std::vector<MultipartFormData>
-Request::get_file_values(const std::string &key) const {
-  std::vector<MultipartFormData> values;
-  auto rng = files.equal_range(key);
-  for (auto it = rng.first; it != rng.second; it++) {
-    values.push_back(it->second);
-  }
-  return values;
-}
-
-// Response implementation
-inline bool Response::has_header(const std::string &key) const {
-  return headers.find(key) != headers.end();
-}
-
-inline std::string Response::get_header_value(const std::string &key,
-                                              const char *def,
-                                              size_t id) const {
-  return detail::get_header_value(headers, key, def, id);
-}
-
-inline size_t Response::get_header_value_count(const std::string &key) const {
-  auto r = headers.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline void Response::set_header(const std::string &key,
-                                 const std::string &val) {
-  if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
-    headers.emplace(key, val);
-  }
-}
-
-inline void Response::set_redirect(const std::string &url, int stat) {
-  if (!detail::has_crlf(url)) {
-    set_header("Location", url);
-    if (300 <= stat && stat < 400) {
-      this->status = stat;
-    } else {
-      this->status = StatusCode::Found_302;
-    }
-  }
-}
-
-inline void Response::set_content(const char *s, size_t n,
-                                  const std::string &content_type) {
-  body.assign(s, n);
-
-  auto rng = headers.equal_range("Content-Type");
-  headers.erase(rng.first, rng.second);
-  set_header("Content-Type", content_type);
-}
-
-inline void Response::set_content(const std::string &s,
-                                  const std::string &content_type) {
-  set_content(s.data(), s.size(), content_type);
-}
-
-inline void Response::set_content(std::string &&s,
-                                  const std::string &content_type) {
-  body = std::move(s);
-
-  auto rng = headers.equal_range("Content-Type");
-  headers.erase(rng.first, rng.second);
-  set_header("Content-Type", content_type);
-}
-
-inline void Response::set_content_provider(
-    size_t in_length, const std::string &content_type, ContentProvider provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = in_length;
-  if (in_length > 0) { content_provider_ = std::move(provider); }
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = false;
-}
-
-inline void Response::set_content_provider(
-    const std::string &content_type, ContentProviderWithoutLength provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = 0;
-  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = false;
-}
-
-inline void Response::set_chunked_content_provider(
-    const std::string &content_type, ContentProviderWithoutLength provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = 0;
-  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = true;
-}
-
-inline void Response::set_file_content(const std::string &path,
-                                       const std::string &content_type) {
-  file_content_path_ = path;
-  file_content_content_type_ = content_type;
-}
-
-inline void Response::set_file_content(const std::string &path) {
-  file_content_path_ = path;
-}
-
-// Result implementation
-inline bool Result::has_request_header(const std::string &key) const {
-  return request_headers_.find(key) != request_headers_.end();
-}
-
-inline std::string Result::get_request_header_value(const std::string &key,
-                                                    const char *def,
-                                                    size_t id) const {
-  return detail::get_header_value(request_headers_, key, def, id);
-}
-
-inline size_t
-Result::get_request_header_value_count(const std::string &key) const {
-  auto r = request_headers_.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-// Stream implementation
-inline ssize_t Stream::write(const char *ptr) {
-  return write(ptr, strlen(ptr));
-}
-
-inline ssize_t Stream::write(const std::string &s) {
-  return write(s.data(), s.size());
-}
-
-namespace detail {
-
-// Socket stream implementation
-inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec,
-                                  time_t read_timeout_usec,
-                                  time_t write_timeout_sec,
-                                  time_t write_timeout_usec)
-    : sock_(sock), read_timeout_sec_(read_timeout_sec),
-      read_timeout_usec_(read_timeout_usec),
-      write_timeout_sec_(write_timeout_sec),
-      write_timeout_usec_(write_timeout_usec), read_buff_(read_buff_size_, 0) {}
-
-inline SocketStream::~SocketStream() = default;
-
-inline bool SocketStream::is_readable() const {
-  return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
-}
-
-inline bool SocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
-         is_socket_alive(sock_);
-}
-
-inline ssize_t SocketStream::read(char *ptr, size_t size) {
-#ifdef _WIN32
-  size =
-      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
-#else
-  size = (std::min)(size,
-                    static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
-#endif
-
-  if (read_buff_off_ < read_buff_content_size_) {
-    auto remaining_size = read_buff_content_size_ - read_buff_off_;
-    if (size <= remaining_size) {
-      memcpy(ptr, read_buff_.data() + read_buff_off_, size);
-      read_buff_off_ += size;
-      return static_cast<ssize_t>(size);
-    } else {
-      memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size);
-      read_buff_off_ += remaining_size;
-      return static_cast<ssize_t>(remaining_size);
-    }
-  }
-
-  if (!is_readable()) { return -1; }
-
-  read_buff_off_ = 0;
-  read_buff_content_size_ = 0;
-
-  if (size < read_buff_size_) {
-    auto n = read_socket(sock_, read_buff_.data(), read_buff_size_,
-                         CPPHTTPLIB_RECV_FLAGS);
-    if (n <= 0) {
-      return n;
-    } else if (n <= static_cast<ssize_t>(size)) {
-      memcpy(ptr, read_buff_.data(), static_cast<size_t>(n));
-      return n;
-    } else {
-      memcpy(ptr, read_buff_.data(), size);
-      read_buff_off_ = size;
-      read_buff_content_size_ = static_cast<size_t>(n);
-      return static_cast<ssize_t>(size);
-    }
-  } else {
-    return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS);
-  }
-}
-
-inline ssize_t SocketStream::write(const char *ptr, size_t size) {
-  if (!is_writable()) { return -1; }
-
-#if defined(_WIN32) && !defined(_WIN64)
-  size =
-      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
-#endif
-
-  return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
-}
-
-inline void SocketStream::get_remote_ip_and_port(std::string &ip,
-                                                 int &port) const {
-  return detail::get_remote_ip_and_port(sock_, ip, port);
-}
-
-inline void SocketStream::get_local_ip_and_port(std::string &ip,
-                                                int &port) const {
-  return detail::get_local_ip_and_port(sock_, ip, port);
-}
-
-inline socket_t SocketStream::socket() const { return sock_; }
-
-// Buffer stream implementation
-inline bool BufferStream::is_readable() const { return true; }
-
-inline bool BufferStream::is_writable() const { return true; }
-
-inline ssize_t BufferStream::read(char *ptr, size_t size) {
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  auto len_read = buffer._Copy_s(ptr, size, size, position);
-#else
-  auto len_read = buffer.copy(ptr, size, position);
-#endif
-  position += static_cast<size_t>(len_read);
-  return static_cast<ssize_t>(len_read);
-}
-
-inline ssize_t BufferStream::write(const char *ptr, size_t size) {
-  buffer.append(ptr, size);
-  return static_cast<ssize_t>(size);
-}
-
-inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
-                                                 int & /*port*/) const {}
-
-inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
-                                                int & /*port*/) const {}
-
-inline socket_t BufferStream::socket() const { return 0; }
-
-inline const std::string &BufferStream::get_buffer() const { return buffer; }
-
-inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
-  static constexpr char marker[] = "/:";
-
-  // One past the last ending position of a path param substring
-  std::size_t last_param_end = 0;
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-  // Needed to ensure that parameter names are unique during matcher
-  // construction
-  // If exceptions are disabled, only last duplicate path
-  // parameter will be set
-  std::unordered_set<std::string> param_name_set;
-#endif
-
-  while (true) {
-    const auto marker_pos = pattern.find(
-        marker, last_param_end == 0 ? last_param_end : last_param_end - 1);
-    if (marker_pos == std::string::npos) { break; }
-
-    static_fragments_.push_back(
-        pattern.substr(last_param_end, marker_pos - last_param_end + 1));
-
-    const auto param_name_start = marker_pos + 2;
-
-    auto sep_pos = pattern.find(separator, param_name_start);
-    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
-
-    auto param_name =
-        pattern.substr(param_name_start, sep_pos - param_name_start);
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-    if (param_name_set.find(param_name) != param_name_set.cend()) {
-      std::string msg = "Encountered path parameter '" + param_name +
-                        "' multiple times in route pattern '" + pattern + "'.";
-      throw std::invalid_argument(msg);
-    }
-#endif
-
-    param_names_.push_back(std::move(param_name));
-
-    last_param_end = sep_pos + 1;
-  }
-
-  if (last_param_end < pattern.length()) {
-    static_fragments_.push_back(pattern.substr(last_param_end));
-  }
-}
-
-inline bool PathParamsMatcher::match(Request &request) const {
-  request.matches = std::smatch();
-  request.path_params.clear();
-  request.path_params.reserve(param_names_.size());
-
-  // One past the position at which the path matched the pattern last time
-  std::size_t starting_pos = 0;
-  for (size_t i = 0; i < static_fragments_.size(); ++i) {
-    const auto &fragment = static_fragments_[i];
-
-    if (starting_pos + fragment.length() > request.path.length()) {
-      return false;
-    }
-
-    // Avoid unnecessary allocation by using strncmp instead of substr +
-    // comparison
-    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
-                     fragment.length()) != 0) {
-      return false;
-    }
-
-    starting_pos += fragment.length();
-
-    // Should only happen when we have a static fragment after a param
-    // Example: '/users/:id/subscriptions'
-    // The 'subscriptions' fragment here does not have a corresponding param
-    if (i >= param_names_.size()) { continue; }
-
-    auto sep_pos = request.path.find(separator, starting_pos);
-    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
-
-    const auto &param_name = param_names_[i];
-
-    request.path_params.emplace(
-        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
-
-    // Mark everything up to '/' as matched
-    starting_pos = sep_pos + 1;
-  }
-  // Returns false if the path is longer than the pattern
-  return starting_pos >= request.path.length();
-}
-
-inline bool RegexMatcher::match(Request &request) const {
-  request.path_params.clear();
-  return std::regex_match(request.path, request.matches, regex_);
-}
-
-} // namespace detail
-
-// HTTP server implementation
-inline Server::Server()
-    : new_task_queue(
-          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
-#ifndef _WIN32
-  signal(SIGPIPE, SIG_IGN);
-#endif
-}
-
-inline Server::~Server() = default;
-
-inline std::unique_ptr<detail::MatcherBase>
-Server::make_matcher(const std::string &pattern) {
-  if (pattern.find("/:") != std::string::npos) {
-    return detail::make_unique<detail::PathParamsMatcher>(pattern);
-  } else {
-    return detail::make_unique<detail::RegexMatcher>(pattern);
-  }
-}
-
-inline Server &Server::Get(const std::string &pattern, Handler handler) {
-  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Post(const std::string &pattern, Handler handler) {
-  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Post(const std::string &pattern,
-                            HandlerWithContentReader handler) {
-  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                 std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Put(const std::string &pattern, Handler handler) {
-  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Put(const std::string &pattern,
-                           HandlerWithContentReader handler) {
-  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Patch(const std::string &pattern, Handler handler) {
-  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Patch(const std::string &pattern,
-                             HandlerWithContentReader handler) {
-  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                  std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Delete(const std::string &pattern, Handler handler) {
-  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Delete(const std::string &pattern,
-                              HandlerWithContentReader handler) {
-  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                   std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Options(const std::string &pattern, Handler handler) {
-  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline bool Server::set_base_dir(const std::string &dir,
-                                 const std::string &mount_point) {
-  return set_mount_point(mount_point, dir);
-}
-
-inline bool Server::set_mount_point(const std::string &mount_point,
-                                    const std::string &dir, Headers headers) {
-  detail::FileStat stat(dir);
-  if (stat.is_dir()) {
-    std::string mnt = !mount_point.empty() ? mount_point : "/";
-    if (!mnt.empty() && mnt[0] == '/') {
-      base_dirs_.push_back({mnt, dir, std::move(headers)});
-      return true;
-    }
-  }
-  return false;
-}
-
-inline bool Server::remove_mount_point(const std::string &mount_point) {
-  for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
-    if (it->mount_point == mount_point) {
-      base_dirs_.erase(it);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline Server &
-Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
-                                                const std::string &mime) {
-  file_extension_and_mimetype_map_[ext] = mime;
-  return *this;
-}
-
-inline Server &Server::set_default_file_mimetype(const std::string &mime) {
-  default_file_mimetype_ = mime;
-  return *this;
-}
-
-inline Server &Server::set_file_request_handler(Handler handler) {
-  file_request_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_error_handler_core(HandlerWithResponse handler,
-                                              std::true_type) {
-  error_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_error_handler_core(Handler handler,
-                                              std::false_type) {
-  error_handler_ = [handler](const Request &req, Response &res) {
-    handler(req, res);
-    return HandlerResponse::Handled;
-  };
-  return *this;
-}
-
-inline Server &Server::set_exception_handler(ExceptionHandler handler) {
-  exception_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) {
-  pre_routing_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_post_routing_handler(Handler handler) {
-  post_routing_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_logger(Logger logger) {
-  logger_ = std::move(logger);
-  return *this;
-}
-
-inline Server &
-Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
-  expect_100_continue_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_address_family(int family) {
-  address_family_ = family;
-  return *this;
-}
-
-inline Server &Server::set_tcp_nodelay(bool on) {
-  tcp_nodelay_ = on;
-  return *this;
-}
-
-inline Server &Server::set_ipv6_v6only(bool on) {
-  ipv6_v6only_ = on;
-  return *this;
-}
-
-inline Server &Server::set_socket_options(SocketOptions socket_options) {
-  socket_options_ = std::move(socket_options);
-  return *this;
-}
-
-inline Server &Server::set_default_headers(Headers headers) {
-  default_headers_ = std::move(headers);
-  return *this;
-}
-
-inline Server &Server::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  header_writer_ = writer;
-  return *this;
-}
-
-inline Server &Server::set_keep_alive_max_count(size_t count) {
-  keep_alive_max_count_ = count;
-  return *this;
-}
-
-inline Server &Server::set_keep_alive_timeout(time_t sec) {
-  keep_alive_timeout_sec_ = sec;
-  return *this;
-}
-
-inline Server &Server::set_read_timeout(time_t sec, time_t usec) {
-  read_timeout_sec_ = sec;
-  read_timeout_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_write_timeout(time_t sec, time_t usec) {
-  write_timeout_sec_ = sec;
-  write_timeout_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_idle_interval(time_t sec, time_t usec) {
-  idle_interval_sec_ = sec;
-  idle_interval_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_payload_max_length(size_t length) {
-  payload_max_length_ = length;
-  return *this;
-}
-
-inline bool Server::bind_to_port(const std::string &host, int port,
-                                 int socket_flags) {
-  auto ret = bind_internal(host, port, socket_flags);
-  if (ret == -1) { is_decommisioned = true; }
-  return ret >= 0;
-}
-inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
-  auto ret = bind_internal(host, 0, socket_flags);
-  if (ret == -1) { is_decommisioned = true; }
-  return ret;
-}
-
-inline bool Server::listen_after_bind() { return listen_internal(); }
-
-inline bool Server::listen(const std::string &host, int port,
-                           int socket_flags) {
-  return bind_to_port(host, port, socket_flags) && listen_internal();
-}
-
-inline bool Server::is_running() const { return is_running_; }
-
-inline void Server::wait_until_ready() const {
-  while (!is_running_ && !is_decommisioned) {
-    std::this_thread::sleep_for(std::chrono::milliseconds{1});
-  }
-}
-
-inline void Server::stop() {
-  if (is_running_) {
-    assert(svr_sock_ != INVALID_SOCKET);
-    std::atomic<socket_t> sock(svr_sock_.exchange(INVALID_SOCKET));
-    detail::shutdown_socket(sock);
-    detail::close_socket(sock);
-  }
-  is_decommisioned = false;
-}
-
-inline void Server::decommission() { is_decommisioned = true; }
-
-inline bool Server::parse_request_line(const char *s, Request &req) const {
-  auto len = strlen(s);
-  if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
-  len -= 2;
-
-  {
-    size_t count = 0;
-
-    detail::split(s, s + len, ' ', [&](const char *b, const char *e) {
-      switch (count) {
-      case 0: req.method = std::string(b, e); break;
-      case 1: req.target = std::string(b, e); break;
-      case 2: req.version = std::string(b, e); break;
-      default: break;
-      }
-      count++;
-    });
-
-    if (count != 3) { return false; }
-  }
-
-  static const std::set<std::string> methods{
-      "GET",     "HEAD",    "POST",  "PUT",   "DELETE",
-      "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"};
-
-  if (methods.find(req.method) == methods.end()) { return false; }
-
-  if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { return false; }
-
-  {
-    // Skip URL fragment
-    for (size_t i = 0; i < req.target.size(); i++) {
-      if (req.target[i] == '#') {
-        req.target.erase(i);
-        break;
-      }
-    }
-
-    detail::divide(req.target, '?',
-                   [&](const char *lhs_data, std::size_t lhs_size,
-                       const char *rhs_data, std::size_t rhs_size) {
-                     req.path = detail::decode_url(
-                         std::string(lhs_data, lhs_size), false);
-                     detail::parse_query_text(rhs_data, rhs_size, req.params);
-                   });
-  }
-
-  return true;
-}
-
-inline bool Server::write_response(Stream &strm, bool close_connection,
-                                   Request &req, Response &res) {
-  // NOTE: `req.ranges` should be empty, otherwise it will be applied
-  // incorrectly to the error content.
-  req.ranges.clear();
-  return write_response_core(strm, close_connection, req, res, false);
-}
-
-inline bool Server::write_response_with_content(Stream &strm,
-                                                bool close_connection,
-                                                const Request &req,
-                                                Response &res) {
-  return write_response_core(strm, close_connection, req, res, true);
-}
-
-inline bool Server::write_response_core(Stream &strm, bool close_connection,
-                                        const Request &req, Response &res,
-                                        bool need_apply_ranges) {
-  assert(res.status != -1);
-
-  if (400 <= res.status && error_handler_ &&
-      error_handler_(req, res) == HandlerResponse::Handled) {
-    need_apply_ranges = true;
-  }
-
-  std::string content_type;
-  std::string boundary;
-  if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
-
-  // Prepare additional headers
-  if (close_connection || req.get_header_value("Connection") == "close") {
-    res.set_header("Connection", "close");
-  } else {
-    std::string s = "timeout=";
-    s += std::to_string(keep_alive_timeout_sec_);
-    s += ", max=";
-    s += std::to_string(keep_alive_max_count_);
-    res.set_header("Keep-Alive", s);
-  }
-
-  if ((!res.body.empty() || res.content_length_ > 0 || res.content_provider_) &&
-      !res.has_header("Content-Type")) {
-    res.set_header("Content-Type", "text/plain");
-  }
-
-  if (res.body.empty() && !res.content_length_ && !res.content_provider_ &&
-      !res.has_header("Content-Length")) {
-    res.set_header("Content-Length", "0");
-  }
-
-  if (req.method == "HEAD" && !res.has_header("Accept-Ranges")) {
-    res.set_header("Accept-Ranges", "bytes");
-  }
-
-  if (post_routing_handler_) { post_routing_handler_(req, res); }
-
-  // Response line and headers
-  {
-    detail::BufferStream bstrm;
-    if (!detail::write_response_line(bstrm, res.status)) { return false; }
-    if (!header_writer_(bstrm, res.headers)) { return false; }
-
-    // Flush buffer
-    auto &data = bstrm.get_buffer();
-    detail::write_data(strm, data.data(), data.size());
-  }
-
-  // Body
-  auto ret = true;
-  if (req.method != "HEAD") {
-    if (!res.body.empty()) {
-      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
-        ret = false;
-      }
-    } else if (res.content_provider_) {
-      if (write_content_with_provider(strm, req, res, boundary, content_type)) {
-        res.content_provider_success_ = true;
-      } else {
-        ret = false;
-      }
-    }
-  }
-
-  // Log
-  if (logger_) { logger_(req, res); }
-
-  return ret;
-}
-
-inline bool
-Server::write_content_with_provider(Stream &strm, const Request &req,
-                                    Response &res, const std::string &boundary,
-                                    const std::string &content_type) {
-  auto is_shutting_down = [this]() {
-    return this->svr_sock_ == INVALID_SOCKET;
-  };
-
-  if (res.content_length_ > 0) {
-    if (req.ranges.empty()) {
-      return detail::write_content(strm, res.content_provider_, 0,
-                                   res.content_length_, is_shutting_down);
-    } else if (req.ranges.size() == 1) {
-      auto offset_and_length = detail::get_range_offset_and_length(
-          req.ranges[0], res.content_length_);
-
-      return detail::write_content(strm, res.content_provider_,
-                                   offset_and_length.first,
-                                   offset_and_length.second, is_shutting_down);
-    } else {
-      return detail::write_multipart_ranges_data(
-          strm, req, res, boundary, content_type, res.content_length_,
-          is_shutting_down);
-    }
-  } else {
-    if (res.is_chunked_content_provider_) {
-      auto type = detail::encoding_type(req, res);
-
-      std::unique_ptr<detail::compressor> compressor;
-      if (type == detail::EncodingType::Gzip) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        compressor = detail::make_unique<detail::gzip_compressor>();
-#endif
-      } else if (type == detail::EncodingType::Brotli) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-        compressor = detail::make_unique<detail::brotli_compressor>();
-#endif
-      } else {
-        compressor = detail::make_unique<detail::nocompressor>();
-      }
-      assert(compressor != nullptr);
-
-      return detail::write_content_chunked(strm, res.content_provider_,
-                                           is_shutting_down, *compressor);
-    } else {
-      return detail::write_content_without_length(strm, res.content_provider_,
-                                                  is_shutting_down);
-    }
-  }
-}
-
-inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
-  MultipartFormDataMap::iterator cur;
-  auto file_count = 0;
-  if (read_content_core(
-          strm, req, res,
-          // Regular
-          [&](const char *buf, size_t n) {
-            if (req.body.size() + n > req.body.max_size()) { return false; }
-            req.body.append(buf, n);
-            return true;
-          },
-          // Multipart
-          [&](const MultipartFormData &file) {
-            if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
-              return false;
-            }
-            cur = req.files.emplace(file.name, file);
-            return true;
-          },
-          [&](const char *buf, size_t n) {
-            auto &content = cur->second.content;
-            if (content.size() + n > content.max_size()) { return false; }
-            content.append(buf, n);
-            return true;
-          })) {
-    const auto &content_type = req.get_header_value("Content-Type");
-    if (!content_type.find("application/x-www-form-urlencoded")) {
-      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
-        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
-        return false;
-      }
-      detail::parse_query_text(req.body, req.params);
-    }
-    return true;
-  }
-  return false;
-}
-
-inline bool Server::read_content_with_content_receiver(
-    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
-    MultipartContentHeader multipart_header,
-    ContentReceiver multipart_receiver) {
-  return read_content_core(strm, req, res, std::move(receiver),
-                           std::move(multipart_header),
-                           std::move(multipart_receiver));
-}
-
-inline bool
-Server::read_content_core(Stream &strm, Request &req, Response &res,
-                          ContentReceiver receiver,
-                          MultipartContentHeader multipart_header,
-                          ContentReceiver multipart_receiver) const {
-  detail::MultipartFormDataParser multipart_form_data_parser;
-  ContentReceiverWithProgress out;
-
-  if (req.is_multipart_form_data()) {
-    const auto &content_type = req.get_header_value("Content-Type");
-    std::string boundary;
-    if (!detail::parse_multipart_boundary(content_type, boundary)) {
-      res.status = StatusCode::BadRequest_400;
-      return false;
-    }
-
-    multipart_form_data_parser.set_boundary(std::move(boundary));
-    out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) {
-      /* For debug
-      size_t pos = 0;
-      while (pos < n) {
-        auto read_size = (std::min)<size_t>(1, n - pos);
-        auto ret = multipart_form_data_parser.parse(
-            buf + pos, read_size, multipart_receiver, multipart_header);
-        if (!ret) { return false; }
-        pos += read_size;
-      }
-      return true;
-      */
-      return multipart_form_data_parser.parse(buf, n, multipart_receiver,
-                                              multipart_header);
-    };
-  } else {
-    out = [receiver](const char *buf, size_t n, uint64_t /*off*/,
-                     uint64_t /*len*/) { return receiver(buf, n); };
-  }
-
-  if (req.method == "DELETE" && !req.has_header("Content-Length")) {
-    return true;
-  }
-
-  if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
-                            out, true)) {
-    return false;
-  }
-
-  if (req.is_multipart_form_data()) {
-    if (!multipart_form_data_parser.is_valid()) {
-      res.status = StatusCode::BadRequest_400;
-      return false;
-    }
-  }
-
-  return true;
-}
-
-inline bool Server::handle_file_request(const Request &req, Response &res,
-                                        bool head) {
-  for (const auto &entry : base_dirs_) {
-    // Prefix match
-    if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
-      std::string sub_path = "/" + req.path.substr(entry.mount_point.size());
-      if (detail::is_valid_path(sub_path)) {
-        auto path = entry.base_dir + sub_path;
-        if (path.back() == '/') { path += "index.html"; }
-
-        detail::FileStat stat(path);
-
-        if (stat.is_dir()) {
-          res.set_redirect(sub_path + "/", StatusCode::MovedPermanently_301);
-          return true;
-        }
-
-        if (stat.is_file()) {
-          for (const auto &kv : entry.headers) {
-            res.set_header(kv.first, kv.second);
-          }
-
-          auto mm = std::make_shared<detail::mmap>(path.c_str());
-          if (!mm->is_open()) { return false; }
-
-          res.set_content_provider(
-              mm->size(),
-              detail::find_content_type(path, file_extension_and_mimetype_map_,
-                                        default_file_mimetype_),
-              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
-                sink.write(mm->data() + offset, length);
-                return true;
-              });
-
-          if (!head && file_request_handler_) {
-            file_request_handler_(req, res);
-          }
-
-          return true;
-        }
-      }
-    }
-  }
-  return false;
-}
-
-inline socket_t
-Server::create_server_socket(const std::string &host, int port,
-                             int socket_flags,
-                             SocketOptions socket_options) const {
-  return detail::create_socket(
-      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
-      ipv6_v6only_, std::move(socket_options),
-      [](socket_t sock, struct addrinfo &ai, bool & /*quit*/) -> bool {
-        if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
-          return false;
-        }
-        if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) { return false; }
-        return true;
-      });
-}
-
-inline int Server::bind_internal(const std::string &host, int port,
-                                 int socket_flags) {
-  if (is_decommisioned) { return -1; }
-
-  if (!is_valid()) { return -1; }
-
-  svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
-  if (svr_sock_ == INVALID_SOCKET) { return -1; }
-
-  if (port == 0) {
-    struct sockaddr_storage addr;
-    socklen_t addr_len = sizeof(addr);
-    if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&addr),
-                    &addr_len) == -1) {
-      return -1;
-    }
-    if (addr.ss_family == AF_INET) {
-      return ntohs(reinterpret_cast<struct sockaddr_in *>(&addr)->sin_port);
-    } else if (addr.ss_family == AF_INET6) {
-      return ntohs(reinterpret_cast<struct sockaddr_in6 *>(&addr)->sin6_port);
-    } else {
-      return -1;
-    }
-  } else {
-    return port;
-  }
-}
-
-inline bool Server::listen_internal() {
-  if (is_decommisioned) { return false; }
-
-  auto ret = true;
-  is_running_ = true;
-  auto se = detail::scope_exit([&]() { is_running_ = false; });
-
-  {
-    std::unique_ptr<TaskQueue> task_queue(new_task_queue());
-
-    while (svr_sock_ != INVALID_SOCKET) {
-#ifndef _WIN32
-      if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
-#endif
-        auto val = detail::select_read(svr_sock_, idle_interval_sec_,
-                                       idle_interval_usec_);
-        if (val == 0) { // Timeout
-          task_queue->on_idle();
-          continue;
-        }
-#ifndef _WIN32
-      }
-#endif
-
-#if defined _WIN32
-      // sockets conneced via WASAccept inherit flags NO_HANDLE_INHERIT,
-      // OVERLAPPED
-      socket_t sock = WSAAccept(svr_sock_, nullptr, nullptr, nullptr, 0);
-#elif defined SOCK_CLOEXEC
-      socket_t sock = accept4(svr_sock_, nullptr, nullptr, SOCK_CLOEXEC);
-#else
-      socket_t sock = accept(svr_sock_, nullptr, nullptr);
-#endif
-
-      if (sock == INVALID_SOCKET) {
-        if (errno == EMFILE) {
-          // The per-process limit of open file descriptors has been reached.
-          // Try to accept new connections after a short sleep.
-          std::this_thread::sleep_for(std::chrono::microseconds{1});
-          continue;
-        } else if (errno == EINTR || errno == EAGAIN) {
-          continue;
-        }
-        if (svr_sock_ != INVALID_SOCKET) {
-          detail::close_socket(svr_sock_);
-          ret = false;
-        } else {
-          ; // The server socket was closed by user.
-        }
-        break;
-      }
-
-      {
-#ifdef _WIN32
-        auto timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 +
-                                             read_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-        timeval tv;
-        tv.tv_sec = static_cast<long>(read_timeout_sec_);
-        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                   reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-      }
-      {
-
-#ifdef _WIN32
-        auto timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 +
-                                             write_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-        timeval tv;
-        tv.tv_sec = static_cast<long>(write_timeout_sec_);
-        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                   reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-      }
-
-      if (!task_queue->enqueue(
-              [this, sock]() { process_and_close_socket(sock); })) {
-        detail::shutdown_socket(sock);
-        detail::close_socket(sock);
-      }
-    }
-
-    task_queue->shutdown();
-  }
-
-  is_decommisioned = !ret;
-  return ret;
-}
-
-inline bool Server::routing(Request &req, Response &res, Stream &strm) {
-  if (pre_routing_handler_ &&
-      pre_routing_handler_(req, res) == HandlerResponse::Handled) {
-    return true;
-  }
-
-  // File handler
-  auto is_head_request = req.method == "HEAD";
-  if ((req.method == "GET" || is_head_request) &&
-      handle_file_request(req, res, is_head_request)) {
-    return true;
-  }
-
-  if (detail::expect_content(req)) {
-    // Content reader handler
-    {
-      ContentReader reader(
-          [&](ContentReceiver receiver) {
-            return read_content_with_content_receiver(
-                strm, req, res, std::move(receiver), nullptr, nullptr);
-          },
-          [&](MultipartContentHeader header, ContentReceiver receiver) {
-            return read_content_with_content_receiver(strm, req, res, nullptr,
-                                                      std::move(header),
-                                                      std::move(receiver));
-          });
-
-      if (req.method == "POST") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                post_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "PUT") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                put_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "PATCH") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                patch_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "DELETE") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                delete_handlers_for_content_reader_)) {
-          return true;
-        }
-      }
-    }
-
-    // Read content into `req.body`
-    if (!read_content(strm, req, res)) { return false; }
-  }
-
-  // Regular handler
-  if (req.method == "GET" || req.method == "HEAD") {
-    return dispatch_request(req, res, get_handlers_);
-  } else if (req.method == "POST") {
-    return dispatch_request(req, res, post_handlers_);
-  } else if (req.method == "PUT") {
-    return dispatch_request(req, res, put_handlers_);
-  } else if (req.method == "DELETE") {
-    return dispatch_request(req, res, delete_handlers_);
-  } else if (req.method == "OPTIONS") {
-    return dispatch_request(req, res, options_handlers_);
-  } else if (req.method == "PATCH") {
-    return dispatch_request(req, res, patch_handlers_);
-  }
-
-  res.status = StatusCode::BadRequest_400;
-  return false;
-}
-
-inline bool Server::dispatch_request(Request &req, Response &res,
-                                     const Handlers &handlers) const {
-  for (const auto &x : handlers) {
-    const auto &matcher = x.first;
-    const auto &handler = x.second;
-
-    if (matcher->match(req)) {
-      handler(req, res);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline void Server::apply_ranges(const Request &req, Response &res,
-                                 std::string &content_type,
-                                 std::string &boundary) const {
-  if (req.ranges.size() > 1 && res.status == StatusCode::PartialContent_206) {
-    auto it = res.headers.find("Content-Type");
-    if (it != res.headers.end()) {
-      content_type = it->second;
-      res.headers.erase(it);
-    }
-
-    boundary = detail::make_multipart_data_boundary();
-
-    res.set_header("Content-Type",
-                   "multipart/byteranges; boundary=" + boundary);
-  }
-
-  auto type = detail::encoding_type(req, res);
-
-  if (res.body.empty()) {
-    if (res.content_length_ > 0) {
-      size_t length = 0;
-      if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
-        length = res.content_length_;
-      } else if (req.ranges.size() == 1) {
-        auto offset_and_length = detail::get_range_offset_and_length(
-            req.ranges[0], res.content_length_);
-
-        length = offset_and_length.second;
-
-        auto content_range = detail::make_content_range_header_field(
-            offset_and_length, res.content_length_);
-        res.set_header("Content-Range", content_range);
-      } else {
-        length = detail::get_multipart_ranges_data_length(
-            req, boundary, content_type, res.content_length_);
-      }
-      res.set_header("Content-Length", std::to_string(length));
-    } else {
-      if (res.content_provider_) {
-        if (res.is_chunked_content_provider_) {
-          res.set_header("Transfer-Encoding", "chunked");
-          if (type == detail::EncodingType::Gzip) {
-            res.set_header("Content-Encoding", "gzip");
-          } else if (type == detail::EncodingType::Brotli) {
-            res.set_header("Content-Encoding", "br");
-          }
-        }
-      }
-    }
-  } else {
-    if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
-      ;
-    } else if (req.ranges.size() == 1) {
-      auto offset_and_length =
-          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
-      auto offset = offset_and_length.first;
-      auto length = offset_and_length.second;
-
-      auto content_range = detail::make_content_range_header_field(
-          offset_and_length, res.body.size());
-      res.set_header("Content-Range", content_range);
-
-      assert(offset + length <= res.body.size());
-      res.body = res.body.substr(offset, length);
-    } else {
-      std::string data;
-      detail::make_multipart_ranges_data(req, res, boundary, content_type,
-                                         res.body.size(), data);
-      res.body.swap(data);
-    }
-
-    if (type != detail::EncodingType::None) {
-      std::unique_ptr<detail::compressor> compressor;
-      std::string content_encoding;
-
-      if (type == detail::EncodingType::Gzip) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        compressor = detail::make_unique<detail::gzip_compressor>();
-        content_encoding = "gzip";
-#endif
-      } else if (type == detail::EncodingType::Brotli) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-        compressor = detail::make_unique<detail::brotli_compressor>();
-        content_encoding = "br";
-#endif
-      }
-
-      if (compressor) {
-        std::string compressed;
-        if (compressor->compress(res.body.data(), res.body.size(), true,
-                                 [&](const char *data, size_t data_len) {
-                                   compressed.append(data, data_len);
-                                   return true;
-                                 })) {
-          res.body.swap(compressed);
-          res.set_header("Content-Encoding", content_encoding);
-        }
-      }
-    }
-
-    auto length = std::to_string(res.body.size());
-    res.set_header("Content-Length", length);
-  }
-}
-
-inline bool Server::dispatch_request_for_content_reader(
-    Request &req, Response &res, ContentReader content_reader,
-    const HandlersForContentReader &handlers) const {
-  for (const auto &x : handlers) {
-    const auto &matcher = x.first;
-    const auto &handler = x.second;
-
-    if (matcher->match(req)) {
-      handler(req, res, content_reader);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline bool
-Server::process_request(Stream &strm, const std::string &remote_addr,
-                        int remote_port, const std::string &local_addr,
-                        int local_port, bool close_connection,
-                        bool &connection_closed,
-                        const std::function<void(Request &)> &setup_request) {
-  std::array<char, 2048> buf{};
-
-  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
-
-  // Connection has been closed on client
-  if (!line_reader.getline()) { return false; }
-
-  Request req;
-
-  Response res;
-  res.version = "HTTP/1.1";
-  res.headers = default_headers_;
-
-#ifdef _WIN32
-  // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL).
-#else
-#ifndef CPPHTTPLIB_USE_POLL
-  // Socket file descriptor exceeded FD_SETSIZE...
-  if (strm.socket() >= FD_SETSIZE) {
-    Headers dummy;
-    detail::read_headers(strm, dummy);
-    res.status = StatusCode::InternalServerError_500;
-    return write_response(strm, close_connection, req, res);
-  }
-#endif
-#endif
-
-  // Check if the request URI doesn't exceed the limit
-  if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
-    Headers dummy;
-    detail::read_headers(strm, dummy);
-    res.status = StatusCode::UriTooLong_414;
-    return write_response(strm, close_connection, req, res);
-  }
-
-  // Request line and headers
-  if (!parse_request_line(line_reader.ptr(), req) ||
-      !detail::read_headers(strm, req.headers)) {
-    res.status = StatusCode::BadRequest_400;
-    return write_response(strm, close_connection, req, res);
-  }
-
-  if (req.get_header_value("Connection") == "close") {
-    connection_closed = true;
-  }
-
-  if (req.version == "HTTP/1.0" &&
-      req.get_header_value("Connection") != "Keep-Alive") {
-    connection_closed = true;
-  }
-
-  req.remote_addr = remote_addr;
-  req.remote_port = remote_port;
-  req.set_header("REMOTE_ADDR", req.remote_addr);
-  req.set_header("REMOTE_PORT", std::to_string(req.remote_port));
-
-  req.local_addr = local_addr;
-  req.local_port = local_port;
-  req.set_header("LOCAL_ADDR", req.local_addr);
-  req.set_header("LOCAL_PORT", std::to_string(req.local_port));
-
-  if (req.has_header("Range")) {
-    const auto &range_header_value = req.get_header_value("Range");
-    if (!detail::parse_range_header(range_header_value, req.ranges)) {
-      res.status = StatusCode::RangeNotSatisfiable_416;
-      return write_response(strm, close_connection, req, res);
-    }
-  }
-
-  if (setup_request) { setup_request(req); }
-
-  if (req.get_header_value("Expect") == "100-continue") {
-    int status = StatusCode::Continue_100;
-    if (expect_100_continue_handler_) {
-      status = expect_100_continue_handler_(req, res);
-    }
-    switch (status) {
-    case StatusCode::Continue_100:
-    case StatusCode::ExpectationFailed_417:
-      detail::write_response_line(strm, status);
-      strm.write("\r\n");
-      break;
-    default:
-      connection_closed = true;
-      return write_response(strm, true, req, res);
-    }
-  }
-
-  // Routing
-  auto routed = false;
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-  routed = routing(req, res, strm);
-#else
-  try {
-    routed = routing(req, res, strm);
-  } catch (std::exception &e) {
-    if (exception_handler_) {
-      auto ep = std::current_exception();
-      exception_handler_(req, res, ep);
-      routed = true;
-    } else {
-      res.status = StatusCode::InternalServerError_500;
-      std::string val;
-      auto s = e.what();
-      for (size_t i = 0; s[i]; i++) {
-        switch (s[i]) {
-        case '\r': val += "\\r"; break;
-        case '\n': val += "\\n"; break;
-        default: val += s[i]; break;
-        }
-      }
-      res.set_header("EXCEPTION_WHAT", val);
-    }
-  } catch (...) {
-    if (exception_handler_) {
-      auto ep = std::current_exception();
-      exception_handler_(req, res, ep);
-      routed = true;
-    } else {
-      res.status = StatusCode::InternalServerError_500;
-      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
-    }
-  }
-#endif
-  if (routed) {
-    if (res.status == -1) {
-      res.status = req.ranges.empty() ? StatusCode::OK_200
-                                      : StatusCode::PartialContent_206;
-    }
-
-    if (detail::range_error(req, res)) {
-      res.body.clear();
-      res.content_length_ = 0;
-      res.content_provider_ = nullptr;
-      res.status = StatusCode::RangeNotSatisfiable_416;
-      return write_response(strm, close_connection, req, res);
-    }
-
-    // Serve file content by using a content provider
-    if (!res.file_content_path_.empty()) {
-      const auto &path = res.file_content_path_;
-      auto mm = std::make_shared<detail::mmap>(path.c_str());
-      if (!mm->is_open()) {
-        res.body.clear();
-        res.content_length_ = 0;
-        res.content_provider_ = nullptr;
-        res.status = StatusCode::NotFound_404;
-        return write_response(strm, close_connection, req, res);
-      }
-
-      auto content_type = res.file_content_content_type_;
-      if (content_type.empty()) {
-        content_type = detail::find_content_type(
-            path, file_extension_and_mimetype_map_, default_file_mimetype_);
-      }
-
-      res.set_content_provider(
-          mm->size(), content_type,
-          [mm](size_t offset, size_t length, DataSink &sink) -> bool {
-            sink.write(mm->data() + offset, length);
-            return true;
-          });
-    }
-
-    return write_response_with_content(strm, close_connection, req, res);
-  } else {
-    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
-
-    return write_response(strm, close_connection, req, res);
-  }
-}
-
-inline bool Server::is_valid() const { return true; }
-
-inline bool Server::process_and_close_socket(socket_t sock) {
-  std::string remote_addr;
-  int remote_port = 0;
-  detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
-
-  std::string local_addr;
-  int local_port = 0;
-  detail::get_local_ip_and_port(sock, local_addr, local_port);
-
-  auto ret = detail::process_server_socket(
-      svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
-      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_,
-      [&](Stream &strm, bool close_connection, bool &connection_closed) {
-        return process_request(strm, remote_addr, remote_port, local_addr,
-                               local_port, close_connection, connection_closed,
-                               nullptr);
-      });
-
-  detail::shutdown_socket(sock);
-  detail::close_socket(sock);
-  return ret;
-}
-
-// HTTP client implementation
-inline ClientImpl::ClientImpl(const std::string &host)
-    : ClientImpl(host, 80, std::string(), std::string()) {}
-
-inline ClientImpl::ClientImpl(const std::string &host, int port)
-    : ClientImpl(host, port, std::string(), std::string()) {}
-
-inline ClientImpl::ClientImpl(const std::string &host, int port,
-                              const std::string &client_cert_path,
-                              const std::string &client_key_path)
-    : host_(detail::escape_abstract_namespace_unix_domain(host)), port_(port),
-      host_and_port_(adjust_host_string(host_) + ":" + std::to_string(port)),
-      client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
-
-inline ClientImpl::~ClientImpl() {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  shutdown_socket(socket_);
-  close_socket(socket_);
-}
-
-inline bool ClientImpl::is_valid() const { return true; }
-
-inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
-  client_cert_path_ = rhs.client_cert_path_;
-  client_key_path_ = rhs.client_key_path_;
-  connection_timeout_sec_ = rhs.connection_timeout_sec_;
-  read_timeout_sec_ = rhs.read_timeout_sec_;
-  read_timeout_usec_ = rhs.read_timeout_usec_;
-  write_timeout_sec_ = rhs.write_timeout_sec_;
-  write_timeout_usec_ = rhs.write_timeout_usec_;
-  basic_auth_username_ = rhs.basic_auth_username_;
-  basic_auth_password_ = rhs.basic_auth_password_;
-  bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  digest_auth_username_ = rhs.digest_auth_username_;
-  digest_auth_password_ = rhs.digest_auth_password_;
-#endif
-  keep_alive_ = rhs.keep_alive_;
-  follow_location_ = rhs.follow_location_;
-  url_encode_ = rhs.url_encode_;
-  address_family_ = rhs.address_family_;
-  tcp_nodelay_ = rhs.tcp_nodelay_;
-  ipv6_v6only_ = rhs.ipv6_v6only_;
-  socket_options_ = rhs.socket_options_;
-  compress_ = rhs.compress_;
-  decompress_ = rhs.decompress_;
-  interface_ = rhs.interface_;
-  proxy_host_ = rhs.proxy_host_;
-  proxy_port_ = rhs.proxy_port_;
-  proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
-  proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
-  proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
-  proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
-#endif
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  ca_cert_file_path_ = rhs.ca_cert_file_path_;
-  ca_cert_dir_path_ = rhs.ca_cert_dir_path_;
-  ca_cert_store_ = rhs.ca_cert_store_;
-#endif
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  server_certificate_verification_ = rhs.server_certificate_verification_;
-  server_hostname_verification_ = rhs.server_hostname_verification_;
-  server_certificate_verifier_ = rhs.server_certificate_verifier_;
-#endif
-  logger_ = rhs.logger_;
-}
-
-inline socket_t ClientImpl::create_client_socket(Error &error) const {
-  if (!proxy_host_.empty() && proxy_port_ != -1) {
-    return detail::create_client_socket(
-        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
-        ipv6_v6only_, socket_options_, connection_timeout_sec_,
-        connection_timeout_usec_, read_timeout_sec_, read_timeout_usec_,
-        write_timeout_sec_, write_timeout_usec_, interface_, error);
-  }
-
-  // Check is custom IP specified for host_
-  std::string ip;
-  auto it = addr_map_.find(host_);
-  if (it != addr_map_.end()) { ip = it->second; }
-
-  return detail::create_client_socket(
-      host_, ip, port_, address_family_, tcp_nodelay_, ipv6_v6only_,
-      socket_options_, connection_timeout_sec_, connection_timeout_usec_,
-      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_, interface_, error);
-}
-
-inline bool ClientImpl::create_and_connect_socket(Socket &socket,
-                                                  Error &error) {
-  auto sock = create_client_socket(error);
-  if (sock == INVALID_SOCKET) { return false; }
-  socket.sock = sock;
-  return true;
-}
-
-inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
-                                     bool /*shutdown_gracefully*/) {
-  // If there are any requests in flight from threads other than us, then it's
-  // a thread-unsafe race because individual ssl* objects are not thread-safe.
-  assert(socket_requests_in_flight_ == 0 ||
-         socket_requests_are_from_thread_ == std::this_thread::get_id());
-}
-
-inline void ClientImpl::shutdown_socket(Socket &socket) const {
-  if (socket.sock == INVALID_SOCKET) { return; }
-  detail::shutdown_socket(socket.sock);
-}
-
-inline void ClientImpl::close_socket(Socket &socket) {
-  // If there are requests in flight in another thread, usually closing
-  // the socket will be fine and they will simply receive an error when
-  // using the closed socket, but it is still a bug since rarely the OS
-  // may reassign the socket id to be used for a new socket, and then
-  // suddenly they will be operating on a live socket that is different
-  // than the one they intended!
-  assert(socket_requests_in_flight_ == 0 ||
-         socket_requests_are_from_thread_ == std::this_thread::get_id());
-
-  // It is also a bug if this happens while SSL is still active
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  assert(socket.ssl == nullptr);
-#endif
-  if (socket.sock == INVALID_SOCKET) { return; }
-  detail::close_socket(socket.sock);
-  socket.sock = INVALID_SOCKET;
-}
-
-inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
-                                           Response &res) const {
-  std::array<char, 2048> buf{};
-
-  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
-
-  if (!line_reader.getline()) { return false; }
-
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
-#else
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
-#endif
-
-  std::cmatch m;
-  if (!std::regex_match(line_reader.ptr(), m, re)) {
-    return req.method == "CONNECT";
-  }
-  res.version = std::string(m[1]);
-  res.status = std::stoi(std::string(m[2]));
-  res.reason = std::string(m[3]);
-
-  // Ignore '100 Continue'
-  while (res.status == StatusCode::Continue_100) {
-    if (!line_reader.getline()) { return false; } // CRLF
-    if (!line_reader.getline()) { return false; } // next response line
-
-    if (!std::regex_match(line_reader.ptr(), m, re)) { return false; }
-    res.version = std::string(m[1]);
-    res.status = std::stoi(std::string(m[2]));
-    res.reason = std::string(m[3]);
-  }
-
-  return true;
-}
-
-inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
-  std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
-  auto ret = send_(req, res, error);
-  if (error == Error::SSLPeerCouldBeClosed_) {
-    assert(!ret);
-    ret = send_(req, res, error);
-  }
-  return ret;
-}
-
-inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
-  {
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-
-    // Set this to false immediately - if it ever gets set to true by the end of
-    // the request, we know another thread instructed us to close the socket.
-    socket_should_be_closed_when_request_is_done_ = false;
-
-    auto is_alive = false;
-    if (socket_.is_open()) {
-      is_alive = detail::is_socket_alive(socket_.sock);
-      if (!is_alive) {
-        // Attempt to avoid sigpipe by shutting down nongracefully if it seems
-        // like the other side has already closed the connection Also, there
-        // cannot be any requests in flight from other threads since we locked
-        // request_mutex_, so safe to close everything immediately
-        const bool shutdown_gracefully = false;
-        shutdown_ssl(socket_, shutdown_gracefully);
-        shutdown_socket(socket_);
-        close_socket(socket_);
-      }
-    }
-
-    if (!is_alive) {
-      if (!create_and_connect_socket(socket_, error)) { return false; }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      // TODO: refactoring
-      if (is_ssl()) {
-        auto &scli = static_cast<SSLClient &>(*this);
-        if (!proxy_host_.empty() && proxy_port_ != -1) {
-          auto success = false;
-          if (!scli.connect_with_proxy(socket_, res, success, error)) {
-            return success;
-          }
-        }
-
-        if (!scli.initialize_ssl(socket_, error)) { return false; }
-      }
-#endif
-    }
-
-    // Mark the current socket as being in use so that it cannot be closed by
-    // anyone else while this request is ongoing, even though we will be
-    // releasing the mutex.
-    if (socket_requests_in_flight_ > 1) {
-      assert(socket_requests_are_from_thread_ == std::this_thread::get_id());
-    }
-    socket_requests_in_flight_ += 1;
-    socket_requests_are_from_thread_ = std::this_thread::get_id();
-  }
-
-  for (const auto &header : default_headers_) {
-    if (req.headers.find(header.first) == req.headers.end()) {
-      req.headers.insert(header);
-    }
-  }
-
-  auto ret = false;
-  auto close_connection = !keep_alive_;
-
-  auto se = detail::scope_exit([&]() {
-    // Briefly lock mutex in order to mark that a request is no longer ongoing
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    socket_requests_in_flight_ -= 1;
-    if (socket_requests_in_flight_ <= 0) {
-      assert(socket_requests_in_flight_ == 0);
-      socket_requests_are_from_thread_ = std::thread::id();
-    }
-
-    if (socket_should_be_closed_when_request_is_done_ || close_connection ||
-        !ret) {
-      shutdown_ssl(socket_, true);
-      shutdown_socket(socket_);
-      close_socket(socket_);
-    }
-  });
-
-  ret = process_socket(socket_, [&](Stream &strm) {
-    return handle_request(strm, req, res, close_connection, error);
-  });
-
-  if (!ret) {
-    if (error == Error::Success) { error = Error::Unknown; }
-  }
-
-  return ret;
-}
-
-inline Result ClientImpl::send(const Request &req) {
-  auto req2 = req;
-  return send_(std::move(req2));
-}
-
-inline Result ClientImpl::send_(Request &&req) {
-  auto res = detail::make_unique<Response>();
-  auto error = Error::Success;
-  auto ret = send(req, *res, error);
-  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)};
-}
-
-inline bool ClientImpl::handle_request(Stream &strm, Request &req,
-                                       Response &res, bool close_connection,
-                                       Error &error) {
-  if (req.path.empty()) {
-    error = Error::Connection;
-    return false;
-  }
-
-  auto req_save = req;
-
-  bool ret;
-
-  if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) {
-    auto req2 = req;
-    req2.path = "http://" + host_and_port_ + req.path;
-    ret = process_request(strm, req2, res, close_connection, error);
-    req = req2;
-    req.path = req_save.path;
-  } else {
-    ret = process_request(strm, req, res, close_connection, error);
-  }
-
-  if (!ret) { return false; }
-
-  if (res.get_header_value("Connection") == "close" ||
-      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
-    // TODO this requires a not-entirely-obvious chain of calls to be correct
-    // for this to be safe.
-
-    // This is safe to call because handle_request is only called by send_
-    // which locks the request mutex during the process. It would be a bug
-    // to call it from a different thread since it's a thread-safety issue
-    // to do these things to the socket if another thread is using the socket.
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    shutdown_ssl(socket_, true);
-    shutdown_socket(socket_);
-    close_socket(socket_);
-  }
-
-  if (300 < res.status && res.status < 400 && follow_location_) {
-    req = req_save;
-    ret = redirect(req, res, error);
-  }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if ((res.status == StatusCode::Unauthorized_401 ||
-       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
-      req.authorization_count_ < 5) {
-    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
-    const auto &username =
-        is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
-    const auto &password =
-        is_proxy ? proxy_digest_auth_password_ : digest_auth_password_;
-
-    if (!username.empty() && !password.empty()) {
-      std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(res, auth, is_proxy)) {
-        Request new_req = req;
-        new_req.authorization_count_ += 1;
-        new_req.headers.erase(is_proxy ? "Proxy-Authorization"
-                                       : "Authorization");
-        new_req.headers.insert(detail::make_digest_authentication_header(
-            req, auth, new_req.authorization_count_, detail::random_string(10),
-            username, password, is_proxy));
-
-        Response new_res;
-
-        ret = send(new_req, new_res, error);
-        if (ret) { res = new_res; }
-      }
-    }
-  }
-#endif
-
-  return ret;
-}
-
-inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
-  if (req.redirect_count_ == 0) {
-    error = Error::ExceedRedirectCount;
-    return false;
-  }
-
-  auto location = res.get_header_value("location");
-  if (location.empty()) { return false; }
-
-  const static std::regex re(
-      R"((?:(https?):)?(?://(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
-
-  std::smatch m;
-  if (!std::regex_match(location, m, re)) { return false; }
-
-  auto scheme = is_ssl() ? "https" : "http";
-
-  auto next_scheme = m[1].str();
-  auto next_host = m[2].str();
-  if (next_host.empty()) { next_host = m[3].str(); }
-  auto port_str = m[4].str();
-  auto next_path = m[5].str();
-  auto next_query = m[6].str();
-
-  auto next_port = port_;
-  if (!port_str.empty()) {
-    next_port = std::stoi(port_str);
-  } else if (!next_scheme.empty()) {
-    next_port = next_scheme == "https" ? 443 : 80;
-  }
-
-  if (next_scheme.empty()) { next_scheme = scheme; }
-  if (next_host.empty()) { next_host = host_; }
-  if (next_path.empty()) { next_path = "/"; }
-
-  auto path = detail::decode_url(next_path, true) + next_query;
-
-  if (next_scheme == scheme && next_host == host_ && next_port == port_) {
-    return detail::redirect(*this, req, res, path, location, error);
-  } else {
-    if (next_scheme == "https") {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      SSLClient cli(next_host, next_port);
-      cli.copy_settings(*this);
-      if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); }
-      return detail::redirect(cli, req, res, path, location, error);
-#else
-      return false;
-#endif
-    } else {
-      ClientImpl cli(next_host, next_port);
-      cli.copy_settings(*this);
-      return detail::redirect(cli, req, res, path, location, error);
-    }
-  }
-}
-
-inline bool ClientImpl::write_content_with_provider(Stream &strm,
-                                                    const Request &req,
-                                                    Error &error) const {
-  auto is_shutting_down = []() { return false; };
-
-  if (req.is_chunked_content_provider_) {
-    // TODO: Brotli support
-    std::unique_ptr<detail::compressor> compressor;
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-    if (compress_) {
-      compressor = detail::make_unique<detail::gzip_compressor>();
-    } else
-#endif
-    {
-      compressor = detail::make_unique<detail::nocompressor>();
-    }
-
-    return detail::write_content_chunked(strm, req.content_provider_,
-                                         is_shutting_down, *compressor, error);
-  } else {
-    return detail::write_content(strm, req.content_provider_, 0,
-                                 req.content_length_, is_shutting_down, error);
-  }
-}
-
-inline bool ClientImpl::write_request(Stream &strm, Request &req,
-                                      bool close_connection, Error &error) {
-  // Prepare additional headers
-  if (close_connection) {
-    if (!req.has_header("Connection")) {
-      req.set_header("Connection", "close");
-    }
-  }
-
-  if (!req.has_header("Host")) {
-    if (is_ssl()) {
-      if (port_ == 443) {
-        req.set_header("Host", host_);
-      } else {
-        req.set_header("Host", host_and_port_);
-      }
-    } else {
-      if (port_ == 80) {
-        req.set_header("Host", host_);
-      } else {
-        req.set_header("Host", host_and_port_);
-      }
-    }
-  }
-
-  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
-
-#ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
-  if (!req.has_header("User-Agent")) {
-    auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
-    req.set_header("User-Agent", agent);
-  }
-#endif
-
-  if (req.body.empty()) {
-    if (req.content_provider_) {
-      if (!req.is_chunked_content_provider_) {
-        if (!req.has_header("Content-Length")) {
-          auto length = std::to_string(req.content_length_);
-          req.set_header("Content-Length", length);
-        }
-      }
-    } else {
-      if (req.method == "POST" || req.method == "PUT" ||
-          req.method == "PATCH") {
-        req.set_header("Content-Length", "0");
-      }
-    }
-  } else {
-    if (!req.has_header("Content-Type")) {
-      req.set_header("Content-Type", "text/plain");
-    }
-
-    if (!req.has_header("Content-Length")) {
-      auto length = std::to_string(req.body.size());
-      req.set_header("Content-Length", length);
-    }
-  }
-
-  if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) {
-    if (!req.has_header("Authorization")) {
-      req.headers.insert(make_basic_authentication_header(
-          basic_auth_username_, basic_auth_password_, false));
-    }
-  }
-
-  if (!proxy_basic_auth_username_.empty() &&
-      !proxy_basic_auth_password_.empty()) {
-    if (!req.has_header("Proxy-Authorization")) {
-      req.headers.insert(make_basic_authentication_header(
-          proxy_basic_auth_username_, proxy_basic_auth_password_, true));
-    }
-  }
-
-  if (!bearer_token_auth_token_.empty()) {
-    if (!req.has_header("Authorization")) {
-      req.headers.insert(make_bearer_token_authentication_header(
-          bearer_token_auth_token_, false));
-    }
-  }
-
-  if (!proxy_bearer_token_auth_token_.empty()) {
-    if (!req.has_header("Proxy-Authorization")) {
-      req.headers.insert(make_bearer_token_authentication_header(
-          proxy_bearer_token_auth_token_, true));
-    }
-  }
-
-  // Request line and headers
-  {
-    detail::BufferStream bstrm;
-
-    const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path;
-    detail::write_request_line(bstrm, req.method, path);
-
-    header_writer_(bstrm, req.headers);
-
-    // Flush buffer
-    auto &data = bstrm.get_buffer();
-    if (!detail::write_data(strm, data.data(), data.size())) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  // Body
-  if (req.body.empty()) {
-    return write_content_with_provider(strm, req, error);
-  }
-
-  if (!detail::write_data(strm, req.body.data(), req.body.size())) {
-    error = Error::Write;
-    return false;
-  }
-
-  return true;
-}
-
-inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
-    Request &req, const char *body, size_t content_length,
-    ContentProvider content_provider,
-    ContentProviderWithoutLength content_provider_without_length,
-    const std::string &content_type, Error &error) {
-  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_ && !content_provider_without_length) {
-    // TODO: Brotli support
-    detail::gzip_compressor compressor;
-
-    if (content_provider) {
-      auto ok = true;
-      size_t offset = 0;
-      DataSink data_sink;
-
-      data_sink.write = [&](const char *data, size_t data_len) -> bool {
-        if (ok) {
-          auto last = offset + data_len == content_length;
-
-          auto ret = compressor.compress(
-              data, data_len, last,
-              [&](const char *compressed_data, size_t compressed_data_len) {
-                req.body.append(compressed_data, compressed_data_len);
-                return true;
-              });
-
-          if (ret) {
-            offset += data_len;
-          } else {
-            ok = false;
-          }
-        }
-        return ok;
-      };
-
-      while (ok && offset < content_length) {
-        if (!content_provider(offset, content_length - offset, data_sink)) {
-          error = Error::Canceled;
-          return nullptr;
-        }
-      }
-    } else {
-      if (!compressor.compress(body, content_length, true,
-                               [&](const char *data, size_t data_len) {
-                                 req.body.append(data, data_len);
-                                 return true;
-                               })) {
-        error = Error::Compression;
-        return nullptr;
-      }
-    }
-  } else
-#endif
-  {
-    if (content_provider) {
-      req.content_length_ = content_length;
-      req.content_provider_ = std::move(content_provider);
-      req.is_chunked_content_provider_ = false;
-    } else if (content_provider_without_length) {
-      req.content_length_ = 0;
-      req.content_provider_ = detail::ContentProviderAdapter(
-          std::move(content_provider_without_length));
-      req.is_chunked_content_provider_ = true;
-      req.set_header("Transfer-Encoding", "chunked");
-    } else {
-      req.body.assign(body, content_length);
-    }
-  }
-
-  auto res = detail::make_unique<Response>();
-  return send(req, *res, error) ? std::move(res) : nullptr;
-}
-
-inline Result ClientImpl::send_with_content_provider(
-    const std::string &method, const std::string &path, const Headers &headers,
-    const char *body, size_t content_length, ContentProvider content_provider,
-    ContentProviderWithoutLength content_provider_without_length,
-    const std::string &content_type, Progress progress) {
-  Request req;
-  req.method = method;
-  req.headers = headers;
-  req.path = path;
-  req.progress = progress;
-
-  auto error = Error::Success;
-
-  auto res = send_with_content_provider(
-      req, body, content_length, std::move(content_provider),
-      std::move(content_provider_without_length), content_type, error);
-
-  return Result{std::move(res), error, std::move(req.headers)};
-}
-
-inline std::string
-ClientImpl::adjust_host_string(const std::string &host) const {
-  if (host.find(':') != std::string::npos) { return "[" + host + "]"; }
-  return host;
-}
-
-inline bool ClientImpl::process_request(Stream &strm, Request &req,
-                                        Response &res, bool close_connection,
-                                        Error &error) {
-  // Send request
-  if (!write_request(strm, req, close_connection, error)) { return false; }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if (is_ssl()) {
-    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
-    if (!is_proxy_enabled) {
-      char buf[1];
-      if (SSL_peek(socket_.ssl, buf, 1) == 0 &&
-          SSL_get_error(socket_.ssl, 0) == SSL_ERROR_ZERO_RETURN) {
-        error = Error::SSLPeerCouldBeClosed_;
-        return false;
-      }
-    }
-  }
-#endif
-
-  // Receive response and headers
-  if (!read_response_line(strm, req, res) ||
-      !detail::read_headers(strm, res.headers)) {
-    error = Error::Read;
-    return false;
-  }
-
-  // Body
-  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
-      req.method != "CONNECT") {
-    auto redirect = 300 < res.status && res.status < 400 && follow_location_;
-
-    if (req.response_handler && !redirect) {
-      if (!req.response_handler(res)) {
-        error = Error::Canceled;
-        return false;
-      }
-    }
-
-    auto out =
-        req.content_receiver
-            ? static_cast<ContentReceiverWithProgress>(
-                  [&](const char *buf, size_t n, uint64_t off, uint64_t len) {
-                    if (redirect) { return true; }
-                    auto ret = req.content_receiver(buf, n, off, len);
-                    if (!ret) { error = Error::Canceled; }
-                    return ret;
-                  })
-            : static_cast<ContentReceiverWithProgress>(
-                  [&](const char *buf, size_t n, uint64_t /*off*/,
-                      uint64_t /*len*/) {
-                    if (res.body.size() + n > res.body.max_size()) {
-                      return false;
-                    }
-                    res.body.append(buf, n);
-                    return true;
-                  });
-
-    auto progress = [&](uint64_t current, uint64_t total) {
-      if (!req.progress || redirect) { return true; }
-      auto ret = req.progress(current, total);
-      if (!ret) { error = Error::Canceled; }
-      return ret;
-    };
-
-    if (res.has_header("Content-Length")) {
-      if (!req.content_receiver) {
-        auto len = std::min<size_t>(res.get_header_value_u64("Content-Length"),
-                                    res.body.max_size());
-        if (len > 0) { res.body.reserve(len); }
-      }
-    }
-
-    int dummy_status;
-    if (!detail::read_content(strm, res, (std::numeric_limits<size_t>::max)(),
-                              dummy_status, std::move(progress), std::move(out),
-                              decompress_)) {
-      if (error != Error::Canceled) { error = Error::Read; }
-      return false;
-    }
-  }
-
-  // Log
-  if (logger_) { logger_(req, res); }
-
-  return true;
-}
-
-inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
-    const std::string &boundary, const MultipartFormDataItems &items,
-    const MultipartFormDataProviderItems &provider_items) const {
-  size_t cur_item = 0;
-  size_t cur_start = 0;
-  // cur_item and cur_start are copied to within the std::function and maintain
-  // state between successive calls
-  return [&, cur_item, cur_start](size_t offset,
-                                  DataSink &sink) mutable -> bool {
-    if (!offset && !items.empty()) {
-      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
-      return true;
-    } else if (cur_item < provider_items.size()) {
-      if (!cur_start) {
-        const auto &begin = detail::serialize_multipart_formdata_item_begin(
-            provider_items[cur_item], boundary);
-        offset += begin.size();
-        cur_start = offset;
-        sink.os << begin;
-      }
-
-      DataSink cur_sink;
-      auto has_data = true;
-      cur_sink.write = sink.write;
-      cur_sink.done = [&]() { has_data = false; };
-
-      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
-        return false;
-      }
-
-      if (!has_data) {
-        sink.os << detail::serialize_multipart_formdata_item_end();
-        cur_item++;
-        cur_start = 0;
-      }
-      return true;
-    } else {
-      sink.os << detail::serialize_multipart_formdata_finish(boundary);
-      sink.done();
-      return true;
-    }
-  };
-}
-
-inline bool
-ClientImpl::process_socket(const Socket &socket,
-                           std::function<bool(Stream &strm)> callback) {
-  return detail::process_client_socket(
-      socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_, std::move(callback));
-}
-
-inline bool ClientImpl::is_ssl() const { return false; }
-
-inline Result ClientImpl::Get(const std::string &path) {
-  return Get(path, Headers(), Progress());
-}
-
-inline Result ClientImpl::Get(const std::string &path, Progress progress) {
-  return Get(path, Headers(), std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers) {
-  return Get(path, headers, Progress());
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              Progress progress) {
-  Request req;
-  req.method = "GET";
-  req.path = path;
-  req.headers = headers;
-  req.progress = std::move(progress);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ContentReceiver content_receiver) {
-  return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, Headers(), nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ContentReceiver content_receiver) {
-  return Get(path, headers, nullptr, std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, headers, nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver) {
-  return Get(path, Headers(), std::move(response_handler),
-             std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver) {
-  return Get(path, headers, std::move(response_handler),
-             std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, Headers(), std::move(response_handler),
-             std::move(content_receiver), std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  Request req;
-  req.method = "GET";
-  req.path = path;
-  req.headers = headers;
-  req.response_handler = std::move(response_handler);
-  req.content_receiver =
-      [content_receiver](const char *data, size_t data_length,
-                         uint64_t /*offset*/, uint64_t /*total_length*/) {
-        return content_receiver(data, data_length);
-      };
-  req.progress = std::move(progress);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers, Progress progress) {
-  if (params.empty()) { return Get(path, headers); }
-
-  std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query, headers, std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, params, headers, nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  if (params.empty()) {
-    return Get(path, headers, std::move(response_handler),
-               std::move(content_receiver), std::move(progress));
-  }
-
-  std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query, headers, std::move(response_handler),
-             std::move(content_receiver), std::move(progress));
-}
-
-inline Result ClientImpl::Head(const std::string &path) {
-  return Head(path, Headers());
-}
-
-inline Result ClientImpl::Head(const std::string &path,
-                               const Headers &headers) {
-  Request req;
-  req.method = "HEAD";
-  req.headers = headers;
-  req.path = path;
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Post(const std::string &path) {
-  return Post(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               const Headers &headers) {
-  return Post(path, headers, nullptr, 0, std::string());
-}
-
-inline Result ClientImpl::Post(const std::string &path, const char *body,
-                               size_t content_length,
-                               const std::string &content_type) {
-  return Post(path, Headers(), body, content_length, content_type, nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const char *body, size_t content_length,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const char *body, size_t content_length,
-                               const std::string &content_type,
-                               Progress progress) {
-  return send_with_content_provider("POST", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const std::string &body,
-                               const std::string &content_type) {
-  return Post(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const std::string &body,
-                               const std::string &content_type,
-                               Progress progress) {
-  return Post(path, Headers(), body, content_type, progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const std::string &body,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const std::string &body,
-                               const std::string &content_type,
-                               Progress progress) {
-  return send_with_content_provider("POST", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Params &params) {
-  return Post(path, Headers(), params);
-}
-
-inline Result ClientImpl::Post(const std::string &path, size_t content_length,
-                               ContentProvider content_provider,
-                               const std::string &content_type) {
-  return Post(path, Headers(), content_length, std::move(content_provider),
-              content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               ContentProviderWithoutLength content_provider,
-                               const std::string &content_type) {
-  return Post(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               size_t content_length,
-                               ContentProvider content_provider,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               ContentProviderWithoutLength content_provider,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const Params &params) {
-  auto query = detail::params_to_query_str(params);
-  return Post(path, headers, query, "application/x-www-form-urlencoded");
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const Params &params, Progress progress) {
-  auto query = detail::params_to_query_str(params);
-  return Post(path, headers, query, "application/x-www-form-urlencoded",
-              progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               const MultipartFormDataItems &items) {
-  return Post(path, Headers(), items);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const MultipartFormDataItems &items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Post(path, headers, body, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const MultipartFormDataItems &items,
-                               const std::string &boundary) {
-  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
-    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-  }
-
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Post(path, headers, body, content_type);
-}
-
-inline Result
-ClientImpl::Post(const std::string &path, const Headers &headers,
-                 const MultipartFormDataItems &items,
-                 const MultipartFormDataProviderItems &provider_items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  return send_with_content_provider(
-      "POST", path, headers, nullptr, 0, nullptr,
-      get_multipart_content_provider(boundary, items, provider_items),
-      content_type, nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path) {
-  return Put(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Put(const std::string &path, const char *body,
-                              size_t content_length,
-                              const std::string &content_type) {
-  return Put(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const char *body, size_t content_length,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const char *body, size_t content_length,
-                              const std::string &content_type,
-                              Progress progress) {
-  return send_with_content_provider("PUT", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const std::string &body,
-                              const std::string &content_type) {
-  return Put(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const std::string &body,
-                              const std::string &content_type,
-                              Progress progress) {
-  return Put(path, Headers(), body, content_type, progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const std::string &body,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const std::string &body,
-                              const std::string &content_type,
-                              Progress progress) {
-  return send_with_content_provider("PUT", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path, size_t content_length,
-                              ContentProvider content_provider,
-                              const std::string &content_type) {
-  return Put(path, Headers(), content_length, std::move(content_provider),
-             content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path,
-                              ContentProviderWithoutLength content_provider,
-                              const std::string &content_type) {
-  return Put(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              size_t content_length,
-                              ContentProvider content_provider,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              ContentProviderWithoutLength content_provider,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Params &params) {
-  return Put(path, Headers(), params);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const Params &params) {
-  auto query = detail::params_to_query_str(params);
-  return Put(path, headers, query, "application/x-www-form-urlencoded");
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const Params &params, Progress progress) {
-  auto query = detail::params_to_query_str(params);
-  return Put(path, headers, query, "application/x-www-form-urlencoded",
-             progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path,
-                              const MultipartFormDataItems &items) {
-  return Put(path, Headers(), items);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const MultipartFormDataItems &items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Put(path, headers, body, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const MultipartFormDataItems &items,
-                              const std::string &boundary) {
-  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
-    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-  }
-
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Put(path, headers, body, content_type);
-}
-
-inline Result
-ClientImpl::Put(const std::string &path, const Headers &headers,
-                const MultipartFormDataItems &items,
-                const MultipartFormDataProviderItems &provider_items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  return send_with_content_provider(
-      "PUT", path, headers, nullptr, 0, nullptr,
-      get_multipart_content_provider(boundary, items, provider_items),
-      content_type, nullptr);
-}
-inline Result ClientImpl::Patch(const std::string &path) {
-  return Patch(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const char *body,
-                                size_t content_length,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const char *body,
-                                size_t content_length,
-                                const std::string &content_type,
-                                Progress progress) {
-  return Patch(path, Headers(), body, content_length, content_type, progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const char *body, size_t content_length,
-                                const std::string &content_type) {
-  return Patch(path, headers, body, content_length, content_type, nullptr);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const char *body, size_t content_length,
-                                const std::string &content_type,
-                                Progress progress) {
-  return send_with_content_provider("PATCH", path, headers, body,
-                                    content_length, nullptr, nullptr,
-                                    content_type, progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                const std::string &body,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                const std::string &body,
-                                const std::string &content_type,
-                                Progress progress) {
-  return Patch(path, Headers(), body, content_type, progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const std::string &body,
-                                const std::string &content_type) {
-  return Patch(path, headers, body, content_type, nullptr);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const std::string &body,
-                                const std::string &content_type,
-                                Progress progress) {
-  return send_with_content_provider("PATCH", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
-                                ContentProvider content_provider,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), content_length, std::move(content_provider),
-               content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                ContentProviderWithoutLength content_provider,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                size_t content_length,
-                                ContentProvider content_provider,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                ContentProviderWithoutLength content_provider,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Delete(const std::string &path) {
-  return Delete(path, Headers(), std::string(), std::string());
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers) {
-  return Delete(path, headers, std::string(), std::string());
-}
-
-inline Result ClientImpl::Delete(const std::string &path, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type) {
-  return Delete(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  return Delete(path, Headers(), body, content_length, content_type, progress);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type) {
-  return Delete(path, headers, body, content_length, content_type, nullptr);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  Request req;
-  req.method = "DELETE";
-  req.headers = headers;
-  req.path = path;
-  req.progress = progress;
-
-  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
-  req.body.assign(body, content_length);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const std::string &body,
-                                 const std::string &content_type) {
-  return Delete(path, Headers(), body.data(), body.size(), content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const std::string &body,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  return Delete(path, Headers(), body.data(), body.size(), content_type,
-                progress);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers,
-                                 const std::string &body,
-                                 const std::string &content_type) {
-  return Delete(path, headers, body.data(), body.size(), content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers,
-                                 const std::string &body,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  return Delete(path, headers, body.data(), body.size(), content_type,
-                progress);
-}
-
-inline Result ClientImpl::Options(const std::string &path) {
-  return Options(path, Headers());
-}
-
-inline Result ClientImpl::Options(const std::string &path,
-                                  const Headers &headers) {
-  Request req;
-  req.method = "OPTIONS";
-  req.headers = headers;
-  req.path = path;
-
-  return send_(std::move(req));
-}
-
-inline void ClientImpl::stop() {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-
-  // If there is anything ongoing right now, the ONLY thread-safe thing we can
-  // do is to shutdown_socket, so that threads using this socket suddenly
-  // discover they can't read/write any more and error out. Everything else
-  // (closing the socket, shutting ssl down) is unsafe because these actions are
-  // not thread-safe.
-  if (socket_requests_in_flight_ > 0) {
-    shutdown_socket(socket_);
-
-    // Aside from that, we set a flag for the socket to be closed when we're
-    // done.
-    socket_should_be_closed_when_request_is_done_ = true;
-    return;
-  }
-
-  // Otherwise, still holding the mutex, we can shut everything down ourselves
-  shutdown_ssl(socket_, true);
-  shutdown_socket(socket_);
-  close_socket(socket_);
-}
-
-inline std::string ClientImpl::host() const { return host_; }
-
-inline int ClientImpl::port() const { return port_; }
-
-inline size_t ClientImpl::is_socket_open() const {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  return socket_.is_open();
-}
-
-inline socket_t ClientImpl::socket() const { return socket_.sock; }
-
-inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
-  connection_timeout_sec_ = sec;
-  connection_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) {
-  read_timeout_sec_ = sec;
-  read_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
-  write_timeout_sec_ = sec;
-  write_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_basic_auth(const std::string &username,
-                                       const std::string &password) {
-  basic_auth_username_ = username;
-  basic_auth_password_ = password;
-}
-
-inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
-  bearer_token_auth_token_ = token;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_digest_auth(const std::string &username,
-                                        const std::string &password) {
-  digest_auth_username_ = username;
-  digest_auth_password_ = password;
-}
-#endif
-
-inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; }
-
-inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
-
-inline void ClientImpl::set_url_encode(bool on) { url_encode_ = on; }
-
-inline void
-ClientImpl::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
-  addr_map_ = std::move(addr_map);
-}
-
-inline void ClientImpl::set_default_headers(Headers headers) {
-  default_headers_ = std::move(headers);
-}
-
-inline void ClientImpl::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  header_writer_ = writer;
-}
-
-inline void ClientImpl::set_address_family(int family) {
-  address_family_ = family;
-}
-
-inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }
-
-inline void ClientImpl::set_ipv6_v6only(bool on) { ipv6_v6only_ = on; }
-
-inline void ClientImpl::set_socket_options(SocketOptions socket_options) {
-  socket_options_ = std::move(socket_options);
-}
-
-inline void ClientImpl::set_compress(bool on) { compress_ = on; }
-
-inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
-
-inline void ClientImpl::set_interface(const std::string &intf) {
-  interface_ = intf;
-}
-
-inline void ClientImpl::set_proxy(const std::string &host, int port) {
-  proxy_host_ = host;
-  proxy_port_ = port;
-}
-
-inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
-                                             const std::string &password) {
-  proxy_basic_auth_username_ = username;
-  proxy_basic_auth_password_ = password;
-}
-
-inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
-  proxy_bearer_token_auth_token_ = token;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
-                                              const std::string &password) {
-  proxy_digest_auth_username_ = username;
-  proxy_digest_auth_password_ = password;
-}
-
-inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
-                                         const std::string &ca_cert_dir_path) {
-  ca_cert_file_path_ = ca_cert_file_path;
-  ca_cert_dir_path_ = ca_cert_dir_path;
-}
-
-inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (ca_cert_store && ca_cert_store != ca_cert_store_) {
-    ca_cert_store_ = ca_cert_store;
-  }
-}
-
-inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
-                                                    std::size_t size) const {
-  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
-  auto se = detail::scope_exit([&] { BIO_free_all(mem); });
-  if (!mem) { return nullptr; }
-
-  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
-  if (!inf) { return nullptr; }
-
-  auto cts = X509_STORE_new();
-  if (cts) {
-    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
-      auto itmp = sk_X509_INFO_value(inf, i);
-      if (!itmp) { continue; }
-
-      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
-      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
-    }
-  }
-
-  sk_X509_INFO_pop_free(inf, X509_INFO_free);
-  return cts;
-}
-
-inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
-  server_certificate_verification_ = enabled;
-}
-
-inline void ClientImpl::enable_server_hostname_verification(bool enabled) {
-  server_hostname_verification_ = enabled;
-}
-
-inline void ClientImpl::set_server_certificate_verifier(
-    std::function<bool(SSL *ssl)> verifier) {
-  server_certificate_verifier_ = verifier;
-}
-#endif
-
-inline void ClientImpl::set_logger(Logger logger) {
-  logger_ = std::move(logger);
-}
-
-/*
- * SSL Implementation
- */
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-namespace detail {
-
-template <typename U, typename V>
-inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex,
-                    U SSL_connect_or_accept, V setup) {
-  SSL *ssl = nullptr;
-  {
-    std::lock_guard<std::mutex> guard(ctx_mutex);
-    ssl = SSL_new(ctx);
-  }
-
-  if (ssl) {
-    set_nonblocking(sock, true);
-    auto bio = BIO_new_socket(static_cast<int>(sock), BIO_NOCLOSE);
-    BIO_set_nbio(bio, 1);
-    SSL_set_bio(ssl, bio, bio);
-
-    if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) {
-      SSL_shutdown(ssl);
-      {
-        std::lock_guard<std::mutex> guard(ctx_mutex);
-        SSL_free(ssl);
-      }
-      set_nonblocking(sock, false);
-      return nullptr;
-    }
-    BIO_set_nbio(bio, 0);
-    set_nonblocking(sock, false);
-  }
-
-  return ssl;
-}
-
-inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, socket_t sock,
-                       bool shutdown_gracefully) {
-  // sometimes we may want to skip this to try to avoid SIGPIPE if we know
-  // the remote has closed the network connection
-  // Note that it is not always possible to avoid SIGPIPE, this is merely a
-  // best-efforts.
-  if (shutdown_gracefully) {
-#ifdef _WIN32
-    SSL_shutdown(ssl);
-#else
-    timeval tv;
-    tv.tv_sec = 1;
-    tv.tv_usec = 0;
-    setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-               reinterpret_cast<const void *>(&tv), sizeof(tv));
-
-    auto ret = SSL_shutdown(ssl);
-    while (ret == 0) {
-      std::this_thread::sleep_for(std::chrono::milliseconds{100});
-      ret = SSL_shutdown(ssl);
-    }
-#endif
-  }
-
-  std::lock_guard<std::mutex> guard(ctx_mutex);
-  SSL_free(ssl);
-}
-
-template <typename U>
-bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
-                                       U ssl_connect_or_accept,
-                                       time_t timeout_sec,
-                                       time_t timeout_usec) {
-  auto res = 0;
-  while ((res = ssl_connect_or_accept(ssl)) != 1) {
-    auto err = SSL_get_error(ssl, res);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; }
-      break;
-    case SSL_ERROR_WANT_WRITE:
-      if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; }
-      break;
-    default: break;
-    }
-    return false;
-  }
-  return true;
-}
-
-template <typename T>
-inline bool process_server_socket_ssl(
-    const std::atomic<socket_t> &svr_sock, SSL *ssl, socket_t sock,
-    size_t keep_alive_max_count, time_t keep_alive_timeout_sec,
-    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, T callback) {
-  return process_server_socket_core(
-      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
-      [&](bool close_connection, bool &connection_closed) {
-        SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
-                             write_timeout_sec, write_timeout_usec);
-        return callback(strm, close_connection, connection_closed);
-      });
-}
-
-template <typename T>
-inline bool
-process_client_socket_ssl(SSL *ssl, socket_t sock, time_t read_timeout_sec,
-                          time_t read_timeout_usec, time_t write_timeout_sec,
-                          time_t write_timeout_usec, T callback) {
-  SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
-                       write_timeout_sec, write_timeout_usec);
-  return callback(strm);
-}
-
-class SSLInit {
-public:
-  SSLInit() {
-    OPENSSL_init_ssl(
-        OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-  }
-};
-
-// SSL socket stream implementation
-inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl,
-                                        time_t read_timeout_sec,
-                                        time_t read_timeout_usec,
-                                        time_t write_timeout_sec,
-                                        time_t write_timeout_usec)
-    : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec),
-      read_timeout_usec_(read_timeout_usec),
-      write_timeout_sec_(write_timeout_sec),
-      write_timeout_usec_(write_timeout_usec) {
-  SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
-}
-
-inline SSLSocketStream::~SSLSocketStream() = default;
-
-inline bool SSLSocketStream::is_readable() const {
-  return detail::select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
-}
-
-inline bool SSLSocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
-         is_socket_alive(sock_);
-}
-
-inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
-  if (SSL_pending(ssl_) > 0) {
-    return SSL_read(ssl_, ptr, static_cast<int>(size));
-  } else if (is_readable()) {
-    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
-    if (ret < 0) {
-      auto err = SSL_get_error(ssl_, ret);
-      auto n = 1000;
-#ifdef _WIN32
-      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
-                          (err == SSL_ERROR_SYSCALL &&
-                           WSAGetLastError() == WSAETIMEDOUT))) {
-#else
-      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
-#endif
-        if (SSL_pending(ssl_) > 0) {
-          return SSL_read(ssl_, ptr, static_cast<int>(size));
-        } else if (is_readable()) {
-          std::this_thread::sleep_for(std::chrono::microseconds{10});
-          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
-          if (ret >= 0) { return ret; }
-          err = SSL_get_error(ssl_, ret);
-        } else {
-          return -1;
-        }
-      }
-    }
-    return ret;
-  }
-  return -1;
-}
-
-inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
-  if (is_writable()) {
-    auto handle_size = static_cast<int>(
-        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
-
-    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
-    if (ret < 0) {
-      auto err = SSL_get_error(ssl_, ret);
-      auto n = 1000;
-#ifdef _WIN32
-      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
-                          (err == SSL_ERROR_SYSCALL &&
-                           WSAGetLastError() == WSAETIMEDOUT))) {
-#else
-      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
-#endif
-        if (is_writable()) {
-          std::this_thread::sleep_for(std::chrono::microseconds{10});
-          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
-          if (ret >= 0) { return ret; }
-          err = SSL_get_error(ssl_, ret);
-        } else {
-          return -1;
-        }
-      }
-    }
-    return ret;
-  }
-  return -1;
-}
-
-inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
-                                                    int &port) const {
-  detail::get_remote_ip_and_port(sock_, ip, port);
-}
-
-inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
-                                                   int &port) const {
-  detail::get_local_ip_and_port(sock_, ip, port);
-}
-
-inline socket_t SSLSocketStream::socket() const { return sock_; }
-
-static SSLInit sslinit_;
-
-} // namespace detail
-
-// SSL HTTP server implementation
-inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
-                            const char *client_ca_cert_file_path,
-                            const char *client_ca_cert_dir_path,
-                            const char *private_key_password) {
-  ctx_ = SSL_CTX_new(TLS_server_method());
-
-  if (ctx_) {
-    SSL_CTX_set_options(ctx_,
-                        SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
-
-    if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_,
-          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
-    }
-
-    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
-        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
-            1 ||
-        SSL_CTX_check_private_key(ctx_) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
-      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
-                                    client_ca_cert_dir_path);
-
-      SSL_CTX_set_verify(
-          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-    }
-  }
-}
-
-inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key,
-                            X509_STORE *client_ca_cert_store) {
-  ctx_ = SSL_CTX_new(TLS_server_method());
-
-  if (ctx_) {
-    SSL_CTX_set_options(ctx_,
-                        SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
-
-    if (SSL_CTX_use_certificate(ctx_, cert) != 1 ||
-        SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    } else if (client_ca_cert_store) {
-      SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
-
-      SSL_CTX_set_verify(
-          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-    }
-  }
-}
-
-inline SSLServer::SSLServer(
-    const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback) {
-  ctx_ = SSL_CTX_new(TLS_method());
-  if (ctx_) {
-    if (!setup_ssl_ctx_callback(*ctx_)) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLServer::~SSLServer() {
-  if (ctx_) { SSL_CTX_free(ctx_); }
-}
-
-inline bool SSLServer::is_valid() const { return ctx_; }
-
-inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
-
-inline void SSLServer::update_certs(X509 *cert, EVP_PKEY *private_key,
-                                    X509_STORE *client_ca_cert_store) {
-
-  std::lock_guard<std::mutex> guard(ctx_mutex_);
-
-  SSL_CTX_use_certificate(ctx_, cert);
-  SSL_CTX_use_PrivateKey(ctx_, private_key);
-
-  if (client_ca_cert_store != nullptr) {
-    SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
-  }
-}
-
-inline bool SSLServer::process_and_close_socket(socket_t sock) {
-  auto ssl = detail::ssl_new(
-      sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl2) {
-        return detail::ssl_connect_or_accept_nonblocking(
-            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_);
-      },
-      [](SSL * /*ssl2*/) { return true; });
-
-  auto ret = false;
-  if (ssl) {
-    std::string remote_addr;
-    int remote_port = 0;
-    detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
-
-    std::string local_addr;
-    int local_port = 0;
-    detail::get_local_ip_and_port(sock, local_addr, local_port);
-
-    ret = detail::process_server_socket_ssl(
-        svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
-        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-        write_timeout_usec_,
-        [&](Stream &strm, bool close_connection, bool &connection_closed) {
-          return process_request(strm, remote_addr, remote_port, local_addr,
-                                 local_port, close_connection,
-                                 connection_closed,
-                                 [&](Request &req) { req.ssl = ssl; });
-        });
-
-    // Shutdown gracefully if the result seemed successful, non-gracefully if
-    // the connection appeared to be closed.
-    const bool shutdown_gracefully = ret;
-    detail::ssl_delete(ctx_mutex_, ssl, sock, shutdown_gracefully);
-  }
-
-  detail::shutdown_socket(sock);
-  detail::close_socket(sock);
-  return ret;
-}
-
-// SSL HTTP client implementation
-inline SSLClient::SSLClient(const std::string &host)
-    : SSLClient(host, 443, std::string(), std::string()) {}
-
-inline SSLClient::SSLClient(const std::string &host, int port)
-    : SSLClient(host, port, std::string(), std::string()) {}
-
-inline SSLClient::SSLClient(const std::string &host, int port,
-                            const std::string &client_cert_path,
-                            const std::string &client_key_path,
-                            const std::string &private_key_password)
-    : ClientImpl(host, port, client_cert_path, client_key_path) {
-  ctx_ = SSL_CTX_new(TLS_client_method());
-
-  SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
-
-  detail::split(&host_[0], &host_[host_.size()], '.',
-                [&](const char *b, const char *e) {
-                  host_components_.emplace_back(b, e);
-                });
-
-  if (!client_cert_path.empty() && !client_key_path.empty()) {
-    if (!private_key_password.empty()) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_, reinterpret_cast<void *>(
-                    const_cast<char *>(private_key_password.c_str())));
-    }
-
-    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(),
-                                     SSL_FILETYPE_PEM) != 1 ||
-        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(),
-                                    SSL_FILETYPE_PEM) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLClient::SSLClient(const std::string &host, int port,
-                            X509 *client_cert, EVP_PKEY *client_key,
-                            const std::string &private_key_password)
-    : ClientImpl(host, port) {
-  ctx_ = SSL_CTX_new(TLS_client_method());
-
-  detail::split(&host_[0], &host_[host_.size()], '.',
-                [&](const char *b, const char *e) {
-                  host_components_.emplace_back(b, e);
-                });
-
-  if (client_cert != nullptr && client_key != nullptr) {
-    if (!private_key_password.empty()) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_, reinterpret_cast<void *>(
-                    const_cast<char *>(private_key_password.c_str())));
-    }
-
-    if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 ||
-        SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLClient::~SSLClient() {
-  if (ctx_) { SSL_CTX_free(ctx_); }
-  // Make sure to shut down SSL since shutdown_ssl will resolve to the
-  // base function rather than the derived function once we get to the
-  // base class destructor, and won't free the SSL (causing a leak).
-  shutdown_ssl_impl(socket_, true);
-}
-
-inline bool SSLClient::is_valid() const { return ctx_; }
-
-inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (ca_cert_store) {
-    if (ctx_) {
-      if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
-        // Free memory allocated for old cert and use new store `ca_cert_store`
-        SSL_CTX_set_cert_store(ctx_, ca_cert_store);
-      }
-    } else {
-      X509_STORE_free(ca_cert_store);
-    }
-  }
-}
-
-inline void SSLClient::load_ca_cert_store(const char *ca_cert,
-                                          std::size_t size) {
-  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
-}
-
-inline long SSLClient::get_openssl_verify_result() const {
-  return verify_result_;
-}
-
-inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }
-
-inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
-  return is_valid() && ClientImpl::create_and_connect_socket(socket, error);
-}
-
-// Assumes that socket_mutex_ is locked and that there are no requests in flight
-inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
-                                          bool &success, Error &error) {
-  success = true;
-  Response proxy_res;
-  if (!detail::process_client_socket(
-          socket.sock, read_timeout_sec_, read_timeout_usec_,
-          write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
-            Request req2;
-            req2.method = "CONNECT";
-            req2.path = host_and_port_;
-            return process_request(strm, req2, proxy_res, false, error);
-          })) {
-    // Thread-safe to close everything because we are assuming there are no
-    // requests in flight
-    shutdown_ssl(socket, true);
-    shutdown_socket(socket);
-    close_socket(socket);
-    success = false;
-    return false;
-  }
-
-  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
-    if (!proxy_digest_auth_username_.empty() &&
-        !proxy_digest_auth_password_.empty()) {
-      std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
-        proxy_res = Response();
-        if (!detail::process_client_socket(
-                socket.sock, read_timeout_sec_, read_timeout_usec_,
-                write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
-                  Request req3;
-                  req3.method = "CONNECT";
-                  req3.path = host_and_port_;
-                  req3.headers.insert(detail::make_digest_authentication_header(
-                      req3, auth, 1, detail::random_string(10),
-                      proxy_digest_auth_username_, proxy_digest_auth_password_,
-                      true));
-                  return process_request(strm, req3, proxy_res, false, error);
-                })) {
-          // Thread-safe to close everything because we are assuming there are
-          // no requests in flight
-          shutdown_ssl(socket, true);
-          shutdown_socket(socket);
-          close_socket(socket);
-          success = false;
-          return false;
-        }
-      }
-    }
-  }
-
-  // If status code is not 200, proxy request is failed.
-  // Set error to ProxyConnection and return proxy response
-  // as the response of the request
-  if (proxy_res.status != StatusCode::OK_200) {
-    error = Error::ProxyConnection;
-    res = std::move(proxy_res);
-    // Thread-safe to close everything because we are assuming there are
-    // no requests in flight
-    shutdown_ssl(socket, true);
-    shutdown_socket(socket);
-    close_socket(socket);
-    return false;
-  }
-
-  return true;
-}
-
-inline bool SSLClient::load_certs() {
-  auto ret = true;
-
-  std::call_once(initialize_cert_, [&]() {
-    std::lock_guard<std::mutex> guard(ctx_mutex_);
-    if (!ca_cert_file_path_.empty()) {
-      if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(),
-                                         nullptr)) {
-        ret = false;
-      }
-    } else if (!ca_cert_dir_path_.empty()) {
-      if (!SSL_CTX_load_verify_locations(ctx_, nullptr,
-                                         ca_cert_dir_path_.c_str())) {
-        ret = false;
-      }
-    } else {
-      auto loaded = false;
-#ifdef _WIN32
-      loaded =
-          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#if TARGET_OS_OSX
-      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
-    }
-  });
-
-  return ret;
-}
-
-inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
-  auto ssl = detail::ssl_new(
-      socket.sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl2) {
-        if (server_certificate_verification_) {
-          if (!load_certs()) {
-            error = Error::SSLLoadingCerts;
-            return false;
-          }
-          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
-        }
-
-        if (!detail::ssl_connect_or_accept_nonblocking(
-                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
-                connection_timeout_usec_)) {
-          error = Error::SSLConnection;
-          return false;
-        }
-
-        if (server_certificate_verification_) {
-          if (server_certificate_verifier_) {
-            if (!server_certificate_verifier_(ssl2)) {
-              error = Error::SSLServerVerification;
-              return false;
-            }
-          } else {
-            verify_result_ = SSL_get_verify_result(ssl2);
-
-            if (verify_result_ != X509_V_OK) {
-              error = Error::SSLServerVerification;
-              return false;
-            }
-
-            auto server_cert = SSL_get1_peer_certificate(ssl2);
-            auto se = detail::scope_exit([&] { X509_free(server_cert); });
-
-            if (server_cert == nullptr) {
-              error = Error::SSLServerVerification;
-              return false;
-            }
-
-            if (server_hostname_verification_) {
-              if (!verify_host(server_cert)) {
-                error = Error::SSLServerHostnameVerification;
-                return false;
-              }
-            }
-          }
-        }
-
-        return true;
-      },
-      [&](SSL *ssl2) {
-#if defined(OPENSSL_IS_BORINGSSL)
-        SSL_set_tlsext_host_name(ssl2, host_.c_str());
-#else
-        // NOTE: Direct call instead of using the OpenSSL macro to suppress
-        // -Wold-style-cast warning
-        SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name,
-                 static_cast<void *>(const_cast<char *>(host_.c_str())));
-#endif
-        return true;
-      });
-
-  if (ssl) {
-    socket.ssl = ssl;
-    return true;
-  }
-
-  shutdown_socket(socket);
-  close_socket(socket);
-  return false;
-}
-
-inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) {
-  shutdown_ssl_impl(socket, shutdown_gracefully);
-}
-
-inline void SSLClient::shutdown_ssl_impl(Socket &socket,
-                                         bool shutdown_gracefully) {
-  if (socket.sock == INVALID_SOCKET) {
-    assert(socket.ssl == nullptr);
-    return;
-  }
-  if (socket.ssl) {
-    detail::ssl_delete(ctx_mutex_, socket.ssl, socket.sock,
-                       shutdown_gracefully);
-    socket.ssl = nullptr;
-  }
-  assert(socket.ssl == nullptr);
-}
-
-inline bool
-SSLClient::process_socket(const Socket &socket,
-                          std::function<bool(Stream &strm)> callback) {
-  assert(socket.ssl);
-  return detail::process_client_socket_ssl(
-      socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_,
-      write_timeout_sec_, write_timeout_usec_, std::move(callback));
-}
-
-inline bool SSLClient::is_ssl() const { return true; }
-
-inline bool SSLClient::verify_host(X509 *server_cert) const {
-  /* Quote from RFC2818 section 3.1 "Server Identity"
-
-     If a subjectAltName extension of type dNSName is present, that MUST
-     be used as the identity. Otherwise, the (most specific) Common Name
-     field in the Subject field of the certificate MUST be used. Although
-     the use of the Common Name is existing practice, it is deprecated and
-     Certification Authorities are encouraged to use the dNSName instead.
-
-     Matching is performed using the matching rules specified by
-     [RFC2459].  If more than one identity of a given type is present in
-     the certificate (e.g., more than one dNSName name, a match in any one
-     of the set is considered acceptable.) Names may contain the wildcard
-     character * which is considered to match any single domain name
-     component or component fragment. E.g., *.a.com matches foo.a.com but
-     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
-
-     In some cases, the URI is specified as an IP address rather than a
-     hostname. In this case, the iPAddress subjectAltName must be present
-     in the certificate and must exactly match the IP in the URI.
-
-  */
-  return verify_host_with_subject_alt_name(server_cert) ||
-         verify_host_with_common_name(server_cert);
-}
-
-inline bool
-SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
-  auto ret = false;
-
-  auto type = GEN_DNS;
-
-  struct in6_addr addr6 {};
-  struct in_addr addr {};
-  size_t addr_len = 0;
-
-#ifndef __MINGW32__
-  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
-    type = GEN_IPADD;
-    addr_len = sizeof(struct in6_addr);
-  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
-    type = GEN_IPADD;
-    addr_len = sizeof(struct in_addr);
-  }
-#endif
-
-  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
-      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
-
-  if (alt_names) {
-    auto dsn_matched = false;
-    auto ip_matched = false;
-
-    auto count = sk_GENERAL_NAME_num(alt_names);
-
-    for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
-      auto val = sk_GENERAL_NAME_value(alt_names, i);
-      if (val->type == type) {
-        auto name =
-            reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
-        auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
-
-        switch (type) {
-        case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
-
-        case GEN_IPADD:
-          if (!memcmp(&addr6, name, addr_len) ||
-              !memcmp(&addr, name, addr_len)) {
-            ip_matched = true;
-          }
-          break;
-        }
-      }
-    }
-
-    if (dsn_matched || ip_matched) { ret = true; }
-  }
-
-  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
-      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
-  return ret;
-}
-
-inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
-  const auto subject_name = X509_get_subject_name(server_cert);
-
-  if (subject_name != nullptr) {
-    char name[BUFSIZ];
-    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
-                                              name, sizeof(name));
-
-    if (name_len != -1) {
-      return check_host_name(name, static_cast<size_t>(name_len));
-    }
-  }
-
-  return false;
-}
-
-inline bool SSLClient::check_host_name(const char *pattern,
-                                       size_t pattern_len) const {
-  if (host_.size() == pattern_len && host_ == pattern) { return true; }
-
-  // Wildcard match
-  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
-  std::vector<std::string> pattern_components;
-  detail::split(&pattern[0], &pattern[pattern_len], '.',
-                [&](const char *b, const char *e) {
-                  pattern_components.emplace_back(b, e);
-                });
-
-  if (host_components_.size() != pattern_components.size()) { return false; }
-
-  auto itr = pattern_components.begin();
-  for (const auto &h : host_components_) {
-    auto &p = *itr;
-    if (p != h && p != "*") {
-      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
-                            !p.compare(0, p.size() - 1, h));
-      if (!partial_match) { return false; }
-    }
-    ++itr;
-  }
-
-  return true;
-}
-#endif
-
-// Universal client implementation
-inline Client::Client(const std::string &scheme_host_port)
-    : Client(scheme_host_port, std::string(), std::string()) {}
-
-inline Client::Client(const std::string &scheme_host_port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path) {
-  const static std::regex re(
-      R"((?:([a-z]+):\/\/)?(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)");
-
-  std::smatch m;
-  if (std::regex_match(scheme_host_port, m, re)) {
-    auto scheme = m[1].str();
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    if (!scheme.empty() && (scheme != "http" && scheme != "https")) {
-#else
-    if (!scheme.empty() && scheme != "http") {
-#endif
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-      std::string msg = "'" + scheme + "' scheme is not supported.";
-      throw std::invalid_argument(msg);
-#endif
-      return;
-    }
-
-    auto is_ssl = scheme == "https";
-
-    auto host = m[2].str();
-    if (host.empty()) { host = m[3].str(); }
-
-    auto port_str = m[4].str();
-    auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80);
-
-    if (is_ssl) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
-                                            client_key_path);
-      is_ssl_ = is_ssl;
-#endif
-    } else {
-      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
-                                             client_key_path);
-    }
-  } else {
-    // NOTE: Update TEST(UniversalClientImplTest, Ipv6LiteralAddress)
-    // if port param below changes.
-    cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
-                                           client_cert_path, client_key_path);
-  }
-} // namespace detail
-
-inline Client::Client(const std::string &host, int port)
-    : cli_(detail::make_unique<ClientImpl>(host, port)) {}
-
-inline Client::Client(const std::string &host, int port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path)
-    : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
-                                           client_key_path)) {}
-
-inline Client::~Client() = default;
-
-inline bool Client::is_valid() const {
-  return cli_ != nullptr && cli_->is_valid();
-}
-
-inline Result Client::Get(const std::string &path) { return cli_->Get(path); }
-inline Result Client::Get(const std::string &path, const Headers &headers) {
-  return cli_->Get(path, headers);
-}
-inline Result Client::Get(const std::string &path, Progress progress) {
-  return cli_->Get(path, std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          Progress progress) {
-  return cli_->Get(path, headers, std::move(progress));
-}
-inline Result Client::Get(const std::string &path,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, headers, std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, headers, std::move(content_receiver),
-                   std::move(progress));
-}
-inline Result Client::Get(const std::string &path,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, std::move(response_handler),
-                   std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, headers, std::move(response_handler),
-                   std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, headers, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(content_receiver),
-                   std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-
-inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
-inline Result Client::Head(const std::string &path, const Headers &headers) {
-  return cli_->Head(path, headers);
-}
-
-inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
-inline Result Client::Post(const std::string &path, const Headers &headers) {
-  return cli_->Post(path, headers);
-}
-inline Result Client::Post(const std::string &path, const char *body,
-                           size_t content_length,
-                           const std::string &content_type) {
-  return cli_->Post(path, body, content_length, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const char *body, size_t content_length,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, body, content_length, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const char *body, size_t content_length,
-                           const std::string &content_type, Progress progress) {
-  return cli_->Post(path, headers, body, content_length, content_type,
-                    progress);
-}
-inline Result Client::Post(const std::string &path, const std::string &body,
-                           const std::string &content_type) {
-  return cli_->Post(path, body, content_type);
-}
-inline Result Client::Post(const std::string &path, const std::string &body,
-                           const std::string &content_type, Progress progress) {
-  return cli_->Post(path, body, content_type, progress);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const std::string &body,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, body, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const std::string &body,
-                           const std::string &content_type, Progress progress) {
-  return cli_->Post(path, headers, body, content_type, progress);
-}
-inline Result Client::Post(const std::string &path, size_t content_length,
-                           ContentProvider content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, content_length, std::move(content_provider),
-                    content_type);
-}
-inline Result Client::Post(const std::string &path,
-                           ContentProviderWithoutLength content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, std::move(content_provider), content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           size_t content_length,
-                           ContentProvider content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, content_length, std::move(content_provider),
-                    content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           ContentProviderWithoutLength content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Post(const std::string &path, const Params &params) {
-  return cli_->Post(path, params);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const Params &params) {
-  return cli_->Post(path, headers, params);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const Params &params, Progress progress) {
-  return cli_->Post(path, headers, params, progress);
-}
-inline Result Client::Post(const std::string &path,
-                           const MultipartFormDataItems &items) {
-  return cli_->Post(path, items);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const MultipartFormDataItems &items) {
-  return cli_->Post(path, headers, items);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const MultipartFormDataItems &items,
-                           const std::string &boundary) {
-  return cli_->Post(path, headers, items, boundary);
-}
-inline Result
-Client::Post(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items) {
-  return cli_->Post(path, headers, items, provider_items);
-}
-inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
-inline Result Client::Put(const std::string &path, const char *body,
-                          size_t content_length,
-                          const std::string &content_type) {
-  return cli_->Put(path, body, content_length, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const char *body, size_t content_length,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, body, content_length, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const char *body, size_t content_length,
-                          const std::string &content_type, Progress progress) {
-  return cli_->Put(path, headers, body, content_length, content_type, progress);
-}
-inline Result Client::Put(const std::string &path, const std::string &body,
-                          const std::string &content_type) {
-  return cli_->Put(path, body, content_type);
-}
-inline Result Client::Put(const std::string &path, const std::string &body,
-                          const std::string &content_type, Progress progress) {
-  return cli_->Put(path, body, content_type, progress);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const std::string &body,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, body, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const std::string &body,
-                          const std::string &content_type, Progress progress) {
-  return cli_->Put(path, headers, body, content_type, progress);
-}
-inline Result Client::Put(const std::string &path, size_t content_length,
-                          ContentProvider content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, content_length, std::move(content_provider),
-                   content_type);
-}
-inline Result Client::Put(const std::string &path,
-                          ContentProviderWithoutLength content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, std::move(content_provider), content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          size_t content_length,
-                          ContentProvider content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, content_length, std::move(content_provider),
-                   content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          ContentProviderWithoutLength content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Put(const std::string &path, const Params &params) {
-  return cli_->Put(path, params);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const Params &params) {
-  return cli_->Put(path, headers, params);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const Params &params, Progress progress) {
-  return cli_->Put(path, headers, params, progress);
-}
-inline Result Client::Put(const std::string &path,
-                          const MultipartFormDataItems &items) {
-  return cli_->Put(path, items);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const MultipartFormDataItems &items) {
-  return cli_->Put(path, headers, items);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const MultipartFormDataItems &items,
-                          const std::string &boundary) {
-  return cli_->Put(path, headers, items, boundary);
-}
-inline Result
-Client::Put(const std::string &path, const Headers &headers,
-            const MultipartFormDataItems &items,
-            const MultipartFormDataProviderItems &provider_items) {
-  return cli_->Put(path, headers, items, provider_items);
-}
-inline Result Client::Patch(const std::string &path) {
-  return cli_->Patch(path);
-}
-inline Result Client::Patch(const std::string &path, const char *body,
-                            size_t content_length,
-                            const std::string &content_type) {
-  return cli_->Patch(path, body, content_length, content_type);
-}
-inline Result Client::Patch(const std::string &path, const char *body,
-                            size_t content_length,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, body, content_length, content_type, progress);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const char *body, size_t content_length,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, body, content_length, content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const char *body, size_t content_length,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, headers, body, content_length, content_type,
-                     progress);
-}
-inline Result Client::Patch(const std::string &path, const std::string &body,
-                            const std::string &content_type) {
-  return cli_->Patch(path, body, content_type);
-}
-inline Result Client::Patch(const std::string &path, const std::string &body,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, body, content_type, progress);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const std::string &body,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, body, content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const std::string &body,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, headers, body, content_type, progress);
-}
-inline Result Client::Patch(const std::string &path, size_t content_length,
-                            ContentProvider content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, content_length, std::move(content_provider),
-                     content_type);
-}
-inline Result Client::Patch(const std::string &path,
-                            ContentProviderWithoutLength content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, std::move(content_provider), content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            size_t content_length,
-                            ContentProvider content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, content_length, std::move(content_provider),
-                     content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            ContentProviderWithoutLength content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Delete(const std::string &path) {
-  return cli_->Delete(path);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers) {
-  return cli_->Delete(path, headers);
-}
-inline Result Client::Delete(const std::string &path, const char *body,
-                             size_t content_length,
-                             const std::string &content_type) {
-  return cli_->Delete(path, body, content_length, content_type);
-}
-inline Result Client::Delete(const std::string &path, const char *body,
-                             size_t content_length,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, body, content_length, content_type, progress);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const char *body, size_t content_length,
-                             const std::string &content_type) {
-  return cli_->Delete(path, headers, body, content_length, content_type);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const char *body, size_t content_length,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, headers, body, content_length, content_type,
-                      progress);
-}
-inline Result Client::Delete(const std::string &path, const std::string &body,
-                             const std::string &content_type) {
-  return cli_->Delete(path, body, content_type);
-}
-inline Result Client::Delete(const std::string &path, const std::string &body,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, body, content_type, progress);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const std::string &body,
-                             const std::string &content_type) {
-  return cli_->Delete(path, headers, body, content_type);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const std::string &body,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, headers, body, content_type, progress);
-}
-inline Result Client::Options(const std::string &path) {
-  return cli_->Options(path);
-}
-inline Result Client::Options(const std::string &path, const Headers &headers) {
-  return cli_->Options(path, headers);
-}
-
-inline bool Client::send(Request &req, Response &res, Error &error) {
-  return cli_->send(req, res, error);
-}
-
-inline Result Client::send(const Request &req) { return cli_->send(req); }
-
-inline void Client::stop() { cli_->stop(); }
-
-inline std::string Client::host() const { return cli_->host(); }
-
-inline int Client::port() const { return cli_->port(); }
-
-inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
-
-inline socket_t Client::socket() const { return cli_->socket(); }
-
-inline void
-Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
-  cli_->set_hostname_addr_map(std::move(addr_map));
-}
-
-inline void Client::set_default_headers(Headers headers) {
-  cli_->set_default_headers(std::move(headers));
-}
-
-inline void Client::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  cli_->set_header_writer(writer);
-}
-
-inline void Client::set_address_family(int family) {
-  cli_->set_address_family(family);
-}
-
-inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }
-
-inline void Client::set_socket_options(SocketOptions socket_options) {
-  cli_->set_socket_options(std::move(socket_options));
-}
-
-inline void Client::set_connection_timeout(time_t sec, time_t usec) {
-  cli_->set_connection_timeout(sec, usec);
-}
-
-inline void Client::set_read_timeout(time_t sec, time_t usec) {
-  cli_->set_read_timeout(sec, usec);
-}
-
-inline void Client::set_write_timeout(time_t sec, time_t usec) {
-  cli_->set_write_timeout(sec, usec);
-}
-
-inline void Client::set_basic_auth(const std::string &username,
-                                   const std::string &password) {
-  cli_->set_basic_auth(username, password);
-}
-inline void Client::set_bearer_token_auth(const std::string &token) {
-  cli_->set_bearer_token_auth(token);
-}
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_digest_auth(const std::string &username,
-                                    const std::string &password) {
-  cli_->set_digest_auth(username, password);
-}
-#endif
-
-inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); }
-inline void Client::set_follow_location(bool on) {
-  cli_->set_follow_location(on);
-}
-
-inline void Client::set_url_encode(bool on) { cli_->set_url_encode(on); }
-
-inline void Client::set_compress(bool on) { cli_->set_compress(on); }
-
-inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
-
-inline void Client::set_interface(const std::string &intf) {
-  cli_->set_interface(intf);
-}
-
-inline void Client::set_proxy(const std::string &host, int port) {
-  cli_->set_proxy(host, port);
-}
-inline void Client::set_proxy_basic_auth(const std::string &username,
-                                         const std::string &password) {
-  cli_->set_proxy_basic_auth(username, password);
-}
-inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
-  cli_->set_proxy_bearer_token_auth(token);
-}
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_proxy_digest_auth(const std::string &username,
-                                          const std::string &password) {
-  cli_->set_proxy_digest_auth(username, password);
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::enable_server_certificate_verification(bool enabled) {
-  cli_->enable_server_certificate_verification(enabled);
-}
-
-inline void Client::enable_server_hostname_verification(bool enabled) {
-  cli_->enable_server_hostname_verification(enabled);
-}
-
-inline void Client::set_server_certificate_verifier(
-    std::function<bool(SSL *ssl)> verifier) {
-  cli_->set_server_certificate_verifier(verifier);
-}
-#endif
-
-inline void Client::set_logger(Logger logger) {
-  cli_->set_logger(std::move(logger));
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
-                                     const std::string &ca_cert_dir_path) {
-  cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
-}
-
-inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (is_ssl_) {
-    static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
-  } else {
-    cli_->set_ca_cert_store(ca_cert_store);
-  }
-}
-
-inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
-  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
-}
-
-inline long Client::get_openssl_verify_result() const {
-  if (is_ssl_) {
-    return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
-  }
-  return -1; // NOTE: -1 doesn't match any of X509_V_ERR_???
-}
-
-inline SSL_CTX *Client::ssl_context() const {
-  if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); }
-  return nullptr;
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-} // namespace httplib
-
-#if defined(_WIN32) && defined(CPPHTTPLIB_USE_POLL)
-#undef poll
-#endif
-
-#endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp
deleted file mode 100644
index 86070a10..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib-base/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "./httplib.h"
-using namespace httplib;
-
-int main() {
-  Server svr;
-
-  svr.Get("/", [](const Request &, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  svr.listen("0.0.0.0", 8080);
-}
diff --git a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp b/code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp
deleted file mode 100644
index ab2e757b..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/cpp-httplib/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "httplib.h"
-using namespace httplib;
-
-int main() {
-  Server svr;
-
-  svr.Get("/", [](const Request &, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  svr.listen("0.0.0.0", 8080);
-}
diff --git a/code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h b/code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h
deleted file mode 100644
index 0465f96d..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/crow/crow_all.h
+++ /dev/null
@@ -1,14316 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause AND ISC AND MIT
-/*BSD 3-Clause License
-
-Copyright (c) 2014-2017, ipkn
-              2020-2022, CrowCpp
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The Crow logo and other graphic material (excluding third party logos) used are under exclusive Copyright (c) 2021-2022, Farook Al-Sammarraie (The-EDev), All rights reserved.
-*/
-#pragma once
-// This file is generated from nginx/conf/mime.types using nginx_mime2cpp.py on 2021-12-03.
-#include <unordered_map>
-#include <string>
-
-namespace crow
-{
-    const std::unordered_map<std::string, std::string> mime_types{
-      {"shtml", "text/html"},
-      {"htm", "text/html"},
-      {"html", "text/html"},
-      {"css", "text/css"},
-      {"xml", "text/xml"},
-      {"gif", "image/gif"},
-      {"jpg", "image/jpeg"},
-      {"jpeg", "image/jpeg"},
-      {"js", "application/javascript"},
-      {"atom", "application/atom+xml"},
-      {"rss", "application/rss+xml"},
-      {"mml", "text/mathml"},
-      {"txt", "text/plain"},
-      {"jad", "text/vnd.sun.j2me.app-descriptor"},
-      {"wml", "text/vnd.wap.wml"},
-      {"htc", "text/x-component"},
-      {"avif", "image/avif"},
-      {"png", "image/png"},
-      {"svgz", "image/svg+xml"},
-      {"svg", "image/svg+xml"},
-      {"tiff", "image/tiff"},
-      {"tif", "image/tiff"},
-      {"wbmp", "image/vnd.wap.wbmp"},
-      {"webp", "image/webp"},
-      {"ico", "image/x-icon"},
-      {"jng", "image/x-jng"},
-      {"bmp", "image/x-ms-bmp"},
-      {"woff", "font/woff"},
-      {"woff2", "font/woff2"},
-      {"ear", "application/java-archive"},
-      {"war", "application/java-archive"},
-      {"jar", "application/java-archive"},
-      {"json", "application/json"},
-      {"hqx", "application/mac-binhex40"},
-      {"doc", "application/msword"},
-      {"pdf", "application/pdf"},
-      {"ai", "application/postscript"},
-      {"eps", "application/postscript"},
-      {"ps", "application/postscript"},
-      {"rtf", "application/rtf"},
-      {"m3u8", "application/vnd.apple.mpegurl"},
-      {"kml", "application/vnd.google-earth.kml+xml"},
-      {"kmz", "application/vnd.google-earth.kmz"},
-      {"xls", "application/vnd.ms-excel"},
-      {"eot", "application/vnd.ms-fontobject"},
-      {"ppt", "application/vnd.ms-powerpoint"},
-      {"odg", "application/vnd.oasis.opendocument.graphics"},
-      {"odp", "application/vnd.oasis.opendocument.presentation"},
-      {"ods", "application/vnd.oasis.opendocument.spreadsheet"},
-      {"odt", "application/vnd.oasis.opendocument.text"},
-      {"pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
-      {"xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
-      {"docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
-      {"wmlc", "application/vnd.wap.wmlc"},
-      {"wasm", "application/wasm"},
-      {"7z", "application/x-7z-compressed"},
-      {"cco", "application/x-cocoa"},
-      {"jardiff", "application/x-java-archive-diff"},
-      {"jnlp", "application/x-java-jnlp-file"},
-      {"run", "application/x-makeself"},
-      {"pm", "application/x-perl"},
-      {"pl", "application/x-perl"},
-      {"pdb", "application/x-pilot"},
-      {"prc", "application/x-pilot"},
-      {"rar", "application/x-rar-compressed"},
-      {"rpm", "application/x-redhat-package-manager"},
-      {"sea", "application/x-sea"},
-      {"swf", "application/x-shockwave-flash"},
-      {"sit", "application/x-stuffit"},
-      {"tk", "application/x-tcl"},
-      {"tcl", "application/x-tcl"},
-      {"crt", "application/x-x509-ca-cert"},
-      {"pem", "application/x-x509-ca-cert"},
-      {"der", "application/x-x509-ca-cert"},
-      {"xpi", "application/x-xpinstall"},
-      {"xhtml", "application/xhtml+xml"},
-      {"xspf", "application/xspf+xml"},
-      {"zip", "application/zip"},
-      {"dll", "application/octet-stream"},
-      {"exe", "application/octet-stream"},
-      {"bin", "application/octet-stream"},
-      {"deb", "application/octet-stream"},
-      {"dmg", "application/octet-stream"},
-      {"img", "application/octet-stream"},
-      {"iso", "application/octet-stream"},
-      {"msm", "application/octet-stream"},
-      {"msp", "application/octet-stream"},
-      {"msi", "application/octet-stream"},
-      {"kar", "audio/midi"},
-      {"midi", "audio/midi"},
-      {"mid", "audio/midi"},
-      {"mp3", "audio/mpeg"},
-      {"ogg", "audio/ogg"},
-      {"m4a", "audio/x-m4a"},
-      {"ra", "audio/x-realaudio"},
-      {"3gp", "video/3gpp"},
-      {"3gpp", "video/3gpp"},
-      {"ts", "video/mp2t"},
-      {"mp4", "video/mp4"},
-      {"mpg", "video/mpeg"},
-      {"mpeg", "video/mpeg"},
-      {"mov", "video/quicktime"},
-      {"webm", "video/webm"},
-      {"flv", "video/x-flv"},
-      {"m4v", "video/x-m4v"},
-      {"mng", "video/x-mng"},
-      {"asf", "video/x-ms-asf"},
-      {"asx", "video/x-ms-asf"},
-      {"wmv", "video/x-ms-wmv"},
-      {"avi", "video/x-msvideo"}};
-}
-
-
-#include <string>
-
-namespace crow
-{
-    /// An abstract class that allows any other class to be returned by a handler.
-    struct returnable
-    {
-        std::string content_type;
-        virtual std::string dump() const = 0;
-
-        returnable(std::string ctype):
-          content_type{ctype}
-        {}
-
-        virtual ~returnable(){};
-    };
-} // namespace crow
-
-
-#include <stdio.h>
-#include <string.h>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <iostream>
-#include <memory>
-
-namespace crow
-{
-
-// ----------------------------------------------------------------------------
-// qs_parse (modified)
-// https://github.com/bartgrantham/qs_parse
-// ----------------------------------------------------------------------------
-/*  Similar to strncmp, but handles URL-encoding for either string  */
-int qs_strncmp(const char* s, const char* qs, size_t n);
-
-
-/*  Finds the beginning of each key/value pair and stores a pointer in qs_kv.
- *  Also decodes the value portion of the k/v pair *in-place*.  In a future
- *  enhancement it will also have a compile-time option of sorting qs_kv
- *  alphabetically by key.  */
-size_t qs_parse(char* qs, char* qs_kv[], size_t qs_kv_size, bool parse_url);
-
-
-/*  Used by qs_parse to decode the value portion of a k/v pair  */
-int qs_decode(char * qs);
-
-
-/*  Looks up the value according to the key on a pre-processed query string
- *  A future enhancement will be a compile-time option to look up the key
- *  in a pre-sorted qs_kv array via a binary search.  */
-//char * qs_k2v(const char * key, char * qs_kv[], int qs_kv_size);
- char * qs_k2v(const char * key, char * const * qs_kv, size_t qs_kv_size, int nth);
-
-
-/*  Non-destructive lookup of value, based on key.  User provides the
- *  destinaton string and length.  */
-char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_len);
-
-// TODO: implement sorting of the qs_kv array; for now ensure it's not compiled
-#undef _qsSORTING
-
-// isxdigit _is_ available in <ctype.h>, but let's avoid another header instead
-#define CROW_QS_ISHEX(x)    ((((x)>='0'&&(x)<='9') || ((x)>='A'&&(x)<='F') || ((x)>='a'&&(x)<='f')) ? 1 : 0)
-#define CROW_QS_HEX2DEC(x)  (((x)>='0'&&(x)<='9') ? (x)-48 : ((x)>='A'&&(x)<='F') ? (x)-55 : ((x)>='a'&&(x)<='f') ? (x)-87 : 0)
-#define CROW_QS_ISQSCHR(x) ((((x)=='=')||((x)=='#')||((x)=='&')||((x)=='\0')) ? 0 : 1)
-
-inline int qs_strncmp(const char * s, const char * qs, size_t n)
-{
-    unsigned char u1, u2, unyb, lnyb;
-
-    while(n-- > 0)
-    {
-        u1 = static_cast<unsigned char>(*s++);
-        u2 = static_cast<unsigned char>(*qs++);
-
-        if ( ! CROW_QS_ISQSCHR(u1) ) {  u1 = '\0';  }
-        if ( ! CROW_QS_ISQSCHR(u2) ) {  u2 = '\0';  }
-
-        if ( u1 == '+' ) {  u1 = ' ';  }
-        if ( u1 == '%' ) // easier/safer than scanf
-        {
-            unyb = static_cast<unsigned char>(*s++);
-            lnyb = static_cast<unsigned char>(*s++);
-            if ( CROW_QS_ISHEX(unyb) && CROW_QS_ISHEX(lnyb) )
-                u1 = (CROW_QS_HEX2DEC(unyb) * 16) + CROW_QS_HEX2DEC(lnyb);
-            else
-                u1 = '\0';
-        }
-
-        if ( u2 == '+' ) {  u2 = ' ';  }
-        if ( u2 == '%' ) // easier/safer than scanf
-        {
-            unyb = static_cast<unsigned char>(*qs++);
-            lnyb = static_cast<unsigned char>(*qs++);
-            if ( CROW_QS_ISHEX(unyb) && CROW_QS_ISHEX(lnyb) )
-                u2 = (CROW_QS_HEX2DEC(unyb) * 16) + CROW_QS_HEX2DEC(lnyb);
-            else
-                u2 = '\0';
-        }
-
-        if ( u1 != u2 )
-            return u1 - u2;
-        if ( u1 == '\0' )
-            return 0;
-    }
-    if ( CROW_QS_ISQSCHR(*qs) )
-        return -1;
-    else
-        return 0;
-}
-
-
-inline size_t qs_parse(char* qs, char* qs_kv[], size_t qs_kv_size, bool parse_url = true)
-{
-    size_t i, j;
-    char * substr_ptr;
-
-    for(i=0; i<qs_kv_size; i++)  qs_kv[i] = NULL;
-
-    // find the beginning of the k/v substrings or the fragment
-    substr_ptr = parse_url ? qs + strcspn(qs, "?#") : qs;
-    if (parse_url)
-    {
-        if (substr_ptr[0] != '\0')
-            substr_ptr++;
-        else
-            return 0; // no query or fragment
-    }
-
-    i=0;
-    while(i<qs_kv_size)
-    {
-        qs_kv[i] = substr_ptr;
-        j = strcspn(substr_ptr, "&");
-        if ( substr_ptr[j] == '\0' ) { i++; break;  } // x &'s -> means x iterations of this loop -> means *x+1* k/v pairs
-        substr_ptr += j + 1;
-        i++;
-    }
-
-    // we only decode the values in place, the keys could have '='s in them
-    // which will hose our ability to distinguish keys from values later
-    for(j=0; j<i; j++)
-    {
-        substr_ptr = qs_kv[j] + strcspn(qs_kv[j], "=&#");
-        if ( substr_ptr[0] == '&' || substr_ptr[0] == '\0')  // blank value: skip decoding
-            substr_ptr[0] = '\0';
-        else
-            qs_decode(++substr_ptr);
-    }
-
-#ifdef _qsSORTING
-// TODO: qsort qs_kv, using qs_strncmp() for the comparison
-#endif
-
-    return i;
-}
-
-
-inline int qs_decode(char * qs)
-{
-    int i=0, j=0;
-
-    while( CROW_QS_ISQSCHR(qs[j]) )
-    {
-        if ( qs[j] == '+' ) {  qs[i] = ' ';  }
-        else if ( qs[j] == '%' ) // easier/safer than scanf
-        {
-            if ( ! CROW_QS_ISHEX(qs[j+1]) || ! CROW_QS_ISHEX(qs[j+2]) )
-            {
-                qs[i] = '\0';
-                return i;
-            }
-            qs[i] = (CROW_QS_HEX2DEC(qs[j+1]) * 16) + CROW_QS_HEX2DEC(qs[j+2]);
-            j+=2;
-        }
-        else
-        {
-            qs[i] = qs[j];
-        }
-        i++;  j++;
-    }
-    qs[i] = '\0';
-
-    return i;
-}
-
-
-inline char * qs_k2v(const char * key, char * const * qs_kv, size_t qs_kv_size, int nth = 0)
-{
-    size_t i;
-    size_t key_len, skip;
-
-    key_len = strlen(key);
-
-#ifdef _qsSORTING
-// TODO: binary search for key in the sorted qs_kv
-#else  // _qsSORTING
-    for(i=0; i<qs_kv_size; i++)
-    {
-        // we rely on the unambiguous '=' to find the value in our k/v pair
-        if ( qs_strncmp(key, qs_kv[i], key_len) == 0 )
-        {
-            skip = strcspn(qs_kv[i], "=");
-            if ( qs_kv[i][skip] == '=' )
-                skip++;
-            // return (zero-char value) ? ptr to trailing '\0' : ptr to value
-            if(nth == 0)
-                return qs_kv[i] + skip;
-            else
-                --nth;
-        }
-    }
-#endif  // _qsSORTING
-
-    return nullptr;
-}
-
-inline std::unique_ptr<std::pair<std::string, std::string>> qs_dict_name2kv(const char * dict_name, char * const * qs_kv, size_t qs_kv_size, int nth = 0)
-{
-    size_t i;
-    size_t name_len, skip_to_eq, skip_to_brace_open, skip_to_brace_close;
-
-    name_len = strlen(dict_name);
-
-#ifdef _qsSORTING
-// TODO: binary search for key in the sorted qs_kv
-#else  // _qsSORTING
-    for(i=0; i<qs_kv_size; i++)
-    {
-        if ( strncmp(dict_name, qs_kv[i], name_len) == 0 )
-        {
-            skip_to_eq = strcspn(qs_kv[i], "=");
-            if ( qs_kv[i][skip_to_eq] == '=' )
-                skip_to_eq++;
-            skip_to_brace_open = strcspn(qs_kv[i], "[");
-            if ( qs_kv[i][skip_to_brace_open] == '[' )
-                skip_to_brace_open++;
-            skip_to_brace_close = strcspn(qs_kv[i], "]");
-
-            if ( skip_to_brace_open <= skip_to_brace_close &&
-                 skip_to_brace_open > 0 &&
-                 skip_to_brace_close > 0 &&
-                 nth == 0 )
-            {
-                auto key = std::string(qs_kv[i] + skip_to_brace_open, skip_to_brace_close - skip_to_brace_open);
-                auto value = std::string(qs_kv[i] + skip_to_eq);
-                return std::unique_ptr<std::pair<std::string, std::string>>(new std::pair<std::string, std::string>(key, value));
-            }
-            else
-            {
-                --nth;
-            }
-        }
-    }
-#endif  // _qsSORTING
-
-    return nullptr;
-}
-
-
-inline char * qs_scanvalue(const char * key, const char * qs, char * val, size_t val_len)
-{
-    size_t i, key_len;
-    const char * tmp;
-
-    // find the beginning of the k/v substrings
-    if ( (tmp = strchr(qs, '?')) != NULL )
-        qs = tmp + 1;
-
-    key_len = strlen(key);
-    while(qs[0] != '#' && qs[0] != '\0')
-    {
-        if ( qs_strncmp(key, qs, key_len) == 0 )
-            break;
-        qs += strcspn(qs, "&") + 1;
-    }
-
-    if ( qs[0] == '\0' ) return NULL;
-
-    qs += strcspn(qs, "=&#");
-    if ( qs[0] == '=' )
-    {
-        qs++;
-        i = strcspn(qs, "&=#");
-#ifdef _MSC_VER
-        strncpy_s(val, val_len, qs, (val_len - 1)<(i + 1) ? (val_len - 1) : (i + 1));
-#else
-        strncpy(val, qs, (val_len - 1)<(i + 1) ? (val_len - 1) : (i + 1));
-#endif
-		qs_decode(val);
-    }
-    else
-    {
-        if ( val_len > 0 )
-            val[0] = '\0';
-    }
-
-    return val;
-}
-}
-// ----------------------------------------------------------------------------
-
-
-namespace crow
-{
-    struct request;
-    /// A class to represent any data coming after the `?` in the request URL into key-value pairs.
-    class query_string
-    {
-    public:
-        static const int MAX_KEY_VALUE_PAIRS_COUNT = 256;
-
-        query_string() = default;
-
-        query_string(const query_string& qs):
-          url_(qs.url_)
-        {
-            for (auto p : qs.key_value_pairs_)
-            {
-                key_value_pairs_.push_back((char*)(p - qs.url_.c_str() + url_.c_str()));
-            }
-        }
-
-        query_string& operator=(const query_string& qs)
-        {
-            url_ = qs.url_;
-            key_value_pairs_.clear();
-            for (auto p : qs.key_value_pairs_)
-            {
-                key_value_pairs_.push_back((char*)(p - qs.url_.c_str() + url_.c_str()));
-            }
-            return *this;
-        }
-
-        query_string& operator=(query_string&& qs) noexcept
-        {
-            key_value_pairs_ = std::move(qs.key_value_pairs_);
-            char* old_data = (char*)qs.url_.c_str();
-            url_ = std::move(qs.url_);
-            for (auto& p : key_value_pairs_)
-            {
-                p += (char*)url_.c_str() - old_data;
-            }
-            return *this;
-        }
-
-
-        query_string(std::string params, bool url = true):
-          url_(std::move(params))
-        {
-            if (url_.empty())
-                return;
-
-            key_value_pairs_.resize(MAX_KEY_VALUE_PAIRS_COUNT);
-            size_t count = qs_parse(&url_[0], &key_value_pairs_[0], MAX_KEY_VALUE_PAIRS_COUNT, url);
-
-            key_value_pairs_.resize(count);
-            key_value_pairs_.shrink_to_fit();
-        }
-
-        void clear()
-        {
-            key_value_pairs_.clear();
-            url_.clear();
-        }
-
-        friend std::ostream& operator<<(std::ostream& os, const query_string& qs)
-        {
-            os << "[ ";
-            for (size_t i = 0; i < qs.key_value_pairs_.size(); ++i)
-            {
-                if (i)
-                    os << ", ";
-                os << qs.key_value_pairs_[i];
-            }
-            os << " ]";
-            return os;
-        }
-
-        /// Get a value from a name, used for `?name=value`.
-
-        ///
-        /// Note: this method returns the value of the first occurrence of the key only, to return all occurrences, see \ref get_list().
-        char* get(const std::string& name) const
-        {
-            char* ret = qs_k2v(name.c_str(), key_value_pairs_.data(), key_value_pairs_.size());
-            return ret;
-        }
-
-        /// Works similar to \ref get() except it removes the item from the query string.
-        char* pop(const std::string& name)
-        {
-            char* ret = get(name);
-            if (ret != nullptr)
-            {
-                for (unsigned int i = 0; i < key_value_pairs_.size(); i++)
-                {
-                    std::string str_item(key_value_pairs_[i]);
-                    if (str_item.substr(0, name.size() + 1) == name + '=')
-                    {
-                        key_value_pairs_.erase(key_value_pairs_.begin() + i);
-                        break;
-                    }
-                }
-            }
-            return ret;
-        }
-
-        /// Returns a list of values, passed as `?name[]=value1&name[]=value2&...name[]=valuen` with n being the size of the list.
-
-        ///
-        /// Note: Square brackets in the above example are controlled by `use_brackets` boolean (true by default). If set to false, the example becomes `?name=value1,name=value2...name=valuen`
-        std::vector<char*> get_list(const std::string& name, bool use_brackets = true) const
-        {
-            std::vector<char*> ret;
-            std::string plus = name + (use_brackets ? "[]" : "");
-            char* element = nullptr;
-
-            int count = 0;
-            while (1)
-            {
-                element = qs_k2v(plus.c_str(), key_value_pairs_.data(), key_value_pairs_.size(), count++);
-                if (!element)
-                    break;
-                ret.push_back(element);
-            }
-            return ret;
-        }
-
-        /// Similar to \ref get_list() but it removes the
-        std::vector<char*> pop_list(const std::string& name, bool use_brackets = true)
-        {
-            std::vector<char*> ret = get_list(name, use_brackets);
-            if (!ret.empty())
-            {
-                for (unsigned int i = 0; i < key_value_pairs_.size(); i++)
-                {
-                    std::string str_item(key_value_pairs_[i]);
-                    if ((use_brackets ? (str_item.substr(0, name.size() + 3) == name + "[]=") : (str_item.substr(0, name.size() + 1) == name + '=')))
-                    {
-                        key_value_pairs_.erase(key_value_pairs_.begin() + i--);
-                    }
-                }
-            }
-            return ret;
-        }
-
-        /// Works similar to \ref get_list() except the brackets are mandatory must not be empty.
-
-        ///
-        /// For example calling `get_dict(yourname)` on `?yourname[sub1]=42&yourname[sub2]=84` would give a map containing `{sub1 : 42, sub2 : 84}`.
-        ///
-        /// if your query string has both empty brackets and ones with a key inside, use pop_list() to get all the values without a key before running this method.
-        std::unordered_map<std::string, std::string> get_dict(const std::string& name) const
-        {
-            std::unordered_map<std::string, std::string> ret;
-
-            int count = 0;
-            while (1)
-            {
-                if (auto element = qs_dict_name2kv(name.c_str(), key_value_pairs_.data(), key_value_pairs_.size(), count++))
-                    ret.insert(*element);
-                else
-                    break;
-            }
-            return ret;
-        }
-
-        /// Works the same as \ref get_dict() but removes the values from the query string.
-        std::unordered_map<std::string, std::string> pop_dict(const std::string& name)
-        {
-            std::unordered_map<std::string, std::string> ret = get_dict(name);
-            if (!ret.empty())
-            {
-                for (unsigned int i = 0; i < key_value_pairs_.size(); i++)
-                {
-                    std::string str_item(key_value_pairs_[i]);
-                    if (str_item.substr(0, name.size() + 1) == name + '[')
-                    {
-                        key_value_pairs_.erase(key_value_pairs_.begin() + i--);
-                    }
-                }
-            }
-            return ret;
-        }
-
-        std::vector<std::string> keys() const
-        {
-            std::vector<std::string> keys;
-            keys.reserve(key_value_pairs_.size());
-
-            for (const char* const element : key_value_pairs_)
-            {
-                const char* delimiter = strchr(element, '=');
-                if (delimiter)
-                    keys.emplace_back(element, delimiter);
-                else
-                    keys.emplace_back(element);
-            }
-
-            return keys;
-        }
-
-    private:
-        std::string url_;
-        std::vector<char*> key_value_pairs_;
-    };
-
-} // namespace crow
-
-#ifdef CROW_ENABLE_COMPRESSION
-
-#include <string>
-#include <zlib.h>
-
-// http://zlib.net/manual.html
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-    namespace compression
-    {
-        // Values used in the 'windowBits' parameter for deflateInit2.
-        enum algorithm
-        {
-            // 15 is the default value for deflate
-            DEFLATE = 15,
-            // 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.
-            GZIP = 15 | 16,
-        };
-
-        inline std::string compress_string(std::string const& str, algorithm algo)
-        {
-            std::string compressed_str;
-            z_stream stream{};
-            // Initialize with the default values
-            if (::deflateInit2(&stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, algo, 8, Z_DEFAULT_STRATEGY) == Z_OK)
-            {
-                char buffer[8192];
-
-                stream.avail_in = str.size();
-                // zlib does not take a const pointer. The data is not altered.
-                stream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(str.c_str()));
-
-                int code = Z_OK;
-                do
-                {
-                    stream.avail_out = sizeof(buffer);
-                    stream.next_out = reinterpret_cast<Bytef*>(&buffer[0]);
-
-                    code = ::deflate(&stream, Z_FINISH);
-                    // Successful and non-fatal error code returned by deflate when used with Z_FINISH flush
-                    if (code == Z_OK || code == Z_STREAM_END)
-                    {
-                        std::copy(&buffer[0], &buffer[sizeof(buffer) - stream.avail_out], std::back_inserter(compressed_str));
-                    }
-
-                } while (code == Z_OK);
-
-                if (code != Z_STREAM_END)
-                    compressed_str.clear();
-
-                ::deflateEnd(&stream);
-            }
-
-            return compressed_str;
-        }
-
-        inline std::string decompress_string(std::string const& deflated_string)
-        {
-            std::string inflated_string;
-            Bytef tmp[8192];
-
-            z_stream zstream{};
-            zstream.avail_in = deflated_string.size();
-            // Nasty const_cast but zlib won't alter its contents
-            zstream.next_in = const_cast<Bytef*>(reinterpret_cast<Bytef const*>(deflated_string.c_str()));
-            // Initialize with automatic header detection, for gzip support
-            if (::inflateInit2(&zstream, MAX_WBITS | 32) == Z_OK)
-            {
-                do
-                {
-                    zstream.avail_out = sizeof(tmp);
-                    zstream.next_out = &tmp[0];
-
-                    auto ret = ::inflate(&zstream, Z_NO_FLUSH);
-                    if (ret == Z_OK || ret == Z_STREAM_END)
-                    {
-                        std::copy(&tmp[0], &tmp[sizeof(tmp) - zstream.avail_out], std::back_inserter(inflated_string));
-                    }
-                    else
-                    {
-                        // Something went wrong with inflate; make sure we return an empty string
-                        inflated_string.clear();
-                        break;
-                    }
-
-                } while (zstream.avail_out == 0);
-
-                // Free zlib's internal memory
-                ::inflateEnd(&zstream);
-            }
-
-            return inflated_string;
-        }
-    } // namespace compression
-} // namespace crow
-
-#endif
-
-/*
- * SHA1 Wikipedia Page: http://en.wikipedia.org/wiki/SHA-1
- * 
- * Copyright (c) 2012-22 SAURAV MOHAPATRA <mohaps@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/** 
- * \file TinySHA1.hpp
- * \author SAURAV MOHAPATRA <mohaps@gmail.com>
- * \date 2012-22
- * \brief TinySHA1 - a header only implementation of the SHA1 algorithm in C++. Based
- * on the implementation in boost::uuid::details.
- *
- * In this file are defined:
- * - sha1::SHA1
- */
-#ifndef _TINY_SHA1_HPP_
-#define _TINY_SHA1_HPP_
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <stdint.h>
-
-/**
- * \namespace sha1
- * \brief Here is defined the SHA1 class
- */
-namespace sha1
-{
-	/**
-	 * \class SHA1
-	 * \brief A tiny SHA1 algorithm implementation used internally in the
-	 * Crow server (specifically in crow/websocket.h).
-	 */
-	class SHA1
-	{
-	public:
-		typedef uint32_t digest32_t[5];
-		typedef uint8_t digest8_t[20];
-		inline static uint32_t LeftRotate(uint32_t value, size_t count) {
-			return (value << count) ^ (value >> (32-count));
-		}
-		SHA1(){ reset(); }
-		virtual ~SHA1() {}
-		SHA1(const SHA1& s) { *this = s; }
-		const SHA1& operator = (const SHA1& s) {
-			memcpy(m_digest, s.m_digest, 5 * sizeof(uint32_t));
-			memcpy(m_block, s.m_block, 64);
-			m_blockByteIndex = s.m_blockByteIndex;
-			m_byteCount = s.m_byteCount;
-			return *this;
-		}
-		SHA1& reset() {
-			m_digest[0] = 0x67452301;
-			m_digest[1] = 0xEFCDAB89;
-			m_digest[2] = 0x98BADCFE;
-			m_digest[3] = 0x10325476;
-			m_digest[4] = 0xC3D2E1F0;
-			m_blockByteIndex = 0;
-			m_byteCount = 0;
-			return *this;
-		}
-		SHA1& processByte(uint8_t octet) {
-			this->m_block[this->m_blockByteIndex++] = octet;
-			++this->m_byteCount;
-			if(m_blockByteIndex == 64) {
-				this->m_blockByteIndex = 0;
-				processBlock();
-			}
-			return *this;
-		}
-		SHA1& processBlock(const void* const start, const void* const end) {
-			const uint8_t* begin = static_cast<const uint8_t*>(start);
-			const uint8_t* finish = static_cast<const uint8_t*>(end);
-			while(begin != finish) {
-				processByte(*begin);
-				begin++;
-			}
-			return *this;
-		}
-		SHA1& processBytes(const void* const data, size_t len) {
-			const uint8_t* block = static_cast<const uint8_t*>(data);
-			processBlock(block, block + len);
-			return *this;
-		}
-		const uint32_t* getDigest(digest32_t digest) {
-			size_t bitCount = this->m_byteCount * 8;
-			processByte(0x80);
-			if (this->m_blockByteIndex > 56) {
-				while (m_blockByteIndex != 0) {
-					processByte(0);
-				}
-				while (m_blockByteIndex < 56) {
-					processByte(0);
-				}
-			} else {
-				while (m_blockByteIndex < 56) {
-					processByte(0);
-				}
-			}
-			processByte(0);
-			processByte(0);
-			processByte(0);
-			processByte(0);
-			processByte( static_cast<unsigned char>((bitCount>>24) & 0xFF));
-			processByte( static_cast<unsigned char>((bitCount>>16) & 0xFF));
-			processByte( static_cast<unsigned char>((bitCount>>8 ) & 0xFF));
-			processByte( static_cast<unsigned char>((bitCount)     & 0xFF));
-	
-			memcpy(digest, m_digest, 5 * sizeof(uint32_t));
-			return digest;
-		}
-		const uint8_t* getDigestBytes(digest8_t digest) {
-			digest32_t d32;
-			getDigest(d32);
-			size_t di = 0;
-			digest[di++] = ((d32[0] >> 24) & 0xFF);
-			digest[di++] = ((d32[0] >> 16) & 0xFF);
-			digest[di++] = ((d32[0] >> 8) & 0xFF);
-			digest[di++] = ((d32[0]) & 0xFF);
-			
-			digest[di++] = ((d32[1] >> 24) & 0xFF);
-			digest[di++] = ((d32[1] >> 16) & 0xFF);
-			digest[di++] = ((d32[1] >> 8) & 0xFF);
-			digest[di++] = ((d32[1]) & 0xFF);
-			
-			digest[di++] = ((d32[2] >> 24) & 0xFF);
-			digest[di++] = ((d32[2] >> 16) & 0xFF);
-			digest[di++] = ((d32[2] >> 8) & 0xFF);
-			digest[di++] = ((d32[2]) & 0xFF);
-			
-			digest[di++] = ((d32[3] >> 24) & 0xFF);
-			digest[di++] = ((d32[3] >> 16) & 0xFF);
-			digest[di++] = ((d32[3] >> 8) & 0xFF);
-			digest[di++] = ((d32[3]) & 0xFF);
-			
-			digest[di++] = ((d32[4] >> 24) & 0xFF);
-			digest[di++] = ((d32[4] >> 16) & 0xFF);
-			digest[di++] = ((d32[4] >> 8) & 0xFF);
-			digest[di++] = ((d32[4]) & 0xFF);
-			return digest;
-		}
-	
-	protected:
-		void processBlock() {
-			uint32_t w[80];
-			for (size_t i = 0; i < 16; i++) {
-				w[i]  = (m_block[i*4 + 0] << 24);
-				w[i] |= (m_block[i*4 + 1] << 16);
-				w[i] |= (m_block[i*4 + 2] << 8);
-				w[i] |= (m_block[i*4 + 3]);
-			}
-			for (size_t i = 16; i < 80; i++) {
-				w[i] = LeftRotate((w[i-3] ^ w[i-8] ^ w[i-14] ^ w[i-16]), 1);
-			}
-	
-			uint32_t a = m_digest[0];
-			uint32_t b = m_digest[1];
-			uint32_t c = m_digest[2];
-			uint32_t d = m_digest[3];
-			uint32_t e = m_digest[4];
-	
-			for (std::size_t i=0; i<80; ++i) {
-				uint32_t f = 0;
-				uint32_t k = 0;
-	
-				if (i<20) {
-					f = (b & c) | (~b & d);
-					k = 0x5A827999;
-				} else if (i<40) {
-					f = b ^ c ^ d;
-					k = 0x6ED9EBA1;
-				} else if (i<60) {
-					f = (b & c) | (b & d) | (c & d);
-					k = 0x8F1BBCDC;
-				} else {
-					f = b ^ c ^ d;
-					k = 0xCA62C1D6;
-				}
-				uint32_t temp = LeftRotate(a, 5) + f + e + k + w[i];
-				e = d;
-				d = c;
-				c = LeftRotate(b, 30);
-				b = a;
-				a = temp;
-			}
-	
-			m_digest[0] += a;
-			m_digest[1] += b;
-			m_digest[2] += c;
-			m_digest[3] += d;
-			m_digest[4] += e;
-		}
-	private:
-		digest32_t m_digest;
-		uint8_t m_block[64];
-		size_t m_blockByteIndex;
-		size_t m_byteCount;
-	};
-}
-#endif
-
-// settings for crow
-// TODO(ipkn) replace with runtime config. libucl?
-
-/* #ifdef - enables debug mode */
-//#define CROW_ENABLE_DEBUG
-
-/* #ifdef - enables logging */
-#define CROW_ENABLE_LOGGING
-
-/* #ifdef - enforces section 5.2 and 6.1 of RFC6455 (only accepting masked messages from clients) */
-//#define CROW_ENFORCE_WS_SPEC
-
-/* #define - specifies log level */
-/*
-    Debug       = 0
-    Info        = 1
-    Warning     = 2
-    Error       = 3
-    Critical    = 4
-
-    default to INFO
-*/
-#ifndef CROW_LOG_LEVEL
-#define CROW_LOG_LEVEL 1
-#endif
-
-#ifndef CROW_STATIC_DIRECTORY
-#define CROW_STATIC_DIRECTORY "static/"
-#endif
-#ifndef CROW_STATIC_ENDPOINT
-#define CROW_STATIC_ENDPOINT "/static/<path>"
-#endif
-
-// compiler flags
-#if defined(_MSVC_LANG) && _MSVC_LANG >= 201402L
-#define CROW_CAN_USE_CPP14
-#endif
-#if __cplusplus >= 201402L
-#define CROW_CAN_USE_CPP14
-#endif
-
-#if defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
-#define CROW_CAN_USE_CPP17
-#endif
-#if __cplusplus >= 201703L
-#define CROW_CAN_USE_CPP17
-#if defined(__GNUC__) && __GNUC__ < 8
-#define CROW_FILESYSTEM_IS_EXPERIMENTAL
-#endif
-#endif
-
-#if defined(_MSC_VER)
-#if _MSC_VER < 1900
-#define CROW_MSVC_WORKAROUND
-#define constexpr const
-#define noexcept throw()
-#endif
-#endif
-
-#if defined(__GNUC__) && __GNUC__ == 8 && __GNUC_MINOR__ < 4
-#if __cplusplus > 201103L
-#define CROW_GCC83_WORKAROUND
-#else
-#error "GCC 8.1 - 8.3 has a bug that prevents Crow from compiling with C++11. Please update GCC to > 8.3 or use C++ > 11."
-#endif
-#endif
-
-
-#ifdef CROW_USE_BOOST
-#include <boost/asio.hpp>
-#include <boost/asio/version.hpp>
-#ifdef CROW_ENABLE_SSL
-#include <boost/asio/ssl.hpp>
-#endif
-#else
-#ifndef ASIO_STANDALONE
-#define ASIO_STANDALONE
-#endif
-#include <asio.hpp>
-#include <asio/version.hpp>
-#ifdef CROW_ENABLE_SSL
-#include <asio/ssl.hpp>
-#endif
-#endif
-
-#if (CROW_USE_BOOST && BOOST_VERSION >= 107000) || (ASIO_VERSION >= 101300)
-#define GET_IO_SERVICE(s) ((asio::io_context&)(s).get_executor().context())
-#else
-#define GET_IO_SERVICE(s) ((s).get_io_service())
-#endif
-
-namespace crow
-{
-#ifdef CROW_USE_BOOST
-    namespace asio = boost::asio;
-    using error_code = boost::system::error_code;
-#else
-    using error_code = asio::error_code;
-#endif
-    using tcp = asio::ip::tcp;
-
-    /// A wrapper for the asio::ip::tcp::socket and asio::ssl::stream
-    struct SocketAdaptor
-    {
-        using context = void;
-        SocketAdaptor(asio::io_service& io_service, context*):
-          socket_(io_service)
-        {}
-
-        asio::io_service& get_io_service()
-        {
-            return GET_IO_SERVICE(socket_);
-        }
-
-        /// Get the TCP socket handling data trasfers, regardless of what layer is handling transfers on top of the socket.
-        tcp::socket& raw_socket()
-        {
-            return socket_;
-        }
-
-        /// Get the object handling data transfers, this can be either a TCP socket or an SSL stream (if SSL is enabled).
-        tcp::socket& socket()
-        {
-            return socket_;
-        }
-
-        tcp::endpoint remote_endpoint()
-        {
-            return socket_.remote_endpoint();
-        }
-
-        bool is_open()
-        {
-            return socket_.is_open();
-        }
-
-        void close()
-        {
-            error_code ec;
-            socket_.close(ec);
-        }
-
-        void shutdown_readwrite()
-        {
-            error_code ec;
-            socket_.shutdown(asio::socket_base::shutdown_type::shutdown_both, ec);
-        }
-
-        void shutdown_write()
-        {
-            error_code ec;
-            socket_.shutdown(asio::socket_base::shutdown_type::shutdown_send, ec);
-        }
-
-        void shutdown_read()
-        {
-            error_code ec;
-            socket_.shutdown(asio::socket_base::shutdown_type::shutdown_receive, ec);
-        }
-
-        template<typename F>
-        void start(F f)
-        {
-            f(error_code());
-        }
-
-        tcp::socket socket_;
-    };
-
-#ifdef CROW_ENABLE_SSL
-    struct SSLAdaptor
-    {
-        using context = asio::ssl::context;
-        using ssl_socket_t = asio::ssl::stream<tcp::socket>;
-        SSLAdaptor(asio::io_service& io_service, context* ctx):
-          ssl_socket_(new ssl_socket_t(io_service, *ctx))
-        {}
-
-        asio::ssl::stream<tcp::socket>& socket()
-        {
-            return *ssl_socket_;
-        }
-
-        tcp::socket::lowest_layer_type&
-          raw_socket()
-        {
-            return ssl_socket_->lowest_layer();
-        }
-
-        tcp::endpoint remote_endpoint()
-        {
-            return raw_socket().remote_endpoint();
-        }
-
-        bool is_open()
-        {
-            return ssl_socket_ ? raw_socket().is_open() : false;
-        }
-
-        void close()
-        {
-            if (is_open())
-            {
-                error_code ec;
-                raw_socket().close(ec);
-            }
-        }
-
-        void shutdown_readwrite()
-        {
-            if (is_open())
-            {
-                error_code ec;
-                raw_socket().shutdown(asio::socket_base::shutdown_type::shutdown_both, ec);
-            }
-        }
-
-        void shutdown_write()
-        {
-            if (is_open())
-            {
-                error_code ec;
-                raw_socket().shutdown(asio::socket_base::shutdown_type::shutdown_send, ec);
-            }
-        }
-
-        void shutdown_read()
-        {
-            if (is_open())
-            {
-                error_code ec;
-                raw_socket().shutdown(asio::socket_base::shutdown_type::shutdown_receive, ec);
-            }
-        }
-
-        asio::io_service& get_io_service()
-        {
-            return GET_IO_SERVICE(raw_socket());
-        }
-
-        template<typename F>
-        void start(F f)
-        {
-            ssl_socket_->async_handshake(asio::ssl::stream_base::server,
-                                         [f](const error_code& ec) {
-                                             f(ec);
-                                         });
-        }
-
-        std::unique_ptr<asio::ssl::stream<tcp::socket>> ssl_socket_;
-    };
-#endif
-} // namespace crow
-
-
-#include <cstdint>
-#include <stdexcept>
-#include <tuple>
-#include <type_traits>
-#include <cstring>
-#include <cctype>
-#include <functional>
-#include <string>
-#include <sstream>
-#include <unordered_map>
-#include <random>
-#include <algorithm>
-
-
-#if defined(CROW_CAN_USE_CPP17) && !defined(CROW_FILESYSTEM_IS_EXPERIMENTAL)
-#include <filesystem>
-#endif
-
-// TODO(EDev): Adding C++20's [[likely]] and [[unlikely]] attributes might be useful
-#if defined(__GNUG__) || defined(__clang__)
-#define CROW_LIKELY(X) __builtin_expect(!!(X), 1)
-#define CROW_UNLIKELY(X) __builtin_expect(!!(X), 0)
-#else
-#define CROW_LIKELY(X) (X)
-#define CROW_UNLIKELY(X) (X)
-#endif
-
-namespace crow
-{
-    /// @cond SKIP
-    namespace black_magic
-    {
-#ifndef CROW_MSVC_WORKAROUND
-        /// Out of Range Exception for const_str
-        struct OutOfRange
-        {
-            OutOfRange(unsigned /*pos*/, unsigned /*length*/) {}
-        };
-        /// Helper function to throw an exception if i is larger than len
-        constexpr unsigned requires_in_range(unsigned i, unsigned len)
-        {
-            return i >= len ? throw OutOfRange(i, len) : i;
-        }
-
-        /// A constant string implementation.
-        class const_str
-        {
-            const char* const begin_;
-            unsigned size_;
-
-        public:
-            template<unsigned N>
-            constexpr const_str(const char (&arr)[N]):
-              begin_(arr), size_(N - 1)
-            {
-                static_assert(N >= 1, "not a string literal");
-            }
-            constexpr char operator[](unsigned i) const
-            {
-                return requires_in_range(i, size_), begin_[i];
-            }
-
-            constexpr operator const char*() const
-            {
-                return begin_;
-            }
-
-            constexpr const char* begin() const { return begin_; }
-            constexpr const char* end() const { return begin_ + size_; }
-
-            constexpr unsigned size() const
-            {
-                return size_;
-            }
-        };
-
-        constexpr unsigned find_closing_tag(const_str s, unsigned p)
-        {
-            return s[p] == '>' ? p : find_closing_tag(s, p + 1);
-        }
-
-        /// Check that the CROW_ROUTE string is valid
-        constexpr bool is_valid(const_str s, unsigned i = 0, int f = 0)
-        {
-            return i == s.size()   ? f == 0 :
-                   f < 0 || f >= 2 ? false :
-                   s[i] == '<'     ? is_valid(s, i + 1, f + 1) :
-                   s[i] == '>'     ? is_valid(s, i + 1, f - 1) :
-                                     is_valid(s, i + 1, f);
-        }
-
-        constexpr bool is_equ_p(const char* a, const char* b, unsigned n)
-        {
-            return *a == 0 && *b == 0 && n == 0 ? true :
-                   (*a == 0 || *b == 0)         ? false :
-                   n == 0                       ? true :
-                   *a != *b                     ? false :
-                                                  is_equ_p(a + 1, b + 1, n - 1);
-        }
-
-        constexpr bool is_equ_n(const_str a, unsigned ai, const_str b, unsigned bi, unsigned n)
-        {
-            return ai + n > a.size() || bi + n > b.size() ? false :
-                   n == 0                                 ? true :
-                   a[ai] != b[bi]                         ? false :
-                                                            is_equ_n(a, ai + 1, b, bi + 1, n - 1);
-        }
-
-        constexpr bool is_int(const_str s, unsigned i)
-        {
-            return is_equ_n(s, i, "<int>", 0, 5);
-        }
-
-        constexpr bool is_uint(const_str s, unsigned i)
-        {
-            return is_equ_n(s, i, "<uint>", 0, 6);
-        }
-
-        constexpr bool is_float(const_str s, unsigned i)
-        {
-            return is_equ_n(s, i, "<float>", 0, 7) ||
-                   is_equ_n(s, i, "<double>", 0, 8);
-        }
-
-        constexpr bool is_str(const_str s, unsigned i)
-        {
-            return is_equ_n(s, i, "<str>", 0, 5) ||
-                   is_equ_n(s, i, "<string>", 0, 8);
-        }
-
-        constexpr bool is_path(const_str s, unsigned i)
-        {
-            return is_equ_n(s, i, "<path>", 0, 6);
-        }
-#endif
-        template<typename T>
-        struct parameter_tag
-        {
-            static const int value = 0;
-        };
-#define CROW_INTERNAL_PARAMETER_TAG(t, i) \
-    template<>                            \
-    struct parameter_tag<t>               \
-    {                                     \
-        static const int value = i;       \
-    }
-        CROW_INTERNAL_PARAMETER_TAG(int, 1);
-        CROW_INTERNAL_PARAMETER_TAG(char, 1);
-        CROW_INTERNAL_PARAMETER_TAG(short, 1);
-        CROW_INTERNAL_PARAMETER_TAG(long, 1);
-        CROW_INTERNAL_PARAMETER_TAG(long long, 1);
-        CROW_INTERNAL_PARAMETER_TAG(unsigned int, 2);
-        CROW_INTERNAL_PARAMETER_TAG(unsigned char, 2);
-        CROW_INTERNAL_PARAMETER_TAG(unsigned short, 2);
-        CROW_INTERNAL_PARAMETER_TAG(unsigned long, 2);
-        CROW_INTERNAL_PARAMETER_TAG(unsigned long long, 2);
-        CROW_INTERNAL_PARAMETER_TAG(double, 3);
-        CROW_INTERNAL_PARAMETER_TAG(std::string, 4);
-#undef CROW_INTERNAL_PARAMETER_TAG
-        template<typename... Args>
-        struct compute_parameter_tag_from_args_list;
-
-        template<>
-        struct compute_parameter_tag_from_args_list<>
-        {
-            static const int value = 0;
-        };
-
-        template<typename Arg, typename... Args>
-        struct compute_parameter_tag_from_args_list<Arg, Args...>
-        {
-            static const int sub_value =
-              compute_parameter_tag_from_args_list<Args...>::value;
-            static const int value =
-              parameter_tag<typename std::decay<Arg>::type>::value ? sub_value * 6 + parameter_tag<typename std::decay<Arg>::type>::value : sub_value;
-        };
-
-        static inline bool is_parameter_tag_compatible(uint64_t a, uint64_t b)
-        {
-            if (a == 0)
-                return b == 0;
-            if (b == 0)
-                return a == 0;
-            int sa = a % 6;
-            int sb = a % 6;
-            if (sa == 5) sa = 4;
-            if (sb == 5) sb = 4;
-            if (sa != sb)
-                return false;
-            return is_parameter_tag_compatible(a / 6, b / 6);
-        }
-
-        static inline unsigned find_closing_tag_runtime(const char* s, unsigned p)
-        {
-            return s[p] == 0   ? throw std::runtime_error("unmatched tag <") :
-                   s[p] == '>' ? p :
-                                 find_closing_tag_runtime(s, p + 1);
-        }
-
-        static inline uint64_t get_parameter_tag_runtime(const char* s, unsigned p = 0)
-        {
-            return s[p] == 0   ? 0 :
-                   s[p] == '<' ? (
-                                   std::strncmp(s + p, "<int>", 5) == 0  ? get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 1 :
-                                   std::strncmp(s + p, "<uint>", 6) == 0 ? get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 2 :
-                                   (std::strncmp(s + p, "<float>", 7) == 0 ||
-                                    std::strncmp(s + p, "<double>", 8) == 0) ?
-                                                                           get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 3 :
-                                   (std::strncmp(s + p, "<str>", 5) == 0 ||
-                                    std::strncmp(s + p, "<string>", 8) == 0) ?
-                                                                           get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 4 :
-                                   std::strncmp(s + p, "<path>", 6) == 0 ? get_parameter_tag_runtime(s, find_closing_tag_runtime(s, p)) * 6 + 5 :
-                                                                           throw std::runtime_error("invalid parameter type")) :
-                                 get_parameter_tag_runtime(s, p + 1);
-        }
-#ifndef CROW_MSVC_WORKAROUND
-        constexpr uint64_t get_parameter_tag(const_str s, unsigned p = 0)
-        {
-            return p == s.size() ? 0 :
-                   s[p] == '<'   ? (
-                                   is_int(s, p)   ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 1 :
-                                     is_uint(s, p)  ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 2 :
-                                     is_float(s, p) ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 3 :
-                                     is_str(s, p)   ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 4 :
-                                     is_path(s, p)  ? get_parameter_tag(s, find_closing_tag(s, p)) * 6 + 5 :
-                                                      throw std::runtime_error("invalid parameter type")) :
-                                 get_parameter_tag(s, p + 1);
-        }
-#endif
-
-        template<typename... T>
-        struct S
-        {
-            template<typename U>
-            using push = S<U, T...>;
-            template<typename U>
-            using push_back = S<T..., U>;
-            template<template<typename... Args> class U>
-            using rebind = U<T...>;
-        };
-
-        // Check whether the template function can be called with specific arguments
-        template<typename F, typename Set>
-        struct CallHelper;
-        template<typename F, typename... Args>
-        struct CallHelper<F, S<Args...>>
-        {
-            template<typename F1, typename... Args1, typename = decltype(std::declval<F1>()(std::declval<Args1>()...))>
-            static char __test(int);
-
-            template<typename...>
-            static int __test(...);
-
-            static constexpr bool value = sizeof(__test<F, Args...>(0)) == sizeof(char);
-        };
-
-        // Check Tuple contains type T
-        template<typename T, typename Tuple>
-        struct has_type;
-
-        template<typename T>
-        struct has_type<T, std::tuple<>> : std::false_type
-        {};
-
-        template<typename T, typename U, typename... Ts>
-        struct has_type<T, std::tuple<U, Ts...>> : has_type<T, std::tuple<Ts...>>
-        {};
-
-        template<typename T, typename... Ts>
-        struct has_type<T, std::tuple<T, Ts...>> : std::true_type
-        {};
-
-        // Find index of type in tuple
-        template<class T, class Tuple>
-        struct tuple_index;
-
-        template<class T, class... Types>
-        struct tuple_index<T, std::tuple<T, Types...>>
-        {
-            static const int value = 0;
-        };
-
-        template<class T, class U, class... Types>
-        struct tuple_index<T, std::tuple<U, Types...>>
-        {
-            static const int value = 1 + tuple_index<T, std::tuple<Types...>>::value;
-        };
-
-        // Extract element from forward tuple or get default
-#ifdef CROW_CAN_USE_CPP14
-        template<typename T, typename Tup>
-        typename std::enable_if<has_type<T&, Tup>::value, typename std::decay<T>::type&&>::type
-          tuple_extract(Tup& tup)
-        {
-            return std::move(std::get<T&>(tup));
-        }
-#else
-        template<typename T, typename Tup>
-        typename std::enable_if<has_type<T&, Tup>::value, T&&>::type
-          tuple_extract(Tup& tup)
-        {
-            return std::move(std::get<tuple_index<T&, Tup>::value>(tup));
-        }
-#endif
-
-        template<typename T, typename Tup>
-        typename std::enable_if<!has_type<T&, Tup>::value, T>::type
-          tuple_extract(Tup&)
-        {
-            return T{};
-        }
-
-        // Kind of fold expressions in C++11
-        template<bool...>
-        struct bool_pack;
-        template<bool... bs>
-        using all_true = std::is_same<bool_pack<bs..., true>, bool_pack<true, bs...>>;
-
-        template<int N>
-        struct single_tag_to_type
-        {};
-
-        template<>
-        struct single_tag_to_type<1>
-        {
-            using type = int64_t;
-        };
-
-        template<>
-        struct single_tag_to_type<2>
-        {
-            using type = uint64_t;
-        };
-
-        template<>
-        struct single_tag_to_type<3>
-        {
-            using type = double;
-        };
-
-        template<>
-        struct single_tag_to_type<4>
-        {
-            using type = std::string;
-        };
-
-        template<>
-        struct single_tag_to_type<5>
-        {
-            using type = std::string;
-        };
-
-
-        template<uint64_t Tag>
-        struct arguments
-        {
-            using subarguments = typename arguments<Tag / 6>::type;
-            using type =
-              typename subarguments::template push<typename single_tag_to_type<Tag % 6>::type>;
-        };
-
-        template<>
-        struct arguments<0>
-        {
-            using type = S<>;
-        };
-
-        template<typename... T>
-        struct last_element_type
-        {
-            using type = typename std::tuple_element<sizeof...(T) - 1, std::tuple<T...>>::type;
-        };
-
-
-        template<>
-        struct last_element_type<>
-        {};
-
-
-        // from http://stackoverflow.com/questions/13072359/c11-compile-time-array-with-logarithmic-evaluation-depth
-        template<class T>
-        using Invoke = typename T::type;
-
-        template<unsigned...>
-        struct seq
-        {
-            using type = seq;
-        };
-
-        template<class S1, class S2>
-        struct concat;
-
-        template<unsigned... I1, unsigned... I2>
-        struct concat<seq<I1...>, seq<I2...>> : seq<I1..., (sizeof...(I1) + I2)...>
-        {};
-
-        template<class S1, class S2>
-        using Concat = Invoke<concat<S1, S2>>;
-
-        template<unsigned N>
-        struct gen_seq;
-        template<unsigned N>
-        using GenSeq = Invoke<gen_seq<N>>;
-
-        template<unsigned N>
-        struct gen_seq : Concat<GenSeq<N / 2>, GenSeq<N - N / 2>>
-        {};
-
-        template<>
-        struct gen_seq<0> : seq<>
-        {};
-        template<>
-        struct gen_seq<1> : seq<0>
-        {};
-
-        template<typename Seq, typename Tuple>
-        struct pop_back_helper;
-
-        template<unsigned... N, typename Tuple>
-        struct pop_back_helper<seq<N...>, Tuple>
-        {
-            template<template<typename... Args> class U>
-            using rebind = U<typename std::tuple_element<N, Tuple>::type...>;
-        };
-
-        template<typename... T>
-        struct pop_back //: public pop_back_helper<typename gen_seq<sizeof...(T)-1>::type, std::tuple<T...>>
-        {
-            template<template<typename... Args> class U>
-            using rebind = typename pop_back_helper<typename gen_seq<sizeof...(T) - 1>::type, std::tuple<T...>>::template rebind<U>;
-        };
-
-        template<>
-        struct pop_back<>
-        {
-            template<template<typename... Args> class U>
-            using rebind = U<>;
-        };
-
-        // from http://stackoverflow.com/questions/2118541/check-if-c0x-parameter-pack-contains-a-type
-        template<typename Tp, typename... List>
-        struct contains : std::true_type
-        {};
-
-        template<typename Tp, typename Head, typename... Rest>
-        struct contains<Tp, Head, Rest...> : std::conditional<std::is_same<Tp, Head>::value, std::true_type, contains<Tp, Rest...>>::type
-        {};
-
-        template<typename Tp>
-        struct contains<Tp> : std::false_type
-        {};
-
-        template<typename T>
-        struct empty_context
-        {};
-
-        template<typename T>
-        struct promote
-        {
-            using type = T;
-        };
-
-#define CROW_INTERNAL_PROMOTE_TYPE(t1, t2) \
-    template<>                             \
-    struct promote<t1>                     \
-    {                                      \
-        using type = t2;                   \
-    }
-
-        CROW_INTERNAL_PROMOTE_TYPE(char, int64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(short, int64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(int, int64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(long, int64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(long long, int64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(unsigned char, uint64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(unsigned short, uint64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(unsigned int, uint64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(unsigned long, uint64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(unsigned long long, uint64_t);
-        CROW_INTERNAL_PROMOTE_TYPE(float, double);
-#undef CROW_INTERNAL_PROMOTE_TYPE
-
-        template<typename T>
-        using promote_t = typename promote<T>::type;
-
-    } // namespace black_magic
-
-    namespace detail
-    {
-
-        template<class T, std::size_t N, class... Args>
-        struct get_index_of_element_from_tuple_by_type_impl
-        {
-            static constexpr auto value = N;
-        };
-
-        template<class T, std::size_t N, class... Args>
-        struct get_index_of_element_from_tuple_by_type_impl<T, N, T, Args...>
-        {
-            static constexpr auto value = N;
-        };
-
-        template<class T, std::size_t N, class U, class... Args>
-        struct get_index_of_element_from_tuple_by_type_impl<T, N, U, Args...>
-        {
-            static constexpr auto value = get_index_of_element_from_tuple_by_type_impl<T, N + 1, Args...>::value;
-        };
-    } // namespace detail
-
-    namespace utility
-    {
-        template<class T, class... Args>
-        T& get_element_by_type(std::tuple<Args...>& t)
-        {
-            return std::get<detail::get_index_of_element_from_tuple_by_type_impl<T, 0, Args...>::value>(t);
-        }
-
-        template<typename T>
-        struct function_traits;
-
-#ifndef CROW_MSVC_WORKAROUND
-        template<typename T>
-        struct function_traits : public function_traits<decltype(&T::operator())>
-        {
-            using parent_t = function_traits<decltype(&T::operator())>;
-            static const size_t arity = parent_t::arity;
-            using result_type = typename parent_t::result_type;
-            template<size_t i>
-            using arg = typename parent_t::template arg<i>;
-        };
-#endif
-
-        template<typename ClassType, typename R, typename... Args>
-        struct function_traits<R (ClassType::*)(Args...) const>
-        {
-            static const size_t arity = sizeof...(Args);
-
-            typedef R result_type;
-
-            template<size_t i>
-            using arg = typename std::tuple_element<i, std::tuple<Args...>>::type;
-        };
-
-        template<typename ClassType, typename R, typename... Args>
-        struct function_traits<R (ClassType::*)(Args...)>
-        {
-            static const size_t arity = sizeof...(Args);
-
-            typedef R result_type;
-
-            template<size_t i>
-            using arg = typename std::tuple_element<i, std::tuple<Args...>>::type;
-        };
-
-        template<typename R, typename... Args>
-        struct function_traits<std::function<R(Args...)>>
-        {
-            static const size_t arity = sizeof...(Args);
-
-            typedef R result_type;
-
-            template<size_t i>
-            using arg = typename std::tuple_element<i, std::tuple<Args...>>::type;
-        };
-        /// @endcond
-
-        inline static std::string base64encode(const unsigned char* data, size_t size, const char* key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")
-        {
-            std::string ret;
-            ret.resize((size + 2) / 3 * 4);
-            auto it = ret.begin();
-            while (size >= 3)
-            {
-                *it++ = key[(static_cast<unsigned char>(*data) & 0xFC) >> 2];
-                unsigned char h = (static_cast<unsigned char>(*data++) & 0x03) << 4;
-                *it++ = key[h | ((static_cast<unsigned char>(*data) & 0xF0) >> 4)];
-                h = (static_cast<unsigned char>(*data++) & 0x0F) << 2;
-                *it++ = key[h | ((static_cast<unsigned char>(*data) & 0xC0) >> 6)];
-                *it++ = key[static_cast<unsigned char>(*data++) & 0x3F];
-
-                size -= 3;
-            }
-            if (size == 1)
-            {
-                *it++ = key[(static_cast<unsigned char>(*data) & 0xFC) >> 2];
-                unsigned char h = (static_cast<unsigned char>(*data++) & 0x03) << 4;
-                *it++ = key[h];
-                *it++ = '=';
-                *it++ = '=';
-            }
-            else if (size == 2)
-            {
-                *it++ = key[(static_cast<unsigned char>(*data) & 0xFC) >> 2];
-                unsigned char h = (static_cast<unsigned char>(*data++) & 0x03) << 4;
-                *it++ = key[h | ((static_cast<unsigned char>(*data) & 0xF0) >> 4)];
-                h = (static_cast<unsigned char>(*data++) & 0x0F) << 2;
-                *it++ = key[h];
-                *it++ = '=';
-            }
-            return ret;
-        }
-
-        inline static std::string base64encode(std::string data, size_t size, const char* key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")
-        {
-            return base64encode((const unsigned char*)data.c_str(), size, key);
-        }
-
-        inline static std::string base64encode_urlsafe(const unsigned char* data, size_t size)
-        {
-            return base64encode(data, size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_");
-        }
-
-        inline static std::string base64encode_urlsafe(std::string data, size_t size)
-        {
-            return base64encode((const unsigned char*)data.c_str(), size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_");
-        }
-
-        inline static std::string base64decode(const char* data, size_t size)
-        {
-            // We accept both regular and url encoding here, as there does not seem to be any downside to that.
-            // If we want to distinguish that we should use +/ for non-url and -_ for url.
-
-            // Mapping logic from characters to [0-63]
-            auto key = [](char c) -> unsigned char {
-                if ((c >= 'A') && (c <= 'Z')) return c - 'A';
-                if ((c >= 'a') && (c <= 'z')) return c - 'a' + 26;
-                if ((c >= '0') && (c <= '9')) return c - '0' + 52;
-                if ((c == '+') || (c == '-')) return 62;
-                if ((c == '/') || (c == '_')) return 63;
-                return 0;
-            };
-
-            // Not padded
-            if (size % 4 == 2)             // missing last 2 characters
-                size = (size / 4 * 3) + 1; // Not subtracting extra characters because they're truncated in int division
-            else if (size % 4 == 3)        // missing last character
-                size = (size / 4 * 3) + 2; // Not subtracting extra characters because they're truncated in int division
-
-            // Padded
-            else if (data[size - 2] == '=') // padded with '=='
-                size = (size / 4 * 3) - 2;  // == padding means the last block only has 1 character instead of 3, hence the '-2'
-            else if (data[size - 1] == '=') // padded with '='
-                size = (size / 4 * 3) - 1;  // = padding means the last block only has 2 character instead of 3, hence the '-1'
-
-            // Padding not needed
-            else
-                size = size / 4 * 3;
-
-            std::string ret;
-            ret.resize(size);
-            auto it = ret.begin();
-
-            // These will be used to decode 1 character at a time
-            unsigned char odd;  // char1 and char3
-            unsigned char even; // char2 and char4
-
-            // Take 4 character blocks to turn into 3
-            while (size >= 3)
-            {
-                // dec_char1 = (char1 shifted 2 bits to the left) OR ((char2 AND 00110000) shifted 4 bits to the right))
-                odd = key(*data++);
-                even = key(*data++);
-                *it++ = (odd << 2) | ((even & 0x30) >> 4);
-                // dec_char2 = ((char2 AND 00001111) shifted 4 bits left) OR ((char3 AND 00111100) shifted 2 bits right))
-                odd = key(*data++);
-                *it++ = ((even & 0x0F) << 4) | ((odd & 0x3C) >> 2);
-                // dec_char3 = ((char3 AND 00000011) shifted 6 bits left) OR (char4)
-                even = key(*data++);
-                *it++ = ((odd & 0x03) << 6) | (even);
-
-                size -= 3;
-            }
-            if (size == 2)
-            {
-                // d_char1 = (char1 shifted 2 bits to the left) OR ((char2 AND 00110000) shifted 4 bits to the right))
-                odd = key(*data++);
-                even = key(*data++);
-                *it++ = (odd << 2) | ((even & 0x30) >> 4);
-                // d_char2 = ((char2 AND 00001111) shifted 4 bits left) OR ((char3 AND 00111100) shifted 2 bits right))
-                odd = key(*data++);
-                *it++ = ((even & 0x0F) << 4) | ((odd & 0x3C) >> 2);
-            }
-            else if (size == 1)
-            {
-                // d_char1 = (char1 shifted 2 bits to the left) OR ((char2 AND 00110000) shifted 4 bits to the right))
-                odd = key(*data++);
-                even = key(*data++);
-                *it++ = (odd << 2) | ((even & 0x30) >> 4);
-            }
-            return ret;
-        }
-
-        inline static std::string base64decode(const std::string& data, size_t size)
-        {
-            return base64decode(data.data(), size);
-        }
-
-        inline static std::string base64decode(const std::string& data)
-        {
-            return base64decode(data.data(), data.length());
-        }
-
-        inline static std::string normalize_path(const std::string& directoryPath)
-        {
-            std::string normalizedPath = directoryPath;
-            std::replace(normalizedPath.begin(), normalizedPath.end(), '\\', '/');
-            if (!normalizedPath.empty() && normalizedPath.back() != '/')
-                normalizedPath += '/';
-            return normalizedPath;
-        }
-
-        inline static void sanitize_filename(std::string& data, char replacement = '_')
-        {
-            if (data.length() > 255)
-                data.resize(255);
-
-            static const auto toUpper = [](char c) {
-                return ((c >= 'a') && (c <= 'z')) ? (c - ('a' - 'A')) : c;
-            };
-            // Check for special device names. The Windows behavior is really odd here, it will consider both AUX and AUX.txt
-            // a special device. Thus we search for the string (case-insensitive), and then check if the string ends or if
-            // is has a dangerous follow up character (.:\/)
-            auto sanitizeSpecialFile = [](std::string& source, unsigned ofs, const char* pattern, bool includeNumber, char replacement) {
-                unsigned i = ofs;
-                size_t len = source.length();
-                const char* p = pattern;
-                while (*p)
-                {
-                    if (i >= len) return;
-                    if (toUpper(source[i]) != *p) return;
-                    ++i;
-                    ++p;
-                }
-                if (includeNumber)
-                {
-                    if ((i >= len) || (source[i] < '1') || (source[i] > '9')) return;
-                    ++i;
-                }
-                if ((i >= len) || (source[i] == '.') || (source[i] == ':') || (source[i] == '/') || (source[i] == '\\'))
-                {
-                    source.erase(ofs + 1, (i - ofs) - 1);
-                    source[ofs] = replacement;
-                }
-            };
-            bool checkForSpecialEntries = true;
-            for (unsigned i = 0; i < data.length(); ++i)
-            {
-                // Recognize directory traversals and the special devices CON/PRN/AUX/NULL/COM[1-]/LPT[1-9]
-                if (checkForSpecialEntries)
-                {
-                    checkForSpecialEntries = false;
-                    switch (toUpper(data[i]))
-                    {
-                        case 'A':
-                            sanitizeSpecialFile(data, i, "AUX", false, replacement);
-                            break;
-                        case 'C':
-                            sanitizeSpecialFile(data, i, "CON", false, replacement);
-                            sanitizeSpecialFile(data, i, "COM", true, replacement);
-                            break;
-                        case 'L':
-                            sanitizeSpecialFile(data, i, "LPT", true, replacement);
-                            break;
-                        case 'N':
-                            sanitizeSpecialFile(data, i, "NUL", false, replacement);
-                            break;
-                        case 'P':
-                            sanitizeSpecialFile(data, i, "PRN", false, replacement);
-                            break;
-                        case '.':
-                            sanitizeSpecialFile(data, i, "..", false, replacement);
-                            break;
-                    }
-                }
-
-                // Sanitize individual characters
-                unsigned char c = data[i];
-                if ((c < ' ') || ((c >= 0x80) && (c <= 0x9F)) || (c == '?') || (c == '<') || (c == '>') || (c == ':') || (c == '*') || (c == '|') || (c == '\"'))
-                {
-                    data[i] = replacement;
-                }
-                else if ((c == '/') || (c == '\\'))
-                {
-                    if (CROW_UNLIKELY(i == 0)) //Prevent Unix Absolute Paths (Windows Absolute Paths are prevented with `(c == ':')`)
-                    {
-                        data[i] = replacement;
-                    }
-                    else
-                    {
-                        checkForSpecialEntries = true;
-                    }
-                }
-            }
-        }
-
-        inline static std::string random_alphanum(std::size_t size)
-        {
-            static const char alphabet[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-            std::random_device dev;
-            std::mt19937 rng(dev());
-            std::uniform_int_distribution<std::mt19937::result_type> dist(0, sizeof(alphabet) - 2);
-            std::string out;
-            out.reserve(size);
-            for (std::size_t i = 0; i < size; i++)
-                out.push_back(alphabet[dist(rng)]);
-            return out;
-        }
-
-        inline static std::string join_path(std::string path, const std::string& fname)
-        {
-#if defined(CROW_CAN_USE_CPP17) && !defined(CROW_FILESYSTEM_IS_EXPERIMENTAL)
-            return (std::filesystem::path(path) / fname).string();
-#else
-            if (!(path.back() == '/' || path.back() == '\\'))
-                path += '/';
-            path += fname;
-            return path;
-#endif
-        }
-
-        /**
-         * @brief Checks two string for equality.
-         * Always returns false if strings differ in size.
-         * Defaults to case-insensitive comparison.
-         */
-        inline static bool string_equals(const std::string& l, const std::string& r, bool case_sensitive = false)
-        {
-            if (l.length() != r.length())
-                return false;
-
-            for (size_t i = 0; i < l.length(); i++)
-            {
-                if (case_sensitive)
-                {
-                    if (l[i] != r[i])
-                        return false;
-                }
-                else
-                {
-                    if (std::toupper(l[i]) != std::toupper(r[i]))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
-        template<typename T, typename U>
-        inline static T lexical_cast(const U& v)
-        {
-            std::stringstream stream;
-            T res;
-
-            stream << v;
-            stream >> res;
-
-            return res;
-        }
-
-        template<typename T>
-        inline static T lexical_cast(const char* v, size_t count)
-        {
-            std::stringstream stream;
-            T res;
-
-            stream.write(v, count);
-            stream >> res;
-
-            return res;
-        }
-
-
-        /// Return a copy of the given string with its
-        /// leading and trailing whitespaces removed.
-        inline static std::string trim(const std::string& v)
-        {
-            if (v.empty())
-                return "";
-
-            size_t begin = 0, end = v.length();
-
-            size_t i;
-            for (i = 0; i < v.length(); i++)
-            {
-                if (!std::isspace(v[i]))
-                {
-                    begin = i;
-                    break;
-                }
-            }
-
-            if (i == v.length())
-                return "";
-
-            for (i = v.length(); i > 0; i--)
-            {
-                if (!std::isspace(v[i - 1]))
-                {
-                    end = i;
-                    break;
-                }
-            }
-
-            return v.substr(begin, end - begin);
-        }
-    } // namespace utility
-} // namespace crow
-
-
-#include <locale>
-#include <unordered_map>
-
-namespace crow
-{
-    /// Hashing function for ci_map (unordered_multimap).
-    struct ci_hash
-    {
-        size_t operator()(const std::string& key) const
-        {
-            std::size_t seed = 0;
-            std::locale locale;
-
-            for (auto c : key)
-                hash_combine(seed, std::toupper(c, locale));
-
-            return seed;
-        }
-
-    private:
-        static inline void hash_combine(std::size_t& seed, char v)
-        {
-            std::hash<char> hasher;
-            seed ^= hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-        }
-    };
-
-    /// Equals function for ci_map (unordered_multimap).
-    struct ci_key_eq
-    {
-        bool operator()(const std::string& l, const std::string& r) const
-        {
-            return utility::string_equals(l, r);
-        }
-    };
-
-    using ci_map = std::unordered_multimap<std::string, std::string, ci_hash, ci_key_eq>;
-} // namespace crow
-
-
-#include <vector>
-#include <string>
-#include <stdexcept>
-#include <iostream>
-
-namespace crow
-{
-    const char cr = '\r';
-    const char lf = '\n';
-    const std::string crlf("\r\n");
-
-    enum class HTTPMethod : char
-    {
-#ifndef DELETE
-        DELETE = 0,
-        GET,
-        HEAD,
-        POST,
-        PUT,
-
-        CONNECT,
-        OPTIONS,
-        TRACE,
-
-        PATCH,
-        PURGE,
-
-        COPY,
-        LOCK,
-        MKCOL,
-        MOVE,
-        PROPFIND,
-        PROPPATCH,
-        SEARCH,
-        UNLOCK,
-        BIND,
-        REBIND,
-        UNBIND,
-        ACL,
-
-        REPORT,
-        MKACTIVITY,
-        CHECKOUT,
-        MERGE,
-
-        MSEARCH,
-        NOTIFY,
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-
-        MKCALENDAR,
-
-        LINK,
-        UNLINK,
-
-        SOURCE,
-#endif
-
-        Delete = 0,
-        Get,
-        Head,
-        Post,
-        Put,
-
-        Connect,
-        Options,
-        Trace,
-
-        Patch,
-        Purge,
-
-        Copy,
-        Lock,
-        MkCol,
-        Move,
-        Propfind,
-        Proppatch,
-        Search,
-        Unlock,
-        Bind,
-        Rebind,
-        Unbind,
-        Acl,
-
-        Report,
-        MkActivity,
-        Checkout,
-        Merge,
-
-        MSearch,
-        Notify,
-        Subscribe,
-        Unsubscribe,
-
-        MkCalendar,
-
-        Link,
-        Unlink,
-
-        Source,
-
-
-        InternalMethodCount,
-        // should not add an item below this line: used for array count
-    };
-
-    constexpr const char* method_strings[] =
-      {
-        "DELETE",
-        "GET",
-        "HEAD",
-        "POST",
-        "PUT",
-
-        "CONNECT",
-        "OPTIONS",
-        "TRACE",
-
-        "PATCH",
-        "PURGE",
-
-        "COPY",
-        "LOCK",
-        "MKCOL",
-        "MOVE",
-        "PROPFIND",
-        "PROPPATCH",
-        "SEARCH",
-        "UNLOCK",
-        "BIND",
-        "REBIND",
-        "UNBIND",
-        "ACL",
-
-        "REPORT",
-        "MKACTIVITY",
-        "CHECKOUT",
-        "MERGE",
-
-        "M-SEARCH",
-        "NOTIFY",
-        "SUBSCRIBE",
-        "UNSUBSCRIBE",
-
-        "MKCALENDAR",
-
-        "LINK",
-        "UNLINK",
-
-        "SOURCE"};
-
-
-    inline std::string method_name(HTTPMethod method)
-    {
-        if (CROW_LIKELY(method < HTTPMethod::InternalMethodCount))
-        {
-            return method_strings[(unsigned char)method];
-        }
-        return "invalid";
-    }
-
-    // clang-format off
-
-    enum status
-    {
-        CONTINUE                      = 100,
-        SWITCHING_PROTOCOLS           = 101,
-
-        OK                            = 200,
-        CREATED                       = 201,
-        ACCEPTED                      = 202,
-        NON_AUTHORITATIVE_INFORMATION = 203,
-        NO_CONTENT                    = 204,
-        RESET_CONTENT                 = 205,
-        PARTIAL_CONTENT               = 206,
-
-        MULTIPLE_CHOICES              = 300,
-        MOVED_PERMANENTLY             = 301,
-        FOUND                         = 302,
-        SEE_OTHER                     = 303,
-        NOT_MODIFIED                  = 304,
-        TEMPORARY_REDIRECT            = 307,
-        PERMANENT_REDIRECT            = 308,
-
-        BAD_REQUEST                   = 400,
-        UNAUTHORIZED                  = 401,
-        FORBIDDEN                     = 403,
-        NOT_FOUND                     = 404,
-        METHOD_NOT_ALLOWED            = 405,
-        NOT_ACCEPTABLE                = 406,
-        PROXY_AUTHENTICATION_REQUIRED = 407,
-        CONFLICT                      = 409,
-        GONE                          = 410,
-        PAYLOAD_TOO_LARGE             = 413,
-        UNSUPPORTED_MEDIA_TYPE        = 415,
-        RANGE_NOT_SATISFIABLE         = 416,
-        EXPECTATION_FAILED            = 417,
-        PRECONDITION_REQUIRED         = 428,
-        TOO_MANY_REQUESTS             = 429,
-        UNAVAILABLE_FOR_LEGAL_REASONS = 451,
-
-        INTERNAL_SERVER_ERROR         = 500,
-        NOT_IMPLEMENTED               = 501,
-        BAD_GATEWAY                   = 502,
-        SERVICE_UNAVAILABLE           = 503,
-        GATEWAY_TIMEOUT               = 504,
-        VARIANT_ALSO_NEGOTIATES       = 506
-    };
-
-    // clang-format on
-
-    enum class ParamType : char
-    {
-        INT,
-        UINT,
-        DOUBLE,
-        STRING,
-        PATH,
-
-        MAX
-    };
-
-    /// @cond SKIP
-    struct routing_params
-    {
-        std::vector<int64_t> int_params;
-        std::vector<uint64_t> uint_params;
-        std::vector<double> double_params;
-        std::vector<std::string> string_params;
-
-        void debug_print() const
-        {
-            std::cerr << "routing_params" << std::endl;
-            for (auto i : int_params)
-                std::cerr << i << ", ";
-            std::cerr << std::endl;
-            for (auto i : uint_params)
-                std::cerr << i << ", ";
-            std::cerr << std::endl;
-            for (auto i : double_params)
-                std::cerr << i << ", ";
-            std::cerr << std::endl;
-            for (auto& i : string_params)
-                std::cerr << i << ", ";
-            std::cerr << std::endl;
-        }
-
-        template<typename T>
-        T get(unsigned) const;
-    };
-
-    template<>
-    inline int64_t routing_params::get<int64_t>(unsigned index) const
-    {
-        return int_params[index];
-    }
-
-    template<>
-    inline uint64_t routing_params::get<uint64_t>(unsigned index) const
-    {
-        return uint_params[index];
-    }
-
-    template<>
-    inline double routing_params::get<double>(unsigned index) const
-    {
-        return double_params[index];
-    }
-
-    template<>
-    inline std::string routing_params::get<std::string>(unsigned index) const
-    {
-        return string_params[index];
-    }
-    /// @endcond
-
-    struct routing_handle_result
-    {
-        uint16_t rule_index;
-        std::vector<uint16_t> blueprint_indices;
-        routing_params r_params;
-        HTTPMethod method;
-
-        routing_handle_result() {}
-
-        routing_handle_result(uint16_t rule_index_, std::vector<uint16_t> blueprint_indices_, routing_params r_params_):
-          rule_index(rule_index_),
-          blueprint_indices(blueprint_indices_),
-          r_params(r_params_) {}
-
-        routing_handle_result(uint16_t rule_index_, std::vector<uint16_t> blueprint_indices_, routing_params r_params_, HTTPMethod method_):
-          rule_index(rule_index_),
-          blueprint_indices(blueprint_indices_),
-          r_params(r_params_),
-          method(method_) {}
-    };
-} // namespace crow
-
-// clang-format off
-#ifndef CROW_MSVC_WORKAROUND
-constexpr crow::HTTPMethod method_from_string(const char* str)
-{
-    return crow::black_magic::is_equ_p(str, "GET", 3)    ? crow::HTTPMethod::Get :
-           crow::black_magic::is_equ_p(str, "DELETE", 6) ? crow::HTTPMethod::Delete :
-           crow::black_magic::is_equ_p(str, "HEAD", 4)   ? crow::HTTPMethod::Head :
-           crow::black_magic::is_equ_p(str, "POST", 4)   ? crow::HTTPMethod::Post :
-           crow::black_magic::is_equ_p(str, "PUT", 3)    ? crow::HTTPMethod::Put :
-
-           crow::black_magic::is_equ_p(str, "OPTIONS", 7) ? crow::HTTPMethod::Options :
-           crow::black_magic::is_equ_p(str, "CONNECT", 7) ? crow::HTTPMethod::Connect :
-           crow::black_magic::is_equ_p(str, "TRACE", 5)   ? crow::HTTPMethod::Trace :
-
-           crow::black_magic::is_equ_p(str, "PATCH", 5)     ? crow::HTTPMethod::Patch :
-           crow::black_magic::is_equ_p(str, "PURGE", 5)     ? crow::HTTPMethod::Purge :
-           crow::black_magic::is_equ_p(str, "COPY", 4)      ? crow::HTTPMethod::Copy :
-           crow::black_magic::is_equ_p(str, "LOCK", 4)      ? crow::HTTPMethod::Lock :
-           crow::black_magic::is_equ_p(str, "MKCOL", 5)     ? crow::HTTPMethod::MkCol :
-           crow::black_magic::is_equ_p(str, "MOVE", 4)      ? crow::HTTPMethod::Move :
-           crow::black_magic::is_equ_p(str, "PROPFIND", 8)  ? crow::HTTPMethod::Propfind :
-           crow::black_magic::is_equ_p(str, "PROPPATCH", 9) ? crow::HTTPMethod::Proppatch :
-           crow::black_magic::is_equ_p(str, "SEARCH", 6)    ? crow::HTTPMethod::Search :
-           crow::black_magic::is_equ_p(str, "UNLOCK", 6)    ? crow::HTTPMethod::Unlock :
-           crow::black_magic::is_equ_p(str, "BIND", 4)      ? crow::HTTPMethod::Bind :
-           crow::black_magic::is_equ_p(str, "REBIND", 6)    ? crow::HTTPMethod::Rebind :
-           crow::black_magic::is_equ_p(str, "UNBIND", 6)    ? crow::HTTPMethod::Unbind :
-           crow::black_magic::is_equ_p(str, "ACL", 3)       ? crow::HTTPMethod::Acl :
-
-           crow::black_magic::is_equ_p(str, "REPORT", 6)      ? crow::HTTPMethod::Report :
-           crow::black_magic::is_equ_p(str, "MKACTIVITY", 10) ? crow::HTTPMethod::MkActivity :
-           crow::black_magic::is_equ_p(str, "CHECKOUT", 8)    ? crow::HTTPMethod::Checkout :
-           crow::black_magic::is_equ_p(str, "MERGE", 5)       ? crow::HTTPMethod::Merge :
-
-           crow::black_magic::is_equ_p(str, "MSEARCH", 7)      ? crow::HTTPMethod::MSearch :
-           crow::black_magic::is_equ_p(str, "NOTIFY", 6)       ? crow::HTTPMethod::Notify :
-           crow::black_magic::is_equ_p(str, "SUBSCRIBE", 9)    ? crow::HTTPMethod::Subscribe :
-           crow::black_magic::is_equ_p(str, "UNSUBSCRIBE", 11) ? crow::HTTPMethod::Unsubscribe :
-
-           crow::black_magic::is_equ_p(str, "MKCALENDAR", 10) ? crow::HTTPMethod::MkCalendar :
-
-           crow::black_magic::is_equ_p(str, "LINK", 4)   ? crow::HTTPMethod::Link :
-           crow::black_magic::is_equ_p(str, "UNLINK", 6) ? crow::HTTPMethod::Unlink :
-
-           crow::black_magic::is_equ_p(str, "SOURCE", 6) ? crow::HTTPMethod::Source :
-                                                           throw std::runtime_error("invalid http method");
-}
-
-constexpr crow::HTTPMethod operator"" _method(const char* str, size_t /*len*/)
-{
-    return method_from_string( str );
-}
-#endif
-// clang-format on
-
-
-#ifdef CROW_USE_BOOST
-#include <boost/asio.hpp>
-#else
-#ifndef ASIO_STANDALONE
-#define ASIO_STANDALONE
-#endif
-#include <asio.hpp>
-#endif
-
-
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-#ifdef CROW_USE_BOOST
-    namespace asio = boost::asio;
-#endif
-
-    /// Find and return the value associated with the key. (returns an empty string if nothing is found)
-    template<typename T>
-    inline const std::string& get_header_value(const T& headers, const std::string& key)
-    {
-        if (headers.count(key))
-        {
-            return headers.find(key)->second;
-        }
-        static std::string empty;
-        return empty;
-    }
-
-    /// An HTTP request.
-    struct request
-    {
-        HTTPMethod method;
-        std::string raw_url;     ///< The full URL containing the `?` and URL parameters.
-        std::string url;         ///< The endpoint without any parameters.
-        query_string url_params; ///< The parameters associated with the request. (everything after the `?` in the URL)
-        ci_map headers;
-        std::string body;
-        std::string remote_ip_address; ///< The IP address from which the request was sent.
-        unsigned char http_ver_major, http_ver_minor;
-        bool keep_alive,    ///< Whether or not the server should send a `connection: Keep-Alive` header to the client.
-          close_connection, ///< Whether or not the server should shut down the TCP connection once a response is sent.
-          upgrade;          ///< Whether or noth the server should change the HTTP connection to a different connection.
-
-        void* middleware_context{};
-        void* middleware_container{};
-        asio::io_service* io_service{};
-
-        /// Construct an empty request. (sets the method to `GET`)
-        request():
-          method(HTTPMethod::Get)
-        {}
-
-        /// Construct a request with all values assigned.
-        request(HTTPMethod method, std::string raw_url, std::string url, query_string url_params, ci_map headers, std::string body, unsigned char http_major, unsigned char http_minor, bool has_keep_alive, bool has_close_connection, bool is_upgrade):
-          method(method), raw_url(std::move(raw_url)), url(std::move(url)), url_params(std::move(url_params)), headers(std::move(headers)), body(std::move(body)), http_ver_major(http_major), http_ver_minor(http_minor), keep_alive(has_keep_alive), close_connection(has_close_connection), upgrade(is_upgrade)
-        {}
-
-        void add_header(std::string key, std::string value)
-        {
-            headers.emplace(std::move(key), std::move(value));
-        }
-
-        const std::string& get_header_value(const std::string& key) const
-        {
-            return crow::get_header_value(headers, key);
-        }
-
-        bool check_version(unsigned char major, unsigned char minor) const
-        {
-            return http_ver_major == major && http_ver_minor == minor;
-        }
-
-        /// Get the body as parameters in QS format.
-
-        ///
-        /// This is meant to be used with requests of type "application/x-www-form-urlencoded"
-        const query_string get_body_params() const
-        {
-            return query_string(body, false);
-        }
-
-        /// Send data to whoever made this request with a completion handler and return immediately.
-        template<typename CompletionHandler>
-        void post(CompletionHandler handler)
-        {
-            io_service->post(handler);
-        }
-
-        /// Send data to whoever made this request with a completion handler.
-        template<typename CompletionHandler>
-        void dispatch(CompletionHandler handler)
-        {
-            io_service->dispatch(handler);
-        }
-    };
-} // namespace crow
-
-
-#include <string>
-#include <vector>
-#include <sstream>
-
-
-namespace crow
-{
-
-    /// Encapsulates anything related to processing and organizing `multipart/xyz` messages
-    namespace multipart
-    {
-
-        const std::string dd = "--";
-
-        /// The first part in a section, contains metadata about the part
-        struct header
-        {
-            std::string value;                                   ///< The first part of the header, usually `Content-Type` or `Content-Disposition`
-            std::unordered_map<std::string, std::string> params; ///< The parameters of the header, come after the `value`
-
-            operator int() const { return std::stoi(value); }    ///< Returns \ref value as integer
-            operator double() const { return std::stod(value); } ///< Returns \ref value as double
-        };
-
-        /// Multipart header map (key is header key).
-        using mph_map = std::unordered_multimap<std::string, header, ci_hash, ci_key_eq>;
-
-        /// Find and return the value object associated with the key. (returns an empty class if nothing is found)
-        template<typename O, typename T>
-        inline const O& get_header_value_object(const T& headers, const std::string& key)
-        {
-            if (headers.count(key))
-            {
-                return headers.find(key)->second;
-            }
-            static O empty;
-            return empty;
-        }
-
-        /// Same as \ref get_header_value_object() but for \ref multipart.header
-        template<typename T>
-        inline const header& get_header_object(const T& headers, const std::string& key)
-        {
-            return get_header_value_object<header>(headers, key);
-        }
-
-        ///One part of the multipart message
-
-        ///
-        /// It is usually separated from other sections by a `boundary`
-        struct part
-        {
-            mph_map headers;  ///< (optional) The first part before the data, Contains information regarding the type of data and encoding
-            std::string body; ///< The actual data in the part
-
-            operator int() const { return std::stoi(body); }    ///< Returns \ref body as integer
-            operator double() const { return std::stod(body); } ///< Returns \ref body as double
-
-            const header& get_header_object(const std::string& key) const
-            {
-                return multipart::get_header_object(headers, key);
-            }
-        };
-
-        /// Multipart map (key is the name parameter).
-        using mp_map = std::unordered_multimap<std::string, part, ci_hash, ci_key_eq>;
-
-        /// The parsed multipart request/response
-        struct message : public returnable
-        {
-            ci_map headers;          ///< The request/response headers
-            std::string boundary;    ///< The text boundary that separates different `parts`
-            std::vector<part> parts; ///< The individual parts of the message
-            mp_map part_map;         ///< The individual parts of the message, organized in a map with the `name` header parameter being the key
-
-            const std::string& get_header_value(const std::string& key) const
-            {
-                return crow::get_header_value(headers, key);
-            }
-
-            part get_part_by_name(const std::string& name)
-            {
-                mp_map::iterator result = part_map.find(name);
-                if (result != part_map.end())
-                    return result->second;
-                else
-                    return {};
-            }
-
-            /// Represent all parts as a string (**does not include message headers**)
-            std::string dump() const override
-            {
-                std::stringstream str;
-                std::string delimiter = dd + boundary;
-
-                for (unsigned i = 0; i < parts.size(); i++)
-                {
-                    str << delimiter << crlf;
-                    str << dump(i);
-                }
-                str << delimiter << dd << crlf;
-                return str.str();
-            }
-
-            /// Represent an individual part as a string
-            std::string dump(int part_) const
-            {
-                std::stringstream str;
-                part item = parts[part_];
-                for (auto& item_h : item.headers)
-                {
-                    str << item_h.first << ": " << item_h.second.value;
-                    for (auto& it : item_h.second.params)
-                    {
-                        str << "; " << it.first << '=' << pad(it.second);
-                    }
-                    str << crlf;
-                }
-                str << crlf;
-                str << item.body << crlf;
-                return str.str();
-            }
-
-            /// Default constructor using default values
-            message(const ci_map& headers, const std::string& boundary, const std::vector<part>& sections):
-              returnable("multipart/form-data; boundary=CROW-BOUNDARY"), headers(headers), boundary(boundary), parts(sections)
-            {
-                if (!boundary.empty())
-                    content_type = "multipart/form-data; boundary=" + boundary;
-                for (auto& item : parts)
-                {
-                    part_map.emplace(
-                      (get_header_object(item.headers, "Content-Disposition").params.find("name")->second),
-                      item);
-                }
-            }
-
-            /// Create a multipart message from a request data
-            message(const request& req):
-              returnable("multipart/form-data; boundary=CROW-BOUNDARY"),
-              headers(req.headers),
-              boundary(get_boundary(get_header_value("Content-Type")))
-            {
-                if (!boundary.empty())
-                    content_type = "multipart/form-data; boundary=" + boundary;
-                parse_body(req.body, parts, part_map);
-            }
-
-        private:
-            std::string get_boundary(const std::string& header) const
-            {
-                constexpr char boundary_text[] = "boundary=";
-                size_t found = header.find(boundary_text);
-                if (found != std::string::npos)
-                {
-                    std::string to_return(header.substr(found + strlen(boundary_text)));
-                    if (to_return[0] == '\"')
-                    {
-                        to_return = to_return.substr(1, to_return.length() - 2);
-                    }
-                    return to_return;
-                }
-                return std::string();
-            }
-
-            void parse_body(std::string body, std::vector<part>& sections, mp_map& part_map)
-            {
-
-                std::string delimiter = dd + boundary;
-
-                // TODO(EDev): Exit on error
-                while (body != (crlf))
-                {
-                    size_t found = body.find(delimiter);
-                    if (found == std::string::npos)
-                    {
-                        // did not find delimiter; probably an ill-formed body; ignore the rest
-                        break;
-                    }
-                    std::string section = body.substr(0, found);
-
-                    // +2 is the CRLF.
-                    // We don't check it and delete it so that the same delimiter can be used for The last delimiter (--delimiter--CRLF).
-                    body.erase(0, found + delimiter.length() + 2);
-                    if (!section.empty())
-                    {
-                        part parsed_section(parse_section(section));
-                        part_map.emplace(
-                          (get_header_object(parsed_section.headers, "Content-Disposition").params.find("name")->second),
-                          parsed_section);
-                        sections.push_back(std::move(parsed_section));
-                    }
-                }
-            }
-
-            part parse_section(std::string& section)
-            {
-                struct part to_return;
-
-                size_t found = section.find(crlf + crlf);
-                std::string head_line = section.substr(0, found + 2);
-                section.erase(0, found + 4);
-
-                parse_section_head(head_line, to_return);
-                to_return.body = section.substr(0, section.length() - 2);
-                return to_return;
-            }
-
-            void parse_section_head(std::string& lines, part& part)
-            {
-                while (!lines.empty())
-                {
-                    header to_add;
-
-                    size_t found = lines.find(crlf);
-                    std::string line = lines.substr(0, found);
-                    std::string key;
-                    lines.erase(0, found + 2);
-                    // Add the header if available
-                    if (!line.empty())
-                    {
-                        size_t found = line.find("; ");
-                        std::string header = line.substr(0, found);
-                        if (found != std::string::npos)
-                            line.erase(0, found + 2);
-                        else
-                            line = std::string();
-
-                        size_t header_split = header.find(": ");
-                        key = header.substr(0, header_split);
-
-                        to_add.value = header.substr(header_split + 2);
-                    }
-
-                    // Add the parameters
-                    while (!line.empty())
-                    {
-                        size_t found = line.find("; ");
-                        std::string param = line.substr(0, found);
-                        if (found != std::string::npos)
-                            line.erase(0, found + 2);
-                        else
-                            line = std::string();
-
-                        size_t param_split = param.find('=');
-
-                        std::string value = param.substr(param_split + 1);
-
-                        to_add.params.emplace(param.substr(0, param_split), trim(value));
-                    }
-                    part.headers.emplace(key, to_add);
-                }
-            }
-
-            inline std::string trim(std::string& string, const char& excess = '"') const
-            {
-                if (string.length() > 1 && string[0] == excess && string[string.length() - 1] == excess)
-                    return string.substr(1, string.length() - 2);
-                return string;
-            }
-
-            inline std::string pad(std::string& string, const char& padding = '"') const
-            {
-                return (padding + string + padding);
-            }
-        };
-    } // namespace multipart
-} // namespace crow
-
-/* merged revision: 5b951d74bd66ec9d38448e0a85b1cf8b85d97db3 */
-/* updated to     : e13b274770da9b82a1085dec29182acfea72e7a7 (beyond v2.9.5) */
-/* commits not included:
- * 091ebb87783a58b249062540bbea07de2a11e9cf
- * 6132d1fefa03f769a3979355d1f5da0b8889cad2
- * 7ba312397c2a6c851a4b5efe6c1603b1e1bda6ff
- * d7675453a6c03180572f084e95eea0d02df39164
- * dff604db203986e532e5a679bafd0e7382c6bdd9 (Might be useful to actually add [upgrade requests with a body])
- * e01811e7f4894d7f0f7f4bd8492cccec6f6b4038 (related to above)
- * 05525c5fde1fc562481f6ae08fa7056185325daf (also related to above)
- * 350258965909f249f9c59823aac240313e0d0120 (cannot be implemented due to upgrade)
- */
-
-// clang-format off
-extern "C" {
-#include <stddef.h>
-#if defined(_WIN32) && !defined(__MINGW32__) && \
-  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
-#include <BaseTsd.h>
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#elif (defined(__sun) || defined(__sun__)) && defined(__SunOS_5_9)
-#include <sys/inttypes.h>
-#else
-#include <stdint.h>
-#endif
-#include <assert.h>
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-}
-
-namespace crow
-{
-/* Maximium header size allowed. If the macro is not defined
- * before including this header then the default is used. To
- * change the maximum header size, define the macro in the build
- * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
- * the effective limit on the size of the header, define the macro
- * to a very large number (e.g. -DCROW_HTTP_MAX_HEADER_SIZE=0x7fffffff)
- */
-#ifndef CROW_HTTP_MAX_HEADER_SIZE
-# define CROW_HTTP_MAX_HEADER_SIZE (80*1024)
-#endif
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-
-/* Callbacks should return non-zero to indicate an error. The parser will
- * then halt execution.
- *
- * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
- * returning '1' from on_headers_complete will tell the parser that it
- * should not expect a body. This is used when receiving a response to a
- * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
- * chunked' headers that indicate the presence of a body.
- *
- * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
- * useful for handling responses to a CONNECT request which may not contain
- * `Upgrade` or `Connection: upgrade` headers.
- *
- * http_data_cb does not return data chunks. It will be called arbitrarally
- * many times for each string. E.G. you might get 10 callbacks for "on_url"
- * each providing just a few characters more data.
- */
-typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
-typedef int (*http_cb) (http_parser*);
-
-
-/* Flag values for http_parser.flags field */
-enum http_connection_flags // This is basically 7 booleans placed into 1 integer. Uses 4 bytes instead of n bytes (7 currently).
-  { F_CHUNKED               = 1 << 0 // 00000000 00000000 00000000 00000001
-  , F_CONNECTION_KEEP_ALIVE = 1 << 1 // 00000000 00000000 00000000 00000010
-  , F_CONNECTION_CLOSE      = 1 << 2 // 00000000 00000000 00000000 00000100
-  , F_TRAILING              = 1 << 3 // 00000000 00000000 00000000 00001000
-  , F_UPGRADE               = 1 << 4 // 00000000 00000000 00000000 00010000
-  , F_SKIPBODY              = 1 << 5 // 00000000 00000000 00000000 00100000
-  , F_CONTENTLENGTH         = 1 << 6 // 00000000 00000000 00000000 01000000
-  };
-
-
-/* Map for errno-related constants
- *
- * The provided argument should be a macro that takes 2 arguments.
- */
-#define CROW_HTTP_ERRNO_MAP(CROW_XX)                                                    \
-  /* No error */                                                                        \
-  CROW_XX(OK, "success")                                                                \
-                                                                                        \
-  /* Callback-related errors */                                                         \
-  CROW_XX(CB_message_begin, "the on_message_begin callback failed")                     \
-  CROW_XX(CB_method, "the on_method callback failed")                                   \
-  CROW_XX(CB_url, "the \"on_url\" callback failed")                                     \
-  CROW_XX(CB_header_field, "the \"on_header_field\" callback failed")                   \
-  CROW_XX(CB_header_value, "the \"on_header_value\" callback failed")                   \
-  CROW_XX(CB_headers_complete, "the \"on_headers_complete\" callback failed")           \
-  CROW_XX(CB_body, "the \"on_body\" callback failed")                                   \
-  CROW_XX(CB_message_complete, "the \"on_message_complete\" callback failed")           \
-  CROW_XX(CB_status, "the \"on_status\" callback failed")                               \
-                                                                                        \
-  /* Parsing-related errors */                                                          \
-  CROW_XX(INVALID_EOF_STATE, "stream ended at an unexpected time")                      \
-  CROW_XX(HEADER_OVERFLOW, "too many header bytes seen; overflow detected")             \
-  CROW_XX(CLOSED_CONNECTION, "data received after completed connection: close message") \
-  CROW_XX(INVALID_VERSION, "invalid HTTP version")                                      \
-  CROW_XX(INVALID_STATUS, "invalid HTTP status code")                                   \
-  CROW_XX(INVALID_METHOD, "invalid HTTP method")                                        \
-  CROW_XX(INVALID_URL, "invalid URL")                                                   \
-  CROW_XX(INVALID_HOST, "invalid host")                                                 \
-  CROW_XX(INVALID_PORT, "invalid port")                                                 \
-  CROW_XX(INVALID_PATH, "invalid path")                                                 \
-  CROW_XX(INVALID_QUERY_STRING, "invalid query string")                                 \
-  CROW_XX(INVALID_FRAGMENT, "invalid fragment")                                         \
-  CROW_XX(LF_EXPECTED, "LF character expected")                                         \
-  CROW_XX(INVALID_HEADER_TOKEN, "invalid character in header")                          \
-  CROW_XX(INVALID_CONTENT_LENGTH, "invalid character in content-length header")         \
-  CROW_XX(UNEXPECTED_CONTENT_LENGTH, "unexpected content-length header")                \
-  CROW_XX(INVALID_CHUNK_SIZE, "invalid character in chunk size header")                 \
-  CROW_XX(INVALID_CONSTANT, "invalid constant string")                                  \
-  CROW_XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")              \
-  CROW_XX(STRICT, "strict mode assertion failed")                                       \
-  CROW_XX(UNKNOWN, "an unknown error occurred")                                         \
-  CROW_XX(INVALID_TRANSFER_ENCODING, "request has invalid transfer-encoding")           \
-
-
-/* Define CHPE_* values for each errno value above */
-#define CROW_HTTP_ERRNO_GEN(n, s) CHPE_##n,
-enum http_errno {
-  CROW_HTTP_ERRNO_MAP(CROW_HTTP_ERRNO_GEN)
-};
-#undef CROW_HTTP_ERRNO_GEN
-
-
-/* Get an http_errno value from an http_parser */
-#define CROW_HTTP_PARSER_ERRNO(p) ((enum http_errno)(p)->http_errno)
-
-
-    struct http_parser
-    {
-        /** PRIVATE **/
-        unsigned int flags : 7;                  /* F_* values from 'flags' enum; semi-public */
-        unsigned int state : 8;                  /* enum state from http_parser.c */
-        unsigned int header_state : 7;           /* enum header_state from http_parser.c */
-        unsigned int index : 5;                  /* index into current matcher */
-        unsigned int uses_transfer_encoding : 1; /* Transfer-Encoding header is present */
-        unsigned int allow_chunked_length : 1;   /* Allow headers with both `Content-Length` and `Transfer-Encoding: chunked` set */
-        unsigned int lenient_http_headers : 1;
-
-        uint32_t nread;          /* # bytes read in various scenarios */
-        uint64_t content_length; /* # bytes in body. `(uint64_t) -1` (all bits one) if no Content-Length header. */
-        unsigned long qs_point;
-
-        /** READ-ONLY **/
-        unsigned char http_major;
-        unsigned char http_minor;
-        unsigned int method : 8;       /* requests only */
-        unsigned int http_errno : 7;
-
-  /* 1 = Upgrade header was present and the parser has exited because of that.
-   * 0 = No upgrade header present.
-   * Should be checked when http_parser_execute() returns in addition to
-   * error checking.
-   */
-        unsigned int upgrade : 1;
-
-        /** PUBLIC **/
-        void* data; /* A pointer to get hook to the "connection" or "socket" object */
-    };
-
-
-    struct http_parser_settings
-    {
-        http_cb on_message_begin;
-        http_cb on_method;
-        http_data_cb on_url;
-        http_data_cb on_header_field;
-        http_data_cb on_header_value;
-        http_cb on_headers_complete;
-        http_data_cb on_body;
-        http_cb on_message_complete;
-    };
-
-
-
-// SOURCE (.c) CODE
-static uint32_t max_header_size = CROW_HTTP_MAX_HEADER_SIZE;
-
-#ifndef CROW_ULLONG_MAX
-# define CROW_ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
-#endif
-
-#ifndef CROW_MIN
-# define CROW_MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef CROW_ARRAY_SIZE
-# define CROW_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef CROW_BIT_AT
-# define CROW_BIT_AT(a, i)                                           \
-  (!!((unsigned int) (a)[(unsigned int) (i) >> 3] &                  \
-   (1 << ((unsigned int) (i) & 7))))
-#endif
-
-#define CROW_SET_ERRNO(e)                                            \
-do {                                                                 \
-  parser->nread = nread;                                             \
-  parser->http_errno = (e);                                          \
-} while(0)
-
-/* Run the notify callback FOR, returning ER if it fails */
-#define CROW_CALLBACK_NOTIFY_(FOR, ER)                               \
-do {                                                                 \
-  assert(CROW_HTTP_PARSER_ERRNO(parser) == CHPE_OK);                 \
-                                                                     \
-  if (CROW_LIKELY(settings->on_##FOR)) {                             \
-    if (CROW_UNLIKELY(0 != settings->on_##FOR(parser))) {            \
-      CROW_SET_ERRNO(CHPE_CB_##FOR);                                 \
-    }                                                                \
-                                                                     \
-    /* We either errored above or got paused; get out */             \
-    if (CROW_UNLIKELY(CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK)) {  \
-      return (ER);                                                   \
-    }                                                                \
-  }                                                                  \
-} while (0)
-
-/* Run the notify callback FOR and consume the current byte */
-#define CROW_CALLBACK_NOTIFY(FOR)            CROW_CALLBACK_NOTIFY_(FOR, p - data + 1)
-
-/* Run the notify callback FOR and don't consume the current byte */
-#define CROW_CALLBACK_NOTIFY_NOADVANCE(FOR)  CROW_CALLBACK_NOTIFY_(FOR, p - data)
-
-/* Run data callback FOR with LEN bytes, returning ER if it fails */
-#define CROW_CALLBACK_DATA_(FOR, LEN, ER)                            \
-do {                                                                 \
-  assert(CROW_HTTP_PARSER_ERRNO(parser) == CHPE_OK);                 \
-                                                                     \
-  if (FOR##_mark) {                                                  \
-    if (CROW_LIKELY(settings->on_##FOR)) {                           \
-      if (CROW_UNLIKELY(0 !=                                         \
-          settings->on_##FOR(parser, FOR##_mark, (LEN)))) {          \
-        CROW_SET_ERRNO(CHPE_CB_##FOR);                               \
-      }                                                              \
-                                                                     \
-      /* We either errored above or got paused; get out */           \
-      if (CROW_UNLIKELY(CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK)) {\
-        return (ER);                                                 \
-      }                                                              \
-    }                                                                \
-    FOR##_mark = NULL;                                               \
-  }                                                                  \
-} while (0)
-
-/* Run the data callback FOR and consume the current byte */
-#define CROW_CALLBACK_DATA(FOR)                                      \
-    CROW_CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
-
-/* Run the data callback FOR and don't consume the current byte */
-#define CROW_CALLBACK_DATA_NOADVANCE(FOR)                            \
-    CROW_CALLBACK_DATA_(FOR, p - FOR##_mark, p - data)
-
-/* Set the mark FOR; non-destructive if mark is already set */
-#define CROW_MARK(FOR)                                               \
-do {                                                                 \
-  if (!FOR##_mark) {                                                 \
-    FOR##_mark = p;                                                  \
-  }                                                                  \
-} while (0)
-
-/* Don't allow the total size of the HTTP headers (including the status
- * line) to exceed max_header_size.  This check is here to protect
- * embedders against denial-of-service attacks where the attacker feeds
- * us a never-ending header that the embedder keeps buffering.
- *
- * This check is arguably the responsibility of embedders but we're doing
- * it on the embedder's behalf because most won't bother and this way we
- * make the web a little safer.  max_header_size is still far bigger
- * than any reasonable request or response so this should never affect
- * day-to-day operation.
- */
-#define CROW_COUNT_HEADER_SIZE(V)                                    \
-do {                                                                 \
-  nread += (uint32_t)(V);                                            \
-  if (CROW_UNLIKELY(nread > max_header_size)) {                      \
-    CROW_SET_ERRNO(CHPE_HEADER_OVERFLOW);                            \
-    goto error;                                                      \
-  }                                                                  \
-} while (0)
-#define CROW_REEXECUTE()                                             \
-  goto reexecute;                                                    \
-
-#define CROW_PROXY_CONNECTION "proxy-connection"
-#define CROW_CONNECTION "connection"
-#define CROW_CONTENT_LENGTH "content-length"
-#define CROW_TRANSFER_ENCODING "transfer-encoding"
-#define CROW_UPGRADE "upgrade"
-#define CROW_CHUNKED "chunked"
-#define CROW_KEEP_ALIVE "keep-alive"
-#define CROW_CLOSE "close"
-
-
-
-    enum state
-    {
-        s_dead = 1 /* important that this is > 0 */
-
-        ,
-        s_start_req
-
-        ,
-        s_req_method,
-        s_req_spaces_before_url,
-        s_req_schema,
-        s_req_schema_slash,
-        s_req_schema_slash_slash,
-        s_req_server_start,
-        s_req_server,             // }
-        s_req_server_with_at,     // |
-        s_req_path,               // | The parser recognizes how to switch between these states,
-        s_req_query_string_start, // | however it doesn't process them any differently.
-        s_req_query_string,       // }
-        s_req_http_start,
-        s_req_http_H,
-        s_req_http_HT,
-        s_req_http_HTT,
-        s_req_http_HTTP,
-        s_req_http_I,
-        s_req_http_IC,
-        s_req_http_major,
-        s_req_http_dot,
-        s_req_http_minor,
-        s_req_http_end,
-        s_req_line_almost_done
-
-        ,
-        s_header_field_start,
-        s_header_field,
-        s_header_value_discard_ws,
-        s_header_value_discard_ws_almost_done,
-        s_header_value_discard_lws,
-        s_header_value_start,
-        s_header_value,
-        s_header_value_lws
-
-        ,
-        s_header_almost_done
-
-        ,
-        s_chunk_size_start,
-        s_chunk_size,
-        s_chunk_parameters,
-        s_chunk_size_almost_done
-
-        ,
-        s_headers_almost_done,
-        s_headers_done
-
-        /* Important: 's_headers_done' must be the last 'header' state. All
-         * states beyond this must be 'body' states. It is used for overflow
-         * checking. See the CROW_PARSING_HEADER() macro.
-         */
-
-        ,
-        s_chunk_data,
-        s_chunk_data_almost_done,
-        s_chunk_data_done
-
-        ,
-        s_body_identity,
-        s_body_identity_eof
-
-        ,
-        s_message_done
-    };
-
-
-#define CROW_PARSING_HEADER(state) (state <= s_headers_done)
-
-
-enum header_states
-  { h_general = 0
-  , h_C
-  , h_CO
-  , h_CON
-
-  , h_matching_connection
-  , h_matching_proxy_connection
-  , h_matching_content_length
-  , h_matching_transfer_encoding
-  , h_matching_upgrade
-
-  , h_connection
-  , h_content_length
-  , h_content_length_num
-  , h_content_length_ws
-  , h_transfer_encoding
-  , h_upgrade
-
-  , h_matching_transfer_encoding_token_start
-  , h_matching_transfer_encoding_chunked
-  , h_matching_transfer_encoding_token
-
-  , h_matching_connection_keep_alive
-  , h_matching_connection_close
-
-  , h_transfer_encoding_chunked
-  , h_connection_keep_alive
-  , h_connection_close
-  };
-
-enum http_host_state
-  {
-    s_http_host_dead = 1
-  , s_http_userinfo_start
-  , s_http_userinfo
-  , s_http_host_start
-  , s_http_host_v6_start
-  , s_http_host
-  , s_http_host_v6
-  , s_http_host_v6_end
-  , s_http_host_v6_zone_start
-  , s_http_host_v6_zone
-  , s_http_host_port_start
-  , s_http_host_port
-};
-
-/* Macros for character classes; depends on strict-mode  */
-#define CROW_LOWER(c)            (unsigned char)(c | 0x20)
-#define CROW_IS_ALPHA(c)         (CROW_LOWER(c) >= 'a' && CROW_LOWER(c) <= 'z')
-#define CROW_IS_NUM(c)           ((c) >= '0' && (c) <= '9')
-#define CROW_IS_ALPHANUM(c)      (CROW_IS_ALPHA(c) || CROW_IS_NUM(c))
-//#define CROW_IS_HEX(c)           (CROW_IS_NUM(c) || (CROW_LOWER(c) >= 'a' && CROW_LOWER(c) <= 'f'))
-#define CROW_IS_MARK(c)          ((c) == '-' || (c) == '_' || (c) == '.' || \
-  (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' ||    \
-  (c) == ')')
-#define CROW_IS_USERINFO_CHAR(c) (CROW_IS_ALPHANUM(c) || CROW_IS_MARK(c) || (c) == '%' || \
-  (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' ||                   \
-  (c) == '$' || (c) == ',')
-
-#define CROW_TOKEN(c)            (tokens[(unsigned char)c])
-#define CROW_IS_URL_CHAR(c)      (CROW_BIT_AT(normal_url_char, (unsigned char)c))
-//#define CROW_IS_HOST_CHAR(c)     (CROW_IS_ALPHANUM(c) || (c) == '.' || (c) == '-')
-
-  /**
- * Verify that a char is a valid visible (printable) US-ASCII
- * character or %x80-FF
- **/
-#define CROW_IS_HEADER_CHAR(ch)                                                     \
-  (ch == cr || ch == lf || ch == 9 || ((unsigned char)ch > 31 && ch != 127))
-
-#define CROW_start_state s_start_req
-
-# define CROW_STRICT_CHECK(cond)                                     \
-do {                                                                 \
-  if (cond) {                                                        \
-    CROW_SET_ERRNO(CHPE_STRICT);                                     \
-    goto error;                                                      \
-  }                                                                  \
-} while (0)
-#define CROW_NEW_MESSAGE() (CROW_start_state)
-
-/* Our URL parser.
- *
- * This is designed to be shared by http_parser_execute() for URL validation,
- * hence it has a state transition + byte-for-byte interface. In addition, it
- * is meant to be embedded in http_parser_parse_url(), which does the dirty
- * work of turning state transitions URL components for its API.
- *
- * This function should only be invoked with non-space characters. It is
- * assumed that the caller cares about (and can detect) the transition between
- * URL and non-URL states by looking for these.
- */
-inline enum state
-parse_url_char(enum state s, const char ch, http_parser *parser, const char* url_mark, const char* p)
-{
-# define CROW_T(v) 0
-
-
-static const uint8_t normal_url_char[32] = {
-/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
-/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
-        0    |CROW_T(2)|  0    |   0    |CROW_T(16)| 0    |   0    |   0,
-/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
-/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
-/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
-        0    |   2    |   4    |   0    |   16   |   32   |   64   |  128,
-/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0,
-/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  80  P    81  Q    82  R    83  S    84  CROW_T    85  U    86  V    87  W  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0, };
-
-#undef CROW_T
-
-  if (ch == ' ' || ch == '\r' || ch == '\n') {
-    return s_dead;
-  }
-  if (ch == '\t' || ch == '\f') {
-    return s_dead;
-  }
-
-  switch (s) {
-    case s_req_spaces_before_url:
-      /* Proxied requests are followed by scheme of an absolute URI (alpha).
-       * All methods except CONNECT are followed by '/' or '*'.
-       */
-
-      if (ch == '/' || ch == '*') {
-        return s_req_path;
-      }
-
-      if (CROW_IS_ALPHA(ch)) {
-        return s_req_schema;
-      }
-
-      break;
-
-    case s_req_schema:
-      if (CROW_IS_ALPHA(ch)) {
-        return s;
-      }
-
-      if (ch == ':') {
-        return s_req_schema_slash;
-      }
-
-      break;
-
-    case s_req_schema_slash:
-      if (ch == '/') {
-        return s_req_schema_slash_slash;
-      }
-
-      break;
-
-    case s_req_schema_slash_slash:
-      if (ch == '/') {
-        return s_req_server_start;
-      }
-
-      break;
-
-    case s_req_server_with_at:
-      if (ch == '@') {
-        return s_dead;
-      }
-
-    /* fall through */
-    case s_req_server_start:
-    case s_req_server:
-      if (ch == '/') {
-        return s_req_path;
-      }
-
-      if (ch == '?') {
-          parser->qs_point = p - url_mark;
-        return s_req_query_string_start;
-      }
-
-      if (ch == '@') {
-        return s_req_server_with_at;
-      }
-
-      if (CROW_IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') {
-        return s_req_server;
-      }
-
-      break;
-
-    case s_req_path:
-      if (CROW_IS_URL_CHAR(ch)) {
-        return s;
-      }
-      else if (ch == '?')
-      {
-          parser->qs_point = p - url_mark;
-          return s_req_query_string_start;
-      }
-
-      break;
-
-    case s_req_query_string_start:
-    case s_req_query_string:
-      if (CROW_IS_URL_CHAR(ch)) {
-        return s_req_query_string;
-      }
-      else if (ch == '?')
-      {
-          return s_req_query_string;
-      }
-
-      break;
-
-    default:
-      break;
-  }
-
-  /* We should never fall out of the switch above unless there's an error */
-  return s_dead;
-}
-
-inline size_t http_parser_execute (http_parser *parser,
-                            const http_parser_settings *settings,
-                            const char *data,
-                            size_t len)
-{
-
-/* Tokens as defined by rfc 2616. Also lowercases them.
- *        token       = 1*<any CHAR except CTLs or separators>
- *     separators     = "(" | ")" | "<" | ">" | "@"
- *                    | "," | ";" | ":" | "\" | <">
- *                    | "/" | "[" | "]" | "?" | "="
- *                    | "{" | "}" | SP  | HT
- */
-static const char tokens[256] = {
-/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
-        0,      '!',      0,      '#',     '$',     '%',     '&',    '\'',
-/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
-        0,       0,      '*',     '+',      0,      '-',     '.',      0,
-/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
-       '0',     '1',     '2',     '3',     '4',     '5',     '6',     '7',
-/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
-       '8',     '9',      0,       0,       0,       0,       0,       0,
-/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
-        0,      'a',     'b',     'c',     'd',     'e',     'f',     'g',
-/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
-       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
-/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
-       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
-/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
-       'x',     'y',     'z',      0,       0,       0,      '^',     '_',
-/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
-       '`',     'a',     'b',     'c',     'd',     'e',     'f',     'g',
-/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
-       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
-/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
-       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
-/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
-       'x',     'y',     'z',      0,      '|',      0,      '~',       0 };
-
-
-static const int8_t unhex[256] =
-  {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1
-  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  };
-
-
-
-  char c, ch;
-  int8_t unhex_val;
-  const char *p = data;
-  const char *header_field_mark = 0;
-  const char *header_value_mark = 0;
-  const char *url_mark = 0;
-  const char *url_start_mark = 0;
-  const char *body_mark = 0;
-  const unsigned int lenient = parser->lenient_http_headers;
-  const unsigned int allow_chunked_length = parser->allow_chunked_length;
-  
-  uint32_t nread = parser->nread;
-
-  /* We're in an error state. Don't bother doing anything. */
-  if (CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK) {
-    return 0;
-  }
-
-  if (len == 0) {
-    switch (parser->state) {
-      case s_body_identity_eof:
-        /* Use of CROW_CALLBACK_NOTIFY() here would erroneously return 1 byte read if we got paused. */
-        CROW_CALLBACK_NOTIFY_NOADVANCE(message_complete);
-        return 0;
-
-      case s_dead:
-      case s_start_req:
-        return 0;
-
-      default:
-        CROW_SET_ERRNO(CHPE_INVALID_EOF_STATE);
-        return 1;
-    }
-  }
-
-
-  if (parser->state == s_header_field)
-    header_field_mark = data;
-  if (parser->state == s_header_value)
-    header_value_mark = data;
-  switch (parser->state) {
-  case s_req_path:
-  case s_req_schema:
-  case s_req_schema_slash:
-  case s_req_schema_slash_slash:
-  case s_req_server_start:
-  case s_req_server:
-  case s_req_server_with_at:
-  case s_req_query_string_start:
-  case s_req_query_string:
-    url_mark = data;
-    break;
-  default:
-    break;
-  }
-
-  for (p=data; p != data + len; p++) {
-    ch = *p;
-
-    if (CROW_PARSING_HEADER(parser->state))
-      CROW_COUNT_HEADER_SIZE(1);
-
-reexecute:
-    switch (parser->state) {
-
-      case s_dead:
-        /* this state is used after a 'Connection: close' message
-         * the parser will error out if it reads another message
-         */
-        if (CROW_LIKELY(ch == cr || ch == lf))
-          break;
-
-        CROW_SET_ERRNO(CHPE_CLOSED_CONNECTION);
-        goto error;
-
-      case s_start_req:
-      {
-        if (ch == cr || ch == lf)
-          break;
-        parser->flags = 0;
-        parser->uses_transfer_encoding = 0;
-        parser->content_length = CROW_ULLONG_MAX;
-
-        if (CROW_UNLIKELY(!CROW_IS_ALPHA(ch))) {
-          CROW_SET_ERRNO(CHPE_INVALID_METHOD);
-          goto error;
-        }
-
-        parser->method = 0;
-        parser->index = 1;
-        switch (ch) {
-          case 'A': parser->method = (unsigned)HTTPMethod::Acl;                                                              break;
-          case 'B': parser->method = (unsigned)HTTPMethod::Bind;                                                             break;
-          case 'C': parser->method = (unsigned)HTTPMethod::Connect;   /* or COPY, CHECKOUT */                                break;
-          case 'D': parser->method = (unsigned)HTTPMethod::Delete;                                                           break;
-          case 'G': parser->method = (unsigned)HTTPMethod::Get;                                                              break;
-          case 'H': parser->method = (unsigned)HTTPMethod::Head;                                                             break;
-          case 'L': parser->method = (unsigned)HTTPMethod::Lock;      /* or LINK */                                          break;
-          case 'M': parser->method = (unsigned)HTTPMethod::MkCol;     /* or MOVE, MKACTIVITY, MERGE, M-SEARCH, MKCALENDAR */ break;
-          case 'N': parser->method = (unsigned)HTTPMethod::Notify;                                                           break;
-          case 'O': parser->method = (unsigned)HTTPMethod::Options;                                                          break;
-          case 'P': parser->method = (unsigned)HTTPMethod::Post;      /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */            break;
-          case 'R': parser->method = (unsigned)HTTPMethod::Report;    /* or REBIND */                                        break;
-          case 'S': parser->method = (unsigned)HTTPMethod::Subscribe; /* or SEARCH, SOURCE */                                break;
-          case 'T': parser->method = (unsigned)HTTPMethod::Trace;                                                            break;
-          case 'U': parser->method = (unsigned)HTTPMethod::Unlock;    /* or UNSUBSCRIBE, UNBIND, UNLINK */                   break;
-          default:
-            CROW_SET_ERRNO(CHPE_INVALID_METHOD);
-            goto error;
-        }
-        parser->state = s_req_method;
-
-        CROW_CALLBACK_NOTIFY(message_begin);
-
-        break;
-      }
-
-      case s_req_method:
-      {
-        const char *matcher;
-        if (CROW_UNLIKELY(ch == '\0')) {
-          CROW_SET_ERRNO(CHPE_INVALID_METHOD);
-          goto error;
-        }
-
-        matcher = method_strings[parser->method];
-        if (ch == ' ' && matcher[parser->index] == '\0') {
-          parser->state = s_req_spaces_before_url;
-        } else if (ch == matcher[parser->index]) {
-          ; /* nada */
-        } else if ((ch >= 'A' && ch <= 'Z') || ch == '-') {
-
-          switch (parser->method << 16 | parser->index << 8 | ch) {
-#define CROW_XX(meth, pos, ch, new_meth) \
-            case ((unsigned)HTTPMethod::meth << 16 | pos << 8 | ch): \
-              parser->method = (unsigned)HTTPMethod::new_meth; break;
-
-            CROW_XX(Post,      1, 'U', Put)
-            CROW_XX(Post,      1, 'A', Patch)
-            CROW_XX(Post,      1, 'R', Propfind)
-            CROW_XX(Put,       2, 'R', Purge)
-            CROW_XX(Connect,   1, 'H', Checkout)
-            CROW_XX(Connect,   2, 'P', Copy)
-            CROW_XX(MkCol,     1, 'O', Move)
-            CROW_XX(MkCol,     1, 'E', Merge)
-            CROW_XX(MkCol,     1, '-', MSearch)
-            CROW_XX(MkCol,     2, 'A', MkActivity)
-            CROW_XX(MkCol,     3, 'A', MkCalendar)
-            CROW_XX(Subscribe, 1, 'E', Search)
-            CROW_XX(Subscribe, 1, 'O', Source)
-            CROW_XX(Report,    2, 'B', Rebind)
-            CROW_XX(Propfind,  4, 'P', Proppatch)
-            CROW_XX(Lock,      1, 'I', Link)
-            CROW_XX(Unlock,    2, 'S', Unsubscribe)
-            CROW_XX(Unlock,    2, 'B', Unbind)
-            CROW_XX(Unlock,    3, 'I', Unlink)
-#undef CROW_XX
-            default:
-              CROW_SET_ERRNO(CHPE_INVALID_METHOD);
-              goto error;
-          }
-        } else {
-          CROW_SET_ERRNO(CHPE_INVALID_METHOD);
-          goto error;
-        }
-
-        CROW_CALLBACK_NOTIFY_NOADVANCE(method);
-
-        ++parser->index;
-        break;
-      }
-
-      case s_req_spaces_before_url:
-      {
-        if (ch == ' ') break;
-
-        CROW_MARK(url);
-        CROW_MARK(url_start);
-        if (parser->method == (unsigned)HTTPMethod::Connect) {
-          parser->state = s_req_server_start;
-        }
-
-        parser->state = parse_url_char(static_cast<state>(parser->state), ch, parser, url_start_mark, p);
-        if (CROW_UNLIKELY(parser->state == s_dead)) {
-          CROW_SET_ERRNO(CHPE_INVALID_URL);
-          goto error;
-        }
-
-        break;
-      }
-
-      case s_req_schema:
-      case s_req_schema_slash:
-      case s_req_schema_slash_slash:
-      case s_req_server_start:
-      {
-        switch (ch) {
-          /* No whitespace allowed here */
-          case ' ':
-          case cr:
-          case lf:
-            CROW_SET_ERRNO(CHPE_INVALID_URL);
-            goto error;
-          default:
-            parser->state = parse_url_char(static_cast<state>(parser->state), ch, parser, url_start_mark, p);
-            if (CROW_UNLIKELY(parser->state == s_dead)) {
-              CROW_SET_ERRNO(CHPE_INVALID_URL);
-              goto error;
-            }
-        }
-
-        break;
-      }
-
-      case s_req_server:
-      case s_req_server_with_at:
-      case s_req_path:
-      case s_req_query_string_start:
-      case s_req_query_string:
-      {
-        switch (ch) {
-          case ' ':
-            parser->state = s_req_http_start;
-            CROW_CALLBACK_DATA(url);
-            break;
-          case cr: // No space after URL means no HTTP version. Which means the request is using HTTP/0.9
-          case lf:
-            if (CROW_UNLIKELY(parser->method != (unsigned)HTTPMethod::Get)) // HTTP/0.9 doesn't define any method other than GET
-            {
-              parser->state = s_dead;
-              CROW_SET_ERRNO(CHPE_INVALID_VERSION);
-              goto error;
-            }
-            parser->http_major = 0;
-            parser->http_minor = 9;
-            parser->state = (ch == cr) ?
-              s_req_line_almost_done :
-              s_header_field_start;
-            CROW_CALLBACK_DATA(url);
-            break;
-          default:
-            parser->state = parse_url_char(static_cast<state>(parser->state), ch, parser, url_start_mark, p);
-            if (CROW_UNLIKELY(parser->state == s_dead)) {
-              CROW_SET_ERRNO(CHPE_INVALID_URL);
-              goto error;
-            }
-        }
-        break;
-      }
-
-      case s_req_http_start:
-        switch (ch) {
-          case ' ':
-            break;
-          case 'H':
-            parser->state = s_req_http_H;
-            break;
-          case 'I':
-            if (parser->method == (unsigned)HTTPMethod::Source) {
-              parser->state = s_req_http_I;
-              break;
-            }
-            /* fall through */
-          default:
-            CROW_SET_ERRNO(CHPE_INVALID_CONSTANT);
-            goto error;
-        }
-        break;
-
-      case s_req_http_H:
-        CROW_STRICT_CHECK(ch != 'T');
-        parser->state = s_req_http_HT;
-        break;
-
-      case s_req_http_HT:
-        CROW_STRICT_CHECK(ch != 'T');
-        parser->state = s_req_http_HTT;
-        break;
-
-      case s_req_http_HTT:
-        CROW_STRICT_CHECK(ch != 'P');
-        parser->state = s_req_http_HTTP;
-        break;
-
-      case s_req_http_I:
-        CROW_STRICT_CHECK(ch != 'C');
-        parser->state = s_req_http_IC;
-        break;
-
-      case s_req_http_IC:
-        CROW_STRICT_CHECK(ch != 'E');
-        parser->state = s_req_http_HTTP;  /* Treat "ICE" as "HTTP". */
-        break;
-
-      case s_req_http_HTTP:
-        CROW_STRICT_CHECK(ch != '/');
-        parser->state = s_req_http_major;
-        break;
-
-      /* dot */
-      case s_req_http_major:
-        if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
-          CROW_SET_ERRNO(CHPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_major = ch - '0';
-        parser->state = s_req_http_dot;
-        break;
-
-      case s_req_http_dot:
-      {
-        if (CROW_UNLIKELY(ch != '.')) {
-          CROW_SET_ERRNO(CHPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->state = s_req_http_minor;
-        break;
-      }
-
-      /* minor HTTP version */
-      case s_req_http_minor:
-        if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
-          CROW_SET_ERRNO(CHPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_minor = ch - '0';
-        parser->state = s_req_http_end;
-        break;
-
-      /* end of request line */
-      case s_req_http_end:
-      {
-        if (ch == cr) {
-          parser->state = s_req_line_almost_done;
-          break;
-        }
-
-        if (ch == lf) {
-          parser->state = s_header_field_start;
-          break;
-        }
-
-        CROW_SET_ERRNO(CHPE_INVALID_VERSION);
-        goto error;
-        break;
-      }
-
-      /* end of request line */
-      case s_req_line_almost_done:
-      {
-        if (CROW_UNLIKELY(ch != lf)) {
-          CROW_SET_ERRNO(CHPE_LF_EXPECTED);
-          goto error;
-        }
-
-        parser->state = s_header_field_start;
-        break;
-      }
-
-      case s_header_field_start:
-      {
-        if (ch == cr) {
-          parser->state = s_headers_almost_done;
-          break;
-        }
-
-        if (ch == lf) {
-          /* they might be just sending \n instead of \r\n so this would be
-           * the second \n to denote the end of headers*/
-          parser->state = s_headers_almost_done;
-          CROW_REEXECUTE();
-        }
-
-        c = CROW_TOKEN(ch);
-
-        if (CROW_UNLIKELY(!c)) {
-          CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
-          goto error;
-        }
-
-        CROW_MARK(header_field);
-
-        parser->index = 0;
-        parser->state = s_header_field;
-
-        switch (c) {
-          case 'c':
-            parser->header_state = h_C;
-            break;
-
-          case 'p':
-            parser->header_state = h_matching_proxy_connection;
-            break;
-
-          case 't':
-            parser->header_state = h_matching_transfer_encoding;
-            break;
-
-          case 'u':
-            parser->header_state = h_matching_upgrade;
-            break;
-
-          default:
-            parser->header_state = h_general;
-            break;
-        }
-        break;
-      }
-
-      case s_header_field:
-      {        
-        const char* start = p;
-        for (; p != data + len; p++) {
-          ch = *p;
-          c = CROW_TOKEN(ch);
-
-          if (!c)
-            break;
-          
-          switch (parser->header_state) {
-            case h_general: {
-              size_t left = data + len - p;
-              const char* pe = p + CROW_MIN(left, max_header_size);
-              while (p+1 < pe && CROW_TOKEN(p[1])) {
-                p++;
-              }
-              break;
-            }
-
-            case h_C:
-              parser->index++;
-              parser->header_state = (c == 'o' ? h_CO : h_general);
-              break;
-
-            case h_CO:
-              parser->index++;
-              parser->header_state = (c == 'n' ? h_CON : h_general);
-              break;
-
-            case h_CON:
-              parser->index++;
-              switch (c) {
-                case 'n':
-                  parser->header_state = h_matching_connection;
-                  break;
-                case 't':
-                  parser->header_state = h_matching_content_length;
-                  break;
-                default:
-                  parser->header_state = h_general;
-                  break;
-              }
-              break;
-
-            /* connection */
-
-            case h_matching_connection:
-              parser->index++;
-              if (parser->index > sizeof(CROW_CONNECTION)-1 || c != CROW_CONNECTION[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CROW_CONNECTION)-2) {
-                parser->header_state = h_connection;
-              }
-              break;
-
-            /* proxy-connection */
-
-            case h_matching_proxy_connection:
-              parser->index++;
-              if (parser->index > sizeof(CROW_PROXY_CONNECTION)-1 || c != CROW_PROXY_CONNECTION[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CROW_PROXY_CONNECTION)-2) {
-                parser->header_state = h_connection;
-              }
-              break;
-
-            /* content-length */
-
-            case h_matching_content_length:
-              parser->index++;
-              if (parser->index > sizeof(CROW_CONTENT_LENGTH)-1 || c != CROW_CONTENT_LENGTH[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CROW_CONTENT_LENGTH)-2) {
-                parser->header_state = h_content_length;
-              }
-              break;
-
-            /* transfer-encoding */
-
-            case h_matching_transfer_encoding:
-              parser->index++;
-              if (parser->index > sizeof(CROW_TRANSFER_ENCODING)-1 || c != CROW_TRANSFER_ENCODING[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CROW_TRANSFER_ENCODING)-2) {
-                parser->header_state = h_transfer_encoding;
-                parser->uses_transfer_encoding = 1;
-              }
-              break;
-
-            /* upgrade */
-
-            case h_matching_upgrade:
-              parser->index++;
-              if (parser->index > sizeof(CROW_UPGRADE)-1 || c != CROW_UPGRADE[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CROW_UPGRADE)-2) {
-                parser->header_state = h_upgrade;
-              }
-              break;
-
-            case h_connection:
-            case h_content_length:
-            case h_transfer_encoding:
-            case h_upgrade:
-              if (ch != ' ') parser->header_state = h_general;
-              break;
-
-            default:
-              assert(0 && "Unknown header_state");
-              break;
-          }
-        }
-
-        if (p == data + len) {
-          --p;
-          CROW_COUNT_HEADER_SIZE(p - start);
-          break;
-        }
-
-        CROW_COUNT_HEADER_SIZE(p - start);
-
-        if (ch == ':') {
-          parser->state = s_header_value_discard_ws;
-          CROW_CALLBACK_DATA(header_field);
-          break;
-        }
-/* RFC-7230 Sec 3.2.4 expressly forbids line-folding in header field-names.
-        if (ch == cr) {
-          parser->state = s_header_almost_done;
-          CROW_CALLBACK_DATA(header_field);
-          break;
-        }
-
-        if (ch == lf) {
-          parser->state = s_header_field_start;
-          CROW_CALLBACK_DATA(header_field);
-          break;
-        }
-*/
-        CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
-        goto error;
-      }
-
-      case s_header_value_discard_ws:
-        if (ch == ' ' || ch == '\t') break;
-
-        if (ch == cr) {
-          parser->state = s_header_value_discard_ws_almost_done;
-          break;
-        }
-
-        if (ch == lf) {
-          parser->state = s_header_value_discard_lws;
-          break;
-        }
-
-        /* fall through */
-
-      case s_header_value_start:
-      {
-        CROW_MARK(header_value);
-
-        parser->state = s_header_value;
-        parser->index = 0;
-
-        c = CROW_LOWER(ch);
-
-        switch (parser->header_state) {
-          case h_upgrade:
-            // Crow does not support HTTP/2 at the moment.
-            // According to the RFC https://datatracker.ietf.org/doc/html/rfc7540#section-3.2
-            // "A server that does not support HTTP/2 can respond to the request as though the Upgrade header field were absent"
-            // => `F_UPGRADE` is not set if the header starts by "h2".
-            // This prevents the parser from skipping the request body.
-            if (ch != 'h' || p+1 == (data + len) || *(p+1) != '2') {
-              parser->flags |= F_UPGRADE;
-            }
-            parser->header_state = h_general;
-            break;
-
-          case h_transfer_encoding:
-            /* looking for 'Transfer-Encoding: chunked' */
-            if ('c' == c) {
-              parser->header_state = h_matching_transfer_encoding_chunked;
-            } else {
-              parser->header_state = h_matching_transfer_encoding_token;
-            }
-            break;
-            
-          /* Multi-value `Transfer-Encoding` header */
-          case h_matching_transfer_encoding_token_start:
-            break;
-
-          case h_content_length:
-            if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
-              CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
-              goto error;
-            }
-            
-            if (parser->flags & F_CONTENTLENGTH) {
-              CROW_SET_ERRNO(CHPE_UNEXPECTED_CONTENT_LENGTH);
-              goto error;
-            }
-            parser->flags |= F_CONTENTLENGTH;
-            parser->content_length = ch - '0';
-            parser->header_state = h_content_length_num;
-            break;
-
-          /* when obsolete line folding is encountered for content length
-           * continue to the s_header_value state */
-          case h_content_length_ws:
-            break;
-
-          case h_connection:
-            /* looking for 'Connection: keep-alive' */
-            if (c == 'k') {
-              parser->header_state = h_matching_connection_keep_alive;
-            /* looking for 'Connection: close' */
-            } else if (c == 'c') {
-              parser->header_state = h_matching_connection_close;
-            } else if (c == ' ' || c == '\t') {
-              /* Skip lws */
-            } else {
-              parser->header_state = h_general;
-            }
-            break;
-
-          default:
-            parser->header_state = h_general;
-            break;
-        }
-        break;
-      }
-
-      case s_header_value:
-      {
-        const char* start = p;
-        enum header_states h_state = static_cast<header_states>(parser->header_state);
-        for (; p != data + len; p++) {
-          ch = *p;
-
-          if (ch == cr) {
-            parser->state = s_header_almost_done;
-            parser->header_state = h_state;
-            CROW_CALLBACK_DATA(header_value);
-            break;
-          }
-
-          if (ch == lf) {
-            parser->state = s_header_almost_done;
-            CROW_COUNT_HEADER_SIZE(p - start);
-            parser->header_state = h_state;
-            CROW_CALLBACK_DATA_NOADVANCE(header_value);
-            CROW_REEXECUTE();
-          }
-          
-          if (!lenient && !CROW_IS_HEADER_CHAR(ch)) {
-            CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
-            goto error;
-          }
-          
-          c = CROW_LOWER(ch);
-
-          switch (h_state) {
-            case h_general:
-              {
-                size_t left = data + len - p;
-                const char* pe = p + CROW_MIN(left, max_header_size);
-
-                for (; p != pe; p++) {
-                  ch = *p;
-                  if (ch == cr || ch == lf) {
-                    --p;
-                    break;
-                  }
-                  if (!lenient && !CROW_IS_HEADER_CHAR(ch)) {
-                    CROW_SET_ERRNO(CHPE_INVALID_HEADER_TOKEN);
-                    goto error;
-                  }
-                }
-                if (p == data + len)
-                  --p;
-                break;
-              }
-
-            case h_connection:
-            case h_transfer_encoding:
-              assert(0 && "Shouldn't get here.");
-              break;
-
-            case h_content_length:
-              if (ch == ' ') break;
-              h_state = h_content_length_num;
-              /* fall through */
-
-            case h_content_length_num:
-            {
-              uint64_t t;
-
-              if (ch == ' ') {
-                h_state = h_content_length_ws;
-                break;
-              }
-
-              if (CROW_UNLIKELY(!CROW_IS_NUM(ch))) {
-                CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
-                parser->header_state = h_state;
-                goto error;
-              }
-
-              t = parser->content_length;
-              t *= 10;
-              t += ch - '0';
-
-              /* Overflow? Test against a conservative limit for simplicity. */
-              if (CROW_UNLIKELY((CROW_ULLONG_MAX - 10) / 10 < parser->content_length)) {
-                CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
-                parser->header_state = h_state;
-                goto error;
-              }
-
-              parser->content_length = t;
-              break;
-            }
-            
-            case h_content_length_ws:
-              if (ch == ' ') break;
-              CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
-              parser->header_state = h_state;
-              goto error;
-
-            /* Transfer-Encoding: chunked */
-            case h_matching_transfer_encoding_token_start:
-              /* looking for 'Transfer-Encoding: chunked' */
-              if ('c' == c) {
-                h_state = h_matching_transfer_encoding_chunked;
-              } else if (CROW_TOKEN(c)) {
-                /* TODO(indutny): similar code below does this, but why?
-                 * At the very least it seems to be inconsistent given that
-                 * h_matching_transfer_encoding_token does not check for
-                 * `STRICT_TOKEN`
-                 */
-                h_state = h_matching_transfer_encoding_token;
-              } else if (c == ' ' || c == '\t') {
-                /* Skip lws */
-              } else {
-                h_state = h_general;
-              }
-              break;
-
-            case h_matching_transfer_encoding_chunked:
-              parser->index++;
-              if (parser->index > sizeof(CROW_CHUNKED)-1 || c != CROW_CHUNKED[parser->index]) {
-                h_state = h_matching_transfer_encoding_token;
-              } else if (parser->index == sizeof(CROW_CHUNKED)-2) {
-                h_state = h_transfer_encoding_chunked;
-              }
-              break;
-
-            case h_matching_transfer_encoding_token:
-              if (ch == ',') {
-                h_state = h_matching_transfer_encoding_token_start;
-                parser->index = 0;
-              }
-              break;
-
-            /* looking for 'Connection: keep-alive' */
-            case h_matching_connection_keep_alive:
-              parser->index++;
-              if (parser->index > sizeof(CROW_KEEP_ALIVE)-1 || c != CROW_KEEP_ALIVE[parser->index]) {
-                h_state = h_general;
-              } else if (parser->index == sizeof(CROW_KEEP_ALIVE)-2) {
-                h_state = h_connection_keep_alive;
-              }
-              break;
-
-            /* looking for 'Connection: close' */
-            case h_matching_connection_close:
-              parser->index++;
-              if (parser->index > sizeof(CROW_CLOSE)-1 || c != CROW_CLOSE[parser->index]) {
-                h_state = h_general;
-              } else if (parser->index == sizeof(CROW_CLOSE)-2) {
-                h_state = h_connection_close;
-              }
-              break;
-
-              // Edited from original (because of commits that werent included)
-            case h_transfer_encoding_chunked:
-              if (ch != ' ') h_state = h_matching_transfer_encoding_token;
-              break;
-            case h_connection_keep_alive:
-            case h_connection_close:
-              if (ch != ' ') h_state = h_general;
-              break;
-
-            default:
-              parser->state = s_header_value;
-              h_state = h_general;
-              break;
-          }
-        }
-        parser->header_state = h_state;
-        
-        
-        if (p == data + len)
-          --p;
-        
-        CROW_COUNT_HEADER_SIZE(p - start);
-        break;
-      }
-
-      case s_header_almost_done:
-      {
-        if (CROW_UNLIKELY(ch != lf)) {
-          CROW_SET_ERRNO(CHPE_LF_EXPECTED);
-          goto error;
-        }
-
-        parser->state = s_header_value_lws;
-        break;
-      }
-
-      case s_header_value_lws:
-      {
-        if (ch == ' ' || ch == '\t') {
-          if (parser->header_state == h_content_length_num) {
-              /* treat obsolete line folding as space */
-              parser->header_state = h_content_length_ws;
-          }
-          parser->state = s_header_value_start;
-          CROW_REEXECUTE();
-        }
-
-        /* finished the header */
-        switch (parser->header_state) {
-          case h_connection_keep_alive:
-            parser->flags |= F_CONNECTION_KEEP_ALIVE;
-            break;
-          case h_connection_close:
-            parser->flags |= F_CONNECTION_CLOSE;
-            break;
-          case h_transfer_encoding_chunked:
-            parser->flags |= F_CHUNKED;
-            break;
-          default:
-            break;
-        }
-
-        parser->state = s_header_field_start;
-        CROW_REEXECUTE();
-      }
-
-      case s_header_value_discard_ws_almost_done:
-      {
-        CROW_STRICT_CHECK(ch != lf);
-        parser->state = s_header_value_discard_lws;
-        break;
-      }
-
-      case s_header_value_discard_lws:
-      {
-        if (ch == ' ' || ch == '\t') {
-          parser->state = s_header_value_discard_ws;
-          break;
-        } else {
-          /* header value was empty */
-          CROW_MARK(header_value);
-          parser->state = s_header_field_start;
-          CROW_CALLBACK_DATA_NOADVANCE(header_value);
-          CROW_REEXECUTE();
-        }
-      }
-
-      case s_headers_almost_done:
-      {
-        CROW_STRICT_CHECK(ch != lf);
-
-        if (parser->flags & F_TRAILING) {
-          /* End of a chunked request */
-          CROW_CALLBACK_NOTIFY(message_complete);
-          break;
-        }
-        
-        /* Cannot use transfer-encoding and a content-length header together
-           per the HTTP specification. (RFC 7230 Section 3.3.3) */
-        if ((parser->uses_transfer_encoding == 1) &&
-            (parser->flags & F_CONTENTLENGTH)) {
-          /* Allow it for lenient parsing as long as `Transfer-Encoding` is
-           * not `chunked` or allow_length_with_encoding is set
-           */
-          if (parser->flags & F_CHUNKED) {
-            if (!allow_chunked_length) {
-              CROW_SET_ERRNO(CHPE_UNEXPECTED_CONTENT_LENGTH);
-              goto error;
-            }
-          } else if (!lenient) {
-            CROW_SET_ERRNO(CHPE_UNEXPECTED_CONTENT_LENGTH);
-            goto error;
-          }
-        }
-        
-        parser->state = s_headers_done;
-
-        /* Set this here so that on_headers_complete() callbacks can see it */
-        parser->upgrade =
-          (parser->flags & F_UPGRADE || parser->method == (unsigned)HTTPMethod::Connect);
-
-        /* Here we call the headers_complete callback. This is somewhat
-         * different than other callbacks because if the user returns 1, we
-         * will interpret that as saying that this message has no body. This
-         * is needed for the annoying case of recieving a response to a HEAD
-         * request.
-         *
-         * We'd like to use CROW_CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so
-         * we have to simulate it by handling a change in errno below.
-         */
-        if (settings->on_headers_complete) {
-          switch (settings->on_headers_complete(parser)) {
-            case 0:
-              break;
-
-            case 2:
-              parser->upgrade = 1;
-              //break;
-
-            /* fall through */
-            case 1:
-              parser->flags |= F_SKIPBODY;
-              break;
-
-            default:
-              CROW_SET_ERRNO(CHPE_CB_headers_complete);
-              parser->nread = nread;
-              return p - data; /* Error */
-          }
-        }
-
-        if (CROW_HTTP_PARSER_ERRNO(parser) != CHPE_OK) {
-          parser->nread = nread;
-          return p - data;
-        }
-
-        CROW_REEXECUTE();
-      }
-
-      case s_headers_done:
-      {
-        CROW_STRICT_CHECK(ch != lf);
-
-        parser->nread = 0;
-        nread = 0;
-
-        /* Exit, the rest of the connect is in a different protocol. */
-        if (parser->upgrade) {
-          CROW_CALLBACK_NOTIFY(message_complete);
-          parser->nread = nread;
-          return (p - data) + 1;
-        }
-
-        if (parser->flags & F_SKIPBODY) {
-          CROW_CALLBACK_NOTIFY(message_complete);
-        } else if (parser->flags & F_CHUNKED) {
-          /* chunked encoding - ignore Content-Length header,
-           * prepare for a chunk */
-            parser->state = s_chunk_size_start;
-        }
-        else if (parser->uses_transfer_encoding == 1)
-        {
-            if (!lenient)
-            {
-                /* RFC 7230 3.3.3 */
-
-                /* If a Transfer-Encoding header field
-             * is present in a request and the chunked transfer coding is not
-             * the final encoding, the message body length cannot be determined
-             * reliably; the server MUST respond with the 400 (Bad Request)
-             * status code and then close the connection.
-             */
-                CROW_SET_ERRNO(CHPE_INVALID_TRANSFER_ENCODING);
-                parser->nread = nread;
-                return (p - data); /* Error */
-            }
-            else
-            {
-                /* RFC 7230 3.3.3 */
-
-                /* If a Transfer-Encoding header field is present in a response and
-             * the chunked transfer coding is not the final encoding, the
-             * message body length is determined by reading the connection until
-             * it is closed by the server.
-             */
-                parser->state = s_body_identity_eof;
-            }
-        }
-        else
-        {
-            if (parser->content_length == 0)
-            {
-                /* Content-Length header given but zero: Content-Length: 0\r\n */
-                CROW_CALLBACK_NOTIFY(message_complete);
-            }
-            else if (parser->content_length != CROW_ULLONG_MAX)
-            {
-                /* Content-Length header given and non-zero */
-                parser->state = s_body_identity;
-            }
-            else
-            {
-                /* Assume content-length 0 - read the next */
-                CROW_CALLBACK_NOTIFY(message_complete);
-            }
-        }
-
-        break;
-      }
-
-      case s_body_identity:
-      {
-        uint64_t to_read = CROW_MIN(parser->content_length,
-                               (uint64_t) ((data + len) - p));
-
-        assert(parser->content_length != 0
-            && parser->content_length != CROW_ULLONG_MAX);
-
-        /* The difference between advancing content_length and p is because
-         * the latter will automaticaly advance on the next loop iteration.
-         * Further, if content_length ends up at 0, we want to see the last
-         * byte again for our message complete callback.
-         */
-        CROW_MARK(body);
-        parser->content_length -= to_read;
-        p += to_read - 1;
-
-        if (parser->content_length == 0) {
-          parser->state = s_message_done;
-
-          /* Mimic CROW_CALLBACK_DATA_NOADVANCE() but with one extra byte.
-           *
-           * The alternative to doing this is to wait for the next byte to
-           * trigger the data callback, just as in every other case. The
-           * problem with this is that this makes it difficult for the test
-           * harness to distinguish between complete-on-EOF and
-           * complete-on-length. It's not clear that this distinction is
-           * important for applications, but let's keep it for now.
-           */
-          CROW_CALLBACK_DATA_(body, p - body_mark + 1, p - data);
-          CROW_REEXECUTE();
-        }
-
-        break;
-      }
-
-      /* read until EOF */
-      case s_body_identity_eof:
-        CROW_MARK(body);
-        p = data + len - 1;
-
-        break;
-
-      case s_message_done:
-        CROW_CALLBACK_NOTIFY(message_complete);
-        break;
-
-      case s_chunk_size_start:
-      {
-        assert(nread == 1);
-        assert(parser->flags & F_CHUNKED);
-
-        unhex_val = unhex[static_cast<unsigned char>(ch)];
-        if (CROW_UNLIKELY(unhex_val == -1)) {
-          CROW_SET_ERRNO(CHPE_INVALID_CHUNK_SIZE);
-          goto error;
-        }
-
-        parser->content_length = unhex_val;
-        parser->state = s_chunk_size;
-        break;
-      }
-
-      case s_chunk_size:
-      {
-        uint64_t t;
-
-        assert(parser->flags & F_CHUNKED);
-
-        if (ch == cr) {
-          parser->state = s_chunk_size_almost_done;
-          break;
-        }
-
-        unhex_val = unhex[static_cast<unsigned char>(ch)];
-
-        if (unhex_val == -1) {
-          if (ch == ';' || ch == ' ') {
-            parser->state = s_chunk_parameters;
-            break;
-          }
-
-          CROW_SET_ERRNO(CHPE_INVALID_CHUNK_SIZE);
-          goto error;
-        }
-
-        t = parser->content_length;
-        t *= 16;
-        t += unhex_val;
-
-        /* Overflow? Test against a conservative limit for simplicity. */
-        if (CROW_UNLIKELY((CROW_ULLONG_MAX - 16) / 16 < parser->content_length)) {
-          CROW_SET_ERRNO(CHPE_INVALID_CONTENT_LENGTH);
-          goto error;
-        }
-
-        parser->content_length = t;
-        break;
-      }
-
-      case s_chunk_parameters:
-      {
-        assert(parser->flags & F_CHUNKED);
-        /* just ignore this shit. TODO check for overflow */
-        if (ch == cr) {
-          parser->state = s_chunk_size_almost_done;
-          break;
-        }
-        break;
-      }
-
-      case s_chunk_size_almost_done:
-      {
-        assert(parser->flags & F_CHUNKED);
-        CROW_STRICT_CHECK(ch != lf);
-
-        parser->nread = 0;
-        nread = 0;
-
-        if (parser->content_length == 0) {
-          parser->flags |= F_TRAILING;
-          parser->state = s_header_field_start;
-        } else {
-          parser->state = s_chunk_data;
-        }
-        break;
-      }
-
-      case s_chunk_data:
-      {
-        uint64_t to_read = CROW_MIN(parser->content_length,
-                               (uint64_t) ((data + len) - p));
-
-        assert(parser->flags & F_CHUNKED);
-        assert(parser->content_length != 0
-            && parser->content_length != CROW_ULLONG_MAX);
-
-        /* See the explanation in s_body_identity for why the content
-         * length and data pointers are managed this way.
-         */
-        CROW_MARK(body);
-        parser->content_length -= to_read;
-        p += to_read - 1;
-
-        if (parser->content_length == 0) {
-          parser->state = s_chunk_data_almost_done;
-        }
-
-        break;
-      }
-
-      case s_chunk_data_almost_done:
-        assert(parser->flags & F_CHUNKED);
-        assert(parser->content_length == 0);
-        CROW_STRICT_CHECK(ch != cr);
-        parser->state = s_chunk_data_done;
-        CROW_CALLBACK_DATA(body);
-        break;
-
-      case s_chunk_data_done:
-        assert(parser->flags & F_CHUNKED);
-        CROW_STRICT_CHECK(ch != lf);
-        parser->nread = 0;
-        nread = 0;
-        parser->state = s_chunk_size_start;
-        break;
-
-      default:
-        assert(0 && "unhandled state");
-        CROW_SET_ERRNO(CHPE_INVALID_INTERNAL_STATE);
-        goto error;
-    }
-  }
-
-  /* Run callbacks for any marks that we have leftover after we ran out of
-   * bytes. There should be at most one of these set, so it's OK to invoke
-   * them in series (unset marks will not result in callbacks).
-   *
-   * We use the NOADVANCE() variety of callbacks here because 'p' has already
-   * overflowed 'data' and this allows us to correct for the off-by-one that
-   * we'd otherwise have (since CROW_CALLBACK_DATA() is meant to be run with a 'p'
-   * value that's in-bounds).
-   */
-
-  assert(((header_field_mark ? 1 : 0) +
-          (header_value_mark ? 1 : 0) +
-          (url_mark ? 1 : 0)  +
-          (body_mark ? 1 : 0)) <= 1);
-
-  CROW_CALLBACK_DATA_NOADVANCE(header_field);
-  CROW_CALLBACK_DATA_NOADVANCE(header_value);
-  CROW_CALLBACK_DATA_NOADVANCE(url);
-  CROW_CALLBACK_DATA_NOADVANCE(body);
-
-  parser->nread = nread;
-  return len;
-
-error:
-  if (CROW_HTTP_PARSER_ERRNO(parser) == CHPE_OK) {
-    CROW_SET_ERRNO(CHPE_UNKNOWN);
-  }
-
-  parser->nread = nread;
-  return (p - data);
-}
-
-inline void
-  http_parser_init(http_parser* parser)
-{
-  void *data = parser->data; /* preserve application data */
-  memset(parser, 0, sizeof(*parser));
-  parser->data = data;
-  parser->state = s_start_req;
-  parser->http_errno = CHPE_OK;
-}
-
-/* Return a string name of the given error */
-inline const char *
-http_errno_name(enum http_errno err) {
-/* Map errno values to strings for human-readable output */
-#define CROW_HTTP_STRERROR_GEN(n, s) { "CHPE_" #n, s },
-static struct {
-  const char *name;
-  const char *description;
-} http_strerror_tab[] = {
-  CROW_HTTP_ERRNO_MAP(CROW_HTTP_STRERROR_GEN)
-};
-#undef CROW_HTTP_STRERROR_GEN
-  assert(((size_t) err) < CROW_ARRAY_SIZE(http_strerror_tab));
-  return http_strerror_tab[err].name;
-}
-
-/* Return a string description of the given error */
-inline const char *
-http_errno_description(enum http_errno err) {
-/* Map errno values to strings for human-readable output */
-#define CROW_HTTP_STRERROR_GEN(n, s) { "CHPE_" #n, s },
-static struct {
-  const char *name;
-  const char *description;
-} http_strerror_tab[] = {
-  CROW_HTTP_ERRNO_MAP(CROW_HTTP_STRERROR_GEN)
-};
-#undef CROW_HTTP_STRERROR_GEN
-  assert(((size_t) err) < CROW_ARRAY_SIZE(http_strerror_tab));
-  return http_strerror_tab[err].description;
-}
-
-/* Checks if this is the final chunk of the body. */
-inline int
-http_body_is_final(const struct http_parser *parser) {
-    return parser->state == s_message_done;
-}
-
-/* Change the maximum header size provided at compile time. */
-inline void
-http_parser_set_max_header_size(uint32_t size) {
-  max_header_size = size;
-}
-
-#undef CROW_HTTP_ERRNO_MAP
-#undef CROW_SET_ERRNO
-#undef CROW_CALLBACK_NOTIFY_
-#undef CROW_CALLBACK_NOTIFY
-#undef CROW_CALLBACK_NOTIFY_NOADVANCE
-#undef CROW_CALLBACK_DATA_
-#undef CROW_CALLBACK_DATA
-#undef CROW_CALLBACK_DATA_NOADVANCE
-#undef CROW_MARK
-#undef CROW_PROXY_CONNECTION
-#undef CROW_CONNECTION
-#undef CROW_CONTENT_LENGTH
-#undef CROW_TRANSFER_ENCODING
-#undef CROW_UPGRADE
-#undef CROW_CHUNKED
-#undef CROW_KEEP_ALIVE
-#undef CROW_CLOSE
-#undef CROW_PARSING_HEADER
-#undef CROW_LOWER
-#undef CROW_IS_ALPHA
-#undef CROW_IS_NUM
-#undef CROW_IS_ALPHANUM
-//#undef CROW_IS_HEX
-#undef CROW_IS_MARK
-#undef CROW_IS_USERINFO_CHAR
-#undef CROW_TOKEN
-#undef CROW_IS_URL_CHAR
-//#undef CROW_IS_HOST_CHAR
-#undef CROW_STRICT_CHECK
-
-}
-
-// clang-format on
-
-
-#include <string>
-#include <unordered_map>
-#include <algorithm>
-
-
-namespace crow
-{
-    /// A wrapper for `nodejs/http-parser`.
-
-    ///
-    /// Used to generate a \ref crow.request from the TCP socket buffer.
-    template<typename Handler>
-    struct HTTPParser : public http_parser
-    {
-        static int on_message_begin(http_parser*)
-        {
-            return 0;
-        }
-        static int on_method(http_parser* self_)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-            self->req.method = static_cast<HTTPMethod>(self->method);
-
-            return 0;
-        }
-        static int on_url(http_parser* self_, const char* at, size_t length)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-            self->req.raw_url.insert(self->req.raw_url.end(), at, at + length);
-            self->req.url_params = query_string(self->req.raw_url);
-            self->req.url = self->req.raw_url.substr(0, self->qs_point != 0 ? self->qs_point : std::string::npos);
-
-            self->process_url();
-
-            return 0;
-        }
-        static int on_header_field(http_parser* self_, const char* at, size_t length)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-            switch (self->header_building_state)
-            {
-                case 0:
-                    if (!self->header_value.empty())
-                    {
-                        self->req.headers.emplace(std::move(self->header_field), std::move(self->header_value));
-                    }
-                    self->header_field.assign(at, at + length);
-                    self->header_building_state = 1;
-                    break;
-                case 1:
-                    self->header_field.insert(self->header_field.end(), at, at + length);
-                    break;
-            }
-            return 0;
-        }
-        static int on_header_value(http_parser* self_, const char* at, size_t length)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-            switch (self->header_building_state)
-            {
-                case 0:
-                    self->header_value.insert(self->header_value.end(), at, at + length);
-                    break;
-                case 1:
-                    self->header_building_state = 0;
-                    self->header_value.assign(at, at + length);
-                    break;
-            }
-            return 0;
-        }
-        static int on_headers_complete(http_parser* self_)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-            if (!self->header_field.empty())
-            {
-                self->req.headers.emplace(std::move(self->header_field), std::move(self->header_value));
-            }
-
-            self->set_connection_parameters();
-
-            self->process_header();
-            return 0;
-        }
-        static int on_body(http_parser* self_, const char* at, size_t length)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-            self->req.body.insert(self->req.body.end(), at, at + length);
-            return 0;
-        }
-        static int on_message_complete(http_parser* self_)
-        {
-            HTTPParser* self = static_cast<HTTPParser*>(self_);
-
-            self->message_complete = true;
-            self->process_message();
-            return 0;
-        }
-        HTTPParser(Handler* handler):
-          handler_(handler)
-        {
-            http_parser_init(this);
-        }
-
-        // return false on error
-        /// Parse a buffer into the different sections of an HTTP request.
-        bool feed(const char* buffer, int length)
-        {
-            if (message_complete)
-                return true;
-
-            const static http_parser_settings settings_{
-              on_message_begin,
-              on_method,
-              on_url,
-              on_header_field,
-              on_header_value,
-              on_headers_complete,
-              on_body,
-              on_message_complete,
-            };
-
-            int nparsed = http_parser_execute(this, &settings_, buffer, length);
-            if (http_errno != CHPE_OK)
-            {
-                return false;
-            }
-            return nparsed == length;
-        }
-
-        bool done()
-        {
-            return feed(nullptr, 0);
-        }
-
-        void clear()
-        {
-            req = crow::request();
-            header_field.clear();
-            header_value.clear();
-            header_building_state = 0;
-            qs_point = 0;
-            message_complete = false;
-            state = CROW_NEW_MESSAGE();
-        }
-
-        inline void process_url()
-        {
-            handler_->handle_url();
-        }
-
-        inline void process_header()
-        {
-            handler_->handle_header();
-        }
-
-        inline void process_message()
-        {
-            handler_->handle();
-        }
-
-        inline void set_connection_parameters()
-        {
-            req.http_ver_major = http_major;
-            req.http_ver_minor = http_minor;
-
-            //NOTE(EDev): it seems that the problem is with crow's policy on closing the connection for HTTP_VERSION < 1.0, the behaviour for that in crow is "don't close the connection, but don't send a keep-alive either"
-
-            // HTTP1.1 = always send keep_alive, HTTP1.0 = only send if header exists, HTTP?.? = never send
-            req.keep_alive = (http_major == 1 && http_minor == 0) ?
-                               ((flags & F_CONNECTION_KEEP_ALIVE) ? true : false) :
-                               ((http_major == 1 && http_minor == 1) ? true : false);
-
-            // HTTP1.1 = only close if close header exists, HTTP1.0 = always close unless keep_alive header exists, HTTP?.?= never close
-            req.close_connection = (http_major == 1 && http_minor == 0) ?
-                                     ((flags & F_CONNECTION_KEEP_ALIVE) ? false : true) :
-                                     ((http_major == 1 && http_minor == 1) ? ((flags & F_CONNECTION_CLOSE) ? true : false) : false);
-            req.upgrade = static_cast<bool>(upgrade);
-        }
-
-        /// The final request that this parser outputs.
-        ///
-        /// Data parsed is put directly into this object as soon as the related callback returns. (e.g. the request will have the cooorect method as soon as on_method() returns)
-        request req;
-
-    private:
-        int header_building_state = 0;
-        bool message_complete = false;
-        std::string header_field;
-        std::string header_value;
-
-        Handler* handler_; ///< This is currently an HTTP connection object (\ref crow.Connection).
-    };
-} // namespace crow
-
-#undef CROW_NEW_MESSAGE
-#undef CROW_start_state
-
-
-
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace crow
-{
-    enum class LogLevel
-    {
-#ifndef ERROR
-#ifndef DEBUG
-        DEBUG = 0,
-        INFO,
-        WARNING,
-        ERROR,
-        CRITICAL,
-#endif
-#endif
-
-        Debug = 0,
-        Info,
-        Warning,
-        Error,
-        Critical,
-    };
-
-    class ILogHandler
-    {
-    public:
-        virtual ~ILogHandler() = default;
-
-        virtual void log(std::string message, LogLevel level) = 0;
-    };
-
-    class CerrLogHandler : public ILogHandler
-    {
-    public:
-        void log(std::string message, LogLevel level) override
-        {
-            std::string prefix;
-            switch (level)
-            {
-                case LogLevel::Debug:
-                    prefix = "DEBUG   ";
-                    break;
-                case LogLevel::Info:
-                    prefix = "INFO    ";
-                    break;
-                case LogLevel::Warning:
-                    prefix = "WARNING ";
-                    break;
-                case LogLevel::Error:
-                    prefix = "ERROR   ";
-                    break;
-                case LogLevel::Critical:
-                    prefix = "CRITICAL";
-                    break;
-            }
-            std::cerr << std::string("(") + timestamp() + std::string(") [") + prefix + std::string("] ") + message << std::endl;
-        }
-
-    private:
-        static std::string timestamp()
-        {
-            char date[32];
-            time_t t = time(0);
-
-            tm my_tm;
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#ifdef CROW_USE_LOCALTIMEZONE
-            localtime_s(&my_tm, &t);
-#else
-            gmtime_s(&my_tm, &t);
-#endif
-#else
-#ifdef CROW_USE_LOCALTIMEZONE
-            localtime_r(&t, &my_tm);
-#else
-            gmtime_r(&t, &my_tm);
-#endif
-#endif
-
-            size_t sz = strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", &my_tm);
-            return std::string(date, date + sz);
-        }
-    };
-
-    class logger
-    {
-    public:
-        logger(LogLevel level):
-          level_(level)
-        {}
-        ~logger()
-        {
-#ifdef CROW_ENABLE_LOGGING
-            if (level_ >= get_current_log_level())
-            {
-                get_handler_ref()->log(stringstream_.str(), level_);
-            }
-#endif
-        }
-
-        //
-        template<typename T>
-        logger& operator<<(T const& value)
-        {
-#ifdef CROW_ENABLE_LOGGING
-            if (level_ >= get_current_log_level())
-            {
-                stringstream_ << value;
-            }
-#endif
-            return *this;
-        }
-
-        //
-        static void setLogLevel(LogLevel level) { get_log_level_ref() = level; }
-
-        static void setHandler(ILogHandler* handler) { get_handler_ref() = handler; }
-
-        static LogLevel get_current_log_level() { return get_log_level_ref(); }
-
-    private:
-        //
-        static LogLevel& get_log_level_ref()
-        {
-            static LogLevel current_level = static_cast<LogLevel>(CROW_LOG_LEVEL);
-            return current_level;
-        }
-        static ILogHandler*& get_handler_ref()
-        {
-            static CerrLogHandler default_handler;
-            static ILogHandler* current_handler = &default_handler;
-            return current_handler;
-        }
-
-        //
-        std::ostringstream stringstream_;
-        LogLevel level_;
-    };
-} // namespace crow
-
-#define CROW_LOG_CRITICAL                                                  \
-    if (crow::logger::get_current_log_level() <= crow::LogLevel::Critical) \
-    crow::logger(crow::LogLevel::Critical)
-#define CROW_LOG_ERROR                                                  \
-    if (crow::logger::get_current_log_level() <= crow::LogLevel::Error) \
-    crow::logger(crow::LogLevel::Error)
-#define CROW_LOG_WARNING                                                  \
-    if (crow::logger::get_current_log_level() <= crow::LogLevel::Warning) \
-    crow::logger(crow::LogLevel::Warning)
-#define CROW_LOG_INFO                                                  \
-    if (crow::logger::get_current_log_level() <= crow::LogLevel::Info) \
-    crow::logger(crow::LogLevel::Info)
-#define CROW_LOG_DEBUG                                                  \
-    if (crow::logger::get_current_log_level() <= crow::LogLevel::Debug) \
-    crow::logger(crow::LogLevel::Debug)
-
-
-//#define CROW_JSON_NO_ERROR_CHECK
-//#define CROW_JSON_USE_MAP
-
-#include <string>
-#ifdef CROW_JSON_USE_MAP
-#include <map>
-#else
-#include <unordered_map>
-#endif
-#include <iostream>
-#include <algorithm>
-#include <memory>
-#include <vector>
-#include <cmath>
-#include <cfloat>
-
-
-using std::isinf;
-using std::isnan;
-
-
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-    namespace mustache
-    {
-        class template_t;
-    }
-
-    namespace json
-    {
-        inline void escape(const std::string& str, std::string& ret)
-        {
-            ret.reserve(ret.size() + str.size() + str.size() / 4);
-            for (auto c : str)
-            {
-                switch (c)
-                {
-                    case '"': ret += "\\\""; break;
-                    case '\\': ret += "\\\\"; break;
-                    case '\n': ret += "\\n"; break;
-                    case '\b': ret += "\\b"; break;
-                    case '\f': ret += "\\f"; break;
-                    case '\r': ret += "\\r"; break;
-                    case '\t': ret += "\\t"; break;
-                    default:
-                        if (c >= 0 && c < 0x20)
-                        {
-                            ret += "\\u00";
-                            auto to_hex = [](char c) {
-                                c = c & 0xf;
-                                if (c < 10)
-                                    return '0' + c;
-                                return 'a' + c - 10;
-                            };
-                            ret += to_hex(c / 16);
-                            ret += to_hex(c % 16);
-                        }
-                        else
-                            ret += c;
-                        break;
-                }
-            }
-        }
-        inline std::string escape(const std::string& str)
-        {
-            std::string ret;
-            escape(str, ret);
-            return ret;
-        }
-
-        enum class type : char
-        {
-            Null,
-            False,
-            True,
-            Number,
-            String,
-            List,
-            Object,
-            Function
-        };
-
-        inline const char* get_type_str(type t)
-        {
-            switch (t)
-            {
-                case type::Number: return "Number";
-                case type::False: return "False";
-                case type::True: return "True";
-                case type::List: return "List";
-                case type::String: return "String";
-                case type::Object: return "Object";
-                case type::Function: return "Function";
-                default: return "Unknown";
-            }
-        }
-
-        enum class num_type : char
-        {
-            Signed_integer,
-            Unsigned_integer,
-            Floating_point,
-            Null,
-            Double_precision_floating_point
-        };
-
-        class rvalue;
-        rvalue load(const char* data, size_t size);
-
-        namespace detail
-        {
-            /// A read string implementation with comparison functionality.
-            struct r_string
-            {
-                r_string(){};
-                r_string(char* s, char* e):
-                  s_(s), e_(e){};
-                ~r_string()
-                {
-                    if (owned_)
-                        delete[] s_;
-                }
-
-                r_string(const r_string& r)
-                {
-                    *this = r;
-                }
-
-                r_string(r_string&& r)
-                {
-                    *this = r;
-                }
-
-                r_string& operator=(r_string&& r)
-                {
-                    s_ = r.s_;
-                    e_ = r.e_;
-                    owned_ = r.owned_;
-                    if (r.owned_)
-                        r.owned_ = 0;
-                    return *this;
-                }
-
-                r_string& operator=(const r_string& r)
-                {
-                    s_ = r.s_;
-                    e_ = r.e_;
-                    owned_ = 0;
-                    return *this;
-                }
-
-                operator std::string() const
-                {
-                    return std::string(s_, e_);
-                }
-
-
-                const char* begin() const { return s_; }
-                const char* end() const { return e_; }
-                size_t size() const { return end() - begin(); }
-
-                using iterator = const char*;
-                using const_iterator = const char*;
-
-                char* s_;         ///< Start.
-                mutable char* e_; ///< End.
-                uint8_t owned_{0};
-                friend std::ostream& operator<<(std::ostream& os, const r_string& s)
-                {
-                    os << static_cast<std::string>(s);
-                    return os;
-                }
-
-            private:
-                void force(char* s, uint32_t length)
-                {
-                    s_ = s;
-                    e_ = s_ + length;
-                    owned_ = 1;
-                }
-                friend rvalue crow::json::load(const char* data, size_t size);
-
-                friend bool operator==(const r_string& l, const r_string& r);
-                friend bool operator==(const std::string& l, const r_string& r);
-                friend bool operator==(const r_string& l, const std::string& r);
-
-                template<typename T, typename U>
-                inline static bool equals(const T& l, const U& r)
-                {
-                    if (l.size() != r.size())
-                        return false;
-
-                    for (size_t i = 0; i < l.size(); i++)
-                    {
-                        if (*(l.begin() + i) != *(r.begin() + i))
-                            return false;
-                    }
-
-                    return true;
-                }
-            };
-
-            inline bool operator<(const r_string& l, const r_string& r)
-            {
-                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
-            }
-
-            inline bool operator<(const r_string& l, const std::string& r)
-            {
-                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
-            }
-
-            inline bool operator<(const std::string& l, const r_string& r)
-            {
-                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
-            }
-
-            inline bool operator>(const r_string& l, const r_string& r)
-            {
-                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
-            }
-
-            inline bool operator>(const r_string& l, const std::string& r)
-            {
-                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
-            }
-
-            inline bool operator>(const std::string& l, const r_string& r)
-            {
-                return std::lexicographical_compare(l.begin(), l.end(), r.begin(), r.end());
-            }
-
-            inline bool operator==(const r_string& l, const r_string& r)
-            {
-                return r_string::equals(l, r);
-            }
-
-            inline bool operator==(const r_string& l, const std::string& r)
-            {
-                return r_string::equals(l, r);
-            }
-
-            inline bool operator==(const std::string& l, const r_string& r)
-            {
-                return r_string::equals(l, r);
-            }
-
-            inline bool operator!=(const r_string& l, const r_string& r)
-            {
-                return !(l == r);
-            }
-
-            inline bool operator!=(const r_string& l, const std::string& r)
-            {
-                return !(l == r);
-            }
-
-            inline bool operator!=(const std::string& l, const r_string& r)
-            {
-                return !(l == r);
-            }
-        } // namespace detail
-
-        /// JSON read value.
-
-        ///
-        /// Value can mean any json value, including a JSON object.
-        /// Read means this class is used to primarily read strings into a JSON value.
-        class rvalue
-        {
-            static const int cached_bit = 2;
-            static const int error_bit = 4;
-
-        public:
-            rvalue() noexcept:
-              option_{error_bit}
-            {
-            }
-            rvalue(type t) noexcept:
-              lsize_{}, lremain_{}, t_{t}
-            {
-            }
-            rvalue(type t, char* s, char* e) noexcept:
-              start_{s}, end_{e}, t_{t}
-            {
-                determine_num_type();
-            }
-
-            rvalue(const rvalue& r):
-              start_(r.start_), end_(r.end_), key_(r.key_), t_(r.t_), nt_(r.nt_), option_(r.option_)
-            {
-                copy_l(r);
-            }
-
-            rvalue(rvalue&& r) noexcept
-            {
-                *this = std::move(r);
-            }
-
-            rvalue& operator=(const rvalue& r)
-            {
-                start_ = r.start_;
-                end_ = r.end_;
-                key_ = r.key_;
-                t_ = r.t_;
-                nt_ = r.nt_;
-                option_ = r.option_;
-                copy_l(r);
-                return *this;
-            }
-            rvalue& operator=(rvalue&& r) noexcept
-            {
-                start_ = r.start_;
-                end_ = r.end_;
-                key_ = std::move(r.key_);
-                l_ = std::move(r.l_);
-                lsize_ = r.lsize_;
-                lremain_ = r.lremain_;
-                t_ = r.t_;
-                nt_ = r.nt_;
-                option_ = r.option_;
-                return *this;
-            }
-
-            explicit operator bool() const noexcept
-            {
-                return (option_ & error_bit) == 0;
-            }
-
-            explicit operator int64_t() const
-            {
-                return i();
-            }
-
-            explicit operator uint64_t() const
-            {
-                return u();
-            }
-
-            explicit operator int() const
-            {
-                return static_cast<int>(i());
-            }
-
-            /// Return any json value (not object or list) as a string.
-            explicit operator std::string() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() == type::Object || t() == type::List)
-                    throw std::runtime_error("json type container");
-#endif
-                switch (t())
-                {
-                    case type::String:
-                        return std::string(s());
-                    case type::Null:
-                        return std::string("null");
-                    case type::True:
-                        return std::string("true");
-                    case type::False:
-                        return std::string("false");
-                    default:
-                        return std::string(start_, end_ - start_);
-                }
-            }
-
-            /// The type of the JSON value.
-            type t() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (option_ & error_bit)
-                {
-                    throw std::runtime_error("invalid json object");
-                }
-#endif
-                return t_;
-            }
-
-            /// The number type of the JSON value.
-            num_type nt() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (option_ & error_bit)
-                {
-                    throw std::runtime_error("invalid json object");
-                }
-#endif
-                return nt_;
-            }
-
-            /// The integer value.
-            int64_t i() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                switch (t())
-                {
-                    case type::Number:
-                    case type::String:
-                        return utility::lexical_cast<int64_t>(start_, end_ - start_);
-                    default:
-                        const std::string msg = "expected number, got: " + std::string(get_type_str(t()));
-                        throw std::runtime_error(msg);
-                }
-#endif
-                return utility::lexical_cast<int64_t>(start_, end_ - start_);
-            }
-
-            /// The unsigned integer value.
-            uint64_t u() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                switch (t())
-                {
-                    case type::Number:
-                    case type::String:
-                        return utility::lexical_cast<uint64_t>(start_, end_ - start_);
-                    default:
-                        throw std::runtime_error(std::string("expected number, got: ") + get_type_str(t()));
-                }
-#endif
-                return utility::lexical_cast<uint64_t>(start_, end_ - start_);
-            }
-
-            /// The double precision floating-point number value.
-            double d() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Number)
-                    throw std::runtime_error("value is not number");
-#endif
-                return utility::lexical_cast<double>(start_, end_ - start_);
-            }
-
-            /// The boolean value.
-            bool b() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::True && t() != type::False)
-                    throw std::runtime_error("value is not boolean");
-#endif
-                return t() == type::True;
-            }
-
-            /// The string value.
-            detail::r_string s() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::String)
-                    throw std::runtime_error("value is not string");
-#endif
-                unescape();
-                return detail::r_string{start_, end_};
-            }
-
-            /// The list or object value
-            std::vector<rvalue> lo()
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Object && t() != type::List)
-                    throw std::runtime_error("value is not a container");
-#endif
-                std::vector<rvalue> ret;
-                ret.reserve(lsize_);
-                for (uint32_t i = 0; i < lsize_; i++)
-                {
-                    ret.emplace_back(l_[i]);
-                }
-                return ret;
-            }
-
-            /// Convert escaped string character to their original form ("\\n" -> '\n').
-            void unescape() const
-            {
-                if (*(start_ - 1))
-                {
-                    char* head = start_;
-                    char* tail = start_;
-                    while (head != end_)
-                    {
-                        if (*head == '\\')
-                        {
-                            switch (*++head)
-                            {
-                                case '"': *tail++ = '"'; break;
-                                case '\\': *tail++ = '\\'; break;
-                                case '/': *tail++ = '/'; break;
-                                case 'b': *tail++ = '\b'; break;
-                                case 'f': *tail++ = '\f'; break;
-                                case 'n': *tail++ = '\n'; break;
-                                case 'r': *tail++ = '\r'; break;
-                                case 't': *tail++ = '\t'; break;
-                                case 'u':
-                                {
-                                    auto from_hex = [](char c) {
-                                        if (c >= 'a')
-                                            return c - 'a' + 10;
-                                        if (c >= 'A')
-                                            return c - 'A' + 10;
-                                        return c - '0';
-                                    };
-                                    unsigned int code =
-                                      (from_hex(head[1]) << 12) +
-                                      (from_hex(head[2]) << 8) +
-                                      (from_hex(head[3]) << 4) +
-                                      from_hex(head[4]);
-                                    if (code >= 0x800)
-                                    {
-                                        *tail++ = 0xE0 | (code >> 12);
-                                        *tail++ = 0x80 | ((code >> 6) & 0x3F);
-                                        *tail++ = 0x80 | (code & 0x3F);
-                                    }
-                                    else if (code >= 0x80)
-                                    {
-                                        *tail++ = 0xC0 | (code >> 6);
-                                        *tail++ = 0x80 | (code & 0x3F);
-                                    }
-                                    else
-                                    {
-                                        *tail++ = code;
-                                    }
-                                    head += 4;
-                                }
-                                break;
-                            }
-                        }
-                        else
-                            *tail++ = *head;
-                        head++;
-                    }
-                    end_ = tail;
-                    *end_ = 0;
-                    *(start_ - 1) = 0;
-                }
-            }
-
-            /// Check if the json object has the passed string as a key.
-            bool has(const char* str) const
-            {
-                return has(std::string(str));
-            }
-
-            bool has(const std::string& str) const
-            {
-                struct Pred
-                {
-                    bool operator()(const rvalue& l, const rvalue& r) const
-                    {
-                        return l.key_ < r.key_;
-                    };
-                    bool operator()(const rvalue& l, const std::string& r) const
-                    {
-                        return l.key_ < r;
-                    };
-                    bool operator()(const std::string& l, const rvalue& r) const
-                    {
-                        return l < r.key_;
-                    };
-                };
-                if (!is_cached())
-                {
-                    std::sort(begin(), end(), Pred());
-                    set_cached();
-                }
-                auto it = lower_bound(begin(), end(), str, Pred());
-                return it != end() && it->key_ == str;
-            }
-
-            int count(const std::string& str)
-            {
-                return has(str) ? 1 : 0;
-            }
-
-            rvalue* begin() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Object && t() != type::List)
-                    throw std::runtime_error("value is not a container");
-#endif
-                return l_.get();
-            }
-            rvalue* end() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Object && t() != type::List)
-                    throw std::runtime_error("value is not a container");
-#endif
-                return l_.get() + lsize_;
-            }
-
-            const detail::r_string& key() const
-            {
-                return key_;
-            }
-
-            size_t size() const
-            {
-                if (t() == type::String)
-                    return s().size();
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Object && t() != type::List)
-                    throw std::runtime_error("value is not a container");
-#endif
-                return lsize_;
-            }
-
-            const rvalue& operator[](int index) const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::List)
-                    throw std::runtime_error("value is not a list");
-                if (index >= static_cast<int>(lsize_) || index < 0)
-                    throw std::runtime_error("list out of bound");
-#endif
-                return l_[index];
-            }
-
-            const rvalue& operator[](size_t index) const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::List)
-                    throw std::runtime_error("value is not a list");
-                if (index >= lsize_)
-                    throw std::runtime_error("list out of bound");
-#endif
-                return l_[index];
-            }
-
-            const rvalue& operator[](const char* str) const
-            {
-                return this->operator[](std::string(str));
-            }
-
-            const rvalue& operator[](const std::string& str) const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Object)
-                    throw std::runtime_error("value is not an object");
-#endif
-                struct Pred
-                {
-                    bool operator()(const rvalue& l, const rvalue& r) const
-                    {
-                        return l.key_ < r.key_;
-                    };
-                    bool operator()(const rvalue& l, const std::string& r) const
-                    {
-                        return l.key_ < r;
-                    };
-                    bool operator()(const std::string& l, const rvalue& r) const
-                    {
-                        return l < r.key_;
-                    };
-                };
-                if (!is_cached())
-                {
-                    std::sort(begin(), end(), Pred());
-                    set_cached();
-                }
-                auto it = lower_bound(begin(), end(), str, Pred());
-                if (it != end() && it->key_ == str)
-                    return *it;
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                throw std::runtime_error("cannot find key");
-#else
-                static rvalue nullValue;
-                return nullValue;
-#endif
-            }
-
-            void set_error()
-            {
-                option_ |= error_bit;
-            }
-
-            bool error() const
-            {
-                return (option_ & error_bit) != 0;
-            }
-
-            std::vector<std::string> keys() const
-            {
-#ifndef CROW_JSON_NO_ERROR_CHECK
-                if (t() != type::Object)
-                    throw std::runtime_error("value is not an object");
-#endif
-                std::vector<std::string> ret;
-                ret.reserve(lsize_);
-                for (uint32_t i = 0; i < lsize_; i++)
-                {
-                    ret.emplace_back(std::string(l_[i].key()));
-                }
-                return ret;
-            }
-
-        private:
-            bool is_cached() const
-            {
-                return (option_ & cached_bit) != 0;
-            }
-            void set_cached() const
-            {
-                option_ |= cached_bit;
-            }
-            void copy_l(const rvalue& r)
-            {
-                if (r.t() != type::Object && r.t() != type::List)
-                    return;
-                lsize_ = r.lsize_;
-                lremain_ = 0;
-                l_.reset(new rvalue[lsize_]);
-                std::copy(r.begin(), r.end(), begin());
-            }
-
-            void emplace_back(rvalue&& v)
-            {
-                if (!lremain_)
-                {
-                    int new_size = lsize_ + lsize_;
-                    if (new_size - lsize_ > 60000)
-                        new_size = lsize_ + 60000;
-                    if (new_size < 4)
-                        new_size = 4;
-                    rvalue* p = new rvalue[new_size];
-                    rvalue* p2 = p;
-                    for (auto& x : *this)
-                        *p2++ = std::move(x);
-                    l_.reset(p);
-                    lremain_ = new_size - lsize_;
-                }
-                l_[lsize_++] = std::move(v);
-                lremain_--;
-            }
-
-            /// Determines num_type from the string.
-            void determine_num_type()
-            {
-                if (t_ != type::Number)
-                {
-                    nt_ = num_type::Null;
-                    return;
-                }
-
-                const std::size_t len = end_ - start_;
-                const bool has_minus = std::memchr(start_, '-', len) != nullptr;
-                const bool has_e = std::memchr(start_, 'e', len) != nullptr || std::memchr(start_, 'E', len) != nullptr;
-                const bool has_dec_sep = std::memchr(start_, '.', len) != nullptr;
-                if (has_dec_sep || has_e)
-                    nt_ = num_type::Floating_point;
-                else if (has_minus)
-                    nt_ = num_type::Signed_integer;
-                else
-                    nt_ = num_type::Unsigned_integer;
-            }
-
-            mutable char* start_;
-            mutable char* end_;
-            detail::r_string key_;
-            std::unique_ptr<rvalue[]> l_;
-            uint32_t lsize_;
-            uint16_t lremain_;
-            type t_;
-            num_type nt_{num_type::Null};
-            mutable uint8_t option_{0};
-
-            friend rvalue load_nocopy_internal(char* data, size_t size);
-            friend rvalue load(const char* data, size_t size);
-            friend std::ostream& operator<<(std::ostream& os, const rvalue& r)
-            {
-                switch (r.t_)
-                {
-
-                    case type::Null: os << "null"; break;
-                    case type::False: os << "false"; break;
-                    case type::True: os << "true"; break;
-                    case type::Number:
-                    {
-                        switch (r.nt())
-                        {
-                            case num_type::Floating_point: os << r.d(); break;
-                            case num_type::Double_precision_floating_point: os << r.d(); break;
-                            case num_type::Signed_integer: os << r.i(); break;
-                            case num_type::Unsigned_integer: os << r.u(); break;
-                            case num_type::Null: throw std::runtime_error("Number with num_type Null");
-                        }
-                    }
-                    break;
-                    case type::String: os << '"' << r.s() << '"'; break;
-                    case type::List:
-                    {
-                        os << '[';
-                        bool first = true;
-                        for (auto& x : r)
-                        {
-                            if (!first)
-                                os << ',';
-                            first = false;
-                            os << x;
-                        }
-                        os << ']';
-                    }
-                    break;
-                    case type::Object:
-                    {
-                        os << '{';
-                        bool first = true;
-                        for (auto& x : r)
-                        {
-                            if (!first)
-                                os << ',';
-                            os << '"' << escape(x.key_) << "\":";
-                            first = false;
-                            os << x;
-                        }
-                        os << '}';
-                    }
-                    break;
-                    case type::Function: os << "custom function"; break;
-                }
-                return os;
-            }
-        };
-        namespace detail
-        {
-        }
-
-        inline bool operator==(const rvalue& l, const std::string& r)
-        {
-            return l.s() == r;
-        }
-
-        inline bool operator==(const std::string& l, const rvalue& r)
-        {
-            return l == r.s();
-        }
-
-        inline bool operator!=(const rvalue& l, const std::string& r)
-        {
-            return l.s() != r;
-        }
-
-        inline bool operator!=(const std::string& l, const rvalue& r)
-        {
-            return l != r.s();
-        }
-
-        inline bool operator==(const rvalue& l, double r)
-        {
-            return l.d() == r;
-        }
-
-        inline bool operator==(double l, const rvalue& r)
-        {
-            return l == r.d();
-        }
-
-        inline bool operator!=(const rvalue& l, double r)
-        {
-            return l.d() != r;
-        }
-
-        inline bool operator!=(double l, const rvalue& r)
-        {
-            return l != r.d();
-        }
-
-
-        inline rvalue load_nocopy_internal(char* data, size_t size)
-        {
-            // Defend against excessive recursion
-            static constexpr unsigned max_depth = 10000;
-
-            //static const char* escaped = "\"\\/\b\f\n\r\t";
-            struct Parser
-            {
-                Parser(char* data, size_t /*size*/):
-                  data(data)
-                {
-                }
-
-                bool consume(char c)
-                {
-                    if (CROW_UNLIKELY(*data != c))
-                        return false;
-                    data++;
-                    return true;
-                }
-
-                void ws_skip()
-                {
-                    while (*data == ' ' || *data == '\t' || *data == '\r' || *data == '\n')
-                        ++data;
-                };
-
-                rvalue decode_string()
-                {
-                    if (CROW_UNLIKELY(!consume('"')))
-                        return {};
-                    char* start = data;
-                    uint8_t has_escaping = 0;
-                    while (1)
-                    {
-                        if (CROW_LIKELY(*data != '"' && *data != '\\' && *data != '\0'))
-                        {
-                            data++;
-                        }
-                        else if (*data == '"')
-                        {
-                            *data = 0;
-                            *(start - 1) = has_escaping;
-                            data++;
-                            return {type::String, start, data - 1};
-                        }
-                        else if (*data == '\\')
-                        {
-                            has_escaping = 1;
-                            data++;
-                            switch (*data)
-                            {
-                                case 'u':
-                                {
-                                    auto check = [](char c) {
-                                        return ('0' <= c && c <= '9') ||
-                                               ('a' <= c && c <= 'f') ||
-                                               ('A' <= c && c <= 'F');
-                                    };
-                                    if (!(check(*(data + 1)) &&
-                                          check(*(data + 2)) &&
-                                          check(*(data + 3)) &&
-                                          check(*(data + 4))))
-                                        return {};
-                                }
-                                    data += 5;
-                                    break;
-                                case '"':
-                                case '\\':
-                                case '/':
-                                case 'b':
-                                case 'f':
-                                case 'n':
-                                case 'r':
-                                case 't':
-                                    data++;
-                                    break;
-                                default:
-                                    return {};
-                            }
-                        }
-                        else
-                            return {};
-                    }
-                    return {};
-                }
-
-                rvalue decode_list(unsigned depth)
-                {
-                    rvalue ret(type::List);
-                    if (CROW_UNLIKELY(!consume('[')) || CROW_UNLIKELY(depth > max_depth))
-                    {
-                        ret.set_error();
-                        return ret;
-                    }
-                    ws_skip();
-                    if (CROW_UNLIKELY(*data == ']'))
-                    {
-                        data++;
-                        return ret;
-                    }
-
-                    while (1)
-                    {
-                        auto v = decode_value(depth + 1);
-                        if (CROW_UNLIKELY(!v))
-                        {
-                            ret.set_error();
-                            break;
-                        }
-                        ws_skip();
-                        ret.emplace_back(std::move(v));
-                        if (*data == ']')
-                        {
-                            data++;
-                            break;
-                        }
-                        if (CROW_UNLIKELY(!consume(',')))
-                        {
-                            ret.set_error();
-                            break;
-                        }
-                        ws_skip();
-                    }
-                    return ret;
-                }
-
-                rvalue decode_number()
-                {
-                    char* start = data;
-
-                    enum NumberParsingState
-                    {
-                        Minus,
-                        AfterMinus,
-                        ZeroFirst,
-                        Digits,
-                        DigitsAfterPoints,
-                        E,
-                        DigitsAfterE,
-                        Invalid,
-                    } state{Minus};
-                    while (CROW_LIKELY(state != Invalid))
-                    {
-                        switch (*data)
-                        {
-                            case '0':
-                                state = static_cast<NumberParsingState>("\2\2\7\3\4\6\6"[state]);
-                                /*if (state == NumberParsingState::Minus || state == NumberParsingState::AfterMinus)
-                                {
-                                    state = NumberParsingState::ZeroFirst;
-                                }
-                                else if (state == NumberParsingState::Digits ||
-                                    state == NumberParsingState::DigitsAfterE ||
-                                    state == NumberParsingState::DigitsAfterPoints)
-                                {
-                                    // ok; pass
-                                }
-                                else if (state == NumberParsingState::E)
-                                {
-                                    state = NumberParsingState::DigitsAfterE;
-                                }
-                                else
-                                    return {};*/
-                                break;
-                            case '1':
-                            case '2':
-                            case '3':
-                            case '4':
-                            case '5':
-                            case '6':
-                            case '7':
-                            case '8':
-                            case '9':
-                                state = static_cast<NumberParsingState>("\3\3\7\3\4\6\6"[state]);
-                                while (*(data + 1) >= '0' && *(data + 1) <= '9')
-                                    data++;
-                                /*if (state == NumberParsingState::Minus || state == NumberParsingState::AfterMinus)
-                                {
-                                    state = NumberParsingState::Digits;
-                                }
-                                else if (state == NumberParsingState::Digits ||
-                                    state == NumberParsingState::DigitsAfterE ||
-                                    state == NumberParsingState::DigitsAfterPoints)
-                                {
-                                    // ok; pass
-                                }
-                                else if (state == NumberParsingState::E)
-                                {
-                                    state = NumberParsingState::DigitsAfterE;
-                                }
-                                else
-                                    return {};*/
-                                break;
-                            case '.':
-                                state = static_cast<NumberParsingState>("\7\7\4\4\7\7\7"[state]);
-                                /*
-                                if (state == NumberParsingState::Digits || state == NumberParsingState::ZeroFirst)
-                                {
-                                    state = NumberParsingState::DigitsAfterPoints;
-                                }
-                                else
-                                    return {};
-                                */
-                                break;
-                            case '-':
-                                state = static_cast<NumberParsingState>("\1\7\7\7\7\6\7"[state]);
-                                /*if (state == NumberParsingState::Minus)
-                                {
-                                    state = NumberParsingState::AfterMinus;
-                                }
-                                else if (state == NumberParsingState::E)
-                                {
-                                    state = NumberParsingState::DigitsAfterE;
-                                }
-                                else
-                                    return {};*/
-                                break;
-                            case '+':
-                                state = static_cast<NumberParsingState>("\7\7\7\7\7\6\7"[state]);
-                                /*if (state == NumberParsingState::E)
-                                {
-                                    state = NumberParsingState::DigitsAfterE;
-                                }
-                                else
-                                    return {};*/
-                                break;
-                            case 'e':
-                            case 'E':
-                                state = static_cast<NumberParsingState>("\7\7\7\5\5\7\7"[state]);
-                                /*if (state == NumberParsingState::Digits ||
-                                    state == NumberParsingState::DigitsAfterPoints)
-                                {
-                                    state = NumberParsingState::E;
-                                }
-                                else
-                                    return {};*/
-                                break;
-                            default:
-                                if (CROW_LIKELY(state == NumberParsingState::ZeroFirst ||
-                                                state == NumberParsingState::Digits ||
-                                                state == NumberParsingState::DigitsAfterPoints ||
-                                                state == NumberParsingState::DigitsAfterE))
-                                    return {type::Number, start, data};
-                                else
-                                    return {};
-                        }
-                        data++;
-                    }
-
-                    return {};
-                }
-
-
-                rvalue decode_value(unsigned depth)
-                {
-                    switch (*data)
-                    {
-                        case '[':
-                            return decode_list(depth + 1);
-                        case '{':
-                            return decode_object(depth + 1);
-                        case '"':
-                            return decode_string();
-                        case 't':
-                            if ( //e-data >= 4 &&
-                              data[1] == 'r' &&
-                              data[2] == 'u' &&
-                              data[3] == 'e')
-                            {
-                                data += 4;
-                                return {type::True};
-                            }
-                            else
-                                return {};
-                        case 'f':
-                            if ( //e-data >= 5 &&
-                              data[1] == 'a' &&
-                              data[2] == 'l' &&
-                              data[3] == 's' &&
-                              data[4] == 'e')
-                            {
-                                data += 5;
-                                return {type::False};
-                            }
-                            else
-                                return {};
-                        case 'n':
-                            if ( //e-data >= 4 &&
-                              data[1] == 'u' &&
-                              data[2] == 'l' &&
-                              data[3] == 'l')
-                            {
-                                data += 4;
-                                return {type::Null};
-                            }
-                            else
-                                return {};
-                        //case '1': case '2': case '3':
-                        //case '4': case '5': case '6':
-                        //case '7': case '8': case '9':
-                        //case '0': case '-':
-                        default:
-                            return decode_number();
-                    }
-                    return {};
-                }
-
-                rvalue decode_object(unsigned depth)
-                {
-                    rvalue ret(type::Object);
-                    if (CROW_UNLIKELY(!consume('{')) || CROW_UNLIKELY(depth > max_depth))
-                    {
-                        ret.set_error();
-                        return ret;
-                    }
-
-                    ws_skip();
-
-                    if (CROW_UNLIKELY(*data == '}'))
-                    {
-                        data++;
-                        return ret;
-                    }
-
-                    while (1)
-                    {
-                        auto t = decode_string();
-                        if (CROW_UNLIKELY(!t))
-                        {
-                            ret.set_error();
-                            break;
-                        }
-
-                        ws_skip();
-                        if (CROW_UNLIKELY(!consume(':')))
-                        {
-                            ret.set_error();
-                            break;
-                        }
-
-                        // TODO(ipkn) caching key to speed up (flyweight?)
-                        // I have no idea how flyweight could apply here, but maybe some speedup can happen if we stopped checking type since decode_string returns a string anyway
-                        auto key = t.s();
-
-                        ws_skip();
-                        auto v = decode_value(depth + 1);
-                        if (CROW_UNLIKELY(!v))
-                        {
-                            ret.set_error();
-                            break;
-                        }
-                        ws_skip();
-
-                        v.key_ = std::move(key);
-                        ret.emplace_back(std::move(v));
-                        if (CROW_UNLIKELY(*data == '}'))
-                        {
-                            data++;
-                            break;
-                        }
-                        if (CROW_UNLIKELY(!consume(',')))
-                        {
-                            ret.set_error();
-                            break;
-                        }
-                        ws_skip();
-                    }
-                    return ret;
-                }
-
-                rvalue parse()
-                {
-                    ws_skip();
-                    auto ret = decode_value(0); // or decode object?
-                    ws_skip();
-                    if (ret && *data != '\0')
-                        ret.set_error();
-                    return ret;
-                }
-
-                char* data;
-            };
-            return Parser(data, size).parse();
-        }
-        inline rvalue load(const char* data, size_t size)
-        {
-            char* s = new char[size + 1];
-            memcpy(s, data, size);
-            s[size] = 0;
-            auto ret = load_nocopy_internal(s, size);
-            if (ret)
-                ret.key_.force(s, size);
-            else
-                delete[] s;
-            return ret;
-        }
-
-        inline rvalue load(const char* data)
-        {
-            return load(data, strlen(data));
-        }
-
-        inline rvalue load(const std::string& str)
-        {
-            return load(str.data(), str.size());
-        }
-
-        struct wvalue_reader;
-
-        /// JSON write value.
-
-        ///
-        /// Value can mean any json value, including a JSON object.<br>
-        /// Write means this class is used to primarily assemble JSON objects using keys and values and export those into a string.
-        class wvalue : public returnable
-        {
-            friend class crow::mustache::template_t;
-            friend struct wvalue_reader;
-
-        public:
-            using object =
-#ifdef CROW_JSON_USE_MAP
-              std::map<std::string, wvalue>;
-#else
-              std::unordered_map<std::string, wvalue>;
-#endif
-
-            using list = std::vector<wvalue>;
-
-            type t() const { return t_; }
-
-            /// Create an empty json value (outputs "{}" instead of a "null" string)
-            static crow::json::wvalue empty_object() { return crow::json::wvalue::object(); }
-
-        private:
-            type t_{type::Null};         ///< The type of the value.
-            num_type nt{num_type::Null}; ///< The specific type of the number if \ref t_ is a number.
-            union number
-            {
-                double d;
-                int64_t si;
-                uint64_t ui;
-
-            public:
-                constexpr number() noexcept:
-                  ui() {} /* default constructor initializes unsigned integer. */
-                constexpr number(std::uint64_t value) noexcept:
-                  ui(value) {}
-                constexpr number(std::int64_t value) noexcept:
-                  si(value) {}
-                explicit constexpr number(double value) noexcept:
-                  d(value) {}
-                explicit constexpr number(float value) noexcept:
-                  d(value) {}
-            } num;                                      ///< Value if type is a number.
-            std::string s;                              ///< Value if type is a string.
-            std::unique_ptr<list> l;                    ///< Value if type is a list.
-            std::unique_ptr<object> o;                  ///< Value if type is a JSON object.
-            std::function<std::string(std::string&)> f; ///< Value if type is a function (C++ lambda)
-
-        public:
-            wvalue():
-              returnable("application/json") {}
-
-            wvalue(std::nullptr_t):
-              returnable("application/json"), t_(type::Null) {}
-
-            wvalue(bool value):
-              returnable("application/json"), t_(value ? type::True : type::False) {}
-
-            wvalue(std::uint8_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
-            wvalue(std::uint16_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
-            wvalue(std::uint32_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
-            wvalue(std::uint64_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Unsigned_integer), num(static_cast<std::uint64_t>(value)) {}
-
-            wvalue(std::int8_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
-            wvalue(std::int16_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
-            wvalue(std::int32_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
-            wvalue(std::int64_t value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Signed_integer), num(static_cast<std::int64_t>(value)) {}
-
-            wvalue(float value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Floating_point), num(static_cast<double>(value)) {}
-            wvalue(double value):
-              returnable("application/json"), t_(type::Number), nt(num_type::Double_precision_floating_point), num(static_cast<double>(value)) {}
-
-            wvalue(char const* value):
-              returnable("application/json"), t_(type::String), s(value) {}
-
-            wvalue(std::string const& value):
-              returnable("application/json"), t_(type::String), s(value) {}
-            wvalue(std::string&& value):
-              returnable("application/json"), t_(type::String), s(std::move(value)) {}
-
-            wvalue(std::initializer_list<std::pair<std::string const, wvalue>> initializer_list):
-              returnable("application/json"), t_(type::Object), o(new object(initializer_list)) {}
-
-            wvalue(object const& value):
-              returnable("application/json"), t_(type::Object), o(new object(value)) {}
-            wvalue(object&& value):
-              returnable("application/json"), t_(type::Object), o(new object(std::move(value))) {}
-
-            wvalue(const list& r):
-              returnable("application/json")
-            {
-                t_ = type::List;
-                l = std::unique_ptr<list>(new list{});
-                l->reserve(r.size());
-                for (auto it = r.begin(); it != r.end(); ++it)
-                    l->emplace_back(*it);
-            }
-            wvalue(list& r):
-              returnable("application/json")
-            {
-                t_ = type::List;
-                l = std::unique_ptr<list>(new list{});
-                l->reserve(r.size());
-                for (auto it = r.begin(); it != r.end(); ++it)
-                    l->emplace_back(*it);
-            }
-
-            /// Create a write value from a read value (useful for editing JSON strings).
-            wvalue(const rvalue& r):
-              returnable("application/json")
-            {
-                t_ = r.t();
-                switch (r.t())
-                {
-                    case type::Null:
-                    case type::False:
-                    case type::True:
-                    case type::Function:
-                        return;
-                    case type::Number:
-                        nt = r.nt();
-                        if (nt == num_type::Floating_point || nt == num_type::Double_precision_floating_point)
-                            num.d = r.d();
-                        else if (nt == num_type::Signed_integer)
-                            num.si = r.i();
-                        else
-                            num.ui = r.u();
-                        return;
-                    case type::String:
-                        s = r.s();
-                        return;
-                    case type::List:
-                        l = std::unique_ptr<list>(new list{});
-                        l->reserve(r.size());
-                        for (auto it = r.begin(); it != r.end(); ++it)
-                            l->emplace_back(*it);
-                        return;
-                    case type::Object:
-                        o = std::unique_ptr<object>(new object{});
-                        for (auto it = r.begin(); it != r.end(); ++it)
-                            o->emplace(it->key(), *it);
-                        return;
-                }
-            }
-
-            wvalue(const wvalue& r):
-              returnable("application/json")
-            {
-                t_ = r.t();
-                switch (r.t())
-                {
-                    case type::Null:
-                    case type::False:
-                    case type::True:
-                        return;
-                    case type::Number:
-                        nt = r.nt;
-                        if (nt == num_type::Floating_point || nt == num_type::Double_precision_floating_point)
-                            num.d = r.num.d;
-                        else if (nt == num_type::Signed_integer)
-                            num.si = r.num.si;
-                        else
-                            num.ui = r.num.ui;
-                        return;
-                    case type::String:
-                        s = r.s;
-                        return;
-                    case type::List:
-                        l = std::unique_ptr<list>(new list{});
-                        l->reserve(r.size());
-                        for (auto it = r.l->begin(); it != r.l->end(); ++it)
-                            l->emplace_back(*it);
-                        return;
-                    case type::Object:
-                        o = std::unique_ptr<object>(new object{});
-                        o->insert(r.o->begin(), r.o->end());
-                        return;
-                    case type::Function:
-                        f = r.f;
-                }
-            }
-
-            wvalue(wvalue&& r):
-              returnable("application/json")
-            {
-                *this = std::move(r);
-            }
-
-            wvalue& operator=(wvalue&& r)
-            {
-                t_ = r.t_;
-                nt = r.nt;
-                num = r.num;
-                s = std::move(r.s);
-                l = std::move(r.l);
-                o = std::move(r.o);
-                return *this;
-            }
-
-            /// Used for compatibility, same as \ref reset()
-            void clear()
-            {
-                reset();
-            }
-
-            void reset()
-            {
-                t_ = type::Null;
-                l.reset();
-                o.reset();
-            }
-
-            wvalue& operator=(std::nullptr_t)
-            {
-                reset();
-                return *this;
-            }
-            wvalue& operator=(bool value)
-            {
-                reset();
-                if (value)
-                    t_ = type::True;
-                else
-                    t_ = type::False;
-                return *this;
-            }
-
-            wvalue& operator=(float value)
-            {
-                reset();
-                t_ = type::Number;
-                num.d = value;
-                nt = num_type::Floating_point;
-                return *this;
-            }
-
-            wvalue& operator=(double value)
-            {
-                reset();
-                t_ = type::Number;
-                num.d = value;
-                nt = num_type::Double_precision_floating_point;
-                return *this;
-            }
-
-            wvalue& operator=(unsigned short value)
-            {
-                reset();
-                t_ = type::Number;
-                num.ui = value;
-                nt = num_type::Unsigned_integer;
-                return *this;
-            }
-
-            wvalue& operator=(short value)
-            {
-                reset();
-                t_ = type::Number;
-                num.si = value;
-                nt = num_type::Signed_integer;
-                return *this;
-            }
-
-            wvalue& operator=(long long value)
-            {
-                reset();
-                t_ = type::Number;
-                num.si = value;
-                nt = num_type::Signed_integer;
-                return *this;
-            }
-
-            wvalue& operator=(long value)
-            {
-                reset();
-                t_ = type::Number;
-                num.si = value;
-                nt = num_type::Signed_integer;
-                return *this;
-            }
-
-            wvalue& operator=(int value)
-            {
-                reset();
-                t_ = type::Number;
-                num.si = value;
-                nt = num_type::Signed_integer;
-                return *this;
-            }
-
-            wvalue& operator=(unsigned long long value)
-            {
-                reset();
-                t_ = type::Number;
-                num.ui = value;
-                nt = num_type::Unsigned_integer;
-                return *this;
-            }
-
-            wvalue& operator=(unsigned long value)
-            {
-                reset();
-                t_ = type::Number;
-                num.ui = value;
-                nt = num_type::Unsigned_integer;
-                return *this;
-            }
-
-            wvalue& operator=(unsigned int value)
-            {
-                reset();
-                t_ = type::Number;
-                num.ui = value;
-                nt = num_type::Unsigned_integer;
-                return *this;
-            }
-
-            wvalue& operator=(const char* str)
-            {
-                reset();
-                t_ = type::String;
-                s = str;
-                return *this;
-            }
-
-            wvalue& operator=(const std::string& str)
-            {
-                reset();
-                t_ = type::String;
-                s = str;
-                return *this;
-            }
-
-            wvalue& operator=(list&& v)
-            {
-                if (t_ != type::List)
-                    reset();
-                t_ = type::List;
-                if (!l)
-                    l = std::unique_ptr<list>(new list{});
-                l->clear();
-                l->resize(v.size());
-                size_t idx = 0;
-                for (auto& x : v)
-                {
-                    (*l)[idx++] = std::move(x);
-                }
-                return *this;
-            }
-
-            template<typename T>
-            wvalue& operator=(const std::vector<T>& v)
-            {
-                if (t_ != type::List)
-                    reset();
-                t_ = type::List;
-                if (!l)
-                    l = std::unique_ptr<list>(new list{});
-                l->clear();
-                l->resize(v.size());
-                size_t idx = 0;
-                for (auto& x : v)
-                {
-                    (*l)[idx++] = x;
-                }
-                return *this;
-            }
-
-            wvalue& operator=(std::initializer_list<std::pair<std::string const, wvalue>> initializer_list)
-            {
-                if (t_ != type::Object)
-                {
-                    reset();
-                    t_ = type::Object;
-                    o = std::unique_ptr<object>(new object(initializer_list));
-                }
-                else
-                {
-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(_LIBCPP_VERSION)
-                    o = std::unique_ptr<object>(new object(initializer_list));
-#else
-                    (*o) = initializer_list;
-#endif
-                }
-                return *this;
-            }
-
-            wvalue& operator=(object const& value)
-            {
-                if (t_ != type::Object)
-                {
-                    reset();
-                    t_ = type::Object;
-                    o = std::unique_ptr<object>(new object(value));
-                }
-                else
-                {
-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(_LIBCPP_VERSION)
-                    o = std::unique_ptr<object>(new object(value));
-#else
-                    (*o) = value;
-#endif
-                }
-                return *this;
-            }
-
-            wvalue& operator=(object&& value)
-            {
-                if (t_ != type::Object)
-                {
-                    reset();
-                    t_ = type::Object;
-                    o = std::unique_ptr<object>(new object(std::move(value)));
-                }
-                else
-                {
-                    (*o) = std::move(value);
-                }
-                return *this;
-            }
-
-            wvalue& operator=(std::function<std::string(std::string&)>&& func)
-            {
-                reset();
-                t_ = type::Function;
-                f = std::move(func);
-                return *this;
-            }
-
-            wvalue& operator[](unsigned index)
-            {
-                if (t_ != type::List)
-                    reset();
-                t_ = type::List;
-                if (!l)
-                    l = std::unique_ptr<list>(new list{});
-                if (l->size() < index + 1)
-                    l->resize(index + 1);
-                return (*l)[index];
-            }
-
-            const wvalue& operator[](unsigned index) const
-            {
-                return const_cast<wvalue*>(this)->operator[](index);
-            }
-
-            int count(const std::string& str) const
-            {
-                if (t_ != type::Object)
-                    return 0;
-                if (!o)
-                    return 0;
-                return o->count(str);
-            }
-
-            wvalue& operator[](const std::string& str)
-            {
-                if (t_ != type::Object)
-                    reset();
-                t_ = type::Object;
-                if (!o)
-                    o = std::unique_ptr<object>(new object{});
-                return (*o)[str];
-            }
-
-            const wvalue& operator[](const std::string& str) const
-            {
-                return const_cast<wvalue*>(this)->operator[](str);
-            }
-
-            std::vector<std::string> keys() const
-            {
-                if (t_ != type::Object)
-                    return {};
-                std::vector<std::string> result;
-                for (auto& kv : *o)
-                {
-                    result.push_back(kv.first);
-                }
-                return result;
-            }
-
-            std::string execute(std::string txt = "") const //Not using reference because it cannot be used with a default rvalue
-            {
-                if (t_ != type::Function)
-                    return "";
-                return f(txt);
-            }
-
-            /// If the wvalue is a list, it returns the length of the list, otherwise it returns 1.
-            std::size_t size() const
-            {
-                if (t_ != type::List)
-                    return 1;
-                return l->size();
-            }
-
-            /// Returns an estimated size of the value in bytes.
-            size_t estimate_length() const
-            {
-                switch (t_)
-                {
-                    case type::Null: return 4;
-                    case type::False: return 5;
-                    case type::True: return 4;
-                    case type::Number: return 30;
-                    case type::String: return 2 + s.size() + s.size() / 2;
-                    case type::List:
-                    {
-                        size_t sum{};
-                        if (l)
-                        {
-                            for (auto& x : *l)
-                            {
-                                sum += 1;
-                                sum += x.estimate_length();
-                            }
-                        }
-                        return sum + 2;
-                    }
-                    case type::Object:
-                    {
-                        size_t sum{};
-                        if (o)
-                        {
-                            for (auto& kv : *o)
-                            {
-                                sum += 2;
-                                sum += 2 + kv.first.size() + kv.first.size() / 2;
-                                sum += kv.second.estimate_length();
-                            }
-                        }
-                        return sum + 2;
-                    }
-                    case type::Function:
-                        return 0;
-                }
-                return 1;
-            }
-
-        private:
-            inline void dump_string(const std::string& str, std::string& out) const
-            {
-                out.push_back('"');
-                escape(str, out);
-                out.push_back('"');
-            }
-
-            inline void dump_indentation_part(std::string& out, const int indent, const char separator, const int indent_level) const
-            {
-                out.push_back('\n');
-                out.append(indent_level * indent, separator);
-            }
-
-
-            inline void dump_internal(const wvalue& v, std::string& out, const int indent, const char separator, const int indent_level = 0) const
-            {
-                switch (v.t_)
-                {
-                    case type::Null: out += "null"; break;
-                    case type::False: out += "false"; break;
-                    case type::True: out += "true"; break;
-                    case type::Number:
-                    {
-                        if (v.nt == num_type::Floating_point || v.nt == num_type::Double_precision_floating_point)
-                        {
-                            if (isnan(v.num.d) || isinf(v.num.d))
-                            {
-                                out += "null";
-                                CROW_LOG_WARNING << "Invalid JSON value detected (" << v.num.d << "), value set to null";
-                                break;
-                            }
-                            enum
-                            {
-                                start,
-                                decp, // Decimal point
-                                zero
-                            } f_state;
-                            char outbuf[128];
-                            if (v.nt == num_type::Double_precision_floating_point)
-                            {
-#ifdef _MSC_VER
-                                sprintf_s(outbuf, sizeof(outbuf), "%.*g", DECIMAL_DIG, v.num.d);
-#else
-                                snprintf(outbuf, sizeof(outbuf), "%.*g", DECIMAL_DIG, v.num.d);
-#endif
-                            }
-                            else
-                            {
-#ifdef _MSC_VER
-                                sprintf_s(outbuf, sizeof(outbuf), "%f", v.num.d);
-#else
-                                snprintf(outbuf, sizeof(outbuf), "%f", v.num.d);
-#endif 
-                            }
-                            char *p = &outbuf[0], *o = nullptr; // o is the position of the first trailing 0
-                            f_state = start;
-                            while (*p != '\0')
-                            {
-                                //std::cout << *p << std::endl;
-                                char ch = *p;
-                                switch (f_state)
-                                {
-                                    case start: // Loop and lookahead until a decimal point is found
-                                        if (ch == '.')
-                                        {
-                                            char fch = *(p + 1);
-                                            // if the first character is 0, leave it be (this is so that "1.00000" becomes "1.0" and not "1.")
-                                            if (fch != '\0' && fch == '0') p++;
-                                            f_state = decp;
-                                        }
-                                        p++;
-                                        break;
-                                    case decp: // Loop until a 0 is found, if found, record its position
-                                        if (ch == '0')
-                                        {
-                                            f_state = zero;
-                                            o = p;
-                                        }
-                                        p++;
-                                        break;
-                                    case zero: // if a non 0 is found (e.g. 1.00004) remove the earlier recorded 0 position and look for more trailing 0s
-                                        if (ch != '0')
-                                        {
-                                            o = nullptr;
-                                            f_state = decp;
-                                        }
-                                        p++;
-                                        break;
-                                }
-                            }
-                            if (o != nullptr) // if any trailing 0s are found, terminate the string where they begin
-                                *o = '\0';
-                            out += outbuf;
-                        }
-                        else if (v.nt == num_type::Signed_integer)
-                        {
-                            out += std::to_string(v.num.si);
-                        }
-                        else
-                        {
-                            out += std::to_string(v.num.ui);
-                        }
-                    }
-                    break;
-                    case type::String: dump_string(v.s, out); break;
-                    case type::List:
-                    {
-                        out.push_back('[');
-
-                        if (indent >= 0)
-                        {
-                            dump_indentation_part(out, indent, separator, indent_level + 1);
-                        }
-
-                        if (v.l)
-                        {
-                            bool first = true;
-                            for (auto& x : *v.l)
-                            {
-                                if (!first)
-                                {
-                                    out.push_back(',');
-
-                                    if (indent >= 0)
-                                    {
-                                        dump_indentation_part(out, indent, separator, indent_level + 1);
-                                    }
-                                }
-                                first = false;
-                                dump_internal(x, out, indent, separator, indent_level + 1);
-                            }
-                        }
-
-                        if (indent >= 0)
-                        {
-                            dump_indentation_part(out, indent, separator, indent_level);
-                        }
-
-                        out.push_back(']');
-                    }
-                    break;
-                    case type::Object:
-                    {
-                        out.push_back('{');
-
-                        if (indent >= 0)
-                        {
-                            dump_indentation_part(out, indent, separator, indent_level + 1);
-                        }
-
-                        if (v.o)
-                        {
-                            bool first = true;
-                            for (auto& kv : *v.o)
-                            {
-                                if (!first)
-                                {
-                                    out.push_back(',');
-                                    if (indent >= 0)
-                                    {
-                                        dump_indentation_part(out, indent, separator, indent_level + 1);
-                                    }
-                                }
-                                first = false;
-                                dump_string(kv.first, out);
-                                out.push_back(':');
-
-                                if (indent >= 0)
-                                {
-                                    out.push_back(' ');
-                                }
-
-                                dump_internal(kv.second, out, indent, separator, indent_level + 1);
-                            }
-                        }
-
-                        if (indent >= 0)
-                        {
-                            dump_indentation_part(out, indent, separator, indent_level);
-                        }
-
-                        out.push_back('}');
-                    }
-                    break;
-
-                    case type::Function:
-                        out += "custom function";
-                        break;
-                }
-            }
-
-        public:
-            std::string dump(const int indent, const char separator = ' ') const
-            {
-                std::string ret;
-                ret.reserve(estimate_length());
-                dump_internal(*this, ret, indent, separator);
-                return ret;
-            }
-
-            std::string dump() const
-            {
-                static constexpr int DontIndent = -1;
-
-                return dump(DontIndent);
-            }
-        };
-
-        // Used for accessing the internals of a wvalue
-        struct wvalue_reader
-        {
-            int64_t get(int64_t fallback)
-            {
-                if (ref.t() != type::Number || ref.nt == num_type::Floating_point || 
-                    ref.nt == num_type::Double_precision_floating_point)
-                    return fallback;
-                return ref.num.si;
-            }
-
-            double get(double fallback)
-            {
-                if (ref.t() != type::Number || ref.nt != num_type::Floating_point ||
-                    ref.nt == num_type::Double_precision_floating_point)
-                    return fallback;
-                return ref.num.d;
-            }
-
-            bool get(bool fallback)
-            {
-                if (ref.t() == type::True) return true;
-                if (ref.t() == type::False) return false;
-                return fallback;
-            }
-
-            std::string get(const std::string& fallback)
-            {
-                if (ref.t() != type::String) return fallback;
-                return ref.s;
-            }
-
-            const wvalue& ref;
-        };
-
-        //std::vector<asio::const_buffer> dump_ref(wvalue& v)
-        //{
-        //}
-    } // namespace json
-} // namespace crow
-
-#include <string>
-#include <unordered_map>
-#include <ios>
-#include <fstream>
-#include <sstream>
-// S_ISREG is not defined for windows
-// This defines it like suggested in https://stackoverflow.com/a/62371749
-#if defined(_MSC_VER)
-#define _CRT_INTERNAL_NONSTDC_NAMES 1
-#endif
-#include <sys/stat.h>
-#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
-#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
-#endif
-
-
-
-namespace crow
-{
-    template<typename Adaptor, typename Handler, typename... Middlewares>
-    class Connection;
-
-    class Router;
-
-    /// HTTP response
-    struct response
-    {
-        template<typename Adaptor, typename Handler, typename... Middlewares>
-        friend class crow::Connection;
-
-        friend class Router;
-
-        int code{200};    ///< The Status code for the response.
-        std::string body; ///< The actual payload containing the response data.
-        ci_map headers;   ///< HTTP headers.
-
-#ifdef CROW_ENABLE_COMPRESSION
-        bool compressed = true; ///< If compression is enabled and this is false, the individual response will not be compressed.
-#endif
-        bool skip_body = false;            ///< Whether this is a response to a HEAD request.
-        bool manual_length_header = false; ///< Whether Crow should automatically add a "Content-Length" header.
-
-        /// Set the value of an existing header in the response.
-        void set_header(std::string key, std::string value)
-        {
-            headers.erase(key);
-            headers.emplace(std::move(key), std::move(value));
-        }
-
-        /// Add a new header to the response.
-        void add_header(std::string key, std::string value)
-        {
-            headers.emplace(std::move(key), std::move(value));
-        }
-
-        const std::string& get_header_value(const std::string& key)
-        {
-            return crow::get_header_value(headers, key);
-        }
-
-        // naive validation of a mime-type string
-        static bool validate_mime_type(const std::string& candidate) noexcept
-        {
-            // Here we simply check that the candidate type starts with
-            // a valid parent type, and has at least one character afterwards.
-            std::array<std::string, 10> valid_parent_types = {
-              "application/", "audio/", "font/", "example/",
-              "image/", "message/", "model/", "multipart/",
-              "text/", "video/"};
-            for (const std::string& parent : valid_parent_types)
-            {
-                // ensure the candidate is *longer* than the parent,
-                // to avoid unnecessary string comparison and to
-                // reject zero-length subtypes.
-                if (candidate.size() <= parent.size())
-                {
-                    continue;
-                }
-                // strncmp is used rather than substr to avoid allocation,
-                // but a string_view approach would be better if Crow
-                // migrates to C++17.
-                if (strncmp(parent.c_str(), candidate.c_str(), parent.size()) == 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        // Find the mime type from the content type either by lookup,
-        // or by the content type itself, if it is a valid a mime type.
-        // Defaults to text/plain.
-        static std::string get_mime_type(const std::string& contentType)
-        {
-            const auto mimeTypeIterator = mime_types.find(contentType);
-            if (mimeTypeIterator != mime_types.end())
-            {
-                return mimeTypeIterator->second;
-            }
-            else if (validate_mime_type(contentType))
-            {
-                return contentType;
-            }
-            else
-            {
-                CROW_LOG_WARNING << "Unable to interpret mime type for content type '" << contentType << "'. Defaulting to text/plain.";
-                return "text/plain";
-            }
-        }
-
-
-        // clang-format off
-        response() {}
-        explicit response(int code) : code(code) {}
-        response(std::string body) : body(std::move(body)) {}
-        response(int code, std::string body) : code(code), body(std::move(body)) {}
-        // clang-format on
-        response(returnable&& value)
-        {
-            body = value.dump();
-            set_header("Content-Type", value.content_type);
-        }
-        response(returnable& value)
-        {
-            body = value.dump();
-            set_header("Content-Type", value.content_type);
-        }
-        response(int code, returnable& value):
-          code(code)
-        {
-            body = value.dump();
-            set_header("Content-Type", value.content_type);
-        }
-        response(int code, returnable&& value):
-          code(code), body(value.dump())
-        {
-            set_header("Content-Type", std::move(value.content_type));
-        }
-
-        response(response&& r)
-        {
-            *this = std::move(r);
-        }
-
-        response(std::string contentType, std::string body):
-          body(std::move(body))
-        {
-            set_header("Content-Type", get_mime_type(contentType));
-        }
-
-        response(int code, std::string contentType, std::string body):
-          code(code), body(std::move(body))
-        {
-            set_header("Content-Type", get_mime_type(contentType));
-        }
-
-        response& operator=(const response& r) = delete;
-
-        response& operator=(response&& r) noexcept
-        {
-            body = std::move(r.body);
-            code = r.code;
-            headers = std::move(r.headers);
-            completed_ = r.completed_;
-            file_info = std::move(r.file_info);
-            return *this;
-        }
-
-        /// Check if the response has completed (whether response.end() has been called)
-        bool is_completed() const noexcept
-        {
-            return completed_;
-        }
-
-        void clear()
-        {
-            body.clear();
-            code = 200;
-            headers.clear();
-            completed_ = false;
-            file_info = static_file_info{};
-        }
-
-        /// Return a "Temporary Redirect" response.
-
-        ///
-        /// Location can either be a route or a full URL.
-        void redirect(const std::string& location)
-        {
-            code = 307;
-            set_header("Location", location);
-        }
-
-        /// Return a "Permanent Redirect" response.
-
-        ///
-        /// Location can either be a route or a full URL.
-        void redirect_perm(const std::string& location)
-        {
-            code = 308;
-            set_header("Location", location);
-        }
-
-        /// Return a "Found (Moved Temporarily)" response.
-
-        ///
-        /// Location can either be a route or a full URL.
-        void moved(const std::string& location)
-        {
-            code = 302;
-            set_header("Location", location);
-        }
-
-        /// Return a "Moved Permanently" response.
-
-        ///
-        /// Location can either be a route or a full URL.
-        void moved_perm(const std::string& location)
-        {
-            code = 301;
-            set_header("Location", location);
-        }
-
-        void write(const std::string& body_part)
-        {
-            body += body_part;
-        }
-
-        /// Set the response completion flag and call the handler (to send the response).
-        void end()
-        {
-            if (!completed_)
-            {
-                completed_ = true;
-                if (skip_body)
-                {
-                    set_header("Content-Length", std::to_string(body.size()));
-                    body = "";
-                    manual_length_header = true;
-                }
-                if (complete_request_handler_)
-                {
-                    complete_request_handler_();
-                    manual_length_header = false;
-                    skip_body = false;
-                }
-            }
-        }
-
-        /// Same as end() except it adds a body part right before ending.
-        void end(const std::string& body_part)
-        {
-            body += body_part;
-            end();
-        }
-
-        /// Check if the connection is still alive (usually by checking the socket status).
-        bool is_alive()
-        {
-            return is_alive_helper_ && is_alive_helper_();
-        }
-
-        /// Check whether the response has a static file defined.
-        bool is_static_type()
-        {
-            return file_info.path.size();
-        }
-
-        /// This constains metadata (coming from the `stat` command) related to any static files associated with this response.
-
-        ///
-        /// Either a static file or a string body can be returned as 1 response.
-        struct static_file_info
-        {
-            std::string path = "";
-            struct stat statbuf;
-            int statResult;
-        };
-
-        /// Return a static file as the response body
-        void set_static_file_info(std::string path)
-        {
-            utility::sanitize_filename(path);
-            set_static_file_info_unsafe(path);
-        }
-
-        /// Return a static file as the response body without sanitizing the path (use set_static_file_info instead)
-        void set_static_file_info_unsafe(std::string path)
-        {
-            file_info.path = path;
-            file_info.statResult = stat(file_info.path.c_str(), &file_info.statbuf);
-#ifdef CROW_ENABLE_COMPRESSION
-            compressed = false;
-#endif
-            if (file_info.statResult == 0 && S_ISREG(file_info.statbuf.st_mode))
-            {
-                std::size_t last_dot = path.find_last_of(".");
-                std::string extension = path.substr(last_dot + 1);
-                code = 200;
-                this->add_header("Content-Length", std::to_string(file_info.statbuf.st_size));
-
-                if (!extension.empty())
-                {
-                    this->add_header("Content-Type", get_mime_type(extension));
-                }
-            }
-            else
-            {
-                code = 404;
-                file_info.path.clear();
-            }
-        }
-
-    private:
-        bool completed_{};
-        std::function<void()> complete_request_handler_;
-        std::function<bool()> is_alive_helper_;
-        static_file_info file_info;
-    };
-} // namespace crow
-
-
-namespace crow
-{
-
-    struct UTF8
-    {
-        struct context
-        {};
-
-        void before_handle(request& /*req*/, response& /*res*/, context& /*ctx*/)
-        {}
-
-        void after_handle(request& /*req*/, response& res, context& /*ctx*/)
-        {
-            if (get_header_value(res.headers, "Content-Type").empty())
-            {
-                res.set_header("Content-Type", "text/plain; charset=utf-8");
-            }
-        }
-    };
-
-} // namespace crow
-
-#include <iomanip>
-#include <memory>
-
-namespace crow
-{
-    // Any middleware requires following 3 members:
-
-    // struct context;
-    //      storing data for the middleware; can be read from another middleware or handlers
-
-    // before_handle
-    //      called before handling the request.
-    //      if res.end() is called, the operation is halted.
-    //      (still call after_handle of this middleware)
-    //      2 signatures:
-    //      void before_handle(request& req, response& res, context& ctx)
-    //          if you only need to access this middlewares context.
-    //      template <typename AllContext>
-    //      void before_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
-    //          you can access another middlewares' context by calling `all_ctx.template get<MW>()'
-    //          ctx == all_ctx.template get<CurrentMiddleware>()
-
-    // after_handle
-    //      called after handling the request.
-    //      void after_handle(request& req, response& res, context& ctx)
-    //      template <typename AllContext>
-    //      void after_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
-
-    struct CookieParser
-    {
-        // Cookie stores key, value and attributes
-        struct Cookie
-        {
-            enum class SameSitePolicy
-            {
-                Strict,
-                Lax,
-                None
-            };
-
-            template<typename U>
-            Cookie(const std::string& key, U&& value):
-              Cookie()
-            {
-                key_ = key;
-                value_ = std::forward<U>(value);
-            }
-
-            Cookie(const std::string& key):
-              Cookie(key, "") {}
-
-            // format cookie to HTTP header format
-            std::string dump() const
-            {
-                const static char* HTTP_DATE_FORMAT = "%a, %d %b %Y %H:%M:%S GMT";
-
-                std::stringstream ss;
-                ss << key_ << '=';
-                ss << (value_.empty() ? "\"\"" : value_);
-                dumpString(ss, !domain_.empty(), "Domain=", domain_);
-                dumpString(ss, !path_.empty(), "Path=", path_);
-                dumpString(ss, secure_, "Secure");
-                dumpString(ss, httponly_, "HttpOnly");
-                if (expires_at_)
-                {
-                    ss << DIVIDER << "Expires="
-                       << std::put_time(expires_at_.get(), HTTP_DATE_FORMAT);
-                }
-                if (max_age_)
-                {
-                    ss << DIVIDER << "Max-Age=" << *max_age_;
-                }
-                if (same_site_)
-                {
-                    ss << DIVIDER << "SameSite=";
-                    switch (*same_site_)
-                    {
-                        case SameSitePolicy::Strict:
-                            ss << "Strict";
-                            break;
-                        case SameSitePolicy::Lax:
-                            ss << "Lax";
-                            break;
-                        case SameSitePolicy::None:
-                            ss << "None";
-                            break;
-                    }
-                }
-                return ss.str();
-            }
-
-            const std::string& name()
-            {
-                return key_;
-            }
-
-            template<typename U>
-            Cookie& value(U&& value)
-            {
-                value_ = std::forward<U>(value);
-                return *this;
-            }
-
-            // Expires attribute
-            Cookie& expires(const std::tm& time)
-            {
-                expires_at_ = std::unique_ptr<std::tm>(new std::tm(time));
-                return *this;
-            }
-
-            // Max-Age attribute
-            Cookie& max_age(long long seconds)
-            {
-                max_age_ = std::unique_ptr<long long>(new long long(seconds));
-                return *this;
-            }
-
-            // Domain attribute
-            Cookie& domain(const std::string& name)
-            {
-                domain_ = name;
-                return *this;
-            }
-
-            // Path attribute
-            Cookie& path(const std::string& path)
-            {
-                path_ = path;
-                return *this;
-            }
-
-            // Secured attribute
-            Cookie& secure()
-            {
-                secure_ = true;
-                return *this;
-            }
-
-            // HttpOnly attribute
-            Cookie& httponly()
-            {
-                httponly_ = true;
-                return *this;
-            }
-
-            // SameSite attribute
-            Cookie& same_site(SameSitePolicy ssp)
-            {
-                same_site_ = std::unique_ptr<SameSitePolicy>(new SameSitePolicy(ssp));
-                return *this;
-            }
-
-            Cookie(const Cookie& c):
-              key_(c.key_),
-              value_(c.value_),
-              domain_(c.domain_),
-              path_(c.path_),
-              secure_(c.secure_),
-              httponly_(c.httponly_)
-            {
-                if (c.max_age_)
-                    max_age_ = std::unique_ptr<long long>(new long long(*c.max_age_));
-
-                if (c.expires_at_)
-                    expires_at_ = std::unique_ptr<std::tm>(new std::tm(*c.expires_at_));
-
-                if (c.same_site_)
-                    same_site_ = std::unique_ptr<SameSitePolicy>(new SameSitePolicy(*c.same_site_));
-            }
-
-        private:
-            Cookie() = default;
-
-            static void dumpString(std::stringstream& ss, bool cond, const char* prefix,
-                                   const std::string& value = "")
-            {
-                if (cond)
-                {
-                    ss << DIVIDER << prefix << value;
-                }
-            }
-
-        private:
-            std::string key_;
-            std::string value_;
-            std::unique_ptr<long long> max_age_{};
-            std::string domain_ = "";
-            std::string path_ = "";
-            bool secure_ = false;
-            bool httponly_ = false;
-            std::unique_ptr<std::tm> expires_at_{};
-            std::unique_ptr<SameSitePolicy> same_site_{};
-
-            static constexpr const char* DIVIDER = "; ";
-        };
-
-
-        struct context
-        {
-            std::unordered_map<std::string, std::string> jar;
-
-            std::string get_cookie(const std::string& key) const
-            {
-                auto cookie = jar.find(key);
-                if (cookie != jar.end())
-                    return cookie->second;
-                return {};
-            }
-
-            template<typename U>
-            Cookie& set_cookie(const std::string& key, U&& value)
-            {
-                cookies_to_add.emplace_back(key, std::forward<U>(value));
-                return cookies_to_add.back();
-            }
-
-            Cookie& set_cookie(Cookie cookie)
-            {
-                cookies_to_add.push_back(std::move(cookie));
-                return cookies_to_add.back();
-            }
-
-        private:
-            friend struct CookieParser;
-            std::vector<Cookie> cookies_to_add;
-        };
-
-        void before_handle(request& req, response& res, context& ctx)
-        {
-            // TODO(dranikpg): remove copies, use string_view with c++17
-            int count = req.headers.count("Cookie");
-            if (!count)
-                return;
-            if (count > 1)
-            {
-                res.code = 400;
-                res.end();
-                return;
-            }
-            std::string cookies = req.get_header_value("Cookie");
-            size_t pos = 0;
-            while (pos < cookies.size())
-            {
-                size_t pos_equal = cookies.find('=', pos);
-                if (pos_equal == cookies.npos)
-                    break;
-                std::string name = cookies.substr(pos, pos_equal - pos);
-                name = utility::trim(name);
-                pos = pos_equal + 1;
-                if (pos == cookies.size())
-                    break;
-
-                size_t pos_semicolon = cookies.find(';', pos);
-                std::string value = cookies.substr(pos, pos_semicolon - pos);
-
-                value = utility::trim(value);
-                if (value[0] == '"' && value[value.size() - 1] == '"')
-                {
-                    value = value.substr(1, value.size() - 2);
-                }
-
-                ctx.jar.emplace(std::move(name), std::move(value));
-
-                pos = pos_semicolon;
-                if (pos == cookies.npos)
-                    break;
-                pos++;
-            }
-        }
-
-        void after_handle(request& /*req*/, response& res, context& ctx)
-        {
-            for (const auto& cookie : ctx.cookies_to_add)
-            {
-                res.add_header("Set-Cookie", cookie.dump());
-            }
-        }
-    };
-
-    /*
-    App<CookieParser, AnotherJarMW> app;
-    A B C
-    A::context
-        int aa;
-
-    ctx1 : public A::context
-    ctx2 : public ctx1, public B::context
-    ctx3 : public ctx2, public C::context
-
-    C depends on A
-
-    C::handle
-        context.aaa
-
-    App::context : private CookieParser::context, ...
-    {
-        jar
-
-    }
-
-    SimpleApp
-    */
-} // namespace crow
-
-
-
-#include <unordered_map>
-#include <unordered_set>
-#include <set>
-#include <queue>
-
-#include <memory>
-#include <string>
-#include <cstdio>
-#include <mutex>
-
-#include <fstream>
-#include <sstream>
-
-#include <type_traits>
-#include <functional>
-#include <chrono>
-
-#ifdef CROW_CAN_USE_CPP17
-#include <variant>
-#endif
-
-namespace
-{
-    // convert all integer values to int64_t
-    template<typename T>
-    using wrap_integral_t = typename std::conditional<
-      std::is_integral<T>::value && !std::is_same<bool, T>::value
-        // except for uint64_t because that could lead to overflow on conversion
-        && !std::is_same<uint64_t, T>::value,
-      int64_t, T>::type;
-
-    // convert char[]/char* to std::string
-    template<typename T>
-    using wrap_char_t = typename std::conditional<
-      std::is_same<typename std::decay<T>::type, char*>::value,
-      std::string, T>::type;
-
-    // Upgrade to correct type for multi_variant use
-    template<typename T>
-    using wrap_mv_t = wrap_char_t<wrap_integral_t<T>>;
-} // namespace
-
-namespace crow
-{
-    namespace session
-    {
-
-#ifdef CROW_CAN_USE_CPP17
-        using multi_value_types = black_magic::S<bool, int64_t, double, std::string>;
-
-        /// A multi_value is a safe variant wrapper with json conversion support
-        struct multi_value
-        {
-            json::wvalue json() const
-            {
-                // clang-format off
-                return std::visit([](auto arg) {
-                    return json::wvalue(arg);
-                }, v_);
-                // clang-format on
-            }
-
-            static multi_value from_json(const json::rvalue&);
-
-            std::string string() const
-            {
-                // clang-format off
-                return std::visit([](auto arg) {
-                    if constexpr (std::is_same_v<decltype(arg), std::string>)
-                        return arg;
-                    else
-                        return std::to_string(arg);
-                }, v_);
-                // clang-format on
-            }
-
-            template<typename T, typename RT = wrap_mv_t<T>>
-            RT get(const T& fallback)
-            {
-                if (const RT* val = std::get_if<RT>(&v_)) return *val;
-                return fallback;
-            }
-
-            template<typename T, typename RT = wrap_mv_t<T>>
-            void set(T val)
-            {
-                v_ = RT(std::move(val));
-            }
-
-            typename multi_value_types::rebind<std::variant> v_;
-        };
-
-        inline multi_value multi_value::from_json(const json::rvalue& rv)
-        {
-            using namespace json;
-            switch (rv.t())
-            {
-                case type::Number:
-                {
-                    if (rv.nt() == num_type::Floating_point || rv.nt() == num_type::Double_precision_floating_point)
-                        return multi_value{rv.d()};
-                    else if (rv.nt() == num_type::Unsigned_integer)
-                        return multi_value{int64_t(rv.u())};
-                    else
-                        return multi_value{rv.i()};
-                }
-                case type::False: return multi_value{false};
-                case type::True: return multi_value{true};
-                case type::String: return multi_value{std::string(rv)};
-                default: return multi_value{false};
-            }
-        }
-#else
-        // Fallback for C++11/14 that uses a raw json::wvalue internally.
-        // This implementation consumes significantly more memory
-        // than the variant-based version
-        struct multi_value
-        {
-            json::wvalue json() const { return v_; }
-
-            static multi_value from_json(const json::rvalue&);
-
-            std::string string() const { return v_.dump(); }
-
-            template<typename T, typename RT = wrap_mv_t<T>>
-            RT get(const T& fallback)
-            {
-                return json::wvalue_reader{v_}.get((const RT&)(fallback));
-            }
-
-            template<typename T, typename RT = wrap_mv_t<T>>
-            void set(T val)
-            {
-                v_ = RT(std::move(val));
-            }
-
-            json::wvalue v_;
-        };
-
-        inline multi_value multi_value::from_json(const json::rvalue& rv)
-        {
-            return {rv};
-        }
-#endif
-
-        /// Expiration tracker keeps track of soonest-to-expire keys
-        struct ExpirationTracker
-        {
-            using DataPair = std::pair<uint64_t /*time*/, std::string /*key*/>;
-
-            /// Add key with time to tracker.
-            /// If the key is already present, it will be updated
-            void add(std::string key, uint64_t time)
-            {
-                auto it = times_.find(key);
-                if (it != times_.end()) remove(key);
-                times_[key] = time;
-                queue_.insert({time, std::move(key)});
-            }
-
-            void remove(const std::string& key)
-            {
-                auto it = times_.find(key);
-                if (it != times_.end())
-                {
-                    queue_.erase({it->second, key});
-                    times_.erase(it);
-                }
-            }
-
-            /// Get expiration time of soonest-to-expire entry
-            uint64_t peek_first() const
-            {
-                if (queue_.empty()) return std::numeric_limits<uint64_t>::max();
-                return queue_.begin()->first;
-            }
-
-            std::string pop_first()
-            {
-                auto it = times_.find(queue_.begin()->second);
-                auto key = it->first;
-                times_.erase(it);
-                queue_.erase(queue_.begin());
-                return key;
-            }
-
-            using iterator = typename std::set<DataPair>::const_iterator;
-
-            iterator begin() const { return queue_.cbegin(); }
-
-            iterator end() const { return queue_.cend(); }
-
-        private:
-            std::set<DataPair> queue_;
-            std::unordered_map<std::string, uint64_t> times_;
-        };
-
-        /// CachedSessions are shared across requests
-        struct CachedSession
-        {
-            std::string session_id;
-            std::string requested_session_id; // session hasn't been created yet, but a key was requested
-
-            std::unordered_map<std::string, multi_value> entries;
-            std::unordered_set<std::string> dirty; // values that were changed after last load
-
-            void* store_data;
-            bool requested_refresh;
-
-            // number of references held - used for correctly destroying the cache.
-            // No need to be atomic, all SessionMiddleware accesses are synchronized
-            int referrers;
-            std::recursive_mutex mutex;
-        };
-    } // namespace session
-
-    // SessionMiddleware allows storing securely and easily small snippets of user information
-    template<typename Store>
-    struct SessionMiddleware
-    {
-#ifdef CROW_CAN_USE_CPP17
-        using lock = std::scoped_lock<std::mutex>;
-        using rc_lock = std::scoped_lock<std::recursive_mutex>;
-#else
-        using lock = std::lock_guard<std::mutex>;
-        using rc_lock = std::lock_guard<std::recursive_mutex>;
-#endif
-
-        struct context
-        {
-            // Get a mutex for locking this session
-            std::recursive_mutex& mutex()
-            {
-                check_node();
-                return node->mutex;
-            }
-
-            // Check whether this session is already present
-            bool exists() { return bool(node); }
-
-            // Get a value by key or fallback if it doesn't exist or is of another type
-            template<typename F>
-            auto get(const std::string& key, const F& fallback = F())
-              // This trick lets the multi_value deduce the return type from the fallback
-              // which allows both:
-              //   context.get<std::string>("key")
-              //   context.get("key", "") -> char[] is transformed into string by multivalue
-              // to return a string
-              -> decltype(std::declval<session::multi_value>().get<F>(std::declval<F>()))
-            {
-                if (!node) return fallback;
-                rc_lock l(node->mutex);
-
-                auto it = node->entries.find(key);
-                if (it != node->entries.end()) return it->second.get<F>(fallback);
-                return fallback;
-            }
-
-            // Set a value by key
-            template<typename T>
-            void set(const std::string& key, T value)
-            {
-                check_node();
-                rc_lock l(node->mutex);
-
-                node->dirty.insert(key);
-                node->entries[key].set(std::move(value));
-            }
-
-            bool contains(const std::string& key)
-            {
-                if (!node) return false;
-                return node->entries.find(key) != node->entries.end();
-            }
-
-            // Atomically mutate a value with a function
-            template<typename Func>
-            void apply(const std::string& key, const Func& f)
-            {
-                using traits = utility::function_traits<Func>;
-                using arg = typename std::decay<typename traits::template arg<0>>::type;
-                using retv = typename std::decay<typename traits::result_type>::type;
-                check_node();
-                rc_lock l(node->mutex);
-                node->dirty.insert(key);
-                node->entries[key].set<retv>(f(node->entries[key].get(arg{})));
-            }
-
-            // Remove a value from the session
-            void remove(const std::string& key)
-            {
-                if (!node) return;
-                rc_lock l(node->mutex);
-                node->dirty.insert(key);
-                node->entries.erase(key);
-            }
-
-            // Format value by key as a string
-            std::string string(const std::string& key)
-            {
-                if (!node) return "";
-                rc_lock l(node->mutex);
-
-                auto it = node->entries.find(key);
-                if (it != node->entries.end()) return it->second.string();
-                return "";
-            }
-
-            // Get a list of keys present in session
-            std::vector<std::string> keys()
-            {
-                if (!node) return {};
-                rc_lock l(node->mutex);
-
-                std::vector<std::string> out;
-                for (const auto& p : node->entries)
-                    out.push_back(p.first);
-                return out;
-            }
-
-            // Delay expiration by issuing another cookie with an updated expiration time
-            // and notifying the store
-            void refresh_expiration()
-            {
-                if (!node) return;
-                node->requested_refresh = true;
-            }
-
-        private:
-            friend struct SessionMiddleware;
-
-            void check_node()
-            {
-                if (!node) node = std::make_shared<session::CachedSession>();
-            }
-
-            std::shared_ptr<session::CachedSession> node;
-        };
-
-        template<typename... Ts>
-        SessionMiddleware(
-          CookieParser::Cookie cookie,
-          int id_length,
-          Ts... ts):
-          id_length_(id_length),
-          cookie_(cookie),
-          store_(std::forward<Ts>(ts)...), mutex_(new std::mutex{})
-        {}
-
-        template<typename... Ts>
-        SessionMiddleware(Ts... ts):
-          SessionMiddleware(
-            CookieParser::Cookie("session").path("/").max_age(/*month*/ 30 * 24 * 60 * 60),
-            /*id_length */ 20, // around 10^34 possible combinations, but small enough to fit into SSO
-            std::forward<Ts>(ts)...)
-        {}
-
-        template<typename AllContext>
-        void before_handle(request& /*req*/, response& /*res*/, context& ctx, AllContext& all_ctx)
-        {
-            lock l(*mutex_);
-
-            auto& cookies = all_ctx.template get<CookieParser>();
-            auto session_id = load_id(cookies);
-            if (session_id == "") return;
-
-            // search entry in cache
-            auto it = cache_.find(session_id);
-            if (it != cache_.end())
-            {
-                it->second->referrers++;
-                ctx.node = it->second;
-                return;
-            }
-
-            // check this is a valid entry before loading
-            if (!store_.contains(session_id)) return;
-
-            auto node = std::make_shared<session::CachedSession>();
-            node->session_id = session_id;
-            node->referrers = 1;
-
-            try
-            {
-                store_.load(*node);
-            }
-            catch (...)
-            {
-                CROW_LOG_ERROR << "Exception occurred during session load";
-                return;
-            }
-
-            ctx.node = node;
-            cache_[session_id] = node;
-        }
-
-        template<typename AllContext>
-        void after_handle(request& /*req*/, response& /*res*/, context& ctx, AllContext& all_ctx)
-        {
-            lock l(*mutex_);
-            if (!ctx.node || --ctx.node->referrers > 0) return;
-            ctx.node->requested_refresh |= ctx.node->session_id == "";
-
-            // generate new id
-            if (ctx.node->session_id == "")
-            {
-                // check for requested id
-                ctx.node->session_id = std::move(ctx.node->requested_session_id);
-                if (ctx.node->session_id == "")
-                {
-                    ctx.node->session_id = utility::random_alphanum(id_length_);
-                }
-            }
-            else
-            {
-                cache_.erase(ctx.node->session_id);
-            }
-
-            if (ctx.node->requested_refresh)
-            {
-                auto& cookies = all_ctx.template get<CookieParser>();
-                store_id(cookies, ctx.node->session_id);
-            }
-
-            try
-            {
-                store_.save(*ctx.node);
-            }
-            catch (...)
-            {
-                CROW_LOG_ERROR << "Exception occurred during session save";
-                return;
-            }
-        }
-
-    private:
-        std::string next_id()
-        {
-            std::string id;
-            do
-            {
-                id = utility::random_alphanum(id_length_);
-            } while (store_.contains(id));
-            return id;
-        }
-
-        std::string load_id(const CookieParser::context& cookies)
-        {
-            return cookies.get_cookie(cookie_.name());
-        }
-
-        void store_id(CookieParser::context& cookies, const std::string& session_id)
-        {
-            cookie_.value(session_id);
-            cookies.set_cookie(cookie_);
-        }
-
-    private:
-        int id_length_;
-
-        // prototype for cookie
-        CookieParser::Cookie cookie_;
-
-        Store store_;
-
-        // mutexes are immovable
-        std::unique_ptr<std::mutex> mutex_;
-        std::unordered_map<std::string, std::shared_ptr<session::CachedSession>> cache_;
-    };
-
-    /// InMemoryStore stores all entries in memory
-    struct InMemoryStore
-    {
-        // Load a value into the session cache.
-        // A load is always followed by a save, no loads happen consecutively
-        void load(session::CachedSession& cn)
-        {
-            // load & stores happen sequentially, so moving is safe
-            cn.entries = std::move(entries[cn.session_id]);
-        }
-
-        // Persist session data
-        void save(session::CachedSession& cn)
-        {
-            entries[cn.session_id] = std::move(cn.entries);
-            // cn.dirty is a list of changed keys since the last load
-        }
-
-        bool contains(const std::string& key)
-        {
-            return entries.count(key) > 0;
-        }
-
-        std::unordered_map<std::string, std::unordered_map<std::string, session::multi_value>> entries;
-    };
-
-    // FileStore stores all data as json files in a folder.
-    // Files are deleted after expiration. Expiration refreshes are automatically picked up.
-    struct FileStore
-    {
-        FileStore(const std::string& folder, uint64_t expiration_seconds = /*month*/ 30 * 24 * 60 * 60):
-          path_(folder), expiration_seconds_(expiration_seconds)
-        {
-            std::ifstream ifs(get_filename(".expirations", false));
-
-            auto current_ts = chrono_time();
-            std::string key;
-            uint64_t time;
-            while (ifs >> key >> time)
-            {
-                if (current_ts > time)
-                {
-                    evict(key);
-                }
-                else if (contains(key))
-                {
-                    expirations_.add(key, time);
-                }
-            }
-        }
-
-        ~FileStore()
-        {
-            std::ofstream ofs(get_filename(".expirations", false), std::ios::trunc);
-            for (const auto& p : expirations_)
-                ofs << p.second << " " << p.first << "\n";
-        }
-
-        // Delete expired entries
-        // At most 3 to prevent freezes
-        void handle_expired()
-        {
-            int deleted = 0;
-            auto current_ts = chrono_time();
-            while (current_ts > expirations_.peek_first() && deleted < 3)
-            {
-                evict(expirations_.pop_first());
-                deleted++;
-            }
-        }
-
-        void load(session::CachedSession& cn)
-        {
-            handle_expired();
-
-            std::ifstream file(get_filename(cn.session_id));
-
-            std::stringstream buffer;
-            buffer << file.rdbuf() << std::endl;
-
-            for (const auto& p : json::load(buffer.str()))
-                cn.entries[p.key()] = session::multi_value::from_json(p);
-        }
-
-        void save(session::CachedSession& cn)
-        {
-            if (cn.requested_refresh)
-                expirations_.add(cn.session_id, chrono_time() + expiration_seconds_);
-            if (cn.dirty.empty()) return;
-
-            std::ofstream file(get_filename(cn.session_id));
-            json::wvalue jw;
-            for (const auto& p : cn.entries)
-                jw[p.first] = p.second.json();
-            file << jw.dump() << std::flush;
-        }
-
-        std::string get_filename(const std::string& key, bool suffix = true)
-        {
-            return utility::join_path(path_, key + (suffix ? ".json" : ""));
-        }
-
-        bool contains(const std::string& key)
-        {
-            std::ifstream file(get_filename(key));
-            return file.good();
-        }
-
-        void evict(const std::string& key)
-        {
-            std::remove(get_filename(key).c_str());
-        }
-
-        uint64_t chrono_time() const
-        {
-            return std::chrono::duration_cast<std::chrono::seconds>(
-                     std::chrono::system_clock::now().time_since_epoch())
-              .count();
-        }
-
-        std::string path_;
-        uint64_t expiration_seconds_;
-        session::ExpirationTracker expirations_;
-    };
-
-} // namespace crow
-
-
-
-#include <tuple>
-#include <type_traits>
-#include <iostream>
-#include <utility>
-
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-
-    /// Local middleware should extend ILocalMiddleware
-    struct ILocalMiddleware
-    {
-        using call_global = std::false_type;
-    };
-
-    namespace detail
-    {
-        template<typename MW>
-        struct check_before_handle_arity_3_const
-        {
-            template<typename T, void (T::*)(request&, response&, typename MW::context&) const = &T::before_handle>
-            struct get
-            {};
-        };
-
-        template<typename MW>
-        struct check_before_handle_arity_3
-        {
-            template<typename T, void (T::*)(request&, response&, typename MW::context&) = &T::before_handle>
-            struct get
-            {};
-        };
-
-        template<typename MW>
-        struct check_after_handle_arity_3_const
-        {
-            template<typename T, void (T::*)(request&, response&, typename MW::context&) const = &T::after_handle>
-            struct get
-            {};
-        };
-
-        template<typename MW>
-        struct check_after_handle_arity_3
-        {
-            template<typename T, void (T::*)(request&, response&, typename MW::context&) = &T::after_handle>
-            struct get
-            {};
-        };
-
-        template<typename MW>
-        struct check_global_call_false
-        {
-            template<typename T, typename std::enable_if<T::call_global::value == false, bool>::type = true>
-            struct get
-            {};
-        };
-
-        template<typename T>
-        struct is_before_handle_arity_3_impl
-        {
-            template<typename C>
-            static std::true_type f(typename check_before_handle_arity_3_const<T>::template get<C>*);
-
-            template<typename C>
-            static std::true_type f(typename check_before_handle_arity_3<T>::template get<C>*);
-
-            template<typename C>
-            static std::false_type f(...);
-
-        public:
-            static const bool value = decltype(f<T>(nullptr))::value;
-        };
-
-        template<typename T>
-        struct is_after_handle_arity_3_impl
-        {
-            template<typename C>
-            static std::true_type f(typename check_after_handle_arity_3_const<T>::template get<C>*);
-
-            template<typename C>
-            static std::true_type f(typename check_after_handle_arity_3<T>::template get<C>*);
-
-            template<typename C>
-            static std::false_type f(...);
-
-        public:
-            static constexpr bool value = decltype(f<T>(nullptr))::value;
-        };
-
-        template<typename MW>
-        struct is_middleware_global
-        {
-            template<typename C>
-            static std::false_type f(typename check_global_call_false<MW>::template get<C>*);
-
-            template<typename C>
-            static std::true_type f(...);
-
-            static const bool value = decltype(f<MW>(nullptr))::value;
-        };
-
-        template<typename MW, typename Context, typename ParentContext>
-        typename std::enable_if<!is_before_handle_arity_3_impl<MW>::value>::type
-          before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
-        {
-            mw.before_handle(req, res, ctx.template get<MW>(), ctx);
-        }
-
-        template<typename MW, typename Context, typename ParentContext>
-        typename std::enable_if<is_before_handle_arity_3_impl<MW>::value>::type
-          before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
-        {
-            mw.before_handle(req, res, ctx.template get<MW>());
-        }
-
-        template<typename MW, typename Context, typename ParentContext>
-        typename std::enable_if<!is_after_handle_arity_3_impl<MW>::value>::type
-          after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
-        {
-            mw.after_handle(req, res, ctx.template get<MW>(), ctx);
-        }
-
-        template<typename MW, typename Context, typename ParentContext>
-        typename std::enable_if<is_after_handle_arity_3_impl<MW>::value>::type
-          after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/)
-        {
-            mw.after_handle(req, res, ctx.template get<MW>());
-        }
-
-
-        template<typename CallCriteria,
-                 int N, typename Context, typename Container>
-        typename std::enable_if<(N < std::tuple_size<typename std::remove_reference<Container>::type>::value), bool>::type
-          middleware_call_helper(const CallCriteria& cc, Container& middlewares, request& req, response& res, Context& ctx)
-        {
-
-            using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type;
-
-            if (!cc.template enabled<CurrentMW>(N))
-            {
-                return middleware_call_helper<CallCriteria, N + 1, Context, Container>(cc, middlewares, req, res, ctx);
-            }
-
-            using parent_context_t = typename Context::template partial<N - 1>;
-            before_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
-            if (res.is_completed())
-            {
-                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
-                return true;
-            }
-
-            if (middleware_call_helper<CallCriteria, N + 1, Context, Container>(cc, middlewares, req, res, ctx))
-            {
-                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
-                return true;
-            }
-
-            return false;
-        }
-
-        template<typename CallCriteria, int N, typename Context, typename Container>
-        typename std::enable_if<(N >= std::tuple_size<typename std::remove_reference<Container>::type>::value), bool>::type
-          middleware_call_helper(const CallCriteria& /*cc*/, Container& /*middlewares*/, request& /*req*/, response& /*res*/, Context& /*ctx*/)
-        {
-            return false;
-        }
-
-        template<typename CallCriteria, int N, typename Context, typename Container>
-        typename std::enable_if<(N < 0)>::type
-          after_handlers_call_helper(const CallCriteria& /*cc*/, Container& /*middlewares*/, Context& /*context*/, request& /*req*/, response& /*res*/)
-        {
-        }
-
-        template<typename CallCriteria, int N, typename Context, typename Container>
-        typename std::enable_if<(N == 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res)
-        {
-            using parent_context_t = typename Context::template partial<N - 1>;
-            using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type;
-            if (cc.template enabled<CurrentMW>(N))
-            {
-                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
-            }
-        }
-
-        template<typename CallCriteria, int N, typename Context, typename Container>
-        typename std::enable_if<(N > 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res)
-        {
-            using parent_context_t = typename Context::template partial<N - 1>;
-            using CurrentMW = typename std::tuple_element<N, typename std::remove_reference<Container>::type>::type;
-            if (cc.template enabled<CurrentMW>(N))
-            {
-                after_handler_call<CurrentMW, Context, parent_context_t>(std::get<N>(middlewares), req, res, ctx, static_cast<parent_context_t&>(ctx));
-            }
-            after_handlers_call_helper<CallCriteria, N - 1, Context, Container>(cc, middlewares, ctx, req, res);
-        }
-
-        // A CallCriteria that accepts only global middleware
-        struct middleware_call_criteria_only_global
-        {
-            template<typename MW>
-            constexpr bool enabled(int) const
-            {
-                return is_middleware_global<MW>::value;
-            }
-        };
-
-        template<typename F, typename... Args>
-        typename std::enable_if<black_magic::CallHelper<F, black_magic::S<Args...>>::value, void>::type
-          wrapped_handler_call(crow::request& /*req*/, crow::response& res, const F& f, Args&&... args)
-        {
-            static_assert(!std::is_same<void, decltype(f(std::declval<Args>()...))>::value,
-                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
-
-            res = crow::response(f(std::forward<Args>(args)...));
-            res.end();
-        }
-
-        template<typename F, typename... Args>
-        typename std::enable_if<
-          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
-            black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value,
-          void>::type
-          wrapped_handler_call(crow::request& req, crow::response& res, const F& f, Args&&... args)
-        {
-            static_assert(!std::is_same<void, decltype(f(std::declval<crow::request>(), std::declval<Args>()...))>::value,
-                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
-
-            res = crow::response(f(req, std::forward<Args>(args)...));
-            res.end();
-        }
-
-        template<typename F, typename... Args>
-        typename std::enable_if<
-          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
-            !black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value &&
-            black_magic::CallHelper<F, black_magic::S<crow::response&, Args...>>::value,
-          void>::type
-          wrapped_handler_call(crow::request& /*req*/, crow::response& res, const F& f, Args&&... args)
-        {
-            static_assert(std::is_same<void, decltype(f(std::declval<crow::response&>(), std::declval<Args>()...))>::value,
-                          "Handler function with response argument should have void return type");
-
-            f(res, std::forward<Args>(args)...);
-        }
-
-        template<typename F, typename... Args>
-        typename std::enable_if<
-          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
-            !black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value &&
-            !black_magic::CallHelper<F, black_magic::S<crow::response&, Args...>>::value &&
-            black_magic::CallHelper<F, black_magic::S<const crow::request&, crow::response&, Args...>>::value,
-          void>::type
-          wrapped_handler_call(crow::request& req, crow::response& res, const F& f, Args&&... args)
-        {
-            static_assert(std::is_same<void, decltype(f(std::declval<crow::request&>(), std::declval<crow::response&>(), std::declval<Args>()...))>::value,
-                          "Handler function with response argument should have void return type");
-
-            f(req, res, std::forward<Args>(args)...);
-        }
-
-        // wrapped_handler_call transparently wraps a handler call behind (req, res, args...)
-        template<typename F, typename... Args>
-        typename std::enable_if<
-          !black_magic::CallHelper<F, black_magic::S<Args...>>::value &&
-            !black_magic::CallHelper<F, black_magic::S<crow::request&, Args...>>::value &&
-            !black_magic::CallHelper<F, black_magic::S<crow::response&, Args...>>::value &&
-            !black_magic::CallHelper<F, black_magic::S<const crow::request&, crow::response&, Args...>>::value,
-          void>::type
-          wrapped_handler_call(crow::request& req, crow::response& res, const F& f, Args&&... args)
-        {
-            static_assert(std::is_same<void, decltype(f(std::declval<crow::request&>(), std::declval<crow::response&>(), std::declval<Args>()...))>::value,
-                          "Handler function with response argument should have void return type");
-
-            f(req, res, std::forward<Args>(args)...);
-        }
-
-        template<bool Reversed>
-        struct middleware_call_criteria_dynamic
-        {};
-
-        template<>
-        struct middleware_call_criteria_dynamic<false>
-        {
-            middleware_call_criteria_dynamic(const std::vector<int>& indices):
-              indices(indices), slider(0) {}
-
-            template<typename>
-            bool enabled(int mw_index) const
-            {
-                if (slider < int(indices.size()) && indices[slider] == mw_index)
-                {
-                    slider++;
-                    return true;
-                }
-                return false;
-            }
-
-        private:
-            const std::vector<int>& indices;
-            mutable int slider;
-        };
-
-        template<>
-        struct middleware_call_criteria_dynamic<true>
-        {
-            middleware_call_criteria_dynamic(const std::vector<int>& indices):
-              indices(indices), slider(int(indices.size()) - 1) {}
-
-            template<typename>
-            bool enabled(int mw_index) const
-            {
-                if (slider >= 0 && indices[slider] == mw_index)
-                {
-                    slider--;
-                    return true;
-                }
-                return false;
-            }
-
-        private:
-            const std::vector<int>& indices;
-            mutable int slider;
-        };
-
-    } // namespace detail
-} // namespace crow
-
-
-
-namespace crow
-{
-    namespace detail
-    {
-
-
-        template<typename... Middlewares>
-        struct partial_context : public black_magic::pop_back<Middlewares...>::template rebind<partial_context>, public black_magic::last_element_type<Middlewares...>::type::context
-        {
-            using parent_context = typename black_magic::pop_back<Middlewares...>::template rebind<::crow::detail::partial_context>;
-            template<int N>
-            using partial = typename std::conditional<N == sizeof...(Middlewares) - 1, partial_context, typename parent_context::template partial<N>>::type;
-
-            template<typename T>
-            typename T::context& get()
-            {
-                return static_cast<typename T::context&>(*this);
-            }
-        };
-
-
-
-        template<>
-        struct partial_context<>
-        {
-            template<int>
-            using partial = partial_context;
-        };
-
-
-        template<typename... Middlewares>
-        struct context : private partial_context<Middlewares...>
-        //struct context : private Middlewares::context... // simple but less type-safe
-        {
-            template<typename CallCriteria, int N, typename Context, typename Container>
-            friend typename std::enable_if<(N == 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res);
-            template<typename CallCriteria, int N, typename Context, typename Container>
-            friend typename std::enable_if<(N > 0)>::type after_handlers_call_helper(const CallCriteria& cc, Container& middlewares, Context& ctx, request& req, response& res);
-
-            template<typename CallCriteria, int N, typename Context, typename Container>
-            friend typename std::enable_if<(N < std::tuple_size<typename std::remove_reference<Container>::type>::value), bool>::type
-              middleware_call_helper(const CallCriteria& cc, Container& middlewares, request& req, response& res, Context& ctx);
-
-            template<typename T>
-            typename T::context& get()
-            {
-                return static_cast<typename T::context&>(*this);
-            }
-
-            template<int N>
-            using partial = typename partial_context<Middlewares...>::template partial<N>;
-        };
-    } // namespace detail
-} // namespace crow
-
-
-#ifdef CROW_USE_BOOST
-#include <boost/asio.hpp>
-#include <boost/asio/basic_waitable_timer.hpp>
-#else
-#ifndef ASIO_STANDALONE
-#define ASIO_STANDALONE
-#endif
-#include <asio.hpp>
-#include <asio/basic_waitable_timer.hpp>
-#endif
-
-#include <chrono>
-#include <functional>
-#include <map>
-#include <vector>
-
-
-namespace crow
-{
-#ifdef CROW_USE_BOOST
-    namespace asio = boost::asio;
-    using error_code = boost::system::error_code;
-#else
-    using error_code = asio::error_code;
-#endif
-    namespace detail
-    {
-
-        /// A class for scheduling functions to be called after a specific amount of ticks. A tick is equal to 1 second.
-        class task_timer
-        {
-        public:
-            using task_type = std::function<void()>;
-            using identifier_type = size_t;
-
-        private:
-            using clock_type = std::chrono::steady_clock;
-            using time_type = clock_type::time_point;
-
-        public:
-            task_timer(asio::io_service& io_service):
-              io_service_(io_service), timer_(io_service_)
-            {
-                timer_.expires_after(std::chrono::seconds(1));
-                timer_.async_wait(
-                  std::bind(&task_timer::tick_handler, this, std::placeholders::_1));
-            }
-
-            ~task_timer() { timer_.cancel(); }
-
-            void cancel(identifier_type id)
-            {
-                tasks_.erase(id);
-                CROW_LOG_DEBUG << "task_timer cancelled: " << this << ' ' << id;
-            }
-
-            /// Schedule the given task to be executed after the default amount of ticks.
-
-            ///
-            /// \return identifier_type Used to cancel the thread.
-            /// It is not bound to this task_timer instance and in some cases could lead to
-            /// undefined behavior if used with other task_timer objects or after the task
-            /// has been successfully executed.
-            identifier_type schedule(const task_type& task)
-            {
-                tasks_.insert(
-                  {++highest_id_,
-                   {clock_type::now() + std::chrono::seconds(get_default_timeout()),
-                    task}});
-                CROW_LOG_DEBUG << "task_timer scheduled: " << this << ' ' << highest_id_;
-                return highest_id_;
-            }
-
-            /// Schedule the given task to be executed after the given time.
-
-            ///
-            /// \param timeout The amount of ticks (seconds) to wait before execution.
-            ///
-            /// \return identifier_type Used to cancel the thread.
-            /// It is not bound to this task_timer instance and in some cases could lead to
-            /// undefined behavior if used with other task_timer objects or after the task
-            /// has been successfully executed.
-            identifier_type schedule(const task_type& task, std::uint8_t timeout)
-            {
-                tasks_.insert({++highest_id_,
-                               {clock_type::now() + std::chrono::seconds(timeout), task}});
-                CROW_LOG_DEBUG << "task_timer scheduled: " << this << ' ' << highest_id_;
-                return highest_id_;
-            }
-
-            /// Set the default timeout for this task_timer instance. (Default: 5)
-
-            ///
-            /// \param timeout The amount of ticks (seconds) to wait before execution.
-            void set_default_timeout(std::uint8_t timeout) { default_timeout_ = timeout; }
-
-            /// Get the default timeout. (Default: 5)
-            std::uint8_t get_default_timeout() const { return default_timeout_; }
-
-        private:
-            void process_tasks()
-            {
-                time_type current_time = clock_type::now();
-                std::vector<identifier_type> finished_tasks;
-
-                for (const auto& task : tasks_)
-                {
-                    if (task.second.first < current_time)
-                    {
-                        (task.second.second)();
-                        finished_tasks.push_back(task.first);
-                        CROW_LOG_DEBUG << "task_timer called: " << this << ' ' << task.first;
-                    }
-                }
-
-                for (const auto& task : finished_tasks)
-                    tasks_.erase(task);
-
-                // If no task is currently scheduled, reset the issued ids back to 0.
-                if (tasks_.empty()) highest_id_ = 0;
-            }
-
-            void tick_handler(const error_code& ec)
-            {
-                if (ec) return;
-
-                process_tasks();
-
-                timer_.expires_after(std::chrono::seconds(1));
-                timer_.async_wait(
-                  std::bind(&task_timer::tick_handler, this, std::placeholders::_1));
-            }
-
-        private:
-            std::uint8_t default_timeout_{5};
-            asio::io_service& io_service_;
-            asio::basic_waitable_timer<clock_type> timer_;
-            std::map<identifier_type, std::pair<time_type, task_type>> tasks_;
-
-            // A continuosly increasing number to be issued to threads to identify them.
-            // If no tasks are scheduled, it will be reset to 0.
-            identifier_type highest_id_{0};
-        };
-    } // namespace detail
-} // namespace crow
-
-
-#ifdef CROW_USE_BOOST
-#include <boost/asio.hpp>
-#else
-#ifndef ASIO_STANDALONE
-#define ASIO_STANDALONE
-#endif
-#include <asio.hpp>
-#endif
-
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <vector>
-
-
-namespace crow
-{
-#ifdef CROW_USE_BOOST
-    namespace asio = boost::asio;
-    using error_code = boost::system::error_code;
-#else
-    using error_code = asio::error_code;
-#endif
-    using tcp = asio::ip::tcp;
-
-#ifdef CROW_ENABLE_DEBUG
-    static std::atomic<int> connectionCount;
-#endif
-
-    /// An HTTP connection.
-    template<typename Adaptor, typename Handler, typename... Middlewares>
-    class Connection: public std::enable_shared_from_this<Connection<Adaptor, Handler, Middlewares...>>
-    {
-        friend struct crow::response;
-
-    public:
-        Connection(
-          asio::io_service& io_service,
-          Handler* handler,
-          const std::string& server_name,
-          std::tuple<Middlewares...>* middlewares,
-          std::function<std::string()>& get_cached_date_str_f,
-          detail::task_timer& task_timer,
-          typename Adaptor::context* adaptor_ctx_,
-          std::atomic<unsigned int>& queue_length):
-          adaptor_(io_service, adaptor_ctx_),
-          handler_(handler),
-          parser_(this),
-          req_(parser_.req),
-          server_name_(server_name),
-          middlewares_(middlewares),
-          get_cached_date_str(get_cached_date_str_f),
-          task_timer_(task_timer),
-          res_stream_threshold_(handler->stream_threshold()),
-          queue_length_(queue_length)
-        {
-#ifdef CROW_ENABLE_DEBUG
-            connectionCount++;
-            CROW_LOG_DEBUG << "Connection (" << this << ") allocated, total: " << connectionCount;
-#endif
-        }
-
-        ~Connection()
-        {
-#ifdef CROW_ENABLE_DEBUG
-            connectionCount--;
-            CROW_LOG_DEBUG << "Connection (" << this << ") freed, total: " << connectionCount;
-#endif
-        }
-
-        /// The TCP socket on top of which the connection is established.
-        decltype(std::declval<Adaptor>().raw_socket())& socket()
-        {
-            return adaptor_.raw_socket();
-        }
-
-        void start()
-        {
-            auto self = this->shared_from_this();
-            adaptor_.start([self](const error_code& ec) {
-                if (!ec)
-                {
-                    self->start_deadline();
-                    self->parser_.clear();
-
-                    self->do_read();
-                }
-                else
-                {
-                    CROW_LOG_ERROR << "Could not start adaptor: " << ec.message();
-                }
-            });
-        }
-
-        void handle_url()
-        {
-            routing_handle_result_ = handler_->handle_initial(req_, res);
-            // if no route is found for the request method, return the response without parsing or processing anything further.
-            if (!routing_handle_result_->rule_index)
-            {
-                parser_.done();
-                need_to_call_after_handlers_ = true;
-                complete_request();
-            }
-        }
-
-        void handle_header()
-        {
-            // HTTP 1.1 Expect: 100-continue
-            if (req_.http_ver_major == 1 && req_.http_ver_minor == 1 && get_header_value(req_.headers, "expect") == "100-continue")
-            {
-                continue_requested = true;
-                buffers_.clear();
-                static std::string expect_100_continue = "HTTP/1.1 100 Continue\r\n\r\n";
-                buffers_.emplace_back(expect_100_continue.data(), expect_100_continue.size());
-                do_write();
-            }
-        }
-
-        void handle()
-        {
-            // TODO(EDev): cancel_deadline_timer should be looked into, it might be a good idea to add it to handle_url() and then restart the timer once everything passes
-            cancel_deadline_timer();
-            bool is_invalid_request = false;
-            add_keep_alive_ = false;
-
-            // Create context
-            ctx_ = detail::context<Middlewares...>();
-            req_.middleware_context = static_cast<void*>(&ctx_);
-            req_.middleware_container = static_cast<void*>(middlewares_);
-            req_.io_service = &adaptor_.get_io_service();
-            
-            req_.remote_ip_address = adaptor_.remote_endpoint().address().to_string();
-
-            add_keep_alive_ = req_.keep_alive;
-            close_connection_ = req_.close_connection;
-
-            if (req_.check_version(1, 1)) // HTTP/1.1
-            {
-                if (!req_.headers.count("host"))
-                {
-                    is_invalid_request = true;
-                    res = response(400);
-                }
-                else if (req_.upgrade)
-                {
-                    // h2 or h2c headers
-                    if (req_.get_header_value("upgrade").substr(0, 2) == "h2")
-                    {
-                        // TODO(ipkn): HTTP/2
-                        // currently, ignore upgrade header
-                    }
-                    else
-                    {
-                
-                        detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
-                                                       0, decltype(ctx_), decltype(*middlewares_)>({}, *middlewares_, req_, res, ctx_);
-                        close_connection_ = true;
-                        handler_->handle_upgrade(req_, res, std::move(adaptor_));
-                        return;
-                    }
-                }
-            }
-
-            CROW_LOG_INFO << "Request: " << utility::lexical_cast<std::string>(adaptor_.remote_endpoint()) << " " << this << " HTTP/" << (char)(req_.http_ver_major + '0') << "." << (char)(req_.http_ver_minor + '0') << ' ' << method_name(req_.method) << " " << req_.url;
-
-
-            need_to_call_after_handlers_ = false;
-            if (!is_invalid_request)
-            {
-                res.complete_request_handler_ = nullptr;
-                auto self = this->shared_from_this();
-                res.is_alive_helper_ = [self]() -> bool {
-                    return self->adaptor_.is_open();
-                };
-                
-                detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
-                                               0, decltype(ctx_), decltype(*middlewares_)>({}, *middlewares_, req_, res, ctx_);
-
-                if (!res.completed_)
-                {
-                    auto self = this->shared_from_this();
-                    res.complete_request_handler_ = [self] {
-                        self->complete_request();
-                    };
-                    need_to_call_after_handlers_ = true;
-                    handler_->handle(req_, res, routing_handle_result_);
-                    if (add_keep_alive_)
-                        res.set_header("connection", "Keep-Alive");
-                }
-                else
-                {
-                    complete_request();
-                }
-            }
-            else
-            {
-                complete_request();
-            }
-        }
-
-        /// Call the after handle middleware and send the write the response to the connection.
-        void complete_request()
-        {
-            CROW_LOG_INFO << "Response: " << this << ' ' << req_.raw_url << ' ' << res.code << ' ' << close_connection_;
-            res.is_alive_helper_ = nullptr;
-
-            if (need_to_call_after_handlers_)
-            {
-                need_to_call_after_handlers_ = false;
-
-                // call all after_handler of middlewares
-                detail::after_handlers_call_helper<
-                  detail::middleware_call_criteria_only_global,
-                  (static_cast<int>(sizeof...(Middlewares)) - 1),
-                  decltype(ctx_),
-                  decltype(*middlewares_)>({}, *middlewares_, ctx_, req_, res);
-            }
-#ifdef CROW_ENABLE_COMPRESSION
-            if (handler_->compression_used())
-            {
-                std::string accept_encoding = req_.get_header_value("Accept-Encoding");
-                if (!accept_encoding.empty() && res.compressed)
-                {
-                    switch (handler_->compression_algorithm())
-                    {
-                        case compression::DEFLATE:
-                            if (accept_encoding.find("deflate") != std::string::npos)
-                            {
-                                res.body = compression::compress_string(res.body, compression::algorithm::DEFLATE);
-                                res.set_header("Content-Encoding", "deflate");
-                            }
-                            break;
-                        case compression::GZIP:
-                            if (accept_encoding.find("gzip") != std::string::npos)
-                            {
-                                res.body = compression::compress_string(res.body, compression::algorithm::GZIP);
-                                res.set_header("Content-Encoding", "gzip");
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }
-#endif
-            //if there is a redirection with a partial URL, treat the URL as a route.
-            std::string location = res.get_header_value("Location");
-            if (!location.empty() && location.find("://", 0) == std::string::npos)
-            {
-#ifdef CROW_ENABLE_SSL
-                if (handler_->ssl_used())
-                    location.insert(0, "https://" + req_.get_header_value("Host"));
-                else
-#endif
-                    location.insert(0, "http://" + req_.get_header_value("Host"));
-                res.set_header("location", location);
-            }
-
-            prepare_buffers();
-
-            if (res.is_static_type())
-            {
-                do_write_static();
-            }
-            else
-            {
-                do_write_general();
-            }
-        }
-
-    private:
-        void prepare_buffers()
-        {
-            res.complete_request_handler_ = nullptr;
-            res.is_alive_helper_ = nullptr;
-
-            if (!adaptor_.is_open())
-            {
-                //CROW_LOG_DEBUG << this << " delete (socket is closed) " << is_reading << ' ' << is_writing;
-                //delete this;
-                return;
-            }
-            // TODO(EDev): HTTP version in status codes should be dynamic
-            // Keep in sync with common.h/status
-            static std::unordered_map<int, std::string> statusCodes = {
-              {status::CONTINUE, "HTTP/1.1 100 Continue\r\n"},
-              {status::SWITCHING_PROTOCOLS, "HTTP/1.1 101 Switching Protocols\r\n"},
-
-              {status::OK, "HTTP/1.1 200 OK\r\n"},
-              {status::CREATED, "HTTP/1.1 201 Created\r\n"},
-              {status::ACCEPTED, "HTTP/1.1 202 Accepted\r\n"},
-              {status::NON_AUTHORITATIVE_INFORMATION, "HTTP/1.1 203 Non-Authoritative Information\r\n"},
-              {status::NO_CONTENT, "HTTP/1.1 204 No Content\r\n"},
-              {status::RESET_CONTENT, "HTTP/1.1 205 Reset Content\r\n"},
-              {status::PARTIAL_CONTENT, "HTTP/1.1 206 Partial Content\r\n"},
-
-              {status::MULTIPLE_CHOICES, "HTTP/1.1 300 Multiple Choices\r\n"},
-              {status::MOVED_PERMANENTLY, "HTTP/1.1 301 Moved Permanently\r\n"},
-              {status::FOUND, "HTTP/1.1 302 Found\r\n"},
-              {status::SEE_OTHER, "HTTP/1.1 303 See Other\r\n"},
-              {status::NOT_MODIFIED, "HTTP/1.1 304 Not Modified\r\n"},
-              {status::TEMPORARY_REDIRECT, "HTTP/1.1 307 Temporary Redirect\r\n"},
-              {status::PERMANENT_REDIRECT, "HTTP/1.1 308 Permanent Redirect\r\n"},
-
-              {status::BAD_REQUEST, "HTTP/1.1 400 Bad Request\r\n"},
-              {status::UNAUTHORIZED, "HTTP/1.1 401 Unauthorized\r\n"},
-              {status::FORBIDDEN, "HTTP/1.1 403 Forbidden\r\n"},
-              {status::NOT_FOUND, "HTTP/1.1 404 Not Found\r\n"},
-              {status::METHOD_NOT_ALLOWED, "HTTP/1.1 405 Method Not Allowed\r\n"},
-              {status::NOT_ACCEPTABLE, "HTTP/1.1 406 Not Acceptable\r\n"},
-              {status::PROXY_AUTHENTICATION_REQUIRED, "HTTP/1.1 407 Proxy Authentication Required\r\n"},
-              {status::CONFLICT, "HTTP/1.1 409 Conflict\r\n"},
-              {status::GONE, "HTTP/1.1 410 Gone\r\n"},
-              {status::PAYLOAD_TOO_LARGE, "HTTP/1.1 413 Payload Too Large\r\n"},
-              {status::UNSUPPORTED_MEDIA_TYPE, "HTTP/1.1 415 Unsupported Media Type\r\n"},
-              {status::RANGE_NOT_SATISFIABLE, "HTTP/1.1 416 Range Not Satisfiable\r\n"},
-              {status::EXPECTATION_FAILED, "HTTP/1.1 417 Expectation Failed\r\n"},
-              {status::PRECONDITION_REQUIRED, "HTTP/1.1 428 Precondition Required\r\n"},
-              {status::TOO_MANY_REQUESTS, "HTTP/1.1 429 Too Many Requests\r\n"},
-              {status::UNAVAILABLE_FOR_LEGAL_REASONS, "HTTP/1.1 451 Unavailable For Legal Reasons\r\n"},
-
-              {status::INTERNAL_SERVER_ERROR, "HTTP/1.1 500 Internal Server Error\r\n"},
-              {status::NOT_IMPLEMENTED, "HTTP/1.1 501 Not Implemented\r\n"},
-              {status::BAD_GATEWAY, "HTTP/1.1 502 Bad Gateway\r\n"},
-              {status::SERVICE_UNAVAILABLE, "HTTP/1.1 503 Service Unavailable\r\n"},
-              {status::GATEWAY_TIMEOUT, "HTTP/1.1 504 Gateway Timeout\r\n"},
-              {status::VARIANT_ALSO_NEGOTIATES, "HTTP/1.1 506 Variant Also Negotiates\r\n"},
-            };
-
-            static const std::string seperator = ": ";
-
-            buffers_.clear();
-            buffers_.reserve(4 * (res.headers.size() + 5) + 3);
-
-            if (!statusCodes.count(res.code))
-            {
-                CROW_LOG_WARNING << this << " status code "
-                                 << "(" << res.code << ")"
-                                 << " not defined, returning 500 instead";
-                res.code = 500;
-            }
-
-            auto& status = statusCodes.find(res.code)->second;
-            buffers_.emplace_back(status.data(), status.size());
-
-            if (res.code >= 400 && res.body.empty())
-                res.body = statusCodes[res.code].substr(9);
-
-            for (auto& kv : res.headers)
-            {
-                buffers_.emplace_back(kv.first.data(), kv.first.size());
-                buffers_.emplace_back(seperator.data(), seperator.size());
-                buffers_.emplace_back(kv.second.data(), kv.second.size());
-                buffers_.emplace_back(crlf.data(), crlf.size());
-            }
-
-            if (!res.manual_length_header && !res.headers.count("content-length"))
-            {
-                content_length_ = std::to_string(res.body.size());
-                static std::string content_length_tag = "Content-Length: ";
-                buffers_.emplace_back(content_length_tag.data(), content_length_tag.size());
-                buffers_.emplace_back(content_length_.data(), content_length_.size());
-                buffers_.emplace_back(crlf.data(), crlf.size());
-            }
-            if (!res.headers.count("server"))
-            {
-                static std::string server_tag = "Server: ";
-                buffers_.emplace_back(server_tag.data(), server_tag.size());
-                buffers_.emplace_back(server_name_.data(), server_name_.size());
-                buffers_.emplace_back(crlf.data(), crlf.size());
-            }
-            if (!res.headers.count("date"))
-            {
-                static std::string date_tag = "Date: ";
-                date_str_ = get_cached_date_str();
-                buffers_.emplace_back(date_tag.data(), date_tag.size());
-                buffers_.emplace_back(date_str_.data(), date_str_.size());
-                buffers_.emplace_back(crlf.data(), crlf.size());
-            }
-            if (add_keep_alive_)
-            {
-                static std::string keep_alive_tag = "Connection: Keep-Alive";
-                buffers_.emplace_back(keep_alive_tag.data(), keep_alive_tag.size());
-                buffers_.emplace_back(crlf.data(), crlf.size());
-            }
-
-            buffers_.emplace_back(crlf.data(), crlf.size());
-        }
-
-        void do_write_static()
-        {
-            asio::write(adaptor_.socket(), buffers_);
-
-            if (res.file_info.statResult == 0)
-            {
-                std::ifstream is(res.file_info.path.c_str(), std::ios::in | std::ios::binary);
-                std::vector<asio::const_buffer> buffers{1};
-                char buf[16384];
-                is.read(buf, sizeof(buf));
-                while (is.gcount() > 0)
-                {
-                    buffers[0] = asio::buffer(buf, is.gcount());
-                    do_write_sync(buffers);
-                    is.read(buf, sizeof(buf));
-                }
-            }
-            if (close_connection_)
-            {
-                adaptor_.shutdown_readwrite();
-                adaptor_.close();
-                CROW_LOG_DEBUG << this << " from write (static)";
-            }
-
-            res.end();
-            res.clear();
-            buffers_.clear();
-            parser_.clear();
-        }
-
-        void do_write_general()
-        {
-            if (res.body.length() < res_stream_threshold_)
-            {
-                res_body_copy_.swap(res.body);
-                buffers_.emplace_back(res_body_copy_.data(), res_body_copy_.size());
-
-                do_write();
-
-                if (need_to_start_read_after_complete_)
-                {
-                    need_to_start_read_after_complete_ = false;
-                    start_deadline();
-                    do_read();
-                }
-            }
-            else
-            {
-                asio::write(adaptor_.socket(), buffers_); // Write the response start / headers
-                cancel_deadline_timer();
-                if (res.body.length() > 0)
-                {
-                    std::vector<asio::const_buffer> buffers{1};
-                    const uint8_t *data = reinterpret_cast<const uint8_t*>(res.body.data());
-                    size_t length = res.body.length();
-                    for(size_t transferred = 0; transferred < length;)
-                    {
-                        size_t to_transfer = CROW_MIN(16384UL, length-transferred);
-                        buffers[0] = asio::const_buffer(data+transferred, to_transfer);
-                        do_write_sync(buffers);
-                        transferred += to_transfer;
-                    }
-                }
-                if (close_connection_)
-                {
-                    adaptor_.shutdown_readwrite();
-                    adaptor_.close();
-                    CROW_LOG_DEBUG << this << " from write (res_stream)";
-                }
-
-                res.end();
-                res.clear();
-                buffers_.clear();
-                parser_.clear();
-            }
-        }
-
-        void do_read()
-        {
-            auto self = this->shared_from_this();
-            adaptor_.socket().async_read_some(
-              asio::buffer(buffer_),
-              [self](const error_code& ec, std::size_t bytes_transferred) {
-                  bool error_while_reading = true;
-                  if (!ec)
-                  {
-                      bool ret = self->parser_.feed(self->buffer_.data(), bytes_transferred);
-                      if (ret && self->adaptor_.is_open())
-                      {
-                          error_while_reading = false;
-                      }
-                  }
-
-                  if (error_while_reading)
-                  {
-                      self->cancel_deadline_timer();
-                      self->parser_.done();
-                      self->adaptor_.shutdown_read();
-                      self->adaptor_.close();
-                      CROW_LOG_DEBUG << self << " from read(1) with description: \"" << http_errno_description(static_cast<http_errno>(self->parser_.http_errno)) << '\"';
-                  }
-                  else if (self->close_connection_)
-                  {
-                      self->cancel_deadline_timer();
-                      self->parser_.done();
-                      // adaptor will close after write
-                  }
-                  else if (!self->need_to_call_after_handlers_)
-                  {
-                      self->start_deadline();
-                      self->do_read();
-                  }
-                  else
-                  {
-                      // res will be completed later by user
-                      self->need_to_start_read_after_complete_ = true;
-                  }
-              });
-        }
-
-        void do_write()
-        {
-            auto self = this->shared_from_this();
-            asio::async_write(
-              adaptor_.socket(), buffers_,
-              [self](const error_code& ec, std::size_t /*bytes_transferred*/) {
-                  self->res.clear();
-                  self->res_body_copy_.clear();                  
-                  if (!self->continue_requested)
-                  {
-                      self->parser_.clear();
-                  }
-                  else
-                  {
-                      self->continue_requested = false;
-                  }
-                  
-                  if (!ec)
-                  {
-                      if (self->close_connection_)
-                      {
-                          self->adaptor_.shutdown_write();
-                          self->adaptor_.close();
-                          CROW_LOG_DEBUG << self << " from write(1)";
-                      }
-                  }
-                  else
-                  {
-                      CROW_LOG_DEBUG << self << " from write(2)";
-                  }
-              });
-        }
-
-        inline void do_write_sync(std::vector<asio::const_buffer>& buffers)
-        {
-
-            asio::write(adaptor_.socket(), buffers, [&](error_code ec, std::size_t) {
-                if (!ec)
-                {
-                    return false;
-                }
-                else
-                {
-                    CROW_LOG_ERROR << ec << " - happened while sending buffers";
-                    CROW_LOG_DEBUG << this << " from write (sync)(2)";
-                    return true;
-                }
-            });
-        }
-
-        void cancel_deadline_timer()
-        {
-            CROW_LOG_DEBUG << this << " timer cancelled: " << &task_timer_ << ' ' << task_id_;
-            task_timer_.cancel(task_id_);
-        }
-
-        void start_deadline(/*int timeout = 5*/)
-        {
-            cancel_deadline_timer();
-
-            auto self = this->shared_from_this();
-            task_id_ = task_timer_.schedule([self] {
-                if (!self->adaptor_.is_open())
-                {
-                    return;
-                }
-                self->adaptor_.shutdown_readwrite();
-                self->adaptor_.close();
-            });
-            CROW_LOG_DEBUG << this << " timer added: " << &task_timer_ << ' ' << task_id_;
-        }
-
-    private:
-        Adaptor adaptor_;
-        Handler* handler_;
-
-        std::array<char, 4096> buffer_;
-
-        HTTPParser<Connection> parser_;
-        std::unique_ptr<routing_handle_result> routing_handle_result_;
-        request& req_;
-        response res;
-
-        bool close_connection_ = false;
-
-        const std::string& server_name_;
-        std::vector<asio::const_buffer> buffers_;
-
-        std::string content_length_;
-        std::string date_str_;
-        std::string res_body_copy_;
-
-        detail::task_timer::identifier_type task_id_{};
-
-        bool continue_requested{};
-        bool need_to_call_after_handlers_{};
-        bool need_to_start_read_after_complete_{};
-        bool add_keep_alive_{};
-
-        std::tuple<Middlewares...>* middlewares_;
-        detail::context<Middlewares...> ctx_;
-
-        std::function<std::string()>& get_cached_date_str;
-        detail::task_timer& task_timer_;
-
-        size_t res_stream_threshold_;
-
-        std::atomic<unsigned int>& queue_length_;
-    };
-
-} // namespace crow
-
-#include <array>
-
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-#ifdef CROW_USE_BOOST
-    namespace asio = boost::asio;
-    using error_code = boost::system::error_code;
-#else
-    using error_code = asio::error_code;
-#endif
-
-    /**
-     * \namespace crow::websocket
-     * \brief Namespace that includes the \ref Connection class
-     * and \ref connection struct. Useful for WebSockets connection.
-     *
-     * Used specially in crow/websocket.h, crow/app.h and crow/routing.h
-     */
-    namespace websocket
-    {
-        enum class WebSocketReadState
-        {
-            MiniHeader,
-            Len16,
-            Len64,
-            Mask,
-            Payload,
-        };
-
-        /// A base class for websocket connection.
-        struct connection
-        {
-            virtual void send_binary(std::string msg) = 0;
-            virtual void send_text(std::string msg) = 0;
-            virtual void send_ping(std::string msg) = 0;
-            virtual void send_pong(std::string msg) = 0;
-            virtual void close(std::string const& msg = "quit") = 0;
-            virtual std::string get_remote_ip() = 0;
-            virtual ~connection() = default;
-
-            void userdata(void* u) { userdata_ = u; }
-            void* userdata() { return userdata_; }
-
-        private:
-            void* userdata_;
-        };
-
-        // Modified version of the illustration in RFC6455 Section-5.2
-        //
-        //
-        //  0               1               2               3               -byte
-        //  0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 -bit
-        // +-+-+-+-+-------+-+-------------+-------------------------------+
-        // |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
-        // |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
-        // |N|V|V|V|       |S|             |   (if payload len==126/127)   |
-        // | |1|2|3|       |K|             |                               |
-        // +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
-        // |     Extended payload length continued, if payload len == 127  |
-        // + - - - - - - - - - - - - - - - +-------------------------------+
-        // |                               |Masking-key, if MASK set to 1  |
-        // +-------------------------------+-------------------------------+
-        // | Masking-key (continued)       |          Payload Data         |
-        // +-------------------------------- - - - - - - - - - - - - - - - +
-        // :                     Payload Data continued ...                :
-        // + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
-        // |                     Payload Data continued ...                |
-        // +---------------------------------------------------------------+
-        //
-
-        /// A websocket connection.
-
-        template<typename Adaptor, typename Handler>
-        class Connection : public connection
-        {
-        public:
-            /// Constructor for a connection.
-
-            ///
-            /// Requires a request with an "Upgrade: websocket" header.<br>
-            /// Automatically handles the handshake.
-            Connection(const crow::request& req, Adaptor&& adaptor, Handler* handler, uint64_t max_payload,
-                       std::function<void(crow::websocket::connection&)> open_handler,
-                       std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler,
-                       std::function<void(crow::websocket::connection&, const std::string&)> close_handler,
-                       std::function<void(crow::websocket::connection&, const std::string&)> error_handler,
-                       std::function<bool(const crow::request&, void**)> accept_handler):
-              adaptor_(std::move(adaptor)),
-              handler_(handler),
-              max_payload_bytes_(max_payload),
-              open_handler_(std::move(open_handler)),
-              message_handler_(std::move(message_handler)),
-              close_handler_(std::move(close_handler)),
-              error_handler_(std::move(error_handler)),
-              accept_handler_(std::move(accept_handler))
-            {
-                if (!utility::string_equals(req.get_header_value("upgrade"), "websocket"))
-                {
-                    adaptor_.close();
-                    handler_->remove_websocket(this);
-                    delete this;
-                    return;
-                }
-
-                if (accept_handler_)
-                {
-                    void* ud = nullptr;
-                    if (!accept_handler_(req, &ud))
-                    {
-                        adaptor_.close();
-                        handler_->remove_websocket(this);
-                        delete this;
-                        return;
-                    }
-                    userdata(ud);
-                }
-
-                // Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-                // Sec-WebSocket-Version: 13
-                std::string magic = req.get_header_value("Sec-WebSocket-Key") + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-                sha1::SHA1 s;
-                s.processBytes(magic.data(), magic.size());
-                uint8_t digest[20];
-                s.getDigestBytes(digest);
-
-                start(crow::utility::base64encode((unsigned char*)digest, 20));
-            }
-
-            ~Connection() noexcept override
-            {
-                // Do not modify anchor_ here since writing shared_ptr is not atomic.
-                auto watch = std::weak_ptr<void>{anchor_};
-
-                // Wait until all unhandled asynchronous operations to join.
-                // As the deletion occurs inside 'check_destroy()', which already locks
-                //  anchor, use count can be 1 on valid deletion context.
-                while (watch.use_count() > 2) // 1 for 'check_destroy() routine', 1 for 'this->anchor_'
-                {
-                    std::this_thread::yield();
-                }
-            }
-
-            template<typename Callable>
-            struct WeakWrappedMessage
-            {
-                Callable callable;
-                std::weak_ptr<void> watch;
-
-                void operator()()
-                {
-                    if (auto anchor = watch.lock())
-                    {
-                        std::move(callable)();
-                    }
-                }
-            };
-
-            /// Send data through the socket.
-            template<typename CompletionHandler>
-            void dispatch(CompletionHandler&& handler)
-            {
-                asio::dispatch(adaptor_.get_io_service(),
-                               WeakWrappedMessage<typename std::decay<CompletionHandler>::type>{
-                                 std::forward<CompletionHandler>(handler), anchor_});
-            }
-
-            /// Send data through the socket and return immediately.
-            template<typename CompletionHandler>
-            void post(CompletionHandler&& handler)
-            {
-                asio::post(adaptor_.get_io_service(),
-                           WeakWrappedMessage<typename std::decay<CompletionHandler>::type>{
-                             std::forward<CompletionHandler>(handler), anchor_});
-            }
-
-            /// Send a "Ping" message.
-
-            ///
-            /// Usually invoked to check if the other point is still online.
-            void send_ping(std::string msg) override
-            {
-                send_data(0x9, std::move(msg));
-            }
-
-            /// Send a "Pong" message.
-
-            ///
-            /// Usually automatically invoked as a response to a "Ping" message.
-            void send_pong(std::string msg) override
-            {
-                send_data(0xA, std::move(msg));
-            }
-
-            /// Send a binary encoded message.
-            void send_binary(std::string msg) override
-            {
-                send_data(0x2, std::move(msg));
-            }
-
-            /// Send a plaintext message.
-            void send_text(std::string msg) override
-            {
-                send_data(0x1, std::move(msg));
-            }
-
-            /// Send a close signal.
-
-            ///
-            /// Sets a flag to destroy the object once the message is sent.
-            void close(std::string const& msg) override
-            {
-                dispatch([this, msg]() mutable {
-                    has_sent_close_ = true;
-                    if (has_recv_close_ && !is_close_handler_called_)
-                    {
-                        is_close_handler_called_ = true;
-                        if (close_handler_)
-                            close_handler_(*this, msg);
-                    }
-                    auto header = build_header(0x8, msg.size());
-                    write_buffers_.emplace_back(std::move(header));
-                    write_buffers_.emplace_back(msg);
-                    do_write();
-                });
-            }
-
-            std::string get_remote_ip() override
-            {
-                return adaptor_.remote_endpoint().address().to_string();
-            }
-
-            void set_max_payload_size(uint64_t payload)
-            {
-                max_payload_bytes_ = payload;
-            }
-
-        protected:
-            /// Generate the websocket headers using an opcode and the message size (in bytes).
-            std::string build_header(int opcode, size_t size)
-            {
-                char buf[2 + 8] = "\x80\x00";
-                buf[0] += opcode;
-                if (size < 126)
-                {
-                    buf[1] += static_cast<char>(size);
-                    return {buf, buf + 2};
-                }
-                else if (size < 0x10000)
-                {
-                    buf[1] += 126;
-                    *(uint16_t*)(buf + 2) = htons(static_cast<uint16_t>(size));
-                    return {buf, buf + 4};
-                }
-                else
-                {
-                    buf[1] += 127;
-                    *reinterpret_cast<uint64_t*>(buf + 2) = ((1 == htonl(1)) ? static_cast<uint64_t>(size) : (static_cast<uint64_t>(htonl((size)&0xFFFFFFFF)) << 32) | htonl(static_cast<uint64_t>(size) >> 32));
-                    return {buf, buf + 10};
-                }
-            }
-
-            /// Send the HTTP upgrade response.
-
-            ///
-            /// Finishes the handshake process, then starts reading messages from the socket.
-            void start(std::string&& hello)
-            {
-                static const std::string header =
-                  "HTTP/1.1 101 Switching Protocols\r\n"
-                  "Upgrade: websocket\r\n"
-                  "Connection: Upgrade\r\n"
-                  "Sec-WebSocket-Accept: ";
-                write_buffers_.emplace_back(header);
-                write_buffers_.emplace_back(std::move(hello));
-                write_buffers_.emplace_back(crlf);
-                write_buffers_.emplace_back(crlf);
-                do_write();
-                if (open_handler_)
-                    open_handler_(*this);
-                do_read();
-            }
-
-            /// Read a websocket message.
-
-            ///
-            /// Involves:<br>
-            /// Handling headers (opcodes, size).<br>
-            /// Unmasking the payload.<br>
-            /// Reading the actual payload.<br>
-            void do_read()
-            {
-                if (has_sent_close_ && has_recv_close_)
-                {
-                    close_connection_ = true;
-                    adaptor_.shutdown_readwrite();
-                    adaptor_.close();
-                    check_destroy();
-                    return;
-                }
-
-                is_reading = true;
-                switch (state_)
-                {
-                    case WebSocketReadState::MiniHeader:
-                    {
-                        mini_header_ = 0;
-                        //asio::async_read(adaptor_.socket(), asio::buffer(&mini_header_, 1),
-                        adaptor_.socket().async_read_some(
-                          asio::buffer(&mini_header_, 2),
-                          [this](const error_code& ec, std::size_t
-#ifdef CROW_ENABLE_DEBUG
-                                                               bytes_transferred
-#endif
-                          )
-
-                          {
-                              is_reading = false;
-                              mini_header_ = ntohs(mini_header_);
-#ifdef CROW_ENABLE_DEBUG
-
-                              if (!ec && bytes_transferred != 2)
-                              {
-                                  throw std::runtime_error("WebSocket:MiniHeader:async_read fail:asio bug?");
-                              }
-#endif
-
-                              if (!ec)
-                              {
-                                  if ((mini_header_ & 0x80) == 0x80)
-                                      has_mask_ = true;
-                                  else //if the websocket specification is enforced and the message isn't masked, terminate the connection
-                                  {
-#ifndef CROW_ENFORCE_WS_SPEC
-                                      has_mask_ = false;
-#else
-                                      close_connection_ = true;
-                                      adaptor_.shutdown_readwrite();
-                                      adaptor_.close();
-                                      if (error_handler_)
-                                          error_handler_(*this, "Client connection not masked.");
-                                      check_destroy();
-#endif
-                                  }
-
-                                  if ((mini_header_ & 0x7f) == 127)
-                                  {
-                                      state_ = WebSocketReadState::Len64;
-                                  }
-                                  else if ((mini_header_ & 0x7f) == 126)
-                                  {
-                                      state_ = WebSocketReadState::Len16;
-                                  }
-                                  else
-                                  {
-                                      remaining_length_ = mini_header_ & 0x7f;
-                                      state_ = WebSocketReadState::Mask;
-                                  }
-                                  do_read();
-                              }
-                              else
-                              {
-                                  close_connection_ = true;
-                                  adaptor_.shutdown_readwrite();
-                                  adaptor_.close();
-                                  if (error_handler_)
-                                      error_handler_(*this, ec.message());
-                                  check_destroy();
-                              }
-                          });
-                    }
-                    break;
-                    case WebSocketReadState::Len16:
-                    {
-                        remaining_length_ = 0;
-                        remaining_length16_ = 0;
-                        asio::async_read(
-                          adaptor_.socket(), asio::buffer(&remaining_length16_, 2),
-                          [this](const error_code& ec, std::size_t
-#ifdef CROW_ENABLE_DEBUG
-                                                               bytes_transferred
-#endif
-                          ) {
-                              is_reading = false;
-                              remaining_length16_ = ntohs(remaining_length16_);
-                              remaining_length_ = remaining_length16_;
-#ifdef CROW_ENABLE_DEBUG
-                              if (!ec && bytes_transferred != 2)
-                              {
-                                  throw std::runtime_error("WebSocket:Len16:async_read fail:asio bug?");
-                              }
-#endif
-
-                              if (!ec)
-                              {
-                                  state_ = WebSocketReadState::Mask;
-                                  do_read();
-                              }
-                              else
-                              {
-                                  close_connection_ = true;
-                                  adaptor_.shutdown_readwrite();
-                                  adaptor_.close();
-                                  if (error_handler_)
-                                      error_handler_(*this, ec.message());
-                                  check_destroy();
-                              }
-                          });
-                    }
-                    break;
-                    case WebSocketReadState::Len64:
-                    {
-                        asio::async_read(
-                          adaptor_.socket(), asio::buffer(&remaining_length_, 8),
-                          [this](const error_code& ec, std::size_t
-#ifdef CROW_ENABLE_DEBUG
-                                                               bytes_transferred
-#endif
-                          ) {
-                              is_reading = false;
-                              remaining_length_ = ((1 == ntohl(1)) ? (remaining_length_) : (static_cast<uint64_t>(ntohl((remaining_length_)&0xFFFFFFFF)) << 32) | ntohl((remaining_length_) >> 32));
-#ifdef CROW_ENABLE_DEBUG
-                              if (!ec && bytes_transferred != 8)
-                              {
-                                  throw std::runtime_error("WebSocket:Len16:async_read fail:asio bug?");
-                              }
-#endif
-
-                              if (!ec)
-                              {
-                                  state_ = WebSocketReadState::Mask;
-                                  do_read();
-                              }
-                              else
-                              {
-                                  close_connection_ = true;
-                                  adaptor_.shutdown_readwrite();
-                                  adaptor_.close();
-                                  if (error_handler_)
-                                      error_handler_(*this, ec.message());
-                                  check_destroy();
-                              }
-                          });
-                    }
-                    break;
-                    case WebSocketReadState::Mask:
-                        if (remaining_length_ > max_payload_bytes_)
-                        {
-                            close_connection_ = true;
-                            adaptor_.close();
-                            if (error_handler_)
-                                error_handler_(*this, "Message length exceeds maximum payload.");
-                            check_destroy();
-                        }
-                        else if (has_mask_)
-                        {
-                            asio::async_read(
-                              adaptor_.socket(), asio::buffer((char*)&mask_, 4),
-                              [this](const error_code& ec, std::size_t
-#ifdef CROW_ENABLE_DEBUG
-                                                                   bytes_transferred
-#endif
-                              ) {
-                                  is_reading = false;
-#ifdef CROW_ENABLE_DEBUG
-                                  if (!ec && bytes_transferred != 4)
-                                  {
-                                      throw std::runtime_error("WebSocket:Mask:async_read fail:asio bug?");
-                                  }
-#endif
-
-                                  if (!ec)
-                                  {
-                                      state_ = WebSocketReadState::Payload;
-                                      do_read();
-                                  }
-                                  else
-                                  {
-                                      close_connection_ = true;
-                                      if (error_handler_)
-                                          error_handler_(*this, ec.message());
-                                      adaptor_.shutdown_readwrite();
-                                      adaptor_.close();
-                                      check_destroy();
-                                  }
-                              });
-                        }
-                        else
-                        {
-                            state_ = WebSocketReadState::Payload;
-                            do_read();
-                        }
-                        break;
-                    case WebSocketReadState::Payload:
-                    {
-                        auto to_read = static_cast<std::uint64_t>(buffer_.size());
-                        if (remaining_length_ < to_read)
-                            to_read = remaining_length_;
-                        adaptor_.socket().async_read_some(
-                          asio::buffer(buffer_, static_cast<std::size_t>(to_read)),
-                          [this](const error_code& ec, std::size_t bytes_transferred) {
-                              is_reading = false;
-
-                              if (!ec)
-                              {
-                                  fragment_.insert(fragment_.end(), buffer_.begin(), buffer_.begin() + bytes_transferred);
-                                  remaining_length_ -= bytes_transferred;
-                                  if (remaining_length_ == 0)
-                                  {
-                                      if (handle_fragment())
-                                      {
-                                          state_ = WebSocketReadState::MiniHeader;
-                                          do_read();
-                                      }
-                                  }
-                                  else
-                                      do_read();
-                              }
-                              else
-                              {
-                                  close_connection_ = true;
-                                  if (error_handler_)
-                                      error_handler_(*this, ec.message());
-                                  adaptor_.shutdown_readwrite();
-                                  adaptor_.close();
-                                  check_destroy();
-                              }
-                          });
-                    }
-                    break;
-                }
-            }
-
-            /// Check if the FIN bit is set.
-            bool is_FIN()
-            {
-                return mini_header_ & 0x8000;
-            }
-
-            /// Extract the opcode from the header.
-            int opcode()
-            {
-                return (mini_header_ & 0x0f00) >> 8;
-            }
-
-            /// Process the payload fragment.
-
-            ///
-            /// Unmasks the fragment, checks the opcode, merges fragments into 1 message body, and calls the appropriate handler.
-            bool handle_fragment()
-            {
-                if (has_mask_)
-                {
-                    for (decltype(fragment_.length()) i = 0; i < fragment_.length(); i++)
-                    {
-                        fragment_[i] ^= ((char*)&mask_)[i % 4];
-                    }
-                }
-                switch (opcode())
-                {
-                    case 0: // Continuation
-                    {
-                        message_ += fragment_;
-                        if (is_FIN())
-                        {
-                            if (message_handler_)
-                                message_handler_(*this, message_, is_binary_);
-                            message_.clear();
-                        }
-                    }
-                    break;
-                    case 1: // Text
-                    {
-                        is_binary_ = false;
-                        message_ += fragment_;
-                        if (is_FIN())
-                        {
-                            if (message_handler_)
-                                message_handler_(*this, message_, is_binary_);
-                            message_.clear();
-                        }
-                    }
-                    break;
-                    case 2: // Binary
-                    {
-                        is_binary_ = true;
-                        message_ += fragment_;
-                        if (is_FIN())
-                        {
-                            if (message_handler_)
-                                message_handler_(*this, message_, is_binary_);
-                            message_.clear();
-                        }
-                    }
-                    break;
-                    case 0x8: // Close
-                    {
-                        has_recv_close_ = true;
-                        if (!has_sent_close_)
-                        {
-                            close(fragment_);
-                        }
-                        else
-                        {
-                            adaptor_.shutdown_readwrite();
-                            adaptor_.close();
-                            close_connection_ = true;
-                            if (!is_close_handler_called_)
-                            {
-                                if (close_handler_)
-                                    close_handler_(*this, fragment_);
-                                is_close_handler_called_ = true;
-                            }
-                            check_destroy();
-                            return false;
-                        }
-                    }
-                    break;
-                    case 0x9: // Ping
-                    {
-                        send_pong(fragment_);
-                    }
-                    break;
-                    case 0xA: // Pong
-                    {
-                        pong_received_ = true;
-                    }
-                    break;
-                }
-
-                fragment_.clear();
-                return true;
-            }
-
-            /// Send the buffers' data through the socket.
-
-            ///
-            /// Also destroys the object if the Close flag is set.
-            void do_write()
-            {
-                if (sending_buffers_.empty())
-                {
-                    sending_buffers_.swap(write_buffers_);
-                    std::vector<asio::const_buffer> buffers;
-                    buffers.reserve(sending_buffers_.size());
-                    for (auto& s : sending_buffers_)
-                    {
-                        buffers.emplace_back(asio::buffer(s));
-                    }
-                    auto watch = std::weak_ptr<void>{anchor_};
-                    asio::async_write(
-                      adaptor_.socket(), buffers,
-                      [&, watch](const error_code& ec, std::size_t /*bytes_transferred*/) {
-                          if (!ec && !close_connection_)
-                          {
-                              sending_buffers_.clear();
-                              if (!write_buffers_.empty())
-                                  do_write();
-                              if (has_sent_close_)
-                                  close_connection_ = true;
-                          }
-                          else
-                          {
-                              auto anchor = watch.lock();
-                              if (anchor == nullptr) { return; }
-
-                              sending_buffers_.clear();
-                              close_connection_ = true;
-                              check_destroy();
-                          }
-                      });
-                }
-            }
-
-            /// Destroy the Connection.
-            void check_destroy()
-            {
-                //if (has_sent_close_ && has_recv_close_)
-                if (!is_close_handler_called_)
-                    if (close_handler_)
-                        close_handler_(*this, "uncleanly");
-                handler_->remove_websocket(this);
-                if (sending_buffers_.empty() && !is_reading)
-                    delete this;
-            }
-
-
-            struct SendMessageType
-            {
-                std::string payload;
-                Connection* self;
-                int opcode;
-
-                void operator()()
-                {
-                    self->send_data_impl(this);
-                }
-            };
-
-            void send_data_impl(SendMessageType* s)
-            {
-                auto header = build_header(s->opcode, s->payload.size());
-                write_buffers_.emplace_back(std::move(header));
-                write_buffers_.emplace_back(std::move(s->payload));
-                do_write();
-            }
-
-            void send_data(int opcode, std::string&& msg)
-            {
-                SendMessageType event_arg{
-                  std::move(msg),
-                  this,
-                  opcode};
-
-                post(std::move(event_arg));
-            }
-
-        private:
-            Adaptor adaptor_;
-            Handler* handler_;
-
-            std::vector<std::string> sending_buffers_;
-            std::vector<std::string> write_buffers_;
-
-            std::array<char, 4096> buffer_;
-            bool is_binary_;
-            std::string message_;
-            std::string fragment_;
-            WebSocketReadState state_{WebSocketReadState::MiniHeader};
-            uint16_t remaining_length16_{0};
-            uint64_t remaining_length_{0};
-            uint64_t max_payload_bytes_{UINT64_MAX};
-            bool close_connection_{false};
-            bool is_reading{false};
-            bool has_mask_{false};
-            uint32_t mask_;
-            uint16_t mini_header_;
-            bool has_sent_close_{false};
-            bool has_recv_close_{false};
-            bool error_occurred_{false};
-            bool pong_received_{false};
-            bool is_close_handler_called_{false};
-
-            std::shared_ptr<void> anchor_ = std::make_shared<int>(); // Value is just for placeholding
-
-            std::function<void(crow::websocket::connection&)> open_handler_;
-            std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler_;
-            std::function<void(crow::websocket::connection&, const std::string&)> close_handler_;
-            std::function<void(crow::websocket::connection&, const std::string&)> error_handler_;
-            std::function<bool(const crow::request&, void**)> accept_handler_;
-        };
-    } // namespace websocket
-} // namespace crow
-
-
-namespace crow
-{
-    constexpr const char VERSION[] = "master";
-}
-
-
-#ifdef CROW_USE_BOOST
-#include <boost/asio.hpp>
-#ifdef CROW_ENABLE_SSL
-#include <boost/asio/ssl.hpp>
-#endif
-#else
-#ifndef ASIO_STANDALONE
-#define ASIO_STANDALONE
-#endif
-#include <asio.hpp>
-#ifdef CROW_ENABLE_SSL
-#include <asio/ssl.hpp>
-#endif
-#endif
-
-#include <atomic>
-#include <chrono>
-#include <cstdint>
-#include <future>
-#include <memory>
-#include <vector>
-
-
-
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-#ifdef CROW_USE_BOOST
-    namespace asio = boost::asio;
-    using error_code = boost::system::error_code;
-#else
-    using error_code = asio::error_code;
-#endif
-    using tcp = asio::ip::tcp;
-
-    template<typename Handler, typename Adaptor = SocketAdaptor, typename... Middlewares>
-    class Server
-    {
-    public:
-        Server(Handler* handler, std::string bindaddr, uint16_t port, std::string server_name = std::string("Crow/") + VERSION, std::tuple<Middlewares...>* middlewares = nullptr, uint16_t concurrency = 1, uint8_t timeout = 5, typename Adaptor::context* adaptor_ctx = nullptr):
-          acceptor_(io_service_, tcp::endpoint(asio::ip::address::from_string(bindaddr), port)),
-          signals_(io_service_),
-          tick_timer_(io_service_),
-          handler_(handler),
-          concurrency_(concurrency),
-          timeout_(timeout),
-          server_name_(server_name),
-          port_(port),
-          bindaddr_(bindaddr),
-          task_queue_length_pool_(concurrency_ - 1),
-          middlewares_(middlewares),
-          adaptor_ctx_(adaptor_ctx)
-        {}
-
-        void set_tick_function(std::chrono::milliseconds d, std::function<void()> f)
-        {
-            tick_interval_ = d;
-            tick_function_ = f;
-        }
-
-        void on_tick()
-        {
-            tick_function_();
-            tick_timer_.expires_after(std::chrono::milliseconds(tick_interval_.count()));
-            tick_timer_.async_wait([this](const error_code& ec) {
-                if (ec)
-                    return;
-                on_tick();
-            });
-        }
-
-        void run()
-        {
-            uint16_t worker_thread_count = concurrency_ - 1;
-            for (int i = 0; i < worker_thread_count; i++)
-                io_service_pool_.emplace_back(new asio::io_service());
-            get_cached_date_str_pool_.resize(worker_thread_count);
-            task_timer_pool_.resize(worker_thread_count);
-
-            std::vector<std::future<void>> v;
-            std::atomic<int> init_count(0);
-            for (uint16_t i = 0; i < worker_thread_count; i++)
-                v.push_back(
-                  std::async(
-                    std::launch::async, [this, i, &init_count] {
-                        // thread local date string get function
-                        auto last = std::chrono::steady_clock::now();
-
-                        std::string date_str;
-                        auto update_date_str = [&] {
-                            auto last_time_t = time(0);
-                            tm my_tm;
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-                            gmtime_s(&my_tm, &last_time_t);
-#else
-                            gmtime_r(&last_time_t, &my_tm);
-#endif
-                            date_str.resize(100);
-                            size_t date_str_sz = strftime(&date_str[0], 99, "%a, %d %b %Y %H:%M:%S GMT", &my_tm);
-                            date_str.resize(date_str_sz);
-                        };
-                        update_date_str();
-                        get_cached_date_str_pool_[i] = [&]() -> std::string {
-                            if (std::chrono::steady_clock::now() - last >= std::chrono::seconds(1))
-                            {
-                                last = std::chrono::steady_clock::now();
-                                update_date_str();
-                            }
-                            return date_str;
-                        };
-
-                        // initializing task timers
-                        detail::task_timer task_timer(*io_service_pool_[i]);
-                        task_timer.set_default_timeout(timeout_);
-                        task_timer_pool_[i] = &task_timer;
-                        task_queue_length_pool_[i] = 0;
-
-                        init_count++;
-                        while (1)
-                        {
-                            try
-                            {
-                                if (io_service_pool_[i]->run() == 0)
-                                {
-                                    // when io_service.run returns 0, there are no more works to do.
-                                    break;
-                                }
-                            }
-                            catch (std::exception& e)
-                            {
-                                CROW_LOG_ERROR << "Worker Crash: An uncaught exception occurred: " << e.what();
-                            }
-                        }
-                    }));
-
-            if (tick_function_ && tick_interval_.count() > 0)
-            {
-                tick_timer_.expires_after(std::chrono::milliseconds(tick_interval_.count()));
-                tick_timer_.async_wait(
-                  [this](const error_code& ec) {
-                      if (ec)
-                          return;
-                      on_tick();
-                  });
-            }
-
-            port_ = acceptor_.local_endpoint().port();
-            handler_->port(port_);
-
-
-            CROW_LOG_INFO << server_name_ << " server is running at " << (handler_->ssl_used() ? "https://" : "http://") << bindaddr_ << ":" << acceptor_.local_endpoint().port() << " using " << concurrency_ << " threads";
-            CROW_LOG_INFO << "Call `app.loglevel(crow::LogLevel::Warning)` to hide Info level logs.";
-
-            signals_.async_wait(
-              [&](const error_code& /*error*/, int /*signal_number*/) {
-                  stop();
-              });
-
-            while (worker_thread_count != init_count)
-                std::this_thread::yield();
-
-            do_accept();
-
-            std::thread(
-              [this] {
-                  notify_start();
-                  io_service_.run();
-                  CROW_LOG_INFO << "Exiting.";
-              })
-              .join();
-        }
-
-        void stop()
-        {
-            shutting_down_ = true; // Prevent the acceptor from taking new connections
-            for (auto& io_service : io_service_pool_)
-            {
-                if (io_service != nullptr)
-                {
-                    CROW_LOG_INFO << "Closing IO service " << &io_service;
-                    io_service->stop(); // Close all io_services (and HTTP connections)
-                }
-            }
-
-            CROW_LOG_INFO << "Closing main IO service (" << &io_service_ << ')';
-            io_service_.stop(); // Close main io_service
-        }
-
-        /// Wait until the server has properly started
-        void wait_for_start()
-        {
-            std::unique_lock<std::mutex> lock(start_mutex_);
-            if (!server_started_)
-                cv_started_.wait(lock);
-        }
-
-        void signal_clear()
-        {
-            signals_.clear();
-        }
-
-        void signal_add(int signal_number)
-        {
-            signals_.add(signal_number);
-        }
-
-    private:
-        uint16_t pick_io_service_idx()
-        {
-            uint16_t min_queue_idx = 0;
-
-            // TODO improve load balancing
-            // size_t is used here to avoid the security issue https://codeql.github.com/codeql-query-help/cpp/cpp-comparison-with-wider-type/
-            // even though the max value of this can be only uint16_t as concurrency is uint16_t.
-            for (size_t i = 1; i < task_queue_length_pool_.size() && task_queue_length_pool_[min_queue_idx] > 0; i++)
-            // No need to check other io_services if the current one has no tasks
-            {
-                if (task_queue_length_pool_[i] < task_queue_length_pool_[min_queue_idx])
-                    min_queue_idx = i;
-            }
-            return min_queue_idx;
-        }
-
-        void do_accept()
-        {
-            if (!shutting_down_)
-            {
-                uint16_t service_idx = pick_io_service_idx();
-                asio::io_service& is = *io_service_pool_[service_idx];
-                task_queue_length_pool_[service_idx]++;
-                CROW_LOG_DEBUG << &is << " {" << service_idx << "} queue length: " << task_queue_length_pool_[service_idx];
-
-                auto p = std::make_shared<Connection<Adaptor, Handler, Middlewares...>>(
-                  is, handler_, server_name_, middlewares_,
-                  get_cached_date_str_pool_[service_idx], *task_timer_pool_[service_idx], adaptor_ctx_, task_queue_length_pool_[service_idx]);
-
-                acceptor_.async_accept(
-                  p->socket(),
-                  [this, p, &is, service_idx](error_code ec) {
-                      if (!ec)
-                      {
-                          is.post(
-                            [p] {
-                                p->start();
-                            });
-                      }
-                      else
-                      {
-                          task_queue_length_pool_[service_idx]--;
-                          CROW_LOG_DEBUG << &is << " {" << service_idx << "} queue length: " << task_queue_length_pool_[service_idx];
-                      }
-                      do_accept();
-                  });
-            }
-        }
-
-        /// Notify anything using `wait_for_start()` to proceed
-        void notify_start()
-        {
-            std::unique_lock<std::mutex> lock(start_mutex_);
-            server_started_ = true;
-            cv_started_.notify_all();
-        }
-
-    private:
-        std::vector<std::unique_ptr<asio::io_service>> io_service_pool_;
-        asio::io_service io_service_;
-        std::vector<detail::task_timer*> task_timer_pool_;
-        std::vector<std::function<std::string()>> get_cached_date_str_pool_;
-        tcp::acceptor acceptor_;
-        bool shutting_down_ = false;
-        bool server_started_{false};
-        std::condition_variable cv_started_;
-        std::mutex start_mutex_;
-        asio::signal_set signals_;
-
-        asio::basic_waitable_timer<std::chrono::high_resolution_clock> tick_timer_;
-
-        Handler* handler_;
-        uint16_t concurrency_{2};
-        std::uint8_t timeout_;
-        std::string server_name_;
-        uint16_t port_;
-        std::string bindaddr_;
-        std::vector<std::atomic<unsigned int>> task_queue_length_pool_;
-
-        std::chrono::milliseconds tick_interval_;
-        std::function<void()> tick_function_;
-
-        std::tuple<Middlewares...>* middlewares_;
-
-        typename Adaptor::context* adaptor_ctx_;
-    };
-} // namespace crow
-
-#include <string>
-#include <vector>
-#include <fstream>
-#include <iterator>
-#include <functional>
-
-namespace crow
-{
-    namespace mustache
-    {
-        using context = json::wvalue;
-
-        template_t load(const std::string& filename);
-
-        class invalid_template_exception : public std::exception
-        {
-        public:
-            invalid_template_exception(const std::string& msg):
-              msg("crow::mustache error: " + msg)
-            {}
-            virtual const char* what() const throw()
-            {
-                return msg.c_str();
-            }
-            std::string msg;
-        };
-
-        struct rendered_template : returnable
-        {
-            rendered_template():
-              returnable("text/html") {}
-
-            rendered_template(std::string& body):
-              returnable("text/html"), body_(std::move(body)) {}
-
-            std::string body_;
-
-            std::string dump() const override
-            {
-                return body_;
-            }
-        };
-
-        enum class ActionType
-        {
-            Ignore,
-            Tag,
-            UnescapeTag,
-            OpenBlock,
-            CloseBlock,
-            ElseBlock,
-            Partial,
-        };
-
-        struct Action
-        {
-            int start;
-            int end;
-            int pos;
-            ActionType t;
-            Action(ActionType t, size_t start, size_t end, size_t pos = 0):
-              start(static_cast<int>(start)), end(static_cast<int>(end)), pos(static_cast<int>(pos)), t(t)
-            {
-            }
-        };
-
-        /// A mustache template object.
-        class template_t
-        {
-        public:
-            template_t(std::string body):
-              body_(std::move(body))
-            {
-                // {{ {{# {{/ {{^ {{! {{> {{=
-                parse();
-            }
-
-        private:
-            std::string tag_name(const Action& action) const
-            {
-                return body_.substr(action.start, action.end - action.start);
-            }
-            auto find_context(const std::string& name, const std::vector<const context*>& stack, bool shouldUseOnlyFirstStackValue = false) const -> std::pair<bool, const context&>
-            {
-                if (name == ".")
-                {
-                    return {true, *stack.back()};
-                }
-                static json::wvalue empty_str;
-                empty_str = "";
-
-                int dotPosition = name.find(".");
-                if (dotPosition == static_cast<int>(name.npos))
-                {
-                    for (auto it = stack.rbegin(); it != stack.rend(); ++it)
-                    {
-                        if ((*it)->t() == json::type::Object)
-                        {
-                            if ((*it)->count(name))
-                                return {true, (**it)[name]};
-                        }
-                    }
-                }
-                else
-                {
-                    std::vector<int> dotPositions;
-                    dotPositions.push_back(-1);
-                    while (dotPosition != static_cast<int>(name.npos))
-                    {
-                        dotPositions.push_back(dotPosition);
-                        dotPosition = name.find(".", dotPosition + 1);
-                    }
-                    dotPositions.push_back(name.size());
-                    std::vector<std::string> names;
-                    names.reserve(dotPositions.size() - 1);
-                    for (int i = 1; i < static_cast<int>(dotPositions.size()); i++)
-                        names.emplace_back(name.substr(dotPositions[i - 1] + 1, dotPositions[i] - dotPositions[i - 1] - 1));
-
-                    for (auto it = stack.rbegin(); it != stack.rend(); ++it)
-                    {
-                        const context* view = *it;
-                        bool found = true;
-                        for (auto jt = names.begin(); jt != names.end(); ++jt)
-                        {
-                            if (view->t() == json::type::Object &&
-                                view->count(*jt))
-                            {
-                                view = &(*view)[*jt];
-                            }
-                            else
-                            {
-                                if (shouldUseOnlyFirstStackValue)
-                                {
-                                    return {false, empty_str};
-                                }
-                                found = false;
-                                break;
-                            }
-                        }
-                        if (found)
-                            return {true, *view};
-                    }
-                }
-
-                return {false, empty_str};
-            }
-
-            void escape(const std::string& in, std::string& out) const
-            {
-                out.reserve(out.size() + in.size());
-                for (auto it = in.begin(); it != in.end(); ++it)
-                {
-                    switch (*it)
-                    {
-                        case '&': out += "&amp;"; break;
-                        case '<': out += "&lt;"; break;
-                        case '>': out += "&gt;"; break;
-                        case '"': out += "&quot;"; break;
-                        case '\'': out += "&#39;"; break;
-                        case '/': out += "&#x2F;"; break;
-                        case '`': out += "&#x60;"; break;
-                        case '=': out += "&#x3D;"; break;
-                        default: out += *it; break;
-                    }
-                }
-            }
-
-            bool isTagInsideObjectBlock(const int& current, const std::vector<const context*>& stack) const
-            {
-                int openedBlock = 0;
-                for (int i = current; i > 0; --i)
-                {
-                    auto& action = actions_[i - 1];
-
-                    if (action.t == ActionType::OpenBlock)
-                    {
-                        if (openedBlock == 0 && (*stack.rbegin())->t() == json::type::Object)
-                        {
-                            return true;
-                        }
-                        --openedBlock;
-                    }
-                    else if (action.t == ActionType::CloseBlock)
-                    {
-                        ++openedBlock;
-                    }
-                }
-
-                return false;
-            }
-
-            void render_internal(int actionBegin, int actionEnd, std::vector<const context*>& stack, std::string& out, int indent) const
-            {
-                int current = actionBegin;
-
-                if (indent)
-                    out.insert(out.size(), indent, ' ');
-
-                while (current < actionEnd)
-                {
-                    auto& fragment = fragments_[current];
-                    auto& action = actions_[current];
-                    render_fragment(fragment, indent, out);
-                    switch (action.t)
-                    {
-                        case ActionType::Ignore:
-                            // do nothing
-                            break;
-                        case ActionType::Partial:
-                        {
-                            std::string partial_name = tag_name(action);
-                            auto partial_templ = load(partial_name);
-                            int partial_indent = action.pos;
-                            partial_templ.render_internal(0, partial_templ.fragments_.size() - 1, stack, out, partial_indent ? indent + partial_indent : 0);
-                        }
-                        break;
-                        case ActionType::UnescapeTag:
-                        case ActionType::Tag:
-                        {
-                            bool shouldUseOnlyFirstStackValue = false;
-                            if (isTagInsideObjectBlock(current, stack))
-                            {
-                                shouldUseOnlyFirstStackValue = true;
-                            }
-                            auto optional_ctx = find_context(tag_name(action), stack, shouldUseOnlyFirstStackValue);
-                            auto& ctx = optional_ctx.second;
-                            switch (ctx.t())
-                            {
-                                case json::type::False:
-                                case json::type::True:
-                                case json::type::Number:
-                                    out += ctx.dump();
-                                    break;
-                                case json::type::String:
-                                    if (action.t == ActionType::Tag)
-                                        escape(ctx.s, out);
-                                    else
-                                        out += ctx.s;
-                                    break;
-                                case json::type::Function:
-                                {
-                                    std::string execute_result = ctx.execute();
-                                    while (execute_result.find("{{") != std::string::npos)
-                                    {
-                                        template_t result_plug(execute_result);
-                                        execute_result = result_plug.render_string(*(stack[0]));
-                                    }
-
-                                    if (action.t == ActionType::Tag)
-                                        escape(execute_result, out);
-                                    else
-                                        out += execute_result;
-                                }
-                                break;
-                                default:
-                                    throw std::runtime_error("not implemented tag type" + utility::lexical_cast<std::string>(static_cast<int>(ctx.t())));
-                            }
-                        }
-                        break;
-                        case ActionType::ElseBlock:
-                        {
-                            static context nullContext;
-                            auto optional_ctx = find_context(tag_name(action), stack);
-                            if (!optional_ctx.first)
-                            {
-                                stack.emplace_back(&nullContext);
-                                break;
-                            }
-
-                            auto& ctx = optional_ctx.second;
-                            switch (ctx.t())
-                            {
-                                case json::type::List:
-                                    if (ctx.l && !ctx.l->empty())
-                                        current = action.pos;
-                                    else
-                                        stack.emplace_back(&nullContext);
-                                    break;
-                                case json::type::False:
-                                case json::type::Null:
-                                    stack.emplace_back(&nullContext);
-                                    break;
-                                default:
-                                    current = action.pos;
-                                    break;
-                            }
-                            break;
-                        }
-                        case ActionType::OpenBlock:
-                        {
-                            auto optional_ctx = find_context(tag_name(action), stack);
-                            if (!optional_ctx.first)
-                            {
-                                current = action.pos;
-                                break;
-                            }
-
-                            auto& ctx = optional_ctx.second;
-                            switch (ctx.t())
-                            {
-                                case json::type::List:
-                                    if (ctx.l)
-                                        for (auto it = ctx.l->begin(); it != ctx.l->end(); ++it)
-                                        {
-                                            stack.push_back(&*it);
-                                            render_internal(current + 1, action.pos, stack, out, indent);
-                                            stack.pop_back();
-                                        }
-                                    current = action.pos;
-                                    break;
-                                case json::type::Number:
-                                case json::type::String:
-                                case json::type::Object:
-                                case json::type::True:
-                                    stack.push_back(&ctx);
-                                    break;
-                                case json::type::False:
-                                case json::type::Null:
-                                    current = action.pos;
-                                    break;
-                                default:
-                                    throw std::runtime_error("{{#: not implemented context type: " + utility::lexical_cast<std::string>(static_cast<int>(ctx.t())));
-                                    break;
-                            }
-                            break;
-                        }
-                        case ActionType::CloseBlock:
-                            stack.pop_back();
-                            break;
-                        default:
-                            throw std::runtime_error("not implemented " + utility::lexical_cast<std::string>(static_cast<int>(action.t)));
-                    }
-                    current++;
-                }
-                auto& fragment = fragments_[actionEnd];
-                render_fragment(fragment, indent, out);
-            }
-            void render_fragment(const std::pair<int, int> fragment, int indent, std::string& out) const
-            {
-                if (indent)
-                {
-                    for (int i = fragment.first; i < fragment.second; i++)
-                    {
-                        out += body_[i];
-                        if (body_[i] == '\n' && i + 1 != static_cast<int>(body_.size()))
-                            out.insert(out.size(), indent, ' ');
-                    }
-                }
-                else
-                    out.insert(out.size(), body_, fragment.first, fragment.second - fragment.first);
-            }
-
-        public:
-            /// Output a returnable template from this mustache template
-            rendered_template render() const
-            {
-                context empty_ctx;
-                std::vector<const context*> stack;
-                stack.emplace_back(&empty_ctx);
-
-                std::string ret;
-                render_internal(0, fragments_.size() - 1, stack, ret, 0);
-                return rendered_template(ret);
-            }
-
-            /// Apply the values from the context provided and output a returnable template from this mustache template
-            rendered_template render(const context& ctx) const
-            {
-                std::vector<const context*> stack;
-                stack.emplace_back(&ctx);
-
-                std::string ret;
-                render_internal(0, fragments_.size() - 1, stack, ret, 0);
-                return rendered_template(ret);
-            }
-
-            /// Apply the values from the context provided and output a returnable template from this mustache template
-            rendered_template render(const context&& ctx) const
-            {
-                return render(ctx);
-            }
-
-            /// Output a returnable template from this mustache template
-            std::string render_string() const
-            {
-                context empty_ctx;
-                std::vector<const context*> stack;
-                stack.emplace_back(&empty_ctx);
-
-                std::string ret;
-                render_internal(0, fragments_.size() - 1, stack, ret, 0);
-                return ret;
-            }
-
-            /// Apply the values from the context provided and output a returnable template from this mustache template
-            std::string render_string(const context& ctx) const
-            {
-                std::vector<const context*> stack;
-                stack.emplace_back(&ctx);
-
-                std::string ret;
-                render_internal(0, fragments_.size() - 1, stack, ret, 0);
-                return ret;
-            }
-
-        private:
-            void parse()
-            {
-                std::string tag_open = "{{";
-                std::string tag_close = "}}";
-
-                std::vector<int> blockPositions;
-
-                size_t current = 0;
-                while (1)
-                {
-                    size_t idx = body_.find(tag_open, current);
-                    if (idx == body_.npos)
-                    {
-                        fragments_.emplace_back(static_cast<int>(current), static_cast<int>(body_.size()));
-                        actions_.emplace_back(ActionType::Ignore, 0, 0);
-                        break;
-                    }
-                    fragments_.emplace_back(static_cast<int>(current), static_cast<int>(idx));
-
-                    idx += tag_open.size();
-                    size_t endIdx = body_.find(tag_close, idx);
-                    if (endIdx == idx)
-                    {
-                        throw invalid_template_exception("empty tag is not allowed");
-                    }
-                    if (endIdx == body_.npos)
-                    {
-                        // error, no matching tag
-                        throw invalid_template_exception("not matched opening tag");
-                    }
-                    current = endIdx + tag_close.size();
-                    switch (body_[idx])
-                    {
-                        case '#':
-                            idx++;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            blockPositions.emplace_back(static_cast<int>(actions_.size()));
-                            actions_.emplace_back(ActionType::OpenBlock, idx, endIdx);
-                            break;
-                        case '/':
-                            idx++;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            {
-                                auto& matched = actions_[blockPositions.back()];
-                                if (body_.compare(idx, endIdx - idx,
-                                                  body_, matched.start, matched.end - matched.start) != 0)
-                                {
-                                    throw invalid_template_exception("not matched {{# {{/ pair: " +
-                                                                     body_.substr(matched.start, matched.end - matched.start) + ", " +
-                                                                     body_.substr(idx, endIdx - idx));
-                                }
-                                matched.pos = actions_.size();
-                            }
-                            actions_.emplace_back(ActionType::CloseBlock, idx, endIdx, blockPositions.back());
-                            blockPositions.pop_back();
-                            break;
-                        case '^':
-                            idx++;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            blockPositions.emplace_back(static_cast<int>(actions_.size()));
-                            actions_.emplace_back(ActionType::ElseBlock, idx, endIdx);
-                            break;
-                        case '!':
-                            // do nothing action
-                            actions_.emplace_back(ActionType::Ignore, idx + 1, endIdx);
-                            break;
-                        case '>': // partial
-                            idx++;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            actions_.emplace_back(ActionType::Partial, idx, endIdx);
-                            break;
-                        case '{':
-                            if (tag_open != "{{" || tag_close != "}}")
-                                throw invalid_template_exception("cannot use triple mustache when delimiter changed");
-
-                            idx++;
-                            if (body_[endIdx + 2] != '}')
-                            {
-                                throw invalid_template_exception("{{{: }}} not matched");
-                            }
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            actions_.emplace_back(ActionType::UnescapeTag, idx, endIdx);
-                            current++;
-                            break;
-                        case '&':
-                            idx++;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            actions_.emplace_back(ActionType::UnescapeTag, idx, endIdx);
-                            break;
-                        case '=':
-                            // tag itself is no-op
-                            idx++;
-                            actions_.emplace_back(ActionType::Ignore, idx, endIdx);
-                            endIdx--;
-                            if (body_[endIdx] != '=')
-                                throw invalid_template_exception("{{=: not matching = tag: " + body_.substr(idx, endIdx - idx));
-                            endIdx--;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx] == ' ')
-                                endIdx--;
-                            endIdx++;
-                            {
-                                bool succeeded = false;
-                                for (size_t i = idx; i < endIdx; i++)
-                                {
-                                    if (body_[i] == ' ')
-                                    {
-                                        tag_open = body_.substr(idx, i - idx);
-                                        while (body_[i] == ' ')
-                                            i++;
-                                        tag_close = body_.substr(i, endIdx - i);
-                                        if (tag_open.empty())
-                                            throw invalid_template_exception("{{=: empty open tag");
-                                        if (tag_close.empty())
-                                            throw invalid_template_exception("{{=: empty close tag");
-
-                                        if (tag_close.find(" ") != tag_close.npos)
-                                            throw invalid_template_exception("{{=: invalid open/close tag: " + tag_open + " " + tag_close);
-                                        succeeded = true;
-                                        break;
-                                    }
-                                }
-                                if (!succeeded)
-                                    throw invalid_template_exception("{{=: cannot find space between new open/close tags");
-                            }
-                            break;
-                        default:
-                            // normal tag case;
-                            while (body_[idx] == ' ')
-                                idx++;
-                            while (body_[endIdx - 1] == ' ')
-                                endIdx--;
-                            actions_.emplace_back(ActionType::Tag, idx, endIdx);
-                            break;
-                    }
-                }
-
-                // removing standalones
-                for (int i = actions_.size() - 2; i >= 0; i--)
-                {
-                    if (actions_[i].t == ActionType::Tag || actions_[i].t == ActionType::UnescapeTag)
-                        continue;
-                    auto& fragment_before = fragments_[i];
-                    auto& fragment_after = fragments_[i + 1];
-                    bool is_last_action = i == static_cast<int>(actions_.size()) - 2;
-                    bool all_space_before = true;
-                    int j, k;
-                    for (j = fragment_before.second - 1; j >= fragment_before.first; j--)
-                    {
-                        if (body_[j] != ' ')
-                        {
-                            all_space_before = false;
-                            break;
-                        }
-                    }
-                    if (all_space_before && i > 0)
-                        continue;
-                    if (!all_space_before && body_[j] != '\n')
-                        continue;
-                    bool all_space_after = true;
-                    for (k = fragment_after.first; k < static_cast<int>(body_.size()) && k < fragment_after.second; k++)
-                    {
-                        if (body_[k] != ' ')
-                        {
-                            all_space_after = false;
-                            break;
-                        }
-                    }
-                    if (all_space_after && !is_last_action)
-                        continue;
-                    if (!all_space_after &&
-                        !(
-                          body_[k] == '\n' ||
-                          (body_[k] == '\r' &&
-                           k + 1 < static_cast<int>(body_.size()) &&
-                           body_[k + 1] == '\n')))
-                        continue;
-                    if (actions_[i].t == ActionType::Partial)
-                    {
-                        actions_[i].pos = fragment_before.second - j - 1;
-                    }
-                    fragment_before.second = j + 1;
-                    if (!all_space_after)
-                    {
-                        if (body_[k] == '\n')
-                            k++;
-                        else
-                            k += 2;
-                        fragment_after.first = k;
-                    }
-                }
-            }
-
-            std::vector<std::pair<int, int>> fragments_;
-            std::vector<Action> actions_;
-            std::string body_;
-        };
-
-        inline template_t compile(const std::string& body)
-        {
-            return template_t(body);
-        }
-        namespace detail
-        {
-            inline std::string& get_template_base_directory_ref()
-            {
-                static std::string template_base_directory = "templates";
-                return template_base_directory;
-            }
-
-            /// A base directory not related to any blueprint
-            inline std::string& get_global_template_base_directory_ref()
-            {
-                static std::string template_base_directory = "templates";
-                return template_base_directory;
-            }
-        } // namespace detail
-
-        inline std::string default_loader(const std::string& filename)
-        {
-            std::string path = detail::get_template_base_directory_ref();
-            std::ifstream inf(utility::join_path(path, filename));
-            if (!inf)
-            {
-                CROW_LOG_WARNING << "Template \"" << filename << "\" not found.";
-                return {};
-            }
-            return {std::istreambuf_iterator<char>(inf), std::istreambuf_iterator<char>()};
-        }
-
-        namespace detail
-        {
-            inline std::function<std::string(std::string)>& get_loader_ref()
-            {
-                static std::function<std::string(std::string)> loader = default_loader;
-                return loader;
-            }
-        } // namespace detail
-
-        inline void set_base(const std::string& path)
-        {
-            auto& base = detail::get_template_base_directory_ref();
-            base = path;
-            if (base.back() != '\\' &&
-                base.back() != '/')
-            {
-                base += '/';
-            }
-        }
-
-        inline void set_global_base(const std::string& path)
-        {
-            auto& base = detail::get_global_template_base_directory_ref();
-            base = path;
-            if (base.back() != '\\' &&
-                base.back() != '/')
-            {
-                base += '/';
-            }
-        }
-
-        inline void set_loader(std::function<std::string(std::string)> loader)
-        {
-            detail::get_loader_ref() = std::move(loader);
-        }
-
-        inline std::string load_text(const std::string& filename)
-        {
-            std::string filename_sanitized(filename);
-            utility::sanitize_filename(filename_sanitized);
-            return detail::get_loader_ref()(filename_sanitized);
-        }
-
-        inline std::string load_text_unsafe(const std::string& filename)
-        {
-            return detail::get_loader_ref()(filename);
-        }
-
-        inline template_t load(const std::string& filename)
-        {
-            std::string filename_sanitized(filename);
-            utility::sanitize_filename(filename_sanitized);
-            return compile(detail::get_loader_ref()(filename_sanitized));
-        }
-
-        inline template_t load_unsafe(const std::string& filename)
-        {
-            return compile(detail::get_loader_ref()(filename));
-        }
-    } // namespace mustache
-} // namespace crow
-
-
-#include <cstdint>
-#include <utility>
-#include <tuple>
-#include <unordered_map>
-#include <memory>
-#include <vector>
-#include <algorithm>
-#include <type_traits>
-
-
-namespace crow // NOTE: Already documented in "crow/app.h"
-{
-
-    constexpr const uint16_t INVALID_BP_ID{((uint16_t)-1)};
-
-    namespace detail
-    {
-        /// Typesafe wrapper for storing lists of middleware as their indices in the App
-        struct middleware_indices
-        {
-            template<typename App>
-            void push()
-            {}
-
-            template<typename App, typename MW, typename... Middlewares>
-            void push()
-            {
-                using MwContainer = typename App::mw_container_t;
-                static_assert(black_magic::has_type<MW, MwContainer>::value, "Middleware must be present in app");
-                static_assert(std::is_base_of<crow::ILocalMiddleware, MW>::value, "Middleware must extend ILocalMiddleware");
-                int idx = black_magic::tuple_index<MW, MwContainer>::value;
-                indices_.push_back(idx);
-                push<App, Middlewares...>();
-            }
-
-            void merge_front(const detail::middleware_indices& other)
-            {
-                indices_.insert(indices_.begin(), other.indices_.cbegin(), other.indices_.cend());
-            }
-
-            void merge_back(const detail::middleware_indices& other)
-            {
-                indices_.insert(indices_.end(), other.indices_.cbegin(), other.indices_.cend());
-            }
-
-            void pop_back(const detail::middleware_indices& other)
-            {
-                indices_.resize(indices_.size() - other.indices_.size());
-            }
-
-            bool empty() const
-            {
-                return indices_.empty();
-            }
-
-            // Sorts indices and filters out duplicates to allow fast lookups with traversal
-            void pack()
-            {
-                std::sort(indices_.begin(), indices_.end());
-                indices_.erase(std::unique(indices_.begin(), indices_.end()), indices_.end());
-            }
-
-            const std::vector<int>& indices()
-            {
-                return indices_;
-            }
-
-        private:
-            std::vector<int> indices_;
-        };
-    } // namespace detail
-
-    /// A base class for all rules.
-
-    ///
-    /// Used to provide a common interface for code dealing with different types of rules.<br>
-    /// A Rule provides a URL, allowed HTTP methods, and handlers.
-    class BaseRule
-    {
-    public:
-        BaseRule(std::string rule):
-          rule_(std::move(rule))
-        {}
-
-        virtual ~BaseRule()
-        {}
-
-        virtual void validate() = 0;
-        
-        void set_added() {
-            added_ = true;
-        }
-
-        bool is_added() {
-            return added_;
-        }
-
-        std::unique_ptr<BaseRule> upgrade()
-        {
-            if (rule_to_upgrade_)
-                return std::move(rule_to_upgrade_);
-            return {};
-        }
-
-        virtual void handle(request&, response&, const routing_params&) = 0;
-        virtual void handle_upgrade(const request&, response& res, SocketAdaptor&&)
-        {
-            res = response(404);
-            res.end();
-        }
-#ifdef CROW_ENABLE_SSL
-        virtual void handle_upgrade(const request&, response& res, SSLAdaptor&&)
-        {
-            res = response(404);
-            res.end();
-        }
-#endif
-
-        uint32_t get_methods()
-        {
-            return methods_;
-        }
-
-        template<typename F>
-        void foreach_method(F f)
-        {
-            for (uint32_t method = 0, method_bit = 1; method < static_cast<uint32_t>(HTTPMethod::InternalMethodCount); method++, method_bit <<= 1)
-            {
-                if (methods_ & method_bit)
-                    f(method);
-            }
-        }
-
-        std::string custom_templates_base;
-
-        const std::string& rule() { return rule_; }
-
-    protected:
-        uint32_t methods_{1 << static_cast<int>(HTTPMethod::Get)};
-
-        std::string rule_;
-        std::string name_;
-        bool added_{false};
-
-        std::unique_ptr<BaseRule> rule_to_upgrade_;
-
-        detail::middleware_indices mw_indices_;
-
-        friend class Router;
-        friend class Blueprint;
-        template<typename T>
-        friend struct RuleParameterTraits;
-    };
-
-
-    namespace detail
-    {
-        namespace routing_handler_call_helper
-        {
-            template<typename T, int Pos>
-            struct call_pair
-            {
-                using type = T;
-                static const int pos = Pos;
-            };
-
-            template<typename H1>
-            struct call_params
-            {
-                H1& handler;
-                const routing_params& params;
-                request& req;
-                response& res;
-            };
-
-            template<typename F, int NInt, int NUint, int NDouble, int NString, typename S1, typename S2>
-            struct call
-            {};
-
-            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
-            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<int64_t, Args1...>, black_magic::S<Args2...>>
-            {
-                void operator()(F cparams)
-                {
-                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<int64_t, NInt>>;
-                    call<F, NInt + 1, NUint, NDouble, NString, black_magic::S<Args1...>, pushed>()(cparams);
-                }
-            };
-
-            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
-            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<uint64_t, Args1...>, black_magic::S<Args2...>>
-            {
-                void operator()(F cparams)
-                {
-                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<uint64_t, NUint>>;
-                    call<F, NInt, NUint + 1, NDouble, NString, black_magic::S<Args1...>, pushed>()(cparams);
-                }
-            };
-
-            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
-            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<double, Args1...>, black_magic::S<Args2...>>
-            {
-                void operator()(F cparams)
-                {
-                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<double, NDouble>>;
-                    call<F, NInt, NUint, NDouble + 1, NString, black_magic::S<Args1...>, pushed>()(cparams);
-                }
-            };
-
-            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1, typename... Args2>
-            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<std::string, Args1...>, black_magic::S<Args2...>>
-            {
-                void operator()(F cparams)
-                {
-                    using pushed = typename black_magic::S<Args2...>::template push_back<call_pair<std::string, NString>>;
-                    call<F, NInt, NUint, NDouble, NString + 1, black_magic::S<Args1...>, pushed>()(cparams);
-                }
-            };
-
-            template<typename F, int NInt, int NUint, int NDouble, int NString, typename... Args1>
-            struct call<F, NInt, NUint, NDouble, NString, black_magic::S<>, black_magic::S<Args1...>>
-            {
-                void operator()(F cparams)
-                {
-                    cparams.handler(
-                      cparams.req,
-                      cparams.res,
-                      cparams.params.template get<typename Args1::type>(Args1::pos)...);
-                }
-            };
-
-            template<typename Func, typename... ArgsWrapped>
-            struct Wrapped
-            {
-                template<typename... Args>
-                void set_(Func f, typename std::enable_if<!std::is_same<typename std::tuple_element<0, std::tuple<Args..., void>>::type, const request&>::value, int>::type = 0)
-                {
-                    handler_ = (
-#ifdef CROW_CAN_USE_CPP14
-                      [f = std::move(f)]
-#else
-                      [f]
-#endif
-                      (const request&, response& res, Args... args) {
-                          res = response(f(args...));
-                          res.end();
-                      });
-                }
-
-                template<typename Req, typename... Args>
-                struct req_handler_wrapper
-                {
-                    req_handler_wrapper(Func f):
-                      f(std::move(f))
-                    {
-                    }
-
-                    void operator()(const request& req, response& res, Args... args)
-                    {
-                        res = response(f(req, args...));
-                        res.end();
-                    }
-
-                    Func f;
-                };
-
-                template<typename... Args>
-                void set_(Func f, typename std::enable_if<
-                                    std::is_same<typename std::tuple_element<0, std::tuple<Args..., void>>::type, const request&>::value &&
-                                      !std::is_same<typename std::tuple_element<1, std::tuple<Args..., void, void>>::type, response&>::value,
-                                    int>::type = 0)
-                {
-                    handler_ = req_handler_wrapper<Args...>(std::move(f));
-                    /*handler_ = (
-                        [f = std::move(f)]
-                        (const request& req, response& res, Args... args){
-                             res = response(f(req, args...));
-                             res.end();
-                        });*/
-                }
-
-                template<typename... Args>
-                void set_(Func f, typename std::enable_if<
-                                    std::is_same<typename std::tuple_element<0, std::tuple<Args..., void>>::type, const request&>::value &&
-                                      std::is_same<typename std::tuple_element<1, std::tuple<Args..., void, void>>::type, response&>::value,
-                                    int>::type = 0)
-                {
-                    handler_ = std::move(f);
-                }
-
-                template<typename... Args>
-                struct handler_type_helper
-                {
-                    using type = std::function<void(const crow::request&, crow::response&, Args...)>;
-                    using args_type = black_magic::S<typename black_magic::promote_t<Args>...>;
-                };
-
-                template<typename... Args>
-                struct handler_type_helper<const request&, Args...>
-                {
-                    using type = std::function<void(const crow::request&, crow::response&, Args...)>;
-                    using args_type = black_magic::S<typename black_magic::promote_t<Args>...>;
-                };
-
-                template<typename... Args>
-                struct handler_type_helper<const request&, response&, Args...>
-                {
-                    using type = std::function<void(const crow::request&, crow::response&, Args...)>;
-                    using args_type = black_magic::S<typename black_magic::promote_t<Args>...>;
-                };
-
-                typename handler_type_helper<ArgsWrapped...>::type handler_;
-
-                void operator()(request& req, response& res, const routing_params& params)
-                {
-                    detail::routing_handler_call_helper::call<
-                      detail::routing_handler_call_helper::call_params<
-                        decltype(handler_)>,
-                      0, 0, 0, 0,
-                      typename handler_type_helper<ArgsWrapped...>::args_type,
-                      black_magic::S<>>()(
-                      detail::routing_handler_call_helper::call_params<
-                        decltype(handler_)>{handler_, params, req, res});
-                }
-            };
-
-        } // namespace routing_handler_call_helper
-    }     // namespace detail
-
-
-    class CatchallRule
-    {
-    public:
-        /// @cond SKIP
-        CatchallRule() {}
-
-        template<typename Func>
-        typename std::enable_if<black_magic::CallHelper<Func, black_magic::S<>>::value, void>::type
-          operator()(Func&& f)
-        {
-            static_assert(!std::is_same<void, decltype(f())>::value,
-                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
-
-            handler_ = (
-#ifdef CROW_CAN_USE_CPP14
-              [f = std::move(f)]
-#else
-              [f]
-#endif
-              (const request&, response& res) {
-                  res = response(f());
-                  res.end();
-              });
-        }
-
-        template<typename Func>
-        typename std::enable_if<
-          !black_magic::CallHelper<Func, black_magic::S<>>::value &&
-            black_magic::CallHelper<Func, black_magic::S<crow::request>>::value,
-          void>::type
-          operator()(Func&& f)
-        {
-            static_assert(!std::is_same<void, decltype(f(std::declval<crow::request>()))>::value,
-                          "Handler function cannot have void return type; valid return types: string, int, crow::response, crow::returnable");
-
-            handler_ = (
-#ifdef CROW_CAN_USE_CPP14
-              [f = std::move(f)]
-#else
-              [f]
-#endif
-              (const crow::request& req, crow::response& res) {
-                  res = response(f(req));
-                  res.end();
-              });
-        }
-
-        template<typename Func>
-        typename std::enable_if<
-          !black_magic::CallHelper<Func, black_magic::S<>>::value &&
-            !black_magic::CallHelper<Func, black_magic::S<crow::request>>::value &&
-            black_magic::CallHelper<Func, black_magic::S<crow::response&>>::value,
-          void>::type
-          operator()(Func&& f)
-        {
-            static_assert(std::is_same<void, decltype(f(std::declval<crow::response&>()))>::value,
-                          "Handler function with response argument should have void return type");
-            handler_ = (
-#ifdef CROW_CAN_USE_CPP14
-              [f = std::move(f)]
-#else
-              [f]
-#endif
-              (const crow::request&, crow::response& res) {
-                  f(res);
-              });
-        }
-
-        template<typename Func>
-        typename std::enable_if<
-          !black_magic::CallHelper<Func, black_magic::S<>>::value &&
-            !black_magic::CallHelper<Func, black_magic::S<crow::request>>::value &&
-            !black_magic::CallHelper<Func, black_magic::S<crow::response&>>::value,
-          void>::type
-          operator()(Func&& f)
-        {
-            static_assert(std::is_same<void, decltype(f(std::declval<crow::request>(), std::declval<crow::response&>()))>::value,
-                          "Handler function with response argument should have void return type");
-
-            handler_ = std::move(f);
-        }
-        /// @endcond
-        bool has_handler()
-        {
-            return (handler_ != nullptr);
-        }
-
-    protected:
-        friend class Router;
-
-    private:
-        std::function<void(const crow::request&, crow::response&)> handler_;
-    };
-
-
-    /// A rule dealing with websockets.
-
-    ///
-    /// Provides the interface for the user to put in the necessary handlers for a websocket to work.
-    template<typename App>
-    class WebSocketRule : public BaseRule
-    {
-        using self_t = WebSocketRule;
-
-    public:
-        WebSocketRule(std::string rule, App* app):
-          BaseRule(std::move(rule)),
-          app_(app),
-          max_payload_(UINT64_MAX)
-        {}
-
-        void validate() override
-        {}
-
-        void handle(request&, response& res, const routing_params&) override
-        {
-            res = response(404);
-            res.end();
-        }
-
-        void handle_upgrade(const request& req, response&, SocketAdaptor&& adaptor) override
-        {
-            max_payload_ = max_payload_override_ ? max_payload_ : app_->websocket_max_payload();
-            new crow::websocket::Connection<SocketAdaptor, App>(req, std::move(adaptor), app_, max_payload_, open_handler_, message_handler_, close_handler_, error_handler_, accept_handler_);
-        }
-#ifdef CROW_ENABLE_SSL
-        void handle_upgrade(const request& req, response&, SSLAdaptor&& adaptor) override
-        {
-            new crow::websocket::Connection<SSLAdaptor, App>(req, std::move(adaptor), app_, max_payload_, open_handler_, message_handler_, close_handler_, error_handler_, accept_handler_);
-        }
-#endif
-
-        /// Override the global payload limit for this single WebSocket rule
-        self_t& max_payload(uint64_t max_payload)
-        {
-            max_payload_ = max_payload;
-            max_payload_override_ = true;
-            return *this;
-        }
-
-        template<typename Func>
-        self_t& onopen(Func f)
-        {
-            open_handler_ = f;
-            return *this;
-        }
-
-        template<typename Func>
-        self_t& onmessage(Func f)
-        {
-            message_handler_ = f;
-            return *this;
-        }
-
-        template<typename Func>
-        self_t& onclose(Func f)
-        {
-            close_handler_ = f;
-            return *this;
-        }
-
-        template<typename Func>
-        self_t& onerror(Func f)
-        {
-            error_handler_ = f;
-            return *this;
-        }
-
-        template<typename Func>
-        self_t& onaccept(Func f)
-        {
-            accept_handler_ = f;
-            return *this;
-        }
-
-    protected:
-        App* app_;
-        std::function<void(crow::websocket::connection&)> open_handler_;
-        std::function<void(crow::websocket::connection&, const std::string&, bool)> message_handler_;
-        std::function<void(crow::websocket::connection&, const std::string&)> close_handler_;
-        std::function<void(crow::websocket::connection&, const std::string&)> error_handler_;
-        std::function<bool(const crow::request&, void**)> accept_handler_;
-        uint64_t max_payload_;
-        bool max_payload_override_ = false;
-    };
-
-    /// Allows the user to assign parameters using functions.
-
-    ///
-    /// `rule.name("name").methods(HTTPMethod::POST)`
-    template<typename T>
-    struct RuleParameterTraits
-    {
-        using self_t = T;
-
-        template<typename App>
-        WebSocketRule<App>& websocket(App* app)
-        {
-            auto p = new WebSocketRule<App>(static_cast<self_t*>(this)->rule_, app);
-            static_cast<self_t*>(this)->rule_to_upgrade_.reset(p);
-            return *p;
-        }
-
-        self_t& name(std::string name) noexcept
-        {
-            static_cast<self_t*>(this)->name_ = std::move(name);
-            return static_cast<self_t&>(*this);
-        }
-
-        self_t& methods(HTTPMethod method)
-        {
-            static_cast<self_t*>(this)->methods_ = 1 << static_cast<int>(method);
-            return static_cast<self_t&>(*this);
-        }
-
-        template<typename... MethodArgs>
-        self_t& methods(HTTPMethod method, MethodArgs... args_method)
-        {
-            methods(args_method...);
-            static_cast<self_t*>(this)->methods_ |= 1 << static_cast<int>(method);
-            return static_cast<self_t&>(*this);
-        }
-
-        /// Enable local middleware for this handler
-        template<typename App, typename... Middlewares>
-        self_t& middlewares()
-        {
-            static_cast<self_t*>(this)->mw_indices_.template push<App, Middlewares...>();
-            return static_cast<self_t&>(*this);
-        }
-    };
-
-    /// A rule that can change its parameters during runtime.
-    class DynamicRule : public BaseRule, public RuleParameterTraits<DynamicRule>
-    {
-    public:
-        DynamicRule(std::string rule):
-          BaseRule(std::move(rule))
-        {}
-
-        void validate() override
-        {
-            if (!erased_handler_)
-            {
-                throw std::runtime_error(name_ + (!name_.empty() ? ": " : "") + "no handler for url " + rule_);
-            }
-        }
-
-        void handle(request& req, response& res, const routing_params& params) override
-        {
-            if (!custom_templates_base.empty())
-                mustache::set_base(custom_templates_base);
-            else if (mustache::detail::get_template_base_directory_ref() != "templates")
-                mustache::set_base("templates");
-            erased_handler_(req, res, params);
-        }
-
-        template<typename Func>
-        void operator()(Func f)
-        {
-#ifdef CROW_MSVC_WORKAROUND
-            using function_t = utility::function_traits<decltype(&Func::operator())>;
-#else
-            using function_t = utility::function_traits<Func>;
-#endif
-            erased_handler_ = wrap(std::move(f), black_magic::gen_seq<function_t::arity>());
-        }
-
-        // enable_if Arg1 == request && Arg2 == response
-        // enable_if Arg1 == request && Arg2 != resposne
-        // enable_if Arg1 != request
-#ifdef CROW_MSVC_WORKAROUND
-        template<typename Func, size_t... Indices>
-#else
-        template<typename Func, unsigned... Indices>
-#endif
-        std::function<void(request&, response&, const routing_params&)>
-          wrap(Func f, black_magic::seq<Indices...>)
-        {
-#ifdef CROW_MSVC_WORKAROUND
-            using function_t = utility::function_traits<decltype(&Func::operator())>;
-#else
-            using function_t = utility::function_traits<Func>;
-#endif
-            if (!black_magic::is_parameter_tag_compatible(
-                  black_magic::get_parameter_tag_runtime(rule_.c_str()),
-                  black_magic::compute_parameter_tag_from_args_list<
-                    typename function_t::template arg<Indices>...>::value))
-            {
-                throw std::runtime_error("route_dynamic: Handler type is mismatched with URL parameters: " + rule_);
-            }
-            auto ret = detail::routing_handler_call_helper::Wrapped<Func, typename function_t::template arg<Indices>...>();
-            ret.template set_<
-              typename function_t::template arg<Indices>...>(std::move(f));
-            return ret;
-        }
-
-        template<typename Func>
-        void operator()(std::string name, Func&& f)
-        {
-            name_ = std::move(name);
-            (*this).template operator()<Func>(std::forward(f));
-        }
-
-    private:
-        std::function<void(request&, response&, const routing_params&)> erased_handler_;
-    };
-
-    /// Default rule created when CROW_ROUTE is called.
-    template<typename... Args>
-    class TaggedRule : public BaseRule, public RuleParameterTraits<TaggedRule<Args...>>
-    {
-    public:
-        using self_t = TaggedRule<Args...>;
-
-        TaggedRule(std::string rule):
-          BaseRule(std::move(rule))
-        {}
-
-        void validate() override
-        {
-            if (rule_.at(0) != '/')
-                throw std::runtime_error("Internal error: Routes must start with a '/'");
-
-            if (!handler_)
-            {
-                throw std::runtime_error(name_ + (!name_.empty() ? ": " : "") + "no handler for url " + rule_);
-            }
-        }
-
-        template<typename Func>
-        void operator()(Func&& f)
-        {
-            handler_ = (
-#ifdef CROW_CAN_USE_CPP14
-              [f = std::move(f)]
-#else
-              [f]
-#endif
-              (crow::request& req, crow::response& res, Args... args) {
-                  detail::wrapped_handler_call(req, res, f, std::forward<Args>(args)...);
-              });
-        }
-
-        template<typename Func>
-        void operator()(std::string name, Func&& f)
-        {
-            name_ = std::move(name);
-            (*this).template operator()<Func>(std::forward(f));
-        }
-
-        void handle(request& req, response& res, const routing_params& params) override
-        {
-            if (!custom_templates_base.empty())
-                mustache::set_base(custom_templates_base);
-            else if (mustache::detail::get_template_base_directory_ref() != mustache::detail::get_global_template_base_directory_ref())
-                mustache::set_base(mustache::detail::get_global_template_base_directory_ref());
-
-            detail::routing_handler_call_helper::call<
-              detail::routing_handler_call_helper::call_params<decltype(handler_)>,
-              0, 0, 0, 0,
-              black_magic::S<Args...>,
-              black_magic::S<>>()(
-              detail::routing_handler_call_helper::call_params<decltype(handler_)>{handler_, params, req, res});
-        }
-
-    private:
-        std::function<void(crow::request&, crow::response&, Args...)> handler_;
-    };
-
-    const int RULE_SPECIAL_REDIRECT_SLASH = 1;
-
-
-    /// A search tree.
-    class Trie
-    {
-    public:
-        struct Node
-        {
-            uint16_t rule_index{};
-            // Assign the index to the maximum 32 unsigned integer value by default so that any other number (specifically 0) is a valid BP id.
-            uint16_t blueprint_index{INVALID_BP_ID};
-            std::string key;
-            ParamType param = ParamType::MAX; // MAX = No param.
-            std::vector<Node> children;
-
-            bool IsSimpleNode() const
-            {
-                return !rule_index &&
-                       blueprint_index == INVALID_BP_ID &&
-                       children.size() < 2 &&
-                       param == ParamType::MAX &&
-                       std::all_of(std::begin(children), std::end(children), [](const Node& x) {
-                           return x.param == ParamType::MAX;
-                       });
-            }
-
-            Node& add_child_node()
-            {
-                children.emplace_back();
-                return children.back();
-            }
-        };
-
-
-        Trie()
-        {}
-
-        /// Check whether or not the trie is empty.
-        bool is_empty()
-        {
-            return head_.children.empty();
-        }
-
-        void optimize()
-        {
-            for (auto& child : head_.children)
-            {
-                optimizeNode(child);
-            }
-        }
-
-
-    private:
-        void optimizeNode(Node& node)
-        {
-            if (node.children.empty())
-                return;
-            if (node.IsSimpleNode())
-            {
-                auto children_temp = std::move(node.children);
-                auto& child_temp = children_temp[0];
-                node.key += child_temp.key;
-                node.rule_index = child_temp.rule_index;
-                node.blueprint_index = child_temp.blueprint_index;
-                node.children = std::move(child_temp.children);
-                optimizeNode(node);
-            }
-            else
-            {
-                for (auto& child : node.children)
-                {
-                    optimizeNode(child);
-                }
-            }
-        }
-
-        void debug_node_print(const Node& node, int level)
-        {
-            if (node.param != ParamType::MAX)
-            {
-                switch (node.param)
-                {
-                    case ParamType::INT:
-                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
-                                       << "<int>";
-                        break;
-                    case ParamType::UINT:
-                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
-                                       << "<uint>";
-                        break;
-                    case ParamType::DOUBLE:
-                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
-                                       << "<double>";
-                        break;
-                    case ParamType::STRING:
-                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
-                                       << "<string>";
-                        break;
-                    case ParamType::PATH:
-                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
-                                       << "<path>";
-                        break;
-                    default:
-                        CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� "
-                                       << "<ERROR>";
-                        break;
-                }
-            }
-            else
-                CROW_LOG_DEBUG << std::string(3 * level, ' ') << "└� " << node.key;
-
-            for (const auto& child : node.children)
-            {
-                debug_node_print(child, level + 1);
-            }
-        }
-
-    public:
-        void debug_print()
-        {
-            CROW_LOG_DEBUG << "└➙ ROOT";
-            for (const auto& child : head_.children)
-                debug_node_print(child, 1);
-        }
-
-        void validate()
-        {
-            if (!head_.IsSimpleNode())
-                throw std::runtime_error("Internal error: Trie header should be simple!");
-            optimize();
-        }
-
-        //Rule_index, Blueprint_index, routing_params
-        routing_handle_result find(const std::string& req_url, const Node& node, unsigned pos = 0, routing_params* params = nullptr, std::vector<uint16_t>* blueprints = nullptr) const
-        {
-            //start params as an empty struct
-            routing_params empty;
-            if (params == nullptr)
-                params = &empty;
-            //same for blueprint vector
-            std::vector<uint16_t> MT;
-            if (blueprints == nullptr)
-                blueprints = &MT;
-
-            uint16_t found{};               //The rule index to be found
-            std::vector<uint16_t> found_BP; //The Blueprint indices to be found
-            routing_params match_params;    //supposedly the final matched parameters
-
-            auto update_found = [&found, &found_BP, &match_params](routing_handle_result& ret) {
-                found_BP = std::move(ret.blueprint_indices);
-                if (ret.rule_index && (!found || found > ret.rule_index))
-                {
-                    found = ret.rule_index;
-                    match_params = std::move(ret.r_params);
-                }
-            };
-
-            //if the function was called on a node at the end of the string (the last recursion), return the nodes rule index, and whatever params were passed to the function
-            if (pos == req_url.size())
-            {
-                found_BP = std::move(*blueprints);
-                return routing_handle_result{node.rule_index, *blueprints, *params};
-            }
-
-            bool found_fragment = false;
-
-            for (const auto& child : node.children)
-            {
-                if (child.param != ParamType::MAX)
-                {
-                    if (child.param == ParamType::INT)
-                    {
-                        char c = req_url[pos];
-                        if ((c >= '0' && c <= '9') || c == '+' || c == '-')
-                        {
-                            char* eptr;
-                            errno = 0;
-                            long long int value = strtoll(req_url.data() + pos, &eptr, 10);
-                            if (errno != ERANGE && eptr != req_url.data() + pos)
-                            {
-                                found_fragment = true;
-                                params->int_params.push_back(value);
-                                if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
-                                auto ret = find(req_url, child, eptr - req_url.data(), params, blueprints);
-                                update_found(ret);
-                                params->int_params.pop_back();
-                                if (!blueprints->empty()) blueprints->pop_back();
-                            }
-                        }
-                    }
-
-                    else if (child.param == ParamType::UINT)
-                    {
-                        char c = req_url[pos];
-                        if ((c >= '0' && c <= '9') || c == '+')
-                        {
-                            char* eptr;
-                            errno = 0;
-                            unsigned long long int value = strtoull(req_url.data() + pos, &eptr, 10);
-                            if (errno != ERANGE && eptr != req_url.data() + pos)
-                            {
-                                found_fragment = true;
-                                params->uint_params.push_back(value);
-                                if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
-                                auto ret = find(req_url, child, eptr - req_url.data(), params, blueprints);
-                                update_found(ret);
-                                params->uint_params.pop_back();
-                                if (!blueprints->empty()) blueprints->pop_back();
-                            }
-                        }
-                    }
-
-                    else if (child.param == ParamType::DOUBLE)
-                    {
-                        char c = req_url[pos];
-                        if ((c >= '0' && c <= '9') || c == '+' || c == '-' || c == '.')
-                        {
-                            char* eptr;
-                            errno = 0;
-                            double value = strtod(req_url.data() + pos, &eptr);
-                            if (errno != ERANGE && eptr != req_url.data() + pos)
-                            {
-                                found_fragment = true;
-                                params->double_params.push_back(value);
-                                if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
-                                auto ret = find(req_url, child, eptr - req_url.data(), params, blueprints);
-                                update_found(ret);
-                                params->double_params.pop_back();
-                                if (!blueprints->empty()) blueprints->pop_back();
-                            }
-                        }
-                    }
-
-                    else if (child.param == ParamType::STRING)
-                    {
-                        size_t epos = pos;
-                        for (; epos < req_url.size(); epos++)
-                        {
-                            if (req_url[epos] == '/')
-                                break;
-                        }
-
-                        if (epos != pos)
-                        {
-                            found_fragment = true;
-                            params->string_params.push_back(req_url.substr(pos, epos - pos));
-                            if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
-                            auto ret = find(req_url, child, epos, params, blueprints);
-                            update_found(ret);
-                            params->string_params.pop_back();
-                            if (!blueprints->empty()) blueprints->pop_back();
-                        }
-                    }
-
-                    else if (child.param == ParamType::PATH)
-                    {
-                        size_t epos = req_url.size();
-
-                        if (epos != pos)
-                        {
-                            found_fragment = true;
-                            params->string_params.push_back(req_url.substr(pos, epos - pos));
-                            if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
-                            auto ret = find(req_url, child, epos, params, blueprints);
-                            update_found(ret);
-                            params->string_params.pop_back();
-                            if (!blueprints->empty()) blueprints->pop_back();
-                        }
-                    }
-                }
-
-                else
-                {
-                    const std::string& fragment = child.key;
-                    if (req_url.compare(pos, fragment.size(), fragment) == 0)
-                    {
-                        found_fragment = true;
-                        if (child.blueprint_index != INVALID_BP_ID) blueprints->push_back(child.blueprint_index);
-                        auto ret = find(req_url, child, pos + fragment.size(), params, blueprints);
-                        update_found(ret);
-                        if (!blueprints->empty()) blueprints->pop_back();
-                    }
-                }
-            }
-
-            if (!found_fragment)
-                found_BP = std::move(*blueprints);
-
-            return routing_handle_result{found, found_BP, match_params}; //Called after all the recursions have been done
-        }
-
-        routing_handle_result find(const std::string& req_url) const
-        {
-            return find(req_url, head_);
-        }
-
-        //This functions assumes any blueprint info passed is valid
-        void add(const std::string& url, uint16_t rule_index, unsigned bp_prefix_length = 0, uint16_t blueprint_index = INVALID_BP_ID)
-        {
-            auto idx = &head_;
-
-            bool has_blueprint = bp_prefix_length != 0 && blueprint_index != INVALID_BP_ID;
-
-            for (unsigned i = 0; i < url.size(); i++)
-            {
-                char c = url[i];
-                if (c == '<')
-                {
-                    static struct ParamTraits
-                    {
-                        ParamType type;
-                        std::string name;
-                    } paramTraits[] =
-                      {
-                        {ParamType::INT, "<int>"},
-                        {ParamType::UINT, "<uint>"},
-                        {ParamType::DOUBLE, "<float>"},
-                        {ParamType::DOUBLE, "<double>"},
-                        {ParamType::STRING, "<str>"},
-                        {ParamType::STRING, "<string>"},
-                        {ParamType::PATH, "<path>"},
-                      };
-
-                    for (const auto& x : paramTraits)
-                    {
-                        if (url.compare(i, x.name.size(), x.name) == 0)
-                        {
-                            bool found = false;
-                            for (auto& child : idx->children)
-                            {
-                                if (child.param == x.type)
-                                {
-                                    idx = &child;
-                                    i += x.name.size();
-                                    found = true;
-                                    break;
-                                }
-                            }
-                            if (found)
-                                break;
-
-                            auto new_node_idx = &idx->add_child_node();
-                            new_node_idx->param = x.type;
-                            idx = new_node_idx;
-                            i += x.name.size();
-                            break;
-                        }
-                    }
-
-                    i--;
-                }
-                else
-                {
-                    //This part assumes the tree is unoptimized (every node has a max 1 character key)
-                    bool piece_found = false;
-                    for (auto& child : idx->children)
-                    {
-                        if (child.key[0] == c)
-                        {
-                            idx = &child;
-                            piece_found = true;
-                            break;
-                        }
-                    }
-                    if (!piece_found)
-                    {
-                        auto new_node_idx = &idx->add_child_node();
-                        new_node_idx->key = c;
-                        //The assumption here is that you'd only need to add a blueprint index if the tree didn't have the BP prefix.
-                        if (has_blueprint && i == bp_prefix_length)
-                            new_node_idx->blueprint_index = blueprint_index;
-                        idx = new_node_idx;
-                    }
-                }
-            }
-
-            //check if the last node already has a value (exact url already in Trie)
-            if (idx->rule_index)
-                throw std::runtime_error("handler already exists for " + url);
-            idx->rule_index = rule_index;
-        }
-
-    private:
-        Node head_;
-    };
-
-    /// A blueprint can be considered a smaller section of a Crow app, specifically where the router is conecerned.
-
-    ///
-    /// You can use blueprints to assign a common prefix to rules' prefix, set custom static and template folders, and set a custom catchall route.
-    /// You can also assign nest blueprints for maximum Compartmentalization.
-    class Blueprint
-    {
-    public:
-        Blueprint(const std::string& prefix):
-          prefix_(prefix){};
-
-        Blueprint(const std::string& prefix, const std::string& static_dir):
-          prefix_(prefix), static_dir_(static_dir){};
-
-        Blueprint(const std::string& prefix, const std::string& static_dir, const std::string& templates_dir):
-          prefix_(prefix), static_dir_(static_dir), templates_dir_(templates_dir){};
-
-        /*
-        Blueprint(Blueprint& other)
-        {
-            prefix_ = std::move(other.prefix_);
-            all_rules_ = std::move(other.all_rules_);
-        }
-
-        Blueprint(const Blueprint& other)
-        {
-            prefix_ = other.prefix_;
-            all_rules_ = other.all_rules_;
-        }
-*/
-        Blueprint(Blueprint&& value)
-        {
-            *this = std::move(value);
-        }
-
-        Blueprint& operator=(const Blueprint& value) = delete;
-
-        Blueprint& operator=(Blueprint&& value) noexcept
-        {
-            prefix_ = std::move(value.prefix_);
-            static_dir_ = std::move(value.static_dir_);
-            templates_dir_ = std::move(value.templates_dir_);
-            all_rules_ = std::move(value.all_rules_);
-            catchall_rule_ = std::move(value.catchall_rule_);
-            blueprints_ = std::move(value.blueprints_);
-            mw_indices_ = std::move(value.mw_indices_);
-            return *this;
-        }
-
-        bool operator==(const Blueprint& value)
-        {
-            return value.prefix() == prefix_;
-        }
-
-        bool operator!=(const Blueprint& value)
-        {
-            return value.prefix() != prefix_;
-        }
-
-        std::string prefix() const
-        {
-            return prefix_;
-        }
-
-        std::string static_dir() const
-        {
-            return static_dir_;
-        }
-
-        void set_added() {
-            added_ = true;
-        }
-
-        bool is_added() {
-            return added_;
-        }
-
-        DynamicRule& new_rule_dynamic(const std::string& rule)
-        {
-            std::string new_rule = '/' + prefix_ + rule;
-            auto ruleObject = new DynamicRule(std::move(new_rule));
-            ruleObject->custom_templates_base = templates_dir_;
-            all_rules_.emplace_back(ruleObject);
-
-            return *ruleObject;
-        }
-
-        template<uint64_t N>
-        typename black_magic::arguments<N>::type::template rebind<TaggedRule>& new_rule_tagged(const std::string& rule)
-        {
-            std::string new_rule = '/' + prefix_ + rule;
-            using RuleT = typename black_magic::arguments<N>::type::template rebind<TaggedRule>;
-
-            auto ruleObject = new RuleT(std::move(new_rule));
-            ruleObject->custom_templates_base = templates_dir_;
-            all_rules_.emplace_back(ruleObject);
-
-            return *ruleObject;
-        }
-
-        void register_blueprint(Blueprint& blueprint)
-        {
-            if (blueprints_.empty() || std::find(blueprints_.begin(), blueprints_.end(), &blueprint) == blueprints_.end())
-            {
-                apply_blueprint(blueprint);
-                blueprints_.emplace_back(&blueprint);
-            }
-            else
-                throw std::runtime_error("blueprint \"" + blueprint.prefix_ + "\" already exists in blueprint \"" + prefix_ + '\"');
-        }
-
-
-        CatchallRule& catchall_rule()
-        {
-            return catchall_rule_;
-        }
-
-        template<typename App, typename... Middlewares>
-        void middlewares()
-        {
-            mw_indices_.push<App, Middlewares...>();
-        }
-
-    private:
-        void apply_blueprint(Blueprint& blueprint)
-        {
-
-            blueprint.prefix_ = prefix_ + '/' + blueprint.prefix_;
-            blueprint.static_dir_ = static_dir_ + '/' + blueprint.static_dir_;
-            blueprint.templates_dir_ = templates_dir_ + '/' + blueprint.templates_dir_;
-            for (auto& rule : blueprint.all_rules_)
-            {
-                std::string new_rule = '/' + prefix_ + rule->rule_;
-                rule->rule_ = new_rule;
-            }
-            for (Blueprint* bp_child : blueprint.blueprints_)
-            {
-                Blueprint& bp_ref = *bp_child;
-                apply_blueprint(bp_ref);
-            }
-        }
-
-        std::string prefix_;
-        std::string static_dir_;
-        std::string templates_dir_;
-        std::vector<std::unique_ptr<BaseRule>> all_rules_;
-        CatchallRule catchall_rule_;
-        std::vector<Blueprint*> blueprints_;
-        detail::middleware_indices mw_indices_;
-        bool added_{false};
-
-        friend class Router;
-    };
-
-    /// Handles matching requests to existing rules and upgrade requests.
-    class Router
-    {
-    public:
-        Router()
-        {}
-
-        DynamicRule& new_rule_dynamic(const std::string& rule)
-        {
-            auto ruleObject = new DynamicRule(rule);
-            all_rules_.emplace_back(ruleObject);
-
-            return *ruleObject;
-        }
-
-        template<uint64_t N>
-        typename black_magic::arguments<N>::type::template rebind<TaggedRule>& new_rule_tagged(const std::string& rule)
-        {
-            using RuleT = typename black_magic::arguments<N>::type::template rebind<TaggedRule>;
-
-            auto ruleObject = new RuleT(rule);
-            all_rules_.emplace_back(ruleObject);
-
-            return *ruleObject;
-        }
-
-        CatchallRule& catchall_rule()
-        {
-            return catchall_rule_;
-        }
-
-        void internal_add_rule_object(const std::string& rule, BaseRule* ruleObject)
-        {
-            internal_add_rule_object(rule, ruleObject, INVALID_BP_ID, blueprints_);
-        }
-
-        void internal_add_rule_object(const std::string& rule, BaseRule* ruleObject, const uint16_t& BP_index, std::vector<Blueprint*>& blueprints)
-        {
-            bool has_trailing_slash = false;
-            std::string rule_without_trailing_slash;
-            if (rule.size() > 1 && rule.back() == '/')
-            {
-                has_trailing_slash = true;
-                rule_without_trailing_slash = rule;
-                rule_without_trailing_slash.pop_back();
-            }
-
-            ruleObject->mw_indices_.pack();
-
-            ruleObject->foreach_method([&](int method) {
-                per_methods_[method].rules.emplace_back(ruleObject);
-                per_methods_[method].trie.add(rule, per_methods_[method].rules.size() - 1, BP_index != INVALID_BP_ID ? blueprints[BP_index]->prefix().length() : 0, BP_index);
-
-                // directory case:
-                //   request to '/about' url matches '/about/' rule
-                if (has_trailing_slash)
-                {
-                    per_methods_[method].trie.add(rule_without_trailing_slash, RULE_SPECIAL_REDIRECT_SLASH, BP_index != INVALID_BP_ID ? blueprints[BP_index]->prefix().length() : 0, BP_index);
-                }
-            });
-
-            ruleObject->set_added();
-        }
-
-        void register_blueprint(Blueprint& blueprint)
-        {
-            if (std::find(blueprints_.begin(), blueprints_.end(), &blueprint) == blueprints_.end())
-            {
-                blueprints_.emplace_back(&blueprint);
-            }
-            else
-                throw std::runtime_error("blueprint \"" + blueprint.prefix_ + "\" already exists in router");
-        }
-
-        void get_recursive_child_methods(Blueprint* blueprint, std::vector<HTTPMethod>& methods)
-        {
-            //we only need to deal with children if the blueprint has absolutely no methods (meaning its index won't be added to the trie)
-            if (blueprint->static_dir_.empty() && blueprint->all_rules_.empty())
-            {
-                for (Blueprint* bp : blueprint->blueprints_)
-                {
-                    get_recursive_child_methods(bp, methods);
-                }
-            }
-            else if (!blueprint->static_dir_.empty())
-                methods.emplace_back(HTTPMethod::Get);
-            for (auto& rule : blueprint->all_rules_)
-            {
-                rule->foreach_method([&methods](unsigned method) {
-                    HTTPMethod method_final = static_cast<HTTPMethod>(method);
-                    if (std::find(methods.begin(), methods.end(), method_final) == methods.end())
-                        methods.emplace_back(method_final);
-                });
-            }
-        }
-
-        void validate_bp() {
-            //Take all the routes from the registered blueprints and add them to `all_rules_` to be processed.
-            detail::middleware_indices blueprint_mw;
-            validate_bp(blueprints_, blueprint_mw);
-        }
-
-        void validate_bp(std::vector<Blueprint*> blueprints, detail::middleware_indices& current_mw)
-        {
-            for (unsigned i = 0; i < blueprints.size(); i++)
-            {
-                Blueprint* blueprint = blueprints[i];
-
-                if (blueprint->is_added()) continue;
-
-                if (blueprint->static_dir_ == "" && blueprint->all_rules_.empty())
-                {
-                    std::vector<HTTPMethod> methods;
-                    get_recursive_child_methods(blueprint, methods);
-                    for (HTTPMethod x : methods)
-                    {
-                        int i = static_cast<int>(x);
-                        per_methods_[i].trie.add(blueprint->prefix(), 0, blueprint->prefix().length(), i);
-                    }
-                }
-
-                current_mw.merge_back(blueprint->mw_indices_);
-                for (auto& rule : blueprint->all_rules_)
-                {
-                    if (rule && !rule->is_added())
-                    {
-                        auto upgraded = rule->upgrade();
-                        if (upgraded)
-                            rule = std::move(upgraded);
-                        rule->validate();
-                        rule->mw_indices_.merge_front(current_mw);
-                        internal_add_rule_object(rule->rule(), rule.get(), i, blueprints);
-                    }
-                }
-                validate_bp(blueprint->blueprints_, current_mw);
-                current_mw.pop_back(blueprint->mw_indices_);
-                blueprint->set_added();
-            }
-        }
-
-        void validate()
-        {
-            for (auto& rule : all_rules_)
-            {
-                if (rule && !rule->is_added())
-                {
-                    auto upgraded = rule->upgrade();
-                    if (upgraded)
-                        rule = std::move(upgraded);
-                    rule->validate();
-                    internal_add_rule_object(rule->rule(), rule.get());
-                }
-            }
-            for (auto& per_method : per_methods_)
-            {
-                per_method.trie.validate();
-            }
-        }
-
-        // TODO maybe add actual_method
-        template<typename Adaptor>
-        void handle_upgrade(const request& req, response& res, Adaptor&& adaptor)
-        {
-            if (req.method >= HTTPMethod::InternalMethodCount)
-                return;
-
-            auto& per_method = per_methods_[static_cast<int>(req.method)];
-            auto& rules = per_method.rules;
-            unsigned rule_index = per_method.trie.find(req.url).rule_index;
-
-            if (!rule_index)
-            {
-                for (auto& per_method : per_methods_)
-                {
-                    if (per_method.trie.find(req.url).rule_index)
-                    {
-                        CROW_LOG_DEBUG << "Cannot match method " << req.url << " " << method_name(req.method);
-                        res = response(405);
-                        res.end();
-                        return;
-                    }
-                }
-
-                CROW_LOG_INFO << "Cannot match rules " << req.url;
-                res = response(404);
-                res.end();
-                return;
-            }
-
-            if (rule_index >= rules.size())
-                throw std::runtime_error("Trie internal structure corrupted!");
-
-            if (rule_index == RULE_SPECIAL_REDIRECT_SLASH)
-            {
-                CROW_LOG_INFO << "Redirecting to a url with trailing slash: " << req.url;
-                res = response(301);
-
-                // TODO(ipkn) absolute url building
-                if (req.get_header_value("Host").empty())
-                {
-                    res.add_header("Location", req.url + "/");
-                }
-                else
-                {
-                    res.add_header("Location", "http://" + req.get_header_value("Host") + req.url + "/");
-                }
-                res.end();
-                return;
-            }
-
-            CROW_LOG_DEBUG << "Matched rule (upgrade) '" << rules[rule_index]->rule_ << "' " << static_cast<uint32_t>(req.method) << " / " << rules[rule_index]->get_methods();
-
-            try
-            {
-                rules[rule_index]->handle_upgrade(req, res, std::move(adaptor));
-            }
-            catch (...)
-            {
-                exception_handler_(res);
-                res.end();
-                return;
-            }
-        }
-
-        void get_found_bp(std::vector<uint16_t>& bp_i, std::vector<Blueprint*>& blueprints, std::vector<Blueprint*>& found_bps, uint16_t index = 0)
-        {
-            // This statement makes 3 assertions:
-            // 1. The index is above 0.
-            // 2. The index does not lie outside the given blueprint list.
-            // 3. The next blueprint we're adding has a prefix that starts the same as the already added blueprint + a slash (the rest is irrelevant).
-            //
-            // This is done to prevent a blueprint that has a prefix of "bp_prefix2" to be assumed as a child of one that has "bp_prefix".
-            //
-            // If any of the assertions is untrue, we delete the last item added, and continue using the blueprint list of the blueprint found before, the topmost being the router's list
-            auto verify_prefix = [&bp_i, &index, &blueprints, &found_bps]() {
-                return index > 0 &&
-                       bp_i[index] < blueprints.size() &&
-                       blueprints[bp_i[index]]->prefix().substr(0, found_bps[index - 1]->prefix().length() + 1).compare(std::string(found_bps[index - 1]->prefix() + '/')) == 0;
-            };
-            if (index < bp_i.size())
-            {
-
-                if (verify_prefix())
-                {
-                    found_bps.push_back(blueprints[bp_i[index]]);
-                    get_found_bp(bp_i, found_bps.back()->blueprints_, found_bps, ++index);
-                }
-                else
-                {
-                    if (found_bps.size() < 2)
-                    {
-                        found_bps.clear();
-                        found_bps.push_back(blueprints_[bp_i[index]]);
-                    }
-                    else
-                    {
-                        found_bps.pop_back();
-                        Blueprint* last_element = found_bps.back();
-                        found_bps.push_back(last_element->blueprints_[bp_i[index]]);
-                    }
-                    get_found_bp(bp_i, found_bps.back()->blueprints_, found_bps, ++index);
-                }
-            }
-        }
-
-        /// Is used to handle errors, you insert the error code, found route, request, and response. and it'll either call the appropriate catchall route (considering the blueprint system) and send you a status string (which is mainly used for debug messages), or just set the response code to the proper error code.
-        std::string get_error(unsigned short code, routing_handle_result& found, const request& req, response& res)
-        {
-            res.code = code;
-            std::vector<Blueprint*> bps_found;
-            get_found_bp(found.blueprint_indices, blueprints_, bps_found);
-            for (int i = bps_found.size() - 1; i > 0; i--)
-            {
-                std::vector<uint16_t> bpi = found.blueprint_indices;
-                if (bps_found[i]->catchall_rule().has_handler())
-                {
-                    try
-                    {
-                        bps_found[i]->catchall_rule().handler_(req, res);
-                    }
-                    catch (...)
-                    {
-                        exception_handler_(res);
-                    }
-#ifdef CROW_ENABLE_DEBUG
-                    return std::string("Redirected to Blueprint \"" + bps_found[i]->prefix() + "\" Catchall rule");
-#else
-                    return std::string();
-#endif
-                }
-            }
-            if (catchall_rule_.has_handler())
-            {
-                try
-                {
-                    catchall_rule_.handler_(req, res);
-                }
-                catch (...)
-                {
-                    exception_handler_(res);
-                }
-#ifdef CROW_ENABLE_DEBUG
-                return std::string("Redirected to global Catchall rule");
-#else
-                return std::string();
-#endif
-            }
-            return std::string();
-        }
-
-        std::unique_ptr<routing_handle_result> handle_initial(request& req, response& res)
-        {
-            HTTPMethod method_actual = req.method;
-
-            std::unique_ptr<routing_handle_result> found{
-              new routing_handle_result(
-                0,
-                std::vector<uint16_t>(),
-                routing_params(),
-                HTTPMethod::InternalMethodCount)}; // This is always returned to avoid a null pointer dereference.
-
-            // NOTE(EDev): This most likely will never run since the parser should handle this situation and close the connection before it gets here.
-            if (CROW_UNLIKELY(req.method >= HTTPMethod::InternalMethodCount))
-                return found;
-            else if (req.method == HTTPMethod::Head)
-            {
-                *found = per_methods_[static_cast<int>(method_actual)].trie.find(req.url);
-                // support HEAD requests using GET if not defined as method for the requested URL
-                if (!found->rule_index)
-                {
-                    method_actual = HTTPMethod::Get;
-                    *found = per_methods_[static_cast<int>(method_actual)].trie.find(req.url);
-                    if (!found->rule_index) // If a route is still not found, return a 404 without executing the rest of the HEAD specific code.
-                    {
-                        CROW_LOG_DEBUG << "Cannot match rules " << req.url;
-                        res = response(404); //TODO(EDev): Should this redirect to catchall?
-                        res.end();
-                        return found;
-                    }
-                }
-
-                res.skip_body = true;
-                found->method = method_actual;
-                return found;
-            }
-            else if (req.method == HTTPMethod::Options)
-            {
-                std::string allow = "OPTIONS, HEAD, ";
-
-                if (req.url == "/*")
-                {
-                    for (int i = 0; i < static_cast<int>(HTTPMethod::InternalMethodCount); i++)
-                    {
-                        if (static_cast<int>(HTTPMethod::Head) == i)
-                            continue; // HEAD is always allowed
-
-                        if (!per_methods_[i].trie.is_empty())
-                        {
-                            allow += method_name(static_cast<HTTPMethod>(i)) + ", ";
-                        }
-                    }
-                    allow = allow.substr(0, allow.size() - 2);
-                    res = response(204);
-                    res.set_header("Allow", allow);
-                    res.end();
-                    found->method = method_actual;
-                    return found;
-                }
-                else
-                {
-                    bool rules_matched = false;
-                    for (int i = 0; i < static_cast<int>(HTTPMethod::InternalMethodCount); i++)
-                    {
-                        if (per_methods_[i].trie.find(req.url).rule_index)
-                        {
-                            rules_matched = true;
-
-                            if (static_cast<int>(HTTPMethod::Head) == i)
-                                continue; // HEAD is always allowed
-
-                            allow += method_name(static_cast<HTTPMethod>(i)) + ", ";
-                        }
-                    }
-                    if (rules_matched)
-                    {
-                        allow = allow.substr(0, allow.size() - 2);
-                        res = response(204);
-                        res.set_header("Allow", allow);
-                        res.end();
-                        found->method = method_actual;
-                        return found;
-                    }
-                    else
-                    {
-                        CROW_LOG_DEBUG << "Cannot match rules " << req.url;
-                        res = response(404); //TODO(EDev): Should this redirect to catchall?
-                        res.end();
-                        return found;
-                    }
-                }
-            }
-            else // Every request that isn't a HEAD or OPTIONS request
-            {
-                *found = per_methods_[static_cast<int>(method_actual)].trie.find(req.url);
-                // TODO(EDev): maybe ending the else here would allow the requests coming from above (after removing the return statement) to be checked on whether they actually point to a route
-                if (!found->rule_index)
-                {
-                    for (auto& per_method : per_methods_)
-                    {
-                        if (per_method.trie.find(req.url).rule_index) //Route found, but in another method
-                        {
-                            const std::string error_message(get_error(405, *found, req, res));
-                            CROW_LOG_DEBUG << "Cannot match method " << req.url << " " << method_name(method_actual) << ". " << error_message;
-                            res.end();
-                            return found;
-                        }
-                    }
-                    //Route does not exist anywhere
-
-                    const std::string error_message(get_error(404, *found, req, res));
-                    CROW_LOG_DEBUG << "Cannot match rules " << req.url << ". " << error_message;
-                    res.end();
-                    return found;
-                }
-
-                found->method = method_actual;
-                return found;
-            }
-        }
-
-        template<typename App>
-        void handle(request& req, response& res, routing_handle_result found)
-        {
-            HTTPMethod method_actual = found.method;
-            auto& rules = per_methods_[static_cast<int>(method_actual)].rules;
-            unsigned rule_index = found.rule_index;
-
-            if (rule_index >= rules.size())
-                throw std::runtime_error("Trie internal structure corrupted!");
-
-            if (rule_index == RULE_SPECIAL_REDIRECT_SLASH)
-            {
-                CROW_LOG_INFO << "Redirecting to a url with trailing slash: " << req.url;
-                res = response(301);
-
-                // TODO(ipkn) absolute url building
-                if (req.get_header_value("Host").empty())
-                {
-                    res.add_header("Location", req.url + "/");
-                }
-                else
-                {
-                    res.add_header("Location", "http://" + req.get_header_value("Host") + req.url + "/");
-                }
-                res.end();
-                return;
-            }
-
-            CROW_LOG_DEBUG << "Matched rule '" << rules[rule_index]->rule_ << "' " << static_cast<uint32_t>(req.method) << " / " << rules[rule_index]->get_methods();
-
-            try
-            {
-                auto& rule = rules[rule_index];
-                handle_rule<App>(rule, req, res, found.r_params);
-            }
-            catch (...)
-            {
-                exception_handler_(res);
-                res.end();
-                return;
-            }
-        }
-
-        template<typename App>
-        typename std::enable_if<std::tuple_size<typename App::mw_container_t>::value != 0, void>::type
-          handle_rule(BaseRule* rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
-        {
-            if (!rule->mw_indices_.empty())
-            {
-                auto& ctx = *reinterpret_cast<typename App::context_t*>(req.middleware_context);
-                auto& container = *reinterpret_cast<typename App::mw_container_t*>(req.middleware_container);
-                detail::middleware_call_criteria_dynamic<false> crit_fwd(rule->mw_indices_.indices());
-
-                auto glob_completion_handler = std::move(res.complete_request_handler_);
-                res.complete_request_handler_ = [] {};
-
-                detail::middleware_call_helper<decltype(crit_fwd),
-                                               0, typename App::context_t, typename App::mw_container_t>(crit_fwd, container, req, res, ctx);
-
-                if (res.completed_)
-                {
-                    glob_completion_handler();
-                    return;
-                }
-
-                res.complete_request_handler_ = [&rule, &ctx, &container, &req, &res, glob_completion_handler] {
-                    detail::middleware_call_criteria_dynamic<true> crit_bwd(rule->mw_indices_.indices());
-
-                    detail::after_handlers_call_helper<
-                      decltype(crit_bwd),
-                      std::tuple_size<typename App::mw_container_t>::value - 1,
-                      typename App::context_t,
-                      typename App::mw_container_t>(crit_bwd, container, ctx, req, res);
-                    glob_completion_handler();
-                };
-            }
-            rule->handle(req, res, rp);
-        }
-
-        template<typename App>
-        typename std::enable_if<std::tuple_size<typename App::mw_container_t>::value == 0, void>::type
-          handle_rule(BaseRule* rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
-        {
-            rule->handle(req, res, rp);
-        }
-
-        void debug_print()
-        {
-            for (int i = 0; i < static_cast<int>(HTTPMethod::InternalMethodCount); i++)
-            {
-                Trie& trie_ = per_methods_[i].trie;
-                if (!trie_.is_empty())
-                {
-                    CROW_LOG_DEBUG << method_name(static_cast<HTTPMethod>(i));
-                    trie_.debug_print();
-                }
-            }
-        }
-
-        std::vector<Blueprint*>& blueprints()
-        {
-            return blueprints_;
-        }
-
-        std::function<void(crow::response&)>& exception_handler()
-        {
-            return exception_handler_;
-        }
-
-        static void default_exception_handler(response& res)
-        {
-            // any uncaught exceptions become 500s
-            res = response(500);
-
-            try
-            {
-                throw;
-            }
-            catch (const std::exception& e)
-            {
-                CROW_LOG_ERROR << "An uncaught exception occurred: " << e.what();
-            }
-            catch (...)
-            {
-                CROW_LOG_ERROR << "An uncaught exception occurred. The type was unknown so no information was available.";
-            }
-        }
-
-    private:
-        CatchallRule catchall_rule_;
-
-        struct PerMethod
-        {
-            std::vector<BaseRule*> rules;
-            Trie trie;
-
-            // rule index 0, 1 has special meaning; preallocate it to avoid duplication.
-            PerMethod():
-              rules(2) {}
-        };
-        std::array<PerMethod, static_cast<int>(HTTPMethod::InternalMethodCount)> per_methods_;
-        std::vector<std::unique_ptr<BaseRule>> all_rules_;
-        std::vector<Blueprint*> blueprints_;
-        std::function<void(crow::response&)> exception_handler_ = &default_exception_handler;
-    };
-} // namespace crow
-
-
-namespace crow
-{
-    struct CORSHandler;
-
-    /// Used for tuning CORS policies
-    struct CORSRules
-    {
-        friend struct crow::CORSHandler;
-
-        /// Set Access-Control-Allow-Origin. Default is "*"
-        CORSRules& origin(const std::string& origin)
-        {
-            origin_ = origin;
-            return *this;
-        }
-
-        /// Set Access-Control-Allow-Methods. Default is "*"
-        CORSRules& methods(crow::HTTPMethod method)
-        {
-            add_list_item(methods_, crow::method_name(method));
-            return *this;
-        }
-
-        /// Set Access-Control-Allow-Methods. Default is "*"
-        template<typename... Methods>
-        CORSRules& methods(crow::HTTPMethod method, Methods... method_list)
-        {
-            add_list_item(methods_, crow::method_name(method));
-            methods(method_list...);
-            return *this;
-        }
-
-        /// Set Access-Control-Allow-Headers. Default is "*"
-        CORSRules& headers(const std::string& header)
-        {
-            add_list_item(headers_, header);
-            return *this;
-        }
-
-        /// Set Access-Control-Allow-Headers. Default is "*"
-        template<typename... Headers>
-        CORSRules& headers(const std::string& header, Headers... header_list)
-        {
-            add_list_item(headers_, header);
-            headers(header_list...);
-            return *this;
-        }
-
-        /// Set Access-Control-Max-Age. Default is none
-        CORSRules& max_age(int max_age)
-        {
-            max_age_ = std::to_string(max_age);
-            return *this;
-        }
-
-        /// Enable Access-Control-Allow-Credentials
-        CORSRules& allow_credentials()
-        {
-            allow_credentials_ = true;
-            return *this;
-        }
-
-        /// Ignore CORS and don't send any headers
-        void ignore()
-        {
-            ignore_ = true;
-        }
-
-        /// Handle CORS on specific prefix path
-        CORSRules& prefix(const std::string& prefix);
-
-        /// Handle CORS for specific blueprint
-        CORSRules& blueprint(const Blueprint& bp);
-
-        /// Global CORS policy
-        CORSRules& global();
-
-    private:
-        CORSRules() = delete;
-        CORSRules(CORSHandler* handler):
-          handler_(handler) {}
-
-        /// build comma separated list
-        void add_list_item(std::string& list, const std::string& val)
-        {
-            if (list == "*") list = "";
-            if (list.size() > 0) list += ", ";
-            list += val;
-        }
-
-        /// Set header `key` to `value` if it is not set
-        void set_header_no_override(const std::string& key, const std::string& value, crow::response& res)
-        {
-            if (value.size() == 0) return;
-            if (!get_header_value(res.headers, key).empty()) return;
-            res.add_header(key, value);
-        }
-
-        /// Set response headers
-        void apply(crow::response& res)
-        {
-            if (ignore_) return;
-            set_header_no_override("Access-Control-Allow-Origin", origin_, res);
-            set_header_no_override("Access-Control-Allow-Methods", methods_, res);
-            set_header_no_override("Access-Control-Allow-Headers", headers_, res);
-            set_header_no_override("Access-Control-Max-Age", max_age_, res);
-            if (allow_credentials_) set_header_no_override("Access-Control-Allow-Credentials", "true", res);
-        }
-
-        bool ignore_ = false;
-        // TODO: support multiple origins that are dynamically selected
-        std::string origin_ = "*";
-        std::string methods_ = "*";
-        std::string headers_ = "*";
-        std::string max_age_;
-        bool allow_credentials_ = false;
-
-        CORSHandler* handler_;
-    };
-
-    /// CORSHandler is a global middleware for setting CORS headers.
-
-    ///
-    /// By default, it sets Access-Control-Allow-Origin/Methods/Headers to "*".
-    /// The default behaviour can be changed with the `global()` cors rule.
-    /// Additional rules for prexies can be added with `prefix()`.
-    struct CORSHandler
-    {
-        struct context
-        {};
-
-        void before_handle(crow::request& /*req*/, crow::response& /*res*/, context& /*ctx*/)
-        {}
-
-        void after_handle(crow::request& req, crow::response& res, context& /*ctx*/)
-        {
-            auto& rule = find_rule(req.url);
-            rule.apply(res);
-        }
-
-        /// Handle CORS on a specific prefix path
-        CORSRules& prefix(const std::string& prefix)
-        {
-            rules.emplace_back(prefix, CORSRules(this));
-            return rules.back().second;
-        }
-
-        /// Handle CORS for a specific blueprint
-        CORSRules& blueprint(const Blueprint& bp)
-        {
-            rules.emplace_back(bp.prefix(), CORSRules(this));
-            return rules.back().second;
-        }
-
-        /// Get the global CORS policy
-        CORSRules& global()
-        {
-            return default_;
-        }
-
-    private:
-        CORSRules& find_rule(const std::string& path)
-        {
-            // TODO: use a trie in case of many rules
-            for (auto& rule : rules)
-            {
-                // Check if path starts with a rules prefix
-                if (path.rfind(rule.first, 0) == 0)
-                {
-                    return rule.second;
-                }
-            }
-            return default_;
-        }
-
-        std::vector<std::pair<std::string, CORSRules>> rules;
-        CORSRules default_ = CORSRules(this);
-    };
-
-    inline CORSRules& CORSRules::prefix(const std::string& prefix)
-    {
-        return handler_->prefix(prefix);
-    }
-
-    inline CORSRules& CORSRules::blueprint(const Blueprint& bp)
-    {
-        return handler_->blueprint(bp);
-    }
-
-    inline CORSRules& CORSRules::global()
-    {
-        return handler_->global();
-    }
-
-} // namespace crow
-
-/**
- * \file crow/app.h
- * \brief This file includes the definition of the crow::Crow class,
- * the crow::App and crow::SimpleApp aliases, and some macros.
- *
- * In this file are defined:
- * - crow::Crow
- * - crow::App
- * - crow::SimpleApp
- * - \ref CROW_ROUTE
- * - \ref CROW_BP_ROUTE
- * - \ref CROW_WEBSOCKET_ROUTE
- * - \ref CROW_MIDDLEWARES
- * - \ref CROW_CATCHALL_ROUTE
- * - \ref CROW_BP_CATCHALL_ROUTE
- */
-
-
-#include <chrono>
-#include <string>
-#include <functional>
-#include <memory>
-#include <future>
-#include <cstdint>
-#include <type_traits>
-#include <thread>
-#include <condition_variable>
-
-#ifdef CROW_ENABLE_COMPRESSION
-#endif // #ifdef CROW_ENABLE_COMPRESSION
-
-
-#ifdef CROW_MSVC_WORKAROUND
-
-#define CROW_ROUTE(app, url) app.route_dynamic(url) // See the documentation in the comment below.
-#define CROW_BP_ROUTE(blueprint, url) blueprint.new_rule_dynamic(url) // See the documentation in the comment below.
-
-#else // #ifdef CROW_MSVC_WORKAROUND
-
-/**
- * \def CROW_ROUTE(app, url)
- * \brief Creates a route for app using a rule.
- *
- * It use crow::Crow::route_dynamic or crow::Crow::route to define
- * a rule for your application. It's usage is like this:
- *
- * ```cpp
- * auto app = crow::SimpleApp(); // or crow::App()
- * CROW_ROUTE(app, "/")
- * ([](){
- *     return "<h1>Hello, world!</h1>";
- * });
- * ```
- *
- * This is the recommended way to define routes in a crow application.
- * \see [Page of guide "Routes"](https://crowcpp.org/master/guides/routes/).
- */
-#define CROW_ROUTE(app, url) app.template route<crow::black_magic::get_parameter_tag(url)>(url)
-
-/**
- * \def CROW_BP_ROUTE(blueprint, url)
- * \brief Creates a route for a blueprint using a rule.
- *
- * It may use crow::Blueprint::new_rule_dynamic or
- * crow::Blueprint::new_rule_tagged to define a new rule for
- * an given blueprint. It's usage is similar
- * to CROW_ROUTE macro:
- *
- * ```cpp
- * crow::Blueprint my_bp();
- * CROW_BP_ROUTE(my_bp, "/")
- * ([](){
- *     return "<h1>Hello, world!</h1>";
- * });
- * ```
- *
- * This is the recommended way to define routes in a crow blueprint
- * because of its compile-time capabilities.
- *
- * \see [Page of the guide "Blueprints"](https://crowcpp.org/master/guides/blueprints/).
- */
-#define CROW_BP_ROUTE(blueprint, url) blueprint.new_rule_tagged<crow::black_magic::get_parameter_tag(url)>(url)
-
-/**
- * \def CROW_WEBSOCKET_ROUTE(app, url)
- * \brief Defines WebSocket route for app.
- *
- * It binds a WebSocket route to app. Easy solution to implement
- * WebSockets in your app. The usage syntax of this macro is
- * like this:
- *
- * ```cpp
- * auto app = crow::SimpleApp(); // or crow::App()
- * CROW_WEBSOCKET_ROUTE(app, "/ws")
- *     .onopen([&](crow::websocket::connection& conn){
- *                do_something();
- *            })
- *     .onclose([&](crow::websocket::connection& conn, const std::string& reason){
- *                 do_something();
- *             })
- *     .onmessage([&](crow::websocket::connection&, const std::string& data, bool is_binary){
- *                   if (is_binary)
- *                       do_something(data);
- *                   else
- *                       do_something_else(data);
- *               });
- * ```
- *
- * \see [Page of the guide "WebSockets"](https://crowcpp.org/master/guides/websockets/).
- */
-#define CROW_WEBSOCKET_ROUTE(app, url) app.route<crow::black_magic::get_parameter_tag(url)>(url).websocket<std::remove_reference<decltype(app)>::type>(&app)
-
-/**
- * \def CROW_MIDDLEWARES(app, ...)
- * \brief Enable a Middleware for an specific route in app
- * or blueprint.
- *
- * It defines the usage of a Middleware in one route. And it
- * can be used in both crow::SimpleApp (and crow::App) instances and
- * crow::Blueprint. Its usage syntax is like this:
- *
- * ```cpp
- * auto app = crow::SimpleApp(); // or crow::App()
- * CROW_ROUTE(app, "/with_middleware")
- * .CROW_MIDDLEWARES(app, LocalMiddleware) // Can be used more than one
- * ([]() {                                 // middleware.
- *     return "Hello world!";
- * });
- * ```
- *
- * \see [Page of the guide "Middlewares"](https://crowcpp.org/master/guides/middleware/).
- */
-#define CROW_MIDDLEWARES(app, ...) template middlewares<typename std::remove_reference<decltype(app)>::type, __VA_ARGS__>()
-
-#endif // #ifdef CROW_MSVC_WORKAROUND
-
-/**
- * \def CROW_CATCHALL_ROUTE(app)
- * \brief Defines a custom catchall route for app using a
- * custom rule.
- *
- * It defines a handler when the client make a request for an
- * undefined route. Instead of just reply with a `404` status
- * code (default behavior), you can define a custom handler
- * using this macro.
- *
- * \see [Page of the guide "Routes" (Catchall routes)](https://crowcpp.org/master/guides/routes/#catchall-routes).
- */ 
-#define CROW_CATCHALL_ROUTE(app) app.catchall_route()
-
-/**
- * \def CROW_BP_CATCHALL_ROUTE(blueprint)
- * \brief Defines a custom catchall route for blueprint
- * using a custom rule.
- *
- * It defines a handler when the client make a request for an
- * undefined route in the blueprint.
- *
- * \see [Page of the guide "Blueprint" (Define a custom Catchall route)](https://crowcpp.org/master/guides/blueprints/#define-a-custom-catchall-route).
- */ 
-#define CROW_BP_CATCHALL_ROUTE(blueprint) blueprint.catchall_rule()
-
-
-/**
- * \namespace crow
- * \brief The main namespace of the library. In this namespace
- * is defined the most important classes and functions of the
- * library.
- * 
- * Within this namespace, the Crow class, Router class, Connection
- * class, and other are defined.
- */
-namespace crow
-{
-#ifdef CROW_ENABLE_SSL
-    using ssl_context_t = asio::ssl::context;
-#endif
-    /**
-     * \class Crow
-     * \brief The main server application class.
-     *
-     * Use crow::SimpleApp or crow::App<Middleware1, Middleware2, etc...> instead of
-     * directly instantiate this class.
-     */
-    template<typename... Middlewares>
-    class Crow
-    {
-    public:
-        /// \brief This is the crow application
-        using self_t = Crow;
-
-        /// \brief The HTTP server
-        using server_t = Server<Crow, SocketAdaptor, Middlewares...>;
-
-#ifdef CROW_ENABLE_SSL
-        /// \brief An HTTP server that runs on SSL with an SSLAdaptor
-        using ssl_server_t = Server<Crow, SSLAdaptor, Middlewares...>;
-#endif
-        Crow()
-        {}
-
-        /// \brief Construct Crow with a subset of middleware
-        template<typename... Ts>
-        Crow(Ts&&... ts):
-          middlewares_(make_middleware_tuple(std::forward<Ts>(ts)...))
-        {}
-
-        /// \brief Process an Upgrade request
-        ///
-        /// Currently used to upgrade an HTTP connection to a WebSocket connection
-        template<typename Adaptor>
-        void handle_upgrade(const request& req, response& res, Adaptor&& adaptor)
-        {
-            router_.handle_upgrade(req, res, adaptor);
-        }
-
-        /// \brief Process only the method and URL of a request and provide a route (or an error response)
-        std::unique_ptr<routing_handle_result> handle_initial(request& req, response& res)
-        {
-            return router_.handle_initial(req, res);
-        }
-
-        /// \brief Process the fully parsed request and generate a response for it
-        void handle(request& req, response& res, std::unique_ptr<routing_handle_result>& found)
-        {
-            router_.handle<self_t>(req, res, *found);
-        }
-
-        /// \brief Process a fully parsed request from start to finish (primarily used for debugging)
-        void handle_full(request& req, response& res)
-        {
-            auto found = handle_initial(req, res);
-            if (found->rule_index)
-                handle(req, res, found);
-        }
-
-        /// \brief Create a dynamic route using a rule (**Use CROW_ROUTE instead**)
-        DynamicRule& route_dynamic(const std::string& rule)
-        {
-            return router_.new_rule_dynamic(rule);
-        }
-
-        /// \brief Create a route using a rule (**Use CROW_ROUTE instead**)
-        template<uint64_t Tag>
-#ifdef CROW_GCC83_WORKAROUND
-        auto& route(const std::string& rule)
-#else
-        auto route(const std::string& rule)
-#endif
-#if defined CROW_CAN_USE_CPP17 && !defined CROW_GCC83_WORKAROUND
-          -> typename std::invoke_result<decltype(&Router::new_rule_tagged<Tag>), Router, const std::string&>::type
-#elif !defined CROW_GCC83_WORKAROUND
-          -> typename std::result_of<decltype (&Router::new_rule_tagged<Tag>)(Router, const std::string&)>::type
-#endif
-        {
-            return router_.new_rule_tagged<Tag>(rule);
-        }
-
-        /// \brief Create a route for any requests without a proper route (**Use CROW_CATCHALL_ROUTE instead**)
-        CatchallRule& catchall_route()
-        {
-            return router_.catchall_rule();
-        }
-
-        /// \brief Set the default max payload size for websockets
-        self_t& websocket_max_payload(uint64_t max_payload)
-        {
-            max_payload_ = max_payload;
-            return *this;
-        }
-
-        /// \brief Get the default max payload size for websockets
-        uint64_t websocket_max_payload()
-        {
-            return max_payload_;
-        }
-
-        self_t& signal_clear()
-        {
-            signals_.clear();
-            return *this;
-        }
-
-        self_t& signal_add(int signal_number)
-        {
-            signals_.push_back(signal_number);
-            return *this;
-        }
-
-        std::vector<int> signals()
-        {
-            return signals_;
-        }
-
-        /// \brief Set the port that Crow will handle requests on
-        self_t& port(std::uint16_t port)
-        {
-            port_ = port;
-            return *this;
-        }
-
-        /// \brief Get the port that Crow will handle requests on
-        std::uint16_t port()
-        {
-            return port_;
-        }
-
-        /// \brief Set the connection timeout in seconds (default is 5)
-        self_t& timeout(std::uint8_t timeout)
-        {
-            timeout_ = timeout;
-            return *this;
-        }
-
-        /// \brief Set the server name
-        self_t& server_name(std::string server_name)
-        {
-            server_name_ = server_name;
-            return *this;
-        }
-
-        /// \brief The IP address that Crow will handle requests on (default is 0.0.0.0)
-        self_t& bindaddr(std::string bindaddr)
-        {
-            bindaddr_ = bindaddr;
-            return *this;
-        }
-
-        /// \brief Get the address that Crow will handle requests on
-        std::string bindaddr()
-        {
-            return bindaddr_;
-        }
-
-        /// \brief Run the server on multiple threads using all available threads
-        self_t& multithreaded()
-        {
-            return concurrency(std::thread::hardware_concurrency());
-        }
-
-        /// \brief Run the server on multiple threads using a specific number
-        self_t& concurrency(std::uint16_t concurrency)
-        {
-            if (concurrency < 2) // Crow can have a minimum of 2 threads running
-                concurrency = 2;
-            concurrency_ = concurrency;
-            return *this;
-        }
-
-        /// \brief Get the number of threads that server is using
-        std::uint16_t concurrency()
-        {
-            return concurrency_;
-        }
-
-        /// \brief Set the server's log level
-        ///
-        /// Possible values are:
-        /// - crow::LogLevel::Debug       (0)
-        /// - crow::LogLevel::Info        (1)
-        /// - crow::LogLevel::Warning     (2)
-        /// - crow::LogLevel::Error       (3)
-        /// - crow::LogLevel::Critical    (4)
-        self_t& loglevel(LogLevel level)
-        {
-            crow::logger::setLogLevel(level);
-            return *this;
-        }
-
-        /// \brief Set the response body size (in bytes) beyond which Crow automatically streams responses (Default is 1MiB)
-        ///
-        /// Any streamed response is unaffected by Crow's timer, and therefore won't timeout before a response is fully sent.
-        self_t& stream_threshold(size_t threshold)
-        {
-            res_stream_threshold_ = threshold;
-            return *this;
-        }
-
-        /// \brief Get the response body size (in bytes) beyond which Crow automatically streams responses
-        size_t& stream_threshold()
-        {
-            return res_stream_threshold_;
-        }
-
-        
-        self_t& register_blueprint(Blueprint& blueprint)
-        {
-            router_.register_blueprint(blueprint);
-            return *this;
-        }
-
-        /// \brief Set the function to call to handle uncaught exceptions generated in routes (Default generates error 500).
-        ///
-        /// The function must have the following signature: void(crow::response&).
-        /// It must set the response passed in argument to the function, which will be sent back to the client.
-        /// See Router::default_exception_handler() for the default implementation.
-        template<typename Func>
-        self_t& exception_handler(Func&& f)
-        {
-            router_.exception_handler() = std::forward<Func>(f);
-            return *this;
-        }
-
-        std::function<void(crow::response&)>& exception_handler()
-        {
-            return router_.exception_handler();
-        }
-
-        /// \brief Set a custom duration and function to run on every tick
-        template<typename Duration, typename Func>
-        self_t& tick(Duration d, Func f)
-        {
-            tick_interval_ = std::chrono::duration_cast<std::chrono::milliseconds>(d);
-            tick_function_ = f;
-            return *this;
-        }
-
-#ifdef CROW_ENABLE_COMPRESSION
-        
-        self_t& use_compression(compression::algorithm algorithm)
-        {
-            comp_algorithm_ = algorithm;
-            compression_used_ = true;
-            return *this;
-        }
-
-        compression::algorithm compression_algorithm()
-        {
-            return comp_algorithm_;
-        }
-
-        bool compression_used() const
-        {
-            return compression_used_;
-        }
-#endif
-
-        /// \brief Apply blueprints
-        void add_blueprint()
-        {
-#if defined(__APPLE__) || defined(__MACH__)
-            if (router_.blueprints().empty()) return;
-#endif
-
-            for (Blueprint* bp : router_.blueprints())
-            {
-                if (bp->static_dir().empty()) continue;
-
-                auto static_dir_ = crow::utility::normalize_path(bp->static_dir());
-
-                bp->new_rule_tagged<crow::black_magic::get_parameter_tag(CROW_STATIC_ENDPOINT)>(CROW_STATIC_ENDPOINT)([static_dir_](crow::response& res, std::string file_path_partial) {
-                    utility::sanitize_filename(file_path_partial);
-                    res.set_static_file_info_unsafe(static_dir_ + file_path_partial);
-                    res.end();
-                });
-            }
-
-            router_.validate_bp();
-        }
-
-        /// \brief Go through the rules, upgrade them if possible, and add them to the list of rules
-        void add_static_dir()
-        {
-            if (are_static_routes_added()) return;
-            auto static_dir_ = crow::utility::normalize_path(CROW_STATIC_DIRECTORY);
-
-            route<crow::black_magic::get_parameter_tag(CROW_STATIC_ENDPOINT)>(CROW_STATIC_ENDPOINT)([static_dir_](crow::response& res, std::string file_path_partial) {
-                utility::sanitize_filename(file_path_partial);
-                res.set_static_file_info_unsafe(static_dir_ + file_path_partial);
-                res.end();
-            });
-            set_static_routes_added();
-        }
-
-        /// \brief A wrapper for `validate()` in the router
-        void validate()
-        {
-            router_.validate();
-        }
-
-        /// \brief Run the server
-        void run()
-        {
-#ifndef CROW_DISABLE_STATIC_DIR
-            add_blueprint();
-            add_static_dir();
-#endif
-            validate();
-
-#ifdef CROW_ENABLE_SSL
-            if (ssl_used_)
-            {
-                ssl_server_ = std::move(std::unique_ptr<ssl_server_t>(new ssl_server_t(this, bindaddr_, port_, server_name_, &middlewares_, concurrency_, timeout_, &ssl_context_)));
-                ssl_server_->set_tick_function(tick_interval_, tick_function_);
-                ssl_server_->signal_clear();
-                for (auto snum : signals_)
-                {
-                    ssl_server_->signal_add(snum);
-                }
-                notify_server_start();
-                ssl_server_->run();
-            }
-            else
-#endif
-            {
-                server_ = std::move(std::unique_ptr<server_t>(new server_t(this, bindaddr_, port_, server_name_, &middlewares_, concurrency_, timeout_, nullptr)));
-                server_->set_tick_function(tick_interval_, tick_function_);
-                for (auto snum : signals_)
-                {
-                    server_->signal_add(snum);
-                }
-                notify_server_start();
-                server_->run();
-            }
-        }
-
-        /// \brief Non-blocking version of \ref run()
-        ///
-        /// The output from this method needs to be saved into a variable!
-        /// Otherwise the call will be made on the same thread.
-        std::future<void> run_async()
-        {
-            return std::async(std::launch::async, [&] {
-                this->run();
-            });
-        }
-
-        /// \brief Stop the server
-        void stop()
-        {
-#ifdef CROW_ENABLE_SSL
-            if (ssl_used_)
-            {
-                if (ssl_server_) { ssl_server_->stop(); }
-            }
-            else
-#endif
-            {
-                // TODO(EDev): Move these 6 lines to a method in http_server.
-                std::vector<crow::websocket::connection*> websockets_to_close = websockets_;
-                for (auto websocket : websockets_to_close)
-                {
-                    CROW_LOG_INFO << "Quitting Websocket: " << websocket;
-                    websocket->close("Server Application Terminated");
-                }
-                if (server_) { server_->stop(); }
-            }
-        }
-
-        void add_websocket(crow::websocket::connection* conn)
-        {
-            websockets_.push_back(conn);
-        }
-
-        void remove_websocket(crow::websocket::connection* conn)
-        {
-            websockets_.erase(std::remove(websockets_.begin(), websockets_.end(), conn), websockets_.end());
-        }
-
-        /// \brief Print the routing paths defined for each HTTP method
-        void debug_print()
-        {
-            CROW_LOG_DEBUG << "Routing:";
-            router_.debug_print();
-        }
-
-
-#ifdef CROW_ENABLE_SSL
-
-        /// \brief Use certificate and key files for SSL
-        self_t& ssl_file(const std::string& crt_filename, const std::string& key_filename)
-        {
-            ssl_used_ = true;
-            ssl_context_.set_verify_mode(asio::ssl::verify_peer);
-            ssl_context_.set_verify_mode(asio::ssl::verify_client_once);
-            ssl_context_.use_certificate_file(crt_filename, ssl_context_t::pem);
-            ssl_context_.use_private_key_file(key_filename, ssl_context_t::pem);
-            ssl_context_.set_options(
-              asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3);
-            return *this;
-        }
-
-        /// \brief Use `.pem` file for SSL
-        self_t& ssl_file(const std::string& pem_filename)
-        {
-            ssl_used_ = true;
-            ssl_context_.set_verify_mode(asio::ssl::verify_peer);
-            ssl_context_.set_verify_mode(asio::ssl::verify_client_once);
-            ssl_context_.load_verify_file(pem_filename);
-            ssl_context_.set_options(
-              asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3);
-            return *this;
-        }
-
-        /// \brief Use certificate chain and key files for SSL
-        self_t& ssl_chainfile(const std::string& crt_filename, const std::string& key_filename)
-        {
-            ssl_used_ = true;
-            ssl_context_.set_verify_mode(asio::ssl::verify_peer);
-            ssl_context_.set_verify_mode(asio::ssl::verify_client_once);
-            ssl_context_.use_certificate_chain_file(crt_filename);
-            ssl_context_.use_private_key_file(key_filename, ssl_context_t::pem);
-            ssl_context_.set_options(
-              asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3);
-            return *this;
-        }
-
-        self_t& ssl(asio::ssl::context&& ctx)
-        {
-            ssl_used_ = true;
-            ssl_context_ = std::move(ctx);
-            return *this;
-        }
-
-        bool ssl_used() const
-        {
-            return ssl_used_;
-        }
-#else
-        
-        template<typename T, typename... Remain>
-        self_t& ssl_file(T&&, Remain&&...)
-        {
-            // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined.
-            static_assert(
-              // make static_assert dependent to T; always false
-              std::is_base_of<T, void>::value,
-              "Define CROW_ENABLE_SSL to enable ssl support.");
-            return *this;
-        }
-
-        template<typename T, typename... Remain>
-        self_t& ssl_chainfile(T&&, Remain&&...)
-        {
-            // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined.
-            static_assert(
-              // make static_assert dependent to T; always false
-              std::is_base_of<T, void>::value,
-              "Define CROW_ENABLE_SSL to enable ssl support.");
-            return *this;
-        }
-
-        template<typename T>
-        self_t& ssl(T&&)
-        {
-            // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined.
-            static_assert(
-              // make static_assert dependent to T; always false
-              std::is_base_of<T, void>::value,
-              "Define CROW_ENABLE_SSL to enable ssl support.");
-            return *this;
-        }
-
-        bool ssl_used() const
-        {
-            return false;
-        }
-#endif
-
-        // middleware
-        using context_t = detail::context<Middlewares...>;
-        using mw_container_t = std::tuple<Middlewares...>;
-        template<typename T>
-        typename T::context& get_context(const request& req)
-        {
-            static_assert(black_magic::contains<T, Middlewares...>::value, "App doesn't have the specified middleware type.");
-            auto& ctx = *reinterpret_cast<context_t*>(req.middleware_context);
-            return ctx.template get<T>();
-        }
-
-        template<typename T>
-        T& get_middleware()
-        {
-            return utility::get_element_by_type<T, Middlewares...>(middlewares_);
-        }
-
-        /// \brief Wait until the server has properly started
-        void wait_for_server_start()
-        {
-            {
-                std::unique_lock<std::mutex> lock(start_mutex_);
-                if (!server_started_)
-                    cv_started_.wait(lock);
-            }
-            if (server_)
-                server_->wait_for_start();
-#ifdef CROW_ENABLE_SSL
-            else if (ssl_server_)
-                ssl_server_->wait_for_start();
-#endif
-        }
-
-    private:
-        template<typename... Ts>
-        std::tuple<Middlewares...> make_middleware_tuple(Ts&&... ts)
-        {
-            auto fwd = std::forward_as_tuple((ts)...);
-            return std::make_tuple(
-              std::forward<Middlewares>(
-                black_magic::tuple_extract<Middlewares, decltype(fwd)>(fwd))...);
-        }
-
-        /// \brief Notify anything using \ref wait_for_server_start() to proceed
-        void notify_server_start()
-        {
-            std::unique_lock<std::mutex> lock(start_mutex_);
-            server_started_ = true;
-            cv_started_.notify_all();
-        }
-
-        void set_static_routes_added() {
-            static_routes_added_ = true;
-        }
-
-        bool are_static_routes_added() {
-            return static_routes_added_;
-        }
-
-    private:
-        std::uint8_t timeout_{5};
-        uint16_t port_ = 80;
-        uint16_t concurrency_ = 2;
-        uint64_t max_payload_{UINT64_MAX};
-        std::string server_name_ = std::string("Crow/") + VERSION;
-        std::string bindaddr_ = "0.0.0.0";
-        size_t res_stream_threshold_ = 1048576;
-        Router router_;
-        bool static_routes_added_{false};
-
-#ifdef CROW_ENABLE_COMPRESSION
-        compression::algorithm comp_algorithm_;
-        bool compression_used_{false};
-#endif
-
-        std::chrono::milliseconds tick_interval_;
-        std::function<void()> tick_function_;
-
-        std::tuple<Middlewares...> middlewares_;
-
-#ifdef CROW_ENABLE_SSL
-        std::unique_ptr<ssl_server_t> ssl_server_;
-        bool ssl_used_{false};
-        ssl_context_t ssl_context_{asio::ssl::context::sslv23};
-#endif
-
-        std::unique_ptr<server_t> server_;
-
-        std::vector<int> signals_{SIGINT, SIGTERM};
-
-        bool server_started_{false};
-        std::condition_variable cv_started_;
-        std::mutex start_mutex_;
-        std::vector<crow::websocket::connection*> websockets_;
-    };
-
-    /// \brief Alias of Crow<Middlewares...>. Useful if you want
-    /// a instance of an Crow application that require Middlewares
-    template<typename... Middlewares>
-    using App = Crow<Middlewares...>;
-
-    /// \brief Alias of Crow<>. Useful if you want a instance of
-    /// an Crow application that doesn't require of Middlewares
-    using SimpleApp = Crow<>;
-} // namespace crow
-
diff --git a/code/cpp-httplib-0.19.0/benchmark/crow/main.cpp b/code/cpp-httplib-0.19.0/benchmark/crow/main.cpp
deleted file mode 100644
index 034cf78b..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/crow/main.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "crow_all.h"
-
-class CustomLogger : public crow::ILogHandler {
-public:
-  void log(std::string, crow::LogLevel) {}
-};
-
-int main() {
-  CustomLogger logger;
-  crow::logger::setHandler(&logger);
-
-  crow::SimpleApp app;
-
-  CROW_ROUTE(app, "/")([]() { return "Hello world!"; });
-
-  app.port(8080).multithreaded().run();
-}
diff --git a/code/cpp-httplib-0.19.0/benchmark/download.sh b/code/cpp-httplib-0.19.0/benchmark/download.sh
deleted file mode 100644
index 90c959ed..00000000
--- a/code/cpp-httplib-0.19.0/benchmark/download.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rm -f httplib.h
-wget https://raw.githubusercontent.com/yhirose/cpp-httplib/v$1/httplib.h
diff --git a/code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake b/code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake
deleted file mode 100644
index 2048e554..00000000
--- a/code/cpp-httplib-0.19.0/cmake/FindBrotli.cmake
+++ /dev/null
@@ -1,168 +0,0 @@
-# A simple FindBrotli package for Cmake's find_package function.
-# Note: This find package doesn't have version support, as the version file doesn't seem to be installed on most systems.
-#
-# If you want to find the static packages instead of shared (the default), define BROTLI_USE_STATIC_LIBS as TRUE.
-# The targets will have the same names, but it will use the static libs.
-#
-# Valid find_package COMPONENTS names: "decoder", "encoder", and "common"
-# Note that if you're requiring "decoder" or "encoder", then "common" will be automatically added as required.
-#
-# Defines the libraries (if found): Brotli::decoder, Brotli::encoder, Brotli::common
-# and the includes path variable: Brotli_INCLUDE_DIR
-#
-# If it's failing to find the libraries, try setting BROTLI_ROOT_DIR to the folder containing your library & include dir.
-
-# If they asked for a specific version, warn/fail since we don't support it.
-# TODO: if they start distributing the version somewhere, implement finding it.
-# See https://github.com/google/brotli/issues/773#issuecomment-579133187
-if(Brotli_FIND_VERSION)
-	set(_brotli_version_error_msg "FindBrotli.cmake doesn't have version support!")
-	# If the package is required, throw a fatal error
-	# Otherwise, if not running quietly, we throw a warning
-	if(Brotli_FIND_REQUIRED)
-		message(FATAL_ERROR "${_brotli_version_error_msg}")
-	elseif(NOT Brotli_FIND_QUIETLY)
-		message(WARNING "${_brotli_version_error_msg}")
-	endif()
-endif()
-
-# Since both decoder & encoder require the common lib, force its requirement..
-# if the user is requiring either of those other libs.
-if(Brotli_FIND_REQUIRED_decoder OR Brotli_FIND_REQUIRED_encoder)
-	set(Brotli_FIND_REQUIRED_common TRUE)
-endif()
-
-# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
-# Credit to FindOpenSSL.cmake for this
-if(BROTLI_USE_STATIC_LIBS)
-  set(_brotli_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  if(WIN32)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  else()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-  endif()
-endif()
-
-# Make PkgConfig optional, since some users (mainly Windows) don't have it.
-# But it's a lot more clean than manually using find_library.
-find_package(PkgConfig QUIET)
-
-# Only used if the PkgConfig libraries aren't used.
-find_path(Brotli_INCLUDE_DIR
-	NAMES
-		"brotli/decode.h"
-		"brotli/encode.h"
-	HINTS
-		${BROTLI_ROOT_DIR}
-	PATH_SUFFIXES
-		"include"
-		"includes"
-	DOC "The path to Brotli's include directory."
-)
-# Hides this var from the GUI
-mark_as_advanced(Brotli_INCLUDE_DIR)
-
-# Just used for PkgConfig stuff in the loop below
-set(_brotli_stat_str "")
-if(BROTLI_USE_STATIC_LIBS)
-	set(_brotli_stat_str "_STATIC")
-endif()
-
-# Each string here is "ComponentName;LiteralName" (the semi-colon is a delimiter)
-foreach(_listvar "common;common" "decoder;dec" "encoder;enc")
-	# Split the component name and literal library name from the listvar
-	list(GET _listvar 0 _component_name)
-	list(GET _listvar 1 _libname)
-
-	# NOTE: We can't rely on PkgConf for static libs since the upstream static lib support is broken
-	# See https://github.com/google/brotli/issues/795
-	# TODO: whenever their issue is fixed upstream, remove this "AND NOT BROTLI_USE_STATIC_LIBS" check
-	if(PKG_CONFIG_FOUND AND NOT BROTLI_USE_STATIC_LIBS)
-		# These need to be GLOBAL for MinGW when making ALIAS libraries against them.
-		# Have to postfix _STATIC on the name to tell PkgConfig to find the static libs.
-		pkg_check_modules(Brotli_${_component_name}${_brotli_stat_str} QUIET GLOBAL IMPORTED_TARGET libbrotli${_libname})
-	endif()
-
-	# Check if the target was already found by Pkgconf
-	if(TARGET PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
-		# ALIAS since we don't want the PkgConfig namespace on the Cmake library (for end-users)
-		add_library(Brotli::${_component_name} ALIAS PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
-
-		# Tells HANDLE_COMPONENTS we found the component
-		set(Brotli_${_component_name}_FOUND TRUE)
-		if(Brotli_FIND_REQUIRED_${_component_name})
-			# If the lib is required, we can add its literal path as a required var for FindPackageHandleStandardArgs
-			# Since it won't accept the PkgConfig targets
-			if(BROTLI_USE_STATIC_LIBS)
-				list(APPEND _brotli_req_vars "Brotli_${_component_name}_STATIC_LIBRARIES")
-			else()
-				list(APPEND _brotli_req_vars "Brotli_${_component_name}_LINK_LIBRARIES")
-			endif()
-		endif()
-
-		# Skip searching for the libs with find_library since it was already found by Pkgconf
-		continue()
-	endif()
-
-	if(Brotli_FIND_REQUIRED_${_component_name})
-		# If it's required, we can set the name used in find_library as a required var for FindPackageHandleStandardArgs
-		list(APPEND _brotli_req_vars "Brotli_${_component_name}")
-	endif()
-
-	list(APPEND _brotli_lib_names
-		"brotli${_libname}"
-		"libbrotli${_libname}"
-	)
-	if(BROTLI_USE_STATIC_LIBS)
-		# Postfix "-static" to the libnames since we're looking for static libs
-		list(TRANSFORM _brotli_lib_names APPEND "-static")
-	endif()
-
-	find_library(Brotli_${_component_name}
-		NAMES ${_brotli_lib_names}
-		HINTS ${BROTLI_ROOT_DIR}
-		PATH_SUFFIXES
-			"lib"
-			"lib64"
-			"libs"
-			"libs64"
-			"lib/x86_64-linux-gnu"
-	)
-	# Hide the library variable from the Cmake GUI
-	mark_as_advanced(Brotli_${_component_name})
-
-	# Unset since otherwise it'll stick around for the next loop and break things
-	unset(_brotli_lib_names)
-
-	# Check if find_library found the library
-	if(Brotli_${_component_name})
-		# Tells HANDLE_COMPONENTS we found the component
-		set(Brotli_${_component_name}_FOUND TRUE)
-
-		add_library("Brotli::${_component_name}" UNKNOWN IMPORTED)
-		# Attach the literal library and include dir to the IMPORTED target for the end-user
-		set_target_properties("Brotli::${_component_name}" PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${Brotli_INCLUDE_DIR}"
-			IMPORTED_LOCATION "${Brotli_${_component_name}}"
-		)
-	else()
-		# Tells HANDLE_COMPONENTS we found the component
-		set(Brotli_${_component_name}_FOUND FALSE)
-	endif()
-endforeach()
-
-include(FindPackageHandleStandardArgs)
-# Sets Brotli_FOUND, and fails the find_package(Brotli) call if it was REQUIRED but missing libs.
-find_package_handle_standard_args(Brotli
-	FOUND_VAR
-		Brotli_FOUND
-	REQUIRED_VARS
-		Brotli_INCLUDE_DIR
-		${_brotli_req_vars}
-	HANDLE_COMPONENTS
-)
-
-# Restore the original find library ordering
-if(BROTLI_USE_STATIC_LIBS)
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ${_brotli_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-endif()
diff --git a/code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in b/code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in
deleted file mode 100644
index 93dff323..00000000
--- a/code/cpp-httplib-0.19.0/cmake/httplibConfig.cmake.in
+++ /dev/null
@@ -1,84 +0,0 @@
-# Generates a macro to auto-configure everything
-@PACKAGE_INIT@
-
-# Setting these here so they're accessible after install.
-# Might be useful for some users to check which settings were used.
-set(HTTPLIB_IS_USING_OPENSSL @HTTPLIB_IS_USING_OPENSSL@)
-set(HTTPLIB_IS_USING_ZLIB @HTTPLIB_IS_USING_ZLIB@)
-set(HTTPLIB_IS_COMPILED @HTTPLIB_COMPILE@)
-set(HTTPLIB_IS_USING_BROTLI @HTTPLIB_IS_USING_BROTLI@)
-set(HTTPLIB_VERSION @PROJECT_VERSION@)
-
-include(CMakeFindDependencyMacro)
-
-# We add find_dependency calls here to not make the end-user have to call them.
-find_dependency(Threads)
-if(@HTTPLIB_IS_USING_OPENSSL@)
-	# OpenSSL COMPONENTS were added in Cmake v3.11
-	if(CMAKE_VERSION VERSION_LESS "3.11")
-		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@)
-	else()
-		# Once the COMPONENTS were added, they were made optional when not specified.
-		# Since we use both, we need to search for both.
-		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ COMPONENTS Crypto SSL)
-	endif()
-endif()
-if(@HTTPLIB_IS_USING_ZLIB@)
-	find_dependency(ZLIB)
-endif()
-
-if(@HTTPLIB_IS_USING_BROTLI@)
-	# Needed so we can use our own FindBrotli.cmake in this file.
-	# Note that the FindBrotli.cmake file is installed in the same dir as this file.
-	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-	set(BROTLI_USE_STATIC_LIBS @BROTLI_USE_STATIC_LIBS@)
-	find_dependency(Brotli COMPONENTS common encoder decoder)
-endif()
-
-# Mildly useful for end-users
-# Not really recommended to be used though
-set_and_check(HTTPLIB_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@")
-# Lets the end-user find the header path with the header appended
-# This is helpful if you're using Cmake's pre-compiled header feature
-set_and_check(HTTPLIB_HEADER_PATH "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/httplib.h")
-
-# Consider each library support as a "component"
-set(httplib_OpenSSL_FOUND @HTTPLIB_IS_USING_OPENSSL@)
-set(httplib_ZLIB_FOUND @HTTPLIB_IS_USING_ZLIB@)
-set(httplib_Brotli_FOUND @HTTPLIB_IS_USING_BROTLI@)
-
-check_required_components(httplib)
-
-# Brings in the target library, but only if all required components are found
-if(NOT DEFINED httplib_FOUND OR httplib_FOUND)
-	include("${CMAKE_CURRENT_LIST_DIR}/httplibTargets.cmake")
-endif()
-
-# Outputs a "found httplib /usr/include/httplib.h" message when using find_package(httplib)
-include(FindPackageMessage)
-if(TARGET httplib::httplib)
-	set(HTTPLIB_FOUND TRUE)
-
-	# Since the compiled version has a lib, show that in the message
-	if(@HTTPLIB_COMPILE@)
-		# The list of configurations is most likely just 1 unless they installed a debug & release
-		get_target_property(_httplib_configs httplib::httplib "IMPORTED_CONFIGURATIONS")
-		# Need to loop since the "IMPORTED_LOCATION" property isn't want we want.
-		# Instead, we need to find the IMPORTED_LOCATION_RELEASE or IMPORTED_LOCATION_DEBUG which has the lib path.
-		foreach(_httplib_conf "${_httplib_configs}")
-			# Grab the path to the lib and sets it to HTTPLIB_LIBRARY
-			get_target_property(HTTPLIB_LIBRARY httplib::httplib "IMPORTED_LOCATION_${_httplib_conf}")
-			# Check if we found it
-			if(HTTPLIB_LIBRARY)
-				break()
-			endif()
-		endforeach()
-
-		unset(_httplib_configs)
-		unset(_httplib_conf)
-
-		find_package_message(httplib "Found httplib: ${HTTPLIB_LIBRARY} (found version \"${HTTPLIB_VERSION}\")" "[${HTTPLIB_LIBRARY}][${HTTPLIB_HEADER_PATH}]")
-	else()
-		find_package_message(httplib "Found httplib: ${HTTPLIB_HEADER_PATH} (found version \"${HTTPLIB_VERSION}\")" "[${HTTPLIB_HEADER_PATH}]")
-	endif()
-endif()
diff --git a/code/cpp-httplib-0.19.0/docker-compose.yml b/code/cpp-httplib-0.19.0/docker-compose.yml
deleted file mode 100644
index 4a55b0dc..00000000
--- a/code/cpp-httplib-0.19.0/docker-compose.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-services:
-  http:
-    build: .
-    ports:
-      - "8080:80"
-    volumes:
-      - ./docker/html:/html
diff --git a/code/cpp-httplib-0.19.0/docker/html/index.html b/code/cpp-httplib-0.19.0/docker/html/index.html
deleted file mode 100644
index 1abe9780..00000000
--- a/code/cpp-httplib-0.19.0/docker/html/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to cpp-httplib!</title>
-<style>
-html { color-scheme: light dark; }
-body { width: 35em; margin: 0 auto;
-font-family: Tahoma, Verdana, Arial, sans-serif; }
-</style>
-</head>
-<body>
-<h1>Welcome to cpp-httplib!</h1>
-<p>If you see this page, the cpp-httplib web server is successfully installed and
-working. Further configuration is required.</p>
-
-<p>For online documentation and support please refer to
-<a href="https://github.com/yhirose/cpp-httplib">github.com/yhirose/cpp-httplib</a>.<br/>
-
-<p><em>Thank you for using cpp-httplib.</em></p>
-</body>
-</html>
diff --git a/code/cpp-httplib-0.19.0/docker/main.cc b/code/cpp-httplib-0.19.0/docker/main.cc
deleted file mode 100644
index 913275da..00000000
--- a/code/cpp-httplib-0.19.0/docker/main.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-//  main.cc
-//
-//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <chrono>
-#include <ctime>
-#include <format>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-
-#include <httplib.h>
-
-constexpr auto error_html = R"(<html>
-<head><title>{} {}</title></head>
-<body>
-<center><h1>404 Not Found</h1></center>
-<hr><center>cpp-httplib/{}</center>
-</body>
-</html>
-)";
-
-void sigint_handler(int s) { exit(1); }
-
-std::string time_local() {
-  auto p = std::chrono::system_clock::now();
-  auto t = std::chrono::system_clock::to_time_t(p);
-
-  std::stringstream ss;
-  ss << std::put_time(std::localtime(&t), "%d/%b/%Y:%H:%M:%S %z");
-  return ss.str();
-}
-
-std::string log(auto &req, auto &res) {
-  auto remote_user = "-"; // TODO:
-  auto request = std::format("{} {} {}", req.method, req.path, req.version);
-  auto body_bytes_sent = res.get_header_value("Content-Length");
-  auto http_referer = "-"; // TODO:
-  auto http_user_agent = req.get_header_value("User-Agent", "-");
-
-  // NOTE: From NGINX defualt access log format
-  // log_format combined '$remote_addr - $remote_user [$time_local] '
-  //                     '"$request" $status $body_bytes_sent '
-  //                     '"$http_referer" "$http_user_agent"';
-  return std::format(R"({} - {} [{}] "{}" {} {} "{}" "{}")", req.remote_addr,
-                     remote_user, time_local(), request, res.status,
-                     body_bytes_sent, http_referer, http_user_agent);
-}
-
-int main(int argc, const char **argv) {
-  signal(SIGINT, sigint_handler);
-
-  auto base_dir = "./html";
-  auto host = "0.0.0.0";
-  auto port = 80;
-
-  httplib::Server svr;
-
-  svr.set_error_handler([](auto & /*req*/, auto &res) {
-    auto body =
-        std::format(error_html, res.status, httplib::status_message(res.status),
-                    CPPHTTPLIB_VERSION);
-
-    res.set_content(body, "text/html");
-  });
-
-  svr.set_logger(
-      [](auto &req, auto &res) { std::cout << log(req, res) << std::endl; });
-
-  svr.set_mount_point("/", base_dir);
-
-  std::cout << std::format("Serving HTTP on {0} port {1} ...", host, port)
-            << std::endl;
-
-  auto ret = svr.listen(host, port);
-
-  return ret ? 0 : 1;
-}
diff --git a/code/cpp-httplib-0.19.0/example/Dockerfile.hello b/code/cpp-httplib-0.19.0/example/Dockerfile.hello
deleted file mode 100644
index d1188aec..00000000
--- a/code/cpp-httplib-0.19.0/example/Dockerfile.hello
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM alpine as builder
-WORKDIR /src/example
-RUN apk add g++ make openssl-dev zlib-dev brotli-dev
-COPY ./httplib.h /src
-COPY ./example/hello.cc /src/example
-COPY ./example/Makefile /src/example
-RUN make hello
-
-FROM alpine
-RUN apk --no-cache add brotli libstdc++
-COPY --from=builder /src/example/hello /bin/hello
-CMD ["/bin/hello"]
diff --git a/code/cpp-httplib-0.19.0/example/Makefile b/code/cpp-httplib-0.19.0/example/Makefile
deleted file mode 100644
index ba683593..00000000
--- a/code/cpp-httplib-0.19.0/example/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#CXX = clang++
-CXXFLAGS = -O2 -std=c++11 -I.. -Wall -Wextra -pthread
-
-PREFIX ?= $(shell brew --prefix)
-
-OPENSSL_DIR = $(PREFIX)/opt/openssl@3
-OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
-
-ifneq ($(OS), Windows_NT)
-	UNAME_S := $(shell uname -s)
-	ifeq ($(UNAME_S), Darwin)
-		OPENSSL_SUPPORT += -framework CoreFoundation -framework Security
-	endif
-endif
-
-ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
-
-BROTLI_DIR = $(PREFIX)/opt/brotli
-BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
-
-all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark one_time_request server_and_client
-
-server : server.cc ../httplib.h Makefile
-	$(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-client : client.cc ../httplib.h Makefile
-	$(CXX) -o client $(CXXFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-hello : hello.cc ../httplib.h Makefile
-	$(CXX) -o hello $(CXXFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-simplecli : simplecli.cc ../httplib.h Makefile
-	$(CXX) -o simplecli $(CXXFLAGS) simplecli.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-simplesvr : simplesvr.cc ../httplib.h Makefile
-	$(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-upload : upload.cc ../httplib.h Makefile
-	$(CXX) -o upload $(CXXFLAGS) upload.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-redirect : redirect.cc ../httplib.h Makefile
-	$(CXX) -o redirect $(CXXFLAGS) redirect.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-ssesvr : ssesvr.cc ../httplib.h Makefile
-	$(CXX) -o ssesvr $(CXXFLAGS) ssesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-ssecli : ssecli.cc ../httplib.h Makefile
-	$(CXX) -o ssecli $(CXXFLAGS) ssecli.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-benchmark : benchmark.cc ../httplib.h Makefile
-	$(CXX) -o benchmark $(CXXFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-one_time_request : one_time_request.cc ../httplib.h Makefile
-	$(CXX) -o one_time_request $(CXXFLAGS) one_time_request.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-server_and_client : server_and_client.cc ../httplib.h Makefile
-	$(CXX) -o server_and_client $(CXXFLAGS) server_and_client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-pem:
-	openssl genrsa 2048 > key.pem
-	openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
-
-clean:
-	rm server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark one_time_request server_and_client *.pem
diff --git a/code/cpp-httplib-0.19.0/example/benchmark.cc b/code/cpp-httplib-0.19.0/example/benchmark.cc
deleted file mode 100644
index 433cc675..00000000
--- a/code/cpp-httplib-0.19.0/example/benchmark.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <chrono>
-#include <httplib.h>
-#include <iostream>
-
-using namespace std;
-
-struct StopWatch {
-  StopWatch(const string &label) : label_(label) {
-    start_ = chrono::system_clock::now();
-  }
-  ~StopWatch() {
-    auto end = chrono::system_clock::now();
-    auto diff = end - start_;
-    auto count = chrono::duration_cast<chrono::milliseconds>(diff).count();
-    cout << label_ << ": " << count << " millisec." << endl;
-  }
-  string label_;
-  chrono::system_clock::time_point start_;
-};
-
-int main(void) {
-  string body(1024 * 5, 'a');
-
-  httplib::Client cli("httpbin.org", 80);
-
-  for (int i = 0; i < 3; i++) {
-    StopWatch sw(to_string(i).c_str());
-    auto res = cli.Post("/post", body, "application/octet-stream");
-    assert(res->status == httplib::StatusCode::OK_200);
-  }
-
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/example/ca-bundle.crt b/code/cpp-httplib-0.19.0/example/ca-bundle.crt
deleted file mode 100644
index 7d61eb5c..00000000
--- a/code/cpp-httplib-0.19.0/example/ca-bundle.crt
+++ /dev/null
@@ -1,3401 +0,0 @@
-##
-## Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Tue Jan 22 14:14:40 2019 GMT
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: 18372117493b5b7ec006c31d966143fc95a9464a2b5f8d5188e23c5557b2292d
-##
-
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
-KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
-T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
-J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
-nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-========================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
-Actalis Authentication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
-BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
-AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
-MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
-IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
-wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
-by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
-zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
-YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
-oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
-EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
-hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
-EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
-jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
-iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
-WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
-JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
-K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
-Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
-4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
-2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
-lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
-OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
-vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
-Buypass Class 2 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
-DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
-g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
-9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
-/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
-CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
-awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
-zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
-Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
-Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
-M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
-osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
-aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
-DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
-LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
-oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
-wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
-CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
-rJgWVqA=
------END CERTIFICATE-----
-
-Buypass Class 3 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
-DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
-sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
-5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
-7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
-ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
-2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
-/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
-RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
-Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
-j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
-uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
-Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
-ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
-KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
-6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
-UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
-eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
-Cp/HuZc=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 3
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
-MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
-9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
-NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
-iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
-0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
-AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
-fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
-ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
-P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
------END CERTIFICATE-----
-
-EE Certification Centre Root CA
-===============================
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
-dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
-MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
-UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
-ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
-TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
-rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
-93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
-P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
-MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
-BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
-xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
-lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
-3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
-dcGWxZ0=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
-Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
-LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
-ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
-BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
-KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
-p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
-AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
-4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
-eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
-MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
-PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
-OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
-2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
-dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
-X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 EV 2009
-=================================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
-egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
-zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
-7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
-sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
-11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
-cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
-ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
-MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
-b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
-c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
-PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
-ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
-NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
-w9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-CA Disig Root R2
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
-w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
-xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
-A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
-GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
-g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
-5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
-koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
-Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
-Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
-Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
-sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
-dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
-1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
-mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
-utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
-sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
-UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
-7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-ACCVRAIZ1
-=========
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
-SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
-MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
-UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
-jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
-RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
-aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
-0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
-WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
-8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
-5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
-9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
-Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
-Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
-Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
-Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
-QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
-AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
-YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
-AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
-IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
-aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
-dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
-MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
-hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
-R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
-YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
-nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
-TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
-sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
-Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
-3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
-EfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-TWCA Global Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
-CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
-QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
-EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
-nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
-r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
-Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
-tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
-KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
-sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
-yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
-kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
-zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
-cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
-8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
-/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
-lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
-A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
-i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
-EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
-zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
------END CERTIFICATE-----
-
-TeliaSonera Root CA v1
-======================
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
-CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
-MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
-VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
-6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
-3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
-B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
-Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
-oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
-F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
-oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
-gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
-TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
-AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
-DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
-zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
-pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
-G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
-c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
-JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
-qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
-Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
-WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
-
-E-Tugra Certification Authority
-===============================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
-DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
-ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
-ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
-NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
-QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
-cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
-DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
-hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
-CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
-ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
-BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
-E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
-rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
-jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
-rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
-dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
-kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
-XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
-VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
-a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
-dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
-KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
-Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
-8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
-C7TbO6Orb1wdtn7os4I07QZcJA==
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 2
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
-MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
-SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
-vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
-2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
-WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
-YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
-r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
-vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
-3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
------END CERTIFICATE-----
-
-Atos TrustedRoot 2011
-=====================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
-cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
-MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
-A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
-hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
-54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
-DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
-HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
-z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
-l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
-bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
-k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
-TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
-61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
-3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
-
-QuoVadis Root CA 1 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
-PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
-PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
-Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
-ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
-g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
-7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
-9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
-iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
-t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
-hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
-GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
-Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
-+V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
-3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
-wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
-O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
-FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
-hMJKzRwuJIczYOXD
------END CERTIFICATE-----
-
-QuoVadis Root CA 2 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
-ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
-NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
-oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
-MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
-V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
-L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
-sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
-6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
-lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
-hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
-pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
-x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
-dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
-U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
-mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
-zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
-JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
-O3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-QuoVadis Root CA 3 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
-IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
-Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
-6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
-I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
-VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
-5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
-Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
-dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
-rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
-hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
-t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
-TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
-DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
-Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
-hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
-0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
-dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
-PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G2
-===========================
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
-MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
-35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
-bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
-VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
-YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
-lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
-w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
-0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
-d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
-hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
-jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G3
-===========================
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
-VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
-RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
-KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
-UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
-YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
-1vUhZscv6pZjamVFkpUBtA==
------END CERTIFICATE-----
-
-DigiCert Global Root G2
-=======================
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
-MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
-kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
-3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
-BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
-UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
-o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
-5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
-F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
-WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
-QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
-iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
-
-DigiCert Global Root G3
-=======================
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
-VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
-MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
-aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
-AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
-YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
-Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
-3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
-VOKa5Vt8sycX
------END CERTIFICATE-----
-
-DigiCert Trusted Root G4
-========================
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
-HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
-pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
-k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
-vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
-QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
-MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
-mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
-f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
-dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
-oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
-ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
-yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
-7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
-ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
-5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
-/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
-5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
-G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
-82Z+
------END CERTIFICATE-----
-
-COMODO RSA Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
-dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
-FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
-5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
-x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
-2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
-OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
-sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
-GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
-WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
-rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
-nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
-tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
-sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
-pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
-zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
-ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
-7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
-LaZRfyHBNVOFBkpdn627G190
------END CERTIFICATE-----
-
-USERTrust RSA Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
-0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
-Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
-RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
-+T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
-/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
-Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
-lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
-yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
-eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
-FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
-7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
-Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
-8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
-FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
-yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
-J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
-sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
-Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
-
-USERTrust ECC Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
-0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
-nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
-HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
-HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
-9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R4
-===========================
------BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
-OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
-AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
-MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
-JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R5
-===========================
------BEGIN CERTIFICATE-----
-MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
-SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
-h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
-uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
-yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G3
-==================================
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
-olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
-x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
-EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
-Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
-mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
-1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
-07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
-FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
-41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
-AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
-yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
-U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
-KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
-v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
-8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
-8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
-mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
-1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
-JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
-tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
------END CERTIFICATE-----
-
-Staat der Nederlanden EV Root CA
-================================
------BEGIN CERTIFICATE-----
-MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
-MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
-cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
-SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
-O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
-0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
-Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
-XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
-08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
-0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
-74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
-fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
-ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
-eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
-c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
-5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
-b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
-f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
-5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
-WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
-DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
-eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
------END CERTIFICATE-----
-
-IdenTrust Commercial Root CA 1
-==============================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
-b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
-IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
-hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
-mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
-1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
-XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
-3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
-NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
-WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
-xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
-uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
-hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
-6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
-ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
-ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
-YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
-feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
-kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
-2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
-Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
-cGzM7vRX+Bi6hG6H
------END CERTIFICATE-----
-
-IdenTrust Public Sector Root CA 1
-=================================
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
-ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
-UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
-b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
-P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
-Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
-rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
-qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
-mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
-ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
-LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
-iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
-4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
-Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
-DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
-t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
-mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
-GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
-m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
-NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
-Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
-ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
-ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
-3Wl9af0AVqW3rLatt8o+Ae+c
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
-bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
-HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
-DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
-OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
-/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
-HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
-s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
-TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
-AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
-0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
-iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
-nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
-vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
-e4pIb4tF9g==
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - EC1
-==========================================
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
-FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
-YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
-FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
-LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
-dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
-AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
-9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
-vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
-kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
-CFCA EV ROOT
-============
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
-CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
-IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
-MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
-DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
-BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
-7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
-uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
-ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
-xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
-py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
-gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
-hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
-tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
-ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
-ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
-4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
-E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
-BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
-aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
-PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
-kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
-ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
------END CERTIFICATE-----
-
-Certinomis - Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
-LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
-EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
-ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
-P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
-d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
-z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
-8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
-RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
-6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
-FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
-PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
-i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
-YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
-6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
-WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
-Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
-lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
-y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
-Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
-DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
-I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
-cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
-hkIGuUE=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GB CA
-===============================
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
-EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
-MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
-b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
-scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
-rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
-9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
-Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
-GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
-hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
-dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
-VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
-HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
-Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
------END CERTIFICATE-----
-
-SZAFIR ROOT CA2
-===============
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
-A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
-BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
-BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
-VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
-qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
-DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
-2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
-ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
-ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
-AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
-O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
-oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
-4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
-+/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
------END CERTIFICATE-----
-
-Certum Trusted Network CA 2
-===========================
------BEGIN CERTIFICATE-----
-MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
-BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
-bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
-ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
-TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
-IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
-7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
-CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
-Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
-uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
-GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
-9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
-Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
-hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
-BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
-hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
-Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
-L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
-clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
-pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
-w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
-J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
-ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
-is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
-zAYspsbiDrW5viSP
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2015
-=======================================================
------BEGIN CERTIFICATE-----
-MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
-BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
-aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
-YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
-MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
-QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
-BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
-MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
-bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
-iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
-6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
-FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
-i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
-GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
-fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
-iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
-Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
-hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
-D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
-d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
-d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
-82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
-davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
-Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
-J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
-JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
-p/UsQu0yrbYhnr68
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions ECC RootCA 2015
-===========================================================
------BEGIN CERTIFICATE-----
-MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
-aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
-cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
-aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
-MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
-IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
-VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
-Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
-dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
-Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
-GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
-dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
------END CERTIFICATE-----
-
-ISRG Root X1
-============
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
-BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
-EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
-EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
-DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
-Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
-3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
-b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
-Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
-4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
-1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
-hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
-usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
-OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
-A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
-9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
-0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
-hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
-TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
-e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
-JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
-YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
-JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
-m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----
-
-AC RAIZ FNMT-RCM
-================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
-AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
-MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
-TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
-qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
-btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
-j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
-08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
-WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
-tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
-47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
-ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
-i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
-dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
-nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
-D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
-j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
-Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
-+YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
-Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
-8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
-5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
-rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
------END CERTIFICATE-----
-
-Amazon Root CA 1
-================
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
-MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
-FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
-gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
-dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
-VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
-DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
-CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
-8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
-2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
-xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
------END CERTIFICATE-----
-
-Amazon Root CA 2
-================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
-MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
-kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
-N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
-AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
-fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
-kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
-btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
-Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
-c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
-3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
-DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
-A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
-+gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
-YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
-xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
-gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
-aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
-Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
-KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
-JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
------END CERTIFICATE-----
-
-Amazon Root CA 3
-================
------BEGIN CERTIFICATE-----
-MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
-f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
-Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
-rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
-eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
------END CERTIFICATE-----
-
-Amazon Root CA 4
-================
------BEGIN CERTIFICATE-----
-MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
-/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
-83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
-MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
-AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
------END CERTIFICATE-----
-
-LuxTrust Global Root 2
-======================
------BEGIN CERTIFICATE-----
-MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
-A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
-bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
-MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
-Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
-xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
-wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
-1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
-FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
-wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
-a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
-ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
-MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
-/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
-Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
-+Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
-FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
-H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
-7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
-ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
-VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
-TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
-/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
-7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
-iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
------END CERTIFICATE-----
-
-TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
-D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
-IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
-TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
-ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
-VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
-c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
-bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
-IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
-6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
-wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
-3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
-WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
-ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
-KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
-AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
-lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
-e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
-q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
------END CERTIFICATE-----
-
-GDCA TrustAUTH R5 ROOT
-======================
------BEGIN CERTIFICATE-----
-MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
-BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
-DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
-YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
-IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
-AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
-OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
-pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
-9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
-xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
-R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
-D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
-oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
-9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
-p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
-H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
-6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
-+PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
-HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
-F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
-8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
-/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
-aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
------END CERTIFICATE-----
-
-TrustCor RootCert CA-1
-======================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
-MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
-YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
-VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
-dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
-jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
-pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
-JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
-gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
-/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
-BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
-mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
-ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
-qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
-3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
------END CERTIFICATE-----
-
-TrustCor RootCert CA-2
-======================
------BEGIN CERTIFICATE-----
-MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
-DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
-eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
-eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
-MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
-bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
-IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
-ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
-RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
-oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
-XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
-/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
-jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
-eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
-rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
-8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
-2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
-Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
-kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
-2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
-S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
-PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
-DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
-RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
-xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
-RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
------END CERTIFICATE-----
-
-TrustCor ECA-1
-==============
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
-N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
-MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
-IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
-MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
-xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
-p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
-fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
-YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
-f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
-AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
-/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
-hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
-J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
-jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority RSA
-========================================
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
-BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
-MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
-MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
-LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
-Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
-P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
-oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
-k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
-fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
-gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
-UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
-1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
-bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
-dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
-ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
-u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
-erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
-MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
-vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
-Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
-wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
-WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority ECC
-========================================
------BEGIN CERTIFICATE-----
-MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
-BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
-MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
-BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
-bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
-8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
-hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
-jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
-e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
-5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority RSA R2
-==============================================
------BEGIN CERTIFICATE-----
-MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
-DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
-MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
-MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
-DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
-VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
-hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
-cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
-Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
-B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
-CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
-9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
-RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
-JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
-+qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
-HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
-qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
-++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
-Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
-guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
-OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
-CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
-lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
-rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
-hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
-9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority ECC
-===========================================
------BEGIN CERTIFICATE-----
-MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
-BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
-MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
-LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
-3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
-BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
-5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
-N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
-m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R6
-=======================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
-R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
-b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
-YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
-U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
-grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
-3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
-vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
-PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
-azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
-WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
-CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
-0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
-b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
-HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
-nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
-lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
-BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
-Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
-3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
-0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
-uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
-oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
-JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GC CA
-===============================
------BEGIN CERTIFICATE-----
-MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
-SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
-MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
-Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
-ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
-bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
-VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
-NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
-AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
-AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
------END CERTIFICATE-----
-
-GTS Root R1
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
-9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
-aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
-r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
-LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
-4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
-06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
-wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
-3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
-JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
-BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
-d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
-fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
-ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
-gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
-4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
-tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
-pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
-sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
-CFF1pkgl
------END CERTIFICATE-----
-
-GTS Root R2
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
-k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
-7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
-m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
-dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
-ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
-cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
-Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
-aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
-5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
-BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
-vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
-+YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
-c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
-WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
-n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
-Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
-7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
-gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
-o/DUhgkC
------END CERTIFICATE-----
-
-GTS Root R3
-===========
------BEGIN CERTIFICATE-----
-MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
-Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
-0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
-glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
-KaqW04MjyaR7YbPMAuhd
------END CERTIFICATE-----
-
-GTS Root R4
-===========
------BEGIN CERTIFICATE-----
-MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
-6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
-2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
-N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
-zPKwTdb+mciUqXWi4w==
------END CERTIFICATE-----
-
-UCA Global G2 Root
-==================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
-NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
-cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
-oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
-8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
-h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
-LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
-R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
-KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
-4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
-OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
-8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
-5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
-1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
-Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
-yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
-c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
-jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
-bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
-ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
-RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
------END CERTIFICATE-----
-
-UCA Extended Validation Root
-============================
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
-IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
-A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
-iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
-Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
-eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
-59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
-0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
-el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
-B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
-WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
-NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
-3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
-ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
-aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
-dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
-+7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
-F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
-GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
-GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
-djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
-dhh2n1ax
------END CERTIFICATE-----
-
-Certigna Root CA
-================
------BEGIN CERTIFICATE-----
-MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
-BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
-MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
-MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
-MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
-stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
-KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
-JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
-XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
-4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
-wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
-lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
-jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
-/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
-1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
-dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
-LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
-cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
-OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
-TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
-7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
-4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
-8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
-6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
-tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
-aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
-E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
------END CERTIFICATE-----
diff --git a/code/cpp-httplib-0.19.0/example/client.cc b/code/cpp-httplib-0.19.0/example/client.cc
deleted file mode 100644
index a9b0fc0a..00000000
--- a/code/cpp-httplib-0.19.0/example/client.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  client.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-#include <iostream>
-
-#define CA_CERT_FILE "./ca-bundle.crt"
-
-using namespace std;
-
-int main(void) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  httplib::SSLClient cli("localhost", 8080);
-  // httplib::SSLClient cli("google.com");
-  // httplib::SSLClient cli("www.youtube.com");
-  cli.set_ca_cert_path(CA_CERT_FILE);
-  cli.enable_server_certificate_verification(true);
-#else
-  httplib::Client cli("localhost", 8080);
-#endif
-
-  if (auto res = cli.Get("/hi")) {
-    cout << res->status << endl;
-    cout << res->get_header_value("Content-Type") << endl;
-    cout << res->body << endl;
-  } else {
-    cout << "error code: " << res.error() << std::endl;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    auto result = cli.get_openssl_verify_result();
-    if (result) {
-      cout << "verify error: " << X509_verify_cert_error_string(result) << endl;
-    }
-#endif
-  }
-
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/example/client.vcxproj b/code/cpp-httplib-0.19.0/example/client.vcxproj
deleted file mode 100644
index 817847de..00000000
--- a/code/cpp-httplib-0.19.0/example/client.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6DB1FC63-B153-4279-92B7-D8A11AF285D6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>client</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="client.cc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/example/example.sln b/code/cpp-httplib-0.19.0/example/example.sln
deleted file mode 100644
index 25ca526f..00000000
--- a/code/cpp-httplib-0.19.0/example/example.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{864CD288-050A-4C8B-9BEF-3048BD876C5B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcxproj", "{6DB1FC63-B153-4279-92B7-D8A11AF285D6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{280E605F-0CB8-4336-8D9F-CE50A9472AE2}"
-	ProjectSection(SolutionItems) = preProject
-		..\README.md = ..\README.md
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.Build.0 = Debug|Win32
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|x64.ActiveCfg = Debug|x64
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|x64.Build.0 = Debug|x64
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.ActiveCfg = Release|Win32
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.Build.0 = Release|Win32
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|x64.ActiveCfg = Release|x64
-		{864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|x64.Build.0 = Release|x64
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.Build.0 = Debug|Win32
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|x64.ActiveCfg = Debug|x64
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|x64.Build.0 = Debug|x64
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.ActiveCfg = Release|Win32
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.Build.0 = Release|Win32
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|x64.ActiveCfg = Release|x64
-		{6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7097C9E4-07F8-48C6-A888-BBA9EBB5D17D}
-	EndGlobalSection
-EndGlobal
diff --git a/code/cpp-httplib-0.19.0/example/hello.cc b/code/cpp-httplib-0.19.0/example/hello.cc
deleted file mode 100644
index 38d25a62..00000000
--- a/code/cpp-httplib-0.19.0/example/hello.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  hello.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-using namespace httplib;
-
-int main(void) {
-  Server svr;
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  svr.listen("0.0.0.0", 8080);
-}
diff --git a/code/cpp-httplib-0.19.0/example/one_time_request.cc b/code/cpp-httplib-0.19.0/example/one_time_request.cc
deleted file mode 100644
index 9a8ac345..00000000
--- a/code/cpp-httplib-0.19.0/example/one_time_request.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <httplib.h>
-#include <iostream>
-
-using namespace httplib;
-
-const char *HOST = "localhost";
-const int PORT = 1234;
-
-void one_time_request_server(const char *label) {
-  std::thread th;
-  Server svr;
-
-  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
-    res.set_content(std::string("Hello from ") + label, "text/plain");
-
-    // Stop server
-    th = std::thread([&]() { svr.stop(); });
-  });
-
-  svr.listen(HOST, PORT);
-  th.join();
-
-  std::cout << label << " ended..." << std::endl;
-}
-
-void send_request(const char *label) {
-  Client cli(HOST, PORT);
-
-  std::cout << "Send " << label << " request" << std::endl;
-  auto res = cli.Get("/hi");
-
-  if (res) {
-    std::cout << res->body << std::endl;
-  } else {
-    std::cout << "Request error: " + to_string(res.error()) << std::endl;
-  }
-}
-
-int main(void) {
-  auto th1 = std::thread([&]() { one_time_request_server("Server #1"); });
-  auto th2 = std::thread([&]() { one_time_request_server("Server #2"); });
-
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  send_request("1st");
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  send_request("2nd");
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  send_request("3rd");
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  th1.join();
-  th2.join();
-}
diff --git a/code/cpp-httplib-0.19.0/example/redirect.cc b/code/cpp-httplib-0.19.0/example/redirect.cc
deleted file mode 100644
index b1f39396..00000000
--- a/code/cpp-httplib-0.19.0/example/redirect.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  redirect.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-
-#define SERVER_CERT_FILE "./cert.pem"
-#define SERVER_PRIVATE_KEY_FILE "./key.pem"
-
-using namespace httplib;
-
-int main(void) {
-  // HTTP server
-  Server http;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLServer https(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-#endif
-
-  http.Get("/test", [](const Request & /*req*/, Response &res) {
-    res.set_content("Test\n", "text/plain");
-  });
-
-  http.set_error_handler([](const Request & /*req*/, Response &res) {
-    res.set_redirect("https://localhost:8081/");
-  });
-
-  // HTTPS server
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  https.Get("/", [=](const Request & /*req*/, Response &res) {
-    res.set_redirect("/hi");
-  });
-
-  https.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!\n", "text/plain");
-  });
-
-  https.Get("/stop", [&](const Request & /*req*/, Response & /*res*/) {
-    https.stop();
-    http.stop();
-  });
-#endif
-
-  // Run servers
-  auto httpThread = std::thread([&]() { http.listen("localhost", 8080); });
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto httpsThread = std::thread([&]() { https.listen("localhost", 8081); });
-#endif
-
-  httpThread.join();
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  httpsThread.join();
-#endif
-
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/example/server.cc b/code/cpp-httplib-0.19.0/example/server.cc
deleted file mode 100644
index 1c347f5f..00000000
--- a/code/cpp-httplib-0.19.0/example/server.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-//  sample.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <chrono>
-#include <cstdio>
-#include <httplib.h>
-
-#define SERVER_CERT_FILE "./cert.pem"
-#define SERVER_PRIVATE_KEY_FILE "./key.pem"
-
-using namespace httplib;
-
-std::string dump_headers(const Headers &headers) {
-  std::string s;
-  char buf[BUFSIZ];
-
-  for (auto it = headers.begin(); it != headers.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
-    s += buf;
-  }
-
-  return s;
-}
-
-std::string log(const Request &req, const Response &res) {
-  std::string s;
-  char buf[BUFSIZ];
-
-  s += "================================\n";
-
-  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
-           req.version.c_str(), req.path.c_str());
-  s += buf;
-
-  std::string query;
-  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%c%s=%s",
-             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
-             x.second.c_str());
-    query += buf;
-  }
-  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
-  s += buf;
-
-  s += dump_headers(req.headers);
-
-  s += "--------------------------------\n";
-
-  snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str());
-  s += buf;
-  s += dump_headers(res.headers);
-  s += "\n";
-
-  if (!res.body.empty()) { s += res.body; }
-
-  s += "\n";
-
-  return s;
-}
-
-int main(void) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-#else
-  Server svr;
-#endif
-
-  if (!svr.is_valid()) {
-    printf("server has an error...\n");
-    return -1;
-  }
-
-  svr.Get("/", [=](const Request & /*req*/, Response &res) {
-    res.set_redirect("/hi");
-  });
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!\n", "text/plain");
-  });
-
-  svr.Get("/slow", [](const Request & /*req*/, Response &res) {
-    std::this_thread::sleep_for(std::chrono::seconds(2));
-    res.set_content("Slow...\n", "text/plain");
-  });
-
-  svr.Get("/dump", [](const Request &req, Response &res) {
-    res.set_content(dump_headers(req.headers), "text/plain");
-  });
-
-  svr.Get("/stop",
-          [&](const Request & /*req*/, Response & /*res*/) { svr.stop(); });
-
-  svr.set_error_handler([](const Request & /*req*/, Response &res) {
-    const char *fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
-    char buf[BUFSIZ];
-    snprintf(buf, sizeof(buf), fmt, res.status);
-    res.set_content(buf, "text/html");
-  });
-
-  svr.set_logger([](const Request &req, const Response &res) {
-    printf("%s", log(req, res).c_str());
-  });
-
-  svr.listen("localhost", 8080);
-
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/example/server.vcxproj b/code/cpp-httplib-0.19.0/example/server.vcxproj
deleted file mode 100644
index f18af766..00000000
--- a/code/cpp-httplib-0.19.0/example/server.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="simplesvr.cc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{864CD288-050A-4C8B-9BEF-3048BD876C5B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>sample</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>$(Platform)\$(Configuration)\$(ProjectName)_obj\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/example/server_and_client.cc b/code/cpp-httplib-0.19.0/example/server_and_client.cc
deleted file mode 100644
index 34bf8527..00000000
--- a/code/cpp-httplib-0.19.0/example/server_and_client.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-//  server_and_client.cc
-//
-//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-#include <iostream>
-#include <string>
-
-using namespace httplib;
-
-std::string dump_headers(const Headers &headers) {
-  std::string s;
-  char buf[BUFSIZ];
-
-  for (auto it = headers.begin(); it != headers.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
-    s += buf;
-  }
-
-  return s;
-}
-
-void logger(const Request &req, const Response &res) {
-  std::string s;
-  char buf[BUFSIZ];
-
-  s += "================================\n";
-
-  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
-           req.version.c_str(), req.path.c_str());
-  s += buf;
-
-  std::string query;
-  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%c%s=%s",
-             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
-             x.second.c_str());
-    query += buf;
-  }
-  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
-  s += buf;
-
-  s += dump_headers(req.headers);
-
-  s += "--------------------------------\n";
-
-  snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str());
-  s += buf;
-  s += dump_headers(res.headers);
-  s += "\n";
-
-  if (!res.body.empty()) { s += res.body; }
-
-  s += "\n";
-
-  std::cout << s;
-}
-
-int main(void) {
-  // Server
-  Server svr;
-  svr.set_logger(logger);
-
-  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
-    res.set_content("POST", "text/plain");
-  });
-
-  auto th = std::thread([&]() { svr.listen("localhost", 8080); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    th.join();
-  });
-
-  svr.wait_until_ready();
-
-  // Client
-  Client cli{"localhost", 8080};
-
-  std::string body = R"({"hello": "world"})";
-
-  auto res = cli.Post("/post", body, "application/json");
-  std::cout << "--------------------------------" << std::endl;
-  std::cout << to_string(res.error()) << std::endl;
-}
diff --git a/code/cpp-httplib-0.19.0/example/simplecli.cc b/code/cpp-httplib-0.19.0/example/simplecli.cc
deleted file mode 100644
index b005e408..00000000
--- a/code/cpp-httplib-0.19.0/example/simplecli.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  simplecli.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-#include <iostream>
-
-using namespace std;
-
-int main(void) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto scheme_host_port = "https://localhost:8080";
-#else
-  auto scheme_host_port = "http://localhost:8080";
-#endif
-
-  if (auto res = httplib::Client(scheme_host_port).Get("/hi")) {
-    cout << res->status << endl;
-    cout << res->get_header_value("Content-Type") << endl;
-    cout << res->body << endl;
-  } else {
-    cout << res.error() << endl;
-  }
-
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/example/simplesvr.cc b/code/cpp-httplib-0.19.0/example/simplesvr.cc
deleted file mode 100644
index 17a9e985..00000000
--- a/code/cpp-httplib-0.19.0/example/simplesvr.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-//  simplesvr.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <cstdio>
-#include <httplib.h>
-#include <iostream>
-
-#define SERVER_CERT_FILE "./cert.pem"
-#define SERVER_PRIVATE_KEY_FILE "./key.pem"
-
-using namespace httplib;
-using namespace std;
-
-string dump_headers(const Headers &headers) {
-  string s;
-  char buf[BUFSIZ];
-
-  for (const auto &x : headers) {
-    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
-    s += buf;
-  }
-
-  return s;
-}
-
-string dump_multipart_files(const MultipartFormDataMap &files) {
-  string s;
-  char buf[BUFSIZ];
-
-  s += "--------------------------------\n";
-
-  for (const auto &x : files) {
-    const auto &name = x.first;
-    const auto &file = x.second;
-
-    snprintf(buf, sizeof(buf), "name: %s\n", name.c_str());
-    s += buf;
-
-    snprintf(buf, sizeof(buf), "filename: %s\n", file.filename.c_str());
-    s += buf;
-
-    snprintf(buf, sizeof(buf), "content type: %s\n", file.content_type.c_str());
-    s += buf;
-
-    snprintf(buf, sizeof(buf), "text length: %zu\n", file.content.size());
-    s += buf;
-
-    s += "----------------\n";
-  }
-
-  return s;
-}
-
-string log(const Request &req, const Response &res) {
-  string s;
-  char buf[BUFSIZ];
-
-  s += "================================\n";
-
-  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
-           req.version.c_str(), req.path.c_str());
-  s += buf;
-
-  string query;
-  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%c%s=%s",
-             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
-             x.second.c_str());
-    query += buf;
-  }
-  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
-  s += buf;
-
-  s += dump_headers(req.headers);
-  s += dump_multipart_files(req.files);
-
-  s += "--------------------------------\n";
-
-  snprintf(buf, sizeof(buf), "%d\n", res.status);
-  s += buf;
-  s += dump_headers(res.headers);
-
-  return s;
-}
-
-int main(int argc, const char **argv) {
-  if (argc > 1 && string("--help") == argv[1]) {
-    cout << "usage: simplesvr [PORT] [DIR]" << endl;
-    return 1;
-  }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-#else
-  Server svr;
-#endif
-
-  svr.Post("/multipart", [](const Request &req, Response &res) {
-    auto body = dump_headers(req.headers) + dump_multipart_files(req.files);
-
-    res.set_content(body, "text/plain");
-  });
-
-  svr.set_error_handler([](const Request & /*req*/, Response &res) {
-    const char *fmt = "<p>Error Status: <span style='color:red;'>%d</span></p>";
-    char buf[BUFSIZ];
-    snprintf(buf, sizeof(buf), fmt, res.status);
-    res.set_content(buf, "text/html");
-  });
-
-  svr.set_logger(
-      [](const Request &req, const Response &res) { cout << log(req, res); });
-
-  auto port = 8080;
-  if (argc > 1) { port = atoi(argv[1]); }
-
-  auto base_dir = "./";
-  if (argc > 2) { base_dir = argv[2]; }
-
-  if (!svr.set_mount_point("/", base_dir)) {
-    cout << "The specified base directory doesn't exist...";
-    return 1;
-  }
-
-  cout << "The server started at port " << port << "..." << endl;
-
-  svr.listen("localhost", port);
-
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/example/upload.cc b/code/cpp-httplib-0.19.0/example/upload.cc
deleted file mode 100644
index 1e4f242a..00000000
--- a/code/cpp-httplib-0.19.0/example/upload.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  upload.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <fstream>
-#include <httplib.h>
-#include <iostream>
-using namespace httplib;
-using namespace std;
-
-const char *html = R"(
-<form id="formElem">
-  <input type="file" name="image_file" accept="image/*">
-  <input type="file" name="text_file" accept="text/*">
-  <input type="submit">
-</form>
-<script>
-  formElem.onsubmit = async (e) => {
-    e.preventDefault();
-    let res = await fetch('/post', {
-      method: 'POST',
-      body: new FormData(formElem)
-    });
-    console.log(await res.text());
-  };
-</script>
-)";
-
-int main(void) {
-  Server svr;
-
-  svr.Get("/", [](const Request & /*req*/, Response &res) {
-    res.set_content(html, "text/html");
-  });
-
-  svr.Post("/post", [](const Request &req, Response &res) {
-    auto image_file = req.get_file_value("image_file");
-    auto text_file = req.get_file_value("text_file");
-
-    cout << "image file length: " << image_file.content.length() << endl
-         << "image file name: " << image_file.filename << endl
-         << "text file length: " << text_file.content.length() << endl
-         << "text file name: " << text_file.filename << endl;
-
-    {
-      ofstream ofs(image_file.filename, ios::binary);
-      ofs << image_file.content;
-    }
-    {
-      ofstream ofs(text_file.filename);
-      ofs << text_file.content;
-    }
-
-    res.set_content("done", "text/plain");
-  });
-
-  svr.listen("localhost", 1234);
-}
diff --git a/code/cpp-httplib-0.19.0/example/uploader.sh b/code/cpp-httplib-0.19.0/example/uploader.sh
deleted file mode 100644
index 4382ae62..00000000
--- a/code/cpp-httplib-0.19.0/example/uploader.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#/usr/bin/env bash
-for i in {1..1000000}
-do
-  echo "#### $i ####"
-  curl -X POST -F image_file=@$1 http://localhost:1234/post > /dev/null
-done
diff --git a/code/cpp-httplib-0.19.0/httplib.h b/code/cpp-httplib-0.19.0/httplib.h
deleted file mode 100644
index e4799dab..00000000
--- a/code/cpp-httplib-0.19.0/httplib.h
+++ /dev/null
@@ -1,10475 +0,0 @@
-//
-//  httplib.h
-//
-//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#ifndef CPPHTTPLIB_HTTPLIB_H
-#define CPPHTTPLIB_HTTPLIB_H
-
-#define CPPHTTPLIB_VERSION "0.19.0"
-
-/*
- * Configuration
- */
-
-#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND
-#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND
-#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND 10000
-#endif
-
-#ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT
-#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 100
-#endif
-
-#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND
-#define CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND 300
-#endif
-
-#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND
-#define CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND
-#define CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND
-#define CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND
-#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND
-#define CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND
-#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND 300
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND
-#define CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND
-#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND
-#define CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND
-#define CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_IDLE_INTERVAL_SECOND
-#define CPPHTTPLIB_IDLE_INTERVAL_SECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_IDLE_INTERVAL_USECOND
-#ifdef _WIN32
-#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 10000
-#else
-#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 0
-#endif
-#endif
-
-#ifndef CPPHTTPLIB_REQUEST_URI_MAX_LENGTH
-#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_HEADER_MAX_LENGTH
-#define CPPHTTPLIB_HEADER_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_REDIRECT_MAX_COUNT
-#define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
-#endif
-
-#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
-#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
-#endif
-
-#ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
-#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
-#endif
-
-#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
-#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
-#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
-#endif
-
-#ifndef CPPHTTPLIB_TCP_NODELAY
-#define CPPHTTPLIB_TCP_NODELAY false
-#endif
-
-#ifndef CPPHTTPLIB_IPV6_V6ONLY
-#define CPPHTTPLIB_IPV6_V6ONLY false
-#endif
-
-#ifndef CPPHTTPLIB_RECV_BUFSIZ
-#define CPPHTTPLIB_RECV_BUFSIZ size_t(16384u)
-#endif
-
-#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
-#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
-#endif
-
-#ifndef CPPHTTPLIB_THREAD_POOL_COUNT
-#define CPPHTTPLIB_THREAD_POOL_COUNT                                           \
-  ((std::max)(8u, std::thread::hardware_concurrency() > 0                      \
-                      ? std::thread::hardware_concurrency() - 1                \
-                      : 0))
-#endif
-
-#ifndef CPPHTTPLIB_RECV_FLAGS
-#define CPPHTTPLIB_RECV_FLAGS 0
-#endif
-
-#ifndef CPPHTTPLIB_SEND_FLAGS
-#define CPPHTTPLIB_SEND_FLAGS 0
-#endif
-
-#ifndef CPPHTTPLIB_LISTEN_BACKLOG
-#define CPPHTTPLIB_LISTEN_BACKLOG 5
-#endif
-
-/*
- * Headers
- */
-
-#ifdef _WIN32
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif //_CRT_SECURE_NO_WARNINGS
-
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE
-#endif //_CRT_NONSTDC_NO_DEPRECATE
-
-#if defined(_MSC_VER)
-#if _MSC_VER < 1900
-#error Sorry, Visual Studio versions prior to 2015 are not supported
-#endif
-
-#pragma comment(lib, "ws2_32.lib")
-
-#ifdef _WIN64
-using ssize_t = __int64;
-#else
-using ssize_t = long;
-#endif
-#endif // _MSC_VER
-
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
-#endif // S_ISREG
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
-#endif // S_ISDIR
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif // NOMINMAX
-
-#include <io.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-#ifndef WSA_FLAG_NO_HANDLE_INHERIT
-#define WSA_FLAG_NO_HANDLE_INHERIT 0x80
-#endif
-
-using socket_t = SOCKET;
-#ifdef CPPHTTPLIB_USE_POLL
-#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
-#endif
-
-#else // not _WIN32
-
-#include <arpa/inet.h>
-#if !defined(_AIX) && !defined(__MVS__)
-#include <ifaddrs.h>
-#endif
-#ifdef __MVS__
-#include <strings.h>
-#ifndef NI_MAXHOST
-#define NI_MAXHOST 1025
-#endif
-#endif
-#include <net/if.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef __linux__
-#include <resolv.h>
-#endif
-#include <netinet/tcp.h>
-#ifdef CPPHTTPLIB_USE_POLL
-#include <poll.h>
-#endif
-#include <csignal>
-#include <pthread.h>
-#include <sys/mman.h>
-#ifndef __VMS
-#include <sys/select.h>
-#endif
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-using socket_t = int;
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET (-1)
-#endif
-#endif //_WIN32
-
-#include <algorithm>
-#include <array>
-#include <atomic>
-#include <cassert>
-#include <cctype>
-#include <climits>
-#include <condition_variable>
-#include <cstring>
-#include <errno.h>
-#include <exception>
-#include <fcntl.h>
-#include <fstream>
-#include <functional>
-#include <iomanip>
-#include <iostream>
-#include <list>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <regex>
-#include <set>
-#include <sstream>
-#include <string>
-#include <sys/stat.h>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-#ifdef _WIN32
-#include <wincrypt.h>
-
-// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
-// used
-#undef X509_NAME
-#undef X509_CERT_PAIR
-#undef X509_EXTENSIONS
-#undef PKCS7_SIGNER_INFO
-
-#ifdef _MSC_VER
-#pragma comment(lib, "crypt32.lib")
-#endif
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#include <TargetConditionals.h>
-#if TARGET_OS_OSX
-#include <CoreFoundation/CoreFoundation.h>
-#include <Security/Security.h>
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-#include <openssl/x509v3.h>
-
-#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK)
-#include <openssl/applink.c>
-#endif
-
-#include <iostream>
-#include <sstream>
-
-#if defined(OPENSSL_IS_BORINGSSL) || defined(LIBRESSL_VERSION_NUMBER)
-#if OPENSSL_VERSION_NUMBER < 0x1010107f
-#error Please use OpenSSL or a current version of BoringSSL
-#endif
-#define SSL_get1_peer_certificate SSL_get_peer_certificate
-#elif OPENSSL_VERSION_NUMBER < 0x30000000L
-#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
-#endif
-
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-#include <zlib.h>
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-#include <brotli/decode.h>
-#include <brotli/encode.h>
-#endif
-
-/*
- * Declaration
- */
-namespace httplib {
-
-namespace detail {
-
-/*
- * Backport std::make_unique from C++14.
- *
- * NOTE: This code came up with the following stackoverflow post:
- * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique
- *
- */
-
-template <class T, class... Args>
-typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(Args &&...args) {
-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-template <class T>
-typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(std::size_t n) {
-  typedef typename std::remove_extent<T>::type RT;
-  return std::unique_ptr<T>(new RT[n]);
-}
-
-namespace case_ignore {
-
-inline unsigned char to_lower(int c) {
-  const static unsigned char table[256] = {
-      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
-      15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
-      30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
-      45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
-      60,  61,  62,  63,  64,  97,  98,  99,  100, 101, 102, 103, 104, 105, 106,
-      107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
-      122, 91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
-      105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
-      135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-      150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-      165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-      180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 224, 225, 226,
-      227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
-      242, 243, 244, 245, 246, 215, 248, 249, 250, 251, 252, 253, 254, 223, 224,
-      225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-      240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
-      255,
-  };
-  return table[(unsigned char)(char)c];
-}
-
-inline bool equal(const std::string &a, const std::string &b) {
-  return a.size() == b.size() &&
-         std::equal(a.begin(), a.end(), b.begin(), [](char ca, char cb) {
-           return to_lower(ca) == to_lower(cb);
-         });
-}
-
-struct equal_to {
-  bool operator()(const std::string &a, const std::string &b) const {
-    return equal(a, b);
-  }
-};
-
-struct hash {
-  size_t operator()(const std::string &key) const {
-    return hash_core(key.data(), key.size(), 0);
-  }
-
-  size_t hash_core(const char *s, size_t l, size_t h) const {
-    return (l == 0) ? h
-                    : hash_core(s + 1, l - 1,
-                                // Unsets the 6 high bits of h, therefore no
-                                // overflow happens
-                                (((std::numeric_limits<size_t>::max)() >> 6) &
-                                 h * 33) ^
-                                    static_cast<unsigned char>(to_lower(*s)));
-  }
-};
-
-} // namespace case_ignore
-
-// This is based on
-// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
-
-struct scope_exit {
-  explicit scope_exit(std::function<void(void)> &&f)
-      : exit_function(std::move(f)), execute_on_destruction{true} {}
-
-  scope_exit(scope_exit &&rhs) noexcept
-      : exit_function(std::move(rhs.exit_function)),
-        execute_on_destruction{rhs.execute_on_destruction} {
-    rhs.release();
-  }
-
-  ~scope_exit() {
-    if (execute_on_destruction) { this->exit_function(); }
-  }
-
-  void release() { this->execute_on_destruction = false; }
-
-private:
-  scope_exit(const scope_exit &) = delete;
-  void operator=(const scope_exit &) = delete;
-  scope_exit &operator=(scope_exit &&) = delete;
-
-  std::function<void(void)> exit_function;
-  bool execute_on_destruction;
-};
-
-} // namespace detail
-
-enum StatusCode {
-  // Information responses
-  Continue_100 = 100,
-  SwitchingProtocol_101 = 101,
-  Processing_102 = 102,
-  EarlyHints_103 = 103,
-
-  // Successful responses
-  OK_200 = 200,
-  Created_201 = 201,
-  Accepted_202 = 202,
-  NonAuthoritativeInformation_203 = 203,
-  NoContent_204 = 204,
-  ResetContent_205 = 205,
-  PartialContent_206 = 206,
-  MultiStatus_207 = 207,
-  AlreadyReported_208 = 208,
-  IMUsed_226 = 226,
-
-  // Redirection messages
-  MultipleChoices_300 = 300,
-  MovedPermanently_301 = 301,
-  Found_302 = 302,
-  SeeOther_303 = 303,
-  NotModified_304 = 304,
-  UseProxy_305 = 305,
-  unused_306 = 306,
-  TemporaryRedirect_307 = 307,
-  PermanentRedirect_308 = 308,
-
-  // Client error responses
-  BadRequest_400 = 400,
-  Unauthorized_401 = 401,
-  PaymentRequired_402 = 402,
-  Forbidden_403 = 403,
-  NotFound_404 = 404,
-  MethodNotAllowed_405 = 405,
-  NotAcceptable_406 = 406,
-  ProxyAuthenticationRequired_407 = 407,
-  RequestTimeout_408 = 408,
-  Conflict_409 = 409,
-  Gone_410 = 410,
-  LengthRequired_411 = 411,
-  PreconditionFailed_412 = 412,
-  PayloadTooLarge_413 = 413,
-  UriTooLong_414 = 414,
-  UnsupportedMediaType_415 = 415,
-  RangeNotSatisfiable_416 = 416,
-  ExpectationFailed_417 = 417,
-  ImATeapot_418 = 418,
-  MisdirectedRequest_421 = 421,
-  UnprocessableContent_422 = 422,
-  Locked_423 = 423,
-  FailedDependency_424 = 424,
-  TooEarly_425 = 425,
-  UpgradeRequired_426 = 426,
-  PreconditionRequired_428 = 428,
-  TooManyRequests_429 = 429,
-  RequestHeaderFieldsTooLarge_431 = 431,
-  UnavailableForLegalReasons_451 = 451,
-
-  // Server error responses
-  InternalServerError_500 = 500,
-  NotImplemented_501 = 501,
-  BadGateway_502 = 502,
-  ServiceUnavailable_503 = 503,
-  GatewayTimeout_504 = 504,
-  HttpVersionNotSupported_505 = 505,
-  VariantAlsoNegotiates_506 = 506,
-  InsufficientStorage_507 = 507,
-  LoopDetected_508 = 508,
-  NotExtended_510 = 510,
-  NetworkAuthenticationRequired_511 = 511,
-};
-
-using Headers =
-    std::unordered_multimap<std::string, std::string, detail::case_ignore::hash,
-                            detail::case_ignore::equal_to>;
-
-using Params = std::multimap<std::string, std::string>;
-using Match = std::smatch;
-
-using Progress = std::function<bool(uint64_t current, uint64_t total)>;
-
-struct Response;
-using ResponseHandler = std::function<bool(const Response &response)>;
-
-struct MultipartFormData {
-  std::string name;
-  std::string content;
-  std::string filename;
-  std::string content_type;
-};
-using MultipartFormDataItems = std::vector<MultipartFormData>;
-using MultipartFormDataMap = std::multimap<std::string, MultipartFormData>;
-
-class DataSink {
-public:
-  DataSink() : os(&sb_), sb_(*this) {}
-
-  DataSink(const DataSink &) = delete;
-  DataSink &operator=(const DataSink &) = delete;
-  DataSink(DataSink &&) = delete;
-  DataSink &operator=(DataSink &&) = delete;
-
-  std::function<bool(const char *data, size_t data_len)> write;
-  std::function<bool()> is_writable;
-  std::function<void()> done;
-  std::function<void(const Headers &trailer)> done_with_trailer;
-  std::ostream os;
-
-private:
-  class data_sink_streambuf final : public std::streambuf {
-  public:
-    explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
-
-  protected:
-    std::streamsize xsputn(const char *s, std::streamsize n) override {
-      sink_.write(s, static_cast<size_t>(n));
-      return n;
-    }
-
-  private:
-    DataSink &sink_;
-  };
-
-  data_sink_streambuf sb_;
-};
-
-using ContentProvider =
-    std::function<bool(size_t offset, size_t length, DataSink &sink)>;
-
-using ContentProviderWithoutLength =
-    std::function<bool(size_t offset, DataSink &sink)>;
-
-using ContentProviderResourceReleaser = std::function<void(bool success)>;
-
-struct MultipartFormDataProvider {
-  std::string name;
-  ContentProviderWithoutLength provider;
-  std::string filename;
-  std::string content_type;
-};
-using MultipartFormDataProviderItems = std::vector<MultipartFormDataProvider>;
-
-using ContentReceiverWithProgress =
-    std::function<bool(const char *data, size_t data_length, uint64_t offset,
-                       uint64_t total_length)>;
-
-using ContentReceiver =
-    std::function<bool(const char *data, size_t data_length)>;
-
-using MultipartContentHeader =
-    std::function<bool(const MultipartFormData &file)>;
-
-class ContentReader {
-public:
-  using Reader = std::function<bool(ContentReceiver receiver)>;
-  using MultipartReader = std::function<bool(MultipartContentHeader header,
-                                             ContentReceiver receiver)>;
-
-  ContentReader(Reader reader, MultipartReader multipart_reader)
-      : reader_(std::move(reader)),
-        multipart_reader_(std::move(multipart_reader)) {}
-
-  bool operator()(MultipartContentHeader header,
-                  ContentReceiver receiver) const {
-    return multipart_reader_(std::move(header), std::move(receiver));
-  }
-
-  bool operator()(ContentReceiver receiver) const {
-    return reader_(std::move(receiver));
-  }
-
-  Reader reader_;
-  MultipartReader multipart_reader_;
-};
-
-using Range = std::pair<ssize_t, ssize_t>;
-using Ranges = std::vector<Range>;
-
-struct Request {
-  std::string method;
-  std::string path;
-  Params params;
-  Headers headers;
-  std::string body;
-
-  std::string remote_addr;
-  int remote_port = -1;
-  std::string local_addr;
-  int local_port = -1;
-
-  // for server
-  std::string version;
-  std::string target;
-  MultipartFormDataMap files;
-  Ranges ranges;
-  Match matches;
-  std::unordered_map<std::string, std::string> path_params;
-  std::function<bool()> is_connection_closed = []() { return true; };
-
-  // for client
-  ResponseHandler response_handler;
-  ContentReceiverWithProgress content_receiver;
-  Progress progress;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  const SSL *ssl = nullptr;
-#endif
-
-  bool has_header(const std::string &key) const;
-  std::string get_header_value(const std::string &key, const char *def = "",
-                               size_t id = 0) const;
-  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
-                                size_t id = 0) const;
-  size_t get_header_value_count(const std::string &key) const;
-  void set_header(const std::string &key, const std::string &val);
-
-  bool has_param(const std::string &key) const;
-  std::string get_param_value(const std::string &key, size_t id = 0) const;
-  size_t get_param_value_count(const std::string &key) const;
-
-  bool is_multipart_form_data() const;
-
-  bool has_file(const std::string &key) const;
-  MultipartFormData get_file_value(const std::string &key) const;
-  std::vector<MultipartFormData> get_file_values(const std::string &key) const;
-
-  // private members...
-  size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
-  size_t content_length_ = 0;
-  ContentProvider content_provider_;
-  bool is_chunked_content_provider_ = false;
-  size_t authorization_count_ = 0;
-  std::chrono::time_point<std::chrono::steady_clock> start_time_ =
-      std::chrono::steady_clock::time_point::min();
-};
-
-struct Response {
-  std::string version;
-  int status = -1;
-  std::string reason;
-  Headers headers;
-  std::string body;
-  std::string location; // Redirect location
-
-  bool has_header(const std::string &key) const;
-  std::string get_header_value(const std::string &key, const char *def = "",
-                               size_t id = 0) const;
-  uint64_t get_header_value_u64(const std::string &key, uint64_t def = 0,
-                                size_t id = 0) const;
-  size_t get_header_value_count(const std::string &key) const;
-  void set_header(const std::string &key, const std::string &val);
-
-  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
-  void set_content(const char *s, size_t n, const std::string &content_type);
-  void set_content(const std::string &s, const std::string &content_type);
-  void set_content(std::string &&s, const std::string &content_type);
-
-  void set_content_provider(
-      size_t length, const std::string &content_type, ContentProvider provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_content_provider(
-      const std::string &content_type, ContentProviderWithoutLength provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_chunked_content_provider(
-      const std::string &content_type, ContentProviderWithoutLength provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_file_content(const std::string &path,
-                        const std::string &content_type);
-  void set_file_content(const std::string &path);
-
-  Response() = default;
-  Response(const Response &) = default;
-  Response &operator=(const Response &) = default;
-  Response(Response &&) = default;
-  Response &operator=(Response &&) = default;
-  ~Response() {
-    if (content_provider_resource_releaser_) {
-      content_provider_resource_releaser_(content_provider_success_);
-    }
-  }
-
-  // private members...
-  size_t content_length_ = 0;
-  ContentProvider content_provider_;
-  ContentProviderResourceReleaser content_provider_resource_releaser_;
-  bool is_chunked_content_provider_ = false;
-  bool content_provider_success_ = false;
-  std::string file_content_path_;
-  std::string file_content_content_type_;
-};
-
-class Stream {
-public:
-  virtual ~Stream() = default;
-
-  virtual bool is_readable() const = 0;
-  virtual bool is_writable() const = 0;
-
-  virtual ssize_t read(char *ptr, size_t size) = 0;
-  virtual ssize_t write(const char *ptr, size_t size) = 0;
-  virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
-  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
-  virtual socket_t socket() const = 0;
-
-  virtual time_t duration() const = 0;
-
-  ssize_t write(const char *ptr);
-  ssize_t write(const std::string &s);
-};
-
-class TaskQueue {
-public:
-  TaskQueue() = default;
-  virtual ~TaskQueue() = default;
-
-  virtual bool enqueue(std::function<void()> fn) = 0;
-  virtual void shutdown() = 0;
-
-  virtual void on_idle() {}
-};
-
-class ThreadPool final : public TaskQueue {
-public:
-  explicit ThreadPool(size_t n, size_t mqr = 0)
-      : shutdown_(false), max_queued_requests_(mqr) {
-    while (n) {
-      threads_.emplace_back(worker(*this));
-      n--;
-    }
-  }
-
-  ThreadPool(const ThreadPool &) = delete;
-  ~ThreadPool() override = default;
-
-  bool enqueue(std::function<void()> fn) override {
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
-      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
-        return false;
-      }
-      jobs_.push_back(std::move(fn));
-    }
-
-    cond_.notify_one();
-    return true;
-  }
-
-  void shutdown() override {
-    // Stop all worker threads...
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
-      shutdown_ = true;
-    }
-
-    cond_.notify_all();
-
-    // Join...
-    for (auto &t : threads_) {
-      t.join();
-    }
-  }
-
-private:
-  struct worker {
-    explicit worker(ThreadPool &pool) : pool_(pool) {}
-
-    void operator()() {
-      for (;;) {
-        std::function<void()> fn;
-        {
-          std::unique_lock<std::mutex> lock(pool_.mutex_);
-
-          pool_.cond_.wait(
-              lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; });
-
-          if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
-
-          fn = pool_.jobs_.front();
-          pool_.jobs_.pop_front();
-        }
-
-        assert(true == static_cast<bool>(fn));
-        fn();
-      }
-
-#if defined(CPPHTTPLIB_OPENSSL_SUPPORT) && !defined(OPENSSL_IS_BORINGSSL) &&   \
-    !defined(LIBRESSL_VERSION_NUMBER)
-      OPENSSL_thread_stop();
-#endif
-    }
-
-    ThreadPool &pool_;
-  };
-  friend struct worker;
-
-  std::vector<std::thread> threads_;
-  std::list<std::function<void()>> jobs_;
-
-  bool shutdown_;
-  size_t max_queued_requests_ = 0;
-
-  std::condition_variable cond_;
-  std::mutex mutex_;
-};
-
-using Logger = std::function<void(const Request &, const Response &)>;
-
-using SocketOptions = std::function<void(socket_t sock)>;
-
-void default_socket_options(socket_t sock);
-
-const char *status_message(int status);
-
-std::string get_bearer_token_auth(const Request &req);
-
-namespace detail {
-
-class MatcherBase {
-public:
-  virtual ~MatcherBase() = default;
-
-  // Match request path and populate its matches and
-  virtual bool match(Request &request) const = 0;
-};
-
-/**
- * Captures parameters in request path and stores them in Request::path_params
- *
- * Capture name is a substring of a pattern from : to /.
- * The rest of the pattern is matched agains the request path directly
- * Parameters are captured starting from the next character after
- * the end of the last matched static pattern fragment until the next /.
- *
- * Example pattern:
- * "/path/fragments/:capture/more/fragments/:second_capture"
- * Static fragments:
- * "/path/fragments/", "more/fragments/"
- *
- * Given the following request path:
- * "/path/fragments/:1/more/fragments/:2"
- * the resulting capture will be
- * {{"capture", "1"}, {"second_capture", "2"}}
- */
-class PathParamsMatcher final : public MatcherBase {
-public:
-  PathParamsMatcher(const std::string &pattern);
-
-  bool match(Request &request) const override;
-
-private:
-  // Treat segment separators as the end of path parameter capture
-  // Does not need to handle query parameters as they are parsed before path
-  // matching
-  static constexpr char separator = '/';
-
-  // Contains static path fragments to match against, excluding the '/' after
-  // path params
-  // Fragments are separated by path params
-  std::vector<std::string> static_fragments_;
-  // Stores the names of the path parameters to be used as keys in the
-  // Request::path_params map
-  std::vector<std::string> param_names_;
-};
-
-/**
- * Performs std::regex_match on request path
- * and stores the result in Request::matches
- *
- * Note that regex match is performed directly on the whole request.
- * This means that wildcard patterns may match multiple path segments with /:
- * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
- */
-class RegexMatcher final : public MatcherBase {
-public:
-  RegexMatcher(const std::string &pattern) : regex_(pattern) {}
-
-  bool match(Request &request) const override;
-
-private:
-  std::regex regex_;
-};
-
-ssize_t write_headers(Stream &strm, const Headers &headers);
-
-} // namespace detail
-
-class Server {
-public:
-  using Handler = std::function<void(const Request &, Response &)>;
-
-  using ExceptionHandler =
-      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
-
-  enum class HandlerResponse {
-    Handled,
-    Unhandled,
-  };
-  using HandlerWithResponse =
-      std::function<HandlerResponse(const Request &, Response &)>;
-
-  using HandlerWithContentReader = std::function<void(
-      const Request &, Response &, const ContentReader &content_reader)>;
-
-  using Expect100ContinueHandler =
-      std::function<int(const Request &, Response &)>;
-
-  Server();
-
-  virtual ~Server();
-
-  virtual bool is_valid() const;
-
-  Server &Get(const std::string &pattern, Handler handler);
-  Server &Post(const std::string &pattern, Handler handler);
-  Server &Post(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Put(const std::string &pattern, Handler handler);
-  Server &Put(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Patch(const std::string &pattern, Handler handler);
-  Server &Patch(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Delete(const std::string &pattern, Handler handler);
-  Server &Delete(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Options(const std::string &pattern, Handler handler);
-
-  bool set_base_dir(const std::string &dir,
-                    const std::string &mount_point = std::string());
-  bool set_mount_point(const std::string &mount_point, const std::string &dir,
-                       Headers headers = Headers());
-  bool remove_mount_point(const std::string &mount_point);
-  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
-                                                  const std::string &mime);
-  Server &set_default_file_mimetype(const std::string &mime);
-  Server &set_file_request_handler(Handler handler);
-
-  template <class ErrorHandlerFunc>
-  Server &set_error_handler(ErrorHandlerFunc &&handler) {
-    return set_error_handler_core(
-        std::forward<ErrorHandlerFunc>(handler),
-        std::is_convertible<ErrorHandlerFunc, HandlerWithResponse>{});
-  }
-
-  Server &set_exception_handler(ExceptionHandler handler);
-  Server &set_pre_routing_handler(HandlerWithResponse handler);
-  Server &set_post_routing_handler(Handler handler);
-
-  Server &set_expect_100_continue_handler(Expect100ContinueHandler handler);
-  Server &set_logger(Logger logger);
-
-  Server &set_address_family(int family);
-  Server &set_tcp_nodelay(bool on);
-  Server &set_ipv6_v6only(bool on);
-  Server &set_socket_options(SocketOptions socket_options);
-
-  Server &set_default_headers(Headers headers);
-  Server &
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  Server &set_keep_alive_max_count(size_t count);
-  Server &set_keep_alive_timeout(time_t sec);
-
-  Server &set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_idle_interval(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_idle_interval(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_payload_max_length(size_t length);
-
-  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
-  int bind_to_any_port(const std::string &host, int socket_flags = 0);
-  bool listen_after_bind();
-
-  bool listen(const std::string &host, int port, int socket_flags = 0);
-
-  bool is_running() const;
-  void wait_until_ready() const;
-  void stop();
-  void decommission();
-
-  std::function<TaskQueue *(void)> new_task_queue;
-
-protected:
-  bool process_request(Stream &strm, const std::string &remote_addr,
-                       int remote_port, const std::string &local_addr,
-                       int local_port, bool close_connection,
-                       bool &connection_closed,
-                       const std::function<void(Request &)> &setup_request);
-
-  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
-  size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
-  time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
-  time_t read_timeout_sec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_SECOND;
-  time_t read_timeout_usec_ = CPPHTTPLIB_SERVER_READ_TIMEOUT_USECOND;
-  time_t write_timeout_sec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_SECOND;
-  time_t write_timeout_usec_ = CPPHTTPLIB_SERVER_WRITE_TIMEOUT_USECOND;
-  time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND;
-  time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND;
-  size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
-
-private:
-  using Handlers =
-      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
-  using HandlersForContentReader =
-      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
-                            HandlerWithContentReader>>;
-
-  static std::unique_ptr<detail::MatcherBase>
-  make_matcher(const std::string &pattern);
-
-  Server &set_error_handler_core(HandlerWithResponse handler, std::true_type);
-  Server &set_error_handler_core(Handler handler, std::false_type);
-
-  socket_t create_server_socket(const std::string &host, int port,
-                                int socket_flags,
-                                SocketOptions socket_options) const;
-  int bind_internal(const std::string &host, int port, int socket_flags);
-  bool listen_internal();
-
-  bool routing(Request &req, Response &res, Stream &strm);
-  bool handle_file_request(const Request &req, Response &res,
-                           bool head = false);
-  bool dispatch_request(Request &req, Response &res,
-                        const Handlers &handlers) const;
-  bool dispatch_request_for_content_reader(
-      Request &req, Response &res, ContentReader content_reader,
-      const HandlersForContentReader &handlers) const;
-
-  bool parse_request_line(const char *s, Request &req) const;
-  void apply_ranges(const Request &req, Response &res,
-                    std::string &content_type, std::string &boundary) const;
-  bool write_response(Stream &strm, bool close_connection, Request &req,
-                      Response &res);
-  bool write_response_with_content(Stream &strm, bool close_connection,
-                                   const Request &req, Response &res);
-  bool write_response_core(Stream &strm, bool close_connection,
-                           const Request &req, Response &res,
-                           bool need_apply_ranges);
-  bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Response &res, const std::string &boundary,
-                                   const std::string &content_type);
-  bool read_content(Stream &strm, Request &req, Response &res);
-  bool
-  read_content_with_content_receiver(Stream &strm, Request &req, Response &res,
-                                     ContentReceiver receiver,
-                                     MultipartContentHeader multipart_header,
-                                     ContentReceiver multipart_receiver);
-  bool read_content_core(Stream &strm, Request &req, Response &res,
-                         ContentReceiver receiver,
-                         MultipartContentHeader multipart_header,
-                         ContentReceiver multipart_receiver) const;
-
-  virtual bool process_and_close_socket(socket_t sock);
-
-  std::atomic<bool> is_running_{false};
-  std::atomic<bool> is_decommisioned{false};
-
-  struct MountPointEntry {
-    std::string mount_point;
-    std::string base_dir;
-    Headers headers;
-  };
-  std::vector<MountPointEntry> base_dirs_;
-  std::map<std::string, std::string> file_extension_and_mimetype_map_;
-  std::string default_file_mimetype_ = "application/octet-stream";
-  Handler file_request_handler_;
-
-  Handlers get_handlers_;
-  Handlers post_handlers_;
-  HandlersForContentReader post_handlers_for_content_reader_;
-  Handlers put_handlers_;
-  HandlersForContentReader put_handlers_for_content_reader_;
-  Handlers patch_handlers_;
-  HandlersForContentReader patch_handlers_for_content_reader_;
-  Handlers delete_handlers_;
-  HandlersForContentReader delete_handlers_for_content_reader_;
-  Handlers options_handlers_;
-
-  HandlerWithResponse error_handler_;
-  ExceptionHandler exception_handler_;
-  HandlerWithResponse pre_routing_handler_;
-  Handler post_routing_handler_;
-  Expect100ContinueHandler expect_100_continue_handler_;
-
-  Logger logger_;
-
-  int address_family_ = AF_UNSPEC;
-  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
-  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
-  SocketOptions socket_options_ = default_socket_options;
-
-  Headers default_headers_;
-  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
-      detail::write_headers;
-};
-
-enum class Error {
-  Success = 0,
-  Unknown,
-  Connection,
-  BindIPAddress,
-  Read,
-  Write,
-  ExceedRedirectCount,
-  Canceled,
-  SSLConnection,
-  SSLLoadingCerts,
-  SSLServerVerification,
-  SSLServerHostnameVerification,
-  UnsupportedMultipartBoundaryChars,
-  Compression,
-  ConnectionTimeout,
-  ProxyConnection,
-
-  // For internal use only
-  SSLPeerCouldBeClosed_,
-};
-
-std::string to_string(Error error);
-
-std::ostream &operator<<(std::ostream &os, const Error &obj);
-
-class Result {
-public:
-  Result() = default;
-  Result(std::unique_ptr<Response> &&res, Error err,
-         Headers &&request_headers = Headers{})
-      : res_(std::move(res)), err_(err),
-        request_headers_(std::move(request_headers)) {}
-  // Response
-  operator bool() const { return res_ != nullptr; }
-  bool operator==(std::nullptr_t) const { return res_ == nullptr; }
-  bool operator!=(std::nullptr_t) const { return res_ != nullptr; }
-  const Response &value() const { return *res_; }
-  Response &value() { return *res_; }
-  const Response &operator*() const { return *res_; }
-  Response &operator*() { return *res_; }
-  const Response *operator->() const { return res_.get(); }
-  Response *operator->() { return res_.get(); }
-
-  // Error
-  Error error() const { return err_; }
-
-  // Request Headers
-  bool has_request_header(const std::string &key) const;
-  std::string get_request_header_value(const std::string &key,
-                                       const char *def = "",
-                                       size_t id = 0) const;
-  uint64_t get_request_header_value_u64(const std::string &key,
-                                        uint64_t def = 0, size_t id = 0) const;
-  size_t get_request_header_value_count(const std::string &key) const;
-
-private:
-  std::unique_ptr<Response> res_;
-  Error err_ = Error::Unknown;
-  Headers request_headers_;
-};
-
-class ClientImpl {
-public:
-  explicit ClientImpl(const std::string &host);
-
-  explicit ClientImpl(const std::string &host, int port);
-
-  explicit ClientImpl(const std::string &host, int port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path);
-
-  virtual ~ClientImpl();
-
-  virtual bool is_valid() const;
-
-  Result Get(const std::string &path);
-  Result Get(const std::string &path, const Headers &headers);
-  Result Get(const std::string &path, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             Progress progress);
-  Result Get(const std::string &path, ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress);
-
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ContentReceiver content_receiver,
-             Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress = nullptr);
-
-  Result Head(const std::string &path);
-  Result Head(const std::string &path, const Headers &headers);
-
-  Result Post(const std::string &path);
-  Result Post(const std::string &path, const Headers &headers);
-  Result Post(const std::string &path, const char *body, size_t content_length,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type, Progress progress);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, size_t content_length,
-              ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              size_t content_length, ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params, Progress progress);
-  Result Post(const std::string &path, const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items, const std::string &boundary);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items,
-              const MultipartFormDataProviderItems &provider_items);
-
-  Result Put(const std::string &path);
-  Result Put(const std::string &path, const char *body, size_t content_length,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type, Progress progress);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, size_t content_length,
-             ContentProvider content_provider, const std::string &content_type);
-  Result Put(const std::string &path,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             size_t content_length, ContentProvider content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params, Progress progress);
-  Result Put(const std::string &path, const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items);
-
-  Result Patch(const std::string &path);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type,
-               Progress progress);
-  Result Patch(const std::string &path, size_t content_length,
-               ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               size_t content_length, ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-
-  Result Delete(const std::string &path);
-  Result Delete(const std::string &path, const Headers &headers);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type,
-                Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type,
-                Progress progress);
-
-  Result Options(const std::string &path);
-  Result Options(const std::string &path, const Headers &headers);
-
-  bool send(Request &req, Response &res, Error &error);
-  Result send(const Request &req);
-
-  void stop();
-
-  std::string host() const;
-  int port() const;
-
-  size_t is_socket_open() const;
-  socket_t socket() const;
-
-  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
-
-  void set_default_headers(Headers headers);
-
-  void
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  void set_address_family(int family);
-  void set_tcp_nodelay(bool on);
-  void set_ipv6_v6only(bool on);
-  void set_socket_options(SocketOptions socket_options);
-
-  void set_connection_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void
-  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_max_timeout(time_t msec);
-  template <class Rep, class Period>
-  void set_max_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_basic_auth(const std::string &username, const std::string &password);
-  void set_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const std::string &username,
-                       const std::string &password);
-#endif
-
-  void set_keep_alive(bool on);
-  void set_follow_location(bool on);
-
-  void set_url_encode(bool on);
-
-  void set_compress(bool on);
-
-  void set_decompress(bool on);
-
-  void set_interface(const std::string &intf);
-
-  void set_proxy(const std::string &host, int port);
-  void set_proxy_basic_auth(const std::string &username,
-                            const std::string &password);
-  void set_proxy_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const std::string &username,
-                             const std::string &password);
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const std::string &ca_cert_file_path,
-                        const std::string &ca_cert_dir_path = std::string());
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void enable_server_certificate_verification(bool enabled);
-  void enable_server_hostname_verification(bool enabled);
-  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
-#endif
-
-  void set_logger(Logger logger);
-
-protected:
-  struct Socket {
-    socket_t sock = INVALID_SOCKET;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    SSL *ssl = nullptr;
-#endif
-
-    bool is_open() const { return sock != INVALID_SOCKET; }
-  };
-
-  virtual bool create_and_connect_socket(Socket &socket, Error &error);
-
-  // All of:
-  //   shutdown_ssl
-  //   shutdown_socket
-  //   close_socket
-  // should ONLY be called when socket_mutex_ is locked.
-  // Also, shutdown_ssl and close_socket should also NOT be called concurrently
-  // with a DIFFERENT thread sending requests using that socket.
-  virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
-  void shutdown_socket(Socket &socket) const;
-  void close_socket(Socket &socket);
-
-  bool process_request(Stream &strm, Request &req, Response &res,
-                       bool close_connection, Error &error);
-
-  bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Error &error) const;
-
-  void copy_settings(const ClientImpl &rhs);
-
-  // Socket endpoint information
-  const std::string host_;
-  const int port_;
-  const std::string host_and_port_;
-
-  // Current open socket
-  Socket socket_;
-  mutable std::mutex socket_mutex_;
-  std::recursive_mutex request_mutex_;
-
-  // These are all protected under socket_mutex
-  size_t socket_requests_in_flight_ = 0;
-  std::thread::id socket_requests_are_from_thread_ = std::thread::id();
-  bool socket_should_be_closed_when_request_is_done_ = false;
-
-  // Hostname-IP map
-  std::map<std::string, std::string> addr_map_;
-
-  // Default headers
-  Headers default_headers_;
-
-  // Header writer
-  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
-      detail::write_headers;
-
-  // Settings
-  std::string client_cert_path_;
-  std::string client_key_path_;
-
-  time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND;
-  time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND;
-  time_t read_timeout_sec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_SECOND;
-  time_t read_timeout_usec_ = CPPHTTPLIB_CLIENT_READ_TIMEOUT_USECOND;
-  time_t write_timeout_sec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_SECOND;
-  time_t write_timeout_usec_ = CPPHTTPLIB_CLIENT_WRITE_TIMEOUT_USECOND;
-  time_t max_timeout_msec_ = CPPHTTPLIB_CLIENT_MAX_TIMEOUT_MSECOND;
-
-  std::string basic_auth_username_;
-  std::string basic_auth_password_;
-  std::string bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string digest_auth_username_;
-  std::string digest_auth_password_;
-#endif
-
-  bool keep_alive_ = false;
-  bool follow_location_ = false;
-
-  bool url_encode_ = true;
-
-  int address_family_ = AF_UNSPEC;
-  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
-  bool ipv6_v6only_ = CPPHTTPLIB_IPV6_V6ONLY;
-  SocketOptions socket_options_ = nullptr;
-
-  bool compress_ = false;
-  bool decompress_ = true;
-
-  std::string interface_;
-
-  std::string proxy_host_;
-  int proxy_port_ = -1;
-
-  std::string proxy_basic_auth_username_;
-  std::string proxy_basic_auth_password_;
-  std::string proxy_bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string proxy_digest_auth_username_;
-  std::string proxy_digest_auth_password_;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string ca_cert_file_path_;
-  std::string ca_cert_dir_path_;
-
-  X509_STORE *ca_cert_store_ = nullptr;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  bool server_certificate_verification_ = true;
-  bool server_hostname_verification_ = true;
-  std::function<bool(SSL *ssl)> server_certificate_verifier_;
-#endif
-
-  Logger logger_;
-
-private:
-  bool send_(Request &req, Response &res, Error &error);
-  Result send_(Request &&req);
-
-  socket_t create_client_socket(Error &error) const;
-  bool read_response_line(Stream &strm, const Request &req,
-                          Response &res) const;
-  bool write_request(Stream &strm, Request &req, bool close_connection,
-                     Error &error);
-  bool redirect(Request &req, Response &res, Error &error);
-  bool handle_request(Stream &strm, Request &req, Response &res,
-                      bool close_connection, Error &error);
-  std::unique_ptr<Response> send_with_content_provider(
-      Request &req, const char *body, size_t content_length,
-      ContentProvider content_provider,
-      ContentProviderWithoutLength content_provider_without_length,
-      const std::string &content_type, Error &error);
-  Result send_with_content_provider(
-      const std::string &method, const std::string &path,
-      const Headers &headers, const char *body, size_t content_length,
-      ContentProvider content_provider,
-      ContentProviderWithoutLength content_provider_without_length,
-      const std::string &content_type, Progress progress);
-  ContentProviderWithoutLength get_multipart_content_provider(
-      const std::string &boundary, const MultipartFormDataItems &items,
-      const MultipartFormDataProviderItems &provider_items) const;
-
-  std::string adjust_host_string(const std::string &host) const;
-
-  virtual bool
-  process_socket(const Socket &socket,
-                 std::chrono::time_point<std::chrono::steady_clock> start_time,
-                 std::function<bool(Stream &strm)> callback);
-  virtual bool is_ssl() const;
-};
-
-class Client {
-public:
-  // Universal interface
-  explicit Client(const std::string &scheme_host_port);
-
-  explicit Client(const std::string &scheme_host_port,
-                  const std::string &client_cert_path,
-                  const std::string &client_key_path);
-
-  // HTTP only interface
-  explicit Client(const std::string &host, int port);
-
-  explicit Client(const std::string &host, int port,
-                  const std::string &client_cert_path,
-                  const std::string &client_key_path);
-
-  Client(Client &&) = default;
-  Client &operator=(Client &&) = default;
-
-  ~Client();
-
-  bool is_valid() const;
-
-  Result Get(const std::string &path);
-  Result Get(const std::string &path, const Headers &headers);
-  Result Get(const std::string &path, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             Progress progress);
-  Result Get(const std::string &path, ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress);
-
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ContentReceiver content_receiver,
-             Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress = nullptr);
-
-  Result Head(const std::string &path);
-  Result Head(const std::string &path, const Headers &headers);
-
-  Result Post(const std::string &path);
-  Result Post(const std::string &path, const Headers &headers);
-  Result Post(const std::string &path, const char *body, size_t content_length,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type, Progress progress);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type,
-              Progress progress);
-  Result Post(const std::string &path, size_t content_length,
-              ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              size_t content_length, ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params, Progress progress);
-  Result Post(const std::string &path, const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items, const std::string &boundary);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items,
-              const MultipartFormDataProviderItems &provider_items);
-
-  Result Put(const std::string &path);
-  Result Put(const std::string &path, const char *body, size_t content_length,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type, Progress progress);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type,
-             Progress progress);
-  Result Put(const std::string &path, size_t content_length,
-             ContentProvider content_provider, const std::string &content_type);
-  Result Put(const std::string &path,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             size_t content_length, ContentProvider content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params, Progress progress);
-  Result Put(const std::string &path, const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items);
-
-  Result Patch(const std::string &path);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type, Progress progress);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type,
-               Progress progress);
-  Result Patch(const std::string &path, size_t content_length,
-               ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               size_t content_length, ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-
-  Result Delete(const std::string &path);
-  Result Delete(const std::string &path, const Headers &headers);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type,
-                Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type, Progress progress);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type,
-                Progress progress);
-
-  Result Options(const std::string &path);
-  Result Options(const std::string &path, const Headers &headers);
-
-  bool send(Request &req, Response &res, Error &error);
-  Result send(const Request &req);
-
-  void stop();
-
-  std::string host() const;
-  int port() const;
-
-  size_t is_socket_open() const;
-  socket_t socket() const;
-
-  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
-
-  void set_default_headers(Headers headers);
-
-  void
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  void set_address_family(int family);
-  void set_tcp_nodelay(bool on);
-  void set_socket_options(SocketOptions socket_options);
-
-  void set_connection_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void
-  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_max_timeout(time_t msec);
-  template <class Rep, class Period>
-  void set_max_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_basic_auth(const std::string &username, const std::string &password);
-  void set_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const std::string &username,
-                       const std::string &password);
-#endif
-
-  void set_keep_alive(bool on);
-  void set_follow_location(bool on);
-
-  void set_url_encode(bool on);
-
-  void set_compress(bool on);
-
-  void set_decompress(bool on);
-
-  void set_interface(const std::string &intf);
-
-  void set_proxy(const std::string &host, int port);
-  void set_proxy_basic_auth(const std::string &username,
-                            const std::string &password);
-  void set_proxy_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const std::string &username,
-                             const std::string &password);
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void enable_server_certificate_verification(bool enabled);
-  void enable_server_hostname_verification(bool enabled);
-  void set_server_certificate_verifier(std::function<bool(SSL *ssl)> verifier);
-#endif
-
-  void set_logger(Logger logger);
-
-  // SSL
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const std::string &ca_cert_file_path,
-                        const std::string &ca_cert_dir_path = std::string());
-
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  void load_ca_cert_store(const char *ca_cert, std::size_t size);
-
-  long get_openssl_verify_result() const;
-
-  SSL_CTX *ssl_context() const;
-#endif
-
-private:
-  std::unique_ptr<ClientImpl> cli_;
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  bool is_ssl_ = false;
-#endif
-};
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLServer : public Server {
-public:
-  SSLServer(const char *cert_path, const char *private_key_path,
-            const char *client_ca_cert_file_path = nullptr,
-            const char *client_ca_cert_dir_path = nullptr,
-            const char *private_key_password = nullptr);
-
-  SSLServer(X509 *cert, EVP_PKEY *private_key,
-            X509_STORE *client_ca_cert_store = nullptr);
-
-  SSLServer(
-      const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback);
-
-  ~SSLServer() override;
-
-  bool is_valid() const override;
-
-  SSL_CTX *ssl_context() const;
-
-  void update_certs(X509 *cert, EVP_PKEY *private_key,
-                    X509_STORE *client_ca_cert_store = nullptr);
-
-private:
-  bool process_and_close_socket(socket_t sock) override;
-
-  SSL_CTX *ctx_;
-  std::mutex ctx_mutex_;
-};
-
-class SSLClient final : public ClientImpl {
-public:
-  explicit SSLClient(const std::string &host);
-
-  explicit SSLClient(const std::string &host, int port);
-
-  explicit SSLClient(const std::string &host, int port,
-                     const std::string &client_cert_path,
-                     const std::string &client_key_path,
-                     const std::string &private_key_password = std::string());
-
-  explicit SSLClient(const std::string &host, int port, X509 *client_cert,
-                     EVP_PKEY *client_key,
-                     const std::string &private_key_password = std::string());
-
-  ~SSLClient() override;
-
-  bool is_valid() const override;
-
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  void load_ca_cert_store(const char *ca_cert, std::size_t size);
-
-  long get_openssl_verify_result() const;
-
-  SSL_CTX *ssl_context() const;
-
-private:
-  bool create_and_connect_socket(Socket &socket, Error &error) override;
-  void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
-  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
-
-  bool
-  process_socket(const Socket &socket,
-                 std::chrono::time_point<std::chrono::steady_clock> start_time,
-                 std::function<bool(Stream &strm)> callback) override;
-  bool is_ssl() const override;
-
-  bool connect_with_proxy(
-      Socket &sock,
-      std::chrono::time_point<std::chrono::steady_clock> start_time,
-      Response &res, bool &success, Error &error);
-  bool initialize_ssl(Socket &socket, Error &error);
-
-  bool load_certs();
-
-  bool verify_host(X509 *server_cert) const;
-  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
-  bool verify_host_with_common_name(X509 *server_cert) const;
-  bool check_host_name(const char *pattern, size_t pattern_len) const;
-
-  SSL_CTX *ctx_;
-  std::mutex ctx_mutex_;
-  std::once_flag initialize_cert_;
-
-  std::vector<std::string> host_components_;
-
-  long verify_result_ = 0;
-
-  friend class ClientImpl;
-};
-#endif
-
-/*
- * Implementation of template methods.
- */
-
-namespace detail {
-
-template <typename T, typename U>
-inline void duration_to_sec_and_usec(const T &duration, U callback) {
-  auto sec = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
-  auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
-                  duration - std::chrono::seconds(sec))
-                  .count();
-  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
-}
-
-inline bool is_numeric(const std::string &str) {
-  return !str.empty() && std::all_of(str.begin(), str.end(), ::isdigit);
-}
-
-inline uint64_t get_header_value_u64(const Headers &headers,
-                                     const std::string &key, uint64_t def,
-                                     size_t id, bool &is_invalid_value) {
-  is_invalid_value = false;
-  auto rng = headers.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) {
-    if (is_numeric(it->second)) {
-      return std::strtoull(it->second.data(), nullptr, 10);
-    } else {
-      is_invalid_value = true;
-    }
-  }
-  return def;
-}
-
-inline uint64_t get_header_value_u64(const Headers &headers,
-                                     const std::string &key, uint64_t def,
-                                     size_t id) {
-  bool dummy = false;
-  return get_header_value_u64(headers, key, def, id, dummy);
-}
-
-} // namespace detail
-
-inline uint64_t Request::get_header_value_u64(const std::string &key,
-                                              uint64_t def, size_t id) const {
-  return detail::get_header_value_u64(headers, key, def, id);
-}
-
-inline uint64_t Response::get_header_value_u64(const std::string &key,
-                                               uint64_t def, size_t id) const {
-  return detail::get_header_value_u64(headers, key, def, id);
-}
-
-inline void default_socket_options(socket_t sock) {
-  int opt = 1;
-#ifdef _WIN32
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-             reinterpret_cast<const char *>(&opt), sizeof(opt));
-#else
-#ifdef SO_REUSEPORT
-  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT,
-             reinterpret_cast<const void *>(&opt), sizeof(opt));
-#else
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-             reinterpret_cast<const void *>(&opt), sizeof(opt));
-#endif
-#endif
-}
-
-inline const char *status_message(int status) {
-  switch (status) {
-  case StatusCode::Continue_100: return "Continue";
-  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
-  case StatusCode::Processing_102: return "Processing";
-  case StatusCode::EarlyHints_103: return "Early Hints";
-  case StatusCode::OK_200: return "OK";
-  case StatusCode::Created_201: return "Created";
-  case StatusCode::Accepted_202: return "Accepted";
-  case StatusCode::NonAuthoritativeInformation_203:
-    return "Non-Authoritative Information";
-  case StatusCode::NoContent_204: return "No Content";
-  case StatusCode::ResetContent_205: return "Reset Content";
-  case StatusCode::PartialContent_206: return "Partial Content";
-  case StatusCode::MultiStatus_207: return "Multi-Status";
-  case StatusCode::AlreadyReported_208: return "Already Reported";
-  case StatusCode::IMUsed_226: return "IM Used";
-  case StatusCode::MultipleChoices_300: return "Multiple Choices";
-  case StatusCode::MovedPermanently_301: return "Moved Permanently";
-  case StatusCode::Found_302: return "Found";
-  case StatusCode::SeeOther_303: return "See Other";
-  case StatusCode::NotModified_304: return "Not Modified";
-  case StatusCode::UseProxy_305: return "Use Proxy";
-  case StatusCode::unused_306: return "unused";
-  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
-  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
-  case StatusCode::BadRequest_400: return "Bad Request";
-  case StatusCode::Unauthorized_401: return "Unauthorized";
-  case StatusCode::PaymentRequired_402: return "Payment Required";
-  case StatusCode::Forbidden_403: return "Forbidden";
-  case StatusCode::NotFound_404: return "Not Found";
-  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
-  case StatusCode::NotAcceptable_406: return "Not Acceptable";
-  case StatusCode::ProxyAuthenticationRequired_407:
-    return "Proxy Authentication Required";
-  case StatusCode::RequestTimeout_408: return "Request Timeout";
-  case StatusCode::Conflict_409: return "Conflict";
-  case StatusCode::Gone_410: return "Gone";
-  case StatusCode::LengthRequired_411: return "Length Required";
-  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
-  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
-  case StatusCode::UriTooLong_414: return "URI Too Long";
-  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
-  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
-  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
-  case StatusCode::ImATeapot_418: return "I'm a teapot";
-  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
-  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
-  case StatusCode::Locked_423: return "Locked";
-  case StatusCode::FailedDependency_424: return "Failed Dependency";
-  case StatusCode::TooEarly_425: return "Too Early";
-  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
-  case StatusCode::PreconditionRequired_428: return "Precondition Required";
-  case StatusCode::TooManyRequests_429: return "Too Many Requests";
-  case StatusCode::RequestHeaderFieldsTooLarge_431:
-    return "Request Header Fields Too Large";
-  case StatusCode::UnavailableForLegalReasons_451:
-    return "Unavailable For Legal Reasons";
-  case StatusCode::NotImplemented_501: return "Not Implemented";
-  case StatusCode::BadGateway_502: return "Bad Gateway";
-  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
-  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
-  case StatusCode::HttpVersionNotSupported_505:
-    return "HTTP Version Not Supported";
-  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
-  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
-  case StatusCode::LoopDetected_508: return "Loop Detected";
-  case StatusCode::NotExtended_510: return "Not Extended";
-  case StatusCode::NetworkAuthenticationRequired_511:
-    return "Network Authentication Required";
-
-  default:
-  case StatusCode::InternalServerError_500: return "Internal Server Error";
-  }
-}
-
-inline std::string get_bearer_token_auth(const Request &req) {
-  if (req.has_header("Authorization")) {
-    static std::string BearerHeaderPrefix = "Bearer ";
-    return req.get_header_value("Authorization")
-        .substr(BearerHeaderPrefix.length());
-  }
-  return "";
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
-  return *this;
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
-  return *this;
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); });
-  return *this;
-}
-
-inline std::string to_string(const Error error) {
-  switch (error) {
-  case Error::Success: return "Success (no error)";
-  case Error::Connection: return "Could not establish connection";
-  case Error::BindIPAddress: return "Failed to bind IP address";
-  case Error::Read: return "Failed to read connection";
-  case Error::Write: return "Failed to write connection";
-  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
-  case Error::Canceled: return "Connection handling canceled";
-  case Error::SSLConnection: return "SSL connection failed";
-  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
-  case Error::SSLServerVerification: return "SSL server verification failed";
-  case Error::SSLServerHostnameVerification:
-    return "SSL server hostname verification failed";
-  case Error::UnsupportedMultipartBoundaryChars:
-    return "Unsupported HTTP multipart boundary characters";
-  case Error::Compression: return "Compression failed";
-  case Error::ConnectionTimeout: return "Connection timed out";
-  case Error::ProxyConnection: return "Proxy connection failed";
-  case Error::Unknown: return "Unknown";
-  default: break;
-  }
-
-  return "Invalid";
-}
-
-inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
-  os << to_string(obj);
-  os << " (" << static_cast<std::underlying_type<Error>::type>(obj) << ')';
-  return os;
-}
-
-inline uint64_t Result::get_request_header_value_u64(const std::string &key,
-                                                     uint64_t def,
-                                                     size_t id) const {
-  return detail::get_header_value_u64(request_headers_, key, def, id);
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_connection_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) {
-    set_connection_timeout(sec, usec);
-  });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_read_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_write_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_max_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  auto msec =
-      std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
-  set_max_timeout(msec);
-}
-
-template <class Rep, class Period>
-inline void Client::set_connection_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_connection_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_read_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_write_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_max_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_max_timeout(duration);
-}
-
-/*
- * Forward declarations and types that will be part of the .h file if split into
- * .h + .cc.
- */
-
-std::string hosted_at(const std::string &hostname);
-
-void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
-
-std::string append_query_params(const std::string &path, const Params &params);
-
-std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
-
-std::pair<std::string, std::string>
-make_basic_authentication_header(const std::string &username,
-                                 const std::string &password,
-                                 bool is_proxy = false);
-
-namespace detail {
-
-#if defined(_WIN32)
-inline std::wstring u8string_to_wstring(const char *s) {
-  std::wstring ws;
-  auto len = static_cast<int>(strlen(s));
-  auto wlen = ::MultiByteToWideChar(CP_UTF8, 0, s, len, nullptr, 0);
-  if (wlen > 0) {
-    ws.resize(wlen);
-    wlen = ::MultiByteToWideChar(
-        CP_UTF8, 0, s, len,
-        const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(ws.data())), wlen);
-    if (wlen != static_cast<int>(ws.size())) { ws.clear(); }
-  }
-  return ws;
-}
-#endif
-
-struct FileStat {
-  FileStat(const std::string &path);
-  bool is_file() const;
-  bool is_dir() const;
-
-private:
-#if defined(_WIN32)
-  struct _stat st_;
-#else
-  struct stat st_;
-#endif
-  int ret_ = -1;
-};
-
-std::string encode_query_param(const std::string &value);
-
-std::string decode_url(const std::string &s, bool convert_plus_to_space);
-
-void read_file(const std::string &path, std::string &out);
-
-std::string trim_copy(const std::string &s);
-
-void divide(
-    const char *data, std::size_t size, char d,
-    std::function<void(const char *, std::size_t, const char *, std::size_t)>
-        fn);
-
-void divide(
-    const std::string &str, char d,
-    std::function<void(const char *, std::size_t, const char *, std::size_t)>
-        fn);
-
-void split(const char *b, const char *e, char d,
-           std::function<void(const char *, const char *)> fn);
-
-void split(const char *b, const char *e, char d, size_t m,
-           std::function<void(const char *, const char *)> fn);
-
-bool process_client_socket(
-    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-    time_t write_timeout_sec, time_t write_timeout_usec,
-    time_t max_timeout_msec,
-    std::chrono::time_point<std::chrono::steady_clock> start_time,
-    std::function<bool(Stream &)> callback);
-
-socket_t create_client_socket(const std::string &host, const std::string &ip,
-                              int port, int address_family, bool tcp_nodelay,
-                              bool ipv6_v6only, SocketOptions socket_options,
-                              time_t connection_timeout_sec,
-                              time_t connection_timeout_usec,
-                              time_t read_timeout_sec, time_t read_timeout_usec,
-                              time_t write_timeout_sec,
-                              time_t write_timeout_usec,
-                              const std::string &intf, Error &error);
-
-const char *get_header_value(const Headers &headers, const std::string &key,
-                             const char *def, size_t id);
-
-std::string params_to_query_str(const Params &params);
-
-void parse_query_text(const char *data, std::size_t size, Params &params);
-
-void parse_query_text(const std::string &s, Params &params);
-
-bool parse_multipart_boundary(const std::string &content_type,
-                              std::string &boundary);
-
-bool parse_range_header(const std::string &s, Ranges &ranges);
-
-int close_socket(socket_t sock);
-
-ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
-
-ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
-
-enum class EncodingType { None = 0, Gzip, Brotli };
-
-EncodingType encoding_type(const Request &req, const Response &res);
-
-class BufferStream final : public Stream {
-public:
-  BufferStream() = default;
-  ~BufferStream() override = default;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-  time_t duration() const override;
-
-  const std::string &get_buffer() const;
-
-private:
-  std::string buffer;
-  size_t position = 0;
-};
-
-class compressor {
-public:
-  virtual ~compressor() = default;
-
-  typedef std::function<bool(const char *data, size_t data_len)> Callback;
-  virtual bool compress(const char *data, size_t data_length, bool last,
-                        Callback callback) = 0;
-};
-
-class decompressor {
-public:
-  virtual ~decompressor() = default;
-
-  virtual bool is_valid() const = 0;
-
-  typedef std::function<bool(const char *data, size_t data_len)> Callback;
-  virtual bool decompress(const char *data, size_t data_length,
-                          Callback callback) = 0;
-};
-
-class nocompressor final : public compressor {
-public:
-  ~nocompressor() override = default;
-
-  bool compress(const char *data, size_t data_length, bool /*last*/,
-                Callback callback) override;
-};
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-class gzip_compressor final : public compressor {
-public:
-  gzip_compressor();
-  ~gzip_compressor() override;
-
-  bool compress(const char *data, size_t data_length, bool last,
-                Callback callback) override;
-
-private:
-  bool is_valid_ = false;
-  z_stream strm_;
-};
-
-class gzip_decompressor final : public decompressor {
-public:
-  gzip_decompressor();
-  ~gzip_decompressor() override;
-
-  bool is_valid() const override;
-
-  bool decompress(const char *data, size_t data_length,
-                  Callback callback) override;
-
-private:
-  bool is_valid_ = false;
-  z_stream strm_;
-};
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-class brotli_compressor final : public compressor {
-public:
-  brotli_compressor();
-  ~brotli_compressor();
-
-  bool compress(const char *data, size_t data_length, bool last,
-                Callback callback) override;
-
-private:
-  BrotliEncoderState *state_ = nullptr;
-};
-
-class brotli_decompressor final : public decompressor {
-public:
-  brotli_decompressor();
-  ~brotli_decompressor();
-
-  bool is_valid() const override;
-
-  bool decompress(const char *data, size_t data_length,
-                  Callback callback) override;
-
-private:
-  BrotliDecoderResult decoder_r;
-  BrotliDecoderState *decoder_s = nullptr;
-};
-#endif
-
-// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
-// to store data. The call can set memory on stack for performance.
-class stream_line_reader {
-public:
-  stream_line_reader(Stream &strm, char *fixed_buffer,
-                     size_t fixed_buffer_size);
-  const char *ptr() const;
-  size_t size() const;
-  bool end_with_crlf() const;
-  bool getline();
-
-private:
-  void append(char c);
-
-  Stream &strm_;
-  char *fixed_buffer_;
-  const size_t fixed_buffer_size_;
-  size_t fixed_buffer_used_size_ = 0;
-  std::string glowable_buffer_;
-};
-
-class mmap {
-public:
-  mmap(const char *path);
-  ~mmap();
-
-  bool open(const char *path);
-  void close();
-
-  bool is_open() const;
-  size_t size() const;
-  const char *data() const;
-
-private:
-#if defined(_WIN32)
-  HANDLE hFile_ = NULL;
-  HANDLE hMapping_ = NULL;
-#else
-  int fd_ = -1;
-#endif
-  size_t size_ = 0;
-  void *addr_ = nullptr;
-  bool is_open_empty_file = false;
-};
-
-// NOTE: https://www.rfc-editor.org/rfc/rfc9110#section-5
-namespace fields {
-
-inline bool is_token_char(char c) {
-  return std::isalnum(c) || c == '!' || c == '#' || c == '$' || c == '%' ||
-         c == '&' || c == '\'' || c == '*' || c == '+' || c == '-' ||
-         c == '.' || c == '^' || c == '_' || c == '`' || c == '|' || c == '~';
-}
-
-inline bool is_token(const std::string &s) {
-  if (s.empty()) { return false; }
-  for (auto c : s) {
-    if (!is_token_char(c)) { return false; }
-  }
-  return true;
-}
-
-inline bool is_field_name(const std::string &s) { return is_token(s); }
-
-inline bool is_vchar(char c) { return c >= 33 && c <= 126; }
-
-inline bool is_obs_text(char c) { return 128 <= static_cast<unsigned char>(c); }
-
-inline bool is_field_vchar(char c) { return is_vchar(c) || is_obs_text(c); }
-
-inline bool is_field_content(const std::string &s) {
-  if (s.empty()) { return true; }
-
-  if (s.size() == 1) {
-    return is_field_vchar(s[0]);
-  } else if (s.size() == 2) {
-    return is_field_vchar(s[0]) && is_field_vchar(s[1]);
-  } else {
-    size_t i = 0;
-
-    if (!is_field_vchar(s[i])) { return false; }
-    i++;
-
-    while (i < s.size() - 1) {
-      auto c = s[i++];
-      if (c == ' ' || c == '\t' || is_field_vchar(c)) {
-      } else {
-        return false;
-      }
-    }
-
-    return is_field_vchar(s[i]);
-  }
-}
-
-inline bool is_field_value(const std::string &s) { return is_field_content(s); }
-
-} // namespace fields
-
-} // namespace detail
-
-// ----------------------------------------------------------------------------
-
-/*
- * Implementation that will be part of the .cc file if split into .h + .cc.
- */
-
-namespace detail {
-
-inline bool is_hex(char c, int &v) {
-  if (0x20 <= c && isdigit(c)) {
-    v = c - '0';
-    return true;
-  } else if ('A' <= c && c <= 'F') {
-    v = c - 'A' + 10;
-    return true;
-  } else if ('a' <= c && c <= 'f') {
-    v = c - 'a' + 10;
-    return true;
-  }
-  return false;
-}
-
-inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
-                          int &val) {
-  if (i >= s.size()) { return false; }
-
-  val = 0;
-  for (; cnt; i++, cnt--) {
-    if (!s[i]) { return false; }
-    auto v = 0;
-    if (is_hex(s[i], v)) {
-      val = val * 16 + v;
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-inline std::string from_i_to_hex(size_t n) {
-  static const auto charset = "0123456789abcdef";
-  std::string ret;
-  do {
-    ret = charset[n & 15] + ret;
-    n >>= 4;
-  } while (n > 0);
-  return ret;
-}
-
-inline size_t to_utf8(int code, char *buff) {
-  if (code < 0x0080) {
-    buff[0] = static_cast<char>(code & 0x7F);
-    return 1;
-  } else if (code < 0x0800) {
-    buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
-    buff[1] = static_cast<char>(0x80 | (code & 0x3F));
-    return 2;
-  } else if (code < 0xD800) {
-    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
-    return 3;
-  } else if (code < 0xE000) { // D800 - DFFF is invalid...
-    return 0;
-  } else if (code < 0x10000) {
-    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
-    return 3;
-  } else if (code < 0x110000) {
-    buff[0] = static_cast<char>(0xF0 | ((code >> 18) & 0x7));
-    buff[1] = static_cast<char>(0x80 | ((code >> 12) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[3] = static_cast<char>(0x80 | (code & 0x3F));
-    return 4;
-  }
-
-  // NOTREACHED
-  return 0;
-}
-
-// NOTE: This code came up with the following stackoverflow post:
-// https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c
-inline std::string base64_encode(const std::string &in) {
-  static const auto lookup =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  std::string out;
-  out.reserve(in.size());
-
-  auto val = 0;
-  auto valb = -6;
-
-  for (auto c : in) {
-    val = (val << 8) + static_cast<uint8_t>(c);
-    valb += 8;
-    while (valb >= 0) {
-      out.push_back(lookup[(val >> valb) & 0x3F]);
-      valb -= 6;
-    }
-  }
-
-  if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); }
-
-  while (out.size() % 4) {
-    out.push_back('=');
-  }
-
-  return out;
-}
-
-inline bool is_valid_path(const std::string &path) {
-  size_t level = 0;
-  size_t i = 0;
-
-  // Skip slash
-  while (i < path.size() && path[i] == '/') {
-    i++;
-  }
-
-  while (i < path.size()) {
-    // Read component
-    auto beg = i;
-    while (i < path.size() && path[i] != '/') {
-      if (path[i] == '\0') {
-        return false;
-      } else if (path[i] == '\\') {
-        return false;
-      }
-      i++;
-    }
-
-    auto len = i - beg;
-    assert(len > 0);
-
-    if (!path.compare(beg, len, ".")) {
-      ;
-    } else if (!path.compare(beg, len, "..")) {
-      if (level == 0) { return false; }
-      level--;
-    } else {
-      level++;
-    }
-
-    // Skip slash
-    while (i < path.size() && path[i] == '/') {
-      i++;
-    }
-  }
-
-  return true;
-}
-
-inline FileStat::FileStat(const std::string &path) {
-#if defined(_WIN32)
-  auto wpath = u8string_to_wstring(path.c_str());
-  ret_ = _wstat(wpath.c_str(), &st_);
-#else
-  ret_ = stat(path.c_str(), &st_);
-#endif
-}
-inline bool FileStat::is_file() const {
-  return ret_ >= 0 && S_ISREG(st_.st_mode);
-}
-inline bool FileStat::is_dir() const {
-  return ret_ >= 0 && S_ISDIR(st_.st_mode);
-}
-
-inline std::string encode_query_param(const std::string &value) {
-  std::ostringstream escaped;
-  escaped.fill('0');
-  escaped << std::hex;
-
-  for (auto c : value) {
-    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
-        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
-        c == ')') {
-      escaped << c;
-    } else {
-      escaped << std::uppercase;
-      escaped << '%' << std::setw(2)
-              << static_cast<int>(static_cast<unsigned char>(c));
-      escaped << std::nouppercase;
-    }
-  }
-
-  return escaped.str();
-}
-
-inline std::string encode_url(const std::string &s) {
-  std::string result;
-  result.reserve(s.size());
-
-  for (size_t i = 0; s[i]; i++) {
-    switch (s[i]) {
-    case ' ': result += "%20"; break;
-    case '+': result += "%2B"; break;
-    case '\r': result += "%0D"; break;
-    case '\n': result += "%0A"; break;
-    case '\'': result += "%27"; break;
-    case ',': result += "%2C"; break;
-    // case ':': result += "%3A"; break; // ok? probably...
-    case ';': result += "%3B"; break;
-    default:
-      auto c = static_cast<uint8_t>(s[i]);
-      if (c >= 0x80) {
-        result += '%';
-        char hex[4];
-        auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
-        assert(len == 2);
-        result.append(hex, static_cast<size_t>(len));
-      } else {
-        result += s[i];
-      }
-      break;
-    }
-  }
-
-  return result;
-}
-
-inline std::string decode_url(const std::string &s,
-                              bool convert_plus_to_space) {
-  std::string result;
-
-  for (size_t i = 0; i < s.size(); i++) {
-    if (s[i] == '%' && i + 1 < s.size()) {
-      if (s[i + 1] == 'u') {
-        auto val = 0;
-        if (from_hex_to_i(s, i + 2, 4, val)) {
-          // 4 digits Unicode codes
-          char buff[4];
-          size_t len = to_utf8(val, buff);
-          if (len > 0) { result.append(buff, len); }
-          i += 5; // 'u0000'
-        } else {
-          result += s[i];
-        }
-      } else {
-        auto val = 0;
-        if (from_hex_to_i(s, i + 1, 2, val)) {
-          // 2 digits hex codes
-          result += static_cast<char>(val);
-          i += 2; // '00'
-        } else {
-          result += s[i];
-        }
-      }
-    } else if (convert_plus_to_space && s[i] == '+') {
-      result += ' ';
-    } else {
-      result += s[i];
-    }
-  }
-
-  return result;
-}
-
-inline void read_file(const std::string &path, std::string &out) {
-  std::ifstream fs(path, std::ios_base::binary);
-  fs.seekg(0, std::ios_base::end);
-  auto size = fs.tellg();
-  fs.seekg(0);
-  out.resize(static_cast<size_t>(size));
-  fs.read(&out[0], static_cast<std::streamsize>(size));
-}
-
-inline std::string file_extension(const std::string &path) {
-  std::smatch m;
-  static auto re = std::regex("\\.([a-zA-Z0-9]+)$");
-  if (std::regex_search(path, m, re)) { return m[1].str(); }
-  return std::string();
-}
-
-inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; }
-
-inline std::pair<size_t, size_t> trim(const char *b, const char *e, size_t left,
-                                      size_t right) {
-  while (b + left < e && is_space_or_tab(b[left])) {
-    left++;
-  }
-  while (right > 0 && is_space_or_tab(b[right - 1])) {
-    right--;
-  }
-  return std::make_pair(left, right);
-}
-
-inline std::string trim_copy(const std::string &s) {
-  auto r = trim(s.data(), s.data() + s.size(), 0, s.size());
-  return s.substr(r.first, r.second - r.first);
-}
-
-inline std::string trim_double_quotes_copy(const std::string &s) {
-  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
-    return s.substr(1, s.size() - 2);
-  }
-  return s;
-}
-
-inline void
-divide(const char *data, std::size_t size, char d,
-       std::function<void(const char *, std::size_t, const char *, std::size_t)>
-           fn) {
-  const auto it = std::find(data, data + size, d);
-  const auto found = static_cast<std::size_t>(it != data + size);
-  const auto lhs_data = data;
-  const auto lhs_size = static_cast<std::size_t>(it - data);
-  const auto rhs_data = it + found;
-  const auto rhs_size = size - lhs_size - found;
-
-  fn(lhs_data, lhs_size, rhs_data, rhs_size);
-}
-
-inline void
-divide(const std::string &str, char d,
-       std::function<void(const char *, std::size_t, const char *, std::size_t)>
-           fn) {
-  divide(str.data(), str.size(), d, std::move(fn));
-}
-
-inline void split(const char *b, const char *e, char d,
-                  std::function<void(const char *, const char *)> fn) {
-  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
-}
-
-inline void split(const char *b, const char *e, char d, size_t m,
-                  std::function<void(const char *, const char *)> fn) {
-  size_t i = 0;
-  size_t beg = 0;
-  size_t count = 1;
-
-  while (e ? (b + i < e) : (b[i] != '\0')) {
-    if (b[i] == d && count < m) {
-      auto r = trim(b, e, beg, i);
-      if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
-      beg = i + 1;
-      count++;
-    }
-    i++;
-  }
-
-  if (i) {
-    auto r = trim(b, e, beg, i);
-    if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
-  }
-}
-
-inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer,
-                                              size_t fixed_buffer_size)
-    : strm_(strm), fixed_buffer_(fixed_buffer),
-      fixed_buffer_size_(fixed_buffer_size) {}
-
-inline const char *stream_line_reader::ptr() const {
-  if (glowable_buffer_.empty()) {
-    return fixed_buffer_;
-  } else {
-    return glowable_buffer_.data();
-  }
-}
-
-inline size_t stream_line_reader::size() const {
-  if (glowable_buffer_.empty()) {
-    return fixed_buffer_used_size_;
-  } else {
-    return glowable_buffer_.size();
-  }
-}
-
-inline bool stream_line_reader::end_with_crlf() const {
-  auto end = ptr() + size();
-  return size() >= 2 && end[-2] == '\r' && end[-1] == '\n';
-}
-
-inline bool stream_line_reader::getline() {
-  fixed_buffer_used_size_ = 0;
-  glowable_buffer_.clear();
-
-#ifndef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-  char prev_byte = 0;
-#endif
-
-  for (size_t i = 0;; i++) {
-    char byte;
-    auto n = strm_.read(&byte, 1);
-
-    if (n < 0) {
-      return false;
-    } else if (n == 0) {
-      if (i == 0) {
-        return false;
-      } else {
-        break;
-      }
-    }
-
-    append(byte);
-
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-    if (byte == '\n') { break; }
-#else
-    if (prev_byte == '\r' && byte == '\n') { break; }
-    prev_byte = byte;
-#endif
-  }
-
-  return true;
-}
-
-inline void stream_line_reader::append(char c) {
-  if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
-    fixed_buffer_[fixed_buffer_used_size_++] = c;
-    fixed_buffer_[fixed_buffer_used_size_] = '\0';
-  } else {
-    if (glowable_buffer_.empty()) {
-      assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
-      glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
-    }
-    glowable_buffer_ += c;
-  }
-}
-
-inline mmap::mmap(const char *path) { open(path); }
-
-inline mmap::~mmap() { close(); }
-
-inline bool mmap::open(const char *path) {
-  close();
-
-#if defined(_WIN32)
-  auto wpath = u8string_to_wstring(path);
-  if (wpath.empty()) { return false; }
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-  hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,
-                         OPEN_EXISTING, NULL);
-#else
-  hFile_ = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
-                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#endif
-
-  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
-
-  LARGE_INTEGER size{};
-  if (!::GetFileSizeEx(hFile_, &size)) { return false; }
-  // If the following line doesn't compile due to QuadPart, update Windows SDK.
-  // See:
-  // https://github.com/yhirose/cpp-httplib/issues/1903#issuecomment-2316520721
-  if (static_cast<ULONGLONG>(size.QuadPart) >
-      (std::numeric_limits<decltype(size_)>::max)()) {
-    // `size_t` might be 32-bits, on 32-bits Windows.
-    return false;
-  }
-  size_ = static_cast<size_t>(size.QuadPart);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-  hMapping_ =
-      ::CreateFileMappingFromApp(hFile_, NULL, PAGE_READONLY, size_, NULL);
-#else
-  hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
-#endif
-
-  // Special treatment for an empty file...
-  if (hMapping_ == NULL && size_ == 0) {
-    close();
-    is_open_empty_file = true;
-    return true;
-  }
-
-  if (hMapping_ == NULL) {
-    close();
-    return false;
-  }
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-  addr_ = ::MapViewOfFileFromApp(hMapping_, FILE_MAP_READ, 0, 0);
-#else
-  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
-#endif
-
-  if (addr_ == nullptr) {
-    close();
-    return false;
-  }
-#else
-  fd_ = ::open(path, O_RDONLY);
-  if (fd_ == -1) { return false; }
-
-  struct stat sb;
-  if (fstat(fd_, &sb) == -1) {
-    close();
-    return false;
-  }
-  size_ = static_cast<size_t>(sb.st_size);
-
-  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
-
-  // Special treatment for an empty file...
-  if (addr_ == MAP_FAILED && size_ == 0) {
-    close();
-    is_open_empty_file = true;
-    return false;
-  }
-#endif
-
-  return true;
-}
-
-inline bool mmap::is_open() const {
-  return is_open_empty_file ? true : addr_ != nullptr;
-}
-
-inline size_t mmap::size() const { return size_; }
-
-inline const char *mmap::data() const {
-  return is_open_empty_file ? "" : static_cast<const char *>(addr_);
-}
-
-inline void mmap::close() {
-#if defined(_WIN32)
-  if (addr_) {
-    ::UnmapViewOfFile(addr_);
-    addr_ = nullptr;
-  }
-
-  if (hMapping_) {
-    ::CloseHandle(hMapping_);
-    hMapping_ = NULL;
-  }
-
-  if (hFile_ != INVALID_HANDLE_VALUE) {
-    ::CloseHandle(hFile_);
-    hFile_ = INVALID_HANDLE_VALUE;
-  }
-
-  is_open_empty_file = false;
-#else
-  if (addr_ != nullptr) {
-    munmap(addr_, size_);
-    addr_ = nullptr;
-  }
-
-  if (fd_ != -1) {
-    ::close(fd_);
-    fd_ = -1;
-  }
-#endif
-  size_ = 0;
-}
-inline int close_socket(socket_t sock) {
-#ifdef _WIN32
-  return closesocket(sock);
-#else
-  return close(sock);
-#endif
-}
-
-template <typename T> inline ssize_t handle_EINTR(T fn) {
-  ssize_t res = 0;
-  while (true) {
-    res = fn();
-    if (res < 0 && errno == EINTR) {
-      std::this_thread::sleep_for(std::chrono::microseconds{1});
-      continue;
-    }
-    break;
-  }
-  return res;
-}
-
-inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
-  return handle_EINTR([&]() {
-    return recv(sock,
-#ifdef _WIN32
-                static_cast<char *>(ptr), static_cast<int>(size),
-#else
-                ptr, size,
-#endif
-                flags);
-  });
-}
-
-inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size,
-                           int flags) {
-  return handle_EINTR([&]() {
-    return send(sock,
-#ifdef _WIN32
-                static_cast<const char *>(ptr), static_cast<int>(size),
-#else
-                ptr, size,
-#endif
-                flags);
-  });
-}
-
-template <bool Read>
-inline ssize_t select_impl(socket_t sock, time_t sec, time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd;
-  pfd.fd = sock;
-  pfd.events = (Read ? POLLIN : POLLOUT);
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  return handle_EINTR([&]() { return poll(&pfd, 1, timeout); });
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return -1; }
-#endif
-
-  fd_set fds, *rfds, *wfds;
-  FD_ZERO(&fds);
-  FD_SET(sock, &fds);
-  rfds = (Read ? &fds : nullptr);
-  wfds = (Read ? nullptr : &fds);
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  return handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), rfds, wfds, nullptr, &tv);
-  });
-#endif
-}
-
-inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
-  return select_impl<true>(sock, sec, usec);
-}
-
-inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
-  return select_impl<false>(sock, sec, usec);
-}
-
-inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
-                                        time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLIN | POLLOUT;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-
-  if (poll_res == 0) { return Error::ConnectionTimeout; }
-
-  if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
-    auto error = 0;
-    socklen_t len = sizeof(error);
-    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
-                          reinterpret_cast<char *>(&error), &len);
-    auto successful = res >= 0 && !error;
-    return successful ? Error::Success : Error::Connection;
-  }
-
-  return Error::Connection;
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return Error::Connection; }
-#endif
-
-  fd_set fdsr;
-  FD_ZERO(&fdsr);
-  FD_SET(sock, &fdsr);
-
-  auto fdsw = fdsr;
-  auto fdse = fdsr;
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  auto ret = handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), &fdsr, &fdsw, &fdse, &tv);
-  });
-
-  if (ret == 0) { return Error::ConnectionTimeout; }
-
-  if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
-    auto error = 0;
-    socklen_t len = sizeof(error);
-    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
-                          reinterpret_cast<char *>(&error), &len);
-    auto successful = res >= 0 && !error;
-    return successful ? Error::Success : Error::Connection;
-  }
-  return Error::Connection;
-#endif
-}
-
-inline bool is_socket_alive(socket_t sock) {
-  const auto val = detail::select_read(sock, 0, 0);
-  if (val == 0) {
-    return true;
-  } else if (val < 0 && errno == EBADF) {
-    return false;
-  }
-  char buf[1];
-  return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0;
-}
-
-class SocketStream final : public Stream {
-public:
-  SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-               time_t write_timeout_sec, time_t write_timeout_usec,
-               time_t max_timeout_msec = 0,
-               std::chrono::time_point<std::chrono::steady_clock> start_time =
-                   std::chrono::steady_clock::time_point::min());
-  ~SocketStream() override;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-  time_t duration() const override;
-
-private:
-  socket_t sock_;
-  time_t read_timeout_sec_;
-  time_t read_timeout_usec_;
-  time_t write_timeout_sec_;
-  time_t write_timeout_usec_;
-  time_t max_timeout_msec_;
-  const std::chrono::time_point<std::chrono::steady_clock> start_time;
-
-  std::vector<char> read_buff_;
-  size_t read_buff_off_ = 0;
-  size_t read_buff_content_size_ = 0;
-
-  static const size_t read_buff_size_ = 1024l * 4;
-};
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLSocketStream final : public Stream {
-public:
-  SSLSocketStream(
-      socket_t sock, SSL *ssl, time_t read_timeout_sec,
-      time_t read_timeout_usec, time_t write_timeout_sec,
-      time_t write_timeout_usec, time_t max_timeout_msec = 0,
-      std::chrono::time_point<std::chrono::steady_clock> start_time =
-          std::chrono::steady_clock::time_point::min());
-  ~SSLSocketStream() override;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-  time_t duration() const override;
-
-private:
-  socket_t sock_;
-  SSL *ssl_;
-  time_t read_timeout_sec_;
-  time_t read_timeout_usec_;
-  time_t write_timeout_sec_;
-  time_t write_timeout_usec_;
-  time_t max_timeout_msec_;
-  const std::chrono::time_point<std::chrono::steady_clock> start_time;
-};
-#endif
-
-inline bool keep_alive(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                       time_t keep_alive_timeout_sec) {
-  using namespace std::chrono;
-
-  const auto interval_usec =
-      CPPHTTPLIB_KEEPALIVE_TIMEOUT_CHECK_INTERVAL_USECOND;
-
-  // Avoid expensive `steady_clock::now()` call for the first time
-  if (select_read(sock, 0, interval_usec) > 0) { return true; }
-
-  const auto start = steady_clock::now() - microseconds{interval_usec};
-  const auto timeout = seconds{keep_alive_timeout_sec};
-
-  while (true) {
-    if (svr_sock == INVALID_SOCKET) {
-      break; // Server socket is closed
-    }
-
-    auto val = select_read(sock, 0, interval_usec);
-    if (val < 0) {
-      break; // Ssocket error
-    } else if (val == 0) {
-      if (steady_clock::now() - start > timeout) {
-        break; // Timeout
-      }
-    } else {
-      return true; // Ready for read
-    }
-  }
-
-  return false;
-}
-
-template <typename T>
-inline bool
-process_server_socket_core(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                           size_t keep_alive_max_count,
-                           time_t keep_alive_timeout_sec, T callback) {
-  assert(keep_alive_max_count > 0);
-  auto ret = false;
-  auto count = keep_alive_max_count;
-  while (count > 0 && keep_alive(svr_sock, sock, keep_alive_timeout_sec)) {
-    auto close_connection = count == 1;
-    auto connection_closed = false;
-    ret = callback(close_connection, connection_closed);
-    if (!ret || connection_closed) { break; }
-    count--;
-  }
-  return ret;
-}
-
-template <typename T>
-inline bool
-process_server_socket(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                      size_t keep_alive_max_count,
-                      time_t keep_alive_timeout_sec, time_t read_timeout_sec,
-                      time_t read_timeout_usec, time_t write_timeout_sec,
-                      time_t write_timeout_usec, T callback) {
-  return process_server_socket_core(
-      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
-      [&](bool close_connection, bool &connection_closed) {
-        SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
-                          write_timeout_sec, write_timeout_usec);
-        return callback(strm, close_connection, connection_closed);
-      });
-}
-
-inline bool process_client_socket(
-    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-    time_t write_timeout_sec, time_t write_timeout_usec,
-    time_t max_timeout_msec,
-    std::chrono::time_point<std::chrono::steady_clock> start_time,
-    std::function<bool(Stream &)> callback) {
-  SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
-                    write_timeout_sec, write_timeout_usec, max_timeout_msec,
-                    start_time);
-  return callback(strm);
-}
-
-inline int shutdown_socket(socket_t sock) {
-#ifdef _WIN32
-  return shutdown(sock, SD_BOTH);
-#else
-  return shutdown(sock, SHUT_RDWR);
-#endif
-}
-
-inline std::string escape_abstract_namespace_unix_domain(const std::string &s) {
-  if (s.size() > 1 && s[0] == '\0') {
-    auto ret = s;
-    ret[0] = '@';
-    return ret;
-  }
-  return s;
-}
-
-inline std::string
-unescape_abstract_namespace_unix_domain(const std::string &s) {
-  if (s.size() > 1 && s[0] == '@') {
-    auto ret = s;
-    ret[0] = '\0';
-    return ret;
-  }
-  return s;
-}
-
-template <typename BindOrConnect>
-socket_t create_socket(const std::string &host, const std::string &ip, int port,
-                       int address_family, int socket_flags, bool tcp_nodelay,
-                       bool ipv6_v6only, SocketOptions socket_options,
-                       BindOrConnect bind_or_connect) {
-  // Get address info
-  const char *node = nullptr;
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = IPPROTO_IP;
-
-  if (!ip.empty()) {
-    node = ip.c_str();
-    // Ask getaddrinfo to convert IP in c-string to address
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_flags = AI_NUMERICHOST;
-  } else {
-    if (!host.empty()) { node = host.c_str(); }
-    hints.ai_family = address_family;
-    hints.ai_flags = socket_flags;
-  }
-
-#ifndef _WIN32
-  if (hints.ai_family == AF_UNIX) {
-    const auto addrlen = host.length();
-    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
-
-#ifdef SOCK_CLOEXEC
-    auto sock = socket(hints.ai_family, hints.ai_socktype | SOCK_CLOEXEC,
-                       hints.ai_protocol);
-#else
-    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
-#endif
-
-    if (sock != INVALID_SOCKET) {
-      sockaddr_un addr{};
-      addr.sun_family = AF_UNIX;
-
-      auto unescaped_host = unescape_abstract_namespace_unix_domain(host);
-      std::copy(unescaped_host.begin(), unescaped_host.end(), addr.sun_path);
-
-      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
-      hints.ai_addrlen = static_cast<socklen_t>(
-          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
-
-#ifndef SOCK_CLOEXEC
-      fcntl(sock, F_SETFD, FD_CLOEXEC);
-#endif
-
-      if (socket_options) { socket_options(sock); }
-
-      bool dummy;
-      if (!bind_or_connect(sock, hints, dummy)) {
-        close_socket(sock);
-        sock = INVALID_SOCKET;
-      }
-    }
-    return sock;
-  }
-#endif
-
-  auto service = std::to_string(port);
-
-  if (getaddrinfo(node, service.c_str(), &hints, &result)) {
-#if defined __linux__ && !defined __ANDROID__
-    res_init();
-#endif
-    return INVALID_SOCKET;
-  }
-  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
-
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    // Create a socket
-#ifdef _WIN32
-    auto sock =
-        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
-                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
-    /**
-     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
-     * and above the socket creation fails on older Windows Systems.
-     *
-     * Let's try to create a socket the old way in this case.
-     *
-     * Reference:
-     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
-     *
-     * WSA_FLAG_NO_HANDLE_INHERIT:
-     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
-     * SP1, and later
-     *
-     */
-    if (sock == INVALID_SOCKET) {
-      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    }
-#else
-
-#ifdef SOCK_CLOEXEC
-    auto sock =
-        socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
-#else
-    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-#endif
-
-#endif
-    if (sock == INVALID_SOCKET) { continue; }
-
-#if !defined _WIN32 && !defined SOCK_CLOEXEC
-    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
-      close_socket(sock);
-      continue;
-    }
-#endif
-
-    if (tcp_nodelay) {
-      auto opt = 1;
-#ifdef _WIN32
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const char *>(&opt), sizeof(opt));
-#else
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const void *>(&opt), sizeof(opt));
-#endif
-    }
-
-    if (rp->ai_family == AF_INET6) {
-      auto opt = ipv6_v6only ? 1 : 0;
-#ifdef _WIN32
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const char *>(&opt), sizeof(opt));
-#else
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const void *>(&opt), sizeof(opt));
-#endif
-    }
-
-    if (socket_options) { socket_options(sock); }
-
-    // bind or connect
-    auto quit = false;
-    if (bind_or_connect(sock, *rp, quit)) { return sock; }
-
-    close_socket(sock);
-
-    if (quit) { break; }
-  }
-
-  return INVALID_SOCKET;
-}
-
-inline void set_nonblocking(socket_t sock, bool nonblocking) {
-#ifdef _WIN32
-  auto flags = nonblocking ? 1UL : 0UL;
-  ioctlsocket(sock, FIONBIO, &flags);
-#else
-  auto flags = fcntl(sock, F_GETFL, 0);
-  fcntl(sock, F_SETFL,
-        nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
-#endif
-}
-
-inline bool is_connection_error() {
-#ifdef _WIN32
-  return WSAGetLastError() != WSAEWOULDBLOCK;
-#else
-  return errno != EINPROGRESS;
-#endif
-}
-
-inline bool bind_ip_address(socket_t sock, const std::string &host) {
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; }
-  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
-
-  auto ret = false;
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    const auto &ai = *rp;
-    if (!::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
-      ret = true;
-      break;
-    }
-  }
-
-  return ret;
-}
-
-#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
-#define USE_IF2IP
-#endif
-
-#ifdef USE_IF2IP
-inline std::string if2ip(int address_family, const std::string &ifn) {
-  struct ifaddrs *ifap;
-  getifaddrs(&ifap);
-  auto se = detail::scope_exit([&] { freeifaddrs(ifap); });
-
-  std::string addr_candidate;
-  for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr && ifn == ifa->ifa_name &&
-        (AF_UNSPEC == address_family ||
-         ifa->ifa_addr->sa_family == address_family)) {
-      if (ifa->ifa_addr->sa_family == AF_INET) {
-        auto sa = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr);
-        char buf[INET_ADDRSTRLEN];
-        if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) {
-          return std::string(buf, INET_ADDRSTRLEN);
-        }
-      } else if (ifa->ifa_addr->sa_family == AF_INET6) {
-        auto sa = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr);
-        if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) {
-          char buf[INET6_ADDRSTRLEN] = {};
-          if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) {
-            // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL
-            auto s6_addr_head = sa->sin6_addr.s6_addr[0];
-            if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) {
-              addr_candidate = std::string(buf, INET6_ADDRSTRLEN);
-            } else {
-              return std::string(buf, INET6_ADDRSTRLEN);
-            }
-          }
-        }
-      }
-    }
-  }
-  return addr_candidate;
-}
-#endif
-
-inline socket_t create_client_socket(
-    const std::string &host, const std::string &ip, int port,
-    int address_family, bool tcp_nodelay, bool ipv6_v6only,
-    SocketOptions socket_options, time_t connection_timeout_sec,
-    time_t connection_timeout_usec, time_t read_timeout_sec,
-    time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, const std::string &intf, Error &error) {
-  auto sock = create_socket(
-      host, ip, port, address_family, 0, tcp_nodelay, ipv6_v6only,
-      std::move(socket_options),
-      [&](socket_t sock2, struct addrinfo &ai, bool &quit) -> bool {
-        if (!intf.empty()) {
-#ifdef USE_IF2IP
-          auto ip_from_if = if2ip(address_family, intf);
-          if (ip_from_if.empty()) { ip_from_if = intf; }
-          if (!bind_ip_address(sock2, ip_from_if)) {
-            error = Error::BindIPAddress;
-            return false;
-          }
-#endif
-        }
-
-        set_nonblocking(sock2, true);
-
-        auto ret =
-            ::connect(sock2, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen));
-
-        if (ret < 0) {
-          if (is_connection_error()) {
-            error = Error::Connection;
-            return false;
-          }
-          error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
-                                             connection_timeout_usec);
-          if (error != Error::Success) {
-            if (error == Error::ConnectionTimeout) { quit = true; }
-            return false;
-          }
-        }
-
-        set_nonblocking(sock2, false);
-
-        {
-#ifdef _WIN32
-          auto timeout = static_cast<uint32_t>(read_timeout_sec * 1000 +
-                                               read_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
-                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-          timeval tv;
-          tv.tv_sec = static_cast<long>(read_timeout_sec);
-          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
-                     reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-        }
-        {
-
-#ifdef _WIN32
-          auto timeout = static_cast<uint32_t>(write_timeout_sec * 1000 +
-                                               write_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
-                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-          timeval tv;
-          tv.tv_sec = static_cast<long>(write_timeout_sec);
-          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
-                     reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-        }
-
-        error = Error::Success;
-        return true;
-      });
-
-  if (sock != INVALID_SOCKET) {
-    error = Error::Success;
-  } else {
-    if (error == Error::Success) { error = Error::Connection; }
-  }
-
-  return sock;
-}
-
-inline bool get_ip_and_port(const struct sockaddr_storage &addr,
-                            socklen_t addr_len, std::string &ip, int &port) {
-  if (addr.ss_family == AF_INET) {
-    port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
-  } else if (addr.ss_family == AF_INET6) {
-    port =
-        ntohs(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_port);
-  } else {
-    return false;
-  }
-
-  std::array<char, NI_MAXHOST> ipstr{};
-  if (getnameinfo(reinterpret_cast<const struct sockaddr *>(&addr), addr_len,
-                  ipstr.data(), static_cast<socklen_t>(ipstr.size()), nullptr,
-                  0, NI_NUMERICHOST)) {
-    return false;
-  }
-
-  ip = ipstr.data();
-  return true;
-}
-
-inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
-  struct sockaddr_storage addr;
-  socklen_t addr_len = sizeof(addr);
-  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
-                   &addr_len)) {
-    get_ip_and_port(addr, addr_len, ip, port);
-  }
-}
-
-inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
-  struct sockaddr_storage addr;
-  socklen_t addr_len = sizeof(addr);
-
-  if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
-                   &addr_len)) {
-#ifndef _WIN32
-    if (addr.ss_family == AF_UNIX) {
-#if defined(__linux__)
-      struct ucred ucred;
-      socklen_t len = sizeof(ucred);
-      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
-        port = ucred.pid;
-      }
-#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__
-      pid_t pid;
-      socklen_t len = sizeof(pid);
-      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
-        port = pid;
-      }
-#endif
-      return;
-    }
-#endif
-    get_ip_and_port(addr, addr_len, ip, port);
-  }
-}
-
-inline constexpr unsigned int str2tag_core(const char *s, size_t l,
-                                           unsigned int h) {
-  return (l == 0)
-             ? h
-             : str2tag_core(
-                   s + 1, l - 1,
-                   // Unsets the 6 high bits of h, therefore no overflow happens
-                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
-                    h * 33) ^
-                       static_cast<unsigned char>(*s));
-}
-
-inline unsigned int str2tag(const std::string &s) {
-  return str2tag_core(s.data(), s.size(), 0);
-}
-
-namespace udl {
-
-inline constexpr unsigned int operator""_t(const char *s, size_t l) {
-  return str2tag_core(s, l, 0);
-}
-
-} // namespace udl
-
-inline std::string
-find_content_type(const std::string &path,
-                  const std::map<std::string, std::string> &user_data,
-                  const std::string &default_content_type) {
-  auto ext = file_extension(path);
-
-  auto it = user_data.find(ext);
-  if (it != user_data.end()) { return it->second; }
-
-  using udl::operator""_t;
-
-  switch (str2tag(ext)) {
-  default: return default_content_type;
-
-  case "css"_t: return "text/css";
-  case "csv"_t: return "text/csv";
-  case "htm"_t:
-  case "html"_t: return "text/html";
-  case "js"_t:
-  case "mjs"_t: return "text/javascript";
-  case "txt"_t: return "text/plain";
-  case "vtt"_t: return "text/vtt";
-
-  case "apng"_t: return "image/apng";
-  case "avif"_t: return "image/avif";
-  case "bmp"_t: return "image/bmp";
-  case "gif"_t: return "image/gif";
-  case "png"_t: return "image/png";
-  case "svg"_t: return "image/svg+xml";
-  case "webp"_t: return "image/webp";
-  case "ico"_t: return "image/x-icon";
-  case "tif"_t: return "image/tiff";
-  case "tiff"_t: return "image/tiff";
-  case "jpg"_t:
-  case "jpeg"_t: return "image/jpeg";
-
-  case "mp4"_t: return "video/mp4";
-  case "mpeg"_t: return "video/mpeg";
-  case "webm"_t: return "video/webm";
-
-  case "mp3"_t: return "audio/mp3";
-  case "mpga"_t: return "audio/mpeg";
-  case "weba"_t: return "audio/webm";
-  case "wav"_t: return "audio/wave";
-
-  case "otf"_t: return "font/otf";
-  case "ttf"_t: return "font/ttf";
-  case "woff"_t: return "font/woff";
-  case "woff2"_t: return "font/woff2";
-
-  case "7z"_t: return "application/x-7z-compressed";
-  case "atom"_t: return "application/atom+xml";
-  case "pdf"_t: return "application/pdf";
-  case "json"_t: return "application/json";
-  case "rss"_t: return "application/rss+xml";
-  case "tar"_t: return "application/x-tar";
-  case "xht"_t:
-  case "xhtml"_t: return "application/xhtml+xml";
-  case "xslt"_t: return "application/xslt+xml";
-  case "xml"_t: return "application/xml";
-  case "gz"_t: return "application/gzip";
-  case "zip"_t: return "application/zip";
-  case "wasm"_t: return "application/wasm";
-  }
-}
-
-inline bool can_compress_content_type(const std::string &content_type) {
-  using udl::operator""_t;
-
-  auto tag = str2tag(content_type);
-
-  switch (tag) {
-  case "image/svg+xml"_t:
-  case "application/javascript"_t:
-  case "application/json"_t:
-  case "application/xml"_t:
-  case "application/protobuf"_t:
-  case "application/xhtml+xml"_t: return true;
-
-  case "text/event-stream"_t: return false;
-
-  default: return !content_type.rfind("text/", 0);
-  }
-}
-
-inline EncodingType encoding_type(const Request &req, const Response &res) {
-  auto ret =
-      detail::can_compress_content_type(res.get_header_value("Content-Type"));
-  if (!ret) { return EncodingType::None; }
-
-  const auto &s = req.get_header_value("Accept-Encoding");
-  (void)(s);
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-  // TODO: 'Accept-Encoding' has br, not br;q=0
-  ret = s.find("br") != std::string::npos;
-  if (ret) { return EncodingType::Brotli; }
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  // TODO: 'Accept-Encoding' has gzip, not gzip;q=0
-  ret = s.find("gzip") != std::string::npos;
-  if (ret) { return EncodingType::Gzip; }
-#endif
-
-  return EncodingType::None;
-}
-
-inline bool nocompressor::compress(const char *data, size_t data_length,
-                                   bool /*last*/, Callback callback) {
-  if (!data_length) { return true; }
-  return callback(data, data_length);
-}
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-inline gzip_compressor::gzip_compressor() {
-  std::memset(&strm_, 0, sizeof(strm_));
-  strm_.zalloc = Z_NULL;
-  strm_.zfree = Z_NULL;
-  strm_.opaque = Z_NULL;
-
-  is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
-                           Z_DEFAULT_STRATEGY) == Z_OK;
-}
-
-inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); }
-
-inline bool gzip_compressor::compress(const char *data, size_t data_length,
-                                      bool last, Callback callback) {
-  assert(is_valid_);
-
-  do {
-    constexpr size_t max_avail_in =
-        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
-
-    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
-        (std::min)(data_length, max_avail_in));
-    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
-
-    data_length -= strm_.avail_in;
-    data += strm_.avail_in;
-
-    auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
-    auto ret = Z_OK;
-
-    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    do {
-      strm_.avail_out = static_cast<uInt>(buff.size());
-      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
-
-      ret = deflate(&strm_, flush);
-      if (ret == Z_STREAM_ERROR) { return false; }
-
-      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
-        return false;
-      }
-    } while (strm_.avail_out == 0);
-
-    assert((flush == Z_FINISH && ret == Z_STREAM_END) ||
-           (flush == Z_NO_FLUSH && ret == Z_OK));
-    assert(strm_.avail_in == 0);
-  } while (data_length > 0);
-
-  return true;
-}
-
-inline gzip_decompressor::gzip_decompressor() {
-  std::memset(&strm_, 0, sizeof(strm_));
-  strm_.zalloc = Z_NULL;
-  strm_.zfree = Z_NULL;
-  strm_.opaque = Z_NULL;
-
-  // 15 is the value of wbits, which should be at the maximum possible value
-  // to ensure that any gzip stream can be decoded. The offset of 32 specifies
-  // that the stream type should be automatically detected either gzip or
-  // deflate.
-  is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK;
-}
-
-inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); }
-
-inline bool gzip_decompressor::is_valid() const { return is_valid_; }
-
-inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
-                                          Callback callback) {
-  assert(is_valid_);
-
-  auto ret = Z_OK;
-
-  do {
-    constexpr size_t max_avail_in =
-        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
-
-    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
-        (std::min)(data_length, max_avail_in));
-    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
-
-    data_length -= strm_.avail_in;
-    data += strm_.avail_in;
-
-    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    while (strm_.avail_in > 0 && ret == Z_OK) {
-      strm_.avail_out = static_cast<uInt>(buff.size());
-      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
-
-      ret = inflate(&strm_, Z_NO_FLUSH);
-
-      assert(ret != Z_STREAM_ERROR);
-      switch (ret) {
-      case Z_NEED_DICT:
-      case Z_DATA_ERROR:
-      case Z_MEM_ERROR: inflateEnd(&strm_); return false;
-      }
-
-      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
-        return false;
-      }
-    }
-
-    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
-
-  } while (data_length > 0);
-
-  return true;
-}
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-inline brotli_compressor::brotli_compressor() {
-  state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
-}
-
-inline brotli_compressor::~brotli_compressor() {
-  BrotliEncoderDestroyInstance(state_);
-}
-
-inline bool brotli_compressor::compress(const char *data, size_t data_length,
-                                        bool last, Callback callback) {
-  std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-
-  auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
-  auto available_in = data_length;
-  auto next_in = reinterpret_cast<const uint8_t *>(data);
-
-  for (;;) {
-    if (last) {
-      if (BrotliEncoderIsFinished(state_)) { break; }
-    } else {
-      if (!available_in) { break; }
-    }
-
-    auto available_out = buff.size();
-    auto next_out = buff.data();
-
-    if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in,
-                                     &available_out, &next_out, nullptr)) {
-      return false;
-    }
-
-    auto output_bytes = buff.size() - available_out;
-    if (output_bytes) {
-      callback(reinterpret_cast<const char *>(buff.data()), output_bytes);
-    }
-  }
-
-  return true;
-}
-
-inline brotli_decompressor::brotli_decompressor() {
-  decoder_s = BrotliDecoderCreateInstance(0, 0, 0);
-  decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT
-                        : BROTLI_DECODER_RESULT_ERROR;
-}
-
-inline brotli_decompressor::~brotli_decompressor() {
-  if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); }
-}
-
-inline bool brotli_decompressor::is_valid() const { return decoder_s; }
-
-inline bool brotli_decompressor::decompress(const char *data,
-                                            size_t data_length,
-                                            Callback callback) {
-  if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
-      decoder_r == BROTLI_DECODER_RESULT_ERROR) {
-    return 0;
-  }
-
-  auto next_in = reinterpret_cast<const uint8_t *>(data);
-  size_t avail_in = data_length;
-  size_t total_out;
-
-  decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
-
-  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-  while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
-    char *next_out = buff.data();
-    size_t avail_out = buff.size();
-
-    decoder_r = BrotliDecoderDecompressStream(
-        decoder_s, &avail_in, &next_in, &avail_out,
-        reinterpret_cast<uint8_t **>(&next_out), &total_out);
-
-    if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
-
-    if (!callback(buff.data(), buff.size() - avail_out)) { return false; }
-  }
-
-  return decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
-         decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
-}
-#endif
-
-inline bool has_header(const Headers &headers, const std::string &key) {
-  return headers.find(key) != headers.end();
-}
-
-inline const char *get_header_value(const Headers &headers,
-                                    const std::string &key, const char *def,
-                                    size_t id) {
-  auto rng = headers.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) { return it->second.c_str(); }
-  return def;
-}
-
-template <typename T>
-inline bool parse_header(const char *beg, const char *end, T fn) {
-  // Skip trailing spaces and tabs.
-  while (beg < end && is_space_or_tab(end[-1])) {
-    end--;
-  }
-
-  auto p = beg;
-  while (p < end && *p != ':') {
-    p++;
-  }
-
-  if (p == end) { return false; }
-
-  auto key_end = p;
-
-  if (*p++ != ':') { return false; }
-
-  while (p < end && is_space_or_tab(*p)) {
-    p++;
-  }
-
-  if (p <= end) {
-    auto key_len = key_end - beg;
-    if (!key_len) { return false; }
-
-    auto key = std::string(beg, key_end);
-    // auto val = (case_ignore::equal(key, "Location") ||
-    //             case_ignore::equal(key, "Referer"))
-    //                ? std::string(p, end)
-    //                : decode_url(std::string(p, end), false);
-    auto val = std::string(p, end);
-
-    if (!detail::fields::is_field_value(val)) { return false; }
-
-    if (case_ignore::equal(key, "Location") ||
-        case_ignore::equal(key, "Referer")) {
-      fn(key, val);
-    } else {
-      fn(key, decode_url(val, false));
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-inline bool read_headers(Stream &strm, Headers &headers) {
-  const auto bufsiz = 2048;
-  char buf[bufsiz];
-  stream_line_reader line_reader(strm, buf, bufsiz);
-
-  for (;;) {
-    if (!line_reader.getline()) { return false; }
-
-    // Check if the line ends with CRLF.
-    auto line_terminator_len = 2;
-    if (line_reader.end_with_crlf()) {
-      // Blank line indicates end of headers.
-      if (line_reader.size() == 2) { break; }
-    } else {
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-      // Blank line indicates end of headers.
-      if (line_reader.size() == 1) { break; }
-      line_terminator_len = 1;
-#else
-      continue; // Skip invalid line.
-#endif
-    }
-
-    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-
-    // Exclude line terminator
-    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
-
-    if (!parse_header(line_reader.ptr(), end,
-                      [&](const std::string &key, const std::string &val) {
-                        headers.emplace(key, val);
-                      })) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-inline bool read_content_with_length(Stream &strm, uint64_t len,
-                                     Progress progress,
-                                     ContentReceiverWithProgress out) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-
-  uint64_t r = 0;
-  while (r < len) {
-    auto read_len = static_cast<size_t>(len - r);
-    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
-    if (n <= 0) { return false; }
-
-    if (!out(buf, static_cast<size_t>(n), r, len)) { return false; }
-    r += static_cast<uint64_t>(n);
-
-    if (progress) {
-      if (!progress(r, len)) { return false; }
-    }
-  }
-
-  return true;
-}
-
-inline void skip_content_with_length(Stream &strm, uint64_t len) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-  uint64_t r = 0;
-  while (r < len) {
-    auto read_len = static_cast<size_t>(len - r);
-    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
-    if (n <= 0) { return; }
-    r += static_cast<uint64_t>(n);
-  }
-}
-
-inline bool read_content_without_length(Stream &strm,
-                                        ContentReceiverWithProgress out) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-  uint64_t r = 0;
-  for (;;) {
-    auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
-    if (n <= 0) { return false; }
-
-    if (!out(buf, static_cast<size_t>(n), r, 0)) { return false; }
-    r += static_cast<uint64_t>(n);
-  }
-
-  return true;
-}
-
-template <typename T>
-inline bool read_content_chunked(Stream &strm, T &x,
-                                 ContentReceiverWithProgress out) {
-  const auto bufsiz = 16;
-  char buf[bufsiz];
-
-  stream_line_reader line_reader(strm, buf, bufsiz);
-
-  if (!line_reader.getline()) { return false; }
-
-  unsigned long chunk_len;
-  while (true) {
-    char *end_ptr;
-
-    chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16);
-
-    if (end_ptr == line_reader.ptr()) { return false; }
-    if (chunk_len == ULONG_MAX) { return false; }
-
-    if (chunk_len == 0) { break; }
-
-    if (!read_content_with_length(strm, chunk_len, nullptr, out)) {
-      return false;
-    }
-
-    if (!line_reader.getline()) { return false; }
-
-    if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; }
-
-    if (!line_reader.getline()) { return false; }
-  }
-
-  assert(chunk_len == 0);
-
-  // NOTE: In RFC 9112, '7.1 Chunked Transfer Coding' mentiones "The chunked
-  // transfer coding is complete when a chunk with a chunk-size of zero is
-  // received, possibly followed by a trailer section, and finally terminated by
-  // an empty line". https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1
-  //
-  // In '7.1.3. Decoding Chunked', however, the pseudo-code in the section
-  // does't care for the existence of the final CRLF. In other words, it seems
-  // to be ok whether the final CRLF exists or not in the chunked data.
-  // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.1.3
-  //
-  // According to the reference code in RFC 9112, cpp-htpplib now allows
-  // chuncked transfer coding data without the final CRLF.
-  if (!line_reader.getline()) { return true; }
-
-  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
-    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-
-    // Exclude line terminator
-    constexpr auto line_terminator_len = 2;
-    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
-
-    parse_header(line_reader.ptr(), end,
-                 [&](const std::string &key, const std::string &val) {
-                   x.headers.emplace(key, val);
-                 });
-
-    if (!line_reader.getline()) { return false; }
-  }
-
-  return true;
-}
-
-inline bool is_chunked_transfer_encoding(const Headers &headers) {
-  return case_ignore::equal(
-      get_header_value(headers, "Transfer-Encoding", "", 0), "chunked");
-}
-
-template <typename T, typename U>
-bool prepare_content_receiver(T &x, int &status,
-                              ContentReceiverWithProgress receiver,
-                              bool decompress, U callback) {
-  if (decompress) {
-    std::string encoding = x.get_header_value("Content-Encoding");
-    std::unique_ptr<decompressor> decompressor;
-
-    if (encoding == "gzip" || encoding == "deflate") {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-      decompressor = detail::make_unique<gzip_decompressor>();
-#else
-      status = StatusCode::UnsupportedMediaType_415;
-      return false;
-#endif
-    } else if (encoding.find("br") != std::string::npos) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-      decompressor = detail::make_unique<brotli_decompressor>();
-#else
-      status = StatusCode::UnsupportedMediaType_415;
-      return false;
-#endif
-    }
-
-    if (decompressor) {
-      if (decompressor->is_valid()) {
-        ContentReceiverWithProgress out = [&](const char *buf, size_t n,
-                                              uint64_t off, uint64_t len) {
-          return decompressor->decompress(buf, n,
-                                          [&](const char *buf2, size_t n2) {
-                                            return receiver(buf2, n2, off, len);
-                                          });
-        };
-        return callback(std::move(out));
-      } else {
-        status = StatusCode::InternalServerError_500;
-        return false;
-      }
-    }
-  }
-
-  ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off,
-                                        uint64_t len) {
-    return receiver(buf, n, off, len);
-  };
-  return callback(std::move(out));
-}
-
-template <typename T>
-bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
-                  Progress progress, ContentReceiverWithProgress receiver,
-                  bool decompress) {
-  return prepare_content_receiver(
-      x, status, std::move(receiver), decompress,
-      [&](const ContentReceiverWithProgress &out) {
-        auto ret = true;
-        auto exceed_payload_max_length = false;
-
-        if (is_chunked_transfer_encoding(x.headers)) {
-          ret = read_content_chunked(strm, x, out);
-        } else if (!has_header(x.headers, "Content-Length")) {
-          ret = read_content_without_length(strm, out);
-        } else {
-          auto is_invalid_value = false;
-          auto len = get_header_value_u64(
-              x.headers, "Content-Length",
-              (std::numeric_limits<uint64_t>::max)(), 0, is_invalid_value);
-
-          if (is_invalid_value) {
-            ret = false;
-          } else if (len > payload_max_length) {
-            exceed_payload_max_length = true;
-            skip_content_with_length(strm, len);
-            ret = false;
-          } else if (len > 0) {
-            ret = read_content_with_length(strm, len, std::move(progress), out);
-          }
-        }
-
-        if (!ret) {
-          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
-                                             : StatusCode::BadRequest_400;
-        }
-        return ret;
-      });
-}
-
-inline ssize_t write_request_line(Stream &strm, const std::string &method,
-                                  const std::string &path) {
-  std::string s = method;
-  s += " ";
-  s += path;
-  s += " HTTP/1.1\r\n";
-  return strm.write(s.data(), s.size());
-}
-
-inline ssize_t write_response_line(Stream &strm, int status) {
-  std::string s = "HTTP/1.1 ";
-  s += std::to_string(status);
-  s += " ";
-  s += httplib::status_message(status);
-  s += "\r\n";
-  return strm.write(s.data(), s.size());
-}
-
-inline ssize_t write_headers(Stream &strm, const Headers &headers) {
-  ssize_t write_len = 0;
-  for (const auto &x : headers) {
-    std::string s;
-    s = x.first;
-    s += ": ";
-    s += x.second;
-    s += "\r\n";
-
-    auto len = strm.write(s.data(), s.size());
-    if (len < 0) { return len; }
-    write_len += len;
-  }
-  auto len = strm.write("\r\n");
-  if (len < 0) { return len; }
-  write_len += len;
-  return write_len;
-}
-
-inline bool write_data(Stream &strm, const char *d, size_t l) {
-  size_t offset = 0;
-  while (offset < l) {
-    auto length = strm.write(d + offset, l - offset);
-    if (length < 0) { return false; }
-    offset += static_cast<size_t>(length);
-  }
-  return true;
-}
-
-template <typename T>
-inline bool write_content(Stream &strm, const ContentProvider &content_provider,
-                          size_t offset, size_t length, T is_shutting_down,
-                          Error &error) {
-  size_t end_offset = offset + length;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      if (strm.is_writable() && write_data(strm, d, l)) {
-        offset += l;
-      } else {
-        ok = false;
-      }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  while (offset < end_offset && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      error = Error::Write;
-      return false;
-    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
-      error = Error::Canceled;
-      return false;
-    } else if (!ok) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  error = Error::Success;
-  return true;
-}
-
-template <typename T>
-inline bool write_content(Stream &strm, const ContentProvider &content_provider,
-                          size_t offset, size_t length,
-                          const T &is_shutting_down) {
-  auto error = Error::Success;
-  return write_content(strm, content_provider, offset, length, is_shutting_down,
-                       error);
-}
-
-template <typename T>
-inline bool
-write_content_without_length(Stream &strm,
-                             const ContentProvider &content_provider,
-                             const T &is_shutting_down) {
-  size_t offset = 0;
-  auto data_available = true;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      offset += l;
-      if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  data_sink.done = [&](void) { data_available = false; };
-
-  while (data_available && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      return false;
-    } else if (!content_provider(offset, 0, data_sink)) {
-      return false;
-    } else if (!ok) {
-      return false;
-    }
-  }
-  return true;
-}
-
-template <typename T, typename U>
-inline bool
-write_content_chunked(Stream &strm, const ContentProvider &content_provider,
-                      const T &is_shutting_down, U &compressor, Error &error) {
-  size_t offset = 0;
-  auto data_available = true;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      data_available = l > 0;
-      offset += l;
-
-      std::string payload;
-      if (compressor.compress(d, l, false,
-                              [&](const char *data, size_t data_len) {
-                                payload.append(data, data_len);
-                                return true;
-                              })) {
-        if (!payload.empty()) {
-          // Emit chunked response header and footer for each chunk
-          auto chunk =
-              from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-          if (!strm.is_writable() ||
-              !write_data(strm, chunk.data(), chunk.size())) {
-            ok = false;
-          }
-        }
-      } else {
-        ok = false;
-      }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  auto done_with_trailer = [&](const Headers *trailer) {
-    if (!ok) { return; }
-
-    data_available = false;
-
-    std::string payload;
-    if (!compressor.compress(nullptr, 0, true,
-                             [&](const char *data, size_t data_len) {
-                               payload.append(data, data_len);
-                               return true;
-                             })) {
-      ok = false;
-      return;
-    }
-
-    if (!payload.empty()) {
-      // Emit chunked response header and footer for each chunk
-      auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-      if (!strm.is_writable() ||
-          !write_data(strm, chunk.data(), chunk.size())) {
-        ok = false;
-        return;
-      }
-    }
-
-    static const std::string done_marker("0\r\n");
-    if (!write_data(strm, done_marker.data(), done_marker.size())) {
-      ok = false;
-    }
-
-    // Trailer
-    if (trailer) {
-      for (const auto &kv : *trailer) {
-        std::string field_line = kv.first + ": " + kv.second + "\r\n";
-        if (!write_data(strm, field_line.data(), field_line.size())) {
-          ok = false;
-        }
-      }
-    }
-
-    static const std::string crlf("\r\n");
-    if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
-  };
-
-  data_sink.done = [&](void) { done_with_trailer(nullptr); };
-
-  data_sink.done_with_trailer = [&](const Headers &trailer) {
-    done_with_trailer(&trailer);
-  };
-
-  while (data_available && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      error = Error::Write;
-      return false;
-    } else if (!content_provider(offset, 0, data_sink)) {
-      error = Error::Canceled;
-      return false;
-    } else if (!ok) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  error = Error::Success;
-  return true;
-}
-
-template <typename T, typename U>
-inline bool write_content_chunked(Stream &strm,
-                                  const ContentProvider &content_provider,
-                                  const T &is_shutting_down, U &compressor) {
-  auto error = Error::Success;
-  return write_content_chunked(strm, content_provider, is_shutting_down,
-                               compressor, error);
-}
-
-template <typename T>
-inline bool redirect(T &cli, Request &req, Response &res,
-                     const std::string &path, const std::string &location,
-                     Error &error) {
-  Request new_req = req;
-  new_req.path = path;
-  new_req.redirect_count_ -= 1;
-
-  if (res.status == StatusCode::SeeOther_303 &&
-      (req.method != "GET" && req.method != "HEAD")) {
-    new_req.method = "GET";
-    new_req.body.clear();
-    new_req.headers.clear();
-  }
-
-  Response new_res;
-
-  auto ret = cli.send(new_req, new_res, error);
-  if (ret) {
-    req = new_req;
-    res = new_res;
-
-    if (res.location.empty()) { res.location = location; }
-  }
-  return ret;
-}
-
-inline std::string params_to_query_str(const Params &params) {
-  std::string query;
-
-  for (auto it = params.begin(); it != params.end(); ++it) {
-    if (it != params.begin()) { query += "&"; }
-    query += it->first;
-    query += "=";
-    query += encode_query_param(it->second);
-  }
-  return query;
-}
-
-inline void parse_query_text(const char *data, std::size_t size,
-                             Params &params) {
-  std::set<std::string> cache;
-  split(data, data + size, '&', [&](const char *b, const char *e) {
-    std::string kv(b, e);
-    if (cache.find(kv) != cache.end()) { return; }
-    cache.insert(std::move(kv));
-
-    std::string key;
-    std::string val;
-    divide(b, static_cast<std::size_t>(e - b), '=',
-           [&](const char *lhs_data, std::size_t lhs_size, const char *rhs_data,
-               std::size_t rhs_size) {
-             key.assign(lhs_data, lhs_size);
-             val.assign(rhs_data, rhs_size);
-           });
-
-    if (!key.empty()) {
-      params.emplace(decode_url(key, true), decode_url(val, true));
-    }
-  });
-}
-
-inline void parse_query_text(const std::string &s, Params &params) {
-  parse_query_text(s.data(), s.size(), params);
-}
-
-inline bool parse_multipart_boundary(const std::string &content_type,
-                                     std::string &boundary) {
-  auto boundary_keyword = "boundary=";
-  auto pos = content_type.find(boundary_keyword);
-  if (pos == std::string::npos) { return false; }
-  auto end = content_type.find(';', pos);
-  auto beg = pos + strlen(boundary_keyword);
-  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
-  return !boundary.empty();
-}
-
-inline void parse_disposition_params(const std::string &s, Params &params) {
-  std::set<std::string> cache;
-  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
-    std::string kv(b, e);
-    if (cache.find(kv) != cache.end()) { return; }
-    cache.insert(kv);
-
-    std::string key;
-    std::string val;
-    split(b, e, '=', [&](const char *b2, const char *e2) {
-      if (key.empty()) {
-        key.assign(b2, e2);
-      } else {
-        val.assign(b2, e2);
-      }
-    });
-
-    if (!key.empty()) {
-      params.emplace(trim_double_quotes_copy((key)),
-                     trim_double_quotes_copy((val)));
-    }
-  });
-}
-
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-inline bool parse_range_header(const std::string &s, Ranges &ranges) {
-#else
-inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
-#endif
-  auto is_valid = [](const std::string &str) {
-    return std::all_of(str.cbegin(), str.cend(),
-                       [](unsigned char c) { return std::isdigit(c); });
-  };
-
-  if (s.size() > 7 && s.compare(0, 6, "bytes=") == 0) {
-    const auto pos = static_cast<size_t>(6);
-    const auto len = static_cast<size_t>(s.size() - 6);
-    auto all_valid_ranges = true;
-    split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
-      if (!all_valid_ranges) { return; }
-
-      const auto it = std::find(b, e, '-');
-      if (it == e) {
-        all_valid_ranges = false;
-        return;
-      }
-
-      const auto lhs = std::string(b, it);
-      const auto rhs = std::string(it + 1, e);
-      if (!is_valid(lhs) || !is_valid(rhs)) {
-        all_valid_ranges = false;
-        return;
-      }
-
-      const auto first =
-          static_cast<ssize_t>(lhs.empty() ? -1 : std::stoll(lhs));
-      const auto last =
-          static_cast<ssize_t>(rhs.empty() ? -1 : std::stoll(rhs));
-      if ((first == -1 && last == -1) ||
-          (first != -1 && last != -1 && first > last)) {
-        all_valid_ranges = false;
-        return;
-      }
-
-      ranges.emplace_back(first, last);
-    });
-    return all_valid_ranges && !ranges.empty();
-  }
-  return false;
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-}
-#else
-} catch (...) { return false; }
-#endif
-
-class MultipartFormDataParser {
-public:
-  MultipartFormDataParser() = default;
-
-  void set_boundary(std::string &&boundary) {
-    boundary_ = boundary;
-    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
-    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
-  }
-
-  bool is_valid() const { return is_valid_; }
-
-  bool parse(const char *buf, size_t n, const ContentReceiver &content_callback,
-             const MultipartContentHeader &header_callback) {
-
-    buf_append(buf, n);
-
-    while (buf_size() > 0) {
-      switch (state_) {
-      case 0: { // Initial boundary
-        buf_erase(buf_find(dash_boundary_crlf_));
-        if (dash_boundary_crlf_.size() > buf_size()) { return true; }
-        if (!buf_start_with(dash_boundary_crlf_)) { return false; }
-        buf_erase(dash_boundary_crlf_.size());
-        state_ = 1;
-        break;
-      }
-      case 1: { // New entry
-        clear_file_info();
-        state_ = 2;
-        break;
-      }
-      case 2: { // Headers
-        auto pos = buf_find(crlf_);
-        if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-        while (pos < buf_size()) {
-          // Empty line
-          if (pos == 0) {
-            if (!header_callback(file_)) {
-              is_valid_ = false;
-              return false;
-            }
-            buf_erase(crlf_.size());
-            state_ = 3;
-            break;
-          }
-
-          const auto header = buf_head(pos);
-
-          if (!parse_header(header.data(), header.data() + header.size(),
-                            [&](const std::string &, const std::string &) {})) {
-            is_valid_ = false;
-            return false;
-          }
-
-          static const std::string header_content_type = "Content-Type:";
-
-          if (start_with_case_ignore(header, header_content_type)) {
-            file_.content_type =
-                trim_copy(header.substr(header_content_type.size()));
-          } else {
-            static const std::regex re_content_disposition(
-                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
-                std::regex_constants::icase);
-
-            std::smatch m;
-            if (std::regex_match(header, m, re_content_disposition)) {
-              Params params;
-              parse_disposition_params(m[1], params);
-
-              auto it = params.find("name");
-              if (it != params.end()) {
-                file_.name = it->second;
-              } else {
-                is_valid_ = false;
-                return false;
-              }
-
-              it = params.find("filename");
-              if (it != params.end()) { file_.filename = it->second; }
-
-              it = params.find("filename*");
-              if (it != params.end()) {
-                // Only allow UTF-8 enconnding...
-                static const std::regex re_rfc5987_encoding(
-                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
-
-                std::smatch m2;
-                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
-                  file_.filename = decode_url(m2[1], false); // override...
-                } else {
-                  is_valid_ = false;
-                  return false;
-                }
-              }
-            }
-          }
-          buf_erase(pos + crlf_.size());
-          pos = buf_find(crlf_);
-        }
-        if (state_ != 3) { return true; }
-        break;
-      }
-      case 3: { // Body
-        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
-        auto pos = buf_find(crlf_dash_boundary_);
-        if (pos < buf_size()) {
-          if (!content_callback(buf_data(), pos)) {
-            is_valid_ = false;
-            return false;
-          }
-          buf_erase(pos + crlf_dash_boundary_.size());
-          state_ = 4;
-        } else {
-          auto len = buf_size() - crlf_dash_boundary_.size();
-          if (len > 0) {
-            if (!content_callback(buf_data(), len)) {
-              is_valid_ = false;
-              return false;
-            }
-            buf_erase(len);
-          }
-          return true;
-        }
-        break;
-      }
-      case 4: { // Boundary
-        if (crlf_.size() > buf_size()) { return true; }
-        if (buf_start_with(crlf_)) {
-          buf_erase(crlf_.size());
-          state_ = 1;
-        } else {
-          if (dash_.size() > buf_size()) { return true; }
-          if (buf_start_with(dash_)) {
-            buf_erase(dash_.size());
-            is_valid_ = true;
-            buf_erase(buf_size()); // Remove epilogue
-          } else {
-            return true;
-          }
-        }
-        break;
-      }
-      }
-    }
-
-    return true;
-  }
-
-private:
-  void clear_file_info() {
-    file_.name.clear();
-    file_.filename.clear();
-    file_.content_type.clear();
-  }
-
-  bool start_with_case_ignore(const std::string &a,
-                              const std::string &b) const {
-    if (a.size() < b.size()) { return false; }
-    for (size_t i = 0; i < b.size(); i++) {
-      if (case_ignore::to_lower(a[i]) != case_ignore::to_lower(b[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  const std::string dash_ = "--";
-  const std::string crlf_ = "\r\n";
-  std::string boundary_;
-  std::string dash_boundary_crlf_;
-  std::string crlf_dash_boundary_;
-
-  size_t state_ = 0;
-  bool is_valid_ = false;
-  MultipartFormData file_;
-
-  // Buffer
-  bool start_with(const std::string &a, size_t spos, size_t epos,
-                  const std::string &b) const {
-    if (epos - spos < b.size()) { return false; }
-    for (size_t i = 0; i < b.size(); i++) {
-      if (a[i + spos] != b[i]) { return false; }
-    }
-    return true;
-  }
-
-  size_t buf_size() const { return buf_epos_ - buf_spos_; }
-
-  const char *buf_data() const { return &buf_[buf_spos_]; }
-
-  std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); }
-
-  bool buf_start_with(const std::string &s) const {
-    return start_with(buf_, buf_spos_, buf_epos_, s);
-  }
-
-  size_t buf_find(const std::string &s) const {
-    auto c = s.front();
-
-    size_t off = buf_spos_;
-    while (off < buf_epos_) {
-      auto pos = off;
-      while (true) {
-        if (pos == buf_epos_) { return buf_size(); }
-        if (buf_[pos] == c) { break; }
-        pos++;
-      }
-
-      auto remaining_size = buf_epos_ - pos;
-      if (s.size() > remaining_size) { return buf_size(); }
-
-      if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; }
-
-      off = pos + 1;
-    }
-
-    return buf_size();
-  }
-
-  void buf_append(const char *data, size_t n) {
-    auto remaining_size = buf_size();
-    if (remaining_size > 0 && buf_spos_ > 0) {
-      for (size_t i = 0; i < remaining_size; i++) {
-        buf_[i] = buf_[buf_spos_ + i];
-      }
-    }
-    buf_spos_ = 0;
-    buf_epos_ = remaining_size;
-
-    if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); }
-
-    for (size_t i = 0; i < n; i++) {
-      buf_[buf_epos_ + i] = data[i];
-    }
-    buf_epos_ += n;
-  }
-
-  void buf_erase(size_t size) { buf_spos_ += size; }
-
-  std::string buf_;
-  size_t buf_spos_ = 0;
-  size_t buf_epos_ = 0;
-};
-
-inline std::string random_string(size_t length) {
-  static const char data[] =
-      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-  // std::random_device might actually be deterministic on some
-  // platforms, but due to lack of support in the c++ standard library,
-  // doing better requires either some ugly hacks or breaking portability.
-  static std::random_device seed_gen;
-
-  // Request 128 bits of entropy for initialization
-  static std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(),
-                                     seed_gen()};
-
-  static std::mt19937 engine(seed_sequence);
-
-  std::string result;
-  for (size_t i = 0; i < length; i++) {
-    result += data[engine() % (sizeof(data) - 1)];
-  }
-  return result;
-}
-
-inline std::string make_multipart_data_boundary() {
-  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
-}
-
-inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
-  auto valid = true;
-  for (size_t i = 0; i < boundary.size(); i++) {
-    auto c = boundary[i];
-    if (!std::isalnum(c) && c != '-' && c != '_') {
-      valid = false;
-      break;
-    }
-  }
-  return valid;
-}
-
-template <typename T>
-inline std::string
-serialize_multipart_formdata_item_begin(const T &item,
-                                        const std::string &boundary) {
-  std::string body = "--" + boundary + "\r\n";
-  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
-  if (!item.filename.empty()) {
-    body += "; filename=\"" + item.filename + "\"";
-  }
-  body += "\r\n";
-  if (!item.content_type.empty()) {
-    body += "Content-Type: " + item.content_type + "\r\n";
-  }
-  body += "\r\n";
-
-  return body;
-}
-
-inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
-
-inline std::string
-serialize_multipart_formdata_finish(const std::string &boundary) {
-  return "--" + boundary + "--\r\n";
-}
-
-inline std::string
-serialize_multipart_formdata_get_content_type(const std::string &boundary) {
-  return "multipart/form-data; boundary=" + boundary;
-}
-
-inline std::string
-serialize_multipart_formdata(const MultipartFormDataItems &items,
-                             const std::string &boundary, bool finish = true) {
-  std::string body;
-
-  for (const auto &item : items) {
-    body += serialize_multipart_formdata_item_begin(item, boundary);
-    body += item.content + serialize_multipart_formdata_item_end();
-  }
-
-  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
-
-  return body;
-}
-
-inline bool range_error(Request &req, Response &res) {
-  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
-    ssize_t contant_len = static_cast<ssize_t>(
-        res.content_length_ ? res.content_length_ : res.body.size());
-
-    ssize_t prev_first_pos = -1;
-    ssize_t prev_last_pos = -1;
-    size_t overwrapping_count = 0;
-
-    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
-    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
-    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
-
-    // Too many ranges
-    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
-
-    for (auto &r : req.ranges) {
-      auto &first_pos = r.first;
-      auto &last_pos = r.second;
-
-      if (first_pos == -1 && last_pos == -1) {
-        first_pos = 0;
-        last_pos = contant_len;
-      }
-
-      if (first_pos == -1) {
-        first_pos = contant_len - last_pos;
-        last_pos = contant_len - 1;
-      }
-
-      // NOTE: RFC-9110 '14.1.2. Byte Ranges':
-      // A client can limit the number of bytes requested without knowing the
-      // size of the selected representation. If the last-pos value is absent,
-      // or if the value is greater than or equal to the current length of the
-      // representation data, the byte range is interpreted as the remainder of
-      // the representation (i.e., the server replaces the value of last-pos
-      // with a value that is one less than the current length of the selected
-      // representation).
-      // https://www.rfc-editor.org/rfc/rfc9110.html#section-14.1.2-6
-      if (last_pos == -1 || last_pos >= contant_len) {
-        last_pos = contant_len - 1;
-      }
-
-      // Range must be within content length
-      if (!(0 <= first_pos && first_pos <= last_pos &&
-            last_pos <= contant_len - 1)) {
-        return true;
-      }
-
-      // Ranges must be in ascending order
-      if (first_pos <= prev_first_pos) { return true; }
-
-      // Request must not have more than two overlapping ranges
-      if (first_pos <= prev_last_pos) {
-        overwrapping_count++;
-        if (overwrapping_count > 2) { return true; }
-      }
-
-      prev_first_pos = (std::max)(prev_first_pos, first_pos);
-      prev_last_pos = (std::max)(prev_last_pos, last_pos);
-    }
-  }
-
-  return false;
-}
-
-inline std::pair<size_t, size_t>
-get_range_offset_and_length(Range r, size_t content_length) {
-  assert(r.first != -1 && r.second != -1);
-  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
-  assert(r.first <= r.second &&
-         r.second < static_cast<ssize_t>(content_length));
-  (void)(content_length);
-  return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
-}
-
-inline std::string make_content_range_header_field(
-    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
-  auto st = offset_and_length.first;
-  auto ed = st + offset_and_length.second - 1;
-
-  std::string field = "bytes ";
-  field += std::to_string(st);
-  field += "-";
-  field += std::to_string(ed);
-  field += "/";
-  field += std::to_string(content_length);
-  return field;
-}
-
-template <typename SToken, typename CToken, typename Content>
-bool process_multipart_ranges_data(const Request &req,
-                                   const std::string &boundary,
-                                   const std::string &content_type,
-                                   size_t content_length, SToken stoken,
-                                   CToken ctoken, Content content) {
-  for (size_t i = 0; i < req.ranges.size(); i++) {
-    ctoken("--");
-    stoken(boundary);
-    ctoken("\r\n");
-    if (!content_type.empty()) {
-      ctoken("Content-Type: ");
-      stoken(content_type);
-      ctoken("\r\n");
-    }
-
-    auto offset_and_length =
-        get_range_offset_and_length(req.ranges[i], content_length);
-
-    ctoken("Content-Range: ");
-    stoken(make_content_range_header_field(offset_and_length, content_length));
-    ctoken("\r\n");
-    ctoken("\r\n");
-
-    if (!content(offset_and_length.first, offset_and_length.second)) {
-      return false;
-    }
-    ctoken("\r\n");
-  }
-
-  ctoken("--");
-  stoken(boundary);
-  ctoken("--");
-
-  return true;
-}
-
-inline void make_multipart_ranges_data(const Request &req, Response &res,
-                                       const std::string &boundary,
-                                       const std::string &content_type,
-                                       size_t content_length,
-                                       std::string &data) {
-  process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { data += token; },
-      [&](const std::string &token) { data += token; },
-      [&](size_t offset, size_t length) {
-        assert(offset + length <= content_length);
-        data += res.body.substr(offset, length);
-        return true;
-      });
-}
-
-inline size_t get_multipart_ranges_data_length(const Request &req,
-                                               const std::string &boundary,
-                                               const std::string &content_type,
-                                               size_t content_length) {
-  size_t data_length = 0;
-
-  process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { data_length += token.size(); },
-      [&](const std::string &token) { data_length += token.size(); },
-      [&](size_t /*offset*/, size_t length) {
-        data_length += length;
-        return true;
-      });
-
-  return data_length;
-}
-
-template <typename T>
-inline bool
-write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
-                            const std::string &boundary,
-                            const std::string &content_type,
-                            size_t content_length, const T &is_shutting_down) {
-  return process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { strm.write(token); },
-      [&](const std::string &token) { strm.write(token); },
-      [&](size_t offset, size_t length) {
-        return write_content(strm, res.content_provider_, offset, length,
-                             is_shutting_down);
-      });
-}
-
-inline bool expect_content(const Request &req) {
-  if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
-      req.method == "DELETE") {
-    return true;
-  }
-  if (req.has_header("Content-Length") &&
-      req.get_header_value_u64("Content-Length") > 0) {
-    return true;
-  }
-  if (is_chunked_transfer_encoding(req.headers)) { return true; }
-  return false;
-}
-
-inline bool has_crlf(const std::string &s) {
-  auto p = s.c_str();
-  while (*p) {
-    if (*p == '\r' || *p == '\n') { return true; }
-    p++;
-  }
-  return false;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
-  auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>(
-      EVP_MD_CTX_new(), EVP_MD_CTX_free);
-
-  unsigned int hash_length = 0;
-  unsigned char hash[EVP_MAX_MD_SIZE];
-
-  EVP_DigestInit_ex(context.get(), algo, nullptr);
-  EVP_DigestUpdate(context.get(), s.c_str(), s.size());
-  EVP_DigestFinal_ex(context.get(), hash, &hash_length);
-
-  std::stringstream ss;
-  for (auto i = 0u; i < hash_length; ++i) {
-    ss << std::hex << std::setw(2) << std::setfill('0')
-       << static_cast<unsigned int>(hash[i]);
-  }
-
-  return ss.str();
-}
-
-inline std::string MD5(const std::string &s) {
-  return message_digest(s, EVP_md5());
-}
-
-inline std::string SHA_256(const std::string &s) {
-  return message_digest(s, EVP_sha256());
-}
-
-inline std::string SHA_512(const std::string &s) {
-  return message_digest(s, EVP_sha512());
-}
-
-inline std::pair<std::string, std::string> make_digest_authentication_header(
-    const Request &req, const std::map<std::string, std::string> &auth,
-    size_t cnonce_count, const std::string &cnonce, const std::string &username,
-    const std::string &password, bool is_proxy = false) {
-  std::string nc;
-  {
-    std::stringstream ss;
-    ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count;
-    nc = ss.str();
-  }
-
-  std::string qop;
-  if (auth.find("qop") != auth.end()) {
-    qop = auth.at("qop");
-    if (qop.find("auth-int") != std::string::npos) {
-      qop = "auth-int";
-    } else if (qop.find("auth") != std::string::npos) {
-      qop = "auth";
-    } else {
-      qop.clear();
-    }
-  }
-
-  std::string algo = "MD5";
-  if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); }
-
-  std::string response;
-  {
-    auto H = algo == "SHA-256"   ? detail::SHA_256
-             : algo == "SHA-512" ? detail::SHA_512
-                                 : detail::MD5;
-
-    auto A1 = username + ":" + auth.at("realm") + ":" + password;
-
-    auto A2 = req.method + ":" + req.path;
-    if (qop == "auth-int") { A2 += ":" + H(req.body); }
-
-    if (qop.empty()) {
-      response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2));
-    } else {
-      response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce +
-                   ":" + qop + ":" + H(A2));
-    }
-  }
-
-  auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : "";
-
-  auto field = "Digest username=\"" + username + "\", realm=\"" +
-               auth.at("realm") + "\", nonce=\"" + auth.at("nonce") +
-               "\", uri=\"" + req.path + "\", algorithm=" + algo +
-               (qop.empty() ? ", response=\""
-                            : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" +
-                                  cnonce + "\", response=\"") +
-               response + "\"" +
-               (opaque.empty() ? "" : ", opaque=\"" + opaque + "\"");
-
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, field);
-}
-
-inline bool is_ssl_peer_could_be_closed(SSL *ssl, socket_t sock) {
-  detail::set_nonblocking(sock, true);
-  auto se = detail::scope_exit([&]() { detail::set_nonblocking(sock, false); });
-
-  char buf[1];
-  return !SSL_peek(ssl, buf, 1) &&
-         SSL_get_error(ssl, 0) == SSL_ERROR_ZERO_RETURN;
-}
-
-#ifdef _WIN32
-// NOTE: This code came up with the following stackoverflow post:
-// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
-inline bool load_system_certs_on_windows(X509_STORE *store) {
-  auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
-  if (!hStore) { return false; }
-
-  auto result = false;
-  PCCERT_CONTEXT pContext = NULL;
-  while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
-         nullptr) {
-    auto encoded_cert =
-        static_cast<const unsigned char *>(pContext->pbCertEncoded);
-
-    auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded);
-    if (x509) {
-      X509_STORE_add_cert(store, x509);
-      X509_free(x509);
-      result = true;
-    }
-  }
-
-  CertFreeCertificateContext(pContext);
-  CertCloseStore(hStore, 0);
-
-  return result;
-}
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#if TARGET_OS_OSX
-template <typename T>
-using CFObjectPtr =
-    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
-
-inline void cf_object_ptr_deleter(CFTypeRef obj) {
-  if (obj) { CFRelease(obj); }
-}
-
-inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
-  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
-  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
-                        kCFBooleanTrue};
-
-  CFObjectPtr<CFDictionaryRef> query(
-      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
-                         sizeof(keys) / sizeof(keys[0]),
-                         &kCFTypeDictionaryKeyCallBacks,
-                         &kCFTypeDictionaryValueCallBacks),
-      cf_object_ptr_deleter);
-
-  if (!query) { return false; }
-
-  CFTypeRef security_items = nullptr;
-  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
-      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
-    return false;
-  }
-
-  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
-  return true;
-}
-
-inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
-  CFArrayRef root_security_items = nullptr;
-  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
-    return false;
-  }
-
-  certs.reset(root_security_items);
-  return true;
-}
-
-inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
-  auto result = false;
-  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
-    const auto cert = reinterpret_cast<const __SecCertificate *>(
-        CFArrayGetValueAtIndex(certs, i));
-
-    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
-
-    CFDataRef cert_data = nullptr;
-    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
-        errSecSuccess) {
-      continue;
-    }
-
-    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
-
-    auto encoded_cert = static_cast<const unsigned char *>(
-        CFDataGetBytePtr(cert_data_ptr.get()));
-
-    auto x509 =
-        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
-
-    if (x509) {
-      X509_STORE_add_cert(store, x509);
-      X509_free(x509);
-      result = true;
-    }
-  }
-
-  return result;
-}
-
-inline bool load_system_certs_on_macos(X509_STORE *store) {
-  auto result = false;
-  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
-  if (retrieve_certs_from_keychain(certs) && certs) {
-    result = add_certs_to_x509_store(certs.get(), store);
-  }
-
-  if (retrieve_root_certs_from_keychain(certs) && certs) {
-    result = add_certs_to_x509_store(certs.get(), store) || result;
-  }
-
-  return result;
-}
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-#endif // CPPHTTPLIB_OPENSSL_SUPPORT
-
-#ifdef _WIN32
-class WSInit {
-public:
-  WSInit() {
-    WSADATA wsaData;
-    if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true;
-  }
-
-  ~WSInit() {
-    if (is_valid_) WSACleanup();
-  }
-
-  bool is_valid_ = false;
-};
-
-static WSInit wsinit_;
-#endif
-
-inline bool parse_www_authenticate(const Response &res,
-                                   std::map<std::string, std::string> &auth,
-                                   bool is_proxy) {
-  auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
-  if (res.has_header(auth_key)) {
-    static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
-    auto s = res.get_header_value(auth_key);
-    auto pos = s.find(' ');
-    if (pos != std::string::npos) {
-      auto type = s.substr(0, pos);
-      if (type == "Basic") {
-        return false;
-      } else if (type == "Digest") {
-        s = s.substr(pos + 1);
-        auto beg = std::sregex_iterator(s.begin(), s.end(), re);
-        for (auto i = beg; i != std::sregex_iterator(); ++i) {
-          const auto &m = *i;
-          auto key = s.substr(static_cast<size_t>(m.position(1)),
-                              static_cast<size_t>(m.length(1)));
-          auto val = m.length(2) > 0
-                         ? s.substr(static_cast<size_t>(m.position(2)),
-                                    static_cast<size_t>(m.length(2)))
-                         : s.substr(static_cast<size_t>(m.position(3)),
-                                    static_cast<size_t>(m.length(3)));
-          auth[key] = val;
-        }
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-class ContentProviderAdapter {
-public:
-  explicit ContentProviderAdapter(
-      ContentProviderWithoutLength &&content_provider)
-      : content_provider_(content_provider) {}
-
-  bool operator()(size_t offset, size_t, DataSink &sink) {
-    return content_provider_(offset, sink);
-  }
-
-private:
-  ContentProviderWithoutLength content_provider_;
-};
-
-} // namespace detail
-
-inline std::string hosted_at(const std::string &hostname) {
-  std::vector<std::string> addrs;
-  hosted_at(hostname, addrs);
-  if (addrs.empty()) { return std::string(); }
-  return addrs[0];
-}
-
-inline void hosted_at(const std::string &hostname,
-                      std::vector<std::string> &addrs) {
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) {
-#if defined __linux__ && !defined __ANDROID__
-    res_init();
-#endif
-    return;
-  }
-  auto se = detail::scope_exit([&] { freeaddrinfo(result); });
-
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    const auto &addr =
-        *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
-    std::string ip;
-    auto dummy = -1;
-    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
-                                dummy)) {
-      addrs.push_back(ip);
-    }
-  }
-}
-
-inline std::string append_query_params(const std::string &path,
-                                       const Params &params) {
-  std::string path_with_query = path;
-  const static std::regex re("[^?]+\\?.*");
-  auto delm = std::regex_match(path, re) ? '&' : '?';
-  path_with_query += delm + detail::params_to_query_str(params);
-  return path_with_query;
-}
-
-// Header utilities
-inline std::pair<std::string, std::string>
-make_range_header(const Ranges &ranges) {
-  std::string field = "bytes=";
-  auto i = 0;
-  for (const auto &r : ranges) {
-    if (i != 0) { field += ", "; }
-    if (r.first != -1) { field += std::to_string(r.first); }
-    field += '-';
-    if (r.second != -1) { field += std::to_string(r.second); }
-    i++;
-  }
-  return std::make_pair("Range", std::move(field));
-}
-
-inline std::pair<std::string, std::string>
-make_basic_authentication_header(const std::string &username,
-                                 const std::string &password, bool is_proxy) {
-  auto field = "Basic " + detail::base64_encode(username + ":" + password);
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, std::move(field));
-}
-
-inline std::pair<std::string, std::string>
-make_bearer_token_authentication_header(const std::string &token,
-                                        bool is_proxy = false) {
-  auto field = "Bearer " + token;
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, std::move(field));
-}
-
-// Request implementation
-inline bool Request::has_header(const std::string &key) const {
-  return detail::has_header(headers, key);
-}
-
-inline std::string Request::get_header_value(const std::string &key,
-                                             const char *def, size_t id) const {
-  return detail::get_header_value(headers, key, def, id);
-}
-
-inline size_t Request::get_header_value_count(const std::string &key) const {
-  auto r = headers.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline void Request::set_header(const std::string &key,
-                                const std::string &val) {
-  if (detail::fields::is_field_name(key) &&
-      detail::fields::is_field_value(val)) {
-    headers.emplace(key, val);
-  }
-}
-
-inline bool Request::has_param(const std::string &key) const {
-  return params.find(key) != params.end();
-}
-
-inline std::string Request::get_param_value(const std::string &key,
-                                            size_t id) const {
-  auto rng = params.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) { return it->second; }
-  return std::string();
-}
-
-inline size_t Request::get_param_value_count(const std::string &key) const {
-  auto r = params.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline bool Request::is_multipart_form_data() const {
-  const auto &content_type = get_header_value("Content-Type");
-  return !content_type.rfind("multipart/form-data", 0);
-}
-
-inline bool Request::has_file(const std::string &key) const {
-  return files.find(key) != files.end();
-}
-
-inline MultipartFormData Request::get_file_value(const std::string &key) const {
-  auto it = files.find(key);
-  if (it != files.end()) { return it->second; }
-  return MultipartFormData();
-}
-
-inline std::vector<MultipartFormData>
-Request::get_file_values(const std::string &key) const {
-  std::vector<MultipartFormData> values;
-  auto rng = files.equal_range(key);
-  for (auto it = rng.first; it != rng.second; it++) {
-    values.push_back(it->second);
-  }
-  return values;
-}
-
-// Response implementation
-inline bool Response::has_header(const std::string &key) const {
-  return headers.find(key) != headers.end();
-}
-
-inline std::string Response::get_header_value(const std::string &key,
-                                              const char *def,
-                                              size_t id) const {
-  return detail::get_header_value(headers, key, def, id);
-}
-
-inline size_t Response::get_header_value_count(const std::string &key) const {
-  auto r = headers.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline void Response::set_header(const std::string &key,
-                                 const std::string &val) {
-  if (detail::fields::is_field_name(key) &&
-      detail::fields::is_field_value(val)) {
-    headers.emplace(key, val);
-  }
-}
-
-inline void Response::set_redirect(const std::string &url, int stat) {
-  if (detail::fields::is_field_value(url)) {
-    set_header("Location", url);
-    if (300 <= stat && stat < 400) {
-      this->status = stat;
-    } else {
-      this->status = StatusCode::Found_302;
-    }
-  }
-}
-
-inline void Response::set_content(const char *s, size_t n,
-                                  const std::string &content_type) {
-  body.assign(s, n);
-
-  auto rng = headers.equal_range("Content-Type");
-  headers.erase(rng.first, rng.second);
-  set_header("Content-Type", content_type);
-}
-
-inline void Response::set_content(const std::string &s,
-                                  const std::string &content_type) {
-  set_content(s.data(), s.size(), content_type);
-}
-
-inline void Response::set_content(std::string &&s,
-                                  const std::string &content_type) {
-  body = std::move(s);
-
-  auto rng = headers.equal_range("Content-Type");
-  headers.erase(rng.first, rng.second);
-  set_header("Content-Type", content_type);
-}
-
-inline void Response::set_content_provider(
-    size_t in_length, const std::string &content_type, ContentProvider provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = in_length;
-  if (in_length > 0) { content_provider_ = std::move(provider); }
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = false;
-}
-
-inline void Response::set_content_provider(
-    const std::string &content_type, ContentProviderWithoutLength provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = 0;
-  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = false;
-}
-
-inline void Response::set_chunked_content_provider(
-    const std::string &content_type, ContentProviderWithoutLength provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = 0;
-  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = true;
-}
-
-inline void Response::set_file_content(const std::string &path,
-                                       const std::string &content_type) {
-  file_content_path_ = path;
-  file_content_content_type_ = content_type;
-}
-
-inline void Response::set_file_content(const std::string &path) {
-  file_content_path_ = path;
-}
-
-// Result implementation
-inline bool Result::has_request_header(const std::string &key) const {
-  return request_headers_.find(key) != request_headers_.end();
-}
-
-inline std::string Result::get_request_header_value(const std::string &key,
-                                                    const char *def,
-                                                    size_t id) const {
-  return detail::get_header_value(request_headers_, key, def, id);
-}
-
-inline size_t
-Result::get_request_header_value_count(const std::string &key) const {
-  auto r = request_headers_.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-// Stream implementation
-inline ssize_t Stream::write(const char *ptr) {
-  return write(ptr, strlen(ptr));
-}
-
-inline ssize_t Stream::write(const std::string &s) {
-  return write(s.data(), s.size());
-}
-
-namespace detail {
-
-inline void calc_actual_timeout(time_t max_timeout_msec,
-                                time_t duration_msec, time_t timeout_sec,
-                                time_t timeout_usec, time_t &actual_timeout_sec,
-                                time_t &actual_timeout_usec) {
-  auto timeout_msec = (timeout_sec * 1000) + (timeout_usec / 1000);
-
-  auto actual_timeout_msec =
-      std::min(max_timeout_msec - duration_msec, timeout_msec);
-
-  actual_timeout_sec = actual_timeout_msec / 1000;
-  actual_timeout_usec = (actual_timeout_msec % 1000) * 1000;
-}
-
-// Socket stream implementation
-inline SocketStream::SocketStream(
-    socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-    time_t write_timeout_sec, time_t write_timeout_usec,
-    time_t max_timeout_msec,
-    std::chrono::time_point<std::chrono::steady_clock> start_time)
-    : sock_(sock), read_timeout_sec_(read_timeout_sec),
-      read_timeout_usec_(read_timeout_usec),
-      write_timeout_sec_(write_timeout_sec),
-      write_timeout_usec_(write_timeout_usec),
-      max_timeout_msec_(max_timeout_msec), start_time(start_time),
-      read_buff_(read_buff_size_, 0) {}
-
-inline SocketStream::~SocketStream() = default;
-
-inline bool SocketStream::is_readable() const {
-  if (max_timeout_msec_ <= 0) {
-    return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
-  }
-
-  time_t read_timeout_sec;
-  time_t read_timeout_usec;
-  calc_actual_timeout(max_timeout_msec_, duration(), read_timeout_sec_,
-                      read_timeout_usec_, read_timeout_sec, read_timeout_usec);
-
-  return select_read(sock_, read_timeout_sec, read_timeout_usec) > 0;
-}
-
-inline bool SocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
-         is_socket_alive(sock_);
-}
-
-inline ssize_t SocketStream::read(char *ptr, size_t size) {
-#ifdef _WIN32
-  size =
-      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
-#else
-  size = (std::min)(size,
-                    static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
-#endif
-
-  if (read_buff_off_ < read_buff_content_size_) {
-    auto remaining_size = read_buff_content_size_ - read_buff_off_;
-    if (size <= remaining_size) {
-      memcpy(ptr, read_buff_.data() + read_buff_off_, size);
-      read_buff_off_ += size;
-      return static_cast<ssize_t>(size);
-    } else {
-      memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size);
-      read_buff_off_ += remaining_size;
-      return static_cast<ssize_t>(remaining_size);
-    }
-  }
-
-  if (!is_readable()) { return -1; }
-
-  read_buff_off_ = 0;
-  read_buff_content_size_ = 0;
-
-  if (size < read_buff_size_) {
-    auto n = read_socket(sock_, read_buff_.data(), read_buff_size_,
-                         CPPHTTPLIB_RECV_FLAGS);
-    if (n <= 0) {
-      return n;
-    } else if (n <= static_cast<ssize_t>(size)) {
-      memcpy(ptr, read_buff_.data(), static_cast<size_t>(n));
-      return n;
-    } else {
-      memcpy(ptr, read_buff_.data(), size);
-      read_buff_off_ = size;
-      read_buff_content_size_ = static_cast<size_t>(n);
-      return static_cast<ssize_t>(size);
-    }
-  } else {
-    return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS);
-  }
-}
-
-inline ssize_t SocketStream::write(const char *ptr, size_t size) {
-  if (!is_writable()) { return -1; }
-
-#if defined(_WIN32) && !defined(_WIN64)
-  size =
-      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
-#endif
-
-  return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
-}
-
-inline void SocketStream::get_remote_ip_and_port(std::string &ip,
-                                                 int &port) const {
-  return detail::get_remote_ip_and_port(sock_, ip, port);
-}
-
-inline void SocketStream::get_local_ip_and_port(std::string &ip,
-                                                int &port) const {
-  return detail::get_local_ip_and_port(sock_, ip, port);
-}
-
-inline socket_t SocketStream::socket() const { return sock_; }
-
-inline time_t SocketStream::duration() const {
-  return std::chrono::duration_cast<std::chrono::milliseconds>(
-             std::chrono::steady_clock::now() - start_time)
-      .count();
-}
-
-// Buffer stream implementation
-inline bool BufferStream::is_readable() const { return true; }
-
-inline bool BufferStream::is_writable() const { return true; }
-
-inline ssize_t BufferStream::read(char *ptr, size_t size) {
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  auto len_read = buffer._Copy_s(ptr, size, size, position);
-#else
-  auto len_read = buffer.copy(ptr, size, position);
-#endif
-  position += static_cast<size_t>(len_read);
-  return static_cast<ssize_t>(len_read);
-}
-
-inline ssize_t BufferStream::write(const char *ptr, size_t size) {
-  buffer.append(ptr, size);
-  return static_cast<ssize_t>(size);
-}
-
-inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
-                                                 int & /*port*/) const {}
-
-inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
-                                                int & /*port*/) const {}
-
-inline socket_t BufferStream::socket() const { return 0; }
-
-inline time_t BufferStream::duration() const { return 0; }
-
-inline const std::string &BufferStream::get_buffer() const { return buffer; }
-
-inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
-  static constexpr char marker[] = "/:";
-
-  // One past the last ending position of a path param substring
-  std::size_t last_param_end = 0;
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-  // Needed to ensure that parameter names are unique during matcher
-  // construction
-  // If exceptions are disabled, only last duplicate path
-  // parameter will be set
-  std::unordered_set<std::string> param_name_set;
-#endif
-
-  while (true) {
-    const auto marker_pos = pattern.find(
-        marker, last_param_end == 0 ? last_param_end : last_param_end - 1);
-    if (marker_pos == std::string::npos) { break; }
-
-    static_fragments_.push_back(
-        pattern.substr(last_param_end, marker_pos - last_param_end + 1));
-
-    const auto param_name_start = marker_pos + 2;
-
-    auto sep_pos = pattern.find(separator, param_name_start);
-    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
-
-    auto param_name =
-        pattern.substr(param_name_start, sep_pos - param_name_start);
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-    if (param_name_set.find(param_name) != param_name_set.cend()) {
-      std::string msg = "Encountered path parameter '" + param_name +
-                        "' multiple times in route pattern '" + pattern + "'.";
-      throw std::invalid_argument(msg);
-    }
-#endif
-
-    param_names_.push_back(std::move(param_name));
-
-    last_param_end = sep_pos + 1;
-  }
-
-  if (last_param_end < pattern.length()) {
-    static_fragments_.push_back(pattern.substr(last_param_end));
-  }
-}
-
-inline bool PathParamsMatcher::match(Request &request) const {
-  request.matches = std::smatch();
-  request.path_params.clear();
-  request.path_params.reserve(param_names_.size());
-
-  // One past the position at which the path matched the pattern last time
-  std::size_t starting_pos = 0;
-  for (size_t i = 0; i < static_fragments_.size(); ++i) {
-    const auto &fragment = static_fragments_[i];
-
-    if (starting_pos + fragment.length() > request.path.length()) {
-      return false;
-    }
-
-    // Avoid unnecessary allocation by using strncmp instead of substr +
-    // comparison
-    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
-                     fragment.length()) != 0) {
-      return false;
-    }
-
-    starting_pos += fragment.length();
-
-    // Should only happen when we have a static fragment after a param
-    // Example: '/users/:id/subscriptions'
-    // The 'subscriptions' fragment here does not have a corresponding param
-    if (i >= param_names_.size()) { continue; }
-
-    auto sep_pos = request.path.find(separator, starting_pos);
-    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
-
-    const auto &param_name = param_names_[i];
-
-    request.path_params.emplace(
-        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
-
-    // Mark everything up to '/' as matched
-    starting_pos = sep_pos + 1;
-  }
-  // Returns false if the path is longer than the pattern
-  return starting_pos >= request.path.length();
-}
-
-inline bool RegexMatcher::match(Request &request) const {
-  request.path_params.clear();
-  return std::regex_match(request.path, request.matches, regex_);
-}
-
-} // namespace detail
-
-// HTTP server implementation
-inline Server::Server()
-    : new_task_queue(
-          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
-#ifndef _WIN32
-  signal(SIGPIPE, SIG_IGN);
-#endif
-}
-
-inline Server::~Server() = default;
-
-inline std::unique_ptr<detail::MatcherBase>
-Server::make_matcher(const std::string &pattern) {
-  if (pattern.find("/:") != std::string::npos) {
-    return detail::make_unique<detail::PathParamsMatcher>(pattern);
-  } else {
-    return detail::make_unique<detail::RegexMatcher>(pattern);
-  }
-}
-
-inline Server &Server::Get(const std::string &pattern, Handler handler) {
-  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Post(const std::string &pattern, Handler handler) {
-  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Post(const std::string &pattern,
-                            HandlerWithContentReader handler) {
-  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                 std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Put(const std::string &pattern, Handler handler) {
-  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Put(const std::string &pattern,
-                           HandlerWithContentReader handler) {
-  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Patch(const std::string &pattern, Handler handler) {
-  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Patch(const std::string &pattern,
-                             HandlerWithContentReader handler) {
-  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                  std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Delete(const std::string &pattern, Handler handler) {
-  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Delete(const std::string &pattern,
-                              HandlerWithContentReader handler) {
-  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                   std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Options(const std::string &pattern, Handler handler) {
-  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline bool Server::set_base_dir(const std::string &dir,
-                                 const std::string &mount_point) {
-  return set_mount_point(mount_point, dir);
-}
-
-inline bool Server::set_mount_point(const std::string &mount_point,
-                                    const std::string &dir, Headers headers) {
-  detail::FileStat stat(dir);
-  if (stat.is_dir()) {
-    std::string mnt = !mount_point.empty() ? mount_point : "/";
-    if (!mnt.empty() && mnt[0] == '/') {
-      base_dirs_.push_back({mnt, dir, std::move(headers)});
-      return true;
-    }
-  }
-  return false;
-}
-
-inline bool Server::remove_mount_point(const std::string &mount_point) {
-  for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
-    if (it->mount_point == mount_point) {
-      base_dirs_.erase(it);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline Server &
-Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
-                                                const std::string &mime) {
-  file_extension_and_mimetype_map_[ext] = mime;
-  return *this;
-}
-
-inline Server &Server::set_default_file_mimetype(const std::string &mime) {
-  default_file_mimetype_ = mime;
-  return *this;
-}
-
-inline Server &Server::set_file_request_handler(Handler handler) {
-  file_request_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_error_handler_core(HandlerWithResponse handler,
-                                              std::true_type) {
-  error_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_error_handler_core(Handler handler,
-                                              std::false_type) {
-  error_handler_ = [handler](const Request &req, Response &res) {
-    handler(req, res);
-    return HandlerResponse::Handled;
-  };
-  return *this;
-}
-
-inline Server &Server::set_exception_handler(ExceptionHandler handler) {
-  exception_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) {
-  pre_routing_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_post_routing_handler(Handler handler) {
-  post_routing_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_logger(Logger logger) {
-  logger_ = std::move(logger);
-  return *this;
-}
-
-inline Server &
-Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
-  expect_100_continue_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_address_family(int family) {
-  address_family_ = family;
-  return *this;
-}
-
-inline Server &Server::set_tcp_nodelay(bool on) {
-  tcp_nodelay_ = on;
-  return *this;
-}
-
-inline Server &Server::set_ipv6_v6only(bool on) {
-  ipv6_v6only_ = on;
-  return *this;
-}
-
-inline Server &Server::set_socket_options(SocketOptions socket_options) {
-  socket_options_ = std::move(socket_options);
-  return *this;
-}
-
-inline Server &Server::set_default_headers(Headers headers) {
-  default_headers_ = std::move(headers);
-  return *this;
-}
-
-inline Server &Server::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  header_writer_ = writer;
-  return *this;
-}
-
-inline Server &Server::set_keep_alive_max_count(size_t count) {
-  keep_alive_max_count_ = count;
-  return *this;
-}
-
-inline Server &Server::set_keep_alive_timeout(time_t sec) {
-  keep_alive_timeout_sec_ = sec;
-  return *this;
-}
-
-inline Server &Server::set_read_timeout(time_t sec, time_t usec) {
-  read_timeout_sec_ = sec;
-  read_timeout_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_write_timeout(time_t sec, time_t usec) {
-  write_timeout_sec_ = sec;
-  write_timeout_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_idle_interval(time_t sec, time_t usec) {
-  idle_interval_sec_ = sec;
-  idle_interval_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_payload_max_length(size_t length) {
-  payload_max_length_ = length;
-  return *this;
-}
-
-inline bool Server::bind_to_port(const std::string &host, int port,
-                                 int socket_flags) {
-  auto ret = bind_internal(host, port, socket_flags);
-  if (ret == -1) { is_decommisioned = true; }
-  return ret >= 0;
-}
-inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
-  auto ret = bind_internal(host, 0, socket_flags);
-  if (ret == -1) { is_decommisioned = true; }
-  return ret;
-}
-
-inline bool Server::listen_after_bind() { return listen_internal(); }
-
-inline bool Server::listen(const std::string &host, int port,
-                           int socket_flags) {
-  return bind_to_port(host, port, socket_flags) && listen_internal();
-}
-
-inline bool Server::is_running() const { return is_running_; }
-
-inline void Server::wait_until_ready() const {
-  while (!is_running_ && !is_decommisioned) {
-    std::this_thread::sleep_for(std::chrono::milliseconds{1});
-  }
-}
-
-inline void Server::stop() {
-  if (is_running_) {
-    assert(svr_sock_ != INVALID_SOCKET);
-    std::atomic<socket_t> sock(svr_sock_.exchange(INVALID_SOCKET));
-    detail::shutdown_socket(sock);
-    detail::close_socket(sock);
-  }
-  is_decommisioned = false;
-}
-
-inline void Server::decommission() { is_decommisioned = true; }
-
-inline bool Server::parse_request_line(const char *s, Request &req) const {
-  auto len = strlen(s);
-  if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
-  len -= 2;
-
-  {
-    size_t count = 0;
-
-    detail::split(s, s + len, ' ', [&](const char *b, const char *e) {
-      switch (count) {
-      case 0: req.method = std::string(b, e); break;
-      case 1: req.target = std::string(b, e); break;
-      case 2: req.version = std::string(b, e); break;
-      default: break;
-      }
-      count++;
-    });
-
-    if (count != 3) { return false; }
-  }
-
-  static const std::set<std::string> methods{
-      "GET",     "HEAD",    "POST",  "PUT",   "DELETE",
-      "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"};
-
-  if (methods.find(req.method) == methods.end()) { return false; }
-
-  if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { return false; }
-
-  {
-    // Skip URL fragment
-    for (size_t i = 0; i < req.target.size(); i++) {
-      if (req.target[i] == '#') {
-        req.target.erase(i);
-        break;
-      }
-    }
-
-    detail::divide(req.target, '?',
-                   [&](const char *lhs_data, std::size_t lhs_size,
-                       const char *rhs_data, std::size_t rhs_size) {
-                     req.path = detail::decode_url(
-                         std::string(lhs_data, lhs_size), false);
-                     detail::parse_query_text(rhs_data, rhs_size, req.params);
-                   });
-  }
-
-  return true;
-}
-
-inline bool Server::write_response(Stream &strm, bool close_connection,
-                                   Request &req, Response &res) {
-  // NOTE: `req.ranges` should be empty, otherwise it will be applied
-  // incorrectly to the error content.
-  req.ranges.clear();
-  return write_response_core(strm, close_connection, req, res, false);
-}
-
-inline bool Server::write_response_with_content(Stream &strm,
-                                                bool close_connection,
-                                                const Request &req,
-                                                Response &res) {
-  return write_response_core(strm, close_connection, req, res, true);
-}
-
-inline bool Server::write_response_core(Stream &strm, bool close_connection,
-                                        const Request &req, Response &res,
-                                        bool need_apply_ranges) {
-  assert(res.status != -1);
-
-  if (400 <= res.status && error_handler_ &&
-      error_handler_(req, res) == HandlerResponse::Handled) {
-    need_apply_ranges = true;
-  }
-
-  std::string content_type;
-  std::string boundary;
-  if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
-
-  // Prepare additional headers
-  if (close_connection || req.get_header_value("Connection") == "close") {
-    res.set_header("Connection", "close");
-  } else {
-    std::string s = "timeout=";
-    s += std::to_string(keep_alive_timeout_sec_);
-    s += ", max=";
-    s += std::to_string(keep_alive_max_count_);
-    res.set_header("Keep-Alive", s);
-  }
-
-  if ((!res.body.empty() || res.content_length_ > 0 || res.content_provider_) &&
-      !res.has_header("Content-Type")) {
-    res.set_header("Content-Type", "text/plain");
-  }
-
-  if (res.body.empty() && !res.content_length_ && !res.content_provider_ &&
-      !res.has_header("Content-Length")) {
-    res.set_header("Content-Length", "0");
-  }
-
-  if (req.method == "HEAD" && !res.has_header("Accept-Ranges")) {
-    res.set_header("Accept-Ranges", "bytes");
-  }
-
-  if (post_routing_handler_) { post_routing_handler_(req, res); }
-
-  // Response line and headers
-  {
-    detail::BufferStream bstrm;
-    if (!detail::write_response_line(bstrm, res.status)) { return false; }
-    if (!header_writer_(bstrm, res.headers)) { return false; }
-
-    // Flush buffer
-    auto &data = bstrm.get_buffer();
-    detail::write_data(strm, data.data(), data.size());
-  }
-
-  // Body
-  auto ret = true;
-  if (req.method != "HEAD") {
-    if (!res.body.empty()) {
-      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
-        ret = false;
-      }
-    } else if (res.content_provider_) {
-      if (write_content_with_provider(strm, req, res, boundary, content_type)) {
-        res.content_provider_success_ = true;
-      } else {
-        ret = false;
-      }
-    }
-  }
-
-  // Log
-  if (logger_) { logger_(req, res); }
-
-  return ret;
-}
-
-inline bool
-Server::write_content_with_provider(Stream &strm, const Request &req,
-                                    Response &res, const std::string &boundary,
-                                    const std::string &content_type) {
-  auto is_shutting_down = [this]() {
-    return this->svr_sock_ == INVALID_SOCKET;
-  };
-
-  if (res.content_length_ > 0) {
-    if (req.ranges.empty()) {
-      return detail::write_content(strm, res.content_provider_, 0,
-                                   res.content_length_, is_shutting_down);
-    } else if (req.ranges.size() == 1) {
-      auto offset_and_length = detail::get_range_offset_and_length(
-          req.ranges[0], res.content_length_);
-
-      return detail::write_content(strm, res.content_provider_,
-                                   offset_and_length.first,
-                                   offset_and_length.second, is_shutting_down);
-    } else {
-      return detail::write_multipart_ranges_data(
-          strm, req, res, boundary, content_type, res.content_length_,
-          is_shutting_down);
-    }
-  } else {
-    if (res.is_chunked_content_provider_) {
-      auto type = detail::encoding_type(req, res);
-
-      std::unique_ptr<detail::compressor> compressor;
-      if (type == detail::EncodingType::Gzip) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        compressor = detail::make_unique<detail::gzip_compressor>();
-#endif
-      } else if (type == detail::EncodingType::Brotli) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-        compressor = detail::make_unique<detail::brotli_compressor>();
-#endif
-      } else {
-        compressor = detail::make_unique<detail::nocompressor>();
-      }
-      assert(compressor != nullptr);
-
-      return detail::write_content_chunked(strm, res.content_provider_,
-                                           is_shutting_down, *compressor);
-    } else {
-      return detail::write_content_without_length(strm, res.content_provider_,
-                                                  is_shutting_down);
-    }
-  }
-}
-
-inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
-  MultipartFormDataMap::iterator cur;
-  auto file_count = 0;
-  if (read_content_core(
-          strm, req, res,
-          // Regular
-          [&](const char *buf, size_t n) {
-            if (req.body.size() + n > req.body.max_size()) { return false; }
-            req.body.append(buf, n);
-            return true;
-          },
-          // Multipart
-          [&](const MultipartFormData &file) {
-            if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
-              return false;
-            }
-            cur = req.files.emplace(file.name, file);
-            return true;
-          },
-          [&](const char *buf, size_t n) {
-            auto &content = cur->second.content;
-            if (content.size() + n > content.max_size()) { return false; }
-            content.append(buf, n);
-            return true;
-          })) {
-    const auto &content_type = req.get_header_value("Content-Type");
-    if (!content_type.find("application/x-www-form-urlencoded")) {
-      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
-        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
-        return false;
-      }
-      detail::parse_query_text(req.body, req.params);
-    }
-    return true;
-  }
-  return false;
-}
-
-inline bool Server::read_content_with_content_receiver(
-    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
-    MultipartContentHeader multipart_header,
-    ContentReceiver multipart_receiver) {
-  return read_content_core(strm, req, res, std::move(receiver),
-                           std::move(multipart_header),
-                           std::move(multipart_receiver));
-}
-
-inline bool
-Server::read_content_core(Stream &strm, Request &req, Response &res,
-                          ContentReceiver receiver,
-                          MultipartContentHeader multipart_header,
-                          ContentReceiver multipart_receiver) const {
-  detail::MultipartFormDataParser multipart_form_data_parser;
-  ContentReceiverWithProgress out;
-
-  if (req.is_multipart_form_data()) {
-    const auto &content_type = req.get_header_value("Content-Type");
-    std::string boundary;
-    if (!detail::parse_multipart_boundary(content_type, boundary)) {
-      res.status = StatusCode::BadRequest_400;
-      return false;
-    }
-
-    multipart_form_data_parser.set_boundary(std::move(boundary));
-    out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) {
-      /* For debug
-      size_t pos = 0;
-      while (pos < n) {
-        auto read_size = (std::min)<size_t>(1, n - pos);
-        auto ret = multipart_form_data_parser.parse(
-            buf + pos, read_size, multipart_receiver, multipart_header);
-        if (!ret) { return false; }
-        pos += read_size;
-      }
-      return true;
-      */
-      return multipart_form_data_parser.parse(buf, n, multipart_receiver,
-                                              multipart_header);
-    };
-  } else {
-    out = [receiver](const char *buf, size_t n, uint64_t /*off*/,
-                     uint64_t /*len*/) { return receiver(buf, n); };
-  }
-
-  if (req.method == "DELETE" && !req.has_header("Content-Length")) {
-    return true;
-  }
-
-  if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
-                            out, true)) {
-    return false;
-  }
-
-  if (req.is_multipart_form_data()) {
-    if (!multipart_form_data_parser.is_valid()) {
-      res.status = StatusCode::BadRequest_400;
-      return false;
-    }
-  }
-
-  return true;
-}
-
-inline bool Server::handle_file_request(const Request &req, Response &res,
-                                        bool head) {
-  for (const auto &entry : base_dirs_) {
-    // Prefix match
-    if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
-      std::string sub_path = "/" + req.path.substr(entry.mount_point.size());
-      if (detail::is_valid_path(sub_path)) {
-        auto path = entry.base_dir + sub_path;
-        if (path.back() == '/') { path += "index.html"; }
-
-        detail::FileStat stat(path);
-
-        if (stat.is_dir()) {
-          res.set_redirect(sub_path + "/", StatusCode::MovedPermanently_301);
-          return true;
-        }
-
-        if (stat.is_file()) {
-          for (const auto &kv : entry.headers) {
-            res.set_header(kv.first, kv.second);
-          }
-
-          auto mm = std::make_shared<detail::mmap>(path.c_str());
-          if (!mm->is_open()) { return false; }
-
-          res.set_content_provider(
-              mm->size(),
-              detail::find_content_type(path, file_extension_and_mimetype_map_,
-                                        default_file_mimetype_),
-              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
-                sink.write(mm->data() + offset, length);
-                return true;
-              });
-
-          if (!head && file_request_handler_) {
-            file_request_handler_(req, res);
-          }
-
-          return true;
-        }
-      }
-    }
-  }
-  return false;
-}
-
-inline socket_t
-Server::create_server_socket(const std::string &host, int port,
-                             int socket_flags,
-                             SocketOptions socket_options) const {
-  return detail::create_socket(
-      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
-      ipv6_v6only_, std::move(socket_options),
-      [](socket_t sock, struct addrinfo &ai, bool & /*quit*/) -> bool {
-        if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
-          return false;
-        }
-        if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) { return false; }
-        return true;
-      });
-}
-
-inline int Server::bind_internal(const std::string &host, int port,
-                                 int socket_flags) {
-  if (is_decommisioned) { return -1; }
-
-  if (!is_valid()) { return -1; }
-
-  svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
-  if (svr_sock_ == INVALID_SOCKET) { return -1; }
-
-  if (port == 0) {
-    struct sockaddr_storage addr;
-    socklen_t addr_len = sizeof(addr);
-    if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&addr),
-                    &addr_len) == -1) {
-      return -1;
-    }
-    if (addr.ss_family == AF_INET) {
-      return ntohs(reinterpret_cast<struct sockaddr_in *>(&addr)->sin_port);
-    } else if (addr.ss_family == AF_INET6) {
-      return ntohs(reinterpret_cast<struct sockaddr_in6 *>(&addr)->sin6_port);
-    } else {
-      return -1;
-    }
-  } else {
-    return port;
-  }
-}
-
-inline bool Server::listen_internal() {
-  if (is_decommisioned) { return false; }
-
-  auto ret = true;
-  is_running_ = true;
-  auto se = detail::scope_exit([&]() { is_running_ = false; });
-
-  {
-    std::unique_ptr<TaskQueue> task_queue(new_task_queue());
-
-    while (svr_sock_ != INVALID_SOCKET) {
-#ifndef _WIN32
-      if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
-#endif
-        auto val = detail::select_read(svr_sock_, idle_interval_sec_,
-                                       idle_interval_usec_);
-        if (val == 0) { // Timeout
-          task_queue->on_idle();
-          continue;
-        }
-#ifndef _WIN32
-      }
-#endif
-
-#if defined _WIN32
-      // sockets conneced via WASAccept inherit flags NO_HANDLE_INHERIT,
-      // OVERLAPPED
-      socket_t sock = WSAAccept(svr_sock_, nullptr, nullptr, nullptr, 0);
-#elif defined SOCK_CLOEXEC
-      socket_t sock = accept4(svr_sock_, nullptr, nullptr, SOCK_CLOEXEC);
-#else
-      socket_t sock = accept(svr_sock_, nullptr, nullptr);
-#endif
-
-      if (sock == INVALID_SOCKET) {
-        if (errno == EMFILE) {
-          // The per-process limit of open file descriptors has been reached.
-          // Try to accept new connections after a short sleep.
-          std::this_thread::sleep_for(std::chrono::microseconds{1});
-          continue;
-        } else if (errno == EINTR || errno == EAGAIN) {
-          continue;
-        }
-        if (svr_sock_ != INVALID_SOCKET) {
-          detail::close_socket(svr_sock_);
-          ret = false;
-        } else {
-          ; // The server socket was closed by user.
-        }
-        break;
-      }
-
-      {
-#ifdef _WIN32
-        auto timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 +
-                                             read_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-        timeval tv;
-        tv.tv_sec = static_cast<long>(read_timeout_sec_);
-        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                   reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-      }
-      {
-
-#ifdef _WIN32
-        auto timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 +
-                                             write_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-        timeval tv;
-        tv.tv_sec = static_cast<long>(write_timeout_sec_);
-        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                   reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-      }
-
-      if (!task_queue->enqueue(
-              [this, sock]() { process_and_close_socket(sock); })) {
-        detail::shutdown_socket(sock);
-        detail::close_socket(sock);
-      }
-    }
-
-    task_queue->shutdown();
-  }
-
-  is_decommisioned = !ret;
-  return ret;
-}
-
-inline bool Server::routing(Request &req, Response &res, Stream &strm) {
-  if (pre_routing_handler_ &&
-      pre_routing_handler_(req, res) == HandlerResponse::Handled) {
-    return true;
-  }
-
-  // File handler
-  auto is_head_request = req.method == "HEAD";
-  if ((req.method == "GET" || is_head_request) &&
-      handle_file_request(req, res, is_head_request)) {
-    return true;
-  }
-
-  if (detail::expect_content(req)) {
-    // Content reader handler
-    {
-      ContentReader reader(
-          [&](ContentReceiver receiver) {
-            return read_content_with_content_receiver(
-                strm, req, res, std::move(receiver), nullptr, nullptr);
-          },
-          [&](MultipartContentHeader header, ContentReceiver receiver) {
-            return read_content_with_content_receiver(strm, req, res, nullptr,
-                                                      std::move(header),
-                                                      std::move(receiver));
-          });
-
-      if (req.method == "POST") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                post_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "PUT") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                put_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "PATCH") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                patch_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "DELETE") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                delete_handlers_for_content_reader_)) {
-          return true;
-        }
-      }
-    }
-
-    // Read content into `req.body`
-    if (!read_content(strm, req, res)) { return false; }
-  }
-
-  // Regular handler
-  if (req.method == "GET" || req.method == "HEAD") {
-    return dispatch_request(req, res, get_handlers_);
-  } else if (req.method == "POST") {
-    return dispatch_request(req, res, post_handlers_);
-  } else if (req.method == "PUT") {
-    return dispatch_request(req, res, put_handlers_);
-  } else if (req.method == "DELETE") {
-    return dispatch_request(req, res, delete_handlers_);
-  } else if (req.method == "OPTIONS") {
-    return dispatch_request(req, res, options_handlers_);
-  } else if (req.method == "PATCH") {
-    return dispatch_request(req, res, patch_handlers_);
-  }
-
-  res.status = StatusCode::BadRequest_400;
-  return false;
-}
-
-inline bool Server::dispatch_request(Request &req, Response &res,
-                                     const Handlers &handlers) const {
-  for (const auto &x : handlers) {
-    const auto &matcher = x.first;
-    const auto &handler = x.second;
-
-    if (matcher->match(req)) {
-      handler(req, res);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline void Server::apply_ranges(const Request &req, Response &res,
-                                 std::string &content_type,
-                                 std::string &boundary) const {
-  if (req.ranges.size() > 1 && res.status == StatusCode::PartialContent_206) {
-    auto it = res.headers.find("Content-Type");
-    if (it != res.headers.end()) {
-      content_type = it->second;
-      res.headers.erase(it);
-    }
-
-    boundary = detail::make_multipart_data_boundary();
-
-    res.set_header("Content-Type",
-                   "multipart/byteranges; boundary=" + boundary);
-  }
-
-  auto type = detail::encoding_type(req, res);
-
-  if (res.body.empty()) {
-    if (res.content_length_ > 0) {
-      size_t length = 0;
-      if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
-        length = res.content_length_;
-      } else if (req.ranges.size() == 1) {
-        auto offset_and_length = detail::get_range_offset_and_length(
-            req.ranges[0], res.content_length_);
-
-        length = offset_and_length.second;
-
-        auto content_range = detail::make_content_range_header_field(
-            offset_and_length, res.content_length_);
-        res.set_header("Content-Range", content_range);
-      } else {
-        length = detail::get_multipart_ranges_data_length(
-            req, boundary, content_type, res.content_length_);
-      }
-      res.set_header("Content-Length", std::to_string(length));
-    } else {
-      if (res.content_provider_) {
-        if (res.is_chunked_content_provider_) {
-          res.set_header("Transfer-Encoding", "chunked");
-          if (type == detail::EncodingType::Gzip) {
-            res.set_header("Content-Encoding", "gzip");
-          } else if (type == detail::EncodingType::Brotli) {
-            res.set_header("Content-Encoding", "br");
-          }
-        }
-      }
-    }
-  } else {
-    if (req.ranges.empty() || res.status != StatusCode::PartialContent_206) {
-      ;
-    } else if (req.ranges.size() == 1) {
-      auto offset_and_length =
-          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
-      auto offset = offset_and_length.first;
-      auto length = offset_and_length.second;
-
-      auto content_range = detail::make_content_range_header_field(
-          offset_and_length, res.body.size());
-      res.set_header("Content-Range", content_range);
-
-      assert(offset + length <= res.body.size());
-      res.body = res.body.substr(offset, length);
-    } else {
-      std::string data;
-      detail::make_multipart_ranges_data(req, res, boundary, content_type,
-                                         res.body.size(), data);
-      res.body.swap(data);
-    }
-
-    if (type != detail::EncodingType::None) {
-      std::unique_ptr<detail::compressor> compressor;
-      std::string content_encoding;
-
-      if (type == detail::EncodingType::Gzip) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        compressor = detail::make_unique<detail::gzip_compressor>();
-        content_encoding = "gzip";
-#endif
-      } else if (type == detail::EncodingType::Brotli) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-        compressor = detail::make_unique<detail::brotli_compressor>();
-        content_encoding = "br";
-#endif
-      }
-
-      if (compressor) {
-        std::string compressed;
-        if (compressor->compress(res.body.data(), res.body.size(), true,
-                                 [&](const char *data, size_t data_len) {
-                                   compressed.append(data, data_len);
-                                   return true;
-                                 })) {
-          res.body.swap(compressed);
-          res.set_header("Content-Encoding", content_encoding);
-        }
-      }
-    }
-
-    auto length = std::to_string(res.body.size());
-    res.set_header("Content-Length", length);
-  }
-}
-
-inline bool Server::dispatch_request_for_content_reader(
-    Request &req, Response &res, ContentReader content_reader,
-    const HandlersForContentReader &handlers) const {
-  for (const auto &x : handlers) {
-    const auto &matcher = x.first;
-    const auto &handler = x.second;
-
-    if (matcher->match(req)) {
-      handler(req, res, content_reader);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline bool
-Server::process_request(Stream &strm, const std::string &remote_addr,
-                        int remote_port, const std::string &local_addr,
-                        int local_port, bool close_connection,
-                        bool &connection_closed,
-                        const std::function<void(Request &)> &setup_request) {
-  std::array<char, 2048> buf{};
-
-  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
-
-  // Connection has been closed on client
-  if (!line_reader.getline()) { return false; }
-
-  Request req;
-
-  Response res;
-  res.version = "HTTP/1.1";
-  res.headers = default_headers_;
-
-#ifdef _WIN32
-  // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL).
-#else
-#ifndef CPPHTTPLIB_USE_POLL
-  // Socket file descriptor exceeded FD_SETSIZE...
-  if (strm.socket() >= FD_SETSIZE) {
-    Headers dummy;
-    detail::read_headers(strm, dummy);
-    res.status = StatusCode::InternalServerError_500;
-    return write_response(strm, close_connection, req, res);
-  }
-#endif
-#endif
-
-  // Request line and headers
-  if (!parse_request_line(line_reader.ptr(), req) ||
-      !detail::read_headers(strm, req.headers)) {
-    res.status = StatusCode::BadRequest_400;
-    return write_response(strm, close_connection, req, res);
-  }
-
-  // Check if the request URI doesn't exceed the limit
-  if (req.target.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
-    Headers dummy;
-    detail::read_headers(strm, dummy);
-    res.status = StatusCode::UriTooLong_414;
-    return write_response(strm, close_connection, req, res);
-  }
-
-  if (req.get_header_value("Connection") == "close") {
-    connection_closed = true;
-  }
-
-  if (req.version == "HTTP/1.0" &&
-      req.get_header_value("Connection") != "Keep-Alive") {
-    connection_closed = true;
-  }
-
-  req.remote_addr = remote_addr;
-  req.remote_port = remote_port;
-  req.set_header("REMOTE_ADDR", req.remote_addr);
-  req.set_header("REMOTE_PORT", std::to_string(req.remote_port));
-
-  req.local_addr = local_addr;
-  req.local_port = local_port;
-  req.set_header("LOCAL_ADDR", req.local_addr);
-  req.set_header("LOCAL_PORT", std::to_string(req.local_port));
-
-  if (req.has_header("Range")) {
-    const auto &range_header_value = req.get_header_value("Range");
-    if (!detail::parse_range_header(range_header_value, req.ranges)) {
-      res.status = StatusCode::RangeNotSatisfiable_416;
-      return write_response(strm, close_connection, req, res);
-    }
-  }
-
-  if (setup_request) { setup_request(req); }
-
-  if (req.get_header_value("Expect") == "100-continue") {
-    int status = StatusCode::Continue_100;
-    if (expect_100_continue_handler_) {
-      status = expect_100_continue_handler_(req, res);
-    }
-    switch (status) {
-    case StatusCode::Continue_100:
-    case StatusCode::ExpectationFailed_417:
-      detail::write_response_line(strm, status);
-      strm.write("\r\n");
-      break;
-    default:
-      connection_closed = true;
-      return write_response(strm, true, req, res);
-    }
-  }
-
-  // Setup `is_connection_closed` method
-  req.is_connection_closed = [&]() {
-    return !detail::is_socket_alive(strm.socket());
-  };
-
-  // Routing
-  auto routed = false;
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-  routed = routing(req, res, strm);
-#else
-  try {
-    routed = routing(req, res, strm);
-  } catch (std::exception &e) {
-    if (exception_handler_) {
-      auto ep = std::current_exception();
-      exception_handler_(req, res, ep);
-      routed = true;
-    } else {
-      res.status = StatusCode::InternalServerError_500;
-      std::string val;
-      auto s = e.what();
-      for (size_t i = 0; s[i]; i++) {
-        switch (s[i]) {
-        case '\r': val += "\\r"; break;
-        case '\n': val += "\\n"; break;
-        default: val += s[i]; break;
-        }
-      }
-      res.set_header("EXCEPTION_WHAT", val);
-    }
-  } catch (...) {
-    if (exception_handler_) {
-      auto ep = std::current_exception();
-      exception_handler_(req, res, ep);
-      routed = true;
-    } else {
-      res.status = StatusCode::InternalServerError_500;
-      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
-    }
-  }
-#endif
-  if (routed) {
-    if (res.status == -1) {
-      res.status = req.ranges.empty() ? StatusCode::OK_200
-                                      : StatusCode::PartialContent_206;
-    }
-
-    // Serve file content by using a content provider
-    if (!res.file_content_path_.empty()) {
-      const auto &path = res.file_content_path_;
-      auto mm = std::make_shared<detail::mmap>(path.c_str());
-      if (!mm->is_open()) {
-        res.body.clear();
-        res.content_length_ = 0;
-        res.content_provider_ = nullptr;
-        res.status = StatusCode::NotFound_404;
-        return write_response(strm, close_connection, req, res);
-      }
-
-      auto content_type = res.file_content_content_type_;
-      if (content_type.empty()) {
-        content_type = detail::find_content_type(
-            path, file_extension_and_mimetype_map_, default_file_mimetype_);
-      }
-
-      res.set_content_provider(
-          mm->size(), content_type,
-          [mm](size_t offset, size_t length, DataSink &sink) -> bool {
-            sink.write(mm->data() + offset, length);
-            return true;
-          });
-    }
-
-    if (detail::range_error(req, res)) {
-      res.body.clear();
-      res.content_length_ = 0;
-      res.content_provider_ = nullptr;
-      res.status = StatusCode::RangeNotSatisfiable_416;
-      return write_response(strm, close_connection, req, res);
-    }
-
-    return write_response_with_content(strm, close_connection, req, res);
-  } else {
-    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
-
-    return write_response(strm, close_connection, req, res);
-  }
-}
-
-inline bool Server::is_valid() const { return true; }
-
-inline bool Server::process_and_close_socket(socket_t sock) {
-  std::string remote_addr;
-  int remote_port = 0;
-  detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
-
-  std::string local_addr;
-  int local_port = 0;
-  detail::get_local_ip_and_port(sock, local_addr, local_port);
-
-  auto ret = detail::process_server_socket(
-      svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
-      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_,
-      [&](Stream &strm, bool close_connection, bool &connection_closed) {
-        return process_request(strm, remote_addr, remote_port, local_addr,
-                               local_port, close_connection, connection_closed,
-                               nullptr);
-      });
-
-  detail::shutdown_socket(sock);
-  detail::close_socket(sock);
-  return ret;
-}
-
-// HTTP client implementation
-inline ClientImpl::ClientImpl(const std::string &host)
-    : ClientImpl(host, 80, std::string(), std::string()) {}
-
-inline ClientImpl::ClientImpl(const std::string &host, int port)
-    : ClientImpl(host, port, std::string(), std::string()) {}
-
-inline ClientImpl::ClientImpl(const std::string &host, int port,
-                              const std::string &client_cert_path,
-                              const std::string &client_key_path)
-    : host_(detail::escape_abstract_namespace_unix_domain(host)), port_(port),
-      host_and_port_(adjust_host_string(host_) + ":" + std::to_string(port)),
-      client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
-
-inline ClientImpl::~ClientImpl() {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  shutdown_socket(socket_);
-  close_socket(socket_);
-}
-
-inline bool ClientImpl::is_valid() const { return true; }
-
-inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
-  client_cert_path_ = rhs.client_cert_path_;
-  client_key_path_ = rhs.client_key_path_;
-  connection_timeout_sec_ = rhs.connection_timeout_sec_;
-  read_timeout_sec_ = rhs.read_timeout_sec_;
-  read_timeout_usec_ = rhs.read_timeout_usec_;
-  write_timeout_sec_ = rhs.write_timeout_sec_;
-  write_timeout_usec_ = rhs.write_timeout_usec_;
-  max_timeout_msec_ = rhs.max_timeout_msec_;
-  basic_auth_username_ = rhs.basic_auth_username_;
-  basic_auth_password_ = rhs.basic_auth_password_;
-  bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  digest_auth_username_ = rhs.digest_auth_username_;
-  digest_auth_password_ = rhs.digest_auth_password_;
-#endif
-  keep_alive_ = rhs.keep_alive_;
-  follow_location_ = rhs.follow_location_;
-  url_encode_ = rhs.url_encode_;
-  address_family_ = rhs.address_family_;
-  tcp_nodelay_ = rhs.tcp_nodelay_;
-  ipv6_v6only_ = rhs.ipv6_v6only_;
-  socket_options_ = rhs.socket_options_;
-  compress_ = rhs.compress_;
-  decompress_ = rhs.decompress_;
-  interface_ = rhs.interface_;
-  proxy_host_ = rhs.proxy_host_;
-  proxy_port_ = rhs.proxy_port_;
-  proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
-  proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
-  proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
-  proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
-#endif
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  ca_cert_file_path_ = rhs.ca_cert_file_path_;
-  ca_cert_dir_path_ = rhs.ca_cert_dir_path_;
-  ca_cert_store_ = rhs.ca_cert_store_;
-#endif
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  server_certificate_verification_ = rhs.server_certificate_verification_;
-  server_hostname_verification_ = rhs.server_hostname_verification_;
-  server_certificate_verifier_ = rhs.server_certificate_verifier_;
-#endif
-  logger_ = rhs.logger_;
-}
-
-inline socket_t ClientImpl::create_client_socket(Error &error) const {
-  if (!proxy_host_.empty() && proxy_port_ != -1) {
-    return detail::create_client_socket(
-        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
-        ipv6_v6only_, socket_options_, connection_timeout_sec_,
-        connection_timeout_usec_, read_timeout_sec_, read_timeout_usec_,
-        write_timeout_sec_, write_timeout_usec_, interface_, error);
-  }
-
-  // Check is custom IP specified for host_
-  std::string ip;
-  auto it = addr_map_.find(host_);
-  if (it != addr_map_.end()) { ip = it->second; }
-
-  return detail::create_client_socket(
-      host_, ip, port_, address_family_, tcp_nodelay_, ipv6_v6only_,
-      socket_options_, connection_timeout_sec_, connection_timeout_usec_,
-      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_, interface_, error);
-}
-
-inline bool ClientImpl::create_and_connect_socket(Socket &socket,
-                                                  Error &error) {
-  auto sock = create_client_socket(error);
-  if (sock == INVALID_SOCKET) { return false; }
-  socket.sock = sock;
-  return true;
-}
-
-inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
-                                     bool /*shutdown_gracefully*/) {
-  // If there are any requests in flight from threads other than us, then it's
-  // a thread-unsafe race because individual ssl* objects are not thread-safe.
-  assert(socket_requests_in_flight_ == 0 ||
-         socket_requests_are_from_thread_ == std::this_thread::get_id());
-}
-
-inline void ClientImpl::shutdown_socket(Socket &socket) const {
-  if (socket.sock == INVALID_SOCKET) { return; }
-  detail::shutdown_socket(socket.sock);
-}
-
-inline void ClientImpl::close_socket(Socket &socket) {
-  // If there are requests in flight in another thread, usually closing
-  // the socket will be fine and they will simply receive an error when
-  // using the closed socket, but it is still a bug since rarely the OS
-  // may reassign the socket id to be used for a new socket, and then
-  // suddenly they will be operating on a live socket that is different
-  // than the one they intended!
-  assert(socket_requests_in_flight_ == 0 ||
-         socket_requests_are_from_thread_ == std::this_thread::get_id());
-
-  // It is also a bug if this happens while SSL is still active
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  assert(socket.ssl == nullptr);
-#endif
-  if (socket.sock == INVALID_SOCKET) { return; }
-  detail::close_socket(socket.sock);
-  socket.sock = INVALID_SOCKET;
-}
-
-inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
-                                           Response &res) const {
-  std::array<char, 2048> buf{};
-
-  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
-
-  if (!line_reader.getline()) { return false; }
-
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
-#else
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
-#endif
-
-  std::cmatch m;
-  if (!std::regex_match(line_reader.ptr(), m, re)) {
-    return req.method == "CONNECT";
-  }
-  res.version = std::string(m[1]);
-  res.status = std::stoi(std::string(m[2]));
-  res.reason = std::string(m[3]);
-
-  // Ignore '100 Continue'
-  while (res.status == StatusCode::Continue_100) {
-    if (!line_reader.getline()) { return false; } // CRLF
-    if (!line_reader.getline()) { return false; } // next response line
-
-    if (!std::regex_match(line_reader.ptr(), m, re)) { return false; }
-    res.version = std::string(m[1]);
-    res.status = std::stoi(std::string(m[2]));
-    res.reason = std::string(m[3]);
-  }
-
-  return true;
-}
-
-inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
-  std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
-  auto ret = send_(req, res, error);
-  if (error == Error::SSLPeerCouldBeClosed_) {
-    assert(!ret);
-    ret = send_(req, res, error);
-  }
-  return ret;
-}
-
-inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
-  {
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-
-    // Set this to false immediately - if it ever gets set to true by the end of
-    // the request, we know another thread instructed us to close the socket.
-    socket_should_be_closed_when_request_is_done_ = false;
-
-    auto is_alive = false;
-    if (socket_.is_open()) {
-      is_alive = detail::is_socket_alive(socket_.sock);
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      if (is_alive && is_ssl()) {
-        if (detail::is_ssl_peer_could_be_closed(socket_.ssl, socket_.sock)) {
-          is_alive = false;
-        }
-      }
-#endif
-
-      if (!is_alive) {
-        // Attempt to avoid sigpipe by shutting down nongracefully if it seems
-        // like the other side has already closed the connection Also, there
-        // cannot be any requests in flight from other threads since we locked
-        // request_mutex_, so safe to close everything immediately
-        const bool shutdown_gracefully = false;
-        shutdown_ssl(socket_, shutdown_gracefully);
-        shutdown_socket(socket_);
-        close_socket(socket_);
-      }
-    }
-
-    if (!is_alive) {
-      if (!create_and_connect_socket(socket_, error)) { return false; }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      // TODO: refactoring
-      if (is_ssl()) {
-        auto &scli = static_cast<SSLClient &>(*this);
-        if (!proxy_host_.empty() && proxy_port_ != -1) {
-          auto success = false;
-          if (!scli.connect_with_proxy(socket_, req.start_time_, res, success,
-                                       error)) {
-            return success;
-          }
-        }
-
-        if (!scli.initialize_ssl(socket_, error)) { return false; }
-      }
-#endif
-    }
-
-    // Mark the current socket as being in use so that it cannot be closed by
-    // anyone else while this request is ongoing, even though we will be
-    // releasing the mutex.
-    if (socket_requests_in_flight_ > 1) {
-      assert(socket_requests_are_from_thread_ == std::this_thread::get_id());
-    }
-    socket_requests_in_flight_ += 1;
-    socket_requests_are_from_thread_ = std::this_thread::get_id();
-  }
-
-  for (const auto &header : default_headers_) {
-    if (req.headers.find(header.first) == req.headers.end()) {
-      req.headers.insert(header);
-    }
-  }
-
-  auto ret = false;
-  auto close_connection = !keep_alive_;
-
-  auto se = detail::scope_exit([&]() {
-    // Briefly lock mutex in order to mark that a request is no longer ongoing
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    socket_requests_in_flight_ -= 1;
-    if (socket_requests_in_flight_ <= 0) {
-      assert(socket_requests_in_flight_ == 0);
-      socket_requests_are_from_thread_ = std::thread::id();
-    }
-
-    if (socket_should_be_closed_when_request_is_done_ || close_connection ||
-        !ret) {
-      shutdown_ssl(socket_, true);
-      shutdown_socket(socket_);
-      close_socket(socket_);
-    }
-  });
-
-  ret = process_socket(socket_, req.start_time_, [&](Stream &strm) {
-    return handle_request(strm, req, res, close_connection, error);
-  });
-
-  if (!ret) {
-    if (error == Error::Success) { error = Error::Unknown; }
-  }
-
-  return ret;
-}
-
-inline Result ClientImpl::send(const Request &req) {
-  auto req2 = req;
-  return send_(std::move(req2));
-}
-
-inline Result ClientImpl::send_(Request &&req) {
-  auto res = detail::make_unique<Response>();
-  auto error = Error::Success;
-  auto ret = send(req, *res, error);
-  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)};
-}
-
-inline bool ClientImpl::handle_request(Stream &strm, Request &req,
-                                       Response &res, bool close_connection,
-                                       Error &error) {
-  if (req.path.empty()) {
-    error = Error::Connection;
-    return false;
-  }
-
-  auto req_save = req;
-
-  bool ret;
-
-  if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) {
-    auto req2 = req;
-    req2.path = "http://" + host_and_port_ + req.path;
-    ret = process_request(strm, req2, res, close_connection, error);
-    req = req2;
-    req.path = req_save.path;
-  } else {
-    ret = process_request(strm, req, res, close_connection, error);
-  }
-
-  if (!ret) { return false; }
-
-  if (res.get_header_value("Connection") == "close" ||
-      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
-    // TODO this requires a not-entirely-obvious chain of calls to be correct
-    // for this to be safe.
-
-    // This is safe to call because handle_request is only called by send_
-    // which locks the request mutex during the process. It would be a bug
-    // to call it from a different thread since it's a thread-safety issue
-    // to do these things to the socket if another thread is using the socket.
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    shutdown_ssl(socket_, true);
-    shutdown_socket(socket_);
-    close_socket(socket_);
-  }
-
-  if (300 < res.status && res.status < 400 && follow_location_) {
-    req = req_save;
-    ret = redirect(req, res, error);
-  }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if ((res.status == StatusCode::Unauthorized_401 ||
-       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
-      req.authorization_count_ < 5) {
-    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
-    const auto &username =
-        is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
-    const auto &password =
-        is_proxy ? proxy_digest_auth_password_ : digest_auth_password_;
-
-    if (!username.empty() && !password.empty()) {
-      std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(res, auth, is_proxy)) {
-        Request new_req = req;
-        new_req.authorization_count_ += 1;
-        new_req.headers.erase(is_proxy ? "Proxy-Authorization"
-                                       : "Authorization");
-        new_req.headers.insert(detail::make_digest_authentication_header(
-            req, auth, new_req.authorization_count_, detail::random_string(10),
-            username, password, is_proxy));
-
-        Response new_res;
-
-        ret = send(new_req, new_res, error);
-        if (ret) { res = new_res; }
-      }
-    }
-  }
-#endif
-
-  return ret;
-}
-
-inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
-  if (req.redirect_count_ == 0) {
-    error = Error::ExceedRedirectCount;
-    return false;
-  }
-
-  auto location = res.get_header_value("location");
-  if (location.empty()) { return false; }
-
-  const static std::regex re(
-      R"((?:(https?):)?(?://(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
-
-  std::smatch m;
-  if (!std::regex_match(location, m, re)) { return false; }
-
-  auto scheme = is_ssl() ? "https" : "http";
-
-  auto next_scheme = m[1].str();
-  auto next_host = m[2].str();
-  if (next_host.empty()) { next_host = m[3].str(); }
-  auto port_str = m[4].str();
-  auto next_path = m[5].str();
-  auto next_query = m[6].str();
-
-  auto next_port = port_;
-  if (!port_str.empty()) {
-    next_port = std::stoi(port_str);
-  } else if (!next_scheme.empty()) {
-    next_port = next_scheme == "https" ? 443 : 80;
-  }
-
-  if (next_scheme.empty()) { next_scheme = scheme; }
-  if (next_host.empty()) { next_host = host_; }
-  if (next_path.empty()) { next_path = "/"; }
-
-  auto path = detail::decode_url(next_path, true) + next_query;
-
-  if (next_scheme == scheme && next_host == host_ && next_port == port_) {
-    return detail::redirect(*this, req, res, path, location, error);
-  } else {
-    if (next_scheme == "https") {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      SSLClient cli(next_host, next_port);
-      cli.copy_settings(*this);
-      if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); }
-      return detail::redirect(cli, req, res, path, location, error);
-#else
-      return false;
-#endif
-    } else {
-      ClientImpl cli(next_host, next_port);
-      cli.copy_settings(*this);
-      return detail::redirect(cli, req, res, path, location, error);
-    }
-  }
-}
-
-inline bool ClientImpl::write_content_with_provider(Stream &strm,
-                                                    const Request &req,
-                                                    Error &error) const {
-  auto is_shutting_down = []() { return false; };
-
-  if (req.is_chunked_content_provider_) {
-    // TODO: Brotli support
-    std::unique_ptr<detail::compressor> compressor;
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-    if (compress_) {
-      compressor = detail::make_unique<detail::gzip_compressor>();
-    } else
-#endif
-    {
-      compressor = detail::make_unique<detail::nocompressor>();
-    }
-
-    return detail::write_content_chunked(strm, req.content_provider_,
-                                         is_shutting_down, *compressor, error);
-  } else {
-    return detail::write_content(strm, req.content_provider_, 0,
-                                 req.content_length_, is_shutting_down, error);
-  }
-}
-
-inline bool ClientImpl::write_request(Stream &strm, Request &req,
-                                      bool close_connection, Error &error) {
-  // Prepare additional headers
-  if (close_connection) {
-    if (!req.has_header("Connection")) {
-      req.set_header("Connection", "close");
-    }
-  }
-
-  if (!req.has_header("Host")) {
-    if (is_ssl()) {
-      if (port_ == 443) {
-        req.set_header("Host", host_);
-      } else {
-        req.set_header("Host", host_and_port_);
-      }
-    } else {
-      if (port_ == 80) {
-        req.set_header("Host", host_);
-      } else {
-        req.set_header("Host", host_and_port_);
-      }
-    }
-  }
-
-  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
-
-  if (!req.content_receiver) {
-    if (!req.has_header("Accept-Encoding")) {
-      std::string accept_encoding;
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-      accept_encoding = "br";
-#endif
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-      if (!accept_encoding.empty()) { accept_encoding += ", "; }
-      accept_encoding += "gzip, deflate";
-#endif
-      req.set_header("Accept-Encoding", accept_encoding);
-    }
-
-#ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
-    if (!req.has_header("User-Agent")) {
-      auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
-      req.set_header("User-Agent", agent);
-    }
-#endif
-  };
-
-  if (req.body.empty()) {
-    if (req.content_provider_) {
-      if (!req.is_chunked_content_provider_) {
-        if (!req.has_header("Content-Length")) {
-          auto length = std::to_string(req.content_length_);
-          req.set_header("Content-Length", length);
-        }
-      }
-    } else {
-      if (req.method == "POST" || req.method == "PUT" ||
-          req.method == "PATCH") {
-        req.set_header("Content-Length", "0");
-      }
-    }
-  } else {
-    if (!req.has_header("Content-Type")) {
-      req.set_header("Content-Type", "text/plain");
-    }
-
-    if (!req.has_header("Content-Length")) {
-      auto length = std::to_string(req.body.size());
-      req.set_header("Content-Length", length);
-    }
-  }
-
-  if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) {
-    if (!req.has_header("Authorization")) {
-      req.headers.insert(make_basic_authentication_header(
-          basic_auth_username_, basic_auth_password_, false));
-    }
-  }
-
-  if (!proxy_basic_auth_username_.empty() &&
-      !proxy_basic_auth_password_.empty()) {
-    if (!req.has_header("Proxy-Authorization")) {
-      req.headers.insert(make_basic_authentication_header(
-          proxy_basic_auth_username_, proxy_basic_auth_password_, true));
-    }
-  }
-
-  if (!bearer_token_auth_token_.empty()) {
-    if (!req.has_header("Authorization")) {
-      req.headers.insert(make_bearer_token_authentication_header(
-          bearer_token_auth_token_, false));
-    }
-  }
-
-  if (!proxy_bearer_token_auth_token_.empty()) {
-    if (!req.has_header("Proxy-Authorization")) {
-      req.headers.insert(make_bearer_token_authentication_header(
-          proxy_bearer_token_auth_token_, true));
-    }
-  }
-
-  // Request line and headers
-  {
-    detail::BufferStream bstrm;
-
-    const auto &path_with_query =
-        req.params.empty() ? req.path
-                           : append_query_params(req.path, req.params);
-
-    const auto &path =
-        url_encode_ ? detail::encode_url(path_with_query) : path_with_query;
-
-    detail::write_request_line(bstrm, req.method, path);
-
-    header_writer_(bstrm, req.headers);
-
-    // Flush buffer
-    auto &data = bstrm.get_buffer();
-    if (!detail::write_data(strm, data.data(), data.size())) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  // Body
-  if (req.body.empty()) {
-    return write_content_with_provider(strm, req, error);
-  }
-
-  if (!detail::write_data(strm, req.body.data(), req.body.size())) {
-    error = Error::Write;
-    return false;
-  }
-
-  return true;
-}
-
-inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
-    Request &req, const char *body, size_t content_length,
-    ContentProvider content_provider,
-    ContentProviderWithoutLength content_provider_without_length,
-    const std::string &content_type, Error &error) {
-  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_ && !content_provider_without_length) {
-    // TODO: Brotli support
-    detail::gzip_compressor compressor;
-
-    if (content_provider) {
-      auto ok = true;
-      size_t offset = 0;
-      DataSink data_sink;
-
-      data_sink.write = [&](const char *data, size_t data_len) -> bool {
-        if (ok) {
-          auto last = offset + data_len == content_length;
-
-          auto ret = compressor.compress(
-              data, data_len, last,
-              [&](const char *compressed_data, size_t compressed_data_len) {
-                req.body.append(compressed_data, compressed_data_len);
-                return true;
-              });
-
-          if (ret) {
-            offset += data_len;
-          } else {
-            ok = false;
-          }
-        }
-        return ok;
-      };
-
-      while (ok && offset < content_length) {
-        if (!content_provider(offset, content_length - offset, data_sink)) {
-          error = Error::Canceled;
-          return nullptr;
-        }
-      }
-    } else {
-      if (!compressor.compress(body, content_length, true,
-                               [&](const char *data, size_t data_len) {
-                                 req.body.append(data, data_len);
-                                 return true;
-                               })) {
-        error = Error::Compression;
-        return nullptr;
-      }
-    }
-  } else
-#endif
-  {
-    if (content_provider) {
-      req.content_length_ = content_length;
-      req.content_provider_ = std::move(content_provider);
-      req.is_chunked_content_provider_ = false;
-    } else if (content_provider_without_length) {
-      req.content_length_ = 0;
-      req.content_provider_ = detail::ContentProviderAdapter(
-          std::move(content_provider_without_length));
-      req.is_chunked_content_provider_ = true;
-      req.set_header("Transfer-Encoding", "chunked");
-    } else {
-      req.body.assign(body, content_length);
-    }
-  }
-
-  auto res = detail::make_unique<Response>();
-  return send(req, *res, error) ? std::move(res) : nullptr;
-}
-
-inline Result ClientImpl::send_with_content_provider(
-    const std::string &method, const std::string &path, const Headers &headers,
-    const char *body, size_t content_length, ContentProvider content_provider,
-    ContentProviderWithoutLength content_provider_without_length,
-    const std::string &content_type, Progress progress) {
-  Request req;
-  req.method = method;
-  req.headers = headers;
-  req.path = path;
-  req.progress = progress;
-  if (max_timeout_msec_ > 0) {
-    req.start_time_ = std::chrono::steady_clock::now();
-  }
-
-  auto error = Error::Success;
-
-  auto res = send_with_content_provider(
-      req, body, content_length, std::move(content_provider),
-      std::move(content_provider_without_length), content_type, error);
-
-  return Result{std::move(res), error, std::move(req.headers)};
-}
-
-inline std::string
-ClientImpl::adjust_host_string(const std::string &host) const {
-  if (host.find(':') != std::string::npos) { return "[" + host + "]"; }
-  return host;
-}
-
-inline bool ClientImpl::process_request(Stream &strm, Request &req,
-                                        Response &res, bool close_connection,
-                                        Error &error) {
-  // Send request
-  if (!write_request(strm, req, close_connection, error)) { return false; }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if (is_ssl()) {
-    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
-    if (!is_proxy_enabled) {
-      if (detail::is_ssl_peer_could_be_closed(socket_.ssl, socket_.sock)) {
-        error = Error::SSLPeerCouldBeClosed_;
-        return false;
-      }
-    }
-  }
-#endif
-
-  // Receive response and headers
-  if (!read_response_line(strm, req, res) ||
-      !detail::read_headers(strm, res.headers)) {
-    error = Error::Read;
-    return false;
-  }
-
-  // Body
-  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
-      req.method != "CONNECT") {
-    auto redirect = 300 < res.status && res.status < 400 &&
-                    res.status != StatusCode::NotModified_304 &&
-                    follow_location_;
-
-    if (req.response_handler && !redirect) {
-      if (!req.response_handler(res)) {
-        error = Error::Canceled;
-        return false;
-      }
-    }
-
-    auto out =
-        req.content_receiver
-            ? static_cast<ContentReceiverWithProgress>(
-                  [&](const char *buf, size_t n, uint64_t off, uint64_t len) {
-                    if (redirect) { return true; }
-                    auto ret = req.content_receiver(buf, n, off, len);
-                    if (!ret) { error = Error::Canceled; }
-                    return ret;
-                  })
-            : static_cast<ContentReceiverWithProgress>(
-                  [&](const char *buf, size_t n, uint64_t /*off*/,
-                      uint64_t /*len*/) {
-                    assert(res.body.size() + n <= res.body.max_size());
-                    res.body.append(buf, n);
-                    return true;
-                  });
-
-    auto progress = [&](uint64_t current, uint64_t total) {
-      if (!req.progress || redirect) { return true; }
-      auto ret = req.progress(current, total);
-      if (!ret) { error = Error::Canceled; }
-      return ret;
-    };
-
-    if (res.has_header("Content-Length")) {
-      if (!req.content_receiver) {
-        auto len = res.get_header_value_u64("Content-Length");
-        if (len > res.body.max_size()) {
-          error = Error::Read;
-          return false;
-        }
-        res.body.reserve(static_cast<size_t>(len));
-      }
-    }
-
-    if (res.status != StatusCode::NotModified_304) {
-      int dummy_status;
-      if (!detail::read_content(strm, res, (std::numeric_limits<size_t>::max)(),
-                                dummy_status, std::move(progress),
-                                std::move(out), decompress_)) {
-        if (error != Error::Canceled) { error = Error::Read; }
-        return false;
-      }
-    }
-  }
-
-  // Log
-  if (logger_) { logger_(req, res); }
-
-  return true;
-}
-
-inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
-    const std::string &boundary, const MultipartFormDataItems &items,
-    const MultipartFormDataProviderItems &provider_items) const {
-  size_t cur_item = 0;
-  size_t cur_start = 0;
-  // cur_item and cur_start are copied to within the std::function and maintain
-  // state between successive calls
-  return [&, cur_item, cur_start](size_t offset,
-                                  DataSink &sink) mutable -> bool {
-    if (!offset && !items.empty()) {
-      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
-      return true;
-    } else if (cur_item < provider_items.size()) {
-      if (!cur_start) {
-        const auto &begin = detail::serialize_multipart_formdata_item_begin(
-            provider_items[cur_item], boundary);
-        offset += begin.size();
-        cur_start = offset;
-        sink.os << begin;
-      }
-
-      DataSink cur_sink;
-      auto has_data = true;
-      cur_sink.write = sink.write;
-      cur_sink.done = [&]() { has_data = false; };
-
-      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
-        return false;
-      }
-
-      if (!has_data) {
-        sink.os << detail::serialize_multipart_formdata_item_end();
-        cur_item++;
-        cur_start = 0;
-      }
-      return true;
-    } else {
-      sink.os << detail::serialize_multipart_formdata_finish(boundary);
-      sink.done();
-      return true;
-    }
-  };
-}
-
-inline bool ClientImpl::process_socket(
-    const Socket &socket,
-    std::chrono::time_point<std::chrono::steady_clock> start_time,
-    std::function<bool(Stream &strm)> callback) {
-  return detail::process_client_socket(
-      socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_, max_timeout_msec_, start_time,
-      std::move(callback));
-}
-
-inline bool ClientImpl::is_ssl() const { return false; }
-
-inline Result ClientImpl::Get(const std::string &path) {
-  return Get(path, Headers(), Progress());
-}
-
-inline Result ClientImpl::Get(const std::string &path, Progress progress) {
-  return Get(path, Headers(), std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers) {
-  return Get(path, headers, Progress());
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              Progress progress) {
-  Request req;
-  req.method = "GET";
-  req.path = path;
-  req.headers = headers;
-  req.progress = std::move(progress);
-  if (max_timeout_msec_ > 0) {
-    req.start_time_ = std::chrono::steady_clock::now();
-  }
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ContentReceiver content_receiver) {
-  return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, Headers(), nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ContentReceiver content_receiver) {
-  return Get(path, headers, nullptr, std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, headers, nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver) {
-  return Get(path, Headers(), std::move(response_handler),
-             std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver) {
-  return Get(path, headers, std::move(response_handler),
-             std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, Headers(), std::move(response_handler),
-             std::move(content_receiver), std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  Request req;
-  req.method = "GET";
-  req.path = path;
-  req.headers = headers;
-  req.response_handler = std::move(response_handler);
-  req.content_receiver =
-      [content_receiver](const char *data, size_t data_length,
-                         uint64_t /*offset*/, uint64_t /*total_length*/) {
-        return content_receiver(data, data_length);
-      };
-  req.progress = std::move(progress);
-  if (max_timeout_msec_ > 0) {
-    req.start_time_ = std::chrono::steady_clock::now();
-  }
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers, Progress progress) {
-  if (params.empty()) { return Get(path, headers); }
-
-  std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query, headers, std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, params, headers, nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  if (params.empty()) {
-    return Get(path, headers, std::move(response_handler),
-               std::move(content_receiver), std::move(progress));
-  }
-
-  std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query, headers, std::move(response_handler),
-             std::move(content_receiver), std::move(progress));
-}
-
-inline Result ClientImpl::Head(const std::string &path) {
-  return Head(path, Headers());
-}
-
-inline Result ClientImpl::Head(const std::string &path,
-                               const Headers &headers) {
-  Request req;
-  req.method = "HEAD";
-  req.headers = headers;
-  req.path = path;
-  if (max_timeout_msec_ > 0) {
-    req.start_time_ = std::chrono::steady_clock::now();
-  }
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Post(const std::string &path) {
-  return Post(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               const Headers &headers) {
-  return Post(path, headers, nullptr, 0, std::string());
-}
-
-inline Result ClientImpl::Post(const std::string &path, const char *body,
-                               size_t content_length,
-                               const std::string &content_type) {
-  return Post(path, Headers(), body, content_length, content_type, nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const char *body, size_t content_length,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const char *body, size_t content_length,
-                               const std::string &content_type,
-                               Progress progress) {
-  return send_with_content_provider("POST", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const std::string &body,
-                               const std::string &content_type) {
-  return Post(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const std::string &body,
-                               const std::string &content_type,
-                               Progress progress) {
-  return Post(path, Headers(), body, content_type, progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const std::string &body,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const std::string &body,
-                               const std::string &content_type,
-                               Progress progress) {
-  return send_with_content_provider("POST", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Params &params) {
-  return Post(path, Headers(), params);
-}
-
-inline Result ClientImpl::Post(const std::string &path, size_t content_length,
-                               ContentProvider content_provider,
-                               const std::string &content_type) {
-  return Post(path, Headers(), content_length, std::move(content_provider),
-              content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               ContentProviderWithoutLength content_provider,
-                               const std::string &content_type) {
-  return Post(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               size_t content_length,
-                               ContentProvider content_provider,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               ContentProviderWithoutLength content_provider,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const Params &params) {
-  auto query = detail::params_to_query_str(params);
-  return Post(path, headers, query, "application/x-www-form-urlencoded");
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const Params &params, Progress progress) {
-  auto query = detail::params_to_query_str(params);
-  return Post(path, headers, query, "application/x-www-form-urlencoded",
-              progress);
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               const MultipartFormDataItems &items) {
-  return Post(path, Headers(), items);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const MultipartFormDataItems &items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Post(path, headers, body, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const MultipartFormDataItems &items,
-                               const std::string &boundary) {
-  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
-    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-  }
-
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Post(path, headers, body, content_type);
-}
-
-inline Result
-ClientImpl::Post(const std::string &path, const Headers &headers,
-                 const MultipartFormDataItems &items,
-                 const MultipartFormDataProviderItems &provider_items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  return send_with_content_provider(
-      "POST", path, headers, nullptr, 0, nullptr,
-      get_multipart_content_provider(boundary, items, provider_items),
-      content_type, nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path) {
-  return Put(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Put(const std::string &path, const char *body,
-                              size_t content_length,
-                              const std::string &content_type) {
-  return Put(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const char *body, size_t content_length,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const char *body, size_t content_length,
-                              const std::string &content_type,
-                              Progress progress) {
-  return send_with_content_provider("PUT", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type, progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const std::string &body,
-                              const std::string &content_type) {
-  return Put(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const std::string &body,
-                              const std::string &content_type,
-                              Progress progress) {
-  return Put(path, Headers(), body, content_type, progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const std::string &body,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const std::string &body,
-                              const std::string &content_type,
-                              Progress progress) {
-  return send_with_content_provider("PUT", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path, size_t content_length,
-                              ContentProvider content_provider,
-                              const std::string &content_type) {
-  return Put(path, Headers(), content_length, std::move(content_provider),
-             content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path,
-                              ContentProviderWithoutLength content_provider,
-                              const std::string &content_type) {
-  return Put(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              size_t content_length,
-                              ContentProvider content_provider,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              ContentProviderWithoutLength content_provider,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Params &params) {
-  return Put(path, Headers(), params);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const Params &params) {
-  auto query = detail::params_to_query_str(params);
-  return Put(path, headers, query, "application/x-www-form-urlencoded");
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const Params &params, Progress progress) {
-  auto query = detail::params_to_query_str(params);
-  return Put(path, headers, query, "application/x-www-form-urlencoded",
-             progress);
-}
-
-inline Result ClientImpl::Put(const std::string &path,
-                              const MultipartFormDataItems &items) {
-  return Put(path, Headers(), items);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const MultipartFormDataItems &items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Put(path, headers, body, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const MultipartFormDataItems &items,
-                              const std::string &boundary) {
-  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
-    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-  }
-
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Put(path, headers, body, content_type);
-}
-
-inline Result
-ClientImpl::Put(const std::string &path, const Headers &headers,
-                const MultipartFormDataItems &items,
-                const MultipartFormDataProviderItems &provider_items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  return send_with_content_provider(
-      "PUT", path, headers, nullptr, 0, nullptr,
-      get_multipart_content_provider(boundary, items, provider_items),
-      content_type, nullptr);
-}
-inline Result ClientImpl::Patch(const std::string &path) {
-  return Patch(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const char *body,
-                                size_t content_length,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const char *body,
-                                size_t content_length,
-                                const std::string &content_type,
-                                Progress progress) {
-  return Patch(path, Headers(), body, content_length, content_type, progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const char *body, size_t content_length,
-                                const std::string &content_type) {
-  return Patch(path, headers, body, content_length, content_type, nullptr);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const char *body, size_t content_length,
-                                const std::string &content_type,
-                                Progress progress) {
-  return send_with_content_provider("PATCH", path, headers, body,
-                                    content_length, nullptr, nullptr,
-                                    content_type, progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                const std::string &body,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                const std::string &body,
-                                const std::string &content_type,
-                                Progress progress) {
-  return Patch(path, Headers(), body, content_type, progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const std::string &body,
-                                const std::string &content_type) {
-  return Patch(path, headers, body, content_type, nullptr);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const std::string &body,
-                                const std::string &content_type,
-                                Progress progress) {
-  return send_with_content_provider("PATCH", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr, content_type,
-                                    progress);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
-                                ContentProvider content_provider,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), content_length, std::move(content_provider),
-               content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                ContentProviderWithoutLength content_provider,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                size_t content_length,
-                                ContentProvider content_provider,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type, nullptr);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                ContentProviderWithoutLength content_provider,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type,
-                                    nullptr);
-}
-
-inline Result ClientImpl::Delete(const std::string &path) {
-  return Delete(path, Headers(), std::string(), std::string());
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers) {
-  return Delete(path, headers, std::string(), std::string());
-}
-
-inline Result ClientImpl::Delete(const std::string &path, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type) {
-  return Delete(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  return Delete(path, Headers(), body, content_length, content_type, progress);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type) {
-  return Delete(path, headers, body, content_length, content_type, nullptr);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  Request req;
-  req.method = "DELETE";
-  req.headers = headers;
-  req.path = path;
-  req.progress = progress;
-  if (max_timeout_msec_ > 0) {
-    req.start_time_ = std::chrono::steady_clock::now();
-  }
-
-  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
-  req.body.assign(body, content_length);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const std::string &body,
-                                 const std::string &content_type) {
-  return Delete(path, Headers(), body.data(), body.size(), content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const std::string &body,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  return Delete(path, Headers(), body.data(), body.size(), content_type,
-                progress);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers,
-                                 const std::string &body,
-                                 const std::string &content_type) {
-  return Delete(path, headers, body.data(), body.size(), content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers,
-                                 const std::string &body,
-                                 const std::string &content_type,
-                                 Progress progress) {
-  return Delete(path, headers, body.data(), body.size(), content_type,
-                progress);
-}
-
-inline Result ClientImpl::Options(const std::string &path) {
-  return Options(path, Headers());
-}
-
-inline Result ClientImpl::Options(const std::string &path,
-                                  const Headers &headers) {
-  Request req;
-  req.method = "OPTIONS";
-  req.headers = headers;
-  req.path = path;
-  if (max_timeout_msec_ > 0) {
-    req.start_time_ = std::chrono::steady_clock::now();
-  }
-
-  return send_(std::move(req));
-}
-
-inline void ClientImpl::stop() {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-
-  // If there is anything ongoing right now, the ONLY thread-safe thing we can
-  // do is to shutdown_socket, so that threads using this socket suddenly
-  // discover they can't read/write any more and error out. Everything else
-  // (closing the socket, shutting ssl down) is unsafe because these actions are
-  // not thread-safe.
-  if (socket_requests_in_flight_ > 0) {
-    shutdown_socket(socket_);
-
-    // Aside from that, we set a flag for the socket to be closed when we're
-    // done.
-    socket_should_be_closed_when_request_is_done_ = true;
-    return;
-  }
-
-  // Otherwise, still holding the mutex, we can shut everything down ourselves
-  shutdown_ssl(socket_, true);
-  shutdown_socket(socket_);
-  close_socket(socket_);
-}
-
-inline std::string ClientImpl::host() const { return host_; }
-
-inline int ClientImpl::port() const { return port_; }
-
-inline size_t ClientImpl::is_socket_open() const {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  return socket_.is_open();
-}
-
-inline socket_t ClientImpl::socket() const { return socket_.sock; }
-
-inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
-  connection_timeout_sec_ = sec;
-  connection_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) {
-  read_timeout_sec_ = sec;
-  read_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
-  write_timeout_sec_ = sec;
-  write_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_max_timeout(time_t msec) {
-  max_timeout_msec_ = msec;
-}
-
-inline void ClientImpl::set_basic_auth(const std::string &username,
-                                       const std::string &password) {
-  basic_auth_username_ = username;
-  basic_auth_password_ = password;
-}
-
-inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
-  bearer_token_auth_token_ = token;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_digest_auth(const std::string &username,
-                                        const std::string &password) {
-  digest_auth_username_ = username;
-  digest_auth_password_ = password;
-}
-#endif
-
-inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; }
-
-inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
-
-inline void ClientImpl::set_url_encode(bool on) { url_encode_ = on; }
-
-inline void
-ClientImpl::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
-  addr_map_ = std::move(addr_map);
-}
-
-inline void ClientImpl::set_default_headers(Headers headers) {
-  default_headers_ = std::move(headers);
-}
-
-inline void ClientImpl::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  header_writer_ = writer;
-}
-
-inline void ClientImpl::set_address_family(int family) {
-  address_family_ = family;
-}
-
-inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }
-
-inline void ClientImpl::set_ipv6_v6only(bool on) { ipv6_v6only_ = on; }
-
-inline void ClientImpl::set_socket_options(SocketOptions socket_options) {
-  socket_options_ = std::move(socket_options);
-}
-
-inline void ClientImpl::set_compress(bool on) { compress_ = on; }
-
-inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
-
-inline void ClientImpl::set_interface(const std::string &intf) {
-  interface_ = intf;
-}
-
-inline void ClientImpl::set_proxy(const std::string &host, int port) {
-  proxy_host_ = host;
-  proxy_port_ = port;
-}
-
-inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
-                                             const std::string &password) {
-  proxy_basic_auth_username_ = username;
-  proxy_basic_auth_password_ = password;
-}
-
-inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
-  proxy_bearer_token_auth_token_ = token;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
-                                              const std::string &password) {
-  proxy_digest_auth_username_ = username;
-  proxy_digest_auth_password_ = password;
-}
-
-inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
-                                         const std::string &ca_cert_dir_path) {
-  ca_cert_file_path_ = ca_cert_file_path;
-  ca_cert_dir_path_ = ca_cert_dir_path;
-}
-
-inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (ca_cert_store && ca_cert_store != ca_cert_store_) {
-    ca_cert_store_ = ca_cert_store;
-  }
-}
-
-inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
-                                                    std::size_t size) const {
-  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
-  auto se = detail::scope_exit([&] { BIO_free_all(mem); });
-  if (!mem) { return nullptr; }
-
-  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
-  if (!inf) { return nullptr; }
-
-  auto cts = X509_STORE_new();
-  if (cts) {
-    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
-      auto itmp = sk_X509_INFO_value(inf, i);
-      if (!itmp) { continue; }
-
-      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
-      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
-    }
-  }
-
-  sk_X509_INFO_pop_free(inf, X509_INFO_free);
-  return cts;
-}
-
-inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
-  server_certificate_verification_ = enabled;
-}
-
-inline void ClientImpl::enable_server_hostname_verification(bool enabled) {
-  server_hostname_verification_ = enabled;
-}
-
-inline void ClientImpl::set_server_certificate_verifier(
-    std::function<bool(SSL *ssl)> verifier) {
-  server_certificate_verifier_ = verifier;
-}
-#endif
-
-inline void ClientImpl::set_logger(Logger logger) {
-  logger_ = std::move(logger);
-}
-
-/*
- * SSL Implementation
- */
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-namespace detail {
-
-template <typename U, typename V>
-inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex,
-                    U SSL_connect_or_accept, V setup) {
-  SSL *ssl = nullptr;
-  {
-    std::lock_guard<std::mutex> guard(ctx_mutex);
-    ssl = SSL_new(ctx);
-  }
-
-  if (ssl) {
-    set_nonblocking(sock, true);
-    auto bio = BIO_new_socket(static_cast<int>(sock), BIO_NOCLOSE);
-    BIO_set_nbio(bio, 1);
-    SSL_set_bio(ssl, bio, bio);
-
-    if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) {
-      SSL_shutdown(ssl);
-      {
-        std::lock_guard<std::mutex> guard(ctx_mutex);
-        SSL_free(ssl);
-      }
-      set_nonblocking(sock, false);
-      return nullptr;
-    }
-    BIO_set_nbio(bio, 0);
-    set_nonblocking(sock, false);
-  }
-
-  return ssl;
-}
-
-inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, socket_t sock,
-                       bool shutdown_gracefully) {
-  // sometimes we may want to skip this to try to avoid SIGPIPE if we know
-  // the remote has closed the network connection
-  // Note that it is not always possible to avoid SIGPIPE, this is merely a
-  // best-efforts.
-  if (shutdown_gracefully) {
-#ifdef _WIN32
-    (void)(sock);
-    SSL_shutdown(ssl);
-#else
-    timeval tv;
-    tv.tv_sec = 1;
-    tv.tv_usec = 0;
-    setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-               reinterpret_cast<const void *>(&tv), sizeof(tv));
-
-    auto ret = SSL_shutdown(ssl);
-    while (ret == 0) {
-      std::this_thread::sleep_for(std::chrono::milliseconds{100});
-      ret = SSL_shutdown(ssl);
-    }
-#endif
-  }
-
-  std::lock_guard<std::mutex> guard(ctx_mutex);
-  SSL_free(ssl);
-}
-
-template <typename U>
-bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
-                                       U ssl_connect_or_accept,
-                                       time_t timeout_sec,
-                                       time_t timeout_usec) {
-  auto res = 0;
-  while ((res = ssl_connect_or_accept(ssl)) != 1) {
-    auto err = SSL_get_error(ssl, res);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; }
-      break;
-    case SSL_ERROR_WANT_WRITE:
-      if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; }
-      break;
-    default: break;
-    }
-    return false;
-  }
-  return true;
-}
-
-template <typename T>
-inline bool process_server_socket_ssl(
-    const std::atomic<socket_t> &svr_sock, SSL *ssl, socket_t sock,
-    size_t keep_alive_max_count, time_t keep_alive_timeout_sec,
-    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, T callback) {
-  return process_server_socket_core(
-      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
-      [&](bool close_connection, bool &connection_closed) {
-        SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
-                             write_timeout_sec, write_timeout_usec);
-        return callback(strm, close_connection, connection_closed);
-      });
-}
-
-template <typename T>
-inline bool process_client_socket_ssl(
-    SSL *ssl, socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-    time_t write_timeout_sec, time_t write_timeout_usec,
-    time_t max_timeout_msec,
-    std::chrono::time_point<std::chrono::steady_clock> start_time, T callback) {
-  SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
-                       write_timeout_sec, write_timeout_usec,
-                       max_timeout_msec, start_time);
-  return callback(strm);
-}
-
-class SSLInit {
-public:
-  SSLInit() {
-    OPENSSL_init_ssl(
-        OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-  }
-};
-
-// SSL socket stream implementation
-inline SSLSocketStream::SSLSocketStream(
-    socket_t sock, SSL *ssl, time_t read_timeout_sec, time_t read_timeout_usec,
-    time_t write_timeout_sec, time_t write_timeout_usec,
-    time_t max_timeout_msec,
-    std::chrono::time_point<std::chrono::steady_clock> start_time)
-    : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec),
-      read_timeout_usec_(read_timeout_usec),
-      write_timeout_sec_(write_timeout_sec),
-      write_timeout_usec_(write_timeout_usec),
-      max_timeout_msec_(max_timeout_msec), start_time(start_time) {
-  SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
-}
-
-inline SSLSocketStream::~SSLSocketStream() = default;
-
-inline bool SSLSocketStream::is_readable() const {
-  if (max_timeout_msec_ <= 0) {
-    return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
-  }
-
-  time_t read_timeout_sec;
-  time_t read_timeout_usec;
-  calc_actual_timeout(max_timeout_msec_, duration(), read_timeout_sec_,
-                      read_timeout_usec_, read_timeout_sec, read_timeout_usec);
-
-  return select_read(sock_, read_timeout_sec, read_timeout_usec) > 0;
-}
-
-inline bool SSLSocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
-         is_socket_alive(sock_) && !is_ssl_peer_could_be_closed(ssl_, sock_);
-}
-
-inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
-  if (SSL_pending(ssl_) > 0) {
-    return SSL_read(ssl_, ptr, static_cast<int>(size));
-  } else if (is_readable()) {
-    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
-    if (ret < 0) {
-      auto err = SSL_get_error(ssl_, ret);
-      auto n = 1000;
-#ifdef _WIN32
-      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
-                          (err == SSL_ERROR_SYSCALL &&
-                           WSAGetLastError() == WSAETIMEDOUT))) {
-#else
-      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
-#endif
-        if (SSL_pending(ssl_) > 0) {
-          return SSL_read(ssl_, ptr, static_cast<int>(size));
-        } else if (is_readable()) {
-          std::this_thread::sleep_for(std::chrono::microseconds{10});
-          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
-          if (ret >= 0) { return ret; }
-          err = SSL_get_error(ssl_, ret);
-        } else {
-          return -1;
-        }
-      }
-    }
-    return ret;
-  } else {
-    return -1;
-  }
-}
-
-inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
-  if (is_writable()) {
-    auto handle_size = static_cast<int>(
-        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
-
-    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
-    if (ret < 0) {
-      auto err = SSL_get_error(ssl_, ret);
-      auto n = 1000;
-#ifdef _WIN32
-      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
-                          (err == SSL_ERROR_SYSCALL &&
-                           WSAGetLastError() == WSAETIMEDOUT))) {
-#else
-      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
-#endif
-        if (is_writable()) {
-          std::this_thread::sleep_for(std::chrono::microseconds{10});
-          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
-          if (ret >= 0) { return ret; }
-          err = SSL_get_error(ssl_, ret);
-        } else {
-          return -1;
-        }
-      }
-    }
-    return ret;
-  }
-  return -1;
-}
-
-inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
-                                                    int &port) const {
-  detail::get_remote_ip_and_port(sock_, ip, port);
-}
-
-inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
-                                                   int &port) const {
-  detail::get_local_ip_and_port(sock_, ip, port);
-}
-
-inline socket_t SSLSocketStream::socket() const { return sock_; }
-
-inline time_t SSLSocketStream::duration() const {
-  return std::chrono::duration_cast<std::chrono::milliseconds>(
-             std::chrono::steady_clock::now() - start_time)
-      .count();
-}
-
-static SSLInit sslinit_;
-
-} // namespace detail
-
-// SSL HTTP server implementation
-inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
-                            const char *client_ca_cert_file_path,
-                            const char *client_ca_cert_dir_path,
-                            const char *private_key_password) {
-  ctx_ = SSL_CTX_new(TLS_server_method());
-
-  if (ctx_) {
-    SSL_CTX_set_options(ctx_,
-                        SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
-
-    if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_,
-          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
-    }
-
-    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
-        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
-            1 ||
-        SSL_CTX_check_private_key(ctx_) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
-      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
-                                    client_ca_cert_dir_path);
-
-      SSL_CTX_set_verify(
-          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-    }
-  }
-}
-
-inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key,
-                            X509_STORE *client_ca_cert_store) {
-  ctx_ = SSL_CTX_new(TLS_server_method());
-
-  if (ctx_) {
-    SSL_CTX_set_options(ctx_,
-                        SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-    SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
-
-    if (SSL_CTX_use_certificate(ctx_, cert) != 1 ||
-        SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    } else if (client_ca_cert_store) {
-      SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
-
-      SSL_CTX_set_verify(
-          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-    }
-  }
-}
-
-inline SSLServer::SSLServer(
-    const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback) {
-  ctx_ = SSL_CTX_new(TLS_method());
-  if (ctx_) {
-    if (!setup_ssl_ctx_callback(*ctx_)) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLServer::~SSLServer() {
-  if (ctx_) { SSL_CTX_free(ctx_); }
-}
-
-inline bool SSLServer::is_valid() const { return ctx_; }
-
-inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
-
-inline void SSLServer::update_certs(X509 *cert, EVP_PKEY *private_key,
-                                    X509_STORE *client_ca_cert_store) {
-
-  std::lock_guard<std::mutex> guard(ctx_mutex_);
-
-  SSL_CTX_use_certificate(ctx_, cert);
-  SSL_CTX_use_PrivateKey(ctx_, private_key);
-
-  if (client_ca_cert_store != nullptr) {
-    SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
-  }
-}
-
-inline bool SSLServer::process_and_close_socket(socket_t sock) {
-  auto ssl = detail::ssl_new(
-      sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl2) {
-        return detail::ssl_connect_or_accept_nonblocking(
-            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_);
-      },
-      [](SSL * /*ssl2*/) { return true; });
-
-  auto ret = false;
-  if (ssl) {
-    std::string remote_addr;
-    int remote_port = 0;
-    detail::get_remote_ip_and_port(sock, remote_addr, remote_port);
-
-    std::string local_addr;
-    int local_port = 0;
-    detail::get_local_ip_and_port(sock, local_addr, local_port);
-
-    ret = detail::process_server_socket_ssl(
-        svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
-        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-        write_timeout_usec_,
-        [&](Stream &strm, bool close_connection, bool &connection_closed) {
-          return process_request(strm, remote_addr, remote_port, local_addr,
-                                 local_port, close_connection,
-                                 connection_closed,
-                                 [&](Request &req) { req.ssl = ssl; });
-        });
-
-    // Shutdown gracefully if the result seemed successful, non-gracefully if
-    // the connection appeared to be closed.
-    const bool shutdown_gracefully = ret;
-    detail::ssl_delete(ctx_mutex_, ssl, sock, shutdown_gracefully);
-  }
-
-  detail::shutdown_socket(sock);
-  detail::close_socket(sock);
-  return ret;
-}
-
-// SSL HTTP client implementation
-inline SSLClient::SSLClient(const std::string &host)
-    : SSLClient(host, 443, std::string(), std::string()) {}
-
-inline SSLClient::SSLClient(const std::string &host, int port)
-    : SSLClient(host, port, std::string(), std::string()) {}
-
-inline SSLClient::SSLClient(const std::string &host, int port,
-                            const std::string &client_cert_path,
-                            const std::string &client_key_path,
-                            const std::string &private_key_password)
-    : ClientImpl(host, port, client_cert_path, client_key_path) {
-  ctx_ = SSL_CTX_new(TLS_client_method());
-
-  SSL_CTX_set_min_proto_version(ctx_, TLS1_2_VERSION);
-
-  detail::split(&host_[0], &host_[host_.size()], '.',
-                [&](const char *b, const char *e) {
-                  host_components_.emplace_back(b, e);
-                });
-
-  if (!client_cert_path.empty() && !client_key_path.empty()) {
-    if (!private_key_password.empty()) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_, reinterpret_cast<void *>(
-                    const_cast<char *>(private_key_password.c_str())));
-    }
-
-    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(),
-                                     SSL_FILETYPE_PEM) != 1 ||
-        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(),
-                                    SSL_FILETYPE_PEM) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLClient::SSLClient(const std::string &host, int port,
-                            X509 *client_cert, EVP_PKEY *client_key,
-                            const std::string &private_key_password)
-    : ClientImpl(host, port) {
-  ctx_ = SSL_CTX_new(TLS_client_method());
-
-  detail::split(&host_[0], &host_[host_.size()], '.',
-                [&](const char *b, const char *e) {
-                  host_components_.emplace_back(b, e);
-                });
-
-  if (client_cert != nullptr && client_key != nullptr) {
-    if (!private_key_password.empty()) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_, reinterpret_cast<void *>(
-                    const_cast<char *>(private_key_password.c_str())));
-    }
-
-    if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 ||
-        SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLClient::~SSLClient() {
-  if (ctx_) { SSL_CTX_free(ctx_); }
-  // Make sure to shut down SSL since shutdown_ssl will resolve to the
-  // base function rather than the derived function once we get to the
-  // base class destructor, and won't free the SSL (causing a leak).
-  shutdown_ssl_impl(socket_, true);
-}
-
-inline bool SSLClient::is_valid() const { return ctx_; }
-
-inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (ca_cert_store) {
-    if (ctx_) {
-      if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
-        // Free memory allocated for old cert and use new store `ca_cert_store`
-        SSL_CTX_set_cert_store(ctx_, ca_cert_store);
-      }
-    } else {
-      X509_STORE_free(ca_cert_store);
-    }
-  }
-}
-
-inline void SSLClient::load_ca_cert_store(const char *ca_cert,
-                                          std::size_t size) {
-  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
-}
-
-inline long SSLClient::get_openssl_verify_result() const {
-  return verify_result_;
-}
-
-inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }
-
-inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
-  return is_valid() && ClientImpl::create_and_connect_socket(socket, error);
-}
-
-// Assumes that socket_mutex_ is locked and that there are no requests in flight
-inline bool SSLClient::connect_with_proxy(
-    Socket &socket,
-    std::chrono::time_point<std::chrono::steady_clock> start_time,
-    Response &res, bool &success, Error &error) {
-  success = true;
-  Response proxy_res;
-  if (!detail::process_client_socket(
-          socket.sock, read_timeout_sec_, read_timeout_usec_,
-          write_timeout_sec_, write_timeout_usec_, max_timeout_msec_,
-          start_time, [&](Stream &strm) {
-            Request req2;
-            req2.method = "CONNECT";
-            req2.path = host_and_port_;
-            if (max_timeout_msec_ > 0) {
-              req2.start_time_ = std::chrono::steady_clock::now();
-            }
-            return process_request(strm, req2, proxy_res, false, error);
-          })) {
-    // Thread-safe to close everything because we are assuming there are no
-    // requests in flight
-    shutdown_ssl(socket, true);
-    shutdown_socket(socket);
-    close_socket(socket);
-    success = false;
-    return false;
-  }
-
-  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
-    if (!proxy_digest_auth_username_.empty() &&
-        !proxy_digest_auth_password_.empty()) {
-      std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
-        proxy_res = Response();
-        if (!detail::process_client_socket(
-                socket.sock, read_timeout_sec_, read_timeout_usec_,
-                write_timeout_sec_, write_timeout_usec_, max_timeout_msec_,
-                start_time, [&](Stream &strm) {
-                  Request req3;
-                  req3.method = "CONNECT";
-                  req3.path = host_and_port_;
-                  req3.headers.insert(detail::make_digest_authentication_header(
-                      req3, auth, 1, detail::random_string(10),
-                      proxy_digest_auth_username_, proxy_digest_auth_password_,
-                      true));
-                  if (max_timeout_msec_ > 0) {
-                    req3.start_time_ = std::chrono::steady_clock::now();
-                  }
-                  return process_request(strm, req3, proxy_res, false, error);
-                })) {
-          // Thread-safe to close everything because we are assuming there are
-          // no requests in flight
-          shutdown_ssl(socket, true);
-          shutdown_socket(socket);
-          close_socket(socket);
-          success = false;
-          return false;
-        }
-      }
-    }
-  }
-
-  // If status code is not 200, proxy request is failed.
-  // Set error to ProxyConnection and return proxy response
-  // as the response of the request
-  if (proxy_res.status != StatusCode::OK_200) {
-    error = Error::ProxyConnection;
-    res = std::move(proxy_res);
-    // Thread-safe to close everything because we are assuming there are
-    // no requests in flight
-    shutdown_ssl(socket, true);
-    shutdown_socket(socket);
-    close_socket(socket);
-    return false;
-  }
-
-  return true;
-}
-
-inline bool SSLClient::load_certs() {
-  auto ret = true;
-
-  std::call_once(initialize_cert_, [&]() {
-    std::lock_guard<std::mutex> guard(ctx_mutex_);
-    if (!ca_cert_file_path_.empty()) {
-      if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(),
-                                         nullptr)) {
-        ret = false;
-      }
-    } else if (!ca_cert_dir_path_.empty()) {
-      if (!SSL_CTX_load_verify_locations(ctx_, nullptr,
-                                         ca_cert_dir_path_.c_str())) {
-        ret = false;
-      }
-    } else {
-      auto loaded = false;
-#ifdef _WIN32
-      loaded =
-          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#if TARGET_OS_OSX
-      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
-    }
-  });
-
-  return ret;
-}
-
-inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
-  auto ssl = detail::ssl_new(
-      socket.sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl2) {
-        if (server_certificate_verification_) {
-          if (!load_certs()) {
-            error = Error::SSLLoadingCerts;
-            return false;
-          }
-          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
-        }
-
-        if (!detail::ssl_connect_or_accept_nonblocking(
-                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
-                connection_timeout_usec_)) {
-          error = Error::SSLConnection;
-          return false;
-        }
-
-        if (server_certificate_verification_) {
-          if (server_certificate_verifier_) {
-            if (!server_certificate_verifier_(ssl2)) {
-              error = Error::SSLServerVerification;
-              return false;
-            }
-          } else {
-            verify_result_ = SSL_get_verify_result(ssl2);
-
-            if (verify_result_ != X509_V_OK) {
-              error = Error::SSLServerVerification;
-              return false;
-            }
-
-            auto server_cert = SSL_get1_peer_certificate(ssl2);
-            auto se = detail::scope_exit([&] { X509_free(server_cert); });
-
-            if (server_cert == nullptr) {
-              error = Error::SSLServerVerification;
-              return false;
-            }
-
-            if (server_hostname_verification_) {
-              if (!verify_host(server_cert)) {
-                error = Error::SSLServerHostnameVerification;
-                return false;
-              }
-            }
-          }
-        }
-
-        return true;
-      },
-      [&](SSL *ssl2) {
-#if defined(OPENSSL_IS_BORINGSSL)
-        SSL_set_tlsext_host_name(ssl2, host_.c_str());
-#else
-        // NOTE: Direct call instead of using the OpenSSL macro to suppress
-        // -Wold-style-cast warning
-        SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name,
-                 static_cast<void *>(const_cast<char *>(host_.c_str())));
-#endif
-        return true;
-      });
-
-  if (ssl) {
-    socket.ssl = ssl;
-    return true;
-  }
-
-  shutdown_socket(socket);
-  close_socket(socket);
-  return false;
-}
-
-inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) {
-  shutdown_ssl_impl(socket, shutdown_gracefully);
-}
-
-inline void SSLClient::shutdown_ssl_impl(Socket &socket,
-                                         bool shutdown_gracefully) {
-  if (socket.sock == INVALID_SOCKET) {
-    assert(socket.ssl == nullptr);
-    return;
-  }
-  if (socket.ssl) {
-    detail::ssl_delete(ctx_mutex_, socket.ssl, socket.sock,
-                       shutdown_gracefully);
-    socket.ssl = nullptr;
-  }
-  assert(socket.ssl == nullptr);
-}
-
-inline bool SSLClient::process_socket(
-    const Socket &socket,
-    std::chrono::time_point<std::chrono::steady_clock> start_time,
-    std::function<bool(Stream &strm)> callback) {
-  assert(socket.ssl);
-  return detail::process_client_socket_ssl(
-      socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_,
-      write_timeout_sec_, write_timeout_usec_, max_timeout_msec_, start_time,
-      std::move(callback));
-}
-
-inline bool SSLClient::is_ssl() const { return true; }
-
-inline bool SSLClient::verify_host(X509 *server_cert) const {
-  /* Quote from RFC2818 section 3.1 "Server Identity"
-
-     If a subjectAltName extension of type dNSName is present, that MUST
-     be used as the identity. Otherwise, the (most specific) Common Name
-     field in the Subject field of the certificate MUST be used. Although
-     the use of the Common Name is existing practice, it is deprecated and
-     Certification Authorities are encouraged to use the dNSName instead.
-
-     Matching is performed using the matching rules specified by
-     [RFC2459].  If more than one identity of a given type is present in
-     the certificate (e.g., more than one dNSName name, a match in any one
-     of the set is considered acceptable.) Names may contain the wildcard
-     character * which is considered to match any single domain name
-     component or component fragment. E.g., *.a.com matches foo.a.com but
-     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
-
-     In some cases, the URI is specified as an IP address rather than a
-     hostname. In this case, the iPAddress subjectAltName must be present
-     in the certificate and must exactly match the IP in the URI.
-
-  */
-  return verify_host_with_subject_alt_name(server_cert) ||
-         verify_host_with_common_name(server_cert);
-}
-
-inline bool
-SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
-  auto ret = false;
-
-  auto type = GEN_DNS;
-
-  struct in6_addr addr6{};
-  struct in_addr addr{};
-  size_t addr_len = 0;
-
-#ifndef __MINGW32__
-  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
-    type = GEN_IPADD;
-    addr_len = sizeof(struct in6_addr);
-  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
-    type = GEN_IPADD;
-    addr_len = sizeof(struct in_addr);
-  }
-#endif
-
-  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
-      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
-
-  if (alt_names) {
-    auto dsn_matched = false;
-    auto ip_matched = false;
-
-    auto count = sk_GENERAL_NAME_num(alt_names);
-
-    for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
-      auto val = sk_GENERAL_NAME_value(alt_names, i);
-      if (val->type == type) {
-        auto name =
-            reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
-        auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
-
-        switch (type) {
-        case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
-
-        case GEN_IPADD:
-          if (!memcmp(&addr6, name, addr_len) ||
-              !memcmp(&addr, name, addr_len)) {
-            ip_matched = true;
-          }
-          break;
-        }
-      }
-    }
-
-    if (dsn_matched || ip_matched) { ret = true; }
-  }
-
-  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
-      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
-  return ret;
-}
-
-inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
-  const auto subject_name = X509_get_subject_name(server_cert);
-
-  if (subject_name != nullptr) {
-    char name[BUFSIZ];
-    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
-                                              name, sizeof(name));
-
-    if (name_len != -1) {
-      return check_host_name(name, static_cast<size_t>(name_len));
-    }
-  }
-
-  return false;
-}
-
-inline bool SSLClient::check_host_name(const char *pattern,
-                                       size_t pattern_len) const {
-  if (host_.size() == pattern_len && host_ == pattern) { return true; }
-
-  // Wildcard match
-  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
-  std::vector<std::string> pattern_components;
-  detail::split(&pattern[0], &pattern[pattern_len], '.',
-                [&](const char *b, const char *e) {
-                  pattern_components.emplace_back(b, e);
-                });
-
-  if (host_components_.size() != pattern_components.size()) { return false; }
-
-  auto itr = pattern_components.begin();
-  for (const auto &h : host_components_) {
-    auto &p = *itr;
-    if (p != h && p != "*") {
-      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
-                            !p.compare(0, p.size() - 1, h));
-      if (!partial_match) { return false; }
-    }
-    ++itr;
-  }
-
-  return true;
-}
-#endif
-
-// Universal client implementation
-inline Client::Client(const std::string &scheme_host_port)
-    : Client(scheme_host_port, std::string(), std::string()) {}
-
-inline Client::Client(const std::string &scheme_host_port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path) {
-  const static std::regex re(
-      R"((?:([a-z]+):\/\/)?(?:\[([a-fA-F\d:]+)\]|([^:/?#]+))(?::(\d+))?)");
-
-  std::smatch m;
-  if (std::regex_match(scheme_host_port, m, re)) {
-    auto scheme = m[1].str();
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    if (!scheme.empty() && (scheme != "http" && scheme != "https")) {
-#else
-    if (!scheme.empty() && scheme != "http") {
-#endif
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-      std::string msg = "'" + scheme + "' scheme is not supported.";
-      throw std::invalid_argument(msg);
-#endif
-      return;
-    }
-
-    auto is_ssl = scheme == "https";
-
-    auto host = m[2].str();
-    if (host.empty()) { host = m[3].str(); }
-
-    auto port_str = m[4].str();
-    auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80);
-
-    if (is_ssl) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
-                                            client_key_path);
-      is_ssl_ = is_ssl;
-#endif
-    } else {
-      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
-                                             client_key_path);
-    }
-  } else {
-    // NOTE: Update TEST(UniversalClientImplTest, Ipv6LiteralAddress)
-    // if port param below changes.
-    cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
-                                           client_cert_path, client_key_path);
-  }
-} // namespace detail
-
-inline Client::Client(const std::string &host, int port)
-    : cli_(detail::make_unique<ClientImpl>(host, port)) {}
-
-inline Client::Client(const std::string &host, int port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path)
-    : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
-                                           client_key_path)) {}
-
-inline Client::~Client() = default;
-
-inline bool Client::is_valid() const {
-  return cli_ != nullptr && cli_->is_valid();
-}
-
-inline Result Client::Get(const std::string &path) { return cli_->Get(path); }
-inline Result Client::Get(const std::string &path, const Headers &headers) {
-  return cli_->Get(path, headers);
-}
-inline Result Client::Get(const std::string &path, Progress progress) {
-  return cli_->Get(path, std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          Progress progress) {
-  return cli_->Get(path, headers, std::move(progress));
-}
-inline Result Client::Get(const std::string &path,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, headers, std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, headers, std::move(content_receiver),
-                   std::move(progress));
-}
-inline Result Client::Get(const std::string &path,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, std::move(response_handler),
-                   std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, headers, std::move(response_handler),
-                   std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, headers, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(content_receiver),
-                   std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-
-inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
-inline Result Client::Head(const std::string &path, const Headers &headers) {
-  return cli_->Head(path, headers);
-}
-
-inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
-inline Result Client::Post(const std::string &path, const Headers &headers) {
-  return cli_->Post(path, headers);
-}
-inline Result Client::Post(const std::string &path, const char *body,
-                           size_t content_length,
-                           const std::string &content_type) {
-  return cli_->Post(path, body, content_length, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const char *body, size_t content_length,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, body, content_length, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const char *body, size_t content_length,
-                           const std::string &content_type, Progress progress) {
-  return cli_->Post(path, headers, body, content_length, content_type,
-                    progress);
-}
-inline Result Client::Post(const std::string &path, const std::string &body,
-                           const std::string &content_type) {
-  return cli_->Post(path, body, content_type);
-}
-inline Result Client::Post(const std::string &path, const std::string &body,
-                           const std::string &content_type, Progress progress) {
-  return cli_->Post(path, body, content_type, progress);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const std::string &body,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, body, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const std::string &body,
-                           const std::string &content_type, Progress progress) {
-  return cli_->Post(path, headers, body, content_type, progress);
-}
-inline Result Client::Post(const std::string &path, size_t content_length,
-                           ContentProvider content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, content_length, std::move(content_provider),
-                    content_type);
-}
-inline Result Client::Post(const std::string &path,
-                           ContentProviderWithoutLength content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, std::move(content_provider), content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           size_t content_length,
-                           ContentProvider content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, content_length, std::move(content_provider),
-                    content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           ContentProviderWithoutLength content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Post(const std::string &path, const Params &params) {
-  return cli_->Post(path, params);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const Params &params) {
-  return cli_->Post(path, headers, params);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const Params &params, Progress progress) {
-  return cli_->Post(path, headers, params, progress);
-}
-inline Result Client::Post(const std::string &path,
-                           const MultipartFormDataItems &items) {
-  return cli_->Post(path, items);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const MultipartFormDataItems &items) {
-  return cli_->Post(path, headers, items);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const MultipartFormDataItems &items,
-                           const std::string &boundary) {
-  return cli_->Post(path, headers, items, boundary);
-}
-inline Result
-Client::Post(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items) {
-  return cli_->Post(path, headers, items, provider_items);
-}
-inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
-inline Result Client::Put(const std::string &path, const char *body,
-                          size_t content_length,
-                          const std::string &content_type) {
-  return cli_->Put(path, body, content_length, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const char *body, size_t content_length,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, body, content_length, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const char *body, size_t content_length,
-                          const std::string &content_type, Progress progress) {
-  return cli_->Put(path, headers, body, content_length, content_type, progress);
-}
-inline Result Client::Put(const std::string &path, const std::string &body,
-                          const std::string &content_type) {
-  return cli_->Put(path, body, content_type);
-}
-inline Result Client::Put(const std::string &path, const std::string &body,
-                          const std::string &content_type, Progress progress) {
-  return cli_->Put(path, body, content_type, progress);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const std::string &body,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, body, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const std::string &body,
-                          const std::string &content_type, Progress progress) {
-  return cli_->Put(path, headers, body, content_type, progress);
-}
-inline Result Client::Put(const std::string &path, size_t content_length,
-                          ContentProvider content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, content_length, std::move(content_provider),
-                   content_type);
-}
-inline Result Client::Put(const std::string &path,
-                          ContentProviderWithoutLength content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, std::move(content_provider), content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          size_t content_length,
-                          ContentProvider content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, content_length, std::move(content_provider),
-                   content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          ContentProviderWithoutLength content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Put(const std::string &path, const Params &params) {
-  return cli_->Put(path, params);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const Params &params) {
-  return cli_->Put(path, headers, params);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const Params &params, Progress progress) {
-  return cli_->Put(path, headers, params, progress);
-}
-inline Result Client::Put(const std::string &path,
-                          const MultipartFormDataItems &items) {
-  return cli_->Put(path, items);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const MultipartFormDataItems &items) {
-  return cli_->Put(path, headers, items);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const MultipartFormDataItems &items,
-                          const std::string &boundary) {
-  return cli_->Put(path, headers, items, boundary);
-}
-inline Result
-Client::Put(const std::string &path, const Headers &headers,
-            const MultipartFormDataItems &items,
-            const MultipartFormDataProviderItems &provider_items) {
-  return cli_->Put(path, headers, items, provider_items);
-}
-inline Result Client::Patch(const std::string &path) {
-  return cli_->Patch(path);
-}
-inline Result Client::Patch(const std::string &path, const char *body,
-                            size_t content_length,
-                            const std::string &content_type) {
-  return cli_->Patch(path, body, content_length, content_type);
-}
-inline Result Client::Patch(const std::string &path, const char *body,
-                            size_t content_length,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, body, content_length, content_type, progress);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const char *body, size_t content_length,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, body, content_length, content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const char *body, size_t content_length,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, headers, body, content_length, content_type,
-                     progress);
-}
-inline Result Client::Patch(const std::string &path, const std::string &body,
-                            const std::string &content_type) {
-  return cli_->Patch(path, body, content_type);
-}
-inline Result Client::Patch(const std::string &path, const std::string &body,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, body, content_type, progress);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const std::string &body,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, body, content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const std::string &body,
-                            const std::string &content_type,
-                            Progress progress) {
-  return cli_->Patch(path, headers, body, content_type, progress);
-}
-inline Result Client::Patch(const std::string &path, size_t content_length,
-                            ContentProvider content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, content_length, std::move(content_provider),
-                     content_type);
-}
-inline Result Client::Patch(const std::string &path,
-                            ContentProviderWithoutLength content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, std::move(content_provider), content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            size_t content_length,
-                            ContentProvider content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, content_length, std::move(content_provider),
-                     content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            ContentProviderWithoutLength content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Delete(const std::string &path) {
-  return cli_->Delete(path);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers) {
-  return cli_->Delete(path, headers);
-}
-inline Result Client::Delete(const std::string &path, const char *body,
-                             size_t content_length,
-                             const std::string &content_type) {
-  return cli_->Delete(path, body, content_length, content_type);
-}
-inline Result Client::Delete(const std::string &path, const char *body,
-                             size_t content_length,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, body, content_length, content_type, progress);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const char *body, size_t content_length,
-                             const std::string &content_type) {
-  return cli_->Delete(path, headers, body, content_length, content_type);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const char *body, size_t content_length,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, headers, body, content_length, content_type,
-                      progress);
-}
-inline Result Client::Delete(const std::string &path, const std::string &body,
-                             const std::string &content_type) {
-  return cli_->Delete(path, body, content_type);
-}
-inline Result Client::Delete(const std::string &path, const std::string &body,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, body, content_type, progress);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const std::string &body,
-                             const std::string &content_type) {
-  return cli_->Delete(path, headers, body, content_type);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const std::string &body,
-                             const std::string &content_type,
-                             Progress progress) {
-  return cli_->Delete(path, headers, body, content_type, progress);
-}
-inline Result Client::Options(const std::string &path) {
-  return cli_->Options(path);
-}
-inline Result Client::Options(const std::string &path, const Headers &headers) {
-  return cli_->Options(path, headers);
-}
-
-inline bool Client::send(Request &req, Response &res, Error &error) {
-  return cli_->send(req, res, error);
-}
-
-inline Result Client::send(const Request &req) { return cli_->send(req); }
-
-inline void Client::stop() { cli_->stop(); }
-
-inline std::string Client::host() const { return cli_->host(); }
-
-inline int Client::port() const { return cli_->port(); }
-
-inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
-
-inline socket_t Client::socket() const { return cli_->socket(); }
-
-inline void
-Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
-  cli_->set_hostname_addr_map(std::move(addr_map));
-}
-
-inline void Client::set_default_headers(Headers headers) {
-  cli_->set_default_headers(std::move(headers));
-}
-
-inline void Client::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  cli_->set_header_writer(writer);
-}
-
-inline void Client::set_address_family(int family) {
-  cli_->set_address_family(family);
-}
-
-inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }
-
-inline void Client::set_socket_options(SocketOptions socket_options) {
-  cli_->set_socket_options(std::move(socket_options));
-}
-
-inline void Client::set_connection_timeout(time_t sec, time_t usec) {
-  cli_->set_connection_timeout(sec, usec);
-}
-
-inline void Client::set_read_timeout(time_t sec, time_t usec) {
-  cli_->set_read_timeout(sec, usec);
-}
-
-inline void Client::set_write_timeout(time_t sec, time_t usec) {
-  cli_->set_write_timeout(sec, usec);
-}
-
-inline void Client::set_basic_auth(const std::string &username,
-                                   const std::string &password) {
-  cli_->set_basic_auth(username, password);
-}
-inline void Client::set_bearer_token_auth(const std::string &token) {
-  cli_->set_bearer_token_auth(token);
-}
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_digest_auth(const std::string &username,
-                                    const std::string &password) {
-  cli_->set_digest_auth(username, password);
-}
-#endif
-
-inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); }
-inline void Client::set_follow_location(bool on) {
-  cli_->set_follow_location(on);
-}
-
-inline void Client::set_url_encode(bool on) { cli_->set_url_encode(on); }
-
-inline void Client::set_compress(bool on) { cli_->set_compress(on); }
-
-inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
-
-inline void Client::set_interface(const std::string &intf) {
-  cli_->set_interface(intf);
-}
-
-inline void Client::set_proxy(const std::string &host, int port) {
-  cli_->set_proxy(host, port);
-}
-inline void Client::set_proxy_basic_auth(const std::string &username,
-                                         const std::string &password) {
-  cli_->set_proxy_basic_auth(username, password);
-}
-inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
-  cli_->set_proxy_bearer_token_auth(token);
-}
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_proxy_digest_auth(const std::string &username,
-                                          const std::string &password) {
-  cli_->set_proxy_digest_auth(username, password);
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::enable_server_certificate_verification(bool enabled) {
-  cli_->enable_server_certificate_verification(enabled);
-}
-
-inline void Client::enable_server_hostname_verification(bool enabled) {
-  cli_->enable_server_hostname_verification(enabled);
-}
-
-inline void Client::set_server_certificate_verifier(
-    std::function<bool(SSL *ssl)> verifier) {
-  cli_->set_server_certificate_verifier(verifier);
-}
-#endif
-
-inline void Client::set_logger(Logger logger) {
-  cli_->set_logger(std::move(logger));
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
-                                     const std::string &ca_cert_dir_path) {
-  cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
-}
-
-inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (is_ssl_) {
-    static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
-  } else {
-    cli_->set_ca_cert_store(ca_cert_store);
-  }
-}
-
-inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
-  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
-}
-
-inline long Client::get_openssl_verify_result() const {
-  if (is_ssl_) {
-    return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
-  }
-  return -1; // NOTE: -1 doesn't match any of X509_V_ERR_???
-}
-
-inline SSL_CTX *Client::ssl_context() const {
-  if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); }
-  return nullptr;
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-} // namespace httplib
-
-#if defined(_WIN32) && defined(CPPHTTPLIB_USE_POLL)
-#undef poll
-#endif
-
-#endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/code/cpp-httplib-0.19.0/meson.build b/code/cpp-httplib-0.19.0/meson.build
deleted file mode 100644
index 9fa1919c..00000000
--- a/code/cpp-httplib-0.19.0/meson.build
+++ /dev/null
@@ -1,116 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-project(
-  'cpp-httplib',
-  'cpp',
-  license: 'MIT',
-  default_options: [
-    'cpp_std=c++11',
-    'buildtype=release',
-    'b_ndebug=if-release',
-    'b_lto=true',
-    'warning_level=3'
-  ],
-  meson_version: '>=0.62.0'
-)
-
-# Check just in case downstream decides to edit the source
-# and add a project version
-version = meson.project_version()
-if version == 'undefined'
-  cxx = meson.get_compiler('cpp')
-  version = cxx.get_define('CPPHTTPLIB_VERSION',
-    prefix: '#include <httplib.h>',
-    include_directories: include_directories('.')).strip('"')
-  assert(version != '', 'failed to get version from httplib.h')
-endif
-
-deps = [dependency('threads')]
-args = []
-
-openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('cpp-httplib_openssl'))
-if openssl_dep.found()
-  deps += openssl_dep
-  args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
-  if host_machine.system() == 'darwin'
-    macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('cpp-httplib_macosx_keychain'))
-    if macosx_keychain_dep.found()
-        deps += macosx_keychain_dep
-        args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN'
-    endif  
-  endif
-endif
-
-zlib_dep = dependency('zlib', required: get_option('cpp-httplib_zlib'))
-if zlib_dep.found()
-  deps += zlib_dep
-  args += '-DCPPHTTPLIB_ZLIB_SUPPORT'
-endif
-
-brotli_deps = [dependency('libbrotlicommon', required: get_option('cpp-httplib_brotli'))]
-brotli_deps += dependency('libbrotlidec',    required: get_option('cpp-httplib_brotli'))
-brotli_deps += dependency('libbrotlienc',    required: get_option('cpp-httplib_brotli'))
-
-brotli_found_all = true
-foreach brotli_dep : brotli_deps
-  if not brotli_dep.found()
-    brotli_found_all = false
-  endif
-endforeach
-
-if brotli_found_all
-  deps += brotli_deps
-  args += '-DCPPHTTPLIB_BROTLI_SUPPORT'
-endif
-
-cpp_httplib_dep = dependency('', required: false)
-
-if get_option('cpp-httplib_compile')
-  python3 = find_program('python3')
-
-  httplib_ch = custom_target(
-    'split',
-    input: 'httplib.h',
-    output: ['httplib.cc', 'httplib.h'],
-    command: [python3, files('split.py'), '--out', meson.current_build_dir()],
-    install: true,
-    install_dir: [false, get_option('includedir')]
-  )
-  lib = library(
-    'cpp-httplib',
-    sources: httplib_ch,
-    dependencies: deps,
-    cpp_args: args,
-    version: version,
-    soversion: version.split('.')[0] + '.' + version.split('.')[1],
-    install: true
-  )
-  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, link_with: lib, sources: httplib_ch[1])
-
-  import('pkgconfig').generate(
-    lib,
-    description: 'A C++ HTTP/HTTPS server and client library',
-    extra_cflags: args,
-    url: 'https://github.com/yhirose/cpp-httplib',
-    version: version
-  )
-else
-  install_headers('httplib.h')
-  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, include_directories: '.')
-
-  import('pkgconfig').generate(
-    name: 'cpp-httplib',
-    description: 'A C++ HTTP/HTTPS server and client library',
-    install_dir: get_option('datadir')/'pkgconfig',
-    url: 'https://github.com/yhirose/cpp-httplib',
-    version: version
-  )
-endif
-
-meson.override_dependency('cpp-httplib', cpp_httplib_dep)
-
-if get_option('cpp-httplib_test')
-  subdir('test')
-endif
diff --git a/code/cpp-httplib-0.19.0/meson_options.txt b/code/cpp-httplib-0.19.0/meson_options.txt
deleted file mode 100644
index e15847d4..00000000
--- a/code/cpp-httplib-0.19.0/meson_options.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-option('cpp-httplib_openssl', type: 'feature', value: 'auto', description: 'Enable OpenSSL support')
-option('cpp-httplib_zlib',    type: 'feature', value: 'auto', description: 'Enable zlib support')
-option('cpp-httplib_brotli',  type: 'feature', value: 'auto', description: 'Enable Brotli support')
-option('cpp-httplib_macosx_keychain', type: 'feature', value: 'auto', description: 'Enable loading certs from the Keychain on Apple devices')
-option('cpp-httplib_compile', type: 'boolean', value: false,  description: 'Split the header into a compilable header & source file (requires python3)')
-option('cpp-httplib_test',    type: 'boolean', value: false,  description: 'Build tests')
diff --git a/code/cpp-httplib-0.19.0/split.py b/code/cpp-httplib-0.19.0/split.py
deleted file mode 100644
index 4d8b3074..00000000
--- a/code/cpp-httplib-0.19.0/split.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-
-"""This script splits httplib.h into .h and .cc parts."""
-
-import argparse
-import os
-import sys
-
-border = '// ----------------------------------------------------------------------------'
-
-args_parser = argparse.ArgumentParser(description=__doc__)
-args_parser.add_argument(
-    "-e", "--extension", help="extension of the implementation file (default: cc)",
-    default="cc"
-)
-args_parser.add_argument(
-    "-o", "--out", help="where to write the files (default: out)", default="out"
-)
-args = args_parser.parse_args()
-
-cur_dir = os.path.dirname(sys.argv[0])
-lib_name = 'httplib'
-header_name = '/' + lib_name + '.h'
-source_name = '/' + lib_name + '.' + args.extension
-# get the input file
-in_file = cur_dir + header_name
-# get the output file
-h_out = args.out + header_name
-cc_out = args.out + source_name
-
-# if the modification time of the out file is after the in file,
-# don't split (as it is already finished)
-do_split = True
-
-if os.path.exists(h_out):
-    in_time = os.path.getmtime(in_file)
-    out_time = os.path.getmtime(h_out)
-    do_split = in_time > out_time
-
-if do_split:
-    with open(in_file) as f:
-        lines = f.readlines()
-
-    python_version = sys.version_info[0]
-    if python_version < 3:
-        os.makedirs(args.out)
-    else:
-        os.makedirs(args.out, exist_ok=True)
-
-    in_implementation = False
-    cc_out = args.out + source_name
-    with open(h_out, 'w') as fh, open(cc_out, 'w') as fc:
-        fc.write('#include "httplib.h"\n')
-        fc.write('namespace httplib {\n')
-        for line in lines:
-            is_border_line = border in line
-            if is_border_line:
-                in_implementation = not in_implementation
-            elif in_implementation:
-                fc.write(line.replace('inline ', ''))
-            else:
-                fh.write(line)
-        fc.write('} // namespace httplib\n')
-
-    print("Wrote {} and {}".format(h_out, cc_out))
-else:
-    print("{} and {} are up to date".format(h_out, cc_out))
diff --git a/code/cpp-httplib-0.19.0/test/CMakeLists.txt b/code/cpp-httplib-0.19.0/test/CMakeLists.txt
deleted file mode 100644
index a9982b92..00000000
--- a/code/cpp-httplib-0.19.0/test/CMakeLists.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-find_package(GTest)
-
-if(GTest_FOUND)
-    if(NOT TARGET GTest::gtest_main AND TARGET GTest::Main)
-        # CMake <3.20
-        add_library(GTest::gtest_main INTERFACE IMPORTED)
-        target_link_libraries(GTest::gtest_main INTERFACE GTest::Main)
-    endif()
-else()
-    if(POLICY CMP0135)
-        cmake_policy(SET CMP0135 NEW)
-    endif()
-
-    include(FetchContent)
-
-    set(BUILD_GMOCK OFF)
-    set(INSTALL_GTEST OFF)
-    set(gtest_force_shared_crt ON)
-
-    FetchContent_Declare(
-        gtest
-        URL https://github.com/google/googletest/archive/main.tar.gz
-    )
-    FetchContent_MakeAvailable(gtest)
-endif()
-
-find_package(CURL REQUIRED)
-
-add_executable(httplib-test test.cc)
-target_compile_options(httplib-test PRIVATE "$<$<CXX_COMPILER_ID:MSVC>:/utf-8;/bigobj>")
-target_link_libraries(httplib-test PRIVATE httplib GTest::gtest_main CURL::libcurl)
-gtest_discover_tests(httplib-test)
-
-file(
-    COPY www www2 www3 ca-bundle.crt image.jpg
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-if(HTTPLIB_IS_USING_OPENSSL)
-    if (OPENSSL_VERSION VERSION_LESS "3.2.0")
-      set(OPENSSL_X509_FLAG "-x509")
-    else()
-      set(OPENSSL_X509_FLAG "-x509v1")
-    endif()
-    find_program(OPENSSL_COMMAND
-        NAMES openssl
-        PATHS ${OPENSSL_INCLUDE_DIR}/../bin
-        REQUIRED
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa 2048
-        OUTPUT_FILE key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem
-        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key.pem
-        OUTPUT_FILE cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa 2048
-        OUTPUT_FILE rootCA.key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
-        OUTPUT_FILE rootCA.cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa 2048
-        OUTPUT_FILE client.key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client.key.pem
-        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
-        OUTPUT_FILE client.cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa -passout pass:test123! 2048
-        OUTPUT_FILE key_encrypted.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key_encrypted.pem
-        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key_encrypted.pem
-        OUTPUT_FILE cert_encrypted.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa -aes256 -passout pass:test012! 2048
-        OUTPUT_FILE client_encrypted.key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client_encrypted.key.pem -passin pass:test012!
-        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
-        OUTPUT_FILE client_encrypted.cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-endif()
-
-add_subdirectory(fuzzing)
diff --git a/code/cpp-httplib-0.19.0/test/Makefile b/code/cpp-httplib-0.19.0/test/Makefile
deleted file mode 100644
index 152f9098..00000000
--- a/code/cpp-httplib-0.19.0/test/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-CXX = clang++
-CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
-
-PREFIX ?= $(shell brew --prefix)
-
-OPENSSL_DIR = $(PREFIX)/opt/openssl@3
-OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
-
-ifneq ($(OS), Windows_NT)
-	UNAME_S := $(shell uname -s)
-	ifeq ($(UNAME_S), Darwin)
-		OPENSSL_SUPPORT += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework CoreFoundation -framework Security
-	endif
-endif
-
-ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
-
-BROTLI_DIR = $(PREFIX)/opt/brotli
-BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
-
-TEST_ARGS = gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread -lcurl
-
-# By default, use standalone_fuzz_target_runner.
-# This runner does no fuzzing, but simply executes the inputs
-# provided via parameters.
-# Run e.g. "make all LIB_FUZZING_ENGINE=/path/to/libFuzzer.a"
-# to link the fuzzer(s) against a real fuzzing engine.
-# OSS-Fuzz will define its own value for LIB_FUZZING_ENGINE.
-LIB_FUZZING_ENGINE ?= standalone_fuzz_target_runner.o
-
-all : test test_split
-	./test
-
-proxy : test_proxy
-	./test_proxy
-
-test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
-	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS)
-
-# Note: The intention of test_split is to verify that it works to compile and
-# link the split httplib.h, so there is normally no need to execute it.
-test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem
-	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS)
-
-check_abi:
-	@./check-shared-library-abi-compatibility.sh
-
-test_proxy : test_proxy.cc ../httplib.h Makefile cert.pem
-	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS)
-
-# Runs server_fuzzer.cc based on value of $(LIB_FUZZING_ENGINE).
-# Usage: make fuzz_test LIB_FUZZING_ENGINE=/path/to/libFuzzer
-fuzz_test: server_fuzzer
-	./server_fuzzer fuzzing/corpus/*
-
-# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
-server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h standalone_fuzz_target_runner.o
-	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) -pthread
-
-# Standalone fuzz runner, which just reads inputs from fuzzing/corpus/ dir and
-# feeds it to server_fuzzer.
-standalone_fuzz_target_runner.o : fuzzing/standalone_fuzz_target_runner.cpp
-	$(CXX) -o $@ -I.. $(CXXFLAGS) -c $<
-
-httplib.cc : ../httplib.h
-	python3 ../split.py -o .
-
-cert.pem:
-	./gen-certs.sh
-
-clean:
-	rm -rf test test_split test_proxy server_fuzzer *.pem *.0 *.o *.1 *.srl httplib.h httplib.cc _build*
-
diff --git a/code/cpp-httplib-0.19.0/test/ca-bundle.crt b/code/cpp-httplib-0.19.0/test/ca-bundle.crt
deleted file mode 100644
index 7d61eb5c..00000000
--- a/code/cpp-httplib-0.19.0/test/ca-bundle.crt
+++ /dev/null
@@ -1,3401 +0,0 @@
-##
-## Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Tue Jan 22 14:14:40 2019 GMT
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: 18372117493b5b7ec006c31d966143fc95a9464a2b5f8d5188e23c5557b2292d
-##
-
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
-KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
-T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
-J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
-nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-========================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
-Actalis Authentication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
-BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
-AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
-MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
-IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
-wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
-by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
-zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
-YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
-oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
-EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
-hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
-EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
-jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
-iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
-WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
-JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
-K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
-Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
-4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
-2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
-lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
-OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
-vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
-Buypass Class 2 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
-DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
-g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
-9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
-/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
-CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
-awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
-zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
-Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
-Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
-M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
-osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
-aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
-DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
-LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
-oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
-wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
-CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
-rJgWVqA=
------END CERTIFICATE-----
-
-Buypass Class 3 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
-DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
-sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
-5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
-7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
-ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
-2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
-/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
-RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
-Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
-j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
-uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
-Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
-ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
-KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
-6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
-UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
-eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
-Cp/HuZc=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 3
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
-MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
-9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
-NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
-iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
-0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
-AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
-fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
-ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
-P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
------END CERTIFICATE-----
-
-EE Certification Centre Root CA
-===============================
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
-dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
-MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
-UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
-ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
-TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
-rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
-93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
-P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
-MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
-BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
-xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
-lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
-3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
-dcGWxZ0=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
-Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
-LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
-ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
-BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
-KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
-p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
-AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
-4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
-eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
-MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
-PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
-OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
-2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
-dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
-X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 EV 2009
-=================================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
-egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
-zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
-7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
-sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
-11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
-cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
-ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
-MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
-b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
-c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
-PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
-ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
-NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
-w9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-CA Disig Root R2
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
-w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
-xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
-A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
-GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
-g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
-5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
-koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
-Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
-Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
-Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
-sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
-dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
-1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
-mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
-utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
-sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
-UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
-7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-ACCVRAIZ1
-=========
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
-SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
-MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
-UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
-jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
-RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
-aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
-0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
-WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
-8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
-5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
-9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
-Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
-Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
-Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
-Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
-QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
-AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
-YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
-AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
-IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
-aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
-dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
-MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
-hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
-R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
-YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
-nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
-TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
-sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
-Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
-3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
-EfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-TWCA Global Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
-CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
-QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
-EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
-nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
-r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
-Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
-tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
-KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
-sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
-yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
-kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
-zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
-cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
-8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
-/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
-lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
-A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
-i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
-EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
-zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
------END CERTIFICATE-----
-
-TeliaSonera Root CA v1
-======================
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
-CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
-MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
-VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
-6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
-3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
-B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
-Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
-oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
-F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
-oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
-gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
-TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
-AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
-DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
-zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
-pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
-G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
-c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
-JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
-qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
-Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
-WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
-
-E-Tugra Certification Authority
-===============================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
-DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
-ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
-ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
-NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
-QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
-cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
-DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
-hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
-CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
-ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
-BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
-E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
-rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
-jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
-rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
-dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
-kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
-XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
-VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
-a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
-dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
-KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
-Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
-8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
-C7TbO6Orb1wdtn7os4I07QZcJA==
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 2
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
-MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
-SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
-vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
-2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
-WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
-YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
-r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
-vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
-3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
------END CERTIFICATE-----
-
-Atos TrustedRoot 2011
-=====================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
-cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
-MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
-A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
-hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
-54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
-DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
-HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
-z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
-l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
-bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
-k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
-TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
-61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
-3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
-
-QuoVadis Root CA 1 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
-PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
-PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
-Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
-ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
-g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
-7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
-9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
-iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
-t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
-hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
-GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
-Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
-+V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
-3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
-wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
-O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
-FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
-hMJKzRwuJIczYOXD
------END CERTIFICATE-----
-
-QuoVadis Root CA 2 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
-ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
-NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
-oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
-MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
-V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
-L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
-sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
-6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
-lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
-hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
-pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
-x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
-dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
-U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
-mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
-zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
-JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
-O3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-QuoVadis Root CA 3 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
-IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
-Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
-6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
-I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
-VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
-5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
-Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
-dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
-rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
-hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
-t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
-TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
-DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
-Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
-hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
-0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
-dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
-PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G2
-===========================
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
-MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
-35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
-bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
-VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
-YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
-lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
-w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
-0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
-d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
-hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
-jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G3
-===========================
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
-VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
-RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
-KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
-UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
-YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
-1vUhZscv6pZjamVFkpUBtA==
------END CERTIFICATE-----
-
-DigiCert Global Root G2
-=======================
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
-MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
-kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
-3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
-BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
-UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
-o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
-5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
-F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
-WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
-QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
-iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
-
-DigiCert Global Root G3
-=======================
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
-VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
-MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
-aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
-AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
-YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
-Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
-3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
-VOKa5Vt8sycX
------END CERTIFICATE-----
-
-DigiCert Trusted Root G4
-========================
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
-HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
-pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
-k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
-vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
-QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
-MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
-mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
-f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
-dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
-oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
-ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
-yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
-7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
-ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
-5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
-/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
-5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
-G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
-82Z+
------END CERTIFICATE-----
-
-COMODO RSA Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
-dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
-FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
-5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
-x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
-2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
-OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
-sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
-GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
-WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
-rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
-nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
-tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
-sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
-pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
-zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
-ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
-7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
-LaZRfyHBNVOFBkpdn627G190
------END CERTIFICATE-----
-
-USERTrust RSA Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
-0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
-Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
-RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
-+T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
-/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
-Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
-lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
-yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
-eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
-FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
-7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
-Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
-8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
-FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
-yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
-J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
-sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
-Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
-
-USERTrust ECC Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
-0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
-nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
-HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
-HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
-9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R4
-===========================
------BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
-OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
-AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
-MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
-JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R5
-===========================
------BEGIN CERTIFICATE-----
-MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
-SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
-h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
-uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
-yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G3
-==================================
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
-olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
-x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
-EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
-Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
-mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
-1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
-07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
-FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
-41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
-AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
-yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
-U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
-KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
-v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
-8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
-8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
-mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
-1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
-JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
-tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
------END CERTIFICATE-----
-
-Staat der Nederlanden EV Root CA
-================================
------BEGIN CERTIFICATE-----
-MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
-MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
-cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
-SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
-O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
-0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
-Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
-XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
-08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
-0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
-74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
-fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
-ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
-eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
-c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
-5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
-b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
-f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
-5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
-WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
-DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
-eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
------END CERTIFICATE-----
-
-IdenTrust Commercial Root CA 1
-==============================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
-b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
-IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
-hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
-mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
-1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
-XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
-3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
-NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
-WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
-xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
-uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
-hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
-6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
-ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
-ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
-YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
-feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
-kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
-2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
-Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
-cGzM7vRX+Bi6hG6H
------END CERTIFICATE-----
-
-IdenTrust Public Sector Root CA 1
-=================================
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
-ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
-UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
-b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
-P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
-Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
-rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
-qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
-mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
-ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
-LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
-iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
-4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
-Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
-DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
-t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
-mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
-GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
-m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
-NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
-Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
-ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
-ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
-3Wl9af0AVqW3rLatt8o+Ae+c
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
-bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
-HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
-DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
-OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
-/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
-HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
-s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
-TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
-AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
-0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
-iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
-nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
-vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
-e4pIb4tF9g==
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - EC1
-==========================================
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
-FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
-YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
-FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
-LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
-dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
-AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
-9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
-vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
-kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
-CFCA EV ROOT
-============
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
-CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
-IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
-MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
-DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
-BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
-7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
-uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
-ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
-xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
-py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
-gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
-hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
-tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
-ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
-ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
-4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
-E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
-BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
-aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
-PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
-kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
-ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
------END CERTIFICATE-----
-
-Certinomis - Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
-LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
-EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
-ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
-P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
-d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
-z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
-8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
-RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
-6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
-FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
-PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
-i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
-YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
-6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
-WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
-Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
-lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
-y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
-Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
-DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
-I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
-cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
-hkIGuUE=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GB CA
-===============================
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
-EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
-MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
-b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
-scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
-rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
-9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
-Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
-GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
-hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
-dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
-VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
-HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
-Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
------END CERTIFICATE-----
-
-SZAFIR ROOT CA2
-===============
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
-A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
-BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
-BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
-VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
-qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
-DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
-2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
-ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
-ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
-AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
-O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
-oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
-4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
-+/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
------END CERTIFICATE-----
-
-Certum Trusted Network CA 2
-===========================
------BEGIN CERTIFICATE-----
-MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
-BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
-bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
-ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
-TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
-IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
-7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
-CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
-Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
-uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
-GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
-9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
-Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
-hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
-BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
-hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
-Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
-L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
-clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
-pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
-w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
-J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
-ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
-is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
-zAYspsbiDrW5viSP
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2015
-=======================================================
------BEGIN CERTIFICATE-----
-MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
-BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
-aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
-YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
-MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
-QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
-BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
-MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
-bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
-iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
-6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
-FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
-i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
-GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
-fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
-iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
-Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
-hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
-D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
-d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
-d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
-82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
-davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
-Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
-J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
-JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
-p/UsQu0yrbYhnr68
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions ECC RootCA 2015
-===========================================================
------BEGIN CERTIFICATE-----
-MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
-aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
-cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
-aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
-MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
-IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
-VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
-Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
-dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
-Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
-GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
-dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
------END CERTIFICATE-----
-
-ISRG Root X1
-============
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
-BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
-EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
-EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
-DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
-Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
-3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
-b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
-Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
-4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
-1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
-hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
-usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
-OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
-A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
-9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
-0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
-hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
-TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
-e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
-JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
-YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
-JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
-m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----
-
-AC RAIZ FNMT-RCM
-================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
-AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
-MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
-TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
-qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
-btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
-j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
-08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
-WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
-tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
-47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
-ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
-i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
-dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
-nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
-D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
-j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
-Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
-+YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
-Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
-8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
-5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
-rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
------END CERTIFICATE-----
-
-Amazon Root CA 1
-================
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
-MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
-FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
-gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
-dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
-VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
-DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
-CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
-8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
-2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
-xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
------END CERTIFICATE-----
-
-Amazon Root CA 2
-================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
-MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
-kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
-N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
-AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
-fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
-kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
-btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
-Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
-c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
-3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
-DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
-A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
-+gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
-YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
-xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
-gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
-aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
-Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
-KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
-JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
------END CERTIFICATE-----
-
-Amazon Root CA 3
-================
------BEGIN CERTIFICATE-----
-MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
-f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
-Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
-rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
-eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
------END CERTIFICATE-----
-
-Amazon Root CA 4
-================
------BEGIN CERTIFICATE-----
-MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
-/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
-83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
-MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
-AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
------END CERTIFICATE-----
-
-LuxTrust Global Root 2
-======================
------BEGIN CERTIFICATE-----
-MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
-A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
-bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
-MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
-Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
-xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
-wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
-1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
-FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
-wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
-a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
-ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
-MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
-/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
-Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
-+Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
-FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
-H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
-7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
-ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
-VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
-TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
-/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
-7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
-iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
------END CERTIFICATE-----
-
-TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
-D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
-IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
-TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
-ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
-VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
-c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
-bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
-IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
-6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
-wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
-3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
-WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
-ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
-KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
-AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
-lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
-e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
-q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
------END CERTIFICATE-----
-
-GDCA TrustAUTH R5 ROOT
-======================
------BEGIN CERTIFICATE-----
-MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
-BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
-DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
-YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
-IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
-AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
-OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
-pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
-9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
-xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
-R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
-D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
-oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
-9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
-p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
-H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
-6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
-+PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
-HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
-F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
-8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
-/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
-aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
------END CERTIFICATE-----
-
-TrustCor RootCert CA-1
-======================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
-MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
-YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
-VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
-dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
-jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
-pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
-JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
-gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
-/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
-BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
-mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
-ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
-qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
-3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
------END CERTIFICATE-----
-
-TrustCor RootCert CA-2
-======================
------BEGIN CERTIFICATE-----
-MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
-DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
-eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
-eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
-MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
-bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
-IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
-ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
-RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
-oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
-XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
-/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
-jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
-eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
-rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
-8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
-2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
-Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
-kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
-2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
-S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
-PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
-DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
-RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
-xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
-RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
------END CERTIFICATE-----
-
-TrustCor ECA-1
-==============
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
-N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
-MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
-IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
-MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
-xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
-p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
-fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
-YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
-f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
-AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
-/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
-hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
-J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
-jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority RSA
-========================================
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
-BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
-MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
-MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
-LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
-Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
-P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
-oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
-k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
-fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
-gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
-UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
-1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
-bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
-dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
-ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
-u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
-erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
-MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
-vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
-Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
-wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
-WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority ECC
-========================================
------BEGIN CERTIFICATE-----
-MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
-BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
-MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
-BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
-bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
-8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
-hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
-jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
-e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
-5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority RSA R2
-==============================================
------BEGIN CERTIFICATE-----
-MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
-DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
-MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
-MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
-DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
-VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
-hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
-cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
-Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
-B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
-CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
-9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
-RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
-JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
-+qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
-HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
-qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
-++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
-Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
-guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
-OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
-CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
-lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
-rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
-hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
-9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority ECC
-===========================================
------BEGIN CERTIFICATE-----
-MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
-BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
-MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
-LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
-3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
-BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
-5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
-N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
-m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R6
-=======================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
-R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
-b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
-YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
-U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
-grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
-3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
-vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
-PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
-azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
-WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
-CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
-0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
-b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
-HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
-nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
-lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
-BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
-Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
-3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
-0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
-uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
-oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
-JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GC CA
-===============================
------BEGIN CERTIFICATE-----
-MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
-SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
-MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
-Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
-ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
-bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
-VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
-NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
-AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
-AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
------END CERTIFICATE-----
-
-GTS Root R1
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
-9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
-aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
-r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
-LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
-4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
-06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
-wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
-3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
-JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
-BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
-d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
-fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
-ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
-gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
-4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
-tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
-pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
-sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
-CFF1pkgl
------END CERTIFICATE-----
-
-GTS Root R2
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
-k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
-7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
-m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
-dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
-ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
-cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
-Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
-aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
-5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
-BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
-vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
-+YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
-c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
-WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
-n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
-Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
-7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
-gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
-o/DUhgkC
------END CERTIFICATE-----
-
-GTS Root R3
-===========
------BEGIN CERTIFICATE-----
-MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
-Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
-0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
-glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
-KaqW04MjyaR7YbPMAuhd
------END CERTIFICATE-----
-
-GTS Root R4
-===========
------BEGIN CERTIFICATE-----
-MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
-6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
-2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
-N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
-zPKwTdb+mciUqXWi4w==
------END CERTIFICATE-----
-
-UCA Global G2 Root
-==================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
-NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
-cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
-oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
-8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
-h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
-LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
-R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
-KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
-4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
-OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
-8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
-5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
-1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
-Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
-yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
-c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
-jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
-bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
-ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
-RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
------END CERTIFICATE-----
-
-UCA Extended Validation Root
-============================
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
-IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
-A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
-iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
-Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
-eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
-59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
-0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
-el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
-B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
-WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
-NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
-3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
-ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
-aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
-dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
-+7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
-F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
-GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
-GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
-djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
-dhh2n1ax
------END CERTIFICATE-----
-
-Certigna Root CA
-================
------BEGIN CERTIFICATE-----
-MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
-BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
-MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
-MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
-MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
-stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
-KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
-JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
-XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
-4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
-wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
-lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
-jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
-/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
-1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
-dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
-LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
-cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
-OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
-TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
-7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
-4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
-8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
-6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
-tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
-aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
-E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
------END CERTIFICATE-----
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt b/code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt
deleted file mode 100644
index 7e416c7e..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-file(GLOB HTTPLIB_CORPUS corpus/*)
-add_executable(httplib-test-fuzz
-    server_fuzzer.cc
-    standalone_fuzz_target_runner.cpp
-)
-target_link_libraries(httplib-test-fuzz PRIVATE httplib)
-add_test(
-    NAME httplib-test-fuzz
-    COMMAND httplib-test-fuzz ${HTTPLIB_CORPUS}
-)
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/Makefile b/code/cpp-httplib-0.19.0/test/fuzzing/Makefile
deleted file mode 100644
index d6a3e21b..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#CXX = clang++
-# Do not add default sanitizer flags here as OSS-fuzz adds its own sanitizer flags.
-CXXFLAGS += -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I../.. -I. -Wall -Wextra -Wtype-limits -Wconversion
-
-OPENSSL_DIR = /usr/local/opt/openssl@1.1
-
-# Using full path to libssl and libcrypto to avoid accidentally picking openssl libs brought in by msan.
-OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -I$(OPENSSL_DIR)/lib  /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a
-
-ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
-
-BROTLI_DIR = /usr/local/opt/brotli
-# BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
-
-# Runs all the tests and also fuzz tests against seed corpus.
-all : server_fuzzer
-	./server_fuzzer corpus/*
-
-# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
-server_fuzzer : server_fuzzer.cc ../../httplib.h
-# 	$(CXX) $(CXXFLAGS) -o $@  $<  -Wl,-Bstatic $(OPENSSL_SUPPORT)  -Wl,-Bdynamic -ldl  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
-	$(CXX) $(CXXFLAGS) -o $@  $<  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
-	zip -q -r server_fuzzer_seed_corpus.zip corpus
-
-clean:
-	rm -f server_fuzzer pem *.0 *.o *.1 *.srl *.zip
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/1 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/1
deleted file mode 100644
index 2b9fcc44..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/1
+++ /dev/null
@@ -1 +0,0 @@
-PUT /search/sample?a=12 HTTP/1.1
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/2 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/2
deleted file mode 100644
index bdb9bcce..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/2
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /hello.htm HTTP/1.1
-User-Agent: Mozilla/4.0 (compatible; MSIE5.01; Windows NT)
-Accept-Language: en-us
-Accept-Encoding: gzip, deflate
-Connection: Keep-Alive
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/3 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/3
deleted file mode 100644
index 878944f52b023cb0b609e3f5173b361d6ab96c67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
zcmWIW4-Qe#SMUf43D7sxGvMWN&d)1J%`4G$%}dTt$;?Z)N=Z%2Ni0d_<>KYC=w)VL
JU|?Wm005?e4gdfE

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088
deleted file mode 100644
index 0325729036eeef76902e138b0f0edad8fe884429..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 516575
zcmWFt4N<sl&!~1wO-((PT`fyZPR&})S4}|ewAw4R0<|)=e6>=wQ)(P)MQS~2ztv>b
z?yISltEsCkR-2&U5fT!hZ>VR$%N3Mpn;vGB6cFU8VC0&YoS%}J2Vx(FC^678fGRcQ
z<#P7VD@n~O(Zy5-Hpw|3A{|m$kZP4%np2WlkXTfrpO#;gtDBNol9-fVnwOGTRB4;b
z%jG<ft~CJpn<UpleFpV-x>b5rW&tl3FPB9x7X!n8Fydfy{Qv)dR`RWa<PvTMFaU*|
zv2Ji`Nl9j2dNCg_m({21Tvoii5M0V@Vq#)qY-3|nV`BqinwS`CLwGg_kXn?Nn4=J!
zT2z)=q~KaqlwX99v$1JlU|@joBXp5Hr0ZW$l9``Z43V=j0?~^=1Q>Jia_Q>6X5ref
z0n7qL2h@WunZ*V9#hD<zRy;gh2=E^a5(^4)z&>MeyIzr+lbQnJaBy)cb8&$UCQMi&
zlqevWM6xWfs|!vnOVxErEJ?JnA`<K(Qk|6*@hU+^s(}bH@e%U$+2PP;i$k0~!n(#f
zx<)#>W?<4tN7od_HUx_pf<+8<bRk?Lu%M9+NEbv4TncWEDNM1Uj;;w<r71Mcj%G@F
zXG&VvCZw0ow69Ina94h$J9jkYj#ei`6vU&|2{e#K^UDC`7pj!>H0zIymdT?{d}s-Q
zK@s0@CtfAUlF>356be>WR-<L|P%e}4jOCEtoTYv1d$jRAI+g=1chD)~i*Mppg6tT)
z1-&82c|!(|))NC%PuSSl?12xMjt-q-W|+Y_bc*Rts)|%n)ii>J!H1#su_)ETB8Dz>
z7F~dJK0FhE7<9@Aqov+xsYgUg9lVVUA{;-2l#G^opt27GQ+wugwA33d^@u1HMoT>+
z0*MMrMoT@65)ULWTIvm-#X+MzTzuukXb%@(=uk&)w1*2?GCH~>lAcQ<M@v0?d3Utb
z!xuW#ksB@bMoT@=;_uN?4{LrJ?crh#7OD%5_HaQRS`0ke!yWD6;>l~oFN7doCCIwb
zQV$dgw8x{R9!7}=5*RJ@MoT?BnUDCgjChqG>qbjGP$<wIkCu9%LJk9umU^S59-hoc
zd|5`kN|1G<r5-30XpcurJ&Y0$Brsa)jh1?NG9U3}8SyGX){T~WpirPa9xe4ig&YPR
zE%ioAJv^C@__B<6l_2XzOFd91&>oMLdKe`hNMN+o8!h$lWIp1{GU8Q&tQ#%$K%qc;
zJX-333ONisTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^)O02kiclEH(Ki9$$Z3@WyGrl
zSvOkhfkJ`yc(l|56>=DOwA33d_3&gq;>$APRf4P=E%iX5Kzlq|>S2_4Ac4_RZ?x3I
zllh1*%ZOJAvTn501BC+Z@o1?BD&#QmXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)Waz8
zKmwzs-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$NRLEiA(Nb@;)Wehch%d{CR|&FiwA2HI
z0`2i=sfSVGfdocNz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elsF1_Jqov+xsfQ=?5nq-O
zuM%Y4XsHJZ1={1$QV*lV0||_ldZVQtp3FylSw_4{kaeS_9w-!Ok4H;AP$7qbM@zlY
zQV&n&BfcynUM0x7(NYf-3be<gr5;9!2ND=9^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK
zph6A<kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFfJd4<s;J>W!9qcrqXHWf}1*LDr3y
zdZ19CJsvIfK!qFz9xe4oOFcZ9kNC2Tc$FaQMoT?VD9|2{mU<W^9!Oxc)Eh1J@MJ#X
z%QE6sf~*@Y^+2IOdpug|feJYcJX-3FmU?(HAMs@w@hU;qjh1?#P@p{?E%h);JdnU>
zsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^0~K-@c(l|TE%oqZKH|$V;#GpI8!h!fp+I{)
zTIykxcp!n%Qg5`>!;|@lFUyEm39@dq)B}YA?eS=-2P)(+@Mx(wTI%7+e8iV!#H$2Z
zH(Kg}LV@;pwA8~W@jwEjrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4^+ru;L%cVwA90s
z`G_yeh*t@+ZnV?`g#zvIXsL%$;(-K4OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9;lGR
zz@w$!XsL%M^ATT`5w8+t-Ds%?3I*EZ(NYhi!~+S8mU^S59-hocd|5`kN|1G<r5-30
zXpcurJy0Qsfk#Wd(NYgj<|Do=BVHxQy3tY(6biJ*qop23i3buGE%ioAJv^C@__B<6
zl_2XzOFd91&>oMLdZ0oM1CN$^qop36%tw4#M!ZUpb)%&oC=_UqM@v175)ULWTI!9K
zdU!G)@nsqDDnZtbmU^I2pgkTf^+1Ij1|BW-MoT?BnUDCgjChqG>qbjGP$<wIkCu8E
zB_2p%wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>VXP53_M!ujh1?NG9U3}8SyGX){T~W
zpirPa9xe4SN<5IjXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)B_cA7<jbQ8!h$lWIp1{
zGU8Q&tQ#%$K%qc;JX-2u1*4_jXsL%M^ATT`5w8+t-Ds%?3I*EZ(Nb@;)B}e=gsyXb
zUP)?RiEc<`L8`9*XsL%M^ATT`5w8+t-Ds%?3I*EZ(NYhb=h2DLw%%x|hbQw9UzQQC
z5@g+IsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(6biJ*qop3WltU**OTE!j
z4^QSJzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#M!ZUpb)%&oC=_UqM@v0$
zDThvsmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?BnUDCgjChqG>qbjG
zP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguinm_J(Tjh1?NG9U3}
z8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf_0S7EFn_ev
z8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$APRf4P=E%iX5Kzlq|
z>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRDXsI_^>fy<J#Fu5ns{~m$
zTIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z@o1?BF6GdP(Nb@;)Wehc
zh%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$NT*{#n
zqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@OEF)ee$hy%|4-^Wt
z$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8KdZVQtp3FylSw_4{
zkaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}OFi@g56mAe^+roQ
zJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`#~
z9+*E`>W!9qcrqXHWf}1*LDr3ydh`LKr5?DHLnlT{z0pz+PX;8uEF)ee$hy%|4-^Wt
z$D^eldVvS#kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFeKYhfa)^dZVQtp3FylSw_4{
zkaeS_9w-!Ok4H;A^a2meA1(DpOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`e)4xJb+^+roQ
zJeiO9vW$3@AnQg;Jy0mn9*>rK=mj2_KU(UImU?(HAMs@w@hU;qjh1?#P@p{?E%m^q
z96B*t>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;f3(yaE%oqZKH|$V;#GpI8!h!f
zp+I{)TIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p%-{y{%EN;TI%7+e8iV!
z#H$2ZH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^Loe{a{LxZx
zwA90s`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>!;|@lFUyEm39@dq)B}YA?eS=-
zhhE@;`J<)YXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYgw%ApgZrQT?%hbQw9UzQQC5@g+I
zsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(6biJ*qop3WltU**OTE!j4^QSJ
zzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#M!ZUpb)%&oC=_UqM@v0$DThvs
zmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?BnUDCgjChqG>qbjGP$<wI
zkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguinm_J(Tjh1?NG9U3}8SyGX
z){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf_0S7EFn_ev8!h$l
zWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>Y*2S
zVE$;SH(Ki9$$Z3@WyGrlSvOkh(Fcr{df-wHofs|kMoT?B8Ibt0jChqG>qbjGP$<wI
zkCuAq1s<3`TI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^}wYZIx$-6jh1?NG9U3}8SyGX
z){T~WpirPa9xe6I3p_A?wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>VZo+bYisB8!h$l
zWIp1{GU8Q&tQ#%$K%qc;JX-3Z7kFU)XsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)B~4t
z=)`ELH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|*FYv(p(Nb@;)Wehch%d{CR|&FiwA2HI
z0`2i=sRu6Q(23DfZ?x3Illh1*%ZOJAvTn501BC+Z@o1@sUf_ZGqov+xsfQ=?5nq-O
zuM%Y4XsHJZ1={1$QV(3pp%bH}-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$Ny}$$WM@zlY
zQV&n&BfcynUM0x7(NYf-3be<gr5?DHLnlT{z0pz+Pv#@OEF)ee$hy%|4-^Wt$D^el
zdVvS#kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFeKYhfa)^dZVQtp3FylSw_4{kaeS_
z9w-!Ok4H;A^a2meA1(DpOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`e)4xJb+^+roQJeiO9
zvW$3@AnQg;Jy0mn9*>rK=mj2_KU(UImU?(HAMs@w@hU;qjh1?#P@p{?E%m^q96B*t
z>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;f3(yaE%oqZKH|$V;#GpI8!h!fp+I{)
zTIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p%-{y{%EN;TI%7+e8iV!#H$2Z
zH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^Loe{a{LxZxwA90s
z`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>!;|@lFUyEm39@dq)B}YA?eS=-hhE@;
z`J<)YXsL$>5MP!NuM%Y4XsHJZ1={1$QV(3pp%bH}-e{?ZC-V_smJzQKWZh_~2MPt+
z<Iz$Ny}$$WM@zlYQV&n&BfcynUM0x7(NYf-3be<gr5?DHLnlT{z0pz+Pv#@OEF)ee
z$hy%|4-^Wt$D^eldVvS#kCu9)r5>KlM|@dEyh@ODqop1w6ljk}OFeKYhfa)^dZVQt
zp3FylSw_4{kaeS_9w-!Ok4H;A^a2meA1(DpOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`e)
z4xJb+^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK=mj2_KU(UImU?(HAMs@w@hU;qjh1?#
zP@p{?E%m^q96B*t>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;f3(yaE%oqZKH|$V
z;#GpI8!h!fp+I{)TIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p%-{y{%EN;
zTI%7+e8iV!#H$2ZH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^
zLoe{a{LxZxwA90s`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>!;|@lFUyEm39@dq
z)B}YA?eS=-hhE@;`J<)YXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYgw%ApgZrQT?%hbQw9
zUzQQC5@g+IsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(6biJ*qop3WltU**
zOTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#M!ZUpb)%&oC=_Uq
zM@v0$DThvsmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?BnUDCgjChqG
z>qbjGP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguinm_J(Tjh1?N
zG9U3}8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf_0S7E
zFn_ev8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$APRf4P=E%iX5
zKzlq|>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRDXsI_^>fy<J#Fu5n
zs{~m$TIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z@o1?BF6GdP(Nb@;
z)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$N
zT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@OEF)ee$hy%|
z4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8KdZVQtp3Fyl
zSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}OFi@g56mAe
z^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQMoT?VD9|2{
zmU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4mU?(HAMs@w@hU;q
zjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|flE1bVzks7E%oqZ
zKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)>VZOm_IR|^1DA5>
z#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@lFUyEm39@dq)B}YA
z?eS=-2QKB%iP2JTwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0rQT?%hbQw9UzQQC
z5@g+IsRs%L+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh+zytF~OTE!j
z4^QSJzAPhNCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQy3tY(6biJ*qop2J
zFk0%3mU?(HAMs@w@hU;qjh1?#P@p{?E%ioAJ#Yv_=sM@;m89mC=!R4lr0V*QmU?(H
zAMs@w@hU;qjh1?#P@p{?E%m^89-SC%>y4IrcrqXHWf}1*LDr3ydZ19CJsvIf&<i{;
zf3(yaE%oqZKH|$V;#GpI8!h!fp+I{)TIzvIIdo#Q)Eh1J@MJ#X%QE6sf~*@Y^+2IO
zdpug|p%-{y{%EN;TI%7+e8iV!#H$2ZH(Kg}LV@;pwA2Haa_GcpsW)2c;mLf&mu1AO
z1X(v)>VZOm_IR|^Loe{a{LxZxwA90s`G_yeh*t@+ZnV?`g#zvIXsHJ-<<N=IQg5`>
z!;|@lFUyEm39@dq)B}YA?eS=-hhE@;`J<)YXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYgw
z%ApgZrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu552$x^G8d)(NYgj<|Do=BVHxQy3tY(
z6biJ*qop3WltU**OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9(sWX=8u+oqop36%tw4#
zM!ZUpb)%&oC=_UqM@v0$DThvsmU^S59-hocd|5`kN|1G<r5-30XpcurJ@f((%pWcF
zMoT?BnUDCgjChqG>qbjGP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oML
zdguinm_J(Tjh1?NG9U3}8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtb
zmU^I2pgkTf_0S7EFn_ev8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq
z;>$APRf4P=E%iX5Kzlq|>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRD
zXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z
z@o1?BF6GdP(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQK
zWZh_~2MPt+<Iz$NT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+
zPv#@OEF)ee$hy%|4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L
z2j-8KdZVQtp3FylSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w
z6ljk}OFi@g56mAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2T
zc$FaQMoT?VD9|2{mU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4
zmU?(HAMs@w@hU;qjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|
zflE1bVzks7E%oqZKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)
z>VZOm_IR|^1DA5>#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@l
zFUyEm39@dq)B}YA?eS=-2QKB%iP2JTwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0
zrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ
z(NYh+zytF~OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQ
zy3tY(6biJ*qop2tfd}S~mU^S59-hocd|5`kN|1G<r5-30XpcurJ#Z<9PK=g%qop36
z%tw4#M!ZUpb)%&oC=_UqM@v2Q0uRg|E%ioAJv^C@__B<6l_2XzOFd91&>oMLdf-wH
zofs|kMoT?BnUDCgjChqG>qbjGP$<wIkCuAq1s<3`TI!9KdU!G)@nsqDDnZtbmU^I2
zpgkTf^}wYZIx$-6jh1?NG9U3}8SyGX){T~WpirPa9xe6I3p_A?wA33d_3&gq;>$AP
zRf4P=E%oRFMoT?#DThvsmU^S59-a(Hd|5`kN|1G<r5-30XpcurJ@f((%pWcFMoT?B
znUDCgjChqG>qbjGP$<wIkCuAiQVyLME%ioAJv^C@__B<6l_2XzOFd91&>oMLdguin
zm_J(Tjh1?NG9U3}8SyGX){T~WpirPa9xe62r5rjjTI!9KdU!G)@nsqDDnZtbmU^I2
zpgkTf_0S7EFn_ev8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-33OF496wA33d_3&gq;>$AP
zRf4P=E%iX5Kzlq|>Y*2SVE$;SH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|5mvZRDXsI_^
z>fy<J#Fu5ns{~m$TIzv9f%bT`)I%@u!2HotZ?x3Illh1*%ZOJAvTn501BC+Z@o1?B
zF6GdP(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~
z2MPt+<Iz$NT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@O
zEF)ee$hy%|4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8K
zdZVQtp3FylSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}
zOFi@g56mAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQ
zMoT?VD9|2{mU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4mU?(H
zAMs@w@hU;qjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|flE1b
zVzks7E%oqZKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)>VZOm
z_IR|^1DA5>#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!vlyf%ZOJA
zvTn501BC+Z@o1?BF6GdP(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sfS+Rf%&7Q-e{?Z
zC-V_smJzQKWZh_~2MPt+<Iz$NT*{#nqov+xsfQ=?5nq-OuM%Y4XsHJZ1={1$QV+er
z1M^2qz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elxRgUDMoYcXQV&n&BfcynUM0x7(NYf-
z3be<gr5<{L2j-8KdZVQtp3FylSw_4{kaeS_9w-!Ok4H;Aa4CmQjFx(%r5>KlM|@dE
zyh@ODqop1w6ljk}OFi@g56mAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK;8G5q7%lZi
zOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`#~9+*E`>W!9qcrqXHWf}1*LDr3ydZ19CJsvIf
zz@;2IF<R=4mU?(HAMs@w@hU;qjh1?#P@p{?E%nd~JTQN>)Eh1J@MJ#X%QE6sf~*@Y
z^+2IOdpug|flE1bVzks7E%oqZKH|$V;#GpI8!h!fp+I{)TI!(}cwqi$sW)2c;mLf&
zmu1AO1X(v)>VZOm_IR|^1DA5>#AvBETI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}h
zQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2QKB%iP2JTwA90s`G_yeh*t@+ZnV?`g#zvI
zXsL%@;DPz0rQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t
z-Ds%?3I*EZ(NYh+zytF~OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj
z<|Do=BVHxQy3tY(6biJ*qop2tfd}S~mU=^=)WeoLMoSrNp)$~7qooYER6!?3OPL{1
z%AiLY4*njvxCNYr!k~6!Bj@SSQV%&a1`B(%)I-StFb=gdLVjLJYF>%1YhH4GN@iZV
zReDus0WTLXmqjlZ1H*qX;$U<9|Nnnh@~wj85^e@C@CXSBFxCxDEh)*&OE2c*<+A#8
zoy&@s7lKQ9O-xKojBRXeYHVykOcN7hZ3qwM4I3Mq)S|q^9EIT2qO#N?1=pgY{30Yt
zn+6631_(bw*BR=_kjjEoUH{Qi4^I{)zAPhNCCIwb9wjIgXpcurJxHcUBS%ZU(NYgj
z<|Do=BVHxQy3tY(6biJ*qop2Nc?aQ+mU^S59v(n^Sw_4{kaeS_9w-!Ok4H;ANHK>-
zj+T0(r5>KlM|@dEyh@ODqop1w6ljk}OFgvm4#FKR^+roQJeiO9vW$3@AnQg;Jy0mn
z9*>rKkYWyv94+-mOFcZ9kNC2Tc$FaQMoT?VD9|2{mU?LA9fUht>W!9qcrqXHWf}1*
zLDr3ydZ19CJsvIfAjKRSIa=zCmU?(HAMs@w@hU;qjh1?#P@p{?E%ngKI|z5Q)Eh1J
z@MJ#X%QE6sf~*@Y^+2IOdpug|L5evva<tSNE%oqZKH|$V;#GpI8!h!fp+I{)TI!*d
zcM$GqsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^gA{XU<Y=ikTI%7+e8iV!#H$2ZH(Kg}
zLV@;pwA4c@?;zaKQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2Px*z$k9@7wA90s`G_ye
zh*t@+ZnV?`g#zvIXsL%*-a)vdrQT?%hbQw9UzQQC5@g+IsRs%L+T+nu4^qsbk)x&F
zXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYhsyn}E@OTE!j4^QSJzAPhNCCIwbQV$dgw8x{R
z9;BE<BS%ZU(NYgj<|Do=BVHxQy3tY(6biJ*qop2Nc?aQ+mU^S59-hocd|5`kN|1G<
zr5-30XpcurJxDQ!Mvj(xqop36%tw4#M!ZUpb)%&oC=_UqM@v1l@(#isE%ioAJv^C@
z__B<6l_2XzOFd91&>oMLdXQocjT|lYMoT?BnUDCgjChqG>qbjGP$<wIkCu99<sF1O
zTI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^&rI@8aZ0(jh1?NG9U3}8SyGX){T~WpirPa
z9xe6I$~y>mwA33d_3&gq;>$APRf4P=E%iX5Kzlq|>OqP*G;*}m8!h$lWIp1{GU8Q&
ztQ#%$K%qc;JX-3Zm3I*CXsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`)PodrXyj<AH(Ki9
z$$Z3@WyGrlSvOkhfkJ`yc(l|*EAJrO(Nb@;)Wehch%d{CR|&FiwA2HI0`2i=sRt?M
z(8$qJZ?x3Illh1*%ZOJAvTn501BC+Z@o1@sR^CClqov+xsfQ=?5nq-OuM%Y4XsHJZ
z1={1$QV&whp^>Ad-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$Nt-OP9M@zlYQV&n&Bfcyn
zUM0x7(NYf-3be<gr5>c1LnB8^z0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elT6qWIj+T0(
zr5>KlM|@dEyh@ODqop1w6ljk}OFc+2henQ;dZVQtp3FylSw_4{kaeS_9w-!Ok4H;A
zwDJzZ9WC`nOFcZ9kNC2Tc$FaQMoT?VD9|2{mU@t44vicw^+roQJeiO9vW$3@AnQg;
zJy0mn9*>rKXyqM*J6h_EmU?(HAMs@w@hU;qjh1?#P@p{?E%hM992z-V>W!9qcrqXH
zWf}1*LDr3ydZ19CJsvIf(8@aqceK<SE%oqZKH|$V;#GpI8!h!fp+I{)TIxZHIW%&#
z)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|p_O+K?r5nuTI%7+e8iV!#H$2ZH(Kg}LV@;p
zwA6zXb7<sfsW)2c;mLf&mu1AO1X(v)>VZOm_IR|^Lo4qf+|g2RwA90s`G_yeh*t@+
zZnV?`g#zvIXsHJ&=FrH|Qg5`>!;|@lFUyEm39@dq)B}YA?eS=-hgRM}xTB@sXsL%M
z^ATT`5w8+t-Ds%?3I*EZ(NYgm%%PE^rQT?%hbQw9UzQQC5@g+IsRs%L+T+nu53Rg|
za7RnM(NYgj<|Do=BVHxQy3tY(6biJ*qop3Cm_s8+OTE!j4^QSJzAPhNCCIwbQV$dg
zw8x{R9$I+^;f|Jiqop36%tw4#M!ZUpb)%&oC=_UqM@v0OF^5KumU^S59-hocd|5`k
zN|1G<r5-30XpcurJ+$%;!W}L3MoT?BnUDCgjChqG>qbjGP$<wIkCu9nVh)WQE%ioA
zJv^C@__B<6l_2XzOFd91&>oMLdRW0|sW)2c;mLf&mu1AO1X(v)>VZOm_IR|^8!h#~
zArPVKoS#>cnpdJ5Qdy9y>pxoR;mLf&mu1AO1X(v)>VZOm_IR|^1Lt{kVzjL{TI%7+
ze8iV!#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2QKB%
ziP2JTwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0rQT?%hbQw9UzQQC5@g+IsRs%L
z+T+nu4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh+zytF~OTE!j4^QSJzAPhN
zCCIwbQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQy3tY(6biJ*qop2tfd}S~mU^S5
z9-hocd|5`kN|1G<r5-30XpcurJ#Z<9PK=g%qop36%tw4#M!ZUpb)%&oC=_UqM@v2Q
z0uRg|E%ioAJv^C@__B<6l_2XzOFd91&>oMLdf-wHofs|kMoT?BnUDCgjChqG>qbjG
zP$<wIkCuAq1s<3`TI!9KdU!G)@nsqDDnZtbmU^I2pgkTf^}wYZIx$-6jh1?NG9U3}
z8SyGX){T~WpirPa9xe6I3p_A?wA33d_3&gq;>$APRf4P=E%iX5Kzlq|>VZo+bYisB
z8!h$lWIp1{GU8Q&tQ#%$K%qc;JX-3Z7kFU)XsI_^>fy<J#Fu5ns{~m$TIzv9f%bT`
z)B~4t=)`ELH(Ki9$$Z3@WyGrlSvOkhfkJ`yc(l|*FYv(p(Nb@;)Wehch%d{CR|&Fi
zwA2HI0`2i=sRu6Q(23DfZ?x3Illh1*%ZOJAvTn501BC+Z@o1@sUf_ZGqov+xsfQ=?
z5nq-OuM%Y4XsHJZ1={1$QV(3pp%bH}-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$Ny}$$W
zM@zlYQV&n&BfcynUM0x7(NYf-3be<gr5?DHLnlT{z0pz+Pv#@OEF)ee$hy%|4-^Wt
z$D^eldVvS#kCu9)r5>KlM|@dEyh@ODqop2wz-XxlF6GdP(Nb@;)Weeji7(5DR|&Fi
zwA2HI0`2i=sfS+Rf%&7Q-e{?ZC-V_smJzQKWZh_~2MPt+<Iz$NT*{#nqov+xsfQ=?
z5nq-OuM%Y4XsHJZ1={1$QV+er1M^2qz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elxRgUD
zMoYcXQV&n&BfcynUM0x7(NYf-3be<gr5<{L2j-8KdZVQtp3FylSw_4{kaeS_9w-!O
zk4H;Aa4CmQjFx(%r5>KlM|@dEyh@ODqop1w6ljk}OFi@g56mAe^+roQJeiO9vW$3@
zAnQg;Jy0mn9*>rK;8G5q7%lZiOFcZ9kNC2Tc$FaQMoT?VD9|2{mU`#~9+*E`>W!9q
zcrqXHWf}1*LDr3ydZ19CJsvIfz@;2IF<R=4mU?(HAMs@w@hU;qjh1?#P@p{?E%nd~
zJTQN>)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|flE1bVzks7E%oqZKH|$V;#GpI8!h!f
zp+I{)TI!(}cwqi$sW)2c;mLf&mu1AO1X(v)>VZOm_IR|^1DA5>#AvBETI%7+e8iV!
z#H$2ZH(Kg}LV@;pwA4c{@WA}hQg5`>!;|@lFUyEm39@dq)B}YA?eS=-2QKB%iP2JT
zwA90s`G_yeh*t@+ZnV?`g#zvIXsL%@;DPz0rQT?%hbQw9UzQQC5@g+IsRs%L+T+nu
z4_wNj6QiZxXsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh+zytF~OTE!j4^QSJzAPhNCCIwb
zQV$dgw8x{R9=Mc4Cq_%X(NYgj<|Do=BVHxQy3tY(6biJ*qop2tfd}S~mU^S59-hoc
zd|5`kN|1G<r5-30XpcurJ#Z<9PK=g%qop36%tw4#M!ZUpb)%&oC=_UqM@v2Q0uRg|
zE%oS8>R~2tEleQ{k+T>gBnyD!7)DsY7^w7U5}-#CNKIj2U|`_j;!@_~LJfbMJWGU(
z0)mN`wFfRsr^rT5k)stKa%c<|_GrZi&lAXu(Nb@;)WefSi7(5DR|&Fiw7Cxo1={1$
zQV+SXgR@6Vz0pz+Pv#@OEF)ee$hy%|4-^Wt$D^elyre^BjFx(%r5>KlM|@dEyh@OD
zqop1w6ljk}OFiVm4$dAe^+roQJeiO9vW$3@AnQg;Jy0mn9*>rK@RAOhF<R=4mU?(H
zAMs@w@hU;qjh1?#P@p{?E%lHKJ2-o^)Eh1J@MJ#X%QE6sf~*@Y^+2IOdpug|!Am-1
z#%QTGTI%7+e8iV!#H$2ZH(Kg}LV@;pwA4c`?BMLtQg5`>!;|@lFUyEm39@dq)B}YA
z?eS=-2QTT68Kb4%XsL%M^ATT`5w8+t-Ds%?3I*EZ(NYh&u!FNlOTE!j4^QSJzAPhN
zCCIwbQV$dgw8x{R9=xPOW{j44qop36%tw4#M!ZUpb)%&oC=_UqM@v2A!Vb<JE%ioA
zJv^C@__B<6l_2XzOFd91&>oMLdhn7CnK4@Gjh1?NG9U3}8SyGX){T~WpirPa9xe5d
z3p+TQ+NB<HMA9%Ld|uGliENdXmDLe6K9O8I9O`Uwhz|?l5ttdsinrksPSRxg9<Iqq
zN7q<K*Gxy(NJrNYj36RLU_n!uh@p<I30S3ReqKpxUWu-2UUGg)W?s5gdR1ltFBdPD
zMK2cv!+$X1U~~Nc|9@8Ut%BqdZqSKD3=AG2Apyp^!Ko!BnR)5Oe7sy%pRRLR@$y1&
zDX)o%iHWg|jZKY>4Tx!CVyq3}!Amn6o7AGb#2kg-)S|M~A_do?qWmHxNt*@+1_lT}
zLf0AU$dJl{RNdjS8^1^Gx0<ZleKoamHFdScY7-PdVXAMaXTZx9lxUkCW|b5W<f&i;
zjTjL7Fhq%go&i*;AupG+KT7<eD&yrs4mqpb(wvgag2bW{{j~g|T-}t!lEkF^(!7+!
zqDtFbUM}Y>H90kFHD5IWwbN>^)C$zf)biCz)lR8#s1>PE!L=qvmL`^F=0=ugyj*J3
zbT>40KtpOY2{X7|uSm_I&*5Q^ED9n=4-bPE!f?jmY_W{ym;WG;SWu7ysm;jFFGH#L
zrE+C4nutJY=sy(_5vcHlU}8^fgs29QqlGTKtc5d13*8z}(tzU;-p;nMu^Bz#6rMS-
zFa~FS!QxPA3JsUx0usUmULb%N!>i&L9b+UR9bhUQftdj_5Qq>NF5xsf#t13`ZAQl!
zhus*X;pos}NoIatF(iH47=h?TAOeiJc)4_SU$by+*Z^jM#(bgOc$duLg8br4kX|bu
z9xem`cXCI2xdbYQ(Uk$v0D>l`(V=*XhZeyZ7EBN|Dny0(87dDD(s(wB%C03P;U*W1
zPJ@C|CN_eM3uq9=46j}(v`mCi!)nzFDfwk|*#IJiW3Zt41(ryxtc(#%WEN_lEhsfD
zwJ5a+qyX3O9Y_unQzsE>!wshC+A9mVHC9#up&<%#kOdG%pfwU9MTvREX{kksl`F{^
srFq$@DWJtGx|W89CPro!hvz06GB7Y?CnFhz#zbEufxajrKQF)-02GHrIsgCw

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5372331946541056 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5372331946541056
deleted file mode 100644
index 6fca86b02dcbde747d972241990aa90ab281b7d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1041826
zcmWFt4N-7Z@CXSB&^OdG<mGbC&nrpIE71+9EJ(FVEGWpyOinDx%+J%W&@C@7*G<bW
z%GE6`%1O;j&QD2AL8x~H31s@ETcxC?<s_D*@^bNVS@d#Q3V1MRX}|y%7uzZ@=;i9w
zQsC+xg`*)b8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zK$Q?!MH?{MU>yyC(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S^960$wA+m!s>0M?+vV
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhm2hrlrQ+UOBNqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFkm6jHDET6-f%n`
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd72GDg?wwBXl$bMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ON05t^qM|a(fhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjD!&ILfu(3${P)V(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C;TQs5qjQ0yAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFl0ht)o>i18THd>2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb8|e
z1o&uf!;o2sHX0J6Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UiCJ1XhhC&yM<aGz3ONU^E0qLtr!nMnhmU1V%$(Gz2IJ
F0RSV!qs9OL

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5386708825800704 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5386708825800704
deleted file mode 100644
index 1f1e4aeb8c04180ccd014f54b6e9f48e8054c712..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 787294
zcmWFt4N*{2@CXSB&^OdG<mC!V%=_>k3>0*n^Ycnl^GbAsQ<F=JGD|9T1FCdOQj2Xv
zDhpEc^GftUav_xk+`1qED+NwoE|?CeKw?2bPG)jqNoIbYeuZv%dAV*{eo?M&X;DsU
zUUGg)Y6?upUXV>8|LcF-C;Iq1dk1GaxD_1-0kz}x$DI;W6oOI<OLapO)G9Jca&rv9
z?gJAMx)H&_x&cM`C8^0EYrum44=RA^(2)QCe}h>Lp&@FPMn=ZQ=0*m_W)`L<=H{jr
z29{tsIB{I<cwPy_FS@$Qsv)MlT>t;Gt6CZIa_Q>wYKDYxIhK}W<QHXDfqj&pmYI|K
zU!DsDwi{c>@-TqBp9gY>s-v!BPG(tZPEMu)i>R7rNQj!dnwq*Amu{+VUS717Gy?;}
zMPvXn1A>u7!E9bG12d2RJm<JTrh}uy6%=-vdFfUvDXD2Wi6yE3^$d8qLW&aeiqley
zbm7v;8KrsIsVNKrp&`6nyj+I%|F|r8xr`+|xO$5XdASV1JSzbYBqp*9M9mIfE@QA7
z1CVk@$K>SH;$mG;JQwBX=sM=)<d^F@7p118=9Oe7<`hHJ!j0zY<+9K*)I}fzT^&PY
zKJjcMLx|S|QfXw4S1ZUxcoi7xLV^I~7Z?i?HlWZ%upseAE@?on#-XDRoSfkVC<%cI
zkf6l8^i;Sg@eG8&iPwWuCBiT+E}V*pmjD?@jB1cN2qs1~0W~0l2q*zdgVYh@Nw7LF
z0oFzt0Wyae6F}-9m>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=
z1cSLy0#gJkK`I3@h!{N}br4L9Y65CN1`$v~j5M*vfYd=SF{Tnw12Tw!60kH#9R!29
zlo23<h%o`A4uXkMjZY2O6nqMZlmnSVj8c#~2qs1~0W~0lz)HBmByIwv5Q1^5AzB7x
z5HX5D>L8dH)dbXl3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wg
zgNQK!qz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}
zF$h6&BbXGj!0x&PCUFu7D{v|yTLNS@F`7Z@Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&
z0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYcsfD9tW
z1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)p*oE3;~gN6cH<hYD^t&Z6JjZ
zj9U%SG9ZJ9Q4CTC!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|
zAQ;T0i~t!#j0qrh5KN5fix)v^iBSns2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM
z6Qi1d8jwK*lz^o{>L3`*MJKMJ3*hC048p4bDhW~t!B7E8D3C$K=m)8TU}97gPy;fE
zfD*7YNF4-&xs(wQgFqx@=74n*YYa#obX*h61QTErC?i1T5Mu&J9Rw4jnrJm3BZ*NA
zQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVkgmm1jogG**{L4I*2Xz~!3Qjj>r
zLJ$e!QHY5(2BZ#xDYOuz9b^!QCWJxiAefL!BIH2^5uprR$%52UW%>oDg%BG+Bu*v7
zOQ0Gv+H$=JX)1w&g(|TKGKiSi0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uY|%
zj>aa4TMT3nZdrs3NF4+t#K>lW3?fD|NF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh
z5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXaB*>|fz)!1mJY-O7hDY}%-|fH4B}Lc7ST8Z
z5WmDw4&EWrH5P()-3UhmC@Mya5d7hUCJPEOG$E{9kU9v)DovUo$RJ{LfYcEa`CxTm
zf*4Z?r~#QnKnYkHqz;0?T*?TLLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW
z1QVm07&Rc%h*bwtJ6e(u6IyUJpdf>D@GwB?AQ+D#Vx>R^5u+BQ4uXkMjZF<`HN0Vn
zE7E%SkRnIy%c@~Z*P$!Mb4zndG7A!mO7y`?+*1-u5|i>v^HLIvDs6K?%dee5tH{AD
zD8m@G*jg8~0NaX}%a|*d%L>XiL}Km2B8E+!6)%?ok~S+|R1UI{nA(lFta!172$C2i
zXh9^BAh}FpjRC2HU~+9j(g!jKiHnm7QU}2}l@KohGKd(}AaxK-jB3)<fXpRE2S^<R
z6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pI
zFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW
z1QVkgj~a*}AQF!vVx>@x866QH5hLP%p{WBD`49{hpo9V$M2vorItV64H32msg9s=A
zOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@
zurx>=1cSMh5g>zzF#)6wf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Mm14tK*kZH
z5Tp)*iBU~J4agt@O2E<}br1~Zq7y@6M3%Ub5r{8AB)TWb;1g>MNF4-|VF|hxkU{8T
z*!UoI5R6ThL@|&-#ApGjgJ5D*6Ho&(h=3BXG)Ud(h%7iLpaeKXzywr)5(;DvG5SI3
zAeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpQW%12F_d;!#Ab6sj?!-I)>5oq;6|
zP~<}}OoRd&WDqghLFyow7}W&SfD9s_1S}0w2f<)2Wdz6|VoU(3gJ5D*<5L4R1)l;U
z<v`{TqZFhLf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0
z838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29
zlo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(q
zOBn$&h!_(<>L8dH)!5a5^kbJn6$Pn-U{rCkcp!s_(Fjrp!NjO0O%2FgVswDiK`=3@
z38(=XL_i5x8l(<_!CcA+kU>xrY84*amj=`-e1-B+D3Ce`MiC~D12Tvhogj4(OpIy*
zYCr}NPy&_)se@oJmofrm5HTiz)Il(cYSIS3U|K;2!Pxj{kU9v)r;129kU>N$#iEQ@
z-5_-kjKvUAg+K<8s)sc7#M%H-2f?J7k5x6uAgmH-f*^Gej3z-27i17I`atR+m>AUr
z)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0
zKn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{
z1k`{GBA^61U`ANg=(Y@E!U&5R;v!*i1}~0w5XegqjK#mC3V{qFMh{3G1QVm0fEtiN
z1eAcKLFynF%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@NmBzd
zmlz!&br4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TL
zLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zL~
z8AOZ;AaxK-jA}e;AclZQJc@{wLN#XaO~4ZH2gvylOh6$q(jbF~RR>Z_-0B?yCV~ti
zpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U$M-9Xf
z5Q#?-u~MkU48Gh6avum2>mNMoh&2YJ4ubI*MywRbAY#;l)Il&YstKq88ALz{SQ?}b
zg27y>5+HMlF%YB<f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_
zK`@w0838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#
z9R!29lo23<h%o`A4uXkMjYkc{5D<w+5wTLJ#*9{9(7{Sju#C1HiA_Xcb)X;vGYAkM
zbr4KIAu-Y*gNRiJQacFa6yhupNsLGEsR5Zm%!2icAw`LqIjKb#PtXnEa5l)rIHXX7
zLFynFMVLGe$RJ{Lg497UcGbLA*u}Amf(*hcfhGu22f=6(<ZwX-5u*>J4uXkMO+XFE
zAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl
z3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%
z$RGkrz|tUf5Dey0l>nJbjDa9^5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu
z0U1O<30NAWj*E+{ASDgVrHlX>b}^R-Ge8O<m<Yu<lmvu^Kx9A$L0I@nkU9v)q7EVf
zBC$x4Dul}zqFQJm%@9ngwOG`H48kIeAp}wf!5C5m1wi@;DjMxv5fen%)Qko%dZ>Ux
z1cK3J$l!wvB1RiX9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)
zse@oJm#PHFTw)9ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0Kn=(s0!qNr
zAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;
z4N?ceU@m0@$RJ`&0I7puVpQW%12F_d;!#Ab6sj?UZ#bQRKS0ihU;+w>kp>w=tU8d|
zK{z%`jPs$5T4Iz!d<i0nQB6P%vBrSZK`;RWiID~wM65cHT8iToVhD&N###buP>mUU
zxfA3*5GLRaVx);R2BZ#xi7}Oc8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vK
zmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?TnY%VDWvG9+bq@z9IgVn7>5*!
zFi0H)qX?770U1P$PLMhXCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkr
zz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}W&SfD9s_
z1S}0w2f<)2RSA%}#25%t2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*
zlz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@#YzfJlHyRB^I+#2N!q2f<`n
zgQ^K+5UL1v9!MPoW0xmM6l4%F8bInGm>AWlYC!r>MX>Wg>L3`qJV~M;gNV@pQU}4r
zs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zOLoJ0m0O^lf!
zbr4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TLLByB<
zQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%q5?I7y=^6
zHv_H{)tJFIm<e|%b_U4#5R6@(BvFt-#ApDigJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf8
z0i+IsiBU~J4agt@O2E<}br1~Z5+opMK_o$?gcT5L3`iXW6E>5e3Xnkr6+vf+Kx!$T
z4*^*QG6+Ny!XR}JOh_dW@*snVP<9cd4uXkMjZY2O6nqMZlmnSVj8c#~2&TSj0w#j2
zC7=W>4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFE
zAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl
z3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xl|=U<`QEdNF4+dqndyk
zkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu
z0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6QdfB
z8i*kv5|1KcrBIC-eEn#U`#_jj|KL$atT7;U5RAt#Vx>R^5u+BQ4uXkMO+XFEAOcFj
z(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xx^4gxD|m+!YzxC0jYyvgc#W@
zkU_*~2C0K!VpJ1Q12Tw!60kH#9R!29lo23<2%A8hs=;uSZ$M~>!ejdoH5LVrkdOd<
zLp?)YuAs!c^i->)%97M#TU{MpUarzK17ic#(llcOGu2Y({JfIXyb@i;%7Rp@#DapH
z%w!yT6H7Al^Ykn7N_1WGlJiqC^U|$SQqyu0OHz5cLW&aeiqley5K_q*rFq$@DZE^~
zT!vg0ya7R;T*h2Z{`S0F##{zm7Q9@>hFm*(LyfHjJa~CQd@f@Petv#-ehA>@;{Esk
z|AzlyP>}LJAnm{Ze_l{TfH2`GBdCH{V?gR47^{&uPD;kA7Lq`4NTCQrECi7#!sKy?
zH3p;(g2}T7MHk2*6agF@kU9v)p@0-&kU_+#2dRT#VpJ1Q12Tw!60kH#9R!29lo23<
zh%o`A4mvFjW`YS~G!jq)GKYW?urx>=1cSMh5g>zzF#)6wg0ZR|&9Yd71w2WBT?SPY
z60{%^Rh%pyvBrSZK`>d?plSjcgeroa2T}*Y*yTwQ1sOz)29P>vmc^?atPV`zRYsg7
z$Q)u+g497UF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@Us9ywJzC`^b65s*3vCPp;@
zH6VisC;>}@)Il(qOC&+M4jcx948kFWA`DUo!6?GyaX<zUqZ6bKf{9U0Kn=(s0!qNr
zAaxK7=2DdanM;g;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x
z8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HQ3;3yh(r}9i$|<6AaxK-mNlrF
zKn9_TVCR9<K`?fCl0-oU5u*X54uXkMjj9Hu4^;#^52Ox)vCESr3NnZo4Ip(8OpIy*
zYCr}NPy&_)se@oJmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjO0
zpax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}
z($s*=B}NBG9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ
zmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjO0pax_R0VQB*kU9tk
zb15T01`%TdNF4+dqZ*GIh#?>nk0N5FP>mT~Q!%;%oY<6ut`0RNq01upAaxLo5W{2<
zdty7tBuw3yA|Q1Tj44O52*@B}G=bDXFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4r
zs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zL~8AOZ;AaxK-
zjA{aEKn4*|0xfz8tAdQHgG?OVq(e+-!PS6*49>yB0I7puJc@{w0vSY%T97&j#;SUB
zf);DAj84#E1Pde)fk+G~(glb$2BdCuf)+V^!65=BkVVO4gUlgDD@Yv#6Qi1d8jwK*
zlz^o{>L3`*C7L*hQzghWoRUZqAaxLoBuFk3WDqfWLFyow7}W&SfD9s_1S}0w2f<)2
zWdz6|VoU(3gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~Z
zQbvFbBE|%eItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3c
zE>#JTxx^R<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN1eAcKLFynF
z%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i51X<~JQ
z)Il&F!-$mv8AOa)kU9v)s(Q4)h&5P7`->RC0!c(55<`k~0b-2-sT=JtB8M+HM8E{H
zD4A@KImBoMse@qrs#Ogg@hgDJg3N+4@lqgl5R6wDagrc|h*1er2f@Us#-j#e2#Ca^
zh*&99V@78np~K*yU>P0WCN>d))q#Qx%pgF3)Il%-g~UjM3?fz?NbL}fQ?S#C@h42p
z=v5D}kibTRgA+_(lO<6MWDYS}K<Xfv7}W&SfD9s_1S}0w2f<)2Wdz6|VoU(3gJ5D*
z6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64
zH32msg9s=AOM}!wFqlgj0Wt{5gdtiJK-(us9>K{3c^HCmDj{A1WDqf`LFyow7}W&S
zfDFQ`<TgYWqz-~1e2PerLBtpUQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0
zfEtiN1eAcKLFynF%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@
z38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcB?DDLlj^L|zCJXjKyf<S8X%l}
zkW_$z42g@A2~r2aIF%4D0Wydf)gW~cOpIy*YCr}NPy&_)sl$cA3g}PZat>IW80UZ$
zf(c?&(^w7I9k>W$>_+G%Ml}I7Aj1eK0ZW6_K`@w0838hgToZ`Z3sMKc<l2O!4`dJ$
z7bg>>4uWwiAzlJx5D}_D${?5s#pp^P8bKtw3>kc4jRC2HU@|O0*8(yKT?`u^qz;0y
z$&x4rGKd&0AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x8l(<_
z!Ca~mAajW^5Tp)*iBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64H32msg9s=AOM}!w
zFqlgj0W#=fE)iyc6hbf&ig73j2n~VAfDD4L@RJ~Q5R63~L;^%&kt9_Jt1&k*O#!Kc
zU`#oZML-4-qY0!Af{9U0Kn=(s0!qNrAaxK7=8{B!^bw;0qz;0KQB6P%$RGkrz|tUf
z5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}W&SfD9s_1S}0w
z2f<)2Wdz6|VoU(3gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}
zbr1~ZQk4LiON@aabr4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkH
zqz;0?T*?TLLByB<QU}4rsK%uRc96GAW^qA&aVF@nZd^)1;t&f#B#1{LCe|2`ItZrF
zLXdWlK_HqC2C0K!LMn-n2N^_!GU|5Paass+4Fuy<Lc9dXAcX4C5&O{*dqip=jfI+$
zaO(xBgJ5iGqOl3$76TcCTNWV$QU}2ZF|t`8gNV@#QU}4rs3xEWWDo%*U}=y#2nKU0
zBR~cbV**GW1QVm0fEtiN1eAcKLFynF%%zL~8AOZ;TwGjgAhleh^LfMs7hDY}%-|fH
z4B}Lco)3aE0P#x<<=`C>`@MvS+44i(X5vteQ~aqFU3T#M6y3#G_#jU}FcwKtg+K-o
zqX(o8f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w01p;Im
zF~)$@K`=3@38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z
z5n}>K9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJmofrm
z5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjO0O%2FgVswDiK`=3@38(=X
zL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9Rw4jnt&RR
zK?Ib5r9tW-7|f-VfEWcLDK!Z?N=b|{AnPEQ7}W&SfD9s_1S}0w2f<)2Wdz6|VoU(3
zgJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFbBE|%e
zItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE@cGBAYx1a
zse@o*R1;7GGKhc@urx>=1cSL$B|zp9V<1Q!1QVm0fEtiN1eAcKLFynF%%zL~8AOZ;
zAaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x8l(<_!CX`VA^{>%
z#mV9kYYa#o1e0YAswR*@s3O>TAaxLoU7jRSkU_*~0I7puVpOB50qH{(!OjDzgJA6P
zB#D9yB1Qv99Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ
zmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjP>rUs%LL}HUAQH)q)
zK<XfvL<_Jf2N{G-99;~g4ua8T$l!wvB1RiX9Rw4jnt&RRK?Ib5r9tX&VXy-F6S$lM
z7AM9zV1;0U7}YdZ19k^4f*89IdWlg@Kn=(+0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7
zAcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q
z12Tw!60kH#9R!29=){m%C_&unDTpsYB)TWb;1g>MNF4-|VF|hxkU{8T*!UoI5R6Th
zL@|&-#ApGjgJ5D*6Ho&(h=3BXG)NsWt7O3Hzyw$uWdz6^VoU(3gJ5D*6Ho&(h=3BX
zG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64HL99GWG=)I
z5Q!{GCL7h5(RKIG87)w-5LY+A!ku&-Fr8>L$RIQ!tXz;f2*xT+njpv^VswDiK`=3@
z38(=XL_i5x8l(<_!Ca~mAajW^5Tp)*iBU~J4agt@O2E<}br1~ZQbvFbBE|%eItV64
zH32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE-C?$0FkKTWbueK
z2BZ#x$+8Aj6UZP`5$rsWIta!tPm(CeAYwFt)Il&Ys!`Q|^r4Di=YiBgFm`#8L_r1-
zqXDE2f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg
z7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<
zh%o`A4uXkMO_~~zxy0xIse@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0Kn=(s
z0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{G
zBA^5;4N?ceU@m0@$RJ`&0I7puVpQW%12F_d;!#Ab6sj?!;{{}o7vKnR)bPcjXw*`S
zfU&|5!7eZwzUbis3K0lKmmz}>GKd&$AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2
zK`=3@38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hc2q24oNcCD2lku&U90`ox407B$30
z!r%<v(dlO_5jvV>umlPyl|wKVNm7MC1`(qNq;7Qj89AiDAp$0lMag7?%ppcANF4+d
zqndykkU<2LfTcm|AQ;RgnmCA4CCD_Kl1LIDbr6gsNG=m(5HWf|>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkr
zz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}W&SfD9s_
z1S}0w2f<)2RSA%}#25%t2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*
zlz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7
zKnWgcVs(SmK`<V}h?N2vM2uRHIta$9dbGcYHCVuh#9@~~6@>&Xh(r}9i$|<6AaxK-
zmNlrFKn9_TVCR9<K`?fCl0-oU5u*X5ZnVFM98%yA0TalgWU@i#5Tg~O4ubKkRyB0Q
zuK+3wG7HMYOM%ouFkWTENrDU_MkPoc1QVkgj~a*}AQF!vVx>@x8J&TIj_HAdg|rpR
zI077G5DqC6VURiqMiC~D12Tvhogj4(OpIy*YCr}NPy&_)se@oJmofrm5HTiz)Il&Y
zstKq88ALz{SQ?}bg27x02(T%n=s!U>fWuWF7vqpZ5eBJ)U=(5UI3R<F(Fsxq!NjO0
zpax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}
z0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@Us
zCZGmn5R#J7+8rq{2s6<_52pr@Ita$8gm?*%L3mZ)hRA}{K`?|*5eYJg7z04+Aeb1{
z1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkM
zO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH
z)dbXl3?iTe+Jhvlipnc}2wRBi_|d*TG^RkoGTIs-oP3Z}fPxH(i<1db2f;X%5HA5T
zh#1u%br4L9Y65CN1`$vKmIkTAg~1BwPvCM6SezK=fE9uXVpP*u4cHyH2x9C;=p{xq
z0W~1Q2q*zdgVaGVm`fP}GKgFgh}8>H2f^gpgrpB-5E2(B6QmA;aVjBR0%Q;oszJ&i
zm<Yw_N+23RB)SY4d}56Ose@oLEJ4=-G6-D^8y}<&g0abxC<Zc!7%d=m5KN3}0%|}8
z5l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW4uZj4suCb`i7^nQ4uXkMO+XFE
zAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&=wdDrW`GnzFcFGz
zC<zD+fyjUig0S$DAaxLoMIA%}L}HO7RS2swH!)2Cse@olIg&*{1`(qPqz;0KQB6P%
z$RGkrz|tUf5Dey$M1b@WqXDE2f{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7
zAcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q
z12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYdm0GUgSfgp7dOpIy*
zYCr}NPy&_)se@oJmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27zM2#`U<m;h1-!NjP>
zrN%iwuOv0EMAs#=xFEkcvm`S=50_GqIK)B_3F1+Ri8ThK4uUDP5TqSs5Qrv(LFyow
zkV+!tK?V__47~Ohq?RgUy*Mp|*Z?ANDj{A1)tJ!{`_U15;?oYQO4O8uDu>Jise@o-
zQ5ZWK#vqOc8AOaqkU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{1k`{GBA^5;
z4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kHE7nd4HEf-bFc#uh8V+jx-br4KIAu-Y*
zgNRiJQcFjlf~*^)PNVW%`lwIQ;~5kp5R5JZ<`0SeUP468#6o-tBEdeRj3Cw+kU9va
z%s#MgkU?Mu0Rp5Bf(a-jMjB)gvFbo-=~!+-3kM=x2XPpPBtkJECBzy7QU}3=Oe8`c
zWDpU`sM{GDIhKNhcI0?>)TiJGM<PHW0>Mav<T6195u+ER4uXkMO+XFEAOcFj(javZ
z4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTeEDcfz
z!C)>`36QzO7zk1a!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|
zAQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW
z4uZj4$_S7_#Fzk52f@Us#-j#e2#Ca^h*&99V@5~BM@PhoO*!c5P*W1REP@YG2f+w2
zvRNR5h|vsE2f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*
zrHlX>M6wCQY67W)V3Mss)c`RBM52n5#X~h_v=kmKg~>`r&|o7*FDS)9FfpnLr~w&7
zKnYkHqz;0?T*?TLLByB<QU}4rsK%!TYzjUF=yG&BG~@)j%}_qb#ZV?*3ZxE#@hT%u
z5@ZlDDnaTXm>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh
z5g>zzF#)6wf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0
z838hg7!yG1Aeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29
zR3$*>5@R4p9Rw4jnt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ
zmofrm5HTiz)Il&YstKq88ALz{SQ?}bg27x=0wMt-QN_vP5o-)c9R!nQ4XP%PL8v0w
zc_4KVj9s22QIJ7IX&_c1NF4+dWh{P0AcOF$fXIT>K`?|*5eYJg7z04+Aeb1{1k`{G
zBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFE
zAOcFj(javZ4CWF;7~xg~G6}aVLI$J`f)Qe5vp@zBqZy<Qf{9U0Kn=(s0!qNrAaxK7
z=2Aw03?gg-ajKweoj{6-TJ1)_UXVEilz^o{>LB>y#ft%<AqtP}L)2IlJVHVO^bPe4
zdAWiT^U_nTk}6A5i*0pvba}Z-(+rFaR7=y04a`(aVH;%_D+^Ms5(^4)GLv!WO$2SC
z(XYrW(RIyB&QHnAOSei%P0L9vN#*4VDN4*MPD?F9NF`^K=4Gd*@N)5T8FE?h1_XI>
z8FM-L+w*c6a~W`1@NyX&a_#61HMSD);N=DJxr{CN`T5!TA%K^Q_uv2j8~%eqLCXJt
zwEzD9c_IF!|N1qsz2MMBCx*o8OX30y>`5?z?nyHEAajV(22uyX#Hc2q24oNcC17cg
zItT`HDI-7z5n}>K9Rw4jnt&RRK?Ib5r9tYTg%OwuCcrY35g>DjF#)6wf{9U0Kn=(s
z0!qNrAaxK7=Asj$Sr$D+Abe1eL0I@nkU9v)uZ}2LkU_*K1gV2yVpJ1Q12Tw!60kH#
z9R!29lo23<h%o`A4w_~0DhI0r6L^&oCkZl#7?mJ(5KN3}0%|}85l{k_2C0K!Fqbj{
zWDqeXfYd=SF{&YLKVnou%mk6ds3xF>SYtryAeexG#7Kh-B32zpEpe?60w#hCBA^5;
z4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4i_dyKMmC2at>IW
z82i8q!2~g?X{-k94qOB=b|dr>qndykkYNOrfTcm|AQ;TWOI*P#JGw3bOYlH~7DQr^
zBvpu5V?gR4m{c3Es0SH@MHoW}qz-~Hq(~P48AOaOkU9v)s(Q4)fHhda``EC{po&6*
z7DS?olf@&}7?3&$Cd(RBO(26%MX>Wg>L3`qJV~M;gNV@pQa9RPKn^Kzh=2)XQ8L*e
zbBNIjQU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVkgRZSo=7h(vAL>48JjcUy3
zx>#sK3KT4(9Wav86e!4u(Ew5h!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqZ*$Y
zuqpTy5Ge;ThZv<Gbr4K_)dWlgSxZ0(SQ?}bg27zM2#`U<m;h1-!NjO0pax_R0VQB*
zkU9tkb15T01`%TdNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_
z2C0K!Fqbj{WDqeXfYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%
zX^=Vy26L%OfXpSvK#)2JCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkr
zz|tUf5Dey0Mt}?=#srW$2qs1~9yJg{KqMYT#7dzWGujy(?F<r|a?sVGrX+M(1Rtah
zf)Qe5vp@zBqZy<Qf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_
zK`@w0838hg7!yG1Aeb1{U^T{I5-R~R39AH}AV?hqqe+m%1sOz)K9D*HCPp;@H6Vis
zC;>}@)Il(qOBn$&h_DI7se&va0jV9h@w(CF!-QiKq5>385EgzCqz;0ysvDhK#2PH4
zbBh?k0!c(55<`k~0b-2-se{fff|+1~bn7s5fXu-V#3BGv2f<h*NfiPaM2sGgIta$9
zdNj*o4VKX?ixDi4L<Ax+q(~Pa))<gFXqLrm30NJNKvEW=8|vxefh0gA6J!oCN<r!%
zm>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>z*P56!l
zAj>1OL3$w=S(FSm#1IfkhGujvsK$(r3XP5mp{EdH`KT!gw=R%62*#}jMdktu50wKl
z2vr0-52Ox)vCESr3NnZo4Ip(8OpI!LYQU!8Q$VB~$Q)vng497UF{%lu0U1O<30NAW
z4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{
z>L3`*rHlX>M2ra_br4L1Y9l>8J$%YQ2H}&3$$`{CFieC38e|YL+Cl0dm>AUr)PM{k
zpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6wf{9U0ni`O~
z#OMI2gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~ZQbvFb
zBE|%eItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AUr)PM{kpad)pQU}3cE@cGB
zAYx1ase@o*RO3+tF$6^7QADg1sxhN|%F#Y0u_*^#9coHKmqqYF>L3^)Mm7s%5HXrT
z>L8dH)dbXl3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!
zqz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKjDV
z#HpgqLIVjLfS{{Ej)q`@N(n0f8AMnWZ9;&cy&%UyFhQk+6@UyPtcsvdM`ts!2O^b%
z7rWuOL`N+}4;fI1a9uorE{w?sD+CjmawLm@%ppb-NF4+dqndykkU<2LfTcm|AQ;T0
zi~t!#j0qrh5R6~7s-d}op^2fPg|Ug5fr*)=k+Gq<iGih|ftk6fxv7!4v4w?&p{cQj
zBYtC`vLG9wOuQ6G9R%Z5Mw}$bAYxR4)Il&Ys`03S7y=^kC?Zx0)tJ%#=xBeG*p!2=
z4mBmA%Odz7br6gYBbx;>h#1Wvbr4L9Y65CN1`$vKmIkSVU@(^g0&EH?`bVz^!WUZL
z-~<!+R1ql$GKUzYAaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x
z8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9Rw4jnt&RRK?Ib5
zr9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJmofrm5HTiz)Il&Ys!3A=GM5+~
zAaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2K`=3@38(=XL_i5x8l(<_!CcA+kU<x7
zi7*4C5Q2$Nj6+F4Xb40GWDtafp9HCcU@Yn&5+D+bB&kBg8Us=X!KB)NMLozMEW#K<
zAaxLoAw{|X$RJ{Lfz&}TF{)A3fb^k?VCR9<K`?fCl0-oU5u*X54uXkMO+XFEAOcFj
z(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTe
zEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB9f}kh#R@
z0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj(javZ4CYcsfD9tW
z1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl3?iTeEDcfz!C)?B1jry_
zOaQ5aU}99`Q3EjqL}FE>ua8w2hajpkgKr=nhqGbAAm>9cOoRd&WDqghLFyow7}W&S
zfD9s_1S}0w2f<)2Wdz6|VoU(3gJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBXM5
z4a5)-iANE!QmDoZzT63N9|#lcA3W-aH3p;(g7FwetQ5!~V$_1vK`=3@38(=XL_i5x
z8l(<_!CcY^^c{L2gNQK!qz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~J~d!d
z@F_r-8=WRY4-sTOI5@!svM8BskU7L?1*wBzVpJ1Q12Tw!60kH#9R!29lo23<h%o`A
z4uXkMO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qOBn$&h!_(<
z>L8dH)dbXl3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xs(wggNQK!
zqz;0KQB9f}kh#R@0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A4uXkMO+XFEAOcFj
z(javZ4CYcsfD9tW1duuiCPp;@H6VisC;>}@)Il(qi%LKwKqRU-Sv+Em0jYyvvaCVX
z1TqL!1UnC;4uY}ElOzf<h!_nZbr4L9YE(5KeW)VXc_4KVj9s22QIJ8zXaK2$U}97g
zPy;fEfD*7YNF4-&xs(wggNQK!qz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~
z0W~0l2q*zdgVaGVm`fP}GKd%xK<Xfv7}eO+Ky-shY_cSZ5o-)c9R!nT0XF3zgRqIC
zi-FWZFuDvGe2_uJXalK(U}97gPy;fEfD*7YNF6Q=RzQCOmvg}4#5f165KIuGn#O9t
z?!ZM5V>d!CF{%lu0U1U>30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJR
zKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSVU@#Y*
z7~R~79wHDvD99iz{3J*n1mjmnlq|>~VibbZK`=3@38(=XL_i5x8l(<_!CcA+kU_+l
z08&TH5q)5FV1gJ^38(>?LqG{w8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`H
zDI-7z5n}>K9Rw4jnt&RRK?Ib5r9tW-7|bP!7{WK#Lc9zjN%Apm6oZ_B6BA=4LNhU{
z38(=XMnDNz8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9Rw4j
znt&RRK?Ib5r9tW-7|f-N02xG#2_SV4OpIy*YCr}NPy&_)se@oJ7o8YwCZdN3gbxZb
z2n#<6QU}5K)e$8NGKd(3AaxK-jA{aEKn4*|0+t4;gJ3Y1G6G}}F(!c2jW!dJLkb)s
zU;<f`Og6|IVzh$PK`=3@38(=XL_i5x8l(<_!CcA+kU_+l08$6R#Hhxj24V<^#G{B<
zDO6)dmn@E+>_KeGL05;GlF(%le2_W_Mu?Hk0vSY%W{^4vCPp;@H6VisC;>}@)Il(q
zO925kg#!IBtsrw?Y<x6G9R%Z31(SoQ1d%Wi3TR@D0jYyv;w*!x1(C$5M^;6wE|5A1
zM%GOx8)OhMT0!a{m>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=
z1cSMh5g>zzF#)6wf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_
zK`@w0838hg7!yG1Aeb1{q^SX!ON<VXItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9
zm>AUr)PM{kpad)pQU}3cE@cGBAYx1ase@o*R1;7GGKhc@urx>=1cSMh5g>zzF#)6w
zf{9U0Kn=(s0!qNrAaxK7=2Aw03?jw^kU9t^Ml~Ka5JNyD9!11Tp&B#z`icbn0dhVB
z6HrKuG{_)g)q&Iw-0j=MxDuZlkn8cu!{k8fAQ&b>0Sz*U80{c+5KN3}0%|}85l{k_
z2C0K!FqeD+VhD&N-we1;RAUBT?gY6Hgy9Y*pFylKAaxK-zFlygAcNo>JPeRJ2*#s`
zSSgS}#Ha<SgJ5D*6Ho&(h=3BXG)Nr;gSnIuAcKf80i+IsiBU~J4agt@O2E<}br1~Z
zQb2%BAw~b_=2Lv31rAOyfln2Yav*bvQ3_HA!NjO0pax_R0VQB*kU9tkb15T01`%Td
zNF4+dqndykkU<2LfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fqbj{WDqeX
zfYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G
z0!SSM6Qi0mH6U||(E(Bi!NjO0pax_R0VQB*kU9tkb15T01`%TdNF4+dqndykkU<2L
zfTcm|AQ;T0i~t!#j0qrh5KN3}0%|}85l{k_2C0K!Fc+18NPtLGak6;C8Us=X!DLy3
zstIHest9%-NF4-YmnTUSWDqeLK<Xfv7}cn1K>AQcu=7CbAQ-zmNunTwh|vI22f@Us
zCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9
zY65CN1`$vKmIkSV05F#_0%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4r
zs3uJf$XsG{fYd=SF{%lu0U1O<30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy
z26HJRKn4+G0!SSM6Qi1d8jwK*lz^o{>L3`*rHlX>M2ra_br4L9Y65CN1`$vKmIkSV
zU@(_50%Q;&6Npg*G6SRzf<ZhAF~}fdi~y;FU}97gPy;fEfD*7YNF4-&xs(wggNQK!
zqz;0KQB6P%$RGkrz|tUf5Dey0Mt}?=#srW$2qs1~0W~0l2q*zdgVaGVm`fP}GKd%x
zK<Xfv7}W&SfD9s_1S}0w2f<)2`2@re5J|onaGj{e47NEnxHCr?qaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmwWGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhl}jE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1Jg3%Bd4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=CQ7{?;qaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFbYOPU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V+JV2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQKHo4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVB~
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*U^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(6pV(zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S22B?J!A#g<V^M!{$ZjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz$h3Efzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5EuocAut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsKxznRld54<{b&e`hQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinC>RZa(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7zLvtFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;6Cw1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtqq)
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mg(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fe{h{TwGjS2(Q*5nCL8!LI_5eA%hPxh!|}kbr4L9
zY65CN1`$vKmIkSVU@(_50%Q;|CV<pIFfpnLr~w&7KnYkHqz;0?T*?TLLByB<QU}4r
zs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVkgpBk_!_!JN+2Qr5kr66?>Onub^Oaxg=
zKnYkHqz;0?T*?TLLByB<QU}4rs3xEWWDo%*U}=y#2nKU0BR~cbV**GW1QVm0fEtiN
z1eAcKLFynF%%zL~8AOZ;AaxK-jA{aEKn4*|0+t4;gW!u7FS@&iD5#dExVpM3c!Y!m
z=o{!6@FG>pU=8>PkU{w5VR9gK5DXKcfCd>vjCPPZ2qs1~0W~0l2q*zdgVaGVm`fP}
zGKd%xK<Xfv7}cby0hvpT4v;zsCPp;@H6VisC;>}@)Il(qOBn$&h!_(<>L8dH)dbXl
z3?iTeEDcfz!C)?B1jry_OaQ5aU}97gPy;fEfD*7YNF4-&xmXE^Jcz_9O`0IF#(>m8
zFlpvvRShx-s|1=LNF4;DNsz+@8AOaekU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1
zAeb1{1k`{GBA^5;4N?ceU@m0@$RJ`&0I7puVpJ1Q12Tw!60kH#9R!29lo23<h%o`A
z4uXkMO+XFEAOcFj(javZ4CYcsfD9tW1duuiCPp=BYCz@^qXVQ4f{9U0Kn=(s0!qNr
zAaxK7=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0V*+FoF;;-oK`=3@38(=XL_o>K
zix-Jg1yKi5i#)hU*mN8!KnCHELJ<b3gJ2Y4@;D%ah|vjB2f@UsCZGmn5CJ7%X^=Vy
z26HJRKn4+G0!SSMV^w_>t0*o(kU_ZQki|jjAQ)McOg6|MVzh$PK`=3@38(=XL_i5x
z8l(<_!CcA+kU_+l08$6R#Hc2q24oNcC17cgItT`HDI-7z5n}>K9WjF{V0B=E7*h$T
z0hvQU30NAW4uZj4$_S7_#Fzk52f@UsCZGmn5CJ7%X^=Vy26HJRKn4+G0!SSM6Qi0K
zH6YW7RR>Z#S`QKvT5vU>AcJ%8FhJ@c7>^=ir9cJ|qZXtNf{9U0Kn=(s0!qNrAaxK7
z=2Aw03?jw^kU9t^Ml}I7AcF`f0ZW6_K`@w0838hg7!yG1Aeb1{#HfLo1|o@3O+XE?
z#(>m8FfIcvEO5zS5eFHCMHoW}qz-~Hq(~P48HA*3wB$qz48lyb(8H+#qz-~{Dj{A1
zWDs7}w;{41br1~UQ$&IcBE|raItV64H32msg9s=AOM}!wFqlgj0Wydf6F}-9m>AVq
z)POW&5ylV#se@n)DbfWX27yS@^<wBC))<gF2*xmiGyyIyE@M+(h*2~ss&FsJ;^i80
eDH|3_)Ceb#S;WK?NF4+dqZ&;ONF$mMCKmv{2RjP@

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5667822731132928 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5667822731132928
deleted file mode 100644
index b21d1cee9db6fcfd60f780ce92b1c46bed591a41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 317
zcmWFt4N-7Z@CXSB&^OdG;N?oqD@o+)_3}#Ka?Z~yNzE(Kb<Io8Ps#L4w@OJ(%SkLr
z<>lh#vgl=IU|?Wi1Q84jYZ(||A`A=+n>YLV`1m;a_-qCNpI)wBu2wD(2_`^{UaplO
zN)br_#P8*r%+<@)f*}f#>*Z4H<w{IUv`mc(jnb%qLWl#fkuD9lU0l#5I2jli#Lxxt
X@B`+Ah9F5pEv+cw;_B_?;_3we%icZR

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552
deleted file mode 100644
index 797165c50b2ce9fd62fc71f5ca322aeac8ac3bf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 974479
zcmWFt4N-7Z@CXSB&^OdG;N|LtLR}qQUM}bSypq(s65Wu>f>f*A(wvgag2bW{{j~g|
zT-}t!lEkF^(!7+!qDtFbUM^?0xMfh~uBj>cDXA$4{jPb*`6-!x=~gMJX*r1{sk~gg
zTo%1tmI59OS{hso4FAE1gU#{(|NmLZ$*Bb;x&etL$r-%1R=m7iV9dkIWyJ?#Ye4uQ
z@lsx^9N7{sn4^MS9fO=b{{PQnU~oyzDM{3IN-R!gzyai8;*Lo6fyCThLljIDJV5e>
zdWO7QoEtC!$R3C&7cZBtF39&#ue)Rx7vvXbmSpDVS@H02A;5nK_yiYm%*n|whw;3)
zxVUU=Y-|ETLqL>`jR_nW+t}FDzyzQih?*fxLVPz|d^3b2f*MYLPYpvx%@_@V(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~TC0-A%v8KbTk4S~@R7!85Z5WpS+E}q!M
zM@2_NU^E117Xmu8GkVnI(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC70osOuGi{9@HGMP$MnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(6pV(zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjDpb+7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fl)9T0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*AutL?Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3P$Xb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2A{7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c1*0J_8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqhK@yMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU=)moz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kW!
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S`WG8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiQ~MnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0q!DtAKhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinC>RZa(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7zLvtFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;6Cw1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtqq)hQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mg(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!83@Fd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?3PwX<Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhl}
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1Jg3%Bd4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=CQ7{?;qaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFbYOPU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V+JV2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin
zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-S1JhQKHo4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVB~qaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*U^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU
z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
KMnhnvga81b{Bo24

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5942767436562432 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5942767436562432
deleted file mode 100644
index a2fedd59cf1bf07854832fbff53d2c2b4f1d7a09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmWFt4N-7Z@CXSB&^OdG;N^18&nrpIE3rx}D9Fi7PP8t`%+J%W&@C@7*G<bW%GE6`
z%1O;j&QD2A;pOV}@=Abd&~*igX8NUDrKG0iB$lKGlw=m9<@0j!a#{2;GcYhPFfuUk
zGB7Z3Sza>|@L&)%;-nQ=)yoBg0>=c72^|BG45CIz;vo5e&=8n9Ef60I&M#4L%P-AK
zv3Q6Z@bYq<w&LaGf?)?M0bZE7T)mFT$*IM~x*)U9f<<{j%w8!l2^IhmT0x0<>8Suf
Cwrtt}

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464
deleted file mode 100644
index 4c4c57e819e60fbc67e1ecc8a554ad13112ba739..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452123
zcmWFt@>D2Q@CXSB&^OdG;N^18&nrpIE71+9EJ(G=EzK#(EJ!RW(ND`S%GFItEJ;kt
zFU?CyEUL84MW}VnOU_Tp%uBaQugWao<q8N5QE-GAX^2n;HZrlGASW|9u_QA;PrpL9
zyu4f&Y;<W+PAbTh)D(nzh_Qa@Rw=1zIf*5yyj;9o7QI}S0v-%n8Zf}c#kL9zdbxVF
z6u5e62+@qT;^pOnV_7JhotKM&;s1XI5MYCf!PM!Z@nPZ(3=9k~HV;e<1K4bsFqj5~
zYk`7CD<rNAdAUN067!1FQj2t5^Zu7Gfb9K`1pYzUAZ@j<=m5pAKk+fl%cZNE%gY6h
za*zDtl50?~dGnXeMS1zznNa?<Yu7dxr5;r~s3xUWt0tgUp;o3=z;Q}VO|7&@%{0K*
z7Ze^4?Cb06tD0ng+1}s2#Xi;E+P=;{)jq`jag)6}m@~~j)&4SADAzvPF*!N4xL6mI
zD2wuQbRBbY^2>Fdi&9fk^GY%kbBZBa+Uz0TgC`x=ih|6d)MDKbaJa#OlrA(~ECHtt
zc-o`CCuwTG9Yy}}Ow;wt&r8+yO)N>yAkLjFWW-s7u5*4-QECpjAk+19!RBT|GR(zh
z4qh>c7Z-uR=LHRoAbQbaFo}m)i6jRq9!5)R28PkndbG60o73o#n}?nqqop+|aW-07
zqcx&w*<K$tdo%<_Ltr!nXdMC+7HJe}r?u}!%^wYc(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2cd?5guq8)s$8g<cV2n^>CP&G3i9m5$7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@Rpi>C+(8-?R+>agg+h_=khQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2C73IVIpsrJzj7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVCWArO+8o0*pmJ#XB<C^J1XZ<zROL=9Dp
z#@QeY0gXZErqNt68UmvsFd71*Aut*OqaiR@L!foE<uDooqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Auv=!0CdrFL5Z$QVo7RAW^U?W9f2Bk*JucghQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-R~zz7Xgfs-uFV?j8++(GVC7
zfzc2c4S~@R7!3iuA%ItM@HNUtT{Id3qaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*AuzZ@ARshE!BN2@BqTuJP|uK;%Q-)<BsH%@H>9#4)he-|ASW|9u_QA;
zPrpL9yu4gDEx#yNx3nlHH7_|oB{c=1-W4Q}>6dPmlA4y2Sdz-i#mi;U%VjCx!Jwr9
z16*8etH7X_t5-{5bfjxE1V%$(Gz3ON04)U2xTIDf6ly2cx>5C`Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd72X3jtNb(ZQY35Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5E#-S&^e@CKf2FvGz3ONU^E0qLtr!nMnhmU1ZWikqm87|5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu;sYKH(5t%mbP%^eMa(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!3j1hQMgIV>ARtLtr!nMnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E19hCl*N8QLD2IcoZ72#kinXb6mkz-S1JhQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb22c2q=^)Y+M}@pl_&W
zz{};FpI4HaSE3tIS&(X#TbfgnS&&#%qMw#ul&hPPSdy5OUz(SaSX617i%{#Dmz<xH
znU`*rUX@wE%M}nBqTs0D5dt#O!o<YP+{DDd+}PZ}($v(@%+OTN5Tf%+Ub<CEYFbWW
zNh&WFFPB9xm!*IQgO&yiaB;C|tO9{vu3jw#ih504R=m6rEDNRCdAS%E{(}(%8&r&!
zHy7j(UEN$>uF^cPry-hPnxQn5f}4q*FODMr4sHkBND_Sn(-%;bn4X&mvXde|Sn*nM
zaq;pZ99a$l1C<Cz?Hvt)(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu;s
z@<M>beY@mYGOBAd1gI4Pt)nS+Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E2i7y?{$w2NBnu1C!o4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
zAU6a?k9Zvofzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC70h)$@s+loO%^zL;Fd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;Gq)AUP_}gLIdV>KF}y(GVC7fzc2c
z4S~@R7!85Z5Eu;sdWXOuX+6{1+oSf4hQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz+epljnNUz(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7&IX;XdE(nRNH6>5EBBeqbYVY1V%$(Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONVAzI0XhC{WVoIv6XI^n?a%oYjZcu7rX=-sv@v!wVF*D_(YDPm~Gz3ONU^E0q
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMniyb2yl(=&>szf(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7
zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C
z(GVCxAuxixIyxCT8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?5FwyyW;}Z4)o2KehQMeD
zjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J
zhQMeDjE2By2#kinXb6mkz-R~zs}LAgo*CW#Ga3S;Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Ulko1O~}M
zCy&7%PNVJ{4S~@R7!85Z5Eu=C(GVE;5b(<{QSi-A$xO>kO&NICjJjYn1O`b<dNd+N
zLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E0EA)qlje=`~aqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF
z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*
zAut*OqaiRF0;3@?8UmvsFhoOOh&p@p2(XbF0<EJdb~FS=Ltr!nMnhmU1V%$(Gz3ON
zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1PFw{=LL=X@r|Q@UeLG$pZuuY
TXb8|O1U@flSVtiJVzV0nN!|%Z

diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696
deleted file mode 100644
index 6f898364..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6508706672541696
+++ /dev/null
@@ -1,7 +0,0 @@
-PUT { HTTP/1.0
-Content-Type:multipart/form-databoundary=m
-Range:bytes=-
-
---m
-C
-c






















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	






























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































ï



















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌







































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































X-Forwarded-Host


























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹












































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































X-Forwarded-Host





































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































ï



















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌







































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































PUT Ñ?
&+&:&<&ã&I&`&a&Ó&s&�&Æ&2&ä&Å&@&!&





















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	




























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































X-Forwarded-Host


























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































	













































































































































































































































































































































































































































































































‮










































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































‌























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































¹









































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































2
























































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































+/v+
















































































































































































































































































































































































































































































































































































































































































































































































































































































\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264 b/code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264
deleted file mode 100644
index fd53db5c..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/corpus/issue1264
+++ /dev/null
@@ -1,19 +0,0 @@
-POST /fform%u008anoÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔãm%u08a�g HTTP/1.0
-DondntGnt-Encodin€z-daExpi%20-Enëv2PUT@ËHTkP/

-Rcnðÿÿÿÿÿÿ ,Cotent-Security-Pz-tes=T“peont.e�µ-Typènt-Ty@n/***ww-form-urlenc…Tÿû?aLO%KSi@FrÇTTP/1.0
-Cofffffffffffffffffffffffntemt�
-�
-�
-�
-�
-�
-Content-Length:dent:applica;tion/x-wsw-form%`00368aogrlencod368angrlencoded
-�JJ`
-o
-
-8�ÿõContent-EncodxNg:deflatePtipfo
-
-8�


-9Ö2H2											ncod368anPOST # HTTP/1.0
Content-Encoding:defPOST / HTTP/1.0
-Content-Encoding:PUT { HTTP/1.0
-Content-Type:Range:bytes=-
multipart/
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc b/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc
deleted file mode 100644
index b1ba3dbf..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-#include <cstdint>
-
-#include <httplib.h>
-
-class FuzzedStream : public httplib::Stream {
-public:
-  FuzzedStream(const uint8_t *data, size_t size)
-      : data_(data), size_(size), read_pos_(0) {}
-
-  ssize_t read(char *ptr, size_t size) override {
-    if (size + read_pos_ > size_) { size = size_ - read_pos_; }
-    memcpy(ptr, data_ + read_pos_, size);
-    read_pos_ += size;
-    return static_cast<ssize_t>(size);
-  }
-
-  ssize_t write(const char *ptr, size_t size) override {
-    response_.append(ptr, size);
-    return static_cast<int>(size);
-  }
-
-  ssize_t write(const char *ptr) { return write(ptr, strlen(ptr)); }
-
-  ssize_t write(const std::string &s) { return write(s.data(), s.size()); }
-
-  bool is_readable() const override { return true; }
-
-  bool is_writable() const override { return true; }
-
-  void get_remote_ip_and_port(std::string &ip, int &port) const override {
-    ip = "127.0.0.1";
-    port = 8080;
-  }
-
-  void get_local_ip_and_port(std::string &ip, int &port) const override {
-    ip = "127.0.0.1";
-    port = 8080;
-  }
-
-  socket_t socket() const override { return 0; }
-
-  time_t duration() const override { return 0; };
-
-private:
-  const uint8_t *data_;
-  size_t size_;
-  size_t read_pos_;
-  std::string response_;
-};
-
-class FuzzableServer : public httplib::Server {
-public:
-  void ProcessFuzzedRequest(FuzzedStream &stream) {
-    bool connection_close = false;
-    process_request(stream,
-                    /*remote_addr=*/"",
-                    /*remote_port =*/0,
-                    /*local_addr=*/"",
-                    /*local_port =*/0,
-                    /*last_connection=*/false, connection_close, nullptr);
-  }
-};
-
-static FuzzableServer g_server;
-
-extern "C" int LLVMFuzzerInitialize(int * /*argc*/, char *** /*argv*/) {
-  g_server.Get(R"(.*)",
-               [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                 res.set_content("response content", "text/plain");
-               });
-  g_server.Post(R"(.*)",
-                [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                  res.set_content("response content", "text/plain");
-                });
-  g_server.Put(R"(.*)",
-               [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                 res.set_content("response content", "text/plain");
-               });
-  g_server.Patch(R"(.*)",
-                 [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                   res.set_content("response content", "text/plain");
-                 });
-  g_server.Delete(
-      R"(.*)", [&](const httplib::Request & /*req*/, httplib::Response &res) {
-        res.set_content("response content", "text/plain");
-      });
-  g_server.Options(
-      R"(.*)", [&](const httplib::Request & /*req*/, httplib::Response &res) {
-        res.set_content("response content", "text/plain");
-      });
-  return 0;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-  FuzzedStream stream{data, size};
-  g_server.ProcessFuzzedRequest(stream);
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict b/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict
deleted file mode 100644
index 47283dc3..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/server_fuzzer.dict
+++ /dev/null
@@ -1,224 +0,0 @@
-# Sources: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-
-# misc
-"HTTP/1.1"
-
-# verbs
-"CONNECT"
-"DELETE"
-"GET"
-"HEAD"
-"OPTIONS"
-"PATCH"
-"POST"
-"PUT"
-"TRACE"
-
-
-# Webdav/caldav verbs
-"ACL"
-"BASELINE-CONTROL"
-"BIND"
-"CHECKIN"
-"CHECKOUT"
-"COPY"
-"LABEL"
-"LINK"
-"LOCK"
-"MERGE"
-"MKACTIVITY"
-"MKCALENDAR"
-"MKCOL"
-"MKREDIRECTREF"
-"MKWORKSPACE"
-"MOVE"
-"ORDERPATCH"
-"PRI"
-"PROPFIND"
-"PROPPATCH"
-"REBIND"
-"REPORT"
-"SEARCH"
-"UNBIND"
-"UNCHECKOUT"
-"UNLINK"
-"UNLOCK"
-"UPDATE"
-"UPDATEREDIRECTREF"
-"VERSION-CONTROL"
-
-
-# Fields
-"A-IM"
-"Accept"
-"Accept-Charset"
-"Accept-Datetime"
-"Accept-Encoding"
-"Accept-Language"
-"Accept-Patch"
-"Accept-Ranges"
-"Access-Control-Allow-Credentials"
-"Access-Control-Allow-Headers"
-"Access-Control-Allow-Methods"
-"Access-Control-Allow-Origin"
-"Access-Control-Expose-Headers"
-"Access-Control-Max-Age"
-"Access-Control-Request-Headers"
-"Access-Control-Request-Method"
-"Age"
-"Allow"
-"Alt-Svc"
-"Authorization"
-"Cache-Control"
-"Connection"
-"Connection:"
-"Content-Disposition"
-"Content-Encoding"
-"Content-Language"
-"Content-Length"
-"Content-Location"
-"Content-MD5"
-"Content-Range"
-"Content-Security-Policy"
-"Content-Type"
-"Cookie"
-"DNT"
-"Date"
-"Delta-Base"
-"ETag"
-"Expect"
-"Expires"
-"Forwarded"
-"From"
-"Front-End-Https"
-"HTTP2-Settings"
-"Host"
-"IM"
-"If-Match"
-"If-Modified-Since"
-"If-None-Match"
-"If-Range"
-"If-Unmodified-Since"
-"Last-Modified"
-"Link"
-"Location"
-"Max-Forwards"
-"Origin"
-"P3P"
-"Pragma"
-"Proxy-Authenticate"
-"Proxy-Authorization"
-"Proxy-Connection"
-"Public-Key-Pins"
-"Range"
-"Referer"
-"Refresh"
-"Retry-After"
-"Save-Data"
-"Server"
-"Set-Cookie"
-"Status"
-"Strict-Transport-Security"
-"TE"
-"Timing-Allow-Origin"
-"Tk"
-"Trailer"
-"Transfer-Encoding"
-"Upgrade"
-"Upgrade-Insecure-Requests"
-"User-Agent"
-"Vary"
-"Via"
-"WWW-Authenticate"
-"Warning"
-"X-ATT-DeviceId"
-"X-Content-Duration"
-"X-Content-Security-Policy"
-"X-Content-Type-Options"
-"X-Correlation-ID"
-"X-Csrf-Token"
-"X-Forwarded-For"
-"X-Forwarded-Host"
-"X-Forwarded-Proto"
-"X-Frame-Options"
-"X-Http-Method-Override"
-"X-Powered-By"
-"X-Request-ID"
-"X-Requested-With"
-"X-UA-Compatible"
-"X-UIDH"
-"X-Wap-Profile"
-"X-WebKit-CSP"
-"X-XSS-Protection"
-
-# Source: string and character literals in httplib.h
-" "
-"&"
-", "
-"-"
-"--"
-"."
-".."
-":"
-"="
-" = = "
-"0123456789abcdef"
-"%02X"
-"%0A"
-"\\x0a\\x0d"
-"%0D"
-"%20"
-"%27"
-"%2B"
-"%2C"
-"%3A"
-"%3B"
-"application/javascript"
-"application/json"
-"application/pdf"
-"application/xhtml+xml"
-"application/xml"
-"application/x-www-form-urlencoded"
-"Bad Request"
-"boundary="
-"bytes="
-"chunked"
-"close"
-"CONNECT"
-"css"
-"Forbidden"
-"Found"
-"gif"
-"gzip"
-"html"
-"ico"
-"image/gif"
-"image/jpg"
-"image/png"
-"image/svg+xml"
-"image/x-icon"
-"index.html"
-"Internal Server Error"
-"jpeg"
-"js"
-"json"
-"Location"
-"Moved Permanently"
-"multipart/form-data"
-"Not Found"
-"Not Modified"
-"OK"
-"pdf"
-"png"
-"Range"
-"REMOTE_ADDR"
-"See Other"
-"svg"
-"text/"
-"text/css"
-"text/html"
-"text/plain"
-"txt"
-"Unsupported Media Type"
-"xhtml"
-"xml"
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp b/code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp
deleted file mode 100644
index e8bd5ed6..00000000
--- a/code/cpp-httplib-0.19.0/test/fuzzing/standalone_fuzz_target_runner.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
-// Licensed under the Apache License, Version 2.0 (the "License");
-
-// This runner does not do any fuzzing, but allows us to run the fuzz target
-// on the test corpus or on a single file,
-// e.g. the one that comes from a bug report.
-
-#include <cstdint>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-// Forward declare the "fuzz target" interface.
-// We deliberately keep this interface simple and header-free.
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
-
-// It reads all files passed as parameters and feeds their contents
-// one by one into the fuzz target (LLVMFuzzerTestOneInput).
-int main(int argc, char **argv) {
-  for (int i = 1; i < argc; i++) {
-    std::ifstream in(argv[i]);
-    in.seekg(0, in.end);
-    size_t length = static_cast<size_t>(in.tellg());
-    in.seekg(0, in.beg);
-    std::cout << "Reading " << length << " bytes from " << argv[i] << std::endl;
-    // Allocate exactly length bytes so that we reliably catch buffer overflows.
-    std::vector<char> bytes(length);
-    in.read(bytes.data(), static_cast<std::streamsize>(bytes.size()));
-    LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()),
-                           bytes.size());
-    std::cout << "Execution successful" << std::endl;
-  }
-  std::cout << "Execution finished" << std::endl;
-  return 0;
-}
diff --git a/code/cpp-httplib-0.19.0/test/gen-certs.sh b/code/cpp-httplib-0.19.0/test/gen-certs.sh
deleted file mode 100644
index ee2a2cf3..00000000
--- a/code/cpp-httplib-0.19.0/test/gen-certs.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-if [[ $(openssl version) =~ 3\.[2-9]\.[0-9]+ ]]; then
-	OPENSSL_X509_FLAG='-x509v1'
-else
-	OPENSSL_X509_FLAG='-x509'
-fi
-
-openssl genrsa 2048 > key.pem
-openssl req -new -batch -config test.conf -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
-openssl req -x509 -config test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
-openssl genrsa 2048 > rootCA.key.pem
-openssl req $OPENSSL_X509_FLAG -new -batch -config test.rootCA.conf -key rootCA.key.pem -days 1024 > rootCA.cert.pem
-openssl genrsa 2048 > client.key.pem
-openssl req -new -batch -config test.conf -key client.key.pem | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client.cert.pem
-openssl genrsa -passout pass:test123! 2048 > key_encrypted.pem
-openssl req -new -batch -config test.conf -key key_encrypted.pem | openssl x509 -days 3650 -req -signkey key_encrypted.pem > cert_encrypted.pem
-openssl genrsa -aes256 -passout pass:test012! 2048 > client_encrypted.key.pem
-openssl req -new -batch -config test.conf -key client_encrypted.key.pem -passin pass:test012! | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client_encrypted.cert.pem
diff --git a/code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc b/code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc
deleted file mode 100644
index 24e669e1..00000000
--- a/code/cpp-httplib-0.19.0/test/gtest/gtest-all.cc
+++ /dev/null
@@ -1,12501 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Testing and Mocking Framework (Google Test)
-//
-// Sometimes it's desirable to build Google Test by compiling a single file.
-// This file serves this purpose.
-
-// This line ensures that gtest.h can be compiled on its own, even
-// when it's fused.
-#include "gtest/gtest.h"
-
-// The following lines pull in the real gtest *.cc files.
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Utilities for testing Google Test itself and code that uses Google Test
-// (e.g. frameworks built on top of Google Test).
-
-// GOOGLETEST_CM0004 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
-
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// This helper class can be used to mock out Google Test failure reporting
-// so that we can test Google Test or code that builds on Google Test.
-//
-// An object of this class appends a TestPartResult object to the
-// TestPartResultArray object given in the constructor whenever a Google Test
-// failure is reported. It can either intercept only failures that are
-// generated in the same thread that created this object or it can intercept
-// all generated failures. The scope of this mock object can be controlled with
-// the second argument to the two arguments constructor.
-class GTEST_API_ ScopedFakeTestPartResultReporter
-    : public TestPartResultReporterInterface {
- public:
-  // The two possible mocking modes of this object.
-  enum InterceptMode {
-    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
-    INTERCEPT_ALL_THREADS           // Intercepts all failures.
-  };
-
-  // The c'tor sets this object as the test part result reporter used
-  // by Google Test.  The 'result' parameter specifies where to report the
-  // results. This reporter will only catch failures generated in the current
-  // thread. DEPRECATED
-  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
-
-  // Same as above, but you can choose the interception scope of this object.
-  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
-                                   TestPartResultArray* result);
-
-  // The d'tor restores the previous test part result reporter.
-  ~ScopedFakeTestPartResultReporter() override;
-
-  // Appends the TestPartResult object to the TestPartResultArray
-  // received in the constructor.
-  //
-  // This method is from the TestPartResultReporterInterface
-  // interface.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  void Init();
-
-  const InterceptMode intercept_mode_;
-  TestPartResultReporterInterface* old_reporter_;
-  TestPartResultArray* const result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
-};
-
-namespace internal {
-
-// A helper class for implementing EXPECT_FATAL_FAILURE() and
-// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring.  If that's not the case, a
-// non-fatal failure will be generated.
-class GTEST_API_ SingleFailureChecker {
- public:
-  // The constructor remembers the arguments.
-  SingleFailureChecker(const TestPartResultArray* results,
-                       TestPartResult::Type type, const std::string& substr);
-  ~SingleFailureChecker();
- private:
-  const TestPartResultArray* const results_;
-  const TestPartResult::Type type_;
-  const std::string substr_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// A set of macros for testing Google Test assertions or code that's expected
-// to generate Google Test fatal failures.  It verifies that the given
-// statement will cause exactly one fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-//   - 'statement' cannot reference local non-static variables or
-//     non-static members of the current object.
-//   - 'statement' cannot return a value.
-//   - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
-// gtest_unittest.cc will fail to compile if we do that.
-#define EXPECT_FATAL_FAILURE(statement, substr) \
-  do { \
-    class GTestExpectFatalFailureHelper {\
-     public:\
-      static void Execute() { statement; }\
-    };\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
-      GTestExpectFatalFailureHelper::Execute();\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
-  do { \
-    class GTestExpectFatalFailureHelper {\
-     public:\
-      static void Execute() { statement; }\
-    };\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ALL_THREADS, &gtest_failures);\
-      GTestExpectFatalFailureHelper::Execute();\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-// A macro for testing Google Test assertions or code that's expected to
-// generate Google Test non-fatal failures.  It asserts that the given
-// statement will cause exactly one non-fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// 'statement' is allowed to reference local variables and members of
-// the current object.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-//   - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works.  If we do that, the code won't compile when the user gives
-// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
-// expands to code containing an unprotected comma.  The
-// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
-// catches that.
-//
-// For the same reason, we have to write
-//   if (::testing::internal::AlwaysTrue()) { statement; }
-// instead of
-//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-// to avoid an MSVC warning on unreachable code.
-#define EXPECT_NONFATAL_FAILURE(statement, substr) \
-  do {\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
-      if (::testing::internal::AlwaysTrue()) { statement; }\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
-  do {\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
-          &gtest_failures);\
-      if (::testing::internal::AlwaysTrue()) { statement; }\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
-
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include <algorithm>
-#include <chrono>  // NOLINT
-#include <cmath>
-#include <cstdint>
-#include <iomanip>
-#include <limits>
-#include <list>
-#include <map>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <vector>
-
-#if GTEST_OS_LINUX
-
-# include <fcntl.h>  // NOLINT
-# include <limits.h>  // NOLINT
-# include <sched.h>  // NOLINT
-// Declares vsnprintf().  This header is not available on Windows.
-# include <strings.h>  // NOLINT
-# include <sys/mman.h>  // NOLINT
-# include <sys/time.h>  // NOLINT
-# include <unistd.h>  // NOLINT
-# include <string>
-
-#elif GTEST_OS_ZOS
-# include <sys/time.h>  // NOLINT
-
-// On z/OS we additionally need strings.h for strcasecmp.
-# include <strings.h>  // NOLINT
-
-#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
-
-# include <windows.h>  // NOLINT
-# undef min
-
-#elif GTEST_OS_WINDOWS  // We are on Windows proper.
-
-# include <windows.h>  // NOLINT
-# undef min
-
-#ifdef _MSC_VER
-# include <crtdbg.h>  // NOLINT
-#endif
-
-# include <io.h>  // NOLINT
-# include <sys/timeb.h>  // NOLINT
-# include <sys/types.h>  // NOLINT
-# include <sys/stat.h>  // NOLINT
-
-# if GTEST_OS_WINDOWS_MINGW
-#  include <sys/time.h>  // NOLINT
-# endif  // GTEST_OS_WINDOWS_MINGW
-
-#else
-
-// cpplint thinks that the header is already included, so we want to
-// silence it.
-# include <sys/time.h>  // NOLINT
-# include <unistd.h>  // NOLINT
-
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>
-#endif
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include <arpa/inet.h>  // NOLINT
-# include <netdb.h>  // NOLINT
-# include <sys/socket.h>  // NOLINT
-# include <sys/types.h>  // NOLINT
-#endif
-
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Utility functions and classes used by the Google C++ testing framework.//
-// This file contains purely Google Test's internal implementation.  Please
-// DO NOT #INCLUDE IT IN A USER PROGRAM.
-
-#ifndef GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
-#define GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
-
-#ifndef _WIN32_WCE
-# include <errno.h>
-#endif  // !_WIN32_WCE
-#include <stddef.h>
-#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
-#include <string.h>  // For memmove.
-
-#include <algorithm>
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
-
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include <arpa/inet.h>  // NOLINT
-# include <netdb.h>  // NOLINT
-#endif
-
-#if GTEST_OS_WINDOWS
-# include <windows.h>  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// Declares the flags.
-//
-// We don't want the users to modify this flag in the code, but want
-// Google Test's own unit tests to be able to access it. Therefore we
-// declare it here as opposed to in gtest.h.
-GTEST_DECLARE_bool_(death_test_use_fork);
-
-namespace internal {
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library.  This is solely for testing GetTestTypeId().
-GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
-const char kBreakOnFailureFlag[] = "break_on_failure";
-const char kCatchExceptionsFlag[] = "catch_exceptions";
-const char kColorFlag[] = "color";
-const char kFailFast[] = "fail_fast";
-const char kFilterFlag[] = "filter";
-const char kListTestsFlag[] = "list_tests";
-const char kOutputFlag[] = "output";
-const char kBriefFlag[] = "brief";
-const char kPrintTimeFlag[] = "print_time";
-const char kPrintUTF8Flag[] = "print_utf8";
-const char kRandomSeedFlag[] = "random_seed";
-const char kRepeatFlag[] = "repeat";
-const char kShuffleFlag[] = "shuffle";
-const char kStackTraceDepthFlag[] = "stack_trace_depth";
-const char kStreamResultToFlag[] = "stream_result_to";
-const char kThrowOnFailureFlag[] = "throw_on_failure";
-const char kFlagfileFlag[] = "flagfile";
-
-// A valid random seed must be in [1, kMaxRandomSeed].
-const int kMaxRandomSeed = 99999;
-
-// g_help_flag is true if and only if the --help flag or an equivalent form
-// is specified on the command line.
-GTEST_API_ extern bool g_help_flag;
-
-// Returns the current time in milliseconds.
-GTEST_API_ TimeInMillis GetTimeInMillis();
-
-// Returns true if and only if Google Test should use colors in the output.
-GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
-
-// Formats the given time in milliseconds as seconds.
-GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
-
-// Converts the given time in milliseconds to a date string in the ISO 8601
-// format, without the timezone information.  N.B.: due to the use the
-// non-reentrant localtime() function, this function is not thread safe.  Do
-// not use it in any code that can be called from multiple threads.
-GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
-
-// Parses a string for an Int32 flag, in the form of "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-GTEST_API_ bool ParseInt32Flag(
-    const char* str, const char* flag, int32_t* value);
-
-// Returns a random seed in range [1, kMaxRandomSeed] based on the
-// given --gtest_random_seed flag value.
-inline int GetRandomSeedFromFlag(int32_t random_seed_flag) {
-  const unsigned int raw_seed = (random_seed_flag == 0) ?
-      static_cast<unsigned int>(GetTimeInMillis()) :
-      static_cast<unsigned int>(random_seed_flag);
-
-  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
-  // it's easy to type.
-  const int normalized_seed =
-      static_cast<int>((raw_seed - 1U) %
-                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
-  return normalized_seed;
-}
-
-// Returns the first valid random seed after 'seed'.  The behavior is
-// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
-// considered to be 1.
-inline int GetNextRandomSeed(int seed) {
-  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
-      << "Invalid random seed " << seed << " - must be in [1, "
-      << kMaxRandomSeed << "].";
-  const int next_seed = seed + 1;
-  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
-}
-
-// This class saves the values of all Google Test flags in its c'tor, and
-// restores them in its d'tor.
-class GTestFlagSaver {
- public:
-  // The c'tor.
-  GTestFlagSaver() {
-    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
-    break_on_failure_ = GTEST_FLAG(break_on_failure);
-    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
-    color_ = GTEST_FLAG(color);
-    death_test_style_ = GTEST_FLAG(death_test_style);
-    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
-    fail_fast_ = GTEST_FLAG(fail_fast);
-    filter_ = GTEST_FLAG(filter);
-    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
-    list_tests_ = GTEST_FLAG(list_tests);
-    output_ = GTEST_FLAG(output);
-    brief_ = GTEST_FLAG(brief);
-    print_time_ = GTEST_FLAG(print_time);
-    print_utf8_ = GTEST_FLAG(print_utf8);
-    random_seed_ = GTEST_FLAG(random_seed);
-    repeat_ = GTEST_FLAG(repeat);
-    shuffle_ = GTEST_FLAG(shuffle);
-    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
-    stream_result_to_ = GTEST_FLAG(stream_result_to);
-    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
-  }
-
-  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
-  ~GTestFlagSaver() {
-    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
-    GTEST_FLAG(break_on_failure) = break_on_failure_;
-    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
-    GTEST_FLAG(color) = color_;
-    GTEST_FLAG(death_test_style) = death_test_style_;
-    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
-    GTEST_FLAG(filter) = filter_;
-    GTEST_FLAG(fail_fast) = fail_fast_;
-    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
-    GTEST_FLAG(list_tests) = list_tests_;
-    GTEST_FLAG(output) = output_;
-    GTEST_FLAG(brief) = brief_;
-    GTEST_FLAG(print_time) = print_time_;
-    GTEST_FLAG(print_utf8) = print_utf8_;
-    GTEST_FLAG(random_seed) = random_seed_;
-    GTEST_FLAG(repeat) = repeat_;
-    GTEST_FLAG(shuffle) = shuffle_;
-    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
-    GTEST_FLAG(stream_result_to) = stream_result_to_;
-    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
-  }
-
- private:
-  // Fields for saving the original values of flags.
-  bool also_run_disabled_tests_;
-  bool break_on_failure_;
-  bool catch_exceptions_;
-  std::string color_;
-  std::string death_test_style_;
-  bool death_test_use_fork_;
-  bool fail_fast_;
-  std::string filter_;
-  std::string internal_run_death_test_;
-  bool list_tests_;
-  std::string output_;
-  bool brief_;
-  bool print_time_;
-  bool print_utf8_;
-  int32_t random_seed_;
-  int32_t repeat_;
-  bool shuffle_;
-  int32_t stack_trace_depth_;
-  std::string stream_result_to_;
-  bool throw_on_failure_;
-} GTEST_ATTRIBUTE_UNUSED_;
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
-// to "(Invalid Unicode 0xXXXXXXXX)".
-GTEST_API_ std::string CodePointToUtf8(uint32_t code_point);
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
-//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded();
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (e.g., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-GTEST_API_ bool ShouldShard(const char* total_shards_str,
-                            const char* shard_index_str,
-                            bool in_subprocess_for_death_test);
-
-// Parses the environment variable var as a 32-bit integer. If it is unset,
-// returns default_val. If it is not a 32-bit integer, prints an error and
-// and aborts.
-GTEST_API_ int32_t Int32FromEnvOrDie(const char* env_var, int32_t default_val);
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true if and only if the test should be run on this shard. The test id
-// is some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-GTEST_API_ bool ShouldRunTestOnShard(
-    int total_shards, int shard_index, int test_id);
-
-// STL container utilities.
-
-// Returns the number of elements in the given container that satisfy
-// the given predicate.
-template <class Container, typename Predicate>
-inline int CountIf(const Container& c, Predicate predicate) {
-  // Implemented as an explicit loop since std::count_if() in libCstd on
-  // Solaris has a non-standard signature.
-  int count = 0;
-  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
-    if (predicate(*it))
-      ++count;
-  }
-  return count;
-}
-
-// Applies a function/functor to each element in the container.
-template <class Container, typename Functor>
-void ForEach(const Container& c, Functor functor) {
-  std::for_each(c.begin(), c.end(), functor);
-}
-
-// Returns the i-th element of the vector, or default_value if i is not
-// in range [0, v.size()).
-template <typename E>
-inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
-  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value
-                                                    : v[static_cast<size_t>(i)];
-}
-
-// Performs an in-place shuffle of a range of the vector's elements.
-// 'begin' and 'end' are element indices as an STL-style range;
-// i.e. [begin, end) are shuffled, where 'end' == size() means to
-// shuffle to the end of the vector.
-template <typename E>
-void ShuffleRange(internal::Random* random, int begin, int end,
-                  std::vector<E>* v) {
-  const int size = static_cast<int>(v->size());
-  GTEST_CHECK_(0 <= begin && begin <= size)
-      << "Invalid shuffle range start " << begin << ": must be in range [0, "
-      << size << "].";
-  GTEST_CHECK_(begin <= end && end <= size)
-      << "Invalid shuffle range finish " << end << ": must be in range ["
-      << begin << ", " << size << "].";
-
-  // Fisher-Yates shuffle, from
-  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
-  for (int range_width = end - begin; range_width >= 2; range_width--) {
-    const int last_in_range = begin + range_width - 1;
-    const int selected =
-        begin +
-        static_cast<int>(random->Generate(static_cast<uint32_t>(range_width)));
-    std::swap((*v)[static_cast<size_t>(selected)],
-              (*v)[static_cast<size_t>(last_in_range)]);
-  }
-}
-
-// Performs an in-place shuffle of the vector's elements.
-template <typename E>
-inline void Shuffle(internal::Random* random, std::vector<E>* v) {
-  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
-}
-
-// A function for deleting an object.  Handy for being used as a
-// functor.
-template <typename T>
-static void Delete(T* x) {
-  delete x;
-}
-
-// A predicate that checks the key of a TestProperty against a known key.
-//
-// TestPropertyKeyIs is copyable.
-class TestPropertyKeyIs {
- public:
-  // Constructor.
-  //
-  // TestPropertyKeyIs has NO default constructor.
-  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
-
-  // Returns true if and only if the test name of test property matches on key_.
-  bool operator()(const TestProperty& test_property) const {
-    return test_property.key() == key_;
-  }
-
- private:
-  std::string key_;
-};
-
-// Class UnitTestOptions.
-//
-// This class contains functions for processing options the user
-// specifies when running the tests.  It has only static members.
-//
-// In most cases, the user can specify an option using either an
-// environment variable or a command line flag.  E.g. you can set the
-// test filter using either GTEST_FILTER or --gtest_filter.  If both
-// the variable and the flag are present, the latter overrides the
-// former.
-class GTEST_API_ UnitTestOptions {
- public:
-  // Functions for processing the gtest_output flag.
-
-  // Returns the output format, or "" for normal printed output.
-  static std::string GetOutputFormat();
-
-  // Returns the absolute path of the requested output file, or the
-  // default (test_detail.xml in the original working directory) if
-  // none was explicitly specified.
-  static std::string GetAbsolutePathToOutputFile();
-
-  // Functions for processing the gtest_filter flag.
-
-  // Returns true if and only if the user-specified filter matches the test
-  // suite name and the test name.
-  static bool FilterMatchesTest(const std::string& test_suite_name,
-                                const std::string& test_name);
-
-#if GTEST_OS_WINDOWS
-  // Function for supporting the gtest_catch_exception flag.
-
-  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-  // This function is useful as an __except condition.
-  static int GTestShouldProcessSEH(DWORD exception_code);
-#endif  // GTEST_OS_WINDOWS
-
-  // Returns true if "name" matches the ':' separated list of glob-style
-  // filters in "filter".
-  static bool MatchesFilter(const std::string& name, const char* filter);
-};
-
-// Returns the current application's name, removing directory path if that
-// is present.  Used by UnitTestOptions::GetOutputFile.
-GTEST_API_ FilePath GetCurrentExecutableName();
-
-// The role interface for getting the OS stack trace as a string.
-class OsStackTraceGetterInterface {
- public:
-  OsStackTraceGetterInterface() {}
-  virtual ~OsStackTraceGetterInterface() {}
-
-  // Returns the current OS stack trace as an std::string.  Parameters:
-  //
-  //   max_depth  - the maximum number of stack frames to be included
-  //                in the trace.
-  //   skip_count - the number of top frames to be skipped; doesn't count
-  //                against max_depth.
-  virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0;
-
-  // UponLeavingGTest() should be called immediately before Google Test calls
-  // user code. It saves some information about the current stack that
-  // CurrentStackTrace() will use to find and hide Google Test stack frames.
-  virtual void UponLeavingGTest() = 0;
-
-  // This string is inserted in place of stack frames that are part of
-  // Google Test's implementation.
-  static const char* const kElidedFramesMarker;
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
-};
-
-// A working implementation of the OsStackTraceGetterInterface interface.
-class OsStackTraceGetter : public OsStackTraceGetterInterface {
- public:
-  OsStackTraceGetter() {}
-
-  std::string CurrentStackTrace(int max_depth, int skip_count) override;
-  void UponLeavingGTest() override;
-
- private:
-#if GTEST_HAS_ABSL
-  Mutex mutex_;  // Protects all internal state.
-
-  // We save the stack frame below the frame that calls user code.
-  // We do this because the address of the frame immediately below
-  // the user code changes between the call to UponLeavingGTest()
-  // and any calls to the stack trace code from within the user code.
-  void* caller_frame_ = nullptr;
-#endif  // GTEST_HAS_ABSL
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
-};
-
-// Information about a Google Test trace point.
-struct TraceInfo {
-  const char* file;
-  int line;
-  std::string message;
-};
-
-// This is the default global test part result reporter used in UnitTestImpl.
-// This class should only be used by UnitTestImpl.
-class DefaultGlobalTestPartResultReporter
-  : public TestPartResultReporterInterface {
- public:
-  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
-  // Implements the TestPartResultReporterInterface. Reports the test part
-  // result in the current test.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  UnitTestImpl* const unit_test_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
-};
-
-// This is the default per thread test part result reporter used in
-// UnitTestImpl. This class should only be used by UnitTestImpl.
-class DefaultPerThreadTestPartResultReporter
-    : public TestPartResultReporterInterface {
- public:
-  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
-  // Implements the TestPartResultReporterInterface. The implementation just
-  // delegates to the current global test part result reporter of *unit_test_.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  UnitTestImpl* const unit_test_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
-};
-
-// The private implementation of the UnitTest class.  We don't protect
-// the methods under a mutex, as this class is not accessible by a
-// user and the UnitTest class that delegates work to this class does
-// proper locking.
-class GTEST_API_ UnitTestImpl {
- public:
-  explicit UnitTestImpl(UnitTest* parent);
-  virtual ~UnitTestImpl();
-
-  // There are two different ways to register your own TestPartResultReporter.
-  // You can register your own repoter to listen either only for test results
-  // from the current thread or for results from all threads.
-  // By default, each per-thread test result repoter just passes a new
-  // TestPartResult to the global test result reporter, which registers the
-  // test part result for the currently running test.
-
-  // Returns the global test part result reporter.
-  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
-
-  // Sets the global test part result reporter.
-  void SetGlobalTestPartResultReporter(
-      TestPartResultReporterInterface* reporter);
-
-  // Returns the test part result reporter for the current thread.
-  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
-
-  // Sets the test part result reporter for the current thread.
-  void SetTestPartResultReporterForCurrentThread(
-      TestPartResultReporterInterface* reporter);
-
-  // Gets the number of successful test suites.
-  int successful_test_suite_count() const;
-
-  // Gets the number of failed test suites.
-  int failed_test_suite_count() const;
-
-  // Gets the number of all test suites.
-  int total_test_suite_count() const;
-
-  // Gets the number of all test suites that contain at least one test
-  // that should run.
-  int test_suite_to_run_count() const;
-
-  // Gets the number of successful tests.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Gets the number of all tests.
-  int total_test_count() const;
-
-  // Gets the number of tests that should run.
-  int test_to_run_count() const;
-
-  // Gets the time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Gets the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Returns true if and only if the unit test passed (i.e. all test suites
-  // passed).
-  bool Passed() const { return !Failed(); }
-
-  // Returns true if and only if the unit test failed (i.e. some test suite
-  // failed or something outside of all tests failed).
-  bool Failed() const {
-    return failed_test_suite_count() > 0 || ad_hoc_test_result()->Failed();
-  }
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  const TestSuite* GetTestSuite(int i) const {
-    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
-  }
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* GetTestCase(int i) const { return GetTestSuite(i); }
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  TestSuite* GetMutableSuiteCase(int i) {
-    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
-  }
-
-  // Provides access to the event listener list.
-  TestEventListeners* listeners() { return &listeners_; }
-
-  // Returns the TestResult for the test that's currently running, or
-  // the TestResult for the ad hoc test if no test is running.
-  TestResult* current_test_result();
-
-  // Returns the TestResult for the ad hoc test.
-  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
-
-  // Sets the OS stack trace getter.
-  //
-  // Does nothing if the input and the current OS stack trace getter
-  // are the same; otherwise, deletes the old getter and makes the
-  // input the current getter.
-  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
-
-  // Returns the current OS stack trace getter if it is not NULL;
-  // otherwise, creates an OsStackTraceGetter, makes it the current
-  // getter, and returns it.
-  OsStackTraceGetterInterface* os_stack_trace_getter();
-
-  // Returns the current OS stack trace as an std::string.
-  //
-  // The maximum number of stack frames to be included is specified by
-  // the gtest_stack_trace_depth flag.  The skip_count parameter
-  // specifies the number of top frames to be skipped, which doesn't
-  // count against the number of frames to be included.
-  //
-  // For example, if Foo() calls Bar(), which in turn calls
-  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
-
-  // Finds and returns a TestSuite with the given name.  If one doesn't
-  // exist, creates one and returns it.
-  //
-  // Arguments:
-  //
-  //   test_suite_name: name of the test suite
-  //   type_param:      the name of the test's type parameter, or NULL if
-  //                    this is not a typed or a type-parameterized test.
-  //   set_up_tc:       pointer to the function that sets up the test suite
-  //   tear_down_tc:    pointer to the function that tears down the test suite
-  TestSuite* GetTestSuite(const char* test_suite_name, const char* type_param,
-                          internal::SetUpTestSuiteFunc set_up_tc,
-                          internal::TearDownTestSuiteFunc tear_down_tc);
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  TestCase* GetTestCase(const char* test_case_name, const char* type_param,
-                        internal::SetUpTestSuiteFunc set_up_tc,
-                        internal::TearDownTestSuiteFunc tear_down_tc) {
-    return GetTestSuite(test_case_name, type_param, set_up_tc, tear_down_tc);
-  }
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Adds a TestInfo to the unit test.
-  //
-  // Arguments:
-  //
-  //   set_up_tc:    pointer to the function that sets up the test suite
-  //   tear_down_tc: pointer to the function that tears down the test suite
-  //   test_info:    the TestInfo object
-  void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
-                   internal::TearDownTestSuiteFunc tear_down_tc,
-                   TestInfo* test_info) {
-#if GTEST_HAS_DEATH_TEST
-    // In order to support thread-safe death tests, we need to
-    // remember the original working directory when the test program
-    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
-    // the user may have changed the current directory before calling
-    // RUN_ALL_TESTS().  Therefore we capture the current directory in
-    // AddTestInfo(), which is called to register a TEST or TEST_F
-    // before main() is reached.
-    if (original_working_dir_.IsEmpty()) {
-      original_working_dir_.Set(FilePath::GetCurrentDir());
-      GTEST_CHECK_(!original_working_dir_.IsEmpty())
-          << "Failed to get the current working directory.";
-    }
-#endif  // GTEST_HAS_DEATH_TEST
-
-    GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
-                 set_up_tc, tear_down_tc)
-        ->AddTestInfo(test_info);
-  }
-
-  // Returns ParameterizedTestSuiteRegistry object used to keep track of
-  // value-parameterized tests and instantiate and register them.
-  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry() {
-    return parameterized_test_registry_;
-  }
-
-  std::set<std::string>* ignored_parameterized_test_suites() {
-    return &ignored_parameterized_test_suites_;
-  }
-
-  // Returns TypeParameterizedTestSuiteRegistry object used to keep track of
-  // type-parameterized tests and instantiations of them.
-  internal::TypeParameterizedTestSuiteRegistry&
-  type_parameterized_test_registry() {
-    return type_parameterized_test_registry_;
-  }
-
-  // Sets the TestSuite object for the test that's currently running.
-  void set_current_test_suite(TestSuite* a_current_test_suite) {
-    current_test_suite_ = a_current_test_suite;
-  }
-
-  // Sets the TestInfo object for the test that's currently running.  If
-  // current_test_info is NULL, the assertion results will be stored in
-  // ad_hoc_test_result_.
-  void set_current_test_info(TestInfo* a_current_test_info) {
-    current_test_info_ = a_current_test_info;
-  }
-
-  // Registers all parameterized tests defined using TEST_P and
-  // INSTANTIATE_TEST_SUITE_P, creating regular tests for each test/parameter
-  // combination. This method can be called more then once; it has guards
-  // protecting from registering the tests more then once.  If
-  // value-parameterized tests are disabled, RegisterParameterizedTests is
-  // present but does nothing.
-  void RegisterParameterizedTests();
-
-  // Runs all tests in this UnitTest object, prints the result, and
-  // returns true if all tests are successful.  If any exception is
-  // thrown during a test, this test is considered to be failed, but
-  // the rest of the tests will still be run.
-  bool RunAllTests();
-
-  // Clears the results of all tests, except the ad hoc tests.
-  void ClearNonAdHocTestResult() {
-    ForEach(test_suites_, TestSuite::ClearTestSuiteResult);
-  }
-
-  // Clears the results of ad-hoc test assertions.
-  void ClearAdHocTestResult() {
-    ad_hoc_test_result_.Clear();
-  }
-
-  // Adds a TestProperty to the current TestResult object when invoked in a
-  // context of a test or a test suite, or to the global property set. If the
-  // result already contains a property with the same key, the value will be
-  // updated.
-  void RecordProperty(const TestProperty& test_property);
-
-  enum ReactionToSharding {
-    HONOR_SHARDING_PROTOCOL,
-    IGNORE_SHARDING_PROTOCOL
-  };
-
-  // Matches the full name of each test against the user-specified
-  // filter to decide whether the test should run, then records the
-  // result in each TestSuite and TestInfo object.
-  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
-  // based on sharding variables in the environment.
-  // Returns the number of tests that should run.
-  int FilterTests(ReactionToSharding shard_tests);
-
-  // Prints the names of the tests matching the user-specified filter flag.
-  void ListTestsMatchingFilter();
-
-  const TestSuite* current_test_suite() const { return current_test_suite_; }
-  TestInfo* current_test_info() { return current_test_info_; }
-  const TestInfo* current_test_info() const { return current_test_info_; }
-
-  // Returns the vector of environments that need to be set-up/torn-down
-  // before/after the tests are run.
-  std::vector<Environment*>& environments() { return environments_; }
-
-  // Getters for the per-thread Google Test trace stack.
-  std::vector<TraceInfo>& gtest_trace_stack() {
-    return *(gtest_trace_stack_.pointer());
-  }
-  const std::vector<TraceInfo>& gtest_trace_stack() const {
-    return gtest_trace_stack_.get();
-  }
-
-#if GTEST_HAS_DEATH_TEST
-  void InitDeathTestSubprocessControlInfo() {
-    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
-  }
-  // Returns a pointer to the parsed --gtest_internal_run_death_test
-  // flag, or NULL if that flag was not specified.
-  // This information is useful only in a death test child process.
-  // Must not be called before a call to InitGoogleTest.
-  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
-    return internal_run_death_test_flag_.get();
-  }
-
-  // Returns a pointer to the current death test factory.
-  internal::DeathTestFactory* death_test_factory() {
-    return death_test_factory_.get();
-  }
-
-  void SuppressTestEventsIfInSubprocess();
-
-  friend class ReplaceDeathTestFactory;
-#endif  // GTEST_HAS_DEATH_TEST
-
-  // Initializes the event listener performing XML output as specified by
-  // UnitTestOptions. Must not be called before InitGoogleTest.
-  void ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
-  // Initializes the event listener for streaming test results to a socket.
-  // Must not be called before InitGoogleTest.
-  void ConfigureStreamingOutput();
-#endif
-
-  // Performs initialization dependent upon flag values obtained in
-  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
-  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
-  // this function is also called from RunAllTests.  Since this function can be
-  // called more than once, it has to be idempotent.
-  void PostFlagParsingInit();
-
-  // Gets the random seed used at the start of the current test iteration.
-  int random_seed() const { return random_seed_; }
-
-  // Gets the random number generator.
-  internal::Random* random() { return &random_; }
-
-  // Shuffles all test suites, and the tests within each test suite,
-  // making sure that death tests are still run first.
-  void ShuffleTests();
-
-  // Restores the test suites and tests to their order before the first shuffle.
-  void UnshuffleTests();
-
-  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
-  // UnitTest::Run() starts.
-  bool catch_exceptions() const { return catch_exceptions_; }
-
- private:
-  friend class ::testing::UnitTest;
-
-  // Used by UnitTest::Run() to capture the state of
-  // GTEST_FLAG(catch_exceptions) at the moment it starts.
-  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
-
-  // The UnitTest object that owns this implementation object.
-  UnitTest* const parent_;
-
-  // The working directory when the first TEST() or TEST_F() was
-  // executed.
-  internal::FilePath original_working_dir_;
-
-  // The default test part result reporters.
-  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
-  DefaultPerThreadTestPartResultReporter
-      default_per_thread_test_part_result_reporter_;
-
-  // Points to (but doesn't own) the global test part result reporter.
-  TestPartResultReporterInterface* global_test_part_result_repoter_;
-
-  // Protects read and write access to global_test_part_result_reporter_.
-  internal::Mutex global_test_part_result_reporter_mutex_;
-
-  // Points to (but doesn't own) the per-thread test part result reporter.
-  internal::ThreadLocal<TestPartResultReporterInterface*>
-      per_thread_test_part_result_reporter_;
-
-  // The vector of environments that need to be set-up/torn-down
-  // before/after the tests are run.
-  std::vector<Environment*> environments_;
-
-  // The vector of TestSuites in their original order.  It owns the
-  // elements in the vector.
-  std::vector<TestSuite*> test_suites_;
-
-  // Provides a level of indirection for the test suite list to allow
-  // easy shuffling and restoring the test suite order.  The i-th
-  // element of this vector is the index of the i-th test suite in the
-  // shuffled order.
-  std::vector<int> test_suite_indices_;
-
-  // ParameterizedTestRegistry object used to register value-parameterized
-  // tests.
-  internal::ParameterizedTestSuiteRegistry parameterized_test_registry_;
-  internal::TypeParameterizedTestSuiteRegistry
-      type_parameterized_test_registry_;
-
-  // The set holding the name of parameterized
-  // test suites that may go uninstantiated.
-  std::set<std::string> ignored_parameterized_test_suites_;
-
-  // Indicates whether RegisterParameterizedTests() has been called already.
-  bool parameterized_tests_registered_;
-
-  // Index of the last death test suite registered.  Initially -1.
-  int last_death_test_suite_;
-
-  // This points to the TestSuite for the currently running test.  It
-  // changes as Google Test goes through one test suite after another.
-  // When no test is running, this is set to NULL and Google Test
-  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
-  TestSuite* current_test_suite_;
-
-  // This points to the TestInfo for the currently running test.  It
-  // changes as Google Test goes through one test after another.  When
-  // no test is running, this is set to NULL and Google Test stores
-  // assertion results in ad_hoc_test_result_.  Initially NULL.
-  TestInfo* current_test_info_;
-
-  // Normally, a user only writes assertions inside a TEST or TEST_F,
-  // or inside a function called by a TEST or TEST_F.  Since Google
-  // Test keeps track of which test is current running, it can
-  // associate such an assertion with the test it belongs to.
-  //
-  // If an assertion is encountered when no TEST or TEST_F is running,
-  // Google Test attributes the assertion result to an imaginary "ad hoc"
-  // test, and records the result in ad_hoc_test_result_.
-  TestResult ad_hoc_test_result_;
-
-  // The list of event listeners that can be used to track events inside
-  // Google Test.
-  TestEventListeners listeners_;
-
-  // The OS stack trace getter.  Will be deleted when the UnitTest
-  // object is destructed.  By default, an OsStackTraceGetter is used,
-  // but the user can set this field to use a custom getter if that is
-  // desired.
-  OsStackTraceGetterInterface* os_stack_trace_getter_;
-
-  // True if and only if PostFlagParsingInit() has been called.
-  bool post_flag_parse_init_performed_;
-
-  // The random number seed used at the beginning of the test run.
-  int random_seed_;
-
-  // Our random number generator.
-  internal::Random random_;
-
-  // The time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp_;
-
-  // How long the test took to run, in milliseconds.
-  TimeInMillis elapsed_time_;
-
-#if GTEST_HAS_DEATH_TEST
-  // The decomposed components of the gtest_internal_run_death_test flag,
-  // parsed when RUN_ALL_TESTS is called.
-  std::unique_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
-  std::unique_ptr<internal::DeathTestFactory> death_test_factory_;
-#endif  // GTEST_HAS_DEATH_TEST
-
-  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
-  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
-
-  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
-  // starts.
-  bool catch_exceptions_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
-};  // class UnitTestImpl
-
-// Convenience function for accessing the global UnitTest
-// implementation object.
-inline UnitTestImpl* GetUnitTestImpl() {
-  return UnitTest::GetInstance()->impl();
-}
-
-#if GTEST_USES_SIMPLE_RE
-
-// Internal helper functions for implementing the simple regular
-// expression matcher.
-GTEST_API_ bool IsInSet(char ch, const char* str);
-GTEST_API_ bool IsAsciiDigit(char ch);
-GTEST_API_ bool IsAsciiPunct(char ch);
-GTEST_API_ bool IsRepeat(char ch);
-GTEST_API_ bool IsAsciiWhiteSpace(char ch);
-GTEST_API_ bool IsAsciiWordChar(char ch);
-GTEST_API_ bool IsValidEscape(char ch);
-GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
-GTEST_API_ bool ValidateRegex(const char* regex);
-GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
-GTEST_API_ bool MatchRepetitionAndRegexAtHead(
-    bool escaped, char ch, char repeat, const char* regex, const char* str);
-GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
-
-#endif  // GTEST_USES_SIMPLE_RE
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
-
-#if GTEST_HAS_DEATH_TEST
-
-// Returns the message describing the last system error, regardless of the
-// platform.
-GTEST_API_ std::string GetLastErrnoDescription();
-
-// Attempts to parse a string into a positive integer pointed to by the
-// number parameter.  Returns true if that is possible.
-// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
-// it here.
-template <typename Integer>
-bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
-  // Fail fast if the given string does not begin with a digit;
-  // this bypasses strtoXXX's "optional leading whitespace and plus
-  // or minus sign" semantics, which are undesirable here.
-  if (str.empty() || !IsDigit(str[0])) {
-    return false;
-  }
-  errno = 0;
-
-  char* end;
-  // BiggestConvertible is the largest integer type that system-provided
-  // string-to-number conversion routines can return.
-  using BiggestConvertible = unsigned long long;  // NOLINT
-
-  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);  // NOLINT
-  const bool parse_success = *end == '\0' && errno == 0;
-
-  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
-
-  const Integer result = static_cast<Integer>(parsed);
-  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
-    *number = result;
-    return true;
-  }
-  return false;
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-// TestResult contains some private methods that should be hidden from
-// Google Test user but are required for testing. This class allow our tests
-// to access them.
-//
-// This class is supplied only for the purpose of testing Google Test's own
-// constructs. Do not use it in user tests, either directly or indirectly.
-class TestResultAccessor {
- public:
-  static void RecordProperty(TestResult* test_result,
-                             const std::string& xml_element,
-                             const TestProperty& property) {
-    test_result->RecordProperty(xml_element, property);
-  }
-
-  static void ClearTestPartResults(TestResult* test_result) {
-    test_result->ClearTestPartResults();
-  }
-
-  static const std::vector<testing::TestPartResult>& test_part_results(
-      const TestResult& test_result) {
-    return test_result.test_part_results();
-  }
-};
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Streams test results to the given port on the given host machine.
-class StreamingListener : public EmptyTestEventListener {
- public:
-  // Abstract base class for writing strings to a socket.
-  class AbstractSocketWriter {
-   public:
-    virtual ~AbstractSocketWriter() {}
-
-    // Sends a string to the socket.
-    virtual void Send(const std::string& message) = 0;
-
-    // Closes the socket.
-    virtual void CloseConnection() {}
-
-    // Sends a string and a newline to the socket.
-    void SendLn(const std::string& message) { Send(message + "\n"); }
-  };
-
-  // Concrete class for actually writing strings to a socket.
-  class SocketWriter : public AbstractSocketWriter {
-   public:
-    SocketWriter(const std::string& host, const std::string& port)
-        : sockfd_(-1), host_name_(host), port_num_(port) {
-      MakeConnection();
-    }
-
-    ~SocketWriter() override {
-      if (sockfd_ != -1)
-        CloseConnection();
-    }
-
-    // Sends a string to the socket.
-    void Send(const std::string& message) override {
-      GTEST_CHECK_(sockfd_ != -1)
-          << "Send() can be called only when there is a connection.";
-
-      const auto len = static_cast<size_t>(message.length());
-      if (write(sockfd_, message.c_str(), len) != static_cast<ssize_t>(len)) {
-        GTEST_LOG_(WARNING)
-            << "stream_result_to: failed to stream to "
-            << host_name_ << ":" << port_num_;
-      }
-    }
-
-   private:
-    // Creates a client socket and connects to the server.
-    void MakeConnection();
-
-    // Closes the socket.
-    void CloseConnection() override {
-      GTEST_CHECK_(sockfd_ != -1)
-          << "CloseConnection() can be called only when there is a connection.";
-
-      close(sockfd_);
-      sockfd_ = -1;
-    }
-
-    int sockfd_;  // socket file descriptor
-    const std::string host_name_;
-    const std::string port_num_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
-  };  // class SocketWriter
-
-  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
-  static std::string UrlEncode(const char* str);
-
-  StreamingListener(const std::string& host, const std::string& port)
-      : socket_writer_(new SocketWriter(host, port)) {
-    Start();
-  }
-
-  explicit StreamingListener(AbstractSocketWriter* socket_writer)
-      : socket_writer_(socket_writer) { Start(); }
-
-  void OnTestProgramStart(const UnitTest& /* unit_test */) override {
-    SendLn("event=TestProgramStart");
-  }
-
-  void OnTestProgramEnd(const UnitTest& unit_test) override {
-    // Note that Google Test current only report elapsed time for each
-    // test iteration, not for the entire test program.
-    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
-
-    // Notify the streaming server to stop.
-    socket_writer_->CloseConnection();
-  }
-
-  void OnTestIterationStart(const UnitTest& /* unit_test */,
-                            int iteration) override {
-    SendLn("event=TestIterationStart&iteration=" +
-           StreamableToString(iteration));
-  }
-
-  void OnTestIterationEnd(const UnitTest& unit_test,
-                          int /* iteration */) override {
-    SendLn("event=TestIterationEnd&passed=" +
-           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
-           StreamableToString(unit_test.elapsed_time()) + "ms");
-  }
-
-  // Note that "event=TestCaseStart" is a wire format and has to remain
-  // "case" for compatibility
-  void OnTestCaseStart(const TestCase& test_case) override {
-    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
-  }
-
-  // Note that "event=TestCaseEnd" is a wire format and has to remain
-  // "case" for compatibility
-  void OnTestCaseEnd(const TestCase& test_case) override {
-    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) +
-           "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) +
-           "ms");
-  }
-
-  void OnTestStart(const TestInfo& test_info) override {
-    SendLn(std::string("event=TestStart&name=") + test_info.name());
-  }
-
-  void OnTestEnd(const TestInfo& test_info) override {
-    SendLn("event=TestEnd&passed=" +
-           FormatBool((test_info.result())->Passed()) +
-           "&elapsed_time=" +
-           StreamableToString((test_info.result())->elapsed_time()) + "ms");
-  }
-
-  void OnTestPartResult(const TestPartResult& test_part_result) override {
-    const char* file_name = test_part_result.file_name();
-    if (file_name == nullptr) file_name = "";
-    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
-           "&line=" + StreamableToString(test_part_result.line_number()) +
-           "&message=" + UrlEncode(test_part_result.message()));
-  }
-
- private:
-  // Sends the given message and a newline to the socket.
-  void SendLn(const std::string& message) { socket_writer_->SendLn(message); }
-
-  // Called at the start of streaming to notify the receiver what
-  // protocol we are using.
-  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
-
-  std::string FormatBool(bool value) { return value ? "1" : "0"; }
-
-  const std::unique_ptr<AbstractSocketWriter> socket_writer_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
-};  // class StreamingListener
-
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
-
-#if GTEST_OS_WINDOWS
-# define vsnprintf _vsnprintf
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_MAC
-#ifndef GTEST_OS_IOS
-#include <crt_externs.h>
-#endif
-#endif
-
-#if GTEST_HAS_ABSL
-#include "absl/debugging/failure_signal_handler.h"
-#include "absl/debugging/stacktrace.h"
-#include "absl/debugging/symbolize.h"
-#include "absl/strings/str_cat.h"
-#endif  // GTEST_HAS_ABSL
-
-namespace testing {
-
-using internal::CountIf;
-using internal::ForEach;
-using internal::GetElementOr;
-using internal::Shuffle;
-
-// Constants.
-
-// A test whose test suite name or test name matches this filter is
-// disabled and not run.
-static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
-
-// A test suite whose name matches this filter is considered a death
-// test suite and will be run before test suites whose name doesn't
-// match this filter.
-static const char kDeathTestSuiteFilter[] = "*DeathTest:*DeathTest/*";
-
-// A test filter that matches everything.
-static const char kUniversalFilter[] = "*";
-
-// The default output format.
-static const char kDefaultOutputFormat[] = "xml";
-// The default output file.
-static const char kDefaultOutputFile[] = "test_detail";
-
-// The environment variable name for the test shard index.
-static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
-// The environment variable name for the total number of test shards.
-static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
-// The environment variable name for the test shard status file.
-static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
-
-namespace internal {
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-const char kStackTraceMarker[] = "\nStack trace:\n";
-
-// g_help_flag is true if and only if the --help flag or an equivalent form
-// is specified on the command line.
-bool g_help_flag = false;
-
-// Utilty function to Open File for Writing
-static FILE* OpenFileForWriting(const std::string& output_file) {
-  FILE* fileout = nullptr;
-  FilePath output_file_path(output_file);
-  FilePath output_dir(output_file_path.RemoveFileName());
-
-  if (output_dir.CreateDirectoriesRecursively()) {
-    fileout = posix::FOpen(output_file.c_str(), "w");
-  }
-  if (fileout == nullptr) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file << "\"";
-  }
-  return fileout;
-}
-
-}  // namespace internal
-
-// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY
-// environment variable.
-static const char* GetDefaultFilter() {
-  const char* const testbridge_test_only =
-      internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY");
-  if (testbridge_test_only != nullptr) {
-    return testbridge_test_only;
-  }
-  return kUniversalFilter;
-}
-
-// Bazel passes in the argument to '--test_runner_fail_fast' via the
-// TESTBRIDGE_TEST_RUNNER_FAIL_FAST environment variable.
-static bool GetDefaultFailFast() {
-  const char* const testbridge_test_runner_fail_fast =
-      internal::posix::GetEnv("TESTBRIDGE_TEST_RUNNER_FAIL_FAST");
-  if (testbridge_test_runner_fail_fast != nullptr) {
-    return strcmp(testbridge_test_runner_fail_fast, "1") == 0;
-  }
-  return false;
-}
-
-GTEST_DEFINE_bool_(
-    fail_fast, internal::BoolFromGTestEnv("fail_fast", GetDefaultFailFast()),
-    "True if and only if a test failure should stop further test execution.");
-
-GTEST_DEFINE_bool_(
-    also_run_disabled_tests,
-    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
-    "Run disabled tests too, in addition to the tests normally being run.");
-
-GTEST_DEFINE_bool_(
-    break_on_failure, internal::BoolFromGTestEnv("break_on_failure", false),
-    "True if and only if a failed assertion should be a debugger "
-    "break-point.");
-
-GTEST_DEFINE_bool_(catch_exceptions,
-                   internal::BoolFromGTestEnv("catch_exceptions", true),
-                   "True if and only if " GTEST_NAME_
-                   " should catch exceptions and treat them as test failures.");
-
-GTEST_DEFINE_string_(
-    color,
-    internal::StringFromGTestEnv("color", "auto"),
-    "Whether to use colors in the output.  Valid values: yes, no, "
-    "and auto.  'auto' means to use colors if the output is "
-    "being sent to a terminal and the TERM environment variable "
-    "is set to a terminal type that supports colors.");
-
-GTEST_DEFINE_string_(
-    filter,
-    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
-    "A colon-separated list of glob (not regex) patterns "
-    "for filtering the tests to run, optionally followed by a "
-    "'-' and a : separated list of negative patterns (tests to "
-    "exclude).  A test is run if it matches one of the positive "
-    "patterns and does not match any of the negative patterns.");
-
-GTEST_DEFINE_bool_(
-    install_failure_signal_handler,
-    internal::BoolFromGTestEnv("install_failure_signal_handler", false),
-    "If true and supported on the current platform, " GTEST_NAME_ " should "
-    "install a signal handler that dumps debugging information when fatal "
-    "signals are raised.");
-
-GTEST_DEFINE_bool_(list_tests, false,
-                   "List all tests without running them.");
-
-// The net priority order after flag processing is thus:
-//   --gtest_output command line flag
-//   GTEST_OUTPUT environment variable
-//   XML_OUTPUT_FILE environment variable
-//   ''
-GTEST_DEFINE_string_(
-    output,
-    internal::StringFromGTestEnv("output",
-      internal::OutputFlagAlsoCheckEnvVar().c_str()),
-    "A format (defaults to \"xml\" but can be specified to be \"json\"), "
-    "optionally followed by a colon and an output file name or directory. "
-    "A directory is indicated by a trailing pathname separator. "
-    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
-    "If a directory is specified, output files will be created "
-    "within that directory, with file-names based on the test "
-    "executable's name and, if necessary, made unique by adding "
-    "digits.");
-
-GTEST_DEFINE_bool_(
-    brief, internal::BoolFromGTestEnv("brief", false),
-    "True if only test failures should be displayed in text output.");
-
-GTEST_DEFINE_bool_(print_time, internal::BoolFromGTestEnv("print_time", true),
-                   "True if and only if " GTEST_NAME_
-                   " should display elapsed time in text output.");
-
-GTEST_DEFINE_bool_(print_utf8, internal::BoolFromGTestEnv("print_utf8", true),
-                   "True if and only if " GTEST_NAME_
-                   " prints UTF8 characters as text.");
-
-GTEST_DEFINE_int32_(
-    random_seed,
-    internal::Int32FromGTestEnv("random_seed", 0),
-    "Random number seed to use when shuffling test orders.  Must be in range "
-    "[1, 99999], or 0 to use a seed based on the current time.");
-
-GTEST_DEFINE_int32_(
-    repeat,
-    internal::Int32FromGTestEnv("repeat", 1),
-    "How many times to repeat each test.  Specify a negative number "
-    "for repeating forever.  Useful for shaking out flaky tests.");
-
-GTEST_DEFINE_bool_(show_internal_stack_frames, false,
-                   "True if and only if " GTEST_NAME_
-                   " should include internal stack frames when "
-                   "printing test failure stack traces.");
-
-GTEST_DEFINE_bool_(shuffle, internal::BoolFromGTestEnv("shuffle", false),
-                   "True if and only if " GTEST_NAME_
-                   " should randomize tests' order on every run.");
-
-GTEST_DEFINE_int32_(
-    stack_trace_depth,
-    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
-    "The maximum number of stack frames to print when an "
-    "assertion fails.  The valid range is 0 through 100, inclusive.");
-
-GTEST_DEFINE_string_(
-    stream_result_to,
-    internal::StringFromGTestEnv("stream_result_to", ""),
-    "This flag specifies the host name and the port number on which to stream "
-    "test results. Example: \"localhost:555\". The flag is effective only on "
-    "Linux.");
-
-GTEST_DEFINE_bool_(
-    throw_on_failure,
-    internal::BoolFromGTestEnv("throw_on_failure", false),
-    "When this flag is specified, a failed assertion will throw an exception "
-    "if exceptions are enabled or exit the program with a non-zero code "
-    "otherwise. For use with an external test framework.");
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-GTEST_DEFINE_string_(
-    flagfile,
-    internal::StringFromGTestEnv("flagfile", ""),
-    "This flag specifies the flagfile to read command-line flags from.");
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-namespace internal {
-
-// Generates a random number from [0, range), using a Linear
-// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
-// than kMaxRange.
-uint32_t Random::Generate(uint32_t range) {
-  // These constants are the same as are used in glibc's rand(3).
-  // Use wider types than necessary to prevent unsigned overflow diagnostics.
-  state_ = static_cast<uint32_t>(1103515245ULL*state_ + 12345U) % kMaxRange;
-
-  GTEST_CHECK_(range > 0)
-      << "Cannot generate a number in the range [0, 0).";
-  GTEST_CHECK_(range <= kMaxRange)
-      << "Generation of a number in [0, " << range << ") was requested, "
-      << "but this can only generate numbers in [0, " << kMaxRange << ").";
-
-  // Converting via modulus introduces a bit of downward bias, but
-  // it's simple, and a linear congruential generator isn't too good
-  // to begin with.
-  return state_ % range;
-}
-
-// GTestIsInitialized() returns true if and only if the user has initialized
-// Google Test.  Useful for catching the user mistake of not initializing
-// Google Test before calling RUN_ALL_TESTS().
-static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
-
-// Iterates over a vector of TestSuites, keeping a running sum of the
-// results of calling a given int-returning method on each.
-// Returns the sum.
-static int SumOverTestSuiteList(const std::vector<TestSuite*>& case_list,
-                                int (TestSuite::*method)() const) {
-  int sum = 0;
-  for (size_t i = 0; i < case_list.size(); i++) {
-    sum += (case_list[i]->*method)();
-  }
-  return sum;
-}
-
-// Returns true if and only if the test suite passed.
-static bool TestSuitePassed(const TestSuite* test_suite) {
-  return test_suite->should_run() && test_suite->Passed();
-}
-
-// Returns true if and only if the test suite failed.
-static bool TestSuiteFailed(const TestSuite* test_suite) {
-  return test_suite->should_run() && test_suite->Failed();
-}
-
-// Returns true if and only if test_suite contains at least one test that
-// should run.
-static bool ShouldRunTestSuite(const TestSuite* test_suite) {
-  return test_suite->should_run();
-}
-
-// AssertHelper constructor.
-AssertHelper::AssertHelper(TestPartResult::Type type,
-                           const char* file,
-                           int line,
-                           const char* message)
-    : data_(new AssertHelperData(type, file, line, message)) {
-}
-
-AssertHelper::~AssertHelper() {
-  delete data_;
-}
-
-// Message assignment, for assertion streaming support.
-void AssertHelper::operator=(const Message& message) const {
-  UnitTest::GetInstance()->
-    AddTestPartResult(data_->type, data_->file, data_->line,
-                      AppendUserMessage(data_->message, message),
-                      UnitTest::GetInstance()->impl()
-                      ->CurrentOsStackTraceExceptTop(1)
-                      // Skips the stack frame for this function itself.
-                      );  // NOLINT
-}
-
-namespace {
-
-// When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P
-// to creates test cases for it, a synthetic test case is
-// inserted to report ether an error or a log message.
-//
-// This configuration bit will likely be removed at some point.
-constexpr bool kErrorOnUninstantiatedParameterizedTest = true;
-constexpr bool kErrorOnUninstantiatedTypeParameterizedTest = true;
-
-// A test that fails at a given file/line location with a given message.
-class FailureTest : public Test {
- public:
-  explicit FailureTest(const CodeLocation& loc, std::string error_message,
-                       bool as_error)
-      : loc_(loc),
-        error_message_(std::move(error_message)),
-        as_error_(as_error) {}
-
-  void TestBody() override {
-    if (as_error_) {
-      AssertHelper(TestPartResult::kNonFatalFailure, loc_.file.c_str(),
-                   loc_.line, "") = Message() << error_message_;
-    } else {
-      std::cout << error_message_ << std::endl;
-    }
-  }
-
- private:
-  const CodeLocation loc_;
-  const std::string error_message_;
-  const bool as_error_;
-};
-
-
-}  // namespace
-
-std::set<std::string>* GetIgnoredParameterizedTestSuites() {
-  return UnitTest::GetInstance()->impl()->ignored_parameterized_test_suites();
-}
-
-// Add a given test_suit to the list of them allow to go un-instantiated.
-MarkAsIgnored::MarkAsIgnored(const char* test_suite) {
-  GetIgnoredParameterizedTestSuites()->insert(test_suite);
-}
-
-// If this parameterized test suite has no instantiations (and that
-// has not been marked as okay), emit a test case reporting that.
-void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
-                             bool has_test_p) {
-  const auto& ignored = *GetIgnoredParameterizedTestSuites();
-  if (ignored.find(name) != ignored.end()) return;
-
-  const char kMissingInstantiation[] =  //
-      " is defined via TEST_P, but never instantiated. None of the test cases "
-      "will run. Either no INSTANTIATE_TEST_SUITE_P is provided or the only "
-      "ones provided expand to nothing."
-      "\n\n"
-      "Ideally, TEST_P definitions should only ever be included as part of "
-      "binaries that intend to use them. (As opposed to, for example, being "
-      "placed in a library that may be linked in to get other utilities.)";
-
-  const char kMissingTestCase[] =  //
-      " is instantiated via INSTANTIATE_TEST_SUITE_P, but no tests are "
-      "defined via TEST_P . No test cases will run."
-      "\n\n"
-      "Ideally, INSTANTIATE_TEST_SUITE_P should only ever be invoked from "
-      "code that always depend on code that provides TEST_P. Failing to do "
-      "so is often an indication of dead code, e.g. the last TEST_P was "
-      "removed but the rest got left behind.";
-
-  std::string message =
-      "Parameterized test suite " + name +
-      (has_test_p ? kMissingInstantiation : kMissingTestCase) +
-      "\n\n"
-      "To suppress this error for this test suite, insert the following line "
-      "(in a non-header) in the namespace it is defined in:"
-      "\n\n"
-      "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");";
-
-  std::string full_name = "UninstantiatedParameterizedTestSuite<" + name + ">";
-  RegisterTest(  //
-      "GoogleTestVerification", full_name.c_str(),
-      nullptr,  // No type parameter.
-      nullptr,  // No value parameter.
-      location.file.c_str(), location.line, [message, location] {
-        return new FailureTest(location, message,
-                               kErrorOnUninstantiatedParameterizedTest);
-      });
-}
-
-void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
-                                        CodeLocation code_location) {
-  GetUnitTestImpl()->type_parameterized_test_registry().RegisterTestSuite(
-      test_suite_name, code_location);
-}
-
-void RegisterTypeParameterizedTestSuiteInstantiation(const char* case_name) {
-  GetUnitTestImpl()
-      ->type_parameterized_test_registry()
-      .RegisterInstantiation(case_name);
-}
-
-void TypeParameterizedTestSuiteRegistry::RegisterTestSuite(
-    const char* test_suite_name, CodeLocation code_location) {
-  suites_.emplace(std::string(test_suite_name),
-                 TypeParameterizedTestSuiteInfo(code_location));
-}
-
-void TypeParameterizedTestSuiteRegistry::RegisterInstantiation(
-        const char* test_suite_name) {
-  auto it = suites_.find(std::string(test_suite_name));
-  if (it != suites_.end()) {
-    it->second.instantiated = true;
-  } else {
-    GTEST_LOG_(ERROR) << "Unknown type parameterized test suit '"
-                      << test_suite_name << "'";
-  }
-}
-
-void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
-  const auto& ignored = *GetIgnoredParameterizedTestSuites();
-  for (const auto& testcase : suites_) {
-    if (testcase.second.instantiated) continue;
-    if (ignored.find(testcase.first) != ignored.end()) continue;
-
-    std::string message =
-        "Type parameterized test suite " + testcase.first +
-        " is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated "
-        "via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run."
-        "\n\n"
-        "Ideally, TYPED_TEST_P definitions should only ever be included as "
-        "part of binaries that intend to use them. (As opposed to, for "
-        "example, being placed in a library that may be linked in to get other "
-        "utilities.)"
-        "\n\n"
-        "To suppress this error for this test suite, insert the following line "
-        "(in a non-header) in the namespace it is defined in:"
-        "\n\n"
-        "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" +
-        testcase.first + ");";
-
-    std::string full_name =
-        "UninstantiatedTypeParameterizedTestSuite<" + testcase.first + ">";
-    RegisterTest(  //
-        "GoogleTestVerification", full_name.c_str(),
-        nullptr,  // No type parameter.
-        nullptr,  // No value parameter.
-        testcase.second.code_location.file.c_str(),
-        testcase.second.code_location.line, [message, testcase] {
-          return new FailureTest(testcase.second.code_location, message,
-                                 kErrorOnUninstantiatedTypeParameterizedTest);
-        });
-  }
-}
-
-// A copy of all command line arguments.  Set by InitGoogleTest().
-static ::std::vector<std::string> g_argvs;
-
-::std::vector<std::string> GetArgvs() {
-#if defined(GTEST_CUSTOM_GET_ARGVS_)
-  // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or
-  // ::string. This code converts it to the appropriate type.
-  const auto& custom = GTEST_CUSTOM_GET_ARGVS_();
-  return ::std::vector<std::string>(custom.begin(), custom.end());
-#else   // defined(GTEST_CUSTOM_GET_ARGVS_)
-  return g_argvs;
-#endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
-}
-
-// Returns the current application's name, removing directory path if that
-// is present.
-FilePath GetCurrentExecutableName() {
-  FilePath result;
-
-#if GTEST_OS_WINDOWS || GTEST_OS_OS2
-  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
-#else
-  result.Set(FilePath(GetArgvs()[0]));
-#endif  // GTEST_OS_WINDOWS
-
-  return result.RemoveDirectoryName();
-}
-
-// Functions for processing the gtest_output flag.
-
-// Returns the output format, or "" for normal printed output.
-std::string UnitTestOptions::GetOutputFormat() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
-  const char* const colon = strchr(gtest_output_flag, ':');
-  return (colon == nullptr)
-             ? std::string(gtest_output_flag)
-             : std::string(gtest_output_flag,
-                           static_cast<size_t>(colon - gtest_output_flag));
-}
-
-// Returns the name of the requested output file, or the default if none
-// was explicitly specified.
-std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
-
-  std::string format = GetOutputFormat();
-  if (format.empty())
-    format = std::string(kDefaultOutputFormat);
-
-  const char* const colon = strchr(gtest_output_flag, ':');
-  if (colon == nullptr)
-    return internal::FilePath::MakeFileName(
-        internal::FilePath(
-            UnitTest::GetInstance()->original_working_dir()),
-        internal::FilePath(kDefaultOutputFile), 0,
-        format.c_str()).string();
-
-  internal::FilePath output_name(colon + 1);
-  if (!output_name.IsAbsolutePath())
-    output_name = internal::FilePath::ConcatPaths(
-        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
-        internal::FilePath(colon + 1));
-
-  if (!output_name.IsDirectory())
-    return output_name.string();
-
-  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
-      output_name, internal::GetCurrentExecutableName(),
-      GetOutputFormat().c_str()));
-  return result.string();
-}
-
-// Returns true if and only if the wildcard pattern matches the string. Each
-// pattern consists of regular characters, single-character wildcards (?), and
-// multi-character wildcards (*).
-//
-// This function implements a linear-time string globbing algorithm based on
-// https://research.swtch.com/glob.
-static bool PatternMatchesString(const std::string& name_str,
-                                 const char* pattern, const char* pattern_end) {
-  const char* name = name_str.c_str();
-  const char* const name_begin = name;
-  const char* const name_end = name + name_str.size();
-
-  const char* pattern_next = pattern;
-  const char* name_next = name;
-
-  while (pattern < pattern_end || name < name_end) {
-    if (pattern < pattern_end) {
-      switch (*pattern) {
-        default:  // Match an ordinary character.
-          if (name < name_end && *name == *pattern) {
-            ++pattern;
-            ++name;
-            continue;
-          }
-          break;
-        case '?':  // Match any single character.
-          if (name < name_end) {
-            ++pattern;
-            ++name;
-            continue;
-          }
-          break;
-        case '*':
-          // Match zero or more characters. Start by skipping over the wildcard
-          // and matching zero characters from name. If that fails, restart and
-          // match one more character than the last attempt.
-          pattern_next = pattern;
-          name_next = name + 1;
-          ++pattern;
-          continue;
-      }
-    }
-    // Failed to match a character. Restart if possible.
-    if (name_begin < name_next && name_next <= name_end) {
-      pattern = pattern_next;
-      name = name_next;
-      continue;
-    }
-    return false;
-  }
-  return true;
-}
-
-bool UnitTestOptions::MatchesFilter(const std::string& name_str,
-                                    const char* filter) {
-  // The filter is a list of patterns separated by colons (:).
-  const char* pattern = filter;
-  while (true) {
-    // Find the bounds of this pattern.
-    const char* const next_sep = strchr(pattern, ':');
-    const char* const pattern_end =
-        next_sep != nullptr ? next_sep : pattern + strlen(pattern);
-
-    // Check if this pattern matches name_str.
-    if (PatternMatchesString(name_str, pattern, pattern_end)) {
-      return true;
-    }
-
-    // Give up on this pattern. However, if we found a pattern separator (:),
-    // advance to the next pattern (skipping over the separator) and restart.
-    if (next_sep == nullptr) {
-      return false;
-    }
-    pattern = next_sep + 1;
-  }
-  return true;
-}
-
-// Returns true if and only if the user-specified filter matches the test
-// suite name and the test name.
-bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
-                                        const std::string& test_name) {
-  const std::string& full_name = test_suite_name + "." + test_name.c_str();
-
-  // Split --gtest_filter at '-', if there is one, to separate into
-  // positive filter and negative filter portions
-  const char* const p = GTEST_FLAG(filter).c_str();
-  const char* const dash = strchr(p, '-');
-  std::string positive;
-  std::string negative;
-  if (dash == nullptr) {
-    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
-    negative = "";
-  } else {
-    positive = std::string(p, dash);   // Everything up to the dash
-    negative = std::string(dash + 1);  // Everything after the dash
-    if (positive.empty()) {
-      // Treat '-test1' as the same as '*-test1'
-      positive = kUniversalFilter;
-    }
-  }
-
-  // A filter is a colon-separated list of patterns.  It matches a
-  // test if any pattern in it matches the test.
-  return (MatchesFilter(full_name, positive.c_str()) &&
-          !MatchesFilter(full_name, negative.c_str()));
-}
-
-#if GTEST_HAS_SEH
-// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-// This function is useful as an __except condition.
-int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
-  // Google Test should handle a SEH exception if:
-  //   1. the user wants it to, AND
-  //   2. this is not a breakpoint exception, AND
-  //   3. this is not a C++ exception (VC++ implements them via SEH,
-  //      apparently).
-  //
-  // SEH exception code for C++ exceptions.
-  // (see http://support.microsoft.com/kb/185294 for more information).
-  const DWORD kCxxExceptionCode = 0xe06d7363;
-
-  bool should_handle = true;
-
-  if (!GTEST_FLAG(catch_exceptions))
-    should_handle = false;
-  else if (exception_code == EXCEPTION_BREAKPOINT)
-    should_handle = false;
-  else if (exception_code == kCxxExceptionCode)
-    should_handle = false;
-
-  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
-}
-#endif  // GTEST_HAS_SEH
-
-}  // namespace internal
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test.  The 'result' parameter specifies where to report the
-// results. Intercepts only failures from the current thread.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
-    TestPartResultArray* result)
-    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
-      result_(result) {
-  Init();
-}
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test.  The 'result' parameter specifies where to report the
-// results.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
-    InterceptMode intercept_mode, TestPartResultArray* result)
-    : intercept_mode_(intercept_mode),
-      result_(result) {
-  Init();
-}
-
-void ScopedFakeTestPartResultReporter::Init() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
-    old_reporter_ = impl->GetGlobalTestPartResultReporter();
-    impl->SetGlobalTestPartResultReporter(this);
-  } else {
-    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
-    impl->SetTestPartResultReporterForCurrentThread(this);
-  }
-}
-
-// The d'tor restores the test part result reporter used by Google Test
-// before.
-ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
-    impl->SetGlobalTestPartResultReporter(old_reporter_);
-  } else {
-    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
-  }
-}
-
-// Increments the test part result count and remembers the result.
-// This method is from the TestPartResultReporterInterface interface.
-void ScopedFakeTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  result_->Append(result);
-}
-
-namespace internal {
-
-// Returns the type ID of ::testing::Test.  We should always call this
-// instead of GetTypeId< ::testing::Test>() to get the type ID of
-// testing::Test.  This is to work around a suspected linker bug when
-// using Google Test as a framework on Mac OS X.  The bug causes
-// GetTypeId< ::testing::Test>() to return different values depending
-// on whether the call is from the Google Test framework itself or
-// from user test code.  GetTestTypeId() is guaranteed to always
-// return the same value, as it always calls GetTypeId<>() from the
-// gtest.cc, which is within the Google Test framework.
-TypeId GetTestTypeId() {
-  return GetTypeId<Test>();
-}
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library.  This is solely for testing GetTestTypeId().
-extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
-
-// This predicate-formatter checks that 'results' contains a test part
-// failure of the given type and that the failure message contains the
-// given substring.
-static AssertionResult HasOneFailure(const char* /* results_expr */,
-                                     const char* /* type_expr */,
-                                     const char* /* substr_expr */,
-                                     const TestPartResultArray& results,
-                                     TestPartResult::Type type,
-                                     const std::string& substr) {
-  const std::string expected(type == TestPartResult::kFatalFailure ?
-                        "1 fatal failure" :
-                        "1 non-fatal failure");
-  Message msg;
-  if (results.size() != 1) {
-    msg << "Expected: " << expected << "\n"
-        << "  Actual: " << results.size() << " failures";
-    for (int i = 0; i < results.size(); i++) {
-      msg << "\n" << results.GetTestPartResult(i);
-    }
-    return AssertionFailure() << msg;
-  }
-
-  const TestPartResult& r = results.GetTestPartResult(0);
-  if (r.type() != type) {
-    return AssertionFailure() << "Expected: " << expected << "\n"
-                              << "  Actual:\n"
-                              << r;
-  }
-
-  if (strstr(r.message(), substr.c_str()) == nullptr) {
-    return AssertionFailure() << "Expected: " << expected << " containing \""
-                              << substr << "\"\n"
-                              << "  Actual:\n"
-                              << r;
-  }
-
-  return AssertionSuccess();
-}
-
-// The constructor of SingleFailureChecker remembers where to look up
-// test part results, what type of failure we expect, and what
-// substring the failure message should contain.
-SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results,
-                                           TestPartResult::Type type,
-                                           const std::string& substr)
-    : results_(results), type_(type), substr_(substr) {}
-
-// The destructor of SingleFailureChecker verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring.  If that's not the case, a
-// non-fatal failure will be generated.
-SingleFailureChecker::~SingleFailureChecker() {
-  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
-}
-
-DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
-    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  unit_test_->current_test_result()->AddTestPartResult(result);
-  unit_test_->listeners()->repeater()->OnTestPartResult(result);
-}
-
-DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
-    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
-}
-
-// Returns the global test part result reporter.
-TestPartResultReporterInterface*
-UnitTestImpl::GetGlobalTestPartResultReporter() {
-  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  return global_test_part_result_repoter_;
-}
-
-// Sets the global test part result reporter.
-void UnitTestImpl::SetGlobalTestPartResultReporter(
-    TestPartResultReporterInterface* reporter) {
-  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  global_test_part_result_repoter_ = reporter;
-}
-
-// Returns the test part result reporter for the current thread.
-TestPartResultReporterInterface*
-UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
-  return per_thread_test_part_result_reporter_.get();
-}
-
-// Sets the test part result reporter for the current thread.
-void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
-    TestPartResultReporterInterface* reporter) {
-  per_thread_test_part_result_reporter_.set(reporter);
-}
-
-// Gets the number of successful test suites.
-int UnitTestImpl::successful_test_suite_count() const {
-  return CountIf(test_suites_, TestSuitePassed);
-}
-
-// Gets the number of failed test suites.
-int UnitTestImpl::failed_test_suite_count() const {
-  return CountIf(test_suites_, TestSuiteFailed);
-}
-
-// Gets the number of all test suites.
-int UnitTestImpl::total_test_suite_count() const {
-  return static_cast<int>(test_suites_.size());
-}
-
-// Gets the number of all test suites that contain at least one test
-// that should run.
-int UnitTestImpl::test_suite_to_run_count() const {
-  return CountIf(test_suites_, ShouldRunTestSuite);
-}
-
-// Gets the number of successful tests.
-int UnitTestImpl::successful_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::successful_test_count);
-}
-
-// Gets the number of skipped tests.
-int UnitTestImpl::skipped_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::skipped_test_count);
-}
-
-// Gets the number of failed tests.
-int UnitTestImpl::failed_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::failed_test_count);
-}
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int UnitTestImpl::reportable_disabled_test_count() const {
-  return SumOverTestSuiteList(test_suites_,
-                              &TestSuite::reportable_disabled_test_count);
-}
-
-// Gets the number of disabled tests.
-int UnitTestImpl::disabled_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::disabled_test_count);
-}
-
-// Gets the number of tests to be printed in the XML report.
-int UnitTestImpl::reportable_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::reportable_test_count);
-}
-
-// Gets the number of all tests.
-int UnitTestImpl::total_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::total_test_count);
-}
-
-// Gets the number of tests that should run.
-int UnitTestImpl::test_to_run_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::test_to_run_count);
-}
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
-  return os_stack_trace_getter()->CurrentStackTrace(
-      static_cast<int>(GTEST_FLAG(stack_trace_depth)),
-      skip_count + 1
-      // Skips the user-specified number of frames plus this function
-      // itself.
-      );  // NOLINT
-}
-
-// A helper class for measuring elapsed times.
-class Timer {
- public:
-  Timer() : start_(std::chrono::steady_clock::now()) {}
-
-  // Return time elapsed in milliseconds since the timer was created.
-  TimeInMillis Elapsed() {
-    return std::chrono::duration_cast<std::chrono::milliseconds>(
-               std::chrono::steady_clock::now() - start_)
-        .count();
-  }
-
- private:
-  std::chrono::steady_clock::time_point start_;
-};
-
-// Returns a timestamp as milliseconds since the epoch. Note this time may jump
-// around subject to adjustments by the system, to measure elapsed time use
-// Timer instead.
-TimeInMillis GetTimeInMillis() {
-  return std::chrono::duration_cast<std::chrono::milliseconds>(
-             std::chrono::system_clock::now() -
-             std::chrono::system_clock::from_time_t(0))
-      .count();
-}
-
-// Utilities
-
-// class String.
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Creates a UTF-16 wide string from the given ANSI string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the wide string, or NULL if the
-// input is NULL.
-LPCWSTR String::AnsiToUtf16(const char* ansi) {
-  if (!ansi) return nullptr;
-  const int length = strlen(ansi);
-  const int unicode_length =
-      MultiByteToWideChar(CP_ACP, 0, ansi, length, nullptr, 0);
-  WCHAR* unicode = new WCHAR[unicode_length + 1];
-  MultiByteToWideChar(CP_ACP, 0, ansi, length,
-                      unicode, unicode_length);
-  unicode[unicode_length] = 0;
-  return unicode;
-}
-
-// Creates an ANSI string from the given wide string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the ANSI string, or NULL if the
-// input is NULL.
-const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
-  if (!utf16_str) return nullptr;
-  const int ansi_length = WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, nullptr,
-                                              0, nullptr, nullptr);
-  char* ansi = new char[ansi_length + 1];
-  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, ansi, ansi_length, nullptr,
-                      nullptr);
-  ansi[ansi_length] = 0;
-  return ansi;
-}
-
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-// Compares two C strings.  Returns true if and only if they have the same
-// content.
-//
-// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CStringEquals(const char * lhs, const char * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-  return strcmp(lhs, rhs) == 0;
-}
-
-#if GTEST_HAS_STD_WSTRING
-
-// Converts an array of wide chars to a narrow string using the UTF-8
-// encoding, and streams the result to the given Message object.
-static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
-                                     Message* msg) {
-  for (size_t i = 0; i != length; ) {  // NOLINT
-    if (wstr[i] != L'\0') {
-      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
-      while (i != length && wstr[i] != L'\0')
-        i++;
-    } else {
-      *msg << '\0';
-      i++;
-    }
-  }
-}
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-void SplitString(const ::std::string& str, char delimiter,
-                 ::std::vector< ::std::string>* dest) {
-  ::std::vector< ::std::string> parsed;
-  ::std::string::size_type pos = 0;
-  while (::testing::internal::AlwaysTrue()) {
-    const ::std::string::size_type colon = str.find(delimiter, pos);
-    if (colon == ::std::string::npos) {
-      parsed.push_back(str.substr(pos));
-      break;
-    } else {
-      parsed.push_back(str.substr(pos, colon - pos));
-      pos = colon + 1;
-    }
-  }
-  dest->swap(parsed);
-}
-
-}  // namespace internal
-
-// Constructs an empty Message.
-// We allocate the stringstream separately because otherwise each use of
-// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
-// stack frame leading to huge stack frames in some cases; gcc does not reuse
-// the stack space.
-Message::Message() : ss_(new ::std::stringstream) {
-  // By default, we want there to be enough precision when printing
-  // a double to a Message.
-  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
-}
-
-// These two overloads allow streaming a wide C string to a Message
-// using the UTF-8 encoding.
-Message& Message::operator <<(const wchar_t* wide_c_str) {
-  return *this << internal::String::ShowWideCString(wide_c_str);
-}
-Message& Message::operator <<(wchar_t* wide_c_str) {
-  return *this << internal::String::ShowWideCString(wide_c_str);
-}
-
-#if GTEST_HAS_STD_WSTRING
-// Converts the given wide string to a narrow string using the UTF-8
-// encoding, and streams the result to this Message object.
-Message& Message::operator <<(const ::std::wstring& wstr) {
-  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
-  return *this;
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Gets the text streamed to this object so far as an std::string.
-// Each '\0' character in the buffer is replaced with "\\0".
-std::string Message::GetString() const {
-  return internal::StringStreamToString(ss_.get());
-}
-
-// AssertionResult constructors.
-// Used in EXPECT_TRUE/FALSE(assertion_result).
-AssertionResult::AssertionResult(const AssertionResult& other)
-    : success_(other.success_),
-      message_(other.message_.get() != nullptr
-                   ? new ::std::string(*other.message_)
-                   : static_cast< ::std::string*>(nullptr)) {}
-
-// Swaps two AssertionResults.
-void AssertionResult::swap(AssertionResult& other) {
-  using std::swap;
-  swap(success_, other.success_);
-  swap(message_, other.message_);
-}
-
-// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-AssertionResult AssertionResult::operator!() const {
-  AssertionResult negation(!success_);
-  if (message_.get() != nullptr) negation << *message_;
-  return negation;
-}
-
-// Makes a successful assertion result.
-AssertionResult AssertionSuccess() {
-  return AssertionResult(true);
-}
-
-// Makes a failed assertion result.
-AssertionResult AssertionFailure() {
-  return AssertionResult(false);
-}
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << message.
-AssertionResult AssertionFailure(const Message& message) {
-  return AssertionFailure() << message;
-}
-
-namespace internal {
-
-namespace edit_distance {
-std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
-                                            const std::vector<size_t>& right) {
-  std::vector<std::vector<double> > costs(
-      left.size() + 1, std::vector<double>(right.size() + 1));
-  std::vector<std::vector<EditType> > best_move(
-      left.size() + 1, std::vector<EditType>(right.size() + 1));
-
-  // Populate for empty right.
-  for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
-    costs[l_i][0] = static_cast<double>(l_i);
-    best_move[l_i][0] = kRemove;
-  }
-  // Populate for empty left.
-  for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
-    costs[0][r_i] = static_cast<double>(r_i);
-    best_move[0][r_i] = kAdd;
-  }
-
-  for (size_t l_i = 0; l_i < left.size(); ++l_i) {
-    for (size_t r_i = 0; r_i < right.size(); ++r_i) {
-      if (left[l_i] == right[r_i]) {
-        // Found a match. Consume it.
-        costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
-        best_move[l_i + 1][r_i + 1] = kMatch;
-        continue;
-      }
-
-      const double add = costs[l_i + 1][r_i];
-      const double remove = costs[l_i][r_i + 1];
-      const double replace = costs[l_i][r_i];
-      if (add < remove && add < replace) {
-        costs[l_i + 1][r_i + 1] = add + 1;
-        best_move[l_i + 1][r_i + 1] = kAdd;
-      } else if (remove < add && remove < replace) {
-        costs[l_i + 1][r_i + 1] = remove + 1;
-        best_move[l_i + 1][r_i + 1] = kRemove;
-      } else {
-        // We make replace a little more expensive than add/remove to lower
-        // their priority.
-        costs[l_i + 1][r_i + 1] = replace + 1.00001;
-        best_move[l_i + 1][r_i + 1] = kReplace;
-      }
-    }
-  }
-
-  // Reconstruct the best path. We do it in reverse order.
-  std::vector<EditType> best_path;
-  for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
-    EditType move = best_move[l_i][r_i];
-    best_path.push_back(move);
-    l_i -= move != kAdd;
-    r_i -= move != kRemove;
-  }
-  std::reverse(best_path.begin(), best_path.end());
-  return best_path;
-}
-
-namespace {
-
-// Helper class to convert string into ids with deduplication.
-class InternalStrings {
- public:
-  size_t GetId(const std::string& str) {
-    IdMap::iterator it = ids_.find(str);
-    if (it != ids_.end()) return it->second;
-    size_t id = ids_.size();
-    return ids_[str] = id;
-  }
-
- private:
-  typedef std::map<std::string, size_t> IdMap;
-  IdMap ids_;
-};
-
-}  // namespace
-
-std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<std::string>& left,
-    const std::vector<std::string>& right) {
-  std::vector<size_t> left_ids, right_ids;
-  {
-    InternalStrings intern_table;
-    for (size_t i = 0; i < left.size(); ++i) {
-      left_ids.push_back(intern_table.GetId(left[i]));
-    }
-    for (size_t i = 0; i < right.size(); ++i) {
-      right_ids.push_back(intern_table.GetId(right[i]));
-    }
-  }
-  return CalculateOptimalEdits(left_ids, right_ids);
-}
-
-namespace {
-
-// Helper class that holds the state for one hunk and prints it out to the
-// stream.
-// It reorders adds/removes when possible to group all removes before all
-// adds. It also adds the hunk header before printint into the stream.
-class Hunk {
- public:
-  Hunk(size_t left_start, size_t right_start)
-      : left_start_(left_start),
-        right_start_(right_start),
-        adds_(),
-        removes_(),
-        common_() {}
-
-  void PushLine(char edit, const char* line) {
-    switch (edit) {
-      case ' ':
-        ++common_;
-        FlushEdits();
-        hunk_.push_back(std::make_pair(' ', line));
-        break;
-      case '-':
-        ++removes_;
-        hunk_removes_.push_back(std::make_pair('-', line));
-        break;
-      case '+':
-        ++adds_;
-        hunk_adds_.push_back(std::make_pair('+', line));
-        break;
-    }
-  }
-
-  void PrintTo(std::ostream* os) {
-    PrintHeader(os);
-    FlushEdits();
-    for (std::list<std::pair<char, const char*> >::const_iterator it =
-             hunk_.begin();
-         it != hunk_.end(); ++it) {
-      *os << it->first << it->second << "\n";
-    }
-  }
-
-  bool has_edits() const { return adds_ || removes_; }
-
- private:
-  void FlushEdits() {
-    hunk_.splice(hunk_.end(), hunk_removes_);
-    hunk_.splice(hunk_.end(), hunk_adds_);
-  }
-
-  // Print a unified diff header for one hunk.
-  // The format is
-  //   "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
-  // where the left/right parts are omitted if unnecessary.
-  void PrintHeader(std::ostream* ss) const {
-    *ss << "@@ ";
-    if (removes_) {
-      *ss << "-" << left_start_ << "," << (removes_ + common_);
-    }
-    if (removes_ && adds_) {
-      *ss << " ";
-    }
-    if (adds_) {
-      *ss << "+" << right_start_ << "," << (adds_ + common_);
-    }
-    *ss << " @@\n";
-  }
-
-  size_t left_start_, right_start_;
-  size_t adds_, removes_, common_;
-  std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
-};
-
-}  // namespace
-
-// Create a list of diff hunks in Unified diff format.
-// Each hunk has a header generated by PrintHeader above plus a body with
-// lines prefixed with ' ' for no change, '-' for deletion and '+' for
-// addition.
-// 'context' represents the desired unchanged prefix/suffix around the diff.
-// If two hunks are close enough that their contexts overlap, then they are
-// joined into one hunk.
-std::string CreateUnifiedDiff(const std::vector<std::string>& left,
-                              const std::vector<std::string>& right,
-                              size_t context) {
-  const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
-
-  size_t l_i = 0, r_i = 0, edit_i = 0;
-  std::stringstream ss;
-  while (edit_i < edits.size()) {
-    // Find first edit.
-    while (edit_i < edits.size() && edits[edit_i] == kMatch) {
-      ++l_i;
-      ++r_i;
-      ++edit_i;
-    }
-
-    // Find the first line to include in the hunk.
-    const size_t prefix_context = std::min(l_i, context);
-    Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
-    for (size_t i = prefix_context; i > 0; --i) {
-      hunk.PushLine(' ', left[l_i - i].c_str());
-    }
-
-    // Iterate the edits until we found enough suffix for the hunk or the input
-    // is over.
-    size_t n_suffix = 0;
-    for (; edit_i < edits.size(); ++edit_i) {
-      if (n_suffix >= context) {
-        // Continue only if the next hunk is very close.
-        auto it = edits.begin() + static_cast<int>(edit_i);
-        while (it != edits.end() && *it == kMatch) ++it;
-        if (it == edits.end() ||
-            static_cast<size_t>(it - edits.begin()) - edit_i >= context) {
-          // There is no next edit or it is too far away.
-          break;
-        }
-      }
-
-      EditType edit = edits[edit_i];
-      // Reset count when a non match is found.
-      n_suffix = edit == kMatch ? n_suffix + 1 : 0;
-
-      if (edit == kMatch || edit == kRemove || edit == kReplace) {
-        hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
-      }
-      if (edit == kAdd || edit == kReplace) {
-        hunk.PushLine('+', right[r_i].c_str());
-      }
-
-      // Advance indices, depending on edit type.
-      l_i += edit != kAdd;
-      r_i += edit != kRemove;
-    }
-
-    if (!hunk.has_edits()) {
-      // We are done. We don't want this hunk.
-      break;
-    }
-
-    hunk.PrintTo(&ss);
-  }
-  return ss.str();
-}
-
-}  // namespace edit_distance
-
-namespace {
-
-// The string representation of the values received in EqFailure() are already
-// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
-// characters the same.
-std::vector<std::string> SplitEscapedString(const std::string& str) {
-  std::vector<std::string> lines;
-  size_t start = 0, end = str.size();
-  if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
-    ++start;
-    --end;
-  }
-  bool escaped = false;
-  for (size_t i = start; i + 1 < end; ++i) {
-    if (escaped) {
-      escaped = false;
-      if (str[i] == 'n') {
-        lines.push_back(str.substr(start, i - start - 1));
-        start = i + 1;
-      }
-    } else {
-      escaped = str[i] == '\\';
-    }
-  }
-  lines.push_back(str.substr(start, end - start));
-  return lines;
-}
-
-}  // namespace
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-//   lhs_expression: "foo"
-//   rhs_expression: "bar"
-//   lhs_value:      "5"
-//   rhs_value:      "6"
-//
-// The ignoring_case parameter is true if and only if the assertion is a
-// *_STRCASEEQ*.  When it's true, the string "Ignoring case" will
-// be inserted into the message.
-AssertionResult EqFailure(const char* lhs_expression,
-                          const char* rhs_expression,
-                          const std::string& lhs_value,
-                          const std::string& rhs_value,
-                          bool ignoring_case) {
-  Message msg;
-  msg << "Expected equality of these values:";
-  msg << "\n  " << lhs_expression;
-  if (lhs_value != lhs_expression) {
-    msg << "\n    Which is: " << lhs_value;
-  }
-  msg << "\n  " << rhs_expression;
-  if (rhs_value != rhs_expression) {
-    msg << "\n    Which is: " << rhs_value;
-  }
-
-  if (ignoring_case) {
-    msg << "\nIgnoring case";
-  }
-
-  if (!lhs_value.empty() && !rhs_value.empty()) {
-    const std::vector<std::string> lhs_lines =
-        SplitEscapedString(lhs_value);
-    const std::vector<std::string> rhs_lines =
-        SplitEscapedString(rhs_value);
-    if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
-      msg << "\nWith diff:\n"
-          << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
-    }
-  }
-
-  return AssertionFailure() << msg;
-}
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-std::string GetBoolAssertionFailureMessage(
-    const AssertionResult& assertion_result,
-    const char* expression_text,
-    const char* actual_predicate_value,
-    const char* expected_predicate_value) {
-  const char* actual_message = assertion_result.message();
-  Message msg;
-  msg << "Value of: " << expression_text
-      << "\n  Actual: " << actual_predicate_value;
-  if (actual_message[0] != '\0')
-    msg << " (" << actual_message << ")";
-  msg << "\nExpected: " << expected_predicate_value;
-  return msg.GetString();
-}
-
-// Helper function for implementing ASSERT_NEAR.
-AssertionResult DoubleNearPredFormat(const char* expr1,
-                                     const char* expr2,
-                                     const char* abs_error_expr,
-                                     double val1,
-                                     double val2,
-                                     double abs_error) {
-  const double diff = fabs(val1 - val2);
-  if (diff <= abs_error) return AssertionSuccess();
-
-  // Find the value which is closest to zero.
-  const double min_abs = std::min(fabs(val1), fabs(val2));
-  // Find the distance to the next double from that value.
-  const double epsilon =
-      nextafter(min_abs, std::numeric_limits<double>::infinity()) - min_abs;
-  // Detect the case where abs_error is so small that EXPECT_NEAR is
-  // effectively the same as EXPECT_EQUAL, and give an informative error
-  // message so that the situation can be more easily understood without
-  // requiring exotic floating-point knowledge.
-  // Don't do an epsilon check if abs_error is zero because that implies
-  // that an equality check was actually intended.
-  if (!(std::isnan)(val1) && !(std::isnan)(val2) && abs_error > 0 &&
-      abs_error < epsilon) {
-    return AssertionFailure()
-           << "The difference between " << expr1 << " and " << expr2 << " is "
-           << diff << ", where\n"
-           << expr1 << " evaluates to " << val1 << ",\n"
-           << expr2 << " evaluates to " << val2 << ".\nThe abs_error parameter "
-           << abs_error_expr << " evaluates to " << abs_error
-           << " which is smaller than the minimum distance between doubles for "
-              "numbers of this magnitude which is "
-           << epsilon
-           << ", thus making this EXPECT_NEAR check equivalent to "
-              "EXPECT_EQUAL. Consider using EXPECT_DOUBLE_EQ instead.";
-  }
-  return AssertionFailure()
-      << "The difference between " << expr1 << " and " << expr2
-      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
-      << expr1 << " evaluates to " << val1 << ",\n"
-      << expr2 << " evaluates to " << val2 << ", and\n"
-      << abs_error_expr << " evaluates to " << abs_error << ".";
-}
-
-
-// Helper template for implementing FloatLE() and DoubleLE().
-template <typename RawType>
-AssertionResult FloatingPointLE(const char* expr1,
-                                const char* expr2,
-                                RawType val1,
-                                RawType val2) {
-  // Returns success if val1 is less than val2,
-  if (val1 < val2) {
-    return AssertionSuccess();
-  }
-
-  // or if val1 is almost equal to val2.
-  const FloatingPoint<RawType> lhs(val1), rhs(val2);
-  if (lhs.AlmostEquals(rhs)) {
-    return AssertionSuccess();
-  }
-
-  // Note that the above two checks will both fail if either val1 or
-  // val2 is NaN, as the IEEE floating-point standard requires that
-  // any predicate involving a NaN must return false.
-
-  ::std::stringstream val1_ss;
-  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-          << val1;
-
-  ::std::stringstream val2_ss;
-  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-          << val2;
-
-  return AssertionFailure()
-      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
-      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
-      << StringStreamToString(&val2_ss);
-}
-
-}  // namespace internal
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-AssertionResult FloatLE(const char* expr1, const char* expr2,
-                        float val1, float val2) {
-  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
-}
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-AssertionResult DoubleLE(const char* expr1, const char* expr2,
-                         double val1, double val2) {
-  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
-}
-
-namespace internal {
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-AssertionResult CmpHelperSTREQ(const char* lhs_expression,
-                               const char* rhs_expression,
-                               const char* lhs,
-                               const char* rhs) {
-  if (String::CStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   false);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const char* lhs,
-                                   const char* rhs) {
-  if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   true);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                               const char* s2_expression,
-                               const char* s1,
-                               const char* s2) {
-  if (!String::CStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  } else {
-    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
-                              << s2_expression << "), actual: \""
-                              << s1 << "\" vs \"" << s2 << "\"";
-  }
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
-                                   const char* s2_expression,
-                                   const char* s1,
-                                   const char* s2) {
-  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  } else {
-    return AssertionFailure()
-        << "Expected: (" << s1_expression << ") != ("
-        << s2_expression << ") (ignoring case), actual: \""
-        << s1 << "\" vs \"" << s2 << "\"";
-  }
-}
-
-}  // namespace internal
-
-namespace {
-
-// Helper functions for implementing IsSubString() and IsNotSubstring().
-
-// This group of overloaded functions return true if and only if needle
-// is a substring of haystack.  NULL is considered a substring of
-// itself only.
-
-bool IsSubstringPred(const char* needle, const char* haystack) {
-  if (needle == nullptr || haystack == nullptr) return needle == haystack;
-
-  return strstr(haystack, needle) != nullptr;
-}
-
-bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
-  if (needle == nullptr || haystack == nullptr) return needle == haystack;
-
-  return wcsstr(haystack, needle) != nullptr;
-}
-
-// StringType here can be either ::std::string or ::std::wstring.
-template <typename StringType>
-bool IsSubstringPred(const StringType& needle,
-                     const StringType& haystack) {
-  return haystack.find(needle) != StringType::npos;
-}
-
-// This function implements either IsSubstring() or IsNotSubstring(),
-// depending on the value of the expected_to_be_substring parameter.
-// StringType here can be const char*, const wchar_t*, ::std::string,
-// or ::std::wstring.
-template <typename StringType>
-AssertionResult IsSubstringImpl(
-    bool expected_to_be_substring,
-    const char* needle_expr, const char* haystack_expr,
-    const StringType& needle, const StringType& haystack) {
-  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
-    return AssertionSuccess();
-
-  const bool is_wide_string = sizeof(needle[0]) > 1;
-  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
-  return AssertionFailure()
-      << "Value of: " << needle_expr << "\n"
-      << "  Actual: " << begin_string_quote << needle << "\"\n"
-      << "Expected: " << (expected_to_be_substring ? "" : "not ")
-      << "a substring of " << haystack_expr << "\n"
-      << "Which is: " << begin_string_quote << haystack << "\"";
-}
-
-}  // namespace
-
-// IsSubstring() and IsNotSubstring() check whether needle is a
-// substring of haystack (NULL is considered a substring of itself
-// only), and return an appropriate error message when they fail.
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-#if GTEST_HAS_STD_WSTRING
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-
-namespace {
-
-// Helper function for IsHRESULT{SuccessFailure} predicates
-AssertionResult HRESULTFailureHelper(const char* expr,
-                                     const char* expected,
-                                     long hr) {  // NOLINT
-# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
-
-  // Windows CE doesn't support FormatMessage.
-  const char error_text[] = "";
-
-# else
-
-  // Looks up the human-readable system message for the HRESULT code
-  // and since we're not passing any params to FormatMessage, we don't
-  // want inserts expanded.
-  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
-                       FORMAT_MESSAGE_IGNORE_INSERTS;
-  const DWORD kBufSize = 4096;
-  // Gets the system's human readable message string for this HRESULT.
-  char error_text[kBufSize] = { '\0' };
-  DWORD message_length = ::FormatMessageA(kFlags,
-                                          0,   // no source, we're asking system
-                                          static_cast<DWORD>(hr),  // the error
-                                          0,   // no line width restrictions
-                                          error_text,  // output buffer
-                                          kBufSize,    // buf size
-                                          nullptr);  // no arguments for inserts
-  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
-  for (; message_length && IsSpace(error_text[message_length - 1]);
-          --message_length) {
-    error_text[message_length - 1] = '\0';
-  }
-
-# endif  // GTEST_OS_WINDOWS_MOBILE
-
-  const std::string error_hex("0x" + String::FormatHexInt(hr));
-  return ::testing::AssertionFailure()
-      << "Expected: " << expr << " " << expected << ".\n"
-      << "  Actual: " << error_hex << " " << error_text << "\n";
-}
-
-}  // namespace
-
-AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
-  if (SUCCEEDED(hr)) {
-    return AssertionSuccess();
-  }
-  return HRESULTFailureHelper(expr, "succeeds", hr);
-}
-
-AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
-  if (FAILED(hr)) {
-    return AssertionSuccess();
-  }
-  return HRESULTFailureHelper(expr, "fails", hr);
-}
-
-#endif  // GTEST_OS_WINDOWS
-
-// Utility functions for encoding Unicode text (wide strings) in
-// UTF-8.
-
-// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
-// like this:
-//
-// Code-point length   Encoding
-//   0 -  7 bits       0xxxxxxx
-//   8 - 11 bits       110xxxxx 10xxxxxx
-//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
-//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-
-// The maximum code-point a one-byte UTF-8 sequence can represent.
-constexpr uint32_t kMaxCodePoint1 = (static_cast<uint32_t>(1) <<  7) - 1;
-
-// The maximum code-point a two-byte UTF-8 sequence can represent.
-constexpr uint32_t kMaxCodePoint2 = (static_cast<uint32_t>(1) << (5 + 6)) - 1;
-
-// The maximum code-point a three-byte UTF-8 sequence can represent.
-constexpr uint32_t kMaxCodePoint3 = (static_cast<uint32_t>(1) << (4 + 2*6)) - 1;
-
-// The maximum code-point a four-byte UTF-8 sequence can represent.
-constexpr uint32_t kMaxCodePoint4 = (static_cast<uint32_t>(1) << (3 + 3*6)) - 1;
-
-// Chops off the n lowest bits from a bit pattern.  Returns the n
-// lowest bits.  As a side effect, the original bit pattern will be
-// shifted to the right by n bits.
-inline uint32_t ChopLowBits(uint32_t* bits, int n) {
-  const uint32_t low_bits = *bits & ((static_cast<uint32_t>(1) << n) - 1);
-  *bits >>= n;
-  return low_bits;
-}
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type uint32_t because wchar_t may not be
-// wide enough to contain a code point.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
-// to "(Invalid Unicode 0xXXXXXXXX)".
-std::string CodePointToUtf8(uint32_t code_point) {
-  if (code_point > kMaxCodePoint4) {
-    return "(Invalid Unicode 0x" + String::FormatHexUInt32(code_point) + ")";
-  }
-
-  char str[5];  // Big enough for the largest valid code point.
-  if (code_point <= kMaxCodePoint1) {
-    str[1] = '\0';
-    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
-  } else if (code_point <= kMaxCodePoint2) {
-    str[2] = '\0';
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
-  } else if (code_point <= kMaxCodePoint3) {
-    str[3] = '\0';
-    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
-  } else {  // code_point <= kMaxCodePoint4
-    str[4] = '\0';
-    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
-  }
-  return str;
-}
-
-// The following two functions only make sense if the system
-// uses UTF-16 for wide string encoding. All supported systems
-// with 16 bit wchar_t (Windows, Cygwin) do use UTF-16.
-
-// Determines if the arguments constitute UTF-16 surrogate pair
-// and thus should be combined into a single Unicode code point
-// using CreateCodePointFromUtf16SurrogatePair.
-inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
-  return sizeof(wchar_t) == 2 &&
-      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
-}
-
-// Creates a Unicode code point from UTF16 surrogate pair.
-inline uint32_t CreateCodePointFromUtf16SurrogatePair(wchar_t first,
-                                                      wchar_t second) {
-  const auto first_u = static_cast<uint32_t>(first);
-  const auto second_u = static_cast<uint32_t>(second);
-  const uint32_t mask = (1 << 10) - 1;
-  return (sizeof(wchar_t) == 2)
-             ? (((first_u & mask) << 10) | (second_u & mask)) + 0x10000
-             :
-             // This function should not be called when the condition is
-             // false, but we provide a sensible default in case it is.
-             first_u;
-}
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
-//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
-  if (num_chars == -1)
-    num_chars = static_cast<int>(wcslen(str));
-
-  ::std::stringstream stream;
-  for (int i = 0; i < num_chars; ++i) {
-    uint32_t unicode_code_point;
-
-    if (str[i] == L'\0') {
-      break;
-    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
-      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
-                                                                 str[i + 1]);
-      i++;
-    } else {
-      unicode_code_point = static_cast<uint32_t>(str[i]);
-    }
-
-    stream << CodePointToUtf8(unicode_code_point);
-  }
-  return StringStreamToString(&stream);
-}
-
-// Converts a wide C string to an std::string using the UTF-8 encoding.
-// NULL will be converted to "(null)".
-std::string String::ShowWideCString(const wchar_t * wide_c_str) {
-  if (wide_c_str == nullptr) return "(null)";
-
-  return internal::WideStringToUtf8(wide_c_str, -1);
-}
-
-// Compares two wide C strings.  Returns true if and only if they have the
-// same content.
-//
-// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-  return wcscmp(lhs, rhs) == 0;
-}
-
-// Helper function for *_STREQ on wide strings.
-AssertionResult CmpHelperSTREQ(const char* lhs_expression,
-                               const char* rhs_expression,
-                               const wchar_t* lhs,
-                               const wchar_t* rhs) {
-  if (String::WideCStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   false);
-}
-
-// Helper function for *_STRNE on wide strings.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                               const char* s2_expression,
-                               const wchar_t* s1,
-                               const wchar_t* s2) {
-  if (!String::WideCStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  }
-
-  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
-                            << s2_expression << "), actual: "
-                            << PrintToString(s1)
-                            << " vs " << PrintToString(s2);
-}
-
-// Compares two C strings, ignoring case.  Returns true if and only if they have
-// the same content.
-//
-// Unlike strcasecmp(), this function can handle NULL argument(s).  A
-// NULL C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-  if (rhs == nullptr) return false;
-  return posix::StrCaseCmp(lhs, rhs) == 0;
-}
-
-// Compares two wide C strings, ignoring case.  Returns true if and only if they
-// have the same content.
-//
-// Unlike wcscasecmp(), this function can handle NULL argument(s).
-// A NULL C string is considered different to any non-NULL wide C string,
-// including the empty string.
-// NB: The implementations on different platforms slightly differ.
-// On windows, this method uses _wcsicmp which compares according to LC_CTYPE
-// environment variable. On GNU platform this method uses wcscasecmp
-// which compares according to LC_CTYPE category of the current locale.
-// On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
-// current locale.
-bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
-                                              const wchar_t* rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-#if GTEST_OS_WINDOWS
-  return _wcsicmp(lhs, rhs) == 0;
-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
-  return wcscasecmp(lhs, rhs) == 0;
-#else
-  // Android, Mac OS X and Cygwin don't define wcscasecmp.
-  // Other unknown OSes may not define it either.
-  wint_t left, right;
-  do {
-    left = towlower(static_cast<wint_t>(*lhs++));
-    right = towlower(static_cast<wint_t>(*rhs++));
-  } while (left && left == right);
-  return left == right;
-#endif  // OS selector
-}
-
-// Returns true if and only if str ends with the given suffix, ignoring case.
-// Any string is considered to end with an empty suffix.
-bool String::EndsWithCaseInsensitive(
-    const std::string& str, const std::string& suffix) {
-  const size_t str_len = str.length();
-  const size_t suffix_len = suffix.length();
-  return (str_len >= suffix_len) &&
-         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
-                                      suffix.c_str());
-}
-
-// Formats an int value as "%02d".
-std::string String::FormatIntWidth2(int value) {
-  return FormatIntWidthN(value, 2);
-}
-
-// Formats an int value to given width with leading zeros.
-std::string String::FormatIntWidthN(int value, int width) {
-  std::stringstream ss;
-  ss << std::setfill('0') << std::setw(width) << value;
-  return ss.str();
-}
-
-// Formats an int value as "%X".
-std::string String::FormatHexUInt32(uint32_t value) {
-  std::stringstream ss;
-  ss << std::hex << std::uppercase << value;
-  return ss.str();
-}
-
-// Formats an int value as "%X".
-std::string String::FormatHexInt(int value) {
-  return FormatHexUInt32(static_cast<uint32_t>(value));
-}
-
-// Formats a byte as "%02X".
-std::string String::FormatByte(unsigned char value) {
-  std::stringstream ss;
-  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
-     << static_cast<unsigned int>(value);
-  return ss.str();
-}
-
-// Converts the buffer in a stringstream to an std::string, converting NUL
-// bytes to "\\0" along the way.
-std::string StringStreamToString(::std::stringstream* ss) {
-  const ::std::string& str = ss->str();
-  const char* const start = str.c_str();
-  const char* const end = start + str.length();
-
-  std::string result;
-  result.reserve(static_cast<size_t>(2 * (end - start)));
-  for (const char* ch = start; ch != end; ++ch) {
-    if (*ch == '\0') {
-      result += "\\0";  // Replaces NUL with "\\0";
-    } else {
-      result += *ch;
-    }
-  }
-
-  return result;
-}
-
-// Appends the user-supplied message to the Google-Test-generated message.
-std::string AppendUserMessage(const std::string& gtest_msg,
-                              const Message& user_msg) {
-  // Appends the user message if it's non-empty.
-  const std::string user_msg_string = user_msg.GetString();
-  if (user_msg_string.empty()) {
-    return gtest_msg;
-  }
-  if (gtest_msg.empty()) {
-    return user_msg_string;
-  }
-  return gtest_msg + "\n" + user_msg_string;
-}
-
-}  // namespace internal
-
-// class TestResult
-
-// Creates an empty TestResult.
-TestResult::TestResult()
-    : death_test_count_(0), start_timestamp_(0), elapsed_time_(0) {}
-
-// D'tor.
-TestResult::~TestResult() {
-}
-
-// Returns the i-th test part result among all the results. i can
-// range from 0 to total_part_count() - 1. If i is not in that range,
-// aborts the program.
-const TestPartResult& TestResult::GetTestPartResult(int i) const {
-  if (i < 0 || i >= total_part_count())
-    internal::posix::Abort();
-  return test_part_results_.at(static_cast<size_t>(i));
-}
-
-// Returns the i-th test property. i can range from 0 to
-// test_property_count() - 1. If i is not in that range, aborts the
-// program.
-const TestProperty& TestResult::GetTestProperty(int i) const {
-  if (i < 0 || i >= test_property_count())
-    internal::posix::Abort();
-  return test_properties_.at(static_cast<size_t>(i));
-}
-
-// Clears the test part results.
-void TestResult::ClearTestPartResults() {
-  test_part_results_.clear();
-}
-
-// Adds a test part result to the list.
-void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
-  test_part_results_.push_back(test_part_result);
-}
-
-// Adds a test property to the list. If a property with the same key as the
-// supplied property is already represented, the value of this test_property
-// replaces the old value for that key.
-void TestResult::RecordProperty(const std::string& xml_element,
-                                const TestProperty& test_property) {
-  if (!ValidateTestProperty(xml_element, test_property)) {
-    return;
-  }
-  internal::MutexLock lock(&test_properties_mutex_);
-  const std::vector<TestProperty>::iterator property_with_matching_key =
-      std::find_if(test_properties_.begin(), test_properties_.end(),
-                   internal::TestPropertyKeyIs(test_property.key()));
-  if (property_with_matching_key == test_properties_.end()) {
-    test_properties_.push_back(test_property);
-    return;
-  }
-  property_with_matching_key->SetValue(test_property.value());
-}
-
-// The list of reserved attributes used in the <testsuites> element of XML
-// output.
-static const char* const kReservedTestSuitesAttributes[] = {
-  "disabled",
-  "errors",
-  "failures",
-  "name",
-  "random_seed",
-  "tests",
-  "time",
-  "timestamp"
-};
-
-// The list of reserved attributes used in the <testsuite> element of XML
-// output.
-static const char* const kReservedTestSuiteAttributes[] = {
-    "disabled", "errors", "failures",  "name",
-    "tests",    "time",   "timestamp", "skipped"};
-
-// The list of reserved attributes used in the <testcase> element of XML output.
-static const char* const kReservedTestCaseAttributes[] = {
-    "classname",   "name", "status", "time",  "type_param",
-    "value_param", "file", "line"};
-
-// Use a slightly different set for allowed output to ensure existing tests can
-// still RecordProperty("result") or "RecordProperty(timestamp")
-static const char* const kReservedOutputTestCaseAttributes[] = {
-    "classname",   "name", "status", "time",   "type_param",
-    "value_param", "file", "line",   "result", "timestamp"};
-
-template <size_t kSize>
-std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
-  return std::vector<std::string>(array, array + kSize);
-}
-
-static std::vector<std::string> GetReservedAttributesForElement(
-    const std::string& xml_element) {
-  if (xml_element == "testsuites") {
-    return ArrayAsVector(kReservedTestSuitesAttributes);
-  } else if (xml_element == "testsuite") {
-    return ArrayAsVector(kReservedTestSuiteAttributes);
-  } else if (xml_element == "testcase") {
-    return ArrayAsVector(kReservedTestCaseAttributes);
-  } else {
-    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
-  }
-  // This code is unreachable but some compilers may not realizes that.
-  return std::vector<std::string>();
-}
-
-// TODO(jdesprez): Merge the two getReserved attributes once skip is improved
-static std::vector<std::string> GetReservedOutputAttributesForElement(
-    const std::string& xml_element) {
-  if (xml_element == "testsuites") {
-    return ArrayAsVector(kReservedTestSuitesAttributes);
-  } else if (xml_element == "testsuite") {
-    return ArrayAsVector(kReservedTestSuiteAttributes);
-  } else if (xml_element == "testcase") {
-    return ArrayAsVector(kReservedOutputTestCaseAttributes);
-  } else {
-    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
-  }
-  // This code is unreachable but some compilers may not realizes that.
-  return std::vector<std::string>();
-}
-
-static std::string FormatWordList(const std::vector<std::string>& words) {
-  Message word_list;
-  for (size_t i = 0; i < words.size(); ++i) {
-    if (i > 0 && words.size() > 2) {
-      word_list << ", ";
-    }
-    if (i == words.size() - 1) {
-      word_list << "and ";
-    }
-    word_list << "'" << words[i] << "'";
-  }
-  return word_list.GetString();
-}
-
-static bool ValidateTestPropertyName(
-    const std::string& property_name,
-    const std::vector<std::string>& reserved_names) {
-  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
-          reserved_names.end()) {
-    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
-                  << " (" << FormatWordList(reserved_names)
-                  << " are reserved by " << GTEST_NAME_ << ")";
-    return false;
-  }
-  return true;
-}
-
-// Adds a failure if the key is a reserved attribute of the element named
-// xml_element.  Returns true if the property is valid.
-bool TestResult::ValidateTestProperty(const std::string& xml_element,
-                                      const TestProperty& test_property) {
-  return ValidateTestPropertyName(test_property.key(),
-                                  GetReservedAttributesForElement(xml_element));
-}
-
-// Clears the object.
-void TestResult::Clear() {
-  test_part_results_.clear();
-  test_properties_.clear();
-  death_test_count_ = 0;
-  elapsed_time_ = 0;
-}
-
-// Returns true off the test part was skipped.
-static bool TestPartSkipped(const TestPartResult& result) {
-  return result.skipped();
-}
-
-// Returns true if and only if the test was skipped.
-bool TestResult::Skipped() const {
-  return !Failed() && CountIf(test_part_results_, TestPartSkipped) > 0;
-}
-
-// Returns true if and only if the test failed.
-bool TestResult::Failed() const {
-  for (int i = 0; i < total_part_count(); ++i) {
-    if (GetTestPartResult(i).failed())
-      return true;
-  }
-  return false;
-}
-
-// Returns true if and only if the test part fatally failed.
-static bool TestPartFatallyFailed(const TestPartResult& result) {
-  return result.fatally_failed();
-}
-
-// Returns true if and only if the test fatally failed.
-bool TestResult::HasFatalFailure() const {
-  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
-}
-
-// Returns true if and only if the test part non-fatally failed.
-static bool TestPartNonfatallyFailed(const TestPartResult& result) {
-  return result.nonfatally_failed();
-}
-
-// Returns true if and only if the test has a non-fatal failure.
-bool TestResult::HasNonfatalFailure() const {
-  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
-}
-
-// Gets the number of all test parts.  This is the sum of the number
-// of successful test parts and the number of failed test parts.
-int TestResult::total_part_count() const {
-  return static_cast<int>(test_part_results_.size());
-}
-
-// Returns the number of the test properties.
-int TestResult::test_property_count() const {
-  return static_cast<int>(test_properties_.size());
-}
-
-// class Test
-
-// Creates a Test object.
-
-// The c'tor saves the states of all flags.
-Test::Test()
-    : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
-}
-
-// The d'tor restores the states of all flags.  The actual work is
-// done by the d'tor of the gtest_flag_saver_ field, and thus not
-// visible here.
-Test::~Test() {
-}
-
-// Sets up the test fixture.
-//
-// A sub-class may override this.
-void Test::SetUp() {
-}
-
-// Tears down the test fixture.
-//
-// A sub-class may override this.
-void Test::TearDown() {
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, const std::string& value) {
-  UnitTest::GetInstance()->RecordProperty(key, value);
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, int value) {
-  Message value_message;
-  value_message << value;
-  RecordProperty(key, value_message.GetString().c_str());
-}
-
-namespace internal {
-
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
-                                    const std::string& message) {
-  // This function is a friend of UnitTest and as such has access to
-  // AddTestPartResult.
-  UnitTest::GetInstance()->AddTestPartResult(
-      result_type,
-      nullptr,  // No info about the source file where the exception occurred.
-      -1,       // We have no info on which line caused the exception.
-      message,
-      "");  // No stack trace, either.
-}
-
-}  // namespace internal
-
-// Google Test requires all tests in the same test suite to use the same test
-// fixture class.  This function checks if the current test has the
-// same fixture class as the first test in the current test suite.  If
-// yes, it returns true; otherwise it generates a Google Test failure and
-// returns false.
-bool Test::HasSameFixtureClass() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  const TestSuite* const test_suite = impl->current_test_suite();
-
-  // Info about the first test in the current test suite.
-  const TestInfo* const first_test_info = test_suite->test_info_list()[0];
-  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
-  const char* const first_test_name = first_test_info->name();
-
-  // Info about the current test.
-  const TestInfo* const this_test_info = impl->current_test_info();
-  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
-  const char* const this_test_name = this_test_info->name();
-
-  if (this_fixture_id != first_fixture_id) {
-    // Is the first test defined using TEST?
-    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
-    // Is this test defined using TEST?
-    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
-
-    if (first_is_TEST || this_is_TEST) {
-      // Both TEST and TEST_F appear in same test suite, which is incorrect.
-      // Tell the user how to fix this.
-
-      // Gets the name of the TEST and the name of the TEST_F.  Note
-      // that first_is_TEST and this_is_TEST cannot both be true, as
-      // the fixture IDs are different for the two tests.
-      const char* const TEST_name =
-          first_is_TEST ? first_test_name : this_test_name;
-      const char* const TEST_F_name =
-          first_is_TEST ? this_test_name : first_test_name;
-
-      ADD_FAILURE()
-          << "All tests in the same test suite must use the same test fixture\n"
-          << "class, so mixing TEST_F and TEST in the same test suite is\n"
-          << "illegal.  In test suite " << this_test_info->test_suite_name()
-          << ",\n"
-          << "test " << TEST_F_name << " is defined using TEST_F but\n"
-          << "test " << TEST_name << " is defined using TEST.  You probably\n"
-          << "want to change the TEST to TEST_F or move it to another test\n"
-          << "case.";
-    } else {
-      // Two fixture classes with the same name appear in two different
-      // namespaces, which is not allowed. Tell the user how to fix this.
-      ADD_FAILURE()
-          << "All tests in the same test suite must use the same test fixture\n"
-          << "class.  However, in test suite "
-          << this_test_info->test_suite_name() << ",\n"
-          << "you defined test " << first_test_name << " and test "
-          << this_test_name << "\n"
-          << "using two different test fixture classes.  This can happen if\n"
-          << "the two classes are from different namespaces or translation\n"
-          << "units and have the same name.  You should probably rename one\n"
-          << "of the classes to put the tests into different test suites.";
-    }
-    return false;
-  }
-
-  return true;
-}
-
-#if GTEST_HAS_SEH
-
-// Adds an "exception thrown" fatal failure to the current test.  This
-// function returns its result via an output parameter pointer because VC++
-// prohibits creation of objects with destructors on stack in functions
-// using __try (see error C2712).
-static std::string* FormatSehExceptionMessage(DWORD exception_code,
-                                              const char* location) {
-  Message message;
-  message << "SEH exception with code 0x" << std::setbase(16) <<
-    exception_code << std::setbase(10) << " thrown in " << location << ".";
-
-  return new std::string(message.GetString());
-}
-
-#endif  // GTEST_HAS_SEH
-
-namespace internal {
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Adds an "exception thrown" fatal failure to the current test.
-static std::string FormatCxxExceptionMessage(const char* description,
-                                             const char* location) {
-  Message message;
-  if (description != nullptr) {
-    message << "C++ exception with description \"" << description << "\"";
-  } else {
-    message << "Unknown C++ exception";
-  }
-  message << " thrown in " << location << ".";
-
-  return message.GetString();
-}
-
-static std::string PrintTestPartResultToString(
-    const TestPartResult& test_part_result);
-
-GoogleTestFailureException::GoogleTestFailureException(
-    const TestPartResult& failure)
-    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-// We put these helper functions in the internal namespace as IBM's xlC
-// compiler rejects the code if they were declared static.
-
-// Runs the given method and handles SEH exceptions it throws, when
-// SEH is supported; returns the 0-value for type Result in case of an
-// SEH exception.  (Microsoft compilers cannot handle SEH and C++
-// exceptions in the same function.  Therefore, we provide a separate
-// wrapper function for handling SEH exceptions.)
-template <class T, typename Result>
-Result HandleSehExceptionsInMethodIfSupported(
-    T* object, Result (T::*method)(), const char* location) {
-#if GTEST_HAS_SEH
-  __try {
-    return (object->*method)();
-  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
-      GetExceptionCode())) {
-    // We create the exception message on the heap because VC++ prohibits
-    // creation of objects with destructors on stack in functions using __try
-    // (see error C2712).
-    std::string* exception_message = FormatSehExceptionMessage(
-        GetExceptionCode(), location);
-    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
-                                             *exception_message);
-    delete exception_message;
-    return static_cast<Result>(0);
-  }
-#else
-  (void)location;
-  return (object->*method)();
-#endif  // GTEST_HAS_SEH
-}
-
-// Runs the given method and catches and reports C++ and/or SEH-style
-// exceptions, if they are supported; returns the 0-value for type
-// Result in case of an SEH exception.
-template <class T, typename Result>
-Result HandleExceptionsInMethodIfSupported(
-    T* object, Result (T::*method)(), const char* location) {
-  // NOTE: The user code can affect the way in which Google Test handles
-  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
-  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
-  // after the exception is caught and either report or re-throw the
-  // exception based on the flag's value:
-  //
-  // try {
-  //   // Perform the test method.
-  // } catch (...) {
-  //   if (GTEST_FLAG(catch_exceptions))
-  //     // Report the exception as failure.
-  //   else
-  //     throw;  // Re-throws the original exception.
-  // }
-  //
-  // However, the purpose of this flag is to allow the program to drop into
-  // the debugger when the exception is thrown. On most platforms, once the
-  // control enters the catch block, the exception origin information is
-  // lost and the debugger will stop the program at the point of the
-  // re-throw in this function -- instead of at the point of the original
-  // throw statement in the code under test.  For this reason, we perform
-  // the check early, sacrificing the ability to affect Google Test's
-  // exception handling in the method where the exception is thrown.
-  if (internal::GetUnitTestImpl()->catch_exceptions()) {
-#if GTEST_HAS_EXCEPTIONS
-    try {
-      return HandleSehExceptionsInMethodIfSupported(object, method, location);
-    } catch (const AssertionException&) {  // NOLINT
-      // This failure was reported already.
-    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
-      // This exception type can only be thrown by a failed Google
-      // Test assertion with the intention of letting another testing
-      // framework catch it.  Therefore we just re-throw it.
-      throw;
-    } catch (const std::exception& e) {  // NOLINT
-      internal::ReportFailureInUnknownLocation(
-          TestPartResult::kFatalFailure,
-          FormatCxxExceptionMessage(e.what(), location));
-    } catch (...) {  // NOLINT
-      internal::ReportFailureInUnknownLocation(
-          TestPartResult::kFatalFailure,
-          FormatCxxExceptionMessage(nullptr, location));
-    }
-    return static_cast<Result>(0);
-#else
-    return HandleSehExceptionsInMethodIfSupported(object, method, location);
-#endif  // GTEST_HAS_EXCEPTIONS
-  } else {
-    return (object->*method)();
-  }
-}
-
-}  // namespace internal
-
-// Runs the test and updates the test result.
-void Test::Run() {
-  if (!HasSameFixtureClass()) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
-  // We will run the test only if SetUp() was successful and didn't call
-  // GTEST_SKIP().
-  if (!HasFatalFailure() && !IsSkipped()) {
-    impl->os_stack_trace_getter()->UponLeavingGTest();
-    internal::HandleExceptionsInMethodIfSupported(
-        this, &Test::TestBody, "the test body");
-  }
-
-  // However, we want to clean up as much as possible.  Hence we will
-  // always call TearDown(), even if SetUp() or the test body has
-  // failed.
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &Test::TearDown, "TearDown()");
-}
-
-// Returns true if and only if the current test has a fatal failure.
-bool Test::HasFatalFailure() {
-  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
-}
-
-// Returns true if and only if the current test has a non-fatal failure.
-bool Test::HasNonfatalFailure() {
-  return internal::GetUnitTestImpl()->current_test_result()->
-      HasNonfatalFailure();
-}
-
-// Returns true if and only if the current test was skipped.
-bool Test::IsSkipped() {
-  return internal::GetUnitTestImpl()->current_test_result()->Skipped();
-}
-
-// class TestInfo
-
-// Constructs a TestInfo object. It assumes ownership of the test factory
-// object.
-TestInfo::TestInfo(const std::string& a_test_suite_name,
-                   const std::string& a_name, const char* a_type_param,
-                   const char* a_value_param,
-                   internal::CodeLocation a_code_location,
-                   internal::TypeId fixture_class_id,
-                   internal::TestFactoryBase* factory)
-    : test_suite_name_(a_test_suite_name),
-      name_(a_name),
-      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
-      value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
-      location_(a_code_location),
-      fixture_class_id_(fixture_class_id),
-      should_run_(false),
-      is_disabled_(false),
-      matches_filter_(false),
-      is_in_another_shard_(false),
-      factory_(factory),
-      result_() {}
-
-// Destructs a TestInfo object.
-TestInfo::~TestInfo() { delete factory_; }
-
-namespace internal {
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-//   test_suite_name:  name of the test suite
-//   name:             name of the test
-//   type_param:       the name of the test's type parameter, or NULL if
-//                     this is not a typed or a type-parameterized test.
-//   value_param:      text representation of the test's value parameter,
-//                     or NULL if this is not a value-parameterized test.
-//   code_location:    code location where the test is defined
-//   fixture_class_id: ID of the test fixture class
-//   set_up_tc:        pointer to the function that sets up the test suite
-//   tear_down_tc:     pointer to the function that tears down the test suite
-//   factory:          pointer to the factory that creates a test object.
-//                     The newly created TestInfo instance will assume
-//                     ownership of the factory object.
-TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
-    const char* value_param, CodeLocation code_location,
-    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
-    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory) {
-  TestInfo* const test_info =
-      new TestInfo(test_suite_name, name, type_param, value_param,
-                   code_location, fixture_class_id, factory);
-  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
-  return test_info;
-}
-
-void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                CodeLocation code_location) {
-  Message errors;
-  errors
-      << "Attempted redefinition of test suite " << test_suite_name << ".\n"
-      << "All tests in the same test suite must use the same test fixture\n"
-      << "class.  However, in test suite " << test_suite_name << ", you tried\n"
-      << "to define a test using a fixture class different from the one\n"
-      << "used earlier. This can happen if the two fixture classes are\n"
-      << "from different namespaces and have the same name. You should\n"
-      << "probably rename one of the classes to put the tests into different\n"
-      << "test suites.";
-
-  GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(),
-                                          code_location.line)
-                    << " " << errors.GetString();
-}
-}  // namespace internal
-
-namespace {
-
-// A predicate that checks the test name of a TestInfo against a known
-// value.
-//
-// This is used for implementation of the TestSuite class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestNameIs is copyable.
-class TestNameIs {
- public:
-  // Constructor.
-  //
-  // TestNameIs has NO default constructor.
-  explicit TestNameIs(const char* name)
-      : name_(name) {}
-
-  // Returns true if and only if the test name of test_info matches name_.
-  bool operator()(const TestInfo * test_info) const {
-    return test_info && test_info->name() == name_;
-  }
-
- private:
-  std::string name_;
-};
-
-}  // namespace
-
-namespace internal {
-
-// This method expands all parameterized tests registered with macros TEST_P
-// and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
-// This will be done just once during the program runtime.
-void UnitTestImpl::RegisterParameterizedTests() {
-  if (!parameterized_tests_registered_) {
-    parameterized_test_registry_.RegisterTests();
-    type_parameterized_test_registry_.CheckForInstantiations();
-    parameterized_tests_registered_ = true;
-  }
-}
-
-}  // namespace internal
-
-// Creates the test object, runs it, records its result, and then
-// deletes it.
-void TestInfo::Run() {
-  if (!should_run_) return;
-
-  // Tells UnitTest where to store test result.
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_info(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Notifies the unit test event listeners that a test is about to start.
-  repeater->OnTestStart(*this);
-
-  result_.set_start_timestamp(internal::GetTimeInMillis());
-  internal::Timer timer;
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-
-  // Creates the test object.
-  Test* const test = internal::HandleExceptionsInMethodIfSupported(
-      factory_, &internal::TestFactoryBase::CreateTest,
-      "the test fixture's constructor");
-
-  // Runs the test if the constructor didn't generate a fatal failure or invoke
-  // GTEST_SKIP().
-  // Note that the object will not be null
-  if (!Test::HasFatalFailure() && !Test::IsSkipped()) {
-    // This doesn't throw as all user code that can throw are wrapped into
-    // exception handling code.
-    test->Run();
-  }
-
-  if (test != nullptr) {
-    // Deletes the test object.
-    impl->os_stack_trace_getter()->UponLeavingGTest();
-    internal::HandleExceptionsInMethodIfSupported(
-        test, &Test::DeleteSelf_, "the test fixture's destructor");
-  }
-
-  result_.set_elapsed_time(timer.Elapsed());
-
-  // Notifies the unit test event listener that a test has just finished.
-  repeater->OnTestEnd(*this);
-
-  // Tells UnitTest to stop associating assertion results to this
-  // test.
-  impl->set_current_test_info(nullptr);
-}
-
-// Skip and records a skipped test result for this object.
-void TestInfo::Skip() {
-  if (!should_run_) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_info(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Notifies the unit test event listeners that a test is about to start.
-  repeater->OnTestStart(*this);
-
-  const TestPartResult test_part_result =
-      TestPartResult(TestPartResult::kSkip, this->file(), this->line(), "");
-  impl->GetTestPartResultReporterForCurrentThread()->ReportTestPartResult(
-      test_part_result);
-
-  // Notifies the unit test event listener that a test has just finished.
-  repeater->OnTestEnd(*this);
-  impl->set_current_test_info(nullptr);
-}
-
-// class TestSuite
-
-// Gets the number of successful tests in this test suite.
-int TestSuite::successful_test_count() const {
-  return CountIf(test_info_list_, TestPassed);
-}
-
-// Gets the number of successful tests in this test suite.
-int TestSuite::skipped_test_count() const {
-  return CountIf(test_info_list_, TestSkipped);
-}
-
-// Gets the number of failed tests in this test suite.
-int TestSuite::failed_test_count() const {
-  return CountIf(test_info_list_, TestFailed);
-}
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int TestSuite::reportable_disabled_test_count() const {
-  return CountIf(test_info_list_, TestReportableDisabled);
-}
-
-// Gets the number of disabled tests in this test suite.
-int TestSuite::disabled_test_count() const {
-  return CountIf(test_info_list_, TestDisabled);
-}
-
-// Gets the number of tests to be printed in the XML report.
-int TestSuite::reportable_test_count() const {
-  return CountIf(test_info_list_, TestReportable);
-}
-
-// Get the number of tests in this test suite that should run.
-int TestSuite::test_to_run_count() const {
-  return CountIf(test_info_list_, ShouldRunTest);
-}
-
-// Gets the number of all tests.
-int TestSuite::total_test_count() const {
-  return static_cast<int>(test_info_list_.size());
-}
-
-// Creates a TestSuite with the given name.
-//
-// Arguments:
-//
-//   a_name:       name of the test suite
-//   a_type_param: the name of the test suite's type parameter, or NULL if
-//                 this is not a typed or a type-parameterized test suite.
-//   set_up_tc:    pointer to the function that sets up the test suite
-//   tear_down_tc: pointer to the function that tears down the test suite
-TestSuite::TestSuite(const char* a_name, const char* a_type_param,
-                     internal::SetUpTestSuiteFunc set_up_tc,
-                     internal::TearDownTestSuiteFunc tear_down_tc)
-    : name_(a_name),
-      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
-      set_up_tc_(set_up_tc),
-      tear_down_tc_(tear_down_tc),
-      should_run_(false),
-      start_timestamp_(0),
-      elapsed_time_(0) {}
-
-// Destructor of TestSuite.
-TestSuite::~TestSuite() {
-  // Deletes every Test in the collection.
-  ForEach(test_info_list_, internal::Delete<TestInfo>);
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-const TestInfo* TestSuite::GetTestInfo(int i) const {
-  const int index = GetElementOr(test_indices_, i, -1);
-  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-TestInfo* TestSuite::GetMutableTestInfo(int i) {
-  const int index = GetElementOr(test_indices_, i, -1);
-  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
-}
-
-// Adds a test to this test suite.  Will delete the test upon
-// destruction of the TestSuite object.
-void TestSuite::AddTestInfo(TestInfo* test_info) {
-  test_info_list_.push_back(test_info);
-  test_indices_.push_back(static_cast<int>(test_indices_.size()));
-}
-
-// Runs every test in this TestSuite.
-void TestSuite::Run() {
-  if (!should_run_) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_suite(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteStart(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  repeater->OnTestCaseStart(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()");
-
-  start_timestamp_ = internal::GetTimeInMillis();
-  internal::Timer timer;
-  for (int i = 0; i < total_test_count(); i++) {
-    GetMutableTestInfo(i)->Run();
-    if (GTEST_FLAG(fail_fast) && GetMutableTestInfo(i)->result()->Failed()) {
-      for (int j = i + 1; j < total_test_count(); j++) {
-        GetMutableTestInfo(j)->Skip();
-      }
-      break;
-    }
-  }
-  elapsed_time_ = timer.Elapsed();
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &TestSuite::RunTearDownTestSuite, "TearDownTestSuite()");
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteEnd(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  repeater->OnTestCaseEnd(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  impl->set_current_test_suite(nullptr);
-}
-
-// Skips all tests under this TestSuite.
-void TestSuite::Skip() {
-  if (!should_run_) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_suite(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteStart(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  repeater->OnTestCaseStart(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  for (int i = 0; i < total_test_count(); i++) {
-    GetMutableTestInfo(i)->Skip();
-  }
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteEnd(*this);
-  // Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  repeater->OnTestCaseEnd(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  impl->set_current_test_suite(nullptr);
-}
-
-// Clears the results of all tests in this test suite.
-void TestSuite::ClearResult() {
-  ad_hoc_test_result_.Clear();
-  ForEach(test_info_list_, TestInfo::ClearTestResult);
-}
-
-// Shuffles the tests in this test suite.
-void TestSuite::ShuffleTests(internal::Random* random) {
-  Shuffle(random, &test_indices_);
-}
-
-// Restores the test order to before the first shuffle.
-void TestSuite::UnshuffleTests() {
-  for (size_t i = 0; i < test_indices_.size(); i++) {
-    test_indices_[i] = static_cast<int>(i);
-  }
-}
-
-// Formats a countable noun.  Depending on its quantity, either the
-// singular form or the plural form is used. e.g.
-//
-// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
-// FormatCountableNoun(5, "book", "books") returns "5 books".
-static std::string FormatCountableNoun(int count,
-                                       const char * singular_form,
-                                       const char * plural_form) {
-  return internal::StreamableToString(count) + " " +
-      (count == 1 ? singular_form : plural_form);
-}
-
-// Formats the count of tests.
-static std::string FormatTestCount(int test_count) {
-  return FormatCountableNoun(test_count, "test", "tests");
-}
-
-// Formats the count of test suites.
-static std::string FormatTestSuiteCount(int test_suite_count) {
-  return FormatCountableNoun(test_suite_count, "test suite", "test suites");
-}
-
-// Converts a TestPartResult::Type enum to human-friendly string
-// representation.  Both kNonFatalFailure and kFatalFailure are translated
-// to "Failure", as the user usually doesn't care about the difference
-// between the two when viewing the test result.
-static const char * TestPartResultTypeToString(TestPartResult::Type type) {
-  switch (type) {
-    case TestPartResult::kSkip:
-      return "Skipped\n";
-    case TestPartResult::kSuccess:
-      return "Success";
-
-    case TestPartResult::kNonFatalFailure:
-    case TestPartResult::kFatalFailure:
-#ifdef _MSC_VER
-      return "error: ";
-#else
-      return "Failure\n";
-#endif
-    default:
-      return "Unknown result type";
-  }
-}
-
-namespace internal {
-namespace {
-enum class GTestColor { kDefault, kRed, kGreen, kYellow };
-}  // namespace
-
-// Prints a TestPartResult to an std::string.
-static std::string PrintTestPartResultToString(
-    const TestPartResult& test_part_result) {
-  return (Message()
-          << internal::FormatFileLocation(test_part_result.file_name(),
-                                          test_part_result.line_number())
-          << " " << TestPartResultTypeToString(test_part_result.type())
-          << test_part_result.message()).GetString();
-}
-
-// Prints a TestPartResult.
-static void PrintTestPartResult(const TestPartResult& test_part_result) {
-  const std::string& result =
-      PrintTestPartResultToString(test_part_result);
-  printf("%s\n", result.c_str());
-  fflush(stdout);
-  // If the test program runs in Visual Studio or a debugger, the
-  // following statements add the test part result message to the Output
-  // window such that the user can double-click on it to jump to the
-  // corresponding source code location; otherwise they do nothing.
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-  // We don't call OutputDebugString*() on Windows Mobile, as printing
-  // to stdout is done by OutputDebugString() there already - we don't
-  // want the same message printed twice.
-  ::OutputDebugStringA(result.c_str());
-  ::OutputDebugStringA("\n");
-#endif
-}
-
-// class PrettyUnitTestResultPrinter
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
-    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
-
-// Returns the character attribute for the given color.
-static WORD GetColorAttribute(GTestColor color) {
-  switch (color) {
-    case GTestColor::kRed:
-      return FOREGROUND_RED;
-    case GTestColor::kGreen:
-      return FOREGROUND_GREEN;
-    case GTestColor::kYellow:
-      return FOREGROUND_RED | FOREGROUND_GREEN;
-    default:           return 0;
-  }
-}
-
-static int GetBitOffset(WORD color_mask) {
-  if (color_mask == 0) return 0;
-
-  int bitOffset = 0;
-  while ((color_mask & 1) == 0) {
-    color_mask >>= 1;
-    ++bitOffset;
-  }
-  return bitOffset;
-}
-
-static WORD GetNewColor(GTestColor color, WORD old_color_attrs) {
-  // Let's reuse the BG
-  static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN |
-                                      BACKGROUND_RED | BACKGROUND_INTENSITY;
-  static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN |
-                                      FOREGROUND_RED | FOREGROUND_INTENSITY;
-  const WORD existing_bg = old_color_attrs & background_mask;
-
-  WORD new_color =
-      GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY;
-  static const int bg_bitOffset = GetBitOffset(background_mask);
-  static const int fg_bitOffset = GetBitOffset(foreground_mask);
-
-  if (((new_color & background_mask) >> bg_bitOffset) ==
-      ((new_color & foreground_mask) >> fg_bitOffset)) {
-    new_color ^= FOREGROUND_INTENSITY;  // invert intensity
-  }
-  return new_color;
-}
-
-#else
-
-// Returns the ANSI color code for the given color. GTestColor::kDefault is
-// an invalid input.
-static const char* GetAnsiColorCode(GTestColor color) {
-  switch (color) {
-    case GTestColor::kRed:
-      return "1";
-    case GTestColor::kGreen:
-      return "2";
-    case GTestColor::kYellow:
-      return "3";
-    default:
-      return nullptr;
-  }
-}
-
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-
-// Returns true if and only if Google Test should use colors in the output.
-bool ShouldUseColor(bool stdout_is_tty) {
-  const char* const gtest_color = GTEST_FLAG(color).c_str();
-
-  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
-    // On Windows the TERM variable is usually not set, but the
-    // console there does support colors.
-    return stdout_is_tty;
-#else
-    // On non-Windows platforms, we rely on the TERM variable.
-    const char* const term = posix::GetEnv("TERM");
-    const bool term_supports_color =
-        String::CStringEquals(term, "xterm") ||
-        String::CStringEquals(term, "xterm-color") ||
-        String::CStringEquals(term, "xterm-256color") ||
-        String::CStringEquals(term, "screen") ||
-        String::CStringEquals(term, "screen-256color") ||
-        String::CStringEquals(term, "tmux") ||
-        String::CStringEquals(term, "tmux-256color") ||
-        String::CStringEquals(term, "rxvt-unicode") ||
-        String::CStringEquals(term, "rxvt-unicode-256color") ||
-        String::CStringEquals(term, "linux") ||
-        String::CStringEquals(term, "cygwin");
-    return stdout_is_tty && term_supports_color;
-#endif  // GTEST_OS_WINDOWS
-  }
-
-  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
-      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
-      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
-      String::CStringEquals(gtest_color, "1");
-  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
-  // value is neither one of these nor "auto", we treat it as "no" to
-  // be conservative.
-}
-
-// Helpers for printing colored strings to stdout. Note that on Windows, we
-// cannot simply emit special characters and have the terminal change colors.
-// This routine must actually emit the characters rather than return a string
-// that would be colored when printed, as can be done on Linux.
-
-GTEST_ATTRIBUTE_PRINTF_(2, 3)
-static void ColoredPrintf(GTestColor color, const char *fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
-    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
-  const bool use_color = AlwaysFalse();
-#else
-  static const bool in_color_mode =
-      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
-  const bool use_color = in_color_mode && (color != GTestColor::kDefault);
-#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS
-
-  if (!use_color) {
-    vprintf(fmt, args);
-    va_end(args);
-    return;
-  }
-
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
-    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
-  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
-  // Gets the current text color.
-  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
-  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
-  const WORD old_color_attrs = buffer_info.wAttributes;
-  const WORD new_color = GetNewColor(color, old_color_attrs);
-
-  // We need to flush the stream buffers into the console before each
-  // SetConsoleTextAttribute call lest it affect the text that is already
-  // printed but has not yet reached the console.
-  fflush(stdout);
-  SetConsoleTextAttribute(stdout_handle, new_color);
-
-  vprintf(fmt, args);
-
-  fflush(stdout);
-  // Restores the text color.
-  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
-#else
-  printf("\033[0;3%sm", GetAnsiColorCode(color));
-  vprintf(fmt, args);
-  printf("\033[m");  // Resets the terminal to default.
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-  va_end(args);
-}
-
-// Text printed in Google Test's text output and --gtest_list_tests
-// output to label the type parameter and value parameter for a test.
-static const char kTypeParamLabel[] = "TypeParam";
-static const char kValueParamLabel[] = "GetParam()";
-
-static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
-  const char* const type_param = test_info.type_param();
-  const char* const value_param = test_info.value_param();
-
-  if (type_param != nullptr || value_param != nullptr) {
-    printf(", where ");
-    if (type_param != nullptr) {
-      printf("%s = %s", kTypeParamLabel, type_param);
-      if (value_param != nullptr) printf(" and ");
-    }
-    if (value_param != nullptr) {
-      printf("%s = %s", kValueParamLabel, value_param);
-    }
-  }
-}
-
-// This class implements the TestEventListener interface.
-//
-// Class PrettyUnitTestResultPrinter is copyable.
-class PrettyUnitTestResultPrinter : public TestEventListener {
- public:
-  PrettyUnitTestResultPrinter() {}
-  static void PrintTestName(const char* test_suite, const char* test) {
-    printf("%s.%s", test_suite, test);
-  }
-
-  // The following methods override what's in the TestEventListener class.
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& test_case) override;
-#else
-  void OnTestSuiteStart(const TestSuite& test_suite) override;
-#endif  // OnTestCaseStart
-
-  void OnTestStart(const TestInfo& test_info) override;
-
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& test_case) override;
-#else
-  void OnTestSuiteEnd(const TestSuite& test_suite) override;
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-
- private:
-  static void PrintFailedTests(const UnitTest& unit_test);
-  static void PrintFailedTestSuites(const UnitTest& unit_test);
-  static void PrintSkippedTests(const UnitTest& unit_test);
-};
-
-  // Fired before each iteration of tests starts.
-void PrettyUnitTestResultPrinter::OnTestIterationStart(
-    const UnitTest& unit_test, int iteration) {
-  if (GTEST_FLAG(repeat) != 1)
-    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
-
-  const char* const filter = GTEST_FLAG(filter).c_str();
-
-  // Prints the filter if it's not *.  This reminds the user that some
-  // tests may be skipped.
-  if (!String::CStringEquals(filter, kUniversalFilter)) {
-    ColoredPrintf(GTestColor::kYellow, "Note: %s filter = %s\n", GTEST_NAME_,
-                  filter);
-  }
-
-  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
-    const int32_t shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
-    ColoredPrintf(GTestColor::kYellow, "Note: This is test shard %d of %s.\n",
-                  static_cast<int>(shard_index) + 1,
-                  internal::posix::GetEnv(kTestTotalShards));
-  }
-
-  if (GTEST_FLAG(shuffle)) {
-    ColoredPrintf(GTestColor::kYellow,
-                  "Note: Randomizing tests' orders with a seed of %d .\n",
-                  unit_test.random_seed());
-  }
-
-  ColoredPrintf(GTestColor::kGreen, "[==========] ");
-  printf("Running %s from %s.\n",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
-    const UnitTest& /*unit_test*/) {
-  ColoredPrintf(GTestColor::kGreen, "[----------] ");
-  printf("Global test environment set-up.\n");
-  fflush(stdout);
-}
-
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
-  const std::string counts =
-      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
-  ColoredPrintf(GTestColor::kGreen, "[----------] ");
-  printf("%s from %s", counts.c_str(), test_case.name());
-  if (test_case.type_param() == nullptr) {
-    printf("\n");
-  } else {
-    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
-  }
-  fflush(stdout);
-}
-#else
-void PrettyUnitTestResultPrinter::OnTestSuiteStart(
-    const TestSuite& test_suite) {
-  const std::string counts =
-      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
-  ColoredPrintf(GTestColor::kGreen, "[----------] ");
-  printf("%s from %s", counts.c_str(), test_suite.name());
-  if (test_suite.type_param() == nullptr) {
-    printf("\n");
-  } else {
-    printf(", where %s = %s\n", kTypeParamLabel, test_suite.type_param());
-  }
-  fflush(stdout);
-}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
-  ColoredPrintf(GTestColor::kGreen, "[ RUN      ] ");
-  PrintTestName(test_info.test_suite_name(), test_info.name());
-  printf("\n");
-  fflush(stdout);
-}
-
-// Called after an assertion failure.
-void PrettyUnitTestResultPrinter::OnTestPartResult(
-    const TestPartResult& result) {
-  switch (result.type()) {
-    // If the test part succeeded, we don't need to do anything.
-    case TestPartResult::kSuccess:
-      return;
-    default:
-      // Print failure message from the assertion
-      // (e.g. expected this and got that).
-      PrintTestPartResult(result);
-      fflush(stdout);
-  }
-}
-
-void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
-  if (test_info.result()->Passed()) {
-    ColoredPrintf(GTestColor::kGreen, "[       OK ] ");
-  } else if (test_info.result()->Skipped()) {
-    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
-  } else {
-    ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
-  }
-  PrintTestName(test_info.test_suite_name(), test_info.name());
-  if (test_info.result()->Failed())
-    PrintFullTestCommentIfPresent(test_info);
-
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms)\n", internal::StreamableToString(
-           test_info.result()->elapsed_time()).c_str());
-  } else {
-    printf("\n");
-  }
-  fflush(stdout);
-}
-
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
-  if (!GTEST_FLAG(print_time)) return;
-
-  const std::string counts =
-      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
-  ColoredPrintf(GTestColor::kGreen, "[----------] ");
-  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_case.name(),
-         internal::StreamableToString(test_case.elapsed_time()).c_str());
-  fflush(stdout);
-}
-#else
-void PrettyUnitTestResultPrinter::OnTestSuiteEnd(const TestSuite& test_suite) {
-  if (!GTEST_FLAG(print_time)) return;
-
-  const std::string counts =
-      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
-  ColoredPrintf(GTestColor::kGreen, "[----------] ");
-  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_suite.name(),
-         internal::StreamableToString(test_suite.elapsed_time()).c_str());
-  fflush(stdout);
-}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
-    const UnitTest& /*unit_test*/) {
-  ColoredPrintf(GTestColor::kGreen, "[----------] ");
-  printf("Global test environment tear-down\n");
-  fflush(stdout);
-}
-
-// Internal helper for printing the list of failed tests.
-void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
-  const int failed_test_count = unit_test.failed_test_count();
-  ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
-  printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run() || (test_suite.failed_test_count() == 0)) {
-      continue;
-    }
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      if (!test_info.should_run() || !test_info.result()->Failed()) {
-        continue;
-      }
-      ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
-      printf("%s.%s", test_suite.name(), test_info.name());
-      PrintFullTestCommentIfPresent(test_info);
-      printf("\n");
-    }
-  }
-  printf("\n%2d FAILED %s\n", failed_test_count,
-         failed_test_count == 1 ? "TEST" : "TESTS");
-}
-
-// Internal helper for printing the list of test suite failures not covered by
-// PrintFailedTests.
-void PrettyUnitTestResultPrinter::PrintFailedTestSuites(
-    const UnitTest& unit_test) {
-  int suite_failure_count = 0;
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run()) {
-      continue;
-    }
-    if (test_suite.ad_hoc_test_result().Failed()) {
-      ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
-      printf("%s: SetUpTestSuite or TearDownTestSuite\n", test_suite.name());
-      ++suite_failure_count;
-    }
-  }
-  if (suite_failure_count > 0) {
-    printf("\n%2d FAILED TEST %s\n", suite_failure_count,
-           suite_failure_count == 1 ? "SUITE" : "SUITES");
-  }
-}
-
-// Internal helper for printing the list of skipped tests.
-void PrettyUnitTestResultPrinter::PrintSkippedTests(const UnitTest& unit_test) {
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count == 0) {
-    return;
-  }
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run() || (test_suite.skipped_test_count() == 0)) {
-      continue;
-    }
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      if (!test_info.should_run() || !test_info.result()->Skipped()) {
-        continue;
-      }
-      ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
-      printf("%s.%s", test_suite.name(), test_info.name());
-      printf("\n");
-    }
-  }
-}
-
-void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                     int /*iteration*/) {
-  ColoredPrintf(GTestColor::kGreen, "[==========] ");
-  printf("%s from %s ran.",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms total)",
-           internal::StreamableToString(unit_test.elapsed_time()).c_str());
-  }
-  printf("\n");
-  ColoredPrintf(GTestColor::kGreen, "[  PASSED  ] ");
-  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
-
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count > 0) {
-    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
-    printf("%s, listed below:\n", FormatTestCount(skipped_test_count).c_str());
-    PrintSkippedTests(unit_test);
-  }
-
-  if (!unit_test.Passed()) {
-    PrintFailedTests(unit_test);
-    PrintFailedTestSuites(unit_test);
-  }
-
-  int num_disabled = unit_test.reportable_disabled_test_count();
-  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
-    if (unit_test.Passed()) {
-      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
-    }
-    ColoredPrintf(GTestColor::kYellow, "  YOU HAVE %d DISABLED %s\n\n",
-                  num_disabled, num_disabled == 1 ? "TEST" : "TESTS");
-  }
-  // Ensure that Google Test output is printed before, e.g., heapchecker output.
-  fflush(stdout);
-}
-
-// End PrettyUnitTestResultPrinter
-
-// This class implements the TestEventListener interface.
-//
-// Class BriefUnitTestResultPrinter is copyable.
-class BriefUnitTestResultPrinter : public TestEventListener {
- public:
-  BriefUnitTestResultPrinter() {}
-  static void PrintTestName(const char* test_suite, const char* test) {
-    printf("%s.%s", test_suite, test);
-  }
-
-  // The following methods override what's in the TestEventListener class.
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& /*unit_test*/,
-                            int /*iteration*/) override {}
-  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
-#else
-  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
-#endif  // OnTestCaseStart
-
-  void OnTestStart(const TestInfo& /*test_info*/) override {}
-
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
-#else
-  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-};
-
-// Called after an assertion failure.
-void BriefUnitTestResultPrinter::OnTestPartResult(
-    const TestPartResult& result) {
-  switch (result.type()) {
-    // If the test part succeeded, we don't need to do anything.
-    case TestPartResult::kSuccess:
-      return;
-    default:
-      // Print failure message from the assertion
-      // (e.g. expected this and got that).
-      PrintTestPartResult(result);
-      fflush(stdout);
-  }
-}
-
-void BriefUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
-  if (test_info.result()->Failed()) {
-    ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
-    PrintTestName(test_info.test_suite_name(), test_info.name());
-    PrintFullTestCommentIfPresent(test_info);
-
-    if (GTEST_FLAG(print_time)) {
-      printf(" (%s ms)\n",
-             internal::StreamableToString(test_info.result()->elapsed_time())
-                 .c_str());
-    } else {
-      printf("\n");
-    }
-    fflush(stdout);
-  }
-}
-
-void BriefUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                    int /*iteration*/) {
-  ColoredPrintf(GTestColor::kGreen, "[==========] ");
-  printf("%s from %s ran.",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms total)",
-           internal::StreamableToString(unit_test.elapsed_time()).c_str());
-  }
-  printf("\n");
-  ColoredPrintf(GTestColor::kGreen, "[  PASSED  ] ");
-  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
-
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count > 0) {
-    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
-    printf("%s.\n", FormatTestCount(skipped_test_count).c_str());
-  }
-
-  int num_disabled = unit_test.reportable_disabled_test_count();
-  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
-    if (unit_test.Passed()) {
-      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
-    }
-    ColoredPrintf(GTestColor::kYellow, "  YOU HAVE %d DISABLED %s\n\n",
-                  num_disabled, num_disabled == 1 ? "TEST" : "TESTS");
-  }
-  // Ensure that Google Test output is printed before, e.g., heapchecker output.
-  fflush(stdout);
-}
-
-// End BriefUnitTestResultPrinter
-
-// class TestEventRepeater
-//
-// This class forwards events to other event listeners.
-class TestEventRepeater : public TestEventListener {
- public:
-  TestEventRepeater() : forwarding_enabled_(true) {}
-  ~TestEventRepeater() override;
-  void Append(TestEventListener *listener);
-  TestEventListener* Release(TestEventListener* listener);
-
-  // Controls whether events will be forwarded to listeners_. Set to false
-  // in death test child processes.
-  bool forwarding_enabled() const { return forwarding_enabled_; }
-  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
-
-  void OnTestProgramStart(const UnitTest& unit_test) override;
-  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) override;
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestSuite& parameter) override;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestSuiteStart(const TestSuite& parameter) override;
-  void OnTestStart(const TestInfo& test_info) override;
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& parameter) override;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestSuiteEnd(const TestSuite& parameter) override;
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) override;
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& unit_test) override;
-
- private:
-  // Controls whether events will be forwarded to listeners_. Set to false
-  // in death test child processes.
-  bool forwarding_enabled_;
-  // The list of listeners that receive events.
-  std::vector<TestEventListener*> listeners_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
-};
-
-TestEventRepeater::~TestEventRepeater() {
-  ForEach(listeners_, Delete<TestEventListener>);
-}
-
-void TestEventRepeater::Append(TestEventListener *listener) {
-  listeners_.push_back(listener);
-}
-
-TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
-  for (size_t i = 0; i < listeners_.size(); ++i) {
-    if (listeners_[i] == listener) {
-      listeners_.erase(listeners_.begin() + static_cast<int>(i));
-      return listener;
-    }
-  }
-
-  return nullptr;
-}
-
-// Since most methods are very similar, use macros to reduce boilerplate.
-// This defines a member that forwards the call to all listeners.
-#define GTEST_REPEATER_METHOD_(Name, Type) \
-void TestEventRepeater::Name(const Type& parameter) { \
-  if (forwarding_enabled_) { \
-    for (size_t i = 0; i < listeners_.size(); i++) { \
-      listeners_[i]->Name(parameter); \
-    } \
-  } \
-}
-// This defines a member that forwards the call to all listeners in reverse
-// order.
-#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type)      \
-  void TestEventRepeater::Name(const Type& parameter) { \
-    if (forwarding_enabled_) {                          \
-      for (size_t i = listeners_.size(); i != 0; i--) { \
-        listeners_[i - 1]->Name(parameter);             \
-      }                                                 \
-    }                                                   \
-  }
-
-GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
-GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REPEATER_METHOD_(OnTestCaseStart, TestSuite)
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REPEATER_METHOD_(OnTestSuiteStart, TestSuite)
-GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
-GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
-GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestSuite)
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REVERSE_REPEATER_METHOD_(OnTestSuiteEnd, TestSuite)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
-
-#undef GTEST_REPEATER_METHOD_
-#undef GTEST_REVERSE_REPEATER_METHOD_
-
-void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
-                                             int iteration) {
-  if (forwarding_enabled_) {
-    for (size_t i = 0; i < listeners_.size(); i++) {
-      listeners_[i]->OnTestIterationStart(unit_test, iteration);
-    }
-  }
-}
-
-void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
-                                           int iteration) {
-  if (forwarding_enabled_) {
-    for (size_t i = listeners_.size(); i > 0; i--) {
-      listeners_[i - 1]->OnTestIterationEnd(unit_test, iteration);
-    }
-  }
-}
-
-// End TestEventRepeater
-
-// This class generates an XML output file.
-class XmlUnitTestResultPrinter : public EmptyTestEventListener {
- public:
-  explicit XmlUnitTestResultPrinter(const char* output_file);
-
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void ListTestsMatchingFilter(const std::vector<TestSuite*>& test_suites);
-
-  // Prints an XML summary of all unit tests.
-  static void PrintXmlTestsList(std::ostream* stream,
-                                const std::vector<TestSuite*>& test_suites);
-
- private:
-  // Is c a whitespace character that is normalized to a space character
-  // when it appears in an XML attribute value?
-  static bool IsNormalizableWhitespace(char c) {
-    return c == 0x9 || c == 0xA || c == 0xD;
-  }
-
-  // May c appear in a well-formed XML document?
-  static bool IsValidXmlCharacter(char c) {
-    return IsNormalizableWhitespace(c) || c >= 0x20;
-  }
-
-  // Returns an XML-escaped copy of the input string str.  If
-  // is_attribute is true, the text is meant to appear as an attribute
-  // value, and normalizable whitespace is preserved by replacing it
-  // with character references.
-  static std::string EscapeXml(const std::string& str, bool is_attribute);
-
-  // Returns the given string with all characters invalid in XML removed.
-  static std::string RemoveInvalidXmlCharacters(const std::string& str);
-
-  // Convenience wrapper around EscapeXml when str is an attribute value.
-  static std::string EscapeXmlAttribute(const std::string& str) {
-    return EscapeXml(str, true);
-  }
-
-  // Convenience wrapper around EscapeXml when str is not an attribute value.
-  static std::string EscapeXmlText(const char* str) {
-    return EscapeXml(str, false);
-  }
-
-  // Verifies that the given attribute belongs to the given element and
-  // streams the attribute as XML.
-  static void OutputXmlAttribute(std::ostream* stream,
-                                 const std::string& element_name,
-                                 const std::string& name,
-                                 const std::string& value);
-
-  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
-
-  // Streams a test suite XML stanza containing the given test result.
-  //
-  // Requires: result.Failed()
-  static void OutputXmlTestSuiteForTestResult(::std::ostream* stream,
-                                              const TestResult& result);
-
-  // Streams an XML representation of a TestResult object.
-  static void OutputXmlTestResult(::std::ostream* stream,
-                                  const TestResult& result);
-
-  // Streams an XML representation of a TestInfo object.
-  static void OutputXmlTestInfo(::std::ostream* stream,
-                                const char* test_suite_name,
-                                const TestInfo& test_info);
-
-  // Prints an XML representation of a TestSuite object
-  static void PrintXmlTestSuite(::std::ostream* stream,
-                                const TestSuite& test_suite);
-
-  // Prints an XML summary of unit_test to output stream out.
-  static void PrintXmlUnitTest(::std::ostream* stream,
-                               const UnitTest& unit_test);
-
-  // Produces a string representing the test properties in a result as space
-  // delimited XML attributes based on the property key="value" pairs.
-  // When the std::string is not empty, it includes a space at the beginning,
-  // to delimit this attribute from prior attributes.
-  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
-
-  // Streams an XML representation of the test properties of a TestResult
-  // object.
-  static void OutputXmlTestProperties(std::ostream* stream,
-                                      const TestResult& result);
-
-  // The output file.
-  const std::string output_file_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
-};
-
-// Creates a new XmlUnitTestResultPrinter.
-XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
-    : output_file_(output_file) {
-  if (output_file_.empty()) {
-    GTEST_LOG_(FATAL) << "XML output file may not be null";
-  }
-}
-
-// Called after the unit test ends.
-void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                  int /*iteration*/) {
-  FILE* xmlout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintXmlUnitTest(&stream, unit_test);
-  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
-  fclose(xmlout);
-}
-
-void XmlUnitTestResultPrinter::ListTestsMatchingFilter(
-    const std::vector<TestSuite*>& test_suites) {
-  FILE* xmlout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintXmlTestsList(&stream, test_suites);
-  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
-  fclose(xmlout);
-}
-
-// Returns an XML-escaped copy of the input string str.  If is_attribute
-// is true, the text is meant to appear as an attribute value, and
-// normalizable whitespace is preserved by replacing it with character
-// references.
-//
-// Invalid XML characters in str, if any, are stripped from the output.
-// It is expected that most, if not all, of the text processed by this
-// module will consist of ordinary English text.
-// If this module is ever modified to produce version 1.1 XML output,
-// most invalid characters can be retained using character references.
-std::string XmlUnitTestResultPrinter::EscapeXml(
-    const std::string& str, bool is_attribute) {
-  Message m;
-
-  for (size_t i = 0; i < str.size(); ++i) {
-    const char ch = str[i];
-    switch (ch) {
-      case '<':
-        m << "&lt;";
-        break;
-      case '>':
-        m << "&gt;";
-        break;
-      case '&':
-        m << "&amp;";
-        break;
-      case '\'':
-        if (is_attribute)
-          m << "&apos;";
-        else
-          m << '\'';
-        break;
-      case '"':
-        if (is_attribute)
-          m << "&quot;";
-        else
-          m << '"';
-        break;
-      default:
-        if (IsValidXmlCharacter(ch)) {
-          if (is_attribute && IsNormalizableWhitespace(ch))
-            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
-              << ";";
-          else
-            m << ch;
-        }
-        break;
-    }
-  }
-
-  return m.GetString();
-}
-
-// Returns the given string with all characters invalid in XML removed.
-// Currently invalid characters are dropped from the string. An
-// alternative is to replace them with certain characters such as . or ?.
-std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
-    const std::string& str) {
-  std::string output;
-  output.reserve(str.size());
-  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
-    if (IsValidXmlCharacter(*it))
-      output.push_back(*it);
-
-  return output;
-}
-
-// The following routines generate an XML representation of a UnitTest
-// object.
-// GOOGLETEST_CM0009 DO NOT DELETE
-//
-// This is how Google Test concepts map to the DTD:
-//
-// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
-//   <testsuite name="testcase-name">  <-- corresponds to a TestSuite object
-//     <testcase name="test-name">     <-- corresponds to a TestInfo object
-//       <failure message="...">...</failure>
-//       <failure message="...">...</failure>
-//       <failure message="...">...</failure>
-//                                     <-- individual assertion failures
-//     </testcase>
-//   </testsuite>
-// </testsuites>
-
-// Formats the given time in milliseconds as seconds.
-std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
-  ::std::stringstream ss;
-  ss << (static_cast<double>(ms) * 1e-3);
-  return ss.str();
-}
-
-static bool PortableLocaltime(time_t seconds, struct tm* out) {
-#if defined(_MSC_VER)
-  return localtime_s(out, &seconds) == 0;
-#elif defined(__MINGW32__) || defined(__MINGW64__)
-  // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
-  // Windows' localtime(), which has a thread-local tm buffer.
-  struct tm* tm_ptr = localtime(&seconds);  // NOLINT
-  if (tm_ptr == nullptr) return false;
-  *out = *tm_ptr;
-  return true;
-#elif defined(__STDC_LIB_EXT1__)
-  // Uses localtime_s when available as localtime_r is only available from
-  // C23 standard.
-  return localtime_s(&seconds, out) != nullptr;
-#else
-  return localtime_r(&seconds, out) != nullptr;
-#endif
-}
-
-// Converts the given epoch time in milliseconds to a date string in the ISO
-// 8601 format, without the timezone information.
-std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
-  struct tm time_struct;
-  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
-    return "";
-  // YYYY-MM-DDThh:mm:ss.sss
-  return StreamableToString(time_struct.tm_year + 1900) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
-      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
-      String::FormatIntWidth2(time_struct.tm_min) + ":" +
-      String::FormatIntWidth2(time_struct.tm_sec) + "." +
-      String::FormatIntWidthN(static_cast<int>(ms % 1000), 3);
-}
-
-// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
-                                                     const char* data) {
-  const char* segment = data;
-  *stream << "<![CDATA[";
-  for (;;) {
-    const char* const next_segment = strstr(segment, "]]>");
-    if (next_segment != nullptr) {
-      stream->write(
-          segment, static_cast<std::streamsize>(next_segment - segment));
-      *stream << "]]>]]&gt;<![CDATA[";
-      segment = next_segment + strlen("]]>");
-    } else {
-      *stream << segment;
-      break;
-    }
-  }
-  *stream << "]]>";
-}
-
-void XmlUnitTestResultPrinter::OutputXmlAttribute(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    const std::string& value) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Attribute " << name << " is not allowed for element <" << element_name
-      << ">.";
-
-  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
-}
-
-// Streams a test suite XML stanza containing the given test result.
-void XmlUnitTestResultPrinter::OutputXmlTestSuiteForTestResult(
-    ::std::ostream* stream, const TestResult& result) {
-  // Output the boilerplate for a minimal test suite with one test.
-  *stream << "  <testsuite";
-  OutputXmlAttribute(stream, "testsuite", "name", "NonTestSuiteFailure");
-  OutputXmlAttribute(stream, "testsuite", "tests", "1");
-  OutputXmlAttribute(stream, "testsuite", "failures", "1");
-  OutputXmlAttribute(stream, "testsuite", "disabled", "0");
-  OutputXmlAttribute(stream, "testsuite", "skipped", "0");
-  OutputXmlAttribute(stream, "testsuite", "errors", "0");
-  OutputXmlAttribute(stream, "testsuite", "time",
-                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
-  OutputXmlAttribute(
-      stream, "testsuite", "timestamp",
-      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
-  *stream << ">";
-
-  // Output the boilerplate for a minimal test case with a single test.
-  *stream << "    <testcase";
-  OutputXmlAttribute(stream, "testcase", "name", "");
-  OutputXmlAttribute(stream, "testcase", "status", "run");
-  OutputXmlAttribute(stream, "testcase", "result", "completed");
-  OutputXmlAttribute(stream, "testcase", "classname", "");
-  OutputXmlAttribute(stream, "testcase", "time",
-                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
-  OutputXmlAttribute(
-      stream, "testcase", "timestamp",
-      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
-
-  // Output the actual test result.
-  OutputXmlTestResult(stream, result);
-
-  // Complete the test suite.
-  *stream << "  </testsuite>\n";
-}
-
-// Prints an XML representation of a TestInfo object.
-void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
-                                                 const char* test_suite_name,
-                                                 const TestInfo& test_info) {
-  const TestResult& result = *test_info.result();
-  const std::string kTestsuite = "testcase";
-
-  if (test_info.is_in_another_shard()) {
-    return;
-  }
-
-  *stream << "    <testcase";
-  OutputXmlAttribute(stream, kTestsuite, "name", test_info.name());
-
-  if (test_info.value_param() != nullptr) {
-    OutputXmlAttribute(stream, kTestsuite, "value_param",
-                       test_info.value_param());
-  }
-  if (test_info.type_param() != nullptr) {
-    OutputXmlAttribute(stream, kTestsuite, "type_param",
-                       test_info.type_param());
-  }
-  if (GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
-    OutputXmlAttribute(stream, kTestsuite, "line",
-                       StreamableToString(test_info.line()));
-    *stream << " />\n";
-    return;
-  }
-
-  OutputXmlAttribute(stream, kTestsuite, "status",
-                     test_info.should_run() ? "run" : "notrun");
-  OutputXmlAttribute(stream, kTestsuite, "result",
-                     test_info.should_run()
-                         ? (result.Skipped() ? "skipped" : "completed")
-                         : "suppressed");
-  OutputXmlAttribute(stream, kTestsuite, "time",
-                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
-  OutputXmlAttribute(
-      stream, kTestsuite, "timestamp",
-      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
-  OutputXmlAttribute(stream, kTestsuite, "classname", test_suite_name);
-
-  OutputXmlTestResult(stream, result);
-}
-
-void XmlUnitTestResultPrinter::OutputXmlTestResult(::std::ostream* stream,
-                                                   const TestResult& result) {
-  int failures = 0;
-  int skips = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      if (++failures == 1 && skips == 0) {
-        *stream << ">\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string summary = location + "\n" + part.summary();
-      *stream << "      <failure message=\""
-              << EscapeXmlAttribute(summary)
-              << "\" type=\"\">";
-      const std::string detail = location + "\n" + part.message();
-      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
-      *stream << "</failure>\n";
-    } else if (part.skipped()) {
-      if (++skips == 1 && failures == 0) {
-        *stream << ">\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string summary = location + "\n" + part.summary();
-      *stream << "      <skipped message=\""
-              << EscapeXmlAttribute(summary.c_str()) << "\">";
-      const std::string detail = location + "\n" + part.message();
-      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
-      *stream << "</skipped>\n";
-    }
-  }
-
-  if (failures == 0 && skips == 0 && result.test_property_count() == 0) {
-    *stream << " />\n";
-  } else {
-    if (failures == 0 && skips == 0) {
-      *stream << ">\n";
-    }
-    OutputXmlTestProperties(stream, result);
-    *stream << "    </testcase>\n";
-  }
-}
-
-// Prints an XML representation of a TestSuite object
-void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
-                                                 const TestSuite& test_suite) {
-  const std::string kTestsuite = "testsuite";
-  *stream << "  <" << kTestsuite;
-  OutputXmlAttribute(stream, kTestsuite, "name", test_suite.name());
-  OutputXmlAttribute(stream, kTestsuite, "tests",
-                     StreamableToString(test_suite.reportable_test_count()));
-  if (!GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "failures",
-                       StreamableToString(test_suite.failed_test_count()));
-    OutputXmlAttribute(
-        stream, kTestsuite, "disabled",
-        StreamableToString(test_suite.reportable_disabled_test_count()));
-    OutputXmlAttribute(stream, kTestsuite, "skipped",
-                       StreamableToString(test_suite.skipped_test_count()));
-
-    OutputXmlAttribute(stream, kTestsuite, "errors", "0");
-
-    OutputXmlAttribute(stream, kTestsuite, "time",
-                       FormatTimeInMillisAsSeconds(test_suite.elapsed_time()));
-    OutputXmlAttribute(
-        stream, kTestsuite, "timestamp",
-        FormatEpochTimeInMillisAsIso8601(test_suite.start_timestamp()));
-    *stream << TestPropertiesAsXmlAttributes(test_suite.ad_hoc_test_result());
-  }
-  *stream << ">\n";
-  for (int i = 0; i < test_suite.total_test_count(); ++i) {
-    if (test_suite.GetTestInfo(i)->is_reportable())
-      OutputXmlTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
-  }
-  *stream << "  </" << kTestsuite << ">\n";
-}
-
-// Prints an XML summary of unit_test to output stream out.
-void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
-                                                const UnitTest& unit_test) {
-  const std::string kTestsuites = "testsuites";
-
-  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-  *stream << "<" << kTestsuites;
-
-  OutputXmlAttribute(stream, kTestsuites, "tests",
-                     StreamableToString(unit_test.reportable_test_count()));
-  OutputXmlAttribute(stream, kTestsuites, "failures",
-                     StreamableToString(unit_test.failed_test_count()));
-  OutputXmlAttribute(
-      stream, kTestsuites, "disabled",
-      StreamableToString(unit_test.reportable_disabled_test_count()));
-  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
-  OutputXmlAttribute(stream, kTestsuites, "time",
-                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
-  OutputXmlAttribute(
-      stream, kTestsuites, "timestamp",
-      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
-
-  if (GTEST_FLAG(shuffle)) {
-    OutputXmlAttribute(stream, kTestsuites, "random_seed",
-                       StreamableToString(unit_test.random_seed()));
-  }
-  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
-
-  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
-  *stream << ">\n";
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0)
-      PrintXmlTestSuite(stream, *unit_test.GetTestSuite(i));
-  }
-
-  // If there was a test failure outside of one of the test suites (like in a
-  // test environment) include that in the output.
-  if (unit_test.ad_hoc_test_result().Failed()) {
-    OutputXmlTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
-  }
-
-  *stream << "</" << kTestsuites << ">\n";
-}
-
-void XmlUnitTestResultPrinter::PrintXmlTestsList(
-    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
-  const std::string kTestsuites = "testsuites";
-
-  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-  *stream << "<" << kTestsuites;
-
-  int total_tests = 0;
-  for (auto test_suite : test_suites) {
-    total_tests += test_suite->total_test_count();
-  }
-  OutputXmlAttribute(stream, kTestsuites, "tests",
-                     StreamableToString(total_tests));
-  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
-  *stream << ">\n";
-
-  for (auto test_suite : test_suites) {
-    PrintXmlTestSuite(stream, *test_suite);
-  }
-  *stream << "</" << kTestsuites << ">\n";
-}
-
-// Produces a string representing the test properties in a result as space
-// delimited XML attributes based on the property key="value" pairs.
-std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
-    const TestResult& result) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << " " << property.key() << "="
-        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
-void XmlUnitTestResultPrinter::OutputXmlTestProperties(
-    std::ostream* stream, const TestResult& result) {
-  const std::string kProperties = "properties";
-  const std::string kProperty = "property";
-
-  if (result.test_property_count() <= 0) {
-    return;
-  }
-
-  *stream << "<" << kProperties << ">\n";
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    *stream << "<" << kProperty;
-    *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
-    *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
-    *stream << "/>\n";
-  }
-  *stream << "</" << kProperties << ">\n";
-}
-
-// End XmlUnitTestResultPrinter
-
-// This class generates an JSON output file.
-class JsonUnitTestResultPrinter : public EmptyTestEventListener {
- public:
-  explicit JsonUnitTestResultPrinter(const char* output_file);
-
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-
-  // Prints an JSON summary of all unit tests.
-  static void PrintJsonTestList(::std::ostream* stream,
-                                const std::vector<TestSuite*>& test_suites);
-
- private:
-  // Returns an JSON-escaped copy of the input string str.
-  static std::string EscapeJson(const std::string& str);
-
-  //// Verifies that the given attribute belongs to the given element and
-  //// streams the attribute as JSON.
-  static void OutputJsonKey(std::ostream* stream,
-                            const std::string& element_name,
-                            const std::string& name,
-                            const std::string& value,
-                            const std::string& indent,
-                            bool comma = true);
-  static void OutputJsonKey(std::ostream* stream,
-                            const std::string& element_name,
-                            const std::string& name,
-                            int value,
-                            const std::string& indent,
-                            bool comma = true);
-
-  // Streams a test suite JSON stanza containing the given test result.
-  //
-  // Requires: result.Failed()
-  static void OutputJsonTestSuiteForTestResult(::std::ostream* stream,
-                                               const TestResult& result);
-
-  // Streams a JSON representation of a TestResult object.
-  static void OutputJsonTestResult(::std::ostream* stream,
-                                   const TestResult& result);
-
-  // Streams a JSON representation of a TestInfo object.
-  static void OutputJsonTestInfo(::std::ostream* stream,
-                                 const char* test_suite_name,
-                                 const TestInfo& test_info);
-
-  // Prints a JSON representation of a TestSuite object
-  static void PrintJsonTestSuite(::std::ostream* stream,
-                                 const TestSuite& test_suite);
-
-  // Prints a JSON summary of unit_test to output stream out.
-  static void PrintJsonUnitTest(::std::ostream* stream,
-                                const UnitTest& unit_test);
-
-  // Produces a string representing the test properties in a result as
-  // a JSON dictionary.
-  static std::string TestPropertiesAsJson(const TestResult& result,
-                                          const std::string& indent);
-
-  // The output file.
-  const std::string output_file_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
-};
-
-// Creates a new JsonUnitTestResultPrinter.
-JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file)
-    : output_file_(output_file) {
-  if (output_file_.empty()) {
-    GTEST_LOG_(FATAL) << "JSON output file may not be null";
-  }
-}
-
-void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                  int /*iteration*/) {
-  FILE* jsonout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintJsonUnitTest(&stream, unit_test);
-  fprintf(jsonout, "%s", StringStreamToString(&stream).c_str());
-  fclose(jsonout);
-}
-
-// Returns an JSON-escaped copy of the input string str.
-std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) {
-  Message m;
-
-  for (size_t i = 0; i < str.size(); ++i) {
-    const char ch = str[i];
-    switch (ch) {
-      case '\\':
-      case '"':
-      case '/':
-        m << '\\' << ch;
-        break;
-      case '\b':
-        m << "\\b";
-        break;
-      case '\t':
-        m << "\\t";
-        break;
-      case '\n':
-        m << "\\n";
-        break;
-      case '\f':
-        m << "\\f";
-        break;
-      case '\r':
-        m << "\\r";
-        break;
-      default:
-        if (ch < ' ') {
-          m << "\\u00" << String::FormatByte(static_cast<unsigned char>(ch));
-        } else {
-          m << ch;
-        }
-        break;
-    }
-  }
-
-  return m.GetString();
-}
-
-// The following routines generate an JSON representation of a UnitTest
-// object.
-
-// Formats the given time in milliseconds as seconds.
-static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) {
-  ::std::stringstream ss;
-  ss << (static_cast<double>(ms) * 1e-3) << "s";
-  return ss.str();
-}
-
-// Converts the given epoch time in milliseconds to a date string in the
-// RFC3339 format, without the timezone information.
-static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) {
-  struct tm time_struct;
-  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
-    return "";
-  // YYYY-MM-DDThh:mm:ss
-  return StreamableToString(time_struct.tm_year + 1900) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
-      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
-      String::FormatIntWidth2(time_struct.tm_min) + ":" +
-      String::FormatIntWidth2(time_struct.tm_sec) + "Z";
-}
-
-static inline std::string Indent(size_t width) {
-  return std::string(width, ' ');
-}
-
-void JsonUnitTestResultPrinter::OutputJsonKey(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    const std::string& value,
-    const std::string& indent,
-    bool comma) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Key \"" << name << "\" is not allowed for value \"" << element_name
-      << "\".";
-
-  *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\"";
-  if (comma)
-    *stream << ",\n";
-}
-
-void JsonUnitTestResultPrinter::OutputJsonKey(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    int value,
-    const std::string& indent,
-    bool comma) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Key \"" << name << "\" is not allowed for value \"" << element_name
-      << "\".";
-
-  *stream << indent << "\"" << name << "\": " << StreamableToString(value);
-  if (comma)
-    *stream << ",\n";
-}
-
-// Streams a test suite JSON stanza containing the given test result.
-void JsonUnitTestResultPrinter::OutputJsonTestSuiteForTestResult(
-    ::std::ostream* stream, const TestResult& result) {
-  // Output the boilerplate for a new test suite.
-  *stream << Indent(4) << "{\n";
-  OutputJsonKey(stream, "testsuite", "name", "NonTestSuiteFailure", Indent(6));
-  OutputJsonKey(stream, "testsuite", "tests", 1, Indent(6));
-  if (!GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, "testsuite", "failures", 1, Indent(6));
-    OutputJsonKey(stream, "testsuite", "disabled", 0, Indent(6));
-    OutputJsonKey(stream, "testsuite", "skipped", 0, Indent(6));
-    OutputJsonKey(stream, "testsuite", "errors", 0, Indent(6));
-    OutputJsonKey(stream, "testsuite", "time",
-                  FormatTimeInMillisAsDuration(result.elapsed_time()),
-                  Indent(6));
-    OutputJsonKey(stream, "testsuite", "timestamp",
-                  FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
-                  Indent(6));
-  }
-  *stream << Indent(6) << "\"testsuite\": [\n";
-
-  // Output the boilerplate for a new test case.
-  *stream << Indent(8) << "{\n";
-  OutputJsonKey(stream, "testcase", "name", "", Indent(10));
-  OutputJsonKey(stream, "testcase", "status", "RUN", Indent(10));
-  OutputJsonKey(stream, "testcase", "result", "COMPLETED", Indent(10));
-  OutputJsonKey(stream, "testcase", "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
-                Indent(10));
-  OutputJsonKey(stream, "testcase", "time",
-                FormatTimeInMillisAsDuration(result.elapsed_time()),
-                Indent(10));
-  OutputJsonKey(stream, "testcase", "classname", "", Indent(10), false);
-  *stream << TestPropertiesAsJson(result, Indent(10));
-
-  // Output the actual test result.
-  OutputJsonTestResult(stream, result);
-
-  // Finish the test suite.
-  *stream << "\n" << Indent(6) << "]\n" << Indent(4) << "}";
-}
-
-// Prints a JSON representation of a TestInfo object.
-void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
-                                                   const char* test_suite_name,
-                                                   const TestInfo& test_info) {
-  const TestResult& result = *test_info.result();
-  const std::string kTestsuite = "testcase";
-  const std::string kIndent = Indent(10);
-
-  *stream << Indent(8) << "{\n";
-  OutputJsonKey(stream, kTestsuite, "name", test_info.name(), kIndent);
-
-  if (test_info.value_param() != nullptr) {
-    OutputJsonKey(stream, kTestsuite, "value_param", test_info.value_param(),
-                  kIndent);
-  }
-  if (test_info.type_param() != nullptr) {
-    OutputJsonKey(stream, kTestsuite, "type_param", test_info.type_param(),
-                  kIndent);
-  }
-  if (GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
-    *stream << "\n" << Indent(8) << "}";
-    return;
-  }
-
-  OutputJsonKey(stream, kTestsuite, "status",
-                test_info.should_run() ? "RUN" : "NOTRUN", kIndent);
-  OutputJsonKey(stream, kTestsuite, "result",
-                test_info.should_run()
-                    ? (result.Skipped() ? "SKIPPED" : "COMPLETED")
-                    : "SUPPRESSED",
-                kIndent);
-  OutputJsonKey(stream, kTestsuite, "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
-                kIndent);
-  OutputJsonKey(stream, kTestsuite, "time",
-                FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent);
-  OutputJsonKey(stream, kTestsuite, "classname", test_suite_name, kIndent,
-                false);
-  *stream << TestPropertiesAsJson(result, kIndent);
-
-  OutputJsonTestResult(stream, result);
-}
-
-void JsonUnitTestResultPrinter::OutputJsonTestResult(::std::ostream* stream,
-                                                     const TestResult& result) {
-  const std::string kIndent = Indent(10);
-
-  int failures = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      *stream << ",\n";
-      if (++failures == 1) {
-        *stream << kIndent << "\"" << "failures" << "\": [\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string message = EscapeJson(location + "\n" + part.message());
-      *stream << kIndent << "  {\n"
-              << kIndent << "    \"failure\": \"" << message << "\",\n"
-              << kIndent << "    \"type\": \"\"\n"
-              << kIndent << "  }";
-    }
-  }
-
-  if (failures > 0)
-    *stream << "\n" << kIndent << "]";
-  *stream << "\n" << Indent(8) << "}";
-}
-
-// Prints an JSON representation of a TestSuite object
-void JsonUnitTestResultPrinter::PrintJsonTestSuite(
-    std::ostream* stream, const TestSuite& test_suite) {
-  const std::string kTestsuite = "testsuite";
-  const std::string kIndent = Indent(6);
-
-  *stream << Indent(4) << "{\n";
-  OutputJsonKey(stream, kTestsuite, "name", test_suite.name(), kIndent);
-  OutputJsonKey(stream, kTestsuite, "tests", test_suite.reportable_test_count(),
-                kIndent);
-  if (!GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "failures",
-                  test_suite.failed_test_count(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "disabled",
-                  test_suite.reportable_disabled_test_count(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent);
-    OutputJsonKey(
-        stream, kTestsuite, "timestamp",
-        FormatEpochTimeInMillisAsRFC3339(test_suite.start_timestamp()),
-        kIndent);
-    OutputJsonKey(stream, kTestsuite, "time",
-                  FormatTimeInMillisAsDuration(test_suite.elapsed_time()),
-                  kIndent, false);
-    *stream << TestPropertiesAsJson(test_suite.ad_hoc_test_result(), kIndent)
-            << ",\n";
-  }
-
-  *stream << kIndent << "\"" << kTestsuite << "\": [\n";
-
-  bool comma = false;
-  for (int i = 0; i < test_suite.total_test_count(); ++i) {
-    if (test_suite.GetTestInfo(i)->is_reportable()) {
-      if (comma) {
-        *stream << ",\n";
-      } else {
-        comma = true;
-      }
-      OutputJsonTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
-    }
-  }
-  *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
-}
-
-// Prints a JSON summary of unit_test to output stream out.
-void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
-                                                  const UnitTest& unit_test) {
-  const std::string kTestsuites = "testsuites";
-  const std::string kIndent = Indent(2);
-  *stream << "{\n";
-
-  OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "disabled",
-                unit_test.reportable_disabled_test_count(), kIndent);
-  OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
-  if (GTEST_FLAG(shuffle)) {
-    OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
-                  kIndent);
-  }
-  OutputJsonKey(stream, kTestsuites, "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "time",
-                FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent,
-                false);
-
-  *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent)
-          << ",\n";
-
-  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
-  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
-
-  bool comma = false;
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0) {
-      if (comma) {
-        *stream << ",\n";
-      } else {
-        comma = true;
-      }
-      PrintJsonTestSuite(stream, *unit_test.GetTestSuite(i));
-    }
-  }
-
-  // If there was a test failure outside of one of the test suites (like in a
-  // test environment) include that in the output.
-  if (unit_test.ad_hoc_test_result().Failed()) {
-    OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
-  }
-
-  *stream << "\n" << kIndent << "]\n" << "}\n";
-}
-
-void JsonUnitTestResultPrinter::PrintJsonTestList(
-    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
-  const std::string kTestsuites = "testsuites";
-  const std::string kIndent = Indent(2);
-  *stream << "{\n";
-  int total_tests = 0;
-  for (auto test_suite : test_suites) {
-    total_tests += test_suite->total_test_count();
-  }
-  OutputJsonKey(stream, kTestsuites, "tests", total_tests, kIndent);
-
-  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
-  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
-
-  for (size_t i = 0; i < test_suites.size(); ++i) {
-    if (i != 0) {
-      *stream << ",\n";
-    }
-    PrintJsonTestSuite(stream, *test_suites[i]);
-  }
-
-  *stream << "\n"
-          << kIndent << "]\n"
-          << "}\n";
-}
-// Produces a string representing the test properties in a result as
-// a JSON dictionary.
-std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
-    const TestResult& result, const std::string& indent) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << ",\n" << indent << "\"" << property.key() << "\": "
-               << "\"" << EscapeJson(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
-// End JsonUnitTestResultPrinter
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
-// replaces them by "%xx" where xx is their hexadecimal value. For
-// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
-// in both time and space -- important as the input str may contain an
-// arbitrarily long test failure message and stack trace.
-std::string StreamingListener::UrlEncode(const char* str) {
-  std::string result;
-  result.reserve(strlen(str) + 1);
-  for (char ch = *str; ch != '\0'; ch = *++str) {
-    switch (ch) {
-      case '%':
-      case '=':
-      case '&':
-      case '\n':
-        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
-        break;
-      default:
-        result.push_back(ch);
-        break;
-    }
-  }
-  return result;
-}
-
-void StreamingListener::SocketWriter::MakeConnection() {
-  GTEST_CHECK_(sockfd_ == -1)
-      << "MakeConnection() can't be called when there is already a connection.";
-
-  addrinfo hints;
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
-  hints.ai_socktype = SOCK_STREAM;
-  addrinfo* servinfo = nullptr;
-
-  // Use the getaddrinfo() to get a linked list of IP addresses for
-  // the given host name.
-  const int error_num = getaddrinfo(
-      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
-  if (error_num != 0) {
-    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
-                        << gai_strerror(error_num);
-  }
-
-  // Loop through all the results and connect to the first we can.
-  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != nullptr;
-       cur_addr = cur_addr->ai_next) {
-    sockfd_ = socket(
-        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
-    if (sockfd_ != -1) {
-      // Connect the client socket to the server socket.
-      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
-        close(sockfd_);
-        sockfd_ = -1;
-      }
-    }
-  }
-
-  freeaddrinfo(servinfo);  // all done with this structure
-
-  if (sockfd_ == -1) {
-    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
-                        << host_name_ << ":" << port_num_;
-  }
-}
-
-// End of class Streaming Listener
-#endif  // GTEST_CAN_STREAM_RESULTS__
-
-// class OsStackTraceGetter
-
-const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
-    "... " GTEST_NAME_ " internal frames ...";
-
-std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
-  std::string result;
-
-  if (max_depth <= 0) {
-    return result;
-  }
-
-  max_depth = std::min(max_depth, kMaxStackTraceDepth);
-
-  std::vector<void*> raw_stack(max_depth);
-  // Skips the frames requested by the caller, plus this function.
-  const int raw_stack_size =
-      absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1);
-
-  void* caller_frame = nullptr;
-  {
-    MutexLock lock(&mutex_);
-    caller_frame = caller_frame_;
-  }
-
-  for (int i = 0; i < raw_stack_size; ++i) {
-    if (raw_stack[i] == caller_frame &&
-        !GTEST_FLAG(show_internal_stack_frames)) {
-      // Add a marker to the trace and stop adding frames.
-      absl::StrAppend(&result, kElidedFramesMarker, "\n");
-      break;
-    }
-
-    char tmp[1024];
-    const char* symbol = "(unknown)";
-    if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) {
-      symbol = tmp;
-    }
-
-    char line[1024];
-    snprintf(line, sizeof(line), "  %p: %s\n", raw_stack[i], symbol);
-    result += line;
-  }
-
-  return result;
-
-#else  // !GTEST_HAS_ABSL
-  static_cast<void>(max_depth);
-  static_cast<void>(skip_count);
-  return "";
-#endif  // GTEST_HAS_ABSL
-}
-
-void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
-  void* caller_frame = nullptr;
-  if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
-    caller_frame = nullptr;
-  }
-
-  MutexLock lock(&mutex_);
-  caller_frame_ = caller_frame;
-#endif  // GTEST_HAS_ABSL
-}
-
-// A helper class that creates the premature-exit file in its
-// constructor and deletes the file in its destructor.
-class ScopedPrematureExitFile {
- public:
-  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
-      : premature_exit_filepath_(premature_exit_filepath ?
-                                 premature_exit_filepath : "") {
-    // If a path to the premature-exit file is specified...
-    if (!premature_exit_filepath_.empty()) {
-      // create the file with a single "0" character in it.  I/O
-      // errors are ignored as there's nothing better we can do and we
-      // don't want to fail the test because of this.
-      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
-      fwrite("0", 1, 1, pfile);
-      fclose(pfile);
-    }
-  }
-
-  ~ScopedPrematureExitFile() {
-#if !defined GTEST_OS_ESP8266
-    if (!premature_exit_filepath_.empty()) {
-      int retval = remove(premature_exit_filepath_.c_str());
-      if (retval) {
-        GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \""
-                          << premature_exit_filepath_ << "\" with error "
-                          << retval;
-      }
-    }
-#endif
-  }
-
- private:
-  const std::string premature_exit_filepath_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
-};
-
-}  // namespace internal
-
-// class TestEventListeners
-
-TestEventListeners::TestEventListeners()
-    : repeater_(new internal::TestEventRepeater()),
-      default_result_printer_(nullptr),
-      default_xml_generator_(nullptr) {}
-
-TestEventListeners::~TestEventListeners() { delete repeater_; }
-
-// Returns the standard listener responsible for the default console
-// output.  Can be removed from the listeners list to shut down default
-// console output.  Note that removing this object from the listener list
-// with Release transfers its ownership to the user.
-void TestEventListeners::Append(TestEventListener* listener) {
-  repeater_->Append(listener);
-}
-
-// Removes the given event listener from the list and returns it.  It then
-// becomes the caller's responsibility to delete the listener. Returns
-// NULL if the listener is not found in the list.
-TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
-  if (listener == default_result_printer_)
-    default_result_printer_ = nullptr;
-  else if (listener == default_xml_generator_)
-    default_xml_generator_ = nullptr;
-  return repeater_->Release(listener);
-}
-
-// Returns repeater that broadcasts the TestEventListener events to all
-// subscribers.
-TestEventListener* TestEventListeners::repeater() { return repeater_; }
-
-// Sets the default_result_printer attribute to the provided listener.
-// The listener is also added to the listener list and previous
-// default_result_printer is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
-  if (default_result_printer_ != listener) {
-    // It is an error to pass this method a listener that is already in the
-    // list.
-    delete Release(default_result_printer_);
-    default_result_printer_ = listener;
-    if (listener != nullptr) Append(listener);
-  }
-}
-
-// Sets the default_xml_generator attribute to the provided listener.  The
-// listener is also added to the listener list and previous
-// default_xml_generator is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
-  if (default_xml_generator_ != listener) {
-    // It is an error to pass this method a listener that is already in the
-    // list.
-    delete Release(default_xml_generator_);
-    default_xml_generator_ = listener;
-    if (listener != nullptr) Append(listener);
-  }
-}
-
-// Controls whether events will be forwarded by the repeater to the
-// listeners in the list.
-bool TestEventListeners::EventForwardingEnabled() const {
-  return repeater_->forwarding_enabled();
-}
-
-void TestEventListeners::SuppressEventForwarding() {
-  repeater_->set_forwarding_enabled(false);
-}
-
-// class UnitTest
-
-// Gets the singleton UnitTest object.  The first time this method is
-// called, a UnitTest object is constructed and returned.  Consecutive
-// calls will return the same object.
-//
-// We don't protect this under mutex_ as a user is not supposed to
-// call this before main() starts, from which point on the return
-// value will never change.
-UnitTest* UnitTest::GetInstance() {
-  // CodeGear C++Builder insists on a public destructor for the
-  // default implementation.  Use this implementation to keep good OO
-  // design with private destructor.
-
-#if defined(__BORLANDC__)
-  static UnitTest* const instance = new UnitTest;
-  return instance;
-#else
-  static UnitTest instance;
-  return &instance;
-#endif  // defined(__BORLANDC__)
-}
-
-// Gets the number of successful test suites.
-int UnitTest::successful_test_suite_count() const {
-  return impl()->successful_test_suite_count();
-}
-
-// Gets the number of failed test suites.
-int UnitTest::failed_test_suite_count() const {
-  return impl()->failed_test_suite_count();
-}
-
-// Gets the number of all test suites.
-int UnitTest::total_test_suite_count() const {
-  return impl()->total_test_suite_count();
-}
-
-// Gets the number of all test suites that contain at least one test
-// that should run.
-int UnitTest::test_suite_to_run_count() const {
-  return impl()->test_suite_to_run_count();
-}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-int UnitTest::successful_test_case_count() const {
-  return impl()->successful_test_suite_count();
-}
-int UnitTest::failed_test_case_count() const {
-  return impl()->failed_test_suite_count();
-}
-int UnitTest::total_test_case_count() const {
-  return impl()->total_test_suite_count();
-}
-int UnitTest::test_case_to_run_count() const {
-  return impl()->test_suite_to_run_count();
-}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Gets the number of successful tests.
-int UnitTest::successful_test_count() const {
-  return impl()->successful_test_count();
-}
-
-// Gets the number of skipped tests.
-int UnitTest::skipped_test_count() const {
-  return impl()->skipped_test_count();
-}
-
-// Gets the number of failed tests.
-int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int UnitTest::reportable_disabled_test_count() const {
-  return impl()->reportable_disabled_test_count();
-}
-
-// Gets the number of disabled tests.
-int UnitTest::disabled_test_count() const {
-  return impl()->disabled_test_count();
-}
-
-// Gets the number of tests to be printed in the XML report.
-int UnitTest::reportable_test_count() const {
-  return impl()->reportable_test_count();
-}
-
-// Gets the number of all tests.
-int UnitTest::total_test_count() const { return impl()->total_test_count(); }
-
-// Gets the number of tests that should run.
-int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
-
-// Gets the time of the test program start, in ms from the start of the
-// UNIX epoch.
-internal::TimeInMillis UnitTest::start_timestamp() const {
-    return impl()->start_timestamp();
-}
-
-// Gets the elapsed time, in milliseconds.
-internal::TimeInMillis UnitTest::elapsed_time() const {
-  return impl()->elapsed_time();
-}
-
-// Returns true if and only if the unit test passed (i.e. all test suites
-// passed).
-bool UnitTest::Passed() const { return impl()->Passed(); }
-
-// Returns true if and only if the unit test failed (i.e. some test suite
-// failed or something outside of all tests failed).
-bool UnitTest::Failed() const { return impl()->Failed(); }
-
-// Gets the i-th test suite among all the test suites. i can range from 0 to
-// total_test_suite_count() - 1. If i is not in that range, returns NULL.
-const TestSuite* UnitTest::GetTestSuite(int i) const {
-  return impl()->GetTestSuite(i);
-}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-const TestCase* UnitTest::GetTestCase(int i) const {
-  return impl()->GetTestCase(i);
-}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Returns the TestResult containing information on test failures and
-// properties logged outside of individual test suites.
-const TestResult& UnitTest::ad_hoc_test_result() const {
-  return *impl()->ad_hoc_test_result();
-}
-
-// Gets the i-th test suite among all the test suites. i can range from 0 to
-// total_test_suite_count() - 1. If i is not in that range, returns NULL.
-TestSuite* UnitTest::GetMutableTestSuite(int i) {
-  return impl()->GetMutableSuiteCase(i);
-}
-
-// Returns the list of event listeners that can be used to track events
-// inside Google Test.
-TestEventListeners& UnitTest::listeners() {
-  return *impl()->listeners();
-}
-
-// Registers and returns a global test environment.  When a test
-// program is run, all global test environments will be set-up in the
-// order they were registered.  After all tests in the program have
-// finished, all global test environments will be torn-down in the
-// *reverse* order they were registered.
-//
-// The UnitTest object takes ownership of the given environment.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-Environment* UnitTest::AddEnvironment(Environment* env) {
-  if (env == nullptr) {
-    return nullptr;
-  }
-
-  impl_->environments().push_back(env);
-  return env;
-}
-
-// Adds a TestPartResult to the current TestResult object.  All Google Test
-// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
-// this to report their results.  The user code should use the
-// assertion macros instead of calling this directly.
-void UnitTest::AddTestPartResult(
-    TestPartResult::Type result_type,
-    const char* file_name,
-    int line_number,
-    const std::string& message,
-    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
-  Message msg;
-  msg << message;
-
-  internal::MutexLock lock(&mutex_);
-  if (impl_->gtest_trace_stack().size() > 0) {
-    msg << "\n" << GTEST_NAME_ << " trace:";
-
-    for (size_t i = impl_->gtest_trace_stack().size(); i > 0; --i) {
-      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
-      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
-          << " " << trace.message;
-    }
-  }
-
-  if (os_stack_trace.c_str() != nullptr && !os_stack_trace.empty()) {
-    msg << internal::kStackTraceMarker << os_stack_trace;
-  }
-
-  const TestPartResult result = TestPartResult(
-      result_type, file_name, line_number, msg.GetString().c_str());
-  impl_->GetTestPartResultReporterForCurrentThread()->
-      ReportTestPartResult(result);
-
-  if (result_type != TestPartResult::kSuccess &&
-      result_type != TestPartResult::kSkip) {
-    // gtest_break_on_failure takes precedence over
-    // gtest_throw_on_failure.  This allows a user to set the latter
-    // in the code (perhaps in order to use Google Test assertions
-    // with another testing framework) and specify the former on the
-    // command line for debugging.
-    if (GTEST_FLAG(break_on_failure)) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-      // Using DebugBreak on Windows allows gtest to still break into a debugger
-      // when a failure happens and both the --gtest_break_on_failure and
-      // the --gtest_catch_exceptions flags are specified.
-      DebugBreak();
-#elif (!defined(__native_client__)) &&            \
-    ((defined(__clang__) || defined(__GNUC__)) && \
-     (defined(__x86_64__) || defined(__i386__)))
-      // with clang/gcc we can achieve the same effect on x86 by invoking int3
-      asm("int3");
-#else
-      // Dereference nullptr through a volatile pointer to prevent the compiler
-      // from removing. We use this rather than abort() or __builtin_trap() for
-      // portability: some debuggers don't correctly trap abort().
-      *static_cast<volatile int*>(nullptr) = 1;
-#endif  // GTEST_OS_WINDOWS
-    } else if (GTEST_FLAG(throw_on_failure)) {
-#if GTEST_HAS_EXCEPTIONS
-      throw internal::GoogleTestFailureException(result);
-#else
-      // We cannot call abort() as it generates a pop-up in debug mode
-      // that cannot be suppressed in VC 7.1 or below.
-      exit(1);
-#endif
-    }
-  }
-}
-
-// Adds a TestProperty to the current TestResult object when invoked from
-// inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
-// from SetUpTestSuite or TearDownTestSuite, or to the global property set
-// when invoked elsewhere.  If the result already contains a property with
-// the same key, the value will be updated.
-void UnitTest::RecordProperty(const std::string& key,
-                              const std::string& value) {
-  impl_->RecordProperty(TestProperty(key, value));
-}
-
-// Runs all tests in this UnitTest object and prints the result.
-// Returns 0 if successful, or 1 otherwise.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-int UnitTest::Run() {
-  const bool in_death_test_child_process =
-      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
-
-  // Google Test implements this protocol for catching that a test
-  // program exits before returning control to Google Test:
-  //
-  //   1. Upon start, Google Test creates a file whose absolute path
-  //      is specified by the environment variable
-  //      TEST_PREMATURE_EXIT_FILE.
-  //   2. When Google Test has finished its work, it deletes the file.
-  //
-  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
-  // running a Google-Test-based test program and check the existence
-  // of the file at the end of the test execution to see if it has
-  // exited prematurely.
-
-  // If we are in the child process of a death test, don't
-  // create/delete the premature exit file, as doing so is unnecessary
-  // and will confuse the parent process.  Otherwise, create/delete
-  // the file upon entering/leaving this function.  If the program
-  // somehow exits before this function has a chance to return, the
-  // premature-exit file will be left undeleted, causing a test runner
-  // that understands the premature-exit-file protocol to report the
-  // test as having failed.
-  const internal::ScopedPrematureExitFile premature_exit_file(
-      in_death_test_child_process
-          ? nullptr
-          : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
-
-  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
-  // used for the duration of the program.
-  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
-
-#if GTEST_OS_WINDOWS
-  // Either the user wants Google Test to catch exceptions thrown by the
-  // tests or this is executing in the context of death test child
-  // process. In either case the user does not want to see pop-up dialogs
-  // about crashes - they are expected.
-  if (impl()->catch_exceptions() || in_death_test_child_process) {
-# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-    // SetErrorMode doesn't exist on CE.
-    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
-                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
-# endif  // !GTEST_OS_WINDOWS_MOBILE
-
-# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
-    // Death test children can be terminated with _abort().  On Windows,
-    // _abort() can show a dialog with a warning message.  This forces the
-    // abort message to go to stderr instead.
-    _set_error_mode(_OUT_TO_STDERR);
-# endif
-
-# if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
-    // In the debug version, Visual Studio pops up a separate dialog
-    // offering a choice to debug the aborted program. We need to suppress
-    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
-    // executed. Google Test will notify the user of any unexpected
-    // failure via stderr.
-    if (!GTEST_FLAG(break_on_failure))
-      _set_abort_behavior(
-          0x0,                                    // Clear the following flags:
-          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
-
-    // In debug mode, the Windows CRT can crash with an assertion over invalid
-    // input (e.g. passing an invalid file descriptor).  The default handling
-    // for these assertions is to pop up a dialog and wait for user input.
-    // Instead ask the CRT to dump such assertions to stderr non-interactively.
-    if (!IsDebuggerPresent()) {
-      (void)_CrtSetReportMode(_CRT_ASSERT,
-                              _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-      (void)_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-    }
-# endif
-  }
-#endif  // GTEST_OS_WINDOWS
-
-  return internal::HandleExceptionsInMethodIfSupported(
-      impl(),
-      &internal::UnitTestImpl::RunAllTests,
-      "auxiliary test code (environments or event listeners)") ? 0 : 1;
-}
-
-// Returns the working directory when the first TEST() or TEST_F() was
-// executed.
-const char* UnitTest::original_working_dir() const {
-  return impl_->original_working_dir_.c_str();
-}
-
-// Returns the TestSuite object for the test that's currently running,
-// or NULL if no test is running.
-const TestSuite* UnitTest::current_test_suite() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_suite();
-}
-
-// Legacy API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-const TestCase* UnitTest::current_test_case() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_suite();
-}
-#endif
-
-// Returns the TestInfo object for the test that's currently running,
-// or NULL if no test is running.
-const TestInfo* UnitTest::current_test_info() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_info();
-}
-
-// Returns the random seed used at the start of the current test run.
-int UnitTest::random_seed() const { return impl_->random_seed(); }
-
-// Returns ParameterizedTestSuiteRegistry object used to keep track of
-// value-parameterized tests and instantiate and register them.
-internal::ParameterizedTestSuiteRegistry&
-UnitTest::parameterized_test_registry() GTEST_LOCK_EXCLUDED_(mutex_) {
-  return impl_->parameterized_test_registry();
-}
-
-// Creates an empty UnitTest.
-UnitTest::UnitTest() {
-  impl_ = new internal::UnitTestImpl(this);
-}
-
-// Destructor of UnitTest.
-UnitTest::~UnitTest() {
-  delete impl_;
-}
-
-// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-// Google Test trace stack.
-void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  impl_->gtest_trace_stack().push_back(trace);
-}
-
-// Pops a trace from the per-thread Google Test trace stack.
-void UnitTest::PopGTestTrace()
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  impl_->gtest_trace_stack().pop_back();
-}
-
-namespace internal {
-
-UnitTestImpl::UnitTestImpl(UnitTest* parent)
-    : parent_(parent),
-      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
-          default_global_test_part_result_reporter_(this),
-      default_per_thread_test_part_result_reporter_(this),
-      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
-          &default_global_test_part_result_reporter_),
-      per_thread_test_part_result_reporter_(
-          &default_per_thread_test_part_result_reporter_),
-      parameterized_test_registry_(),
-      parameterized_tests_registered_(false),
-      last_death_test_suite_(-1),
-      current_test_suite_(nullptr),
-      current_test_info_(nullptr),
-      ad_hoc_test_result_(),
-      os_stack_trace_getter_(nullptr),
-      post_flag_parse_init_performed_(false),
-      random_seed_(0),  // Will be overridden by the flag before first use.
-      random_(0),       // Will be reseeded before first use.
-      start_timestamp_(0),
-      elapsed_time_(0),
-#if GTEST_HAS_DEATH_TEST
-      death_test_factory_(new DefaultDeathTestFactory),
-#endif
-      // Will be overridden by the flag before first use.
-      catch_exceptions_(false) {
-  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
-}
-
-UnitTestImpl::~UnitTestImpl() {
-  // Deletes every TestSuite.
-  ForEach(test_suites_, internal::Delete<TestSuite>);
-
-  // Deletes every Environment.
-  ForEach(environments_, internal::Delete<Environment>);
-
-  delete os_stack_trace_getter_;
-}
-
-// Adds a TestProperty to the current TestResult object when invoked in a
-// context of a test, to current test suite's ad_hoc_test_result when invoke
-// from SetUpTestSuite/TearDownTestSuite, or to the global property set
-// otherwise.  If the result already contains a property with the same key,
-// the value will be updated.
-void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
-  std::string xml_element;
-  TestResult* test_result;  // TestResult appropriate for property recording.
-
-  if (current_test_info_ != nullptr) {
-    xml_element = "testcase";
-    test_result = &(current_test_info_->result_);
-  } else if (current_test_suite_ != nullptr) {
-    xml_element = "testsuite";
-    test_result = &(current_test_suite_->ad_hoc_test_result_);
-  } else {
-    xml_element = "testsuites";
-    test_result = &ad_hoc_test_result_;
-  }
-  test_result->RecordProperty(xml_element, test_property);
-}
-
-#if GTEST_HAS_DEATH_TEST
-// Disables event forwarding if the control is currently in a death test
-// subprocess. Must not be called before InitGoogleTest.
-void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
-  if (internal_run_death_test_flag_.get() != nullptr)
-    listeners()->SuppressEventForwarding();
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-// Initializes event listeners performing XML output as specified by
-// UnitTestOptions. Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureXmlOutput() {
-  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-  if (output_format == "xml") {
-    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format == "json") {
-    listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format != "") {
-    GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
-                        << output_format << "\" ignored.";
-  }
-}
-
-#if GTEST_CAN_STREAM_RESULTS_
-// Initializes event listeners for streaming test results in string form.
-// Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureStreamingOutput() {
-  const std::string& target = GTEST_FLAG(stream_result_to);
-  if (!target.empty()) {
-    const size_t pos = target.find(':');
-    if (pos != std::string::npos) {
-      listeners()->Append(new StreamingListener(target.substr(0, pos),
-                                                target.substr(pos+1)));
-    } else {
-      GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target
-                          << "\" ignored.";
-    }
-  }
-}
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-// Performs initialization dependent upon flag values obtained in
-// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
-// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
-// this function is also called from RunAllTests.  Since this function can be
-// called more than once, it has to be idempotent.
-void UnitTestImpl::PostFlagParsingInit() {
-  // Ensures that this function does not execute more than once.
-  if (!post_flag_parse_init_performed_) {
-    post_flag_parse_init_performed_ = true;
-
-#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
-    // Register to send notifications about key process state changes.
-    listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
-#endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
-
-#if GTEST_HAS_DEATH_TEST
-    InitDeathTestSubprocessControlInfo();
-    SuppressTestEventsIfInSubprocess();
-#endif  // GTEST_HAS_DEATH_TEST
-
-    // Registers parameterized tests. This makes parameterized tests
-    // available to the UnitTest reflection API without running
-    // RUN_ALL_TESTS.
-    RegisterParameterizedTests();
-
-    // Configures listeners for XML output. This makes it possible for users
-    // to shut down the default XML output before invoking RUN_ALL_TESTS.
-    ConfigureXmlOutput();
-
-    if (GTEST_FLAG(brief)) {
-      listeners()->SetDefaultResultPrinter(new BriefUnitTestResultPrinter);
-    }
-
-#if GTEST_CAN_STREAM_RESULTS_
-    // Configures listeners for streaming test results to the specified server.
-    ConfigureStreamingOutput();
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-#if GTEST_HAS_ABSL
-    if (GTEST_FLAG(install_failure_signal_handler)) {
-      absl::FailureSignalHandlerOptions options;
-      absl::InstallFailureSignalHandler(options);
-    }
-#endif  // GTEST_HAS_ABSL
-  }
-}
-
-// A predicate that checks the name of a TestSuite against a known
-// value.
-//
-// This is used for implementation of the UnitTest class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestSuiteNameIs is copyable.
-class TestSuiteNameIs {
- public:
-  // Constructor.
-  explicit TestSuiteNameIs(const std::string& name) : name_(name) {}
-
-  // Returns true if and only if the name of test_suite matches name_.
-  bool operator()(const TestSuite* test_suite) const {
-    return test_suite != nullptr &&
-           strcmp(test_suite->name(), name_.c_str()) == 0;
-  }
-
- private:
-  std::string name_;
-};
-
-// Finds and returns a TestSuite with the given name.  If one doesn't
-// exist, creates one and returns it.  It's the CALLER'S
-// RESPONSIBILITY to ensure that this function is only called WHEN THE
-// TESTS ARE NOT SHUFFLED.
-//
-// Arguments:
-//
-//   test_suite_name: name of the test suite
-//   type_param:      the name of the test suite's type parameter, or NULL if
-//                    this is not a typed or a type-parameterized test suite.
-//   set_up_tc:       pointer to the function that sets up the test suite
-//   tear_down_tc:    pointer to the function that tears down the test suite
-TestSuite* UnitTestImpl::GetTestSuite(
-    const char* test_suite_name, const char* type_param,
-    internal::SetUpTestSuiteFunc set_up_tc,
-    internal::TearDownTestSuiteFunc tear_down_tc) {
-  // Can we find a TestSuite with the given name?
-  const auto test_suite =
-      std::find_if(test_suites_.rbegin(), test_suites_.rend(),
-                   TestSuiteNameIs(test_suite_name));
-
-  if (test_suite != test_suites_.rend()) return *test_suite;
-
-  // No.  Let's create one.
-  auto* const new_test_suite =
-      new TestSuite(test_suite_name, type_param, set_up_tc, tear_down_tc);
-
-  // Is this a death test suite?
-  if (internal::UnitTestOptions::MatchesFilter(test_suite_name,
-                                               kDeathTestSuiteFilter)) {
-    // Yes.  Inserts the test suite after the last death test suite
-    // defined so far.  This only works when the test suites haven't
-    // been shuffled.  Otherwise we may end up running a death test
-    // after a non-death test.
-    ++last_death_test_suite_;
-    test_suites_.insert(test_suites_.begin() + last_death_test_suite_,
-                        new_test_suite);
-  } else {
-    // No.  Appends to the end of the list.
-    test_suites_.push_back(new_test_suite);
-  }
-
-  test_suite_indices_.push_back(static_cast<int>(test_suite_indices_.size()));
-  return new_test_suite;
-}
-
-// Helpers for setting up / tearing down the given environment.  They
-// are for use in the ForEach() function.
-static void SetUpEnvironment(Environment* env) { env->SetUp(); }
-static void TearDownEnvironment(Environment* env) { env->TearDown(); }
-
-// Runs all tests in this UnitTest object, prints the result, and
-// returns true if all tests are successful.  If any exception is
-// thrown during a test, the test is considered to be failed, but the
-// rest of the tests will still be run.
-//
-// When parameterized tests are enabled, it expands and registers
-// parameterized tests first in RegisterParameterizedTests().
-// All other functions called from RunAllTests() may safely assume that
-// parameterized tests are ready to be counted and run.
-bool UnitTestImpl::RunAllTests() {
-  // True if and only if Google Test is initialized before RUN_ALL_TESTS() is
-  // called.
-  const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized();
-
-  // Do not run any test if the --help flag was specified.
-  if (g_help_flag)
-    return true;
-
-  // Repeats the call to the post-flag parsing initialization in case the
-  // user didn't call InitGoogleTest.
-  PostFlagParsingInit();
-
-  // Even if sharding is not on, test runners may want to use the
-  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
-  // protocol.
-  internal::WriteToShardStatusFileIfNeeded();
-
-  // True if and only if we are in a subprocess for running a thread-safe-style
-  // death test.
-  bool in_subprocess_for_death_test = false;
-
-#if GTEST_HAS_DEATH_TEST
-  in_subprocess_for_death_test =
-      (internal_run_death_test_flag_.get() != nullptr);
-# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
-  if (in_subprocess_for_death_test) {
-    GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
-  }
-# endif  // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
-#endif  // GTEST_HAS_DEATH_TEST
-
-  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
-                                        in_subprocess_for_death_test);
-
-  // Compares the full test names with the filter to decide which
-  // tests to run.
-  const bool has_tests_to_run = FilterTests(should_shard
-                                              ? HONOR_SHARDING_PROTOCOL
-                                              : IGNORE_SHARDING_PROTOCOL) > 0;
-
-  // Lists the tests and exits if the --gtest_list_tests flag was specified.
-  if (GTEST_FLAG(list_tests)) {
-    // This must be called *after* FilterTests() has been called.
-    ListTestsMatchingFilter();
-    return true;
-  }
-
-  random_seed_ = GTEST_FLAG(shuffle) ?
-      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
-
-  // True if and only if at least one test has failed.
-  bool failed = false;
-
-  TestEventListener* repeater = listeners()->repeater();
-
-  start_timestamp_ = GetTimeInMillis();
-  repeater->OnTestProgramStart(*parent_);
-
-  // How many times to repeat the tests?  We don't want to repeat them
-  // when we are inside the subprocess of a death test.
-  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
-  // Repeats forever if the repeat count is negative.
-  const bool gtest_repeat_forever = repeat < 0;
-  for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
-    // We want to preserve failures generated by ad-hoc test
-    // assertions executed before RUN_ALL_TESTS().
-    ClearNonAdHocTestResult();
-
-    Timer timer;
-
-    // Shuffles test suites and tests if requested.
-    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
-      random()->Reseed(static_cast<uint32_t>(random_seed_));
-      // This should be done before calling OnTestIterationStart(),
-      // such that a test event listener can see the actual test order
-      // in the event.
-      ShuffleTests();
-    }
-
-    // Tells the unit test event listeners that the tests are about to start.
-    repeater->OnTestIterationStart(*parent_, i);
-
-    // Runs each test suite if there is at least one test to run.
-    if (has_tests_to_run) {
-      // Sets up all environments beforehand.
-      repeater->OnEnvironmentsSetUpStart(*parent_);
-      ForEach(environments_, SetUpEnvironment);
-      repeater->OnEnvironmentsSetUpEnd(*parent_);
-
-      // Runs the tests only if there was no fatal failure or skip triggered
-      // during global set-up.
-      if (Test::IsSkipped()) {
-        // Emit diagnostics when global set-up calls skip, as it will not be
-        // emitted by default.
-        TestResult& test_result =
-            *internal::GetUnitTestImpl()->current_test_result();
-        for (int j = 0; j < test_result.total_part_count(); ++j) {
-          const TestPartResult& test_part_result =
-              test_result.GetTestPartResult(j);
-          if (test_part_result.type() == TestPartResult::kSkip) {
-            const std::string& result = test_part_result.message();
-            printf("%s\n", result.c_str());
-          }
-        }
-        fflush(stdout);
-      } else if (!Test::HasFatalFailure()) {
-        for (int test_index = 0; test_index < total_test_suite_count();
-             test_index++) {
-          GetMutableSuiteCase(test_index)->Run();
-          if (GTEST_FLAG(fail_fast) &&
-              GetMutableSuiteCase(test_index)->Failed()) {
-            for (int j = test_index + 1; j < total_test_suite_count(); j++) {
-              GetMutableSuiteCase(j)->Skip();
-            }
-            break;
-          }
-        }
-      } else if (Test::HasFatalFailure()) {
-        // If there was a fatal failure during the global setup then we know we
-        // aren't going to run any tests. Explicitly mark all of the tests as
-        // skipped to make this obvious in the output.
-        for (int test_index = 0; test_index < total_test_suite_count();
-             test_index++) {
-          GetMutableSuiteCase(test_index)->Skip();
-        }
-      }
-
-      // Tears down all environments in reverse order afterwards.
-      repeater->OnEnvironmentsTearDownStart(*parent_);
-      std::for_each(environments_.rbegin(), environments_.rend(),
-                    TearDownEnvironment);
-      repeater->OnEnvironmentsTearDownEnd(*parent_);
-    }
-
-    elapsed_time_ = timer.Elapsed();
-
-    // Tells the unit test event listener that the tests have just finished.
-    repeater->OnTestIterationEnd(*parent_, i);
-
-    // Gets the result and clears it.
-    if (!Passed()) {
-      failed = true;
-    }
-
-    // Restores the original test order after the iteration.  This
-    // allows the user to quickly repro a failure that happens in the
-    // N-th iteration without repeating the first (N - 1) iterations.
-    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
-    // case the user somehow changes the value of the flag somewhere
-    // (it's always safe to unshuffle the tests).
-    UnshuffleTests();
-
-    if (GTEST_FLAG(shuffle)) {
-      // Picks a new random seed for each iteration.
-      random_seed_ = GetNextRandomSeed(random_seed_);
-    }
-  }
-
-  repeater->OnTestProgramEnd(*parent_);
-
-  if (!gtest_is_initialized_before_run_all_tests) {
-    ColoredPrintf(
-        GTestColor::kRed,
-        "\nIMPORTANT NOTICE - DO NOT IGNORE:\n"
-        "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_
-        "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
-        " will start to enforce the valid usage. "
-        "Please fix it ASAP, or IT WILL START TO FAIL.\n");  // NOLINT
-#if GTEST_FOR_GOOGLE_
-    ColoredPrintf(GTestColor::kRed,
-                  "For more details, see http://wiki/Main/ValidGUnitMain.\n");
-#endif  // GTEST_FOR_GOOGLE_
-  }
-
-  return !failed;
-}
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded() {
-  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
-  if (test_shard_file != nullptr) {
-    FILE* const file = posix::FOpen(test_shard_file, "w");
-    if (file == nullptr) {
-      ColoredPrintf(GTestColor::kRed,
-                    "Could not write to the test shard status file \"%s\" "
-                    "specified by the %s environment variable.\n",
-                    test_shard_file, kTestShardStatusFile);
-      fflush(stdout);
-      exit(EXIT_FAILURE);
-    }
-    fclose(file);
-  }
-}
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (i.e., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-bool ShouldShard(const char* total_shards_env,
-                 const char* shard_index_env,
-                 bool in_subprocess_for_death_test) {
-  if (in_subprocess_for_death_test) {
-    return false;
-  }
-
-  const int32_t total_shards = Int32FromEnvOrDie(total_shards_env, -1);
-  const int32_t shard_index = Int32FromEnvOrDie(shard_index_env, -1);
-
-  if (total_shards == -1 && shard_index == -1) {
-    return false;
-  } else if (total_shards == -1 && shard_index != -1) {
-    const Message msg = Message()
-      << "Invalid environment variables: you have "
-      << kTestShardIndex << " = " << shard_index
-      << ", but have left " << kTestTotalShards << " unset.\n";
-    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  } else if (total_shards != -1 && shard_index == -1) {
-    const Message msg = Message()
-      << "Invalid environment variables: you have "
-      << kTestTotalShards << " = " << total_shards
-      << ", but have left " << kTestShardIndex << " unset.\n";
-    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  } else if (shard_index < 0 || shard_index >= total_shards) {
-    const Message msg = Message()
-      << "Invalid environment variables: we require 0 <= "
-      << kTestShardIndex << " < " << kTestTotalShards
-      << ", but you have " << kTestShardIndex << "=" << shard_index
-      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
-    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  }
-
-  return total_shards > 1;
-}
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error
-// and aborts.
-int32_t Int32FromEnvOrDie(const char* var, int32_t default_val) {
-  const char* str_val = posix::GetEnv(var);
-  if (str_val == nullptr) {
-    return default_val;
-  }
-
-  int32_t result;
-  if (!ParseInt32(Message() << "The value of environment variable " << var,
-                  str_val, &result)) {
-    exit(EXIT_FAILURE);
-  }
-  return result;
-}
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true if and only if the test should be run on this shard. The test id
-// is some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
-  return (test_id % total_shards) == shard_index;
-}
-
-// Compares the name of each test with the user-specified filter to
-// decide whether the test should be run, then records the result in
-// each TestSuite and TestInfo object.
-// If shard_tests == true, further filters tests based on sharding
-// variables in the environment - see
-// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
-// . Returns the number of tests that should run.
-int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
-  const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
-      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
-  const int32_t shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
-      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
-
-  // num_runnable_tests are the number of tests that will
-  // run across all shards (i.e., match filter and are not disabled).
-  // num_selected_tests are the number of tests to be run on
-  // this shard.
-  int num_runnable_tests = 0;
-  int num_selected_tests = 0;
-  for (auto* test_suite : test_suites_) {
-    const std::string& test_suite_name = test_suite->name();
-    test_suite->set_should_run(false);
-
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      TestInfo* const test_info = test_suite->test_info_list()[j];
-      const std::string test_name(test_info->name());
-      // A test is disabled if test suite name or test name matches
-      // kDisableTestFilter.
-      const bool is_disabled = internal::UnitTestOptions::MatchesFilter(
-                                   test_suite_name, kDisableTestFilter) ||
-                               internal::UnitTestOptions::MatchesFilter(
-                                   test_name, kDisableTestFilter);
-      test_info->is_disabled_ = is_disabled;
-
-      const bool matches_filter = internal::UnitTestOptions::FilterMatchesTest(
-          test_suite_name, test_name);
-      test_info->matches_filter_ = matches_filter;
-
-      const bool is_runnable =
-          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
-          matches_filter;
-
-      const bool is_in_another_shard =
-          shard_tests != IGNORE_SHARDING_PROTOCOL &&
-          !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests);
-      test_info->is_in_another_shard_ = is_in_another_shard;
-      const bool is_selected = is_runnable && !is_in_another_shard;
-
-      num_runnable_tests += is_runnable;
-      num_selected_tests += is_selected;
-
-      test_info->should_run_ = is_selected;
-      test_suite->set_should_run(test_suite->should_run() || is_selected);
-    }
-  }
-  return num_selected_tests;
-}
-
-// Prints the given C-string on a single line by replacing all '\n'
-// characters with string "\\n".  If the output takes more than
-// max_length characters, only prints the first max_length characters
-// and "...".
-static void PrintOnOneLine(const char* str, int max_length) {
-  if (str != nullptr) {
-    for (int i = 0; *str != '\0'; ++str) {
-      if (i >= max_length) {
-        printf("...");
-        break;
-      }
-      if (*str == '\n') {
-        printf("\\n");
-        i += 2;
-      } else {
-        printf("%c", *str);
-        ++i;
-      }
-    }
-  }
-}
-
-// Prints the names of the tests matching the user-specified filter flag.
-void UnitTestImpl::ListTestsMatchingFilter() {
-  // Print at most this many characters for each type/value parameter.
-  const int kMaxParamLength = 250;
-
-  for (auto* test_suite : test_suites_) {
-    bool printed_test_suite_name = false;
-
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      const TestInfo* const test_info = test_suite->test_info_list()[j];
-      if (test_info->matches_filter_) {
-        if (!printed_test_suite_name) {
-          printed_test_suite_name = true;
-          printf("%s.", test_suite->name());
-          if (test_suite->type_param() != nullptr) {
-            printf("  # %s = ", kTypeParamLabel);
-            // We print the type parameter on a single line to make
-            // the output easy to parse by a program.
-            PrintOnOneLine(test_suite->type_param(), kMaxParamLength);
-          }
-          printf("\n");
-        }
-        printf("  %s", test_info->name());
-        if (test_info->value_param() != nullptr) {
-          printf("  # %s = ", kValueParamLabel);
-          // We print the value parameter on a single line to make the
-          // output easy to parse by a program.
-          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
-        }
-        printf("\n");
-      }
-    }
-  }
-  fflush(stdout);
-  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-  if (output_format == "xml" || output_format == "json") {
-    FILE* fileout = OpenFileForWriting(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
-    std::stringstream stream;
-    if (output_format == "xml") {
-      XmlUnitTestResultPrinter(
-          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
-          .PrintXmlTestsList(&stream, test_suites_);
-    } else if (output_format == "json") {
-      JsonUnitTestResultPrinter(
-          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
-          .PrintJsonTestList(&stream, test_suites_);
-    }
-    fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
-    fclose(fileout);
-  }
-}
-
-// Sets the OS stack trace getter.
-//
-// Does nothing if the input and the current OS stack trace getter are
-// the same; otherwise, deletes the old getter and makes the input the
-// current getter.
-void UnitTestImpl::set_os_stack_trace_getter(
-    OsStackTraceGetterInterface* getter) {
-  if (os_stack_trace_getter_ != getter) {
-    delete os_stack_trace_getter_;
-    os_stack_trace_getter_ = getter;
-  }
-}
-
-// Returns the current OS stack trace getter if it is not NULL;
-// otherwise, creates an OsStackTraceGetter, makes it the current
-// getter, and returns it.
-OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
-  if (os_stack_trace_getter_ == nullptr) {
-#ifdef GTEST_OS_STACK_TRACE_GETTER_
-    os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
-#else
-    os_stack_trace_getter_ = new OsStackTraceGetter;
-#endif  // GTEST_OS_STACK_TRACE_GETTER_
-  }
-
-  return os_stack_trace_getter_;
-}
-
-// Returns the most specific TestResult currently running.
-TestResult* UnitTestImpl::current_test_result() {
-  if (current_test_info_ != nullptr) {
-    return &current_test_info_->result_;
-  }
-  if (current_test_suite_ != nullptr) {
-    return &current_test_suite_->ad_hoc_test_result_;
-  }
-  return &ad_hoc_test_result_;
-}
-
-// Shuffles all test suites, and the tests within each test suite,
-// making sure that death tests are still run first.
-void UnitTestImpl::ShuffleTests() {
-  // Shuffles the death test suites.
-  ShuffleRange(random(), 0, last_death_test_suite_ + 1, &test_suite_indices_);
-
-  // Shuffles the non-death test suites.
-  ShuffleRange(random(), last_death_test_suite_ + 1,
-               static_cast<int>(test_suites_.size()), &test_suite_indices_);
-
-  // Shuffles the tests inside each test suite.
-  for (auto& test_suite : test_suites_) {
-    test_suite->ShuffleTests(random());
-  }
-}
-
-// Restores the test suites and tests to their order before the first shuffle.
-void UnitTestImpl::UnshuffleTests() {
-  for (size_t i = 0; i < test_suites_.size(); i++) {
-    // Unshuffles the tests in each test suite.
-    test_suites_[i]->UnshuffleTests();
-    // Resets the index of each test suite.
-    test_suite_indices_[i] = static_cast<int>(i);
-  }
-}
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
-                                            int skip_count) {
-  // We pass skip_count + 1 to skip this wrapper function in addition
-  // to what the user really wants to skip.
-  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
-}
-
-// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
-// suppress unreachable code warnings.
-namespace {
-class ClassUniqueToAlwaysTrue {};
-}
-
-bool IsTrue(bool condition) { return condition; }
-
-bool AlwaysTrue() {
-#if GTEST_HAS_EXCEPTIONS
-  // This condition is always false so AlwaysTrue() never actually throws,
-  // but it makes the compiler think that it may throw.
-  if (IsTrue(false))
-    throw ClassUniqueToAlwaysTrue();
-#endif  // GTEST_HAS_EXCEPTIONS
-  return true;
-}
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-bool SkipPrefix(const char* prefix, const char** pstr) {
-  const size_t prefix_len = strlen(prefix);
-  if (strncmp(*pstr, prefix, prefix_len) == 0) {
-    *pstr += prefix_len;
-    return true;
-  }
-  return false;
-}
-
-// Parses a string as a command line flag.  The string should have
-// the format "--flag=value".  When def_optional is true, the "=value"
-// part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseFlagValue(const char* str, const char* flag,
-                                  bool def_optional) {
-  // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
-  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) {
-    return flag_end;
-  }
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-// Parses a string for a bool flag, in the form of either
-// "--flag=value" or "--flag".
-//
-// In the former case, the value is taken as true as long as it does
-// not start with '0', 'f', or 'F'.
-//
-// In the latter case, the value is taken as true.
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
-  return true;
-}
-
-// Parses a string for an int32_t flag, in the form of "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag,
-                    value_str, value);
-}
-
-// Parses a string for a string flag, in the form of "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-template <typename String>
-static bool ParseStringFlag(const char* str, const char* flag, String* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  *value = value_str;
-  return true;
-}
-
-// Determines whether a string has a prefix that Google Test uses for its
-// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
-// If Google Test detects that a command line flag has its prefix but is not
-// recognized, it will print its help message. Flags starting with
-// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
-// internal flags and do not trigger the help message.
-static bool HasGoogleTestFlagPrefix(const char* str) {
-  return (SkipPrefix("--", &str) ||
-          SkipPrefix("-", &str) ||
-          SkipPrefix("/", &str)) &&
-         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
-         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
-          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
-}
-
-// Prints a string containing code-encoded text.  The following escape
-// sequences can be used in the string to control the text color:
-//
-//   @@    prints a single '@' character.
-//   @R    changes the color to red.
-//   @G    changes the color to green.
-//   @Y    changes the color to yellow.
-//   @D    changes to the default terminal text color.
-//
-static void PrintColorEncoded(const char* str) {
-  GTestColor color = GTestColor::kDefault;  // The current color.
-
-  // Conceptually, we split the string into segments divided by escape
-  // sequences.  Then we print one segment at a time.  At the end of
-  // each iteration, the str pointer advances to the beginning of the
-  // next segment.
-  for (;;) {
-    const char* p = strchr(str, '@');
-    if (p == nullptr) {
-      ColoredPrintf(color, "%s", str);
-      return;
-    }
-
-    ColoredPrintf(color, "%s", std::string(str, p).c_str());
-
-    const char ch = p[1];
-    str = p + 2;
-    if (ch == '@') {
-      ColoredPrintf(color, "@");
-    } else if (ch == 'D') {
-      color = GTestColor::kDefault;
-    } else if (ch == 'R') {
-      color = GTestColor::kRed;
-    } else if (ch == 'G') {
-      color = GTestColor::kGreen;
-    } else if (ch == 'Y') {
-      color = GTestColor::kYellow;
-    } else {
-      --str;
-    }
-  }
-}
-
-static const char kColorEncodedHelpMessage[] =
-    "This program contains tests written using " GTEST_NAME_
-    ". You can use the\n"
-    "following command line flags to control its behavior:\n"
-    "\n"
-    "Test Selection:\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "list_tests@D\n"
-    "      List the names of all tests instead of running them. The name of\n"
-    "      TEST(Foo, Bar) is \"Foo.Bar\".\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "filter=@YPOSITIVE_PATTERNS"
-    "[@G-@YNEGATIVE_PATTERNS]@D\n"
-    "      Run only the tests whose name matches one of the positive patterns "
-    "but\n"
-    "      none of the negative patterns. '?' matches any single character; "
-    "'*'\n"
-    "      matches any substring; ':' separates two patterns.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "also_run_disabled_tests@D\n"
-    "      Run all disabled tests too.\n"
-    "\n"
-    "Test Execution:\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "repeat=@Y[COUNT]@D\n"
-    "      Run the tests repeatedly; use a negative count to repeat forever.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "shuffle@D\n"
-    "      Randomize tests' orders on every iteration.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "random_seed=@Y[NUMBER]@D\n"
-    "      Random number seed to use for shuffling test orders (between 1 and\n"
-    "      99999, or 0 to use a seed based on the current time).\n"
-    "\n"
-    "Test Output:\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
-    "      Enable/disable colored output. The default is @Gauto@D.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "brief=1@D\n"
-    "      Only print test failures.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "print_time=0@D\n"
-    "      Don't print the elapsed time of each test.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" GTEST_PATH_SEP_
-    "@Y|@G:@YFILE_PATH]@D\n"
-    "      Generate a JSON or XML report in the given directory or with the "
-    "given\n"
-    "      file name. @YFILE_PATH@D defaults to @Gtest_detail.xml@D.\n"
-# if GTEST_CAN_STREAM_RESULTS_
-    "  @G--" GTEST_FLAG_PREFIX_
-    "stream_result_to=@YHOST@G:@YPORT@D\n"
-    "      Stream test results to the given server.\n"
-# endif  // GTEST_CAN_STREAM_RESULTS_
-    "\n"
-    "Assertion Behavior:\n"
-# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-    "  @G--" GTEST_FLAG_PREFIX_
-    "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
-    "      Set the default death test style.\n"
-# endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-    "  @G--" GTEST_FLAG_PREFIX_
-    "break_on_failure@D\n"
-    "      Turn assertion failures into debugger break-points.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "throw_on_failure@D\n"
-    "      Turn assertion failures into C++ exceptions for use by an external\n"
-    "      test framework.\n"
-    "  @G--" GTEST_FLAG_PREFIX_
-    "catch_exceptions=0@D\n"
-    "      Do not report exceptions as test failures. Instead, allow them\n"
-    "      to crash the program or throw a pop-up (on Windows).\n"
-    "\n"
-    "Except for @G--" GTEST_FLAG_PREFIX_
-    "list_tests@D, you can alternatively set "
-    "the corresponding\n"
-    "environment variable of a flag (all letters in upper-case). For example, "
-    "to\n"
-    "disable colored text output, you can either specify "
-    "@G--" GTEST_FLAG_PREFIX_
-    "color=no@D or set\n"
-    "the @G" GTEST_FLAG_PREFIX_UPPER_
-    "COLOR@D environment variable to @Gno@D.\n"
-    "\n"
-    "For more information, please read the " GTEST_NAME_
-    " documentation at\n"
-    "@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_
-    "\n"
-    "(not one in your own code or tests), please report it to\n"
-    "@G<" GTEST_DEV_EMAIL_ ">@D.\n";
-
-static bool ParseGoogleTestFlag(const char* const arg) {
-  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
-                       &GTEST_FLAG(also_run_disabled_tests)) ||
-         ParseBoolFlag(arg, kBreakOnFailureFlag,
-                       &GTEST_FLAG(break_on_failure)) ||
-         ParseBoolFlag(arg, kCatchExceptionsFlag,
-                       &GTEST_FLAG(catch_exceptions)) ||
-         ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
-         ParseStringFlag(arg, kDeathTestStyleFlag,
-                         &GTEST_FLAG(death_test_style)) ||
-         ParseBoolFlag(arg, kDeathTestUseFork,
-                       &GTEST_FLAG(death_test_use_fork)) ||
-         ParseBoolFlag(arg, kFailFast, &GTEST_FLAG(fail_fast)) ||
-         ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
-         ParseStringFlag(arg, kInternalRunDeathTestFlag,
-                         &GTEST_FLAG(internal_run_death_test)) ||
-         ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
-         ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
-         ParseBoolFlag(arg, kBriefFlag, &GTEST_FLAG(brief)) ||
-         ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
-         ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
-         ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
-         ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
-         ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
-         ParseInt32Flag(arg, kStackTraceDepthFlag,
-                        &GTEST_FLAG(stack_trace_depth)) ||
-         ParseStringFlag(arg, kStreamResultToFlag,
-                         &GTEST_FLAG(stream_result_to)) ||
-         ParseBoolFlag(arg, kThrowOnFailureFlag, &GTEST_FLAG(throw_on_failure));
-}
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-static void LoadFlagsFromFile(const std::string& path) {
-  FILE* flagfile = posix::FOpen(path.c_str(), "r");
-  if (!flagfile) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
-                      << "\"";
-  }
-  std::string contents(ReadEntireFile(flagfile));
-  posix::FClose(flagfile);
-  std::vector<std::string> lines;
-  SplitString(contents, '\n', &lines);
-  for (size_t i = 0; i < lines.size(); ++i) {
-    if (lines[i].empty())
-      continue;
-    if (!ParseGoogleTestFlag(lines[i].c_str()))
-      g_help_flag = true;
-  }
-}
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.  The type parameter CharType can be
-// instantiated to either char or wchar_t.
-template <typename CharType>
-void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
-  for (int i = 1; i < *argc; i++) {
-    const std::string arg_string = StreamableToString(argv[i]);
-    const char* const arg = arg_string.c_str();
-
-    using internal::ParseBoolFlag;
-    using internal::ParseInt32Flag;
-    using internal::ParseStringFlag;
-
-    bool remove_flag = false;
-    if (ParseGoogleTestFlag(arg)) {
-      remove_flag = true;
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
-      LoadFlagsFromFile(GTEST_FLAG(flagfile));
-      remove_flag = true;
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (arg_string == "--help" || arg_string == "-h" ||
-               arg_string == "-?" || arg_string == "/?" ||
-               HasGoogleTestFlagPrefix(arg)) {
-      // Both help flag and unrecognized Google Test flags (excluding
-      // internal ones) trigger help display.
-      g_help_flag = true;
-    }
-
-    if (remove_flag) {
-      // Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
-      }
-
-      // Decrements the argument count.
-      (*argc)--;
-
-      // We also need to decrement the iterator as we just removed
-      // an element.
-      i--;
-    }
-  }
-
-  if (g_help_flag) {
-    // We print the help here instead of in RUN_ALL_TESTS(), as the
-    // latter may not be called at all if the user is using Google
-    // Test with another testing framework.
-    PrintColorEncoded(kColorEncodedHelpMessage);
-  }
-}
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
-  ParseGoogleTestFlagsOnlyImpl(argc, argv);
-
-  // Fix the value of *_NSGetArgc() on macOS, but if and only if
-  // *_NSGetArgv() == argv
-  // Only applicable to char** version of argv
-#if GTEST_OS_MAC
-#ifndef GTEST_OS_IOS
-  if (*_NSGetArgv() == argv) {
-    *_NSGetArgc() = *argc;
-  }
-#endif
-#endif
-}
-void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
-  ParseGoogleTestFlagsOnlyImpl(argc, argv);
-}
-
-// The internal implementation of InitGoogleTest().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template <typename CharType>
-void InitGoogleTestImpl(int* argc, CharType** argv) {
-  // We don't want to run the initialization code twice.
-  if (GTestIsInitialized()) return;
-
-  if (*argc <= 0) return;
-
-  g_argvs.clear();
-  for (int i = 0; i != *argc; i++) {
-    g_argvs.push_back(StreamableToString(argv[i]));
-  }
-
-#if GTEST_HAS_ABSL
-  absl::InitializeSymbolizer(g_argvs[0].c_str());
-#endif  // GTEST_HAS_ABSL
-
-  ParseGoogleTestFlagsOnly(argc, argv);
-  GetUnitTestImpl()->PostFlagParsingInit();
-}
-
-}  // namespace internal
-
-// Initializes Google Test.  This must be called before calling
-// RUN_ALL_TESTS().  In particular, it parses a command line for the
-// flags that Google Test recognizes.  Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-void InitGoogleTest(int* argc, char** argv) {
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-void InitGoogleTest(int* argc, wchar_t** argv) {
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-void InitGoogleTest() {
-  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
-  int argc = 1;
-  const auto arg0 = "dummy";
-  char* argv0 = const_cast<char*>(arg0);
-  char** argv = &argv0;
-
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(&argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(&argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-std::string TempDir() {
-#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
-  return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
-#elif GTEST_OS_WINDOWS_MOBILE
-  return "\\temp\\";
-#elif GTEST_OS_WINDOWS
-  const char* temp_dir = internal::posix::GetEnv("TEMP");
-  if (temp_dir == nullptr || temp_dir[0] == '\0') {
-    return "\\temp\\";
-  } else if (temp_dir[strlen(temp_dir) - 1] == '\\') {
-    return temp_dir;
-  } else {
-    return std::string(temp_dir) + "\\";
-  }
-#elif GTEST_OS_LINUX_ANDROID
-  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
-  if (temp_dir == nullptr || temp_dir[0] == '\0') {
-    return "/data/local/tmp/";
-  } else {
-    return temp_dir;
-  }
-#elif GTEST_OS_LINUX
-  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
-  if (temp_dir == nullptr || temp_dir[0] == '\0') {
-    return "/tmp/";
-  } else {
-    return temp_dir;
-  }
-#else
-  return "/tmp/";
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Class ScopedTrace
-
-// Pushes the given source file location and message onto a per-thread
-// trace stack maintained by Google Test.
-void ScopedTrace::PushTrace(const char* file, int line, std::string message) {
-  internal::TraceInfo trace;
-  trace.file = file;
-  trace.line = line;
-  trace.message.swap(message);
-
-  UnitTest::GetInstance()->PushGTestTrace(trace);
-}
-
-// Pops the info pushed by the c'tor.
-ScopedTrace::~ScopedTrace()
-    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
-  UnitTest::GetInstance()->PopGTestTrace();
-}
-
-}  // namespace testing
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// This file implements death tests.
-
-
-#include <functional>
-#include <utility>
-
-
-#if GTEST_HAS_DEATH_TEST
-
-# if GTEST_OS_MAC
-#  include <crt_externs.h>
-# endif  // GTEST_OS_MAC
-
-# include <errno.h>
-# include <fcntl.h>
-# include <limits.h>
-
-# if GTEST_OS_LINUX
-#  include <signal.h>
-# endif  // GTEST_OS_LINUX
-
-# include <stdarg.h>
-
-# if GTEST_OS_WINDOWS
-#  include <windows.h>
-# else
-#  include <sys/mman.h>
-#  include <sys/wait.h>
-# endif  // GTEST_OS_WINDOWS
-
-# if GTEST_OS_QNX
-#  include <spawn.h>
-# endif  // GTEST_OS_QNX
-
-# if GTEST_OS_FUCHSIA
-#  include <lib/fdio/fd.h>
-#  include <lib/fdio/io.h>
-#  include <lib/fdio/spawn.h>
-#  include <lib/zx/channel.h>
-#  include <lib/zx/port.h>
-#  include <lib/zx/process.h>
-#  include <lib/zx/socket.h>
-#  include <zircon/processargs.h>
-#  include <zircon/syscalls.h>
-#  include <zircon/syscalls/policy.h>
-#  include <zircon/syscalls/port.h>
-# endif  // GTEST_OS_FUCHSIA
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-
-namespace testing {
-
-// Constants.
-
-// The default death test style.
-//
-// This is defined in internal/gtest-port.h as "fast", but can be overridden by
-// a definition in internal/custom/gtest-port.h. The recommended value, which is
-// used internally at Google, is "threadsafe".
-static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
-
-GTEST_DEFINE_string_(
-    death_test_style,
-    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
-    "Indicates how to run a death test in a forked child process: "
-    "\"threadsafe\" (child process re-executes the test binary "
-    "from the beginning, running only the specific death test) or "
-    "\"fast\" (child process runs the death test immediately "
-    "after forking).");
-
-GTEST_DEFINE_bool_(
-    death_test_use_fork,
-    internal::BoolFromGTestEnv("death_test_use_fork", false),
-    "Instructs to use fork()/_exit() instead of clone() in death tests. "
-    "Ignored and always uses fork() on POSIX systems where clone() is not "
-    "implemented. Useful when running under valgrind or similar tools if "
-    "those do not support clone(). Valgrind 3.3.1 will just fail if "
-    "it sees an unsupported combination of clone() flags. "
-    "It is not recommended to use this flag w/o valgrind though it will "
-    "work in 99% of the cases. Once valgrind is fixed, this flag will "
-    "most likely be removed.");
-
-namespace internal {
-GTEST_DEFINE_string_(
-    internal_run_death_test, "",
-    "Indicates the file, line number, temporal index of "
-    "the single death test to run, and a file descriptor to "
-    "which a success code may be sent, all separated by "
-    "the '|' characters.  This flag is specified if and only if the "
-    "current process is a sub-process launched for running a thread-safe "
-    "death test.  FOR INTERNAL USE ONLY.");
-}  // namespace internal
-
-#if GTEST_HAS_DEATH_TEST
-
-namespace internal {
-
-// Valid only for fast death tests. Indicates the code is running in the
-// child process of a fast style death test.
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-static bool g_in_fast_death_test_child = false;
-# endif
-
-// Returns a Boolean value indicating whether the caller is currently
-// executing in the context of the death test child process.  Tools such as
-// Valgrind heap checkers may need this to modify their behavior in death
-// tests.  IMPORTANT: This is an internal utility.  Using it may break the
-// implementation of death tests.  User code MUST NOT use it.
-bool InDeathTestChild() {
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  // On Windows and Fuchsia, death tests are thread-safe regardless of the value
-  // of the death_test_style flag.
-  return !GTEST_FLAG(internal_run_death_test).empty();
-
-# else
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe")
-    return !GTEST_FLAG(internal_run_death_test).empty();
-  else
-    return g_in_fast_death_test_child;
-#endif
-}
-
-}  // namespace internal
-
-// ExitedWithCode constructor.
-ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
-}
-
-// ExitedWithCode function-call operator.
-bool ExitedWithCode::operator()(int exit_status) const {
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  return exit_status == exit_code_;
-
-# else
-
-  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
-
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-}
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// KilledBySignal constructor.
-KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
-}
-
-// KilledBySignal function-call operator.
-bool KilledBySignal::operator()(int exit_status) const {
-#  if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
-  {
-    bool result;
-    if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
-      return result;
-    }
-  }
-#  endif  // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
-  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
-}
-# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-
-namespace internal {
-
-// Utilities needed for death tests.
-
-// Generates a textual description of a given exit code, in the format
-// specified by wait(2).
-static std::string ExitSummary(int exit_code) {
-  Message m;
-
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  m << "Exited with exit status " << exit_code;
-
-# else
-
-  if (WIFEXITED(exit_code)) {
-    m << "Exited with exit status " << WEXITSTATUS(exit_code);
-  } else if (WIFSIGNALED(exit_code)) {
-    m << "Terminated by signal " << WTERMSIG(exit_code);
-  }
-#  ifdef WCOREDUMP
-  if (WCOREDUMP(exit_code)) {
-    m << " (core dumped)";
-  }
-#  endif
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  return m.GetString();
-}
-
-// Returns true if exit_status describes a process that was terminated
-// by a signal, or exited normally with a nonzero exit code.
-bool ExitedUnsuccessfully(int exit_status) {
-  return !ExitedWithCode(0)(exit_status);
-}
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// Generates a textual failure message when a death test finds more than
-// one thread running, or cannot determine the number of threads, prior
-// to executing the given statement.  It is the responsibility of the
-// caller not to pass a thread_count of 1.
-static std::string DeathTestThreadWarning(size_t thread_count) {
-  Message msg;
-  msg << "Death tests use fork(), which is unsafe particularly"
-      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
-  if (thread_count == 0) {
-    msg << "couldn't detect the number of threads.";
-  } else {
-    msg << "detected " << thread_count << " threads.";
-  }
-  msg << " See "
-         "https://github.com/google/googletest/blob/master/docs/"
-         "advanced.md#death-tests-and-threads"
-      << " for more explanation and suggested solutions, especially if"
-      << " this is the last message you see before your test times out.";
-  return msg.GetString();
-}
-# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-
-// Flag characters for reporting a death test that did not die.
-static const char kDeathTestLived = 'L';
-static const char kDeathTestReturned = 'R';
-static const char kDeathTestThrew = 'T';
-static const char kDeathTestInternalError = 'I';
-
-#if GTEST_OS_FUCHSIA
-
-// File descriptor used for the pipe in the child process.
-static const int kFuchsiaReadPipeFd = 3;
-
-#endif
-
-// An enumeration describing all of the possible ways that a death test can
-// conclude.  DIED means that the process died while executing the test
-// code; LIVED means that process lived beyond the end of the test code;
-// RETURNED means that the test statement attempted to execute a return
-// statement, which is not allowed; THREW means that the test statement
-// returned control by throwing an exception.  IN_PROGRESS means the test
-// has not yet concluded.
-enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
-
-// Routine for aborting the program which is safe to call from an
-// exec-style death test child process, in which case the error
-// message is propagated back to the parent process.  Otherwise, the
-// message is simply printed to stderr.  In either case, the program
-// then exits with status 1.
-static void DeathTestAbort(const std::string& message) {
-  // On a POSIX system, this function may be called from a threadsafe-style
-  // death test child process, which operates on a very small stack.  Use
-  // the heap for any additional non-minuscule memory requirements.
-  const InternalRunDeathTestFlag* const flag =
-      GetUnitTestImpl()->internal_run_death_test_flag();
-  if (flag != nullptr) {
-    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
-    fputc(kDeathTestInternalError, parent);
-    fprintf(parent, "%s", message.c_str());
-    fflush(parent);
-    _exit(1);
-  } else {
-    fprintf(stderr, "%s", message.c_str());
-    fflush(stderr);
-    posix::Abort();
-  }
-}
-
-// A replacement for CHECK that calls DeathTestAbort if the assertion
-// fails.
-# define GTEST_DEATH_TEST_CHECK_(expression) \
-  do { \
-    if (!::testing::internal::IsTrue(expression)) { \
-      DeathTestAbort( \
-          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
-          + ::testing::internal::StreamableToString(__LINE__) + ": " \
-          + #expression); \
-    } \
-  } while (::testing::internal::AlwaysFalse())
-
-// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
-// evaluating any system call that fulfills two conditions: it must return
-// -1 on failure, and set errno to EINTR when it is interrupted and
-// should be tried again.  The macro expands to a loop that repeatedly
-// evaluates the expression as long as it evaluates to -1 and sets
-// errno to EINTR.  If the expression evaluates to -1 but errno is
-// something other than EINTR, DeathTestAbort is called.
-# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
-  do { \
-    int gtest_retval; \
-    do { \
-      gtest_retval = (expression); \
-    } while (gtest_retval == -1 && errno == EINTR); \
-    if (gtest_retval == -1) { \
-      DeathTestAbort( \
-          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
-          + ::testing::internal::StreamableToString(__LINE__) + ": " \
-          + #expression + " != -1"); \
-    } \
-  } while (::testing::internal::AlwaysFalse())
-
-// Returns the message describing the last system error in errno.
-std::string GetLastErrnoDescription() {
-    return errno == 0 ? "" : posix::StrError(errno);
-}
-
-// This is called from a death test parent process to read a failure
-// message from the death test child process and log it with the FATAL
-// severity. On Windows, the message is read from a pipe handle. On other
-// platforms, it is read from a file descriptor.
-static void FailFromInternalError(int fd) {
-  Message error;
-  char buffer[256];
-  int num_read;
-
-  do {
-    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
-      buffer[num_read] = '\0';
-      error << buffer;
-    }
-  } while (num_read == -1 && errno == EINTR);
-
-  if (num_read == 0) {
-    GTEST_LOG_(FATAL) << error.GetString();
-  } else {
-    const int last_error = errno;
-    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
-                      << GetLastErrnoDescription() << " [" << last_error << "]";
-  }
-}
-
-// Death test constructor.  Increments the running death test count
-// for the current test.
-DeathTest::DeathTest() {
-  TestInfo* const info = GetUnitTestImpl()->current_test_info();
-  if (info == nullptr) {
-    DeathTestAbort("Cannot run a death test outside of a TEST or "
-                   "TEST_F construct");
-  }
-}
-
-// Creates and returns a death test by dispatching to the current
-// death test factory.
-bool DeathTest::Create(const char* statement,
-                       Matcher<const std::string&> matcher, const char* file,
-                       int line, DeathTest** test) {
-  return GetUnitTestImpl()->death_test_factory()->Create(
-      statement, std::move(matcher), file, line, test);
-}
-
-const char* DeathTest::LastMessage() {
-  return last_death_test_message_.c_str();
-}
-
-void DeathTest::set_last_death_test_message(const std::string& message) {
-  last_death_test_message_ = message;
-}
-
-std::string DeathTest::last_death_test_message_;
-
-// Provides cross platform implementation for some death functionality.
-class DeathTestImpl : public DeathTest {
- protected:
-  DeathTestImpl(const char* a_statement, Matcher<const std::string&> matcher)
-      : statement_(a_statement),
-        matcher_(std::move(matcher)),
-        spawned_(false),
-        status_(-1),
-        outcome_(IN_PROGRESS),
-        read_fd_(-1),
-        write_fd_(-1) {}
-
-  // read_fd_ is expected to be closed and cleared by a derived class.
-  ~DeathTestImpl() override { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
-
-  void Abort(AbortReason reason) override;
-  bool Passed(bool status_ok) override;
-
-  const char* statement() const { return statement_; }
-  bool spawned() const { return spawned_; }
-  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
-  int status() const { return status_; }
-  void set_status(int a_status) { status_ = a_status; }
-  DeathTestOutcome outcome() const { return outcome_; }
-  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
-  int read_fd() const { return read_fd_; }
-  void set_read_fd(int fd) { read_fd_ = fd; }
-  int write_fd() const { return write_fd_; }
-  void set_write_fd(int fd) { write_fd_ = fd; }
-
-  // Called in the parent process only. Reads the result code of the death
-  // test child process via a pipe, interprets it to set the outcome_
-  // member, and closes read_fd_.  Outputs diagnostics and terminates in
-  // case of unexpected codes.
-  void ReadAndInterpretStatusByte();
-
-  // Returns stderr output from the child process.
-  virtual std::string GetErrorLogs();
-
- private:
-  // The textual content of the code this object is testing.  This class
-  // doesn't own this string and should not attempt to delete it.
-  const char* const statement_;
-  // A matcher that's expected to match the stderr output by the child process.
-  Matcher<const std::string&> matcher_;
-  // True if the death test child process has been successfully spawned.
-  bool spawned_;
-  // The exit status of the child process.
-  int status_;
-  // How the death test concluded.
-  DeathTestOutcome outcome_;
-  // Descriptor to the read end of the pipe to the child process.  It is
-  // always -1 in the child process.  The child keeps its write end of the
-  // pipe in write_fd_.
-  int read_fd_;
-  // Descriptor to the child's write end of the pipe to the parent process.
-  // It is always -1 in the parent process.  The parent keeps its end of the
-  // pipe in read_fd_.
-  int write_fd_;
-};
-
-// Called in the parent process only. Reads the result code of the death
-// test child process via a pipe, interprets it to set the outcome_
-// member, and closes read_fd_.  Outputs diagnostics and terminates in
-// case of unexpected codes.
-void DeathTestImpl::ReadAndInterpretStatusByte() {
-  char flag;
-  int bytes_read;
-
-  // The read() here blocks until data is available (signifying the
-  // failure of the death test) or until the pipe is closed (signifying
-  // its success), so it's okay to call this in the parent before
-  // the child process has exited.
-  do {
-    bytes_read = posix::Read(read_fd(), &flag, 1);
-  } while (bytes_read == -1 && errno == EINTR);
-
-  if (bytes_read == 0) {
-    set_outcome(DIED);
-  } else if (bytes_read == 1) {
-    switch (flag) {
-      case kDeathTestReturned:
-        set_outcome(RETURNED);
-        break;
-      case kDeathTestThrew:
-        set_outcome(THREW);
-        break;
-      case kDeathTestLived:
-        set_outcome(LIVED);
-        break;
-      case kDeathTestInternalError:
-        FailFromInternalError(read_fd());  // Does not return.
-        break;
-      default:
-        GTEST_LOG_(FATAL) << "Death test child process reported "
-                          << "unexpected status byte ("
-                          << static_cast<unsigned int>(flag) << ")";
-    }
-  } else {
-    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
-                      << GetLastErrnoDescription();
-  }
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
-  set_read_fd(-1);
-}
-
-std::string DeathTestImpl::GetErrorLogs() {
-  return GetCapturedStderr();
-}
-
-// Signals that the death test code which should have exited, didn't.
-// Should be called only in a death test child process.
-// Writes a status byte to the child's status file descriptor, then
-// calls _exit(1).
-void DeathTestImpl::Abort(AbortReason reason) {
-  // The parent process considers the death test to be a failure if
-  // it finds any data in our pipe.  So, here we write a single flag byte
-  // to the pipe, then exit.
-  const char status_ch =
-      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
-      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
-
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
-  // We are leaking the descriptor here because on some platforms (i.e.,
-  // when built as Windows DLL), destructors of global objects will still
-  // run after calling _exit(). On such systems, write_fd_ will be
-  // indirectly closed from the destructor of UnitTestImpl, causing double
-  // close if it is also closed here. On debug configurations, double close
-  // may assert. As there are no in-process buffers to flush here, we are
-  // relying on the OS to close the descriptor after the process terminates
-  // when the destructors are not run.
-  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
-}
-
-// Returns an indented copy of stderr output for a death test.
-// This makes distinguishing death test output lines from regular log lines
-// much easier.
-static ::std::string FormatDeathTestOutput(const ::std::string& output) {
-  ::std::string ret;
-  for (size_t at = 0; ; ) {
-    const size_t line_end = output.find('\n', at);
-    ret += "[  DEATH   ] ";
-    if (line_end == ::std::string::npos) {
-      ret += output.substr(at);
-      break;
-    }
-    ret += output.substr(at, line_end + 1 - at);
-    at = line_end + 1;
-  }
-  return ret;
-}
-
-// Assesses the success or failure of a death test, using both private
-// members which have previously been set, and one argument:
-//
-// Private data members:
-//   outcome:  An enumeration describing how the death test
-//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
-//             fails in the latter three cases.
-//   status:   The exit status of the child process. On *nix, it is in the
-//             in the format specified by wait(2). On Windows, this is the
-//             value supplied to the ExitProcess() API or a numeric code
-//             of the exception that terminated the program.
-//   matcher_: A matcher that's expected to match the stderr output by the child
-//             process.
-//
-// Argument:
-//   status_ok: true if exit_status is acceptable in the context of
-//              this particular death test, which fails if it is false
-//
-// Returns true if and only if all of the above conditions are met.  Otherwise,
-// the first failing condition, in the order given above, is the one that is
-// reported. Also sets the last death test message string.
-bool DeathTestImpl::Passed(bool status_ok) {
-  if (!spawned())
-    return false;
-
-  const std::string error_message = GetErrorLogs();
-
-  bool success = false;
-  Message buffer;
-
-  buffer << "Death test: " << statement() << "\n";
-  switch (outcome()) {
-    case LIVED:
-      buffer << "    Result: failed to die.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case THREW:
-      buffer << "    Result: threw an exception.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case RETURNED:
-      buffer << "    Result: illegal return in test statement.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case DIED:
-      if (status_ok) {
-        if (matcher_.Matches(error_message)) {
-          success = true;
-        } else {
-          std::ostringstream stream;
-          matcher_.DescribeTo(&stream);
-          buffer << "    Result: died but not with expected error.\n"
-                 << "  Expected: " << stream.str() << "\n"
-                 << "Actual msg:\n"
-                 << FormatDeathTestOutput(error_message);
-        }
-      } else {
-        buffer << "    Result: died but not with expected exit code:\n"
-               << "            " << ExitSummary(status()) << "\n"
-               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
-      }
-      break;
-    case IN_PROGRESS:
-    default:
-      GTEST_LOG_(FATAL)
-          << "DeathTest::Passed somehow called before conclusion of test";
-  }
-
-  DeathTest::set_last_death_test_message(buffer.GetString());
-  return success;
-}
-
-# if GTEST_OS_WINDOWS
-// WindowsDeathTest implements death tests on Windows. Due to the
-// specifics of starting new processes on Windows, death tests there are
-// always threadsafe, and Google Test considers the
-// --gtest_death_test_style=fast setting to be equivalent to
-// --gtest_death_test_style=threadsafe there.
-//
-// A few implementation notes:  Like the Linux version, the Windows
-// implementation uses pipes for child-to-parent communication. But due to
-// the specifics of pipes on Windows, some extra steps are required:
-//
-// 1. The parent creates a communication pipe and stores handles to both
-//    ends of it.
-// 2. The parent starts the child and provides it with the information
-//    necessary to acquire the handle to the write end of the pipe.
-// 3. The child acquires the write end of the pipe and signals the parent
-//    using a Windows event.
-// 4. Now the parent can release the write end of the pipe on its side. If
-//    this is done before step 3, the object's reference count goes down to
-//    0 and it is destroyed, preventing the child from acquiring it. The
-//    parent now has to release it, or read operations on the read end of
-//    the pipe will not return when the child terminates.
-// 5. The parent reads child's output through the pipe (outcome code and
-//    any possible error messages) from the pipe, and its stderr and then
-//    determines whether to fail the test.
-//
-// Note: to distinguish Win32 API calls from the local method and function
-// calls, the former are explicitly resolved in the global namespace.
-//
-class WindowsDeathTest : public DeathTestImpl {
- public:
-  WindowsDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                   const char* file, int line)
-      : DeathTestImpl(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-
-  // All of these virtual functions are inherited from DeathTest.
-  virtual int Wait();
-  virtual TestRole AssumeRole();
-
- private:
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-  // Handle to the write end of the pipe to the child process.
-  AutoHandle write_handle_;
-  // Child process handle.
-  AutoHandle child_handle_;
-  // Event the child process uses to signal the parent that it has
-  // acquired the handle to the write end of the pipe. After seeing this
-  // event the parent can release its own handles to make sure its
-  // ReadFile() calls return when the child terminates.
-  AutoHandle event_handle_;
-};
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int WindowsDeathTest::Wait() {
-  if (!spawned())
-    return 0;
-
-  // Wait until the child either signals that it has acquired the write end
-  // of the pipe or it dies.
-  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
-  switch (::WaitForMultipleObjects(2,
-                                   wait_handles,
-                                   FALSE,  // Waits for any of the handles.
-                                   INFINITE)) {
-    case WAIT_OBJECT_0:
-    case WAIT_OBJECT_0 + 1:
-      break;
-    default:
-      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
-  }
-
-  // The child has acquired the write end of the pipe or exited.
-  // We release the handle on our side and continue.
-  write_handle_.Reset();
-  event_handle_.Reset();
-
-  ReadAndInterpretStatusByte();
-
-  // Waits for the child process to exit if it haven't already. This
-  // returns immediately if the child has already exited, regardless of
-  // whether previous calls to WaitForMultipleObjects synchronized on this
-  // handle or not.
-  GTEST_DEATH_TEST_CHECK_(
-      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
-                                             INFINITE));
-  DWORD status_code;
-  GTEST_DEATH_TEST_CHECK_(
-      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
-  child_handle_.Reset();
-  set_status(static_cast<int>(status_code));
-  return status();
-}
-
-// The AssumeRole process for a Windows death test.  It creates a child
-// process with the same executable as the current process to run the
-// death test.  The child process is given the --gtest_filter and
-// --gtest_internal_run_death_test flags such that it knows to run the
-// current death test only.
-DeathTest::TestRole WindowsDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    // ParseInternalRunDeathTestFlag() has performed all the necessary
-    // processing.
-    set_write_fd(flag->write_fd());
-    return EXECUTE_TEST;
-  }
-
-  // WindowsDeathTest uses an anonymous pipe to communicate results of
-  // a death test.
-  SECURITY_ATTRIBUTES handles_are_inheritable = {sizeof(SECURITY_ATTRIBUTES),
-                                                 nullptr, TRUE};
-  HANDLE read_handle, write_handle;
-  GTEST_DEATH_TEST_CHECK_(
-      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
-                   0)  // Default buffer size.
-      != FALSE);
-  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
-                                O_RDONLY));
-  write_handle_.Reset(write_handle);
-  event_handle_.Reset(::CreateEvent(
-      &handles_are_inheritable,
-      TRUE,       // The event will automatically reset to non-signaled state.
-      FALSE,      // The initial state is non-signalled.
-      nullptr));  // The even is unnamed.
-  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr);
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
-      "=" + file_ + "|" + StreamableToString(line_) + "|" +
-      StreamableToString(death_test_index) + "|" +
-      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
-      // size_t has the same width as pointers on both 32-bit and 64-bit
-      // Windows platforms.
-      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
-      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
-      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
-
-  char executable_path[_MAX_PATH + 1];  // NOLINT
-  GTEST_DEATH_TEST_CHECK_(_MAX_PATH + 1 != ::GetModuleFileNameA(nullptr,
-                                                                executable_path,
-                                                                _MAX_PATH));
-
-  std::string command_line =
-      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
-      internal_flag + "\"";
-
-  DeathTest::set_last_death_test_message("");
-
-  CaptureStderr();
-  // Flush the log buffers since the log streams are shared with the child.
-  FlushInfoLog();
-
-  // The child process will share the standard handles with the parent.
-  STARTUPINFOA startup_info;
-  memset(&startup_info, 0, sizeof(STARTUPINFO));
-  startup_info.dwFlags = STARTF_USESTDHANDLES;
-  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
-  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
-  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
-
-  PROCESS_INFORMATION process_info;
-  GTEST_DEATH_TEST_CHECK_(
-      ::CreateProcessA(
-          executable_path, const_cast<char*>(command_line.c_str()),
-          nullptr,  // Retuned process handle is not inheritable.
-          nullptr,  // Retuned thread handle is not inheritable.
-          TRUE,  // Child inherits all inheritable handles (for write_handle_).
-          0x0,   // Default creation flags.
-          nullptr,  // Inherit the parent's environment.
-          UnitTest::GetInstance()->original_working_dir(), &startup_info,
-          &process_info) != FALSE);
-  child_handle_.Reset(process_info.hProcess);
-  ::CloseHandle(process_info.hThread);
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-# elif GTEST_OS_FUCHSIA
-
-class FuchsiaDeathTest : public DeathTestImpl {
- public:
-  FuchsiaDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                   const char* file, int line)
-      : DeathTestImpl(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-
-  // All of these virtual functions are inherited from DeathTest.
-  int Wait() override;
-  TestRole AssumeRole() override;
-  std::string GetErrorLogs() override;
-
- private:
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-  // The stderr data captured by the child process.
-  std::string captured_stderr_;
-
-  zx::process child_process_;
-  zx::channel exception_channel_;
-  zx::socket stderr_socket_;
-};
-
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end();
-         ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() {
-    return &args_[0];
-  }
-
-  int size() {
-    return static_cast<int>(args_.size()) - 1;
-  }
-
- private:
-  std::vector<char*> args_;
-};
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int FuchsiaDeathTest::Wait() {
-  const int kProcessKey = 0;
-  const int kSocketKey = 1;
-  const int kExceptionKey = 2;
-
-  if (!spawned())
-    return 0;
-
-  // Create a port to wait for socket/task/exception events.
-  zx_status_t status_zx;
-  zx::port port;
-  status_zx = zx::port::create(0, &port);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for the child process to terminate.
-  status_zx = child_process_.wait_async(
-      port, kProcessKey, ZX_PROCESS_TERMINATED, 0);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for the socket to be readable or closed.
-  status_zx = stderr_socket_.wait_async(
-      port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED, 0);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for an exception.
-  status_zx = exception_channel_.wait_async(
-      port, kExceptionKey, ZX_CHANNEL_READABLE, 0);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  bool process_terminated = false;
-  bool socket_closed = false;
-  do {
-    zx_port_packet_t packet = {};
-    status_zx = port.wait(zx::time::infinite(), &packet);
-    GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-    if (packet.key == kExceptionKey) {
-      // Process encountered an exception. Kill it directly rather than
-      // letting other handlers process the event. We will get a kProcessKey
-      // event when the process actually terminates.
-      status_zx = child_process_.kill();
-      GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-    } else if (packet.key == kProcessKey) {
-      // Process terminated.
-      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
-      GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
-      process_terminated = true;
-    } else if (packet.key == kSocketKey) {
-      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
-      if (packet.signal.observed & ZX_SOCKET_READABLE) {
-        // Read data from the socket.
-        constexpr size_t kBufferSize = 1024;
-        do {
-          size_t old_length = captured_stderr_.length();
-          size_t bytes_read = 0;
-          captured_stderr_.resize(old_length + kBufferSize);
-          status_zx = stderr_socket_.read(
-              0, &captured_stderr_.front() + old_length, kBufferSize,
-              &bytes_read);
-          captured_stderr_.resize(old_length + bytes_read);
-        } while (status_zx == ZX_OK);
-        if (status_zx == ZX_ERR_PEER_CLOSED) {
-          socket_closed = true;
-        } else {
-          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_ERR_SHOULD_WAIT);
-          status_zx = stderr_socket_.wait_async(
-              port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED, 0);
-          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-        }
-      } else {
-        GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_SOCKET_PEER_CLOSED);
-        socket_closed = true;
-      }
-    }
-  } while (!process_terminated && !socket_closed);
-
-  ReadAndInterpretStatusByte();
-
-  zx_info_process_t buffer;
-  status_zx = child_process_.get_info(ZX_INFO_PROCESS, &buffer, sizeof(buffer),
-                                      nullptr, nullptr);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  GTEST_DEATH_TEST_CHECK_(buffer.flags & ZX_INFO_PROCESS_FLAG_EXITED);
-  set_status(static_cast<int>(buffer.return_code));
-  return status();
-}
-
-// The AssumeRole process for a Fuchsia death test.  It creates a child
-// process with the same executable as the current process to run the
-// death test.  The child process is given the --gtest_filter and
-// --gtest_internal_run_death_test flags such that it knows to run the
-// current death test only.
-DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    // ParseInternalRunDeathTestFlag() has performed all the necessary
-    // processing.
-    set_write_fd(kFuchsiaReadPipeFd);
-    return EXECUTE_TEST;
-  }
-
-  // Flush the log buffers since the log streams are shared with the child.
-  FlushInfoLog();
-
-  // Build the child process command line.
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
-      + file_ + "|"
-      + StreamableToString(line_) + "|"
-      + StreamableToString(death_test_index);
-  Arguments args;
-  args.AddArguments(GetInjectableArgvs());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
-
-  // Build the pipe for communication with the child.
-  zx_status_t status;
-  zx_handle_t child_pipe_handle;
-  int child_pipe_fd;
-  status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-  set_read_fd(child_pipe_fd);
-
-  // Set the pipe handle for the child.
-  fdio_spawn_action_t spawn_actions[2] = {};
-  fdio_spawn_action_t* add_handle_action = &spawn_actions[0];
-  add_handle_action->action = FDIO_SPAWN_ACTION_ADD_HANDLE;
-  add_handle_action->h.id = PA_HND(PA_FD, kFuchsiaReadPipeFd);
-  add_handle_action->h.handle = child_pipe_handle;
-
-  // Create a socket pair will be used to receive the child process' stderr.
-  zx::socket stderr_producer_socket;
-  status =
-      zx::socket::create(0, &stderr_producer_socket, &stderr_socket_);
-  GTEST_DEATH_TEST_CHECK_(status >= 0);
-  int stderr_producer_fd = -1;
-  status =
-      fdio_fd_create(stderr_producer_socket.release(), &stderr_producer_fd);
-  GTEST_DEATH_TEST_CHECK_(status >= 0);
-
-  // Make the stderr socket nonblocking.
-  GTEST_DEATH_TEST_CHECK_(fcntl(stderr_producer_fd, F_SETFL, 0) == 0);
-
-  fdio_spawn_action_t* add_stderr_action = &spawn_actions[1];
-  add_stderr_action->action = FDIO_SPAWN_ACTION_CLONE_FD;
-  add_stderr_action->fd.local_fd = stderr_producer_fd;
-  add_stderr_action->fd.target_fd = STDERR_FILENO;
-
-  // Create a child job.
-  zx_handle_t child_job = ZX_HANDLE_INVALID;
-  status = zx_job_create(zx_job_default(), 0, & child_job);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-  zx_policy_basic_t policy;
-  policy.condition = ZX_POL_NEW_ANY;
-  policy.policy = ZX_POL_ACTION_ALLOW;
-  status = zx_job_set_policy(
-      child_job, ZX_JOB_POL_RELATIVE, ZX_JOB_POL_BASIC, &policy, 1);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  // Create an exception channel attached to the |child_job|, to allow
-  // us to suppress the system default exception handler from firing.
-  status =
-      zx_task_create_exception_channel(
-          child_job, 0, exception_channel_.reset_and_get_address());
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  // Spawn the child process.
-  status = fdio_spawn_etc(
-      child_job, FDIO_SPAWN_CLONE_ALL, args.Argv()[0], args.Argv(), nullptr,
-      2, spawn_actions, child_process_.reset_and_get_address(), nullptr);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-std::string FuchsiaDeathTest::GetErrorLogs() {
-  return captured_stderr_;
-}
-
-#else  // We are neither on Windows, nor on Fuchsia.
-
-// ForkingDeathTest provides implementations for most of the abstract
-// methods of the DeathTest interface.  Only the AssumeRole method is
-// left undefined.
-class ForkingDeathTest : public DeathTestImpl {
- public:
-  ForkingDeathTest(const char* statement, Matcher<const std::string&> matcher);
-
-  // All of these virtual functions are inherited from DeathTest.
-  int Wait() override;
-
- protected:
-  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
-
- private:
-  // PID of child process during death test; 0 in the child process itself.
-  pid_t child_pid_;
-};
-
-// Constructs a ForkingDeathTest.
-ForkingDeathTest::ForkingDeathTest(const char* a_statement,
-                                   Matcher<const std::string&> matcher)
-    : DeathTestImpl(a_statement, std::move(matcher)), child_pid_(-1) {}
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int ForkingDeathTest::Wait() {
-  if (!spawned())
-    return 0;
-
-  ReadAndInterpretStatusByte();
-
-  int status_value;
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
-  set_status(status_value);
-  return status_value;
-}
-
-// A concrete death test class that forks, then immediately runs the test
-// in the child process.
-class NoExecDeathTest : public ForkingDeathTest {
- public:
-  NoExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher)
-      : ForkingDeathTest(a_statement, std::move(matcher)) {}
-  TestRole AssumeRole() override;
-};
-
-// The AssumeRole process for a fork-and-run death test.  It implements a
-// straightforward fork, with a simple pipe to transmit the status byte.
-DeathTest::TestRole NoExecDeathTest::AssumeRole() {
-  const size_t thread_count = GetThreadCount();
-  if (thread_count != 1) {
-    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
-  }
-
-  int pipe_fd[2];
-  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
-
-  DeathTest::set_last_death_test_message("");
-  CaptureStderr();
-  // When we fork the process below, the log file buffers are copied, but the
-  // file descriptors are shared.  We flush all log files here so that closing
-  // the file descriptors in the child process doesn't throw off the
-  // synchronization between descriptors and buffers in the parent process.
-  // This is as close to the fork as possible to avoid a race condition in case
-  // there are multiple threads running before the death test, and another
-  // thread writes to the log file.
-  FlushInfoLog();
-
-  const pid_t child_pid = fork();
-  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
-  set_child_pid(child_pid);
-  if (child_pid == 0) {
-    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
-    set_write_fd(pipe_fd[1]);
-    // Redirects all logging to stderr in the child process to prevent
-    // concurrent writes to the log files.  We capture stderr in the parent
-    // process and append the child process' output to a log.
-    LogToStderr();
-    // Event forwarding to the listeners of event listener API mush be shut
-    // down in death test subprocesses.
-    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
-    g_in_fast_death_test_child = true;
-    return EXECUTE_TEST;
-  } else {
-    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
-    set_read_fd(pipe_fd[0]);
-    set_spawned(true);
-    return OVERSEE_TEST;
-  }
-}
-
-// A concrete death test class that forks and re-executes the main
-// program from the beginning, with command-line flags set that cause
-// only this specific death test to be run.
-class ExecDeathTest : public ForkingDeathTest {
- public:
-  ExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                const char* file, int line)
-      : ForkingDeathTest(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-  TestRole AssumeRole() override;
-
- private:
-  static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() {
-    ::std::vector<std::string> args = GetInjectableArgvs();
-#  if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
-    ::std::vector<std::string> extra_args =
-        GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
-    args.insert(args.end(), extra_args.begin(), extra_args.end());
-#  endif  // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
-    return args;
-  }
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-};
-
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end();
-         ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() {
-    return &args_[0];
-  }
-
- private:
-  std::vector<char*> args_;
-};
-
-// A struct that encompasses the arguments to the child process of a
-// threadsafe-style death test process.
-struct ExecDeathTestArgs {
-  char* const* argv;  // Command-line arguments for the child's call to exec
-  int close_fd;       // File descriptor to close; the read end of a pipe
-};
-
-#  if GTEST_OS_QNX
-extern "C" char** environ;
-#  else  // GTEST_OS_QNX
-// The main function for a threadsafe-style death test child process.
-// This function is called in a clone()-ed process and thus must avoid
-// any potentially unsafe operations like malloc or libc functions.
-static int ExecDeathTestChildMain(void* child_arg) {
-  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
-
-  // We need to execute the test program in the same environment where
-  // it was originally invoked.  Therefore we change to the original
-  // working directory first.
-  const char* const original_dir =
-      UnitTest::GetInstance()->original_working_dir();
-  // We can safely call chdir() as it's a direct system call.
-  if (chdir(original_dir) != 0) {
-    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
-                   GetLastErrnoDescription());
-    return EXIT_FAILURE;
-  }
-
-  // We can safely call execv() as it's almost a direct system call. We
-  // cannot use execvp() as it's a libc function and thus potentially
-  // unsafe.  Since execv() doesn't search the PATH, the user must
-  // invoke the test program via a valid path that contains at least
-  // one path separator.
-  execv(args->argv[0], args->argv);
-  DeathTestAbort(std::string("execv(") + args->argv[0] + ", ...) in " +
-                 original_dir + " failed: " +
-                 GetLastErrnoDescription());
-  return EXIT_FAILURE;
-}
-#  endif  // GTEST_OS_QNX
-
-#  if GTEST_HAS_CLONE
-// Two utility routines that together determine the direction the stack
-// grows.
-// This could be accomplished more elegantly by a single recursive
-// function, but we want to guard against the unlikely possibility of
-// a smart compiler optimizing the recursion away.
-//
-// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
-// StackLowerThanAddress into StackGrowsDown, which then doesn't give
-// correct answer.
-static void StackLowerThanAddress(const void* ptr,
-                                  bool* result) GTEST_NO_INLINE_;
-// Make sure sanitizers do not tamper with the stack here.
-// Ideally, we want to use `__builtin_frame_address` instead of a local variable
-// address with sanitizer disabled, but it does not work when the
-// compiler optimizes the stack frame out, which happens on PowerPC targets.
-// HWAddressSanitizer add a random tag to the MSB of the local variable address,
-// making comparison result unpredictable.
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-static void StackLowerThanAddress(const void* ptr, bool* result) {
-  int dummy = 0;
-  *result = std::less<const void*>()(&dummy, ptr);
-}
-
-// Make sure AddressSanitizer does not tamper with the stack here.
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-static bool StackGrowsDown() {
-  int dummy = 0;
-  bool result;
-  StackLowerThanAddress(&dummy, &result);
-  return result;
-}
-#  endif  // GTEST_HAS_CLONE
-
-// Spawns a child process with the same executable as the current process in
-// a thread-safe manner and instructs it to run the death test.  The
-// implementation uses fork(2) + exec.  On systems where clone(2) is
-// available, it is used instead, being slightly more thread-safe.  On QNX,
-// fork supports only single-threaded environments, so this function uses
-// spawn(2) there instead.  The function dies with an error message if
-// anything goes wrong.
-static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
-  ExecDeathTestArgs args = { argv, close_fd };
-  pid_t child_pid = -1;
-
-#  if GTEST_OS_QNX
-  // Obtains the current directory and sets it to be closed in the child
-  // process.
-  const int cwd_fd = open(".", O_RDONLY);
-  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
-  // We need to execute the test program in the same environment where
-  // it was originally invoked.  Therefore we change to the original
-  // working directory first.
-  const char* const original_dir =
-      UnitTest::GetInstance()->original_working_dir();
-  // We can safely call chdir() as it's a direct system call.
-  if (chdir(original_dir) != 0) {
-    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
-                   GetLastErrnoDescription());
-    return EXIT_FAILURE;
-  }
-
-  int fd_flags;
-  // Set close_fd to be closed after spawn.
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
-                                        fd_flags | FD_CLOEXEC));
-  struct inheritance inherit = {0};
-  // spawn is a system call.
-  child_pid = spawn(args.argv[0], 0, nullptr, &inherit, args.argv, environ);
-  // Restores the current working directory.
-  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
-
-#  else   // GTEST_OS_QNX
-#   if GTEST_OS_LINUX
-  // When a SIGPROF signal is received while fork() or clone() are executing,
-  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
-  // it after the call to fork()/clone() is complete.
-  struct sigaction saved_sigprof_action;
-  struct sigaction ignore_sigprof_action;
-  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
-  sigemptyset(&ignore_sigprof_action.sa_mask);
-  ignore_sigprof_action.sa_handler = SIG_IGN;
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
-      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
-#   endif  // GTEST_OS_LINUX
-
-#   if GTEST_HAS_CLONE
-  const bool use_fork = GTEST_FLAG(death_test_use_fork);
-
-  if (!use_fork) {
-    static const bool stack_grows_down = StackGrowsDown();
-    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-    void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
-                             MAP_ANON | MAP_PRIVATE, -1, 0);
-    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
-
-    // Maximum stack alignment in bytes:  For a downward-growing stack, this
-    // amount is subtracted from size of the stack space to get an address
-    // that is within the stack space and is aligned on all systems we care
-    // about.  As far as I know there is no ABI with stack alignment greater
-    // than 64.  We assume stack and stack_size already have alignment of
-    // kMaxStackAlignment.
-    const size_t kMaxStackAlignment = 64;
-    void* const stack_top =
-        static_cast<char*>(stack) +
-            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
-    GTEST_DEATH_TEST_CHECK_(
-        static_cast<size_t>(stack_size) > kMaxStackAlignment &&
-        reinterpret_cast<uintptr_t>(stack_top) % kMaxStackAlignment == 0);
-
-    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
-
-    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
-  }
-#   else
-  const bool use_fork = true;
-#   endif  // GTEST_HAS_CLONE
-
-  if (use_fork && (child_pid = fork()) == 0) {
-      ExecDeathTestChildMain(&args);
-      _exit(0);
-  }
-#  endif  // GTEST_OS_QNX
-#  if GTEST_OS_LINUX
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(
-      sigaction(SIGPROF, &saved_sigprof_action, nullptr));
-#  endif  // GTEST_OS_LINUX
-
-  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
-  return child_pid;
-}
-
-// The AssumeRole process for a fork-and-exec death test.  It re-executes the
-// main program from the beginning, setting the --gtest_filter
-// and --gtest_internal_run_death_test flags to cause only the current
-// death test to be re-run.
-DeathTest::TestRole ExecDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    set_write_fd(flag->write_fd());
-    return EXECUTE_TEST;
-  }
-
-  int pipe_fd[2];
-  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
-  // Clear the close-on-exec flag on the write end of the pipe, lest
-  // it be closed when the child process does an exec:
-  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
-
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
-      + file_ + "|" + StreamableToString(line_) + "|"
-      + StreamableToString(death_test_index) + "|"
-      + StreamableToString(pipe_fd[1]);
-  Arguments args;
-  args.AddArguments(GetArgvsForDeathTestChildProcess());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
-
-  DeathTest::set_last_death_test_message("");
-
-  CaptureStderr();
-  // See the comment in NoExecDeathTest::AssumeRole for why the next line
-  // is necessary.
-  FlushInfoLog();
-
-  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
-  set_child_pid(child_pid);
-  set_read_fd(pipe_fd[0]);
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-# endif  // !GTEST_OS_WINDOWS
-
-// Creates a concrete DeathTest-derived class that depends on the
-// --gtest_death_test_style flag, and sets the pointer pointed to
-// by the "test" argument to its address.  If the test should be
-// skipped, sets that pointer to NULL.  Returns true, unless the
-// flag is set to an invalid value.
-bool DefaultDeathTestFactory::Create(const char* statement,
-                                     Matcher<const std::string&> matcher,
-                                     const char* file, int line,
-                                     DeathTest** test) {
-  UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const int death_test_index = impl->current_test_info()
-      ->increment_death_test_count();
-
-  if (flag != nullptr) {
-    if (death_test_index > flag->index()) {
-      DeathTest::set_last_death_test_message(
-          "Death test count (" + StreamableToString(death_test_index)
-          + ") somehow exceeded expected maximum ("
-          + StreamableToString(flag->index()) + ")");
-      return false;
-    }
-
-    if (!(flag->file() == file && flag->line() == line &&
-          flag->index() == death_test_index)) {
-      *test = nullptr;
-      return true;
-    }
-  }
-
-# if GTEST_OS_WINDOWS
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
-    *test = new WindowsDeathTest(statement, std::move(matcher), file, line);
-  }
-
-# elif GTEST_OS_FUCHSIA
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
-    *test = new FuchsiaDeathTest(statement, std::move(matcher), file, line);
-  }
-
-# else
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe") {
-    *test = new ExecDeathTest(statement, std::move(matcher), file, line);
-  } else if (GTEST_FLAG(death_test_style) == "fast") {
-    *test = new NoExecDeathTest(statement, std::move(matcher));
-  }
-
-# endif  // GTEST_OS_WINDOWS
-
-  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
-    DeathTest::set_last_death_test_message(
-        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
-        + "\" encountered");
-    return false;
-  }
-
-  return true;
-}
-
-# if GTEST_OS_WINDOWS
-// Recreates the pipe and event handles from the provided parameters,
-// signals the event, and returns a file descriptor wrapped around the pipe
-// handle. This function is called in the child process only.
-static int GetStatusFileDescriptor(unsigned int parent_process_id,
-                            size_t write_handle_as_size_t,
-                            size_t event_handle_as_size_t) {
-  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
-                                                   FALSE,  // Non-inheritable.
-                                                   parent_process_id));
-  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
-    DeathTestAbort("Unable to open parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
-
-  const HANDLE write_handle =
-      reinterpret_cast<HANDLE>(write_handle_as_size_t);
-  HANDLE dup_write_handle;
-
-  // The newly initialized handle is accessible only in the parent
-  // process. To obtain one accessible within the child, we need to use
-  // DuplicateHandle.
-  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
-                         ::GetCurrentProcess(), &dup_write_handle,
-                         0x0,    // Requested privileges ignored since
-                                 // DUPLICATE_SAME_ACCESS is used.
-                         FALSE,  // Request non-inheritable handler.
-                         DUPLICATE_SAME_ACCESS)) {
-    DeathTestAbort("Unable to duplicate the pipe handle " +
-                   StreamableToString(write_handle_as_size_t) +
-                   " from the parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
-  HANDLE dup_event_handle;
-
-  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
-                         ::GetCurrentProcess(), &dup_event_handle,
-                         0x0,
-                         FALSE,
-                         DUPLICATE_SAME_ACCESS)) {
-    DeathTestAbort("Unable to duplicate the event handle " +
-                   StreamableToString(event_handle_as_size_t) +
-                   " from the parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  const int write_fd =
-      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
-  if (write_fd == -1) {
-    DeathTestAbort("Unable to convert pipe handle " +
-                   StreamableToString(write_handle_as_size_t) +
-                   " to a file descriptor");
-  }
-
-  // Signals the parent that the write end of the pipe has been acquired
-  // so the parent can release its own write end.
-  ::SetEvent(dup_event_handle);
-
-  return write_fd;
-}
-# endif  // GTEST_OS_WINDOWS
-
-// Returns a newly created InternalRunDeathTestFlag object with fields
-// initialized from the GTEST_FLAG(internal_run_death_test) flag if
-// the flag is specified; otherwise returns NULL.
-InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
-  if (GTEST_FLAG(internal_run_death_test) == "") return nullptr;
-
-  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
-  // can use it here.
-  int line = -1;
-  int index = -1;
-  ::std::vector< ::std::string> fields;
-  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
-  int write_fd = -1;
-
-# if GTEST_OS_WINDOWS
-
-  unsigned int parent_process_id = 0;
-  size_t write_handle_as_size_t = 0;
-  size_t event_handle_as_size_t = 0;
-
-  if (fields.size() != 6
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)
-      || !ParseNaturalNumber(fields[3], &parent_process_id)
-      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
-      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
-                   GTEST_FLAG(internal_run_death_test));
-  }
-  write_fd = GetStatusFileDescriptor(parent_process_id,
-                                     write_handle_as_size_t,
-                                     event_handle_as_size_t);
-
-# elif GTEST_OS_FUCHSIA
-
-  if (fields.size() != 3
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
-        + GTEST_FLAG(internal_run_death_test));
-  }
-
-# else
-
-  if (fields.size() != 4
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)
-      || !ParseNaturalNumber(fields[3], &write_fd)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
-        + GTEST_FLAG(internal_run_death_test));
-  }
-
-# endif  // GTEST_OS_WINDOWS
-
-  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
-}
-
-}  // namespace internal
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-}  // namespace testing
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include <stdlib.h>
-
-#if GTEST_OS_WINDOWS_MOBILE
-# include <windows.h>
-#elif GTEST_OS_WINDOWS
-# include <direct.h>
-# include <io.h>
-#else
-# include <limits.h>
-# include <climits>  // Some Linux distributions define PATH_MAX here.
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_MAX_ _MAX_PATH
-#elif defined(PATH_MAX)
-# define GTEST_PATH_MAX_ PATH_MAX
-#elif defined(_XOPEN_PATH_MAX)
-# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
-#else
-# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
-#endif  // GTEST_OS_WINDOWS
-
-namespace testing {
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-// On Windows, '\\' is the standard path separator, but many tools and the
-// Windows API also accept '/' as an alternate path separator. Unless otherwise
-// noted, a file path can contain either kind of path separators, or a mixture
-// of them.
-const char kPathSeparator = '\\';
-const char kAlternatePathSeparator = '/';
-const char kAlternatePathSeparatorString[] = "/";
-# if GTEST_OS_WINDOWS_MOBILE
-// Windows CE doesn't have a current directory. You should not use
-// the current directory in tests on Windows CE, but this at least
-// provides a reasonable fallback.
-const char kCurrentDirectoryString[] = "\\";
-// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
-const DWORD kInvalidFileAttributes = 0xffffffff;
-# else
-const char kCurrentDirectoryString[] = ".\\";
-# endif  // GTEST_OS_WINDOWS_MOBILE
-#else
-const char kPathSeparator = '/';
-const char kCurrentDirectoryString[] = "./";
-#endif  // GTEST_OS_WINDOWS
-
-// Returns whether the given character is a valid path separator.
-static bool IsPathSeparator(char c) {
-#if GTEST_HAS_ALT_PATH_SEP_
-  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
-#else
-  return c == kPathSeparator;
-#endif
-}
-
-// Returns the current working directory, or "" if unsuccessful.
-FilePath FilePath::GetCurrentDir() {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||         \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_ESP32 || \
-    GTEST_OS_XTENSA
-  // These platforms do not have a current directory, so we just return
-  // something reasonable.
-  return FilePath(kCurrentDirectoryString);
-#elif GTEST_OS_WINDOWS
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
-  return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
-#else
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
-  char* result = getcwd(cwd, sizeof(cwd));
-# if GTEST_OS_NACL
-  // getcwd will likely fail in NaCl due to the sandbox, so return something
-  // reasonable. The user may have provided a shim implementation for getcwd,
-  // however, so fallback only when failure is detected.
-  return FilePath(result == nullptr ? kCurrentDirectoryString : cwd);
-# endif  // GTEST_OS_NACL
-  return FilePath(result == nullptr ? "" : cwd);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Returns a copy of the FilePath with the case-insensitive extension removed.
-// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
-// FilePath("dir/file"). If a case-insensitive extension is not
-// found, returns a copy of the original FilePath.
-FilePath FilePath::RemoveExtension(const char* extension) const {
-  const std::string dot_extension = std::string(".") + extension;
-  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
-    return FilePath(pathname_.substr(
-        0, pathname_.length() - dot_extension.length()));
-  }
-  return *this;
-}
-
-// Returns a pointer to the last occurrence of a valid path separator in
-// the FilePath. On Windows, for example, both '/' and '\' are valid path
-// separators. Returns NULL if no path separator was found.
-const char* FilePath::FindLastPathSeparator() const {
-  const char* const last_sep = strrchr(c_str(), kPathSeparator);
-#if GTEST_HAS_ALT_PATH_SEP_
-  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
-  // Comparing two pointers of which only one is NULL is undefined.
-  if (last_alt_sep != nullptr &&
-      (last_sep == nullptr || last_alt_sep > last_sep)) {
-    return last_alt_sep;
-  }
-#endif
-  return last_sep;
-}
-
-// Returns a copy of the FilePath with the directory part removed.
-// Example: FilePath("path/to/file").RemoveDirectoryName() returns
-// FilePath("file"). If there is no directory part ("just_a_file"), it returns
-// the FilePath unmodified. If there is no file part ("just_a_dir/") it
-// returns an empty FilePath ("").
-// On Windows platform, '\' is the path separator, otherwise it is '/'.
-FilePath FilePath::RemoveDirectoryName() const {
-  const char* const last_sep = FindLastPathSeparator();
-  return last_sep ? FilePath(last_sep + 1) : *this;
-}
-
-// RemoveFileName returns the directory path with the filename removed.
-// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
-// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
-// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
-// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
-// On Windows platform, '\' is the path separator, otherwise it is '/'.
-FilePath FilePath::RemoveFileName() const {
-  const char* const last_sep = FindLastPathSeparator();
-  std::string dir;
-  if (last_sep) {
-    dir = std::string(c_str(), static_cast<size_t>(last_sep + 1 - c_str()));
-  } else {
-    dir = kCurrentDirectoryString;
-  }
-  return FilePath(dir);
-}
-
-// Helper functions for naming files in a directory for xml output.
-
-// Given directory = "dir", base_name = "test", number = 0,
-// extension = "xml", returns "dir/test.xml". If number is greater
-// than zero (e.g., 12), returns "dir/test_12.xml".
-// On Windows platform, uses \ as the separator rather than /.
-FilePath FilePath::MakeFileName(const FilePath& directory,
-                                const FilePath& base_name,
-                                int number,
-                                const char* extension) {
-  std::string file;
-  if (number == 0) {
-    file = base_name.string() + "." + extension;
-  } else {
-    file = base_name.string() + "_" + StreamableToString(number)
-        + "." + extension;
-  }
-  return ConcatPaths(directory, FilePath(file));
-}
-
-// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
-// On Windows, uses \ as the separator rather than /.
-FilePath FilePath::ConcatPaths(const FilePath& directory,
-                               const FilePath& relative_path) {
-  if (directory.IsEmpty())
-    return relative_path;
-  const FilePath dir(directory.RemoveTrailingPathSeparator());
-  return FilePath(dir.string() + kPathSeparator + relative_path.string());
-}
-
-// Returns true if pathname describes something findable in the file-system,
-// either a file, directory, or whatever.
-bool FilePath::FileOrDirectoryExists() const {
-#if GTEST_OS_WINDOWS_MOBILE
-  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
-  const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
-  return attributes != kInvalidFileAttributes;
-#else
-  posix::StatStruct file_stat{};
-  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Returns true if pathname describes a directory in the file-system
-// that exists.
-bool FilePath::DirectoryExists() const {
-  bool result = false;
-#if GTEST_OS_WINDOWS
-  // Don't strip off trailing separator if path is a root directory on
-  // Windows (like "C:\\").
-  const FilePath& path(IsRootDirectory() ? *this :
-                                           RemoveTrailingPathSeparator());
-#else
-  const FilePath& path(*this);
-#endif
-
-#if GTEST_OS_WINDOWS_MOBILE
-  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
-  const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
-  if ((attributes != kInvalidFileAttributes) &&
-      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
-    result = true;
-  }
-#else
-  posix::StatStruct file_stat{};
-  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
-      posix::IsDir(file_stat);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-  return result;
-}
-
-// Returns true if pathname describes a root directory. (Windows has one
-// root directory per disk drive.)
-bool FilePath::IsRootDirectory() const {
-#if GTEST_OS_WINDOWS
-  return pathname_.length() == 3 && IsAbsolutePath();
-#else
-  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
-#endif
-}
-
-// Returns true if pathname describes an absolute path.
-bool FilePath::IsAbsolutePath() const {
-  const char* const name = pathname_.c_str();
-#if GTEST_OS_WINDOWS
-  return pathname_.length() >= 3 &&
-     ((name[0] >= 'a' && name[0] <= 'z') ||
-      (name[0] >= 'A' && name[0] <= 'Z')) &&
-     name[1] == ':' &&
-     IsPathSeparator(name[2]);
-#else
-  return IsPathSeparator(name[0]);
-#endif
-}
-
-// Returns a pathname for a file that does not currently exist. The pathname
-// will be directory/base_name.extension or
-// directory/base_name_<number>.extension if directory/base_name.extension
-// already exists. The number will be incremented until a pathname is found
-// that does not already exist.
-// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
-// There could be a race condition if two or more processes are calling this
-// function at the same time -- they could both pick the same filename.
-FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
-                                          const FilePath& base_name,
-                                          const char* extension) {
-  FilePath full_pathname;
-  int number = 0;
-  do {
-    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
-  } while (full_pathname.FileOrDirectoryExists());
-  return full_pathname;
-}
-
-// Returns true if FilePath ends with a path separator, which indicates that
-// it is intended to represent a directory. Returns false otherwise.
-// This does NOT check that a directory (or file) actually exists.
-bool FilePath::IsDirectory() const {
-  return !pathname_.empty() &&
-         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
-}
-
-// Create directories so that path exists. Returns true if successful or if
-// the directories already exist; returns false if unable to create directories
-// for any reason.
-bool FilePath::CreateDirectoriesRecursively() const {
-  if (!this->IsDirectory()) {
-    return false;
-  }
-
-  if (pathname_.length() == 0 || this->DirectoryExists()) {
-    return true;
-  }
-
-  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
-  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
-}
-
-// Create the directory so that path exists. Returns true if successful or
-// if the directory already exists; returns false if unable to create the
-// directory for any reason, including if the parent directory does not
-// exist. Not named "CreateDirectory" because that's a macro on Windows.
-bool FilePath::CreateFolder() const {
-#if GTEST_OS_WINDOWS_MOBILE
-  FilePath removed_sep(this->RemoveTrailingPathSeparator());
-  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
-  int result = CreateDirectory(unicode, nullptr) ? 0 : -1;
-  delete [] unicode;
-#elif GTEST_OS_WINDOWS
-  int result = _mkdir(pathname_.c_str());
-#elif GTEST_OS_ESP8266 || GTEST_OS_XTENSA
-  // do nothing
-  int result = 0;
-#else
-  int result = mkdir(pathname_.c_str(), 0777);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-  if (result == -1) {
-    return this->DirectoryExists();  // An error is OK if the directory exists.
-  }
-  return true;  // No error.
-}
-
-// If input name has a trailing separator character, remove it and return the
-// name, otherwise return the name string unmodified.
-// On Windows platform, uses \ as the separator, other platforms use /.
-FilePath FilePath::RemoveTrailingPathSeparator() const {
-  return IsDirectory()
-      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
-      : *this;
-}
-
-// Removes any redundant separators that might be in the pathname.
-// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
-// redundancies that might be in a pathname involving "." or "..".
-void FilePath::Normalize() {
-  auto out = pathname_.begin();
-
-  for (const char character : pathname_) {
-    if (!IsPathSeparator(character)) {
-      *(out++) = character;
-    } else if (out == pathname_.begin() || *std::prev(out) != kPathSeparator) {
-      *(out++) = kPathSeparator;
-    } else {
-      continue;
-    }
-  }
-
-  pathname_.erase(out, pathname_.end());
-}
-
-}  // namespace internal
-}  // namespace testing
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file implements just enough of the matcher interface to allow
-// EXPECT_DEATH and friends to accept a matcher argument.
-
-
-#include <string>
-
-namespace testing {
-
-// Constructs a matcher that matches a const std::string& whose value is
-// equal to s.
-Matcher<const std::string&>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a const std::string& whose value is
-// equal to s.
-Matcher<const std::string&>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a std::string whose value is equal to
-// s.
-Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a std::string whose value is equal to
-// s.
-Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); }
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-// Constructs a matcher that matches a const StringView& whose value is
-// equal to s.
-Matcher<const internal::StringView&>::Matcher(const std::string& s) {
-  *this = Eq(s);
-}
-
-// Constructs a matcher that matches a const StringView& whose value is
-// equal to s.
-Matcher<const internal::StringView&>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a const StringView& whose value is
-// equal to s.
-Matcher<const internal::StringView&>::Matcher(internal::StringView s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a StringView whose value is equal to
-// s.
-Matcher<internal::StringView>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a StringView whose value is equal to
-// s.
-Matcher<internal::StringView>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a StringView whose value is equal to
-// s.
-Matcher<internal::StringView>::Matcher(internal::StringView s) {
-  *this = Eq(std::string(s));
-}
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-}  // namespace testing
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cstdint>
-#include <fstream>
-#include <memory>
-
-#if GTEST_OS_WINDOWS
-# include <windows.h>
-# include <io.h>
-# include <sys/stat.h>
-# include <map>  // Used in ThreadLocal.
-# ifdef _MSC_VER
-#  include <crtdbg.h>
-# endif  // _MSC_VER
-#else
-# include <unistd.h>
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_MAC
-# include <mach/mach_init.h>
-# include <mach/task.h>
-# include <mach/vm_map.h>
-#endif  // GTEST_OS_MAC
-
-#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# include <sys/sysctl.h>
-# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-#  include <sys/user.h>
-# endif
-#endif
-
-#if GTEST_OS_QNX
-# include <devctl.h>
-# include <fcntl.h>
-# include <sys/procfs.h>
-#endif  // GTEST_OS_QNX
-
-#if GTEST_OS_AIX
-# include <procinfo.h>
-# include <sys/types.h>
-#endif  // GTEST_OS_AIX
-
-#if GTEST_OS_FUCHSIA
-# include <zircon/process.h>
-# include <zircon/syscalls.h>
-#endif  // GTEST_OS_FUCHSIA
-
-
-namespace testing {
-namespace internal {
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
-const int kStdOutFileno = 1;
-const int kStdErrFileno = 2;
-#else
-const int kStdOutFileno = STDOUT_FILENO;
-const int kStdErrFileno = STDERR_FILENO;
-#endif  // _MSC_VER
-
-#if GTEST_OS_LINUX
-
-namespace {
-template <typename T>
-T ReadProcFileField(const std::string& filename, int field) {
-  std::string dummy;
-  std::ifstream file(filename.c_str());
-  while (field-- > 0) {
-    file >> dummy;
-  }
-  T output = 0;
-  file >> output;
-  return output;
-}
-}  // namespace
-
-// Returns the number of active threads, or 0 when there is an error.
-size_t GetThreadCount() {
-  const std::string filename =
-      (Message() << "/proc/" << getpid() << "/stat").GetString();
-  return ReadProcFileField<size_t>(filename, 19);
-}
-
-#elif GTEST_OS_MAC
-
-size_t GetThreadCount() {
-  const task_t task = mach_task_self();
-  mach_msg_type_number_t thread_count;
-  thread_act_array_t thread_list;
-  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
-  if (status == KERN_SUCCESS) {
-    // task_threads allocates resources in thread_list and we need to free them
-    // to avoid leaks.
-    vm_deallocate(task,
-                  reinterpret_cast<vm_address_t>(thread_list),
-                  sizeof(thread_t) * thread_count);
-    return static_cast<size_t>(thread_count);
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-      GTEST_OS_NETBSD
-
-#if GTEST_OS_NETBSD
-#undef KERN_PROC
-#define KERN_PROC KERN_PROC2
-#define kinfo_proc kinfo_proc2
-#endif
-
-#if GTEST_OS_DRAGONFLY
-#define KP_NLWP(kp) (kp.kp_nthreads)
-#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-#define KP_NLWP(kp) (kp.ki_numthreads)
-#elif GTEST_OS_NETBSD
-#define KP_NLWP(kp) (kp.p_nlwps)
-#endif
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID,
-    getpid(),
-#if GTEST_OS_NETBSD
-    sizeof(struct kinfo_proc),
-    1,
-#endif
-  };
-  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-  struct kinfo_proc info;
-  size_t size = sizeof(info);
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-    return 0;
-  }
-  return static_cast<size_t>(KP_NLWP(info));
-}
-#elif GTEST_OS_OPENBSD
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID | KERN_PROC_SHOW_THREADS,
-    getpid(),
-    sizeof(struct kinfo_proc),
-    0,
-  };
-  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-
-  // get number of structs
-  size_t size;
-  if (sysctl(mib, miblen, NULL, &size, NULL, 0)) {
-    return 0;
-  }
-
-  mib[5] = static_cast<int>(size / static_cast<size_t>(mib[4]));
-
-  // populate array of structs
-  struct kinfo_proc info[mib[5]];
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-    return 0;
-  }
-
-  // exclude empty members
-  size_t nthreads = 0;
-  for (size_t i = 0; i < size / static_cast<size_t>(mib[4]); i++) {
-    if (info[i].p_tid != -1)
-      nthreads++;
-  }
-  return nthreads;
-}
-
-#elif GTEST_OS_QNX
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  const int fd = open("/proc/self/as", O_RDONLY);
-  if (fd < 0) {
-    return 0;
-  }
-  procfs_info process_info;
-  const int status =
-      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), nullptr);
-  close(fd);
-  if (status == EOK) {
-    return static_cast<size_t>(process_info.num_threads);
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_AIX
-
-size_t GetThreadCount() {
-  struct procentry64 entry;
-  pid_t pid = getpid();
-  int status = getprocs64(&entry, sizeof(entry), nullptr, 0, &pid, 1);
-  if (status == 1) {
-    return entry.pi_thcount;
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_FUCHSIA
-
-size_t GetThreadCount() {
-  int dummy_buffer;
-  size_t avail;
-  zx_status_t status = zx_object_get_info(
-      zx_process_self(),
-      ZX_INFO_PROCESS_THREADS,
-      &dummy_buffer,
-      0,
-      nullptr,
-      &avail);
-  if (status == ZX_OK) {
-    return avail;
-  } else {
-    return 0;
-  }
-}
-
-#else
-
-size_t GetThreadCount() {
-  // There's no portable way to detect the number of threads, so we just
-  // return 0 to indicate that we cannot detect it.
-  return 0;
-}
-
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-void SleepMilliseconds(int n) {
-  ::Sleep(static_cast<DWORD>(n));
-}
-
-AutoHandle::AutoHandle()
-    : handle_(INVALID_HANDLE_VALUE) {}
-
-AutoHandle::AutoHandle(Handle handle)
-    : handle_(handle) {}
-
-AutoHandle::~AutoHandle() {
-  Reset();
-}
-
-AutoHandle::Handle AutoHandle::Get() const {
-  return handle_;
-}
-
-void AutoHandle::Reset() {
-  Reset(INVALID_HANDLE_VALUE);
-}
-
-void AutoHandle::Reset(HANDLE handle) {
-  // Resetting with the same handle we already own is invalid.
-  if (handle_ != handle) {
-    if (IsCloseable()) {
-      ::CloseHandle(handle_);
-    }
-    handle_ = handle;
-  } else {
-    GTEST_CHECK_(!IsCloseable())
-        << "Resetting a valid handle to itself is likely a programmer error "
-            "and thus not allowed.";
-  }
-}
-
-bool AutoHandle::IsCloseable() const {
-  // Different Windows APIs may use either of these values to represent an
-  // invalid handle.
-  return handle_ != nullptr && handle_ != INVALID_HANDLE_VALUE;
-}
-
-Notification::Notification()
-    : event_(::CreateEvent(nullptr,     // Default security attributes.
-                           TRUE,        // Do not reset automatically.
-                           FALSE,       // Initially unset.
-                           nullptr)) {  // Anonymous event.
-  GTEST_CHECK_(event_.Get() != nullptr);
-}
-
-void Notification::Notify() {
-  GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
-}
-
-void Notification::WaitForNotification() {
-  GTEST_CHECK_(
-      ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
-}
-
-Mutex::Mutex()
-    : owner_thread_id_(0),
-      type_(kDynamic),
-      critical_section_init_phase_(0),
-      critical_section_(new CRITICAL_SECTION) {
-  ::InitializeCriticalSection(critical_section_);
-}
-
-Mutex::~Mutex() {
-  // Static mutexes are leaked intentionally. It is not thread-safe to try
-  // to clean them up.
-  if (type_ == kDynamic) {
-    ::DeleteCriticalSection(critical_section_);
-    delete critical_section_;
-    critical_section_ = nullptr;
-  }
-}
-
-void Mutex::Lock() {
-  ThreadSafeLazyInit();
-  ::EnterCriticalSection(critical_section_);
-  owner_thread_id_ = ::GetCurrentThreadId();
-}
-
-void Mutex::Unlock() {
-  ThreadSafeLazyInit();
-  // We don't protect writing to owner_thread_id_ here, as it's the
-  // caller's responsibility to ensure that the current thread holds the
-  // mutex when this is called.
-  owner_thread_id_ = 0;
-  ::LeaveCriticalSection(critical_section_);
-}
-
-// Does nothing if the current thread holds the mutex. Otherwise, crashes
-// with high probability.
-void Mutex::AssertHeld() {
-  ThreadSafeLazyInit();
-  GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
-      << "The current thread is not holding the mutex @" << this;
-}
-
-namespace {
-
-#ifdef _MSC_VER
-// Use the RAII idiom to flag mem allocs that are intentionally never
-// deallocated. The motivation is to silence the false positive mem leaks
-// that are reported by the debug version of MS's CRT which can only detect
-// if an alloc is missing a matching deallocation.
-// Example:
-//    MemoryIsNotDeallocated memory_is_not_deallocated;
-//    critical_section_ = new CRITICAL_SECTION;
-//
-class MemoryIsNotDeallocated
-{
- public:
-  MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
-    old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-    // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
-    // doesn't report mem leak if there's no matching deallocation.
-    _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
-  }
-
-  ~MemoryIsNotDeallocated() {
-    // Restore the original _CRTDBG_ALLOC_MEM_DF flag
-    _CrtSetDbgFlag(old_crtdbg_flag_);
-  }
-
- private:
-  int old_crtdbg_flag_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
-};
-#endif  // _MSC_VER
-
-}  // namespace
-
-// Initializes owner_thread_id_ and critical_section_ in static mutexes.
-void Mutex::ThreadSafeLazyInit() {
-  // Dynamic mutexes are initialized in the constructor.
-  if (type_ == kStatic) {
-    switch (
-        ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
-      case 0:
-        // If critical_section_init_phase_ was 0 before the exchange, we
-        // are the first to test it and need to perform the initialization.
-        owner_thread_id_ = 0;
-        {
-          // Use RAII to flag that following mem alloc is never deallocated.
-#ifdef _MSC_VER
-          MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-          critical_section_ = new CRITICAL_SECTION;
-        }
-        ::InitializeCriticalSection(critical_section_);
-        // Updates the critical_section_init_phase_ to 2 to signal
-        // initialization complete.
-        GTEST_CHECK_(::InterlockedCompareExchange(
-                          &critical_section_init_phase_, 2L, 1L) ==
-                      1L);
-        break;
-      case 1:
-        // Somebody else is already initializing the mutex; spin until they
-        // are done.
-        while (::InterlockedCompareExchange(&critical_section_init_phase_,
-                                            2L,
-                                            2L) != 2L) {
-          // Possibly yields the rest of the thread's time slice to other
-          // threads.
-          ::Sleep(0);
-        }
-        break;
-
-      case 2:
-        break;  // The mutex is already initialized and ready for use.
-
-      default:
-        GTEST_CHECK_(false)
-            << "Unexpected value of critical_section_init_phase_ "
-            << "while initializing a static mutex.";
-    }
-  }
-}
-
-namespace {
-
-class ThreadWithParamSupport : public ThreadWithParamBase {
- public:
-  static HANDLE CreateThread(Runnable* runnable,
-                             Notification* thread_can_start) {
-    ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
-    DWORD thread_id;
-    HANDLE thread_handle = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size.
-        &ThreadWithParamSupport::ThreadMain,
-        param,        // Parameter to ThreadMainStatic
-        0x0,          // Default creation flags.
-        &thread_id);  // Need a valid pointer for the call to work under Win98.
-    GTEST_CHECK_(thread_handle != nullptr)
-        << "CreateThread failed with error " << ::GetLastError() << ".";
-    if (thread_handle == nullptr) {
-      delete param;
-    }
-    return thread_handle;
-  }
-
- private:
-  struct ThreadMainParam {
-    ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
-        : runnable_(runnable),
-          thread_can_start_(thread_can_start) {
-    }
-    std::unique_ptr<Runnable> runnable_;
-    // Does not own.
-    Notification* thread_can_start_;
-  };
-
-  static DWORD WINAPI ThreadMain(void* ptr) {
-    // Transfers ownership.
-    std::unique_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
-    if (param->thread_can_start_ != nullptr)
-      param->thread_can_start_->WaitForNotification();
-    param->runnable_->Run();
-    return 0;
-  }
-
-  // Prohibit instantiation.
-  ThreadWithParamSupport();
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
-};
-
-}  // namespace
-
-ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
-                                         Notification* thread_can_start)
-      : thread_(ThreadWithParamSupport::CreateThread(runnable,
-                                                     thread_can_start)) {
-}
-
-ThreadWithParamBase::~ThreadWithParamBase() {
-  Join();
-}
-
-void ThreadWithParamBase::Join() {
-  GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
-      << "Failed to join the thread with error " << ::GetLastError() << ".";
-}
-
-// Maps a thread to a set of ThreadIdToThreadLocals that have values
-// instantiated on that thread and notifies them when the thread exits.  A
-// ThreadLocal instance is expected to persist until all threads it has
-// values on have terminated.
-class ThreadLocalRegistryImpl {
- public:
-  // Registers thread_local_instance as having value on the current thread.
-  // Returns a value that can be used to identify the thread from other threads.
-  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance) {
-#ifdef _MSC_VER
-    MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-    DWORD current_thread = ::GetCurrentThreadId();
-    MutexLock lock(&mutex_);
-    ThreadIdToThreadLocals* const thread_to_thread_locals =
-        GetThreadLocalsMapLocked();
-    ThreadIdToThreadLocals::iterator thread_local_pos =
-        thread_to_thread_locals->find(current_thread);
-    if (thread_local_pos == thread_to_thread_locals->end()) {
-      thread_local_pos = thread_to_thread_locals->insert(
-          std::make_pair(current_thread, ThreadLocalValues())).first;
-      StartWatcherThreadFor(current_thread);
-    }
-    ThreadLocalValues& thread_local_values = thread_local_pos->second;
-    ThreadLocalValues::iterator value_pos =
-        thread_local_values.find(thread_local_instance);
-    if (value_pos == thread_local_values.end()) {
-      value_pos =
-          thread_local_values
-              .insert(std::make_pair(
-                  thread_local_instance,
-                  std::shared_ptr<ThreadLocalValueHolderBase>(
-                      thread_local_instance->NewValueForCurrentThread())))
-              .first;
-    }
-    return value_pos->second.get();
-  }
-
-  static void OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance) {
-    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
-    // Clean up the ThreadLocalValues data structure while holding the lock, but
-    // defer the destruction of the ThreadLocalValueHolderBases.
-    {
-      MutexLock lock(&mutex_);
-      ThreadIdToThreadLocals* const thread_to_thread_locals =
-          GetThreadLocalsMapLocked();
-      for (ThreadIdToThreadLocals::iterator it =
-          thread_to_thread_locals->begin();
-          it != thread_to_thread_locals->end();
-          ++it) {
-        ThreadLocalValues& thread_local_values = it->second;
-        ThreadLocalValues::iterator value_pos =
-            thread_local_values.find(thread_local_instance);
-        if (value_pos != thread_local_values.end()) {
-          value_holders.push_back(value_pos->second);
-          thread_local_values.erase(value_pos);
-          // This 'if' can only be successful at most once, so theoretically we
-          // could break out of the loop here, but we don't bother doing so.
-        }
-      }
-    }
-    // Outside the lock, let the destructor for 'value_holders' deallocate the
-    // ThreadLocalValueHolderBases.
-  }
-
-  static void OnThreadExit(DWORD thread_id) {
-    GTEST_CHECK_(thread_id != 0) << ::GetLastError();
-    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
-    // Clean up the ThreadIdToThreadLocals data structure while holding the
-    // lock, but defer the destruction of the ThreadLocalValueHolderBases.
-    {
-      MutexLock lock(&mutex_);
-      ThreadIdToThreadLocals* const thread_to_thread_locals =
-          GetThreadLocalsMapLocked();
-      ThreadIdToThreadLocals::iterator thread_local_pos =
-          thread_to_thread_locals->find(thread_id);
-      if (thread_local_pos != thread_to_thread_locals->end()) {
-        ThreadLocalValues& thread_local_values = thread_local_pos->second;
-        for (ThreadLocalValues::iterator value_pos =
-            thread_local_values.begin();
-            value_pos != thread_local_values.end();
-            ++value_pos) {
-          value_holders.push_back(value_pos->second);
-        }
-        thread_to_thread_locals->erase(thread_local_pos);
-      }
-    }
-    // Outside the lock, let the destructor for 'value_holders' deallocate the
-    // ThreadLocalValueHolderBases.
-  }
-
- private:
-  // In a particular thread, maps a ThreadLocal object to its value.
-  typedef std::map<const ThreadLocalBase*,
-                   std::shared_ptr<ThreadLocalValueHolderBase> >
-      ThreadLocalValues;
-  // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
-  // thread's ID.
-  typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
-
-  // Holds the thread id and thread handle that we pass from
-  // StartWatcherThreadFor to WatcherThreadFunc.
-  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
-
-  static void StartWatcherThreadFor(DWORD thread_id) {
-    // The returned handle will be kept in thread_map and closed by
-    // watcher_thread in WatcherThreadFunc.
-    HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
-                                 FALSE,
-                                 thread_id);
-    GTEST_CHECK_(thread != nullptr);
-    // We need to pass a valid thread ID pointer into CreateThread for it
-    // to work correctly under Win98.
-    DWORD watcher_thread_id;
-    HANDLE watcher_thread = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size
-        &ThreadLocalRegistryImpl::WatcherThreadFunc,
-        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
-        CREATE_SUSPENDED, &watcher_thread_id);
-    GTEST_CHECK_(watcher_thread != nullptr);
-    // Give the watcher thread the same priority as ours to avoid being
-    // blocked by it.
-    ::SetThreadPriority(watcher_thread,
-                        ::GetThreadPriority(::GetCurrentThread()));
-    ::ResumeThread(watcher_thread);
-    ::CloseHandle(watcher_thread);
-  }
-
-  // Monitors exit from a given thread and notifies those
-  // ThreadIdToThreadLocals about thread termination.
-  static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
-    const ThreadIdAndHandle* tah =
-        reinterpret_cast<const ThreadIdAndHandle*>(param);
-    GTEST_CHECK_(
-        ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
-    OnThreadExit(tah->first);
-    ::CloseHandle(tah->second);
-    delete tah;
-    return 0;
-  }
-
-  // Returns map of thread local instances.
-  static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
-    mutex_.AssertHeld();
-#ifdef _MSC_VER
-    MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
-    return map;
-  }
-
-  // Protects access to GetThreadLocalsMapLocked() and its return value.
-  static Mutex mutex_;
-  // Protects access to GetThreadMapLocked() and its return value.
-  static Mutex thread_map_mutex_;
-};
-
-Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);  // NOLINT
-Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);  // NOLINT
-
-ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance) {
-  return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
-      thread_local_instance);
-}
-
-void ThreadLocalRegistry::OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance) {
-  ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
-}
-
-#endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-#if GTEST_USES_POSIX_RE
-
-// Implements RE.  Currently only needed for death tests.
-
-RE::~RE() {
-  if (is_valid_) {
-    // regfree'ing an invalid regex might crash because the content
-    // of the regex is undefined. Since the regex's are essentially
-    // the same, one cannot be valid (or invalid) without the other
-    // being so too.
-    regfree(&partial_regex_);
-    regfree(&full_regex_);
-  }
-  free(const_cast<char*>(pattern_));
-}
-
-// Returns true if and only if regular expression re matches the entire str.
-bool RE::FullMatch(const char* str, const RE& re) {
-  if (!re.is_valid_) return false;
-
-  regmatch_t match;
-  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
-}
-
-// Returns true if and only if regular expression re matches a substring of
-// str (including str itself).
-bool RE::PartialMatch(const char* str, const RE& re) {
-  if (!re.is_valid_) return false;
-
-  regmatch_t match;
-  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
-}
-
-// Initializes an RE from its string representation.
-void RE::Init(const char* regex) {
-  pattern_ = posix::StrDup(regex);
-
-  // Reserves enough bytes to hold the regular expression used for a
-  // full match.
-  const size_t full_regex_len = strlen(regex) + 10;
-  char* const full_pattern = new char[full_regex_len];
-
-  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
-  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
-  // We want to call regcomp(&partial_regex_, ...) even if the
-  // previous expression returns false.  Otherwise partial_regex_ may
-  // not be properly initialized can may cause trouble when it's
-  // freed.
-  //
-  // Some implementation of POSIX regex (e.g. on at least some
-  // versions of Cygwin) doesn't accept the empty string as a valid
-  // regex.  We change it to an equivalent form "()" to be safe.
-  if (is_valid_) {
-    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
-    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
-  }
-  EXPECT_TRUE(is_valid_)
-      << "Regular expression \"" << regex
-      << "\" is not a valid POSIX Extended regular expression.";
-
-  delete[] full_pattern;
-}
-
-#elif GTEST_USES_SIMPLE_RE
-
-// Returns true if and only if ch appears anywhere in str (excluding the
-// terminating '\0' character).
-bool IsInSet(char ch, const char* str) {
-  return ch != '\0' && strchr(str, ch) != nullptr;
-}
-
-// Returns true if and only if ch belongs to the given classification.
-// Unlike similar functions in <ctype.h>, these aren't affected by the
-// current locale.
-bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
-bool IsAsciiPunct(char ch) {
-  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
-}
-bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
-bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
-bool IsAsciiWordChar(char ch) {
-  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
-      ('0' <= ch && ch <= '9') || ch == '_';
-}
-
-// Returns true if and only if "\\c" is a supported escape sequence.
-bool IsValidEscape(char c) {
-  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
-}
-
-// Returns true if and only if the given atom (specified by escaped and
-// pattern) matches ch.  The result is undefined if the atom is invalid.
-bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
-  if (escaped) {  // "\\p" where p is pattern_char.
-    switch (pattern_char) {
-      case 'd': return IsAsciiDigit(ch);
-      case 'D': return !IsAsciiDigit(ch);
-      case 'f': return ch == '\f';
-      case 'n': return ch == '\n';
-      case 'r': return ch == '\r';
-      case 's': return IsAsciiWhiteSpace(ch);
-      case 'S': return !IsAsciiWhiteSpace(ch);
-      case 't': return ch == '\t';
-      case 'v': return ch == '\v';
-      case 'w': return IsAsciiWordChar(ch);
-      case 'W': return !IsAsciiWordChar(ch);
-    }
-    return IsAsciiPunct(pattern_char) && pattern_char == ch;
-  }
-
-  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
-}
-
-// Helper function used by ValidateRegex() to format error messages.
-static std::string FormatRegexSyntaxError(const char* regex, int index) {
-  return (Message() << "Syntax error at index " << index
-          << " in simple regular expression \"" << regex << "\": ").GetString();
-}
-
-// Generates non-fatal failures and returns false if regex is invalid;
-// otherwise returns true.
-bool ValidateRegex(const char* regex) {
-  if (regex == nullptr) {
-    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
-    return false;
-  }
-
-  bool is_valid = true;
-
-  // True if and only if ?, *, or + can follow the previous atom.
-  bool prev_repeatable = false;
-  for (int i = 0; regex[i]; i++) {
-    if (regex[i] == '\\') {  // An escape sequence
-      i++;
-      if (regex[i] == '\0') {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
-                      << "'\\' cannot appear at the end.";
-        return false;
-      }
-
-      if (!IsValidEscape(regex[i])) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
-                      << "invalid escape sequence \"\\" << regex[i] << "\".";
-        is_valid = false;
-      }
-      prev_repeatable = true;
-    } else {  // Not an escape sequence.
-      const char ch = regex[i];
-
-      if (ch == '^' && i > 0) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'^' can only appear at the beginning.";
-        is_valid = false;
-      } else if (ch == '$' && regex[i + 1] != '\0') {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'$' can only appear at the end.";
-        is_valid = false;
-      } else if (IsInSet(ch, "()[]{}|")) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'" << ch << "' is unsupported.";
-        is_valid = false;
-      } else if (IsRepeat(ch) && !prev_repeatable) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'" << ch << "' can only follow a repeatable token.";
-        is_valid = false;
-      }
-
-      prev_repeatable = !IsInSet(ch, "^$?*+");
-    }
-  }
-
-  return is_valid;
-}
-
-// Matches a repeated regex atom followed by a valid simple regular
-// expression.  The regex atom is defined as c if escaped is false,
-// or \c otherwise.  repeat is the repetition meta character (?, *,
-// or +).  The behavior is undefined if str contains too many
-// characters to be indexable by size_t, in which case the test will
-// probably time out anyway.  We are fine with this limitation as
-// std::string has it too.
-bool MatchRepetitionAndRegexAtHead(
-    bool escaped, char c, char repeat, const char* regex,
-    const char* str) {
-  const size_t min_count = (repeat == '+') ? 1 : 0;
-  const size_t max_count = (repeat == '?') ? 1 :
-      static_cast<size_t>(-1) - 1;
-  // We cannot call numeric_limits::max() as it conflicts with the
-  // max() macro on Windows.
-
-  for (size_t i = 0; i <= max_count; ++i) {
-    // We know that the atom matches each of the first i characters in str.
-    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
-      // We have enough matches at the head, and the tail matches too.
-      // Since we only care about *whether* the pattern matches str
-      // (as opposed to *how* it matches), there is no need to find a
-      // greedy match.
-      return true;
-    }
-    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
-      return false;
-  }
-  return false;
-}
-
-// Returns true if and only if regex matches a prefix of str. regex must
-// be a valid simple regular expression and not start with "^", or the
-// result is undefined.
-bool MatchRegexAtHead(const char* regex, const char* str) {
-  if (*regex == '\0')  // An empty regex matches a prefix of anything.
-    return true;
-
-  // "$" only matches the end of a string.  Note that regex being
-  // valid guarantees that there's nothing after "$" in it.
-  if (*regex == '$')
-    return *str == '\0';
-
-  // Is the first thing in regex an escape sequence?
-  const bool escaped = *regex == '\\';
-  if (escaped)
-    ++regex;
-  if (IsRepeat(regex[1])) {
-    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
-    // here's an indirect recursion.  It terminates as the regex gets
-    // shorter in each recursion.
-    return MatchRepetitionAndRegexAtHead(
-        escaped, regex[0], regex[1], regex + 2, str);
-  } else {
-    // regex isn't empty, isn't "$", and doesn't start with a
-    // repetition.  We match the first atom of regex with the first
-    // character of str and recurse.
-    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
-        MatchRegexAtHead(regex + 1, str + 1);
-  }
-}
-
-// Returns true if and only if regex matches any substring of str.  regex must
-// be a valid simple regular expression, or the result is undefined.
-//
-// The algorithm is recursive, but the recursion depth doesn't exceed
-// the regex length, so we won't need to worry about running out of
-// stack space normally.  In rare cases the time complexity can be
-// exponential with respect to the regex length + the string length,
-// but usually it's must faster (often close to linear).
-bool MatchRegexAnywhere(const char* regex, const char* str) {
-  if (regex == nullptr || str == nullptr) return false;
-
-  if (*regex == '^')
-    return MatchRegexAtHead(regex + 1, str);
-
-  // A successful match can be anywhere in str.
-  do {
-    if (MatchRegexAtHead(regex, str))
-      return true;
-  } while (*str++ != '\0');
-  return false;
-}
-
-// Implements the RE class.
-
-RE::~RE() {
-  free(const_cast<char*>(pattern_));
-  free(const_cast<char*>(full_pattern_));
-}
-
-// Returns true if and only if regular expression re matches the entire str.
-bool RE::FullMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
-}
-
-// Returns true if and only if regular expression re matches a substring of
-// str (including str itself).
-bool RE::PartialMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
-}
-
-// Initializes an RE from its string representation.
-void RE::Init(const char* regex) {
-  pattern_ = full_pattern_ = nullptr;
-  if (regex != nullptr) {
-    pattern_ = posix::StrDup(regex);
-  }
-
-  is_valid_ = ValidateRegex(regex);
-  if (!is_valid_) {
-    // No need to calculate the full pattern when the regex is invalid.
-    return;
-  }
-
-  const size_t len = strlen(regex);
-  // Reserves enough bytes to hold the regular expression used for a
-  // full match: we need space to prepend a '^', append a '$', and
-  // terminate the string with '\0'.
-  char* buffer = static_cast<char*>(malloc(len + 3));
-  full_pattern_ = buffer;
-
-  if (*regex != '^')
-    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
-
-  // We don't use snprintf or strncpy, as they trigger a warning when
-  // compiled with VC++ 8.0.
-  memcpy(buffer, regex, len);
-  buffer += len;
-
-  if (len == 0 || regex[len - 1] != '$')
-    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
-
-  *buffer = '\0';
-}
-
-#endif  // GTEST_USES_POSIX_RE
-
-const char kUnknownFile[] = "unknown file";
-
-// Formats a source file path and a line number as they would appear
-// in an error message from the compiler used to compile this code.
-GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
-  const std::string file_name(file == nullptr ? kUnknownFile : file);
-
-  if (line < 0) {
-    return file_name + ":";
-  }
-#ifdef _MSC_VER
-  return file_name + "(" + StreamableToString(line) + "):";
-#else
-  return file_name + ":" + StreamableToString(line) + ":";
-#endif  // _MSC_VER
-}
-
-// Formats a file location for compiler-independent XML output.
-// Although this function is not platform dependent, we put it next to
-// FormatFileLocation in order to contrast the two functions.
-// Note that FormatCompilerIndependentFileLocation() does NOT append colon
-// to the file location it produces, unlike FormatFileLocation().
-GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
-    const char* file, int line) {
-  const std::string file_name(file == nullptr ? kUnknownFile : file);
-
-  if (line < 0)
-    return file_name;
-  else
-    return file_name + ":" + StreamableToString(line);
-}
-
-GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
-    : severity_(severity) {
-  const char* const marker =
-      severity == GTEST_INFO ?    "[  INFO ]" :
-      severity == GTEST_WARNING ? "[WARNING]" :
-      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
-  GetStream() << ::std::endl << marker << " "
-              << FormatFileLocation(file, line).c_str() << ": ";
-}
-
-// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
-GTestLog::~GTestLog() {
-  GetStream() << ::std::endl;
-  if (severity_ == GTEST_FATAL) {
-    fflush(stderr);
-    posix::Abort();
-  }
-}
-
-// Disable Microsoft deprecation warnings for POSIX functions called from
-// this class (creat, dup, dup2, and close)
-GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-
-#if GTEST_HAS_STREAM_REDIRECTION
-
-// Object that captures an output stream (stdout/stderr).
-class CapturedStream {
- public:
-  // The ctor redirects the stream to a temporary file.
-  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
-# if GTEST_OS_WINDOWS
-    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
-    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
-
-    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
-    const UINT success = ::GetTempFileNameA(temp_dir_path,
-                                            "gtest_redir",
-                                            0,  // Generate unique file name.
-                                            temp_file_path);
-    GTEST_CHECK_(success != 0)
-        << "Unable to create a temporary file in " << temp_dir_path;
-    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
-    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
-                                    << temp_file_path;
-    filename_ = temp_file_path;
-# else
-    // There's no guarantee that a test has write access to the current
-    // directory, so we create the temporary file in a temporary directory.
-    std::string name_template;
-
-#  if GTEST_OS_LINUX_ANDROID
-    // Note: Android applications are expected to call the framework's
-    // Context.getExternalStorageDirectory() method through JNI to get
-    // the location of the world-writable SD Card directory. However,
-    // this requires a Context handle, which cannot be retrieved
-    // globally from native code. Doing so also precludes running the
-    // code as part of a regular standalone executable, which doesn't
-    // run in a Dalvik process (e.g. when running it through 'adb shell').
-    //
-    // The location /data/local/tmp is directly accessible from native code.
-    // '/sdcard' and other variants cannot be relied on, as they are not
-    // guaranteed to be mounted, or may have a delay in mounting.
-    name_template = "/data/local/tmp/";
-#  elif GTEST_OS_IOS
-    char user_temp_dir[PATH_MAX + 1];
-
-    // Documented alternative to NSTemporaryDirectory() (for obtaining creating
-    // a temporary directory) at
-    // https://developer.apple.com/library/archive/documentation/Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html#//apple_ref/doc/uid/TP40002585-SW10
-    //
-    // _CS_DARWIN_USER_TEMP_DIR (as well as _CS_DARWIN_USER_CACHE_DIR) is not
-    // documented in the confstr() man page at
-    // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/confstr.3.html#//apple_ref/doc/man/3/confstr
-    // but are still available, according to the WebKit patches at
-    // https://trac.webkit.org/changeset/262004/webkit
-    // https://trac.webkit.org/changeset/263705/webkit
-    //
-    // The confstr() implementation falls back to getenv("TMPDIR"). See
-    // https://opensource.apple.com/source/Libc/Libc-1439.100.3/gen/confstr.c.auto.html
-    ::confstr(_CS_DARWIN_USER_TEMP_DIR, user_temp_dir, sizeof(user_temp_dir));
-
-    name_template = user_temp_dir;
-    if (name_template.back() != GTEST_PATH_SEP_[0])
-      name_template.push_back(GTEST_PATH_SEP_[0]);
-#  else
-    name_template = "/tmp/";
-#  endif
-    name_template.append("gtest_captured_stream.XXXXXX");
-
-    // mkstemp() modifies the string bytes in place, and does not go beyond the
-    // string's length. This results in well-defined behavior in C++17.
-    //
-    // The const_cast is needed below C++17. The constraints on std::string
-    // implementations in C++11 and above make assumption behind the const_cast
-    // fairly safe.
-    const int captured_fd = ::mkstemp(const_cast<char*>(name_template.data()));
-    if (captured_fd == -1) {
-      GTEST_LOG_(WARNING)
-          << "Failed to create tmp file " << name_template
-          << " for test; does the test have access to the /tmp directory?";
-    }
-    filename_ = std::move(name_template);
-# endif  // GTEST_OS_WINDOWS
-    fflush(nullptr);
-    dup2(captured_fd, fd_);
-    close(captured_fd);
-  }
-
-  ~CapturedStream() {
-    remove(filename_.c_str());
-  }
-
-  std::string GetCapturedString() {
-    if (uncaptured_fd_ != -1) {
-      // Restores the original stream.
-      fflush(nullptr);
-      dup2(uncaptured_fd_, fd_);
-      close(uncaptured_fd_);
-      uncaptured_fd_ = -1;
-    }
-
-    FILE* const file = posix::FOpen(filename_.c_str(), "r");
-    if (file == nullptr) {
-      GTEST_LOG_(FATAL) << "Failed to open tmp file " << filename_
-                        << " for capturing stream.";
-    }
-    const std::string content = ReadEntireFile(file);
-    posix::FClose(file);
-    return content;
-  }
-
- private:
-  const int fd_;  // A stream to capture.
-  int uncaptured_fd_;
-  // Name of the temporary file holding the stderr output.
-  ::std::string filename_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
-};
-
-GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-static CapturedStream* g_captured_stderr = nullptr;
-static CapturedStream* g_captured_stdout = nullptr;
-
-// Starts capturing an output stream (stdout/stderr).
-static void CaptureStream(int fd, const char* stream_name,
-                          CapturedStream** stream) {
-  if (*stream != nullptr) {
-    GTEST_LOG_(FATAL) << "Only one " << stream_name
-                      << " capturer can exist at a time.";
-  }
-  *stream = new CapturedStream(fd);
-}
-
-// Stops capturing the output stream and returns the captured string.
-static std::string GetCapturedStream(CapturedStream** captured_stream) {
-  const std::string content = (*captured_stream)->GetCapturedString();
-
-  delete *captured_stream;
-  *captured_stream = nullptr;
-
-  return content;
-}
-
-// Starts capturing stdout.
-void CaptureStdout() {
-  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
-}
-
-// Starts capturing stderr.
-void CaptureStderr() {
-  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
-}
-
-// Stops capturing stdout and returns the captured string.
-std::string GetCapturedStdout() {
-  return GetCapturedStream(&g_captured_stdout);
-}
-
-// Stops capturing stderr and returns the captured string.
-std::string GetCapturedStderr() {
-  return GetCapturedStream(&g_captured_stderr);
-}
-
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-
-
-
-
-
-size_t GetFileSize(FILE* file) {
-  fseek(file, 0, SEEK_END);
-  return static_cast<size_t>(ftell(file));
-}
-
-std::string ReadEntireFile(FILE* file) {
-  const size_t file_size = GetFileSize(file);
-  char* const buffer = new char[file_size];
-
-  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
-  size_t bytes_read = 0;       // # of bytes read so far
-
-  fseek(file, 0, SEEK_SET);
-
-  // Keeps reading the file until we cannot read further or the
-  // pre-determined file size is reached.
-  do {
-    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
-    bytes_read += bytes_last_read;
-  } while (bytes_last_read > 0 && bytes_read < file_size);
-
-  const std::string content(buffer, bytes_read);
-  delete[] buffer;
-
-  return content;
-}
-
-#if GTEST_HAS_DEATH_TEST
-static const std::vector<std::string>* g_injected_test_argvs =
-    nullptr;  // Owned.
-
-std::vector<std::string> GetInjectableArgvs() {
-  if (g_injected_test_argvs != nullptr) {
-    return *g_injected_test_argvs;
-  }
-  return GetArgvs();
-}
-
-void SetInjectableArgvs(const std::vector<std::string>* new_argvs) {
-  if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs;
-  g_injected_test_argvs = new_argvs;
-}
-
-void SetInjectableArgvs(const std::vector<std::string>& new_argvs) {
-  SetInjectableArgvs(
-      new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
-}
-
-void ClearInjectableArgvs() {
-  delete g_injected_test_argvs;
-  g_injected_test_argvs = nullptr;
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-#if GTEST_OS_WINDOWS_MOBILE
-namespace posix {
-void Abort() {
-  DebugBreak();
-  TerminateProcess(GetCurrentProcess(), 1);
-}
-}  // namespace posix
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-// Returns the name of the environment variable corresponding to the
-// given flag.  For example, FlagToEnvVar("foo") will return
-// "GTEST_FOO" in the open-source version.
-static std::string FlagToEnvVar(const char* flag) {
-  const std::string full_flag =
-      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
-
-  Message env_var;
-  for (size_t i = 0; i != full_flag.length(); i++) {
-    env_var << ToUpper(full_flag.c_str()[i]);
-  }
-
-  return env_var.GetString();
-}
-
-// Parses 'str' for a 32-bit signed integer.  If successful, writes
-// the result to *value and returns true; otherwise leaves *value
-// unchanged and returns false.
-bool ParseInt32(const Message& src_text, const char* str, int32_t* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const long long_value = strtol(str, &end, 10);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    Message msg;
-    msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value \"" << str << "\".\n";
-    printf("%s", msg.GetString().c_str());
-    fflush(stdout);
-    return false;
-  }
-
-  // Is the parsed value in the range of an int32_t?
-  const auto result = static_cast<int32_t>(long_value);
-  if (long_value == LONG_MAX || long_value == LONG_MIN ||
-      // The parsed value overflows as a long.  (strtol() returns
-      // LONG_MAX or LONG_MIN when the input overflows.)
-      result != long_value
-      // The parsed value overflows as an int32_t.
-      ) {
-    Message msg;
-    msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value " << str << ", which overflows.\n";
-    printf("%s", msg.GetString().c_str());
-    fflush(stdout);
-    return false;
-  }
-
-  *value = result;
-  return true;
-}
-
-// Reads and returns the Boolean environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-//
-// The value is considered true if and only if it's not "0".
-bool BoolFromGTestEnv(const char* flag, bool default_value) {
-#if defined(GTEST_GET_BOOL_FROM_ENV_)
-  return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = posix::GetEnv(env_var.c_str());
-  return string_value == nullptr ? default_value
-                                 : strcmp(string_value, "0") != 0;
-#endif  // defined(GTEST_GET_BOOL_FROM_ENV_)
-}
-
-// Reads and returns a 32-bit integer stored in the environment
-// variable corresponding to the given flag; if it isn't set or
-// doesn't represent a valid 32-bit integer, returns default_value.
-int32_t Int32FromGTestEnv(const char* flag, int32_t default_value) {
-#if defined(GTEST_GET_INT32_FROM_ENV_)
-  return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = posix::GetEnv(env_var.c_str());
-  if (string_value == nullptr) {
-    // The environment variable is not set.
-    return default_value;
-  }
-
-  int32_t result = default_value;
-  if (!ParseInt32(Message() << "Environment variable " << env_var,
-                  string_value, &result)) {
-    printf("The default value %s is used.\n",
-           (Message() << default_value).GetString().c_str());
-    fflush(stdout);
-    return default_value;
-  }
-
-  return result;
-#endif  // defined(GTEST_GET_INT32_FROM_ENV_)
-}
-
-// As a special case for the 'output' flag, if GTEST_OUTPUT is not
-// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
-// system.  The value of XML_OUTPUT_FILE is a filename without the
-// "xml:" prefix of GTEST_OUTPUT.
-// Note that this is meant to be called at the call site so it does
-// not check that the flag is 'output'
-// In essence this checks an env variable called XML_OUTPUT_FILE
-// and if it is set we prepend "xml:" to its value, if it not set we return ""
-std::string OutputFlagAlsoCheckEnvVar(){
-  std::string default_value_for_output_flag = "";
-  const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
-  if (nullptr != xml_output_file_env) {
-    default_value_for_output_flag = std::string("xml:") + xml_output_file_env;
-  }
-  return default_value_for_output_flag;
-}
-
-// Reads and returns the string environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-const char* StringFromGTestEnv(const char* flag, const char* default_value) {
-#if defined(GTEST_GET_STRING_FROM_ENV_)
-  return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const value = posix::GetEnv(env_var.c_str());
-  return value == nullptr ? default_value : value;
-#endif  // defined(GTEST_GET_STRING_FROM_ENV_)
-}
-
-}  // namespace internal
-}  // namespace testing
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Test - The Google C++ Testing and Mocking Framework
-//
-// This file implements a universal value printer that can print a
-// value of any type T:
-//
-//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
-//
-// It uses the << operator when possible, and prints the bytes in the
-// object otherwise.  A user can override its behavior for a class
-// type Foo by defining either operator<<(::std::ostream&, const Foo&)
-// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
-// defines Foo.
-
-
-#include <stdio.h>
-
-#include <cctype>
-#include <cstdint>
-#include <cwchar>
-#include <ostream>  // NOLINT
-#include <string>
-#include <type_traits>
-
-
-namespace testing {
-
-namespace {
-
-using ::std::ostream;
-
-// Prints a segment of bytes in the given object.
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
-                                size_t count, ostream* os) {
-  char text[5] = "";
-  for (size_t i = 0; i != count; i++) {
-    const size_t j = start + i;
-    if (i != 0) {
-      // Organizes the bytes into groups of 2 for easy parsing by
-      // human.
-      if ((j % 2) == 0)
-        *os << ' ';
-      else
-        *os << '-';
-    }
-    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
-    *os << text;
-  }
-}
-
-// Prints the bytes in the given value to the given ostream.
-void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
-                              ostream* os) {
-  // Tells the user how big the object is.
-  *os << count << "-byte object <";
-
-  const size_t kThreshold = 132;
-  const size_t kChunkSize = 64;
-  // If the object size is bigger than kThreshold, we'll have to omit
-  // some details by printing only the first and the last kChunkSize
-  // bytes.
-  if (count < kThreshold) {
-    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
-  } else {
-    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
-    *os << " ... ";
-    // Rounds up to 2-byte boundary.
-    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
-    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
-  }
-  *os << ">";
-}
-
-// Helpers for widening a character to char32_t. Since the standard does not
-// specify if char / wchar_t is signed or unsigned, it is important to first
-// convert it to the unsigned type of the same width before widening it to
-// char32_t.
-template <typename CharType>
-char32_t ToChar32(CharType in) {
-  return static_cast<char32_t>(
-      static_cast<typename std::make_unsigned<CharType>::type>(in));
-}
-
-}  // namespace
-
-namespace internal {
-
-// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
-// given object.  The delegation simplifies the implementation, which
-// uses the << operator and thus is easier done outside of the
-// ::testing::internal namespace, which contains a << operator that
-// sometimes conflicts with the one in STL.
-void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
-                          ostream* os) {
-  PrintBytesInObjectToImpl(obj_bytes, count, os);
-}
-
-// Depending on the value of a char (or wchar_t), we print it in one
-// of three formats:
-//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
-//   - as a hexadecimal escape sequence (e.g. '\x7F'), or
-//   - as a special escape sequence (e.g. '\r', '\n').
-enum CharFormat {
-  kAsIs,
-  kHexEscape,
-  kSpecialEscape
-};
-
-// Returns true if c is a printable ASCII character.  We test the
-// value of c directly instead of calling isprint(), which is buggy on
-// Windows Mobile.
-inline bool IsPrintableAscii(char32_t c) { return 0x20 <= c && c <= 0x7E; }
-
-// Prints c (of type char, char8_t, char16_t, char32_t, or wchar_t) as a
-// character literal without the quotes, escaping it when necessary; returns how
-// c was formatted.
-template <typename Char>
-static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
-  const char32_t u_c = ToChar32(c);
-  switch (u_c) {
-    case L'\0':
-      *os << "\\0";
-      break;
-    case L'\'':
-      *os << "\\'";
-      break;
-    case L'\\':
-      *os << "\\\\";
-      break;
-    case L'\a':
-      *os << "\\a";
-      break;
-    case L'\b':
-      *os << "\\b";
-      break;
-    case L'\f':
-      *os << "\\f";
-      break;
-    case L'\n':
-      *os << "\\n";
-      break;
-    case L'\r':
-      *os << "\\r";
-      break;
-    case L'\t':
-      *os << "\\t";
-      break;
-    case L'\v':
-      *os << "\\v";
-      break;
-    default:
-      if (IsPrintableAscii(u_c)) {
-        *os << static_cast<char>(c);
-        return kAsIs;
-      } else {
-        ostream::fmtflags flags = os->flags();
-        *os << "\\x" << std::hex << std::uppercase << static_cast<int>(u_c);
-        os->flags(flags);
-        return kHexEscape;
-      }
-  }
-  return kSpecialEscape;
-}
-
-// Prints a char32_t c as if it's part of a string literal, escaping it when
-// necessary; returns how c was formatted.
-static CharFormat PrintAsStringLiteralTo(char32_t c, ostream* os) {
-  switch (c) {
-    case L'\'':
-      *os << "'";
-      return kAsIs;
-    case L'"':
-      *os << "\\\"";
-      return kSpecialEscape;
-    default:
-      return PrintAsCharLiteralTo(c, os);
-  }
-}
-
-static const char* GetCharWidthPrefix(char) {
-  return "";
-}
-
-static const char* GetCharWidthPrefix(signed char) {
-  return "";
-}
-
-static const char* GetCharWidthPrefix(unsigned char) {
-  return "";
-}
-
-#ifdef __cpp_char8_t
-static const char* GetCharWidthPrefix(char8_t) {
-  return "u8";
-}
-#endif
-
-static const char* GetCharWidthPrefix(char16_t) {
-  return "u";
-}
-
-static const char* GetCharWidthPrefix(char32_t) {
-  return "U";
-}
-
-static const char* GetCharWidthPrefix(wchar_t) {
-  return "L";
-}
-
-// Prints a char c as if it's part of a string literal, escaping it when
-// necessary; returns how c was formatted.
-static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
-  return PrintAsStringLiteralTo(ToChar32(c), os);
-}
-
-#ifdef __cpp_char8_t
-static CharFormat PrintAsStringLiteralTo(char8_t c, ostream* os) {
-  return PrintAsStringLiteralTo(ToChar32(c), os);
-}
-#endif
-
-static CharFormat PrintAsStringLiteralTo(char16_t c, ostream* os) {
-  return PrintAsStringLiteralTo(ToChar32(c), os);
-}
-
-static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
-  return PrintAsStringLiteralTo(ToChar32(c), os);
-}
-
-// Prints a character c (of type char, char8_t, char16_t, char32_t, or wchar_t)
-// and its code. '\0' is printed as "'\\0'", other unprintable characters are
-// also properly escaped using the standard C++ escape sequence.
-template <typename Char>
-void PrintCharAndCodeTo(Char c, ostream* os) {
-  // First, print c as a literal in the most readable form we can find.
-  *os << GetCharWidthPrefix(c) << "'";
-  const CharFormat format = PrintAsCharLiteralTo(c, os);
-  *os << "'";
-
-  // To aid user debugging, we also print c's code in decimal, unless
-  // it's 0 (in which case c was printed as '\\0', making the code
-  // obvious).
-  if (c == 0)
-    return;
-  *os << " (" << static_cast<int>(c);
-
-  // For more convenience, we print c's code again in hexadecimal,
-  // unless c was already printed in the form '\x##' or the code is in
-  // [1, 9].
-  if (format == kHexEscape || (1 <= c && c <= 9)) {
-    // Do nothing.
-  } else {
-    *os << ", 0x" << String::FormatHexInt(static_cast<int>(c));
-  }
-  *os << ")";
-}
-
-void PrintTo(unsigned char c, ::std::ostream* os) { PrintCharAndCodeTo(c, os); }
-void PrintTo(signed char c, ::std::ostream* os) { PrintCharAndCodeTo(c, os); }
-
-// Prints a wchar_t as a symbol if it is printable or as its internal
-// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
-void PrintTo(wchar_t wc, ostream* os) { PrintCharAndCodeTo(wc, os); }
-
-// TODO(dcheng): Consider making this delegate to PrintCharAndCodeTo() as well.
-void PrintTo(char32_t c, ::std::ostream* os) {
-  *os << std::hex << "U+" << std::uppercase << std::setfill('0') << std::setw(4)
-      << static_cast<uint32_t>(c);
-}
-
-// Prints the given array of characters to the ostream.  CharType must be either
-// char, char8_t, char16_t, char32_t, or wchar_t.
-// The array starts at begin, the length is len, it may include '\0' characters
-// and may not be NUL-terminated.
-template <typename CharType>
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-static CharFormat PrintCharsAsStringTo(
-    const CharType* begin, size_t len, ostream* os) {
-  const char* const quote_prefix = GetCharWidthPrefix(*begin);
-  *os << quote_prefix << "\"";
-  bool is_previous_hex = false;
-  CharFormat print_format = kAsIs;
-  for (size_t index = 0; index < len; ++index) {
-    const CharType cur = begin[index];
-    if (is_previous_hex && IsXDigit(cur)) {
-      // Previous character is of '\x..' form and this character can be
-      // interpreted as another hexadecimal digit in its number. Break string to
-      // disambiguate.
-      *os << "\" " << quote_prefix << "\"";
-    }
-    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
-    // Remember if any characters required hex escaping.
-    if (is_previous_hex) {
-      print_format = kHexEscape;
-    }
-  }
-  *os << "\"";
-  return print_format;
-}
-
-// Prints a (const) char/wchar_t array of 'len' elements, starting at address
-// 'begin'.  CharType must be either char or wchar_t.
-template <typename CharType>
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-static void UniversalPrintCharArray(
-    const CharType* begin, size_t len, ostream* os) {
-  // The code
-  //   const char kFoo[] = "foo";
-  // generates an array of 4, not 3, elements, with the last one being '\0'.
-  //
-  // Therefore when printing a char array, we don't print the last element if
-  // it's '\0', such that the output matches the string literal as it's
-  // written in the source code.
-  if (len > 0 && begin[len - 1] == '\0') {
-    PrintCharsAsStringTo(begin, len - 1, os);
-    return;
-  }
-
-  // If, however, the last element in the array is not '\0', e.g.
-  //    const char kFoo[] = { 'f', 'o', 'o' };
-  // we must print the entire array.  We also print a message to indicate
-  // that the array is not NUL-terminated.
-  PrintCharsAsStringTo(begin, len, os);
-  *os << " (no terminating NUL)";
-}
-
-// Prints a (const) char array of 'len' elements, starting at address 'begin'.
-void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-#ifdef __cpp_char8_t
-// Prints a (const) char8_t array of 'len' elements, starting at address
-// 'begin'.
-void UniversalPrintArray(const char8_t* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-#endif
-
-// Prints a (const) char16_t array of 'len' elements, starting at address
-// 'begin'.
-void UniversalPrintArray(const char16_t* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-// Prints a (const) char32_t array of 'len' elements, starting at address
-// 'begin'.
-void UniversalPrintArray(const char32_t* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-// Prints a (const) wchar_t array of 'len' elements, starting at address
-// 'begin'.
-void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-namespace {
-
-// Prints a null-terminated C-style string to the ostream.
-template <typename Char>
-void PrintCStringTo(const Char* s, ostream* os) {
-  if (s == nullptr) {
-    *os << "NULL";
-  } else {
-    *os << ImplicitCast_<const void*>(s) << " pointing to ";
-    PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
-  }
-}
-
-}  // anonymous namespace
-
-void PrintTo(const char* s, ostream* os) { PrintCStringTo(s, os); }
-
-#ifdef __cpp_char8_t
-void PrintTo(const char8_t* s, ostream* os) { PrintCStringTo(s, os); }
-#endif
-
-void PrintTo(const char16_t* s, ostream* os) { PrintCStringTo(s, os); }
-
-void PrintTo(const char32_t* s, ostream* os) { PrintCStringTo(s, os); }
-
-// MSVC compiler can be configured to define whar_t as a typedef
-// of unsigned short. Defining an overload for const wchar_t* in that case
-// would cause pointers to unsigned shorts be printed as wide strings,
-// possibly accessing more memory than intended and causing invalid
-// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
-// wchar_t is implemented as a native type.
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-// Prints the given wide C string to the ostream.
-void PrintTo(const wchar_t* s, ostream* os) { PrintCStringTo(s, os); }
-#endif  // wchar_t is native
-
-namespace {
-
-bool ContainsUnprintableControlCodes(const char* str, size_t length) {
-  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
-
-  for (size_t i = 0; i < length; i++) {
-    unsigned char ch = *s++;
-    if (std::iscntrl(ch)) {
-        switch (ch) {
-        case '\t':
-        case '\n':
-        case '\r':
-          break;
-        default:
-          return true;
-        }
-      }
-  }
-  return false;
-}
-
-bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; }
-
-bool IsValidUTF8(const char* str, size_t length) {
-  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
-
-  for (size_t i = 0; i < length;) {
-    unsigned char lead = s[i++];
-
-    if (lead <= 0x7f) {
-      continue;  // single-byte character (ASCII) 0..7F
-    }
-    if (lead < 0xc2) {
-      return false;  // trail byte or non-shortest form
-    } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) {
-      ++i;  // 2-byte character
-    } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length &&
-               IsUTF8TrailByte(s[i]) &&
-               IsUTF8TrailByte(s[i + 1]) &&
-               // check for non-shortest form and surrogate
-               (lead != 0xe0 || s[i] >= 0xa0) &&
-               (lead != 0xed || s[i] < 0xa0)) {
-      i += 2;  // 3-byte character
-    } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length &&
-               IsUTF8TrailByte(s[i]) &&
-               IsUTF8TrailByte(s[i + 1]) &&
-               IsUTF8TrailByte(s[i + 2]) &&
-               // check for non-shortest form
-               (lead != 0xf0 || s[i] >= 0x90) &&
-               (lead != 0xf4 || s[i] < 0x90)) {
-      i += 3;  // 4-byte character
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
-  if (!ContainsUnprintableControlCodes(str, length) &&
-      IsValidUTF8(str, length)) {
-    *os << "\n    As Text: \"" << str << "\"";
-  }
-}
-
-}  // anonymous namespace
-
-void PrintStringTo(const ::std::string& s, ostream* os) {
-  if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
-    if (GTEST_FLAG(print_utf8)) {
-      ConditionalPrintAsText(s.data(), s.size(), os);
-    }
-  }
-}
-
-#ifdef __cpp_char8_t
-void PrintU8StringTo(const ::std::u8string& s, ostream* os) {
-  PrintCharsAsStringTo(s.data(), s.size(), os);
-}
-#endif
-
-void PrintU16StringTo(const ::std::u16string& s, ostream* os) {
-  PrintCharsAsStringTo(s.data(), s.size(), os);
-}
-
-void PrintU32StringTo(const ::std::u32string& s, ostream* os) {
-  PrintCharsAsStringTo(s.data(), s.size(), os);
-}
-
-#if GTEST_HAS_STD_WSTRING
-void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
-  PrintCharsAsStringTo(s.data(), s.size(), os);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-}  // namespace internal
-
-}  // namespace testing
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-
-
-
-namespace testing {
-
-using internal::GetUnitTestImpl;
-
-// Gets the summary of the failure message by omitting the stack trace
-// in it.
-std::string TestPartResult::ExtractSummary(const char* message) {
-  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
-  return stack_trace == nullptr ? message : std::string(message, stack_trace);
-}
-
-// Prints a TestPartResult object.
-std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
-  return os << internal::FormatFileLocation(result.file_name(),
-                                            result.line_number())
-            << " "
-            << (result.type() == TestPartResult::kSuccess
-                    ? "Success"
-                    : result.type() == TestPartResult::kSkip
-                          ? "Skipped"
-                          : result.type() == TestPartResult::kFatalFailure
-                                ? "Fatal failure"
-                                : "Non-fatal failure")
-            << ":\n"
-            << result.message() << std::endl;
-}
-
-// Appends a TestPartResult to the array.
-void TestPartResultArray::Append(const TestPartResult& result) {
-  array_.push_back(result);
-}
-
-// Returns the TestPartResult at the given index (0-based).
-const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
-  if (index < 0 || index >= size()) {
-    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
-    internal::posix::Abort();
-  }
-
-  return array_[static_cast<size_t>(index)];
-}
-
-// Returns the number of TestPartResult objects in the array.
-int TestPartResultArray::size() const {
-  return static_cast<int>(array_.size());
-}
-
-namespace internal {
-
-HasNewFatalFailureHelper::HasNewFatalFailureHelper()
-    : has_new_fatal_failure_(false),
-      original_reporter_(GetUnitTestImpl()->
-                         GetTestPartResultReporterForCurrentThread()) {
-  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
-}
-
-HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
-  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
-      original_reporter_);
-}
-
-void HasNewFatalFailureHelper::ReportTestPartResult(
-    const TestPartResult& result) {
-  if (result.fatally_failed())
-    has_new_fatal_failure_ = true;
-  original_reporter_->ReportTestPartResult(result);
-}
-
-}  // namespace internal
-
-}  // namespace testing
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-namespace testing {
-namespace internal {
-
-// Skips to the first non-space char in str. Returns an empty string if str
-// contains only whitespace characters.
-static const char* SkipSpaces(const char* str) {
-  while (IsSpace(*str))
-    str++;
-  return str;
-}
-
-static std::vector<std::string> SplitIntoTestNames(const char* src) {
-  std::vector<std::string> name_vec;
-  src = SkipSpaces(src);
-  for (; src != nullptr; src = SkipComma(src)) {
-    name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
-  }
-  return name_vec;
-}
-
-// Verifies that registered_tests match the test names in
-// registered_tests_; returns registered_tests if successful, or
-// aborts the program otherwise.
-const char* TypedTestSuitePState::VerifyRegisteredTestNames(
-    const char* test_suite_name, const char* file, int line,
-    const char* registered_tests) {
-  RegisterTypeParameterizedTestSuite(test_suite_name, CodeLocation(file, line));
-
-  typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
-  registered_ = true;
-
-  std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
-
-  Message errors;
-
-  std::set<std::string> tests;
-  for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
-       name_it != name_vec.end(); ++name_it) {
-    const std::string& name = *name_it;
-    if (tests.count(name) != 0) {
-      errors << "Test " << name << " is listed more than once.\n";
-      continue;
-    }
-
-    if (registered_tests_.count(name) != 0) {
-      tests.insert(name);
-    } else {
-      errors << "No test named " << name
-             << " can be found in this test suite.\n";
-    }
-  }
-
-  for (RegisteredTestIter it = registered_tests_.begin();
-       it != registered_tests_.end();
-       ++it) {
-    if (tests.count(it->first) == 0) {
-      errors << "You forgot to list test " << it->first << ".\n";
-    }
-  }
-
-  const std::string& errors_str = errors.GetString();
-  if (errors_str != "") {
-    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
-            errors_str.c_str());
-    fflush(stderr);
-    posix::Abort();
-  }
-
-  return registered_tests;
-}
-
-}  // namespace internal
-}  // namespace testing
diff --git a/code/cpp-httplib-0.19.0/test/gtest/gtest.h b/code/cpp-httplib-0.19.0/test/gtest/gtest.h
deleted file mode 100644
index e7490573..00000000
--- a/code/cpp-httplib-0.19.0/test/gtest/gtest.h
+++ /dev/null
@@ -1,12377 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the public API for Google Test.  It should be
-// included by any test program that uses Google Test.
-//
-// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
-// leave some internal implementation details in this header file.
-// They are clearly marked by comments like this:
-//
-//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-//
-// Such code is NOT meant to be used by a user directly, and is subject
-// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
-// program!
-//
-// Acknowledgment: Google Test borrowed the idea of automatic test
-// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
-// easyUnit framework.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_H_
-
-#include <cstddef>
-#include <limits>
-#include <memory>
-#include <ostream>
-#include <type_traits>
-#include <vector>
-
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file declares functions and macros used internally by
-// Google Test.  They are subject to change without notice.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Low-level types and utilities for porting Google Test to various
-// platforms.  All macros ending with _ and symbols defined in an
-// internal namespace are subject to change without notice.  Code
-// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
-// end with _ are part of Google Test's public API and can be used by
-// code outside Google Test.
-//
-// This file is fundamental to Google Test.  All other Google Test source
-// files are expected to #include this.  Therefore, it cannot #include
-// any other Google Test header.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-
-// Environment-describing macros
-// -----------------------------
-//
-// Google Test can be used in many different environments.  Macros in
-// this section tell Google Test what kind of environment it is being
-// used in, such that Google Test can provide environment-specific
-// features and implementations.
-//
-// Google Test tries to automatically detect the properties of its
-// environment, so users usually don't need to worry about these
-// macros.  However, the automatic detection is not perfect.
-// Sometimes it's necessary for a user to define some of the following
-// macros in the build script to override Google Test's decisions.
-//
-// If the user doesn't define a macro in the list, Google Test will
-// provide a default definition.  After this header is #included, all
-// macros in this list will be defined to either 1 or 0.
-//
-// Notes to maintainers:
-//   - Each macro here is a user-tweakable knob; do not grow the list
-//     lightly.
-//   - Use #if to key off these macros.  Don't use #ifdef or "#if
-//     defined(...)", which will not work as these macros are ALWAYS
-//     defined.
-//
-//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
-//                              is/isn't available.
-//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
-//                              are enabled.
-//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
-//                              expressions are/aren't available.
-//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
-//                              is/isn't available.
-//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
-//                              enabled.
-//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
-//                              std::wstring does/doesn't work (Google Test can
-//                              be used where std::wstring is unavailable).
-//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
-//                              compiler supports Microsoft's "Structured
-//                              Exception Handling".
-//   GTEST_HAS_STREAM_REDIRECTION
-//                            - Define it to 1/0 to indicate whether the
-//                              platform supports I/O stream redirection using
-//                              dup() and dup2().
-//   GTEST_LINKED_AS_SHARED_LIBRARY
-//                            - Define to 1 when compiling tests that use
-//                              Google Test as a shared library (known as
-//                              DLL on Windows).
-//   GTEST_CREATE_SHARED_LIBRARY
-//                            - Define to 1 when compiling Google Test itself
-//                              as a shared library.
-//   GTEST_DEFAULT_DEATH_TEST_STYLE
-//                            - The default value of --gtest_death_test_style.
-//                              The legacy default has been "fast" in the open
-//                              source version since 2008. The recommended value
-//                              is "threadsafe", and can be set in
-//                              custom/gtest-port.h.
-
-// Platform-indicating macros
-// --------------------------
-//
-// Macros indicating the platform on which Google Test is being used
-// (a macro is defined to 1 if compiled on the given platform;
-// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
-// defines these macros automatically.  Code outside Google Test MUST
-// NOT define them.
-//
-//   GTEST_OS_AIX      - IBM AIX
-//   GTEST_OS_CYGWIN   - Cygwin
-//   GTEST_OS_DRAGONFLY - DragonFlyBSD
-//   GTEST_OS_FREEBSD  - FreeBSD
-//   GTEST_OS_FUCHSIA  - Fuchsia
-//   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
-//   GTEST_OS_HAIKU    - Haiku
-//   GTEST_OS_HPUX     - HP-UX
-//   GTEST_OS_LINUX    - Linux
-//     GTEST_OS_LINUX_ANDROID - Google Android
-//   GTEST_OS_MAC      - Mac OS X
-//     GTEST_OS_IOS    - iOS
-//   GTEST_OS_NACL     - Google Native Client (NaCl)
-//   GTEST_OS_NETBSD   - NetBSD
-//   GTEST_OS_OPENBSD  - OpenBSD
-//   GTEST_OS_OS2      - OS/2
-//   GTEST_OS_QNX      - QNX
-//   GTEST_OS_SOLARIS  - Sun Solaris
-//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
-//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
-//     GTEST_OS_WINDOWS_MINGW    - MinGW
-//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
-//     GTEST_OS_WINDOWS_PHONE    - Windows Phone
-//     GTEST_OS_WINDOWS_RT       - Windows Store App/WinRT
-//   GTEST_OS_ZOS      - z/OS
-//
-// Among the platforms, Cygwin, Linux, Mac OS X, and Windows have the
-// most stable support.  Since core members of the Google Test project
-// don't have access to other platforms, support for them may be less
-// stable.  If you notice any problems on your platform, please notify
-// googletestframework@googlegroups.com (patches for fixing them are
-// even more welcome!).
-//
-// It is possible that none of the GTEST_OS_* macros are defined.
-
-// Feature-indicating macros
-// -------------------------
-//
-// Macros indicating which Google Test features are available (a macro
-// is defined to 1 if the corresponding feature is supported;
-// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
-// defines these macros automatically.  Code outside Google Test MUST
-// NOT define them.
-//
-// These macros are public so that portable tests can be written.
-// Such tests typically surround code using a feature with an #if
-// which controls that code.  For example:
-//
-// #if GTEST_HAS_DEATH_TEST
-//   EXPECT_DEATH(DoSomethingDeadly());
-// #endif
-//
-//   GTEST_HAS_DEATH_TEST   - death tests
-//   GTEST_HAS_TYPED_TEST   - typed tests
-//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
-//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
-//   GOOGLETEST_CM0007 DO NOT DELETE
-//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
-//                            GTEST_HAS_POSIX_RE (see above) which users can
-//                            define themselves.
-//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
-//                            the above RE\b(s) are mutually exclusive.
-
-// Misc public macros
-// ------------------
-//
-//   GTEST_FLAG(flag_name)  - references the variable corresponding to
-//                            the given Google Test flag.
-
-// Internal utilities
-// ------------------
-//
-// The following macros and utilities are for Google Test's INTERNAL
-// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
-//
-// Macros for basic C++ coding:
-//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
-//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
-//                              variable don't have to be used.
-//   GTEST_DISALLOW_ASSIGN_   - disables copy operator=.
-//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
-//   GTEST_DISALLOW_MOVE_ASSIGN_   - disables move operator=.
-//   GTEST_DISALLOW_MOVE_AND_ASSIGN_ - disables move ctor and operator=.
-//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
-//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
-//                                        suppressed (constant conditional).
-//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
-//                                        is suppressed.
-//   GTEST_INTERNAL_HAS_ANY - for enabling UniversalPrinter<std::any> or
-//                            UniversalPrinter<absl::any> specializations.
-//   GTEST_INTERNAL_HAS_OPTIONAL - for enabling UniversalPrinter<std::optional>
-//   or
-//                                 UniversalPrinter<absl::optional>
-//                                 specializations.
-//   GTEST_INTERNAL_HAS_STRING_VIEW - for enabling Matcher<std::string_view> or
-//                                    Matcher<absl::string_view>
-//                                    specializations.
-//   GTEST_INTERNAL_HAS_VARIANT - for enabling UniversalPrinter<std::variant> or
-//                                UniversalPrinter<absl::variant>
-//                                specializations.
-//
-// Synchronization:
-//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
-//                            - synchronization primitives.
-//
-// Regular expressions:
-//   RE             - a simple regular expression class using the POSIX
-//                    Extended Regular Expression syntax on UNIX-like platforms
-//                    GOOGLETEST_CM0008 DO NOT DELETE
-//                    or a reduced regular exception syntax on other
-//                    platforms, including Windows.
-// Logging:
-//   GTEST_LOG_()   - logs messages at the specified severity level.
-//   LogToStderr()  - directs all log messages to stderr.
-//   FlushInfoLog() - flushes informational log messages.
-//
-// Stdout and stderr capturing:
-//   CaptureStdout()     - starts capturing stdout.
-//   GetCapturedStdout() - stops capturing stdout and returns the captured
-//                         string.
-//   CaptureStderr()     - starts capturing stderr.
-//   GetCapturedStderr() - stops capturing stderr and returns the captured
-//                         string.
-//
-// Integer types:
-//   TypeWithSize   - maps an integer to a int type.
-//   TimeInMillis   - integers of known sizes.
-//   BiggestInt     - the biggest signed integer type.
-//
-// Command-line utilities:
-//   GTEST_DECLARE_*()  - declares a flag.
-//   GTEST_DEFINE_*()   - defines a flag.
-//   GetInjectableArgvs() - returns the command line as a vector of strings.
-//
-// Environment variable utilities:
-//   GetEnv()             - gets the value of an environment variable.
-//   BoolFromGTestEnv()   - parses a bool environment variable.
-//   Int32FromGTestEnv()  - parses an int32_t environment variable.
-//   StringFromGTestEnv() - parses a string environment variable.
-//
-// Deprecation warnings:
-//   GTEST_INTERNAL_DEPRECATED(message) - attribute marking a function as
-//                                        deprecated; calling a marked function
-//                                        should generate a compiler warning
-
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <cerrno>
-#include <cstdint>
-#include <limits>
-#include <type_traits>
-
-#ifndef _WIN32_WCE
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif  // !_WIN32_WCE
-
-#if defined __APPLE__
-# include <AvailabilityMacros.h>
-# include <TargetConditionals.h>
-#endif
-
-#include <iostream>  // NOLINT
-#include <locale>
-#include <memory>
-#include <string>  // NOLINT
-#include <tuple>
-#include <vector>  // NOLINT
-
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the GTEST_OS_* macro.
-// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-
-// Determines the platform on which Google Test is compiled.
-#ifdef __CYGWIN__
-# define GTEST_OS_CYGWIN 1
-# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
-#  define GTEST_OS_WINDOWS_MINGW 1
-#  define GTEST_OS_WINDOWS 1
-#elif defined _WIN32
-# define GTEST_OS_WINDOWS 1
-# ifdef _WIN32_WCE
-#  define GTEST_OS_WINDOWS_MOBILE 1
-# elif defined(WINAPI_FAMILY)
-#  include <winapifamily.h>
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#   define GTEST_OS_WINDOWS_DESKTOP 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
-#   define GTEST_OS_WINDOWS_PHONE 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-#   define GTEST_OS_WINDOWS_RT 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
-#   define GTEST_OS_WINDOWS_PHONE 1
-#   define GTEST_OS_WINDOWS_TV_TITLE 1
-#  else
-    // WINAPI_FAMILY defined but no known partition matched.
-    // Default to desktop.
-#   define GTEST_OS_WINDOWS_DESKTOP 1
-#  endif
-# else
-#  define GTEST_OS_WINDOWS_DESKTOP 1
-# endif  // _WIN32_WCE
-#elif defined __OS2__
-# define GTEST_OS_OS2 1
-#elif defined __APPLE__
-# define GTEST_OS_MAC 1
-# include <TargetConditionals.h>
-# if TARGET_OS_IPHONE
-#  define GTEST_OS_IOS 1
-# endif
-#elif defined __DragonFly__
-# define GTEST_OS_DRAGONFLY 1
-#elif defined __FreeBSD__
-# define GTEST_OS_FREEBSD 1
-#elif defined __Fuchsia__
-# define GTEST_OS_FUCHSIA 1
-#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-# define GTEST_OS_GNU_KFREEBSD 1
-#elif defined __linux__
-# define GTEST_OS_LINUX 1
-# if defined __ANDROID__
-#  define GTEST_OS_LINUX_ANDROID 1
-# endif
-#elif defined __MVS__
-# define GTEST_OS_ZOS 1
-#elif defined(__sun) && defined(__SVR4)
-# define GTEST_OS_SOLARIS 1
-#elif defined(_AIX)
-# define GTEST_OS_AIX 1
-#elif defined(__hpux)
-# define GTEST_OS_HPUX 1
-#elif defined __native_client__
-# define GTEST_OS_NACL 1
-#elif defined __NetBSD__
-# define GTEST_OS_NETBSD 1
-#elif defined __OpenBSD__
-# define GTEST_OS_OPENBSD 1
-#elif defined __QNX__
-# define GTEST_OS_QNX 1
-#elif defined(__HAIKU__)
-#define GTEST_OS_HAIKU 1
-#elif defined ESP8266
-#define GTEST_OS_ESP8266 1
-#elif defined ESP32
-#define GTEST_OS_ESP32 1
-#elif defined(__XTENSA__)
-#define GTEST_OS_XTENSA 1
-#endif  // __CYGWIN__
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-
-#if !defined(GTEST_DEV_EMAIL_)
-# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
-# define GTEST_FLAG_PREFIX_ "gtest_"
-# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
-# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
-# define GTEST_NAME_ "Google Test"
-# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
-#endif  // !defined(GTEST_DEV_EMAIL_)
-
-#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
-#endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-
-// Determines the version of gcc that is used to compile this.
-#ifdef __GNUC__
-// 40302 means version 4.3.2.
-# define GTEST_GCC_VER_ \
-    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
-#endif  // __GNUC__
-
-// Macros for disabling Microsoft Visual C++ warnings.
-//
-//   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
-//   /* code that triggers warnings C4800 and C4385 */
-//   GTEST_DISABLE_MSC_WARNINGS_POP_()
-#if defined(_MSC_VER)
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
-    __pragma(warning(push))                        \
-    __pragma(warning(disable: warnings))
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
-    __pragma(warning(pop))
-#else
-// Not all compilers are MSVC
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-// Clang on Windows does not understand MSVC's pragma warning.
-// We need clang-specific way to disable function deprecation warning.
-#ifdef __clang__
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                         \
-    _Pragma("clang diagnostic push")                                  \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
-#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    _Pragma("clang diagnostic pop")
-#else
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
-# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-// Brings in definitions for functions used in the testing::internal::posix
-// namespace (read, write, close, chdir, isatty, stat). We do not currently
-// use them on Windows Mobile.
-#if GTEST_OS_WINDOWS
-# if !GTEST_OS_WINDOWS_MOBILE
-#  include <direct.h>
-#  include <io.h>
-# endif
-// In order to avoid having to include <windows.h>, use forward declaration
-#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
-// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
-// separate (equivalent) structs, instead of using typedef
-typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
-#else
-// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
-// This assumption is verified by
-// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
-typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
-#endif
-#elif GTEST_OS_XTENSA
-#include <unistd.h>
-// Xtensa toolchains define strcasecmp in the string.h header instead of
-// strings.h. string.h is already included.
-#else
-// This assumes that non-Windows OSes provide unistd.h. For OSes where this
-// is not the case, we need to include headers that provide the functions
-// mentioned above.
-# include <unistd.h>
-# include <strings.h>
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_LINUX_ANDROID
-// Used to define __ANDROID_API__ matching the target NDK API level.
-#  include <android/api-level.h>  // NOLINT
-#endif
-
-// Defines this to true if and only if Google Test can use POSIX regular
-// expressions.
-#ifndef GTEST_HAS_POSIX_RE
-# if GTEST_OS_LINUX_ANDROID
-// On Android, <regex.h> is only available starting with Gingerbread.
-#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
-# else
-#define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS && !GTEST_OS_XTENSA)
-# endif
-#endif
-
-#if GTEST_USES_PCRE
-// The appropriate headers have already been included.
-
-#elif GTEST_HAS_POSIX_RE
-
-// On some platforms, <regex.h> needs someone to define size_t, and
-// won't compile otherwise.  We can #include it here as we already
-// included <stdlib.h>, which is guaranteed to define size_t through
-// <stddef.h>.
-# include <regex.h>  // NOLINT
-
-# define GTEST_USES_POSIX_RE 1
-
-#elif GTEST_OS_WINDOWS
-
-// <regex.h> is not available on Windows.  Use our own simple regex
-// implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#else
-
-// <regex.h> may not be available on this platform.  Use our own
-// simple regex implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#endif  // GTEST_USES_PCRE
-
-#ifndef GTEST_HAS_EXCEPTIONS
-// The user didn't tell us whether exceptions are enabled, so we need
-// to figure it out.
-# if defined(_MSC_VER) && defined(_CPPUNWIND)
-// MSVC defines _CPPUNWIND to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__BORLANDC__)
-// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
-// macro to enable exceptions, so we'll do the same.
-// Assumes that exceptions are enabled by default.
-#  ifndef _HAS_EXCEPTIONS
-#   define _HAS_EXCEPTIONS 1
-#  endif  // _HAS_EXCEPTIONS
-#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
-# elif defined(__clang__)
-// clang defines __EXCEPTIONS if and only if exceptions are enabled before clang
-// 220714, but if and only if cleanups are enabled after that. In Obj-C++ files,
-// there can be cleanups for ObjC exceptions which also need cleanups, even if
-// C++ exceptions are disabled. clang has __has_feature(cxx_exceptions) which
-// checks for C++ exceptions starting at clang r206352, but which checked for
-// cleanups prior to that. To reliably check for C++ exception availability with
-// clang, check for
-// __EXCEPTIONS && __has_feature(cxx_exceptions).
-#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
-# elif defined(__GNUC__) && __EXCEPTIONS
-// gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__SUNPRO_CC)
-// Sun Pro CC supports exceptions.  However, there is no compile-time way of
-// detecting whether they are enabled or not.  Therefore, we assume that
-// they are enabled unless the user tells us otherwise.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__IBMCPP__) && __EXCEPTIONS
-// xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__HP_aCC)
-// Exception handling is in effect by default in HP aCC compiler. It has to
-// be turned of by +noeh compiler option if desired.
-#  define GTEST_HAS_EXCEPTIONS 1
-# else
-// For other compilers, we assume exceptions are disabled to be
-// conservative.
-#  define GTEST_HAS_EXCEPTIONS 0
-# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#ifndef GTEST_HAS_STD_WSTRING
-// The user didn't tell us whether ::std::wstring is available, so we need
-// to figure it out.
-// Cygwin 1.7 and below doesn't support ::std::wstring.
-// Solaris' libc++ doesn't support it either.  Android has
-// no support for it at least as recent as Froyo (2.2).
-#define GTEST_HAS_STD_WSTRING                                         \
-  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
-     GTEST_OS_HAIKU || GTEST_OS_ESP32 || GTEST_OS_ESP8266 || GTEST_OS_XTENSA))
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Determines whether RTTI is available.
-#ifndef GTEST_HAS_RTTI
-// The user didn't tell us whether RTTI is enabled, so we need to
-// figure it out.
-
-# ifdef _MSC_VER
-
-#ifdef _CPPRTTI  // MSVC defines this macro if and only if RTTI is enabled.
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
-
-// Starting with version 4.3.2, gcc defines __GXX_RTTI if and only if RTTI is
-// enabled.
-# elif defined(__GNUC__)
-
-#  ifdef __GXX_RTTI
-// When building against STLport with the Android NDK and with
-// -frtti -fno-exceptions, the build fails at link time with undefined
-// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
-// so disable RTTI when detected.
-#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
-       !defined(__EXCEPTIONS)
-#    define GTEST_HAS_RTTI 0
-#   else
-#    define GTEST_HAS_RTTI 1
-#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif  // __GXX_RTTI
-
-// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
-// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
-// first version with C++ support.
-# elif defined(__clang__)
-
-#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
-
-// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
-// both the typeid and dynamic_cast features are present.
-# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
-
-#  ifdef __RTTI_ALL__
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
-
-# else
-
-// For all other compilers, we assume RTTI is enabled.
-#  define GTEST_HAS_RTTI 1
-
-# endif  // _MSC_VER
-
-#endif  // GTEST_HAS_RTTI
-
-// It's this header's responsibility to #include <typeinfo> when RTTI
-// is enabled.
-#if GTEST_HAS_RTTI
-# include <typeinfo>
-#endif
-
-// Determines whether Google Test can use the pthreads library.
-#ifndef GTEST_HAS_PTHREAD
-// The user didn't tell us explicitly, so we make reasonable assumptions about
-// which platforms have pthreads support.
-//
-// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
-// to your compiler flags.
-#define GTEST_HAS_PTHREAD                                                      \
-  (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||          \
-   GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
-   GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||          \
-   GTEST_OS_HAIKU)
-#endif  // GTEST_HAS_PTHREAD
-
-#if GTEST_HAS_PTHREAD
-// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
-// true.
-# include <pthread.h>  // NOLINT
-
-// For timespec and nanosleep, used below.
-# include <time.h>  // NOLINT
-#endif
-
-// Determines whether clone(2) is supported.
-// Usually it will only be available on Linux, excluding
-// Linux on the Itanium architecture.
-// Also see http://linux.die.net/man/2/clone.
-#ifndef GTEST_HAS_CLONE
-// The user didn't tell us, so we need to figure it out.
-
-# if GTEST_OS_LINUX && !defined(__ia64__)
-#  if GTEST_OS_LINUX_ANDROID
-// On Android, clone() became available at different API levels for each 32-bit
-// architecture.
-#    if defined(__LP64__) || \
-        (defined(__arm__) && __ANDROID_API__ >= 9) || \
-        (defined(__mips__) && __ANDROID_API__ >= 12) || \
-        (defined(__i386__) && __ANDROID_API__ >= 17)
-#     define GTEST_HAS_CLONE 1
-#    else
-#     define GTEST_HAS_CLONE 0
-#    endif
-#  else
-#   define GTEST_HAS_CLONE 1
-#  endif
-# else
-#  define GTEST_HAS_CLONE 0
-# endif  // GTEST_OS_LINUX && !defined(__ia64__)
-
-#endif  // GTEST_HAS_CLONE
-
-// Determines whether to support stream redirection. This is used to test
-// output correctness and to implement death tests.
-#ifndef GTEST_HAS_STREAM_REDIRECTION
-// By default, we assume that stream redirection is supported on all
-// platforms except known mobile ones.
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
-#  define GTEST_HAS_STREAM_REDIRECTION 0
-# else
-#  define GTEST_HAS_STREAM_REDIRECTION 1
-# endif  // !GTEST_OS_WINDOWS_MOBILE
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-
-// Determines whether to support death tests.
-// pops up a dialog window that cannot be suppressed programmatically.
-#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS ||             \
-     (GTEST_OS_MAC && !GTEST_OS_IOS) ||                                   \
-     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW ||  \
-     GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
-     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
-     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
-# define GTEST_HAS_DEATH_TEST 1
-#endif
-
-// Determines whether to support type-driven tests.
-
-// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
-// Sun Pro CC, IBM Visual Age, and HP aCC support.
-#if defined(__GNUC__) || defined(_MSC_VER) || defined(__SUNPRO_CC) || \
-    defined(__IBMCPP__) || defined(__HP_aCC)
-# define GTEST_HAS_TYPED_TEST 1
-# define GTEST_HAS_TYPED_TEST_P 1
-#endif
-
-// Determines whether the system compiler uses UTF-16 for encoding wide strings.
-#define GTEST_WIDE_STRING_USES_UTF16_ \
-  (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
-
-// Determines whether test results can be streamed to a socket.
-#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
-    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# define GTEST_CAN_STREAM_RESULTS_ 1
-#endif
-
-// Defines some utility macros.
-
-// The GNU compiler emits a warning if nested "if" statements are followed by
-// an "else" statement and braces are not used to explicitly disambiguate the
-// "else" binding.  This leads to problems with code like:
-//
-//   if (gate)
-//     ASSERT_*(condition) << "Some message";
-//
-// The "switch (0) case 0:" idiom is used to suppress this.
-#ifdef __INTEL_COMPILER
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
-#else
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
-#endif
-
-// Use this annotation at the end of a struct/class definition to
-// prevent the compiler from optimizing away instances that are never
-// used.  This is useful when all interesting logic happens inside the
-// c'tor and / or d'tor.  Example:
-//
-//   struct Foo {
-//     Foo() { ... }
-//   } GTEST_ATTRIBUTE_UNUSED_;
-//
-// Also use it after a variable or parameter declaration to tell the
-// compiler the variable/parameter does not have to be used.
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-#elif defined(__clang__)
-# if __has_attribute(unused)
-#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-# endif
-#endif
-#ifndef GTEST_ATTRIBUTE_UNUSED_
-# define GTEST_ATTRIBUTE_UNUSED_
-#endif
-
-// Use this annotation before a function that takes a printf format string.
-#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
-# if defined(__MINGW_PRINTF_FORMAT)
-// MinGW has two different printf implementations. Ensure the format macro
-// matches the selected implementation. See
-// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
-                                 first_to_check)))
-# else
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__printf__, string_index, first_to_check)))
-# endif
-#else
-# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
-#endif
-
-
-// A macro to disallow copy operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_ASSIGN_(type) \
-  type& operator=(type const &) = delete
-
-// A macro to disallow copy constructor and operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
-  type(type const&) = delete;                 \
-  type& operator=(type const&) = delete
-
-// A macro to disallow move operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_MOVE_ASSIGN_(type) \
-  type& operator=(type &&) noexcept = delete
-
-// A macro to disallow move constructor and operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
-  type(type&&) noexcept = delete;             \
-  type& operator=(type&&) noexcept = delete
-
-// Tell the compiler to warn about unused return values for functions declared
-// with this macro.  The macro should be used on function declarations
-// following the argument list:
-//
-//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
-#else
-# define GTEST_MUST_USE_RESULT_
-#endif  // __GNUC__ && !COMPILER_ICC
-
-// MS C++ compiler emits warning when a conditional expression is compile time
-// constant. In some contexts this warning is false positive and needs to be
-// suppressed. Use the following two macros in such cases:
-//
-// GTEST_INTENTIONAL_CONST_COND_PUSH_()
-// while (true) {
-// GTEST_INTENTIONAL_CONST_COND_POP_()
-// }
-# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
-# define GTEST_INTENTIONAL_CONST_COND_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
-
-// Determine whether the compiler supports Microsoft's Structured Exception
-// Handling.  This is supported by several Windows compilers but generally
-// does not exist on any other system.
-#ifndef GTEST_HAS_SEH
-// The user didn't tell us, so we need to figure it out.
-
-# if defined(_MSC_VER) || defined(__BORLANDC__)
-// These two compilers are known to support SEH.
-#  define GTEST_HAS_SEH 1
-# else
-// Assume no SEH.
-#  define GTEST_HAS_SEH 0
-# endif
-
-#endif  // GTEST_HAS_SEH
-
-#ifndef GTEST_IS_THREADSAFE
-
-#define GTEST_IS_THREADSAFE                                                 \
-  (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                                     \
-   (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) || \
-   GTEST_HAS_PTHREAD)
-
-#endif  // GTEST_IS_THREADSAFE
-
-// GTEST_API_ qualifies all symbols that must be exported. The definitions below
-// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
-// gtest/internal/custom/gtest-port.h
-#ifndef GTEST_API_
-
-#ifdef _MSC_VER
-# if GTEST_LINKED_AS_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllimport)
-# elif GTEST_CREATE_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllexport)
-# endif
-#elif __GNUC__ >= 4 || defined(__clang__)
-# define GTEST_API_ __attribute__((visibility ("default")))
-#endif  // _MSC_VER
-
-#endif  // GTEST_API_
-
-#ifndef GTEST_API_
-# define GTEST_API_
-#endif  // GTEST_API_
-
-#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
-# define GTEST_DEFAULT_DEATH_TEST_STYLE  "fast"
-#endif  // GTEST_DEFAULT_DEATH_TEST_STYLE
-
-#ifdef __GNUC__
-// Ask the compiler to never inline a given function.
-# define GTEST_NO_INLINE_ __attribute__((noinline))
-#else
-# define GTEST_NO_INLINE_
-#endif
-
-// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
-#if !defined(GTEST_HAS_CXXABI_H_)
-# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
-#  define GTEST_HAS_CXXABI_H_ 1
-# else
-#  define GTEST_HAS_CXXABI_H_ 0
-# endif
-#endif
-
-// A function level attribute to disable checking for use of uninitialized
-// memory when built with MemorySanitizer.
-#if defined(__clang__)
-# if __has_feature(memory_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
-       __attribute__((no_sanitize_memory))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-# endif  // __has_feature(memory_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-#endif  // __clang__
-
-// A function level attribute to disable AddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(address_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
-       __attribute__((no_sanitize_address))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-# endif  // __has_feature(address_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-#endif  // __clang__
-
-// A function level attribute to disable HWAddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(hwaddress_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
-       __attribute__((no_sanitize("hwaddress")))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-# endif  // __has_feature(hwaddress_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-#endif  // __clang__
-
-// A function level attribute to disable ThreadSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(thread_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
-       __attribute__((no_sanitize_thread))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-# endif  // __has_feature(thread_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-#endif  // __clang__
-
-namespace testing {
-
-class Message;
-
-// Legacy imports for backwards compatibility.
-// New code should use std:: names directly.
-using std::get;
-using std::make_tuple;
-using std::tuple;
-using std::tuple_element;
-using std::tuple_size;
-
-namespace internal {
-
-// A secret type that Google Test users don't know about.  It has no
-// definition on purpose.  Therefore it's impossible to create a
-// Secret object, which is what we want.
-class Secret;
-
-// The GTEST_COMPILE_ASSERT_ is a legacy macro used to verify that a compile
-// time expression is true (in new code, use static_assert instead). For
-// example, you could use it to verify the size of a static array:
-//
-//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
-//                         names_incorrect_size);
-//
-// The second argument to the macro must be a valid C++ identifier. If the
-// expression is false, compiler will issue an error containing this identifier.
-#define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
-
-// A helper for suppressing warnings on constant condition.  It just
-// returns 'condition'.
-GTEST_API_ bool IsTrue(bool condition);
-
-// Defines RE.
-
-#if GTEST_USES_PCRE
-// if used, PCRE is injected by custom/gtest-port.h
-#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
-
-// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
-// Regular Expression syntax.
-class GTEST_API_ RE {
- public:
-  // A copy constructor is required by the Standard to initialize object
-  // references from r-values.
-  RE(const RE& other) { Init(other.pattern()); }
-
-  // Constructs an RE from a string.
-  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
-
-  RE(const char* regex) { Init(regex); }  // NOLINT
-  ~RE();
-
-  // Returns the string representation of the regex.
-  const char* pattern() const { return pattern_; }
-
-  // FullMatch(str, re) returns true if and only if regular expression re
-  // matches the entire str.
-  // PartialMatch(str, re) returns true if and only if regular expression re
-  // matches a substring of str (including str itself).
-  static bool FullMatch(const ::std::string& str, const RE& re) {
-    return FullMatch(str.c_str(), re);
-  }
-  static bool PartialMatch(const ::std::string& str, const RE& re) {
-    return PartialMatch(str.c_str(), re);
-  }
-
-  static bool FullMatch(const char* str, const RE& re);
-  static bool PartialMatch(const char* str, const RE& re);
-
- private:
-  void Init(const char* regex);
-  const char* pattern_;
-  bool is_valid_;
-
-# if GTEST_USES_POSIX_RE
-
-  regex_t full_regex_;     // For FullMatch().
-  regex_t partial_regex_;  // For PartialMatch().
-
-# else  // GTEST_USES_SIMPLE_RE
-
-  const char* full_pattern_;  // For FullMatch();
-
-# endif
-};
-
-#endif  // GTEST_USES_PCRE
-
-// Formats a source file path and a line number as they would appear
-// in an error message from the compiler used to compile this code.
-GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
-
-// Formats a file location for compiler-independent XML output.
-// Although this function is not platform dependent, we put it next to
-// FormatFileLocation in order to contrast the two functions.
-GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
-                                                               int line);
-
-// Defines logging utilities:
-//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
-//                          message itself is streamed into the macro.
-//   LogToStderr()  - directs all log messages to stderr.
-//   FlushInfoLog() - flushes informational log messages.
-
-enum GTestLogSeverity {
-  GTEST_INFO,
-  GTEST_WARNING,
-  GTEST_ERROR,
-  GTEST_FATAL
-};
-
-// Formats log entry severity, provides a stream object for streaming the
-// log message, and terminates the message with a newline when going out of
-// scope.
-class GTEST_API_ GTestLog {
- public:
-  GTestLog(GTestLogSeverity severity, const char* file, int line);
-
-  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
-  ~GTestLog();
-
-  ::std::ostream& GetStream() { return ::std::cerr; }
-
- private:
-  const GTestLogSeverity severity_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
-};
-
-#if !defined(GTEST_LOG_)
-
-# define GTEST_LOG_(severity) \
-    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
-                                  __FILE__, __LINE__).GetStream()
-
-inline void LogToStderr() {}
-inline void FlushInfoLog() { fflush(nullptr); }
-
-#endif  // !defined(GTEST_LOG_)
-
-#if !defined(GTEST_CHECK_)
-// INTERNAL IMPLEMENTATION - DO NOT USE.
-//
-// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
-// is not satisfied.
-//  Synopsys:
-//    GTEST_CHECK_(boolean_condition);
-//     or
-//    GTEST_CHECK_(boolean_condition) << "Additional message";
-//
-//    This checks the condition and if the condition is not satisfied
-//    it prints message about the condition violation, including the
-//    condition itself, plus additional message streamed into it, if any,
-//    and then it aborts the program. It aborts the program irrespective of
-//    whether it is built in the debug mode or not.
-# define GTEST_CHECK_(condition) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::IsTrue(condition)) \
-      ; \
-    else \
-      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
-#endif  // !defined(GTEST_CHECK_)
-
-// An all-mode assert to verify that the given POSIX-style function
-// call returns 0 (indicating success).  Known limitation: this
-// doesn't expand to a balanced 'if' statement, so enclose the macro
-// in {} if you need to use it as the only statement in an 'if'
-// branch.
-#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
-  if (const int gtest_error = (posix_call)) \
-    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
-                      << gtest_error
-
-// Transforms "T" into "const T&" according to standard reference collapsing
-// rules (this is only needed as a backport for C++98 compilers that do not
-// support reference collapsing). Specifically, it transforms:
-//
-//   char         ==> const char&
-//   const char   ==> const char&
-//   char&        ==> char&
-//   const char&  ==> const char&
-//
-// Note that the non-const reference will not have "const" added. This is
-// standard, and necessary so that "T" can always bind to "const T&".
-template <typename T>
-struct ConstRef { typedef const T& type; };
-template <typename T>
-struct ConstRef<T&> { typedef T& type; };
-
-// The argument T must depend on some template parameters.
-#define GTEST_REFERENCE_TO_CONST_(T) \
-  typename ::testing::internal::ConstRef<T>::type
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Use ImplicitCast_ as a safe version of static_cast for upcasting in
-// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
-// const Foo*).  When you use ImplicitCast_, the compiler checks that
-// the cast is safe.  Such explicit ImplicitCast_s are necessary in
-// surprisingly many situations where C++ demands an exact type match
-// instead of an argument type convertable to a target type.
-//
-// The syntax for using ImplicitCast_ is the same as for static_cast:
-//
-//   ImplicitCast_<ToType>(expr)
-//
-// ImplicitCast_ would have been part of the C++ standard library,
-// but the proposal was submitted too late.  It will probably make
-// its way into the language in the future.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., implicit_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To>
-inline To ImplicitCast_(To x) { return x; }
-
-// When you upcast (that is, cast a pointer from type Foo to type
-// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
-// always succeed.  When you downcast (that is, cast a pointer from
-// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
-// how do you know the pointer is really of type SubclassOfFoo?  It
-// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
-// when you downcast, you should use this macro.  In debug mode, we
-// use dynamic_cast<> to double-check the downcast is legal (we die
-// if it's not).  In normal mode, we do the efficient static_cast<>
-// instead.  Thus, it's important to test in debug mode to make sure
-// the cast is legal!
-//    This is the only place in the code we should use dynamic_cast<>.
-// In particular, you SHOULDN'T be using dynamic_cast<> in order to
-// do RTTI (eg code like this:
-//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
-//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
-// You should design the code some other way not to need this.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., down_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
-inline To DownCast_(From* f) {  // so we only accept pointers
-  // Ensures that To is a sub-type of From *.  This test is here only
-  // for compile-time type checking, and has no overhead in an
-  // optimized build at run-time, as it will be optimized away
-  // completely.
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (false) {
-  GTEST_INTENTIONAL_CONST_COND_POP_()
-  const To to = nullptr;
-  ::testing::internal::ImplicitCast_<From*>(to);
-  }
-
-#if GTEST_HAS_RTTI
-  // RTTI: debug mode only!
-  GTEST_CHECK_(f == nullptr || dynamic_cast<To>(f) != nullptr);
-#endif
-  return static_cast<To>(f);
-}
-
-// Downcasts the pointer of type Base to Derived.
-// Derived must be a subclass of Base. The parameter MUST
-// point to a class of type Derived, not any subclass of it.
-// When RTTI is available, the function performs a runtime
-// check to enforce this.
-template <class Derived, class Base>
-Derived* CheckedDowncastToActualType(Base* base) {
-#if GTEST_HAS_RTTI
-  GTEST_CHECK_(typeid(*base) == typeid(Derived));
-#endif
-
-#if GTEST_HAS_DOWNCAST_
-  return ::down_cast<Derived*>(base);
-#elif GTEST_HAS_RTTI
-  return dynamic_cast<Derived*>(base);  // NOLINT
-#else
-  return static_cast<Derived*>(base);  // Poor man's downcast.
-#endif
-}
-
-#if GTEST_HAS_STREAM_REDIRECTION
-
-// Defines the stderr capturer:
-//   CaptureStdout     - starts capturing stdout.
-//   GetCapturedStdout - stops capturing stdout and returns the captured string.
-//   CaptureStderr     - starts capturing stderr.
-//   GetCapturedStderr - stops capturing stderr and returns the captured string.
-//
-GTEST_API_ void CaptureStdout();
-GTEST_API_ std::string GetCapturedStdout();
-GTEST_API_ void CaptureStderr();
-GTEST_API_ std::string GetCapturedStderr();
-
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-// Returns the size (in bytes) of a file.
-GTEST_API_ size_t GetFileSize(FILE* file);
-
-// Reads the entire content of a file as a string.
-GTEST_API_ std::string ReadEntireFile(FILE* file);
-
-// All command line arguments.
-GTEST_API_ std::vector<std::string> GetArgvs();
-
-#if GTEST_HAS_DEATH_TEST
-
-std::vector<std::string> GetInjectableArgvs();
-// Deprecated: pass the args vector by value instead.
-void SetInjectableArgvs(const std::vector<std::string>* new_argvs);
-void SetInjectableArgvs(const std::vector<std::string>& new_argvs);
-void ClearInjectableArgvs();
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-// Defines synchronization primitives.
-#if GTEST_IS_THREADSAFE
-# if GTEST_HAS_PTHREAD
-// Sleeps for (roughly) n milliseconds.  This function is only for testing
-// Google Test's own constructs.  Don't use it in user tests, either
-// directly or indirectly.
-inline void SleepMilliseconds(int n) {
-  const timespec time = {
-    0,                  // 0 seconds.
-    n * 1000L * 1000L,  // And n ms.
-  };
-  nanosleep(&time, nullptr);
-}
-# endif  // GTEST_HAS_PTHREAD
-
-# if GTEST_HAS_NOTIFICATION_
-// Notification has already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_HAS_PTHREAD
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class Notification {
- public:
-  Notification() : notified_(false) {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-  }
-  ~Notification() {
-    pthread_mutex_destroy(&mutex_);
-  }
-
-  // Notifies all threads created with this notification to start. Must
-  // be called from the controller thread.
-  void Notify() {
-    pthread_mutex_lock(&mutex_);
-    notified_ = true;
-    pthread_mutex_unlock(&mutex_);
-  }
-
-  // Blocks until the controller thread notifies. Must be called from a test
-  // thread.
-  void WaitForNotification() {
-    for (;;) {
-      pthread_mutex_lock(&mutex_);
-      const bool notified = notified_;
-      pthread_mutex_unlock(&mutex_);
-      if (notified)
-        break;
-      SleepMilliseconds(10);
-    }
-  }
-
- private:
-  pthread_mutex_t mutex_;
-  bool notified_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-GTEST_API_ void SleepMilliseconds(int n);
-
-// Provides leak-safe Windows kernel handle ownership.
-// Used in death tests and in threading support.
-class GTEST_API_ AutoHandle {
- public:
-  // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
-  // avoid including <windows.h> in this header file. Including <windows.h> is
-  // undesirable because it defines a lot of symbols and macros that tend to
-  // conflict with client code. This assumption is verified by
-  // WindowsTypesTest.HANDLEIsVoidStar.
-  typedef void* Handle;
-  AutoHandle();
-  explicit AutoHandle(Handle handle);
-
-  ~AutoHandle();
-
-  Handle Get() const;
-  void Reset();
-  void Reset(Handle handle);
-
- private:
-  // Returns true if and only if the handle is a valid handle object that can be
-  // closed.
-  bool IsCloseable() const;
-
-  Handle handle_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
-};
-
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class GTEST_API_ Notification {
- public:
-  Notification();
-  void Notify();
-  void WaitForNotification();
-
- private:
-  AutoHandle event_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-# endif  // GTEST_HAS_NOTIFICATION_
-
-// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
-// defined, but we don't want to use MinGW's pthreads implementation, which
-// has conformance problems with some versions of the POSIX standard.
-# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
-
-// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
-// Consequently, it cannot select a correct instantiation of ThreadWithParam
-// in order to call its Run(). Introducing ThreadWithParamBase as a
-// non-templated base class for ThreadWithParam allows us to bypass this
-// problem.
-class ThreadWithParamBase {
- public:
-  virtual ~ThreadWithParamBase() {}
-  virtual void Run() = 0;
-};
-
-// pthread_create() accepts a pointer to a function type with the C linkage.
-// According to the Standard (7.5/1), function types with different linkages
-// are different even if they are otherwise identical.  Some compilers (for
-// example, SunStudio) treat them as different types.  Since class methods
-// cannot be defined with C-linkage we need to define a free C-function to
-// pass into pthread_create().
-extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
-  static_cast<ThreadWithParamBase*>(thread)->Run();
-  return nullptr;
-}
-
-// Helper class for testing Google Test's multi-threading constructs.
-// To use it, write:
-//
-//   void ThreadFunc(int param) { /* Do things with param */ }
-//   Notification thread_can_start;
-//   ...
-//   // The thread_can_start parameter is optional; you can supply NULL.
-//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
-//   thread_can_start.Notify();
-//
-// These classes are only for testing Google Test's own constructs. Do
-// not use them in user tests, either directly or indirectly.
-template <typename T>
-class ThreadWithParam : public ThreadWithParamBase {
- public:
-  typedef void UserThreadFunc(T);
-
-  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : func_(func),
-        param_(param),
-        thread_can_start_(thread_can_start),
-        finished_(false) {
-    ThreadWithParamBase* const base = this;
-    // The thread can be created only after all fields except thread_
-    // have been initialized.
-    GTEST_CHECK_POSIX_SUCCESS_(
-        pthread_create(&thread_, nullptr, &ThreadFuncWithCLinkage, base));
-  }
-  ~ThreadWithParam() override { Join(); }
-
-  void Join() {
-    if (!finished_) {
-      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, nullptr));
-      finished_ = true;
-    }
-  }
-
-  void Run() override {
-    if (thread_can_start_ != nullptr) thread_can_start_->WaitForNotification();
-    func_(param_);
-  }
-
- private:
-  UserThreadFunc* const func_;  // User-supplied thread function.
-  const T param_;  // User-supplied parameter to the thread function.
-  // When non-NULL, used to block execution until the controller thread
-  // notifies.
-  Notification* const thread_can_start_;
-  bool finished_;  // true if and only if we know that the thread function has
-                   // finished.
-  pthread_t thread_;  // The native thread object.
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
-};
-# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
-         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-
-# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-// Mutex and ThreadLocal have already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-// Mutex implements mutex on Windows platforms.  It is used in conjunction
-// with class MutexLock:
-//
-//   Mutex mutex;
-//   ...
-//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the
-//                            // end of the current scope.
-//
-// A static Mutex *must* be defined or declared using one of the following
-// macros:
-//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
-//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
-//
-// (A non-static Mutex is defined/declared in the usual way).
-class GTEST_API_ Mutex {
- public:
-  enum MutexType { kStatic = 0, kDynamic = 1 };
-  // We rely on kStaticMutex being 0 as it is to what the linker initializes
-  // type_ in static mutexes.  critical_section_ will be initialized lazily
-  // in ThreadSafeLazyInit().
-  enum StaticConstructorSelector { kStaticMutex = 0 };
-
-  // This constructor intentionally does nothing.  It relies on type_ being
-  // statically initialized to 0 (effectively setting it to kStatic) and on
-  // ThreadSafeLazyInit() to lazily initialize the rest of the members.
-  explicit Mutex(StaticConstructorSelector /*dummy*/) {}
-
-  Mutex();
-  ~Mutex();
-
-  void Lock();
-
-  void Unlock();
-
-  // Does nothing if the current thread holds the mutex. Otherwise, crashes
-  // with high probability.
-  void AssertHeld();
-
- private:
-  // Initializes owner_thread_id_ and critical_section_ in static mutexes.
-  void ThreadSafeLazyInit();
-
-  // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503,
-  // we assume that 0 is an invalid value for thread IDs.
-  unsigned int owner_thread_id_;
-
-  // For static mutexes, we rely on these members being initialized to zeros
-  // by the linker.
-  MutexType type_;
-  long critical_section_init_phase_;  // NOLINT
-  GTEST_CRITICAL_SECTION* critical_section_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
-};
-
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-    extern ::testing::internal::Mutex mutex
-
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(Mutex* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
-
-  ~GTestMutexLock() { mutex_->Unlock(); }
-
- private:
-  Mutex* const mutex_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
-};
-
-typedef GTestMutexLock MutexLock;
-
-// Base class for ValueHolder<T>.  Allows a caller to hold and delete a value
-// without knowing its type.
-class ThreadLocalValueHolderBase {
- public:
-  virtual ~ThreadLocalValueHolderBase() {}
-};
-
-// Provides a way for a thread to send notifications to a ThreadLocal
-// regardless of its parameter type.
-class ThreadLocalBase {
- public:
-  // Creates a new ValueHolder<T> object holding a default value passed to
-  // this ThreadLocal<T>'s constructor and returns it.  It is the caller's
-  // responsibility not to call this when the ThreadLocal<T> instance already
-  // has a value on the current thread.
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
-
- protected:
-  ThreadLocalBase() {}
-  virtual ~ThreadLocalBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
-};
-
-// Maps a thread to a set of ThreadLocals that have values instantiated on that
-// thread and notifies them when the thread exits.  A ThreadLocal instance is
-// expected to persist until all threads it has values on have terminated.
-class GTEST_API_ ThreadLocalRegistry {
- public:
-  // Registers thread_local_instance as having value on the current thread.
-  // Returns a value that can be used to identify the thread from other threads.
-  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance);
-
-  // Invoked when a ThreadLocal instance is destroyed.
-  static void OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance);
-};
-
-class GTEST_API_ ThreadWithParamBase {
- public:
-  void Join();
-
- protected:
-  class Runnable {
-   public:
-    virtual ~Runnable() {}
-    virtual void Run() = 0;
-  };
-
-  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
-  virtual ~ThreadWithParamBase();
-
- private:
-  AutoHandle thread_;
-};
-
-// Helper class for testing Google Test's multi-threading constructs.
-template <typename T>
-class ThreadWithParam : public ThreadWithParamBase {
- public:
-  typedef void UserThreadFunc(T);
-
-  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
-  }
-  virtual ~ThreadWithParam() {}
-
- private:
-  class RunnableImpl : public Runnable {
-   public:
-    RunnableImpl(UserThreadFunc* func, T param)
-        : func_(func),
-          param_(param) {
-    }
-    virtual ~RunnableImpl() {}
-    virtual void Run() {
-      func_(param_);
-    }
-
-   private:
-    UserThreadFunc* const func_;
-    const T param_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
-  };
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
-};
-
-// Implements thread-local storage on Windows systems.
-//
-//   // Thread 1
-//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
-//
-//   // Thread 2
-//   tl.set(150);  // Changes the value for thread 2 only.
-//   EXPECT_EQ(150, tl.get());
-//
-//   // Thread 1
-//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
-//   tl.set(200);
-//   EXPECT_EQ(200, tl.get());
-//
-// The template type argument T must have a public copy constructor.
-// In addition, the default ThreadLocal constructor requires T to have
-// a public default constructor.
-//
-// The users of a TheadLocal instance have to make sure that all but one
-// threads (including the main one) using that instance have exited before
-// destroying it. Otherwise, the per-thread objects managed for them by the
-// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
-//
-// Google Test only uses global ThreadLocal objects.  That means they
-// will die after main() has returned.  Therefore, no per-thread
-// object managed by Google Test will be leaked as long as all threads
-// using Google Test have exited when main() returns.
-template <typename T>
-class ThreadLocal : public ThreadLocalBase {
- public:
-  ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
-  explicit ThreadLocal(const T& value)
-      : default_factory_(new InstanceValueHolderFactory(value)) {}
-
-  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
-
-  T* pointer() { return GetOrCreateValue(); }
-  const T* pointer() const { return GetOrCreateValue(); }
-  const T& get() const { return *pointer(); }
-  void set(const T& value) { *pointer() = value; }
-
- private:
-  // Holds a value of T.  Can be deleted via its base class without the caller
-  // knowing the type of T.
-  class ValueHolder : public ThreadLocalValueHolderBase {
-   public:
-    ValueHolder() : value_() {}
-    explicit ValueHolder(const T& value) : value_(value) {}
-
-    T* pointer() { return &value_; }
-
-   private:
-    T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
-  };
-
-
-  T* GetOrCreateValue() const {
-    return static_cast<ValueHolder*>(
-        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
-  }
-
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
-    return default_factory_->MakeNewHolder();
-  }
-
-  class ValueHolderFactory {
-   public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const = 0;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
-  };
-
-  class DefaultValueHolderFactory : public ValueHolderFactory {
-   public:
-    DefaultValueHolderFactory() {}
-    ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
-  };
-
-  class InstanceValueHolderFactory : public ValueHolderFactory {
-   public:
-    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
-    ValueHolder* MakeNewHolder() const override {
-      return new ValueHolder(value_);
-    }
-
-   private:
-    const T value_;  // The value for each thread.
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
-  };
-
-  std::unique_ptr<ValueHolderFactory> default_factory_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
-};
-
-# elif GTEST_HAS_PTHREAD
-
-// MutexBase and Mutex implement mutex on pthreads-based platforms.
-class MutexBase {
- public:
-  // Acquires this mutex.
-  void Lock() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
-    owner_ = pthread_self();
-    has_owner_ = true;
-  }
-
-  // Releases this mutex.
-  void Unlock() {
-    // Since the lock is being released the owner_ field should no longer be
-    // considered valid. We don't protect writing to has_owner_ here, as it's
-    // the caller's responsibility to ensure that the current thread holds the
-    // mutex when this is called.
-    has_owner_ = false;
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
-  }
-
-  // Does nothing if the current thread holds the mutex. Otherwise, crashes
-  // with high probability.
-  void AssertHeld() const {
-    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
-        << "The current thread is not holding the mutex @" << this;
-  }
-
-  // A static mutex may be used before main() is entered.  It may even
-  // be used before the dynamic initialization stage.  Therefore we
-  // must be able to initialize a static mutex object at link time.
-  // This means MutexBase has to be a POD and its member variables
-  // have to be public.
- public:
-  pthread_mutex_t mutex_;  // The underlying pthread mutex.
-  // has_owner_ indicates whether the owner_ field below contains a valid thread
-  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
-  // accesses to the owner_ field should be protected by a check of this field.
-  // An alternative might be to memset() owner_ to all zeros, but there's no
-  // guarantee that a zero'd pthread_t is necessarily invalid or even different
-  // from pthread_self().
-  bool has_owner_;
-  pthread_t owner_;  // The thread holding the mutex.
-};
-
-// Forward-declares a static mutex.
-#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-     extern ::testing::internal::MutexBase mutex
-
-// Defines and statically (i.e. at link time) initializes a static mutex.
-// The initialization list here does not explicitly initialize each field,
-// instead relying on default initialization for the unspecified fields. In
-// particular, the owner_ field (a pthread_t) is not explicitly initialized.
-// This allows initialization to work whether pthread_t is a scalar or struct.
-// The flag -Wmissing-field-initializers must not be specified for this to work.
-#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-  ::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
-
-// The Mutex class can only be used for mutexes created at runtime. It
-// shares its API with MutexBase otherwise.
-class Mutex : public MutexBase {
- public:
-  Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-    has_owner_ = false;
-  }
-  ~Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
-};
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(MutexBase* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
-
-  ~GTestMutexLock() { mutex_->Unlock(); }
-
- private:
-  MutexBase* const mutex_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
-};
-
-typedef GTestMutexLock MutexLock;
-
-// Helpers for ThreadLocal.
-
-// pthread_key_create() requires DeleteThreadLocalValue() to have
-// C-linkage.  Therefore it cannot be templatized to access
-// ThreadLocal<T>.  Hence the need for class
-// ThreadLocalValueHolderBase.
-class ThreadLocalValueHolderBase {
- public:
-  virtual ~ThreadLocalValueHolderBase() {}
-};
-
-// Called by pthread to delete thread-local data stored by
-// pthread_setspecific().
-extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
-  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
-}
-
-// Implements thread-local storage on pthreads-based systems.
-template <typename T>
-class GTEST_API_ ThreadLocal {
- public:
-  ThreadLocal()
-      : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
-  explicit ThreadLocal(const T& value)
-      : key_(CreateKey()),
-        default_factory_(new InstanceValueHolderFactory(value)) {}
-
-  ~ThreadLocal() {
-    // Destroys the managed object for the current thread, if any.
-    DeleteThreadLocalValue(pthread_getspecific(key_));
-
-    // Releases resources associated with the key.  This will *not*
-    // delete managed objects for other threads.
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
-  }
-
-  T* pointer() { return GetOrCreateValue(); }
-  const T* pointer() const { return GetOrCreateValue(); }
-  const T& get() const { return *pointer(); }
-  void set(const T& value) { *pointer() = value; }
-
- private:
-  // Holds a value of type T.
-  class ValueHolder : public ThreadLocalValueHolderBase {
-   public:
-    ValueHolder() : value_() {}
-    explicit ValueHolder(const T& value) : value_(value) {}
-
-    T* pointer() { return &value_; }
-
-   private:
-    T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
-  };
-
-  static pthread_key_t CreateKey() {
-    pthread_key_t key;
-    // When a thread exits, DeleteThreadLocalValue() will be called on
-    // the object managed for that thread.
-    GTEST_CHECK_POSIX_SUCCESS_(
-        pthread_key_create(&key, &DeleteThreadLocalValue));
-    return key;
-  }
-
-  T* GetOrCreateValue() const {
-    ThreadLocalValueHolderBase* const holder =
-        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
-    if (holder != nullptr) {
-      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
-    }
-
-    ValueHolder* const new_holder = default_factory_->MakeNewHolder();
-    ThreadLocalValueHolderBase* const holder_base = new_holder;
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
-    return new_holder->pointer();
-  }
-
-  class ValueHolderFactory {
-   public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const = 0;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
-  };
-
-  class DefaultValueHolderFactory : public ValueHolderFactory {
-   public:
-    DefaultValueHolderFactory() {}
-    ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
-  };
-
-  class InstanceValueHolderFactory : public ValueHolderFactory {
-   public:
-    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
-    ValueHolder* MakeNewHolder() const override {
-      return new ValueHolder(value_);
-    }
-
-   private:
-    const T value_;  // The value for each thread.
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
-  };
-
-  // A key pthreads uses for looking up per-thread values.
-  const pthread_key_t key_;
-  std::unique_ptr<ValueHolderFactory> default_factory_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
-};
-
-# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-
-#else  // GTEST_IS_THREADSAFE
-
-// A dummy implementation of synchronization primitives (mutex, lock,
-// and thread-local variable).  Necessary for compiling Google Test where
-// mutex is not supported - using Google Test in multiple threads is not
-// supported on such platforms.
-
-class Mutex {
- public:
-  Mutex() {}
-  void Lock() {}
-  void Unlock() {}
-  void AssertHeld() const {}
-};
-
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-  extern ::testing::internal::Mutex mutex
-
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(Mutex*) {}  // NOLINT
-};
-
-typedef GTestMutexLock MutexLock;
-
-template <typename T>
-class GTEST_API_ ThreadLocal {
- public:
-  ThreadLocal() : value_() {}
-  explicit ThreadLocal(const T& value) : value_(value) {}
-  T* pointer() { return &value_; }
-  const T* pointer() const { return &value_; }
-  const T& get() const { return value_; }
-  void set(const T& value) { value_ = value; }
- private:
-  T value_;
-};
-
-#endif  // GTEST_IS_THREADSAFE
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-GTEST_API_ size_t GetThreadCount();
-
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_SEP_ "\\"
-# define GTEST_HAS_ALT_PATH_SEP_ 1
-#else
-# define GTEST_PATH_SEP_ "/"
-# define GTEST_HAS_ALT_PATH_SEP_ 0
-#endif  // GTEST_OS_WINDOWS
-
-// Utilities for char.
-
-// isspace(int ch) and friends accept an unsigned char or EOF.  char
-// may be signed, depending on the compiler (or compiler flags).
-// Therefore we need to cast a char to unsigned char before calling
-// isspace(), etc.
-
-inline bool IsAlpha(char ch) {
-  return isalpha(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsAlNum(char ch) {
-  return isalnum(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsDigit(char ch) {
-  return isdigit(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsLower(char ch) {
-  return islower(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsSpace(char ch) {
-  return isspace(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsUpper(char ch) {
-  return isupper(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsXDigit(char ch) {
-  return isxdigit(static_cast<unsigned char>(ch)) != 0;
-}
-#ifdef __cpp_char8_t
-inline bool IsXDigit(char8_t ch) {
-  return isxdigit(static_cast<unsigned char>(ch)) != 0;
-}
-#endif
-inline bool IsXDigit(char16_t ch) {
-  const unsigned char low_byte = static_cast<unsigned char>(ch);
-  return ch == low_byte && isxdigit(low_byte) != 0;
-}
-inline bool IsXDigit(char32_t ch) {
-  const unsigned char low_byte = static_cast<unsigned char>(ch);
-  return ch == low_byte && isxdigit(low_byte) != 0;
-}
-inline bool IsXDigit(wchar_t ch) {
-  const unsigned char low_byte = static_cast<unsigned char>(ch);
-  return ch == low_byte && isxdigit(low_byte) != 0;
-}
-
-inline char ToLower(char ch) {
-  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
-}
-inline char ToUpper(char ch) {
-  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
-}
-
-inline std::string StripTrailingSpaces(std::string str) {
-  std::string::iterator it = str.end();
-  while (it != str.begin() && IsSpace(*--it))
-    it = str.erase(it);
-  return str;
-}
-
-// The testing::internal::posix namespace holds wrappers for common
-// POSIX functions.  These wrappers hide the differences between
-// Windows/MSVC and POSIX systems.  Since some compilers define these
-// standard functions as macros, the wrapper cannot have the same name
-// as the wrapped function.
-
-namespace posix {
-
-// Functions with a different name on Windows.
-
-#if GTEST_OS_WINDOWS
-
-typedef struct _stat StatStruct;
-
-# ifdef __BORLANDC__
-inline int DoIsATTY(int fd) { return isatty(fd); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-# else  // !__BORLANDC__
-#  if GTEST_OS_WINDOWS_MOBILE
-inline int DoIsATTY(int /* fd */) { return 0; }
-#  else
-inline int DoIsATTY(int fd) { return _isatty(fd); }
-#  endif  // GTEST_OS_WINDOWS_MOBILE
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return _stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return _strdup(src); }
-# endif  // __BORLANDC__
-
-# if GTEST_OS_WINDOWS_MOBILE
-inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
-// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
-// time and thus not defined there.
-# else
-inline int FileNo(FILE* file) { return _fileno(file); }
-inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
-inline int RmDir(const char* dir) { return _rmdir(dir); }
-inline bool IsDir(const StatStruct& st) {
-  return (_S_IFDIR & st.st_mode) != 0;
-}
-# endif  // GTEST_OS_WINDOWS_MOBILE
-
-#elif GTEST_OS_ESP8266
-typedef struct stat StatStruct;
-
-inline int FileNo(FILE* file) { return fileno(file); }
-inline int DoIsATTY(int fd) { return isatty(fd); }
-inline int Stat(const char* path, StatStruct* buf) {
-  // stat function not implemented on ESP8266
-  return 0;
-}
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return strcasecmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-inline int RmDir(const char* dir) { return rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
-
-#else
-
-typedef struct stat StatStruct;
-
-inline int FileNo(FILE* file) { return fileno(file); }
-inline int DoIsATTY(int fd) { return isatty(fd); }
-inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return strcasecmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-inline int RmDir(const char* dir) { return rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
-
-#endif  // GTEST_OS_WINDOWS
-
-inline int IsATTY(int fd) {
-  // DoIsATTY might change errno (for example ENOTTY in case you redirect stdout
-  // to a file on Linux), which is unexpected, so save the previous value, and
-  // restore it after the call.
-  int savedErrno = errno;
-  int isAttyValue = DoIsATTY(fd);
-  errno = savedErrno;
-
-  return isAttyValue;
-}
-
-// Functions deprecated by MSVC 8.0.
-
-GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-
-// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
-// StrError() aren't needed on Windows CE at this time and thus not
-// defined there.
-
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
-    !GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA
-inline int ChDir(const char* dir) { return chdir(dir); }
-#endif
-inline FILE* FOpen(const char* path, const char* mode) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
-  struct wchar_codecvt : public std::codecvt<wchar_t, char, std::mbstate_t> {};
-  std::wstring_convert<wchar_codecvt> converter;
-  std::wstring wide_path = converter.from_bytes(path);
-  std::wstring wide_mode = converter.from_bytes(mode);
-  return _wfopen(wide_path.c_str(), wide_mode.c_str());
-#else  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
-  return fopen(path, mode);
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
-}
-#if !GTEST_OS_WINDOWS_MOBILE
-inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
-  return freopen(path, mode, stream);
-}
-inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
-#endif
-inline int FClose(FILE* fp) { return fclose(fp); }
-#if !GTEST_OS_WINDOWS_MOBILE
-inline int Read(int fd, void* buf, unsigned int count) {
-  return static_cast<int>(read(fd, buf, count));
-}
-inline int Write(int fd, const void* buf, unsigned int count) {
-  return static_cast<int>(write(fd, buf, count));
-}
-inline int Close(int fd) { return close(fd); }
-inline const char* StrError(int errnum) { return strerror(errnum); }
-#endif
-inline const char* GetEnv(const char* name) {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
-  // We are on an embedded platform, which has no environment variables.
-  static_cast<void>(name);  // To prevent 'unused argument' warning.
-  return nullptr;
-#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
-  // Environment variables which we programmatically clear will be set to the
-  // empty string rather than unset (NULL).  Handle that case.
-  const char* const env = getenv(name);
-  return (env != nullptr && env[0] != '\0') ? env : nullptr;
-#else
-  return getenv(name);
-#endif
-}
-
-GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Windows CE has no C library. The abort() function is used in
-// several places in Google Test. This implementation provides a reasonable
-// imitation of standard behaviour.
-[[noreturn]] void Abort();
-#else
-[[noreturn]] inline void Abort() { abort(); }
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-}  // namespace posix
-
-// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
-// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
-// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
-// function in order to achieve that.  We use macro definition here because
-// snprintf is a variadic function.
-#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
-// MSVC 2005 and above support variadic macros.
-# define GTEST_SNPRINTF_(buffer, size, format, ...) \
-     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
-#elif defined(_MSC_VER)
-// Windows CE does not define _snprintf_s
-# define GTEST_SNPRINTF_ _snprintf
-#else
-# define GTEST_SNPRINTF_ snprintf
-#endif
-
-// The biggest signed integer type the compiler supports.
-//
-// long long is guaranteed to be at least 64-bits in C++11.
-using BiggestInt = long long;  // NOLINT
-
-// The maximum number a BiggestInt can represent.
-constexpr BiggestInt kMaxBiggestInt = (std::numeric_limits<BiggestInt>::max)();
-
-// This template class serves as a compile-time function from size to
-// type.  It maps a size in bytes to a primitive type with that
-// size. e.g.
-//
-//   TypeWithSize<4>::UInt
-//
-// is typedef-ed to be unsigned int (unsigned integer made up of 4
-// bytes).
-//
-// Such functionality should belong to STL, but I cannot find it
-// there.
-//
-// Google Test uses this class in the implementation of floating-point
-// comparison.
-//
-// For now it only handles UInt (unsigned int) as that's all Google Test
-// needs.  Other types can be easily added in the future if need
-// arises.
-template <size_t size>
-class TypeWithSize {
- public:
-  // This prevents the user from using TypeWithSize<N> with incorrect
-  // values of N.
-  using UInt = void;
-};
-
-// The specialization for size 4.
-template <>
-class TypeWithSize<4> {
- public:
-  using Int = std::int32_t;
-  using UInt = std::uint32_t;
-};
-
-// The specialization for size 8.
-template <>
-class TypeWithSize<8> {
- public:
-  using Int = std::int64_t;
-  using UInt = std::uint64_t;
-};
-
-// Integer types of known sizes.
-using TimeInMillis = int64_t;  // Represents time in milliseconds.
-
-// Utilities for command line flags and environment variables.
-
-// Macro for referencing flags.
-#if !defined(GTEST_FLAG)
-# define GTEST_FLAG(name) FLAGS_gtest_##name
-#endif  // !defined(GTEST_FLAG)
-
-#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
-#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-
-#if !defined(GTEST_DECLARE_bool_)
-# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
-
-// Macros for declaring flags.
-# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
-# define GTEST_DECLARE_int32_(name) \
-    GTEST_API_ extern std::int32_t GTEST_FLAG(name)
-# define GTEST_DECLARE_string_(name) \
-    GTEST_API_ extern ::std::string GTEST_FLAG(name)
-
-// Macros for defining flags.
-# define GTEST_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ std::int32_t GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
-
-#endif  // !defined(GTEST_DECLARE_bool_)
-
-// Thread annotations
-#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
-# define GTEST_LOCK_EXCLUDED_(locks)
-#endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-
-// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
-// to *value and returns true; otherwise leaves *value unchanged and returns
-// false.
-GTEST_API_ bool ParseInt32(const Message& src_text, const char* str,
-                           int32_t* value);
-
-// Parses a bool/int32_t/string from the environment variable
-// corresponding to the given Google Test flag.
-bool BoolFromGTestEnv(const char* flag, bool default_val);
-GTEST_API_ int32_t Int32FromGTestEnv(const char* flag, int32_t default_val);
-std::string OutputFlagAlsoCheckEnvVar();
-const char* StringFromGTestEnv(const char* flag, const char* default_val);
-
-}  // namespace internal
-}  // namespace testing
-
-#if !defined(GTEST_INTERNAL_DEPRECATED)
-
-// Internal Macro to mark an API deprecated, for googletest usage only
-// Usage: class GTEST_INTERNAL_DEPRECATED(message) MyClass or
-// GTEST_INTERNAL_DEPRECATED(message) <return_type> myFunction(); Every usage of
-// a deprecated entity will trigger a warning when compiled with
-// `-Wdeprecated-declarations` option (clang, gcc, any __GNUC__ compiler).
-// For msvc /W3 option will need to be used
-// Note that for 'other' compilers this macro evaluates to nothing to prevent
-// compilations errors.
-#if defined(_MSC_VER)
-#define GTEST_INTERNAL_DEPRECATED(message) __declspec(deprecated(message))
-#elif defined(__GNUC__)
-#define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message)))
-#else
-#define GTEST_INTERNAL_DEPRECATED(message)
-#endif
-
-#endif  // !defined(GTEST_INTERNAL_DEPRECATED)
-
-#if GTEST_HAS_ABSL
-// Always use absl::any for UniversalPrinter<> specializations if googletest
-// is built with absl support.
-#define GTEST_INTERNAL_HAS_ANY 1
-#include "absl/types/any.h"
-namespace testing {
-namespace internal {
-using Any = ::absl::any;
-}  // namespace internal
-}  // namespace testing
-#else
-#ifdef __has_include
-#if __has_include(<any>) && __cplusplus >= 201703L
-// Otherwise for C++17 and higher use std::any for UniversalPrinter<>
-// specializations.
-#define GTEST_INTERNAL_HAS_ANY 1
-#include <any>
-namespace testing {
-namespace internal {
-using Any = ::std::any;
-}  // namespace internal
-}  // namespace testing
-// The case where absl is configured NOT to alias std::any is not
-// supported.
-#endif  // __has_include(<any>) && __cplusplus >= 201703L
-#endif  // __has_include
-#endif  // GTEST_HAS_ABSL
-
-#if GTEST_HAS_ABSL
-// Always use absl::optional for UniversalPrinter<> specializations if
-// googletest is built with absl support.
-#define GTEST_INTERNAL_HAS_OPTIONAL 1
-#include "absl/types/optional.h"
-namespace testing {
-namespace internal {
-template <typename T>
-using Optional = ::absl::optional<T>;
-}  // namespace internal
-}  // namespace testing
-#else
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-// Otherwise for C++17 and higher use std::optional for UniversalPrinter<>
-// specializations.
-#define GTEST_INTERNAL_HAS_OPTIONAL 1
-#include <optional>
-namespace testing {
-namespace internal {
-template <typename T>
-using Optional = ::std::optional<T>;
-}  // namespace internal
-}  // namespace testing
-// The case where absl is configured NOT to alias std::optional is not
-// supported.
-#endif  // __has_include(<optional>) && __cplusplus >= 201703L
-#endif  // __has_include
-#endif  // GTEST_HAS_ABSL
-
-#if GTEST_HAS_ABSL
-// Always use absl::string_view for Matcher<> specializations if googletest
-// is built with absl support.
-# define GTEST_INTERNAL_HAS_STRING_VIEW 1
-#include "absl/strings/string_view.h"
-namespace testing {
-namespace internal {
-using StringView = ::absl::string_view;
-}  // namespace internal
-}  // namespace testing
-#else
-# ifdef __has_include
-#   if __has_include(<string_view>) && __cplusplus >= 201703L
-// Otherwise for C++17 and higher use std::string_view for Matcher<>
-// specializations.
-#   define GTEST_INTERNAL_HAS_STRING_VIEW 1
-#include <string_view>
-namespace testing {
-namespace internal {
-using StringView = ::std::string_view;
-}  // namespace internal
-}  // namespace testing
-// The case where absl is configured NOT to alias std::string_view is not
-// supported.
-#  endif  // __has_include(<string_view>) && __cplusplus >= 201703L
-# endif  // __has_include
-#endif  // GTEST_HAS_ABSL
-
-#if GTEST_HAS_ABSL
-// Always use absl::variant for UniversalPrinter<> specializations if googletest
-// is built with absl support.
-#define GTEST_INTERNAL_HAS_VARIANT 1
-#include "absl/types/variant.h"
-namespace testing {
-namespace internal {
-template <typename... T>
-using Variant = ::absl::variant<T...>;
-}  // namespace internal
-}  // namespace testing
-#else
-#ifdef __has_include
-#if __has_include(<variant>) && __cplusplus >= 201703L
-// Otherwise for C++17 and higher use std::variant for UniversalPrinter<>
-// specializations.
-#define GTEST_INTERNAL_HAS_VARIANT 1
-#include <variant>
-namespace testing {
-namespace internal {
-template <typename... T>
-using Variant = ::std::variant<T...>;
-}  // namespace internal
-}  // namespace testing
-// The case where absl is configured NOT to alias std::variant is not supported.
-#endif  // __has_include(<variant>) && __cplusplus >= 201703L
-#endif  // __has_include
-#endif  // GTEST_HAS_ABSL
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-
-#if GTEST_OS_LINUX
-# include <stdlib.h>
-# include <sys/types.h>
-# include <sys/wait.h>
-# include <unistd.h>
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>
-#endif
-
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
-#include <cstdint>
-#include <iomanip>
-#include <limits>
-#include <map>
-#include <set>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the Message class.
-//
-// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
-// leave some internal implementation details in this header file.
-// They are clearly marked by comments like this:
-//
-//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-//
-// Such code is NOT meant to be used by a user directly, and is subject
-// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
-// program!
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-
-#include <limits>
-#include <memory>
-#include <sstream>
-
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// Ensures that there is at least one operator<< in the global namespace.
-// See Message& operator<<(...) below for why.
-void operator<<(const testing::internal::Secret&, int);
-
-namespace testing {
-
-// The Message class works like an ostream repeater.
-//
-// Typical usage:
-//
-//   1. You stream a bunch of values to a Message object.
-//      It will remember the text in a stringstream.
-//   2. Then you stream the Message object to an ostream.
-//      This causes the text in the Message to be streamed
-//      to the ostream.
-//
-// For example;
-//
-//   testing::Message foo;
-//   foo << 1 << " != " << 2;
-//   std::cout << foo;
-//
-// will print "1 != 2".
-//
-// Message is not intended to be inherited from.  In particular, its
-// destructor is not virtual.
-//
-// Note that stringstream behaves differently in gcc and in MSVC.  You
-// can stream a NULL char pointer to it in the former, but not in the
-// latter (it causes an access violation if you do).  The Message
-// class hides this difference by treating a NULL char pointer as
-// "(null)".
-class GTEST_API_ Message {
- private:
-  // The type of basic IO manipulators (endl, ends, and flush) for
-  // narrow streams.
-  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
-
- public:
-  // Constructs an empty Message.
-  Message();
-
-  // Copy constructor.
-  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
-    *ss_ << msg.GetString();
-  }
-
-  // Constructs a Message from a C-string.
-  explicit Message(const char* str) : ss_(new ::std::stringstream) {
-    *ss_ << str;
-  }
-
-  // Streams a non-pointer value to this object.
-  template <typename T>
-  inline Message& operator <<(const T& val) {
-    // Some libraries overload << for STL containers.  These
-    // overloads are defined in the global namespace instead of ::std.
-    //
-    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
-    // overloads are visible in either the std namespace or the global
-    // namespace, but not other namespaces, including the testing
-    // namespace which Google Test's Message class is in.
-    //
-    // To allow STL containers (and other types that has a << operator
-    // defined in the global namespace) to be used in Google Test
-    // assertions, testing::Message must access the custom << operator
-    // from the global namespace.  With this using declaration,
-    // overloads of << defined in the global namespace and those
-    // visible via Koenig lookup are both exposed in this function.
-    using ::operator <<;
-    *ss_ << val;
-    return *this;
-  }
-
-  // Streams a pointer value to this object.
-  //
-  // This function is an overload of the previous one.  When you
-  // stream a pointer to a Message, this definition will be used as it
-  // is more specialized.  (The C++ Standard, section
-  // [temp.func.order].)  If you stream a non-pointer, then the
-  // previous definition will be used.
-  //
-  // The reason for this overload is that streaming a NULL pointer to
-  // ostream is undefined behavior.  Depending on the compiler, you
-  // may get "0", "(nil)", "(null)", or an access violation.  To
-  // ensure consistent result across compilers, we always treat NULL
-  // as "(null)".
-  template <typename T>
-  inline Message& operator <<(T* const& pointer) {  // NOLINT
-    if (pointer == nullptr) {
-      *ss_ << "(null)";
-    } else {
-      *ss_ << pointer;
-    }
-    return *this;
-  }
-
-  // Since the basic IO manipulators are overloaded for both narrow
-  // and wide streams, we have to provide this specialized definition
-  // of operator <<, even though its body is the same as the
-  // templatized version above.  Without this definition, streaming
-  // endl or other basic IO manipulators to Message will confuse the
-  // compiler.
-  Message& operator <<(BasicNarrowIoManip val) {
-    *ss_ << val;
-    return *this;
-  }
-
-  // Instead of 1/0, we want to see true/false for bool values.
-  Message& operator <<(bool b) {
-    return *this << (b ? "true" : "false");
-  }
-
-  // These two overloads allow streaming a wide C string to a Message
-  // using the UTF-8 encoding.
-  Message& operator <<(const wchar_t* wide_c_str);
-  Message& operator <<(wchar_t* wide_c_str);
-
-#if GTEST_HAS_STD_WSTRING
-  // Converts the given wide string to a narrow string using the UTF-8
-  // encoding, and streams the result to this Message object.
-  Message& operator <<(const ::std::wstring& wstr);
-#endif  // GTEST_HAS_STD_WSTRING
-
-  // Gets the text streamed to this object so far as an std::string.
-  // Each '\0' character in the buffer is replaced with "\\0".
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  std::string GetString() const;
-
- private:
-  // We'll hold the text streamed to this object here.
-  const std::unique_ptr< ::std::stringstream> ss_;
-
-  // We declare (but don't implement) this to prevent the compiler
-  // from implementing the assignment operator.
-  void operator=(const Message&);
-};
-
-// Streams a Message to an ostream.
-inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
-  return os << sb.GetString();
-}
-
-namespace internal {
-
-// Converts a streamable value to an std::string.  A NULL pointer is
-// converted to "(null)".  When the input value is a ::string,
-// ::std::string, ::wstring, or ::std::wstring object, each NUL
-// character in it is replaced with "\\0".
-template <typename T>
-std::string StreamableToString(const T& streamable) {
-  return (Message() << streamable).GetString();
-}
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Google Test filepath utilities
-//
-// This header file declares classes and functions used internally by
-// Google Test.  They are subject to change without notice.
-//
-// This file is #included in gtest/internal/gtest-internal.h.
-// Do not include this header file separately!
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file declares the String class and functions used internally by
-// Google Test.  They are subject to change without notice. They should not used
-// by code external to Google Test.
-//
-// This header file is #included by gtest-internal.h.
-// It should not be #included by other files.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-
-#ifdef __BORLANDC__
-// string.h is not guaranteed to provide strcpy on C++ Builder.
-# include <mem.h>
-#endif
-
-#include <string.h>
-#include <cstdint>
-#include <string>
-
-
-namespace testing {
-namespace internal {
-
-// String - an abstract class holding static string utilities.
-class GTEST_API_ String {
- public:
-  // Static utility methods
-
-  // Clones a 0-terminated C string, allocating memory using new.  The
-  // caller is responsible for deleting the return value using
-  // delete[].  Returns the cloned string, or NULL if the input is
-  // NULL.
-  //
-  // This is different from strdup() in string.h, which allocates
-  // memory using malloc().
-  static const char* CloneCString(const char* c_str);
-
-#if GTEST_OS_WINDOWS_MOBILE
-  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
-  // able to pass strings to Win32 APIs on CE we need to convert them
-  // to 'Unicode', UTF-16.
-
-  // Creates a UTF-16 wide string from the given ANSI string, allocating
-  // memory using new. The caller is responsible for deleting the return
-  // value using delete[]. Returns the wide string, or NULL if the
-  // input is NULL.
-  //
-  // The wide string is created using the ANSI codepage (CP_ACP) to
-  // match the behaviour of the ANSI versions of Win32 calls and the
-  // C runtime.
-  static LPCWSTR AnsiToUtf16(const char* c_str);
-
-  // Creates an ANSI string from the given wide string, allocating
-  // memory using new. The caller is responsible for deleting the return
-  // value using delete[]. Returns the ANSI string, or NULL if the
-  // input is NULL.
-  //
-  // The returned string is created using the ANSI codepage (CP_ACP) to
-  // match the behaviour of the ANSI versions of Win32 calls and the
-  // C runtime.
-  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
-#endif
-
-  // Compares two C strings.  Returns true if and only if they have the same
-  // content.
-  //
-  // Unlike strcmp(), this function can handle NULL argument(s).  A
-  // NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool CStringEquals(const char* lhs, const char* rhs);
-
-  // Converts a wide C string to a String using the UTF-8 encoding.
-  // NULL will be converted to "(null)".  If an error occurred during
-  // the conversion, "(failed to convert from wide string)" is
-  // returned.
-  static std::string ShowWideCString(const wchar_t* wide_c_str);
-
-  // Compares two wide C strings.  Returns true if and only if they have the
-  // same content.
-  //
-  // Unlike wcscmp(), this function can handle NULL argument(s).  A
-  // NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
-
-  // Compares two C strings, ignoring case.  Returns true if and only if
-  // they have the same content.
-  //
-  // Unlike strcasecmp(), this function can handle NULL argument(s).
-  // A NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool CaseInsensitiveCStringEquals(const char* lhs,
-                                           const char* rhs);
-
-  // Compares two wide C strings, ignoring case.  Returns true if and only if
-  // they have the same content.
-  //
-  // Unlike wcscasecmp(), this function can handle NULL argument(s).
-  // A NULL C string is considered different to any non-NULL wide C string,
-  // including the empty string.
-  // NB: The implementations on different platforms slightly differ.
-  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
-  // environment variable. On GNU platform this method uses wcscasecmp
-  // which compares according to LC_CTYPE category of the current locale.
-  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
-  // current locale.
-  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
-                                               const wchar_t* rhs);
-
-  // Returns true if and only if the given string ends with the given suffix,
-  // ignoring case. Any string is considered to end with an empty suffix.
-  static bool EndsWithCaseInsensitive(
-      const std::string& str, const std::string& suffix);
-
-  // Formats an int value as "%02d".
-  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
-
-  // Formats an int value to given width with leading zeros.
-  static std::string FormatIntWidthN(int value, int width);
-
-  // Formats an int value as "%X".
-  static std::string FormatHexInt(int value);
-
-  // Formats an int value as "%X".
-  static std::string FormatHexUInt32(uint32_t value);
-
-  // Formats a byte as "%02X".
-  static std::string FormatByte(unsigned char value);
-
- private:
-  String();  // Not meant to be instantiated.
-};  // class String
-
-// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
-// character in the buffer is replaced with "\\0".
-GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-namespace internal {
-
-// FilePath - a class for file and directory pathname manipulation which
-// handles platform-specific conventions (like the pathname separator).
-// Used for helper functions for naming files in a directory for xml output.
-// Except for Set methods, all methods are const or static, which provides an
-// "immutable value object" -- useful for peace of mind.
-// A FilePath with a value ending in a path separator ("like/this/") represents
-// a directory, otherwise it is assumed to represent a file. In either case,
-// it may or may not represent an actual file or directory in the file system.
-// Names are NOT checked for syntax correctness -- no checking for illegal
-// characters, malformed paths, etc.
-
-class GTEST_API_ FilePath {
- public:
-  FilePath() : pathname_("") { }
-  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
-
-  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
-    Normalize();
-  }
-
-  FilePath& operator=(const FilePath& rhs) {
-    Set(rhs);
-    return *this;
-  }
-
-  void Set(const FilePath& rhs) {
-    pathname_ = rhs.pathname_;
-  }
-
-  const std::string& string() const { return pathname_; }
-  const char* c_str() const { return pathname_.c_str(); }
-
-  // Returns the current working directory, or "" if unsuccessful.
-  static FilePath GetCurrentDir();
-
-  // Given directory = "dir", base_name = "test", number = 0,
-  // extension = "xml", returns "dir/test.xml". If number is greater
-  // than zero (e.g., 12), returns "dir/test_12.xml".
-  // On Windows platform, uses \ as the separator rather than /.
-  static FilePath MakeFileName(const FilePath& directory,
-                               const FilePath& base_name,
-                               int number,
-                               const char* extension);
-
-  // Given directory = "dir", relative_path = "test.xml",
-  // returns "dir/test.xml".
-  // On Windows, uses \ as the separator rather than /.
-  static FilePath ConcatPaths(const FilePath& directory,
-                              const FilePath& relative_path);
-
-  // Returns a pathname for a file that does not currently exist. The pathname
-  // will be directory/base_name.extension or
-  // directory/base_name_<number>.extension if directory/base_name.extension
-  // already exists. The number will be incremented until a pathname is found
-  // that does not already exist.
-  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
-  // There could be a race condition if two or more processes are calling this
-  // function at the same time -- they could both pick the same filename.
-  static FilePath GenerateUniqueFileName(const FilePath& directory,
-                                         const FilePath& base_name,
-                                         const char* extension);
-
-  // Returns true if and only if the path is "".
-  bool IsEmpty() const { return pathname_.empty(); }
-
-  // If input name has a trailing separator character, removes it and returns
-  // the name, otherwise return the name string unmodified.
-  // On Windows platform, uses \ as the separator, other platforms use /.
-  FilePath RemoveTrailingPathSeparator() const;
-
-  // Returns a copy of the FilePath with the directory part removed.
-  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
-  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
-  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
-  // returns an empty FilePath ("").
-  // On Windows platform, '\' is the path separator, otherwise it is '/'.
-  FilePath RemoveDirectoryName() const;
-
-  // RemoveFileName returns the directory path with the filename removed.
-  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
-  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
-  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
-  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
-  // On Windows platform, '\' is the path separator, otherwise it is '/'.
-  FilePath RemoveFileName() const;
-
-  // Returns a copy of the FilePath with the case-insensitive extension removed.
-  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
-  // FilePath("dir/file"). If a case-insensitive extension is not
-  // found, returns a copy of the original FilePath.
-  FilePath RemoveExtension(const char* extension) const;
-
-  // Creates directories so that path exists. Returns true if successful or if
-  // the directories already exist; returns false if unable to create
-  // directories for any reason. Will also return false if the FilePath does
-  // not represent a directory (that is, it doesn't end with a path separator).
-  bool CreateDirectoriesRecursively() const;
-
-  // Create the directory so that path exists. Returns true if successful or
-  // if the directory already exists; returns false if unable to create the
-  // directory for any reason, including if the parent directory does not
-  // exist. Not named "CreateDirectory" because that's a macro on Windows.
-  bool CreateFolder() const;
-
-  // Returns true if FilePath describes something in the file-system,
-  // either a file, directory, or whatever, and that something exists.
-  bool FileOrDirectoryExists() const;
-
-  // Returns true if pathname describes a directory in the file-system
-  // that exists.
-  bool DirectoryExists() const;
-
-  // Returns true if FilePath ends with a path separator, which indicates that
-  // it is intended to represent a directory. Returns false otherwise.
-  // This does NOT check that a directory (or file) actually exists.
-  bool IsDirectory() const;
-
-  // Returns true if pathname describes a root directory. (Windows has one
-  // root directory per disk drive.)
-  bool IsRootDirectory() const;
-
-  // Returns true if pathname describes an absolute path.
-  bool IsAbsolutePath() const;
-
- private:
-  // Replaces multiple consecutive separators with a single separator.
-  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
-  // redundancies that might be in a pathname involving "." or "..".
-  //
-  // A pathname with multiple consecutive separators may occur either through
-  // user error or as a result of some scripts or APIs that generate a pathname
-  // with a trailing separator. On other platforms the same API or script
-  // may NOT generate a pathname with a trailing "/". Then elsewhere that
-  // pathname may have another "/" and pathname components added to it,
-  // without checking for the separator already being there.
-  // The script language and operating system may allow paths like "foo//bar"
-  // but some of the functions in FilePath will not handle that correctly. In
-  // particular, RemoveTrailingPathSeparator() only removes one separator, and
-  // it is called in CreateDirectoriesRecursively() assuming that it will change
-  // a pathname from directory syntax (trailing separator) to filename syntax.
-  //
-  // On Windows this method also replaces the alternate path separator '/' with
-  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
-  // "bar\\foo".
-
-  void Normalize();
-
-  // Returns a pointer to the last occurrence of a valid path separator in
-  // the FilePath. On Windows, for example, both '/' and '\' are valid path
-  // separators. Returns NULL if no path separator was found.
-  const char* FindLastPathSeparator() const;
-
-  std::string pathname_;
-};  // class FilePath
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Type utilities needed for implementing typed and type-parameterized
-// tests.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-
-
-// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
-// libstdc++ (which is where cxxabi.h comes from).
-# if GTEST_HAS_CXXABI_H_
-#  include <cxxabi.h>
-# elif defined(__HP_aCC)
-#  include <acxx_demangle.h>
-# endif  // GTEST_HASH_CXXABI_H_
-
-namespace testing {
-namespace internal {
-
-// Canonicalizes a given name with respect to the Standard C++ Library.
-// This handles removing the inline namespace within `std` that is
-// used by various standard libraries (e.g., `std::__1`).  Names outside
-// of namespace std are returned unmodified.
-inline std::string CanonicalizeForStdLibVersioning(std::string s) {
-  static const char prefix[] = "std::__";
-  if (s.compare(0, strlen(prefix), prefix) == 0) {
-    std::string::size_type end = s.find("::", strlen(prefix));
-    if (end != s.npos) {
-      // Erase everything between the initial `std` and the second `::`.
-      s.erase(strlen("std"), end - strlen("std"));
-    }
-  }
-  return s;
-}
-
-#if GTEST_HAS_RTTI
-// GetTypeName(const std::type_info&) returns a human-readable name of type T.
-inline std::string GetTypeName(const std::type_info& type) {
-  const char* const name = type.name();
-#if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
-  int status = 0;
-  // gcc's implementation of typeid(T).name() mangles the type name,
-  // so we have to demangle it.
-#if GTEST_HAS_CXXABI_H_
-  using abi::__cxa_demangle;
-#endif  // GTEST_HAS_CXXABI_H_
-  char* const readable_name = __cxa_demangle(name, nullptr, nullptr, &status);
-  const std::string name_str(status == 0 ? readable_name : name);
-  free(readable_name);
-  return CanonicalizeForStdLibVersioning(name_str);
-#else
-  return name;
-#endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
-}
-#endif  // GTEST_HAS_RTTI
-
-// GetTypeName<T>() returns a human-readable name of type T if and only if
-// RTTI is enabled, otherwise it returns a dummy type name.
-// NB: This function is also used in Google Mock, so don't move it inside of
-// the typed-test-only section below.
-template <typename T>
-std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-  return GetTypeName(typeid(T));
-#else
-  return "<type>";
-#endif  // GTEST_HAS_RTTI
-}
-
-// A unique type indicating an empty node
-struct None {};
-
-# define GTEST_TEMPLATE_ template <typename T> class
-
-// The template "selector" struct TemplateSel<Tmpl> is used to
-// represent Tmpl, which must be a class template with one type
-// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
-// as the type Tmpl<T>.  This allows us to actually instantiate the
-// template "selected" by TemplateSel<Tmpl>.
-//
-// This trick is necessary for simulating typedef for class templates,
-// which C++ doesn't support directly.
-template <GTEST_TEMPLATE_ Tmpl>
-struct TemplateSel {
-  template <typename T>
-  struct Bind {
-    typedef Tmpl<T> type;
-  };
-};
-
-# define GTEST_BIND_(TmplSel, T) \
-  TmplSel::template Bind<T>::type
-
-template <GTEST_TEMPLATE_ Head_, GTEST_TEMPLATE_... Tail_>
-struct Templates {
-  using Head = TemplateSel<Head_>;
-  using Tail = Templates<Tail_...>;
-};
-
-template <GTEST_TEMPLATE_ Head_>
-struct Templates<Head_> {
-  using Head = TemplateSel<Head_>;
-  using Tail = None;
-};
-
-// Tuple-like type lists
-template <typename Head_, typename... Tail_>
-struct Types {
-  using Head = Head_;
-  using Tail = Types<Tail_...>;
-};
-
-template <typename Head_>
-struct Types<Head_> {
-  using Head = Head_;
-  using Tail = None;
-};
-
-// Helper metafunctions to tell apart a single type from types
-// generated by ::testing::Types
-template <typename... Ts>
-struct ProxyTypeList {
-  using type = Types<Ts...>;
-};
-
-template <typename>
-struct is_proxy_type_list : std::false_type {};
-
-template <typename... Ts>
-struct is_proxy_type_list<ProxyTypeList<Ts...>> : std::true_type {};
-
-// Generator which conditionally creates type lists.
-// It recognizes if a requested type list should be created
-// and prevents creating a new type list nested within another one.
-template <typename T>
-struct GenerateTypeList {
- private:
-  using proxy = typename std::conditional<is_proxy_type_list<T>::value, T,
-                                          ProxyTypeList<T>>::type;
-
- public:
-  using type = typename proxy::type;
-};
-
-}  // namespace internal
-
-template <typename... Ts>
-using Types = internal::ProxyTypeList<Ts...>;
-
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-
-// Due to C++ preprocessor weirdness, we need double indirection to
-// concatenate two tokens when one of them is __LINE__.  Writing
-//
-//   foo ## __LINE__
-//
-// will result in the token foo__LINE__, instead of foo followed by
-// the current line number.  For more details, see
-// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
-#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
-#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
-
-// Stringifies its argument.
-// Work around a bug in visual studio which doesn't accept code like this:
-//
-//   #define GTEST_STRINGIFY_(name) #name
-//   #define MACRO(a, b, c) ... GTEST_STRINGIFY_(a) ...
-//   MACRO(, x, y)
-//
-// Complaining about the argument to GTEST_STRINGIFY_ being empty.
-// This is allowed by the spec.
-#define GTEST_STRINGIFY_HELPER_(name, ...) #name
-#define GTEST_STRINGIFY_(...) GTEST_STRINGIFY_HELPER_(__VA_ARGS__, )
-
-namespace proto2 {
-class MessageLite;
-}
-
-namespace testing {
-
-// Forward declarations.
-
-class AssertionResult;                 // Result of an assertion.
-class Message;                         // Represents a failure message.
-class Test;                            // Represents a test.
-class TestInfo;                        // Information about a test.
-class TestPartResult;                  // Result of a test part.
-class UnitTest;                        // A collection of test suites.
-
-template <typename T>
-::std::string PrintToString(const T& value);
-
-namespace internal {
-
-struct TraceInfo;                      // Information about a trace point.
-class TestInfoImpl;                    // Opaque implementation of TestInfo
-class UnitTestImpl;                    // Opaque implementation of UnitTest
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-GTEST_API_ extern const char kStackTraceMarker[];
-
-// An IgnoredValue object can be implicitly constructed from ANY value.
-class IgnoredValue {
-  struct Sink {};
- public:
-  // This constructor template allows any value to be implicitly
-  // converted to IgnoredValue.  The object has no data member and
-  // doesn't try to remember anything about the argument.  We
-  // deliberately omit the 'explicit' keyword in order to allow the
-  // conversion to be implicit.
-  // Disable the conversion if T already has a magical conversion operator.
-  // Otherwise we get ambiguity.
-  template <typename T,
-            typename std::enable_if<!std::is_convertible<T, Sink>::value,
-                                    int>::type = 0>
-  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
-};
-
-// Appends the user-supplied message to the Google-Test-generated message.
-GTEST_API_ std::string AppendUserMessage(
-    const std::string& gtest_msg, const Message& user_msg);
-
-#if GTEST_HAS_EXCEPTIONS
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4275 \
-/* an exported class was derived from a class that was not exported */)
-
-// This exception is thrown by (and only by) a failed Google Test
-// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
-// are enabled).  We derive it from std::runtime_error, which is for
-// errors presumably detectable only at run time.  Since
-// std::runtime_error inherits from std::exception, many testing
-// frameworks know how to extract and print the message inside it.
-class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
- public:
-  explicit GoogleTestFailureException(const TestPartResult& failure);
-};
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4275
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-namespace edit_distance {
-// Returns the optimal edits to go from 'left' to 'right'.
-// All edits cost the same, with replace having lower priority than
-// add/remove.
-// Simple implementation of the Wagner-Fischer algorithm.
-// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
-enum EditType { kMatch, kAdd, kRemove, kReplace };
-GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<size_t>& left, const std::vector<size_t>& right);
-
-// Same as above, but the input is represented as strings.
-GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<std::string>& left,
-    const std::vector<std::string>& right);
-
-// Create a diff of the input strings in Unified diff format.
-GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
-                                         const std::vector<std::string>& right,
-                                         size_t context = 2);
-
-}  // namespace edit_distance
-
-// Calculate the diff between 'left' and 'right' and return it in unified diff
-// format.
-// If not null, stores in 'total_line_count' the total number of lines found
-// in left + right.
-GTEST_API_ std::string DiffStrings(const std::string& left,
-                                   const std::string& right,
-                                   size_t* total_line_count);
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-//   expected_expression: "foo"
-//   actual_expression:   "bar"
-//   expected_value:      "5"
-//   actual_value:        "6"
-//
-// The ignoring_case parameter is true if and only if the assertion is a
-// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
-// be inserted into the message.
-GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
-                                     const char* actual_expression,
-                                     const std::string& expected_value,
-                                     const std::string& actual_value,
-                                     bool ignoring_case);
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-GTEST_API_ std::string GetBoolAssertionFailureMessage(
-    const AssertionResult& assertion_result,
-    const char* expression_text,
-    const char* actual_predicate_value,
-    const char* expected_predicate_value);
-
-// This template class represents an IEEE floating-point number
-// (either single-precision or double-precision, depending on the
-// template parameters).
-//
-// The purpose of this class is to do more sophisticated number
-// comparison.  (Due to round-off error, etc, it's very unlikely that
-// two floating-points will be equal exactly.  Hence a naive
-// comparison by the == operation often doesn't work.)
-//
-// Format of IEEE floating-point:
-//
-//   The most-significant bit being the leftmost, an IEEE
-//   floating-point looks like
-//
-//     sign_bit exponent_bits fraction_bits
-//
-//   Here, sign_bit is a single bit that designates the sign of the
-//   number.
-//
-//   For float, there are 8 exponent bits and 23 fraction bits.
-//
-//   For double, there are 11 exponent bits and 52 fraction bits.
-//
-//   More details can be found at
-//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
-//
-// Template parameter:
-//
-//   RawType: the raw floating-point type (either float or double)
-template <typename RawType>
-class FloatingPoint {
- public:
-  // Defines the unsigned integer type that has the same size as the
-  // floating point number.
-  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
-
-  // Constants.
-
-  // # of bits in a number.
-  static const size_t kBitCount = 8*sizeof(RawType);
-
-  // # of fraction bits in a number.
-  static const size_t kFractionBitCount =
-    std::numeric_limits<RawType>::digits - 1;
-
-  // # of exponent bits in a number.
-  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
-
-  // The mask for the sign bit.
-  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
-
-  // The mask for the fraction bits.
-  static const Bits kFractionBitMask =
-    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
-
-  // The mask for the exponent bits.
-  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
-
-  // How many ULP's (Units in the Last Place) we want to tolerate when
-  // comparing two numbers.  The larger the value, the more error we
-  // allow.  A 0 value means that two numbers must be exactly the same
-  // to be considered equal.
-  //
-  // The maximum error of a single floating-point operation is 0.5
-  // units in the last place.  On Intel CPU's, all floating-point
-  // calculations are done with 80-bit precision, while double has 64
-  // bits.  Therefore, 4 should be enough for ordinary use.
-  //
-  // See the following article for more details on ULP:
-  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
-  static const uint32_t kMaxUlps = 4;
-
-  // Constructs a FloatingPoint from a raw floating-point number.
-  //
-  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
-  // around may change its bits, although the new value is guaranteed
-  // to be also a NAN.  Therefore, don't expect this constructor to
-  // preserve the bits in x when x is a NAN.
-  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
-
-  // Static methods
-
-  // Reinterprets a bit pattern as a floating-point number.
-  //
-  // This function is needed to test the AlmostEquals() method.
-  static RawType ReinterpretBits(const Bits bits) {
-    FloatingPoint fp(0);
-    fp.u_.bits_ = bits;
-    return fp.u_.value_;
-  }
-
-  // Returns the floating-point number that represent positive infinity.
-  static RawType Infinity() {
-    return ReinterpretBits(kExponentBitMask);
-  }
-
-  // Returns the maximum representable finite floating-point number.
-  static RawType Max();
-
-  // Non-static methods
-
-  // Returns the bits that represents this number.
-  const Bits &bits() const { return u_.bits_; }
-
-  // Returns the exponent bits of this number.
-  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
-
-  // Returns the fraction bits of this number.
-  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
-
-  // Returns the sign bit of this number.
-  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
-
-  // Returns true if and only if this is NAN (not a number).
-  bool is_nan() const {
-    // It's a NAN if the exponent bits are all ones and the fraction
-    // bits are not entirely zeros.
-    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
-  }
-
-  // Returns true if and only if this number is at most kMaxUlps ULP's away
-  // from rhs.  In particular, this function:
-  //
-  //   - returns false if either number is (or both are) NAN.
-  //   - treats really large numbers as almost equal to infinity.
-  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
-  bool AlmostEquals(const FloatingPoint& rhs) const {
-    // The IEEE standard says that any comparison operation involving
-    // a NAN must return false.
-    if (is_nan() || rhs.is_nan()) return false;
-
-    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
-        <= kMaxUlps;
-  }
-
- private:
-  // The data type used to store the actual floating-point number.
-  union FloatingPointUnion {
-    RawType value_;  // The raw floating-point number.
-    Bits bits_;      // The bits that represent the number.
-  };
-
-  // Converts an integer from the sign-and-magnitude representation to
-  // the biased representation.  More precisely, let N be 2 to the
-  // power of (kBitCount - 1), an integer x is represented by the
-  // unsigned number x + N.
-  //
-  // For instance,
-  //
-  //   -N + 1 (the most negative number representable using
-  //          sign-and-magnitude) is represented by 1;
-  //   0      is represented by N; and
-  //   N - 1  (the biggest number representable using
-  //          sign-and-magnitude) is represented by 2N - 1.
-  //
-  // Read http://en.wikipedia.org/wiki/Signed_number_representations
-  // for more details on signed number representations.
-  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
-    if (kSignBitMask & sam) {
-      // sam represents a negative number.
-      return ~sam + 1;
-    } else {
-      // sam represents a positive number.
-      return kSignBitMask | sam;
-    }
-  }
-
-  // Given two numbers in the sign-and-magnitude representation,
-  // returns the distance between them as an unsigned number.
-  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
-                                                     const Bits &sam2) {
-    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
-    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
-    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
-  }
-
-  FloatingPointUnion u_;
-};
-
-// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
-// macro defined by <windows.h>.
-template <>
-inline float FloatingPoint<float>::Max() { return FLT_MAX; }
-template <>
-inline double FloatingPoint<double>::Max() { return DBL_MAX; }
-
-// Typedefs the instances of the FloatingPoint template class that we
-// care to use.
-typedef FloatingPoint<float> Float;
-typedef FloatingPoint<double> Double;
-
-// In order to catch the mistake of putting tests that use different
-// test fixture classes in the same test suite, we need to assign
-// unique IDs to fixture classes and compare them.  The TypeId type is
-// used to hold such IDs.  The user should treat TypeId as an opaque
-// type: the only operation allowed on TypeId values is to compare
-// them for equality using the == operator.
-typedef const void* TypeId;
-
-template <typename T>
-class TypeIdHelper {
- public:
-  // dummy_ must not have a const type.  Otherwise an overly eager
-  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
-  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
-  static bool dummy_;
-};
-
-template <typename T>
-bool TypeIdHelper<T>::dummy_ = false;
-
-// GetTypeId<T>() returns the ID of type T.  Different values will be
-// returned for different types.  Calling the function twice with the
-// same type argument is guaranteed to return the same ID.
-template <typename T>
-TypeId GetTypeId() {
-  // The compiler is required to allocate a different
-  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
-  // the template.  Therefore, the address of dummy_ is guaranteed to
-  // be unique.
-  return &(TypeIdHelper<T>::dummy_);
-}
-
-// Returns the type ID of ::testing::Test.  Always call this instead
-// of GetTypeId< ::testing::Test>() to get the type ID of
-// ::testing::Test, as the latter may give the wrong result due to a
-// suspected linker bug when compiling Google Test as a Mac OS X
-// framework.
-GTEST_API_ TypeId GetTestTypeId();
-
-// Defines the abstract factory interface that creates instances
-// of a Test object.
-class TestFactoryBase {
- public:
-  virtual ~TestFactoryBase() {}
-
-  // Creates a test instance to run. The instance is both created and destroyed
-  // within TestInfoImpl::Run()
-  virtual Test* CreateTest() = 0;
-
- protected:
-  TestFactoryBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
-};
-
-// This class provides implementation of TeastFactoryBase interface.
-// It is used in TEST and TEST_F macros.
-template <class TestClass>
-class TestFactoryImpl : public TestFactoryBase {
- public:
-  Test* CreateTest() override { return new TestClass; }
-};
-
-#if GTEST_OS_WINDOWS
-
-// Predicate-formatters for implementing the HRESULT checking macros
-// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
-// We pass a long instead of HRESULT to avoid causing an
-// include dependency for the HRESULT type.
-GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
-                                            long hr);  // NOLINT
-GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
-                                            long hr);  // NOLINT
-
-#endif  // GTEST_OS_WINDOWS
-
-// Types of SetUpTestSuite() and TearDownTestSuite() functions.
-using SetUpTestSuiteFunc = void (*)();
-using TearDownTestSuiteFunc = void (*)();
-
-struct CodeLocation {
-  CodeLocation(const std::string& a_file, int a_line)
-      : file(a_file), line(a_line) {}
-
-  std::string file;
-  int line;
-};
-
-//  Helper to identify which setup function for TestCase / TestSuite to call.
-//  Only one function is allowed, either TestCase or TestSute but not both.
-
-// Utility functions to help SuiteApiResolver
-using SetUpTearDownSuiteFuncType = void (*)();
-
-inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
-    SetUpTearDownSuiteFuncType a, SetUpTearDownSuiteFuncType def) {
-  return a == def ? nullptr : a;
-}
-
-template <typename T>
-//  Note that SuiteApiResolver inherits from T because
-//  SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
-//  SuiteApiResolver can access them.
-struct SuiteApiResolver : T {
-  // testing::Test is only forward declared at this point. So we make it a
-  // dependend class for the compiler to be OK with it.
-  using Test =
-      typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
-
-  static SetUpTearDownSuiteFuncType GetSetUpCaseOrSuite(const char* filename,
-                                                        int line_num) {
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-    SetUpTearDownSuiteFuncType test_case_fp =
-        GetNotDefaultOrNull(&T::SetUpTestCase, &Test::SetUpTestCase);
-    SetUpTearDownSuiteFuncType test_suite_fp =
-        GetNotDefaultOrNull(&T::SetUpTestSuite, &Test::SetUpTestSuite);
-
-    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
-        << "Test can not provide both SetUpTestSuite and SetUpTestCase, please "
-           "make sure there is only one present at "
-        << filename << ":" << line_num;
-
-    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
-#else
-    (void)(filename);
-    (void)(line_num);
-    return &T::SetUpTestSuite;
-#endif
-  }
-
-  static SetUpTearDownSuiteFuncType GetTearDownCaseOrSuite(const char* filename,
-                                                           int line_num) {
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-    SetUpTearDownSuiteFuncType test_case_fp =
-        GetNotDefaultOrNull(&T::TearDownTestCase, &Test::TearDownTestCase);
-    SetUpTearDownSuiteFuncType test_suite_fp =
-        GetNotDefaultOrNull(&T::TearDownTestSuite, &Test::TearDownTestSuite);
-
-    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
-        << "Test can not provide both TearDownTestSuite and TearDownTestCase,"
-           " please make sure there is only one present at"
-        << filename << ":" << line_num;
-
-    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
-#else
-    (void)(filename);
-    (void)(line_num);
-    return &T::TearDownTestSuite;
-#endif
-  }
-};
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-//   test_suite_name:  name of the test suite
-//   name:             name of the test
-//   type_param:       the name of the test's type parameter, or NULL if
-//                     this is not a typed or a type-parameterized test.
-//   value_param:      text representation of the test's value parameter,
-//                     or NULL if this is not a type-parameterized test.
-//   code_location:    code location where the test is defined
-//   fixture_class_id: ID of the test fixture class
-//   set_up_tc:        pointer to the function that sets up the test suite
-//   tear_down_tc:     pointer to the function that tears down the test suite
-//   factory:          pointer to the factory that creates a test object.
-//                     The newly created TestInfo instance will assume
-//                     ownership of the factory object.
-GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
-    const char* value_param, CodeLocation code_location,
-    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
-    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory);
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// State of the definition of a type-parameterized test suite.
-class GTEST_API_ TypedTestSuitePState {
- public:
-  TypedTestSuitePState() : registered_(false) {}
-
-  // Adds the given test name to defined_test_names_ and return true
-  // if the test suite hasn't been registered; otherwise aborts the
-  // program.
-  bool AddTestName(const char* file, int line, const char* case_name,
-                   const char* test_name) {
-    if (registered_) {
-      fprintf(stderr,
-              "%s Test %s must be defined before "
-              "REGISTER_TYPED_TEST_SUITE_P(%s, ...).\n",
-              FormatFileLocation(file, line).c_str(), test_name, case_name);
-      fflush(stderr);
-      posix::Abort();
-    }
-    registered_tests_.insert(
-        ::std::make_pair(test_name, CodeLocation(file, line)));
-    return true;
-  }
-
-  bool TestExists(const std::string& test_name) const {
-    return registered_tests_.count(test_name) > 0;
-  }
-
-  const CodeLocation& GetCodeLocation(const std::string& test_name) const {
-    RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
-    GTEST_CHECK_(it != registered_tests_.end());
-    return it->second;
-  }
-
-  // Verifies that registered_tests match the test names in
-  // defined_test_names_; returns registered_tests if successful, or
-  // aborts the program otherwise.
-  const char* VerifyRegisteredTestNames(const char* test_suite_name,
-                                        const char* file, int line,
-                                        const char* registered_tests);
-
- private:
-  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
-
-  bool registered_;
-  RegisteredTestsMap registered_tests_;
-};
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-using TypedTestCasePState = TypedTestSuitePState;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Skips to the first non-space char after the first comma in 'str';
-// returns NULL if no comma is found in 'str'.
-inline const char* SkipComma(const char* str) {
-  const char* comma = strchr(str, ',');
-  if (comma == nullptr) {
-    return nullptr;
-  }
-  while (IsSpace(*(++comma))) {}
-  return comma;
-}
-
-// Returns the prefix of 'str' before the first comma in it; returns
-// the entire string if it contains no comma.
-inline std::string GetPrefixUntilComma(const char* str) {
-  const char* comma = strchr(str, ',');
-  return comma == nullptr ? str : std::string(str, comma);
-}
-
-// Splits a given string on a given delimiter, populating a given
-// vector with the fields.
-void SplitString(const ::std::string& str, char delimiter,
-                 ::std::vector< ::std::string>* dest);
-
-// The default argument to the template below for the case when the user does
-// not provide a name generator.
-struct DefaultNameGenerator {
-  template <typename T>
-  static std::string GetName(int i) {
-    return StreamableToString(i);
-  }
-};
-
-template <typename Provided = DefaultNameGenerator>
-struct NameGeneratorSelector {
-  typedef Provided type;
-};
-
-template <typename NameGenerator>
-void GenerateNamesRecursively(internal::None, std::vector<std::string>*, int) {}
-
-template <typename NameGenerator, typename Types>
-void GenerateNamesRecursively(Types, std::vector<std::string>* result, int i) {
-  result->push_back(NameGenerator::template GetName<typename Types::Head>(i));
-  GenerateNamesRecursively<NameGenerator>(typename Types::Tail(), result,
-                                          i + 1);
-}
-
-template <typename NameGenerator, typename Types>
-std::vector<std::string> GenerateNames() {
-  std::vector<std::string> result;
-  GenerateNamesRecursively<NameGenerator>(Types(), &result, 0);
-  return result;
-}
-
-// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
-// registers a list of type-parameterized tests with Google Test.  The
-// return value is insignificant - we just need to return something
-// such that we can call this function in a namespace scope.
-//
-// Implementation note: The GTEST_TEMPLATE_ macro declares a template
-// template parameter.  It's defined in gtest-type-util.h.
-template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
-class TypeParameterizedTest {
- public:
-  // 'index' is the index of the test in the type list 'Types'
-  // specified in INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, TestSuite,
-  // Types).  Valid values for 'index' are [0, N - 1] where N is the
-  // length of Types.
-  static bool Register(const char* prefix, const CodeLocation& code_location,
-                       const char* case_name, const char* test_names, int index,
-                       const std::vector<std::string>& type_names =
-                           GenerateNames<DefaultNameGenerator, Types>()) {
-    typedef typename Types::Head Type;
-    typedef Fixture<Type> FixtureClass;
-    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
-
-    // First, registers the first type-parameterized test in the type
-    // list.
-    MakeAndRegisterTestInfo(
-        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
-         "/" + type_names[static_cast<size_t>(index)])
-            .c_str(),
-        StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
-        GetTypeName<Type>().c_str(),
-        nullptr,  // No value parameter.
-        code_location, GetTypeId<FixtureClass>(),
-        SuiteApiResolver<TestClass>::GetSetUpCaseOrSuite(
-            code_location.file.c_str(), code_location.line),
-        SuiteApiResolver<TestClass>::GetTearDownCaseOrSuite(
-            code_location.file.c_str(), code_location.line),
-        new TestFactoryImpl<TestClass>);
-
-    // Next, recurses (at compile time) with the tail of the type list.
-    return TypeParameterizedTest<Fixture, TestSel,
-                                 typename Types::Tail>::Register(prefix,
-                                                                 code_location,
-                                                                 case_name,
-                                                                 test_names,
-                                                                 index + 1,
-                                                                 type_names);
-  }
-};
-
-// The base case for the compile time recursion.
-template <GTEST_TEMPLATE_ Fixture, class TestSel>
-class TypeParameterizedTest<Fixture, TestSel, internal::None> {
- public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
-                       const char* /*case_name*/, const char* /*test_names*/,
-                       int /*index*/,
-                       const std::vector<std::string>& =
-                           std::vector<std::string>() /*type_names*/) {
-    return true;
-  }
-};
-
-GTEST_API_ void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
-                                                   CodeLocation code_location);
-GTEST_API_ void RegisterTypeParameterizedTestSuiteInstantiation(
-    const char* case_name);
-
-// TypeParameterizedTestSuite<Fixture, Tests, Types>::Register()
-// registers *all combinations* of 'Tests' and 'Types' with Google
-// Test.  The return value is insignificant - we just need to return
-// something such that we can call this function in a namespace scope.
-template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
-class TypeParameterizedTestSuite {
- public:
-  static bool Register(const char* prefix, CodeLocation code_location,
-                       const TypedTestSuitePState* state, const char* case_name,
-                       const char* test_names,
-                       const std::vector<std::string>& type_names =
-                           GenerateNames<DefaultNameGenerator, Types>()) {
-    RegisterTypeParameterizedTestSuiteInstantiation(case_name);
-    std::string test_name = StripTrailingSpaces(
-        GetPrefixUntilComma(test_names));
-    if (!state->TestExists(test_name)) {
-      fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
-              case_name, test_name.c_str(),
-              FormatFileLocation(code_location.file.c_str(),
-                                 code_location.line).c_str());
-      fflush(stderr);
-      posix::Abort();
-    }
-    const CodeLocation& test_location = state->GetCodeLocation(test_name);
-
-    typedef typename Tests::Head Head;
-
-    // First, register the first test in 'Test' for each type in 'Types'.
-    TypeParameterizedTest<Fixture, Head, Types>::Register(
-        prefix, test_location, case_name, test_names, 0, type_names);
-
-    // Next, recurses (at compile time) with the tail of the test list.
-    return TypeParameterizedTestSuite<Fixture, typename Tests::Tail,
-                                      Types>::Register(prefix, code_location,
-                                                       state, case_name,
-                                                       SkipComma(test_names),
-                                                       type_names);
-  }
-};
-
-// The base case for the compile time recursion.
-template <GTEST_TEMPLATE_ Fixture, typename Types>
-class TypeParameterizedTestSuite<Fixture, internal::None, Types> {
- public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
-                       const TypedTestSuitePState* /*state*/,
-                       const char* /*case_name*/, const char* /*test_names*/,
-                       const std::vector<std::string>& =
-                           std::vector<std::string>() /*type_names*/) {
-    return true;
-  }
-};
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
-    UnitTest* unit_test, int skip_count);
-
-// Helpers for suppressing warnings on unreachable code or constant
-// condition.
-
-// Always returns true.
-GTEST_API_ bool AlwaysTrue();
-
-// Always returns false.
-inline bool AlwaysFalse() { return !AlwaysTrue(); }
-
-// Helper for suppressing false warning from Clang on a const char*
-// variable declared in a conditional expression always being NULL in
-// the else branch.
-struct GTEST_API_ ConstCharPtr {
-  ConstCharPtr(const char* str) : value(str) {}
-  operator bool() const { return true; }
-  const char* value;
-};
-
-// Helper for declaring std::string within 'if' statement
-// in pre C++17 build environment.
-struct TrueWithString {
-  TrueWithString() = default;
-  explicit TrueWithString(const char* str) : value(str) {}
-  explicit TrueWithString(const std::string& str) : value(str) {}
-  explicit operator bool() const { return true; }
-  std::string value;
-};
-
-// A simple Linear Congruential Generator for generating random
-// numbers with a uniform distribution.  Unlike rand() and srand(), it
-// doesn't use global state (and therefore can't interfere with user
-// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
-// but it's good enough for our purposes.
-class GTEST_API_ Random {
- public:
-  static const uint32_t kMaxRange = 1u << 31;
-
-  explicit Random(uint32_t seed) : state_(seed) {}
-
-  void Reseed(uint32_t seed) { state_ = seed; }
-
-  // Generates a random number from [0, range).  Crashes if 'range' is
-  // 0 or greater than kMaxRange.
-  uint32_t Generate(uint32_t range);
-
- private:
-  uint32_t state_;
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
-};
-
-// Turns const U&, U&, const U, and U all into U.
-#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
-  typename std::remove_const<typename std::remove_reference<T>::type>::type
-
-// HasDebugStringAndShortDebugString<T>::value is a compile-time bool constant
-// that's true if and only if T has methods DebugString() and ShortDebugString()
-// that return std::string.
-template <typename T>
-class HasDebugStringAndShortDebugString {
- private:
-  template <typename C>
-  static auto CheckDebugString(C*) -> typename std::is_same<
-      std::string, decltype(std::declval<const C>().DebugString())>::type;
-  template <typename>
-  static std::false_type CheckDebugString(...);
-
-  template <typename C>
-  static auto CheckShortDebugString(C*) -> typename std::is_same<
-      std::string, decltype(std::declval<const C>().ShortDebugString())>::type;
-  template <typename>
-  static std::false_type CheckShortDebugString(...);
-
-  using HasDebugStringType = decltype(CheckDebugString<T>(nullptr));
-  using HasShortDebugStringType = decltype(CheckShortDebugString<T>(nullptr));
-
- public:
-  static constexpr bool value =
-      HasDebugStringType::value && HasShortDebugStringType::value;
-};
-
-template <typename T>
-constexpr bool HasDebugStringAndShortDebugString<T>::value;
-
-// When the compiler sees expression IsContainerTest<C>(0), if C is an
-// STL-style container class, the first overload of IsContainerTest
-// will be viable (since both C::iterator* and C::const_iterator* are
-// valid types and NULL can be implicitly converted to them).  It will
-// be picked over the second overload as 'int' is a perfect match for
-// the type of argument 0.  If C::iterator or C::const_iterator is not
-// a valid type, the first overload is not viable, and the second
-// overload will be picked.  Therefore, we can determine whether C is
-// a container class by checking the type of IsContainerTest<C>(0).
-// The value of the expression is insignificant.
-//
-// In C++11 mode we check the existence of a const_iterator and that an
-// iterator is properly implemented for the container.
-//
-// For pre-C++11 that we look for both C::iterator and C::const_iterator.
-// The reason is that C++ injects the name of a class as a member of the
-// class itself (e.g. you can refer to class iterator as either
-// 'iterator' or 'iterator::iterator').  If we look for C::iterator
-// only, for example, we would mistakenly think that a class named
-// iterator is an STL container.
-//
-// Also note that the simpler approach of overloading
-// IsContainerTest(typename C::const_iterator*) and
-// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
-typedef int IsContainer;
-template <class C,
-          class Iterator = decltype(::std::declval<const C&>().begin()),
-          class = decltype(::std::declval<const C&>().end()),
-          class = decltype(++::std::declval<Iterator&>()),
-          class = decltype(*::std::declval<Iterator>()),
-          class = typename C::const_iterator>
-IsContainer IsContainerTest(int /* dummy */) {
-  return 0;
-}
-
-typedef char IsNotContainer;
-template <class C>
-IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
-
-// Trait to detect whether a type T is a hash table.
-// The heuristic used is that the type contains an inner type `hasher` and does
-// not contain an inner type `reverse_iterator`.
-// If the container is iterable in reverse, then order might actually matter.
-template <typename T>
-struct IsHashTable {
- private:
-  template <typename U>
-  static char test(typename U::hasher*, typename U::reverse_iterator*);
-  template <typename U>
-  static int test(typename U::hasher*, ...);
-  template <typename U>
-  static char test(...);
-
- public:
-  static const bool value = sizeof(test<T>(nullptr, nullptr)) == sizeof(int);
-};
-
-template <typename T>
-const bool IsHashTable<T>::value;
-
-template <typename C,
-          bool = sizeof(IsContainerTest<C>(0)) == sizeof(IsContainer)>
-struct IsRecursiveContainerImpl;
-
-template <typename C>
-struct IsRecursiveContainerImpl<C, false> : public std::false_type {};
-
-// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
-// obey the same inconsistencies as the IsContainerTest, namely check if
-// something is a container is relying on only const_iterator in C++11 and
-// is relying on both const_iterator and iterator otherwise
-template <typename C>
-struct IsRecursiveContainerImpl<C, true> {
-  using value_type = decltype(*std::declval<typename C::const_iterator>());
-  using type =
-      std::is_same<typename std::remove_const<
-                       typename std::remove_reference<value_type>::type>::type,
-                   C>;
-};
-
-// IsRecursiveContainer<Type> is a unary compile-time predicate that
-// evaluates whether C is a recursive container type. A recursive container
-// type is a container type whose value_type is equal to the container type
-// itself. An example for a recursive container type is
-// boost::filesystem::path, whose iterator has a value_type that is equal to
-// boost::filesystem::path.
-template <typename C>
-struct IsRecursiveContainer : public IsRecursiveContainerImpl<C>::type {};
-
-// Utilities for native arrays.
-
-// ArrayEq() compares two k-dimensional native arrays using the
-// elements' operator==, where k can be any integer >= 0.  When k is
-// 0, ArrayEq() degenerates into comparing a single pair of values.
-
-template <typename T, typename U>
-bool ArrayEq(const T* lhs, size_t size, const U* rhs);
-
-// This generic version is used when k is 0.
-template <typename T, typename U>
-inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
-
-// This overload is used when k >= 1.
-template <typename T, typename U, size_t N>
-inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
-  return internal::ArrayEq(lhs, N, rhs);
-}
-
-// This helper reduces code bloat.  If we instead put its logic inside
-// the previous ArrayEq() function, arrays with different sizes would
-// lead to different copies of the template code.
-template <typename T, typename U>
-bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
-  for (size_t i = 0; i != size; i++) {
-    if (!internal::ArrayEq(lhs[i], rhs[i]))
-      return false;
-  }
-  return true;
-}
-
-// Finds the first element in the iterator range [begin, end) that
-// equals elem.  Element may be a native array type itself.
-template <typename Iter, typename Element>
-Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
-  for (Iter it = begin; it != end; ++it) {
-    if (internal::ArrayEq(*it, elem))
-      return it;
-  }
-  return end;
-}
-
-// CopyArray() copies a k-dimensional native array using the elements'
-// operator=, where k can be any integer >= 0.  When k is 0,
-// CopyArray() degenerates into copying a single value.
-
-template <typename T, typename U>
-void CopyArray(const T* from, size_t size, U* to);
-
-// This generic version is used when k is 0.
-template <typename T, typename U>
-inline void CopyArray(const T& from, U* to) { *to = from; }
-
-// This overload is used when k >= 1.
-template <typename T, typename U, size_t N>
-inline void CopyArray(const T(&from)[N], U(*to)[N]) {
-  internal::CopyArray(from, N, *to);
-}
-
-// This helper reduces code bloat.  If we instead put its logic inside
-// the previous CopyArray() function, arrays with different sizes
-// would lead to different copies of the template code.
-template <typename T, typename U>
-void CopyArray(const T* from, size_t size, U* to) {
-  for (size_t i = 0; i != size; i++) {
-    internal::CopyArray(from[i], to + i);
-  }
-}
-
-// The relation between an NativeArray object (see below) and the
-// native array it represents.
-// We use 2 different structs to allow non-copyable types to be used, as long
-// as RelationToSourceReference() is passed.
-struct RelationToSourceReference {};
-struct RelationToSourceCopy {};
-
-// Adapts a native array to a read-only STL-style container.  Instead
-// of the complete STL container concept, this adaptor only implements
-// members useful for Google Mock's container matchers.  New members
-// should be added as needed.  To simplify the implementation, we only
-// support Element being a raw type (i.e. having no top-level const or
-// reference modifier).  It's the client's responsibility to satisfy
-// this requirement.  Element can be an array type itself (hence
-// multi-dimensional arrays are supported).
-template <typename Element>
-class NativeArray {
- public:
-  // STL-style container typedefs.
-  typedef Element value_type;
-  typedef Element* iterator;
-  typedef const Element* const_iterator;
-
-  // Constructs from a native array. References the source.
-  NativeArray(const Element* array, size_t count, RelationToSourceReference) {
-    InitRef(array, count);
-  }
-
-  // Constructs from a native array. Copies the source.
-  NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
-    InitCopy(array, count);
-  }
-
-  // Copy constructor.
-  NativeArray(const NativeArray& rhs) {
-    (this->*rhs.clone_)(rhs.array_, rhs.size_);
-  }
-
-  ~NativeArray() {
-    if (clone_ != &NativeArray::InitRef)
-      delete[] array_;
-  }
-
-  // STL-style container methods.
-  size_t size() const { return size_; }
-  const_iterator begin() const { return array_; }
-  const_iterator end() const { return array_ + size_; }
-  bool operator==(const NativeArray& rhs) const {
-    return size() == rhs.size() &&
-        ArrayEq(begin(), size(), rhs.begin());
-  }
-
- private:
-  static_assert(!std::is_const<Element>::value, "Type must not be const");
-  static_assert(!std::is_reference<Element>::value,
-                "Type must not be a reference");
-
-  // Initializes this object with a copy of the input.
-  void InitCopy(const Element* array, size_t a_size) {
-    Element* const copy = new Element[a_size];
-    CopyArray(array, a_size, copy);
-    array_ = copy;
-    size_ = a_size;
-    clone_ = &NativeArray::InitCopy;
-  }
-
-  // Initializes this object with a reference of the input.
-  void InitRef(const Element* array, size_t a_size) {
-    array_ = array;
-    size_ = a_size;
-    clone_ = &NativeArray::InitRef;
-  }
-
-  const Element* array_;
-  size_t size_;
-  void (NativeArray::*clone_)(const Element*, size_t);
-};
-
-// Backport of std::index_sequence.
-template <size_t... Is>
-struct IndexSequence {
-  using type = IndexSequence;
-};
-
-// Double the IndexSequence, and one if plus_one is true.
-template <bool plus_one, typename T, size_t sizeofT>
-struct DoubleSequence;
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<true, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)..., 2 * sizeofT>;
-};
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<false, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)...>;
-};
-
-// Backport of std::make_index_sequence.
-// It uses O(ln(N)) instantiation depth.
-template <size_t N>
-struct MakeIndexSequenceImpl
-    : DoubleSequence<N % 2 == 1, typename MakeIndexSequenceImpl<N / 2>::type,
-                     N / 2>::type {};
-
-template <>
-struct MakeIndexSequenceImpl<0> : IndexSequence<> {};
-
-template <size_t N>
-using MakeIndexSequence = typename MakeIndexSequenceImpl<N>::type;
-
-template <typename... T>
-using IndexSequenceFor = typename MakeIndexSequence<sizeof...(T)>::type;
-
-template <size_t>
-struct Ignore {
-  Ignore(...);  // NOLINT
-};
-
-template <typename>
-struct ElemFromListImpl;
-template <size_t... I>
-struct ElemFromListImpl<IndexSequence<I...>> {
-  // We make Ignore a template to solve a problem with MSVC.
-  // A non-template Ignore would work fine with `decltype(Ignore(I))...`, but
-  // MSVC doesn't understand how to deal with that pack expansion.
-  // Use `0 * I` to have a single instantiation of Ignore.
-  template <typename R>
-  static R Apply(Ignore<0 * I>..., R (*)(), ...);
-};
-
-template <size_t N, typename... T>
-struct ElemFromList {
-  using type =
-      decltype(ElemFromListImpl<typename MakeIndexSequence<N>::type>::Apply(
-          static_cast<T (*)()>(nullptr)...));
-};
-
-struct FlatTupleConstructTag {};
-
-template <typename... T>
-class FlatTuple;
-
-template <typename Derived, size_t I>
-struct FlatTupleElemBase;
-
-template <typename... T, size_t I>
-struct FlatTupleElemBase<FlatTuple<T...>, I> {
-  using value_type = typename ElemFromList<I, T...>::type;
-  FlatTupleElemBase() = default;
-  template <typename Arg>
-  explicit FlatTupleElemBase(FlatTupleConstructTag, Arg&& t)
-      : value(std::forward<Arg>(t)) {}
-  value_type value;
-};
-
-template <typename Derived, typename Idx>
-struct FlatTupleBase;
-
-template <size_t... Idx, typename... T>
-struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
-    : FlatTupleElemBase<FlatTuple<T...>, Idx>... {
-  using Indices = IndexSequence<Idx...>;
-  FlatTupleBase() = default;
-  template <typename... Args>
-  explicit FlatTupleBase(FlatTupleConstructTag, Args&&... args)
-      : FlatTupleElemBase<FlatTuple<T...>, Idx>(FlatTupleConstructTag{},
-                                                std::forward<Args>(args))... {}
-
-  template <size_t I>
-  const typename ElemFromList<I, T...>::type& Get() const {
-    return FlatTupleElemBase<FlatTuple<T...>, I>::value;
-  }
-
-  template <size_t I>
-  typename ElemFromList<I, T...>::type& Get() {
-    return FlatTupleElemBase<FlatTuple<T...>, I>::value;
-  }
-
-  template <typename F>
-  auto Apply(F&& f) -> decltype(std::forward<F>(f)(this->Get<Idx>()...)) {
-    return std::forward<F>(f)(Get<Idx>()...);
-  }
-
-  template <typename F>
-  auto Apply(F&& f) const -> decltype(std::forward<F>(f)(this->Get<Idx>()...)) {
-    return std::forward<F>(f)(Get<Idx>()...);
-  }
-};
-
-// Analog to std::tuple but with different tradeoffs.
-// This class minimizes the template instantiation depth, thus allowing more
-// elements than std::tuple would. std::tuple has been seen to require an
-// instantiation depth of more than 10x the number of elements in some
-// implementations.
-// FlatTuple and ElemFromList are not recursive and have a fixed depth
-// regardless of T...
-// MakeIndexSequence, on the other hand, it is recursive but with an
-// instantiation depth of O(ln(N)).
-template <typename... T>
-class FlatTuple
-    : private FlatTupleBase<FlatTuple<T...>,
-                            typename MakeIndexSequence<sizeof...(T)>::type> {
-  using Indices = typename FlatTupleBase<
-      FlatTuple<T...>, typename MakeIndexSequence<sizeof...(T)>::type>::Indices;
-
- public:
-  FlatTuple() = default;
-  template <typename... Args>
-  explicit FlatTuple(FlatTupleConstructTag tag, Args&&... args)
-      : FlatTuple::FlatTupleBase(tag, std::forward<Args>(args)...) {}
-
-  using FlatTuple::FlatTupleBase::Apply;
-  using FlatTuple::FlatTupleBase::Get;
-};
-
-// Utility functions to be called with static_assert to induce deprecation
-// warnings.
-GTEST_INTERNAL_DEPRECATED(
-    "INSTANTIATE_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TEST_SUITE_P")
-constexpr bool InstantiateTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "TYPED_TEST_CASE_P is deprecated, please use "
-    "TYPED_TEST_SUITE_P")
-constexpr bool TypedTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "TYPED_TEST_CASE is deprecated, please use "
-    "TYPED_TEST_SUITE")
-constexpr bool TypedTestCaseIsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "REGISTER_TYPED_TEST_CASE_P is deprecated, please use "
-    "REGISTER_TYPED_TEST_SUITE_P")
-constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "INSTANTIATE_TYPED_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TYPED_TEST_SUITE_P")
-constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
-
-}  // namespace internal
-}  // namespace testing
-
-namespace std {
-// Some standard library implementations use `struct tuple_size` and some use
-// `class tuple_size`. Clang warns about the mismatch.
-// https://reviews.llvm.org/D55466
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmismatched-tags"
-#endif
-template <typename... Ts>
-struct tuple_size<testing::internal::FlatTuple<Ts...>>
-    : std::integral_constant<size_t, sizeof...(Ts)> {};
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-}  // namespace std
-
-#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
-  ::testing::internal::AssertHelper(result_type, file, line, message) \
-    = ::testing::Message()
-
-#define GTEST_MESSAGE_(message, result_type) \
-  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
-
-#define GTEST_FATAL_FAILURE_(message) \
-  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
-
-#define GTEST_NONFATAL_FAILURE_(message) \
-  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
-
-#define GTEST_SUCCESS_(message) \
-  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
-
-#define GTEST_SKIP_(message) \
-  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kSkip)
-
-// Suppress MSVC warning 4072 (unreachable code) for the code following
-// statement if it returns or throws (or doesn't return or throw in some
-// situations).
-// NOTE: The "else" is important to keep this expansion to prevent a top-level
-// "else" from attaching to our "if".
-#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
-  if (::testing::internal::AlwaysTrue()) {                        \
-    statement;                                                    \
-  } else                     /* NOLINT */                         \
-    static_assert(true, "")  // User must have a semicolon after expansion.
-
-#if GTEST_HAS_EXCEPTIONS
-
-namespace testing {
-namespace internal {
-
-class NeverThrown {
- public:
-  const char* what() const noexcept {
-    return "this exception should never be thrown";
-  }
-};
-
-}  // namespace internal
-}  // namespace testing
-
-#if GTEST_HAS_RTTI
-
-#define GTEST_EXCEPTION_TYPE_(e) ::testing::internal::GetTypeName(typeid(e))
-
-#else  // GTEST_HAS_RTTI
-
-#define GTEST_EXCEPTION_TYPE_(e) \
-  std::string { "an std::exception-derived error" }
-
-#endif  // GTEST_HAS_RTTI
-
-#define GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)   \
-  catch (typename std::conditional<                                            \
-         std::is_same<typename std::remove_cv<typename std::remove_reference<  \
-                          expected_exception>::type>::type,                    \
-                      std::exception>::value,                                  \
-         const ::testing::internal::NeverThrown&, const std::exception&>::type \
-             e) {                                                              \
-    gtest_msg.value = "Expected: " #statement                                  \
-                      " throws an exception of type " #expected_exception      \
-                      ".\n  Actual: it throws ";                               \
-    gtest_msg.value += GTEST_EXCEPTION_TYPE_(e);                               \
-    gtest_msg.value += " with description \"";                                 \
-    gtest_msg.value += e.what();                                               \
-    gtest_msg.value += "\".";                                                  \
-    goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);                \
-  }
-
-#else  // GTEST_HAS_EXCEPTIONS
-
-#define GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#define GTEST_TEST_THROW_(statement, expected_exception, fail)              \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                             \
-  if (::testing::internal::TrueWithString gtest_msg{}) {                    \
-    bool gtest_caught_expected = false;                                     \
-    try {                                                                   \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);            \
-    } catch (expected_exception const&) {                                   \
-      gtest_caught_expected = true;                                         \
-    }                                                                       \
-    GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)    \
-    catch (...) {                                                           \
-      gtest_msg.value = "Expected: " #statement                             \
-                        " throws an exception of type " #expected_exception \
-                        ".\n  Actual: it throws a different type.";         \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);           \
-    }                                                                       \
-    if (!gtest_caught_expected) {                                           \
-      gtest_msg.value = "Expected: " #statement                             \
-                        " throws an exception of type " #expected_exception \
-                        ".\n  Actual: it throws nothing.";                  \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);           \
-    }                                                                       \
-  } else /*NOLINT*/                                                         \
-    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__)                   \
-        : fail(gtest_msg.value.c_str())
-
-#if GTEST_HAS_EXCEPTIONS
-
-#define GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_()                \
-  catch (std::exception const& e) {                               \
-    gtest_msg.value = "it throws ";                               \
-    gtest_msg.value += GTEST_EXCEPTION_TYPE_(e);                  \
-    gtest_msg.value += " with description \"";                    \
-    gtest_msg.value += e.what();                                  \
-    gtest_msg.value += "\".";                                     \
-    goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
-  }
-
-#else  // GTEST_HAS_EXCEPTIONS
-
-#define GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_()
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#define GTEST_TEST_NO_THROW_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::TrueWithString gtest_msg{}) { \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_() \
-    catch (...) { \
-      gtest_msg.value = "it throws."; \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
-      fail(("Expected: " #statement " doesn't throw an exception.\n" \
-            "  Actual: " + gtest_msg.value).c_str())
-
-#define GTEST_TEST_ANY_THROW_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    bool gtest_caught_any = false; \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (...) { \
-      gtest_caught_any = true; \
-    } \
-    if (!gtest_caught_any) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
-      fail("Expected: " #statement " throws an exception.\n" \
-           "  Actual: it doesn't.")
-
-
-// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
-// either a boolean expression or an AssertionResult. text is a textual
-// representation of expression as it was passed into the EXPECT_TRUE.
-#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (const ::testing::AssertionResult gtest_ar_ = \
-      ::testing::AssertionResult(expression)) \
-    ; \
-  else \
-    fail(::testing::internal::GetBoolAssertionFailureMessage(\
-        gtest_ar_, text, #actual, #expected).c_str())
-
-#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
-      fail("Expected: " #statement " doesn't generate new fatal " \
-           "failures in the current thread.\n" \
-           "  Actual: it does.")
-
-// Expands to the name of the class that implements the given test.
-#define GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
-  test_suite_name##_##test_name##_Test
-
-// Helper macro for defining tests.
-#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)      \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                \
-                "test_suite_name must not be empty");                         \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                      \
-                "test_name must not be empty");                               \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                    \
-      : public parent_class {                                                 \
-   public:                                                                    \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;           \
-    ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default; \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
-                                                           test_name));       \
-    GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
-                                                           test_name));       \
-                                                                              \
-   private:                                                                   \
-    void TestBody() override;                                                 \
-    static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;     \
-  };                                                                          \
-                                                                              \
-  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,          \
-                                                    test_name)::test_info_ =  \
-      ::testing::internal::MakeAndRegisterTestInfo(                           \
-          #test_suite_name, #test_name, nullptr, nullptr,                     \
-          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),         \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),      \
-          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(    \
-              test_suite_name, test_name)>);                                  \
-  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the public API for death tests.  It is
-// #included by gtest.h so a user doesn't need to include this
-// directly.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines internal utilities needed for implementing
-// death tests.  They are subject to change without notice.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file implements just enough of the matcher interface to allow
-// EXPECT_DEATH and friends to accept a matcher argument.
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-
-#include <atomic>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <type_traits>
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Test - The Google C++ Testing and Mocking Framework
-//
-// This file implements a universal value printer that can print a
-// value of any type T:
-//
-//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
-//
-// A user can teach this function how to print a class type T by
-// defining either operator<<() or PrintTo() in the namespace that
-// defines T.  More specifically, the FIRST defined function in the
-// following list will be used (assuming T is defined in namespace
-// foo):
-//
-//   1. foo::PrintTo(const T&, ostream*)
-//   2. operator<<(ostream&, const T&) defined in either foo or the
-//      global namespace.
-//
-// However if T is an STL-style container then it is printed element-wise
-// unless foo::PrintTo(const T&, ostream*) is defined. Note that
-// operator<<() is ignored for container types.
-//
-// If none of the above is defined, it will print the debug string of
-// the value if it is a protocol buffer, or print the raw bytes in the
-// value otherwise.
-//
-// To aid debugging: when T is a reference type, the address of the
-// value is also printed; when T is a (const) char pointer, both the
-// pointer value and the NUL-terminated string it points to are
-// printed.
-//
-// We also provide some convenient wrappers:
-//
-//   // Prints a value to a string.  For a (const or not) char
-//   // pointer, the NUL-terminated string (but not the pointer) is
-//   // printed.
-//   std::string ::testing::PrintToString(const T& value);
-//
-//   // Prints a value tersely: for a reference type, the referenced
-//   // value (but not the address) is printed; for a (const or not) char
-//   // pointer, the NUL-terminated string (but not the pointer) is
-//   // printed.
-//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
-//
-//   // Prints value using the type inferred by the compiler.  The difference
-//   // from UniversalTersePrint() is that this function prints both the
-//   // pointer and the NUL-terminated string for a (const or not) char pointer.
-//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
-//
-//   // Prints the fields of a tuple tersely to a string vector, one
-//   // element for each field. Tuple support must be enabled in
-//   // gtest-port.h.
-//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
-//       const Tuple& value);
-//
-// Known limitation:
-//
-// The print primitives print the elements of an STL-style container
-// using the compiler-inferred type of *iter where iter is a
-// const_iterator of the container.  When const_iterator is an input
-// iterator but not a forward iterator, this inferred type may not
-// match value_type, and the print output may be incorrect.  In
-// practice, this is rarely a problem as for most containers
-// const_iterator is a forward iterator.  We'll fix this if there's an
-// actual need for it.  Note that this fix cannot rely on value_type
-// being defined as many user-defined container types don't have
-// value_type.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-
-#include <functional>
-#include <memory>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-
-namespace testing {
-
-// Definitions in the internal* namespaces are subject to change without notice.
-// DO NOT USE THEM IN USER CODE!
-namespace internal {
-
-template <typename T>
-void UniversalPrint(const T& value, ::std::ostream* os);
-
-// Used to print an STL-style container when the user doesn't define
-// a PrintTo() for it.
-struct ContainerPrinter {
-  template <typename T,
-            typename = typename std::enable_if<
-                (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
-                !IsRecursiveContainer<T>::value>::type>
-  static void PrintValue(const T& container, std::ostream* os) {
-    const size_t kMaxCount = 32;  // The maximum number of elements to print.
-    *os << '{';
-    size_t count = 0;
-    for (auto&& elem : container) {
-      if (count > 0) {
-        *os << ',';
-        if (count == kMaxCount) {  // Enough has been printed.
-          *os << " ...";
-          break;
-        }
-      }
-      *os << ' ';
-      // We cannot call PrintTo(elem, os) here as PrintTo() doesn't
-      // handle `elem` being a native array.
-      internal::UniversalPrint(elem, os);
-      ++count;
-    }
-
-    if (count > 0) {
-      *os << ' ';
-    }
-    *os << '}';
-  }
-};
-
-// Used to print a pointer that is neither a char pointer nor a member
-// pointer, when the user doesn't define PrintTo() for it.  (A member
-// variable pointer or member function pointer doesn't really point to
-// a location in the address space.  Their representation is
-// implementation-defined.  Therefore they will be printed as raw
-// bytes.)
-struct FunctionPointerPrinter {
-  template <typename T, typename = typename std::enable_if<
-                            std::is_function<T>::value>::type>
-  static void PrintValue(T* p, ::std::ostream* os) {
-    if (p == nullptr) {
-      *os << "NULL";
-    } else {
-      // T is a function type, so '*os << p' doesn't do what we want
-      // (it just prints p as bool).  We want to print p as a const
-      // void*.
-      *os << reinterpret_cast<const void*>(p);
-    }
-  }
-};
-
-struct PointerPrinter {
-  template <typename T>
-  static void PrintValue(T* p, ::std::ostream* os) {
-    if (p == nullptr) {
-      *os << "NULL";
-    } else {
-      // T is not a function type.  We just call << to print p,
-      // relying on ADL to pick up user-defined << for their pointer
-      // types, if any.
-      *os << p;
-    }
-  }
-};
-
-namespace internal_stream_operator_without_lexical_name_lookup {
-
-// The presence of an operator<< here will terminate lexical scope lookup
-// straight away (even though it cannot be a match because of its argument
-// types). Thus, the two operator<< calls in StreamPrinter will find only ADL
-// candidates.
-struct LookupBlocker {};
-void operator<<(LookupBlocker, LookupBlocker);
-
-struct StreamPrinter {
-  template <typename T,
-            // Don't accept member pointers here. We'd print them via implicit
-            // conversion to bool, which isn't useful.
-            typename = typename std::enable_if<
-                !std::is_member_pointer<T>::value>::type,
-            // Only accept types for which we can find a streaming operator via
-            // ADL (possibly involving implicit conversions).
-            typename = decltype(std::declval<std::ostream&>()
-                                << std::declval<const T&>())>
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    // Call streaming operator found by ADL, possibly with implicit conversions
-    // of the arguments.
-    *os << value;
-  }
-};
-
-}  // namespace internal_stream_operator_without_lexical_name_lookup
-
-struct ProtobufPrinter {
-  // We print a protobuf using its ShortDebugString() when the string
-  // doesn't exceed this many characters; otherwise we print it using
-  // DebugString() for better readability.
-  static const size_t kProtobufOneLinerMaxLength = 50;
-
-  template <typename T,
-            typename = typename std::enable_if<
-                internal::HasDebugStringAndShortDebugString<T>::value>::type>
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    std::string pretty_str = value.ShortDebugString();
-    if (pretty_str.length() > kProtobufOneLinerMaxLength) {
-      pretty_str = "\n" + value.DebugString();
-    }
-    *os << ("<" + pretty_str + ">");
-  }
-};
-
-struct ConvertibleToIntegerPrinter {
-  // Since T has no << operator or PrintTo() but can be implicitly
-  // converted to BiggestInt, we print it as a BiggestInt.
-  //
-  // Most likely T is an enum type (either named or unnamed), in which
-  // case printing it as an integer is the desired behavior.  In case
-  // T is not an enum, printing it as an integer is the best we can do
-  // given that it has no user-defined printer.
-  static void PrintValue(internal::BiggestInt value, ::std::ostream* os) {
-    *os << value;
-  }
-};
-
-struct ConvertibleToStringViewPrinter {
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  static void PrintValue(internal::StringView value, ::std::ostream* os) {
-    internal::UniversalPrint(value, os);
-  }
-#endif
-};
-
-
-// Prints the given number of bytes in the given object to the given
-// ostream.
-GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
-                                     size_t count,
-                                     ::std::ostream* os);
-struct RawBytesPrinter {
-  // SFINAE on `sizeof` to make sure we have a complete type.
-  template <typename T, size_t = sizeof(T)>
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    PrintBytesInObjectTo(
-        static_cast<const unsigned char*>(
-            // Load bearing cast to void* to support iOS
-            reinterpret_cast<const void*>(std::addressof(value))),
-        sizeof(value), os);
-  }
-};
-
-struct FallbackPrinter {
-  template <typename T>
-  static void PrintValue(const T&, ::std::ostream* os) {
-    *os << "(incomplete type)";
-  }
-};
-
-// Try every printer in order and return the first one that works.
-template <typename T, typename E, typename Printer, typename... Printers>
-struct FindFirstPrinter : FindFirstPrinter<T, E, Printers...> {};
-
-template <typename T, typename Printer, typename... Printers>
-struct FindFirstPrinter<
-    T, decltype(Printer::PrintValue(std::declval<const T&>(), nullptr)),
-    Printer, Printers...> {
-  using type = Printer;
-};
-
-// Select the best printer in the following order:
-//  - Print containers (they have begin/end/etc).
-//  - Print function pointers.
-//  - Print object pointers.
-//  - Use the stream operator, if available.
-//  - Print protocol buffers.
-//  - Print types convertible to BiggestInt.
-//  - Print types convertible to StringView, if available.
-//  - Fallback to printing the raw bytes of the object.
-template <typename T>
-void PrintWithFallback(const T& value, ::std::ostream* os) {
-  using Printer = typename FindFirstPrinter<
-      T, void, ContainerPrinter, FunctionPointerPrinter, PointerPrinter,
-      internal_stream_operator_without_lexical_name_lookup::StreamPrinter,
-      ProtobufPrinter, ConvertibleToIntegerPrinter,
-      ConvertibleToStringViewPrinter, RawBytesPrinter, FallbackPrinter>::type;
-  Printer::PrintValue(value, os);
-}
-
-// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
-// value of type ToPrint that is an operand of a comparison assertion
-// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
-// the comparison, and is used to help determine the best way to
-// format the value.  In particular, when the value is a C string
-// (char pointer) and the other operand is an STL string object, we
-// want to format the C string as a string, since we know it is
-// compared by value with the string object.  If the value is a char
-// pointer but the other operand is not an STL string object, we don't
-// know whether the pointer is supposed to point to a NUL-terminated
-// string, and thus want to print it as a pointer to be safe.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// The default case.
-template <typename ToPrint, typename OtherOperand>
-class FormatForComparison {
- public:
-  static ::std::string Format(const ToPrint& value) {
-    return ::testing::PrintToString(value);
-  }
-};
-
-// Array.
-template <typename ToPrint, size_t N, typename OtherOperand>
-class FormatForComparison<ToPrint[N], OtherOperand> {
- public:
-  static ::std::string Format(const ToPrint* value) {
-    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
-  }
-};
-
-// By default, print C string as pointers to be safe, as we don't know
-// whether they actually point to a NUL-terminated string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
-  template <typename OtherOperand>                                      \
-  class FormatForComparison<CharType*, OtherOperand> {                  \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(static_cast<const void*>(value)); \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
-#ifdef __cpp_char8_t
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char8_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char8_t);
-#endif
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char16_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char16_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char32_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char32_t);
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
-
-// If a C string is compared with an STL string object, we know it's meant
-// to point to a NUL-terminated string, and thus can print it as a string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
-  template <>                                                           \
-  class FormatForComparison<CharType*, OtherStringType> {               \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(value);                           \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
-#ifdef __cpp_char8_t
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char8_t, ::std::u8string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char8_t, ::std::u8string);
-#endif
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char16_t, ::std::u16string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char16_t, ::std::u16string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char32_t, ::std::u32string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char32_t, ::std::u32string);
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
-#endif
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
-
-// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
-// operand to be used in a failure message.  The type (but not value)
-// of the other operand may affect the format.  This allows us to
-// print a char* as a raw pointer when it is compared against another
-// char* or void*, and print it as a C string when it is compared
-// against an std::string object, for example.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename T1, typename T2>
-std::string FormatForComparisonFailureMessage(
-    const T1& value, const T2& /* other_operand */) {
-  return FormatForComparison<T1, T2>::Format(value);
-}
-
-// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
-// value to the given ostream.  The caller must ensure that
-// 'ostream_ptr' is not NULL, or the behavior is undefined.
-//
-// We define UniversalPrinter as a class template (as opposed to a
-// function template), as we need to partially specialize it for
-// reference types, which cannot be done with function templates.
-template <typename T>
-class UniversalPrinter;
-
-// Prints the given value using the << operator if it has one;
-// otherwise prints the bytes in it.  This is what
-// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
-// or overloaded for type T.
-//
-// A user can override this behavior for a class type Foo by defining
-// an overload of PrintTo() in the namespace where Foo is defined.  We
-// give the user this option as sometimes defining a << operator for
-// Foo is not desirable (e.g. the coding style may prevent doing it,
-// or there is already a << operator but it doesn't do what the user
-// wants).
-template <typename T>
-void PrintTo(const T& value, ::std::ostream* os) {
-  internal::PrintWithFallback(value, os);
-}
-
-// The following list of PrintTo() overloads tells
-// UniversalPrinter<T>::Print() how to print standard types (built-in
-// types, strings, plain arrays, and pointers).
-
-// Overloads for various char types.
-GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
-GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
-inline void PrintTo(char c, ::std::ostream* os) {
-  // When printing a plain char, we always treat it as unsigned.  This
-  // way, the output won't be affected by whether the compiler thinks
-  // char is signed or not.
-  PrintTo(static_cast<unsigned char>(c), os);
-}
-
-// Overloads for other simple built-in types.
-inline void PrintTo(bool x, ::std::ostream* os) {
-  *os << (x ? "true" : "false");
-}
-
-// Overload for wchar_t type.
-// Prints a wchar_t as a symbol if it is printable or as its internal
-// code otherwise and also as its decimal code (except for L'\0').
-// The L'\0' char is printed as "L'\\0'". The decimal code is printed
-// as signed integer when wchar_t is implemented by the compiler
-// as a signed type and is printed as an unsigned integer when wchar_t
-// is implemented as an unsigned type.
-GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
-
-GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os);
-inline void PrintTo(char16_t c, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<char32_t>(c), os);
-}
-#ifdef __cpp_char8_t
-inline void PrintTo(char8_t c, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<char32_t>(c), os);
-}
-#endif
-
-// Overloads for C strings.
-GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
-inline void PrintTo(char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const char*>(s), os);
-}
-
-// signed/unsigned char is often used for representing binary data, so
-// we print pointers to it as void* to be safe.
-inline void PrintTo(const signed char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(signed char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(unsigned char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-#ifdef __cpp_char8_t
-// Overloads for u8 strings.
-GTEST_API_ void PrintTo(const char8_t* s, ::std::ostream* os);
-inline void PrintTo(char8_t* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const char8_t*>(s), os);
-}
-#endif
-// Overloads for u16 strings.
-GTEST_API_ void PrintTo(const char16_t* s, ::std::ostream* os);
-inline void PrintTo(char16_t* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const char16_t*>(s), os);
-}
-// Overloads for u32 strings.
-GTEST_API_ void PrintTo(const char32_t* s, ::std::ostream* os);
-inline void PrintTo(char32_t* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const char32_t*>(s), os);
-}
-
-// MSVC can be configured to define wchar_t as a typedef of unsigned
-// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
-// type.  When wchar_t is a typedef, defining an overload for const
-// wchar_t* would cause unsigned short* be printed as a wide string,
-// possibly causing invalid memory accesses.
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-// Overloads for wide C strings
-GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
-inline void PrintTo(wchar_t* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
-}
-#endif
-
-// Overload for C arrays.  Multi-dimensional arrays are printed
-// properly.
-
-// Prints the given number of elements in an array, without printing
-// the curly braces.
-template <typename T>
-void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
-  UniversalPrint(a[0], os);
-  for (size_t i = 1; i != count; i++) {
-    *os << ", ";
-    UniversalPrint(a[i], os);
-  }
-}
-
-// Overloads for ::std::string.
-GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
-inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
-  PrintStringTo(s, os);
-}
-
-// Overloads for ::std::u8string
-#ifdef __cpp_char8_t
-GTEST_API_ void PrintU8StringTo(const ::std::u8string& s, ::std::ostream* os);
-inline void PrintTo(const ::std::u8string& s, ::std::ostream* os) {
-  PrintU8StringTo(s, os);
-}
-#endif
-
-// Overloads for ::std::u16string
-GTEST_API_ void PrintU16StringTo(const ::std::u16string& s, ::std::ostream* os);
-inline void PrintTo(const ::std::u16string& s, ::std::ostream* os) {
-  PrintU16StringTo(s, os);
-}
-
-// Overloads for ::std::u32string
-GTEST_API_ void PrintU32StringTo(const ::std::u32string& s, ::std::ostream* os);
-inline void PrintTo(const ::std::u32string& s, ::std::ostream* os) {
-  PrintU32StringTo(s, os);
-}
-
-// Overloads for ::std::wstring.
-#if GTEST_HAS_STD_WSTRING
-GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
-inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
-  PrintWideStringTo(s, os);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-// Overload for internal::StringView.
-inline void PrintTo(internal::StringView sp, ::std::ostream* os) {
-  PrintTo(::std::string(sp), os);
-}
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
-
-template <typename T>
-void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) {
-  UniversalPrinter<T&>::Print(ref.get(), os);
-}
-
-inline const void* VoidifyPointer(const void* p) { return p; }
-inline const void* VoidifyPointer(volatile const void* p) {
-  return const_cast<const void*>(p);
-}
-
-template <typename T, typename Ptr>
-void PrintSmartPointer(const Ptr& ptr, std::ostream* os, char) {
-  if (ptr == nullptr) {
-    *os << "(nullptr)";
-  } else {
-    // We can't print the value. Just print the pointer..
-    *os << "(" << (VoidifyPointer)(ptr.get()) << ")";
-  }
-}
-template <typename T, typename Ptr,
-          typename = typename std::enable_if<!std::is_void<T>::value &&
-                                             !std::is_array<T>::value>::type>
-void PrintSmartPointer(const Ptr& ptr, std::ostream* os, int) {
-  if (ptr == nullptr) {
-    *os << "(nullptr)";
-  } else {
-    *os << "(ptr = " << (VoidifyPointer)(ptr.get()) << ", value = ";
-    UniversalPrinter<T>::Print(*ptr, os);
-    *os << ")";
-  }
-}
-
-template <typename T, typename D>
-void PrintTo(const std::unique_ptr<T, D>& ptr, std::ostream* os) {
-  (PrintSmartPointer<T>)(ptr, os, 0);
-}
-
-template <typename T>
-void PrintTo(const std::shared_ptr<T>& ptr, std::ostream* os) {
-  (PrintSmartPointer<T>)(ptr, os, 0);
-}
-
-// Helper function for printing a tuple.  T must be instantiated with
-// a tuple type.
-template <typename T>
-void PrintTupleTo(const T&, std::integral_constant<size_t, 0>,
-                  ::std::ostream*) {}
-
-template <typename T, size_t I>
-void PrintTupleTo(const T& t, std::integral_constant<size_t, I>,
-                  ::std::ostream* os) {
-  PrintTupleTo(t, std::integral_constant<size_t, I - 1>(), os);
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (I > 1) {
-    GTEST_INTENTIONAL_CONST_COND_POP_()
-    *os << ", ";
-  }
-  UniversalPrinter<typename std::tuple_element<I - 1, T>::type>::Print(
-      std::get<I - 1>(t), os);
-}
-
-template <typename... Types>
-void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
-  *os << "(";
-  PrintTupleTo(t, std::integral_constant<size_t, sizeof...(Types)>(), os);
-  *os << ")";
-}
-
-// Overload for std::pair.
-template <typename T1, typename T2>
-void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
-  *os << '(';
-  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
-  // a reference type.  The same for printing value.second.
-  UniversalPrinter<T1>::Print(value.first, os);
-  *os << ", ";
-  UniversalPrinter<T2>::Print(value.second, os);
-  *os << ')';
-}
-
-// Implements printing a non-reference type T by letting the compiler
-// pick the right overload of PrintTo() for T.
-template <typename T>
-class UniversalPrinter {
- public:
-  // MSVC warns about adding const to a function type, so we want to
-  // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
-
-  // Note: we deliberately don't call this PrintTo(), as that name
-  // conflicts with ::testing::internal::PrintTo in the body of the
-  // function.
-  static void Print(const T& value, ::std::ostream* os) {
-    // By default, ::testing::internal::PrintTo() is used for printing
-    // the value.
-    //
-    // Thanks to Koenig look-up, if T is a class and has its own
-    // PrintTo() function defined in its namespace, that function will
-    // be visible here.  Since it is more specific than the generic ones
-    // in ::testing::internal, it will be picked by the compiler in the
-    // following statement - exactly what we want.
-    PrintTo(value, os);
-  }
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-};
-
-// Remove any const-qualifiers before passing a type to UniversalPrinter.
-template <typename T>
-class UniversalPrinter<const T> : public UniversalPrinter<T> {};
-
-#if GTEST_INTERNAL_HAS_ANY
-
-// Printer for std::any / absl::any
-
-template <>
-class UniversalPrinter<Any> {
- public:
-  static void Print(const Any& value, ::std::ostream* os) {
-    if (value.has_value()) {
-      *os << "value of type " << GetTypeName(value);
-    } else {
-      *os << "no value";
-    }
-  }
-
- private:
-  static std::string GetTypeName(const Any& value) {
-#if GTEST_HAS_RTTI
-    return internal::GetTypeName(value.type());
-#else
-    static_cast<void>(value);  // possibly unused
-    return "<unknown_type>";
-#endif  // GTEST_HAS_RTTI
-  }
-};
-
-#endif  // GTEST_INTERNAL_HAS_ANY
-
-#if GTEST_INTERNAL_HAS_OPTIONAL
-
-// Printer for std::optional / absl::optional
-
-template <typename T>
-class UniversalPrinter<Optional<T>> {
- public:
-  static void Print(const Optional<T>& value, ::std::ostream* os) {
-    *os << '(';
-    if (!value) {
-      *os << "nullopt";
-    } else {
-      UniversalPrint(*value, os);
-    }
-    *os << ')';
-  }
-};
-
-#endif  // GTEST_INTERNAL_HAS_OPTIONAL
-
-#if GTEST_INTERNAL_HAS_VARIANT
-
-// Printer for std::variant / absl::variant
-
-template <typename... T>
-class UniversalPrinter<Variant<T...>> {
- public:
-  static void Print(const Variant<T...>& value, ::std::ostream* os) {
-    *os << '(';
-#if GTEST_HAS_ABSL
-    absl::visit(Visitor{os, value.index()}, value);
-#else
-    std::visit(Visitor{os, value.index()}, value);
-#endif  // GTEST_HAS_ABSL
-    *os << ')';
-  }
-
- private:
-  struct Visitor {
-    template <typename U>
-    void operator()(const U& u) const {
-      *os << "'" << GetTypeName<U>() << "(index = " << index
-          << ")' with value ";
-      UniversalPrint(u, os);
-    }
-    ::std::ostream* os;
-    std::size_t index;
-  };
-};
-
-#endif  // GTEST_INTERNAL_HAS_VARIANT
-
-// UniversalPrintArray(begin, len, os) prints an array of 'len'
-// elements, starting at address 'begin'.
-template <typename T>
-void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
-  if (len == 0) {
-    *os << "{}";
-  } else {
-    *os << "{ ";
-    const size_t kThreshold = 18;
-    const size_t kChunkSize = 8;
-    // If the array has more than kThreshold elements, we'll have to
-    // omit some details by printing only the first and the last
-    // kChunkSize elements.
-    if (len <= kThreshold) {
-      PrintRawArrayTo(begin, len, os);
-    } else {
-      PrintRawArrayTo(begin, kChunkSize, os);
-      *os << ", ..., ";
-      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
-    }
-    *os << " }";
-  }
-}
-// This overload prints a (const) char array compactly.
-GTEST_API_ void UniversalPrintArray(
-    const char* begin, size_t len, ::std::ostream* os);
-
-#ifdef __cpp_char8_t
-// This overload prints a (const) char8_t array compactly.
-GTEST_API_ void UniversalPrintArray(const char8_t* begin, size_t len,
-                                    ::std::ostream* os);
-#endif
-
-// This overload prints a (const) char16_t array compactly.
-GTEST_API_ void UniversalPrintArray(const char16_t* begin, size_t len,
-                                    ::std::ostream* os);
-
-// This overload prints a (const) char32_t array compactly.
-GTEST_API_ void UniversalPrintArray(const char32_t* begin, size_t len,
-                                    ::std::ostream* os);
-
-// This overload prints a (const) wchar_t array compactly.
-GTEST_API_ void UniversalPrintArray(
-    const wchar_t* begin, size_t len, ::std::ostream* os);
-
-// Implements printing an array type T[N].
-template <typename T, size_t N>
-class UniversalPrinter<T[N]> {
- public:
-  // Prints the given array, omitting some elements when there are too
-  // many.
-  static void Print(const T (&a)[N], ::std::ostream* os) {
-    UniversalPrintArray(a, N, os);
-  }
-};
-
-// Implements printing a reference type T&.
-template <typename T>
-class UniversalPrinter<T&> {
- public:
-  // MSVC warns about adding const to a function type, so we want to
-  // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
-
-  static void Print(const T& value, ::std::ostream* os) {
-    // Prints the address of the value.  We use reinterpret_cast here
-    // as static_cast doesn't compile when T is a function type.
-    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
-
-    // Then prints the value itself.
-    UniversalPrint(value, os);
-  }
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-};
-
-// Prints a value tersely: for a reference type, the referenced value
-// (but not the address) is printed; for a (const) char pointer, the
-// NUL-terminated string (but not the pointer) is printed.
-
-template <typename T>
-class UniversalTersePrinter {
- public:
-  static void Print(const T& value, ::std::ostream* os) {
-    UniversalPrint(value, os);
-  }
-};
-template <typename T>
-class UniversalTersePrinter<T&> {
- public:
-  static void Print(const T& value, ::std::ostream* os) {
-    UniversalPrint(value, os);
-  }
-};
-template <typename T, size_t N>
-class UniversalTersePrinter<T[N]> {
- public:
-  static void Print(const T (&value)[N], ::std::ostream* os) {
-    UniversalPrinter<T[N]>::Print(value, os);
-  }
-};
-template <>
-class UniversalTersePrinter<const char*> {
- public:
-  static void Print(const char* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(std::string(str), os);
-    }
-  }
-};
-template <>
-class UniversalTersePrinter<char*> : public UniversalTersePrinter<const char*> {
-};
-
-#ifdef __cpp_char8_t
-template <>
-class UniversalTersePrinter<const char8_t*> {
- public:
-  static void Print(const char8_t* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(::std::u8string(str), os);
-    }
-  }
-};
-template <>
-class UniversalTersePrinter<char8_t*>
-    : public UniversalTersePrinter<const char8_t*> {};
-#endif
-
-template <>
-class UniversalTersePrinter<const char16_t*> {
- public:
-  static void Print(const char16_t* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(::std::u16string(str), os);
-    }
-  }
-};
-template <>
-class UniversalTersePrinter<char16_t*>
-    : public UniversalTersePrinter<const char16_t*> {};
-
-template <>
-class UniversalTersePrinter<const char32_t*> {
- public:
-  static void Print(const char32_t* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(::std::u32string(str), os);
-    }
-  }
-};
-template <>
-class UniversalTersePrinter<char32_t*>
-    : public UniversalTersePrinter<const char32_t*> {};
-
-#if GTEST_HAS_STD_WSTRING
-template <>
-class UniversalTersePrinter<const wchar_t*> {
- public:
-  static void Print(const wchar_t* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(::std::wstring(str), os);
-    }
-  }
-};
-#endif
-
-template <>
-class UniversalTersePrinter<wchar_t*> {
- public:
-  static void Print(wchar_t* str, ::std::ostream* os) {
-    UniversalTersePrinter<const wchar_t*>::Print(str, os);
-  }
-};
-
-template <typename T>
-void UniversalTersePrint(const T& value, ::std::ostream* os) {
-  UniversalTersePrinter<T>::Print(value, os);
-}
-
-// Prints a value using the type inferred by the compiler.  The
-// difference between this and UniversalTersePrint() is that for a
-// (const) char pointer, this prints both the pointer and the
-// NUL-terminated string.
-template <typename T>
-void UniversalPrint(const T& value, ::std::ostream* os) {
-  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
-  // UniversalPrinter with T directly.
-  typedef T T1;
-  UniversalPrinter<T1>::Print(value, os);
-}
-
-typedef ::std::vector< ::std::string> Strings;
-
-  // Tersely prints the first N fields of a tuple to a string vector,
-  // one element for each field.
-template <typename Tuple>
-void TersePrintPrefixToStrings(const Tuple&, std::integral_constant<size_t, 0>,
-                               Strings*) {}
-template <typename Tuple, size_t I>
-void TersePrintPrefixToStrings(const Tuple& t,
-                               std::integral_constant<size_t, I>,
-                               Strings* strings) {
-  TersePrintPrefixToStrings(t, std::integral_constant<size_t, I - 1>(),
-                            strings);
-  ::std::stringstream ss;
-  UniversalTersePrint(std::get<I - 1>(t), &ss);
-  strings->push_back(ss.str());
-}
-
-// Prints the fields of a tuple tersely to a string vector, one
-// element for each field.  See the comment before
-// UniversalTersePrint() for how we define "tersely".
-template <typename Tuple>
-Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
-  Strings result;
-  TersePrintPrefixToStrings(
-      value, std::integral_constant<size_t, std::tuple_size<Tuple>::value>(),
-      &result);
-  return result;
-}
-
-}  // namespace internal
-
-template <typename T>
-::std::string PrintToString(const T& value) {
-  ::std::stringstream ss;
-  internal::UniversalTersePrinter<T>::Print(value, &ss);
-  return ss.str();
-}
-
-}  // namespace testing
-
-// Include any custom printer added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// This file provides an injection point for custom printers in a local
-// installation of gTest.
-// It will be included from gtest-printers.h and the overrides in this file
-// will be visible to everyone.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-
-// MSVC warning C5046 is new as of VS2017 version 15.8.
-#if defined(_MSC_VER) && _MSC_VER >= 1915
-#define GTEST_MAYBE_5046_ 5046
-#else
-#define GTEST_MAYBE_5046_
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(
-    4251 GTEST_MAYBE_5046_ /* class A needs to have dll-interface to be used by
-                              clients of class B */
-    /* Symbol involving type with internal linkage not defined */)
-
-namespace testing {
-
-// To implement a matcher Foo for type T, define:
-//   1. a class FooMatcherMatcher that implements the matcher interface:
-//     using is_gtest_matcher = void;
-//     bool MatchAndExplain(const T&, std::ostream*);
-//       (MatchResultListener* can also be used instead of std::ostream*)
-//     void DescribeTo(std::ostream*);
-//     void DescribeNegationTo(std::ostream*);
-//
-//   2. a factory function that creates a Matcher<T> object from a
-//      FooMatcherMatcher.
-
-class MatchResultListener {
- public:
-  // Creates a listener object with the given underlying ostream.  The
-  // listener does not own the ostream, and does not dereference it
-  // in the constructor or destructor.
-  explicit MatchResultListener(::std::ostream* os) : stream_(os) {}
-  virtual ~MatchResultListener() = 0;  // Makes this class abstract.
-
-  // Streams x to the underlying ostream; does nothing if the ostream
-  // is NULL.
-  template <typename T>
-  MatchResultListener& operator<<(const T& x) {
-    if (stream_ != nullptr) *stream_ << x;
-    return *this;
-  }
-
-  // Returns the underlying ostream.
-  ::std::ostream* stream() { return stream_; }
-
-  // Returns true if and only if the listener is interested in an explanation
-  // of the match result.  A matcher's MatchAndExplain() method can use
-  // this information to avoid generating the explanation when no one
-  // intends to hear it.
-  bool IsInterested() const { return stream_ != nullptr; }
-
- private:
-  ::std::ostream* const stream_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
-};
-
-inline MatchResultListener::~MatchResultListener() {
-}
-
-// An instance of a subclass of this knows how to describe itself as a
-// matcher.
-class GTEST_API_ MatcherDescriberInterface {
- public:
-  virtual ~MatcherDescriberInterface() {}
-
-  // Describes this matcher to an ostream.  The function should print
-  // a verb phrase that describes the property a value matching this
-  // matcher should have.  The subject of the verb phrase is the value
-  // being matched.  For example, the DescribeTo() method of the Gt(7)
-  // matcher prints "is greater than 7".
-  virtual void DescribeTo(::std::ostream* os) const = 0;
-
-  // Describes the negation of this matcher to an ostream.  For
-  // example, if the description of this matcher is "is greater than
-  // 7", the negated description could be "is not greater than 7".
-  // You are not required to override this when implementing
-  // MatcherInterface, but it is highly advised so that your matcher
-  // can produce good error messages.
-  virtual void DescribeNegationTo(::std::ostream* os) const {
-    *os << "not (";
-    DescribeTo(os);
-    *os << ")";
-  }
-};
-
-// The implementation of a matcher.
-template <typename T>
-class MatcherInterface : public MatcherDescriberInterface {
- public:
-  // Returns true if and only if the matcher matches x; also explains the
-  // match result to 'listener' if necessary (see the next paragraph), in
-  // the form of a non-restrictive relative clause ("which ...",
-  // "whose ...", etc) that describes x.  For example, the
-  // MatchAndExplain() method of the Pointee(...) matcher should
-  // generate an explanation like "which points to ...".
-  //
-  // Implementations of MatchAndExplain() should add an explanation of
-  // the match result *if and only if* they can provide additional
-  // information that's not already present (or not obvious) in the
-  // print-out of x and the matcher's description.  Whether the match
-  // succeeds is not a factor in deciding whether an explanation is
-  // needed, as sometimes the caller needs to print a failure message
-  // when the match succeeds (e.g. when the matcher is used inside
-  // Not()).
-  //
-  // For example, a "has at least 10 elements" matcher should explain
-  // what the actual element count is, regardless of the match result,
-  // as it is useful information to the reader; on the other hand, an
-  // "is empty" matcher probably only needs to explain what the actual
-  // size is when the match fails, as it's redundant to say that the
-  // size is 0 when the value is already known to be empty.
-  //
-  // You should override this method when defining a new matcher.
-  //
-  // It's the responsibility of the caller (Google Test) to guarantee
-  // that 'listener' is not NULL.  This helps to simplify a matcher's
-  // implementation when it doesn't care about the performance, as it
-  // can talk to 'listener' without checking its validity first.
-  // However, in order to implement dummy listeners efficiently,
-  // listener->stream() may be NULL.
-  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
-
-  // Inherits these methods from MatcherDescriberInterface:
-  //   virtual void DescribeTo(::std::ostream* os) const = 0;
-  //   virtual void DescribeNegationTo(::std::ostream* os) const;
-};
-
-namespace internal {
-
-struct AnyEq {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a == b; }
-};
-struct AnyNe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a != b; }
-};
-struct AnyLt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a < b; }
-};
-struct AnyGt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a > b; }
-};
-struct AnyLe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a <= b; }
-};
-struct AnyGe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a >= b; }
-};
-
-// A match result listener that ignores the explanation.
-class DummyMatchResultListener : public MatchResultListener {
- public:
-  DummyMatchResultListener() : MatchResultListener(nullptr) {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
-};
-
-// A match result listener that forwards the explanation to a given
-// ostream.  The difference between this and MatchResultListener is
-// that the former is concrete.
-class StreamMatchResultListener : public MatchResultListener {
- public:
-  explicit StreamMatchResultListener(::std::ostream* os)
-      : MatchResultListener(os) {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
-};
-
-struct SharedPayloadBase {
-  std::atomic<int> ref{1};
-  void Ref() { ref.fetch_add(1, std::memory_order_relaxed); }
-  bool Unref() { return ref.fetch_sub(1, std::memory_order_acq_rel) == 1; }
-};
-
-template <typename T>
-struct SharedPayload : SharedPayloadBase {
-  explicit SharedPayload(const T& v) : value(v) {}
-  explicit SharedPayload(T&& v) : value(std::move(v)) {}
-
-  static void Destroy(SharedPayloadBase* shared) {
-    delete static_cast<SharedPayload*>(shared);
-  }
-
-  T value;
-};
-
-// An internal class for implementing Matcher<T>, which will derive
-// from it.  We put functionalities common to all Matcher<T>
-// specializations here to avoid code duplication.
-template <typename T>
-class MatcherBase : private MatcherDescriberInterface {
- public:
-  // Returns true if and only if the matcher matches x; also explains the
-  // match result to 'listener'.
-  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
-    GTEST_CHECK_(vtable_ != nullptr);
-    return vtable_->match_and_explain(*this, x, listener);
-  }
-
-  // Returns true if and only if this matcher matches x.
-  bool Matches(const T& x) const {
-    DummyMatchResultListener dummy;
-    return MatchAndExplain(x, &dummy);
-  }
-
-  // Describes this matcher to an ostream.
-  void DescribeTo(::std::ostream* os) const final {
-    GTEST_CHECK_(vtable_ != nullptr);
-    vtable_->describe(*this, os, false);
-  }
-
-  // Describes the negation of this matcher to an ostream.
-  void DescribeNegationTo(::std::ostream* os) const final {
-    GTEST_CHECK_(vtable_ != nullptr);
-    vtable_->describe(*this, os, true);
-  }
-
-  // Explains why x matches, or doesn't match, the matcher.
-  void ExplainMatchResultTo(const T& x, ::std::ostream* os) const {
-    StreamMatchResultListener listener(os);
-    MatchAndExplain(x, &listener);
-  }
-
-  // Returns the describer for this matcher object; retains ownership
-  // of the describer, which is only guaranteed to be alive when
-  // this matcher object is alive.
-  const MatcherDescriberInterface* GetDescriber() const {
-    if (vtable_ == nullptr) return nullptr;
-    return vtable_->get_describer(*this);
-  }
-
- protected:
-  MatcherBase() : vtable_(nullptr) {}
-
-  // Constructs a matcher from its implementation.
-  template <typename U>
-  explicit MatcherBase(const MatcherInterface<U>* impl) {
-    Init(impl);
-  }
-
-  template <typename M, typename = typename std::remove_reference<
-                            M>::type::is_gtest_matcher>
-  MatcherBase(M&& m) {  // NOLINT
-    Init(std::forward<M>(m));
-  }
-
-  MatcherBase(const MatcherBase& other)
-      : vtable_(other.vtable_), buffer_(other.buffer_) {
-    if (IsShared()) buffer_.shared->Ref();
-  }
-
-  MatcherBase& operator=(const MatcherBase& other) {
-    if (this == &other) return *this;
-    Destroy();
-    vtable_ = other.vtable_;
-    buffer_ = other.buffer_;
-    if (IsShared()) buffer_.shared->Ref();
-    return *this;
-  }
-
-  MatcherBase(MatcherBase&& other)
-      : vtable_(other.vtable_), buffer_(other.buffer_) {
-    other.vtable_ = nullptr;
-  }
-
-  MatcherBase& operator=(MatcherBase&& other) {
-    if (this == &other) return *this;
-    Destroy();
-    vtable_ = other.vtable_;
-    buffer_ = other.buffer_;
-    other.vtable_ = nullptr;
-    return *this;
-  }
-
-  ~MatcherBase() override { Destroy(); }
-
- private:
-  struct VTable {
-    bool (*match_and_explain)(const MatcherBase&, const T&,
-                              MatchResultListener*);
-    void (*describe)(const MatcherBase&, std::ostream*, bool negation);
-    // Returns the captured object if it implements the interface, otherwise
-    // returns the MatcherBase itself.
-    const MatcherDescriberInterface* (*get_describer)(const MatcherBase&);
-    // Called on shared instances when the reference count reaches 0.
-    void (*shared_destroy)(SharedPayloadBase*);
-  };
-
-  bool IsShared() const {
-    return vtable_ != nullptr && vtable_->shared_destroy != nullptr;
-  }
-
-  // If the implementation uses a listener, call that.
-  template <typename P>
-  static auto MatchAndExplainImpl(const MatcherBase& m, const T& value,
-                                  MatchResultListener* listener)
-      -> decltype(P::Get(m).MatchAndExplain(value, listener->stream())) {
-    return P::Get(m).MatchAndExplain(value, listener->stream());
-  }
-
-  template <typename P>
-  static auto MatchAndExplainImpl(const MatcherBase& m, const T& value,
-                                  MatchResultListener* listener)
-      -> decltype(P::Get(m).MatchAndExplain(value, listener)) {
-    return P::Get(m).MatchAndExplain(value, listener);
-  }
-
-  template <typename P>
-  static void DescribeImpl(const MatcherBase& m, std::ostream* os,
-                           bool negation) {
-    if (negation) {
-      P::Get(m).DescribeNegationTo(os);
-    } else {
-      P::Get(m).DescribeTo(os);
-    }
-  }
-
-  template <typename P>
-  static const MatcherDescriberInterface* GetDescriberImpl(
-      const MatcherBase& m) {
-    // If the impl is a MatcherDescriberInterface, then return it.
-    // Otherwise use MatcherBase itself.
-    // This allows us to implement the GetDescriber() function without support
-    // from the impl, but some users really want to get their impl back when
-    // they call GetDescriber().
-    // We use std::get on a tuple as a workaround of not having `if constexpr`.
-    return std::get<(
-        std::is_convertible<decltype(&P::Get(m)),
-                            const MatcherDescriberInterface*>::value
-            ? 1
-            : 0)>(std::make_tuple(&m, &P::Get(m)));
-  }
-
-  template <typename P>
-  const VTable* GetVTable() {
-    static constexpr VTable kVTable = {&MatchAndExplainImpl<P>,
-                                       &DescribeImpl<P>, &GetDescriberImpl<P>,
-                                       P::shared_destroy};
-    return &kVTable;
-  }
-
-  union Buffer {
-    // Add some types to give Buffer some common alignment/size use cases.
-    void* ptr;
-    double d;
-    int64_t i;
-    // And add one for the out-of-line cases.
-    SharedPayloadBase* shared;
-  };
-
-  void Destroy() {
-    if (IsShared() && buffer_.shared->Unref()) {
-      vtable_->shared_destroy(buffer_.shared);
-    }
-  }
-
-  template <typename M>
-  static constexpr bool IsInlined() {
-    return sizeof(M) <= sizeof(Buffer) && alignof(M) <= alignof(Buffer) &&
-           std::is_trivially_copy_constructible<M>::value &&
-           std::is_trivially_destructible<M>::value;
-  }
-
-  template <typename M, bool = MatcherBase::IsInlined<M>()>
-  struct ValuePolicy {
-    static const M& Get(const MatcherBase& m) {
-      // When inlined along with Init, need to be explicit to avoid violating
-      // strict aliasing rules.
-      const M *ptr = static_cast<const M*>(
-          static_cast<const void*>(&m.buffer_));
-      return *ptr;
-    }
-    static void Init(MatcherBase& m, M impl) {
-      ::new (static_cast<void*>(&m.buffer_)) M(impl);
-    }
-    static constexpr auto shared_destroy = nullptr;
-  };
-
-  template <typename M>
-  struct ValuePolicy<M, false> {
-    using Shared = SharedPayload<M>;
-    static const M& Get(const MatcherBase& m) {
-      return static_cast<Shared*>(m.buffer_.shared)->value;
-    }
-    template <typename Arg>
-    static void Init(MatcherBase& m, Arg&& arg) {
-      m.buffer_.shared = new Shared(std::forward<Arg>(arg));
-    }
-    static constexpr auto shared_destroy = &Shared::Destroy;
-  };
-
-  template <typename U, bool B>
-  struct ValuePolicy<const MatcherInterface<U>*, B> {
-    using M = const MatcherInterface<U>;
-    using Shared = SharedPayload<std::unique_ptr<M>>;
-    static const M& Get(const MatcherBase& m) {
-      return *static_cast<Shared*>(m.buffer_.shared)->value;
-    }
-    static void Init(MatcherBase& m, M* impl) {
-      m.buffer_.shared = new Shared(std::unique_ptr<M>(impl));
-    }
-
-    static constexpr auto shared_destroy = &Shared::Destroy;
-  };
-
-  template <typename M>
-  void Init(M&& m) {
-    using MM = typename std::decay<M>::type;
-    using Policy = ValuePolicy<MM>;
-    vtable_ = GetVTable<Policy>();
-    Policy::Init(*this, std::forward<M>(m));
-  }
-
-  const VTable* vtable_;
-  Buffer buffer_;
-};
-
-}  // namespace internal
-
-// A Matcher<T> is a copyable and IMMUTABLE (except by assignment)
-// object that can check whether a value of type T matches.  The
-// implementation of Matcher<T> is just a std::shared_ptr to const
-// MatcherInterface<T>.  Don't inherit from Matcher!
-template <typename T>
-class Matcher : public internal::MatcherBase<T> {
- public:
-  // Constructs a null matcher.  Needed for storing Matcher objects in STL
-  // containers.  A default-constructed matcher is not yet initialized.  You
-  // cannot use it until a valid value has been assigned to it.
-  explicit Matcher() {}  // NOLINT
-
-  // Constructs a matcher from its implementation.
-  explicit Matcher(const MatcherInterface<const T&>* impl)
-      : internal::MatcherBase<T>(impl) {}
-
-  template <typename U>
-  explicit Matcher(
-      const MatcherInterface<U>* impl,
-      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
-          nullptr)
-      : internal::MatcherBase<T>(impl) {}
-
-  template <typename M, typename = typename std::remove_reference<
-                            M>::type::is_gtest_matcher>
-  Matcher(M&& m) : internal::MatcherBase<T>(std::forward<M>(m)) {}  // NOLINT
-
-  // Implicit constructor here allows people to write
-  // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes
-  Matcher(T value);  // NOLINT
-};
-
-// The following two specializations allow the user to write str
-// instead of Eq(str) and "foo" instead of Eq("foo") when a std::string
-// matcher is expected.
-template <>
-class GTEST_API_ Matcher<const std::string&>
-    : public internal::MatcherBase<const std::string&> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const std::string&>* impl)
-      : internal::MatcherBase<const std::string&>(impl) {}
-
-  template <typename M, typename = typename std::remove_reference<
-                            M>::type::is_gtest_matcher>
-  Matcher(M&& m)  // NOLINT
-      : internal::MatcherBase<const std::string&>(std::forward<M>(m)) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-};
-
-template <>
-class GTEST_API_ Matcher<std::string>
-    : public internal::MatcherBase<std::string> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const std::string&>* impl)
-      : internal::MatcherBase<std::string>(impl) {}
-  explicit Matcher(const MatcherInterface<std::string>* impl)
-      : internal::MatcherBase<std::string>(impl) {}
-
-  template <typename M, typename = typename std::remove_reference<
-                            M>::type::is_gtest_matcher>
-  Matcher(M&& m)  // NOLINT
-      : internal::MatcherBase<std::string>(std::forward<M>(m)) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-};
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-// The following two specializations allow the user to write str
-// instead of Eq(str) and "foo" instead of Eq("foo") when a absl::string_view
-// matcher is expected.
-template <>
-class GTEST_API_ Matcher<const internal::StringView&>
-    : public internal::MatcherBase<const internal::StringView&> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
-      : internal::MatcherBase<const internal::StringView&>(impl) {}
-
-  template <typename M, typename = typename std::remove_reference<
-                            M>::type::is_gtest_matcher>
-  Matcher(M&& m)  // NOLINT
-      : internal::MatcherBase<const internal::StringView&>(std::forward<M>(m)) {
-  }
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-
-  // Allows the user to pass absl::string_views or std::string_views directly.
-  Matcher(internal::StringView s);  // NOLINT
-};
-
-template <>
-class GTEST_API_ Matcher<internal::StringView>
-    : public internal::MatcherBase<internal::StringView> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
-      : internal::MatcherBase<internal::StringView>(impl) {}
-  explicit Matcher(const MatcherInterface<internal::StringView>* impl)
-      : internal::MatcherBase<internal::StringView>(impl) {}
-
-  template <typename M, typename = typename std::remove_reference<
-                            M>::type::is_gtest_matcher>
-  Matcher(M&& m)  // NOLINT
-      : internal::MatcherBase<internal::StringView>(std::forward<M>(m)) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-
-  // Allows the user to pass absl::string_views or std::string_views directly.
-  Matcher(internal::StringView s);  // NOLINT
-};
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-// Prints a matcher in a human-readable format.
-template <typename T>
-std::ostream& operator<<(std::ostream& os, const Matcher<T>& matcher) {
-  matcher.DescribeTo(&os);
-  return os;
-}
-
-// The PolymorphicMatcher class template makes it easy to implement a
-// polymorphic matcher (i.e. a matcher that can match values of more
-// than one type, e.g. Eq(n) and NotNull()).
-//
-// To define a polymorphic matcher, a user should provide an Impl
-// class that has a DescribeTo() method and a DescribeNegationTo()
-// method, and define a member function (or member function template)
-//
-//   bool MatchAndExplain(const Value& value,
-//                        MatchResultListener* listener) const;
-//
-// See the definition of NotNull() for a complete example.
-template <class Impl>
-class PolymorphicMatcher {
- public:
-  explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {}
-
-  // Returns a mutable reference to the underlying matcher
-  // implementation object.
-  Impl& mutable_impl() { return impl_; }
-
-  // Returns an immutable reference to the underlying matcher
-  // implementation object.
-  const Impl& impl() const { return impl_; }
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new MonomorphicImpl<const T&>(impl_));
-  }
-
- private:
-  template <typename T>
-  class MonomorphicImpl : public MatcherInterface<T> {
-   public:
-    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
-
-    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      impl_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
-      return impl_.MatchAndExplain(x, listener);
-    }
-
-   private:
-    const Impl impl_;
-  };
-
-  Impl impl_;
-};
-
-// Creates a matcher from its implementation.
-// DEPRECATED: Especially in the generic code, prefer:
-//   Matcher<T>(new MyMatcherImpl<const T&>(...));
-//
-// MakeMatcher may create a Matcher that accepts its argument by value, which
-// leads to unnecessary copies & lack of support for non-copyable types.
-template <typename T>
-inline Matcher<T> MakeMatcher(const MatcherInterface<T>* impl) {
-  return Matcher<T>(impl);
-}
-
-// Creates a polymorphic matcher from its implementation.  This is
-// easier to use than the PolymorphicMatcher<Impl> constructor as it
-// doesn't require you to explicitly write the template argument, e.g.
-//
-//   MakePolymorphicMatcher(foo);
-// vs
-//   PolymorphicMatcher<TypeOfFoo>(foo);
-template <class Impl>
-inline PolymorphicMatcher<Impl> MakePolymorphicMatcher(const Impl& impl) {
-  return PolymorphicMatcher<Impl>(impl);
-}
-
-namespace internal {
-// Implements a matcher that compares a given value with a
-// pre-supplied value using one of the ==, <=, <, etc, operators.  The
-// two values being compared don't have to have the same type.
-//
-// The matcher defined here is polymorphic (for example, Eq(5) can be
-// used to match an int, a short, a double, etc).  Therefore we use
-// a template type conversion operator in the implementation.
-//
-// The following template definition assumes that the Rhs parameter is
-// a "bare" type (i.e. neither 'const T' nor 'T&').
-template <typename D, typename Rhs, typename Op>
-class ComparisonBase {
- public:
-  explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {}
-
-  using is_gtest_matcher = void;
-
-  template <typename Lhs>
-  bool MatchAndExplain(const Lhs& lhs, std::ostream*) const {
-    return Op()(lhs, Unwrap(rhs_));
-  }
-  void DescribeTo(std::ostream* os) const {
-    *os << D::Desc() << " ";
-    UniversalPrint(Unwrap(rhs_), os);
-  }
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << D::NegatedDesc() << " ";
-    UniversalPrint(Unwrap(rhs_), os);
-  }
-
- private:
-  template <typename T>
-  static const T& Unwrap(const T& v) {
-    return v;
-  }
-  template <typename T>
-  static const T& Unwrap(std::reference_wrapper<T> v) {
-    return v;
-  }
-
-  Rhs rhs_;
-};
-
-template <typename Rhs>
-class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
- public:
-  explicit EqMatcher(const Rhs& rhs)
-      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) { }
-  static const char* Desc() { return "is equal to"; }
-  static const char* NegatedDesc() { return "isn't equal to"; }
-};
-template <typename Rhs>
-class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
- public:
-  explicit NeMatcher(const Rhs& rhs)
-      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) { }
-  static const char* Desc() { return "isn't equal to"; }
-  static const char* NegatedDesc() { return "is equal to"; }
-};
-template <typename Rhs>
-class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
- public:
-  explicit LtMatcher(const Rhs& rhs)
-      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) { }
-  static const char* Desc() { return "is <"; }
-  static const char* NegatedDesc() { return "isn't <"; }
-};
-template <typename Rhs>
-class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
- public:
-  explicit GtMatcher(const Rhs& rhs)
-      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) { }
-  static const char* Desc() { return "is >"; }
-  static const char* NegatedDesc() { return "isn't >"; }
-};
-template <typename Rhs>
-class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
- public:
-  explicit LeMatcher(const Rhs& rhs)
-      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) { }
-  static const char* Desc() { return "is <="; }
-  static const char* NegatedDesc() { return "isn't <="; }
-};
-template <typename Rhs>
-class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
- public:
-  explicit GeMatcher(const Rhs& rhs)
-      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) { }
-  static const char* Desc() { return "is >="; }
-  static const char* NegatedDesc() { return "isn't >="; }
-};
-
-template <typename T, typename = typename std::enable_if<
-                          std::is_constructible<std::string, T>::value>::type>
-using StringLike = T;
-
-// Implements polymorphic matchers MatchesRegex(regex) and
-// ContainsRegex(regex), which can be used as a Matcher<T> as long as
-// T can be converted to a string.
-class MatchesRegexMatcher {
- public:
-  MatchesRegexMatcher(const RE* regex, bool full_match)
-      : regex_(regex), full_match_(full_match) {}
-
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  bool MatchAndExplain(const internal::StringView& s,
-                       MatchResultListener* listener) const {
-    return MatchAndExplain(std::string(s), listener);
-  }
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(std::string(s), listener);
-  }
-
-  // Matches anything that can convert to std::string.
-  //
-  // This is a template, not just a plain function with const std::string&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <class MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const std::string& s2(s);
-    return full_match_ ? RE::FullMatch(s2, *regex_)
-                       : RE::PartialMatch(s2, *regex_);
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << (full_match_ ? "matches" : "contains") << " regular expression ";
-    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't " << (full_match_ ? "match" : "contain")
-        << " regular expression ";
-    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
-  }
-
- private:
-  const std::shared_ptr<const RE> regex_;
-  const bool full_match_;
-};
-}  // namespace internal
-
-// Matches a string that fully matches regular expression 'regex'.
-// The matcher takes ownership of 'regex'.
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
-    const internal::RE* regex) {
-  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, true));
-}
-template <typename T = std::string>
-PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
-    const internal::StringLike<T>& regex) {
-  return MatchesRegex(new internal::RE(std::string(regex)));
-}
-
-// Matches a string that contains regular expression 'regex'.
-// The matcher takes ownership of 'regex'.
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
-    const internal::RE* regex) {
-  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, false));
-}
-template <typename T = std::string>
-PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
-    const internal::StringLike<T>& regex) {
-  return ContainsRegex(new internal::RE(std::string(regex)));
-}
-
-// Creates a polymorphic matcher that matches anything equal to x.
-// Note: if the parameter of Eq() were declared as const T&, Eq("foo")
-// wouldn't compile.
-template <typename T>
-inline internal::EqMatcher<T> Eq(T x) { return internal::EqMatcher<T>(x); }
-
-// Constructs a Matcher<T> from a 'value' of type T.  The constructed
-// matcher matches any value that's equal to 'value'.
-template <typename T>
-Matcher<T>::Matcher(T value) { *this = Eq(value); }
-
-// Creates a monomorphic matcher that matches anything with type Lhs
-// and equal to rhs.  A user may need to use this instead of Eq(...)
-// in order to resolve an overloading ambiguity.
-//
-// TypedEq<T>(x) is just a convenient short-hand for Matcher<T>(Eq(x))
-// or Matcher<T>(x), but more readable than the latter.
-//
-// We could define similar monomorphic matchers for other comparison
-// operations (e.g. TypedLt, TypedGe, and etc), but decided not to do
-// it yet as those are used much less than Eq() in practice.  A user
-// can always write Matcher<T>(Lt(5)) to be explicit about the type,
-// for example.
-template <typename Lhs, typename Rhs>
-inline Matcher<Lhs> TypedEq(const Rhs& rhs) { return Eq(rhs); }
-
-// Creates a polymorphic matcher that matches anything >= x.
-template <typename Rhs>
-inline internal::GeMatcher<Rhs> Ge(Rhs x) {
-  return internal::GeMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything > x.
-template <typename Rhs>
-inline internal::GtMatcher<Rhs> Gt(Rhs x) {
-  return internal::GtMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything <= x.
-template <typename Rhs>
-inline internal::LeMatcher<Rhs> Le(Rhs x) {
-  return internal::LeMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything < x.
-template <typename Rhs>
-inline internal::LtMatcher<Rhs> Lt(Rhs x) {
-  return internal::LtMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything != x.
-template <typename Rhs>
-inline internal::NeMatcher<Rhs> Ne(Rhs x) {
-  return internal::NeMatcher<Rhs>(x);
-}
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-
-#include <stdio.h>
-#include <memory>
-
-namespace testing {
-namespace internal {
-
-GTEST_DECLARE_string_(internal_run_death_test);
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kDeathTestStyleFlag[] = "death_test_style";
-const char kDeathTestUseFork[] = "death_test_use_fork";
-const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
-
-#if GTEST_HAS_DEATH_TEST
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// DeathTest is a class that hides much of the complexity of the
-// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
-// returns a concrete class that depends on the prevailing death test
-// style, as defined by the --gtest_death_test_style and/or
-// --gtest_internal_run_death_test flags.
-
-// In describing the results of death tests, these terms are used with
-// the corresponding definitions:
-//
-// exit status:  The integer exit information in the format specified
-//               by wait(2)
-// exit code:    The integer code passed to exit(3), _exit(2), or
-//               returned from main()
-class GTEST_API_ DeathTest {
- public:
-  // Create returns false if there was an error determining the
-  // appropriate action to take for the current death test; for example,
-  // if the gtest_death_test_style flag is set to an invalid value.
-  // The LastMessage method will return a more detailed message in that
-  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
-  // argument is set.  If the death test should be skipped, the pointer
-  // is set to NULL; otherwise, it is set to the address of a new concrete
-  // DeathTest object that controls the execution of the current test.
-  static bool Create(const char* statement, Matcher<const std::string&> matcher,
-                     const char* file, int line, DeathTest** test);
-  DeathTest();
-  virtual ~DeathTest() { }
-
-  // A helper class that aborts a death test when it's deleted.
-  class ReturnSentinel {
-   public:
-    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
-    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
-   private:
-    DeathTest* const test_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
-  } GTEST_ATTRIBUTE_UNUSED_;
-
-  // An enumeration of possible roles that may be taken when a death
-  // test is encountered.  EXECUTE means that the death test logic should
-  // be executed immediately.  OVERSEE means that the program should prepare
-  // the appropriate environment for a child process to execute the death
-  // test, then wait for it to complete.
-  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
-
-  // An enumeration of the three reasons that a test might be aborted.
-  enum AbortReason {
-    TEST_ENCOUNTERED_RETURN_STATEMENT,
-    TEST_THREW_EXCEPTION,
-    TEST_DID_NOT_DIE
-  };
-
-  // Assumes one of the above roles.
-  virtual TestRole AssumeRole() = 0;
-
-  // Waits for the death test to finish and returns its status.
-  virtual int Wait() = 0;
-
-  // Returns true if the death test passed; that is, the test process
-  // exited during the test, its exit status matches a user-supplied
-  // predicate, and its stderr output matches a user-supplied regular
-  // expression.
-  // The user-supplied predicate may be a macro expression rather
-  // than a function pointer or functor, or else Wait and Passed could
-  // be combined.
-  virtual bool Passed(bool exit_status_ok) = 0;
-
-  // Signals that the death test did not die as expected.
-  virtual void Abort(AbortReason reason) = 0;
-
-  // Returns a human-readable outcome message regarding the outcome of
-  // the last death test.
-  static const char* LastMessage();
-
-  static void set_last_death_test_message(const std::string& message);
-
- private:
-  // A string containing a description of the outcome of the last death test.
-  static std::string last_death_test_message_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
-};
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Factory interface for death tests.  May be mocked out for testing.
-class DeathTestFactory {
- public:
-  virtual ~DeathTestFactory() { }
-  virtual bool Create(const char* statement,
-                      Matcher<const std::string&> matcher, const char* file,
-                      int line, DeathTest** test) = 0;
-};
-
-// A concrete DeathTestFactory implementation for normal use.
-class DefaultDeathTestFactory : public DeathTestFactory {
- public:
-  bool Create(const char* statement, Matcher<const std::string&> matcher,
-              const char* file, int line, DeathTest** test) override;
-};
-
-// Returns true if exit_status describes a process that was terminated
-// by a signal, or exited normally with a nonzero exit code.
-GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
-
-// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
-// and interpreted as a regex (rather than an Eq matcher) for legacy
-// compatibility.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    ::testing::internal::RE regex) {
-  return ContainsRegex(regex.pattern());
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
-  return ContainsRegex(regex);
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    const ::std::string& regex) {
-  return ContainsRegex(regex);
-}
-
-// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
-// used directly.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    Matcher<const ::std::string&> matcher) {
-  return matcher;
-}
-
-// Traps C++ exceptions escaping statement and reports them as test
-// failures. Note that trapping SEH exceptions is not implemented here.
-# if GTEST_HAS_EXCEPTIONS
-#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
-  try { \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-  } catch (const ::std::exception& gtest_exception) { \
-    fprintf(\
-        stderr, \
-        "\n%s: Caught std::exception-derived exception escaping the " \
-        "death test statement. Exception message: %s\n", \
-        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
-        gtest_exception.what()); \
-    fflush(stderr); \
-    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
-  } catch (...) { \
-    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
-  }
-
-# else
-#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
-  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-
-# endif
-
-// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
-// ASSERT_EXIT*, and EXPECT_EXIT*.
-#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)        \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
-  if (::testing::internal::AlwaysTrue()) {                                     \
-    ::testing::internal::DeathTest* gtest_dt;                                  \
-    if (!::testing::internal::DeathTest::Create(                               \
-            #statement,                                                        \
-            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),       \
-            __FILE__, __LINE__, &gtest_dt)) {                                  \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
-    }                                                                          \
-    if (gtest_dt != nullptr) {                                                 \
-      std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
-      switch (gtest_dt->AssumeRole()) {                                        \
-        case ::testing::internal::DeathTest::OVERSEE_TEST:                     \
-          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                \
-            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                  \
-          }                                                                    \
-          break;                                                               \
-        case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
-          ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
-              gtest_dt);                                                       \
-          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
-          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
-          break;                                                               \
-        }                                                                      \
-        default:                                                               \
-          break;                                                               \
-      }                                                                        \
-    }                                                                          \
-  } else                                                                       \
-    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                \
-        : fail(::testing::internal::DeathTest::LastMessage())
-// The symbol "fail" here expands to something into which a message
-// can be streamed.
-
-// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
-// NDEBUG mode. In this case we need the statements to be executed and the macro
-// must accept a streamed message even though the message is never printed.
-// The regex object is not evaluated, but it is used to prevent "unused"
-// warnings and to avoid an expression that doesn't compile in debug mode.
-#define GTEST_EXECUTE_STATEMENT_(statement, regex_or_matcher)    \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                  \
-  if (::testing::internal::AlwaysTrue()) {                       \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);   \
-  } else if (!::testing::internal::AlwaysTrue()) {               \
-    ::testing::internal::MakeDeathTestMatcher(regex_or_matcher); \
-  } else                                                         \
-    ::testing::Message()
-
-// A class representing the parsed contents of the
-// --gtest_internal_run_death_test flag, as it existed when
-// RUN_ALL_TESTS was called.
-class InternalRunDeathTestFlag {
- public:
-  InternalRunDeathTestFlag(const std::string& a_file,
-                           int a_line,
-                           int an_index,
-                           int a_write_fd)
-      : file_(a_file), line_(a_line), index_(an_index),
-        write_fd_(a_write_fd) {}
-
-  ~InternalRunDeathTestFlag() {
-    if (write_fd_ >= 0)
-      posix::Close(write_fd_);
-  }
-
-  const std::string& file() const { return file_; }
-  int line() const { return line_; }
-  int index() const { return index_; }
-  int write_fd() const { return write_fd_; }
-
- private:
-  std::string file_;
-  int line_;
-  int index_;
-  int write_fd_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
-};
-
-// Returns a newly created InternalRunDeathTestFlag object with fields
-// initialized from the GTEST_FLAG(internal_run_death_test) flag if
-// the flag is specified; otherwise returns NULL.
-InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-
-namespace testing {
-
-// This flag controls the style of death tests.  Valid values are "threadsafe",
-// meaning that the death test child process will re-execute the test binary
-// from the start, running only a single death test, or "fast",
-// meaning that the child process will execute the test logic immediately
-// after forking.
-GTEST_DECLARE_string_(death_test_style);
-
-#if GTEST_HAS_DEATH_TEST
-
-namespace internal {
-
-// Returns a Boolean value indicating whether the caller is currently
-// executing in the context of the death test child process.  Tools such as
-// Valgrind heap checkers may need this to modify their behavior in death
-// tests.  IMPORTANT: This is an internal utility.  Using it may break the
-// implementation of death tests.  User code MUST NOT use it.
-GTEST_API_ bool InDeathTestChild();
-
-}  // namespace internal
-
-// The following macros are useful for writing death tests.
-
-// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
-// executed:
-//
-//   1. It generates a warning if there is more than one active
-//   thread.  This is because it's safe to fork() or clone() only
-//   when there is a single thread.
-//
-//   2. The parent process clone()s a sub-process and runs the death
-//   test in it; the sub-process exits with code 0 at the end of the
-//   death test, if it hasn't exited already.
-//
-//   3. The parent process waits for the sub-process to terminate.
-//
-//   4. The parent process checks the exit code and error message of
-//   the sub-process.
-//
-// Examples:
-//
-//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
-//   for (int i = 0; i < 5; i++) {
-//     EXPECT_DEATH(server.ProcessRequest(i),
-//                  "Invalid request .* in ProcessRequest()")
-//                  << "Failed to die on request " << i;
-//   }
-//
-//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
-//
-//   bool KilledBySIGHUP(int exit_code) {
-//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
-//   }
-//
-//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
-//
-// The final parameter to each of these macros is a matcher applied to any data
-// the sub-process wrote to stderr.  For compatibility with existing tests, a
-// bare string is interpreted as a regular expression matcher.
-//
-// On the regular expressions used in death tests:
-//
-//   GOOGLETEST_CM0005 DO NOT DELETE
-//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
-//   which uses the POSIX extended regex syntax.
-//
-//   On other platforms (e.g. Windows or Mac), we only support a simple regex
-//   syntax implemented as part of Google Test.  This limited
-//   implementation should be enough most of the time when writing
-//   death tests; though it lacks many features you can find in PCRE
-//   or POSIX extended regex syntax.  For example, we don't support
-//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
-//   repetition count ("x{5,7}"), among others.
-//
-//   Below is the syntax that we do support.  We chose it to be a
-//   subset of both PCRE and POSIX extended regex, so it's easy to
-//   learn wherever you come from.  In the following: 'A' denotes a
-//   literal character, period (.), or a single \\ escape sequence;
-//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
-//   natural numbers.
-//
-//     c     matches any literal character c
-//     \\d   matches any decimal digit
-//     \\D   matches any character that's not a decimal digit
-//     \\f   matches \f
-//     \\n   matches \n
-//     \\r   matches \r
-//     \\s   matches any ASCII whitespace, including \n
-//     \\S   matches any character that's not a whitespace
-//     \\t   matches \t
-//     \\v   matches \v
-//     \\w   matches any letter, _, or decimal digit
-//     \\W   matches any character that \\w doesn't match
-//     \\c   matches any literal character c, which must be a punctuation
-//     .     matches any single character except \n
-//     A?    matches 0 or 1 occurrences of A
-//     A*    matches 0 or many occurrences of A
-//     A+    matches 1 or many occurrences of A
-//     ^     matches the beginning of a string (not that of each line)
-//     $     matches the end of a string (not that of each line)
-//     xy    matches x followed by y
-//
-//   If you accidentally use PCRE or POSIX extended regex features
-//   not implemented by us, you will get a run-time failure.  In that
-//   case, please try to rewrite your regular expression within the
-//   above syntax.
-//
-//   This implementation is *not* meant to be as highly tuned or robust
-//   as a compiled regex library, but should perform well enough for a
-//   death test, which already incurs significant overhead by launching
-//   a child process.
-//
-// Known caveats:
-//
-//   A "threadsafe" style death test obtains the path to the test
-//   program from argv[0] and re-executes it in the sub-process.  For
-//   simplicity, the current implementation doesn't search the PATH
-//   when launching the sub-process.  This means that the user must
-//   invoke the test program via a path that contains at least one
-//   path separator (e.g. path/to/foo_test and
-//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
-//   is rarely a problem as people usually don't put the test binary
-//   directory in PATH.
-//
-
-// Asserts that a given `statement` causes the program to exit, with an
-// integer exit status that satisfies `predicate`, and emitting error output
-// that matches `matcher`.
-# define ASSERT_EXIT(statement, predicate, matcher) \
-    GTEST_DEATH_TEST_(statement, predicate, matcher, GTEST_FATAL_FAILURE_)
-
-// Like `ASSERT_EXIT`, but continues on to successive tests in the
-// test suite, if any:
-# define EXPECT_EXIT(statement, predicate, matcher) \
-    GTEST_DEATH_TEST_(statement, predicate, matcher, GTEST_NONFATAL_FAILURE_)
-
-// Asserts that a given `statement` causes the program to exit, either by
-// explicitly exiting with a nonzero exit code or being killed by a
-// signal, and emitting error output that matches `matcher`.
-# define ASSERT_DEATH(statement, matcher) \
-    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, matcher)
-
-// Like `ASSERT_DEATH`, but continues on to successive tests in the
-// test suite, if any:
-# define EXPECT_DEATH(statement, matcher) \
-    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, matcher)
-
-// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
-
-// Tests that an exit code describes a normal exit with a given exit code.
-class GTEST_API_ ExitedWithCode {
- public:
-  explicit ExitedWithCode(int exit_code);
-  ExitedWithCode(const ExitedWithCode&) = default;
-  void operator=(const ExitedWithCode& other) = delete;
-  bool operator()(int exit_status) const;
- private:
-  const int exit_code_;
-};
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// Tests that an exit code describes an exit due to termination by a
-// given signal.
-// GOOGLETEST_CM0006 DO NOT DELETE
-class GTEST_API_ KilledBySignal {
- public:
-  explicit KilledBySignal(int signum);
-  bool operator()(int exit_status) const;
- private:
-  const int signum_;
-};
-# endif  // !GTEST_OS_WINDOWS
-
-// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
-// The death testing framework causes this to have interesting semantics,
-// since the sideeffects of the call are only visible in opt mode, and not
-// in debug mode.
-//
-// In practice, this can be used to test functions that utilize the
-// LOG(DFATAL) macro using the following style:
-//
-// int DieInDebugOr12(int* sideeffect) {
-//   if (sideeffect) {
-//     *sideeffect = 12;
-//   }
-//   LOG(DFATAL) << "death";
-//   return 12;
-// }
-//
-// TEST(TestSuite, TestDieOr12WorksInDgbAndOpt) {
-//   int sideeffect = 0;
-//   // Only asserts in dbg.
-//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
-//
-// #ifdef NDEBUG
-//   // opt-mode has sideeffect visible.
-//   EXPECT_EQ(12, sideeffect);
-// #else
-//   // dbg-mode no visible sideeffect.
-//   EXPECT_EQ(0, sideeffect);
-// #endif
-// }
-//
-// This will assert that DieInDebugReturn12InOpt() crashes in debug
-// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
-// appropriate fallback value (12 in this case) in opt mode. If you
-// need to test that a function has appropriate side-effects in opt
-// mode, include assertions against the side-effects.  A general
-// pattern for this is:
-//
-// EXPECT_DEBUG_DEATH({
-//   // Side-effects here will have an effect after this statement in
-//   // opt mode, but none in debug mode.
-//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
-// }, "death");
-//
-# ifdef NDEBUG
-
-#  define EXPECT_DEBUG_DEATH(statement, regex) \
-  GTEST_EXECUTE_STATEMENT_(statement, regex)
-
-#  define ASSERT_DEBUG_DEATH(statement, regex) \
-  GTEST_EXECUTE_STATEMENT_(statement, regex)
-
-# else
-
-#  define EXPECT_DEBUG_DEATH(statement, regex) \
-  EXPECT_DEATH(statement, regex)
-
-#  define ASSERT_DEBUG_DEATH(statement, regex) \
-  ASSERT_DEATH(statement, regex)
-
-# endif  // NDEBUG for EXPECT_DEBUG_DEATH
-#endif  // GTEST_HAS_DEATH_TEST
-
-// This macro is used for implementing macros such as
-// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
-// death tests are not supported. Those macros must compile on such systems
-// if and only if EXPECT_DEATH and ASSERT_DEATH compile with the same parameters
-// on systems that support death tests. This allows one to write such a macro on
-// a system that does not support death tests and be sure that it will compile
-// on a death-test supporting system. It is exposed publicly so that systems
-// that have death-tests with stricter requirements than GTEST_HAS_DEATH_TEST
-// can write their own equivalent of EXPECT_DEATH_IF_SUPPORTED and
-// ASSERT_DEATH_IF_SUPPORTED.
-//
-// Parameters:
-//   statement -  A statement that a macro such as EXPECT_DEATH would test
-//                for program termination. This macro has to make sure this
-//                statement is compiled but not executed, to ensure that
-//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
-//                parameter if and only if EXPECT_DEATH compiles with it.
-//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
-//                the output of statement.  This parameter has to be
-//                compiled but not evaluated by this macro, to ensure that
-//                this macro only accepts expressions that a macro such as
-//                EXPECT_DEATH would accept.
-//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
-//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
-//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
-//                compile inside functions where ASSERT_DEATH doesn't
-//                compile.
-//
-//  The branch that has an always false condition is used to ensure that
-//  statement and regex are compiled (and thus syntactically correct) but
-//  never executed. The unreachable code macro protects the terminator
-//  statement from generating an 'unreachable code' warning in case
-//  statement unconditionally returns or throws. The Message constructor at
-//  the end allows the syntax of streaming additional messages into the
-//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
-# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::AlwaysTrue()) { \
-      GTEST_LOG_(WARNING) \
-          << "Death tests are not supported on this platform.\n" \
-          << "Statement '" #statement "' cannot be verified."; \
-    } else if (::testing::internal::AlwaysFalse()) { \
-      ::testing::internal::RE::PartialMatch(".*", (regex)); \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-      terminator; \
-    } else \
-      ::testing::Message()
-
-// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
-// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
-// death tests are supported; otherwise they just issue a warning.  This is
-// useful when you are combining death test assertions with normal test
-// assertions in one test.
-#if GTEST_HAS_DEATH_TEST
-# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
-    EXPECT_DEATH(statement, regex)
-# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-    ASSERT_DEATH(statement, regex)
-#else
-# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
-    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
-# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
-#endif
-
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Macros and functions for implementing parameterized tests
-// in Google C++ Testing and Mocking Framework (Google Test)
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-
-// Value-parameterized tests allow you to test your code with different
-// parameters without writing multiple copies of the same test.
-//
-// Here is how you use value-parameterized tests:
-
-#if 0
-
-// To write value-parameterized tests, first you should define a fixture
-// class. It is usually derived from testing::TestWithParam<T> (see below for
-// another inheritance scheme that's sometimes useful in more complicated
-// class hierarchies), where the type of your parameter values.
-// TestWithParam<T> is itself derived from testing::Test. T can be any
-// copyable type. If it's a raw pointer, you are responsible for managing the
-// lifespan of the pointed values.
-
-class FooTest : public ::testing::TestWithParam<const char*> {
-  // You can implement all the usual class fixture members here.
-};
-
-// Then, use the TEST_P macro to define as many parameterized tests
-// for this fixture as you want. The _P suffix is for "parameterized"
-// or "pattern", whichever you prefer to think.
-
-TEST_P(FooTest, DoesBlah) {
-  // Inside a test, access the test parameter with the GetParam() method
-  // of the TestWithParam<T> class:
-  EXPECT_TRUE(foo.Blah(GetParam()));
-  ...
-}
-
-TEST_P(FooTest, HasBlahBlah) {
-  ...
-}
-
-// Finally, you can use INSTANTIATE_TEST_SUITE_P to instantiate the test
-// case with any set of parameters you want. Google Test defines a number
-// of functions for generating test parameters. They return what we call
-// (surprise!) parameter generators. Here is a summary of them, which
-// are all in the testing namespace:
-//
-//
-//  Range(begin, end [, step]) - Yields values {begin, begin+step,
-//                               begin+step+step, ...}. The values do not
-//                               include end. step defaults to 1.
-//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
-//  ValuesIn(container)        - Yields values from a C-style array, an STL
-//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
-//  Bool()                     - Yields sequence {false, true}.
-//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
-//                               for the math savvy) of the values generated
-//                               by the N generators.
-//
-// For more details, see comments at the definitions of these functions below
-// in this file.
-//
-// The following statement will instantiate tests from the FooTest test suite
-// each with parameter values "meeny", "miny", and "moe".
-
-INSTANTIATE_TEST_SUITE_P(InstantiationName,
-                         FooTest,
-                         Values("meeny", "miny", "moe"));
-
-// To distinguish different instances of the pattern, (yes, you
-// can instantiate it more than once) the first argument to the
-// INSTANTIATE_TEST_SUITE_P macro is a prefix that will be added to the
-// actual test suite name. Remember to pick unique prefixes for different
-// instantiations. The tests from the instantiation above will have
-// these names:
-//
-//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
-//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
-//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
-//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
-//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
-//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
-//
-// You can use these names in --gtest_filter.
-//
-// This statement will instantiate all tests from FooTest again, each
-// with parameter values "cat" and "dog":
-
-const char* pets[] = {"cat", "dog"};
-INSTANTIATE_TEST_SUITE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
-
-// The tests from the instantiation above will have these names:
-//
-//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
-//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
-//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
-//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
-//
-// Please note that INSTANTIATE_TEST_SUITE_P will instantiate all tests
-// in the given test suite, whether their definitions come before or
-// AFTER the INSTANTIATE_TEST_SUITE_P statement.
-//
-// Please also note that generator expressions (including parameters to the
-// generators) are evaluated in InitGoogleTest(), after main() has started.
-// This allows the user on one hand, to adjust generator parameters in order
-// to dynamically determine a set of tests to run and on the other hand,
-// give the user a chance to inspect the generated tests with Google Test
-// reflection API before RUN_ALL_TESTS() is executed.
-//
-// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
-// for more examples.
-//
-// In the future, we plan to publish the API for defining new parameter
-// generators. But for now this interface remains part of the internal
-// implementation and is subject to change.
-//
-//
-// A parameterized test fixture must be derived from testing::Test and from
-// testing::WithParamInterface<T>, where T is the type of the parameter
-// values. Inheriting from TestWithParam<T> satisfies that requirement because
-// TestWithParam<T> inherits from both Test and WithParamInterface. In more
-// complicated hierarchies, however, it is occasionally useful to inherit
-// separately from Test and WithParamInterface. For example:
-
-class BaseTest : public ::testing::Test {
-  // You can inherit all the usual members for a non-parameterized test
-  // fixture here.
-};
-
-class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
-  // The usual test fixture members go here too.
-};
-
-TEST_F(BaseTest, HasFoo) {
-  // This is an ordinary non-parameterized test.
-}
-
-TEST_P(DerivedTest, DoesBlah) {
-  // GetParam works just the same here as if you inherit from TestWithParam.
-  EXPECT_TRUE(foo.Blah(GetParam()));
-}
-
-#endif  // 0
-
-#include <iterator>
-#include <utility>
-
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Type and function utilities for implementing parameterized tests.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-
-#include <ctype.h>
-
-#include <cassert>
-#include <iterator>
-#include <memory>
-#include <set>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-
-#include <iosfwd>
-#include <vector>
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// A copyable object representing the result of a test part (i.e. an
-// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
-//
-// Don't inherit from TestPartResult as its destructor is not virtual.
-class GTEST_API_ TestPartResult {
- public:
-  // The possible outcomes of a test part (i.e. an assertion or an
-  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
-  enum Type {
-    kSuccess,          // Succeeded.
-    kNonFatalFailure,  // Failed but the test can continue.
-    kFatalFailure,     // Failed and the test should be terminated.
-    kSkip              // Skipped.
-  };
-
-  // C'tor.  TestPartResult does NOT have a default constructor.
-  // Always use this constructor (with parameters) to create a
-  // TestPartResult object.
-  TestPartResult(Type a_type, const char* a_file_name, int a_line_number,
-                 const char* a_message)
-      : type_(a_type),
-        file_name_(a_file_name == nullptr ? "" : a_file_name),
-        line_number_(a_line_number),
-        summary_(ExtractSummary(a_message)),
-        message_(a_message) {}
-
-  // Gets the outcome of the test part.
-  Type type() const { return type_; }
-
-  // Gets the name of the source file where the test part took place, or
-  // NULL if it's unknown.
-  const char* file_name() const {
-    return file_name_.empty() ? nullptr : file_name_.c_str();
-  }
-
-  // Gets the line in the source file where the test part took place,
-  // or -1 if it's unknown.
-  int line_number() const { return line_number_; }
-
-  // Gets the summary of the failure message.
-  const char* summary() const { return summary_.c_str(); }
-
-  // Gets the message associated with the test part.
-  const char* message() const { return message_.c_str(); }
-
-  // Returns true if and only if the test part was skipped.
-  bool skipped() const { return type_ == kSkip; }
-
-  // Returns true if and only if the test part passed.
-  bool passed() const { return type_ == kSuccess; }
-
-  // Returns true if and only if the test part non-fatally failed.
-  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
-
-  // Returns true if and only if the test part fatally failed.
-  bool fatally_failed() const { return type_ == kFatalFailure; }
-
-  // Returns true if and only if the test part failed.
-  bool failed() const { return fatally_failed() || nonfatally_failed(); }
-
- private:
-  Type type_;
-
-  // Gets the summary of the failure message by omitting the stack
-  // trace in it.
-  static std::string ExtractSummary(const char* message);
-
-  // The name of the source file where the test part took place, or
-  // "" if the source file is unknown.
-  std::string file_name_;
-  // The line in the source file where the test part took place, or -1
-  // if the line number is unknown.
-  int line_number_;
-  std::string summary_;  // The test failure summary.
-  std::string message_;  // The test failure message.
-};
-
-// Prints a TestPartResult object.
-std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
-
-// An array of TestPartResult objects.
-//
-// Don't inherit from TestPartResultArray as its destructor is not
-// virtual.
-class GTEST_API_ TestPartResultArray {
- public:
-  TestPartResultArray() {}
-
-  // Appends the given TestPartResult to the array.
-  void Append(const TestPartResult& result);
-
-  // Returns the TestPartResult at the given index (0-based).
-  const TestPartResult& GetTestPartResult(int index) const;
-
-  // Returns the number of TestPartResult objects in the array.
-  int size() const;
-
- private:
-  std::vector<TestPartResult> array_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
-};
-
-// This interface knows how to report a test part result.
-class GTEST_API_ TestPartResultReporterInterface {
- public:
-  virtual ~TestPartResultReporterInterface() {}
-
-  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
-};
-
-namespace internal {
-
-// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
-// statement generates new fatal failures. To do so it registers itself as the
-// current test part result reporter. Besides checking if fatal failures were
-// reported, it only delegates the reporting to the former result reporter.
-// The original result reporter is restored in the destructor.
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-class GTEST_API_ HasNewFatalFailureHelper
-    : public TestPartResultReporterInterface {
- public:
-  HasNewFatalFailureHelper();
-  ~HasNewFatalFailureHelper() override;
-  void ReportTestPartResult(const TestPartResult& result) override;
-  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
- private:
-  bool has_new_fatal_failure_;
-  TestPartResultReporterInterface* original_reporter_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-
-namespace testing {
-// Input to a parameterized test name generator, describing a test parameter.
-// Consists of the parameter value and the integer parameter index.
-template <class ParamType>
-struct TestParamInfo {
-  TestParamInfo(const ParamType& a_param, size_t an_index) :
-    param(a_param),
-    index(an_index) {}
-  ParamType param;
-  size_t index;
-};
-
-// A builtin parameterized test name generator which returns the result of
-// testing::PrintToString.
-struct PrintToStringParamName {
-  template <class ParamType>
-  std::string operator()(const TestParamInfo<ParamType>& info) const {
-    return PrintToString(info.param);
-  }
-};
-
-namespace internal {
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-// Utility Functions
-
-// Outputs a message explaining invalid registration of different
-// fixture class for the same test suite. This may happen when
-// TEST_P macro is used to define two tests with the same name
-// but in different namespaces.
-GTEST_API_ void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                           CodeLocation code_location);
-
-template <typename> class ParamGeneratorInterface;
-template <typename> class ParamGenerator;
-
-// Interface for iterating over elements provided by an implementation
-// of ParamGeneratorInterface<T>.
-template <typename T>
-class ParamIteratorInterface {
- public:
-  virtual ~ParamIteratorInterface() {}
-  // A pointer to the base generator instance.
-  // Used only for the purposes of iterator comparison
-  // to make sure that two iterators belong to the same generator.
-  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
-  // Advances iterator to point to the next element
-  // provided by the generator. The caller is responsible
-  // for not calling Advance() on an iterator equal to
-  // BaseGenerator()->End().
-  virtual void Advance() = 0;
-  // Clones the iterator object. Used for implementing copy semantics
-  // of ParamIterator<T>.
-  virtual ParamIteratorInterface* Clone() const = 0;
-  // Dereferences the current iterator and provides (read-only) access
-  // to the pointed value. It is the caller's responsibility not to call
-  // Current() on an iterator equal to BaseGenerator()->End().
-  // Used for implementing ParamGenerator<T>::operator*().
-  virtual const T* Current() const = 0;
-  // Determines whether the given iterator and other point to the same
-  // element in the sequence generated by the generator.
-  // Used for implementing ParamGenerator<T>::operator==().
-  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
-};
-
-// Class iterating over elements provided by an implementation of
-// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
-// and implements the const forward iterator concept.
-template <typename T>
-class ParamIterator {
- public:
-  typedef T value_type;
-  typedef const T& reference;
-  typedef ptrdiff_t difference_type;
-
-  // ParamIterator assumes ownership of the impl_ pointer.
-  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
-  ParamIterator& operator=(const ParamIterator& other) {
-    if (this != &other)
-      impl_.reset(other.impl_->Clone());
-    return *this;
-  }
-
-  const T& operator*() const { return *impl_->Current(); }
-  const T* operator->() const { return impl_->Current(); }
-  // Prefix version of operator++.
-  ParamIterator& operator++() {
-    impl_->Advance();
-    return *this;
-  }
-  // Postfix version of operator++.
-  ParamIterator operator++(int /*unused*/) {
-    ParamIteratorInterface<T>* clone = impl_->Clone();
-    impl_->Advance();
-    return ParamIterator(clone);
-  }
-  bool operator==(const ParamIterator& other) const {
-    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
-  }
-  bool operator!=(const ParamIterator& other) const {
-    return !(*this == other);
-  }
-
- private:
-  friend class ParamGenerator<T>;
-  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
-  std::unique_ptr<ParamIteratorInterface<T> > impl_;
-};
-
-// ParamGeneratorInterface<T> is the binary interface to access generators
-// defined in other translation units.
-template <typename T>
-class ParamGeneratorInterface {
- public:
-  typedef T ParamType;
-
-  virtual ~ParamGeneratorInterface() {}
-
-  // Generator interface definition
-  virtual ParamIteratorInterface<T>* Begin() const = 0;
-  virtual ParamIteratorInterface<T>* End() const = 0;
-};
-
-// Wraps ParamGeneratorInterface<T> and provides general generator syntax
-// compatible with the STL Container concept.
-// This class implements copy initialization semantics and the contained
-// ParamGeneratorInterface<T> instance is shared among all copies
-// of the original object. This is possible because that instance is immutable.
-template<typename T>
-class ParamGenerator {
- public:
-  typedef ParamIterator<T> iterator;
-
-  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
-  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
-
-  ParamGenerator& operator=(const ParamGenerator& other) {
-    impl_ = other.impl_;
-    return *this;
-  }
-
-  iterator begin() const { return iterator(impl_->Begin()); }
-  iterator end() const { return iterator(impl_->End()); }
-
- private:
-  std::shared_ptr<const ParamGeneratorInterface<T> > impl_;
-};
-
-// Generates values from a range of two comparable values. Can be used to
-// generate sequences of user-defined types that implement operator+() and
-// operator<().
-// This class is used in the Range() function.
-template <typename T, typename IncrementT>
-class RangeGenerator : public ParamGeneratorInterface<T> {
- public:
-  RangeGenerator(T begin, T end, IncrementT step)
-      : begin_(begin), end_(end),
-        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
-  ~RangeGenerator() override {}
-
-  ParamIteratorInterface<T>* Begin() const override {
-    return new Iterator(this, begin_, 0, step_);
-  }
-  ParamIteratorInterface<T>* End() const override {
-    return new Iterator(this, end_, end_index_, step_);
-  }
-
- private:
-  class Iterator : public ParamIteratorInterface<T> {
-   public:
-    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
-             IncrementT step)
-        : base_(base), value_(value), index_(index), step_(step) {}
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<T>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      value_ = static_cast<T>(value_ + step_);
-      index_++;
-    }
-    ParamIteratorInterface<T>* Clone() const override {
-      return new Iterator(*this);
-    }
-    const T* Current() const override { return &value_; }
-    bool Equals(const ParamIteratorInterface<T>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const int other_index =
-          CheckedDowncastToActualType<const Iterator>(&other)->index_;
-      return index_ == other_index;
-    }
-
-   private:
-    Iterator(const Iterator& other)
-        : ParamIteratorInterface<T>(),
-          base_(other.base_), value_(other.value_), index_(other.index_),
-          step_(other.step_) {}
-
-    // No implementation - assignment is unsupported.
-    void operator=(const Iterator& other);
-
-    const ParamGeneratorInterface<T>* const base_;
-    T value_;
-    int index_;
-    const IncrementT step_;
-  };  // class RangeGenerator::Iterator
-
-  static int CalculateEndIndex(const T& begin,
-                               const T& end,
-                               const IncrementT& step) {
-    int end_index = 0;
-    for (T i = begin; i < end; i = static_cast<T>(i + step))
-      end_index++;
-    return end_index;
-  }
-
-  // No implementation - assignment is unsupported.
-  void operator=(const RangeGenerator& other);
-
-  const T begin_;
-  const T end_;
-  const IncrementT step_;
-  // The index for the end() iterator. All the elements in the generated
-  // sequence are indexed (0-based) to aid iterator comparison.
-  const int end_index_;
-};  // class RangeGenerator
-
-
-// Generates values from a pair of STL-style iterators. Used in the
-// ValuesIn() function. The elements are copied from the source range
-// since the source can be located on the stack, and the generator
-// is likely to persist beyond that stack frame.
-template <typename T>
-class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
- public:
-  template <typename ForwardIterator>
-  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
-      : container_(begin, end) {}
-  ~ValuesInIteratorRangeGenerator() override {}
-
-  ParamIteratorInterface<T>* Begin() const override {
-    return new Iterator(this, container_.begin());
-  }
-  ParamIteratorInterface<T>* End() const override {
-    return new Iterator(this, container_.end());
-  }
-
- private:
-  typedef typename ::std::vector<T> ContainerType;
-
-  class Iterator : public ParamIteratorInterface<T> {
-   public:
-    Iterator(const ParamGeneratorInterface<T>* base,
-             typename ContainerType::const_iterator iterator)
-        : base_(base), iterator_(iterator) {}
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<T>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      ++iterator_;
-      value_.reset();
-    }
-    ParamIteratorInterface<T>* Clone() const override {
-      return new Iterator(*this);
-    }
-    // We need to use cached value referenced by iterator_ because *iterator_
-    // can return a temporary object (and of type other then T), so just
-    // having "return &*iterator_;" doesn't work.
-    // value_ is updated here and not in Advance() because Advance()
-    // can advance iterator_ beyond the end of the range, and we cannot
-    // detect that fact. The client code, on the other hand, is
-    // responsible for not calling Current() on an out-of-range iterator.
-    const T* Current() const override {
-      if (value_.get() == nullptr) value_.reset(new T(*iterator_));
-      return value_.get();
-    }
-    bool Equals(const ParamIteratorInterface<T>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      return iterator_ ==
-          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
-    }
-
-   private:
-    Iterator(const Iterator& other)
-          // The explicit constructor call suppresses a false warning
-          // emitted by gcc when supplied with the -Wextra option.
-        : ParamIteratorInterface<T>(),
-          base_(other.base_),
-          iterator_(other.iterator_) {}
-
-    const ParamGeneratorInterface<T>* const base_;
-    typename ContainerType::const_iterator iterator_;
-    // A cached value of *iterator_. We keep it here to allow access by
-    // pointer in the wrapping iterator's operator->().
-    // value_ needs to be mutable to be accessed in Current().
-    // Use of std::unique_ptr helps manage cached value's lifetime,
-    // which is bound by the lifespan of the iterator itself.
-    mutable std::unique_ptr<const T> value_;
-  };  // class ValuesInIteratorRangeGenerator::Iterator
-
-  // No implementation - assignment is unsupported.
-  void operator=(const ValuesInIteratorRangeGenerator& other);
-
-  const ContainerType container_;
-};  // class ValuesInIteratorRangeGenerator
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Default parameterized test name generator, returns a string containing the
-// integer test parameter index.
-template <class ParamType>
-std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
-  Message name_stream;
-  name_stream << info.index;
-  return name_stream.GetString();
-}
-
-template <typename T = int>
-void TestNotEmpty() {
-  static_assert(sizeof(T) == 0, "Empty arguments are not allowed.");
-}
-template <typename T = int>
-void TestNotEmpty(const T&) {}
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Stores a parameter value and later creates tests parameterized with that
-// value.
-template <class TestClass>
-class ParameterizedTestFactory : public TestFactoryBase {
- public:
-  typedef typename TestClass::ParamType ParamType;
-  explicit ParameterizedTestFactory(ParamType parameter) :
-      parameter_(parameter) {}
-  Test* CreateTest() override {
-    TestClass::SetParam(&parameter_);
-    return new TestClass();
-  }
-
- private:
-  const ParamType parameter_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// TestMetaFactoryBase is a base class for meta-factories that create
-// test factories for passing into MakeAndRegisterTestInfo function.
-template <class ParamType>
-class TestMetaFactoryBase {
- public:
-  virtual ~TestMetaFactoryBase() {}
-
-  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// TestMetaFactory creates test factories for passing into
-// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
-// ownership of test factory pointer, same factory object cannot be passed
-// into that method twice. But ParameterizedTestSuiteInfo is going to call
-// it for each Test/Parameter value combination. Thus it needs meta factory
-// creator class.
-template <class TestSuite>
-class TestMetaFactory
-    : public TestMetaFactoryBase<typename TestSuite::ParamType> {
- public:
-  using ParamType = typename TestSuite::ParamType;
-
-  TestMetaFactory() {}
-
-  TestFactoryBase* CreateTestFactory(ParamType parameter) override {
-    return new ParameterizedTestFactory<TestSuite>(parameter);
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteInfoBase is a generic interface
-// to ParameterizedTestSuiteInfo classes. ParameterizedTestSuiteInfoBase
-// accumulates test information provided by TEST_P macro invocations
-// and generators provided by INSTANTIATE_TEST_SUITE_P macro invocations
-// and uses that information to register all resulting test instances
-// in RegisterTests method. The ParameterizeTestSuiteRegistry class holds
-// a collection of pointers to the ParameterizedTestSuiteInfo objects
-// and calls RegisterTests() on each of them when asked.
-class ParameterizedTestSuiteInfoBase {
- public:
-  virtual ~ParameterizedTestSuiteInfoBase() {}
-
-  // Base part of test suite name for display purposes.
-  virtual const std::string& GetTestSuiteName() const = 0;
-  // Test suite id to verify identity.
-  virtual TypeId GetTestSuiteTypeId() const = 0;
-  // UnitTest class invokes this method to register tests in this
-  // test suite right before running them in RUN_ALL_TESTS macro.
-  // This method should not be called more than once on any single
-  // instance of a ParameterizedTestSuiteInfoBase derived class.
-  virtual void RegisterTests() = 0;
-
- protected:
-  ParameterizedTestSuiteInfoBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfoBase);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Report a the name of a test_suit as safe to ignore
-// as the side effect of construction of this type.
-struct GTEST_API_ MarkAsIgnored {
-  explicit MarkAsIgnored(const char* test_suite);
-};
-
-GTEST_API_ void InsertSyntheticTestCase(const std::string& name,
-                                        CodeLocation location, bool has_test_p);
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteInfo accumulates tests obtained from TEST_P
-// macro invocations for a particular test suite and generators
-// obtained from INSTANTIATE_TEST_SUITE_P macro invocations for that
-// test suite. It registers tests with all values generated by all
-// generators when asked.
-template <class TestSuite>
-class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
- public:
-  // ParamType and GeneratorCreationFunc are private types but are required
-  // for declarations of public methods AddTestPattern() and
-  // AddTestSuiteInstantiation().
-  using ParamType = typename TestSuite::ParamType;
-  // A function that returns an instance of appropriate generator type.
-  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
-  using ParamNameGeneratorFunc = std::string(const TestParamInfo<ParamType>&);
-
-  explicit ParameterizedTestSuiteInfo(const char* name,
-                                      CodeLocation code_location)
-      : test_suite_name_(name), code_location_(code_location) {}
-
-  // Test suite base name for display purposes.
-  const std::string& GetTestSuiteName() const override {
-    return test_suite_name_;
-  }
-  // Test suite id to verify identity.
-  TypeId GetTestSuiteTypeId() const override { return GetTypeId<TestSuite>(); }
-  // TEST_P macro uses AddTestPattern() to record information
-  // about a single test in a LocalTestInfo structure.
-  // test_suite_name is the base name of the test suite (without invocation
-  // prefix). test_base_name is the name of an individual test without
-  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
-  // test suite base name and DoBar is test base name.
-  void AddTestPattern(const char* test_suite_name, const char* test_base_name,
-                      TestMetaFactoryBase<ParamType>* meta_factory,
-                      CodeLocation code_location) {
-    tests_.push_back(std::shared_ptr<TestInfo>(new TestInfo(
-        test_suite_name, test_base_name, meta_factory, code_location)));
-  }
-  // INSTANTIATE_TEST_SUITE_P macro uses AddGenerator() to record information
-  // about a generator.
-  int AddTestSuiteInstantiation(const std::string& instantiation_name,
-                                GeneratorCreationFunc* func,
-                                ParamNameGeneratorFunc* name_func,
-                                const char* file, int line) {
-    instantiations_.push_back(
-        InstantiationInfo(instantiation_name, func, name_func, file, line));
-    return 0;  // Return value used only to run this method in namespace scope.
-  }
-  // UnitTest class invokes this method to register tests in this test suite
-  // right before running tests in RUN_ALL_TESTS macro.
-  // This method should not be called more than once on any single
-  // instance of a ParameterizedTestSuiteInfoBase derived class.
-  // UnitTest has a guard to prevent from calling this method more than once.
-  void RegisterTests() override {
-    bool generated_instantiations = false;
-
-    for (typename TestInfoContainer::iterator test_it = tests_.begin();
-         test_it != tests_.end(); ++test_it) {
-      std::shared_ptr<TestInfo> test_info = *test_it;
-      for (typename InstantiationContainer::iterator gen_it =
-               instantiations_.begin(); gen_it != instantiations_.end();
-               ++gen_it) {
-        const std::string& instantiation_name = gen_it->name;
-        ParamGenerator<ParamType> generator((*gen_it->generator)());
-        ParamNameGeneratorFunc* name_func = gen_it->name_func;
-        const char* file = gen_it->file;
-        int line = gen_it->line;
-
-        std::string test_suite_name;
-        if ( !instantiation_name.empty() )
-          test_suite_name = instantiation_name + "/";
-        test_suite_name += test_info->test_suite_base_name;
-
-        size_t i = 0;
-        std::set<std::string> test_param_names;
-        for (typename ParamGenerator<ParamType>::iterator param_it =
-                 generator.begin();
-             param_it != generator.end(); ++param_it, ++i) {
-          generated_instantiations = true;
-
-          Message test_name_stream;
-
-          std::string param_name = name_func(
-              TestParamInfo<ParamType>(*param_it, i));
-
-          GTEST_CHECK_(IsValidParamName(param_name))
-              << "Parameterized test name '" << param_name
-              << "' is invalid, in " << file
-              << " line " << line << std::endl;
-
-          GTEST_CHECK_(test_param_names.count(param_name) == 0)
-              << "Duplicate parameterized test name '" << param_name
-              << "', in " << file << " line " << line << std::endl;
-
-          test_param_names.insert(param_name);
-
-          if (!test_info->test_base_name.empty()) {
-            test_name_stream << test_info->test_base_name << "/";
-          }
-          test_name_stream << param_name;
-          MakeAndRegisterTestInfo(
-              test_suite_name.c_str(), test_name_stream.GetString().c_str(),
-              nullptr,  // No type parameter.
-              PrintToString(*param_it).c_str(), test_info->code_location,
-              GetTestSuiteTypeId(),
-              SuiteApiResolver<TestSuite>::GetSetUpCaseOrSuite(file, line),
-              SuiteApiResolver<TestSuite>::GetTearDownCaseOrSuite(file, line),
-              test_info->test_meta_factory->CreateTestFactory(*param_it));
-        }  // for param_it
-      }  // for gen_it
-    }  // for test_it
-
-    if (!generated_instantiations) {
-      // There are no generaotrs, or they all generate nothing ...
-      InsertSyntheticTestCase(GetTestSuiteName(), code_location_,
-                              !tests_.empty());
-    }
-  }    // RegisterTests
-
- private:
-  // LocalTestInfo structure keeps information about a single test registered
-  // with TEST_P macro.
-  struct TestInfo {
-    TestInfo(const char* a_test_suite_base_name, const char* a_test_base_name,
-             TestMetaFactoryBase<ParamType>* a_test_meta_factory,
-             CodeLocation a_code_location)
-        : test_suite_base_name(a_test_suite_base_name),
-          test_base_name(a_test_base_name),
-          test_meta_factory(a_test_meta_factory),
-          code_location(a_code_location) {}
-
-    const std::string test_suite_base_name;
-    const std::string test_base_name;
-    const std::unique_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
-    const CodeLocation code_location;
-  };
-  using TestInfoContainer = ::std::vector<std::shared_ptr<TestInfo> >;
-  // Records data received from INSTANTIATE_TEST_SUITE_P macros:
-  //  <Instantiation name, Sequence generator creation function,
-  //     Name generator function, Source file, Source line>
-  struct InstantiationInfo {
-      InstantiationInfo(const std::string &name_in,
-                        GeneratorCreationFunc* generator_in,
-                        ParamNameGeneratorFunc* name_func_in,
-                        const char* file_in,
-                        int line_in)
-          : name(name_in),
-            generator(generator_in),
-            name_func(name_func_in),
-            file(file_in),
-            line(line_in) {}
-
-      std::string name;
-      GeneratorCreationFunc* generator;
-      ParamNameGeneratorFunc* name_func;
-      const char* file;
-      int line;
-  };
-  typedef ::std::vector<InstantiationInfo> InstantiationContainer;
-
-  static bool IsValidParamName(const std::string& name) {
-    // Check for empty string
-    if (name.empty())
-      return false;
-
-    // Check for invalid characters
-    for (std::string::size_type index = 0; index < name.size(); ++index) {
-      if (!IsAlNum(name[index]) && name[index] != '_')
-        return false;
-    }
-
-    return true;
-  }
-
-  const std::string test_suite_name_;
-  CodeLocation code_location_;
-  TestInfoContainer tests_;
-  InstantiationContainer instantiations_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfo);
-};  // class ParameterizedTestSuiteInfo
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-template <class TestCase>
-using ParameterizedTestCaseInfo = ParameterizedTestSuiteInfo<TestCase>;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteRegistry contains a map of
-// ParameterizedTestSuiteInfoBase classes accessed by test suite names. TEST_P
-// and INSTANTIATE_TEST_SUITE_P macros use it to locate their corresponding
-// ParameterizedTestSuiteInfo descriptors.
-class ParameterizedTestSuiteRegistry {
- public:
-  ParameterizedTestSuiteRegistry() {}
-  ~ParameterizedTestSuiteRegistry() {
-    for (auto& test_suite_info : test_suite_infos_) {
-      delete test_suite_info;
-    }
-  }
-
-  // Looks up or creates and returns a structure containing information about
-  // tests and instantiations of a particular test suite.
-  template <class TestSuite>
-  ParameterizedTestSuiteInfo<TestSuite>* GetTestSuitePatternHolder(
-      const char* test_suite_name, CodeLocation code_location) {
-    ParameterizedTestSuiteInfo<TestSuite>* typed_test_info = nullptr;
-    for (auto& test_suite_info : test_suite_infos_) {
-      if (test_suite_info->GetTestSuiteName() == test_suite_name) {
-        if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
-          // Complain about incorrect usage of Google Test facilities
-          // and terminate the program since we cannot guaranty correct
-          // test suite setup and tear-down in this case.
-          ReportInvalidTestSuiteType(test_suite_name, code_location);
-          posix::Abort();
-        } else {
-          // At this point we are sure that the object we found is of the same
-          // type we are looking for, so we downcast it to that type
-          // without further checks.
-          typed_test_info = CheckedDowncastToActualType<
-              ParameterizedTestSuiteInfo<TestSuite> >(test_suite_info);
-        }
-        break;
-      }
-    }
-    if (typed_test_info == nullptr) {
-      typed_test_info = new ParameterizedTestSuiteInfo<TestSuite>(
-          test_suite_name, code_location);
-      test_suite_infos_.push_back(typed_test_info);
-    }
-    return typed_test_info;
-  }
-  void RegisterTests() {
-    for (auto& test_suite_info : test_suite_infos_) {
-      test_suite_info->RegisterTests();
-    }
-  }
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  template <class TestCase>
-  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
-      const char* test_case_name, CodeLocation code_location) {
-    return GetTestSuitePatternHolder<TestCase>(test_case_name, code_location);
-  }
-
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
- private:
-  using TestSuiteInfoContainer = ::std::vector<ParameterizedTestSuiteInfoBase*>;
-
-  TestSuiteInfoContainer test_suite_infos_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteRegistry);
-};
-
-// Keep track of what type-parameterized test suite are defined and
-// where as well as which are intatiated. This allows susequently
-// identifying suits that are defined but never used.
-class TypeParameterizedTestSuiteRegistry {
- public:
-  // Add a suite definition
-  void RegisterTestSuite(const char* test_suite_name,
-                         CodeLocation code_location);
-
-  // Add an instantiation of a suit.
-  void RegisterInstantiation(const char* test_suite_name);
-
-  // For each suit repored as defined but not reported as instantiation,
-  // emit a test that reports that fact (configurably, as an error).
-  void CheckForInstantiations();
-
- private:
-  struct TypeParameterizedTestSuiteInfo {
-    explicit TypeParameterizedTestSuiteInfo(CodeLocation c)
-        : code_location(c), instantiated(false) {}
-
-    CodeLocation code_location;
-    bool instantiated;
-  };
-
-  std::map<std::string, TypeParameterizedTestSuiteInfo> suites_;
-};
-
-}  // namespace internal
-
-// Forward declarations of ValuesIn(), which is implemented in
-// include/gtest/gtest-param-test.h.
-template <class Container>
-internal::ParamGenerator<typename Container::value_type> ValuesIn(
-    const Container& container);
-
-namespace internal {
-// Used in the Values() function to provide polymorphic capabilities.
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
-
-template <typename... Ts>
-class ValueArray {
- public:
-  explicit ValueArray(Ts... v) : v_(FlatTupleConstructTag{}, std::move(v)...) {}
-
-  template <typename T>
-  operator ParamGenerator<T>() const {  // NOLINT
-    return ValuesIn(MakeVector<T>(MakeIndexSequence<sizeof...(Ts)>()));
-  }
-
- private:
-  template <typename T, size_t... I>
-  std::vector<T> MakeVector(IndexSequence<I...>) const {
-    return std::vector<T>{static_cast<T>(v_.template Get<I>())...};
-  }
-
-  FlatTuple<Ts...> v_;
-};
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-template <typename... T>
-class CartesianProductGenerator
-    : public ParamGeneratorInterface<::std::tuple<T...>> {
- public:
-  typedef ::std::tuple<T...> ParamType;
-
-  CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
-      : generators_(g) {}
-  ~CartesianProductGenerator() override {}
-
-  ParamIteratorInterface<ParamType>* Begin() const override {
-    return new Iterator(this, generators_, false);
-  }
-  ParamIteratorInterface<ParamType>* End() const override {
-    return new Iterator(this, generators_, true);
-  }
-
- private:
-  template <class I>
-  class IteratorImpl;
-  template <size_t... I>
-  class IteratorImpl<IndexSequence<I...>>
-      : public ParamIteratorInterface<ParamType> {
-   public:
-    IteratorImpl(const ParamGeneratorInterface<ParamType>* base,
-             const std::tuple<ParamGenerator<T>...>& generators, bool is_end)
-        : base_(base),
-          begin_(std::get<I>(generators).begin()...),
-          end_(std::get<I>(generators).end()...),
-          current_(is_end ? end_ : begin_) {
-      ComputeCurrentValue();
-    }
-    ~IteratorImpl() override {}
-
-    const ParamGeneratorInterface<ParamType>* BaseGenerator() const override {
-      return base_;
-    }
-    // Advance should not be called on beyond-of-range iterators
-    // so no component iterators must be beyond end of range, either.
-    void Advance() override {
-      assert(!AtEnd());
-      // Advance the last iterator.
-      ++std::get<sizeof...(T) - 1>(current_);
-      // if that reaches end, propagate that up.
-      AdvanceIfEnd<sizeof...(T) - 1>();
-      ComputeCurrentValue();
-    }
-    ParamIteratorInterface<ParamType>* Clone() const override {
-      return new IteratorImpl(*this);
-    }
-
-    const ParamType* Current() const override { return current_value_.get(); }
-
-    bool Equals(const ParamIteratorInterface<ParamType>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const IteratorImpl* typed_other =
-          CheckedDowncastToActualType<const IteratorImpl>(&other);
-
-      // We must report iterators equal if they both point beyond their
-      // respective ranges. That can happen in a variety of fashions,
-      // so we have to consult AtEnd().
-      if (AtEnd() && typed_other->AtEnd()) return true;
-
-      bool same = true;
-      bool dummy[] = {
-          (same = same && std::get<I>(current_) ==
-                              std::get<I>(typed_other->current_))...};
-      (void)dummy;
-      return same;
-    }
-
-   private:
-    template <size_t ThisI>
-    void AdvanceIfEnd() {
-      if (std::get<ThisI>(current_) != std::get<ThisI>(end_)) return;
-
-      bool last = ThisI == 0;
-      if (last) {
-        // We are done. Nothing else to propagate.
-        return;
-      }
-
-      constexpr size_t NextI = ThisI - (ThisI != 0);
-      std::get<ThisI>(current_) = std::get<ThisI>(begin_);
-      ++std::get<NextI>(current_);
-      AdvanceIfEnd<NextI>();
-    }
-
-    void ComputeCurrentValue() {
-      if (!AtEnd())
-        current_value_ = std::make_shared<ParamType>(*std::get<I>(current_)...);
-    }
-    bool AtEnd() const {
-      bool at_end = false;
-      bool dummy[] = {
-          (at_end = at_end || std::get<I>(current_) == std::get<I>(end_))...};
-      (void)dummy;
-      return at_end;
-    }
-
-    const ParamGeneratorInterface<ParamType>* const base_;
-    std::tuple<typename ParamGenerator<T>::iterator...> begin_;
-    std::tuple<typename ParamGenerator<T>::iterator...> end_;
-    std::tuple<typename ParamGenerator<T>::iterator...> current_;
-    std::shared_ptr<ParamType> current_value_;
-  };
-
-  using Iterator = IteratorImpl<typename MakeIndexSequence<sizeof...(T)>::type>;
-
-  std::tuple<ParamGenerator<T>...> generators_;
-};
-
-template <class... Gen>
-class CartesianProductHolder {
- public:
-  CartesianProductHolder(const Gen&... g) : generators_(g...) {}
-  template <typename... T>
-  operator ParamGenerator<::std::tuple<T...>>() const {
-    return ParamGenerator<::std::tuple<T...>>(
-        new CartesianProductGenerator<T...>(generators_));
-  }
-
- private:
-  std::tuple<Gen...> generators_;
-};
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-
-namespace testing {
-
-// Functions producing parameter generators.
-//
-// Google Test uses these generators to produce parameters for value-
-// parameterized tests. When a parameterized test suite is instantiated
-// with a particular generator, Google Test creates and runs tests
-// for each element in the sequence produced by the generator.
-//
-// In the following sample, tests from test suite FooTest are instantiated
-// each three times with parameter values 3, 5, and 8:
-//
-// class FooTest : public TestWithParam<int> { ... };
-//
-// TEST_P(FooTest, TestThis) {
-// }
-// TEST_P(FooTest, TestThat) {
-// }
-// INSTANTIATE_TEST_SUITE_P(TestSequence, FooTest, Values(3, 5, 8));
-//
-
-// Range() returns generators providing sequences of values in a range.
-//
-// Synopsis:
-// Range(start, end)
-//   - returns a generator producing a sequence of values {start, start+1,
-//     start+2, ..., }.
-// Range(start, end, step)
-//   - returns a generator producing a sequence of values {start, start+step,
-//     start+step+step, ..., }.
-// Notes:
-//   * The generated sequences never include end. For example, Range(1, 5)
-//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
-//     returns a generator producing {1, 3, 5, 7}.
-//   * start and end must have the same type. That type may be any integral or
-//     floating-point type or a user defined type satisfying these conditions:
-//     * It must be assignable (have operator=() defined).
-//     * It must have operator+() (operator+(int-compatible type) for
-//       two-operand version).
-//     * It must have operator<() defined.
-//     Elements in the resulting sequences will also have that type.
-//   * Condition start < end must be satisfied in order for resulting sequences
-//     to contain any elements.
-//
-template <typename T, typename IncrementT>
-internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
-  return internal::ParamGenerator<T>(
-      new internal::RangeGenerator<T, IncrementT>(start, end, step));
-}
-
-template <typename T>
-internal::ParamGenerator<T> Range(T start, T end) {
-  return Range(start, end, 1);
-}
-
-// ValuesIn() function allows generation of tests with parameters coming from
-// a container.
-//
-// Synopsis:
-// ValuesIn(const T (&array)[N])
-//   - returns a generator producing sequences with elements from
-//     a C-style array.
-// ValuesIn(const Container& container)
-//   - returns a generator producing sequences with elements from
-//     an STL-style container.
-// ValuesIn(Iterator begin, Iterator end)
-//   - returns a generator producing sequences with elements from
-//     a range [begin, end) defined by a pair of STL-style iterators. These
-//     iterators can also be plain C pointers.
-//
-// Please note that ValuesIn copies the values from the containers
-// passed in and keeps them to generate tests in RUN_ALL_TESTS().
-//
-// Examples:
-//
-// This instantiates tests from test suite StringTest
-// each with C-string values of "foo", "bar", and "baz":
-//
-// const char* strings[] = {"foo", "bar", "baz"};
-// INSTANTIATE_TEST_SUITE_P(StringSequence, StringTest, ValuesIn(strings));
-//
-// This instantiates tests from test suite StlStringTest
-// each with STL strings with values "a" and "b":
-//
-// ::std::vector< ::std::string> GetParameterStrings() {
-//   ::std::vector< ::std::string> v;
-//   v.push_back("a");
-//   v.push_back("b");
-//   return v;
-// }
-//
-// INSTANTIATE_TEST_SUITE_P(CharSequence,
-//                          StlStringTest,
-//                          ValuesIn(GetParameterStrings()));
-//
-//
-// This will also instantiate tests from CharTest
-// each with parameter values 'a' and 'b':
-//
-// ::std::list<char> GetParameterChars() {
-//   ::std::list<char> list;
-//   list.push_back('a');
-//   list.push_back('b');
-//   return list;
-// }
-// ::std::list<char> l = GetParameterChars();
-// INSTANTIATE_TEST_SUITE_P(CharSequence2,
-//                          CharTest,
-//                          ValuesIn(l.begin(), l.end()));
-//
-template <typename ForwardIterator>
-internal::ParamGenerator<
-    typename std::iterator_traits<ForwardIterator>::value_type>
-ValuesIn(ForwardIterator begin, ForwardIterator end) {
-  typedef typename std::iterator_traits<ForwardIterator>::value_type ParamType;
-  return internal::ParamGenerator<ParamType>(
-      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
-}
-
-template <typename T, size_t N>
-internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
-  return ValuesIn(array, array + N);
-}
-
-template <class Container>
-internal::ParamGenerator<typename Container::value_type> ValuesIn(
-    const Container& container) {
-  return ValuesIn(container.begin(), container.end());
-}
-
-// Values() allows generating tests from explicitly specified list of
-// parameters.
-//
-// Synopsis:
-// Values(T v1, T v2, ..., T vN)
-//   - returns a generator producing sequences with elements v1, v2, ..., vN.
-//
-// For example, this instantiates tests from test suite BarTest each
-// with values "one", "two", and "three":
-//
-// INSTANTIATE_TEST_SUITE_P(NumSequence,
-//                          BarTest,
-//                          Values("one", "two", "three"));
-//
-// This instantiates tests from test suite BazTest each with values 1, 2, 3.5.
-// The exact type of values will depend on the type of parameter in BazTest.
-//
-// INSTANTIATE_TEST_SUITE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
-//
-//
-template <typename... T>
-internal::ValueArray<T...> Values(T... v) {
-  return internal::ValueArray<T...>(std::move(v)...);
-}
-
-// Bool() allows generating tests with parameters in a set of (false, true).
-//
-// Synopsis:
-// Bool()
-//   - returns a generator producing sequences with elements {false, true}.
-//
-// It is useful when testing code that depends on Boolean flags. Combinations
-// of multiple flags can be tested when several Bool()'s are combined using
-// Combine() function.
-//
-// In the following example all tests in the test suite FlagDependentTest
-// will be instantiated twice with parameters false and true.
-//
-// class FlagDependentTest : public testing::TestWithParam<bool> {
-//   virtual void SetUp() {
-//     external_flag = GetParam();
-//   }
-// }
-// INSTANTIATE_TEST_SUITE_P(BoolSequence, FlagDependentTest, Bool());
-//
-inline internal::ParamGenerator<bool> Bool() {
-  return Values(false, true);
-}
-
-// Combine() allows the user to combine two or more sequences to produce
-// values of a Cartesian product of those sequences' elements.
-//
-// Synopsis:
-// Combine(gen1, gen2, ..., genN)
-//   - returns a generator producing sequences with elements coming from
-//     the Cartesian product of elements from the sequences generated by
-//     gen1, gen2, ..., genN. The sequence elements will have a type of
-//     std::tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
-//     of elements from sequences produces by gen1, gen2, ..., genN.
-//
-// Example:
-//
-// This will instantiate tests in test suite AnimalTest each one with
-// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
-// tuple("dog", BLACK), and tuple("dog", WHITE):
-//
-// enum Color { BLACK, GRAY, WHITE };
-// class AnimalTest
-//     : public testing::TestWithParam<std::tuple<const char*, Color> > {...};
-//
-// TEST_P(AnimalTest, AnimalLooksNice) {...}
-//
-// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
-//                          Combine(Values("cat", "dog"),
-//                                  Values(BLACK, WHITE)));
-//
-// This will instantiate tests in FlagDependentTest with all variations of two
-// Boolean flags:
-//
-// class FlagDependentTest
-//     : public testing::TestWithParam<std::tuple<bool, bool> > {
-//   virtual void SetUp() {
-//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
-//     std::tie(external_flag_1, external_flag_2) = GetParam();
-//   }
-// };
-//
-// TEST_P(FlagDependentTest, TestFeature1) {
-//   // Test your code using external_flag_1 and external_flag_2 here.
-// }
-// INSTANTIATE_TEST_SUITE_P(TwoBoolSequence, FlagDependentTest,
-//                          Combine(Bool(), Bool()));
-//
-template <typename... Generator>
-internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
-  return internal::CartesianProductHolder<Generator...>(g...);
-}
-
-#define TEST_P(test_suite_name, test_name)                                     \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
-      : public test_suite_name {                                               \
-   public:                                                                     \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
-    void TestBody() override;                                                  \
-                                                                               \
-   private:                                                                    \
-    static int AddToRegistry() {                                               \
-      ::testing::UnitTest::GetInstance()                                       \
-          ->parameterized_test_registry()                                      \
-          .GetTestSuitePatternHolder<test_suite_name>(                         \
-              GTEST_STRINGIFY_(test_suite_name),                               \
-              ::testing::internal::CodeLocation(__FILE__, __LINE__))           \
-          ->AddTestPattern(                                                    \
-              GTEST_STRINGIFY_(test_suite_name), GTEST_STRINGIFY_(test_name),  \
-              new ::testing::internal::TestMetaFactory<GTEST_TEST_CLASS_NAME_( \
-                  test_suite_name, test_name)>(),                              \
-              ::testing::internal::CodeLocation(__FILE__, __LINE__));          \
-      return 0;                                                                \
-    }                                                                          \
-    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
-                                                           test_name));        \
-  };                                                                           \
-  int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
-                             test_name)::gtest_registering_dummy_ =            \
-      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry();     \
-  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
-
-// The last argument to INSTANTIATE_TEST_SUITE_P allows the user to specify
-// generator and an optional function or functor that generates custom test name
-// suffixes based on the test parameters. Such a function or functor should
-// accept one argument of type testing::TestParamInfo<class ParamType>, and
-// return std::string.
-//
-// testing::PrintToStringParamName is a builtin test suffix generator that
-// returns the value of testing::PrintToString(GetParam()).
-//
-// Note: test names must be non-empty, unique, and may only contain ASCII
-// alphanumeric characters or underscore. Because PrintToString adds quotes
-// to std::string and C strings, it won't work for these types.
-
-#define GTEST_EXPAND_(arg) arg
-#define GTEST_GET_FIRST_(first, ...) first
-#define GTEST_GET_SECOND_(first, second, ...) second
-
-#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)                \
-  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>      \
-      gtest_##prefix##test_suite_name##_EvalGenerator_() {                    \
-    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));        \
-  }                                                                           \
-  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(   \
-      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {     \
-    if (::testing::internal::AlwaysFalse()) {                                 \
-      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(      \
-          __VA_ARGS__,                                                        \
-          ::testing::internal::DefaultParamName<test_suite_name::ParamType>,  \
-          DUMMY_PARAM_)));                                                    \
-      auto t = std::make_tuple(__VA_ARGS__);                                  \
-      static_assert(std::tuple_size<decltype(t)>::value <= 2,                 \
-                    "Too Many Args!");                                        \
-    }                                                                         \
-    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                 \
-        __VA_ARGS__,                                                          \
-        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,    \
-        DUMMY_PARAM_))))(info);                                               \
-  }                                                                           \
-  static int gtest_##prefix##test_suite_name##_dummy_                         \
-      GTEST_ATTRIBUTE_UNUSED_ =                                               \
-          ::testing::UnitTest::GetInstance()                                  \
-              ->parameterized_test_registry()                                 \
-              .GetTestSuitePatternHolder<test_suite_name>(                    \
-                  GTEST_STRINGIFY_(test_suite_name),                          \
-                  ::testing::internal::CodeLocation(__FILE__, __LINE__))      \
-              ->AddTestSuiteInstantiation(                                    \
-                  GTEST_STRINGIFY_(prefix),                                   \
-                  &gtest_##prefix##test_suite_name##_EvalGenerator_,          \
-                  &gtest_##prefix##test_suite_name##_EvalGenerateName_,       \
-                  __FILE__, __LINE__)
-
-
-// Allow Marking a Parameterized test class as not needing to be instantiated.
-#define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T)                   \
-  namespace gtest_do_not_use_outside_namespace_scope {}                   \
-  static const ::testing::internal::MarkAsIgnored gtest_allow_ignore_##T( \
-      GTEST_STRINGIFY_(T))
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define INSTANTIATE_TEST_CASE_P                                            \
-  static_assert(::testing::internal::InstantiateTestCase_P_IsDeprecated(), \
-                "");                                                       \
-  INSTANTIATE_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Testing and Mocking Framework definitions useful in production code.
-// GOOGLETEST_CM0003 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
-
-// When you need to test the private or protected members of a class,
-// use the FRIEND_TEST macro to declare your tests as friends of the
-// class.  For example:
-//
-// class MyClass {
-//  private:
-//   void PrivateMethod();
-//   FRIEND_TEST(MyClassTest, PrivateMethodWorks);
-// };
-//
-// class MyClassTest : public testing::Test {
-//   // ...
-// };
-//
-// TEST_F(MyClassTest, PrivateMethodWorks) {
-//   // Can call MyClass::PrivateMethod() here.
-// }
-//
-// Note: The test class must be in the same namespace as the class being tested.
-// For example, putting MyClassTest in an anonymous namespace will not work.
-
-#define FRIEND_TEST(test_case_name, test_name)\
-friend class test_case_name##_##test_name##_Test
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-
-// This header implements typed tests and type-parameterized tests.
-
-// Typed (aka type-driven) tests repeat the same test for types in a
-// list.  You must know which types you want to test with when writing
-// typed tests. Here's how you do it:
-
-#if 0
-
-// First, define a fixture class template.  It should be parameterized
-// by a type.  Remember to derive it from testing::Test.
-template <typename T>
-class FooTest : public testing::Test {
- public:
-  ...
-  typedef std::list<T> List;
-  static T shared_;
-  T value_;
-};
-
-// Next, associate a list of types with the test suite, which will be
-// repeated for each type in the list.  The typedef is necessary for
-// the macro to parse correctly.
-typedef testing::Types<char, int, unsigned int> MyTypes;
-TYPED_TEST_SUITE(FooTest, MyTypes);
-
-// If the type list contains only one type, you can write that type
-// directly without Types<...>:
-//   TYPED_TEST_SUITE(FooTest, int);
-
-// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
-// tests for this test suite as you want.
-TYPED_TEST(FooTest, DoesBlah) {
-  // Inside a test, refer to the special name TypeParam to get the type
-  // parameter.  Since we are inside a derived class template, C++ requires
-  // us to visit the members of FooTest via 'this'.
-  TypeParam n = this->value_;
-
-  // To visit static members of the fixture, add the TestFixture::
-  // prefix.
-  n += TestFixture::shared_;
-
-  // To refer to typedefs in the fixture, add the "typename
-  // TestFixture::" prefix.
-  typename TestFixture::List values;
-  values.push_back(n);
-  ...
-}
-
-TYPED_TEST(FooTest, HasPropertyA) { ... }
-
-// TYPED_TEST_SUITE takes an optional third argument which allows to specify a
-// class that generates custom test name suffixes based on the type. This should
-// be a class which has a static template function GetName(int index) returning
-// a string for each type. The provided integer index equals the index of the
-// type in the provided type list. In many cases the index can be ignored.
-//
-// For example:
-//   class MyTypeNames {
-//    public:
-//     template <typename T>
-//     static std::string GetName(int) {
-//       if (std::is_same<T, char>()) return "char";
-//       if (std::is_same<T, int>()) return "int";
-//       if (std::is_same<T, unsigned int>()) return "unsignedInt";
-//     }
-//   };
-//   TYPED_TEST_SUITE(FooTest, MyTypes, MyTypeNames);
-
-#endif  // 0
-
-// Type-parameterized tests are abstract test patterns parameterized
-// by a type.  Compared with typed tests, type-parameterized tests
-// allow you to define the test pattern without knowing what the type
-// parameters are.  The defined pattern can be instantiated with
-// different types any number of times, in any number of translation
-// units.
-//
-// If you are designing an interface or concept, you can define a
-// suite of type-parameterized tests to verify properties that any
-// valid implementation of the interface/concept should have.  Then,
-// each implementation can easily instantiate the test suite to verify
-// that it conforms to the requirements, without having to write
-// similar tests repeatedly.  Here's an example:
-
-#if 0
-
-// First, define a fixture class template.  It should be parameterized
-// by a type.  Remember to derive it from testing::Test.
-template <typename T>
-class FooTest : public testing::Test {
-  ...
-};
-
-// Next, declare that you will define a type-parameterized test suite
-// (the _P suffix is for "parameterized" or "pattern", whichever you
-// prefer):
-TYPED_TEST_SUITE_P(FooTest);
-
-// Then, use TYPED_TEST_P() to define as many type-parameterized tests
-// for this type-parameterized test suite as you want.
-TYPED_TEST_P(FooTest, DoesBlah) {
-  // Inside a test, refer to TypeParam to get the type parameter.
-  TypeParam n = 0;
-  ...
-}
-
-TYPED_TEST_P(FooTest, HasPropertyA) { ... }
-
-// Now the tricky part: you need to register all test patterns before
-// you can instantiate them.  The first argument of the macro is the
-// test suite name; the rest are the names of the tests in this test
-// case.
-REGISTER_TYPED_TEST_SUITE_P(FooTest,
-                            DoesBlah, HasPropertyA);
-
-// Finally, you are free to instantiate the pattern with the types you
-// want.  If you put the above code in a header file, you can #include
-// it in multiple C++ source files and instantiate it multiple times.
-//
-// To distinguish different instances of the pattern, the first
-// argument to the INSTANTIATE_* macro is a prefix that will be added
-// to the actual test suite name.  Remember to pick unique prefixes for
-// different instances.
-typedef testing::Types<char, int, unsigned int> MyTypes;
-INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
-
-// If the type list contains only one type, you can write that type
-// directly without Types<...>:
-//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, int);
-//
-// Similar to the optional argument of TYPED_TEST_SUITE above,
-// INSTANTIATE_TEST_SUITE_P takes an optional fourth argument which allows to
-// generate custom names.
-//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes, MyTypeNames);
-
-#endif  // 0
-
-
-// Implements typed tests.
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the name of the typedef for the type parameters of the
-// given test suite.
-#define GTEST_TYPE_PARAMS_(TestSuiteName) gtest_type_params_##TestSuiteName##_
-
-// Expands to the name of the typedef for the NameGenerator, responsible for
-// creating the suffixes of the name.
-#define GTEST_NAME_GENERATOR_(TestSuiteName) \
-  gtest_type_params_##TestSuiteName##_NameGenerator
-
-#define TYPED_TEST_SUITE(CaseName, Types, ...)                          \
-  typedef ::testing::internal::GenerateTypeList<Types>::type            \
-      GTEST_TYPE_PARAMS_(CaseName);                                     \
-  typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type \
-      GTEST_NAME_GENERATOR_(CaseName)
-
-#define TYPED_TEST(CaseName, TestName)                                        \
-  static_assert(sizeof(GTEST_STRINGIFY_(TestName)) > 1,                       \
-                "test-name must not be empty");                               \
-  template <typename gtest_TypeParam_>                                        \
-  class GTEST_TEST_CLASS_NAME_(CaseName, TestName)                            \
-      : public CaseName<gtest_TypeParam_> {                                   \
-   private:                                                                   \
-    typedef CaseName<gtest_TypeParam_> TestFixture;                           \
-    typedef gtest_TypeParam_ TypeParam;                                       \
-    void TestBody() override;                                                 \
-  };                                                                          \
-  static bool gtest_##CaseName##_##TestName##_registered_                     \
-      GTEST_ATTRIBUTE_UNUSED_ = ::testing::internal::TypeParameterizedTest<   \
-          CaseName,                                                           \
-          ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName,   \
-                                                                  TestName)>, \
-          GTEST_TYPE_PARAMS_(                                                 \
-              CaseName)>::Register("",                                        \
-                                   ::testing::internal::CodeLocation(         \
-                                       __FILE__, __LINE__),                   \
-                                   GTEST_STRINGIFY_(CaseName),                \
-                                   GTEST_STRINGIFY_(TestName), 0,             \
-                                   ::testing::internal::GenerateNames<        \
-                                       GTEST_NAME_GENERATOR_(CaseName),       \
-                                       GTEST_TYPE_PARAMS_(CaseName)>());      \
-  template <typename gtest_TypeParam_>                                        \
-  void GTEST_TEST_CLASS_NAME_(CaseName,                                       \
-                              TestName)<gtest_TypeParam_>::TestBody()
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define TYPED_TEST_CASE                                                \
-  static_assert(::testing::internal::TypedTestCaseIsDeprecated(), ""); \
-  TYPED_TEST_SUITE
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Implements type-parameterized tests.
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the namespace name that the type-parameterized tests for
-// the given type-parameterized test suite are defined in.  The exact
-// name of the namespace is subject to change without notice.
-#define GTEST_SUITE_NAMESPACE_(TestSuiteName) gtest_suite_##TestSuiteName##_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the name of the variable used to remember the names of
-// the defined tests in the given test suite.
-#define GTEST_TYPED_TEST_SUITE_P_STATE_(TestSuiteName) \
-  gtest_typed_test_suite_p_state_##TestSuiteName##_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
-//
-// Expands to the name of the variable used to remember the names of
-// the registered tests in the given test suite.
-#define GTEST_REGISTERED_TEST_NAMES_(TestSuiteName) \
-  gtest_registered_test_names_##TestSuiteName##_
-
-// The variables defined in the type-parameterized test macros are
-// static as typically these macros are used in a .h file that can be
-// #included in multiple translation units linked together.
-#define TYPED_TEST_SUITE_P(SuiteName)              \
-  static ::testing::internal::TypedTestSuitePState \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define TYPED_TEST_CASE_P                                                 \
-  static_assert(::testing::internal::TypedTestCase_P_IsDeprecated(), ""); \
-  TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#define TYPED_TEST_P(SuiteName, TestName)                             \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                       \
-    template <typename gtest_TypeParam_>                              \
-    class TestName : public SuiteName<gtest_TypeParam_> {             \
-     private:                                                         \
-      typedef SuiteName<gtest_TypeParam_> TestFixture;                \
-      typedef gtest_TypeParam_ TypeParam;                             \
-      void TestBody() override;                                       \
-    };                                                                \
-    static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
-        GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName(       \
-            __FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName),          \
-            GTEST_STRINGIFY_(TestName));                              \
-  }                                                                   \
-  template <typename gtest_TypeParam_>                                \
-  void GTEST_SUITE_NAMESPACE_(                                        \
-      SuiteName)::TestName<gtest_TypeParam_>::TestBody()
-
-// Note: this won't work correctly if the trailing arguments are macros.
-#define REGISTER_TYPED_TEST_SUITE_P(SuiteName, ...)                         \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                             \
-    typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_;    \
-  }                                                                         \
-  static const char* const GTEST_REGISTERED_TEST_NAMES_(                    \
-      SuiteName) GTEST_ATTRIBUTE_UNUSED_ =                                  \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).VerifyRegisteredTestNames( \
-          GTEST_STRINGIFY_(SuiteName), __FILE__, __LINE__, #__VA_ARGS__)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define REGISTER_TYPED_TEST_CASE_P                                           \
-  static_assert(::testing::internal::RegisterTypedTestCase_P_IsDeprecated(), \
-                "");                                                         \
-  REGISTER_TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#define INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, SuiteName, Types, ...)       \
-  static_assert(sizeof(GTEST_STRINGIFY_(Prefix)) > 1,                       \
-                "test-suit-prefix must not be empty");                      \
-  static bool gtest_##Prefix##_##SuiteName GTEST_ATTRIBUTE_UNUSED_ =        \
-      ::testing::internal::TypeParameterizedTestSuite<                      \
-          SuiteName, GTEST_SUITE_NAMESPACE_(SuiteName)::gtest_AllTests_,    \
-          ::testing::internal::GenerateTypeList<Types>::type>::             \
-          Register(GTEST_STRINGIFY_(Prefix),                                \
-                   ::testing::internal::CodeLocation(__FILE__, __LINE__),   \
-                   &GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName),             \
-                   GTEST_STRINGIFY_(SuiteName),                             \
-                   GTEST_REGISTERED_TEST_NAMES_(SuiteName),                 \
-                   ::testing::internal::GenerateNames<                      \
-                       ::testing::internal::NameGeneratorSelector<          \
-                           __VA_ARGS__>::type,                              \
-                       ::testing::internal::GenerateTypeList<Types>::type>())
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define INSTANTIATE_TYPED_TEST_CASE_P                                      \
-  static_assert(                                                           \
-      ::testing::internal::InstantiateTypedTestCase_P_IsDeprecated(), ""); \
-  INSTANTIATE_TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// Silence C4100 (unreferenced formal parameter) and 4805
-// unsafe mix of type 'const int' and type 'const bool'
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4805)
-# pragma warning(disable:4100)
-#endif
-
-
-// Declares the flags.
-
-// This flag temporary enables the disabled tests.
-GTEST_DECLARE_bool_(also_run_disabled_tests);
-
-// This flag brings the debugger on an assertion failure.
-GTEST_DECLARE_bool_(break_on_failure);
-
-// This flag controls whether Google Test catches all test-thrown exceptions
-// and logs them as failures.
-GTEST_DECLARE_bool_(catch_exceptions);
-
-// This flag enables using colors in terminal output. Available values are
-// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
-// to let Google Test decide.
-GTEST_DECLARE_string_(color);
-
-// This flag controls whether the test runner should continue execution past
-// first failure.
-GTEST_DECLARE_bool_(fail_fast);
-
-// This flag sets up the filter to select by name using a glob pattern
-// the tests to run. If the filter is not given all tests are executed.
-GTEST_DECLARE_string_(filter);
-
-// This flag controls whether Google Test installs a signal handler that dumps
-// debugging information when fatal signals are raised.
-GTEST_DECLARE_bool_(install_failure_signal_handler);
-
-// This flag causes the Google Test to list tests. None of the tests listed
-// are actually run if the flag is provided.
-GTEST_DECLARE_bool_(list_tests);
-
-// This flag controls whether Google Test emits a detailed XML report to a file
-// in addition to its normal textual output.
-GTEST_DECLARE_string_(output);
-
-// This flags control whether Google Test prints only test failures.
-GTEST_DECLARE_bool_(brief);
-
-// This flags control whether Google Test prints the elapsed time for each
-// test.
-GTEST_DECLARE_bool_(print_time);
-
-// This flags control whether Google Test prints UTF8 characters as text.
-GTEST_DECLARE_bool_(print_utf8);
-
-// This flag specifies the random number seed.
-GTEST_DECLARE_int32_(random_seed);
-
-// This flag sets how many times the tests are repeated. The default value
-// is 1. If the value is -1 the tests are repeating forever.
-GTEST_DECLARE_int32_(repeat);
-
-// This flag controls whether Google Test includes Google Test internal
-// stack frames in failure stack traces.
-GTEST_DECLARE_bool_(show_internal_stack_frames);
-
-// When this flag is specified, tests' order is randomized on every iteration.
-GTEST_DECLARE_bool_(shuffle);
-
-// This flag specifies the maximum number of stack frames to be
-// printed in a failure message.
-GTEST_DECLARE_int32_(stack_trace_depth);
-
-// When this flag is specified, a failed assertion will throw an
-// exception if exceptions are enabled, or exit the program with a
-// non-zero code otherwise. For use with an external test framework.
-GTEST_DECLARE_bool_(throw_on_failure);
-
-// When this flag is set with a "host:port" string, on supported
-// platforms test results are streamed to the specified port on
-// the specified host machine.
-GTEST_DECLARE_string_(stream_result_to);
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-GTEST_DECLARE_string_(flagfile);
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-// The upper limit for valid stack trace depths.
-const int kMaxStackTraceDepth = 100;
-
-namespace internal {
-
-class AssertHelper;
-class DefaultGlobalTestPartResultReporter;
-class ExecDeathTest;
-class NoExecDeathTest;
-class FinalSuccessChecker;
-class GTestFlagSaver;
-class StreamingListenerTest;
-class TestResultAccessor;
-class TestEventListenersAccessor;
-class TestEventRepeater;
-class UnitTestRecordPropertyTestHelper;
-class WindowsDeathTest;
-class FuchsiaDeathTest;
-class UnitTestImpl* GetUnitTestImpl();
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
-                                    const std::string& message);
-std::set<std::string>* GetIgnoredParameterizedTestSuites();
-
-}  // namespace internal
-
-// The friend relationship of some of these classes is cyclic.
-// If we don't forward declare them the compiler might confuse the classes
-// in friendship clauses with same named classes on the scope.
-class Test;
-class TestSuite;
-
-// Old API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-using TestCase = TestSuite;
-#endif
-class TestInfo;
-class UnitTest;
-
-// A class for indicating whether an assertion was successful.  When
-// the assertion wasn't successful, the AssertionResult object
-// remembers a non-empty message that describes how it failed.
-//
-// To create an instance of this class, use one of the factory functions
-// (AssertionSuccess() and AssertionFailure()).
-//
-// This class is useful for two purposes:
-//   1. Defining predicate functions to be used with Boolean test assertions
-//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
-//   2. Defining predicate-format functions to be
-//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
-//
-// For example, if you define IsEven predicate:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
-// will print the message
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false (5 is odd)
-//   Expected: true
-//
-// instead of a more opaque
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false
-//   Expected: true
-//
-// in case IsEven is a simple Boolean predicate.
-//
-// If you expect your predicate to be reused and want to support informative
-// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
-// about half as often as positive ones in our tests), supply messages for
-// both success and failure cases:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess() << n << " is even";
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
-//
-//   Value of: IsEven(Fib(6))
-//     Actual: true (8 is even)
-//   Expected: false
-//
-// NB: Predicates that support negative Boolean assertions have reduced
-// performance in positive ones so be careful not to use them in tests
-// that have lots (tens of thousands) of positive Boolean assertions.
-//
-// To use this class with EXPECT_PRED_FORMAT assertions such as:
-//
-//   // Verifies that Foo() returns an even number.
-//   EXPECT_PRED_FORMAT1(IsEven, Foo());
-//
-// you need to define:
-//
-//   testing::AssertionResult IsEven(const char* expr, int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure()
-//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
-//   }
-//
-// If Foo() returns 5, you will see the following message:
-//
-//   Expected: Foo() is even
-//     Actual: it's 5
-//
-class GTEST_API_ AssertionResult {
- public:
-  // Copy constructor.
-  // Used in EXPECT_TRUE/FALSE(assertion_result).
-  AssertionResult(const AssertionResult& other);
-
-// C4800 is a level 3 warning in Visual Studio 2015 and earlier.
-// This warning is not emitted in Visual Studio 2017.
-// This warning is off by default starting in Visual Studio 2019 but can be
-// enabled with command-line options.
-#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
-#endif
-
-  // Used in the EXPECT_TRUE/FALSE(bool_expression).
-  //
-  // T must be contextually convertible to bool.
-  //
-  // The second parameter prevents this overload from being considered if
-  // the argument is implicitly convertible to AssertionResult. In that case
-  // we want AssertionResult's copy constructor to be used.
-  template <typename T>
-  explicit AssertionResult(
-      const T& success,
-      typename std::enable_if<
-          !std::is_convertible<T, AssertionResult>::value>::type*
-      /*enabler*/
-      = nullptr)
-      : success_(success) {}
-
-#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-  // Assignment operator.
-  AssertionResult& operator=(AssertionResult other) {
-    swap(other);
-    return *this;
-  }
-
-  // Returns true if and only if the assertion succeeded.
-  operator bool() const { return success_; }  // NOLINT
-
-  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-  AssertionResult operator!() const;
-
-  // Returns the text streamed into this AssertionResult. Test assertions
-  // use it when they fail (i.e., the predicate's outcome doesn't match the
-  // assertion's expectation). When nothing has been streamed into the
-  // object, returns an empty string.
-  const char* message() const {
-    return message_.get() != nullptr ? message_->c_str() : "";
-  }
-  // Deprecated; please use message() instead.
-  const char* failure_message() const { return message(); }
-
-  // Streams a custom failure message into this object.
-  template <typename T> AssertionResult& operator<<(const T& value) {
-    AppendMessage(Message() << value);
-    return *this;
-  }
-
-  // Allows streaming basic output manipulators such as endl or flush into
-  // this object.
-  AssertionResult& operator<<(
-      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
-    AppendMessage(Message() << basic_manipulator);
-    return *this;
-  }
-
- private:
-  // Appends the contents of message to message_.
-  void AppendMessage(const Message& a_message) {
-    if (message_.get() == nullptr) message_.reset(new ::std::string);
-    message_->append(a_message.GetString().c_str());
-  }
-
-  // Swap the contents of this AssertionResult with other.
-  void swap(AssertionResult& other);
-
-  // Stores result of the assertion predicate.
-  bool success_;
-  // Stores the message describing the condition in case the expectation
-  // construct is not satisfied with the predicate's outcome.
-  // Referenced via a pointer to avoid taking too much stack frame space
-  // with test assertions.
-  std::unique_ptr< ::std::string> message_;
-};
-
-// Makes a successful assertion result.
-GTEST_API_ AssertionResult AssertionSuccess();
-
-// Makes a failed assertion result.
-GTEST_API_ AssertionResult AssertionFailure();
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << msg.
-GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
-
-}  // namespace testing
-
-// Includes the auto-generated header that implements a family of generic
-// predicate assertion macros. This include comes late because it relies on
-// APIs declared above.
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file is AUTOMATICALLY GENERATED on 01/02/2019 by command
-// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
-//
-// Implements a family of generic predicate assertion macros.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-
-
-namespace testing {
-
-// This header implements a family of generic predicate assertion
-// macros:
-//
-//   ASSERT_PRED_FORMAT1(pred_format, v1)
-//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
-//   ...
-//
-// where pred_format is a function or functor that takes n (in the
-// case of ASSERT_PRED_FORMATn) values and their source expression
-// text, and returns a testing::AssertionResult.  See the definition
-// of ASSERT_EQ in gtest.h for an example.
-//
-// If you don't care about formatting, you can use the more
-// restrictive version:
-//
-//   ASSERT_PRED1(pred, v1)
-//   ASSERT_PRED2(pred, v1, v2)
-//   ...
-//
-// where pred is an n-ary function or functor that returns bool,
-// and the values v1, v2, ..., must support the << operator for
-// streaming to std::ostream.
-//
-// We also define the EXPECT_* variations.
-//
-// For now we only support predicates whose arity is at most 5.
-// Please email googletestframework@googlegroups.com if you need
-// support for higher arities.
-
-// GTEST_ASSERT_ is the basic statement to which all of the assertions
-// in this file reduce.  Don't use this in your code.
-
-#define GTEST_ASSERT_(expression, on_failure) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (const ::testing::AssertionResult gtest_ar = (expression)) \
-    ; \
-  else \
-    on_failure(gtest_ar.failure_message())
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1>
-AssertionResult AssertPred1Helper(const char* pred_text,
-                                  const char* e1,
-                                  Pred pred,
-                                  const T1& v1) {
-  if (pred(v1)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, v1), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
-// this in your code.
-#define GTEST_PRED1_(pred, v1, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
-                                             #v1, \
-                                             pred, \
-                                             v1), on_failure)
-
-// Unary predicate assertion macros.
-#define EXPECT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED1(pred, v1) \
-  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED1(pred, v1) \
-  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2>
-AssertionResult AssertPred2Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2) {
-  if (pred(v1, v2)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
-// this in your code.
-#define GTEST_PRED2_(pred, v1, v2, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             pred, \
-                                             v1, \
-                                             v2), on_failure)
-
-// Binary predicate assertion macros.
-#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
-  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED2(pred, v1, v2) \
-  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
-  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED2(pred, v1, v2) \
-  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3>
-AssertionResult AssertPred3Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3) {
-  if (pred(v1, v2, v3)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
-// this in your code.
-#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3), on_failure)
-
-// Ternary predicate assertion macros.
-#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
-  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED3(pred, v1, v2, v3) \
-  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
-  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED3(pred, v1, v2, v3) \
-  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4>
-AssertionResult AssertPred4Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  const char* e4,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3,
-                                  const T4& v4) {
-  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
-         << e4 << " evaluates to " << ::testing::PrintToString(v4);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
-// this in your code.
-#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             #v4, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3, \
-                                             v4), on_failure)
-
-// 4-ary predicate assertion macros.
-#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
-  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
-  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
-  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
-  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4,
-          typename T5>
-AssertionResult AssertPred5Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  const char* e4,
-                                  const char* e5,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3,
-                                  const T4& v4,
-                                  const T5& v5) {
-  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
-         << ", " << e5 << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
-         << e4 << " evaluates to " << ::testing::PrintToString(v4) << "\n"
-         << e5 << " evaluates to " << ::testing::PrintToString(v5);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
-// this in your code.
-#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             #v4, \
-                                             #v5, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3, \
-                                             v4, \
-                                             v5), on_failure)
-
-// 5-ary predicate assertion macros.
-#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
-  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
-  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
-  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
-  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
-
-
-
-}  // namespace testing
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-
-namespace testing {
-
-// The abstract class that all tests inherit from.
-//
-// In Google Test, a unit test program contains one or many TestSuites, and
-// each TestSuite contains one or many Tests.
-//
-// When you define a test using the TEST macro, you don't need to
-// explicitly derive from Test - the TEST macro automatically does
-// this for you.
-//
-// The only time you derive from Test is when defining a test fixture
-// to be used in a TEST_F.  For example:
-//
-//   class FooTest : public testing::Test {
-//    protected:
-//     void SetUp() override { ... }
-//     void TearDown() override { ... }
-//     ...
-//   };
-//
-//   TEST_F(FooTest, Bar) { ... }
-//   TEST_F(FooTest, Baz) { ... }
-//
-// Test is not copyable.
-class GTEST_API_ Test {
- public:
-  friend class TestInfo;
-
-  // The d'tor is virtual as we intend to inherit from Test.
-  virtual ~Test();
-
-  // Sets up the stuff shared by all tests in this test suite.
-  //
-  // Google Test will call Foo::SetUpTestSuite() before running the first
-  // test in test suite Foo.  Hence a sub-class can define its own
-  // SetUpTestSuite() method to shadow the one defined in the super
-  // class.
-  static void SetUpTestSuite() {}
-
-  // Tears down the stuff shared by all tests in this test suite.
-  //
-  // Google Test will call Foo::TearDownTestSuite() after running the last
-  // test in test suite Foo.  Hence a sub-class can define its own
-  // TearDownTestSuite() method to shadow the one defined in the super
-  // class.
-  static void TearDownTestSuite() {}
-
-  // Legacy API is deprecated but still available. Use SetUpTestSuite and
-  // TearDownTestSuite instead.
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  static void TearDownTestCase() {}
-  static void SetUpTestCase() {}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns true if and only if the current test has a fatal failure.
-  static bool HasFatalFailure();
-
-  // Returns true if and only if the current test has a non-fatal failure.
-  static bool HasNonfatalFailure();
-
-  // Returns true if and only if the current test was skipped.
-  static bool IsSkipped();
-
-  // Returns true if and only if the current test has a (either fatal or
-  // non-fatal) failure.
-  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
-
-  // Logs a property for the current test, test suite, or for the entire
-  // invocation of the test program when used outside of the context of a
-  // test suite.  Only the last value for a given key is remembered.  These
-  // are public static so they can be called from utility functions that are
-  // not members of the test fixture.  Calls to RecordProperty made during
-  // lifespan of the test (from the moment its constructor starts to the
-  // moment its destructor finishes) will be output in XML as attributes of
-  // the <testcase> element.  Properties recorded from fixture's
-  // SetUpTestSuite or TearDownTestSuite are logged as attributes of the
-  // corresponding <testsuite> element.  Calls to RecordProperty made in the
-  // global context (before or after invocation of RUN_ALL_TESTS and from
-  // SetUp/TearDown method of Environment objects registered with Google
-  // Test) will be output as attributes of the <testsuites> element.
-  static void RecordProperty(const std::string& key, const std::string& value);
-  static void RecordProperty(const std::string& key, int value);
-
- protected:
-  // Creates a Test object.
-  Test();
-
-  // Sets up the test fixture.
-  virtual void SetUp();
-
-  // Tears down the test fixture.
-  virtual void TearDown();
-
- private:
-  // Returns true if and only if the current test has the same fixture class
-  // as the first test in the current test suite.
-  static bool HasSameFixtureClass();
-
-  // Runs the test after the test fixture has been set up.
-  //
-  // A sub-class must implement this to define the test logic.
-  //
-  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
-  // Instead, use the TEST or TEST_F macro.
-  virtual void TestBody() = 0;
-
-  // Sets up, executes, and tears down the test.
-  void Run();
-
-  // Deletes self.  We deliberately pick an unusual name for this
-  // internal method to avoid clashing with names used in user TESTs.
-  void DeleteSelf_() { delete this; }
-
-  const std::unique_ptr<GTEST_FLAG_SAVER_> gtest_flag_saver_;
-
-  // Often a user misspells SetUp() as Setup() and spends a long time
-  // wondering why it is never called by Google Test.  The declaration of
-  // the following method is solely for catching such an error at
-  // compile time:
-  //
-  //   - The return type is deliberately chosen to be not void, so it
-  //   will be a conflict if void Setup() is declared in the user's
-  //   test fixture.
-  //
-  //   - This method is private, so it will be another compiler error
-  //   if the method is called from the user's test fixture.
-  //
-  // DO NOT OVERRIDE THIS FUNCTION.
-  //
-  // If you see an error about overriding the following function or
-  // about it being private, you have mis-spelled SetUp() as Setup().
-  struct Setup_should_be_spelled_SetUp {};
-  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
-
-  // We disallow copying Tests.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
-};
-
-typedef internal::TimeInMillis TimeInMillis;
-
-// A copyable object representing a user specified test property which can be
-// output as a key/value string pair.
-//
-// Don't inherit from TestProperty as its destructor is not virtual.
-class TestProperty {
- public:
-  // C'tor.  TestProperty does NOT have a default constructor.
-  // Always use this constructor (with parameters) to create a
-  // TestProperty object.
-  TestProperty(const std::string& a_key, const std::string& a_value) :
-    key_(a_key), value_(a_value) {
-  }
-
-  // Gets the user supplied key.
-  const char* key() const {
-    return key_.c_str();
-  }
-
-  // Gets the user supplied value.
-  const char* value() const {
-    return value_.c_str();
-  }
-
-  // Sets a new value, overriding the one supplied in the constructor.
-  void SetValue(const std::string& new_value) {
-    value_ = new_value;
-  }
-
- private:
-  // The key supplied by the user.
-  std::string key_;
-  // The value supplied by the user.
-  std::string value_;
-};
-
-// The result of a single Test.  This includes a list of
-// TestPartResults, a list of TestProperties, a count of how many
-// death tests there are in the Test, and how much time it took to run
-// the Test.
-//
-// TestResult is not copyable.
-class GTEST_API_ TestResult {
- public:
-  // Creates an empty TestResult.
-  TestResult();
-
-  // D'tor.  Do not inherit from TestResult.
-  ~TestResult();
-
-  // Gets the number of all test parts.  This is the sum of the number
-  // of successful test parts and the number of failed test parts.
-  int total_part_count() const;
-
-  // Returns the number of the test properties.
-  int test_property_count() const;
-
-  // Returns true if and only if the test passed (i.e. no test part failed).
-  bool Passed() const { return !Skipped() && !Failed(); }
-
-  // Returns true if and only if the test was skipped.
-  bool Skipped() const;
-
-  // Returns true if and only if the test failed.
-  bool Failed() const;
-
-  // Returns true if and only if the test fatally failed.
-  bool HasFatalFailure() const;
-
-  // Returns true if and only if the test has a non-fatal failure.
-  bool HasNonfatalFailure() const;
-
-  // Returns the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Gets the time of the test case start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Returns the i-th test part result among all the results. i can range from 0
-  // to total_part_count() - 1. If i is not in that range, aborts the program.
-  const TestPartResult& GetTestPartResult(int i) const;
-
-  // Returns the i-th test property. i can range from 0 to
-  // test_property_count() - 1. If i is not in that range, aborts the
-  // program.
-  const TestProperty& GetTestProperty(int i) const;
-
- private:
-  friend class TestInfo;
-  friend class TestSuite;
-  friend class UnitTest;
-  friend class internal::DefaultGlobalTestPartResultReporter;
-  friend class internal::ExecDeathTest;
-  friend class internal::TestResultAccessor;
-  friend class internal::UnitTestImpl;
-  friend class internal::WindowsDeathTest;
-  friend class internal::FuchsiaDeathTest;
-
-  // Gets the vector of TestPartResults.
-  const std::vector<TestPartResult>& test_part_results() const {
-    return test_part_results_;
-  }
-
-  // Gets the vector of TestProperties.
-  const std::vector<TestProperty>& test_properties() const {
-    return test_properties_;
-  }
-
-  // Sets the start time.
-  void set_start_timestamp(TimeInMillis start) { start_timestamp_ = start; }
-
-  // Sets the elapsed time.
-  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
-
-  // Adds a test property to the list. The property is validated and may add
-  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
-  // key names). If a property is already recorded for the same key, the
-  // value will be updated, rather than storing multiple values for the same
-  // key.  xml_element specifies the element for which the property is being
-  // recorded and is used for validation.
-  void RecordProperty(const std::string& xml_element,
-                      const TestProperty& test_property);
-
-  // Adds a failure if the key is a reserved attribute of Google Test
-  // testsuite tags.  Returns true if the property is valid.
-  // FIXME: Validate attribute names are legal and human readable.
-  static bool ValidateTestProperty(const std::string& xml_element,
-                                   const TestProperty& test_property);
-
-  // Adds a test part result to the list.
-  void AddTestPartResult(const TestPartResult& test_part_result);
-
-  // Returns the death test count.
-  int death_test_count() const { return death_test_count_; }
-
-  // Increments the death test count, returning the new count.
-  int increment_death_test_count() { return ++death_test_count_; }
-
-  // Clears the test part results.
-  void ClearTestPartResults();
-
-  // Clears the object.
-  void Clear();
-
-  // Protects mutable state of the property vector and of owned
-  // properties, whose values may be updated.
-  internal::Mutex test_properties_mutex_;
-
-  // The vector of TestPartResults
-  std::vector<TestPartResult> test_part_results_;
-  // The vector of TestProperties
-  std::vector<TestProperty> test_properties_;
-  // Running count of death tests.
-  int death_test_count_;
-  // The start time, in milliseconds since UNIX Epoch.
-  TimeInMillis start_timestamp_;
-  // The elapsed time, in milliseconds.
-  TimeInMillis elapsed_time_;
-
-  // We disallow copying TestResult.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
-};  // class TestResult
-
-// A TestInfo object stores the following information about a test:
-//
-//   Test suite name
-//   Test name
-//   Whether the test should be run
-//   A function pointer that creates the test object when invoked
-//   Test result
-//
-// The constructor of TestInfo registers itself with the UnitTest
-// singleton such that the RUN_ALL_TESTS() macro knows which tests to
-// run.
-class GTEST_API_ TestInfo {
- public:
-  // Destructs a TestInfo object.  This function is not virtual, so
-  // don't inherit from TestInfo.
-  ~TestInfo();
-
-  // Returns the test suite name.
-  const char* test_suite_name() const { return test_suite_name_.c_str(); }
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const char* test_case_name() const { return test_suite_name(); }
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns the test name.
-  const char* name() const { return name_.c_str(); }
-
-  // Returns the name of the parameter type, or NULL if this is not a typed
-  // or a type-parameterized test.
-  const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns the text representation of the value parameter, or NULL if this
-  // is not a value-parameterized test.
-  const char* value_param() const {
-    if (value_param_.get() != nullptr) return value_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns the file name where this test is defined.
-  const char* file() const { return location_.file.c_str(); }
-
-  // Returns the line where this test is defined.
-  int line() const { return location_.line; }
-
-  // Return true if this test should not be run because it's in another shard.
-  bool is_in_another_shard() const { return is_in_another_shard_; }
-
-  // Returns true if this test should run, that is if the test is not
-  // disabled (or it is disabled but the also_run_disabled_tests flag has
-  // been specified) and its full name matches the user-specified filter.
-  //
-  // Google Test allows the user to filter the tests by their full names.
-  // The full name of a test Bar in test suite Foo is defined as
-  // "Foo.Bar".  Only the tests that match the filter will run.
-  //
-  // A filter is a colon-separated list of glob (not regex) patterns,
-  // optionally followed by a '-' and a colon-separated list of
-  // negative patterns (tests to exclude).  A test is run if it
-  // matches one of the positive patterns and does not match any of
-  // the negative patterns.
-  //
-  // For example, *A*:Foo.* is a filter that matches any string that
-  // contains the character 'A' or starts with "Foo.".
-  bool should_run() const { return should_run_; }
-
-  // Returns true if and only if this test will appear in the XML report.
-  bool is_reportable() const {
-    // The XML report includes tests matching the filter, excluding those
-    // run in other shards.
-    return matches_filter_ && !is_in_another_shard_;
-  }
-
-  // Returns the result of the test.
-  const TestResult* result() const { return &result_; }
-
- private:
-#if GTEST_HAS_DEATH_TEST
-  friend class internal::DefaultDeathTestFactory;
-#endif  // GTEST_HAS_DEATH_TEST
-  friend class Test;
-  friend class TestSuite;
-  friend class internal::UnitTestImpl;
-  friend class internal::StreamingListenerTest;
-  friend TestInfo* internal::MakeAndRegisterTestInfo(
-      const char* test_suite_name, const char* name, const char* type_param,
-      const char* value_param, internal::CodeLocation code_location,
-      internal::TypeId fixture_class_id, internal::SetUpTestSuiteFunc set_up_tc,
-      internal::TearDownTestSuiteFunc tear_down_tc,
-      internal::TestFactoryBase* factory);
-
-  // Constructs a TestInfo object. The newly constructed instance assumes
-  // ownership of the factory object.
-  TestInfo(const std::string& test_suite_name, const std::string& name,
-           const char* a_type_param,   // NULL if not a type-parameterized test
-           const char* a_value_param,  // NULL if not a value-parameterized test
-           internal::CodeLocation a_code_location,
-           internal::TypeId fixture_class_id,
-           internal::TestFactoryBase* factory);
-
-  // Increments the number of death tests encountered in this test so
-  // far.
-  int increment_death_test_count() {
-    return result_.increment_death_test_count();
-  }
-
-  // Creates the test object, runs it, records its result, and then
-  // deletes it.
-  void Run();
-
-  // Skip and records the test result for this object.
-  void Skip();
-
-  static void ClearTestResult(TestInfo* test_info) {
-    test_info->result_.Clear();
-  }
-
-  // These fields are immutable properties of the test.
-  const std::string test_suite_name_;    // test suite name
-  const std::string name_;               // Test name
-  // Name of the parameter type, or NULL if this is not a typed or a
-  // type-parameterized test.
-  const std::unique_ptr<const ::std::string> type_param_;
-  // Text representation of the value parameter, or NULL if this is not a
-  // value-parameterized test.
-  const std::unique_ptr<const ::std::string> value_param_;
-  internal::CodeLocation location_;
-  const internal::TypeId fixture_class_id_;  // ID of the test fixture class
-  bool should_run_;           // True if and only if this test should run
-  bool is_disabled_;          // True if and only if this test is disabled
-  bool matches_filter_;       // True if this test matches the
-                              // user-specified filter.
-  bool is_in_another_shard_;  // Will be run in another shard.
-  internal::TestFactoryBase* const factory_;  // The factory that creates
-                                              // the test object
-
-  // This field is mutable and needs to be reset before running the
-  // test for the second time.
-  TestResult result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
-};
-
-// A test suite, which consists of a vector of TestInfos.
-//
-// TestSuite is not copyable.
-class GTEST_API_ TestSuite {
- public:
-  // Creates a TestSuite with the given name.
-  //
-  // TestSuite does NOT have a default constructor.  Always use this
-  // constructor to create a TestSuite object.
-  //
-  // Arguments:
-  //
-  //   name:         name of the test suite
-  //   a_type_param: the name of the test's type parameter, or NULL if
-  //                 this is not a type-parameterized test.
-  //   set_up_tc:    pointer to the function that sets up the test suite
-  //   tear_down_tc: pointer to the function that tears down the test suite
-  TestSuite(const char* name, const char* a_type_param,
-            internal::SetUpTestSuiteFunc set_up_tc,
-            internal::TearDownTestSuiteFunc tear_down_tc);
-
-  // Destructor of TestSuite.
-  virtual ~TestSuite();
-
-  // Gets the name of the TestSuite.
-  const char* name() const { return name_.c_str(); }
-
-  // Returns the name of the parameter type, or NULL if this is not a
-  // type-parameterized test suite.
-  const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns true if any test in this test suite should run.
-  bool should_run() const { return should_run_; }
-
-  // Gets the number of successful tests in this test suite.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests in this test suite.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests in this test suite.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests in this test suite.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Get the number of tests in this test suite that should run.
-  int test_to_run_count() const;
-
-  // Gets the number of all tests in this test suite.
-  int total_test_count() const;
-
-  // Returns true if and only if the test suite passed.
-  bool Passed() const { return !Failed(); }
-
-  // Returns true if and only if the test suite failed.
-  bool Failed() const {
-    return failed_test_count() > 0 || ad_hoc_test_result().Failed();
-  }
-
-  // Returns the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Gets the time of the test suite start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Returns the i-th test among all the tests. i can range from 0 to
-  // total_test_count() - 1. If i is not in that range, returns NULL.
-  const TestInfo* GetTestInfo(int i) const;
-
-  // Returns the TestResult that holds test properties recorded during
-  // execution of SetUpTestSuite and TearDownTestSuite.
-  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
-
- private:
-  friend class Test;
-  friend class internal::UnitTestImpl;
-
-  // Gets the (mutable) vector of TestInfos in this TestSuite.
-  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
-
-  // Gets the (immutable) vector of TestInfos in this TestSuite.
-  const std::vector<TestInfo*>& test_info_list() const {
-    return test_info_list_;
-  }
-
-  // Returns the i-th test among all the tests. i can range from 0 to
-  // total_test_count() - 1. If i is not in that range, returns NULL.
-  TestInfo* GetMutableTestInfo(int i);
-
-  // Sets the should_run member.
-  void set_should_run(bool should) { should_run_ = should; }
-
-  // Adds a TestInfo to this test suite.  Will delete the TestInfo upon
-  // destruction of the TestSuite object.
-  void AddTestInfo(TestInfo * test_info);
-
-  // Clears the results of all tests in this test suite.
-  void ClearResult();
-
-  // Clears the results of all tests in the given test suite.
-  static void ClearTestSuiteResult(TestSuite* test_suite) {
-    test_suite->ClearResult();
-  }
-
-  // Runs every test in this TestSuite.
-  void Run();
-
-  // Skips the execution of tests under this TestSuite
-  void Skip();
-
-  // Runs SetUpTestSuite() for this TestSuite.  This wrapper is needed
-  // for catching exceptions thrown from SetUpTestSuite().
-  void RunSetUpTestSuite() {
-    if (set_up_tc_ != nullptr) {
-      (*set_up_tc_)();
-    }
-  }
-
-  // Runs TearDownTestSuite() for this TestSuite.  This wrapper is
-  // needed for catching exceptions thrown from TearDownTestSuite().
-  void RunTearDownTestSuite() {
-    if (tear_down_tc_ != nullptr) {
-      (*tear_down_tc_)();
-    }
-  }
-
-  // Returns true if and only if test passed.
-  static bool TestPassed(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Passed();
-  }
-
-  // Returns true if and only if test skipped.
-  static bool TestSkipped(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Skipped();
-  }
-
-  // Returns true if and only if test failed.
-  static bool TestFailed(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Failed();
-  }
-
-  // Returns true if and only if the test is disabled and will be reported in
-  // the XML report.
-  static bool TestReportableDisabled(const TestInfo* test_info) {
-    return test_info->is_reportable() && test_info->is_disabled_;
-  }
-
-  // Returns true if and only if test is disabled.
-  static bool TestDisabled(const TestInfo* test_info) {
-    return test_info->is_disabled_;
-  }
-
-  // Returns true if and only if this test will appear in the XML report.
-  static bool TestReportable(const TestInfo* test_info) {
-    return test_info->is_reportable();
-  }
-
-  // Returns true if the given test should run.
-  static bool ShouldRunTest(const TestInfo* test_info) {
-    return test_info->should_run();
-  }
-
-  // Shuffles the tests in this test suite.
-  void ShuffleTests(internal::Random* random);
-
-  // Restores the test order to before the first shuffle.
-  void UnshuffleTests();
-
-  // Name of the test suite.
-  std::string name_;
-  // Name of the parameter type, or NULL if this is not a typed or a
-  // type-parameterized test.
-  const std::unique_ptr<const ::std::string> type_param_;
-  // The vector of TestInfos in their original order.  It owns the
-  // elements in the vector.
-  std::vector<TestInfo*> test_info_list_;
-  // Provides a level of indirection for the test list to allow easy
-  // shuffling and restoring the test order.  The i-th element in this
-  // vector is the index of the i-th test in the shuffled test list.
-  std::vector<int> test_indices_;
-  // Pointer to the function that sets up the test suite.
-  internal::SetUpTestSuiteFunc set_up_tc_;
-  // Pointer to the function that tears down the test suite.
-  internal::TearDownTestSuiteFunc tear_down_tc_;
-  // True if and only if any test in this test suite should run.
-  bool should_run_;
-  // The start time, in milliseconds since UNIX Epoch.
-  TimeInMillis start_timestamp_;
-  // Elapsed time, in milliseconds.
-  TimeInMillis elapsed_time_;
-  // Holds test properties recorded during execution of SetUpTestSuite and
-  // TearDownTestSuite.
-  TestResult ad_hoc_test_result_;
-
-  // We disallow copying TestSuites.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestSuite);
-};
-
-// An Environment object is capable of setting up and tearing down an
-// environment.  You should subclass this to define your own
-// environment(s).
-//
-// An Environment object does the set-up and tear-down in virtual
-// methods SetUp() and TearDown() instead of the constructor and the
-// destructor, as:
-//
-//   1. You cannot safely throw from a destructor.  This is a problem
-//      as in some cases Google Test is used where exceptions are enabled, and
-//      we may want to implement ASSERT_* using exceptions where they are
-//      available.
-//   2. You cannot use ASSERT_* directly in a constructor or
-//      destructor.
-class Environment {
- public:
-  // The d'tor is virtual as we need to subclass Environment.
-  virtual ~Environment() {}
-
-  // Override this to define how to set up the environment.
-  virtual void SetUp() {}
-
-  // Override this to define how to tear down the environment.
-  virtual void TearDown() {}
- private:
-  // If you see an error about overriding the following function or
-  // about it being private, you have mis-spelled SetUp() as Setup().
-  struct Setup_should_be_spelled_SetUp {};
-  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
-};
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Exception which can be thrown from TestEventListener::OnTestPartResult.
-class GTEST_API_ AssertionException
-    : public internal::GoogleTestFailureException {
- public:
-  explicit AssertionException(const TestPartResult& result)
-      : GoogleTestFailureException(result) {}
-};
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-// The interface for tracing execution of tests. The methods are organized in
-// the order the corresponding events are fired.
-class TestEventListener {
- public:
-  virtual ~TestEventListener() {}
-
-  // Fired before any test activity starts.
-  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
-
-  // Fired before each iteration of tests starts.  There may be more than
-  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
-  // index, starting from 0.
-  virtual void OnTestIterationStart(const UnitTest& unit_test,
-                                    int iteration) = 0;
-
-  // Fired before environment set-up for each iteration of tests starts.
-  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
-
-  // Fired after environment set-up for each iteration of tests ends.
-  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
-
-  // Fired before the test suite starts.
-  virtual void OnTestSuiteStart(const TestSuite& /*test_suite*/) {}
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Fired before the test starts.
-  virtual void OnTestStart(const TestInfo& test_info) = 0;
-
-  // Fired after a failed assertion or a SUCCEED() invocation.
-  // If you want to throw an exception from this function to skip to the next
-  // TEST, it must be AssertionException defined above, or inherited from it.
-  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
-
-  // Fired after the test ends.
-  virtual void OnTestEnd(const TestInfo& test_info) = 0;
-
-  // Fired after the test suite ends.
-  virtual void OnTestSuiteEnd(const TestSuite& /*test_suite*/) {}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Fired before environment tear-down for each iteration of tests starts.
-  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
-
-  // Fired after environment tear-down for each iteration of tests ends.
-  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
-
-  // Fired after each iteration of tests finishes.
-  virtual void OnTestIterationEnd(const UnitTest& unit_test,
-                                  int iteration) = 0;
-
-  // Fired after all test activities have ended.
-  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
-};
-
-// The convenience class for users who need to override just one or two
-// methods and are not concerned that a possible change to a signature of
-// the methods they override will not be caught during the build.  For
-// comments about each method please see the definition of TestEventListener
-// above.
-class EmptyTestEventListener : public TestEventListener {
- public:
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& /*unit_test*/,
-                            int /*iteration*/) override {}
-  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnTestStart(const TestInfo& /*test_info*/) override {}
-  void OnTestPartResult(const TestPartResult& /*test_part_result*/) override {}
-  void OnTestEnd(const TestInfo& /*test_info*/) override {}
-  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& /*unit_test*/,
-                          int /*iteration*/) override {}
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-};
-
-// TestEventListeners lets users add listeners to track events in Google Test.
-class GTEST_API_ TestEventListeners {
- public:
-  TestEventListeners();
-  ~TestEventListeners();
-
-  // Appends an event listener to the end of the list. Google Test assumes
-  // the ownership of the listener (i.e. it will delete the listener when
-  // the test program finishes).
-  void Append(TestEventListener* listener);
-
-  // Removes the given event listener from the list and returns it.  It then
-  // becomes the caller's responsibility to delete the listener. Returns
-  // NULL if the listener is not found in the list.
-  TestEventListener* Release(TestEventListener* listener);
-
-  // Returns the standard listener responsible for the default console
-  // output.  Can be removed from the listeners list to shut down default
-  // console output.  Note that removing this object from the listener list
-  // with Release transfers its ownership to the caller and makes this
-  // function return NULL the next time.
-  TestEventListener* default_result_printer() const {
-    return default_result_printer_;
-  }
-
-  // Returns the standard listener responsible for the default XML output
-  // controlled by the --gtest_output=xml flag.  Can be removed from the
-  // listeners list by users who want to shut down the default XML output
-  // controlled by this flag and substitute it with custom one.  Note that
-  // removing this object from the listener list with Release transfers its
-  // ownership to the caller and makes this function return NULL the next
-  // time.
-  TestEventListener* default_xml_generator() const {
-    return default_xml_generator_;
-  }
-
- private:
-  friend class TestSuite;
-  friend class TestInfo;
-  friend class internal::DefaultGlobalTestPartResultReporter;
-  friend class internal::NoExecDeathTest;
-  friend class internal::TestEventListenersAccessor;
-  friend class internal::UnitTestImpl;
-
-  // Returns repeater that broadcasts the TestEventListener events to all
-  // subscribers.
-  TestEventListener* repeater();
-
-  // Sets the default_result_printer attribute to the provided listener.
-  // The listener is also added to the listener list and previous
-  // default_result_printer is removed from it and deleted. The listener can
-  // also be NULL in which case it will not be added to the list. Does
-  // nothing if the previous and the current listener objects are the same.
-  void SetDefaultResultPrinter(TestEventListener* listener);
-
-  // Sets the default_xml_generator attribute to the provided listener.  The
-  // listener is also added to the listener list and previous
-  // default_xml_generator is removed from it and deleted. The listener can
-  // also be NULL in which case it will not be added to the list. Does
-  // nothing if the previous and the current listener objects are the same.
-  void SetDefaultXmlGenerator(TestEventListener* listener);
-
-  // Controls whether events will be forwarded by the repeater to the
-  // listeners in the list.
-  bool EventForwardingEnabled() const;
-  void SuppressEventForwarding();
-
-  // The actual list of listeners.
-  internal::TestEventRepeater* repeater_;
-  // Listener responsible for the standard result output.
-  TestEventListener* default_result_printer_;
-  // Listener responsible for the creation of the XML output file.
-  TestEventListener* default_xml_generator_;
-
-  // We disallow copying TestEventListeners.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
-};
-
-// A UnitTest consists of a vector of TestSuites.
-//
-// This is a singleton class.  The only instance of UnitTest is
-// created when UnitTest::GetInstance() is first called.  This
-// instance is never deleted.
-//
-// UnitTest is not copyable.
-//
-// This class is thread-safe as long as the methods are called
-// according to their specification.
-class GTEST_API_ UnitTest {
- public:
-  // Gets the singleton UnitTest object.  The first time this method
-  // is called, a UnitTest object is constructed and returned.
-  // Consecutive calls will return the same object.
-  static UnitTest* GetInstance();
-
-  // Runs all tests in this UnitTest object and prints the result.
-  // Returns 0 if successful, or 1 otherwise.
-  //
-  // This method can only be called from the main thread.
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  int Run() GTEST_MUST_USE_RESULT_;
-
-  // Returns the working directory when the first TEST() or TEST_F()
-  // was executed.  The UnitTest object owns the string.
-  const char* original_working_dir() const;
-
-  // Returns the TestSuite object for the test that's currently running,
-  // or NULL if no test is running.
-  const TestSuite* current_test_suite() const GTEST_LOCK_EXCLUDED_(mutex_);
-
-// Legacy API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* current_test_case() const GTEST_LOCK_EXCLUDED_(mutex_);
-#endif
-
-  // Returns the TestInfo object for the test that's currently running,
-  // or NULL if no test is running.
-  const TestInfo* current_test_info() const
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Returns the random seed used at the start of the current test run.
-  int random_seed() const;
-
-  // Returns the ParameterizedTestSuiteRegistry object used to keep track of
-  // value-parameterized tests and instantiate and register them.
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry()
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Gets the number of successful test suites.
-  int successful_test_suite_count() const;
-
-  // Gets the number of failed test suites.
-  int failed_test_suite_count() const;
-
-  // Gets the number of all test suites.
-  int total_test_suite_count() const;
-
-  // Gets the number of all test suites that contain at least one test
-  // that should run.
-  int test_suite_to_run_count() const;
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  int successful_test_case_count() const;
-  int failed_test_case_count() const;
-  int total_test_case_count() const;
-  int test_case_to_run_count() const;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Gets the number of successful tests.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Gets the number of all tests.
-  int total_test_count() const;
-
-  // Gets the number of tests that should run.
-  int test_to_run_count() const;
-
-  // Gets the time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const;
-
-  // Gets the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const;
-
-  // Returns true if and only if the unit test passed (i.e. all test suites
-  // passed).
-  bool Passed() const;
-
-  // Returns true if and only if the unit test failed (i.e. some test suite
-  // failed or something outside of all tests failed).
-  bool Failed() const;
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  const TestSuite* GetTestSuite(int i) const;
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* GetTestCase(int i) const;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns the TestResult containing information on test failures and
-  // properties logged outside of individual test suites.
-  const TestResult& ad_hoc_test_result() const;
-
-  // Returns the list of event listeners that can be used to track events
-  // inside Google Test.
-  TestEventListeners& listeners();
-
- private:
-  // Registers and returns a global test environment.  When a test
-  // program is run, all global test environments will be set-up in
-  // the order they were registered.  After all tests in the program
-  // have finished, all global test environments will be torn-down in
-  // the *reverse* order they were registered.
-  //
-  // The UnitTest object takes ownership of the given environment.
-  //
-  // This method can only be called from the main thread.
-  Environment* AddEnvironment(Environment* env);
-
-  // Adds a TestPartResult to the current TestResult object.  All
-  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
-  // eventually call this to report their results.  The user code
-  // should use the assertion macros instead of calling this directly.
-  void AddTestPartResult(TestPartResult::Type result_type,
-                         const char* file_name,
-                         int line_number,
-                         const std::string& message,
-                         const std::string& os_stack_trace)
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Adds a TestProperty to the current TestResult object when invoked from
-  // inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
-  // from SetUpTestSuite or TearDownTestSuite, or to the global property set
-  // when invoked elsewhere.  If the result already contains a property with
-  // the same key, the value will be updated.
-  void RecordProperty(const std::string& key, const std::string& value);
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  TestSuite* GetMutableTestSuite(int i);
-
-  // Accessors for the implementation object.
-  internal::UnitTestImpl* impl() { return impl_; }
-  const internal::UnitTestImpl* impl() const { return impl_; }
-
-  // These classes and functions are friends as they need to access private
-  // members of UnitTest.
-  friend class ScopedTrace;
-  friend class Test;
-  friend class internal::AssertHelper;
-  friend class internal::StreamingListenerTest;
-  friend class internal::UnitTestRecordPropertyTestHelper;
-  friend Environment* AddGlobalTestEnvironment(Environment* env);
-  friend std::set<std::string>* internal::GetIgnoredParameterizedTestSuites();
-  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
-  friend void internal::ReportFailureInUnknownLocation(
-      TestPartResult::Type result_type,
-      const std::string& message);
-
-  // Creates an empty UnitTest.
-  UnitTest();
-
-  // D'tor
-  virtual ~UnitTest();
-
-  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-  // Google Test trace stack.
-  void PushGTestTrace(const internal::TraceInfo& trace)
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Pops a trace from the per-thread Google Test trace stack.
-  void PopGTestTrace()
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Protects mutable state in *impl_.  This is mutable as some const
-  // methods need to lock it too.
-  mutable internal::Mutex mutex_;
-
-  // Opaque implementation object.  This field is never changed once
-  // the object is constructed.  We don't mark it as const here, as
-  // doing so will cause a warning in the constructor of UnitTest.
-  // Mutable state in *impl_ is protected by mutex_.
-  internal::UnitTestImpl* impl_;
-
-  // We disallow copying UnitTest.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
-};
-
-// A convenient wrapper for adding an environment for the test
-// program.
-//
-// You should call this before RUN_ALL_TESTS() is called, probably in
-// main().  If you use gtest_main, you need to call this before main()
-// starts for it to take effect.  For example, you can define a global
-// variable like this:
-//
-//   testing::Environment* const foo_env =
-//       testing::AddGlobalTestEnvironment(new FooEnvironment);
-//
-// However, we strongly recommend you to write your own main() and
-// call AddGlobalTestEnvironment() there, as relying on initialization
-// of global variables makes the code harder to read and may cause
-// problems when you register multiple environments from different
-// translation units and the environments have dependencies among them
-// (remember that the compiler doesn't guarantee the order in which
-// global variables from different translation units are initialized).
-inline Environment* AddGlobalTestEnvironment(Environment* env) {
-  return UnitTest::GetInstance()->AddEnvironment(env);
-}
-
-// Initializes Google Test.  This must be called before calling
-// RUN_ALL_TESTS().  In particular, it parses a command line for the
-// flags that Google Test recognizes.  Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-GTEST_API_ void InitGoogleTest(int* argc, char** argv);
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleTest();
-
-namespace internal {
-
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_* in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperEQFailure(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const T1& lhs, const T2& rhs) {
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   FormatForComparisonFailureMessage(lhs, rhs),
-                   FormatForComparisonFailureMessage(rhs, lhs),
-                   false);
-}
-
-// This block of code defines operator==/!=
-// to block lexical scope lookup.
-// It prevents using invalid operator==/!= defined at namespace scope.
-struct faketype {};
-inline bool operator==(faketype, faketype) { return true; }
-inline bool operator!=(faketype, faketype) { return false; }
-
-// The helper function for {ASSERT|EXPECT}_EQ.
-template <typename T1, typename T2>
-AssertionResult CmpHelperEQ(const char* lhs_expression,
-                            const char* rhs_expression,
-                            const T1& lhs,
-                            const T2& rhs) {
-  if (lhs == rhs) {
-    return AssertionSuccess();
-  }
-
-  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
-}
-
-class EqHelper {
- public:
-  // This templatized version is for the general case.
-  template <
-      typename T1, typename T2,
-      // Disable this overload for cases where one argument is a pointer
-      // and the other is the null pointer constant.
-      typename std::enable_if<!std::is_integral<T1>::value ||
-                              !std::is_pointer<T2>::value>::type* = nullptr>
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression, const T1& lhs,
-                                 const T2& rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
-  }
-
-  // With this overloaded version, we allow anonymous enums to be used
-  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
-  // enums can be implicitly cast to BiggestInt.
-  //
-  // Even though its body looks the same as the above version, we
-  // cannot merge the two, as it will make anonymous enums unhappy.
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression,
-                                 BiggestInt lhs,
-                                 BiggestInt rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
-  }
-
-  template <typename T>
-  static AssertionResult Compare(
-      const char* lhs_expression, const char* rhs_expression,
-      // Handle cases where '0' is used as a null pointer literal.
-      std::nullptr_t /* lhs */, T* rhs) {
-    // We already know that 'lhs' is a null pointer.
-    return CmpHelperEQ(lhs_expression, rhs_expression, static_cast<T*>(nullptr),
-                       rhs);
-  }
-};
-
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_OP in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
-                                   const T1& val1, const T2& val2,
-                                   const char* op) {
-  return AssertionFailure()
-         << "Expected: (" << expr1 << ") " << op << " (" << expr2
-         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
-         << " vs " << FormatForComparisonFailureMessage(val2, val1);
-}
-
-// A macro for implementing the helper functions needed to implement
-// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
-// of similar code.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
-template <typename T1, typename T2>\
-AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
-                                   const T1& val1, const T2& val2) {\
-  if (val1 op val2) {\
-    return AssertionSuccess();\
-  } else {\
-    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
-  }\
-}
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// Implements the helper function for {ASSERT|EXPECT}_NE
-GTEST_IMPL_CMP_HELPER_(NE, !=)
-// Implements the helper function for {ASSERT|EXPECT}_LE
-GTEST_IMPL_CMP_HELPER_(LE, <=)
-// Implements the helper function for {ASSERT|EXPECT}_LT
-GTEST_IMPL_CMP_HELPER_(LT, <)
-// Implements the helper function for {ASSERT|EXPECT}_GE
-GTEST_IMPL_CMP_HELPER_(GE, >=)
-// Implements the helper function for {ASSERT|EXPECT}_GT
-GTEST_IMPL_CMP_HELPER_(GT, >)
-
-#undef GTEST_IMPL_CMP_HELPER_
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
-
-
-// Helper function for *_STREQ on wide strings.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
-
-// Helper function for *_STRNE on wide strings.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
-
-}  // namespace internal
-
-// IsSubstring() and IsNotSubstring() are intended to be used as the
-// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
-// themselves.  They check whether needle is a substring of haystack
-// (NULL is considered a substring of itself only), and return an
-// appropriate error message when they fail.
-//
-// The {needle,haystack}_expr arguments are the stringified
-// expressions that generated the two real arguments.
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack);
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack);
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack);
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack);
-#endif  // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-// Helper template function for comparing floating-points.
-//
-// Template parameter:
-//
-//   RawType: the raw floating-point type (either float or double)
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename RawType>
-AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
-                                         const char* rhs_expression,
-                                         RawType lhs_value,
-                                         RawType rhs_value) {
-  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
-
-  if (lhs.AlmostEquals(rhs)) {
-    return AssertionSuccess();
-  }
-
-  ::std::stringstream lhs_ss;
-  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << lhs_value;
-
-  ::std::stringstream rhs_ss;
-  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << rhs_value;
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   StringStreamToString(&lhs_ss),
-                   StringStreamToString(&rhs_ss),
-                   false);
-}
-
-// Helper function for implementing ASSERT_NEAR.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
-                                                const char* expr2,
-                                                const char* abs_error_expr,
-                                                double val1,
-                                                double val2,
-                                                double abs_error);
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-// A class that enables one to stream messages to assertion macros
-class GTEST_API_ AssertHelper {
- public:
-  // Constructor.
-  AssertHelper(TestPartResult::Type type,
-               const char* file,
-               int line,
-               const char* message);
-  ~AssertHelper();
-
-  // Message assignment is a semantic trick to enable assertion
-  // streaming; see the GTEST_MESSAGE_ macro below.
-  void operator=(const Message& message) const;
-
- private:
-  // We put our data in a struct so that the size of the AssertHelper class can
-  // be as small as possible.  This is important because gcc is incapable of
-  // re-using stack space even for temporary variables, so every EXPECT_EQ
-  // reserves stack space for another AssertHelper.
-  struct AssertHelperData {
-    AssertHelperData(TestPartResult::Type t,
-                     const char* srcfile,
-                     int line_num,
-                     const char* msg)
-        : type(t), file(srcfile), line(line_num), message(msg) { }
-
-    TestPartResult::Type const type;
-    const char* const file;
-    int const line;
-    std::string const message;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
-  };
-
-  AssertHelperData* const data_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
-};
-
-}  // namespace internal
-
-// The pure interface class that all value-parameterized tests inherit from.
-// A value-parameterized class must inherit from both ::testing::Test and
-// ::testing::WithParamInterface. In most cases that just means inheriting
-// from ::testing::TestWithParam, but more complicated test hierarchies
-// may need to inherit from Test and WithParamInterface at different levels.
-//
-// This interface has support for accessing the test parameter value via
-// the GetParam() method.
-//
-// Use it with one of the parameter generator defining functions, like Range(),
-// Values(), ValuesIn(), Bool(), and Combine().
-//
-// class FooTest : public ::testing::TestWithParam<int> {
-//  protected:
-//   FooTest() {
-//     // Can use GetParam() here.
-//   }
-//   ~FooTest() override {
-//     // Can use GetParam() here.
-//   }
-//   void SetUp() override {
-//     // Can use GetParam() here.
-//   }
-//   void TearDown override {
-//     // Can use GetParam() here.
-//   }
-// };
-// TEST_P(FooTest, DoesBar) {
-//   // Can use GetParam() method here.
-//   Foo foo;
-//   ASSERT_TRUE(foo.DoesBar(GetParam()));
-// }
-// INSTANTIATE_TEST_SUITE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
-
-template <typename T>
-class WithParamInterface {
- public:
-  typedef T ParamType;
-  virtual ~WithParamInterface() {}
-
-  // The current parameter value. Is also available in the test fixture's
-  // constructor.
-  static const ParamType& GetParam() {
-    GTEST_CHECK_(parameter_ != nullptr)
-        << "GetParam() can only be called inside a value-parameterized test "
-        << "-- did you intend to write TEST_P instead of TEST_F?";
-    return *parameter_;
-  }
-
- private:
-  // Sets parameter value. The caller is responsible for making sure the value
-  // remains alive and unchanged throughout the current test.
-  static void SetParam(const ParamType* parameter) {
-    parameter_ = parameter;
-  }
-
-  // Static value used for accessing parameter during a test lifetime.
-  static const ParamType* parameter_;
-
-  // TestClass must be a subclass of WithParamInterface<T> and Test.
-  template <class TestClass> friend class internal::ParameterizedTestFactory;
-};
-
-template <typename T>
-const T* WithParamInterface<T>::parameter_ = nullptr;
-
-// Most value-parameterized classes can ignore the existence of
-// WithParamInterface, and can just inherit from ::testing::TestWithParam.
-
-template <typename T>
-class TestWithParam : public Test, public WithParamInterface<T> {
-};
-
-// Macros for indicating success/failure in test code.
-
-// Skips test in runtime.
-// Skipping test aborts current function.
-// Skipped tests are neither successful nor failed.
-#define GTEST_SKIP() GTEST_SKIP_("")
-
-// ADD_FAILURE unconditionally adds a failure to the current test.
-// SUCCEED generates a success - it doesn't automatically make the
-// current test successful, as a test is only successful when it has
-// no failure.
-//
-// EXPECT_* verifies that a certain condition is satisfied.  If not,
-// it behaves like ADD_FAILURE.  In particular:
-//
-//   EXPECT_TRUE  verifies that a Boolean condition is true.
-//   EXPECT_FALSE verifies that a Boolean condition is false.
-//
-// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
-// that they will also abort the current function on failure.  People
-// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
-// writing data-driven tests often find themselves using ADD_FAILURE
-// and EXPECT_* more.
-
-// Generates a nonfatal failure with a generic message.
-#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
-
-// Generates a nonfatal failure at the given source file location with
-// a generic message.
-#define ADD_FAILURE_AT(file, line) \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kNonFatalFailure)
-
-// Generates a fatal failure with a generic message.
-#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
-
-// Like GTEST_FAIL(), but at the given source file location.
-#define GTEST_FAIL_AT(file, line)         \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kFatalFailure)
-
-// Define this macro to 1 to omit the definition of FAIL(), which is a
-// generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_FAIL
-# define FAIL() GTEST_FAIL()
-#endif
-
-// Generates a success with a generic message.
-#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
-
-// Define this macro to 1 to omit the definition of SUCCEED(), which
-// is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_SUCCEED
-# define SUCCEED() GTEST_SUCCEED()
-#endif
-
-// Macros for testing exceptions.
-//
-//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
-//         Tests that the statement throws the expected exception.
-//    * {ASSERT|EXPECT}_NO_THROW(statement):
-//         Tests that the statement doesn't throw any exception.
-//    * {ASSERT|EXPECT}_ANY_THROW(statement):
-//         Tests that the statement throws an exception.
-
-#define EXPECT_THROW(statement, expected_exception) \
-  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_NO_THROW(statement) \
-  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_ANY_THROW(statement) \
-  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_THROW(statement, expected_exception) \
-  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
-#define ASSERT_NO_THROW(statement) \
-  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
-#define ASSERT_ANY_THROW(statement) \
-  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
-
-// Boolean assertions. Condition can be either a Boolean expression or an
-// AssertionResult. For more information on how to use AssertionResult with
-// these macros see comments on that class.
-#define GTEST_EXPECT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
-                      GTEST_NONFATAL_FAILURE_)
-#define GTEST_EXPECT_FALSE(condition) \
-  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
-                      GTEST_NONFATAL_FAILURE_)
-#define GTEST_ASSERT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
-                      GTEST_FATAL_FAILURE_)
-#define GTEST_ASSERT_FALSE(condition) \
-  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
-                      GTEST_FATAL_FAILURE_)
-
-// Define these macros to 1 to omit the definition of the corresponding
-// EXPECT or ASSERT, which clashes with some users' own code.
-
-#if !GTEST_DONT_DEFINE_EXPECT_TRUE
-#define EXPECT_TRUE(condition) GTEST_EXPECT_TRUE(condition)
-#endif
-
-#if !GTEST_DONT_DEFINE_EXPECT_FALSE
-#define EXPECT_FALSE(condition) GTEST_EXPECT_FALSE(condition)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_TRUE
-#define ASSERT_TRUE(condition) GTEST_ASSERT_TRUE(condition)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_FALSE
-#define ASSERT_FALSE(condition) GTEST_ASSERT_FALSE(condition)
-#endif
-
-// Macros for testing equalities and inequalities.
-//
-//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
-//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
-//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
-//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
-//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
-//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
-//
-// When they are not, Google Test prints both the tested expressions and
-// their actual values.  The values must be compatible built-in types,
-// or you will get a compiler error.  By "compatible" we mean that the
-// values can be compared by the respective operator.
-//
-// Note:
-//
-//   1. It is possible to make a user-defined type work with
-//   {ASSERT|EXPECT}_??(), but that requires overloading the
-//   comparison operators and is thus discouraged by the Google C++
-//   Usage Guide.  Therefore, you are advised to use the
-//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
-//   equal.
-//
-//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
-//   pointers (in particular, C strings).  Therefore, if you use it
-//   with two C strings, you are testing how their locations in memory
-//   are related, not how their content is related.  To compare two C
-//   strings by content, use {ASSERT|EXPECT}_STR*().
-//
-//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
-//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
-//   what the actual value is when it fails, and similarly for the
-//   other comparisons.
-//
-//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
-//   evaluate their arguments, which is undefined.
-//
-//   5. These macros evaluate their arguments exactly once.
-//
-// Examples:
-//
-//   EXPECT_NE(Foo(), 5);
-//   EXPECT_EQ(a_pointer, NULL);
-//   ASSERT_LT(i, array_size);
-//   ASSERT_GT(records.size(), 0) << "There is no record left.";
-
-#define EXPECT_EQ(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define EXPECT_NE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define EXPECT_LE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define EXPECT_LT(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-#define EXPECT_GE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define EXPECT_GT(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-
-#define GTEST_ASSERT_EQ(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define GTEST_ASSERT_NE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define GTEST_ASSERT_LE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define GTEST_ASSERT_LT(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-#define GTEST_ASSERT_GE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define GTEST_ASSERT_GT(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-
-// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
-// ASSERT_XY(), which clashes with some users' own code.
-
-#if !GTEST_DONT_DEFINE_ASSERT_EQ
-# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_NE
-# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_LE
-# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_LT
-# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_GE
-# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_GT
-# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
-#endif
-
-// C-string Comparisons.  All tests treat NULL and any non-NULL string
-// as different.  Two NULLs are equal.
-//
-//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
-//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
-//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
-//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
-//
-// For wide or narrow string objects, you can use the
-// {ASSERT|EXPECT}_??() macros.
-//
-// Don't depend on the order in which the arguments are evaluated,
-// which is undefined.
-//
-// These macros evaluate their arguments exactly once.
-
-#define EXPECT_STREQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
-#define EXPECT_STRNE(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define EXPECT_STRCASEEQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
-#define EXPECT_STRCASENE(s1, s2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
-
-#define ASSERT_STREQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
-#define ASSERT_STRNE(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define ASSERT_STRCASEEQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
-#define ASSERT_STRCASENE(s1, s2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
-
-// Macros for comparing floating-point numbers.
-//
-//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
-//         Tests that two float values are almost equal.
-//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
-//         Tests that two double values are almost equal.
-//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
-//         Tests that v1 and v2 are within the given distance to each other.
-//
-// Google Test uses ULP-based comparison to automatically pick a default
-// error bound that is appropriate for the operands.  See the
-// FloatingPoint template class in gtest-internal.h if you are
-// interested in the implementation details.
-
-#define EXPECT_FLOAT_EQ(val1, val2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
-
-#define EXPECT_DOUBLE_EQ(val1, val2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
-
-#define ASSERT_FLOAT_EQ(val1, val2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
-
-#define ASSERT_DOUBLE_EQ(val1, val2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
-
-#define EXPECT_NEAR(val1, val2, abs_error)\
-  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
-                      val1, val2, abs_error)
-
-#define ASSERT_NEAR(val1, val2, abs_error)\
-  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
-                      val1, val2, abs_error)
-
-// These predicate format functions work on floating-point values, and
-// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
-//
-//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
-                                   float val1, float val2);
-GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
-                                    double val1, double val2);
-
-
-#if GTEST_OS_WINDOWS
-
-// Macros that test for HRESULT failure and success, these are only useful
-// on Windows, and rely on Windows SDK macros and APIs to compile.
-//
-//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
-//
-// When expr unexpectedly fails or succeeds, Google Test prints the
-// expected result and the actual result with both a human-readable
-// string representation of the error, if available, as well as the
-// hex result code.
-# define EXPECT_HRESULT_SUCCEEDED(expr) \
-    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-
-# define ASSERT_HRESULT_SUCCEEDED(expr) \
-    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-
-# define EXPECT_HRESULT_FAILED(expr) \
-    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
-
-# define ASSERT_HRESULT_FAILED(expr) \
-    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
-
-#endif  // GTEST_OS_WINDOWS
-
-// Macros that execute statement and check that it doesn't generate new fatal
-// failures in the current thread.
-//
-//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
-//
-// Examples:
-//
-//   EXPECT_NO_FATAL_FAILURE(Process());
-//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
-//
-#define ASSERT_NO_FATAL_FAILURE(statement) \
-    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
-#define EXPECT_NO_FATAL_FAILURE(statement) \
-    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
-
-// Causes a trace (including the given source file path and line number,
-// and the given message) to be included in every test failure message generated
-// by code in the scope of the lifetime of an instance of this class. The effect
-// is undone with the destruction of the instance.
-//
-// The message argument can be anything streamable to std::ostream.
-//
-// Example:
-//   testing::ScopedTrace trace("file.cc", 123, "message");
-//
-class GTEST_API_ ScopedTrace {
- public:
-  // The c'tor pushes the given source file location and message onto
-  // a trace stack maintained by Google Test.
-
-  // Template version. Uses Message() to convert the values into strings.
-  // Slow, but flexible.
-  template <typename T>
-  ScopedTrace(const char* file, int line, const T& message) {
-    PushTrace(file, line, (Message() << message).GetString());
-  }
-
-  // Optimize for some known types.
-  ScopedTrace(const char* file, int line, const char* message) {
-    PushTrace(file, line, message ? message : "(null)");
-  }
-
-  ScopedTrace(const char* file, int line, const std::string& message) {
-    PushTrace(file, line, message);
-  }
-
-  // The d'tor pops the info pushed by the c'tor.
-  //
-  // Note that the d'tor is not virtual in order to be efficient.
-  // Don't inherit from ScopedTrace!
-  ~ScopedTrace();
-
- private:
-  void PushTrace(const char* file, int line, std::string message);
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
-} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
-                            // c'tor and d'tor.  Therefore it doesn't
-                            // need to be used otherwise.
-
-// Causes a trace (including the source file path, the current line
-// number, and the given message) to be included in every test failure
-// message generated by code in the current scope.  The effect is
-// undone when the control leaves the current scope.
-//
-// The message argument can be anything streamable to std::ostream.
-//
-// In the implementation, we include the current line number as part
-// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
-// to appear in the same block - as long as they are on different
-// lines.
-//
-// Assuming that each thread maintains its own stack of traces.
-// Therefore, a SCOPED_TRACE() would (correctly) only affect the
-// assertions in its own thread.
-#define SCOPED_TRACE(message) \
-  ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
-    __FILE__, __LINE__, (message))
-
-// Compile-time assertion for type equality.
-// StaticAssertTypeEq<type1, type2>() compiles if and only if type1 and type2
-// are the same type.  The value it returns is not interesting.
-//
-// Instead of making StaticAssertTypeEq a class template, we make it a
-// function template that invokes a helper class template.  This
-// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
-// defining objects of that type.
-//
-// CAVEAT:
-//
-// When used inside a method of a class template,
-// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
-// instantiated.  For example, given:
-//
-//   template <typename T> class Foo {
-//    public:
-//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
-//   };
-//
-// the code:
-//
-//   void Test1() { Foo<bool> foo; }
-//
-// will NOT generate a compiler error, as Foo<bool>::Bar() is never
-// actually instantiated.  Instead, you need:
-//
-//   void Test2() { Foo<bool> foo; foo.Bar(); }
-//
-// to cause a compiler error.
-template <typename T1, typename T2>
-constexpr bool StaticAssertTypeEq() noexcept {
-  static_assert(std::is_same<T1, T2>::value, "T1 and T2 are not the same type");
-  return true;
-}
-
-// Defines a test.
-//
-// The first parameter is the name of the test suite, and the second
-// parameter is the name of the test within the test suite.
-//
-// The convention is to end the test suite name with "Test".  For
-// example, a test suite for the Foo class can be named FooTest.
-//
-// Test code should appear between braces after an invocation of
-// this macro.  Example:
-//
-//   TEST(FooTest, InitializesCorrectly) {
-//     Foo foo;
-//     EXPECT_TRUE(foo.StatusIsOK());
-//   }
-
-// Note that we call GetTestTypeId() instead of GetTypeId<
-// ::testing::Test>() here to get the type ID of testing::Test.  This
-// is to work around a suspected linker bug when using Google Test as
-// a framework on Mac OS X.  The bug causes GetTypeId<
-// ::testing::Test>() to return different values depending on whether
-// the call is from the Google Test framework itself or from user test
-// code.  GetTestTypeId() is guaranteed to always return the same
-// value, as it always calls GetTypeId<>() from the Google Test
-// framework.
-#define GTEST_TEST(test_suite_name, test_name)             \
-  GTEST_TEST_(test_suite_name, test_name, ::testing::Test, \
-              ::testing::internal::GetTestTypeId())
-
-// Define this macro to 1 to omit the definition of TEST(), which
-// is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_TEST
-#define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
-#endif
-
-// Defines a test that uses a test fixture.
-//
-// The first parameter is the name of the test fixture class, which
-// also doubles as the test suite name.  The second parameter is the
-// name of the test within the test suite.
-//
-// A test fixture class must be declared earlier.  The user should put
-// the test code between braces after using this macro.  Example:
-//
-//   class FooTest : public testing::Test {
-//    protected:
-//     void SetUp() override { b_.AddElement(3); }
-//
-//     Foo a_;
-//     Foo b_;
-//   };
-//
-//   TEST_F(FooTest, InitializesCorrectly) {
-//     EXPECT_TRUE(a_.StatusIsOK());
-//   }
-//
-//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
-//     EXPECT_EQ(a_.size(), 0);
-//     EXPECT_EQ(b_.size(), 1);
-//   }
-//
-// GOOGLETEST_CM0011 DO NOT DELETE
-#if !GTEST_DONT_DEFINE_TEST
-#define TEST_F(test_fixture, test_name)\
-  GTEST_TEST_(test_fixture, test_name, test_fixture, \
-              ::testing::internal::GetTypeId<test_fixture>())
-#endif  // !GTEST_DONT_DEFINE_TEST
-
-// Returns a path to temporary directory.
-// Tries to determine an appropriate directory for the platform.
-GTEST_API_ std::string TempDir();
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-// Dynamically registers a test with the framework.
-//
-// This is an advanced API only to be used when the `TEST` macros are
-// insufficient. The macros should be preferred when possible, as they avoid
-// most of the complexity of calling this function.
-//
-// The `factory` argument is a factory callable (move-constructible) object or
-// function pointer that creates a new instance of the Test object. It
-// handles ownership to the caller. The signature of the callable is
-// `Fixture*()`, where `Fixture` is the test fixture class for the test. All
-// tests registered with the same `test_suite_name` must return the same
-// fixture type. This is checked at runtime.
-//
-// The framework will infer the fixture class from the factory and will call
-// the `SetUpTestSuite` and `TearDownTestSuite` for it.
-//
-// Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is
-// undefined.
-//
-// Use case example:
-//
-// class MyFixture : public ::testing::Test {
-//  public:
-//   // All of these optional, just like in regular macro usage.
-//   static void SetUpTestSuite() { ... }
-//   static void TearDownTestSuite() { ... }
-//   void SetUp() override { ... }
-//   void TearDown() override { ... }
-// };
-//
-// class MyTest : public MyFixture {
-//  public:
-//   explicit MyTest(int data) : data_(data) {}
-//   void TestBody() override { ... }
-//
-//  private:
-//   int data_;
-// };
-//
-// void RegisterMyTests(const std::vector<int>& values) {
-//   for (int v : values) {
-//     ::testing::RegisterTest(
-//         "MyFixture", ("Test" + std::to_string(v)).c_str(), nullptr,
-//         std::to_string(v).c_str(),
-//         __FILE__, __LINE__,
-//         // Important to use the fixture type as the return type here.
-//         [=]() -> MyFixture* { return new MyTest(v); });
-//   }
-// }
-// ...
-// int main(int argc, char** argv) {
-//   std::vector<int> values_to_test = LoadValuesFromConfig();
-//   RegisterMyTests(values_to_test);
-//   ...
-//   return RUN_ALL_TESTS();
-// }
-//
-template <int&... ExplicitParameterBarrier, typename Factory>
-TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
-                       const char* type_param, const char* value_param,
-                       const char* file, int line, Factory factory) {
-  using TestT = typename std::remove_pointer<decltype(factory())>::type;
-
-  class FactoryImpl : public internal::TestFactoryBase {
-   public:
-    explicit FactoryImpl(Factory f) : factory_(std::move(f)) {}
-    Test* CreateTest() override { return factory_(); }
-
-   private:
-    Factory factory_;
-  };
-
-  return internal::MakeAndRegisterTestInfo(
-      test_suite_name, test_name, type_param, value_param,
-      internal::CodeLocation(file, line), internal::GetTypeId<TestT>(),
-      internal::SuiteApiResolver<TestT>::GetSetUpCaseOrSuite(file, line),
-      internal::SuiteApiResolver<TestT>::GetTearDownCaseOrSuite(file, line),
-      new FactoryImpl{std::move(factory)});
-}
-
-}  // namespace testing
-
-// Use this function in main() to run all tests.  It returns 0 if all
-// tests are successful, or 1 otherwise.
-//
-// RUN_ALL_TESTS() should be invoked after the command line has been
-// parsed by InitGoogleTest().
-//
-// This function was formerly a macro; thus, it is in the global
-// namespace and has an all-caps name.
-int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
-
-inline int RUN_ALL_TESTS() {
-  return ::testing::UnitTest::GetInstance()->Run();
-}
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_H_
diff --git a/code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc b/code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc
deleted file mode 100644
index 46b27c3d..00000000
--- a/code/cpp-httplib-0.19.0/test/gtest/gtest_main.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <cstdio>
-#include "gtest/gtest.h"
-
-#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-#if GTEST_OS_ESP8266
-extern "C" {
-#endif
-void setup() {
-  testing::InitGoogleTest();
-}
-
-void loop() { RUN_ALL_TESTS(); }
-
-#if GTEST_OS_ESP8266
-}
-#endif
-
-#else
-
-GTEST_API_ int main(int argc, char **argv) {
-  printf("Running main() from %s\n", __FILE__);
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-#endif
diff --git a/code/cpp-httplib-0.19.0/test/image.jpg b/code/cpp-httplib-0.19.0/test/image.jpg
deleted file mode 100644
index f74b495328f3cf26a12dd2c4843484cc6a13561c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33653
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq}t>f#LsK2AzP6{F40Q
zjQj!xV?6@~3nx!s7FDn&0WgU~{C~&5=a`b8l**8DfPsO5@&9dx76vvJ78X_(Hda<P
zPBvCHPHql1HV$qcE-r2^E*=3MFc9G3;}_uP;}I4X5fK)ak(QR0k%t3Dc6N4N9$pCn
z0SPHlK~X8V1hI_&2N(o7n6@*`Wo8s)U=n0x7G(T?gmDoA0|PrF2*5nR!ph9V#>l|V
z!O6wV$iT$J43cDo$}%!AF|)9;fh7ePm>8LvnOK<E*qK?F*qDkLnV1Dx7+4jB3>^d6
zgcFqt8%2yJE@T(o=%jow=;A|Tv7`?wMNJ=7olSx#E!vb^e8|*Aee&YXX5t|!C5JCP
z;!tbm<dTqVnd0iUWJ}oPPz|Y1k3S!|^5jcuY3tObTaR9S`ZcYrZQ8PJ$F4p5X6_!I
zUfw=^`S#=2pMSUTh{&kun6YBVi5o9|Xj*zkW>$92T)Fe)&6hv5th}PKs=8*a+I8yI
zt6zc)OiYYS%&e>|tZXbC%*?rr3`~N|EFc%N1_~!Cu@yE>G+MavgUG>)50#xngOZ9q
z8mpK%H;GLOR$Y|5=@5JICDTVP&Eg@GIY3TTGjo+vPbmpC|Fn4XVGYg8k3Y9eS+WJy
z$!=i?N8@xe9w-05#lXW1cBUYMJ;PT&tv8`JR&NYXT6Z+IYqw|_9`2sUpXZ-T_q=$l
zJ6&DYIVkwmrdbkiU%T0VzWk;?>)GYaCU=S++bsUR=RZS!_8*-(nYxvKo4<Yfxg;+5
zv)y95iTQ=Bmlv;iXvDVavu|(soA=jWo(tbv=<mI9N|HzCo$CHqPrlVQuWZ}y&UuE}
z@a6P9bsOCuom#u+{VG>SEB6BHNfze!cGpSv^Ibk+d9ip?S(x#O3A1ngeC{);>5--G
z?VZ1~zxV!U;5pNt`Pk+lpP1jN6Lyoh3Nu%~oL(aK-Eg;DXO#IL&V^^rRP_`;ac-XM
zJ4rsoOJ6S&pNH`W2W@0m_{N8BzEpC0uGiNe(NPO0Ip5D~sNQ&^`pL(~#uGZ8MQwi8
zry+TILe2VTwpE|wuC3b|z4`a;_Ek%>1ldk>zgfMl^hP01fuO9s>D8>%*@|;^PI-Sq
zYWmVj-RA8F3oMWDe_n8hf7ZV>&uv#+{P<AP-J<xr{H?F|j+C{xub9SEcEar6hQCSw
z9Ouq?Fh4Y#De7q8wq4g&XZkz6a$#OH`DFcrsKt71%T+9eE>8CDs}FI?&whT^%Zj@r
zd9Hh5Nb;Ai{=>$Kw<gO6upT;j)8hOkkKe(w<859FUGUo!y}ju0q`$9&f28GD`%6Ag
zJb3bEq`TIn;_Q_#uP4+-J+t)uJ2mn2KlXKL&L-+#CdA0hQ0HGE(0Mv)E`dZzn^?e-
z8TQzJ-hFO<^uBoAn|pKDO4xqZ{2hGxq3>=5>;DW>Kb`&0kot0mdq?HGxaYm!+T)Mv
zv)L>@fB)`>-+#|*o!xy_`{rHm%yQ8)Zj+oIUccAAaC!37XGdiw7);mX%Dw!2n#{zL
z@~cz?KUBTld!*d#VvI|+%nDil&0Ia7eBC&cPHK41@wNNA<jQe7jVJw=4Y>X+Jee(8
zcwpMbus+S``%KHk<|SOq)ll3$LE}YF<@!5U&-7I7nebHUamvL<^DSB)UH;7US3_^@
z<C*m{IeYg%PW+LUXLohRuLk?%*2x<m)J<}~H8-mAxy!7kVAaj_)3(O%txQX^yL?oy
zOonIf)M+-WJg=@>m|UWrTPSny#DV!sct4v-CfYA)dhq11MXf_?&BnDv79g~WtBCv0
z*k>nwIzByZFN^fe`r>5Cdz&`=4*B5tQGWNn)Qm6xbY3qHkH1xQaru$dKkkX||Mt&N
zofWyXa%r*3Cc{eE-pHA~o+{tftu|-`)I1APx%q56m-JDd-zTD`uU&pJ>G|Vrd4c~K
zj+vYOk=kEZu<y!?A4TpOPj&nE)NTB3xA={D#>a=#=DAno*{`bn)Bk%};GEg_OuKeG
z@QzsRF0%H(TA9$rT~QW74?Gl_ovZ}AmW9nryPlh&yt^#$w^7}P`orNyg|CZ_PucI?
zJ=wXf=8@f#SC>EYz0J^j8{~L*u`2(a%CtPYYZHF8?vS*WQhzzM`tojjn+$UiA&+lo
zs=b!Yulgikm-hIrP0+LKdk>zxS#$A;#om)=x4vC^>C?7(meY6kHrK5=+vailrNR#3
zqZ+jitvR#Vi74!85LZ5@Rz-G%1_t>ZVC<UobMa^MbGpy+4LwzK{AQ*{<b-cz_!Crf
z=by;A<<84KEZl#ka$ohWTkp@LZv5h&`0JmJOIr4-e9?RnwRzE3_Pf6p@HsZo^2;)n
z3k9{S{5LNAWgL5Jm;IT{r~Hqe**^a0_jp6K^QT!mQtW-N>|a&+XXhWerSn35FOFDx
zoGI#Pl*Q6K){IAMWr8jqn4S>2Tx3gOc!GD<yB<l2)qFj?9KScR^m!=AWiFjR+w^x7
z%kE5(x-(lQ)V|&ScxJ`dpNs#5zrTCr<jo)H=S<(-wBGXP_>6$KDD8?pKH>jFch>DW
zd;He(AB#T~7?o-KldQSC+upje?os2i>@xe!Mic)t@L1|Uo_XW9H_xu?dk>tvS-JSq
z-;-Cw&8~BvyB9LkewG=J-N%_5=cMRJ7pQZ(Txr!xnL&f7z*pZtn?JX%_^<d9UaoUq
z@mXHAMOI6<X4F4Pl&K3nyFM**$J1k#?(ZxA-M{{$;*Z7O;OFoD?qB<0=7l}pZ5p8X
zG4I;zd|GPy^)D4EX=^U>d*!~WR4@K4V)-m~@8S=pM(dZwE&TZW+rH~>_Gi?ky9@cR
zlbihE>1WZ8zQ#UZ{49j7X<a<3U7+nQn(=5_AIom0wH8YkckO11vREAfk~^^WxXwn4
zin)smFHV_I_p!yJInl>aq})&E&(mkpQH(`tj=zl={xf_y{^(D!v3$m}{^;*JBCX9?
z{xh`gy<K<Y)A`RTZ}fBi<#X2`Tl=5EG_B0;#=nv}zy112^+xgb$6xsC?0Nb0^(y`~
zzxe9Y5`zCpzxii5w|`5)>9y5&c=pbmC#!$=$ChWB3uiJPRyxtXSP>Lk6DKGg+|Cwg
zXyU4W(vU9giGZkc>r)rMEVr8bx?tN@XXSa%=8D$dcw_siV&lvcF2%Z*pWQ`xo}RD^
z`^>kqa@}k5sI?FOem(u^aa2p-CWUXI4C(Rh0>=dfFMiGqTNJrT^7KsaPsiGM0`6(u
z)5sT1x#x0aFR$mDJOAFjtdmc7@c4bSp69vkvWq`vSRB9F|IX$=gJZRP(r@>JS7qE^
zp3?sFaK~TeN0Q$vAHVJ+BK~B8E*{lQ2-~1qV=gZC{v2nV`oEN<<?kgm&Kxhu>{%$u
zrF40<y-j7;t%h@Y0(ECjN&k~5%s*~i_-$Us*ZtMa(>HDKUs^r+w*HwDy{vC%>vtbI
zxc_0){Es^4j^9@PvG`Nz&uX6k3@rOHzfPZ1v%B13d$#cW8?!cEewp9?@ywsvg>Cgm
z<NnSqi#vOs|Ka|!mwSrbmDqcm7rr><$o^7t28VS!$B|~&G7)RME#ci1%6`~??mvT-
z^j+7Qo$2bobi0f8rdr#4xoH>J|091|iR|=c5BnvbRaVb4zr|ZG^GD;a;q&)@=U1OL
z&iS1CXr08uJ)wI7?rE)Lx#Vb4>{4-3nBDnWtFN283d^IUO4*r@PU{p4cdm4~@x6U*
z#NFeS>AY9!lT!HDTdSJ=9xtm@+w4=2I?ecx`ft1A_jlVz%KCAn_G@<kO@2@oX4&;@
zYuA=SuRB~9L51YvM!f^8{WLQktvfKSPwN`X)~+oD+U_D-3cVvl*KlS$nzk`)gX)^l
zs9WDYUHy66UxoLvwCG=VRh~(mJ0?l^i==5eh`c+0{$A3y1(iWh+25R5wEu(mk-tCZ
z_HQkApZVzf4#{d|mYsa^MYX9v=Vn|H-<B`medOTrbG^sr*QGyxyJG$-(|4setNEN?
zOtAa%@ATPyv3nNueHH9~;~jCf#?Fd=xADi<AI?u{Kb{^tee>qSbNmn2?=%Yw3pnMh
zc}H-E<uu+MDZv#1M0amUh}4MV&(vo>{&al0+U_9UKVRDp8ShO^{MG?&aJ+ytIAT#6
z94eDMQ!-PMK3R*ECkI8$n&kPecs0{}n~5qnv&D1~k@_a!oK5S>s%e)q-_>dOuN3&t
zpxA$e{p9|*Lc6OkUIm`9`sM%PPo>?=H|iO8(w9&F@N4nA*Wa$6*>reL@r&G~wK755
znYI*$^=W22@ZO+xxhu+I^#;|&U0WM<lh(>`T|BBQ6LgI=n<>g->6*|roY|sftWkyD
z?o7KyR^Q5sYMmW+?U@JvpRlKnKO2fFKKsdgDy~+O@PEay{962sd5PN>%v`)H@ZX;(
zQ@hOLpv<&>md&fU@A1<&Za6*l_}$;Zzva*TwSBRD+a`zlSw<@H%l7cUKHH{utMS(&
z_gk+weG@r;QK9y?`Zv4GPk-OCh+q6<D|mj{{o;@7FV6h2^+x(B=XbyFmc_E=)I6&D
z&#=>!MKExOEnn)6Jc1ol5@If@+{LXtVa0-JNf`{%lRS^G2>Z|Y&tSCY$-nf^B9mQ?
zf5}~%xWQk9{n6y-iua#7-nLpRHv3R(z2LK--?LutH=K6-f|>mKM@QMxtd4zju2>DL
z@^*`;Nr^2g`5VMN>yp8p)Yspn(_TKjZm`?k!&E}Gf2DNwFKfNy*XOFOlB{Ch|JCpK
zo8NIOqq_QLJ~<+gvG2PilTJ}Kvs#~KbYqmoYIl(>1*$hhGmq-Zgx(Okcr*&!&SwSH
zhnm?;TN^=f2+oX<%CRxFE9$`NLhlXQ?jnoUY^@DC(wteUqfmFslKabg=V_0xq_kgF
zk}7)n@yV}6+zOlioV@;E!4AP#{i4?g_kCIL$JkyxC#~OV^19PEW~6?(Q!kg(bo#Ts
z=d`9z_oCBmBQurwmp{xuY-X`LTk=<<eD>PYHzL_Dx$HaUnEcF_?brOUeVsGDxaINx
zXJGmh{o!nzZkpy_Bfjl=-DdWyRE^F|7o|$qV9)W-+t1BkT(b0n&Xc9@7H!?7RqmbF
zQh(lg`>CB<-|RIP*>PUu?|+7k&v#eHK0JJ=|EgZy`&%D;Uc~8c?AqQXeKf|<xngz2
z!abok7VZgsX%}>*Zs%eb>EE~W@9aP6eyILI=DgguV*LlN%;aBIx4u7qdwuttdnd};
zpP3}7zdHKT?)}5xW<S&|7gkN9Jc{61QRB62b>xNxTlP#-l@&15{LjFUwZARCJ9M)A
zWhI%KT|SX^E1FK|)EjR-k)gM!>uvR{s{HTk5C3Q2p3M`xb((#E&~JNr_2}svHhRBQ
zv(JD0>_kqz@fXV#+XKC`j;{{zXnq;r{ZAYeZ-T!X`)~jFX?16B>oj{$kTx^d<n=GM
ze-WF$;neX(Y>fXI9`H(o;x0_{uMz9D)Jv(yzq+*4rC7Y9Am^=+EsorDv1Inzpszb_
z-&$DqG5KO>?adWzk=>GWTHK8;uQ)FgU_4#nXK?(r_oZi(UWe{6o%iyz=qu4GE&WYv
z8P4tIQ|wbxUi|FWT$jx$#?y_aKkeo10oQvEyQGgsALV_t?kMl0HSH&(I<{V|WjE=1
zQ*f`LIQH_7{^cfe7hn9zHJtEk<NFV<fBoYRe^Z|EFFr!Sf3g1Z$A9ee?u##YK6~E@
z0_{wAJ7sZK6gUrtgL?`E+8eziMDsMuKp7HL`z>w+m8PHy^Qf*2r_Y+2)9WJwqV9Wj
z?N!!2%l@1F$^N#KN7qu1e>t&ZXNg5oZ6MENpFiiWHLnQ|yBJ$PWozfYNtXJ5^l~<o
zU5j4HsK4>j>)q;X8ZvX-6l&__&6h^qIa-`6dc<wxnZ^sh4c3)xm@&nrUFq|re$J&n
zlf}vF$bF~>H9zVmTopfkttjlge_nWMmF-c@<4+|_{xd}Fle|zCH@nRyedg1575DC6
zFFb#!|FT@&e})^M?%cL{U9k{Lo+>G_Dbks^G2BT~qLf9d$v}W((To#En#>em-OBwG
zAK_Rwn=?d=c{A^fTK1ezaThMh+EpgMv##D%+rRId-=3^57tYvs<iCGXcg6FJc?y|T
z*w)6dN7EC+`ZPfUS5X$Ci@Tygo$ocEPF~W=-WD0*D~TWN{S#+aC_3E}zomEKqftfR
zuf+4`;x~WYtA0Xi`r1U*?)iN;ce?*)khpXGL)PENR(5C378=;vJ^meAXIYrczB~ED
z({HtBR-1K_)65Uk{n`JV<Ino1C-agMe>pwda6|DwL!IF6%Lm#1GZeg^S*2^<ZS}%(
z*Sjm%dhL|luawF6tDoUlKB?@fEMBfUw{xY+J5S52jsEi{S5Musa8JMuNH&1A2j2wT
z(|Qv+^Cy4cs`JZt-mS0ZFnv*0`2E7)pU11i7jKj~{A>A_y6G2do8L+qU-tOV;ALO3
z-|^?B$8)@2X5;H{k(Uv|wlrUzUcX`Y_AjRmojZ2TyYZI)bfQXa(T%$OO<BgapSyi)
zwy&(~yQVOAc8^Z2=6T11-&B5UF0PfFxb*bHCqgf;-~Dm-^u^OxlK;Hlzx>sYy}?%H
zs-)K?Ydw|RdR2M^1;onK8W?w~JYroiODtahUrOaMf0N3-=ovTu^=(^Y#*yvsBYSV2
zk?g+^+0CmjX714l|0tI~ziio-S4NZUCT{psxiRN-={it&W0pbdjt0*1{Tz{H5X*Zc
z_hY}PwZVUeM$6u{mwA4q_WWlM_;-Hm**AAHFTGNnQP23>s=uRZ(WYH&L0lVFP28dI
zeBwDaBSV|RU)Xde&T(0kXC!8ObWO8apBAXC#tCVjiI%Z!DFnB)!DS6NT_<?Ei);nA
z>(+sr=nuk^rftx=6Z8hu$V&hXJu!is>5IFzcEvjRvOW1Cu_%Zk^2w~*hm<<>>(<nM
zwwAGQeztezI;%Oy;t!ei@BX%`XXCYXM-{HU5BRih>DRwv;>nQ<|DHL%@<~I${IAp6
zt$fAuY?6NVc5k2fXeIxn`(OXA+?Tq6<b3dS|2(;pzw%4hPhaz7>9YlU)}5Mr>E4#d
zpC@$Hua1|wT^2XHD<*xy)AyD4?q4r(hE?S`FXT-3gx*+<weY#Ix+36<zWOWss7qq%
zS*NpVjkL56uac_S_RIL(-enhmMD-bdd2;{p^{;>86Tj(isi{?OSAKOQ`_KJ{f0ZB1
zOE>$*3mu|+!?oqnv_7pjoEeYS!o$#AWNTy8foXl3*`lC=CAKkaPSC{z>yGLsgzi{+
z16<00#$j1A9!=Yz?Jk-vvgl31>Z&zn()#C*>mTMe`}FVPw|15qiMda|R`1?tU%pp%
zroYIIL#sD>t9?>i`nA?~&E1u<xBi&Ee5LmIz33m~<eN7uiVD6=zxVuQYN6q~J9YCf
ze%s4#eiqA+G`@Ck(0>Ml?6N4i{?b+Vq#UzaPkqt3D=L0>RzvEHLYYZ|vQeg%kJ}~Z
z>|{Sx^=@nR+E?GBmcB09v8(6}yQ{3I_|33}^w@5J78iGgpXV0aY&vr;<`lC|M!sm7
z);*1!q_vOQK8C}_3(7RW!XoPP0<P4pT&<FmDSG|gjC?=$H&Qj<eieJ({$(%kll`iF
zMUCa(e(yK)GyX+KOWXC#oBZ+Vx4+ZA=zJExEk#kQ7v7}OO$h7Lx>Gn)M&tc`9@kkJ
zS6?MJOP<to{^+?%Bb3XGIdSGk5zSA3em<R+R`gu;M$~MH&@#=Crc8xdmWymsJDV4N
zNHvx3^AO_gOWe%o$Jtq@z5d46)7&T4=Pcaa{l=&9z-y<f=68HIuRJ=TE~t3*rk_b>
zyiO8H9n25*=iXb@O}aYWVe_PIQN>{|R^EJ9CHSAg=Gc9!=gv2)@+3aaOMh2!?%wr^
z$sZPfIX-{?H=Dy|>+K+gJB~7ck48*SXtSnb;|k>!7F>62ojvx6-zpK0-}3rn-;~15
zb;>r2x0cjTzv3lp*<bkd*Zk@?dKdoOn<QD^wJQFawEXptu5+$ir;*-i#8KnQrt`Br
ztGissY_#D}>mL0rvI`$Q`SAFQ^IQAP)6WVSeV>~znv)oMW9i1$$m37{Ej@Ry*7E#O
z!LNz(PYf3`e#-qf=T2E#Y!AQh@t1!pciRL#I>sOI_SgRKgVWP)>Ji@}4O9O){kh7g
z{nJ(EsmU){x0<&}ZqJDyOP04J*Ux3IIdd^{PvrFveR<orn(m)|#N$`r;je$>4L0xI
zZM`u)$=lFWW$sCp=ON6`kKB$}z0tX1^~SJ|&dH+rBIaE?lG;9ofjWN>;SUQpHb$mT
zEafvgpYS~W@0(b=3pd;Q9?dT+io5#a$HwCZ&t>~}eEMDYeg8N9Efq$m{gt=;4gB6$
zZ}{)&44H@WL7;vewsB4ptKHSP;w#nuGo+SV+7xVhRh_=YUbj7eT{Qpo4?b*Z`-*NH
zTKi~ikJfIHZ3e6CU9R}eT@`(I^6xEKJ~qj@v)@TSy<zmDSm@pFIcsHJ)!3iA{k3*~
z^3{VZAtmP)o+7%44?C?===SN<LFFE?@?-}Qu1TJ63>q_37*jvJf2Kc2<+J-twcSCk
zEuw9QjJGNUf9v>{ZZG(IcY5gJ%Rd6v?Txp6Ynyo`)##t#hVOOP^o(_{Z|~YIV&1h|
zG+)Hb5FFr$-Zog6OIkuyc=<ig^lIKqwJT<rT7{I$d)(H%@}MuL=(t{x$deaai!MLw
zi}>8g{;j6c*3D8V;*!USlmbbK5{0hjdCt>CHl8^Y^C<HdKU>Dr<C4cKPB7W&&RM&Y
z$YC!?7oF=(&^6ZRu2^s{fHPY(;{j;&g~^va__CPMgbtNYoIQpekGb#f{C;Ln;ewy*
zv$Fe^8&3c5N$#o7#_MJVOZS9sYz<GEc1$#%Yp?dnThp(bL|p7m+xqwPpD8u$|JdgH
zl}PdIsW|Xjc7O1;DLW3#|Ge+t{`HUMKFcPy?f+^0d3~$D?tbxlkte-(KYd<xs@%Kk
z&3sFa{|t>kpWWW{<xbFJn|A%`bKk!0ZjuwJJUxH+w>`>M?0p4CqmRaRNgs^`b)hA|
z-RHw1<{%DCxRtku>&BtB$|rXn?qn{zdp2cjp7Qz|x!2cUGCsd|<;4$alJ1&+AAbwK
z_3QqIyNe&a?30uaQ{Mj7|CRYS_2ZW1J2FTdq{1w30>vigzmlKy^v2?=Pxmf<%O~-}
z@LApZ^77*!&x#o<KDvEqZI33rw23~nrun4R^sA<Y%(Gl8Y>ofzxXb@Kez|dpWQ9?<
zXYQ~4a(QKw!g%bIzx<v3N3MG=b1}YY5_n^D>Aj@uIa_4KUWe|n-?_~%Cfn&vnTy<;
zBRt#rlqWeUuXbA=C}VNv=?S}lYhSzXribpl@;-j<*~`<5Z<KLu{X12J`L@-ah$Bi$
zmh9(>pG}LLd3vVf(_TG^)fI%xooI=G**}y1GrX$W<Jzk{`@2#7CTsa0T4~F-ZK<De
z*-QDA+`{+rYjWQ2o%vS&RCc2B7w^mZg@4_;FPy7Pez#VJvi9Y+j@YKYzkUKbm;2XT
zb!Sta6l-^1rD{b0!wajl1d*R@HJ45sTNY1x*t&9$){R5cK876=jqQq-2;HN#%e<tt
zBxzlXk-;ktQ}!1Yzh@h!7)+S(;_F<kzoxua+*=oX4G;^wdF;%7XC~tn2d5utm|nek
zj)Qg4%XcrjPDc<kHvjoQ!}IdF^<LS`j+-ZKlggG~BTzQ!*%W)1gpWV3TgjcdT;SgG
zdHS7?b9b-%sQ&Qy%YOU%H-Gbu&aPgNFJh6j7Cg9sv%MdEsO=bQPNH+g!k1BU3%~v~
zl03O)%VTq|&#|2*A79T4za3?N`c<mnm$}Dx{9EV0`?vWm``H%{rTlsfUDeWOxw8Bm
zxY<r%WF1!#6B4_pCVb*=-(Q=RMY7AAzcp{MiJ2$kzeqmw@0_Wdp3l!oTKh2Un8^07
zZ3e5}1l>3U;%S}P)3`FfaJl7whVF-dM329+ugl$StoMxlp1t>`!+JV(g|{D6*3I8I
zGwtqVg6V#Z^Jn{W-B0WFJXLt?J@17{v%Zt)?~1B$<E<+>bCz%R(Ru$FJf6L_4v+m=
z6K1zF$3FhxXKrI-v82cuS7*HQv^`g<&*Z&f;hunpUBr~~8(VoFwfR1o>wJ0Fw4>(_
z8$1_ScjrnT!}s{BbGC1_va?avc+OY%_;<bc-D>Vzc4CVnRBA2V?q8E%6Mw>3d0x%0
z+a!&JqZBjYhvm&zzOZ_-P+D*Cwrb~3KgxbR-SAia;rGRCsdgpzM6m{S_oesq4hJ;7
z&HlZd^}xIKG<mPd(~?dkD(XE~_coNg_*8el++)|*94}sg@&Ic@iNZU+QidBFo(VWE
zx<_E@Y3;0xg{{wK9w~HL`eb6SXsD~F$~R^Xu?!^_#`MWg=by2+@P0Pm$iIqH%&_hm
zq@rE<=Ukog_p)>AJ(qu27+bZk_Eyy46{k}FC?~#4ww&_%_R;90e8d(v_cTJc?3{G#
znRUnc<HBrlTTI?$-gp|h(Orc{^_0`>FSj}qPs&XAwa8JPeTAb*@nM;ZvyN-EJHI)!
z*rqwSDWb?r=((`}g<ZBGr4q^0?0pVse`;4HXP|p)qaMR#$19JH6$`S=ZE!u-C^o+?
z<&cTI$y?pRE6<Go$vNNIlX8dc!|G(we6DRMwd^*-un(&*{F%DqZ?=cnyKLQ=U(Wsh
zm0n`6Rb%g#Uu~@~W+%7t_pZA2&D$P5?wDV1U-A6cKb>ad8~8d~v0Z!Sf4+R~e(;8P
z-AGUG*+=>7PL+Gur<%Q2eErY=yxHIB%O2S&KC!I6SG;}e9m5Zc&&B+`zxAQz{z`F3
zW3o-_o)&>7eojKzF%k1F83S#zPq9Cy9es1-Pua7Tm)}^fzwEZIpzi96A4Tp4;8iK-
zcYcje*zMlWv*r05et~~0pMSD{H&d)ge}OLgTsm=W%qW(>o4=&aczpG#?c%q5f)9?*
zychSbG2TedbYoZap|w4sd(g`F8%LuLt-L>_RDWf*;c6-8(%&;}w2nWp{}5ekIepRT
zgA>YS_lMv9zVnu6?BPeYkH5vAuvNAadyZ!;b5-QC*t*lFf2m$uTTx${Gc{x__s*Mw
zwKun&E_h_Arew7xYpdYlo^!GC>aV4?zFWU4=2iLnbFW@GtF&+X%kV95!?$z0<qSDG
z`W!#6xw&*wTG6wBnP$sL4|%Qhr@#L*tavryl)uEBU&X=>7Tb$zd-<|=N4x**wORNl
z=J=jE%{$-NGyeHU^0dF)HT|o<{dD{0i^V7J*F+VlqOM~gBJ8JYP0OnN(U^MdTGrxb
z!IOIPGhG=N7Q8T4;i@@omYFhh&b~#vRj%DQs{1hPnASbfoJ8-6)yZ7zj_US+c%VAq
zXtk8wk<z1^WzM9iShlaqsOq?4vb%bb`-;<^4!0)hAG%$0?B2~wFE{;|ab(xO>FEY~
z$CY=ur@oQJz3A?I{oH+JfA!b$@}2W~`72t`kUdkc%J4tKy!w>t>sES*igo9@k46=R
zzY@RyJ3fo&mX+AYaMA-@J6W_!fBO1=yO%mE3#Il{1x*gB)GzXn>XP})cmLuKshQ!I
z?E`*%{vBWVEqF`4>7w5GarTZsihg$exRp@s@ntQ^6KJcC%yIP(o}S!mBcA`Qy?1((
zy^G!D>tD4}`x^IX;S1<vBAd=DX4&YeU%vClm_JPLUsRXDudw-LIlIkuJr3`$KmK^}
zhJ$)KrPu5W|GK|VySXzB*RVlE{<GzC*{9iTdv^Ebs`#R&Bjv&VeevHI-oA57dr@*v
z=ld^r^T=Df?lX(skJ%=_{=v_d&BkI$-oinCPbSZGJ}3q%BtZS9?Oig4Vc<XyPg?t^
z?HG7%N5N6vN8rJmq_&UYNoyZECo^p`09C_{(GshbKBa!_`ukSmk2rVee}-7|{|p`1
zKb*_IRV&}U{IPtP?LYSUudD5otlbY@{o(SfsOvw2MbTg7Cuh!8o_>={T2O1fxVCKh
zf|G7$vG%!T?N2{ksoR-j?-?#x{k->K*oW20BHLS|C0192Zfw<sbz4EaE|73g$EMwr
z&V7>J@x4OELQbJH{+rWcRn8eFJc@aL<un<KpLkPyfAj3C4`*3E?91racpC8Hp4OoS
z&;2Di8Qhhgol=pq6@M}TTj+;QKF_;H$lto-VW;<LWhvHB(Io!{2?v!6E=w3TpRf!2
zbMSM`z0A)l-@huIv%ho0rR*`++)nv3{~0o#hcCI@6TrMa{QPeBh*C+P{q4(l_V%1A
zhz5<#gXSDbY3Q``aNRf>sxbB8EX&0v6*sKr?OwU!#5txwLz})cA5*7Ub{@|Jt?gJA
zb?10#uIQ2aq);BV+u<9R7tV8Dds#+uY0rNK&VT1O{*vCjb>r2{hqG*!OaJ&P&%9~j
znQ&7Q=95<j`|zY2O3ajP2n%%d*{9U}Z0_Q<R&$o6PxmkSIH@2S+^E#d=K|NK$z0J#
zqd}u-If<a?gH^ioeo6;^{c?SCaip&F!~YCD`9b>&SNse%kDWX1LGqvbJ9azjS#Z|y
zAO048?50`{_N5vV>#8g7zuK1lv|Ih}-%FjQV!^u(M=hy0S6Y7i`Ru;amm@#&`}tem
zzV%MxN8q!{-@EtebD#Zu(#$aI7-(D)yd;f;2K`~CZJ@CRgHNgd8LTsP=KKkmSJ?L_
zdWF2&-^wG^k&7409A3ZVU;m|F?Hgnl7tWg%Ya95zUi`NEqZ8)}`xhgxQzKBmhxFEG
zzdL!Lw9-H0w^Mtg-0ss~_%H3(t$2DEl=cs;?FquswuF@Pt8$<AI=`|yB4oHEXuezg
z*O)H(g)8bJCoesHaDrTW{`|MaCPjA+|GZ!ENAP1+T!}B1sobS;8J~HlPv4@wHtNkE
zv6mrzTZ}wF9oPHUbq}^YnbGm;@he!Zn)Pe#yR|Ftyb53cDmK<5W$NDZi4PcV@bkRh
z_*kH$<B7b@*=dn#sd}lLle2P?*7krVqQHyEh#o@t=-kE%8dh$p>#qH(>n3?}Ny5kJ
z>u==t9bRkoOg!Ty+hUfD-+TA|wY#2uW7p>;SDp1e=Kg0`Rc4=j(fGtuAzr!s3x*RW
zY&@}B=_E0$UA8tx1qS;#Y!{DS-8Wxw=F4wW1E)9qoR+icq_SqQ?!)XDL+=Vus|HWa
z3hG^LcW`81__}Sfq{IYwgD>y(vf`JRbf~30HRAWHm&@F!{x{L>SMkD2sgI9wK0oo#
z?s~SB-NIAR|7?$^oHoMj#n!z4dGmSxWvd$(*F1T;>}5`v)ACHcD(jlbZ~B)Xx3W8X
zxxl&OZ_w{~#@oK$)AQr_Yw-I&L-N_;v=_6FMoX+t1`U;ofQDyCE%qxGRz1*JbiQV1
z_1Cp}c5a)Te=q;fkYp$PpMlxub9}~^I=&?*YAwxweEnN5e(P`lTlq5?M?Aki`trxV
z{mtzMGoRai&6NQ!CV~uofu=zsgf1S{O#;uMKzd%HH<qs9+Uv@`FH+z`?A}{)W^o*U
z1%CU-U%7E|m)M6@4?*q7hhfJE6ek;7Bkd<{m3RB+EpE?x;i<%bhHioI{I8S0rXAkA
z>BIT<pZ6>N&M)3@*}IFS-n_o?`M2w5HqW_hj5dIo7(ZLCR4($<?e6r)t6s@0+_XGI
z<nNRHZy0a?S!8VOxa?#4{!5m-_FcR7Lt-1Kua`gLmEZHCsyVOZ1lI)I)4Fk#{8Byo
zDED>7RFU7OwlCuT&*0iC^nmpZyWy^{zuYg+`OmPW%3j(h#coB_KH0jn|M-*NlxNh%
zM=1F(hb~(XOP!bX8#KiPUcwBTd9ql#hU*#&Xrd3iIu<g2#agCW)cd+k>8^S1xAvzW
zL+W<EvG<HKx_&;!FpPwt4$XZ&?Ow$@C6j4ld~;hvuC?Fzen=%Lr<nIv%^YEtPp{v-
z`kL)MW8K=MogLRKCs<uyD-m8_^K#=EKPBgh#n0u0oYwhvBaI_0FDzu;x@WsMpHh=(
zrYgAS8Zr5eL4)UlV?lyqmF%bH)qgJem-$)s*rKd$tADSS=zrt1<l~Bu`CDqwmCo|D
zILauuH{Sj&Z{+zYr<eN|%bc0c3948(c5MT#?EwwNS1dd%nlB2SjnV*>CRiq^%nY=X
zxulQsNr-}0F^I2YI;C~d`q-%#Ub`loI=n);ph$?JOV7;`oT013rd4xS9~M?A=a7tO
zJ~FR`$zd&rvd!!*CF%aN0$%Xld)L3O%x_QDmJg?|1>V1Z{cTJ!>rK-}0!!`0jAyj?
zEZxA}7Qt$lc}wc>ic@KoC7*bECbvB7+TI$@6Lb$$dx8p}jgaQfJuUETVKNt}@dIiF
zLE1$3w9fwNTv0V`a)jlNwYTTQzw*d(zi{>UvE1M0y3Ks=FaNIlp3Yf#KyGpJFT1n*
zcov&wA+>q-)PH__?%BP&HfvK=)pjt&dQN$_@vFzSfAw4LUHN$Sc<ReFKiVIBuHCzK
z;Y0VC&wtI6oc(+XBy1@w-&<cdZ0f3ia$nc~nQqyAzrNL+Ki(~s-^lfM@n>81oo8~x
z3cJ|+&Trn*9yr0F==Hl=&HVK2+)UXehO45Tnk*hMKjc`{5Nzo=Ps#J%eYfL+3@l}g
zjFnGo+1@Slc5$=cF8=QPA6>>@#r$gRB0rBm-8{EHewNJA&v%vg{MorJYqs_Fo^PHG
zh2Pi9U!4(Ytz>^#fA;+TZA<?I{!}TS=YIX|t02`Kf%nu{{xcldE<D51+T5fne&>zk
zw=qV~Dr#S<o?Uu%bHR?*hxwc$EB_R;RXmkTn)4#1XL~2B%M)oS?0K=^q>Ih+Ewu}s
z4|IN>{z88FlN%@ZR6T434ey2)fT|Zlja^XeuYI(#t#w6R|J8(@$sVf@72m#G+iCym
z&3(7nX8m?Uy}7mbd+(f;*&Abj?)R^{_1%|0FUg0Oc`N;A{W+fg^eo%!uw8c(;_tdg
zNvh^fWIyxwaLsNu;Ymq~$FIIhZkL?-;-_)QmG`E;UXKI!)(5?M<u)z+dvX*%gB9b$
zxj72Tf`TXPDyQpg@;DW9N?h$4WVC|vqEP(8e}<{|0{=2DSaV(Tc+h@s-J?~Df*<t1
zU|W9Yx#9XNKPE5y(thE$xZ{JQowY@G{xzK0%z6hh{+l!LxYCq~&I@0yVPt<{!NHz1
z!Q+mq_`HBmf3JE+t?{eR5=#EVe)vb4n&0`u`VZF^&+gw+?EGW>{ax<WKXWBlZrY>$
zV6txg!)fzB${aX(<MEHw&t($3bN(~P)Oqs0pHy==H%LL8!#+!l_df$y#{IU0CvWat
zd|CHAv3sk5|Jv$Hk#FBA)CnK?X#Z)~RQtj+k`6~Miad8KoUkF+<4Lp>V!_yMap72S
zBjZQqv`q(o&hwcxr)Npdv}3y2Z6Z68);<g+uD!Q9nQMF3_Ul}Z%NPHQ4m7`I<9ar&
z`Mc4Ns|*Y6O%<N~cAefYu`fCQ_`zFeK8Cb^%>VW8%6+37kdV5u`nmnN_16F9T(5Vz
zdGfT+r5h`imrR$H{d?%|)L%8li{IQeXR+wNs=xEm@9fw|PagDNmf!naa#P8=L!eG#
z+sCkDS~sBU?bbeO=Lv-@qr|fq<HmutJsSBU773tX361poQ|kP!u5B}wUb1fXa)D=y
zGu2*oeyLsd%ceN`R@8hx8Rb{g@4Wxby!lVgo}yoh-{v)c+56ja`#yLQhOB&uG!Z!0
zX1O>r;Hx`h`<)`AjtPr&r=%t2NO`WWnfmnhs`;y{`0BHSg8zw^{xRlPPkT7s>$~NR
z-N80i_xFFy<bD2habC`P#}A&<=6^W-pTXoAo8Pg2Is5Vsi|5tb+3O#F>7idU^O<(k
z<g7Hu-vJX<>u>aTe>lT4ckV3v!*y@(_UT<dX#Z$^-TjSf(=?NcCM|Y*ylR7%`-Nhz
zK;@+8#~iw)*PK|Ic~n=PX97Rt?Y#>hKYh@Dk$=lqy^~gE$Fz1Ndbera6D6`)xy@j8
z#j1y`I?X4m+OK|f&UrR5cD>+#21%i%b)hotcW3V6*<-1_WZ!>=qdRX!#_&{cmtX#+
zrrY-H<79As8)5(K{@neC<DxU(raWGqWwUV0!XFbef1j+s(d_unEj`2Jp3e7Q&a2+$
z<~Me=U)PIY`&q8!J<mO@H_-kPB_;fdxmJf>2kdJ)cG1>*_H@A`&ASbk-<>$;h@<+1
z^lp(&K5jOrU;by%{#kYX^e@?M)ARQ)**YsK;G}lmySnt{+isqCWh}GVNPl_8mWh`i
zNgVgzvTUdKG^A<^X$*E%xY)Gqnui{V%(S28%47F<!aR!;A+4L+JYDX1a;m<cXtTRC
zXv5ac^KZ3w{AXy*^Zt=0=6CwA-qd%+AIr8?ls@{tVZK>q(rsr!iTAeYGv)~x1vd4q
z@vuK^vg<BS!BwyKi*?iUPaiU5TCTV4I9tM=$rYg+yVgkrky=OZNc4K~WRkh3vQ0{F
z^Rat8%U0EWY&&tMIQQ`6Ca3tW*WYaY{rB{JJH@@?TjT_DdFH$RJFL?^yA|fRw1?Xj
zF81iz2x>&FpK5PZdNw}#v+dDu3v*4E#NUm$eXgff!TH0R!>hw5ez&}m!DiUQA*lDu
zeD}e!c`-AMX8Nhw9_YH+&2zT&>?5jV<ZtmO?bUw;?4Ox0{C!eew_n(sxhm8DPQNL4
z_2XIjtXDZdk{^AOJ6BfAFBe<Z|I&WpYssZm$8nG8`aOCiU7<2BjZ?%c_Qp3Zts?Mb
zIfq*7p6s}5YFEE{u2)$RW|Qduw5N9B-`dX;uROO*ONkBh{3z{xEO`TH*dg>V7ilfp
z=%e90n)zIt`IWLn`)X~^z5M;c{in*s;}@>j`{i1j>s!>ggI1jA6hT*<c>FLrb4z<;
zc+#5ukWKB^r*S4nD%N+nJusS@cV(%WspR?B3WcdV-d6ACQSlQgPntFV>GsL_ug))D
zx~F~dZDC&f8|x4LXW*VGVO<>BKjlaJm+gP|XE)B@P%_iLx#d5Dd;W&pZ-%!1pPYol
zE`3#t=U5kDT7Pr7{ExQ0g6fF+Q_g?&U)is{^vZUU{FCSZX4FmmHDlTGpRv!S8P4dk
zKFPlNHp2c+dr$j6cJrwE43n8=j~?1zy8ZU)w_U#On{Vxj{_v6i#rto?za`FIo%?jj
zGU**E+ozQFg`^~YF<>|Q@#$F7BbWAR@8+v%I$UY&{Cv}0Cp#ZBmqljZ-T%+zr<H$B
zu0ObZY1o~*PwxVM3#`9oZ~V=D=b75D1xbz5<NC_eGy0YrG(5e2=U3jXTinqVYu8?I
zWzkaZGQFX-Vgd6L<4IFG%_{fJ<ltx&+`u(M5>|JC%QTdu3D$6bmOmq(?zTOjeUI{c
zm;VgC{TFB1UAtO8Szi9i!>mp990`$&3ua3!1r6DT^Jo?vjXt!xO*0?dfCdYKW-XA{
z1t8C1<cr1_EZw8kb7}qAwuP+s-yFNYSNgql&R^SJ_kEGw>MSk0_q|&eHYwCjZW4Hz
z%oRqKkUW0pxyqn1#Z~cZ4xVG3QrhwU`kQTc_r9DVySTes_G|aVWpllDU#huaE!M}H
z%@ndOH+Nl9MqZNV!~Cr>U9$dXOx?UBRhbJ_<kch%k0rM`2;M1AwwnHQ`sDRH&9CfR
ztz5rbcgAu5N%``B^l~>;JFY(dC&u|#^xr-It_QC8R_!_cM}_~Fvfq}qJ>fxrCg*o<
zIqM<+wCkzn_Y?C!yX9^9cdh@^gda!#HUGM+w)iIVd69oY@=NNLX|Jq{t~_*T$&J}F
zj{n|tqci(c;K%<Ahn~Inzx~T+|M5fhOSj)X{kEj4KmBXP{^pK)_xjEAZyZnGzGM4@
zqlLnUHC|2943l>}yGLD;yOX8Ts`K#_UJrqqYbi6VNgao{abW$T{|wrD=KquX^y_5N
zoKovw-lc&bl`cQ%{@Y>wd-9z98Cf-vZ^2E$&Hown+n#<sUHpsL=!|#~_Syl|WLWy^
z-$uTPOV3uSa%(*1syAtW)BpPIj9+sei|};Ed44!{&#<u2^vEZFWASNWdT*+ynOdIk
za&wt{X4j&eTW2_OlBR)X4`U3L9v02#S_eu@paD6sAl50xWXKTcp3s6rU`18zQ%w2S
zW^xKkozAEg`_B+k+x(w_dHb2P_m0!MWlQ_+ue^0C#=-yR{rdRpAN@X?Hg61D;yO`M
zA~ZrY@lDwQ*DkGNOL`woTwK4UrFpBi-+u<bqMI8(_#EGPJ9)YQYvQSyTO0L`Mx9t4
zvGj&0e|d6hrTo(JeAzSc?{@~q);(iMow3<pa)+?+lg#yc5-Fk<o&1J5=|O+ie`<Z9
zsypkP^UmsY?f(p1cP_t+xs&;K@zuxA^$h<i{&JPydO6E>_NCOP!pwh#fARKj?9Q^E
z^j-Vpmb<Ph|0322Ed0;V>=*i<q4Dg!`L|xof3M*F)%S1PzVGfUzS%j~1hb!V+IO+O
zSo})8{-3*v!D{n9EBxJE<-@;MXzll&yDxv2drqHn!2Z(h_ct$QS+hrW&*7B6__g--
z-%gf^p29PpI8D+!)5D?gyLooR36F?7Rx@3WToeiGnGBgdB4Q%ri~K2m^}3nY_It%H
zEqQC&%uwZN9}-`%KjW{Q<(jv;{wx;mSM_(^|HhvF<7SO#t-x>p$L0H;n|%i*7^Kz(
zDtAid^E2{GO`TbEqph8StV+`VF8{~;yLkFr-SAE;d7s#{#rlE^PZ;jGZerdV4N56D
zKs60n#m<eR!TU8{$%kCMW@gg$rpou>`8Db9SN&($bY`zu98dGE=(_b+KNfG<v?1}M
z{PH*VAAI4tw+&QMPRTYXoT|>$<lnlBzoX>mmAW;Tzs=JN{$V*Q@-t`VS?5{TSayqM
zE3HkM4%&KqV|9e+ai)OnyYlAN%+b$H+Ua*FBz*bl36^=Xem-swmE{YU&AC-m>FTHC
zd?s4*%6{#d<>g^rk~(v~H=fo0xB9busd4G@Z}Y?ZX9~+-l3z7fZSl=sH9v;~{~28V
zHRr?!{h7VrYuns<na4lXgC&0!#U=cc+;jPNe9wP|N@n@8{|u|Y?9%n$c$58mu+YD4
z_e=k^>96=He>SQ@t=7uT@!y-aNo#HD%cAD{<(vH7zU1_mC*sey-+QrDwte-{ugNNv
zRr{VyoI15@gVuoy%^TUx8ty&3Di|#WT1|p=N5mct@YK1|mb+H(gRbbl(G|Y3b7!H9
z_q*dOKQOPf<e4ncIq`|K!J}!O9qu!0ouBsW-^!3u-8MaU*P;D;ChtCRd-wdAf6UIg
z+a*s*bNzBxZkmN5PvOgNQ!Z;3&BZxS8fN@_zd>EkWxKV^L7zT|I$5nMN&CnA+c^4G
z)OtP<yOkEddiE%_8-1EM=kVHm#DEW3Elh7v+jJW@6W7Kt>D7D-dJoF$L_-!-efg{Q
zH~-5Ey<^8*e_ScyvlEwhW}Yj@vrmO(ZqFme+td9EpLB!PQw8pAzP_#E_^qYE+mDz_
zKaKoYc;M(9)kBWSQ`h}GEf{T`kh`WUwrlIeu#Mguv?GMxgs$Ow+^CxnF2i+AGvh&s
z?6-+a@2{7>?UCo6tfejZNhKuphiPTOe}-~R_d78)zkDM1@99Z>FLtby|I~i%J6CS6
z+2&U+H~CZ4e}>iS_6K_IW&T}t_3*2QGd|0&nk%>Xrmvd+@-Frh|8^%^wLfKBEgN;{
zlXmNyP0hkJ+n(+3IQwk=Z62fBDys5jkH3gJulQzdQonmn>igSY|Fs#fsI)(GtI|I5
z^3w-aCndfH&9hnjg#GgDx8^yS#kG>kwa1e`nY<{q?OuKOYx4BNh2NqA9NF5Fta@%*
zZBK&ltcI?{fTSDS#h?679^)?itotY^@?gJznDm-jIsb35>|1M!op0@$Z71>a?3>y-
zZ~h5B_MZ8x_U?ZM`QzrRpUr%QJ8^_s&z_OH_Q{U9P0m8o%WNA&EhW#m2vxEOJDond
z^=(paeDJJqvCUF0^G{3s*8W@jxgXN__4EAbb%9wU;U0K)A6&_hUp?h>MaEAo<?^(f
z_dM<IAA3XB!v73{_H{Yc*1E#{{jdMZXKy$RSrk^E`?qJm*-21$T;a+CgS&g}&ditk
z`u<Az^Eux$k{+C_Re4i#dB^o4VFQ`zNo!L=*95)c0+%*SpfgZJk27uUin0)0!}W#}
zw1XnRs;zzTE9SpurzCH0-o<qI$^DGlpHr7#e}4Gyou~4B_x1eL7CSbZf1l8^_i_Df
z$^Cy;e|mb<ceQWY-6nIBU(TQMf8^YI`FHJA=huQWz6bs``z_12_@=DNzdnuX-u`Xp
zZykI8pFwl$jI5k@3wOn{t?{dCK3V^8bM^9XhyC^6D{Itml3(z*uRZWh-Xi<Er;PtI
zB-MNTj=1`tVd|g5iNU4I&vaSsT5lr%=JKR}misP$+cw?&;w1G`FaGqsYYx0AwZ=Zq
zlE1Zo#)fHW2d}{wu7TDePxvW)>T>1uGX@b{Yd8J-_9^hU!AhBx@9w8m&pCGW6`O`+
z>5J!Oc^$8cIqLb1-_=^?vzUEw&u8Lz*y-dd^+q%#fbo;$$w{7@euX3{F~~Ii;lZ7H
z!sq`>scfID*PC~n%l4t1ZJ_<*<S%LMTerqPIez@Bh1Ht<ha|)@?x=xhs3@<Gq7O}R
zZGC(*?qJ#M88U{<E93g?rmCbYH0I>wo8Q0l#HI6XC6(UEKR%hn&3}FPMQ!qoFBZS%
zEv=IiS+DgY*vd{Z{Nm{c=CR>VX6zPqcrEsC>Gl=uM+Mja7T#PRzt~{wj~yTH2kx$$
zS7Y>jN#!|fbHWKI7Q7or>kX&(`ak;@Wr><kGdS~nO{+uw4@0*<#peFEs(R$_o^vRV
zyRYZRw|sNS&;Ja2T2iWC*UvXIUr`tO!uaZ1)mayJ>(;vbp8e=QL)+PJvv2eI*zXaX
zf1~c~zT=K7zgc_RFE}Ni@w@zY#Jz<-Bi9|^j`9}0)z=;Gd;Y?G{y%2<TkhS+T)xdw
zqjvF|`)^95<|mgL+?QEw|4sev?YGI>|HWN<qm}n2turL#M97r?49!vNAJ6`4o|*ai
zKSR02iSKd$8T9h)SH9Wn$N%2&1mCaQ&&<3xn;yvLk`C}(aA#gK)4mCRHhil1^nCi1
zJL<B2zk9AveYLwruzmx3eNplB>#sl!;XeO`-^`jn{V4zSbmw2@hu=5z94x~!#S3lG
ztcrdno24u7HSObzm>L7O`YgBK%0K4k9KV{yrXeZczIVNzpTzB>&*nvUKAD%Mud^o3
z-PYT1rRDKcZf@s|UU_cLHqrpEEdtdupsrJB!J+9qp?kD;fZE7#L2RqQpv$krK87CV
z0_)tPnd_+55Hhb>H2waf_w|S7Fa9}y%`cnG?OxX}zw|2nVO;va`@n<O@r}P^r+4bF
z{;~S)y1IY+zPvXMcoVuTG*#=+Dpw9$4vW=N^OSkc3+Dw~+MQ?ByuIVTWvrV%Uz*-+
zksph=<^|oj<{EWW@4(sw?~P#_wEI}LHpUcaM=V|37<FJBXgB=^)f?agEY=;Ewn2M?
zc7*5+p{e(OW;^U(e{D@-nYAR-hx#9;i|Z^mUM}0Wn*ZV?=TmQLdfQ`HzL~36zh1`k
z{VIFI-7@?CthxAf<>npJZuYxoc{IPUiT)>T{;NLctKh#+hVy?5|8l?a!qo0q=JS1)
zUh;3+U;hsOssHJjuKAe__p`nWo=wgEeM8habQ$}DXIpOQ-+EPkcA0<nhScMSgIfCQ
z^*4XDkn&F{dU!@%S@Mu|-|z2r*Eb(7&$a&^wE8!b_V-kYtrnkZjacuWmsxy9>**Oh
z3$`XzK0jl>v@}?RH(J|kNyv+{zx}^_k-K^7Ti@!VbNQF)Z4R8?6<x$rkhb?YXr;V&
z1!#(?3mjRLL~}}=|0TQ4CHbjQhx6(fs!ZnYe^B+TuAN<EN58_|HnH5<&mNuzRVg=C
z1+P8m)>nA{LH;%SzO3qC-bTZB#U_*QP1<v5=UGCv3A`}KX4=iPwK29)SB498z(s7=
zqJ*pZ5B|L?TmEVL5xd7Rr;px}{P@?%zW&}-TN~9g$`3!=9=hNwwBuvc%72y{kKX>t
zeqEsUcHMTd+WEpKE+w+h*z(e>=%W0mR`+|_vu$FxH^scO`_FLWvA^?#qPz0EXZIZ1
z=&`AOmE+lIIv-AcIU!%%t5ei(=ruE&9ev1aP4xMDiGQV+)dsOGefmI4^Q!WTvtPc*
z-<);s^3{rhhw>r&o=XQ$ZwYu77d+?iTF|s5IMaYexWElN@|%RKZ{G4PFO}V*w8<mG
zc8}-Jl#d5aG)THcE?;&d(m6F#c8l|ao}j%a-}#?;?%FTW;=osv>@@Wg<V3_(Q?D>p
zmv?+k{4n`~;128Rr<H}BM~-|=<qX_r;>gw_;2uz>Z0YIJ?0UO7>DCEV{B=I=SOT49
z!F7#g8z<X>3w`YjCM#B$_IgRN&h3z$|46>K*jzmGmEos}Ki+@e;_uxTb10F0R+_Xw
z*Y=+tUjNv3Za(^!ryUk;bL?A|2~>9bPERZA_+jx+X|Y*Fb-uq{%JKWZWinqB@tYjd
zd@v(SQ_S(v68WpMZ7LTU7ApLn6X|e##?qh3u)Q=vyLUBRx)nY1hKj+;N{Md_;mVdB
zM^1d=n8*-Wv25q+^Q*Ip<4y;jxn%OsMLxCu{Jz3nbDry*>0WWtSTl-QGXd27h?WSV
zO8YGBp6?}F>Eab$`}fWW5~x=1|E+&@b}bv1jQh-@4~JSe#oX8qE!|gd3~3MD{$<^1
zMwjW2<wXCkKVHAwM0RO=TTQIWo082tt`~8e_IZPb3D$6yX<cJ21QmLHtl1)43cw}b
zHLYtbpv(h4ZsZzk87n9+fm>{lRvd`Q2@;KMj5@LO)R{Gso?)^aHy#Qp+;9}@ZH~V3
z@TFnlgZ~WTkIK*diCw$m_^I&scaP7TEVE0^pmOc8%Ln+o6_-EA{`EPt{g&~cf}eHk
zZ#_D{+5N+mL;MDrMVB^7%=k7T_@k(NU#`Kod$a0~9;*4zAoA$E>m*xUgT9ERae=#b
z{aDFTC%L)J<4lZ)^2uXUJf3Nm`F5WJo!fHwoa@E4w;y`h-juz)YWc-0e<c^Z%?+K;
zQ&S(@xcc-T#m1hCJA5B{CyP?4Y+E_6ajDtTx`_g{EI*#-e{#>C`EsUIj-ATt<zZ(E
z9_f38h6b!+2o+%{VMupio&(yD58Wpe5Vb{a>0*oDfi=lb?5;oDm-u?a$H%sh%iah-
zoa8*`^p<Q9P#owTjXJQ-LI@N|Ym=sd#tL_X7JD23_u9ehhYzefur?t)!P}h)v@Ll$
zXps$w39jrmXh(`{?b@xhHo<#?_9Rc`JddN&M?Kj;oOCPd+%ZeTkbRaFZ+&P>fbW?K
z56e2+dYKy!-_G^3fAmPM`rmb_DxIR2{uX=8+1@1=9DS~LEX>whc;~O8b9VOO)ko4A
zd(Nbu5moGtt_Y%5GQT3^z_jEI!y(a^cCnY-W-ni5@SnkB^5Z$b=XL)(ZvHFAPDXq6
z+&&pa<1^DxClVxgH5@GXSQh-@>u>eKo!`zyhqoU-;qIQ>RujnTZa5oM+<*cmT!u57
zX~%=Gjo`qF1ue_~1q^6$QY@(Vnh>@@dxI*dQ2=QufSKTsz9G7%E9z+M#4u1pA&<3;
zW#fLsTLn9#TjhBc_5R!RpCK*%WqQ)?dEwhl{#ddc*Q|Z0E;;4J?L*U!X@TbJr+ox1
zf&{JOlUPOiT>t7ekxlVxFa9$`>@vTso4DP6H~Y6G{~2Z%CoVX6R8RSY`GeNk>5@B(
z?xGGp1ntecw`w|<xjgfqUCm$Qug_X{<#3_!yP_|X7stM|%b44YrRNR~0MJQLpzIAk
zD{2kb8?I}tWh~&b0bE{ynL^+$9n;o{-Vv)efy;}v2i6^!BDXsG>ugD7rgiKp{~03d
z*ZXYd`H{lidP}NaoU=bJ`JP0@+0}>5TXlOvLE9X4AFYM0@d_n<?j}&otT-<AcrM49
zNwfGFtS5hxOtX+Y!FY8_a@xFw$?3dPmy})TQb}q)GVjTsb0rlYJ6ssvC`*Z~pX`k~
zgRpAu5p5HG;gUkHOIvLFFBC~Cs0s^TH8jcXG1{~-Oe9ss;I)&PvZdyMBNM8uXPi2^
zb%Hm>hzEt?Hf@8p;MKQvYipGnUFv)7+<zBmHq``H%)5N~M`Xu~at@ol2dL5xI9D@$
z@h`Ds|5E>cc{Gvvmc9J9_|@iCJTl51pY_r>0=D_i7W<CgTv>NCNH>k&?}dlmnM3>E
zOi%t}?0joRR+97T4VV0mmMa*CJOz(CQ>m2Fx&s;(U|MRIxb>^9%PBhzzyA!cwjDPr
z*}O8mdfD5(_HufL=j@B6&rUuGT9*sn(*{}w1)jwrd1}YEX7>`a<tub@_^&<&mEQH!
z|4vJJSx_-~-P~wH=Z?L)AzH10u1pPl4LmQL=V6;!2+>=am$tcpHP+6QX|H>r<Mpg(
zdYkz>d-~SyNI$F)@vi9HO>m~6u##O9dQ&u;DYh}}L3o09glJC3CbtuZRvlQ)pWI=R
z+w(wGSop+--5pY#Pg-{^RQ_FD$XUn`$8M+Gm&U#@!YJ4G5hX3i)e|E-LPe7@7+!fE
z5`8%@_L8{I<w<7pFNJD~xBqnC{#$P5g_i{t1?%?4{3&?IIWJ`!X!sdRSV`^M{%h~$
zW30lf>Q_|-KfP>OTPDx1D9iWmy1$*q!q2>WA%oDM`c4#dMi01Fi&z~2E^5FBvPOvB
z01q2wJP3o9U7R2$xbIfRnyoZ#V|YsF8qPA-Xi&o+R4K}TmR&Cy^wjPA2m3Q6e~j%t
zZF}O<x0ifXoKSk>pS{ea#F^{uC@Y{(*-Twr^<6z+W_>Z^5{2)RkN@p|eRf(iyWnG+
z=7~*WxpSU9g>-AM9I3uCZD;-|)j6fkM}O5$d->zvo@-^x<TMKT3X8UEUKw8HJ?HZ#
z%G+mXN#}-8+ZEl`vr8t{T@>~I+V)tztHy}+=(U%BV%%)2s&CYCsK|DlJ$*>v9tAyo
zmm873)s>=alpjyIw721%|B2KYpkqi&QzdRLUwJd~aC)Zb7Nv<t_PFowv^U;YGUI`w
z0K0pl#D%3fvry)BktSVM-As;5s<{1ThgRnG+D*nC6BIsavh{9Eck8_=|5j1!%FBSv
zIejr{LWZ`oXH<_cMo--Ys_DH!vl=L)ji9Cg_(T^_n--;i2<>@*8(jz1rUYHndegNP
zblzow_6Ak(U?pRi?wVV_#LqY^^8UE~%-27~*~?BI<u5)~wr&35GuczN|ILs&QQ8aI
zUrttEP3QB;DD$gpegB;HT*v;d@zuuv3}<iddh<ud@R7~=JI@kYxl?X#M6BaO3LIF{
zS~BbIe(u&8{B415_D}Whcl?c9^fty+(eCe@zcSwpy^8~$fyO;lL1Xn%N5LKAG8WL8
zLEyHcyJ#5;C_um?BA|vQq*w>HIYFT|Jt1t9X0~XVYZT~+<Q<|ngh0)LtqrT9*WIq#
zR<}T2Mt%Bkx&I8;jZ9`*q{hBmzOCd>MMb+s{)bn`HfMc&OJ=y3f4bIJYU>)<{>vn!
z^8EJH{|u=!qkQC4{<NFj33#OM!=S;y#khfaf#gL?+~ZxK09ujjcKfwhUqk5eqw-##
z<U~KdobhXootm-Onc#;Lbh0gt-pMw`6i_>Gt_7S5Z4K!Xd{Yps6vz^o_`U4ey=NZ&
zZ)E#BUfJ{9eLP>pu|hYDxm&UEMaZ#;3#9iHLr<(ZBkGuz?8;o^d5CrC%YSj;@>z&|
z-G2s|xBmj)ev&m_eCff5hp|;Ve>^-SY;!UPJjwzJ5-dpw)P+3uRlDBl<CWTJKdwKy
ze>>)xwKG3k@SXCqS(zW*@3fu~S3J%{)j~RgYipyX{EXcFyLSfubN;t+<}aN&k3P@c
zyZq^d>i!p=Z8>s<dk~v1h+I0iX8lPi{q+T<lGDEjNICFV+SK3px98@!x_Rd%pIBO2
zC{}NtbJvpaNuo<{-Q8JT3SGZ(eEDAE*jp79AMZ!(w2Hj4dau&C+?&|uG(h=<{8DCv
zs?)nWG0~o!e;022VC(*P(s4UUri-f%7(F(yjhGm;WTl95lI`az?gJAX7rhC9FG3({
z>Ss~OZOQfPleV_MJ(U@Epj72g8|3`Ou)y9~Ra>VnF)P~`?W8H=C0gU(Y4_YJr$C^C
zdGW@cjG%44gpb<U@?u?2kJcKF#7BI`85z2?xJ75FwS{-?yClT<GQNKKx+2MsGR21P
z$}OHB6$q1Ax{<mC5opH)Yx1nS+m}|PFh7`4Byaa~+r=l3TFY(fb6)<jx#K+L`;V{Q
zpEa+L)?QrmpW&pH{?(kbUru|zbANa6)y7i!53zM`?v>TeZ?kcq`FqYCfrUA<&2;e>
zKd`(u>Gifhsoo7{^^L!37w-6er*6%qvTbs~a*v*8JU^!yc~*HI75e(nR`hPBr~{yl
zI7|ylyYr*YcF4=bOZ?>9-<FbDRB-;@YwKwLM~N!Meg7HO_NG02EDhUZwwmxl<dw&#
zeo0>WN^70{#l*$uYTUuaa+R%pr|nO^+!+gx#LZz~YEH1?d2zQHwX=n@*a_IX{nybo
zpjL_BeStfvRy}blJk>WJ&*y1OX18S0PI~9KZIfo<0SX5}&;w?RgHro4)@7R2dAaYF
zbboVP^`Bu?x#XV1llv6*$Zhw3@N`O5$#;#X=d_cF>%6b)mAxCtn4ZM6;?ATphLnb_
zRnw<$X}R>}N<-u8{l~5O-c{GM`@AgKVPg><x9+fvg{xZSgd14e%Gd*K<K3t`hbxZo
zH~IJa{q?^kYWMSO**rO(X_lV1GSds!JrT=}nGTtOr@TM9L3Isl6lh>@gO>mL+o3`a
zc&|UKpZM~}v$}S*XL`-sOTG(ED7o>k|M)EL+2%8HKodX7poMby7e_@ui50&#=T))(
zyN5Qp2jBg@{kQ-1&$R2Cw|uKO@8{>oQ<gh7?Iq6kGAs`v1=s@9)%8J_uP{Guf3*Im
z`diQxqP07}oN~<L-4mD1=lT1l-m*OFaU=DbJK$2Lj5TOSYg+50ygtn~;fE7!&sKiu
znP6b+EL@UO<|dM=BKXdDLFdNA2kOj1NtNw9Iz&vKxW1fKbF1}B*o40;dAZ9%-yMHq
zbjPCSiIU_Yv&`3GWfN{i9nEEUEaD~V{?YEaRZW3lN5>P{9#^iglS`okinyB2$XV_g
zq&Xr`B~YjsvGxobcc-HD2NU+aR!y02=hUs{Z=Z1V&ZGGvjzN}vH$W>nsF{wmBZa0k
zM{ob~&SgQ3QSX0-YqG`p3r`lVdp_yyUVFAU!&C89F~+8sK`W+K;U6UX;;-^ze(<JW
zZ%%u6FZ|GaHTjkOgI#}b?tAmso~5GS_`Br|!wcKIv5sZn3#65Hd-L~{GygN(|2qEh
zti0=o6MRZ;?A&GfE@_I)1#31cj2eR4*SZOyv$`8WW9L&AeD$u6J9|L1<j3`A_M7!D
zJ$W$Wo!<T}U;gO{u^aA4PBvdJ1ghTg70Ao$LN59(U#T%6>>8KN^Ns&P{xhWh+HCB)
z{G<B*OP1RnwhMl$s$k&an|a9^V<rkqegd`s;Mpr=-2-v4Pfqn2IsQrJ?D;k8%?vFh
z=B-(%C&Vq9aA3lL)x2Hv7Ce{Mm@$dpy;L~q)`?A^?l`Es1nz}{j+I{x?mH1bf(V*^
zg_k_qkwVipXiHwv{mZ@GL1XzN|A}Y6%~qFTtjN1?`A1|=Rk7To_A~9A_}1a?v$*Fe
zW^rZnPOeo}lgbzp874bAU){5J@v^DQj^}TjxzF-OdGYlZvTP;4V&r7B*M}$f$tX?M
zIYF?E3=bnjf|9$I`&WC@gFrQzcE^u(*T4QMp8Yn)#?oS!=gmy@!gWvBvhExM^{dDo
zz(=pUb~A0AsF}^Qbk@`T8exgojNN|9zdiGp&1+(R_2Rc@?M2ue|JWCL8s~jl+k<C*
zKKY5Q@YR`HJ+FT+6x#OSd)?cA$Cv+(-1_FO?L6bllP51fesylz+cSi^3|N9=V~E(s
z{MV7289yHV*gxTSd|P7nhl&~f6?gah+ex-r&RM*j28l)MW^$x*#_cy76#iNyDhqME
zIIL%AF=L*KVWx7%lZ@MMH5L9!UOeRFAb9nG(PM*&ozJ)~PRhp7a9(V()+*QSpSDNc
zmG(z@rxuqbf0E3TaaU<^ws7ybeC@4n;+Ab)w^+et^64LQUL`V0G+45y3OY?K$|NVe
z!jsnIz4qSK=KfH!VpWCFpLqVP@8{w}7o3!wCvm4{?mAf)53zDb1BD5$9IyDYJJ#iS
zfW|ODN0Ec4C`g(N!jYDCGX?qP-S0VVAZ@X@=J>a?`<p-A@u>#SY8Xqhf2@7{O?9yu
zUnh=b0AK1=GU|gi{CaZQd-ej3^`ZT%`oG2cU!2RH{_=<Nk;>EWia#VTtbH?`*rqbJ
zL=`&8nP<@?r5*nnG?*vM(>VW%VN=hECjmt-rs;ok?D@|yslIVtLdu&pMo(XUH$NV3
z_^fI6>C3#2rbgdv7yeVste)&qYs7x<iF=e)i^#3qFY#Go%17%If28f#Yd5hx^7oxj
z@u8S5fhJ!5m?OI9K<h=w9TtJM6S9?pK*J;p*T4N+9qyoYpvZs5=`A-a)R5*xjvXt}
z=h=}Mj=6xw_S3Y^U%^3au4|X>m8)m|v-02RuW4oN{*V0YmlWq6?(g_%>ulwofGwPe
zxxNvptY1}h`=G(!H(CFlFcqztk!Zhy>74PDN)eG;yp#X-1<EG}{<v;n^vzAOXvaUB
zI~}jpEZ;TGKE0iLPmp#$^N0D5XZ_jRZTMwE-Ek$W7xR)P7-wGJ@OMX4^A4Hzd)l+!
z?9#dLT<FPR8`TpFH;Zlsjn9G;E@%lLwh3j70n2Mlpo0TIW51o=pp`in53H#U-2Nr+
z4*#bA3_^eHZ_oa#7H7ftar2RH%jO?C<L<n}ndemLJBig5$UADo4~tAXG0|=5lQOO@
zt4Y2LhXp(r%-X)TvfjPl>vHlo5u^Ei<+69a{$h8W>o=X@D1+74GK+_YG!4(Rq0Tj8
zZ<-^8CB9lURCBFv+P`nA$&cLrGt|c{SDP*KZ$;BN%Tzg6X7lN9=2x6{sbO64r~FTG
z?DUNry<hIwX>jdK@m)sq>3P?GFOOtzziHohzb|{!H$BHM6ZJQL{9Kf{uJf5DqiO3C
z`+J8@*<=QO@7)|b-E+G9RUw%fX)QZNd5-3S%UST06`|pB&`6AKLU=;hCRGsS?as9H
z*AbbwM;dAZ=l*kFmtIyEC;8#~uDsiqKR$Xa^Z2{UV)J|z^c`?Be=<9NRmlx2{h_R?
z+xYIT<i5UUv%fQ!ZGI%*Jazf;KR)lx^B@}&5p^d;feK6O0ke*s%YUC3roLCB?&H4X
z)JsVxzq*K>NSjkB!g4QWOYNhwo*%Uff4u+kY`1>mBYRK7-}Un5YEm!xk}e2WmVGtv
zS+jTpd*`3BKgH40HyXRYTv<E6fA&<~5`NoBKi|B2uzt0$!bj!&{mZh8UKS<)TI4*L
zXXA9G#WUXaLMGqAqo~L;?l=qCC=1c-RlBAph9)}M_9?kY^Q1E>I6jHEa?vDcPx`7^
z>E3-wg+j7%>~_MC37lioJ|IrSaC<40@@v{c(K)s$_R?jc@|pc7Qg0Z{nJmcjP)^xD
zcFWebYqzX3#CrlYLgWrx?Qn2muw+kR<qADX#%cNZk}@pR!ByQVsamsR_3ssf{NFMj
z`TJ;Q=XB?G^{ay4YtLRdZ}CZk^Uvm-+lQ6iYWR=XH=fOlJ9w;aro`WMKBk{!jxPQD
zvpAr?;>RiblP30s%d(Bj)GGd(>K})O{L8g@3HEzCC*N&ket$MC*3PFs#G`28B%>#}
z-WqA(bt<S+&{!IfkSYC8&1(sZ*Br>X&s}re=XP0MG@HKZ?Ojz9PFTIEcZx91_<R;=
z>-CrQDjD?wm;Y@yy7cM|+rn2HzlQ#*n)70}weLYb<*(k<sL4>m54n$qQJf!P(x^&W
z;rV5*RsMFSrt0;F>K|s#h^)3|^DC6+-S_NAR+0Ne@8_Sk@CLJ-nRkYn|Ip0Ur{DbH
zzo=yU``>ac*~NMb_2!@6HKkNzwZ?x2h4<g3($<?NWhtKEtlpnJmAB0Je9FG;>JDGE
z-o^G$ne5}TK0TOc9K=$6XT>>CC~Ku*&VxW3^)5?6^CF<)MKo}Ci!bx>JN@m?tWtN?
z>=70!+&ZgXT(CcG-ZyI}UjCSuaUAW5(5>w&zfb;Rf2nFhX4tlAS1MOu?0>WT@~_S2
zj>|w@7U>U<AKCc_otp{Yt4@`&0h~(lgz}?>jXaF(D=auz0s{hqU+l`cpT!#dXg>d|
zGdy>vE<brrp?cfzIUQM>+*ifgPfap4@C!c}!~CNwZMFI4jrJ}b-**PQ75?K03g<bY
ziY$wd^42pu&suZ0b49!2(RW1;*Bz_66t83KawpZz?L&h5>$7n_!Hp}K_-9X*>?|@{
zI@Jg=_k!Fv1ostXxUMm+O$nO#s-P;|rSZebkNop%UYJ-`eC+$U`B>S$`G?PVJk|Zr
z5G8CJ8wENuXZ6D_&!rxVf<Ad140I3jTp+1&WU`||^z{;6C0lKuuB#a-zk_%DU2g0D
zLGo(m2A%-HpSx`e9*WF(=4_5R?@#688A}u_cPV}JO42{T)y*wXNW`_J$z6r_SnJZW
zJ6n`1j(_;aoPXH#=5Bf4$v-lF=KhwMk!|F@_V=aR{hEB+K3_hVBKpVu%UQqtwDzBt
zfBrK>{Phd5_WpVJ$+SC_)gkTm-d6(e8K3^}`bXMw`=nQe{~7oNKHdNJw=czX$J1+j
zU)D_YlrEgeW!}uh|9IA(8Bc|SSme#sjMyigS+gk{G{13RZHgCcE{rj3lcwXV302dM
zw%_W1^vn8LdHU0bCu3D!Rj2zuN_-^qaR1>|p0mIAf%o&zu8Yrzxw|#<`a`d!D{OBs
zw!e6x)^g{Yy{7*@{E^vfX8%ZsRuv$Y5XL?>6n0XiNMBOG>OX@vgF9%a{F#sj<+Fwp
zWhVXZ*LxWp@+)q(+{amU(*1``XYLmEo&2Ms_IBO*ji=gn>r~y}tGnY<b6)N{#t)IK
z_7B^?oVBY@<A+5-jJ5yI!%wE($&gxOx`y>i-IaRr2j+i_1LtonwfN7_c6{1@hOKAX
zwu|h#zL(*}i=(k#8(wiNJR9>MDWgj-K;cvL1Wj1mkTvSW(nX9cvIk!o?lNm)6p8qH
zL``y@@o)9~={c_qQXV%<uRic<gG{6<-=htwYdPMEd(RHJlC-%yFKv_krv<-#r@#CF
zsuVvS?znvYZSKOY+xzZ`J{Iv36u*%k$-&XUuJGo-La&`FL^j-rFRihMIR3m8=FK9k
zFPR)Eez3uQz4pmANmdWe>Z6-_&QwZy=h<vt>Kn9iM#T4?%O6Z7SDwEil{2TY^OOC$
z!_#@|BEIggiY$Ec)75wHq3umOw10Fxn{U7All<K?@^$yuo^H?Lf5e%3taa7FplfeV
z|2g^bKf{r%V&C~2zefB#Fu&|SL-9=BG|eInwxA_#BFZZ)*C_OMPvN@L8MaBYjA>=s
zM)n&s>Q~)AY<740>^b~<pIcY^pH}!Te_>kB9h=9O_w+BU>%Y8jtI?%*Z`e$sb>vHH
zYu|^5JN^d!p7YnvPO#Qn<!m=-BQ&0}7o)->CkXKeFpBJ|;9Ix-G)+7e{xfJg{;l-O
zwX<njE~sCT&NHcB*)#X})GaHs0;9zKGbp_MZd&X=|K?efpUnJ)f6Ja8-codY-pknY
zlh=hUyH`4)!a}Q_FLK%WH|re#-Z`@Ocinb#`7D>ePLo#86%N_Ha?;&X{kQyk>JMEv
znbmjV%A;QkvQO9VJac^YalIh#b%{bpKAK$>`6+Yg@Px-RrWci3xW%N&KK?EBDX*ba
zH+atLf880*KKyQ3e>DHrZr<_ct$nxlKY<TFHcZyCm0LR3n)I7?XdJAt#$xlnSjBzP
z_nnq6Ulk(1VD9JmHGNaw&Tjtm>aXq(zrZhrHL^>cm%1{qo0V+vt0%?KpzxJc*s|qy
lGs`APEao~IBj@(-+Dz$*>T}<}cS{SxvyTD2!dn0TCIHqs{51do

diff --git a/code/cpp-httplib-0.19.0/test/include_httplib.cc b/code/cpp-httplib-0.19.0/test/include_httplib.cc
deleted file mode 100644
index fd38cb82..00000000
--- a/code/cpp-httplib-0.19.0/test/include_httplib.cc
+++ /dev/null
@@ -1,5 +0,0 @@
-// The sole purpose of this file is to include httplib.h in a separate
-// compilation unit, thus verifying that inline keywords have not been forgotten
-// when linked together with test.cc.
-
-#include <httplib.h>
diff --git a/code/cpp-httplib-0.19.0/test/make-shared-library.sh b/code/cpp-httplib-0.19.0/test/make-shared-library.sh
deleted file mode 100644
index 04f2fc08..00000000
--- a/code/cpp-httplib-0.19.0/test/make-shared-library.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-if [ "$#" -ne 1 ]; then
-    echo "Usage: $0 build_dir"
-    exit 1
-fi
-
-BUILD_DIR=$1
-
-# Make the build directory
-rm -rf $BUILD_DIR
-mkdir -p $BUILD_DIR/out
-
-cd $BUILD_DIR
-
-# Build the version
-git checkout $BUILD_DIR -q
-
-cmake \
-  -DCMAKE_BUILD_TYPE=Debug \
-  -DCMAKE_CXX_FLAGS="-g -Og" \
-  -DBUILD_SHARED_LIBS=ON \
-  -DHTTPLIB_COMPILE=ON \
-  -DCMAKE_INSTALL_PREFIX=./out \
-  ../..
-
-cmake --build . --target install
-cmake --build . --target clean
-
diff --git a/code/cpp-httplib-0.19.0/test/meson.build b/code/cpp-httplib-0.19.0/test/meson.build
deleted file mode 100644
index 80621d30..00000000
--- a/code/cpp-httplib-0.19.0/test/meson.build
+++ /dev/null
@@ -1,144 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-gtest_dep = dependency('gtest', main: true)
-libcurl_dep = dependency('libcurl')
-openssl = find_program('openssl')
-test_conf = files('test.conf')
-req_x509_flag = openssl.version().version_compare('>=3.2.0') ? '-x509v1' : '-x509'
-
-key_pem = custom_target(
-  'key_pem',
-  output: 'key.pem',
-  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
-)
-
-temp_req = custom_target(
-  'temp_req',
-  input: key_pem,
-  output: 'temp_req',
-  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-out', '@OUTPUT@']
-)
-
-cert_pem = custom_target(
-  'cert_pem',
-  input: [temp_req, key_pem],
-  output: 'cert.pem',
-  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '3650', '-req', '-signkey', '@INPUT1@', '-out', '@OUTPUT@']
-)
-
-cert2_pem = custom_target(
-  'cert2_pem',
-  input: key_pem,
-  output: 'cert2.pem',
-  command: [openssl, 'req', req_x509_flag, '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
-)
-
-key_encrypted_pem = custom_target(
-  'key_encrypted_pem',
-  output: 'key_encrypted.pem',
-  command: [openssl, 'genrsa', '-passout', 'pass:test123!', '-out', '@OUTPUT@', '2048']
-)
-
-cert_encrypted_pem = custom_target(
-  'cert_encrypted_pem',
-  input: key_encrypted_pem,
-  output: 'cert_encrypted.pem',
-  command: [openssl, 'req', req_x509_flag, '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
-)
-
-rootca_key_pem = custom_target(
-  'rootca_key_pem',
-  output: 'rootCA.key.pem',
-  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
-)
-
-rootca_cert_pem = custom_target(
-  'rootca_cert_pem',
-  input: rootca_key_pem,
-  output: 'rootCA.cert.pem',
-  command: [openssl, 'req', req_x509_flag, '-new', '-batch', '-config', files('test.rootCA.conf'), '-key', '@INPUT@', '-days', '1024', '-out', '@OUTPUT@']
-)
-
-client_key_pem = custom_target(
-  'client_key_pem',
-  output: 'client.key.pem',
-  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
-)
-
-client_temp_req = custom_target(
-  'client_temp_req',
-  input: client_key_pem,
-  output: 'client_temp_req',
-  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-out', '@OUTPUT@']
-)
-
-client_cert_pem = custom_target(
-  'client_cert_pem',
-  input: [client_temp_req, rootca_cert_pem, rootca_key_pem],
-  output: 'client.cert.pem',
-  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '370', '-req', '-CA', '@INPUT1@', '-CAkey', '@INPUT2@', '-CAcreateserial', '-out', '@OUTPUT@']
-)
-
-client_encrypted_key_pem = custom_target(
-  'client_encrypted_key_pem',
-  output: 'client_encrypted.key.pem',
-  command: [openssl, 'genrsa', '-aes256', '-passout', 'pass:test012!', '-out', '@OUTPUT@', '2048']
-)
-
-client_encrypted_temp_req = custom_target(
-  'client_encrypted_temp_req',
-  input: client_encrypted_key_pem,
-  output: 'client_encrypted_temp_req',
-  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-passin', 'pass:test012!', '-out', '@OUTPUT@']
-)
-
-client_encrypted_cert_pem = custom_target(
-  'client_encrypted_cert_pem',
-  input: [client_encrypted_temp_req, rootca_cert_pem, rootca_key_pem],
-  output: 'client_encrypted.cert.pem',
-  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '370', '-req', '-CA', '@INPUT1@', '-CAkey', '@INPUT2@', '-CAcreateserial', '-out', '@OUTPUT@']
-)
-
-# Copy test files to the build directory
-configure_file(input: 'ca-bundle.crt', output: 'ca-bundle.crt', copy: true)
-configure_file(input: 'image.jpg',     output: 'image.jpg',     copy: true)
-subdir('www')
-subdir('www2'/'dir')
-subdir('www3'/'dir')
-
-# GoogleTest 1.13.0 requires C++14
-test_options = []
-if gtest_dep.version().version_compare('>=1.13.0')
-  test_options += 'cpp_std=c++14'
-endif
-
-test(
-  'main',
-  executable(
-    'main',
-    'test.cc',
-    dependencies: [
-      cpp_httplib_dep,
-      gtest_dep,
-      libcurl_dep
-    ],
-    override_options: test_options
-  ),
-  depends: [
-    key_pem,
-    cert_pem,
-    cert2_pem,
-    key_encrypted_pem,
-    cert_encrypted_pem,
-    rootca_key_pem,
-    rootca_cert_pem,
-    client_key_pem,
-    client_cert_pem,
-    client_encrypted_key_pem,
-    client_encrypted_cert_pem
-  ],
-  workdir: meson.current_build_dir(),
-  timeout: 300
-)
diff --git a/code/cpp-httplib-0.19.0/test/proxy/Dockerfile b/code/cpp-httplib-0.19.0/test/proxy/Dockerfile
deleted file mode 100644
index cd20938b..00000000
--- a/code/cpp-httplib-0.19.0/test/proxy/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM centos:7
-
-ARG auth="basic"
-ARG port="3128"
-
-RUN yum install -y squid
-
-COPY ./${auth}_squid.conf /etc/squid/squid.conf
-COPY ./${auth}_passwd /etc/squid/passwd
-
-EXPOSE ${port}
-
-CMD ["/usr/sbin/squid", "-N"]
diff --git a/code/cpp-httplib-0.19.0/test/proxy/basic_passwd b/code/cpp-httplib-0.19.0/test/proxy/basic_passwd
deleted file mode 100644
index bb1b7091..00000000
--- a/code/cpp-httplib-0.19.0/test/proxy/basic_passwd
+++ /dev/null
@@ -1 +0,0 @@
-hello:$apr1$O6S28OBL$8dr3ixl4Mohf97hgsYvLy/
diff --git a/code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf b/code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf
deleted file mode 100644
index f97f09a4..00000000
--- a/code/cpp-httplib-0.19.0/test/proxy/basic_squid.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 0.0.0.1-0.255.255.255	# RFC 1122 "this" network (LAN)
-acl localnet src 10.0.0.0/8		# RFC 1918 local private network (LAN)
-acl localnet src 100.64.0.0/10		# RFC 6598 shared address space (CGN)
-acl localnet src 169.254.0.0/16 	# RFC 3927 link-local (directly plugged) machines
-acl localnet src 172.16.0.0/12		# RFC 1918 local private network (LAN)
-acl localnet src 192.168.0.0/16		# RFC 1918 local private network (LAN)
-acl localnet src fc00::/7       	# RFC 4193 local private network range
-acl localnet src fe80::/10      	# RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-auth_param basic program /usr/lib64/squid/basic_ncsa_auth /etc/squid/passwd
-auth_param basic realm proxy
-acl authenticated proxy_auth REQUIRED
-http_access allow authenticated
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-# Squid normally listens to port 3128
-http_port 3128
-
-# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/spool/squid 100 16 256
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/spool/squid
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
diff --git a/code/cpp-httplib-0.19.0/test/proxy/digest_passwd b/code/cpp-httplib-0.19.0/test/proxy/digest_passwd
deleted file mode 100644
index d45615f5..00000000
--- a/code/cpp-httplib-0.19.0/test/proxy/digest_passwd
+++ /dev/null
@@ -1 +0,0 @@
-hello:world
diff --git a/code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf b/code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf
deleted file mode 100644
index 050c5da1..00000000
--- a/code/cpp-httplib-0.19.0/test/proxy/digest_squid.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 0.0.0.1-0.255.255.255	# RFC 1122 "this" network (LAN)
-acl localnet src 10.0.0.0/8		# RFC 1918 local private network (LAN)
-acl localnet src 100.64.0.0/10		# RFC 6598 shared address space (CGN)
-acl localnet src 169.254.0.0/16 	# RFC 3927 link-local (directly plugged) machines
-acl localnet src 172.16.0.0/12		# RFC 1918 local private network (LAN)
-acl localnet src 192.168.0.0/16		# RFC 1918 local private network (LAN)
-acl localnet src fc00::/7       	# RFC 4193 local private network range
-acl localnet src fe80::/10      	# RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-auth_param digest program /usr/lib64/squid/digest_file_auth /etc/squid/passwd
-auth_param digest realm proxy
-acl authenticated proxy_auth REQUIRED
-http_access allow authenticated
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-# Squid normally listens to port 3128
-http_port 3129
-
-# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/spool/squid 100 16 256
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/spool/squid
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
diff --git a/code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml b/code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml
deleted file mode 100644
index 67a9e9b6..00000000
--- a/code/cpp-httplib-0.19.0/test/proxy/docker-compose.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: '2'
-
-services:
-  squid_basic:
-    image: squid_basic
-    restart: always
-    ports:
-      - "3128:3128"
-    build:
-      context: ./
-      args:
-        auth: basic
-
-  squid_digest:
-    image: squid_digest
-    restart: always
-    ports:
-      - "3129:3129"
-    build:
-      context: ./
-      args:
-        auth: digest
diff --git a/code/cpp-httplib-0.19.0/test/test.cc b/code/cpp-httplib-0.19.0/test/test.cc
deleted file mode 100644
index 82648b95..00000000
--- a/code/cpp-httplib-0.19.0/test/test.cc
+++ /dev/null
@@ -1,8458 +0,0 @@
-// NOTE: This file should be saved as UTF-8 w/ BOM
-#include <httplib.h>
-#include <signal.h>
-
-#ifndef _WIN32
-#include <curl/curl.h>
-#endif
-#include <gtest/gtest.h>
-
-#include <atomic>
-#include <chrono>
-#include <future>
-#include <limits>
-#include <memory>
-#include <sstream>
-#include <stdexcept>
-#include <thread>
-#include <type_traits>
-#include <vector>
-
-#define SERVER_CERT_FILE "./cert.pem"
-#define SERVER_CERT2_FILE "./cert2.pem"
-#define SERVER_PRIVATE_KEY_FILE "./key.pem"
-#define CA_CERT_FILE "./ca-bundle.crt"
-#define CLIENT_CA_CERT_FILE "./rootCA.cert.pem"
-#define CLIENT_CA_CERT_DIR "."
-#define CLIENT_CERT_FILE "./client.cert.pem"
-#define CLIENT_PRIVATE_KEY_FILE "./client.key.pem"
-#define CLIENT_ENCRYPTED_CERT_FILE "./client_encrypted.cert.pem"
-#define CLIENT_ENCRYPTED_PRIVATE_KEY_FILE "./client_encrypted.key.pem"
-#define CLIENT_ENCRYPTED_PRIVATE_KEY_PASS "test012!"
-#define SERVER_ENCRYPTED_CERT_FILE "./cert_encrypted.pem"
-#define SERVER_ENCRYPTED_PRIVATE_KEY_FILE "./key_encrypted.pem"
-#define SERVER_ENCRYPTED_PRIVATE_KEY_PASS "test123!"
-
-using namespace std;
-using namespace httplib;
-
-const char *HOST = "localhost";
-const int PORT = 1234;
-
-const string LONG_QUERY_VALUE = string(25000, '@');
-const string LONG_QUERY_URL = "/long-query-value?key=" + LONG_QUERY_VALUE;
-
-const std::string JSON_DATA = "{\"hello\":\"world\"}";
-
-const string LARGE_DATA = string(1024 * 1024 * 100, '@'); // 100MB
-
-MultipartFormData &get_file_value(MultipartFormDataItems &files,
-                                  const char *key) {
-  auto it = std::find_if(
-      files.begin(), files.end(),
-      [&](const MultipartFormData &file) { return file.name == key; });
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-  return *it;
-#else
-  if (it != files.end()) { return *it; }
-  throw std::runtime_error("invalid multipart form data name error");
-#endif
-}
-
-#ifndef _WIN32
-class UnixSocketTest : public ::testing::Test {
-protected:
-  void TearDown() override { std::remove(pathname_.c_str()); }
-
-  void client_GET(const std::string &addr) {
-    httplib::Client cli{addr};
-    cli.set_address_family(AF_UNIX);
-    ASSERT_TRUE(cli.is_valid());
-
-    const auto &result = cli.Get(pattern_);
-    ASSERT_TRUE(result) << "error: " << result.error();
-
-    const auto &resp = result.value();
-    EXPECT_EQ(resp.status, StatusCode::OK_200);
-    EXPECT_EQ(resp.body, content_);
-  }
-
-  const std::string pathname_{"./httplib-server.sock"};
-  const std::string pattern_{"/hi"};
-  const std::string content_{"Hello World!"};
-};
-
-TEST_F(UnixSocketTest, pathname) {
-  httplib::Server svr;
-  svr.Get(pattern_, [&](const httplib::Request &, httplib::Response &res) {
-    res.set_content(content_, "text/plain");
-  });
-
-  std::thread t{[&] {
-    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(pathname_, 80));
-  }};
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-  ASSERT_TRUE(svr.is_running());
-
-  client_GET(pathname_);
-}
-
-#if defined(__linux__) ||                                                      \
-    /* __APPLE__ */ (defined(SOL_LOCAL) && defined(SO_PEERPID))
-TEST_F(UnixSocketTest, PeerPid) {
-  httplib::Server svr;
-  std::string remote_port_val;
-  svr.Get(pattern_, [&](const httplib::Request &req, httplib::Response &res) {
-    res.set_content(content_, "text/plain");
-    remote_port_val = req.get_header_value("REMOTE_PORT");
-  });
-
-  std::thread t{[&] {
-    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(pathname_, 80));
-  }};
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-  ASSERT_TRUE(svr.is_running());
-
-  client_GET(pathname_);
-  EXPECT_EQ(std::to_string(getpid()), remote_port_val);
-}
-#endif
-
-#ifdef __linux__
-TEST_F(UnixSocketTest, abstract) {
-  constexpr char svr_path[]{"\x00httplib-server.sock"};
-  const std::string abstract_addr{svr_path, sizeof(svr_path) - 1};
-
-  httplib::Server svr;
-  svr.Get(pattern_, [&](const httplib::Request &, httplib::Response &res) {
-    res.set_content(content_, "text/plain");
-  });
-
-  std::thread t{[&] {
-    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(abstract_addr, 80));
-  }};
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-  ASSERT_TRUE(svr.is_running());
-
-  client_GET(abstract_addr);
-}
-#endif
-
-TEST(SocketStream, is_writable_UNIX) {
-  int fds[2];
-  ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_STREAM, 0, fds));
-
-  const auto asSocketStream = [&](socket_t fd,
-                                  std::function<bool(Stream &)> func) {
-    return detail::process_client_socket(
-        fd, 0, 0, 0, 0, 0, std::chrono::steady_clock::time_point::min(), func);
-  };
-  asSocketStream(fds[0], [&](Stream &s0) {
-    EXPECT_EQ(s0.socket(), fds[0]);
-    EXPECT_TRUE(s0.is_writable());
-
-    EXPECT_EQ(0, close(fds[1]));
-    EXPECT_FALSE(s0.is_writable());
-
-    return true;
-  });
-  EXPECT_EQ(0, close(fds[0]));
-}
-
-TEST(SocketStream, is_writable_INET) {
-  sockaddr_in addr;
-  memset(&addr, 0, sizeof(addr));
-  addr.sin_family = AF_INET;
-  addr.sin_port = htons(PORT + 1);
-  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-  int disconnected_svr_sock = -1;
-  std::thread svr{[&] {
-    const int s = socket(AF_INET, SOCK_STREAM, 0);
-    ASSERT_LE(0, s);
-    ASSERT_EQ(0, ::bind(s, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)));
-    ASSERT_EQ(0, listen(s, 1));
-    ASSERT_LE(0, disconnected_svr_sock = accept(s, nullptr, nullptr));
-    ASSERT_EQ(0, close(s));
-  }};
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  std::thread cli{[&] {
-    const int s = socket(AF_INET, SOCK_STREAM, 0);
-    ASSERT_LE(0, s);
-    ASSERT_EQ(0, connect(s, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)));
-    ASSERT_EQ(0, close(s));
-  }};
-  cli.join();
-  svr.join();
-  ASSERT_NE(disconnected_svr_sock, -1);
-
-  const auto asSocketStream = [&](socket_t fd,
-                                  std::function<bool(Stream &)> func) {
-    return detail::process_client_socket(
-        fd, 0, 0, 0, 0, 0, std::chrono::steady_clock::time_point::min(), func);
-  };
-  asSocketStream(disconnected_svr_sock, [&](Stream &ss) {
-    EXPECT_EQ(ss.socket(), disconnected_svr_sock);
-    EXPECT_FALSE(ss.is_writable());
-
-    return true;
-  });
-
-  ASSERT_EQ(0, close(disconnected_svr_sock));
-}
-#endif // #ifndef _WIN32
-
-TEST(ClientTest, MoveConstructible) {
-  EXPECT_FALSE(std::is_copy_constructible<Client>::value);
-  EXPECT_TRUE(std::is_nothrow_move_constructible<Client>::value);
-}
-
-TEST(ClientTest, MoveAssignable) {
-  EXPECT_FALSE(std::is_copy_assignable<Client>::value);
-  EXPECT_TRUE(std::is_nothrow_move_assignable<Client>::value);
-}
-
-#ifdef _WIN32
-TEST(StartupTest, WSAStartup) {
-  WSADATA wsaData;
-  int ret = WSAStartup(0x0002, &wsaData);
-  ASSERT_EQ(0, ret);
-}
-#endif
-
-TEST(DecodeURLTest, PercentCharacter) {
-  EXPECT_EQ(
-      detail::decode_url(
-          R"(descrip=Gastos%20%C3%A1%C3%A9%C3%AD%C3%B3%C3%BA%C3%B1%C3%91%206)",
-          false),
-      u8"descrip=Gastos áéíóúñÑ 6");
-}
-
-TEST(DecodeURLTest, PercentCharacterNUL) {
-  string expected;
-  expected.push_back('x');
-  expected.push_back('\0');
-  expected.push_back('x');
-
-  EXPECT_EQ(detail::decode_url("x%00x", false), expected);
-}
-
-TEST(EncodeQueryParamTest, ParseUnescapedChararactersTest) {
-  string unescapedCharacters = "-_.!~*'()";
-
-  EXPECT_EQ(detail::encode_query_param(unescapedCharacters), "-_.!~*'()");
-}
-
-TEST(EncodeQueryParamTest, ParseReservedCharactersTest) {
-  string reservedCharacters = ";,/?:@&=+$";
-
-  EXPECT_EQ(detail::encode_query_param(reservedCharacters),
-            "%3B%2C%2F%3F%3A%40%26%3D%2B%24");
-}
-
-TEST(EncodeQueryParamTest, TestUTF8Characters) {
-  string chineseCharacters = u8"中国語";
-  string russianCharacters = u8"дом";
-  string brazilianCharacters = u8"óculos";
-
-  EXPECT_EQ(detail::encode_query_param(chineseCharacters),
-            "%E4%B8%AD%E5%9B%BD%E8%AA%9E");
-
-  EXPECT_EQ(detail::encode_query_param(russianCharacters),
-            "%D0%B4%D0%BE%D0%BC");
-
-  EXPECT_EQ(detail::encode_query_param(brazilianCharacters), "%C3%B3culos");
-}
-
-TEST(TrimTests, TrimStringTests) {
-  EXPECT_EQ("abc", detail::trim_copy("abc"));
-  EXPECT_EQ("abc", detail::trim_copy("  abc  "));
-  EXPECT_TRUE(detail::trim_copy("").empty());
-}
-
-TEST(DivideTest, DivideStringTests) {
-  auto divide = [](const std::string &str, char d) {
-    std::string lhs;
-    std::string rhs;
-
-    detail::divide(str, d,
-                   [&](const char *lhs_data, std::size_t lhs_size,
-                       const char *rhs_data, std::size_t rhs_size) {
-                     lhs.assign(lhs_data, lhs_size);
-                     rhs.assign(rhs_data, rhs_size);
-                   });
-
-    return std::make_pair(std::move(lhs), std::move(rhs));
-  };
-
-  {
-    const auto res = divide("", '=');
-    EXPECT_EQ(res.first, "");
-    EXPECT_EQ(res.second, "");
-  }
-
-  {
-    const auto res = divide("=", '=');
-    EXPECT_EQ(res.first, "");
-    EXPECT_EQ(res.second, "");
-  }
-
-  {
-    const auto res = divide(" ", '=');
-    EXPECT_EQ(res.first, " ");
-    EXPECT_EQ(res.second, "");
-  }
-
-  {
-    const auto res = divide("a", '=');
-    EXPECT_EQ(res.first, "a");
-    EXPECT_EQ(res.second, "");
-  }
-
-  {
-    const auto res = divide("a=", '=');
-    EXPECT_EQ(res.first, "a");
-    EXPECT_EQ(res.second, "");
-  }
-
-  {
-    const auto res = divide("=b", '=');
-    EXPECT_EQ(res.first, "");
-    EXPECT_EQ(res.second, "b");
-  }
-
-  {
-    const auto res = divide("a=b", '=');
-    EXPECT_EQ(res.first, "a");
-    EXPECT_EQ(res.second, "b");
-  }
-
-  {
-    const auto res = divide("a=b=", '=');
-    EXPECT_EQ(res.first, "a");
-    EXPECT_EQ(res.second, "b=");
-  }
-
-  {
-    const auto res = divide("a=b=c", '=');
-    EXPECT_EQ(res.first, "a");
-    EXPECT_EQ(res.second, "b=c");
-  }
-}
-
-TEST(SplitTest, ParseQueryString) {
-  string s = "key1=val1&key2=val2&key3=val3";
-  Params dic;
-
-  detail::split(s.c_str(), s.c_str() + s.size(), '&',
-                [&](const char *b, const char *e) {
-                  string key, val;
-                  detail::split(b, e, '=', [&](const char *b2, const char *e2) {
-                    if (key.empty()) {
-                      key.assign(b2, e2);
-                    } else {
-                      val.assign(b2, e2);
-                    }
-                  });
-                  dic.emplace(key, val);
-                });
-
-  EXPECT_EQ("val1", dic.find("key1")->second);
-  EXPECT_EQ("val2", dic.find("key2")->second);
-  EXPECT_EQ("val3", dic.find("key3")->second);
-}
-
-TEST(SplitTest, ParseInvalidQueryTests) {
-
-  {
-    string s = " ";
-    Params dict;
-    detail::parse_query_text(s, dict);
-    EXPECT_TRUE(dict.empty());
-  }
-
-  {
-    string s = " = =";
-    Params dict;
-    detail::parse_query_text(s, dict);
-    EXPECT_TRUE(dict.empty());
-  }
-}
-
-TEST(ParseQueryTest, ParseQueryString) {
-  {
-    std::string s = "key1=val1&key2=val2&key3=val3";
-    Params dic;
-
-    detail::parse_query_text(s, dic);
-
-    EXPECT_EQ("val1", dic.find("key1")->second);
-    EXPECT_EQ("val2", dic.find("key2")->second);
-    EXPECT_EQ("val3", dic.find("key3")->second);
-  }
-
-  {
-    std::string s = "key1&key2=val1&key3=val1=val2&key4=val1=val2=val3";
-    Params dic;
-
-    detail::parse_query_text(s, dic);
-
-    EXPECT_EQ("", dic.find("key1")->second);
-    EXPECT_EQ("val1", dic.find("key2")->second);
-    EXPECT_EQ("val1=val2", dic.find("key3")->second);
-    EXPECT_EQ("val1=val2=val3", dic.find("key4")->second);
-  }
-}
-
-TEST(ParamsToQueryTest, ConvertParamsToQuery) {
-  Params dic;
-
-  EXPECT_EQ(detail::params_to_query_str(dic), "");
-
-  dic.emplace("key1", "val1");
-
-  EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1");
-
-  dic.emplace("key2", "val2");
-  dic.emplace("key3", "val3");
-
-  EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1&key2=val2&key3=val3");
-}
-
-TEST(ParseMultipartBoundaryTest, DefaultValue) {
-  string content_type = "multipart/form-data; boundary=something";
-  string boundary;
-  auto ret = detail::parse_multipart_boundary(content_type, boundary);
-  EXPECT_TRUE(ret);
-  EXPECT_EQ(boundary, "something");
-}
-
-TEST(ParseMultipartBoundaryTest, ValueWithQuote) {
-  string content_type = "multipart/form-data; boundary=\"gc0pJq0M:08jU534c0p\"";
-  string boundary;
-  auto ret = detail::parse_multipart_boundary(content_type, boundary);
-  EXPECT_TRUE(ret);
-  EXPECT_EQ(boundary, "gc0pJq0M:08jU534c0p");
-}
-
-TEST(ParseMultipartBoundaryTest, ValueWithCharset) {
-  string content_type =
-      "multipart/mixed; boundary=THIS_STRING_SEPARATES;charset=UTF-8";
-  string boundary;
-  auto ret = detail::parse_multipart_boundary(content_type, boundary);
-  EXPECT_TRUE(ret);
-  EXPECT_EQ(boundary, "THIS_STRING_SEPARATES");
-}
-
-TEST(ParseMultipartBoundaryTest, ValueWithQuotesAndCharset) {
-  string content_type =
-      "multipart/mixed; boundary=\"cpp-httplib-multipart-data\"; charset=UTF-8";
-  string boundary;
-  auto ret = detail::parse_multipart_boundary(content_type, boundary);
-  EXPECT_TRUE(ret);
-  EXPECT_EQ(boundary, "cpp-httplib-multipart-data");
-}
-
-TEST(GetHeaderValueTest, DefaultValue) {
-  Headers headers = {{"Dummy", "Dummy"}};
-  auto val = detail::get_header_value(headers, "Content-Type", "text/plain", 0);
-  EXPECT_STREQ("text/plain", val);
-}
-
-TEST(GetHeaderValueTest, DefaultValueInt) {
-  Headers headers = {{"Dummy", "Dummy"}};
-  auto val = detail::get_header_value_u64(headers, "Content-Length", 100, 0);
-  EXPECT_EQ(100ull, val);
-}
-
-TEST(GetHeaderValueTest, RegularValue) {
-  Headers headers = {{"Content-Type", "text/html"}, {"Dummy", "Dummy"}};
-  auto val = detail::get_header_value(headers, "Content-Type", "text/plain", 0);
-  EXPECT_STREQ("text/html", val);
-}
-
-TEST(GetHeaderValueTest, RegularValueWithDifferentCase) {
-  Headers headers = {{"Content-Type", "text/html"}, {"Dummy", "Dummy"}};
-  auto val = detail::get_header_value(headers, "content-type", "text/plain", 0);
-  EXPECT_STREQ("text/html", val);
-}
-
-TEST(GetHeaderValueTest, SetContent) {
-  Response res;
-
-  res.set_content("html", "text/html");
-  EXPECT_EQ("text/html", res.get_header_value("Content-Type"));
-
-  res.set_content("text", "text/plain");
-  EXPECT_EQ(1U, res.get_header_value_count("Content-Type"));
-  EXPECT_EQ("text/plain", res.get_header_value("Content-Type"));
-}
-
-TEST(GetHeaderValueTest, RegularValueInt) {
-  Headers headers = {{"Content-Length", "100"}, {"Dummy", "Dummy"}};
-  auto val = detail::get_header_value_u64(headers, "Content-Length", 0, 0);
-  EXPECT_EQ(100ull, val);
-}
-
-TEST(GetHeaderValueTest, RegularInvalidValueInt) {
-  Headers headers = {{"Content-Length", "x"}};
-  auto is_invalid_value = false;
-  auto val = detail::get_header_value_u64(headers, "Content-Length", 0, 0,
-                                          is_invalid_value);
-  EXPECT_EQ(0ull, val);
-  EXPECT_TRUE(is_invalid_value);
-}
-
-TEST(GetHeaderValueTest, Range) {
-  {
-    Headers headers = {make_range_header({{1, -1}})};
-    auto val = detail::get_header_value(headers, "Range", 0, 0);
-    EXPECT_STREQ("bytes=1-", val);
-  }
-
-  {
-    Headers headers = {make_range_header({{-1, 1}})};
-    auto val = detail::get_header_value(headers, "Range", 0, 0);
-    EXPECT_STREQ("bytes=-1", val);
-  }
-
-  {
-    Headers headers = {make_range_header({{1, 10}})};
-    auto val = detail::get_header_value(headers, "Range", 0, 0);
-    EXPECT_STREQ("bytes=1-10", val);
-  }
-
-  {
-    Headers headers = {make_range_header({{1, 10}, {100, -1}})};
-    auto val = detail::get_header_value(headers, "Range", 0, 0);
-    EXPECT_STREQ("bytes=1-10, 100-", val);
-  }
-
-  {
-    Headers headers = {make_range_header({{1, 10}, {100, 200}})};
-    auto val = detail::get_header_value(headers, "Range", 0, 0);
-    EXPECT_STREQ("bytes=1-10, 100-200", val);
-  }
-
-  {
-    Headers headers = {make_range_header({{0, 0}, {-1, 1}})};
-    auto val = detail::get_header_value(headers, "Range", 0, 0);
-    EXPECT_STREQ("bytes=0-0, -1", val);
-  }
-}
-
-TEST(ParseHeaderValueTest, Range) {
-  {
-    Ranges ranges;
-    auto ret = detail::parse_range_header("bytes=1-", ranges);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(1u, ranges.size());
-    EXPECT_EQ(1u, ranges[0].first);
-    EXPECT_EQ(-1, ranges[0].second);
-  }
-
-  {
-    Ranges ranges;
-    auto ret = detail::parse_range_header("bytes=-1", ranges);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(1u, ranges.size());
-    EXPECT_EQ(-1, ranges[0].first);
-    EXPECT_EQ(1u, ranges[0].second);
-  }
-
-  {
-    Ranges ranges;
-    auto ret = detail::parse_range_header("bytes=1-10", ranges);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(1u, ranges.size());
-    EXPECT_EQ(1u, ranges[0].first);
-    EXPECT_EQ(10u, ranges[0].second);
-  }
-
-  {
-    Ranges ranges;
-    auto ret = detail::parse_range_header("bytes=10-1", ranges);
-    EXPECT_FALSE(ret);
-  }
-
-  {
-    Ranges ranges;
-    auto ret = detail::parse_range_header("bytes=1-10, 100-", ranges);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(2u, ranges.size());
-    EXPECT_EQ(1u, ranges[0].first);
-    EXPECT_EQ(10u, ranges[0].second);
-    EXPECT_EQ(100u, ranges[1].first);
-    EXPECT_EQ(-1, ranges[1].second);
-  }
-
-  {
-    Ranges ranges;
-    auto ret =
-        detail::parse_range_header("bytes=1-10, 100-200, 300-400", ranges);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(3u, ranges.size());
-    EXPECT_EQ(1u, ranges[0].first);
-    EXPECT_EQ(10u, ranges[0].second);
-    EXPECT_EQ(100u, ranges[1].first);
-    EXPECT_EQ(200u, ranges[1].second);
-    EXPECT_EQ(300u, ranges[2].first);
-    EXPECT_EQ(400u, ranges[2].second);
-  }
-
-  {
-    Ranges ranges;
-
-    EXPECT_FALSE(detail::parse_range_header("bytes", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=0", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=-", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes= ", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=,", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=,,", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=,,,", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=a-b", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=1-0", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=0--1", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=0- 1", ranges));
-    EXPECT_FALSE(detail::parse_range_header("bytes=0 -1", ranges));
-    EXPECT_TRUE(ranges.empty());
-  }
-}
-
-TEST(ParseAcceptEncoding1, AcceptEncoding) {
-  Request req;
-  req.set_header("Accept-Encoding", "gzip");
-
-  Response res;
-  res.set_header("Content-Type", "text/plain");
-
-  auto ret = detail::encoding_type(req, res);
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  EXPECT_TRUE(ret == detail::EncodingType::Gzip);
-#else
-  EXPECT_TRUE(ret == detail::EncodingType::None);
-#endif
-}
-
-TEST(ParseAcceptEncoding2, AcceptEncoding) {
-  Request req;
-  req.set_header("Accept-Encoding", "gzip, deflate, br");
-
-  Response res;
-  res.set_header("Content-Type", "text/plain");
-
-  auto ret = detail::encoding_type(req, res);
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-  EXPECT_TRUE(ret == detail::EncodingType::Brotli);
-#elif CPPHTTPLIB_ZLIB_SUPPORT
-  EXPECT_TRUE(ret == detail::EncodingType::Gzip);
-#else
-  EXPECT_TRUE(ret == detail::EncodingType::None);
-#endif
-}
-
-TEST(ParseAcceptEncoding3, AcceptEncoding) {
-  Request req;
-  req.set_header("Accept-Encoding", "br;q=1.0, gzip;q=0.8, *;q=0.1");
-
-  Response res;
-  res.set_header("Content-Type", "text/plain");
-
-  auto ret = detail::encoding_type(req, res);
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-  EXPECT_TRUE(ret == detail::EncodingType::Brotli);
-#elif CPPHTTPLIB_ZLIB_SUPPORT
-  EXPECT_TRUE(ret == detail::EncodingType::Gzip);
-#else
-  EXPECT_TRUE(ret == detail::EncodingType::None);
-#endif
-}
-
-TEST(BufferStreamTest, read) {
-  detail::BufferStream strm1;
-  Stream &strm = strm1;
-
-  EXPECT_EQ(5, strm.write("hello"));
-
-  char buf[512];
-  EXPECT_EQ(2, strm.read(buf, 2));
-  EXPECT_EQ('h', buf[0]);
-  EXPECT_EQ('e', buf[1]);
-
-  EXPECT_EQ(2, strm.read(buf, 2));
-  EXPECT_EQ('l', buf[0]);
-  EXPECT_EQ('l', buf[1]);
-
-  EXPECT_EQ(1, strm.read(buf, 1));
-  EXPECT_EQ('o', buf[0]);
-
-  EXPECT_EQ(0, strm.read(buf, 1));
-}
-
-TEST(ChunkedEncodingTest, FromHTTPWatch_Online) {
-  auto host = "www.httpwatch.com";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(2);
-
-  auto res =
-      cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137");
-  ASSERT_TRUE(res);
-
-  std::string out;
-  detail::read_file("./image.jpg", out);
-
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(out, res->body);
-}
-
-TEST(HostnameToIPConversionTest, HTTPWatch_Online) {
-  auto host = "www.httpwatch.com";
-
-  auto ip = hosted_at(host);
-  EXPECT_EQ("23.96.13.243", ip);
-
-  std::vector<std::string> addrs;
-  hosted_at(host, addrs);
-  EXPECT_EQ(1u, addrs.size());
-}
-
-#if 0 // It depends on each test environment...
-TEST(HostnameToIPConversionTest, YouTube_Online) {
-  auto host = "www.youtube.com";
-
-  std::vector<std::string> addrs;
-  hosted_at(host, addrs);
-
-  EXPECT_EQ(20u, addrs.size());
-
-  auto it = std::find(addrs.begin(), addrs.end(), "2607:f8b0:4006:809::200e");
-  EXPECT_TRUE(it != addrs.end());
-}
-#endif
-
-TEST(ChunkedEncodingTest, WithContentReceiver_Online) {
-  auto host = "www.httpwatch.com";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(2);
-
-  std::string body;
-  auto res =
-      cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
-              [&](const char *data, size_t data_length) {
-                body.append(data, data_length);
-                return true;
-              });
-  ASSERT_TRUE(res);
-
-  std::string out;
-  detail::read_file("./image.jpg", out);
-
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(out, body);
-}
-
-TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver_Online) {
-  auto host = "www.httpwatch.com";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(2);
-
-  std::string body;
-  auto res = cli.Get(
-      "/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
-      [&](const Response &response) {
-        EXPECT_EQ(StatusCode::OK_200, response.status);
-        return true;
-      },
-      [&](const char *data, size_t data_length) {
-        body.append(data, data_length);
-        return true;
-      });
-  ASSERT_TRUE(res);
-
-  std::string out;
-  detail::read_file("./image.jpg", out);
-
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(out, body);
-}
-
-TEST(RangeTest, FromHTTPBin_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/range/32"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/range/32"};
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(5);
-
-  {
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    Headers headers = {make_range_header({{1, -1}})};
-    auto res = cli.Get(path, headers);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("bcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  }
-
-  {
-    Headers headers = {make_range_header({{1, 10}})};
-    auto res = cli.Get(path, headers);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("bcdefghijk", res->body);
-    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  }
-
-  {
-    Headers headers = {make_range_header({{0, 31}})};
-    auto res = cli.Get(path, headers);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    Headers headers = {make_range_header({{0, -1}})};
-    auto res = cli.Get(path, headers);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    Headers headers = {make_range_header({{0, 32}})};
-    auto res = cli.Get(path, headers);
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-  }
-}
-
-TEST(ConnectionErrorTest, InvalidHost) {
-  auto host = "-abcde.com";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(2));
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Connection, res.error());
-}
-
-TEST(ConnectionErrorTest, InvalidHost2) {
-  auto host = "httpbin.org/";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(2));
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Connection, res.error());
-}
-
-TEST(ConnectionErrorTest, InvalidHostCheckResultErrorToString) {
-  auto host = "httpbin.org/";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(2));
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  stringstream s;
-  s << "error code: " << res.error();
-  EXPECT_EQ("error code: Could not establish connection (2)", s.str());
-}
-
-TEST(ConnectionErrorTest, InvalidPort) {
-  auto host = "localhost";
-  auto port = 44380;
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host, port);
-#else
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(2));
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  EXPECT_TRUE(Error::Connection == res.error() ||
-              Error::ConnectionTimeout == res.error());
-}
-
-TEST(ConnectionErrorTest, Timeout_Online) {
-  auto host = "google.com";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 44380;
-  SSLClient cli(host, port);
-#else
-  auto port = 8080;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(2));
-
-  // only probe one address type so that the error reason
-  // correlates to the timed-out IPv4, not the unsupported
-  // IPv6 connection attempt
-  cli.set_address_family(AF_INET);
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::ConnectionTimeout, res.error());
-}
-
-TEST(CancelTest, NoCancel_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/range/32"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/range/32"};
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res = cli.Get(path, [](uint64_t, uint64_t) { return true; });
-  ASSERT_TRUE(res);
-  EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(CancelTest, WithCancelSmallPayload_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/range/32"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/range/32"};
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-
-  auto res = cli.Get(path, [](uint64_t, uint64_t) { return false; });
-  cli.set_connection_timeout(std::chrono::seconds(5));
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, WithCancelLargePayload_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/range/65536"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/range/65536"};
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  uint32_t count = 0;
-  auto res =
-      cli.Get(path, [&count](uint64_t, uint64_t) { return (count++ == 0); });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, NoCancelPost) {
-  Server svr;
-
-  svr.Post("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Post("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-               "application/json", [](uint64_t, uint64_t) { return true; });
-  ASSERT_TRUE(res);
-  EXPECT_EQ("Hello World!", res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(CancelTest, WithCancelSmallPayloadPost) {
-  Server svr;
-
-  svr.Post("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Post("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-               "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, WithCancelLargePayloadPost) {
-  Server svr;
-
-  svr.Post("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content(LARGE_DATA, "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Post("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-               "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, NoCancelPut) {
-  Server svr;
-
-  svr.Put("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Put("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-              "application/json", [](uint64_t, uint64_t) { return true; });
-  ASSERT_TRUE(res);
-  EXPECT_EQ("Hello World!", res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(CancelTest, WithCancelSmallPayloadPut) {
-  Server svr;
-
-  svr.Put("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Put("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-              "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, WithCancelLargePayloadPut) {
-  Server svr;
-
-  svr.Put("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content(LARGE_DATA, "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Put("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-              "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, NoCancelPatch) {
-  Server svr;
-
-  svr.Patch("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Patch("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-                "application/json", [](uint64_t, uint64_t) { return true; });
-  ASSERT_TRUE(res);
-  EXPECT_EQ("Hello World!", res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(CancelTest, WithCancelSmallPayloadPatch) {
-  Server svr;
-
-  svr.Patch("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Patch("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-                "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, WithCancelLargePayloadPatch) {
-  Server svr;
-
-  svr.Patch("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content(LARGE_DATA, "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Patch("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-                "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, NoCancelDelete) {
-  Server svr;
-
-  svr.Delete("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Delete("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-                 "application/json", [](uint64_t, uint64_t) { return true; });
-  ASSERT_TRUE(res);
-  EXPECT_EQ("Hello World!", res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(CancelTest, WithCancelSmallPayloadDelete) {
-  Server svr;
-
-  svr.Delete("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Delete("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-                 "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(CancelTest, WithCancelLargePayloadDelete) {
-  Server svr;
-
-  svr.Delete("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content(LARGE_DATA, "text/plain");
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_connection_timeout(std::chrono::seconds(5));
-
-  auto res =
-      cli.Delete("/", Headers(), JSON_DATA.data(), JSON_DATA.size(),
-                 "application/json", [](uint64_t, uint64_t) { return false; });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST(BaseAuthTest, FromHTTPWatch_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/basic-auth/hello/world"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/basic-auth/hello/world"};
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto port = 443;
-  SSLClient cli(host, port);
-#else
-  auto port = 80;
-  Client cli(host, port);
-#endif
-
-  {
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-
-  {
-    auto res =
-        cli.Get(path, {make_basic_authentication_header("hello", "world")});
-    ASSERT_TRUE(res);
-    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
-              res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    cli.set_basic_auth("hello", "world");
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
-              res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    cli.set_basic_auth("hello", "bad");
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-
-  {
-    cli.set_basic_auth("bad", "world");
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(DigestAuthTest, FromHTTPWatch_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto unauth_path = std::string{"/digest-auth/auth/hello/world"};
-  auto paths = std::vector<std::string>{
-      "/digest-auth/auth/hello/world/MD5",
-      "/digest-auth/auth/hello/world/SHA-256",
-      "/digest-auth/auth/hello/world/SHA-512",
-      "/digest-auth/auth-int/hello/world/MD5",
-  };
-#else
-  auto host = "nghttp2.org";
-  auto unauth_path = std::string{"/httpbin/digest-auth/auth/hello/world"};
-  auto paths = std::vector<std::string>{
-      "/httpbin/digest-auth/auth/hello/world/MD5",
-      "/httpbin/digest-auth/auth/hello/world/SHA-256",
-      "/httpbin/digest-auth/auth/hello/world/SHA-512",
-      "/httpbin/digest-auth/auth-int/hello/world/MD5",
-  };
-#endif
-
-  auto port = 443;
-  SSLClient cli(host, port);
-
-  {
-    auto res = cli.Get(unauth_path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-
-  {
-
-    cli.set_digest_auth("hello", "world");
-    for (const auto &path : paths) {
-      auto res = cli.Get(path.c_str());
-      ASSERT_TRUE(res);
-      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
-                res->body);
-      EXPECT_EQ(StatusCode::OK_200, res->status);
-    }
-
-    cli.set_digest_auth("hello", "bad");
-    for (const auto &path : paths) {
-      auto res = cli.Get(path.c_str());
-      ASSERT_TRUE(res);
-      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-    }
-
-    // NOTE: Until httpbin.org fixes issue #46, the following test is commented
-    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
-    // cli.set_digest_auth("bad", "world");
-    // for (const auto& path : paths) {
-    //   auto res = cli.Get(path.c_str());
-    //   ASSERT_TRUE(res);
-    //   EXPECT_EQ(StatusCode::BadRequest_400, res->status);
-    // }
-  }
-}
-#endif
-
-TEST(SpecifyServerIPAddressTest, AnotherHostname_Online) {
-  auto host = "google.com";
-  auto another_host = "example.com";
-  auto wrong_ip = "0.0.0.0";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_hostname_addr_map({{another_host, wrong_ip}});
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
-}
-
-TEST(SpecifyServerIPAddressTest, RealHostname_Online) {
-  auto host = "google.com";
-  auto wrong_ip = "0.0.0.0";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_hostname_addr_map({{host, wrong_ip}});
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Connection, res.error());
-}
-
-TEST(AbsoluteRedirectTest, Redirect_Online) {
-  auto host = "nghttp2.org";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_follow_location(true);
-  auto res = cli.Get("/httpbin/absolute-redirect/3");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(RedirectTest, Redirect_Online) {
-  auto host = "nghttp2.org";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_follow_location(true);
-  auto res = cli.Get("/httpbin/redirect/3");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(RelativeRedirectTest, Redirect_Online) {
-  auto host = "nghttp2.org";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_follow_location(true);
-  auto res = cli.Get("/httpbin/relative-redirect/3");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(TooManyRedirectTest, Redirect_Online) {
-  auto host = "nghttp2.org";
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_follow_location(true);
-  auto res = cli.Get("/httpbin/redirect/21");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::ExceedRedirectCount, res.error());
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(YahooRedirectTest, Redirect_Online) {
-  Client cli("yahoo.com");
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
-
-  cli.set_follow_location(true);
-  res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("https://www.yahoo.com/", res->location);
-}
-
-TEST(HttpsToHttpRedirectTest, Redirect_Online) {
-  SSLClient cli("nghttp2.org");
-  cli.set_follow_location(true);
-  auto res = cli.Get(
-      "/httpbin/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(HttpsToHttpRedirectTest2, Redirect_Online) {
-  SSLClient cli("nghttp2.org");
-  cli.set_follow_location(true);
-
-  Params params;
-  params.emplace("url", "http://www.google.com");
-  params.emplace("status_code", "302");
-
-  auto res = cli.Get("/httpbin/redirect-to", params, Headers{});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(HttpsToHttpRedirectTest3, Redirect_Online) {
-  SSLClient cli("nghttp2.org");
-  cli.set_follow_location(true);
-
-  Params params;
-  params.emplace("url", "http://www.google.com");
-
-  auto res = cli.Get("/httpbin/redirect-to?status_code=302", params, Headers{});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(UrlWithSpace, Redirect_Online) {
-  SSLClient cli("edge.forgecdn.net");
-  cli.set_follow_location(true);
-
-  auto res = cli.Get("/files/2595/310/Neat 1.4-17.jar");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(18527U, res->get_header_value_u64("Content-Length"));
-}
-
-#endif
-
-#if !defined(_WIN32) && !defined(_WIN64)
-TEST(ReceiveSignals, Signal) {
-  auto setupSignalHandlers = []() {
-    struct sigaction act;
-
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = SA_SIGINFO;
-    act.sa_sigaction = [](int sig, siginfo_t *, void *) {
-      switch (sig) {
-      case SIGINT:
-      default: break;
-      }
-    };
-    ::sigaction(SIGINT, &act, nullptr);
-  };
-
-  Server svr;
-  int port = 0;
-  auto thread = std::thread([&]() {
-    setupSignalHandlers();
-    port = svr.bind_to_any_port("localhost");
-    svr.listen_after_bind();
-  });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  ASSERT_TRUE(svr.is_running());
-  pthread_kill(thread.native_handle(), SIGINT);
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-  ASSERT_TRUE(svr.is_running());
-}
-#endif
-
-TEST(RedirectToDifferentPort, Redirect) {
-  Server svr1;
-  svr1.Get("/1", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  int svr1_port = 0;
-  auto thread1 = std::thread([&]() {
-    svr1_port = svr1.bind_to_any_port("localhost");
-    svr1.listen_after_bind();
-  });
-
-  Server svr2;
-  svr2.Get("/2", [&](const Request & /*req*/, Response &res) {
-    res.set_redirect("http://localhost:" + std::to_string(svr1_port) + "/1");
-  });
-
-  int svr2_port = 0;
-  auto thread2 = std::thread([&]() {
-    svr2_port = svr2.bind_to_any_port("localhost");
-    svr2.listen_after_bind();
-  });
-  auto se = detail::scope_exit([&] {
-    svr2.stop();
-    thread2.join();
-    svr1.stop();
-    thread1.join();
-    ASSERT_FALSE(svr2.is_running());
-    ASSERT_FALSE(svr1.is_running());
-  });
-
-  svr1.wait_until_ready();
-  svr2.wait_until_ready();
-
-  Client cli("localhost", svr2_port);
-  cli.set_follow_location(true);
-
-  auto res = cli.Get("/2");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("Hello World!", res->body);
-}
-
-TEST(RedirectFromPageWithContent, Redirect) {
-  Server svr;
-
-  svr.Get("/1", [&](const Request & /*req*/, Response &res) {
-    res.set_content("___", "text/plain");
-    res.set_redirect("/2");
-  });
-
-  svr.Get("/2", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  auto th = std::thread([&]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    th.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli("localhost", PORT);
-    cli.set_follow_location(true);
-
-    std::string body;
-    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
-      body.append(data, data_length);
-      return true;
-    });
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("Hello World!", body);
-  }
-
-  {
-    Client cli("localhost", PORT);
-
-    std::string body;
-    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
-      body.append(data, data_length);
-      return true;
-    });
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::Found_302, res->status);
-    EXPECT_EQ("___", body);
-  }
-}
-
-TEST(RedirectFromPageWithContentIP6, Redirect) {
-  Server svr;
-
-  svr.Get("/1", [&](const Request & /*req*/, Response &res) {
-    res.set_content("___", "text/plain");
-    // res.set_redirect("/2");
-    res.set_redirect("http://[::1]:1234/2");
-  });
-
-  svr.Get("/2", [&](const Request &req, Response &res) {
-    auto host_header = req.headers.find("Host");
-    ASSERT_TRUE(host_header != req.headers.end());
-    EXPECT_EQ("[::1]:1234", host_header->second);
-
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  auto th = std::thread([&]() { svr.listen("::1", 1234); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    th.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  // When IPV6 support isn't available svr.listen("::1", 1234) never
-  // actually starts anything, so the condition !svr.is_running() will
-  // always remain true, and the loop never stops.
-  // This basically counts how many milliseconds have passed since the
-  // call to svr.listen(), and if after 5 seconds nothing started yet
-  // aborts the test.
-  for (unsigned int milliseconds = 0; !svr.is_running(); milliseconds++) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    ASSERT_LT(milliseconds, 5000U);
-  }
-
-  {
-    Client cli("http://[::1]:1234");
-    cli.set_follow_location(true);
-
-    std::string body;
-    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
-      body.append(data, data_length);
-      return true;
-    });
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("Hello World!", body);
-  }
-
-  {
-    Client cli("http://[::1]:1234");
-
-    std::string body;
-    auto res = cli.Get("/1", [&](const char *data, size_t data_length) {
-      body.append(data, data_length);
-      return true;
-    });
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::Found_302, res->status);
-    EXPECT_EQ("___", body);
-  }
-}
-
-TEST(PathUrlEncodeTest, PathUrlEncode) {
-  Server svr;
-
-  svr.Get("/foo", [](const Request &req, Response &res) {
-    auto a = req.params.find("a");
-    if (a != req.params.end()) {
-      res.set_content((*a).second, "text/plain");
-      res.status = StatusCode::OK_200;
-    } else {
-      res.status = StatusCode::BadRequest_400;
-    }
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-    cli.set_url_encode(false);
-
-    auto res = cli.Get("/foo?a=explicitly+encoded");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    // This expects it back with a space, as the `+` won't have been
-    // url-encoded, and server-side the params get decoded turning `+`
-    // into spaces.
-    EXPECT_EQ("explicitly encoded", res->body);
-  }
-}
-
-TEST(PathUrlEncodeTest, IncludePercentEncodingLF) {
-  Server svr;
-
-  svr.Get("/", [](const Request &req, Response &) {
-    EXPECT_EQ("\x0A", req.get_param_value("something"));
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-    cli.set_url_encode(false);
-
-    auto res = cli.Get("/?something=%0A");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-}
-
-TEST(BindServerTest, DISABLED_BindDualStack) {
-  Server svr;
-
-  svr.Get("/1", [&](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  auto thread = std::thread([&]() { svr.listen("::", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli("127.0.0.1", PORT);
-
-    auto res = cli.Get("/1");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("Hello World!", res->body);
-  }
-  {
-    Client cli("::1", PORT);
-
-    auto res = cli.Get("/1");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("Hello World!", res->body);
-  }
-}
-
-TEST(BindServerTest, BindAndListenSeparately) {
-  Server svr;
-  int port = svr.bind_to_any_port("0.0.0.0");
-  ASSERT_TRUE(svr.is_valid());
-  ASSERT_TRUE(port > 0);
-  svr.stop();
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(BindServerTest, BindAndListenSeparatelySSL) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
-                CLIENT_CA_CERT_DIR);
-  int port = svr.bind_to_any_port("0.0.0.0");
-  ASSERT_TRUE(svr.is_valid());
-  ASSERT_TRUE(port > 0);
-  svr.stop();
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(BindServerTest, BindAndListenSeparatelySSLEncryptedKey) {
-  SSLServer svr(SERVER_ENCRYPTED_CERT_FILE, SERVER_ENCRYPTED_PRIVATE_KEY_FILE,
-                nullptr, nullptr, SERVER_ENCRYPTED_PRIVATE_KEY_PASS);
-  int port = svr.bind_to_any_port("0.0.0.0");
-  ASSERT_TRUE(svr.is_valid());
-  ASSERT_TRUE(port > 0);
-  svr.stop();
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-X509 *readCertificate(const std::string &strFileName) {
-  std::ifstream inStream(strFileName);
-  std::string strCertPEM((std::istreambuf_iterator<char>(inStream)),
-                         std::istreambuf_iterator<char>());
-
-  if (strCertPEM.empty()) return (nullptr);
-
-  BIO *pbCert = BIO_new(BIO_s_mem());
-  BIO_write(pbCert, strCertPEM.c_str(), (int)strCertPEM.size());
-  X509 *pCert = PEM_read_bio_X509(pbCert, NULL, 0, NULL);
-  BIO_free(pbCert);
-
-  return (pCert);
-}
-
-EVP_PKEY *readPrivateKey(const std::string &strFileName) {
-  std::ifstream inStream(strFileName);
-  std::string strPrivateKeyPEM((std::istreambuf_iterator<char>(inStream)),
-                               std::istreambuf_iterator<char>());
-
-  if (strPrivateKeyPEM.empty()) return (nullptr);
-
-  BIO *pbPrivKey = BIO_new(BIO_s_mem());
-  BIO_write(pbPrivKey, strPrivateKeyPEM.c_str(), (int)strPrivateKeyPEM.size());
-  EVP_PKEY *pPrivateKey = PEM_read_bio_PrivateKey(pbPrivKey, NULL, NULL, NULL);
-  BIO_free(pbPrivKey);
-
-  return (pPrivateKey);
-}
-
-TEST(BindServerTest, UpdateCerts) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE);
-  int port = svr.bind_to_any_port("0.0.0.0");
-  ASSERT_TRUE(svr.is_valid());
-  ASSERT_TRUE(port > 0);
-
-  X509 *cert = readCertificate(SERVER_CERT_FILE);
-  X509 *ca_cert = readCertificate(CLIENT_CA_CERT_FILE);
-  EVP_PKEY *key = readPrivateKey(SERVER_PRIVATE_KEY_FILE);
-
-  ASSERT_TRUE(cert != nullptr);
-  ASSERT_TRUE(ca_cert != nullptr);
-  ASSERT_TRUE(key != nullptr);
-
-  X509_STORE *cert_store = X509_STORE_new();
-
-  X509_STORE_add_cert(cert_store, ca_cert);
-
-  svr.update_certs(cert, key, cert_store);
-
-  ASSERT_TRUE(svr.is_valid());
-  svr.stop();
-
-  X509_free(cert);
-  X509_free(ca_cert);
-  EVP_PKEY_free(key);
-}
-#endif
-
-TEST(ErrorHandlerTest, ContentLength) {
-  Server svr;
-
-  svr.set_error_handler([](const Request & /*req*/, Response &res) {
-    res.status = StatusCode::OK_200;
-    res.set_content("abcdefghijklmnopqrstuvwxyz",
-                    "text/html"); // <= Content-Length still 13
-  });
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!\n", "text/plain");
-    res.status = 524;
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/hi", {{"Accept-Encoding", ""}});
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-    EXPECT_EQ("26", res->get_header_value("Content-Length"));
-    EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
-  }
-}
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-TEST(ExceptionTest, WithoutExceptionHandler) {
-  Server svr;
-
-  svr.Get("/exception", [&](const Request & /*req*/, Response & /*res*/) {
-    throw std::runtime_error("exception...");
-  });
-
-  svr.Get("/unknown", [&](const Request & /*req*/, Response & /*res*/) {
-    throw std::runtime_error("exception\r\n...");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  {
-    auto res = cli.Get("/exception");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
-    ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
-    EXPECT_EQ("exception...", res->get_header_value("EXCEPTION_WHAT"));
-  }
-
-  {
-    auto res = cli.Get("/unknown");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
-    ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
-    EXPECT_EQ("exception\\r\\n...", res->get_header_value("EXCEPTION_WHAT"));
-  }
-}
-
-TEST(ExceptionTest, WithExceptionHandler) {
-  Server svr;
-
-  svr.set_exception_handler([](const Request & /*req*/, Response &res,
-                               std::exception_ptr ep) {
-    EXPECT_FALSE(ep == nullptr);
-    try {
-      std::rethrow_exception(ep);
-    } catch (std::exception &e) {
-      EXPECT_EQ("abc", std::string(e.what()));
-    } catch (...) {}
-    res.status = StatusCode::InternalServerError_500;
-    res.set_content("abcdefghijklmnopqrstuvwxyz",
-                    "text/html"); // <= Content-Length still 13 at this point
-  });
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!\n", "text/plain");
-    throw std::runtime_error("abc");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  for (size_t i = 0; i < 10; i++) {
-    Client cli(HOST, PORT);
-
-    for (size_t j = 0; j < 100; j++) {
-      auto res = cli.Get("/hi", {{"Accept-Encoding", ""}});
-      ASSERT_TRUE(res);
-      EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
-      EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-      EXPECT_EQ("26", res->get_header_value("Content-Length"));
-      EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
-    }
-
-    cli.set_keep_alive(true);
-
-    for (size_t j = 0; j < 100; j++) {
-      auto res = cli.Get("/hi", {{"Accept-Encoding", ""}});
-      ASSERT_TRUE(res);
-      EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
-      EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-      EXPECT_EQ("26", res->get_header_value("Content-Length"));
-      EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
-    }
-  }
-}
-
-TEST(ExceptionTest, AndErrorHandler) {
-  Server svr;
-
-  svr.set_error_handler([](const Request & /*req*/, Response &res) {
-    if (res.body.empty()) { res.set_content("NOT_FOUND", "text/html"); }
-  });
-
-  svr.set_exception_handler(
-      [](const Request & /*req*/, Response &res, std::exception_ptr ep) {
-        EXPECT_FALSE(ep == nullptr);
-        try {
-          std::rethrow_exception(ep);
-        } catch (std::exception &e) {
-          res.set_content(e.what(), "text/html");
-        } catch (...) {}
-        res.status = StatusCode::InternalServerError_500;
-      });
-
-  svr.Get("/exception", [](const Request & /*req*/, Response & /*res*/) {
-    throw std::runtime_error("EXCEPTION");
-  });
-
-  svr.Get("/error", [](const Request & /*req*/, Response &res) {
-    res.set_content("ERROR", "text/html");
-    res.status = StatusCode::InternalServerError_500;
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-
-  {
-    auto res = cli.Get("/exception");
-    ASSERT_TRUE(res);
-    EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-    EXPECT_EQ("EXCEPTION", res->body);
-  }
-
-  {
-    auto res = cli.Get("/error");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
-    EXPECT_EQ("ERROR", res->body);
-  }
-
-  {
-    auto res = cli.Get("/invalid");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::NotFound_404, res->status);
-    EXPECT_EQ("NOT_FOUND", res->body);
-  }
-}
-#endif
-
-TEST(NoContentTest, ContentLength) {
-  Server svr;
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.status = StatusCode::NoContent_204;
-  });
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/hi");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::NoContent_204, res->status);
-    EXPECT_EQ("0", res->get_header_value("Content-Length"));
-  }
-}
-
-TEST(RoutingHandlerTest, PreRoutingHandler) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(svr.is_valid());
-#else
-  Server svr;
-#endif
-
-  svr.set_pre_routing_handler([](const Request &req, Response &res) {
-    if (req.path == "/routing_handler") {
-      res.set_header("PRE_ROUTING", "on");
-      res.set_content("Routing Handler", "text/plain");
-      return httplib::Server::HandlerResponse::Handled;
-    }
-    return httplib::Server::HandlerResponse::Unhandled;
-  });
-
-  svr.set_error_handler([](const Request & /*req*/, Response &res) {
-    res.set_content("Error", "text/html");
-  });
-
-  svr.set_post_routing_handler([](const Request &req, Response &res) {
-    if (req.path == "/routing_handler") {
-      res.set_header("POST_ROUTING", "on");
-    }
-  });
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!\n", "text/plain");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    SSLClient cli(HOST, PORT);
-    cli.enable_server_certificate_verification(false);
-#else
-    Client cli(HOST, PORT);
-#endif
-
-    auto res = cli.Get("/routing_handler");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("Routing Handler", res->body);
-    EXPECT_EQ(1U, res->get_header_value_count("PRE_ROUTING"));
-    EXPECT_EQ("on", res->get_header_value("PRE_ROUTING"));
-    EXPECT_EQ(1U, res->get_header_value_count("POST_ROUTING"));
-    EXPECT_EQ("on", res->get_header_value("POST_ROUTING"));
-  }
-
-  {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    SSLClient cli(HOST, PORT);
-    cli.enable_server_certificate_verification(false);
-#else
-    Client cli(HOST, PORT);
-#endif
-
-    auto res = cli.Get("/hi");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("Hello World!\n", res->body);
-    EXPECT_EQ(0U, res->get_header_value_count("PRE_ROUTING"));
-    EXPECT_EQ(0U, res->get_header_value_count("POST_ROUTING"));
-  }
-
-  {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    SSLClient cli(HOST, PORT);
-    cli.enable_server_certificate_verification(false);
-#else
-    Client cli(HOST, PORT);
-#endif
-
-    auto res = cli.Get("/aaa");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::NotFound_404, res->status);
-    EXPECT_EQ("Error", res->body);
-    EXPECT_EQ(0U, res->get_header_value_count("PRE_ROUTING"));
-    EXPECT_EQ(0U, res->get_header_value_count("POST_ROUTING"));
-  }
-}
-
-TEST(InvalidFormatTest, StatusCode) {
-  Server svr;
-
-  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello World!\n", "text/plain");
-    res.status = 9999; // Status should be a three-digit code...
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/hi");
-    ASSERT_FALSE(res);
-  }
-}
-
-TEST(URLFragmentTest, WithFragment) {
-  Server svr;
-
-  svr.Get("/hi", [](const Request &req, Response & /*res*/) {
-    EXPECT_TRUE(req.target == "/hi");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/hi#key1=val1=key2=val2");
-    EXPECT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-
-    res = cli.Get("/hi%23key1=val1=key2=val2");
-    EXPECT_TRUE(res);
-    EXPECT_EQ(StatusCode::NotFound_404, res->status);
-  }
-}
-
-TEST(HeaderWriter, SetHeaderWriter) {
-  Server svr;
-
-  svr.set_header_writer([](Stream &strm, Headers &hdrs) {
-    hdrs.emplace("CustomServerHeader", "CustomServerValue");
-    return detail::write_headers(strm, hdrs);
-  });
-  svr.Get("/hi", [](const Request &req, Response &res) {
-    auto it = req.headers.find("CustomClientHeader");
-    EXPECT_TRUE(it != req.headers.end());
-    EXPECT_EQ(it->second, "CustomClientValue");
-    res.set_content("Hello World!\n", "text/plain");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-    cli.set_header_writer([](Stream &strm, Headers &hdrs) {
-      hdrs.emplace("CustomClientHeader", "CustomClientValue");
-      return detail::write_headers(strm, hdrs);
-    });
-
-    auto res = cli.Get("/hi");
-    EXPECT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-
-    auto it = res->headers.find("CustomServerHeader");
-    EXPECT_TRUE(it != res->headers.end());
-    EXPECT_EQ(it->second, "CustomServerValue");
-  }
-}
-
-class ServerTest : public ::testing::Test {
-protected:
-  ServerTest()
-      : cli_(HOST, PORT)
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-        ,
-        svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE)
-#endif
-  {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    cli_.enable_server_certificate_verification(false);
-#endif
-  }
-
-  virtual void SetUp() {
-    svr_.set_mount_point("/", "./www");
-    svr_.set_mount_point("/mount", "./www2");
-    svr_.set_file_extension_and_mimetype_mapping("abcde", "text/abcde");
-
-    svr_.Get("/hi",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content("Hello World!", "text/plain");
-             })
-        .Get("/file_content",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_file_content("./www/dir/test.html");
-             })
-        .Get("/file_content_with_content_type",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_file_content("./www/file", "text/plain");
-             })
-        .Get("/invalid_file_content",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_file_content("./www/dir/invalid_file_path");
-             })
-        .Get("/http_response_splitting",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_header("a", "1\r\nSet-Cookie: a=1");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("a"));
-
-               res.set_header("a", "1\nSet-Cookie: a=1");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("a"));
-
-               res.set_header("a", "1\rSet-Cookie: a=1");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("a"));
-
-               res.set_header("a\r\nb", "0");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("a"));
-
-               res.set_header("a\rb", "0");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("a"));
-
-               res.set_header("a\nb", "0");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("a"));
-
-               res.set_redirect("1\r\nSet-Cookie: a=1");
-               EXPECT_EQ(0U, res.headers.size());
-               EXPECT_FALSE(res.has_header("Location"));
-             })
-        .Get("/slow",
-             [&](const Request & /*req*/, Response &res) {
-               std::this_thread::sleep_for(std::chrono::seconds(2));
-               res.set_content("slow", "text/plain");
-             })
-#if 0
-        .Post("/slowpost",
-              [&](const Request & /*req*/, Response &res) {
-                std::this_thread::sleep_for(std::chrono::seconds(2));
-                res.set_content("slow", "text/plain");
-              })
-#endif
-        .Get("/remote_addr",
-             [&](const Request &req, Response &res) {
-               auto remote_addr = req.headers.find("REMOTE_ADDR")->second;
-               EXPECT_TRUE(req.has_header("REMOTE_PORT"));
-               EXPECT_EQ(req.remote_addr, req.get_header_value("REMOTE_ADDR"));
-               EXPECT_EQ(req.remote_port,
-                         std::stoi(req.get_header_value("REMOTE_PORT")));
-               res.set_content(remote_addr.c_str(), "text/plain");
-             })
-        .Get("/local_addr",
-             [&](const Request &req, Response &res) {
-               EXPECT_TRUE(req.has_header("LOCAL_PORT"));
-               EXPECT_TRUE(req.has_header("LOCAL_ADDR"));
-               auto local_addr = req.get_header_value("LOCAL_ADDR");
-               auto local_port = req.get_header_value("LOCAL_PORT");
-               EXPECT_EQ(req.local_addr, local_addr);
-               EXPECT_EQ(req.local_port, std::stoi(local_port));
-               res.set_content(local_addr.append(":").append(local_port),
-                               "text/plain");
-             })
-        .Get("/endwith%",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content("Hello World!", "text/plain");
-             })
-        .Get("/a\\+\\+b",
-             [&](const Request &req, Response &res) {
-               ASSERT_TRUE(req.has_param("a +b"));
-               auto val = req.get_param_value("a +b");
-               res.set_content(val, "text/plain");
-             })
-        .Get("/", [&](const Request & /*req*/,
-                      Response &res) { res.set_redirect("/hi"); })
-        .Post("/1",
-              [](const Request & /*req*/, Response &res) {
-                res.set_redirect("/2", StatusCode::SeeOther_303);
-              })
-        .Get("/2",
-             [](const Request & /*req*/, Response &res) {
-               res.set_content("redirected.", "text/plain");
-               res.status = StatusCode::OK_200;
-             })
-        .Post("/person",
-              [&](const Request &req, Response &res) {
-                if (req.has_param("name") && req.has_param("note")) {
-                  persons_[req.get_param_value("name")] =
-                      req.get_param_value("note");
-                } else {
-                  res.status = StatusCode::BadRequest_400;
-                }
-              })
-        .Put("/person",
-             [&](const Request &req, Response &res) {
-               if (req.has_param("name") && req.has_param("note")) {
-                 persons_[req.get_param_value("name")] =
-                     req.get_param_value("note");
-               } else {
-                 res.status = StatusCode::BadRequest_400;
-               }
-             })
-        .Get("/person/(.*)",
-             [&](const Request &req, Response &res) {
-               string name = req.matches[1];
-               if (persons_.find(name) != persons_.end()) {
-                 auto note = persons_[name];
-                 res.set_content(note, "text/plain");
-               } else {
-                 res.status = StatusCode::NotFound_404;
-               }
-             })
-        .Post("/x-www-form-urlencoded-json",
-              [&](const Request &req, Response &res) {
-                auto json = req.get_param_value("json");
-                ASSERT_EQ(JSON_DATA, json);
-                res.set_content(json, "appliation/json");
-                res.status = StatusCode::OK_200;
-              })
-        .Get("/streamed-chunked",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_chunked_content_provider(
-                   "text/plain", [](size_t /*offset*/, DataSink &sink) {
-                     sink.os << "123";
-                     sink.os << "456";
-                     sink.os << "789";
-                     sink.done();
-                     return true;
-                   });
-             })
-        .Get("/streamed-chunked2",
-             [&](const Request & /*req*/, Response &res) {
-               auto i = new int(0);
-               res.set_chunked_content_provider(
-                   "text/plain",
-                   [i](size_t /*offset*/, DataSink &sink) {
-                     switch (*i) {
-                     case 0: sink.os << "123"; break;
-                     case 1: sink.os << "456"; break;
-                     case 2: sink.os << "789"; break;
-                     case 3: sink.done(); break;
-                     }
-                     (*i)++;
-                     return true;
-                   },
-                   [i](bool success) {
-                     EXPECT_TRUE(success);
-                     delete i;
-                   });
-             })
-        .Get("/streamed-chunked-with-trailer",
-             [&](const Request & /*req*/, Response &res) {
-               auto i = new int(0);
-               res.set_header("Trailer", "Dummy1, Dummy2");
-               res.set_chunked_content_provider(
-                   "text/plain",
-                   [i](size_t /*offset*/, DataSink &sink) {
-                     switch (*i) {
-                     case 0: sink.os << "123"; break;
-                     case 1: sink.os << "456"; break;
-                     case 2: sink.os << "789"; break;
-                     case 3: {
-                       sink.done_with_trailer(
-                           {{"Dummy1", "DummyVal1"}, {"Dummy2", "DummyVal2"}});
-                     } break;
-                     }
-                     (*i)++;
-                     return true;
-                   },
-                   [i](bool success) {
-                     EXPECT_TRUE(success);
-                     delete i;
-                   });
-             })
-        .Get("/streamed",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content_provider(
-                   6, "text/plain",
-                   [](size_t offset, size_t /*length*/, DataSink &sink) {
-                     sink.os << (offset < 3 ? "a" : "b");
-                     return true;
-                   });
-             })
-        .Get("/streamed-with-range",
-             [&](const Request &req, Response &res) {
-               auto data = new std::string("abcdefg");
-               res.set_content_provider(
-                   data->size(), "text/plain",
-                   [data](size_t offset, size_t length, DataSink &sink) {
-                     size_t DATA_CHUNK_SIZE = 4;
-                     const auto &d = *data;
-                     auto out_len =
-                         std::min(static_cast<size_t>(length), DATA_CHUNK_SIZE);
-                     auto ret =
-                         sink.write(&d[static_cast<size_t>(offset)], out_len);
-                     EXPECT_TRUE(ret);
-                     return true;
-                   },
-                   [data, &req](bool success) {
-                     EXPECT_EQ(success, !req.has_param("error"));
-                     delete data;
-                   });
-             })
-        .Get("/streamed-cancel",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content_provider(
-                   size_t(-1), "text/plain",
-                   [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-                     sink.os << "data_chunk";
-                     return true;
-                   });
-             })
-        .Get("/regex-with-delimiter",
-             [&](const Request &req, Response & /*res*/) {
-               ASSERT_TRUE(req.has_param("key"));
-               EXPECT_EQ("^(?.*(value))", req.get_param_value("key"));
-             })
-        .Get("/with-range",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content("abcdefg", "text/plain");
-             })
-        .Get("/with-range-customized-response",
-             [&](const Request & /*req*/, Response &res) {
-               res.status = StatusCode::BadRequest_400;
-               res.set_content(JSON_DATA, "application/json");
-             })
-        .Post("/chunked",
-              [&](const Request &req, Response & /*res*/) {
-                EXPECT_EQ(req.body, "dechunked post body");
-              })
-        .Post("/large-chunked",
-              [&](const Request &req, Response & /*res*/) {
-                std::string expected(6 * 30 * 1024u, 'a');
-                EXPECT_EQ(req.body, expected);
-              })
-        .Post("/multipart",
-              [&](const Request &req, Response & /*res*/) {
-                EXPECT_EQ(6u, req.files.size());
-                ASSERT_TRUE(!req.has_file("???"));
-                ASSERT_TRUE(req.body.empty());
-
-                {
-                  const auto &file = req.get_file_value("text1");
-                  EXPECT_TRUE(file.filename.empty());
-                  EXPECT_EQ("text default", file.content);
-                }
-
-                {
-                  const auto &file = req.get_file_value("text2");
-                  EXPECT_TRUE(file.filename.empty());
-                  EXPECT_EQ("aωb", file.content);
-                }
-
-                {
-                  const auto &file = req.get_file_value("file1");
-                  EXPECT_EQ("hello.txt", file.filename);
-                  EXPECT_EQ("text/plain", file.content_type);
-                  EXPECT_EQ("h\ne\n\nl\nl\no\n", file.content);
-                }
-
-                {
-                  const auto &file = req.get_file_value("file3");
-                  EXPECT_TRUE(file.filename.empty());
-                  EXPECT_EQ("application/octet-stream", file.content_type);
-                  EXPECT_EQ(0u, file.content.size());
-                }
-
-                {
-                  const auto &file = req.get_file_value("file4");
-                  EXPECT_TRUE(file.filename.empty());
-                  EXPECT_EQ(0u, file.content.size());
-                  EXPECT_EQ("application/json  tmp-string", file.content_type);
-                }
-              })
-        .Post("/multipart/multi_file_values",
-              [&](const Request &req, Response & /*res*/) {
-                EXPECT_EQ(5u, req.files.size());
-                ASSERT_TRUE(!req.has_file("???"));
-                ASSERT_TRUE(req.body.empty());
-
-                {
-                  const auto &text_value = req.get_file_values("text");
-                  EXPECT_EQ(1u, text_value.size());
-                  auto &text = text_value[0];
-                  EXPECT_TRUE(text.filename.empty());
-                  EXPECT_EQ("default text", text.content);
-                }
-                {
-                  const auto &text1_values = req.get_file_values("multi_text1");
-                  EXPECT_EQ(2u, text1_values.size());
-                  EXPECT_EQ("aaaaa", text1_values[0].content);
-                  EXPECT_EQ("bbbbb", text1_values[1].content);
-                }
-
-                {
-                  const auto &file1_values = req.get_file_values("multi_file1");
-                  EXPECT_EQ(2u, file1_values.size());
-                  auto file1 = file1_values[0];
-                  EXPECT_EQ(file1.filename, "hello.txt");
-                  EXPECT_EQ(file1.content_type, "text/plain");
-                  EXPECT_EQ("h\ne\n\nl\nl\no\n", file1.content);
-
-                  auto file2 = file1_values[1];
-                  EXPECT_EQ(file2.filename, "world.json");
-                  EXPECT_EQ(file2.content_type, "application/json");
-                  EXPECT_EQ("{\n  \"world\", true\n}\n", file2.content);
-                }
-              })
-        .Post("/empty",
-              [&](const Request &req, Response &res) {
-                EXPECT_EQ(req.body, "");
-                EXPECT_EQ("text/plain", req.get_header_value("Content-Type"));
-                EXPECT_EQ("0", req.get_header_value("Content-Length"));
-                res.set_content("empty", "text/plain");
-              })
-        .Post("/empty-no-content-type",
-              [&](const Request &req, Response &res) {
-                EXPECT_EQ(req.body, "");
-                EXPECT_FALSE(req.has_header("Content-Type"));
-                EXPECT_EQ("0", req.get_header_value("Content-Length"));
-                res.set_content("empty-no-content-type", "text/plain");
-              })
-        .Post("/path-only",
-              [&](const Request &req, Response &res) {
-                EXPECT_EQ(req.body, "");
-                EXPECT_EQ("", req.get_header_value("Content-Type"));
-                EXPECT_EQ("0", req.get_header_value("Content-Length"));
-                res.set_content("path-only", "text/plain");
-              })
-        .Post("/path-headers-only",
-              [&](const Request &req, Response &res) {
-                EXPECT_EQ(req.body, "");
-                EXPECT_EQ("", req.get_header_value("Content-Type"));
-                EXPECT_EQ("0", req.get_header_value("Content-Length"));
-                EXPECT_EQ("world", req.get_header_value("hello"));
-                EXPECT_EQ("world2", req.get_header_value("hello2"));
-                res.set_content("path-headers-only", "text/plain");
-              })
-        .Post("/post-large",
-              [&](const Request &req, Response &res) {
-                EXPECT_EQ(req.body, LARGE_DATA);
-                res.set_content(req.body, "text/plain");
-              })
-        .Put("/empty-no-content-type",
-             [&](const Request &req, Response &res) {
-               EXPECT_EQ(req.body, "");
-               EXPECT_FALSE(req.has_header("Content-Type"));
-               EXPECT_EQ("0", req.get_header_value("Content-Length"));
-               res.set_content("empty-no-content-type", "text/plain");
-             })
-        .Put("/put",
-             [&](const Request &req, Response &res) {
-               EXPECT_EQ(req.body, "PUT");
-               res.set_content(req.body, "text/plain");
-             })
-        .Put("/put-large",
-             [&](const Request &req, Response &res) {
-               EXPECT_EQ(req.body, LARGE_DATA);
-               res.set_content(req.body, "text/plain");
-             })
-        .Patch("/patch",
-               [&](const Request &req, Response &res) {
-                 EXPECT_EQ(req.body, "PATCH");
-                 res.set_content(req.body, "text/plain");
-               })
-        .Delete("/delete",
-                [&](const Request & /*req*/, Response &res) {
-                  res.set_content("DELETE", "text/plain");
-                })
-        .Delete("/delete-body",
-                [&](const Request &req, Response &res) {
-                  EXPECT_EQ(req.body, "content");
-                  res.set_content(req.body, "text/plain");
-                })
-        .Options(R"(\*)",
-                 [&](const Request & /*req*/, Response &res) {
-                   res.set_header("Allow", "GET, POST, HEAD, OPTIONS");
-                 })
-        .Get("/request-target",
-             [&](const Request &req, Response & /*res*/) {
-               EXPECT_EQ("/request-target?aaa=bbb&ccc=ddd", req.target);
-               EXPECT_EQ("bbb", req.get_param_value("aaa"));
-               EXPECT_EQ("ddd", req.get_param_value("ccc"));
-             })
-        .Get("/long-query-value",
-             [&](const Request &req, Response & /*res*/) {
-               EXPECT_EQ(LONG_QUERY_URL, req.target);
-               EXPECT_EQ(LONG_QUERY_VALUE, req.get_param_value("key"));
-             })
-        .Get("/array-param",
-             [&](const Request &req, Response & /*res*/) {
-               EXPECT_EQ(3u, req.get_param_value_count("array"));
-               EXPECT_EQ("value1", req.get_param_value("array", 0));
-               EXPECT_EQ("value2", req.get_param_value("array", 1));
-               EXPECT_EQ("value3", req.get_param_value("array", 2));
-             })
-        .Post("/validate-no-multiple-headers",
-              [&](const Request &req, Response & /*res*/) {
-                EXPECT_EQ(1u, req.get_header_value_count("Content-Length"));
-                EXPECT_EQ("5", req.get_header_value("Content-Length"));
-              })
-        .Post("/content_receiver",
-              [&](const Request &req, Response &res,
-                  const ContentReader &content_reader) {
-                if (req.is_multipart_form_data()) {
-                  MultipartFormDataItems files;
-                  content_reader(
-                      [&](const MultipartFormData &file) {
-                        files.push_back(file);
-                        return true;
-                      },
-                      [&](const char *data, size_t data_length) {
-                        files.back().content.append(data, data_length);
-                        return true;
-                      });
-
-                  EXPECT_EQ(5u, files.size());
-
-                  {
-                    const auto &file = get_file_value(files, "text1");
-                    EXPECT_TRUE(file.filename.empty());
-                    EXPECT_EQ("text default", file.content);
-                  }
-
-                  {
-                    const auto &file = get_file_value(files, "text2");
-                    EXPECT_TRUE(file.filename.empty());
-                    EXPECT_EQ("aωb", file.content);
-                  }
-
-                  {
-                    const auto &file = get_file_value(files, "file1");
-                    EXPECT_EQ("hello.txt", file.filename);
-                    EXPECT_EQ("text/plain", file.content_type);
-                    EXPECT_EQ("h\ne\n\nl\nl\no\n", file.content);
-                  }
-
-                  {
-                    const auto &file = get_file_value(files, "file3");
-                    EXPECT_TRUE(file.filename.empty());
-                    EXPECT_EQ("application/octet-stream", file.content_type);
-                    EXPECT_EQ(0u, file.content.size());
-                  }
-                } else {
-                  std::string body;
-                  content_reader([&](const char *data, size_t data_length) {
-                    EXPECT_EQ(7U, data_length);
-                    body.append(data, data_length);
-                    return true;
-                  });
-                  EXPECT_EQ(body, "content");
-                  res.set_content(body, "text/plain");
-                }
-              })
-        .Put("/content_receiver",
-             [&](const Request & /*req*/, Response &res,
-                 const ContentReader &content_reader) {
-               std::string body;
-               content_reader([&](const char *data, size_t data_length) {
-                 body.append(data, data_length);
-                 return true;
-               });
-               EXPECT_EQ(body, "content");
-               res.set_content(body, "text/plain");
-             })
-        .Patch("/content_receiver",
-               [&](const Request & /*req*/, Response &res,
-                   const ContentReader &content_reader) {
-                 std::string body;
-                 content_reader([&](const char *data, size_t data_length) {
-                   body.append(data, data_length);
-                   return true;
-                 });
-                 EXPECT_EQ(body, "content");
-                 res.set_content(body, "text/plain");
-               })
-        .Post("/query-string-and-body",
-              [&](const Request &req, Response & /*res*/) {
-                ASSERT_TRUE(req.has_param("key"));
-                EXPECT_EQ(req.get_param_value("key"), "value");
-                EXPECT_EQ(req.body, "content");
-              })
-        .Get("/last-request",
-             [&](const Request &req, Response & /*res*/) {
-               EXPECT_EQ("close", req.get_header_value("Connection"));
-             })
-        .Get(R"(/redirect/(\d+))",
-             [&](const Request &req, Response &res) {
-               auto num = std::stoi(req.matches[1]) + 1;
-               std::string url = "/redirect/" + std::to_string(num);
-               res.set_redirect(url);
-             })
-        .Post("/binary",
-              [&](const Request &req, Response &res) {
-                EXPECT_EQ(4U, req.body.size());
-                EXPECT_EQ("application/octet-stream",
-                          req.get_header_value("Content-Type"));
-                EXPECT_EQ("4", req.get_header_value("Content-Length"));
-                res.set_content(req.body, "application/octet-stream");
-              })
-        .Put("/binary",
-             [&](const Request &req, Response &res) {
-               EXPECT_EQ(4U, req.body.size());
-               EXPECT_EQ("application/octet-stream",
-                         req.get_header_value("Content-Type"));
-               EXPECT_EQ("4", req.get_header_value("Content-Length"));
-               res.set_content(req.body, "application/octet-stream");
-             })
-        .Patch("/binary",
-               [&](const Request &req, Response &res) {
-                 EXPECT_EQ(4U, req.body.size());
-                 EXPECT_EQ("application/octet-stream",
-                           req.get_header_value("Content-Type"));
-                 EXPECT_EQ("4", req.get_header_value("Content-Length"));
-                 res.set_content(req.body, "application/octet-stream");
-               })
-        .Delete("/binary",
-                [&](const Request &req, Response &res) {
-                  EXPECT_EQ(4U, req.body.size());
-                  EXPECT_EQ("application/octet-stream",
-                            req.get_header_value("Content-Type"));
-                  EXPECT_EQ("4", req.get_header_value("Content-Length"));
-                  res.set_content(req.body, "application/octet-stream");
-                })
-        .Get("/issue1772",
-             [&](const Request & /*req*/, Response &res) {
-               res.status = 401;
-               res.set_header("WWW-Authenticate", "Basic realm=123456");
-             })
-        .Delete("/issue609",
-                [](const httplib::Request &, httplib::Response &res,
-                   const httplib::ContentReader &) {
-                  res.set_content("ok", "text/plain");
-                })
-#if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT)
-        .Get("/compress",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content(
-                   "12345678901234567890123456789012345678901234567890123456789"
-                   "01234567890123456789012345678901234567890",
-                   "text/plain");
-             })
-        .Get("/nocompress",
-             [&](const Request & /*req*/, Response &res) {
-               res.set_content(
-                   "12345678901234567890123456789012345678901234567890123456789"
-                   "01234567890123456789012345678901234567890",
-                   "application/octet-stream");
-             })
-        .Post("/compress-multipart",
-              [&](const Request &req, Response & /*res*/) {
-                EXPECT_EQ(2u, req.files.size());
-                ASSERT_TRUE(!req.has_file("???"));
-
-                {
-                  const auto &file = req.get_file_value("key1");
-                  EXPECT_TRUE(file.filename.empty());
-                  EXPECT_EQ("test", file.content);
-                }
-
-                {
-                  const auto &file = req.get_file_value("key2");
-                  EXPECT_TRUE(file.filename.empty());
-                  EXPECT_EQ("--abcdefg123", file.content);
-                }
-              })
-#endif
-        ;
-
-    persons_["john"] = "programmer";
-
-    t_ = thread([&]() { ASSERT_TRUE(svr_.listen(HOST, PORT)); });
-
-    svr_.wait_until_ready();
-  }
-
-  virtual void TearDown() {
-    svr_.stop();
-    if (!request_threads_.empty()) {
-      std::this_thread::sleep_for(std::chrono::seconds(1));
-      for (auto &t : request_threads_) {
-        t.join();
-      }
-    }
-    t_.join();
-  }
-
-  map<string, string> persons_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli_;
-  SSLServer svr_;
-#else
-  Client cli_;
-  Server svr_;
-#endif
-  thread t_;
-  std::vector<thread> request_threads_;
-};
-
-TEST_F(ServerTest, GetMethod200) {
-  auto res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ("HTTP/1.1", res->version);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("OK", res->reason);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ(1U, res->get_header_value_count("Content-Type"));
-  EXPECT_EQ("Hello World!", res->body);
-}
-
-TEST_F(ServerTest, GetEmptyFile) {
-  auto res = cli_.Get("/empty_file");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
-  EXPECT_EQ(0, std::stoi(res->get_header_value("Content-Length")));
-  EXPECT_EQ("", res->body);
-}
-
-TEST_F(ServerTest, GetFileContent) {
-  auto res = cli_.Get("/file_content");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ(9, std::stoi(res->get_header_value("Content-Length")));
-  EXPECT_EQ("test.html", res->body);
-}
-
-TEST_F(ServerTest, GetFileContentWithRange) {
-  auto res = cli_.Get("/file_content", {{make_range_header({{1, 3}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ("bytes 1-3/9", res->get_header_value("Content-Range"));
-  EXPECT_EQ(3, std::stoi(res->get_header_value("Content-Length")));
-  EXPECT_EQ("est", res->body);
-}
-
-TEST_F(ServerTest, GetFileContentWithContentType) {
-  auto res = cli_.Get("/file_content_with_content_type");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ(5, std::stoi(res->get_header_value("Content-Length")));
-  EXPECT_EQ("file\n", res->body);
-}
-
-TEST_F(ServerTest, GetInvalidFileContent) {
-  auto res = cli_.Get("/invalid_file_content");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethod200withPercentEncoding) {
-  auto res = cli_.Get("/%68%69"); // auto res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ("HTTP/1.1", res->version);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ(1U, res->get_header_value_count("Content-Type"));
-  EXPECT_EQ("Hello World!", res->body);
-}
-
-TEST_F(ServerTest, GetMethod302) {
-  auto res = cli_.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::Found_302, res->status);
-  EXPECT_EQ("/hi", res->get_header_value("Location"));
-}
-
-TEST_F(ServerTest, GetMethod302Redirect) {
-  cli_.set_follow_location(true);
-  auto res = cli_.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("Hello World!", res->body);
-  EXPECT_EQ("/hi", res->location);
-}
-
-TEST_F(ServerTest, GetMethod404) {
-  auto res = cli_.Get("/invalid");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, HeadMethod200) {
-  auto res = cli_.Head("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_TRUE(res->body.empty());
-}
-
-TEST_F(ServerTest, HeadMethod200Static) {
-  auto res = cli_.Head("/mount/dir/index.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ(104, std::stoi(res->get_header_value("Content-Length")));
-  EXPECT_TRUE(res->body.empty());
-}
-
-TEST_F(ServerTest, HeadMethod404) {
-  auto res = cli_.Head("/invalid");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-  EXPECT_TRUE(res->body.empty());
-}
-
-TEST_F(ServerTest, GetMethodPersonJohn) {
-  auto res = cli_.Get("/person/john");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("programmer", res->body);
-}
-
-TEST_F(ServerTest, PostMethod1) {
-  auto res = cli_.Get("/person/john1");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::NotFound_404, res->status);
-
-  res = cli_.Post("/person", "name=john1&note=coder",
-                  "application/x-www-form-urlencoded");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-
-  res = cli_.Get("/person/john1");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
-  ASSERT_EQ("coder", res->body);
-}
-
-TEST_F(ServerTest, PostMethod2) {
-  auto res = cli_.Get("/person/john2");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::NotFound_404, res->status);
-
-  Params params;
-  params.emplace("name", "john2");
-  params.emplace("note", "coder");
-
-  res = cli_.Post("/person", params);
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-
-  res = cli_.Get("/person/john2");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
-  ASSERT_EQ("coder", res->body);
-}
-
-TEST_F(ServerTest, PutMethod3) {
-  auto res = cli_.Get("/person/john3");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::NotFound_404, res->status);
-
-  Params params;
-  params.emplace("name", "john3");
-  params.emplace("note", "coder");
-
-  res = cli_.Put("/person", params);
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-
-  res = cli_.Get("/person/john3");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
-  ASSERT_EQ("coder", res->body);
-}
-
-TEST_F(ServerTest, PostWwwFormUrlEncodedJson) {
-  Params params;
-  params.emplace("json", JSON_DATA);
-
-  auto res = cli_.Post("/x-www-form-urlencoded-json", params);
-
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(JSON_DATA, res->body);
-}
-
-TEST_F(ServerTest, PostEmptyContent) {
-  auto res = cli_.Post("/empty", "", "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("empty", res->body);
-}
-
-TEST_F(ServerTest, PostEmptyContentWithNoContentType) {
-  auto res = cli_.Post("/empty-no-content-type");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("empty-no-content-type", res->body);
-}
-
-TEST_F(ServerTest, PostPathOnly) {
-  auto res = cli_.Post("/path-only");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("path-only", res->body);
-}
-
-TEST_F(ServerTest, PostPathAndHeadersOnly) {
-  auto res = cli_.Post("/path-headers-only",
-                       Headers({{"hello", "world"}, {"hello2", "world2"}}));
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("path-headers-only", res->body);
-}
-
-TEST_F(ServerTest, PostLarge) {
-  auto res = cli_.Post("/post-large", LARGE_DATA, "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(LARGE_DATA, res->body);
-}
-
-TEST_F(ServerTest, PutEmptyContentWithNoContentType) {
-  auto res = cli_.Put("/empty-no-content-type");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("empty-no-content-type", res->body);
-}
-
-TEST_F(ServerTest, GetMethodDir) {
-  auto res = cli_.Get("/dir/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-
-  auto body = R"(<html>
-<head>
-</head>
-<body>
-  <a href="/dir/test.html">Test</a>
-  <a href="/hi">hi</a>
-</body>
-</html>
-)";
-  EXPECT_EQ(body, res->body);
-}
-
-TEST_F(ServerTest, GetMethodDirTest) {
-  auto res = cli_.Get("/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ("test.html", res->body);
-}
-
-TEST_F(ServerTest, GetMethodDirTestWithDoubleDots) {
-  auto res = cli_.Get("/dir/../dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ("test.html", res->body);
-}
-
-TEST_F(ServerTest, GetMethodInvalidPath) {
-  auto res = cli_.Get("/dir/../test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodOutOfBaseDir) {
-  auto res = cli_.Get("/../www/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodOutOfBaseDir2) {
-  auto res = cli_.Get("/dir/../../www/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodDirMountTest) {
-  auto res = cli_.Get("/mount/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ("test.html", res->body);
-}
-
-TEST_F(ServerTest, GetMethodDirMountTestWithDoubleDots) {
-  auto res = cli_.Get("/mount/dir/../dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-  EXPECT_EQ("test.html", res->body);
-}
-
-TEST_F(ServerTest, GetMethodInvalidMountPath) {
-  auto res = cli_.Get("/mount/dir/../test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodEmbeddedNUL) {
-  auto res = cli_.Get("/mount/dir/test.html%00.js");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodOutOfBaseDirMount) {
-  auto res = cli_.Get("/mount/../www2/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodOutOfBaseDirMount2) {
-  auto res = cli_.Get("/mount/dir/../../www2/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, GetMethodOutOfBaseDirMountWithBackslash) {
-  auto res = cli_.Get("/mount/%2e%2e%5c/www2/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, PostMethod303) {
-  auto res = cli_.Post("/1", "body", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::SeeOther_303, res->status);
-  EXPECT_EQ("/2", res->get_header_value("Location"));
-}
-
-TEST_F(ServerTest, PostMethod303Redirect) {
-  cli_.set_follow_location(true);
-  auto res = cli_.Post("/1", "body", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("redirected.", res->body);
-  EXPECT_EQ("/2", res->location);
-}
-
-TEST_F(ServerTest, UserDefinedMIMETypeMapping) {
-  auto res = cli_.Get("/dir/test.abcde");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
-  EXPECT_EQ("abcde", res->body);
-}
-
-TEST_F(ServerTest, StaticFileRange) {
-  auto res = cli_.Get("/dir/test.abcde", {{make_range_header({{2, 3}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
-  EXPECT_EQ("2", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 2-3/5", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("cd"), res->body);
-}
-
-TEST_F(ServerTest, StaticFileRanges) {
-  auto res =
-      cli_.Get("/dir/test.abcde", {{make_range_header({{1, 2}, {4, -1}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_TRUE(
-      res->get_header_value("Content-Type")
-          .find(
-              "multipart/byteranges; boundary=--cpp-httplib-multipart-data-") ==
-      0);
-  EXPECT_EQ("266", res->get_header_value("Content-Length"));
-}
-
-TEST_F(ServerTest, StaticFileRangeHead) {
-  auto res = cli_.Head("/dir/test.abcde", {{make_range_header({{2, 3}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
-  EXPECT_EQ("2", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 2-3/5", res->get_header_value("Content-Range"));
-}
-
-TEST_F(ServerTest, StaticFileRangeBigFile) {
-  auto res = cli_.Get("/dir/1MB.txt", {{make_range_header({{-1, 5}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("5", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 1048571-1048575/1048576",
-            res->get_header_value("Content-Range"));
-  EXPECT_EQ("LAST\n", res->body);
-}
-
-TEST_F(ServerTest, StaticFileRangeBigFile2) {
-  auto res = cli_.Get("/dir/1MB.txt", {{make_range_header({{1, 4097}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("4097", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 1-4097/1048576", res->get_header_value("Content-Range"));
-}
-
-TEST_F(ServerTest, StaticFileBigFile) {
-  auto res = cli_.Get("/dir/1MB.txt");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("1048576", res->get_header_value("Content-Length"));
-}
-
-TEST_F(ServerTest, InvalidBaseDirMount) {
-  EXPECT_EQ(false, svr_.set_mount_point("invalid_mount_point", "./www3"));
-}
-
-TEST_F(ServerTest, Binary) {
-  std::vector<char> binary{0x00, 0x01, 0x02, 0x03};
-
-  auto res = cli_.Post("/binary", binary.data(), binary.size(),
-                       "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-
-  res = cli_.Put("/binary", binary.data(), binary.size(),
-                 "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-
-  res = cli_.Patch("/binary", binary.data(), binary.size(),
-                   "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-
-  res = cli_.Delete("/binary", binary.data(), binary.size(),
-                    "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-}
-
-TEST_F(ServerTest, BinaryString) {
-  auto binary = std::string("\x00\x01\x02\x03", 4);
-
-  auto res = cli_.Post("/binary", binary, "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-
-  res = cli_.Put("/binary", binary, "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-
-  res = cli_.Patch("/binary", binary, "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-
-  res = cli_.Delete("/binary", binary, "application/octet-stream");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ(4U, res->body.size());
-}
-
-TEST_F(ServerTest, EmptyRequest) {
-  auto res = cli_.Get("");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Connection, res.error());
-}
-
-TEST_F(ServerTest, LongRequest) {
-  std::string request;
-  for (size_t i = 0; i < 545; i++) {
-    request += "/TooLongRequest";
-  }
-  request += "OK";
-
-  auto res = cli_.Get(request.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, TooLongRequest) {
-  std::string request;
-  for (size_t i = 0; i < 546; i++) {
-    request += "/TooLongRequest";
-  }
-  request += "_NG";
-
-  auto res = cli_.Get(request.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::UriTooLong_414, res->status);
-}
-
-TEST_F(ServerTest, AlmostTooLongRequest) {
-  // test for #2046 - URI length check shouldn't include other content on req line
-  // URI is max URI length, minus 14 other chars in req line (GET, space, leading /, space, HTTP/1.1)
-  std::string request = "/" + string(CPPHTTPLIB_REQUEST_URI_MAX_LENGTH - 14, 'A');
-
-  auto res = cli_.Get(request.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, LongHeader) {
-  Request req;
-  req.method = "GET";
-  req.path = "/hi";
-
-  std::string host_and_port;
-  host_and_port += HOST;
-  host_and_port += ":";
-  host_and_port += std::to_string(PORT);
-
-  req.headers.emplace("Host", host_and_port.c_str());
-  req.headers.emplace("Accept", "*/*");
-  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
-
-  req.headers.emplace(
-      "Header-Name",
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@");
-
-  auto res = std::make_shared<Response>();
-  auto error = Error::Success;
-  auto ret = cli_.send(req, *res, error);
-
-  ASSERT_TRUE(ret);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, LongQueryValue) {
-  auto res = cli_.Get(LONG_QUERY_URL.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::UriTooLong_414, res->status);
-}
-
-TEST_F(ServerTest, TooLongHeader) {
-  Request req;
-  req.method = "GET";
-  req.path = "/hi";
-
-  std::string host_and_port;
-  host_and_port += HOST;
-  host_and_port += ":";
-  host_and_port += std::to_string(PORT);
-
-  req.headers.emplace("Host", host_and_port.c_str());
-  req.headers.emplace("Accept", "*/*");
-  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
-
-  req.headers.emplace(
-      "Header-Name",
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-      "@@@@@@@@@@@@@@@@@");
-
-  auto res = std::make_shared<Response>();
-  auto error = Error::Success;
-  auto ret = cli_.send(req, *res, error);
-
-  ASSERT_TRUE(ret);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, PercentEncoding) {
-  auto res = cli_.Get("/e%6edwith%");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, PercentEncodingUnicode) {
-  auto res = cli_.Get("/e%u006edwith%");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, InvalidPercentEncoding) {
-  auto res = cli_.Get("/%endwith%");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, InvalidPercentEncodingUnicode) {
-  auto res = cli_.Get("/%uendwith%");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, EndWithPercentCharacterInQuery) {
-  auto res = cli_.Get("/hello?aaa=bbb%");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST_F(ServerTest, PlusSignEncoding) {
-  auto res = cli_.Get("/a+%2Bb?a %2bb=a %2Bb");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("a +b", res->body);
-}
-
-TEST_F(ServerTest, MultipartFormData) {
-  MultipartFormDataItems items = {
-      {"text1", "text default", "", ""},
-      {"text2", "aωb", "", ""},
-      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
-      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
-      {"file3", "", "", "application/octet-stream"},
-      {"file4", "", "", "   application/json  tmp-string    "}};
-
-  auto res = cli_.Post("/multipart", items);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, MultipartFormDataMultiFileValues) {
-  MultipartFormDataItems items = {
-      {"text", "default text", "", ""},
-
-      {"multi_text1", "aaaaa", "", ""},
-      {"multi_text1", "bbbbb", "", ""},
-
-      {"multi_file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
-      {"multi_file1", "{\n  \"world\", true\n}\n", "world.json",
-       "application/json"},
-  };
-
-  auto res = cli_.Post("/multipart/multi_file_values", items);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, CaseInsensitiveHeaderName) {
-  auto res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("content-type"));
-  EXPECT_EQ("Hello World!", res->body);
-}
-
-TEST_F(ServerTest, CaseInsensitiveTransferEncoding) {
-  Request req;
-  req.method = "POST";
-  req.path = "/chunked";
-
-  std::string host_and_port;
-  host_and_port += HOST;
-  host_and_port += ":";
-  host_and_port += std::to_string(PORT);
-
-  req.headers.emplace("Host", host_and_port.c_str());
-  req.headers.emplace("Accept", "*/*");
-  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
-  req.headers.emplace("Content-Type", "text/plain");
-  req.headers.emplace("Content-Length", "0");
-  req.headers.emplace(
-      "Transfer-Encoding",
-      "Chunked"); // Note, "Chunked" rather than typical "chunked".
-
-  // Client does not chunk, so make a chunked body manually.
-  req.body = "4\r\ndech\r\nf\r\nunked post body\r\n0\r\n\r\n";
-
-  auto res = std::make_shared<Response>();
-  auto error = Error::Success;
-  auto ret = cli_.send(req, *res, error);
-
-  ASSERT_TRUE(ret);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, GetStreamed2) {
-  auto res = cli_.Get("/streamed", {{make_range_header({{2, 3}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("2", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 2-3/6", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("ab"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamed) {
-  auto res = cli_.Get("/streamed");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("6", res->get_header_value("Content-Length"));
-  EXPECT_EQ(std::string("aaabbb"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedWithRange1) {
-  auto res = cli_.Get("/streamed-with-range", {{make_range_header({{3, 5}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("3", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 3-5/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("def"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedWithRange2) {
-  auto res = cli_.Get("/streamed-with-range", {{make_range_header({{1, -1}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("6", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 1-6/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("bcdefg"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedWithRangeSuffix1) {
-  auto res = cli_.Get("/streamed-with-range", {{"Range", "bytes=-3"}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("3", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 4-6/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("efg"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedWithRangeSuffix2) {
-  auto res = cli_.Get("/streamed-with-range?error", {{"Range", "bytes=-9999"}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-  EXPECT_EQ("0", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(0U, res->body.size());
-}
-
-TEST_F(ServerTest, GetStreamedWithRangeError) {
-  auto res = cli_.Get("/streamed-with-range",
-                      {{"Range", "bytes=92233720368547758079223372036854775806-"
-                                 "92233720368547758079223372036854775807"}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-  EXPECT_EQ("0", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(0U, res->body.size());
-}
-
-TEST_F(ServerTest, GetRangeWithMaxLongLength) {
-  auto res = cli_.Get(
-      "/with-range",
-      {{"Range", "bytes=0-" + std::to_string(std::numeric_limits<long>::max())},
-       {"Accept-Encoding", ""}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("7", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 0-6/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("abcdefg"), res->body);
-}
-
-TEST_F(ServerTest, GetRangeWithZeroToInfinite) {
-  auto res = cli_.Get("/with-range", {
-                                         {"Range", "bytes=0-"},
-                                         {"Accept-Encoding", ""},
-                                     });
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("7", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 0-6/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("abcdefg"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedWithRangeMultipart) {
-  auto res =
-      cli_.Get("/streamed-with-range", {{make_range_header({{1, 2}, {4, 5}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("267", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(267U, res->body.size());
-}
-
-TEST_F(ServerTest, GetStreamedWithTooManyRanges) {
-  Ranges ranges;
-  for (size_t i = 0; i < CPPHTTPLIB_RANGE_MAX_COUNT + 1; i++) {
-    ranges.emplace_back(0, -1);
-  }
-
-  auto res =
-      cli_.Get("/streamed-with-range?error", {{make_range_header(ranges)}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-  EXPECT_EQ("0", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(0U, res->body.size());
-}
-
-TEST_F(ServerTest, GetStreamedWithNonAscendingRanges) {
-  auto res = cli_.Get("/streamed-with-range?error",
-                      {{make_range_header({{0, -1}, {0, -1}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-  EXPECT_EQ("0", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(0U, res->body.size());
-}
-
-TEST_F(ServerTest, GetStreamedWithRangesMoreThanTwoOverwrapping) {
-  auto res = cli_.Get("/streamed-with-range?error",
-                      {{make_range_header({{0, 1}, {1, 2}, {2, 3}, {3, 4}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-  EXPECT_EQ("0", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(0U, res->body.size());
-}
-
-TEST_F(ServerTest, GetStreamedEndless) {
-  uint64_t offset = 0;
-  auto res = cli_.Get("/streamed-cancel",
-                      [&](const char * /*data*/, uint64_t data_length) {
-                        if (offset < 100) {
-                          offset += data_length;
-                          return true;
-                        }
-                        return false;
-                      });
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST_F(ServerTest, ClientStop) {
-  std::atomic_size_t count{4};
-  std::vector<std::thread> threads;
-
-  for (auto i = count.load(); i != 0; --i) {
-    threads.emplace_back([&]() {
-      auto res = cli_.Get("/streamed-cancel",
-                          [&](const char *, uint64_t) { return true; });
-
-      --count;
-
-      ASSERT_TRUE(!res);
-      EXPECT_TRUE(res.error() == Error::Canceled ||
-                  res.error() == Error::Read || res.error() == Error::Write);
-    });
-  }
-
-  std::this_thread::sleep_for(std::chrono::seconds(2));
-  while (count != 0) {
-    cli_.stop();
-    std::this_thread::sleep_for(std::chrono::milliseconds(10));
-  }
-  for (auto &t : threads) {
-    t.join();
-  }
-}
-
-TEST_F(ServerTest, GetWithRange1) {
-  auto res = cli_.Get("/with-range", {
-                                         make_range_header({{3, 5}}),
-                                         {"Accept-Encoding", ""},
-                                     });
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("3", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 3-5/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("def"), res->body);
-}
-
-TEST_F(ServerTest, GetWithRange2) {
-  auto res = cli_.Get("/with-range", {
-                                         make_range_header({{1, -1}}),
-                                         {"Accept-Encoding", ""},
-                                     });
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("6", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 1-6/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("bcdefg"), res->body);
-}
-
-TEST_F(ServerTest, GetWithRange3) {
-  auto res = cli_.Get("/with-range", {
-                                         make_range_header({{0, 0}}),
-                                         {"Accept-Encoding", ""},
-                                     });
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("1", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 0-0/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("a"), res->body);
-}
-
-TEST_F(ServerTest, GetWithRange4) {
-  auto res = cli_.Get("/with-range", {
-                                         make_range_header({{-1, 2}}),
-                                         {"Accept-Encoding", ""},
-                                     });
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("2", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ("bytes 5-6/7", res->get_header_value("Content-Range"));
-  EXPECT_EQ(std::string("fg"), res->body);
-}
-
-TEST_F(ServerTest, GetWithRangeOffsetGreaterThanContent) {
-  auto res = cli_.Get("/with-range", {{make_range_header({{10000, 20000}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-}
-
-TEST_F(ServerTest, GetWithRangeMultipart) {
-  auto res = cli_.Get("/with-range", {{make_range_header({{1, 2}, {4, 5}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  EXPECT_EQ("267", res->get_header_value("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(267U, res->body.size());
-}
-
-TEST_F(ServerTest, GetWithRangeMultipartOffsetGreaterThanContent) {
-  auto res =
-      cli_.Get("/with-range", {{make_range_header({{-1, 2}, {10000, 30000}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
-}
-
-TEST_F(ServerTest, GetWithRangeCustomizedResponse) {
-  auto res = cli_.Get("/with-range-customized-response",
-                      {{make_range_header({{1, 2}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
-  EXPECT_EQ(true, res->has_header("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(JSON_DATA, res->body);
-}
-
-TEST_F(ServerTest, GetWithRangeMultipartCustomizedResponseMultipleRange) {
-  auto res = cli_.Get("/with-range-customized-response",
-                      {{make_range_header({{1, 2}, {4, 5}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
-  EXPECT_EQ(true, res->has_header("Content-Length"));
-  EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(JSON_DATA, res->body);
-}
-
-TEST_F(ServerTest, Issue1772) {
-  auto res = cli_.Get("/issue1772", {{make_range_header({{1000, -1}})}});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-}
-
-TEST_F(ServerTest, Issue609) {
-  auto res = cli_.Delete("/issue609");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("ok"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedChunked) {
-  auto res = cli_.Get("/streamed-chunked");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedChunked2) {
-  auto res = cli_.Get("/streamed-chunked2");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedChunkedWithTrailer) {
-  auto res = cli_.Get("/streamed-chunked-with-trailer");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-  EXPECT_EQ(std::string("DummyVal1"), res->get_header_value("Dummy1"));
-  EXPECT_EQ(std::string("DummyVal2"), res->get_header_value("Dummy2"));
-}
-
-TEST_F(ServerTest, LargeChunkedPost) {
-  Request req;
-  req.method = "POST";
-  req.path = "/large-chunked";
-
-  std::string host_and_port;
-  host_and_port += HOST;
-  host_and_port += ":";
-  host_and_port += std::to_string(PORT);
-
-  req.headers.emplace("Host", host_and_port.c_str());
-  req.headers.emplace("Accept", "*/*");
-  req.headers.emplace("User-Agent", "cpp-httplib/0.1");
-  req.headers.emplace("Content-Type", "text/plain");
-  req.headers.emplace("Content-Length", "0");
-  req.headers.emplace("Transfer-Encoding", "chunked");
-
-  std::string long_string(30 * 1024u, 'a');
-  std::string chunk = "7800\r\n" + long_string + "\r\n";
-
-  // Attempt to make a large enough post to exceed OS buffers, to test that
-  // the server handles short reads if the full chunk data isn't available.
-  req.body = chunk + chunk + chunk + chunk + chunk + chunk + "0\r\n\r\n";
-
-  auto res = std::make_shared<Response>();
-  auto error = Error::Success;
-  auto ret = cli_.send(req, *res, error);
-
-  ASSERT_TRUE(ret);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, GetMethodRemoteAddr) {
-  auto res = cli_.Get("/remote_addr");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1");
-}
-
-TEST_F(ServerTest, GetMethodLocalAddr) {
-  auto res = cli_.Get("/local_addr");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_TRUE(res->body == std::string("::1:").append(to_string(PORT)) ||
-              res->body == std::string("127.0.0.1:").append(to_string(PORT)));
-}
-
-TEST_F(ServerTest, HTTPResponseSplitting) {
-  auto res = cli_.Get("/http_response_splitting");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, SlowRequest) {
-  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
-  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
-  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
-}
-
-#if 0
-TEST_F(ServerTest, SlowPost) {
-  char buffer[64 * 1024];
-  memset(buffer, 0x42, sizeof(buffer));
-
-  auto res = cli_.Post(
-      "/slowpost", 64 * 1024 * 1024,
-      [&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        auto ret = sink.write(buffer, sizeof(buffer));
-        EXPECT_TRUE(ret);
-        return true;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, SlowPostFail) {
-  char buffer[64 * 1024];
-  memset(buffer, 0x42, sizeof(buffer));
-
-  cli_.set_write_timeout(std::chrono::seconds(0));
-  auto res = cli_.Post(
-      "/slowpost", 64 * 1024 * 1024,
-      [&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        sink.write(buffer, sizeof(buffer));
-        return true;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Write, res.error());
-}
-#endif
-
-TEST_F(ServerTest, Put) {
-  auto res = cli_.Put("/put", "PUT", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PUT", res->body);
-}
-
-TEST_F(ServerTest, PutWithContentProvider) {
-  auto res = cli_.Put(
-      "/put", 3,
-      [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        sink.os << "PUT";
-        return true;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PUT", res->body);
-}
-
-TEST_F(ServerTest, PostWithContentProviderAbort) {
-  auto res = cli_.Post(
-      "/post", 42,
-      [](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
-        return false;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST_F(ServerTest, PutWithContentProviderWithoutLength) {
-  auto res = cli_.Put(
-      "/put",
-      [](size_t /*offset*/, DataSink &sink) {
-        sink.os << "PUT";
-        sink.done();
-        return true;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PUT", res->body);
-}
-
-TEST_F(ServerTest, PostWithContentProviderWithoutLengthAbort) {
-  auto res = cli_.Post(
-      "/post", [](size_t /*offset*/, DataSink & /*sink*/) { return false; },
-      "text/plain");
-
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-TEST_F(ServerTest, PutWithContentProviderWithGzip) {
-  cli_.set_compress(true);
-  auto res = cli_.Put(
-      "/put", 3,
-      [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        sink.os << "PUT";
-        return true;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PUT", res->body);
-}
-
-TEST_F(ServerTest, PostWithContentProviderWithGzipAbort) {
-  cli_.set_compress(true);
-  auto res = cli_.Post(
-      "/post", 42,
-      [](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
-        return false;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST_F(ServerTest, PutWithContentProviderWithoutLengthWithGzip) {
-  cli_.set_compress(true);
-  auto res = cli_.Put(
-      "/put",
-      [](size_t /*offset*/, DataSink &sink) {
-        sink.os << "PUT";
-        sink.done();
-        return true;
-      },
-      "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PUT", res->body);
-}
-
-TEST_F(ServerTest, PostWithContentProviderWithoutLengthWithGzipAbort) {
-  cli_.set_compress(true);
-  auto res = cli_.Post(
-      "/post", [](size_t /*offset*/, DataSink & /*sink*/) { return false; },
-      "text/plain");
-
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::Canceled, res.error());
-}
-
-TEST_F(ServerTest, PutLargeFileWithGzip) {
-  cli_.set_compress(true);
-  auto res = cli_.Put("/put-large", LARGE_DATA, "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(LARGE_DATA, res->body);
-}
-
-TEST_F(ServerTest, PutLargeFileWithGzip2) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string s = std::string("https://") + HOST + ":" + std::to_string(PORT);
-  Client cli(s.c_str());
-  cli.enable_server_certificate_verification(false);
-#else
-  std::string s = std::string("http://") + HOST + ":" + std::to_string(PORT);
-  Client cli(s.c_str());
-#endif
-  cli.set_compress(true);
-
-  auto res = cli.Put("/put-large", LARGE_DATA, "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(LARGE_DATA, res->body);
-  // The compressed size should be less than a 10th of the original. May vary
-  // depending on the zlib library.
-  EXPECT_LT(res.get_request_header_value_u64("Content-Length"),
-            static_cast<uint64_t>(10 * 1024 * 1024));
-  EXPECT_EQ("gzip", res.get_request_header_value("Content-Encoding"));
-}
-
-TEST_F(ServerTest, PutContentWithDeflate) {
-  cli_.set_compress(false);
-  Headers headers;
-  headers.emplace("Content-Encoding", "deflate");
-  // PUT in deflate format:
-  auto res = cli_.Put("/put", headers,
-                      "\170\234\013\010\015\001\0\001\361\0\372", "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PUT", res->body);
-}
-
-TEST_F(ServerTest, GetStreamedChunkedWithGzip) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-
-  auto res = cli_.Get("/streamed-chunked", headers);
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedChunkedWithGzip2) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-
-  auto res = cli_.Get("/streamed-chunked2", headers);
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-}
-
-TEST_F(ServerTest, SplitDelimiterInPathRegex) {
-  auto res = cli_.Get("/regex-with-delimiter?key=^(?.*(value))");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(GzipDecompressor, ChunkedDecompression) {
-  std::string data;
-  for (size_t i = 0; i < 32 * 1024; ++i) {
-    data.push_back(static_cast<char>('a' + i % 26));
-  }
-
-  std::string compressed_data;
-  {
-    httplib::detail::gzip_compressor compressor;
-    bool result = compressor.compress(
-        data.data(), data.size(),
-        /*last=*/true,
-        [&](const char *compressed_data_chunk, size_t compressed_data_size) {
-          compressed_data.insert(compressed_data.size(), compressed_data_chunk,
-                                 compressed_data_size);
-          return true;
-        });
-    ASSERT_TRUE(result);
-  }
-
-  std::string decompressed_data;
-  {
-    httplib::detail::gzip_decompressor decompressor;
-
-    // Chunk size is chosen specifically to have a decompressed chunk size equal
-    // to 16384 bytes 16384 bytes is the size of decompressor output buffer
-    size_t chunk_size = 130;
-    for (size_t chunk_begin = 0; chunk_begin < compressed_data.size();
-         chunk_begin += chunk_size) {
-      size_t current_chunk_size =
-          std::min(compressed_data.size() - chunk_begin, chunk_size);
-      bool result = decompressor.decompress(
-          compressed_data.data() + chunk_begin, current_chunk_size,
-          [&](const char *decompressed_data_chunk,
-              size_t decompressed_data_chunk_size) {
-            decompressed_data.insert(decompressed_data.size(),
-                                     decompressed_data_chunk,
-                                     decompressed_data_chunk_size);
-            return true;
-          });
-      ASSERT_TRUE(result);
-    }
-  }
-  ASSERT_EQ(data, decompressed_data);
-}
-
-TEST(GzipDecompressor, DeflateDecompression) {
-  std::string original_text = "Raw deflate without gzip";
-  unsigned char data[32] = {0x78, 0x9C, 0x0B, 0x4A, 0x2C, 0x57, 0x48, 0x49,
-                            0x4D, 0xCB, 0x49, 0x2C, 0x49, 0x55, 0x28, 0xCF,
-                            0x2C, 0xC9, 0xC8, 0x2F, 0x2D, 0x51, 0x48, 0xAF,
-                            0xCA, 0x2C, 0x00, 0x00, 0x6F, 0x98, 0x09, 0x2E};
-  std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
-
-  std::string decompressed_data;
-  {
-    httplib::detail::gzip_decompressor decompressor;
-
-    bool result = decompressor.decompress(
-        compressed_data.data(), compressed_data.size(),
-        [&](const char *decompressed_data_chunk,
-            size_t decompressed_data_chunk_size) {
-          decompressed_data.insert(decompressed_data.size(),
-                                   decompressed_data_chunk,
-                                   decompressed_data_chunk_size);
-          return true;
-        });
-    ASSERT_TRUE(result);
-  }
-  ASSERT_EQ(original_text, decompressed_data);
-}
-
-TEST(GzipDecompressor, DeflateDecompressionTrailingBytes) {
-  std::string original_text = "Raw deflate without gzip";
-  unsigned char data[40] = {0x78, 0x9C, 0x0B, 0x4A, 0x2C, 0x57, 0x48, 0x49,
-                            0x4D, 0xCB, 0x49, 0x2C, 0x49, 0x55, 0x28, 0xCF,
-                            0x2C, 0xC9, 0xC8, 0x2F, 0x2D, 0x51, 0x48, 0xAF,
-                            0xCA, 0x2C, 0x00, 0x00, 0x6F, 0x98, 0x09, 0x2E,
-                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
-
-  std::string decompressed_data;
-  {
-    httplib::detail::gzip_decompressor decompressor;
-
-    bool result = decompressor.decompress(
-        compressed_data.data(), compressed_data.size(),
-        [&](const char *decompressed_data_chunk,
-            size_t decompressed_data_chunk_size) {
-          decompressed_data.insert(decompressed_data.size(),
-                                   decompressed_data_chunk,
-                                   decompressed_data_chunk_size);
-          return true;
-        });
-    ASSERT_TRUE(result);
-  }
-  ASSERT_EQ(original_text, decompressed_data);
-}
-
-#ifdef _WIN32
-TEST(GzipDecompressor, LargeRandomData) {
-
-  // prepare large random data that is difficult to be compressed and is
-  // expected to have large size even when compressed
-  std::random_device seed_gen;
-  std::mt19937 random(seed_gen());
-  constexpr auto large_size_byte = 4294967296UL;            // 4GiB
-  constexpr auto data_size = large_size_byte + 134217728UL; // + 128MiB
-  std::vector<std::uint32_t> data(data_size / sizeof(std::uint32_t));
-  std::generate(data.begin(), data.end(), [&]() { return random(); });
-
-  // compress data over 4GiB
-  std::string compressed_data;
-  compressed_data.reserve(large_size_byte + 536870912UL); // + 512MiB reserved
-  httplib::detail::gzip_compressor compressor;
-  auto result = compressor.compress(reinterpret_cast<const char *>(data.data()),
-                                    data.size() * sizeof(std::uint32_t), true,
-                                    [&](const char *data, size_t size) {
-                                      compressed_data.insert(
-                                          compressed_data.size(), data, size);
-                                      return true;
-                                    });
-  ASSERT_TRUE(result);
-
-  // FIXME: compressed data size is expected to be greater than 4GiB,
-  // but there is no guarantee
-  // ASSERT_TRUE(compressed_data.size() >= large_size_byte);
-
-  // decompress data over 4GiB
-  std::string decompressed_data;
-  decompressed_data.reserve(data_size);
-  httplib::detail::gzip_decompressor decompressor;
-  result = decompressor.decompress(
-      compressed_data.data(), compressed_data.size(),
-      [&](const char *data, size_t size) {
-        decompressed_data.insert(decompressed_data.size(), data, size);
-        return true;
-      });
-  ASSERT_TRUE(result);
-
-  // compare
-  ASSERT_EQ(data_size, decompressed_data.size());
-  ASSERT_TRUE(std::memcmp(data.data(), decompressed_data.data(), data_size) ==
-              0);
-}
-#endif
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-TEST_F(ServerTest, GetStreamedChunkedWithBrotli) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "br");
-
-  auto res = cli_.Get("/streamed-chunked", headers);
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-}
-
-TEST_F(ServerTest, GetStreamedChunkedWithBrotli2) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "br");
-
-  auto res = cli_.Get("/streamed-chunked2", headers);
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(std::string("123456789"), res->body);
-}
-#endif
-
-TEST_F(ServerTest, Patch) {
-  auto res = cli_.Patch("/patch", "PATCH", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("PATCH", res->body);
-}
-
-TEST_F(ServerTest, Delete) {
-  auto res = cli_.Delete("/delete");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("DELETE", res->body);
-}
-
-TEST_F(ServerTest, DeleteContentReceiver) {
-  auto res = cli_.Delete("/delete-body", "content", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("content", res->body);
-}
-
-TEST_F(ServerTest, Options) {
-  auto res = cli_.Options("*");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("GET, POST, HEAD, OPTIONS", res->get_header_value("Allow"));
-  EXPECT_TRUE(res->body.empty());
-}
-
-TEST_F(ServerTest, URL) {
-  auto res = cli_.Get("/request-target?aaa=bbb&ccc=ddd");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, ArrayParam) {
-  auto res = cli_.Get("/array-param?array=value1&array=value2&array=value3");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, NoMultipleHeaders) {
-  Headers headers = {{"Content-Length", "5"}};
-  auto res = cli_.Post("/validate-no-multiple-headers", headers, "hello",
-                       "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, PostContentReceiver) {
-  auto res = cli_.Post("/content_receiver", "content", "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("content", res->body);
-}
-
-TEST_F(ServerTest, PostMultipartFileContentReceiver) {
-  MultipartFormDataItems items = {
-      {"text1", "text default", "", ""},
-      {"text2", "aωb", "", ""},
-      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
-      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
-      {"file3", "", "", "application/octet-stream"},
-  };
-
-  auto res = cli_.Post("/content_receiver", items);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, PostMultipartPlusBoundary) {
-  MultipartFormDataItems items = {
-      {"text1", "text default", "", ""},
-      {"text2", "aωb", "", ""},
-      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
-      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
-      {"file3", "", "", "application/octet-stream"},
-  };
-
-  auto boundary = std::string("+++++");
-
-  std::string body;
-
-  for (const auto &item : items) {
-    body += "--" + boundary + "\r\n";
-    body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
-    if (!item.filename.empty()) {
-      body += "; filename=\"" + item.filename + "\"";
-    }
-    body += "\r\n";
-    if (!item.content_type.empty()) {
-      body += "Content-Type: " + item.content_type + "\r\n";
-    }
-    body += "\r\n";
-    body += item.content + "\r\n";
-  }
-  body += "--" + boundary + "--\r\n";
-
-  std::string content_type = "multipart/form-data; boundary=" + boundary;
-  auto res = cli_.Post("/content_receiver", body, content_type.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, PostContentReceiverGzip) {
-  cli_.set_compress(true);
-  auto res = cli_.Post("/content_receiver", "content", "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("content", res->body);
-}
-
-TEST_F(ServerTest, PutContentReceiver) {
-  auto res = cli_.Put("/content_receiver", "content", "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("content", res->body);
-}
-
-TEST_F(ServerTest, PatchContentReceiver) {
-  auto res = cli_.Patch("/content_receiver", "content", "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-  ASSERT_EQ("content", res->body);
-}
-
-TEST_F(ServerTest, PostQueryStringAndBody) {
-  auto res =
-      cli_.Post("/query-string-and-body?key=value", "content", "text/plain");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, HTTP2Magic) {
-  Request req;
-  req.method = "PRI";
-  req.path = "*";
-  req.body = "SM";
-
-  auto res = std::make_shared<Response>();
-  auto error = Error::Success;
-  auto ret = cli_.send(req, *res, error);
-
-  ASSERT_TRUE(ret);
-  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
-}
-
-TEST_F(ServerTest, KeepAlive) {
-  auto res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("Hello World!", res->body);
-
-  res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("Hello World!", res->body);
-
-  res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("Hello World!", res->body);
-
-  res = cli_.Get("/not-exist");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-
-  res = cli_.Post("/empty", "", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("empty", res->body);
-  EXPECT_EQ("close", res->get_header_value("Connection"));
-
-  res = cli_.Post(
-      "/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
-      "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("empty", res->body);
-
-  cli_.set_keep_alive(false);
-  res = cli_.Get("/last-request");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("close", res->get_header_value("Connection"));
-}
-
-TEST_F(ServerTest, TooManyRedirect) {
-  cli_.set_follow_location(true);
-  auto res = cli_.Get("/redirect/0");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::ExceedRedirectCount, res.error());
-}
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-TEST_F(ServerTest, Gzip) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-  auto res = cli_.Get("/compress", headers);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("33", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, GzipWithoutAcceptEncoding) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "");
-  auto res = cli_.Get("/compress", headers);
-
-  ASSERT_TRUE(res);
-  EXPECT_TRUE(res->get_header_value("Content-Encoding").empty());
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("100", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, GzipWithContentReceiver) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-  std::string body;
-  auto res = cli_.Get("/compress", headers,
-                      [&](const char *data, uint64_t data_length) {
-                        EXPECT_EQ(100U, data_length);
-                        body.append(data, data_length);
-                        return true;
-                      });
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("33", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, GzipWithoutDecompressing) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-
-  cli_.set_decompress(false);
-  auto res = cli_.Get("/compress", headers);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("33", res->get_header_value("Content-Length"));
-  EXPECT_EQ(33U, res->body.size());
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, GzipWithContentReceiverWithoutAcceptEncoding) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "");
-
-  std::string body;
-  auto res = cli_.Get("/compress", headers,
-                      [&](const char *data, uint64_t data_length) {
-                        EXPECT_EQ(100U, data_length);
-                        body.append(data, data_length);
-                        return true;
-                      });
-
-  ASSERT_TRUE(res);
-  EXPECT_TRUE(res->get_header_value("Content-Encoding").empty());
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("100", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, NoGzip) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-  auto res = cli_.Get("/nocompress", headers);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(false, res->has_header("Content-Encoding"));
-  EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
-  EXPECT_EQ("100", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, NoGzipWithContentReceiver) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "gzip, deflate");
-  std::string body;
-  auto res = cli_.Get("/nocompress", headers,
-                      [&](const char *data, uint64_t data_length) {
-                        EXPECT_EQ(100U, data_length);
-                        body.append(data, data_length);
-                        return true;
-                      });
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(false, res->has_header("Content-Encoding"));
-  EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
-  EXPECT_EQ("100", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST_F(ServerTest, MultipartFormDataGzip) {
-  MultipartFormDataItems items = {
-      {"key1", "test", "", ""},
-      {"key2", "--abcdefg123", "", ""},
-  };
-
-  cli_.set_compress(true);
-  auto res = cli_.Post("/compress-multipart", items);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-TEST_F(ServerTest, Brotli) {
-  Headers headers;
-  headers.emplace("Accept-Encoding", "br");
-  auto res = cli_.Get("/compress", headers);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ("br", res->get_header_value("Content-Encoding"));
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("19", res->get_header_value("Content-Length"));
-  EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
-            "7890123456789012345678901234567890",
-            res->body);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-#endif
-
-// Sends a raw request to a server listening at HOST:PORT.
-static bool send_request(time_t read_timeout_sec, const std::string &req,
-                         std::string *resp = nullptr) {
-  auto error = Error::Success;
-
-  auto client_sock = detail::create_client_socket(
-      HOST, "", PORT, AF_UNSPEC, false, false, nullptr,
-      /*connection_timeout_sec=*/5, 0,
-      /*read_timeout_sec=*/5, 0,
-      /*write_timeout_sec=*/5, 0, std::string(), error);
-
-  if (client_sock == INVALID_SOCKET) { return false; }
-
-  auto ret = detail::process_client_socket(
-      client_sock, read_timeout_sec, 0, 0, 0, 0,
-      std::chrono::steady_clock::time_point::min(), [&](Stream &strm) {
-        if (req.size() !=
-            static_cast<size_t>(strm.write(req.data(), req.size()))) {
-          return false;
-        }
-
-        char buf[512];
-
-        detail::stream_line_reader line_reader(strm, buf, sizeof(buf));
-        while (line_reader.getline()) {
-          if (resp) { *resp += line_reader.ptr(); }
-        }
-        return true;
-      });
-
-  detail::close_socket(client_sock);
-
-  return ret;
-}
-
-TEST(ServerRequestParsingTest, TrimWhitespaceFromHeaderValues) {
-  Server svr;
-  std::string header_value;
-  svr.Get("/validate-ws-in-headers", [&](const Request &req, Response &res) {
-    header_value = req.get_header_value("foo");
-    res.set_content("ok", "text/plain");
-  });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  // Only space and horizontal tab are whitespace. Make sure other whitespace-
-  // like characters are not treated the same - use vertical tab and escape.
-  const std::string req = "GET /validate-ws-in-headers HTTP/1.1\r\n"
-                          "foo: \t \v bar \x1B\t \r\n"
-                          "Connection: close\r\n"
-                          "\r\n";
-
-  std::string res;
-  ASSERT_TRUE(send_request(5, req, &res));
-  EXPECT_EQ(header_value, "");
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", res.substr(0, 24));
-}
-
-// Sends a raw request and verifies that there isn't a crash or exception.
-static void test_raw_request(const std::string &req,
-                             std::string *out = nullptr) {
-  Server svr;
-  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
-    res.set_content("ok", "text/plain");
-  });
-  svr.Put("/put_hi", [&](const Request & /*req*/, Response &res) {
-    res.set_content("ok", "text/plain");
-  });
-  svr.Get("/header_field_value_check",
-          [&](const Request & /*req*/, Response &res) {
-            res.set_content("ok", "text/plain");
-          });
-
-  // Server read timeout must be longer than the client read timeout for the
-  // bug to reproduce, probably to force the server to process a request
-  // without a trailing blank line.
-  const time_t client_read_timeout_sec = 1;
-  svr.set_read_timeout(std::chrono::seconds(client_read_timeout_sec + 1));
-  bool listen_thread_ok = false;
-  thread t = thread([&] { listen_thread_ok = svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-    EXPECT_TRUE(listen_thread_ok);
-  });
-
-  svr.wait_until_ready();
-
-  ASSERT_TRUE(send_request(client_read_timeout_sec, req, out));
-}
-
-TEST(ServerRequestParsingTest, ReadHeadersRegexComplexity) {
-  // A certain header line causes an exception if the header property is parsed
-  // naively with a single regex. This occurs with libc++ but not libstdc++.
-  test_raw_request(
-      "GET /hi HTTP/1.1\r\n"
-      " :                                                                      "
-      "                                                                      "
-      " ");
-}
-
-TEST(ServerRequestParsingTest, ReadHeadersRegexComplexity2) {
-  // A certain header line causes an exception if the header property *name* is
-  // parsed with a regular expression starting with "(.+?):" - this is a non-
-  // greedy matcher and requires backtracking when there are a lot of ":"
-  // characters.
-  // This occurs with libc++ but not libstdc++.
-  test_raw_request(
-      "GET /hi HTTP/1.1\r\n"
-      ":-:::::::::::::::::::::::::::-::::::::::::::::::::::::@-&&&&&&&&&&&"
-      "--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&"
-      "&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-:::::"
-      "::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-::::::::::::::::::::::::"
-      ":::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::"
-      "::::::::-:::::::::::::::::@-&&&&&&&--:::::::-::::::::::::::::::::::"
-      ":::::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::"
-      "::::::::::-:::::::::::::::::@-&&&&&::::::::::::-:::::::::::::::::@-"
-      "&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::::::::::::"
-      ":@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::"
-      "::::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::@-&&"
-      "&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@"
-      "::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&"
-      "--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&"
-      "&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&"
-      "&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@-&&"
-      "&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::::@"
-      "-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::::"
-      "::@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::::::::"
-      ":::::@-&&&&&&&&&&&::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-::::::"
-      ":::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-:::"
-      "::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&--:::::::-"
-      ":::::::::::::::::::::::::::::-:::::::::::::::::@-&&&&&&&&&&&---&&:&"
-      "&&.0------------:-:::::::::::::::::::::::::::::-:::::::::::::::::@-"
-      "&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-::::::::::::::::"
-      ":@-&&&&&&&&&&&--:::::::-:::::::::::::::::::::::::::::-:::::::::::::"
-      "::::@-&&&&&&&&&&&---&&:&&&.0------------O--------\rH PUTHTTP/1.1\r\n"
-      "&&&%%%");
-}
-
-TEST(ServerRequestParsingTest, ExcessiveWhitespaceInUnparsableHeaderLine) {
-  // Make sure this doesn't crash the server.
-  // In a previous version of the header line regex, the "\r" rendered the line
-  // unparsable and the regex engine repeatedly backtracked, trying to look for
-  // a new position where the leading white space ended and the field value
-  // began.
-  // The crash occurs with libc++ but not libstdc++.
-  test_raw_request("GET /hi HTTP/1.1\r\n"
-                   "a:" +
-                   std::string(2000, ' ') + '\r' + std::string(20, 'z') +
-                   "\r\n"
-                   "\r\n");
-}
-
-TEST(ServerRequestParsingTest, InvalidFirstChunkLengthInRequest) {
-  std::string out;
-
-  test_raw_request("PUT /put_hi HTTP/1.1\r\n"
-                   "Content-Type: text/plain\r\n"
-                   "Transfer-Encoding: chunked\r\n"
-                   "\r\n"
-                   "nothex\r\n",
-                   &out);
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
-}
-
-TEST(ServerRequestParsingTest, InvalidSecondChunkLengthInRequest) {
-  std::string out;
-
-  test_raw_request("PUT /put_hi HTTP/1.1\r\n"
-                   "Content-Type: text/plain\r\n"
-                   "Transfer-Encoding: chunked\r\n"
-                   "\r\n"
-                   "3\r\n"
-                   "xyz\r\n"
-                   "NaN\r\n",
-                   &out);
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
-}
-
-TEST(ServerRequestParsingTest, ChunkLengthTooHighInRequest) {
-  std::string out;
-
-  test_raw_request("PUT /put_hi HTTP/1.1\r\n"
-                   "Content-Type: text/plain\r\n"
-                   "Transfer-Encoding: chunked\r\n"
-                   "\r\n"
-                   // Length is too large for 64 bits.
-                   "1ffffffffffffffff\r\n"
-                   "xyz\r\n",
-                   &out);
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
-}
-
-TEST(ServerRequestParsingTest, InvalidHeaderTextWithExtraCR) {
-  test_raw_request("GET /hi HTTP/1.1\r\n"
-                   "Content-Type: text/plain\r\n\r");
-}
-
-TEST(ServerRequestParsingTest, InvalidSpaceInURL) {
-  std::string out;
-  test_raw_request("GET /h i HTTP/1.1\r\n\r\n", &out);
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
-}
-
-TEST(ServerRequestParsingTest, InvalidFieldValueContains_CR_LF_NUL) {
-  std::string out;
-  std::string request(
-      "GET /header_field_value_check HTTP/1.1\r\nTest: [\r\x00\n]\r\n\r\n", 55);
-  test_raw_request(request, &out);
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
-}
-
-TEST(ServerRequestParsingTest, InvalidFieldValueContains_LF) {
-  std::string out;
-  std::string request(
-      "GET /header_field_value_check HTTP/1.1\r\nTest: [\n\n\n]\r\n\r\n", 55);
-  test_raw_request(request, &out);
-  EXPECT_EQ("HTTP/1.1 400 Bad Request", out.substr(0, 24));
-}
-
-TEST(ServerRequestParsingTest, EmptyFieldValue) {
-  std::string out;
-
-  test_raw_request("GET /header_field_value_check HTTP/1.1\r\n"
-                   "Test: \r\n\r\n",
-                   &out);
-  EXPECT_EQ("HTTP/1.1 200 OK", out.substr(0, 15));
-}
-
-TEST(ServerStopTest, StopServerWithChunkedTransmission) {
-  Server svr;
-
-  svr.Get("/events", [](const Request & /*req*/, Response &res) {
-    res.set_header("Cache-Control", "no-cache");
-    res.set_chunked_content_provider(
-        "text/event-stream", [](size_t offset, DataSink &sink) {
-          std::string s = "data:";
-          s += std::to_string(offset);
-          s += "\n\n";
-          auto ret = sink.write(s.data(), s.size());
-          EXPECT_TRUE(ret);
-          std::this_thread::sleep_for(std::chrono::seconds(1));
-          return true;
-        });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  svr.wait_until_ready();
-
-  Client client(HOST, PORT);
-  const Headers headers = {{"Accept", "text/event-stream"}};
-
-  auto get_thread = std::thread([&client, &headers]() {
-    auto res = client.Get(
-        "/events", headers,
-        [](const char * /*data*/, size_t /*len*/) -> bool { return true; });
-  });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    get_thread.join();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(2));
-}
-
-TEST(ServerStopTest, ClientAccessAfterServerDown) {
-  httplib::Server svr;
-  svr.Post("/hi",
-           [&](const httplib::Request & /*req*/, httplib::Response &res) {
-             res.status = StatusCode::OK_200;
-           });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-
-  auto res = cli.Post("/hi", "data", "text/plain");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
-
-  res = cli.Post("/hi", "data", "text/plain");
-  ASSERT_FALSE(res);
-}
-
-TEST(ServerStopTest, ListenFailure) {
-  Server svr;
-  auto t = thread([&]() {
-    auto ret = svr.listen("????", PORT);
-    EXPECT_FALSE(ret);
-  });
-  svr.wait_until_ready();
-  svr.stop();
-  t.join();
-}
-
-TEST(ServerStopTest, Decommision) {
-  Server svr;
-
-  svr.Get("/hi", [&](const Request &, Response &res) { res.body = "hi..."; });
-
-  for (int i = 0; i < 4; i++) {
-    auto is_even = !(i % 2);
-
-    std::thread t{[&] {
-      try {
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-        if (is_even) {
-          throw std::runtime_error("Some thing that happens to go wrong.");
-        }
-
-        svr.listen(HOST, PORT);
-      } catch (...) { svr.decommission(); }
-    }};
-
-    svr.wait_until_ready();
-
-    // Server is up
-    {
-      Client cli(HOST, PORT);
-      auto res = cli.Get("/hi");
-      if (is_even) {
-        EXPECT_FALSE(res);
-      } else {
-        EXPECT_TRUE(res);
-        EXPECT_EQ("hi...", res->body);
-      }
-    }
-
-    svr.stop();
-    t.join();
-
-    // Server is down...
-    {
-      Client cli(HOST, PORT);
-      auto res = cli.Get("/hi");
-      EXPECT_FALSE(res);
-    }
-  }
-}
-
-TEST(StreamingTest, NoContentLengthStreaming) {
-  Server svr;
-
-  svr.Get("/stream", [](const Request & /*req*/, Response &res) {
-    res.set_content_provider("text/plain", [](size_t offset, DataSink &sink) {
-      if (offset < 6) {
-        sink.os << (offset < 3 ? "a" : "b");
-      } else {
-        sink.done();
-      }
-      return true;
-    });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto listen_se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client client(HOST, PORT);
-
-  auto get_thread = std::thread([&client]() {
-    std::string s;
-    auto res =
-        client.Get("/stream", [&s](const char *data, size_t len) -> bool {
-          s += std::string(data, len);
-          return true;
-        });
-    EXPECT_EQ("aaabbb", s);
-  });
-  auto get_se = detail::scope_exit([&] { get_thread.join(); });
-
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::milliseconds(500));
-}
-
-TEST(MountTest, Unmount) {
-  Server svr;
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  svr.set_mount_point("/mount2", "./www2");
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-
-  res = cli.Get("/mount2/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-
-  svr.set_mount_point("/", "./www");
-
-  res = cli.Get("/dir/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-
-  svr.remove_mount_point("/");
-  res = cli.Get("/dir/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-
-  svr.remove_mount_point("/mount2");
-  res = cli.Get("/mount2/dir/test.html");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-}
-
-TEST(MountTest, Redicect) {
-  Server svr;
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.set_mount_point("/", "./www");
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  auto res = cli.Get("/dir/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-
-  res = cli.Get("/dir");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
-
-  res = cli.Get("/file");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-
-  res = cli.Get("/file/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-
-  cli.set_follow_location(true);
-  res = cli.Get("/dir");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(MountTest, MultibytesPathName) {
-  Server svr;
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.set_mount_point("/", "./www");
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  auto res = cli.Get(u8"/日本語Dir/日本語File.txt");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(u8"日本語コンテンツ", res->body);
-}
-
-TEST(KeepAliveTest, ReadTimeout) {
-  Server svr;
-
-  svr.Get("/a", [&](const Request & /*req*/, Response &res) {
-    std::this_thread::sleep_for(std::chrono::seconds(2));
-    res.set_content("a", "text/plain");
-  });
-
-  svr.Get("/b", [&](const Request & /*req*/, Response &res) {
-    res.set_content("b", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-  cli.set_keep_alive(true);
-  cli.set_read_timeout(std::chrono::seconds(1));
-
-  auto resa = cli.Get("/a");
-  ASSERT_FALSE(resa);
-  EXPECT_EQ(Error::Read, resa.error());
-
-  auto resb = cli.Get("/b");
-  ASSERT_TRUE(resb);
-  EXPECT_EQ(StatusCode::OK_200, resb->status);
-  EXPECT_EQ("b", resb->body);
-}
-
-TEST(KeepAliveTest, Issue1041) {
-  Server svr;
-  svr.set_keep_alive_timeout(3);
-
-  svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.set_keep_alive(true);
-
-  auto result = cli.Get("/hi");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(StatusCode::OK_200, result->status);
-
-  std::this_thread::sleep_for(std::chrono::seconds(5));
-
-  result = cli.Get("/hi");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(StatusCode::OK_200, result->status);
-}
-
-TEST(KeepAliveTest, Issue1959) {
-  Server svr;
-  svr.set_keep_alive_timeout(5);
-
-  svr.Get("/a", [&](const Request & /*req*/, Response &res) {
-    res.set_content("a", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    if (!svr.is_running()) return;
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-  cli.set_keep_alive(true);
-
-  using namespace std::chrono;
-  auto start = steady_clock::now();
-
-  cli.Get("/a");
-
-  svr.stop();
-  listen_thread.join();
-
-  auto end = steady_clock::now();
-  auto elapsed = duration_cast<milliseconds>(end - start).count();
-
-  EXPECT_LT(elapsed, 5000);
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(KeepAliveTest, SSLClientReconnection) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(svr.is_valid());
-  svr.set_keep_alive_timeout(1);
-
-  svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT);
-  cli.enable_server_certificate_verification(false);
-  cli.set_keep_alive(true);
-
-  auto result = cli.Get("/hi");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(StatusCode::OK_200, result->status);
-
-  result = cli.Get("/hi");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(StatusCode::OK_200, result->status);
-
-  std::this_thread::sleep_for(std::chrono::seconds(2));
-
-  // Recoonect
-  result = cli.Get("/hi");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(StatusCode::OK_200, result->status);
-
-  result = cli.Get("/hi");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(StatusCode::OK_200, result->status);
-}
-
-TEST(KeepAliveTest, SSLClientReconnectionPost) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(svr.is_valid());
-  svr.set_keep_alive_timeout(1);
-  std::string content = "reconnect";
-
-  svr.Post("/hi", [](const httplib::Request &, httplib::Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT);
-  cli.enable_server_certificate_verification(false);
-  cli.set_keep_alive(true);
-
-  auto result = cli.Post(
-      "/hi", content.size(),
-      [&content](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        sink.write(content.c_str(), content.size());
-        return true;
-      },
-      "text/plain");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(200, result->status);
-
-  std::this_thread::sleep_for(std::chrono::seconds(2));
-
-  // Recoonect
-  result = cli.Post(
-      "/hi", content.size(),
-      [&content](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        sink.write(content.c_str(), content.size());
-        return true;
-      },
-      "text/plain");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(200, result->status);
-
-  result = cli.Post(
-      "/hi", content.size(),
-      [&content](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        sink.write(content.c_str(), content.size());
-        return true;
-      },
-      "text/plain");
-  ASSERT_TRUE(result);
-  EXPECT_EQ(200, result->status);
-}
-#endif
-
-TEST(ClientProblemDetectionTest, ContentProvider) {
-  Server svr;
-
-  size_t content_length = 1024 * 1024;
-
-  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
-    res.set_content_provider(
-        content_length, "text/plain",
-        [&](size_t offset, size_t length, DataSink &sink) {
-          auto out_len = std::min(length, static_cast<size_t>(1024));
-          std::string out(out_len, '@');
-          sink.write(out.data(), out_len);
-          return offset < 4096;
-        },
-        [](bool success) { ASSERT_FALSE(success); });
-  });
-
-  svr.Get("/empty", [&](const Request & /*req*/, Response &res) {
-    res.set_content_provider(
-        0, "text/plain",
-        [&](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) -> bool {
-          EXPECT_TRUE(false);
-          return true;
-        },
-        [](bool success) { ASSERT_FALSE(success); });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  {
-    auto res = cli.Get("/hi", [&](const char * /*data*/,
-                                  size_t /*data_length*/) { return false; });
-    ASSERT_FALSE(res);
-  }
-
-  {
-    auto res = cli.Get("/empty", [&](const char * /*data*/,
-                                     size_t /*data_length*/) { return false; });
-    ASSERT_TRUE(res);
-  }
-}
-
-TEST(ErrorHandlerWithContentProviderTest, ErrorHandler) {
-  Server svr;
-
-  svr.set_error_handler([](Request const &, Response &res) -> void {
-    res.set_chunked_content_provider(
-        "text/plain", [](std::size_t const, DataSink &sink) -> bool {
-          sink.os << "hello";
-          sink.os << "world";
-          sink.done();
-          return true;
-        });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::NotFound_404, res->status);
-  EXPECT_EQ("helloworld", res->body);
-}
-
-TEST(LongPollingTest, ClientCloseDetection) {
-  Server svr;
-
-  svr.Get("/events", [&](const Request & /*req*/, Response &res) {
-    res.set_chunked_content_provider(
-        "text/plain", [](std::size_t const, DataSink &sink) -> bool {
-          EXPECT_TRUE(sink.is_writable()); // the socket is alive
-          sink.os << "hello";
-
-          auto count = 10;
-          while (count > 0 && sink.is_writable()) {
-            this_thread::sleep_for(chrono::milliseconds(10));
-            count--;
-          }
-          EXPECT_FALSE(sink.is_writable()); // the socket is closed
-          return true;
-        });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  auto res = cli.Get("/events", [&](const char *data, size_t data_length) {
-    EXPECT_EQ("hello", string(data, data_length));
-    return false; // close the socket immediately.
-  });
-
-  ASSERT_FALSE(res);
-}
-
-TEST(GetWithParametersTest, GetWithParameters) {
-  Server svr;
-
-  svr.Get("/", [&](const Request &req, Response &) {
-    EXPECT_EQ("world", req.get_param_value("hello"));
-    EXPECT_EQ("world2", req.get_param_value("hello2"));
-    EXPECT_EQ("world3", req.get_param_value("hello3"));
-  });
-
-  svr.Get("/params", [&](const Request &req, Response &) {
-    EXPECT_EQ("world", req.get_param_value("hello"));
-    EXPECT_EQ("world2", req.get_param_value("hello2"));
-    EXPECT_EQ("world3", req.get_param_value("hello3"));
-  });
-
-  svr.Get(R"(/resources/([a-z0-9\\-]+))", [&](const Request &req, Response &) {
-    EXPECT_EQ("resource-id", req.matches[1]);
-    EXPECT_EQ("foo", req.get_param_value("param1"));
-    EXPECT_EQ("bar", req.get_param_value("param2"));
-  });
-
-  svr.Get("/users/:id", [&](const Request &req, Response &) {
-    EXPECT_EQ("user-id", req.path_params.at("id"));
-    EXPECT_EQ("foo", req.get_param_value("param1"));
-    EXPECT_EQ("bar", req.get_param_value("param2"));
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-
-    Params params;
-    params.emplace("hello", "world");
-    params.emplace("hello2", "world2");
-    params.emplace("hello3", "world3");
-    auto res = cli.Get("/", params, Headers{});
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/params?hello=world&hello2=world2&hello3=world3");
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/resources/resource-id?param1=foo&param2=bar");
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    Client cli(HOST, PORT);
-
-    auto res = cli.Get("/users/user-id?param1=foo&param2=bar");
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-}
-
-TEST(GetWithParametersTest, GetWithParameters2) {
-  Server svr;
-
-  svr.Get("/", [&](const Request &req, Response &res) {
-    auto text = req.get_param_value("hello");
-    res.set_content(text, "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  Params params;
-  params.emplace("hello", "world");
-
-  std::string body;
-  auto res = cli.Get("/", params, Headers{},
-                     [&](const char *data, size_t data_length) {
-                       body.append(data, data_length);
-                       return true;
-                     });
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("world", body);
-}
-
-TEST(ClientDefaultHeadersTest, DefaultHeaders_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/range/32"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/range/32"};
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli(host);
-#else
-  Client cli(host);
-#endif
-
-  cli.set_default_headers({make_range_header({{1, 10}})});
-  cli.set_connection_timeout(5);
-
-  {
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("bcdefghijk", res->body);
-    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  }
-
-  {
-    auto res = cli.Get(path);
-    ASSERT_TRUE(res);
-    EXPECT_EQ("bcdefghijk", res->body);
-    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
-  }
-}
-
-TEST(ServerDefaultHeadersTest, DefaultHeaders) {
-  Server svr;
-  svr.set_default_headers({{"Hello", "World"}});
-
-  svr.Get("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content("ok", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli("localhost", PORT);
-
-  auto res = cli.Get("/");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("ok", res->body);
-  EXPECT_EQ("World", res->get_header_value("Hello"));
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(KeepAliveTest, ReadTimeoutSSL) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/a", [&](const Request & /*req*/, Response &res) {
-    std::this_thread::sleep_for(std::chrono::seconds(2));
-    res.set_content("a", "text/plain");
-  });
-
-  svr.Get("/b", [&](const Request & /*req*/, Response &res) {
-    res.set_content("b", "text/plain");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli("localhost", PORT);
-  cli.enable_server_certificate_verification(false);
-  cli.set_keep_alive(true);
-  cli.set_read_timeout(std::chrono::seconds(1));
-
-  auto resa = cli.Get("/a");
-  ASSERT_TRUE(!resa);
-  EXPECT_EQ(Error::Read, resa.error());
-
-  auto resb = cli.Get("/b");
-  ASSERT_TRUE(resb);
-  EXPECT_EQ(StatusCode::OK_200, resb->status);
-  EXPECT_EQ("b", resb->body);
-}
-#endif
-
-class ServerTestWithAI_PASSIVE : public ::testing::Test {
-protected:
-  ServerTestWithAI_PASSIVE()
-      : cli_(HOST, PORT)
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-        ,
-        svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE)
-#endif
-  {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    cli_.enable_server_certificate_verification(false);
-#endif
-  }
-
-  virtual void SetUp() {
-    svr_.Get("/hi", [&](const Request & /*req*/, Response &res) {
-      res.set_content("Hello World!", "text/plain");
-    });
-
-    t_ = thread(
-        [&]() { ASSERT_TRUE(svr_.listen(std::string(), PORT, AI_PASSIVE)); });
-
-    svr_.wait_until_ready();
-  }
-
-  virtual void TearDown() {
-    svr_.stop();
-    t_.join();
-  }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli_;
-  SSLServer svr_;
-#else
-  Client cli_;
-  Server svr_;
-#endif
-  thread t_;
-};
-
-TEST_F(ServerTestWithAI_PASSIVE, GetMethod200) {
-  auto res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_EQ("Hello World!", res->body);
-}
-
-class ServerUpDownTest : public ::testing::Test {
-protected:
-  ServerUpDownTest() : cli_(HOST, PORT) {}
-
-  virtual void SetUp() {
-    t_ = thread([&]() {
-      svr_.bind_to_any_port(HOST);
-      std::this_thread::sleep_for(std::chrono::milliseconds(500));
-      ASSERT_TRUE(svr_.listen_after_bind());
-    });
-
-    svr_.wait_until_ready();
-  }
-
-  virtual void TearDown() {
-    svr_.stop();
-    t_.join();
-  }
-
-  Client cli_;
-  Server svr_;
-  thread t_;
-};
-
-TEST_F(ServerUpDownTest, QuickStartStop) {
-  // Should not crash, especially when run with
-  // --gtest_filter=ServerUpDownTest.QuickStartStop --gtest_repeat=1000
-}
-
-class PayloadMaxLengthTest : public ::testing::Test {
-protected:
-  PayloadMaxLengthTest()
-      : cli_(HOST, PORT)
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-        ,
-        svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE)
-#endif
-  {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    cli_.enable_server_certificate_verification(false);
-#endif
-  }
-
-  virtual void SetUp() {
-    svr_.set_payload_max_length(8);
-
-    svr_.Post("/test", [&](const Request & /*req*/, Response &res) {
-      res.set_content("test", "text/plain");
-    });
-
-    t_ = thread([&]() { ASSERT_TRUE(svr_.listen(HOST, PORT)); });
-
-    svr_.wait_until_ready();
-  }
-
-  virtual void TearDown() {
-    svr_.stop();
-    t_.join();
-  }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  SSLClient cli_;
-  SSLServer svr_;
-#else
-  Client cli_;
-  Server svr_;
-#endif
-  thread t_;
-};
-
-TEST_F(PayloadMaxLengthTest, ExceedLimit) {
-  auto res = cli_.Post("/test", "123456789", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::PayloadTooLarge_413, res->status);
-
-  res = cli_.Post("/test", "12345678", "text/plain");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(HostAndPortPropertiesTest, NoSSL) {
-  httplib::Client cli("www.google.com", 1234);
-  ASSERT_EQ("www.google.com", cli.host());
-  ASSERT_EQ(1234, cli.port());
-}
-
-TEST(HostAndPortPropertiesTest, NoSSLWithSimpleAPI) {
-  httplib::Client cli("www.google.com:1234");
-  ASSERT_EQ("www.google.com", cli.host());
-  ASSERT_EQ(1234, cli.port());
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(HostAndPortPropertiesTest, SSL) {
-  httplib::SSLClient cli("www.google.com");
-  ASSERT_EQ("www.google.com", cli.host());
-  ASSERT_EQ(443, cli.port());
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(SSLClientTest, UpdateCAStore) {
-  httplib::SSLClient httplib_client("www.google.com");
-  auto ca_store_1 = X509_STORE_new();
-  X509_STORE_load_locations(ca_store_1, "/etc/ssl/certs/ca-certificates.crt",
-                            nullptr);
-  httplib_client.set_ca_cert_store(ca_store_1);
-
-  auto ca_store_2 = X509_STORE_new();
-  X509_STORE_load_locations(ca_store_2, "/etc/ssl/certs/ca-certificates.crt",
-                            nullptr);
-  httplib_client.set_ca_cert_store(ca_store_2);
-}
-
-TEST(SSLClientTest, ServerNameIndication_Online) {
-#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
-  auto host = "httpbin.org";
-  auto path = std::string{"/get"};
-#else
-  auto host = "nghttp2.org";
-  auto path = std::string{"/httpbin/get"};
-#endif
-
-  SSLClient cli(host, 443);
-  auto res = cli.Get(path);
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(SSLClientTest, ServerCertificateVerification1_Online) {
-  Client cli("https://google.com");
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
-}
-
-TEST(SSLClientTest, ServerCertificateVerification2_Online) {
-  SSLClient cli("google.com");
-  cli.enable_server_certificate_verification(true);
-  cli.set_ca_cert_path("hello");
-  auto res = cli.Get("/");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::SSLLoadingCerts, res.error());
-}
-
-TEST(SSLClientTest, ServerCertificateVerification3_Online) {
-  SSLClient cli("google.com");
-  cli.set_ca_cert_path(CA_CERT_FILE);
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
-}
-
-TEST(SSLClientTest, ServerCertificateVerification4) {
-  SSLServer svr(SERVER_CERT2_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &, Response &res) {
-    res.set_content("test", "text/plain");
-    svr.stop();
-    ASSERT_TRUE(true);
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen("127.0.0.1", PORT)); });
-  auto se = detail::scope_exit([&] {
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli("127.0.0.1", PORT);
-  cli.set_ca_cert_path(SERVER_CERT2_FILE);
-  cli.enable_server_certificate_verification(true);
-  cli.set_connection_timeout(30);
-
-  auto res = cli.Get("/test");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(SSLClientTest, ServerCertificateVerification5_Online) {
-  std::string cert;
-  detail::read_file(CA_CERT_FILE, cert);
-
-  SSLClient cli("google.com");
-  cli.load_ca_cert_store(cert.data(), cert.size());
-  const auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
-}
-
-TEST(SSLClientTest, ServerCertificateVerification6_Online) {
-  // clang-format off
-  static constexpr char cert[] =
-    "GlobalSign Root CA\n"
-    "==================\n"
-    "-----BEGIN CERTIFICATE-----\n"
-    "MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx\n"
-    "GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds\n"
-    "b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV\n"
-    "BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD\n"
-    "VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa\n"
-    "DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc\n"
-    "THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb\n"
-    "Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP\n"
-    "c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX\n"
-    "gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\n"
-    "HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF\n"
-    "AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj\n"
-    "Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG\n"
-    "j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH\n"
-    "hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC\n"
-    "X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\n"
-    "-----END CERTIFICATE-----\n";
-  // clang-format on
-
-  SSLClient cli("google.com");
-  cli.load_ca_cert_store(cert, sizeof(cert));
-  const auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
-}
-
-TEST(SSLClientTest, WildcardHostNameMatch_Online) {
-  SSLClient cli("www.youtube.com");
-
-  cli.set_ca_cert_path(CA_CERT_FILE);
-  cli.enable_server_certificate_verification(true);
-  cli.set_follow_location(true);
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(SSLClientTest, Issue2004_Online) {
-  Client client("https://google.com");
-  client.set_follow_location(true);
-
-  auto res = client.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-
-  auto body = res->body;
-  EXPECT_EQ(body.substr(0, 15), "<!doctype html>");
-}
-
-#if 0
-TEST(SSLClientTest, SetInterfaceWithINET6) {
-  auto cli = std::make_shared<httplib::Client>("https://httpbin.org");
-  ASSERT_TRUE(cli != nullptr);
-
-  cli->set_address_family(AF_INET6);
-  cli->set_interface("en0");
-
-  auto res = cli->Get("/get");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-#endif
-
-void ClientCertPresent(
-    const std::string &client_cert_file,
-    const std::string &client_private_key_file,
-    const std::string &client_encrypted_private_key_pass = std::string()) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
-                CLIENT_CA_CERT_DIR);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &req, Response &res) {
-    res.set_content("test", "text/plain");
-
-    auto peer_cert = SSL_get_peer_certificate(req.ssl);
-    ASSERT_TRUE(peer_cert != nullptr);
-
-    auto subject_name = X509_get_subject_name(peer_cert);
-    ASSERT_TRUE(subject_name != nullptr);
-
-    std::string common_name;
-    {
-      char name[BUFSIZ];
-      auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
-                                                name, sizeof(name));
-      common_name.assign(name, static_cast<size_t>(name_len));
-    }
-
-    EXPECT_EQ("Common Name", common_name);
-
-    X509_free(peer_cert);
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT, client_cert_file, client_private_key_file,
-                client_encrypted_private_key_pass);
-  cli.enable_server_certificate_verification(false);
-  cli.set_connection_timeout(30);
-
-  auto res = cli.Get("/test");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(SSLClientServerTest, ClientCertPresent) {
-  ClientCertPresent(CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
-}
-
-TEST(SSLClientServerTest, ClientEncryptedCertPresent) {
-  ClientCertPresent(CLIENT_ENCRYPTED_CERT_FILE,
-                    CLIENT_ENCRYPTED_PRIVATE_KEY_FILE,
-                    CLIENT_ENCRYPTED_PRIVATE_KEY_PASS);
-}
-
-#if !defined(_WIN32) || defined(OPENSSL_USE_APPLINK)
-void MemoryClientCertPresent(
-    const std::string &client_cert_file,
-    const std::string &client_private_key_file,
-    const std::string &client_encrypted_private_key_pass = std::string()) {
-  auto f = fopen(SERVER_CERT_FILE, "r+");
-  auto server_cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
-  fclose(f);
-
-  f = fopen(SERVER_PRIVATE_KEY_FILE, "r+");
-  auto server_private_key = PEM_read_PrivateKey(f, nullptr, nullptr, nullptr);
-  fclose(f);
-
-  f = fopen(CLIENT_CA_CERT_FILE, "r+");
-  auto client_cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
-  auto client_ca_cert_store = X509_STORE_new();
-  X509_STORE_add_cert(client_ca_cert_store, client_cert);
-  X509_free(client_cert);
-  fclose(f);
-
-  f = fopen(client_cert_file.c_str(), "r+");
-  client_cert = PEM_read_X509(f, nullptr, nullptr, nullptr);
-  fclose(f);
-
-  f = fopen(client_private_key_file.c_str(), "r+");
-  auto client_private_key = PEM_read_PrivateKey(
-      f, nullptr, nullptr, (void *)client_encrypted_private_key_pass.c_str());
-  fclose(f);
-
-  SSLServer svr(server_cert, server_private_key, client_ca_cert_store);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &req, Response &res) {
-    res.set_content("test", "text/plain");
-
-    auto peer_cert = SSL_get_peer_certificate(req.ssl);
-    ASSERT_TRUE(peer_cert != nullptr);
-
-    auto subject_name = X509_get_subject_name(peer_cert);
-    ASSERT_TRUE(subject_name != nullptr);
-
-    std::string common_name;
-    {
-      char name[BUFSIZ];
-      auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
-                                                name, sizeof(name));
-      common_name.assign(name, static_cast<size_t>(name_len));
-    }
-
-    EXPECT_EQ("Common Name", common_name);
-
-    X509_free(peer_cert);
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT, client_cert, client_private_key,
-                client_encrypted_private_key_pass);
-  cli.enable_server_certificate_verification(false);
-  cli.set_connection_timeout(30);
-
-  auto res = cli.Get("/test");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-
-  X509_free(server_cert);
-  EVP_PKEY_free(server_private_key);
-  X509_free(client_cert);
-  EVP_PKEY_free(client_private_key);
-}
-
-TEST(SSLClientServerTest, MemoryClientCertPresent) {
-  MemoryClientCertPresent(CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
-}
-
-TEST(SSLClientServerTest, MemoryClientEncryptedCertPresent) {
-  MemoryClientCertPresent(CLIENT_ENCRYPTED_CERT_FILE,
-                          CLIENT_ENCRYPTED_PRIVATE_KEY_FILE,
-                          CLIENT_ENCRYPTED_PRIVATE_KEY_PASS);
-}
-#endif
-
-TEST(SSLClientServerTest, ClientCertMissing) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
-                CLIENT_CA_CERT_DIR);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &, Response &) { ASSERT_TRUE(false); });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT);
-  auto res = cli.Get("/test");
-  cli.set_connection_timeout(30);
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::SSLServerVerification, res.error());
-}
-
-TEST(SSLClientServerTest, TrustDirOptional) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &, Response &res) {
-    res.set_content("test", "text/plain");
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
-  cli.enable_server_certificate_verification(false);
-  cli.set_connection_timeout(30);
-
-  auto res = cli.Get("/test");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(SSLClientServerTest, SSLConnectTimeout) {
-  class NoListenSSLServer : public SSLServer {
-  public:
-    NoListenSSLServer(const char *cert_path, const char *private_key_path,
-                      const char *client_ca_cert_file_path,
-                      const char *client_ca_cert_dir_path = nullptr)
-        : SSLServer(cert_path, private_key_path, client_ca_cert_file_path,
-                    client_ca_cert_dir_path),
-          stop_(false) {}
-
-    std::atomic_bool stop_;
-
-  private:
-    bool process_and_close_socket(socket_t /*sock*/) override {
-      // Don't create SSL context
-      while (!stop_.load()) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-      }
-      return true;
-    }
-  };
-  NoListenSSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE,
-                        CLIENT_CA_CERT_FILE);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &, Response &res) {
-    res.set_content("test", "text/plain");
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  auto se = detail::scope_exit([&] {
-    svr.stop_ = true;
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
-  cli.enable_server_certificate_verification(false);
-  cli.set_connection_timeout(1);
-
-  auto res = cli.Get("/test");
-  ASSERT_TRUE(!res);
-  EXPECT_EQ(Error::SSLConnection, res.error());
-}
-
-TEST(SSLClientServerTest, CustomizeServerSSLCtx) {
-  auto setup_ssl_ctx_callback = [](SSL_CTX &ssl_ctx) {
-    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_COMPRESSION);
-    SSL_CTX_set_options(&ssl_ctx,
-                        SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_SSLv2);
-    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_SSLv3);
-    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_TLSv1);
-    SSL_CTX_set_options(&ssl_ctx, SSL_OP_NO_TLSv1_1);
-    auto ciphers = "ECDHE-RSA-AES128-SHA256:"
-                   "ECDHE-DSS-AES128-SHA256:"
-                   "ECDHE-RSA-AES256-SHA256:"
-                   "ECDHE-DSS-AES256-SHA256:";
-    SSL_CTX_set_cipher_list(&ssl_ctx, ciphers);
-    if (SSL_CTX_use_certificate_chain_file(&ssl_ctx, SERVER_CERT_FILE) != 1 ||
-        SSL_CTX_use_PrivateKey_file(&ssl_ctx, SERVER_PRIVATE_KEY_FILE,
-                                    SSL_FILETYPE_PEM) != 1) {
-      return false;
-    }
-    SSL_CTX_load_verify_locations(&ssl_ctx, CLIENT_CA_CERT_FILE,
-                                  CLIENT_CA_CERT_DIR);
-    SSL_CTX_set_verify(
-        &ssl_ctx,
-        SSL_VERIFY_PEER |
-            SSL_VERIFY_FAIL_IF_NO_PEER_CERT, // SSL_VERIFY_CLIENT_ONCE,
-        nullptr);
-    return true;
-  };
-
-  SSLServer svr(setup_ssl_ctx_callback);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Get("/test", [&](const Request &req, Response &res) {
-    res.set_content("test", "text/plain");
-
-    auto peer_cert = SSL_get_peer_certificate(req.ssl);
-    ASSERT_TRUE(peer_cert != nullptr);
-
-    auto subject_name = X509_get_subject_name(peer_cert);
-    ASSERT_TRUE(subject_name != nullptr);
-
-    std::string common_name;
-    {
-      char name[BUFSIZ];
-      auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
-                                                name, sizeof(name));
-      common_name.assign(name, static_cast<size_t>(name_len));
-    }
-
-    EXPECT_EQ("Common Name", common_name);
-
-    X509_free(peer_cert);
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
-  cli.enable_server_certificate_verification(false);
-  cli.set_connection_timeout(30);
-
-  auto res = cli.Get("/test");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-// Disabled due to the out-of-memory problem on GitHub Actions Workflows
-TEST(SSLClientServerTest, DISABLED_LargeDataTransfer) {
-
-  // prepare large data
-  std::random_device seed_gen;
-  std::mt19937 random(seed_gen());
-  constexpr auto large_size_byte = 2147483648UL + 1048576UL; // 2GiB + 1MiB
-  std::vector<std::uint32_t> binary(large_size_byte / sizeof(std::uint32_t));
-  std::generate(binary.begin(), binary.end(), [&random]() { return random(); });
-
-  // server
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(svr.is_valid());
-
-  svr.Post("/binary", [&](const Request &req, Response &res) {
-    EXPECT_EQ(large_size_byte, req.body.size());
-    EXPECT_EQ(0, std::memcmp(binary.data(), req.body.data(), large_size_byte));
-    res.set_content(req.body, "application/octet-stream");
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  // client POST
-  SSLClient cli("localhost", PORT);
-  cli.enable_server_certificate_verification(false);
-  cli.set_read_timeout(std::chrono::seconds(100));
-  cli.set_write_timeout(std::chrono::seconds(100));
-  auto res = cli.Post("/binary", reinterpret_cast<char *>(binary.data()),
-                      large_size_byte, "application/octet-stream");
-
-  // compare
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(large_size_byte, res->body.size());
-  EXPECT_EQ(0, std::memcmp(binary.data(), res->body.data(), large_size_byte));
-}
-#endif
-
-#ifdef _WIN32
-TEST(CleanupTest, WSACleanup) {
-  int ret = WSACleanup();
-  ASSERT_EQ(0, ret);
-}
-#endif
-
-#ifndef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(NoSSLSupport, SimpleInterface) {
-  ASSERT_ANY_THROW(Client cli("https://yahoo.com"));
-}
-#endif
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-TEST(InvalidScheme, SimpleInterface) {
-  ASSERT_ANY_THROW(Client cli("scheme://yahoo.com"));
-}
-#endif
-
-TEST(NoScheme, SimpleInterface) {
-  Client cli("yahoo.com:80");
-  ASSERT_TRUE(cli.is_valid());
-}
-
-TEST(SendAPI, SimpleInterface_Online) {
-  Client cli("http://yahoo.com");
-
-  Request req;
-  req.method = "GET";
-  req.path = "/";
-  auto res = cli.send(req);
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
-}
-
-TEST(SendAPI, WithParamsInRequest) {
-  Server svr;
-
-  svr.Get("/", [&](const Request &req, Response & /*res*/) {
-    EXPECT_TRUE(req.has_param("test"));
-    EXPECT_EQ("test_value", req.get_param_value("test"));
-  });
-
-  auto t = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-
-  {
-    Request req;
-    req.method = "GET";
-    req.path = "/";
-    req.params.emplace("test", "test_value");
-    auto res = cli.send(req);
-    ASSERT_TRUE(res);
-  }
-  {
-    auto res = cli.Get("/", {{"test", "test_value"}}, Headers{});
-    ASSERT_TRUE(res);
-  }
-}
-
-TEST(ClientImplMethods, GetSocketTest) {
-  httplib::Server svr;
-  svr.Get("/", [&](const httplib::Request & /*req*/, httplib::Response &res) {
-    res.status = StatusCode::OK_200;
-  });
-
-  auto thread = std::thread([&]() { svr.listen("127.0.0.1", 3333); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    httplib::Client cli("http://127.0.0.1:3333");
-    cli.set_keep_alive(true);
-
-    // Use the behavior of cpp-httplib of opening the connection
-    // only when the first request happens. If that changes,
-    // this test would be obsolete.
-
-    EXPECT_EQ(cli.socket(), INVALID_SOCKET);
-
-    // This also implicitly tests the server. But other tests would fail much
-    // earlier than this one to be considered.
-
-    auto res = cli.Get("/");
-    ASSERT_TRUE(res);
-
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    ASSERT_TRUE(cli.socket() != INVALID_SOCKET);
-  }
-}
-
-// Disabled due to out-of-memory problem on GitHub Actions
-#ifdef _WIN64
-TEST(ServerLargeContentTest, DISABLED_SendLargeContent) {
-  // allocate content size larger than 2GB in memory
-  const size_t content_size = 2LL * 1024LL * 1024LL * 1024LL + 1LL;
-  char *content = (char *)malloc(content_size);
-  ASSERT_TRUE(content);
-
-  Server svr;
-  svr.Get("/foo",
-          [=](const httplib::Request & /*req*/, httplib::Response &res) {
-            res.set_content(content, content_size, "application/octet-stream");
-          });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    if (content) free(content);
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  auto res = cli.Get("/foo");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(content_size, res->body.length());
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(YahooRedirectTest2, SimpleInterface_Online) {
-  Client cli("http://yahoo.com");
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
-
-  cli.set_follow_location(true);
-  res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("https://www.yahoo.com/", res->location);
-}
-
-TEST(YahooRedirectTest3, SimpleInterface_Online) {
-  Client cli("https://yahoo.com");
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
-
-  cli.set_follow_location(true);
-  res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("https://www.yahoo.com/", res->location);
-}
-
-TEST(YahooRedirectTest3, NewResultInterface_Online) {
-  Client cli("https://yahoo.com");
-
-  auto res = cli.Get("/");
-  ASSERT_TRUE(res);
-  ASSERT_FALSE(!res);
-  ASSERT_TRUE(res);
-  ASSERT_FALSE(res == nullptr);
-  ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(Error::Success, res.error());
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res.value().status);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, (*res).status);
-  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
-
-  cli.set_follow_location(true);
-  res = cli.Get("/");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(Error::Success, res.error());
-  EXPECT_EQ(StatusCode::OK_200, res.value().status);
-  EXPECT_EQ(StatusCode::OK_200, (*res).status);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ("https://www.yahoo.com/", res->location);
-}
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-TEST(DecodeWithChunkedEncoding, BrotliEncoding_Online) {
-  Client cli("https://cdnjs.cloudflare.com");
-  auto res =
-      cli.Get("/ajax/libs/jquery/3.5.1/jquery.js", {{"Accept-Encoding", "br"}});
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-  EXPECT_EQ(287630U, res->body.size());
-  EXPECT_EQ("application/javascript; charset=utf-8",
-            res->get_header_value("Content-Type"));
-}
-#endif
-
-TEST(HttpsToHttpRedirectTest, SimpleInterface_Online) {
-  Client cli("https://nghttp2.org");
-  cli.set_follow_location(true);
-  auto res =
-      cli.Get("/httpbin/"
-              "redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302");
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(HttpsToHttpRedirectTest2, SimpleInterface_Online) {
-  Client cli("https://nghttp2.org");
-  cli.set_follow_location(true);
-
-  Params params;
-  params.emplace("url", "http://www.google.com");
-  params.emplace("status_code", "302");
-
-  auto res = cli.Get("/httpbin/redirect-to", params, Headers{});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(HttpsToHttpRedirectTest3, SimpleInterface_Online) {
-  Client cli("https://nghttp2.org");
-  cli.set_follow_location(true);
-
-  Params params;
-  params.emplace("url", "http://www.google.com");
-
-  auto res = cli.Get("/httpbin/redirect-to?status_code=302", params, Headers{});
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(HttpToHttpsRedirectTest, CertFile) {
-  Server svr;
-  ASSERT_TRUE(svr.is_valid());
-  svr.Get("/index", [&](const Request &, Response &res) {
-    res.set_redirect("https://127.0.0.1:1235/index");
-    svr.stop();
-  });
-
-  SSLServer ssl_svr(SERVER_CERT2_FILE, SERVER_PRIVATE_KEY_FILE);
-  ASSERT_TRUE(ssl_svr.is_valid());
-  ssl_svr.Get("/index", [&](const Request &, Response &res) {
-    res.set_content("test", "text/plain");
-    ssl_svr.stop();
-  });
-
-  thread t = thread([&]() { ASSERT_TRUE(svr.listen("127.0.0.1", PORT)); });
-  thread t2 = thread([&]() { ASSERT_TRUE(ssl_svr.listen("127.0.0.1", 1235)); });
-  auto se = detail::scope_exit([&] {
-    t2.join();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-  ssl_svr.wait_until_ready();
-
-  Client cli("127.0.0.1", PORT);
-  cli.set_ca_cert_path(SERVER_CERT2_FILE);
-  cli.enable_server_certificate_verification(true);
-  cli.set_follow_location(true);
-  cli.set_connection_timeout(30);
-
-  auto res = cli.Get("/index");
-  ASSERT_TRUE(res);
-  ASSERT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(MultipartFormDataTest, LargeData) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
-  svr.Post("/post", [&](const Request &req, Response & /*res*/,
-                        const ContentReader &content_reader) {
-    if (req.is_multipart_form_data()) {
-      MultipartFormDataItems files;
-      content_reader(
-          [&](const MultipartFormData &file) {
-            files.push_back(file);
-            return true;
-          },
-          [&](const char *data, size_t data_length) {
-            files.back().content.append(data, data_length);
-            return true;
-          });
-
-      EXPECT_TRUE(std::string(files[0].name) == "document");
-      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
-      EXPECT_TRUE(files[0].filename == "2MB_data");
-      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
-
-      EXPECT_TRUE(files[1].name == "hello");
-      EXPECT_TRUE(files[1].content == "world");
-      EXPECT_TRUE(files[1].filename == "");
-      EXPECT_TRUE(files[1].content_type == "");
-    } else {
-      std::string body;
-      content_reader([&](const char *data, size_t data_length) {
-        body.append(data, data_length);
-        return true;
-      });
-    }
-  });
-
-  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    std::string data(1024 * 1024 * 2, '.');
-    std::stringstream buffer;
-    buffer << data;
-
-    Client cli("https://localhost:8080");
-    cli.enable_server_certificate_verification(false);
-
-    MultipartFormDataItems items{
-        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
-        {"hello", "world", "", ""},
-    };
-
-    auto res = cli.Post("/post", items);
-    ASSERT_TRUE(res);
-    ASSERT_EQ(StatusCode::OK_200, res->status);
-  }
-}
-
-TEST(MultipartFormDataTest, DataProviderItems) {
-
-  std::random_device seed_gen;
-  std::mt19937 random(seed_gen());
-
-  std::string rand1;
-  rand1.resize(1000);
-  std::generate(rand1.begin(), rand1.end(), [&]() { return random(); });
-
-  std::string rand2;
-  rand2.resize(3000);
-  std::generate(rand2.begin(), rand2.end(), [&]() { return random(); });
-
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
-  svr.Post("/post-none", [&](const Request &req, Response & /*res*/,
-                             const ContentReader &content_reader) {
-    ASSERT_FALSE(req.is_multipart_form_data());
-
-    std::string body;
-    content_reader([&](const char *data, size_t data_length) {
-      body.append(data, data_length);
-      return true;
-    });
-
-    EXPECT_EQ(body, "");
-  });
-
-  svr.Post("/post-items", [&](const Request &req, Response & /*res*/,
-                              const ContentReader &content_reader) {
-    ASSERT_TRUE(req.is_multipart_form_data());
-    MultipartFormDataItems files;
-    content_reader(
-        [&](const MultipartFormData &file) {
-          files.push_back(file);
-          return true;
-        },
-        [&](const char *data, size_t data_length) {
-          files.back().content.append(data, data_length);
-          return true;
-        });
-
-    ASSERT_TRUE(files.size() == 2);
-
-    EXPECT_EQ(std::string(files[0].name), "name1");
-    EXPECT_EQ(files[0].content, "Testing123");
-    EXPECT_EQ(files[0].filename, "filename1");
-    EXPECT_EQ(files[0].content_type, "application/octet-stream");
-
-    EXPECT_EQ(files[1].name, "name2");
-    EXPECT_EQ(files[1].content, "Testing456");
-    EXPECT_EQ(files[1].filename, "");
-    EXPECT_EQ(files[1].content_type, "");
-  });
-
-  svr.Post("/post-providers", [&](const Request &req, Response & /*res*/,
-                                  const ContentReader &content_reader) {
-    ASSERT_TRUE(req.is_multipart_form_data());
-    MultipartFormDataItems files;
-    content_reader(
-        [&](const MultipartFormData &file) {
-          files.push_back(file);
-          return true;
-        },
-        [&](const char *data, size_t data_length) {
-          files.back().content.append(data, data_length);
-          return true;
-        });
-
-    ASSERT_TRUE(files.size() == 2);
-
-    EXPECT_EQ(files[0].name, "name3");
-    EXPECT_EQ(files[0].content, rand1);
-    EXPECT_EQ(files[0].filename, "filename3");
-    EXPECT_EQ(files[0].content_type, "");
-
-    EXPECT_EQ(files[1].name, "name4");
-    EXPECT_EQ(files[1].content, rand2);
-    EXPECT_EQ(files[1].filename, "filename4");
-    EXPECT_EQ(files[1].content_type, "");
-  });
-
-  svr.Post("/post-both", [&](const Request &req, Response & /*res*/,
-                             const ContentReader &content_reader) {
-    ASSERT_TRUE(req.is_multipart_form_data());
-    MultipartFormDataItems files;
-    content_reader(
-        [&](const MultipartFormData &file) {
-          files.push_back(file);
-          return true;
-        },
-        [&](const char *data, size_t data_length) {
-          files.back().content.append(data, data_length);
-          return true;
-        });
-
-    ASSERT_TRUE(files.size() == 4);
-
-    EXPECT_EQ(std::string(files[0].name), "name1");
-    EXPECT_EQ(files[0].content, "Testing123");
-    EXPECT_EQ(files[0].filename, "filename1");
-    EXPECT_EQ(files[0].content_type, "application/octet-stream");
-
-    EXPECT_EQ(files[1].name, "name2");
-    EXPECT_EQ(files[1].content, "Testing456");
-    EXPECT_EQ(files[1].filename, "");
-    EXPECT_EQ(files[1].content_type, "");
-
-    EXPECT_EQ(files[2].name, "name3");
-    EXPECT_EQ(files[2].content, rand1);
-    EXPECT_EQ(files[2].filename, "filename3");
-    EXPECT_EQ(files[2].content_type, "");
-
-    EXPECT_EQ(files[3].name, "name4");
-    EXPECT_EQ(files[3].content, rand2);
-    EXPECT_EQ(files[3].filename, "filename4");
-    EXPECT_EQ(files[3].content_type, "");
-  });
-
-  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli("https://localhost:8080");
-    cli.enable_server_certificate_verification(false);
-
-    MultipartFormDataItems items{
-        {"name1", "Testing123", "filename1", "application/octet-stream"},
-        {"name2", "Testing456", "", ""}, // not a file
-    };
-
-    {
-      auto res = cli.Post("/post-none", {}, {}, {});
-      ASSERT_TRUE(res);
-      ASSERT_EQ(StatusCode::OK_200, res->status);
-    }
-
-    MultipartFormDataProviderItems providers;
-
-    {
-      auto res =
-          cli.Post("/post-items", {}, items, providers); // empty providers
-      ASSERT_TRUE(res);
-      ASSERT_EQ(StatusCode::OK_200, res->status);
-    }
-
-    providers.push_back({"name3",
-                         [&](size_t offset, httplib::DataSink &sink) -> bool {
-                           // test the offset is given correctly at each step
-                           if (!offset)
-                             sink.os.write(rand1.data(), 30);
-                           else if (offset == 30)
-                             sink.os.write(rand1.data() + 30, 300);
-                           else if (offset == 330)
-                             sink.os.write(rand1.data() + 330, 670);
-                           else if (offset == rand1.size())
-                             sink.done();
-                           return true;
-                         },
-                         "filename3",
-                         {}});
-
-    providers.push_back({"name4",
-                         [&](size_t offset, httplib::DataSink &sink) -> bool {
-                           // test the offset is given correctly at each step
-                           if (!offset)
-                             sink.os.write(rand2.data(), 2000);
-                           else if (offset == 2000)
-                             sink.os.write(rand2.data() + 2000, 1);
-                           else if (offset == 2001)
-                             sink.os.write(rand2.data() + 2001, 999);
-                           else if (offset == rand2.size())
-                             sink.done();
-                           return true;
-                         },
-                         "filename4",
-                         {}});
-
-    {
-      auto res = cli.Post("/post-providers", {}, {}, providers);
-      ASSERT_TRUE(res);
-      ASSERT_EQ(StatusCode::OK_200, res->status);
-    }
-
-    {
-      auto res = cli.Post("/post-both", {}, items, providers);
-      ASSERT_TRUE(res);
-      ASSERT_EQ(StatusCode::OK_200, res->status);
-    }
-  }
-}
-
-TEST(MultipartFormDataTest, BadHeader) {
-  Server svr;
-  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
-    res.set_content("ok", "text/plain");
-  });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  const std::string body =
-      "This is the preamble.  It is to be ignored, though it\r\n"
-      "is a handy place for composition agents to include an\r\n"
-      "explanatory note to non-MIME conformant readers.\r\n"
-      "\r\n"
-      "\r\n"
-      "--simple boundary\r\n"
-      "Content-Disposition: form-data; name=\"field1\"\r\n"
-      ": BAD...\r\n"
-      "\r\n"
-      "value1\r\n"
-      "--simple boundary\r\n"
-      "Content-Disposition: form-data; name=\"field2\"; "
-      "filename=\"example.txt\"\r\n"
-      "\r\n"
-      "value2\r\n"
-      "--simple boundary--\r\n"
-      "This is the epilogue.  It is also to be ignored.\r\n";
-
-  std::string content_type =
-      R"(multipart/form-data; boundary="simple boundary")";
-
-  Client cli(HOST, PORT);
-  auto res = cli.Post("/post", body, content_type.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
-}
-
-TEST(MultipartFormDataTest, WithPreamble) {
-  Server svr;
-  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
-    res.set_content("ok", "text/plain");
-  });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  const std::string body =
-      "This is the preamble.  It is to be ignored, though it\r\n"
-      "is a handy place for composition agents to include an\r\n"
-      "explanatory note to non-MIME conformant readers.\r\n"
-      "\r\n"
-      "\r\n"
-      "--simple boundary\r\n"
-      "Content-Disposition: form-data; name=\"field1\"\r\n"
-      "\r\n"
-      "value1\r\n"
-      "--simple boundary\r\n"
-      "Content-Disposition: form-data; name=\"field2\"; "
-      "filename=\"example.txt\"\r\n"
-      "\r\n"
-      "value2\r\n"
-      "--simple boundary--\r\n"
-      "This is the epilogue.  It is also to be ignored.\r\n";
-
-  std::string content_type =
-      R"(multipart/form-data; boundary="simple boundary")";
-
-  Client cli(HOST, PORT);
-  auto res = cli.Post("/post", body, content_type.c_str());
-
-  ASSERT_TRUE(res);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(MultipartFormDataTest, PostCustomBoundary) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
-  svr.Post("/post_customboundary", [&](const Request &req, Response & /*res*/,
-                                       const ContentReader &content_reader) {
-    if (req.is_multipart_form_data()) {
-      MultipartFormDataItems files;
-      content_reader(
-          [&](const MultipartFormData &file) {
-            files.push_back(file);
-            return true;
-          },
-          [&](const char *data, size_t data_length) {
-            files.back().content.append(data, data_length);
-            return true;
-          });
-
-      EXPECT_TRUE(std::string(files[0].name) == "document");
-      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
-      EXPECT_TRUE(files[0].filename == "2MB_data");
-      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
-
-      EXPECT_TRUE(files[1].name == "hello");
-      EXPECT_TRUE(files[1].content == "world");
-      EXPECT_TRUE(files[1].filename == "");
-      EXPECT_TRUE(files[1].content_type == "");
-    } else {
-      std::string body;
-      content_reader([&](const char *data, size_t data_length) {
-        body.append(data, data_length);
-        return true;
-      });
-    }
-  });
-
-  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    std::string data(1024 * 1024 * 2, '.');
-    std::stringstream buffer;
-    buffer << data;
-
-    Client cli("https://localhost:8080");
-    cli.enable_server_certificate_verification(false);
-
-    MultipartFormDataItems items{
-        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
-        {"hello", "world", "", ""},
-    };
-
-    auto res = cli.Post("/post_customboundary", {}, items, "abc-abc");
-    ASSERT_TRUE(res);
-    ASSERT_EQ(StatusCode::OK_200, res->status);
-  }
-}
-
-TEST(MultipartFormDataTest, PostInvalidBoundaryChars) {
-  std::string data(1024 * 1024 * 2, '&');
-  std::stringstream buffer;
-  buffer << data;
-
-  Client cli("https://localhost:8080");
-
-  MultipartFormDataItems items{
-      {"document", buffer.str(), "2MB_data", "application/octet-stream"},
-      {"hello", "world", "", ""},
-  };
-
-  for (const char &c : " \t\r\n") {
-    auto res =
-        cli.Post("/invalid_boundary", {}, items, string("abc123").append(1, c));
-    ASSERT_EQ(Error::UnsupportedMultipartBoundaryChars, res.error());
-    ASSERT_FALSE(res);
-  }
-}
-
-TEST(MultipartFormDataTest, PutFormData) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
-  svr.Put("/put", [&](const Request &req, const Response & /*res*/,
-                      const ContentReader &content_reader) {
-    if (req.is_multipart_form_data()) {
-      MultipartFormDataItems files;
-      content_reader(
-          [&](const MultipartFormData &file) {
-            files.push_back(file);
-            return true;
-          },
-          [&](const char *data, size_t data_length) {
-            files.back().content.append(data, data_length);
-            return true;
-          });
-
-      EXPECT_TRUE(std::string(files[0].name) == "document");
-      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
-      EXPECT_TRUE(files[0].filename == "2MB_data");
-      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
-
-      EXPECT_TRUE(files[1].name == "hello");
-      EXPECT_TRUE(files[1].content == "world");
-      EXPECT_TRUE(files[1].filename == "");
-      EXPECT_TRUE(files[1].content_type == "");
-    } else {
-      std::string body;
-      content_reader([&](const char *data, size_t data_length) {
-        body.append(data, data_length);
-        return true;
-      });
-    }
-  });
-
-  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    std::string data(1024 * 1024 * 2, '&');
-    std::stringstream buffer;
-    buffer << data;
-
-    Client cli("https://localhost:8080");
-    cli.enable_server_certificate_verification(false);
-
-    MultipartFormDataItems items{
-        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
-        {"hello", "world", "", ""},
-    };
-
-    auto res = cli.Put("/put", items);
-    ASSERT_TRUE(res);
-    ASSERT_EQ(StatusCode::OK_200, res->status);
-  }
-}
-
-TEST(MultipartFormDataTest, PutFormDataCustomBoundary) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
-  svr.Put("/put_customboundary",
-          [&](const Request &req, const Response & /*res*/,
-              const ContentReader &content_reader) {
-            if (req.is_multipart_form_data()) {
-              MultipartFormDataItems files;
-              content_reader(
-                  [&](const MultipartFormData &file) {
-                    files.push_back(file);
-                    return true;
-                  },
-                  [&](const char *data, size_t data_length) {
-                    files.back().content.append(data, data_length);
-                    return true;
-                  });
-
-              EXPECT_TRUE(std::string(files[0].name) == "document");
-              EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
-              EXPECT_TRUE(files[0].filename == "2MB_data");
-              EXPECT_TRUE(files[0].content_type == "application/octet-stream");
-
-              EXPECT_TRUE(files[1].name == "hello");
-              EXPECT_TRUE(files[1].content == "world");
-              EXPECT_TRUE(files[1].filename == "");
-              EXPECT_TRUE(files[1].content_type == "");
-            } else {
-              std::string body;
-              content_reader([&](const char *data, size_t data_length) {
-                body.append(data, data_length);
-                return true;
-              });
-            }
-          });
-
-  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    std::string data(1024 * 1024 * 2, '&');
-    std::stringstream buffer;
-    buffer << data;
-
-    Client cli("https://localhost:8080");
-    cli.enable_server_certificate_verification(false);
-
-    MultipartFormDataItems items{
-        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
-        {"hello", "world", "", ""},
-    };
-
-    auto res = cli.Put("/put_customboundary", {}, items, "abc-abc_");
-    ASSERT_TRUE(res);
-    ASSERT_EQ(StatusCode::OK_200, res->status);
-  }
-}
-
-TEST(MultipartFormDataTest, PutInvalidBoundaryChars) {
-  std::string data(1024 * 1024 * 2, '&');
-  std::stringstream buffer;
-  buffer << data;
-
-  Client cli("https://localhost:8080");
-  cli.enable_server_certificate_verification(false);
-
-  MultipartFormDataItems items{
-      {"document", buffer.str(), "2MB_data", "application/octet-stream"},
-      {"hello", "world", "", ""},
-  };
-
-  for (const char &c : " \t\r\n") {
-    auto res = cli.Put("/put", {}, items, string("abc123").append(1, c));
-    ASSERT_EQ(Error::UnsupportedMultipartBoundaryChars, res.error());
-    ASSERT_FALSE(res);
-  }
-}
-
-TEST(MultipartFormDataTest, AlternateFilename) {
-  auto handled = false;
-
-  Server svr;
-  svr.Post("/test", [&](const Request &req, Response &res) {
-    ASSERT_EQ(3u, req.files.size());
-
-    auto it = req.files.begin();
-    ASSERT_EQ("file1", it->second.name);
-    ASSERT_EQ("A.txt", it->second.filename);
-    ASSERT_EQ("text/plain", it->second.content_type);
-    ASSERT_EQ("Content of a.txt.\r\n", it->second.content);
-
-    ++it;
-    ASSERT_EQ("file2", it->second.name);
-    ASSERT_EQ("a.html", it->second.filename);
-    ASSERT_EQ("text/html", it->second.content_type);
-    ASSERT_EQ("<!DOCTYPE html><title>Content of a.html.</title>\r\n",
-              it->second.content);
-
-    ++it;
-    ASSERT_EQ("text", it->second.name);
-    ASSERT_EQ("", it->second.filename);
-    ASSERT_EQ("", it->second.content_type);
-    ASSERT_EQ("text default", it->second.content);
-
-    res.set_content("ok", "text/plain");
-
-    handled = true;
-  });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-    ASSERT_TRUE(handled);
-  });
-
-  svr.wait_until_ready();
-
-  auto req = "POST /test HTTP/1.1\r\n"
-             "Content-Type: multipart/form-data;boundary=--------\r\n"
-             "Content-Length: 399\r\n"
-             "\r\n"
-             "----------\r\n"
-             "Content-Disposition: form-data; name=\"text\"\r\n"
-             "\r\n"
-             "text default\r\n"
-             "----------\r\n"
-             "Content-Disposition: form-data; filename*=\"UTF-8''%41.txt\"; "
-             "filename=\"a.txt\"; name=\"file1\"\r\n"
-             "Content-Type: text/plain\r\n"
-             "\r\n"
-             "Content of a.txt.\r\n"
-             "\r\n"
-             "----------\r\n"
-             "Content-Disposition: form-data;  name=\"file2\" ;filename = "
-             "\"a.html\"\r\n"
-             "Content-Type: text/html\r\n"
-             "\r\n"
-             "<!DOCTYPE html><title>Content of a.html.</title>\r\n"
-             "\r\n"
-             "------------\r\n";
-
-  ASSERT_TRUE(send_request(1, req));
-}
-
-TEST(MultipartFormDataTest, CloseDelimiterWithoutCRLF) {
-  auto handled = false;
-
-  Server svr;
-  svr.Post("/test", [&](const Request &req, Response &) {
-    ASSERT_EQ(2u, req.files.size());
-
-    auto it = req.files.begin();
-    ASSERT_EQ("text1", it->second.name);
-    ASSERT_EQ("text1", it->second.content);
-
-    ++it;
-    ASSERT_EQ("text2", it->second.name);
-    ASSERT_EQ("text2", it->second.content);
-
-    handled = true;
-  });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-    ASSERT_TRUE(handled);
-  });
-
-  svr.wait_until_ready();
-
-  auto req = "POST /test HTTP/1.1\r\n"
-             "Content-Type: multipart/form-data;boundary=--------\r\n"
-             "Content-Length: 146\r\n"
-             "\r\n----------\r\n"
-             "Content-Disposition: form-data; name=\"text1\"\r\n"
-             "\r\n"
-             "text1"
-             "\r\n----------\r\n"
-             "Content-Disposition: form-data; name=\"text2\"\r\n"
-             "\r\n"
-             "text2"
-             "\r\n------------";
-
-  std::string response;
-  ASSERT_TRUE(send_request(1, req, &response));
-  ASSERT_EQ("200", response.substr(9, 3));
-}
-
-TEST(MultipartFormDataTest, ContentLength) {
-  auto handled = false;
-
-  Server svr;
-  svr.Post("/test", [&](const Request &req, Response &) {
-    ASSERT_EQ(2u, req.files.size());
-
-    auto it = req.files.begin();
-    ASSERT_EQ("text1", it->second.name);
-    ASSERT_EQ("text1", it->second.content);
-
-    ++it;
-    ASSERT_EQ("text2", it->second.name);
-    ASSERT_EQ("text2", it->second.content);
-
-    handled = true;
-  });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-    ASSERT_TRUE(handled);
-  });
-
-  svr.wait_until_ready();
-
-  auto req = "POST /test HTTP/1.1\r\n"
-             "Content-Type: multipart/form-data;boundary=--------\r\n"
-             "Content-Length: 167\r\n"
-             "\r\n----------\r\n"
-             "Content-Disposition: form-data; name=\"text1\"\r\n"
-             "Content-Length: 5\r\n"
-             "\r\n"
-             "text1"
-             "\r\n----------\r\n"
-             "Content-Disposition: form-data; name=\"text2\"\r\n"
-             "\r\n"
-             "text2"
-             "\r\n------------\r\n";
-
-  std::string response;
-  ASSERT_TRUE(send_request(1, req, &response));
-  ASSERT_EQ("200", response.substr(9, 3));
-}
-#endif
-
-TEST(TaskQueueTest, IncreaseAtomicInteger) {
-  static constexpr unsigned int number_of_tasks{1000000};
-  std::atomic_uint count{0};
-  std::unique_ptr<TaskQueue> task_queue{
-      new ThreadPool{CPPHTTPLIB_THREAD_POOL_COUNT}};
-
-  for (unsigned int i = 0; i < number_of_tasks; ++i) {
-    auto queued = task_queue->enqueue(
-        [&count] { count.fetch_add(1, std::memory_order_relaxed); });
-    EXPECT_TRUE(queued);
-  }
-
-  EXPECT_NO_THROW(task_queue->shutdown());
-  EXPECT_EQ(number_of_tasks, count.load());
-}
-
-TEST(TaskQueueTest, IncreaseAtomicIntegerWithQueueLimit) {
-  static constexpr unsigned int number_of_tasks{1000000};
-  static constexpr unsigned int qlimit{2};
-  unsigned int queued_count{0};
-  std::atomic_uint count{0};
-  std::unique_ptr<TaskQueue> task_queue{
-      new ThreadPool{/*num_threads=*/1, qlimit}};
-
-  for (unsigned int i = 0; i < number_of_tasks; ++i) {
-    if (task_queue->enqueue(
-            [&count] { count.fetch_add(1, std::memory_order_relaxed); })) {
-      queued_count++;
-    }
-  }
-
-  EXPECT_NO_THROW(task_queue->shutdown());
-  EXPECT_EQ(queued_count, count.load());
-  EXPECT_TRUE(queued_count <= number_of_tasks);
-  EXPECT_TRUE(queued_count >= qlimit);
-}
-
-TEST(TaskQueueTest, MaxQueuedRequests) {
-  static constexpr unsigned int qlimit{3};
-  std::unique_ptr<TaskQueue> task_queue{new ThreadPool{1, qlimit}};
-  std::condition_variable sem_cv;
-  std::mutex sem_mtx;
-  int credits = 0;
-  bool queued;
-
-  /* Fill up the queue with tasks that will block until we give them credits to
-   * complete. */
-  for (unsigned int n = 0; n <= qlimit;) {
-    queued = task_queue->enqueue([&sem_mtx, &sem_cv, &credits] {
-      std::unique_lock<std::mutex> lock(sem_mtx);
-      while (credits <= 0) {
-        sem_cv.wait(lock);
-      }
-      /* Consume the credit and signal the test code if they are all gone. */
-      if (--credits == 0) { sem_cv.notify_one(); }
-    });
-
-    if (n < qlimit) {
-      /* The first qlimit enqueues must succeed. */
-      EXPECT_TRUE(queued);
-    } else {
-      /* The last one will succeed only when the worker thread
-       * starts and dequeues the first blocking task. Although
-       * not necessary for the correctness of this test, we sleep for
-       * a short while to avoid busy waiting. */
-      std::this_thread::sleep_for(std::chrono::milliseconds(10));
-    }
-    if (queued) { n++; }
-  }
-
-  /* Further enqueues must fail since the queue is full. */
-  for (auto i = 0; i < 4; i++) {
-    queued = task_queue->enqueue([] {});
-    EXPECT_FALSE(queued);
-  }
-
-  /* Give the credits to allow the previous tasks to complete. */
-  {
-    std::unique_lock<std::mutex> lock(sem_mtx);
-    credits += qlimit + 1;
-  }
-  sem_cv.notify_all();
-
-  /* Wait for all the credits to be consumed. */
-  {
-    std::unique_lock<std::mutex> lock(sem_mtx);
-    while (credits > 0) {
-      sem_cv.wait(lock);
-    }
-  }
-
-  /* Check that we are able again to enqueue at least qlimit tasks. */
-  for (unsigned int i = 0; i < qlimit; i++) {
-    queued = task_queue->enqueue([] {});
-    EXPECT_TRUE(queued);
-  }
-
-  EXPECT_NO_THROW(task_queue->shutdown());
-}
-
-TEST(RedirectTest, RedirectToUrlWithQueryParameters) {
-  Server svr;
-
-  svr.Get("/", [](const Request & /*req*/, Response &res) {
-    res.set_redirect(R"(/hello?key=val%26key2%3Dval2)");
-  });
-
-  svr.Get("/hello", [](const Request &req, Response &res) {
-    res.set_content(req.get_param_value("key"), "text/plain");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-    cli.set_follow_location(true);
-
-    auto res = cli.Get("/");
-    ASSERT_TRUE(res);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-    EXPECT_EQ("val&key2=val2", res->body);
-  }
-}
-
-TEST(VulnerabilityTest, CRLFInjection) {
-  Server svr;
-
-  svr.Post("/test1", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello 1", "text/plain");
-  });
-
-  svr.Delete("/test2", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello 2", "text/plain");
-  });
-
-  svr.Put("/test3", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello 3", "text/plain");
-  });
-
-  svr.Patch("/test4", [](const Request & /*req*/, Response &res) {
-    res.set_content("Hello 4", "text/plain");
-  });
-
-  svr.set_logger([](const Request &req, const Response & /*res*/) {
-    for (const auto &x : req.headers) {
-      auto key = x.first;
-      EXPECT_STRNE("evil", key.c_str());
-    }
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    Client cli(HOST, PORT);
-
-    cli.Post("/test1", "A=B",
-             "application/x-www-form-urlencoded\r\nevil: hello1");
-    cli.Delete("/test2", "A=B", "text/plain\r\nevil: hello2");
-    cli.Put("/test3", "text", "text/plain\r\nevil: hello3");
-    cli.Patch("/test4", "content", "text/plain\r\nevil: hello4");
-  }
-}
-
-TEST(PathParamsTest, StaticMatch) {
-  const auto pattern = "/users/all";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/all";
-  ASSERT_TRUE(matcher.match(request));
-
-  std::unordered_map<std::string, std::string> expected_params = {};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, StaticMismatch) {
-  const auto pattern = "/users/all";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/1";
-  ASSERT_FALSE(matcher.match(request));
-}
-
-TEST(PathParamsTest, SingleParamInTheMiddle) {
-  const auto pattern = "/users/:id/subscriptions";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/42/subscriptions";
-  ASSERT_TRUE(matcher.match(request));
-
-  std::unordered_map<std::string, std::string> expected_params = {{"id", "42"}};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, SingleParamInTheEnd) {
-  const auto pattern = "/users/:id";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/24";
-  ASSERT_TRUE(matcher.match(request));
-
-  std::unordered_map<std::string, std::string> expected_params = {{"id", "24"}};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, SingleParamInTheEndTrailingSlash) {
-  const auto pattern = "/users/:id/";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/42/";
-  ASSERT_TRUE(matcher.match(request));
-  std::unordered_map<std::string, std::string> expected_params = {{"id", "42"}};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, EmptyParam) {
-  const auto pattern = "/users/:id/";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users//";
-  ASSERT_TRUE(matcher.match(request));
-
-  std::unordered_map<std::string, std::string> expected_params = {{"id", ""}};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, FragmentMismatch) {
-  const auto pattern = "/users/:id/";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/admins/24/";
-  ASSERT_FALSE(matcher.match(request));
-}
-
-TEST(PathParamsTest, ExtraFragments) {
-  const auto pattern = "/users/:id";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/42/subscriptions";
-  ASSERT_FALSE(matcher.match(request));
-}
-
-TEST(PathParamsTest, MissingTrailingParam) {
-  const auto pattern = "/users/:id";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users";
-  ASSERT_FALSE(matcher.match(request));
-}
-
-TEST(PathParamsTest, MissingParamInTheMiddle) {
-  const auto pattern = "/users/:id/subscriptions";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/subscriptions";
-  ASSERT_FALSE(matcher.match(request));
-}
-
-TEST(PathParamsTest, MultipleParams) {
-  const auto pattern = "/users/:userid/subscriptions/:subid";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/users/42/subscriptions/2";
-  ASSERT_TRUE(matcher.match(request));
-
-  std::unordered_map<std::string, std::string> expected_params = {
-      {"userid", "42"}, {"subid", "2"}};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, SequenceOfParams) {
-  const auto pattern = "/values/:x/:y/:z";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/values/1/2/3";
-  ASSERT_TRUE(matcher.match(request));
-
-  std::unordered_map<std::string, std::string> expected_params = {
-      {"x", "1"}, {"y", "2"}, {"z", "3"}};
-
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(PathParamsTest, SemicolonInTheMiddleIsNotAParam) {
-  const auto pattern = "/prefix:suffix";
-  detail::PathParamsMatcher matcher(pattern);
-
-  Request request;
-  request.path = "/prefix:suffix";
-  ASSERT_TRUE(matcher.match(request));
-
-  const std::unordered_map<std::string, std::string> expected_params = {};
-  EXPECT_EQ(request.path_params, expected_params);
-}
-
-TEST(UniversalClientImplTest, Ipv6LiteralAddress) {
-  // If ipv6 regex working, regex match codepath is taken.
-  // else port will default to 80 in Client impl
-  int clientImplMagicPort = 80;
-  int port = 4321;
-  // above ports must be different to avoid false negative
-  EXPECT_NE(clientImplMagicPort, port);
-
-  std::string ipV6TestURL = "http://[ff06::c3]";
-
-  Client cli(ipV6TestURL + ":" + std::to_string(port), CLIENT_CERT_FILE,
-             CLIENT_PRIVATE_KEY_FILE);
-  EXPECT_EQ(cli.port(), port);
-}
-
-TEST(FileSystemTest, FileAndDirExistenceCheck) {
-  auto file_path = "./www/dir/index.html";
-  auto dir_path = "./www/dir";
-
-  detail::FileStat stat_file(file_path);
-  EXPECT_TRUE(stat_file.is_file());
-  EXPECT_FALSE(stat_file.is_dir());
-
-  detail::FileStat stat_dir(dir_path);
-  EXPECT_FALSE(stat_dir.is_file());
-  EXPECT_TRUE(stat_dir.is_dir());
-}
-
-TEST(DirtyDataRequestTest, HeadFieldValueContains_CR_LF_NUL) {
-  Server svr;
-
-  svr.Get("/test", [&](const Request & /*req*/, Response &res) {
-    EXPECT_EQ(res.status, 400);
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  cli.Get("/test", {{"Test", "_\n\r_\n\r_"}});
-}
-
-TEST(InvalidHeaderCharsTest, is_field_name) {
-  EXPECT_TRUE(detail::fields::is_field_name("exampleToken"));
-  EXPECT_TRUE(detail::fields::is_field_name("token123"));
-  EXPECT_TRUE(detail::fields::is_field_name("!#$%&'*+-.^_`|~"));
-
-  EXPECT_FALSE(detail::fields::is_field_name("example token"));
-  EXPECT_FALSE(detail::fields::is_field_name(" example_token"));
-  EXPECT_FALSE(detail::fields::is_field_name("example_token "));
-  EXPECT_FALSE(detail::fields::is_field_name("token@123"));
-  EXPECT_FALSE(detail::fields::is_field_name(""));
-  EXPECT_FALSE(detail::fields::is_field_name("example\rtoken"));
-  EXPECT_FALSE(detail::fields::is_field_name("example\ntoken"));
-  EXPECT_FALSE(detail::fields::is_field_name(std::string("\0", 1)));
-  EXPECT_FALSE(detail::fields::is_field_name("example\ttoken"));
-}
-
-TEST(InvalidHeaderCharsTest, is_field_value) {
-  EXPECT_TRUE(detail::fields::is_field_value("exampleToken"));
-  EXPECT_TRUE(detail::fields::is_field_value("token123"));
-  EXPECT_TRUE(detail::fields::is_field_value("!#$%&'*+-.^_`|~"));
-
-  EXPECT_TRUE(detail::fields::is_field_value("example token"));
-  EXPECT_FALSE(detail::fields::is_field_value(" example_token"));
-  EXPECT_FALSE(detail::fields::is_field_value("example_token "));
-  EXPECT_TRUE(detail::fields::is_field_value("token@123"));
-  EXPECT_TRUE(detail::fields::is_field_value(""));
-  EXPECT_FALSE(detail::fields::is_field_value("example\rtoken"));
-  EXPECT_FALSE(detail::fields::is_field_value("example\ntoken"));
-  EXPECT_FALSE(detail::fields::is_field_value(std::string("\0", 1)));
-  EXPECT_TRUE(detail::fields::is_field_value("example\ttoken"));
-
-  EXPECT_TRUE(detail::fields::is_field_value("0"));
-}
-
-TEST(InvalidHeaderCharsTest, OnServer) {
-  Server svr;
-
-  svr.Get("/test_name", [&](const Request &req, Response &res) {
-    std::string header = "Not Set";
-    if (req.has_param("header")) { header = req.get_param_value("header"); }
-
-    res.set_header(header, "value");
-    res.set_content("Page Content Page Content", "text/plain");
-  });
-
-  svr.Get("/test_value", [&](const Request &req, Response &res) {
-    std::string header = "Not Set";
-    if (req.has_param("header")) { header = req.get_param_value("header"); }
-
-    res.set_header("X-Test", header);
-    res.set_content("Page Content Page Content", "text/plain");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  Client cli(HOST, PORT);
-  {
-    auto res = cli.Get(
-        R"(/test_name?header=Value%00%0d%0aHEADER_KEY%3aHEADER_VALUE%0d%0a%0d%0aBODY_BODY_BODY)");
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ("Page Content Page Content", res->body);
-    EXPECT_FALSE(res->has_header("HEADER_KEY"));
-  }
-  {
-    auto res = cli.Get(
-        R"(/test_value?header=Value%00%0d%0aHEADER_KEY%3aHEADER_VALUE%0d%0a%0d%0aBODY_BODY_BODY)");
-
-    ASSERT_TRUE(res);
-    EXPECT_EQ("Page Content Page Content", res->body);
-    EXPECT_FALSE(res->has_header("HEADER_KEY"));
-  }
-}
-
-TEST(InvalidHeaderValueTest, InvalidContentLength) {
-  auto handled = false;
-
-  Server svr;
-  svr.Post("/test", [&](const Request &, Response &) { handled = true; });
-
-  thread t = thread([&] { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    t.join();
-    ASSERT_FALSE(svr.is_running());
-    ASSERT_FALSE(handled);
-  });
-
-  svr.wait_until_ready();
-
-  auto req = "POST /test HTTP/1.1\r\n"
-             "Content-Length: x\r\n"
-             "\r\n";
-
-  std::string response;
-  ASSERT_TRUE(send_request(1, req, &response));
-  ASSERT_EQ("HTTP/1.1 400 Bad Request",
-            response.substr(0, response.find("\r\n")));
-}
-
-#ifndef _WIN32
-TEST(Expect100ContinueTest, ServerClosesConnection) {
-  static constexpr char reject[] = "Unauthorized";
-  static constexpr char accept[] = "Upload accepted";
-  constexpr size_t total_size = 10 * 1024 * 1024 * 1024ULL;
-
-  Server svr;
-
-  svr.set_expect_100_continue_handler(
-      [](const Request & /*req*/, Response &res) {
-        res.status = StatusCode::Unauthorized_401;
-        res.set_content(reject, "text/plain");
-        return res.status;
-      });
-  svr.Post("/", [&](const Request & /*req*/, Response &res) {
-    res.set_content(accept, "text/plain");
-  });
-
-  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  {
-    const auto curl = std::unique_ptr<CURL, decltype(&curl_easy_cleanup)>{
-        curl_easy_init(), &curl_easy_cleanup};
-    ASSERT_NE(curl, nullptr);
-
-    curl_easy_setopt(curl.get(), CURLOPT_URL, HOST);
-    curl_easy_setopt(curl.get(), CURLOPT_PORT, PORT);
-    curl_easy_setopt(curl.get(), CURLOPT_POST, 1L);
-    auto list = std::unique_ptr<curl_slist, decltype(&curl_slist_free_all)>{
-        curl_slist_append(nullptr, "Content-Type: application/octet-stream"),
-        &curl_slist_free_all};
-    ASSERT_NE(list, nullptr);
-    curl_easy_setopt(curl.get(), CURLOPT_HTTPHEADER, list.get());
-
-    struct read_data {
-      size_t read_size;
-      size_t total_size;
-    } data = {0, total_size};
-    using read_callback_t =
-        size_t (*)(char *ptr, size_t size, size_t nmemb, void *userdata);
-    read_callback_t read_callback = [](char *ptr, size_t size, size_t nmemb,
-                                       void *userdata) -> size_t {
-      read_data *data = (read_data *)userdata;
-
-      if (!userdata || data->read_size >= data->total_size) { return 0; }
-
-      std::fill_n(ptr, size * nmemb, 'A');
-      data->read_size += size * nmemb;
-      return size * nmemb;
-    };
-    curl_easy_setopt(curl.get(), CURLOPT_READDATA, data);
-    curl_easy_setopt(curl.get(), CURLOPT_READFUNCTION, read_callback);
-
-    std::vector<char> buffer;
-    curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, &buffer);
-    using write_callback_t =
-        size_t (*)(char *ptr, size_t size, size_t nmemb, void *userdata);
-    write_callback_t write_callback = [](char *ptr, size_t size, size_t nmemb,
-                                         void *userdata) -> size_t {
-      std::vector<char> *buffer = (std::vector<char> *)userdata;
-      buffer->reserve(buffer->size() + size * nmemb + 1);
-      buffer->insert(buffer->end(), (char *)ptr, (char *)ptr + size * nmemb);
-      return size * nmemb;
-    };
-    curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, write_callback);
-
-    {
-      const auto res = curl_easy_perform(curl.get());
-      ASSERT_EQ(res, CURLE_OK);
-    }
-
-    {
-      auto response_code = long{};
-      const auto res =
-          curl_easy_getinfo(curl.get(), CURLINFO_RESPONSE_CODE, &response_code);
-      ASSERT_EQ(res, CURLE_OK);
-      ASSERT_EQ(response_code, StatusCode::Unauthorized_401);
-    }
-
-    {
-      auto dl = curl_off_t{};
-      const auto res =
-          curl_easy_getinfo(curl.get(), CURLINFO_SIZE_DOWNLOAD_T, &dl);
-      ASSERT_EQ(res, CURLE_OK);
-      ASSERT_EQ(dl, (curl_off_t)sizeof reject - 1);
-    }
-
-    {
-      buffer.push_back('\0');
-      ASSERT_STRCASEEQ(buffer.data(), reject);
-    }
-  }
-}
-#endif
-
-TEST(MaxTimeoutTest, ContentStream) {
-  Server svr;
-
-  svr.Get("/stream", [&](const Request &, Response &res) {
-    auto data = new std::string("01234567890123456789");
-
-    res.set_content_provider(
-        data->size(), "text/plain",
-        [&, data](size_t offset, size_t length, DataSink &sink) {
-          const size_t DATA_CHUNK_SIZE = 4;
-          const auto &d = *data;
-          std::this_thread::sleep_for(std::chrono::seconds(1));
-          sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
-          return true;
-        },
-        [data](bool success) {
-          EXPECT_FALSE(success);
-          delete data;
-        });
-  });
-
-  svr.Get("/stream_without_length", [&](const Request &, Response &res) {
-    auto i = new size_t(0);
-
-    res.set_content_provider(
-        "text/plain",
-        [i](size_t, DataSink &sink) {
-          if (*i < 5) {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-            sink.write("abcd", 4);
-            (*i)++;
-          } else {
-            sink.done();
-          }
-          return true;
-        },
-        [i](bool success) {
-          EXPECT_FALSE(success);
-          delete i;
-        });
-  });
-
-  svr.Get("/chunked", [&](const Request &, Response &res) {
-    auto i = new size_t(0);
-
-    res.set_chunked_content_provider(
-        "text/plain",
-        [i](size_t, DataSink &sink) {
-          if (*i < 5) {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-            sink.os << "abcd";
-            (*i)++;
-          } else {
-            sink.done();
-          }
-          return true;
-        },
-        [i](bool success) {
-          EXPECT_FALSE(success);
-          delete i;
-        });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  const time_t timeout = 2000;
-  const time_t threshold = 200;
-
-  Client cli("localhost", PORT);
-  cli.set_max_timeout(std::chrono::milliseconds(timeout));
-
-
-  {
-    auto start = std::chrono::steady_clock::now();
-
-    auto res = cli.Get("/stream");
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                       std::chrono::steady_clock::now() - start)
-                       .count();
-
-    ASSERT_FALSE(res);
-    EXPECT_EQ(Error::Read, res.error());
-    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
-  }
-
-  {
-    auto start = std::chrono::steady_clock::now();
-
-    auto res = cli.Get("/stream_without_length");
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                       std::chrono::steady_clock::now() - start)
-                       .count();
-
-    ASSERT_FALSE(res);
-    EXPECT_EQ(Error::Read, res.error());
-    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
-  }
-
-  {
-    auto start = std::chrono::steady_clock::now();
-
-    auto res = cli.Get("/chunked", [&](const char *data, size_t data_length) {
-      EXPECT_EQ("abcd", string(data, data_length));
-      return true;
-    });
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                       std::chrono::steady_clock::now() - start)
-                       .count();
-
-    ASSERT_FALSE(res);
-    EXPECT_EQ(Error::Read, res.error());
-    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
-  }
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(MaxTimeoutTest, ContentStreamSSL) {
-  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
-  svr.Get("/stream", [&](const Request &, Response &res) {
-    auto data = new std::string("01234567890123456789");
-
-    res.set_content_provider(
-        data->size(), "text/plain",
-        [&, data](size_t offset, size_t length, DataSink &sink) {
-          const size_t DATA_CHUNK_SIZE = 4;
-          const auto &d = *data;
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-          sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
-          return true;
-        },
-        [data](bool success) {
-          EXPECT_FALSE(success);
-          delete data;
-        });
-  });
-
-  svr.Get("/stream_without_length", [&](const Request &, Response &res) {
-    auto i = new size_t(0);
-
-    res.set_content_provider(
-        "text/plain",
-        [i](size_t, DataSink &sink) {
-          if (*i < 5) {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-            sink.write("abcd", 4);
-            (*i)++;
-          } else {
-            sink.done();
-          }
-          return true;
-        },
-        [i](bool success) {
-          EXPECT_FALSE(success);
-          delete i;
-        });
-  });
-
-  svr.Get("/chunked", [&](const Request &, Response &res) {
-    auto i = new size_t(0);
-
-    res.set_chunked_content_provider(
-        "text/plain",
-        [i](size_t, DataSink &sink) {
-          if (*i < 5) {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-            sink.os << "abcd";
-            (*i)++;
-          } else {
-            sink.done();
-          }
-          return true;
-        },
-        [i](bool success) {
-          EXPECT_FALSE(success);
-          delete i;
-        });
-  });
-
-  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    listen_thread.join();
-    ASSERT_FALSE(svr.is_running());
-  });
-
-  svr.wait_until_ready();
-
-  const time_t timeout = 2000;
-  const time_t threshold = 1000; // SSL_shutdown is slow...
-
-  SSLClient cli("localhost", PORT);
-  cli.enable_server_certificate_verification(false);
-  cli.set_max_timeout(std::chrono::milliseconds(timeout));
-
-  {
-    auto start = std::chrono::steady_clock::now();
-
-    auto res = cli.Get("/stream");
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                       std::chrono::steady_clock::now() - start)
-                       .count();
-
-    ASSERT_FALSE(res);
-    EXPECT_EQ(Error::Read, res.error());
-    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
-  }
-
-  {
-    auto start = std::chrono::steady_clock::now();
-
-    auto res = cli.Get("/stream_without_length");
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                       std::chrono::steady_clock::now() - start)
-                       .count();
-
-    ASSERT_FALSE(res);
-    EXPECT_EQ(Error::Read, res.error());
-    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
-  }
-
-  {
-    auto start = std::chrono::steady_clock::now();
-
-    auto res = cli.Get("/chunked", [&](const char *data, size_t data_length) {
-      EXPECT_EQ("abcd", string(data, data_length));
-      return true;
-    });
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                       std::chrono::steady_clock::now() - start)
-                       .count();
-
-    ASSERT_FALSE(res);
-    EXPECT_EQ(Error::Read, res.error());
-    EXPECT_TRUE(timeout <= elapsed && elapsed < timeout + threshold);
-  }
-}
-#endif
diff --git a/code/cpp-httplib-0.19.0/test/test.conf b/code/cpp-httplib-0.19.0/test/test.conf
deleted file mode 100644
index 1cf7d639..00000000
--- a/code/cpp-httplib-0.19.0/test/test.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[req]
-default_bits           = 2048
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-output_password        = mypass
-
-[req_distinguished_name]
-C                      = US
-ST                     = Test State or Province
-L                      = Test Locality
-O                      = Organization Name
-OU                     = Organizational Unit Name
-CN                     = Common Name
-emailAddress           = test@email.address
-
-[req_attributes]
-challengePassword              = 1234
-
-[SAN]
-subjectAltName=IP:127.0.0.1
diff --git a/code/cpp-httplib-0.19.0/test/test.rootCA.conf b/code/cpp-httplib-0.19.0/test/test.rootCA.conf
deleted file mode 100644
index 9d7037dd..00000000
--- a/code/cpp-httplib-0.19.0/test/test.rootCA.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[req]
-default_bits           = 2048
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-output_password        = mypass
-
-[req_distinguished_name]
-C                      = US
-ST                     = Test State or Province
-L                      = Test Locality
-O                      = Organization Name
-OU                     = Organizational Unit Name
-CN                     = Root CA Name
-emailAddress           = test@email.address
-
-[req_attributes]
-challengePassword              = 1234
diff --git a/code/cpp-httplib-0.19.0/test/test.sln b/code/cpp-httplib-0.19.0/test/test.sln
deleted file mode 100644
index f7b3ae3b..00000000
--- a/code/cpp-httplib-0.19.0/test/test.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.20617.1 PREVIEW
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcxproj", "{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|Win32.Build.0 = Debug|Win32
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|x64.ActiveCfg = Debug|x64
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Debug|x64.Build.0 = Debug|x64
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|Win32.ActiveCfg = Release|Win32
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|Win32.Build.0 = Release|Win32
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|x64.ActiveCfg = Release|x64
-		{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/code/cpp-httplib-0.19.0/test/test.vcxproj b/code/cpp-httplib-0.19.0/test/test.vcxproj
deleted file mode 100644
index c4dca390..00000000
--- a/code/cpp-httplib-0.19.0/test/test.vcxproj
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>
-      </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>
-      </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>
-      </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>
-      </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="gtest\gtest-all.cc" />
-    <ClCompile Include="gtest\gtest_main.cc" />
-    <ClCompile Include="test.cc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/test_proxy.cc b/code/cpp-httplib-0.19.0/test/test_proxy.cc
deleted file mode 100644
index 88a8ba96..00000000
--- a/code/cpp-httplib-0.19.0/test/test_proxy.cc
+++ /dev/null
@@ -1,288 +0,0 @@
-#include <future>
-#include <gtest/gtest.h>
-#include <httplib.h>
-
-using namespace std;
-using namespace httplib;
-
-template <typename T>
-void ProxyTest(T& cli, bool basic) {
-  cli.set_proxy("localhost", basic ? 3128 : 3129);
-  auto res = cli.Get("/httpbin/get");
-  ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(StatusCode::ProxyAuthenticationRequired_407, res->status);
-}
-
-TEST(ProxyTest, NoSSLBasic) {
-  Client cli("nghttp2.org");
-  ProxyTest(cli, true);
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(ProxyTest, SSLBasic) {
-  SSLClient cli("nghttp2.org");
-  ProxyTest(cli, true);
-}
-
-TEST(ProxyTest, NoSSLDigest) {
-  Client cli("nghttp2.org");
-  ProxyTest(cli, false);
-}
-
-TEST(ProxyTest, SSLDigest) {
-  SSLClient cli("nghttp2.org");
-  ProxyTest(cli, false);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-template <typename T>
-void RedirectProxyText(T& cli, const char *path, bool basic) {
-  cli.set_proxy("localhost", basic ? 3128 : 3129);
-  if (basic) {
-    cli.set_proxy_basic_auth("hello", "world");
-  } else {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    cli.set_proxy_digest_auth("hello", "world");
-#endif
-  }
-  cli.set_follow_location(true);
-
-  auto res = cli.Get(path);
-  ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
-}
-
-TEST(RedirectTest, HTTPBinNoSSLBasic) {
-  Client cli("nghttp2.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", true);
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(RedirectTest, HTTPBinNoSSLDigest) {
-  Client cli("nghttp2.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", false);
-}
-
-TEST(RedirectTest, HTTPBinSSLBasic) {
-  SSLClient cli("nghttp2.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", true);
-}
-
-TEST(RedirectTest, HTTPBinSSLDigest) {
-  SSLClient cli("nghttp2.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", false);
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(RedirectTest, YouTubeNoSSLBasic) {
-  Client cli("youtube.com");
-  RedirectProxyText(cli, "/", true);
-}
-
-TEST(RedirectTest, DISABLED_YouTubeNoSSLDigest) {
-  Client cli("youtube.com");
-  RedirectProxyText(cli, "/", false);
-}
-
-TEST(RedirectTest, YouTubeSSLBasic) {
-  SSLClient cli("youtube.com");
-  RedirectProxyText(cli, "/", true);
-}
-
-TEST(RedirectTest, YouTubeSSLDigest) {
-  SSLClient cli("youtube.com");
-  RedirectProxyText(cli, "/", false);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-template <typename T>
-void BaseAuthTestFromHTTPWatch(T& cli) {
-  cli.set_proxy("localhost", 3128);
-  cli.set_proxy_basic_auth("hello", "world");
-
-  {
-    auto res = cli.Get("/basic-auth/hello/world");
-    ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-
-  {
-    auto res =
-        cli.Get("/basic-auth/hello/world",
-                {make_basic_authentication_header("hello", "world")});
-    ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    cli.set_basic_auth("hello", "world");
-    auto res = cli.Get("/basic-auth/hello/world");
-    ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    cli.set_basic_auth("hello", "bad");
-    auto res = cli.Get("/basic-auth/hello/world");
-    ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-
-  {
-    cli.set_basic_auth("bad", "world");
-    auto res = cli.Get("/basic-auth/hello/world");
-    ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-}
-
-TEST(BaseAuthTest, NoSSL) {
-  Client cli("httpbin.org");
-  BaseAuthTestFromHTTPWatch(cli);
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(BaseAuthTest, SSL) {
-  SSLClient cli("httpbin.org");
-  BaseAuthTestFromHTTPWatch(cli);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-template <typename T>
-void DigestAuthTestFromHTTPWatch(T& cli) {
-  cli.set_proxy("localhost", 3129);
-  cli.set_proxy_digest_auth("hello", "world");
-
-  {
-    auto res = cli.Get("/digest-auth/auth/hello/world");
-    ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-  }
-
-  {
-    std::vector<std::string> paths = {
-        "/digest-auth/auth/hello/world/MD5",
-        "/digest-auth/auth/hello/world/SHA-256",
-        "/digest-auth/auth/hello/world/SHA-512",
-        "/digest-auth/auth-int/hello/world/MD5",
-    };
-
-    cli.set_digest_auth("hello", "world");
-    for (auto path : paths) {
-      auto res = cli.Get(path.c_str());
-      ASSERT_TRUE(res != nullptr);
-      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-      EXPECT_EQ(StatusCode::OK_200, res->status);
-    }
-
-    cli.set_digest_auth("hello", "bad");
-    for (auto path : paths) {
-      auto res = cli.Get(path.c_str());
-      ASSERT_TRUE(res != nullptr);
-      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-    }
-
-    // NOTE: Until httpbin.org fixes issue #46, the following test is commented
-    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
-    // cli.set_digest_auth("bad", "world");
-    // for (auto path : paths) {
-    //   auto res = cli.Get(path.c_str());
-    //   ASSERT_TRUE(res != nullptr);
-    //   EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-    // }
-  }
-}
-
-TEST(DigestAuthTest, SSL) {
-  SSLClient cli("httpbin.org");
-  DigestAuthTestFromHTTPWatch(cli);
-}
-
-TEST(DigestAuthTest, NoSSL) {
-  Client cli("httpbin.org");
-  DigestAuthTestFromHTTPWatch(cli);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-template <typename T>
-void KeepAliveTest(T& cli, bool basic) {
-  cli.set_proxy("localhost", basic ? 3128 : 3129);
-  if (basic) {
-    cli.set_proxy_basic_auth("hello", "world");
-  } else {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    cli.set_proxy_digest_auth("hello", "world");
-#endif
-  }
-
-  cli.set_follow_location(true);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  cli.set_digest_auth("hello", "world");
-#endif
-
-  {
-    auto res = cli.Get("/httpbin/get");
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-  {
-    auto res = cli.Get("/httpbin/redirect/2");
-    EXPECT_EQ(StatusCode::OK_200, res->status);
-  }
-
-  {
-    std::vector<std::string> paths = {
-        "/httpbin/digest-auth/auth/hello/world/MD5",
-        "/httpbin/digest-auth/auth/hello/world/SHA-256",
-        "/httpbin/digest-auth/auth/hello/world/SHA-512",
-        "/httpbin/digest-auth/auth-int/hello/world/MD5",
-    };
-
-    for (auto path: paths) {
-      auto res = cli.Get(path.c_str());
-      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-      EXPECT_EQ(StatusCode::OK_200, res->status);
-    }
-  }
-
-  {
-    int count = 10;
-    while (count--) {
-      auto res = cli.Get("/httpbin/get");
-      EXPECT_EQ(StatusCode::OK_200, res->status);
-    }
-  }
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-TEST(KeepAliveTest, NoSSLWithBasic) {
-  Client cli("nghttp2.org");
-  KeepAliveTest(cli, true);
-}
-
-TEST(KeepAliveTest, SSLWithBasic) {
-  SSLClient cli("nghttp2.org");
-  KeepAliveTest(cli, true);
-}
-
-TEST(KeepAliveTest, NoSSLWithDigest) {
-  Client cli("nghttp2.org");
-  KeepAliveTest(cli, false);
-}
-
-TEST(KeepAliveTest, SSLWithDigest) {
-  SSLClient cli("nghttp2.org");
-  KeepAliveTest(cli, false);
-}
-#endif
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/1MB.txt b/code/cpp-httplib-0.19.0/test/www/dir/1MB.txt
deleted file mode 100644
index f5a9c204..00000000
--- a/code/cpp-httplib-0.19.0/test/www/dir/1MB.txt
+++ /dev/null
@@ -1,8192 +0,0 @@
-9254835974458887629672873635789957411886024698554157393849494864228024962939550688297074527198420261051675205999609689838587412
-7948702662533481896767559573369920938242346354580061545409242090168773727371802699309443935396635866263937828773324526334321892
-7929250312741837331511829643632683169694074912332726993582394725302853411901337696207186358524323117172520907433878952968176465
-9486937364148093931718552300016332142708943190856638524388888569011747617956915519539025796115901484762122047712200094207683584
-0703675740855407318047361595661595146837376373951978537785605481083388906490085533348547865459237835407372374738389274773789264
-3524314516560200536698529022539598732463389124803873184044464663165630452635665559603483233341839268186056673186867104904449866
-3388466377320953222057779182433549144340237502432464295061371141084500222833875925546082542869030852833895137466510262849050187
-2359980877010447170873386178573828860442255448874794721230413368694441497441338856684036949118353204002591974711928301953002372
-6372613557152801003023836434406997863096739346637849381675791163293956729985652182807911615231198696051411047800847064484769940
-4555399892730282159333189930818248844009737851281434494736943722577947684829017806688345340403991974811107725657399196027995602
-3976607710681047393460981746843991626375149576917517874980586155555711990727221948467045177979554215577477183785345135535682148
-8981224019853812859833307577420310576654838103212699667682513798088777109119729024038590682109547975734687407898816774007038892
-9017123764104410282402525387418186790830943654104676998756681754083664849203556615995024922746652778319099999725942494552746687
-4602993085345245279681119328539229356959910969065035141679707233267342542524482900839390718291823532073464112692162110160887576
-8646564120617234541914353449310981315044240998894442066188871011899825887695202156119273906958004776559173081177243291448706570
-4866033151494706872899672197703352421058356661105030485577210664650513250767511742264039882291373723618030276740280451621184372
-9438899492601727676139376045138079061355198567322008270344297244790265795845160675322685239683610065522225253070076549915962270
-8389935622999431104891971065250599273560270041530059453015141663393829191008304620453278274234791447194116642959854046669653221
-4390066870930359126190473237338490788280116222078414392005864878004044572924012489353108185972058375678318527434060575546457283
-0571024164252835918003185534087097269093594036226831977994875139354124615791501602629221816855731144878875700135493432353006251
-5927821910139360288795697248742701824779517711136895716699422565064551330393130338804982871980774254446227613970394730940420871
-3742377272014443550088749485134437400845098911378170974616143540710504172620523980130687874417124218036934374655684373965565750
-1478423915766121994159683752043056020433068572256778826939436280481378432842397489866548450027752963017529841096517341127140258
-8566764493817154363962092792522076892737665735147823735202597353071978920287229637466345140359899735477359400126088124931881468
-8940255760337363163978793913265843793885760290540433771518954295210648595347128727773745692808704267887587662204824695198843990
-0899757006576147578169404543275069681042994730814241204020586377450354179962282687398746645565905502250948590090052580759060254
-6486974981051360582508378437652320531515639324364424491392656403886587101611394285202791775180181840494403192370521504242888310
-0832863857962097233772304981176182241414796661234070317886749751979535621508014316193777356696545211120669034308685700669047575
-1601920560631092775469657814901382577801938745924198963515833985856042317888652481510158158143597978988591350058772254540887509
-2132235148831014717469033542114409228818750252221985002159849994061876844567039235968616101425307518401162305005282076459564485
-3749005491254116003221964938075605607977980187695543266859111481060871108661145469674590183816636520815523589998805144183387552
-3454557776795930937812464849331806246436437524220402821725671887519345824588678830784061509096255092713692879753496348543679698
-6604711892156464428503873379368266697844691398807542828869396127474509499861163107833096454590997165019449027223124752455672795
-1464056065563451406292025100441586772081609300298880665395988771146415490692648836974652685280576941091682396423173897267646839
-0355383165630525414486907132932207574564820206814521900700480593494653392345246480522618317569197186894847097184780188176595384
-2234714652935409724403164799544553996270776652429105659472464101488105672623286713328942045106946821859926624587221567145826782
-0309935578008890373154226142294034025862773115052182464935233315361839771441799453095926400038395389556682588458216003237653863
-1061156071932484650516913321439215405043703716040614962270232640142284681169472791577978618224769535957766957086206741391709970
-7647351716205014294072195135184469100518783539374945598848168573993875333505334011212625117442647232720744618603822330582078365
-6190042304849971211815384939288709598033150233044255711655989057889996862762413082297341687788607689416591830790638752880761817
-3350993967482666602170935703513835999165561197161777938477157925978429670778105685120890113130859239045083522459241247368307415
-5460081669964922086720150722963115784946235169601550836667474277946931369187925788894576312382075479577915204545165252523196796
-9483728931707116749644793319165741326903913011722074179317419072713429472369240811255731316334667969479890293999075667048649131
-3479265891282260862086967904220845208360231245372151218473448305464967324382299780822943482467600298687513476936031155077963601
-5358607166888753271639287331221882667306965170073890751994864930247242443182503197751744519602399141153643026523167858853130538
-7454234112327473005509721991333469328638161495819890863131852055720398755713433050343878076412540696773945682790587599473898772
-1829500286670935139918198012253669665196719074234685642111242009658467409729732638466770339415767564217863874440642300491597266
-5585497029761221358413402963546931530898077983556347511671398790492531247609197801647309393017719703556474420667077635431137035
-8446511749461154540070308470454488783535318141900958816289412388611370858697615498746416636102261400237788596935028958347787028
-3125589335242227429164632721324285385335478344437654660712476162463759322956724441170491898597020350367163787012219584863841888
-6802337989299969519242898184367047999251583706804577726542893830886334416591927545136810611568115854449708934129157129519681281
-4502536799805954583144549032621959969753071050956941684132891200046324576389173182566153807220810192479638581311891427849367417
-6325541021938064574977797529368876421571303611445571554655335842928934553745122110842178236045825160364424732178843094315127909
-7416551206319999579172591987511489686313571898121634456963111089610744020435972487389528243640299599133169203384400119064268257
-5942558924368052900576494867848083529988242331335385049200017447913990221665638834941940132033114280719741451021709322013495656
-3034267296680277379429583962288582457402893052674209528241394670330734634693333770067544918231098413897817493181756172191761769
-4462568735945386723562623780129364617626340957792264088426814103842409805756856047587770203362285297182877719759239486173167134
-8181657858983878076788365457679611406051878073922935400724071002626732091440173091689286855430601190105542880854867957669944342
-1682764258327911438109776589215105175058720345720016147450773913501679216877023673201387960875767306750352156509386560915532694
-4168453046768399507263930483191895109159119018724369742162771101927944398681984030667327651300421681200981291741743361136642792
-5961214949092908589726506803431211408890378633711553535211419472586275853572210445315467622414789208830684013971300686277675328
-9269710543143964341467182430089608998710751826481978504336310277969086698368677287182389959721242273938854619109417313330166529
-8486459999966843090378171773263091325696386996545517566407679424699279968298703891528397394384066258625248890398189881141241156
-1449849546688513154852662654151484110306993368687380709636409815697889872688403677017676988174939843342948688833489247136945501
-3026821425662283243215241228426396875362999466310497066906176240972976192127107346129568606866349374029240104708104443230866441
-4888599832610923002904596161762304764008702325429097763470366526898011656507069583771589908698710318907474941536590688671464002
-2187786798670885931014137550230451723811271617853032443909991254363190383287294838940424051082728434647528986018234698035977262
-4010150476565439429491060857277549534561616385054516756344772776300804281913985317098584407945908254666687113999982299034911916
-9543106789274635042741853569705907409683466986445551664737067041728196021666244823741197574167419992584104093228192902092720801
-1102588771206288521669854794170734776396759389699841902844928003578465247527168100807066013305698109312645455547945036883046986
-3363256734764708042924448420459037705906529627671525144633382899415555101340497992824046104327698365969273385304329013580634534
-5814024400502542484138080303093675479908925878015957334513036393579080542663814740530799226052633254072603206379019404756963615
-8568459878266889844587337958272179244147420281407959235700418194754222652142770182396574372220705526302797889629403089542338729
-8226364273353855713782831639652716359809735693921459950536413341806490125092787610897542413754704628839004798504470781343226879
-9564108089806303912196187245286576464060313163695650258929860024346682416259472890719900060340274063102211811727469052257146328
-0723807096388817245239864356681843226170736144832701238842559718295427226555369395998370081796589238415142792914737246512392617
-4241424816471283201248965000004171003042756134627995493041482479770591013182623840449510466593158465328399081296605282376713554
-9973513220590332519460381924338347505856779256581376567327469745338170108702340101128824216183825500136464452346025348049667485
-8383897971629124447860057453350337067099519586684049058435585462779736095630666963739484221218567448740285624710665297561214099
-9964116268591382706460872763874878534297946361217165257274977145088020502651470013064060961213429959898581048432243027406481577
-4824315082578790346775943088343852549806522479147355182415674805204204673847884219703487656256651056490611337757236524094938348
-7062382447597254598729362880233858271292436951748099256624309342834053225940366427538355199347489811241328865453894894705029296
-9735693411211619628088603452483215272175364970550497151583596541206523461527332458408984429879086514102509879665768932131692226
-6961688387629152540756216546017259642317857065168508958573052496210655276891659756089714383999813015316305245290357709870563638
-3863034723721495784723589237391107262786771026496285596990386769945707595340965195448259401890929565886615037974745228156868323
-3287577904832967842610714371567414265151412481754216777139400930821306278453396427971928947503983582862250196984342590738386627
-1791128295449101351282899590128118669109794265058849951756999066974826947872800232214872176234126177766951584517353226892319930
-8805052099840613606036822579273082344123139982418321238213526119536401574939527633217151490658267375799590895845553195225375174
-1355928510541796297379079857922955866076933929404227257481153317061720856509437585235189609477388103725696248255380889259925943
-1402201875930840177564779603131963190398447445546273482826943610197406605496467698637182093544726028048446184407465904504733488
-1834037129267281181848805100644706716446934703366578946950288560270548606368029542736413168537166947783032181537827321728818305
-2399588088866368871684803227983829485917501647912319399696731866908470118289600881964063135888922021379521028829404789266368968
-5637489977535077950426899162426475829892339881113388204978816994197921201698140466319573566765752657389499556451516488232245559
-6112692169213605381302831305889438504096793315962284966459192757358537426473374519814657784899843476819443537896967951107338491
-7895505461382759098793722523795396339534176000429147383719128841803883949006205025948100090981495836498310874463726230844486437
-9522042614500829901321795525603265978871144309432521198633117362072879318547949126425751870262081563243482328537146079314556599
-5093542621599279420676140514142072884094585996707002095359240117940447064308608734332029368110977503867431654445743620282821742
-2074818355004815481495949283111185240895061522427508730372487670815127557063465146879286952537668866636765956480834805349247418
-0982616183770170277896101663961256388046096956303414645662042291995673037815635718874781061367093483701372208717092453548930045
-3197990341408426456860501773717322183556963874016603497159407408857792270849795326742052795163483613191779561704529979153717213
-0442381165605136382176204027769856937910886725474913822447353042136166362618403395513606165988761350028767809916274534709139581
-1546533500647539778292217072989397950692244341857345231008319214990106951110301762058019968223873956867021450221558460837271796
-1089583682950702039719953402978240768135379617758154644301927987331573523265837746123630494418924793748993674977892210713791382
-2010498095473532597719948269554932451554991652103201520706494302534512806373772862577948592827967992187111665796229241795272327
-4495947525239030494005205359163320911969546009892986032715554824732415447400580445227801191434206229755544175085033640445463730
-5799343664533857261737308836915890943267341995945607000250119768647338018370977116150224513412795224930773162810128318361091070
-2845165641335198012087900200223115487995666447653144922411381435396653532150893427712002942030941647409112450887593516206623257
-5995936189970345951128332927675055555031225056766626864377451946716279426300206796784320339236602175243416848009874418064376734
-2751388225971927284674719275737386426623723915170272496656834116124167598744380632642578314683658323664087930294748983479134152
-4463890675024338744201454760164930410895360686852249316115526602608580347281230566360947860956394767605509297995646286805155429
-3902535272296902694906404269870261097232828009262961508419387381919670436136425912908116240583462930917866834873246313946702767
-0171550221706917129701789274673785241823132172160837286626181116666263103300493781986590027327174868610919833041462749008446670
-1233446436949798212579086729206735034953949556045481891487880919889748751337486349345808929953562851746791383784762700811827813
-3273320169223863915019571833988285591541029709234409949795661766708317004888223115613777281294607726043777706813741640111212754
-2476840221289778122524588163601454015024966289209119530584971298419043747426874336591254749329149388984462650479516131162264547
-8321322112340265706034027413610131445579234122444443539849216325832257070066442940612976748450142222873158683339615189385385401
-2845301295555610107931163495080379964949955895954082606347174241430747973616106979000794362756653542557197433894470866065773098
-7002289110540946230118386265586199860767183813803128176222583812066464632835592487506968002253203796340562076570806978606547027
-0518614265711371822209002835579969441398099868205035333550662371029236766960492501859441092496004547436756442048667962205035734
-4662742623053069471722274771033535333247780680117662494001501801076484609461801093095512629224389725470873708072969419161134986
-8879423231727024904174405990021786946862967043559824446453539979244586561718968470449066018656109597862462444251052806647222165
-2462868109247823087920350263249330583062507248433983310105749602411182363633125913535849740456631462938827755069526554867046297
-0556317986368239387236732047607114173950737209007825151623731055762898522619516377121452352573813859619423710420648830645140602
-0693502619716624171936460417629499350461603844160041861287075322351538559343745415528939056080652464222483749575581089457335292
-4766904028429523888256867990946783862212788485169555738269492360138212802976905819698072914952002888319407814152289904290372830
-3063149485419553279766015944554584134585112055860455417890621924246024514671960271622075351843821409825893454426591239346175825
-4138071925467858356596514010874840756148724225545969356853427243328235466057330927837715365449101436095007553412409485033663473
-1718208277388066697955637942282188804022877425156297722332673824998500535568426990569492133060260476735245935911435663031104540
-7259896781146483425619092546253937377799155709431757305830799439617510543866635784180461435471514956432054478723110546701399601
-4212208190748800869765878332993087846354727233690197986460622890272309218632979045510485708917467310543076772888886969650697402
-5830555875156620379814707898244277917838097196097913596741388644704517369937389656755811401456911697429799824431768975340394565
-5218384019129708961023696421751573471619498755822698446106554346210228582416782419196987283985815988033363104751364948821321736
-1511408675805990625863697514171112598891753956197059919478438005392395089087719396999097527167894172833319566356364163919692543
-6760864061185222844062388472607262118669410742190580800609818458141651702885176634837319000673951554557807668749868767849900633
-4624693982782044541974663953840367719217355838087352148000020445830027606519679992919499646684217452676557562945022247829061975
-2885293059896283301736153794239325555898371313303885556968069349802848506212069388120502744705750493536808390340479824477084109
-4742565846910523167821445663540712005957374896244507720218360942226085109738527921622092099772083368812073433747682045449511884
-6164131243427554092783794384838205105688550227514505179310025715143470000166045228305059905780171994193190773288044579516190413
-6196746209214286300600159852801523856096528659384736317041341206058064233216653841144231397934288134905891354902685060365011048
-5888543435289034798476752259935453803961756168693460157400272434328483248778988626059542292033153708506682448981834226044225475
-3520105979519175798851693163134966793094384503981145911295918784323346445102768597120762535638265452619900970085082259502423098
-6023108133594199401032707688284772080067633191011227704160888217224741219472651134131857620995953537078628999627600457859691029
-7135355737374006279317910328897677569526320656280275576870747086734764513800879537763010892690268998504415888806085447064856828
-7067645951048993310751362481424429404370974532580270127897680271443323793244595619510531091473812713032955994538657114149409819
-4429631547566328842887647552139562050329710358137821590185444827892759275367380722401524911377817064992340751082835810723755618
-7949457580263990600187866192739809055130641391600646169338376355962933757309772135951086682561238922534649604316450790162767470
-6778696718174528127426896010544648198065903564137512038147927254912585276060875391066341248912566730098691603844487954144583289
-9567988530970013733492869819764508889770837509952069384446637448211216157716267753953316429209184585653933599673133926099458608
-3413492966631743395005504952764856687552734825362970605800032693220033767913422924066513158712050177343306017113090503548595910
-6782760373416377101401788671756172877579108677684185994928623883970442286211028728581037425407354811624955553337741266271223038
-4228769569080076083693265874897262718489495320015615486943453828550003614854151710616339504422293141400194809493593482338761720
-1275749976017493214306625272092330580872354604747422498275624636561377503079831465248194508227879655351358840776762816388383155
-4044611547062276323077587550347056464054608166550263311750875441257836393920920323092209759398994038142599127607649577377981910
-4521255521824521693676238300467676986666555950395922139641083951517880343036286546664953201729241686129223651162600610883998263
-4053431348518058012397818472045875672812077824208246071436792077005700411785602017912645840401853632467140385402691379589989961
-5296228207351306866595027867237475870719440724477597041700391443928732836085081541635185416372585087892465757549359102233343361
-5753047891155830333399279611743974102446066339908340811693445790222472707295688908858729491663915472040238337620182908302697924
-1508699849153464593476010736879669905272623521348097908417836104685217230447793112158735284635375208948973376371517941685224649
-0333224377446486130711894052961084313686306998844675785828086842465862992758130724435712277355911443550657464532883107599718794
-6835605634916383199967953082993703931572871914916373072477880100548805151438790628235173925034028725412169450381473208146789756
-5647596797800233744008641095874820885871714922036190240494729749620603436690380840330661337877272707920476284213555812599419547
-5513261332211064956118510684223202485323331553849116007081552356506786559518794150443263231676076605407451231256028775857402194
-0513233346964413426058663133294017428893643801135629939987380889256710071523164000264715556002787400893978524476668487881682249
-2238557041006601823583800792379249859430190860772025645499651325329407777431099926158122243379494002959281894688702064542524790
-5329597914788889055993063859757359411515855405549076867209561054324585069797183524577493085961561532791013967475565456058906425
-1727267651465421481105710991587303136944086691165624660300683125601416772368166283177444892976868345022274558919475820725390404
-9723590243421203442884921434798664645968065479222983928276913077586527562214486087189922112591555037425227530771384194025142882
-2491150360749458092334991769156796313818947278756674701926505201943095015129003490350920079450451251986198697962197375931585963
-3288323311745586996701741630221983319300390047571862205264349777484027201608059718085154305903308263735198400749807369566973087
-1513669962911297058622557295345513797998471626294474435337069062590410594233688469673875484253912558586263976338954760252676149
-5698941909248281308488717883921117273305117757034931046904729563167368375307728972002962702645828488935279252804415118514787991
-4226862654077359109954473957002792990601772994320272543965433892756039129932073592057677191275583708907760929447157089919000104
-5013015202975115790118348806423060224599193301855272198220793587287609415484559416236588999749109103840932649489845113026318936
-0096212754630289886604076288072412229982106747320501739034720205607227829189554712104511341545586461792092663001971581276075105
-1400830012525551115910295470153382076377587383792342868236429581401216573706230071139732339253271088253819425521718399148426972
-8130329129443141149308342972871751834898890054061408002066328617017958243761248655943163660366018684672224076482931610024551435
-1612470444029502611969134698674683976299405806211129021898957209691274647456212891723004609478869086828079731180673443147282673
-2207763612557030174078525394691981763423880246207823469307642881721011975478949627177448531469379452033830830547116487954748579
-8943550014526152971159374128630625318393391528677655228099671641521821415999666028671716937719971706453115362098995997004338463
-6633791090761145650463177053061879817237525424207069349153087084514135819202898699531517360951263097509259970351913296855368085
-3253556229437227815840782322932038842610282009077575504105765620857277275220518640524545781112378703944765595787111117088536490
-3612778048987899240807648365404713381232983899393777316948941796158037305227415310986733359795685540845368139757679718651388721
-0329656082303032301035960655149116897998069813522388783445067885544697734848160954106786926689147778838221235161040983098545023
-4949145925422482842946072091038603570358418034882170359973918018079551251028978485799644769497234033416966830413282850538365544
-9688715528548523732988559882524759509039740049260246259447423254924760566724656561201075170029641287177630144231062011355479091
-9326655743860681005816798142139776662356020296561383131825601205038606699757827396575776760705487871722516625005501108342115046
-4862493770761711413231246894538240278199950440029797832691068222332648670966923316771267216815856555063431665762362373752681261
-7759348913324715341816977430054410931106803880118579894939051307627827449748451051704548335839341424354678283555009009093334643
-5035504534504599464259968803145065603468459325562475588547886212145426779673200191888479107787688352706387961887120658923163596
-7064143605981003619608323632499268464142806140873807593464533126484595249138527994250140164063377300752448939069709418760740581
-3405460804222472492156715297971710492718005664789725902179902462523655008185987881883912400930038752420707768027434069222517179
-6201754337957471374021641947490208688904315801118730053700597398632018696041671232277781587402859428981324544384470959282694488
-6581501955752939978682011949909110724289175482558070539947143137365139752819830357605189104362596510417675677952395485738392629
-5415386438105335984223237131949793153812658394744575126207919072784736846230789712179591745207901814607314375532066326818332653
-3916132472388884065768704630042622537625667251509691545801542090771247404318802955070620862627476301969800427094218570764969521
-4673296443835065767694158631727161041961301871016507435883528289555722603890069782368970629525870136617529702747543702356107980
-3969736866659860369283152300636814307559050510391015595957669034065148689817184431746719346979216411505522453887905503375134993
-2033209673996359127998948182294581452192221728807476998740417776019537129643269360367751767407520936424856588589036363660084548
-8920359577043563701436228560312778025314413146903691717334802285060730546542075837699964573276987471415144914980259764316759773
-3627657012409360919929372833162804983136382545072275729679633045374976939117136265913209976809144657411039862524163682772934353
-7062667690768603813766580397495981633020198031283191319322060508875443418955017187814158494951274114076243932640382433951906100
-7089164714588749807180199878456232640504233132283953906601030144605887922753172274055475279148519962245834295034899100856266109
-6314588522281633268271129575999011547246790816567972537919142521521537511380072338334215014034228037819143744053883142669885047
-1533466041592069230562893355289214460798489775583299853132986367560533284715718053651634282346811547110422080041794519104713892
-4512970626101824923414591998781160477443695022763348614143799819070327746195782058463430126505518264262282025424239196981682678
-0616389983515682792619586855106396642118585620436668809283536133165065564894495800101984339481469054418070569566522216534870046
-3480404934288007401354060197932800798509063792079011642804930003377191431422069063134440047889535881274567178940747418743011151
-6923077833597121569133964233884887129884707102983051918568192593065049229148460460606709813558966649828440283419826988551789494
-7928629618912970441223379654942167876674509009329326197500704752789973531185610595644942798244043453568923441723724834770288101
-5686916225325175369639383018669733714398867749909229151589872339897763998251848983094518391124033198227341074940345064217565274
-6976813108342658294069521014494920511978448452850030848500379855545152314960261910035283177013574685072898109220517966532820914
-1235440485859974578507661524414185881273494203471328032423655298610228309217218895796957468358842309363210353318874365415441005
-4775757215064448647761305923181381380005564211124254441169985896444461359377488533806177746993363765363744834471832298666899659
-6549502546484198000053617666533373457701974326516846596770901748191355355442117405686714513545060992856554971022392931918431672
-7550521620433789157641377352042796699563142807992890238677899811145361588800069593324309664156547033893582449253982866608790396
-8335832703903786234598337454771069254394148676210696718885661839587950139009136903487221685179093872236368600881697661914186761
-6081423646547430855633909798819189360248786532594620983774708429259122445948885539867620755942089483824811916664871291112367965
-6763010129734054857751250818823088329080234337202140258490696882947562857997890963039131549439624749888135285626495741851799125
-3823814359862336359300824370629334246257087407174522366323576913384874982113357872199582879993086251942490130349296563220714459
-5201936494493880745125428463676510521663426683417020693977788479860674628237207703884747094987717754212968764024565059007572287
-5656800692578264688131164439239627529022443380780216659445516384845610830241501827976377913518196568744298647947111534785980646
-1465035810576162949068709350012676100595272189178329025511241633720229686245517256992739629981296918245960598907587127807526613
-3498649092457065189914681277177637039326561250640746889454833842625621406771442705555721525931725554548176228818511280348712812
-1526903631217370487596090586369687092431736602852047414002552907015226570166585529226164536775440508494117144839832365340311216
-7172800070700446830268660237981558246985408200103623671258540515214258800554645764441093416997150958224932045592907480540349584
-8145891984169127686107656905169532154735243264685794264058843466267191409417280492627793038318403119617408184518297221316412215
-3733585102819835157576236492205872180664881259553134950516961350305063296415930019908542524245430548400901559537444244647471710
-8919107817519795022023748231546623121376187758240479239499900553296636944913506176758776881811178925344276782657634277574411018
-0087408240115194690559689367771085179492160150159772172117583670772068640711181227707347785373406551286722418977845204918371862
-4087671496873156369239006050995430210075877655341012369255927938969111714405072240508066221092434986016434496634246773638497705
-3997764933956408083465951727938645280914517402927065500370134817839436837421504452664821784855528363909858322652715776945384928
-6358034140171396799781808478643680937510756584505346662094931360684566558016245219693809041873394197337373027746374913052226841
-3523525169184690915788330052438367441556380178099903982632705234888141866441214930597392851790874812046196446764134474357280196
-7912390044622498326943727559828557263667260605437809865126129166669886288145038860031004268429510310452514645934110806061259377
-8350389661397820495902304825219183306686077590455378114318515252557794852940943308375379300282537760761994418165168215848774199
-4335948571309322083199073879107610257555821153883090762370374143145191005083410872058977433580493717339726072170334542991808382
-0741068478360850873822704930167309345230781173492590875420659162725013692793497218747184011101436665668426379299561926131540226
-9684119382210299933488533355753954403421331470099036025961973755235128720357457186896140454721156015369426494838464841418224574
-2606550410151415944627360045368428365343042196701567415760981599314167562524281114850783881875311867997694821988388783550617647
-3906118902121264712371873625367711895188485445955724568729752600563482629569914020509331709891753567605376276818895453947988485
-1946035303735634882855442231649687139100528774921727985325887697840697252312164193587116219630593036960739462878472488751794288
-7553042934057050700594030020764349497635594011506182646429625749401961796662698874719407015328877341348471848266936805626731614
-3965083773308342246671432838925759649742042738645731254867213711401607696364783002153346490446057228458139827872431818981641456
-6290917282609648173484002432007182859707772380995362779354118181323028872604689080381882966273198128487451758287389558544864092
-5135412345654409193398015818933242323380089276961210614666090376540312839620184116491698184580875294639581135409937430385452967
-7814752714924949029739912516676992468879575093818117912716084850528773868618697654019734174399226706840162753982136880421595798
-8344230549785765490790122830425599688553302815508985004520791080241214227127540251939234623642895839337504147995870998311297157
-1312261536153577576475501063559792340822581967430971162124952202625290357772475691141555237352878643256411801046597748593662978
-5420113078044378326245454890074054926337548530109656935414953837202844128511917486560998089330806876653700112974245139455110655
-1446316293204894461498438056975498718142802987046646526458433588790266320884188848067627056955062757523352642280099730639892974
-8768410207973700878297712434460869178087366365740643368423050061014329802628323539796504787700469737820946806556379851425348409
-6903484946126406722104799612810275531016737884354336960835748710713062889887930835389522081146458095107803234373499389860789149
-6113798456809198989364723468291582407592480139088852307707256783165897446795918270682937158869421622443360894104220836046672216
-1297180429334742843324101908319081257574325368096788573404226330238491288173549545719251363488582787945804486932260991191153289
-6310060489009039954463983763054135671085760401926391779699811819750329003225671390731075907159344886944959170333579705985011394
-8928332308562582665591113793712076278529561597438667031252620919756801258278599576959931680328088876910755153375346545987026059
-6122799394738485298698282219069449469308864175448069521079405422190290510333027132055402559422290946776150886848955390869348557
-3298127120443406100122108547957183131539174057790900079286455780159808161628252012286085211125545510059619150351442374519647873
-7895547723969636832110890595697353438517639756208042458909186966958825057542753856885651750056062715953653156961335641588198051
-7242277604059435612451710438360700839539630420328128639238629662384680381167202360792624305492770524378775130253064094350170239
-6328910744252096963453975544360333319092492567496656064841933375445672717827688660311871137666274201081402086421470543791139037
-1263075806974163649200998435369614522606717804984408053096263479824896274273438278637073802016955266073407127338686266295417138
-3380472791463934939167548524939273036820154830243043930199471181363843017057589926197441097934643398001941245455025305275718778
-6053039097745341259474392045998222000183392630902077243215225896980913571132934688432219430448989534298905581203790323081204451
-9398618592749592673582297312578194153271726432191886003886455601016177152460729663034185278967994135744387261240974218700552874
-5660578626067455796320901716488860867842597868415619043285914590213707161427735661103212503097888685177044222466862770614738888
-7523554669658437443860955048187147707950298396691077287510802686031319997279006079308577219459278947413769480723164988814047848
-7728230896579900984081254526628677638403672817908586482917564357430378814260695955826428360637353362697491648099319657648279806
-1471506063396451021205086178083016198973053283515072407397794280863574093292850961361893442271480652011908263493969049518154719
-1271663389268841465526530211516124798508874084299647641127612963439336172485890973748223056840291177210000865573662838724859865
-1558003045612329244947071838328209194658672648215862136590055290358556159847830215232765640226279624286079243381635121169856392
-5235686772055013347630127336838697764880220575101940207293906989459723943700375632099865606791689918944793971999840022845627855
-3362608893556970872086765317357229622168187942063554148251194799624231946317410456787560024770536041305554794440402555379048363
-5400711312343982155393978124014413441498824140561950458826861214386401267011236483424009049988004220217832202185519723172983734
-4739966966771226209909624912450025675969022747113454805529677743180928548967947375791545038561055048316262023987945828187738406
-8806383430961455857801815047901978280522034447065757458634887588704123408758546678452281010485610787173222519794754395918755668
-1313032694820263690081002684124072214508820793025272277314613304407858220279657882431787747545642867929558977205831435007980692
-3821423807029286765485523471547535800355065560255771366935624333716101960889324812432465967939307158664437101875808531730514686
-0552828401027435473969844207309352000803571913860014776373394805498998489404828887974801011916107676224063398083299850490285852
-3252785594630414326772320135663653623232974740345887923006984684749440127689169558676316478796812920656203083787608388272541143
-0886829100701462879464273672433682081314775699581471366939184918943997271841997863805609882688632845996559926289731733309941773
-1588621110929737275611330049699746179538000510503020090443485760166202124848757232989323035029655555830280894064603577880623924
-9460393092105077041540924186306320293949908924617136654677663794806814239207321566509608838781326729111423409256038330560254768
-2457234134203393682333223194421969884096521962196051357781698196280191186003044231263105047089066125824374037625184294564841726
-1139020355104202113948476242624526315291276395095210708873598278111336130644448701938653730158050834519082575031500159059606323
-5508845274116902540996666349891489554638610844733883825695366107090243640688502082955261760220172087743405531646494097110373564
-6139164128879727447485151113660365410811051772254913947601863445614936478465117644061091010800284725353254306320280311126282508
-3691867968556520735423213939515627425003649240791159831598564334907098275550400308993911728901273767070664323401959466199812550
-4385285527314360012494827503644449196670340936661875727271329351754418864846693134514944138823292825239723190822861243721969511
-3358507325257641984977160116136111658256532073729689685425144586604492783647635836225848095839938544002404873700622644589011676
-0802250613087293781581129847507424374630865942136402236774163044580066760450481644654868348223850714885941401523519942001370346
-4033651642172702525694267019009943272304377112789600524789052835595443304754361088227651039992096267114223436584457492049115625
-1008702122009370555007456522799161340685826326521804374437361823776598365128302875870953921955751574077453333491368066562183540
-8297016982983877478208126579509560908805708870139177751490524014204560610778740303237644832086788493774257972604784310184677682
-6595999611158451837934955382339066842486744152636969464066220937412139592293869816659174158028425151865523439443968468476337116
-8189453034430471397425280708179774110697730501130625090567026833440338110187758034977661201862518966699911402128869207946665922
-2967301009332385012982602845125958037212145265901920840751275900004234804254302792404413397360100212415586648851954797337031843
-4621309795646253111797549932297844132545282162620476457572874699573469126157531277320612819758228011208417228396419529928921453
-8015689409373876308149147646698419734053674168732622753328286778805854267784590171527922720365829353861437404497654095122385810
-3928532819894452405285805315911246752486216644456327155370715615309647716023031992277092232949890587556921144870096925641170977
-8706990895052933118940892301863446619427769704201470123344557113277628075518257745853511560735206426541219526593186205677069195
-9323565048038756996967463636608859147371871703253988562924960678047445864387523330892542610569708364248757858563962167618047606
-7400110024724615888960177029937719273668926142229826804752461957263527604940620456908940268767529855383328656980509173310228171
-2961079316835291946492496420673777366632570317335815018560521820389694972648667220189874230520964455139599084822803458488491752
-2053325276467463411017022059798270225751157375504499399426618848961341529109405849259510473132610506746820731096435354555540869
-8022085653261752864363248353443911714595466837953116893617432029480864961559617145874891482509931363773686667586008577729590619
-9511531059462330034969446429670396910393858411286019648142180898913734931062268324002479006487407711948954747504728441451817299
-2402899664016344765585783952968436864461868976736500943447165022135283244224710415767003722013469693233516880183011359108783628
-3912070384615994999455640965424049848090544713337811655011624123059617272139004908000480810430015004300019350285545631530421459
-7040129421344930471792157420616841533490962354840490248534268666426427664847776443733801972606800005209711387678959754783758169
-4514744752921544867887197341433819468485319076219844212297689345457872671062595496333380534044033301910072934964202067332750929
-7744301249953061021059801665718252827169031698368805857673827901657376462120738712603816558346872095129968009454819539063410887
-6694959951385441493938996005094705323326365638007625755937236084671116883434472854253964886004560210329640317017985931432992507
-9830755088107356428137960573336610521897465624860840691251416368635190221352342520096074021567053917840102300469951496094532646
-0386151915867137989482068036180096232759486104299898530934407665433761886348452364475713105652919177827149093478062390353337982
-5026237611119968967543921268886408485214827943839163757065518470886816959612437396882015040264309844556286249899479340530273455
-3790585606726228419436731177762295480034329918020969162076958086843994331135466429174339242003665276457867681590462499745066166
-2010072822988771442333707800353630624045735130580706054631404185963369356383377732515576219388977808173711224814572042638811746
-7799862036041836103498954213010085023304912197271099528776247085017591855736447939941510010043072233516636490128682332435837718
-5444031310957599380550217779540801553000957068137470959947071825380695799288846148959315246034349773291226461068837384267657314
-2720831922046271298345192916201975278989464655822747470522487119845175483171802764985807888092086888555468865508558747670561030
-5037268239030155207644532217893862758398321608270496665238719184860604497280537678204406616537105359104541182047680859111844623
-4406453518829809819978030558459040108565356220631255519247977687593573153889331324518157228436273334635625807524985686484922311
-7999885151695902136577261421847256015439589971601084977870060297320803728853045230722764838994142711659330991658042253610623719
-7149325976325848648664235796296763337498794913699316628172271388813068172391895353748736320858783488531575015143960860926515250
-9988100123929774124197265328008141820710758495752123486181540545695574140507942678614702580850949656109084164982037643220132234
-0375655311441060929515636645306301671876166021260474227545267428349070029167644989380583812184485451805574601129180998157634256
-2128590561140195400524100610776393812855470570049174388092975612532917892277799041074366790055894057834557983976227857050864930
-3547444389508771568810075527864526064121655767293193457033048336615284399475478737509966968763107403398079684015244980874035979
-8519927849602061794266560801914694036469483013102023144973737181284943231700919734522079332185384045910178109811932848109276138
-3567893790780435626536700059643971391023938979188277544418757492427060624484762199641583855650960393640504524655219454811384399
-1735108417168233650163860054247929680595797171838825452321119827231787146560622246912322232224942016739093046379276365165998295
-2756695873865903361436041234030623662053438358924238813701743016813195378135003338279782291211315013357508842537428877943825850
-6550701509812921278785065189524058197762485207459987155095767921276575821627138362297358879947692406013849533700244092475658064
-1746417294003960060064872265575781963057635907396407260460748957479942537372418296161245217676807862873866767635894044939661427
-2752800199195253529712854754798642118106991591404644917342058968657791030752834046050164301961614256798982226629143783613672100
-0156432932446788502003627727688728508740309980174215347673828299641766130526832968939502574943042109833631744090112189289099293
-3949539215662926707735521667894130134427486982796357220482855624651559957655963754443694394481228836760254413314867991125537370
-0833694740794893624914563726494064663925162779653035815936273173351045298468454290966312347207985664544908635066940292067018215
-0068104260838913669470167249521001975928318786418160510709377212045134485178004263296128628173776672447600907854928188803969244
-5213186606414124173974080816812650470078589656434215381413340547874523982782714789910645183938314140377172417321651847315127943
-3831079213870153648590263375611549325132489817138611364392701108960231363751036773655982850004119077364131468986709426279928740
-0816735516514168218608953096598217254388061619583961807831532937684267549690578384517226873045647249368898189499267589557763196
-7614683199694761607567513771357320522896560891215582525317620218466204798420014498841517198000714225395529432437408592988810647
-6493791813371800888731383040408467219612486147146096499615909931691397312978653723829961950808111958324158561777510444489457609
-4673680562966535580522867179325650694242060572148395328716350087210015917993916484085808071728589768362522840828065262726854285
-9484597285206848463033004828740831651691831183702931423669671299973340807479819361399029066256705512283915649297270684923293120
-1714285317558703325551063623439102862882087552524008272992080310001454376923262343097189280399813634553559119888320098054640112
-6878492562141548781762151287184309582512789444294394903670308453724775992147414690794148922865626436020007876554089383158780819
-9151911784071444893456939300122542765400868095022473582458690303654492910301968711120089416900205538880607052645783814509878005
-1882377638793327163743947324933816937365677683669086577608915703348630259888777501270806753764247220631643679580537815123548411
-6272056421434812628524453496821198676269890972424881983781819205395093370536909259477553372703891212584194254740307122112225533
-9681870026283102041075727337579428100736459914910652574617863758549452931286799490040297351890738617979595875678774646214173033
-4185695124550535533485860637896723654154834853472854068710912474987668413470803105179616610921355620666097149488574561869489797
-3333789216162396397679204330436931257560768258425513267401621836728579265694014546537584859527037491359360764924746663506919770
-2081504393567373511045831331064517139188352171030907247345004840816407938277996907076471099879274974679268216987024065310558333
-4237450865130692858281322184224268516039222037739605355087614033374925113958908332718451900205100215886486089988991485524969556
-7929075290163499129098877300162688469599528046726233844196457006510599251899484746828484574667591829570772351512078305736672654
-9048657921163013454470683806356852138380411128268107788272256300715016144618475970710912738205043728268553865691241054834233600
-7029431095139361764456603528202380622931434502522594214209499225882330762428652317267948702623321489577844016464692915246359712
-1105356646640216883904536505154508223476242075189032231521222657818953039915135319911079058876034135094530224254031516149971890
-9040945596327638323723931073336767619159273652642403035784821558395849500879059623038153539774239738033911626241510146918039749
-5283073188137753905883236902928531799079492225443087557262624838420087547899455213109577396225125545248301841891417389453351792
-7168518951278682051937542342148124215459196543677153007216757499379420036959725544058917170458823956258437616459586004329579552
-5203183504391078070063471026373757432195663011756522268894506479810617330340549685777010011742133881536309636471645529762659089
-4854999787239813251707701121392165868052289429676407362096901868531485589830231940346048063593475645736706551014468995600111842
-4955763538748975069385515923948951672972674499411759026560381765340448515748581186486358853253830173480680063909301824002408127
-9640228631714593257928903905827590703526290377038235443447387587380382054598578561742893844220053769466029427853174638397427339
-7206862882358947361070854137919196014699723353543071743024301192848154276186984110546320724917862537765542130378492262094573104
-9132037902884622149627426018038745128067438979528182768862440252858820253995972446342211888009471423051493159698724414795710825
-4044729478097558603438562691316366082632115863305337165834502683246949426265600257894877978230675496217762990369003197560692400
-1914819988622085254720645203900712417397542695171367605811941681178792903669629925720096971822910923986744641852805301639652708
-2489879698662595408916009150319958484334649360641536805110449468835050783501013718256899380316883895243102069697127104742796718
-4988423693542042725154817443015091705766869067613353141088272355694386531680806067437655514967029170154529196712934789617792274
-9999952996574987268331116423939940247569869095269736111023291772144901858552922926558494336795934151397996022792048113880115874
-1453279672186008281192597269984891593458554070326190463606379023362133764652707672957322700161490484448540753367821464532839504
-8011800610118047251507565848810514239096971840458570325653839372359200258329325658866372171001058138732560340444368314621028592
-8193050742913890615185212677939019076499475354863399017606329114085259623153218920828787136128272822531407941969673998134066236
-6165032662878134088891598296730315347615307351518186514382605872591152954913301540364688295560996800081490449469152762525841628
-6574519924837827479315694440706135165231391744110344384147108151733208482344899812368417803491072197299164648305134049390042783
-4020778253016163495293946067531529520938183648436344477015365877950549136205835548741134429268197026979922853216037833912140076
-2560367110629307999607135522026567041549325633921424597293236948045008668100091755427842685667533245402093886980655601060106544
-8546203408136109675436916166218885966337393842202215612854795887800951672240495314500504099192631873269330473780375743830861472
-9788815056490265802740571039729926738317636325182129335295512619052159101153870121975439793577984106855088335077085584239297075
-0607830196004382404188902942190311303589870612777737359147435465863424442529799140567063628056860095478745600686399779891523221
-6451811221617351847394635729026502559474989696391694472537910902735717543356566711060840045900392940941333171363021277998101010
-5131780001821762931334985227662541898093578808808129086254438607279239181340438600040947973426848418990057822839591824881359023
-1781431927220093804299065870243095263893435123368341056371775420733487563878765425465471958566683414339834418118022714155686281
-7855784526694976383147640552245153733193000678558101047345867400675345449097722230036412101539440443445801673442840764573276547
-7277064664195765848534013590019916383557749169375559963951776576181466602296914352536749809247940247872302329782226925806468043
-7192135649991318277247808266477765244997880386860464765070023950465490749600254005312168230797058556941811885358619067264540155
-7745942254017380214048240376624237449522972214173349323588251697136718540827110673334670762835744617609275818957162829921297194
-9308025524075793350930587214905796399488049433256186463627589329393236892726854692113712455277309297788479077266643487682416715
-0884436213404481146144542589017779230742715119840784000653264872459751590076369675379177572780987987657953814990135600852985178
-3730124530298931373240431341115710398974380360265132276809345755075936226833617497570877144367390338090832665519341170114016004
-4487614165841966483390809601332500844989818602599615930254525814591372642009685306021109318297597415196166334778397096512192919
-9738135052767202788355804851260065753666213740432424577877433994081030576175406007197406894692674226624886870624390536370450115
-4972079333970854412711805268652812255100648740561624233549801666164086630826247751458218621070591048081789263645429911196722042
-6264477153602121971771346665126521727114186506364463613567938860398188315590497953212091430368302124372365408850328299694402187
-7096923163132078408222622634338258654575603652287595704602066710353019363339205986259588116309830845020074124235604674290929803
-8620319232582906151287500817533307221837336344013921731345438451489042597967502976685688377786979657248449082964352894633940456
-2338290774645460787964275902190755185934483199622353782037807590665967507775691698706742149485822727584225845398159573488959138
-9690411512559467787285374715845943612220011261976368220307963458032917206195128934924351124238497339947198608551639030163894645
-2522942273087160899325601687017261599086953489151039944965907240532011926664847298253352884442034273091440472287878013270485552
-1149024375555901235741559582840384810679491209306220816791833779666244374445454015124428345163452944670223052356961455086641846
-4911582198911887147216938492382715818668300238279079306283822841054803949022104243393368739761683072273825914099989412306146198
-9386705286204083264591504191247314048641049210231970001783669995174466309042384199881382505454205575494098905658585266777083412
-6597181522016787958122306510209743227930379650431716531860926286813430719462209935654406493573792531684209677728726902971780496
-7454713877871827759953186012939103462107245349313356776395316754209733644734837949073664445059496108161795213098031298387675255
-8608951097824554197185243937211248657800767047324365682759725200979621123783045604563185385990004228189141941283634284151650878
-5110742662179788336448957887870922104701629467080657819437644833165127617594897707891497065965495615130086622172410875337801320
-2393400609667414757827986008711153834467770780863121443973568354701559598965757992398836770293536284505657099974035105460765424
-5696578078800033701889220099620389665546740070731873354278406253021517777757298261519059116566359233204858968015644380662525991
-0719487243613892918578289524307174160805716406329931625803050285847534463223682481335815436403441752588538391995273084423051287
-6507583132575286651290896026205391515246827860101127710478694329951379556419208073957900692792049817183622267407642643093594278
-1377392380718866307096826670910831948575020464783957275980748872622490677834200043136176315679139636646826582155786548373039619
-6270395893591295820132189201839068186418319333704429754904087462921395570639063307809781688462251183623162844581418406608429879
-5043135604579355727135840436265306254474995931628655768285052525690960177800386175175072542969753822246288489006113161219380471
-2468870042718971405890990067722938578347935929978019468025646064389136067817188723296206441343678326386730657242344326326352583
-4850753963828793552300794217123706294629474328454245842829452531896699931041364932772984481884556840376569123447688057207356583
-7057042541510451935323810217032483925746383540989928451101483213770975125680075200108338616874937924879361446516778250185550748
-0832810498555353548220097752070786325088219810053096162098021215047558250904896030368053916311890910240442204298949146112466005
-6040761853883330139655359121858985041009457655416978338162675746762113717003221699855200571002086517873586911211646864010901906
-7256461701161490507120388412005575681572262509069280090655692691681966297281536854053796037221572903258227405845942489932658062
-8784119159896217889610742272823513831023300901198251714365380671379756902059751391678189474782942687418296669663414454093527211
-1713004342725426977027637006978967397759795215758374886596544583647960566243025979142738914314172995528789806147213520151545065
-6148932160477331319836946915602714548850688076504811022908366977684207197869071392739615383347277286078886115107459496844571114
-2443445647690017845788068401719782165485185661849045242867722200580611203950026796072201135775981201642969396670605705878495845
-1294371619212953132417647548708472622197636506856370676160451382994700324005284453279834375908065277166478082791508699598722770
-0053575986014268796134989286247216849523870686352637864684792640382519878279886269694672196689841813884729761559800125789968281
-4079017492141445585825743793710894771763718871198578437956220555470157513268225528361787107561094227364687598864249537846090985
-3335615421853085612471428388452383268898317706526014807014690533942186796242785098624189594771605450015209158202436565395838528
-6313851017796457232684831975868577197008285743175695149676285515896251363246115689779921987378115615609824156064808941150859547
-2765806218554516717364886537785391971358807028025829434420213828068755277959823238847926003687327479957197440099922200245318093
-0743837871847609090197592779267491068691643664874076633968061486254606691482824855693172784961663018432092989740850414577990750
-6025684120312451259686658587433694029989987324349789159690905104220972232002229613273265979326232104213906084669828970966380427
-6946689887211552778830098495751925653354785324514999092963991842666284889259310987400348941690948665027526678850288865496058905
-6762732711489921976841952967909655635081188142889946182277259409310226741889437458160117435942945024450654816897944448992096154
-5422044978529069360644478126257492572807446085424868838210351520631277115650603746786970481265582987466949165123354295111201812
-4211276624640084315612918421177060204230299421803486633824592006573340606615889580523464227765304350439006450951838160825473751
-1889210243603037535646067281045805960008570285172891727145769267831573879630019508324069996866828486890146852983707941528252170
-6433944896458400005722683036542919674416232401927258992043251760109983309622060221449241884161395267285324969554809613236559401
-5926828496890530602862162152396620975722541268836002211191264684743325984168877494942640619948750726132999624105124012640906283
-8437529190279374121273890161340277025282882572337700420322280964590810755716568643364840307879983400203857287989101011632690781
-5802276041061620122710926329386353739806320420710281218622737558209391349689462899753335081329268758815057487656715890733084223
-8915069186666442083922633115688459542249351209368361689010535548757066038294153139851377020698884275592572198938097053313533421
-3618393873597153740469607428584632822338908997205070091595456519416863149036488990139674096344263132753025929808588767591996177
-8414765535715090848046152050822658084473018911692025473276058620384118863100457752482347145023516317250246454398495927754913591
-4409298010504839698734131748484717641239465901635152376312170896985346043211365815426588368753012122770591860188057761705660735
-5937603186684235090583457539320837412342393238618817530913846014346149555309319385019839106489932216877734882102311404478731716
-7896182092904946306296521788524236999972318921384942071102716941043024956484573567729385887708261561271188936395359650621440543
-9381772394748371157597820184835066654518409316544350915121960781236322808659004922335381181699829103134517372303100027463245782
-2615260350961768130102419692323579521155005867350775325462551282112894826272075572040191002407099324856614539494210810480930402
-1838597774381264536500359028476517592435681239463143604712064430411599943084702827260512914320943321785685269655653280527187527
-6303497221483801786682166005068915785511014637493079986822276972242808097676862236960849777047832121671397043713182928176830651
-4198254431094795957177601291882860974299955452519675630067202852553365287181631847719984611318356336562220811004590160639271651
-2089050062014249099555113392986787327862396528284354504971691665000330719435672605372528268724943691397193582081997337212460855
-8717657741330116057938366732697730717547522872552360477855457981234742653137379848417305649320084599648948083741462795882532206
-9986804236567371664160082803763334644507241277854017370156980387812678877717978239570818728942909512587707736901227099845780710
-1187012467446764171881903676699687486363209718049359334271085642494010609014855350532206473984262423560106107436149534409159662
-2848539362765385732985316450544140366071147981646641820740677994697597799634870260463776941968992688323272637389950097251845343
-2181340059702615616436136969810778034448257219485660110664564303142589278244498041564775661983269433643752893242421364842071587
-6511475958145031560867412663572535560224504744829799500512261131519166232318015397419472829178929843115481631831351152969869230
-5907563295429072630722334129008428981723806690819380400545768764609783317272102244876794754684900328466037092277858030276039049
-6371121545042724094475375695524854871280733127714683231595927748253222937280791764025222016369882957071507439090065827190758754
-1326490274618829941454831367643360383905788459550667904893538378442057279259437234426288871318674319032806392619399812416955409
-2775275011488829091588325070565060813564196841900611728756018532857865700574781000487644896468359788252916194701281784442869238
-5475404321259151425741175250657761031096608313986258427026901467928877964154516924617882931075782136380173762818340243425882456
-8098506275539721604499982773326806644420333816118778369209316210417120818431663778002427348509174034183157653013145092651819004
-3184928471078890543345386093573923680647427432807794321314997911033358058808825224490515008557540951525337845495688169454435522
-2663993815050031607786993170355950506772886776860845172901406916363156294602197804936561148186445731375733299997098917913770308
-9652206542382536216286608096098963262843138133196068261154952924480494400928138047212132673039123404498669742532274932056703877
-0803886057269071094490544437295692503919136095718722047240291609927251689451657849380414877514143018375735518559305335464120670
-0151936480170888759767939879997438315844081206201757776198680712499035405650084830184555439755477818487911581690050566831394218
-6229367230673286153903588882341483871782570684557378319370079577894075314574849976163949953230620503498800993353619885098682722
-0775734990307483598683533921005381003594918538823910337693583925400749988570440308274068133400598419503446320537735625031687287
-2279164484478563946971740937436182665660391281989609876479617857522997660917074445342075564734477309946731477007826609533166522
-3758123683039815493345731508244661356741376276550143129350958441510802897891765417564525850067802663207435432004216770694226804
-5619370786333060777254420771287566622455383721762137194440628363338996839313233289419808657699323597544032060605130001017679348
-1117350732097568268814555936831091979923626150476679569711035279777989299558634893220687598099570940599334574372587146302188862
-7465078440908857228369280211059007709404158916443923372217270156208307015594931088483508995735817533317081734115339967063512432
-0277551433478001259984748926007853394677528181409165584238991766092184666080139589261333280556946872045412337141801061054086949
-0700754560549557192840941960533883683916477333049889110496053434388836650044089728945956844381845980096615663986249384912038818
-1729833498846421646108320742580046475400334773592611265395391377127688594599285540845684396076777993728243626683212706942573378
-4323511472129830807288869567946309250674678068275114664508496611904796208234885435751853338278854135085398181237686024172180393
-1312943548505486065871582599174831836548648084308970713256187466678464307897110260321658188877464727357499093515658589884692245
-7139584610276191442567513021000360376560327542398104492743671139951823728316211591532169872633220764756742780779371664542606277
-8013300125828426771757381146217871760111879193645766888697436656318066675243280906292568248974540959337990973627561398675008197
-5419373124232954726590126551016645137142696380830673731392642951542537238565961064580394978042654467730915963421765890733361548
-8922925533382884854249653772799918390864697404746308525228860651400300505857310156341812355891928439789989969029099008533806665
-0128219411137135309941467559688405403979836275303036131774092714874831957845954239946311223981403764141665925425006138193699503
-4023035360745761142363755560440975222622652382698883967356728120684964102122995320575139970015373461400690787473496703365503109
-2193654449177213661881030975620088565679413977376323484863510871705861613106991010472484286534395967108522932664799263272973605
-1651932770511765948726250021128129739307128956256839990590743197977037091662728274789578774568077274689428101918180304889077378
-5017924617218629587957879829522315523692604428645809008208520226544692314383658761425382226132125228054011492055441635314272210
-6749666157481037578188762106676697225815856020636806090419991079970372071289788209874954711658011019178097283297120172931963024
-3867624578607959056494862536265389313506274108084087969185322137028561490827818437756426384470803080867883480797295503488443754
-0266755732085811371635896735784706558323514361613693558482118358007540674486152236347627273339110326422500120960164943514979392
-5851591583094022546650594344855608619956936942520965617453776819147723734709318492888126759979035908706037791854416714517089588
-7488779820804386679237327683610073367094612676999550051056279635818725821831859618176236859057491859294403215135785905001415728
-3397867405536078184923760377846341551636533657104459673180071634565287960125731400588939475716477977856211995657191117602660471
-6368419292461966253403926350187375212915416793685707098775001247308325202429711397391995493844090131420300451991006099818565158
-3171884061798508018743336874067220372374917564318502076615548912819919624484325005878069566693150527749974672352053137075239471
-6765298415501192506923578604075674679460732604669110708523132941578157177568853063216936080050749029655642031375231708316371762
-3941656184595817536876952668926168956461631341364895778129612449325569155094729678326528659230305783051788455638170048468709384
-9344704062107618220092102502671070488066523904860951808964071896990152691743696929206393427492236495869384495623953241985933433
-2329954473357680885309244441022618801570174231106127708621760839070677029891079166854592191885991850284207932518637882898896696
-2253197905988134418498970803242763736997197997987724202146481273276883471048373064146605033007993208986500108914474101742235859
-4471673346443282932636516218151183887721959139730007987788845685281052854907139082610271978365656275535187015151917676999391516
-1490454357895502187362105850833658593130025904397280081248261243837433753996643256759896119495710470799362993945917928340275859
-4187480193910225053682324326478852139878506761849860931936128187212907303727615513834095500089467988300420504891523377586019041
-2552835341088538861109696869815032626256269959324139802181242249722241877212898021098564840649196902417063584333206994390607317
-1538928060054617317449920025668989345408124114562616395808759769278572186743963855933221653177548947045222630757626854233433755
-5185848360760696218717214816135397052477034052026614446970415328439572221368707488898468973353428786860987024947961924953899839
-2985590716831731870038599668250152561736463733069492744631154471689685148003517537536069537952391933185169671069870236035572482
-0858819385615354860719000425698572982937868475649379251912477519089804489107469755432874178918458772943168929318750385686530082
-4333886362870957848081259613648289163828064171655224322239708870842553708643760011978783227657321411272976905508646641961780912
-2833169683733846355069467452629978104797868384861004576520122658047677739451418977045812632716306848990938028931383957425588061
-6045777379942977654526927417023844498064089452756699867598470436037381168815462649457696613017471951809000988548875034178737874
-9160331824383077463591927113486291567227954453778702317129507491730495740733772073822607464672707613182092741352901404225499494
-2171629178354382148962537134449119312001738349076684871759101972177169632459401670960405086152157843086489006781537667287047896
-5465718260392150704046827088996611582230320415786650066647900151553492798388495126103785840394545507668150495076747239741124643
-1419544523318047856148530079232229449051190304992694484547233964026124081035121194889038106213961089629592355710172833338936041
-5735074574334557161220421706612819925561806730824425800383474349667304718298810588448596848386045836391940535442755152772209476
-4477743831927353467775816826229193246462805293097367869721250682503407993182691455177890744118461259199550137591872314970843570
-9614009267031215091375702771630372739884751484563943485109876681877458872527820916316860531787616767154557713108421464243252888
-5725244451595751926785755645396186934606833650722629688279447836080615920686865486122499155337740847620671316549690747377719416
-9886724243384291436035548475563689452903302006875551792856774087989888845839795026561561511158603968657727537570783565987096483
-4338269257625836943750609173139824275314999458619895874921046346622761766613817248643045610302260828228899586867769128173831852
-1927251435241586742325643335703829021262110618516121300640702167056777723519853174450793473043913595814696522118527504244796457
-3599578411448167894106533981801012494310659214850381649569414007781396645447499689729938374104814729448345077680781325687345087
-6129529633831819171439689515282408943585760656344118595138870514119273973014358876594274788901442968142994742135926265337385656
-2522744449484255252321589542733596606602045925005526885282459116039248444399754430448309551058351839870771919853241700908753171
-8095397674156020153025647112643503525783203561945051043117484225509753196255050991995918313572389826508756030729780202503607157
-0514732746209410237098921106270758705122238404358107693018072790601247661147289735400790334022315641411924147791473123654604067
-2183481353624169330708810250088442996270202852800382852132922090252387617856118236197486397057001588957700864557493511482566082
-0159554686938426672550427425422201760923684567404107605954807954862252513544057244716697622930133085009155635119267747535809775
-1603870374074406842079458547774759610733574985005768921583657069449807861035511349884403260777475545081121567326386609338253275
-2866478551802452645398860404273568244013340206033503958336009745540839717584645607628126532817660071722429335530485083943886111
-4372806755879104949087031501622642625790498233747556727536449464577828956704936323795941826197457122033168971930280473743209480
-3510521745467987614604622504324811929598409501462197588604391588467606320835512728358214802216357643065451820237801293132895101
-8869176817884529359989957422435201680723727230870849702923220814297956988224073755455624237386035731957272496882413670632312027
-4987041709615070926110617696999725204352784063869478762637421619822949085893727644701242995534552198616152209092394050930669848
-7400973738218421741284556096408600962957422728138542260382229658265717929340410249216494966480842797114656043729408022372140555
-5357622280419421430680077268491817179160449030679507850055675685514803114136633487732178706581280425610186327901499849008080553
-2063614935667238312237638365326101007587181929899519898020565403780654677915752203035463564958973934599571280127628650025231204
-7510339610097271890758575355760181313472729121504677949019841665976993380277166759244310422659174282752504901557558455360101043
-6704624590746564335785852066839780043541376118703961641315331313655337920280405840841448353766789935381787637277026193365826955
-5718584531080420228299782199614112550723022759714938401551695221278973774269123526563402857239118115571007974128747966574892058
-7406616537246908705363274038771943716880888382315653131428051669734785136535017075892856676521312977758275400592055721561155447
-8191030503034523458658590430731690106155340044400945735308786298326190302983231623869556707507267012762969572969229893222326020
-2781627756283482808592633115010135954787388098836449433663074354764942592857302479394320001436105974173300167981736974256889069
-0749889909665269146510382674032370824445149525831032970035921874308716508078712017288693000420564774687445800320014347768102977
-9500582955080504298493442003839451470653349230762999448413032412395803444854529134420395637374428892260393652466859653474793248
-5578683404816116099839255848388989533623282136956100112356341602163894219640627502458957004434668830525937659394378712613593339
-1328818081682559186294868249152029912791110338139114004470380993085670292745974492137182403037306610656137695392960137614180452
-9752978688889728250401766859342517990190156836045937377483717028864519242478723992053825465496992411244434140736698055778811865
-5764034558119091657996034001136138512460220698471156208113839665880299241195462026376651406117658603193270831455055313097779290
-8887190533917978952783942478895262358255953083684956216049958401478271139454139129915935858174062762845986202401574727546757519
-9965112384492455902741039666831644918325589401840520355227650968749201419553213336728867559952057316374095495633674649247673155
-6547477349678905420240149432846633096396537735337479158019850832661246628844505249719392841713290257003652108726047676880419068
-4709595063724483081528398865202332209399887790016225322294096330311019868576291990108551198704968033034014495019187100300731545
-3677983555491782274707240632393630038558613476413675438434221141668472183743225033730344641440692723378405837243484642959062746
-5604991163272359834040422515862505640037839519050818603112192411600677144216422234215431187611787844494127075718764452791848799
-4854476179924301594123281798645361490338402536310431288082224776520403651635476604940174850365038818289755315902382966023203577
-0810744335357702561567797304986145218660883831691187353402861163846458499952189536879044115452318681728624510324860015033788398
-3979771283995380891938289539381044182171976827997056764348788204187193621090041996206584024348644400402675325221299998818648561
-8560553235856018013965529605400965645682933039991913219712272084018424710938107420465401522172404020985846364794336906931979136
-4463662321945447989909156167276620401617659159053053338198477063314745749076987397606793494767276193523264007206178167936213596
-6945045570777520341473278974105523918485559285787445842507870137014286454851350178004328369233461521852484045058748849569462881
-7175394733133381132769602280613000317015438488548919976504824538838731947546613872200764083627777984989422833194236427886436510
-6841401583932488101726607361270514543381198032082148492961394207816779730163687527133913837138426969504533356370971942113680465
-7438297763442758000905394998453798098283316097089007654200747461809281986645383560583766595972712154827834692097585224878349332
-9365726487547590990433290508632050107564671461069290060500347861396555664994103630437491491318643117772003180597703910105848664
-6611643426610581687045714856705413399193072506247927181637882082436528718891021527134176567154185837899481317325358321239700678
-1557904502034099580005949862058754523860889792700842593217321816597173581797908357156234792521428404814333336278006477527454771
-5551300020237036342120897324580866490216118116991149735001002790662102209629270626643498774459628186650438561401066616780089887
-6490963755355736580386978526346909059361347064280111211229508805478817906115930155049278075845715671257641653870466615953910939
-5214778972551839841667874021257601195235129654518890488743898996335333591775608284908553206841411120044347642321931257964395096
-5963500480745033263837415489981452116756935833729630104233601643805643301868453891208377454731826714298746739883158478178624208
-8078825488224820778954240186836158374373671746556003072588357835036884385547573916766540198508057742745190671930027702184464479
-7807519854130748159210155879811678899722270728200599689770154189194726372412310007746266228667023082290285051427818296004435318
-8849779730758648974379073101178990211676693852201291929217145528640734853429497077571161674011066495817276757324157483849716817
-3827352998411927949530005101476246283441759897176637008058185334546170312583858564041585383266413483217734023667361663656510262
-4989459887640993845875939547459055523785574975836774839383442442772727790780196274204446558595371067248953971633261788681833422
-1430260652446882399259326117845029992780579944482914613560754920430392419419801174119306529200876322246749783122971752437529985
-1073402550916699040362018956704245437401832452382196705545206547444352132288265525961915924743830388330363555452775455714221746
-1446616034452999060536906307198084433181209978784238878045014349105221877679941993115397416711191417693894301857690745032510836
-2955390019036983033546377278387952218996955027373523655965784118029086980123579985775681000785897246210289721704232358897262443
-1116899333926038276430989136011993311064835969966384464160468735201645112827713375177166600414004561963808951457633980244174631
-3365167597668328545027411315066184915713562624842225290359331084124729347322094220584503855828183282959730835678676639554531692
-3703132630286521554741077336255711977522731641435705473997030102644612053700886241315456330580773390018414386585814426113751822
-9217494111509421272989272558690493322060649433443466464859990829891612802636240902558280843106767641519024486333577210250455758
-1991150751561946927232491146002439007601543254992434751580119323409611022604175456900099304707614992483865118197257172247468485
-4718289269042762658615396540607439436267108037664826892947523927247548349191063673761417193077849996352799507438421286155035753
-3670003174685490297784963434080516316824119943018705327982929605778412196093833118187456471893403114829335230172542023511761918
-3530299462397538994353624879221057016014513591355266971800473995195599575301873296387357918288523036075230002667564181209941862
-5652465756063919538830640228613516853681348031923008502389424015416629283480087157633179737963541694567718976270634283296698772
-0628398273786061322495772855081114777882254155541640367813109541283460927308493462443462004237680494256941289350455650052190389
-6530923425528750248516830645859529161548508001636146477492907827739674571658452569696309864671893300056851989854105052764500328
-6377838408857911124605696723808145124469491655188029699697020610066790779133275460162800601521823852930699312176096876169139587
-0939964825101402137367079294180090650010316165686145129739428563266232844352675969324123159076365905057635263730951535508592474
-1811804823447992196520518580949056544426238843325335935996032408627339563545875884333166832898448807558706376176980463476019811
-1853671195949445539340843650229575714750539986544526174232405759132358558190475375028485355385394868549681406717987759935904458
-0905656451763972780540932190579104438556329939472118207647554428546869843074735432587357981463196272333295652269129883611649971
-8081235587163561191593283995607470950948702816215035438010567011848029435878836700192088876498542980088266248768136664360732349
-9048395346539903256416069243232533610069691095414640231288922049229368354092313481960519237230458713935632653201847905841902926
-3586899375981532151071970206889742452371614510846757239619094223086588901204291404135214382914427118575565088049023826713070734
-2259183814776114935570816268571424671175423119794189492522671432476564901966405647187984087627618260356094922535155595764746633
-8775939779211866982932257974707044029673787248018990390269181484731175023868082868637570701885688930003111950730117366747034776
-7292037040878433775921745075599110933471784681597260046655966261287697859339714368407310137037826533774841074326027111292219013
-0255740507228750627788675142293353045696200562639503837065555027761345191438643278181859657112500994447007605647817675710357329
-2976075331061106900800437561657304517961915727589721564040507512613786451696450429048216474153539650176719572123959448008900012
-3408433706045747990792868143612079234278596536479367304972783738238238625919742682436942402201332632706821698633101418726786131
-8375660756604324838036937822438189146692980841058943655646096987446498055875487503182581651007976496878268593478897138465125407
-0302161625788138941756180586844882835162635784547013096553214201480525116709804815394793585124634598219195269074280104207728072
-4667838900407600665351205946634451166183916253892825653381319301710998507256107777186848085957403008238368100522944303632213848
-0568234978451633682200113830676859774853569376506354250671989943595147694543341125278943952146653132296950198184251693558754266
-0837997184654618266464229835853893240382511414642926848175904359357425914225875122515607126936089890130506925127703951001817058
-7698607971927804322206607636649779969047920064098738740542516881736563449825854806194526365935192809082449412467250570813092077
-7597321887811111154968364298503454292989382990719881362442172931187037500402048057328677657705369081382090672410230632333022578
-5702691344767100466202486216169170905325756285673048601355109036801723677816257513289352210067825399512675664902709627155754391
-9534899164623786842509061739505443727104012615679366121874758009252764781464695793453679090140639672566086270483355150124722338
-3629599380125790239429932208245186801604452556987851483665390481177058173633973798236252529147955843797090679456499291551397899
-1654839141753372209578242837530384383897899016697607163271741042796206564645006293555562819243718356635356102675076651792712069
-0330578183767799422174048823749345411130436371482070584047136107077445803065143356378310883097325525812461948426463818958359831
-0535837083229949247061916351323305805073161284351843348700635104127671026579915150619625693973299904452300157134992421628495782
-9135533592025422741289488252334208635046166354163256661447685205945401888767478319569656787569357811074256962118550453119004362
-9301751134736346294356523345255306657038167822211402293117443464784840025659169376501953957672727051530179579688902595680131766
-2105969846665539329882900056874716520798786759023512793122449365556804018453805656203040461898429839786920406056455733868681013
-8994359707951012841246179634189829024194191300675090705148350390247850109295388787831386650321294752877084504137894482370739618
-9241947230769626839032573755018849701961689378840022528468670515360403514925600595045782712624516468191893178057825723173315417
-0398704518600034083166938112120280977963993296425790225059839016038745051472686938943167918298644018861694001602670324180907739
-2829253174521666979009820015551029220993105373115142695444414232286946938928961493390386858301002697320226848958500348592987936
-4933376341875898717948810316592654389756790528913140902980810511129982071300880573916140408222881362220907631175682400695211957
-2728405831786952505365442116971677026094675638127255014104635321119617454191227198408175192550442007477181962648595382032863011
-3335513609023390087365324523236604049358730860336918649941016742564809500323096143070248679219333226141951672644858949079743290
-2564143013685722767288600853878709769356311565059463598251742499173323941411533573854915762183775988798690410191696639340413240
-0493448733483595346076056156947860868081377709049727106924154044343435604871736849228001533150906569243527614792377672885378205
-5757247991130415486385859064419869200094851432494013487858837812428585929428086640566084149796652609672519627454844564932256297
-4669558478660881121021903646645372020041434507907448258764267056511994202274610206718051374682457426295364768694292186976277202
-1564360996091464350826834839280932166253903015206256531264131271209638480781609315412345487344374301996139188255108960560840234
-9176534815648639973257109408451729832095062649822000160147163265683826755303899059727567592934572490764864402347275743547218198
-1866055495605517210298107031806201932208987305284317169767415130763125409722583393741250961695800822861253047933789380082578910
-7563809612558319699283127796207634523042191451596228205984495682290513031662522019531400901314878626864267750108819514332947951
-6013217317646435086018804719571761416592333129643806900438788455325630320446510012694647580590342912656641492584092556696246675
-0844610636935384963725961540456988648961187114742364338486232200258126457044861826644153851981432318719173242496404738484829592
-3080829363782082227074488901159023270312983944302028828324523976099006110195688729810726298266450333348633619065288392022236229
-8005690472921247866581261895577036104640057531331680489329654614207889686295106419176764455962025382611644995861348654828098933
-8502321967575148172006469677676125932579572402208147927471694132908710196626265784804209764246638587086749717612279459712731943
-8253507041283227562754413288994720899007749153170225893148651683553291625294974124954074490050789574119491844797138467527966227
-0130509196073119104402816135401821552059355465255575401457469499625193746950815086568670490180348072693785487568778765124602003
-0665248124119376664057125582265850335568981888916788294854156077917276025925880496268355143677289608433935345978812154208855268
-8995137970182597573167629723687168196388018417038021858197249313810312106750976993518701591284371821222304917627037046364482239
-3380163047424234535936046961259910243886634603953810906816744443879125914109276466757734603864050055610106148478096732039481501
-0050863632424997195774488430947153709833716798293363139764056905080948883372556055175360309201107604690863026027029304809129018
-3159045522676282622055741762907017038764983291766901157880220174438440331565498671114637842462602216932285417970008975756029800
-3552237063449291059014349162828946704972597219745549772402644156576458713144836954411568696563098211658803621586740322438123527
-8553792749167921622407818214329886287689794104816641507269131593430918574387850051670847355476478466155909359159406347347073422
-4529077230987714405406119382703861571668341576429308147647968381984164008665288474312273798880569173169482210427510225857144151
-6873466267196323702969428729542596817149488353193513581368049814798979078196465830515246880993440065883452528995023407220294628
-3423764900702625807926494346022071251875105005653050523263476206366063134157656968651581937910705560688575444683225925304492434
-2952113637739291573792177591055762311484591345740602655920022962868733639951191003783483933798477891209504511076833970415208477
-5918285063915228730571970492875778946493408022023485280196322884176264848374770469091671934052402742006902024842930375953314997
-0188283754328437589051211543538670804314085522712102214064193375644277314824255259794129098802312806481056628400349306174297818
-7400374465412082001463306963438819366261869661341067811137716763449961651069723995940239925017934226230532596999220744932707685
-6210672490680638537370704393760193333970297977253365672997212980801329671424210333810500664050546692669173806880821364438329547
-0441850655848799432631375117017035628999017015487913470494267041654835295714453029034648907258088418618148803149605119491595378
-0667709470097778550996561398901373747557627918533058120957567808028277879620594852014529739234370013800886373620787541449928329
-3125515897530266841998191196333295200100578758020333846745697177799969213733901430202219148194889600422499239512275441137216920
-5650415027342249979224454839045392096843643602822206652387425455763721764312986203030589819856297909492941454232871627676382600
-9334860923952422719693805188600329744718934283065130982713900165662458916981874159673444880197331666542991521443060535788337790
-2260464469972488038180467803562022523783671731570132720326212442908194344858555602668263231905684505806559421525279834670049624
-7792295078720351079690690721334629651981883246931635344717773193932081371713539221551527543695110154112122644215377568071412160
-9195473483543180179899660415512485164196998646076213127620507751563271324222304453084630241541418631528227182134165081602418516
-6107199131518105376224811112336028754695240510430182476876463353393744511821873843541677824666782764783493452855094114804483949
-4681701662176678506643507046144062278379351438997367570137464357422720669913574736380880061893275748247043675527436431955366100
-7149553832033242764660394022295041894654956152213899886346680985491273200086975419330405272293533518246991447255727068177450390
-3655198436587622677364860349928319378663047397528676907239140945275682820405657108502041392682979560846597921188888907265931036
-6476533442276806500783053564071177712515831376234094631885310570178318133342242810813665266902989059805523937906419013727894188
-5431372487274298724777517697230193875880937677668764659986523658830811826735084723524757461022654674192380627828684371745612348
-3820846618376083469895407196241963862417850743410179248545973893510278183277393709562656195366243761330452232662018800107769440
-2069720833072682115347026542393190511365870201586051736004598121210837565385863777323843786272509797134422300430192141780468920
-0442031082909423594641218252063553777303614020588281829250848330051744891712248697144729676289337492695365177253047051776547762
-7268639820077382077506959745238922291525171731315329144119549984484846531136030620064784882237444115815092112452964098100945835
-9872606636855509027099907122315750101939814965155251567403611737103452272009598076995597635176083234788901670535978209531433759
-1085327638195333244518594079295886331726523118261222009427508754702667381643585015276186491128806622593525832828640622269002176
-8000558812466886549021793247340135947691306446427709528028498200426365682563584527832696795214569479985794618339152398807896264
-6187988847312530289136504030984674599402925257102785831329312431749794271223626066515601194350356075536808657593446997124519277
-8221593778261506773470868068030158332034878924556789236087379527748372902142937754401272228850387450354124993708739623158789162
-0522225048132576688432285718958345124544338046135042578516691967468794904627442698787375554323557096004260191198734997094093259
-2462493092358156921232365706546429643442698260566011347797207644508552329524610339812245114706710736520675636593241151933904714
-8168806409481440220552654041925492552985114821706878419857282323004033916474011864732600044228285384350058041710798941857144196
-8456183927145192331984325229219292792322346278563254801756089348717336352552507588302857665733398806159165657708323657950532344
-7959027432654889449179694030583164431534165468437531025326379868797173494533488353046359898220027884040904102921916878818230634
-1572671474039612214962772842653777925720919829404267236601529791378862012346769450214240286963754895280462160430824808649254296
-2713235643749557564532205594282964657763877791499599519104896455051738725475670902079776954156280521778944415643098383791627273
-6105964254598123007279257593697900824845572590247120355844905046052760198392683039070579501029336629655707492386250995234644336
-2615762358163929247483738668566291188631481608731204506773561888479176007728316484171079619334578564058039995926257045933155309
-9915284962226636771930258072321745421222389817234966851925987744510291810977458517680205953227386190750476782698954854970577352
-5673578687374046860672064496277781044455548859373704110716891640260365042726694184132711815871762240294031220477588483951772686
-8668728817231201425334885333412781573848400038328099971193361147160493544335456580227648349461318031327984792185171580102807503
-0169567182553246331404084202997183149669206523460201655479386533242862563036582654644409484005992680312894606697548079677284436
-2408634459821807360135371085559754639951676453609356475891807606645289547821918227592956096670383760258316085039325249167270345
-0639753426126492725051857242781368140995333223012553263382165242568922620303770347983405643905206504900791961601071942284936427
-0871588895354801816598052309754202243843057099627863238724184518284044817748295192358320828895054008513930794283973928514112196
-9798654324310664456635488952439998180995428408476235283937134417681364575355417817510233366035067348678178856527757300827180944
-0038123007290989063863175985592778519488056333171045377703085872568160778246582018586168915869948568385646644298618780983546355
-7869384600764512734048062223566504717806018441987433044570169614606144975153300488119826197625737171672582011169222743563965980
-6977293818241046999651425289984525444775996710580402650890897413638457082477468109575400763448366802872239506128418904706794072
-5799904603862986594106662322483455329279349540532965537255861860553280872874108710364305979053889159756036410545175996560632213
-1905113425852351684154357685504469533745516493501062212340862826870385326709406031686063551224557399310052952422838419329227931
-7546871961833002037605725905779115533289685288706841277287949763530450546184456445185142124516259820881277398739985868903009290
-5390552777664596373149764240028438950449670876087502765011571015373476441820757391918243018050536384628502031771242890575429423
-5602898175403670523511959645093602460733826479169195731008780332981500631244059144423791577718260284080812356359230721779826632
-0282070388225563293057775488479437333861437827295440192975141284220068554470734762243654683900921775316128776798676828649464561
-7044919729960370651911034098935618095727733916533962937362197410606374931103363062973825850629444853848346339446960413652519614
-7923852433886365419446901963455158024361204561948757781294971510735411634498000899993250692952771388573089449720039510778006556
-6448339128502198442312788117252393804187619178631365039260121533649897690132658417974431016238776431953884429473283621621760928
-4796673454480093007496675559950785558242785307210144883418877108437084521237518409035829359990440607609053004656855467826840969
-2539967222010309449705096804270772495367746726394308555148839954759386392982542739753442093370829925036983594533194718249508227
-5349079635800249074525176724894658939051245265345143033311987922668779171808073614407324686649849960572890952798590407394876104
-8881074380416317599148271017700792806364855765066986663556628051754736630602571628284291106232498605571402693983906331712030753
-9874937506608818776772074340810498838067037288381814044995123846119534641571274807743575095446827709625774292925956993651483030
-1351712538266765203986454072646816009684736475838189392745470191271779327758375268068178391759551780428792430541942252314370156
-8407859484892460620078868667802179357348492180685724246644370230014476781983275135684947107880402240406891839259873980451085903
-4906163533191850256268583682454988749837419823578079473319346296433799092047235338380155019552271132115175763259341940167374009
-0058465924482070913500147064727037054124622100326796664614046484792704959337155884709332716325316023891570424872580884952438266
-2436800291590505288180953642913700972896437288014085488105811040747638787748114199225450616098949678241069300416404785919318926
-1934599170792002326313718708164205938810092585230289681773510059324899654472028348104884160918328871998687720554532160558923223
-2833310668093246151983045850009608661418327316614685260920047242208439507520352050936476946684777115573214252016051709311522733
-5806306154432125296361988853844471579270461201267503074861984238054921903008010783021332277527690547871326604862832931571535476
-6953887201338700880983597387777946758689636635028887005208234910693065403037992011989492126099118102129494636864406808581750418
-8449828487903174265578895543349223421139970247142747092518020699819810023484608128979286359504168816826179123882092074937458466
-8429190917143583035383484835202769619898592015997875633392860989349020465819040052129531463007708159553740489427112502433350259
-0015541288911157030703391088218525575081861192862772160417721389983310098584001488671913042391958271599517521875772879817883670
-8715721723667422477987285388090627370795114420296274720333968016528373376502351404697409435351445641183117232448408900877983999
-8085119600169893659072473239891529571989304915800525658372770589231187553832358134049724486998092398100951195327740893124363904
-6825971614998820258858203237294363381385260403003703481866209020749805588161211696398124406863222077112906818160524737133236376
-4791287439396340287050946270382309108183116290058907007033269789030152170762597022242414148156450382489069745048352057183456698
-7699407910303700018163871163387977417734630895740976320842794125644044206230844211892365927545147294624099819954065586859396532
-3131672188768311610064467750350104984282723151135474654890501043106825950749943883966630006426594607652504022624213316206819824
-2381097970942205624530028578508606408894416081148567879895026246182144217645044116693226312513033539646866882479709987958089969
-8906558060289356651604127285059333055318644242901255378341192868378040612451560944688746385088366187655524363293058496259834503
-6045783943499511329380195312503328218913377235931966010737751685331040259612353101709972563764048165640905281453608759750462107
-2697778235378791219808122722229257971170129904297461026446932149333464400232434190909889478146390656698937276924878791295257123
-2803907707992452534631676946969649948134841465957319668276815925648168701088565169944440306293458637327427324437179025248962792
-4731713616143649458304003973798123909714421863335575637937266819992047643342146589405067966192841049385855050988705354679370809
-5372002945727744156997261317197525282324231196500161732336217784763019914950265863384886596392669097800628799874734609235337063
-0503789478310331174915570738552836640716185310681333898360502850585012405514745303614418697185463616197057663173866523087604838
-0675037169916204490298120588020089851962810662807481941976840354009840553886735946987601156791667665686995459100468477453975696
-6834794049663185275577105102245452812771387897018848470724588835525127031721746222497385677737902506111966509521044773531500357
-5329174285407427305661763207997349560549428910454568831186538339414510256938492615597532037011523362904523476314189986503671291
-2718934812220309630578226399896956440076865897466517017205703733213982937662658920267819470286608114781834913036578565065677437
-0292082835411024840424424503720769844545589088751119682651139453690649901159394940442554457210310520610468908232856172200322893
-2168944494860484191151489757452268440986053558799687398611861491809004454116677153114993411395893222172780575772632409234094898
-0022046237220608888434835342573839194475118566063006131560443847533169495969846042538404623478526559762435571079702487933385421
-2451919192203771937523596048769324041291130793137730493766482430142235410357050813575163787479425148259744336129889104511577631
-4142550759732390528563707063152034344178846568888223418447224601319163578533878251799463243956174732623278426810354689051255154
-3970640202120158350260730117870456696154229567633606514596475612129033212370234978048801831781364493706668262862093481931515716
-6561924140099494620364526936808552193114041143469574838371934269300545161105733392695711211423415123016324534422409169998476243
-2456534483029530345127697481939835893243537886692901492470290039455511175154304300500928667293566968811328935461117311498383274
-7770989718625939764088550940976599710169478296655836026852130278698487150688281647540447530622442916288092929799874814879443957
-9848763764198437026743206591847265528425238321090574928951078930719540533808196681934811602035009442951951047723353414154858302
-5787946077159159168774450433330444862738778849768023490388074911496672265084989382578533753038885946437129868548176233233930301
-8580017107399342108923739552269357825947129658651850931301283981215557531809779053507136238066452267893979878894161383251981836
-9913766525707178278575810543038685579648619267169136094328824697618419625108889858389235878109542078438921757522374605654744287
-4829229647563208502985033637245591132219509835319418276937992741995767258780935271942567981080789563695276467555561800638017448
-1643138233933525491385701115282638884356620775214978523597941747167932566311974729439511528404991306505854174907409034566035713
-6143827997778747391148759316186369744390378766441792907186485522361511087226349625577289271875444080879557771349971812896783921
-8151037464162282243454432112145953184331053916340169687740205103102595400733446898088691425582734935373310066807019088114280263
-8729904943075565576008704186063345542320788733990798433124383054387825974302546390620173375209936756748717665874520884924479185
-9888909645307351789982700065033105216388788398262734159940626037880383673919937047828435841493103609687935677331602519191613414
-8850737384099163846794178899558085730334694261907207404022320796803770107876986360807427894048245601008966306481139963465178636
-9603978263464022093387313902323305847024620528667574592309994157800256182557220046954796119376040712963053063896476690374286989
-3405947975994172973640043088019552492100802303545308377567580689104604977659913539104938989315677959717470803854511462658064563
-3191162645413432233404183050706031855638390349798393321645475424393193065096426473922012746067572812705091078572123464528104522
-5754070330806062132016998542325199869791387417374085617357171312577717425296247007640670351991232446756043415004205160478899347
-1725194535387949369475223998736399458938442651506418282232173272224426998356393475616690357433350683532939697909185050724112276
-1531609961298179460965979011464443408544699180131732903518616680630569852510445519164321486062756903290742218453214665562625462
-4277461038526097907874522581743597670466704734455633690080575913829222964025366450929288253518473640288917518499198469245997685
-7420143434734074307744766434941598412413533864920547945213441905542326713457623437002740516606230037868321117285609425877483514
-5509703411252690324400121230820675240247540075031296148576782911392574907974824839505516956261324207298130826703943230789524466
-6235427271350178310739006810179034776823843871399578101065895786301705049659021548642844679899589499916930305008178597329009228
-8708376738514576473422684695199014327164139367786002985515660277291737951903297112627302613852418677997201436504553518932602363
-9576506417537859055584148204389221076679317163739081159093922729562344633399336320523856409926599959155324451664857304036979342
-7821519375657055506931717396389844553686714012907465431386872822303418480617283652851337727643122589592938283893016029851450741
-4046931470136635022512650864971382510668763279223722442081085741561189482186827034926915081819290103926309450155161557982601266
-4715454308438516658794722092196206636934007267582801367477453071665674490724227142539801920570519231994847446963269786268119916
-9168041401535492095223153393392138627537574429611826175866774713151956729343684934892542983754029148830727112711391973335239513
-6515970901191127073416539618442535739664555006336299291335206114647465786032988393861387837528101930282563813184667131516357399
-6965025115159934457674823672748261872585621777883115554117585206762204650484234255271173958058407125541367807442514328611570278
-4831064230665616198380860322957982656881003885916660535633639193463684058409926839010861838915803748651536627056017889319571392
-2850377483892889368048618651662404196455568541580082178826055899571765132140934322132515590245447090853398672580050380575567268
-3835035801788676880902622563977805200108581423258706942731469718506605351522050771195525463348620059942550507473397926975656075
-8170641249931936194409801838731827726032358290235160889838261562910412201128942409820711534658779929527668900047257962358847821
-3914141889006189906618830872826326907793134446571712010041037077410013305523598603376182060668984447359850821728080727595426748
-0524288363005399115153078597028593878897064055724890623451683531614421839812503951731500983120346087995189240459208148107096125
-4155453406508028056687037448768955586471685200246991147018630064209861444093780513311415335160348800209398873165630411940689888
-6507947702834259046810555837139361937816955993601288388902706347465220128545880169696095175041923698015462911423095653174399855
-3762547022058799188111929405215622052455625552628888943381861262479627747983891009023031983537685246888772136743333720092806316
-1214549690057757944760791464294073960482795674578197576015074847454616235022841464586043262062684847644609779311315421146732973
-8541338437296411555067873828147460205050118794445175546707442427376724688646895066999337376018755680130878200128406968859847082
-9053903102817499105181101245913670467308052365562812081988351351621302283720868904030918069105268441314194378171102376175885834
-7390879175657202991792721024454048282348887367327525251428650799473344325817058656761335824140200255463527106801978883972849023
-9114858631082305511415208423205161099795092979957887353079774012813446208145355233313207283275642795951235302177270570702859527
-9437270466650300884205636449007422609778006468400075137707364599220020468818147412256802671321760977139033664343323597425197602
-0302618076580610803854795974063518981909366239035024103586093127902225268380234904318024257226627138837362185766291678782029207
-3947830739969480621126671162942463986987058328256455824368521897685045168203062702288692030759860685197940546125045250168790201
-0514803654436570370324022741742361761085767189089724981006110323674867393784988265456553747645514420643289677440464150052019123
-5223236088122199447858422156052424410894574207990368063564291905403412016110145065374098953504598451976662453874666981008325424
-8373293703798267046749026333095880042002196112554036817370313956674653924174972808775910245525212215059736970917924397257890308
-2688275927997288192485396746573266295779844438202521819272050705543165472702597009969819708658965256689368204413111379773538064
-5084094239742086467203807611090720704742678798346329233433650521401666169943202745736920597870661200400002701183019652790391816
-9022357095836768187469229301323281507939417769215045474272231522798590708421786910823915726035891376298601448255283206715063088
-7293988737791411397897393109492140546674166871313197493347838700746175919251207836436115320719048184023218823514733017767389387
-7188783211699643174822974868235729901402276203893157987109644622416046761772620967723823455916506713613144614196470266830456333
-3793370001173936142455344055973062003252783611956485218268240522116090384604646513391487197827194186399975132117817107687082668
-3534299426891086746037016872943029880008565862091417500370811850667508670706496943938696062708498042156433801209832903518387378
-3612904603444715041436728628573199366360323396870491816934924984624193337784171063290043144432026274325167439913901462851257791
-8301153338470277907154944290430893973748596163892611069628643761048471308522954471189690031882490684526895423581669049412645780
-9532276724709021001315582137581907800630208033706211952374871095930264465397182584969831143514075753862615083949416688307055905
-8388236378283440896890187881320950399116639874885181013806820276432717798539692296166413239097562927693580121835296266376329989
-7227163697631743317865706478603326970676879690725149096075601615664615649563621319796915072035936935656249230727588009066864898
-4030193127531435008439718127581289588778728561167418433131262502679346011703797827534339742404719888498611315489306325294200918
-0822596041854995877122241367357937629640300673554434225279391124715516842541288461765835730255187409409295964047110843143360218
-8020810762143625695211304403500380226297593451193440072241550883222759127723312388393491431821749019440262383840735943032001195
-8318237479489554100626369597427649553987985282444811016365279010859228891440704149689826185729924642137537603090218575037482996
-5366847590778547088514990246112762636619967032116058526965593868078207507263589910269699995373744003756645473632293041062685541
-9610845056170949836472700450287286628803643135098265884778110832410350875689137416100768678349522724998316556986352522714663266
-1503726130267377258411268772164465860231491482249362263232011498460531343555282835085236658598989040170763967052694908347332552
-9494811816089738912922010509947751572303760145536902984045309394480942411502821839970060527331347541450194445987076121267053844
-0578064800062529101700072602908332148334858119123936457716348054959136175842817084891684097218981249238233949488256020176601607
-8655837084859592004656876506460130727405913211331057771278893395802267144808219629460783237220481671207469404413079770236276202
-2474357024202046544233057042050406320202093782109005795759352430295741395906001878748884723478079164300747108788119563090468194
-9729275772864119080887672349769974091030926766697899488139685369926038289554489717497100438993101868557613700320201349470541544
-9690121476368923069792412981332423045488814436625785624017824621004713254286195984412682695459029135822031307061078889173619865
-7378777371791906660635984844468930766958298884404755753328140351948727806677530013266236008432182713748064589578467419387451399
-5958115863312505525587296099572988051567717080297066945899741469832877228284562546192870097158128338501540449059947967484049806
-1525360297576645372782766370344139731393001666478941675207716176663153356185352097531952067180451056483850877049391450796637643
-0957180541118429393622724140553758348088782996643755097821436674434023381251140872906157549968145359578492278555879752671991774
-6216547228847936682579390485586625009476953902113956539812453553726263850745606267922068236416232274799633682965858910518609181
-9364762411101864870815658017284551581396524871993598349274914322101521556813705161096159781789698091708777511072561306773711005
-9372502462001712636254133123395734859574314940832644465721405982847453658518168263698099694805090947049141539874161892364044592
-2081215406680382103751369362572309567943724594570823605875011736925225634106628852644577321897191396835476563249653975626106030
-4349971249994089684132392481061788229278189139063384564147513903173876133019427848009965641301113400947275878225261721625731279
-0221661121010559617008273964451895647239826707650461656354872916410348912631911913485548662828141859786059545072528125011374221
-4423053386826713852263693496635804173362348029571154806846975163821408623542798104298751000786068795017683260714515841078366993
-8161127671355970070573405532186939626037976009760161070135615665381704277318637283166773287886342633146869956929128780714287331
-4724406673554759228867043031026142833731777584308969100843251135369865682593955020981079390823701606661557011686336153922127671
-6320174341401698137531688064847461308245007114188039688579142931690284251799997677320348583442367762054912291140917964811725137
-8202757825011219494192886746445679726841310275929718330630078072572216660349917135633404881654966136524906313940172149175596901
-4973259052196790674213907468121479716985489021755170094314094085515986880378978689367545392713051595516162518064260512413271805
-1589006020451052603264805726624921702203140540281094471735610296632014298925191276086205769087410850492910589262019474771202876
-5301512438781961299615681939122770744864098845659058825055415852695585895078281739508660406939859772275150311279745599614771126
-4288153404604175490400855789649207035885124038840820254085618553577028061229192741635233861987354455133991517534727391845052478
-6258955556704090814031626148938140929500657324155298474719121746871071846048890688770977276676240866370191127535467056926311394
-9986426460698287989606477786579619338308357811140009068302509875335795457387693847614672598016435455104290716649294340111672025
-5987575195605597807571132149058303080863960035941811196802177359118666488648716460574884370433012992324776906424681910784438914
-3212828929093079665577584834614675181147027766122500255332258719353578136517199306847607401381636227698622152320466280962873067
-4298697726297500762842637031315949284066464528353792900058970168170276550530718742305480231641988165044232612666352048235992340
-6528595274852601267138855685497658048124785482783676783853867479073934060681129115971059226209525138395957477851256838662435594
-6333253678417649760854615241319608105505866305579272971991684020242948061790638726814427247631657265086447512599362760504729659
-0050552281101516551597310571530814588813676939570968218933911952205870242379775297989531959401920856446210979962385790387518282
-8767289958783485919140054170755933223361121752964753574235200401049015889601531517259131960751322512615901642287582440268512260
-3451721805339224609531183820195682695971871204396323817335046115539455320833063731322682287797699412707522241064736997253801427
-9838095438421652946093122030638044112929662006537527680294782737078006325003341225082530500978086841673076833294743067222781678
-9343880589742192946487883613246357871516859764774916328816004546765194900049207055237803648799342279688804719689248327413730472
-0721971662815930264205326239766135366858450956630362245585637639859898001993676716328053273905567456704608882800064784850223773
-0571787432542029050900323916790197508546510517976343882254348928206749045986326975042209032481347983325984442399998495068210198
-6252008138898607709468342620809002496223471138515742069863151888069692871096460617937300581107228988473399264367167623204729419
-2797770513682558101443641688720044042871553905410373246365721075390692021825457052959920292945148726156660506042073326859993576
-9943199450035463537495910614331149365062244685626306093678223057245690588586113869249388996930139917906887631260478153521760102
-1950460426985566320913113822097771379876492753786278737646554639417059453209917138732302032256017931681335738155323404263671794
-2838332702415027792861677040542052438018840283865010592299818970494138350530560217854544968425238656792859418734080761867272852
-6010463746369529626569768506440616846423788144981864845682008740038225629815725166282753185272670640607060429451038753678650440
-3603428316928538153550803942955541314085414603075220414550257874931378714081625009020301955524753074400211685480928675879412454
-9843069053870715332522840750526561812419932672015609424516373833579891793837439080150576601064726524016745608185730860593580037
-4790338120349419657809887950279987231778879709683733319593125286240898651454362025515251496405484678061036071464115462928635106
-4812436174990135339020055889098969606774850114068102256726271424987296420443648067709292253692100724695627779636510134753572039
-8737165463831035630144985978697481580718872897801411679391604620458063323095158841009595789901639579062186093555920948550517282
-6684194497843892923374409974962663409557384721186689597945008117535697913915795350771799536776499659499378233933827449930665824
-7081582116471192658574426394048422901610749624872891986363877792779389085331435286663561611309448994925468965045010492951543901
-3680646340800173339218788077063204059241257097481947777145409084202800888856762009180382127277534304230302616826742040805136435
-8971885064485253090204122142512764196490013452340872579790701372873179615012971724582237981895972101835369658929642000295179467
-3378697466160221993719637822345980287088027594206423215053076460092623235649859970956549802453476198188280999027211336510921505
-2652711751748836279015697510746966396333400935969997511167766407036252126460465825405459671454621493581082715193532241502957665
-0853017906034458377960386056517204258262136080721053029202866891152909200067791240221407899628896204792320935757942824137109755
-1860549007099165197284140872678756594535459353075535851412365063078974696027557562375802944288504306767016261985686187927040312
-6976439902255838121317145194266076485068757990450059106045155783172858632535344129113251970702093415466811410640476211193415639
-0223864295074452283847305560600110714424512989818888930888094361164360320952698546375108408821282297940103191521862113682311023
-1062349856533324628662077342594233105268417141054370232872638557841382516201012169119621084906023902818960772903834214834404456
-6774964345965594961633616650657071025352025214474328041017041037485163730502274877992356272868337521422636796698369213270452116
-3863759791559426852045781221052728648632252466126078672480213084512794723010528131976170544126507023866299598547784848361822975
-6029193859923289086357438220756059069241393076481467455226491973473927966812070493726378405565631775752820893408930243604143389
-8322645429369121872596731546622494472770504292226778137537611049076304139170096181584862462563435300455143882748092410271989379
-5326365807733260201580801629433084263428632745627040818781791453399164548163815232430786017320082301681273560908524949863305250
-0127708812120756378948747377847983639315742195284498126386446424753766099623540522826797908737477298768890173160498925727449025
-2938525448223494002554985481215274772014195861665818544594199880542548809977177276693721985173829796357491362226406805154130568
-8969218337326188250536163628581836759650127208671515917790854163363077352794417610106050375787449708519147175922505361662892084
-9818570904194161360123724397774706465600642465735373239577049512865171271762814912171304543676985961805640424586977875904966200
-5504575938770959529220023577243022588499122259144158193746005510614090936240126010183628014128216077152330048541538274583951558
-1040854914239994126791549056393295346381943572230033663200164558894293446713116407420635913349055999596494259230893231105260703
-2206196014061006612340848198814409910794456229071521204012047591463330479752534343609457402515951279901699854399989958952429475
-7726196843265136180636204555752895156585913253117092477574090168474904085406088453119889514918675712220848883891583790692329162
-2932979781809321279966736276684170473868093894960203921581294390763273096543783962941941740885305313552176422059326344349963187
-7716303606885535604492911546074803956458411462697046763121884171908019143640932002882802971285171891988638807617682091180833424
-6415461043036191035529625558425951185907448251833755623616264167570352631169542482639741527208649286390063877760359771911261699
-2470130258381358062929085215957585938262216089039199788226601264737025509814505817029779107756588940453410080897136093992799084
-8707632659399021754985431789449236853018112947892026429638184953314257900880019675773825490255337783864219014358786450842397851
-5533932851049276649253727477601106534672571299541307151668502286973847937896722437084410916259029864044870523541806218077954614
-7765554877085157744714903505492619912731173476480412564678818534684847115861709661320561820994876787782948571629974821128726525
-4958648468242228861341995358858962307381366972784922066788447146487993304134477988625345942386711833780639553271598395688961584
-1195610154724201767373227499183087873970044260009821201260837039944092568903479517438262374212926002997007192595185854104973828
-1619364472726153539242937799692428699593667255284692675884347709702639988899768923848970457805127213116307471608615036594270036
-9983245059851562634241554611084024908123182475839572134087792577459483664336562817481606414919540980247553055009390347181343478
-6678203813070191242843917525205623295811411258351922528980269188922471356248950351834938277372740881478275242174992792567496074
-4143356634732380642139347869145766266914672583108623737574556686979737703412637109328384991661662700191639112734811399558605096
-1208518184191671627470570937029456222980556566946874634805220009038965108642318793927711482497435062563764442708954406150308502
-9023312095876743701169506435873830799968604505754154998579861924311377960500475654542205202570979796896262463835446621504771900
-1307938351217139321342488304983730107947723886674861520928741265078308049241789485663045316829261201640722069914290181463616514
-3662774552959414495906707805907185396346911240417542898771207054497319717662592108767592192807181086654802759806348618578837674
-1314737004679848142363776160351558775692327407524329957179113590512266999745499877585915362625510835561292623778541138597816039
-0237557760056059081432345998516737302912533244471786164779569231630397999149258259824248258872090314272651220971111732309368883
-6627477978424025488072609778273019056422203214910145966781125727030515618065001832071393756745595983343475497495207623260839724
-3342966216908293442342817978848639488604191273604917723840719378411000753792919755939336669416561658839344042868764649850515740
-4843734023345647692176295441180249482639581287413972097837107583698158034620661397371501344888180961705583629809207419852455696
-4443380077789857586353070023335893700728665808003439355680624696628418230215872552816714310195766329481088338871468994321119252
-9699439754749964974015300163681954912050318298048480045612220669380962262620582805353459791375378214164628533298845978013550599
-5105714350835688155081910384711576767489399113130569825483778697383765314872304014753426304269107388256780976698871683305123430
-7876749639965180153007689268468639912304158853044482532644498399416286758021429281245070574658924487014301816203665832428101533
-0785808281226435244861112112960701400035860271883263300268756398080488577467688265527817734331234380039587960227981962626600939
-3364281430281513574894870100381156896475296131097244720576919647275082387947394192830802845871083057512101147458345259973497437
-2352548478260815071941762637203003924467368412816659772061510861905396984310747338352315940227937768901334141297190271981978620
-7421497155149250772882271160825127041610751435166048440557936723442915599683580765855387190581730147042311189334715395286473607
-9469405090355283185848987802133089556363626275612421572132540664555746805117424373802421917096772214790891162942671883468819382
-1589417274385691408452755936967864047060787328586473526198572660582234669906554955441129992972950187613542002387015080229290084
-6570356377915672505761938151404215475617807815543585573009407518371861507851745477702147309937407690084987324419699405440825645
-0612011361559116532371585728822626979903698606786712794256913394582020905043090461211508518273342883931278463866340432838401156
-6760882395086214518227285005993629709889190889508417455761844997600135276044719721514847763212602718036483323892756763864051034
-9188515996754462022639889466629680669832215175040501200558563344456278764716592388326318156786971890684957626542747491478209927
-8987779229113917038185012511339563267826387201889188999106457112243660191988731669456871109523244231764354533555547239773405699
-6489667993193399907320056380302219372587627376810666191791189051092938301013845696380002825207303265588504074647639636023424359
-5972299897263342080767319345606033144822159869746010125714876643532020183420706758750193523599953077555495726481141414611132824
-5084488926501974380578938135730935789462111699625550813110845128956753975680460172778115855586076226024263960948204752675321380
-2481196609759725214010722486828189087368975741750919937794099496934509151874334791821893377695611203497436421390537165843568949
-5731231776297026471145248406339411301301972034255825750883890535679456779763247607668575953175369910078981695492172415999716775
-4579188403021146726016160128342968838235818738719371073259844121400672340573224465598262036627730489472180977859344538916635018
-4072803135751982897056486221080699066662076832459383392956264311706786163956015331215770418998634239350534320417157397046765970
-1201062381226118587752910736476250954770728984407318744902312031409265281863798225473350200683876473994417794886956931818743554
-4970302735301544243501924330552682090042743013078749961722848840311456198559231934700094783625178641374367971636230883796585194
-7528520099930871600504738859526542685454459947737830229008160696355714649737859829804718726706633142812661022345510571151124118
-8421496990755255433515708880870288195255467739826209142506221198099596830401844825962275951060431553735295340571732198670724017
-8936767354220444343191661460546264683941090169583805460925893859976635128662736335459378982086771782291262296836018682528094985
-2091822408378038044344571653062122443897076701230437493508375904957950547708046448886825832044918141237713293307448531246301325
-3809577056439308352524023850120731400555497421961772257434416551729487887916281181723448155709611102047050048200739035199609339
-3691135325949817192195090067443211343266627775946016712851865749742799362777412328641698096396095788341581675313236780103509391
-7728571205866997785438131913054881617576104163904406501238204339704104937888486853321561284077020503299289883355914615218277880
-1111888880906892863133264981628224969781528602979570581183128605546822078255116005933260161155631478832277334536041066268750461
-0079412603436706091984459336642210703864450821510237108480924013766858888811236465849216492858539373276328300134023520401083981
-9032711135936968864615808603415924938529404508326233015998723558019026312135753805702013665081865026922455487474085399902382380
-1925270181168851392094205156290625337733809503843149282248914199479920984244708969137863994130437975788618973591803506088013062
-5670224338144189138135191184201868809626683864671529567267492650290228767102161777058656146469480714765930525720049680179040530
-7230690280352425636146176530879993888167423730080287061127174186402752375468464868170738182852209838339454679149339529988407952
-5792512066685362806154726245973930382853685512688261188341000372263049656702777229779863118583825044769296407053427341340382043
-9064288699746230367766305172967912478546347888349770026780079432939827599619309710342120385387650986045115258506762134679333064
-0440596074705090759141142692292577561658123037036520266673482910698027486128518652316613594364723726387332531338654819095216165
-6586405699035556181676379611570196812319147084489164717015394853295535428378692362698265567241807453037131148384149957093387466
-9613627657031243653069021006489437859522461371334813124213550061172753326963975967858093098270917873153645156857962187738174651
-1136920419639517807349446907609250529925657860858085930986434051082566457439789550530915328824048952555143480521491002977432620
-9723285190605612751574356382595987410097040493290287438645066768564593720132821343589116869402530302205558307160327389977244390
-9364492329019171456987187525681281472110463501074399197748223709921114091308897093844593961700969890959904837552334397994454560
-3052838056301761186571362672662664380662089189821373489289767638693120179754848616628936578638481820222476538767896516701765186
-5650968841999476243265351662185220984505585094177664675790716289996388896832182868460012463094065416068468660526498381293391126
-9133890615055659775962704691788335028541094043193982847019337250184246131745395473435608325229593796115617156815138186553076713
-2129458246410892733861841029801352092648607760367150219892460311630359921628868730343711772190656001417014669173768985351029224
-1665772830534776231474157241609092342166046079774561656411248463883336203142778691223352454530469529359343352214726777533890124
-8331713345182730719576279806483123633260411891324365421657390996528436543606816818186451009421810586108827795803801756029033502
-1364037207944391495829014284717167206349222584053304291053816472070825719135329033244226893785498596526306122826589748158594087
-5166290726387661882217520391175991236803942524737711932725364262567914513184343152964650814367428507369519194246642124353850820
-0827084375654733169383428093676562471650179031999648254047083978351359301318312364388282400723012984805620892215650029052432539
-3941456090006715583530315193770635520541951076921761324088412023106545476103418543330517872032796586561611105128147089091776975
-1738857734263197422168561159954861725900337109733462635773133902960240600973009046170223803445433108730659547191448827977753217
-2930699447354813297267803165810088809944869393780407968089194813574507757841359950100327174854511476594508709317805723583889020
-7143123510044372032973820765560757174132206252079849711539375893206623268969901549499791778646394614259993009419795504303081399
-1805751816651443729216778302694093259724338799262345264750249439983832664270852123252647682716640466581767974713902148881103321
-8726470726559295990593930464431140413396151555993515614244807290113117258035592083195115356107951148992883803789239385817695980
-3921614672869622892796645795274584202330027636891305986908354816884938844639467554178364479042973665199423978535726526806853994
-1879696934764137925030122852767473404168885624623810742903886724883175975872670995314600387454933128918537822599476294544895031
-6035100939350635436051361083289099777664034736094529995818610825799950536521416106176327389907566363175789821848187634785837579
-9000534727303607788183270598866205796784604375642000912263136681354291802540390456321071569535579301082240092546052754082125140
-1036718094258942656960699558474884940333329012199962569808690163604756147670835128428656230386743308384472157735698077816035891
-6071364091704432824311172611510490775020204802190669441798310247002139209451209194509056421614671635249279135552841468497623698
-4388935023201010068076632458613446034376062184128689428896319432854524321580911853120662708261911385263651607882193115809188251
-7169742597495615052582018265793684790742777650121858370707225197495242787747124696863007018741360971574027831332907655096436810
-0422401456149077117264566129183248282220685815602963735110673297177754943137791219212563311879171990788150209340116758159767140
-2965862835354985730344339045722772376955873793360410786309094363480176270871774839639924049136780870709007238189898961666868275
-2861817902533679195525000340605947416733205573982037034681250485524002724047643727596821058644083422061496633576063860945664624
-2693808963859011255454082437160794171986401169181404558686995397058453911479501396355062702756373669284391335723793677898504528
-7653550559325583799147678302921854984957213549656349312970370601725315750255349048113259251600824306253788257181726835044331139
-2669198588461532129599972595504488308041821964826043635029559596161652526633086414778498340817442875389328897830361220046753460
-2464008866849845585427596306460289186014718930150794200485697147420894155928351507966633760981788686260275637265508592186109230
-8485080800308772606343366155948976547130610312843499421865489766584635822710314441085925235277117540126323440360094147819765072
-3284154124684872982729898726330863362356401302174583854830959819131037571458234265917476543549149369136036055331113709805046443
-6448518117737425864310082406263081225358862769781154236900286043306718901307704827192440877547054996291784365092391305036785917
-6937932081779624691771675203207782587255392167526245881985222450132700822827458180664476166098376639952639111122762216172733126
-4351428226863320079499951081487882664115198758192473811033557945313783704183329712942802900894464150489698398293843181571708391
-4008673285830233165375165239225902635382169451174378889470574573298752951780171507430341658864697744996790183195739971709305547
-3512291497844318467447674406573948587271898370849211096489030445902905335005315909627516994616160913716819045790842998532630215
-5522629798725110629827671497041697233370597035945650285606531591280806838835367751631589755667302233305861288279338186531242009
-4038072792258238775154639697267095650759428219766235775721809805667537846787229698544718121429627243715285966487077144477541907
-5934583620628679989854657650575271470278836721346368661646073065566282621355114101575479793022577251192819889432201758294108462
-4480564984351469882094948004921988867959440174254223793056014056869119031094103106976186436427858310194322489736576393894678612
-6908132113303990201784965196474475898344897609537622286517498106001289334026874927830753197509682053509801560482547631691338408
-9319954675495203754314132567507992211027517777636008035159464490278748417535817989110579370702464528694578198640300697978306801
-4761479515872183180982458008106034482409223233605055754850233921649363735633967021409784641062684672780275455212963103609820201
-2564622328254102204752883685136476152747302286902963024211546476863845751873654900973840371931652957066788857238841473470464835
-0397866053032166080589875219701391296400993039583315649582052801128849941725263617220137826074241870851980225112051857130648469
-8173011294494728142605327204039773210726054522101869637370867240485919811250566145341338527471719086407653593120324797075262800
-9276563059829040598662749592867289249306923572562392127787551507493862417784430100714677869547866344355462003505196714057035937
-3281114518664069193538073304543737277406653201799960331850340753228936196208065150992985287938425817855366760648223669372651097
-2101840795886669078503855800666686104431608113029414404488344962534581805317909553125776693807861855300451192405993773968098583
-6961316934095858314386858284332606626453618369372169846037717301254036577518610498824984225850477019844523165578520651885370736
-5674574044356298030636615794164061879134353864364329335297710010416084563498871752753647964277918366926080825456181880254954413
-1539836063070409136278143569348758593204080100329208721008698517483741296128676983168524689365145284941105915339931290444395066
-5870435438526474510831874542069716476806976094126759545431524918894521691790318139213265279009865120135936482961615836310836321
-2764563926650270576320235999861005882574146665848294584476765322933617549606955812826398821817999980232276039438569048353472002
-4681622264311366983045853037646736891614380849223091345272419576321258005567715693518336948951455962926248349277346106557405718
-8956877856487148384136234859130353374642270367915456930125213227196134161996004529594088595345226945903651779962975528996861250
-8929969605933523152819203271238663371252277051363612117118809528465712440154903065164514629518743371367297353604095710696093004
-7157581534746462952501632250334837099070591121491848742704449306300549604064489388204805910975177833999231196480535164260229721
-0485019965651431731437912577838502867419408108382589212055345268265256532718527981331506279373063176342764821347791812231845829
-7209745175723014456091749043194092299024100594164185069424964912279120968460389124726898963864775282217153874785467678332297469
-6065725443439620053836394925815928161931638271242410865193688681337289422879252019985383178533022928491349413174307090957339832
-4700128875271375466912640968373319232662860319940601106545249660353269122104137983304514576260940899048020820371598690778056227
-7730285573414592054013879878236163258148114953801223831916249666510471398921760574945529246282567489263612670937049902168944246
-9130285817898813367964618316152272977147568779205131506356566544347370722993791917334237866531951886887339933938523558239665651
-6324176517408834364349803908520408107012550850560156082064698531696664057881361151779666150135225685603149038329558618588277296
-8952307375129199935262885586527056730554419885668513403462367686079193825971303716999017662160537275706617381132201851911575059
-9097939471326158030329763386527360778246814576714519406324120582675890884898234797792200042538307916074737348191079713801271431
-3543558395840050080153435933135880595590305720081325097084551423268599148459068228435603649060705649929053840511309887473304515
-9764838954490408335606543556024437767253488401288444187782685927977837265995938637882104106333802927203512151240662538609957779
-2886694819124240943375973107339251767858923004989669776842476259662336587537006376705925903350515688363082070599436191295014286
-4373652465925317661858189411340138062597385913063993168012584788091469995881494867908911062927314918797351706279530078724029778
-2064997451678388426343449295809472909654204980492286328038224332702407992526584281413262450071832225709127884717383554674100721
-7539736814358108443787011442956856478411159063433502735600777534624427911961386455371172130290891500709946519469882478498227746
-6726050228227536316385485897543745820479149980410361188284581130022635250330849613983713225572081803265842903422696226592604564
-7194667876267325769087238008916325523655281922437602110657822708321617107090571364990182422106391457560890252879023326941272951
-8084067244599983014933199534424787256031530896533024441147175887371345390886210891424383817784357384520863399170708018540336261
-6756491974545573085147283999623619067108143004190487704098038956692693217789059190015343978239812814528286370354978428552071154
-7449780712548692282752907313327411787266027754878897309843460775599392567392973717717866266635813723308899529146352109375925165
-4589899290541494280337702591008141258629373350544520604291218705671399173981123075630121451176103241759370092474254377359262199
-6674505740657078583031897307527013973936077370107324719073133704686647880878285508608449940595668407790459295575945823755660650
-4398342537751131171214988271811959189579782716426212830903406974442463464257365397952526980356187741927953055943122410685033921
-0094907389935032343867848721405008172219352354700721989014087040463745373039712419507660947640188922848825854691917677041514246
-1508958586684510982818262867790308592204381251380001158886369026776930843982561684403451614590888186936500388011892045824866501
-5793657116945434882250299286723935630635472763043771513002492162136250578168782159984593375232995341440779322489270838200480406
-1528263927376996749090311110890532617677357745138138771708962614857985706783193215918275341078100860497124422089882672715412665
-8047862045380193284671628316345513578527766132655289631199372572297400350940186548315099505461109159626804827405877434015762079
-4497649985437114106619275583585240709212568170308750996103273375973255643809512987167799126855604592582070720993954457629607433
-4115202807426887388976298359856110123402007311986746450130132490988863002251413157990023529650615874660044346489668889392287152
-6927862701563682169262409452072639909156413247108366389659864970583248090206725794860315733927719571533833830245401473668394282
-6642155549542044431836970672852504846515539364245490047433571110732970388069323446548403285359639096781185191635964711812010789
-3758505500262572544806847683378518452890545811878275350915244958015902281380798955282380990829046266914505428380626717794710699
-8543173740869008063671194651581188030729498726094049008714991031352383511909957936902571701241692397622133551499445586152966454
-8558201709766887626106558682087493174247508346751479027758498057382070135663052096489680200478789301589881335174285636803583368
-4021046412548985259286576563116974009718144433360698911802741759233868394233863822972297994024437477811572624976113883122932672
-5381918891212001167216621281602456221735226414991801854696667000136111863626404844152191631832767778925457352443210000412625595
-5545489652781686362831418324972755141214447870296324256972282335912548489681306938005662008761939913552064594595349128397481698
-1089524707879456280414931183450523776892076608328015438392554074880142678157014194242067164456688702421957600153913700978618426
-8305117650117364060258714900356625435051024551440455926273115470939757929013176898347131589373525848240533670222323888613399302
-8471548092796793462446437655496090111004563242834114582368336961549825665258690557364306703617109594457055331363141186121145408
-2838670852038846380823335210551520468349670239701607224866707358833084563155287946007354912983177147283657585469121005219622389
-5789402261399916318681167359698620197070246205566424633235135391148334480479925501535906551354569207810065959398048065712057919
-7261986944279592176600370192037825062903228830667505762121478097517284917101606104242575975523312739096999493662697366954853560
-9155879998783130488358931786153797296783212124287955652349632245457365996542148509944356865191456587886152913113892875578626974
-9514039241881963923397516312505696923391431643577404694192615351139994947842245479233801981061807552927418310904314043203688694
-4614887134561403862531573523675942563015366589167507205886559178959551755768826801165790017789960028672209846259757000436195062
-6712756378314975481834508159845487505561014170818191973740730433116802799842074666829329785272494733308089058087919052323067808
-4343294134478763284253795500389053885558601278822120237277266312668433120502431917455874080753529426382802888951317455320771924
-2376278290758786366787499337556544479743289945243171688237218372051181305516529407353834157305915645651032848895215696121925178
-3277461207520288197080048258823569914990769314412444872094153856107817656040287107340131396038173497845042121242427193089822818
-0292406985223320173089591545488895576256166382750650552107291481212988120961054843360076945546651513119822979777064017606102333
-4155585975612603215642148373485509667928447809166188682093526614287990594479841858693261264552895318696996233565563963262273017
-3435051958110889869116245172555488932493678104217964596210912258968214519860568648927109250277169274770553939366194092044056400
-5580589234840522431968399852060022338678890148720329696753155804394492049184529967776995091977565256891476404577309506725891693
-7335500310521157522656023934693183042792687707804385279531540473816692277059506917018062802407212114266734977379325447178574076
-1771613660964024539818471437377426571013833744798577093945387086328616540439686380471290881092187502982926867793090143460960995
-2854310614938011180157233734163443946405910506035197343508210254223120818772340019254546366421372519708012585990732220553479817
-1257049653581939929259306981138171825335308854774522129783756061113569283775667916315356572397505175426434698580681752134340583
-0335808023777690523056395860773496290527877864032944037336174082899748170635967157534100283308552217210895819668943595660390141
-0793041940236886441234025927232106929006722186357450970274155143635586525537995503752589941375247670685666954666533793877981889
-5778831921482018016340449172209749049865029154730502990831586948434948616688177219302113345681124510479338999307531273610240254
-0006855309162866716967524960032543880915882390415328777432560766307982993890466192334347172872288555702927609941028091228916549
-7852480060739012387300892561223523799609034777867042713542472004721462831725545348869852796577495340595446292276187383478785958
-7959977096587753530877434044450370650017598273016702141156049535064683872702373865885204993323178473693440316927580843350832264
-5711255434828429627433858416873855046302807982520306738509536092504233877047237492422270856933123651986965389822895956478482440
-6861826464075028721520622101929991628946998804166738863536077306024363695385475918930843524639833318710346078946645157384213109
-3481268732060383732986016495680958177849607099558634081654518008026716403239770966732475944721762791451888118885285069414233963
-8027947110287197529845522807009685886470194904262452476975443162530080660974564750582146126181908103247560999247950332233807322
-7124796294345362297022824568300955114164662928041497399401450052218863148267186902693402640989732333727359655944286809966607247
-6673207022195790654496166749745020173181219341922393697843282922354805033819231485054350962234180921218558256719281039871046137
-9465616068877625982160091084356867655695114307535279252535857794074660077470905649500203254845487633889884403918357791957962609
-5439735864176545493786682348080515776951063552894497267405045766639566000474520462761676673185451169867195127044329565448901474
-4077128683528317505947720920671307017612997849640361880751590889728513950754717072470243203246494346250198972938371059265537757
-1744350487793132663117639969909905883135140378094636348689423577493817809958662291757247314354678873465246383300244542531431911
-4940086036767442787655065360411221974038277063722727918083568388107313711402640446340277014461054034344740215045925518041320283
-6681118829208967331321877862087707476476072276521025702668676229506021840555589912885589031283416146794110309804988142636941186
-2405582757418961820523544833021078187732693088350227346014916968640935524755515218365262141583526578487828351593275991676198367
-2826944841325179084380122395615301242526065149184196022148551459509194360014728846066978997793718470140240650758184827065285092
-2993193263125920746329597500608467852384071869621346018318097029329594882972558366328973665134862355812606060309541457130668022
-4276324020092753413044519728088179483413580580809338027992824022071273342649903541028827269643668077697566268171224024282173079
-3298668219738409681902878367215423318085688425654045440812819269643490157963034537370434474347979142141704582114328144364074548
-3331207723416487218945222041751113899922244456772815194220564328760009807415143846017951460454941724943113249362066483407691380
-6952116171208702291147492954583173797003314720166450613568401114973391179929136073418264108322111138297086137222772204563421106
-7600975435069311874768177860666996344740802287521757586619300995824931951698677022696322801985871429773970218124919477206966901
-3780912628061324155929062282119787356103921261553217430966183645130255649596951891774470507549609157651291460007364039518971745
-3378164561008341242097804088752883493567850412617992500593780122329644848355808639540910546811625908951376798420135130564695711
-1010690664052506424047390590878204998037797666671722315517689809912733797153349697357764209138638827429140983606619452818262145
-9300376547277559089699722018353829113301128665766029981150643108015654465357713345760938255089553063389045170395343438086345129
-5388574617722177598048137212627225252667251794017646238607267836072085293351506292982031628145496634572585511875570432312724337
-2949102931084425964911707872142235444671368657598878661624977383342922503912907622387561510392479663939836372865380891249214191
-4125450850629924708967370485579795410196136664949644795471576226816969360966521409006096786481214505471016659590219454123795063
-1052876846080196429866636468392224678653280363636952881423630013978399548705549755495939234226751546533383899311389616571394812
-4742555980388054447437326569075723750771475897619661025765632486508214470920970384046022812610698865095434736181621465694089157
-8053089116717921661140443537567547341019450706571788438437303262785839761518407332728972316994708287799676864196511854612689905
-9729609228443111962917503361177873795233721041675657438816948255161968110343038443890530223545306466481706693430767571885086143
-5688308264781028505036247702821583514666470671292172916350280224873269657299593653174145005772915708578064978186214186153683267
-2204744465132776025498386899741825318473763441099667987231878067919021578886769657107832299974638025812458213339029056421384587
-2941505567992035598339903647769230684834003209355669548196807243023989038563917277881744820709582631259852618961087166384306292
-8258024223124059927265905619693379087206675705618331236606891852566067360854244728445479329673501981619440816785961582356678690
-6012067901366243313604096658402361049393912691496270752442176761357212025454418262374116671287518874273805796136109140975751742
-1773101052368269774971707329316287503544657412042811119480548137588711677240886794469483314479010931714923252443537409707971115
-6673163431438354320152064250744844641052080216051967752388682876816416999627859168211126178210239748498710723469312339914116142
-5806996877521195102255361656866436538966669931939141317697197556942791721788110932577145668299881351690980272915197702021298156
-3837290410389303517128116353347856259353484969554892124616182205192313287433755106122400179494690010200326668121477882253979202
-4517266820218197081941589722796747209204288657893693887244618207431797169277035145695561271253339157663193312460041285285239201
-9619778362364427885644889878069243475033064627573715740274290928496163757241181156603865800841856421952950186816149922823346976
-2573799739461267334017539893388809186322465134575561495883735717608135099991766507451755547789018617434096932254961072365198882
-5105319049917763260343536285268328841500875349287045804710455434303605043562842410645690374572514107603618866501621709959657187
-7151556358315357415841531703618215410583915203575998268810030381640117079961254114904804786046065507943854733690644791284850608
-8204760879007736798651157366669090166543821998311590636584404376075249452086719646757979910467231964531015916233682304625227803
-7147573127581292166990486442215222962358403851938571275150035153036061725108691622876773795056511233146161151053768550862751540
-6784559304983902886590174698622574195988266824149602039534916660889368814614010342767085921580402597291566274193343471685906410
-7880113249001482900851888199979393787162065292926067710104923584703156779327643300580458887132435255065678627456912854660490039
-1350749751135031413626228320025567623412283741939627729115634082906593503710519533248918652855496972010878915554543211009367225
-0004322455171197190670578109680045148889288778920452116958832375230435697820421502377733900228528866659062527967209953101213734
-2911494504322931801753348544419729543749078880072226980969166346711819931480214331433779640233877327672317049984114641749562870
-2396528513460618041259531318301991286281693049268735199694175803321673323893916691134629842475605991446026813330356086230228330
-8981164060702124227875449453939249569083280933393885800497807219622718057632147355043854391102180378987437281964171835261740700
-4207084959173122310540889440071390175078165835125695056930143838697501277302913507401666310496334451392319525169760616015349520
-1210081234448921940981378280200458404260945592669718748037205896059223823726981351910671794263375996276697272684781727338912271
-0029168415827572351727213122061796310780992187543596747141643738703113178475108090159020344233281790182332311601803329178285993
-3777296404075934053174216751857062118469565443797038517380817156541529651488369770373411767683949249420334108704951789531604654
-0677478972172417855596910438873967997191564526032435944553932413671467038312980120163881839182106666575810117448701361229089668
-2906070251543291085920125260549397785656115356661440571177943054793731483489419102892567240649669779614310761600563474068066656
-8852394653036692892038076417261650066148179764783605637155006560905389777668215992491194523484007340075319390767759607804494192
-5467138831557823428775541689197797741887498255851810682591799669249141593216801183262480761866825456541084229589715596536290776
-7751352765591319462216158866914539056239902442050723154683435064019845231969816008347645334022334350198037412040594819924724593
-3021915992015948439763471750840891829476672656242373621059864369709314486194930162083489346397306741461969474457136306652660884
-3810149798323432950565012468358334053474435740399651150333513841619654716521117976746459459286758520929133377210685994781661011
-4783431510440557379639204082385220913253340902177656244399207972984745234341006126872839573292250089207868222847639289722379753
-7370438575710728204326451494061012215276912157251877502908542289047363288154325283991522374002173371912625950441590135539908011
-3066350412780717315157416276543477507139338679594873856557881443518665559120844101586947952288770461228629756299270909156776058
-0225437513080408599402290104732039265518603222598728765215485627157659513804399230415740373980117223389491501554877516067224969
-6906447098674865317783282853291741419024882827886344308680586123738306172623618313185104401579759220967002703474556768483264969
-7905688354362418737693115373990150326675244455866285863285017259126406290824772728738190085605025791061658351412473817132182003
-0647939692176384124068167344966453433916156302209336971942526032217331539621915101096729732974008611758025821638418841239335586
-8207612011209373495228760846993905535758093646702045474203894639020884032055233069612162464709714659219943117947340234145019206
-6685510574753704984128082407027684573335104766797904438216667655851315902097650094638260466258758906563426639941626773728838182
-2859725751851113943873234212381842264933438665075493160334098268584252964692288511136721035397358821669241681360772178239556283
-5410817225831141636647896001039576920297438613631278187702231335198482845481821124632157811564428311298381077638390915142518664
-5603082383902365441423743060726658870177085955695406252400018823076710944733837738608757044351867174051742821082475300834328708
-8478410686281696423470828758415498795393164508886616098722313596122431017415306773664281061410625509783895380848928242909573156
-1195618788186485122683528679683670597289650244657656876407897279500115335276331331011520690820997358881740005917663903217514124
-1469313024861648921401247135353735958071127626605430535836717325791385228578496115248025350543355198105506645012545576867598396
-4272483837056013890177205566878534986867897273483516131338967706119399325076036529394304714161849476343886942682280685872295940
-6971223873405564611431588388181753597862284579604627783908270991876509853907693857394999066866716324481756490631331601939564088
-8692753456851589867469578350330459046916706027508903379244973723114291207510039578602992677933126396343784500936297228340222600
-3596764762533798756045077959160866048043299983905049607435425529900440769757414376919342785743646389458775443875643589233861301
-9939277922617044929198368291152778217422406940588205287822196961674791811253436361915620783243520085430696637802610907731339802
-9987990017965498772438500667174890865212624587022291536612477503056361052627799082687991851074848222861818981269823302761583997
-8147838382210431535807715103935094271794068054691587562868334683152631170314268604516246803968415953907592500669227061338962852
-5229815249263579089803694020966160885001383014770540554119854860763174611534378849807683267399405523325826175066050422465261245
-3718808810539902175097435162693814660278935973946526145133557384972950132995651178561319774914749271123710684959722970432994100
-9959643168956842935132972702456973644474462349184166563719137832114600377784944150813295076399096859538689536653676932352320454
-3562313742471254053603374767998733448940422800590796399248016870732131873285978468485675936836421845482343165519443520207502472
-6212070810123317420939860915076451492474105989853395883410582273920108061505858814970010182505273303507369510379631126623445635
-0255217936242316574157324758578917396184805700986741727460755136645033816635143639164644674079087020280816581372010788765004026
-8089847944137656769780273194285160566134507215012061013579883469551314461311271302478380193931275275686279445049118291696625976
-5717365181365376852569097535965171977412985242766246364289767242179344339616335652390309582781287529277190209039953388689399517
-7041440160561255381091312862643936475613988744385378977312543669992877553324112750381702041222192086102659343479767405018249915
-2110051683946677346707980171411807954606467103478530131043035978033107947826868347943468663705645386376022529329242653151632937
-3379574154524802337331393517730441276946707038997138141465007355281465799683250899916025487713716291942082244114027843952458642
-5030312724644064165890328712593254449923448331621966613833157539215136234997090424298061395610381815885285290455631522924868317
-4994969373293084869354149476773798201740005462072247291096910619119410509333790774262072570461057954016819195195682237016634823
-4014617100181465701775054953697719420102573860376968588430229723536957418028396409863878695628364581200214130204435051219695552
-9995923662150908682939564279380158287700441111607726222291472481672861788611478655050339588555615320984584521234687823576281254
-7451463346941792082220143976579354392136627715379752529027471716966012381538802459409604897867012386933986500209811720725405141
-5447700282385988297313347229401494009078606483625633850809103068410968238448493407439403040224936061985927544263475630989480459
-1276956495071860259959641422731621493130581830343261790000300846232499293476144299954615667025912420799180581171607386310558493
-5072567626180671481702538305209899197776259094898315797269647260887831166441294066368414302707370453117631015362578331461379694
-1152681127657219064376008724117880126055071670561685874051473152694654802783634954044854697360607744867225915714681210070391625
-4963921877303857727536312369203728666152509364270556408792999159107647346567121427484742607873371889230959069964077737186080579
-2539117036539210376394880318723799879677288248068497337514544989379323165067241670457629058952981263712005132132192204500173772
-6813760519782616773952896216661044250831393786872842763541388164566337619519250295645333112400558661044316307967715017816016933
-2537593940009216399181185307950727066601997003943463162691283637037387944868769661465346762713541328987499170590124382561225808
-2775885197315288545943935069058879566010060299863101752754477420864624440405321494564586899592105748495227288314078895511070581
-5073590254176183749859074321316849201765757369989203202482670238574028719679448337609628523768999643298161243528454637871645997
-4654524903507892912886995134469509913539767744116890388991007614902224668150391846827264198768560243067636303891131378158227338
-0324734826151939630626306117202466456571054839140771329647402994885021118469683547773949974151585727386291916309232652285623776
-1825578079957905035730446040937650014976367810409736691475746813209385827351129150863065044732028040265416217520597270250595073
-3855654215693196726130528392601924163490164258356468808028166928343554047073423362885338439044483545871577569335583661986547054
-7793570955613127244841652451443245937038624291178210631123294830620894480548406463322651814043971289378075631025886964612359732
-2535751039273171851827163526482017707846468207349048105786558968816006070754676314714316763865097547820424829616783998998577881
-2844480806501005182020568712353744447818200854387376634450572497810731969576672980314852204195217762355809650187750497828976590
-0779679209849300532787708183193857610170295918273464149221680774855800423860839661690361920242424552243626034568783063475060030
-0715723560396890811677256708000602036818903166537471742271498254161510038321801193648871563911124555662395779532361864351019488
-0796637275901473841659277764647010680246421160415288649143217531307967149087210418850695712273237810379507829287822942082290828
-2503374558287484037225872566037347531382781922322502069198289211129714070730191986360007963273941619249637438751324038507743444
-1257552500220289953409007738059857241268432142060119245938800646680659562080913958426385782354999183544917531229451796428251407
-0627725746927523912542272514587614535547975158991752064909670083277315643027595358743280831654266470167938798514468394097718636
-8318980485800264189777412075113224818829974167411737699158537404003402647667510002613635249834073904159437111364326870286724933
-8736390761693005617348059895960699070609999931133577397987040270060440645814471436005094800905267014783073740415604380803498206
-5542024002024944354928529036523594800851472969896531771028010643441490945234844042008320398276632902810470392426566175025658836
-7031032484519885828134561441713514585691824451116624144085217816423547864679125010423917860268671111391465300826171047260397179
-8220783551779338773320989765886440391559510492663544076020535514257589749352990988564034320388602959557187208585104844145026439
-8020438087951116022977373383495534674635129594766601601387483705748972280627013851396530590121458524210171753315286548207527820
-8153810125605918943918826453140421737748512940456044065444292520385926730447939082216173702077609971171912049413332448203544586
-0886669881112435179401237673978622874656264303143999122578352317897806033193993865036799045024203333380525337357889563568831448
-3748676570310585965679075167577833926365276411040601559021494474638574451420952356408036362315997810486031449429712897242856220
-0680179178809075888645900355703866665848623566100723748395628721560414660071214664781095082893581316152736759533950009932003975
-0830073511229116156443164078334884149650348116571315260656550335371524295132896582152314795929439939447827419494358066689706173
-3038785789686019127115381229380791436051546935860047229508729818282744657378118473627065099573727853891404083449592265655152693
-7387679714798835215773140865910355708661822160467627107526217765214393654304740207983760504979185513943991488603347106187504836
-4959345618457216694880885929572868404119594959297665383045694122211724921300914575522725438253647266552305439505601459584619177
-0467037747326795908961510775114924268777468775918327644966642534544042676564308146590029193764372898938024544197186375500357840
-8285890907673262212647988009259010379723054727978121814340184295658072413264615156697842474728575585169324914900743103535246719
-8911662589073033021628854642652750279152366994152376376433694906661951714454207190114956328995857009825646477784015810868978338
-6105850627169563438884040914539421660727931317710596144077279839188308966168911142486835009941100149861369756674171355191560490
-2993431983320455272922883788672722733898158280538086533775288120030297726075605253307507669239723828996651212708874872223213527
-2383871203918607138972250186349539349163142546547549565946027359258489597478748862408648058675393278207850385093331126182621573
-9149363763947487276724850656041160743708661373179229186384365572255499194358074217364047819850970764281787263423869876082053909
-5827019270739581666492975342346328261479975112685223225619643483040396563898673337995672909483700478627244101352870984979237732
-6998285824391825859392150613924432428270654497491969804735086552708299672203935039153979762171440238901122660133544046138761976
-9253330844439113156612382643124565174653829532487393981769888635312756386927331059248556801164857640315799609889660186200071275
-5612390497528583434894505132668347409216226770741805847223173711771542665456899372500390460954330204857624315915587829701045748
-3597132578062559495102590042788395347495253649400865738509995118091093608521019322954235222572297567318636643867386469580449507
-8425515407736939284693677162137557410259923224830338231554842919234034510500493129925331580967001474100531060588153614511993338
-9601991297057389436503665001505251866564553593237174176487901010113004032749058341666775216970685449376017846133214652240838962
-1863773381844384208184694104858797647539515137932214592371546918752008772143433088976967184397882651789039128762093118018510138
-8436667156247339295567342218063358078249911156583296510351786615409192064411950727914656163850098232887122260394676405120111886
-7683313388786537579802951656666063632278774842670516448032010207156251926218292168775800210222391153956472045994503212219850049
-8209641417161775663979384085179876713787424866821458112247475298894421880117371699371735285979992519666751909878379569083863705
-5145614759445599831570000861590726100099887859826097034388914355367729544959518374514940678332048394297378845981970826760413852
-8761767120217732947982706113384060618324856798940745761981931692821487049372786616858603289668185012412091827806837321112104047
-9255297129664160944098264261547065105677964568103165093339743646349513755899758152316922927563473869566225326724560456097296052
-8120768832977744822631836021474402079390526097477803448973026451821196612519143995594879311933463926655409414749552006489267940
-7017154772060236322937445448043347707331947096778317016923510498198624836901896034874919545286197554142622789268469355512048260
-4180409321511968885143370514200618650235742405287713769661977834572569077057120974054874981770237845015640851329981775003008191
-2674007147813616401003929214576628097932821870524475792725335810151140502429235053500438517449175945097953478389066531072308154
-2478433215760250770512406042154394331540911914042172939884164584979797404189940441889258451913067147217070836370940898306980314
-1416691061574950251933857581530784660502363969157027453652188159283670553356947339926944472421121743170291855577403109297001923
-9846364489252978228078702013876774947354134510165101268064021721322665802683013959144338916544348159574015107727356473797086745
-5487580365242793847184389294498037980764980441864399341257536426029899353090372478661527651346349015000812904186890490170512422
-0317001187750772629199900746610544979042670580491329322209673449299816557793150957519344382208574308527216206006597313873698350
-3641287214039996737900834675182665853779449596351604582635503134884649233644728626688852457677654231608768591360986911023898427
-6414868015450446904060895609231719309486232701910101120865147273052264604064433289410480856555673255517305129013544577242362891
-0524147637426415811762515415524550268148125432394280267631328443360400295790051752698236429135771292548014257090019134991791562
-9227410989021340348714125220582535723860559138846179511512191891037914244234245126229571603923532773311387103298341477228375501
-4041581080402587294355936437638145699274625343476210354812865278292813236740766242635378473283614144250925302804707242340663339
-0724867859827673965725683173043844289022888248735884487800477685080844896245015920731492673699852061747889861151283779392092379
-5909276888786182094219448158615991460321912732697015860009933234510620643391119454097956755043612428806923128306819132701862789
-5863973408297121204616907602368353757254965361693796331036727921299882051062544545347637276552415740930878434572627384251645258
-2609867181490019825132280383807303218611438271972259358234476006167125808789720811193408861105326321587061359193074883011503250
-2053550365140441314774770422273440770268402358845803831349391590570354084402287239858709867448417600167758148787965827714400727
-7156914133575985423380170082307013620095209686338890246264669241382877333719091759478776099336392938215841439510174135934515390
-4831194527648288858829733221197151800308714018772578642206404911045931696147282373784233544435117870290316107286565703640910861
-3300965303400428799995252612196866095687126018105212822125411581947708785019993474053195560005697252054488325120896486904066095
-5685043938431323336868482886553258817526871549549389321696880672458619872963868160503420041705844727261813948644337640127844475
-8437858633093280150489850618743229089133908480393577494682517449743840953324665700848231841040716763791338769325607594504384201
-5092632498177396936492730922026153200701191354311511401621705191001018224605697557158822145660532720002740219521243300566753090
-0884695364629948365817606370132571392316227842180869160712531089788912972870842630687441550199592940590099216041036498458331435
-7030125885795773170445439886698551870214797580800884149092936799091801845209138388276070168782087225547258102113578759536143915
-8807215865608701057987377248776702944861046260230342503936276411275965656745488818885694005475308409675094846381271540973613956
-6869008153507650455021791206721217199858946589909935757514740552973399919912521587008600090842850454930346920106313925959869436
-8747302342382237757458390343882591560184411401946674013753631245032512422678856746902092711874356365404625893572768808561925896
-1816616401614372016489584185015076832989812362352963164309054653174766477426767816672229374164734973950570074316503361323429424
-1677262729710288413972124464110274430459973064690910792449284824422312855723898793069294265613363135307936039462077553033385323
-0904814204574628728334178723557725337676246503641550973591704771295724843533583760990530372617065538876854581885105724368370399
-5318034405787225786821497050581659615205871549939335953839157390829611482749151979571742480565357809673956661177238715716708421
-5050974915162203984880371984109598616980412684284404767484126024659745317958728060034806278671739980663056141392010690752871879
-3910704359349884254016812391071406772666793577154924194799659346664635964157482006918898999240501149700799097400684650477119203
-0922138102426301243886965897610590765176893150415296968278489084200960754236095696787157337789651225430707548067049568646321905
-9034532106902339573322445743023271918597056331210862099117907113669633072759130199009133076195985791779283506809079562559701881
-8961339360352958868430789580169262538709387737102199957461921100064868143051486287683576990974108237901843716454745741895109283
-3895519300319620380905559168583475674843131617139726705719237185238119833221024548683898215318859806049104445070815116282206901
-3205107673082159654286800880087962054713784047147807335322961266542952563116519811400145837980005316237797804651103815235446781
-4645211086556795731679627686638624553276782440503123281227932461374131645478394881186841410205689089468850242938656791425398127
-8527652116361873059872046061450470630778597394637649835734537239971727675715042761592888819669786191505268650105293343814467234
-4729851960520632361339165114787166123924351946142914574237488059076517558856540707604936767815825051810582920267228276662907034
-4922524498676764577221603274496474839043188887553906964245432382389882944444308052516105844797654740378920402689234115734188908
-5209597697295900954976185802188459574638626316316754990028635919463918798002460967253179124238772322245122243876066379489508079
-4508289933039159505453489164861720999217265104842659882479905333119333431390108947303039851217725991104705191344280222412086293
-8069168568134508776661939124641765187854999589971548041638843098203486147656735371454412494419404765242018465434846607552127178
-2927086453284193065980223266739988186690361081906781869605569767794118257589865157784413584255650425147523732344110338440580815
-1748049647890769557692421227727549481557775151410048868814718985045151061237011017099100528551045245586497019590105694556854099
-5925541326979395577276086387515399363166724218914221343444459910602377753889752768375789640169881596578910501727353216027189265
-0670300499827706283025120061244353545380543254798985391943205942681540582832008582661334249048815794102101737939011541318568554
-1807401946172440506670841188965007674553832019157741404977051650612570825055419487071388288683499429125090172081236081328128795
-1574208400432062514192736694804153587958619698259830513687209529110862276181211516095950235354568516040903749851761677661305637
-4121149896620030430814848794433445919918770329319490730619096312332656236065824412598168467443676868836685315118978623516376785
-7498488621509709129976594981432727530944618723741457356588286547102533914121132990321805599546945869002131411100756554367181741
-2582026542886480869734858959495104201677107827620049653093381222272376273695750172303884972292405628020932588645381010082785621
-4289447606077369793749546092089501817143072386741950941157247080345113014329756464038358626070033871947884567651488044623905631
-2542825564877135509885226287724296817068865459213301536696178082552402072123707396192496897302967815948042943248544343979991813
-2226470997115317096784601264496380718265218871198752715837658374418501244345114451866417686910079224568758319235433015428196960
-8662720543840647608329817530425275416788291903848716280076563958924728751343578053506896388100895823567897044421928057610378475
-4719351914296817015503837199703117466548446025449281302558021903566930798786374684451211437854302542934198900108681526080958767
-3447640954611982803365820977016952430036387460526610055495899354375691830575753318086903113772624764685535267168082007345740305
-1797213012073375178436558221355605782112077809669165249433528557235690262339894762165301931035587761808175461223039297448962130
-6950060736132243209446984212914140861957832417030579738364918001660026811196800334571314378298274260059705895036596817108824926
-9243829747951735931284002210476722019445511064984030772651417194277223668272106134988724834976681779756839767862454568373306618
-4177035873387789691442645602142232402697759139202124087044601161733861189197322918438352811683833924407803890384828993570282474
-4594126055178872656922618774167034354795564094725497124745719061896909861368756961278327080697512762579612758334700763137442983
-5295668887669717485226390123467973887358507953479829153694623729169375830523050788966597377361980793027344718171019365784257200
-9888285370457729318303943315282858750583399490083047557333008218529891417381026015175475841289968239416942724745429537867737999
-3215943066766119309004524839024701086312759322446215895076113158100056596170634794503064752363481133827922180405978563689758589
-5959944414411467463305736849422386192090664596675188756343645002538240622043092367067855848705606619349233737685916244645398642
-3415921462522850660711019463447810831161516098186857649733922254277645246597288489872824421913456035668900907466154510857353878
-0820770271351282269897729773480908180216209552917101530859717823023591831191252679348064887785178954716044181664367902784712050
-4837078657362119194233933526772924288995857318513107274934487922952892071107573280347076419494020490239809987105400407903583211
-4566520950673320089105623215464822027247924240083971798563728505499902175676964769999078225165976694000667473401833118202304025
-6860738161875565205941822290237567447513259073024464364524976929966835518792473395436546988594137222229184152759954076791794830
-3322947265984158060992158624663708425488918876383348951122905125836522038089874259881383269124957101134232722838965307585611944
-2514815461210894795746476799700740431234580399243562016925036790171527515771508119826976806830254109945111480181093741053447775
-5733504011133442490826886677777865571712956442700084777358932735387221216646199198889278425501261656719619101527490023033629983
-6816820665025994462583833453804933866931009904653183983658207938144775757074429801900721418490709180940459786270732207357575723
-8952696642268346283355069787962809893365964014926493914452473794524489554221368619837559042723108457610361497745820672215991860
-4686726618791630599619015305428791046600757619220375372642195506961581791667069381025833026424470965152344317512976704970780861
-7817535100493702359961847958187008692676255354707895369219620793484182638707169828174557995935583658475438688352992259510602626
-7874029548817067666626239631331985390475404826024086339339243583071276348104332609325698630718922399423989995185805657290031135
-2250809137006081215712604683009748641626154723738138936917095298080941105465629041740614734952469019573555032467949707456686827
-9015780860040863502309304151201467772727168204445161990634325579174702838004535428730659838209979201561616665321137059277802195
-7650185512550554196643188069669262493680280748343975919639135449289335914799374871448334387269516977974949025899212288538454112
-8893662379603774306702720358700430713868475310661351513479439829552220384722225613968805831874918699875259504799262267715048953
-6970047041565543406988313458814942522252185061892588920654751003945616453031191382091583403673677641380943374412110595010134653
-9871101512999920825593895837672777862350486799080847951285270490204712290524251977042420133385216867854292673426124017430550114
-4761750275074356557669956909154179090706612051478635506091941757942400068895124161242203046266249256221284982009220935209300242
-8708015446206142670623126732884105024418284851295914904738375122444129503796268180002105711502782904456582492253779456800326918
-0613210293625239057781585677639979950255289284707390038337154693725678298193172844000279478330485593483147704265272812526895779
-2716164189514060813320272610067774089300292554132648786501937337701166054949053895064937132503546260829302791728809439780621266
-7313188607076954454240146509025347232689443993903699487707438769611328865209183398377855897661913914996316621615825549781446347
-1784361684093575880030474001414660619024654155783784777347697077774197795864389624206377564266630250281594010870492871026068899
-1515638387019036333906018359538519902111800466842577317066502746814101599618916383605825219038858550204877062732542814333739145
-9220084992150752811004335287492444508585899566926596972214201784424729857471199982968054884285888711269768545472118962801716609
-3225729665605184922610258057387753797602084282592399424014307116412082926636660405157448703031528431483170813038850013412917589
-0896837209572767267939653527113544043129466184693048843785638628896239995824306624383959725609177449846462355536652421863726297
-6350549459745687058464464835566280558244152696093628407065101518502946110700562358545869437041517797874386126356678480069546762
-7437438880206605630925397821472561939196877744334362718590301519068712375301433711985727209285202108430567240861306104506294438
-3997013218626793371442945794751768102167128014691257491799130532817890787884088430906840628465718832537193051422942089432586522
-5767261809159521411906210527732505137517003452232973525892796163942363843586179566469412536807588910846358095073973053136806664
-3610420406657475104037145580225980872688624964111041381549594329404718245302720059446156211318636072750134363504069278172819616
-6203445793416289171078116228949526537345367573758934511473904862922585007326728074024526181186924979509692268351022430367531902
-6396903617968213357545062076755915835538061764765669442173658896006627193712410945197598872950553456423579139305216599382954077
-0380250815827704962815549731957552434336266476872009617222288199268494650352751383734703683895685962764217150385921949138345511
-8687569627504118278687806727964146837523838460065586633962532325989849682060922414609471208083225295893531164710651416235932804
-7419608622045901350837303269139752477969857182975189849619797931283834755645259685017775129366698872709262322484867769237487261
-2446574648357299934768068561355356119075191099390351323266829442188920299959413380468532819783426950868690325166385302101461953
-4690378580819708064900475904899019106498140395743178471011674929320871266333196561704778715716963538368801024314408279647276339
-2089232113041890885410086998151297290297216269518414003124742833718798363559663862672468722436254498875698485622178498338429914
-6550115139019878137719854465346267455296956376622672210869101826618943385242099068657285404811000189142469975735597865828978322
-5550336328979484745931555695487878550858216320770924583332798110114879836414978841309407295358874518788123614542792919395667790
-0067101966073227418786203809533671075851186310058420930636457857938955159488144881158165188969895896949949174391923269110027161
-8258211496051765933329722240348370716824091139227581167499651455166693356343053246387421021603939871942981451611393932490380081
-1143232998448167618984488431281685110452032295577636699995232387576558530063365443650214541186195345336376561664260667081107636
-9153874053518331378425571758003432585952239206770799268110257888073536748287123822972824857968518689632999374391956653833541643
-5746454771428065810576182766708428737462219904665952012954717596322305804801076045993811560187169208752861306869132853087960769
-9312948167988600676884786283729313554222793557251794907465964089218336400060941052967060271657136677975942167674352571570304004
-6999898093303477247632176216594681728525645905467929567402604064471637964034911185817952376210008390273053006469300379255866531
-1000632388106711156678341302292429215991586500122697419661097904387224375829260375948304920442750157857268831027577641937349960
-0561600453741069995026478401094735925203677529242298315347820295756013844421038599646676315356655360880496025651231310731701615
-2967967299264819933654047107088552569694325550743639578846283279457367587777819171468331383302126179626852498959303153806267304
-0993137404276474214149260182488025202243237418254946278036864473980040065830274036040054866953015031416924556900973301250401325
-0611401987313671825312920644599670850377089684826838922442681491359233283306670402386279700142617583474055662080523345059224691
-5939710996631567268204735821745742750433473750474145824948890280584535509141301239485088599010310179272128880118496394992466934
-3357460688499765569727929892732936606129832020628130664357730146150594561279515636082352905831482949527411745350155774277195108
-7138561333287682465057643618887421608272303910896561253448290571853039520359195699641420904384787139962581486218527455895010235
-5098065276517497532201660511210544476729427289544804994012760004734407796257346283172974549503877915741488118551582294732680387
-9918245303994525211620190522775746453648980603544567886385199869862202445674868474533709002221515555801308081350907650459178667
-8721390287975913893819238889792260446828081274233551710328471981963516819510944667867602212793558775770710289206007250029862895
-1280952122455041043530594319244152931145497436315530258653194357643115496210565410757613267156777417895715618326341142914815577
-7155758483619829149138641241642134167637824757268284393191488835351550697663275036059641871170325362834558782380774852273848821
-9812670602301209189800121141901793479005817704022886493550881027819499284489381378125534965938777548562514868791510874667018247
-0362874203793328000664031717659796956361927785166994482222033051420000873310315385500469809294516134684467763731164514267312822
-5076794324739899424289073581881385172449093717540058394689713271226423655501988369216296397971568827556688651950460247532081671
-2211691279142831153117347297369818334578478434502829176759746633980926915557525626263924160377780019382684610945724739361356924
-9219339881449560885105533284707871200679261887421531149034514599874409542178946360778835736536874753087132328398630153344208176
-1738323078966650030040964282424869456011617229198020575179773319844636313591780039750411848469791355249483448877218482996481058
-7662725242856974627520011178425574682734942204257582618062074645522175607162830607624141450906516065750218377963070171888324843
-4118042284044277227029777215730052173836438075783336538165120621022353806541561734384066342123951846452650796265263415816226504
-9577454228253953925531431429190317095770965424733462598360193026659796995068726322946365945449373804244913417484873047389958047
-2530447003714965976379236094037411278014717964765934254550861704945379408174897820528178412885512242072953354276409893858269606
-8161920683332117194434729439905850512943519462231619259091383414069915670154194411541846032268055950920748136328515080957772524
-4455001394112823835403683958904433147118332238523201500644925421808301905477707785391327088921953707802405649821266420465223561
-6446522347006213132203935166470869874136295692811490433897687621265910913874552752126752166818595258011990560857727236113871905
-9408818174849694926607806886600067803753381428797382723099805698620415041534972953179055866017711870699147517868454045402246335
-4135626065428509052074741682443536368971147858952760160985560880547769122981012756994845114634562103177568847660082033374741355
-6629483302659977998713743227246471116209038004192175569114510152669193408163108052671223081581651955384894038833735367319970945
-2019914369819713476232512996482094786229436696697562766992595975532622307992117773104105916821954959122045124593739046172932273
-1444770368011659028126820519729159232409884803442212877208399135578736969682832974964729860145229172744181374244786183467104294
-5285602663449673777986234552062489192832103368544537902433053581936823853505740285888319749907423551259460167786803225430704894
-0644806832972865011089771228494426041526498427256197014809301589227000243312341210098122668991020924989347084902763173739593342
-8397927825150753855181618641584202156450292633924809550510911217351590362959737037094558684222129548773410325105794129798697578
-2130742130526719507540424131716191473755652175799405630787752600339151530661377691130274509280084673031861647779131553466473489
-8949445645797314751748458206320095870152672752275260151260265707878555413048057771903238190200758654160960860864191150393477626
-1150155207111417862229200794999414320488018094694431946879621916439109486610009948685634866137188097525670175207351289611083094
-3459879841467541763732336521769192414341573430800023957612803685733924880739274791648569413015334203212412056584388583105695911
-4207107909576145869607620085461426361544959409669769028641359260476393776996951928885197026584290166920423018039379739461412804
-2471437021597594937922441016847924078362096363319644062767483944790539470640965768192086646725793415577156194561524796709562342
-2281835051710898850388364318434644955789879751829726732802303436684019874264646806723409567549761608858039525219541663231620839
-2007932711287625313296243751903200023005400873291491556838807519342296983784742524733445763971687078693207166472588686547509634
-7628738900800911617227705711930133205924637233313615650647097515124961199263711780307927527262674727498690057241315682922136505
-0493387404859274797132212785618181333173806092520644500400240017059008198178246301124430115868753110589721037771703980382573162
-1169775643061410030855660308847307357939679557417322697395889694976054211267593984893969933792226845025198715121269754643254572
-1728088919686607770305974714811474045083911324960307426887087611368014116902540202262357011208475439646884185432232498389602471
-9413509858059972641349538923181108900150612516616095667778909942463828217847216087159443807284569471198894585206492715160193699
-6728843665008266563029199158801993529576549886997200057517865461162768723429256920925422142043184781462681238742660537092344889
-1931599731390297037090231505612731169969829636622229470099002019655957459951531223643763907113518395449915860761987492535032339
-5034107674301251502545019517381773020837552557746624579624919732008873147762835295630900229992866373514578020722517390727520774
-8983019600230774694685639778625463724553591351398381775880431832781553934906986888770789153951456721760712116772577734503027958
-0722579888130638672105073329597090462417149082738030373661949401575813793082783579270436569787902655097641040401368636813371427
-7854245354370422693429496181630052949425191073877308843275368739572310979470712820505147110988781661197587183674125970895995542
-9743873036934859621564820909920160132335721185173809848423866981847229831790016569684947679721801847602901060080188329396305906
-3397337816832712119749817143233767742905059889912076656163289731022283191890667300707504214144077245819520343407565716275839778
-1635431146179533618869624816029047896887367730042516939278216433734900869272992829571445669607086349418935403567352277456520703
-6762725385281999872315155129365300727718531348063401770341896591345777984146395511533572557918080490707700609701643325567678181
-4555558906784569913680220888302706502231120206554070127879841389783669163314482027219519085496782129580409038602612227824819543
-4625553964652973015688630098326028308371988997070002772661734916972323600534194087341555003249709049635157603584665553841867805
-5469615145572204179649517877754736243473051237336198742915870594247954290354530866927776592105619674425818013502199456960100742
-0688295929947456127268347042202884584629259939771429635850789571181349570944477662818026788804604769581716692572546910654441173
-1781053017263760670442837500622338443773255350157040419311002126378320391255428265011649731680948453211623587016944241093429272
-4424881884807343597741531983608658269276205760340198024603987236049280398955549067330598233254907076437393855435114528768763737
-6402747544261459973943024136936806092529416389402993987239813694282531255632557296852083229095761340348625572700195393957513287
-1528386320984169104784676953231416483588713316281109988780398093348714641247346320098277064757682809088330401558069087928359793
-4836620934876383780592087107373057072272745160875663949786761387509864704698529847777036861011698566433232612309834845364039380
-3575337583851040701388845815054721473930456788213430385395140774983959957647809720764167375524924858966015899435919948180069180
-3727628368963430480869218342563326331182798677393171005831460902561217359479597768311004931085102290184621530025879576836660947
-3475800984573188366693910563609274312878602294132115102801727644998770488363543862638723091471157432089891694987852322137790631
-5023683657353497036212732071088147337120821028934424904568945720202766911488162370473709710449329167955152043455364639983165681
-4313458074953427422966761496213154547288857367926863109897916806997328848306557928981283734566043834603735209469550380544603011
-4769534552591442528339142072463485535584209788041390319662187991947284630203143273451030277553655546597381665676996289780792291
-8029659403865541723176070298858179302484672898090770785814054293418165410123040143090326214914018331298053460618863938939353357
-2504331261837289138046426704519324433487258219679900506483638261532541113835978749947580235779347318410118894160450785891787503
-9154332931976583483472163920590162126815140207546760699499178902132160947370072538150136322051659957346811166868803166980109050
-0222142484013400331297859576897114613785020913334195683798252363342695111135735081039945217905782047137997143182303582893239120
-9813120425348259494442258981684713118897639132890990099359593568005985530954284388860261356040562648449500126432442951864251191
-9491055336614888264152467342246996843863880300943314768116172425467094897669780084992632583894436406804533915530813948074710378
-5125880262000217074108251922916601396846452955978383367381037097928649700928330600429463193168987527289334840125068384753709726
-3250963913544985283516074025079436289530032965000091704733601456641384410110473920750483277883697522865698072624602352586775278
-6909533273650494192857472271669762600062165210442469141500817398520087420757013742072500281461753556164642072928308813935348280
-4807129228896091173010215184046472764333315290810434138260279373142369497015166184160402673619706065463269358547161491925056454
-7992119117554165493880872181423830045252323577778753354174393490633929436643377607848377532573742197373252323683113537849603683
-8841806293434459100805456108210596607134914383853585818153512788887296784056237782465358856155449499271949927041469376892328564
-1632152697497520229603928059316997370226452543375632335002549957119486189260078571706186257203470953055703949967851861921520731
-5864396596718182058160283419308429964136934231008821382389697128204242562370820069167753381761875728312424003987892871207159646
-3666084774918882500462621483992172725824109862896378199142479129987559328773744933469602552905906375001745899273316469658254151
-3498338535962144862096688449703329334091149790999664223656029226119319000718124150843673811902580542556051470065598276315050434
-2588642538822153267060185463367170199110995449008021906678609426788891572594252587471982661988824671301251499893937578926745391
-9319707795744627065170409664872689583830132047201026242383522246999299133923376128562725383185342894837098008031828134646969110
-0671702811161136021518386108886822361915633677386996222331112492876474384896788653692739997207795179082317779078270838374606210
-0529680562308620614160670757652951824510508056181488035417621544956335930822186390269360882386498654576366806627786546389748223
-7121344007162987446407144751532917923911603613369296361423444081791345960568825786153422255467670330488573438324604236300940295
-7856126749900534423962976560155869500794418586760356971148877729423323229897743690930063998855496652306786264023420507384957613
-1115472217398806310578221635364703110916537667405172225846214402717552527160481181622222803507823937807179294058810167262993525
-7733396618045594337624445678237438829647882527257597412143681872681853625778555809127382419530057648275810262641644934924071181
-3613929384294435871056622853422519700112176582857461049491276578382237331260522744886532614099866550813707901946900039411643678
-2471863854966531804604197010815017888282961247506056635263741803813648407515388558830396273074055989597305977778886391310447068
-5772682018682680181055188634541777077934406094474845232952841473576584969574909042981622739932442934509311768673906919851347223
-1971820335809415226886329944736554280331033759806916931583970783266805147633904060778157532814909009520404718412464333929846412
-9304789467519446866413824868897777103238294214707967726874145548954743749977770022421296628566823077488711722686581183789601459
-4520829387352906480220193366391017100275344244933837568936172706668016811057327408759076674979685576296077953383462420493700931
-8246906431343919288012465266462141639350962646993227082304804964566869105156074039984736745415005176673660764795387467919402546
-0186162998111273052854513690953012281012706484313894676418003816742150384731546652072390520748548343581415404883693106949598503
-7407453409468893649012012693295080963235028162714227398127099455397823529445343521263605978197734068303737481555026299674237511
-1229395187707069269668822522188040767339600015117257223444650130799671208076697307072988709360546665590067811729152682754853792
-2543283984004058807502208094435749036903952553879602762556029245920852075326946498509084553554503835502118795067551626235164267
-2007797747581357604343336945727914338356814330722751353631792234077965818274628997502349441503414970786616526353391356822676384
-5194656346701670632084824377074289402109258239302810982753490912710811175011533673266509733689435108026608580234617657393376969
-9037146495591802460947583581948869619219502922722697707400434384802310554421740985009894719409552319891457897233615461251631720
-3990697080273078766162376909117528749470352764935216917028329174981312070290561402015804824976866738329336998564205666524939715
-7848352778978178394189920640395834604512765967920164240559275230242580756053219581598506048812354481467677378211973577424576951
-9532477816991813127692436491685156204938010748592475096875883131377908630365761647389532075843048673325944084338736570456096797
-6164242821944626959915759190590818947629953857895701779138738262444662644883838599728736964664029753263536337011632748825080378
-2817015241236739478928849304183816788634913242150862112550226668153792859950263630837585979285928908928017849179569989536100198
-3188299380080735588065637018955883708261980780287989654193640067585824757814983887808561472404025858752559638368589207857289458
-2148159553153805396206627740954877447246881212999958661604167091735503989349952300666940107138834649908131455364478740204253214
-5183812867943299697018327767670320460762394440257519747758147645570356514775758990004394658301628734229570022912960712413921130
-2264795742893091605616321707447640168594382931899898384410937459110317820561426704161424031904340033048159158399357351652777596
-2139572365125527551258839222311219599103367463992672950511023648604600231272790630354961828455031402437496547839035832950304233
-5563173043827945218120288721053385228256759107947287607765533263965688120561373605092351078219345874822210656978425318969319770
-8518350618323036588967937820117667974812517069373788130975907844737917546000454481446588184420492343516807727330574227463796535
-2208092079415381688598883619322045535433174373692220944523386140424053570720154062384759984606718110454232154813303857905183459
-0403764445312406400743177177292964855962834587085077838226697948324657642954983884229554291774482754430895940798928630071520949
-1218078030268093244894387180566099112644808636942463725970271185753041625812549630461585448271241111674252623627152709755765524
-4640249030477405125378434884747349008061139769305596841781606951188241867017869136729477063722445205619856063985162910427240398
-2909590245662898324814954125183873527735419113049232565629860534526664160220755933343864533662307471463902405211409478015729764
-1532024154051612895466466141175266647835257739963433595273778351297990606120134172421391748505385924656782899507982823237116066
-7625676430217706141880242765715903813773188383257526213002250997251341961521914541749167347954676286972265765550795698115431540
-3971204449523415473814450392924406717851351635913252062373246080376997499866289003353070967905385783507116089156113219681812229
-7080951492315882179871809720207741914174481310077398153033680591523295504167580131795931815413662606081970038126846874489797367
-2964040579217611595547760234190477290346436427835968877980338437548172752209833653855504469466390943293257324156532489625950388
-3972616808815375498057586682316341344883202169607183819718037286789995473261003288017415010063837288806976576286819527639032681
-1290138051725002391039102512231630818525813814320415691425261417707087230623051869853213472687397101016144678883680930245168423
-3850834662586016207855419987088023334696460550057253060411826174208076438814838201928582833181083830814307068201908029863175971
-7944749902703521228274612063687297856087416799604592533936372400167341391775276233906976252493497295192482610468181988345091916
-7011096175582468584236690812621406307216715768647084636075068364924266221366474623044001441060540006895424513815585241978347109
-9612362696533734373153334851655466254197093486211639205861389987966709302035551682330490724447416578042696870553662285651851441
-0111552534765233442760444257765948564305822466469203165903339169326584537556214779726091179725355707166736526121645211226756106
-5885039259881836616302187141071464709494663689251644989212209295897461744225634984400183422383926438027326803031066696585257111
-5396579069429715251643225942479087285188610492026082322649552644481241838275988175206718743351678720472794668564948833054357449
-8688233606386980591001497882755114729508367160997540301693192893291539036951478433163921320714186025327605130043325851253234451
-4872214673472278544834646890891722960548978190052377730643946484747055518801507106492936171927846554906068388153908514485343068
-7214840374326612339276352609419398397127314205763710059777054421447567554750695002090543962570373028396055745121721373269382936
-4524482436241914482911352925071095921316760701089039169544052169552093783128384931032814298463081577630793680822839743941613795
-4223734008339327317027315036935919017365387705335808468598641390301926191406305147914145568155445735877807426352454856646393111
-5101170944379204574558835956241764204898906557725918071785044288986731351021322301083120247570462572136590876553271594974477165
-1498954940338463049076496039744592188429182308195708965464178219513192666612550201124332096109168498851228361187923717360547190
-2838593784210615507907908324852279814008797652951109874718831612968151452611605913542110950712021617053098075818112497307624799
-9381906333865113269293243176861228537211612376105763917319466803899016867981408631123044887142147183129506705177986309824780722
-5409043531218283220619747469806558139995337403975277796517573718341286548125289716392847076083882092014379916668361163684338425
-1904893321014375227674131798347455361695847285890504332145250525132622615658888584205703776156043946440538442055020240373771823
-1351830991497076875181168528408533516757044944191964801761366476485666222599596030732870772285002472325833568217236712614883027
-7315021210616605619597435420913698876375528968662848736161937624720303296895982028335232063555260929924269983942028091369465040
-5072200871530059327653441988927547294080741487165355628851444397293608964873155978474929308924899776875776153220999350338874781
-7297806144047991652107617589673777407092234699017295323732250434070279346790076112443512292202647551871470787944370705490593514
-8338680194506251068070541345811382066184901866943035469419313397753521282182668152084983612781310002659403231835343007351253055
-6114581775690037701739519471149107309520083450078485755172388779153808947468636573364766942355736298359796132744647242525151199
-7574059840087355237287159427555431111919013708861023222908038566164641505519732443177083128309239177653941203870945389834998157
-0673474392377001399825892148070125779937209491690893896089896421739180565135864053866800087116893052683453216209088258021309774
-4693630023596081716394525302256706650097913048822663453433130852833930985337805085115332988734054335391426675730296735748012109
-1093024463171151726057935490277564245957695353097684106836395483499057575855912524860400186656839768087931489404973303617192884
-7635877951810419014091014411375539957398983529537012020519286943703105851379947162885419241335326379003488660213681674994537920
-7313912009934610962402221459721660669217906503605255214027757570091733853488694769091622366303142874602414314687218525998341547
-1566050559171006939210753283371737704974135991991141945660050193578931524036467433476181347487862613613591250793557188528520720
-8176429431061693107924500762483197651311460029641913001176379201100638867103309766025948024030323914130084770751860668764418979
-1729648696441840023063291425166270194908270401060650039064514332458826292034060316832564595611388754933869606578691497545240684
-5096948893204927421293649874213362565576773971352082850459718459918977951318599802521678656926223913450782713343578245294043312
-3086541714606171194181739777107223773075014101828171109460641650405365226657056099487143258905930679574237317845176027548390939
-7740302926757091096782313708390498469422515280866564744352174072524950077317896546008807496266670386420521998084434771204151893
-5027934064208470666653625072824590692528078583512194513874229573957257382460729248431045517338285948895199087965965424240384379
-4571860754401274665671127939865476298997613160622025616980368067727347277864838846767268485621173877779887690613158095362529635
-6944876714447267999239762443038959101083236381747476636643523496718859843462703424789350147757356429745707937022796547995361159
-1608685279655308172831370710312433300754386599666997983340912162248117716366440489547493562293368632280675661325251959965144367
-0470115155279779686716584895721905617913807392365128663764858517955975388392843450401077964641050043314321327171303982059553970
-6215103349524529478271694130462996515027440018395285605756916821272681672383831564950333676633547276622946473458222960324229716
-5752661076880540890733587009248458903926085507327954333035749203073156883894621881819872469950016600034383209674501094959670531
-1945586770541986321354980385963397070039734408942633942296911586196737659678600361467268366772660352728384921986880900512427348
-0224298460720490332231265716874929497392701347632450314627063512555464017409367105505507132766860559659364230297395631822230539
-1702023132625842749699356356536784362975613947059773629978196487288877402990298821674431326788769352305708774873068640207819256
-0837874454109632180336808361233189153201698197837194960277668995755988025271886650717010166150668262322432532297058508033324759
-3169311626099247379274799980132948823347592107280599635475818048919814215035606030291543579920124429871014029266938736200412702
-1914619565140979302991699155094170839054951976790499833713849411741065459327090513567799966465721776223514774008243762437394273
-0284830262288056137733605741424808121279641702537891966081045603173960192239888264018200262442793489277094386722616393425116590
-1173151387211465492751444105592198529015440250049757464822160661232074007786672709170841572180341360083386765961004042180282066
-2747834197332941363146926817441453515366505571978984487189489275517487274745916049268403158626553738640115381387510687487708488
-1958762131814281375452347210594453320648975262319481726099981862965271971390001963271654018154213822420613244796687794506233768
-5861590138913305751605474142329109238465204802867089486028021810232894377402829167243953763417451369079334074531476305390636648
-6931736509544684644323440543056340368361669695138186889701847677102848670844548402669049251722131793379128120867567738961962646
-6821092152578736586590175476051687813270318648206546383329391485549308897384882743702278026541948728683530021908873051239269012
-3127870261792191598343155115866595959890760429348459173942873213248004394755219777755565345896164898508858847846745938219558572
-4104690546998169355396414252792133064383123628337383872945199098541769741499506855287626343383400914652705990644014540006261236
-8792100596328961741396764802811919634888917999468524631681735602589600555328679349075778614192998476904702613310979642799638155
-6734793674993705010403616483433595873080508573310753327845752574399663353072797746592366100412052447212721125322772808600316385
-0099515723538668132596125963466202152817452490708599517233532239221132293841708379481396652887673374586403485713968074564071453
-0083805755888358130747915433250146084164753782259744459712819051842998158461581619972310157769421457011089633907439164606444507
-7652876608005273562462370933960187647117519619868786042595158425921249718553500241273244226393132978251127763667423654542879946
-4405249132813172389850479368504130884719811118887711374371841091799443512801595585892341132692059703325567321860246290919547167
-6941199045895501309914547487559727954258599982156757774973817213033640726217789962907551298312065690327505399614397188477788050
-5358645453073717607933338901589045055393757684759513577031387645637409945004898936885098068574782470685593557377991753572387018
-4706013177574137609818422036943485331576839280415982210652357962891328244924452137995064340517319656166353370990119146719861836
-6329505987385677903166233247184756000826411332850477352758018273420949926789280244169127178212529891658087198774279941207714390
-1511370436371213645604523617727839098695940567432172783593724006252095799407942743832278211803447800402891197805298593983426545
-3022464264863164058488714249339098231034997516428008392896433897781383885524218363385806736382055438093644340647396074293733782
-4501101178543767329620885826562169899606635544112652117620964836027885674519772391619599940633712271697963657935450955634525900
-6375010018855545330452050093482150077359764898798182405456683026765532905675606074372556178229924063905296358938093169081598198
-8483257277634207523851089755598501951207216079577367620523344599612671928857960638762403403726285770712060711385777082614045533
-8256451384331378443868986535492407706512110875647453641525322621598498933275339800741719049869908400644823204415096675208523961
-9398321546440720870569872262936542811668490033035472870984698676634686438176528523891161540254323161470512628073841436944062388
-7797071423711013392162710663609589623668119033549706301015274145920933018984092472146696838533855941884096071158160204252589379
-4261414209517939560365542448209082777049757262017603674203052224119028323101718025778556206926756191607192650438859403548542695
-1466289085237622991161102650836935979121797669268051582725264475273671975785294342068745493084363600896894177743687712147368123
-9181597431483593985916614200861015600827448233462428138664038851972627461175903260548893373194383862378492912625568875647273959
-9257826929421951643418775488431746425388390160227055490497812088985726596130954189607412047036836095076045019637105980229125135
-0051088814685847441269344262748461773674703937437029964258894662753422844953047676499113437643607083551852374126649110465539183
-9719703193787962011022241398606941751940065229976379345648357311141518661729448144028369831751739729767389915436519514302519528
-4754705205114290966030322546625592332320235853494013451121235653943274561055976709436804717429731588488742125670116982095506624
-7915307785043160782062481393173682663021526076353055172054644485732609943157735268019683657488875580064373381138013382280006724
-1348120551409342824081918999927191374394809490457882851229963796819461455853157081977254041113267197827298870478281259789531341
-3812065821388690082091959389908490155933727232741583927718485507099116748923648769090644447688804257458798099398350465758474495
-2937863476645119756329442458144939324030284617554341982278719802555921010666415523070911564773110585363083165465312366738827231
-9179756558387423308702990244249813252311594585173041207944901196092166608366163256489844497165091829615643175666074910233765563
-6459378049219057988171618077989915820678435345205197081776728544947416949166191536837274889454949606246062308000247423136050336
-9590694274127077084581072678020481871509177233838867384578103147792423645131300534630220077747270144036126808318115046320973761
-0633314308759908977900550446703882605141401119276147159777634200043370016079844602659915203435729306675829065339742126589258345
-1889317316284541412519941066954231638054475095114130395821846044209964998882207473650227876029465587838652109009674311273487678
-1491201614697119361909884499515016131285970573442170426537294317539659125369759905519191669796894139802704690179128614455530965
-7312991894729010255958350913145958890797364015827373553097639087944419042322472672141767845335817123220952073258598944857610720
-1824787410780276399243095677626477613009119292679764840577779945279669981000204638159164277233130499426714911295485793124165881
-3599221696151384019695918691913331345308102473844702422853474390767392532790500021180165318933884607342905862054572886894689533
-7797578535955366187957171752724494492272818965402286074464704517072955420112819202222670121573771410655986788904078893257371168
-3476992235872213742357632857624847275225481432286353014243838356580086497628026465199448029895990288276361657184717108337186384
-7666621551208709893696388991140973902647787737649797506777580191326933697405674502023865297304974748640809764705859758691017754
-6544825495307606554357924631329747091007811292348124154567821317868772060770803350068486092232254680993513246201748613742385991
-6866165375349816659160016479507285079045466715841081115993221601429358066993308321907376618487248492349626318569998572862307928
-2954124850369537534496609519161469912394832203382444510628904117251662671751490677012621979800464348066614680001698354593940135
-0193499508454379205949576005154484505543366786538069430200252986165917146991374529470556848495722371613024998552648030029385354
-6300091436093722524653066330745577837674427424963685925900231612998930766803747751089009018089480544176580489192755004987058784
-0521904612577648015929532704786690696377674858853171421019639025087849558650954768145265982042719739087464082587058116910545924
-2995811242507764873679857631100733041164546962708369112790103328792294311269786039292022283070742012101949352297665947227182231
-0598910805263795572231168128611351576632001399408367899641814748409013513401170040370795100905848171920487777572798457368620639
-5688904469919555388263250672582090539068694827337359228605791133091700320455439594271216798892203930514646320638691425342088585
-8515424974655688512862245643897078195523156507477939116050565619183311712594098054858317849757764852624936019665610738326843069
-5113156995533534391502169817952742278838176530218998980784387996273419179922080679783505603663683376521615832986618021979492127
-1086319824275441488370793880965889728722603318901376609034648244802721809098732997770252918945517263258021059460064891744542026
-1590099478966776519298307952043122519324124336024594288380180094489716784777893529727657815697554594607079223393500535902031225
-7357641282650721485620638312466056185406173433791953981763404688139736645500991900862738958018055032882772556895285743906215162
-1650489828204176805947705046005072475080530548765982426627534295084219207983407930870882583588364915870597364960371942080426209
-4961456796449042167841011430036294492463136865448894885627513655748299627165496853898722132001299392052298889154231937053221092
-9292679093929935825812492666003758036634836903177775163898869080980492856814299385978432904050294518519563887081873640579238706
-3011512315941368814678516363524198263828364895022582836616309022291899256400386653229758118495144379060943664767132561955347093
-7994582030787878507087359159314617931782658556072425334054967106060186618004693028010903789497198319676911594575116984344480865
-6353605238667338186351983657599555627480760430658384201616896420757729940462911589836581183482303716623193619087127242146945823
-5587627832512661518234488087236957525879895860979271923639746468639388295216331627000259398878042734326931204663332399636686573
-0672965511904852366825996694902980930309250905369947812120763277890579450585046143580711709629358309790006863408567461111578107
-7579999047873643551313574662014234072727914277127742448350969386406545430650595860664380236476144348769728322529154001617830780
-7768720905776990806878980911933213548469388055876623124525549575902760321680062870410042191450149173795942693780209583496274718
-7500581851674961002356261345542689400915034872242480502581980604450197467020488142845109390383270729947278076491900579496982299
-2129690101587171429651661009917402506767801016536968984813683892465052790569498753467876499730105980696506174974591421872344509
-7047018820490212289369541715584056487037206133357581281018603240803633328043751106808274944483601431153046581012102597333076902
-8327884098495349573228357110403653478827808473415101824363258200250596339218554185491862934594792362506926494486378909931564949
-1740056330174856891125669279294923651309763604203532765617783458152533228430452541997637109088581841891669514331609715059758968
-4197367157825328214419156751555885819747937310581379204615061923091469679845199014292435432070508700023932922581376409143095993
-2165125379005342133424590972755612895768392827051354709297231877589314385116008084334202246281649011825694669304551295469244979
-4509728839111272144692019658264673559690649474179262646699331625117318888277703635865926266976720285188867979085670193580891875
-7275477166128052446741208082801962510905074668975005769114065221711777393514237422266031434604625793424024653464475330291262873
-0817046411197027445752205700663441451626769878011224256767794721900542448009071309280703954949009199107668829370562168637408040
-9787763619368655981881242490879775693879040221802840519661369579710229328600940826654427779387311550329699789056384531195194998
-2723448594543172549888888596962814780076107260643457934204621584814413545214573904777806106803313154411323713368897701260407449
-8000951726014956095448794689858919573269714659606606617498924039765372767236447524498222062645212525371056330185170891625286898
-7400634580995643373473457408678165048789850829161271772842260046851336944770097590727744202976687517001530085639423877373364847
-6131960772116097152434381501203781193864171006504601138647645912125860654370952251962787439280635180850121164508129160794934976
-8194796768491845741394186667260815254416308027847649620467735109219757947751470402197659639068665099777922925932497275155739813
-5209664008657449547795035193830830788192397569777052795318568835532699855624203558168754541268446171707037486010417690857467487
-8377976554519991606329945190868959375772837211176688945495596448296939525690240337764633216663866800325009183616688088580000528
-5192787146614999641495067302066620692218333148024412938301229255333067720338121642154391246693289222550082295681213541896998006
-8136852204722481664059335120578115477689164853072624921786692464359828604653937695373728935390680120663294293493176103289690254
-1144435038869128719771735108732844672639943553994309593207501141582954078007058121278827020008994616209652065957537243296195065
-0970656298377136326223895516660489631269402730038663872646787518014244370067321464425302758563853474605729399708299081361238244
-0240779629525661769222180612134943092596901392802155389763359378856115803129803025504659400407739325825079102512268146609621569
-1920020849630289059227598433172661405103577932866917079329997842631426173495463282180424424558897910324932519322784595681717233
-1144193327801538649747431966846093543676528159861420323208804005782998653152702827377592130780075570401214786834816747288844424
-7672000694647648348909906701159130777349487715893771185782393615180543175659863092467698777377397102350383295634648499503885338
-0495630306491592179663093479474155305629241895069310776977867647781537028272341913619281785471238537339471770501056143359192572
-7308837601725546836619910084602280257935558569169920782961917685472285154488319168403367545336906857013748237755825054290532894
-9661814404701500878628706398803486793202614438164625925828662516099882010742067149392493627954571934045651513234013334682059852
-0312168977557161126723210896500911203207572745509229840888786198868413208045541779692684493190694384662556740715047630385587973
-8520266389063839477339561111091620930884162729262785462465146299021058533677470756448900131157092740484913244873616221850614852
-2366892600338849323238354679971377016007007696850190096980341739336594207986799037588279474367471064265784394163814443326245256
-4911325423638475961054407270474262985635705119625522856108931080012973303196967168739739944802380176010145279834846779349851937
-4257810389850148158544144932315012034020829622092429506782620637342284858172415547207765264086812199822149360687311593339577078
-9708659858477940738903030251204629213359548332123829955153191520032561522000846708640602917979387525987407975336034837147466054
-8086930623135121532860695594083516763569498334428501641151038532550501591735570621442476271723263173645629791905305955098548029
-2777352200022791503781001509067591047738954816120020121065054036180446105221458464420759433938919480637654297994424050557216733
-4557327979787779116307153599001198923403057470538783746410924085722270113118125208362788921890249447415394699853853075390237309
-4365884384429048241521760483369109759203884801440475321881130286288789565265074980716663859447668954490193155283240957032437631
-2400761044210689572007006009552492603834440745618264315468884643834376009957185817870038205575856137576307667033965516109840180
-9737040417279915834911486990827520959476936502177184234720809847197612305989565105760154340868284644203521456078055612096029018
-9781808678278846885397125652129297898882169803910679237997846224593685450165476495607070948013373905740079438009246883252169515
-7739852920294363425633218123401420673829295163516060432640021373043583962110762867984429100483394773437741380363822754539046324
-0883431115446791272406513984118239461183841794345923431236238292749873478934884995894017966307053473725524062094771916898837907
-6139386014396316197310075826416043562421564641768733346779156742528616231256212666391070181857228107399708720583287723130892055
-8564495834035892079724353995520557131026025067703760714350598180164418444716168502414005579666385014431317699567383147791141861
-2311406885413424305003701677451722846677377710768986204839545491722958560065098823523147478261771908820851989126482817082569115
-9602340226869859614696378992497033778548537442058541618817057710375353486743749797455027651809309416058045995383235110379798461
-9628709222162680949961060074815226201933096277151174310696525731658668144988286362519156716805236829848685383992849148064465103
-9735346812240729849346428396581006547963793149866858949294858741576251512791660305611651687839731531035722282235292660633788691
-9538042061855430905977346502656421504814621398394569363683719060626568625659708532699356988708790883640172621307887407813836364
-6305019984976325257337569429166547690694053229542307273781369534773313407694544352991644928363693848808898178142342306260087117
-1805704646504085604801764484506100460470712673185793035853367748681894021658904030806253312188697070560965442489042489792077571
-2490985236219600794455119570755743690829793064352980492197865586952595298856978623488801799239792633697972577551080842006688049
-4451839628325290929728145285465077829042998419941805433824084767085375358192064592570165051059371791323138480645291403839150350
-2979438318932849641805788421308077401361414307061802172300131888869924632094305534351210554801463479850767128364891176166829465
-8872921500436141106816138238492673770588860037153870977927285412564501357209059187194899313386454964167921543412282921398037659
-7636485131279033828460677166640282160440679145358607334279812434544494120552175807283800350790566307285400625724030248887429340
-4680751592769547019498010899871228144441828285042700998685644394131763248290312908027689367430340488843863114128754770298553903
-7371408142591796865710653973046215109255786437157352313924442478531290092820677548020730647005559727973069973416903159076053104
-0296204614919758433624657596498376245793058852298819735885655373134544548701918947319286620768915718576221199382936906689136966
-4514861015660728180490886079334753171354215683899059435960727947953401618302867137487819801076786142685334483700384896695954037
-2862199178730357056510866292501440152986864077701674864131708177930481209373944027435441136206079828523990989033623289788521958
-3232125855905003070647322986167904784829417211608519129888545490992306400854811324029764732798696566611533605039116218287211064
-3328048087467522304174357185558580322486932881453149442008314359000540253074863751401069345083176437332910631591438430165816043
-6086110405144344067589331082608930355326779125945673110136783179380891079747539440654925994890579005806127474614509336396435324
-7215091301714414443069868776064064504395207482808517829405383379414684365187710912963053526301972343897304816484149722894728342
-2436471129882505774580140273945136647748090634204279933544155848974105586771383680141377892142181597367201114241681187884944773
-2048644482475865853030326358622959819676030401734261133906361439604280224652350627125083350512410927294034793877892580606553735
-3602935472072437248748601211519488988169731855279575778400706577254567463123219123896535430970244921999769114868734160215986062
-7783657628040022836086246510234417653915945131795351860293548640058155931582229824232337815003665382949403984933860425849161499
-7472148054410673792713655531708222900140217409627089428063743914621052166172358563633841329724840401144427912925448192355476917
-0347053733535476550133949622008506766494989314867137093489295258193336447136204549399148001892481820212852414088927422900419709
-9639078047884835538046942482094804161605891002036742318046907668105442784580061293938476627159719249453272549683221805416505790
-1032786228200415283294994910054729118848671075845281886209463073179728081317785205722424406468440642562912784973899656483223098
-6968595178017412521208376863115552570593292656764798517030930445070380603195697501931025439581550142699705302804245618724490111
-5453654356413064906966652124099905267347821364144623020142756809037695527255942562866173971391249170311659304510623511853516154
-2732536262071170918681622064325048337837520111884271935643287214208402090379942906531363266640024631740298714867728868944222573
-3147285446615157276563228822132897878376378847350594831988142529113309891139340761458000809351957235529902167556281922497506368
-4354478919601617063477169153215969873898414180925342349186710519974948744199229908589593712396666250201617868945303106857533139
-6882511013607261756622150246671069745871933132400620002505947164316958006187665439907383822926483113411891198332966708317599278
-5134964407461253261959522854559873663187547708050982034442691200555341283933873911454057728258698109359806239057894517156699836
-6450666103279081547887551782344908272320062944069880747023544207556937435206656509659651679103507702121341392065845820245893429
-0369780371537429488949966165797604230927289652620569227359744404503741546226260737989821878745670653730192856868459952515531054
-3093345869807819730548713734544643718538694047498494322996726007960107180939172720629651622711868833028333458719243526925076960
-7989599203565850572942150442657633965818968052176208211383992661670496993990824695668976291478797155039216428981397014999174383
-1307119242405531123217610464790254600437026788611070015681427406612197589802556879143899518155467294982590879340815458735590885
-7771734336463859132744468610337712969586326511610847632572701236574882685603506834926412287387742247547804989759024383729486919
-5271411219228882208040644078382620627789689028134461694434130394862996168758457553833289759810275955726724366779012750280404286
-9512730467284947060387240979546511277358650894416265360099607348235188428440048072383761268322342324845297508884228837212297345
-5520192598997086640709924048681358015575115024163991652287513881247554854286841200564378110057343645081513230448973403055902132
-7020240592700662201858752560247475343913953666111892278775820432145603140381127320826667055090149454135269196723432849201394471
-5046712344141591199667738249797803701007407397593500840656021101416075518278507896267944040576213675962509419570331142339223528
-5009173314040221242742971167778009936788547416346651832329001334847054317513290947080798012432976916063888435394522306337209156
-1366848096908460688950147484431870925661107449748979391978321496249695501280906214711588783547789400280700153426360634008817145
-5032320677216082097266187853807984797656213614647275198101803139086954569491022740666386321968921335192817122277500443048900363
-5004785469025981206660221297903847696398366951138307001168655587727211921402639926973173862035209940308951165885978641411045411
-8785398824958308479147867520302086574154227898640917802025901098713415060910391722736844682709559806414137007346900318504025652
-4829177039724412998798470463159506613910620057768809973408365008034259886542242550978070824664073713620021235802691404413458167
-9261226904113620784725763761828029554734562287674270893824453948307773514334280989553881807221303459863642843519335273228474128
-3311573735232406552245381370523373424363177967581228254334269537766809380288366330679697723673023553333593300509406940840178257
-5850353980111617800710390835159343131583882096987317262767588967118575624615788759557354550955443154249258491730584290096574346
-6058742867661098727133777961247323273097355895095662383648934730004254372357455111922489913009492093823561131792526688980983778
-7068373836217667990225856363415691473206022105532884987579074277226993152918608006384495892970483440333181267244554192632887695
-0375929236714973683664267906774009903162875936131255110025871545553310661098253000439303508717945000859600253447780364023263921
-3589236909622208939924919255987333064134666511205037102476749734554331712415072770445515704120917930961110839990243914307170158
-6795584768746356073781978623124211251870230688353778395309754364333319536742360245765209901147398777468379230149142523181377411
-2729948487677410474357762288343380948554393380782338431844676175646578459942584025062978984890983296713845183696219799180782039
-8853156389861615819589926505138052323380550759364020828050387019448769426662074170464533329827565869171293278882331249180195752
-5354617268287092363055229579924827016859348547054043349609066878817933385065188678139799271936447212380584467570750380867131343
-6669574812003056132820086160683395897628895296098843871784268115803999250621428898234509785779912888254113882189729913124138323
-1094710833263258542617692112795417986473641110466966207723302828445199198995397058382901854029835381782441946019335577334721714
-7084654187809403875061887873785967514836739155665927380077234732823032340675248478794617424267309726934964316167994411232825813
-8586810770368457480021270214945101098418804122645991758117744041940927633232985858835902473466474854825024480648895385708401183
-5596898921066046808429836093228050083092077217562084369964360104846761170405526779538921555848456229448715495096371173722462344
-5660195590159993019077789825004164832246820538076625410586718868028600352830449932992980717485232030870587444549082470943172077
-0821935416600837395349048851468072663127356309332941980901438793730151587795962214031501434310617749617534269164881521735791175
-3042072934705160703532059769445721283937901499649463824595439982424043872605434635393216517511777007087089174560510963232009367
-5464155662396168936608488040261163576038165196682279135320764015816698209508887367606848299565138365679605265583581996112669276
-6753095562768549798586933346781184629087517744898743057935941129179204236737611864578907720852163937289062427955626269555922129
-5716541079272109791401178359438691238957049044014297693164836859127158377764717929820749372762244199830728156908190474636597721
-6048348633690063166546832299456572409599753235001536610146572139811087134501881675589119526672410909520126024302026020371798099
-1171674402450497762501699459068107617561003253876215131387056282446344211385618131395030296408469586922564210025675216461987907
-9312371022806876440175927558224158477356755411023006311819103124252221341547172708634888791607917037276394431911343613744399883
-0922159956723896116809200304280546821592880397796462717485456950002852867129487923589665229233372270334774238944990617682919310
-7658709241655408916654408381196074058493866541161875193933692025333882777349795393761970679827330490202099389041851596493234215
-9234545178442642967566968436599668141535683259923279950462781030512766827071494181783393026832191674347556257505316419663487762
-0041257342453564273568929735796453624713683399848511617479340816490608890963355058355974856413150349382759095918170362098854394
-9592779304960316507865578967321355607760068698329045954497816675023927602619347677723250166350520531047186145206536424990428337
-4299316161376269795506896486995922307501710625151467203920818965364151628354223037516185750241653836563366411298238504451597789
-8841671421275735676647633262528681899530392131503705721695449652045887039670882496194478043622621695748874619557992717633215233
-2073059696519439089739646800449388322820261958926389800326850308700850275001529873409140035288149114816334962577827586268363961
-2490360047432436143344657376283381577226551875079136121637392911221073093866166045906272906769849919522908370281254710635409730
-4974848754591262059988003622570276863287575164608170178580822963208162146400835022943896925242423440936618793540028102479004702
-4372126595413379264526984770633204109208673880518625238463206225086878596008443858616399507133771134539070683384873925072702058
-0639171273649854719051709551224607779261350414555233764709993649110326667200717789312129165461963429321431418833445603440663689
-7186962822361873750181210266660607397813719262382253059434948056476254707273143420389570046116876618519383113357898774377253891
-4319529017033432347952439153798524883464591210553274851928717915148566352954737293867412627976883192261494139098284868083014649
-2622939111808623590774562258070588172127827495395694013730379591966886930134915200669202327099882207686441261515920355425526638
-1200973651071533307294108492132851108586204275141332635739794068695424575790972361088170979623763207458716935295604008671317983
-1251374850775260697268191392326213755565839271682628582402356668458562455145193885654924842502488021956636839087993338831884363
-2092679910172237700017761223090447686346621171455515944807634834063707579619074178681232780539980362324148874096831135359068248
-7059799025589703414119220067452626516006331839767724497907056535882707433149950178268364082722639297792594500281095862497786970
-4542905544332920101592075397986385645511891063856851014878633174032148021231620025882083670673312205077519194573640381350698919
-1312255205389657370322617251904525722465432117955235178041221031184821368449334584954069933722375723026079372281725777733909489
-8940234530803425309074547064952811642951856360280155612932727691967562499759113316867977300723413954039644096858319695187621995
-1667713304364140592650059312268785120415368020836414159057787321290823207568631669529330852196553357371986318924246623685192637
-0422089184234642438098080557484372830069143118691288742408958852833389685002956551956492581208496774233386094905265339874099483
-1677835356907666147956557529262732608196197501168021350247232245111279150809917571509855702652690905689682229523319549019678024
-3645155615476272052329623583943381582821256380614894465459876556622453836730749021655688760168012160726745987877981868221817319
-5647755640891329597098392215119820185325320967799221680909508299218493251878104661039386657485694867555315346235424508828545406
-2249500944046395955203873004372279572553883458895334843433140571043474669708074473381457065865063499709405786900325552248426583
-1230511579171467602223112925195512272958191569060831817009891427720423564097069405239471201694564617244826682098552152177059273
-8469866721000791525531110152439789939013289745066720962189402891838096512969001059723536174778699525713458075138245336864075519
-1296905270266717168150361331577154511349585629938472384230294812334459038517468323643620870384471376627488513753063864443527971
-8484849516117452587091720711551100043539596219785764133452403530020825880462282298393651618450654255243582938022557870602084123
-1944353914349184905366261486479354722961723711488366658700425467290309892874206605011693831609609440448499484127167958439545979
-1904342525350793098590501390656028964534129323617049186915074724786886755773131382892183343708636631327982725884104881408443775
-4047731221209068512782993439144246721190758070966515666060478086425710216870076434550244885851035049595368742260028400195490338
-3375747312957348876639595293489234210411377963219380216708693519698209655124852272292375830483071612875799792380567345928238534
-5110079232697543396393866568868109799067673989898575725771625847005572590499345721422620239447760726870678880204127450730489419
-1892883230935369730591390745517921975081616548082333381141791553938700817410468926449238904528671037503779324573001732065035519
-8395077376884962568002904176016991329810132526312963614723727626088091850321489438757392596606168596638103913778878129196298132
-3938927636631738411085232552592623008752473475775738216360990000223836611551924314564820835426069886741001153829625505334993487
-1299692449183332553204542348863840181665273246414104121624684776356638436277872632132123576236177751436546351690643540205371844
-9194356489958293805818668234623245496942584158879649161401045859846964460358471563904833418667460716546730472435403875780613403
-9275256836090272445757731146730052254532930338266683064726986679677894399506235508548851649563290194895324537517696553037056936
-6401315045565945782629076626066813595555038611734944119511046358367624104666208828448443470577765348785145599426526721185590575
-0586738484454531185743029468713911469676776854865676690022624209621140076731906638884334409090253652724218159918793965233464039
-3171209020852465810305033445747086308509991604961680580404820907479024353374887015602705890939142087700418451581794807689385348
-9424311150932643701645157338987499029528852262438813754400403069738023146915551968014972578206454343730343122265559473474927849
-7742146609950233423816671939328483772283214892322537597846916524424589673152890736557038920458731659652032921748569241119859976
-6687533180189782962288035952098447575892236672807319984532899523336137857362773056256776453970744401322852572058367357860586750
-5112973080188345114036362904396465766939815911981737447433859679102909113460170044475876180448426521815838110280974934802651453
-0141366660566071877771992446357332649851216791119528638672163150044856967323023760152081614645879961910911227845879654515023475
-2214123760185353539707121031098580866690882823675580600794715047520486504684525675655152270550399135886572417008928998130462848
-9223973656232181173590003292639341133004977532862200821270596930208889426180465089396056658959981954090935260888619248916061940
-6623578698318166136431412779326115216613003933902509874343492190835346614403255698238178964137991654202739789058288364219841871
-8291158969189181550110191401002122993337707939239499805961356987899937471416091612952104089354586248344316163672726189677077009
-2569911973118347742318591298716009672334442600647034815935927622454202539592391699029450660978546827587095337413939180709898411
-0899648100113650188435064875802395140965508050973328163902047496526339571954451436627138016940395531683176282436292339394573885
-3218116539223354243511329358754444736017570099304122222814440304223163469524526595019625005310578387024223128529473465323727623
-2903847495538482030544840551895363794476928236443136637630260470246965452066473119820100467512281726986329810864283236603867046
-4226586385557184936270267709088518321173404628666811633771213904835009960571786348833009556180773685058946093743512399598902672
-8536593915600232712348175092402812063615932808932457150254760365196790780020038688785606653890320304533826035350207715944668272
-7207307332779658122899268750088169215451053148485733154400660830345046074837509653982716901490942833776007996597381089382249055
-7354364139715042807616100729619187431380023428907586266528433249618278407719620456619422594117403277614144426686677487237152240
-7463017222778211045789643242204755641148330540930800826901784405753146374489626927527265867849180494980902054821139633747003818
-5151230162674659769071431499839596583910959703956345024479063722159584629356540852497161935430481786349464090482420412307760810
-9834488101241849496636150547202745300929538510953947644624667132590235877398283748992791388091916279125999482122365178401663101
-3799117737061812716778711014651789301773605485731280987694315010080752800132070053513995645594283497896886041897544784262244652
-7787706667573783951864085352707088626343810856713494836743287556709150843482692271254078127357988781374166954894723733919964351
-3850833609175684557920955809259004150766406752693874551692602542748508158101511651908521148570349768720243116655926752800025156
-0542333256075861408967459343438031423694963841751597298639419078331767590705140401244001636510150856151990464720632445051520472
-6303430699933496407768275797041897577889994294810383735293345544688537126863233465001327982318529841153751728223029693637728347
-5397568768462052741831355049132795323985421528118062025164276988946171985642590654143451292287062379578161283874235728279748519
-4640901822963272018953105436900070403241616145463711907565248533620946580204196365483196723416387548557874992063706490486368853
-2187665586968675889547896116950223441017696539693810802819756256217188102291391477467930773393197219210849036472348714939348493
-0530870138541801269405772003173391922440292694411582576482977240988452402062182324365937231322664832700142793000599915699446377
-3232764179605713808662558293727950897506959582972158149863534091415959234408922619772945504672047855130269189456164558749700864
-7976387712997851037838832161690498586021679479533477214488890351913481087239877288703362839723676811186594991567854176580725967
-8767096970476797579593159059506720944428573124512821132135870916546309651522551842044412513318859523946351494542237948488449896
-0718064204159475781113170590472579807866358541733298234646266805452325502205676982790448617382183104529620072495546016035798369
-6656888096932816475747398102488120987337320254949271905969490909227960204913812078261626642629009104843808070570261399892364887
-7197928827518406319220242665874355187232953000643123084932578105682719648228431872207900564999025910692470162420939628457406240
-9390054304943829673541677221189814900027963471043254648597886086990795714249446234111674340418457357710907778877224567169903636
-3047190706971324195888140547475741620358462920833528017528636158028581644462796976018091635090361132164631234849610385434473088
-1299169151001233913629789222426928990506746164121889744635941525381099603593944992448532482489564134843216370953945058018816372
-8022886634541463283701288620853613352158026264893049477075544241214340204041747957155846007535087712499320675089565208063975842
-8518974453812680488184297781261482966404248280615326837256707090751389480480211355208009414536208955423929547041219391948623885
-3604467721690594055924832819820324481035373705830034807313911053016213471052470202123999030910736617997566930544442854033269439
-0783963633104292458209399376532444272248160361826344666316224873723641667255667675127680227315908535163742986352235015659049712
-4004639628899564002311837850986616952858773518487977784208052701702476955042845648511721265262737849283604073030798668836277183
-0862408653011082563803132060254754932254909982790619138767168477417959797920610077885997837256974272446346326081237570982197007
-0940886136952306043500899870090754863364443344376526643707265847999796477272121932881155662360934605500536289044543909420287159
-9325468416880604404675394196786101658805312863903480479928341990160539724867416343519113232899201923506345096672360143197907320
-7602604379899247751883206653536848520843218205588950289513511227638017895858870330990465204694386615676242643330003217066315632
-0851199846447079085502271034855714656668178101657497639831079366789502032474686387227843449343312220724903806454747746782689424
-4098848471040002241791388735422021963275960354775258076923928679254165040693087908221190070756034164623860222301010088075103056
-3055192757629057465255631284293545235726639464473675957498678493846951810733281325747646636144880693592596312740548434768830767
-6731474905682791005984276464714844713588718904361218261812425686803684106123652431919970410078795392818111582997268429659349585
-7924410389518202685905806688713577803625532077879713115752972677622209346192681858566234259911076164694414416704969551453021886
-9355683562980634479815919874568756218379958083872036318959815690363034752884522901587704723069489938561066700856799286608658620
-0543220462343036193244858851552821480362000689940188453022451557344919396300863983139599553360452940548134852258624017234867371
-1067014527356580183151961289434647684360706506035600010429135039073802230973345888131418619960777100132646812026883383699827970
-5359069383361932605007503288578185157851793814788353694181498218990573049785293883804780055838358139459377587968253742572072043
-4573719136273381835268729540845328454994954362222395612112318303745157807658681724375200294326161779060096534923740884933625708
-3514458846264455850674231783280205705825729759163794635971944702176098831501306476593168602881301267771422854514181550204581778
-2814589926430879599930014687698610766303495462811227979670379853246555977897078815634814137435467174275073493314846601851573261
-9109412328394243903990091864894855454386078755925003658916610663445020722891205775398782367407839761338086985543481077581229638
-1491723826525165284311575346657279958318121038102570973778417404071686643040506005133105712555305338320966176072017676784923629
-5488218241739200538202629320385686355121297434909655261539604247574676965715827475716615737941607238002608903015929093309168488
-6222350309549145806267049598652344478433516262239158892817022906333942210072994901250459132730572231739319182532518293889630019
-8044072077285353283240535057997955717161542654506209603492744952552847242899140500411096612225095709028876598587942929972397072
-1885954490526928165806858149219735696470308645981279734404025197278823077339850867123073835557226495747843398970587652389656636
-3636990744440216604699149114584326945110057025978680402356462092308935861145193409488632679598241716104734129398885084544095857
-6069902893386332364062130016921517943943574898468298687528180638591233629526536463888804022514538460226447545474670300837773440
-0715242925233223925302043184620521073165032928562060926764419538572558168218946544243657541925010495652673050247406203961490742
-4163377094941935791929068796922863289449570870715728363127254502097952823099544701660693419650850191571787642058768071578191335
-2362149372830570291861457450525257727016337864275693314681112878356465000993320675510813633779009823896594571255519867010367760
-9335339409871128425332395511671431500329529218909754194982323897857550540930935004728114503428724192561034251245345901549129065
-0756506273973719264925319448914314432556471353593665242663682345436151888535592338801660197397976918922142540903105362128344221
-7296939654818049488767067190718755957947538340790260392001857532393622868997477129188922872359726386124323878376837617352814907
-4078579999111217939011699307760285871218819333972182125286903838312055662520500719903656687016759241817857273468272683917688574
-8726333004719198815434960721386959090224338905967680668744954339106442434132414526246207631805974218944345895924595868424575128
-8809968439523768418749746186037611280882890683322020074536396621763557542013569567593054212148112921735580176883820120783267348
-2537069038616920940158973428724068585048795501013293376681740631186566951229973336427931288891824421015980577224523633941036996
-7974808176187279818828936860482106588007126950454089943602952411737485839990023098877207814888492767150658782003308086338815157
-1588659669715002646102364063331711646691061797936643322785359527528662208821134749050337274899095692843563066296876088924734707
-4549130202526685872258479111021810868210332005793914145311147798812593113617843971880716197778981371491177307945521311901222788
-8560297570244477829694687977784621455987068942424983136944870380427057052887779787702603030649524780263375021654142024115901877
-2048774313776039429808088171712835186320571466269472744364892701622816406146475324290364012640387008030349061922998372137187474
-1958983930518040048400877463606239970518078952389442564587925608445408847664043055091202257080066087803944336882062127350978604
-4065348283423540496042896789726757274478123900698244046915478972359449728574613924262102889566496871444268574144572205450579978
-3629438124450409423602990222911509881985430704078927765904795404045938118161221397917848075421341126252805098426191320837834521
-8085534923914835313209677375813349364458599796275600866316693139878003025545882010477316042716780306226946838431532163667037127
-9898915134568321964545103764074604849670802062543079353666823915979509779221620608508897413582424170944308180311897168957048017
-5385323115399849956058889239701492340513864492761797303099763383900112373871513361204005145800948160917012448658958645510687464
-8637322858113048873422361029279103210946558131854412009103898341572774795544194370639320402689943405658836056138282160542993169
-3301482949893831756487465487869018898293856072780727019945397657149862423574816057140762598392679733606145316506298182753363157
-1989885295563430148607778298379580655148124775805236404809749482897588166275331919278290911157248463196182871139898936725797368
-8850340804158989499571102548588275214111587736824329752538481445797164191835592201791780416442465525643066854658921528683230761
-1421812723062059588410998478367550671697961940333154251595442093624642651562126033425248558504164225223871598921143098979968917
-2477995193068866106116650832975646638319811948342255800290956070421894468168681224145709091760495793451121243995417375669474096
-3150729646482352886032550446062928871539222609285098660402450856512727724053427921573737445175821849100475781418189174380995632
-7046750620615596575236877490285020288321290904270312430965440858488622217217317102253600290127052465317624607416177498383288106
-9945695686299042380678429305385240697039293151977430358157956385467140053019250720885367675692664936064594234820657654969335744
-5571751022714308898152825948152037875574841245733361004625842517428626308101356793475497881525020804091668118665745094943275801
-8608762448666074656196662829963227928222015907465782465504699762597437156318531429585635263586424089541092855892902609967867982
-1978685830753176969518395838040278058667840236176435782603960672407003909222439483538760352906908927302768494238355233209217253
-7074071920319953536604510843365153876170171633349491568232092272150542222706006804946809770825099582766752656052960983718114235
-3280496115751440895543554193849398007467023324006497516116534251153591572725745514291959829061315518724947165745450390160259001
-0601737046591989613120616719919874653529282948250689745032606820130735453268070027901333295387220734852357272804293331117523997
-6136958737937467562116926228263651346592589988767235293060122410789132148757897567424381946719333849272080001742385628150689944
-1891595701639675010992493605507619576155702842803896050077803395482631144748035073236453571286662875633494080865014296782405059
-6994138350962374748911276067098522195781999897499082597900135054301540799702368264182765273926228557006482725202228009397664985
-7788023609935244035749201882811852725625300846793646185552122933557882704452555648205100150340311907075711931570895497802594450
-2197653103798752067286172607092220822596982226247423576487125070944191009560709583893589326623076734376750057424185701225493266
-8863132327252007877822761700057804325184406486939470443703245734365105772001424789573894937476178130538608010471355446757855177
-8174190110749058109791874932401725786307915411703003043709908238217181652029602262116068758446055873309569311805547464496642142
-2490958747068677929992898459199669839140241121204680850335549077174567238373970308977898462513690749136086901700597984427253536
-5982357462083434284507903055152940486985159078049952746161034961672224995628192794860546561549979398991180455860037140923248338
-8926976775587697462174304166383030496921336111150196335640267063653243971405939737115496867091474614902122111713955464436671112
-2328015592752422584686538755738383160041067711192111211555671470860520931401458590260603642848665758765427324349701633338120285
-3238367054704111120178059574962944110115171398341904274585267575082605150464279484097073060481753901121878225454945359042570553
-3450237761306126967240618521993384597368444622149529677366929462149782561575513795963740446321127465963106959992420775690369312
-3448814725588587245567368751607825271329254275986408132599484784341832975302652140521158378926626072460485474580935278488412601
-9150780220021887436734602033408383688852530542191765389359753381850912455739194414678686576674855611507802645590418679170889751
-4835292344245385826099978982021385208338079311915794842181613685383986799333650292340449601221579759524765161463912861431586003
-8364091375971775721571844301438463624297900164446658688640976105663184901553656708363187917609334998277021278755741801258289094
-7084708048206234641953289421943297010794421803966656094223814335341165874897678668246105857901156960186097878571917343164253048
-1580091826012825586670694920435572709977363754508123881333362672498821977048126176623956391025928031884064853593246953559407401
-1343143393297933839473552543351834063051545756389274017156011730389906161525821950360013682370064447544881706475110217230969461
-3302514538150761859786668968377489515133804300482090273478961905590177116881654275768644498073647264106408418864420104945624333
-1455642109436975199690456185370628722356663838058282076416293074142932077562024273500214654758558303856335007961702080005015078
-8063031532965823241531821249811544926127012157501395220835632529512891602224510304171587094059291180949555426978545235398053558
-6792060710713434110654251175014016166953632439786838514140951524356192499726146571336067500056531834668571621898017480292338282
-1437695510093265077864080367192602710341444418961408220405302548941539890702354912153612054318858614633735009858764482449040861
-5181414865532338468286437374705876616670683310417100729198121447458573292151625305538384979133781114543503822301014850960361423
-0442509889959385737920714766510641471461284309092021412176656794047214218226892073311469169814612693044014585717564971417728218
-2325595356223658506960436649084028083363095352384800259697237546709925440654926883086116058532378827751785516901620186132035077
-5272017869427934924377297497212161665902064352062568107159660976294283182349751217848859566575424801083760720335160297859673425
-4927647302447341405487506286250768152116103802235113601574433911840768325925117428685709060725568588745725091307806563183578704
-6009173829226300709392490503960716312095637543299322573027471284752881663572097511651811613598957587604124624018835545870558611
-9874256128717490827444943646188644499417848153072863603454092200052312279880710501340245614763095671533551439274986414901802322
-0712116664532492284027602515056442554560965687688409213710573265303359796914199163349296608736358741384041138558244053035969858
-9693983191087651982342027390681525334777714170455444776207288727295047097906322701667199571113890318007616548536163726817679168
-6706523778360875477183129443881169868743369990013775836046887154518569535610947164990958856446973388802060554267647855673512269
-5862057420569669693068391429181291253874208771601116624815603880238130385298427887023332027652265710135551985724073597417285974
-1151313997638402328677281725415458206631525714244607205307139347412188214659490398369065819541976622293080801350270699351750349
-5489131825943276548129703872359273308252153537674522058679810049913479398153870812359217912596783251244700635734540612732369203
-3810123181289945953628771451906051867522552261199661987069529884844103683969181491185606510174695973406830793843872394354042162
-3346242314263710422512316433607417431578705396179309838772547308651613774189871178285455805352015354652802479496815910335754476
-5032059944587174601615131788722847272253927881072336845872496308794095355330608135957953660775615970673613290442946086962710905
-3407385896995114869865346803277241560730078573870063366755416777507927736959074993460049742600768481558296737228998922109024099
-0049052520096863687692070927701978011226142548782375715516453178031755305702747877694502859869129537906539333534520649523091710
-0991259574063512483397592194908683392249793361680299501959035992654866098958575700878621835330177239453007223378603834381079687
-1103177507554459538813745204571902700244177530864339036101223775180048578597548931452670546251696214644617674818880606435247986
-4019388020763636749355438098141001952281422670022244785922521428313256185545192914769702955966048643204981030086298329088086717
-1549239391810219717095199987772454895177623386763902046734720379092060908409042895882464384442634362486868518995850543330943745
-5263274887172899674152253042181056688293450964020128773142784973127071891058343458622006778652971493625047746423062870250661196
-2492300927820520335243072396524887229850551524757145264574209619185242101186100663595852135831547431534587842715149723823788454
-0239821705984933412196203741296576026949577895980132509651253316722691651055934018399445089497754941402505430183658650264000569
-4454480470480799484331207273048645656468167612178274351303856622687362159020726843169180682079344623827123515453025370828135970
-6142817374030811769491227966611452974299687874240073880283247099440633899922286466254504368749938286010203764066551001971357963
-9169371099648374900400474139097217260717487967105154156622253602791903705738661081630850020115390238371457432815879031763979788
-5560591117813511863922620504148281644660212448276865905578433181502848473767100143776780656617049797235772123812344362645447507
-7125601127543091335948203843174929841142906765885076202058923049770681372235738838189576737300366872775686393117885907972185950
-3813261893105186097817193647097680347436595910522013775725325978428043833139417789267610377229028363642103442485430761044994912
-3166100516390908023193075423476442023657276364366869002050485177701831320339505415669888608102030204859429175627661908828955978
-9494583112215459385851845969134725676775320276319447511947728695272882901489693777569547667119292451041697329224102769821139225
-7691777515996491255498611230620011375291757353871825879292337748953866037150788019954259501731583992956846734646612549716437169
-4674403391449814677760084246730522440833433795684947826674440906657230316614951017230444639014782979009506122819959837960185292
-0124355369267161692186629219979251945207193338015531285271750882020294586168274943975716404048435047057151424920598922068881892
-4259039872889979839195103377532319383985569925201669042943584292754218542022884377759029683915124413393419307275904131879991019
-1735669223208908684334277224397343396336961848404316449603849894027168642444303310792840158007116435560970914275701222063897926
-4461905512399641675513869110628312166872040099906116555152852234330620387342830937229572832948858700069818699059571737043133655
-2317566091257832110561031578973018527337285656514910017567896208598685109912802746001639928928505435442403312983994465299665281
-7100315234971800925514182498331922330287575769352512401970636582041663941571732261396082519132641394516031353060487765740093218
-9334108345710950934819716799864030596011645738530063495673802842261253827926601866855793893356025796840470669373855061371630452
-9938632519142602121728449903028585427271086908360215670337654867014624403654411514574585082225609074457979619906343109374814363
-8543685485409092161128411354085800792705928451605723409112677460751012429082851977989992688721655128865875431794910678786635771
-7286092726668793850700794820169050814700948490519583438078010079869324333131287831724247406778611721612540484173599614481822185
-4574626770701467258525092815137010178678255624898097602082268698327798870150981485054197815103745515005378748184630266101601233
-6996566956298539914158437280054873330111337840249130739283399579411421525420812145476940206933841167306808654076518530796691101
-8418268977140865314494741099167445020028244920345037125932530888607409097769183652295273473400544354104335924214164055029523702
-8653179301531871439574603212631671179611383475494609355467328013854637990353997237551580336715104250041179882078593885288177498
-6757096834181706624090949791934584516326051126444323415129234296822035888300651545387936037901447054120865724936805272897353272
-3719471070090385271298581540906250911443020297189549719410313905300350268160333497598330190662838247612158675798074496367653467
-7420546839654007142424912212795950734732168508855699265941182387494625335487354878640173067010282119575715050167662820992299427
-8999971488927790060730948508800281979058687995045352068109470869864835768781397747295222955822196732634803342790733054201967597
-6576480323890189237090109618880316708942469888066595108911237671288781962755118036472198419023002661197238821372958077703913188
-0030541257153278168215715641021711922462243607936192442241352641161941478602829260934238679472069149540374325351015851641339748
-2308535064234691761213175923993413124441933619616103905759452431159366446936203305785164404138919753229165645626046227853031827
-9274311478528593074600453989280243110143811549871941292371158642466286143077576823957560727090752083042241440289345317446749500
-1173344584450748636805732688311608479601983149113524409946668094326431976475189882181347248492781101482302481266734427266149348
-6919145353409181506683417908661000530570384104910516382895650835980412723990294313264588477866084060873540703108364930450237118
-5325748279790493246685409745464007302387808804042056122442284885720787803880628218787879564860434934892913815793329423983574457
-6453232382761168189611119093517182812167138336965744983593436983776900497001902946217406040709180061277827817549237791463409689
-5084186690867471312419665514325307095801242831316185457562663155798586037028408988187703062546161289787145296742552136882463426
-8870611874224684584815641540909217473850820482485529973916085066540438294865034479488663791703681082228740535939513197426568394
-3829342886981207956995705990631766515300196466846957375041259104048073176049856454632700433183856168388096468289412653196954791
-5561500767524576355366009997865394697845244227185393733933754620619491997202491015533470742012384145261633852618565246889880329
-6777844984653507188325486982839438152297369628419739121210603276755667853986365800165693953505799574103492924940759456778294070
-2214788746856145315547663790110177531050862742765653751073730521273798413515040644084618990342819820992718598911810035213540952
-8641245540354058813605493935866324134857506571449379897541736929598327494870227097960497570120553215541706501704428439721082223
-1700972466803583171420254007427289345043866532653318330426834471075577492940413011600530531542381075895357213715112384747031546
-4123673880740060770118806009141779021375877044026069684883815887385967786493701519196377144556351001736897028481481645941513408
-2662387772790420942409426074953672031980544055539694698764834339968798663047095391766181294233657281432203121874861027827377503
-3000685337077147654086746625753896686864534986031835702363775205640514651662788785826457436508900020141827996232430281971022030
-3024908258360292259670809665500668877816383415506517420287409766113445399746700536527732408780456759980633419485517682977905050
-7609884167715679957397855272558744514159873182477148797463658401514781751802711120892880095270644173320069885204433134067923423
-0014100455158046473463596055055311019866188559065450226001282429179589867255611231640796556419411721523548855378235369309657647
-9633011209397874287442661801560684815176053929256216322999478244794557838852723961384875065741787167826618848105863793521919749
-5428219888294008773249094303237486065991730028127620139643719301859855449270217745813940272539972852306476328220561773494939103
-4521537632739898925531910531504909038824924540851609471635849282948417316063275786486909546139512668787750779344864961591530650
-0285764732059028849862258838048464137495797174589639632732738487543884739338580280553036435526582504329979148309470441850901993
-3193744331770081476790157034764887938574991726583896870321256839758584043852505285610942913104942834651377543523173599555843275
-7417116084257040522072018694176431604709041564144995596676144624737792695410277079523480490262409478745371723464489814999444924
-0087200564277539488709914626916914001557170500699327915642055990350944184767970585140183066326636283502929299531353689075738930
-9142572663076266551791245195307340496553949814370587843903642543965453293671993338189766065010527351493298615638788367806472270
-3051117521339185890745759762693550854894691691802102995243849634880012010573871449566457109934687770743470466412945533888196288
-4158491602681925772695910708467090530134341332595220736564785569416215771589193350272179369165509097131151416084829009479740145
-1103853287929082360008599627015884781258703830958532256506076724299192350494313751000293453841630584783094561339455205657099017
-6669316988454995197629701325242327637911706551201433838323166461015137492273818007712193923739461699066479249555708713191227011
-2113634008934694195638896909191311796132499125975665209093925839375449400491235035672664100786917876149509780668632265414075514
-0126792384563810279878665722622429577480527747103593555729429055584348852183674740137123973052149872227487163624179929217676754
-0429035865573402523285948804441336965668748085575713483346016033116457998360922288296258888389027618101688101669309692510329301
-4327425318090553450075452219201170395108911828576562899226660479453870050953529030012653173886753094327406771671224243820895023
-5520772008782057192477714645125967892355088889936328957302124838926954775059515639556003228522011635026617680256545865946919398
-5091701805891827972817338370300267783615596474978619035655959815481776653782092336443749908777349150397039742672328322075757599
-5790089502501043722549854203882262801131152082075103693079735744546403353282880501020065196803852275180952587214373981006637291
-9796322418193084084142426874342342820014220995329829353218013607479946651207097461896332568716316883980489998209799290426511423
-2380307550005537574650358548246683232060877572246000949898947779365886734692122861965160733025000170093436288569747823376036955
-1082935962455046112099818942036953428151667543776795511944294244788427450015296441783391903107987172541886534905100146388519657
-8380489382633120509090625034073608336127658262734309778765867742476489991527857117594934853404329609845740341120593238746572358
-0633586457978329098387174811695256037738146638558272816343120362030421967763476640034051908578551893496813666553354240880945358
-5373098216766144042601726925416970539214195693276289721208185447267076741060153916852700809475592729479267755151190925441394762
-0437558873199426030384531618231327018631366219163826316141114912440580402838580312314548478509711368795320884000345769917178052
-5639423930316613774685180001977671844817204570499797609653987640525926925309564084656003072725353558374445587925969239833796829
-1210135977251946489323174272650887900867086890978166723808871820517325894679293066521051888521481265231417131690626664853728495
-0539462898410401286175566033379657439604282033567012883413399478842279156974842259796901368805265470365140797961756617874554244
-8867613639089241484274514628778139575529407010929548231466056716290533770512410612299882134379199476168691871070113322417352240
-4833451141363445314543208606007459133355986460223413209331799936622495058516670427933156376684533870032838911569984108849259357
-4227813092685468088212208364841572112496680733745196711345105782294865361331232982776705201607924522572931046426758698077037314
-3298920484699256928312414816543062270280813072616261084031990462638788100585936907797010649601422888227353971911450080527103430
-8677297821634129486433214400771371293863980023792460946229497228182272173859417196509074761854532992353908622744248599410546426
-6781620363930103389596792660725581404654123168036180688431615736861252151699433810032668453228299140054818608750957825124796595
-8122906022184441989524946520995601380863784338127264956306250128205898953341684941467474429559908562531894365353100792345598520
-0411240004527716081891095406341655736648076045216518268298111043258024354531159970495009766409513979584877788837540685928510096
-8110610731150417715423694936324187409013994345563727775716872413402896219029394300366269945656385788061342489896665541029423618
-3755150141442065122724114186286854845339699980415816422951602029278923264626041281480497555316143381278936597056953084064028022
-9997198501283363781790158682287440631540353151583792163912187892594225150451760679251039984200332891341466144376776153588743411
-8117278660244194155818259161232321467141273951036898758016163015261776236723767428479024530348209694127274271155128147667928805
-0936167378563389999940015556970429817708525142859666613441735283201399969921725036498088504412772933143791841603758820099231969
-1224164983307664154773003073878449221074064106296765689183370554165942272977254560731754387603794592725273703193699452227243648
-0945223186347621257574665017745770814803043072264123465865881332861490934432664674134678310921895127370062396231037904388566491
-5578757540264948131008953288936928142006135647005490612913881156326258717861846071301620618495929699330750590715333343381570370
-8766152138213724166896984751062466183413369758646701425025924527217037621942282338912065834670044626031344011383552551288896568
-3053487311706357675549287442389024758844523549667853410498690516184480612259764698839374235801509026206625335813997095967736808
-0878702145089270046099454388880300081151816870001049594773880813882330822460954086402671799804568587855965385027526964053573154
-4675804956846633737319204649690805027179329770063541964923158992410097311744090492573918964775287855196910884200372242948299414
-9493162547793763389979831614732404846665474684277822658912090008789913594349007683276852208398902139951370774691434150042517692
-7345730422542157756414350209374237744157462270676494668123673800976571405254566784526649041229590418069453350314530822807850416
-1964598394787617389494252382959463826235528571672258679974212194662236832005305369294264438079751870505403383373187745093885686
-8249944446042573821740194113388700642890510755384482816288425486723007601353010761537384611960083168099219424928983664383056396
-3337126174819661239061831213486837993026986769690178323635308622147431003839607372786324521326222541843059384926020501381139876
-3550125336344588588098791695947139914704682212688259894589141433972450950443922835504195392482891358587151935390940488550833886
-7749712101826086175922145824388719830543614893730681609524662863877518177721578349626789661635402530736054829364302745002369020
-7052231140791673822400576065079175225485411488088090330405642998541294857834801823806307475957421894499261138427284899379872160
-1843292586638145520787104685467083303977045950130084986120058743550949902430669077350548793220932862849879063881005931348774482
-1487754184031131275500703273842524528318488976791651801275003631033587218395976230647938697685183895874331282612016119932243681
-9443865463893265996646234621765924400556069796282223873874118161895663217586723720163197972926787252465189277090874867985305943
-0897354453697180183636362963351299526862015366834373289147517835099724224465741319067052046603751698502499127219361448464402391
-5704747041899601180624074915530540633028597706644514489974845238123048510465569828429534100611326273262355319658327363672387706
-8316996307878784269659645906887598359322978350217418291053466278096200407791776549885681670136754711514051366460206315185892069
-4722848610616728633370187439001656108169740264355894513804107426599369076853462061213905264840303368831514494760256744683488217
-3692367810726295806823047818393633700597950772879297341267237845287738595298116096169937443486203130496785989216239853131904645
-2667811751880900529395751251780403233472004508704751605995052039171718893677809009851286227285227934697321953881347551922850785
-6909280644240056221753293916337855667825910341176418724960272141306897770589964342155201798900696411923242239316269753447770119
-0999650808847959816984860421127802079006195715319055574680057716511026426618826912583374854994252722086849395905477181959336308
-6682428165643537701794115175085151859549462586484758294772142985146427091765603916714315410145159899524436580396471513525615313
-0287601495196877948543109041275994870460190783889596253917385102642407519701386785758190101150573237633840832279432894588540853
-8953039640516871936098610139590123074456039528834700886251621001651688622097083336798736244961699802438533721144359429291546962
-9090712409265567652916908423800558494486073728012853735882650836864723820428807816418262790577395429269519877994493798687893365
-1660175388130474812877157640023025667491901812382385258466335889928876299301453437354017152844077297406456989761054934994390342
-9934657654239690864626478281461559020855371564678749001531999572350068313050489634121119934441378970500982348402296361517516343
-6359086489575862410458280767790738382982543594459454924194612177893193423779790100018577922756855011303081967830570557786235066
-9627300155446988370785806212844429529453154177930814144914555470252140016234923123986998575098139584073958387735640106379021856
-1431322355214385540867355391544675004031897330982334142717560574603867105320387323557316017902469957357722433291210791176477230
-2894506203039713875024969465668820869708991702780944843854568441944017095189870471544531770235169544173059692732034123691090895
-9985087463071783533894010510378579436608410386134175083499511116916575290748570942191993555978994826375337547024070760036740444
-6261306132531269467443124232293674590069389935930085698373191334535132795190967480627467212037239181698443751352939224782894445
-2120942222786996279924477488386308186164427794112389492451650285444010405583566731254920895180572589153915684428013418667038463
-1430800636064677716455907326084896393465425867531959255704442690767435730899236888138775592453451717734356391997983296892276722
-6245887023168571979343600695324609549057431178812999538431044619282851448174071578424122279044132430998592688952289021834131681
-9674276988668745718949139392247616305459443871778443070291211471809698194880071407948810420513382171773670397147925755783987072
-8396960072488524616931349500116793025065793132740236508100883299116095620726458675309257154864629749532773543158061852267047338
-4708002781694658659895872218532749075225884113621393683821853677375696999740077965880387656889715948194663339565410394344347289
-5555870327192777337829881158886331270254424879662205835411641384434648950116158681537009743933205450514200494453854527945997900
-7477629425593340948832945986684831020436243430891488737957650425170704516063535499519492960538931301090427592749932503236484184
-8423876423875909116240287411777889735748877901032042101830839646783823015629217546200038215020201848216827890202734808048558954
-0807456230133883710789676060781653192722644571250120561750361830812875165496905115518629620725251203869040049714454953862738741
-5303451865971911125648060457840129182131488705975454818569283523145391216818437057554152537823305765736049257100852046148635621
-1261116302127532039373528605959266607418243283938981652100937053779793268699698358833723678904084230346993115051100507293779300
-8426944066403361349421019695464969608724905091684569968020665596067769625988182192985084507208329554219894020546830342373194912
-9836620096551496246720748973842622026481410313119306152287268352751048064398407415273133860155815754408933010180348795503748753
-4609338756911699625776639967309034003047928015509904888467025680057353339055998784262880963136510735792422530687128803685177960
-3794220657491630690779260465220147420857430753103256706506076703567632175129351004805264212916552247643663829004772139169350940
-7434241221131032055118140342385838086277269231509234123959703170231052929402882172699084758826526485094213048561191825363736939
-0904036155468367437756029547852649525568053491591721559536888529587622171812488273446127650656057211625693401063929504404510727
-8594239813337093390867462989975908087174105244731466049861585875653241923202495711120654077327719056153590078128352003621088112
-6550980939146114945715655019872060022635651047970499718424015515740106255804720532248662461951505100400404921280927158680583839
-6741404050546354494349489969507458195999859785965336806692031040435145352201853821004643353403220778871762826594034649052903693
-5050161106286616149825562707832775275340760357578872487646716309800665185049903572794595588208600449320559114964177323489795050
-7988668426398349050514452498533331732900030359537800440340518464659495823291497139184592287414133272356549392805616744235453149
-9266075338762306748845630416478232159198106165396768656800162018036519950819645985549720852139273704724379986117806399232175170
-5556988932197330115132604542704979085477903108338527639954740461587257180160289420796745117217674397152069207476864049579397740
-2173348172420527062990485233356407054265180085263061116024667765176353870469789794863489543966815025332527451848905334447400043
-2653295629344700441742575198328366052220017722996829827117810780652298604720896185508927603921863120335461979927552660891307644
-0066285895594775046166427188466940243950248922228033222148293913898651489477743932715196100030572189599370661700468278120150796
-9557220581453859816276169005234368536133383160153382159372481458293494645221000658600106273797363754949138070903261376602472730
-3805492311138707905865671027330890704509145113408439234581134791375788711343962876719164349282530634198140214550594966178264550
-1436926045326544742314469119616902325996600826173849367078861191857896132772006881206929709595222480758410968732831090627983535
-1444386260983859263563013696700221044836992640755935489313754181471481261753184503838050091200730279031416065367564840157446166
-2902149047863838396186395637335864504592375088936920775765866174611877001827681253531321463980847446832448377620176627133555161
-4791558390249335499772225358752569718358080171845842601137108723166037557543519329054572216953276760772287383669070062122544693
-3653096889815826831439877436629034472435210543189243295673175535474384447647824085044069839822212271287638158109858092072312186
-0748574544351788265285261914954044165932622710335856937231283900552445994528620171010664109729214838117784033934235805145199914
-5275894527081180465946457660332530286653207667782652877623355615488795343761394166684000047525776778529177571402318083997867530
-6467109418857304686760026137696284413841248686101454431645726165291910757652786986378480149853820055715870646485922893256858093
-6676215878298696393785441082359744916852977084427450114208277030042915360587042453548139647735771416607502451093388273522788649
-7671054706470997891661682369520143839129305382788490682363534839812789784359519127806453517900921204537766515545890569275307893
-1361042207361371441527086792533736691205317414847988400835638938786015770536113548366581806919926001472840811854920801842703777
-3513103534581691803636903931367504112887620002748826537288400922168108606124444688399865918353400722960622289440592437281395265
-7889386408564819031497565924192895193912656422791697412472168255473833561450568882333025985344661645666990267705103860364236866
-4138536431654239332667925068305482627915123154662709208870044077990559363503200410357003059370208164876016094801255094919175222
-8463391696176344840026735185830036495571599978819527559041511392555529527154011417043582657075386914403021244017762572439715299
-6162318218961162791019379824579408557803275130662824155987476456514181881477682742571553987831058318649000691189597142635269772
-0762970133488857814721372272166424064692356325030921377174309564434883115428450738561984323237757935361350713032425828308741123
-4714351982559489932236335028957017819906944707422172680018267561533474486226912008423131335876195206249325093723564894293512080
-2816500946584950779938046762589915909515704971018715869504032011106342871269261795583577290967260307340084652876419981696310087
-2895004364486838513889537109545822827678603850445221912466809759993491507875666091568956682275842225830234855225383245575493552
-2650099647818037615116956954341655646634963643235750472739733468509790968870462418042203958941068786618484819431710507936599802
-7533481270625343830151159727689285867369942408696652407015806894633372367355011778476566950994358633971847804532262002525341326
-6932860309305588424128816753568417315152512711756820693574982607856846643933251360676478873401876049759834996395397442053366771
-6368418934202491624332453410763014824694322271983857287392943327020965722037743354197029665328443075456374222598320483575376742
-4282586458471797802238473382178433687724169447427314412337761093512867942490521429740324461721167516599618126259885014134320111
-6677394682606606653900300409179091142196198876169170096213616729601352901860163965806655227312385454363306654134273762118341113
-7643573234932937551595703701897895283801028602846877296702625125220327139117379468939484216431057135643790896852072143295568124
-7835389220407382114018498622358193237717282193191181508848234026347203068182480302817923964772670420825100195578203841958774014
-0034680494236515185913110737330886189937723492058708152408147979713114102686546086347368499582981596157232052021983733385897893
-9959931900795867812310134476649406402976231824404571628106712844354935633442704883886435745579659139240624317737165693276684021
-7687653483916295211948300957846886688394120859824086212655110896478780014654869246794209169764271870284569926071280986536129686
-5389201304796699165935771717834181664385244359824248801827481372360749339940576454594000410357902778074011200874064037958889186
-2726930691205319100949599707692925525547420349048657283658532712722412081334373160958039199607974848481872853703890943042973921
-7254087398978104571457211604241039805468739560240953011032729779871018385163199958508492807104550542120182914215024552352099374
-0577915788776618918085672242537299536604399259342051743390425673863630842390420280176568564228989365174973256614738413491070038
-6830892093137210682654019600696831217364160874783778871977883927322860408992703263164973180938595498029716242874574648385670449
-5774283228582139254923100205140724149936447963980034063069342493084827233283799090727386532026590721266521634433539903773672657
-8489342339836233604189107412549422519166707342446243631744337172427688799797300485425305108241084447320396355017099790987982304
-5579039086144583780301772101084268454284211524135896968194358624225126732215388025582474957280102865197930121676550220972263090
-3389908879281737422526309759732063914252217622801815648828128392852505613143446838612931228798897371072027044252222238376051988
-3571583131629499703290168358948884937302565954157189422433659984916252703476429662770576623285862465399735505261324990848316694
-9423186355018278041568884367207433805709684366572651006506138520185260823230823570755489649379382727052958581331266615555167678
-6126444225712076374139461277391085492256424369818965208777930082776462483927136117628590877335005615182912506580467844672001776
-2323186582401204627524733122349298471005163415025134564249126647383086521203590734419048262603709759435997087128843414545136629
-1421280371866708001926278928901318288694248295906455469958649830300570517830927222281187526547437638030692046413330135004977193
-4201689423423687675024635448407327285565295542200018160703811061939134316388397382336397162201256369493787936488029791585101767
-1265877778847130342563633758037018164444481581498122824054055477037485608751037801526946223069038643514687690116234164514587643
-6465410554863527094647350795029177204941109231775452235798798372912591022108733306213831496272836341289051922220644943607370174
-4555709604071919166868299016817656945294419168762671940808165674695761877170460702219178063962280901485563918842254363745508105
-0013210837712837766354170359690869396554185818181209225721015219925108353810498389109811284979505591805687297968690234266672264
-3540066879463905504617792447842885657986052603128773981944573151451301111933677250259888942146768184470087035596773903177095378
-5526250295384032490751656419926139482444274162610961490517202317645513359417017299610996672882236901128269120411948696682951298
-1147928498844392902179227619628807696892271738030552398135463750372457058220840887917423404648021366673468670510142397314290816
-2022158104950164034675577261500173802135526124382488977804744045573154829053227880877248106935421683250032295002832455111826392
-8408395848784043250462314109208469565763023368052967204488715596813441318603486322106989843882974610129619714497130039489786739
-0214994088989310972413925550111779902382656332396702390689823464515504633177056625665996413210331231059059122014949611785985118
-5638643037266704666895115401268842632588292722777701463135298698439281447394022408579092978979422708178801226855288373349007705
-8326215915178072795379523340039085009563169070517125775679474479863606678664704404360480187047960485640111421757696617713004548
-7011793090984794876958820884434550749243106407550272966012525399145703465211673094494166304978135466245182409167311669917812035
-0646616697055433264306514791141300386873739412778313053422926573847874849306566154499488632029298944379782617421929711377514401
-9297384752555069074761141370510516463922575237795983591479132397584337422724053423993525662073888857524562744276272922807488244
-1675900193060201503933483483504265157956265823054822690157216718534136770295979836197494827206847083365905242438375193125219057
-1431083489513661032602020638770515681536739853677363483613015298018233407875797334225693452983166033993589897236847768729569036
-3412842920266990322594256412420427432972591970945387529406395749977856430023496367881365081011414676715347811993981995507454759
-5814144158348481510698013052752762134884248303529348153673229587940320030719465454064415732294560941869034046035698546780721067
-3694293937312762744233869259702927434016315955447360677690945403418821029256532787548058243155743890295919743842535871205350185
-8704385056392271497806649473016369833786145282019863224686988090496033200166054190979749241314009880507707963024916288921654292
-3157093902990992972624660747840907228349704051194371097267625916545775966277296334446546102566702460108399894331979790861994643
-6211141708601791603941445199717151439636201237385208163393264036156546491266459438443028650233309419884755515206198073403412631
-7609935217879726233731421923555596716242460372189351557516117275999330506730738459524772217152788164129973955538645698104965588
-9847824808961328798019186709647321679530290047204083126132050648182784705034270305452693472108814807665149578959595630309221057
-2336424726766825888588931956562955321343032371214572623650620016457504060828907233038750693736196960807811513112341914628133531
-9997503724107344142689181995651896815056436454295876248977561163594537358114242360861284248276610577578928061231272901007371912
-2013755472268039887671228509805013770238575064767125406070391538875450803622634669600191763159687914916440803301533482646017516
-5799981996920369911160876482866900908859555470100550461338722440379485926728401393736777675182480925560316384661340355950830168
-4131746820931543634876854491169439418699998977639325418048790558796894160516876451374044889060607036066881936080985211558198717
-8071462893187814119459304307555930509471933902061826760709069595504601694208191737856286699434878770893482761009503838844594596
-7181730908337307386590819037242463777795080011670425589895801753553643404874388537396185083285326538843075531064088612600268485
-7874226918011033625880877484768842271536701038369116084490113476976040281425980324472775723714911411152630252812320962593721057
-0414263983887707664017378501754926805713789236380580564348508099662975168539697702344553508537455836440798954696577079098427990
-5498272997168152869729083312401990047724554350008563240202328869525129660589507428406050419409546123885174117080636577540661417
-2321805983098426879552953451815149973073351984882483766093075912871745174124737636496091875961776384678278562342333189413446156
-7532047930885191527458749856036064187500060909405487710845907268217223665450938676158247000950256593423837838865029236735406065
-4326287344295297838879679103933460283015103512394382866450845885799711951741393486898208614864273534333346921541450681108663424
-8567495767845161425037712088656492510273651099963049803480674659806775332933320452431001042997191274150089937218301268747409008
-1892491166044214033213915009098534855928106088594182060850901874215590307570900626843004514029616915218847005161443909006676086
-3105173474201156958194039816160955452881468075916368040511971709028208813038518932050264340243550030216756906608101248802881284
-5437478863331533890468364414134511741947560918971502005022258558696334726057777326125552089511046269814814736730962698056311073
-4951554244048858298258123156812226947705933314291630536799208713986095914743504621255604040168912151175487398095913442501527517
-1612279415688868683265625113331706654838561784474685978138326507909792993504451472859581305912676732125668231491237540161852687
-1352117401098609459260904440848555453118498774861101544577811081137171667682199549961162875051222443028292136608108908775783291
-4668566015341904293075901042719184643021339885314119600028221153413672044545251474917661767760069310540295768155060202109602728
-2520334200236839012091693839792035322503068072072460065591632021254758742371667902074341537861212278319285847598815912703706243
-3175268051143981660033747106123282192419159048635214903634052864839951778255031756400562020446144172393222917501787673701002700
-6674523291734748122422773809147614700484318146175088254981107335895144969807349660283900516719746118645468637821636061386059378
-4188188277626583767786502184322569089569789412892621297176431619545847378700138574560707680259428721989759555839556974186233480
-7390532896972001905316907714622971854007628170763072962479615247643615622571558632228493177244362089074929594584800973845536848
-9849264610200952816901406520106384682505741852721568226048835135789532787094701294801848704745256861395407908649513920150263639
-7854370986367091444291966220372693018093730764321979930716154354135718272983430773038337101141108835455952869661500155683833074
-9808115836250545782744528663456612751035343126746511715032833222650951208562936847133894670903159578406935434899681616157157677
-5449933772771897148631641377562540641640474848389783754029100557570032554566006191465792063723092795517702238425793412416470001
-2937905058909924731783049378468003437910238645835264792097079136587087350442777867813702093887200643761896159097869017005937395
-7717133729012763683884090295651337537034023162131283487583227409327777370699292346651312872193008211062413650051860746533410200
-4095695950110108518764643338298928366182339223897361738328378044503564041168430011712729973754089101835569129650304327287404972
-1174584897511466194183788253926349029362049505536254582209201338252575420290164983455933289840278231035884030712260894346134552
-7761765877961955439161913415420485543948776016504802146528406434389546215574979243086360938551004600037990661153084242444222743
-4353062554304250531566068529474211745999775668076123932253052153101156786485645664269792342453816897835171506547074839704777091
-8193385707206057241016991296332616186095885707895014417445978963635638843413167453713147741250557894417823842378892716883564383
-4414701258878541571780503656512173574547903536405524255843710113697817741762054938128322216548020454736882148058230445988304376
-8363544420911047180282206501238156287142986596377518728647856328365181602387822102287895774281073353368828111014956911375392578
-5780430022747871965685716392391425352083934583867099701698503567269032511748940082003282777645389137257025389413017452674572537
-2606024393701221307694529871431154164540614164993497271619958131424791186768644684669356636777831879397734272673335705649633002
-4789715983933276471694982923444249864558464851612286765926229253919876317314926011029164829296322542092827015562884359904206642
-4213428153587165381335521523932052241841163300973801287138253226845490672931816978773941803990440278669979647051465348624079105
-3419168581475572983260190361701934633564914249990805271700921787735379441310149748846950460105295646015883522763651311765718139
-0643017584581435034370880134992336308617187531872808223433939732921528795419567765739615646487503731718827467059811489514462708
-8240926821672036119484675230474136343520006840157742512260506574754560864426113591474981060698558545401924390339201368669580151
-2180431409945375285121040004138946753923265119496541829137171528887590486854621739462433884861201148650039065347599969036034946
-1220794484575763660002325630268586558185893116790653322219525972500497727914800636242536069684827121496593553311794674511534108
-1435781606190730034271758074654507450242292934136120417582018758847558210750517197211614624177861297537749923102696299059068262
-0472496196020370020276610485121224239313415267755759579734483426439502592786733423472402917351281201878422928096327388672118427
-5664545446808704741371688000935805171339458791507069541059893057148797349299303009996748288669321167515451714205892864440743408
-3539189653746007637884781151821846130210806166359445842675385724193537198834368015119520365512286626859121785638758771673116936
-7228747311262908816869990638505266862436414983330364594232199408818881369887998094729811275091341031498735810192826600585848478
-0205817711643909986528303579098875467050350065610591795091066174715779956393527864740830714556714738435192795203670003124014759
-9197293866434029742096641108142225947219962019182256790387923893087254917713809995074288755692595202295289706002058647970706318
-5801028709225408662416729985040929435165270531028696258985082752391299922713342941633843800570338856731347298583819618303436452
-8554584149353583626116529209271190042567689752495849141906628210792514969913837494587223513509196504949988416482688661169416704
-1402557567228850127015457900783688564010064141030969351494178978419198543363884975731636660451573493841983931009293074401767946
-3030096749835569373371333947576923588432247404291305005146406298391452901679290153566364898274791521766815033709118309495674776
-5711698251707518922789190956913393869735623141004406498318629780886567378932420667481352170410684788247915724815490088304482484
-3076891999474110399724898312925906240059216711193634437769661170118805829580169752019184852464954183024109801959695130678652316
-5549698831705307512844145517641207234201273500862193514468462342310564088815360136277681192006596458241962992029526454841238730
-6411622599480809121036108851843289420809827360922656655734346202711742438003990222191272251022816208079113097900823895134384085
-8642218596518127375568301272202091207693967578318544987425186514107159773089906580986790334784827799489119999185876094206749612
-0920817351118635692704580562112859516048707763068110821230955827967708140350064043987570026933663880446183554485511010170742288
-6208781018246003491238792622187493762169792217017386868912187285653248963115594278272915569084370195923738619149855997663765716
-2725282513427928049648973662146630492856487618068183730067763515357833597788940914019736675580475997314248706127026547890194380
-0912098065082008833983417148631289829848433926717155189805055489641556714887595710925279228500591899600062727405015074732933183
-5895616117549258380703685066950990019495929210886386708101945826998030626417636766877015647925822567530097432835311405452851781
-3061662816058323226135782103379493145683394691280827163116839270882202901941521202335712663514020076981153846416619848715503675
-3704213022599283410938645199398840870678548274677230864636710751729466573816253072905154246398964963820890925958414003660031502
-4630926004977081614276851598024033198734821505047735799361816301169717640380369512425102474864033576302498992022080746889954455
-8300690807062719013236716321873014112140959900671073008576129360776883572345888774946590273926184154530838752149268349654124927
-3447912234767016528327462063192808290048544233618790028527492173810076784214345126091690768646666027973848294720038771161886178
-5457890600658613094704911994422834789695852986406564746776631261869186614541778685993675186223192485017919263967183543307324819
-5220338990377375643418843097310570471194246573225298484773451484736001523372710934922163010657077255170019875356114982042678628
-3627624529201855124798528837400884425278033564368552915095248122583917121126951781145851039073704399808416096566055979179720996
-6138215215437842405346946457258803271828305596332127664808930703097188386621950424243497121232196129953435128118553466623324068
-5920381194124220091735356882290501723032521874921419228504863143247804084726835859796865644318358484363167764149683837216715113
-9615036434361215242420376195665243628638184799766269042140156331651635843944014951375098750172039065463946417568449326243598402
-2848169979084951950982695318867752277301100025960923376831113692149385936857810916874319944880663028251022532340529140647508871
-9496200698078244875645144567349529530108679183666387943211721642572053750534478253516851058589093730399207634528878897274151362
-2928780676487223500661310045048476864951396027388478482164226318809641027170548978608486524888062863065934362652787878241515138
-6280140376322091582258435509210383633979192424770386485640747341583226684971908322655364759264755383681296473387197771187476598
-7993834385710389281257683754961049197160221786960013125265044154150064439440391405850545737192660609079271627770663100625583357
-6072190114323511020360786591498148692349156157375850747362774972374185937176303811511475665210532862701141979885066767496308496
-6809986728266957224821129384937931767139546739620244968569547174693124128355961928311295430759387663715690541708892900136725621
-8713302194814326105418406542612287987228114780045964567511737165272440568730052294690749670110950977545749571399774020053301568
-7216372973252354647766828421771297596834262561708247359782436050128141372353679212726164448161015103612893738264244644610968102
-5490158565324437536585310937019467679460278414170537463829112562515850928229747475007728895628087831498962809803771938282971625
-7508575669851979183836777758657815365989035447083239066619058708444094473391492540134970134555418935400444033568972945852753572
-2681051665685441434594259287440247146082524888648989023037549139977692642794573123372272447282566487899476245382067369090850227
-3516664349028783594652935471979981657724225297147289075312362875423752912404004312370632615551263897637065247961679885605652690
-9466216134195188009940680229231563219004828730503835830166900891639648098483491041893870240357033427709041628218884025561211450
-4848574180102172215721912201870496816515688173491866267900855346017402326765363320124474261873980008204988494006538252079431490
-0175523216285771758146998384814407339456495403123042145864725622594607160861096627528216923235632801268714390775921555811885643
-3472489136602420352765486727018974617090254641528435634640334942425890346384541194932965110314503859645146781896767507525832148
-3797532143892746774112201800929601204074380314303366575611389855222496601937222584569281001864863917059035591510412512996095572
-6540831912166873834974788036724952907724341969947205585823842409980011722639587514582627960169448155988074691268777322159243577
-8665277823830969067856126267665294223334216725032631778088124483157924821285251588520602045895388804877588758409591955378022156
-6073508435137376529408576041907918073738449051031545977935509368280423831551346121480713109837860058648169729195905582970167345
-3067341878979134838523394919669124325563435281537910461171499830549480992384643061189946199980549578258740383418503347009079843
-6535435940186811905537955923044494920097170641355108274375772163581055863892145187878626476077935978473720854007118125956368393
-7039488100826115931812511833016243383119511518291750301509797980336012158668128482275262947277553272940357496952990711563149829
-6786417640541461059254040553435360397444650993725507452127477820766859236159070974204514281362156361495968903161994222700825800
-2231234046323964842602361033236684311038633571563965762668970125159431168316364793191351729000958068187715242930876778118365126
-0967020148060045963966458121640283348948132407097784342111426011211692372274414489985481236783110642969061229593384194970583663
-0518863000584387454760957529314643812512823643579550158516331617073251164731368407116086238782619225015253603821594850218277314
-9500480699512272865605970060364505765826990178852739273720908237913877224017867775678563171957729835114722642208632758208282247
-9138815300684460564222550599375232818221500256241474012816587003367381334232108533309664763635997507997023730828738583077664669
-8788277264997082732015978733262501251796460091814731315709354222338224334551918351172940509755714499856609104221032539934398062
-5201268981606265439495692981057225390935909458631770334121087316181673897848115792408678690299457980695904707677321358225662858
-1753894444989509786731779001286291244699622264775676367978135041545186928742736879462156569826451402964970455781449463407937916
-0502111951096040580120210611615484977765606052460541731989539917916976249725653281972573849533515652151626503088059881052346467
-3880078154575290219658231687424062098862063067654268460424536569017374872824177081255701341783967148208402475928724455704261768
-4392256036256639333393028072709593018903870460743710545351823219115495656631234924513636506499865017761998475934414247147614073
-9879823269518650692917107025520590107178762204459762006129828636469652976104262657652867426597078219790167485035259125893130526
-4491505097353181156857564911252591317148670618490859288558887139051313551147429010258650026546020137477020225229299116254389267
-6985649712270923660498384674089852650962875340575045596604964662128408959309248980968270692814095597628820086983662450615030773
-6856393844414418123694511010327503283724147879193562418774164993500731367874976787177535887228795026180482876909284579667315939
-6933319890504711538399213021011090982613851985557386817639509779738587337666166285748238443831950809951451700040304637246662798
-8972237565184004138743415214250280650420991574154677063216686873786654244381615346208802365774879184715316421935088510122029692
-6620712954831004627906209308475373401688370427674946161939930227860450185388905612087218953668667006558048824549749639289702982
-2252979368901033426647735610872049783979382409247439935969647741186385842273253355085952551816588123321471149874812539836048112
-4296535534263007024565979896369915411490254323267398694533004344505948807352166933785377686738429645888455485219163542489241753
-3740204196364178691705296568637646938043711157073683455458837069839389554673644717418013786210053159123354215579725572298341488
-9402853270709855032434056268150751702914142055269816941745088351607954708943354365301302743628246326922883750858759728646811815
-7702984283703968225748705248163911320353463996186650929366431271533557842658056577524133407573715263399635592058138266058468047
-0714364441200044139354320382443415251209148277388628504182113543224388038221246572844030594506529807381529435302712895155562998
-0439249856337395882945730885613068512496256701244515252923706394988734280606704794447812748091162906835016774939625011625452587
-8701684848748737861671752322431955447724661967607517009813604790923987516158908955881849157986515334551799664962438730731109340
-1331695486624815425190823239475277990544123745272288937823732446789801006674641059010522745250663013852871097862751638189259629
-0016943722810447477028299392663967547809929491638369830715943306970577569121839921705532284065788504261357162084070598074698898
-8301370408134947453196729774027640676030589016291539644959237246218491449189371838582480346507102754824929019477369849852385466
-2141296007314745921128534279212951822200061786556429858733058886029876384472876002241385397319110771995753216118435172891077520
-9778033995372614700099511429265411943800576787023724043391866778854759353346452408608492285235768924255415140931221126895275706
-6825951183619818611745057594180574765846145064255544523604725057011807870654883273137368630387060066151211603237021909384345606
-6330524686796934177420756525152826921339672339044318925623881985016143335928837573713885535605018904858579244102576335089585010
-6476163553560279805504121578981537068558170447489713068606370855078339092366601341950660196338341527489856914865088585338744059
-9336566578276542977779339876759708356666986167810967015943735975240831465492474205336898814725322385265950743359319117386285955
-1003736656415305664502391530550831810874960043692083942495595913831106487788016650162073804988081719551806867379947943364891966
-4573789346107222063252149996048100164143705560186510044433851243141510350751823081763496713992637129016266999061673393254758192
-0532366470306788734368951439658028825164454629260106890282620855033982533015451546843353901652120510130789111458392221784617757
-3253852880221087799999614626290882768972817659832607861376923098885595639154736935283503251479471872499871522284582447822302040
-6285682722317206257124522813577367514121775302484636697810948128394195942996079881830875566043123925277038343926112033315427349
-3775226925665315936530276286731605375257672911376828473612175726312446039948354980701402997357293119532073936998664168131452515
-9033989479402366425600648174316259705202840220576987680353222246016330572206033521947195443476632332503203414941943726000075449
-3497459952076058462828783375726894554577596495151945532419592454939988268844456907659575363299273992966202955633347460395801503
-3425070812671430759768577458384150050234482462127557226191091262303333548668785285283704391650036078067518873006221217224813250
-1772566105841430765131974198596141137685703304393653624186537427347991201369580105964338526460016536799639038488848966636423096
-6770176829068426450217510320589346020757715335312260267538371974073805419798173049507293562584393319422383700569196675270010649
-8817107380879373164458511189191184591118659927137093795839429896643513855977855984835472389317216929700259038397397174527984545
-9182176191236023496232040243155433201447895622909243154991531577802143936144665255362367572046313372242799588041424257757065202
-6776868876338528332502171518394602792217092464624165442452676081627495348032268487133922812426314590277917132179444733559137458
-2894505940700668608956696393712351416879091173479440509500831009675626499007967467374789971290965256917798968433095199887640804
-2933556414955828193417995654373126786599609721238527340939127371332396349156901995803794360944816870450892560704118441975220867
-8553706670591731040619297656286157301262507708170329674504933402137245881090232925455937213553504830839742590855235282434383116
-9795978189578883639204205303262814903090980902741535992637415797011196591002116065669674171784371634354111486560182744790314795
-4119132103638186216017314646897106719838984255536083613903341238051086509058863316947216192276628486590741349320633205188806897
-5670698885913664671019828424294908157556037863822378418679559826760134301152250392322845741422553340998938758664406467756180798
-7800330341660310724142951110753435998016854748165017611258286920601003037645494210716339815788133485140202482683448446213209716
-8180605035942700911937960726293062276511453378796626425148211321573098417580088171144007867547815289216240544844126601589466966
-7821272307041782298994133562164496850666805515425583415056198384421212580796187662587737326754702942280674718201253410570348983
-1042240816866808878998548317060777151321655529169893824595029339588028328148179827446446643616423322057981572730612868764050015
-1252481771070461052389437601673649482439048233841755345725688472923079857771939132303119904339949419801565589936559095363036112
-9690992931777916802696331919514208983516033826094247916936120742724743873182994969726283601645253015955852055017097669830871832
-5020330232719825823684760306159154637346729706124058199917604069885798242234996370123942691457916122474221663868046994104598933
-3075139912987034850456516141324884611162536977850304751997334983975217864864834605427571083113425269670859785386338318467147612
-0588929507981854517277972648054247858977149919377574480251256787460673116218337687478964763305472549592601599187647039007311159
-8091499973422866102588159323886136790375349337327388200287148626779716184548302459458465936817938524771802569873742301251650117
-7114931231277684778417144640504976098202413303636808727117937611520910337365455884518757181692362707318939628346107928380267487
-4950235887683950624565704360578955553783208046483127644086525832912071037741169842458625817412278583829306158758057435134618696
-8199425955265652644399992914133529916068954186792582922740480043066932022166380883075792995446339961281184510898029007416993672
-9600726548050421231768431078919064425306219469503912968092554459127359674333330276775477837154780938957377807571696713004700625
-7295599369136487293154800206051955319915985280570186743302107975100582206721744471004980480977594771538574498512856521123216578
-6297798457301239668561079936581574605258366525996359269984364801565322122584365843225724581654618783605926367931879918225442452
-6533005631078137948109852121400341144965267577414971222703110484819122046478368287561575133762804019638669026806894198861867537
-9875087635268237028446411260770380453643015454432015279985047995719605753073640336797720945754884595273185611911133456865738261
-1289442162696753398201423924491482730765830984320927644525084976853458311031303193411990973143614781325043459014068347046089289
-5407587059442212092113638721767282263392344800170580359252927060347500966261590384053868270413268344224069405566567860000139705
-8360711621827142923632844470555921440996634627172367848310520969393805873503222609811062308946619951688125101610027026987846081
-0944723049476073716566027637737569127176067300129222186002435041592350356420231369282460258580648007773781925508162225156920162
-8475983626059931171149310298021646566523963848825823192493400102745845807108661239544077702836139330088359628977689491846874286
-9167471361458822389556369913209606973474148790242038515231761016355472551050907573614312829544645064709238887157780557241782741
-7014298247554687536486236050770971039248187073536082362810060976896826815113357515444053263548215504897920396644014795535941249
-0560999088691723682614108804238530988595549473233071643241045493910124491974900926784898185428410219894939857122959475910314078
-0706992135879838500099998224229773341412566822617554024599579881313516475013871821845580144033844736871959630619808210884015298
-3257284534077293882786787542863570138992146936142087051892058183105267975351672517356758026095332624891123361507959805527300464
-4074440343205139647276844490970010808052229358468787479224053850708044118534407822903344480715673998402733320764968913814756460
-7541792444051749131437550370667287159419463038893712135130829128921018730253201583423068101308427818790061823168162915307740555
-1517558628903132612936551305596370414201320454890625631435775037687907085643182588609436062805330988597026150223859036793476645
-6591140085443467002438387440547002194892167702007183254656681949652141186889776360123350307460795672547510863464622633652798129
-7586611318404573147896264171755514255213812732114705872658268827371541849326158561820698871403138855140301594042187495345343587
-8296969079616469879346007981374601146907653922591351081026313152884017339179855411584129459367820354848581380738645777750515335
-8731520753126192088044684618604970364839081511006806274832524720914395021711036520236353757973882463981033460910456305044738117
-8522729809358153390546384877141395094866223397312997581315815377215593011496352023911920483284381829852239261360027871178466434
-1761342609588366253125631150586581982113849076981180786682830283076537811478367306351425774976563602440271445970009753618288192
-2190966255981782407270090701820316391321596233574351800067587131465490412933509752425381764960420707947936543904169527628499764
-9513655081411394282745221856716659032453348163674130701896927299389413958771625248039619427975826651601280801943472380714643137
-0617514295978753057337209914173385759751936634152085643157967813155609425512280471102235144051790721763863647958187237685008587
-3639355491023500583172147594486316367021278514106274611239107265098592491987675254836995000835549078267373162122839134981244694
-3032030608995234928881439477961757003027720355891764881759463215674265954842081986273329762678139617217680974433220699552082278
-1162323720318256232198753258939220028085022540772566418699150206741508982674558652349158167206478285853624098497667218452569282
-5449383863141380776369123912608347050738601579475359170938129811063143046219515664348459639566915361115334890006657006031842097
-0352577524785516785715741803748070461694324222115473415680064156677430016348738412256655844328208932407174179588633693022145069
-3240824351920886083704779764410813380504193208597077988968552959949184540967132284829781189340533621232738907229081350464536533
-9963137564898255760485048365009768861444430624328428769392562608655048396702090989488644412080235346086820241525013306324575413
-6313120896902229376551555163469139342705609183907471905448131939609829452611107992213294654747615543541094148280055017927542670
-2193326928610645174628017287211712211408683079421721839813537852939457890561997238125898536070007981217325358023811789787011723
-8243869736268481951401784440593310926754240433539070013976127357814953175386685024013642745787559590618261612069606519053423542
-0179110493828168312231149822817828204338127248358983471224771340698766448231962762617835559498180861959832229135237920163613151
-4787386815157272287656433720722356482569671165537977997843012106191355180546649834098738516604856452092754246704403258051505371
-0634701773994997694376147550495812360818423051628930021511577756465075343321034591427451854134383867627150784580620161049855432
-0766676598258381037189024267219785521248498516810290597640526034223344261052531930836169758828566004912961881921058343147697444
-6482511785125094948376527886610692241647293945078604787929517099856009510498982203730650348969745313708621728477885759515338493
-5205196085155489849560658125068733947071196666550006357643461400687947338189762369344420067691692171235090223284004207347050790
-9809626775201561107404043309301598988061425083419682730787633868247584100867048954636838021112840948572297116645919603622359907
-0822943415366943321888436141210445288839456758217953163265370657515497810970631795622846252681104767475177503937782564413276889
-0099794234571476050102251924980186262893747705880229668101192044145818046711997376029940219465691893053496893208450200931362078
-7338980161503676399103395907119988361285887220551606875942870878016149229490400212073840391368478482151725734739290023095487410
-7899326915683751786630813196982092775796371026481722729931635095642264999233728389534905015911812126591048864589797672830096696
-2751118177471534985294175817313968889734356500489672942275914873801559720503551024017816293024629330339229860581633938440765263
-2579409952433198069628120504384999886282779583918285844878077794508256550262226622072460752726666294025165627679376513073930940
-1557518549380248705140615993858146675367318700594928368305022009826106738355680320673267541599976659073767016002316705812605118
-0706655774414337358133841048392051795234166451755892548200847217249090290629891786004054678210061272314883459040459769608941760
-1894242091014594788195514987048397793320863358408872612791768967887371355399390803287124928045545098723504490408131463760999333
-3060272094521186414251733828941054176318890330197109603090531231771409739699564694060282342629340263255630493316904735659002049
-1028815907660526325417480678219858187627208188992524766305787455603486273947607751634385261335594552079352038645485771077029993
-0683468157651545576501200944305620051155390867906355388005127965874177601579306536442110166029928489048442610212141268455617318
-0988081700313980006604864032962026305268670102163784987963985127384885587927642407664223367758558519122248185218742873483956807
-8435692954315269375984976106264988536738299966701776101047442064080401887709348151446333391726616352591853741366988778921917957
-8956328839854159854532673749984321247777028190876411555620913589749860701945785300696279975495557163768982684990843868186778431
-2520325381475441756157721367873710939223796803781885424158254911912476533014496257166233162377942526340788173572154209732321202
-8180099306765466453860728219641256442389031828386563717730489464926442454808958172470108839488494541309400369186661157251374638
-0628247148382602252920534144240581556722670156430583076620252695866327968997749969112676595494827895760196984828212360640034869
-1083401588117745555669152288505435653771338944376475705488767101152826312238533625308441022273664874833693060276780849703095095
-1156085057274283778724094356821366624982478225088443694900412624860954703963723162086763699442272343649549404340286403255643105
-7910121814653271873529362722249047841930063953194714561480180469523505989148782328178679381325533730833709002539304255163521040
-1625855113537607234401449098110230513476322963277630854102799933050565678807805089239388422442620697922678611315082884292068865
-4371620713456528072846857825011777710835705836437187394614071662418465730864540826899869210260117229659041798505650538477261368
-8985576750846387981996728278040998786610281073838965731512714567426037576813755214228497693635971824751946973019990502558550741
-3401249486943615979298276104790818107736649764729969044884395409904447217117866856126816079991915988836153438356752147841144170
-4762938795985970542856369222277414531064648102624695688826552014393694646959714635482411149329964264665288374841117934547255987
-8266183745098026650707351627828760547702165330658530132998099760473617506446329738701905894912433667123567916471538563863907720
-1749733602645901685261363936495062217041689057898136406969925562689807608184144495204588063954048062251421026224871438707736424
-8548102168448428644279598842714118177587767821370906237000294038845928905112282335030976267725288843840126116450813362024012439
-5938499597145637343173003399875431713125443282016722261731991805628239317480073706051380874344456692406363674536084190692646142
-0730500561374089587897509875647211800809704761282604727960645054003482860298243507208373227297725664305984934399424216469588628
-8419154111597746163254112932894914530620901371133608712199806376981269451117389112518987662727134188058972066300128519445766440
-7937806580759161251998478953470159484262859343028238192145225348422179576900021837242945100592904945106701907680168893307572302
-7516873429370795478978284132360296301129718931677825172903818753611017830921544550227392257770205145640364461713731347634995836
-4812445494938381664839724186613091405433366166945041207304600303147241282114042034521353097954231266436563888803937496834589712
-3378087498752524611421562976032943128888258876939559646852575538636633313807640898785156463287303741217790696080003514700600687
-2916828602935343245489574829087284839505734067476926451104496434541582983914416281292812699388088495707067652976139900162078153
-1962925444708479245069456050692574860960690835458249514553536707157865617717301444683893731781098151767222498616081872995504896
-8173903682609218746993851247188524280631112843215665762250628484523471921122641923241385617676960635551184550463145418449684690
-2919933149036430836155770474842583951453613631150982113752681626101371527818957365564134323888669717562193735500885632774199608
-1609040194815030093545138643057865379099082109649230423000768558709693305039551156969735710643672277845208035827493067182565724
-6908049177553254273158603203912637795720376483171212869602699514186725461068506421013630496115516175113680573200157037543353536
-7096806396941038667344905110986317666939904573544009284947400783005195693194103701914010433669991415780015087815639572682791514
-3680756978168727352707707927350530897842094443052210887958488018513662258743146529661558086974070289076864455883890457256934114
-1990854389059420349848505548169668954938843880071111806085356892226974097003547436768393216697877346132002814225746150600875921
-4374492277982018508835930955357380285574652568017468028145914088210165891776161047538281175076369924948661559170128551211440651
-6393090046195615488795758266312386404911848462625030168594274415704463604586947949625250757933039912135660379167156550736214014
-5728243934436503311699358540925223297549609990942386098315769782770878982264993140803173130768644963918006938211060093506696811
-8242993502087208931436768299544970974899425557012952209431499521399155627662162396837380424393929443574272383673835625796387465
-2907417733054963303298412175669470571774232019901402324926626651661243360954715973085766036500273697051651414938093042950467378
-6785894337286818807967188916007632157799934091531302525882785328964971157321099749451607078727217297793573097237856806946698841
-2698558719450879861393803875387234736047009367170703129862250880475805397892793129358764218650002148641764709592993056227677164
-0081971305438865752091446464085352177755237063190907377734114566649793616356658589817576855323559323530686449621884731840150788
-1826939540243947080817186653825740075444935631469715645767626335326860305087307127848152820195439244125563274241365606473310540
-8086243883958240578268878611599696204485799969418845316458163879163274209827292559109804125366908746820981499563030997204003905
-0386391010049409963011357239704626669689746915426124197111331235480408669200583724344735150698143659880232480059746405028850204
-7070621356175994235487518719187218494861976025281218293612423462113181646903473241591007825352754630207984555163787848738511210
-5746214941035113394857005157649321493185603337720914119128667915231061424163637568324581504110784614852811094476768652380182856
-9112517888906528267503001049949573135127874375506725576149307826638851599758326023611417494647191891545342374452874064341534379
-2427813650814077661287436979575407398921688136831196702246080880472345267198382221158754713144173467705458354166291752011017130
-3427037443878854401716449891823089902160247151232344993329995686205840347612271617101573796125148445827775208799719717001561364
-6663271105359323644532079372626792834540392816461024173260479629489907065371009161907255452160867279588979514640773444750654047
-5973386387254971355387042682264494417370956942797373987206113528047687059080572493246240752693790196755839336183495531383520500
-0786113322119991260636829390212550532753074849695602064584008995135867708856455125847634381213436388672553141147016113632022246
-5315245540985412852477846866194175059739189599584743384794049685678013782286205098025299864897730658726559776885622145372207093
-2947046237055804495388214736381241294012375243250351412075115454784594240484997746146442841037234277389231586332048832314609602
-4940560326735767175083614737052886039378277408442894735731934794992054788139312451587128497131293085948245032106415584594528368
-0132772291233611554088929401128017045937329980274933241381990578374018596495898631586186020586965351932668997510872004538098971
-6387651070790112849045385204698059096706128798635300671169181792420546539133767532896269735055635232257735434930885609585584847
-9016459024097607724588041340562451108743288014737496316921528251742165151671257409207041532182399287641327587310586187223956817
-7534883738445463926481692970148340291005837757179973259685921796789142441810657257829230854362459214897426800925224271446152113
-0560193061957298132549489635518745231685759631661778699250394638322691452161479836232887573811183208096513244778566157714733211
-1547430295477490963534296984638628258877576273566145152920369666682577588376652374130208299869130148553971805471715526321961195
-6131510592032893543765491267410178707297913936975805122290905928404238596549066769665229727337467790389337961037867643489553699
-0609065177988688342181444376437189336384085173474299503743870199156371216381879438127542687917993261590322648797772549606051885
-5486486858037007564853644084702405129390388809213365108089374357918264647019430516503970264903210163964653753490047274772902330
-0461300174226405350596681300475321223682365336534045385167141718398138848125986935473489411898994178547406946367385725330213907
-1293509274626976153463652826393079169386713361776443893666230924263947932847701762953659799461100689690446626123374959253884277
-1306373580520533113454583490110255646387329350405309931889447247185635126485724261288069862689556565591921946727772549017471108
-4575946994632942954732825619796920704805541065043930109567542878956936210283544264617080903536339854736947121491562648913229061
-3705434044613436537344272909123399762720035093491390444488810776264889843570633561219106570438196072991495500597843887820183050
-9436774296203905562085230110417550251074216179370977223886873788396051869595539699599654175540263842606847704783570758848289347
-8739544541060559735321933455321086474549444477666793232318769795339438758735396350156993223591143789407202109979058296632555075
-4292457420547255026544250001229816943682894619632431862491477990869504856164569154248439119907994750443837979614731379296026483
-7759359950784829354681821925764141180511597239315053998175532245470389364554510124781233539932768390441633522487434841829277108
-6460068597420725351564334958788443977520626552046510044910725038151710003467025913052244964411427404827820741380296783360351862
-5211054158075000733081570753562084145801231533068994378093380973748015206056523195741701721944088905307131000364624646104412959
-5581089920926259625216459931700561828077094118449960988240945610479754976194870306805076133937666171790939426378434449418282506
-6039057527913534217575393813423847928955750038761332266774182283692275076570170104686335201401167177077211434292507428463611621
-0405115165537284758792010216853186661681734615099607405177733845109910013152569350731884598363743840624814198617754273927011515
-1407618016023682414983073935592618659194377480743081488662206405541839291934958759003119610099774589701968015068594030177949217
-0790315691986911016674475309797543936300728937674591920985541138152579574295860682375269717640514911824203818306809998011275060
-4382117983381412972994275528147432373242673418215434465602805780063289348278856395267652713597654578622689358031371373016193682
-4971203890127140128708179164505005602256484886747097346823610758765747601150832737555748482400760746795103492345268624660081193
-1238474101549902789927134668369786012288633703563425355984226013256465916402333622807942597885223175366854363298056733781480165
-2475056989181989715935840837103963570756393472493139600699839539995767516688497969127775142807367604482540314805881080534085920
-5110483916952128964226635567750120557932419254741576165448818621280817929369091427028028668168593266857526132988629197479499338
-7382097529770364245616319813419439630747996451787212372784898440040645194051307376865641947314145623284843530906118562837024282
-1180719306858134644273288620402473339088866088558646666749328622134176944113672979075244216767608666882416653166422367766359934
-7454692494850748528168077614552490356358640467830959916873691009192683520419187156489031520981784955116022176529954332656159900
-5703126531777606205672012335960434796458742284617167876316278828807209603472901804370309819783462306443611963348173237324352923
-7622935915352142387734818536448742013947936195902370636105913778439778154319304174619967238291501475263405722167671985219327033
-4192469391918128902822325360387297654953797790226858555687025028458729211895927349803665945095655786671449147679921097155626406
-2780677237649339975622761955036413080116980723465856549727438471457957358521359815258203894427475417964365478268462653223640340
-6384355742271287800278025268983527483432389226283229170112845354988683227778986191910815226499442938779725664362022274661446656
-8983529286956750153487719136198257278584599062333134754547317517831680020077715886321603644059583997509690986046227389994861108
-7329782796097322937140185361853575699691754834694652931632748528792770060065607908729085140248378226282625852546158156687855610
-7542858690282896923167331772353246169388345238738453225427851985834084721866947550098641275435407170332769801857389664211235898
-5799583185812386717849837795175430854770749931463501139883970148364355569591352178627597816164651268936590016366615235430971843
-1626691744466309451182517845050907803525893409042451069687831523577743242687080029262942742968372360368621788807914146915526880
-5318459023686131069631243003764992320489381131276662425282581511713606116289353391248019203404378565007089996278162834011328054
-2940914263304203321901619997487124198689066488749388375440671721678381773728920019056941032982814050260828373786697860844945937
-0935106263610485636127316359361586585062460943315331019818757835533567856247177900197592421873824025425985298148601575872003838
-7678845567273084139170475285839065925039600025616987691701666903861540800590513965950744386259900437461673353720707990879400851
-8954549187260534626790030686600472676242184422173770737899202674956746463128211733652450269429272431346452882295888511514249530
-2678743312277245350760231139022995628706226321476561623183303095250671287742041881664219630594695703026351221927214229218759706
-8754746770599874955073426285210045733061478934256278154824723752843570542480374148666553082213624470594178380618511944338556770
-1258342170448502309847524118053510267304683961421264512188294654208652383435713573419843151024833136714917076044792376946554552
-2686790894179727162588194653073820095034068415445717821765878768235572220948743946189649565838289653662296142578461681042115408
-4979975702994756010947392018214486397764251254586716632357033001934850295130508675410334819960903160411122706650159720668896818
-3588969475934951426055953320940144471459990302441248110905750552714828775127383961567862284258836730043491152173444309138622805
-0885835602018492226235865580484440117123283431801851414462459989105042310153202450298431895243159623304698553633960555968674076
-2495404637338396778354332975443524901010204103490577360377282407257576116606492214532864036869380580423420924036214250605437552
-0273823801820228766960129999040441972228765926389245168282516822705610151382079832776017382538534107323345050070717318572440468
-3719693296470114077607298610532514071278447231443437795910351532332738448270051379404482177889663554053263746637709700053641967
-9828951429348008059079973550469791268813640030847883313731919419849614743360559828672182938947231250356355114573949483277719010
-8160147790535337222916241165963603517851503563087426894556730214593005608351479878086372777584308199478067490440060949884647159
-2948684894394971841029364986618911826288588400559264365297543464936912860908849309130216792677280193265598685884468366012698447
-3139146768567604514882268160880542261286448423327913447026774946542138981930662613526814753066924945383435581070740645979592320
-2648770517875200683345474598491811627153093170689853703611806314466352414707945002443742160480066256003350127740349411901099140
-3308592816806695381210143529051488111319581220479904092647583948868369653515446635908476209492392955841254295107008775348098134
-9546057832057661112548846778480873064251831646186943320977718022174333455691510572548784701482794043711785251965805930805124302
-9797598220825240487337675580868560618123083511865310119111306172185132317065154479238514833175902325985968356007574306322665172
-6169700545459665615556940263207457415925074513750097043236324790451429771342105725243301487094857682554118664272164353388631072
-2065773265591123476370674843120027879502951065822173174917589895449890375502164860452910893685397468281488262706240927914630538
-1707471421521563472417257512298478800552951214730430454446551411959701879859928077389843110236600965268158074916952323108191254
-2504020366275453319690764881376901720307904782764373433647976640867427413961893744590272111954111461916745192557787193817126040
-1588579151481338108756894573873934357158704669830936720767495898488860812251579113152660788061419535504615986627104261122375990
-7331623622011754370645778091243569467777379728540842719407347993337611435365175147413009114962875879124181378102542276566594108
-7484609326756980072187285780841286543812762762534587441056462410575222582806689121646585229111979073490526305371963936438467919
-5706586317647554978296224372749817614542161459685489294484897802898801747536653246958762657311576344225567199024088879682797895
-7982416710167868709570332702438980645861985176457876981357976675349506324625350574864591977896798566893422693217353865223434242
-4612810517637816971256206727690640808547458195070320671241318078156152911173576755031013652809873321281227880993755057868636257
-5869566853914426396407700744200965755799089377206196772845889331869496057116760154715122075783787728423594874902542137832225559
-9589225721722482637458883619679136109478999500918895037360018469933679740571642521146059558547268528193088694289457407297389417
-8114608149302113225536168603740452239048816211285413122470267658232185443153634579198429078537401989102386028340268733889611123
-1658771744647637356624539664960206812688702241127922503053926273465214516451739790546967335354319444825617690989800359892589856
-0053465651697302095039711511050038742810220818349852842019182724663703883278427036626489847521335203092583455303768771456368837
-9461783935995459315552854731516681231226811974225458662840484653357703794689886592991537310946084831023202899386375997693481512
-4533585921481186000403378289480817856084298244494770175994273545179036968044114231324393781909984894250047249639320078105176941
-0088337423065130496692628858394850230047403024636567775158827661121094757863694577077324592397639708861018849419374525563390572
-9433907825695888321692655143225283986904641901823924591220365135713855259383744336203797993519930945597887702113356326830645826
-6988446116797840398450853279454162958768243775646820798515687585868046231740714350466068297160555230698894793181661331483900976
-3228255598385373641636782196372646263654896275851591790742732186929071139789500558984105284755563028281035328678092579289714000
-4681011094010579149015425103883784622081638214345888273901960768244903621448040859732301956914911242855175944393888342553563087
-2560980412018398873410432462155957943116348971819529996430919042949095207925589612393187400930103605496273814170584912659092382
-9069469616610979589154787060025562176784632650316733720274832314981371020706161084351225782272365506817110974959084699634535788
-6765587755549143676480283034752182178980320308874937062805295265849032617917049285075020134633510431916668093086266525800515736
-1987129393090049213521579473208927794007157494973792406906256045288699283419276005662236119067885571670938877198469481410429981
-3722619269607651225319072582934109199126677644296125933160645018724047938190291886105626593185859522559253131444513872231301882
-3878903450400959596968323921819162239731394330071230682797573061816799122019281619186466630116704421984435128057686311537024574
-2171772674581440679441147914828465322671796713303729214917204516452594596558898159147461291026535836576291138961274078954494387
-1278996875658664588862768319875101010284199226028473900312140448349990579106956212227946883352757991736474264479730037979113425
-8251737524782800721142346398693390112514424073577724343296177123905498209033583895128953063498814237667366732979745537429555278
-0896743149526940034664390783553213882383502205749882093466354195761918368893140199641725113693740413564898871253806941096124190
-7796854830589872123486600630498401268330698814798157768931103798808711643064916232366065296644778046047073412187780619253278677
-6500537503531609708551372800808683958268146390074367413801774325497534682441389495398023074938743544207866592122064463211672009
-8374007659269318743410884141200642883663626493756879447578129358932170292700541285549708569643545027306452528039696051958912164
-5461313220523803049639223578843432913631643532704665479011316367050573380692644563882130994146341345324086855525040200238888685
-8089200828994642111859047971321583377842360402699515255215765930754030446170133309029861283548123601950771958367816928039501979
-4921861981592932540366839797291842409375656173168252866766746284441002285941098783812692417408647250610811303546299712956961745
-9167799975366484899208629064327399424255199740686280222254809555146344897012896217389558240697588684347940576269967072665683864
-9259388885200851860744997606520800745929512006692275733677005833780389985037437438896650034386964970221299725643606029624930990
-1923555984126235140744073661251739569863134027553494228555366490941034788475845541690058986834251129830243447779754071605873640
-8546321296959618681680784347875855095908171158196021873844044080735403609307093046577378976184646301996038465275795577308210631
-0292841602799520083981301964025702228115813520124006499666068950846030422607104364257191751077960220252620197225981403964787782
-1502322992487049171872430148257934075524270686852895414785698734102981748355080650539194240735935759095611779799454232906920170
-7645673745116807956634247517521534891766878215315481669195796109233157590171328181080639943010458633508897705148841450600988472
-5372622766288568973430030404326811200585106334044292931194542876927622884286129265334479806408440904927200146880239590676743160
-9737852886366125426992930022076166695307759649277919719824038921587655496096287480936269368326605698820270793854355939980396762
-3180790631743853089037422811844405317287386545411386410379668362987107109358079426452748318127402761332147799830440163526016129
-9051792458167155549317710812956107571797762247756516089487421498534083002847984096816239076561386593955153876706013822381927681
-4173095560231171732875361485159122658902814416236442472154640300288401422165407659115651941434514022078384640403200843998671972
-5966470556331046673745430553457883526280940892044422560744252802816860579980940340917982940500224988618235941234788610789509168
-0789375239650015659257828854233372959702664651151444414363942452653680312005125741160555543069598467797693116222658921071003474
-8906623899466461239060702070337224569185523906567051838309830757794131815206179504935357263945463042333252081048931892858013514
-2565946185596833054040544913117114680329109501977878093743966290348734278988799428312347727405020457211698124070822545220367599
-7887639027440626642608258462581197685627001806341140783071773706310063459682140433859377089948217599328491885205500920242752765
-9105042785087589492163764806502467978793005126850254340679666786999523605304678430709511644540488408967072195820451312364898977
-4806602335002501148210169758225301946374240051070758860058332659173580299590222924023022260764063882929324416573334085874519685
-8860484115578005776711551777005731510087855975894724843956874006078066036507250577776451260714027733005242056180700853839120022
-9972510062716845450929888769682540876602068670550887529330503339523242901354677312818632650357341649500497585776441604969459550
-2623606137079639076047135393717143616094073824102105929404170935516181957666178130675618698894069752882863773580174806425770058
-4036671892720176871088682314351824213287902597131301780764439176800136663620269901795969751693427552587437595932156820043424392
-0677294124292240149296066696637747776445858679559483174535961774585189431151122220911414705647847144029722579499169874681984001
-3515611659295600392682520429928899147250410034409210806506732173247308027181439461299331344368884698174936563300497600474483708
-0063773420552619484426050490136425686777123343387056930411442496315945289353053161802745807953399447036489317450479861853401831
-1025437802898670603956439520711493780674154126180902484921242469929281393551385642769157018539956452797615106532069322627218483
-8759796578568398063968102679425317647163292357375418469803494058822777510870684874739268000355169575539187937262850844553141671
-0520130761108166376660600783005143635657232142524978468353606381401953088627097253750920455395288123559132491257402067683088919
-2890887289996966535342242107315365601206035014159576380219737883962373302977227719789793402712556663655879816814402801231940391
-7075049290134330330911964129274745947329781151686133509827045508476840011833420977165532815261601339404747681713954176358695787
-4190862513692697255977164180664759574127822507052658315853043337010650269787647027656260221445450941719360532423677717036461514
-6908155746961875390092893184110336543104604423996158420042649680420697682015958655453176718660496277341803127921088518280061343
-8331309328194407889735199978235437818800306669005429636917360222653217191676841870581785131998034245906906399415366961802496511
-4025301862689940996141896458524993405457637230423945068131717803505952316603722440206101338781745994056920279938566008667957974
-8407156560172061727221211500538117499687747789630891734019549331980906693172176957439813668311313041124185359330130579817813671
-7466416959132373028000515440426004927338552129675365950832267054293724597329240325990928091976976797329108528262309484406803795
-7029882344252063506996455416881601769204928489785629548747090770306190718064516950313796925310576174715934481881905681054628070
-6880642279419324327941511209000580929409891074059158709439715032933825582097408872913695012908119133558817540571147731630417054
-0450976304961807996926719984418185237945644387146277128118939816965978556618267349869880710186417738649005061794411263100794703
-7430304052534898545934660709004803179571319216041424124846029027406133093839979267839656729246840664461817790155804024698154985
-7645544772776077953527747512204638297554270388027111651502874795299134795410937797070656228161921719694817879801901345933313665
-1313410076049663998827811921356048583498283359569530324863158193199961087225704771561935232487625934010979224924950123845221938
-5542450907649094312430747916423053695607417672358828335758664117685424978394617325307248658166202146920547925646776725087468720
-8125710483678181819120321493187443931435742819361342552711290450551262872707443639793745995943576289709507020621251828473114770
-5808995455056792083922234742431742082106369821885564948694790039533752228468465967393391425326441602867483086230714643155046641
-2407915004627569028579526596926110527896052886334582385573230907225818330304996992697006735418150830862621130034997989250568103
-4747836691209220024929494385208567863244371223110054782899030754719240501536232821233744154670656379727685527957774155672319475
-9632183735133215405359145903218054467186662532650851575633645907886287911612022173510068469813052313582577723168904869118582615
-1758443894147315526858202229285381300192667883978558926059924490571584269631902778078169815289434853467255533171050775547788250
-6827379725903576619807972215479471705793002981926808670091729392075163455575073588508765374074600361763199064144608650998814612
-1139348883195112842120618191199370895634072657781661691958053236883789482321308598352679539450892103726749423679416567117182472
-5628380449503846780627597266237186381426941668768981275727365655268389180764025467621494196092237996217033830813378898293373834
-6249982118767143075646051931844250281862161753132641089322013640269043322260625061753846454820580624883961230554153956989845603
-1506389246361534372134008198497771836659467625678409854914006570144648661265229365915719554541771143877999578976720337073985818
-7005263179523699177762675340194056182817188450058666203568903779623473238455975919469726862072009578002483873154457672262756142
-2974648493466373909300392298493641388947991203930909247567333382267233769728042131150238686456747730553128288781731025800074389
-5103801198075821222369482103926218823537252278659224466101143285542928579893855240568803378461857010249847636234366813910593321
-8255444368358914408018189587539831385866661807993390145935560791507824844153502737089683973595182396850151415917641412882278385
-6994623624086457510788033568938511176649748143257081559534249807952079088004873263643117220080770572410226081636499222544341556
-5868861827549149829709753995576140261303291609060728919357591890769431437067208298630183272025511291993873213366101172628545169
-3536668590020988868465523872067378130539719812107645831862475320339405404292929655894962610265222780223832442563481658864747632
-3855559579815655284020206856324714890689773172461142431850331038157366681406979208119201701019291754639995462477549126425391350
-8450291792039621077539436402960450989801386738795258875543765926494042577259109968714035988972694939518009619956412673656801521
-9433075795122748111293126771649210779744396506362417079033687912993766618349565561906099136133480366162159291355560623721579187
-3378797875509332216281558051343681937584540368139917115626876588840206579792879445323063696609803160334574023091211019696117960
-8286659856511129135392256673984667705469454940089344874655311260297659378259031305125448870028720171028350742267966605006358033
-1559883131888908511800248016547342952257309383028102249271256078844439208862517563884780187208616611438790446776997799461384713
-9213000700276768725565441947730287329227888200262127732583001595805481558214719061412862292967561082950848644790833398460564723
-1237463356367627789252505343790157426584837476951882453112990120548575795054118752744721410491509448371890573822392145256573546
-0705282244277315586839396249472907788988824858086668101214804950902161992883203183045693099700874860748969961552066568180233875
-3649804362910298143091615106831740058421008356128934335979284102172120855125136327683861035088765145754792315464262726624806783
-9434730144784579817482674138286237679514020123482574946846405367389289759453442305761634017866345369865209680919734485563877769
-7735810389258589718835809442124950108708303704945904199371845065484839372522859566124912994258804441548671551838820818437896075
-7383779025406555287701082383561184897642996999173556341153509465466385364878232088945280693653997350128318569872380406482923450
-0873625836034957145587001580511059464110231294763738687292419746897783167632026738408026265866915946594910670670203196220111099
-7591072259741426420367322902499121885937012842290323842004604562106110626665272233088406003591488022718144482545987747891823870
-9175117307974364573779518417573849521480439605413624062061689756346227400155445091604379572899069013192269044493766848399848392
-5240204070345240378009455038862456326732346785249576960346569277468135720674493354585769115025511723751059422380004118585409709
-3349173998694448270286501817135410477702569648480525937208264068896413487832339295364105296137401893118290448960552591536754124
-2721855377073042117183109540215181252714104113649070283807754222580162122302324470826848007123339852921541117150545915474905734
-4442237467667117475961916917266329385273400917266015718314637687934575915917583933649989627896013912399205012102463085560527584
-4091026285900629392132231811067909337191049861336953793421590084466340471776345574531068461460044327698926685026108185944785273
-5202568174541673346987530914965105932805689677456919213224331168071054852507039901870720345655716025476685968559834858758422493
-0614858796890361150654138608860068135509273139791153876597516417474596470901950497034522305572817639212080825359999795816120790
-4690019462662785935463711750437540580321430169890806355137538513325878535253326703788253684313085653375194280379587086774403636
-1192297531414960747356858854539457018921020998476941206542822005080405209643807598603349026957600933047420780702135587594220420
-6385879114957936148095665992720513226197859511089355764654052901972661068207137358088876405026746758171573905075146612191621724
-7225256074560068850195651541217829216290435321680622077492940113765770295891334808874940394348277026794361425754981697514840551
-6579386119350941004072171940171520374772062901476128261790580552298150743389764668933362002827319670377285437400224631386514541
-8225060930462866114265671430768226751533399557663700459188510439035058277166158167696828360029527807376628848000272330091576713
-0060985472860653127812993949032906458731116791182858234879179245998734711417931089452148679024170798661176089885161196837664106
-3722805008939449259124307009136610112592018063781886320098372656598331954054355261215122816645348365251690431718100984807641151
-7671563753475866652087409998956658850991352510305691362750704516857124752942784347614592502287785972007339688267613862027066735
-1058283061155393934892259910225706182663785747481861117691921311446649045132526185682558542054377226003665649454406375422089246
-9732227956822666337303879201449758438032098745926653063569926833474234804332766368153105341066282800778041496886005184241210550
-3671076559003594556531982936604847786145732585941552091406028722895252734130685947197552543811727116647815405252804851390263345
-6932108260738047486627928786730592183240725916073436786293871274003576099287405402166418657664483313714856186223383473022466647
-3109816045417430083537878210451471667742535838802468841651352736464574926057073048472886864367560530408263557356129708697457730
-5131047990674797494394562345612521219564146779615283892037401029449518064490250135341621616256327661631926681344727899774392825
-9793560539429965156147946048811944830887554283992612919784433839525971829092056423046384752108153956186882584119526879128063725
-4848894438740997315189560856906795393017681147097928684567412396811955257068230623390617279746246419592475583485164533349133972
-9247196347885177565475533963701634576057917406510305607776085697222055528129649096213092034549229625900854393776713393006598014
-0895574299458423626122169092017122327940337399418681543962293182652716019527292869659349372977261887962838657423721599638764034
-8069818312801265892359056947805299813404068292205524125399036272188934298155723014962611157660369164361085013693243392717540968
-1746313469892957608005716135870516847580996237870651257913684437466577959076954626426758903637186057505535214913540381448786350
-0826130380070802481888865468100577235559992056039751752075537240976306665243883422413804381659448597324700429367218879041686316
-8783969310605138136810926575209117557352903553802462523920408350875226887462880478648547408932195087998226093346126517623953622
-3655963588132204550439064715232312197339282921758181601943083078440247650220106399066615678880555199248431536315260442825292972
-2898418712339146920156618115849473564647025888554958680753487875973131958912468912448106432964749351366422577093050105438712807
-1852498129286540733225557917645869957332090278845330056842464816843083325044360873406582227952116884337704935341689726805650922
-3976284069253193914079828201683985526108157492968673193265258027640406409120387997580216531505549000204500196895696438933985023
-7344227386409800578949975082890327124630045606308364332447462178940410322375677488036092734345158152279018751575711953710675611
-1365860719506143953539467521806358327791893587420884033512557356449628421974197081525171097681451739962654458105945042338824044
-7339951041651291336434788317295707347631976285149811926440821662705811682404836418364754712250487175296474328282212659994274238
-0212161973979980092408896174977830808566631947896643996545492647236993898876722578200269918604906863319277003087190525085408577
-4872695328272197013637039406318385585335721591609046713028487734545081008963689929406578869624586103965589484238888590831714070
-3093781382852235095749474972285903266360882836791963595009076006750220113661602476802687021999748113402446232401462878936110934
-6435034693320558902105688910308538965196623309949466683973971294957981775446228096356658904951613108961843850602970532678592796
-9900412913465232057825708257994535036127184304885007026505543104350741668197223958911527343764741682299736861152999772201279599
-0514985184283479308437214277006973884479296109534451984897036545588323471166529442587769709637302971344236763633165248653048272
-2548677505362732783025625571327094753804197898599649990120724885114160782630110803234921618274764179324553264262464188071111602
-1490102219572319216164107062405778780633273426833137366869390517112371874174117264586848123441331500645236212846316718716883477
-6374557134532066647778099833443353940716636987739316642710720220881882944339283639205849477871629369917099561362221287484469397
-5537933700604880504714026554029166587597577826204845542181354963551493735767539318268321221914383282788245529093887530478824907
-4539736948571324006868573970323898689460869616752573795437663232396854974783326373421982301397494963660135114656842200560632231
-5417628879269942844019831356484605118567348015685889718110291011794547506306795984565230200245047127434730978214554859175571386
-5244295129306313578981901753289283565322938724988065200258490956019375699629296714989839545066652554067148655850643910689520282
-2971836240187409511885225271973597558472371014435493899110877817281998758924278138897958733963027723716372919312791817550414257
-3718036377547310037822620295119160273747183347935451508155041258644862468137971759991204189248362267356043409939280563151645203
-2059403653814048643066476915696010105560937121353588493219472721117585709084500577027269061641086537899045745026346755806963182
-4321247098580397470005864122314116779988792921164422171095663365610591552259489098505982208555327107941284015766148898178511334
-4129075760977557106793231123557041651779523250483585239932004312719534628408382643294636229121610127684366632908893383504173184
-2529072874533404417364878145806482135038499775952105421793815591456627903830117948809720387389717200574623969207051170720940841
-8319746694698707336604137199806790228573013581807699678418425604568242103303802544153333753105945256725487631110225791990763711
-3880160358558853965367146276153313624158725831047412244380280879089394407413109649993209520904697096729360273647396579418687376
-2091906829462709596208568404663223009844823381264480008433097662223468678702122339891481765380241818468489069582210313140199504
-7634167069455911451763369770809802453049016134384625283172635485682336911180471943157282346432504400241673963332048163371168819
-6945528084709716553738011980160563280642542751055915815221655609127228922438332498633425574184424076324567457335614537707491118
-6855985221224698806898182154405013337026345633363958698774698699505064139860586968819626692305575161911369355200549282693239574
-9661995161189339321012455875057211575581587182476156883528607442238967236926672903199283225630412167629967841892682077069456544
-5556977126081270383421853880021926196747677623279360503448724398127284807443362608046943892392030345708092629807650879718315338
-2008556770184273576766805643194174770708191017610672185545130733621276522353464775534219302741371801405182864900478774809576537
-3865082900785088869003731961311138273432940384506242628178208362272250891137755623037615929981020628600026015312604846649871045
-1810271541153370013506194385701474067688519311563701121092950023460871685900667973434789085894353689769155959515852286976707125
-9220855281244525680311255117572398240118776083069705246489217127641378521494501271090294888487837045515780398860147999941580644
-7341485956164711767365322167960284966203049807458284565556017984048646824943506319395879136232290301571995491168074801397213067
-5371405547126368328180403806382396944697802094247261778722922120527093199887586224288144259646007747572032786762234373440343768
-9641998676406552363362334096338343938226513712459780071504106769464358782102176567281764333076640338559714360625098972864983029
-5780224793125175832096440772460219675603258721147649221639684097269727175225573293185628479999177881598175668238919939024400140
-5871315749737173437146622211284749783435729572078139529891438562616324259909214610231102730312223921245301659630109254504380334
-6697637358599635782137313649853967748604644159075078379860391872979880640358744386814475406235163749464766557762029498100317344
-9260432917913444420430985635427292687992391436924828756222785655924726309271829922076362876173530631675597755661167920958784469
-8008272163146127952220122593079694523591964786341879588418492633364085713190449203278430539536800444410958318893570820694596913
-5865771428552651226808077349460469511350507824410126508014924137043903316541107301501243645730254790431504727160432598689746741
-0797866504326277547835398517451743711623314102885283925539211029404096358855485908679412360891989483761400122402649553985042303
-6315338269917337190802305575034003552890761126872174385267928282692687307003769845400327640284655468895977857113820663582843212
-5883143761391732179613778683464000760776952507578651405618216504779945736760856433526347237980076786027307666785673805176780505
-2608019170724255979187609288672429113478903050968752935506997075853793110328285209939065370268834945095553185289660445134585271
-5934178091636548622002305410563118241322636012045119794891759960583808782939464117247149044590174301040963274743429124451974081
-9822212841254646950102433569804383682318140936706127266382165162763534213426673482380144302560262856995513292329891211427952322
-4939074943058922639133209628604240951813644498408022254626546671648111368884617471264005460319454857408802054462873323814596304
-3567851550694955955743156890344607975932611999373517821856035756405925438219730313496771878294219292907299376903706456079314724
-4355891716120089571168867921156570013309057339164893294310027619061553640293850173132141828093723591781265620877693908024633891
-3432150765823697928455051347308237232788126878764759364421680111689906395962403729413891780224106047993476140159348719814489238
-0234684991575714928121012708547654894568292786765465546202194583822334911755447378931758555122045328265456840620648627956740582
-6213762564459648735386518381734716590458385722741140951208497160837103126054522292981022939593107580769282971517719856277138950
-9795430658880195944561326976463238641719113418421451290008508454179670774519228875316092692131997401436104108663905564902246214
-9652373982485787988119955149332007099514930250170109206849474570844779657182243727422415156736246473756296181666403081597210612
-6363221919442807657179269261813196315614323943076172547080772762082497876523976444410926957078802241443845971487934887307740781
-8442538716705496485993660458983193034639571775952652456130115624584796446966906201307091498198760859970990751619599499849168922
-7540755071266549940783200519568012630337075342163311989445430751720634069245959298519839175642543857453232073106471321794307960
-1699245059009156264426959609151370644710641713396754020166970217700932248280718651485571836633670709702375632170998942628345680
-0816396190588432801059693946646313280382672711087244012208759747817406868034578850546787526313820913242493648577159472787123381
-0759322746357530465987827894614798343895157467747058744481984104257507440485290934854164189380366013210043776529824930881371048
-6385658080000822018084506735695449199723297410443658699992360702264595362859622022028092450523165950738306668328519968101921178
-9290969633149036611961423129438616262578501454017560337962795366936304454531175225394994520495848281893733418969823834849646325
-4866905011511861701376543806753349151579844197278285044705460570867283644779510401658626041128258372474841328027560368075591684
-4097340967374048459759351247293757377219970623863320131555594933368226711740987383236414710324945367020743532195606500683770435
-8777289231702354648686196142357855572861820397757772835817870476148855333166772599103631182225390962911857675993162562793056451
-1643701292272316612682496492137369576459996136135417810378930005125534965897227946840522877611416279622753205256995171831362038
-0366738891350724663780781742018384952618867530073606447030185424566647732433327301660674858875240792034393577096349757765316310
-8289591408206074373434407333542355057011414872348953466323958988208406535831896578204946085981588003478321397316316325936083627
-9704718565559121039339280928457498417206123777131839564784077774260566019404908403357317188872113841441577298919813210986548633
-9293886303171570837540716535349361584600602170148405662530496205079833641395026663688854207586823003823193883976384903470625532
-1727675041270249998973772127828169098733155135266069947499638944765750528948036161984830730668217006998355034769138526948886812
-0092789759212121413625842309085282315688319684507180858726957280563112424218015623004324904038907228951254860936129174811193610
-7248502251808372373101361237612617365642190393287142805878594705588056326330546884029678052177636399750149538893582015648656691
-3367150919108114535725714981888781359653934702237037159199343298241562681613327166427987327289684634196866794561168570101129576
-3376393226054192039386172081865991731275655717454440752850294664224843539838937920883445641690602345087514795742186569107517414
-3623971382393048718491241619316545941650237621831224965329865224908967972818626887372855949653336237529478398264567160685068577
-4052813893095863733367924664141451148648087387776942749014403408537141959668060633169208644494300366994545481397333067992909358
-0667669402093903159518564734675653958529086910570255872008713355774046040785518290333034404789497402572158389475386895486868259
-7468963766629011848413788837165962853506507117471181320045844652746289086413801588758664510368868946415159144280007188633881726
-7244685543653493127669292847190750279258471265994953355225441242455255911176450067019362851931161106818923851255323971731656588
-5234890473800747514454607303289634698091529945347698407177688996229422965619449293992367330399443066079751703944482713291326343
-6459044264277571164204689989304404957960666476059760392612837445978755062781098058819661144475485054149528425812865761888665230
-4335062014272927898970122302854052906295227383275313276798239957308395793035503825814636802802824167294443473540831595897555019
-7272548964073946058176039524239703608785612474858328053422538963447385787828187985994849316214926394617015487472147004996421715
-5996250931763812814551030631847429127490485716717613966608339966170653265360723312151608339298980087240888475983661731432872181
-2297536852364764322872184823063403907099469015512172454623275616030363118664676670421610327708607480232788374190290021972622793
-6341746181410744070773088966325798253704849845010112635545932402181743821794042899160348845322610793015131752714444557452077603
-0974929188283489944704823132680006629007254931129889666199080416689925517182595848963795936091170595822025233402048475030835352
-6345563891720858751435127759306670956633219054037703933137927110019397801896389210768937954353107771885376564624836527498565777
-7406605189056950050564580620487220225704555865872099535962165458171814654057503675391062376917680202395298499820248250031013118
-9646002186451042668001138188414741520592517338749162144757726571293411846579111672780359450504540363461450479439757376293399965
-5620887367929571798109873216776069586763980872092222280624201174614361433514239488022226011723867237579885237366697226018636145
-7658816676965243906096876039909445364177324988679848256414790985301032302828151276736018655718069421805321528401722943260148087
-3504531887253350368429518151187892137924735559724530027941664978322897818820489478004391185810494126054267658700325358193119630
-6476950573687760010199531144942136546086284325150545828401223666989902218958065517474495615521528611225439578736181496123291235
-8141273699960775743878136458997315091877968088833966155435545803714212437024032432947661397098373986850161208575249088483734667
-7526564869781879172205819920641629162261070844597301726270751056013595355206013946667713217060767795442616244184317275433955181
-6807778755059399042252363801724898729347456888637350665052001794960468288523356956423878794195125458046129085019792922364372832
-9606605635909164393346308754559022246397895156754911940817409436883533684563312856180585298884265000503280045621922703129043223
-1353282688124152832117904166784884443448057703427122162928095824570260033806131301099883014390489674198929314751517488130229287
-3941712694041861559776002423763440625536805158907454771393762216105225325673929237051966211204216493810015246774275044495594616
-3694132772158289887311123798026659094603586436166517150338257882694213224057803554027693325965893134619716724281180373864668897
-0965421930380580362871564338408316626579345707567981028006568747619015807088576948951469852219385041334895298633260796214042764
-4365061209195177145333592267894941789748549729388820653503884365772532158665492262305741107905299439181875779535940222413616201
-7002692668339856374514202085788525299569973429859432424389034479629705876996023622182434169328690891870930429505413389490533136
-4295933444463189433951574721728951160043627069745406122977006157620687110134601604174649175489421916452229565760756130297102064
-1960368933597422050626608328849588309269037647433491188814133197810733941601294848194060829957660144812059760171213031036827489
-5163673581923411040228773859014781426438397455478270422462230943695383387244412044104565525899545629313341781559828594738866880
-9340062964014870509227099698887936675774112546104074153547361150335199188541340855227153532746778775047019132401967059701871242
-3486224254115155530038741441994666898680466167832566881940775772365423817200581937154559007068187829334117784945473428671685916
-6007443619236946702946484250753989318115938165448366527641686620981129998037010871500824063178061129082786722904909804168031283
-5077049104333703032159256335893142225775472800145797927383645074150506549583979834771372332786212436563421519736302401896553214
-9328253090460566002578048864828230612968529907510194421722878024618561333479693530779323192843841998003032594026649617397117033
-6902940885468724446328665796554679901999854957523032465138455983570952184108442966984143957137952183112915545991326476857170678
-1147940566264959316051371696041947904637481710293264721589819021588178200143221071704512368347198312678908673679523259812561827
-1664627873674389755627490418493705966611982979380988314739579220409030725477944088566536789756067951060713524593551031845158984
-3598081566704365022254984411009080907751257030857437625615151390400729972784657938585703465777027605245686537246903748184890274
-3743523412032108137414706768919475408652123860125336712812291505493576913938367683595349130153523703056997225766687176144402340
-0831940301479210349558229457276992358900461281585291044594812536347699257011182959431429011534075284989504481274394019519138849
-5294182590907051056305209676408046536522421503936187377406071503791132907536141109384530248717758304915645762984125835020638228
-2925263782209751558565689180869492270244285946019041108330056058905348740666223484108200048676063426609063511425234359377856803
-5066811579460770402822516077692569897555102184861090248580603480179709451447581598869819018321983813091599472628576647298283510
-6074763977940235151776420120127969582510026900568916108091774893522283047922950769687105424389690185426520673414305707753060144
-1829809239775426957360751626081187328513913192137296926783947378382044283754109795780048763911203026361961183033933012273700578
-6256148707335785289325167505290076615535370263567053348838880542975561767345020465640090418173271179915907484593965695502745441
-2416400711412329501943051474827325196149637971289654356289167838113336024091716837472756809029018726324544210527893716549434408
-2077670900805210878733285491095692143052856294682669529394939361462198474814099442765549871744436963471806447226559851872954947
-9082929602325709346337243734095265641562540772131425161193766826203999287761238275537747088073534676484013517045928815906520421
-5721840157618684926859754448303249283214882375060250302441861554867804071849460117284782240184817225436567120551507130457965054
-3640323862784940017360312940091490694469989530945043763136591022334344797040629558445856236949010602808244365211211804494530091
-6701192226260174575156745632984043284760428280836716963199179332091776863302070789290228857289693019520852953529236479717683160
-7117865720410815041230240613271283107726446255341876904224653305719269008887983911844926604802435682901331270611392890319564523
-6692783449614566649026808017316150504276465383033625466313163064737973819404507236614011588134611220037079763294452798973884759
-0914820111491787540225084826895277018554164459289529667607470230351077932208310255555375301186238522549530796497320559115264320
-5836662613656654780353360816866098001238641884282152191319830259179620144977780872729828947449487560906147944637380292807461055
-6561572680280173994959056296932010485999239763428796091258639640337313710982242786240160248574519338042692530967139936885572234
-2825509566854748807330632140109077953768464116764873006974740017020211637781546586566316927017884251448954820201170637677959988
-0832497323156260043765386414739221132824464852853436205409279663532624738981652928962852787063322728977472723705113895939816648
-3887836720640005567311856937351200913471468555895780989932698604802967755682558413334239668009044766569135994431992317817193615
-9488541867758126379374062288207207762501971013768400508156207999323493728384215408284344930017408986904527951285518045057193770
-1193456086093196883061110691053041347131507623254475732487481683124957212918787096719880296652189465479161772651216902388161935
-9023602670135872848924155417498176225830627494225163432154996996459879170929691453342113731711303819248475466023815067381174572
-2080493294756115922317931111866355542145263306791051695700043555158422272380979294286809277064163627702612725392431921737967789
-5506584820111354803017904304944193794950330337626863953844116710622843699200721933361001889997152111163384731679702997569228667
-4453953407265344555661480951607569587119336749659238396970668832430048807500071385571032957421002113212240607304287845329689873
-9400568404300352678168177542306869394633571699501805048687025644577243527012594817839631515308187464636399822139186673563109194
-0383996386779379889997394025888104236940479474160100383602505977089098334042031033748699121508022116963448387393566265472288965
-0847531693445140037287515174964594859379085364324835476807557964238229721804605800683718605401718393447954937423707976551995646
-8901279644569224520056558762822223149315014455057454435980383798016264269841766056870811144787284148299586773970705052525539895
-0256120889703056267161520334600912740468642740690884187820554569479971860126461193414499951106260376564440623032634236822171234
-9700910582776001785061958742334821043319568168457980526939228569330951842352229610659307009566518307187068255993195333178816924
-8084009439471986482548298108494644279210299285939700414080731141355145274821687079465639330167799278714667429384500519830074150
-7502762255088959326392982513450122047410180131292434743496089993750128169949631240918611287380175422097126458912263961350683605
-9825024574318602570230904976205086057242856859840660113304499069379218541308171998260227484149937812807157987838492362751492073
-5236013621279011602439272005713397632062733928777510296548649421999353087528124960783236699168282936749555076309059950538448044
-6316174264399599155501461815935271957641181470379962431535756895151732821144407472754664303419949275610161730902538833181412620
-4057262138394989003315257406621046570918156102356055537411042166653273066886196141130782850554134831168704085162214611295749827
-1728494807516097505065593608124398864640297391491113562997206711322054216710834884111534067711304959653237337706486015754839628
-5402941401919360128506367871554679221289967323748328989926516006333132440966780154068277893259475878724270654107817685397502294
-5331749302510962305291613004333202326722920832094875206002590142911609625146433305314091631233538797653208605364527924132244946
-6532771118816432093996083328883576769019322364788699903259151365484388584381218032915424365355589731770063912720956702509258388
-3882789530639893098899335537330679624810372563783381211488557543067129370526059579061942074775015254040779746533167078485769900
-3805020437690986060459807837031266916198079638277454221416718947378635541609908151334933790442634344916435987118766221380030868
-1492873283652410067454455812350782971829174602968575413579966330593167559586103530053302924740897504468176712345572924410751989
-1402681422012394852214397745855323854981769611609240399129690457712558487768725787104039715649959552365787249656873757201153712
-7034615208236270834171130441362610841044504351389336191409989539270321328989800821619371048375553928712514470949748975085093770
-4290878195796201049040671016672715493368576254144716365945552067883559930088219118750514982822693100430367769784775351909372687
-4911033872681823931983855759969195568792322301570737362071175550474999508803728901587248248809147697357896852570255543589500900
-1706971004869558605860088419347382200967993695904618287963224847080176675951145483137675636512072408162582506993137174472960694
-5573663486380813348973168761749599259962367833751791115712074445847171992391927789752756447549332777671869328971664763925290830
-3549115232652328982096333522858191070453865857146234126898896140406643330756492575988127393599824952457257137615690188707592890
-1525981890012719417710592274397314151142262744434946961995671692595224961001445969622314797497698000523423663899015096913051877
-5058249696800337974138653960205886721218275906496709288754537792787671454609339328245451684579097878838116584542322616579053187
-8462720851869420776547815997374420654356793047547706068426425982466357700923014078111329124212863212450480733486009748682342594
-8687099289779458763026259506520765785275805315714163404563447144528065795533004752634001703743154416316364697795177031670571395
-7862389886797621228571167458335190181377137309906389411269247283889070732381228453233824760431622453252798014077600435024553202
-9884611862481302466807813924732912660462964877829202613446787892509006450191623119538981968974508042576824347741032177030382425
-3275371888164672951716608075300420614160898739974183834737152799222716640347298255880801705875381815950138367820787575063612645
-9756093031018363423853254508819810837905492342390007409090686184553436757595124339753724654015162734521998021981012802729263275
-3427616385168365599989752741868814273183927471411894804297652680678085002922251517971806076560284843234235639397961184180625624
-1126099034992853577542894567722591646934072315106827450408752081909824273574814734547622072209980280969251694858199479989346866
-8324744163428589301098203537736106384602289116499145216551769186060030444438336222899526023763743834415207190662514180019708518
-9860319477002084962218177584666884101089885263708103715532250072465740590415811526551340778700948662719303811079801949032990730
-9442895797928578191430950680716135775881506952099465712614129706777971670822951940768332168877767587109595551931372470789023062
-9676406861977772053008009279919036888396717196766804819265649832410502497794545528956267262992497398344695416980354321065043902
-3430450368036376703613028439245508507778168871582511449294099014869582746432398446542812126358198966694091267937409209466063739
-3928978146389085853115437005111689057451518521401216175319263947818787743509560003599577334399518674836615112723186476720359894
-4447676769726440097553180938842032872197723469668279942479093598413513198335476789357764400869873866217837103053672831807359964
-9438439139166494727711797686854076602382501450775000543946895474100528401256910882752544466058353451178988269998012104071279388
-6796506900519353467866660536525382267232333410870940350598284296015115345501330091034294987205096937204489666809908368374224287
-2156069024262468587697645236488193119228612123037868983120993219205723939445417381491095019098927648926035392978843470867760614
-7821524721406495642677263766762922840188657758664683038649201210659149304382137313140079079190066786903508941027377579459577045
-2846438208088991099137843881611431007996513901288343001595074297103385844197112994321057890476648269334831505632974358825733750
-1231729513446989718094794150861322831069880594276720936717092445853573977523050237490193119260788535329095088882720971495287598
-6552792304258966749461747651069123750999083956204720301600561922121624443601785058830034234673249878353748610370038504030736047
-4350618220429461920496227812205841572163867546971596032105207072905191109123570652010474485250661135080242831754570708916683989
-3648963905128198988374985403745574043149005801382728738825016196793544318399117519577715497903566248991289200713376389062963733
-9079224255192675318799042558252967439629275533715026478752109034505102371733784051667760885774671501306079109448761994271014212
-1512159183483513720286072997122368280567403105173759926916954869853277451339001028186617037332009159449259382498277868408842981
-5560323178755830694146107056035341050323807669577457330458808700666012312546070466530820114714620579338594279601664840585122075
-1503852393417110615057020185323349829356846940778480270527833679702648854699330937650632301666517518142397830288536621388668145
-3710500442232649775196536006291799614616427004022039024161898799546077671371127704078583325133930080437162856065176543455363091
-9667028302235222877392627005222715604718844825560371250888081705125248380997161235203510947690674677658525524540413177350345055
-1651124581699981562124791312861972388295643691956825406823017359302629847041679857625842731954319702741028762561310737659882575
-7234973146912955319568057648697281752581304980681832088301794847222733894976160526360976917273669474157112988773823160903919773
-7236452528456462658486826400719408745377253190375111579049732814880300278553197889206203166333133501206064778109147665779882391
-7682375338032730875672864027350071637472437979382544031201751667224513438710165103834022186623616196654886225240056588996350179
-0853897451837131243025169955161135908558413022976148659863288496875873894764829106676107357256982339087954980489000376844916919
-8360603574420141848805577433559168689130304284043047944444385048148193572183817853604188280975779635124804366554607129505815592
-5620546941760373757081442569363535705009166704002199788324439031196454334794954999272772623824166956059123197810751221134756232
-8439866566091270892187388961159863817415914847036125600694319372852752155914048990490541073567566380258061226260248539927574844
-3029318850407273236073024405659942071591211229297986931569472429177060698779317028894343293006454758184946754805713329630249820
-2687678405796666588388227397973494711846620655765600330508932225839545844068520955016865194693435829894249625192750034081363961
-0826642719445444861688478619229100303043863369218122546764063288271554588608667295145429271395132923307142550915748046259216532
-0468573883399305338589054269280928735368128284996899601120318736730996079626128417354949909634397399033464297120851931573621836
-3410567460401768661525344506338831729399382001213762232285178082217011433200810491330007874531405259479829710109345021089321397
-4652171379208756546308171186440327278368902304830062446989533198226580273246735128676055302820200408293662986737676930578153746
-2150739333645551554065559172680067798805779396460259578671413082802669062176930977818789038399646027209326563780688854879437364
-5947149323195596075203471654735880096964253215673415065855952449622950653788545812330777657299303345667765138612882163698466977
-2308935140239438613941108953213493640813697893782475635075053824082277617694735156671731366529539638010664196515846143425205110
-8579861845970706058547725114635120976593327222009873742050798971923964666256857891243866172081317410728590091574945331275284201
-6824605749924142731964725200957618055202505975317938345133949930752079669713432776367891693447902213677009365812998801001720273
-9233059182009261025428591058709759978362385968915457411652886788541048883340218037203772730667179361924214082717915090369829831
-2313518106392278036401430877932921941234750269539064717318812526416633477902124303231275087598527988161235948020286385526463743
-3838476810771838510370563675061364260967203242139687527568417240328961372800287193798489828795160993501686735937478711295496291
-1519858055532723186083206022574209495517859134830555261865370844903580200999194798031588523243896559267197627522165919682799739
-9373974604821907639636032716761671130085088834596447375314712571767917652624045445822422980937123575808022402072804691330745798
-1179538903767384713618264919378659303577920743409425206952169277638505227558099310711226481165660388253070855325241107221381882
-1789290788643749161623308260296145948321831584631161915478987224126348775962249568727630631570400533850489485693171250304745466
-6433974998050768158826396562741859990471614366251286876757878787725794466582791436968613297526831824776182286993388108679611273
-6110623308937612049537824555231489221014173246666865428966654501963681680683054782880195354576356714786682961340119163196471017
-7065396261977852039518801715732959486507529242741135438482938793950709913003256496248997903954928882444470989824659787821204683
-9252764834270969572461432198412629509667322770306467304657216423067070489844755342237360066917220335677138645076622463524222641
-2863822477918798068216749348395676325852006154849615936810666235080045937062299799315963185719888255745874252084645488043646414
-7004033498629565919058730350299817723186869899372617107591275993421694639356397475575742082851089041949288607800654160534708316
-4190299271083535674187523239133194914262331993315335908926599556351517813335151871562105201268635100775530492262605262924734429
-9412474523205479108160235037378746252342301320435142535429384588026050874475919119800213524490595720796240406073642925771858154
-2913084106745765525951041794109785827673640207212541754087108553407118981892598453634040675583256537303820724542193091642590800
-6534476025728340988278166932729090239881218889572681282009000341783806869952125287383734393447529192404697677486779298438469322
-2829214412991708861478313576349293840205174852775802339069812401323737815710652651384534932732051408295532745074816386764349267
-7099631393624915897100017625766879968866232677413779562258136847735611193368355358377164844416154018729080207420593111993431521
-9679117084184583456113996444214687961259734088670459741393316532022602071869803421115792325270648228861169427886111180946003583
-9793622141632553469977231970499144123659775068372909299552862631976151882730222347477076919808461706462627308819362671717147651
-8286017842303147776294340423265613507963077365773181170674484922475010476392279295555883161702991597407378465228254838715678283
-7139981166981912432328248939664037584747665029041762831645786266577343138070260044935844528507385472563673503510303215480074901
-6952789894317576895242795097137355300336216988450939924501915977563360873810170551299455217264567889345472118057178061331257728
-1694193485067381935776175208128377412895577843695434073687471815717642677045054952476930977756497488385115713913555764776948263
-2231234433522295956531798985522781927112508008839457523109337600193193052076325806292222155384767900607744680674492935529295805
-7875818939048046279625548208487559794494231792862975497567734812838016356460114239167085114060525364762528245992233228644094327
-5021327908105698731349894818836329218148701613108177279681910593746940136925470307141167410364253643713010143547929247739518061
-9070977175221547245640857484222877237472955055880739878012461158071643167060432840330043982130511367475881160956788509827952621
-3413847694252380420294340031416724229995257917239755969134460592475590887547733435481300484633477930736275363875263891668995643
-6581430213176248276716948697514387283511867935196454364984608140452221982505162813367283133818168866214263555481101556955727420
-0078360325719735185976311476426092189177189796469613813653608015870137963763116020948507804890688620493269983909621885486957143
-5618073667256477516793467657312199638612399475873899685969826531992817695372605952175192740133201709617218497592077143464993595
-9686528263740598514413702973825670801929614448327903726180967797157579946183718568106283503561970266617924646393019216381949796
-7239480687825534075396618625255444191589146664116441837547061247242846107878949219756732241373337771333630723471570758001480280
-2126415066562760335451168640052256439621013367706107505889219639609857343988288214828754545448713238798703235273922756046005812
-0281498418252644767093639973704165385252675952065796869316299823450944375075913221341612192647317518382010547568017829174497579
-1057968057525848488438423398887379257534282986505898261044295544509349907137424691109525427205047296410961152317113953498675027
-8037990675600906293845109738467043233236225877257801109348395466430705164075214123065322814006154190811607337254708305938085250
-7210750787555252394437778367913891376849871377061775971887348544361550409572803722815881181222850658661431069707417398802536368
-3948215469610248733031315237243553696794016591253408216711885250561262516305255457076505242344244633141474145222490778655694723
-6617637025342831507631846476937783337058482960397621355078541340935495458638237325584632545957068938913331687735591931648307374
-8523372206558862816505119548118888594916440410353297374883874035661877591624592793870237386066600870369847319996357899821848884
-2706665246531670922861049993051412169291896643639078882262700663889473964251112689202969447822598990637782956377227324903867608
-4848299459820567898610921948177867341511272056149848749209193175952272681698383112955078617288403697439760095671946801857673079
-1356542472568516852079785586485413072353853487441642185000260635680413178133480855130718255056119475830508178140915142512386038
-6695877448601376560251771173382757011161242171039619918232438391997384640483554361477105518555170292200647684746099630559477876
-3728050473071484393708670159181207753885192509059591605951929761162380613874243004953769191772521075466929499282741107419333117
-7606734018487546777450475520310398974869459655169606480072758933265326533542081878074199816338268783853568241202511239916973258
-1633835831994903654810299535109070687398984404650301845605445387393310102422388713024846802629758902868815270339924811537344859
-8928571046801342106880818013492293682607259787490363620233716285093685649713330924728743681650501355104561967670012038426873625
-9125730098479474089046067867529096250921613432172766348896492595710398358975815806788579245423344223729093128465048555061302778
-3282236766431701005576011421891586267683372954054171332350103840612998244535378427127331925639537865313201470923709392166490250
-0060953065190643840375181038485605085116833098863859869877736596835368776079089936760138916464834786551291455693169964704950417
-7199761056487159527818318808980388404160177710661891595418127883387542011797165555082211982772990941128288012248134317959535274
-3151702008500412396300814816932022272142827209737059555958537947102106965289850740478085447869942031637107833939492398930644696
-5466978918720768258413199259613003866496795654264247159666752558539556973496507886748391341566752558990139978324598436936793928
-7875629494705039695595741518975797423129800053333398650746169290789301147238968164288511049704954808998463415048261417058627843
-3675014761845381637345570687526385375856012330298649384510964329070850231207976330807099687112778366295062201878036276787748707
-4186642715813159153197640948334883431130155154184492235081536887094317988019087470651733545171824399201735161775652002448517265
-4661100517204949080442753518341612732523752379970048081237708561434446413436675964518402865361477156495973338379138615279891674
-3104047228288563492721376497746751756302186258285396146017997376211045579689813619459200950120798719227167890408329425880640799
-8361120737152440781721610389840480574105404073477545436637229579684528270718993412816918987324414005130598864358095704485655816
-2635022304411690520549036888248912012839104866750669849182202670549996591599148236127250813538958602763034624939004690945598644
-7161693686069093177957527866565203934639363610988615731752113714098234889877144865056494208717095238090181742851725619039913679
-7926731919437873880030756176008264549114452715998481120029937345677673326677605995613852123446385084312717926880869469763207023
-2138495852046091769881664603146562927499752742224823433380060312750362684368906102817542844818392822621059272739767561472497448
-3487585927757204836571198808541456058695288628326581580540815649602826692062251298954681717253220499784757374087955966951533070
-4467286406109149470022526422047665420981641926169730080064026643952810388751979407214952628713107539097869076094466606508205808
-0329251645328585224993793572099403208481085245076448698022757086335438075955415420248533451214205820043135499362946801092902796
-0976117055234786919615481110380099853162437989837673156044051970682580784609511428623279845514623277521398030431160849037450740
-8697358783561542570626868871304762629606530282055602229180460161462702998318108546783149370269213126706148977779508293460733304
-5685401232626893164468498498310349947377219975132662081047738432680920912627837266028376099158214591714411685177672935669560017
-1991014855525662209159171891334726717439346791115150429082237201563017187579488089876803702248258879215762021955798945536843228
-3358779497231258973228903279307787602968091467986183211284685640196892409994105852728310998830904989480714242762651865855421586
-5348281152141939663360571564939207399533427205490276937846050282692131755481373457167966144301656498283646918663467663563230116
-0442219576879355438661813222738756969322895770177941048443578213219939881424295242319200710244313116242014329915750902609753298
-6880215129386746871145799105266743824027120004725079746962555401718867449525806260178086747751584880447035314395435465651034570
-5590819486053989106201536213480377379276227468376756122798396628016810991489235173054754920663273388709967201645610835786499004
-9939124283008389379680409146709896607754411605235108861950292912142332714272148567105156028757875660670111321491114463297009230
-2097548826892083113543893580713808393001576983724545670281722041343097928800752617116438879952016563025042978404320211936405203
-6082731184886898638758782020161455765775544117220425974704422223842521161418889571069655363278462600259872240060382048674290190
-2889620681353481574769346958935531281292735580442822115141047535414968598234054161580569343948696497621906027825367798221210232
-0975609392326975398368477771498401808897612300017559800926232766502316691201583773217274029458304062931758320244725915302928993
-2656060793106179140097207671393073878144623719159743370358884637219392258120064605880204498430784571518779561821815030688040645
-5261532754299991261842655852754335348627643855237017342819255089240352732014055394202970458645445920979909498339363437891353307
-2437642062562451324051185886722830951326647012880268770841964036842838215823451274151497274115272960818748924818830295293023164
-6427726746699539771500247174272715628837777269348318525014112099038948379809971189523179740600410427829712055609005231760641337
-2123549160662241455227582001148252334968910254759170985955722387116765936697038502260200822286774138322324033501219326909463806
-0821193700130194457116090490985590394866182284594574006494500813138155877966705322490599457628280712279954157952750704655060385
-3280391474844631197279842080980749627555722515522776772617462578270115902754706089142103829738218939451926197117850790818482759
-1294311329582945102206118794968530880988413255047180804846373165792608079444603588122636074961065406623564621335429415769062656
-8977139076449153307860216027207885939587708357239425724499000050811065643249463642868728678159848609219920477201880783130814232
-6033248813331250043643381559597258568598550852601730339407737331740193572873459479638405202147132462334764720678461849283231967
-5244706826495860145056785602766589976181173320167438082817365766859974115630195914700440671364272919565408159761417527099133015
-5244648245024168084347025892989203801674105350823195087890804798433093162301085522657402786073312465657131861678950736152896502
-7020998265858326008838932594312667517103689364315007929663379806725932670838335332530002316590322181497959301133051038639381171
-3173858772156448895864459261457987925785493055610741437909826143835126197998316368571824712159171580331713288750535891179500215
-2461289349520625956975133669730507522155477555105599302736241191876700580974296813158063100071375109901417730679844357856593047
-7673877787687493268983420698315905381260558449663590054448103444553449366277579160597491777336624754840213430260072450113764481
-2114017564926717940676432504294232477129802350412122813350795229854770687737407776153546967564248142801354985562159014016660409
-7639567903574424627121988012936196690968952173335045547572877439937623104537739475753166073603089257419976655666993295754279243
-5512010810515840583007802011584440810442039388430026796415104195890917308156926213851922793907826473532250186114497099571038088
-1090443322487112398586196562777035714693242567109619766467418285811180453954969091778067062185341924208029182725946749209676264
-9663462321929487207790152045012463956298339314526151434668136673612071349597053270833334450801647517402244793354108502290993012
-7465047517200443480317342789716535487720038254767800382013521445375492608318405493546080410946096145404154482214436078102318897
-3241343339884810074493047134584332154632775327907375423171218727031001503885369275032870180181698599353279959939076928392091092
-3566208126745756363429701058439360596278930537654250601183842796400352091131220495755538686838579076983412474092980588063067246
-4135280622573899686743659033428766204732217042537180031329938266218979406566474637509065330050474399644477629470645922989131608
-7243489726801527985565622807882110752891684081535249425920277363697188485817835521822988850811873532635201983418016593214492469
-8143017528502801938786431108109170005870927726570176129291655180782741998755590156671788445329312481442984040900285747284336895
-5565100360014106030272353666080827357535103165363399802552515662750922553611500390854921288593734087100792149327574407938377815
-4240318921296779247997230590857031671134516419731819431863267883435154179769593315054293181367248263035923946261410558920492931
-3065344926131172598974832603770803242453631170305261893085619634353617662701712503317939637731383890741691116709803904180847998
-9640635307154881695674450558215122808610162087865073261126743708282066313632270460083280371892143332906784831299555537946109939
-0645039315913940793949968013785570770789031780794104310782057130859521600859343415595288573910289771410236190253921849657190998
-2817116940059523621717397073394274259776453515913607417038665482821641102656240840561075406926383495205691566077252073640483438
-6876828215210014803339974347992473188369840859181281062746399956666218336920552262054357048613213862945863515439475503711072752
-1206178405392180823761458212656703549891855527651389518191357531805984535259972031066177734136716154598488260571189715523538978
-4990265766954047391630449528696946350646833442858182431131915610086870866589089866607870181211091256487223226710174280311854030
-6161821498017905298626518871081902325899313379230902725132275803649959728622670760552023317532682229232464170889758455581169141
-2416184842590677978922625659052895162548385411298782741233394356631320019382233371212037232115448059660819419247622831630454503
-8975030577721689746153882576268854827896373568358085985637110827886139292888578025729952622899410488518168089967179203288999038
-0077221628423351964468120440528719933928163566191359047160562478933063353123985611799118577768774930246047770557959247998776831
-1721135782157358288734205102478591394569267133297228431858377971925993589071779657700502192679741782178657102555324869244446359
-7869917278483084269980405860197759252589350638010408763257025389708116328761797581159680452123249311643134587279719495772936617
-8130672462738712860454774853313086658312258840823449860002088944658955778609509469061098214154416089413962879973327200377762688
-8704019840879290058261002736123709853095591291334597972059260229183193853550672628813904508834589255323455601476677738648315934
-3234707347670711573887321944356094703845291499731243740116195333742959154260950396149564697796845304852992191344817095433298019
-4556001053283765367945967785584518418747873282740299536406596053579536242035383267115157980628785476579854884310834210027387315
-3952399660098012461635956108592408478331533765191761940733106633178973207757390760027945616808844645166556348572120907508405281
-9620717181599113391181876705169833156639227504083941308593882555592005786644351550764764616222603704206370090556397818828816448
-1082150428965180471148236660642979232846204673076692680655912004876027643170213363695294926023526278443457817518033465638673749
-5350172689969152071949149368789531895369178652578561324968877842847433493285130074155790255799028895045897756190837543509860775
-8482306198938020753154634340975595193686061652677880586337892305604321362120530299145893988789835870281018804163394448979511499
-7488870885383052769468046156937025798795341295237597526911841052145121608390932943180983640617731865473642038426653712735002335
-9011612227214170561522052833657180847394409367216727282193072678838450183604374539578667642858779645471672950276478435834423943
-0042627888400396166577808028511674909710254329416152368725303977021338640330576476481308582201268866056584880471857573435293178
-9268879578435020158729300163317051184609265956929202720052876516659404370185319984314639348524347471621091689443144604058655054
-5852357719309697687694316961668030847489545691322959818739069805501234210837740692288860145679956618287254425865421435945272722
-7947183003454715593442541393266684657719476151125892217474788448864376694397034056195614730803146207684810002655419508268188406
-0212392708824827732017576889397138488570370042723523923833128481673477500325568912519958461261978143669880070457987816169424188
-1965090700335288348865794109082688653306331467742286624350702924857750689705564771477934006408695884251431946386364556639034176
-6475202723487206164676214732339055881658522754087991356304799053722702797567004357975452415295767243300651018833595864642447417
-4933751846153559955643592816488612142322342560545913045826692544542626150928640726729092043333739064265750508139974673275834713
-2427576527067163076789990338481516933446902541780767233056948866977560689363984682741766823172377515643032993191346658956321461
-7240324801931427740710853207105854320415521035336023346171992089619399728628105888007254180361185035803733126321368733856723085
-1503702321045090573654976317248889826950138261936742489712456263150062608622387827772363799121813242734818379753299053724286228
-5076095412377646585652542244868299631686826272014334350505998081702990345584728215380800687580035780236658004071510394469994071
-9933250676927268802066614172669848689165401909644815070604643321993975291059605403370117318954869373816750869659405704139511279
-1490487519262534395623800813247168885091994099496258142463552140723866858712657283749576144012562970919330051773400199590563572
-8265606609996094143464919138293434901647769730550988047626306005465014764814728223656959001378552960458572921902571777313119856
-0301901698751025073371353819870024706444286250847057963018585025053110220589734085318599463450687736352183212884401020231957087
-4456959908526601850236631528599915374848039675582388183944917813443948321814362879113998039695208714072018715891598727749400184
-7983572039054110543265312946188122716587941443406593149730482849110607363599698686119685785597056173835119438876589991354302327
-0157777305454082280716591110467065838967277498987788761274920512893356487762316080383017175970582934458813655903151031833258038
-6820568297362586686149767416323236376371752928724979488399337093603770184434877480032885947231535650930077949030676059598788698
-8108972963805156390445400882624903314064494634772981427763122632358977184343156109534055951999238879890515883719506599847044143
-5178486334616508289086769240536520705517396788807705586482419714104331671474772634945045486037353039747544411584344166691513962
-8343543694892040940224135766807400138072678909751563547074645700842179499138145819361180694589974178543789544801347334713872045
-9708545131525935820756667264787954116125739691093797584888706242100925330533736446977764101332858478855148268301440155677807429
-8363906279880507853775707450188819239306527160717217937065519073363784713378967477694756526571005707114651691767780955073859818
-5651083308096512159550753176200623584419958971162109603579598590262428369134046173758247656339396228143231420340091898293104843
-4302402395996304257050404831355580727247848379655438560342120245630874884033522016540414633929586663157231554069390318916865498
-2822530065271711681487170629161962249557718383135273443686990757846857063424817696146359531243469019949939521304535035359286967
-4074330918579124906980668220696463605660380759667033381676449310911291881680221895239419422515427861193964219305035700436309668
-3698935243696912496491762756802269973014707849066246048122302860046406677238810686973357352423777172732249145383686882436002629
-2170964033471347644711273905006241361125626168342597916481066003694402986372839549149179850327741026797871619199281396638967050
-3740578777458341247832731137954141104761544067127564384269992513879476807275980026551471675919580563967451050762083496336212971
-7234069436162575416758566662736313504628826119312240011212647893254386199394411434394192850902621006968244175625150393585420756
-0819505443586556219267270131584242241933754418772049304646166400049758424842433111724173775260453475529050201556290830854251309
-8694504279853225298817987700209881068598742151871017058490633074185456825579641586256200310473031416146096103034054724162968499
-1678422417003132262043356103744836118876129032014712571839148276942048121918851516621273265839886300177612597618998212159348375
-2526979362189085413641977979132635792430656327264789820332281372901762624494315668746921549021511066663733746233883697857770994
-0998995661761657851385372991367035240872501467476816162857262794643509591735415040438155899974797001865973911239317650890930815
-0189734426599237495702149267240934080052773268635893422129378135841786547348314154856133018855495625125449892981908291205858083
-1077322089308800545276469380562276682750368988122928137210856581036772006900205486477908581832538965073059726766472615915649559
-7595664231420716081656297104542741477179939201745233207227457362234020070465865805626851389405073254933773440235630530654929440
-4561326689796974026193323140357607026602878702428514108628434286473624453127013395116455824218643518830181373377505009554553648
-5175104916514700448781338224183451234036582197678358641053766734457042147404203339056493172875783393464733980674769043154128903
-9625053130166787806916253108452498110678784874573415439254136465274322837153616892957540974054903367967131773174510386204520192
-4708907023698793329968287054491892003035884220479471761449794976142360667172403302792534515419470234070842851218805657152102504
-5165815294615880424810698811972894519218327570376404414484865603951627216319921021460205245622341179697179353800333764741713858
-3375832459808523959735342163302977206974789134934574309888193442489681770595931407566150654834927560855722717629843449379732533
-0696873250701946777504053721122628669489758761941472800177248115996803185013999823071443413470671100299081264402635064626229095
-8025269049201568533557667082941257090329107268081485134499591411578665111542402290969079825247733361568938034890137999482482426
-8413571137578802277713985161717245739847221863546744280234586017009016274669615970285654793200770322063367655004275873714400764
-0799707402410991916198286689965775278824664119744877317308731118045964149958722032731308079677323234905411311426216785693702443
-4397846375057495792019955808977919911307473873070308655227892822037825751568866737076516050806909779275729314309462325310751161
-5878515311252357335941687228452716020488777361851148660668041257248641752627888839374533734775241618706657533250097255962909759
-7924103963089477116974416014956752830485444377913838660792557425488769129517146048639663168698011387132583363962130759916380103
-8854627858331158799334753893263279859800213644437374816465531701511843970386899153300191498875238863924442400115037208900760391
-6931077305054934679510399257137017692212293765671016977117885559987800112104522229358688690556795828786584220491722127422607686
-1161689224772384204986305992766453244735906304538266466175104130240871760142886069723737054629941552777930420547825827115890782
-1184882323411827620265622192040661772065557335415769691870166844416649885380327832148533301202237904520864333379649271453239928
-2427936123038564183450762355240415926776086706660362490151633725587501086167861442974904906015877742003232322938651897499721504
-7575735828907721001810713381085000197583517056663976862531026160720187808215284714716227545242555746984605470134836970810868686
-7690274030579086519662066594780770842382679015250578750543674207604336237491570959207826549369435808803521562398005006071237827
-1591235570232351829740515082573934645171861807176059621044839781347865804129548447089911918892970375115928184446756254541226685
-2615960213766977626603096139489045595459731295282305420627566186367919926990597793979775395219871115824222384407322704217828184
-7269890378837649922156673232477845852726935996940584696490442582150880559450498906939124023442999694271016368614887466665480687
-2492299648986452580995323839604907135499552296977074591849011346778726414701224990442027943081442825619102646860492552917507521
-1791849743502515995886083914654782544108637930226038487802556564179211481768559160141129157276978288393204371047755590042629364
-2476979194376897909780308753936290021359131405027064825271771828980164040364357335094434041723555965477129434483174161190644661
-8416023154844136801169958073248822091441560069684654659045233353502161929981208692256561137140555110119558013208216615513472071
-8088260724856516409808086622373800856820389920242427841076949364650960501816473316120878023138924750918248626057879988336142195
-8686116426096280530843620941389111299655341997827197141570086674404151699053951971920289530070752071000490045958486626799786432
-6549357623845124371617655875408646869879278421775346320373177073222854384021377119568271293703313232299103659136776571632693838
-6591886804108118051730248844194375009874244915537509136047158661056246282742880964703031154340229700891206754898355101039366979
-7268446901106376070498745112524561027602391892725887518917435705098580461006376837385629028194839014124169131891549609455012171
-2285131899533028794555938374512548939747904214953588004250694538667660139983891321230034509152717542342156366790660293952707870
-7433656872059365457021513060668191880971221287545847083471271690608548455879533083319220177538857519457319889888751900959653068
-9242848205306926609548172769597825608518368367889673409305233019839916718283755877093610440755381268416027885226989117854626319
-8543014996495123544046729990961256012932771211075541381188839964005105738775284593953696325073738652709607173130510895811417458
-1100281056074250163495442070917233405800039282178047058927490789657980634481405379098411400723381012395226453993698124096414583
-1497707784106353163476884094382224594079935684207379351580860836917141337699813295106036949622008098195962892923132082743352822
-0227639803444432864090266134712772762851750164363159986164200332551145986599690734005702172852457747000704439537884708919681464
-3297805927942628853699179019515733067501114704121488080361171310117107236329567894778609250864163044875868270159183178936230020
-5632160100910553597455671868785895773407892040726468337688933116567628214043646404787040937392191211462332257825317687874338725
-2296104873433207092085115555734422123208784998029195153841807872132818719198275132977492788603520666575735728468601968901331765
-8507664661851267844375807200747151263758160914796423476220162799279781135476440706809418288627923653896822426541736985486808537
-8804577755163112469882477676592666556395113447285604375941404675578061757730014398552781158003833295830499727417346600077947853
-5831914326747916706642066586312780276779650520761789440673709492335505292573240738337240722730985752273930258542997960743098240
-0068020053146252182779250786628431011150801984991349353593228652822215156799328870412166924618702218796377703357100331644399678
-8109188902158713215146842638263856459757440491023323555585167449490157093903282451159411558188534514053282926080246371635200972
-1083689238510925211444565358062724034393858074119865447872227462830480815166007221130324188970568012551002420122076677588668537
-8348566408824119448641450955381151117598257925347235252204110951120532544649854733446808547885490496232547849386772180981787081
-4560676276145414580213909440734926632475864478909927595616312861612204269485671554044668485757818928586611911258131650112268582
-6442754729881254198230970045300311192828701003356370115227215491493010569367089158620723231028014912810350816540331381099940995
-2865041663295338237509904105995789610569727200605222728767332785967873952215814407401152907766797309671425581760149058652925760
-4017820912206849712695013871311183547029336150750415340954915312119753021914893470116876327839429907255892388374033828544982922
-6915440546354439943941953788638484102813214756761743923515532313884486004173505190595536349294404018810183152351908266279594331
-2928244470990795144278024903861617956853603900951440210459677120550845092043556188794480813102688176816346489991301120405759270
-1186435866287315352826686449165308561598819563912734578580650689933009781657638259105653726859937343022833693021987646952723005
-8712542566252718904406054272317438859093977264257379132707981296910101101713844533871886378161442772031073848272459192591830784
-1058110999534770164492882010801967465978671453250245066874219221865094533085057504007502380425647847612715483754244102708112443
-1742666667868535721098914454487184166505673192687612783065836658057498575235907333228055857705494275550823062941047285844371213
-4854496575428807093051119901176270909165842784911651361479733219811770760153017103816762799215219103460967340988812865617828044
-1917561105792307812885764646858740340976693913696981626941718101122829669609931847477816007131803415395929587982744622533841587
-9667546614449025826471505952967761841638682554759010436234535597997076544716136876213634826200883843816631177929989595634824997
-9075236896089146108414434690485647098336762127620316996183949539422311636347004018452729032082455756224021955521110115243171929
-7022352504520236787549133408418756692328586206498166126138700604093881377702931259764322041155662852059678496015745189492835117
-7091800587591451755394603236816915477651467511713772374848670866752841854518597403280700140135675063538245814642015579501650431
-3475133641567131461159293976535068676192194831897897611380261311134218099223461446586431446131415308645022873899564559364425282
-3789965382702942084656483383865958903699057640653956948168423022124988840895696969117651267238844593486453639829783832289036588
-1651772364049655351227109534629863148340655489696054950189023140607819232747963074764923819690470465024081626771998338862194589
-8535421442026745607190566634422441543153174467912420591988970152959270609189415618141521453452531554132027545470737271909694248
-4266576066028018898848004953928316732798903447774832407967130237423961865629656870579836679541833228863492849112635373253768730
-9318620813778397458907750295204099889575365028367626038475757355404525059311775107234951920852829456542067713455662881377001712
-9660563316063581065664074432670545816492979485719464785114250983280531864483884025594604925138921571079067953012249664289286107
-4733006686229685087965270923863015490601420365854224908680910247314401508516820945614321593880289181386292705522860502467700146
-9595467875394655716250868523623848001720836247002935008259127820208612390799061964695134992188932480652490964335096936081240148
-1812489955447149372964288932685703059456499125726325849419752698359991222537673326627718506868098338620828381688669635638529284
-2277365318750471576552640984213353147488350298228497735938404810800516562727031985237579073707417430708173600319624539956749453
-8558865515990107426689500711926656694092773040192992037548490908808858324669008603563963750417300374317505710614289622964156217
-2457409596680804630516887336784028949728779145781319560216200606134423822190318186800036885710141555957030479473061434184735920
-9100569805069607595713477651532945125488629510591455102444809609662844669593112401315706794492448332303051585825039449951564890
-2934068975480357331702373570405176114572488785747724819226534222897314789801301206100799457068445592290174980265109976510186964
-6974436264361115896790352170073260547419486352304459996628335808264941225228110927615548124284539746249063361590443246656233810
-2022987197590236256417410387584617910709314684989417286318087666015073752226802244527631727840148104686143554769788772100971964
-3931314203567669848668014170818609543271827823841957939988437792149776879965413983671414699512124596470803895106449229017252962
-1646897058572253319802460817369397398067528887800488520057974357980724071070615260303277654527720835652573050782049698374251316
-0612949136289175984348022991134845911118529208723293255584972808307452158666230105816460375784187988904522880654792018341929152
-6230320383294577758148209875436786980246088588555018398742402423700033755813061790265512976391765915810238317924960933176044915
-6724326703636717615730930803229989144709304487765743249773045992631205387565818549594275877262188712201760168274734486308418567
-9793449160017973876181891146468573134118620184336387033315592292444997748610681437980592831049932965491128002640896459624743912
-4292773888056347657265747923515456543197563688072118373801968694939175467616839381912904118459023550508906592936405878500629369
-0726575398511990054804247570050536297610421442312874646372000460857738421341575986454091454129764640046210072544927787587872609
-6223497359073574286258812426783136238045789247117981734256875260415121593723556039489844073919163685845325053278772517808357882
-4805353931456319684552807410713836603840908704132137938671395582768618313934438378980539779778185823334069713366782891327854771
-6127074671224214243978383308821083055917752075116334068237357481944923919216084154202678626979129283869929664457025576182992309
-9095642603811777857467738034071749226163187428061948529437320054852470403172207781014210493833697169288095448800181203251014035
-4736481344099852996408105951657679269262847981157582390462101509329835494113215114942443801348682136828613264161536188227115466
-4003055863718708771225642500990071025833297545571403747979992978828908605722348616364122656556369792934466258936918430294297508
-0884716108700884651920742851823456839844922966806960079344733214332219603718719129110850475334654765668025057309956984350345154
-4885236271502923816983822161323233481126598003985902081480145736364185121032980985643061033399360057443356862260970037248156868
-9095109506937315402103438551736664529148909771957666146775454439817301965157339466426336556934667643823128218330998524081566484
-9554172468178139926024925040064147501158211448170728837042601105476806693933691272219558658718966118313273471191896511638062325
-9954369358233682690458005171274421730241048095790588467590844502525588085948164312745806267036443692262270244497152879755376313
-8540761990884030057918282213961331175575293790886064372121411245265558611444044299259702033859938015653338871057063134186390567
-2937295853774855369815055903708691070046531641376115545763368983982874877046797588826386810643172084809422213611867667864377575
-7456129086242673800167308357557286842740029636829456648911252509981444991813390655015368895052836323823418477931875989888413494
-7619903401290202996353920197163165845104216512134977822317453208086977782938058360962563863616931222677006031494617743246676098
-8619837607929254793532399964916863199570819754247459608169557658376643077622610923724449371091028101105519894212018425361113161
-0198232737234871539712619394554173033293046636313472444724663228704935678432306609229598127499957898688691002287353410535746129
-9160344825935915883479808009630827527538308033068458669327511758149831271072074138691690968888119139014429832927001663077896093
-6075520157463461341098226057137016444093714810741234441217965271334334440753561468859945005901907007749818800609799068435785758
-0546092246435123497159753904346692263278071121042508101131684892541656872975812647089730436015791483195690674123772749878087282
-6758449872382291050831212201949792798424861556134983601310627614120558124555112900385099751123167702480059628861813816928572678
-2294380967592455168636104873737766456888729486890507823276579714836828251933669783531511408873018452811541618386657467835047578
-9771964953738092240932562360117185595020635073758269035209960005817272212266420970453644822258523689081214708732161974226486482
-2078896042427351080221479050978223463317038184395717248909464597626365437809427793625231151897894098417132582150723722131356816
-2733651127665461066112679225653017158187022844835577848138599970119201959393371465576981148627618500453766449113619920556794832
-3098796406035170187586479893078215549068777188615428168013041309627717475700524281634638706348659216956344427373631234955931788
-8266607652077744997152631910857696622624195835857414262086680438204284388121731692389911117940177851680318293050972437430080491
-5263662912508589659968304863826115756592152285582835871560573052117732379831943224939230850768149596127803763098910581308889239
-1399259544384714811458348148272122374447108528351486026748375991519038080289258112233626298579932128994892803010854830711867003
-0120562601270662181088525907457246972630366755109340652778459673777734310903812432648671068725042051752322546900077059823883777
-1071975377081858251465844724729282629412278512504579575631776161691808267150394386844729953211628319505799528227342615586982667
-5142190253907427483211782117002935160362621628506088192922092212154140185826659904555543974037176549370222198088358512119912742
-7709122677369521964052899819214134971313049580616225982506654419124826044743127724976092244678406630989264402052401911579629855
-5241083294500875288635504487164898666527862404520007162909767182104068330196614730977680503144106835763690135404371824827295654
-6210246422372066059297630639990103921525353988425004032130811899385175353438423745075299078297982811812894692845392714907314914
-6639687154171290857100923298064297354897427312066201467165805288117452112109293854180789331988821851079333157010919824197308857
-2725453575267288288994357675260613771455378866560128031996095809604727908410382843600101001039972876558637948184365207490031492
-3022829447684501701771651529957077694566855215179433255048106574130176149607854191690519660804326926806696105896923466573489014
-2276500150756721393101309310240889850130747890241895231090329328679796493201088708899083812272168509412763541079565359287160502
-0441480433094880222135017379174984153891031352882663477623197838966247123264644246447696041370087767283894667315757217159981846
-6600209627389381111032923919248323966625789375205223637463959729585017236548352912218466643214096190786355523902607233701011308
-0879209770503108176937425508560832114089876275039410069927508813642206128497418765988069857902212785710790868994707145334746457
-1573213691519886100372421851125709104684878670999887084420803400476797705625591520633797149282934213606570900108998582064311163
-8676807063736715112005822408555267407647050728641117839753641320386536310057649950460984214505375532528456592558681408856748600
-0458633214841398749014431880145127111888700604235741500367092065118505389545560189317863466505700948103428117858933891140917600
-5132202176401630576193346962510769965520088034746560321030328807272795203005246723655044384670879356197070618995577734499503916
-6506939563329550580672846170456665825955418030610189100857896112174782009029170826779986506077333681379230762539236049071683000
-6370393487113254502942284063528147627172601717639450424195980075047464787096908959060881173708540962987133431304917906118868338
-9267746888420071021500735075663336736361717345091433424161991124952838871022030399503645263408791327784786086730026429717318657
-1672147391408891002327479016767689503494648768717682253138108661180075426978036916352251329255918145397491166698770599594009604
-1973656522713866421729264353952482643307862403936073686775977710379738331755646451684387173747099995521827339722863619385237499
-5408235756969453434913224193378329404979503566466468217232986076880098924660185616188785089771941834979789440134998311199906069
-2232778818840350786605080110308895419763433233707234872571290509162878857914634432096414764357358087088039057924071148091731175
-6015400792410124384152213047000568844879712268022351230585299428537516602169557527154990684330404034064121063393300034030430905
-2306055374539312465651241264233074065955242079361211680462145344554747450796349210759636113482252702608031612245403353997125476
-3803253691034432130798363413192595243576410393487613462409388440991106589264853952016023685661448176427389232941666704057678369
-8628747721532797463638681268551173019525973277356279608142072485533442125834239673920151827309537064739870526314899247429664781
-9025827660968538606553886333865132013576294269585884802265251611104643759277860774328243246331432389944537967831541391858902940
-1930816587488360252688732499160213070813273038333861895643529140656993608246150830322861238139209540926180077253222099793719072
-8959519042048720068153629627140256241685908963439182993973204720950662335620899080859042503691987552467007737450276337233761755
-6288965328635383011799009079228464765004787324704548708119617161002013632986577780042057914052383556753286042031709306907755664
-9921350932285357024268612614215975988614776231803905241441720250462994526451363159473639866331342141233807338499617054943944238
-0578049360816576019800945237402222592171684814088734743903979539564400529178521960883785173251341874550331866956766247772470369
-6083904254700701911630159329372053705191987684688500636724033475465777760911461588784110437867357713431148790643538763108521995
-0296263770538400456769346062348737783795801732870097577376952964730500440617573963135158364912865598645263299913463769215039071
-9483488255991073328145731534454837990839423394416473517085030613349147333787972449423197209621559003595529788900553100012406747
-6566884594766054381929553636693829055015384572992260492476307544253448277903698366356427152189807274375674035466963843196695551
-6323074679661834194813723642658721376145252523971723277400835325217197190050897668239821693181091121061162219401288326146881306
-1808318984353930429816050257400279035517547964016766257303295002919848213345027516727642354899576468006486504355233740324100211
-0373421583654094261005790222006220690243740321608605292144463259644370384862300052723119124037021639917903672109294422220446746
-0968367458627898019517765631253210766036998155063276402536135475040822567588712196840514962484791203840216962030611173316284918
-6730753402413401318179055308056338575836289967262947906669540139949663260817034924092055901733213326920487904492973772740252118
-6813399504142772729322264698007839309738863435169195740088479397131114450638902610593694986422730992468798340242051077542153965
-9094257292692469011371694239749935666279240094911204646416349941755315640280190692332906803301138668428433338486284139761451437
-4927696735702519573953727266824755919361553550569177388087634691983381789617481807188380885676894329271297374663349552211867549
-6214976348118306656535007501010457882239285954427884872811741042673638154912694956412208130004776408704809831151781445974935728
-0120629582751291565009219505554682954747176012178127728953108970378564330824283571745236870527703343674549433801104649142185888
-3235814158776446629647585300745371840827518705724793256416163401064594247074494980560274282618040988687418212805930332830675213
-9481691238337366800610093527436128723725108303743340453678113695806808341554588638276662497395500403037304969340369996972707032
-4082676737625354210464419813293767706297361241754982481007296169725698649583516782177058747437891980516222464440989464874961596
-6461961406394849542189779035893533584829634128015156718397540384299215958366542622049511074988966488475073248255117221338638960
-0142933164629079463406544918744481398396204306933357431841214352733485790844296470933212820449310522157583393441447538375216436
-3436698506912676403242337919492000906428711269510381173399936468041047249569064777837314598565623718618433285256806067639636763
-8460415932660725184337524946121929924205499042071794021186039050613143778222559008526610557979170270365704047948250328090311884
-8815703597819948360630939744751577068004694199231149936335126538352407733636909351409964233765563167198074923729461436493523959
-0713926842635856417640343723268323797389202591360887205782568996458244122502082280450763638212538223700620622044815212320168684
-9492871418408066338755969200124883796242190267635257673723366249954282292979482645457308347074754036142876356477739278675875440
-2183538168589813954235091042917215997797441009968993171615399263341109892414323128649997905799043937988646881424204624530006049
-7733957096488341212048475007904035717627062565794383079540365496869348281433928986222996400495215587152772750589584231009322321
-6967167721546910451512704467642578730007590171739084668065616508498732163764275594573615283985791091469103384452900988352107000
-6807413612465354023458660940481659053886101973060578770973513038430471528121342377174140575232152423951725002933862875035962993
-5491625968951170241792359320698419197951622254963187269169519754789130928703155856710378168285319433421425146672702276206900357
-6582314544521282948303668171056488977803778991914594073284490075274341682398796202525053587573368003492350674264590216915743030
-0229180917308822559423399370500197589688253700875858499871606888817412759424516191276640847554118760685723541416666202243509736
-9274208984682823732942979222927492539292245964003720945726994325795924579380001664666341956208236538074900737136200088724900215
-5814292572624892701632682972030886871485930705868231267185916589385811869703139406294452824977282139608709779376891002163708313
-4033763100173660376690182575379995726083861081926510802579785312647154456013703372795547129639766049095465742696104516613357933
-2568315805640894925038031436747677782703800879694535494046794349191040639680313707242709239136167699797774023104845097743799234
-6763080953224487156488442945555613963349180931811315907436001825754710792409694328952798340996992622252003347436512459358128857
-3954533989335010638156841066648473526011867397359480295694595402042037502438174479721797977373598413288286342098814213128179837
-2396433612158432510452891115965816912823381888049756989510546093247222344511226918341455435352327199403241839439420506108676964
-0795850610161143815844607948060775881656537958435083754755508315612517655376939244238451149176008256028242905067513932423707050
-3517402986146524008574508829340726577308717530546869694363472906429850377209335971237767032862995433224020904386089476753728648
-7922151222682324169544546785791039508552110735905147311483313421452486749631056709157326288104257728264776617306059521303067262
-9433265821676424821718658733270406951796862690935463256100330389699577509374904038151899940074906081844482171701461900939078601
-6186077218855804555456232441080881439587655776678203701080218698681846807414980313213113823373021577317623820418853903404980853
-2057729858963790488672801591735476430626710017313638370400064539747700089967564851982820372204387613607305955240060602392589527
-0383881550897793438940267029950019121382581949345028853214775595378737481122241954444306274659828618843592228475107234699152687
-5284798962706326315885441962112759776606317588723708150855167126722288961236786090248841992912344949773249220873179712041971922
-9678187960541674562218790198419395947752158216709587927827286969325482868753908887434457039802709422399284864987575179916747347
-5327838914777072714692085263368643404584146218804037383216974773265161119155906542869845216416813947477024304569196702936579095
-6268003933265575972147374394617649572960257762413423428779104569461013465964897200866208582709538990234194911357542427621601938
-8074876525846270711334089333528645517621667077382560706349198812216415510664481057225472908752257947691952856523071940619013694
-8017368030459649790293701927587307177007662644838805113977690349437913275410750363651007980050566471766249753077608880102272532
-1982797159364965178888531580373430260986522031868350608333752657707407931000254944024943348168140524874484514493735113742249981
-6288538584949755098193652659249807271937205648283720864311553381239244146100739200355642491916783137202534161705603274089556521
-9354739749045138253043275273268328367815186805183694069007675806235940663397422177024952828447038786641822001541524569479714913
-7698528117160783953905420058390896481011235446749390616223922774275291430828661119528466868454607218473820114505896776059375354
-1619019266174818706077047840193129831420498197596777970098691437675408999864116292704117680089265101055969410774137278714249866
-3704870678985840970113166302795462489950063082099943547515245655672648446079824717316402600594084559028770660910436751665528235
-4429408197253611572221699160867353954702111945889329273311821911416970564822252007768702453855504730931208682912670990901446785
-5056501125351085290367349611566587022633517744283896529455313187439470673480194626772000636195743336806541403680260332379718964
-4062991551971333412504544251310884322830607074386974123640580284992839293238984564989258127209764459890435786526862148574118080
-2625522665812777011614768650094518338934467618573508691312860257788451631146950375887371627144471854275002143114396671788841878
-2226696461215179698643658067033045890658991544538880319431666117259518073995053382607108900045909290904771038098705696699068324
-6726532088338857549906950143621062126429461929145317128221035122460444306074528944822699784500814789341052158726046904507897034
-6793037164285887325166583356411787362893236497739544799385622176244058491240539097656877256235845151279052346581850041111149908
-4093573044381701004333825958081420923185855648955716595548583153752167241574306747073123301312447687906770815027018933422227596
-6707271839374572454938209957923490292030537274459728356418336773458317286912917431092307541994164910938497543069009665010432516
-7241600538166073336929364870095691302789706058064621204209320909673557421090888354529446748882788614331747011940455844576764284
-7137143302702161225320499515565654830535431434870632910006167776519433451398361978770695152191140156154509207190258738746324525
-7177837461622149136708945368215880972643302158259696018853584758017706472295497707280871705217770629770641478542481671610250773
-5554013978114456033660343221358867604345109625580200393288313536168463029481940254044728394046188030569648323861618169629477000
-8748988786120543881188413407361779739580428614335192009085939766971185616502526635854198592751325209395171686208426924544564152
-6617729010736669611153048037379873649289970538055287963581277014784710903080627770559078145423490012308690390159447385760636617
-1396112919025930755072794022535421762089970913319020087082933809741223660404657644541118861471741622430838236195432385726159361
-7249197652757615950334012535738132798576509936889286629270864681020298782574659494783085110319815705595177485744225974776618676
-4858557343521566530159783491610288461205535017137620369901510860776505101408698469561089138749268742702921025433191359814405089
-1405508073047405874902803040100792069570430571449445778558936794822787960786336616853548170322337310425822658832018643837559079
-7255075818431908394615699437073631405701119134607024097267578921840611418622682373870814723883284591259922905738590072345115516
-4240694967339735201081972989105259182809574142617805837465112261091318429255228721568810181664317538777929819157212160575829023
-2748237669200464565992816533713130419647283186413179673011963172187269272224647869974262327569585442612854368077691269344188871
-1222760335817459965853292578856201576938118519312855304508610105281112231513426234814422228921425942855517206703964421120719762
-5224765636718330925202872259803187360837016560225525039097597027027310508724003400835919326880989701929146674585353105826375662
-4608686356759945389820261327877835956104857982859971343770150256738677287345081654437248462809898624047205228119203349515135144
-6762635128848980939500701402251709503914581106728361156687648893186497005364492516596632908393739083848785619442884628144162198
-9408219837678921746467927680318487696309519621970987584546154535257273988915610716263345779849862915767049642549659017655936977
-2878461866210176159858735856155729710212544372367962529421415383498942572742627275020994117127943578105501057737118382232121164
-6202970140395425040275648643808519609153095822076099220917958127812733404125781257612941188098229102786208245263355552763155862
-3412899983063072356219645639174430993848691176774827540248823520470123385464397586328853608924297363157128484769714643392030260
-7516335187749776239975100738544129195651952155894618035351972235899711941435830137791970183095848641340212385537760526454996975
-9326117473414458915105300842976184452176417489508025383214692364884363250764059076859137855740438113389750789393201920849913143
-8213713819060950631004232834986002902474872793703875917119551478078092258435100422531909399249521481966638648761188280089875780
-4759150755939784604117474362263502288999681621525995527689733138120086197663894427404346527959682389904515329738583325486736756
-9325978425209872464237977527958499931962722888446298443732493719892549369851302316811008601401750818556435135705126450083049922
-6347121675883203194927076244218929133933870815129366063255106247006180593262999464959953693728515646161688550961478583928288648
-1770297585530292141472219789662846895032928913171250259285237148388628954759446094661658933173846573153793706711301693991850474
-0792606603197595851399011444059807607822829889531316870539398964731417122727677982590799094547174678976545309066723508642538395
-7542251187115005568283732133757451228935803355815247833157647444961116649664568241618566131440468159056245333148920222556848970
-1686590915600101341570938724862037843381611006851337958368672209742162426192678307570447318588843817286911928534762475716887889
-5985898442600265569905129276649109155018541224177922670883691334985077196371351903258301592600475229763499481236752268688794381
-9908334038229937596478744640386393429233365920050089472460888907538665294038594595567391991275514366380037563916695381509760722
-6697176988394487279550132960940875716670256744139528862226095599316038741474608986574869723524996958686407456560239747388319182
-5272345146409276991368562911742268892736319679968918454777104809692672080906197146972033144703725807051487037561295160467451538
-3361581138752178146561886363234614574825214993383047665369152075131490893168140965966229773832573946751662445845244243875117807
-8497747825333018837277204487016088859935993376161231128402571833027091271675038762646104326773996163504827534262519513030402352
-2850247104178367791237021165640248127529302018809122924281078393572312164207913339929888292707995450264033189457174311609184073
-8924909933371581642458243436549195910810805622486372258791244747556044533591204446068293714215938334798650520367000310196349472
-4508128384366452869820524778886955415968833938807781198993008689473057745756213279992800316467476453813822465284911857999907387
-2023953430847273884483235864052375615320236609720705596526699723117087569499174093607783752368506950667179330339328300764225536
-2114055767363508202672868934173997107264743852817603394956504753530153541861401139621693806395357957937922300502759889840467545
-0621018093521434841220357944235687355230152336239627344725027296978480489999738827553268628247847786834042126152054295485896741
-1728177905254640772617413047936979080771772313470023078251325162582234445493894126314939244900306139362255151328277418578396047
-1792422884816727055970087290849551106652457784152258102530082023142369893647618177451355631227247379577671860849853688299849551
-1175037347149672092098074310747361251964753674884333700769847744830036555394374700856740987145924794681060765600644641697283847
-9174589667717240975144336198616364140632445180996668524271118863864525314244946497799850056518633949293612226613509484575056441
-3024489420602308444377762407441001512681502589345978196662197798484057230208048085644756143263157845710447555275495197040972213
-5990095737215350840694710792788564049039561363466293476205766559255673678361573392948770517450420686662337759686497763541080151
-5536095650185550909008740808818202276021308469567387829730017248451381382214473271435330569988489076831395673641296020100168963
-8691489605876605176450990544960425812802030262532258796192840475047025803288315858498575542856190938582743335067317105863072855
-8766959566097551451268355313989562707945501704157509911384107284566676448181401117485715830603954518469086610851712800284373857
-2622452939630203014872224939693671859800249164641618680985148159351811785234412541320836473437263872332827932949209391274805175
-6798235720998149184680985250493187047397164050502295623889415695762080775856311836882958794525078302171514915009308220188324579
-7404140736104785086437030648484406734008243907361526117865122472043884228991384547907143497695706699559582484787176857952820522
-8804256451428134606481551907263647977538193140987930551038510575189609463453621867637464848455610801693723759700181203650436839
-2454914648531519297448584075603475998203868332048006750382533505496359960760723675619846780966293281981298326598027774066580197
-7995861529357273876737015678397822856184868318896981667361295506177063218216975663372922918478316465965515092121524544927046347
-7075516111646427841984461388320881450094372462158722036978724530408790912720869813138049436688811195541657354372228803333585071
-6429445107361977048898774220057765467210817429170612447918756002833100352538329968035564836996813252177717820091122268457886430
-7174078917945962391527335388096356842601813618444449251961003226992399982772853124625379285502923443657958530018722098893816397
-4966136548214340660067711135963960273659031432856630667889996071606345454141323196469871177597395097849304859547230071866679596
-3726141431238995322616590363658851982624885785492321657227849247981548495242247508727680411775990290110420891478204977360853532
-1644317907061571688813615690182418379232646792079005297020445585096706983621152261491067330546246215457831060764875633375743540
-0260037498619368766791619780583839981870124397870392302778118229013764892065306663721631976910781105530817819103416467777655922
-1257160865985307861172892171513923812618825522832093610372208245587343312911128848417617475098350804052464802003464019493811163
-3766028847159301257741274325560482246090419451830573366629957679849625493927009484554531296839025641820596875488169323390321224
-8232388226007759579919663974563407506786051531271638328419810743863932368666194478382016978871056258046863096095307264426924960
-4549834654287891305590680957281622094960361243150054432811463994295196664383435297694301203486327605844830810715344529812950660
-5753311902123482227347291010505867923405362170620911512612976729652957268599586765352146177919457594239032123428411979879139233
-1756522666058959488542110121660842887596621268641851969762507171503624064440144225359791257651455405971257235743672383114242117
-3669744927951794530124706132421697781115421405857509254735757547057701496218013526040546290811670945415111481766033696065077908
-3743986898663416455838782244658330408591406810811925113737418608085893951934341548820971030074613077943621026895167359064570606
-9471978412930979202834282673808363212715221979769900548835760002508328425519756934140019511728229374555172954389643589129389588
-9455543651731906114795743817911783078297338344457513508249293073101170733009370971042675747320086133963697038647918247059612888
-8987238012717473365026512535048463787033301244418231940438539856074603360903070483058902057658066015083363248256775852399567354
-3364502373064620236820638615612559600453180311037005397530277541350185917242503038852432559174885033399595723295543954546558084
-9899331087165498351833150053347482195081440704956752507876144131532942935103436324218551370249739155812929164520262875021494783
-6908904643032400627041773579937621950623563067061899745276566450404645141582156514162192031414915906603166745603027411059622640
-6495757281070400862553880509625330137059949973388167457480215447233006890221821337932185784669081820552176614865399261551583475
-5214987707999082292941559306056717820096495439266384956685554643672988468125971218644583921446293636673793845912080991022068721
-9098075542650837679681095355197850211686123726685262897042587789900344672369748441583193738857149324437982999889236683375639656
-3454737499177458611505297150687929879276146562076664745364918792408073476880967147036390541767431864129948395331642282070602239
-6878237499611110425456520778926623547629857959652095556385934261653929146175223058776396057712180642186976052559776640567287939
-9117825842497962507655739795549675536045986355442960959176637564697703951624943028930326642942379066897205661256857648338706258
-5607249824040048715831055763915681630425710558796489860046207669351392908027930067134903067626066854044057840603625024212216072
-6132093035960157469992103741008683953459144927130308314821395510817197195888871912314613073270790771658400690547770532514734857
-2289766523163076031024159344583085122839051296194651927355671209701571188590931542840886950235609126079848243347538568462648984
-5766639281060869652151900461538022230554309323803322083408453315192390160247383316259588161796028371801133887539960085255308323
-9483650441565836194775795637439945189737766569777908677905305601319160962603730861873961369931413625520373523170442339205096446
-6397277751314562067770288602692729550017088466152598972362685935373861021657565974015373030623318967239986491125515528075018887
-5402601339014610197678055292860126657475597634829577844878918241260173909075027791997352414032212153167271561905364752619385786
-8491863948995147633786778542070447298998068007279647829967199136460489001972567744945790789456373114064713748773853626265799228
-2370209092117301003097542080527068882722669167429990641325299940901538545419032212913930826834352316812337709858765794889107909
-1398631884718147949515763634548480975677014453715972288924837802795200463595978496786857308537512388719226166051585776739717368
-6941189534316796817726911487247546420252712714875639017653467949442416805399033991555627055669486555645886651826109264153186819
-4940516166674720818220542130511334825103331157208156275492549414655335399338455554953498955587141484886410449146234826660024826
-6659792948006838082450272697160209259339168888357685416533244048793279607628259013570705943914832132649302220555803191155769678
-3450607770354143996892622745433805449122734203977711922327068576407370897444833149206827486642681899060356549533970828759001934
-5727275520263633514968976110225542746359061074870472786303946464842833869445090010825025879958856002949152638295200941043841906
-1327175710840731608371208629917959139504834096615996636184118498113010168900528468440699292352911245996048410672241669829930509
-5804872329617982647538232786144744032881485213965459136524837612293635959247462464117508493059931748287964717902656930987863246
-4277723315738568098484054986328302182182023008609946701266751039890388797338292226205365731416488922689962862442504898912370823
-0169167783207015850910326779335592201489472916428336283983741331168324385837589731443211700684040249551018329769335204931232483
-5298537282274168905097783252545295159931996045324669229561719918373117774516092756810950028198012718738992851067743291059615923
-9444851345487696935698137109913963152214976022384665735269814043959675847649595558507091607437770303094115672250928216923641250
-2149472592686716079768844857346451000286201002122320769034758020998927559101579776094371380910427183625784710226757782544230415
-0647876642293735785152692483992423954470320088754545909378609961100700126777198798362991474951795873563734734785888619665299138
-5849838488444430649533263787538811331357728938722568950445006777515651519234515285808516388251516110101450462227962034131202241
-7276104739525907372419126181186384546119321638501786879645354354875497667502927550069197442007577146458961731206493061524033007
-9422217503140335187736221742892478886207544102369268483447607791356773560830807813772377547585429918129160635826252418480968692
-4951724274446263780114357613049442315030582695389596800003586264063614032462365896162651936067640252887621519671734335954108739
-7454566191860852039559843736923834077952568697550937244831873949705841445761551247253789687164216518186201016215799884228535871
-8439893371971012000885553951535059948361302183174942319645796198457357286423328894929588756597087846522596101434099524110623679
-2208231333330844864465745363677908966068876448934931718761801046807820975248234034617078513450119384012451530340905431793537946
-2305572597375584599916270867173159433891169944691281508143382202813205881528811308590035206333627177252785229699333403132814188
-6581817307307772248849032636830370028521484024024459152842727518740380359881146898101434552487760886134249651169919754088451088
-9972253499037895070298514770518285390402914258598519025675691003304065496834156654347189749182550625905099172508363395356804877
-5758008808025624632351941198979018660594929305107322792450818499652772086629264781844489198081813129733546688788720899531192457
-2745675328488913480621264293304705435951452309540398654081411328496424730516137398740590505211615977997709945823736263422098774
-4319217301030265407335508264753089155109074707762624338354639950177679811707826932551029618948153019495825747590381756914645981
-9125342547489286004121333337059776054538539726153714180036823804029952720452919240063140345998373975940156807239544138619226508
-7242675874264000704878339896544038336920890771642735504973073959953113142490324395737352393349120127057115852252907686376626747
-3473321596354209308933007945651010752129252885281924230373167976919072240297072208573755175225599946410500654362886750707794528
-5727589543974524706691693259117706864773673979587751324354353742658357813584415514973239116989629743388388478173856874552697761
-1142418605095869987288446285147568178401344806595851658792922110020211362874700057924021743582095514290749364426026381491938886
-7017216586801442390706943294273005287782115442259090512088524168970016375416554459606914186390125156135455842825317699271637907
-0211233315441242280840462166926685973850749956345775689925242698347596240183158491250150173733543845430700552741593194555804750
-1797724078344241125893042060239537330994558786922162379383591805537659608535521283089375039292199790021670953442916099772863332
-6130652679697033488878720295305832453720948952785209088953761883766005724826476556165454243473790630572440696210857988190704713
-4744821686581324503785124383460438165434233854467259677279955943920755162775872557500679297287992727542016808831027373389642811
-8818850180176632238377551894120301699425047464434209428644888921239546400810384063448594908229208386662084553428371435016786566
-2565402723149127183692936818466510584042955514361987237908845951130503356391102529543147109435545190864583265738886354448729716
-2555888389438655691918145095510314610669012618591908132566801282747594112804817710376968735883323783155393749243633468461076212
-4037970808854790499072817736929400553034907676890898900783090149602127450205466513482819048073679969106848951996174948205730701
-0816030875372524859030697931442206128673990318458281042368684773151576092499288971063578724086458233384930941299441451767263066
-1664521612180858396451529620088930659358500352782541669595817923485051339758066634536721977274523994998146473981701939017205602
-2524104027099484717563367769361246592695182470261402965977193164101572566284710942794698915634141627566609476347965721168530986
-4359025426573155220274777012266852482447049345363636421786714781355224872652596955092178684933842367455487342490049229104686636
-1405127824749409497462184480237538519293466992317964479311951604897323056429690265101169427550747026874617333157171121236924703
-6018076627013550295381656119236991061160617457180144979226462876301063552180250667955529552359828561142316939674528337208856344
-4374830018868998904944977293261195517662546966324518234611103690143089662138017933662034152841911712239931096922875112835748433
-0236447221655510600424621887641222992324877860049632049076965940501963553949996895966286320389211270787434721126820780971624253
-1124118658886218410732481795333541469161905682578320893049989427979158879370075562912903672274463984603712619157580009287344826
-1490073439715132975375184719480763004789606934374075237219980119217402660147346676094869754304392997432951402325274930204871342
-7507088153751893726167389642050254715794421419546083151335746591084804700733010001661585164038391983336305667211157845088930512
-9454605864819889656904342091511833717539963300409957365660591244004512939427858955522107791635547956216918186634105330346773979
-0658593516322846162016300446203238142166026181710436615937557978420890524597354295972144917810824199008158678995080211427722929
-8980589661160288330719076634082892363742482807739228207426629330991685667550752678607146578792931470069849286956087928508404855
-0981420843325337105199162550260043516249035154228170027681913983488364730292863723816365277728171439162179656110789246164875870
-7235989772218476249654125554327002628917857770756363184283174214585030441232386973067535578285982100385381595377232095167172355
-8531968481709055316167180990447601481938541581517577911736493317452245372585792259012856477270057051421673563226983021870172320
-3966519268023261060863087111821082801296148611252172465597370204173800451852480272015584093876590792853690848377385063421097933
-4667059194375637666825712724740535719642601441210189891690016272378550854485280624499553958549215837331920055819015130335235748
-5180652276625067336617174370015460185337302241346649852510792894228685353669611675801310899772318114006268028233834332313504023
-1941303813100529733477333374209673305915978659212933725574700988773740701325826021523545062039757705261878074707241548966802269
-2746067443336418197240323253838643666106109625323987238695096142699993722607024221029583744572542375113816178166737688431737737
-1790082381839115387609873262982695752275538347088304949304931589485737690198187441832377091589179048950816796427590616885843542
-5552689266955858826481326722121453449315123458065490624658389457610909531278210069460670951157478754958271396713130819467585412
-8161144774814776141255994752061769287038765060690866140571952344698969957192475271081186838639007943816699743960034503332953194
-8789192141356424274503562578603345033063547574284980009602843989229909463071658256259561315235167835094522110712803401150014304
-2269120125327746733199585385420581800688978135760399189023545691870920243025811096318243711254873352522759304218250492540601301
-3220660009367443347579325094663071621014417170436158246461857082697811419327408184450532404128001876815109034413458694764955526
-4236810019612678173215181621403086283786465950563987195979676317579127299901400746488219293603220797858502005948349760508971512
-0842456999754267165377711495312735495780613161991580964945616998690779002045181519007002606802172925174094502143404195978695837
-4416749583760585438101952975396064089728080431113199590836008764153005621794368480547875309689843049490843783015113705286745691
-0795274682904383996694242263473123412015847505963674606830368047427506205910859669522416907398900276339485220277009294111636658
-0726660439712285671104280059752886748116228091939311944983809111670167487220776456879193368274819545300958924106260054971842623
-8150764216086897115298219326429987785009191738597276238467913392040684511353140756968540557235239878544391001829270153861846092
-4383222134341106409110971398373626248863354871646454326385144812872101996077996725153807549596115873770116755372384144360289549
-8170673501302124114120744895395545744756695363267571023745570418014263093634951684729982428233593809293841917967048459961199699
-9763136038244743451806991825890314924556837135102471133555361059824564665398157293669951119702184740695499289874076409711970682
-1422421956968116348857989939957276677533229421063047970708284154758036180433546990214632661390471026182712000805513222171655488
-0790454789270387069048408785812014404576158995323548751958890039523932351478622587142638056133836919868045535455845844392024399
-6828229983228262659292226957969701095193296498963956591476120614340834793473477949399153199148731691820887892496627505449096093
-8624492093374718033878604413583151815223479591147786368391299257097621796393142945746725700896309907581595691253852161958930992
-7107729406703783687280485106218574382700030054257355689626925093581880354626104182184797971451190514868852721286584413091561305
-8741987234103316893377380144344514006198840745678799814654988835056150781397439910157073114301452768509065135515533734967678598
-2735043292667576626222020726140529203825880750760734206750175908534901067729659839678099054130592189468939769616706044680647240
-2763006819383647925527431911808115681683993973822624367816274873450252222984650251537326892288304742295886859351709349425297650
-7134753100395351301348083365117683812003850761712390745630056031799089854945233811860729771699517948808663082113548033370410055
-2156718353193091760663949540389192861228968135157606923907872289234299014121301709409557692508414639141148641363055713300497167
-9323046502608972228620000366263176485575290223984881067717695579312796433503231136630486297616245185739116228913473000321724069
-3402413948021099348085449161508115950805641814124236561124067595528674925736958070838477983849773356429271615279624883406948406
-2586362309829746055325863292755259087415528960697154410026073785183365372343620398551768197389974234910915413966255239135166137
-6948141006945340339297784658800718813009858499271702100629421441689482806248257882748211373263608811093415305500022007093455945
-0842258683716404942736428616895358695656655266518974938995151040768012671515151979466768515865903424648012383400333040320383895
-5049269512019956300105561497239010604854186206683961343893764070138734690927147819767835829400814779254514025647466904224213470
-9569948375696342652641662102284605174592869950745185014008552719701570802715911338264166097617707320465336842190177333964575034
-9428680684767284183633020532362541285325879314896297017757679938122092115670160403478099811406505218708402491047782860144041267
-2048668363875460097326211666406188941409324970507852534507916458181293600129195542233794471499710031501087442970014489278431811
-3405993437193068750979763065800204417948705854493241428660974718747020128492308645680153785966021095932035295060527677641892559
-2814589083509652662902787080397228682431174828014560598681492336798258054680671382857806718386021239491601389601875295478518945
-5986699496572944083337074930929834075993621216590713141225309670719782429561351058677320246208472110574056384475102009208825158
-3701143845992716374497567663523592738178836225177899343548036997338523733500001300643656167477000925420983129066143726434092701
-7423291379038754262185514882391794604313384501082737513845672893062736061561920457702887522180551612186897189287428790772663945
-8038882462960387008399150903931548842040303337569963977574310341965170156166264463639669524288945874943197641758694114087360524
-6755427287648373311476510042437767363082433235534497669444705172475485394287772438817148371693824101932257743465051113814804574
-3302584529244780057393036854445554623243089576362550605055694156880682183315829897197741778897975736012282052319045886108088033
-8087176493289867561968800923375092924482419715512093174473694625106772042668885277666098646361898523510402733964872800445131037
-8320007995921770348498605128869111626930267035943426816435809551556518111290098800524644244409358410267473862764842446130048523
-1436098828025610017328979458386153232076446194265248731690143382189291992244935737904603822794261840119592775301158595671929956
-1859896675014716704798696047818739852245706249557223427847334266658566082156593745460337399765187932861285602937611319183698837
-8695387218535720582564065835479455701900416698839376472323627804365945785468346621682197696163783828936362978547295808542269445
-8279752484506847142094417985544033613129823835703913986703044915444548737906032583690923865665220094573089105884291792454719678
-1316169725449877686068579181522410565098719766530274437681078973112896904796812316498589687674134438686508004774642199962324204
-4690063619499878869524791692206588255254568407388459022366711747832387099104508881401463078787110967721065394141648606132537550
-1451429470869671002057789223158518659342906175930490990163086609677315590447420960904216338864582531646704745882645257996753003
-3594769224483393076962577578336775804994360716705648101110515582304099946203974654110102114903083901640907564773113403226112614
-7842811390980512417623967516307862595714647209118659868698680060437058188686064362842966029195804418885454481156401460457680810
-1353730331240432284758809177395482784888827256712163440645440749728289433010840369051942073911490213001477219496896397735829211
-4601945158211709423733169616586120219445506544455684681994448828365740758425856347182450418912396580393258871768216932273389644
-7546606883962070377792485250777570864737360035965255716590780907370097846008363755114568550428189781279182714576817370377989913
-5909871699164748481388103916215854782263584875652627145927520783000462057342075067627629231607264735052014948668522278967261465
-7789853062938105623444363261994088544665616630390123445507860288440231593034911635167838522597643333127458708364830418263896184
-1286144438352596484065325500754944308173042437315362632781599996019422261591416810474894175619846059414717720198222378370653571
-6971462477582470633206125394932199429053380382783796898399516803651438673139498531736021776634684941580638746309619120992683170
-8629432822993724963855361987882118654589234693568266212440633573606219295689682039033133123609808063033145394447533709295411896
-0281594967652261579794466637274919984182923757681634332365968310833409307348568763974412665592870158544818035335013012421932763
-7655826860692715418764005666669293766929001138134358352328235302135813053504743107776878655717896623753934484760219931500298692
-9290168663678775972562133999711785783179036668870829240738642007250789936063529444287722257668245891843786516368999364205453698
-1388094089899362163718773572230079214466119375080348978705038480095898940916060131319234067470176587422484787467679366538347868
-8017293664803927630769729168954945146012294840940686008911896485848777037133106837925465110245874730110174759001141830380040038
-0120439722450454617928179479243857705288134086458602893871161972846537382451740227055242495699985657918659780373398590814158015
-9185549346791665800883510913273745072991047690371888044204398878541170797025220849684634548447569944177523688037116487344544844
-3983330147768673814424552255794031561316294164196820680509267685360230979960997521617397764375675161021883986966830273621436840
-5559819786199323213875219658620019627595340113429135282821726501703289978583492131096279542835050405087347140325687712807079487
-9787946090092230362250195573096660493646419587912974580035697132589473417918325240116393969464922906025196729087774385693764553
-9860355320714920060965670358032280168554148297437945180860387882403591842300282814921233640661490871801402207762626482522032047
-3097025361491117451005377278198487212237099544908247111077372764356886263791448989161160949762415522639831639294698581458345985
-7119461403366321455704765813404706513096376229662175435103856904757065360840168635845572631764671801632765978886309611217770123
-2355725108730791813146700353437818727398062989969964100944171032459233591148110740093249920429111285758187817891195538479372333
-7717147589069034365041184332554553609756818941590171329038369697464604453126540943732615622700321916184110353125350100127752260
-5400719243883713007355805618610788516934976237500923767706894033322172234355015854525038569883308926393709084041999484656996753
-1283666031444516796129629651038339271512674202354596553588525167158551065999313761923723647718179391480101442800341777895133996
-0753973775383179955400385390016380992296547654995782315767306424246762945687075752145691419815405005932537449947304486849576643
-2979180958396224767297581462043320034127704743702992357878029772922817116999851784773690688789215232089766369127969016032601856
-3851573261415488209314332793330099314068046066211719044146103127781354079770099732602779302176734228288014045681315375260376275
-5613084622744138175415292879907528314309988380989805830104342547726499059288400078772029464667932988421246953056079406071204771
-4586730576036740853854978952480253788859203002939257757392716256983049436420156853771221502897572109716517239674204969203181474
-0982119350191052441755943123327258611832950316806139591389360751863567226397368531779203766930988225110737707276225086269268083
-1166609927459152345242074308503846915870742513191815496448329154263550697382001973332037653901875197894977220232463712982961473
-8742250538546251559619529217497793362557849446641056066254726761640756859174902719692841027963345440941200289292587371677456563
-1787473730619074666648808301286212846168364513813858291223488226257956569272198811926719725754005926219281926579718279777830444
-9964885779070155802556863992597887379404305287991864566420006473195804170299129414259096081893003248613986369776375193541122827
-8679261717535638702784929128089835277682571491318590535314932208130153018789998592505582846756436233025096155853923159667457622
-0064101062279216730164192200983393569735835140706754353527254528463606619322108164129797836707319607352924077829068257856221565
-4098966914598730293864163204728437998349124344700052324246741119119244973881766239805489297351925527481613098094358252765642656
-3256631812453399632987567720287450907847236484423613740997675264597104916297183865029408528402827703543717537820987540612308827
-9763193844988062420108359297687488837148328286540087218373263127565810612066788312087172343604520200144217517124505185828378183
-0839169941798971803467138716750724876136916222233258526467257984594030393990037357389464526262272705365500201964650768865692587
-6552250604997641261294087071350242489522328429130222914193744223497369981001341679952214443941383946458063259049876349424028513
-2213974436158368636025109248174911312580051245505113315795959437260475388392500593400331863318219524296806654096778830779216940
-4878685599516319690797457606707664358483790224825508827231099632903629838432588023623129489722939201221165328880348763488094404
-4425772854689128756512183299147748549960529805463272504802739617344094375960651486501133996216955411590283887952698362709773340
-3400068591062085249345178361745959828363146278918068111168494145377017234716441154409189698261322125169944980545699464089750536
-8846865398199885991570109728269877331973845988335052515573008133676441111176443077214835337189028637762538757833593083011292020
-5146028640720658045073881058022137119722140728994381646856170548927402303281330627742305686994941764560406751703346767750713886
-7209258975092391507951817856714755923161856176501059139093203502102911025009832983122251947751287786516716014787221574638939756
-4031047248735708744857275535082996528246946792080390060989384866585501142477546435169883331570932498501313613151748523824910672
-5636536308963660510951867259797466984603129916969819578084787382312187680895777499152465628258228314680156051454804934741689251
-0512085879302345402847429395015269085320583560263939898103230391420972595529857458723736782481282792113866713373594735837816637
-7989131244460061235927200538684991689192443600011394251966967305334141431951393722271395226793607939272662478632186079903315157
-4105861225129127048237596511466748710669457275423951266966241892139141936555720690437418563605034436351637331842274069357984239
-7714780490538701008702866992517751463558344819912101444037343071198346617249265664311758101747127784897043351442589412949637554
-0794058900554049165331519254294841158439399536633260010261808293322453935679510287405960977887161196498223064393352481611148599
-1300801876528225731545729262391681879452425698425569733040068970789105907778300649408653356394071182530765139660697696280006682
-9500403460028711452841481826687628011337250118712797471026118134978473459279189369396543791538899643830373887355243212938105191
-0873118171200026341001915337132116843336126642682077009436271005094613931653248785836179383736770204896797782028704969977499350
-0015763840495758341501065058600781266869591393444306380925176998016954972799133300711081355008885083487358653288976991291458433
-1182038281534129680784410839850542254891681906855217404657576532842299794168911463577129652659153953666202320168343676218151354
-4489515205537483086890747806185147028159038841561163491305751443503026033718219551299657596422184541173585136713789948319572208
-5427049518844513938239013971033113865769356316346953363872557559769111015332419532829697997722648255367995610629118024243751562
-2407474388820183495631279695253839995841338363502759887550630065930650395810552864219034911688436057782562693639597408091177372
-6597246835826333390472023469934087393575305915386587464255626374910540525559513620612895257369286541372428722814356277369790926
-0540482329932732167361734686964636330198342028336626252732092257904785101659859937597352536082164206650257784256989122547150860
-6958569549047812907458129176134743095874743438183862052347741885494624143736509130890665487847350948675120079666371405006768737
-8780431675373547960195603385932928721012510177772630104840609721475744144915357267790854338213160647630650329373129575638594956
-9496521524390891252020171500116808958864975665633521384560269916937417268750283135245520953900937858745308291830904258244389317
-0015367958131832930196538448945414897381505579147872992058659675192664335486653438990141847260783598099119731774723267313420147
-7668586967951300028516829535113315808229408687973080784960696295388250987543953394689424360452251573606982659417899250410280988
-0855610169950498351316129660470090096789046559977941298373823170600445713232790694833343261118257499105417238723309775430866295
-2330553865870284141777533356762036585595078938692432368606760459748846645365953536258322870084801797022785593339163737467833147
-6997226216417469287126591633487052682393389785830401431520389186301156111690874765557617527284900760279233718743071166517225051
-9560345000426728260399841368953209835209100487337639538936954570820031680886090876109665021023200759147113373797389077298422122
-8175155068276335352679806117326566700814346009488428499581701401590558929437455938924635624938224553855781741120788865291783407
-2295536946679503673362429092591476438921243024065802176610048872694278802256805275897901963915809617356852239830206442834187860
-1980560976965565165140981488552352620248220002599581191144636050647934285203553865821505084561426414945738261567792216102403148
-1151908591260497769379834919810177114427370448525005415075150280396616811812913926897078347185577604045023394052213732465977204
-5152624009308747654657296667409633669797187558140762249677298229159695566185953786763883703575683368256625993695568514289670471
-5898396239237604417219674285036697981388707533386023577734556605753254850219222927862511398982564982295186931657039590148578018
-5932796785525089331274908323688642021701636412080489905006446995970747450915290182470813258134915840332610387871533886024451368
-8138194206803987511384906150527820013265474338857553899093509868964543274546783521373587071739152356855552276377502435950664343
-6671221923018976396144288089085545597962326938710922261699996323322275457923099268605292778087753199123847741515682942101433343
-0553836973054122354894964985734607674790792609106461042226839499946875666977767744836458472114784382708675816804952000351499560
-2364997010884637465860014885474868656892220025469289156670808481103243684995557245150848863996066555128792257705475749161690025
-4110649532154387762250909130921439734079690118528643911754202049214907597563788601359791270067268169269560624171237553348861595
-5940616224028249469894892261151683448506705471885912971357007128279832881479611563158245452847817654715394431167451576558923691
-2701950548115303007534807474569747157173002064876638265966317419898895957065042960548048125830083650783906003217529190210069108
-9448438509033254495362865744281724512323137198768884725254104680523096628653622761003126111128301647813853623032837646549389708
-8800961571279179907403520239170262557803310568213744508717356574441764473623277516011904000012404016704294869157929203333991614
-5621867976685621217499877201966531190154493625522363719922688125680349437187226891224242675375445798588375405091275415995993660
-6776602064451444697704536229609651834393352676778641614610712731028707328894803760218379598569050464723477953936124087430950917
-8609350069628812265374110081821823052163446196500492527833170210965201939797385205224718774402651526872691305286672629217382035
-8488697066441224751559631066164022076293716903983024132971083317225244640782734589625800094058649006568726351629980984900472989
-5845746441409288197669763941632849306888745439411555999404218596367981143977695990224865577494042079971012624349908586273448094
-3944731944003065116712174476397673714373918870846441482703374457072218866041336694655582361341131880499845103050687313792470342
-7857292237476195260600973001695477364449307421802939526518179464787823934178232688755800049682688090660718430541383983270572304
-0611341821464316878794523833266573224644012837504558841156871904475125652999503438286924058574554384509785291956022252381864357
-0405626679943651292212678664558286589975871490755359605369624889948784641951887207653741241486219388021477385980747033128784838
-0349563685997861866328510113314436119201124870929479544327167409917885140426561670911266619220856732660355093308773694213795936
-3842271417777258599324767675283259950186722960735488702869088413460362934496727774403713216022454808579752649987147082209915211
-7262086846799716572297263071380322488276591389406786696601706848938742607301811413241169596156442149745813064652698654676224030
-5774876540806221409456713575924968982273367206175097023050483195829231424480633395579433434537883182331511499750784779245974304
-6819745509357317439429415625378554567362388569070215909977624507836378437106698876357999443207523376055325643289588788312580731
-7833148656904363694334569121139758945904938915660261426660062808527488257575416983895078937523942074734502850315306918181450849
-0874641305830980547277712020017148651915548171250649493853510014278214375521776229277631115079740388430042785920214556466053488
-8302249778400205215684880334891997915871809162392886542987069548288428411471154533517912205528047987025944754683578880543791606
-0358320982227642668267885208147099122293592290139450664586369209811129197752858004803010616081626472750567559363814707696436535
-0313506752837594147209139665385131531998918025147449755897149885365821721038971422038604629058413601987368885444084132780675032
-8698373618661979252204221364880007737028947769589369624595251994724054095272484618585409406539000761630748495654887039290015310
-0800818173175869261167775704612174999230343952148568401102639665953327107535357309312915124706207238389207300777172747117401698
-0640073150863859675544943154734483059715378564796905159762945298307365280446171698542814284025032267504158534248530901828343035
-0873201504993233632733239057534034773053022444340692497950449652566396669145334447109018793398061041589027430348848568737315985
-0702523531880691374404054678759180464956226260133696133658291458560416403819468440250477647013266610552428012647058409477074911
-2679888054788444461424298005407130238905755507645631966764120317200939342102226493489457200513433158963725232826211305616759400
-6659241756332251314783750854468182797311328498121933543014291040088680657858265588241030117849346100683667795040402222839296842
-8277427249362157833641670896337597700968219737912856460330555628526942419632625557211562429343845027815601523792180592076379859
-9754404607631948362062894438912954500557072195072644550642458309860663622333701157823267362150209715197912528880882392701349340
-9392967484360182578733939528902161701930343748675665636284278981486199253820383071398887821347218338053979003089742707812914379
-2904235361284953393462862403685101898073830804299574939556200135991635904384199077467177409693740584708928799458835571980205648
-8121614185438088992376830836290018683875444583668400234525664787649173577729566744205001928280399848363250846307170382670891227
-1379156561645180509829419293369128655964653490776933715927876086576622995107120980971557236204092369803081979966524323872401105
-8210634652239640140303181717302977441319086010060056823202877048062527278336721358234059108992008083109338742139836036323492605
-7384031376893772770300054085703713950658765604751229388016547464754511995220292088356538057488534591958960218276518555883565725
-4074775956662864334941163174462487475635543748972688834049926463696503634025310758502751556398690346342648412837461668031647927
-6365750302288055740676475554487791055706610049861824646116595120976061102018119073494765991803213702717674747175954421813209939
-8009331937511328151001411154015547213063838109162601512214845406533014265983012161008264010599651427488015290161524354573353234
-6470978945561557225050621564665550894387519941185513668617316911095236397590508616848692919250154411755818493336504839734750031
-3525111855377922515708294426372763399105358667430235504503228627410198905334837234851992023849271193012460177555030458178964902
-2832205291216922852095126506355099210740893308816704635379794133382523761361826241501772732710458333973916837834880210080414250
-9084082447350749526849475397900892283815818083030975632291741303292925823304366055091504295072069505478412237935230243114270458
-8733240614953524515745727759843129756538792646920469274157284227528661937418719037781765126256474601006075476554791323844619684
-1035243868690685092085007530104395247063420667025726455865466535541087734271159372906562129287612463548495628710375386966180600
-5440542501876451157868698528285357586655663503645304099842630588650168915815059917415278238955617758631802903768822104984447821
-2018849475721498910886528030895133588236820109040257215930892013189827568406433756483461049360024443491773721292902184969255790
-8822875627013591731684908728396697952056849491038175568000507526035874582989907019189676297477355884544173196568562596540184740
-6207027832469439408465681825635058880584562540284002435337574271598044807397129809411607354965616450909115426381853724556891033
-7221658030059861817521753782741366902139395897501991336285575875528980544038829626149666345302799699624831576475243396464744984
-1649540253799052538081391692469181324705607910980425515252483873483980593877409055481936471747872491282539042199279780879543216
-4236145733824367590860331474571745015558798839670826761096891349398910243527132904379844441054007921880393265550231971508677926
-9325201276405157061556423958329163005949768823959483768715570931105074676418085399720398268434277889429566019457186074673651582
-1556755082109554008455021604947841187746491317217027281220528571996910808491743715098726471698066342041982149950618417860098084
-9612051527440619756444098523237719085720236857461176953239899550769256325996619384467815272576473677824512425753715748473823644
-3293706412332532029368150574309147409666660955800738909802362577371939197344269404239579009973609254902956047445459161013030585
-3889810572293351817285095560307955387570122899356894847953368306309169743185951491528192204482516204225431961214922057114411745
-2466537795850541088028557343809549480793529110899163252329393397207265339963882361084755962562912216879860134066671514387618346
-7860354854395803331508980945959835169783983572284248855654573657487835485311040917221652836888254950796354469715116733559514443
-9649687850645361629683896013084952406507914922578933911589068814423571506614639956792270631464418346423540206296752844238915237
-6020288012912630828121914201273847417936995938147436941121877369382021368921214557882494996867880498498027992143690818597132057
-7464732232055318247290946075477625177092427701352448918522702341636498386700884661390140882325113012278493389309349523351396213
-9696483275515491260944768055252019253491922403588385357522280969636691193420388846988546363998678336385777443993831313531774583
-6282522032399446565965739736752150396232120722412203505719106262036358824681398508892551567229346012725815333843066908465157756
-9407628149379572734413508114861082667244920525693627019900560538557779908157912341364139167913811711711544677292025506854245811
-3464634373606321375959043076084467134891991975403488809906777158185809859079955799214529934428440394715803296141747865907907489
-9423993889790762040142434803114305323935291193328498665927373291227929076575533913306444776443880643225751481031179680675214923
-3368470912062297700011980465345274304044785588310672874869214201316579834207228249128013243107286248089143869069547088156308777
-1414590222708121116814503748513196371955339806257298864789960510451079590735116383580469454857965360874314128844784304143454069
-8766678394720390254448078037404671513243310605018703312189431738938607517130277658972087080448195787216475306011123823302381254
-3391550184839202307004590614178501644771630600861096494601392733266531850599404613838770697571965897048614790913072319558856284
-7803230787138777594218452988887094396749088370117209351285801556001096168575241228759515079363186428923678980339871398190852582
-4019696628533985636279505759337532628472390302841917324608852947709111244515112700445738982371253756187679740389512024539739520
-4770847899134941839230668652175028834007538603739876886601634289336067458758592877494727624461743546957277223347887135182085175
-9704365765485920770156655545282270424007413902597806432869012806155483311798101235310454409760720811406614955012826140011450968
-0313480515097495573412839063893028999786645804567919951099814820194282264604422806064547777371073192487100289094441987847150568
-1657543112009039941765308947835121413396501421019711136903259340105124014460634621836811024214292779775980478293474663062122820
-9705767650372955367904858685510440746508331239334572782478185604370866609254504064506288513924921428844442806366648997093161941
-3489214963851233247024856358669087681654387218345765317192165484089902190489810844772030255183904855574220071570304690043795231
-2065091959221855386411960322245401320421129454685844655947550889456851989959823948526569728196088066488438899595441765150072821
-4429114819428348855107669954324003559235452502739679008927728613312163086830142833511895866448006257958165946765071157730382695
-9882679827690443780755577550740154748999710142655073573245474660654485200341800425388615819101330831466686148830980748666684090
-7163405135812565179670235235614927720441373285793867065291904861238349709700184831060873375476942470039510660809272264903320798
-4462917767939061046448018044214701368685457860623889616757211734619696932095108903120448131130054208365085745531785639497736359
-8218165839330532616994196742532527473553555966673141549749982047712150106818828620285541917373915693522694719282613944281399835
-8674485087809037160526520795860814268331241546826667372648249043039257847644579120849321232434718628926179993145231262359579173
-6402705380929919120941181769537062173912605142768108201761013755197467816367902585985810911153925853453654100594647121313245913
-0666872833826033632401371436548685693080139022484100159022033636174658329127466366162032910540421919446428986161784748017789598
-4723199613767942411247930612753447325541505390129994382585659648148388692327147276519250190560063905452973361339890280400124358
-6913416888336681958297148217827338479648390575317941960750631878321348332412104016113215430987661026879407929196484877377640061
-8494663204235300224243052398541725825482919073092074355975063032796596426605495082752541621103997044605964809112021627153615430
-1932408491193512375077001954464823146678231602554522550896013165127235920096414910813761330938337552089472955671775628068540474
-8216732019553272236739723100215131535386354969462704414412180804694918899617675023795044921436432605559415902678545425651517812
-8025247190590822148102225680479409002058106823871348717740963812585351667254545007307100968605826752214724522314039708032085185
-2898242245907570507615621864533672777989484514162394933849338212142607118088404798508269488444104500180113716320167923336719325
-6087711919535546884547342110103435389748847458344462232091767124995184518172878034781269231230242533893228603793308922587510107
-4591474660599204864799066811331150365409997858447042372594886218949250820247279474918230135657009456785941687614114216570961562
-0712145092385555182611993058740320634997625075753366666542910024626577807784857468873721417913984050547176339602792705731039726
-5904226911569176720780206777188612328120845124057780320649670149526594811111907198960857717925291216166167928639613716137663067
-4307416456452371611701931195073322788105756639763524372948315105493615715372579618838296610933712476520491005806495650421658587
-8328103991782890592563008949384942150246156275152343753139757736003563406755966669814359044466955928045317799518086337670918431
-0138083133435376046718367707916060720252112445257291714225747183751131216668718597844623190537189131972377334685833227229634752
-6238721382625606157004023423898943602807707672999152909288657052128785368828226605301253816178238566671806542598902348311422328
-8320139586923410723937149546492213794676826048701166669784481756530412597915193651538414740148097847037639468257092287852640305
-5479022830982203377478476331811758576901670233527290215872232363518816501458927070562308753377018843087767143244104321568604135
-7369186061703793181459759961931363593408835426106781211446368072605366366571248851597783995945722926222426820630491316650527779
-8828573417201809585216027386210261861298732060253123609864528252840272478045882739663756003736716392199489082689850824432511971
-8111646983909651153366476446390221276039522740932580204249319217339578537772918571217444956420257260371077236650618481206170288
-2935054551970379324008798030984106801055948226939968902171687217907155340893582643366397894579369212912093597160438593641683669
-2485378257568528389277310889609277386833678172566456312002344737328227016110453362502908568225831332260414575845627976066579941
-3482852162228716106007258452673841400279159876124086723321209861347673279139378292982201754962295388660515249705755465339980807
-8586012495756212505119149505421333725699491270326513988475156468533804482583378661782959257850441126447111003717332538997317723
-1776086627675735007130894098661445494477133237650830139159997474669449285984774365441233470966013545796673243563388041724650925
-4871204375981896728514583939521811481161849278118060344334503543763509824336823270998963842004711517359429526921820434423765506
-4949119417418804810189631493303008698556136954410752013975187350631734375598695358460132019129899037320268439555839944615572946
-2352205983666568424098911534581381260867463768189900460175744875437666192115066390019086651996365032553554531097825841729484867
-6396761821871154925250940721334814793716957966097731930384514803099552848004844714015522077211735687647117734547230837853524693
-1596031648179998000220637673943792334209148422484797868537888852196932416293373918035158752836265069893009384789762509582269339
-9695024706050496247098862490788952376578622083442656866053965079277898118236124486093149364786379996025483226916387856904200464
-5207178534801739733741859262250257717063345689422848102283865760573174574242830519134626672907219548945944321186449133371889496
-8091522599148708961675484538617588113615426169855145369191110338586586013267131819054886276010519517578355159744969858769754154
-1409888192657898889323633959345553144675637666158270953101126274823625732454329591205013981131246606853736622675628645701807371
-9520905296639004266979383969455080705361676763621326243504360544161563837353776252465278766865244727756979870759572455920688699
-9581386171160687133121725147597447299189214610587624098233087649334093755829602691095533964193964555227483958747057992036054166
-8721053344317784071933338712749304229416314171955616978192540365793299631623144229526476496982594982691261090976385827573975900
-7821592310703338108652726889016577851582851275588755649801212540201927028394346407971389167170778763825909054893860501536766294
-1680216758688189041294684581042122535978201496230771039365667061380634389195094311357702877874169983055267901138828354564408227
-3161070157288336465271541894601581266294703722546655378330486847268915166615856440605517140340676687703279431660743947236511822
-7741994422834194190860106225475557703581613419594307564273066500384493526007784089212735294217591917854424698645245431154845570
-7453435530259083182485810144347944810673614929556646679467919668579911140259730381818980942598880746925296760172341499274790409
-2328005309406832991426090784212693827689769275846169654962563240745452602435209585710235753460014401490458336687380630135023071
-5366592739312999644456849006548399917819901894358497737731098338943033079178655254808256654806548883980302404456845406302737523
-7903862311453131512315977712627346676478344399846058399879029101474967706599628983635802084695117268292559579897221003598626395
-1226042367447825280036345293351132154926212820976803484997329381495188404459278925205516668444497544901886948777923893344531981
-6856828147900151315527595804653628550631963940129883617356848115429626055627960941822258407367220366681493979858804129725050531
-5342427449777364357294403483728929672993293331804282077540029002773232860603723492768689779320843055290078442091489307669129440
-2646993961014124319764296539370434958358249722078956842849671467698536721940846395173191197670777284048312934901527571955362838
-0198542559113109732314309858412233715215167131228324026800689688315670022802995393900835564840785241774828835077665262843753444
-9550183762744591451958276893980778053478437092327149970098767098796188062615518630585477187237482484844353645352242801527565339
-4554133259430221270883589344804016824319680145988501368070988742027201586296359667866696516024912143872664381709357471736498210
-5093801098192097809224518282804541968783581829389873304181998214634779593308644761544892301474532546795113168811568716153209669
-1410860371073926432124196875939453572716037044352794395231284292433400177009767688979893244784882963302195811252949131002020348
-1963827673323077855623143768105648991600618303185458508264555147286917125868559346485583695956446151749324530132278047444739067
-6874456031627491486993438537612795741124963717273593326065380547768578196708046010574823669488232340781667689355939847002297664
-9059011156256654537948571823030159169978023672567790424242785131594034312912382632898662220373433122635586320057460971136026042
-4324851680908243245093083193503431558790765585803419091388697495752260988154385332510991556891584925155976792883412406678432776
-5169890219592441180988843355694784180780002217839745830787310928598719082559628331291213329365294364549008762394123896795514907
-4029304916499522070046006091292088087865888798317559803991873835903034439822636248876206336683085957754970026069257438125567024
-5122833726152490145361691490840338977240905109443464507374230617046450541939205551391476680636725777819582830317640677472291259
-8887879121383290774133008351057610071339235010888965861277804156037797773751958774639837524541250075316907358014661336099985243
-8039061153806899718406603277773464956989757949717475056088907096202984062415028201715624897091896396812284772715615886727140592
-0697572299245622972158982736674917157478112408603912440899066443377237594315710291599368603222944799827489902803052151032150505
-7013603271652485049620063445001242816749693945247727354086779497318820787447165373787134099987577277741625609459410605718145900
-0792184428093364028147126779227116462983472771162905140500152025984437549037622220978921623538498863508150200422542729027788614
-4411728159030287378714419332373354590292666051672346415137756916116829485503628039118411108736302251425180386282192968531233608
-3508034331771430567756401746605566004814192531598982097023747313496871602413228109505959309225451717487757635602112764447022631
-3428939513944422073187530514913804210377096901814387277664055693937327821063211837805670103207586535472844416128884599982345779
-3765013258236529201610750246167509469405857415384290132571908547691847116538830356937781623544344792657443940779980096189839626
-9024565602139835552337325332903285437411134785405743434839219379066510469685518924233636921521087402359934033983973385991471002
-2649847962568274167726165208946386788572121523811142222528040146116227215917720262618074588389904637062666528544746561556536935
-2620030538510199023964637151697713281829456055441798954059894139613970616409824903577033806155241943903044175681019965795785283
-6461188416880024087073825761424480883587286299792763357082205040327994699188993856940062456204962545880583868705703598889787721
-5944413986797134250694896844973795638537262177510549522817774683727110576630405084332924025735617088037709220742387561124513292
-1615973751057225002195236737059699517585264539200525680337988614003524501832730480276366257598203042140690301023569755795697899
-9008200222469601333665860661780983941015300488620597776980944258674129973552734738060885268066420909348372616142102733523433267
-5003598890783029733738430164315966147920008508177297711130783619606431201578483617231981134136392404255762575061631480099367673
-4714080230392459893569173674100327560113467502678424574866012722633975629063693151545366570327641280682622355521718987259238801
-4739385038824895235096103000674296240229268577109938375885209481939108319170129231324096236414336990925757528939018270228944966
-2361210030668060864499350273214477998565800871680472680681932947260121232176894643185754378295528202618772690219192407686919753
-5156059412217536746848726448056144396547837914584560922069735882550291341190213498634134528385275982127813806960692781201779053
-7966885142214723811725348168549783205309168240872140544601559983829401790243561220385975487819401267336194223205730538148703619
-2086985085185073545036414851529838204481235650803097024838796015231330542654233028002529608154776678617456164886732320375739646
-0833105952434512974899609076351921948939569136092110228925816092118172001373677700416412487399777738494320581470807407424704877
-8185614688665309617727123329966574828512583312557787490171669059879359795468437113583190694186011613831079902014081217754134725
-7131783601536200912167420913195076409694857630710552837087267662216383925992631278943851251589580445676689967886327863559646484
-9888310805734900531289699098784350167801387862535778038559729898236704661594447329313866535642213694637004811239940871137589762
-8123715241748226553144892581245052850529932097715696995932059624924557269075540247991049472713937530723957720713793716760718395
-6093034172460809629440737053209815131819638726936540787299401716655839213840485847609031890782549934060830350478366179240604434
-6633327894940509763972045245237235718323112502675490128278367355639972323817271838806709048068724517131782516093900913433491465
-5582353019666679291426183344951264862654895560952921265198755899160545875749490172299073507227437486882523588711701507976499572
-7489002650231525223980434094738594856401532028510616419177773329613390523750901433006132084090755184848290450781826037290985462
-0539323854296447671459242043430937704073386171637825236119340677027183609466820564020370547139050173937355911835070350187485451
-6965582154750741810065288181652685394941853476132562873871859640024361243300296805283748325817168878484565585632754351908511680
-2886210467566660836736517150078351812871682359935951946868379376912994012664524203941072154686353570579681603704825530456774626
-9665362335544365210262820037867343620764616695075643840510926473275049084133707571284177399685539645626628023165977084111958392
-0177820463043321585863992470028736425683626513381632161117010851699245594406701811450201210813697392240877275493182279748367019
-7250981623715632368538564967386387747576695271655268440119068242579103997269027655460321699463398768768277613166901925556040578
-2730921762116366900155596821064099866827590787028023864778747307107976624095851829841563684215591447795700215410952638220148923
-8642501753068607515960160175361362264643558443610150876742595480796702902130477857992388072241713968623856298400849938588555032
-1187308644994319305723690746675187962892871980887310999328792568364489164541385679772588717510375815217942384186220430941913143
-7605854751867100384861067666196612302899049367936234596159545293447341885894031370313641111815396044152641244256403303821921174
-8006560725678932454993887223171401960145271946857211912769628951507047840598467703395747670926287903550867839502877316151413748
-5747061868485506527664044246509977629632520838572005928929416857628593497937173916677705472302579778727680532363758751491026938
-3023153622006915734476058970896478596388304728569523091701672491484313935627044876208043141561946195882862365574965158147452289
-8540852691422877019070250316861163162391778272197273383387116022030059687803664857766804536240988573448290819394431972776651275
-9021443311810736715901066501558981319880316837771114344162148017989800388690774710489918382047318311988709068050500771418272212
-7599513906333939122554708100671399521304710290565461919067937465641955962609388316053120501043224440969693966990639899533003437
-3190313864768728595063193176469208637792413542897116168001394022157595453909893711585707042678368387735204900683732630413423309
-6043003917729256108805619361421477310316625655437814740309514638761344462517487426501249646525209961899684542352037279524879981
-6813035487710494491438894246146083397270552071559892438473910394670225142289451782904407545380437720612171136664498766583513111
-5704425501897608539934816199146825064755643795555188152948142674213138361295684789361927194878162187162220359319096077044697338
-1170042273866788055113160203247185045523345121557337349823787766288071325865947069357672811750151752362658390610542086745537803
-0182650295086344086825098102966797093995388649163271139864646408250278380402342942834021881070263294572807189069134900984272374
-0906668841731928141540118014775032666661994283184008007242068962044782267000273516374045366478779586459658472979356032532424400
-9941559950477797261120283165043361871515058911345852440301289987592080477208449029732297262652194811701835630896804400526302181
-9586422168434769367306983212903836891536506488360440148109923788291834492143450307170521991049310812325101209435949795579328604
-8845618327364168114007785559410459235882830447965260478796725064238526247677648804067848274177910485949526784938820751326532317
-2508842138180368207641530038974478572707059622379262380563191970615374835570345785749767510398007047615953484581417608147080414
-6150921916969845997446844026937752931358496152526223613349123080269156525204842351030887676736715854630790139383298746726376238
-0031087628812333418550306049252849828620365883770156880965318518371047868891562748685920081560624079882621440888924178323074068
-8556547813934656680983629186991073869359264408784267940961601835440468005712703124932656473056207782384291231611143830784642169
-4764006946356475094019331519107580885428818699148255825445877812529420751612646315832517900095651843319599421976422128038327435
-6209251031135205676846184796239439073588798115331056299413787815047447544760251266043212878984345103105431840273907195809002871
-3654931993884850780377252970969582655676559449815451929264323578834644743068604576736541418957979028943061560532360261664725787
-1145330876015831126155307819990268909839073491920596329763420311698726840745194869089228905040694957988171983477254803375572985
-8257437969668449439729079801079379205727147223003815670652927114347162605507272520770488283403449339977650008075057150876981627
-8526350745722665602676982911174850303165259851752432760991481586280102205346134401601648981884690319798225175260769925489404224
-4638271898447020123724423300538195550321048052825314720561544239062181964769986570926083174181155377779882057584541395809301918
-6106817249634524848855511452769182264081765291797239837907787970553958190403210902425419707216288535844322802242224844682625560
-0987012833422099095295557450557916850795807069003361331869709388270541973078686998103429124404642889230735965872322730527661759
-0637705394090134454432592452488278594036085049343720666733736875565892704518648963039960363828210137149300479545174722900885474
-0438909745910598389431226270312843755719991811348892485728211852221096700168476622881940496574796916264512821293932878797623865
-5429545451401418793893535526425687987849470147455674595433976709030225358630706349020692453458568350635883987698939555558472630
-1147145098629672646090540159437091576295858909288901226882948677153091610088843747423989951237804279634707873305141146001310035
-1453067258355914230711608884942303119909820139748995292741299997309447939834224950618749891034712331269306844559292626045946290
-0350632260797112269078999525007760708741928859358707432624911128337604559525225243942115958112015615876335010570860522898738781
-1402978628312279477469329446037732401120697968328000813953667479029085290308524043626235410022744559135665074491331563473370347
-9337757755044278436081677756600946862635252212939271849678018763209718297572192696470355304192247185638719953361091249281203364
-5405880207322161294391822123973103190408090878564615457135856917654118957703067143223083955082019279925860379183853717628861577
-7799366841975673356259200026023839542055869990618462031135739235438635258865047764693545067810235010528954960166478294307447628
-2027467028086256924839310527875817129214597755080392073496545377860632428440004957401492609606750537328284161904594401425287572
-0946928415702129545673169191304792948477302426781915513863540380482590408165885780307409257801864775225156808756934724074392504
-6885597618942836774284752567772379904321306380471869189416734595292130350179577547119957964477389742383246612250778027835962842
-8375378564184742787926400597138354486910116541106048723078444753508902260690644823241797242756355368838174606975331846084479482
-3212968824505986851162688090961261899834237009593445525206396148505570975743205626589129717163778397732428341839974826649188402
-6250784433605236331523177619946160387836454523224441645894992796160653797716355919979290100324224314406791061386652716371890152
-4400989435392530316607884601954369502551234892963245103254821300716613610559994576020035792556553491043544497572846045958494663
-5437689141597501417826982456539318735177994543195003033035189307876601341936559142966278723819207128349590261078232012690448383
-2240565515565951781099043148895044873938264025267367187036427905278273314523689584565134739736805096906657362307932608184624022
-3576329018410785775670826940638079688618282322990520892260090365771287681416891560096002562633570097542699787911417555916230717
-2453291822907103982064112069025122300625453433920178638265846617355201994938801382944512864303440296743023682910689965580508346
-3275346241221900813564939920509014369583021411699796257800366335780055834288641882272217012847000156622653258224710526325808198
-1761823047477639207496107226016946214853880512328754599996142453344143869395811453079561049784458849323538032761380820785136205
-2258773098932947134988484220635633194802789720564239663961212480883691013756304617477696306260192353528126108628749643695576613
-6833244981505084786837439890389565039428783638198451342774797405426073205683183254178026538685346206428799444442723636136435573
-9080842459252171303872018490896413638818633597602353810855257937546412235233854346618680040369752485990328489156699457496819504
-5734956183309699603857071255358660306282081929816419207249476965467352584050195709593369245076183392383809049796820142290983389
-0663950400843838925251438784404925348605007257769726864605575147487057019983649102686292523010863667700171976798290888401737766
-3133554911232814826547253321321519762370231796859406653514455605268584403622162920523841843001241629651167179835787795168834729
-9915875102181929094696545619337694209374642713183714372607433054204210229685880508097695696888633628128273726076768020385810595
-2987095117021662238907432053186678763052465613665295736124815230360572136345177452861949998291445717212884676001873754746660396
-2589155650613427623626563286829473395485125944790254164155482476888221798281733050713864337019212875437294907722695910181965531
-8195108479458493218118347693154287549401864008165971140576262020179031350059154171267408221692360825699802778787719114529741055
-2994227854778559135194271668156980433699910463754412118741685322605625614010496732911474348010716497147621915462772990056635740
-9885103937597375812527288674502022238204092589207503781840088970784707532373479354579114899440649532568358342845263798451171893
-1120400390759648596081862269355864764100400822617213332109125827310532445408926542692499006220714769552811438530408840934868695
-9637352403752939344901814991765254063329438135234927589317161742716459240954818619945185528105201605559036407476820639345279573
-0967725725520221343652248725994878515580037117626550685849684690414565200284452932891511103030564811419601323232328459974123969
-5151667166514928638097099027082126182546856178488195923185506331245117707219875304117100373941938587261574361349595466933901648
-3122056019614029244775838489907181693402454194031630939340884628769127341314464687448572665248434305566402372170442289658220344
-7261444332642187051262725693834547125915901896179000263992637439997458766108204237403853459573909864356641282495892771557042023
-6977452997091657310159593635773017261586291897746068707373152247429150821576531204588421265308077483457611680883539505380780214
-3922860418447742388907173493206552834918162458673611316176697519544920126038326376534410690399328547067085820148163398020288911
-4131844303372153660043567296613439825919900174540571926796003444468128320273120297033737036976412016725245066800816469650561843
-0565592489986925533018758592782811877964316768421296500160427160146511217146432195095933744734673635804950107620352420106654863
-6645406729317349776240373018557665618972564221260681309297356903494539710063100566543717860365197783559220679304253096607594218
-8395581134093404449211217585032937525052183907591091053649490577579801329664352206258963567937765723904612138153463659172391420
-2858367788679710677058155486700833423902690944634848842142528244040019800469662248189870722506296487688337321695524703236140988
-9562335938642263288699025637860876864417622879634601222106055965060418025394207515941236354344664880329773638937529679471456359
-3869629127425084307826072099872319475018151572502025420028453624372211412720817771154291359747053407476074728284771551844057529
-1190185706672366345077026144989614660307994733718658435474012628808621940611349704306495070342196599139286091306151010932970462
-9675509101851273861946201556462769919002921112388488480221448504521451553534147109710141587683279463216951321945573166307639217
-6672697005271871616738575015318763914957713525828413258526916822948066768551357315714715932196912191677461856418144576263544333
-4907150429612203297659855554908990742757537394357200499303314336795187732766056993269698914296065846201908473023132752908744956
-6150083396086150456609926582054844276634569272470435640456573226419822868710777542210573165448531019738194685407995076708226492
-2678786284405544977160356904372320894983311525398796027674382539921414318300162458602130818377816924569056780073177178248997811
-1585303840969268907598807940355932272770894001504038659615940425154386157294260258784536698627961267225191113300660353374029144
-4866449090853757246935294981633041248861600653432843768265539085865624263955878975774708775312072236190746445124355521953038339
-0619885412382828558999175920193016334591402367369763220140054897008235791975355396141026004273210423619062237213937060537525842
-8976484958039104695613723977251336268561215466702146950426183444969792826975925369611735319989524615202694816932040830397174311
-9564951821673710247264553143623225237946783695563652359502341538660577772441234930760198015851060420035149363908475167289811549
-6152784468367404157734119802017549287296220448855141063864170092034156049229526992205564211402819767239639089903951267480899195
-1084349314003385023967647400823528491190700765335630550586981662116778098851626565057148602128362406840285312235675524872617927
-5940674859942896006453306875133525569054425493267698876245403823203215376527985578976643008721792339745957322665402353157011446
-1029563432263058113381593903721587363928336506888785654392441615160711392515188910321841843403492466442469739247826795396883496
-7172639941661127457144015058984534581536740542737103665437103773621233103380626067034160263026558390443198760839727420004712631
-9914873013707039718441199896815680469326923849342274027255430706708553663676894461369886145860075954707988128252410758852549672
-1551922530995012072301491677655182006822391780785787705916872826260151900149221019724939267128249948853451126842232399605725462
-6980483373104508461112547210954800274259585332622017453698311994963928004018795768275261593898964198667538969022507330787533788
-8940619208645823836214853361748146283829606466502798396069751370937123229891589445495370452889766339397264192786388083894708555
-7956574006856378561036342289467521536334236359576203113726730817643632648603038458281607027513534064039819509732524551295593096
-5939647576077639500586029620496592494701352335060993013958711501324112331829653462612315976140447947573865479895456805542744172
-8296423959232512165579460974983453693457497491285869113279013506974543084139634238126476293873284263151589338438860044240330996
-3782355276288558083473518137834514003242038994143031796041577911531844210313799581374155317783854201414730465792201716701206550
-7105406465035531748842630956573813909293101829709167100331101814849787778408887961527614275809837033921260676349397115972110690
-9643615107680266865840715334731751157919061855580521203957602157773380969437003086918579100512932764454793288187949797876169125
-3320437252833110321043772044039248321368660878095814104499448998676046985620748260108371162632325229365624907230743947154301806
-3552088981131531046172808385452694435204741530370783735986679874877536428004908486014008409001068550950540888673128998784481805
-7440503329453373467657006789991046671852958451887155184801369224781302834630349870843861530093008719949904514151022786314021716
-2709390621195321800279652002200952192418979261420927427122958490897500556999549527116421814590121223682055231817153659082402135
-8861992826208042869383343763880314283402643395875744203109296333659792215641368608715044344315779183133340656043459727198349780
-2734853139703811794155039071217208536677070354393864907407146911703003457454092806351920281851834356124440898064979131802059323
-1762234053491518617088128044036706357776327020285634889111113700954005526394521483443227952188980642686375398780347144135711592
-4027397751732022026309364751091606371427768246571192961054471672221120559486812200168063013361795376094462318094221786026438363
-0392038021743121561693528064882454352142444617962196680006981383051817202169379782864384242280286939946138589599414498933359730
-0182070858522164858867574874421689046928982559988292189961850204180007351631664423841067686122468503764793368632417463823286265
-0700191191614031195459835157848968083002627564348814468750050055060620960050671214092145749062318287857521361265309131257106421
-0309993332034066779054757057884677047198784197094514566927373158826040214788501636945490789604082561095662632988383214277496388
-8146430655840989789550968117320096504739356599535135443521661785643633703575650679430439992282453217709233862686803968241138826
-7498984628272507825242938050646337866580174070972879570659031107873223367860364402212183428942145402115290592836227443279445979
-6978276114539892419020829624768340474210713091442435775100177879638010349673639613552216581396012901447719087628078745824194120
-8522095336564609176473140966826492093656451125709888847406519188859548795021576488451306844892007565711047730272408121668647900
-8524767921694471514347227180326839537161579546977834075174921433329341884828393393398191832645952423890037661848882505051151043
-2944580067530192277404349067174032715610611074091485944569506105415953050308842454649185132382815370040650599793085560858695708
-1141032332340176333446374984947231196716478639118202128308413932621313966803046203929215874583358851861354789012133869833074749
-9480985593249065406361871874582636508161948209786505592954264261087303579799611153927773325602584185048591266936288024303976476
-7322835259534879703369663910307964057121123765236316839734559189401161415410496300232441653039670294405632163031483814775087095
-7887660928641822340331849719497888363217187995951806289777062854449559129016492535377000453799053164705981391283757823729876400
-6020813393115291018308864451756852473844549771230553274019875173525511163873500444811237248088951714603052752360262642567865853
-6201967072308522428055969416019910663232530141827188975690227560728650829855364963013282370083361622353100870401742620986225707
-2869802657723987122733883328526226736949680510879014974422147235169606191520933028844627505009715152702759247026991603640320467
-4241131697918560404418795016499808486429648304834823604182336854359989655705275261891160035233666029073733408580774645759107173
-6464198087662041784095710258475229347049766003901523983606673438365749432588484287371422883288614656304912471987516429205303532
-2029089639113957845701115097046043607676790299218866434022020078360708383436488957906770062559366765186955585351813372430895635
-6464504289920784076224333417714908863182256990967502428628619515039237321418833968508382684390570422398059844256244914931448759
-6529784435502409492045275382927262616866859838773431100600230894559679830532230924353989524323228472158682810144077054469603044
-1378563204070129032409938042343154208174485755861395799608824865872543930138962034925792279431758568493941395394754047686715676
-8867499345143102872671197738475892292486346568581939250404454964808538362896520373387072413955104371842316500056740851235207639
-2274346030168140429762079586632175197653839654847793978202115595048824365507532766797058257757822432716594523867292474757570615
-8116418268033688475580223253494948603537184329744599083311334953737050247127839879240255833527455107807664847505065047983484396
-2629458032033571400314592548790506246485500676837502841162113579334258598171571921210523629971864377357109335285657941548264619
-0524276024669364832317266608416143775893545796330992023551256594493130557067547024156422646526989759981543218213803553279470269
-7049845656048970965053022592938828183548869262256486091586477018991837255857719144475359084653581143521408001578287580561915936
-9529610539570129132154472887914287431871889778678946943105713104741010716248000242330469610192173796870030679714772937881344366
-0545264556901297919417188117578751509627881737016436472816406518703771084849520268761391513510275790321817000658619656930708957
-1126630442325657535785952978581421903165028332745161812379117711348541046986438165712940213350699237254925482467553006850919218
-5721411832634196862603413999653849373180502518946059378586343176647830400545625593156677745062236816423794840646924829283523696
-9566889818345214089079695756528442838502922581513940730675014653702918250796815796276266282500947845827720283326159797147319082
-9317560741024728849503640154852784294588264197172188120649331980986731376355567665746330692183280397742589194244588569542845631
-3577828329965372354724624706136258680035391223875847298805321085928193394693686066077198681054782793606636920380474314204706128
-3316822771568615892652610314018713244424614540516258058981790879447066097870072989300359291800915299516058342141748356513095635
-5061676595203394978368391202469283356586340799916518917181619890218937093078654617621002548811013022192072875054917226111499567
-2293159175827100175340065081112035701753220885751903235819929349733241991099088182499008327172200193308932710369190557345577793
-7287877879088510408061450710486988984638957628372307246581657037353807145126249736162916823230146250853818942298633104586163230
-7832024984477944259180948598164959684871867948848537597567339850852013498502229835859692193114794153895539003144519694217709429
-8852158774260606249546637223424939759148603134570091996953512424441839401422606873114052812717989308319825300637980593162367504
-4443868737007280155976070920335648272365458102007219456742917706885599061474160397874769568586074099945991122357965710810304405
-6905794745598083595623675442819199614676323588131811003338385631872023890221085694977414242799825541355735846812034684719203047
-0457011399186690441251124301781521567240706876614307067167646882762698974983127872249705063133235031055532098528898796399551640
-9652581539551646223682272835407450811885069347498654352393131589816331647166209087054200913809824196442611900896852634745826036
-6159069172552131589074592658415752799244670288018595097465086916954714517572062029793973193555030320732773860687445556056374048
-5349001165930930982732148212936887040004758525708856986464739067246746909509060364496603927468208068059374896651091078566710130
-6254982141720413268677308357696628123925721390150502950572640806864637896561429156063059840807574455370484872143372214422469569
-2175489787129382942852202790241971823638922108920609980574885762787573196139571654120370722438096597478384547338469999448759583
-5779677161907195059713244890541696081649739347821725617254499816041573948157136918495996244811587574062062152794567408848302587
-2529817818204143798110200493373689828340608796471631850589769739013205825657411890682974212480864416875107897957894840172709126
-8663943826538718474564967927014748693701498556781723819074861406711142155938775092841806948205850959520646877840367557220520678
-7792447422465445177106699668289442956655097062959653482152033676820332098951332376110889269353539366684304599313150351375802284
-0121046685822850120961765570267263832452267770816505513149214924261156051159905321694021977473033018289683251782668439030324894
-8869657128937432079954235872959567283205921860119040052090516147170061627077989260167387744379514761600478703309504193576305611
-5381561915778733491108127139487324618000049052071735127115368151009776782599438434551832876965146125033956869670863387976299721
-0949362683385697791271115461446907297573048650262795825751967646029677499691298037462050809938530416641818484223928338242122429
-9766820839983470977275951789763019956067562051439591397901411073621068841669094149499180916451056538781312613407170881646764399
-6524347269748594984863393554929474287488214701192085748591350202439606866037583191335302568028741994749726846505035406608976877
-2807315518903493816008029815670675803410749049697801438415798820359073479308467800153777926573033244523898966885887408576598556
-2253435971693966005243248611373406144205306206628977772254035623423592393288603285157497164481644751059433660694427679833172764
-2802621839144263944769655055452576122669485060013276462140874654840615169333830556593045220363613387004343762888697682047116295
-6079893975072940528060570984236651746363761678873252309931727588216926947288076839743652207728678149523270862367475616321714661
-6924992946415404337508448250054422067066309322273329866764351438985216249046429085623842949432537700067268248539671410894502789
-8240333706088312915806196572306355577223650119535205051323962302240268709606481125217437426747720173549677961990418013172593155
-6781963827534077258276934309689853954408488415498885594714929736965951139633336078246485722224486449322009472875775669311469575
-9358007010281073437748629060353526682504603164238126641900438090676758229061250503441387135871208008336678965627603224246244049
-5356708068957856933330346985639541006539430131114293957097055267024756313531830324556261486697384925986987181884646073628504968
-6088781492829096627570053299366443750840538654491246720498646497885473443660031433479078885663560146413659899024021823265546612
-4698755327188359177076358836200498034389012684305157808211750883923932482111066086636126223845187785757048164121301047675382008
-4187475464845783395113764420886751702440050366103999318308171948006157647282740757274766917041519563322385269555023048099709528
-0571195389552617367126852668538451980401879674162973150705011024259186076369903231002763667511763488135226006543931654677750804
-0619275562362999032336486727097255819748979447931027384044606019902431591438640635467977566427621673095319535200747603235302696
-4867604449981342383768009732025809614182230646572537976384930951101533738349930256172344711040076994914315737263468451025930022
-9527865696943210023342715736597334765710291291516121893348495349788313734498145749015674214471321122949483123539062028956769641
-9765176523721839937410174251025970316488964877877371126040698433360574265827174483074565633308845572364434646203497713132542776
-7378651477723436227947997821691317672343016210083663443777377182287912898006288444888091959123188074922030160615537818420033213
-8447189492947088531974966589067358589089364485475991918412867217338548681050492469752464750298772894247076136639226285280041834
-5454360318746876235873485912565983134779435530640178745325450114100396790737296942281564432762776663339965033474759509011312252
-1273643557029602462258772262515086262035743506025601400592823850215645680844288819770466248021756708616474262140257830085882080
-3749316335624058049683001015861489646556394155367973498744773935515065243970160613827515488862189910777219950612111041830333142
-8451480666232257772267491027370674681436846933893722515862731717525412660342458091112720313220482317659721562206466780128741773
-6590252632454850440238194247507400433748088629955607174486085725118788995595732312569896819608944355538496441101640124949497789
-1257684894384392174484251124503854845960148691603301944875996738800826596693185375085047729958430171553740436704869195063748372
-5735178593590752060263331193146970071579446804835972630866651058153595857973419849597143669821080829676089777998056446703836684
-9360907310859244502541304513473974522087020370096397612021384703925636952795854616525882877878108950663963286923299046586524224
-4736748114460524678435616682271235781989815828869520783049700875658488695718736121600271316948975177628944650186309894116256839
-0122265134749874764508072046641714144031116931952372994620287753392883858943809994533079487667165865233880719017940897178306317
-7314139776044966808676160030164847624119585864721750026892048897546015469276703858536945215709271741054424782569701147500084232
-7758065860697872155705967293772173137656465001477901257876428931468366029449777184812467116641975319314916341175480998066511678
-8213787357873005347083763974187729721493820664650580516006337664286359010259386041876040802392491656717630783835571533641496104
-1539726264552952565436503783866624559510200362458151625173082533487696535010112807775556729174429917223668593210128877186508887
-8321470309679685999475535888469479559195982218922599887296055650137375133750432460874145869352229391171673429325865805622380834
-2056541359048531447828515960692963929079449940672170706409337197174760052966541653050946881379320800572898168412293068662723053
-6860373992960297640329729816572073853997874011764757398797944036292846733897735820446934726176024024757470895603256455220029335
-4569926110072668348278664329257941057438032693980297647417188505086076585913708391932628924011735966680243663432137597450444007
-4011230494392556854932236273332089389934747612548401261998294903567663125297736568382740395489945640372131150054623072337132335
-6844595318925439547616931848005923901307170686601327728283791660587722758968622818978597514280133292570491476960507397213932185
-3642313707941792113315508020910489195204450745180517492522873324890987317406946100562361363175345008151634614618218325839525506
-2427692898230648928178646301964171781644216637535917410571457842164951317391990752953058484915364895813865613835337731245388877
-7010431184482412816244666073504621100130866578971286677458525711336280431605171233723698610913008947422033976946085031938114793
-0877515916454772093488878527862660314336276524158489551235818954456016892617227185085470522620693855915519816376238143161430319
-8799443736799287358483938545063592502641553678820618531061987381595925735003006045937462381053795139314188939327005235192961861
-6759340733723316487592044207138087167698990178309899096979902164464364089126370344350744470572331313727851480014896363857798812
-7052560097987652474276867365814450520379120040581256992867022098643876725081745248682691582583629292763400638018100065591005268
-3106774405492401515494177672517042073837303505772295474776502959089196445416987270369786947855131616223965006450641692994332025
-5855582574286277020845503779828089079164761761910842413066849248818854888626393445367304058754822066188520015897444131019700263
-9198472044843711981048071735258326011544302082682349755642269651044020224003915379747598044212429909878394016016714106491656407
-7815377808589332772544290119723706266101079820396212755543706404343739006942558946534655221133089320660150834947988585978442816
-5845893139549225714132593150193123229669033684893833205775336633241518807901847649594321897137880458298454663559120194776464523
-0400879116612606005027575801357996533825782630360057558670923510328348895013335023158934967383007297478557740608358705255176983
-7266683495403368714481550525556638200455893453737443660389337826017810731088543589057015038655883579293647540385262180527785917
-9515154749550773405200793344557941722519749405852747512969927332977178984307036495472318127241347248808326472175619457986406723
-9518368191888409210468669956186116750302181387390597344128917877355951593149853095697850106850745402883068932235000062455347402
-6771238670568019918070196745624606843885430053371888544619960477580892136283363206743364325496202732003423537704812210825777485
-6482929731992099113054720411204927077100453390882438863808021020983016716953161187024589380636187873278841457216002930842647147
-9086580408882584727439595283961649388079282398490521121307077379799427026353954996467076132654318458754445407020982965846766574
-9211933498567658239813690464315557516873798138696846826984940696375072209871675004339676866312551085733908702422475770451671522
-8116601759554721517887607233127079564923984623323605008410478991117346586220447102577578587384958136197341044972808673740184098
-7135146663669772129679997894669791690347234150535985440597324857772792781041329129123706810764665585549577867626836104138395091
-6171338134734949666403237923355751356314985925381428193696582138260452767497882006262979715518886220518431969713213052164146287
-0631430030464172255146123719714749762611746753803707576735960990848350628824677285326419791772891874510486806367078208015683527
-9792995724212035781617488647953282247761468865566020082106220151676123008979512284726786406279413459522157229217252165905352918
-2536766618340462486482122665210247152075138704341907443423031644884751559830028648873890163595496896608683668686938870179657834
-4207985050934314372862959059606329918091261977012574425026916852113090691158385845006538026326042605485030114114277066770366995
-0403083121980863784638665369135497943380554934143397132755814677874063414921737247611566476833724738395380308234640207731607371
-3017035318366003181883008020161130977715784016586015636467061595058652062869875350107267130020471568933409734170464250203156306
-7978597058687788859694752086622825044743069638461579429486476003366615826282892684888720644513019714307671128574626623134255754
-3225178060856930853571262377435203804205020419212526191171244624283460959473575918723283729545170705498401123341048944419740415
-9391613362743685159686501403436221835235931626375947101387495019232220333271032937655938586143908770909065649064710101953494614
-6134742532053652776330925214492259910738874571044952830222662538392022245336085949987893286559101791675451325204933710093660895
-3150091954112952712726674404458997796890860249938694466648235513572474974162093062356467502005784802581269257972393197375619808
-5518818055326965608441276354480052128774778908643152331498791242682676747511171669510551698928872813137576082004507231113018234
-1869442353797750668263237704646436989107574039444714294394574053634166211680018322567901718394177095139221750525981664718345874
-6533895638718548550755018968962814261467954303937753456123595613702977896395623181616704065331577434094624992851719491928609615
-0190398690201868871739512766894228210227318255924906586297140986714101681237768762073978231156784378903908446734627746278198818
-7031625744207762150055633900029138852849133531239672839021846058540394772383588961074862090538883314417964060795273709151209027
-9458808924606129446923894166510777560369040702494184195952257501705875876785777050661631817125173124207320372163502777664965913
-3571992627283246607384090417534713518631913006344389649603958134572814682981286787015904497353080342805307719694940285614675633
-2468021847965102322233545270789228088801077254585303970545296705237224231512698609584385993582329483075661032700231251161660423
-0192713398720255736106913269405387578211504390721637672765578917354808072397586108294538148319234789867624965197532780016350565
-3634551422633123938462201786680417505451646469018713382722643171537409460426340292141021655461958038710203141816197429713424286
-2547844227738650654059981449340163279595536790994781981453043554676804995664853696521066106987131049223085671186846778658607485
-8528870512517578936416926762107480564174061090150629794502095506665701012457777925443164598343164919674568006002249856403680494
-2627259489744462745552373437029184782032929858142986221112288622061305496355657681071521590855144706970497835664724912122006599
-6545391156443312660152544214378226475642958908136790116192718647739147551525217967757101506789062053773824320749961986081365820
-9807243716856995753119727006541625638999515827040154011379764506202860312616961954158869599676568905867509226176218277805150630
-2073942766462908233406965969896132634247796801676354098426177499898295515362604488579021522583028021857262554533983809115858178
-8347131968232485092731301472083865394183193666260253997648555077371404915951205500140212998582177455804377214724298329527661383
-1594405101691517143629153539833183982495777310394687166385933138800061962945009756356701243200756906586574077923344666352145020
-0197245967822981167194710233250484229803417371108743341686105467298388178153158024123847938905011673366872874417478036778662336
-7258512385396982458981727808434299320938547592708453258132441101938548683407696744955847650770224320115020029123283233005466171
-5842172497719189784583681309409508840094316855599405125810349460717428156132068389884811129531014665690641559952450142631134435
-3120882941134196144363251034342986015603525881548802680508329909569735321266175483509995349121263055144465010373367684170785550
-4158635639323481056067212351252293942485312028596582540399759383658505450921291350114073361212206891492359937785370602986743900
-3248674367436665982259747983227106329784209726320992248877150489251570771053020539956408865849029873307934125408634817191607873
-5454247998356721456240658773994350865596498454154991883699218368604475173834985657275975908620474089305230670921518592231403386
-7351062162946891390363227270397968233004651810177775309863584286429947693132180002624305405957468154601633114090431896806560396
-8578733043161456354664012245929168398575757646163138337526746639222181428391936995137008559247216584486677942670927998985802859
-9200314360845834380351667184778736242928721806415925103242410837162869501355174790557366226463713207146043374288777068201363073
-1884840380691470035098733943006470724355475360919052895346183170077857886208887006329282319454011758272954888828936243319780379
-5906121108044999002595816055500975401842454091232971454535066145382445630442880279299409925299375855072691591936952415415855608
-7427547736672177870270669416923472904176994726042270600865769556468182342137641250127961474267696372215125069986572926580684930
-1283565631209283359581543095011894542058022145233771315616803743285668523226044837411757706026740916352039927306329889089649349
-4270078841384513763036784211367232205576108266657423596077336951308763566593324577257390215814671195914760219863020884678789417
-1094797252284852472558752948074017934025826602284347674097641546447667688812462875419412834529814608042996511263599028929742238
-1967645060681138182820884931078366878249535027007771792225806188604957386423876036386080705880427884926800392921951044407013636
-3181566611581199324907272529442720663293855144200609139564151757908337725071341353176155541142076746946246524270499526229012582
-6539374062743440091085243475167651698361455560983223707251591133463685518000037795208788191244350973724875956194617703899137414
-1430821502040369247348912270128694893351423782952149316135243013570919313886614565161358637079094402119428463930234964822013013
-2907845492061431274313604396416192334514224786448855288597321564420931438182778758210128537309848899766746069430202195659612336
-4975634130177816916191624410591783555638901610254745557743055701024321622685828565315892206810167787457147305784539222040470909
-3426187794037654633853814952285180680406547839298481434679476618025289610702493051123252356926166123963245694601391065308079166
-1560694708414872555648575097110162943981198563540849019446854403562264846931619983425916923587136273462584821828465235074422917
-9261979271695865979574032703343588466946379682055875729180379739323087400969273393174411780309814669530363099378105348978942035
-6060070323917526453062047842877465074776912567111669196792162790002591482979059554932579116312700674668070694919873464603223754
-1894071532823340571620020715489409265478540234593867913381245139145940908648942949383027523114581382713294341230059675979933347
-0475001838386962980608799805753326787172142674741106499743819708928855603482127536974433291922816520616537305575646417283646800
-1407873654137191433607314317494815145886982224527312502679184216570574189580738684704012553837521804108283635888649341886347674
-0746298331021251518403002440748995086111379224255590828431961727677994867561042572035686044830391992128329363200090117946273786
-3394767633292754355096521352490384715569381533683416319072637548165685703657478638050012390155682264692286629389917053497837436
-4659095138863302858042866246863612004771584058240848977405503610643181773657781348444480569875240316081167661626347187543347285
-7911879124009359945066105568437670726515538210712672838972140937144499494198784053146413298370949806905102557089313540518536047
-2387001299041180490187017325756798839893484841126540625119691321202951445764540357103908077323391792392357443606419429134662703
-1311387664343269938420538390428981548672980222893983525849983661962674897972783374663857036358464131799985348402057774789061484
-8274461005931054626156020913275021215007841002783185917701579638808358640962009486666957046897388731341995785176631521816719220
-0104967747699292212229371707417874791998945791320492326714053322534677090261456035102963665329391198512545240166335302214953529
-6438295329258114463806507486440728873144766916788136148990852634546220929994618127547833759089567150425084541257262887419748944
-0763510822819190844430827630471119922358130707131670435790654181644862502449964467386506947657809851105256327118765427086936245
-2850131634530202363427136221800593088389014446941597649063703366121196898996686256705732620416208851855006823708510518951595042
-8751603030878422139220116631069675693727662503215348707642267571256820475012856064445690912370994140681017385311381651837184429
-8337808674514385942347760110022916345088925240957432454452424792146056100857933925448423669501901023480223134384961261737051238
-4413770733662528673309544847059059161282542697670213119975814848684886926540572546980353008826625285683672206383376561174283585
-2470179376522057019705141639334564346002921054122405868536589549939044185327352857788406922050956188186959812914331458433168181
-2179183768538040087965101925166314083741211822328135691819236749579736222030235331381929418960851621953749706426251383153679388
-6697638737127992949029219495456980219928837272379992149835670720157263752765848341694925460132961677719444757263352390287952092
-4093217437367696270862739890376907333913414784572650839225342564140670817115158483271922969611210426005659701735005263854191680
-0504868284114293941201391805305848644129473248052919285116546768968370400211720819698688057290313111673099410825833594935299522
-2193387285480585675810105037896679125123370546559641586098343943853768828725430307316784909701983568646060993578149869405653861
-2934591075689506327550526527978208181872636707486069235044785075612292358262482648814374144402086535106182407978781842722397427
-3764043018357659628728101790307107498150768318990432916850503907920600389618490690749145152636599605594698036095369786495988258
-6957155927715716313765479257750780421880426026172174055737331392383266819616843853222801559499877374057106670897236097150948636
-5427827682310804721340200045877249335498355065518235785095376215323629999016684789788057540796773407165234965827360566567682463
-0931247633662980846735922260231265500967979148521116776842985570907612389971711829938070907548905323760203422391349321697221760
-7882789193682587165711403864901445874796286061561018238012019307540878080647271091752229028944021330264150343818926048069144244
-3829234846305757977743751433953176195429230057570537421684266250781148509555390682508579644164157541082064669789683815095364787
-7604939164496265670478495045765555257915418238903189606069500034604107925625520169975834751123093859423683572718773062691097465
-9536565688839857043404968751102502068918401627692404156712144798677665827278179931457967293092502383995754188611043728483106278
-9597088053951878542145390264364113151329590157432302502341917977233379257169202042072712802096599668573120272798291944153363375
-7607153187541747861933137718609189822023639083176590969309128534131402001720049300131597786926920331444518080594310667529269598
-1927075329456693896562301483770530596686903351047943440879405951056391325510081534440975417269136288862213745763314617080452571
-4793088300460286258221203503876214260288694619740795021100096527276740956582412254816142704747725930689538001063488725674114094
-9964651944235263688993656306565044507502459642744800444126035956827838480470927964887269362894767336619648517065502062761621016
-6129875810846273188094595526245494198400294797450838878997940481886389039479255372079045644823922532826285987109316717080651452
-1158870497644577891842220310991400298247186591687353490986090963675370236688750155704648708257105452733670085922368068618952508
-3951586474153083065442516047977847063483146004542723388081748533379792081337808607910165722930346295608653437371334690508592931
-1348798137260798951844725481726752185101778730990513125012632961668430932041485231492712161518123487434868038690945449294611190
-6621726374054578571840509185550584952608718450715584685612358931363303426238432883301985179247942967408291991891183249754595852
-4638603540391846589823234253913403535906012903538328082937776681713183362324668976651509798060188640593955628086698902190682737
-1314136004568121579468174164410670114683609747309631647110337083615027244209788221757184880343776037559026360829925134683110860
-2743916110589248861852284646250771021137678508599837301158835778690463663553082493519868901155377573114305779992715972859595723
-2324106156194950900453760356879741607730365869344607490682695136931314492042609961479060353962654666877592314030242319785217157
-7037168535189901999950898708785124945709252827963059451445136357835564541820565609455192709322939082485154440865255543678569770
-9896528396971770400160528156211153078421941311469208430939294234515837583618887123400678449175339595403746664662044325400329517
-8261684885541466594581605303831216257932122772017718190045767780517645346911853652853978624682959833140344555022435113362676062
-7591075563360347900183625940068873872381827943795851765368024187038497412028598183964746465300474453614206176090307713158346489
-3374371123832409332000144159517441149498304308931146086397279524284139118811410468196667079250510555507523645907234786379143531
-0501327353064942573752656984727083020738199901757943687656464477159443799349546909245912076525128236088399431523118269843367482
-8613396151458427790408589367894556692924575676708650976493092298687011565830641071449135943255849354462437020422889320020232241
-9743887743932345248629409670762729564753828800124861494449000192569258881214737190612239921652995520457700328791744959299446113
-7181302058928852380763877100101757115044093853940723929209952955676211472249441292704903663335543383186649963257659728968301134
-0388255348661563721653151594456333702528830265445870529546222473972548233646402200780627751622560467191291529956825231887562559
-3526669851709736895997935055319638614407522325558293993145073133898821442020970359820377176459127571138998803488194418913023474
-8960318055715147737928173496291103297340011637615159200331936657806625012838282253984371770704650788787874077528191805071976481
-7124181681951361717176138891836878456339953961111533220751215226320942283255447821785246102801554680118941275936544271258524058
-6005709566240667298294089625210827175355499791073268532752944587487068732200218887976443970173147332812756704491687536620579417
-8523733324824779870890616722944885692254782796148238417811553337420218355790067774624307813310722411932853894530043351212104621
-4208314480849782328920489549263981924145677154566910149000272410262683233827903445768177081248117495913152923052663893776265183
-9942787773857699223811513925994334863462094677096830079955240744467436994912827703793978101340756041298804409547081408298801222
-9436460738640015479585458718857778968516432654013043215917075749663128588920464616671554576564466134592276012302780087016944245
-5682263919237157166619832653999221365676490237394196490562353201595416072759662040168607378605240879904649331264075658653944374
-3188760460625654041085468641256306887215807672289682883500357801180231951265973876967365453175824452139544361480252271534860563
-3489612971636788170285039991175495323686795856259626029428439316305263410995491370010061781397716962628385590075791887118786041
-5311327330508694662530309261695611418858308192623059112240071130884198746415297821301302430358551661316850076909001762997643991
-7081644935973288072050639441580584025029531691351232277986672643518925684337072256344249262810387549624475090299911463668556533
-2269997305729536278296569991307939885225827949212711278683260974334694618965859001446604029046584493463719653785353337281283459
-5669018591396191702482439366148219818778884802332484502882028894694251543216632761518648364549018220678109701293026473478656784
-5216611642715035439533559692613121139357309471021194983124318134640525984115565217254793009252347891534891058775512107043759248
-2075136627102497321632846769129196363043810766007725332614332304423370092169449259610020916402169233919813196199842388493441962
-5246508710864902175515674209765293421695856922741891032048768583212886538286815573096956696932708558353574597425799726517739782
-8036312671737074585001040104552777443725646270711497123342871845885341214930320018750607319709014145767035316932229927380726251
-0928548556204438876091471205246192546298228533150898999146677973522875037893164503792472130409496157160476844265385841682474739
-9233703771903675834839283547585483443926383504808637869079921199402511859863654798938168359018632590649252624952570683979540091
-1817221547279336881324191918747916105439761395909101897519754743532665651720607836479601826466707285601138161807075561528644357
-6507813758533570073431536118758351858756886547831285242021547001802317103965340085013359438004591048652288218222633904693766526
-5939230267672950104631374960137514687520839197558900123956846637455545802654473302741665702939840951606373658402834814254928601
-8899091999774572904211301414279903590789989799671058329810205159495566404297154849221520843334449344645035156970528552300030222
-6795649886498390391442973828383660673784035290138239807079635557460618362207456840361649348840778636144683493328779008559160150
-2312967328418841937893181097506584921132253955130661944022425054340098558673444397656011485902801524597729549862183491017801616
-8364392130149044788968141245875416756772094094121947877022476352773253705820364822300001844264751712000950605882778006252697459
-3173455702957684349309232875767407323242741753471239292204928826580888927330167241766284958168551480352850879501139241966892452
-3677753858072439789438100033278254013052115660199724677408997086225534466921024361672151595117485386004966423349406051295735713
-1033555069901179500855772626876468463729168610634688507726870943003645664213844575844814874933857419440136881531279514876328051
-6902431911053955232595350941009434993084829394137562877137241909400659809326832785642273291709998822359902244140526746390924526
-3598394230231172238038637497155035177663453584383356974229908339909881383831792443286626244348781344679035766390554002582686748
-1986522033280153369322100953745103819643767567342601672718065640720320991063977205827436045236651592119137181084201370425284749
-6005671239600468501156161076186950720461257574394357624099400895752471978287422522141370855745760936595412914180235254380961690
-1248432656688783102677099988123915947205672369413239452092262942922895352363751338938332396260328925306803441684111264080959934
-7043361968005295354938534781857472787124249512274641194624952254981027355960086055922235901916884500390183949326239914435749876
-5900769760705257904732141569222453308536443186947518812790214535222294555869866712002026766787105689583023017833746154510155688
-5602689240796761919744677404697558271913792067417789140292202440216539736230658588620970781000844620550456371994946471279052637
-6983815257060123566373254198705908764725007305820906210985164414734561111049679088421536404461082246253221142258100082860407483
-9787291977224975917546280204714841440857941451156318425600052380180319358748436390813045531423344721155836168161085909646309385
-4242317405737007113338681399774018133792533519976132559943781717607228562711266632582303687475696334211416518106220430942562440
-8001103370755032373531777436355301854609759653124445242732075706459884158212645376386153155459030396899392086527430085304137547
-7061352207839212087427452963168038388774060848015551117972221521512460122751953993512403134647980990954916284061921026824432536
-2639034110356917513777636397443311536328136804898636889890450733741495575783711662670202058347655591164148410498512181752116112
-8649347704311634713230582416874077536749261618798919119607870454970552954421518115988625118329175121493449500857931770229652333
-7998158841528743978260913418602919615786831528127648656825638874370061930628233997562266898051264651939263641927874506380487439
-1169319905978231587648398211672101766334393172127691275996797499245406750863796639040056909542250284633880406494091612313210866
-0317572128063301907416088057966656497607301508200217804677889135103287897506118599601843251561058377858126583470533794642274814
-4690147674695890988264540020570125563698789420115878750835681272646540842126992805764557197985389253255527910197264650144295636
-5798557941192958990661384529989091262630978788566879170732007097819131006336590152363030155153413704404260928053167322809868601
-6850987001199817141644762090308087270676753863496477045191783385382914059759989907264265980509298271071343239640773196627310409
-4389027546704283892663222266104915372633460042956234973983464977451929104395584092104280081159181521725125037452942372440981206
-6675905477554320026243055974304148345728455542853879050278442548087322107774875373656985055242105650999387599625064478196226162
-5421451962648003632206646262643905337837657920982111146977004270602922886008501562566012949545116457517171981566495094457953170
-2653749527617823956383177123455781619052217065408026747322738616321944929384445431993242259268884094539560852964142946672208945
-8593461023191475746268918563613277494098559522521079968069246435865433845367704112809898386514701303501214965468624316127309978
-1864190494247307693037266993358200097794635502447995520938928657994547718890764619887745240985736437934807473704761456024575292
-4959121097171972205063831718099245216438006228886790229146916547085014590026042332430672777678300137100806650898573540666242384
-3655898393459642632004541036291612193425851747783279795401104056847304510228417238922574433467131806129145867390315264166063875
-3665579208506648402815517926487551967245716952452342336509872884242496327353828450388024010049265610889985970803926589219237453
-1676400095916770050334175293677803863116549153471866784271105726012628596876429530293900006500470621643237024986843048814960581
-6303887230138382981362522022235864197895867379102358980372057655831897690287262572451017096062107356032913949946624176978299116
-5005151176823509060156202781958197462286719252108370751542425598689093613819219880986961622340717811406826396835254749852492414
-9810879199072089316354376552239141698257935918222963398002559226752773027118660428719265494441568442234264661966547139854597318
-7873099218250455002270603753696336287379126088262705830929170584620542532170428705348694262962278699570554235741942919271113853
-0853097378201921331418681617335834926523454159799372408812168044016229123296540289846574743942294543985242874224122532498334672
-1490594866688679908867416614545427520723745911612132408696699789261886952468259502210832466240663473598353736119026236378375966
-7870513434223037902717553793135590258545562641705185546860782749440609431080399391577848963291799745623426666134231053217546405
-9446201870461219368892707181895875357863356844636097852807754420432074309846001997057609966109454410826649254380546761753175861
-2761057480832813584246237846523502525922933474798627724801784019360724008460215340269094831023982649184534291701279975122991786
-6747259709148196213568727070749193520741364779274424639307959421349714799461578583982498969579857164144199424813392167578660320
-2903178417498559526330742642780679790900780361831699904848420604973586382034364851787093357442413598696765925470890327590522104
-1850819839601928427102795504066478105300817488452603819717168073205087377109510653761519361878295067555599575161123548496116519
-4527800014440544203257680309603709183834604758224679743597378438522340853371773245388147497516647805604078269186299047096706230
-6498133304861002880698895980139890714606455707071690798907848409609045542981039802321508092873754941535671659985239738644320953
-5988405032666743320254142929561597654494413403431947291535930103688912359712380841156852022207805099821357330225186728532082090
-5547768444839618341918220237864475011631317876613320699268333350020360283617553420136149953194413589978795210753934389762807735
-1597329107893662665482951708145282526843200385584016605115945831916977370397498490572333755725067314085934032787782477551454989
-8425608912417288932359069001529317862434139520899814966998471303722622773872512411876898983545914085663888123444680470167948505
-0434379133165396213883414761877309648582182115178764180968488658223225128338783723464562383576437566308911246233632408447704048
-9663996367177301008227471941256368607999821009483324708241288407336982656214907935931597532047696000543001055538357367423684843
-1080054249718909513852149584485289714580193379500564799748250805755830508642143351393106365614646908548224506838553676335276275
-3599779694595660288226660287150289204263669082115248096828431008225170485272045909181946378454893228880239576553739907190878426
-5885850036699891408378122906193395367309415591691241926759692588330412581784093438940668271882079466692153184239937668982303474
-7878175454828248795271539884473981581982185106585811627218428403581816331240364769920118073711196193240357920319448764087086718
-9383157433735677366088538314691739001878394272868474296524756761536638899101995873845026009993980779305151574599223381548532836
-3668859832227797331952981131294963911962283005597571432352599223356213488863688452877543275627906341710804574808946808990599277
-4561238331796792049632393877616772107198692076748218412457533127281687506143050581347703755397549089646358464889763941628738646
-4287040673613995225940479030356811166110299081667864088662964809883579567473005653984288637714354335572597312336813053771357145
-7067167172790181728147512916597493867072803164173683458648511730308061884633961295638170464699169569357249648229427546009552241
-2411562579887913980455816507682929933659712945876292627871263596090842188654178242939374681016381916432972311121058175582055725
-4171582020877122298082911042822107332503076877376941726903575210668249614607891518640837866322224789915987615341840992350582413
-4400620040237405249285698955673350511161843009038833792839643496604322064832266848854377214512824709405806535993728236489108631
-0795420398459113177519012283723869747981824916722015034363766243369266801152099213940570568038081676315926730528271844090048984
-8736235449371678977947912073661875499227319547901313273871106645387069884378420956151320072268281471236296252518071417869812398
-7190598905022008877003332225740349664805580192380729307470319849086922459614014566654582713365646665851557294353631593510036953
-6381552204220558217529826167930690334372579521383903206328505035888174852614555542283456959315756641772011982607288085297853686
-1349874783384878827773365548625629981523061054390679273761674753812182403462337719746346989770142792526923785272095298042279054
-8890444037528702976987014556298735324481383261103576223990679497009263015064472090831542516594399577027449370238294863246623636
-0336415324118608522678012840335823229090847361254516690870558705257294993006716462941193893800422308988102399798523789694443112
-1923359529945753787122624465725573807149022119989195390997561541611804328914617110055244794800371476974622186846094996027068986
-6556505900937451676724626863029277508817962303859724405355623034880805936586542708527460464895044273023827975806326940478307069
-8592969583414428893231495897818982129258755657382413367672348099201190652878055544751096757376276397486791497622706985221853529
-2908214067134856191896613437551307015999440525676444599333628882928075642102806483213033250837448355509306721853006604031173677
-5140214739575524129341946985893116412008106149871779041808900801409064849278864166852383463573647719274024968463791254976359299
-8847571119606652336355242986018768524604507411735194803338041421026584303361841828532589747052208612636774062068296366532983021
-8655354613872561646045351810915955927958378666435016019460717328781560793954138282423423334855186987151419088975164710160358441
-0049260799204162100696414303845623303274803491195157588921793903647526766706979672202295037308810197036167390246126788340972486
-6425819895447745350399433314412535917516434906996482513931003678441923085763619185652238830813722611071936854791527455947241273
-1522067822697883751451720158852174772439898925807262503934468921130385503850561421474472046621939053613032754307326343494446468
-0373529669975958588899685583408106767873002561071952257411549791159364132364256139331134266337194556486549929770686277721381623
-8699593258141567800940600698126100601323395696274203924322395263563919165964829715731584976772134953809087705318959395613991572
-4912970610760196588068419702343479920035578132234944550622679160245214714573304402887577273891607583288099465093463035431694610
-3905758432785910691737893861264914959634002377051354781210095863851654985098474884630562136246052330525659496807184083910344772
-6004796506916845030772132724200525430268203485146341239363234592583508467825890468047631822102162429469995405739029446103026786
-2936254882880449606977442748506803270167246097479977977827447584435796513203817330397221813580364844509174311882193765156654656
-6587840516915974691152625347076034414185867253449830309514472874859872212804040804281552578684775759016088925401886242253588410
-2136162082678649695650433358835719979490577896244051036608023014229544782516370023231616157535453095718156293168346470255374077
-7531511647981041419067438947595659704304601529630424537788677553031920743289991068705064547597248153946867352942473723492529159
-0056165493810107660174271077633956520600765977621759777545425851195592595759244720831020706108951012298629188421930844092200174
-6642191140454110070088900972029229475358599582028206307088525106506003848087788102905904900131739063517620939825620312143365317
-0312737363283798477941966380713988316123472457978241774897278441026567305606285826664686434652740990763564567342068867452842418
-0562084816143782025599524978888894444210155619376771675521151554796594041637061218094181094152665322539245369886205219847245940
-0029405789079825038952711651290857359659229927344229997950428696846444420150303484487905236128836752670607196713086924265912777
-9562937968844743614454574043893713056224816312429825464738549426759328345347674841205841958347360767579803402491577142236137115
-0533906692397009484027899629862953135204910641799594877569760336943034406380230261140675352675702660262675371335224685084951739
-1782949915965578201764231201307179274400901440982114344774078855036237671988151622145580473895458193522528339933303018706591388
-2624100076711766326191346479084275280944607050965314374143191066314104835834695035041295363869510686680641979042639548470149337
-7092183008459177550878010123635992307868170928762105253223870251579666192277376903965022436031647547645865700232025464698571152
-3958091554628717576397311569044621708700856680671753736603162545139430701751294444844592994780440200375396353670083705904818899
-1158314027781793782715830446196630725174972102720930236759032571130842037840584037988906905557214975416804249578167992887315936
-9206031432141826113994005343808438088835006886050009647865275969654889753018433197685269199002634601456210696285807629459472336
-4978328489062061200804108082671938204870858983057488740461332416429168822452529945581949038775475758752323372301506063733079805
-7738055653647518591404108351211994677622659177154884456890162864455435902069510745121823508583748140331565330826498449431014143
-0674653178829590152076432119041481195951363053106794226287750227106636545367810520707295978843237959311321898828560534345440055
-8038620990007430479290370430002421271720574168054663731040351369363896772189503927548376910184417619479114290519008175905383545
-7118330213438952390733597389988833345665275766596109498963112726494459652684601428898616858980054673653547857404417055361966561
-1587037091185968630608431240360245295772438686943763646925036642543820946055469856983284464996007864493360253900748905383563580
-8745104358873817076497065734218673552778861792932465886098953358042048623712145278501699290745480384052380874247143800362538370
-6251997645750683187872814541336341689788360883547457593458471177846675162375769376759272289262293759496680413378317765946726569
-9307054144320271279835934039640502070988256340708987512314880763049398513262419383032058404111149286657762258132166819869740391
-6208679111601546062938461491996426928719837110414091479969117767614499297075986816870114797028327349760763930021316392342344670
-6195338739848107103644806413130142942032473433624064988762100818410644021199176248704887358790343589713845228788844183335779186
-1206612776301905227273380391656909985775786692526546380296204581461396277505352115889617471623174433491331255641939009226704644
-2188221413330256108594133828534885890151834345250541767462459786862391647167810214086311680548340646481922395107065550293841987
-0422053725280997492804556037165046616311376881740818579026242231815216233417949738101116086586716392810175144442461269235250030
-1446402688506317648015492449267953446562377233978895904366659114613140191253374875252211719488638375761957759777329556920444079
-4742234209552120961058674900214350131325585573620862943651827639544267432934381233345762116672659741592229252195548093031985971
-2686838533752676886446680927399440863720061868372851834815109578907201299828776117754439315722227995606329153759209194448678185
-3375830903591078788002755338696975595441586005976260188707036346541857769978992173498220429575524475532930877665817876092460756
-9351987353933462923395374235495972847763917223789357531623204700947268441087397398182190787387926517802157283116535834305980686
-9492332135897364643664989358260446062172464533880475533980243165095186005367740562491795933632109829107385087893207785894397713
-6433768862702582156901779207532027093153001807004150434114821705300991777142257598550961217676112326241485864463713890885328141
-4370423630135664116118217486548726531069411489498186055038679029605744527511210064431632487827249384739496221986798075711280160
-4424010886610887880437216748921409021429656729228727372446155715321241952848523185619209556774687672654909818027324033748491821
-5647085557243826965464774431484515106691575517669395491646712200606275072075247550415886971532904779039992053369051837694948246
-4648536696394853995288135284563546131345084094639405448329957974626886591260968153163248670156108903690012016896947562864068947
-9335817025706673645248672808655206936988229988506868855512246059364735571373658692183981236508753893624162179393300884572562525
-8454550045708811850843967602772364889207411447386933113146884803720821905371224276398839301167373376393299604166530531671536817
-9469613971479940226446065344175803391558840869442680476409858979317446638566865770776832153252927434674599753345041690804354354
-6652209314699751202444785726308628207785053079762876873537555813669271605409315256570040001991644970781331622466129179499281915
-1961444894849498696928429106294385830964606511500699941607840002024216695044414216800293243595307021832292431154543081449089313
-1962091622249577961316459709116638715944104552499484128514903058588880092425282180366103208523455810521574844650965568635887113
-4368421159409460609897114428104781398719260897374658539676968461604386468189383954460163078825080336107872167576349496495408685
-9649536539795842583228826048018046721092374785553431643665884938389496673231436870435149786802809160883735413992798925929876704
-5235671264707293479931013726706891341489539237837731840177933783526465474894432047982015526419973235553573918270319559547403086
-4039735888376366609018757028506161014783678583356813250677778613982578318008203758267120384291005999279443777316382864592311739
-1217739163779382661260606469702245656794710548611797988738048091846590739807732824364552075368990683393959928284317293320069867
-4916615035875154768600732328677330949063202236875210951540534956404960395079564144372822026855682749788976197007630147709880516
-6877745432713411450666647170018266444463633969867263093231179811756276204043142296040101066040921365338143870829243201412736978
-5181332217031028793650384590762724542630876907198977592730043310368021901782721530053394250577461993296684728562642042745578204
-8059743569954838104598948856222744875810352375978155248926213114786009876969666524615446586588275065587752809296977777941299366
-4960623850950107986976011274245247425368704858396317272530283837294761704449561833295704741998045363670811422098828233894939307
-3391941685834457637274247913999521308752675840541536848418544996656831007389255133631777457133457716285009673478699826403200309
-4519130151833287959851246691876615538787874185186936205145712978930546123861640155395430711723899715676633532061887829247109590
-1676546877970973940392277995447472865522499015178996256227821980732651914936762181112328377073844485649563827098289006561421904
-4935465846415256812459944886042442740776629289289624483798607070666905637221701286036356829140962976615020452048228461943046845
-5324252244416512745242538847575585469682159371913734134263569496276780441518422322618507872746192259540742513974372774167973337
-4061947105362693262133270759088934938816594942342421443896871674922874493598103930292152723174036554995062078161445343075609331
-2764956618470182052214734830103729160245043907968784028181813618886443201986039333396356809943270121754709713915646568740151206
-3370863211220134665256513439944166456784396566762502427753466744044215577692010267595936563128872570057590311781066772952724628
-1434093271982951335221748052776429614044261679575670437872151960576974124250079774604982905427771724749469647670243244251475834
-1955236107353798168181042526280355939682930522521300010742221556820749544725933966041624888393993154502962490618839145486969576
-6290416028546495661266540757687391083370341491184427521635724821327522535027514382783824919995740288516481937621675853899158115
-1271233716574270260984632585239413670925887252984501086126979534236923438493445631129740540692858583194337904806381657298903618
-3300535021488010384891010505876121956740827701335944021678777354223576529240510607458801670448052514469687591418109583216371899
-3485417441989301906542262637698405742722722240100485896839477201597733807155335120248775000837222824525999750714790729423644465
-3411348746879651113262757268624543364109755847832677598538228869268434533167862688737780726486206863057323257234642767012961381
-2165814758833781311422742619981746792464126525574786109619341095871177233773859607236931880493129178559812250332066463408514532
-7726034975123054527871123751165334996022991283473243555448093241244802428165706217812562663617393968824053366244173854470750856
-6095264928940472527983481330401867205683258753243162756860090551147348417813873221392674935402798968661528287131244490650915944
-4846998428123345187768488062434480479219313046695253889842680691405315693254169660178067961065703759896641710892485894972873800
-1685615608144031413476448920807056587474093195656920132969415782126007882727463216577625078022336565533036012495150175153154793
-3655761747568001155088833871531145294046756206587264284578974630056937095900549928662096625015556765632408742933996850251895951
-0111954704076325038375601656210245491836721039674987643056715722213989286056097567862156918863302428121309646750177612394901330
-8415584072851574023474900634488379027144152280913594573298990276864512420566377677406310761330579752357658832083046689763512425
-5360991991088493887837058948075647761797269956784924198250160336333432026534756149206974204145691725795668303825556473066440146
-6308534942697410882776557732300657800112150355078878291669302663342797528117730903433654703116183867380240849386640798032108726
-1472159005438778436757327262797064431019220263757862409221343714482887707767271424863105342534371712556647665588514796238299461
-7911386503568215258552458522450938485043355503569972624134133652411157539448177529209200030556438822689089819514432813580599189
-2365679543813190286281972504483805742897733392239676734466218958339246807222637911353738424980809257547217933600526785327528737
-8206666715147505843269892459203855284050942439891047557154055608815102510800979065603928242478158845237310517156379667384978425
-8564365639950704666389094627317673103441553979461958229265682055180735168285879029143428791049454750378104825426147990982959332
-4829102499976584107337249497306375535937865662615510579219221293219668812136853030161705938471830225621587949094705819774556069
-5123783679768692703321434015951275136482214434898378095577232958805557078721200098045359198446613744587543829867662788092598136
-6929950567989350660377223378484336709625123004431484409297585830087971734242391343301362221372782329683381841402343240854937627
-3027430314645534840941417243615965839776590781088050407903488696621208213787375420065466391992905505392720776395628578270203968
-5561557545896908531566696290176040220677116087315281719465429326728445015278079287297460019260738872427151255654689514071849986
-1828538379287013993210377215462458395873947138158932974395044262987261065763556796656318930386507150893214229366028840942649836
-2063121041445493166725834460800448260568700963104181570946402318291105228818528098805135391601388005156357001178185451101272800
-3370800872347836800855502143109732296211615709327616533336180819117537969874343031967516246129400847851680499950308763513532698
-2261251707986576560067694894090522658489287994163408241552992222074332750687259975120713193581210288235466997453538082950570613
-5547333609592722700682015971929817349283991994515812388316385424977175852402318951978198762120074865379726347089860459367729850
-0402544338102912384265553136946539662518389179790301064640333604344279296879018653656722109731114774692564467347146643170192535
-8993673525857276993127971955065805434826324155448624528360859774191561165506877746667502530039089420897916681025323026574636061
-3901599392791219781553830625484740571991825540511807354859441733493239937466053566374517381465227962291796387571020809725382544
-7574422026948740113868646418886560822423385797395522913481336942061412395775696211559412859927044430059903817069457531153931671
-3666927872751409403909634814246127285265889024700225210198280286825210509773750861772507551910169158603017385059974490577083038
-6432266277247351230987806521470687675699096976848067098507903096237956371518053276015484587153777797643144785970196659271124201
-8805175031746648720776866745620376390338985825396413633102505797368825729966186841638401277578013322523402620704692665720430906
-8623786671348700175861755678175427019767971457395145977447813890266721740858466375677681653108760786751356531141090929913781526
-3195648380237469630693855838585465684458789117617495694729011729035913248141836338293691788762707190185659273515849140203833275
-0597402941284234251455344083137079916499435796408338558567042346638713911874856299057564768580158647502818908352952487514100356
-0970868650564875484386825809898953941148685658470222784359891344183429634142985332602653810091182805015332286021467238333362385
-4744217325804259157671625823323830396696824326946849733799160663706608011805733632306227156863544912264884279245494044730337851
-0084125575216079610672037870038502647338343776533232876650551512543864312081271558094734273891229896844012952524148474639077490
-3953838752044271045872553760612072547541462596253868540540395181295139378941954659771594736894686221229277026890071243182491089
-1570455075037097901528554345355410026197839647129067342374536771901052967778273115724862482455356615889491970844930623438114267
-1113425143150646440502818701009316634243943336310155606852136330886016200376990719743484314150050963993583980070237708157561869
-2850497678307680310432965409960545878246397108725852340253836659713228648432015357639072103145170515437738478376685162370275788
-3326664187179079200022042294919767104163644624649594061308737509813605056856101998334843842071022724849290393928923994480353310
-5498899160503467457596940573659595416916940383633806231810327042150722695852999362605105557507669885448657908253818192962915295
-7340742801283937313388827545354690848045358633204829321755059875964474925792234042792682433581007092726558257928146358188938017
-3788737611929951605093399738060446796551970972956586328702617346062935531918635358396384018139217900704517134300111877098173771
-6556088236400468643295262663772005261144129747959817416429151644418457406109514416151746327186627985567345268051259611187659664
-9265455725916581745797982714801820234080260053210177213938914050671185571980281286595729366143889579286214314682943150406601728
-0316466611292764222191535471075816173597528297677167091929792260801201488249926367457821134968651224754973624583045814966898991
-7240870813182642979734405654373311183972717838426383954790596720674570866884378092938010438980361304392635321123093916926377699
-1098769261784660364965755629864526449156402293650490776352458745073647855811975287018649518441512140869999035534937655163547223
-7318570673563180482204840468935262794048795191854962451038993504158655689641517360974735911839513301305317748540458018312631163
-0444738341332226086089060414609016104084271113844087095538006211914540457624942221411569773470678982159365460154412977671269730
-7214452687225977763650799051005862709711542484791447215218763058978813997928801482608042879518784727437915756166238817248827266
-6180378877242192988083619217841832407955378736448569454941330027911152317402955093457538120111385592095583433817050629741079340
-5629107620334905196700840557766414405147144002648539402508824797133924214385476958587576623195377053042403089302692454844253984
-3318554062977863170044352262420619308431178765567333623647941692615442475752129139395428889369180754179899164103774056228855177
-1724684496632837895268448877487345538070342201067523252247951553639414362390924781555578381060846820725528271757795755177666280
-3668536899528123873671104403554809934477255454000919778770432207141030247047304569687086172422809626838419879927821205317757198
-4281376208790055629568334266876725167967493231201019877577819781783383068774238210201096426961674885308966481435486534817275888
-7577712459257967273487604669410934219901389126865013214764147583539515778668315529487762810385482472159142915583111160208903283
-2092476036780853093515438486821087167147843243339127524062892009959789660882873649427006559335981769826686296878365166850602867
-3343172251567689761041900651298644580155321777412234282871319882978374041565615637937824367712999898962026386244164131814440583
-2523107617535787966332348997625949033914601433430397210697903069041012073594953603672415272693571514416319482962732360550203007
-2354311337820780136418582226046355285087018441007811818178174630131348892691010862349686382003869512529793089372921566890105315
-1170999065500729991421364651545352790769082161371433138736113416719659099975772914182032395782369105406892855739430280792570755
-1474708015575641879072739292610329996968899496702225715923818519908679748009454327877467225863186123383312506444593821059541320
-2519230317068471671990663024614062738285094805102560284217361596105049865919692357067522503590280759438003713619649669926160819
-8477593117311192072667283113407927363527106554972169624278711433088640030184820529565097341512033077210672824164404101920707697
-5928625658638382607550288328629457639763193426953494665267869864411489469568811023649446369996193687172148618677078694284120641
-1646459774821145583534736023501469753322215654392655710781868598002276354678420510784519315703507997622744075405271188494799548
-5604976454282399594837769165955324714117059445288436250408738807427315530171196984735484375626981702836635871509821590209332491
-1535805646302302016352504827863133089568000814854822798689081283591430708834238105002833054643250911507660006657799194089124227
-5554971708100609197716368094861383459498089313293558900360605415466184945588159656825590482066432370186681671169454435798038380
-3849073431364569441656271420494005561747519609440641325324675204133825604638188550112139476449622000662627992498117594394096623
-4191048491581987672722516757004987334900086209495744999112552193520096404679809481469054957100693375905822779214877756331765654
-3967826927260531495518865955487463010124395050606347758705435971911583515293152693887305102817702226005465633434328368776552721
-0431488077940753541035965504802229919911746684489825460131664577839381215244988219702491643455403072485117531612606199932108314
-9410075360076281631174487118204030545727872004911310355915647215932318325233997786962419782803117783722823043531791703707719546
-9979899286512850189031098302495325193753351855488331350658951722090011555997930787556662797780665452620638874492236108755984250
-0652520709290586245394513350104966676213533639227604453023649959625928591554435452582297988094318689720723128469217871904823318
-5154138924950867908591044177967760020371009497593629645137446770819235001454567589699623753759581616298742234368099793781827967
-3473470305718567484348272233839660441345062709145235638650446308235096448960992127705010353860654270452060145032963280540290644
-0926811026419214969150491345419181845874142492157134486078145329290631845342202476471135442659122079092431512088292118497802805
-9354612782399796245605885928858715130206027789349453872862552261402417530015360315458931199778666063128483794096976323329377872
-9050549362931470711847062862659110650055274307045585443522892077774880073956334195774718662309192081402741882514069042809280212
-3388599022582995822369209018970901943500870352576118339149315315976479926966165136544818295802570738444044829469770910136539354
-6564372944547448237407512632251508379320872549342100765184348768929229061655816110427490635344170087149155652249787176557737086
-9304726910793034348084164624446844756267779275838929154374342302538079381563499255177774157465080422281305646532991405754916981
-5079495135477953063596578815549589683659295982170939553637877137130071575921564130005951724009912627770427858856970687414583660
-6190459320672966822341653503087470382689354052580606552329874275327388332913948910878502521194902477705810238260537165258752153
-1741863988657791139389205030367955495311579034712194218460880036525975053623461402320730996642095747448443229185546281279794016
-4885628580837209961221029576497258511104739050257941549091025711288015307691459924906488083252587010968968824529177652581775801
-0763397108119317156892696282929270919177456927168774057189218655020688126030914415663313590555442617356391166888501048989509961
-5152773773826793584772678203560374056030587370542989568481592013810907285435722199937156448541686535030998055918516459522290076
-1305239048493423602262076973364789510528152271858803400583562336066393859447415629511735131940444974630579121650398527184965704
-6991327733592729480669828930382613428226140528036104065114673331048967012900401318314500711300298883332334369070527930012816139
-3452427216705740390119289172699570798671134046758624232397496740015824965414235594660630239994200610360038450127723765597890208
-5175730522105055786800808015853823181610779386663930878893825884556056314059074930365519187914921351319328315180621551748091601
-5714910102916106131414571159732353736678835156815504392107562506650484480968671954066774178137781734638792008562430877641109527
-5369362810620715036409904025968522864824364325482506902964133711312038294053559282742499233287959154156854383883148516152426070
-0230923585180985083743915234845529953134912525464096240500757424789301872897111680226897303301395426146920411464973830228585960
-2828878183082532630135919486366960583430058092282156338048743819662184574743797715878229822611358535700802659064501248149009579
-8877808967697355352896283886616902601338873980280498803907441157295597934158728665206373488691687917104704283343745205639622462
-3315755549989540644308207351384163575736340700335343877848915517455194885659684732058284726257857232622941934453881121004726782
-3002928241602670019659934407449689182082678896433504272332382719662522606641231869982252041696766531509399818750721950486163498
-7932472000788041651204426873094409270765907861252426634561030946897515784875744395710037381070458145660220907030271894709835605
-0606375828713960156150750275120802286593052131450659403286977242629895839703700510410871815684746087294738637398861554742127265
-0927164114710800842124744207418934599056137681039495980981311410777428870205405129624149605463522859752503128770836084491952252
-2931015631747347657009129018143774038849625686108045440606651923845534431071983109500879593401459457270781303275371634919948465
-0387570468949867854454498257661547651091256802128345749601432500529628510635061338338862610989893855279059054348321900538486115
-8602609964344200881430293688135456245345432239342905412584133371544661893209862399991442865006457440325878578391699643241518820
-0476780634258919055579958686158323045730786320160920071950074973087521728400869220442510810405620758553467843454120670874658001
-4611389884432116865691971525430161735365815156176932740053507703667082841676421694566703484160697073157865364859324160407900243
-7848340394578239725877088114075619051748487906575872632940285638137907126466280399912812673908953355586620975122613901023009092
-9989300098497815617534003740634757576144040056489564419015441642507944260710401355749819839918602861170379515547533183230261689
-2978159531889967729748526061427217809996789425967856884930963977509421860822261926488518659963801830737928324899351448743506636
-7739373703546853709971163541284486539624807396328266253157406157316793793115843617866707276779926556010088380028395990807722966
-5262595518780890084621315703653759393744008415536932695809891522083236025326969192829600448033930003810949789949558452866508165
-6709958307107045609075677759152351429582355756238261042407300818561928024091909129169346687529817528488405441096301840942497835
-7939846806218683995681953891663100594898796616302246789629809345268814966245162531052163166438108697094692065750286916247302592
-6376737923232528630569024819762238692074089057479592609265302063789788269041103846131589957468529143458603367428237467202691677
-1164704135075482622437354706246898083995113224930951841406301203169957259318901636559771075096487643893444519082342460614778341
-7571486167299822050740707597065176588093664070641995447134130614103674235649546121137008292829783010870775335672457433796269838
-0786000364088666248224822824647357946129181563136369891309362023665749511277214956791187825832905762312557124459238096857752088
-0224756578418586950260891776975306306690545499717256072289157907934175802791666439540405671709869057148319796761025632922961188
-4317800666800783644393485986576298736917563650897164304571720738720115271226750820847348337143207594067034889090129746637573061
-4992035733871695023603260755794332051946719932307664611429871720394241080075351265170984927835215008078524349098428854934511014
-7791275210894880460866040577708447085440157107534047266197077167838868317086743808903866856598023308194718747427381845326367182
-9440053603247145332820937897067937394376812799936768352012215925676355028026697201409962671443788824047418146714929473243964178
-4694097429621088759426437344831944205038778311615485599880533035443309753228841592516038076111818420993913946554412796041546011
-0591550477943256220239415601324460355602248522402154416815822080226505160015237485088369250676462054718340071691237191715854643
-3754782628510988470286589139121850755775569961153502324797466418949716647077195388880488321524207926209705534645689175931304390
-4293579894293631845176289384983754244067774813502510037057302019611329180738850594681778906215406264239719011424001198377631320
-9407877792875650325539404181214900230679005444970369243950847777718535539213759142124477926938032002586130641694624396314012506
-2378295522687601357905408069624354294555654221781438340067666919648970200524898545019520189688682193849864964964428853699551465
-7923565501350073769051751525297874085786148453411032926127268603914648170142127584914619282268063761170983684501064629044484389
-9840829700300902841805899697228329095218443610475399628627070805326825976451593789370050027841655892248443960659103428515769018
-7131899325280315528312838930296738263099442057104969325259438333829573217299432626262718217616786664813337230788868035555543551
-1613365891642882106953566519548821305418260262459032678151796367238313756913498686906585565640299870573937524634136703149075431
-9289249177275626622021358990349141206245802827466686634188302681734388914438573274476670571970132658340810522019108097685976679
-1999547679043388007539431538024419806104005321474063902499212939182657952169737390109212206767202350076020372910741798343053860
-0796380798378956338026387089364560910203624767639137927998294096484424294854533260048523991232484163916572752125119143647479084
-3312139471300109845789877486922941094495320192955690413961709171195278169767812527830359720778178037462244636938901054061989359
-6446495700380140348116004473224522745585963020017740642418321329101387653563805874445580561212083040164396327873544239022001568
-8221316129071405562026280838341093594207054207388991782744751735089766826502781865742057843922709134454840546015717044077633360
-8884079984504038495190808918953678045353356097676798230492279289061735280457857280913457619377057884683523850527395740839623992
-7553178237304616708890828475106185796221210507905405468874982714460646413397054645663825587287675092464040250385703334315092608
-4773590965589763472535194103574470410955536365729704648777555516672917330870335268784268577673152078292448804242825553568245947
-6215819528050303270969774851839361036143312160025453398613079612450766506304878967542263517886001609950018287965333798559597461
-2170641880151969257726247627112079520687196427192459411452224132231427774555020194976266757454256306589376845325708061001674166
-0808706168526831621497924679232450195651965661724083005213398910330404632324992737223126731122399064939390308377239660504899222
-3551818900906904056676616710573047283299775444456072812898768689067250392820375890588789819477340760813736549269624861064751893
-0906163675906901070688176210778473069828249578452605511950224714556564390138087101450788624170738723043479291100038259738176381
-8078282667536765535434830984808011662048300628237758542292327990288591220497965448597597894673766538440553768610799486540893085
-4239348796188542060619155351521608241401936444825596707153268722768490308653700045149495791462321531911996176024726025953987339
-4599085925561530429435581768120454911625188723603840101001827808010649207159239374191781479981311865586606666121770067310616172
-7104627786436327756821840719455701887978236563257187943017156401785911149438142292942970899875188032869983742209547431350943402
-3524068403178617373975067637980111980036408360680020858787573852832862969725456560160112278450433733839443039332972392923338691
-7361417128175114993261450629674608141894725708171510038678649037487846100911817687890240766440318417379790915067480509929873884
-4192563045095005960884279637612799513276543500165975164906153877957210268650229031342852943158004290795716146485254485943610979
-5527495850605424448537975358841328894172810067249914112763981461492106207569150714303562508512966364997576085520454249415595925
-7749567920199753428291369733514893066123672937987655345561072264405494064545300253825630928142777746597418333809686090132329222
-2347190729828800374979423249344630750463633445579902195914226451238506679798785890126552693482294276302768079721653123608475225
-0152265832264604743532240505688517479981918489770686750786602858928368893549157302414453807821089110756269039234757397043529808
-6533482130565176488100655388961819118126865617901005108218775489706817843329452026358354168685608881349897826461107138466301657
-1298673036456454794414764858082769061588499493558362877721489608505337579335664200621558841720543957496547716133300368539580407
-6422724558120550176442233652100893764139597343252110471726917934375351595018103999311490022927771281873120822851829841201522060
-8271532119297676915199374389042651216528118441258413260870365096855873207948565556782103615860771982841168346920959540519710060
-6184875439923588759440136066343058630113336838104030510817176224460276957688775424874821399346650313045479118572616668489003296
-2897490483936533080760701381789308980122333755911815060695347160990990030052801534871717538234667743972256918252210649169228903
-3655303333861985799802708736697214310308014845445976122762735834979387407451810326226050509201808567673064245381176975037733147
-9657194682720093768010430501297373816646166065617291768151706574173498067197264972548166688571305758669319121229890115185819057
-3103510865220902456203344829140970552995511866958564974902239021728149583173073409170941518663482580344763138822732758130711321
-2350688930344799523350604942490602629624759567547933020887009924743050812335493964555189623547661668513628841842940808414417517
-7886476590659571641831046458439879022628434419829165109717986460127979081642839919400368933401267954441646768446103515126565637
-1110171943300926097143589488105661141081024879644220948038639183302967863702059520939356184545779690411373217502283638534283105
-6427345179711846867068806487631152636131101160079927489950186169690439565446479010213897921064107507425078506360801250554414400
-9449471539328516576998441231176991412965843783160858329264144663894049487064693073174535162944480509103362252131259963289347661
-6448977729584408680822098278848838996541448014927561863895692613238880261580223887644439627676547583170203035028358611234118545
-5113424393568423046116537671317616837784363459294529414397028767453793820041115557136079295159075170242753593066820395440768961
-0357417280340583283641050541304196888459267811242609025317032935293813444330705702581551660482757892548218860632259447912758396
-8759325176891928932295819377731294216097307260061594553902071464538665097894582707057397147529275324299057601238957576630914051
-7741473646777114825234899359211272805439289189063644808522711602498268477174042815308766568204260129647306647359885729554656976
-9309329125552267123498982148765832181281490321112798033562587148057414223743472931562572470841497241968346307379573830843375864
-5689803719011022683494640589564528393539106647783122400405858218032186185463041208001667912281578057825422723357469418158669943
-4135592927602852287576618966571253116928765233133651892018881037343848794704599894714843595981667962009408311650894622157342917
-4255899203623494824224271003677968232634091967503097880844441755720576147137952557139636719564772738964156856519335241825543143
-3626415788714735175257556917344733999894086186508542273673131627361802049868502277018604195271807930087879067221107134172074310
-7958546281467926023449343568661101832138815620051349600621939712639392675220715111033777811540451328852498746778968470255323001
-5507407940398075053567751242109569783310327198481187906287038704370431459121242392319816826310134418784694594320070284603132253
-8500952612124145512973435903996934578404485074378319984371754538530064680891506823775364453662506914230333187130946894042814136
-0265665148790173017555028894292865406694173385138855281737615651927882128657965562089006870021634293021436977249028055567123606
-5915024874219893422458723773331806018064564044582475437209765195603359789772265483078502778595048000442697079452809908661825491
-9974005988977051807595272626225779862046223804794634926553502843630881070875123298869912614128545778960915871587536819171698115
-4134066090737503736509722416899089791584075227377094759873530554067748069082533106208531237181423743510501202120010884006504203
-2130661127717575197825945847274376219456565491166146558949366985214290031939401399735403160414646904595040915898139346351713694
-6324612167251656207707087624536097155449639896731425226748776831598133504224173609907231060039276944120772510687900080346884581
-6779168745096711200457711019042996058420593520557512225066879514823155886446534991145884583182566717602534510076749929656585763
-2645365584973687585388329644555202088022989110607367050144776537693714417352526613252012599647340542087230486009799844093446266
-3564846704113295525583758182164662009216216712683832484187612989237709031101278092921642250525269665257513687371728284688457875
-4269555170494408895577906466689197972679804550565920918614809933468304708581306933698168463484178291731316450813136298166976686
-7026547610376955852909877173580002842485362728362791349023862313373489864426541187364755041770087263084268647054320360965911322
-5647079585282992247752748756022346611926842984561046976951468976647765336240687959117772104657541464074764281634923169020133548
-6986017692163536989579104384975828200486159266813636401205178471888697579916647226641294586286142850042407781409124499578432265
-7557633520998487338874304841131912835862129914096167258884138035045133191763280844957441725806050932560746430226219247549692154
-2059549946818227720943211781526111003981250924876459433602235222747377311088585283118957625555745513105052583294040713888376552
-6312790236548842295363447664682859100743206688687480099078223631017589800121679494388116457487107923554186562511797306252062729
-9341961249268388400507893558690543848588537117611908256806356375473026278316829039260672100995233732139958201591529357001905122
-7622440629036046952745648171252074362090378664664601861125598525510174413032785951294400218362705244805632366004605852186841943
-5591402799903315324575404129541681549710964981665090508369906992078809669693743879553048600144250375936726479837822625004211533
-0078063724382242661885925388201522364426479724179540766386042648425409841158873221737967588237291116048440934261723138640261227
-7668975572438016377259095768317171394189060199749631603972553612209575383312005377253743770387375624576792404785414546299669225
-6702311775340274741303788836209727482858012234498189667215083952930215080983474097496335600683835003845218991908331419228161974
-5844861014709438146848025778890120727743982063500046236695299463240688553674143271469625051120980545361183599015488717404464199
-1417923931690244544999340897859985367002505948231379127672256195312588278402509195472407043750082438215262579893876014989408706
-0852865918577980935645894147403286685964996381094297648429648506192278067863183038777421574419694387317777907505729693297708412
-1477876485508630104652801640230580883493634454785840756974806839665717736338880683347432665781835143575902380330089255654038083
-1333574195103318490380293307280457872559202823396902837942959887393577658742570521479101307298105809134466724699237489092865507
-8231986011655928132234768712876079867027010505901813055232448036254614645338353115984374755578779894249199293331904818734171378
-5291198257745669262198453729172996916240029288161181812810389503650167962679364773038871747909175248874112616641407342566234542
-9827656930274121781454100476261391707245667711266140909114058056141317855910068833712824192869630959336254369672357008292856548
-5323877306540282063144065009953089367459505720096157841731259977506672262970125862602619551379971955654409939177527714243403057
-3533286954907536500237907021493132000340867715658050587581466366920687545465498963798769329374590369604149184427380755601882748
-2772451245387121398103687673837186367345979531432828052838695364605611707914643359500610696276887453665009271796449018655863587
-0698238146791660163022661497107232088142858713995181413650802098858185207125972232613318849001183174321522406825869523281989408
-8598554632732565974534400037249824032956321514858885348539735224820260572526802963756049116642833599682551125312131721936464816
-8777244479719589766354029439548567013317807112981262942768196141952117452742612964786718669561362298781178596889656657857438059
-5923903176580798552139931019374192553986137461354795191944498128759243022494357593594711086051327159717361960027267213667050902
-7713620888965717050672864796196500874403820011858648932283473719914877636081597753296264071668416201048071423687724652867885227
-1226026168424754948160701743250583052114587429759744035821120491264623002950973529144113414105707200986835221503669020815368719
-4301615723202468195623453039744894794833018107887889921748034816356630393443669846540007477652862272296203141137911353369865567
-3701305132741529846291547614776780687562767296077648285050793745319685122361946265802267010089656480989090754766793951985030256
-8873911333836369977427224870430320356503521006657767633627578973429639446804587551411591770027775298708856911679457385890346605
-1569544828599021231532143176442191013631066377985711192575263159095165119051577468547654466026788861257476052155683756383480477
-1570683253965182842006010673097287497172850525327662453055182206979693937570550092128731857505346441332074707878996538911947435
-7826422261424373910786428920393564290525228206911026303685173218951588837324122530045948404629473803092607834231045937648966971
-2638900097751822798368796230240210897707934867384226561665436456581464223307579261127638844885560109562036790807667670390644417
-4192581432555251427389363044896326951734847648428400345150360499669512737809145524003991223977279428592712065139442479960445332
-3942282183806384991949767715266661401310060486291440972343510267352817495541237489262806877081824812836064827724828303648923419
-9223072015234086234796090436383818568296143232241955872923081786551697504279591818923391084950971313678554302938168053766302337
-5040295146817500973605556893314901715843407186937767008367308307925199801486021624397893053770707845409279496052311813731054362
-1647014082822566848815080638989025226353949427396868720941862068805915405636344175116957293867502515550210403185422186297987101
-2299194118400856813156210708210682041625725297454205612569506042325388570654000072012600316753710747599029554756191357595113351
-9406123252615695607363852828573549803486496914881699175306276755265739836369938313041363024110056929623864023133434302918217876
-4012400092952627260881136088985623398889677549475347950880378929158923209470729028820934081657587476645444580153423943137551662
-7552074556799764537114289715930906335072549730926411552458159805302034148895295264056331531618830126090300007948842259905560480
-2034810936658458335936482208711459668407533754842615732173788255099444966005654249703291665433879743623245887203502319367176453
-2055826854912228554738248289886125490164761646368783638608966701408500405439745351176591154838568604792386814062201460103196028
-1704883259604470302949798965476058273811653448846315941108597287428362004683627667421915628743842382745845960365444382205614441
-8276093407998769926806805283999661528492618490261728950220171409852969042576745011296912080496971648424710213822281461166346433
-7954055459730823465679899905176049956104235683646988019468094197473567154076726095028250041409673376986848760985312614035795365
-3541288526820871183022785627606776202868249144458419432875958263707872906136295450220559956136362126175679096582857639739948725
-4938942457166622758688764402917253914836669353169972138509951712963418233559611193066044779423979184123891151058275415387004481
-0186693532983400032989768484986211599974215771878040648121115240600011282719832395142348174280309789242173034859607865458058836
-9693011226500711160574222437812022981161460007590617976243921827767353835606291414448435195278815539213466555449489307049996549
-9509118537609881549110785870137427018215479109414974529881125038407426313589072435487055670013225428915901526956102119247020213
-7469585110154725916486236087220807528982687428584047123899577899339622871539124688449741918490207266633825962457784296958609358
-2301098947514645707894405697878233655395086728296961354861714139621104988822145498752087551938260818588440041204929785479253335
-7195002791628422640170129886701270065601981205842819128758172220230767271007555891989535523140754390046908600193906165109046248
-2903714800754690075212414752414239844419261581404644710369810146988392192489474219249291646325601976712417376991598429990116224
-6657841194866308789835186691755481781807363317310203480516610021219245717136441915610841540149737012207330154276656421683007775
-6496393167312732418345038041143115847682160487308598451735321809667649213873941020106124895016322422646066096706495173559340273
-6190352286444996698010567042083025249630998980474746852300834243586692391358290885793710964591096599205367697354040455225748995
-3808084112830212575642888231806203048547309288414193348028410780142000603799742289999737003393558049032105240979729430950416734
-2055001806906934446231057752350125761310442613239626005937018173389749155377417284662314193484961591256165582045826903566815287
-1770910475516651085946142895420353886980271498962773028208448011256576219469415630937607816862320717646276543446021775437024856
-7317728070174544541281155663261784538153312462326658626789839195595942323601274570763560759947639040733318592217361764664122267
-5163497922629734181478583586735139172337995385407882365183581289857390438660661367597010604158349602523776584737697559311077546
-1232290524053006728473192557288773310853272463002083064021874545276391652038777534156787659533007696087737660972241935746823998
-4820797373925070252089423136204599368358477176708061478789645953897583587905165644362770501568086914083487441612509546270070041
-2710844937068669762717114936914428075765570984673461573362652998653398467217253506007120061287151708786386990808903587499291676
-1722239692416177387037629004556867021409013954231954955946248469232703827805268278720272112690685704443311442687874485358911812
-0696442461522918873003473056316397138103158503920758588244927506442635208935867088943853508413143951321019830428306333251201396
-5237490053651269730925587281174140512120043151663340911938612562084343250088788816613613533254540244890538135550921235569055235
-3652159735685467737870844804342436795620955533935479356452033442056822975104591188103222254197338188275216408256009062112739968
-7134994798879023357613115067249723046493042657115745023241318111461450746096281739377465898982050597074346498759749836646750845
-5435539953004427145646816313257688146440880667736243466005411373421754461366941715230523658976477672479751504847483760926576034
-1189232066364746161715297654667683387924489405288055983423309925216635045159783671997425077719999713937624968743960815866938439
-3458042402161473455431554634378956977066496820341904422146434258908727947177474383440746332129391825690966243498723403254667650
-8583588769346353411734495459871858141713721510897174001175951449320360912321580651780695549218819369972998610310409490019288172
-9334204527475060600189111850610268775609506754404225935699578359127242186303638934810994186504201384645847184324944047027889017
-9180203944559928543575350648779851174917364441299737433952437533215087774057147807226819191868491441590442039396662591808502513
-2164065534579878437699757090955883471447031879403082053258427608568820018565147466627486801491876503507730663614122066321703246
-1913587358432681308736116815399127159387589682764288441702400713256228014611237877207779478537639968530764623959147519370506561
-6235255735630858442517033591935698933960554844760005512206225607812740106611830794710056776637176558829867814913080368920324943
-5410646760661322485781048142156629014814968811323925705022272475371023640394527122828545405831491808608741154836760565505004928
-2033787078461763925201661733809116559798197426225447373091087213252755823492809148960852025727421510534412088471340160144342242
-4053406317407103820908867515275579307068390637321468991384194322089645112923727349244540751951979469134053290718220589958599078
-3285805403257089050405641613610899794397383496324785340103859171172319440876039603408630922409574370487373867533449326075083340
-2983815868763252323303322070522064853273357744420576029234853609842229699640881843769482230526051119476446187157115583149336835
-2361402646872012433986880843871560611945683230864891757700569780134284216871106221826645632387373922861192629580123373279881156
-3429998671996373176825887742582100895464377776504251588052739302345778540285554961799280437565093922440989079226166655301999596
-0886198944491737540229136497483278400920360475905860689648388002698383026711966163612310598810941558644533048630182341670726792
-3224790998309426141510868353814679975103849323867287287851298934668662832191399524482143116612939771691776186144211021701423317
-4793327096193585617231688937441621332297850907599875602232326960040073326201864681000919760060752937975322888247984232424151851
-0809471069558103959275275538388584472907830398322459954494433179596574461777867507710018713571052848608078849868820600263934936
-8295056327643509778568235977901421687599218957335038414287972297917509776356464814745628543893936365866982215021206066423916526
-0069175389099655621827463771703163016234772278712340002459468537149630573879420643113985870282366118625694647368265400040980694
-0185330675548785458492267177712810772887558224559469934081174511045410475070695699952516120170917198086628352522241811643698589
-3432240470257950810314775679834800845473620978487244838484905235351184086387166599707527028976915030731776500593580501517198631
-7221196580395629622683771151068414253703527355840765726766691589948635031125477445246126627685840897423930890628894585553998214
-0691851299476896761562326144030082656664005132402228246129440862040530711922127884942717942941321981606132599740710622690829340
-6387805954414104944165651355643971413515987568344486496225929165033526273702557885861628429072595508259134031569932407466556139
-1855370060311355098279801028503699206359780131940779590143641110125855998712927294283001777864930865688001454553164651367990176
-3395026397066375956526282504048669461521946610830298850923781230518236171386053536666469499692151678856847055919172630657325178
-3046849923385707165827109497171128710135811605592578271326373856764418443760349195924655728319788343802029428671675457416769456
-5261821042279220321036999746346900717107895012894353289951489320917708733388530368251182473743527841343292751660664418023250390
-8824252317744508579970406643025576979363288136493464811540150480851485119103480579103156985795448940762007262203877811330652870
-3204055616321408250954812676138625194951030184386810613892670161995606664768252471283913135456955545480933087872315934450481826
-0110599619290339021324056958678493559294456117665436489672772960474962839844256174658530179997209334133515553960451214172384426
-3123165163841681474367010429491835679876709672710839983993762107872490425945162980229932665274102783110995818120564672709048084
-2232035395926446390712487234338471590552947684994788621710474575654186707905435367680711475885293815543060949577152083169955046
-3350028292251658928286123588620947938740352179851517866242963626384508167950485172272074373493999323206780786225244298185666999
-4138239667749081340443940138823062129167164095346506708209137890234837357780622504863833649209158347489730999565991588612008781
-4664217286110698633018092758084011823559493288270590581425742146586929149871453186482768470820080489858199024057046533515257475
-1359038127174952081563588721035499113638671173404164924825530484539148472501653910385502837523160916070082537168043390775386612
-1436923728210391122200372504366645991744778858443244990595402772009992024820412617754275410349299293608939703285522116131987750
-7070475686255460177418547021473687579971194688396164244442299931146128832803904423667313289561781005593542663645306028982529133
-8234121263247251924212841508107137520536152642698580769661242285329043039771966387613256643214231439403217580461965950616775878
-5413104246474816660429811639531866004425878342745986000581091374331764631199000564830359002609727849512990017018293163945873976
-9271235506027321498393346844536657245544343198147802739604119444238511848559098921026630558834845589124777635275843923942487146
-6915026105020117228571904488841353205308577369931061433915716936274811913573096342546878245443525669417786920642396110509919680
-6739657651695868636149376334284237799146008295879768907577994879004415279621922483186516644311320818173589692203657526672858471
-9876510782436209693056682744986249105883882516043932138260023370268816469981968622627487020614107433825722570906101692145161092
-8947476576936475757290736092762279169953016586726757242391235235637432154172158901821960951603571049760362400377076037216546585
-2735502157822565784279289258228694712999190257163908804541511707522385665999422960150232894155188313507493238330302410605425296
-7940101946087505879550405973067848188833812225296523952905032878875050817047074123446017999571197850004230072472112763344801201
-6857142063692961406887982913011490273637829211932192499375592176104274764580285681098203860236999583984675192011342612589287803
-2211465020826460764614937570329924717346527293528447660776999654426823206473097384092520163892337570587601913303602876478051786
-5272016532080322083507311689593741698084734458418980219100525429302190098183573551213250917695957795596851135451614813138939428
-5194225250639639525068156399214932189538746207985167145356511964074580667075083175359149568969997574350520456153735083289658446
-1455560636188297319680331471565963722123437735473357325582592487841750254758281060767877781711667628353861132757458093517522296
-9590937580052253974622159164858580322392765535712215396895455529996073185392085906968002802221878982904887664044332656986715431
-9536212991471446618363328764237863492326635377747715439634427901843465449556160996406079848698687609807559175166455209276718369
-0962150554158891455114948237812845566152678283675857088563676954226626094608713709080121062121158536561703886898127526222898762
-8414892749163551177217490205399965970236826061221918459810953818518538232318451456451553658102845761329243527433596909757880804
-9825158812532083534774503272169600063323718458433952873310136391419269694767849055513012348666684447456130828029837154887287827
-4062509382360859964541627147185929761392475832974190883249337770970320052156457280268514718326951417528373787461693447362886601
-9802384514195519930363615938594105163103928246792737359775050266251933928460657553568168049147890604569802307087230082628479583
-5935332407364708394968146809867463424837289762388992341535259500067286459397511377634976747563308326968703921946360640378185893
-4569961338778055670213869684862788995924625160473819440389284613604453202763523485241482845106528449769880720371645531620509281
-4202560683681703431369153262516802980502196714639887848169937613326674387122996761898343353693436995583214395894151975156893071
-5332713363776927366695888962587179393484799105075109946348286416315933464459810857879632369155531524704654845441581407617245460
-1504145331569763505220832523847632508529957830567158287689592530569297300966404712183597770247546234814056520028432048220079902
-1149483717724666058290549158624685899733135096369862966589441778195807957291623190196664952975922610237417399523101511538417768
-0036082673459241242094083136368293175771615652653244493296672289353318399016588588663275146926170769838811055155231491519921092
-2671555423322348703897548437846131134228893160392027737396758641632859270434645917320325207654186499204544521705733245689882718
-2041837354468721403869880661989984614132154115011011100068745419042193490192096797533733270459341389726436281948139045659902298
-6287265676207191576589342058985373273830354712920659876843903556929428288343172794038913384089049546744993546672999661244015504
-7671119447680097893124176344032941210873441607294204020878536819662836852561652631058964593184756766213107639235733279668108014
-1503597944873319896726432783506968518844581130482208284211813252594573116879179483819354129815885419312761420721174077013349076
-2090575099698794920755209276799477214063322134870825766478922887601572992873375806104725864045048652936083491870937541080699093
-4276983494146036588052551210478424032928358829122542012906258904015903858342990969060460111480318597431250609578131562003677515
-9113189915457840484343399644582165727880755692052210886524470220995792925869536099894161015143779391596346691130912281801612173
-9319631208845800137369253760266414764140198516858735371828537522929558300406662683159046086394078157278265484925694452296859315
-8349237034176302850857262350204638637311808275176159745110236526981407472953488387189243977498778789698586980560479570319641349
-4582085067641332005668306046922050438876194786256238539902378554139808224133740244623740910175342259941720827473284689401445459
-7345697903120299815105938454414060402797077914470248272961589951135290709800128402376384567445478103311791196342258909767408438
-1687450542289596593441156541948105976556022804241843599203672068561696047317558154471118174352593930389361496742548511304322359
-6498489819476221747377877067530863799486747795199009866503783070729160667495759546595972752749803505545796148381282603736838562
-1116947692218975950285800049524721556053629253858269322416639882955425601685355611062823222776368062359326543474366782696365362
-1876190167722031024686917347027779070009896358771654643412669083054810506078866218417271851286420021860907338434817211204686529
-7526344148737332091666585836660697055361931941977353720336283268157952341498338628673162826343734542380046878989163995116270895
-0881257474139601407433704222324056930283355591807454770810061687372318085122818010133000433045729252354366007849932042280735696
-5414676249451280636930231638752958380804768673433252210159619334608464253621441055450445428123593855381938626029786836437726558
-1472864902858611995686957469529408189014561042091105708978737612763064100403995245584630738467933358860436751349270719679653915
-4154741684647123464440327863242393005522818718477064168160551024239993656696764829360125195215986845682299044548790324197334138
-3620127277527314655388754016922253350206555973782560191527034271929722748456430219013528002841930398470078939445946816067765376
-1722243978849829693580351795930973604730338879610427564825410468950337347468265193351290232895574144876817631258161159766300943
-7560827667474386459711757237346751568066838129529407855307314365209698298457841298119589066095648716960974765231576411494919727
-8647954673176727645450541867878958992452684388452058871232181090099976607265059152633077058376469186824930991444056731009872982
-2534991973200933430036026714058825873362205723979737750638944916727241098322793656977758591967127159597583155643556576943448135
-7155096296084695428953865082662825849460303226866978634425536379072621988021237204615220061198468810868414563936757985215986294
-0328355158636181420325206501518296045012302259181045466662110690600154986730477840865756276397313811576274178347247630894639601
-6488666618858920723988680761139802965152715427776544103393791345032803457282545151397254870010332315293514763142030945537580212
-8490792796508337321795619849060108983218521200268617175020002271232501077412217793566906763151880182142093233096870432790215644
-6497520222357920618391446425720257029473583117356819552842063897560547456381395533477059429635070000008137772848031720176668971
-8337012837324253697188573699623123203170708166950795276999966009577648906818828342730326847639721034032786616971040641824194318
-8936005757600971054320025253057644372313238443033194219596927715787049581460393528422411161050154583706800554645719354006707835
-4215727593152764210346931899527305466845340439034432649923099270817579403876601746194619933095404333412889852431784452755466843
-2088097487158522551752685495115047141137278634729729587648195891955992392424399063377394353752520259570862609415201408164480501
-3544474831228092443689968228780611679861586419457086393251353177701671796943515744580842421181721325756988105402798156643588821
-9778536795257051681439799124663145890473401144931092912457976024515106053860305458288529123695426810921506064347775651216836501
-8629179794286699832017474082041208054529672919556607496647432513709724969762646139135868191228785586347557306843431128687158014
-7106456703557605702232569911033196736598272397024373712296482733842097318351505429979256730289847489156750506335880609744614597
-9660558924487542734143121356331540689398560467085012517453390341732092436780513934245365179678624863881161450471818695381011735
-3612453516034902143796136205048511802780802772294479133906585232123112871839607661282061340027850740910859483338299107807956460
-7138724118583930096084405139356471004624454913317962414308274669136174812224878197906201370412577330455805945128690650516949333
-1730291821726950196206552159924266720782365385611242853448279354949948923432277012453511172303822029259754519038931979427529263
-0548575047242616318508715072515332204278272517306960109310804996719916332590161894788700070468159978743034429043329057033741956
-6780889499085964528861899269034340070621419803779139024411147795371750105312955245739852543595775978340360773771494478163557276
-8779458235824687171901362922249920581085853186181780124486013927395708657432957030172044779093473433280766667409407392636463029
-6492579411705822845905066201120652601308459859010659739650561022388466983198156117882306744218369432413488854001765063909641296
-8476320260631331607201248389753502857961661494677170435281685503191366884817616726638971291309647117085069726218509290967362859
-0810139343653776833125734038676243930878414416044335363929863448842581458674823745747264416650503948061405425537368655356993636
-5246772266327550199529567399996744188644213516458735587639817991224447177904904043235549503266714688854194981790228117033924563
-5461999291173972450770635507697104176866762020802521790899644748842731393628432841194003711839701487245460386154522697276378209
-5508101058683508523829079387008807816663732920071304290119836347773461806818814318630035261732455767269492882409702742637950576
-4599609444549117705097045766405200220153090927581307100167391516722145681413981100426906534790499705750570830947858845925010025
-1009651634984508835728715571045793550385433404603846489058904184111368085059460823145504327889561854662565906194985160507019989
-9357881999324778923494272780697498659881414033472270442304085245770043338219929173021287371666801815069695486701740310076529915
-4608279080766236606674170110085478654830337635040537744779366742642067739517988003498779451425063495418123468371481260706586708
-2700839483986172436829409192485873721128692643705335631914640430691426436305173498220746572777225402080014675196382731227699368
-0086136702746607717078625347234495013215002090165872533540039551264212687781885399476155438281141614343873696580481400589706298
-1705902722746414058890369373242227296762941970919549616605978259694120130539911344963309277369189903126883321693536398430654697
-5704737347400443449757566987270236468633966314353505101478851263083176174429030344023607680553018559157482487272502931014168203
-0929253853547791644998906236759598501768018124990991199353184644473283908513254590068607924929473380232470364424573291631346278
-7114456427076321654054593005258016944651062956332800845969220254804995756234489111294820165405880256529733135691041245584370134
-8553075127747556822577563288536391683930679292906640525736392953226223500696613649419343205087984527799731174525862937043354377
-7195787380049689624114711568372766827743368052980829823446372539589421589808988393401756593651612425875577606936738214349475949
-0181544697505469142362834711903740140759734959010974977126438624042186356553593244884210506676336566524109269413687671228874205
-2896686735795141476730158554607522934103668703053995570782216706155323744964613382384967846986182100960586040580173953854307263
-0286768549279297394586785263108063892918942908459235186623403809969114153282154910435594392237358132752498428484045697160025994
-5955615832427009939764606346259378692931215536161617155986791397037887173705219219646647075071165536665651942885935717666403172
-4276536421804556864922554676992233459439755861177568827029918375612999063128068548901725736512083925758415949098712083242055096
-1725062474106111957956927114735687646594918046204634711666975260667778901437761819647914937715436330233142512856404865653199627
-1291532637755334170692403451392823323540177224847012033326608939686606026939972956526341007272336243309559194347525857345975521
-4741600004754011316928740091902596508371266808717732973936254941000335221943249074812743110404969466723162046697491974991225004
-9085942759791031775731739206062635146158396893656161608173687371708987211298821225045306367484626014700868922039873009889166761
-2541340395518961317950998826785729636172355473248648132541946680948357368185423797382627281741493372551999786014593359188997484
-5815863362546532185070737662568520327034674676319716730206859041401224197894669598892125005912741187360523778711460345399659500
-5019261584110255017064950229895215051849707546749811603776445037494938571872346104053773024040213974077890562979334359709174595
-8333959703819799129975411673347762248495046754138982930023526377690018754531518740079491735091275401960400702618787889510076010
-4581333314409607030057543494344952121287231730028937956224706941567517833092451729648212810249480493474654543033507398453170912
-7852221502784071535646166335599143402394637641678513241517161191111016811759837825114453186940577300367319815188600287295217212
-2010730508881189649006207896145313350898015140508068016693226343978406558747353752836658017965545008809220423091595161424950648
-0496642867065050893136545829132837570390366632826974250747266589629788809643453838849392317508541173149110672931572489980731531
-5044656574615736195246481865299114510211631762807229391764826087155637720268154669986339615396192306621947657967460512382581862
-3895441416167225879629472693046552479446299590678533650004819143386099678646479751244788463147638567925169013110241886917506841
-2313203706796269432481996570645174678020808456857425673026366797683548661197668493887407113195800476443548512276825541513285096
-8842881585797604763305986235159142379357301472286513544030211227645270193019240287343188528847284806872333232004379253392212209
-2688409746134847438143178885250323822851284371547861492401669288415720100963691981973327453125586959600245064339903637953701615
-2157845883601129857682095395770985605599007238545319703595004924079346833281510603116153010794429037127659368861617341676777914
-4401447994414721274888256152671021736338924549726141907269816501834171190194745666679544881448528084111510223352357146390678748
-1598441987414496519030297478102458680201205753852279934039229453001433839642149793337137629917651258040708764206181523433254292
-8502235049697025555092849971402076674867464110183607528142090872909056796241616598564935589465706229822069262366265937628292137
-0055816249709410284431305701461181450452686881595061600026629505373443676670339321519731346337868758756244867546936430600344835
-2653221234894262976174352794968903515069018957828772393070009300269049849197795885320787480595346792949215526978359438371233230
-2573198395480105527983836130766181207518943018866225650015829519188519988960108721260257064720088842555685468531102293009893766
-7692694226464861550196190446675400547348832497307906496613188251375658889565533214610868096123194257835553142178169804139054021
-7725637998171173785445603097719118044612631181543666841703322233562489202164880099839601175940461517268783567897496005081890093
-1623476912740353658966890439792885600281612076194740147557413318421891935617196959684345685434629547787219047616918564873155095
-7025393340892141498709286165315521796432685307146924561201314330411100254047950443336104515273461423562157427134079178986568513
-3037051173501455568382307906695636378996155638857317043809314274578391987572790382804869815651855972786188467330565714827922500
-4074893387854201023525918388726764794855730871461446351512218023803177488574497502040250654764531910469820302411970861290475346
-4505685142400586418253034395353236203805450253479017801928704774791824048811941055335303586560686324885362705510247805420001343
-3089154219080968310703760534064569831009505236913263817236675143668487294264949278958590434251398242365729091805726174530517140
-0036394729791915199963247134854987262729782792900430729405932713576759938708525288045097625035200406357341027793528833641758308
-6352067888617175431411674423431768301646476262241768575619045274936408735985350498083851711439785845206739316196883719103192098
-4796246905383107193048562525408958439687461541231738438567101188983088993969984494129981508412118318349184613817013959589269737
-6278309646817389075935268193490507135536415367887824086765490270943493340352420279233033265958209197334685770879485799469719026
-6501644826983757753799478095020135205854302975462551896895597291920140799672078608383168757287535179491461326280401680688209269
-6878526040144420355891683769364803589616260114471471935609824723068550467740012749917856656207461894693384857525476785223522600
-9913533038664755944016342494625355616351591218888135528544319832829890186060691211822484503271002284261557646472978467535245524
-6548210843247451049422320528853823425570998217119732063096360026534131251690098102596630502775298567714836475115745947762170767
-8887884056401989307352068428168695321737823154308274924885994114161224059109503941221400198439058269599476104839310697936760947
-1499621302434101869959148741723191678491689696644090274728115214408462354277075304721665902694379966811617179086736989510478453
-4472180192689505631132593579798684787021607827033405644669077356547531106428251322335834054519860462918400592332567647993370324
-9048351300356674084399149618697303904545693491523593398209411550081390607196236295352104843258693200555492607047645055200473684
-3904033119579621911938196032662442953927339169769049079015529114126726770405396769752836907821633197786728940414757447592836029
-5698177775039384194905994353296325732870874582783505440992449252246418852133705888017732270642203555475460239299507823556669568
-4584762886535479770675275444567493237009137069030861149601485784515963297935895153471843170037858613325007001549210631837023209
-2986230798529869904729567059889517914570160421964137879893497645563877292347055745496295096825111567999357916375574494934291205
-7206470066816931559279891084092643447735267681920960477832257393262206090265312234429580381825327805715755696980240563671249333
-4975196191021868367044398019078519059684387790904063324517862970957096304027938042892083911602143438683752393325035772333502998
-1316065614559478287404397163400580119624302865064035828659428240183667221604845265166461282189820016614382937134407772850983969
-6172722824726265969836224691170018753182037736393837492582066024393428721754417142086323296047227886511163988288746175386143366
-3150098340574634288363424590978979671688129464997330011306067549875063142531548626552657667362582081599069751262734236839198246
-7320831408674583797739325661435931815687746601771458516299735930183747747803369077854960129285952199586802721391111341133770000
-9781649076575876416834626425635920411598588075542620127671675851163249442163030188821293485762987388143543674662920406406559708
-5939935563329383384304248329695829758747483676028520127505271048590567171170009956748249750276404393523654234793402435394531559
-0252668408043754647206021991183069125065854666835585971567158743285135342908676173306885768974453965943775589652707957703958897
-6941205372351396701250517551254482102589310971175662401605631499693168133844709297036538928165453987035113124871313193061665449
-9276802658913609967848115344605249848453532699908586062377147315012593156326148344297014110306443933718879254374138651819351013
-9358073205389217401007942156414789371666731131537345827743121944929460937083473364444624266082970336996459723671391030112788573
-1765411908158890001229050208942988203575712050271091972655376675898080722954958732806828573013490785204118792568609729781493352
-2380302146221749454886974990613671789801805162408638634096879268990438108120689272991357553079627023448340790990962415597084280
-4048096687228528057040549427950909321059124104059954691594133361792928522598487445722858314871353602305792037504518403367795101
-8791402885580812697264727719699410880547796108771833960539902147827417638408675493518018213254819498104814348795878620396366601
-0903924261354725492168290232167217374559865613331033632981304605379493456181688182582298294804821827770454840207003173905889439
-2319227785834038175693137220680318778454701304164120192954225359327542167556566637258412033259709183354710843065358146305555525
-8673917622829080548174920911891769587355766435165634787328419281721579009044997104872530471989859299305155593643127267879722422
-6682290955279007939673997760490906289041187907827046608623932479656002087546101920096135789193088482019418559812270396482968185
-2423495240985101912282160197226440146044901932777702865325863608790152621900419953459804469566930950992382020196553029673452779
-3436610407681610128962456711300906610774647139359864663150800708313215865508716982334525964257676579485350065609743793059790523
-8492723526317024179966715344536215615681812917282255110526575184184812878258269018344255337700911624857617809339928700208173945
-3637336636381056356070802698487403636259922727330027710606038599582455818066875278487848716217844022297313070587219989978367370
-0060775392327016214743079646392570709223503152196217613938079763344036433088567530057235155273916070612559581478927578508356337
-2980025169096765222953776328674278356394573802596587538549701911336821174109269755308129020228887624742741743790423872778133411
-4050821812671715448039700197323622949979651733365312936187264385591443824448095216098907529899820693216629857601750862463957125
-3142033473651787251598564785166706147991399595143208797800693772522221250290172822723884818192653997830457442015732513857367482
-2434227934816021841461320189923052035591521089170168079786149675686974463633607305584810474242944486308070058500812306124076610
-7715099107942733927512136192299373968619398158672679676087995950860231222104112656659877314698556942502196127845551909712373108
-4069114461731658732633727592893010579600135097271095735648535688306732518715682620335083055144068477571815102417990371455419096
-4513648336048758526599148974167943082379478315281923441623546714332454634302169701041016212788185513022911448815223921787570792
-3624469067047527512170727298754069896031789622645772484827952155406739967506695954077541651367850929296976343602998185574427928
-7941267068022945446692718780586230511573764935339043083147537297266971720289420223564631007244922385010298582167405543731618295
-6806852318072988521804655880278600099719660787055120319799397720389095148995402664025461591174050670273042539667806005860061500
-7207008027571345636661751333090766740919387017591058445443344334627123396031143577924484316316865139392646603641126628696936857
-3077564139261564206167503001531356981773542928052096642681673223984499732941393025220000573381152245673838328811500670802459159
-0948542799001533682410297780373013799791748346265940949566539377367731087302452174028989049580452869089162990037685957268273937
-0880681561126138584261480022891283215404751141789014380796409952816321543905013512146286826522138659411899727000462608467450535
-5880091566261256557011783504868257620770129211977999169370084785384096209807922714348396458806443353193445034311369641072095970
-0556656033549253864960039890721015883335372132680590369609602226419085993403091634173432095151442616233244407104672122152816903
-0104165883408627525444104591380562545622183558159751831249938218150151310276941351661814981521482974647621742382874619909936820
-7313501231477817301767451446702735705428503662442130539627888646852578831768325107739301527824363969429357121983438884878755269
-4393819179422351389843662394835319603450398553466130430331252873486799616761474948216299677793061438633632338236018231007238273
-7068094772817742176160590443426997804722265949259567119852638283512544860402755698118178658952516755701578554245375512654131546
-1929058509678608173068953824208364147161581285515961193245483567752314654578018433833005722739540799467152027333949229966280869
-6336730057716861143854645697201406300653307680945816167555425942108475384088151314617817926634797063108952284581676269870141278
-6513049997339587705695549544072595339278305253913271901919825663866146612507671581432953692087570028664604274026412331620371074
-8287494858287111672511595795429201499531492727612182441663719617940686643391436311349735908431637719847434127985592417043341276
-3683439281027866311263196237695664936547654237370870765012602749829825808040000867227133823847412406422822451359747985192576292
-8080745720999988790691750589159999510681935221965279452806039652949988754070864815196625235801191787296756531552141564212907151
-7193959478339407643118308465039555507133342674876808586706138734909756613087265895500010160295176435656450676824231321652261709
-0364925287385399527025737739685585498448664221812361858587254459582955070942164513804426958941634994463722930608065187062143205
-1510248350334956246451724384468817066713416535078509857129529545180481755289335535116009464206553367625156566677354615817653859
-7881465671702288772143540937915254400157725015862757578041600213873551218117006116952755764443062859739372284691117745149958234
-9088672142145404730278835893039966187590126325943635642412358143475145374782213403246198035026788070070178049812453881844272867
-0338668401687420146135473027030982411204915710337406365921420685513130184588295184291465724202435316806267038332889397443572598
-0839432579664022013756612378573508309364105293988945101718659897497738253028464952712017100629220365209543091962896609529479679
-3205960596777307708890129013560513946330763313564335478005273643120628824046289255031118424365183741647820073945909472936879735
-4620269579622752421433383654982653678424583328146692271652411473449919421964392617935515652881545262048907644967697133592449864
-4910971218311134291321139032124590602851436712963785978946343853100496072075735946195731359706831946181264874128557978861454843
-1011713617018211148846555458691095625992954032111035185714620653734574566700313717404927859717431081627049246861417661324499234
-5786110524543942705885896839017534087003537095772880970962648591315518710892525409209474091669813346069319857029093908507508520
-8853954861830714292944628596393329384568570114810794672937003168548384708307820733820193722197605410037476744326684584534487320
-8506177470614128104032179365484641505802789779285846461790237297261018747968281039195118146388862647365824837138881138267868859
-0627387322960768524871037409484459085875896325439489116621528742302285368082254073124593119410595219290194886865353532781155425
-6809698357496328576273024691628485594217747112697681983376999200098136183929376787562599199562809870612840417370015973807170130
-4180345838072561608049345847198586105129570485513244519517878528919531649387592676465860801665435795014078048815567745274248672
-3354246532695167434429089502120887783749962531689888071529106417054905309204892456124468634666345233412562908228212778433482865
-8025350198646920310690370174859009390241456508358264258699021020277939851249666503547743318751810595431556900870080845029269395
-5024287042925036023658377259430412863334903203075207016434236014370755084100466996153432751138550920390967655897565334875107985
-5140055633415509862050689677756134057716739901647883241169162784527852235725792016297971735177502489661133426961482215258022336
-8037402896490266221826083726250897311919802495381754225581047474087034884706618427848292889662240224463663278752931604522244404
-7043755425948194930791058610151488175614282166409617670305934153837246327320668633959913213103337798602482509159766659520973014
-8270324793209592396753604357772106280615543278837901728489074421806486555551552367821526140160754356205673704266414947144922428
-1799358966488711764366695558613904123247231097498677269788824167860157320461004934898696811210735916673092405907643647942161633
-2879051334510139198581358891368404052755328890835533066541217913121822938905792625249238474950146832344471977043224365781135389
-4792241156268785166424579695585412116561708898561202729978503519790831983242726846466172154727854320602695467825448826562117055
-6892572380716177090374320438112277052543379149328749706362112028296715205065873069869487739216648881329625482801871208985853567
-6373214964682547847971295488976163394711102004330268920420740567984995588029489900437674583804505907280376076761512694288533949
-5155665472119733684583254908202345934203146938766729952819115305923223221786312083916415057710647121628060022705929366547804604
-4979219068691159117673733260174579718275355270622127824048810725346461586407079827993239800649367405496829848031012026874839047
-5453326819721439241285068650662264327283806902040744362117833297041970217611203752467289267570303110513926750426867300123044678
-0552826491452886926336136137608744868267813981244854176639767832954709406334434073383918878421433694185303125198608436174948723
-8232804838617139276458679276053642834353480357742672915996943482707728711707722990226821986645110256211853787080947091570985448
-4530019597199416503606666321373773776661468897805635174486648284631882284913728030703703554479870389738113486662451982640555230
-7993338222145807140991352100542338400006637591961344296816299971822252698512532704506078851263452743784059409504687946969377470
-7050536882923788373466054136459774772814292349043369279413441771827357318562815124739087054575308713882488227553010491099772197
-6089909596225409017825449105685851204483516303044569069782656841637982677940745207225513250507661349031619934115869792030545534
-5623878938475449105483656355950820776480123283684344289877071474158657289092937164564108821983834915760732145489786160801928029
-4816804046415869731980026155380698391293302660706933603124933543082802974288753245590234004708950597141938648083597306991959548
-6285742091945356496670113754904503990748375484181907762641311090270050878330341468974330973619534202556739616012441626266016429
-9943182264167678058972498083665971330560261159232616995578303066019814909746442924781284268163340228187122534568268386331093065
-7152421562633124939028810156815250340969816324770306713467508016775028986746579511353296216202084745909078793312626258806625843
-1270211232086431110376182218366306020098067244906289836262668331857252429211967620796216066094322098532350592071668917821894836
-3845983140880841145716906938062904326623489852177531923802141898083667738472813358868563811996856141869924840103531518902763682
-6718003149619307421590918630236184183948486678786725981990313301354204177947073223184765980604578217913950986068011309908008603
-0928467335337181093723613708048071495790652643180583079182628211576154222901059273081503840088736880283912228917857747961420216
-2166551801482676965109266503314605693500879290753119500152110927158165273225738493344045059814681043424105403563256277265130147
-5602984870377735940956944951929383106107020907201382858387070933315397423879633043403789726957228735509198228676824257307906832
-4033785332705686886894233935205324983504447579271074658738235607798108047836471901273736322254888901735575902110174004577938609
-3402493343952267342344754443371491773245869528553143427384549726736187617570093360565939837511071410896535571400200988988962479
-0467384270228802505542012448307525976842449031499613137353277852822620338697586513075361354863064717799164245330603052561106892
-8842259346260183856170976867586760896719736933276441816021638614978497367736310097708762890208045248689587229972592272876387473
-3259167318440772369838882122021007960375389506141034220872992638686407702750133638151910546511598120704345383522282582904780462
-5442641858108090041720094339574637116216554948307838544047344475741751117118100567565238848037532377180455225898883679663375089
-9577142779120614628627441392665993338561362305904130927688924256501300629907368310744468665785794738752761659537261334710214003
-8036648554081009787955952496618722107214483438085877494384608581966978660817589075759692849806559360759821555215575625537328994
-6018332837847583031691963477349319171451400074031373390713717042745436212897138228273237021196246257873177739985799453366628180
-2105213797394649680881845019293842601907281739434203168302170068885354441461289080251599722778415734193180238772976142195797481
-8846734820754645249343903444980443492288225807913782286509632765370978666435328327850741457922220028478728899676269184885886857
-6241211337754447826883159708571545245319208827655835686933251362672810423079630739434073408653288828495537708526658804579257936
-6272761641480084516721023070052621557056643754854336674557368573875689625068313256900499409409105292963555938180247719262631692
-3370472297661265053196085477234369632895929368519546792630928565306505801718550038387422423219452220411081683199640562587649457
-3951837878713231474233482132735598466639480024677257398672432796607337555329635538613813318615303256000562507502749357845826125
-4701181391450803850270234592090970559917694412710413114961034587689766035663731463069166460549538653431143701866309605231883521
-5130066101866721176356898240445132440597653755333619647577387320361484004480200635865792415170670027337193740214918631143418262
-0808586953125247209833845490228639118624854066699258124848785165048528440583631961380212929557758370252911013779599196305478822
-5521493745858166529682225371969453760228060851280399420192708176554476472315839318021751905690807649055065100259488774569707365
-6158697507308922777896716663452883986126333631244914987739404979553039259206951208801722656773710392910263349735278566679339104
-5235852402635719195587338866742022182421541295397761869128302452896058848115769056351269147058952464962337808384290518791915445
-1541410356265877277120453080537595028913680044162125110791583969590059857305994592466475393255534238742387386696685456308459612
-0685998205305456113478494375669069867507303172663122574416432766684294168665147860680796606372059541989820238442687325132846277
-1106867923762001975234815885590982053876420748926951108789589029118783643675464846081587064829483161231369554788911064379449191
-5812396650186976221479400172298188629572727898176974211003232401377793666992976058114854815038333629709686365618467427463150786
-1384329026943982531591592399085803625354634016228493888015194258739954993856952956641410330220082208258103940975869674221124275
-0959625394390538490258630101489160874897384983747423071388118372125410613424612801559234232776779480366009970965890340120701045
-2667599636961907870724269931710369308622554291093494631427897956168577372077593727180133140549717498300507170013965255252092132
-1737339475235603869117715688789198413446311276950893765017909814539886259628403094769733766342691082854440546058895772248646612
-9197218961185262852748275379196855788331061390003979168135259363646749693751540875250641291188297420332987544882702271806564544
-5155345846357272505381130365306178806560153732924148036950818502559878423925856638459435711194956693467002588044226649914787035
-0339515088331009475687588955523954567747189933073011102332237830656095392839856108022616789694653613303860633782147528467869258
-0130375935586298049775383191407798098669127243484570035128574481514435908283974501169023065679639597582504503336586846159045241
-7077631278309415202815413204154287337150040264985085284229097360757947744868068694211304208527582045828778373828218901884299318
-9750268301116713110151838109753966293343621088077855224277949045570521139532153236249008822916991091102238861514323117478408697
-7155195645472829181908341253643812659814915997068241585467987778740169901860636348467280424257966646686476472265113081410661304
-3489215851493494198992712587668351276298911212514851702684901497030382245009336388185220072052801963314343348536393431861793824
-7433750102437336219240711853055477575713689475760799540383502439038522399381791672647025184537779822386053913810580122038174879
-3818754166719135070632269620576055650986227950584996452818776818068696309115722467830916362575260788613336625118633863774586835
-2178221238069038687341161131798367556148830622561463128345189400786005116148867892392990638096974925106944221425159061603022670
-5524790379877915422325982255364820388029995625235481186060304010456803568052174332647747736403777805245458180638361448671813038
-2561932270943099179760490101865479784716200934807733561691561384108933097340199742932516818080682737612322848740218966854945307
-9080116601255117121383041648878380955264484146894062161454022932953200141179550531168588724355886537447858132714146647197563370
-5582470235237288151308759910566681678927176948236130886004032182125845977161600117740547183580925791449145036400529238606663420
-7837033717084727015977259234033008100455368360038870286352550514822219714510463917848677542164460976523276256801252857727025894
-7130094419267655355009949375142847444276972876916939298289507233195397404513990497114810662137361054915518609388753530456478940
-5388394232615483120266638817714522427995662494049561316381620397442848359037023023824190702655956805505137789130807808295750670
-7728487145979981298300914926600023112696314252375455071809186812868701327870915067718357028716612327551252066278398582389353164
-7289773656445897637637801900198614044295973498998341687324987147175709042706190580765940871231724558042584698396691392833921161
-8657047381454227627618374146397069336202044856822409754902332810974380485722671719214725867693990943072348305834409116868276317
-2768386266640115552548464265203598491327266098674766891714414339959283543826573869249667218521183972556730897770799418342118136
-8189160219232646049490114563802577964294955901129433201250836705921020927053769046687178122894793267915461627258608458791264898
-0219476902780453916709467789696795567878369111867867605857135264741583700268708214119151342234570678050700247598575853332533925
-1642635008587172832360657829315478456525706956941480551250122576528755981779071461911390584857611720174162647873804473942063599
-4967685799379026281672422049403080588839491839093762962697369896023527084701530700159221622072624944257435732610627292851813751
-2044450251147619884660437582513822729870849508689036347657931033634388064328200140554626737296767003665386040440053850111272335
-9965191238699562685527207327106427173242624391995490667681457409129351701642801367806048618652102824703936861574242876103982267
-8167136500949575593721265813173669081199030452059803613088300447991271804667292549385675921231605005292459008477827396828396980
-6509840801282604124983554742769070687886591529251914833953844029743868619125159895774188014042708540332420119945175514865123729
-3692321786307153306613998657737637076488435978265420180472674598878806315670458550057067811482012301407908299677656750462270208
-3553454561634700149917505664871758279230385607072819176680565522193204640320948453398810380708601224770333475704117532694153974
-9739801831118688634434296635463933483606562392700839399728340475392493400599816097076262424865867680957927823749646379318466788
-8207485786494651396331129651303688013258032982874538569357681541288542572016965208057337584986821728683984473782485195031290559
-8109594698571552972881573904540885927360173123269475341745160895931951290769944326526035760450300948152494775976334153020903866
-1739268973385061826289687149889229189956753685868472054090051279828873221786295847959246538258862203254463138510475016160891729
-6472588945675080220223551738194925153786626106262423384260557370130433634861152559973124770729011313810073811203315002214957767
-6317904094534761856637133735479679945651270156668746266850573869850630241143818143990553888552953747865302101114447970138765661
-6050111904910844217007312990287283030132792651432799525258590083326102644255354794948740529248987597130140253327270495396985608
-7218279207220544832644649289313013019030346375149234023654949206605352146548635130815666273562950986058561700625454917451118233
-4591089295985815819108775507988478501559092837715809067331448086286924500664248339776158516774620654659269297333948779421651033
-0402389695369287676425439165311946884646996933164719659142031175373351707836712648952147263228223229642458870791042562919539663
-1663280408606348818705021370639699925355411336760403455952690546859354756234316710656534265824067538349235703012760994218438928
-7331947252166763395452202287514396143003916184577374680861816449247026988630652041781591100537950521820855164931956884346869156
-0167992341341885278124354492799177573677966259864026035120911925009272011711402759093945175436356249669782240856162554344304896
-4307297970448548637044676901410933338328417297377294558704310254387943692431491233869228400552419559003867252598836554809147959
-0400912691036342469718967629054695345164844205186330491298158594966799688436822836744333087245877645780438275466738783338029984
-1522719795609161172147875781283157496792619720043728981895906145341666050986634594495047649741152246939806507306609930123284981
-2105358148148398274033567712304765375367909977448660123752729616799410712586037852322616433905738649313626209308187391551045434
-8184050603718152729487919051152176341217780682835043432591401578282222377677030156609712538101741280977544353648960619498088312
-9780539921497865045552480951265192490326869876857256607893887668594821322177012473373977135212994227092237257692716960309499930
-8387530951877561556746885813088050059098237284649866946622347108029066952894002584214015925808803683837814966224683534722188788
-0980315065961365338422640630321175434205379462185984915822930473041804521924781482514510231643402826027992447752984590090815631
-8885215984427616592965846360943654237762984211426187791836287528989189066470173789608783423601639354776027707428728361921725733
-1713545761488733797112097100438352878478186093850974631628293903780866218943733017611561596620119895299713346283509695880279900
-7056694123692100328413045552536384469910897094450012862955826233283495356986105417266885152765210669772149818027501922143072697
-5044288331991180937483810266252299436099022518584143328384527105505463981298174129945339074070183868941494344473296478243433481
-4945558387028214187495664309036767910507538072289226775563326183770144119596728765797237537898375774364456608274929793323186859
-2322622760682958787774419794236441627708513520567224931868094563846705540632720743482044172976408519449985880794628778392723979
-7704734167762682724779119792543440260650654515136102295412021984201525761889238911775278953009856036983484297176809989345351898
-7538438504892134535588424111693601136717057553968849287415515571796218046474942306436018172239215803280193264125771352664266396
-7105221455394922182238669063185805229847494225913363125711170315190206996126469146603174629254473614090501455991736786538113046
-8157168667432314271904818365481089200297683424381896431649087725330131885687876217074390326660020019876852812089717929283102567
-5370154297245853419804188360942032243192631168128880436140877705786486797146832449934263947276552080089455965696884234934971523
-8611893045023888017310198960086212752413461499017699656702018998940525757023063840379418108573223175879013713671744193748767015
-1169024393509843272061563781622978325016779395605303924999369153283788827391502842037817134058668089767959752756676201396896441
-7712715405049463369575317556974267677998279848759269048895603544096481338768211601218741510541248300317436674252540127015114391
-4834430831243295519098671812863396000922057166207709070811235493720931115916983299692520931163380069504267039634742271991229413
-9287385557045725218161176454965763264083042136444478713449129334549410452033352200798030615759042237027156709457224173930955024
-9440754327156472541302944326043902553561785824204549770748860453197398189036670911169331773914895138408417009555757899645501252
-5832453847611197719596117303718224745254716796559500451686231076822545459079358621425609803998655831572289152307921157534370594
-6716617297863540993457906819123068181321563782640587142663699479729095230755403564453694626863314955875318305864016967285927449
-6751752585208130882471772146338918033811645841373896388668212294917320582400645793013617832138799866544853495551795042553770974
-7292062075462511235154219336433250111030971448383048960076039173673865773457243289124490997622252180509835724029497464904686356
-1703189532838988444479300672213603786659157307392869303094005510273480520540799882625565441527626460538592793551679614793917597
-5131469474921792991086626550504407821816558283404370799177646663722782715758886649389166252871185413421418269585717891891693033
-7009640276492618793739187876608008054508113875022453329081433650929497189681068056166559133270910556458288747450052550799593778
-3775026817449250262071158797005661647517869545017156045641434181332078515755353689003930497030264487465467676524742489128433074
-9510101337115987091584562788637829217924129844325702143952753831115106454935897717213086048464400730491846668741988349250815009
-0460642398157894924642248578767274436367563791950971068099635643161955689433389352445513881354534070645863359289997626236597102
-7422701275758347504612869999447090197900987293675125648746188541872170309069628366658720207642452150511782301406643296921604925
-5722148742542704368310731836532013521833785510008023772247459847917061172721772791747731176316362682231389997934194900072780568
-6833294401022288062004523032063979096666714062815023108654665205678873446818506366372748896978903704125253114795333767006805633
-0409503844899480726742485372066289542014116663615248040053134473634302073503009858583019797024883588714394669118201212140331049
-0801167094699960082079962007695468661043658656967418331551197267388919434693010620339366679098731235659707521841235334772751876
-6325143950028159251006278830542343903327924750282184108026273734472327418765244935721260982532015689685569244807990908472766627
-7594072557268049752783928609937336033485545218183637235406635759394992632389014311377829965838907592318760198667367240484412343
-5995370105199099659966025879437447340499996959986818273399469349454086733538293008250823125200112169460372394345464200255398128
-0278006855752348475839798168839058164956107248521078548181749550904031782397298429598863198195066959241173235250539525076363890
-2434406818995447305231609382502170967538696884871023912846712870860599713914006479152902091530717543673744437190057705732209450
-2049303158709878586595288112356673888760379702189055053773161541139894881284696826212357934526729889089168985110486922861784281
-1480496657855804936389615128385812000095228481966854328817796490269872553734151219601055960998715934877799282526137718284428232
-8638224569717329657108787802886111345753795000064618991042853502960039658407299390014418474102137277340588865538873397922966731
-2915504391345921079597753766165614369426311302871553494239227907927104755401277811135239511652090480469130728548314080193845714
-4662543498990058418814498281187250236958894998429926084397929019382124044722273292092351973221932689481754974738766719140738353
-4190409245555651289372817877351684664080842342410487693494611165285252514427042631380484145603968868053004939443493512729765220
-0119636369629430093021488300230179969441757666478935315483114992540843688913867607317956666306088259979412209337113112892142162
-0522344915049743379719646407210766405374162220565183535557053495876729008927029380341012939110046953015244548503515867668213581
-5545277258914067549098676802369675716209629211229823278440028400844384130766676038181293025311537464968008032689589725571813893
-7241917831784954432887951874113610869422570389407469506150472467208362227227524708480496950010505902724279188045395824562149045
-4536217193131427845613009167815485956442321803951137596941709381463070724725318338865720453796245623311051568325407640234609643
-4950000863730017668562367944404823933355943718044346155630933481082791520987136962663882167172001786426520967022022083855046918
-9948462347102121864710644896101448735320408682918327475914042821856145185407258575043429392954988610306816855047216892742882375
-7607463192368539597117886391111127498537601742711656094819081284338644518509840706151881140781291037342960935079170415736099697
-8170547034180787962131392617751093115453333934584190242119875787080041916215989194964046994229463391170868877473670939015394600
-4967067863801616048208692428984726982425267929231942089387972467090049190181520316912402532109719978404281158192349591335918000
-0182827511598856652325488782019351042712700704721955971553105284410000877214479216605042256842199795133210940783113951447780445
-2845448586343352856456977029480170139895515001400772533947791028664521178270989590999530566461508232129548565121491303912378773
-3186958087525040737796735368369363073980409705399259078085185801788329795473492605756831924612159181775569516279264645527914405
-3736227582287369825938099577236266512057139246043733096797986415476742434871074557767615701953628932757311718425644125724233706
-7173052386737821682078985950554267597062731307233678638341260916391599502956775154905191238402444341035490900454688563799626952
-5147641961470238255748645042116320141678230506441721302812017771332190399762353180889095100320685446894708468194573746305094928
-3469096230652662675602711465325424276546888133056279141284661309882996606616677713056958440903862720614419241163546636652676601
-4000176045790898594283018168562878609386243501149259496688481941480198035420169390431588952838073985685288362095448469635565752
-9472291341301030094187025146867336563674988987757598438413852630025766068250538948297399599973328446303590662904124689712678759
-5558918453683884045568116648619640982031099812596210893142179251292478971547413993326289821580230193948481450670535256195029562
-4928975689440726890177460501590676962108712941853309133182477027909307432937071388936253714931106477057738446899643424898539007
-8940244387920877438974129853648880036120882337129881652544245505645048735775452951748876363983239868801033134946650378020657016
-3701058033103724656733182793045707161803086804756890720227008032425755334349001190669627279911430274518624636020186433616060892
-5795048614649402340472644254299779685615196268626556186825992241948964494636129874107575230767378691185971658847979564205979820
-1236133846548113964258787812605512858795064801453710507748252434757524711761598464790831987938492943750974650361247007836117825
-8985069765244610015917016588371467517920803422724008738355002305222843175513547415525425623310272808519127269635589538855868669
-4866637881580384758530553032050127301271010383021829168699459836736308865544704254424297016793922754172114529453114659796809124
-3421197137282279783180092595776656118340512425979400729754872785822827951114365899638513626864234673281733350488813180030409671
-6116540261589173059806435182727298140303534088364505375974117730218290182662177594123794279119735348291936701406861588485281875
-0383388028538445842643371054045990749985217056001543711456417105050188186522673179186319252532355654228417953034579705914850138
-3589398737652268493665223622209314271095213796466114005222254738357264490629049957974234088293478306962011737255628545244120278
-9242006644961491221804556688452952473719954034253935879343918188942010496090705258446852742963029458182305909452754390287793730
-8783068031607497439341603800503578168008017096526972920750091440007773022446775696934539156855822636256531074692478856955931965
-8800823547223548709312492609422799167744315137636030763502283934241170303284109496261288800964950861563894408561284405190045969
-0236871653896771373931349637525093015261721424149322538581449425146949187109336492808412768678305259961228548229258526615055933
-6808296006076261647807027264924130647898638203490518417736498838185026931804266322409312178542687977048973852811639981510309567
-6711783212313531503601350937924384067635440627869411288664439772524317458074685185346606914709019186196743715338064452022403271
-1329461726620692353133812940387503225279782302791789101276394351197294472993751698133198738485236134603208512597461992464092534
-7712409812790062450698418919781788475967301395142101015147156004348821394973951402124816517835984222889123201533407163528809483
-8878866193884252627688867520926767781102452754391877549372235240772045942305940402248699505448319900090404392151869967674502128
-2483008370299951549301955588790277512316664972307031593695383033586616221934522732614016251454351893271188672805879216575868904
-8930668992950485150931537517355790279447532793020359504907584544928499659083716918240980733762266979363328381222043500384239731
-5449783313063957701679502215046202754515996947849788011011244404372242125949053935941173427778943061308870747330558976279745268
-0087442866677315281344307628368254568290685263159851300491709072441620656219856549470063530059686910247545618397733080267966459
-4275923776467144475919672663054261638444876359385278313589184049205522647886045588220547740175271213225571694335593813888699266
-5631076970562565479284442184748121529273149320713280238168313146627141356684124916604998541431548094125068927278902251637629771
-4049873854233479495273404123122985718709224211298472591495302249456292201698069758048348513785824572699432884088465158829077277
-6601450724720706904135791943277181797939378581152182984849501639363583354753791712537234399122836156611327530479415218232099189
-5823047280117680731777259023254262177630139266484401163220777646941723211983561493087099972956890435877152661438838138706007958
-3871525096685339470645850417153350859644241363604522957863652066029739101996436761253594694922069548250943637910124220796682359
-3789021225120290908842849945791566951268040039302726617891236371450848884685584694857899475642048623621033883942963333740640913
-3413392907322042998743788130668642581010260731658079311951196515199970920919298587850590756579979416052745401954692899254629962
-1834576186290812892686277778078188491493029363265052305832102758282145333131211542287672262899869561233857209736661910966320185
-8640618069436548861856298762841794920426604496493168277782652390652529026370866518863711574378563335650089395301480857411365309
-1062855694706861343683613721473054277513151272875708166067829305351279095564881057460121748427296483260938003342506900294399166
-6708351271129793412643921214770696882147428525507519544681246954889801321262715754608536636546303081680171501901796848282715773
-8170065360748835664225539865399039511547738151434626699419911223518847738407528346693417347838281049824633463358386526323379557
-9773283803239608948889044323843524447778250704201869489766199362127854167469574262448141201863158740882252497005327174568985690
-9629170341829493159540502281159419978757497174339132063688621315745991750554750919122418499757801567167615195540686775308036772
-6813737486648360157997154949184994770910737848857708594705159108226498818076724620595499835896899658135344576077658527954169440
-4916163367448740109143119472115171909713176429892100499193749017654102572161123098799425438195950481418848253249246794538567213
-1943648585194380435794184207380836831419456414164714608475465257187830071751668999365832434059345210749956754565801799757863175
-3687162724713568040156043932976576841434569787909011626375244300886516755159434297033774573216110685196819615175124148320455479
-3344419757198679638351706919063941845054040199124828713172593196435249592482470220242606177271518431150127043364815791934444495
-1400008065520008098162065199768125759577818782918099045365313282741980846275621548204708560469294053250492025107214712766610441
-4165080021198705915210786508550601653226551217888163799551833017968067846988341804528031533804959471453060256667445828562593413
-0316539921143167379344751397929218943090424282667061717675506492829683232765044382831375540458280475310930354270466628024378573
-4617204749069035253813713597661824629929473681227979210717594546338035842018470292109616982725985026372103084242143325201934501
-7628437040946835252535863570081482725836702391432238382009021257963849956941583278276159017021059243802411805222128391491555532
-7118276592277047948538579672067937116293934455417400255981648387252807293008272125197089405857447395662820745517911550198420495
-4817641036360381588057889324736649206689772293316553388319983835732003282890192751493367420760022776216834345866178180918425947
-4046762929816361002114402224273088310438847474234192226897299571581711857975564268312621600137920668387355607049886008638057179
-9349209580226030857313156556379575691164723527464611358492523658913876021766102463374095835678962118324213355237312840525047153
-4458386832215216090846608267034928117933000209670619365236847239547649406543272314067052926849866069213065858041288568227157782
-0323889725674406704675299432615839196837602006707700866051572397447613281818928460518366859474985370527579091269025122957262918
-8693066533952054034279975214015256982660363796184125831239795876267900616583623647519579472331003311428117914837252346650454796
-6978896914173575690746678387000060698232734806725458177123404206650082946025871125219582890983005045333389163168584620102734094
-0208343185195645077429621338459120990032615146936965171481121547620265509203707449471143882951101626839387108073423291107985197
-3806694565547588080124701297594558579857621291153844744163973871845300036486064506978169189349641947450555475680771354116721127
-7571370673293744335868791633492268450482890329783462471218711903016708619390949407758233183647172103050542587791975330523548939
-6895867004702083992837053115350359081392183348123057432804437516085126480426796559419343457573809103554769814374422319272987621
-0493741336702343083547043049060106406621621423866156744878463280624931631638757753907480473151395705318815364246326098575320029
-6546610394497897246218305493409122075422636049647756434404729742804710870898441487104017723846320578576625101570540009682146545
-1011863982645118776769923031005075048502898177517353081584252680645039932448249490068383719149012492191034530578466311073324350
-0940022141946663679361628444591959010381878575634668757912852707910261260983582304441366347012174417975464831931140858093450475
-0648068206853955526969735294213923796512233785864528730934169006767896899020079186828212231303729771906306615698951701782896040
-7705404267837637281673906483600597132329707232579985805240515664780686649377686946124141035632716982723408330472426681691722063
-5719449931034079305356439666263973565128713593058013796099786122163872295053911196817120195135137786906005302955333296169099953
-1565007759742421563846584208111412785562612780177121771600395311757381072903942514964351796547320888609281738762831301074727155
-4840914538717807330571774867536594427640229999158918266573255879619306849868398528582717693006558964074770743956975947230605506
-8434170706163547151705112191666162854461320116071520338539133193324696905732424568076770881016026396766250345270611437134977029
-7078829392513262023910437193357139649522860536333445198136202621793588265321546711781743395796073320028953300954811115494631443
-0358109781392845465184944557313417160881340633391419971812545527651450314512749202620144080637491419201752326439158460989691315
-6502021443239860929638929077452949976769441697009577432157105021271893283919677666379901876413440307841861569738215346309784385
-3775582600443257869423701993595504734055924868316007937741523410145241997102735147790121190918364977637486443176097526249923371
-4637116062887697972788560169232687166734847960365006931173635513798426534363094553967229788862861423059133919581108100325100963
-7530945856385218994386045042760138610248296085030904585153248074916348965900743636913197206787899808540051760130445456596005975
-0082651589864980975976353455996961471089119847766125021188045871260940417581575204228376995886410553255809049908515562710519369
-1760176651046607404619158827695196639809040360410321347276093208667279377323033464221881041272072298115933348047136279306992189
-4449900653089574942697877619922022124081013931968320543380925350254859461377805018823478776678186127822712476112142520129506611
-5360537273314488942383696459647239094488670283840872805432523968819547360255856276619301822761467290415157270983258323381158842
-4069470180647648022724489031315390330623675246416531426538288357194889582860078070141817901349890459635960185352818352346101741
-7844251807909360860529020528005655952345376045413861757127236316061244993838373872852044455049706576181912407467785016013363013
-9052782242469623627138305243693885375972159761715793565717369599576257075617300500868041008633881912456191819467065232604757474
-6257367548773919654525538912712606831341580701967173140576682703453195979358288347264315572356542410824096892368844905848969800
-0225531033632269859821449136659749178099595609866207288912288428688139123199517309089785003185562015618879502978274246919977195
-3412420395378666741269488926730591786905587902546167052955793049551854045851796515140844301739953615780488764468845360750173095
-5314569125098157310473890637519564038989130593324658307078574903372187794019987998391252363359372204089006276213106238012887639
-6663953749875926737127213800088216077686383881272422931892106536521390323291590624983492836817664288184016273391511477345251544
-8638673096407867791116469531963581105938614830552680798696429006418115851082700139624263097469936097502648484256024821946642846
-3261638416472717635495620507090713763983290274773473746283045337514051847664087913092670813304318998742601034170158553214610079
-8880759198069479182867513797991706527425937623927208476182273090404608783390855357409578977746370113730628533384722500327769010
-7964841863629197861004282115308229708980836184692237168958174288698996726561927516939282475998327300490824455643829853959878546
-4078550144875137620442196894251820235783690433882002285566789090860837373159507997956136455505729693351610325429624900264497493
-6050282912476085926950954499140111563620447106769829012752567207785593165136710295523078591701424407957863045561973215300362256
-7166661176552788865443610475451627720514979209097163741564119254519710530732032781304320231265321064373366029789454524964576034
-5731838949398822830420671258681703806386818639376155723888774861742977966282701086517327314375297715355669245126118723701881276
-1224558805186365369295742263213010659311742471260411491616914473284160243356280450620150570408750609913288411042993040473195864
-3965363040687291139829734658431286318462224708522925124414942719604612215357576250193871596416258769483377169469309016314582237
-6893425774786606424591335564336597467021697313261577560777519605605111465025332099784940659090512446671447989183060023172745349
-4463023117754025492704298169088346276715292811942385607520313996627188228077675005968319409041724080200894220147117291796736469
-2838367610734769148543248796176416656292040941138404572575878998139182976355595776291061040689581132913463002164503763638521768
-3585007037968899533646050958305472231296473689572926896126127396786068936357337467731293075452760614111507010520769025993887156
-3025256134722351463444782906552873128386686368275305328178049328442606382059696387241124580313700815579068965097895955058791706
-4888785355196252887855666442682481926655016587897905441501499624695729356509071382797002137717002280304447105900656692938689937
-7373767636755443505506466024295128010399690845976961083809222125377563226037530095320414396885247587842781981216438439176626761
-1467040097296217610154727986310524824930119662672041177376733844872215017687323322767179584613934704188382812120901100084067248
-0055261010703792927114582278798343530536332871891286962151403775103518820096790537756954678439988840466572934380472009105374277
-8745186553258777370952969850546252235196298235316976663904366268611878480055244838332857644576178557847556193922108941720480963
-7310291886872239579954842039199219595404202222951474277713284211951970030467647252785199038918806323250107496561396165925992981
-0269739665100112200470147709926216131752562563116766321854129961314938822821859829783043904077776487245854331065090150597583869
-6022034598022521394602277250974332652859372516801989113143038045232940829875622476147452690929605127893923207935810728978176813
-8336719184987758081413476270877983896287998313373933528191759149653154025750363065606417948489184358633308380877845477894994394
-2211461131853873156810302948765499385999974459433061226146423964769287619911252503115962272972255899290410107199334224556606196
-1402532784763926313823670409002705225482185592078872442217786835593632982577282903273472588503956076522785281354947952227775013
-4429564170373891691353053299293858952840011672714332817264920331107567378250030393312486800497701640449816183190591793478209061
-6696515680454660415306312055092012435204898424655900246268144415272389485588150485707845045690614308427142660270754614963190500
-2858971388307084324374434247865554208042477256400063151868591675576690659860039137955754547923321131572573666015058716528677560
-8082431519645786853787074095747644469767343409908775777981556502295146873300678603062293673505033125364497124824045616025095406
-7796338540952910648733467788030865929612271961440794230689497348772551503718356824778119200166125356293580937006896521596909494
-6623286777262305838866280436574493459341503722464731387299068764367690003490556552997864648359791608273875942027789979081747901
-2820762823681177751588883983434913077317012385982082727245344446265775140411273692313089468167013918322825570599659499017461253
-8261747834117161824733335000918969440857899686470868022119901936951959497914248555296472517607486195543086996762943719289544222
-9801799673583374329577712601117604429044210658931033348348701101269055569381455391166077387776701104476767458640618577366620088
-4812671524372167827325442166901095131227009588677251478248615586184246419258110774327904940522040756539440861199193515869861850
-8664636186261176234317788607818904273283245654628256017166703040583397980518196864696741148650137946657712844496351414683354360
-9233785042626900594870398424394786589093845861107111076865742457098507103631392813148996022790966610376381301013746723765671101
-5599585345939628248728616861490756773613146232759270658252490655694524473642364799716984131253156192355158951050342077829511934
-1018115413367504225955575347257464735373797464835594482025360169817251469418319729479090655145106287600720398462808509722342523
-6277929810316831402715379663360019513470321307271888286707156176722601290897267704973159272389968049881611196311224142002818283
-3935507653397356468132051961271044279593473480413318195705016813924079917284710536189206698836513833423232062305170527285530270
-5930541214728728710514258849354991541204981028873011695299038161284051747700208580498162480391834623057628739847088944321070540
-2131178112490366896971016249779880442716420462976316622931349965957507940779710818286842266030393060843328131735676772739856028
-5339433698747921036431228649318038784378241814872129036313002907877189828316605458939009159662654429547906907634851960924867766
-2725144295031618884966653121214453016640389429569724950019640175004023672074204183536974715285043574870846234625695507751624691
-1101023040899658835128880208200979236233784480432079242348382094125974376887755928733596001730428491870299057160651502141598807
-7529805201863368482438225714843876867695794742159176187308623091428831090441762886002331398279108448588579520003248961018841987
-8520639531359520492110038481387012497220545183327686786319255787574425654228049283708164761318908288816634942299623177967850311
-6808287068903794688768313922352685578188040716704660250946776133077382541811421559714303292759615754217647905753791800896114429
-5661937959933192849164004778980526700005624355990312125795014118394734147334017327033918908976463421944496702296931260093163478
-6866390898079223822127023182717821447021210719486206672090868302561371850042810557962915762631762160188811564644765871940463260
-1983784957124576912722518060888269293020694751991232003856484645400501387457614453894654158242083061986108255912461168024044362
-5023757063288290577909452112558045920010016969071712896564748738667312129264760935144195712725562634643903560619975222875598092
-0140266427651227095088902077296483470532188392053269670883135265668245606745264278532552540957167938303029227319042084398428852
-7212818706985477890259174108784143029357600406814727037979412733984989889987109358055090912357026404921211609781959966663957665
-3885309358663398776897062600124335478996053317484403001725157655044282776168453835403175508740651996708988152698983678588345737
-3549561496006579864153172902480324325137781423364931522958523431287424861594425297230970169266435951937028485126756644018421959
-2100522734881499893473520957404272588614489603694208305341205355969403603944823313607027770883562580199458807047182736184431355
-3558566826776678787162145637003470985297896846344237649664211727912542844807936273529611661291547660198761650362176216275159276
-1697273051970401823436818435327916444246809126780823246257873146180484087471375537086616586114897794676638646530157453530809297
-1877141731822379123458355749374949833686834219493808460922026220049948042459289931477172440353720942293259692771867444391010663
-0596114677690135744062023310258035439858771664427542203238516588128327906442218908975480077474481540939986337760369812161668739
-7140350695399428116941903267710113882542083290951701275369344655927910523637037185426739245384522097331905044898640671070017500
-7453482207139204385313210256702640687353020750058344407280878423180101848431141829884177527114462939147014281506261604724365378
-5747051408867537658614820169384534962462911220360124367460201651929905485919878430356918185750947336103425001412723806012420037
-7672418158298677361496394053891368709542765466425399242228084774006250993472472890952527381058062695609973430135097018848485375
-2721910797057123953879416244095325096151158592383520642643416351496904866623597785985406941433201519864328401275343395705908857
-0642983563496035432630122777955167888076028823131047975325063367604577001605053104073667764503079932854743114362110563627584697
-1737450520589955785122525243234607141022634008326290553045379074437558301788691892914015378729774742647378096844792864200227145
-8049477947243449894011256046326611511617306926576503154750985615770186729781372043096871431456514521234719945343529143211616132
-4060930164560164022219102032312173710730634459253495956116881900466752536260684001258460015562183214690371015163609148581576715
-4339672054138260157605312889148304084301210593319661500758836115820325521753635857005220500312010112221791048318710925629489360
-9098118884517110952549620567550824645268745886275953112452963794466205654973301959016969502644339312155829940467386423970146851
-2030422710629305679756784568188030405053813130034967510951876362126306529129246017456183221963883892572064857246348841309902207
-4014325197777088687588337561652558142332091500654763031260105487352116429628561906919380099545877339112314250562226830515084041
-3366554959465306038343578751837494403196208574534790117389855546409717054044483042532146409499847066640874035730246190276785027
-7784874865116514506998867941821004659533959527747303526874272093224628939120659783314979799979608075209344316698881835617720838
-6440603777916554902557821762272317634207749152011454338456295029524399535728380230269435936275288518444494136138485427687743672
-3697767429372731488197371169546304182440802429138205900920907076873491237616407487249087243231746614255961699354564621444166710
-1737116215657118949418096366707426664676852506304031637797388892083081543972250240515279155087924413491083737598642466601038186
-5943501997584026886556269657780895221836455524956899348998644491412008841758015117023754182242908647650511196372757530427844200
-7126098691386230123347928604422159107062602585844839531380975985325229120484080904014468470157441597070403077589128617082084491
-0277414078111008949169676840880976444791578133697866086476338429943906280786246925904505101785927908752510981120731146336711732
-5011921703942318242688882518650473013576715256957336272842712546671709676486379489552317943731327342059730625728957322661925103
-0879272542563908841343149899911945430473689164183260890378649854294324088836226655479509126988786763035689227450447066454969580
-3635797692910230406460094517526461454920959082159212413377990917407487877377494660930246389887432321322711771671714018210018244
-5496909568572645176488382324921312621177838539677336553279411765862833091060541060811106495286938550448561214644311877956532326
-1372848285800862888898722477263959718622329488994306400315469392140836614515990231729283982778367781183582185203884353672168533
-6002585963544294141850925971586001726265376264686412361898087738304610666926697454083310088708743790359728974336913706461189057
-9544994601782264143680659072037087516325897282651078850550946582804440990613134903404213391711941451230258293606634693846961977
-4294296739368718314807261871407488388139897913896057193551518458028526780686105950168593279489650803151515173510050942218207014
-4440222769538547178501749374936219442687195706297985586916321673062155148432380676822216859833618467359812508595764374585042802
-7090291929148830504311787542972555491835675686001439326827409601590115100758667523079283454747571560861565934370463671494879471
-6306207613636744929606340131323412825985507087453258431275338612289333774848983021189785244607159387364635876091430264215902551
-6978625947059991073203270373760209952614062079324674488242868605448441131389947105750784088354616643566884781392969415722350013
-6876895254868693830649346298281314621651851243964761424180528331393082774872122268180557991527876049313013835528942921722633863
-7994555257251266617368145187318488777925218911343096210380569645729516845387191015748935661281511118325824054860678678241487526
-0561712487759666786219959935849355827031795611802441457990195006279656115907452353501575006228849649556626967066612451740817401
-3065700444272921097020103095032561392189274167240364636985217260309148382438375007728649942200430100798750588348282135626863041
-6418290958339960432209597429802884987767056126860829761197583897408153172039938420304452769552704862796110442336483929988890230
-8411149220304441269312528476234638082926201849344380193272700895522547783655344727512614476846755120115181365390739989354909216
-0361827006206843386504436443633849307138803846456656207910374387223474485947474439419270873842802147250905121223284959187002960
-4561901942869500550331725452244098638243866570298342595884556094097612128702524209824571526031229091793929079092201659156014426
-2569784663225002575851412395224946857021846888745089626571792624047307039913201999491767773809090290291368272189546699726924662
-6874345054057523806453164208085928558404937408086499251394158950058605789150302667994062909598865360566447853006716951800116507
-1806892347177795837940597487685027448543886249836281858785204813002880073746279096873385938335081449362375954555853598273582800
-7280197984136582079744511307894765629896405494228558457447110951049222331477610433641974978714281803792968381573777298819652746
-1797088044067027854938520030542484156979879022746379761147066454374087806486473993175758842146367406488679492927645706548068169
-7653106688789014002295870215309142445613718219291306854675259348422471093504331308963443794325054200760084750801107789128152322
-9003923022817082834921721240788410357242843286036977355497738812382673303415071169601837346379966066053060156517838544048108090
-8927903196351477482460887787174517966173931425526452434853205934174795153124436599267973662874006233354646357728472499860554504
-3649137050137288600334652169002894564926317935052375328874723351133720379648102007752831671041946276927861278960706248758820299
-7881676548153486303936365019720006418330263108526672450012829414081940012783530554845066547004930367871816825750941800388750747
-5617499751970255706526710234532717339068075364068621300856559435412791685014748892438638038434662792832126729610856601828058978
-3609505162338640897172019393757051075698357002384746777463891780931828353562474692966266497051217520058712600221078906316845512
-4218942164849049619324701770389240864171286359070468568203895572380950389773235867347931266228357895243861158024586703415416725
-3286877811857113758575603255834974713137243819997694752214133530728139390482439967896436662426005413536915227299430206070281748
-2197090522718698504657769582076344098155286933671656794750871593655253531647336100969432683359373204499872727545324036411875127
-9266329520011965890398156813860326403682885444460637962832683571266360623432333340007962893574859386016733773045469648300215724
-9360218780816808197711206028145267393233058010562551036732947883280144516446467977991400621686114194941533328336858706301853920
-7975466727102526807928730597288066888928449183473417942716701022737828267407136547666947638756923213101355014521544864295487342
-5529807372773853881156331115996145600478892095295063408262502214227819442322854320893250029815358897498644974831455098851752144
-5217677466571168103885153319146030362086428120742099054171064034691470505077333070394007756131235288630142015715989289401952345
-3238751872112411965525172279795754140090657968922574492232135102357083597107656178253770512768121887161690539858563177051498031
-0621143235328817027584926551312004300826256116914067938452329926333908173348351478521275486940271058902772821984682443421901374
-8675029994765542582556780936437230200725353322681947577235834861538086815882331325782379515826004655685444830286018743065534290
-9009226484124905023296329465126310425464799999137557622919308471018246198151834136297559364600044830857980861753679005100073906
-4026810600660421971978121050945152770853655639964897333811108395111596792046176724058242259398267547036042717629901672105588823
-1701174760060091817941457573061071686086097383906657079983926029247083644956175901708832562604741667581501354921250883246878076
-9360121868675405580012858168094642670756925814930958722345840360155035939830719501362830202256115680429221284715437831407183230
-7627384360887381611002122676157337577850291681707758128451482725333215128574377639863228270429176470896652784523071172226399208
-5924717495388805188609979501739528551778957144375491268555383034743525334962407264117945701829683575948250702090310348063964292
-7285038571762987494406954123411340680613165769286304746181220668099890216085869650378284432589286853709759806525223094629118994
-9108371459503424585162428035918267612861106220506440110173672498423384456764491877643881942033565719022603374698498258614890281
-2119544835856779238923121210216240209691871364625727861760840643200609817224777039142791222829730821468075117365482012776292615
-0287625006985324113383256843550124431381565006783532108722669073077586017057966762263289920449445173729525567088605286164318499
-3802234646726929017573814267132203009806257343348973659561216577528599490870752429375293883854127262090614163544620710283467000
-7574267833171812189998339587827378487203820258567218738257171370030553714438406356225807045913475052445364294909346459733645424
-7057209974818106332836072380332490777736818456915022774135091028181738711236811811377666386715288877847647340595585098875240481
-9197215476954479756497624010576859326493604058234153493216522641384431342823687635555610194191608220091909666730522341780147856
-1119537820044774998504706322100346395055393450296026673688711639572331613882591716507869222690391102545737433635859812821586270
-2028121903848368987212538442391618102128444213522329584551212886903253244685970973210284229639689302832127513289597893485709871
-1139101840913818162477340055623563542434178020287614160741421605723686784042526943742745792272929328869556547712709877327596063
-9107408768006237961652791681788083610784715577214377191666576416371990600318918309907846332307177843177765073709224406749447169
-6733725726008450978073741092474719053157935773438091672305982444490248804288080650618594239161482780330596854243463318510550141
-4618707611170337857871421415147893285747404164961249246066409955331826510336908541776726066361511390478520619795261534651528646
-0029871423726184455790317017373341560382122160829511677232857909382425970016570928985722750518023888742942482674353399294113016
-5851677764630543407742209257890179166834894877003624901201481696534056706522332095998210032002750686323425734736641298781343895
-9906317458124808949504199178481097664951999312281141056844360268819241235749855328929404804574246937697891911753442746410513511
-0301178939436270473741478421267690206733306236983147974561800903978683929049444127508643906957999471564453966363638317098479091
-5695590670680910148994003236516725327853434675592633044599651978504490768012904279502213144296250305384458215615813612885360699
-1739488113025246606429350291878905105006718514335177675021282668693092738324431010591942084632165356255063331639570681777622822
-0452464599884896996261376953519588463160916217402746423924422154683861260191652961898971705302933158251417160490178433853439776
-4496351983750730650624656965901956261109512227868877661440793378743454026849129576683511149685514643006637302234104714172349199
-0650873766138283576167959756442091757660353703079228843249388294567585567331488037468607523624545996431350612623181744202876623
-9217884841612782253645748182653936757610046223059439143748083525756745987386187135434504743166765496977544377259895573270803669
-5233343431863155649799928568730055354198316775389815272387174921789883067246402571006054994197016258947251698092729387460016002
-6222471188835586754619063338314127078684770466144889169048987130424673328124774962008878054843463980934491177848530073946295466
-6092983987521059016788973113331515120050882840886284842856803861355854867424082016223127983920367739842939341557083529339357539
-9152847423135593002663232861455632334026991039822394086654099188131348343461957860123922177650787602787823148319677335222779269
-0688837540315420699495154888659745629289164825587079409113672585691726485783954257060693018031835646491154074592682796993759642
-1560331745546205131052821650865965767504353088368099838110467887791087910699782310016063819056506494246788726522788847044002972
-9843063757395851013539217226262322774482770252168515327930783086524549572291277963238718919614771432829552926078930464389873382
-5165503350814374626462147517304790280393184056104578516266158383058163824599464967401146483647756651293496532192439439145458877
-3334882919381143165661074051363092147447735703148534066554968559573383084492917940343234309775642206678952812922080261015609561
-4150090892422827778476783958648862075260361082863595155851728025658354185826522324370827070485157038772970922137249416500335139
-2270729610239360993359408455484013545432335012129825782822705159183112780581412024925958595707332590452541348227573704213342055
-8812698543571227460191878467610741003808872140196791243938096775905061169632652370417102797369863591037024610630210903737953654
-4650850571724314687005845773201562588529522607481288290365062000530992710204626283641702861862037299641210309359904939817933700
-1541143632255817063903213640253364698002930217355939377060114361273809860644552941254027110592936933650281526566113066201345129
-4904443218069061051090074486584977672087200091073688866301081198367118241651115030647481869824608967401802054144740280994709964
-6714819600988123781424031251846423957142678675252652218273564424036686308763026328451858255344930462603371376203101104448466961
-9509079835837547622180222314290215064732353288206452347849664411672496172109171750484558066698591320017336090478613367662057930
-4411722606999341112288605914814611482715323396030160357274723566603030739104369997016486251468461541345322418772128759607222696
-2948183785699572384084816055776039138878581148811752092336317365102276231176457487558011884744609026187961229782054619496985034
-6425095624545385534119498681567553265889108179726785664829530547971892685921754372850536788921833807429343926950424016846919855
-3908326069100657803588698889883675042505627231337237747168653314558267673583632726264839565017058848634863075879312565153073799
-0321367266050720934662774520376532661682212427124263069420126600109509081952403933716651001460064949865799766176759028464538738
-9741038058065551330442704073919666652946527397570055939551345839830820648016177629571594906346803356773604688620184511211636838
-5025402557710775296650014515224591309232698067998266520271098024189399721692010614452489061642157793190304607388980065831660161
-3865371756663396962706440110406172511579502225888432146828231479035598172810500698253040173626514931478221885791112009689705108
-2972286823839979161832311952971045738890113686974537517223372452946515286365656547601871718080007574659696313592727664057554794
-3671238913457833340723922452738592109309375009714705044237276003225833183922594035143870946960395880735557105535062577056078657
-5639824224660978396027300014663032753936090244783494976851962014859592152013834741021570506331633866559318037963618148063022083
-9565507482964988994686034476299289689477300610763650942914931588839058915298408270882723496065586551944274748829842524532900569
-2950174215698554483745941905548644387438215825109435969023495189379067472134512077000118600012988374494816155364721054534508820
-9518525904194943790633186346738672276318778362232864095452323156494968062204689793145701834333799109246633884847638921045253621
-6777489268860937675801194897856962853781999286279373198884776447439334574892992495036091872659389999472183722596570197112840487
-6940178173947556103657708676822035069381549630078448878860057242455764188710473335746627500154960475546070307022636234086868814
-9329686102999304427635999138246997518586345169303923543680994865014159368545564362656579126189568984209672180187596509411904289
-8400290546843033015441275084455799605870040808860666105081155326036596425585507607789010815662662324838353003534213828215099749
-6262731155067666934829202231823905666280056341904107277513506385716411353609764416145090669300953084810469016331307248958077392
-0982572667217714967858091868055542854621721843072461742877828288780619596753823464439165581485796328231801786913442847252641526
-4848655976411335420584575046674979122655105315200347515565901735274063028061587092460808297171218521824980966675211293241764354
-2938658446761945214970070404972488238286005305727629688975307477962234711112158327154676636619409638849544823620779316735831746
-9233723105727772276287999774922758635916582468201648663126732610340191585232715185516172590941978497752196971596838962424314214
-0715690795433694724565717518703035300373548926507910938888351542625042732566820561320308097626791527666632661894798286702091403
-4964320219506572216963601199129841376254539941692757336784083929771858734782219556315822673159169808692321828354292775097642159
-0335559611733921504268377474272853207366325430567729920137620204884173222566965027114331948190426982554186105784631841860371363
-8033508558384267940900957170710292773682470738089554833769290979485707252598489360936633550982291403202103393568639544279214517
-9104033203529399347159766145704434677301867369574628242547881760927798205454869510642633732888078982477565192220841911379788216
-7987660031763621257245807669247102344394837687835695594169011679441270384265326170270019240149525684618010449694008041756350062
-8151902440733357075969965129856431003770185569733670086864031515027203169324745948550070082363039150127359144961399154724592013
-3790327961179853157835883754649149214290489479319422066362773172577179735157530589191336297098156970651227770438081844185734307
-0727046673630137406560803707058042940068228879956058420026237531511228698088255979495039662974032046384364026969019919437568764
-4204578688546460366354226690592321231974552743860907666913839079477111780605991648504857092410645662298682793993079551732419876
-3756294405429570395559614676089322871628319405115443082409818445213875343993774082306018456892013141571878129826624772129903802
-1915879655542608031603048228973067523323417771894628549592585367737979812887089684899398996853836990904295238545782994463736003
-1862917064901509743356712523964887969381684280627429777002084722985720739317294453681605121270099743339673719320682461749376518
-5235629358000506017419756442938714321316730985284287276160530781176188912088650998156658168743552720877268116184356043543445755
-9443882656574676998601479646029201608533720364834332155558897088411735201080867283586900504743773546108777074700728937687647870
-1677493272605889337983961765432999426943110889282768474699096119469883217687878946342929523139815961885455260346054616901453447
-9942749715588817104901581207188857800673119328816832808571244811062495461360073125883981969697016073423707659358263862951164461
-7589849154636259255662987558451236625196817855393407896633655975124730683842916268495164065502043203437031707489979618651602416
-4877537573726160052953215845080536556910640218250727320033197474127755187683283945624270057808449225177808596236183681916214308
-6307674309759482316304083895463219733480617515657742063182272951154632706337489064696789783685482205360435876431996285794642684
-8643739931017169670588941204387320679922643218218094561807636190505893287798227669018730741719908408353128973453099243266062517
-9595878873331613803340153742041195527735780444717553915355354609332848505998881213100337678158719821578770031967558080136888152
-9826258075448305567391906666815695574763625260042694682673443923778013491658161518721464450500242508138338760627120693213553580
-5553946281220024617384962807582191448987025563460515052097885240434443584003120884005027893320006209592895012188176773812824397
-5351207991648894581591662853877103686069327469518295438143903554689747912914341445196157967066587607931175822601224101946313543
-4718020971952950496510335972370616351651238578779144226177776993578212091520634237018822715136461197024637982739115303152147863
-9502456279815158271330961578383078627663170821879138142148906444928946168505151984176109046790336568113096829851051335078064246
-6953240969636903319954311768057533966261755313567448194782711138760563765547507739230406557393058730942539222575666804143511119
-2069936646276438376676948110321617772893399556260252358509335079746651069969820285929369016951090713864814429938558082689945968
-1521371174145731236232976467624651809029170086344894245707746268123154057519935873219521049882236870962226595226944947282873198
-7819821085451992801895188229558460134173236266804505398682944828070031878272264470195089873005628963880175293100970223151449714
-5581893838568192200692899357118035029378571475716773858918510887575125236858310172913692992079179964473799145336381338174573764
-4769245956084317711076182507252518842194925936437279722455907758875435914157274173921143663890367325067229935879996805150485626
-3134946076248319258593699700301770098983689499295660906642311982752703674969335911328913636983282731424392564971128071529792186
-4653454953851844259383149899336223085116998954459207141602572224661191223836954928657358541085552778110770329785385935394034672
-1848527104180913477755119395683294511819189869818050532796513348646616780772576901429766012659310230873210004958312011164035296
-2958092156871189322732011639055425235756904126336215793291675441374713359747361020499385226744232860514052551561041374928704972
-2212834863497329670476581032210400927271310708293108228424935554688407632484416285274174812931270321948680850009808218617859705
-5759858970411718249018834966145654061840913712087092866138009251429104683711023685469060131756225674409696442152891897372343886
-9744590632172501257249804338242668855862458498369585009073080663432870189779358421204658237236159348444067179731646552147785093
-1487302286960634890703793800583916358993694233181958170067964772301899115902690629049952516027344747956086526751455372742400915
-8338876525824289493587802849949027999302785007312125533604872964433845704867828931952315117389601715858805797176205231916978863
-9771708561966315440823738672686475996359300091791133612159610896088743156170335643885163215910168604808694162494306049091846493
-4260246980990607411798428730055796631495823134395302589335824515261468702425017396399121744052394058025204383900792732372609031
-9971700068769073722960546542881880186840993544233005529300285659415785115249158554970710339057479784757811267863305208596232681
-2366740530644754206054437467535946438364093779279894170145358386159026725061074970741778654202207224942319105808241561149108640
-2131299570746273126264570482316141085118510380774029845237350007337531371596475771574171940133305454244596824947855809667756017
-5149174518393308544163272712602730988826876495407743839625377436405836969824290538418225557277170446225596736304939253815552458
-4121823510749511107366436348094783330267428964699228112245771169272372131739184081655990835742337126629817378548166241761588650
-7681892302838328396599913751062470874471102029977403036886581893796472818466025775981658918091981433719370508505357431231485600
-4066251794397726082230815863792863498887502338665772599923859722198014368910671442996024261604600584351270667582157099044750647
-2453319243126941865196218141928398513931210505017908632678271906294188175528244273588712226403525451579574075491526959814201424
-2165992720884571403675858895697135732268260556618466022757708781513389984131289376166641651464163701439701648503883511692095752
-0809953098069693344801057772787094818934098518685172639722513866511171301116371082267224802273430384579466957516125344869179896
-5481982401939122614289521472353637017126771394148320518526784723238206085981641590886685015768028048372274104457267692145673344
-2306442226244080959840391166046824665212018683995806330612693877379188175903847065416666586796553782166003940513860649019698449
-7839622245401117642004314710277578314230150041129278793586315748881510113272583096733556513373523207978534603403670731996254473
-8688617881383905361473235374450468814839809922748795968256897565635364988983320676159901781893744135189821124712699202769736139
-4654535121453878305432208653573696687720659331945282280482164376466643366264403854440410004602377849435849425047260830549050573
-5901354141130553186089991532215523080159611047438619487077531580624462005235622602720033994742060589665151566143947383285531360
-4404189049080879563477017517544794830939312853525609682809863259313640891722874703005379977055110211171023836236430564193209703
-7229494566794585131912570254848123871703487763830158261455284479338860024826943524410960337002804517176829321597236274083343832
-3895863444104818475102160062282466733057017625695711453552783055209411033854956586687106898952724582542873871156820426292736090
-8900114835631317986947314833806014993742344316565623294563018259706162592235301529753004421871816938486470617127313453996556895
-0571759514976034692556387423658377978720336611483511537576020419517170544073326612329641870061597096528288442406290336718658618
-5351965547349291678130305501394296379111242594063885471825143788366715324130022316640730177505334429253870301505302005277723169
-3916717817342560503418340716556896773392571317597234277462755462162266315055085507027881148045053452399408688937434362014420860
-1395787899840181514485743703752177228078579014380638280483962491760489212783979634460850686798659390084425828810746413759168217
-2135670387347630269927889910568863392759999570308499518950101510541542088393000686133918165399672601047703855590903413630319231
-5402756885639965603367270976348755948712799599490635951531639604227412641095043036804481527401401591963544493042050777198305908
-8529853370862945970036024025436607369800687358272778049961830381455619066198750162208786259673987188349784621840620855238037708
-0287160171661419657676846666977667625410411272514035315874978763125830094141664498713238305106795904657260444752711842879767089
-2429466318667908141926838367968922957966923427083942277132655834855250930739506120606993470384477050842837546690187842884625651
-0859078343456062742869073421013869747003592646292364644445549193378529859368317830004107789688729965524376290149979489394466571
-8035239664854439337661491633430612363668270550373199092404545748888325504908156365529288450637845828980854077097067322982777549
-3141023341289995552305686646515529412648513395018325323202158482204644747543553961230472458295893311161675174437937559470576749
-0847147233703839410907356117466248368234947493218430919253855840473886381053247491509943700747999091387943188137392889875056078
-9027561924408681103294230082697546064172946790782404069187548612190839473120786175725940158419889526634026805571973842865999326
-0264435567708660940819192568711718952454625290701063992984178907184987617554072919582117061061638475508286749372288750484810591
-3758876219081855315432362136232140221117526750802434000370402808679995451358803624973049460963970344708478212627401394392324314
-0737438132749076462394577606428117744360361527711020670066707010174337101948368515240770186600234895342764130573542724774509423
-9073624026312594849755836859839861773390790206872160912057185754009883091290659157623485315161215679742322663821620022079418138
-9512292856680689427009039672717710424584681275009917377139164236516131951125126982668253717705356666975977684408510117347264524
-1614244135791303269397434529358056292497647554306953362312956458703923199969180084694524758403500654442416064508250070732846804
-2519174085201627296034372830011366838603028175377849633378995386798621551863828217907888881997187873208215147973680227021049086
-1003834843003895903348617625671797354229539053440753237068065646834526921585552402882071062806329627104734866652786788079565348
-9629790405359972301542148043545627855421437234097522244411526361848299030888697549739412058687417924390455152178947938956747613
-1220334555078453153775416863741025226449115088431256895031662080047877074330240958104951191074477627437218425259277775462127879
-5330046177874455391020429152325102772616525806909792370732670726443060748075990477694277944732782581654693994482617923050984272
-3673634429035216620140695806733909073383802026068407079504394523147664262305135669486209989893714484828370038683949845972371071
-3708115456116104837959577481370904415573625213784335620684326306607428751455492651914598239687297810388689807875911114963544682
-6275078866641136241403805509431449819259498303907303571719921144438991991012377399643498948247855847742996423485083104296357966
-4819771171509939007698439213480827086866218725106376148904562704537146213203839362150271333692094168029380425896012121918182027
-2363813324380838896838697582331955348538206296702138518105826516120031079298034769024454364560040544650658193748994518844922761
-3584004325313624962617797426518359904557846265454464840046448902633251444504148633006804302389871871448461320891471777760471406
-7015140209188781023966520963877943044151556490498938297548114159848752913311985584190436463500622710986698476383835553548754022
-1839528400463687701674829536257273749291910270980698644016289075485436646251865330303505791679775487148849253452040305315948402
-3145765566550173415234672570838174821210069239627979798684879235063388281638855085067234894023172727303768990495108093511731814
-1483336663514861984292197260930161194717688304395281475857151745194230301582456092278030099203677396095385627051965960418965869
-2854504524032911241727059077016541586716790096641727786446371669834231656716324311341476302384390592511402123780357675520817756
-1896892000036214095213174483595939108751482199845439848320000109938495152786801921343185996467957081886861283697079441114823751
-1013835470696140967938560803552257866025556771879993212750495494783316985507407134125075415195171213975980403552113090097922014
-7515529295471634503543767654884408021479006972212507337901526368761975637401627838535557010674676502841359449244736451534979277
-6386148785910089568558317754358991974549956833481352102962872492406026696207774586778061183616357702706148878186924821100084521
-0786007793408177523760641643227040330556706874975301831960943949711205745890553620154847773954039608277686547389729917607939287
-6601065186724585869718286730900507361468222773067014813540248318802263981782312642062065066278538284353552795463948608367617264
-8710458632884006689061619016115234211820116439477889276589203755014121466655765492211482958675286327074722685854832241409593748
-9721061962175462432000129864627652688757814948302475172688435098625740068901878583888711851475071264973226898929358873311316683
-4174366427344989068552152924708427538956427143878190827546384412926545762544478791156448578168011030464548344644597978114749995
-7360922452061081711320164728509310349083463549987726136205083770590452623618881507969241810844776231293351721107321616807591790
-2550845118266461695500217220306235111000226441822451555820123914245682646337932826709632824811050296875427929721177340139400066
-0537242786569134793043366211458572528023713869510543400208763370329672141795438795279424345734151680580842314157723144187850297
-3691971167907808375655388036762185591921761050859435693988855587355710680373549562866421201047569372572737260475884900803372055
-1007691946206878968978529598838997374929069152901229662680626003917658157134099448777326028788327501120348629153653344792265032
-6789665338488546383152814125714262232923477122140534949024472459646083579525928155625268840134301323030935772657800235228310313
-4868298684968408834649240926318299142611007662477773878693177513443928825272512719998804017438032952107625783388477428012876908
-4309202213419885445857524725380221565049288409243087159437144931986513177158450201360308556789291053726105045930369784581421376
-4918602058560708246713982614793257938660065153424340512931090185661823200932451770267967499779255156975310512692435013776152000
-1110183674703280644653992907629380068789930715341891132020648458097673681456412608084277373854376969813158591776142390000280900
-0445144418946628205657456424237128264942955311965086380583598212294732021966933151948426543613378750502788733253601313302851775
-2374366628960975291734051077636704217339955444337088817734748627762386830985963672836557693273405067738105684469127912825361938
-2027506449534260776940737096467772483868296281393345078755987162674894542324936567113913899614190563606092238595769318736510014
-4601609459626193748838141934701193459914056226332390088463312165368986927729066528661188656389710831973546586554245180984726395
-8820641417137341791284188339243013012221967809583302454529489453970560570507033795822714618813232104921926392983794422966946716
-0917599289793082450351085959141123440985146982836878988204562375158569611940037966919396385952791842444219407364739497415459949
-9477416265026706394163032606799526520617258416558453349947010427060666346412817629143427886670549081801335758913070396959720115
-0666704035859146354165211453275694040361967505403921624893044875089069215309652369723945012113209887458307287755360555234673115
-0255440161315757825615697585801039525106439960924827488627325282298838888854341592966844608858745754258454784788330547612148950
-0874980077738428750262349348089941932765130462263947980854368723919615602845763694707934084120416138718231554631967803081258409
-8981164868907222146030105839525610946849494940635627162577865021292617220051659027789888586435753051650333546661672096178778980
-2620946901150871449077949420947077759285135192780733116251997439655441528374111538899479815498280668657556929167956071921060805
-9030260608320606358567118378046750979991657572292125217943471649264668431650823749458443029769965695844134676138947512285494656
-7911546964476705302214543959264572361084543166660831362636246720337948370592526588629297565497381903059061404007654352003582699
-8922075574627020723499343655693848239182605712427393497956424335482790840429881008002039906918138130808630673506435738463196394
-1030007563952008786387120762737476786971644512140825923263748032598127575949995761019498818566016398257609354069772389656925099
-4044422726596923902940860834745051450250943536191821985629944194928632102239101274072099618807513448554296724965250996986364924
-2354577685813636309146827729776859816069210424412883327405297035176569137490665953223528983078628177275666747947529655966331575
-5477299131598928984485290428357889109417137134680518227595002407302611193611761790018230013945563583265000510580955975339191446
-1619521324601562573756521193045609645344126519940152032470378539517720502293336186421186366939997498341179560168270447355950110
-4230306307869293075421899272149696843537151044956328729562855283491975528896006550623263787552206307775364239158496535813468780
-1611641802461249957884380478543784809385839965522996094364642447223105495756896318541934272292804367584843894271046287233761298
-1709756805199283313621618096481348781674012787506990084789188511001769795898381723775624988249883268986469361054705514036409475
-4042054305280705588082843156563390558519428096353822906407664058875561059644605482196547535261726903242582076817607377960964154
-4253860999746516433043460107715275174182573491654972680242324213294530205657678192111601960601634649905585928529798955700154076
-6676179068384501343541631038132044675296273720164020679619589492139981245074167783663095317254579357724910508792547067262588017
-6293884180622784793929874980896521285454501177558249542530377203281315652064795385736617567836645686619617679168909645709168097
-7743521550856066318163410468235782415369091035062393314878499152138458241235674642599783367386177248502506902767835896501146443
-0483794093371674252980588779386498050198274197464907995529503130294921702208337296889908183028360175355797035085155032755797134
-7360019231801705667141478490298073274830800662389220682649304818227754575701335947775670426238672520023046096705399683924718657
-1560373958818879850684156471739380073353650802319300382801718291634025935869130174150899754981641558303334317282125650661935271
-5092493350585336373714086054348812631829949972662091014907535609939068169965945723736778889287001972766703372105697934518100296
-4734257102525392916687039288087104774233931626636454683584533774360103845888157407165794111547584642769928525653912147278806542
-8822290823497972283964354496248019949369662678090787983018405519062148805449317563743875081526769207312318307346979280704726453
-8280283626279949899078861531461602097441638970306234787225062938541682486544091938804453769368426982357391305981842832099966845
-2217356720554468128605404764499852161966456502338368106620715847133295711653095826628517163144372167241765382757784888551945323
-3293984824292108860635484259719926152739335450946748798660592468126259449417195090268999500256639254414418461654750409028017288
-1675306289991237206693384004427250238261655808453706438418460194044272886240166511333039026240609926117492662156547022216935277
-3798683710262055280473341604637975853707715733359848491914615475081846941708688479067522988710484836724298291195075742855018190
-4581874216800089134728449476207100847781237572690983431502108191722970308605570690039979318708286697553630513952137757229594209
-9413803628857147469961583711007745023208883952507321209502032469098964348049914806057645578293300641835023243516073565578336233
-3421265017714445796604621284137835957308268098924387669789495349357687107880833828961898545436375036341306978848338980923182467
-9343222636188028392447876071807038373006670961664292112334770077234449906744690005047749541517081971030139237186089097495754677
-3197112368581263984569948101844452284212008325999133835851189833940770803601768180655910037983634430639371254776873860967944989
-7762428156063656052457140048976461668407455298961839410706956245596539166362271685772723545123147978715000469199290892122691240
-4878440976953031234401260269958754462435834653516282136155912652234992770322924693740152133726104201502258366755195941397981349
-5410566039278422394352444668313290032035427902945347706947962717669034134093986739640503933965401015646443482046077453432046184
-4739388878693555231586220110918786353416678121114400297535390976972658914130824675010539898056712966138526147925359029678913230
-5886358316255011245098615464017615182438190446564591019394412368509357681569397482568515821423340665852760995420364289038278484
-6311541503127681976206070117236931568310981280275285971795790489631417369196648946460067342315632515195328396495936094906795027
-8224055001487992245066819015245704964683485501844381492046566836373072408682020849321689488337660828971885175876650163928646965
-0254578793821590283140178222280457619069765363934967602749676534057099985483967828656474230988014165618526645571684624945648693
-0109665916508637725280874977575865530242997110923401414431409335639376452646452851515568924163798404754643876369338378812431753
-1218315801760060263870530314784967603071899867258461326183988209146000243519324558810891158838383484826158948667409186010480817
-7903203377696988414945216232421892536173370183150633896237853253925354364816894136252089105545529048726749085139508534886223860
-8148078797101770523716078377874332667044042558325146665083596936734559299430024125955358519934955785765198216278595449870598677
-1116539363983086722722201448783346777178486858969772190694450961667734803002682120934093453206868817575132463247817949468716367
-1637275206589839665316460804048412011573846372603155744795091025936193454883889805228527990919468358500076576823231506244498699
-0027621847956067398935694606560509614067216464874695482321462823676120479915649013012054108931749591716879497574932046754706928
-4550965358813639986179681154209780873107404530149950214180601478806568724333935291072801881538682786052141302073521529721130768
-1636835808005913985865949033373364692120504151732972595493618693947796782831116462924175961942781719381911750675622713009187832
-8144555119970713260660826605512619993205968791014438812251863090080817574324870955751027471809521051989383021792494139844493682
-1585931821612292754292414253292528827165768965683611240737666722015320896218326640019860760530517054982970340862863680710846055
-6536681595996347954437568694119184759342070677456835801973881107420392523103849305532249049602562479138323295711575175876515640
-3486443061013741439479986438866229511864021882422370923187276377158037668029544320414759066219016776345013936686773434186071692
-8652668214037751054395752355562459984977103091936105931037362668574357365575540736744748684242434859190554622399068882473374610
-8580093375714553964201167764812992676992679093090175449230495342109288752328986692009639151993677096258635370756684860954291469
-9964866699458956436463452444822527184213143978744043079921280767307287341419726065990023057954791661193301961189038570454182768
-5099791381798674690627429376704901489902412978407791536768610182213492340739402802196624950327768967894658802241237435134810216
-2644824029820305111520479567245295948221720974051912855629977767969256584700072624737697630748957013069006968156707232150642177
-4694014156265815259320275858444952794733981468869946419687206201356067556770447737925027827372686022309398793525531551762030508
-0692322520193661664579545021783669513925271024381519716157761278129858733071273401229450196329877841294994307214799190419756421
-2529925924690763185785959066401191385349387731434107358942442763904987402826148766868356311114428295259838898928666272489020921
-2079494677073945124622995106365273958525412410850501502163733379133554803716983972906533166904636077433873959124786425510691812
-5600448283577862312179623155268824754692832396408303848264207707120544301021495705368104362648456117090809527815889327217546635
-2343977389207774815138566905589371213682572216665369482458860895527700507201800331270809726620829481769123927780354816652809008
-3857604203317914309286408408516621032904248756858927009945259813983765983907916658284682954733130678932128039594166445571290526
-7783506576165023166951251072092917407173251744876214934915430447355544209919802690055207660666887916247859978935839016078615261
-7480703460843227445195199879222716960672528809567298037159358077924188280933697924269515298429095424116709060884750185401083226
-8717064476124069485152260308142874514219920880901182710267169211713742088964956637523570820108183570127357202528608391772392065
-0183762641286324428853776063863402233453633712505217167155150999046272831538702513532943824820006210590058738974696140094824531
-9112496681140545311761452054846654072950289614507391281868179377997604366151409215985425553727631766796511079991043874131555557
-4848466672408480575274846878733482332783913190570793476048801496992752228173129813319287139570412963303092066006377899503587208
-2004264846825219154033402067536124920004600149381068226608766267724446119288301005499297409144197426544971420258082942394022997
-0140320078386067723015618497818762945156815014583969278200840575341177014900417018827299383394638626203285185921061940008032865
-5962478195492396384491797383201234602669716423445444477699550016949258636112731978273213688262995924599283114955724957765374843
-8311990015515249068920407871121923281094596878515199867380540740586492915851905851867276732161963585489156521545932776243150499
-4592710682075197276504754152068206668838563346968654451648904363538719952128821973082368544846718432978965867108316589932428817
-3552163482893373255049569753046229304178905562057146740570805257427023711941189943044300807285165026750415508222049580394911287
-4596021173135544782173915901528349195173147664807647330846216356295629295015969380040305219923049284417801673254103299322068397
-3943524404368165203936926893260166313850279802117822440456770151714171409778904837544726372346574716859663114202887576413543801
-2969116285326615235890680734637608834483184611588075027596448992877129841445196831709848480423954210927050978003235143506132046
-0153071245386120635128957595884412738484038627307517440237760302728984006580096280602129668935036883924996553872412205753013658
-5621357475787817996023091217050008449865559719579810787563038126520104376758261418798236153692393962370203265309058313384060120
-5031974571476436448786217419749048851015183003367752606459920605017140928435866977820091890996541266633748940714886983142086133
-4562696779266374687250665129144508120768763103068669726719903362264420017240549417302081941962780048493798236161080017811934325
-4744441027688831600256636793504579543928756869184371127623452884135869811364793667736493944686083992892480103958881983194171487
-3993112528998853349337977120649249691278774025202103634228484270608254195748299845801769708524194520077695532568068092195962254
-2329576931503118880223192095103946522402558163495818627264589763485690044385772668639064805859345298816707780560479994433943363
-3218849814933855133187785331003935806771232881004238706522431511966088657254108552621744793383328388740747036182217129765309790
-7924052825089429554499360417535494167874442982520963688982831955472793462543386236218475310833559387701937594241052466519691317
-3120730387098471204669336934308519377296835486747153400369971745719675185172869103202802955453713945706425356726081359191431362
-5436861304614177525957519069526164638577548380287496823470807113570761415650401959363470580496567502232543408020661206474053266
-3120249944908567907826123413136257067078494146549111473184473022022655595636232845880738387277254397911665634549126629364411401
-4035843002062617386757564723259476788690970258752656414372739557004284974159497458955655696811845766981760932359601002427208626
-0779143969819344348002577455948300927630939121921547040685880544649850641595729872650264658050333293212488609440422250520307515
-1460705203029148369614787086632962281691805758071437499284040866802949156450922963941143029043912074471289441815938231327288667
-1549240739672667607945860219999638499322190035348564953406860715951588472937396572245559080251322668950418605324345241657646723
-6681600989234088565629106267156100053645378516406056877177467623317919074902879430656553383602319342476881970725454244483233156
-0192568263169645194866570376494013537343370202553601755904593727729559768993904298684689230055250228064310566719259142616384584
-2226698070135175270997371657677443976168753242911675302780266617573092075405498205119010526964247236701457645067756244640039560
-2411523124866541301070099168413071292074360672744530325093983003307829914552999628543032410966968534244029432252498124255869721
-2032148958117324274615176859919802414958436537913396718375158773684001583339324493639015775574550405787223527127839505198335838
-7873829779466960857655228261450384972633464601331098096364008012962199690499598210503782863578580915221775299630382906076523471
-1033617798236208613493443460691499481184470043787180389655899698166528830636916915480716417683921961582857940369278335021557721
-3570877773431086041166388678403654768190776468384892784896107473099172280071916265352211077124176187206981633533447143541466428
-9162337956051462461244081308639454192982414597589520706270659960902459420484545944118766172576927213645046647438580806130370976
-1679386001024741318115842266812215689927333532837813069949968390429571894735964678235628716093113797167330012932695772923859921
-8804168783787089493714870963570663419696958001331927763315516123670935571014222651056237882407840332672169785104960709919825245
-0497455776366854139775882322268590872937081090128717394425875756408043314452495438785765312873239203328867278937236653265323056
-6042409906538241575209979144212026252259767618647784026916367882392586982801406891358315499203056053321982052638011533498889270
-5665573721287635790869699668106163302621832934471963587290594671222971786422361537494624465628017639194877871599798228379718225
-7432584741479817366719910925645646541846360875945358928938495570674893693392242341873215005147647843928108951666723535877703443
-9626429137239096178611195842928172193314671253797016055524388530347610194243157336306488458466944807366840872517364192307199510
-8872554743012955139567705170988677634651238832225827058388116110755496007697973600003490415480515644505946637930188314840631970
-3992491991103767989877164315291928453885661238942961179632807297112992978760631966972677658662459086278724019257889314597469958
-6669007755891601840756776309575869340114031142955328946684465711503263349456097268207290469828978418533272473362080110971119500
-8033630970428066315841260643530102154382783569132687157611513276699429626479061706898110708339849619210276811595853043955446869
-9768070537230217029438684537825935225327148348372819431279340284261370618005491965480298943126300044774337991256135794900355667
-3657498279192720768668603975934793465689868735015232170607621866439453389115795388712792645934981304662545764256708338815562273
-4841652997648921227154354900004136760485517640549167386012657306424618486993618255961405066483542868908453734101505226047480448
-4390654153631921147807124887078770782524389315313338172327932505555766712042126014521672948387933863420403298182271156860089870
-3083699675349781049946715849913203260143681249018875435801318149856990157414011015651215483550403032096067120964528627647289771
-8136660832504574374548878451558509361941048418373428464399511971079202695299106137651197289051575362091446283996841312766684810
-3676236989934685487277460614965631287879882167402767160319121856718994264197563392677953816932994293095294646864998371569945650
-3049112960977618674809680978004704430920799039334511606915199457270782728770389854739859266964607398443304578468934206463864162
-4020319901840360451062762075624924661391286802372025413278593393390727656336661248466535685907382226627976102440776444559861524
-0166268182450996578449973258577137477283861283683233635300267518223499975003192269667287508860009509128730943175015750710725727
-1027094337033962463834235326303117245639527702316027545974140882034976571260270032549979726479017186330571896766878727628563084
-3735720519280562035416027535373646170800608954405500868661244053278717672230128154298018261865339340499855937060742071802179228
-4620909442780453001381207438741771581539126274686674694429903202199824281873555557550181182902700089108021432193493732079872184
-9458342180011256500005493355500078007350011604607303307732963471459637499551951642174991940916434214889720629725398539493831562
-1757418742866953045608344774690257090125548479597625280633090790836185148048976878560947512134108931123436802430288121604450838
-3439908217353866705662826605127180864607977834354266960510252404933627640585873170058624018410480482791416937234522273135497031
-2172788248827330880258621512418568877495834091216163584166603056260778255791670347944634914745463656259805211952460022859276063
-7062821874356395565274839950114991325558841496177484931811683058289009845398038339874364587482418953564120109998982642304471400
-3698346712015383293895452263862425925615594845734737899372976339855075694671913339207356770288208509103055437248670557197975416
-5731723926926739876475885511154531945948200793682997616742493659519964588297814245753251250515716831733713917292045440536017047
-2326213034490494256432217527368652272393723129996987975280491971552239548286262875444742346718137588580994530639159848308302488
-9664053981063208567695237243202681506536792559295775868533828506782791916794818915656227027388965683683700700077078525885858163
-5667625010472277345606381058073451841188387271842197689932469281333817846476853011214737420944488058943262260113307982047560323
-0376867635943376210756229949512175221086640268169558374511241311647850185329038766762763270981601390818540680562189733654333764
-4491518223112590691196826611428935302844272864063278173063473168207705976253698032183297470010465109985370388667131449602003018
-8802699827748011182168113988637297474486522040228085650948530427329245143454181410142916723537434758973564869412497956238710891
-0653015424586307910784932154517633495234468902775642895621562573878654050393509111804824221865060266482583193591594511748836623
-4094703884414114132180304529532880233548615595688135936066808466092184620343793991343848249436804401054149903884653644876865628
-2718370374189505315521628763517179672356494682994180239553818915110898807872150301279550476267769560111595428023012737770277809
-0983429088572418894311039932871928790123994971756838750348015397853262244219489154464202472581023076365814977799205726076421849
-2244581657719291754700709306659618001196719303854922152332583798578459941542447742263613733064435246505660395020395510382351759
-2371191845917148718985406337649548363315059193935226677398831831786300690640380203874437098924585872141781137278459673035181084
-6868095538827304671263059227883616117642085424440799227282508929248920781388666797060697845611588551792908329555898460456707821
-1192043306305230972108032344493739345654505538181410336224627870081996078504793311999388842368948858806146981869977786056189228
-1263564157432629856155576816827336520937607635620996781728277895852539790604285849253279394716497232033008275892868545867382681
-2337190119883945387644191032300914026172189976929618448527119917727894462635110227775485639758673866947701176216601761844984677
-1541725580846818676211322948610609824222332361334426723507920844056410476870968277509960759021044456134551342168799278225221031
-5808026746515835625867232790523509089624770846326913802756163972740615072842822135746471264238978131846218179577994033108366459
-7209194492748333961784669338759539252535168061991620450390411453076684475148292681430958283119646863377618784660018401847206388
-8164592842234101218973444204368622348477154717654721601252474279965258123105673927507866232148031414671644959483263113289777725
-9536506697075295060127905565119738004002490249111193299408907722018709064690369235720344207608369516256550493184611556526526774
-4560017960261564009218990204461419858845480963206874732488142599183336196461705771053123771553268404282868440226650446328616213
-0784979620602852570679351917990832385632423349482355239911158425540111723754138128518596135522138872178079847769857439148437200
-3065506422221326046922349934844525141835749289303921189806839691414799095653902814723672937020068076690809012734952484971091424
-7531639556490305149862508189711238391327019426642515502558468392326082589336113833462268524671249515158066960751008937821736410
-6252414527138677204351141055246475557495876614593229376289610072418141564580640343324426668169327302426458833085549654617933468
-8091658367794443766667336494599463493723421496560610375457662742614878721712215614199388402972271203457264117746009414601292472
-4908066830822438120188614160836549308604180994779262747990121233555704249867768081188552478880193430879502515548138613493765732
-5079293880539371206967935767115987717076965982796395512686484284292191272158775216705810765026584234552773076439527278292069704
-5164216628992440501162199298685532131413675395537593848742057924552014924010292705113677909421661221880801679108009584398377793
-4121418969859257717214261444608216079650826208617995799712962734646420115576080668425510442736110574190180643945326397724337600
-9884581544962427545759780318699856274991305713483502351242287264905051143111943618139482715140793163760250713362251924403750737
-5001181429052612807248790060512136898354370778167327719757330132811615985502470639866207141577372460429670627788129417134404406
-6178770653157619944192283152223652702640541977712224400210339303510432403323032560310805508239002669348396267104479169736023331
-1565506146888751623012576320991779119855864177643274705087893960131150916233068282254723459661688282729513190349028463435804527
-6845488200397241399013882436401994250911820745822241059508913459645459567274421896167243282273985655453126249904632199335837792
-6040683797579452107027216845343063524780614029426886935760791257030864245182939630838108471908303610357161096840181118609152193
-5867358422344899058837359139467062379239965703229659786120062948805736192330007221916713426793575162507137089954539396331620247
-9120519760679588392286105798236021559061854045122019266108300186277736886734969411204978788065566311792204801446141473355188648
-9729762487738362702158800023376627553944314549674371461896299198497056817939283617350417487984379973531521250384859390378780952
-5278728682099899168824382639886768910340224230494671557124611921288793461227571446099109231672351187529971910075105296077357641
-1730149007222759960804235202582288759192771252526372328644840575023003569331571124411309306137954892577214909905859437364845514
-6359722384817229880817656694157685568966235098606153131789136445509767178564237103959982917552413501317717319150118113725281168
-8331881891680259180368288807257087972744816443005083134263401722243486734946708091896751081947017218318643507133088446490502898
-1564672123742228001093857696640500357335628593848961899541997547484403147074041514838330205353223636545525633021798226061157975
-7577934224848992516208537526305362086756191009198436224096722971843979917310448903629548517759776409320845391838217575441202030
-5842023675100545856824292093806577194777854067803726567456782139496624136800515010149246416535077787552986449619329516458032493
-0373167808153255052885634740314278397690578953752487856466779556596486994777425942109945709709335720717497273570846620327341193
-5952530704523306889233492671665454303269886039975987299656234612350738474857467451882170147036566336312226535534145167519693735
-9607859559588540690534618223279700864577721437927651039992456828233467681820892987538385235563873550538138831743319323285816092
-1624406727909111147099641441681559414299104318980440722709754783222151032344202663364762643657625463452804121615256537142718557
-4340315496406729909696728430969897055002939519672286841554008064322610667892226345008617230358420658804502966997298469146129669
-0210625023915241926959138868143886129423564883883556915150345946486026490910420790564346970440390087533686122782420012907572301
-4721491005031549006749404748103949153294842924575427991607317267682247725581223721840333859898813958860082395329629494670433269
-8089333321693829301610669436388430107322213493559809633043551047784093889175488034859221042528763690657356439399119706918708269
-0081737607011167672164816311361636636595718748621290008823635691873373600228901339494989909273621908199424676593460415730887285
-4160520455923507310701763781457568843470746581847988497318956296776248312754405407533119008905656107514741346097573287623338123
-5386718227154603611476662828982111704301478482540378612558078862521675877095588029121004214011721936617184276464093409939658461
-1979208081789258362592059412017416272899419903367802069424612928998858612300695288310086571610845555893261171864325093713786916
-7319139333841813731995304531194319105663469219744020376897814143833856662869242932535917521586466923358318419175396557400347006
-5043921771833079685531325825310432807800223715751775658072562091646020835717475241682115604301178255769370561929846716138929898
-5795009540103191080406839616053879828656176434583781287476876321448232920090228345539065457933826027880057345811966575002039185
-8576153060956850521311077608763009793771506275720974549550420722202837108735329754654396372138014747847396055096136010954168085
-0509043015950572569270166347532451603412568949379675617083809175396443490772874366901432037667793377607725671409709046037414839
-5757807520296047868933446233650750653295440658940733452331643306076758589809542688132352958487696630197185077693771148210415488
-3493366273573202706880963127674882710949035853748406509260478202136097703296547394474710548706092731416204930859887260446245253
-1707539941222225775800658254639655291940922607284340086831234164821348634212665200587884346716985605251686416602230060503804746
-7119373075229566064030462457605177717171013246215489918839015056056006164706313041702800263980277171617607329962257981016326162
-6663813052725497188713444974040320318581428866821251405183260930030389032259911879414867761739508256774997369921307923003380224
-8543233997255243697045277479565692227756699494957952164631865806868110331658332715068585534381871375140656787606232565908699795
-1127161017080656837915924804407883971278108801828959672411183897706979458144168384325785293840525608900932906069101189576035960
-7746884054099676741518894156142307630763897600710799726835033615686726465390861737711082117067758069961050536090277623500309130
-5637631551447663652036022243883777403508274485804348060822361386569981574710776219228289288499523332852532323527986372935987772
-4799128874055082677319044677884361786887526377254867769810507962743180135340211433750487850964619355570684078365963703331785531
-0073682589254914802156389462761084682583678912826358978335933715271645287806405047356166648799977142475160038979372628423949010
-5037559719886724670132444119093240447382541873564218599313650731701908225623880448841585926824993839038111972019595929993742491
-3846935441857871521862191302228658206156991884533871767438656661539104499878809823997230034119838267962065754111334791148146756
-1506245754838722163589450414720903186576980445131544657545019758753225527419416112605350003805887953770147934624442363883801265
-7711965724693431682894274811945992120534708309601562503539815868676726704850890815034768784240539682384600476706665486329906626
-5956050270087533659778978762952993742209890928275529257391035690977242967921950083594415755279086778292240063613624273000623384
-5061387982251874414971585573609892535056862802605728035065909921406395624271235709374930413322182966464210152496167481038893673
-7793264955081367428964822852138933334974506780923885826935088471472828950440677885279984646325294353993045156334916727728658382
-1917731844388737433964393775321834810791126648863902100900130682254900663770885502300591056044829585219310561565900983432788348
-3993621103753371559559083065225969001381490024230870158740460349214225265354617541796726739208926003200650331011617584531364466
-6446975200293349558151403162258385505474942322796455463090381985898884153879810666921247678344495019592171989327800934238087607
-1116773012813841761179870425820266292137052144431441290909627977940969824030291459806507439794936788928214828707352139273391574
-6029232735235425403035383736905446200540026716844974571516139411975848154720481565143793111521425975198184192780712740114138327
-3438200310045736349450654856319455355471806503450945057852390828051199118282010495739738213447341204668213941183921897766832892
-9512957847613586351781261772535091586107882959218997758350989715296118346024725200133884012765597340862400507624462524830866480
-9478843365776113648646455826476363854336443473601804016310466451767185956320296981753166811182992550179769973329037834636002638
-1745421142947154461000688129964181745046963595109768527672990383210124171587972151958957748633651595231193536560491908213623383
-8381825139460307549572877031135183947681591383140425137518397676071788098018785187454915609863724531998066262732015118963304139
-9818630925621801216199389879103728134389152002296761687336537102178195168590959317811012194485775439363610537061412149495648268
-5576817033233193054333141148999572966012541792116109714940451926593836005748304065707002129553500879663495665687664101078961830
-4255249811578737819490016920102133439336759727576849642889727534022902117660385461887412305323198051682727105599743797538768483
-5664318936157823403995526721241574938566862585452228404066914834889748254113822291330168260243598542768358287033612921584775608
-0493408359374626915181620402845179233550927620380852963377274566085358451742815682206366209318504599243115355217504587070160767
-5099926458337087971802835525020183140934847289656680603935783200084783016975906879446974951582977123093907468193624294378414602
-4993211036037539293757401608261712055642333911428904305517543773653002323722539705273891988338327482438288308063770111207012273
-8875724448927612453412899117913683062983270974383158999932195926949387111141855398745328636343443301765332909049991525667183004
-6179446485196106673286301271613059516541037127280321853066460858041150601008945716021915010720764523897185471929927560029444239
-7849437984569538042541347312104898444874295714765888754190517892771505925662567504469022216257045253341087785885957187833718309
-9972288762936380366686950714951282499790474803745721728891585856096753079311064364081796195123806475478622506713826868777638697
-5194143783169339034131894869316961917794611019135131983101366014715857076410377619181633332553598229324447853163042312520962414
-7850854551539305001687198329060780010579189214774936469033426991594801002823836027328068965959941131816419243666581830678041716
-2062179831972241107526467338284038440066567441767013516710832064119073030278681905009991848241324570216334414105094116172288746
-4795251857046503954973485018229646234695366724410250031504983138843493652944866619750102836093665932368212191653037534272918686
-1825362974498797050137125577095725107017850998954189361286965048355333973664280494182300562942448127524039989758648090694962142
-7512994410145549835156679857014752505125401506747737470958447208937721056830032278112608932324610937928836512547690813007773206
-4386958625254464154906642431853347789932184826155599439488217117827733831342079710541861559451261895702289359997911170346503767
-9160582845194443225222601665399912946931088757458941216770145834719498890068834370787508728005299127862046720974369218083539582
-4881031377785621947067985825999914746359269429111016243690638440462655472434228579718379181809439967478754245522265321625889814
-7583391301685587265357562950095622866121830355803288828241373074939869852539741493888550714334780322503664271906152272539287229
-3706056275918240737054417094100085374094932331005897520832184041773254725650156202489186855782648043533132404772816727073155235
-8593562217884076811451277453364735377701544569033315203869164836320799479709306444027657854268527295924524538225997862678112859
-4570537859634341717395527618756161556420569519217630387646444203036568601265546935410843254883517475649241288633895824882290087
-1279603976070610116464640212199310166444520867245963242449012132718994226744403248200981139871780434324112903659101791778621066
-8744850384566117283317344846157583437411072049976031321951124766354609384768681179440522110424899002915456603055956128713981139
-2086242661312485180876173221212851654741063402662853918748324706267356051777749583559232529239969008936507197332763290031477120
-5741215520375853751719868036345389495144698592395029595732821924732143612679143914116460149908254801423378398341400612840255578
-3112678009802694849286559093313827681147182296039209347542924704088172807791962585025279313952354773038812296501897230865202710
-2464335074070148432312036647984428094369519448454963043288725321796755075626414550577697084871002645789785381682654641241100283
-4946700365473689782081952042866282556327651210752194953923594323433725250140138447685850292340132652464859222629234697220377811
-4116813834263078090553178959891950239969717708797371397856902146227502290357214553371450093318491311749632101080525636146301695
-2152016442288947698443136330933042135184223974200115803798042702098262975256411368585240157169341361695851434355296732786801088
-9469700239580500443632308541309983452163906017765379912144038775472527920834490565234287360219977902823838503195349727039831496
-2028576502159755428471922748239092215954614499408923132851493814161260002491760119779606365853853991681827617094579573055586297
-3640678920108595929213187711839271941417061119448282180155978731064884982006841462863880420761509974612500984423805360525276222
-9057118337335912039094779552592972943649024122835147704439083152493402341167911887606112405528052285968546122798145084807566159
-4304613049097528789015322647077710992450848025235239429386820053371823148160964657760192249248892087179211556970604610852657330
-1245963067779593226119382101475675796217312455063935339967592594066075071514347181089457321147516518204553844378465193273590500
-3560863140415397624008978961463819965678362699058645101497391867248986869781266285523093686811424022579360460735505488281520907
-2803810314481228865478572362393166113955034570401397318410902932552817985751479490450351950758398971928389088057335245044158094
-6904347745025056517093981246275608711548205826384671869194152526627350920208727208140128575295910227390194690418706771705356517
-6784445719916791606648643520294851397681933118673503958741728387886357271190905065762821681465016058740202568162846967243295973
-1820495748778970925066926664077661706850366307799032827973753165199895444172414611070770446635902894354703969177838887030507999
-0792366480532040444153327711554056488308633552915589047332411364711058132183546270866868018652349880999177379420796287072716088
-2231884404962985945388134094475613555762253572694848559208422137166239633417739879274457716224035685193748560132590653034477542
-9227302311116220471908055555125965124068362598930072116668063472712158786276348904469695948132587468164071579543544049342283942
-9611661683770276849635190630772488322125598419492636769106569145188958898006930644639421498885045868655337164693651551682789719
-8113170194159795409724804157277970216585110875118496676005194638884485314135820103479833056690555003499859437927213123666961409
-6776248629614262117061005539488708741664752240716973399951870993215840911122617246729216135676971155075389185544568368200715006
-8136621653681348621828391620654330376833126244814473075974634681828022721817501734663865372891778488609175456672709780494092424
-7509035477896901683836806362847630551058479464889625032860924968434340014421918549778761662492676219077042005549667470710873708
-2649270641258444022173705146602820338815565069036316996296828717613516424116147690610506944602495068800321856748967379303431711
-5231537094318273489411666006633698888790246462698166129109823556983405782712006150780252324827311704109848150151626541203089319
-5293239066624699492800648051071066181862007268310279648019183315312315154420858012591159812489763989269552995744386956174038764
-5180720261104219765835445462051189983679962609760132661239453035110340712611783326617205712026077627868902275865901764502746369
-4450386186789754245435591998462910276602998139642701382886884245787698610667584456364442583085157908011542453439257529663938908
-5226947020891494666123742174916211157087031239651884379910014927950876644487562604700114503798045681730239237952766587287565756
-3462320891328376981719619778327669975981463699579856289946252639770341221258397441894692753073255239973756891174514808164393544
-9266128730309970612623389424292152551017956433451773715730990286170012828117563840968654996015507568606746254308032751484010172
-9555122523637838569715536561794279389081447703619598960381475663155959964617699927258813445644496349054324074619586132556815203
-5221901221258703935673357600398356681976947446424967337708716326590353253394660639230448040100077013280765926948098493319213488
-7738313289310543436800301466124075949448435224583670124694327098481119456888840896351512543815188557251685118660772588456625224
-6115002819234894874533900222654850689485882307323315708374429887345170183105778321445910604513739852020875884337203588872923125
-4481043241227156956639553841037732426965917364470043436075190174090995043087977394594850901991029121373900633832712403510778230
-1122190232976475343331179295988355035324572960682589565916578492624347219825791452145522290660285362795514899273106419997278153
-1419535386080392454227188259532485710914908620105317213100011817889875764632911121751593887025644393163109071422951719422847110
-4026612711274029089236246041114948354793310083266181854689070097597525414068795108775947050469531123122537281180760454160254035
-2729212202223251132035733428110959851887971832113712091873626429082924950281013969697115103891338579818898846568239238607918122
-3944336153317752913161793886424178237035722936447760222478425805766217641600209813232221230340238786982394323446453582721990048
-7389193916919980057221104426235427350670234767999865432553198312811347361703697530913350075859737082487587469312736993623735804
-3544483515704686277538264527506961791275819582201516681389283444580314635355964056417380225809498367162186604237676145482322561
-8044600252747925830317760868421526571377975782889497428302869692743382713250361972424374300944696385157823203594995989063758674
-3762181316198228161833937930845505733610147834846550265056669736693282801787541130363631664735877621678425882651996823896571197
-4895759837384473598984792357851123553619562828621778670882704444499813426092540279529447104250292800981220546692084253328082420
-4664284555514464728238600094152484535233997991752935740228264651440639886242409459644164822259574135218995760166441434144147387
-3498021732532747332097779512063273078194846290742584872890698856916194513341236677884416300942002054144602101645686192153654576
-8855689629475186087358536061769600329981635356231999344927571715122048450556630571843667383074529954198709235538731487573715687
-0984316998018946399866843104618259659452795653432490384229487374720689309493558506727485555071518696965289338830868013877431679
-0444954460337393289812378506420855357215741077375742703669752012654590715324153275679920752247842054109194186158654335712157841
-2806861505564373354176276173563926841713871053400626160801979041772088503472612997224598155147542728678254353573523697935567654
-6201924274245126686318859488923564788418058568530778365444195042057133158737326264356888205129275667061366349202778458019010774
-2825177079603097543301363195546845866777243546459927001122927276132658961336248692066215766333309788747162494346240324193946246
-7328522607444197904276536531669234484641234327006749709725328245867037809150903161226855351918234564454937188245329779811527397
-1625377992337069927288579727970280388115743434164021261444485502332859966787759877144357204976585729746356637542057830900380879
-4756314028565636147037500545330319143265189233753100563686689461353510356901840785161069243491300815016067752040583292254841464
-0425017333645387838654294817531355494569985613245897735076448718279104158222119913920255342054852667882224523660815046839280651
-9062897569747184612738179958208393387812077029581124581459197624411283206076395360970022007778409057996215320186949888642491834
-2577588591174250273899408593063983438617592453792302359558473005206418002455294336176016723332413815891373160708758731967049062
-3790766334026767123109787766877375184100806711868340730414046922950551256206928850545228229670325982658231736019892656930961551
-5274543406306956723055597804421123472449821052046299950205504470231963135543548703265039753201973863356153745730092781664650899
-1020617263114480064430348590768589835423732129147820366131428529210137664442462332795234431300140813802687903923031421483099298
-3305606503022918455845722586154193433226668761115620627747430416848925633688922763380741392673785175993422375485098655310345526
-2853130953848078288453311632699255400113689129756388559283548184844635112023417531659479267970268571040812683475165664822794180
-2783222167931397034746003825257822695087707764404029816076797619920932960124572983887919479900468345097640119343412470086673322
-5063459185940735886394343828328918625032505938760162817991123725871771735016474675217009872180054875341819281047070252038306775
-0743585397605286027482664572990290216960312219499687628442325704541075906118067163819053997876546874075941147761887253181403133
-6865060056069818696891296915545023370983419980885799857058396262667622091719201948407642987224698259796247084724028705854417594
-5103827826152310417357275607217586307830343393236258610369278200854730301259212109525027296782910788706655437239982908254923137
-2959652192735329005701145454769790852470342092444456431448859896236135922540005403226570654335981197446157556763871319983952696
-0906069491801564153648838254163601062811138002404571553190646376754817601328289018602749191681199089353060650264442584766903530
-3785962322135501816792718661619323345882587573641791662855806452191640690223489872037123172150522718319643946771618053874607301
-2342704599377336428681571005102144288192803466969307063516540780329331225964749753260124769353818714585772490856102378132713276
-4346236542835966635872778222659462346707942811767870117146806978169322604045750387880280187005012616459999816635343308178563646
-2604219260434304257671433967264369756269802345023491459538543248359901859356108205297353830910989444923284454022447613985397264
-1822281949178892000423296707942037651472365683251029280064728588016134363373058610506594311454908111460545368768742973357987311
-2329670499086760430314104242828210716854904379725565610986919473143807393666799098016719544449077169306161547903571473642324181
-8934928646320239275117990276319738648757543739070170895539210951333884142223117539519009532014319073300363829125825739466521964
-5363386211310899141728954217940413318460520197666536176317994465965648033515827854532405714333529319178360920611572195490491843
-6452281693971710923703852296775814957821367584399432406445144322839651572894248840082293918339020670715780310479909368596480688
-6791949317913799774656284904153563675547018432823443924016298235065082832647707880299401729868016947630432394689913082273372425
-2712968598557679357916581334926350397464524640833937031346811806334561647348253048938805411658427143226876519485429485016393766
-3501555543617126115194082213265703065410803089224710636262686284845574699295863975355551722711478618786950261560124771603773061
-4778106677024357003045486275897639115668057170330533010873096634039731123238801834051871842868704307554039712015191582514954442
-5218459195255301650149970279364690486331464065970810654696223977244841051824600951397161627678662117382548039349844217280375193
-6369806374093253248520031657537241583648618465123745039819043766572718344368140639003289414418211436811709774570097952888487167
-3212569840247911007598018387084803647762488058555511319640016886915147136497977845568137947542869347226726490373484609221240787
-8115733543956480787117884715874295702599005706164646884593210924736152784838359510894224199377258864940900115663844969555460182
-2035968818201814843503316301816877369650620471604903993852843829395302301918155158237168629501277731356144310878037185323999107
-7016895419441126229181619830275636225832821520441765441532992753638148826237793875874434736200782222141244213180375828740996801
-5879711152250078980107885067914386728437059276590755707069830533352692084569773933300266007591174281283361187767672358396078896
-2103537195144138796197574043874859185879649977538344432422677102393984939164145250471907596342652013494773096173424264207508962
-0637450827987698515011845992398093937196147180755217329303542644463406470700019971836100495535322254679390620873420862364850762
-2242509562912546291760696517385259786276250406593124098460913531494124669973775469757781521279236307631066606896102762073078153
-8737688554624301439839538446862017884613896797755819281023174101498754986747558403862071766932594675733495440363990431783540137
-3643542527592425148722339107873667468772709136145667446671572809454163340131116640859776867285040887038441378816294697995941474
-4072206008606547388536544456067257224875289444010744788037863160664893445070574937489602184055019861155649531412106370948013649
-6183624181311379076807905566573341779391313360549851142539899794930473883081910943750299100861533261211231956101452244671916467
-4790552691647255291761946345206897704211085378644313837821311423673070233392146600975258580259558879486034230540380014801626096
-8493966397430159495762611418791059378501633459275242578770822154956094389019127421733416568122031957966837378624113082091125501
-0539497663700011903785013114734351822728368447618541431249895153026462750771721023669565811790420914410370442390790070707245463
-2527965030066432300857015457970368291786471653036513592059650961230415181073725654607900007084498257528783224577191374901431098
-5466092963804647249090725375187844347347973252108137441562290526430827908072841935677879142427224945383497721669674256500195118
-9408447458584058076150017650238543964665522204847767119461148283020725314993208318241105785737923682521127890161621980525163933
-7752816476751548314213662757572297632611588857400086488089795605852388674435780461993562784936271707018785480608983595358835686
-1627393802741824989025898363620676709684659912421866285079664625171969200262501658717867654051389804050637814037774619076628490
-9122449665202107140311875578301366613855230050319765976709818479408721612162782387682958793989254712472790259401394162587792903
-9264559273820216137804057886666471549044481178190332632113699758788705141611700544482989913381964978281793867160157791927781162
-7442806842403069859300613325533104981898816922110133255013384334075830779759933886533885733793824024671542171085144755776119332
-7374346360629846250873248611855740390376331086859870274251856769041575442564535703086946429812945653348220186072122845016274001
-8100158244663714389704533217051390472696914158612218153906542802690978033894796544874039962095788720080152937661496672600961913
-8620241055478925684985952252838411836616234675852362577897905957450930653087681187667293254151875334644179085362678160756183911
-7978254875299875225763061871403474457110245655385719997304830996169804380424203018555208820048813202142753962116252594621406974
-1364681806031729655441460904058555518845771287158086951978113218142925356256811479736849256168552051145501834683683179144053582
-2064837061784377038174422796078941972546986123715738128334902017019689407784830561790843652346745495974010607663653352384636987
-9087616048769273749416367719522093035127707930211676277159029972485006678648961483209994033836189245748110099847024086616545737
-2425064383233144306141397196556964739088709046393835346029594675076399505634895487000914867003535813058158157320486332684663652
-3641097021982425901903299759975001000185954507785071466003606303822049570876073457705939373716255467071337231807741213874106729
-2074354309025181421785407070622306037112442163872375219312465679573739444271473076859615411141496918260111756219972558400237414
-9209218175245343776137887607783882100053568632353169828579551734386860768832081473967959877027533280331064368843953279403791000
-7265829914895705780556070716875430476662014009364335116363868273301526498001345684876869560767489114942311375190271613882803603
-9073891388696315073189212242611726526377243973277573301675482213008892303352424672983354043608654230919446999369674504952411077
-2313808555572186833151976371065120343070868637724954931470642187595688232146689299510744666262728998553432846824564736716304195
-3769895001051711590090397709284289543423142627611293076964116196325536683515731394758243179761144577336943990391686351744541117
-1964012423430274286597296893918822905314758106425920575603004465793377045724816176059995632780349523671266024041147016652652055
-0559141307894322726836380567121144490621939523042182901839217710526781776038951549469639294413748250130589664480237146063632821
-2784427615240187672159066907559581170138189996990499287132279332580644422377771338142338877270406145886924306247277891647319839
-2650622840124168882146785089864582520075975814107450314378337065910303739372347881027629224527453006767239445485125470798573294
-3280112665923668502905138798645913537592166171499662307256909576761808318862002890184471250591748083711310397550032446473077789
-4839123297739060737950671029462682374736375690549900393153725695518603231578972526440776594614418742798429193873047497505681792
-2160244025080490634108186799676843921536142621408043650219395075800794132235618687434126288996783749492148526728267890467762275
-1151778651927614305188542555589072273825319471951036866487051470913760762080070986450018226884129812856690672034368570260461972
-9126667808863381235489349849691246557114377306076458702232805159967351257175416964221955677360994319567614203175199799743819984
-2789442446232943685597991603590204183390799819475475321518636276804097467590827293001641282750302064255269776064371623832516088
-9048597881455099698450226466082784483581892839976853703691711348479752784919013613635237082895964344395914096977829703979539035
-8807651873851261763689740610852384724724967281185663138373836249447037268804159569417135422054907833329936731832253007919797504
-9682114913920055259992108818897312911322686928213632559659016546514207889796765657343025470035022686294498921433293889021982807
-8817906539189722113102359692407543788732651010055394962852526688290033541790486992705883840600079101359528027208567808930305163
-9801041923433800395009066327257582729179435202758752590945790035180893649947139262456916818609204478389874916889421571462394032
-7712450051093466464431798727528046026835894856944238434402423528849559439733559946888997104896406027931037956349309616326923736
-7381318701427430852131274547674285844624653982181746045743742319196948480723763005752758284784444958915729789741525394299696626
-8012218598270213765952492120607042939337977067878086380794314818747633639449994732495580724511274417714861329582888877331906442
-2523903559053376560461999356914800460953183047966595580074070441846526092785101396532452282664986312641571216344907286853277587
-1243980803716723402043316042450038929890705999070870015541470833748745344879737850504389676782666386423839519311757255510240006
-0284528532586136580475966266604417479884520212063362364900502892825693493079279816397630592037794996982087214380723458893748385
-8491272727902175551882935376152929301347887913314101691264776996119552678466629354884721510455050616404890619695271496162337915
-4545341965713318896843475698632445949069586135305533687841423447686352614650216106958803696792920165610566274323872801678178779
-8253568664915132158211550322533453124118327929548882623091786963905677622475126883200587876894319717512008420758223683547396925
-4320222323998014931144025979173468123790086139354433220062005544015035220976182446830891814234515809043692298378909223491021578
-6069959232219660879097232566121384126364624848136634056377125102029351039021829959177114631501219753707218086851316623762802248
-1243816089430429483661271140945607300465854350055161784219266668283907250544685294916674983006906835039612884905549454140955379
-2940117682598404016293743763452820571055836767681621549318648097809089905651411870200800086998457828557152804031061902717793951
-0887454608619720066585775426385076124950271424460822511049331848391671487328356192926497422819817241814088663154002962024098217
-9444111199203225196678001748854632792810817288744330344130819478809411416720197937516411714390009340089903953898652786438479523
-7598508564858904067093707855688285940754985295788676773297431147947757643127210193954685014018553421494459901761944702436530765
-5554085843289054481441810390185341385291272744398367506999297552891321596456006697431455499740285520112057597547672427356435569
-0013578994633080338189924814677511395910036898885609486453589361725442884886155382037285922038189976648035996103250646536792347
-1883418355117695192895288397176362340054382375638457044029914555409870529840507997093953867543753807297378240486101911704147190
-2990020394219301141282427939313186733000711509741075546302432127423255702951507832353089573401235669455023017949653420450062207
-8315834094959817998047438269545055161942585493293325815723771181252407447320553420868080424394122133699301368250012158017016770
-9114429395330391270070591803725103499827663830583921855069504046749255370339126443177002479229837662039928889147633055859281868
-0939693955047378469672103416236905988750384823305338476710533963327706820167318110473623797427088982971507090747733464699600155
-8097749323633489883895572126941411948413387610953411492455863784508332803867377054591645781447379503035057961144435257072818355
-9192774536491861553570480071143726445650506118482951514380572367117987602662371433431531020944047345411439555055616659122572444
-2538272673224446791161100046059076794348690288664907501420986291128393194698926073716590796828226666658940692534781574652080599
-2296719356672708630298340102476096286223198315529342168688227248665999468122934752834636542066357602969267253948955801596039200
-6907553929212877794229661239340340054507529389112502857484240836627584226292443778415389852020999685448069205241033372399261985
-6092552080660661596415004237982747843962036754844362941207857067711980933061648692291784758051313128780610506614569982941900763
-6594390851938570829005416110125258734178056235062424322731777215369780823020661620803238711218728587137816612075854867828598400
-2369696331217866566447853409278304508453286888356285386844080814982619783652943626843027594633000036437577975836948042581832383
-0948885007237584172710171695745820012612068700229335944852613395850206862454317862915465465928827325249777743488489409096560811
-5495911603990067019527969794975740716100732404562122420639048240417867412633964511077857983711654955131598842753406211465747911
-5938576990907415666730959973171116867930776870120598849297289380213982472240243585128799882672536952585668000017332908127868142
-0055033948608802263653030525631019632385167453147504582749896613855370979829552517051177850239757173815628192095505002356755838
-1575006377951552426189315697593571157901434403253801500948115475871805154047796850271348643125694619380221648554282326550822126
-5246972276283601394823321357823533983734860648197127606415601325852813899044500843947933650765212255657169653289842270182408561
-2963795283400693969427927841410518920229478373496996799858803689356286312942605835353285929732637824507016592351551689198434905
-4524116354075005325609861714463374588743076763717669989113993414649241279740839454455938573607498636902929162122468763846383424
-2179849115762842803410844590988059861418931490923531363860515702620355825744742928541840867928398829472206209785674120570623101
-1132410047750617625576007081275570045071771592714539836172004355577617397790511943990307565673693827096029990088810389666652957
-3079203667265148591706387956264742397674809071114000619637965798572137055721279282178439992636758230593462657176883252897846130
-5344900606236775949063632708480760988922321343844454792539062870953446557548709705912512202634518627191679599405320534739710674
-4862620838291477498931509821859436769537924979388766030614053473312195673928520927507333262772931790461823017698325114264269689
-0377879474949535999373402143435358728101597553950835828260875850446040578864121150552326559433858342085551900119266465442357108
-4145382952202338626169521528905963930174893641795335885386219002691641231007259917968036502863440853204735639598211642320126801
-0053580536687636415170048134719028636721663473814357492351910729926031799390889508364212752500797332425619171871273560570543315
-8050888999124989277531284920879308536986968026163965044507397321505480674446271580916011349473678101309289578265591746813517726
-9127557909914237400136577868957543371638044740008283166851799275961511059368672159330761617818453900045874047935222126146402161
-4101481561011635460925901510238481810190290058999387022386961480571796642806735909558855831574016730200955930521599776711652022
-7452149234766310409197279968867850647491580237728049077688692166936015804308350068889158066597960097627065379539367797830770392
-6879895654050303365324517468233477011666079944449521630351405739029720149442284020545119121309386081120398471736260643772075320
-5115668578180735659993042798673877885823921120201277569914715190894516855160960884928665814998466370463245773786729580361126788
-8473676321663825127148201234179810956242584805477442480418075610556509294721684997709018216961441699698479559880791844442850980
-2548233794760268816189190401306088756408880212519056730724214290704225280819394151931727397286420914387903845669497115561372625
-3358354482836700948199493625980064917823071542164808097350543961229800125334834517703864655364546055166975880935305435123088821
-4029969129548193511513014303632741396672093205336941776475040363815521979058565558783096959704099250216961508907068930707743800
-1178228259948098596059380680409565881553234195364086559565498076952409655440130991639052974945372324956190156780171629355058755
-3717169015464986627001032179838523927735142460855957466743630432390818286505306791995379349323709241837876168544133279436428880
-0351514453291951960472553858319673428002898082287147987459621016579844258976392337653325512601241626465492005157367458123795393
-9131757913676253650480410533013952331883655576543674109012844727933443442812463625615079052305206439748070329783436962037461924
-2344960044770585240104572826430912626099098553793285442582298302002106108601045902079657749391794040816491373923940544837370962
-9188063701594180602103941124399234673973525989100931802175158910488942922514429931243842291939057260146437903218286048586526737
-3095726475590315515951883606439041451987645791724176078005404488548116509110488969805623639698399122683827452715501916665020036
-3403203657780121846439527513421356719526606981096988845264774034545984754667811956286997210908649753612024363260420418331459837
-6454363503953069085653959466382547762654112282647446898596667543948487517796676159860624750118940186171824534509979950086899125
-5534857215488234005757824538224541774649888325359087056984429790126545819871211147018201409980430263764262297169187413523924493
-9520167452539794941218775260774423444492261204451489938948286717754151689428746487424118400020813014135629700319029471552190487
-7649753857278617517384047446362214242830920706961544783469693002591616096695611398984815665331683937899607935227857197308530722
-7670636468635321903676766861271780561993826318676409654225250617146887843176296360469702345236373355189175304203166464435492803
-5456942248296553684603690989598415553795292969337585462669697131930121000520692716176831920728412650435826182698878423955991084
-2896202227362420166816298936702205787111522693592087473120377589659651412246131193859654870409149102874068068052947526362484606
-6206499177988103420772046456006763763163890633653756586913836205106440292257489426046140931638490258992453397047593430476263734
-8271727426541847240045919975482895895407596972876222349935866226855009736203327632117757403576107132386631830517560425145954967
-4982163925157138555939635994371164500846077564198212229817459032427881591645290463697023178851238007473163893076170963474781460
-5340106261127351887331618946742533731988940154583287036382074049074320856289664772105865760586792346984849386692407381048942810
-8539587910802062328556477423232706345676834247983911515809748455837801552264721412722228887311117555317778442883915233779797479
-1727978384302123967727306531882414560603798977850417620003458650086712045078303090511550979287673387880893466154163854646269635
-3674694578655904749986580598395421685146833662087197374056652325798896836233778806349388223093547068287833955056912724333066803
-2847637229990901535043145484946473452323017593046078412652932709449735113175295374406245481235052704111601101677970510368326922
-2791471564967916436181421827384161108238141389611296884460017859614820709694863977807620407661790121758211278587753750388535470
-1311682212671438808292446213587823526675524926735249896308087156166254699859676499961522597030531906137578453887072208144785351
-8861987970713845651946125749765842589051394459161283498525078704659636051445265425124710568264660637581231331333166906616781773
-3433773030784699549858220921642631039795495279596839707512577767723632096893086622754554818674187555230885034907077860457028892
-0456580053379968368017945695164763479833506838952019851181545387562584359601036032261663315698690958554540494006314322814695152
-0089934480486704619783110767294727013349926542271497056296250118282426029001430520413060977864809649544418723152448749796245164
-6374218433638081986774399897692332350976246009622586461188714603950733284096247572024844313234627483374886751903785440297788166
-1964624071497448806005939877571581081852368682713329198774704389508439970356078811686024907131424792844471710419031994307710495
-0920647722499203428391025133284362175932945797352824069655533852410541721344987923656955005597638885921881748026281505225146701
-3234051414875467310335184839402728147911090604477636334326355603404083470772369446633927746336105082555084803709873030579813182
-0797776807854225896647327655002411099428092825155001834564019066984990634531216819521296497699004639732085677368728818595315930
-7917485162442064658421046487728607879599371289976088757626588362451318559683586821768061531908102225442474938214076282479553260
-3281219759953705660325535461460598775637270570011648848817233301493712654518786509665608881437564458093540417006933366539835720
-1421309961668710980725741781573712344943061720229290458895090456489735933725778071381711038599743236066437961925604705889777444
-5346018484213473348778149540609702140487404833149084935132956734625173249282732560039608351835971014828152667004296001672327334
-7640982015534543149522949001287972675835062998825649759593191032854308472369740597155188057572429051521288244481472576347709112
-9082197142126709759172581677046792938596869866773476159806997279087695007866672568094682918889951065921351285356324461616422296
-1936662836367636814393593918150500159197921407091608653457518897602784067757706017281722377124420704953813373267377728149707235
-6165532554189463034890275736530147346375384892741034329027227244542906540148716547806611470041759808947343102903725834811540237
-9921590940060069893953324679767980790622906014798953371116800849894891003273141853411016879477894602450403366892842855960933978
-7315523767557595011955152358473653019805790165086637876204849356737581570450280098237545014539966107468231674446113357850428012
-0791096311925956512226765013630421811573099687378388596324590465120594475232654312603704526616319090075205150090415360289991719
-6209585520294606187513003055352209151687938901113926217849214203137326771247519247105616300171713950372822794825746012319922943
-9070419207282434237195104895273960005868745134822958234433238365905514670266360172103212277318139495451964580465731804042546085
-0338167338157532972668177758079386489083653270128069387600686406564818006155678752863600080494279043355117187180589834925431100
-6075857929007054805987361298779916735419742025429402324367885856941288459616727309405216361897524393233989298288583563658786859
-8295608945048628864124667559446303925571884604451666719475562297491635918267804843940029802361638899118153382320671609177821037
-2582167131471095203583988388775565537112236568527071226697464466863969482609071992299656322827744545682290545625251014139439495
-6711594101773826530320065101211025715415340393938808536071030195055575879765597974028194836866850448633781263352118203830334159
-1911464166497757327229347266491166768994040887477045432967042061773419808596553435219059712816623298485611786304164577509711093
-3950559965553312195375204426888631697136007142008473612408896359608938295800221018496826509159015008898585495437881710932385623
-9874188189105976892158996129334251306053998794609627074731940358792016931428037315501950874633599120688188498035110487709165641
-4173410887164627415991784444779118017795312676797160939963018529923226506062126935003504945358174169319649592822030532548902364
-8585536437904001642599877592181317351676828771494354438414987542591562928890147892012194379909967644778402105597291718886776458
-3150820435297838229930820366686733000243384455249980345366643081949584071763731857162948259797374460060553393333323596509856155
-2746510308210106138913961915766655928022321725147254596535903741506128248245569457512888067134893515592196316478265340857967148
-6054837822399734332369250046782008884610626357811684106025662192613352002782118381922758419491552146516596733810475017566505975
-6253444244691352274570036070483313882748278795425532524034702609588633374333913295809727607310412619066512211586460777396607177
-3167935626890486882612342937895694862011472784369829386553959207681859657350791878067764914715082125859929851130735487337849909
-5973912099248621614115761320919410184939653960557823675647875630413749948258747675478750350454945866579601771984960798194388016
-9736525221109913891380740014791803647462175891768280453619965529263318350088005137408675181210618289125588737889391858187625884
-5353369021308107059796622691343010568879776199002760578714065302617216068310095438159704609241785014319825155619864292170880710
-0495180914933316707105009248960814921465681956792191416760665299694180526760284922837494706424443747428740900047510907222820027
-4261167178860446527279234457781216359164057184535569399549566971774741437839602392078186827336187328588770123788484074481402098
-3638667122645479534954458961543608733857643210245423464371257036918768143627288762652953247716922315676522443004771243444008790
-3924515546743559568892457871009003770852048769643235894176832052809028875813896140562020415910166599360845331504914716199418304
-9539930208848580218543922990732130838884473458954810662182599563214576790823089949536669626168272941913640024171496275351316441
-6014586121604715045014833563011298445249992633905973084716393755263990314978408352185626630254184110544304520462563363100889663
-1480056209827971737404379030390423810733649879094610502529510552900145205746169635070607870308190199905737823014183804945008242
-0269907341608215559877018486447313197581053179139277368261940240899846162645640750726730556726252880111678045833842135360488520
-9452683639389882051701960541518755636274003173728067144992243393027569642308110984514593826650393132965688544590683455796310124
-7380252617100440281579567534384005518334110526934315682916800234325208500512344342386934373532140277510905603770493859349394883
-1640841298979540048287075269187639921568678590871873233480612103263772909669941767642148108401983790040311768132667513845995891
-0797228841202589730512673576721011566549518209931565777081305309555092032097475454967752699515363312040210695622598933787975405
-8668051227922162902176856358741680893763627061240389531754672702747011947735221029021238076999742096989024601711374129582948446
-1940517877834907351003862153234670764674347412348064152632718218140233582465116935278604919054339813155764852687263384383689198
-1258507121750424356317899666874328759136117897322624713333775442411946490404548479399911860814088039900005338783292400154353212
-3215026566497194921100428678498475477212368831513037002482731701747625115899231609161962690257412946823057745227816040916263135
-5553936624046126710513840693074241292678003250027162357678547764315313001417556750343221645935609713903330012474781806462752509
-0087160096352464233135718030584278086059148140723626725159134239250134423251753319043440628036779710209805517160099782393064078
-9318218498563579335348341700906218700126032521018782542069807548617891695409073329049001835630809969460708500370067751685336992
-4208076385552541906663566236770990347477457147392506695455104977958316161334777343709329582406111068678972797895379263213969728
-6469519015224118923867472889765223881558607274601638396572334489644055785283085612422941306760043896876352796674858662547224493
-7581545382840053688960159322695550231110088020621219817091426507061324686155465441741816208389678694769740607167732243171488972
-4513458865704194161496940570841680853750653077515467382681747134693802486964790650970100691348806372555667204130083389487834234
-8611747863343669889389552604708894518837779002018609033906535124466043777729170830388281007572831090596749539330676454829092268
-2614980773184238784409092097541705502166871511835967598046040179529035245968990886914099394023190993075959231506769917989928255
-5078404017663690714097396036195442424905417384596337491669874839339606038090162958546298191413554764614281624619030688715839038
-2641999347004416078674706237266340276545528202969242926658631976187485588763571283416465910176657402769591804490385811120607894
-1022069138109039758566977843736614783843237277066124548095396035264485535383579339344672494958836028783883577568562124831488748
-5036220302308126851203910148295691777409108647096999242270479109438402097077523126876642469999412297820631461204592271671208573
-3765990012871705693020962224239694872611037068970786438641717866334183625110030788667653078611800346467240202316395411589819234
-3782933301188992583378339987527190128332463154672014687853873904582770103495961273158433396887983077621367280840979561172209874
-3749199929332536186794255922364823419316096604597225233951718116228041916547239168206812159635533832324993459328359641335851160
-0949078067861678051433564861906686233060038981581529250289577929864989790385982845786299381823508035058298434160670694386088772
-8589603171909191258961043702444348933790044242468360895051180975009846570524502293795875915077460542906777905339916008769533025
-4696790001285278712597004232911565273828035212555295118585512821803987256554356248161862945364958160311031123882054615472804301
-2136763839544335242427199077661794515629181187002289822787279783807001282765862055208820154228904904403489678312786030757766407
-9614871264207972090235920749815254428999808582182551807788105640461738443833466880592889986393806973211194934814261892282034345
-1053682892737737957362804191027861071649489484546703968499730625323764928679998205513025454613668271807284174919717885935584552
-0107677739834015517323287238318659939175109001778305487593186279160892671682768468572465735391214037913879126299875773890935302
-1453192783717188719965961795655288342172822178539274975297334507529484119848624649135862288188339473719284880061285948938876451
-1104549929363155396273207050870222760506597442331198500643525825130190102095717730285667006432704158844993996831311067931052472
-0828794534801481162296313627002145147495573308897739685396596733882610495059540555269595443659894160127867987587635803471525887
-9824022973580621392509031573913634949593512565298787398230994893915219176490569710003371534856099636970419816555736516423169506
-9878869772576948330900142931880528301401489012367453237909670821957956278129934157555287021598067976133621454184066239649408611
-9449658706952732276667554753119961137301412966671524990966931464264571223338509226807775956572226631814170860570478467598493299
-6650524655470467246688640367290038855618731841663664529545949374735107916410687959478366394614227095766286594581538618985047713
-6086084723895749993359399578577946854255073324766404400181960974843071723540051597517023301307855898898894953430083847202358708
-4753978848939024247917094291054930385042551054372444060172056724142258138979831515270370976027807892767076899036493276499539268
-4888375835344223898032733332908158386194226863203069893727606532739301723911436149446573440019514355993413403576684311443713663
-8296174705195869577823179373277139184472357378750746123040139737885926265459733919518384739329034183096218738593256149149459218
-8744604285228489074099091055498838353604537087151030264581202847750393201247650508352763633370859358894270796201667489608183108
-4803757550419070833057341387873914307394706611793081307683075761521436160450412298883575182283341357874191269212976379223012176
-4435149804710266828206094765772134040146772381477199506975830561360349698395986931196641173574221626045221904844792851097031410
-0140901477445628979104022134212056527853288372076077175566962012356161842830489257088195443545165486451856025672191097292162212
-0064993358872969642733510540028442337052528489493327308542431944612538748472046808937048692371405185247438306806803215040744971
-5863180250517768423942955033295423284494978569038179153339219650484893674393537942959738721683811008504606623434622402463074587
-1057835094428515977317637880823368056821605598124838652727786262421298250352722448869673429472764531868054225289565474229567344
-3983238067434669068143443350182793359210352492378691479389127933138449974060689160199725860332928925347596191014918077016053014
-9909206404814481317875154662284644158413522012241871567063512207157398398808577747347614035401411443650498361772558269985219726
-7744531085141281581884696688318667987388073192993652661160923279555067568241657394706279105517300977887168465546838484164576246
-9611748410338839797298552575152326071882814435353560145135335186607329942289657269580962404267932188572721339477733166705898691
-7946378873728294158344802516673294879896454520313415594420541327407109273815189756012820920103635963852069701484919842956064247
-4874591841062298195410390631359369161750834793590724525846541010552709961171248502344146476896644307714211419632056930049968152
-0852013636597020207693222771451991722621240083418836922565030460173149090294177983564964216327697927947088353859239269055188074
-2400549504774664967997419613371907388057256285629514767888950107220270166626488534296499500671373046737811115964349503266901011
-7846949189277918675793279134349974486913260503583373441600579959916070999842932572749268240452265295033063113981992389359199980
-1807261813286492446582855762770791231541210822077548388510880369998042947014204967053843960432445968862263380028288322991265906
-2762645433260880544005259370505499891003063278739034550726117946384596067905756389481622864019774830490639904899687312014368603
-0877598939078117695418432932115534755404639291467885726434445252435059379183430846339103652602297046524638381772417363883263654
-8359730049870608112690328069372460928467332597727838745244400830648941526818883943362511766258737811338084111308530830389543560
-2410247474136168092178004494614768123474893065682802068994067272461583528237284734448787471492174143726629957921201303786784836
-3419244084207146670255645738668183101897287707313517219103923810981141387894446864639750358126083692639837682548305250192071549
-3436195357834369331471914469743643722462664355231433520254139779344070714371148189113613561574794491575113019678653016828154505
-4439128393642435861391888228862161582205771186938296499633571218847225435482241772976029740807151825694346388408247223423817081
-4171338859609192030035030504936231948955422469935021643277709598491047020926862755743386040228384976638566676326191183360208322
-3510862362886970176404175491659583359746924395962009940383204211293131363439339555697993521569537948812781342292800263161257581
-5726969821251892647951678196842942528264097032325730950425154233756415408461741348237674984518538018983212811201588754756679009
-4778823499024627173529601893322692810338013854983738107737211008580929848242105038076828712411467725165215358148210018424891037
-1496776225022474894349628318466731097093204838845621769757160832213029122420309244726997275518899114578190401052089674878889558
-2150627813505105989559012023523240177523105542484058646465606833626398767902073791909228024464129808047176621447241995834760361
-6052017973982660323612282677894938232580284277106494794233888932365369180563831962638387127741187828046331415436706723759407894
-5180894648613337149931873741726031450761346316713499884971063033267583243155357639761188673059015634957451632776491096066497095
-7359097724129074389636668836328680896804756391700054500433769926703593431467797993796585602417512809374217324038244052246360155
-0320127339112689809171849857331267778192107524355671645529083978652864384633410979534318842451250352236642968028403645196181521
-4118883887076525329129847815663385510560303081843081502700312066224535446821931779450723308317216723461024137619749777688133771
-6860925861993428345905718490095572908986315074234835981417267582301259888782018674341030424958141289788351602467046638469818924
-0143824935249223588362256342022083873670928848969341583470612068807101099916137780686058304339569283167254333748135808339800772
-9845042645815548051061661959342234028016893229602886364367950621055704775648720419681077874002883738984453187494339471937282961
-6185757617018491828131168967624272567910874050935111978401025105754755523134728391834040088198125315748002405260114662632225537
-0001356522238346600683651153474644012974963965580249070955634679932657691126596449770936543341015260416997826513343646145044283
-4828874167962259991499503673600129164632862005208870245173240873585329607224314026307889603968799682624300985376989091014318333
-4168596789573195113960639290119776051474016854378309232971533989042184885619296187870057410925857690307120789952188315701548184
-7815816015467871136014863206025674274535612873638378381437080759117487117954420502148760971346576864484963796596882357424854163
-7278776070084196458814159988413439534481041061939764299982929635630954177993909110795537307351830954498765311432170571984412940
-4866643127910829515007652463394937334032003939291631862785106424516937511685939908344347334073225050202328398177347110978277589
-8801678473026832588217149008639268101698714830248585119117348101801713106570301483277093069752495633755950440945309944552577536
-9617526174545226424763055218268088790352736241937230497521917254797890205799826169553805927031554132395993133419267021828416925
-0588595739388380595646159745519694245103070425108579498054959496392270944865180508024017295767451162258748775694293117545535076
-8702772928743292051022384687311462236447455075709507160040356608423402093661525464261088741775321017969842598962589897299430978
-6237136476697160214138655273076686746008630927947783830802379210660809805387482347921808311217785296709410669748246476297410657
-4956721962293257951828094615247811594706401567441027963919853253912294488061757086648296894406025064932611868738979275806148213
-9236140986639524620047147846000572917224921424609362686790157846221057427556655153843449488971368941339909014048314921826442675
-5366378038534835924469785482056822213525701444985254633404597205774596447015868437597513680309327466710395924280351223623339183
-9261759487436784234076954133371789265925256106206142125748755816777807349896143234487553341181444300315188799020606387261852065
-6449231339989879656134113568400091770993505914272783860814830316499113207580889761456971111735531955653301180535329421263128180
-9593132987957417462820592468596242875901632353771559986709766159903387546786798526051530972235857175987208754226458183961092508
-7166010270941368051527588903270384190676373547534758318035208065713808112773649467017099455130795910402044915843292687098488409
-1937469715418217414858420673158652244798733546985659728265347906685952080207655697652213278741491999837300249957163250199620558
-8228542398195856592161847035652366519403982135370687548941385579105164032051119406009514327346290711302155896619001736994882959
-3637688922930586118891425546901071630399830689323382607140358997300211646909715463890915726479319114588493474688432142961034974
-3846092487931514115420051603659542019430636869539365331821500084544038227936250365288930517356505814134292254191756084661422225
-7491630641568207270697424777290522332626816338241009039782131614678232351819731901409187134000842000166738975995925878926795417
-7070750968877352578247753117115107850387026880348329157736320326010941179590211312594408978595708610843851283204781916328035469
-9579425490712849875219973084577346692279033275981940434988363957383909743141776369454560267346747976256694629456374012164182136
-5715566001611830336152118124700907641876141203182109095013901373890817946278609009427237417191831719001170380251629245333691467
-3777911831700858846402803605902436628175309291503492499557547037759922326055839219601687167716391664999501580752878380637519910
-2345655297190543682328955031766959976133728834616422943753268441547260728586436316967787919247613972239277147037959837372479832
-1264917138428370036605146743753527478105136932962495735773676134552135849746496312485051160777893753074748519890909181403083444
-1019752269689676763134331558096188560591351764633604225395078892173960817806638672836991960044167937282088675278982806967963563
-1646009447412568269213391779579827953653829284427738902923460839464242874336523939561058096952551188341759036552715805796071087
-4514073980834947668053426086988984219335479873558292410478690803080693664498437799009591988658726439726875547569087833595254435
-9375888306479510358575648650751703046541164954438171217850843228076528589259852655316343249086105052230853543970799873699798265
-0497165101239642555970983822927664186264700494353584434852254137560612395432178721562325965038387864052788810184396252265391565
-9637587742861000445296706995627451301787108835157787393998256171661400401789319408568582769562951011299994449045177879050273430
-2769638085862574311449284998834663396793439445498698446119611616703979283028314824805123683773362437290195603306996434216889157
-9746240352274295235857973544138134283682808329702423798784675201114018293748073782256043515882634590777226313897991318556273667
-4701746730536780180098002090253702648694901490740529266632381315672027202981413355374788940709298520432491519903507229198264330
-8070148149525433117389602780506057744721609297582112109576333690538110175139908485162827329907610365996630627743121137187293998
-5104791573207818901442004558359267736381147580646586301522698902268860041597652832411905302035950359208853670857974818287006889
-8341316079342584982610662915730694074266548963632208359785240542883719157226848170269734749166834340935627403531307648991671361
-0980972555646214322144321439065894684434469993258702669138171566031352957356377641038155398195278908409758982420498643103410893
-4371601001168990355540734973104369357289155288304862691393888938344400557230712070949783924178880475136899894295722616103660902
-2650480054074532640486048424756932242389804525662345983096982594522899748828272298964877383316038674083325253436014966605240140
-3856519566975050055663208955514019483009113366052382153385562181732228724721105677879336134186949728875130780075511950816508916
-8078373724394599222427487550133729616625008462045077201670397039714132392823230257154531053190372696559721189464062559107218427
-5533555275076610788085420797340154399319379967237990930040901555785674670104205199936906742420190549652702261090687000720033243
-6220111323366364001766649253557628713894497231901067623752708357435827393686138195041002675760831950319558894058730884453262921
-2672277003207147557184524907281442713352109540367339513087567600977008089227949901291846746947778742548425956666175882640922513
-1341364992092721464190832131115386139839119999152547728030982443332120739263533376607896512917871745789498861904805336640005368
-7658494769549719799407250503812834345058648333149043237321838262779633765459673785919568562329102220327192186018538985265090758
-9891469225677893167626557199385256479464450147340948798817312917938176509424351376822942297600700655298360387396846679746727135
-5585419624514115780086956162546737430419445855772977848266264876064891998070796161296726855803937113862539594644902156882096859
-9369735292641205270247208512449851304357935258980017450069350537303506725253901558161348011161752800022469320895146408450548005
-0250792460158595347750598522833094847081172052676835161342784300572879217498951077354750791561533069799550859447965317570533329
-2215924262194811929293333565918894008757945953561673129802085846175034801490539407544733104736094736753035909391436637603434211
-3003828547025999647155773214469770001753156334255534694689533941988376812539304881256890976599139258146884644045613614613975749
-6800289970404751783592624836999186310592737935219914459902710041374388930994677919752362443845898391179354567028930335795630336
-8505759963363966237797610984127231223565214326257640335015223496586184791131912377414208061741646388077399037761412502229212389
-2367769534630970786705110465175915418118488516256049569042500049966228999665875815493320452276993289094558376973109778079159470
-6740493910513290939463082366133739451516673396242163998658427933891438988618879026121788841470475041492666218138874169322768351
-0357303411110414929271994301686020384849443986791255124503432672170825267728337655437754688169388290097504447359015466216468554
-8192240142847884347063706580178899765888936207019662263339819670804657575316021484690040614562949295841542317355852873318646994
-6622263158780477778507038872483270954479088649415292887077869603719840994025710565546888311161500807362774885446004022146890733
-5176307819234962298055575706826929453118700498832781969398229886642207165799263179818071674130902753482145042794765741675062383
-2751302275326116756435072977812989216925193208517438463427139377868288067976273977283764655073728859395428187073500573181560080
-1845833119022235738677681522695682631533441089840982284202257527507809093077654733824218731845673599302802574363126193666185391
-3166900131346963127277355530406427740614776135936937104096485949875917688047955787215898240293170537866227146364747857832752126
-4669645223062976703005533676266421855057200556768903274559944244985743499257659816488004923631139517399183550005987669212203452
-6297157628559223790562907965128004350109267209905657347407682698178194211365899319173140023292544735908289515011446104226422300
-8502054721545809152280155719799579471628904200160322267901551608506906168294064129630324866997658363940456422902104004108177137
-8611455694956943077268590839116881863962149614279260195002902444128093061737269752861412765172102748566330731758569318211290162
-2118077432186424807711637317365270035214176328074110410477259086405158562676552653953649314850972984909614735542131768665131395
-9130318975369645829745860603018652270421321400871933193989890358079853776989047665775272263249474986926107253991947206182591757
-4325629926598371530112760898633445089584186304063488458578614511450976053503391266403574144006236271752461276059535144816112805
-9310962691558816998084824217608875970240851404516558899699931821439837002656912679683111747809512293159335274051955163666587739
-3902386789985655245291475443305453851903636698632422663873769701394003436882941095444088054500028643416504275287739285414766428
-6731684059779922460344447840778233714899809573570342484286950672469381242333715669289828470432847009362616600780028432025743033
-2276600041430073716292091375271727222342465787797822281415644677410001912257463959430983836963509288786612692459635796134586826
-9782224784159961526251458006646854715817922665126779115397720973464372703397941849152840323345005890646175543131277561028472366
-6526167561528291467123805366888888939086346365110568387291388627679455761130295567840390067905361907699677554800553539940686367
-5318634933920742765367288875699774586510799452591417236786364826083325845867157040527831875773026806940962750032015566117391953
-7493598975572064199793468603272146721884132503560554819191261369489899329392181449153306365084506335645635211479940033483680033
-5666857577286998209607341637144223997808492861427974015972123407497307671199006287616123632355515817115708130939568369663610192
-1205647133800994070282776117664323692713443344045889466640364601504907846992739340462456897562574412472399343745023522153250853
-3330319212199788930516095800858918371890861157149091660451404495244272634139073531985568539542425087248882661841548689414190274
-9339962909966865014181214015249254327772461905399600921043142492498857240896128334661531817157722725029302364254696461600120855
-0275915123664954327692393323944686811113159039391999178218124646929218008261416648150717574114279175738099624550954907847794987
-7571438595941848638134927452374529897917662628583906227103605014116793319790628080501185855732090732338304609688113595225239617
-9130230309512350610529542991215174872450882806867068241227281773112095423160023040208987280292016395893990306260033588936149291
-3745658203217218584383948667226718968580182712181973947156555599253392240064780457939033740602796118129681262618905670233538489
-4412418271808065273371380680584774737632471892264742468899650839254371362867805781616736426407895133489629389395846145646724319
-8489210495984684333844268191310832723383161085211929007986759567690696951893569242504292424131665261321552489038411809330750578
-6574010925786704765333558400961864682658986685222505394734228960816617397028634600968531515638569668302469579752350128387282475
-7078834237219808682337835724461339925697109440081470255808977861161896407485691000442893960515108700590859410043250399284457162
-6826005017559754965121660973424054878627050600950197534543970583792709158920574211453104472613133226055927030752116724686804441
-3714997658728942284217722016417944347609973564690519305766123183125986230197933675112901682033357194516255841107152642532141304
-1057671755594723253182271537993425618933500230542903348744403011513962182314508888904498037845069539547674219152154472098348463
-4167698979868847784276420293320039606112408368549434641654634849595716003611837153708427260322734964264330233981684490094968636
-5842205187892994596332543353231430273153910962730263311288493948447613898642287416656513718409931065308355871917064045665758537
-9483067464396684153711784947324331651250593602460374159868530726671454450164268258494437853338327466263116015842104260460184775
-9918327983152500807062535153855232542858746567492036007943220587038833257219577445237712255513226337182088357385642452970244677
-7796979178949646284046620756567408638628381588842960380640158418933607236535455721736245193350129856456748190582611676103108397
-7474868470568488770868160856619425486013084529184753412392811134951027143914884376770407337322922148422893409126222728159404831
-4025970172900887552972543571216650363430374550536726543515591505239084581125341961497432836939375430662456975979411649814396281
-1376673671354389313333179969625064091561856231653660770117134131024861451548997992193443491241771601133879416546391689721119253
-7812382563778834433247309068407407067582779720037171842393136498269365501469642413788690972515921121053433102407538535462479581
-9706575053071949026852790205126415890557321745536935615519559505631029223517371185086529237733348358256190743027438758336144576
-9006414531022472111125196202814342278375571427110180645405421603811535358205031055882679708681076022342218218061708622772715466
-7014411937404524372862470846165036293398376604107823885481595132489354330681978934995519374885800444029796119672180751145597990
-2217635875626883098820646597303117864519547801664674186453314965253480085119898512655154794357106383983041271503641895125251110
-3512252235837181461231288315033867607629725036297297118913502488196313074376766607719647753171764776345290627421411392489636355
-9367329989873888631983207743830247822211335192876356701620415814984875713241717521999471919347104942898869901044085358319426464
-3886932632919049176756333953836633255259101098478704964812325499313834184343270599669768380535271527046781188364512125103089728
-9085400532850996923140563913725057699601728324308946983801623506065312434754540522710960789580013319731801582815683477412184104
-0482120489559053393661539069411739064074531226478250805786509477678364657275374151794004014104036094940006833641747026194721664
-6223030054108461763808112515000136243498515799834948548188322786124370768805042850586372228996897524679407164853720521651414447
-2045659821087414454414430804224189873085215197748925231475200893842348103097879724089151789730563882183249354356129862099874841
-1315828776287414001746118239879779806183081196189658013775774856212674965726153082362347461854112895332344854176341904165597409
-1213515137476784596057537684608135941219538557595828609988436459029859804112595309586038750020095414785054256852539919216535980
-4484140865975650257767631970278524142097436320367062170812973468859967284286099661751054315067110058820945519136720185944895374
-7742692644036659798892433853855040190699363942257261289132684570773772398269153067661790938476854192452194252168071064023197248
-0852041937859186893599452942342756186406516322350714595377388609314520833365297395472603829432190992959559426685189491282347057
-5433185143289951693194250541689460837628217616946850778491455755537650206858581434235195035172795441448516354831307931147174885
-0450942348007827481803050062279398301950579282155758680606572572109484512358059858330484516434220157350961537316843651345720503
-4380803663067690067136823238680695720389449212682650668097530448778728543739620300359368766106338322729357455486494754904098461
-3264642960305581246967575470210497486665490038206044077023048630121578302316138939937893860519106763145890200076403810118822241
-7107639168089983991587862527040150737165433796689810859573435301169366192576251898692883826389304101824844158348543802249127582
-0669598166832510431109943775944521732861864105283325341271770704933734103372804558821648326293865298432780241079718755089452707
-3568107971104085428061715527742724933050823192969880425640410593395489624255402189258495659521212800172822796344882503818407485
-4194972547530169348356862971069263077075953903800152306693089832494384056021498593498576727061441507427007792270872575143948044
-1172788991936383893646302947517752222941032857029795292428946787677455477081292410506859204482638074930525197495818984377516119
-8708727404823062734669585099177621030117278743659596151369099005394128728746425149879168020045121622056893025422397438542352826
-5536557575335193916360622332260209029723091397745281648820143235533928946294383911963312581783465260511469849131842805230470062
-9799128949323644060685917638538635211442541566486657515013727896653746677089071768007544683389875228688476415065723679786222857
-5615573863935839938823973115950563644124889855629743447770458847381603667537087961954383608440966294356327727154342428403717584
-6135719365304945156195903748702135001035781887797234160617684449358873860897697192990886253607384422197173334101390229305548708
-7355386834242660296627412137907269283682869702323709426719706244145140528071269497974044139621935732608883353990706800769609401
-4117824188478783409286690916041542923147052848706784080198351893505523979781915688089182588499549735693880215954821551279637108
-4670168752285459430877011145545186817108898834243886734027847064654587388165854257852169040893626949216503073312235415138548138
-8311486748387427946913806861679281620866414231742557923760474181682196182819449180979395793050862114181314437692082443568986323
-8048322367949325657177291617359572925594555792044926031542356556453504106573058251613848469630469333674263842694166478603019606
-2241419420107086119951172130953831261301246015464350985640311185360710868324911647982596380951605647282292847958812174415734380
-0207875370509633314857109554449234589264638078127939118196136645009058962335018366740029205503954796978369681506112588271652726
-5224125202089733016629542238144949897132285324338195131993745529968240465385054246763922445031407439625787648928055552616882109
-2793536617404132317781661381899391556171029177272445009604125493001682989300317084296686416290208482553512764370697922889547543
-8188433691033017668731418898412943576673580084814405684350547059200277266867531820522833168888834691511550304066275553413432816
-6069781060072723977215798057681530374205235352090719032425665651313169145801463663003622748057443073337332287692516062915866474
-0991144941963456299854456491439712458220412985735998277280486665724362417204461793739331274746630407706323572187551658131522029
-1128985384630705817449509424373236680198643102398192723995214101875334517122923435752591437827690137749416921444994412824571229
-0933149859869844034267514737213635247382994476023098139584524288805316943149032915781109345152673212416893459588048333327424649
-8431499800476711779747358632413776057189971388402676768615975922425552726845845057116844980552680355154340958763735731899549226
-8999746969039035522234132566990886859367771300359825363759150761208120895977530444860283076544729935781975800213516901282765869
-8578384564148446021966192696855640744733543364607326875346561423047230035981121889907856300901288650704791837601613641976512860
-4782737185453902550739147496508870329447551421595794641391271174654998339963075546317914475664543351090858707240517793471880344
-0532832780888888968522715514533732512924561999915854959906252640056974250958067417634581049729155174966017949852499049433553005
-1013570953208696598838952288133824762193269724513979589866416713036164401176767184475902330276700096926543877198993766233942302
-1558731482683686439823710758826362624215320659618968974586082717778992330445630506757688512508423035162517304559268454636939287
-0350643207571320038261933704850349754594287810435189119965241800581118358691680807766625340717143030794170306528880710869836401
-7542021244067320014248296046012617744009265286583021536650506535157160764351137973007620114482584140630719966828687210278471738
-3972594767241483050839240086921327315906881022442251582254034730627668558044239515436332898375100074941146541911588915186647677
-0697122022586499143860386882839929813751234590790881003673047769341255221587898768035294711863803910391010620206350075218304635
-0915512582808181894140392610882201933416172227163788895549745243551406730258634514282881847090763083210060265428731131498145196
-1501512625884967191270103224021116637844888067197984181082849059840793925774486252348044423174920237439188586936474269289045183
-9546757728181045784907692074408445085975750656689918729547020741600264958315888287557582915125013916814828453001978125724956413
-3762013269830490722798916645093224443451891592652341999436840113601558507630551284115296518475712532341410529593546552381421688
-0535075660768315265313017230395001783344059304089071262026544062275821507449160749765605530180854702975356649517426392492153632
-4462229922158652059017569592409947967925255644154395071833612619360534506981545280294824268624971434641426791536487863590137885
-4122860079882835156235088149203967906043976190683635109983922591971046404170885166646247578979128875141127938069850765269247014
-1129866849265718274907637855113066201183196338524085201233097892015346569822121339489136356302467977157281536251430774161642528
-4989929495806193845801738597980701228751796772240750395477795189154079611747433960930484756810247462060407330702869333431213592
-2584408285550889731205066850550890247663800179003073740079409662955268984464235081016863796902152306425169108972643255331837648
-1846495490902027499953838660575831876113795963871581292212984733841932116361051031722680807069640515568611052917719380714508500
-4730368154761060853591867016650935034777443474265562879400822197268954342492544791524055284219250660710445080227842874954141063
-2999165237216316240588784731941187402326266210523501276042349025855852110771327522344504598981978041650966736224822421754899433
-2237345937661408885897695793709671176319094949111986436639240560063478917538944076082940836147591761497957719533329126550091001
-7598999755791735199200904311392506066249434460145555306422386713523721542555336766166589674039359217816140532997872100172694264
-6085462229902194135463330821695657542854346332891821785703935541518889566865952336969577854576497261635473651422862788436766766
-9330926718781006335569837395334762725138935227106710853342363931868717426383038886351253414292607302835343171708502682390162568
-2759725885383603903963134803626246023341697535265756560586925977858745569648871684971845885034365173610581864076735566479105747
-1316975221277998480665738247654385735782940591833339656446094875845628844928541054371377477189441032462815404076598890156931227
-5084047857098057061549088214576495134500797236087647217879151791731034614882352668503598335757353547259171118367223224526235321
-0797097525215466425082977546510079918770199122108187284931098479825643355771575695825936128687263528517399780086601002282738464
-5882108977367740469432474363253310136350409797015594231680654761034810033039280285322415385168502267113255563957206593967018787
-3765499022319437900072126982943230712423709856742749800481145115762174065774560039072882469409389283337021169962653600686979665
-4601581997618072107980461792417647044978305789885381659804666757198975786036139854382381412304035407153678163339829269303413079
-4804720639771780250811522331538529037693400650190090078194406321327819886301852415216493527923345326577327202798642624789731981
-1262413264233591997549583133381940611046336903584987787247990058376502498817637376736904140547566821566316367905947287384644751
-5776817509537024183629053964111738625804577685331848301319393405578215972673272833105126341165662081776587402862223607527237841
-3028857137505052452119497280084550108942293030946862851209526606327291674235480503744471700882929025765105260116471991605614081
-9340100683840148792620022922546803909003134351687693370396127613819896251128556322124687119185535407506368947843781106277912265
-5837860085277971472343245356960717599185735265281223333386501908378356024658012834775741482445665420888316355875215276412206400
-1493889817668204302273257693995210600140074382228307911629842034054862116792315868260039297702147104111933826341459504324514560
-4753667010660505615221578575743422389046538837003732162433830910088895626144829160559920876420293005201234062697339903600869729
-6354021869352141987691776069755076073591529011311969753213483772524805097648788519425735403544963778868397356812064242294599252
-3007002284988957442402223796792807680185699679494949671140500739304141518373349678385232543712822588498429151363366914067465545
-8768505870421737992314357883218463757749966400771061631074878673057982116800200818694276568644501192730861238043718483873582182
-2517111306024948547742611078204983908881805478217286398022649611447119014425201196572509914583877236045184752832586045682283149
-1376425079937583047628837215348969478849396716756967260659465804416943561566523910593617918317955498182529845524570831173841723
-1739036166752846450279902298627287438597800774942709861167238037011909085160508767640035085875297386568223167138576660874567993
-2749444684052418908020211162253183694144723421354516311236418763218072849726536005435788876083510665834462678112083821685346156
-4979778261313034734593447279308534789267778320343662336147199781647935359075816167778411424508493052174895307203375091235720947
-7206632108909493796814807157234843620292819404196257674170712616419318834035027854762640349933755746419728237290445935893359476
-7972523340752476063451026561953128800722191374241698295085331249527419993680680244353440653002242129183827478637542127263140061
-6106361246560664390746249407209413785337414934577733325155578012914242942249188259728108681483189855141297703781608717770284437
-2459983080689617774602481236618573771655193699359105459132425259318658958293509205828433466503731104595644550263940782605577596
-7182234637562052669040625972588934688697821675314146092726738283785184154736418695256280074985786382718815935852352072100348316
-6798709996334119952629721938215622401513286500076236957073743607147857811179119661766817565585334251822559283874472847953361475
-8077368484549177973605286548826253514295310845993496549862916394171225254015547467894554807332772219846678815481086218479850253
-1557723569466563274008492657223419903746768944164337126986375831639044695750746490501676088871281694494821017358352031765251392
-3419994305802489285895038983304368890483549511884971605938842543322203428568381657097437964153561863023468226697072309642108698
-3155924019915150179568158859379848450337436841515789553391587979303261228659176045375192003213895824215877498665997186076059865
-2999137472267175701076913261675494050812219217526275916261893447733447516002165559492227300890776947227359067981526656072673696
-8601098495166116027734424221556221472614130194797807299983947972112789211510616421380969053402247170620773625487954585201101683
-3246912051329707460282887222043348831157339566467828142441386949856139091307353393247884498427787480035549002968948796358423112
-1150576199110861158548115562719716941558388002376600504843363323295796185489468606412792484061811432762347078760084900402466948
-4752997880608034066503743367113742314926769742881109939696550927489876774818149369014784149716022391683583701555271412269098049
-4122947315189371954201913791790379829165934721428116210038908501041491200253464990161405881080768468552171131345401309484164251
-2900730978305956981781132350165898118101889333020350831669690402919195278513062935410969054110767363793161548411520509850489790
-6317140142444713262780353377445709754525526526100220931420853524029521161445026020859823577131205174501439000115119816705181410
-4499991523210057790779337069784661258008182657881453125037535965670105347302421579889956188914279278573529309721593121892469205
-5508146256593369763940336135259800659809619929794178470062048041370071430831208645554427627646035391559292722312680898801625334
-1648967526716449029810215023304697906807519889979105852637730516484206305531886474058371893246706713362439898050285759339179316
-3759482577410685684593596493926547017312369150876917333521714609230709447558843397643743851645851153700140054595127571231949538
-3562024855350127743440468170916592187245116700044293261821848456699166330596624128415577062851344089770503995251522564366175797
-8477766635255068732724822778949890633417123111391309938080502220545229819981424955190249946666498348138015162432180329219887241
-8326147305998052694691664218432203744648063166741259109591553998325744681167769329433557902221338261010505326465825260282053606
-1089081066369978288230079958586716934294819087031912657105656191281125863299636207713663767265987214971817617524167760055475985
-5956659161052521449892118359418646820302358805073751690270525811449427458601574354728795417080178749838253936083489079736869589
-4756040554221482987126925729358987605986625930694194674956898248814661136244491613548633391179640626903451535330197156879634503
-5269657254348772763363513450959859105237330221730828709908803147787150002260299247932869706456162552333441429917744946610133738
-5165094570822740809419687589443353580562603424278039485215120717937567901150913213688361129548604982677760158365547321585786532
-5721986004191270987440236388972839714531938869537328769699467486823118683325371541953906389947764104960444262942308606574783420
-0825423274999976416479179163665065444342056794814403615470874263539258759123358841581177125724615901000777617590704389294753780
-6742419699812742131364238655136167729098672287631443854160975671169256136755724718145831652290376122821890697634805848496276496
-3900848450956356316829187800619138955746586281240305331127062820418337136267131988611645101253214320267600642044789378308027813
-7768142101816225544376840102775693516634889161775441232950103285109025549587962218777853283361116377890977393111956211092720773
-8166062372469258701826599477785259752674604446062893635372304334593302933414637458058589360745838888558751703330971096452276811
-2564850420537564339701047323195837094030546459418840734199428562634836997313660393990033302759129375346102025176996197579767609
-8872870135828449673289983810960029335233706075121561262257287764860415827304140209641297619500143080704997500176861691643727930
-3523914550868909381989245660265536145050317774721868915147125702074806836551953216452075481799528663908105214114354861340552001
-1593559589951778598427586959614078571783195940556392469576085221648989891950185568932203712798348499019366215767685195049047391
-3677450698912939130282894253043150590674429032380702463421683822229640128060377145549638924052619130706857319423374607432012118
-3201722283329551818782298921051193764095244804825793425784091160773607662095205922340014721050275267634431286245410339294369403
-2407761928636596422414810603411396624762992445889584536298033386878386163466235099237586521069756385945437909851885956052776101
-4551892967264629771755662186507262378960508623998075765778878560332855343021946501189553259398537769291592769103084773248272732
-9106997275950792264693136508466046590049216555344492329753333502148103978681698340982507624277442543719542272924397318970160593
-5003643337652703728951291818235842005801228735393820041591928726474748137284662169580644065969190131576241311478203049648965040
-8986752392715741495979561841249049222033021019539768600866686767034142327899022898431650915325022449300084738502689817549514938
-9360763437700859982761849014720209991738148978736994931574590369983794309597034958260372656270656787930070334337332515206838552
-4451175037964641122624713478708404279076794770827862704532161639277525181767823672699083856308324336587319988741595847500500923
-3042463864865181170367979354550819973787820266099597727415684485159423697903917044701020373206808416942704276522208882269559354
-3048080200899219985092787175219925954199186801590258882778436766885446862979938621696230463254471930200991285622531815432909506
-4494465194385245878424876179842789271630946260267264275467756829223006003558035998437034034758226419782837401641627699056717218
-4254906820448949384513753027180628971432660348348526219339979967375196656324459448972917993637121707012531419527163028051764969
-5795056709264059459045347065077313003930925374715251843125468051992798115117609874425243624614071216341941951333443769594712905
-9786422961702175763231201440570153261798473160575498751716552119467779736203318520988291431980397558340560735449110931384906041
-4425505790631864513694023511858116075339628625002969403915799344384754821079679161200533710912237340094421570796695940926114650
-7558163384552078162151051048460153091046870543482529259775071328325205703384361917997334121827387863984861026567298429845774499
-7024151222382954834390823993921385978213128615164507102313528814208567079688499912070171914927156859122712993045849060653099070
-9429307166946990362134229731057708239430020956417601592711428461279614801214510176796114831132813782448589275144006367262952407
-6718941975166588281116323921210724119843734085559061091993083658912394337924185488399990441930203011310984521684045028699686488
-1289068200800732284238439423123562064066343303384293220311845805205731603115472146721163687728630207002750751276592100892794448
-5346713601139175262412572458619231213504622828349869740030359059521925593845499598173510818770588358689016443776827808183107359
-0509643523301353915236067697449265692352443278187907371809463832094767055096167823904552345535023947977150405485951950799761287
-0296312146861071422545805752124301678869184550494728174693762162879350214577985621448093757895707899661121270041521839117379026
-8409726864010205799722565483699810469720898682668219634727965108320651761711145638969114309423068089263623838477654883333920986
-0701982653061769206880551891091640218809670563459796391962611157072335109465122237619770084725609181414534082646884976727487576
-3526106930335563839568672131933814040405238902124634964052890265269753914225841472646860370300002991439661062411618062909298184
-5489284594499017553239845981638823575689673477128445661568350850251951827238826810782941625211567718831490113495662231409070347
-0761858518186015339779421490664354210470217380607247145985104277374945800693689645130689632481933731656998223732805590077884069
-9539065740290512427091282228814664586680546652097563995149483899551962642839270109575078586841792310434801955703204357001468021
-8203312934682104375075307914019684558657139598128081066927393125488596174624606696359883862043330061635166484866461998328167370
-0125977272761404461319903866680344397363067561278546743044165247263103505646656505183679223334371532724158953424891372755170794
-6917119468055808943262561786048361427010843965462318965409483983665658166958859076133376429071237660115286920877219457193653148
-2210582961962854397595552344204221218872408837841098089244290975638461916790216426889841183579823514753626176299268639366257142
-6938938279494808076759108059141376006848614180404742864748925105751439953802762622388768762467629341123548099684486115445621424
-8751508911757378238494838354486964489105407120238937324611137021997266296685725619021335556120419627792798600024754767811910130
-8942964732151281745754352094851080075271176779020939272053185795856508342400932987956154784656391491859464794187568016580758549
-7093803490558017110343856896961686184727738060163871518042243290379067462803909424058805017311424240997471204900355661374314140
-1566736119124005628798032033275204642554171747963659618881718232992872787295516246973812659316873285663747257448232242034285446
-6562507237663679024109994426672469847713139656813945226527911495634070212834050520202668179078431355382392103665110926728808163
-7163337093376914471075674332970801236470473885515009415164064219689152465011362048740380213961234696943727976782304542628115287
-3743855222420028553131853842508021542825305338712873483864679766747424043976484573734764155416545908654414383080932700776375519
-7834242892295013548785979422302177591758705851513681511359120504187140172485698646885346881713211672798953029529425679446990175
-4633893183134377338289855331963450809211760110920084232081216223646405738494934518180959043407239414117561447413964700328518217
-5433662660787097930154056128793373805525457327147412372094936236754711564146018693671222546348461125048100620268398154557791577
-5116486674264823893675387799935762509658389400995246436075653037631158518006706329179420693907432583221559739906432889568752110
-1646689708083793966601961846963380825939768409816872372745312253381435289673316700861369097472435861788080748455563750632269991
-2394913678196583770021969391869849166343366172108313828891776494450171319520427070741615104344197304147604907461161478146821535
-6970220265997137270733854244424832298730380713169130932100655564124041223879414671509531965328454187192449944156019761861229509
-9043786409994994408835814038392730289274231805044666470305971162880140578631950679277309655392115372566040718447348800220519568
-0260472202194716089247619131312603168906540268723365507831041804698080034582459501938467511494620080710391206340388730610940838
-7326118518322238969330571001468796819573761190336351214992854388628577544497438052708919701742914513344327189122670316147267946
-6390506784888882547755768957113718192319906860888999507544967824165514074944084153555022322181782516106164395236293833936377054
-5714641021392941796626276072711028884736425391454865594302431453743809683815572479844749782164523410744380979378894640742103628
-6367297859579910614284261237130263461592389581599593438725404642412171244089574507753692124870352648825973497683300706972608091
-6528879643690843406788232137812536357500339309765626622435903074816275044864634059559694905228929605192781404349845940406623980
-6885914653705063359510874305420852766939519431522048421204491529430787666838710231728773489324489696476746687650429532899868255
-4233440617969212981294448839630057962261459110072028596849512767604956758310477460111261843845740348872559542671712436710774055
-1508618282454022497140169566835479909506224026572100667557407598641042136865104440157420255694196211078208396396117860451776365
-1507239834904105526832362883413042406464314583874137343256081467177503191240584039921334732134114272817444512404536172921303844
-1462051089737008115697275867129401567569051007638125298802754342170903145796642346081652330045536281219892265708368809837219879
-0453685864744973901237027525243434738854537803039815016737120599127474654581496567442710142699846446910049480896669404203340348
-9346689990227089014642019407223078337725269644715473933462904642091284492249290308972584444368741981346317066840314608857364424
-3692842182371137943388889815198380579665396475153546930512504814795832691928659417816231253704717088404598973194431677726441667
-2526815319204901006066476270701860537782781626529137506566276977867530476935375522834441559090476111355166836264357254224488482
-7009126058180938597916312502300245038383750490075362057823728327394777642420436778059817272275806207554818391187127829756177915
-5110816584935888048243109800031765306763187568267294316288420157299418121619714954580527036028226556975389796598626288986624596
-4019814997533165299992337612192568036796309043358811887855691200355299547444919142751489527995336846485123932685995757878474429
-6005599839728025790953582536623365308961400544193243119538823245141014368431208016452105852057876883877763572171550179791872562
-2500356597670124887859667877622171934055903916486360738831160634956448169247221568037938498171280531058898708454833291828495747
-3109569215216409575065435532987897643346725582420896049058159554867798859087403090846590114662541568279219050551516019161353868
-6185483127396494726368946515385004646852626975268477683334752638226219119476553266373574505398051454753329418244962919295715945
-5344724458607009080560091971792387153222793929070066348570583467465266923727598378490443838259560132593811322661974372369019403
-8458407692595863178782843772482279508788218196221474525584418608306184633515880367399229446502766746947115360332883675953446527
-3121980707768424272697486172479450164639268792099956499632892432254994295106673987928794494946432347077043928557939886000171261
-0577050269924549664323393933836052936324274196559262739026908246179444460993650264121746529145829029909925451248158087279201429
-1182711132849414035693613289891027291528838438771406387710865605582990490514444755922132927296236610194750925496351082081251878
-2109102647103389955876851996958955042517697886815050668367645651505615553003883543425993431580868653965842109551601532047774323
-0249085151080461985544466651926919056622702235431604488689367549402288274733008707563604434799848038664792491456040962095929365
-7278999875589390549123015596410656975040860435505974009899756364318118677742869501641184521884257988494124371969275324199080350
-2143525889485226056728303512644071737922673006177865168448238248795782597126416756968158704999395137061079007456174899879867776
-5408947704672811574519430929617541968994408425732774912564950806181733784295540418756875998713610000715279835936333399272549796
-0046618750251923685648324487668060245166359869535034556031423916249395766390348943983259976779662337330101459084587467420377611
-6066406518226332392745642377882173038406100184159399300600456331777383902825125059202230966872433187523955621780460854740743440
-8412271363530715396852912523334867927661153444730211881314493834485030033457029175684264387115709617680689679312093978999879040
-9657869183165570826073481937962858496613310115706782423102371799566041214554100144472536538085009196821977429400245149738069576
-0816241320499554734167424446072196247447636657341202004109886635882777290094614656786148313850718338218604613751038747577375251
-9117319836426478794488912868694112364734778843674655117850629082666869083673489067903986091210347641126774671760575626609401765
-1008118532396406153376026525242599592034858556342525818569312902010080131834952260460690347206525525021427489641699256115948329
-9403478796471636735520877378951136546880804020374976748551718084257630575582778549740221982719791953968237118454633169542490322
-1286802823239946142833722240859834876694232965252258418975725767245437772637447581851118844815831626565504328510567619469003430
-8292609187732000353612944093829468343729520826414837631688769850723905562968822078612443055462285102551209743540366646373935564
-6195307285792520347832027057354006551256656817339152300843201008404344101735346974655890347210090580920518304844457209111402489
-6224596631460367862650134161563558944936031773882670339156933695467888462978309028912902276648283451994600576418116774756356786
-5472438323418087607827579818345851863545677098783823512135936630219825008658803838212318120192887213931109375285743757983871070
-3462295993623789324823077363153428519235539388072977171154971504655245868325675529422838022778549930317329461099449011610221962
-5200838592621585186795894021330350557903923860725207306860907835414568816984390887997385942459848064357524983387010427408109850
-3373256185275744974070989354450321389766066372305525693275351316959271980719451196548752519719437550201627682282540860722912254
-5801613469773755028551251430496692677302091408721986707132740326731209806971448849117149983546378567141073671063743582525928527
-3697803453226110613863663691507092125649804560354539788548901908917360870034087584677937779281144785927759366742473292064354073
-9963717672138768910209602639579145502161357030053667109664830302862052329208650435316813897369377235565986275115675225384254363
-6761344873607397157287860030945733938977023836366529156220217899463330627464716487783276767734588772780285540219618726811099276
-2472361254288850026102274317845905290678407546967989656293686796378605109224367092391377532276351514638630925654015471910946545
-6893284960359512924679289275759756168128756913637757439682764283483027618435659261867805209746618113123871290501000298928987223
-4604230631532001258913408929361874112508575772563457725381109205712576762498230243782724863115387239822706836827854691589225919
-6353180226120522335706585585655463329450214403091956830465201717296254555917557791034667593584676865134148740185250129625269812
-7681527901091326113048786722462348325784769942754780702258059604458735745233803955056030921585788629283445553041509260093245352
-7309220586489676352977698261496440058970947266199089765873965038198042811288461602506269407874212537834374031596895817266480252
-5671380781713371554805278200673327258182545730441250958579106569242653773093761570049297046722445961242199585137608405012572007
-7828486850550976212754252064205756489990487555478160661135559387233240543781534504267534308047400112433806739577979094229507603
-1735652617764383585639984486995149658650155492118012228612717608699086389981358293860866276067465797190676060353147557719908880
-5809608466540093565672420660893504333126497209645992122475383330847359820073574627113129012380682929130905963299348891171922548
-5002869804918377770158242860178234038771989441187910348213084777623351555039769099812484337067510542127104020429900993982081671
-7709207109088318832932845793851072838104821066587277352066221192004565750065851231562111055731251503571280787745188052871173891
-1300675988020851714469995143129598445432183378365444739669948446307812357058373524561004834384315759687175675721550162755500065
-2986343436898030807360652672895860427883496016032784149587776588259863806298337541233639409877580883769111783951961729854269967
-1601823981755766290542611869833989750039385604668769648848238807861573337182702195579127745245081404264493592362053024115769418
-4107102716492675980158632893016973041072334043127798725365792088221597132425309628489541173280546793641323966773146909247868755
-3819683658930608253697914654878640066261793324512623727802178114862630064529284630973855427311675132424529284212748792990550668
-0736093271588205855246000014782826243591602482151161574269309829561758900770381929089531747951679154943426373942743857678907201
-2579391599623221851200754933465381040789651168701188912204464482208095449667962715138795642341183881460864419304811104815352329
-7570162647614550188694961496075537449438462429576197619766568228578156257291119319362788331980002153009584790725962518357588642
-2867301400919047583578998934993306274019943104502333712247027666654628326692485228040996686989047207277332133939435024962426111
-2800118335388070264161106773949228910777957160444174345990380796529948251126974186339060998840435346432168006747571320370538154
-4476893884627071583698402476874552862205711529686822374264860104226019597554331616506435529408791452032863624032022777509172662
-2387360521387922188586138212711962601419570169405135474539424296757638201501368935895796012267512214174579198583111876438042196
-3207944223864976640314026742675529342045001292563111065130367748865114709153385711357232421423093197866403543774881366812947410
-3024015733350974607130082705448223007580421749047845265584744661269361681112069541859763264352543531462633691003101294808859592
-1169692162436061367720119759930066692678060291627161481443668541634202666603165593913992477700731194838349007676531720171279849
-2751165267818731079924541076614810221037738242037928099580658966017244137214097278777683446450716576425458106456674343770827281
-0396856995901845858069688500739423611458585131275613789773338642449531843526049135797567793850609374983112677866381777610197584
-1531087534395262206112602286543697479767208631357778942636385138053327121554947922895001619615466561594121066079313165604153569
-2093692637556395792176696765614996657813671032355821221008345920651772816571893227375691474134293122057079026746734194976675858
-6656377492316720744820927448196522955924434793647944766092359157144753759050894426200065451501628415477521405487862719508590906
-8342026934212011048128231645702815266555959471653323962526192450377377432253217447538860983839942343996469379287531744331673799
-6119650763732836889688973448048471041648065382987440098529987344461076331072134069257926150018448979279801859696456939951283072
-3364756734455969829310248048507921203362218977909063710162344883654504743601191459570909322659994691353369156210663856657262211
-1878353636597017372001364702577584897453891661198546393569651046602221858825228640216854117340540870937305588763063713204215566
-7246416818039080901692045886943289879346943533530756863194707455582283075691686089441132581902594229725501704594144338085541945
-8508829844172609725721048474190455937918008659794137613216237230265268215971845365542440688734702896182248548131537748110574617
-9749837159931616345230389269791318525672049015765330922830030005687071010042562156668767526231766645728311230400611546831340883
-1042438692813477410787838927504883371438184111986343392632454033632895691282059130126453347410816312739668264804223203706756562
-6361009275683200524885847104957823290376975509915625274519396770442677593644815139040216252662268629183385844801360269251220612
-2229763646114181877287927118379174699532585850694835097303121614336315830870465640665166803477820913104310061050902102789844598
-0133060603914382154852269620976632642294770629603193082836985616373167078617561223317446714275063351779922957184196466970884767
-5219496051735919324804049698971068904312201333312370591154056704186542719979874616042547422134608890139798422893654424476506469
-5309445174646633737921041425428020908437429638540244462052129439971214228921839562115695079069371301404828066341916732725724068
-1929599109824380789046935363381838679112048207357698712063450869013602851026654755608800829647182811384855047709407638244169874
-8711156655539521674331213489806723157012020673218852893220562275184063123762927470825532953422135931696172529627131694897868313
-9146092529763359061139625016856546857269473202244951373230403084240273596615596144680054956193346943461881907308435567570589732
-4427806006379233157431109769793014446131865605460452718401487086503103098553754737499082181376863362004474070049162679495304786
-9908319411586467759323529251895892937674894302534759585448543523471481019079407250526711177578259561097423457479183321229451626
-1131371780154610377491766557592293428206914537775417828678921143427727968850975607814254333398412178045797967112746828184963972
-7463947060005178881443883529993444944563705484864960478232839522887114302507061077267547873033859704180182478601068253214443547
-6363654733262110562720880713693267188885990129857236073837004378034866347649760844198517835526780984480422568814264124396245788
-7422184144089713717140409869475766686474514248637954570906655127051840364408955207306296810118720773449322716315645914875117890
-0847277505961582786741295462154437342373825998662718119420520873688904858163025326891259732777158377960920534957757187301680750
-7127332835591365255818677928303920688285753363566564622227243735455708574607542891965353908456436608550001451776173990862992161
-3829054399301597187964270168808949938169540225900414534726047012413120885338161369990845308813286961059592718025627205221770817
-8092148297686870086401035932812080011392424084497972356658952923082172309746025699168011915919281009722984056602687718337362402
-3027398748877048907651150695381083835937725004446873842854430149618594741819924214123640276762016797602129360641044263480412772
-3710143070992584709931252199044234825397803955966283897640299886246679348943101389030142066287790993761176511866201467864299707
-8525777612726675246376342834401281272453399310074719106459898269090225065025922311415205451670630902470074176854745326883762644
-8262544278833799829033118364917993352082125138925496717970983928091600634758984244372250880458595883955890831596406628913521186
-6897853799297275638235876552327431216883341950745982036695977282177864189708565950522537254131161076036929940837531981536512451
-3213748658129585636531039879081929302798794268346651462737129452506002968774313717689240477017446831448952135158407313634350442
-2055874845167569647361541785365745319937172123917988776868257061731415878495755011208403654576322652419771761741735204486134128
-1873586980474608471307789365974467503495691071252149719435658541818854563735190343177059527503193288117651496365565656653307241
-4168177432498780914163093904219938645313613562804544457122557236850377399062589146156364240794704626265205228184552480787389528
-6002548119488363978641919486071068284491204688921592270835983882131004647117906646204653024128798598225163921424999116659512574
-2157407327085931030684434640191280950835140906873052295703366686157391470840100604628128222870118102675339834080247719766902753
-9516075696286688385617312294770633537786940805769023218236327039881513937432194699645278901401806327344576080861704678059497048
-6871189362548323056223946109945917378776965980493422695153032621053464957232674797346887230723234348508681395275248458966927875
-9336780663866116286377027773514857490216582712388958421219481975628619943979311778012113187699153459212550397452631591800634557
-1884225357321516913996913776484184458840279457439252830670922733976854064570789902403772321837879511792814698370553104269506613
-4608342183802630938543364752477985342180204673563980704638103829760160093636516325877632052705116775395863314477370432360214625
-3293602222611238360052445923968119215574068058661794694301159396049393023879006675439325347420522015724464971518661959121953285
-8043528468318108109054413534510021714964009352370382732039845180887830146914560592175998791412497342760924247174793888155615218
-9953136600515251517270114445026178472065320103271749951560132315486968402879259134348096557033081980214662985678737805295776016
-2082425869735558279582276249486763021868424618618158613101945224876744522204200404218768513612549469324132911065247448884834161
-2715300790048270780472694746992029478410340286154036701148546125752257415749783382221561686531788228065371707859970836437758369
-6586934570724918966767618089617174929582836792685611937969070528242452974277966964414407164887044841543253218406757856518905749
-6701113102105341541135759678684819193668388121785636742894877294681466156143067331027856246686661690573758062813040020779144644
-8573371736029851148801112116958518768083768805313811181481300256743484459392633904102235738743377368774016975057841718194084994
-0319902874585606893329741100525933056084182554392753427931707044407179198386674603799910970919558297811591565044725137884178871
-3211448717893811033719443147078575334620516368575812396883003880411447512133976398395409888756416803178312866623025053382610669
-4561353382089346913344316837392847914820218419836561651969690056195804908190155708078402986544580149409461279682788447362287221
-6541324108089851136771616890125941444979071358059045831564141967544312392874032082755961068514362364886944531733042486972382351
-1947537457345366294923388536623305727166280503481566200274732091551547741549840732121496504900782994752246247415294786133670139
-2790662270964346469038082957923935596601670431239525874522807293008957620170868585946546458722568195100218646703049798761457890
-7207291855021167963306163201383620528292099344156171536132565162121580753163039591601562538194503052311054883261440201088776719
-7081508994123346370534091387062163390235318525916429277771533969354167555829004274478142845946719915110847480617275074050516329
-3008933084371763781228021375479207498806120584984898188493731541257384657224732160257247009445015469067201744844463068899016846
-3400853085115213814503196501389761175483359326430453738990669485692964833263969136641748087708764716019323095274097377414065683
-3262060508094820191682139681063256834961825192399541866597766579614721818676700322392895466758698832928065782064894903472978312
-9760920512587884215163543988536526156574865982745337953096380337326849623081010538502752692990846114093305595114511445577198415
-4534258782640418619628264506406504403447005968106774436451122846867047076694261073542029684272737494317052196031968617018760037
-0005723042928179923030772189645554654702738582913437716383318676665447081003973531059059732707456286646505439805283337167567513
-6867755898727425848664558154624878031288945357600827739272457697556698844756274091214882872082839937589030308224565293706216309
-3727537228724168866963116807318580861851195574160478712150379828696545006021644250770529425526279645439265900826286791538135930
-3153997389799559939607422587882124977791743840140703583207584629133167628782910497529520542920062933572958127405711490497737856
-9067474435390875739488758031979945416769209293461704806750415570467527973320692921500611307072408238071671039355350126215323195
-3397087786775809367683818985726713074834263187298828458889483102002512283284602983872325517586754239568315454503146853407356331
-1156217453455804570907455838506537271360924924818686966590633031323668379608702859282734283827376245634390166587981939981633250
-3412106433453184147582934702569648764561354607002098617356742259624760387826342970038831595863063739528564750876654025034114351
-9541719290749487737141992118412804491779799111981476193385533300689670528815189491502637221085072487226634588032661043056759668
-2892064967147629869694614423619676513067951679311770744515022309616589783655846699918308471661872732172650395986258940991120106
-5144184865919978928920815222171229181997238748998964019938552954342118630154574987629428918689878418879411760377091395290416344
-6885105521575830610256425097707534533542028808834255387318107287078639558846084308180272966744285679093270081574095013341117481
-0825712842225983699546990461215024477130525988490880256409773994103713908818390693122587907689102651005737105310805023272218302
-5661584786775396459681434880691492087318430940497979741425101788956553140338175653002561188152737818909816437963790481976018401
-2333796064755969606150287094100220527676969430567702969130345130599373183629780646448254004373148786027781444947828389799036231
-2370159800594514645060430450080996614777495906387714719376787944968432214762676658329959973122495250133837956302119421564977403
-8812738504000258149359611948440268119800977088619535948947126735318099451090706379617772423943777604512120621890539370786597632
-1363253012488373680482054568974446439190725621429231276569324135313694462859720454323916583978487818838914751980359776090418942
-5309412448985837938866251311974802939648013868273488976753659392241870912692861488024484868367836148433592247524575436350374927
-9969514974899115014452925807661936280550953879875740514792224284344537632692977097082883985126798768022555743127429841568583436
-9127480468310694537875735497900079126170848463529624094796935948030072227221587835070990509651876620138981087391650544865276910
-0663274772751898865701481848764433338510687274568588217413099134231887382122648096865873338497066278774094796953376828006000126
-2223991886894820013487780739895880221686260123953688255289857284508367990146047269272253817887508457566736245360372546074724620
-9022913659536358863270572069247332195356175380482645548420742634480093147625717187780842180713151897503373416116801897541549813
-0040126272697263557284035143648280938089213881029883862911870694532327995219687847437429389232425351493591671711796587562791256
-4017430425461987380494086228031466897556783584467938250558585791601061306591861372175583299944343371927286490389555179774602318
-7872955211264709896492762009841470583148357109101357998512705454425930076065324016499469004837167664624659717653859578461687235
-9667310959423600740682018043806968632350609113790915003388710593533872466670325086871976600837835610439552558719613595783702236
-5280944927395295859052540423240381366808883628148042644568662154130067762884915257137995873057791352572012021048384019627522811
-6995106927652578556591681036413486142384921333996800868230237202393167717311762878194321699747706337864446498735182883503516810
-4894127087101054059360113153040095596503789486674685811347198640008673703554343464924312512011781208631600506972544379180978661
-3653914862578195810106428140030210938175294156340298752901536901851573154592330206774109827394766622168822827213223926407598523
-1752287994131637967328932739154812431240663561508299992489581255396838237199970478414918524473397520840434054432691053868383392
-4475254299662836002489198880413157763837585826054191105485073144949660180125415108179810953128183235091235263489809711965370068
-5618413924400018858280428271296438533254641173714166471746748160577329614446433367969692047250196643164558060988866789634419083
-1976673569829377798715474066924169354140929130742194843186922903877261219583485904128878654906618865153383966440192899927641018
-8533161119710252096705226091491715680664590252842043928311396400578644885931777054299394359376613317844464091496561469756448904
-8685184190096699452877940339075889148354699442923532123110999704074604303853725375307368452619373244845552599196580274471194639
-9829578543429362536437207266353476212156141077734490396691958840205815483098775874456262295189398128556239354143693110486242701
-9970409655619169147931181826146996933740442172396548865369872311637351974239103479278809874040155159335694067867509786798916993
-8934739229131395268686186934227620999682967502345755750450754377980375485746895673108969778424574385778481433357869228670933712
-6403853140387575318798294898252560753364466868740386419346298915926350400035543680556378607221479519818692502368546406996064171
-1053081251212324305626596587814428006013451031378599825941680949090154726066128761151070261252589982556578267160212779194125716
-2889755089191961889036525987804900491217472837363091046321293846058934856253393138783914577483067599584740608242898988136077107
-3871240659195668412257855781781704566864660291767024614816347476774763467463583115867939922590382680508695307915014840948963808
-2822134512303137695995007841922537885648949227095598324952993245073100048846948118672641286579492473549786447729014913418849577
-7115799710686817026544023974604506965289044028358314166807497671714007777434113787389629694840769613243261303424414900494011898
-7392257640112536311638754807439431161718219269700164766558394503991923942217206220355994391249150834799995352874004008637120732
-1738169836253384974782709569139552429502554327170357536474522232448622509720551967534903770682965229229310748674655279819812001
-1013488426299593714852536878758330763717657950972685023529624029812092380027913386862035092137102088651474613519196497838916967
-2365712331332348797178741500614741133803176085015200716152828860157706088237891249512432828832383523202673780925247731837609823
-8343543339820274706718254393402391405027365642281414672601521735599554959777377014041823630157212633295524276413560148004499161
-6041268421639300061742794731401962219148955309257726102832738599350862047986714418077392903665425072627420761149419742624568473
-5903163798089327161860705456299199357142261228683379549747158444438483324626130181126533716219751215937033507622299908730009529
-0388816251038799487192843352437014500990877413652618253793690269472286848421450299377527429839922951807455986611893857644960410
-6747097789593097432933016398117542211434597285816625911203020562919342940284869769635598001370921459163969583961849156409633978
-6058253598655377264266980145151402530578841715801191174134703632064724433621375404185347776838645447066321662228541280092856110
-8706460045506764337863851824656889505997963004840404222919355019179623835893581428684583324979366713626899343900308968866457307
-7217115588869155277775561876870949020701337732105962145058144137569073157203270186719489063643062743100706189008644101702506879
-2134117466607949382162669449831544904500037626615605917490932121868589822502449721652777432598078974018800021624932345792700743
-8772537472143251033025302537735317107162425743475413816038506301465925279856675607449722802889718409431120703912286958510209941
-4868004080038983558128526716248086993854257004538122139718459319434617070817759239833696965506062568522567601751636677225399970
-5772707421791629107161650375371738241195109244751411366251362152446624847548801413381446956815082676765934768156267696685640257
-3337783332137332131442737895629161974159375156476294489620941247396447219121871778030180022268049183913926389862808328015747496
-2718665162373177306261228085712460052227574664675638031209424855973371465310593845908878207798419801473033533102851536608498988
-8594650062259102571664509669089099570629940328720500583665382040942904077679708565306833479512196713193874213822763114277561821
-7763922398020531727099680865423760176807414153322182938644853758445162559723450312367220101572741122819976006288279862925391533
-0609418074163954317311535425632639460543917210847556877142776065667429208580080239400632276304974925905306867007809952150307911
-6324798067968629831501975773028726696101515750158909358262168518496428350181893495977033603403728917956907772455104980623840611
-3585603421384321409739580272281986370246357840985885096013164036482124665391931947880815558360671475167152552411643258730493458
-6674212278514790724079384829207583320586965949581600859999150201711417012504831581096750857003895316139028753798041233239967350
-0724838602272073110730847467620546382405164306488489590470927625949743749910925230346070277479842393578994351426637786933239473
-9758486324598916254826474547605389356962763994905059896268073096288839687527478615702716618454224618511400537520151578922366430
-0912492025822760544865884599694514920137845684369437041888556762598262707248611887100015044910247510922363893211117566916277207
-4970896832680655065722060515676245073680441413700428191825160119923053062012241474629435368642857468208602093702394160800952368
-0401643954061460061469538963715677841733067884978557675498904356226239814257513498478706711931106662782912959490144875688684392
-6427801429230014330280067244320390813250002494116054667882575684276220510978170909405937360209445943389405620264406898441269151
-4513961131947927648793953864754056606418638015682203461287515973198501950396575668694970608763112445843545620657603445132209084
-5756001157040952762796856519600056686459818285012859365932754153307811718432937457957972840218047257233193928872388202493970468
-5745171294650962698731398420701143198082563097452816181021021324846599968746630383827244381072653879098831871344995918422668994
-3440697357810684087609635992103602934958412129332726402190737073092334237927797275626663021730679412659760103153021222137031354
-2561873488408007135940986273685629006346887762950502897998328704241551747655409051903344700915847431066705228403387636950645457
-6677547618819900422307650673816956131536670246263056210725538571359966918216630406962626983531012334568659195035619701341684239
-2420112802529724475156900639848021386946999992189525298915178531829794178899375316321752347503745229384277622075513609101448077
-0978966580118766906719339709431650123507257526495690738543102142511117335171869720713914484644191091368983835287599510980274549
-7253035688826486175835885694607345249760996565501754434755643707038772708239856393717371875268895624588946691881982666455004955
-1229157575767360965832607989363181678043448764770403987112238108580504462888836301106969202711436540526584606392030520555629817
-4303800215068042550679859587110369621335305905151798020996167677493237088394878180209234115765088470219122388293468346691575131
-7160108019683761926270404198160152789263213718306724711634865022789627807005870451606075994736870542860235641292939358601690892
-1281304446363067443221484815128597038007892955460785907630142069752866701460026126386319238710932447939095864553352289508365136
-0314065667002957866858488765937097697311458242916562733459459218151551894102884025238852720369894804551004088501646041028776937
-6071040163745909418176019453877965601147459065352750105116872007917183143758403418504559900007858465882670700927317278238845262
-2057864431401330101261675645065867887669270980722933655585800822914522258771084932227437807465603988558837727049424395413086192
-0838403065062402417019069366493917705353727605973078124319419683057212743574597310780151384502291168595626908520023754345467963
-5237595147390251950945857498093768496867490339391087595954081288707206848402637964670896124834883491892023218043300933428536303
-9038575918527245239784697127935511565993493329345587370301152888215360283868124687096008034911588337723498130857892917083893566
-4326309213195337889918560482484162052931169753291241688638438611871045719430309380350737659700684663483713556511824284273648934
-4109675537859830665204217999322330504340383531423575355281348688917399955785319877102842092110480808916641344634371327017518067
-5976571379562477291805315122658077767583602698526304594638663614898936945525476463455648126285604724437435096863798048639029149
-6805684460338235182637901097297785029718931952225347991353757161498388530429639352729227333463916470311358261242265252454882149
-3713554069757475756235174202220726685159145970448234073615786797869189321230621988473892723703610057245772568034893831333824268
-6384329807418457095553971699330059290079181553384702995369891469896964859336812164228972258241580918221240870171611342340166996
-4238496467737330476039022845048701321182330582443048269767680094107459509184801830653831569366411726902088279531793681281083241
-1389317145760821195180078109186551396173257466092123382087137757380977821227017398905747777928583603397479220222412134551964141
-4172433396133877482307354312025003410197620920424049031355359918529883398507939057731022302176139038905017200234464598134643926
-3776455852500808911518410528880591214453698534859661007977301367112639128608957724121376845610991533136565527742397972171004531
-2169236758277228509207094221732914621136016542832442557119974462763405873279434363734315812872035133971702886820591857401769365
-0469858184126033613406108887661308724723319896168974862654713098974773391394034562612379275030863451007736429954454094411166680
-6170337864185847270755623945219598905895923685556701346236877669819713556924060508835912462997027984549870490684576221788467996
-2684567926478205893568909529013411584469062508988939792621227026970772272619563307265559984083650571137624804538833124458965412
-1535835911469765914801129303385752847166878267150358870063623206823946840223186885612380869419340578863726545596738437580294661
-1159345796279619020659424502037780228138063084481952522217422192474814460650570150288813492963026126513178935693001157815213888
-4115255308469968312956667592729481570942886979872098274544235236610800153069537830562688683755471055934166523033112817689423559
-9188936491751459321231439471707842349428821745374698747871010980962280880750506886802895843191246598782044554283344177438872823
-8347722755763795357915434510354216096329858917788023158970394599943300789945002208151468416849121549451743359325575523192943247
-0386458822265636778073946364464754663546374429692132747455551460488109624863176490317455770854516391720009905789081791014745242
-5441057113825577288143510443291415701276478572336349873718556812697918623782132025707841689574266907977935843620901112527314879
-0138974051576176017602134330816942995720273624834286549509110307443436271222852721817459586302582019304440451903755250893098006
-8714580715983710618302573323538613568787984646210126690769977327196476888780472811559022322326994280966501214045283109750894159
-1238724204438864658817267118920298143255297575901621515081809762078906592560699017605054545611366055292052387838303773046414151
-2117880548683675747162798543936995265803158300313026522266732130084089973850929862579530307924250791678839458713648131052866542
-8688866589649054666206289287368847639201089110726068276561807440633436849032550737263946103998593920752309241137169715090564726
-7992366978913349109203408811669845313806318145335482602504586472079577960741456598112230859758567892658655917499886892820156294
-9269289344377943028314943737975747440225464454099585770665233191895455121597963497469457088101021828673050970000696324467074275
-2620213720505096912466481021388401048520027588680889621938076715558063059090115474427731634806419367474059903683493740456083416
-0419258099585668206386510983923399175364308512576355916179825772896253917529784626455469847416203745543857585138629447495124687
-4926957394763419387802807256844093371043881188012601196274750577103452141865582262123425456983325248975618318937642166941469448
-7745531482212763608085822252151342022701776876422939982991937310338710298056659311711100694774221511805463875602371671771107991
-7622297042918195524581284988624821755976081656742322232878212092814401063399047757727446586120047765852193643525978220488403806
-7694553355731009082341963145016321622315287166497298675517840848325124707270827181601834343475566034855078916693975601380159131
-5691081048224248376219969516692299552551684485812747394911625377626308622713328149116932634160209525550974738125918251287523859
-0467965216958213222976523551707473542482226303543330237484038813545187688169900375790194437313184877958505335015185533760569003
-9313388170020500404223350587859029392425277844920011385363704844190916888907282100497715918895587428711392085764058004531043856
-4805593106127448601646584342013400666164278454947086863410933724954207481882298946080783397578430480735942749099815836074939980
-5829488935963766897295398693976065473334615080031996490066697080972996155867227149556928263586779745098746381741955988476480256
-5145688238158921108920160861540066499070337742408273263858244236306539277333029376512623358171655471201632148566471544471879593
-9921214229435926996318797357630113668084683534980450540625624914828693276400997437801995497337699991160179152196384869788686202
-5452970283364847951628816855350106161884215992345914720345452469417460755112437907196741570679787585797744951997013243245883760
-5291067302501955637725509930308800308821879902449540996764882569862895237545484938003965194362900224359317192536398128214213941
-6161982577027434530385173942460521391267875161999821213546453369930955209737128453903802184733420666743600784696394324963677611
-7259796660195828763104609417030954701404550411856256961919298349416990278446333820166279192694569999689157318159650815071786127
-1409252775006780923895660512761218733793242701073753044161926851887250329246949307610371367921483913476091276544943910212219648
-2024883815854805620725646102396569531338296559295702755514936293184048845778213281077499032309766928238274933799920207837132838
-8210747670883127249029109720500900846638073842072735692712299242482036224417598293305373767651397688387681839834164347629159924
-6849912340362293051521285112884702937904971535989594393302698489020568178389718625627324020502329354706893589619173731210032692
-7043789553739208010357759707009160597258827438739048435319844873364203025319025627611147486361041079291073784131340379802864271
-5630517567000455573262321447961724157507366377593234074637396775521413915860857523966422306759381837353927621547514858375348648
-3907374620037626404876010563369584978900791842626728009855287567645993864184962785602670934980414501849977057712840353440946698
-4146385141059123870591051497280881668008298341992956096236493101498703482256305064373982480667690632647788868461225656591267014
-1968850563894509480587740368883124473858275653505054105229249423142559298770511499954927552803754424222038587228379761857441343
-3593066522032907759239532950409720855609763959255411331452747381650146615224156577229227092417969990679672022642682488460230666
-4777284684581020086703554379926122352924845140673649610422757744893763657846499512591483929572896919893136740342514388775709356
-3278001195584405224574340518455727489287475412287946187833805383833415237459010850315390550944653852931708140442412147400013062
-4193626826135963841422031213601650476649922753686929704940497664287967482680127644394472418039840709944058706759350270065888771
-0496707764123239353916969348556102234417341754509205481354601177831190831135133718891421262586922485229955848858284322651713550
-2364211115463126546765721277139380044647678205497997698025656179147544409871931320460204274120159204240964415234469912669043171
-8252385686403049790333736390573303996823129984313927885511658858105668489196273816414521496403236288238282761677474764476093781
-1249545053006377773498004690990118213356171931577992909398589918937522320753583797192061779831406344206481621920250152295078939
-3709843278222111715104072968292537550135689257500851260250849491755576197121702408117922267107801447424437466479647604658838505
-9854374828488017805142065771759506637983062326803172669751646781389776006196509659848336558123328010610366919010236885546271093
-4449279473317813512456203547757437510023295240020059908269371826627596476653671730054696042131496333128833416321765418914320719
-3406255777740484368806154865989716577772954696365667763046622581695081667791363935783289021366520297269972594689838903064379670
-3971992965532938884360604600128828768832371480402617473079458005449743185395881312301575878592825423836990732749119210579499565
-4964414428994770524920627355735483099389790803639808833122768311697123316450497548024460387672711368021069867385676748771138907
-7272947208705814863061836555172890754692453812368615959884812383294177521377885043762530023437311935454983526848574910569784985
-9715236460972266941105456775641088939352379849288420663874812734503948765928906653066695278788734445614220395365589281481052985
-2219149571492569121653088856413977750911860290899252411873082297287513781665034941515671551141663335672214686872998009233611673
-3252445083210515790502427230581525204628936179674886617751355536540130374691771589975236704266655393863956951833668294842751553
-1066643170812591610511115847160870442604844517253754311969780356590045310298592533473063715395834561034249527692096332630663031
-6094678693574789972643719059293336351890222699519292906160704354339193005774875964485745420773135852897610846364640226020416376
-0078821325017540745977661794444919031229533952549930041702337654768594140134838827623154832919375367293846998623573154781662214
-7359805369711475680734455906157477769170543397898162106347663466476684547058977605857152935135397794083854436364067424905370520
-9053319467618246985715935346228519691376765059011804822695041370567668817595587435020117179808441224160004516561911764361051760
-5279785887324494559284533174001913906340668600486179364934683183133265522486775587610826495582037876134991475823478304604306409
-3941979376926208894324337577802341103192284179207690346815460983649049917703085665853453770292030524017689837132097566609313622
-0874696648882529341619751279943169854047021416531564941329234495433297775450795376776860235960754121606226960482122943806912723
-4403142549129181418798689888112583174439363438245360666469436690361242515845002333293117928704700704567851599171947638983428803
-3086178172887575667595570158882926151846562563832038255451988723965663322118638716096644911129577785347672668155756960077259260
-7016060211620447349613366392265953857687262706207804671997611538526738050334785125634177152240160503249217159499633364839660140
-5489512175142718110444335510020717260552562939322469369407097546446468340557730058147393474938996409762845800786386613781180803
-5316893398694618358236834304108186582233111640280225864142166804368748966281116139163914774116490280764125236118841244780654205
-7528194334785274348270807743401184076977359005808989097790847628594537909545137710117536079654129720175240043680499382931315617
-9670385576675265565821666921824539041489513174876467496206200652157451658908879498586135223489695875901066307973744711118179562
-9293554881752014067237144247792025493783429506129044867060712220683356640982811741139549073541449462843252209357539966735713385
-4766042719100373229390546845449462827735583320023428894346366740071025652090167656518273656932135482003817661060458673642777968
-6301526335239349282461856549816100522037177673330915447520746670914149246304276129215650553527297720437502141660843474787824161
-8981954968443818080133345527259601739419841565729583936192031325311804839597158161812415269217752774138988523259895019553556494
-1375817110090726843596408461202879175175450080051006863993971804570798947994555625585878024069026053117840656838335462247825434
-2951238989342425774096587516368372195370856662387116086488893532196578602234813604266303300411633704142608233959411992656817117
-1078366109359744038481314864313226318060249081213275603047710120330297564750748020015170091244280923403487005151336327967793644
-2590644710984063836471814396137903631095128763841800600303330827770204519245855428525596893191150792386804495821205935562805056
-7587927489845850917488079723623306056569190541982982580007185500509384196528055437763768159799054085157690272308144066104571631
-2716691447638059359782976991714931875589838509515317643963169052633209626064370311932621633892908726622398410656122098501462508
-2187341550744516068766043103052788709422923668066123030675357066234501008353745371362353282261896383609682551818558419836467474
-6386821883063127753430057004971408049021180273353275003607608462963509731380707112452702494852068512020333193164120541304971821
-6414619855917522699462290111082170337250489881403447602549155371621815281167692543542521085921503446688385053019234090686216914
-1514251753750908058132963706101498627247758343884090328099690893144318542740931341743091728225255850843917610568152776796003007
-0586747600603620622562637108763020672642036425806055677095355709416205188154703219135342081900691181922293308472380603914641966
-6943882703466448671671347942866066071729197097929636191832480851465967168936588557508460013143074231989501890259153468168582090
-5106944931177904690443492972535629421878279108027478056702348421231814228319595001969285380236108675594104178148223368821682505
-1013423077468134180344202453328649263556597230333389978398486618230751510288831048067335293062077986298410020248356624260186784
-9609742549854821633067526470397698241682366743287992123678759953855431672859515457048320102063982700799641338555460645670603233
-7227510683690963888209842085118318517866633639207568611885740247627869030070367221673493120062595703412511430540635725690733531
-4166904720216643652362019185541125336279973971095473810174484610634739482031555699998920445667293351815342116856019765913024721
-0204685598907595748165591866024787377707833163733227729761204199756529370097242687722444149797918578951904826714174399654373078
-0029695243252514591043935308120948291772608227171634548103690625246068887952914933102467669452782090604646361027594958463008648
-0606043910237689889945195721316745105694059044358961433889516172023390307325162841023925000976730946622777686367139699337140288
-6532770425227279669614506342121365572660042996371513972011473090716295756052824631404973053818570282987235859556502147507091296
-5784383703297394066201455976072965897350946662861440804630035111722516300582625065762906422553404492330383168345359661866546635
-7755352359361297136322168309187217709956128684689901207140385336402261861792474715981622821266358097679527860080999492143093132
-1766368206837633471921145548103904997241216165904015409300725066451342178028580494490424756975699571333186681161146526160888637
-6435676017243653308531673583521916536301571057843651379516536378840317706213255198563089909258098489728121633860286779010828363
-4431604721944445862183599288814310892377084499055111017374193726585680550914726436314439993180521094601524845475777232173548652
-8838913044786662722923315829866963645973025803566829523066407753524509752981118743428995908031509623037684132020735808440759714
-6831533201518779101708294838185079163952906812726056828622166710833228863087344104415454342957894082410432960146722394394312810
-0026750412265305432804678135281250107474394107101163961158631241381326874456825116424953228542574854725058161235809819422717951
-0530095666016377728309821374273950714947770494099333703734720428753672558560341529622248519497385032763976784920070775745998492
-9988103492323582802831123529566020729884479858348071107686123450154590877464099472518837056085048970237891379355375854402767816
-5730632914573233372640655739395224654373166501801926999740491530052469701082483441902155873112176686047852502749353152358488650
-2570177044053910045946498496953083595646140791798652856797075918041625426521730745013108556438270557756261535076617672897082024
-8070822196216776547306746987791806776779912117872036753101249436897151550298686891155685227497724326515850755173992122017730073
-8834834453446142095731369167693716173639921382555584546233080228430284169771661090869805523170856183199180807458939980812347666
-3374034628848110181967055896853894757362330956181597331342944383294532319770922905892283292682026888125967189041997170645906930
-2816796708896328193169753615809284330192400628212014852560752820595983573685822703155361815716715825780349446395688288981323009
-7068534005360767613192042797492589713014221879034298952445175191916602695770589539510033643533276163270684273301159972772079846
-0851847960381648176955810985408204753982844887706344041815181406997985867444440863020286602964269777581948956459433973575818007
-7244153065545137632239977736639101263396745129055793110973443976621943425823784182900120559207556057714294191011934647831514642
-6220112071917364308442903062123692544853904143920646475613405698807838684964691297033599042267911174717943845099876701146499041
-1997737579617455507368079950355247973464185824287192636611840482334933626092039322468638416062106707636638684831343949569888001
-9056473674062962705649948566947590595122246493016055906506275120659977645801864949778640366697230510631836906881678697914437413
-9851293934933351435860731679561845700615460829332071112719063019501427379839759911846192375852475742108532990355637732868083608
-1981670764831163220456625777162284911174669042984422665330847096514572430663915704539930674009046717718308791910081803605092076
-1436167228645743999726495063433059497403336540806399989879727825522625780324646087140141119024144101040594738802339934675234494
-4511331339256646611464785947970006064997210981736418145964184001849876673693526718038480153571548117761471182638795979792615062
-1795579829237064976093578272496505322533909223281608272636931019121795380635442871500788593701642237770643966129586714071750006
-2259558543726883196265093171148297545202455060457641437680621020678468079454735539167389894892674876922877875836968284903103240
-5190322659532635977759442475453937445078305277952610411039017125942798503797185204729242079034555967093953206391753749025286545
-3346586896166410527904055884469771043579999692960199777847808583456813215611676699557144873569764821207184084966272170201919310
-8492812746065013433267691323002027533207826063607337577540310499920611687417123621076705455447051576454279273880574231655581484
-7963980271743134112154087260650334248257065896933807620141668762775373128572470229135441642876072741306062133796013873900656717
-7155588355012012778870617504567123068873574015355543463865010611682540901252618661459039457810933495173848721472502301449759789
-6250342428228956319030041026630301654869718238658413832351916020529083012909954188736775565330222063260635143292678318707172682
-6306362489099506339243174369018743275045301435603437084640257826344578993743886263071878533536813315686531934206065891475930962
-7256078764576049009416184871748648772794832357694303718710674780587401830972226331756569564368514137449167545781329158975242668
-5137011302637382277771122596368810380574982751431852882121643844964841634725254405565914232138014950212916177841984286676442765
-0130766950573613943351861223297588274240988343477886895038747758639966388317215304568124673651393253970716618528199527580176531
-6359126988671940758748887099156058290162393017636744749307547677028026325587696225823070273928497980385751428178855356190336058
-1262747164602205208071416052898259778064629199619315166088744120423992672210748461774575909144208599043872184758764391922991513
-1637777143251220955861291729128344859755814246044289400356284088474702731048933137147907743901585132956196475715784684303014662
-2779656199507816022148661387875419531355613321583333187996164541556836852609250800638246651009398874732599973734012124894691052
-7354320128684821812105410562348993616339745664287363950112497961551242247169256027249678322546929448755022227225938009677843721
-8972855810687812606653074585753478301824708270260970161604946179349054120962204468271996990113102973342165999101606421899608935
-2427496334389700886512192278170872300796174251105207296701976843139085003204747190192754643836301630137058164840301068688355227
-3959418860712955101125551436177454788270598656333682307048221492143694319890230219738438292220497263359673419823698673057872078
-3013408623490314068776627587135426768753482653895410991590323095157887499728772798489129923069618646593123822639438579269538635
-1908216328408109211109195709992731650405613610224189255235529994289098765621895894667201782074632616819297670322225038809119550
-0817943537763128333901984566290468707429051150902489063403888015248830107015875323502758058360302496764604163625874755344905059
-7334562477121670573355518606105354751505482715112941146764597746549856497547302376364513456936736713783904762299121613461158516
-5283407076162674672773440443861453333470684691925760891504089347363035836279580135355221825821573398468104182485287843330909617
-7205284306122028970211792875328746564733992888131805747056055043004240391649557442465694153748887961289838987106491544764907052
-2500872325568857502281229098611844366313487869502518915819858430987626410127129066096878146872919622682973073559229804271266907
-8295782206872660046903141337058447164373782585028140797785111578071196136068281762757693333793450310851105370333208052458896958
-1725889330426145518489875923548346134621897254499345669060138933732620752098808224545684009099318550221718273960774029508377011
-6086360263760539829227685105382480409473035021789956560069988221518928563686053953426925951987832850158619577369793062706768043
-4352919017742582830329403068368693550555003865896903349651288061511525716234272382256062983241592888339539171693959034050993111
-7316775446918119981332285689855871890517757525471516688406003916733927585058269512316355228173253797483394637476145877140830653
-4449523419101039158408708904430347733804700552814623747680680614331040890499889250979677397459532347731846180044631683772954511
-8775927277284478472403620186389038850970249719140155845452372844321949705137084066166954690611328982193781479003940799798395822
-7036309001309751772232372080817838422988947200353430157955341599997125428100524596360021893214442902724490483771053395386266905
-2526553722458751882973801186174660169500936459737553375965211051557068305755252365586897544315025598670454207459745656417390706
-2637149880243542713228217652476736046313897745886197441813742086881967480415661410956495847064049122729695529600136287474175290
-1793795271658672504903869428016853432949018555098626397052181786382888682206907544219009649133780351002110388824693692103301828
-1084255129975610497399774428514444229695501619744314654316691842636967058501657387850037557822192693461604997872810120193484078
-1690635325513958119210187262311486075808664902577687177132226261921963946973671413085629761815694454894584772804358916692902290
-8584983060051303667121308176671074873807110361225378981139031261855126176018462516372607208578426174357538994152717337719252523
-4278036428830763724403099207458044021754910574858908048715320547117712294990028756794510860977637952837840922253254728458600984
-7883825345262132475931206135018623229949112586397174487649066363051114417355320278795734783658869193239014023523778761960029033
-8695026444117478979408146585926902316341504795145288358653821833800650855569985787340203101735816503203866669795526287437002033
-0245051742430260486282155254132179648064481192529358125651323989892545661828432074084630060930677773108561342125212783387281955
-1156534912244337917835348237158665382209292463641851049571853921423174805869049378131731211644957860891749912005458383867541676
-5778772564492822262562399502030821202632651082331648596186198421567114506013473886361019711381249854838415342169443696628858178
-4018937636066081000726527827443126701548588875106206226537909295887328559668190334839725133746234608966652449462868965060152769
-8173777546154775498367210355738304841393638757271541666703324260466614672029573295838066643359099243819511379078208545782984277
-3894531584135582441443997552974471433572355979512626259310899921004753808626563585592085956971397408889173848312206978387162122
-4249778224435541775834672279093907849532605623442929414275448734738794025759189569362602709330104719867391830325898742293638318
-5618458472230917207115381643121156657396683440299320861523898119230249426608095966989749077626813445096806473183743262392826169
-5141443017081978141752639960290174384446691905687453519079674615609648441987212131402698830771368709970102768419122745998384912
-2946562140012561122001343127839838295167741172616748608003211961781629115805578417306196780198449660660896672943032048541196007
-3488478058250138575080356458275864826075120035949332139371412714212223138848322951784969631050003335580101622399775487873990978
-4317860282593236100733831872685638869277432762005042347567404549772458118340256499688632865717895145858533810557576307974444603
-1928173630042126038543686101259940626688530747112695018229893249219604395612728537717051374474126617790845613836004135628746556
-6994181584676204860202674587876078621483635083475446039294576324194007589602377577833162510613729896861820149258590200450670657
-9591153201889299370958865743889668888080847094554165557463441635078117012681280739489741681606506751718013927402701136203548044
-1780167360508315641369667116901861812842526826720765686979668702075706357523197794146674984683061754983908320058757429657215020
-4621260027453785113729584439569855185620374311773708057945213037359358758689719104605870656508325190409944963614795797144191442
-6611412529823091494357371703456481103154272600004279607488151916951301067639113190114505272247774489140541745738078452548556834
-8106748866753253878302577929999224844368660368702977874939897082451513356653811013795048262545973632043664542271741351318143337
-0778069182951962287178555694626059563658908945272131830094793792647180018850962827338479100883010796179956428416377824203799082
-9473023880877077477396337686061036427727779399244945597262198872743579391652952681609513942805826872165303709494805916573728492
-6294092277154179951451094865452721844277717466377028709711650186357899779470166784063622634966195721705046717157464710442807466
-5804785796886616339545161571917895816310538794711393196665470438339980915686578699904466139950097093535760550147855823745768311
-4727439998296384114816286463820007469707513836075275400610242782096499770391027100262738743742494025582717951675320717526395925
-5770688225429387772370873623458820190254941682623110262393319797303540835367273621810830554446149103975368995431078077876936297
-2405529175616664747550451981407708416427503988134127731468009719622521436517602196339409678849267725633683568413854707742239684
-1747116986005191343502956460687122356601160408668274191052227378815062922961362392926820216609198684542476134407735883221896780
-2662260497987146574078784874203657867733135048405416920171958838688884627100473968981627006284094098910015991752992842055879818
-7034398681569535649106832499610645350629642323049347631261095876814181084980886779188444300173631359422796869708950194760718387
-6836733703618557086120703365229061728453720426186389529699692510071571231710123347703658534972106524417884249218380254553097325
-9819799847270574690752534052463450597318916271469886310284525865231260264874522733678980911253701800076986898602579299994595517
-9135488779985085378045629972341159746040904128068784460666062698063117787215014912137720162075250475265414449002077183911431414
-9809851736195297213683107966811862847637535801414773082875296684360754325074703853487298740359726050853338447561139214515571992
-1029599022890794387902179784268370369360935567144903247409435981421651841889958031240517172069175107596477581973881408689860362
-7400367259185579353010164869469689488102231791643828135531761198096403804156803391787688285965553218505121457658933398225058406
-5220283029470788325194233641742163486977117357701064964101876499830666046451739488161844284719262317454589282938926798508893597
-4856368375624850629404156042966360434746200563963426632219247842217835149470275034357811087591708435161482657165228727592100816
-6253772836778061529203496032750827006398455227451857109564867169437129073006140463432201664058302222335982176666409479667581160
-2936456922664809261586171438046311878472513284135606095783748274074803411461233988794425470611010249655925624921046206975885663
-7903340067868061097623144373319704434575514501755821812557204930865063397777392798291309341112700415633886191910088310537801960
-5573481392684970852911664492959855735295070104374454536083712417507044706607037494482191236686504544140731669546789850452790174
-0904993356742978486159542255719565213826027717277534463338027027906360296595539148861118855418724089346480767402189286985762676
-1005223076106599446960454896515318564456413560395537757983458843931854126284677517864393826744115625918435152244510791809692478
-2164405990650873094086602365842140190819719314893955030230888932507331906676191911961689961891255808931785984896260979975690681
-3253727014960636085246150995307788585817654532411113862158610700251523142672098671368947509829930523262641611496136611155754050
-5927873322526687970315921879739844277763573086829985560339421326548635360045717801382027508629836290928584431149151932663653210
-4760858192547745555268997678117732829237567270192822266668837972286266876280740550930386549524048812443132805094528566843643923
-0552200604353097511107833851418517885398565041104987050582967853637644070929822812409158588536557876274185029987107810161351297
-8488557995995493390642962339468082402922946581115285486581085810242830297673687274512734725802547502660334048415579446341045330
-5709356062023991965872528242196958896198910586431524813751700975464715731688842846588438403790663597080684309160359805580967928
-1809180118084899386382440090650505696513340627765123157216132637785703218992306349927445013022757227491085193637218705876572392
-0750092974015461540416097560544979024242793468547428554110331500932107320102022511854661891492261408877458706999860502548130498
-6089719190070430700600786193146021409101280174362984471307624705342744373049193769815102419864609660529369826990237068799451547
-9880823550824400406858764215681272127616403736552454898294728046365136835488231881807123019108941139138735003722461424915329488
-7529037321181887616470646776506017170053425836736636947752180676382271801340633168596956291990586642144447067879824547939050775
-0702265125795249993652978449111254341598591409462513412644706330823597010310419837016366205284525093508925291114478065520543206
-2486005489914656200352331842636430195667576175939710807407359823751196926836356542172998603833007594132689750457318477364742581
-7540614426291493245957654051180243018629278083258315716499682711339148507426602166172200768552170520220563426401305349960660512
-2404338617929580850851496148983728094122155851959629735499313721174625488662780908166750428714979229469660586277142190041914098
-2734970584167413642829413555542927092036718157943315563661250374551603827984602155759774285156429894221533968500275418633637182
-6560220052859607041833971976550951076186294969188109531953615241005064465315852535875503380591519469842863315620903120851882868
-4362109461838990069490474891539380133820330011017862518437725479693309451782697543824505868730424985500423739583859994419014638
-5084805381905175100929792755321577290419383142651436157340596535511027236705949268189435276570853108955493181266234603455114274
-8408563281709145363110504396918026400160693545535873614031123523353385515760396989543124701606521301192906747319853776998158894
-2312458699599599230972023213413420672303278131983854442962403875724144311681960596932014490316204359247402654596736629024793653
-9839221740989926513947745565345687824749236841443758276831531279631822480088615812410461505184335496692743570654981097859767887
-0148513962240941032376953093608164659349988907238073209903158402845914764726830224719377417036845150993399330628686012123441747
-5919614485617148484720530134538022911021657584302803306902527053421247675384565988567910916387370777305148589468626006026739483
-7159664152823325316769176118475149162428707398939203649766531576459678350978394525441052205823105345184421463902500121849981000
-8288659993085551546441461743163304405139009826361143974328223331967419739647241073571212327801960556484524118468883764120169524
-2246338306775029095975369446186770386599660011384020498379465046982275031718873753405808637548601707969197710675661519594764281
-9599700671171430778834023658375047244787074487357323294015535711745803913257607799601446000833932736200689998469969708376723008
-5081943791810860552689101511523648202214658112058332928346393590013555144813066914194030280115978731407804149764646197662984115
-8801177359464553557557965020150275317953374369713023241680758235462889780964894972416089799047047809594791811478533742030190073
-0665429844750818754679057503636454736605371676903157540119156106676570191787583727649819947468340786574584101743147082806534991
-3657977605543416424987117022654696293608374996078959363230667155054631271871981115488592293902083994811357408917297410729122498
-1862650934481731910956432936712254764601612734362801048040108459535230079759939514256093409449391542317896091270323008227781776
-6653398313274972684240408723778161592189390653041468423088421653090661249171357282254451145484842067919237970412388771640682294
-4059821256052393643115972017853583376641290368154419793622859038067932722073228138326697082834080833163668963795873824307443161
-4885945116785653293180979216652517189039102100870721593874386070396567484340764036310998065513336640289679790609291581823883333
-3428604720660372157112193405611757297738411485553283296939642822708738180393410023516446689646065368009275111140421244624003704
-5562960052258931350563961074454414104687746794788022658055770332756970270739126216170694306943534685894930524814764997593650416
-3008384543733504706776478261526614225467564069116098586935957253917385357687398588155803265872788670839186222042335779464643037
-3618994828725096012458832876031499829184389279845891008599618731986280732307102787004526300770299430819579608003697211024173693
-9217086377524454012913218100708405723232921242597498783314818967648121936298190307693812351239182876627690699979858904402641018
-6156985750875948360548164905855940506817600324843389599811157633619677210306664432514278405659673075559217581592839918628085400
-4764772987507938088705673246656764726283775492007659316410580014942504090614797117731679264296150069410102991752421283871178501
-9088021494611622294962362961658529846402973311983387998125910749644155422299932240783260368601058914444067830424352644504379196
-7142168355025888186137900382975205885091374237093915396552747486547739152007548268368634296637427030850473757422944218387854757
-7616183325502874293153395715965826837360328123096242771948215374071981140320994435687149135694129364024023152186261051421982087
-2832792230789485819847349814552874874835409931161612591863141976920380812857719621635320076324767599038119716738981834869773741
-2754959867605262800904073710237512445047870616662855713005574347858126481109562377143573312098011061313182520482126994274243272
-5944572495216446034342198294744331850728989442478427239279385418283344155306850003896073771784045248648249808863649089110085745
-4935039678346741118281854023639235666178336524231495974905785711915838245296715638301791203620715851604930385744033263165263809
-7601373980902035512868636064609722029939023536705525076519976556652492714730630698715244783359777077548960439099573621098774644
-6788103237769355632318040401274560065924878241545893694505228598734431875252964572555463844283713282670737691866931493869606535
-0416187164312031460323292595651046052380878338516759425813027437945468646970166296000101963391062426079829338723963248745406623
-0923089990664161924027191610177696764629811421643542437939862866986835556859764272302075103487218202328441244550298063164681875
-2019867260237068480077811032787819165579411546914115220954604696377168121100888419574969311251245311564544879246746582842436916
-6868613732260412990938531237301911324073055318005385120355972354500615925738636280898984348888758911483752216818128353784893125
-4877207978980281193491650735689287510067435635758992016711009033554062927257985428856499572775171602494384045603122508003854191
-5729531014485818371423575856151555802439384687195667542811436864469460636476071341511650757925855405897036006697261458329928553
-5460991959983883494783035364470651652782232918135295761659407906592669701830570881217510435070790362298581095301898060905173789
-7646351028988526172675924552809872541181626761125500157109077472362508995981523449708391893239705562284235588614429905027555758
-1619134181392874715654091932556140391724453901036282239744719175838602787922700433547863998561669814541630538374359332841359124
-0642132589359772875036014752032306706353508991088875094683831897858049315214902256977825841683325136398731544129046064024590934
-8005838235188541103906355513876550842936138467720245485620712847710339766152168792765762537490548824247757795430623230546063661
-1739498737086961685166983125262113774813358028871712079307291894391835363168962025939984050181882718770421839433587670806624476
-4755044069459609604971745446900378189205860081010611662569670882836262612421135453240273781870602310532514360568130085933991129
-7924290416111768289187834903766663006016528601174525638099383915633909474617753311810491476284105443999724682875652267118724896
-5850681695306617855936614324554272763867627188224507120915540200480120428647332751636414058742508052557803594703673781795569627
-5161939368398633733681924028671740682293310854421624725144685852406527972897380355105818239535806432392343196805358469063293155
-8819559114109771559602841216196553885494830284200973490048941610619985614867118986891106961906280843338752508763555675909702206
-6241566490588598271025864796744098875607062200785043619624462705052447512034382219094774621478633751781359662848610200184361678
-8704633729839925740538038689681271982506814499991016892558765319948519205733093865854380442216165127136281006009985719211033451
-5874590475603382790640233559612673482775953839089864470737210616394894296028059828241641608622138456309335058488482647911816483
-8528577480552717173959823507749229677977069134280953275629509898562844929982109573639706635205828305920402590508711781395835713
-0089930344552012906619817966789113931607542416094931145768127062728799915073397115668423507229674038044945322045301649766598530
-0236619236986319774758924493517372212562285619369190213778360087721105343106507409406716723533090029620699768530871602210981580
-4900295631035231554608058112293217835929574133906243363911069130644679986177379278388410792340109628431007635443781281483062060
-4988368133324357435318270787600078029431686121284484541827394881261897104701243599451161363480613963194743733844807088688115634
-5178871803932196297861340370803170767481272576611956494376594793113965439245117335478620700378039639755713637510132362926267306
-1973846871626730910248052978143950536530975380151232887509932339881071793647054810578672393058114957563604971882394961817835491
-8978209292630747251522017252062343300917165930874691119490642832557026684811610939173618238354559097444010525631775837097840951
-8326182506155413337881369137900095820346248710691175947937982923048432643166491650906416257503450243786283464120124419550826667
-6090914463028322098876359782808759824243499333411218847428154348072847658504046701534863522297418259623151406625685618209367317
-4253745664431692653592530190665547218310374995530293912340336697232683775175851639464892393461388136647485464789810252552522056
-9182156878387604674503124667923684369744370052287701241975705851689429509464670883347575783846313229293967680582071694204051095
-3321006971958449910630372247668837211034782309154572655303854890011708581736868651280877351904031869989741999700057554577154390
-1273067298313752548096207203603148138418750927315375729523637857281549085842436944573932481003443446922848528006413314412427332
-1441821872672191871420138772481289303458305298682170739045298765824678050356023853590500427850176428627107627730008396343350473
-1052326101498218606100898713263447573551827490516947668567656571319040829379674136592743558516074455124317265474909140902458087
-7834541971992916704455016525869622512851276565353916338983507230882585013003793323808346566693345857527479053033593116284574877
-6838252895614149905894777313466208709968773989472894570857815422084908815232548928189324969136065895039808122393702760781384523
-2929303794620328740393974372454877708805842222813897741603177439187185228877406834374147233014054610369299556729412885884560745
-4370856078387921623155622787671852014805409807299060561419288539719819906697663945124473843579383816264514077377269614977581685
-3394601383138607507974293429184042736065549935759370359893007688911547744095191909676349245026886870781533913476330551278360831
-5351259816322765307961191402595778339300322026355376338266384698585109900534462235764152505801492032987502080039176402011160649
-6015860540766825761905783450339596728965747988413885573654798343784315606643443103943694670901175274103478596479365688106195479
-9733596316022892971509096088392032363480840038385290255713310540683102401152243848292964926264212842555582110823197263253672828
-1062515708221923559386659794495097841198809034454364525085442636233669203446069926961726048176600711294973993391741061849180079
-9806127623797585819585111237146636415904332057123217989550966977692535517011996512651123910136604576120833852264076101548649068
-0894752723723477938861483316019471992063859736335516787664755140329957520633060255798252299793172160680450787189861312439796670
-3913142052442456614486902320774033281367626065329089488796925098543116615817296515061149179999137691128957532263158924327442783
-4918858536678070436088759702284980929577025191565900433342638171236644159755504144947154030057873677997786393398810399270491800
-8872734106335380929798217774610094691386997739307412068494969134661496618521118209935954632189343140189392135323738890270473225
-1245647673515237131109490917571703008777281273557596852732435015863930630266628924061119974383584899927931767742330245961719796
-6852379757973100072309834676038484260260899346508201154263890305770366822928200041404900931901074539015449894481478124870846606
-5288592940348602075775045536917167753748198797428454287343716300518081003013742004598309648467119358078992444950790157070897622
-6178224434793312241397484872165819485491096197408141733026367177440768594738187232231600889719889461459739097869779145699996070
-2192775687835295828387187709692569714086691619295450894879843196267448458847228413092057333128571855124524447189613776196209305
-6242914540023653075456224110675459930237745861318742551814072907467664681202170417286866153184100097311858010110265935844444511
-5209497239417620919469741474768380931492201661270471587341653498268177621359803201248700031595849957309397980724999380306103922
-0556894331856087053327675958304000445533946185075415894264871473185811965493131424842414390488954096468377128994425485984798739
-0196159676818515225003292466076872625799134390488404188280002687542570342770954127173812843410476595231005479765885421327808255
-2605242865388848411850848235973559236245406311003883744452617685164124063273300160172061005325886640047067612731170493761853684
-3723865217540793835273126631505051186346898929963194134815240955269409964826180214819749886514216356192979128714223656587784030
-1612652380049586827710856241890765244152817303616193799144244842589626119110544403111366867458976947676427002814778923808924618
-3631721504060950588384351554676808360758437911729833313655406741373502411393332262640744499827573245395519111703225362606878417
-1363409383247041202382518900846037480203513170344097014906470642027432914804792692599759592956926861572014354287205548305433650
-9938363167455625445680112095072694438021204263665499289036436205115409602435745285690360330318532747799997172095972559600945294
-3849224957526742255789376070484796163223388025899309472042686406132560940455845848040737742829859477224469824421878404438255777
-9153640594267832855398773722288983227094747426234571630063269545219291207342356377829705537624593717193629488670483397161337722
-4742683466675948276596206085950351177248268507712030644980189541847011659976997997291786802803131893537147312873666734632318013
-0962031832358588577470495716330583413563622072795533159442347186921867618325791765612531566938977664106322136330634216330706485
-3562792846227123177501866289549655646263423972314841727623087546398961182987448990222751356418413165373556965561892665216006475
-0506481362115739578595809306613922949438046074388531145186498774188751322860892046433870735773039483261252104554347599292426213
-6629076659887419139215806756640799939588104500582964705062365481405718348479866775939471858338157222844571173771380330117254323
-9427611277124624517129218643055712610406848999072749557192128496185603527876575966140152280783898310639896801498077008734557576
-4949349263979842274642964286301282439502057095606102606822710846752651420038445554041921101778203644249576817202379962365236644
-9000537778793090403522534841735088671708809700351632320108127651758914457761194719832533167517277944390073544087779452376879039
-2179620974987315833763764525622394287879156162214632089232065378247731638836108414730685627306496030775755582279275263164338314
-9850178620109230660864047257606734366763600031327072575073099542439779650618140023637464021494877439885488556217335419454669846
-7274436451730146692806124202594474275423757115268107978580315116832524063995327727093500514697813597360878942124695394787220781
-8077050800020141873083229149343719418506939350096709806686454834234546620350690053797423042331890117409969910833834635664137578
-4222569085314829230694422189066171115029353200770994620763730497186499678980036529016196644500138184587387164123266827728301061
-9140763168998745887384781477877234025340780171338591152461030018239430263211801503428946233869503372300942372235304400820946852
-8437399467538616927457301639250511729312614497619431195080809960619969552298634956256648869707957943168309430154835637684617202
-9927888920815679261894236713565064562156846670872463967287481642034739020192858148286147625951137420641797396365115772980951219
-3655403238951645285818609634851118279549531888817205406539748497770277166060720853420241694457643803188820531391415953932633187
-8096429698574955422724412934129163958768439154851606366794537099440778504483170647334793461803467077456150095540043989710581777
-2365201968161103470136827409580883843970089911974172408580391996075540014445987053836291636308746569551411995558157351658739831
-6950345059892537018933018077820506883809089865363951638996552650340293111131388149509355326175519823347067351884531383182623006
-9729692983578755541105852708900437725294440871971817004794137742625651321002377622365955498287088740364399525852759257372235252
-4593851734614428386795483124618557640086184414899615960895693770722697765927766996280493365204591488466719654529288305662919475
-0122479598904859751605583470001521191650223688479671370454989314043303051942287523649808609527628133476925823025842389422672084
-3056608819600468295745423499468437706122458751753728982506585826980159252966514250379765257256312249132321573973154317443215255
-1261003464887189939919598811711885508553376196973665253914113359871227784508364309872766800569364687529405313394507842277777341
-3335595614255964343357224505993110214988297629416503148121404268247459966936550735839779347369294370575468296662036041463516505
-7279136021331762991558929156754763672783232261635376259854674650491435829901582103560659803340084857348232939069746185793481086
-7001312755863777334623418958360382433258119385097977803059882470820602915102809159265450380632894446941317444541503087066649605
-8796169740654134032665098260784549928283316353597416172219489498769356834724310846396610790766934291348253075369200618334478026
-8802831163686839169667839421840117736653893219551959966388948111069365662007487678001136916755953605936920644573768537311349838
-9739545132806507773311726139940569054566559814706558048797461242055138311352937387308888484537481230253759123043684421386096698
-0953084370435253065135920609321712138864781756707944630525539032264477854921495176982483322151742604869890730064964430072465893
-8563889642871990807691809483723365775240608384031148556634799934500723149755352447233079304887498827996963939978814660785015524
-4422068594927829463105462477608520539620307156466022889708603842952278355035865136962605151617935839688034493508879959012432457
-1797597440197984699879058451944014171742351115567915351330880426124733117964473476818687526048324044778050824433512831279314278
-3544880014006914530017330247894174199038635755809673971423695196336512713364189925640866570283506889971990951009729565756092473
-7989020444450139152190142450813270776908916050703362005761467814560672206433992898775383186508883181569920382329721780736328572
-5963607248916565843748383716251646836534350100847190837736559193434644723784998135363197913246364668420334826697708573880522965
-3263484959293045146013061177283236124170085863131765193651484251463844732711431227375764646336930721004123585223994485289918901
-0583029668150873954157367992526151571563606918837234329358185868795166989340614129979830550547132857672143145949742222265113600
-7440572366306644814358767338023644569585694763643144805041668167574800647065193962831865616870056333413559981420227280146948103
-7295355536699420073390947523011459995035076225978883439577116325646324872851036992256964558891639573786018094493982547872559135
-7129457262838894246866292831053823350947068553550051302734533231301531811721807950765452389323781067242015285235015915373253500
-7003661686534989695171145431734885832337556123063280208162395256598378269110597151277334587048349487450140097618803853206266757
-9082217774055830430004211027285925285344275476747121049534781396260863522010542259349559050699781590339007899734612452403479287
-3191667292995301649109040619271406402727834137378627737752393244791408796163577067403946973388491815614922007647090321324522320
-2949712664738909367012483650928320008049914477514031653686312257788502415066119921871956279807885221949190218605724017500310920
-3169525625766817202209440542641629818384859195018848363928308881901815336912072399651202491194626625193357131514851165636605801
-7255316665553834762495164950088245569336300767957000036188227515262775800565384194139225891768802813443198621045801692291233140
-2574872647913296219947966169138393924496399035916640976364671914696565353222749621284958305509352891507065537978150518314618840
-1953749417768878991833661315137426428652077503145679920658786397955780176167247358992933014357557538701378753423037285649046608
-4668877807427263578702242652781568611601647436182495270690516771196062145719412914253392449657363828299691513193636571040444936
-6886803557429783411232920271165325523458164084362409904470754437138270784982746722601116409545759719688367256037780110379647023
-2300356518881462544550334413932731049376257074071686920169237332025867743966470152553906187385400688773328478685498436856277618
-3440412356699057087611095963196908710039931495043446625996426055839433344899946522222609944936452224313579344290272586318016202
-8993953982184479368753437594218699447584551919428710623167603425460525558734552005471227418138809891695708393142992004433396157
-1641364290874900167201473644758505077028954784718448987507776152112958786620272578580374033281627136838108776465262593788494546
-7335791534524477898748563122556395894974284747735359153516999217809354333772921832279669823385048414976444462237355621384907691
-2772845418405555209223672772048928810050444241654554863085813477997024445507615114437302354148041362541497074784257678291599777
-7178588655224708624898385615582303156928858845044700179599109039474166324676359828675085010955238472718587302252391630153958817
-7714350463980300266933000010667914572625520828229727411680133017980270989103849220980928606661613727680746076907445089175447948
-8959804988970943750240542329725780454835670277149205665534383835852603494258686925800889072070906952377561912949333090450610435
-9127584427822125708186685340454898072189100248623017561567872674357247419856515640720894591586135918230623264124957308938825903
-8565660274882658423962595807578322116479785809616786494557353542161430392650520437776730973491703217016387298185714704526578560
-9055899627055835280579204790473134990779700561942294557075688923514759353053304752653692669704340622777026507467115119994712711
-6401990429555126633982558874714554382951718476795179895512968275571839503381782370343773457772170386412634133151122279458473043
-0293309378136412704813380987793756861154395548470319616928895806731980671468030021029452883570696897386186564749939824907170573
-1417717547255789991707004411151265689787923836241613415526707758612724058279277154586299713815047231145490533591839466123670638
-8468716387126244026336620863493031193083664955579994896168486675960587844522828676215258682659462698160621004514607084416783102
-1449640886898263771104309544234611139764719954279503593908340282487665393419611852384397377672021450701130079538845214864162053
-8048887383017701836654298226594900075026630240187365178333016065699848058831083230977644940244574444820285738121188435273257549
-7734838976170306869973081121181660448148530318134255364556117593964696552501147168845028313551613495459270535042160362667658266
-1546639029308273692114824601121738207436726090786353640928151613146720401120659236951025944213817893334993036938357931276755092
-3794363877794105698247622335925064622343924657500773158672876932260234127197098205417204884907008074223982761704004122962430390
-2332227732674259579606138447783556533770663844706548255581644643545209413054398521429945056259218551425238380035190336407512204
-2377559578117061565563176922758264522313042429970112963159461355099505172026291216364090521544160711259708331105724128544891227
-6832428920554567726830569490691102432470549042227057932067103955101428247157515420358182404777567376342028775513115385366928419
-4241634693879583625259038169292585038330173637743744110426172931636984875802849325805759410994995655688205543970012859415471525
-4435409455307673255925091284402380740900794676435449835586381572908519616958395334196299914509777009013685912584824599000928046
-3987500940366892833785739644668889848240740024168650731790637517228616861342434915208852629849188021280517196274460956387434019
-9025408507685643206458885320228075047871187183125968258455419735129168110055303698970042275578099161589116560991845557669784646
-3366934559408606275260397226783303207383085083713447307195484607017198247596814686470103165356557218941037264416211493596219700
-9986983198296827970312097410216841561044999906047830934706495494099795173682393665158233220314878778675703926172446242051213291
-7327936388263057744394340969867975674336916032235104437222484250956772949755115175068343392125983148796915268153189466560134516
-4505129238068974615562203042384229709458199180125982048735704933556566236123385106774238252165050271569657572461570289000767894
-3255121682739504137653843468184029546420570010142268916658213975683507187608005044348538495082520951103601067607492368878206287
-4806852545996927533787451480123813559737763425204966730971472301392243492249231539770928832609537982396509758149828504617903683
-3852759316339548366895421554002413138488562983328873969801625973328318967409411308340716647240522981188392227872470754156065273
-9712297766053304902554018245083167928441148337025924749085910105658941917341095233228980927774840543348243226033787592995988515
-5229452832882947701986160360761878773430032426431930521890318903440689202842760168592576826646125537090631410703061420763990796
-9492775501530308620829606600311339640855706549659904872171618766544922435708097161505981598338090549562866490651446857290681656
-1678808597459616937537502211249586561665053229525645425138896011542471614595178170509581277828163045626690556829964393718215591
-7053324203154477437019031580603162546890080238913915157646559489429803976541625693989468806549155901365763128179885048681463067
-8903137465669354155616857417689085085205927330249024040964205952230818210265737328326102255377329508350857922236822007786665553
-2734904576394968648887628638128862963608976988414917192020797115239688653336018428937106985737003652208275177709699892675605393
-2387808386702882349280874532643852585858561738093225119093657885192947905905747402618285721157837466909047447734685099503267111
-4222155360968520550560237616569205752212233789555461181069785768415048417477169723562149137809030351670058489971512620085540222
-4298243051299268952240909211177826836030583513734437502197104884602882464340255753900393068054947046141922743129752936688868680
-1061375462364377985228292590232948700810225069864185759076897910654198361668411325978825417457852278989472721657536588031658991
-3940469338205826791620626804680412258933163753767218044848985297248760060861868407223928680948167632232230076213403901155993516
-4300489987649264460199719443525675282990880539122997731272161031062934060033770185574543151609533413639501738216215062848675971
-2177118188977585453528133388279985990921229278769939253605657684059131396416486258985713207176129279519783451725740599907936598
-5468202247459866994978249422059052436184697608003427416719037990135361500297493876720017894883453685240892163318994013086288251
-0775391987748089844439257445352687468561143051750745275017026626096588861151466861293340177217020485953364933966278607508804835
-1628141832107584076506487704333155316297016420320945282094351104594402285535278391969212402643994113779520387919087141691462578
-4568389047366302665905669107740203378971862242851210284195394536420153604497510004787197852478898999690840962496286253318550921
-5915870003274717803413556085627698745281531034825477926175968946204463905051355885851004345422507537344854894128229093755738123
-3106488353902440267975241920861283331388536648597182081274348906670754514090626662608509624737135193693712779860188833406087992
-7845555194352577902505815561879589158643398041086893321684441920278495085775044919835855368307051779503838399479822915036806084
-1432352323824143885623247262050454612927281487774810795510104248803405617391180050263987964438216016361064912733157137057008420
-8930414578064185485247400714821333921221435324501439994244285682760117301820424406392510602828280562393052749013520039103061655
-3173670884438194788166911165081056822054430147218290866655074231005149200684080014396687574505239932587314443974144267617007284
-1527450743968461168931869720925121234258369083166801029927251949358618661922498099466741377608784560458426370545741910023312926
-3234042028371733121222497619662259149254047701278276017559926645765011785573767542697475259020390524937117767929011666715323342
-4704564242794556338739787095791826301668604024597313082723259898622680965079684337190731792129157208207454560161440807617595099
-0586578102694447320030978034126807967366576180034644346378206991116172450484663474175770472979363179024738326934451423318607575
-6711140559239053730606360957739329179929007703740765446432207582934464258439308670322228705839599858462219965901802441668368441
-8135099406701400995240439771871466473527799329781080913941715241663698683730014850012873125772974693072458542177139084387995864
-6568179602365017697198231075678811557245910639538778108917663715366214082022315024791477373317009595760696873073681125441512291
-7907116539452577187506381898980888332568593365733396512784485641208492339371509014105839017197673863709466309379039960962534849
-4750829188061091962181509528044851805549096285740983094887975885868844208625379458016822827359147295255429793714493083753502809
-7458122759750053134279494636824383187336514214679539541415555708799139748870593845560799552363619897719534116667792275265497323
-5164505983084622666859401822913429103147582979952129213026773147211467590148787858747588041796556975884830210299871356341343674
-3017622046748766474496658478936400050960631692047289817971683454103138868538745678486924385845403439475522996310311537377432294
-4414433427221551082351019813726625491301604743637648323980649889708459225496111765515476857080238229389480546313915805440388154
-7128048414711368158025433805098117535633079017719775105234085215317610434688668866637527464933292899758107458405969861125706230
-3650863400245738680980130673926472854780296246906056457846071189797804208159343552552140320987399388241880735463419185645329289
-3725491818789741913366698889863185159632846810598378698135320769928269090296785595628838126516727088490704926873118733305049981
-1156989564178115063843077403158558596361694573121010738084003904783088187504126348616809589260761446819325657369704310082822306
-3039078554378698516122693013852039986103065748081512292985255853944982748397274910996825923066426171066912792454508578589756672
-1894849971820554276778681262205130604407309897326530536792905116831412406644096303796353324894146354102174288891383230945427806
-6519430441043631674771677332934701069341868125297788424647970576482950339536231483156528606063230103167532910086072700422834732
-5003294909621810744051481544451641763277370208048653102677095428677725528287642449117886584959778219864346164599848968697364087
-6751096317004399279893854072583230132666460132819591435600170059086840170914605351655306551416965997517899522960511150518237562
-5960953398400790636904166620422410033200069198453455057858306095484024517953196610901762809189095112424175853725058162186086849
-2378590573214575182954920757796313474094094261522041549359071498710995391605164191319908953433331128043052410209542459403183882
-6967512166626834760387377091334566417667045028443096775043889705526174743033818006933449908412813794430186357687977532151972724
-6459437209781961727829502811704779207375810741393525593812033931653583330049048561114949732748301604240502210577065589268424394
-5485945220569893838677587873427380906709988368671130490257845675526326075411511740051320570135507392241324306058959038656611327
-9867804575762976412063217986099462524791020332282964702449941371619543236717809914141667173375719858685004628965511347280443141
-2110798992334306839358051076527899985588107686694616660268331099137978416904137377280100977825535315137051402200610861241845328
-0363449860601942956031660094586702469467050513998615147930502263169980700379643465968570908871332692146680759419252634341789329
-4178175171299653546801324512595807182660716928201014996433033979566075147588628538125142107342090640143892070802843256418010103
-0456138779092213905930697158012877976499848878257289818896704580464918962127445564050766970246810568260512090191166877529968532
-5482828669997339487166576516726609979104834674845622909875424783106655102257236764736990686408975204793086071837965911886835119
-0267535380044835507754251971519271244598217325940244403179333727723642934577686643739339224195755654907218801997476469074206459
-0065138464529181013506268966674037435955704351830301533242369638335168171139259359713958529701206344946001165594755646272160394
-9247709545287060822576712084519151900147438436096859182537437687606226004692040127414633767616557761740535046385163645108196795
-3057714321815816843173779617852754091940306380163712243160807705160943819438940855547343479788687898931661575785126108832716960
-9533193667848378687611829528479562728893899352573352696025950207316753012731502558223567081292045437196069989946207141541601008
-2746003049129497733856902406986044430147897422219852413496236136281848127325893646312380454532608491203709112537348345922832907
-5956088319437370932773128721138395583820924421370173711672367829016504396575639303752597289231640106298414733655039838766441635
-6180360982212734271044173784836239476693843516863507994881855803639383910953492384867775507310386199169825014966152355545690080
-3474612962133776522839849256217894365224998226219581308883384099107152737580490415337430321380267679764659802341675603080689884
-8385214883553973286697705130178868327520836907858212929553123995458539418552809580075802670275820221517432874193060009661810485
-7635870550202301972338809565930908660230248958179738819097744222123891965883613360999839391218647211336772299291193850385713932
-0223196991899819000674224598203238140866873922543961390070945675722542943959098310960399662895718004978803705167927661114684329
-1353039351866220611077365279049149758286033094828313328435837478853295648033377121231092341833142961745552118705722131187887027
-0630837254454720024736805497864487627874608261900388501662821043624883721807437900259240409899471051510920617085099514167842832
-1988240186121860008928979530309334258534723646976027619874403865209331775508112215956780097468860667994721263707215073620406836
-6148969112241707992551262221756342003961909547272415999992255159101022681539848421608837594935060720460495066842999521680449846
-3457737254497423194650056810264127963010085423288394333781451846227050135758357730754076741230565869445804248143832527389323252
-9790762908682747953438433738621860423268309500095630988326150834401786630708761812852217486714179905608190957461442085387864531
-1522476382145618120242675473759696978079648715587754580423057134915914494338656294472760447616089310947302406703031809581038470
-0171535968526973835184507085581755238300981407341777890096801351412273999921818828858705625413157216884807494772810429053662454
-8619996360469711195123911341155232797961140155492488752604043466908848244534955186766472286479836154777737654804742176595782417
-0442287907416054215425872961111123258314536732740500399960690027024024360050777203631279476105577959878524421999307563248792796
-5348313098484066077132466864776966488466415145151104355092278471837179740560502130988667962911672913331290100002597980514807384
-6973148695771873711809347394667364106588642004523762177909283034839940053425839430616152779752491636974036365528618662576277264
-7738896628379276240988497456223829719984420682404133841162697625994660783140799400756439398245883415372300490612168611754778835
-2968155785628016494964773780830380372616577140688533547628672148913272007307142811840952334174750520152544790354169079912774158
-6160810488767205184519228782587106677087830138711937806611950216229418417002136640356986986424817853470899640679854298647927259
-7389645808720792658628388654675620007991152874617887911936239398213102595897949513877377839509375811277492184373982237380291082
-1922598786894089615133138929724905768857077536113336665514173213408958842847812824030198485744051056380839435865339196791176969
-2136038443877769241444454895223211664298720250012371885167260344691881420934862218782035849576910341176642258076960704001222187
-3619101830106431706477720342582912973276053324213930842322321478885278765764844239473581443510550046154371836075105045519367692
-6632620878175338782391713943229145276164648915620343082760668528508249819030769842115080099804055533615175586509178038716739002
-6375633941128896351976814553047937414266141967344986676911841486068926852092747499580940682140408121435982416523093436110154753
-3222139045759943847229548540511800241253979460730316619733573541964096618975921352811299052448712030457862855059140594007137487
-5542934473211875603591035637674955693033630753758706551752052733350020451305012112157194134893565133530552290159364523539238466
-9616750069420348886409611437053219761816707838644591613686536212537661191394262393089971240329521480448880783267163369576343597
-7663178436164222857814082876400941903973450706396969842174499622842764650335956819817450043712545807776915977745377365681672284
-2935635454175721831517097628434415466056776136240049950596242823574086540015840252558304179235526092054789562977490616481745276
-2672225222323108279006574534254983148801337991382313626787322270855974712894468368216489102586460739019744587910470428744488347
-4456074219727400675373619105257416175699861456100136151468602175897841754789156021282927447724373220233266891662271346817093855
-1945491471112632720796456775261728821202881302996527116048267476118823402662922873934255261349533307722895013671219044843545536
-3793064262773487395195026532854447589979023796935998929027789654646824047287035198327952786992674028615601422606183219879793442
-1630579923384492024946757118026605898057464509351571155868933384841116903091820066294965297665314366667361460313869589402652652
-5439801899827848778232404947415524928188533947410081530624338414230329436826968163987544645598294181482211511249572440955572589
-9020302797433585342712570197932059030880158484733343798115491391574065623327717092645488738835390428206014044345059915068656197
-6778633319862050630189473515487955936852231827578947650626369925629640725543661083890077620427798703103241551925751730707081567
-2865799458475868282589650599779702798567688820803000453419899694057649460056145012638522245118862822941880894081107383763766480
-9848357801406244621888791600769552120182014301160477310095737436308083268418063998275870777119923015945538580745005505737103338
-7945415897343252007659617183211493332054610541474762203740026194193724624943127621999433384183901217893204226254420212426063638
-7076158492133875552332779907935346207685056687613427451355599366014714317865416656614209291512293922523145859007589727797381122
-9946333250403836274494116934757202951674758307883028448572093526467181950556672615580772027423711017988838817957391185266051907
-2671612744740733351071730789204383122286756475831821553120581637533315869945628262846596800538216358815764391197830622296989405
-6992508792590965425974849365498446258624365117468171476061738700582645427331625361075430086525639161565604855405377972628830548
-1767000101633223839049666007882398066097691088797110243675124836228262533287561681535331091157763899063838214576189418367103407
-6457110670443987985620843280548984156731527065461755656723700576735027138342545097213504695717743645364185206786138748271882473
-1596890724976137980689991632152444686110535638170408866300049744279882252913535065665891060859035882361321345023887058337830307
-3373623078064203672049256820541947607511438489025503639693977760706696248117065715718091918113311545970967574977708709494235026
-3986923221612406956343410179388036231285096894778891156497956823154793926342464675477516471934158222112337889492119504249964378
-8383359661494890362436075780531143970408529612575647080037096675346333712031003814298042719987791032534165077846901212886629083
-1031714454907840175775311491859630739967098843327841882994334085317927475102526174618259645090436553276509976956833748682136561
-9064443423702201811261101290439334315411997283217810869669829733471939988609585312109817796812433049198581074521140984709783531
-1643172980645376942250431938106354165389537074459078140489244293256765030797030616074547245248075610258161012282504441637098927
-1963449744475973480042625489273145165780544076999525577661332442838969621507452441516783367746336168024894911875794707697541031
-7478540879501049129571343735300770536436533927260315165717247241849652331693508424305277324109605811185754598081962423629189840
-6683599827684293037220931133813347833193703737280727037200969748489983084498274135581120006138983726589125846483814619896382039
-1059986341689241962791022654106008362005402932907446471177268388894146241093638783546170660638544503679877547754823916693779241
-6066567318288101759879455792419222471083652734422111018558539534478864130071102091839803023165372816119391124984955696131849946
-6509143418752724874347225367749147359005862337831645120532349014908613153135844609402649987007336422813208143055617331460906483
-3354213199998376189921305928077126664201462525396049040175801721488556837349266500704234038852235700461088952452452884233498199
-4256488814582093977539133655050527294580364706253926894156976648375809383013472871520377935537449640402956782630405195205364082
-4477841383190587477839953144802218475017581377483593956131465077901385252056389226406917609350544701283827958845981175691165035
-9675317500791142255855936241556896374576355116352110763482014692288089584642987642868701466081788634493767773533747361856594926
-1789275548140948127853887574961649444778475578058016075475638253177323030087374164983465707068923303558558151943477905316462894
-6521653020185636533316557444077296865023590390333185648729621716717902230175881569862122737390334951189041533339830180227274093
-2241738740799072036341573074248811436322223477169424669409308388622966605065590062245566692647119962939155999944641570918974529
-1928105019305194521974392400885274260434232105024551451106931113484210411868649822559924165796213171984543031754090678126105970
-7223691850432923916423525460668413682740557862272946646859452084367199412001020057846809103738751744440123325432522452656213927
-3644451389904659220831784890291126628998096321970481352017638587386823902603865110497499248782547323024785254006989249949637036
-2368125490914853885015667449603549765164883918157991257417554348691174190395500642639268158971914968315411160008374937535704060
-2009275459811984599922767470947284560232970282990047819179940733002227635796160576632463265974978503386125557611307429312063703
-5284668210801338637743489600143584813073507148578726973558859500688227447435508050513188287747750741584385175252456997688110085
-3073679804770516059033436419747376347125944073396261678398209865762812539120718854779696622769273119321506920635555831381282691
-7090364017219499874566644997354338979508197792775841533060988865177458368657219876491035282278982441665265219245626731000939486
-0475155794230569303711742143247875808031690475413279208626652350784369479556492756708347931041817323940692567675398118277710202
-5987347394026084150071478790424131834854554229261815024383846088465079695373324503305612702444122591068763896541604539174335033
-4436269510455092220918525983424623113381645210225340601560482106077382634781965165780342556554085651205866195116920957396275838
-3995168889104032757269451494854524514321628575817645123299310077893411388042092201792884422861886303896708749182469953549119697
-4535001242830034769362884028681925364864771844433940737375296944979919237869503095436572944940055711115231301447509402025904715
-1800925216578304292056694261819970660613390371844516635237968892926502845404165792819051199273212724458326926182758338001776015
-5370775490948607047730587515100674887605918594533934598837391246334643161422435117919064366778561014958058716726561922586618810
-4628995498127197780734498354535034114170874670064085395510892816542000534421254922356138052258209965701576585535292854686090278
-3177671938008077658853731628156335766651218454783739782004804667103681002183460703859644141290605438413899770795832449230476552
-3025608055188815266778993615750176656164484757488579062995887277096944086284232725973634996318024169760316516668522315338538984
-6602875499695059755336245084768806035216324561236127708770615233130804510875618781547430556541215471796577953669434492812681721
-7882550875891690926234268000498082339514970368440072348061964280285302475222074394484586936518612822244399239424272459493452968
-5181563270479719492880854609815755784042683606603220498202601700410969538595041484423412424024708099469125521786037119075251369
-1248580037503075406711823500465872772309344548541150892813671393177549861436277865197182621221456420646870403987260426109411933
-8643731351640151069976036541617610531794845092323107755413601880551863223421905943669090586959614825141812500194544006658912658
-9742463384500880801343550699245637258131793581488832729126778269174701627529245091838528797596704702724365423027345604418154777
-1491976930735419986039574314558277854162840810698202905470921161004472351694186257157283632042119485754805929863758038770286999
-8776957710513013252382046879914405882388509080000643024892306629178763000752942096488188622280178608686752194263930907107345039
-7700223390484500013939160057722983340948636861897585123716556883603506625380447610584051517968188462287828774879778811063488262
-2795184513732482674790613434841545867779716565739406351364662664736206685645328526381352909903916053024580749353932896630696063
-4740510819037498201511535054658680017511924766740460699058893969064394902765714052038187304179100787141754044221407272788215435
-0593548885409678785621622325583756109305462458590848222639139506641697602853829884986982801690179238753218240401694408881886033
-7410128478642788707381845999570686789659413433178313527394929430353749262597920022866973734073910557598880611659693295671936482
-4050137980096982959463694663632299864309583041246448456720658864445243964035849113054975666938514766051492807225377478267946248
-9230953430893702870077668677812927912187053690817849571057339797969486866950088035191626753948056471063994773880460982770051756
-3412034824969056166032815703553100561028200933063775986905919463873509475321843375830242381162225467967586471609115452917543492
-2276619135566337663226716925555717587888015126203959605452287702197704113342129180746061351411545746680564903503675372305630554
-0286134594910134037086879568380122070111392862199290853114304309332761209262076794099989915249949904726721530928297666077629849
-4661032688517145326760870540723245614758880946406315180541283633369882854109153204199703802230512566561461752474068428161370873
-9985206963338598229560272298952476210547736996017303976951734650959079279082066159408637306110242916656383381032701493580216738
-5913923322753424774114001206375448829014685918194637698592895629614872898525330558761701771138709572823367430917528581806962699
-9424883011486160624035588850742276732199499002202807230209412116053419259700106808447590894864084149744926170960405759460241951
-0111713605391910548623870259046900302961074850779853822097709685279966809633918351283533571183917553534326378996150978977861347
-1050239621857569309671883851470643478606629045329299864518009651449122046063366124913574153087650803586812245327770871382994089
-7338464051366649209011968493386794592783056535912533194525947811637756396164788969037121048254365052840678648300844862166030403
-8244368111563457237764184604100489524090599993135317160344204589670504422777317128963386304474615794833181756194674508984426359
-6271679168658661069189900053139794326069244916803991726466041535821018909664293827288937825025439753702650278433431356713529954
-5346852690092871593686894605405997962260976572140748476453131018042391268683407218753909113662935434807662980531252367452071209
-0705634605741863631683627483540085543041836023190103343436641588904884705166081263630037435630150915106908441737355700766586129
-2154922713467232816471312647563953292047715226865590918846184574044421063130666383320555928376617359704955430293171097080231031
-6735370005980738361139146789749484206639522950848455336267649778629028940168072161013843975973729190308856690607301961044761977
-9897723534911105404785432577277586147477026587182509778621368216939584671433875920453602299697242616307976245807249371547062253
-3864808728722705732544842322660134226278752025136368637744919793216576700939583871247088670783610602247097814787263304145508390
-6389663947104499816842871432275844541634180937582381422116532840275365272420061136044394514594368541860114545782560162829849217
-6461508204689611076377900958964324912439197085219708917353896453831247651446957118893020342996847989755084869372230374673491989
-8433851389135866749479827490565035784654953912616746305746664585754447284795963325019971006496729330088735987747297399102902166
-1771497470275815103247219843409878702558703790756432271114114625912471360708464566558219993340028146304118900320024587821960404
-5976617030473732204037553918438169303047012033263099608437162902327180494837554619833899125897762143660304278719895133912883606
-7761343244919347585259429796353568917054332343654064758967248953925035366120514799510920191615767532119958355777106600079597516
-3095394058128591553990850297147880385815415033833458376807751479083131186229720635268920776120415936997418185983635572280182597
-6753076258298533536576760943150454522971260918131318703703785217592559654671733288977408306810194844570204346184368392179063403
-6769837756043399718259982003405678775173052005969429887545845745194588303371446514765027612890020128811539282517812340583382742
-1145447512453860943574015365970108349103036202936884373965378227317332374230149559079576915215507294569467043944303098203606050
-8331961563901986606916925958427127071602998579210529763507751756811409645017688889813292902535048662887095342609935463489041490
-9736668802244229960622339427799905563413901438749725163782080129777353814116461004513305940715905434522181472880934497720795747
-8089231465924779558459413345521275018800849869822143818873965081853887737597561843190118386215028657051186337416427295963183576
-5419828194392698210106536176184087551774670922454148544855468554475299499312061306599825835773673050247207685913286844665654322
-2029050617375681673334265164512497368276347055093268045529145666800867914194334235145959975127160210970603920222624846997715913
-3338289728310358326423356618856438897910927180875153967318427145237491006914876971227986916804404786999082347353908985698677388
-7003592673799641258705037230618030712653838166741113566125031462959628644295056269826492276245790120809269461415827782914919523
-7933808111352753578305022191116925704616734794703884497922451694274860316351759525772713769181944674741861315056661705956786856
-8984597543198443392303548683602615735750098545443867287028649374064105213301110278127297110019939173598045760404284726471910865
-7750264118815211285409646722851047280505065647360902845736489925465867330208651476223128001763893620074546763783343802324668030
-7948487261322735741590287466404743224701011374099821413313798593806289098955840277566381979282309078179393391191764372912784048
-2031963937573607333606298955675833689352959686316425308916957187087489102352532079680910868716368077096336327451835608150057007
-8744303746009770077282182559273953960324245388355803375849588763883535017206175431068707914836359928021715134879810455899706000
-5908433402194706392948327209167569206279605516036898586828659659699407482487006764800996251885333845684403771593097852947347762
-3484375963559500648211146100726353736952008101895174614070329067925003079219669004928157370633196400836866091467437872364498774
-2081484205640426298611707106538905461885148824043568864528394387116332857339440668358439402474410629912663441714724196706517933
-3644343088909312558175950443352757850056547896271926536743829402725583986356025290388997593791573353364649376090870755738159871
-3017618967565343354488657372318982952747583634309941675726567297969538505603943497976312767045820564276791044673865996984930840
-6755211147212352533715490737391598930938409102322563339784308800982635726297552669891177376792489264858203303571448544969284885
-7207413969560628720009738274631537646543552986672220301640499255496422838738773705028096119936179105477192211718065255929107570
-3952347918324244189239309810051132796520311457058379135751168560732193370931728585607246787585935133034431471433154073599431184
-5948122133173804973271249039138486246462418117000640467153032385374427588683813496957187641107568040808210363510174360369854945
-6331834561201934486343354906308493614367011264274134644391474781936706762560771237417922164625963715633624786284367782142544668
-7058988605827353891060874777352863740110376065711990117582066617633614262447752203022541270469488891576938820572417323582324874
-7650494373012942929901692837674976301695625545739424778268284160337186164992467580080040539595408395037645199431241659430435207
-8656919176134694488026966726643058582704520649434961668466021566505602068958240292321141423966866142697100141650705135865554164
-6074242737126300341900975693876422564450176547153341379638414445501488034596312318816964962988094532520846350286682968373824742
-4534503855120241805255426868718961329975641710164649957599487128347011734954984504486944932371682996864451326051197976215900771
-6630007989276431575068445405328391722701879448701430734576747641331918162377214794008905979133776103351215776077151862759310804
-6329412106193202180915032816114091690804553056071102324935636935651606678882718350090015499101515918794964067433252126478982521
-1507488089191785086302341745012119227252927110062837567351191646939013086128950794430586208439605756178768284242079693463131834
-5134585587442274519690540303774472196006421738851673713532054649167344075465437753885506375501473079004259777595528824429150142
-0167920777588082886922742091652852786107461336681294679615598036369318540905949328746327769828031291675250740935570893774610363
-0038129096989223899832722064059115068115632289006675498997130267266081648211647293457692956590546845542631469315045748487379716
-2520900382745986244596184110700770194581607346454171538723932383294827821673322365898338493511029865949821494463508742106545267
-0565722884026288308442559359348206336146522003909225136977382087745807490609842307769964489536237904153503877870475885643050177
-2879720936866676112852941496983745298612873646677215750883429056007867869583163799946103524454641087004812983861736126233920563
-2682472400392268500328620582825275316785330033129835929951831594780666869418979561874633816166907302039950903765570878767521214
-6000673278648346135978034734234778737168645117288730828023574501322757674622590092065551189918194137651428146720102471591456653
-5327338501961495043879408610895757013526179026139024561532644668711391863557108491473051168562266679950416482721536337117909482
-5138678303997976985493577927432562758408369467781462054517017307284536794110651849922852301352432225552398279721808418546811336
-5942090618633537593070786933293193872947689557210874049534803895058142797994756021217906395785182382696435144831868446840701054
-0805866230785777399683174946303367253262058687100298157860323746012789121984620953083069679370163347105957163924550067110548159
-4041789012854867563385153833627178486269852350526357948901776390770563029842109776450416321004402898078350462398525384367774030
-2665510818821145216742821558285899523213916502258403631925403804385199376750878427488901928524046342897043307449003184422505729
-2048478041171475190266068119919204384149581828382571880806118238802367751477551342088588974943077841775978105590373879036044712
-2582550167003327483543334770578776146465326561660371559249486818965320307377862762238777770099168908851119806663382875070424505
-5444680706893164832113072218288281376031594555136022935125966599054561592735752631698479935094668438169179747421550309847079353
-7876386229779167984882703960774028877296085268097204654180082218579776041301150186998163564389835397054336008319799363495236122
-3595623959964323543031266473552625582982574960453793645874949571464306599166850005238654688725079784506108930071723727021644099
-9904805562100105780931661247162991156577135587825115134266116050943890998432158388576995701892214120245792294717827415173723116
-3198902109416772023345787207073949684308452839612518670096056433197360112721221131290963458888501686457236376124484894557704239
-1439923839664744053843985184599889045003833780920311682293838839176055898856807867213644378338290067096258257324765963896543835
-5700918940980369141639579109635400284102047501766736959067637462699617150713985354772825179670276479720622682613542577452843978
-5832673606644924997743952540484980626339060224968813632527031664879549813855034184500405400404100621140495713672255224298990414
-7192889419886464319914820529555240869091567523179106161721958129392253172606561099507740238957725006168387598704764060094854671
-3309479510962185342022955705280901753250343720767822070179996628541199963151640899372621594086084748660799272108092321615608962
-4880909425016446720046143938905942262706584339160340379312192206890240470343647456683169242925461208146677458242299921836024115
-9112782389287307875231265914118831295892615090298799256818943475243201711378213965480178556028607894090008691361256922857338305
-7878997196220126636517126620736341433150726102479409458917297307599211520723041036260833938983460239182766740060701211352201191
-8683094774314359941970056128495804368612258860699432526379799515947600345795062224586289908023772808639146020665057226162935485
-9660235891943541046373003698737146580202165968722595524291168751596799140752064994627768069683240083731174671310320210501136516
-3952299801633659008575843631974719807086212606583728034228268635353770341290150958327244666611228164923899770204672751927925499
-1681865396625682674685451758504759903079794185779114689381923935911799262023419094458049787998569136087163049641052695527707434
-7051981372339577512946597699315700689964039969082898958542940125278978182609047860935808672479205043611404976983579300374284797
-9494276685604001130980581987978951663125638076896908522150813094023439651488500315910058707670482621722763754582892271598798239
-2297480620143752383199993430862475021936852109466853279971476608874530008450195147642064323768140191491557557914372058492369456
-3210874548598055876505562103390094444210433165591830328725710043504607452200463576289609058990598342445857989436858490154233543
-8132507672542987199374049904308113523835831443354290371614453927015873910762212637250354565826616538395197156337073925141693484
-6828640682510305462478950222772217556425645114511993512248969567524785308290443499084010706135805334321921588360262285590883409
-2594395457778771868965633838538089838472114546447151674569430202509411063873470113459762471547280714167783037132473173267526307
-1601839698883476534179701757004074668031433379390884724016658551011492507080285489891017007383477491584644025888213433125759305
-7523532561560703539946099285117454732843364985652611667389407913314960693543811095755855340427962780551780192610470189512825524
-0348247544916136977309530119407469259627024645454634138436438519986158560867875479423449700625816301245511994796229708771223160
-3917296084877555076938742844381232454610347414176454495292235478841999037736204668770470759408859717947445502249268193464913498
-9942815514474689741504492308012003642347161752400872994567873248383495234578303317585084447735662421098893789187005435875125952
-7400181919019490047282686705057224403673442901199627215721287263528829739748034312624985655044437343710362758307470148179539661
-8008829134593470730958751998114225068506458584106597781009501241738039124829892755451932663527484529522803117480503191650035801
-3220127286757997144992978308357689318213671314902934383221575508818519767526663815112777913873690474000419949051472231014820267
-1399894109901863236068753449286869832068943284626949416147238270002784106062189067937811371979896380361397172738949505933506481
-4254902873234171699063619785819122642732788292824537159169433666069361612397840595910726633660384383938078177403483650975568259
-2209368179438159444309719519784098123505334554409147220881995692904711982790135929098654648473758048308424437091906340638974131
-8784927854050511928452505266509077489186830632833630361379070849447072741785156478899585449175370978549268898176795868437582718
-3231975833056135924558298656515294400028803078329218944207863428380011023399283981167261222531969361122301223500410734344217228
-0958925958615134583645559459986109673563012970906230471133763988818583110841341249599399387466204289301186261815920165156578985
-1991110694748693828675086932988793084291818416422390423728768580762059411945640551530823790024178761601499474873560699371792162
-5361696020245404957765470178767621215479647553935020898244576640893571391546565492142211775010405579641149396961911772636411704
-5933641384834122776049822258585947581244135364908556513226296636775905866481756079367435635748095205281573764949264635941006411
-5041011491795017405240846374877784042033437774313006536528316953327476960247723830386371163515353865121506304361011426783525735
-5488997063517475914229301557438267886673740763412117613628897204796477231021684048588313466034859903879245472327441120566103502
-8530760385580859337137628786690355170400764087907594224462686544107056072485919968752489909254263413225447887894153248109175652
-6157903578937685041336967794345564722166007100607239958562466608483279980200607600350161886932405833906442195659498278360919430
-9828873150674702059652960737024831945705458855872859591267757719944168191278626072224244567244295799804168245158850647976515767
-6733614592966966657616990010769041211313964384427177615958783894640954404002730067938048093833284287697173874637222402450231077
-0815239310564450548270963278380227549898803833625140660969258768879529883774142739151346026790443492061196604908528916004363340
-4528891650268490704421594911777184311417838640306057034638291330148034732863406008674812263692977851302665645685305101437279625
-3233475352967519524983898638596372885741145463145393518228460271054338502613983364910024616107499752355701791207046590492672193
-1607766030654760272868975035371747266369258074306005268123601506826295532939956628851683606599198929232644016608548496393286833
-0164998823596400554560038697981327950512161089142533974519294883428101099674224630562022297926592367086936345609705271926077768
-7913025882622995728679690258052758137385077334095212932668418477051379462440145509778953697224292738907994604706710137743620276
-5951558921066718365814901585239666946472249768608440652585316569506390348051275814890810652375791805564478189249435436637972574
-9602716095164159166038408316037910403855288603710934148506742938423062837375851102966449162297207365844156933403348477083451353
-4627498098319599205600533412615626896664838788638148524473652142820739172777284703948483540298530565794965460580139030303425684
-1565284739336025065162908150482205331120001945515224141600855715524039864305366369748820024483450351626491054274468986093516231
-5340418952181086209554963565801571626818882174630725995663438985529129315572417340527118943747399687973820656682726051844769221
-4320926831481382140838060220194555123790396897025705923345941235597539508677805522059012930976097312217637965288298799051778479
-0908830534451543414307140854781014820685341080782566962124152921948070095677549807088847640541631088209567823713325266131951427
-6110373879023562027503964302970937405830359276112650695138428936697834271328145752116000081078410010751317037848623862138058557
-8822703971093401247422493922044598594234342733457558225718617586744418222085876701060696882821515543129744401944915912235798465
-6594559520819849307838207390295967732653907650649027886332594421647601798566341345946992510422578734064164433073111139225071621
-6354737391657731503659719583497860062575481051328877369003533126272128322177145084735337788672157007937391387995919117571678161
-6945608633872227095639320829071216249131553642307083427955811490415705093929385003029105106248578633207939138356220965510578956
-8875904572434922005652897358604531384916362396100014485333372047722658292461442588088931849935109173016445065149146280103138497
-6344250852997852406467930596512109372720069308708153172074632971208643949842907827125891877283714403480777088075917332714430078
-2141088112696908575603884902935424862191062652660730968192553423838776572288261313561512545353202622522229101786236940604077536
-5420581455921312988453042096323962394005097705232943223301112814607176607418563604729931333417412031473023307632699354685035657
-4904931609893963364651740622632458671635349731291306084872673976452365611310080979515796567705432384020374827307261624382593308
-4292701172515433578998040448234672894273087795215109333668233787741983605782088266764474905796649724673659270602807201042559641
-0405892711593975173584006410022813365106426354541842020523033260675160988528765885253376470412464249071597201808795790920249321
-2969506372363457771265917606965665281965775472879910780113511573805868748553670687571273946389007257215130433994049155446244186
-9422294818781445710760638755747391659377594672815933259737267891227254986222671631563563954141355946614955207418080860505944166
-0087286626782644309557643177400304492693387991339358406695023215774476540471075851900070969889709559625262772196723374356067617
-5897279697608188221125456894430238474410213921346239465846675042270793388259552491229704041982502727376305057500585797419096572
-9629126678093091084216993559586337141715599917690951379809444249525710962700663884823083705316885810747054287541385125785199583
-7595346119985543253389563272070967517963948640714499895302628870263490256644647992172402145011433583359949875045014139097383990
-7523156213061115787711878716816595972617134587220608008483487762219572353605120083032766155082751752855610567994430397014253895
-3701919959515768374982789437891830642750960645657994589236832995980797844253496076657711645006752860088626834982056251575040225
-0979950855271929320767873941275718754278787090305240807928650242101643623835476811933436063479233606315724201732634520101994785
-8113983065740845934933526321338302277547952641828910682131706421618856976337728051411744765715349602385454916896966865817502458
-3541043147303624444017398708391616664010004834339935228226187248791543655458437287589626370079460316930365464946671005586907844
-6467142906481062672351612846421358624595986748030105764102127849419935691001942740215832120384833855662335231988116688960608695
-2788530799703761722379561161257911074841314957231380008835616333860526518888348729384930186986891972631716493196919384541563044
-9960151488910951179842583784111062968107086150565586865326760613018375413860020781154310137687104793480739369654379775885629180
-5757125618091793590015555342485911625792045336449768530669665131967481618933921507464033442861020327590807013639300157233850794
-0108561117599044904729443235325450727345789731582292014742872599813512719247096059598721914318005872025916402947088829272312140
-0248866797650825595958204057508507830807476195084664283762933417519142347075582529326241506715718869000199121666869916905668032
-8723343677864688450245361288384636252992454056026441166941292835836423200070814147349431308408145782824860695919605646719597656
-4679974361161727145100641660878503281476844268161393833161261969965276371391589006952925603728082872969549646978882403423923010
-1471039994683623569789873331804012722815466719684852070254837711074357511238693361592620597284807521864906755820794891745584020
-0746324287724173135220206601559184495263174825463472438325932765982783597938536871848298666533763661034332204209283999095134727
-8847622479138729829083277482843135313544249094572861179333595590622772221061675396437819003622647477864448706978670376179646671
-2102601933270120920559135994545418775337484717153198432612404295706149728016561442479718981277683958181059597372600330224769132
-1259053282379608711992970881977405077810774056106800273103144031624467658496517236458989974966732962924668833215016485379965273
-8337096778081104941132624055977594869352911917306275484469902456879306916808789684303864335821138065913931420528939044385046271
-4299368276599609244497481316123376963837008957992736164808101728168540138407838646916364855310221850303575133697274394091619868
-2713682765289699129061431150379322274699877403663503040025037596762253721290401208216082436415144118858632156119324419976312546
-2881609371673910343032291044465003849815028985591391451188131927898325558643746240832264615980161723347980750483187867525894824
-1267916226042826987257806754004440337824069605413162886825139485042850988829975658205470396562194892003670768255291562747373670
-9234220033570807048609309912547070817083287541492891357818324994480536846132188820055694019487542207004276192292369053562016777
-0261127578143197454905032632100124793899615216318941692486325853609952184783830755458121912666549923939667928989436426770649961
-5323045993412285553048451071174802746049476412795340271320920389475261483664749025686760199917517732942380222819936015551403774
-9891352074356975839408670998973900071675970495889358565662068888386887973659152279951010618083877084169404988201568384833942255
-3238050166229051707803832286590198074734858215255713288528844554284335600396367554775218985201346513397387400209397068796825742
-5728107211476180762511967972657147473012924183544027968479506893336809289253531374220504641466496667214723927677602095165464315
-9011192930379184487659969643233786997863887173759888022579642343995986799605176120033884333316312893660726740709366636155465721
-8537171701432226276253255188614622965933151059377811653184802609155191205285178705789524447418786231655055288040171432169049130
-2707936970837574068569629371931407362409248401030806380356720552870356587923391333211272591561747393382939386843280495661244314
-1175509422804438381892148322240590701277543376729396595323849510597370466005945680426336918977914561211300792916203174309654171
-4042805192423544654158411198004453353597731647696727421911837745446359133507547657475484034048732290037678198364742205283336338
-9337695707833044354501853716373623356235483326284612569311911355595616206369186001725088755459930335959640295675396477063274478
-5056639209721879485672408789757891131387617511313947970994081160678454602320697412448491839531065552976208944273555314142041880
-4822378866853898824086257862623541730929040197220702007762078231078349736989651940081080724932828161588263934616036801731107678
-7042616549110273896023934480613769270956663187245804271172698934235574549161064775406631472230169390486643998381840493803484843
-4432695989367708020512810012276065008453086786966931783819054126557051679306430656639833606398733688366162720200084451796967553
-5350105131227057106985599834342048762794186401151883770272342638155104883645396726235498798575148882718582404327490926780130044
-5764192533929612390344710894456047465905143834205988681215996081613514814903908502795919703880401811242594826105306055481784823
-3081736917550671392293064759141270028494719167332097201455667940386826052104961288882027240309372922868375595753000121957263246
-4989894866974583276238356566258521642610551259726323252743986766553600472233437943119765905133915493843897768279428421555764861
-6801273161353076961494549671635819940275013580673219344227796480147357333556424794612960445706828140206119824948840749240399787
-1573785648039077385334262023034272384935398204989144292167011651539471971703585283557377107933951650497678725581455181207346698
-4874698339219730333194095651462069186623435369684882832433815952523247766685863473588031370751632910706819521148264821690235129
-1745856207579350369947762735836875634021204626000569901414064309006844235664625468595115296405455194740314530759379861609679354
-1263339035301388606388533163722497011371588322482095769750979879436887231718408664779720990691297703089437248834586600555339842
-6251850491772376275294393458209471528965471290147918965218220499155230361216164967212789860144972751525815583122397986208096706
-3484214175754929920259118693783510869997218078047468018854269713219002531566539459352397848678904622285083238008575450746485192
-5035485477939887603964624838580376893177633857009639663967781579876337080786152281286836780643711497334038142643551235377859312
-5770990490009748551131841465407612077195558195928231585911499648608018583508169531801015305515399706824738442071885239921251502
-5505962701249607762425096231287734763141665342862391398728642501706701840207749211087529147723821274132607543767155647569233366
-9531752996646776228330405381959650186056935054844849148234315573131250892996644098435195362019426286916985576819912113865830014
-1606555436659451432978242703284043412347220692073799660822918397493666695089541486316957331014765996271479614514099842437809535
-0289392478723841946498232349165923942701150815142311799644394965419544149980499852640646717021478951519649059011872310248139100
-5511032978947425845575588456445816057377640214105339473284188761415785249565799756251192934762389301520020016150949209737931857
-8405804800314504366659749363367231268121943183966514746661384830649579675620136873178912503421474419998605051121952540207826204
-7505457456876976664571641545260379929258562329503538400546169325488895767917670975295980264182906923671943997046060564087753548
-1274387949977098682446892314563863257816052408410571422114222854885606494860672338931736657657635104187063013087549529686451859
-5042755850832972022663213277248439000831269961224227718932272498745376713860758630276016079020855254056636945995345396441383249
-6344700532270890968181465829707309620564725384105716449055864407328703719779390283415257182087348958918979888739066384714906447
-2478502268884223599964876320836160710993832544375139942095572555604343446400261859797019349052899588226956407340248510969084412
-2858479499626608853379284122587510516464864248784114135053508629608620108109543831989223100900685873301894882329747241764687394
-3516073975240799285196283516667224035786957693305024409405170967493899593072209653378675045399225752043351688237909816464332488
-7045960591955279992811051225021192695063962021956994060992139199430008815112575669363055918094781304106258599283195179624447775
-8303548637737456436395221856298882133107004338700669993457647426042442520873552718504789607522324772936205923889075833787877983
-4528959091848677214793256254827374251508317477836642431769535470979890535339665561280184226951752824749258073794415152803073480
-1459998553825438645486213601892946519503789985188491129629213533576249295139024141113828276369687768834808863007813942900737363
-7827507025285847290454033855290419493832906414032145098230761761828468254431382777807611448800062745765313713732689219610038574
-3538625159483449646940178756166257692080479081424585343862543469052182432934925669284445293824171233112956439604122644220734705
-8884093066755275809492142335471176239144329953772128474695403479470145379846983260079920680227191033324315471442379828977213518
-8161874018859891048210600302227335518426279312266158906257386817733776024570411483770025016852705510503728654494429243801612182
-6746947553453295308964010256393213729923189009745905892535754926116629620973613924884980514744338995975237628963272677038960017
-2316979912101253225038374374358240155041996499533280966926264100171569427093110935120513047386276224147665309331079377719563345
-5252039218101191323619349210669314090591183299132043388783600602372822313158646436097466384432429894279310347011205483804258365
-8849078102378497326534646727789474466302897639756078400720546541976326397706257168948381071970398216623030217390426497155999023
-3271457271229858454657827770335612567349224212240695221407152662225083082143775459834013524692150107287815992741275927112028076
-6697268153473360409230969649314429281006253608637773637800129431557004336600687209561833649108523766841818697796052616713524406
-1264023927267188505910887476294511895228887727108862538027310305679469919872644028196540981088809214448552558389500274219570341
-2341820289505149961074855375132511787200836031120337305514546465652487797619606591322268017233923749079200060539286691098575276
-7095345917502068750136490067362248249806291619173145831611517423916491683475780750592775740226681145459237438975249038494918255
-5854207316691383141245954956380735287065353365324788816174156724268585661703068556010195412645633774843480772404581791184447848
-5983572806554767884384691619553163176913927916522767085440008009887977162986441335924089064521714048589756802500400756006764546
-8749074908864079527865640561432569820363365495585933467014689209329639785755338623694144042638210864919006966920756182400308068
-1488418928276481402385931315882264463640479342727038934158474806015143604448429971536086762337574137961555181782018130291223711
-7647631250366260770657650732694263292505761395977741171841175592881623563088242488954360090722844918014816525013438918815206919
-1155451667283610662459850201212152183408308503418856279359708202057227744768180593554527508439246428232801124311275672977637096
-3703563826897681685685127020250312031591544945988953353941140195645214477592978106315927871524898358121653801020581142274555566
-0502532594831295067422782714984502485832073390165137849670240378837997996971720348493993863606290066187249274244662460276318689
-0152755194697776938435286119441290637386200629628199446127743622173851669645911455169432495002024405765718643210153464143701889
-2562249212763374000591086405147643148598332714850654045728093130807693494090674026473297812238167578278207216049055667059931109
-1802942091998951751764726262310843905210614073350123667768202638105831131108058708767584753018377136585264570210097378501497188
-9619747156993809984322106521027559385156110152742577368251988283361064503255508785410345421538190771023025825991060075397692057
-7975279398046115700291300736456549463218759811012712333893946746580558137896237287869240420636891089058025806023431754219781359
-4988421426405962855719392598321200928497349040850013918965781094541442225330283536616202634976088463128589329235150833173556905
-8706200507172140856416642848813849966143817717503023224834106896623433469273328907429832511563972309658830234487588093651045739
-1804318877742597644565913208808319750885352430439083436497378247283858616368363127977363367800390625897013789449450637875537399
-6640589174553589654051256599633381120024749952650719727219130629373315456037578535279963334633963259335915488696463449646684320
-8032272830450718870582856393550555068150335019058461099968557096935808325051772579016403379075019846185741776197086257884683319
-9863845517847573376326098832507232200317675290516210661300649571154879306959674077908278504743343209243187243262639791806186829
-8260961262731301702271912238265956345814430445731867024044874570864287595912998480366912356847572447005441275362156399624494941
-9393142035376317879394642824057024278760474627041377093083443136837548371844421180440200277690935722486852916560800667873141543
-2707649253179074679795746660619684282278565191941032558500021642302377918384225264159606437430918854686420568233535916210590247
-3653446714468860199818770176822269463628134871277975181151133360475139855607198727163601307481114241837610243765527921963130342
-7740886414228885927181817969815506430494309276878003524396743847692333838266397442280441863182363662933711077420022986422070281
-1048387053761801939044385077721021658809540040018134673396554017098633248966461113346771441179046101247543088625644697892282167
-8354720955462557218106068480057094392968433715936618376234382444557134795213907950353329761280756136821666440990155365084581402
-3688937719186699342108738462217437423679733279917547383863629404136782590007047571508080094271518356483515978166149181632884691
-9910698753207335191315666777695731726998145344199523600464027456153460564479006998462380767579651598842317204792886070420998182
-9896983218119310999564732404427002821382477892511011450905458994448002735795600011464506066851494867367124445888153203962666112
-0874480478255387464724872537442210377291532518746867402289144019512477208223281547993390653821697806118478800205575150577662857
-4918888004811316598554705337363884151483714153627256672377291874950758530975380513235648385297027498654040181963476939202925535
-2944953053399838723025577285199841577289179795119166022276762443360574684698180143394617215098184693212410119796009072687729739
-9732016373361334253176297777291060712041712200359193577310902701783613655008446771602140682798342306314527926659629849329119883
-6451043591004466592393679872228794008130850294984708968342075888842891418002758594861642712850414025146690654543853793479725972
-3268929657246764345075224814644064768187234583627518324258659649632755014931180023989253455291331973610627056888949488127145955
-4261926089033087120812284628614836440477048559583788705295941729615760122728002946792084729956587080892613331345225489314812847
-1986796721026437522158295162217239471552249715846680613750709615232262912940447904521346670150883469709041492285328187488804299
-6628012528405245613161440847234508491425287943434287101928325272535635664307751412665147263964282878231211570769131706300759265
-7377088066364420743764402212273540338705138073396342307947494852950818207406971919647576428347904811456431944019834650692515506
-4705138654618320095006319217530505261916581737627651424491878629844356338877632449493703212698711863106207638016952512058495841
-3297864919576913522726817303334406976314952205292550373391722910736512885151802773872849953849211298237482028668331950499038336
-8974669281536290012748118151506739167431258730634523888446083432703773451432089051580445107667501300580071396777438663916505890
-6676388335245038478835892287014370527286751599266433016127479958260673956274510190770236842963946164980795747343439314929899367
-9777763357901635768971296015139054097237772494695148781717193551641896481882800982585569826367439263979611639005318235314749057
-2006174408272512048656262525906502452313110102817338015892638328650570498699472308145823254807565718645774486952361348150134146
-8820513608849516349458467726176340280776183307750894733331062785346417632047203675211923303269854905166452369376623717371465515
-0487090344893360730368974812186113379856699749061983876927406730979994152222167896194935782650684486995334925005887216364226178
-4428212757677682587368912604936275746129828292671231661463255473216528603314371364809318568990891647756504476074694167225494387
-6438298664776502895176225722692218937876815974395529173364685280466577427859435428997212680686584089016477667080112002827762955
-5372837358048305432426520203755641518748461432567909426155727245524828496289926253694681592910381964428484012886894327170000564
-0966786693488185832806410657062413915673905612790978639242251067404941406079608751238017548545457392976940768385484687626020964
-7081334569477079676309855956739406608641536536529136201573794386634730088085065014162237881535086131012737674806790302926845508
-3849506256608406770319555639552727023819412680964197246748248202159679944624779483651489821124252171233790787024388338169387126
-1220350189747959004534763654451835109235619957413590127042747161319131890755258681890420398880573552502186079819673130304226319
-7793578559294710797103985830517016163667215076322029333261233893714376644214340079810529332625249572639110330515277641165833848
-3375779071080037456833323971305312807921291040172365572121296035080033198190386403786992644365488916964829938879099337521148544
-2151885079681150752124200634430960212055491111062153428630936693865872096334814997531820067268121582290646921550422149642030109
-8613181778258533141158145972750085504588401393903967265445772834337987637418600396630528732934239316047591685154760079805548066
-6810794208813864500809678470319323448087878028803605043954670396669190693495990898866714597544374154361810960387728955757997027
-3780694542345726440651447280692129044592214402723296549397501233597057657590741164054767713089063618201384926245188297986421050
-8252358803202927045538322743598848427122577241918805031148056119515867274399187693181758263084888023518690338982779085780404769
-2424326538477152923084594002081423911440158206786241827087394911592939363042513317947630468078474296989628062484584400644343448
-6293560419015354447114147053377323271370974957505862615433195073799026219744354293045028357502721448147460831465672262899873109
-7387532795839583928982541818961799651808690944192536299119649406867938059084796080728700163640618737891537102681397327040310310
-8646371766907348023824656340748360066056892200614557523317897955392332090329097835097131487719957799594533173582638863081864212
-4986100049536290446290958993632891990045407747006838784207732735249166707023914891375926737812449203630774188546578985599909811
-1084402346707970131458723746814930784514195757804466199671002857316090262762516878154322011683754629425143857675752082486603247
-8761838577711280264766083372187992430863964477324546898292032760669740251929185543394862067810777754782525582117312630882437464
-0771509220114585291617227270613376384799093204219724418023916278133523270037263368542243169870229505561283586085433377009674011
-9820385787390786107677870809083528732710164474423943477332838364565199183957564959608617849089060421328797474250989472544417321
-7919326323563029775076417955118634250595776343877190502902725431786697484594693383405493496141691115991728752796848704617855725
-2558255581109821405634179872876958166347174474348761073684217931689004048682704410888017280103004988712033725528911209075578017
-9160863221896162516421424469589930231499714756713528296148018288586763465400454214603217797926981201646940396481239125062147650
-9840316514604720267572846195066141632646978531870664811024154364403354983561787177052598257504070314131100093324913554509718449
-9311775701841172266095504345180054522901312438857477399185382790126084433098439433269362739881218978298243657480689874068996355
-3022781945908762278768811002699224365141074026805076790548873962428543441756247033480754889441799694147133688175673557083134054
-5661203741867036406194178717036861247199166773801082533375613708479585773697108277538910907988050442661518792070910621436071059
-0690138478379736786396005725249615711997663990048585261495921831819669914145515073403200894318211855461357229650824823305525133
-1751585791160648049215935161043755494836647727651069321059714784747155745680573976254930604344088093264307898664770655705644210
-7624145261014687805152488774841289678583856425221410365164555890159519557132962343799732888357700797774204345288024762788982261
-7890710552868121263477187455194185399264846143513087916598365744278210315488246993448630198352186843484020444533061474327432896
-8206909625120146564482691781469049022430111838502858582644125909195387775957182358764356323550045553074686821737193044914677910
-8204337650424296695493149708468179951960014630538528111508141341188662936175939750414398867506644825258652647525390439239752201
-1219359010151342200692679606063626284788399861632782010310804100495631217242235430375489322644648855854345633079496117764048987
-6653697464408607985860924202927606340854610960203650555980002938739009437996650927711204711526682854187368829518663287620378635
-9615765538591556297112167827891749863300345638363300995749126057833117511099109253123549891887992882557489784541036449471882403
-5919028352049694001658038819829671235731815415745829048231249060308117257367536285634944658365311943856716917740139982945041953
-5779687741861700152585779009366027675558545586949850924189709461217199740749305528005166461978008407813915390937008493360553115
-5834977903061566139099870190655547716966444068581774636647968617674813198281268006404303675453751976888820043577600761967333881
-6972326585063978838443446520453713997506879344217941897803906052743968972254016142258731934881056702957790715642228115030783951
-1362425902796546798395679404782769752464205460307818179674687205006891103510168328363308032810297518997174255427908231022445396
-1509825900031470252867573280977984303757520410764668672441796612789584482854046983756780462029600563288455226754517497700564660
-7759844224301976256343546717305935453950775711909213261546888518009701479912670689049983757648821113680742909226880646315005569
-8295567234561669944338275143058695909726066802894545455268764288094686590468443329734647916141835949923568889966174907115365925
-8847804451408263609187211738763773284048172606546780028907522556324927271519705281526806470352840988271648499699486513703844773
-6679160425612818347335886820513491773906491628651444000288856405322740614920289642723221399498209432232637228104522990852837747
-4111012689294616788593607591102956684483592350971102538317426326909441395344097833084048144520705500574792401000355907792380226
-8347617047251388711302856164567942061715329050448779661635598992241168749527006373179435024773116055832951174916423963970112173
-9055087726497472517559694026453105136312139238988721622285684818285622456138820844308772825216777711338810456475617988242424162
-4197863232696784218000746661193362219301917851338032677667264033511098062281872897803087758355321546501532794013889570222549856
-6115749894285255554690322957000949336927917916709996337643587065466062558943015944180187981070089004992789679317730749848395116
-4787717685054333694149897473720745326568218218182852236278365043324649884567032268831086174748464582606382556519285049880278120
-3971535819215057024510844131306800637142690099398881617684362973207491682213220003762765264571054110883901103595485168757504333
-3733461701846483183011223494998710865469936261566419212369452729547931045469934427223536598514620405179798084202385746863975487
-6787515125117652836269017536232648894348703796120091034388135038967463209181552965632410604353037772756879239864709539921500366
-6197228209653401639582453147092770443022867307115583008238408014093437109999520308757528533277994723967340185717046004119026260
-0327403058251198538854684801262565688227840370906858688450070334229654311591524491257725374686504434311374381373826709761897189
-6320800720313217016667089641041343357180293991403820786439200978809209918586099663595021544518755767970175732723433500537775215
-8586605557740559261081287090127076957830333678084994220662406403052293892606977228772765289631860524156764537528844813070064403
-8457029064238615286786107279460798384585105993306593540395560420933072225512825677840166549704827482169925869109982598418898944
-0346460363516674840943211123653705144516811133167773396076974206411386351987012791478690845256647926914987854519697980693850902
-4071039292859550793054081697582930309815712485519665021072773643984757349601035844973218854642152867868823320985485836576692696
-3566944195916064023455915853671413519744116499257428302391059795726588226281448949481887857567458305547585518788070366283222643
-4475630384874509141748841479483575783195093285020751153893790442309506156006253308563119939383816229293457633418322795791651798
-2534236711768923060748330398823973796625511107263972895904532310389295669901143468746002992855700338033513519817927059960082258
-3266833442506157497412341209730995861476441931081314990884968759007025722755350805078872002993770048685210269397083340942969079
-3325013293836474893127556216824859727670678446693115589979109778870903809827936806876988266059842178470200459657153466761585276
-9339215768239697841992780261560272323641382940735693971437349481277136632058838727826902049882698280374121176916226254815769890
-0579266322319718076679029381516879866920214093645961826097287139995438556892638562807533592029177968784950961959651824138364712
-6905593271581094882293836027956049322801541013654133342099776388830151131142904625837046121178740403372359293970069573073460036
-1334657560229091661514767192486484034874814804158436588838115645203542626667263606421481459341052191296393864355597357106139612
-8983996484498008491962652081920903788269022697096829121085293173454864230335343930546161539206227982332409686050424799265682960
-5979943191308039044837616371196377606973368879788064283861010090419804092295381096855027541458106648574572073809903498794247525
-5748223869403535883463902896159174890497470441638233019825678773597770107171367867175754297335334571074534607008535043181405194
-8795353535341345876592035589428503364517129250540037247550521782811791666374510791517112671288737422099652323046937343991337828
-1845836116381331085732349956975527066319503790930145646064646988078457512408200058689118375881261700543344729871472397774510391
-9908840174753246368222566017712326787176851291551010131314349894185604484963390215007002796394968662213178018411586445058609354
-3648708782366479438386590662421575557958786432758515733410030956830742717789884410593667200352894830011183921069426063462365103
-0863636445701114598272155058937842933641739192649108654968863927721554489981493578009581287965498827240184001075889430327826948
-4493294744917241293353606762738125798775389304371272784848161045309965481110981617696456977856845295663146310544856961560395701
-5828350063875380289041787243953420472517640405923728557572182762701021146981223831971084235740009591348792854248246191617472390
-8142911427486019533916938360973756294199899650632305767565787069658787674361642673323286198646595884519076147156672045347769575
-6919034458315451231488534732525157456948587079445950850088410378838535977516348080551775162637211781455681436512037018188409356
-4896222628077283599302550538329307529265839416312577475209070966536398530653252477467412899117369638571925172776374288534229909
-2854126939661606237890723618332733028245947026454912620083338662672080884075389624244778233027185136679702658181696482687520771
-5486768970237811447646114465006645965128132304833174901323446834886512598955526763233636026886751282286763353050412483339880879
-9146149867375327619762240148102487012789152939324347118132416925423213349620444217738724989375651879154078406666532230695010261
-6432289704281535683765846177747137478857199113830933135896448323481180075359182281747819927805855289891296771338965010648932514
-3498778884149977137993362603088225708342761654666600988476000304267323094698652989046529561743798096047380169014973930605911712
-1555513950736376520645091335370846495268353191373549111643901821633347913274787967705297774512956543219272395543943905097818713
-9824515005207942672277682844175672734608049189360837751069564229080983682875340351162730595292836110710458156809584248318311829
-8644392801319979903321539224060850887494189887888933968978507838319574610389051812420770840579282228222004146980291262806411960
-7170669714045362254284955377287230002812263383500586848752066007279901210618595185664394253569437180949208007446172620486446640
-1197418824383226696240145317846075038217263309407432715400718235690780656588433075117078422196797078588171900080472556706089444
-6058081175983404316870378185108517992309376387807189465675421456144616633676191879370638648087281836756096354696164358804958793
-7175300097350528879964995120589418404250514397730435804307880003642423238815219743208925752113332762492815676234753855313749687
-2216821005143022212418811965038884804162533171952178272981773050431225972337066809470007006624527746167477143326209744916009321
-2874879795494394023670916234680048368860577149936343642623399857065876920729230526286990908222249218870734087284012928821855198
-4892669237695278094261059350844729450055740052868656916863083244548039117228735586420221099748057054754127348342899320517500476
-4913533064284953905878883623486045020791418669162484614426142342087782118817607434327885376004285685360966673400518425200903095
-5236853047264130432207807874987854720636307899392809936830966680235406253508899133299685304059306299982669510153104336419138281
-2635729217127660380760950574877790788724558832203965184259818062945607402185371541729168619518031385767332811305256686570812707
-2508693777459660048221434065348386546516873503781056818039736884680690592725066422073878336659156014383855199604525567079024098
-2527847075125720859307217125972603526269724367871881994978039745425984811500976939283305909268477371136914408464862183620857832
-0690848798245605847434249059051242459537031098176625887386313497201621005955291382938621297556760277294613833001841927601417783
-7028637829951952641999762601338035213911204478792655772152455046625599760300329777350980475951284319951538433620056110253564781
-6305383937871208842219397097772665248616270756493102017303010524320362272253687689906320569651514870191751716750048983549016387
-2503753802832702119325330648883246982515086513140942076923304514033686102637700160768687271319427097046984664384031053585769263
-8859227992404387206024381418823288245956367455432601449940099288001162654396819305512052575309088805570615034227083337938687529
-4650804026596773751781171691707686499798853858855531297662807643678150070418762900082986264876734988853277036828880591174772676
-9388499761915323706082278918760363181675840316081077581226482199990184463308418161663917171550066696858396843063924348798640785
-1339519437101345180144205804260788988338143185013195486237509665528555982435461459049630103016492555659996037806521222234571639
-4775406178328515482958996000719481194780201067828314313954411507309766697327602402398592936844052573242705274081653994583193860
-3528381321380368083594961454997422094241837847317957074543832643804670074418168234251527826193469648447514505161752970468032251
-5644398364843284455563221983222109730803753471463129763873997470655511240512635865533704491564823907699160432034740568090163512
-2019394829622861074339274739867648100223183661088275367604560854273519173101761322314118755022999112270121442893766921444175618
-1024961245677370458394203192048216519899540056189972652416007572725591801341729111029393594712226889998156435621046992279746041
-0271013842729391960551828591764938026380238772791709945105208575380084459912538928688891874547881085895537996185248760341022722
-6443644163751965239785936903668129878996022934136734635016147841655906985263150160687560568016130320940069489352717984945617017
-3980979401244807308375088961101007696165282732048547089807678715095196311609438432458589671418362252711116197050123998645160718
-5029882228039159089170628100687054725011048437854579104323727026278151658455314659996721845525056734089399419451901797673293081
-6285409273407838783004808714400055644398911907669583936293776767386307697838130877184976183405711337976463042849151509723365986
-3789116449777854153143327216807443418065067164460291516731014023725079965308205893342647719238044202553135045734641879985943779
-8298817649314977181973643591691453651364965447794449764965615478663842601481733390271221156996231579991946480360911957202482419
-9923477919534528913583979154285960230181626227828624997322864558028580882337999440750509388244247586570466385544276236851986673
-6266991152224272268084343794242067444247144028060688211987908624847699372423422643841707689624467016900013832905272766427426840
-1355067343839251713050029297274635544953158759007585898844352763675665452680269506694090597773786276467200134181329183129591894
-1203185079814519449730972616794089846681228932967991544425024262788862162483806670387321965112895932667954720701857303315356633
-3010223406691406448732071777784917670640450961064883921707223591238303897553076936064137492313930301276184114003498965768546700
-5055662053584872171686392213754554115803665951484341184481678793730256377197108916198950525496472627926989148952673813222574403
-9135301836957832126464142557708338619444651703425091454666943559384577035607172295502116858050756179608799326777436914985064677
-7849895476822416074994849352092796372963487124157171056152173017480389097568380804863683908585558640345480249639539155208814003
-9261731284405809837137712563712141454654064296465941789875748814378776568326711784539691121352690345339673695586510989770974288
-9504548640513288992288616894826847158596027709105403654435535528958145029279713253496007210603612311147571118952157286120765811
-3172019293671644099810154685400878900781863310226630973663196219151877477083273521217193649999031944551410361083160211498456657
-4584835039206895266033291139088493090671186991332152100943013968139485825629047583367832339953098893263224674847060194281239454
-0086703131238762939716791409510475698044261061184491246815071586146930458568320808697308895974335329174951890370629879266697586
-4531479959438670471013925537723663881523195629756820131576957595320119441034946472734403049979337927590688920672812290238838992
-4555784600301091463114748695085394421438230893318590726172334093673394223159678897396878630225087240466235943323892469006400425
-3181295825258212728965331361945064921751996326740368121061708410146864334211196041567878993280564094949434554682791503673171658
-0842856419453623298809261289857239402872945556557159985688775020115214582384781860334689651493902766220136835999359515682473907
-9925790212755349035787540271290598847673187935010889467948737594198142964082798741209190025028872359505393133888993203341623719
-6881035084279659821037463368291359288972809796102439700962259394869871767171237148065599497261891353342041591198086826562479936
-3071229176011336182119446125694433597177517266017496957596892485297788477134388949109492032269677674633006492819820954408939636
-2158505696670981583492100994722239785061126885782859457540392078035784726890160616966602169759722004423370966068470851220475055
-1608442432121043588281125489656099832629914426535320512741673998725277196703980523715247319219104260826637474643734228192860916
-4370675331345005605018147797477139808981239675873728794694700612511771169428567641131258023552337644203474230406734637422278712
-0072859216860622480346667080043679784914202926542586524758456470894276035984569755855670540260788837234221463158700441389231519
-5908942320852274627106540557811105888610228644494103402263750822407154871367868699882023311506835501899157241704189414346964284
-1936077419723541310264634055462791796583876957815065743467706393867078774982042343936087382789908364464848533080889495741496533
-7254584486083999860932338903788745031776193198150907253247533783144266741445178920158676792459480942978555519260352341102863868
-2324388659990555102109355727630603564463003730580206681960957998377155433799099008210231393030776738444219722412702108302468947
-9926613338642730749665937063588945780266089547872794933113744630542358661411190558266352099886620858549171525338223571617167711
-8986318093141580580876428982707764579287478469073583981696234648037808185140269756651566921560785874161230201920488349770275568
-1902800771331526181562098287158829944843731017880219524960324079005886150803168559590390474829249427791824941894802034999528722
-3088584384403360990907891602519470935005839028378253171884990772710302832296914348751708792698002306050160936562533914379396209
-1408310312115069530150233048818331378284637723150482392301602795737916335332815872089409379843010863320155338585218615794879180
-9677693345069319403701934383954872660888681515065440356051840106884171038792426226463129841417745680354406721408968771559961954
-4557539513449236642758101806291205473048350296831633561735117237579593752211878576489139742035316348287283326781007355249045447
-0883189604094854361797387824593448971971447378881204753543909216846733915206018358578418844775503490330084862478510316277108659
-4392550432502243314906975265564518025479113098902169136391369512817565837562370156090165943691065253900876426946219189578736203
-8435865573452195078786548417341611434423772217538030617156223901185493595765324312422048299670372764076523094427788078350076588
-8758192779916285126332006796232045283091922027709795938540004604312898200544114013208612412744965934919541932903174519980041254
-1905758872835083202758499042134848212716811095613617523820839042848090697442064092232729193928479222578050789364469898951584433
-2042272602260087723772848808702134767220173723358646135775389214656797340171301999623954978758165595263461874252751080813852370
-6274949154731112794816216220066048303875986872572001517499070940234617966182507743418989487331756345308613913050407521686762445
-6252730979488500452149052167583298496816203113490366754560247487872848255355376484138619549701240217905711665471993273764649239
-2281622687072260169420599936083131206454896277499378500769391609676460024680767553958496006032193910593446808391535507538458599
-2191010913898494379461759294973512837440625801801770581499807998348601134363013493664904191350527640096566620000395093356134597
-1660938804470213933500623938584649317535645503810385086838104030744441292813013981381095457570526776722828297499568794267530527
-0049591878181449823254506571309609592366697654558586847111232650386057621118329999460228856081046031697258812551653592183584022
-6258688415014551491572224840400910043380364244249549379338382107530054462860121947719561782286604468083436850199239844591653106
-2286199429292183729722721966817924988059655688863458946473056847154314312282407066615331874808857982581754086039286737461422747
-9602373046472185399409121350660074121130363291629972502459350277036971026440212505022927430609191673069989761094096992091670991
-7527879946650183351260678785085159093046180958175365176059942440628342275638429735328061936632746613485734744234236065653841137
-0853905941635849403951594887838110573652181835969202362039487221504242797299698627659839204874816529447544114385531980406666739
-8062623009337523311886378539061039298966733017052114071143987228104904834551295397466673191503750551657795489921304516776700376
-9007862096833941572335165844081198462047136819292917564132567522715598859947138927117299956642745110763969251319858190814717852
-8138958664951405431541453825461330550794221363483549976099721937150607149588852431715285804748382531904426919820630714135461983
-2082397885435139903190314072146037819079478576247984221600827812796545457214101194496220097049368103574832514769701472385466387
-6896832416290927778053721602166743175733725992261187904101998561355457754417056692268681305083190893002118259512241765998122185
-2636968504609327449982531058224266443456972154252698660084884189652857349507395676672582020179531698016039374573532855093674020
-1136026577034357822803043248989730467073666295507784903395493121839773911132783532427651934810756742564183961335402101819870313
-4917099632663820977131969667158301701831087873930909603855469814730542409624643679930249460380846245995843352815176947927777445
-7319944731827475004706218777611396753968431393783636860295774463198452128755272715443101250558014321901313052738593050746571261
-1707391395815003284391913583753339859531852184651610466904418403752429242924142601415582143805388089376849781779454300111958363
-9869108151029888337540428241180238714963181644033868424652184814249832670934245802862990793758097055499023243559198701686575666
-0187337650771748598070996214382876748717075026419386245187486192182726086987036097255846930650043060886509574171932845313409481
-6310275245723435456702127325230222604362757109683102954203602714184216564293906952316506569915992137104170152492029578927512300
-2305363922251604346990506838961419388192179030700159072409204210540634525740072656419492493606787180195424067534096459265589672
-9014680664163948601215499948895470475969838465633327315676059364457476028555130517706511356929094761498786703750352514595140558
-9277484889618105650227338993928615130344847104186489285414725102606461111639517477747291575877009412511989063198428666104065406
-5967555124952181729420151522869271680843682059283488086279627160865021360567069797183031645357984651583784813809428355166017913
-3607122306789653495447270140672966362274565501229973599229667563911606772081598572491953192767189192005766778789005815828610262
-2082222249317420567583150769393704141643717042001944511315146960110297197944325284159980684280693676403148609684883994123930097
-8731372124960991940185405379357412214932260280623846110357067671501251533776628907031655983387403452673941318358548346602760124
-1976021347697640428375581819297827333264016242688348297392388997119461967525771833238891591593742490277240125530759579876491077
-6072466888350935400785328899402008544459154165636826625026958037650740601926412225205263947146298128779293383020953022202454362
-8044034560774166401511114766914479073842481064943729623980836043134237110449322364783254518711575480004977127696613076710220521
-0564017571074921724777748862479718313010297525498781712387929033234996773668361156592993020275412793744070740135811199115493778
-8419964042103133610587792208097044601548949029168486670192222439144702607241592021192461521821947279760550828661220709620486303
-1088814982734131440185884327578226836944316287501836068430921447613687229952034388566585290882851495307655765844223170274340586
-9005799435401477659962899657617685769970912656575731463413483835844226203192655446200112583102919467583122082891247399200176783
-1851901588702515045318382295536798092875597244431065042731697266394552848998020859370638943554279437980607960337319274852691748
-4157648096188098267490705839256314766006302678665206847589272557754575914579199683296869793220703658904894112352768597742132369
-8723572441033421822131850984144065793127526826673880856427241209325971643349588168485181604003549286943794523645867631822180512
-9961788999122788832400015923298335447164102572685865228181427272076170219015236471640964326542574283167180040163937092128142732
-4937228274511747775697611764578391450794749466871545726021901964860582325608076362650424934625277209649989981489750831225970741
-5984541310271980053712817247539372152339967892775462123252335196274653874061592183413734875908267266920758029830479031847869228
-3871371830143074933411065987051697909188835376373962685096571028998970101211924718499411402849248202339306457377199877126871389
-0586547099952007576979285722825771295071780721616176263387445055392095793671230602073249233658371312728279604207471382798903479
-8923577166944872998618492077791653391106848257807366227129544881151900203904339062941439729248722161475876280041042987870134297
-6237224656556330445619379055992474217471454724969182529987949872722998015945413515067495314489889032179791415649686011073157477
-3003735334796840694489912665109880649358659073702150516968523096869480344821929684468744926264579118587187974938771984262183130
-9005753590334142936036827167253181517255166676962390793299722321456204920350620126047032582007457817410580787154332130609567063
-6768747081081207028623866855036005032042045118427663709885224327750939144410815093506371403873404919815687844934325487062884410
-9939375834444884922802271908890569123942112471025359287053666892829043053920922878243233005965596366467035614279935114942794959
-4228677728256796231027207112191813165638914358249269082781564785198933238543379292199026489661901488181239514397059686005148486
-9858539705692720243176916548886314393535919032096542151105543882501065636878211469917818253828853172821658378951042353768012326
-4422150194025015880156761058170304509425792379790006321176948407538912546088068547813798000277530779888405928477531694464231990
-9405650213736879289008838391184069127301195712710013925801226563743554996233482554161918019454022970208565224871459380574639835
-9130794172100568378934252595907690555743933712658951585006391044055921485334952756122241280828770097902109351842319381201019204
-5387985013440379266230518099534711152536460959269911655397255034626367231069408969413762813968064236154692333107664286960252886
-0837118680763800551465069959598175835527467398611671504215567143391659195926190188250898459493898805547983688580472819756799921
-3903220661160023222988830014776994424185300024466935537043911148899196047568212527843430862631973366330579525805431481011727438
-6908486037368642919233388174527626955887348839535505480142124695672332446751550909649591921180619995217291566458925431968029596
-5922782959375057616516378703156580986104482212435661177276107010237081047649806919032851751263569965116169589560831643100864715
-9530369870366296156375956282332841862206458152569867266578623568655520592049072587837930649946891321926334502571392866551701600
-2244120737959672078726164762991283327806243441107419508409939471693616693409630730506528517088302223393878360169050233927904848
-1173648771365582895309968552846929556758030253414605906336548466169612035971381029462786542081116525705113252983939162686385109
-3234155840835288921699357747660762996672264982174457829675917923339715647526557875639742064383339589189545825487931401530995501
-6887665436803180794927923177816956708553785264323074693008344374916559316617894764427215802134641031792988573701240438184249750
-3839539179042881405914564139952865952209303008409731497507386952470654995467985010268759732897359668659271914262252626200604099
-3901076984640950131960333781644223983532267536121313347358475229440208418673453842347657506344090138736051557656821297434982077
-1623302641135870181311409682200177224901019997404700215147219379739297672524540935209651730504196225871915072497095486880839456
-8525315354478812852093356397223120386907828133392270722811606375757983394361481913342296750609970915686272616757634461450159831
-1758237483830901977324883248068822612744747099358422855339260889327800667524049577373525949059825015390160043063670312221072626
-0817646239152869131112173902854770980862701701464607169211772950069653293230684510278012053087035337608494974396015461535406222
-8646346589715796030816122730522353992998487085588488148264344066530587174128544229529685414458831257128748560990578804587360715
-4892783957104711928531643465336739867007712821809759300577073458900066680389265377353301997705565938884080611069388312576416304
-2814927389151100129042633757615682635990656949553591616128856450443418496471442467646240189440950521511107482659253501599167684
-6135116334119022986012296077975055833220297155080260438551907096128989879928867449175546615606752828933549694825257606317586967
-7016532424149169529714586507287588315821039767281860867212525388739062009398857291177966375322314074508942295009826535646980545
-1130704846522761465358987904002837038112315864342341500267273512280490182439691698104185495677754466174462509539951393350430049
-6239545452060864474289817540605900770875649791603624701849860428246844860967392240963173839859434643202570338001444647069601535
-2892256768296868079082781775690843873409200886346998104928582896183217369070621962623861890767458984640863725872163427837396161
-1015987233236680540127175130575507867333440719260832000405122222181144252353002520085749044160442813319007733231316952017735844
-9207122991749764391450668652103974356514593013095625877412964336676292277200308352297929615022995501002585354045748416214004090
-5010570807508645991981283973843421015013551379801238469792061968346208698033924105198332080219826873915414042770997813678587105
-7079764317445013461353198084076807018884451655619023138435629015461147032511308684817994462582990789356614515379970417351047112
-9725881506883451817378068264565401988152381111185798791532824098438029254469346518084626414715068349480830207550031462251028658
-1504691090829009028694497048664643697386279163491642380984787314683252474807267403308118309227599112336474348292331546087385709
-8374045238326514850352601439525770150385106432876360117179641265901618172845807500617241643296725102357385086749024223414320695
-8751924711372854963768655608131773099674117966941670496696797649406607434691461307943445287152706412809962107879642575743136123
-0303974873561466480968743445273196900705427451656962370162651211903195479518829395352847623644931113876694882674530035776397562
-7062275706646629882491960277069009716984996924439240397590784333436313250958554553224460478301293892351431447612983420608299779
-4021998564670601304459878729468539224393130081394097452696802435298562203672631426231047502881058781296871522825905804208338252
-6603870763394362689777694406864771464497251023441752146535341971346977029094361489321326128197028616266687437237475295317363781
-9156020188117437220553660891624641158468448699614504995148457693527457205903178159270764484168386506020072977552224361333700137
-6800793585132251294965485406539737210356860431874461572263005112556102550605119443415354337340356018964066943951864924412299915
-9176918467253843792621229869758475550809947953676328982327607776920014653501974832672677357939313552991103607402118582223524673
-9686597280549256712036750220654564584483912204263497709158167656617008449221355316543489486938189978195357412962551710086697028
-0388429487175354035020158054103632924527177834523214082900849111108930893956355794346651605160826522047668675831813135358949190
-4345101694469873179969332042811556018423606297108948984557961826035019597070396285751114257989897953296299318364378614357933290
-4949793892609892089229851776026934561460317731511255552266868980253783700717106802153694611663582999276204920297363252094371934
-3674663375108601609896202396621130718019413744942494222052103933540452779973933501106619925311069127219850907767043719608829470
-2702622493254040904859153876396184987380395898007693621320399251663876437827374821903867019473977298529862021085159803043642262
-7628804430192406674682789691745692230306369379190920544277057351743344722619473702262372514469670378356778783948762245486971339
-0209360041654178829792127599208780855624409037374530019447406585398770659754872987726192651460619482209256452092276066423476738
-4709783672042319775995641852494077105915433063897114034300326610462577068371066683331006070063551265931785531029670403665686700
-4587667003896460717120912220270889981167563292172474600789871114756272885374551741764032376074283701965139574996577462686971467
-3848976224442081690472022609003207496720929495444016043645809920259850317579964113261377231461428538754038582648249855596427337
-6172335672098748490848298205075949543310509985651798361629655073050078700179132155025462638010290501496311312192593367695422649
-5726384573393389957861087954363684393648224844030047057212547523809090733733447320925926719918185564312722906061784825834541657
-4665490918503684461998203394016725914244105391374685986007968106627529172068516391306150797382538751326421691707344779240051404
-2641961236056444783029513171308212582932163735856854734301365261361011265730957017358847540597925397759304056715637265630175924
-3143119314616534179607705689766936638499515116711864605104806787742064610741185862931157231900890917045797092416341390041404007
-3447931172643093407899075956016941324761309449689246711224867235309324518097331543836073039264012951510199018054862544697302228
-1563566785164424421738528286186718541346261171578886688118979569809183215506908080307606078120020216388497864724764057557754295
-8570889786931244194585660557574434060147391448332058484468219132867607862446662006468299620134301595151046310252336800694251427
-0217713452224504960721091364387786965013258053103569599886166960333008816549340813042469646283329089138949995982273574974215868
-5241363057936964400802812697301682184281492778601196784957952838829973528993067785327299171845639921011068758599950934223980914
-3238619506166339720940794008445086813283016112070588367871958447351766426343723002443074101469688320695818179265745434758910694
-6296789680362763149161376071869217199662771928863547592423030630832336241218625794010606091635986342053359908043568336874619758
-5796450483018638379674081988788071939094611782491186354599577562913830254367966241420426194905385522339051453836242132016154075
-7739106134294761084702741107955615651072406250165155261201936784282832131480551569227393410480076418655073059966098939360374229
-2971567365547701845803783070635993312664824380381023912535236337973918393748125160984639017693662692774791712740599492208482304
-2270720904622266004044552929046382853488397030569658054130832432158967100326401536494483965188041727224259066348964879067583812
-3443273270836744114169351145812281297836105568675664537098362750380900035541986757124762712416133474277811013584828903165701857
-5742987445704693742780012691654778768416076035850059897986267208927114643299349752186944079949266040605774961616317552910045136
-1240573283641630694358812830029096031820509750547875205950719721469746524236951030334909216603563649107173637973757255912252238
-1182181309135378156725140117731218230316055150298076621940456444204177883491865113883523054776801063888819486505485385264913416
-5069068146388574137237425212952037225400371744975152454660711335647864580574001943714998326035983681508282903233341771279568745
-8467943310622656536228892538026964919357667642832630682651110048817452858559725652837991052187308635773654812551494387013316194
-6440134083862480163392226300450457593962112666903507568451147153007397865298280740371802995538252604177619078977124651051346524
-0537206772933648445348418297957633068071300723364120286017796847418742109018037795201017609886014503958468715621463005263787770
-3432430202920291906940764640954727327787760258258401409130943189103009317398784374181000619017547537895364515789076658241461815
-5914935373373404632064261928025631881068410722283620043865276873695737002786518062855969064577740316535280772509182462064465423
-4663807875203623784262624547123565729447932492414543360035449489544264792983057557527120665531457725601958452570287012086637115
-0847474551270439717567791117916716520890209772268515126243374020404961236068669964591032312120458856151122774707229179093256702
-2728583785414355071386563956562688209782901746373262288816864290881579324219562028197868974414398025024344306680144426091625030
-0910829767068265611067617086376443471268114912189289789288578161296371552096260414590275441364898692653660772972831143055685254
-6907552020126899986435407709381912657932246467804972165765350364308400598137400904853881086873855469475626923756560878726730206
-9692227748520363042215131444256441345425607520902904049752565589636006403442938604002826527897011684910364030121356648587505405
-4764025506989776287250936345001157192241256998927684892678268726606209680040843191546472014984020704327316352200558172668843000
-0564503985848436331698791790813182963520559967441699554268886929254925633860614440306175833628563304317763920599751129071094309
-0175566287557279025857970584297243285600759435104151831150200001725607992873593941524916608511725999483859291253760003734973775
-3039168535120967789573627753936889933310390638519872912077737282540474993630496322839461848810678646381314301370434612679202453
-5290955424609618789728513231303753525180260090737043547498273247450093929519045624882089783253628274100484171694237532423254859
-8186844862044986653314802892230697717326617551815053423012041608272398516591496440428962043914698069230013270892802838135287280
-2942112717174269473287862314996229628874313075502005461595688743732840097634991389852224318945641142059923309434297254976695326
-2444525231843962298275031069381314438305678331941237253189959661616931936428403908777740475422459580996785256969423138340880864
-3680179310627154010609137293613898326769365871171324366981855057912989303388559760676270131578093527806064422528032847530674921
-9355461118722504639190973677696806900807813249020915988601326357024391608006515894656601520223498473406143763133984605551760635
-2692839783034034225135191314183486878688437669767719161941937422862653760924569831725084821460846216076710658987697058689127356
-3364076178555288032798058397361297765867389733546080821420688209714329880465424718281983378741966307965647446727248970877582835
-5097154920011309551648620026419749934729546113147672841385317729841476832905993191729886098778334663461209723905553676387326787
-7544038203057755483948118938898802083672133837458011190981229303171157034238018580240354203030584798053880317332961525265980136
-1511152526450600575245224610801100379737911240153008627074626764499468695975779959724757934622234502314480579416277867481722879
-9208761275469748679977983637248710137550354113725122267268928582906191386758550109656015747293931779066403562806751200098816649
-2774371960428126935364571996703554555526862912399267217503390978028481995519553561409174881144281743002477593997449474113614320
-3283118387697337618913008345214573134792212133551845640272542182183565756097005950085429574121104212579366752791246087630740431
-2251626647794796903046417171601708089033102353726791435541243544024082843362831636356376144988414260766152555993385246920667885
-4120430579803988192186052185336786436260523534744839109920724061087523726726856003315563861271636470368332064799342319979701963
-1178460847308168095740461067148790390275190816124283621727277092177096823111400887004927669450338704196432823728793780107282726
-6147466566392578561700534815888328209861843963585876273190658740165656380640111544922854734365367040797352367883442096872576161
-0655254149992445465845820920429897376775083347655359252308973271695549200271712623988532809944592500421544522541040542744651771
-8895306524774577797925949127567789976094837338117657136712633080384090456221881872243825996086082147423517476054977573177854050
-4943011385246149882784947556915542478920754812582717541224558316858308474902436139789610336015128572291595765038163819815572793
-0059519490142292292642467486355644357871443222407272677363258010549846343690410511589487255437861629574221414317395258487976995
-6701428890977392343133134256358135045673673123158832116303929634062094950503008501398110339118434776130231986975400156621462276
-4809112204042804726404274446015570840535663272343219408139885535879522105193162064034829419212674983141334515042809663864776730
-3339872236842534294842100648778519220364381792736266281427277880995347117460315427394400908444602067720779504370559025897150525
-0666515892628240976196163023835072227181720931267205367481763695114784962335391370607825220441784558120081030826294430035145825
-5990171621923618467399400881105334235398291318764791324436841208478784739274728174080402657482105706012062680090302017358495564
-5800215155555227538662802534678916888507797284554941341847639680300462071370712985768701847640442454877861723356457893345549450
-0044372835991682943791367236860846326267985956993372513320157207230356385776345982286545530591945027191940491720657627496371424
-3896431871159669144163572836324937737933585239956934241358540063356296466656555165061326841756648545874963895216091891197215432
-1150436121846416639357239779525130732656046114770001886098939931426129354428928259723637803567803101198938817466591948073654097
-3680333838160206864509221215320873122528703603282455751545397796927467717336094169326962640299653768153008615924472102530867643
-6770050643269265320774249712789524649226429216132578192388680218997460246361157967129125548877818859824163987287642561738796200
-5254046150685030619784205850259746232647288005274167276588953501245671262327906633892459399349248665683674586756619925085832749
-8138659441098017401153449742392984232024716079021347321627336986000612605589176674195767657558188526805373912850372987580206973
-8191739475819996816485468724355025309335206345790673864079265551398839303546015301031614690697079405116794058344817857751170058
-5907733664187032783992586304169841870946162957846844623230375351751398150941213221188521406317499729525031329275753209552972135
-9176007624492506072188440485436086995355405038611315169617103420795642254487038087275622057368505174049950711687063028236514019
-2054382102455304130470152360854926810408620809647732343016107388521668970316223874173994646760209951211428665814705542349614124
-6010507266966547829863386841978029050310064720150129583679215294838434102788460967870976228374996605588773396271433676057289822
-7051841412308687295953020826737760628903413518500966433370038504670238126933304749517485860557144247313921158680957030845329616
-2360033770199629503223807832521648961131842719239878810835014788911969787608442436353630358920568228223028658040834409931217202
-8400997693934004696590555410764211165674028575041130093079293183383749718414250933932351869983505392135593326730456694681893830
-9601966479081797142729057700273038016579775812303462568369987589932810195102540708796028133906200420900692102185183676170434137
-3162497370959471401670744764602103343725945241209609871641803759642428128312023652491828868062451307296471228615569464816843941
-8764436487815154921343571706294950245330020417561336192910050884197950522678946771691143370350696790098631293864395203215663546
-2103973531056753606278933160819590888661208989653023859755262642075600795082475977389553769715231157147229187302967554388198370
-5511263147464601148510010944839861149087736327442223343582633059022202904665113422199247896714934045390179111585670544907398745
-6503691628140930095878935309503466424485388886339832328600458315631288162890181616057639363435222140281269282576385033650710680
-8454254370393439429040009560609022779619788056284224520991161927353411842168395626223590494290282053470410540843450407987926472
-1336825679355920509182270187363852809609898538144457557442453481966013998014732868105005901821373796606751500831791325616529203
-5075118330341336536977717509239821947081842843667207368538939749602952519028901304254002381236022047524790390418089280097834547
-7087002693940685994858725839374363930880942852293359924965925052590869503751762743229260822706873201650092697209849276502693145
-7306083000612674447155484200177291509744727003567573915026132438684216504412932709214471251820240604475149792423248249870477794
-1828750345492089414352178700274996717656637631789061874232476374372589026121784200003799632748786969419729627555600483655428983
-1419038605582900945308948756881180557106644399148478031842482768934058982366460243721966998715761966320233275607842960609086807
-8995674775072395937621113944922442969450956475559169579744736615353848691595206952225921509080923588771792361528472949801095259
-8071164393093218807836177998870397618178243287174730595843254576188688725044187468313573761652235487642008727514328298453902298
-0249472421551084408818726321837167660068433212182140863918498142778473568559604363644028430498972834010437189971676814372359835
-6326215711122626023900879284642848379045342532983675870120785391214889560676166670449442675798343547201651587376372310330260972
-7721128349367234491190961548434288775058240627555576639847795303346657927088312538298685663289068965153779510427872075661840307
-6404054826004851129562529146035965093659305313594131922007840749997852785915480413483418179403471734301385082608331943522033365
-9733723661694274986939415998932370600151791965983225598026282848806043753357041009447678948117256393500635321688798336983220809
-3023589135170563869561312040343087996767334919517638058142422305672311345678035221436322642357974773060658747505711133889241231
-1715152441111565992971519735514891973779991073609482568950260394204089469526267416519043590653468197703445241031998318436540928
-2571161687670398639649025206286059219618343667065497532146361041751088315806996390315937024865023472982359206847895714744923905
-5104856285757044366877940768642231044057490201353054349716001939164041109356173546969025877651803874584635636362767779008126317
-3656921864783698643075571406752016536758441120671704957195627803118074461526120679475816346733176098378409722349965248254591396
-1131443502066788861338718815939549028179403039813213172777877033453234020243883715396074872970863142546452822669185069959899184
-3828769910844736669658151259692028871696603091005326667495981150974845310134146991259645265882236097619326183020932698293809389
-4299190605742357746915386971343055529972124390299804481008342198376182446383261925929177219506772125075974364335839610948010146
-1147666764087177430198110110312435274731031579695008275499991697667495238558041459480531076474591001063866865437151222907417625
-3118583599222787818632900781019308738830040805599161996484071877144944130661026998282751748208682924005109173737574254051272267
-7248376535827628635806240316333585049198937287552863170331727642858039762809709721675292461634836370227092107000659180675306750
-5306506627623780068062337884640840561088552876565604494700675337745509144650468822636638698294453362040534422173031206225551013
-4252579308534696009946359817557643262143167696605231236359117810698816646524895198187607892477097108960784373761400944824549798
-6045449932335488814802338206074710052382801251742328755176048705595171441928353779134497634248965450262069632636038949744898591
-5048702418591439721957110373280102402968469372594873031440576890966279374555142674908990757259647232567240212811527932452059539
-6445116473158402926922663638150560761537491240522157144544441504700466911488897981059188305240921784775901100861995605851341634
-6426302952753103378949324692632848243080208624864503932730319385221633332864218296337728836033257029589381148577572779689079838
-8323351033213327371073881110283228611521471023685177945561596153462821296338506612181495253533007296541471850977144060198153791
-8612240193336900124220751825865213792796718254928148410457543169565765686381156512821242185857562689521331372459681870446271120
-2190046770619246800670427384048126037985607253433475697587520496744179478706647309818755439429545326720329201172200607765064227
-3736184856673482672738889087427014657874110745468152414492168023597661163943017362999706603380493625843592458433287608755926735
-4182865681401614720438201427164757077032257161772988732629306857669039790289782177374506368443513627759379215518499475202046737
-0697566863573366009839193988358046426820897141853585923998497091914817356341676241151406963597520055377063092845547594101697448
-9770510287164808256026738019695567751276805483623280478598925336381177794945569958800804342768914035606587017994256909693642474
-7259755154611086941695255874435534803016372667978524879504844920733928636400671846029963027849546724083520281554956394251995619
-1834558695670914755649864898844629047200426021450454765139131674876570357846943407935142270035129746721137853801869970041785717
-1163596604514706992103337640896730977362836499853948987124318776421720842943109071494096297915872890046802390417171851693498985
-6696873506860390067654571204036998680608912603658516851469732917336706912396900863519518863153116679969409193499475151912748965
-5772630153097284117632752487886616553301227224710840592032831301443809681968538716385350119500103381352429438906070006049324510
-7255320449590155185339594353774382542901912346562333365165993746566717810379624006716063017965110258762932735063223456498216112
-6248309487192090873881009634314790029246770378814629258114526635202683322798948006269443152846896870196478753064865917440440787
-1079237303256511529274839846470858035223497145513826461412560940325017754834231423361883666751693338383865225187216612119160015
-4861549012935871901840283860561328549067295489644918336638431557892707608901138017599623121810750153111482390969696067122547247
-2439131148441383234199376711842415663942174805857098114579871600691759196917341291603802573327405138562282722593414751206457843
-1973359935209045256671529911507316084304214657632392500349841226204006608244837820483129185333807659672251730206136609040933140
-8184943256874541309753395121370721662620513066937352652876771594490437810449353276322830929392380590748672786848276069239565457
-3348707026381104836690412750227080237859968000391150025633563394577801401905026748085615086352851413067595432050498561008571529
-1877075667972855586652155165911443897166143801340467259805712033287524340520335275436517702758812944056177253493418193171478211
-3774854369590560985587771159245595691913575127970445498501177157738494672527414527162836050852813684096791146417973149365483037
-6704552131555310027219368793280881514598163193897955852905718685913917573430057096937340959824715120372466589909944315684960960
-1012314375846207604646749185426484171598374093369935297204972798525329648052886568477644707532784462941904877487489747098535818
-7985674284714583813663198777955800874049562438949351977791559431711873042288148908962573859023348239888106006645129281470473018
-9254850687404139400561382825175974131012329412859199274634520950110017567085977669352012785318630525841745235957179742713982397
-5097303689162257167085390435448404263178199429357071875772715774544733708487138600770119134943129539543347602041901144161660698
-6953181183113203630678272715731094392489433607360104735402092320971396494926265205286840279679199637087859730680473846380532205
-7565033230336604389926974822292700950491849340699150720775179860790531037997637976970549940150909535407513425455328335706561853
-5335368312471755733760541805372968424193070274491865313428788002453279122401760512494622819480016105587606929438634932015824839
-5559016338160351661853688320039654018084969722536423822579994200012801736919709694310831609907486201946501673508356764142877308
-7309191546539260723637253628477957548575327772499530308454034050815650925443083418507106015799454347735223841084017225944595226
-4885590707691548323545253419048477650698836445425272829459034786263150039138385336170173040262385017882023012446601786508537725
-3159300795992899648874466508404624507417341674483549750138299511054547355595935184376005929821246479521411349307469101710751249
-2708412392547375974662585574062716099744667256888486220537125770970468132844596575936704205294434437646542619212125911160088350
-7671842861670510559275736664436986661209239228900436842961873275642777838933287515196746049787877411927981310119576400549956135
-8080578380146388148902757671260230173280743467984486835312292349158474503715607238743382799824745964056080082925917323860644616
-2120225379169780135148292573265658608927358543522142151484031366388491618786494744941370627406622031907792989518445311039563243
-6616422310981362438162790258221845503573731451992162868203601740290116853659138924079987226446597241351646843845278977024986205
-3662517640661488061073964114703410205367685498808240378692251201166863090113025726146269622096930731719426952075506480919216671
-4823643457908716999726557603223790753609939423361772712423018042932577115436095139459068730410826645568806300379584835433450946
-7837676208477360145796134097352072195957133041368812408314333472555459775670645841696822521516557015970698046160780950308863139
-5015658403765286649459660652152764801017680991103667912937430519322186712931073677796456215078436603241360959178629806771058487
-9139921128024002577938454673706047243620589115000240242563021016654786832806633509254081676514023612790990852595917560180876986
-9308821204883025320496874045455981233709125160954382611635568126874562312377547977111739040746530325193651004237373402504537024
-1600821697316131396065115975797494969376263815891380490449703227459763844691726208596151555303610430036532384862800860173068687
-1677749011530966588655330008218462556189908006964342216676682876215290543872066380630113889263010720992320394875173725292986311
-6989579261987669045792589013853182107944124182584456537044269091571439065320682853599165887592383283334586801282099984394392022
-9970108676029913047954776468886108937529661369633484559390003673582932372797656385704195055160295258401674267521236080828952316
-3273802761420937902459164150004835781371893878839475301617292925707508874975102558388990001315786419341804043737604037226331752
-6423865093791333509337877707981916567162340796885934470115945789596479789320653277617641131277451340371426117129794514423620761
-7417609321834214164793102707841568625675868448913528641242723253295495191476269874558175687931888576975179732585669568870748778
-5922089337143793314961512325922930026645734559888635155138481555659443901618808201784727019382947895019140665125084159195324704
-2832300412363246058905063308416630201890917641050411420603351067801736891124820850891397186056454796477918095532199343583413766
-3842538349880871712437577001398701888177344881522702272474861972439339253087204797211344636084653095826769076765966355059432859
-9877839498202302366738674681533509411775934456542381162185787945980551914209016996885507489310451917077029188324180322160260432
-2738878897545393488539641042595991720479279596803533846602159358145022104838297930283221202267258855473584700375502341592186375
-9062102173051107870783580788794675784912283028909776152369743147402812551267763802726764393893702046520930303504745751378996798
-1890158543698671287785156969862722836025364759849336645190863408137034806850238192071351320453303572785270717307117565718365448
-7734822410504169526033583218346170435610106103279145679136488844339942839493180608845290017442034674025577300763459944350044123
-6105040904995754702216898271414142776115817083443246834852579568391309141621714380298793479424942862844759389997283360409266478
-8207744090633188685115276563756960203356370566871533095111186389044186232441179082078908516925531610020829064403059153715127765
-4543411669625489070844963508370766554494552051662899693726257799474616282059274838670819153036396550543481066774790569529843561
-6679799651036598201198464287278166599830430479287605906552407498711145045497296895091710143423667516678729308766311555682391918
-9060618446032966067396024483927774799271013972963401931215359008050857228820472502367068320857075813753280582206475097498167537
-1091834892775689353192772704190529392359261014072163618697328287354942394830079331974933337512857161868992496906607708010073398
-5364177554337994653512816619520240821994073186844625407311661314696382001907220045017648487411581430791143507856735567122196867
-0716761726451434192525856251744493844256079661428358229774069510316066898590543756088198375973992063361152435222465923662351366
-0043075513893517349925411233398957648025096112448548886678072991181902374596438596256297098774636238148028169588473828501924259
-3228516645884143195864667466124866845099402543607000135666586926382976262509368071827459582454935921975303881150829096536404067
-4761157693052962556888050028734514069905365690844215214316263823173976897101122538440327270223709317772895230031391498145736860
-6385041084622772519780334652630409495229736116311103527030831268982936563366735822928512879378203876837625284271193343076105495
-8825229991999801614347782438381474867852878074358430022437396713162807802543161593009219312576950358519990247724194904234397934
-7703801976947027234960802861233790319790676821468496141323682139060568458559647230530529267618724263639883376817372167884440632
-1726382143017323548108870010820096752312836426102452450577004449101845698867822824844060001600494219691513701486376765683162295
-8567344046439933818792026021934172754782928648841755910876641284145941585066904498876784179002951113808421135227067381608911653
-2236981696764483162752804813037353468784452076739585261632267090804876266610444767882886160729217192498345880705115733282372008
-1313046830998564657547840785183730714291004250275503590948256987454019097344722968276149211207582987088443854985798581722550023
-9063006406664758572850022859344148370428972822517076773683529207252067208935050546823673576957790680951020623419459032466629849
-7938928170423206022080881849589066531884975323736816185913375521669990715327020849225286810140422793741838143465182856377816749
-1265756842388175742586708059491362377918488379984875832030848543287918941984050070389106581268802594158962582407355351035627049
-5900221712437059899622129468224343840497771816212975521659975058333318690798732737341876177817630804815720469182652538833483463
-5823081639915099173836211725045578069819187508359785075471465778986260818861591546963352470179514396250583548650281488440780418
-7451048170517299540822354367273854496577812259623792325601325690996083083112151683648900535783537568629739368276233311118065909
-9084734714613092289461178939653038690130944168935857129538400432419569476969252314501208058863985767404598559353985694589773895
-6277214607560240011967714168838143750302367595949536752213657372427124984199709048837186130780108450270594932950252051594320147
-3499572321088417920853211811454866152496225537457554175697449661675274675801653044218258736968600625898775131530277707042339508
-9914225219653958408220404955503421597988800462882509224240059485399789816322467527449242209991095322026817971575335077154317985
-5278081500892846628897442768350495212681297210154604830667333056587120720522354514329460517681155334733974540010110756237411297
-8210591237075811936724693019310304435150990235368637778807792760313222154371335709089813727563208995319466715986861635780866968
-7932415587435911762210037637958044637519791039364219987373646146500303943912999127265553435145017969397164413915816752545161718
-5633226031400350789184112011648210881013020831437183038308240362781644283374155015679893305443987813011631237184023671550613020
-5811978080228290171238069706605813947244025818423549831774560590994763911374360626408512454006214897383037052649605527910939842
-1578662832737601740265954708879993575835470810729170613732770615041114798158887175252200232752097837948350852301754510131346245
-6068409444406865116594371496646576550470605636603063539678037419994055698404550683594340710909264161990867009969259182486360989
-3207255402572128867597708386762297362519921843080894171603067736003753278183424031926979188196805787920726466251458690002582913
-5008569364534625206093594865389861974491057988729642501378201086357626134901180260883065306275795854872408871966970358994916566
-5260870280380960692056382943423819321600456629197713258529958092905135072192290151897612011642141070383635146934909632500071674
-5103943101344555719687493820066438065019249811470335254469779344109290667032018362593087359223818942995619770011635033602760781
-6090182191502983738438010896590866621707943859659299906860770756177151013807688207972939771298998138528654622092955429850905653
-1626336772125369872523005387925612023085181385255260458074393235131647700974860337649978590067937668268507156384372177447503498
-0983088220975640726485831380650348574527016263360984693517646111104451963030529155545125362875373684368744288268392996464031787
-1886577864886560438915496753180364296870396016073972814584707172757602216484353054194841318491639088652070784986581587056423963
-5791295955798452846006486957884980659241458306340044696019455166134558465794056766142717707049752847050948964499027310212291201
-3920118159051788842792018209898781792646763214510193250573669914454162275192491103856842226701566784572791940951044194717542411
-5568425247114245514540844570366702834465456557122445652286286614869534230920871827766118797945440453053831301603663599611151007
-9132285049335898106348530191639824752961756612096827245060794650887002292087021431444313048295402370831165699527783501924024187
-9094264576555332744996979181892440388769625070877328456545115444598432716233979462060670021904359658071557042696819752714761359
-2624335032983933790947468174067700780434730280286305837296068262033116687738482347338258135450536831314508366201724139587815922
-8450751384747855334597310320588125802084226440657572189418133991724784364158225409421748567123411489197359560319327166452150553
-0217315146965805878176534045386582646736519057669936823885725039838691917663928104666774688631639185290691596050519297245051431
-7940957013433199012061114563562278128253591876081307949974283942244584406336676182042124767131849195077146222822951756668914757
-6589005956437167623060683298552386150740712051896264556502825752701728084586373026820140301271827258402697782005508526864025995
-3287288894211530920495178421618385358928209601522908652144815977173646436635300032777312309529559530424309089857544514218168330
-6097483328468004536631471410495796391660358670051698715076410248502303660016161800128810231929174703618080502422800241933644130
-2956392224013095847029227680428083425620941588942686433369479814315411693725173853101111802188051631515982053459377355277916857
-3065681935968907368748287973480293783213808382487086015879418794067438804225330554229750223350574245985145312570124344685276455
-3489772935059313564818602631010215526615299221297140830316899208960430528821219213991899112889288129943720176337014173173174332
-4169981630658215328566362976636435099613640630157506404256612156966851420692144492745499377619802506248375541742742014068421649
-3723697831339666759125999969874386488250045997138226100381868783065151573396084764792101954730971063666073382268822664370648202
-7695739092394145422409597895972497681500338948172798211529024633083754418602669479252615594701113082363308526566375385313538692
-0362024243582700927996091721261779876357892824920462321831613846936511858949877169168914710103805138231321626700946199996026230
-0910370398336603134902288593437904852970471827636244578441003561376156126397047213862430430449454667576391124197185148345471598
-5028346423876572027639326365391106837855425740087158529449602646500698308039624506892347711322718143846562617911464289132024496
-9181010776426759091535139982513243227866023899159123168014651495554175929065144279128447458894513674919834462361991122972799428
-6472902683846165829490192503189706567753176937559527683694767361120216602239730653948099377610225798683453077405631209096231256
-0512986051426035486790488833906991553793296020140460296126591780195814787329857676072922129878562425136025882880600984983973989
-8577540121631192413042201337007929873227061283325668352988181356692287167551269236062168964313569524237889901244379824573640154
-5738145734013901847027973765976787682776812683421111101939034836663608749968365412229382487929512185391212964474327857768911300
-7562207836356806317921677823535902895646261255973726228824124734902468677105214682457780953879753523764199156291556619449942205
-6685144408630396033374384521831023348395708816803320958823787110609396335187767019703187308157675845831700883961350733812554544
-7576609828782901349340272529157644117188745883108516505970478068227119245704450471362770646680973620118556831550370068906691429
-7387998131808587529731801781598911046784196725282943998624870759033897379214694560999940160160935915403688360574784745832951209
-6248576464881189569842693329569180599977760906738941622134746107827192298531798906163755685774369390363347404463590563452485459
-0534570888244129725519284614466994594106901806409139995601464274045789187815608635654309801136434736637205014712781222746921224
-7852721958335248170761829133326246797700730414740667697834509581576475365734827900004460335634027879413672459976734498386195835
-5088370360545200433735093090688791665393907039059272593032100436084501418577206986549399579720624028466951070544585214365207165
-6435187129368614449937580538296933531792687165143536181239511296901417188887649499928950174527974591005214327286330726199831884
-5864261175041853165789209708620714822361777843032399821785843235985913827357647540975103877312914819841724359018056154229990484
-1936832320986190570216413377747783409617074645446275675504398782817281167330026961325947267465552277788937638823143961712338389
-6643014994016028760819796829700070956205113377466899907953033114796754643995517690305975245695734383895488045495784881027449542
-9277149772110266765516542199009389979979428729803481968242094114554310414335680714665255584623073310801300516821617747378223514
-5122582985363185134103472499467534154970594419472963412571152321765481331992341844237099548533622925469977982035402603376599366
-5702039170472823969912601643296899307773750835106819267275831078282467998094066465029472821615682366477091470622470049719032042
-0671010358945492991105729283517652015315441687350701252921272273957729883415005085140318681745681298665587818639399209287652478
-8504952151973256765543113775190946452315557877268395630007206112950274261280515123602637574614066439170518948486082023049534264
-8318785147359309244073883391968368385030412213804815219561275632927036049996919071912768810313118985299449822580618372563128123
-5447965794084022881336224721150430474622954063445132529997642171980649882452452874371660709010271333178089011623650142945593513
-7498570392070031176556263724838104407401975655807188803601068318852915004571680712468602581133705435004279673319305506280782318
-4235251770160613000830130983063100984485301111420207302571915861863284245935054969687285090784775829404258632032504825073887582
-6407248272722201582954889873840796724288126199508498948167917317499903480984445960848498060154084891463403285778107348687889003
-4953941330396268815099409977237615027521463257528034758197037642240947224961515275989640733601052280398818164960445717239008728
-4426630124553142687273205330644281511721380282097626819427510520776002629092574526215543555846304555626987349130475830717662512
-2679622415503744585776560549326024439456730222065789254179516934309405880579097989297964155354764447981652276792153719461894070
-6549452078295195952851972101892868752466073329081552637836554870868329745518970415001754631788228704301414087107528862687179382
-3095714010946058367115405111675588241660359378724218257897889232511664785827286570897205547229279697287663245465265895194075831
-9805465298621739062011152177896594580714703932025865262409510756369094551491315344002976208292437754134178483455044310999687172
-5635853083465443752399385809613532628000929554168679920157180193163062291041706935484519604033746044464716659982230583915172977
-1397085494342438160066950214161726216316797535747161972858218528442291370670389809452231490128596440810108729216233152926963393
-8718938957831579949398261083744948669476176529513240710990560722588644755296402086806852345746538236347718030640062631744819555
-9204989031916871283227517942830744003831314993547893753197955379403077174291901637842637655437310798500528596483721526174221178
-4510621681082500438705444746385938892179962383128718253236867948364044872547102979732643922151263657382171953178711857903512864
-3434625913079139632847162412927858083774910063803492872036606235419074389757800463882617655159555904544646003283714069095719127
-9422478480758793975004764634088848124200701219293815383644557399151474644429876593122326476162568364525117348282565684006439054
-6415412788931044743766779624337137193856769272687596658353208728053926044570228051289974744446738511898266628888688489033821326
-3857187055764486798882511807937125159502970249818799519647825055901143034107396715341111836431533491237288074873324479254847609
-1944275217447109672414805304798039892872048551668309961639053276921203694927946551682999672834794575568139407200344761188832584
-9228691574818073805866351085919567356330517627511140717776424135867621344167516969731782408297076690641510925488519425339786231
-2831239904815704920016412032913992948413502229392159186483640311971384616648328934218616172408437024641339341534952850417631408
-7800709599423404547224077175920136421077429331304204846667623312748910375272177983791546978316206296185604509872479031731294077
-6784795879386865023891006814459422181459242147354385223330262696056730516247499993593952360113613078289229711721789291466201911
-1558378948527819137236700414103122090944390583763494240148255786716027072401897565958932034145583789267171948650451004479200278
-5903365269957297061267790413012843976619330012086443873201405355132327717135407147467813950090532723390786355726062359803253439
-7629287528827946090011668159293077488731123501345393936384022425933097863996545653037874008416991412735073016080615679561676815
-3237960418959875052085168366152912866396485668534444686608623522780325138572281373258421046475238324527598957994900036953588632
-9883457218912143598750744649289916045155230666253998012127292069605955397882251577278616463161982956480851083203582599294132885
-8739605725967415654345383552272209454198363876790394143551885453633595477692847087747048445889713841117432214889427740276964122
-1808274594398149686259653460592417452536265711085053636183889817336547379067581749366999937190487929782077243956107305394452893
-2858306534503555758138192142342374976569912519114070071304001216131565171144485590883323767986065555672710513575942087665489357
-4757258115582473299797872077008431880804766429204591994348523186470015406253571125582684142251809933836340635261386229168816736
-9918555292750664784762306372865895993392873092492120139178044227677315162874458415577767229742354738329991177067335396671747156
-9915416169565774505455198608946138326580556663002878103141442158950284935423931276623631554768708518659417736110868144091121408
-7485024844800932215930566743200643612646843426043824587026297306446562930746643938917961270550045568670866510426684185886721448
-4920398501344484751530060228048138752162844188260697740262204586350188489261031255952257367650241279996726021255197979400713310
-0983903945365766675649828378701431579004857069167244696371192650313930100887222144395396003002837274898192175630515559492616368
-3277569441388072350944394279081011821982637576381780324461779633187405677617459795408379063310477462661505822241372624056397980
-2796195339856562934096874382820282192099707799004934067504550995736513197478848274092619553245513516215920528915358178045259427
-3947135872153511247151284668940911981933985156149720562664695031030349744372110088157223178406720212021960705751648342245477823
-8276198303392861443910819050105767637970397653898744484200995946877348235373325786715347188697829025445506211703973576651655150
-5882576032689008918318143363475006909501115410116941599853261283394744451901101910507633092078494500214632287815925595536310673
-7269241743888980922214944937348603959760552838607959592411748713582006971089673926445144319837129979120595791416170081356544964
-3311215693514569183444297282757452024106434743342415838798070572517431245405339373780763180400593713529558089381582197573125752
-4556878108283717136754864320383151773421100605854818531410424407658443836201366417280243912680383714161438889747985913112617159
-3825283938152818066103999819485641639048153915591788440799327104545750772861261496085802570014233362502408220258846139854490942
-3543037705426699624325696485612282411023745859388735341967646420985563945181345313960301854453402790876180716518598169356488497
-0055015399759018591540911328290609447855851641187622864276870240973176403939507548117764594583218172186919643238977138111158956
-2302146157347717928300258596580246250649908644352652697865369736710811431250945078622499892640698932203651495464626034751579299
-0465216581077322245370388400939469195489616593652097640401043603078806904801413336072374703228412879808024013691780444525050754
-9151727760868811886689437563229171390965138504950138407176506255752456724326383897323049258585289255126700265024238726662681731
-0098281899254404044904741984338800905867702052389334861534065540083641450439874866038625038945827791603161398328731872690722059
-6264530562489216043969280034408943083142765136686187837798682491792210809601751533837187815038112873969767271421029102693650921
-7670518311894906730059859298650685509520663627502700465860614043829130684092155123515969024766529965326820247830045239762876384
-1971827918374425559499103800305418434180845901819771222995898394549615763182780848478726307902754377493105414864115497763562067
-7293146824231836764324358936471102982745003549454252992884038807314576844595566006507289403671236553892547396334547842381936455
-3707012658412106034610065750021436552038057251146149724375405389299956024255098042568008242870114719254029045709055991603654930
-4543749521242879802728408392725236169206369176046813175364511678612424177154836269263324760122983569594445005273913013269664551
-5817700093174352547416009939112502133121085536020612539401905269863944981266637678387919942591042471679114800424206674615903746
-9928390417067700668674925186060124842260894166668581468768675095262594932684909013159566891337437296287921942274275342136808279
-1720526807320641693668140417766107453595978158154018754776221360462162393984770342801365549647871062173743896063916005240392253
-5161802386530577435326894842370519298812054283209695964545050386222673476579184628919106024296128426895608065795872894836272477
-9269809290510364760281346041981538977140734635535715877861564862122154561230471413453427434440292536928348809500100637413855174
-0657501300841813074935854851050163894991818276164751987873048063138250805404584707419292446697964047248725308217946641983844311
-8063478785147013188508380911686106501438761736788881545360437305874844044022285005421389985126661063912349587081288388003345466
-5080385912620164034274035663131591931589292314684519240800453976434478145811035864455399019210261903984106215732682395895799522
-0939020059406813121907073513079575778716665344964094359764782266431575550874973231091097656538411338304404129653958312868999842
-6732798933518323978985303323091966916070134400750942228988862433672654847071015762525448860254590537863809085645618465872667306
-0427846766351683194895724811056690695837239230026578986973494357639196637007765612283664140977141629336513743191474504552821790
-3228155682944358310924291228796943417467684350283874136741330013804595358442242749651649995689037646356343539795964269040555905
-6826145487746532059740843858150338835296508366342272235981293613561407683050389559856243442342524690245207486156018191382164551
-1327436225221742602074234993619036983345996345216008664910823535986496447271949044534929738194453356131648251656209560053354614
-0407290886807276555505472513777566509192309345071661761386510676177956004136233159240180697853305064135526857625954524710679122
-1431829687708285619275876929673787963838663779016128696006658789855078135858492072768308764926825429711165034052613724177837083
-7028553048202580189681827868563421125284289066186493489485470631057243002992982744971998313406439308961352814738730662842546474
-1661580089658576037549874036611720164076275368701553799369961428692585978010787204558502174932891500734632543309652429899761996
-9575856899639421670892327891209797029282817824375074240277705275435359082312316792956844954585652271368228646822716619012170165
-4690146795978834583378953218274128128954879679834962721495470431115747652300230454490265247933455376976025418712883919785265770
-4032584676449148273007032590154174755542691092611500872882432669889260868344191769763590664159630537010368972815582431630162563
-5692592732110530293190433213941741940871216528267789341138499704212959459631375151781937020467215223500973204249438057106028338
-1541214818072382006149334712979978351719934230083959861254175062060206728245934867359880240685020444293227864055618527079589472
-1439159705776204064690488345048299759772753492079024651663143703086754589449249599931908249754660757813918172727140178033198709
-7752381183500066741893133463291861429042158260704598873907314527361438231014952758222297919601552459311683576335125432073345960
-4158788096315630807867178963280856579732177587633674289101034755608242832707107748491269005626588055241208204418618388578035469
-1184416032139115028602210049000593619116279959516862765906011705138739437332038056873961010636018153261556031158803924660448426
-9834587809319862013631879808865489908412831755556199315250744409755028410760389172898604230817719091796600511778684843691064279
-7878372956127669698977302339079670592653146391325443980293253311254734925614678750486528888944734310378404782150993544089766813
-4482271911480681906845899905802627519765113355182171607609262740960268207890619067150293516596923655844247586174848972864721468
-9552003526630991149245651109495761934587784128507108647124483752936558263106644305431230364441437558819641682185001628863763328
-9406159315820904843204929487522677107941937076263988953382649335050929875295580457118791755887589396355358703932935557257606830
-2969493527901243167542109903168828628101917337300403325039813279857934939104326409957807201457446262732489661524241158979368142
-1833967145487476098973136162241392322964264292952490319901422154921305200229075272133864200487657774340560812039475075659326308
-1445298822625141627089594319278576573094647719202883678449230305616300998398218250958603519589651710614887336894157702428315107
-8911019753589361230572967964751571906635823516517521975275494263948066958905939807605210390275340148405377313480598158489558111
-3183749609096747980513864052412964607501407465024842349303716927046134047076464086834827581454812880653390898896534483223922702
-2047220404370553586495348686661844320582343653984119122227275984849504305399708851775077220602618170548438073982557547603633042
-5484875538490583169391720574953649919139069950121342298729189319935008363006908499817188567294646844902804708973781249800855552
-7421001424990409022663446235185073936721530809635245828159482916215742480785440259606637437758227633658889520747280770098045723
-6510075506635860479703887783619213078585799368504850589990946726994909109916359460180863720392604659818835051505356439580781411
-0959165291367850253561235537386721365762207442766902579631829064237987397582522884081947056330594794737026301952693630585102680
-6267281924773054128920399667616892395906931391070201721710734680164804934661829697133693962106573047827000567454860592220102084
-6351225785373403775734572811446819619019190839393144125015360556285521375890386016901082233720031340998488590003458019399286006
-8086983669350678861956334882898616321436714400384547300867927315159417274826609618496301870293049853960758679069277021904136960
-9865037759852510085988938641077600576537641357106366728530348981390205491195956901092388717027996104357442748303975082427786786
-7507248774842522159480897459767378325396763974897420116495369220388118224704985677597657612836164641593242643705906198310715923
-6020323897854469493762019753971728667497338537420217765895884555350482562903234559598367966289598307357713584270039680501758042
-2970682482901424731104641663111768757582340710358846705532647449734646971482108058532929343635001949578504462729212526976463810
-8406644630764947233594179128313043631264609165757699872474368034583055609364865453910940072958562666156078109884350362008700655
-9106501316131398908994689175684333822574784889714347654697727209736986308940910431037486363365667132654371414795819563310659169
-0137910472839714679161637852622472509459014895991142745425159229935069751019575455036034662579025492228994125955644298201357138
-2263663590472781654218931217059804728469684174302359039764853349702219977113201315914188584584955078222068657185984247622363558
-5695450824338155861977114741562006985207639935376048162114526556989656274727076392276059583216303897816482298413238883403403632
-0038975862485843345228895776545691226502347548540923009663654944132545600827380276828701039586345737400863528654887451057233197
-1285772332269416234665537910079978608222632602148452508934499816027147308767944385913555512454637610386856292966968437445496548
-1261330191618765210009782014085845073559775965093415001665110717532374517158996315004359428915981278340620344383170562473911188
-0755483943667647640579099438554263999127548734337936583257964438443463208543269429173892355146856191237124938489437234962714824
-9129303544439064208938552091032859116474732583566245269345387009587018850752964356086348467165770868170114265169858965115946288
-7279622065007376862875602615836848329672073134886504804366938182665036461895999032293214820132094992897811456738921945565996030
-4834236494451378286976564913106384851412866607459667235230175488097172277734513000370973157558689076209485032473704000163914074
-2906852713508769108670361019771730001144071549164484831831379004788411810506441972725735257048988599402331202363984166872400551
-4374843284474261559922201408952633150671870157517305411040726961843624607898601648184347808307024923212656070285299487288795732
-8117441033938778257340076295628604371272466046790715921004843853378457388333862596453687093388500288301007959254642621709441228
-8336419205482595246714478040728678515920231077940527413442313540990859460129785367310524821300597125039005330560255760446207185
-3407569957745240672748410048085824476146107644741791845367520753456514888607145322239479922742610070735465164422006326154369011
-8894279996606564122245246476739025836636961740221798143384506169709797876615015522415620193119156094455114077417058486277270353
-7131151035004395224877087554662361771017971918239145723682405673667071436258453271309611849685373102636336093172827546720740657
-8432145665345782054212385521456100690288045272048653500410117161030682916822394178179943934653293870095835416016828701651397729
-9807379993673315841883406823522043062628694861759093682354411179777001696451399181533177926653740164108712792568617753057780749
-7552198060883514609633356358462724322863739238474217533806217264897669042731651388657558396154686026363774639912794923252267503
-6291771443785740732590982981719905524567339994411151615939323485160260431350712239547320702908777027534814334898810771281406391
-8383725943909858701756050979518960102350055348726092344362770497395426060226252186716626586574811491995835598427931237638307288
-8507265667315900242180544608612147833573934012185340789193936346356941286917069481442515796977733286907179390046007293777378415
-8688298391307343027481331662068268845813946664921272848764804887244314914603468930763919183778517730411504413547554154855526591
-5310568546507610904043747230819248926074837842921381365456929822505503792963441504203788828448597610860322974517666735027993699
-8190512204618058514563016675739391233696406975567198996502543146118326981238682542313301537034074950744994938638623004424018628
-5962797353210542352910227068452267455627736914233254078275501019026029219977380762852165264848013890176220808626487330453830607
-1392715231741123546207682784414187261145744424815836598165304144212321073536110482416294352751979189695534837507189501132643925
-9547196873348778230662094351866444409683500705986806451682346762409749401895555972393170493498341109191510645940668680160665767
-9096955810744288162025152776265225979561511052982298941267330985571152782374720461772752985049704669084322641186449467889515212
-4360617959299125510229120098324080014685874269740158186892010379118371918256414709312045505595343772662619039003425826619680875
-8242651081630156918805572079983037638369031262141838260427869758050055377235638965872717517504788429694521145838583513263909672
-4433259455372438105974775408627724880736064277338137893108385178827104479149305047828800826485922049778207824411348676510055718
-8718825984885049258859271868511156347573558547616835487996237695354831720772501296121171500663173314753159506044722718279173640
-2709996430110563394535123371054969016136174141380219513450493806426805948941155396288218826477132071568170532718023856256400877
-4412955918580719390710872526700485018418160226844433869987075876676044792011973789419662798626013873183203506118837233134120481
-8772819562426148199715932002776622117594716096791960417797687467419822085071157480539482033047913473604918965910085487367720357
-4625085282706988812822930138218466374524023159847349699030998731244290316248877616127354994943514784160430249591960166158827428
-3012297335233487487686932791672504848939891571342804916267615897166810277253170819233520663757428230248104405100538854660927429
-9123919446207336590235297840044149569787830675448852079217813254125078565940555357151112153929694801251132171203795549941163920
-7476175369012980559938118310990110840174599144325883878065361105628152837782089093135806082805172562067617245231771061838879589
-4768469919871257284902195592516344833223851928691778696654759047583702848545509080899254152913598427216007302226235522358460750
-5223927757227044947866784478462919350895723643402842384138354740120256079056226884847266693352002580953694527348195695223607106
-4705073558122375415417200921965563405533347843275197814453910296613637292816403322858277400213988846375567124674868467361795016
-4745728385156852832029629080429064757351207656991841817680115495315482039644479548944488439788311653187692817074819840714497361
-5386314847182104599263810424039609228765878994123179215715094367283327303020988006589792974721368333841513658700314945433634456
-3685020221252259142980926069027074077129168059113331677771782227727933843623094566219277157186574916058687802285827552124321505
-0794558617931775588320039074320252238014802597836590634824227249703483529574186006183975509386000848443692647358501225142361167
-3942679708028160995866607265771564423203677879968679929985370044267348240320617033379072586756373490054605230219409903866795469
-7536599276764983130315949383875187945686502994166320326189211280377933687730984141460802381512939077916932152569652666724046409
-0292377825630966235158683241512971091944539929600065707699283877623772501033680549048220288927590692487589517712276010516389098
-4141777627623117777410741182897322646935774432337593489702909715834793849902052358894916963594941828827118210427424755222982593
-0263099400776234259640984881940007947968250580544744304077736076557953616095573458814306253535718606350692981623255928091096507
-0588327094996262431505059042095661828596107333578122924612340170790916991622052806671333685104366780235136494027277232872825498
-1523246308282008538061408160202517775966824053244715248653671495274650673682535042749033828795099010214859776685551489176975506
-5811209762314534687747281829159103097186141033482266881873367741901377849867980657673782571505747169485443159028925476795003998
-963436785863456565690613348237130676523955561372248056220702510606833697646989872355666869136182759934340379879840576201228LAST
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/index.html b/code/cpp-httplib-0.19.0/test/www/dir/index.html
deleted file mode 100644
index be3c05f7..00000000
--- a/code/cpp-httplib-0.19.0/test/www/dir/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-  <a href="/dir/test.html">Test</a>
-  <a href="/hi">hi</a>
-</body>
-</html>
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/meson.build b/code/cpp-httplib-0.19.0/test/www/dir/meson.build
deleted file mode 100644
index e88ec79f..00000000
--- a/code/cpp-httplib-0.19.0/test/www/dir/meson.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'index.html', output: 'index.html', copy: true)
-configure_file(input: 'test.abcde', output: 'test.abcde', copy: true)
-configure_file(input: 'test.html',  output: 'test.html',  copy: true)
-configure_file(input: '1MB.txt',    output: '1MB.txt',    copy: true)
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/test.abcde b/code/cpp-httplib-0.19.0/test/www/dir/test.abcde
deleted file mode 100644
index 6a816546..00000000
--- a/code/cpp-httplib-0.19.0/test/www/dir/test.abcde
+++ /dev/null
@@ -1 +0,0 @@
-abcde
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www/dir/test.html b/code/cpp-httplib-0.19.0/test/www/dir/test.html
deleted file mode 100644
index 6d70cd0e..00000000
--- a/code/cpp-httplib-0.19.0/test/www/dir/test.html
+++ /dev/null
@@ -1 +0,0 @@
-test.html
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www/empty_file b/code/cpp-httplib-0.19.0/test/www/empty_file
deleted file mode 100644
index e69de29b..00000000
diff --git a/code/cpp-httplib-0.19.0/test/www/file b/code/cpp-httplib-0.19.0/test/www/file
deleted file mode 100644
index f73f3093..00000000
--- a/code/cpp-httplib-0.19.0/test/www/file
+++ /dev/null
@@ -1 +0,0 @@
-file
diff --git a/code/cpp-httplib-0.19.0/test/www/meson.build b/code/cpp-httplib-0.19.0/test/www/meson.build
deleted file mode 100644
index ed3d3577..00000000
--- a/code/cpp-httplib-0.19.0/test/www/meson.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'empty_file', output: 'empty_file', copy: true)
-configure_file(input: 'file',       output: 'file',       copy: true)
-subdir('dir')
diff --git a/code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt b/code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt
deleted file mode 100644
index 3cc1ce7c..00000000
--- a/code/cpp-httplib-0.19.0/test/www/日本語Dir/日本語File.txt
+++ /dev/null
@@ -1 +0,0 @@
-日本語コンテンツ
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www2/dir/index.html b/code/cpp-httplib-0.19.0/test/www2/dir/index.html
deleted file mode 100644
index be3c05f7..00000000
--- a/code/cpp-httplib-0.19.0/test/www2/dir/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-  <a href="/dir/test.html">Test</a>
-  <a href="/hi">hi</a>
-</body>
-</html>
diff --git a/code/cpp-httplib-0.19.0/test/www2/dir/meson.build b/code/cpp-httplib-0.19.0/test/www2/dir/meson.build
deleted file mode 100644
index 74fe7834..00000000
--- a/code/cpp-httplib-0.19.0/test/www2/dir/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'index.html', output: 'index.html', copy: true)
-configure_file(input: 'test.html',  output: 'test.html',  copy: true)
diff --git a/code/cpp-httplib-0.19.0/test/www2/dir/test.html b/code/cpp-httplib-0.19.0/test/www2/dir/test.html
deleted file mode 100644
index 6d70cd0e..00000000
--- a/code/cpp-httplib-0.19.0/test/www2/dir/test.html
+++ /dev/null
@@ -1 +0,0 @@
-test.html
\ No newline at end of file
diff --git a/code/cpp-httplib-0.19.0/test/www3/dir/index.html b/code/cpp-httplib-0.19.0/test/www3/dir/index.html
deleted file mode 100644
index be3c05f7..00000000
--- a/code/cpp-httplib-0.19.0/test/www3/dir/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-  <a href="/dir/test.html">Test</a>
-  <a href="/hi">hi</a>
-</body>
-</html>
diff --git a/code/cpp-httplib-0.19.0/test/www3/dir/meson.build b/code/cpp-httplib-0.19.0/test/www3/dir/meson.build
deleted file mode 100644
index 74fe7834..00000000
--- a/code/cpp-httplib-0.19.0/test/www3/dir/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'index.html', output: 'index.html', copy: true)
-configure_file(input: 'test.html',  output: 'test.html',  copy: true)
diff --git a/code/cpp-httplib-0.19.0/test/www3/dir/test.html b/code/cpp-httplib-0.19.0/test/www3/dir/test.html
deleted file mode 100644
index 6d70cd0e..00000000
--- a/code/cpp-httplib-0.19.0/test/www3/dir/test.html
+++ /dev/null
@@ -1 +0,0 @@
-test.html
\ No newline at end of file

From eb92182230c51fb6289c2adab5cb711b035a4169 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 8 Mar 2025 15:51:12 +0100
Subject: [PATCH 1971/2040] Split OS builds between different workflow files

---
 .github/workflows/shared-build-linux.yml   | 246 +++++++
 .github/workflows/shared-build-macos.yml   | 239 +++++++
 .github/workflows/shared-build-windows.yml | 255 ++++++++
 .github/workflows/shared-build.yml         | 712 +--------------------
 4 files changed, 749 insertions(+), 703 deletions(-)
 create mode 100644 .github/workflows/shared-build-linux.yml
 create mode 100644 .github/workflows/shared-build-macos.yml
 create mode 100644 .github/workflows/shared-build-windows.yml

diff --git a/.github/workflows/shared-build-linux.yml b/.github/workflows/shared-build-linux.yml
new file mode 100644
index 00000000..726ec8d5
--- /dev/null
+++ b/.github/workflows/shared-build-linux.yml
@@ -0,0 +1,246 @@
+##########################
+#
+# Linux
+# Ubuntu 22.04
+#
+# Using this version instead of 24.04 to use a lower GLIBC version (2.34).
+# ARM is used for more efficiency, and x64 is used for legacy architectures like PowerPC.
+##########################
+name: Linux build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+        
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        architecture: [
+          {name: 'amd64',   os: "ubuntu-22.04-arm", package: 'x86-64-linux-gnu',      triple: 'x86_64-linux-gnu',      arch_option: 'linux-x86_64'},
+          {name: 'i686',    os: "ubuntu-22.04-arm", package: 'i686-linux-gnu',        triple: 'i686-linux-gnu',        arch_option: 'linux-x86'},
+          {name: 'arm64',   os: "ubuntu-22.04-arm", package: 'aarch64-linux-gnu',     triple: 'aarch64-linux-gnu',     arch_option: 'linux-aarch64'},
+          {name: 'armhf',   os: "ubuntu-22.04-arm", package: 'arm-linux-gnueabihf',   triple: 'arm-linux-gnueabihf',   arch_option: 'linux-armv4'},
+          {name: 'powerpc', os: "ubuntu-22.04",     package: 'powerpc-linux-gnu',     triple: 'powerpc-linux-gnu',     arch_option: 'linux-ppc'},
+          {name: 'ppc64',   os: "ubuntu-22.04",     package: 'powerpc64-linux-gnu',   triple: 'powerpc64-linux-gnu',   arch_option: 'linux-ppc64'},
+          {name: 'ppc64el', os: "ubuntu-22.04-arm", package: 'powerpc64le-linux-gnu', triple: 'powerpc64le-linux-gnu', arch_option: 'linux-ppc64le'}
+        ]
+
+    name: "Building for platform linux-${{matrix.architecture.name}}"
+    runs-on: ${{ matrix.architecture.os }}
+    environment: ${{ inputs.environment }}
+    env:
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
+        openal-soft-branch: '1.24.2'
+
+    steps:
+    ###
+    # Packages
+    ###
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required packages
+      with:
+        packages: flex bison ninja-build cmake clang libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
+        version: "${{ runner.os }}-${{ runner.arch }}-v1"
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "HOST_TRIPLE=$(gcc -dumpmachine)" >> $GITHUB_ENV
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required cross-platform packages (${{ matrix.architecture.package }})
+      if: env.HOST_TRIPLE != matrix.architecture.triple
+      with:
+        packages: gcc-12-${{ matrix.architecture.package }} g++-12-${{ matrix.architecture.package }}
+        version: "${{ runner.os }}-${{ runner.arch }}-v1"
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
+        echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+        echo "CXXFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+
+    ###
+    # SDL
+    ###
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: 2-latest
+        build-type: Release
+        # Workaround for when changing the runner OS version
+        cmake-arguments: "-DCACHE_OS_VERSION=Ubuntu_22.04"
+
+    ###
+    # OpenAL
+    ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
+
+    # soft-oal setup
+    - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '${{ env.openal-soft-branch }}'
+
+    - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build \
+        -DALSOFT_UTILS=OFF \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # WolfSSL
+    ###
+    - name: Cache WolfSSL
+      id: cache-wolfssl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/wolfssl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
+
+    # WolfSSL setup
+    - name: Checkout WolfSSL
+      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'wolfssl/wolfssl'
+        path: 'thirdparties/wolfssl'
+        ref: '${{ env.wolfssl-version }}'
+
+    # WolfSSL build
+    - name: Configure and install wolfssl
+      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/wolfssl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl/install' \
+            -DCMAKE_C_FLAGS="$CFLAGS -fPIC" \
+            -DCMAKE_CXX_FLAGS="$CFLAGS -fPIC" \
+            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # cURL
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
+            -DCURL_USE_LIBPSL=OFF \
+            -DCURL_USE_WOLFSSL=ON \
+            -DCURL_ZLIB="" \
+            -DCURL_BROTLI="" \
+            -DCURL_ZSTD="" \
+            -DCMAKE_SHARED_LINKER_FLAGS="-lm" \
+            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl/install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # Project
+    ###
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM=--log-level=VERBOSE \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' \
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Copy libraries
+        mkdir ${{github.workspace}}/package
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.so.4 '${{github.workspace}}/package/'
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
+
+    ###
+    # Artifacts
+    ###
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-linux-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path:
+          ${{github.workspace}}/package
\ No newline at end of file
diff --git a/.github/workflows/shared-build-macos.yml b/.github/workflows/shared-build-macos.yml
new file mode 100644
index 00000000..9061a137
--- /dev/null
+++ b/.github/workflows/shared-build-macos.yml
@@ -0,0 +1,239 @@
+##########################
+#
+# Apple macOS
+# macOS 15
+#
+# This version is used as the OS, as it's faster than other versions.
+##########################
+name: MacOS build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+        
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        architecture: [
+          #{name: 'x86_64',   triple: 'x86_64-apple-macos10.8'},
+          #{name: 'arm64',    triple: 'arm64-apple-macos11'}
+          #{name: 'x86_64',    build_name: 'x86_64'},
+          #{name: 'arm64',     build_name: 'arm64'},
+          # Compile into an universal binary
+          {name: 'multiarch(arm64-x86_64)', build_name: 'arm64;x86_64' }
+        ]
+
+    name: "Building for platform macos-${{matrix.architecture.name}}"
+    runs-on: "macos-15"
+    env:
+        openal-soft-branch: '1.24.2'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
+
+    steps:
+    ###
+    # Packages
+    ###
+    - uses: tecolicom/actions-use-homebrew-tools@b9c066b79607fa3d71e0be05d7003bb75fd9ff34
+      name: Install required packages
+      with:
+        tools: git flex bison ninja cmake llvm perl
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
+        echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV
+
+    ###
+    # SDL
+    ###
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: 2-latest
+        build-type: Release
+        cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}'
+          -DCMAKE_VERBOSE_MAKEFILE=on"
+
+    ###
+    # OpenAL
+    ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
+
+    # soft-oal setup
+    # Use GCC instead of Clang because of missing SSE intrinsics
+    # It also doesn't enable altivec support on PowerPC by default
+    - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '${{ env.openal-soft-branch }}'
+
+    # soft-oal build
+    - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+        -DCMAKE_VERBOSE_MAKEFILE=on
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # WolfSSL
+    ###
+# FIXME: Figure out how to compile WolfSSL cross-architecture
+#
+#    - name: Cache WolfSSL
+#      id: cache-wolfssl
+#      uses: actions/cache@v4
+#      with:
+#        path: 'thirdparties/wolfssl_install'
+#        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
+#
+#    # WolfSSL setup
+#    - name: Checkout WolfSSL
+#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+#      uses: actions/checkout@v4
+#      with:
+#        repository: 'wolfssl/wolfssl'
+#        path: 'thirdparties/wolfssl'
+#        ref: '${{ env.wolfssl-version }}'
+#
+#    # WolfSSL build
+#    - name: Configure and install wolfssl
+#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+#      working-directory: ${{github.workspace}}/thirdparties/wolfssl
+#      run: |
+#        cmake -B ./build \
+#            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl_install' \
+#            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+#            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
+#        cmake --build ./build --config Release --parallel
+#        cmake --install ./build --config Release
+
+    ###
+    # cURL
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
+            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+            -DCURL_USE_LIBPSL=OFF \
+            -DCURL_USE_WOLFSSL=OFF \
+            -DCURL_USE_LIBSSH2=OFF \
+            -DUSE_LIBIDN2=OFF \
+            -DUSE_NGHTTP2=OFF \
+            -DCURL_ENABLE_SSL=OFF \
+            -DCURL_ZLIB="" \
+            -DCURL_BROTLI="" \
+            -DCURL_ZSTD="" \
+            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl_install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # Project
+    ###
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM=--log-level=VERBOSE \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
+        -DCMAKE_VERBOSE_MAKEFILE=on \
+        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Create hard-link and copy symbolic links
+        mkdir ${{github.workspace}}/package
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.4.dylib '${{github.workspace}}/package/'
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
+
+    ###
+    # Artifacts
+    ###
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-macos-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path:
+          ${{github.workspace}}/package
diff --git a/.github/workflows/shared-build-windows.yml b/.github/workflows/shared-build-windows.yml
new file mode 100644
index 00000000..c807b591
--- /dev/null
+++ b/.github/workflows/shared-build-windows.yml
@@ -0,0 +1,255 @@
+##########################
+#
+# Microsoft Windows
+# Windows Server 2025
+#
+##########################
+name: Windows build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+        
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        architecture: [
+          {name: 'x64',   config: 'x64',    toolset: 'x64',        arch_option: 'VC-WIN64A'},
+          {name: 'x86',   config: 'Win32',  toolset: 'x64_x86',    arch_option: 'VC-WIN32' },
+          {name: 'arm64', config: 'ARM64',  toolset: 'x64_arm64',  arch_option: 'VC-WIN64-ARM' }
+        ]
+
+    name: "Building for platform windows-${{matrix.architecture.name}}"
+    runs-on: "windows-2025"
+    environment: ${{ inputs.environment }}
+    env:
+        flexbison-branch: 'v2.5.25'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
+        openal-soft-branch: '1.24.2'
+
+    steps:
+    ###
+    # Packages
+    ###
+
+    - name: Cache Flex/Bison
+      id: cache-flexbison
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/winflexbison-install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-flexbison-${{ env.flexbison-branch }}-v1
+
+    - name: Install Flex/Bison
+      if: steps.cache-flexbison.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}
+      run: |
+        mkdir thirdparties && cd thirdparties
+        git clone --depth 1 --single-branch --branch ${{ env.flexbison-branch }} https://github.com/lexxmark/winflexbison.git
+        cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
+        cmake --build winflexbison-build --config Release --parallel
+        cmake --install winflexbison-build --config Release
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $env:GITHUB_ENV
+        echo "CC=cl.exe" >> $env:GITHUB_ENV
+        echo "CXX=cl.exe" >> $env:GITHUB_ENV
+        pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
+        cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
+          if ($_ -match "=") {
+            # Split into key=value
+            $var = $_.split("=", 2);
+            echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
+          }
+        }
+        popd
+
+    - name: Cache Required Packages
+      id: cache-required-packages
+      uses: actions/cache@v4
+      with:
+        path: 'C:\Packages'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-required-packages-v1
+
+    - name: Install required packages
+      if: steps.cache-required-packages.outputs.cache-hit != 'true'
+      run: |
+        $DownloadPath="$($env:USERPROFILE)\Downloads"
+        Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "C:\Packages\ninja"
+        Invoke-WebRequest "https://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
+        Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "C:\Packages\jom"
+
+    - name: Setup required packages path
+      run: |
+        $env:PATH += ";C:\Packages\ninja;C:\Packages\jom;"
+        echo "PATH=$($env:PATH)" >> $env:GITHUB_ENV
+
+    ###
+    # SDL
+    ###
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: 2-latest
+        build-type: Release
+        cmake-arguments: ""
+
+    ###
+    # OpenAL
+    ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
+
+    # soft-oal setup
+    - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '${{ env.openal-soft-branch }}'
+
+    # soft-oal build
+    # Statically link the CRT runtime into OAL as a workaround to prevent crashes
+    - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build `
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
+        -DALSOFT_BUILD_ROUTER=OFF `
+        -DALSOFT_REQUIRE_WINMM=ON `
+        -DALSOFT_REQUIRE_DSOUND=ON `
+        -DALSOFT_REQUIRE_WASAPI=ON `
+        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_C_FLAGS_MINSIZEREL="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DNDEBUG" `
+        -DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG"
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+        # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
+        if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
+
+    ###
+    # cURL
+    #
+    # Uses Schannel as SSL backend, native CAs are used
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build `
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' `
+            -DCURL_USE_LIBPSL=OFF `
+            -DCURL_USE_SCHANNEL=ON
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # Project
+    ###
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM= `
+        --log-level=VERBOSE `
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
+        -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' `
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' `
+        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        New-Item -ItemType Directory '${{github.workspace}}/package'
+        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/curl/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
+        if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
+
+    ###
+    # Artifact
+    ###
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-windows-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path: |
+          ${{github.workspace}}/package
+          !${{github.workspace}}/package/**/*.pdb
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-windows-${{matrix.architecture.name}}-pdb
+        if-no-files-found: error
+        path: |
+          ${{github.workspace}}/package
\ No newline at end of file
diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
index c1fa5419..3bac5e21 100644
--- a/.github/workflows/shared-build.yml
+++ b/.github/workflows/shared-build.yml
@@ -7,712 +7,18 @@ on:
         required: true
         type: string
 
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: RelWithDebInfo
-  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
-
-#
-# NOTE:
-#  OpenSSL can be statically linked by configuring it with "no-shared no-threads" options
-#
-
 jobs:
-  ##########################
-  #
-  # Linux
-  # Ubuntu 22.04
-  #
-  # Using this version instead of 24.04 to use a lower GLIBC version (2.34).
-  # ARM is used for more efficiency, and x64 is used for legacy architectures like PowerPC.
-  ##########################
   build-platform-linux:
-    strategy:
-      matrix:
-        architecture: [
-          {name: 'amd64',   os: "ubuntu-22.04-arm", package: 'x86-64-linux-gnu',      triple: 'x86_64-linux-gnu',      arch_option: 'linux-x86_64'},
-          {name: 'i686',    os: "ubuntu-22.04-arm", package: 'i686-linux-gnu',        triple: 'i686-linux-gnu',        arch_option: 'linux-x86'},
-          {name: 'arm64',   os: "ubuntu-22.04-arm", package: 'aarch64-linux-gnu',     triple: 'aarch64-linux-gnu',     arch_option: 'linux-aarch64'},
-          {name: 'armhf',   os: "ubuntu-22.04-arm", package: 'arm-linux-gnueabihf',   triple: 'arm-linux-gnueabihf',   arch_option: 'linux-armv4'},
-          {name: 'powerpc', os: "ubuntu-22.04",     package: 'powerpc-linux-gnu',     triple: 'powerpc-linux-gnu',     arch_option: 'linux-ppc'},
-          {name: 'ppc64',   os: "ubuntu-22.04",     package: 'powerpc64-linux-gnu',   triple: 'powerpc64-linux-gnu',   arch_option: 'linux-ppc64'},
-          {name: 'ppc64el', os: "ubuntu-22.04-arm", package: 'powerpc64le-linux-gnu', triple: 'powerpc64le-linux-gnu', arch_option: 'linux-ppc64le'}
-        ]
+    uses: ./.github/workflows/shared-build-linux.yml
+    with:
+      environment: ${{inputs.environment}}
 
-    name: "Building for platform linux-${{matrix.architecture.name}}"
-    runs-on: ${{ matrix.architecture.os }}
-    environment: ${{ inputs.environment }}
-    env:
-        wolfssl-version: 'v5.7.6-stable'
-        curl-version: '8_12_1'
-        openal-soft-branch: '1.24.2'
-
-    steps:
-    ###
-    # Packages
-    ###
-
-    - uses: awalsh128/cache-apt-pkgs-action@latest
-      name: Install required packages
-      with:
-        packages: flex bison ninja-build cmake clang libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
-        version: "${{ runner.os }}-${{ runner.arch }}-v1"
-
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "HOST_TRIPLE=$(gcc -dumpmachine)" >> $GITHUB_ENV
-
-    - uses: awalsh128/cache-apt-pkgs-action@latest
-      name: Install required cross-platform packages (${{ matrix.architecture.package }})
-      if: env.HOST_TRIPLE != matrix.architecture.triple
-      with:
-        packages: gcc-12-${{ matrix.architecture.package }} g++-12-${{ matrix.architecture.package }}
-        version: "${{ runner.os }}-${{ runner.arch }}-v1"
-
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
-        echo "CC=clang" >> $GITHUB_ENV
-        echo "CXX=clang++" >> $GITHUB_ENV
-        echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
-        echo "CXXFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
-
-    ###
-    # SDL
-    ###
-
-    # Setup SDL
-    - name: Set up SDL
-      id: sdl
-      uses: libsdl-org/setup-sdl@main
-      with:
-        version: 2-latest
-        build-type: Release
-        # Workaround for when changing the runner OS version
-        cmake-arguments: "-DCACHE_OS_VERSION=Ubuntu_22.04"
-
-    ###
-    # OpenAL
-    ###
-    - name: Cache OpenAL
-      id: cache-openal-soft
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/soft-oal/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
-
-    # soft-oal setup
-    - name: Checkout soft-oal
-      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'kcat/openal-soft'
-        path: 'thirdparties/soft-oal'
-        ref: '${{ env.openal-soft-branch }}'
-
-    - name: Configure and install soft-oal
-      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/soft-oal
-      run: |
-        cmake -B ./build \
-        -DALSOFT_UTILS=OFF \
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-
-    ###
-    # WolfSSL
-    ###
-    - name: Cache WolfSSL
-      id: cache-wolfssl
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/wolfssl/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
-
-    # WolfSSL setup
-    - name: Checkout WolfSSL
-      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'wolfssl/wolfssl'
-        path: 'thirdparties/wolfssl'
-        ref: '${{ env.wolfssl-version }}'
-
-    # WolfSSL build
-    - name: Configure and install wolfssl
-      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/wolfssl
-      run: |
-        cmake -B ./build \
-            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl/install' \
-            -DCMAKE_C_FLAGS="$CFLAGS -fPIC" \
-            -DCMAKE_CXX_FLAGS="$CFLAGS -fPIC" \
-            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-
-    ###
-    # cURL
-    ###
-    - name: Cache cURL
-      id: cache-curl
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/curl/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
-
-    # cURL setup
-    - name: Checkout cURL
-      if: steps.cache-curl.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'curl/curl'
-        path: 'thirdparties/curl'
-        ref: 'curl-${{ env.curl-version }}'
-
-    # cURL build
-    - name: Configure and install curl
-      if: steps.cache-curl.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/curl
-      run: |
-        cmake -B ./build \
-            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
-            -DCURL_USE_LIBPSL=OFF \
-            -DCURL_USE_WOLFSSL=ON \
-            -DCURL_ZLIB="" \
-            -DCURL_BROTLI="" \
-            -DCURL_ZSTD="" \
-            -DCMAKE_SHARED_LINKER_FLAGS="-lm" \
-            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl/install'
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-
-    ###
-    # Project
-    ###
-
-    - uses: actions/checkout@v4
-      with:
-        path: 'source'
-
-    - name: CMake Settings
-      run: |
-        echo "CMAKE_PARAM=--log-level=VERBOSE \
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
-        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
-        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' \
-        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
-        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
-        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
-
-    - name: Configure CMake
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
-
-    - name: Build
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
-
-    - name: Test
-      working-directory: ${{github.workspace}}
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: |
-        cd "${{github.workspace}}/build"
-        ctest -C ${{env.BUILD_TYPE}}
-
-    - name: Install
-      working-directory: ${{github.workspace}}
-      # Install to the directory defined in CMAKE_INSTALL_PREFIX
-      run: |
-        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        # Copy libraries
-        mkdir ${{github.workspace}}/package
-        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
-        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
-        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.so.4 '${{github.workspace}}/package/'
-        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
-        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
-
-    ###
-    # Artifacts
-    ###
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: out-linux-${{matrix.architecture.name}}
-        if-no-files-found: error
-        path:
-          ${{github.workspace}}/package
-
-  ##########################
-  #
-  # Microsoft Windows
-  # Windows Server 2025
-  #
-  ##########################
   build-platform-windows:
-    strategy:
-      matrix:
-        architecture: [
-          {name: 'x64',   config: 'x64',    toolset: 'x64',        arch_option: 'VC-WIN64A'},
-          {name: 'x86',   config: 'Win32',  toolset: 'x64_x86',    arch_option: 'VC-WIN32' },
-          {name: 'arm64', config: 'ARM64',  toolset: 'x64_arm64',  arch_option: 'VC-WIN64-ARM' }
-        ]
+    uses: ./.github/workflows/shared-build-windows.yml
+    with:
+      environment: ${{inputs.environment}}
 
-    name: "Building for platform windows-${{matrix.architecture.name}}"
-    runs-on: "windows-2025"
-    environment: ${{ inputs.environment }}
-    env:
-        flexbison-branch: 'v2.5.25'
-        wolfssl-version: 'v5.7.6-stable'
-        curl-version: '8_12_1'
-        openal-soft-branch: '1.24.2'
-
-    steps:
-    ###
-    # Packages
-    ###
-
-    - name: Cache Flex/Bison
-      id: cache-flexbison
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/winflexbison-install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-flexbison-${{ env.flexbison-branch }}-v1
-
-    - name: Install Flex/Bison
-      if: steps.cache-flexbison.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}
-      run: |
-        mkdir thirdparties && cd thirdparties
-        git clone --depth 1 --single-branch --branch ${{ env.flexbison-branch }} https://github.com/lexxmark/winflexbison.git
-        cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
-        cmake --build winflexbison-build --config Release --parallel
-        cmake --install winflexbison-build --config Release
-
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $env:GITHUB_ENV
-        echo "CC=cl.exe" >> $env:GITHUB_ENV
-        echo "CXX=cl.exe" >> $env:GITHUB_ENV
-        pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
-        cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
-          if ($_ -match "=") {
-            # Split into key=value
-            $var = $_.split("=", 2);
-            echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
-          }
-        }
-        popd
-
-    - name: Cache Required Packages
-      id: cache-required-packages
-      uses: actions/cache@v4
-      with:
-        path: 'C:\Packages'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-required-packages-v1
-
-    - name: Install required packages
-      if: steps.cache-required-packages.outputs.cache-hit != 'true'
-      run: |
-        $DownloadPath="$($env:USERPROFILE)\Downloads"
-        Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
-        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "C:\Packages\ninja"
-        Invoke-WebRequest "https://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
-        Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "C:\Packages\jom"
-
-    - name: Setup required packages path
-      run: |
-        $env:PATH += ";C:\Packages\ninja;C:\Packages\jom;"
-        echo "PATH=$($env:PATH)" >> $env:GITHUB_ENV
-
-    ###
-    # SDL
-    ###
-
-    # Setup SDL
-    - name: Set up SDL
-      id: sdl
-      uses: libsdl-org/setup-sdl@main
-      with:
-        version: 2-latest
-        build-type: Release
-        cmake-arguments: ""
-
-    ###
-    # OpenAL
-    ###
-    - name: Cache OpenAL
-      id: cache-openal-soft
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/soft-oal/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
-
-    # soft-oal setup
-    - name: Checkout soft-oal
-      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'kcat/openal-soft'
-        path: 'thirdparties/soft-oal'
-        ref: '${{ env.openal-soft-branch }}'
-
-    # soft-oal build
-    # Statically link the CRT runtime into OAL as a workaround to prevent crashes
-    - name: Configure and install soft-oal
-      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/soft-oal
-      run: |
-        cmake -B ./build `
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
-        -DALSOFT_BUILD_ROUTER=OFF `
-        -DALSOFT_REQUIRE_WINMM=ON `
-        -DALSOFT_REQUIRE_DSOUND=ON `
-        -DALSOFT_REQUIRE_WASAPI=ON `
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
-        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
-        -DCMAKE_C_FLAGS_MINSIZEREL="/MT /O2 /Ob2 /DNDEBUG" `
-        -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DNDEBUG" `
-        -DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG" `
-        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG"
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-        # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
-        if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
-
-    ###
-    # cURL
-    #
-    # Uses Schannel as SSL backend, native CAs are used
-    ###
-    - name: Cache cURL
-      id: cache-curl
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/curl/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
-
-    # cURL setup
-    - name: Checkout cURL
-      if: steps.cache-curl.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'curl/curl'
-        path: 'thirdparties/curl'
-        ref: 'curl-${{ env.curl-version }}'
-
-    # cURL build
-    - name: Configure and install curl
-      if: steps.cache-curl.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/curl
-      run: |
-        cmake -B ./build `
-            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' `
-            -DCURL_USE_LIBPSL=OFF `
-            -DCURL_USE_SCHANNEL=ON
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-
-    ###
-    # Project
-    ###
-
-    - uses: actions/checkout@v4
-      with:
-        path: 'source'
-
-    - name: CMake Settings
-      run: |
-        echo "CMAKE_PARAM= `
-        --log-level=VERBOSE `
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
-        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
-        -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
-        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
-        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' `
-        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' `
-        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
-        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
-
-    - name: Configure CMake
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
-
-    - name: Build
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
-
-    - name: Test
-      working-directory: ${{github.workspace}}
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: |
-        cd "${{github.workspace}}/build"
-        ctest -C ${{env.BUILD_TYPE}}
-
-    - name: Install
-      working-directory: ${{github.workspace}}
-      # Install to the directory defined in CMAKE_INSTALL_PREFIX
-      run: |
-        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        New-Item -ItemType Directory '${{github.workspace}}/package'
-        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
-        Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
-        Copy-Item '${{github.workspace}}/thirdparties/curl/install/bin/*.dll' -Destination '${{github.workspace}}/package'
-        if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
-        if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
-
-    ###
-    # Artifact
-    ###
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: out-windows-${{matrix.architecture.name}}
-        if-no-files-found: error
-        path: |
-          ${{github.workspace}}/package
-          !${{github.workspace}}/package/**/*.pdb
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: out-windows-${{matrix.architecture.name}}-pdb
-        if-no-files-found: error
-        path: |
-          ${{github.workspace}}/package
-
-  ##########################
-  #
-  # Apple macOS
-  # macOS 15
-  #
-  # This version is used as the OS, as it's faster than other versions.
-  ##########################
   build-platform-macos:
-    strategy:
-      matrix:
-        architecture: [
-          #{name: 'x86_64',   triple: 'x86_64-apple-macos10.8'},
-          #{name: 'arm64',    triple: 'arm64-apple-macos11'}
-          #{name: 'x86_64',    build_name: 'x86_64'},
-          #{name: 'arm64',     build_name: 'arm64'},
-          # Compile into an universal binary
-          {name: 'multiarch(arm64-x86_64)', build_name: 'arm64;x86_64' }
-        ]
-
-    name: "Building for platform macos-${{matrix.architecture.name}}"
-    runs-on: "macos-15"
-    environment: ${{inputs.environment}}
-    env:
-        openal-soft-branch: '1.24.2'
-        wolfssl-version: 'v5.7.6-stable'
-        curl-version: '8_12_1'
-
-    steps:
-    ###
-    # Packages
-    ###
-    - uses: tecolicom/actions-use-homebrew-tools@b9c066b79607fa3d71e0be05d7003bb75fd9ff34
-      name: Install required packages
-      with:
-        tools: git flex bison ninja cmake llvm perl
-
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
-        echo "CC=clang" >> $GITHUB_ENV
-        echo "CXX=clang++" >> $GITHUB_ENV
-        echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV
-
-    ###
-    # SDL
-    ###
-
-    # Setup SDL
-    - name: Set up SDL
-      id: sdl
-      uses: libsdl-org/setup-sdl@main
-      with:
-        version: 2-latest
-        build-type: Release
-        cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}'
-          -DCMAKE_VERBOSE_MAKEFILE=on"
-
-    ###
-    # OpenAL
-    ###
-    - name: Cache OpenAL
-      id: cache-openal-soft
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/soft-oal/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
-
-    # soft-oal setup
-    # Use GCC instead of Clang because of missing SSE intrinsics
-    # It also doesn't enable altivec support on PowerPC by default
-    - name: Checkout soft-oal
-      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'kcat/openal-soft'
-        path: 'thirdparties/soft-oal'
-        ref: '${{ env.openal-soft-branch }}'
-
-    # soft-oal build
-    - name: Configure and install soft-oal
-      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/soft-oal
-      run: |
-        cmake -B ./build \
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
-        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
-        -DCMAKE_VERBOSE_MAKEFILE=on
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-
-    ###
-    # WolfSSL
-    ###
-# FIXME: Figure out how to compile WolfSSL cross-architecture
-#
-#    - name: Cache WolfSSL
-#      id: cache-wolfssl
-#      uses: actions/cache@v4
-#      with:
-#        path: 'thirdparties/wolfssl_install'
-#        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
-#
-#    # WolfSSL setup
-#    - name: Checkout WolfSSL
-#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-#      uses: actions/checkout@v4
-#      with:
-#        repository: 'wolfssl/wolfssl'
-#        path: 'thirdparties/wolfssl'
-#        ref: '${{ env.wolfssl-version }}'
-#
-#    # WolfSSL build
-#    - name: Configure and install wolfssl
-#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-#      working-directory: ${{github.workspace}}/thirdparties/wolfssl
-#      run: |
-#        cmake -B ./build \
-#            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl_install' \
-#            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
-#            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
-#        cmake --build ./build --config Release --parallel
-#        cmake --install ./build --config Release
-
-    ###
-    # cURL
-    ###
-    - name: Cache cURL
-      id: cache-curl
-      uses: actions/cache@v4
-      with:
-        path: 'thirdparties/curl/install'
-        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
-
-    # cURL setup
-    - name: Checkout cURL
-      if: steps.cache-curl.outputs.cache-hit != 'true'
-      uses: actions/checkout@v4
-      with:
-        repository: 'curl/curl'
-        path: 'thirdparties/curl'
-        ref: 'curl-${{ env.curl-version }}'
-
-    # cURL build
-    - name: Configure and install curl
-      if: steps.cache-curl.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/thirdparties/curl
-      run: |
-        cmake -B ./build \
-            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
-            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
-            -DCURL_USE_LIBPSL=OFF \
-            -DCURL_USE_WOLFSSL=OFF \
-            -DCURL_USE_LIBSSH2=OFF \
-            -DUSE_LIBIDN2=OFF \
-            -DUSE_NGHTTP2=OFF \
-            -DCURL_ENABLE_SSL=OFF \
-            -DCURL_ZLIB="" \
-            -DCURL_BROTLI="" \
-            -DCURL_ZSTD="" \
-            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl_install'
-        cmake --build ./build --config Release --parallel
-        cmake --install ./build --config Release
-
-    ###
-    # Project
-    ###
-
-    - uses: actions/checkout@v4
-      with:
-        path: 'source'
-
-    - name: CMake Settings
-      run: |
-        echo "CMAKE_PARAM=--log-level=VERBOSE \
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
-        -DCMAKE_VERBOSE_MAKEFILE=on \
-        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
-        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
-        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
-        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
-        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
-        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
-
-    - name: Configure CMake
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
-
-    - name: Build
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
-
-    - name: Test
-      working-directory: ${{github.workspace}}
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: |
-        cd "${{github.workspace}}/build"
-        ctest -C ${{env.BUILD_TYPE}}
-
-    - name: Install
-      working-directory: ${{github.workspace}}
-      # Install to the directory defined in CMAKE_INSTALL_PREFIX
-      run: |
-        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        # Create hard-link and copy symbolic links
-        mkdir ${{github.workspace}}/package
-        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/package/'
-        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/package/'
-        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.4.dylib '${{github.workspace}}/package/'
-        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
-        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
-
-    ###
-    # Artifacts
-    ###
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: out-macos-${{matrix.architecture.name}}
-        if-no-files-found: error
-        path:
-          ${{github.workspace}}/package
+    uses: ./.github/workflows/shared-build-macos.yml
+    with:
+      environment: ${{inputs.environment}}

From c87c242098d36602d0823be8b1214becd21564d4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:31:16 +0100
Subject: [PATCH 1972/2040] Add a getter for m_font

---
 code/uilib/uiwidget.cpp | 5 +++++
 code/uilib/uiwidget.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 0082c4c9..64cc2a17 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -3135,6 +3135,11 @@ bool UIWidget::PassEventToWidget
 	return false;
 }
 
+UIFont *UIWidget::getFont() const
+{
+    return m_font;
+}
+
 bool UIWidget::isVirtual() const
 {
 	return m_bVirtual;
diff --git a/code/uilib/uiwidget.h b/code/uilib/uiwidget.h
index 53dff224..787e0c19 100644
--- a/code/uilib/uiwidget.h
+++ b/code/uilib/uiwidget.h
@@ -330,7 +330,9 @@ public:
 	void				setConfigstringIndex( int cs );
 	int					getConfigstringIndex( void );
 	bool				PassEventToWidget( str name, Event *ev );
+
 	// Added in OPM
+    UIFont              *getFont() const;
 	bool				isVirtual() const;
 	const vec2_t&		getVirtualScale() const;
 	const vec2_t&		getHighResScale() const;

From 7a20bb4deba882a62531177f560b5050deb2f374 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:31:53 +0100
Subject: [PATCH 1973/2040] Add a new method that return version numbers

---
 code/sys/sys_update_checker.cpp | 35 ++++++++++++++++++++-------------
 code/sys/sys_update_checker.h   |  1 +
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index 813050ee..da096df9 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -25,13 +25,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef HAS_LIBCURL
 
-#include <curl/curl.h>
+#    include <curl/curl.h>
 
 //#include <httplib.h>
-#include "../qcommon/json.hpp"
+#    include "../qcommon/json.hpp"
 using json = nlohmann::json;
 
-#include <chrono>
+#    include <chrono>
 
 UpdateChecker updateChecker;
 
@@ -168,6 +168,19 @@ bool UpdateChecker::CheckNewVersion() const
     return false;
 }
 
+bool UpdateChecker::CheckNewVersion(int& major, int& minor, int& patch) const
+{
+    if (!CheckNewVersion()) {
+        return false;
+    }
+
+    major = lastMajor;
+    minor = lastMinor;
+    patch = lastPatch;
+
+    return true;
+}
+
 bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const
 {
     const char *p  = value;
@@ -239,10 +252,10 @@ void UpdateChecker::DoRequest()
     }
 
     nlohmann::json data;
-    
+
     try {
         data = nlohmann::json::parse(responseString);
-    } catch(const std::exception& e) {
+    } catch (const std::exception& e) {
         return;
     }
 
@@ -280,16 +293,10 @@ void UpdateChecker::RequestThread()
 
 #else
 
-void Sys_UpdateChecker_Init()
-{
-}
+void Sys_UpdateChecker_Init() {}
 
-void Sys_UpdateChecker_Process()
-{
-}
+void Sys_UpdateChecker_Process() {}
 
-void Sys_UpdateChecker_Shutdown()
-{
-}
+void Sys_UpdateChecker_Shutdown() {}
 
 #endif
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
index 9142da22..e51f8844 100644
--- a/code/sys/sys_update_checker.h
+++ b/code/sys/sys_update_checker.h
@@ -53,6 +53,7 @@ public:
     void Shutdown();
 
     bool CheckNewVersion() const;
+    bool CheckNewVersion(int& major, int& minor, int& patch) const;
 
 private:
     void ShutdownClient();

From 0b590ab1470f5f9e1d66d42ae899d566f70f397b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:32:22 +0100
Subject: [PATCH 1974/2040] Add a way to create a message box

---
 code/uilib/uimessage.cpp | 114 +++++++++++++++++++++++++++++++++++++++
 code/uilib/uimessage.h   |  46 ++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 code/uilib/uimessage.cpp
 create mode 100644 code/uilib/uimessage.h

diff --git a/code/uilib/uimessage.cpp b/code/uilib/uimessage.cpp
new file mode 100644
index 00000000..8f69e225
--- /dev/null
+++ b/code/uilib/uimessage.cpp
@@ -0,0 +1,114 @@
+/*
+===========================================================================
+Copyright (C) 2015 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "uimessage.h"
+
+CLASS_DECLARATION(UIFloatingWindow, UIMessageDialog, NULL) {
+    {&W_Deactivated, &UIFloatingWindow::ClosePressed},
+    {NULL,           NULL                           }
+};
+
+UIMessageDialog::UIMessageDialog()
+    : m_label(NULL)
+    , m_ok(NULL)
+{}
+
+UIMessageDialog::~UIMessageDialog()
+{
+    if (m_label) {
+        delete m_label;
+    }
+
+    if (m_ok) {
+        delete m_ok;
+    }
+}
+
+void UIMessageDialog::FrameInitialized(void)
+{
+    UIFloatingWindow::FrameInitialized();
+
+    m_label = new UILabel();
+
+    m_label->InitFrame(getChildSpace(), getChildSpace()->getClientFrame(), 0);
+    m_label->setForegroundColor(UHudColor);
+
+    m_ok = new UIButton();
+    m_ok->InitFrame(getChildSpace(), UIRect2D(100, 150, 100, 30), 0);
+    m_ok->setTitle("OK");
+    m_ok->setBackgroundColor(UColor(0.25f, 0.295f, 0.378f), false);
+    m_ok->AllowActivate(true);
+    m_ok->Connect(this, W_Button_Pressed, W_Deactivated);
+
+    m_minimizeButton->ProcessEvent(EV_Widget_Hide);
+}
+
+void UIMessageDialog::setText(const char *text)
+{
+    int maxWidth = m_label->getFont()->getWidth(text, -1);
+    int maxHeight = m_label->getFont()->getHeight(text, -1);
+
+    m_label->setTitle(text);
+
+    UIRect2D rect;
+    rect.pos.x = (uid.vidWidth - Q_max(maxWidth, 100)) / 2.0;
+    rect.pos.y = (uid.vidHeight - Q_max(maxHeight, 32)) / 2.0;
+    rect.size.width = maxWidth + 32;
+    rect.size.height = 8 + maxHeight + 16 + 24 + 32;
+
+    setFrame(rect);
+
+    const UIRect2D clientFrame = getChildSpace()->getClientFrame();
+
+    UIRect2D labelRect;
+    labelRect.pos.x = 8;
+    labelRect.pos.y = 8;
+    labelRect.size.width = maxWidth;
+    labelRect.size.height = maxHeight;
+    m_label->setFrame(labelRect);
+
+    UIRect2D buttonRect;
+    buttonRect.pos.x = (clientFrame.size.width - 64) / 2;
+    buttonRect.pos.y = labelRect.pos.y + labelRect.size.height + 16;
+    buttonRect.size.width = 64;
+    buttonRect.size.height = 24;
+    m_ok->setFrame(buttonRect);
+}
+
+void UIMessageDialog::ShowMessageBox(const char *title, const char *text)
+{
+    UIMessageDialog *dialog;
+
+    dialog = new UIMessageDialog();
+
+    dialog->Create(
+        NULL, UIRect2D(uid.vidWidth / 2, uid.vidHeight / 2, 100, 200), title, UColor(0.15f, 0.195f, 0.278f), UHudColor
+    );
+
+    dialog->setText(text);
+
+    uWinMan.ActivateControl(dialog);
+
+    dialog->Connect(dialog, W_Deactivated, W_Deactivated);
+}
diff --git a/code/uilib/uimessage.h b/code/uilib/uimessage.h
new file mode 100644
index 00000000..4b178101
--- /dev/null
+++ b/code/uilib/uimessage.h
@@ -0,0 +1,46 @@
+/*
+===========================================================================
+Copyright (C) 2015 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "cl_ui.h"
+
+class UIMessageDialog : public UIFloatingWindow
+{
+public:
+    CLASS_PROTOTYPE(UIMessageDialog);
+
+public:
+    UIMessageDialog();
+    ~UIMessageDialog();
+
+    void setText(const char *text);
+
+    static void ShowMessageBox(const char *title, const char *text);
+
+protected:
+    void FrameInitialized(void) override;
+
+private:
+    UILabel  *m_label;
+    UIButton *m_ok;
+};

From 4fe11b5ea98f993d98cde7960ad287b3a89cc56b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:33:17 +0100
Subject: [PATCH 1975/2040] Always return false for CheckNewVersion() if
 libcurl is not used

---
 code/sys/sys_update_checker.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index da096df9..1322dcbe 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -293,6 +293,16 @@ void UpdateChecker::RequestThread()
 
 #else
 
+bool UpdateChecker::CheckNewVersion() const
+{
+    return false;
+}
+
+bool UpdateChecker::CheckNewVersion(int& major, int& minor, int& patch) const
+{
+    return false;
+}
+
 void Sys_UpdateChecker_Init() {}
 
 void Sys_UpdateChecker_Process() {}

From e0b7d4cc60a15d3976598bf4df973a60c2999850 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:37:51 +0100
Subject: [PATCH 1976/2040] Display a message box to the client when a new
 update is available

---
 code/client/cl_main.cpp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index de1fc457..b2d9fa21 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/localization.h"
 #include "../qcommon/bg_compat.h"
 #include "../sys/sys_local.h"
+#include "../sys/sys_update_checker.h"
+#include "../uilib/uimessage.h"
 
 extern "C" {
 	#include "../sys/sys_loadlib.h"
@@ -171,6 +173,7 @@ void CL_ServerStatus_f(void);
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg );
 
 static qboolean cl_bCLSystemStarted = qfalse;
+static qboolean cl_updateNotified = qfalse;
 
 /*
 ===============
@@ -2597,6 +2600,36 @@ void CL_SetFrameNumber(int frameNumber) {
 	re.SetFrameNumber(frameNumber);
 }
 
+/*
+==================
+CL_VerifyUpdate
+
+Check for a new version and display a message box
+when a new version is available
+==================
+*/
+void CL_VerifyUpdate() {
+    if (cl_updateNotified) {
+        return;
+    }
+
+    int lastMajor, lastMinor, lastPatch;
+    if (updateChecker.CheckNewVersion(lastMajor, lastMinor, lastPatch)) {
+        cl_updateNotified = true;
+
+        const char *updateText =
+            va("A new update is available!\n"
+               "The latest version is v%d.%d.%d (you are running %s).\n"
+               "Check https://github.com/openmoh/openmohaa for more.",
+               lastMajor,
+               lastMinor,
+               lastPatch,
+               PRODUCT_VERSION_NUMBER_STRING);
+
+        UIMessageDialog::ShowMessageBox("Update available", updateText);
+    }
+}
+
 /*
 ==================
 CL_Frame
@@ -2635,6 +2668,8 @@ void CL_Frame ( int msec ) {
 				S_TriggeredMusic_PlayIntroMusic();
 				UI_MenuEscape("main");
 			}
+
+            CL_VerifyUpdate();
 		} else if (clc.state == CA_CINEMATIC) {
 			UI_ForceMenuOff(qtrue);
 		}

From 79af8a46d1870de67a07cc62af34d45405d7cc46 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:57:25 +0100
Subject: [PATCH 1977/2040] Increase update thread sleep time

This prevents wasting time in scheduling the thread
---
 code/sys/sys_update_checker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index 1322dcbe..a13e48ed 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -287,7 +287,7 @@ void UpdateChecker::RequestThread()
             DoRequest();
         }
 
-        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        std::this_thread::sleep_for(std::chrono::seconds(5));
     }
 }
 

From 158ff62aaa010ec64dd956645dfbe6a4a800648f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 12 Mar 2025 00:02:44 +0100
Subject: [PATCH 1978/2040] Fix small typo

---
 code/client/cl_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index b2d9fa21..dd4ff10c 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -2619,7 +2619,7 @@ void CL_VerifyUpdate() {
 
         const char *updateText =
             va("A new update is available!\n"
-               "The latest version is v%d.%d.%d (you are running %s).\n"
+               "The latest version is v%d.%d.%d (you are running v%s).\n"
                "Check https://github.com/openmoh/openmohaa for more.",
                lastMajor,
                lastMinor,

From 1e2a3315189bff6fb2354883aae4e4fd15b038d8 Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Wed, 12 Mar 2025 07:30:22 +0200
Subject: [PATCH 1979/2040] Add reason field to serverBan structure with
 defined maximum length

---
 code/server/server.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/server/server.h b/code/server/server.h
index 1322ba59..07c593b3 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -326,14 +326,15 @@ typedef struct {
 } serverStatic_t;
 
 #define SERVER_MAXBANS	1024
+#define MAX_REASON_LENGTH 128
+
 // Structure for managing bans
-typedef struct
-{
+typedef struct serverBan_s {
 	netadr_t ip;
 	// For a CIDR-Notation type suffix
 	int subnet;
-	
 	qboolean isexception;
+	char reason[MAX_REASON_LENGTH];
 } serverBan_t;
 
 //=============================================================================

From f164e889ccbbeb2645d5f9fed5b2b481e6bfc050 Mon Sep 17 00:00:00 2001
From: ysdragon <youssefelkholey@gmail.com>
Date: Wed, 12 Mar 2025 07:30:40 +0200
Subject: [PATCH 1980/2040] Add optional reason to kick/ban commands

And enhance `SV_IsBanned` to return ban reason and update `SV_DirectConnect` to display it
---
 code/server/sv_ccmds.c  | 224 +++++++++++++++++++++++++++++++++-------
 code/server/sv_client.c |  25 ++++-
 2 files changed, 205 insertions(+), 44 deletions(-)

diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index 790379ed..a5f978f2 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -342,6 +342,7 @@ Kick a user off of the server  FIXME: move to game
 static void SV_Kick_f( void ) {
 	client_t	*cl;
 	int			i;
+	char        *reason = NULL;
 
 	// make sure server is running
 	if ( !com_sv_running->integer ) {
@@ -349,11 +350,16 @@ static void SV_Kick_f( void ) {
 		return;
 	}
 
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("Usage: kick <player name>\nkick all = kick everyone\nkick allbots = kick all bots\n");
+	if ( Cmd_Argc() < 2 ) {
+		Com_Printf ("Usage: kick <player name> [reason]\nkick all = kick everyone\nkick allbots = kick all bots\n");
 		return;
 	}
 
+	// Check if there's a reason provided
+	if ( Cmd_Argc() >= 3 ) {
+		reason = Cmd_ArgsFrom(2);
+	}
+
 	cl = SV_GetPlayerByHandle();
 	if ( !cl ) {
 		if ( !Q_stricmp(Cmd_Argv(1), "all") ) {
@@ -387,7 +393,25 @@ static void SV_Kick_f( void ) {
 		return;
 	}
 
-	SV_DropClient( cl, "was kicked" );
+	// Check if there's a reason provided
+	if ( reason ) {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server for:\n%s", reason);
+		
+		// Print the kick to all clients
+		SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked for %s\n\"", cl->name, reason);
+		
+		SV_DropClient( cl, va("was kicked for %s", reason) );
+	} else {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server");
+		
+		// Print the kick to all clients
+		SV_SendServerCommand( NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked\n\"", cl->name );
+		
+		SV_DropClient( cl, "was kicked" );
+	}
+	
 	cl->lastPacketTime = svs.time;	// in case there is a funny zombie
 }
 /*
@@ -425,11 +449,12 @@ static void SV_KickAll_f( void ) {
 ==================
 SV_KickNum_f
 
-Kick a user off of the server
+Kick a user off of the server, optionally with a reason
 ==================
 */
 static void SV_KickNum_f( void ) {
 	client_t	*cl;
+	char        *reason = NULL;
 
 	// make sure server is running
 	if ( !com_sv_running->integer ) {
@@ -437,8 +462,8 @@ static void SV_KickNum_f( void ) {
 		return;
 	}
 
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("Usage: %s <client number>\n", Cmd_Argv(0));
+	if ( Cmd_Argc() < 2 ) {
+		Com_Printf ("Usage: %s <client number> [reason]\n", Cmd_Argv(0));
 		return;
 	}
 
@@ -451,7 +476,30 @@ static void SV_KickNum_f( void ) {
 		return;
 	}
 
-	SV_DropClient( cl, "was kicked" );
+	// Check if there's a reason provided
+	if ( Cmd_Argc() >= 3 ) {
+		reason = Cmd_ArgsFrom(2);
+	}
+
+	// Check if there's a reason provided
+	if ( reason ) {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server for:\n%s", reason);
+		
+		// Print the kick to all clients
+		SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked for %s\n\"", cl->name, reason);
+		
+		SV_DropClient( cl, va("was kicked for %s", reason) );
+	} else {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server");
+		
+		// Print the kick to all clients
+		SV_SendServerCommand( NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked\n\"", cl->name );
+		
+		SV_DropClient( cl, "was kicked" );
+	}
+	
 	cl->lastPacketTime = svs.time;	// in case there is a funny zombie
 }
 
@@ -580,7 +628,7 @@ static void SV_RehashBans_f(void)
 {
 	int index, filelen;
 	fileHandle_t readfrom;
-	char *textbuf, *curpos, *maskpos, *newlinepos, *endpos;
+	char *textbuf, *curpos, *maskpos, *newlinepos, *endpos, *reasonpos;
 	char filepath[MAX_QPATH];
 	
 	// make sure server is running
@@ -623,12 +671,29 @@ static void SV_RehashBans_f(void)
 			maskpos++;
 			
 			// find the end of the subnet specifier
-			for(newlinepos = maskpos; newlinepos < endpos && *newlinepos != '\n'; newlinepos++);
+			for(newlinepos = maskpos; newlinepos < endpos && *newlinepos != '\n' && *newlinepos != ':'; newlinepos++);
 			
 			if(newlinepos >= endpos)
 				break;
 			
-			*newlinepos = '\0';
+			if(*newlinepos == ':') {
+				// We have a reason
+				*newlinepos = '\0';
+				reasonpos = newlinepos + 1;
+				
+				// Find the end of the reason string
+				for(newlinepos = reasonpos; newlinepos < endpos && *newlinepos != '\n'; newlinepos++);
+				
+				if(newlinepos >= endpos)
+					break;
+				
+				*newlinepos = '\0';
+				Q_strncpyz(serverBans[index].reason, reasonpos, sizeof(serverBans[index].reason));
+			} else {
+				// No reason
+				*newlinepos = '\0';
+				serverBans[index].reason[0] = '\0';
+			}
 			
 			if(NET_StringToAdr(curpos + 2, &serverBans[index].ip, NA_UNSPEC))
 			{
@@ -676,15 +741,21 @@ static void SV_WriteBans(void)
 
 	if((writeto = FS_SV_FOpenFileWrite(filepath)))
 	{
-		char writebuf[128];
+		char writebuf[128 + MAX_REASON_LENGTH];
 		serverBan_t *curban;
 		
 		for(index = 0; index < serverBansCount; index++)
 		{
 			curban = &serverBans[index];
 			
-			Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d\n",
-					curban->isexception, NET_AdrToString(curban->ip), curban->subnet);
+			if(curban->reason[0]) {
+				Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d:%s\n",
+						curban->isexception, NET_AdrToString(curban->ip), curban->subnet, curban->reason);
+			} else {
+				Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d\n",
+						curban->isexception, NET_AdrToString(curban->ip), curban->subnet);
+			}
+			
 			FS_Write(writebuf, strlen(writebuf), writeto);
 		}
 
@@ -771,11 +842,14 @@ Ban a user from being able to play on this server based on his ip address.
 static void SV_AddBanToList(qboolean isexception)
 {
 	char *banstring;
+	char *reason = NULL;
 	char addy2[NET_ADDRSTRMAXLEN];
 	netadr_t ip;
 	int index, argc, mask;
 	serverBan_t *curban;
-
+	client_t *cl = NULL;
+	qboolean isdigit_only;
+	
 	// make sure server is running
 	if ( !com_sv_running->integer ) {
 		Com_Printf( "Server is not running.\n" );
@@ -784,9 +858,9 @@ static void SV_AddBanToList(qboolean isexception)
 
 	argc = Cmd_Argc();
 	
-	if(argc < 2 || argc > 3)
+	if ( argc < 2 )
 	{
-		Com_Printf ("Usage: %s (ip[/subnet] | clientnum [subnet])\n", Cmd_Argv(0));
+		Com_Printf ("Usage: %s (ip[/subnet] | clientnum [subnet] [reason])\n", Cmd_Argv(0));
 		return;
 	}
 
@@ -798,10 +872,14 @@ static void SV_AddBanToList(qboolean isexception)
 
 	banstring = Cmd_Argv(1);
 	
+	// Get optional reason - can be at arg 2 for IP bans or arg 3 for client num bans
 	if(strchr(banstring, '.') || strchr(banstring, ':'))
 	{
-		// This is an ip address, not a client num.
-		
+		// IP address ban 
+		if(argc >= 3) {
+			reason = Cmd_ArgsFrom(2);
+		}
+
 		if(SV_ParseCIDRNotation(&ip, &mask, banstring))
 		{
 			Com_Printf("Error: Invalid address %s\n", banstring);
@@ -810,13 +888,10 @@ static void SV_AddBanToList(qboolean isexception)
 	}
 	else
 	{
-		client_t *cl;
-		
-		// client num.
-		
+		// client num ban
 		cl = SV_GetPlayerByNum();
 
-		if(!cl)
+		if ( !cl )
 		{
 			Com_Printf("Error: Playernum %s does not exist.\n", Cmd_Argv(1));
 			return;
@@ -824,23 +899,45 @@ static void SV_AddBanToList(qboolean isexception)
 		
 		ip = cl->netchan.remoteAddress;
 		
-		if(argc == 3)
+		if(argc >= 3)
 		{
-			mask = atoi(Cmd_Argv(2));
-			
-			if(ip.type == NA_IP)
-			{
-				if(mask < 1 || mask > 32)
-					mask = 32;
+			// Check if second argument is all digits (CIDR notation)
+			isdigit_only = qtrue;
+			for(index = 0; Cmd_Argv(2)[index]; index++) {
+				if(Cmd_Argv(2)[index] < '0' || Cmd_Argv(2)[index] > '9') {
+					isdigit_only = qfalse;
+					break;
+				}
 			}
-			else
-			{
-				if(mask < 1 || mask > 128)
-					mask = 128;
+			
+			if(isdigit_only) {
+				// Second arg is CIDR mask
+				mask = atoi(Cmd_Argv(2));
+			
+				if(ip.type == NA_IP)
+				{
+					if(mask < 1 || mask > 32)
+						mask = 32;
+				}
+				else
+				{
+					if(mask < 1 || mask > 128)
+						mask = 128;
+				}
+
+				// Get optional reason after subnet
+				if(argc >= 4) {
+					reason = Cmd_ArgsFrom(3);
+				}
+			} else {
+				// Second arg is start of reason
+				reason = Cmd_ArgsFrom(2);
+				mask = (ip.type == NA_IP6) ? 128 : 32;
 			}
 		}
-		else
+		else {
 			mask = (ip.type == NA_IP6) ? 128 : 32;
+		}
 	}
 
 	if(ip.type != NA_IP && ip.type != NA_IP6)
@@ -896,12 +993,47 @@ static void SV_AddBanToList(qboolean isexception)
 	serverBans[serverBansCount].subnet = mask;
 	serverBans[serverBansCount].isexception = isexception;
 	
+	if(reason) {
+		Q_strncpyz(serverBans[serverBansCount].reason, reason, sizeof(serverBans[serverBansCount].reason));
+	} else {
+		serverBans[serverBansCount].reason[0] = '\0';
+	}
+	
 	serverBansCount++;
 	
 	SV_WriteBans();
 
-	Com_Printf("Added %s: %s/%d\n", isexception ? "ban exception" : "ban",
-		   NET_AdrToString(ip), mask);
+	// Find and kick any connected clients matching the banned IP
+	for(index = 0; index < sv_maxclients->integer; index++) {
+		client_t *kickcl = &svs.clients[index];
+		
+		if(!kickcl->state)
+			continue;
+
+		if ( NET_CompareBaseAdrMask(kickcl->netchan.remoteAddress, ip, mask) ) {
+			if ( reason ) {
+				SV_NET_OutOfBandPrint(&svs.netprofile, kickcl->netchan.remoteAddress,
+					"droperror\nYou have been banned from this server for:\n%s", reason);
+				
+				SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was banned for %s\n\"", kickcl->name, reason);
+				
+				SV_DropClient(kickcl, va("was banned for %s", reason));
+			} else {
+				SV_NET_OutOfBandPrint(&svs.netprofile, kickcl->netchan.remoteAddress,
+					"droperror\nYou have been banned from this server");
+
+				SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was banned\n\"", kickcl->name);
+				
+				SV_DropClient(kickcl, "was banned");
+			}
+			kickcl->lastPacketTime = svs.time;
+		}
+	}
+
+	Com_Printf("Added %s: %s/%d%s%s\n", isexception ? "ban exception" : "ban",
+			NET_AdrToString(ip), mask,
+			reason ? " with reason: " : "",
+			reason ? reason : "");
 }
 
 /*
@@ -1023,8 +1155,14 @@ static void SV_ListBans_f(void)
 		{
 			count++;
 
-			Com_Printf("Ban #%d: %s/%d\n", count,
+			Com_Printf("Ban #%d: %s/%d", count,
 					NET_AdrToString(ban->ip), ban->subnet);
+					
+			if(ban->reason[0]) {
+				Com_Printf(" - Reason: %s", ban->reason);
+			}
+			
+			Com_Printf("\n");
 		}
 	}
 	// List all exceptions
@@ -1035,8 +1173,14 @@ static void SV_ListBans_f(void)
 		{
 			count++;
 
-			Com_Printf("Except #%d: %s/%d\n", count,
+			Com_Printf("Except #%d: %s/%d", count,
 					NET_AdrToString(ban->ip), ban->subnet);
+					
+			if(ban->reason[0]) {
+				Com_Printf(" - Reason: %s", ban->reason);
+			}
+			
+			Com_Printf("\n");
 		}
 	}
 }
@@ -1816,6 +1960,8 @@ void SV_AddOperatorCommands(void) {
 	Cmd_AddCommand("kickall", SV_KickAll_f);
 	Cmd_AddCommand("kicknum", SV_KickNum_f);
 	Cmd_AddCommand("clientkick", SV_KickNum_f); // Legacy command
+	Cmd_AddCommand("clientkickr", SV_KickNum_f); // Legacy command with reason
+	Cmd_AddCommand("kickr", SV_KickNum_f); // Legacy command with reason
 	Cmd_AddCommand("status", SV_Status_f);
 	Cmd_AddCommand("serverinfo", SV_Serverinfo_f);
 	Cmd_AddCommand("systeminfo", SV_Systeminfo_f);
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index da97fd94..d56484f2 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -196,18 +196,23 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 SV_IsBanned
 
 Check whether a certain address is banned
+Returns the reason string if available
 ==================
 */
 
-static qboolean SV_IsBanned(netadr_t *from, qboolean isexception)
+static qboolean SV_IsBanned(netadr_t *from, qboolean isexception, char *reason, int reason_size)
 {
 	int index;
 	serverBan_t *curban;
 	
+	if(reason && reason_size > 0) {
+		reason[0] = '\0';
+	}
+	
 	if(!isexception)
 	{
 		// If this is a query for a ban, first check whether the client is excepted
-		if(SV_IsBanned(from, qtrue))
+		if(SV_IsBanned(from, qtrue, NULL, 0))
 			return qfalse;
 	}
 	
@@ -217,8 +222,13 @@ static qboolean SV_IsBanned(netadr_t *from, qboolean isexception)
 		
 		if(curban->isexception == isexception)
 		{
-			if(NET_CompareBaseAdrMask(curban->ip, *from, curban->subnet))
+			if(NET_CompareBaseAdrMask(curban->ip, *from, curban->subnet)) {
+				// Copy the ban reason if available and a buffer was provided
+				if(reason && reason_size > 0 && curban->reason[0]) {
+					Q_strncpyz(reason, curban->reason, reason_size);
+				}
 				return qtrue;
+			}
 		}
 	}
 	
@@ -333,13 +343,18 @@ void SV_DirectConnect( netadr_t from ) {
 	qboolean	compat = qfalse;
 #endif
 	challenge_t* ch;
+	char        banReason[MAX_REASON_LENGTH];
 
 	Com_DPrintf ("SVC_DirectConnect ()\n");
 	
 	// Check whether this client is banned.
-	if(SV_IsBanned(&from, qfalse))
+	if(SV_IsBanned(&from, qfalse, banReason, sizeof(banReason)))
 	{
-		SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nYou are banned from this server.\n");
+		if(banReason[0]) {
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nYou are banned from this server.\nReason: %s\n", banReason);
+		} else {
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nYou are banned from this server.\n");
+		}
 		return;
 	}
 

From 22a34d8d6829f37e9407d441efb83a05780349d3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 12 Mar 2025 23:18:11 +0100
Subject: [PATCH 1981/2040] Fix compile error when libcurl is not installed

---
 code/sys/sys_update_checker.cpp | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index a13e48ed..59c1ac33 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -24,14 +24,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_version.h"
 
 #ifdef HAS_LIBCURL
-
 #    include <curl/curl.h>
+#endif
 
 //#include <httplib.h>
-#    include "../qcommon/json.hpp"
+#include "../qcommon/json.hpp"
 using json = nlohmann::json;
 
-#    include <chrono>
+#include <chrono>
 
 UpdateChecker updateChecker;
 
@@ -67,6 +67,7 @@ UpdateChecker::~UpdateChecker()
 
 void UpdateChecker::Init()
 {
+#ifdef HAS_LIBCURL
     CURLcode result;
 
     assert(!handle);
@@ -90,6 +91,7 @@ void UpdateChecker::Init()
     curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
 
     thread = new std::thread(&UpdateChecker::RequestThread, this);
+#endif
 }
 
 void UpdateChecker::Process()
@@ -122,6 +124,7 @@ void UpdateChecker::Shutdown()
 
 void UpdateChecker::ShutdownClient()
 {
+#ifdef HAS_LIBCURL
     std::lock_guard<std::shared_mutex> l(clientMutex);
 
     if (!handle) {
@@ -130,6 +133,7 @@ void UpdateChecker::ShutdownClient()
 
     curl_easy_cleanup(handle);
     handle = NULL;
+#endif
 }
 
 void UpdateChecker::ShutdownThread()
@@ -229,6 +233,7 @@ bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor
     return true;
 }
 
+#ifdef HAS_LIBCURL
 size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 {
     std::string& responseString = *(std::string *)userp;
@@ -290,23 +295,4 @@ void UpdateChecker::RequestThread()
         std::this_thread::sleep_for(std::chrono::seconds(5));
     }
 }
-
-#else
-
-bool UpdateChecker::CheckNewVersion() const
-{
-    return false;
-}
-
-bool UpdateChecker::CheckNewVersion(int& major, int& minor, int& patch) const
-{
-    return false;
-}
-
-void Sys_UpdateChecker_Init() {}
-
-void Sys_UpdateChecker_Process() {}
-
-void Sys_UpdateChecker_Shutdown() {}
-
 #endif

From c854df8ffa7107ac93a702cd031cfa96a4f4522b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 12 Mar 2025 23:56:54 +0100
Subject: [PATCH 1982/2040] Don't start the update thread if it shouldn't be
 active or if the network doesn't work

---
 code/sys/sys_update_checker.cpp | 37 +++++++++++++++++++++++++++++----
 code/sys/sys_update_checker.h   |  3 +++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index 59c1ac33..e60a42f1 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -56,6 +56,7 @@ UpdateChecker::UpdateChecker()
     versionChecked                    = false;
     handle                            = NULL;
     thread                            = NULL;
+    requestThreadIsActive             = qfalse;
 }
 
 UpdateChecker::~UpdateChecker()
@@ -89,13 +90,39 @@ void UpdateChecker::Init()
     }
 
     curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
+#endif
 
-    thread = new std::thread(&UpdateChecker::RequestThread, this);
+    CheckInitClientThread();
+}
+
+void UpdateChecker::CheckInitClientThread()
+{
+    if (!requestThreadIsActive && CanHaveRequestThread()) {
+        requestThreadIsActive = qtrue;
+
+        thread = new std::thread(&UpdateChecker::RequestThread, this);
+    }
+}
+
+bool UpdateChecker::CanHaveRequestThread() const
+{
+    if (!Cvar_VariableIntegerValue("net_enabled")) {
+        // Network has been disabled by a cvar
+        return false;
+    }
+
+#ifdef HAS_LIBCURL
+    return true;
+#else
+    return false;
 #endif
 }
 
 void UpdateChecker::Process()
 {
+    // Initialize the client thread when necessary
+    CheckInitClientThread();
+
     std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
     if (currentTime
         < lastMessageTime + std::chrono::milliseconds(Q_max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
@@ -233,7 +260,6 @@ bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor
     return true;
 }
 
-#ifdef HAS_LIBCURL
 size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 {
     std::string& responseString = *(std::string *)userp;
@@ -244,6 +270,7 @@ size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 
 void UpdateChecker::DoRequest()
 {
+#ifdef HAS_LIBCURL
     std::lock_guard<std::shared_mutex> l(clientMutex);
     CURLcode                           result;
     std::string                        responseString;
@@ -276,6 +303,7 @@ void UpdateChecker::DoRequest()
 
         versionChecked = true;
     } catch (std::out_of_range&) {}
+#endif
 }
 
 void UpdateChecker::RequestThread()
@@ -283,7 +311,7 @@ void UpdateChecker::RequestThread()
     std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
     std::chrono::time_point<std::chrono::steady_clock> lastCheckTime;
 
-    while (handle) {
+    while (handle && CanHaveRequestThread()) {
         currentTime = std::chrono::steady_clock::now();
         if (currentTime
             >= lastCheckTime + std::chrono::milliseconds(Q_max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
@@ -294,5 +322,6 @@ void UpdateChecker::RequestThread()
 
         std::this_thread::sleep_for(std::chrono::seconds(5));
     }
+
+    requestThreadIsActive = qfalse;
 }
-#endif
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
index e51f8844..e9bddbf1 100644
--- a/code/sys/sys_update_checker.h
+++ b/code/sys/sys_update_checker.h
@@ -59,6 +59,8 @@ private:
     void ShutdownClient();
     void ShutdownThread();
     void RequestThread();
+    void CheckInitClientThread();
+    bool CanHaveRequestThread() const;
     void DoRequest();
     bool ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const;
 
@@ -79,6 +81,7 @@ private:
     void             *handle;
     std::shared_mutex clientMutex;
     std::thread      *thread;
+    qboolean          requestThreadIsActive;
 };
 
 extern UpdateChecker updateChecker;

From 456b660b2af76b2528d8d72c3a4358bab237df71 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 21:09:42 +0100
Subject: [PATCH 1983/2040] Improve the update checker so it can be opt-out
 (#696)

* Add a cvar to enable/disable update checking

* Refactor update checker

This splits the thread part from the main part to clarify the code

* Move and update the configuration documentation, for a more general approach
---
 README.md                                     |   2 +-
 code/qcommon/common.c                         |   8 +-
 code/qcommon/qcommon.h                        |   3 +-
 code/sys/sys_update_checker.cpp               | 225 +++++++++++-------
 code/sys/sys_update_checker.h                 |  47 +++-
 .../server.md => configuration.md}            |  58 +++--
 6 files changed, 216 insertions(+), 127 deletions(-)
 rename docs/{configuration/server.md => configuration.md} (88%)

diff --git a/README.md b/README.md
index c584f425..9d221b94 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of
 
 - [Downloading and installing OpenMoHAA](docs/getting_started_installation.md)
 - [Running OpenMoHAA and using expansion assets](docs/getting_started_running.md)
-- [Dedicated server configuration](docs/configuration/server.md)
+- [Game configuration](docs/configuration.md)
 
 If you encounter any issues, please refer to the [FAQ](docs/faq.md) for possible solutions.
 
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index c4520f0f..e7dbd31c 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -127,7 +127,8 @@ cvar_t	*precache;
 cvar_t	*com_target_game;
 cvar_t	*com_target_version;
 cvar_t	*com_target_demo;
-cvar_t	*com_updateCheckInterval;
+cvar_t	*com_updatecheck_enabled;
+cvar_t	*com_updatecheck_interval;
 
 int protocol_version_demo;
 int protocol_version_full;
@@ -1919,8 +1920,9 @@ void Com_Init( char *commandLine ) {
 #ifdef LEGACY_PROTOCOL
 	com_legacyprotocol = Cvar_Get("com_legacyprotocol", va("%i", PROTOCOL_LEGACY_VERSION), CVAR_INIT);
 
-	com_updateCheckInterval = Cvar_Get("com_updateCheckInterval", "15", 0);
-    Cvar_CheckRange(com_updateCheckInterval, 5, 240, qtrue);
+	com_updatecheck_enabled = Cvar_Get("com_updatecheck_enabled", "1", CVAR_ARCHIVE);
+	com_updatecheck_interval = Cvar_Get("com_updatecheck_interval", "15", 0);
+    Cvar_CheckRange(com_updatecheck_interval, 5, 240, qtrue);
 
 	// Keep for compatibility with old mods / mods that haven't updated yet.
 	if(com_legacyprotocol->integer > 0)
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 9c853055..cd0f9785 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1060,7 +1060,8 @@ extern  cvar_t* con_autochat;
 extern	cvar_t* com_target_version;
 extern	cvar_t* com_target_game;
 extern	cvar_t* com_target_demo;
-extern	cvar_t* com_updateCheckInterval;
+extern	cvar_t* com_updatecheck_enabled;
+extern	cvar_t* com_updatecheck_interval;
 
 extern	int		protocol_version_demo;
 extern	int		protocol_version_full;
diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index e60a42f1..d40d8060 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -54,53 +54,29 @@ UpdateChecker::UpdateChecker()
 {
     lastMajor = lastMinor = lastPatch = 0;
     versionChecked                    = false;
-    handle                            = NULL;
-    thread                            = NULL;
-    requestThreadIsActive             = qfalse;
 }
 
-UpdateChecker::~UpdateChecker()
-{
-    if (handle) {
-        Shutdown();
-    }
-}
+UpdateChecker::~UpdateChecker() {}
 
 void UpdateChecker::Init()
 {
-#ifdef HAS_LIBCURL
-    CURLcode result;
-
-    assert(!handle);
-    assert(!thread);
-
-    handle = curl_easy_init();
-    if (!handle) {
-        Com_DPrintf("Failed to create curl client\n");
-        return;
-    }
-
-    result = curl_easy_setopt(handle, CURLOPT_URL, "https://api.github.com/repos/openmoh/openmohaa/releases/latest");
-
-    if (result != CURLE_OK) {
-        Com_DPrintf("Failed to set curl URL: %s\n", curl_easy_strerror(result));
-        curl_easy_cleanup(handle);
-        handle = NULL;
-        return;
-    }
-
-    curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
-#endif
-
     CheckInitClientThread();
 }
 
 void UpdateChecker::CheckInitClientThread()
 {
-    if (!requestThreadIsActive && CanHaveRequestThread()) {
-        requestThreadIsActive = qtrue;
+    if (!thread) {
+        if (CanHaveRequestThread()) {
+            thread = new UpdateCheckerThread();
+            thread->Init();
+        }
+    } else {
+        if (!CanHaveRequestThread()) {
+            Com_DPrintf("Shutting down the update checker thread\n");
 
-        thread = new std::thread(&UpdateChecker::RequestThread, this);
+            delete thread;
+            thread = NULL;
+        }
     }
 }
 
@@ -111,6 +87,11 @@ bool UpdateChecker::CanHaveRequestThread() const
         return false;
     }
 
+    if (!com_updatecheck_enabled->integer) {
+        // Update checking has been disabled
+        return false;
+    }
+
 #ifdef HAS_LIBCURL
     return true;
 #else
@@ -118,21 +99,28 @@ bool UpdateChecker::CanHaveRequestThread() const
 #endif
 }
 
+void UpdateChecker::SetLatestVersion(int major, int minor, int patch)
+{
+    lastMajor = major;
+    lastMinor = minor;
+    lastPatch = patch;
+
+    versionChecked = true;
+}
+
 void UpdateChecker::Process()
 {
     // Initialize the client thread when necessary
     CheckInitClientThread();
 
     std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
-    if (currentTime
-        < lastMessageTime + std::chrono::milliseconds(Q_max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
+    if (currentTime < nextMessageTime) {
         return;
     }
 
     if (!CheckNewVersion()) {
         return;
     }
-    lastMessageTime = currentTime;
 
     Com_Printf(
         "New release v%d.%d.%d published *\\(^ o ^)/*. Your current version is v%s. See www.openmohaa.org\n",
@@ -141,37 +129,16 @@ void UpdateChecker::Process()
         lastPatch,
         PRODUCT_VERSION_NUMBER_STRING
     );
+
+    nextMessageTime = currentTime + std::chrono::milliseconds(Q_max(1, com_updatecheck_interval->integer) * 60 * 1000);
 }
 
 void UpdateChecker::Shutdown()
 {
-    ShutdownClient();
-    ShutdownThread();
-}
-
-void UpdateChecker::ShutdownClient()
-{
-#ifdef HAS_LIBCURL
-    std::lock_guard<std::shared_mutex> l(clientMutex);
-
-    if (!handle) {
-        return;
+    if (thread) {
+        delete thread;
+        thread = NULL;
     }
-
-    curl_easy_cleanup(handle);
-    handle = NULL;
-#endif
-}
-
-void UpdateChecker::ShutdownThread()
-{
-    if (!thread) {
-        return;
-    }
-
-    thread->join();
-    delete thread;
-    thread = NULL;
 }
 
 bool UpdateChecker::CheckNewVersion() const
@@ -212,7 +179,91 @@ bool UpdateChecker::CheckNewVersion(int& major, int& minor, int& patch) const
     return true;
 }
 
-bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const
+UpdateCheckerThread::UpdateCheckerThread()
+{
+    handle                = NULL;
+    osThread              = NULL;
+    requestThreadIsActive = qfalse;
+    shouldBeActive        = qfalse;
+}
+
+UpdateCheckerThread::~UpdateCheckerThread()
+{
+    Shutdown();
+}
+
+void UpdateCheckerThread::Init()
+{
+    shouldBeActive        = qtrue;
+    requestThreadIsActive = qtrue;
+
+    osThread = new std::thread(&UpdateCheckerThread::RequestThread, this);
+}
+
+void UpdateCheckerThread::Shutdown()
+{
+    if (!shouldBeActive) {
+        return;
+    }
+
+    shouldBeActive = qfalse;
+
+    if (osThread) {
+        // Notify and shutdown the thread
+        clientWake.notify_all();
+        osThread->join();
+
+        delete osThread;
+        osThread = NULL;
+    }
+}
+
+bool UpdateCheckerThread::IsRoutineActive() const
+{
+    return requestThreadIsActive;
+}
+
+void UpdateCheckerThread::InitClient()
+{
+#ifdef HAS_LIBCURL
+    CURLcode result;
+
+    assert(!handle);
+
+    handle = curl_easy_init();
+    if (!handle) {
+        Com_DPrintf("Failed to create curl client\n");
+        return;
+    }
+
+    result = curl_easy_setopt(handle, CURLOPT_URL, "https://api.github.com/repos/openmoh/openmohaa/releases/latest");
+
+    if (result != CURLE_OK) {
+        Com_DPrintf("Failed to set curl URL: %s\n", curl_easy_strerror(result));
+        curl_easy_cleanup(handle);
+        handle = NULL;
+        return;
+    }
+
+    curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
+#else
+    Com_DPrintf("Project was compiled without libcurl, will not check for updates\n");
+#endif
+}
+
+void UpdateCheckerThread::ShutdownClient()
+{
+#ifdef HAS_LIBCURL
+    if (!handle) {
+        return;
+    }
+
+    curl_easy_cleanup(handle);
+    handle = NULL;
+#endif
+}
+
+bool UpdateCheckerThread::ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const
 {
     const char *p  = value;
     const char *pn = value;
@@ -268,12 +319,11 @@ size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
     return size * nmemb;
 }
 
-void UpdateChecker::DoRequest()
+void UpdateCheckerThread::DoRequest()
 {
 #ifdef HAS_LIBCURL
-    std::lock_guard<std::shared_mutex> l(clientMutex);
-    CURLcode                           result;
-    std::string                        responseString;
+    CURLcode    result;
+    std::string responseString;
 
     curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback);
     curl_easy_setopt(handle, CURLOPT_WRITEDATA, &responseString);
@@ -297,31 +347,30 @@ void UpdateChecker::DoRequest()
         int major, minor, patch;
         ParseVersionNumber(tagName.c_str(), major, minor, patch);
 
-        lastMajor = major;
-        lastMinor = minor;
-        lastPatch = patch;
-
-        versionChecked = true;
+        updateChecker.SetLatestVersion(major, minor, patch);
     } catch (std::out_of_range&) {}
 #endif
 }
 
-void UpdateChecker::RequestThread()
+void UpdateCheckerThread::RequestThread()
 {
-    std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
-    std::chrono::time_point<std::chrono::steady_clock> lastCheckTime;
+    // Initialize the curl client
+    InitClient();
 
-    while (handle && CanHaveRequestThread()) {
-        currentTime = std::chrono::steady_clock::now();
-        if (currentTime
-            >= lastCheckTime + std::chrono::milliseconds(Q_max(1, com_updateCheckInterval->integer) * 60 * 1000)) {
-            lastCheckTime = currentTime;
-
-            DoRequest();
-        }
-
-        std::this_thread::sleep_for(std::chrono::seconds(5));
+    while (handle && shouldBeActive) {
+        DoRequest();
+        RequestThreadSleep();
     }
 
+    ShutdownClient();
+
     requestThreadIsActive = qfalse;
 }
+
+void UpdateCheckerThread::RequestThreadSleep()
+{
+    const std::chrono::seconds interval = std::chrono::seconds(Q_max(1, com_updatecheck_interval->integer) * 60);
+
+    std::unique_lock<std::mutex> l(clientWakeMutex);
+    clientWake.wait_for(l, interval);
+}
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
index e9bddbf1..e3905012 100644
--- a/code/sys/sys_update_checker.h
+++ b/code/sys/sys_update_checker.h
@@ -41,6 +41,37 @@ extern "C" {
 #    include <thread>
 #    include <shared_mutex>
 #    include <chrono>
+#    include <condition_variable>
+
+class UpdateCheckerThread
+{
+public:
+    UpdateCheckerThread();
+    ~UpdateCheckerThread();
+
+    void Init();
+    void Shutdown();
+    bool IsRoutineActive() const;
+
+private:
+    void ShutdownThread();
+
+    void InitClient();
+    void ShutdownClient();
+
+    bool ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const;
+    void RequestThread();
+    void RequestThreadSleep();
+    void DoRequest();
+
+private:
+    void                   *handle;
+    std::mutex              clientWakeMutex;
+    std::condition_variable clientWake;
+    std::thread            *osThread;
+    qboolean                requestThreadIsActive;
+    qboolean                shouldBeActive;
+};
 
 class UpdateChecker
 {
@@ -54,15 +85,11 @@ public:
 
     bool CheckNewVersion() const;
     bool CheckNewVersion(int& major, int& minor, int& patch) const;
+    void SetLatestVersion(int major, int minor, int patch);
 
 private:
-    void ShutdownClient();
-    void ShutdownThread();
-    void RequestThread();
     void CheckInitClientThread();
     bool CanHaveRequestThread() const;
-    void DoRequest();
-    bool ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const;
 
 private:
     //
@@ -73,15 +100,9 @@ private:
     int  lastPatch;
     bool versionChecked;
 
-    std::chrono::time_point<std::chrono::steady_clock> lastMessageTime;
+    std::chrono::time_point<std::chrono::steady_clock> nextMessageTime;
 
-    //
-    // Thread-related variables
-    //
-    void             *handle;
-    std::shared_mutex clientMutex;
-    std::thread      *thread;
-    qboolean          requestThreadIsActive;
+    UpdateCheckerThread *thread;
 };
 
 extern UpdateChecker updateChecker;
diff --git a/docs/configuration/server.md b/docs/configuration.md
similarity index 88%
rename from docs/configuration/server.md
rename to docs/configuration.md
index 3e655f21..8d9a8658 100644
--- a/docs/configuration/server.md
+++ b/docs/configuration.md
@@ -1,10 +1,12 @@
-# Server configuration and commands
+# Configuration and commands
+
+## General configuration
 
 This documentation currently only lists new changes that were introduced in OpenMoHAA.
 
 If you want to use containers, see [Building a server container in Docker](../../docker/server/README.md) to build an image for your dedicated server.
 
-## Home directory
+### Home directory
 
 In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:
 
@@ -18,19 +20,44 @@ The variable defaults to the following value depending on the OS:
 - `~/.openmohaa` on Linux
 - `~/Library/Application Support/openmohaa` on macOS
 
-## Networking
+### Networking
 
-### Configure the network components
+#### Configure the network components
 
 The network settings can be adjusted to use either IPv4, IPv6, or both. By default, IPv6 is disabled on dedicated servers. The following commands adjust network settings:
 
+- `set net_enabled 0`: This networking.
 - `set net_enabled 1`: This enables IPv4 only (the default setting for dedicated servers).
 - `set net_enabled 2`: This enables IPv6 only.
 - `set net_enabled 3`: This enables both IPv4 and IPv6 (the default setting when running the standalone game).
 
 *Note: The master server (using the GameSpy protocol) does not support IPv6. If IPv4 is disabled, the server won't appear in the online server list for internet games, even if IPv6 is enabled.*
 
-### Optimization / Antichams
+### Flood protection differences with MOH: Spearhead
+
+Flood protection is turned on by default in all games (`sv_floodProtection 1`).
+
+- In MOH: Allied Assault and OpenMoHAA, flood protection checks all commands.
+- In MOH: Spearhead 2.0 and later, flood protection only checks for text messages.
+
+While flood protection prevents spam, it can sometimes be annoying in certain situations like reloading and checking scores within a short period of time. If needed, it can be disabled with `set sv_floodProtection 0`.
+
+For more details on preventing message spamming, check out the [Chat](#chat) section below.
+
+### Updates
+
+The game periodically retrieves the latest version number from the GitHub project page at fixed intervals to check for available updates. This process runs in the background and does not interfere with the main thread, meaning it will not cause hangs or stability issues. Updates are not applied automatically, they must be downloaded and installed manually.
+
+Update checking is enabled by default, but can be disabled under any of the following conditions:
+- `net_enabled` is set to 0, disables networking, as mentioned above
+- `com_updatechecker_enabled` is set to 0
+- The project is compiled without libcurl support
+
+## Server configuration
+
+### Networking
+
+#### Optimization / Antichams
 
 A new variable, `sv_netoptimize`, enables a feature that optimizes network bandwidth by not sending players information about others they can't see. For each client, the server optimizes by only transmitting data about players within their view. Clients will not receive information about players they can't see. This feature also helps protect against cheaters:
 
@@ -40,7 +67,7 @@ A new variable, `sv_netoptimize`, enables a feature that optimizes network bandw
 
 This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was improved in OpenMoHAA: sounds like footsteps will be sent so players don't get confused.
 
-### Managing bans
+#### Managing bans
 
 A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` but it can be modified with the `sv_banFile` variable. Here are commands to manage bans:
 
@@ -66,20 +93,9 @@ Examples:
 
 To calculate IP subnets, search for `IP subnet calculator` on Internet.
 
-## Flood protection differences with MOH: Spearhead
+### Game
 
-Flood protection is turned on by default in all games (`sv_floodProtection 1`).
-
-- In MOH: Allied Assault and OpenMoHAA, flood protection checks all commands.
-- In MOH: Spearhead 2.0 and later, flood protection only checks for text messages.
-
-While flood protection prevents spam, it can sometimes be annoying in certain situations like reloading and checking scores within a short period of time. If needed, it can be disabled with `set sv_floodProtection 0`.
-
-For more details on preventing message spamming, check out the [Chat](#chat) section below.
-
-## Game
-
-### Chat
+#### Chat
 
 Chat messages will be logged in the console and in the logfile without requiring to set the `developer` variable.
 
@@ -92,7 +108,7 @@ The in-game chat can be tweaked:
 
 Temporarily disabling text messages can be useful in situations where tensions arise in the chat. Otherwise, it's best to keep them enabled under normal circumstances.
 
-### Balancing teams
+#### Balancing teams
 
 This setting prevents clients from joining a team if that team already has more players than the others. By default, it's turned off, but it can be switched on with the command `set g_teambalance 1`.
 
@@ -100,7 +116,7 @@ This feature is passive: it only checks the team sizes when someone tries to joi
 
 *Note: This check doesn't apply in server scripts; it only works when clients join teams directly.*
 
-### Bots
+#### Bots
 
 OpenMoHAA introduced multiplayer bots which can be used for entertainment or for testing purposes. Bots are players controlled by the computer, they appear in the scoreboard with their ping set to **bot**.
 

From 06a12246f5d8966531bd8afd2e2f5254295970a1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 22:37:21 +0100
Subject: [PATCH 1984/2040] Notify the request thread of shutdown only if it's
 waiting

This avoids a deadlock that would occur if notify_all() is called before the thread is waiting
---
 code/sys/sys_update_checker.cpp | 22 ++++++++++++----------
 code/sys/sys_update_checker.h   |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index d40d8060..c7915503 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -210,7 +210,13 @@ void UpdateCheckerThread::Shutdown()
 
     if (osThread) {
         // Notify and shutdown the thread
-        clientWake.notify_all();
+        {
+            // Wait until the request thread is ready
+            std::lock_guard<std::mutex> l(clientWakeMutex);
+            clientWake.notify_all();
+        }
+
+        // Wait for the thread to exit
         osThread->join();
 
         delete osThread;
@@ -358,19 +364,15 @@ void UpdateCheckerThread::RequestThread()
     InitClient();
 
     while (handle && shouldBeActive) {
+        std::unique_lock<std::mutex> l(clientWakeMutex);
         DoRequest();
-        RequestThreadSleep();
+
+        const std::chrono::seconds interval = std::chrono::seconds(Q_max(1, com_updatecheck_interval->integer) * 60);
+
+        clientWake.wait_for(l, interval);
     }
 
     ShutdownClient();
 
     requestThreadIsActive = qfalse;
 }
-
-void UpdateCheckerThread::RequestThreadSleep()
-{
-    const std::chrono::seconds interval = std::chrono::seconds(Q_max(1, com_updatecheck_interval->integer) * 60);
-
-    std::unique_lock<std::mutex> l(clientWakeMutex);
-    clientWake.wait_for(l, interval);
-}
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
index e3905012..ac5e8748 100644
--- a/code/sys/sys_update_checker.h
+++ b/code/sys/sys_update_checker.h
@@ -61,7 +61,6 @@ private:
 
     bool ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const;
     void RequestThread();
-    void RequestThreadSleep();
     void DoRequest();
 
 private:

From 9536a8ec64b40ef01fb892d7c0d0d138dff416e3 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 22:41:01 +0100
Subject: [PATCH 1985/2040] Specify a small timeout for each request

---
 code/sys/sys_update_checker.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index c7915503..a67b4620 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -333,6 +333,7 @@ void UpdateCheckerThread::DoRequest()
 
     curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback);
     curl_easy_setopt(handle, CURLOPT_WRITEDATA, &responseString);
+    curl_easy_setopt(handle, CURLOPT_TIMEOUT, 15);
 
     result = curl_easy_perform(handle);
     if (result != CURLE_OK) {

From fecd1eb505f9cba227a195b5269bd55be7f31ac6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:36:50 +0100
Subject: [PATCH 1986/2040] Preallocate and set the maximum buffer size to
 receive the request

---
 code/sys/sys_update_checker.cpp | 41 ++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index a67b4620..97807a5b 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -252,6 +252,7 @@ void UpdateCheckerThread::InitClient()
     }
 
     curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
+    curl_easy_setopt(handle, CURLOPT_TIMEOUT, 15);
 #else
     Com_DPrintf("Project was compiled without libcurl, will not check for updates\n");
 #endif
@@ -317,23 +318,47 @@ bool UpdateCheckerThread::ParseVersionNumber(const char *value, int& major, int&
     return true;
 }
 
+// It shouldn't be possible to receive responses that high from the API
+// 4MB
+static constexpr unsigned int MAX_BUFFER_SIZE = 4 * 1024 * 1024;
+
+struct WriteCallbackData {
+    WriteCallbackData()
+    {
+        // Reserve a buffer of 64KB
+        buffer.reserve(64 * 1024);
+    }
+
+    const char *GetData() const { return buffer.data(); }
+
+    size_t GetSize() const { return buffer.size(); }
+
+    std::string buffer;
+};
+
 size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 {
-    std::string& responseString = *(std::string *)userp;
-    responseString.append(contents, size * nmemb);
+    WriteCallbackData *callbackData = (WriteCallbackData *)userp;
 
-    return size * nmemb;
+    size_t responseSize = size * nmemb;
+    if (callbackData->GetSize() + responseSize + 1 > MAX_BUFFER_SIZE) {
+        return CURL_WRITEFUNC_ERROR;
+    }
+
+    callbackData->buffer.append(contents, responseSize);
+
+    return responseSize;
 }
 
 void UpdateCheckerThread::DoRequest()
 {
 #ifdef HAS_LIBCURL
-    CURLcode    result;
-    std::string responseString;
+    CURLcode          result;
+    WriteCallbackData callbackData;
 
     curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback);
-    curl_easy_setopt(handle, CURLOPT_WRITEDATA, &responseString);
-    curl_easy_setopt(handle, CURLOPT_TIMEOUT, 15);
+    curl_easy_setopt(handle, CURLOPT_WRITEDATA, &callbackData);
+    curl_easy_setopt(handle, CURLOPT_MAXFILESIZE, MAX_BUFFER_SIZE);
 
     result = curl_easy_perform(handle);
     if (result != CURLE_OK) {
@@ -343,7 +368,7 @@ void UpdateCheckerThread::DoRequest()
     nlohmann::json data;
 
     try {
-        data = nlohmann::json::parse(responseString);
+        data = nlohmann::json::parse(callbackData.GetData());
     } catch (const std::exception& e) {
         return;
     }

From e6f5d76abe08c111fed92b246e031df8b8d58e42 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:42:50 +0100
Subject: [PATCH 1987/2040] Set the appropriate headers to use API versioning

---
 code/sys/sys_update_checker.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index 97807a5b..ba37b34e 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -360,7 +360,15 @@ void UpdateCheckerThread::DoRequest()
     curl_easy_setopt(handle, CURLOPT_WRITEDATA, &callbackData);
     curl_easy_setopt(handle, CURLOPT_MAXFILESIZE, MAX_BUFFER_SIZE);
 
+    struct curl_slist *list = NULL;
+
+    list = curl_slist_append(list, "Accept: application/vnd.github+json");
+    list = curl_slist_append(list, "X-GitHub-Api-Version: 2022-11-28");
+    curl_easy_setopt(handle, CURLOPT_HTTPHEADER, list);
+
     result = curl_easy_perform(handle);
+    curl_slist_free_all(list);
+
     if (result != CURLE_OK) {
         return;
     }

From de43299841edd635d60531ae71e226320d172404 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:57:08 +0100
Subject: [PATCH 1988/2040] Add a note about updates

---
 docs/configuration.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 8d9a8658..92aad75a 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -20,9 +20,7 @@ The variable defaults to the following value depending on the OS:
 - `~/.openmohaa` on Linux
 - `~/Library/Application Support/openmohaa` on macOS
 
-### Networking
-
-#### Configure the network components
+### Configure the network components
 
 The network settings can be adjusted to use either IPv4, IPv6, or both. By default, IPv6 is disabled on dedicated servers. The following commands adjust network settings:
 
@@ -53,11 +51,11 @@ Update checking is enabled by default, but can be disabled under any of the foll
 - `com_updatechecker_enabled` is set to 0
 - The project is compiled without libcurl support
 
+If you disable the update checker, remember to regularly check the project page for new versions. Updates can improve security and provide important fixes against exploits.
+
 ## Server configuration
 
-### Networking
-
-#### Optimization / Antichams
+### Optimization / Antichams
 
 A new variable, `sv_netoptimize`, enables a feature that optimizes network bandwidth by not sending players information about others they can't see. For each client, the server optimizes by only transmitting data about players within their view. Clients will not receive information about players they can't see. This feature also helps protect against cheaters:
 
@@ -67,7 +65,7 @@ A new variable, `sv_netoptimize`, enables a feature that optimizes network bandw
 
 This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was improved in OpenMoHAA: sounds like footsteps will be sent so players don't get confused.
 
-#### Managing bans
+### Managing bans
 
 A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` but it can be modified with the `sv_banFile` variable. Here are commands to manage bans:
 

From f653317e5b36dec3aaf4d3ccb7e373659776f6f4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:57:35 +0100
Subject: [PATCH 1989/2040] Add the reason parameter to banaddr documentation

---
 docs/configuration.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 92aad75a..b110713e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -69,15 +69,15 @@ This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, h
 
 A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` but it can be modified with the `sv_banFile` variable. Here are commands to manage bans:
 
-|Name       |Parameters                             |Description
-|-----------|---------------------------------------|-----------
-|rehashbans |                                       |Loads saved bans from the banlist file
-|listbans   |                                       |Lists all banned IP addresses
-|banaddr    |ip[*/subnet*] \| clientnum [*subnet*]  |Bans an IP through its address or through a client number, a subnet can be specified to ban a network range
-|exceptaddr |ip[*/subnet*] \| clientnum [*subnet*]  |Adds an IP as an exception, for example IP ranges can be banned but one or more exceptions can be added
-|bandel     |ip[*/subnet*] \| num                   |Unbans an IP address or a subnet, the entry number can be specified as an alternative
-|exceptdel  |ip[*/subnet*] \| num                   |Removes a ban exception
-|flushbans  |                                       |Removes all bans
+|Name       |Parameters                                      |Description
+|-----------|------------------------------------------------|-----------
+|rehashbans |                                                |Loads saved bans from the banlist file
+|listbans   |                                                |Lists all banned IP addresses
+|banaddr    |ip[*/subnet*] \| clientnum [*subnet*] [reason]  |Bans an IP through its address or through a client number, a subnet can be specified to ban a network range
+|exceptaddr |ip[*/subnet*] \| clientnum [*subnet*]           |Adds an IP as an exception, for example IP ranges can be banned but one or more exceptions can be added
+|bandel     |ip[*/subnet*] \| num                            |Unbans an IP address or a subnet, the entry number can be specified as an alternative
+|exceptdel  |ip[*/subnet*] \| num                            |Removes a ban exception
+|flushbans  |                                                |Removes all bans
 
 Examples:
 

From 5ee79480713e5d1c621db6a77033753c2427ef5a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Mar 2025 19:43:23 +0100
Subject: [PATCH 1990/2040] Add more sound-related commands

---
 code/cgame/cg_servercmds.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 081f0394..cc44cd55 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -482,25 +482,39 @@ static const char *whiteListedLocalServerVariables[] = {"ui_hidemouse", "ui_show
 // List of commands allowed to be executed by the server
 //
 static const char *whiteListedCommands[] = {
-    "primarydmweapon",
+    //
+    // HUD
+    //==========
     "pushmenu",
     "pushmenu_teamselect",
     "pushmenu_weaponselect",
     "popmenu",
-    "wait",
     "globalwidgetcommand", // used for mods adding custom HUDs
     "ui_addhud",
     "ui_removehud",
+
+    //
+    // Sounds
+    //==========
     "tmstart",
     "tmstartloop",
     "tmstop",
     "tmvolume",
-    "`stufftext",
+    "play",
+    "playmp3",
+    "stopmp3",
+
+    //
+    // Misc
+    //==========
+    "primarydmweapon",
+    "wait",
     "+moveup", // workaround for mods that want to prevent inactivity when handling the spectate
     "-moveup",
     "screenshot",
     "screenshotJPEG",
     "levelshot"
+    "`stufftext", // Stufftext detection from Reborn, the player gets kicked without it
 };
 
 //

From 4b3c150004fd77881a6db21f7c8afa0ad45a4684 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Mar 2025 19:47:35 +0100
Subject: [PATCH 1991/2040] Add cg_cameraverticaldisplacement

---
 code/cgame/cg_servercmds.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index cc44cd55..afbd626c 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -470,7 +470,8 @@ static const char *whiteListedVariables[] = {
     "subtitle2",
     "subtitle3",
     "name",
-    "cg_3rd_person" // for 3rd person server
+    "cg_3rd_person", // for 3rd person server
+    "cg_cameraverticaldisplacement" // for 3rd person server
 };
 
 //

From 74e909d17f652ee09c0c3a4818ab991d11f067b5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 15 Mar 2025 19:48:17 +0100
Subject: [PATCH 1992/2040] Add echo

---
 code/cgame/cg_servercmds.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index afbd626c..f946fc61 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -493,6 +493,7 @@ static const char *whiteListedCommands[] = {
     "globalwidgetcommand", // used for mods adding custom HUDs
     "ui_addhud",
     "ui_removehud",
+    "echo", // to print stuff client-side
 
     //
     // Sounds
@@ -514,8 +515,8 @@ static const char *whiteListedCommands[] = {
     "-moveup",
     "screenshot",
     "screenshotJPEG",
-    "levelshot"
-    "`stufftext", // Stufftext detection from Reborn, the player gets kicked without it
+    "levelshot",
+    "`stufftext" // Stufftext detection from Reborn, the player gets kicked without it
 };
 
 //

From 73aa377264c1dc2c8c2c2ef88b4845fea5fd7b47 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 17 Mar 2025 00:19:40 +0100
Subject: [PATCH 1993/2040] Fix hit/kill notify being swapped (#698)

---
 code/cgame/cg_parsemsg.cpp | 13 ++++++-------
 code/fgame/bg_public.h     |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 5fab94fe..fe723d77 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1667,8 +1667,8 @@ void CG_ParseCGMessage_ver_15()
             CG_HudDrawFont(iInfo);
             break;
 
-        case CGM_NOTIFY_KILL:
         case CGM_NOTIFY_HIT:
+        case CGM_NOTIFY_KILL:
             if (cg.snap) {
                 const char *soundName;
                 int         iOldEnt;
@@ -1676,12 +1676,11 @@ void CG_ParseCGMessage_ver_15()
                 iOldEnt = current_entity_number;
 
                 current_entity_number = cg.snap->ps.clientNum;
-                if (iType == CGM_NOTIFY_HIT) {
-                    soundName = "dm_kill_notify";
+                if (iType == CGM_NOTIFY_KILL) {
+                    commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 } else {
-                    soundName = "dm_hit_notify";
+                    commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 }
-                commandManager.PlaySound(soundName, NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
 
                 current_entity_number = iOldEnt;
             }
@@ -2058,15 +2057,15 @@ void CG_ParseCGMessage_ver_6()
             CG_HudDrawFont(iInfo);
             break;
 
-        case CGM6_NOTIFY_KILL:
         case CGM6_NOTIFY_HIT:
+        case CGM6_NOTIFY_KILL:
             if (cg.snap) {
                 int iOldEnt;
 
                 iOldEnt = current_entity_number;
 
                 current_entity_number = cg.snap->ps.clientNum;
-                if (iType == CGM6_NOTIFY_HIT) {
+                if (iType == CGM6_NOTIFY_KILL) {
                     commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 } else {
                     commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 30e55a0b..840d1ffd 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -770,8 +770,8 @@ movement on the server game.
         CGM_HUDDRAW_ALPHA,
         CGM_HUDDRAW_STRING,
         CGM_HUDDRAW_FONT,
-        CGM_NOTIFY_KILL,
         CGM_NOTIFY_HIT,
+        CGM_NOTIFY_KILL,
         CGM_VOICE_CHAT,
         CGM_FENCEPOST,
     };
@@ -812,8 +812,8 @@ movement on the server game.
         CGM6_HUDDRAW_ALPHA,
         CGM6_HUDDRAW_STRING,
         CGM6_HUDDRAW_FONT,
-        CGM6_NOTIFY_KILL,
         CGM6_NOTIFY_HIT,
+        CGM6_NOTIFY_KILL,
         CGM6_VOICE_CHAT,
     };
 

From 49fd4acef82c86017109107563386a799f5f2d9e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 17 Mar 2025 11:49:24 +0100
Subject: [PATCH 1994/2040] Wrap WriteCallback around HAS_LIBCURL define

---
 code/sys/sys_update_checker.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
index ba37b34e..849df6be 100644
--- a/code/sys/sys_update_checker.cpp
+++ b/code/sys/sys_update_checker.cpp
@@ -336,6 +336,7 @@ struct WriteCallbackData {
     std::string buffer;
 };
 
+#ifdef HAS_LIBCURL
 size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 {
     WriteCallbackData *callbackData = (WriteCallbackData *)userp;
@@ -349,6 +350,7 @@ size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 
     return responseSize;
 }
+#endif
 
 void UpdateCheckerThread::DoRequest()
 {

From b5e49df1807f8f4d85f95bb4586c18740bdeaf36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Noel?= <sebastien@twolife.be>
Date: Wed, 19 Mar 2025 14:46:12 +0100
Subject: [PATCH 1995/2040] fix build with shared jpeg library (#701)

---
 code/renderercommon/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/renderercommon/CMakeLists.txt b/code/renderercommon/CMakeLists.txt
index 2270b0c4..dfe0ef62 100644
--- a/code/renderercommon/CMakeLists.txt
+++ b/code/renderercommon/CMakeLists.txt
@@ -25,6 +25,7 @@ if(USE_INTERNAL_JPEG)
 	target_link_libraries(omohrenderer_common PRIVATE jpeg8)
 	target_compile_definitions(omohrenderer_common PUBLIC USE_INTERNAL_JPEG)
 else()
+	find_package(JPEG REQUIRED)
 	target_include_directories(omohrenderer_common PUBLIC ${JPEG_INCLUDE_DIRS})
 	target_link_libraries(omohrenderer_common PRIVATE ${JPEG_LIBRARIES})
 endif()

From 921726e0b83540994964b8fc4075f8736d932c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Noel?= <sebastien@twolife.be>
Date: Wed, 19 Mar 2025 15:03:01 +0100
Subject: [PATCH 1996/2040] Fix a few typos (#699)

Co-authored-by: smallmodel <15067410+smallmodel@users.noreply.github.com>
---
 code/fgame/actor.cpp      | 2 +-
 code/fgame/trigger.cpp    | 2 +-
 code/qcommon/listener.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 9f3b9794..5045e93e 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -432,7 +432,7 @@ Event EV_Actor_SetAnimFinal
     EV_DEFAULT,
     NULL,
     NULL,
-    "Whether the animation was succesfully finished",
+    "Whether the animation was successfully finished",
     EV_SETTER
 );
 Event EV_Actor_GetWeaponType
diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index fe442df2..0cc77ade 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -77,7 +77,7 @@ Event EV_Trigger_SetCount
     EV_DEFAULT,
     "i",
     "count",
-    "Set the amount of times this trigger can be triggered",
+    "Set the number of times this trigger can be triggered",
     EV_NORMAL
 );
 Event EV_Trigger_SetMessage
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 427c433d..d3631a6b 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -669,7 +669,7 @@ void EventArgDef::Setup(const char *eventName, const char *argName, const char *
             if (!endptr) {
                 assert(0);
                 EVENT_Printf(
-                    "Argument defintion %s, no matching ']' found for range spec in event %s.\n",
+                    "Argument definition %s, no matching ']' found for range spec in event %s.\n",
                     name.c_str(),
                     eventName
                 );

From fdab158290101569710e8db9134d0306daff2e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Noel?= <sebastien@twolife.be>
Date: Wed, 19 Mar 2025 15:26:26 +0100
Subject: [PATCH 1997/2040] fix build on Debian mips64el (#700)

Co-authored-by: smallmodel <15067410+smallmodel@users.noreply.github.com>
---
 code/gamespy/common/gsPlatform.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/gamespy/common/gsPlatform.h b/code/gamespy/common/gsPlatform.h
index 780abd8f..d7ffb37e 100644
--- a/code/gamespy/common/gsPlatform.h
+++ b/code/gamespy/common/gsPlatform.h
@@ -23,7 +23,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // Set the platform define
-#ifdef __mips64
+#if defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+	#define _UNIX
+#elif __mips64
 	#ifndef _PS2
 		#define _PS2
 	#endif
@@ -34,10 +36,6 @@
 	#endif
 #endif
 
-#if defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-	#define _UNIX
-#endif
-
 #if defined(_XBOX) || defined (_X360)
 #if _XBOX_VER >= 200
 	#define _X360

From 3c155882923cd8fbcf91c926825394ffb82e54b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trung=20L=C3=AA?= <8@tle.id.au>
Date: Sun, 23 Mar 2025 09:25:50 +1100
Subject: [PATCH 1998/2040] Update compiling.md (#704)

PowerPC64 LE run the game perfectly
---
 docs/compiling.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/compiling.md b/docs/compiling.md
index 19f6a704..07c335a4 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -1,6 +1,6 @@
 # Compiling
 
-OpenMoHAA supports any architecture, thanks to the CMake build system and cross-platform code/libraries. While the most common little-Endian architectures (arm, aarch64, x86, x86_64) have been tested and confirmed to work, big-Endian architectures should be supported as well; however, they remain untested.
+OpenMoHAA supports any architecture, thanks to the CMake build system and cross-platform code/libraries. While the most common little-Endian architectures (arm, aarch64, x86, x86_64, ppc64le) have been tested and confirmed to work, big-Endian architectures should be supported as well; however, they remain untested.
 
 The following tools are required for all platforms:
 - CMake >= 3.12
@@ -67,4 +67,4 @@ afterwards you can can append `-DCURL_ROOT=path\to\curl\install` to specify the
 - `-DCMAKE_LIB_SUFFIX=suffix` Default suffix to use for the default `lib` directory. For example `-DCMAKE_LIB_SUFFIX=64`
 - `-DNO_MODERN_DMA=1` Use the basic DMA sound system from quake3. This lacks many features such as soundtracks and movie audio from the modern OpenAL-based DMA sound system. This option is not recommended, unless openal is not available.
 - `-DTARGET_LOCAL_SYSTEM=1` for compiling and installing on the local system. This will remove the architecture suffix at the end of each binary. This option can be useful for packaging builds.
-- `-DUSE_SYSTEM_LIBS=1` for third-party libraries, this will make use of system libraries instead of libraries that are embedded within the project.
\ No newline at end of file
+- `-DUSE_SYSTEM_LIBS=1` for third-party libraries, this will make use of system libraries instead of libraries that are embedded within the project.

From 50e3aa1f616af45565c6f31ff6f8fa87728eff65 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 22 Mar 2025 23:45:41 +0100
Subject: [PATCH 1999/2040] Fix compilation errors with AL local headers (#705)

* Remove alext inclusion as it's included by qal.h already

* Update local AL headers
---
 code/AL/al.h                   | 555 +++++++++++---------
 code/AL/alc.h                  | 230 ++++++---
 code/AL/alext.h                | 897 ++++++++++++++++++++++++++++++---
 code/AL/efx-presets.h          |   4 +-
 code/AL/efx.h                  | 135 ++---
 code/client/snd_openal_new.cpp |  12 +-
 6 files changed, 1348 insertions(+), 485 deletions(-)

diff --git a/code/AL/al.h b/code/AL/al.h
index 413b3833..a4e3ad51 100644
--- a/code/AL/al.h
+++ b/code/AL/al.h
@@ -1,8 +1,40 @@
 #ifndef AL_AL_H
 #define AL_AL_H
 
-#if defined(__cplusplus)
+/* NOLINTBEGIN */
+#ifdef __cplusplus
 extern "C" {
+
+#ifdef _MSVC_LANG
+#define AL_CPLUSPLUS _MSVC_LANG
+#else
+#define AL_CPLUSPLUS __cplusplus
+#endif
+
+#ifndef AL_DISABLE_NOEXCEPT
+#if AL_CPLUSPLUS >= 201103L
+#define AL_API_NOEXCEPT noexcept
+#else
+#define AL_API_NOEXCEPT
+#endif
+#if AL_CPLUSPLUS >= 201703L
+#define AL_API_NOEXCEPT17 noexcept
+#else
+#define AL_API_NOEXCEPT17
+#endif
+
+#else /* AL_DISABLE_NOEXCEPT */
+
+#define AL_API_NOEXCEPT
+#define AL_API_NOEXCEPT17
+#endif
+
+#undef AL_CPLUSPLUS
+
+#else /* __cplusplus */
+
+#define AL_API_NOEXCEPT
+#define AL_API_NOEXCEPT17
 #endif
 
 #ifndef AL_API
@@ -15,14 +47,14 @@ extern "C" {
  #endif
 #endif
 
-#if defined(_WIN32)
+#ifdef _WIN32
  #define AL_APIENTRY __cdecl
 #else
  #define AL_APIENTRY
 #endif
 
 
-/** Deprecated macro. */
+/* Deprecated macros. */
 #define OPENAL
 #define ALAPI                                    AL_API
 #define ALAPIENTRY                               AL_APIENTRY
@@ -30,7 +62,7 @@ extern "C" {
 #define AL_ILLEGAL_ENUM                          AL_INVALID_ENUM
 #define AL_ILLEGAL_COMMAND                       AL_INVALID_OPERATION
 
-/** Supported AL version. */
+/* Supported AL versions. */
 #define AL_VERSION_1_0
 #define AL_VERSION_1_1
 
@@ -40,43 +72,43 @@ typedef char ALboolean;
 /** character */
 typedef char ALchar;
 
-/** signed 8-bit 2's complement integer */
+/** signed 8-bit integer */
 typedef signed char ALbyte;
 
 /** unsigned 8-bit integer */
 typedef unsigned char ALubyte;
 
-/** signed 16-bit 2's complement integer */
+/** signed 16-bit integer */
 typedef short ALshort;
 
 /** unsigned 16-bit integer */
 typedef unsigned short ALushort;
 
-/** signed 32-bit 2's complement integer */
+/** signed 32-bit integer */
 typedef int ALint;
 
 /** unsigned 32-bit integer */
 typedef unsigned int ALuint;
 
-/** non-negative 32-bit binary integer size */
+/** non-negative 32-bit integer size */
 typedef int ALsizei;
 
-/** enumerated 32-bit value */
+/** 32-bit enumeration value */
 typedef int ALenum;
 
-/** 32-bit IEEE754 floating-point */
+/** 32-bit IEEE-754 floating-point */
 typedef float ALfloat;
 
-/** 64-bit IEEE754 floating-point */
+/** 64-bit IEEE-754 floating-point */
 typedef double ALdouble;
 
-/** void type (for opaque pointers only) */
+/** void type (opaque pointers only) */
 typedef void ALvoid;
 
 
-/* Enumerant values begin at column 50. No tabs. */
+/* Enumeration values begin at column 50. Do not use tabs. */
 
-/** "no distance model" or "no buffer" */
+/** No distance model or no buffer */
 #define AL_NONE                                  0
 
 /** Boolean False. */
@@ -89,10 +121,10 @@ typedef void ALvoid;
 /**
  * Relative source.
  * Type:    ALboolean
- * Range:   [AL_TRUE, AL_FALSE]
+ * Range:   [AL_FALSE, AL_TRUE]
  * Default: AL_FALSE
  *
- * Specifies if the Source has relative coordinates.
+ * Specifies if the source uses relative coordinates.
  */
 #define AL_SOURCE_RELATIVE                       0x202
 
@@ -103,7 +135,8 @@ typedef void ALvoid;
  * Range:   [0 - 360]
  * Default: 360
  *
- * The angle covered by the inner cone, where the source will not attenuate.
+ * The angle covered by the inner cone, the area within which the source will
+ * not be attenuated by direction.
  */
 #define AL_CONE_INNER_ANGLE                      0x1001
 
@@ -112,8 +145,8 @@ typedef void ALvoid;
  * Range:   [0 - 360]
  * Default: 360
  *
- * The angle covered by the outer cone, where the source will be fully
- * attenuated.
+ * The angle covered by the outer cone, the area outside of which the source
+ * will be fully attenuated by direction.
  */
 #define AL_CONE_OUTER_ANGLE                      0x1002
 
@@ -123,7 +156,7 @@ typedef void ALvoid;
  * Range:   [0.5 - 2.0]
  * Default: 1.0
  *
- * A multiplier for the frequency (sample rate) of the source's buffer.
+ * A multiplier for the sample rate of the source's buffer.
  */
 #define AL_PITCH                                 0x1003
 
@@ -134,12 +167,12 @@ typedef void ALvoid;
  *
  * The source or listener location in three dimensional space.
  *
- * OpenAL, like OpenGL, uses a right handed coordinate system, where in a
- * frontal default view X (thumb) points right, Y points up (index finger), and
- * Z points towards the viewer/camera (middle finger).
+ * OpenAL uses a right handed coordinate system, like OpenGL, where with a
+ * default view, X points right (thumb), Y points up (index finger), and Z
+ * points towards the viewer/camera (middle finger).
  *
- * To switch from a left handed coordinate system, flip the sign on the Z
- * coordinate.
+ * To change from or to a left handed coordinate system, negate the Z
+ * component.
  */
 #define AL_POSITION                              0x1004
 
@@ -148,8 +181,11 @@ typedef void ALvoid;
  * Type:    ALfloat[3], ALint[3]
  * Default: {0, 0, 0}
  *
- * Specifies the current direction in local space.
- * A zero-length vector specifies an omni-directional source (cone is ignored).
+ * Specifies the current direction in local space. A zero-length vector
+ * specifies an omni-directional source (cone is ignored).
+ *
+ * To change from or to a left handed coordinate system, negate the Z
+ * component.
  */
 #define AL_DIRECTION                             0x1005
 
@@ -158,26 +194,30 @@ typedef void ALvoid;
  * Type:    ALfloat[3], ALint[3]
  * Default: {0, 0, 0}
  *
- * Specifies the current velocity in local space.
+ * Specifies the current velocity, relative to the position.
+ *
+ * To change from or to a left handed coordinate system, negate the Z
+ * component.
  */
 #define AL_VELOCITY                              0x1006
 
 /**
  * Source looping.
  * Type:    ALboolean
- * Range:   [AL_TRUE, AL_FALSE]
+ * Range:   [AL_FALSE, AL_TRUE]
  * Default: AL_FALSE
  *
- * Specifies whether source is looping.
+ * Specifies whether source playback loops.
  */
 #define AL_LOOPING                               0x1007
 
 /**
  * Source buffer.
- * Type:  ALuint
- * Range: any valid Buffer.
+ * Type:    ALuint
+ * Range:   any valid Buffer ID
+ * Default: AL_NONE
  *
- * Specifies the buffer to provide sound samples.
+ * Specifies the buffer to provide sound samples for a source.
  */
 #define AL_BUFFER                                0x1009
 
@@ -186,12 +226,12 @@ typedef void ALvoid;
  * Type:  ALfloat
  * Range: [0.0 - ]
  *
- * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation
- * of about -6dB. Each multiplicaton by 2 equals an amplification of about
- * +6dB.
+ * For sources, an initial linear gain value (before attenuation is applied).
+ * For the listener, an output linear gain adjustment.
  *
- * A value of 0.0 is meaningless with respect to a logarithmic scale; it is
- * silent.
+ * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation
+ * of about -6dB. Each multiplication by 2 equals an amplification of about
+ * +6dB.
  */
 #define AL_GAIN                                  0x100A
 
@@ -200,8 +240,8 @@ typedef void ALvoid;
  * Type:  ALfloat
  * Range: [0.0 - 1.0]
  *
- * The minimum gain allowed for a source, after distance and cone attenation is
- * applied (if applicable).
+ * The minimum gain allowed for a source, after distance and cone attenuation
+ * are applied (if applicable).
  */
 #define AL_MIN_GAIN                              0x100D
 
@@ -210,31 +250,33 @@ typedef void ALvoid;
  * Type:  ALfloat
  * Range: [0.0 - 1.0]
  *
- * The maximum gain allowed for a source, after distance and cone attenation is
- * applied (if applicable).
+ * The maximum gain allowed for a source, after distance and cone attenuation
+ * are applied (if applicable).
  */
 #define AL_MAX_GAIN                              0x100E
 
 /**
  * Listener orientation.
- * Type: ALfloat[6]
+ * Type:    ALfloat[6]
  * Default: {0.0, 0.0, -1.0, 0.0, 1.0, 0.0}
  *
  * Effectively two three dimensional vectors. The first vector is the front (or
- * "at") and the second is the top (or "up").
+ * "at") and the second is the top (or "up"). Both vectors are relative to the
+ * listener position.
  *
- * Both vectors are in local space.
+ * To change from or to a left handed coordinate system, negate the Z
+ * component of both vectors.
  */
 #define AL_ORIENTATION                           0x100F
 
 /**
  * Source state (query only).
- * Type:  ALint
+ * Type:  ALenum
  * Range: [AL_INITIAL, AL_PLAYING, AL_PAUSED, AL_STOPPED]
  */
 #define AL_SOURCE_STATE                          0x1010
 
-/** Source state value. */
+/* Source state values. */
 #define AL_INITIAL                               0x1011
 #define AL_PLAYING                               0x1012
 #define AL_PAUSED                                0x1013
@@ -267,9 +309,9 @@ typedef void ALvoid;
  * Range:   [0.0 - ]
  * Default: 1.0
  *
- * The distance in units that no attenuation occurs.
+ * The distance in units that no distance attenuation occurs.
  *
- * At 0.0, no distance attenuation ever occurs on non-linear attenuation models.
+ * At 0.0, no distance attenuation occurs with non-linear attenuation models.
  */
 #define AL_REFERENCE_DISTANCE                    0x1020
 
@@ -292,7 +334,7 @@ typedef void ALvoid;
  * Default: 0.0
  *
  * The gain attenuation applied when the listener is outside of the source's
- * outer cone.
+ * outer cone angle.
  */
 #define AL_CONE_OUTER_GAIN                       0x1022
 
@@ -300,7 +342,7 @@ typedef void ALvoid;
  * Source maximum distance.
  * Type:    ALfloat
  * Range:   [0.0 - ]
- * Default: +inf
+ * Default: FLT_MAX
  *
  * The distance above which the source is not attenuated any further with a
  * clamped distance model, or where attenuation reaches 0.0 gain for linear
@@ -308,16 +350,16 @@ typedef void ALvoid;
  */
 #define AL_MAX_DISTANCE                          0x1023
 
-/** Source buffer position, in seconds */
+/** Source buffer offset, in seconds */
 #define AL_SEC_OFFSET                            0x1024
-/** Source buffer position, in sample frames */
+/** Source buffer offset, in sample frames */
 #define AL_SAMPLE_OFFSET                         0x1025
-/** Source buffer position, in bytes */
+/** Source buffer offset, in bytes */
 #define AL_BYTE_OFFSET                           0x1026
 
 /**
  * Source type (query only).
- * Type:  ALint
+ * Type:  ALenum
  * Range: [AL_STATIC, AL_STREAMING, AL_UNDETERMINED]
  *
  * A Source is Static if a Buffer has been attached using AL_BUFFER.
@@ -330,31 +372,30 @@ typedef void ALvoid;
  */
 #define AL_SOURCE_TYPE                           0x1027
 
-/** Source type value. */
+/* Source type values. */
 #define AL_STATIC                                0x1028
 #define AL_STREAMING                             0x1029
 #define AL_UNDETERMINED                          0x1030
 
-/** Buffer format specifier. */
+/** Unsigned 8-bit mono buffer format. */
 #define AL_FORMAT_MONO8                          0x1100
+/** Signed 16-bit mono buffer format. */
 #define AL_FORMAT_MONO16                         0x1101
+/** Unsigned 8-bit stereo buffer format. */
 #define AL_FORMAT_STEREO8                        0x1102
+/** Signed 16-bit stereo buffer format. */
 #define AL_FORMAT_STEREO16                       0x1103
 
-/** Buffer frequency (query only). */
+/** Buffer frequency/sample rate (query only). */
 #define AL_FREQUENCY                             0x2001
 /** Buffer bits per sample (query only). */
 #define AL_BITS                                  0x2002
 /** Buffer channel count (query only). */
 #define AL_CHANNELS                              0x2003
-/** Buffer data size (query only). */
+/** Buffer data size in bytes (query only). */
 #define AL_SIZE                                  0x2004
 
-/**
- * Buffer state.
- *
- * Not for public use.
- */
+/* Buffer state. Not for public use. */
 #define AL_UNUSED                                0x2010
 #define AL_PENDING                               0x2011
 #define AL_PROCESSED                             0x2012
@@ -363,32 +404,31 @@ typedef void ALvoid;
 /** No error. */
 #define AL_NO_ERROR                              0
 
-/** Invalid name paramater passed to AL call. */
+/** Invalid name (ID) passed to an AL call. */
 #define AL_INVALID_NAME                          0xA001
 
-/** Invalid enum parameter passed to AL call. */
+/** Invalid enumeration passed to AL call. */
 #define AL_INVALID_ENUM                          0xA002
 
-/** Invalid value parameter passed to AL call. */
+/** Invalid value passed to AL call. */
 #define AL_INVALID_VALUE                         0xA003
 
 /** Illegal AL call. */
 #define AL_INVALID_OPERATION                     0xA004
 
-/** Not enough memory. */
+/** Not enough memory to execute the AL call. */
 #define AL_OUT_OF_MEMORY                         0xA005
 
 
-/** Context string: Vendor ID. */
+/** Context string: Vendor name. */
 #define AL_VENDOR                                0xB001
 /** Context string: Version. */
 #define AL_VERSION                               0xB002
-/** Context string: Renderer ID. */
+/** Context string: Renderer name. */
 #define AL_RENDERER                              0xB003
 /** Context string: Space-separated extension list. */
 #define AL_EXTENSIONS                            0xB004
 
-
 /**
  * Doppler scale.
  * Type:    ALfloat
@@ -398,7 +438,6 @@ typedef void ALvoid;
  * Scale for source and listener velocities.
  */
 #define AL_DOPPLER_FACTOR                        0xC000
-AL_API void AL_APIENTRY alDopplerFactor(ALfloat value);
 
 /**
  * Doppler velocity (deprecated).
@@ -406,7 +445,6 @@ AL_API void AL_APIENTRY alDopplerFactor(ALfloat value);
  * A multiplier applied to the Speed of Sound.
  */
 #define AL_DOPPLER_VELOCITY                      0xC001
-AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value);
 
 /**
  * Speed of Sound, in units per second.
@@ -415,14 +453,13 @@ AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value);
  * Default: 343.3
  *
  * The speed at which sound waves are assumed to travel, when calculating the
- * doppler effect.
+ * doppler effect from source and listener velocities.
  */
 #define AL_SPEED_OF_SOUND                        0xC003
-AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value);
 
 /**
  * Distance attenuation model.
- * Type:    ALint
+ * Type:    ALenum
  * Range:   [AL_NONE, AL_INVERSE_DISTANCE, AL_INVERSE_DISTANCE_CLAMPED,
  *           AL_LINEAR_DISTANCE, AL_LINEAR_DISTANCE_CLAMPED,
  *           AL_EXPONENT_DISTANCE, AL_EXPONENT_DISTANCE_CLAMPED]
@@ -439,9 +476,8 @@ AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value);
  * distance calculated is clamped between the reference and max distances.
  */
 #define AL_DISTANCE_MODEL                        0xD000
-AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel);
 
-/** Distance model value. */
+/* Distance model values. */
 #define AL_INVERSE_DISTANCE                      0xD001
 #define AL_INVERSE_DISTANCE_CLAMPED              0xD002
 #define AL_LINEAR_DISTANCE                       0xD003
@@ -449,208 +485,223 @@ AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel);
 #define AL_EXPONENT_DISTANCE                     0xD005
 #define AL_EXPONENT_DISTANCE_CLAMPED             0xD006
 
-/** Renderer State management. */
-AL_API void AL_APIENTRY alEnable(ALenum capability);
-AL_API void AL_APIENTRY alDisable(ALenum capability);
-AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability);
+#ifndef AL_NO_PROTOTYPES
+/* Renderer State management. */
+AL_API void AL_APIENTRY alEnable(ALenum capability) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDisable(ALenum capability) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability) AL_API_NOEXCEPT;
 
-/** State retrieval. */
-AL_API const ALchar* AL_APIENTRY alGetString(ALenum param);
-AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values);
-AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values);
-AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values);
-AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param);
-AL_API ALint AL_APIENTRY alGetInteger(ALenum param);
-AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param);
-AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param);
+/* Context state setting. */
+AL_API void AL_APIENTRY alDopplerFactor(ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel) AL_API_NOEXCEPT;
+
+/* Context state retrieval. */
+AL_API const ALchar* AL_APIENTRY alGetString(ALenum param) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param) AL_API_NOEXCEPT;
+AL_API ALint AL_APIENTRY alGetInteger(ALenum param) AL_API_NOEXCEPT;
+AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param) AL_API_NOEXCEPT;
+AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param) AL_API_NOEXCEPT;
 
 /**
- * Error retrieval.
- *
- * Obtain the first error generated in the AL context since the last check.
+ * Obtain the first error generated in the AL context since the last call to
+ * this function.
  */
-AL_API ALenum AL_APIENTRY alGetError(void);
+AL_API ALenum AL_APIENTRY alGetError(void) AL_API_NOEXCEPT;
 
+/** Query for the presence of an extension on the AL context. */
+AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname) AL_API_NOEXCEPT;
 /**
- * Extension support.
- *
- * Query for the presence of an extension, and obtain any appropriate function
- * pointers and enum values.
+ * Retrieve the address of a function. The returned function may be context-
+ * specific.
  */
-AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname);
-AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname);
-AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename);
+AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname) AL_API_NOEXCEPT;
+/**
+ * Retrieve the value of an enum. The returned value may be context-specific.
+ */
+AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename) AL_API_NOEXCEPT;
 
 
-/** Set Listener parameters */
-AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value);
-AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values);
-AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value);
-AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3);
-AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values);
+/* Set listener parameters. */
+AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values) AL_API_NOEXCEPT;
 
-/** Get Listener parameters */
-AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value);
-AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value);
-AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3);
-AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values);
+/* Get listener parameters. */
+AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values) AL_API_NOEXCEPT;
 
 
-/** Create Source objects. */
-AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources);
-/** Delete Source objects. */
-AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources);
-/** Verify a handle is a valid Source. */
-AL_API ALboolean AL_APIENTRY alIsSource(ALuint source);
+/** Create source objects. */
+AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources) AL_API_NOEXCEPT;
+/** Delete source objects. */
+AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Verify an ID is for a valid source. */
+AL_API ALboolean AL_APIENTRY alIsSource(ALuint source) AL_API_NOEXCEPT;
 
-/** Set Source parameters. */
-AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value);
-AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values);
-AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value);
-AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
-AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values);
+/* Set source parameters. */
+AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT;
 
-/** Get Source parameters. */
-AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value);
-AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetSourcei(ALuint source,  ALenum param, ALint *value);
-AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-AL_API void AL_APIENTRY alGetSourceiv(ALuint source,  ALenum param, ALint *values);
+/* Get source parameters. */
+AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcei(ALuint source,  ALenum param, ALint *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourceiv(ALuint source,  ALenum param, ALint *values) AL_API_NOEXCEPT;
 
 
-/** Play, replay, or resume (if paused) a list of Sources */
-AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources);
-/** Stop a list of Sources */
-AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources);
-/** Rewind a list of Sources */
-AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources);
-/** Pause a list of Sources */
-AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources);
+/** Play, restart, or resume a source, setting its state to AL_PLAYING. */
+AL_API void AL_APIENTRY alSourcePlay(ALuint source) AL_API_NOEXCEPT;
+/** Stop a source, setting its state to AL_STOPPED if playing or paused. */
+AL_API void AL_APIENTRY alSourceStop(ALuint source) AL_API_NOEXCEPT;
+/** Rewind a source, setting its state to AL_INITIAL. */
+AL_API void AL_APIENTRY alSourceRewind(ALuint source) AL_API_NOEXCEPT;
+/** Pause a source, setting its state to AL_PAUSED if playing. */
+AL_API void AL_APIENTRY alSourcePause(ALuint source) AL_API_NOEXCEPT;
 
-/** Play, replay, or resume a Source */
-AL_API void AL_APIENTRY alSourcePlay(ALuint source);
-/** Stop a Source */
-AL_API void AL_APIENTRY alSourceStop(ALuint source);
-/** Rewind a Source (set playback postiton to beginning) */
-AL_API void AL_APIENTRY alSourceRewind(ALuint source);
-/** Pause a Source */
-AL_API void AL_APIENTRY alSourcePause(ALuint source);
+/** Play, restart, or resume a list of sources atomically. */
+AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Stop a list of sources atomically. */
+AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Rewind a list of sources atomically. */
+AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Pause a list of sources atomically. */
+AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
 
 /** Queue buffers onto a source */
-AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers);
+AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT;
 /** Unqueue processed buffers from a source */
-AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers);
+AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT;
 
 
-/** Create Buffer objects */
-AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers);
-/** Delete Buffer objects */
-AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers);
-/** Verify a handle is a valid Buffer */
-AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer);
+/** Create buffer objects */
+AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers) AL_API_NOEXCEPT;
+/** Delete buffer objects */
+AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT;
+/** Verify an ID is a valid buffer (including the NULL buffer) */
+AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer) AL_API_NOEXCEPT;
 
-/** Specifies the data to be copied into a buffer */
-AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq);
+/**
+ * Copies data into the buffer, interpreting it using the specified format and
+ * samplerate.
+ */
+AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT;
 
-/** Set Buffer parameters, */
-AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value);
-AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values);
-AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value);
-AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3);
-AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values);
+/* Set buffer parameters. */
+AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT;
 
-/** Get Buffer parameters. */
-AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value);
-AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value);
-AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values);
+/* Get buffer parameters. */
+AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT;
+#endif /* AL_NO_PROTOTYPES */
 
-/** Pointer-to-function type, useful for dynamically getting AL entry points. */
-typedef void          (AL_APIENTRY *LPALENABLE)(ALenum capability);
-typedef void          (AL_APIENTRY *LPALDISABLE)(ALenum capability);
-typedef ALboolean     (AL_APIENTRY *LPALISENABLED)(ALenum capability);
-typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param);
-typedef void          (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values);
-typedef void          (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values);
-typedef ALboolean     (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param);
-typedef ALint         (AL_APIENTRY *LPALGETINTEGER)(ALenum param);
-typedef ALfloat       (AL_APIENTRY *LPALGETFLOAT)(ALenum param);
-typedef ALdouble      (AL_APIENTRY *LPALGETDOUBLE)(ALenum param);
-typedef ALenum        (AL_APIENTRY *LPALGETERROR)(void);
-typedef ALboolean     (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname);
-typedef void*         (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname);
-typedef ALenum        (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename);
-typedef void          (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value);
-typedef void          (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-typedef void          (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values);
-typedef void          (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value);
-typedef void          (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3);
-typedef void          (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values);
-typedef void          (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value);
-typedef void          (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-typedef void          (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value);
-typedef void          (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3);
-typedef void          (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources);
-typedef void          (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources);
-typedef ALboolean     (AL_APIENTRY *LPALISSOURCE)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value);
-typedef void          (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-typedef void          (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values);
-typedef void          (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value);
-typedef void          (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
-typedef void          (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values);
-typedef void          (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value);
-typedef void          (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-typedef void          (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value);
-typedef void          (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-typedef void          (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCESTOP)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers);
-typedef void          (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers);
-typedef void          (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers);
-typedef void          (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers);
-typedef ALboolean     (AL_APIENTRY *LPALISBUFFER)(ALuint buffer);
-typedef void          (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq);
-typedef void          (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value);
-typedef void          (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-typedef void          (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values);
-typedef void          (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value);
-typedef void          (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3);
-typedef void          (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values);
-typedef void          (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value);
-typedef void          (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-typedef void          (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value);
-typedef void          (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-typedef void          (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value);
-typedef void          (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value);
-typedef void          (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value);
-typedef void          (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel);
+/* Pointer-to-function types, useful for storing dynamically loaded AL entry
+ * points.
+ */
+typedef void          (AL_APIENTRY *LPALENABLE)(ALenum capability) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDISABLE)(ALenum capability) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISENABLED)(ALenum capability) AL_API_NOEXCEPT17;
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALint         (AL_APIENTRY *LPALGETINTEGER)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALfloat       (AL_APIENTRY *LPALGETFLOAT)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALdouble      (AL_APIENTRY *LPALGETDOUBLE)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALenum        (AL_APIENTRY *LPALGETERROR)(void) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname) AL_API_NOEXCEPT17;
+typedef void*         (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname) AL_API_NOEXCEPT17;
+typedef ALenum        (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISSOURCE)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCESTOP)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISBUFFER)(ALuint buffer) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel) AL_API_NOEXCEPT17;
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 }  /* extern "C" */
 #endif
+/* NOLINTEND */
 
 #endif /* AL_AL_H */
diff --git a/code/AL/alc.h b/code/AL/alc.h
index 294e8b33..d048ca04 100644
--- a/code/AL/alc.h
+++ b/code/AL/alc.h
@@ -1,8 +1,40 @@
 #ifndef AL_ALC_H
 #define AL_ALC_H
 
-#if defined(__cplusplus)
+/* NOLINTBEGIN */
+#ifdef __cplusplus
 extern "C" {
+
+#ifdef _MSVC_LANG
+#define ALC_CPLUSPLUS _MSVC_LANG
+#else
+#define ALC_CPLUSPLUS __cplusplus
+#endif
+
+#ifndef AL_DISABLE_NOEXCEPT
+#if ALC_CPLUSPLUS >= 201103L
+#define ALC_API_NOEXCEPT noexcept
+#else
+#define ALC_API_NOEXCEPT
+#endif
+#if ALC_CPLUSPLUS >= 201703L
+#define ALC_API_NOEXCEPT17 noexcept
+#else
+#define ALC_API_NOEXCEPT17
+#endif
+
+#else /* AL_DISABLE_NOEXCEPT */
+
+#define ALC_API_NOEXCEPT
+#define ALC_API_NOEXCEPT17
+#endif
+
+#undef ALC_CPLUSPLUS
+
+#else /* __cplusplus */
+
+#define ALC_API_NOEXCEPT
+#define ALC_API_NOEXCEPT17
 #endif
 
 #ifndef ALC_API
@@ -15,14 +47,14 @@ extern "C" {
  #endif
 #endif
 
-#if defined(_WIN32)
+#ifdef _WIN32
  #define ALC_APIENTRY __cdecl
 #else
  #define ALC_APIENTRY
 #endif
 
 
-/** Deprecated macro. */
+/* Deprecated macros. */
 #define ALCAPI                                   ALC_API
 #define ALCAPIENTRY                              ALC_APIENTRY
 #define ALC_INVALID                              0
@@ -31,9 +63,9 @@ extern "C" {
 #define ALC_VERSION_0_1                          1
 
 /** Opaque device handle */
-typedef struct ALCdevice_struct ALCdevice;
+typedef struct ALCdevice ALCdevice;
 /** Opaque context handle */
-typedef struct ALCcontext_struct ALCcontext;
+typedef struct ALCcontext ALCcontext;
 
 /** 8-bit boolean */
 typedef char ALCboolean;
@@ -41,41 +73,41 @@ typedef char ALCboolean;
 /** character */
 typedef char ALCchar;
 
-/** signed 8-bit 2's complement integer */
+/** signed 8-bit integer */
 typedef signed char ALCbyte;
 
 /** unsigned 8-bit integer */
 typedef unsigned char ALCubyte;
 
-/** signed 16-bit 2's complement integer */
+/** signed 16-bit integer */
 typedef short ALCshort;
 
 /** unsigned 16-bit integer */
 typedef unsigned short ALCushort;
 
-/** signed 32-bit 2's complement integer */
+/** signed 32-bit integer */
 typedef int ALCint;
 
 /** unsigned 32-bit integer */
 typedef unsigned int ALCuint;
 
-/** non-negative 32-bit binary integer size */
+/** non-negative 32-bit integer size */
 typedef int ALCsizei;
 
-/** enumerated 32-bit value */
+/** 32-bit enumeration value */
 typedef int ALCenum;
 
-/** 32-bit IEEE754 floating-point */
+/** 32-bit IEEE-754 floating-point */
 typedef float ALCfloat;
 
-/** 64-bit IEEE754 floating-point */
+/** 64-bit IEEE-754 floating-point */
 typedef double ALCdouble;
 
 /** void type (for opaque pointers only) */
 typedef void ALCvoid;
 
 
-/* Enumerant values begin at column 50. No tabs. */
+/* Enumeration values begin at column 50. Do not use tabs. */
 
 /** Boolean False. */
 #define ALC_FALSE                                0
@@ -89,7 +121,7 @@ typedef void ALCvoid;
 /** Context attribute: <int> Hz. */
 #define ALC_REFRESH                              0x1008
 
-/** Context attribute: AL_TRUE or AL_FALSE. */
+/** Context attribute: AL_TRUE or AL_FALSE synchronous context? */
 #define ALC_SYNC                                 0x1009
 
 /** Context attribute: <int> requested Mono (3D) Sources. */
@@ -107,30 +139,32 @@ typedef void ALCvoid;
 /** Invalid context handle. */
 #define ALC_INVALID_CONTEXT                      0xA002
 
-/** Invalid enum parameter passed to an ALC call. */
+/** Invalid enumeration passed to an ALC call. */
 #define ALC_INVALID_ENUM                         0xA003
 
-/** Invalid value parameter passed to an ALC call. */
+/** Invalid value passed to an ALC call. */
 #define ALC_INVALID_VALUE                        0xA004
 
 /** Out of memory. */
 #define ALC_OUT_OF_MEMORY                        0xA005
 
 
-/** Runtime ALC version. */
+/** Runtime ALC major version. */
 #define ALC_MAJOR_VERSION                        0x1000
+/** Runtime ALC minor version. */
 #define ALC_MINOR_VERSION                        0x1001
 
-/** Context attribute list properties. */
+/** Context attribute list size. */
 #define ALC_ATTRIBUTES_SIZE                      0x1002
+/** Context attribute list properties. */
 #define ALC_ALL_ATTRIBUTES                       0x1003
 
 /** String for the default device specifier. */
 #define ALC_DEFAULT_DEVICE_SPECIFIER             0x1004
 /**
- * String for the given device's specifier.
+ * Device specifier string.
  *
- * If device handle is NULL, it is instead a null-char separated list of
+ * If device handle is NULL, it is instead a null-character separated list of
  * strings of known device specifiers (list ends with an empty string).
  */
 #define ALC_DEVICE_SPECIFIER                     0x1005
@@ -141,9 +175,9 @@ typedef void ALCvoid;
 /** Capture extension */
 #define ALC_EXT_CAPTURE 1
 /**
- * String for the given capture device's specifier.
+ * Capture device specifier string.
  *
- * If device handle is NULL, it is instead a null-char separated list of
+ * If device handle is NULL, it is instead a null-character separated list of
  * strings of known capture device specifiers (list ends with an empty string).
  */
 #define ALC_CAPTURE_DEVICE_SPECIFIER             0x310
@@ -158,80 +192,116 @@ typedef void ALCvoid;
 /** String for the default extended device specifier. */
 #define ALC_DEFAULT_ALL_DEVICES_SPECIFIER        0x1012
 /**
- * String for the given extended device's specifier.
+ * Device's extended specifier string.
  *
- * If device handle is NULL, it is instead a null-char separated list of
+ * If device handle is NULL, it is instead a null-character separated list of
  * strings of known extended device specifiers (list ends with an empty string).
  */
 #define ALC_ALL_DEVICES_SPECIFIER                0x1013
 
 
-/** Context management. */
-ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint* attrlist);
-ALC_API ALCboolean  ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context);
-ALC_API void        ALC_APIENTRY alcProcessContext(ALCcontext *context);
-ALC_API void        ALC_APIENTRY alcSuspendContext(ALCcontext *context);
-ALC_API void        ALC_APIENTRY alcDestroyContext(ALCcontext *context);
-ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void);
-ALC_API ALCdevice*  ALC_APIENTRY alcGetContextsDevice(ALCcontext *context);
+#ifndef ALC_NO_PROTOTYPES
+/* Context management. */
 
-/** Device management. */
-ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename);
-ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device);
+/** Create and attach a context to the given device. */
+ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint *attrlist) ALC_API_NOEXCEPT;
+/**
+ * Makes the given context the active process-wide context. Passing NULL clears
+ * the active context.
+ */
+ALC_API ALCboolean  ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Resumes processing updates for the given context. */
+ALC_API void        ALC_APIENTRY alcProcessContext(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Suspends updates for the given context. */
+ALC_API void        ALC_APIENTRY alcSuspendContext(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Remove a context from its device and destroys it. */
+ALC_API void        ALC_APIENTRY alcDestroyContext(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Returns the currently active context. */
+ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void) ALC_API_NOEXCEPT;
+/** Returns the device that a particular context is attached to. */
+ALC_API ALCdevice*  ALC_APIENTRY alcGetContextsDevice(ALCcontext *context) ALC_API_NOEXCEPT;
 
+/* Device management. */
+
+/** Opens the named playback device. */
+ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename) ALC_API_NOEXCEPT;
+/** Closes the given playback device. */
+ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device) ALC_API_NOEXCEPT;
+
+/* Error support. */
+
+/** Obtain the most recent Device error. */
+ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device) ALC_API_NOEXCEPT;
+
+/* Extension support. */
 
 /**
- * Error support.
- *
- * Obtain the most recent Device error.
+ * Query for the presence of an extension on the device. Pass a NULL device to
+ * query a device-inspecific extension.
  */
-ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device);
+ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname) ALC_API_NOEXCEPT;
+/**
+ * Retrieve the address of a function. Given a non-NULL device, the returned
+ * function may be device-specific.
+ */
+ALC_API ALCvoid*   ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) ALC_API_NOEXCEPT;
+/**
+ * Retrieve the value of an enum. Given a non-NULL device, the returned value
+ * may be device-specific.
+ */
+ALC_API ALCenum    ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname) ALC_API_NOEXCEPT;
+
+/* Query functions. */
+
+/** Returns information about the device, and error strings. */
+ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param) ALC_API_NOEXCEPT;
+/** Returns information about the device and the version of OpenAL. */
+ALC_API void           ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values) ALC_API_NOEXCEPT;
+
+/* Capture functions. */
 
 /**
- * Extension support.
- *
- * Query for the presence of an extension, and obtain any appropriate
- * function pointers and enum values.
+ * Opens the named capture device with the given frequency, format, and buffer
+ * size.
  */
-ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname);
-ALC_API void*      ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname);
-ALC_API ALCenum    ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname);
+ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize) ALC_API_NOEXCEPT;
+/** Closes the given capture device. */
+ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device) ALC_API_NOEXCEPT;
+/** Starts capturing samples into the device buffer. */
+ALC_API void       ALC_APIENTRY alcCaptureStart(ALCdevice *device) ALC_API_NOEXCEPT;
+/** Stops capturing samples. Samples in the device buffer remain available. */
+ALC_API void       ALC_APIENTRY alcCaptureStop(ALCdevice *device) ALC_API_NOEXCEPT;
+/** Reads samples from the device buffer. */
+ALC_API void       ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) ALC_API_NOEXCEPT;
+#endif /* ALC_NO_PROTOTYPES */
 
-/** Query function. */
-ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param);
-ALC_API void           ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values);
+/* Pointer-to-function types, useful for storing dynamically loaded ALC entry
+ * points.
+ */
+typedef ALCcontext*    (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef ALCcontext*    (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void) ALC_API_NOEXCEPT17;
+typedef ALCdevice*     (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef ALCdevice*     (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef ALCenum        (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname) ALC_API_NOEXCEPT17;
+typedef ALCvoid*       (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname) ALC_API_NOEXCEPT17;
+typedef ALCenum        (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname) ALC_API_NOEXCEPT17;
+typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values) ALC_API_NOEXCEPT17;
+typedef ALCdevice*     (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) ALC_API_NOEXCEPT17;
 
-/** Capture function. */
-ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
-ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device);
-ALC_API void       ALC_APIENTRY alcCaptureStart(ALCdevice *device);
-ALC_API void       ALC_APIENTRY alcCaptureStop(ALCdevice *device);
-ALC_API void       ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
-
-/** Pointer-to-function type, useful for dynamically getting ALC entry points. */
-typedef ALCcontext*    (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist);
-typedef ALCboolean     (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context);
-typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context);
-typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context);
-typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context);
-typedef ALCcontext*    (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void);
-typedef ALCdevice*     (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context);
-typedef ALCdevice*     (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename);
-typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device);
-typedef ALCenum        (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device);
-typedef ALCboolean     (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname);
-typedef void*          (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname);
-typedef ALCenum        (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname);
-typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param);
-typedef void           (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values);
-typedef ALCdevice*     (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
-typedef ALCboolean     (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device);
-typedef void           (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device);
-typedef void           (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device);
-typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
-
-#if defined(__cplusplus)
-}
+#ifdef __cplusplus
+} /* extern "C" */
 #endif
+/* NOLINTEND */
 
 #endif /* AL_ALC_H */
diff --git a/code/AL/alext.h b/code/AL/alext.h
index 0447f2bb..3908e194 100644
--- a/code/AL/alext.h
+++ b/code/AL/alext.h
@@ -1,38 +1,22 @@
-/**
- * OpenAL cross platform audio library
- * Copyright (C) 2008 by authors.
- * This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA  02111-1307, USA.
- * Or go to http://www.gnu.org/copyleft/lgpl.html
- */
-
 #ifndef AL_ALEXT_H
 #define AL_ALEXT_H
 
+/* NOLINTBEGIN */
 #include <stddef.h>
-/* Define int64_t and uint64_t types */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(_WIN32) && defined(__GNUC__)
+/* Define int64 and uint64 types */
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||             \
+    (defined(__cplusplus) && __cplusplus >= 201103L)
 #include <stdint.h>
+typedef int64_t _alsoft_int64_t;
+typedef uint64_t _alsoft_uint64_t;
 #elif defined(_WIN32)
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
+typedef __int64 _alsoft_int64_t;
+typedef unsigned __int64 _alsoft_uint64_t;
 #else
 /* Fallback if nothing above works */
-#include <inttypes.h>
+#include <stdint.h>
+typedef int64_t _alsoft_int64_t;
+typedef uint64_t _alsoft_uint64_t;
 #endif
 
 #include "alc.h"
@@ -42,6 +26,8 @@ typedef unsigned __int64 uint64_t;
 extern "C" {
 #endif
 
+struct _GUID;
+
 #ifndef AL_LOKI_IMA_ADPCM_format
 #define AL_LOKI_IMA_ADPCM_format 1
 #define AL_FORMAT_IMA_ADPCM_MONO16_EXT           0x10000
@@ -97,6 +83,31 @@ extern "C" {
 
 #ifndef AL_EXT_MCFORMATS
 #define AL_EXT_MCFORMATS 1
+/* Provides support for surround sound buffer formats with 8, 16, and 32-bit
+ * samples.
+ *
+ * QUAD8: Unsigned 8-bit, Quadraphonic (Front Left, Front Right, Rear Left,
+ *        Rear Right).
+ * QUAD16: Signed 16-bit, Quadraphonic.
+ * QUAD32: 32-bit float, Quadraphonic.
+ * REAR8: Unsigned 8-bit, Rear Stereo (Rear Left, Rear Right).
+ * REAR16: Signed 16-bit, Rear Stereo.
+ * REAR32: 32-bit float, Rear Stereo.
+ * 51CHN8: Unsigned 8-bit, 5.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Side Left, Side Right). Note that some audio systems may label
+ *         5.1's Side channels as Rear or Surround; they are equivalent for the
+ *         purposes of this extension.
+ * 51CHN16: Signed 16-bit, 5.1 Surround.
+ * 51CHN32: 32-bit float, 5.1 Surround.
+ * 61CHN8: Unsigned 8-bit, 6.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Rear Center, Side Left, Side Right).
+ * 61CHN16: Signed 16-bit, 6.1 Surround.
+ * 61CHN32: 32-bit float, 6.1 Surround.
+ * 71CHN8: Unsigned 8-bit, 7.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Rear Left, Rear Right, Side Left, Side Right).
+ * 71CHN16: Signed 16-bit, 7.1 Surround.
+ * 71CHN32: 32-bit float, 7.1 Surround.
+ */
 #define AL_FORMAT_QUAD8                          0x1204
 #define AL_FORMAT_QUAD16                         0x1205
 #define AL_FORMAT_QUAD32                         0x1206
@@ -133,9 +144,9 @@ extern "C" {
 
 #ifndef AL_EXT_STATIC_BUFFER
 #define AL_EXT_STATIC_BUFFER 1
-typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei);
+typedef void (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALuint,ALenum,ALvoid*,ALsizei,ALsizei) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq);
+void AL_APIENTRY alBufferDataStatic(const ALuint buffer, ALenum format, ALvoid *data, ALsizei size, ALsizei freq) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -151,11 +162,11 @@ AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format,
 
 #ifndef ALC_EXT_thread_local_context
 #define ALC_EXT_thread_local_context 1
-typedef ALCboolean  (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context);
-typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void);
+typedef ALCboolean  (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void) ALC_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API ALCboolean  ALC_APIENTRY alcSetThreadContext(ALCcontext *context);
-ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
+ALC_API ALCboolean  ALC_APIENTRY alcSetThreadContext(ALCcontext *context) ALC_API_NOEXCEPT;
+ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void) ALC_API_NOEXCEPT;
 #endif
 #endif
 
@@ -168,9 +179,9 @@ ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
 #define AL_SOFT_buffer_sub_data 1
 #define AL_BYTE_RW_OFFSETS_SOFT                  0x1031
 #define AL_SAMPLE_RW_OFFSETS_SOFT                0x1032
-typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei);
+typedef void (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
+AL_API void AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -187,12 +198,12 @@ AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const
 #define AL_FOLDBACK_EVENT_STOP                   0x4113
 #define AL_FOLDBACK_MODE_MONO                    0x4101
 #define AL_FOLDBACK_MODE_STEREO                  0x4102
-typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei);
-typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK);
-typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void);
+typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback);
-AL_API void AL_APIENTRY alRequestFoldbackStop(void);
+AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alRequestFoldbackStop(void) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -255,15 +266,15 @@ AL_API void AL_APIENTRY alRequestFoldbackStop(void);
 #define AL_SAMPLE_LENGTH_SOFT                    0x200A
 #define AL_SEC_LENGTH_SOFT                       0x200B
 
-typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
-typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);
-typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*);
-typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum);
+typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
-AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
-AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data);
-AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
+AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -294,13 +305,13 @@ AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
 #define ALC_6POINT1_SOFT                         0x1505
 #define ALC_7POINT1_SOFT                         0x1506
 
-typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*);
-typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum);
-typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei);
+typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*) ALC_API_NOEXCEPT17;
+typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum) ALC_API_NOEXCEPT17;
+typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei) ALC_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName);
-ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type);
-ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
+ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName) AL_API_NOEXCEPT;
+ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type) AL_API_NOEXCEPT;
+ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -318,38 +329,764 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe
 #define AL_SOFT_source_latency 1
 #define AL_SAMPLE_OFFSET_LATENCY_SOFT            0x1200
 #define AL_SEC_OFFSET_LATENCY_SOFT               0x1201
-typedef int64_t ALint64SOFT;
-typedef uint64_t ALuint64SOFT;
-typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble);
-typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble);
-typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*);
-typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT);
-typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT);
-typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*);
+typedef _alsoft_int64_t ALint64SOFT;
+typedef _alsoft_uint64_t ALuint64SOFT;
+typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value);
-AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3);
-AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values);
-AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value);
-AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3);
-AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values);
-AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value);
-AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3);
-AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values);
-AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value);
-AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3);
-AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values);
+AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values) AL_API_NOEXCEPT;
 #endif
 #endif
 
+#ifndef ALC_EXT_DEFAULT_FILTER_ORDER
+#define ALC_EXT_DEFAULT_FILTER_ORDER 1
+#define ALC_DEFAULT_FILTER_ORDER                 0x1100
+#endif
+
+#ifndef AL_SOFT_deferred_updates
+#define AL_SOFT_deferred_updates 1
+#define AL_DEFERRED_UPDATES_SOFT                 0xC002
+typedef void (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alDeferUpdatesSOFT(void) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alProcessUpdatesSOFT(void) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_block_alignment
+#define AL_SOFT_block_alignment 1
+#define AL_UNPACK_BLOCK_ALIGNMENT_SOFT           0x200C
+#define AL_PACK_BLOCK_ALIGNMENT_SOFT             0x200D
+#endif
+
+#ifndef AL_SOFT_MSADPCM
+#define AL_SOFT_MSADPCM 1
+#define AL_FORMAT_MONO_MSADPCM_SOFT              0x1302
+#define AL_FORMAT_STEREO_MSADPCM_SOFT            0x1303
+#endif
+
+#ifndef AL_SOFT_source_length
+#define AL_SOFT_source_length 1
+/*#define AL_BYTE_LENGTH_SOFT                      0x2009*/
+/*#define AL_SAMPLE_LENGTH_SOFT                    0x200A*/
+/*#define AL_SEC_LENGTH_SOFT                       0x200B*/
+#endif
+
+#ifndef AL_SOFT_buffer_length_query
+#define AL_SOFT_buffer_length_query 1
+/*#define AL_BYTE_LENGTH_SOFT                      0x2009*/
+/*#define AL_SAMPLE_LENGTH_SOFT                    0x200A*/
+/*#define AL_SEC_LENGTH_SOFT                       0x200B*/
+#endif
+
+#ifndef ALC_SOFT_pause_device
+#define ALC_SOFT_pause_device 1
+typedef void (ALC_APIENTRY*LPALCDEVICEPAUSESOFT)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void (ALC_APIENTRY*LPALCDEVICERESUMESOFT)(ALCdevice *device) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcDevicePauseSOFT(ALCdevice *device) ALC_API_NOEXCEPT;
+ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_EXT_BFORMAT
+#define AL_EXT_BFORMAT 1
+/* Provides support for B-Format ambisonic buffers (first-order, FuMa scaling
+ * and layout).
+ *
+ * BFORMAT2D_8: Unsigned 8-bit, 3-channel non-periphonic (WXY).
+ * BFORMAT2D_16: Signed 16-bit, 3-channel non-periphonic (WXY).
+ * BFORMAT2D_FLOAT32: 32-bit float, 3-channel non-periphonic (WXY).
+ * BFORMAT3D_8: Unsigned 8-bit, 4-channel periphonic (WXYZ).
+ * BFORMAT3D_16: Signed 16-bit, 4-channel periphonic (WXYZ).
+ * BFORMAT3D_FLOAT32: 32-bit float, 4-channel periphonic (WXYZ).
+ */
+#define AL_FORMAT_BFORMAT2D_8                    0x20021
+#define AL_FORMAT_BFORMAT2D_16                   0x20022
+#define AL_FORMAT_BFORMAT2D_FLOAT32              0x20023
+#define AL_FORMAT_BFORMAT3D_8                    0x20031
+#define AL_FORMAT_BFORMAT3D_16                   0x20032
+#define AL_FORMAT_BFORMAT3D_FLOAT32              0x20033
+#endif
+
+#ifndef AL_EXT_MULAW_BFORMAT
+#define AL_EXT_MULAW_BFORMAT 1
+#define AL_FORMAT_BFORMAT2D_MULAW                0x10031
+#define AL_FORMAT_BFORMAT3D_MULAW                0x10032
+#endif
+
+#ifndef ALC_SOFT_HRTF
+#define ALC_SOFT_HRTF 1
+#define ALC_HRTF_SOFT                            0x1992
+#define ALC_DONT_CARE_SOFT                       0x0002
+#define ALC_HRTF_STATUS_SOFT                     0x1993
+#define ALC_HRTF_DISABLED_SOFT                   0x0000
+#define ALC_HRTF_ENABLED_SOFT                    0x0001
+#define ALC_HRTF_DENIED_SOFT                     0x0002
+#define ALC_HRTF_REQUIRED_SOFT                   0x0003
+#define ALC_HRTF_HEADPHONES_DETECTED_SOFT        0x0004
+#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT         0x0005
+#define ALC_NUM_HRTF_SPECIFIERS_SOFT             0x1994
+#define ALC_HRTF_SPECIFIER_SOFT                  0x1995
+#define ALC_HRTF_ID_SOFT                         0x1996
+typedef const ALCchar* (ALC_APIENTRY*LPALCGETSTRINGISOFT)(ALCdevice *device, ALCenum paramName, ALCsizei index) ALC_API_NOEXCEPT17;
+typedef ALCboolean (ALC_APIENTRY*LPALCRESETDEVICESOFT)(ALCdevice *device, const ALCint *attribs) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice *device, ALCenum paramName, ALCsizei index) ALC_API_NOEXCEPT;
+ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCint *attribs) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_gain_clamp_ex
+#define AL_SOFT_gain_clamp_ex 1
+#define AL_GAIN_LIMIT_SOFT                       0x200E
+#endif
+
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT                   0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT                0x1211
+#define AL_SOURCE_RESAMPLER_SOFT                 0x1212
+#define AL_RESAMPLER_NAME_SOFT                   0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_source_spatialize
+#define AL_SOFT_source_spatialize
+#define AL_SOURCE_SPATIALIZE_SOFT                0x1214
+#define AL_AUTO_SOFT                             0x0002
+#endif
+
+#ifndef ALC_SOFT_output_limiter
+#define ALC_SOFT_output_limiter
+#define ALC_OUTPUT_LIMITER_SOFT                  0x199A
+#endif
+
+#ifndef ALC_SOFT_device_clock
+#define ALC_SOFT_device_clock 1
+typedef _alsoft_int64_t ALCint64SOFT;
+typedef _alsoft_uint64_t ALCuint64SOFT;
+#define ALC_DEVICE_CLOCK_SOFT                    0x1600
+#define ALC_DEVICE_LATENCY_SOFT                  0x1601
+#define ALC_DEVICE_CLOCK_LATENCY_SOFT            0x1602
+#define AL_SAMPLE_OFFSET_CLOCK_SOFT              0x1202
+#define AL_SEC_OFFSET_CLOCK_SOFT                 0x1203
+typedef void (ALC_APIENTRY*LPALCGETINTEGER64VSOFT)(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_direct_channels_remix
+#define AL_SOFT_direct_channels_remix 1
+#define AL_DROP_UNMATCHED_SOFT                   0x0001
+#define AL_REMIX_UNMATCHED_SOFT                  0x0002
+#endif
+
+#ifndef AL_SOFT_bformat_ex
+#define AL_SOFT_bformat_ex 1
+#define AL_AMBISONIC_LAYOUT_SOFT                 0x1997
+#define AL_AMBISONIC_SCALING_SOFT                0x1998
+
+/* Ambisonic layouts */
+#define AL_FUMA_SOFT                             0x0000
+#define AL_ACN_SOFT                              0x0001
+
+/* Ambisonic scalings (normalization) */
+/*#define AL_FUMA_SOFT*/
+#define AL_SN3D_SOFT                             0x0001
+#define AL_N3D_SOFT                              0x0002
+#endif
+
+#ifndef ALC_SOFT_loopback_bformat
+#define ALC_SOFT_loopback_bformat 1
+#define ALC_AMBISONIC_LAYOUT_SOFT                0x1997
+#define ALC_AMBISONIC_SCALING_SOFT               0x1998
+#define ALC_AMBISONIC_ORDER_SOFT                 0x1999
+#define ALC_MAX_AMBISONIC_ORDER_SOFT             0x199B
+
+#define ALC_BFORMAT3D_SOFT                       0x1507
+
+/* Ambisonic layouts */
+#define ALC_FUMA_SOFT                            0x0000
+#define ALC_ACN_SOFT                             0x0001
+
+/* Ambisonic scalings (normalization) */
+/*#define ALC_FUMA_SOFT*/
+#define ALC_SN3D_SOFT                            0x0001
+#define ALC_N3D_SOFT                             0x0002
+#endif
+
+#ifndef AL_SOFT_effect_target
+#define AL_SOFT_effect_target
+#define AL_EFFECTSLOT_TARGET_SOFT                0x199C
+#endif
+
+#ifndef AL_SOFT_events
+#define AL_SOFT_events 1
+#define AL_EVENT_CALLBACK_FUNCTION_SOFT          0x19A2
+#define AL_EVENT_CALLBACK_USER_PARAM_SOFT        0x19A3
+#define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT      0x19A4
+#define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT  0x19A5
+#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x19A6
+typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param,
+    ALsizei length, const ALchar *message, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALEVENTCONTROLSOFT)(ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALEVENTCALLBACKSOFT)(ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY*LPALGETPOINTERSOFT)(ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETPOINTERVSOFT)(ALenum pname, void **values) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alEventControlSOFT(ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEventCallbackSOFT(ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT;
+AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef ALC_SOFT_reopen_device
+#define ALC_SOFT_reopen_device
+typedef ALCboolean (ALC_APIENTRY*LPALCREOPENDEVICESOFT)(ALCdevice *device,
+    const ALCchar *deviceName, const ALCint *attribs) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALCboolean ALC_APIENTRY alcReopenDeviceSOFT(ALCdevice *device, const ALCchar *deviceName,
+    const ALCint *attribs) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_callback_buffer
+#define AL_SOFT_callback_buffer
+#define AL_BUFFER_CALLBACK_FUNCTION_SOFT         0x19A0
+#define AL_BUFFER_CALLBACK_USER_PARAM_SOFT       0x19A1
+typedef ALsizei (AL_APIENTRY*ALBUFFERCALLBACKTYPESOFT)(ALvoid *userptr, ALvoid *sampledata, ALsizei numbytes) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALBUFFERCALLBACKSOFT)(ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFERPTRSOFT)(ALuint buffer, ALenum param, ALvoid **value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFER3PTRSOFT)(ALuint buffer, ALenum param, ALvoid **value1, ALvoid **value2, ALvoid **value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFERPTRVSOFT)(ALuint buffer, ALenum param, ALvoid **values) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alBufferCallbackSOFT(ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferPtrSOFT(ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBuffer3PtrSOFT(ALuint buffer, ALenum param, ALvoid **ptr0, ALvoid **ptr1, ALvoid **ptr2) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferPtrvSOFT(ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_UHJ
+#define AL_SOFT_UHJ
+#define AL_FORMAT_UHJ2CHN8_SOFT                  0x19A2
+#define AL_FORMAT_UHJ2CHN16_SOFT                 0x19A3
+#define AL_FORMAT_UHJ2CHN_FLOAT32_SOFT           0x19A4
+#define AL_FORMAT_UHJ3CHN8_SOFT                  0x19A5
+#define AL_FORMAT_UHJ3CHN16_SOFT                 0x19A6
+#define AL_FORMAT_UHJ3CHN_FLOAT32_SOFT           0x19A7
+#define AL_FORMAT_UHJ4CHN8_SOFT                  0x19A8
+#define AL_FORMAT_UHJ4CHN16_SOFT                 0x19A9
+#define AL_FORMAT_UHJ4CHN_FLOAT32_SOFT           0x19AA
+
+#define AL_STEREO_MODE_SOFT                      0x19B0
+#define AL_NORMAL_SOFT                           0x0000
+#define AL_SUPER_STEREO_SOFT                     0x0001
+#define AL_SUPER_STEREO_WIDTH_SOFT               0x19B1
+#endif
+
+#ifndef AL_SOFT_UHJ_ex
+#define AL_SOFT_UHJ_ex
+#define AL_FORMAT_UHJ2CHN_MULAW_SOFT             0x19B3
+#define AL_FORMAT_UHJ2CHN_ALAW_SOFT              0x19B4
+#define AL_FORMAT_UHJ2CHN_IMA4_SOFT              0x19B5
+#define AL_FORMAT_UHJ2CHN_MSADPCM_SOFT           0x19B6
+#define AL_FORMAT_UHJ3CHN_MULAW_SOFT             0x19B7
+#define AL_FORMAT_UHJ3CHN_ALAW_SOFT              0x19B8
+#define AL_FORMAT_UHJ4CHN_MULAW_SOFT             0x19B9
+#define AL_FORMAT_UHJ4CHN_ALAW_SOFT              0x19BA
+#endif
+
+#ifndef ALC_SOFT_output_mode
+#define ALC_SOFT_output_mode
+#define ALC_OUTPUT_MODE_SOFT                     0x19AC
+#define ALC_ANY_SOFT                             0x19AD
+/*#define ALC_MONO_SOFT                            0x1500*/
+/*#define ALC_STEREO_SOFT                          0x1501*/
+#define ALC_STEREO_BASIC_SOFT                    0x19AE
+#define ALC_STEREO_UHJ_SOFT                      0x19AF
+#define ALC_STEREO_HRTF_SOFT                     0x19B2
+/*#define ALC_QUAD_SOFT                            0x1503*/
+#define ALC_SURROUND_5_1_SOFT                    0x1504
+#define ALC_SURROUND_6_1_SOFT                    0x1505
+#define ALC_SURROUND_7_1_SOFT                    0x1506
+#endif
+
+#ifndef AL_SOFT_source_start_delay
+#define AL_SOFT_source_start_delay
+typedef void (AL_APIENTRY*LPALSOURCEPLAYATTIMESOFT)(ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEPLAYATTIMEVSOFT)(ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+void AL_APIENTRY alSourcePlayAtTimeSOFT(ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayAtTimevSOFT(ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef ALC_EXT_debug
+#define ALC_EXT_debug
+#define ALC_CONTEXT_FLAGS_EXT                    0x19CF
+#define ALC_CONTEXT_DEBUG_BIT_EXT                0x0001
+#endif
+
+#ifndef AL_EXT_debug
+#define AL_EXT_debug
+#define AL_DONT_CARE_EXT                         0x0002
+#define AL_DEBUG_OUTPUT_EXT                      0x19B2
+#define AL_DEBUG_CALLBACK_FUNCTION_EXT           0x19B3
+#define AL_DEBUG_CALLBACK_USER_PARAM_EXT         0x19B4
+#define AL_DEBUG_SOURCE_API_EXT                  0x19B5
+#define AL_DEBUG_SOURCE_AUDIO_SYSTEM_EXT         0x19B6
+#define AL_DEBUG_SOURCE_THIRD_PARTY_EXT          0x19B7
+#define AL_DEBUG_SOURCE_APPLICATION_EXT          0x19B8
+#define AL_DEBUG_SOURCE_OTHER_EXT                0x19B9
+#define AL_DEBUG_TYPE_ERROR_EXT                  0x19BA
+#define AL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_EXT    0x19BB
+#define AL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_EXT     0x19BC
+#define AL_DEBUG_TYPE_PORTABILITY_EXT            0x19BD
+#define AL_DEBUG_TYPE_PERFORMANCE_EXT            0x19BE
+#define AL_DEBUG_TYPE_MARKER_EXT                 0x19BF
+#define AL_DEBUG_TYPE_PUSH_GROUP_EXT             0x19C0
+#define AL_DEBUG_TYPE_POP_GROUP_EXT              0x19C1
+#define AL_DEBUG_TYPE_OTHER_EXT                  0x19C2
+#define AL_DEBUG_SEVERITY_HIGH_EXT               0x19C3
+#define AL_DEBUG_SEVERITY_MEDIUM_EXT             0x19C4
+#define AL_DEBUG_SEVERITY_LOW_EXT                0x19C5
+#define AL_DEBUG_SEVERITY_NOTIFICATION_EXT       0x19C6
+#define AL_DEBUG_LOGGED_MESSAGES_EXT             0x19C7
+#define AL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_EXT  0x19C8
+#define AL_MAX_DEBUG_MESSAGE_LENGTH_EXT          0x19C9
+#define AL_MAX_DEBUG_LOGGED_MESSAGES_EXT         0x19CA
+#define AL_MAX_DEBUG_GROUP_STACK_DEPTH_EXT       0x19CB
+#define AL_MAX_LABEL_LENGTH_EXT                  0x19CC
+#define AL_STACK_OVERFLOW_EXT                    0x19CD
+#define AL_STACK_UNDERFLOW_EXT                   0x19CE
+#define AL_CONTEXT_FLAGS_EXT                     0x19CF
+#define AL_BUFFER_EXT                            0x1009 /* Same as AL_BUFFER */
+#define AL_SOURCE_EXT                            0x19D0
+#define AL_FILTER_EXT                            0x19D1
+#define AL_EFFECT_EXT                            0x19D2
+#define AL_AUXILIARY_EFFECT_SLOT_EXT             0x19D3
+
+typedef void (AL_APIENTRY*ALDEBUGPROCEXT)(ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECALLBACKEXT)(ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGEINSERTEXT)(ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECONTROLEXT)(ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPUSHDEBUGGROUPEXT)(ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPOPDEBUGGROUPEXT)(void) AL_API_NOEXCEPT17;
+typedef ALuint (AL_APIENTRY*LPALGETDEBUGMESSAGELOGEXT)(ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALOBJECTLABELEXT)(ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETOBJECTLABELEXT)(ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY*LPALGETPOINTEREXT)(ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETPOINTERVEXT)(ALenum pname, void **values) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+void AL_APIENTRY alDebugMessageCallbackEXT(ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageInsertEXT(ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageControlEXT(ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT;
+void AL_APIENTRY alPushDebugGroupEXT(ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alPopDebugGroupEXT(void) AL_API_NOEXCEPT;
+ALuint AL_APIENTRY alGetDebugMessageLogEXT(ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT;
+void AL_APIENTRY alObjectLabelEXT(ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetObjectLabelEXT(ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetPointerEXT(ALenum pname) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetPointervEXT(ALenum pname, void **values) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef ALC_SOFT_system_events
+#define ALC_SOFT_system_events
+#define ALC_PLAYBACK_DEVICE_SOFT                 0x19D4
+#define ALC_CAPTURE_DEVICE_SOFT                  0x19D5
+#define ALC_EVENT_TYPE_DEFAULT_DEVICE_CHANGED_SOFT 0x19D6
+#define ALC_EVENT_TYPE_DEVICE_ADDED_SOFT         0x19D7
+#define ALC_EVENT_TYPE_DEVICE_REMOVED_SOFT       0x19D8
+#define ALC_EVENT_SUPPORTED_SOFT                 0x19D9
+#define ALC_EVENT_NOT_SUPPORTED_SOFT             0x19DA
+typedef void (ALC_APIENTRY*ALCEVENTPROCTYPESOFT)(ALCenum eventType, ALCenum deviceType,
+    ALCdevice *device, ALCsizei length, const ALCchar *message, void *userParam) ALC_API_NOEXCEPT17;
+typedef ALCenum (ALC_APIENTRY*LPALCEVENTISSUPPORTEDSOFT)(ALCenum eventType, ALCenum deviceType) ALC_API_NOEXCEPT17;
+typedef ALCboolean (ALC_APIENTRY*LPALCEVENTCONTROLSOFT)(ALCsizei count, const ALCenum *events, ALCboolean enable) ALC_API_NOEXCEPT17;
+typedef void (ALC_APIENTRY*LPALCEVENTCALLBACKSOFT)(ALCEVENTPROCTYPESOFT callback, void *userParam) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALCenum ALC_APIENTRY alcEventIsSupportedSOFT(ALCenum eventType, ALCenum deviceType) ALC_API_NOEXCEPT;
+ALCboolean ALC_APIENTRY alcEventControlSOFT(ALCsizei count, const ALCenum *events, ALCboolean enable) ALC_API_NOEXCEPT;
+void ALC_APIENTRY alcEventCallbackSOFT(ALCEVENTPROCTYPESOFT callback, void *userParam) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_EXT_direct_context
+#define AL_EXT_direct_context
+typedef ALCvoid* (ALC_APIENTRY *LPALCGETPROCADDRESS2)(ALCdevice *device, const ALCchar *funcname) AL_API_NOEXCEPT17;
+
+typedef void (AL_APIENTRY *LPALENABLEDIRECT)(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDISABLEDIRECT)(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISENABLEDDIRECT)(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDOPPLERFACTORDIRECT)(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSPEEDOFSOUNDDIRECT)(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDISTANCEMODELDIRECT)(ALCcontext *context, ALenum distanceModel) AL_API_NOEXCEPT17;
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRINGDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBOOLEANVDIRECT)(ALCcontext *context, ALenum param, ALboolean *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETINTEGERVDIRECT)(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFLOATVDIRECT)(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETDOUBLEVDIRECT)(ALCcontext *context, ALenum param, ALdouble *values) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALGETBOOLEANDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALint (AL_APIENTRY *LPALGETINTEGERDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALfloat (AL_APIENTRY *LPALGETFLOATDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALdouble (AL_APIENTRY *LPALGETDOUBLEDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPALGETERRORDIRECT)(ALCcontext *context) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISEXTENSIONPRESENTDIRECT)(ALCcontext *context, const ALchar *extname) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY *LPALGETPROCADDRESSDIRECT)(ALCcontext *context, const ALchar *fname) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPALGETENUMVALUEDIRECT)(ALCcontext *context, const ALchar *ename) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERFDIRECT)(ALCcontext *context, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENER3FDIRECT)(ALCcontext *context, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERFVDIRECT)(ALCcontext *context, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERIDIRECT)(ALCcontext *context, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENER3IDIRECT)(ALCcontext *context, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERIVDIRECT)(ALCcontext *context, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERFDIRECT)(ALCcontext *context, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENER3FDIRECT)(ALCcontext *context, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERFVDIRECT)(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERIDIRECT)(ALCcontext *context, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENER3IDIRECT)(ALCcontext *context, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERIVDIRECT)(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENSOURCESDIRECT)(ALCcontext *context, ALsizei n, ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETESOURCESDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISSOURCEDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEFDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3FDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEFVDIRECT)(ALCcontext *context, ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEIDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3IDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEIVDIRECT)(ALCcontext *context, ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEFDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3FDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEFVDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEIDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3IDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEIVDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPLAYDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCESTOPDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEREWINDDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPAUSEDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPLAYVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCESTOPVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEREWINDVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPAUSEVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEQUEUEBUFFERSDIRECT)(ALCcontext *context, ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERSDIRECT)(ALCcontext *context, ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENBUFFERSDIRECT)(ALCcontext *context, ALsizei n, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEBUFFERSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISBUFFERDIRECT)(ALCcontext *context, ALuint buffer) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERDATADIRECT)(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERFDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFER3FDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERFVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERIDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFER3IDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERIVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERFDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFER3FDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERFVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERIDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFER3IDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERIVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+/* ALC_EXT_EFX */
+typedef void (AL_APIENTRY *LPALGENEFFECTSDIRECT)(ALCcontext *context, ALsizei n, ALuint *effects) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEEFFECTSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *effects) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISEFFECTDIRECT)(ALCcontext *context, ALuint effect) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTIDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTIVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTFDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTFVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTIDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTIVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTFDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTFVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENFILTERSDIRECT)(ALCcontext *context, ALsizei n, ALuint *filters) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEFILTERSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *filters) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISFILTERDIRECT)(ALCcontext *context, ALuint filter) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERIDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERIVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERFDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERFVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERIDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERIVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERFDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERFVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTSDIRECT)(ALCcontext *context, ALsizei n, ALuint *effectslots) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *effectslots) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOTDIRECT)(ALCcontext *context, ALuint effectslot) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+/* AL_EXT_BUFFER_DATA_STATIC */
+typedef void (AL_APIENTRY *LPALBUFFERDATASTATICDIRECT)(ALCcontext *context, ALuint buffer, ALenum format, ALvoid *data, ALsizei size, ALsizei freq) AL_API_NOEXCEPT17;
+/* AL_EXT_debug */
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECALLBACKDIRECTEXT)(ALCcontext *context, ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGEINSERTDIRECTEXT)(ALCcontext *context, ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECONTROLDIRECTEXT)(ALCcontext *context, ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPUSHDEBUGGROUPDIRECTEXT)(ALCcontext *context, ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPOPDEBUGGROUPDIRECTEXT)(ALCcontext *context) AL_API_NOEXCEPT17;
+typedef ALuint (AL_APIENTRY*LPALGETDEBUGMESSAGELOGDIRECTEXT)(ALCcontext *context, ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALOBJECTLABELDIRECTEXT)(ALCcontext *context, ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETOBJECTLABELDIRECTEXT)(ALCcontext *context, ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY*LPALGETPOINTERDIRECTEXT)(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETPOINTERVDIRECTEXT)(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT17;
+/* AL_EXT_FOLDBACK */
+typedef void (AL_APIENTRY *LPALREQUESTFOLDBACKSTARTDIRECT)(ALCcontext *context, ALenum mode, ALsizei count, ALsizei length, ALfloat *mem, LPALFOLDBACKCALLBACK callback) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALREQUESTFOLDBACKSTOPDIRECT)(ALCcontext *context) AL_API_NOEXCEPT17;
+/* AL_SOFT_buffer_sub_data */
+typedef void (AL_APIENTRY *LPALBUFFERSUBDATADIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei offset, ALsizei length) AL_API_NOEXCEPT17;
+/* AL_SOFT_source_latency */
+typedef void (AL_APIENTRY *LPALSOURCEDDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3DDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble,ALdouble,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEDVDIRECTSOFT)(ALCcontext*,ALuint,ALenum,const ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEDDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3DDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEDVDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEI64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3I64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEI64VDIRECTSOFT)(ALCcontext*,ALuint,ALenum,const ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEI64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3I64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEI64VDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
+/* AL_SOFT_deferred_updates */
+typedef void (AL_APIENTRY *LPALDEFERUPDATESDIRECTSOFT)(ALCcontext *context) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALPROCESSUPDATESDIRECTSOFT)(ALCcontext *context) AL_API_NOEXCEPT17;
+/* AL_SOFT_source_resampler */
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRINGIDIRECTSOFT)(ALCcontext *context, ALenum pname, ALsizei index) AL_API_NOEXCEPT17;
+/* AL_SOFT_events */
+typedef void (AL_APIENTRY *LPALEVENTCONTROLDIRECTSOFT)(ALCcontext *context, ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEVENTCALLBACKDIRECTSOFT)(ALCcontext *context, ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY *LPALGETPOINTERDIRECTSOFT)(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETPOINTERVDIRECTSOFT)(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT17;
+/* AL_SOFT_callback_buffer */
+typedef void (AL_APIENTRY *LPALBUFFERCALLBACKDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERPTRDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFER3PTRDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **value1, ALvoid **value2, ALvoid **value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERPTRVDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **values) AL_API_NOEXCEPT17;
+/* AL_SOFT_source_start_delay */
+typedef void (AL_APIENTRY *LPALSOURCEPLAYATTIMEDIRECTSOFT)(ALCcontext *context, ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPLAYATTIMEVDIRECTSOFT)(ALCcontext *context, ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+/* EAX */
+typedef ALenum (AL_APIENTRY *LPEAXSETDIRECT)(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPEAXGETDIRECT)(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPEAXSETBUFFERMODEDIRECT)(ALCcontext *context, ALsizei n, const ALuint *buffers, ALint value) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPEAXGETBUFFERMODEDIRECT)(ALCcontext *context, ALuint buffer, ALint *pReserved) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALCvoid* ALC_APIENTRY alcGetProcAddress2(ALCdevice *device, const ALCchar *funcName) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alEnableDirect(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT;
+void AL_APIENTRY alDisableDirect(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsEnabledDirect(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alDopplerFactorDirect(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSpeedOfSoundDirect(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alDistanceModelDirect(ALCcontext *context, ALenum distanceModel) AL_API_NOEXCEPT;
+
+const ALchar* AL_APIENTRY alGetStringDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBooleanvDirect(ALCcontext *context, ALenum param, ALboolean *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetIntegervDirect(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFloatvDirect(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetDoublevDirect(ALCcontext *context, ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alGetBooleanDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+ALint AL_APIENTRY alGetIntegerDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+ALfloat AL_APIENTRY alGetFloatDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+ALdouble AL_APIENTRY alGetDoubleDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+
+ALenum AL_APIENTRY alGetErrorDirect(ALCcontext *context) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsExtensionPresentDirect(ALCcontext *context, const ALchar *extname) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetProcAddressDirect(ALCcontext *context, const ALchar *fname) AL_API_NOEXCEPT;
+ALenum AL_APIENTRY alGetEnumValueDirect(ALCcontext *context, const ALchar *ename) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alListenerfDirect(ALCcontext *context, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alListener3fDirect(ALCcontext *context, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alListenerfvDirect(ALCcontext *context, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alListeneriDirect(ALCcontext *context, ALenum param, ALint value) AL_API_NOEXCEPT;
+void AL_APIENTRY alListener3iDirect(ALCcontext *context, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alListenerivDirect(ALCcontext *context, ALenum param, const ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListenerfDirect(ALCcontext *context, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListener3fDirect(ALCcontext *context, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListenerfvDirect(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListeneriDirect(ALCcontext *context, ALenum param, ALint *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListener3iDirect(ALCcontext *context, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListenerivDirect(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenSourcesDirect(ALCcontext *context, ALsizei n, ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteSourcesDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsSourceDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcefDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3fDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcefvDirect(ALCcontext *context, ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceiDirect(ALCcontext *context, ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3iDirect(ALCcontext *context, ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceivDirect(ALCcontext *context, ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcefDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3fDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcefvDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourceiDirect(ALCcontext *context, ALuint source,  ALenum param, ALint *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3iDirect(ALCcontext *context, ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourceivDirect(ALCcontext *context, ALuint source,  ALenum param, ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceStopDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceRewindDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePauseDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayvDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceStopvDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceRewindvDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePausevDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceQueueBuffersDirect(ALCcontext *context, ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceUnqueueBuffersDirect(ALCcontext *context, ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenBuffersDirect(ALCcontext *context, ALsizei n, ALuint *buffers) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteBuffersDirect(ALCcontext *context, ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsBufferDirect(ALCcontext *context, ALuint buffer) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferDataDirect(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferfDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alBuffer3fDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferfvDirect(ALCcontext *context, ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferiDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT;
+void AL_APIENTRY alBuffer3iDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferivDirect(ALCcontext *context, ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferfDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBuffer3fDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferfvDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferiDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBuffer3iDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferivDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenEffectsDirect(ALCcontext *context, ALsizei n, ALuint *effects) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteEffectsDirect(ALCcontext *context, ALsizei n, const ALuint *effects) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsEffectDirect(ALCcontext *context, ALuint effect) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectiDirect(ALCcontext *context, ALuint effect, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectivDirect(ALCcontext *context, ALuint effect, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectfDirect(ALCcontext *context, ALuint effect, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectfvDirect(ALCcontext *context, ALuint effect, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectiDirect(ALCcontext *context, ALuint effect, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectivDirect(ALCcontext *context, ALuint effect, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectfDirect(ALCcontext *context, ALuint effect, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectfvDirect(ALCcontext *context, ALuint effect, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenFiltersDirect(ALCcontext *context, ALsizei n, ALuint *filters) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteFiltersDirect(ALCcontext *context, ALsizei n, const ALuint *filters) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsFilterDirect(ALCcontext *context, ALuint filter) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilteriDirect(ALCcontext *context, ALuint filter, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilterivDirect(ALCcontext *context, ALuint filter, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilterfDirect(ALCcontext *context, ALuint filter, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilterfvDirect(ALCcontext *context, ALuint filter, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilteriDirect(ALCcontext *context, ALuint filter, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilterivDirect(ALCcontext *context, ALuint filter, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilterfDirect(ALCcontext *context, ALuint filter, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilterfvDirect(ALCcontext *context, ALuint filter, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenAuxiliaryEffectSlotsDirect(ALCcontext *context, ALsizei n, ALuint *effectslots) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteAuxiliaryEffectSlotsDirect(ALCcontext *context, ALsizei n, const ALuint *effectslots) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsAuxiliaryEffectSlotDirect(ALCcontext *context, ALuint effectslot) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotiDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotivDirect(ALCcontext *context, ALuint effectslot, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotfDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotfvDirect(ALCcontext *context, ALuint effectslot, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotiDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotivDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotfDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotfvDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alBufferDataStaticDirect(ALCcontext *context, ALuint buffer, ALenum format, ALvoid *data, ALsizei size, ALsizei freq) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alDebugMessageCallbackDirectEXT(ALCcontext *context, ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageInsertDirectEXT(ALCcontext *context, ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageControlDirectEXT(ALCcontext *context, ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT;
+void AL_APIENTRY alPushDebugGroupDirectEXT(ALCcontext *context, ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alPopDebugGroupDirectEXT(ALCcontext *context) AL_API_NOEXCEPT;
+ALuint AL_APIENTRY alGetDebugMessageLogDirectEXT(ALCcontext *context, ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT;
+void AL_APIENTRY alObjectLabelDirectEXT(ALCcontext *context, ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetObjectLabelDirectEXT(ALCcontext *context, ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetPointerDirectEXT(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetPointervDirectEXT(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alRequestFoldbackStartDirect(ALCcontext *context, ALenum mode, ALsizei count, ALsizei length, ALfloat *mem, LPALFOLDBACKCALLBACK callback) AL_API_NOEXCEPT;
+void AL_APIENTRY alRequestFoldbackStopDirect(ALCcontext *context) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alBufferSubDataDirectSOFT(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei offset, ALsizei length) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alSourcedDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3dDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcedvDirectSOFT(ALCcontext *context, ALuint source, ALenum param, const ALdouble *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcedDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3dDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcedvDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcei64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3i64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcei64vDirectSOFT(ALCcontext *context, ALuint source, ALenum param, const ALint64SOFT *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcei64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3i64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcei64vDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT *values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alDeferUpdatesDirectSOFT(ALCcontext *context) AL_API_NOEXCEPT;
+void AL_APIENTRY alProcessUpdatesDirectSOFT(ALCcontext *context) AL_API_NOEXCEPT;
+
+const ALchar* AL_APIENTRY alGetStringiDirectSOFT(ALCcontext *context, ALenum pname, ALsizei index) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alEventControlDirectSOFT(ALCcontext *context, ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT;
+void AL_APIENTRY alEventCallbackDirectSOFT(ALCcontext *context, ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetPointerDirectSOFT(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetPointervDirectSOFT(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alBufferCallbackDirectSOFT(ALCcontext *context, ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferPtrDirectSOFT(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBuffer3PtrDirectSOFT(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **ptr0, ALvoid **ptr1, ALvoid **ptr2) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferPtrvDirectSOFT(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alSourcePlayAtTimeDirectSOFT(ALCcontext *context, ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayAtTimevDirectSOFT(ALCcontext *context, ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT;
+
+ALenum AL_APIENTRY EAXSetDirect(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT;
+ALenum AL_APIENTRY EAXGetDirect(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY EAXSetBufferModeDirect(ALCcontext *context, ALsizei n, const ALuint *buffers, ALint value) AL_API_NOEXCEPT;
+ALenum AL_APIENTRY EAXGetBufferModeDirect(ALCcontext *context, ALuint buffer, ALint *pReserved) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_bformat_hoa
+#define AL_SOFT_bformat_hoa
+#define AL_UNPACK_AMBISONIC_ORDER_SOFT           0x199D
+#endif
+
 #ifdef __cplusplus
 }
 #endif
+/* NOLINTEND */
 
 #endif
diff --git a/code/AL/efx-presets.h b/code/AL/efx-presets.h
index 86dcbda2..acd5bf39 100644
--- a/code/AL/efx-presets.h
+++ b/code/AL/efx-presets.h
@@ -2,6 +2,7 @@
 
 #ifndef EFX_PRESETS_H
 #define EFX_PRESETS_H
+/* NOLINTBEGIN */
 
 #ifndef EFXEAXREVERBPROPERTIES_DEFINED
 #define EFXEAXREVERBPROPERTIES_DEFINED
@@ -345,7 +346,7 @@ typedef struct {
 /* Driving Presets */
 
 #define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \
-    { 1.0000f, 0.0000f, 3.1623f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+    { 1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
 
 #define EFX_REVERB_PRESET_DRIVING_PITGARAGE \
     { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
@@ -399,4 +400,5 @@ typedef struct {
 #define EFX_REVERB_PRESET_SMALLWATERROOM \
     { 1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
 
+/* NOLINTEND */
 #endif /* EFX_PRESETS_H */
diff --git a/code/AL/efx.h b/code/AL/efx.h
index 57766983..1e93bf22 100644
--- a/code/AL/efx.h
+++ b/code/AL/efx.h
@@ -1,6 +1,8 @@
 #ifndef AL_EFX_H
 #define AL_EFX_H
 
+/* NOLINTBEGIN */
+#include <float.h>
 
 #include "alc.h"
 #include "al.h"
@@ -203,80 +205,80 @@ extern "C" {
 
 
 /* Effect object function types. */
-typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint);
-typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
 
 /* Filter object function types. */
-typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint);
-typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
 
 /* Auxiliary Effect Slot object function types. */
-typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
 
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects);
-AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects);
-AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect);
-AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues);
+AL_API void AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
 
-AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters);
-AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters);
-AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter);
-AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues);
+AL_API void AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
 
-AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots);
-AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots);
-AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues);
+AL_API void AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
 #endif
 
 /* Filter ranges and defaults. */
@@ -757,5 +759,6 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum p
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
+/* NOLINTEND */
 
 #endif /* AL_EFX_H */
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 1a4713c4..60af9513 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -26,12 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../server/server.h"
 #include "snd_codec.h"
 
-#if defined(_MSC_VER) || defined(__APPLE__)
-#    include <alext.h>
-#else
-#    include <AL/alext.h>
-#endif
-
 typedef struct {
     const char *funcname;
     void      **funcptr;
@@ -3102,10 +3096,12 @@ bool openal_channel::set_sfx(sfx_t *pSfx)
             qalGenBuffers(1, &pSfx->buffer);
             alDieIfError();
 
+#if AL_SOFT_block_alignment
             if (pSfx->info.dataalign > 1) {
                 qalBufferi(pSfx->buffer, AL_UNPACK_BLOCK_ALIGNMENT_SOFT, pSfx->info.dataalign);
                 alDieIfError();
             }
+#endif
 
             qalBufferData(
                 pSfx->buffer,
@@ -4484,10 +4480,12 @@ bool openal_channel_two_d_stream::set_sfx(sfx_t *pSfx)
         return true;
     }
 
+#if AL_SOFT_block_alignment
     if (stream->info.dataalign > 1 && soft_block_align) {
         qalBufferi(buffers[currentBuf], AL_UNPACK_BLOCK_ALIGNMENT_SOFT, stream->info.dataalign);
         alDieIfError();
     }
+#endif
 
     qalBufferData(buffers[currentBuf], pSfx->info.format, rawData, bytesRead, stream->info.rate);
     alDieIfError();
@@ -4628,10 +4626,12 @@ void openal_channel_two_d_stream::update()
         }
     }
 
+#if AL_SOFT_block_alignment
     if (stream->info.dataalign > 1 && soft_block_align) {
         qalBufferi(buffers[currentBuf], AL_UNPACK_BLOCK_ALIGNMENT_SOFT, stream->info.dataalign);
         alDieIfError();
     }
+#endif
 
     qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
     alDieIfError();

From e2c24abf62d86ce61f51122465be0be88187dfb9 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Mar 2025 22:16:43 +0100
Subject: [PATCH 2000/2040] Move alext functions out of qal.h (#706)

qal.h should contain core/required functions. To get functions from extensions, alGetProcAddress should be used, so they can be optional
---
 code/client/qal.c              |  6 ---
 code/client/qal.h              |  3 --
 code/client/snd_openal_new.cpp | 68 ++++++++++++++++++++++------------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/code/client/qal.c b/code/client/qal.c
index 8b32af17..78e0b80e 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -88,9 +88,6 @@ LPALGETBUFFERI qalGetBufferi;
 LPALDOPPLERFACTOR qalDopplerFactor;
 LPALSPEEDOFSOUND qalSpeedOfSound;
 LPALDISTANCEMODEL qalDistanceModel;
-#ifdef AL_SOFT_source_resampler
-LPALGETSTRINGISOFT qalGetStringiSOFT;
-#endif
 
 LPALCCREATECONTEXT qalcCreateContext;
 LPALCMAKECONTEXTCURRENT qalcMakeContextCurrent;
@@ -212,9 +209,6 @@ qboolean QAL_Init(const char *libname)
 	qalDopplerFactor = GPA("alDopplerFactor");
 	qalSpeedOfSound = GPA("alSpeedOfSound");
 	qalDistanceModel = GPA("alDistanceModel");
-#ifdef AL_SOFT_source_resampler
-	qalGetStringiSOFT = GPA("alGetStringiSOFT");
-#endif
 
 	qalcCreateContext = GPA("alcCreateContext");
 	qalcMakeContextCurrent = GPA("alcMakeContextCurrent");
diff --git a/code/client/qal.h b/code/client/qal.h
index 94111724..c676b195 100644
--- a/code/client/qal.h
+++ b/code/client/qal.h
@@ -135,9 +135,6 @@ extern LPALGETBUFFERIV qalGetBufferiv;
 extern LPALDOPPLERFACTOR qalDopplerFactor;
 extern LPALSPEEDOFSOUND qalSpeedOfSound;
 extern LPALDISTANCEMODEL qalDistanceModel;
-#ifdef AL_SOFT_source_resampler
-extern LPALGETSTRINGISOFT qalGetStringiSOFT;
-#endif
 
 extern LPALCCREATECONTEXT qalcCreateContext;
 extern LPALCMAKECONTEXTCURRENT qalcMakeContextCurrent;
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 60af9513..8e5bef71 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -128,6 +128,13 @@ static ALuint S_OPENAL_Format(float width, int channels);
 #    define ALDRIVER_DEFAULT "libopenal.so.1"
 #endif
 
+//
+// alext
+//
+#ifdef AL_SOFT_source_resampler
+LPALGETSTRINGISOFT qalGetStringiSOFT;
+#endif
+
 /*
 ==============
 __alDieIfError
@@ -268,8 +275,6 @@ static bool S_OPENAL_InitContext()
 {
     const char *dev;
     int         attrlist[10];
-    size_t      i;
-    size_t      numResamplers;
 
     Com_DPrintf("OpenAL: Context initialization\n");
 
@@ -427,23 +432,6 @@ static bool S_OPENAL_InitContext()
     qalcMakeContextCurrent(al_context_id);
     alDieIfError();
 
-#ifdef AL_SOFT_source_resampler
-    al_default_resampler_index = qalGetInteger(AL_DEFAULT_RESAMPLER_SOFT);
-    alDieIfError();
-    al_resampler_index = al_default_resampler_index;
-    numResamplers = qalGetInteger(AL_NUM_RESAMPLERS_SOFT);
-    alDieIfError();
-
-    for (i = 0; i < numResamplers; i++) {
-        const ALchar* resamplerName = qalGetStringiSOFT(AL_RESAMPLER_NAME_SOFT, i);
-        if (Q_stristr(resamplerName, "spline")) {
-            Com_Printf("OpenAL: Using %s as the resampler.\n", resamplerName);
-            al_resampler_index = i;
-            break;
-        }
-     }
-#endif
-
     Com_Printf("AL_VENDOR: %s\n", qalGetString(AL_VENDOR));
     alDieIfError();
 
@@ -472,11 +460,7 @@ S_OPENAL_InitExtensions
 */
 static bool S_OPENAL_InitExtensions()
 {
-    ima4_ext         = qalIsExtensionPresent("AL_EXT_IMA4");
-    soft_block_align = qalIsExtensionPresent("AL_SOFT_block_alignment");
-
-    return true;
-
+    /*
     extensions_table_t extensions_table[4] = {
         "alutLoadMP3_LOKI",
         (void **)&_alutLoadMP3_LOKI,
@@ -488,6 +472,17 @@ static bool S_OPENAL_InitExtensions()
         (void **)&_alReverbDelay_LOKI,
         true
     };
+    */
+
+    extensions_table_t extensions_table[] = {
+#ifdef AL_SOFT_source_resampler
+        extensions_table_t {
+                            "alGetStringiSOFT", (void **)&qalGetStringiSOFT,
+                            false, },
+#endif
+        extensions_table_t {NULL, NULL, NULL}
+    };
+
     extensions_table_t *i;
 
     for (i = extensions_table; i->funcname; ++i) {
@@ -510,6 +505,9 @@ static bool S_OPENAL_InitExtensions()
         Com_Printf("...found.\n");
     }
 
+    ima4_ext         = qalIsExtensionPresent("AL_EXT_IMA4");
+    soft_block_align = qalIsExtensionPresent("AL_SOFT_block_alignment");
+
     qalGetError();
     return true;
 }
@@ -630,6 +628,28 @@ qboolean S_OPENAL_Init()
     qalListenerf(AL_GAIN, al_current_volume);
     alDieIfError();
 
+#ifdef AL_SOFT_source_resampler
+    if (qalGetStringiSOFT) {
+        size_t numResamplers;
+        size_t i;
+
+        al_default_resampler_index = qalGetInteger(AL_DEFAULT_RESAMPLER_SOFT);
+        alDieIfError();
+        al_resampler_index = al_default_resampler_index;
+        numResamplers      = qalGetInteger(AL_NUM_RESAMPLERS_SOFT);
+        alDieIfError();
+
+        for (i = 0; i < numResamplers; i++) {
+            const ALchar *resamplerName = qalGetStringiSOFT(AL_RESAMPLER_NAME_SOFT, i);
+            if (Q_stristr(resamplerName, "spline")) {
+                Com_Printf("OpenAL: Using %s as the resampler.\n", resamplerName);
+                al_resampler_index = i;
+                break;
+            }
+        }
+    }
+#endif
+
     for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_3D; i++) {
         if (!S_OPENAL_InitChannel(i, &openal.chan_3D[i])) {
             return false;

From f16bec1e0a8d25af337400963e7016e127c1f6c4 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 24 Mar 2025 22:16:53 +0100
Subject: [PATCH 2001/2040] Remove #pragma once from uimessage

---
 code/uilib/uimessage.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/uilib/uimessage.cpp b/code/uilib/uimessage.cpp
index 8f69e225..d2cdddee 100644
--- a/code/uilib/uimessage.cpp
+++ b/code/uilib/uimessage.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#pragma once
-
 #include "uimessage.h"
 
 CLASS_DECLARATION(UIFloatingWindow, UIMessageDialog, NULL) {

From 94cc77b848e395cb6aa44691dc7612bd37142a6c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Apr 2025 21:33:16 +0200
Subject: [PATCH 2002/2040] Set cmake version to 3.5 minimum for libmad

---
 code/libmad/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/libmad/CMakeLists.txt b/code/libmad/CMakeLists.txt
index 6524ce5d..3d3e16db 100644
--- a/code/libmad/CMakeLists.txt
+++ b/code/libmad/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5)
 project(mad VERSION 0.16.4)
 
 option(BUILD_SHARED_LIBS "Build dynamic library" ON)

From f9db0ab8f90dc45a1abd29d14ef7b96ca80ca587 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Apr 2025 22:07:05 +0200
Subject: [PATCH 2003/2040] Fix an access violation that would occur when
 opening the logfile before com_version is created (#708)

---
 code/qcommon/common.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index e7dbd31c..03ae938c 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -274,10 +274,13 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 			
 			logfile = FS_FOpenTextFileWrite( "qconsole.log" );
 
+            // Remove recursive count as it won't be able to print relevant info
+            recursive_count--;
 			if(logfile)
 			{
 				Com_Printf( "logfile opened on %s\n", asctime( newtime ) );
-				Com_Printf( "=> game is version %s\n", com_version->string );
+				Com_Printf( "=> game is version %s\n", PRODUCT_NAME PRODUCT_VERSION_FULL PLATFORM_STRING PRODUCT_VERSION_DATE );
+                Com_Printf( "=> targeting game ID %d\n", Cvar_VariableIntegerValue( "com_target_game" ) );
 
 				if ( com_logfile->integer > 1 )
 				{
@@ -291,6 +294,7 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 				Com_Printf("Opening qconsole.log failed!\n");
 				Cvar_SetValue("logfile", 0);
 			}
+            recursive_count++;
 
       opening_qconsole = qfalse;
 		}

From a9e161181cb643cc86c508f27897e82bf6c9e554 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 1 Apr 2025 22:41:39 +0200
Subject: [PATCH 2004/2040] Improve compiling documentation

---
 docs/compiling.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/compiling.md b/docs/compiling.md
index 07c335a4..41b4f445 100644
--- a/docs/compiling.md
+++ b/docs/compiling.md
@@ -37,9 +37,13 @@ sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libop
 Example with **CMake** and **ninja-build** installed:
 ```sh
 mkdir .cmake && cd .cmake
-cmake -G Ninja ../
+cmake ../
+cmake --build .
+cmake --install .
 ```
 
+Usually binaries get installed inside the `/usr/local/lib/openmohaa` directory.
+
 Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compiler -DCMAKE_CXX_COMPILER=path/to/compiler` to the CMake command-line.
 
 ## Compiling for Windows
@@ -50,8 +54,6 @@ Visual Studio (2019 or 2022) is generally preferred.
 - Get OpenAL: https://github.com/kcat/openal-soft/releases/latest rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
 - Get cURL: https://github.com/curl/curl
 
-Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to use the package from the link above.
-
 Optionally, The cURL library can be compiled with the following CMake commands:
 ```
 cmake -DCMAKE_INSTALL_PREFIX="E:\Src\openmoh\openmohaa\thirdparty\curl\build\install" -DCURL_USE_LIBPSL=OFF -DCURL_USE_SCHANNEL=ON -B build
@@ -59,6 +61,18 @@ cmake --build build --config Release
 cmake --install build --config Release
 ```
 
+Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to compile the project.
+
+Example after cloning the repository:
+```sh
+mkdir .cmake && cd .cmake
+cmake -DFLEX_EXECUTABLE=path/to/win_flex.exe -DBISON_EXECUTABLE=path/to/win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal" ../
+cmake --build .
+cmake --install .
+```
+
+Usually binaries get installed inside the `Program Files (x86)` folder.
+
 afterwards you can can append `-DCURL_ROOT=path\to\curl\install` to specify the install path to cURL.
 
 ## Tweaking the build

From 3074494131cfaeabfb9fdba6af2a46a704b2c49c Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 4 Apr 2025 22:53:06 +0200
Subject: [PATCH 2005/2040] Convert the game version to number once

---
 code/client/cl_uiserverlist.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index eca7fde8..a202a3ca 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -1048,6 +1048,7 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         str sPlayers;
         const char* pszGameVer;
         const char* pszGameVerNumber;
+        float fGameVer;
 
         pszHostName = ServerGetStringValue(server, "hostname", "(NONE)");
         bDiffVersion = false;
@@ -1061,24 +1062,26 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
             bIsDemo = true;
         }
 
+        fGameVer = atof(pszGameVerNumber);
+
         if (com_target_game->integer >= target_game_e::TG_MOHTT) {
             if (iServerType == target_game_e::TG_MOHTT) {
-                //if (fabs(atof(pszGameVerNumber) - com_target_version->value) > 0.1f) {
+                //if (fabs(fGameVer - com_target_version->value) > 0.1f) {
                 //    bDiffVersion = true;
                 //}
-                if (fabs(atof(pszGameVerNumber)) < 2.3f) {
+                if (fabs(fGameVer) < 2.3f) {
                     bDiffVersion = true;
                 }
             } else {
-                //if (fabs(atof(pszGameVerNumber) - com_target_version->value) > 0.3f) {
+                //if (fabs(fGameVer - com_target_version->value) > 0.3f) {
                 //    bDiffVersion = true;
                 //}
-                if (fabs(atof(pszGameVerNumber)) < 2.1f) {
+                if (fabs(fGameVer) < 2.1f) {
                     bDiffVersion = true;
                 }
             }
         } else {
-            if (fabs(atof(pszGameVerNumber) - com_target_version->value) > 0.1f) {
+            if (fabs(fGameVer - com_target_version->value) > 0.1f) {
                 bDiffVersion = true;
             }
         }

From e05114806ab18288544a063cfd38b589cd53364f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 12 Apr 2025 22:10:53 +0200
Subject: [PATCH 2006/2040] Add a simple install guide for Windows users

---
 docs/getting_started_installation.md          |   4 +-
 docs/getting_started_installation_windows.md  |  38 ++++++++++++++++++
 .../windows_installation_sendto.png           | Bin 0 -> 79572 bytes
 .../windows_installation_shortcut.png         | Bin 0 -> 19664 bytes
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 docs/getting_started_installation_windows.md
 create mode 100644 docs/screenshots/install_guide/windows_installation_sendto.png
 create mode 100644 docs/screenshots/install_guide/windows_installation_shortcut.png

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index 1b367547..f84c5f5c 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -1,7 +1,7 @@
 # Installation
 
-- On Windows there is no installer yet, so you have to follow all the steps below.
-- On Linux, you might want to check if an OpenMoHAA package is available with your package manager.
+- Windows users can check this [Quick install guide](getting_started_installation_windows.md).
+- Linux users may want to check if an OpenMoHAA package is available with the distribution's package manager.
 
 ## Requirements
 
diff --git a/docs/getting_started_installation_windows.md b/docs/getting_started_installation_windows.md
new file mode 100644
index 00000000..a446adb8
--- /dev/null
+++ b/docs/getting_started_installation_windows.md
@@ -0,0 +1,38 @@
+# Quick installation
+
+This guide assumes you installed **Medal of Honor: Allied Assault Warchest** from GOG, but it also works with CD or other versions.
+
+You can get it from [GOG here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
+
+## 1. Download
+
+Grab the latest `openmohaa-*-windows-x64.zip` from the [releases page](https://github.com/openmoh/openmohaa/releases).
+
+## 2. Find your game folder
+
+1. Right-click your **Medal of Honor - Allied Assault** desktop shortcut → **Properties**
+2. Then check the "**Start in**" field, that's your game folder.
+
+![Shortcut](screenshots/install_guide/windows_installation_shortcut.png)
+
+Alternatively, try one of these common locations:
+- C:\GOG Games\Medal of Honor - Allied Assault War Chest
+- C:\Program Files (x86)\EA Games\MOHAA
+- C:\Program Files\Origin Games\Medal of Honor Allied Assault Warchest
+- C:\Program Files\GOG Galaxy\Games\Medal of Honor - Allied Assault War Chest
+
+If not there, you'll need to search where you installed it.
+
+## 3. Install
+
+1. **Extract the .zip file** you downloaded into the game folder you found earlier.
+2. **Create desktop shortcuts** for these 3 files:
+    * `launch_openmohaa_base.x86_64.exe` - *Allied Assault*
+    * `launch_openmohaa_spearhead.x86_64.exe` - *Spearhead*
+    * `launch_openmohaa_breakthrough.x86_64.exe` - *Breakthrough*
+
+To do that, **right-click each file**, then choose **Send to → Desktop (create shortcut)**.
+
+![Send To](screenshots/install_guide/windows_installation_sendto.png)
+
+Now you can launch any version of the game directly from your desktop using OpenMoHAA.
diff --git a/docs/screenshots/install_guide/windows_installation_sendto.png b/docs/screenshots/install_guide/windows_installation_sendto.png
new file mode 100644
index 0000000000000000000000000000000000000000..069a18d07bf98e6a0f32522b82f0c760b0069319
GIT binary patch
literal 79572
zcmeAS@N?(olHy`uVBq!ia0y~yV76yqV4BFm#=yW(Wg?!*z`(#*9OUlAc=M!AJp%&+
zOS+@4BLl<6e(pbstPBhc3dtTpz6=aiY77hwEes657#J8DUNA6}8Za=tN?>5Hn!&&z
zUNC1@pbY~9180FpWHAE+-yslY6xHx*U|?Wu&kTtuiSYHYO3u&KOH9d6O4X~#Enolv
z8~cia#N_PM5{0DH^vpb4_4m8?t1D!t*s6z{`WpBaIHzW0dQ=sq23ProBv)l8Tc)Vn
z+wpSQR9IEy7UZUuBq~(o=HwMyRoE(l4YtZFwgL(3E7{o;rKDK}xwt`96s4ruDrJ<E
z6j<r&mzS68l^g5j7p3bPT3TA_8yM*u8R-_Kr0Et{=9MH?=;jqGLk)0AElw`VEGWs$
z&r<*yn3$AbT4JkITAG<+m6n)hnv{}as+*K(oT6)Jn3AZQm||?Gn__I7Vs2_^VU%W=
zqy)9TBr^?Re_k;(7?SgI^+7WFhI$4dCxh5l{zaLoc_oP;EA0$z!15?!Hu@lkAUVtq
zA`;}{W@n=h4;fG}!9zDSFU3~9T;1MIXUYt228O@SJY5_^D&pSUt&Isu{b&F0dWG;x
zNv($llby^Lq;_e~c;|HQ$-7AkQ*ST-F(tF4dBfZFuB)yF+<ALBPvhnGup8Ti43+b>
zvZJ+F7RMTMm!+~^Yh2Tk=P)<XC}fRGOJZI98O!$Kb90P&%(cwdKYx7CdB?fZb;Z^d
zd(VH}$Je$w{k&D-L<t@?9yuEcwr0n@9U$<lbK5qvEnBx9eEBA3d+~(@juIvr0>8Vi
zB=d-C|By6F;mA)>Qc_yPc;sctqODs)W7lM!n4oy+`y1mRf5|0!I|O*xnDdjsDvsT@
zd$7Q9o!+YLUpx1d1~$z<*v!7V8)QcYg8;L%|DKi3S4731o=al!cX4qsF{l*2QE;UF
z-1NTpc1j?ysIK84zaR+ka`4oF^mSx7?9f=hOU|lf#jX?DqN1V|f4^QY{Pe{0tCH_x
z_x@vVx8LvU=-~JY(yg@1BPuHDiYr&_TWz7zCFfb}@7Mj-{r92WKH=V;${ALrtEx6G
zJ8%DArnR-z!`u7tkB^V9c6WAkbi7bX_~0yl`oXMOv;JpiWgVKL8N8wJu^U6f&7837
zuLEN%ua>5!s`AO(^&FS0<_V7}Yz>dU9$PMJ_v?l7jI(KM_AV|iE_+>~qi65(Sg2j=
zs+7-D^>k`@!Ohg^5C8psfBgIX`t@=5vOz(7{J4AU9mSvV?90x1dwV-4BrJHeddrrO
zz~x)ETv_WE8#{MV-;1N-@g=K&zuWzO)#{yr>y5Lo>6D7TI`HUdx1fZ?3cYE2e!ts2
z>-zQR($Z47+ta<hy$^Tm?^~hwPQ?HF`8AQ7O-@%Q?G}$tNKm+R>C%;>6(5g^FD?4I
zm4k=p&8NcEw=Z43`+NCvmZ~3r7n@~Y)7k!6NpAfwi%XX-nVhc<?|kn4x;!equd(Bc
z?UxJAUF*4XpPrh!V%@qh@z+%^7PfzQZvQ_rR_Ern-01Cni+Amk(hgr2BA)&0^Zfrk
ze}8{p-Mu#~Hdc4;_s7TkSBpPh*e-X;#{BNxb>?i02i9)C*QGwMg6a15{BV7BS#B|%
z0}GwouN?i`b>rd6)vG7(yI1vEcgobMo~4&AT`G7!xBSs$f4hmVYCfG*-|=$U>^oNT
zH>aI-DlFW%Xs^HB&m)h0^~wZ5T8>t2PCx&yd~P#$p+74t>(0_|F0ZezcMk}duxm%S
zm$&!fNvhrf;o<GK^LG30-EqI_``vQG>TfwYcXx&EJ+XM#E-RZq9}d5IB)7Hrx!;+2
zw$ktSeD15d=o%aq_3ESJ$wjW+0WmRaG;VLr7H80?JI{DvU+r&$;%7dtk>R>=dn8_8
zUmyO*FM40i&gcVICqFq@=)YTF|LzW}*9+U_oU*dC%<}K`oSkj1Y-kv`dGp=dHNW3(
zpY^-)&yT{IUoV%xdKCBi>GXKFq$DM?{Chn0_4QvLb!T0ue!sW<_xt_w=WRaoEc2V&
zC8+GS;`M~KudlBwYih2%|L;)zo(jXTbupb^zLdEB?2$BH;un&csktrhZkJW>@-z8+
zzlzCKJ`r50qpQoiIsN>xZMnCX7;RivCA|pb+fOHye>|D&Z;*V9=jf&{UrN@`bNj9;
z{%GDT+iJ72H#ZjQ*{z?u?(@QJ+r%Cp>kStFUTt0e&ZVfxDDC{bx8DjLCaqe%+Br8@
z_u87s%P$YSN#f$?KfbT_w@B*Iqeo}hR&P_%5b9sA&XoJ{;o;-*^=mZtzuk8GPTl#h
zqT-Lr#RJnr!o!o_+}Oy$$vN><+POI^f9%}8>tUO;i9FZzsZ$f*+}H>TliT_GkIpbm
zzH)T$p#{<Tdqvmp`PB8L^zYZ}t6xuO^PH@f`1n}w^RMFn=Gj&YNJw;)zP{#}8obQs
z;1tc^CG)SZjcz}1z~Rl!&F)&S*X`P6_2%~W^@r7uzTfkiZ<<czB0aVi1<!kqw|A9l
zPntC8%2k_NTeHQd=|o;ioS@7W|7iN3m&<-^37)qvJUo24$Nu2{mKDLDpB%Ze@xbQ^
zRppBBGz}91%I9p}v}r@l&mvbzlOU<9j+1I`*8l$<f7Iyfu2-MmbXLXwG@WajE%xp0
z?e?wN*OfM~UusS}J8S8UX;m|;;;-DEd|&w0({6G7uqEcD?LT(TF-&HA^ytxs;^%&)
zqOp(aI<9Djze=8@9~>X9ySwb|p*J@-gYv!PjFtAmkG@^W+*<YZ>G!!+_4jMP$DTd^
zs9S$uhxPkC!dtg)<+$Q03No#!sY&GR``g?3v#+fQWO4of_kBGm$-hkhxlcE4PlQ(e
z_q*jAD?TQ@+;QbOBSYDn8;wt%q?B%){p(lN*<$A2`<3(7<z{ATis{GoY|Xx&^!nP`
zysy=VT7TSiy&}2Tt@o0wqhP0I3cu}_3DH_N=Kuebezs)i<Kz9H{C?=)-`^iEIP+`D
zy*TxHwfvV;(=(SgoNR4rd2pEDzGU_HXS4H_%*?_9*%)@0zrS`T{KU8LKURg0T9S5F
z$UK@Jc44Xe-q^y}!r2THCQf`<mS^o<%kyf>f%cX!mX)%mKQ~R)4&U{E?tEr;z7^db
z?)86L*Z=E}^Uuv)d)#Egf&~gP)@3|PmoDYt;wt*hzeoA#(W7#=#oylA>OHY+d+F;i
z*Yvd4*VfLkELMB<>eYsnlR|e&F8elIXsmd>cKe31w^1vNzrNf3-pl^_)vJk5PfZPa
z?)GL+_h~WRD3#pB%VRpKvwnVh+SRxD#>z1JtLs*;K0LSlp5{`SeP6Fd@A!Pqdg;^6
zX=e|enyS6@^TKyM`#+zvzO>2T?x#!PJX=j&-BRzRcedxxf7JQ&&CShAb6?*L@3;BX
zu}D}#LgIy)mSOfa9i6Bx9))|a%D%LIzb80qU&=|LHBno=qPA6hOk!bW^*lYl{$J(G
ze?qpOPAFgc^iDvY%|Sx-#`gU9>9=%rb*H+89If5={a*Fbr?Ro(y4GcH4!qrdpN}E0
zF)}lA<s;*-e?FgQK9ufj!}jq`cb}Z?sull#Jnr{Cz31zP!~BoeZofBaUH?6f&mgyn
zY`=6VNV8)yyX)`o@7+^UR21H9x8dEsZCjY2Pshu`QYp=uNwxWI6>{}|3NxiQr=JgF
z$v3}SB0R7DU*#3f`MN)C)%I@#6+#LnpTgF~RK^9n>K}Qpr<DKm_itrWQ&CAt$yswB
z-rZgP__DwK)SyRsJ07xWCRo<}u~@hNUsdMKv*!2Th@Aly6rZ1+jo4GM@rtE*@E%Y>
zs=aQ9)2i7MCqCS$yVWrH*n?-Y^TU?hdv|}o{A6|iV=Dp|i<EwUf4|@Seob)J|8=|H
z1+lQNT)DFA@2S(LgV*TG9e;Lq_QYAUy579WIa*}9yZrqzcllbCwX-KqY<%-3CnP-l
z@csMpv(59_THdaY-5s`fm&+czPwQ8$(#rh#@$vDAvu3UGh;R8|?fdTO^!RDh{O8%+
z)YX_ezgaqO$3fd4g8!2jb?4vPQ@LXG>cd^4+DkT_I^`7-7UpHYK4K$NX=&*U^Za=s
zWp*d#=VjYEzSa3D9RG82u>Y$Nf9s=tClB-6uX(|6ex9xL*RNkMo%f!mGx6VMaqEmn
zE2jN;624}C-QTLC=?@;Z%TJrf5MTLp>WZ~%Lv>zvAL-j%@y{&p&WfKYX^)TfMr=yy
zyb>tv{@Kghd+E7(e`MA~Zg%@6=ajX`<BiX$_1*K<tkGE$voomBcYf`+$g?H3{zuL&
z{NrsGw6c`v(-gmnf9iJp{dRk4^@1&1M1FsJ8!YoYcl+IEW}g<8=IwTpOK{k6{^(E5
zxeM*~KT2P`Zk^xfIV;w$o>j5#$nPiW_CGt747fQs7+St5=I9$32rx1-?wYUu)AH|0
z|GGshu3t_&H%IesG^lbFd2*t8QSI+<iZ(Vf7d-rD+g6+P$y%%Zl@SrSqI~e^=JR&i
zwesTP>T{dL<7)&rr=Op;O;AFjL)ClQgZ=;it}pRDdj4jQr12iEEgioWPnaN}sZilz
zD)sr<?EFUu+2yCy?Rz>cddW|dfB*i?u&>{@MMp*DNUq4UY0-HT_vveEA3ke-e@#V%
zcD%izVc@U2XJ=;q_;x#g>HM!}=2!~n@B6vzOL1J>yk{%?<KpHm`up?qbMJ$P-`(A9
zSotaCXx+(vNvHdMD$7__^@n!<`t$Sm@5k$Qzk7A%gkZ}94<4^42fJVV{eJ&A$O@0}
zm^~GSc7HxNzf51zr>&&qWW~0&ctgd<r0);f_msc5ps1p%n)vuw?+la7NmYgOMFj*N
zOk>}ld)w^F%6aG5SXnFgT+GhSE_^yQ+-t7P#?Q<Pi-Xmxxz@Pety?hRT~K)Vb2G#E
zdAqjc-?wv3U$Xg%GMj)^-uAm?(xBpM>goRF%VSnlXFWYN_0o|qYooU(9c*HKrPZ*(
zr%vzN+uQ1;Ypz^(=&reY>sHkICV7s=Wpj2dz7xEq&rx<s=iKs%HTGYwO}}6NDtTfs
z`<E(yF)wfL!0701P{CBFYb7nvb!3X;+U&)pKJ)f`K4%@26`7E*z~qxETUz5GnFF))
zc5yatnzCBbIPJmD=kupuo6J6E>823ppB`_2DzJr@9^zOm@ub5saPF~;-am;KuC0wO
z{PH3&bLR5T;u^neFA4g8zYA(mT+e@fZS5u7?<dvgdwlmy5Axmp+Uf5*rB`cyetw?(
z`PtbY9}e@2)^hz^;hdGVN=akl@{-i_^xdpFpE&>Aul+tZX^Fe9?R(d|)22<BAmB64
zM)LRf_tS&Ee|e^znx3xh=BL1&U{!Uo!D=ZFgWp`MrR$b?+H#pzeaTqQwESGq{OFG}
zp4<+4-~C4>doHu<htKz_-)k<qc`xP5i;Ec<83!gRyI<)pxqAKj<0mI4?|8H6^p);i
zYwiCp5_fmDI>o*J@3-4`FLk&)3NHMpnIAqcs5&cN&%i+7^mP5{Ov?E|-)sW+NBX^4
z;8bB1tG;CNip#Tiy>_}63~CWyTO0lHQMZ28oN!hDdZGPa=4G8`X8Snj<oTt`{T9x$
zs#v>z{rfAw?p@+qk(Hf&*J@tXmuufeKAd1Z#q`UHe`VyOKUQD2g31OK-g}p%L@!G#
zzR*axyQ_5d?eu3qpU)3xNi$A6GhrII3bDIib~|^4aM1Q6Uk;VuuMMA=_2Z=a{1e-*
zeSWfk{u9S@x!doy-MSU!x=XQzU3cQdiI@JpJX?KbbIM7fm-(+sr(WBu&^PDg`<1fR
zWhFnV_o&C5xF72hTl)E|IVemno&Qu~QtEXzeSWRl)RXREUuwSJEq}Erue+ne!PArT
z)923{3m!UsP3pY%qBE>rz9H$He`)E~DN-8tb@?lsmrPdof0ei0`pWZbw-5L&5uM<9
z@O=9G+P3|F-{yDp^@Uw~p$e)h{(M<(e{}x8FY0Szc3xV&{{Qd&{|_(moGjv;VVnB%
z)6>7d#Q$zSZ`bWES9#>|<inE2X&Gg6yjv}$KLyS;&AyiK_SV*2{@b>mxV`>zWsugi
z|4-EIC)S1aN0lC1<l0^GT>QlOR;#JY)niUnYXx{rjoe+fR%xo&yKlGiug_hsyzJab
z>#$Fs)%<ri<~%thU07I{cf0n_$K%yCeN%7joEjhgv3jqAgI|q@!v5t)D|M<ElfrZF
z?h5^Er5m|v$>sIa`ntP=_jCrXTl{*}w|BeWD`{w)cw5u?eA|{SA-{w=m9yXP`@OED
z_vn4auV24fl)ahph_UV0!jo@qZWcXw_}AChqNlI!+4){cS$SjfalY*iY1=-Oxm2EV
z$<1ABV#V_CR*73xmDRSqyRW9b19c;-L{D__>uq^;?PQSnLPM^XXLr8n;{Lh2`-JrG
z@9)b``~3WHnBTDKONIkS%azY=E|2EO2YPyTChfd+W~TAShwbuOaqBizf6sHByG|hZ
z$*NVWN}k)FpJ~jlzyHssT@nKK(pKKn|2b!#u)1Hun;RR01Qy!G&%0Ce`E1u)Ir};p
zP?`F!u59YHop-n8O6TqSndWM1`|#nz6{}VS$=u$SdpqXfc~FlheO@J-v{_DpwACwL
zxtb4-fBt>nfBf(F`~9G<kg&Snkq-|KFP-1cFW=WGtnOvMeAzN3OH0XSwy!m1_t(Yl
z{`FPA>Z9jcE8DcUx3+dIzx?v$%dRU^4;*mF+_Y;Cvj&^NtCC)DN|?j6vDPrv?GLEG
zlXhlC<ADPXpgJ+C?)~2HW!X=jKWvvjmXmmB^AFYcce+v^wLEs1D>!-Gjtk$fyxo3Z
zZ?3y;Qq-hBcTUH%DeOBJ6QeeNu>yY#Gc)tVsZ*bRJ#iLPVQ#zY+ATJBx@Fj_>YC$y
zvU%$jzCC%|Zy$E&@}nc4=Y4t9t)ImvF`>7wEN%AoyJfRYp1c2<RDQ%ZHhk;X*VkXO
zE%lzJ;}{kurm)AvDaYR~-nFhbd|gbZ<e}AHvQsllK20&=;17E8az@qd_MCZ93)-hR
zar}3@mbK@As*#b<)~#DF9Tw$Soc8H)AiK}K3GB6xuK)Y{+jRZLs09X#wC=Y%+<dS2
zb8B;s-c*Zv!w)ul-oADE|4!-E3DfH_kEiiXn=wP9_Sn(;m7ks_9oSUyF=@}wXS0JU
z-IaM16&1UtYukLe;2bpJYHabdGY4bK?=IDwc4of4y!oAi=0_Gs7M#0(U%s=mGw)^X
zqM63&NpEg!ykz8`e=In9PsPTh-H*IEzXW~W<@Nf`uiw9S+uB@u{QkZE-X6!8|35xH
zHn>y!{qDKwyq&BUFJ2Va`5*}z?^zMNYSpR_U$4hM{_ybdk9WJ@3kV7_a$Ni=8XnWg
zDXf-oXGh@-v)ox#p`gK^T_+%8KX>113%xX)V_SV~rJl|GUDeL}zu&92sQIyBS485W
z7S0`CuSH)y3L38|nP~W9VfRvh$mq?Laxm|?`e6ak@RQ(IC;0eN!Ut!NdKYG<W_gfJ
zN>T!PULPKp#C<5&0VxjDzi{o^GQFb5B~~}%mwbM-h{c|--8mMbr@{PSzj<lLE|6%?
zGtgiYn_T|yhNKUVb8D6IW2fx@tZXE~BVkivz{A#D1+iK<H#avUJNtEsf^o(L1s*Ar
zj#}4OhT^6_6v5W-3efYqB@I@3vGv%4_6`tWV}ba?#YDjXqHYmmBj#8d+%HWJFD!Ka
zV+|g;a=G$ea?aep!MnjucBvJ(d=F$~M}`AjIl}7_e?Wc~yx4F6zs(mbzdY`@U)A05
zi}l`Z7ndvIhCdXo`lF(wue!SYWqO~hr1YwrShK)>MH&$_u$b$&eAfnZtEw*=uU@@+
zP+-Bp(9F(%>}q&C@8pw9*4<L~IsHrM|JJ!v>*6djRsQW$2?%Vjy2mbG({Me$UY4QY
zxNLa>xJ6{UYU4)1ef##kN?K&s|J_Vb@T)7^k}ylggcAzPdAqVKw%w^zT_<H568nD9
z1a_NdHeRQU3=Ov)2}TBs!bdE2zuy=;aI`cvH5ELa8ony(#a|w6`_|&OyssYFJwCR-
zu2ub6Ory1W{JOX+uR#Mo75{!d|G4}9Up|HpXN=D$+}xD9<6+z9@_#oSm;CF3*xpwB
z{G27@gZARwAN%Xg4kX#P^G}akx~@EM%9JSzIyyYlV~RNYWUbqj-TOS0?Va0r4(=#?
z46=RE%9Wh#{BkZXE-kw{yN^9Ac(C{Ty~DrX@9%GGWBZ!KaNyir>!lCW_4N4a>gr}#
zm+QUT^VyF_&L$%EZ<BTDD-k1O<Bva|&-Z@*_n374kxx%gFSTl$I{(qB)9nd|*Di|_
zW%&Et{{O*WUteE68W*`ePj=m|Rq1xjws#%>{P}$T<8u4IocsU(eP4LD^!iHi$IpE4
zf0=b&|7*T&ZN9LeU@S+_2WCYEsol@Kw=D4wy0**1?%$7O7dN+6-KL?Tp^7FZA+a?V
zpFDlKaLpPXPft$+soqyd85$Nkw|gD*_x9%A_xqjoo<E;X@A&m<^~Q{gN~K@9->qCe
z?~v*BnC9K@c5zRSt6EuQXlH+~=k@&6j;WtQXZ$~PF;1M}?cLqtp`oE3US2`^m$u~I
zHtUhK-sT?suxeBDkDt%yKi>I#-r<$O%MG%wXxMzak(|dE5HIh!=R(+;h{pVVKiy*A
zh<<HuXk4ZaO0A2ypWWG6?DtbVX!V@ENB7nKp2OGf{PF6wYs=PM)BgMG`u;LG%OV%6
z_4nuH75V+CZ=YMro4&+o`DM+y`77^jzi%a9^T9DRTm1Ol^80Udva*7v%+1LvRr~XH
zhOxrm;^(~QWy{Xp{4w?Oot?$!yk7I4)4pEwu4eP5z`*}Wn<8}1sn4$oDy*;m^{f8>
z`~Q~zzpk%eIs4_b;N^ZRyLUa=eBQ2DFLu|JpEuLzTfX1*TJPxjqS(KG-re7SzY^4c
zh`(YirW^I-%<0p?;?~MaN^?Nf{<@f*mv&}cRQmeJZsGEGxk^flxL2Ov`}S;t!GjCi
z&sH2RlDe(sr@8OmhB?QcAD?}7b&LovFK?INeDQy^Tw9k%ZCLnZ%A$F<Rs=5o@b~-u
z)!q7B?S~gie6%ds!f9^zU-Ve749n^K=75hULVrAHEM#ct43BBL`@P@!RJGX~yFblq
zrgk5{e_vkRZ%%;tYpc3H7JvT!y?Ru9uEir|`IkH2?Rx#;Msoi{Q2acfU%xJHY4EF8
zuRgq3-2dps#l;p?Uo^bDygr<>e!pUM>56sh&b^*^t5Hc$kI%aNUC5NF)22OIwR+v5
z9!cX3X=kN!?(d7;IH#kd<J^2Z@jna>skO#=d-GVteD}tDEcHH7AhYFb-vjq|Ije>B
z|1KB2{pd`^*ZsW~rPoaBm+4#Hes$#Tdf9{VNyn3}#@P4l3aR#+beMBa)+^cL&!0bU
ze|)@O`_!e&mreJ#e-Prex3_nV%%3oO_Uf6B)Yu$A&7(zoHotoP+A#f`%**Eo4mjMY
z`~9}d%J$`niOR2(&TisPJlZAN(cS&}(sc9UQ+fOUmeqW@=-#zy&z?QpVk%j4!`B)q
zDJ^PT<j-cW+h-PIb!36wv8Q&;7anB<i^rF&4>M7^Q=^%;JC8-_SbW#?(^6MMtM>Nn
zJ#KieT%)e;ZNZ;{b-eHE{wddmSIF$YmB-3Z^YO0bpQ6)&Hipl+?$~ZEKf^3xRife6
zC({|c{FeJ|K3S_JKWjnR?f<{(9w}2Vt=GEO*2TUS`_Zv(_dBaK(cArE?`RsQojI_2
z{k|^oxC+O;91H@IlAVQ*k0svOQMdy%{PZbwb=bpJ@wfv!3Lk@l-^Imc0c0%saxOQ+
znlSBcd3Uw`?kRm87O{5S?-x$d+w)}0-rc#mR6qau?=v%v-3=#wyXY>jXl5qH@Zk`*
zzQ(z!e_}v`X?cq?_4j;W3R@esbVYo4xcc8U*JhvFI&HGL|09rf^K7fHbZ^MLZI*L;
zn{RB7ZS}VYAmNjf)vto)pRBH^H_zYq?EF#nk3T=AfdZlC<6P~pYqzfT|5K@YQhM6u
zii&3%HlOZoH%PDP%>8fMEAZcY<LhpDkw$;7l=o7WA3uLSTz<cHxn5cEqa&ShGe4Cr
zl(DT6IePS{gn6C}Xu#!D_4~cz-|tngpCTkKBC_N~P5%9TvhMwIM^}Ze4hRZr0*z1F
zR*CHYc{YEERhDu3xg#x{!W&9ohvnSeB`U1ubKuNO<EvMH_3qeV@#g-1`3Xz+u(Iv?
z@4FskZ2iB_^OqLy&AV&G!o~(l-IJK+yuH1B@wRPZ0+)Ec-V*xyt$6OVX>F$2*B<Qq
z{Vv$1=f<{N>7d|X(5Mwh1D~u_%kOu)LF2)WQBku({9Ig~=(>LRe0ZlBkK_}(MNYBb
z-#xcay0YP5#mh3~u=BFb&+}!wrH{om$+A};-y@fQrT%``thVBcC$`qddL){ZR|<dp
zuG(1fBt4m7!F4vf7f1HYe|)_E`>840`|kX>zW&2W^Ykl685;ceSvJS#ef#H|mZVU8
zT(;apSyaCE%S5FKKfkW8U+eKWYGYFCm)i7>xu3f4O4{Gg%ohl{A6NS|l;J=lGrNGe
z`0{m39M6CCS-+d$R+p8X9T*kWb>f7_ljqMDuUp4g{OpWlK!AXkxA(;P^Vi>=7L#vz
z9W)KsDDtPH{(1Vditpi4!PiAY|94C+{$ud`)x%5SUPm%SuKroE?pF5I{};Mm|It4<
zyZc!3TV1yp!$r0G{5RZJ-D~!t@!TGHU3I@X2SmeT7V5qG`frZ{L-|{aM`8@MpUz6&
z+4`7c-k+Zlt~<@|)&0)h?)j_8_N)1Xv~zPRFIqnqS9;6K@NV~eyD8JACH?;P7Ti4D
z=pyq~a6hQ8apOjWh`6}2y?wk@Iy;|?Lt){@<J+E89o~8E(;;qskK<OELBHomfW|yS
z_EmgLT3K^xiD%Hx<yX9vl$30n^?n{sjQP}lSYr1x?<tYzm7dqH3%R~f@5ATMhdYJU
zKm1vnTzI=wS>$vcr(|Pp`Am`2MZwGc5}%xy`07#jEA?gGfis1Ac3#)$XJ%McFRsLD
z=WqLUO4UbK^RzP(NAECHvU~sgTYkT`ePgn<yhcopd90~SzMj;2j)o%#o}YDnTzEP3
z@YU5jDxc3S7g?DHa(zI6fWn#ZiRDJ|RWDWVp8VC=*cjv`rg?UbrEtI9uNB8lOuz0F
zV`XD|G&_HvV_~5osDJ~NfEs#w$IS27EWRx!C@7dI{UoNk`E`HJGXF#B`}eV3|M`2x
z>j3dHbFIZKEiJoFev`E<eI-&<TwH2BUHsOAgUyBC-b9veT(&v=eA(}*r=K_P-@iZU
ziMyS@!@s{DA0IbN>(TCAzkVXS1A~?54+oFaRbMW;FD+U9=uy&|$jxj5K@Yd(-`CS+
zeo$z4evW0aRn0@k{369m_Y~$lzI7|AKQrt0_Wa|sOtY61>;AV@sF$Aa@$VC-l9JM=
zzJo7IzTKMnUB3R$#%KkDj0*}mt1VhxgZ0CwbeGB4^d7ye_fLAa3?KWwipRWvKF|Mu
z<?n7=>+*LkiBFdotlP_2SXd}wS)`(*tSl%m-+!=qYrJZ$qV3l!!8@MK$}YGbTdw)<
zUjMC|o6|oYlg@u|T7Ul$`TsxMzdq_-wQHBuZ1enMpn;CBO08S7uRjXk|4Ve4&&)+}
zS9E)Odp~@Advp7JkWm$%PO4u$`s2xL;~$mh%zvaG3XNm8bBQgr16S{#*M_s(tE#GU
zaC0A4ogSk!l~>AyBR|6L@wL}(JNCZ&RZ=W{Z@pdff8MKnJyptvKVJ5}dj0z2A#VKz
zyLL(Owg0>SPSU2rz{$yJ!jvg3+UwuMW=>8&KksOM{qJbdM1|DO0MJ;&hvWAD1hcQN
zd;2jwc5}1GUr|uo=~Z`C>4)MkF9NSzz3M6Z9yE5}CY^U+VgBsE$op@;nb)@Q$+fIh
zn{PL9m$~k1??2bC%?sLAaLMCOE$8R&=iC4Pd2WAWSE=@^*RQX3GbozAd$;@ju{DvK
zuXOL~m34Wwz9L^(Ffjhg>Sp;x`}z<9N9>Edz&#qIjvKK(j*FEhDJKL<1q1gVsGi-?
z@k{C7Tv*@F;uA)95TB_Me6m(Yw(kXZVFLFb504f8s(ioxzwNx*Z;>|tems`2ELu`!
zDEL(<Y_(|G=Ezu|C!+W4|4OgV|6Wq^Z^k#bEB-bA|9<!I@@l%7bL?@yec${2|Knm?
zJ32Zt9FjjcU*Yd)Ja7B`PV<o?E`Q#Y?@wj`d3nj92kk5RC$rmazgMNrkZ`DllcxdH
zr3;bxBk+~Ev$HekfwB;@!tArlG}M)pl%!UG#0!<(`;Oe%S$y?qg8+l?3<JklAJ8HV
z1w+jKq^-msnM1|=OCDZ(<1F<wvSM{yC`heT%YXmW_|u>IS8IPQ+VubT>+eZ3_s9qQ
zYkR%p-v)8_tEcxIs%usMy?N?)zx#XJJ*NMVtWx0JZuf!hoAcvhw_Q~RKNuO5*IDk8
zJwJ8z>CTRh6V+}<*83i>j=uEq-n44LFWY&g_{FbQWd;Zsh|i3kRG7{X^ZSQ5ciz8T
zt9!p6$Mgj2ES_gzyz%e8osnhosmFe;UL6!4vS0l4Kc+SJlwzK5b(7HyuRnKUvK(Js
zLnL>7=dC?^Emp-jxVX5)8gTZn{j0j}XZX_BocZ(9T^9V4k5^anUsG0NdapzK=zQj9
zkIosSihf#iyjgz6^Q4PA_&3C*SA-hMXxknYnin?p{ZXUDo5fELT>PW+_TjBx->NPZ
z$O{Sv){7P}r}b`M5OHEn!T<eV1m;yISlhM8?$l2GzrXCq|J3q-|4Xl4joPO3Kl&z9
zp^Mkf{&i)ci$kk^ufA<o`o`kkujW@#Q};jgvc9t8->>V@um3IN*303_vs-laeBOVZ
zllJ@H?pLm`b+wiM!!ToJg?`h&Z?m3V*qvnYE&l(6s~eTg`6KqJ%D(?=CL;e&mG^aF
z|LS-7&L6Md|HdKyQea+m=0P1p*$3MX@NJiF=;&DSzv%z|5+S+C%Pm#?ULE;AeeTcy
z-<etdhWTv&shag)iB0cR>gmLT?XS){?CgJ+8Bz87weRgE=jF@wc#gKS-@2^!U4FxZ
zXRXDCd;xL)x9(?I@^ALNuM4`fh2(BeYKmMceMjDb<JeKP(?Rmi8+Qfo=l`|;v(O)g
z$scay_nxQ?SGJFwwPb7T*VCsve%$AfKe9n{hosw?S$cnxcxE@vPCP!bis9@1MPW6Y
zzB)+d{q1Irk7R##R9R_JqsuhCWxwlJ_FVrTU-s<({Q#FPO*6*gjW5#6u0*z`KCbVy
zNW8h@M*M@cjg|Q?-{$*ovAxjhd+=<~ttW~i^11f&yI!x~w=C*<a}{I#ouBR>8C%L2
zSQvh9-p;)LZ~PgS^~>*6a@8@koORyw>nVGeXOw1#ynggG&4q7;_ipR(-_g<0@oVKT
z|BoL9m5;HPeEWZC-?#s%@we~qOA>nY?|7f=&*OzA|K(TAEo?S;wYW^iU1ajMO53Wf
z4Lc+L*}ENGF>lEqUYp+Pk28|&1lFsc%l^Pzf9L1y_(k9JH!TnP<QesK{-ejrU7~x0
z4a6Kb@Z4BvrKBX4ab%1BL(X;E|4;w+<^Oc2>PLH&ue?9nSI?>J$e1ix@`U+~$TZor
z|J(m{Op)9B_ig7k&d1BznU+>>*evo^xtf8&+Rjd4&S$WjZ<=1+C09~7_5D;|Nz1<a
z>9-1dBb8gf=nGuB%d%(Qq|Xw6wzw~uw4t)&ID5s9Mw2_gnq(d2=7+s3-20WSzWAw?
zmRgaZpx{^TO<$(4|7$$3_2patg3|x`b6ZZ#KN(+f;qw3ZUAI>M?Y?l$i#u(tD3g)T
zq2xm~3!~*d4p+65DVqA`*H<sfbvh8EBb9!z{c+vGD%nkfj@PcYWNUG6DqYVW8<LnD
zsQx$aM#G)L@4L><zde7ito)&-<wswCYu{^e>b0gJcpzv3sCOs7`YPAvneVHYt$X?E
z?`C^z-lLaO8%_8g?gTsR&u@dhp5g2Dcb1g=JNNzsc#T<X&DZLU&L0;sFKX-rkCX-O
zfBMVXe*3yD3DbUrnJ;4O$;@|gaS@Mj&y;kT_u=2m`xUjjmoNT&d?KtWz*p{<Nc>sj
z727v$npjBfKh=8`-<fM-(~nNy>i+SR^!o*8K50fpMJ-t$y7KhZ)u%<2PEKfXdimQU
z<=TqZR}_pdHK>Fy<-4L_9JHQyZIS6uyBD?oE-qI-+xQ-9RTV$EQ|zUCbs(Ej*PE{S
z#ob*KCI+^A3u5@Dlyc%)@kRx6OYv7h;?`Y8Mhe+c%Xu|kzj`}AZs(E9`#M5O-<*29
z<%!zi-0wCy*C(yE+E;hz@n2<u^Uc3YUuba`O|E`a^DV^McIo!F{pHucKl=2kcvbki
z3w8hAx=MDP-}HNH;Quvi7k|E<_(3_V)Z)UWBECK|_FFQ1TefXku=VP~b=Pc7cW>CN
zBFMe?D)*L<#{nl(d^o;slX37>Q{rWl;9+w~lMB;VRZ`mZ;>}mH8NO~W(~}!G!)AZj
zzjrT3bdF)i{9AGHDfSV3m$w9zZe%aJu||z$Oa3Wm>9?g{zxl7<6WtRm*j6O7g}H%M
zH1**OF)bDwr{!MtyUVWJUUS0V->s;qh@X|AwpEt>bmNAVZW7De7@xAIHg3AmxJ5)!
zIkGm-Mt5>>xzk&XQw3N3{qo*Fh$^~$I%aMZchThH0Jev_JW@Apd-L}8wC$=_wNFi*
zmid16uHKl4mcNr<d4KP}_Ag^?|GC`y1s8wMc{MfLaz^);PX<elz7AzbSm_X1!Lul3
z|K?qXUO!mAbEhO5Lv^?J#^;mk4<|5qoz^N?_HxaxRnxsD2tDF*;bFU(;eSM>Wkpt&
zrcamS)wZVr$33f_Iw($Z3NqMvfOGlf&X_kY+jemY3I?uEb-y^RsO9YSS27VBtnV+m
zzwtuC$+L~RWp=m1FXkWK`>r*~<qC762H5X>69n#e)*2{jnQ}))MxHq3)u37L-R|G>
zoA<Zl6lI>^-dB7pPIUcYdeFE=CuQkTrmo`0nKQ+#yNoUc%1u+7^IE6l@AV5mzI~RD
z3u{oS)_Am8NPy2c>GGxtPp@6vs$gy_zl<eu@0N%gMNb^3iT>P{xh|FS;f81LuSs}r
zQ83>tlbGow&FSDMC@^&vL-4=6hy=$xz6legSe3VYbI-0VWZ!f1pTm;xmRGgIH!Ioi
z=Xq!tSkRw+OFm)8tP6PyjrZ`?9a<LCzT@_yf}g2}A7+#uh^pr)b?;Yrywj)VpX=6L
zyTp|?EW9P!VKLV)M`ZETNzNbc%+fY}_tNvKMx2`by^Gr7;__~xN7!`4w+ZjbF%`O6
z+R@QbrCEJZY)ZTBg1=WT2VLxZaOA7Vo&!_bLMoGI<-WMGH{gxyi5p5KM>cOVSnDLg
z$<gZ`wkpis(_dp*Yjohc9)@4KyR&b&TiCn#@G^fYKfU{9+7Ua2IrhmSNr%>E$S?W4
z#i#kN!l|_nJ1*|B*LkGj$#?3?=`A;2CpPDl9LW8hcBJcI{R@+p!);Yx_uYJ*7+f;r
zbj!p80Y}ssEaj{p&b!uLep|ldi{0|7r+H^Od;{2bZAwj2n3d+#D4v-w`_bx$;9sq0
z;vN5f`exW%?J!+E|G-LN^@5j6r>|ID>idD|h--?nfB89oUL)nljWNsJ9xM*^b8)${
zeZ}RYF`2PnZ_LeaHMPHcRnhx=`_)<fUwV{oB)SJS@+JnGTFuXUqfzwLE#zQNnDnjE
zt>4eDh`uL#%Fjl?N>?UT^whoJ^ljObp8xn7E%tQpq&YobYP18w78-jcy6^RkRr|DM
z4f8jplqU?F;6&!U=6R-stxn91bsw(2yx8<^o&AOvwSHeunMy96Fe|~SZdZF{<FS<-
z#^nM%)eA2l<Y)Nv<FO=<B+H*~8=p#8l^D$NTfWOnoHhC8E0>hxE8?mGCU>53VrYFm
z(Wuh&&Lio)ML$n-H>oESd2(IjetRv&?(7zGC8bxjJ!&(S_N`*w{kd_&%D|54<;N~1
zC7K;q(lzCB`|UVo_MS7%+uykD3yWQA_T^R9yZM3p_el3Jszs!J4%HD&U3b9E?D_H4
zZ*O%61f;e3`CQo_p%swU=Q`_8-AOO!H9L9U{`I@5F~gwf^1OF1GH0?q4r!TrI%Q=d
z({A3d%_pyZ+$!&~GjwOfWJ3nE6W=b!wJ`aAcG<#_yW?&DjCa$fGCZkxmGFA)`_7ts
zlkR>0JN@4Cko7U)88(-aa!&;AKjWHW-%*tP-TrtiSDjj0O!t-J(;hCH|5xOE+M0t`
z!(*4OyHt8n`r(>;4Xb8+`{~eDk>F?&P`rcdL|>-9xrD&X$i>m?vLvLrV;ZL(OmMJy
zG~=6_i_6}AL#~ya4t*2!T3SNBGq||@S7m+o=BwEP9d{`~0rlMMtqa4$%m05lwOiRl
zE;I3|hxoSn%`D%)Sl@jcH9`Abb(Niu?MD0BhNX*m(r#WZ6IWi=HZ#@#?pcGI+fJP8
zwc$N;*+|zd(a!g`$7F5OLc64i?{}3&=NNb@+piOGIm*qZvarLyyH(eHPu^1w@7Ec>
zv(}j@+@AmBj*>`f$LDKKhVd5<hQ05<_UqMO71q7ySH|sRKei%7WyX=fT#e^{mP}XH
zS^Il_a`Wcq#Mz-MPk+2J|JsUfQ`?`vLn9_{j05*Up0~2@l>9p5{>q>FS+*D1zRHR{
zQ4>F~<YwoWEj=shUt9v$=U>?tcDygUa7j2<K=3QCY~P<X^=Z6*^K4e?T{EfrlA%+d
zG<DYuP$#I0)qk<|ylH}8`DNK4^ItB18L2Vl1@7Y^O;cf+J>&6PetD(dl<5CwqUP9C
zI>qWp+E($rixuMEd~;14sORS5awQwubXfjxi(9Nt<)`nf4XVCm+}Zu4jt$gR0jc=v
zaqITo?{~W2M#nc^%?i~A&kHKO65S>Hr$@?^OMl-78^3uropXHkSBeXRo%NM#E??cZ
zsZkrg-~T_guI|f6(TZ38*&nXVzxE&}c=DokPM}J9;)ykZwf#;ip7*)ACMOuEEDQ*H
zqGfy_!9XD>FtUG7?B4gC9UWDQ-g=WJPo6kuPEU{0?kdeUu96<-G@5P;dFxFo);%?U
za<QUzqw4jm>*8*IGAn_!KDPMm)X&@Usv;|RN$~NwDT-5fZ?$HKD4IO=yYu#l3A5)k
zDp@mB3mP4Hzk9X%?M2*&-xg=N2fF=!&-GLH`p5KuvUtX~xlf~7Qs2H^b^D#x`sVrm
ztM?y#*Z=MDk(0q07KK9f`ggiNojQN@>K9gh=Z%{sPB(?#*9JAD7@XxMtkBSR3E~NO
zP;%&{&VeUWD%kX0T(0;>PMFQCl9H;Zt<AXXkM63zg{-?jZ@qNpt%lYH#j?7LYW77;
z9N{6FPJg%Pq`cgwo9(=P-MxP=r@nsE-4rLwT~wUY;Tybt<+{aNV-MtQR<d!lX{%^i
z75?`88&{1Dt;%=878IV_byA}B%9;=t$*bIZ7QT8@wtDTn1@CGm+wDESQkK#1&~qJK
zv2Am{DJ<VS-_bkI>eS&&6GZi|nQ+gq|GsVasn-wEPb_e>C|<^S*?Il(Ui+CX#=hwW
zDIM2WS8Ga~?wVVW7qdb~?~HTVBPSPThD94|m^T!QFP2wQdeyEYs=+;9twhMl&|XZ#
zUPJz@218Qv!*5-Rpt3Qk#czpV;L6AoUGtZ%N$zo)a^<(dp(S}P_uArO_x`=Cef_pL
z>s+gERX5Hg&d6eE2=L+FerVadC9m?t8O|8QZt?qiG}S(WujTCVKL$_#I$tTZnjhSv
z6!IrFk*C3P<C)**7wpwww)AjV6{nKJ)4*wVrTlZ*H>;{lZ0*Hoj@N_FXYqwACIxkT
zDgMxMQo}N2?F#0OmnBJAcM`t_DJd<AJ0F+d9C<C;fNe&CX!W0ON;w;kD%53F*G~MK
zVCi$&s%o89di&Wdr-n827v6WP2K(T>*yE6vg)-~*?S{4!m)zyZtp9a;>*9N9u64Vr
ztz!PCA3s>6kh4ng*vdqQpN^4TOAIb0YC5$=uUfD?wdmDFp|@MqD{rM#O9k_tQiu^>
z>2qz`-rC!zOw<>~O)TqL+_VU@U8oRj)AQm;`iBI)OQ#P{Q0x7Xu_0uEPE5^#%cXJb
z_GizYHDI_A9n)ny|Bo~qb3jyBqp@%L)lmIOPAaWS5{epy{gw;wywRCcDypQk$nJFC
zBHgDPv)5m>+>lVd@1&?i#mPytnWNv-L`rqlNxv)A7g1g$$KhOAWi)AWaYIYr<+NLz
z{wqx{J^W?++i{Asgkdnt1SRcH+zsq4AxawOdY7k0z0o)&5HxjD%=73s``eCfpa1{E
zCMJ=a&Vuu&HWV06J-K#qwqstEolnxNkSLuT%TEfYyJ~KmT;J4E5b?P@dx=BjgxPU@
z28N+pj2aqDi-Lp`PTlA2o}o4qrGa-q<?P#)Gt_pkyI04y_QZL8=L#Q@JCA35dvNlr
zwnOdtl6lt;`rnxHTA(~yL~nnNh0I#Mh}ZoK-@On_v6<d^e*XoD)}0r!_!es=F;ClF
z^jKg|&ep7Z0)m2p_fz$6HGSH^zGZ$@l$Mp?oE`I;#AjTZ@=_IFGp=7dHE+R^`kg`d
zmT^5l-mx;#;a^^*`Q4ry>@A<udz^Zd=3cmL#QUvTV|$yj+v|T5;#?*+8+|p>{Z@5D
zq34}r_V2VrKk0@GnH<->8aG`(yzGU+bWY{Qg&qD3MOIvkO0R>OZwq<?SFTe?k7Au<
z`aGcW7tbug*$eneQco|jv{w_!*ml=4j@^Dy{Lw#57wz|R_AZy&nD$lJqVy4q-rg@l
zrCa5e`V|K+KM3kTi@z!{437%8EqflFc-FtX^u(pliCdp3+b-rPd#K8qxUSPscEjQm
zqP{DdB-fg4d7brse&F^!)>GzID3nB5oYI<d{+9LT*vU4>*WWMNE8x5<eA48J^YU3w
zX_dHXzFDz-<!P6B(@GD-weY-j70K)fJ+E)Q{!r^%uK2lfx-Z`SVvfkL5wc-9vunO%
zvPh7y&k6tUADoy$t)8#9zlAMtmS_0!@wl;s5yy|W$)^oVUL;t|^(&n^Pt=H0@Mh(q
z)$6%8+Oc*-3#^%AEn>qs**j=MT!np^@3YH3)yhhX_8re?ihQ*qYJ;^r$84$Aipq2y
zU9q%col8NB6GHa9Sin5(?uqNGR$pz4i#_|-_|^3CX2Sz4t8?~sEnRd*^u~#2e=4@d
zRts{S+B3i6?(#^qc3R=$H=KKLw9`a)+~Qvp^P06a>lnifh1>qsf?P)`<L(LFD!48G
za%}@=!*cVsm+N57v>8X0tmlh`WYk{U^OL9Tn6mD*Hkq~8e>m^yx5_xojkB$`xoP^s
z9Sj|Y5(x%J7+9m$pX@t!tjQ(i_>Q;=fqsi+dqIgexyLDsX@c?+ZpDM2vm3s~2R%3!
zm(P5vXo(<Wq0pu<>8jGw@BZueSUWwQC>GXNlK6X8e$%D9>)zzIEO~zTitz8t>=9b0
z5~lS|+bLmadPYau)cA19Z6#~-PbLQbr?*J7{xo^3?7QyDk)Iu|`(EG5-FWhz&I_;l
zpgjo=LR~*V9kwH{!}>OC>D#vcSr+rAzn<rGodVk|@^wW%i^}GF{g<(J{XPF6gKLW&
zY{KvU;gMP#G%-QQee1$GpC`wGwB3Huaq#BB4QE$fc?xPVTsb;x-k-l(YfeV2*Si+b
zq2eqjW@XN`e!ZHK(xP*l70egQeYQ6J@48m~)`ES9o9;Yenqgu+aUQ6#6)W}g<+ejM
zDegW@>2C!D1xwvE9_^Oh^2J5k#iiD{UD^Ki{K)3X>i(;`O?%~RrB2U}SgMy7KDqP6
z1d%BUOwy~i23-fW-d_CqXtL{Zrexs%3yIK$Sy$v^=79PIpe=~pJ>a1nK|%cOFnl97
z_|{Lo2>GzN=&2WI<A{L-kAVaaXm8qvtgBk3rr<W%qPXL$AEbYOch^9IN8-s3q2ja|
zh1)i=q)U4nq_;`7U6YdFVS96LZ}eU%aH}kEePV&tT))zVF)l7FZ9JJrR=K}#dVE~?
zN5=Q#9yJA=3<|%WuAO0AFUHm{(QH~@C%ks;J`GLHKyycMTe0L~rOeOD|9`(5rg$hT
zH8C3$mgsKVyNgx1cHgmn=RY4F3)uI3`6+cf?ru}(;%q@dnFd8?slbqsC3$V2pzL_D
z=(EHh&<eiO?|*O#<?ZKLeQgix?Va)kMJXElR{Ug(zf#jYS=l+!`a5&j+DdND?eT3-
z%m1)!zf;t`OVUws5)Y`sI6YqDUfzBIPc~*A&(>G03=Ol+cu4HYaz8gaw>sF}IdM`p
zUs#ITl+~}cE)T!ATSP50migzt)BDz+bV*s>zw+_t1$+6Q2Os~<lDL1$?xh>!5`*~P
zRP!1s$A11j<@=0d-#S)2k1U!vXAXDwA`QutC)cg-QQDo;8NzsS=OL+SG5w`)Va?A-
z>0P%kXGX8zw^zeiD_nkZ(=o%>x!&s*e=F_Zx_{E#&EGyJI_4FzmG~)MtX%lr+A++z
zH2zlLl!-cj_%<no@9K|@f3$x4y9>N^^J+eME>Y8Uxcxxw&%gE63D)14>wYLoC^Ij6
z?EYK)$HjlFZfris`R!Q_m%U>LskmUagL9=P_lGBw{a4L?ovb7f_;rih^K}BRgR6q0
z;uR+)ZJHSIpk;G~WYg8|->YW%*u+lla5<a3K(RuyYwppAYm?O%Z2o=W@fYTv7p<Kq
z&P`@DGi?uS6?${$YTV9e1)@r7ty`|YTr<nZMarolW2>;=@()wF-@MARS-POU$Ax+J
zhxzra0_!yNz)jUuM2mKftShV8k#qc|rBX!=EO&Q_y*ao26gSHzvy$!0FK^4Mg|u5^
z#QFoShS|y%w_V#7VzYgH`I^5|9?eNr)IQttOYViiw&3!x-HX(3Er>gR_&tm5v^ynJ
z+LtP7$NdqREjU~4-sz1Sp6;-}^FrtDgXe$0-*>;eGHr_dZZ7k4(Otja)rtJy{XuTc
zuHSlFERQcbYbmz+-9B!R(4F${i+2>>3j!%ET|VpMzu)gy&wgF3=HIr+n3F-{jB{C%
zlF-zp;*l)7E+2o}n^pFf<<Yd{$~nhOcQ{lXwtK-fv!!Fz;Y%LzXV=Z0u_uwaU`3S9
z!F6*T?li4)Yc@U6<A3l8le(GP>8|GKi8KGCD_QyXba<V03j1RcS}3w;N!(sRwarC_
zZ`cF#x*VqnHY{aIeR#P=K|$nma^t7wPZMV_DVT}9QWMF2k?X%cckeF-24f$$pXak~
z9nZ0k;5%}z{QflQzu;uG>2`wYY=yaeM@toVHQ4;~D@fNr<-jL2L2BveL^HMnEYh#G
z*0Gi}<$VZ_j^@6-@qEFmXZags^&Eb5=ofl_NX)5!9lK}e`(h9VvF`}gNIX>D*YdWY
zarL{6=L4dnSLdBud`KlSt9Qz(#dTV1CVrZtxuiytrz6D1E^OIrjZO8dj0IQj?7Ot&
z>1spERNGtOYaO3m4!yCVX5pfFuQ_+_Si9uguT7s$oH^VTx~2a*^HH-Sk2PH;DYD(v
zaP;bUp8U~cb8bmZpLK-3re;v3-JWar3i;y%*x%e)>h=8cqFv#;3Vf&7yluX=cWLOd
z^0~HmuYcO~E&Fv@Ka0MDOxYpP$veN5UTWf;F=wv2OtvZCRG(ukir+qNk)L&aWtw=|
zG?k=8_r|_^>7JketUe#ee%!-FcEjN`Q$>es?i=KF+B0XZUY@vq`$3&<HqhWq?jr*q
z!EHB^1nfhjbS7?J7^ReZKKZuL&wn=q^EWHm-wl4{tsYsFnwcYa>wCePzhN&-TB1L1
zbbW7gyL-aIsckCS;mgE#x@8s>AH8x&W{RW5{UFuECw?2(Rh78^x!DwR)@((6@&CC?
z3k<|xK27wP>{eqEp%oyeXEWy|+uaB0*WcAA9lt$a>8mSukkLQh{VT!^s?K%)__^q5
z#j}~|g=Yn%^$yyFY~?*JJpb&G7utT0<o~Zdd`L6-<6(aL6|+BUR4twn72I$nC;xJf
z*My>sh1q+XT&8$5dhr@5J8v*v7v*(5v%V^}Y0C1(nC+!oT#^%$%$B@aG%NN-r-g?6
zGI1r%6!k}|TL0=Z%saP6@Kmh-xw(GoMH_{0ZrW;9zUS1oIaj3vM1?!g%*x0q5mOKp
zyb<u$Wn<d8=@&LmVbx@F?#YS&a%<Y!^_6|raqF{!^yZxFeX-*I8@IZ7qH}BVOW)4Y
zsJPXB=&Q%fm<4;bZ#iXEJNN07>(^FF)G;<B_{@k=;`tKtSm4nH1q&%|;nf8@*bZ?#
zb$WT{_51er*CK|T^Vmhc+Id?&zyDUIw4}%7NvEngyIH0Si&NHg&RK=sO|q`hrv%O7
zS1+oQes}w`Ph`Br)t4@>x=%<XG?~_KpYSZ{_`#yJUrhIYvz5)R7wh`5#-wHH^6WDc
zHz@6As8G=6j^uo}sTkV-c$EO|e;hc<HTxywOPTiWl^!1#Iz3QcqQ$wgY~HW+>;49B
zcl<l|`F+K(C(oxV+NiCnJrcCfr((mzIm{|w4*Xpt{YSz#jpfJhLr>m!Yaj1BWbrto
z$Gq2VLM4w|k6d^D@%t@r7l$X@-RT}^{L{{+?th`kJ`0ZG{8a~==EtwjJ7-*YY2Tvc
zdlNZwBJ{o)i7N>@9rv%u+8bpo(Q%+HCNZz4MppLXY4ZiIGOw$=KlD{|#-1qC^=>n=
z6<H+=Z)#YEyw&Qz!BF_UY5Ll*Wv5D?Rb=xm=GwIU!@<)VtODQsD06uc!6oarl37RZ
z-G<z~#dkhd&C(2?rOdQSYn`I_LmT#FN0|wm;#M!~TNfuR+5cMr)W$YEHIZ+vQOPH(
z@<}G|mmBckoUE>JW2^LyovV-4?(2V7_aa7}LBo>e{Pr2=(mmh*c|BKI>6OZL;craA
zvy4oS1U+1seDPe|7S^YU{2BI^S96@xt9MzglJClV7&iBcDeuCM9^G3N)h#7Yo{UZq
z{+#CYc;eJmR|B*1??2x7t=h?9h8TBrpACbN@;AnZds_XRcg%1~S>Mk4@NMIILoUOI
zVO#iL%oH>WeeQCLf6*POz8Q^`i&i?z{`G5kz0W6r{m!P;OLOFfxvCP@&B*)kI3suR
zzW+D<q<wCd?ohiu_1v{r1ql=GOVm6xmR-*Fd*RZn4c-r25*(!0&Hlms>>StRtydan
z`M4ZoVD(d<b1o~VBOrW7$C2g#T4z@5TDAA_nkgD@c7M2fQTWZhnmx~>KNyL4Kle)B
z;#jfJ#nY?9BuI2p5R=Etn0v3Dm<GN`kZ(yo;kswSzNNus`_^wZc)$EZfv8ZchDn8^
zOhLx<qJ941-;^sDA1S3Qo;P<{;lHit1O-bc$+}8LH?VICnagqAo9oHk;8Lww+M#RZ
zc7I;G;n{9CmPwc4{j^@QFWZ*i-4?igpV;KQciq;>A*&1)P3X$pP_=cP=7Dz)BiIF!
zMdUh67q4krnOb64@!y*9n8p&d858Eed)Ueb8Y4g5{At}q-nuARzL&q_S!264+izR&
zuVQm{WVW>3)@_TP`fx|hlC>zm#(3D0`2j=JES`!NjY~I8vkIu?P)+LcJ*)R-O58HB
zCQrdl7h4Y5yq`CZTh=^$Rd6|Ibp519r{~08mJ{Os2U0R}v@4j@rY~`j(OGe_W>@X~
z(*E%F4ZYvK?Dnyl`}SxJPkzbPx9iqjp9pHK=QwQL^Z3o0V{PY3j_fY-eX{3H`-9Y@
zEA9z2YTdlBaFNe<tMZTg!noraES4y!vA)&c!!fVn<V{VFiD$oGywC67v@xetX;X5D
zqnEFmk@YUVs^{?wO7C@?@Sb+}gm}E0f_lAY<B5!>ook%DGH=c0Z}IJQ+Vg|WKymBI
zoIcm6ERmilP$j%McX3^<C8!(tCEoABL{)LiZ4o=-($wdFR#x6Bzp8%CtI}W6-V+~f
zJ;;7~ZI@-#tR6;#g*-t$Df&*1Gjmi<2!lGarvn~*v$)4GdC%gkl@2pkv3)JR_s4I7
zuzS^3yW0ZplDmKWc0T6(;jz@ulRvI={&~5W?N8n>4T*Ls1_nNN>18*~AML*$*PI;O
zoWRT7bl=@n;_t)hJ64w1ziFGlB1%~E`2v@;YYZ1pZ)DWuFqBB>ux~keY4Xc&d@~Lv
zG$``#%JlL&7!elJaB`FS_q$c6WcJEPD}A~2V$sHpRm=*vr)57XGcgm}^1j;U(XH>X
z-z&cE*cPZduYJPYj@8$sOkZ}b+jjTrR~zj!r`=kjCrI|N77CsUx30d@nyqyCp`C|j
z3R}w(pR&8+QK`GG-@N_XN{U<9b}!F?t^OSo&O3J>JLJN!>8IVV-xnKS^d5>?_wD>@
zMY)Iz4_&WW{*QXT;&8Hxl4bQ?UX9a%f6jLIDDD2{&D9g=;oC4lZyK}8lBzci8Cw@_
zx81v~^!4fgVeVCSKC*ARC*|CgQE)V_c<J~1Z$Jh^&Lf%5CnZm2+w8IR7V4@{bUjxp
zcUo}TvbxkAC#FW-__v8k88m1l<bHEWrJI|}(U!$NIl&*Lic6)h$iMvWcOkvU%eBeV
z&P#hXq}TbbejhJ*q@1O}IsR6`)2VJV=B+(;YWANGzb(T(PM@+{d$eomb)}Eb{r<dq
z?iXXkA`w|6G5ybt4)y#`NAv6IblZ4}SV4=wO7=xem>t;vbCzS{_Nqm^N{jY6n*Z2X
zQz)`f`1r#sH_du>g;+Xlx&O)3>tB`lJx$B5>O8yVpT>1Za_`r4+;{6c{I_^r+5=~B
zZ)<N~-iObbTSe2)Z$0p`WYJm9>v!7CuFG)D{wncLy^K#uSy}LF_s)o|Z}P5ek7fQm
z<6*)bsK$wTu%7Dt7yCYdS7LRnu!nVDNnM`i_{-Wp_4q7<+B*ebi=e&Emj^BybL=mg
zu`6P_$R7zFwm+M%b)MD>42SF(dKFt|!T!hQ1cTz7k6lVXZsr#!ZE%bQts(2^Sn++P
z+=ZPF+KXYw?R?03vV85?#%Yt?8{g{`%vs}hxSY4ZD%zmtN5PiZI^CKxmko^)nAmvb
z*2GPP^dk4Xcyq$P{h)vLXGx3P-xp)PbM9NW?LgHV=^t@|9PZiLbrz*O|Ngo4NJ@7s
ze4KvpeOp9~)uW<RW^kywJa_D8vtN5Qz2TP94K41C_5bBe=59+mabY3H{*Tiwt{3r5
z6|KJbtR(5kQ?;1tvn)LPvv`YLl-gpSY2RjnbfV9{&iSy|`uXy+7ulBQ+UHDd{gLtB
zI>WY@=WsjkQIB}#V?X*1%sB0yaKxjYXLpLgta^*K^Y-=~mrdm#+-Nj^kWso~wlX*z
zcdaOCo<A+P)FL{(r~d!z`4Vq3j$Bx1Ct>qM=trN~q4W;n>3pS0N1oP6*c@SZZjWPf
z|IB$scI{FAcJ7aFuZzBV#vqd9>!1?%+by=vF19B(F5~%ciSy;Z<8DoEdCAD;!*B55
z;2Wu<iyl2)_vvNao8`-Qxo=W7v^5iUpK{d2MLh1K@Q?c^68_|;7=*q15w%z3n(Y2V
zcln<kSQQuWhvl8$edXHwcg;>+a^7<L0;r=~dVKwoPrLK0m{KoIDyw?Ubja@I8upU9
zdbX}jUnYF}z3}$82d%T~TEF)(SWIf3`sn-JtCMptwl4f!DPo^retKQ{@%fH7Ygrk7
zNWHh!xVOFf!y(_dum9(#7{qCWt-C9_>)`qR<64Q^<&WQJDCFSTC&<_s{4jqXqg%c5
zg)%<2bnZWHy@!@6AAfjhVtCSzr{RYl8Z7vhVY|wk`^s6tQfI|$I;##n{$KXUp_Z}f
zzkoig-qF*%H)Mi(nZNqUtk6GZ8@}>-?(>~_irfAzbcu6tDVg}@Ah$n*c31WXw?eaH
z`#;QBmAr$!Qa|J*H%t8Ey=U7C-`9SwTGp#<x#8T}W72uKFSe|Wmfuht+iLkb>w{Y%
zZ`}VUk}a#Zt=hltg5WLgGhyqMU;g>W!{J`^;o9`_gm2U9U;cb7H@{)){6DhW`@;1<
zw5{5Fd+oLthc5lMnYOh3!P?c`E$4R>*zW!yspH-6bW*?TL)9&tg(*g2```V#`|;T8
zl@^~`sxMrP+;#B$gUjuOiw?FuSiSye&-@mpKWzd&b0s<&0-Y~hD&kwK``qAKxxhMZ
zsou`UWC5dl{L1aW58S-gvn~Js;=H~UulHH@%z9b4<E0iu$FVu8sy}{dGiV%fpPzdm
zxbxsEQ<I8y)hfR;AM{HLfR-kfEEL_}Uwd&o2jd|doj<$*pElNrJk>vtKkvZRO`!}7
z?*BR`W!JxcRr19}`mu09_L3bBvU=t#)U3X~Ev}Z~KuQn)l>ciM?S6N4$JeJ>d*+pO
zhg|iY{%!gH&2@XYe;i%E@q_rOZ2v2zRr8PA-uVAi_{UqNtNBy>>e$v=*R_7V(XsVa
znakt#2P<USwl*`YQr>m2fAdR=zS?4erN93-p5JHFwE67w2PJcyvtL_UL`7e?b&JV;
z_3AfoZWjNzRV8&_&c1Eo55Zhtv(n<cTbKKJX6)M&pb@$};$*$pzVp|->sKAj-uO0m
z-NgP+byGXpO|M`4;9DJ=YJKS2_ZM51M(A^{3$*nA{pQ}iS+-8Erbfq>{$BOC`JZ9d
z{Pe#?v2(NHpGRfPQ=XVDyYj8A=UdH;aNPs?8-?d{d_U+OEo_)B*I-*&@%xwa4Xtf2
zHB-+9-_1ArnDRAiO;^ymMGv;Um-`mJ*-mg``I@cmg<r3}{r_`zv)Y5#>s!ygo+$I@
z>FfKC%s1b9-MvQs{h=Q_*DYUad$H}(b&H}3rZbPNGomlW$^VeLroVc_+dTi3`bD2g
zOGWGzm%b^jt7mIkANY-5A?eyxgY!`ge;&`@^u;al$x;h;?ba!azGXkkoH?g#)g&uZ
z&v~D&%sV!vrGL)U8)e(~_*}a-@msF;<vA@?)?0#QUMgwT$^Txr)@@$FU6ae1*1ve_
z{;<gXKF(yL-uoj%qfY+!qSkify9=cMY}vN;Py$2LtbK>Wud)|>_`Lq&kH?l4GV2Z;
z7yYwk!N=obS7fq}++4;MWAsCYq2lYI<`ZB26#uSZD9@?AmHV%Cn~+WP-V0mr^|?g+
z+Yt96<l2L+Hw0=5X3x0v<cQYGJ5wLreBQA9&b5m{9j5lajvx3E@BiD&Xxjbc;EXkE
z>+>0wd|B<Z=I2YlKcDU&s<Li48`Q91`}tMh%2Xb`b!D^ZjOpDq_lEvevoGg1$L%!R
z`}kUB`uQrG>e|LvQ59D13<5pXpST77w13rbQ@p0bWb}FZ!P0v6$Mc>){&3KrcZQq*
z^P3wSFC7nE(~8mEGPAOlYu*=;J6YG(9?b54b436D{*2OG$+flZ?SHSXdY`zzqhrq}
z(|grL;!5u>zmj?5c#m7yAo$nQ70a`8rz}-}cp|^<?Ywo%oFngl-E!mhmFeg5PD?*u
zd^Yaw3H!h%Rt|aogg@s68)G$s=X}=6xzF?G+vKc0AFH$$>`<FGE%T?;d)pUYp+&Ke
zrT)0>Xg_rM*81OX4()%iSNZdY+5TopeTiIR`{R_obA{d><o<5c{P8@;>%H^3l>JXM
zuhGi+|4Z!prqch->*Fg{-qsAb;>^XL{3m<e>urB-rGF3)O?dUwIHEPT{;zbJ{S=1H
zRf4zV=iK?rvf<9#c`t45K45otOZxF)Vn#7jhIRMl<*y2tt(5G$CT1a{TVN5>cwy$U
z;({&n4kkEj&+$t*F+s6_@9U$`>z7!*N$go0w@jO<zkBYLO724TRRQ058}iE@HZylt
zco;9$Wa_uqFY$W%I^*XvgDiy}ErtW3r$0=XlEj)C{VDanj2o}lhd2JM>VLa8C9YhT
z7w?`u|LWVb(H+(Tjqz@r#}`=a^LsPBO1kQK<ocM&=L(&d&&^g-EXnT4dUEQrrI2g#
zRlbCoRtJ8n3G>@2vBZD%JEJ+JS4}rk_w3!y9=|IY!ETG+O?*>PQxLuG_)e!^zt?Tw
zU-h-KW7oM|j}52%d1U!^`Mjg=t6xNHd0ivDPW@MYZ0wTxU5hRR{;ixL8M}0H+trJ^
zj3%Cc@OAoDE3d4%8Jpz`m+tu+V__ez{73x2xA3Q$%99J<2Os(=J-@+v@#=yl=Vqr$
z_5Bf6ZGV4YZq)PeDnVDJZ!4!~T7DAkd(iid;ZE-F$*q>T3`+S2-^h71E|OD{p2#`B
zx;^L1)!FACr0B#g2hHlWSlX}OFV?iZ>cLZqT?hSdKfV5-OS`AQg8lHrf`k_r9!i*P
z;qAL7R#U%>)qYN4@4pzUC8B)n4>EFF6F2aKb~q$HGbk<gx}WmspsPdLUSalEt3UoI
zDQ(@ifUR`?$$CGLKKCC{?=w{%GF`MjU-dL@qU`oK>u}w}r@#8yv{t0viWWbAapI!6
z2XeVv0!70gd@5TgzOqX8)ZuIPQx1G;7YLv5>9R-!-;xL6vtAa@z5D&#HFc$;z~#9+
zFYVgrbdNjq$E)@GOG?$=pF0p9pYmWMdvStjT#$gFxBb`E+POQdbo&|oL$$4RZ{^0X
zjgCM4L*Z-D`|F{vJO93nkI~;eVO?>Gf!yD0)qo%S&S{*yzM*cVo^WN<wMJ#j2+h46
zkC^Y=K3K#5s^99PB#+O5Tj^>Ezis8>G7SDb@0fAH(cm5H-3QNwE|>g}Y&LjQBz$h`
zmc$<)5)CY(6RiuyuDb7YK6`QUhWQz7jJgsz46~wd89Xww-@>~~B;4=!)LoWK*Yh1T
zsuf~V?7P*$?Nso!<mU>fdE$$O4$YbH^5$KC-CbEsO%r?jQ;I{(x<7j}FsS}m;BlkP
z;Fd{x-0!Np_x8=>`|jO-ukxDq^`*skWVaaGZIr10pUje#m1Q$W`Rbl^t`2Fnj2l+e
z&O7tt!O0DKc6)Pqba8JMloEO*^>k9ux2zAhif`^vj#58yVa;yA)lV2t?Kf8_`Nj6f
zwqEks>F=j6@5_F(zOGhDNuQ<dLDtH}yVxuB83Z>AeVFZkL_{gv>Vm0o@W(r+ISo$7
z2VIz)E3&`k?JJ`fTWh!0)$UZbtXLiJ_$m9nHQMU4KVM$^_ho<A{p0&M{U4lvR64Dx
zfBVMxU;SQYztno}Y*}ty6}2q!&v`+^hq-%}&Z`d&?_ICna)4!{?9(J)P%VAp+h-5H
zds=T2ewTc7y{ELq^pNO>oI2^v&(FR7lWy=y(&qc@!x8H((>?a|o7B~pOggCf$1|k)
zV8dTCbvEf3?prds8>a5<6aIg<@%-x5f+b4@ebZ+b{IRxflbXfI;H%qQ`0~O+hFcfz
zlyR=xQKQioU(cU*XJXqy=Qa(qC$FB^^{)OO+f%)+=<LPHZww7DJ9jXL?)X*t@ao~}
zNd~on+p?#scJ4^dp1Ps0rna>D(fPM4!^__kBwe*xYxQZqY0czL_WD^&+z-6I2d(W^
zJ#afZcD+kku5-36gEv<}f~`$X{9b+8KX(q+Wv*XdKJV+PqjRT!F1cg%wnlY#n}<u<
z-U&j_KFU00>fiA!ckdjD9_5=8e_Y*N=%nzdO7O_~BjJJini=w*6Sr&XU%wO>Yq-~s
ztM1D=`vz6%4?og1cl~}H7oS|cH{j~Km{LK(!0kTs?BixUdH0L^P4Ts@=Q#x<%m17*
zwNflT`~Q36o6L`LdkQZ9o}sx<ZTAn(J9{mUi0<ID|Np*gKjWrv)_I%jh2kyO*!jKg
zi+{LreSP=!%MIdrzqkc>YeF7a*}uJ>;@^Jy*#2+jcdX+6?cL#1+Z$WlxUKeKOX8#d
z31)oBe}dQjN`0vq5&ob>Q7!tG{K~b;mJyZbjenea*>cc;^}E)#h4+^IN#9ivGT(j0
zx@aG>IRDwtpQc~<Yc*|Yd&1x8{ttFeU+*~Y&Ay;}{BM`BODMD$$6e&DV|ehUe|h1W
z3gy1A+K%`8?Rzitno7L+BiPKgQ_FI$gLd0u(dh?oK66NTp>JrLr|Z`DDLa43{Q!1J
zm%sj3-^JW1K5zRfNokQ@<=d^-4JzyQ?3$sc_5Iwk^3xqv%g?dd@5;<)D0ta%I<e2^
z$O>sOrGz!|O~>L}1H)rlA1eDw*j-||Z}?cy;F^5$-<rgEg7@2*<~yyK80UQEy5R0F
z(~B>~_ceq1l2x;gKVWBQ>-})_$$a|`?fQ@GJsh0}J1#m(nANE0?M$)YvHK@s^>6x&
z0(Z5%ed(q0oHY-syr<W!bKfh>e&os;#?|}hO#W9S1L|2`xoop+ui(W4hqjn2z4G*_
zR$laZtvh6y->%1J`0p?NnIjw(9d+T_wQDQ=xC8_JgIVnD=S=<&)@ytJW^RVf&4y>2
zeKU$Ju5@>H>{@g2E7L2#iI?u3>N8FJwd3Kdr!FQ9dp@1g1{p2)`BwIN&{?nH;=+Po
zXE3{;SNL-(@l{f6&<AIiDYH*o+PhpSj;nrax@F6j11Uy|Dk>~$lR1^$dJZgbJhMxE
zQFrtHTF^nXdwzaAE?@ZVP2`qs+YY@fDLTh57#jjUiR8r|!T6#B3)(xXnAz-IuBfM^
zr5!qc-2K<7GiO4=LEZdM9S8XZzgBrq*E`xJsy$))^!8`Z(w;nh3fg2Iv8!a|E-gVp
z!HIex&8tJh!j$y&`M=*SmtVAaF(bppix+pi-}f7&>C`E&uUeomm?iN?AaMP*^z(9a
z>}sXT?-aH#s`>Qfq($v7lW%WsHXl0V^y9~m2mgM*Z{NS)zNV%|KvcAK*)lZ;js-`G
zei{|-&AhxUbDg`3i_2f`W_hJolhu4?EYNGZn&lcBD|>BibbG(uFOHixZ)Rj<IOOE$
zi0Q?2JbRWVV^P2$Dk|#X=Qr)z=kMRc*K99;ALj}>nB<Cmh3Fp(89tfqS08=8^nHW<
zf6G0aEqN;~wLd(R{@;G7KIiDf_4dup^;>6l=q)(h&d<C`A>&{ZtAtsO#Iv)r+fVE7
zmkA9G)zH;-t*y0<tNj}K<HwJLUteBY)c)GCMpZ#WgX3`9*8hzr8*`PElwQSK@zk9&
zo9p;?VXZ~XC#`>f`@=t;KXkod%e&$$wSQUvZPk}&x383a`ab>PfqUj34u3zz$0`_D
z-g)rs?fm^~HP)|Mb?E8z_`br&$23n}J>rmdcUNgfUf#5QX1TYPtOJcq{hf3C!SkHU
zl2^jS4u1Oh`b7Qr&_CbpSuG0pNG0n@v)mUv(3!vbW8~H276H51=l^|e`e${4@;>{!
zEArYpR-E1vmlqHb(GebBE4n&-{V~wVr@MBSy>$u>o}4sqf(6%?JH_W0E?mgS@ZqAn
z{6|+#7Z(@i33(qL7i>8gwOM|?ti}=d>idqbXC_P7<!HG5k}^D2&T=fqj!D_=SMm+j
z<_mug8`k{$>3F5?7vm|rD(1CoeHxV)&D)%LS#3?+Ua8B={oDKd`9X13`ubYp%}uFY
zRr0l81l@Y2T1B<PJo4LT8>MoAQi*Z;xdS<7hmRj;FTYp0JjoWc*-)aSdA{)dYX_@#
zNc{hI-QMuV#g2u}wFVU@R6oe(wwxDG*OPs9q~r8ogNhFRHom<qeb0nfSVwh7c`NSw
zv&iYLOoNk(q|(I5#d`Mh^^Te8Z~0u?^L%q{{_Stu?)|*Pd|ThA>0m;`!32jTs}>$o
z3Ez3JJGWw0^khj+=M*)oj78_8w&l!J%Jr4~;V|`<ntwLPrG4`Ddb-wie=L^y%xrq`
zBEvPdP&z7CIPkiu+?m6-wq|ckI?A<V$sVrmT}%w#c}9~a$Hq&#mVI?nQGcGbj=kgb
z-Roa(JYz^W>FZXs?p@?-74D+R#sMkp3HnZLKWfXrrbL${zNnGAZJ+=4`sT;y7rfcW
z#Bd{UisHTPVo$hUcg5QlTEAwqFEyQNk!Ibuk@2yBM2#{N)AB?2YnXffxh;4r!*fpT
zN3T??w|n2=rONA%d^o+n<#6JG>7`$9>|gJ2S0+&Xi^GPCt3{MFmvKq2np<GSZD6Sy
zXSMB+3iG^qA-u~kb1nxhiM{%I+vk|=0<VL;p0K*O>^-(}vbw>``mm(CyGn0tcxczM
zO8Z84fW0na`$+c%Ng*pIQHLE>vYo6uEghPwV(*%<b5sj*<virrF8bw9q4eSjv!-@w
zEUs!a51D&6Z>y{Lw13YpPMY1r6g=xgrSQ6Ral2;3k^$XBx13oQ+&~k2?;OL^U$WWz
z@{%)<a%}PcKy!DKf~zuap)N9FEX)ojVrtVK1eh|2D6P+8F0ysC5jtO*Z8V?FEXSdx
zicv6dy#d?5x>rV$$s&uEbe!Oryz}qx6<2gpj`~ktwQFO@0-c&!0s*Z_bvglc7v3#A
z+jy{UgAB*){-245ek!~&+k1X7tLU}}n+1Id);}e;h^H#Bb9#hsS2hAq@b9h!Mc(r|
zi@xOhGA=Lw)j!y*-~S-zv!#XX^9#4C`1-DiZP~W%z{OWu*45u+_HCPYZ2R&4M2$L^
z&-{>ak#Zgb716GxtJME}n&0}~`0J(itO=4g?=8Ec!Vr?K6jUtBYx=fy>RXQ6`d2c&
zH^vFYtggJ3{{7n|uGTB6+jqVC7J8ihZ}Jtp^S_?%GPzwY>l_r6^4l<b9((?_@D7z`
z#<nFYDw0VPdWDv>taw$HDQ~iF;j_O>WAu%TFV}wYEdH%@{jd5|akZ_>7qEgR^^>L-
z$Uje2Pf9dtIAoLJZ`bnm(Y`9L$j>3$)r3E`hb2E|daA{hcipwR{<oH4ZSTu0m%SIi
zTa><Hu{%|^bg%7aM|WFs>zpuQrjlRw4HL>H2eMc*RPW_Y3$9KDZ}zH^j@xo`{f$CU
z0B5xnW=RCp3A{~rk*M4#qIg(W_T*(F%ef({p;?n`p02d*)nrfIpkyB#r<Q&C-oD(_
zS(5|SdsrWxsHf!3ddkP_joA9xA8v-cdSG0EI;k&r`E8)n-3QCJt`%itzHsS_?7mfY
z4bAiGdymPVKlreK)o$H`<*dE-+ZH^FP(Ej7`e4$*=L`?uGnJ}TEe`g$uj!EV?Q+~Q
zi>V4vFF0MVV(rxMjMOh#mpwsJvT1H%lGg-b>BXt9ZFryTTDy3ufTyD7j2MMC(O=m@
zj-IeSuxZ;WbB3T_L5h={%9PecMXYD2h>G&epC9^GR7J`9SVP5=tSfJi)UDjM5Y&j>
z`cig#cI4G1F&1;B1>Zijskj%%Yowgqz@$D$+B|9TW`@p=f~B3F;z9o<?tVXbdFQ3Y
zG5X@x6W2z(%lyqC(35(Ub;g`ca;+Mm_3Z(Bc-9rpO3*pod-$9HGf$huf&}Fyw~cpm
zO>X%dYGBFwab8)-<~&}b$K^_SJFhHaTl<>n>|a%-SCz_!r4O4Ub{45#Tie~9d0ksB
zI9_L`<%Xl@%Kdv^w|%~twm!|iqo^fum0&}m)}a8trw{r?f3hB6cG40QdFe54TIR;Z
z8qOY}r;3)UcY^njO<9h8aWUs76ZOgosjmBSXJtn^S*-cFd-q%>SKB3L*d|YyH!b1R
zaj~nukAE6xxYpH49!g&HK<+w6V^NXOq~Zpa?bXXZmo(2`Xs2vg^TT6{CF7R4M_&ei
zwYYqR$32@{rcca5W}U+epUajOQRfpjEEM%qH%K`l!1M8AsQGihSqyTEU!_zDHS#8@
z>sKiX1-2eGWymT^O!rg@%U;Ifn&7<d0_W8Ai<dq#SfyYymA&CXYJ~1m4ab|)Y9h}j
zhIA^6vN7`*-qe^FcIjq%Y4t_!i5(nAb`~uTIexwKZ&1GTdz;r&voBfZCC=P(e%`s}
z_P1|)%30UFWn3-BfBeNZ{(0x7_RTuHqU#33#~@by=w26BR{z`LuF1)a0*m<yvWx^J
z^;!J<)Wx2ibXzPG?p<8INL=mIJ8532(rly08;$j@KaNrS`+Cvl{Vp!g&+^U?OS|lO
zxTsf7WX7d0m*ZR(emvoI^_9lT(nV+Mj!gYz77E|6c9_LDNnYUGeCRa&w92Su2kQi$
zUMo0~F*p9DtB9pWu>R#F&|LluwQu=%x8=LNsWIF%tL+1P2xP99o^<WkXT}+BIZaj<
zrs__9_Gd=G1!n!@7kKO3e#ACwuQNFGP==@daN|Pf_T(EE%q*g!Km463_NU;O>969K
z6T&QH8WwLAZ98ZuVO1e;EKYP;p5IC};dShP{Ve8Qy>UTZUF*t&f~kL=yF9FD(LZnd
zlN%hC)vmR7vZS6LeEiLe!KLEem+yt9yUUmgxmyAi!XHeUyWIZYi@i2${52gty*jj4
zaC$m=dU83LTz+n{j$81eYf{na+Kr1flDR)POl#+xWL7#Wx>_pc`t3Kjb#8!n#l?E@
zd!OIVlqzbqSf%XB>vLfrAbZ+8^cQ(J=dgdaU19&~Ncshd)+;Q+pDx?(xp2TjH1Qc<
zQ=$F~HhaeFKJ6DpS_G%hE?Bpe_i#IZ^TC^3w>vklu=^yN)i<x@uZuBH#=!*U3wJKH
z2~Pi+cwvIK;nVc}LFUUtYB^K|CkrqYUU7>NXz~=?wERnJW!_?zSxw>!dP>pLvaY!v
z6gH5&IpNn*)0q`fbLKNLXdLvreuOu3OJ-sT=0HYP6)1$11g1y#FdfM_v-l-b|MOFa
z|B6D_U`MQ1`<(gyo$b**ii)*oA{mZsIbY5-&p=Yuy4;h|GcnFgNv(B<+k_<|2c%N$
z=JvXr71r)C+j;eFNAIVGWmU{dN@fdoRY*2H{k^n2w&dINju(4=mhp3)@}1y&v2f!X
zw|y&xcmCOAX>TwqVVc!9u{Y<+&z8O{nf<qQDO2jRh$Wnw8SB=Y9GP`GK=G^A+P91I
z51r^Wx%H?Jx|=RwL7hzg_JdhwJKZLLmf?l!T}$C<;N0|gi}=C?YntC)J}PeI>yh1}
z{XkR0`Nx(E=jz#<A5Rp^cJ6yNNAaVb(eD5MUZ~uC@ch(*P6M|4E!pe&4o*l^i>W#p
zP*eFvWuIjbd-~^cgDvw~zE&{r+xWM`k&T`0XAI+fMTZAdB7FXxJb&e^rmOyOwj~Nj
z5*if$38;B1GaiiCcFXkp(FB776WBvvO_VF#*ZP4a=5;GWT<5W4uXtAoZI|C9TzK_U
z$pQ`^I}v@`)cHC~xprP_&iQ?7@~_>i7XQ5jF49Y1%5I-^uJS`t^+oB`g4>N<W}J9m
zr9A64H~*eTFJmfq?O(Jpa7KBmfrLQ6h5mcniP`spuC_hxa5I^fzrv}<f=PI<;MGFw
z*yH&I3T&(zabh}eR$GW`uxL)^wpsG8blJLD*Gf-bxf8FnXkPl!d(-2~{?48Mf4lUu
z_IU-bd2YVWb%^x){p80vpEPqfMN`HTf|piLcu;jVZ~Lt`hjm0#4ZJn;l|bA30@Yka
z(`MvE$2?cHm0#9UaWjSow3u9Q>MVxIIZHIJGbxnVB~9%A@+3tif8)t}UqrhyAAS;-
zJJG6Srz^Hi=HaZRply4LK@rvUV~fF*<?70oma;#Wu^eeHduyBln$Fjhe;LG}0-Mm^
zFLw7qiPhX!P8a#_&p)=G%Y4zMH_kQx|7Om~TX8VqdB23o2?mA&tHv-McWu4q&1V}|
z8rOAN%SClxOt#s3e$#p_mq`yZeO872uN8eY9aLr(ajc$O)fo4G%Iw+Q)$ew?$NIQj
zQC+|Ho0Q)ii^h+Sk3atPdj0VqA0Hbg9pL~Ub2wE`g1cxkcfzGNE>%%(SL|Q({b4we
zs;qz9f3dLP$78J$;t$#vd<;*#A{w6f!$Y{O-{fHVnF^MkukAPQi(h_r?EAt4?iFh{
zJ<49N{O^Z3Cq&ozXZl~=y`Vz219bd=c>h6uh8~%h-O*xp9kc&E=jWIs)O<0VCGp3H
zi61^n^38wvk7LFM?=$rZ!rj8*-zOemUuUB5Glp|{aE0$D2eS+3J3qa5Ihvw=DlW8E
z@$1{y0crV%4$I3N)GxdC;P`(&_sb8XFI<aRz0S?W#ib;$!lzn!QR7nW%>4WFiywUG
zOndWdli>ThQmM6v-47a8XxMS@7t&2{Tz0wHAmd6B&(0)6Hs1M7j?V5YXDckK>&nb`
zxpKS2;*+z>lJtA8ug>`H#w+wc^YHCb-3+Nh)^ohOSk~q?EL_VwJ?7C7kNaUUMP}m9
z_s!^+|Cj6bSbc8w{Y+<P=BB2m2ag{s*NTdLo9l9*t&Odvt!>e!O+kB4EIxJ0E2jGG
zR@rsWb3q-xqz}$6cME>`aM$fQBcI;Zd+g>y<p&weQPDC5TedOsG4QFg@f$t3<jr{B
zaP0@~f&+!y0`K~?*VNV)J~+T=Vs5Uiug|~#-`DjQFI-r#?%H~vnMSPfbw5?XCm=1k
z5V&_8TYPM6e@Dj(^W+cCF0t3HUE*@jmX=wYn^A1BwElL>gX0ev=B#D7#o#QRP{3F8
z_YSXd+L?y+>-E=!<^Rh7tsw}s291iOo|_hC5j8jH!Q+h5UHfGGByKTmkxa-iK5+9@
z39Bui`kb}v!k?ChW@c(KF)<0q$h<MLQv4tJ=ikiqc@r-^H8S4%f7-=MOTCv`c~944
zWiT-{Rn*ctmAq>1wJL$2i+}$9y}M2G-Q_-6>m^THTU$?@Ia6}mJ-^>I&VTRu+uQTq
zBO)aB{dmOfGv7|ud%E7#SNH4x|K;G~a&mTVzFlZyVzOiHayz}BmKU=ogM11K(^#{l
z4#soEx&>P}l<oS=EM(SARIuPV6h7PJ)#WO&0}IaW|FB@=MnPz29dufmh^T1djSY#f
zvht*)r2~V5m6x8j{eGu-mh5NW*=7rO?vxB$Eeg8yAvIO?+q=8n3l=Dtn42%&xl{7u
z#dq)TT#j15a3SNyjT<YzUJbu^=MIm(z5R_Gv&^~2j=6!x!B(tZ?Hm^;C#Dy}!65r?
zvH9^u_nue3-z)y~>C+h&g-U!f77f0$%{+5`XPfbE-MaO|=g-B~e5<d%+BWak4v?g~
zT%`+_&DC5XLBX$XJaru_PM4iObKv>)*zV-Z%!N6>LN~OrFRc3&y1{op*T19j54-xa
zAACO<{^9oz?Vg+A%^#~zeYmocsnl3j==mSeI1=cT%hz9CfBgE@wW!GGg5$23#6-oK
znwkW&*-IT#@9Zc%ar*RSS>2{{Rbi_|&F@txKRY*<n;~LPg`tny<Sl*c*Xx7MXyTDJ
z;{ly{c%)O<F#n#-g67&U&m#8ROy|h$yxnrHa7E<WuphsEB^~RLY%sW<ac@thMb#IL
z1sBx>1q1VsJZSIObw>Sz;2cX!iF4B&3$|@zJm+}n&%AFx?bn6u*mli~C)=j)cb!$-
z-Ja{9v4?iKDvsORa)b3>Z8~+z%jV+|;SEu1ElOXBJUcU!nd7!q-5(1Eji5bNQSXyp
zWz66D<=A5dB_*qP&`8~M-mkM;4<4)jSbJFE`t7?>j9aW2*+ujn3bt%Zyx}SRZpNE-
z>GhIp^OgmJ?sYjk+kEk+O+ts;`Q05H8cco#L`AK#E?W5f#l^)O92^HeJUkp29NgU1
z#dY*k>gj2TcXyS7j!<3{lW)8EW)Jv0uHEJO3<<Zl<<7mg{N1J7>AF?N7p9rbzIfwC
z$E8a_4ji+-y}z&D3(8zySwV3b-FE*2&p8XHkAKUX86T>$XGp753pNQW`$Y+sMH&a?
z@AcbTwfyJLpAQ$d%N=^$Z_me2@#UgB=#=;$KYl1!TSre!dd6#Ln|ozNV8xGz?S_Sq
zTpXrxJ$wAP`T4wRzHV{-Z&|kX_V#<eT=KqTXKG?nQZ;{<SN8nBfBt}OYdYG^{lrGL
zy#}P@$@Axr_x*m?+~3a+8W((fdwX#mzo6h(O}6EiUxtVaT|5A<Qtm9=R=m6*>;7Gd
zFMrh~9^da$bmo=#_%U7LN)_Mq`Bq)CkHvTGx3iF)&cEAbua@A~WW4oH$BU*1C-?<R
zZ!hq6OFW}rmi*zWc3`|Ui~Sr1J=?#s$F9g9`|rx0`1-&2!2_T}o%O8NyVc3?vHR6j
zi}1SZWc=AC_4ON@#a!JFvX(N+f7Z3Wy!Fz6-S5F<nMHQ%Rx8^V^~t{~u(6jqz5i}U
zXt~e9ua9f4hIV8$fGquLCd+1@KKtB(sLk@*4$oiki<^7R@qLZ&MH>sYY<tumeEh-t
z{3ACS99UY;9O5-jD!h5(^i^MhK>3Tp2l)jjf=8Ck<SySkXExU{H&swaet+Me^7y0m
z|AQNZkFPd-w#o5>EaRLX+oa})*7h(jt^ROxf862yT;`8{U+#UC2C5)CI`pjWJ~;j`
zqj_tZy`6PHNB_5d&DV^N8`Rtg==oxr)bpOBXJ-wIThEu{8@$;T{%lYF@#k~%ioai&
zr__F7i;9+g^$co^*4+osk8Cg9Ag6b1|NpQ4JY^<HF9PIw<cc_J+@&8HAL;aNw=#TG
zWX~h_sCl8Ye&gbwEU)^mExH!ep}+saFKfY84<i?)&2F$2T7Tb4oPYkYWZ~OGDiS>4
zQ)*U)>G%{)mEMzaIruJUFO!n-MMq&5m)fw$2W{5G?iSMyTjSt$YW0Q{+6)_>s3}|C
z{5mx-C0yU7sA%1@s)ikRYGeCz`530%Nl|(JYTj1AO$z3g%&uji^LaY%mxudra}{qp
z_k82u&)4c~t^e_ydZ*3MAnPjms5aYi-G+5Pt_pA8ocAF(Jh(G?+hYl71HQ(C=1K|$
zT7S-(A9#_^a_ii|2RV)RR|M`Td14V`^~sB8{~s?48Md0p@czHQxvrcQ{OZ{1(Y5kW
zTbBBqb4)&dozt17;~fb6dv1si1YY@mh3J96{YGs6=KYgfXUG*8<dV{I^3K27kSwuH
zkCuCe-UV$3vGe6v0ogX6@%_TH0}1xft?mzN1WIS$dw#KrD_Tb`z<tBqKRma(jV3g+
zELnA1P?9;JiTCT>J#$N&=NH?{9N(DFx2WX5{fC>=-3zw;l$q04oRMqG?w-vZ6&?K`
zqjc(A+iJe}X#dBzA0Iamv0wC)efBO(^S7A}Y!Z{Wjs}HBP5P7m@VC!ilO<9qZriqN
znsPE+o!N0E#@!jZJc_&YR?wR1EZ4K<eY?4L?-D0P)>CWO?W(={(eb~;*7KX|c3Q9f
z{A%C(U%$2HaqrFDb<4}EE9A;m>v`w4u3aNPvvSAYJ$spqlv8hO_+<Gzf|hQ-IimOQ
z-|5qSM-F8$v{s&&SHto8=-Wz+QNQD_6YEW13k$~P+<$y!rSK1p+f%=NJHsyfHRjER
zNMDW%FaI+*-STx4e8T`f-|6ktUPiTu+*i337t{8G_JAOE+;5pLnE2#qPz%rY5*7c`
zPfCKOhOG4bG-dfWlVvhf4tD)1shqh+xBB<CshNIGdzIdbxbN!F5!EohxgmN_-l6p1
zmCffL9E@2qy<O2)>f^-(&;d+7+ub=!o9AEK7AC>t;C;FL$Esfpe0Bd!rRr_i+YgKW
z*wHj!%;evVrdi3o7Pqf7c(cuCZrRU$W#WroKSkaZ44pUqcb{#(5Y{xsnLGBisLCRh
z)V&vWu69gI;V3)Sxzg1yr)S#Q&n6RIZ|j=|-Lk(SAG9Y&ng3WyZfHKk5|b59Dy?r^
zVzzFGWBjmX%cOgDt8Zz0xRmuUemrq?#qG|&LAl_;joq3t{Zme|&O5()`g5oH*{UmM
zP2pZ%tQ>RpwXA>o?XY><LB~Js@bom8CMup#bgD{Zk$|V6gX2e|9mg`8HtLx3Sv&I>
zNF+5d75-;P2~V7~L7sJTu)z9irmwHADHzwOKbq#Pn{~k|uHr`g+Fx?tR=3Cge4_p1
zwR))Be)UC-87j;4Y6P^y*B#ka`qAKR)zRcv-Kys7+iv`Px3chVf!(b)SKqJ)_8It?
zG8y=}N}O6K^JgPymyUynYLgOZbXK=aB$Z>OSLC`cDjWYxN!_3KNd$3Vl-@F<ouwtZ
zCw$MhYdX$*roz8z&57;4#k$@c?WXnR+k+RZXrFR3LFm$DA)lW&7VXNksYf~|KuR&d
z&(E!hZ^DDJ^Ck20J{Vs~S83yy?=(|y*tXfCc9mTEtXU5;avKj{WNJSw$}u<7irxLS
zB#+saLoZp{cqE$??c)9fI%g_X_PDi&__LUG%su*|)x$-U?>fVZo2_$IJ0sT4j1p<&
z-Rbl^U|-*~S%+6NeJGJ<Xquk5b;>Ii(6T4+uFEAY9R7EbHw7xKU9$Q7t8a_Ml>`Ml
zil0WT>{~DVd+EKldzII;!?|a+bi9%172K>hhx=~sslMnRk)JE9ZkL@+3~|kAsQA@9
zeXZM~9X^Uu(%cOar47N8J5N+7aui!_H1IcjG;K%Jtlh$U4Fb#dnr2*Cd$Q;Fxg9b6
z#jRiZ!}IIEzM3De{Xg6Nm$|ORZMHr4FEpuVpL>)uTbT9u?2WHJ%U`(i?8xq~zCU6^
zmFr^vY^^F)k_yN>u*G1upVYMMFAEM#SvLQh5*PF+tF^+p-;~!)*}n47Ps5}vi3$6o
z<<w>f{%$Dv*Av*mxqVUXhBHWKApG&tUv$E8X4OowYTF!+<0c#HUvH~5PI}%w@v2G7
zcLy$!uL3tad|qrRxcOqW`Fuy?B;hNK>vCqAJU`yjBv)bCmiNK<(0i$v!d5}P=Lr@v
zd_1yNGKbr?9lUs}>HYaF5892_U7YXTzU9zE2AQ>M4S2pCyl}AD;M*$Dnkdtm9X*U(
zb6}%_Hdh{Oc$8SSsKDk>_-}!eM;C*~%31WCH(u_HIdXWx)I9czay_ffzWwLYZ+pQ8
z2SveygOyBHn*6VWy#gi)J>m*-3JM6C)Fg2Bi)HWQuPZix-M#*%r9|I0vp?Vd?fy8~
z^ZLPy*V>jGEu2wwmu1Vgtq&LOet+Oer((gDtq*f%JMOg-<aJQneg|}z-ZlpQl*$(h
znZe6<Ze4z`bnn@HXPfT+42$@DdFhu8up_dP-1olAVf8<41)BN$qSR$_q|D%c^RLBz
zHEg|s9=-;O_ID3+^Y#P_roB^;_}-NFLAc;-iG;7CMBz@(=TWx|YJM0<%vrl(u0{7N
z<@*btz3{x@Z*sUnjK_@OtZuGE;Y@ip-kl=Bb>Fm0i@mP42M8H*Dhjyg9${6SA)+XK
zQRB>K8!bhyxP~1aZ{98c!Qy`)CB^yG{c9<YG7IOiGb~`Sjum!Ta&cMf#ka3ZtAAHn
z-O-l?E#SM;4BOF@>9KP1^F`dZOD^Bs)(ky$>-k!>&zU#>E}7*o#w=pN-7w=@rO`oQ
zwZ$pV^)wYU&zyEUvP9r|#*`^h;mv23Z=SfK+|cB8-VwLThM>KSf`ZZkv3qz9e)@aK
zI&SXYtLy9Qwr<;c@ZvSLcIO}4*YfhUJOA1js#QL<Gz?`#VHf*CUS3`fUS8MKR8=i)
z?ZUTPuY<-GVto(Zt}1%;PbYTQm9;T<>hdp2fA3`5k^g<cf;%iXMP$WK=RKKiHSx6m
z?9a@LIn!1q=O27mb3JCd-}amF&@;X!G(GzTKIBU@X#J&IcA$k-9*cG5re_-Xxz5<h
z!}{v@$1>?PX_K>APSy!L4SSm83qL;Ml+_Kp*qVixTei6EV4Bxt)Z)+m_D{NjiCpGJ
zvnLtnB!%89Z~pzh-|rG{-8!CG9LXPicYJ##z$2M<Xz6sGqtlQ3J({gtT3}Ys?)=&_
zqTl?1^zD9$l!Al_=S4qAGO_q|9(^+ZkI&sXL0^h;9Jri#*d!kDCvN((#7^RL*zRZh
zK#kK+3nnjHqIT}Kz`P}|`vOW-q@-7yFYvlkcf#*T=;=#c0*xozW0V!zCW!b<3+jt`
z?YOP>yuRRzHGSWp%iolKTbnCtPEK9fI@d;g?#*TE&TW(J?L8Eu)qJp_;z;Hlf725^
zJ&xFhBi~B#bT~40O=so)t$2==%kk6`rkgPuThCnyy=-;Q=kMREYwl0}zHpn_a_s{@
zKR?SoQB!ICZ&ND!zgfSn;%dI~=G@sOJbT;z&N;IA3$I>m+h(@Bs&xI2U%wt5Xk^aF
z%X2F(HeR&YcK#8~;AP;mucv4R+psZws+z0#u0KrRnxOx0=PUM+8^1rD9$WwX`Tw_V
zFBhucv2y-aB^@yBvYq8V<H<Kc8H}N*<%^cej=0UY*P8t{@OG6v6Lf0!iH?<tX;VA{
zTP4+Qi(RkuJm0RV7-uGa__C3%o6AzQ11i#)r?xV1%<YeOqHJp^c``a@lX-1xQq+z=
zt?Wh6lg)Ody@VWXR`L-v0?PCB<w*}eKlgo_j2{=q{)QZyamsy{2*b%|&;!lZyP8|f
z^}BoT1kT~ksk<JPFs+s73yWb(pUoVc{zs_XW{cS3;}uo&Q{zKBR1ROB5wiB5wJx*Z
zdDr@>uu;x87Z3kl`(ba5%Dz?BT+4+simezeE?#>kbu)|kK~C|Z9I5W$<@=9I+w%vS
zKMZtsW(Hljm2-dJ-Q)?2!u{9pS$*VNP;l_aZ@2T4Ute1*VU{!F`t6U~;{10^xUF>Q
z6KD<7kxpR=`#PI-`~Ow-$lJ?-mMA?q*nBngWz$9l^PLQ8XZ@BePj&g*{O$xlLyXy{
zqCX~9g2MSR9fgc_98&e7Zn1@;ZT%*o5!9OFJ?;l0>Sz3|HO$Sck>{%6ny6wYIej17
zuk6N3zg_7M=GnW?7Vg_-)?+@~;G9fDVVd$8Mz<Nhho%?m_%Qw}*s^uuTJFsJc_Cq8
zhwk5(x3jZ5apugFQ%5gO1>GL0qr($l^O1F#|NM7`p}x>jxYti|SNYB~VqNUs?^d?0
ztY}@${UafJ+uGR9{+)Q87c!c*#ooH?%>|odOTDLi<(}^Mem@6v#t=Kn!?#})e$L@u
z9{g?A)5fmnORCx4{Ve9l%$MH2Gw6=l`ybNV_WUy|y8pvE?(WR?-2A=Gvh~&eGlZ8|
zUw9LkoU9CTwwTP3W5*s{4Ucy%E;j!2=TE|B&Gct|a<)>a17@1jR-2lcEn2pW?d;jJ
zCr+O}TzuZPy{(O{)YQ|>jm<3o-kWKMmfhRV%+B{<qPtw<)vVIn^V{0k?o_|udt-At
z|E$@wKVI_IPrSV?w_$_*`aPexUcGu%@ZbPrN@}X-?OR(ig=fv4owzk>WBva+&4$-6
zK%v2#BFkpq@cQdj;e3wchkn>UcxeCZarsR44@W+WR{XiSH{#Rn=LV*K)OcjAT=quU
z3-|W=Evwx5AtqqA*~3;g`}tpu&+LAgzQeLe?U~!T18?S^J+Nl}-HsFU{oIfA6l^I=
ze&TNTeEGI*Vs&+O8=}_k_;^g(u>4&N!+}RfyAzFOURhn%wSK++q{)*R8Q>$ee<OF*
z)zyLa;!l`5b*aYosI?!yem&YFY0Qu~B?B_*wqnt|i0f&aJrCYJ)XE(g`n0Nc5n>GQ
z%-Y^V;1z2Ja?HFL&;7Jece!%EMaj-vf9=`JMvML(T>YTE!=wN3ORhRlB4j$Iq>!M~
zlYCt1zzhDz5%m&({~DIP5nX4#ztr%@%d^kU&F#K*E9wpCB$pG}YLhv`R)<zCY`(@3
z8XPQ~m7UF~xb<zP`n-m#Sw~j}FE>a(CsSIgq@;A|0BAsP>DsfL?TdM%@1HsRZTr20
z+4a@@`G0KXtv{DNTwBid;ahd<iPQD+eR+G{`gY&UIadGgv;3R8yTutc<lf%aJ?W8Y
z&J6>b-)}a1czRCUmX9>#76ut|JK0%!G{k)8v14v;Zf<602nY^t{`ITs%nU<j_kKB7
z2M2~We)+yxv!p^oLKyafqx)+Zc!VxWcAendNc-J_6OCgv^Xz8}w#~eJ*dY0ri4Xt$
zu9u0yOZWf2Ec(gP{*g-^bfhg}M*(O+^}>Y<3uZog`uutOOyl&deIFJq2aVCM4qrd5
z?%U_j&UJNm?{>ep11-0^x2N*PzFO-)fBxM0=Dz0lm&^XU_Z~QK{kpiQsOX1}9}j+c
zdHLfR<MRj3pZE95mNv~2k*oWW=rhM6@YXu>=Pex_84EuBSe30L6|w8ns@FUC`I3*M
zDqpzv%w_iGvtO%To2lQLb0|D|_Lsl>_J2C+|76YD#d+z#^^oBD1L3j4f%%6g$}7E^
zcCfGb(Cj-h>nd#zaSO=g<`!7Qq^^5^+u%r{-(D+0LBWfxhe5IQ)O_puM@tRtb9i<$
z-AoKuNZ(~&wCs2C=aTw8HIF0q7#;4oBk8us>T<{NoctBxpi}gBCCvEd<}zvBlD)a{
zG9AIa%O9T2pXA*Z-*#l~yY<y-i~e<j=UqU@3wee&$tx+@f`WZ}BJ?gdA`dKD@O#_#
zujkhsJvmwZ%F#H`@sZQ)HwMM}xa^g=|IN+Cwllw4dC@($@+ZrU8_zdIi);ORduA7C
zJ*SI{c+<NR=i%o#-3ZTejE<Im_V0`OE7wWt_4~Q9jjpZs;+~jNAvJkb_eP$X9XvNX
zcf3l{;hr{?eRWvihi!6#rK0Y29V^s#y47VBE_!qShg5RG&D80M&({C%Vy|0d{3-dQ
zYZ2ds38MW0u91=q2V`cqUC~%v!^>J7$ObwWZ<-XVGH3-|OQ?0s_Wc{4s4Y&45_@#p
zUjZ~R=jGj6@?%<zO1O{nwLeuUOQtLP>^q|^l{?Q|?1|cQhaEi(4Ify3ek^U@e*ED+
z{%1E#miXCfSl8d%X3CIRyY9C5s&lhtT_s<hFjrO3mdks-SAE^ycPIL9Ex&p{;k*0q
z!beXuP3Bm1?iYXOTKV+(tE_vRacxP@TRD=rCZ=?_r1kEa)A4K3Qt#<WFE1^9mDGwn
zqxE>xx{QnrhkyWqnwpv=>(89=Dcvd;8X4J{y?*bu<9&@U{`{6(yv(*^s&;tN-S^K9
zZ~GY<aV0dtJ<!c)l6FIZ>rT+>Ij1nOO`C)gPTg-(+P$c$hjsVowQucjK~~(wt-W2}
z;>YbC+4_d(_UpuE(WmUU`R~Q$H{VQQ=?U~W`-*#Rsd3Wfmh72g+|hpPj@hcDJLVO+
z@yF-iv`b0d$@J2$_@AEG-t$}Sydeiks=8Xt-TO`Uv(*ntqYQy_b21Nox$wI1vA^0w
zpUaXwl8?T=a&fsE6dBo>e7x`Bjg85+_ddS&3wZMSbvH9R--4YxCC{Ec8?h~C<}R=P
zSw^W``~H0L_L*t4H2Sx1$-^0fA}Tf3*El9;t?Y)KB&oA4WPwi2tPfi(L_Q}kd~xLT
z&2FxS8xb>(GJ%%dsULBhv4r*SoQo`**UCML+$68lu4yK=!Bf>Dg0IE*?PA-qWCouN
z3*&y9Er@e{UcB~j+>}Ncl^6XNzFpY*9oONJs=b0UU-`I5fllG-_+k>WIC#Cm$<Q<d
zi3ATVk!^y_Ia3r=U38Qe?aMkp&vwVtY0(9zb+;#+pJ)5(sLK`cnks>(iAe^R4KrJu
z5_k*_W^LYmDZ{9137_2?*BeRQj(<W{uIiFCTg}O6RlBP0sD)^vM!U9K39Hqzm5c^c
zLpl7<JbmtD=cH5<Kc)N0lN1$ob!BI}k|cenwvf2{aqFU{&6(2^^YG#x)$M<)w_lW~
z7Bni-eY==>RcUFYR)CnCa__c?qTAPf&uu*sbY;y6fAP}~Dy_ScU;CWDb(mxFqd6t@
zTNd57p7Gi%^6Qk#%XWQ>eOmhA@|`<8%nf^wF1_*j<o-khhNY>Z7MDxHVz+X8P55Lo
z;dRNO$i0jno!31>FRvHhdyx~o?h`b!rMy{9N_sA<hYO2Yi1oue5^M8%I(~I5Tc%d?
z=i~7i=J|4<d60hle-ggFzL!3oI_34__wVdwb1S3R60fKu+F5!_ub#aA`Qt~&#Kh-v
z3v^<4g+!IVytFhUE6XV)WXhtshYmTpxVkP}xze+|`q7JXpu1ZaEKs;|<%)udiOBD7
zZ(kSeZ*FS3aN&YNZuDKVi>;R`4EVFJuRGe+9K7-2KFwE0@1{V{JAZEySyY_RJ@<X-
zg{#{o1rs)LG252i5NKO@EWn3beBKOgx64<+BTGvqR9g<u+8_O5OZ0@<^Z0|CwEw<f
zoO1eEqQ>-{L6c(`8<kkk2QkjxS^MN%-3A#0NygK8*Z=S-&h^>-UYo_}<jHkAl{a}U
z{P=cd@55A9jZN)JcG`>&lXivFtPuFY@iHXuHhA#sz}p#DQ+_Ytn|CJyatvmyHlxOc
zo(U(8cK!Kd)N*{svsXKHFYg3LlCarRt0Q;CT2Jds^SQ5PzV<75g>@B+<oVP`pY>N=
zy=tw=BwaLJQDWUsht<N~1s<C{`M+{aZkae=B1Jn~X_4K!WyiiwQMRy<ICyZ~$)==8
zXJ_W5<m8X9R<B>QbEhPzy>v52R!{in&z}qT?2!>x_dC+a%)TM>vfB2quqjmIy=x$|
zzUACHX1TXoo;^#8SQ`eqQq0uU6f~&@YW;h^-uL(0Z4j^U*%`_H+u1oeN48{M4v3EK
zzPQ+(nZd1JZtc$d-|toHgH~}rdzJ>8SOeWD2AvnyG}X77#ozqm(5Jb(E|@+~f91Gj
ziOu4_OZFH$J)Wq#=gNUN@PRWgY<SCT-|8Fi_Dq-UShC=7P@_>WL(jS#iz)J3cK0sR
zoGGZyHgVx)0lj4sH(w_jA9spL>FLUxe>f4kD$TPuu!B>)Nk5Wn-qJ&D8)g_R_@nUV
z(-rH*oX<AR;d6_5^4ZQuV?zJ7h$9oVo*t=S{p~m<`mo^QN`BBN*M*nU<Tpz{og?30
zTaY*}w0im8Gp0$NR%beVGx%rSo%S;Jx85f!e8;Ri^YVqSJiX<_tE(wWMr;}dRu4<U
zlAT*tX$gMKtp4`q;F`$I201qjKr_Uf)6P1Dg^4j7$lCe{bbscZoyCj{-QxOfC!fp;
zeULd*J#4k;zJ2><7$&nRoY_3nJYTL)&UV$hS7y)Md33nAxgS1$%)I%g4r`2Y+8Kw?
zP*Eu<sS6h_G!#ESm-z0^PT9Qk*RP9zes*?pZs_c*S*>T&CO2(t<rZJGY8BVxW4+FC
zar2&?5WmP;dRWOuBrSV>-6clNv%U}R6_)RPa$wf{cdt^GJwKdv*1gJ2@XZGB(zpf#
z%UT7&CO+@Iybqm1lIBRU-QbJ6@zXAdYaXlUHUl5txm^Y~61K~`SROLC`hsg((B@4a
z7`9ayE>hZ(Db}Q2EoihvJZXvIw(zsBxx~MD|M(=KD+oF?1T@6u+_m7(t#W592Zz4c
zqq|$!YeVt$3H!q~b6a~0Z8VUQDsC=$6)NxKc|@hf<7rZ@(yP}}Qc@r86rTreT)Fh(
zRF|lBKuAansK@g)ZsDd)LjE=%S=NMU`^~j#wJd(da7g3w-SYdrxwp50`Z%E5tu`bc
zzOuT!`(#Sf)vT#a8+~V+C7zn1X;Jsbg2CWzub$0n(XE&G=Pz1xhvjY~yXj)iw9Iu~
zth+zA_U$%#t}gQN6JJ`C&Y5Qs*H^F8-90h?)xSRtb|)=F6HmDN?bF_TCRB_eIMVLZ
zZlmufB^V}~%I|KCTe)||g4!uZB^ZQHDeO%+7uV8cRHy<PcX0SQjp@drWrsMFm$lst
z*m#?*#W!?`h2-L(iDKDpzSTFD&i$)!YHix}!kf7pX8Eowd&3^6SABDSQ=!(OGpXWw
zUwtgp#dE6vx<ZbRpLqWH<jL{B^IimfFgAP=wZv{4kNMv>%PY*1dDrcGrByoBuj{}Q
z=a1{QY@HzDqj!Vj?Gm23Rj5bOobWdhQ~T7)?ou0>nW?GfH>V?bxu2)(FVIbKkB)R|
z=<2qjbvev3mmIxp<bNj37_??2DvFEa;F*7ae=nUlvrophN`#S-QNpgqA}cE^ATUr-
zceZ)H+`an$wKbnks)JTiTwuN}-1!!CC*xiYh7CD4jn+hO=WFMe57Sq&s&}jF@0uQ8
zcJ^oFL~ffeE#DbC4I$^)Uu$7`AFrLWemi5T<=e>*t!-!S)i+McnjvYxy;z%}A;5>5
zeS!7;<C6o9sJATEIbJHaUBTzut49GxmLEN&rsM6W?;a8L`+l*ZA20Kow~Kv`txVi7
z_2w=2`AfEJO<D4Mc1h6X6wQ=R`@Kc1<TsvhuPQQ{wEad({ul0}TMB-1^Y?Uk`8IgU
zD1J$6Ss5MkoMqG7t@|q)Z4BL(DjihmyXW-(R(bO~dCS=UXQbxXR0hSqnR;=td-6}=
z)mM(XTsi&qn0?W%l9xd~^K5Ru6}>cb=FAnVRvlXAI~%lLr<GfriD6#FBTmr1EYSUc
zMyXxLQ;R@*wm^4kg6?RXZI<hlnyLz_k}og!fBfmR{_%OX)pxFCW@H>VYkvRDwYcD5
zVbE22pu0jrUFX7|Pp3bgnLh6zXcJJXqod=EEt!+I^xgY*<#xdTH<|kxK{rAkmMy=d
zIJdc>fnmz@>4(ps_rGO!@#mvo%FERa>i$&3)c^eo8uW4Nk!U>FT>9^Xrr^cOWzv5H
zE*`in4cff5TjGyEVE*N$uv1p|wbAsHRg{DCUtOK17t19tFTWk!@V@Goosr>?k)ffb
zt$nrIM(^{I)vv#%Pn|k-$G2PAfsv6fKmK`fb@Fs!&;hgU2haaXzm^pGs_5?eujkja
zUd;+!@8)tv8Bs0z%&`yz-DOx@Y&=ajdfB>L`ITG}Rmxxg`5~<`TeoUKxPRQbyxAQc
zD~zpp>ip)}G=dK2|Ni>PN#Ps&zKX)m<zHPY@u%YPyXtqT3@$F>JwLwu|M&a7dq9AI
zl$2CJWF%*OeZ8jcx(yow0>foA1OD?U-t~$J*PrVb=YA(GI9PbmqD6PMtz4&{ADnOh
zb(*P(3FyLS=pa`gXt?UDYt`?CSLITkCmipSz4YnOA*YnIG_TU5wbxc@+sjo(J-W2i
z+w}YO+r{fb{p0rK-?wwU-7T)~77{Y$k&Kv_n39$jm#?pHmsv+g#|7bo=T`(S{_u$V
z{NpDlC!e_aWm1));KfSN0-nsv%NB0iCdMEjE!_>;VRrWHS&M=P404rE1h@NbnTA;I
zb-0n4eZthKPq)Q6J2SuA`#lac;&Art*@~A-r-SZd1r1v`Iy%Bfco*Njbp|njWnyCT
z;@$FlMys!Oefm_S`85CXGT*M+?5wOqZ@1s?W91gp_~yLc_T!B!zjqWobYgHQF5a9p
z|7z*g=N|K>?Wq6%kMH~T#oufsZL78{dYgND+rx|Q@<(sy@7KLr`TOnmk1rPYC*9bP
z*j3uu(Q#qwgY@{7tkwVj#=m^-E+4PB^uXM&KbEW&@NDx)xyG>Kq|1^Yd-wd=^I=<U
zrS0DLoh!C~`1<wep32V*49NAiAgtbwIz1OLvgA{4yZS2E?6YkzFE2lQ{5U(exSmUB
zsOYg?>GnN)Y_?xis+<iU#aey*@0TrSCeNBBb>;f?<d2Vzc75u*75x73kxt>IpEd8N
zm&TS_x3;!^`1rB$W=`ALw8`7vcP{^Cm3^#7a>c4ulbTLL8w9ViN+x3LO=~(asr$*3
zn5RYFdWicOYC4a^O;Nm>8GpZT5zj^)$(_5T-|pAhdD7$EM&|7pD^s4&{g!_A@bi%M
zd-gj0u4Ua)pI5AVXw$dz1^%^td->|@*8XGLZGWp@Slxf&!y}%5_7>=$(zXu||Lpg{
zNW{8(qfW%$hK?7HGPANKxlOv_qb9s2Y_-X*O_`U~d}bOw{h$8+-{V=k-XHDXzi6vq
zZmXBB%GFzIBhs}a4qo!jTfS6UI7K_UJhuAvl32lC!Uc0D^KQSpTU+;4iPQeqYdw}1
zT3K%|TjLzC%PMyH>}m3<3swv5&dPPla(0b2<a+YkebV8Rik$X;0$aX+{&>Q<$j<)U
zNly0j*7LtV7xtTD!FWNpHFrbM{Kai;Y}0fio33U(eR6X0nOUaZ(R<wwo~z7nX>b30
zfSDiEmNv`1<&u-Lrso%rgSvg*!)?Fok93J@M{G`GG`z)iPkNqJ$LE_du8Eo{BI3a@
za~c=c?7crbW%pUH7&pVCM~{k#FR%W!U3liBo73iZtql<l;Vt{7rIk~7<fhi2d7HU~
zCc4BG%6SUjYPxsf&YQS^c=6_M&!Sl#e~;p>m^;gG>Mf76*Yo(#<Y+B0Gn@aY<b6En
z;^lvj?(VCW{S#xFBawb?i=lEFSNXj{>GWIY3a*Ck&C_cUnBH?SW69R7Q~&<{-u!%7
z&Ha6~M~)vi&bp$Zq^vx3V(Z`E-+%W6Y}vMLQ}J`ZfZjzF?%sR${LR0$<z)Kqa6dmj
z?XWcuK0G{pOG*A<pK(N_L118@i<?`S^|pWCp8GE-F8TALP)S)?(lkp%th;sBF00(&
z{Y+o4$9HyizPYinS=PEtV{v%W0?E@m3f`J+<(TxTOVe-uyUkbQ;<;BA+Z^=aDGpk=
z?cV*nlLei(&wehEwCB6O;6w?NrOk8q?h{LTZlG><!BTjU{jT_I#`VF~#%9SnmzD0^
zUVc1sBkRx5E#aa;UTl?(N)J0ccy46yU2@O=VpWy-{>6hoKZ{FB$}Zfz==l5R=PldI
zGgg0{G(Tk1G9{rBs}d_&PCHhyE}=WOORZ!hr~b&iZ|ke8t<5-BuY1A#!%<g$^VD5d
zYLVD+=<s1pef{)<O{_1zRtX6U-`rDa{P5w!mX?+c85fl<UAlDP_17s=rX(1Y++}NR
zYYPewZ;xA_eym4QCw||Y4+Zyko8<pLJx%xX%scOWe_ne1bxqvfUD2;*hHZHKX62i8
zyWf4<{lL+~gClxdPU6>BS5IvW2@7L;yM8^>T;=?#$cPAue*1qGlhys%&cEg<*~9X3
zz4@Q7va+&gd(H2i=rzB0BX?$wp}?GHPfm)JP2X|(-n9L7jpce3L77~u3%;i;znQjl
zkAg>5@6NtiJ6_hg&0*8F{<>AbTDPeqb7MgCd&}^W-jW%sHQr3?6ItWqYaR8-{^*6A
zprtyRnLbOeJgD41C3n@nH?hCJ`4)e=vig-~uh;E%&dtw%O!;-{egFQ)AFt2b_qP7R
ztD{?&i5d1rWECF2m-Z^_(G0m4N^8sm1Ejt889jR34zha+x4de}*9Y$2bq}n{-_3bF
z-!$#|GW#jJujT$~e(ies^twyF`^!bA=M>D%v3&|wac5`oI(glnjoWs5wQ5hExz5!0
zU)`~zXH3_rO+WoKE9&vAl~YW2UORKd^zvU7hxl91-~HQlE8}(5&ey47JLa3No%vGf
z!N;H3`bQpYPCU#u{qoBx?KV@|uV$6{&a=508XJ3eZH|Jim`=n4Ep6@B+hXPBzfC^e
z#=Gw7>hRrl|9{`#EhQ}-yLN4L?Ebn{2evMb{C)lS>U&!szT{n3_4Fm%^~<L|r(N%R
zKCjGn`{J8>|L&As_wMeM-DWm_=Ul4)-1j`j-~R8G*Dra!`kkFW^Ib1K^)s{VZN<9R
zb9S7+cscg@`pWj#mQUw=4SDuH{pxR_fCbxbJ%9ICJ3oB;-_`fL=ilcw_5J@<+UEGP
zzjrVF>C1ebJ^%NX_h<jLb6u_EDw(@$&-;g$*Db&Lel`F3%CFJ)LZ8*e%=vux^~Cu%
zUg#UVm-g)0nI<CpRyJa`{ev4HziY<C9<gqpwdLyX47F?@OP7c9__vr8>$A^hIBmA=
z-Px4P`ReRvQ|{f7yA{EA*`k=Y`);?f;MC1id~#(KTLhRv^|pNdpN%>t1+F{hzTCL&
z-txqwOD50HT5MuH`^}rLH+bAqs|(|V?%FeyEx%UryWitf@p;i1aqiy)W?g^iS2_Ec
zrM;j}ck8FOuVxCl1<8M$v%f<nsOHkdrl~&@*Dt>&<=(Zw|MAq5@0MQ4IQ?g%d9t&q
z)rH*uZb8p0xRRF%Ki6kHb+6~F^`yyjeakX=!)D8NDB3c6ZT40?Y^{H$zv1o6yZ_pG
zu5J~3VYM|paEF|nX4(0hGvmZF4l*gPlw5hk>u>DhSC;l{T6%{{@4S9+{Pk?jc*URh
z{xA5NqJ3U3_Rz^`Vs3qVqN3k2MOfTfaaXNH!0E@Qy8VGkNlNy=Z=O$C*sR^5c<Fp^
z5rY>)@SNi%YxZW{UhC&$C24#22)|U?w&~Fur-^I4jAVTpwqhl>LEs&~;sdQx%~QV~
zNEfQHTRHFd!_&&=Hpib=j?kJKFMg};#fP};f9rzpE65}*J02MP{Qvd|9V(xUc&3Q6
zL|#xxlG=ETdw<_=nLi9Qzg|kNlVbC)uQyb7<2nAcD0B6fi*eiXKKnfQ*z;|PDsy1*
zO!Lhxsdul<oOdMG*mkiq!_?F%8CgG;&yp4?)eiptY||xU%@aXe)=aPEP&{%$P)@Gz
zW{%v1;!GzerxmMKJv!1U%>3y`i@f~1C5x_I$URiDeunRqTR}607tj5?IBET&MaPU4
zZ|8*Fb(y*HbDsR0Go@D~f=`Cu-y{Bfa@LxKulH@vE;(aeblFr~Ibx=~;N=d}YXJ-Y
zTHMP!oMo~jzvk`NE4#wa@#`rGF|T^OB|K0tXI_W>JiA@8{AoT*Cj`!6JQ&8qeZx-T
z>z<_!_WVY#vVDC^=eoH_ZCLee_RQB=24&d`9?3d>D$jlV*Y?xq^LDSoKNweD(tT2E
z-~Ru{CGp76A3F1Q|4hrBYB%fTmFAc4TzS==8f{I|eV4OEqv%_Rfob`qw1dqWMbpxP
zCOwMeSlCmyWR2?PZHrd-mpuErm|w9)z=<V2_4@kyxBuqNkIy;&;l(67pNO#9^X{4{
zKYUAruWD)>pYSl!%yQ98uGC9anibpmi=OS0>RIJ~`>xUqvFwoAS9wPgqSsrczcSg7
zkowPM!j$Qaj;5DVjF=6JJ(kXCdXuy1`t1*CPL-FJ)`&?29GNh0e%IP7zw53E&Axy6
z-_|>|3#{hl1dE2YF1-=-T)>&9xF&DI*5i-Y@BL=czKY>`)PmP0YIFbGi2DBCp{(q~
z)H^mxlRlj=m=e5TkNql<BTZ3BpY{J(UE5hDvF&H!y`+E7>*rt1`}R8B{-@!2v2|DS
z#GGOjeL!bx{a8@8S-|Pb>1n#r8JU@hhgvv&W*W6}3af!`3~S?;U$<6EPuh6d8!n!@
ze5K~8oQ4)(vY)tffC7j^ah-{6-=8%x|8zhlK-uQ_>#^ms-P8X>?2hCpY@IMsUh&9L
z6=i$ozzrAYCZsy?@Y%B2J9R8{ZURdj>=#H{Fma1H#Hb?^6b|+aIDrgK@|f@dYJ;JQ
z#|PyWu&{)X$`3&&o(#VB=1yVtMb}?neEqdY+Ptr=jg3J{N(wYQKjr!KsMOS@Mc`4*
zhXom{!KN`xe&Ehw_yAP(#>Vzuewp&}(o&nxXN<RO-6|+6dv>C-dq-d2H8ai=4+{i@
zg)cvESh;XvqpJ6`gsoA9R&%FJpMLqqjT`U({krW3GVZVX!G3{9T}Ji)YG%!zy)i=P
z)*|m$KR!NoadR`ux}w3bXz}8irrFcB%>p@^&49D6MIc<~>x<6s&!3*2uDvqT)z$Ux
ztK-Lx6}`Bin098y!9%Uw2aQ)5=iRYb8k?HB)Ze<{$Bzm=St}P$&(2M{0rlMCdLh3)
z<$adBf0*CCCvN@m43n~K^%eoA4sUNzIEtoTUgqoK<|ZU6x>R@3)~%x5N1HCcT(V|O
z&(+o8zt5cJ<mX?$ZQHbylhuP`W6$m?eO+K7vt-$_O@)u$=J=^!y?WK=>y_ZUmo6SU
ze7N%Y-0~aSa%T%E{Cv%y0NSuI*KbXj_U~_RgMVe^=BEDo^3rSOwz(jW>FI(z#vGTO
ztqmG(Tz`FY)z_?TIX9g=JUX^XEnK)TB|W`4eTkZhiOA}!tJXd{oV8U*O3JII#-`%Z
zO(9`n%ep^1wrMFUDu#rH2FAvoZDQsA(<iVnO5$LKNz&$<Q{FCIxKKq+?bj7iCl19U
zPnAJw<v_50MZuRBfrkzs-Wsa6`o)WkX?n4zR<GZ;O7~Nw#KR{iCmZQ|a45D&I8@30
zc>!*~ZQXtO=ksn!o09iDS>?;MZ?_6O@=7t0%FNA8{r~Up1J1Z_Z*MQ}VX1t3Z*R0`
ze0Fwr^6hQ8K69<EF6W!oDySpIU0PatOAC}JfAoCO`myrvT)(sHSX1miam4Tb&l2u$
z=^y%+cZvR<S+iofSKQp{z@(sfL{!nnX3p++ySyVa6l`qfeEL)*rW4T+w_e@QaN^n7
z=H=3{v#d(BR<2z6;%n8RLx({7nk+3X@BW%?TW!XWn3xE<(H%7Mvs_+3*BX>JVydjB
zpMH8NFJ$%IxqJt%zq3E+9~^VX%5=)%-nCQy6x%Q;J6khE{O;y^l$O7w{auRy^Nf=z
zj}EfSgK~LC-OWv@+`78DJ~Ip&HG`KKBpzaM>z6zG;o;$}p{)XsHgQ;e3f^rkdwsvN
zM|_3p#N_-XPv$?4{PjCf#ipt`=y}fTf^*yW)L*k7PGtcFu7DGVVFD{pU5S;f`ZvqU
zACccroXaiWVq~<X+3&9>gIfJVmSv^Scf9Qj`@rIOAeEy*>*OWXfGe-xo4?8ayYEHr
z{k?0;SJqtnE$+l&I7RmE*X()K?=0(n9G2hor*!wW9o;uw%C>QC-gM9}G|}wl&3El9
zS08A<c_noDhE>)7zpZlG#J&1OoY9V%zBg0YtukxVj!lX6m@2y=Jn+TepH8u7_8n<`
zUB+8>y>#!-eff>sguh6I{Ec(GZklgYeQMXbw+Z#kzmyU_Fc<vgO+0m;{XSo6-7AA@
zqA{oEO}9(=ey`Z(i-&dol~S#h`7gQGhi#QRrE&w5*cmKpJ0{QnEocAhVt>R&CE3H<
zc<<)*Oab-cF6Z?7XfE5aW5%ODAvsIy@=m=8HSzy`Mf2Q&fPHb7_s@L$^x*V8@>AY~
zhTM46u{rdI<$ZAtrOrK%Y$hpfVcolM=gqwf_8mDY{6gwWs#$7q;)(Au`LXY#7rdQ!
zDK5S_EtqlZ#-Ad~k5_Dy@I3qeVZMVrD^J}v{r`N$^M7tXzwOdlt825`CVzOrTazBf
z9v*AT)%?yX^$NJ?Jal~P<e6p{f2YW>HRo@PX7Q{%Dze=FdQQLMv1)!1!Os87JXI=R
z3p5^l5uLMsRl}7KliBRH)wQ}u&L#TkT)7ti=7l?tUE?}OQ{&QYA#yLpR<hlCckOoe
zg}6`;P01&$FOL5;Kj8M6^`8|xPu;rxiamUDtyg^Pdo$zO+{ah1&tkk${>IJc^|_y0
z7++XeIPE@p*jOqk(xoZA^358r4I-)<r&HBew0r5qe%(`AYf?J(_ZIFW`L*8-Q&UwJ
zTuu$_EZaXX*C93R`o<T#WO?T8D|xYL(}_z<0}jO%sb{|W_FCe~`dI5lODfl8O%DjU
zQv2oP`+ugp_SSK`a<2L{HS&c}S3p$xYJE@@Uc@x}tV2pe_3Q;_O0OL8RcG_h>box@
zWo@>4ReiPS>s-wx{+C0fzr49}-RaF14y9#BopSfSim7yqI}<8W<}Jz-woFVR)N}Hz
zC4TO2yppw+vS~kMeTCfRF=F*C6q!C@XP;Da@7sIdk5}`u-SU%Pcd$yBb?e3_+RAoy
zGhVOg^xpX(@KD3S{&&T>r_QHGw||Z}#Ln=hB2{L8&9zh2|MQ+@f1iKg*{>OqhQ3~R
zr(K?}VPC#|`kmB-qMZeyDM6DKDa#7$o&UUdr?##6`Kc+sr&6<8Psd){(soSbYww<X
z``EWkfmidRn0LOkt2MoscIau8x6#xT-&?2lsGYCVPMEno=~L8svvAg#s;5mfbH%!Z
zf)*TV&3+qoZI{-G6t(PGF*~lQY5(S|IddzS<J&FfkGbhd+NyR>4}N?9^!-=obMv^C
zJzKYAlGmo71xfyVfsC)eS1fSiP;6Vlyx%l&_HWa2hRfdHRylp=4ZT|us?}4U7Oc7L
zisih2Z$s9uS1t4VVAeco@4Tp_nPQACKFZUgYS`=7ObI`rJTFA4CWy6p>d)lmt1e7l
z74pW<|I<ES!<VryI|@xjLvAK}=$}(KH~Z9;w|`BNwKR@TSm;+A#2y)TD);i;RLR1K
z)7#?<xTd^VEG5n6FBR3caL(6z=EvWEyBF6ScItF?hqvdV>X^rzQ#Nltsn^<*x8Jx{
z+~CK>s>1WV5&zyKeEWMm@=LPv?fOFDiOKm#7VPf3`^?j8@5bwKk1wCQ?sIL1jrqBg
znJGq-D~s=LzxeKXugo@vX@^ZFdCoG=>o}E|`7Dl4%W&E@dH>xFAz%M~St`@~)S&mC
zp!8h6STD}%y`tKiZ5B&w&RW2<ZJB@4>pf~yERL^FIKIZVEn&Sa!|6n+^mU0Fm&b;j
z3o@$JV!6HF{lNA4XKrzMTwLmKG-}Fp$qoAioH!O<J9Y2U^A%lx7`^x1`uk07M#mDH
z?`PkA*|o0ois4I<=PUE4+)?HiZL3jDJr=ih-mM$%dOw06X-~9%nmg<H9~T2%u~XYu
zA7)Wr*<W!k-bF~WFf7NbL2%6({%YH;*DQkm%+1(bK4sYysoa_N-_ml97{+>*UU_%l
zW7T&zt2C=ZaYa_IFB7w#sHRoPguS2rIKBG)dPn7zlD8bfLzkWTX&CS@-LQ2Zm&BhV
zXYZZp3qSTV=lA{VJTERbr>C6Q@=oTP;PRSRJp147Isduw_@RexZ_T#)XvN$MlskW-
zcPYpB1AW}nS9h8kU;X->$(a43@BaDM<wN3Mb1Sw;MEM2Be+&QdtUqGPjjy4SwPKU~
z+U`piT8Fm2emF7dY7FCdmh9}x#^29&FOXTibq>@1l|{|H&$gzg2M6S}&f3MWSfy-M
z?ycOogQuzz)-T#1V${{Gsdr9&>vB%{qzNlu-!_$)=n~h~_^C;OTgt^p`Pz&3`40D4
zc<Pu6W6im2;;Uxu`;aBK|8;Qc&g{#(ijSPVw<7Z*f8chbsY0jrR7Orynl^QXoAa+6
z{pjtLZI(K>Z|pL6h@bbj%=>PZ)rosEw;OWiSC>BYc{cM~fTP!gN|Rc_FI)W|ZJW6&
zaKWif>jGD-h@QF2eEQURWz!a=-gR5?C-|&1*Oy;=U*@gj@(4WpnlmDvL$T$<hJDVy
zH%ijlvbn1c=7inln7MMbVN%D39u1ApyxW5FE}UcTP`o?2>8bC0BdOq%-z9aWmOy)8
z`~N+v3F<YyqN#rQ)>e+D^e1kTxtvkY+>e+f^_qrc*!OL}y+Mli-RIo(%eR?#*SfkS
zIh4-%rlpltbz}dInxtjbm&6O}Ujzg?-}y3w;r8X<b-c$Q-T8oql=aK6z4|F#z{tdA
zuQ$Cr@_*@p_lwx}*ZtF&dwr*SL)_opjm`P(Nm1o}*Pcy$kXfBLDe^X`kn*>>x@7H{
z?4YI5UvK&>lk@rhW$NjW(pS^?zt^3d`(*bH$4^PuCY)B8%NP60aoMk)KNV5ya+B^|
z^PG2-VUp+RFPk4Yu4k!!8~8-0^!(IIFH2sW3Rt>Lb@Mgjey`=1C!VwMy%nARqx!F_
zi0YCHJJJkKs%)<CRn|P!#QyKq_pe{M6k8<D_|3OteZOyE&3XU4yuA17tK3b37y8uc
zxAMFd+Le&M&CxgW`jKCXc7pd}!kYs<D?fK7M6H=9rMk)>X~WuZyNTv0OIANiWYzwx
z-n3*756`NJYLg{9W;$y<6-h~-y!YO+s8;>9mxZrb`L85-ocBK(_Nr2!JFD~T`^^83
zCVh&GQEB_~CnAe`)5&vs3+_yKIP<<}M)iGHm8TOE1NsG4KKmnbMQHZ@zxfXFFJo+7
zw65Q?Xui9D@7!z8CZ_yfB0T$b@+vR)$x}XRvfV9xAo(#fSI+Yhv#Pk_2SM@Hr5!Dv
z?2)gyL|$-SoJ&lr?~|zHd|5<yu5;muoKws4s;(=EH9H=dD8K%)e2DSu{d@vam1387
z6|2<WoBL?mpPykqug@h$mG|x5Uz@<dVmEK;vRXOk@|RCfP2Cy0vI^8b7I6B~Idhle
zjItZaADYz}x@Pa4xZ|eu&5*C+^Xng{<v%&&ZaTm4L9;chx9!J!Pe19%+J@}d-+x^C
z$I>Y&tEMdxdvq!^B%~#7{r5`Hd|LbAg==4JUl+GN{o$cj6B85Ax+~BU(Ol5@OGjRk
zhrV1*X1ndOy_|||ecFm|*REK>(J*I@Om3k0)TvW#zTHT^a_yRs+`aiXuQ~BJ-kzU+
zt@!<i#dr57^=(_zukzNH!|=kFEKo0&jj8?c!PENt&;0rMd8_MP3mHDS>NkdQH6L9$
zYg%4(Tl#PQ?f&7;8ugp&bcLNdwCAwcJ9TIu`}g;E<%34{D$z4Jx3+XHS)wv&^4*i`
z`P!Rj%#e_hlA1EV{`c+sMtOHEzEtfsTBOp#@a&HlsB5r51>ASMaP8VLZ~eV4NlA;g
zt(e``#@5x{ee&G7Yhs#F(a|?IBr+fGlU=-P*Q`g6l4kO&wA`8#|M7LcdC~nf&n*{$
zoiPRMjHaVWiI0wSy12VHs~`B-cWZ^XLq>M?<C*F66s@hJSHAYo$k13FwpK|+rRBwo
z3|OaYmVop1Z|Xnq$uIk~{H}j-_ck96#dQHfe>fD^aafnXd!ilxv+I+MmDMa^b-xEC
zR+d#?R!rgw4+>&(NK1Ra|JnAnYkL>F_h*@N8<ynOPl`NW7${~d;MCFR0_u!5T)%eh
z*zEj$Cx3i=yw%lChL2r;@0UqNi-di$v$d_u-?5xu5ma1k{PE+*TUky#wzua`Kj6+`
znBn<Bxkci`xjB}H+2v~*E@oU2`+4H@>BkoqI-i+gxcK(>KN+CTJMy^so^WnW4#O8`
zD`(vm`oW>drulQ8ykg5EuOIW~cOQIMP;lP%`-aNT&lY@cY7r23+xOg^!|=k16S&3~
zB#I6lK5RJq?4(bi^u=Simk-pxv6|a=>+Z`xpO5m$?J8&6y8H6fw~&<1VL0I{ah*Z%
z$i<O{Ysnu#eXNG{ck7#0zBM!ZTfkEt_iMt5jpj@fzBWHh`J1qV#Q|b=2cvEVSTWuX
znHPf!*yt9C8%%8WR&)D=f6uY`lf%xi{qDt6Cob?=eN|_i@uyW7)EwVt9d%Hcg>kwf
z!zvZ;=?)WJciT?z+GO*2(w_b`Ub%Dsy?VRx%eH$<KSjQe2aN-k&ib_}{_~yU^B)h(
z|C`Xud#gxvbLX2J;b(cbH=R6pZrO%Y>-0Wu2o8OrcmCYDV@tAf)@y}qD}P<iVK95s
z$*}noxRWsYWUAsHW^t9x{k40Y=&JkLFLurIP4kbuzIE;1eZRE{_r{EjuE;7Z)!!3!
zwMt>;$ysXRdegbXFH1=UZ`zUZu|HlY2Q(^^x14kKKij%5i{&>yVlUpXcgw}|z7w9e
zE$4ewvu(EFR42DW!=pzfB~D%cz0-4>@XR2e!a~ENKUd!H+MT!QjhS|#<h)IfN|H=;
z*-fiOMYmZz$`P$QcayctLutK5{}PT|$NY@EGW`|$g*$)lUv_4OSMHK$+3PPmTrW+4
z_0g)=hb>-y|K0WSdSbe0&$|RlwSzOCY+zAyiV@oUdX7)++SU`|ec9bD0?v~rb_(0t
z-xFwb41Oi%7!+rC^yTGR^VzRgbk2Ua^I%t^pVpOY+3%kucYM63?&^~D%REV9k@?kc
zzoI(k9-b3X|J<kJ-=|{Vo3l4cCeIXO6gd3FLfg!`as6wCH=(UlCOO6}@UT!4Vm6zl
z|KYl2!iVC&yon_*?l|_ArySq%PG<eSYdi<`C7UNjm7iPA>u~&_;4NRdc^4;~QW6Sz
znLce1i>j=yqismi%T>?KL)WfceP?;Bzt(AulQCX?BBvnzw@SC>ns2vFokC_V^_u&-
z%%EiH_0-gfOT8Di?0w>Q>B`sYGq$qLzqV$(Pcb<k`c|l`YgfPB&%68W#kz$4yt)5=
zXP|sN6DQ}a@2iZsW1R%2#clm=taN>C@9!H^9*2K_zkT11n0G6SjaFalTz%PfId_bn
zxcQ&`-*@i&F=N{*fut2y0sgsb%xAoux%XyUVCiyE!OR0$n|EK%;9C8njQ@$S&dtni
zk(&A(6S|C7++4Z7^+u+ki%)m!t*Wa#KlSVZ&vY#lS>vPYuxgT;=}DxSu6UH0F0M&&
zs(Kq4u7?~kNm_YSHhK2S)t$*z`T9lcson9LY%RN1Y4YBk+Pm{Q)Snt{b(*_s*}jS2
z-!5Mrt1!>OWx4ZoCeiH4wWp-=jUN`RRh{XzNi8>Zp1JEfrfHRBv-Vuud^XfE?WB>f
z*X-6sEg~xl9!Bk+wsjqs(cYD1r}j0;ZvH0GwD+4s&Fz^tygL0WH~h^GS*KE-)%yJF
zu7dq72c9o`{p0(F^h`C?)L7f_X;UZcG-+QEw>7@|*W8c${ZHHsK6vHM)Q}+0Fs_g{
zCl$34{>u5!*}>5H_4$tHx$2u=+c^5S|9<$%#>(2NaA!=*db?AltM4hl5#P7?q*KSj
zg<JQXv3<V0PAXe0=8wL3*fYf|zTrzxSJ;*E%`!6gxcPeJ(a)ZH&iAgIKJ^n<#gWNg
zE$4S~hCS<_yUNLbRnW%YHP!c<W_(%qSw1}2ajI?Gmq$F0_N?@|n^$sn2G=RWip#4$
z1#g_Xs#!<->9&{eHuYGnd3sylg4OGb>w;{prX}u4D|Jt(S??Ax`ZX&lYw4anZ9Ar@
z>^g25dvMzB*ZaP{@jvju{q<2>^Q51fn{R%XPrumToAdvuuS?%v!RB{XWwX^azaERL
z?)A5hH;zpHbZ3Ry@`)#Xo}Dedzirq2>Pr`O+A~!qo4lV}5W?qe{JkikbK{o3U#1*e
zHt%z>^ywNmmyqKLmOhL97la&&d+!J8Epj6D7X2p(cx*_%Cg;52x?ICkgI?q78*W_I
z(@NKzX(!tBHa_`M?in4=i#<nJEzNIz-?+qwGwHOH?eQzOzhyDrR@uCbDd^6`obUr8
z8}{u8iO~~Z=l6Z_;os}k8D5p_EGS*{>*n7*_FCH77hivU@wE!Hfba0b3t>CgKnKw?
zGG5pf-v*C`Ki=+h_F;iR;UgC@y_glcObb@5=qP-A?BazB0wwj+yT99dczG>ayY}^A
zL*4hUKkbXJ+B<L2BBfl@{Z+gB@4b3kt*E#6LT2VWOZ&^OPM(ducld0H{*fiYbFP;z
z7MVEZ`98(jaqiphpZxqTWX{4#|DK}E1sWXmc%?k=v-m`pu1U+T1kaTJR+Y83aLJF~
z7I8CK;=Oveosq9LHVawIcK2JpN@<_@rdfV>Ts<0v{x03M>`kc1y6-G!jvn<{|N8YI
z7PlbdEsg6|`ON&Byx`FLuXoKEo9BbtrXNpP%+LM*dlsW@)rTIQnb+nXwtF<if9}KW
zbH7*GJ#aajdhblaK^HaAd4l}YPa78{YaX)Q@c7WvtfaF(rGNJxICHRcvh38ua?`nm
zU(VWMZU21P>=d!}nJJMIS-meBNj*RNwdd4@)8C?Mb1z^2^~kAY+wSIh=gQuD^gn;d
z*)pZx`p(LNxpVb$#ci`PG7?TsQjJ&}Hpfr>>C>ksW@cHdW5X_9yeMN?)birR3+`P9
z`FMGku3Wh?I=cPv!B<yTPksLCZ>^XNAA7&;H;L5L)R557!e?h@E?94AVlw5`tE@SG
z>S3#=UR@o|&hu%{mfswloEO6cn-9MIe{}K2Z4b;ZYkAF@-EPLaZuX24qozA+q?MYt
z$eNtV(chk=s~>RbFxRQI0m0%4Q;zs;_T7C}J0g<*O{j=gcj%MJSy#dYnj003oP=|n
z&wR1SdiCf3HdYbT{<Or8U+>m79Q0RM_u8%Txwrpi@wl^(%WGHZl;=j3_wBeTZL0fA
z@m1Kepr%Q-shUZVomnPNoFcYuEPd~j_gZSrt4BBUw}-4;*8FB}rS#+v+rq`qrOeCZ
z7tL_<`lbCMd;XE!R|nQ^T9YlJ^(t)HyR)fFm(N|A5xHG()xNG%H=QrfnrR}pjm6Hq
z&gJY}_UQ0UMXy7q?NSf_x^QonT<`(2c_rrItSiFbaYw|*Xw8+?i+TI*;=I1H@6MbJ
zHjV-5>hA*Q^OY-H2|wO1uWn>CDRA+f`fAve&Mnc`&t~VRJwG?s?)JC$_x*Enbl95z
zuY5Sa^}>aKWBu~$@7`Jb;X}cx)2DB4&yVj{F8h18UE;x-us$t+zJT!T7j}tO6F8XN
zo-Vt4=3CKs8?pJ8_Gz16rJeMN?cL9LGc@GKZ99pXuU8l@oAmyt$i2TO)UQT3U;n!z
zOXQ4k(PdM2Z1bocZ@*rNs_p*U)p4ZZmBri8kT2=~I(B>sxgO%OgmHCN+{~Tp)PA&!
zG#&wW;ji4UvD>rXUA#_~ou@8FPki&g*A4ewdF%fE3A9>Y+|RK0S2;8LeZHex-pQ;z
zt9<bCw?itMw`KD7YR>zz)H8bK^(AxpFNv=TSpi~iIllQp<FxAiPyB+^e!t$NrC4d0
zeIj*|U%TF4h2UDZIvd^VW`_B%Rn9;8opQ<OuTI4U?SpaEB9`8Fi<g#I$?h@=S($rs
z&DS%FFTE^TV(dTp+ckEtuK9hQJMS^59oYF%JxlMi#=?}WS+8tgJ6E^vH-q=?=LIek
zNj=D1|F!y7`woG*_X1_l@4vUx?p>g~|AobJjIZ232+PZ#U+CPfq4`qo-1e<oCr+8N
zWJ!2v*slBUTe-!xZtqd%yC*p7>FMe0zQ?0>6fC^dUly`_;ljrBd6jNA|83v@xA(@4
z2tHY>BR!JFHE!loQc@D;c`*n6R@A<)zW?~?^!PBQ=55=|;;LS%is?ozxpGmiegE~h
zYd?QD%&)z&@l|rbeEIsf7iBi@ivODZ=cRwW)CW^`AyHA+loXZU-`}&JtpgRgN0UCj
zyj;C+%U2mb_x|_E8$QdevHw~rEPiwA@|C~0ey^_c`S4=WJ^zS44<&tOFWZ&DDL*2G
zz?02Qdv^7`vUcJ+W%wi8ngcW!zRIq(ygMOkP2kteJ%Y`-dtcpI@jQbC*I-4PqvX%R
z<=&;b6$`|itLn721-<_r=ABdL|66>ze?ztwWLCL)?p)cLqub<MK%*2I%N;lyLW=9S
zvO3T1=eWLcHT!jm$1$e6#dehKoAYv(mF8hlxzhcs)2=gxS6unKZsla7m|*o(ji-BG
z_{He?X2%$xED6on&MkPPjaNFxZ~5ly{LUx$$4=DW_qyxPe&ux?;yUX({-+n-{qQF-
z{KffuMXfeJcWFO4sTF?W@$Fb;`PC)8XV#STp1E^vZT~$Rzj-z<XPIVC<1Uywb?VQY
z=#5FP+kf3dTDkLfQ`FjZCr)@=Z(`++@mqd5G%V~{S5Hq#<l3<LW~r&EcBT8iEY;Wi
z9kDT~HT!6n=-ppm|Gl}Jo|3X8``Vhwb)cnGclvkTZDQq~ay>LQ_U*4<*Z04x`hK_k
z?>prSufM&!zWeU)n7i+Pe0&^x_3Bl-^?|qV#n;xa5BwW*yMNo6>NBaSsdrDEK6Pr>
z+~E4ZD_*l!$!}c`+K8~uF!|VzTHag#wmc7(6Mw!j@i5!<S65fZ?*ISyeQa-U@49Q(
z!osVocYpKm-?8RZtn|FPb6Xcj?!J4~d8R<K^8sQ8XBv*Md+8nOIN$m~$Mo%IiCx~Z
z;p@)4^}5RKac<@ggKdY^Gq>%KFFWmNXY<KW{odah+rH11%&VXO@LMv^{|^$%Z{8ao
z`j@{h@7?{Ze3ZG_6>HWUN!obf&K>YL$<?WypWPM<&R(mXXlr6J<;|O%4?P;KZEZ<g
ze?3d;k++}MZ~t$`wrytrK26_0Vdl(}v-9_PdV6!{@B69N+1Y9L^)DwcZ|c=mp)D;f
zEO+{&%F4|2_kIz|&CL}N7ytZXalcW~l4_M$?HjN8czHwn&SxQ}j#-7lQ^yvMkM}QM
zv*t{Cib}-a?!+@Q3_<4%tiIZHHZA#BkK~K5RhKSZ`g86fSD5~V-x*t@c78r*Jrgv&
z`uX|!@F4c;SL@B+uNH9X(2nmv$Ul!kBk!BrqqO{#;H&X9|9WTdooFn7wdPnO|GO#b
zUtP+lpFV%-Wb@4T<)4>;hN>F)QdZ12E_`Tp@M`C|&kcShbLY*Eefz@7>OyIi{M!db
z_307yuI}!eOI`+nZV1Vp=(N}2(8<Z_zisR_v`*Dt-ShQYG-%!ZnVH7z7Z<y0o1eP(
zsr%&Z=kou5xZC~vk^J=8-=NOEzGp`|g&FKJ^QU(mO?vp@;bDp1cYDN}4=&J2cvxZ;
zxjk?0HqI{#<MLzQ{A&?#im9v;{qrF9lGzF8nrn+r+*Ee#*|BF1Yp`vjpL$8zqStQ<
z*j?tneX*y%uk6JOhv%;z9Fdp1Ty}Bs-QDHC&y?QWmMa~++%NRm#GG4OPA=b9)yUF)
z)G0Q0u79P!lateq-|u!$-Km>=yie84Y})<5@5=Age!n|CMRe1I2?BDpUjpSSpG=hd
zF8HD}Te8<JDmuFM+08e%xBE-pWIS>5Bq-r~C0q*r`wzPApynrNux0AsFW-JtuUejF
zB31c%?e-g6v&9)^o8<<%{j0h?zp5^D!Ti=8n~qM1lgYT}vcX7^tv!z2-ihPk`J2y|
z?R2lUS?o~ZR(D6)b{@lts|VZH+bqnzr5(K7Pu0{^bZ?x0M1+K}x}S==di#V40^4$K
z9(r|kb*<WqYIom5hYnTz`FMP$P35L-r{z@D)IR<D{a$-zKxbzs=!A>>tdNQdi}Jgr
z;p^4^vl~@^%aN;iz_|ZqPF7>w_G#r)x3Y4JEx7*L)5j;}^Ru%p?d`v7@-Mx*x_YL4
zecgp$QMP-ZUAq>hy7vut{12w5PoJu&@3!yz_%8kCrqol0KVC21{`CrImBq)S;-22#
z&g-u~F0h!gW&6J`>Ma6EA1>}px#7m~Fwtmc#fO9JTW43NUU~HQ0_TN;SJh`r7H*1^
z6#ey~-#>dbw_;m^ZuGVbmo6P@;S`=>l*%Qn=9BQ{#YG-@yO`)u4n;j~$)AEwF(T<<
z$CzbbSj8@w^;o$PJo3fH1zNNres*SP{G-e9=Tam-Jd~gR?6Cc=@Fzl`(I*KG&<dNF
z65ZGP*WLvWFnyc}S~~+;gusEZ5(hNw;>5!V8aV`yMYXYjOb3}G;M~Mw4`w)ZC@%Cr
z=zs3==fb)6{PO>~udn=mWA|Ipw$_-nYe8deAVZk_);G;xQyJfEe7wR)bz<}D`6)9B
zrKWv)zT?;5{Q=SYSYwu}a)2Eu;KY+*%Vz&n)w|N>HD}%T`~5|?i_Z(r-Q0LidA;G!
zi(hMY{+Vy{`G4IZ>GQUp&rderF(~WVwi7gm-y-0|!{OLG|0}D%QRORJo6R|f-F#Lr
zDvo;{Z@m9`{jcvY{(O<2Q~Q`fzE|$_^=<!~?`ls=*lwM|;=xfEXeq-7s<Y$PyRW|v
zTB#!?CB=}Dk?~+!bY9>*{t)oM?~J_Tk{P=}R_XOFIC%cBeazwh`G3@ouiMFX+g<+S
z$Jw_pw)#H#mY@1L;??1jZIPK3srK9NiyYj$e)i9^{{OnqZL7*P7mrkp+{MzRbL%bh
z(WN%~yl-w7U=Gj7(71Z_s>NJC&~g{!^ES@W(bDkFK}PQ6hF{VJU$)N`cx3W5b^o)S
z&*wdExBsIk-5l$bCVcaz+L>E#8}_c6@aB-#n_Eo!^|@!&Hf`Pv9?8>6IPG{k=aky*
zC+~B<wMzz<DTbCEh;v=|{W*83;cp@FbN5S^B%1A9zcT0Q?`vCqi`Raw;9XU>o&hxa
z_jj*p@~16d?evbVFFx?#`CME5&-MT3p57*%|M1F9vv2>ubGh|5B$^*9{-7`2`L~Gc
zwDGftHXqn{*S|^cDwMJQAIP@uqtP$rmK`b2&d>KRE;bhHuHjNRGWDTJ;^qCv`|G|a
zhy6+5+cw?o*UpWf?tHl7IA<FNgYoUtYj5?+HQt(qJfz3JRyqeZYA61`)Lms__#F43
zmTe2nP0V+TUzxt6f+^O0-<f4OT0B2R#KnW()ZPcJ($N2w6C9siyPxgsGN!EL&zgSy
zA9D;R&3gaR+Fmp|^TUBP=1gq%<~@7c-sZn~aBO0DU`;$*mD_^-f8+lBYuCN=Z7S=T
znWg&I-Fy<gJq>f&zZX96zZw!NeU{t%vqb5>*xPdjoMK8|U6go#{`7SH@SrDMU0u7b
z_V@Nag$!#qw{nX&sn_P+*-_}V`_!pZaa*H7ZP8=9*REaLyJX3d1+~6&ECN^dr~QAG
z{O$Vw@1=HsJ{*S5ja(5=N-#1iT=e|7w30!F*Igx#Q`*ZcYIkj8V5kmdU9v3cikQQL
zZO^Q-9xZ#kuN5+4_`Tq{X~&J%*@|U+#YyegUW@$|ePHz|aoM?Pr<8Abm@0Lu<gamJ
zVSC?t>o{zcN9OPEpngT~vjeeTybe5gUhud&!rtnryL{c5>5mred_0@~)3<C<mAl{P
zm(&$>%oYx=Ot{xP=g*y-dpCpG4r~Ziu2}y~Hg8wvo^89=O<8*ix~M*KYJ#Sh!}H2{
z3(h^?RC4w6wXYYiguc7HPMX`5^H$w1dG80c=@0LgriO*vTRm;KQ=6Kq`r`_3MNRFi
z+uQ4$E<RlMHtO!L(*1d<_aRF?`j$l3Dz4+1ZI-KKWHf2T3XNRBwQJW#=!nhnQ%_Az
zT@$zWmbwK8F{|M0UgrM0#R%G7xcqYG)vVO}`)W;0Og3a+*8}DL%P)_-ESWTC&YCZm
zuU$LV%x`z1TYuk*FBfm!I@QK2ZBh0{;_B6_BI4rOzrS7Izy0i&mzOQ8zGysr_|WUW
z6Hf*EtChW9@9}({w72W)HjzuqS8ki>docI`L-l6f#S34nX(?T5xGJ{hXhPERePT(=
zT?Gtv#j;+9K0jsrDQVrJ4bfIX8;rIxtn`|7MWs|LBwQ+3(=<X;KOjH&YwG)3+w*5l
zULF_fpBeIKlHv8h<P96|{{Hu4FWcK2YuJ>Oe^u~ao2{{;S2bSp<Hy4>?!GanSo?+8
zc<TCY&1Hy@w`!X$9K7*Qsrvo1KiHN>-&>k;wEyRdZL?nQpK;>*q<x39kKbLrr*xj>
z`5m3tGpmAbd%rU>*cr1!%ShAn;>14A>Cb=OyEAp(><?a>KnrXSJ=M#Oa!&55TGtI)
zmhxvsjOV*6T;=w9;@MMw3xvx1W-FNAy<D#vIeDAW`jeaAb45J6SqNX8Qq#BmqnWVY
z^{6{{*{$~N`}Ve4&L?N-k=@?%|9-X3u@&_>8|$e$HD#&8(Rng=ws-$~#m=qJ`XguS
zwrxhq$9TR}*{%*>pLTkhZc9r`#%e(+DX+3JGlq{JKem9{rfgnQ3pYotZE0&0l9%Uq
zC@C@N?Cg}WuZxM^I{VZquP;@$pf>GUwgW#tKGxLMer@)OWx~{{NAK(`u4P(u;X**z
z+9+2K50CA&zhB?Kt!8K#SgCi!;d)g3vw5F`?R!nRtL)wR-#}KpOpsQ(I2UEfi+#cN
zpg6|<ilEL9p6*<TF-&XQlhyyFCf}RNC5m+rGiAl)IaeH~O)a`zQXc6hbM4bx@i|PY
zzg8S;J2<&*TB1h!-e=Pf=V%?BX0<$Dz90cHiaF20(t7rrpc5~?Szj(^Y@Tnt_Wh*7
z@8TAv+jvjMmj_Mw&XI2}^JK2=?UTR0X2-}|H=kSl-ssu3jJka)!VTMkm+$y}@1~5k
z*o$R}YS}*Xq(3|{F`9XD&(3-N`I9f7STgaj*ny%MZbqJ;@5#G7-CzRRF2MBlapv>$
zOK#7Iob)KY#N%rFuKLr7Qa8QdshnTo0a_Ddz3$AXo+(Q*ngp)C{$TUHx~BH+?V=gS
zW@bmcvE&c5^e&vA+1v0}4K#dNq8adz_e|4O@uY+x{R)EsH)|;=sfbM}oMEe{PFD9f
z%D$%afyH0lZw|u;&+6>lTvZd3DaVev&9A$1>((vM>FF#l<2$qiUu-e?K4*UB*C)^P
z-aky+)x9^%cI(FelK)H0)#g63sW<mxQpLGcW|!Rr{;+55d*?-E%V^%cr*fVnw#@A2
z&85&?2+Dmg@BO}=_uG8ZE8dpmWy0lxK?_{uSGvU|Ejzx_t?16;deOE&2Qsr6B|Xnx
zVB59IDD_-_V^{YE3%3Ig((ljP|FQSy{ila7&kx$Ta>7*o>50{^OY{DRnFW^ns{Q&`
z(dPTdX0Dm`VYgP}U$e3+th8DL7w0`Y)3JKX-P*E6MK>N7B`V3z-T%dsK}Y7>PWh8d
z4jBhMDcV`E*0*eV=h6o^?;V*n^VP4~!j-?iUCs}vU8{fO0rIj}E6B1})*|#>S@S>5
znIjXnCgR}3!|zJ2Ubql2ul`>p!~DR7*RF+?y}QHNa5QP*&Yd%V{P-dFTl`U1$?y7)
z8EbTZoZWJ0?}^5(dk)kx#|HFWjq+=}A2R#h7EQBTB6ALU7vI~oSyN-XlW%N8ppf<1
zSmx7Gkfk{RGvCbfU-h3eIw@d7a42YR#y8HIUnRV5DifzCF4&`RqKOT(Z{V9i&v&N-
z50*b!-(K<g!S0-$=}evcDTUt-#2s61cT%_buIKjoTWSvJ7B4S6`_=ry%}a-t&#yVO
z_<L>h{lDK>t!|&o-2Hm?is+eMoT>L5js_jsBy`myz~1HQn}wNYeWa!;F4~)O_u0>z
zn|jw)+y1Toc2}2o%}a&q^n1rtmhQ_hT>oY3d)Shl&k34Q%cKf}bgN}o#OLpty_zW~
z<Z~6%HSwem-2D8{*X@26B&G+dYWD1z!;0Khxa&53%iFZ`^LQPQ_G^W%nq}^q|L@OF
zyT2mh;+u1Cn@yTD$)ft3&ccNYuUx&l@cQeShRJNFr|YZR*w`fecZw-o6L#nEOa}H9
zt4#%7{5u}b^KzbvRzBC1i!;3H;)DeE&iL%y!nnBTaDH0#&T76h3)0suJ~qQ^->*BO
z;4K+`J6CTh^R@Zjb4O#buH)%H9W&h4Y;5Ct3p%bcZ1F+crj+%|%_`V7MZ2i5g&faZ
zzi832_P^by)zfyV*9w*&2nMYPk}$|$e&<2Do?ra>gELA#1?Ns-+qLcO*DF!Id;k0v
zj5zRM`R2DW>+^o{Cac>XFn#WCZ1>f3(ffY(basZrZTyQrpQ&`aZ#=X5@uD4eDJshA
zcFv67^GiH8{O^P_x0acjEUUN#n!Spftd+Z3e@cmw?Bt^5n@o<+o@X|BCHvjQj=MZ}
z`h;FObmzBP`K0$uEGN4oo%JS{Se3kFpLuKj#hLrQ%{>!!{*K06KX<Fof0pn4`F4B9
zq81UU>pE&PK|}K@u8|)O#Mkb3PI9Vw2AT1%+ke_UcG=qHwd<b6dK}pOqQN}$?8}m(
zM@KmK=U&*t&B?iN)he##mrvgR|F2w2ORJ-=PtDRYGV;xV*^8FjiRJHJwMr{*&qud2
zX~xoKIWM+3I4$_syjM?=ZArF&@b~QZ-~Y^ba8dPc{v^Ft&@P?@S0<Oa9=j0XcN5z(
zBeyF&k}p?TN*z4)r&B>wpSd|}$;lM9q-PVnELm^fOj*CZbS;A$&*jHgxaC$HodDi0
zVtjn@f@wGY%=@OVr#YWrD#_z~|I%#=v){a7I>jrw<oFKvk`<bv_v%v(yXs<^1wAWM
zB(5m$S!HR@y7kDj?|0n&OZ29nUV3-Mx8qGa@9ck5YUTfj^)d6#8+N}sHmqL%%*4v-
zoaM=VpHI8=UHCYA)7?GE+50{O&Og0qlFnVDyzE=eLfo8+1~YwZemrQtb=HaFqJH$Y
zoP|r5f_IOko)S^>nQ`F7#l@0#H9NMg+L3c+#wKlpAA37_!qnQ7Hfzq_^)j|Qf`^UK
zy>8FGnfrThNFToOb9H>etjQ<b|IhYL{wFLG`-w$f<WCFx{y(nodSA&fH2SMX-V5Y;
zs_1RO4epd)EKhsImUt_%{~*7^)~C+<KHa~4vf|p2PhZu(h3{|N`}4ict|#heVm{RF
z`*G&I{o@1d<yzCLnD(Du8dVhq>UuhHT&y-+BF?{W%VD|8_gVy;+n4O+RMb=RtQL0S
zG1)8iQxMvX)t-y!(K<HCgDqDia?1+XB8-l5c+0kJpbUQjJPS8z(xi;+?8{-&CNg~N
zhK7bFCMFr(pl<a=e^3XTZBJVpTi&jhYGS%kE#QXermU-4-`?L}zqab=qy*54?;T%2
zop+v$+}vEy=9Zj0J0?DPl9F0oQev_>?d+$O+91;eedagKpR@e=W2<^OyMN;Ag5Pf}
zzpc%~y)!D>mqSrcs{5!Dba{@FtFtrn<72(SL65YwwH-}oeY$=BUzn!8mR3;Ei#=Z%
zw6wMVF1w@~vm@YT`NKo457b%x@A5l-d%g7S<%b0V($c3FI=9a-Om5pGZ?fL^Zab)7
z{A*qKLH}!e)*qaiY%_DxiGyGLjm}u`djBkr`TH+^h3<W(b(e)$I2H9~M(6LH8o1ak
z)4W;zf`_kf>f>X*7IXbptzKREYUT1NUp8L57G{=n<G{w`<15y!Tef3|MEB7{i(I=w
zcgjqy0}Z-~=|;JDcyz2PkJz3k>$hBZ_0?1RYJX>BWF%Z)7YjNI(DPt$zenZI+v~s2
z*isv{HY_VUd!|jL(bcP0*F<k$7cCFzH%PS~UU+jd$mvz9k3U$xCq=VA-S*)7f4>9s
zs^3{IDmJ@N`NUMse%Czx>HjCE|GV#B@pz~DOPk6G(#QHPnu$AgaF_k~ka%v6<>I?M
z4Og>NO-w>0CA<3i)C>(LK0e;hEFdLyYE|fJ4o=RGn%({V%QtQmY(Lz1_~C;)JB!cE
zvyHyIyV}KL{q<xMsf{;t7<%OG=WW`wX@Rm~<2UaHyT5_o1?A=aGcq*7R)>OOuSH<5
zh{=!0_zx<Rm)|>Vd|GVtiv`Vn<!ef0e%StBRo{Qk|Np_8=6oM6zSvlk``iA;-XzYl
z-Og?eEdt`9At53YCr%VkEd)($^vT(BIaE|w@Y{R<jmaflUgmq`*s(I{ubJ?PO22tF
zE6*5qL5C^pF5la7<u~t@<)EO_+e_8ak6;fEj&3nsC0*UK>L)-k`2F2o3GguE)CVgT
zE^Ms*{Y_KZaqZf*Z|>|A{&Pm&%f~0>c%ST>8ylOC9C2Bizy9&@eql+;lPdxjZ-~&j
za`o!ZDbJrg*^qRUi%;I}&E~lZzu&I(S7e)i`O5Uav!2hZ?vwxbp*@FZ+k%CVohVt8
zL1QOxa?T&#e&%$}r)lZI5vlEYZ=1HuuQ{_UXOpk^Yth+;sp3JY>~BIvs_ORzh;P;}
zJo$6C9CK`TDC4%@|J+v9t-n*fVAX}+)!E0EWY!zj&1Gh@fB&X(=KtUCW47I`;9h=i
z+s6O<!wsrfcy=4kYp%cP@n(8(#5_a(=Z)qW6{+^YJ&$kv>^CatoqkbX@rdixIdgnU
zOHH}ObOOY<K&P2@^!KYnHX1F}f$T97mXqU~cV*+QT~=SJY>m^-B>epJ)GM;2!~}Fj
z5eQ$rcyZR=MN1C0wzhu!@wnf(@>5E{(zP$YR)wvPJNxJ7XH#9~_vQifA3l6|r}TR4
zT`?PhN2khXZFqVAvAg{*LG3yN_S@dle_0gff%m{nyRqg-sz`85j89>qmEo)+(CEtd
zY3T_X@%~d~l_q_%xqYYqPl)odE0%X}^M`$do@Ag`mmoM1?I43kMW4%U*>+u<#FWEd
z#yiWG^~$kl!E@fNO;s_yf7u;0SC#wW3aC3HeJt+qH}kTB$0t^6?9*qqRlab)PQU*D
zVX?g5r<k6d*)=^|dD(`gOJ;0q{%!GLdDg0Rz0X>gR`yukU-#CJLs758{OXzACmcdU
zr%qb7OwYRTk;`_6XEW31aqhA>xP9MO-M4BVdaOc2Lm!q{{rr9Zzn`ls>&1%~Rn*nB
z|H|4{g>Ww0^5?C2!2A_rPM{Lz;lqbB&ZaH(`5n`t-Hv7P)>hUALFWz9k2_Q*P1(JY
zgU9WDlDYBi)4WS~7Fy?^?YW7yjp=7xzt!RP?i;JQG*z4TIFu?W873_L$y5(YH|^5*
z5C6KTY4__x@;(vqv$FSVCTx#it?+W+|0SQBo$t(<af<n~+><BI(>|Y@XT;FfD|N7X
z>-&PszK^%wEnS)uDmHP!<%O4Do>;}=9mr&L{xeId-Snla=WSotzieI6{Ia_d8eSK^
zUH%)v^xm5L{W|T<yMA5NWPkEbTU-0!^1K6&UkBgc_f@!S*YayWK7Eg3ej8kShf_r*
z<6L2?*sc~OoxNG>tM10#y|ts?*HZk|zrWYSA6?4M$awI$-~QX~3ylJgge(I5bKiVf
zF#pf5O_y^v2gN<`tNgfZOQPAt*a+9})e6>Ts~bJu?w!1oFPeY81;1X|t8B%xC>FuX
zNej2dm9Dc<)_<nOWxLYlR3&c|`o^5|)vI!lMnk50YJRTId31@hz;+euu4_!W-&dg@
zI3TCWBk@OOt2N^eyAmFA^<_yvU;FKw{gKyi`yTI;UGkp;b4{<;8%}($TH6}lw>!M@
zwN3H7LgDq7zbx5?b#Kn@yfvT&TKI-Q_-jLJP1ZKvDe?ag+n=*fJ7H$}@sruMw_`+8
zrs;gPoOkTD&yJYv!gBc+KYrcX{=U*+<5Z#ddVfFuj$(el`SlLia;)@?o7S|PS!(I>
zb=BVQrP^!%ZfQgtB3Z<AjbH2nS7G9w`<Exrm~rBK-M7to+_D^sdh4$JGWtGe{;$k6
zkr$?4^giD)L2aq7z~+@#&ht*2yNXMC<7K@MeJ{O|)-RtHvCNf0@N&mevHJ(*wV#T9
z=un@^G5@pFnltj&p{?^mRQ;<afB$Eyw)gek?$s+7oRV{{Dr76X7qTqRd{>$e>r;t6
znW3O{mRB(cF%~U<ZFpg;SjO(@Q$Kx@dK5J2MciWT8>bMPbu2Ic(vvK&ZwyYqz2Q%(
zI%{SBhqA+t_ik>UyC#1Bv9BAAU)cQ8OU~<l_T1ZuF~hpFYxn!PXE!Fldm6KQ_DQM9
z&)du`dwtT3^4I<TcKz=jq%n&?cfw;98ZPiL3m<%A7B3n8?7f!o`^voklZ;e7w6njw
z*}nblRi<s8X}PRRUIZ<05;b65qkp88bBfk8U)#^qmC6lSZmkz^4n-ZDu$myT?0Do|
z%^2j3J%8S58h@+G;uZgw`Elxzxu49=7S}1w5aWJ&`)Xp-#4GML&-Il$r&ws4J+<Ww
zgN#+o`Cp=jx~u1Ib^UF~c?rs^Uml5V5z)99zv}fxZE(;Z^2lm4yAV26v$&2YB&Ox4
zArqVZ?{9y4^UwU(lb`o*N|$fznwp(Fx1-k=|K7f-b62*}#qY<Ba~?f^xg}E4Ol!`?
z>oJEf2P*bRlp3eI#VmdMZnH3SNz}fT33fU%c_H@ammD&#dITMuNJSc);QY<^BkJ#)
z&3KkgIdLeiv)KM$y#Ls(ru#nM4_we)e%3GaVO7PF9n}vWbF%Q9y89&{A+36+Xm(}e
zB)Kre1|a6TyAc~U$=z73q0`#)D5<Oav*%Z9aqpOySFR^7$kx43CNJpuBvnE~pJUSk
zN6^+7Tb9Rr1q^;@{(P-?&*q0-^t+i3kC-Fp*lw8qaixFJ={uPWHJ3hdZa*{knCbQV
z4(Z<9^Xoow_TT%?Tlf98_=_Ct<!{&JFUm{RQq_ozfb0=!`lYCq&hML@c4-BV;M>&K
zX6MgO%gwp_`sMx2@AERlec5kXe>PLo{94;xy>xx8``uGl_U>HsWe&Ud#Z3<~^X2T;
zn_jT{+cC?Uf7`m0r`J~Moc-8hw>NKnRGW2zv_I0|gA+&L(alkX^`}J-Fuuy-we^|7
zcOcHywKsj!)~a*;mDW!g?L*7X*S@^|Z(YbUtE`@tPgaNBEMk{8y`ot@b(Q}cTV?au
z@5>IJ!a5+Z&HVm(8Np7*tA)2#uUPRi@&BXE3-`(0m1c^`Zrt`;aI#<Bs@|aepMUPz
z?{2HR<HF{KgZ}BaE#vNfl0N2F)sTH|ep=0|$u9Th`Oon&wDHQjJ)ilxXJ5L}_hYVw
zwI@8>Vv3FTSA5mKweFYV%&orJ89pDEID+>rzTGn^F6h$95}#9{cdr<Oy8p^5knaBm
zaQFX`-}F#UyaNDD%lH1QUCa3GrT>+fXMs*9ub5oj`OX>VQX<fDfJ4ZOZx|Z8>{q@2
zsiARv!o^z8l<LjASzf!<uKo5o!nc9pkV4wJ)dyEB*;DCipnJ`uS144%@W!>(=T=v7
ze#Cj&L&)k6J1;NYC1w-Qt!Qg68olzn?Rr(S{mVgvEH}PNyolo7a(92n5*s6)ry?4R
z6SB_vJL+!ydG|ltm#OET7VX?3ef3|2!SvtL_xe5W+@DaRAb#6jUa;)z)j4kN$1T-w
zme<WZA!t<>ylr-Q&RKE0SH+Pbla@vw%k`}eNK#Z}QJdV!E?*O{JCZ~3SL*3$x?8qv
zF-Sbbvdm{DXd+p{w#wviJOA}C(doUC!DXy$`^_gFJk=s0!_@buqSm-xdZT&U#?RsV
z516P=?Ehyz{n#IMi(OAR?KFOH^4I<Bz9W6rl7VTy*QPy-*-j;I(3@#9C2lpSJJ2E^
z?oNE~{MD4ILwim?P3L@eFiB%?7^Iu6*9YmFA3y3>t*xv3bYZ*Pr1uvElR74CF;_g|
zaC!AadBv6&{k6Zp72dD?e(~D1WxC+m;vH{5J>nRldkxR;>?{^y;8bi8NOAxjEm3%J
z%hs(Q|9n0Vn#@f*H^(zLSlD}-4(OazaS?{lu&_no(<LCYZH<Q?DyXTowY9P3mVzC$
zA7t#8)6@5TQI+9q|8ys5W5NHw-#@=xKELSA4Z~NjUV&CKoIH8*$&)8vtQoMb?gTl-
z>5B(w%M5F=h0LAm_j_&re!2YQ>C>OF4-^ayCn~%5C2ZWW|JJtcee(8xDJd$8-Flf6
ztgL25ZcfWwjja9lmQ3OM|NnjW^efZfaqq%~1AVgAH#R1-hpnF4*2Z?}(j^UTZDlK~
zsM|Ix5C=<a<FNTHWu7NfwHLHtH}&_SR_>`GJHa!O9^IXt4<EM6hh2Jp<?Y_vpiu)u
z3(y9g9SXU*xmT`TGphYn0y=;4OO>tnG@XZAug59t>-XRP^UVA&Ukw9jfdk|i3F)f6
z^G=;wxBhc(Zf@$~HeMO)vYt(wjKbE(t!2@FeQoXGmnBJCqi$}`pKoNoV(ZqaFE1}I
z{_-M_L9XhBV%fVpotIxeIVv8Xa(S7r*MHC`j6@75++zf~k2<-!vfBUq*#GmG`M$=>
zFPAJ@)D-{sRrr}1hRyMR9*O_utJ&k^<g{YdsztkY%>o?)$QXdw3iabhg_E=M#;COm
zqEw)VP3&`WcJ}n~VL6bsHEHur&;h$ud*^N0VlvYov<QMH2{ZzucjIxt{khlc_n(_%
zSzNQNU(&d3u621_z=OqNva)9{E%mPadNq8jtKF4ul{q$*MlWO(L5p>kJ%BFO=>p{i
zHcrmE76EY;E2~-a|NnVjCvF+BHA~cO@y7GrGAqDGP()_KkDv&RKHFY35xNp*8yADy
z;)&O;g?W|=gLYnXfDD=*5*H`u>+5^#>|V3dS0O>c!53eDZE0;aEPUirR8+L(YR#E>
zw$cq7HW<j&|0z`SpSNZ$)4ZQ9PoF;3iQcy6_9G5(sMbKn03|y7mS4_eTEHL6p~z-1
z`Q(vie!CTS-&{Y^DJ*GS1{#vSr6m9V$8mcNZSCN&CSfNYSv-S%0!}evd%5cNIG$HO
zzKzM?(=Gj?vLp68pUtYQ`E)XD-Oe;Q4*``UqU-e!_Fv6<`&E3}y`s~)w|t#C6dgc$
z!r^lAt=WFdA5Zq*_UYutwR1Lx6`b|`oMHJT*lpf_CHa4!6U!N%aCR~E@^C7$$uGWm
zLU;R}ORK?yOh+69On!W1v%4N++;3ht{VZ?%odf!p4n_W{e<wKaf6S&v`?Wn!dbT$4
zo7=D10vp|HRLl6lT=2|a^iO80%6Hwov}-yiV&BJ^u6%mI|0eGmz5HkL`FZVf_IK8*
zcrSOJe)TJBYu2<yEG4^Gx~_CPg{CdM{BnwWQ@&#4tzVAY!qZsqneWvQcj8cV`7cAl
z2^U^h_uqU{|63r@EOoN%izQ!YVy?(ociZ&E>A27pF~N3Ut9D#_6WW?09(HlB%hzhw
z*z0>vzR`TWYg_YQ-WS~s2mAe&7cbv@w@K*7mTmVK9g2&MpZm$S-F=sPkKx7P`fnz`
zj3>|RJ-v%nE#Ty-J9}sOM!pD=ioE>f(9@!aMW&#IyS@xpyr(HmGfkWHviv^GKXdGk
zoIGFKFaP(2`<jS}eTlc(?9F%0lb&bQf$t=Ydzbf125Y92+_rPMv3kXZqk`$Hcl=my
zjpHDU?U9|QKg8v~JmR3g&eZt!>AUd`_k=gEY`Ar!rt9)u+vbT^{>c4f`x1EI0sHww
zY{}~X=X~q$|LAtpaMk}`Qt9`9t1~Q~>HYioyWIRKvdMYJ>W=ySvvl0&EzqzsIPtaF
z+YLUFsxxP%Xi4jc=xQr&PU5!=yq6pJWX3gzcV54&?2>P86Md$e_R+@v_d8ec(xG23
zZ=Lj+{i4>0uleBi8@f$P_9S&(UY@<}xWMDR>|Gs4>MyHI+EdzbAmPiOjCG6E@^(Fc
zrqgD*G9bEs<Kl+K({b_K8;fTMTW^Wm{$jnu^##)eo6Q2=K8)HN9_o;#b<f*apgL4>
zY03m~4WYh{BMrUJxc`*$N&LA}cwE-z=iZfPc08B9Gy7ZYwyDQ9uQi$X`*R%AgT~PM
z<af;6Q{NiD`^n~Cm%qx$O5{Xt_jIGH>J1wMwyc?G+I@MKR^+ygrTJ=^x26^@erA-P
zrriEpWPZerZKBW4_9|t)v$?U0_x>~6sjDNpJOVC#*tFt^Q(%*p?0V3qtHAKzd0$%v
zoH`c1VKJNCc!J@(nd8d*4QG}yXquGegq8pQmL~0XH8u*g#(Zsc_ra5XwYo?Ax)qY5
zbgo=meQs*{lcO=NiQ7$<CZuLD22C|t>G`VU$U2i{L0KDu;uhRn_UiP#t@-y&)cyCa
zdhjyzQP8H#IiL5Gulg+iC2Di{#(UG8ewi%2vA+u25gO-j=kGsz%YNRYx7+V8+q!k?
z{M<g42c7G$e7-s%YoAomS?}|6o_Uv_f0#a7nUlBl`uZptn;(rSmyEnMKD#kZ%gsrZ
zE1oJS*FST+q37n4x%%u=-+SNjez#<urQ<tyF4b4BUj1AA%&33u51w~lLe{NN$-Wf!
ztn%^)t%OLyCvR4MU@3;JKF~iJU%OwHTd_sJ`B3BiSsTv&o%LM!(Y?TD5?6e~mmd0&
zZZ<W^d+z1s|JYTlZMPmV(q-zH;ij|o2j9O4&GilLHY;6zEYW1u{(RgobfJ3a${Ta%
zJ*l0YbZPe`!N*xzD>faU5I4thj``G;w|{3I3km2uI6G`A=qOOxlt|6(zU9+Xk0k2e
zuREw2ut?u#u`}c4+gsj%mmc(etG%`<C@#)9#!Kk#<5}wxw0Dab?fQG}OYDIM>;Yi~
z+`P5Y4f=O&-8HNC=CYZ7egCK;SDj&Z`R?uaKU`p2>ZfqB`}&0)XKbB<b{b7z>Ajb+
z`P9AUAOHP+%)GPA#nm{pxM@#6SLm-f=1X(eE&s3a>|FDmsjCW?%bgOPcGzT9^V%sw
z-{f+bCPhXwYVHzQ5z%cFAqqaq!tlzLP20a%u2QN$Fll|+{=J-PN}A_uH=FM5%X!b?
z=wo%X@|Cpe_Y=;oiuMJk&Imlhu@}f|&eU~|8xvCNZoFQ(_1MHm@Aqg=e&D_G;<TU1
z`N!O3E>8_{fBUa@Nmc$5*pz(zQ3Km^QYK3;K@P~MG7L&qF?E)HvFg+m$f<viBpjRN
z8`k9aJ^a1$-9*{-*KenNxH=&#?#F2prTTBPg1)VnzrQ3)vZcIb>86g<-t34s=6iij
zt)8UbJa%nw@XoE#OGG-V6<hc2oIGXXLeHJm3zwXk+;lB?XPBDkD~Ig0-wtg36$Luc
zK_UlntVKohwhiBtE}i^Pt(>=fRe`Nd&>P_&8JF*DS!vlky}D@U);$iM{Mv{qbF;T*
z>l0FKH-rbS@M$^^KFQ)yS4u|@N5NXt-~Z&qrX+8j7W}|G_NwfQXUKipfB)FN_#Sw0
z{Ap3)VQ1+RbA{O27p{4gyYIKL^y<^IZ*ELxum5-BV7T+D$_LWkH}>9^{ozyjZN??D
z9U4W`{8Y_V!%bf;(mlUK#nsk-*`zg|J2#{iUVq``uXS2u=FT>?`4bnaU8`VTJ@3@j
z(`oK^Plb5>S+cJ3(%l%*1$Oruz~zVHkzahKiI-<euG4+Nx;e5`Ic3?pW5ze5Y@Z+B
zGq<RDekFq-ThA$8&^bx(EDf6H?d+3E*7`Y5#N@m3{E%ec(o-ixYLnhe?hJH`ZkqN}
z(6BcmnOF2y|Kqo2YuuWvSx(0J=jMz31}#zpZ+^M*WkdbPn;XIdAMTa=8<*|5WOY6J
z=U_wd0T~;wc6h4WUv<k|z;H6of9=)tP29C220uQ|`t-)|UG()c%=aS>-P~+_WAE*~
z5>DB#W&bQVBg?S0zNY8HZQ-rH&E9cmX3d<b^ET?-+3-(MF`^R|%{uMe+HKqT>UUsd
z*r79d2SY`QpPyZ_WX-1IMe!%s<VG>C3RH>>6LjU&G+7tvV{}p{?y^VMrU#Atf8DYJ
zm8}Qget8-E;hprU?|+^=d-knvQI(6a=&2{)gHF8Ir?P49O*Ye|vBIzS3U5@NbmDZw
zC52pe<>FXgH`S+SwVN_Gx@ApSaj4_qwz!`z_a;1y-Lzx5QN5DKsnZ7*NM#z$Y@A`a
zB*@RP%<Sgt+}PD0DlZ}TI-l>=Spn&GdY?)!6ukQVoye5r4{^cbAEUZGPAMN=Ag35~
z_NOLD&Hvi!moc_HmtWZ2ziFHuc72bW&C3FY?Ee*A-}?Itua>@>vR!VMuoF)LtaJI(
z_-TPfM{n=aojW6MhJ}T>6&0;N-mt!cmzQ_R(xri6VQwWQTeejk*cH?t9b<#11&MRI
z*tYLaMYCk-gU=72wg0@IU*Em8-iB47v0vcPBraawrMq@XEx+s;87T?c8OPV|9IdO-
ze%R5+hliJ!_tqjteJiV3%I<wJg^Wk0R^4&pQ2elD79VK#w^`oCvDa$D&W8(m?N;x~
zJl!hrD5$f)UmbLS-BxqXC!n_Si}@0ly4mAzC9ZFhU%$?ku}0pBqj2Y&`}^mgIN`Bq
z(Vfj-A$x^D-KtJu^+yF38QIy&nwp$@<ND*)r+<ES_Q)~hbN_a4z54oVNZ79DPb=L!
zLD!Tm^{@XO_<7sUxB2y}uV`y&y(+Djulc~}>FIgOkRc>2Y|@k|N7&_S9vEj`y<AxR
zdgc7=^PN@p_l)X)=VfQVE?dLbzW8?bC%OH*>fe6+QgR2h?)222=Xy5^xfOpYw|#l!
zkeLha)Bh6r!=ZR2ec{%vQzebl7F>S~>b$I6wMt1vg{A%QL1%v3Bj@H?7h28T^W#xB
z=!lEh-DRL&#T-9%zvYwL<*GVv-HKB4p9h+U0`=q`7EG8m>(sGc=|ZcyA>rYluLS#R
zn!j4RcCF8RySa<q`<Z^+?GMY&)|NKQd2nN6a!7c1a7@gd*Z=-~XtxKQkqnx%UAjL!
zzILi>x0qqk6OYtr|KqY9-{!1%?$Zj|B=UWxar!RV)!(<Sj-Pxphwp~{UW<3vu7&A{
zbx*prqv~sx44?aj$6`(#iod)-{fCC<b3cPlJKR_MdrF}AYS6xrV5Y@ewwOpsOH10<
z*`%hXo_f(}AGUhxg$n_X9zQ;4Y_AHLlWk6)-`V*tREPPkyS9nRl+e{-f<i)<*8h9-
z_;F@VPKaCBxw+QI-`w0>`|aZ8LiS6SEjhQmcR1el%=GJ(djI3HkR^v1LDJQ)!Z{RM
zUT}l@Y2iIDUSxnaO3V)wZ$8*?H7nGO?b_OC_mUD5&<eI487qVSeG~SHj-G9F>T&=6
zf1ob(gGTlnTQY?~i(1XhrcIb2kbAlA<;yuNx3}+4zWQqA|9`te{(=s+nFa0>2R=JL
z|Gc;UUKeL)W=KDAzh(x5rKRPXh>cB$+xfG*r)&dlJv(1B1w3CW{O=Xpt^RQ6nH&ee
zJA3Xt{|7p|8dN9z|9yX^ef_>|7B33>rA)g{obX6BN&Wxt?~R;&@#p2<%=vM<d_(eA
z^??5e`*xc%eFd#7_|nP(IvK^QqQauz?w7`So6kIp-Fg@8*)u2g^fXQ3N8)-h9;vBI
zKh=DFb@j}A`}rR}6ujH@S}*lrGi1YL<c0*ss=f1$9C0zrzvoj?@qPWm@7J!r14jbN
zG-mBPeJ!o7Z{Nxe9Xiys?Q8j+dpoT&Gc#X&t@85nGLYbT5P86%+HcFBx7If{uKIeV
ze#2wFWy|Y8<?X%~AHDrr1)PsN{F!uFyY=wH2lJ}mC4PQ(_S0T7r-~EP=Wr>qNrARb
zaDYa6FxG24QsUs}Kb~XeeQGx748#V|kO-(#-vT+86uTx+sUhI(bm0BZ$en*I?f&g>
z-Muq>-R?Y{?&*I#c1Lm;9ys~^4~L?j8tC|vBM!m^PnPR9p1-qx`OiPMr*8x6cH$_s
zWRdxaIK=f?{_nFTWo1UcyUR1WMeKi{?62Hbu(YgLU~0<CX@$|3<%$-WxK2|N0v!Xe
zf78BQ8MUmIaf<5_{<+oJ{d%E1|G5)~;EAu-<KKV2WBaLi%CuSapYo3toi)8)a6Nhd
zqlwl`J%48Src8HoE3`7SyPd^gu<Y67=^_jB9v+Sh^>ED9`B~}d!jKkhHgB2jHd&oB
z%W_^V6Q6vql*uqPJmJK7=gOaH!Z%AVYtFmuljx|s@ztidkC&gTCLfy;+x0w`MM2N`
z?=L-<{CM~8$smKx*T$9ptGaz%;K}=4@3gMWF}DtFWt}2zq~W*xcIAGF_qFSr=QI1h
z|G4k!xtp8)tgNggmR&Y1tWnu`G5$m5@uPfodM6xSZMV;D*|FyjtGyG)Md|2mIT!PU
zoOm2xzI-`v{+>o3nL<;8z2XP^Z%*-TJ^0(PRn1^icwj_=^3i<zz1Lqqcz$7GvW&$a
zy^rO0{FbktZ2mve`O6fIq-A$rUFPGgV|w8)t*ECD%Eo`Urk)o2`CIXb!1mPBVxb=%
zryiRUdp-Gs@!EY8n4-Ckp1ROi7UJ=HPd(GQpBJ;R9xl(CuBqg>-1&KBN@&)p*}F~&
zcj?UQotpAeC}7^NFB4tE#l^aWuGEH4S_(ZYW8vvlAzz=ad%gMpDV-8d*NCQf&WGQB
zbV?1oURd%ryjlmEKwkO2n{qY5GWVHP)}tUjjSma;mF>6kzEAl1-SF1Ac}o{Bp1Zn@
z|M{7j{*fQ%<{N6IEb)*2uWbL0p@B<0d-B%L`8Ed+o-s9fds1;#^vv=jF2+?sGhGio
zJo@Hj<DwSNoVnMJ$jwg_eVft!sxnw?*Cvyg?8$dcH<wIVx-(+7OosfeI%e7Rt7e`5
zxAnNvkpsdRPe9GhcXupf^u!terEn;=t$292-8kt8M_k>{)cy7LEdtK&|J~~De6HGc
z{`tjoTf4Xo@>k?n*?tn1{>%ETR=Lygde5T8dzrI8v&&fjvuj=5UGY3%^0umS$nksD
z*BVyHOiO$Bbit((@OkAwbw6*AS$5I7YSHC|-kOQ;52|g*Nq&9LXWBQ_RUUrIo0pt1
zUKQ*a`B+L!o&Bb}xntjUqtnKpCOdWJD=V(E(3{S^{IX|y`f?UKr;a=;E2{#lx!|>I
z-flt0K^v!v1*Luuo)!-|FNRHP)8DHvXUDPI$KCh&$#wGkKlZii(UoN{h5WW{F(`U+
z^;VYn3Gi8W>wUCr=G*O#(Mx@@?ER$3J<BGhx{B$zp3azKeqHv2gZ;OKR&m~foSGH4
z%r~YjTeeCde8%VJ=e;i|w{Up<bK_9l<2T>VH#%DS`T6<p|FSQK&Q%#CUYl0w>Z5!u
z<7nB=X88txd)vdIhabFrub+0L<Kf=wz`*U`Q|d0q>bUA?2lldToWAz9&F3^5Wy{!9
zxp{WeRzADFWBd8kdp`EJs|8HU<#J+Ao?08c+pU-Bt+VxajSC;mWK-Usxjkb^&ihx6
z9om8J?()ySfkvB?PHeiFV<E$L>(;GbW&Dt7pG$|d{v0z0oy*|HBX040dHliiPdv9z
z`2JVs-(&Cil+cHpYu-JZy*2cYM_MlEydImEDWFyVnYytb&w@{ZoAT6Xt5fW=r|+8Y
zc+O&FU3B7R@WGI)W#4Bpom`U27MY>|+XJ2z-}r5z=!1&M;+xxI)LxdnxWsQ1D*5x}
z!wAsuv|`JSL#C#tg@1k&`pvbv`uxpA#2m`hPfa<X?N0Bmmj{)K7aVM!dV2oT$Nl!#
z^4?8-y>55kQSZ7ncklR5O?i3BqxdIxTZ@4B<o&Gtw{G34na8czVh`HO`>*cHwfpz3
ze>@Z4miX^N`S0oZP4oY_tH;lK@IB0x!|*`P%}uSJpPx@QkeFeTDa6*?cyY12aZbek
zW6^q@4F}IR1kP;DyP5kg^y-#Wr;hHd1#I@#Wp5r>-~Y+SFmd9<H+OeW-<W(nYxUPi
zZ*T76XJ-=s{`z{S?)TeUNs2D=U(A2pys;oT(e;D$;!@4IIvsL1wre|alz%Ax^u+U6
zzx??rn!%uJmlnJCr~UZw@YbsNGauCF+Iio5f6FuTO;o5ahv5?$i-Lyvf1arC`TcJ9
z9Gl8X;c=C%%<Oy_t7AiSb#;#%KOX<-FNdMR-hcHfs!u=dD*LTk@JZ*-1K#`56E{^J
z=J@=VjkoT@F$2GOU+=25NX*#NEyHu=<J3m!KQ2!<9DjP~>7@5Z1(P(a>;6~>3JUf}
znQ}GU&fh<G_xpX((Y_po8*9E6t`a+Z>a+mE-(`goYiEUSdOv$j^7W>~J2Ka{uD$wl
z-R*Eb*pc2--BXuV-&=baKI5|ad`Nx&>iusSpof$Ex*FD@?R)?KBo4(RsU^?nmS4JZ
z<%qZb-X*%Ad*DH59B<fQu<t{w{)J1I7WLd(6ScK#!v=#xhYtO?y1wq|_TH-9;ojcd
z#_8vte0X?RMMdSq5n=z5Y;iHMV|}vLTYOt3Z1(MXwu!}Iz3Iy>vl(ubirhOVb53?*
z?9;|q-&EjdYh1m0RVQ*23+R-(Yw6-bIV)n<)akjDl$f~p$tYS`MMbL|SpYt=+Ckd7
zOecT;U$fiW^S^UiMMXtbJelYYy1!W6f8LT6D>`(ew=opFx}w=9V+q<M{PXVny5pbE
z+plMF`+mRPe(BPspa|QTd^~CM&0TNv-{0GNr|R|EH#ax8i^o+gjNWZq{q4iw_x16Y
z9vyk`?W*aXA7`8Yq+j~~aox5zN|o=ISnEFP^N`I?FI&3%>AM$8-pGoVa_@F)*i)+C
zaxnum-H`=4Z>j~<bYskaa$@42pXck-&d;+=NlDp|e4H=GOxkRAZ%YdcDE!Wq?_12G
zoP4b3;Ys!REay*LoMD(e<=4iI8_&!#<!)e?uMucI_+YbseU6zlNYOd#_bmRe?yia4
zYympzdzC=*@z*<Tz8$~)qxS0Knz-n)i89tt<<3^VU(&sOcH(uW@3|)rUoKfv>v-H&
z+Pd=nlKi{epzFln?Rvc~Pg&;HMe(<v+uGPbHzLKYPk(fzGeSo!DLL7)<b?oeecQuB
zt#@Co41U8j)l!CU|KE();-aFOx34x`y(ssYUB1R4C}`4o!%##A>T}iYTem#Cyk32?
z+EN?WBWR+iXAY|4!+StUch4T1e_xi{GbR{FOlcMHn`d*9TYt}jT&0#5{nv{<qd2=)
zU;7Z6dlQsRZ2m;4=bP`Izy9YfgS7lNDc3J@%fAI3FAmv;E?51=kc*ppYiLuEg^bOY
z3(jxu>=a&p`DC~Lz7yMWZ?9OpHuck!lOf^ZoAd5k$?&nST)8sm&W=FOjn%JKF3-rw
z;D|`u8nydt^Ya<zkOi+A+S<uqUtPV+#G4CRop;J(+y3N#hvokrfUSSE1NEiEbfb=(
zm>8?=vt{en!uz$~L06+g`fg92r0lQFyS2qLQ~k(PCvacs+q2pETFO@G=jWyV{`MAB
z@<{No`OURjx@6bawu1=^wr!hscXxSnx~E_6t=abXYWIG<7X4u6|KQlzwLL7HhAZ~`
ztDkQAVds@A#dW7npYH7Me}DOp6tvH^0@CN&dUXSQ<JG)M=)NnPjG6We7cK;4(Fqd-
z9zA}{$;<n8+NyN4?fPz;m}QG=YHWIYdo5)6Wcb*hpPL(et2$CgY}V}Apl-_fZw|Fw
zg-a)b4*6ejx9<1bJN5tnwzReiN=lw=;S{d;bW$BOgSCFoC$84k)>BF>_l|Nhfka$g
zU2C3O-&fSp>6tc7Y=35c^6|dZV?C0mn%M8vrlzC_h>0z$F~4y1$2vttwmIwV{H~_*
z)f{p=)RxclxX<JJ=R2}<-$WVo+!WTgx$3K{rPURkw^KFYf?&tNgacVywUia_3C?Of
zbKkJN9qn2u9YsaOTgw=Kz7Fot?geMQ+&4Ei?)iMqx-R%O=w7~i_5W+<Z`zoAeAByf
z%jFCVW;;Ax97F2=*FE+2-g<ujx2@|nzt(@6Jpad(m3u!N;<o!8{QmXd@AtpocH_8c
zzOd^1{&JTWJCude^53u|IPdM=R37subnBC^zR7wvtml$87Cbp2c&uOk{pQ*$D?qn2
zX*pi}_xJbIz{JHDJ+ia2`!(b4Re`&Ue`eJF{w63dFTZ8Y{vJ2w{Jmerc9*?nO1Qkt
zcdym6BS&1y-rP8N|Np=5d5f(pn2ww{aUw6b`K#uUsV<Nu@-=G9TzCAxTYBZFtm@oT
z;xpI%yk&4{--6^{yVkMt=kdM1uQ8$OoPSc15~!LLv*F<6OuV?rb;;7D3$MS{)YJ@g
zYds9PTM4v-o{525Tu;RYdba+G1JU^hn^;fngY*|G`cq%kRcYJU%n^^T3A9XWKYa1A
z;bYFcTeoj>a&s%&*u-33{W}I!Q(s*j{#&O)V2!`xIu)zy4u5}zDjrEqhwQqq-L`e>
z)}J=wP8{{8PMzBI_wS37pRXSNaZq}nWAAJA!z;J%_PBjZ^asPAM{(l*=L`Bl(~rw^
zqqpJMjQ`bGS=rvHV?oKTf3>%?S_Eu=zPsY5`t|H<|Mr+OVY-FA>bCE82djP%bc(S6
zl|GK3KIM*(LvDxk-+krHy0ooq>Hf;UkM8+B<ql{Sc;xg&>&MF%FCMhK)p-Brzwz%=
z;h&dJ|D>t?SF!%@-TKY{_4hygTmQeiua7U+Sn-HL!Pl$d-V7=&9Iu@Ix#@J2ef(8l
z`swNHEvg@$&VKOq|Em<oEh#U!74`b$p8uJXYu$Wx6aVdp`!AQA==s|Gon!AmHLF{<
ze?ED_-Xkr3kawcFpykWFyng?uv$Btawz<bB{yF=Tv0!J+9Q*n>yC(upKQ6p1c~N4u
zZr`sgL_`1hRD<X086S$bz2$M2UiBlqRQ30_w@cnmnY!AoN8#PM^+oUgSW3MryZExm
zu&Spq+OA&P{NAtBeHQAIvyZoA?G|#1VPpb#>n7_)Z#!|HU$Je6w&D-Y8Q-p5yx4hl
zQ-6JE_@?UX^E2!}GcI;=E6B}YNp^NOE<2Oq7H{1*VRie%KTnwNRW6^mm_2TJ+V}Sv
z`P2Q|Tfx0{0cP(550*bYoE*Xb{^9)p70nN2*Y-#(O#cxYE?gDM@@sWWkIciQFEa|-
z;+Li$=~(@;U|YePAAx<dv@MHP_}#vn8ss@muTiPH?Dx?N^Y{I}xXj4gQ`zH!$(l1o
z`PaWLI-gLg>&p2;sO!Z-ZqRT7hvKgztLlm#Y=83X*`&F1eG{j~#y&~}os=0qaqg-^
zIh#O7Vw&At)qe8L?Opav%l2N~^D|xNYyHFK#b0Ag*9ey!W{`b+X#MemyP;dQ&wrlr
zIrELW-J->hW!^qNfAQYJ<Q@O47QORGJNVfCYFVXZ2z1@giOx&YVpsh8a`(E~t6%$a
zwKtdO>|WbxyZ41g#a*vWC7M&t#5iA`C-dj3fb;bITekPx{W|e{r-0Ls&%a);FaP};
zbQbrvoSRO`-rVKBGY(AAJY4y?(mMXnRi}3nbqv8}tZjd6CfUU2y-E9aGY@=yfx5ot
zqG-u)T3p;YOGK6nFMhYEpNY-BUO(E^`LA7`Ou4RkjJT8g?#bW26_;$Azj*Io8QHhb
zE$`RO`~3X;<$HDWil3h={&U#>=a)YPc{?7u&C~m_dE4pJ3)UZWi~q9xz1_BrA`>U@
zsrd&4&0M-z=j_p2PrNn>@onA_e$eZ~u4#){!i@Tlt&ROHc<6LI=+>CMip6y;0(J+_
ze>iNDzrQ_Rw<rC_hle*-b48w4o_FBbYV89v!{R*}bz2{m<Yz4AtlMS#ettt{{&PFa
zgY56GZmz!{|Ks|^@0PD^+E*{u{*ak(@9)05`u5Gu&wp(HDk4AcM}uHZ*Jt6`+pNvK
z1v%$U(VOe%9=3G*fyr`VH$&%zzVtl*X*!eG26@oh>eAioLJVZBLKi#SzWUo!!|Kk~
z*x+TCQx|UGx^^tKaS_Ya!qBwRr3+lorpiU%Ok-TJWR1$?Eh!5&^-NmH9{KWa{Dvu8
zK`Cm9e9Wm^JNNn4lvKw$_Fd1f1*a{;E0%UvjfzEcKG}e_kw4S_%DV!x*jebukHmG0
z)%2b=G08Wv+P|Iq_C-m-zPHNva#t<;H@E)sua}lqR(Bfvt$$ehzh3@)W6gzAH_h0?
z`R&=~y=Q&34m9WEv$o)2(ar+XwF?bhZRJz-cb-1*r0C(Q6H8QF-L2Hh?{@iod$#V&
zorv#i=dUZ9u;<$4W8m{9m-haDyYIIlc<C}^8r8J&R_K9EO5Xgrd%!(C_`#7H$_9Z?
zW<1+iI*D(t9;?>1NpEt)E}h7o_czq%tZJ<FMEA4#vD~gNqi1f9czKb(etoyX@z?9?
zCOif$@?yxD{o+oovTW$}3;P~R-74>S_@^)6-21+RSIc~&qd5#$L~81<SJYGOd{@{z
z^%K+iIrD=~aEQr#4La~3z2#q&Tko!Ee&QD@rv<Cew!Hjo$>P5@va-)#z9?XKO22jP
z;>EhQhr7yR^me>jwR(rw`}CFBrxT?<_M|Yt_B`(qP1|(r$<CF2e#(<)o|*mH^OTpL
z@?<x@=wFxnm&?uz<eqE2;RC1FpWN*-%L<=K?b+xAI`RK%>KoPaN$E$Fm$vL>pWU?m
z<3#Y$|7;fbwwO=1p5dV#+?$oE7aH_@(q*H&zqyb2$9e}^ML(a}wERA6RV-t_c>pNh
zl{WBsGtNzqF5KDnFv&u%?cz;Kp77i3b8eT*ulv0AmYP$C<7tm9H?3_!Uk|ab+Vm%>
ztGiqCoO!^*%@$7oS$OK)+Uw`NUf;jqu<4w>K0db|3D*-Hepa{67ymj_X=nLZ?yqEJ
zsI{!@g^Tz4@^;J<JltM*`0U18@9e6lDG3EFIP?^J65<)TZQnI6Uq1FZLORD~X}Qkr
zZHM;kJY_TI$rc~4Q+jSnk&@cQ-#3|;PqOxyIpy@dy*qtA&9=LK{rc7Gzd-Altio@z
z?~qt#V`Xjoe^=YZ%4f{CR^>fCv(3X!*ZhO$&WZk~ju-zr|Jd^H^qF(4|FP$m+h!rn
zsHkgdc5d5dmb=yQ=tI!eP0r5F&D%H{7A;Z&9anjm$HCc|dHbCr?*rS!C;zel4M7J6
zPTbbDXw#-m;qT)&T$fwp6BG0BdjH{THBOaz`P&jrO5|@dDkydC;bDHts>Y=E0(5EN
z;;9ZZi}#8e{OJ7ihewG=Skm^`ft{b{_DG2~ox9q%_Nk8V`}&rrKaSssp7X-ue1WXR
z`EsLQvkKZ`O((t3uMNH}>jIh@4S4rd*H!29xy+Z{|Gr%=nXuP5KUt_DRXY0nw+*(?
zgACK{r!7j2UF<Y3`NgzHqHB7~<0hLg)nnC)5uI?!)L-q@wUuw~?(*gI&^qlkqw==O
zcaCY3`qCF>L~_n-jN5R3S9auTzJOWR41y!y`j*Bt#)UUL=8XYOJ#(CSdg);iZ+ZWp
z629X9ucg|uBRG`vclB@hk<K~$<NcWObi3r_`U5v!`U}>%i#^<4*Lv}7e)eweRSOq3
z&d%G_>Dn#!u*9m+YA&d){`dFy?A3gdyu7@7em<KmA}*fY&Ct=;_w2+(Wfyn%>~6i4
zj~*r6tNHA^zp?Z1!v`CW%Pn5Brf1bEEhi_ZEulvogzfka-~PJezOV7^(~4zL4G-8A
z)aL#PkzU#w`lC1h4QMMdOV|7=?Sv1-kB^*marw)>y(Uj6yj4P?@+(JQ%?HExd+T|o
ze^xGeE1zup@PX~^<vf>54Sectf31G7>_y13dmmME%impD3EoZ|v_vg8HEyz2>#FO&
zZu%qNGEn7S!IY~$bL+gF?pAaAN}jC@x^d@tL%E9U^H>eV2x)z8)Op)-7PU%U-_P52
z^}8-tZsj^(boJz#+)w9NXSuw)!o|eD;mgu>)AnBv75P!|_u765<xnRMMYhd>h5AKj
z&*;W{UfLV;d+BtE&qx0&e_5C0^ti6C?v8B1J;t}X1^ZZUMK63T{Nj&@)%gXl|G3<a
zbwJs{x$ZyDV#tkR{&yFqJU=%VbodstUIPawC+N0fUWqBKZEZ$%e=6Rl83weTPYJZz
zGiA1SS(#?ampxw5E<tjVZADyD7(7g$FJCb226xQM-URPh=9;2kBL7#!csrksx2*jo
zvRp>2ZMR+O4Fg#QJ@GBZU1jSIUcGs6%a8S+*1FGsyldmbTkBc`!Wkl8MR8n=uZ?{5
z>s7zc11t7*eCHSM{k^}$VR=>c_4Cj3Djjbxjpya%1$A`)d|h9!YIEoRUQcId=FZN}
zIaZ}y4VyL@O`1Hp&_d=;@p;=PPoGYlJo)g-;N=?H+K)dxJpAWFyFE+7(Js*^PoDf(
zyIQxqxA*D#`oG#+w{DGC8<skM;>3xd<)>L!G~VrgZ&&vI-dY*ZRNU@dZ$H0pmTCFF
zKYS>d|JHk&&cZcodd|)^|K0Ndw9NPJ`?~4#|Gr6gad!_630bm7u7Q<XEFdD{gzfh`
zho7CDZ79`iyU(mXHRD`ve*fl$3mgCcod5r!`Tn21LUSx-_>z*7GxPG;u2#N(xi|Q`
zWKR99WR_if(;MsRTh`-i`U@94VSg|y`}l{WPkhww&ph_yM1h*$j+q-?=cirS%H|fE
ztx)oYMJZpRy)Z`Oa{6-b2gQ-0lb*`v2Fh)^vIVpl-637NWZq|+Isg8@wP0WO`JKYa
z<?kYM^BwP2y<XcRW$LwC(#HHMWWYdh`DM@2Qd581uTv(KT}2#7lbV{kWa(1I2PIaT
zkZ}VGnZCTz)vH%)>gj!Znf~j`OBvfLkp|F&?p*8gM<rI3ACHRP+>$B0yX<Y!qa&SO
zS#d>0o9^fGwI9x}ew)q7&wo7a^}nmi>F4G=Z05H+kYU0!Ve;hW%P)^)Z55K1_D)P(
zxXrVF{n_})`u@uqCZ7(n%NIO5BbgdqQDL!l>sFt6HZxzn%2NHn_3d6|=IfQ;#a~EV
z+><W!gGUdv1}A$x@6+te`;YD4{ns>iU0!hatFWZ$tEex(0$;fIDu24R-st&6rDy4S
zQx81f<n?Xt@yA6Ei@qxT_3zNW5-?|j&XI(zPtO)w<X14IAGusp_4o3WygKIFCw#oN
z|KYv8V!3ARPx%|`D%&ni|DL@2+wm#?{^jN*+CQJ0=&f<{b82q6qpV%cjpuGrXR{E;
z4L*cinqX0JX$|D`7mkk~KZ1O5<cJFcWW?fV*4DDsuh+}xTZ4x@k|E<hmo8n($jM3h
z^W)=`sZ)RY{P@0IH=ug;)l+lJ@11;eb2H-%`+7UJX2;CyllSbgsrz+#{;$0k-@n}Y
zQ~UM%!aga}F6sO|ftKqVzkIp3@-^$N_yx%>pXYTRTzdQg`<>I_{`+kEwtSiY>Bsrg
zKOF;2z5m6_o?mn8X!-oOvs-rjPdL)Cddt}sfk%rnUOaC}ZC~?B`A7q3q!e`29q3d-
zzxj4&zgTKp7CvIR{CrK(|Ji@Mzwg&PI<Nk}yt?0<1xuH@dKSLwU9kdm@pJW`=)#R#
zw{F#3Z1Ycohiy&R>QCQu?(Qmead$6%)KZ<Qvp3E^HFfFz+{Rn+9QpfSRR%V)ROjB>
z^iO7aS<0)R*XIqpw4>L91_OSqInk1;$Tt7gt1M6#QLg?^q3VpA|8GrxSO5RZjOX`t
zzVA<c_jJbh>9zdrhY!BIynJe1m5`7SXkWL7w|8*fhmSQ2HdTMm>v2<FyLPQt!IcXa
z4uGcjFShK<$jwcCer_&91b9g3@3+Tymz(eP(pFb*7u60c`0*ie|81tN=2E?&lNaCI
z+REMFJKOB1Z}sKAH5M{_b^kuk|Lt4;nd{pvrm0`QTdWP!HosSqd?3Vi{k?tV2fvBG
zkU0844RrmW!{vYOtCz~&{b=|9_WgfuIXOD*e6mT$dL$Y5pLgOY{ApW|&b-`zewbY0
z^&ExAw}U&SzbZ+7zwdSDglS66=d?#|B9kVjspS1Qf8xh4i+y#;hW|hJ?$6xKtz~Hm
z$`xWd5et@_wflU=_{j0&!g6wcm6bb#rp=gf;@R2Rf0xyL1&uzV%!Jqd{`jsKG%)f}
zCuT>$Pd@3rapxgt5$*%U2WZskQMdl2Y17)`)*pXZ@WZ#7o0Ie5yWQ`@n5OO7W0RGg
zZ79|I!dCNW`uShyR>S<?FK>UY^m^>|$6h6SYu`7$)xTiabx`+3R=!im!c>KI-=5_^
zl{alq3zh#`{9eoT*44fi0rB|wuxjbTFU$XYUi|yTix&&_?wxy6aDV997iIghTeqKk
zcRNOT-Sa<Frf-d{TehXXoo&~=f9qDUR_7i(^~-s;(A*uLVm_|k%c*$8K_KVQCV@w%
zKCjG^TJAspng7vZ%i3QiXL;8r8^1qvYePG~)V)W|%=yKC4lv%czj5UE|Em7v_Ys!A
z&b7<@FK1uwBzLJy{g;N7)vVp`_sxFuCMWk|x|X%|?APmd`!UHEdU}Gc8M$D$n)9?%
zhxhYWv)?_R>~EKN?62w^yV_YBGut`-U$c(+zqa1+-M{9Z-(kw;ckVkJ+5Woo$G6)q
zb-Vcv*Iz3-TwAaD<k|Y{-NJt-OrC7~K<)eb=<Rt2WG741fL3DgWZ3#f$eCt=cGI8w
zwCwly_us8ghI1HhSh8%{r?dHWlk@9;-@dg-+pnU+B5iYJKwkt4C>UBKR)BR^98}X;
z-K@Mf&fn9s^L)y+-S2jJi`jt2D_Bl6u{&{WZQSvoQQ*<33)5NoTLhXX>r^N}Ccp%k
zTYCO*D2f<;Qf_&%-a#33J5%xVa}SGlPKf4HTvv0roj?6Zhv176tK5kog)IU}FN$`?
zSj_davbI+JAec1a#fujQUY5jdy#A$ur*6xA9UagOquS?xety3GhO~;JOTs<DyV@5w
znAh3O?=*g1{P~Q0aM78)7kB4AI`eZ$-ly#;IlT4(SJ|ai`OiOpHvf9Xsa?1H=UC2{
z-}CY|_@s^Icz5^qvdIET6LtjI-;nrr`uzGQFYfv7+5SD!D4(fs@3D#1W`!m1)%xDW
z9ubeLh!cJC<NLAm;-7DYhkd%||JWuvPw9WEzr6nW$8%NnKeR3D1%*nBz@t+oN7?Mp
zpD(YMZ+o;Xe?sN<@0}B)^S|m|`}KX9{AZ1BjqBeYmtO9zX?!g6Qn3NlWju0W!}`mv
z7c0fH=gj@HX>D_S-K~SGf}clTt(rGg_j$y}i<Z-F&lS0K?$e!*W?X%97e2T@|I>bV
zyTt8}Px)*WbmHMTT=&$|clXbS*MDr^CZgTW-~W8t>@Bx#|9xZn{^x1;pHRt<A0MBs
z{gZg^@4G-%PzRl-a=-0mzpE$xSN{4DTxMan^wW_{E&D$$UC;biWZ0eE#vgU_o1^yA
z<Iz7q|5n$uzjiA7{oE&8>+8?lS~mICJEpA6%!i;8MH3SfPdyIb|7+^DsP$X6Y!Q%`
zKi|mAzQuL=ne}yFwLx2Q-acb|zS+Wj@7E*3{$GCEiZ@^05N-Q1Q@^%O+duo+_dOp!
z$A3B}eE&(@{Izk%H7XMI@7H~iuJMaLV#p=;fhE-Y!P10-6F~vnHf5Rrxl0e<l-QqJ
zDR-{y>NY;B^QD(6&$+g5c3$~;y>R-LyR4>ZXC%J8xq0~HWcAALcgrjP{d}&U<xsdX
z?+?F>#esRY)e(EEwr+c|XlKard-39rE4I|GiQ7BNw)$I4!2F~F$!D??cYdEY(_~-v
z*PJr_gb%0BujiR_?wIcr{rShOy{~Y~uQ+Anc(q!;|M_&gZe<S8-Yt#KY({UNTfHpU
z)jVgN!U^dYJ2J}4E*0L}yZ7?v{PxZNKl2>xlRd4yeveaWsj056?yX0Rsn^%Vs;H<K
z6g~0Co%o`8qO$v>dGquZ+dDl>Uzshf%5Tqae_ur9!^asvcu!65e}0p_NhhP=^4yxo
z*OF!IR_TJm;z+;~*}E^l^t{+&eb+JI_)fp`8U4%u#Hh=rTTcm8`u>eO+VS1A=sZOw
zrKauos<>^Gb%fP?6m)cY^lKh+Z`rb?;M<$XegD3$*Irp<UH0a~%fqw%z8_%bHz<DQ
z!zXX&<K)z2v}nn@;Jf#%wLb2?|JP6RdwFo(w>OcXum!C&+m_jX@^*Y$+OncI|Kj-P
zebLXqtv;`!Y1*`Da{aM)?QRrSn3|dWs*Sas+kfVa4`{0H&vX0xZ!7-1^|#*jxc1-o
z{r~U2&z7>Uvr+e-H)Va0AOlZv|A`wKm6`hY_o?&U`=flmZXbVf$-BCy{dR?O-2a}F
zWa`^{G`l_j(Y4N7OyC6U`tIV~bs=V@2QIJUYO*@FTYm1_xm)IcW^sIOwe{}TXm4-s
zew$Amx3}j%e{yoNh^Xks)YD>R@9&*$;S{#0{G_7pKkrF){O?(pmaSde`{heXS65fX
z&!^LG?k?Bgey>Wq`rDg_t>SSDmM(4m{eJ)aOP7K`b8ho&tAG6azJL9l74xl1yL@Mx
zUA%H-$(D=DQs!C~v#q|`b@0JIfnRTKZvOMU{-1jBvokNte3tvoO}e!u6Eu^;P#4dC
z05om4<X>obc=G0(f8?qce2Z&5*ZZsV@4NE-kAFU&zkKP^rQy$$Z*9puwQ*&?`i<A$
zp6`0S?)A4>3_NViVXLPar~jH}q{+5CalNg<{7z%>&u^ZKf9&4<@V<Nh<6Hl{=f8jX
z@qes+teyG)$hcpB!rlckDO{a1pZ(uS^SEz1i*;KB{$9Cu%`GTMsA{j=-Z=lDAkZ1t
zx3Zi%v>U8z&(1!!%qur|>He+O)*0V>er=f_y7ZW(e$Es22e-1<r~diz@kWkWj+rzk
zCud7*>&Ln8YucIF`3&m*RQ&t%-2S)hRM25KGmO*y4$Ll?efHQ4!{i;G&sj6>`1|el
zOw(+!<NfmN=Vg{0I^^WmCv$VH&IHho!tJ*!L1zoQ_DCALNh)%EsbVO5b7Nu8x*IwF
z-oI|z`kkvJ@5=hu=d9nSoS9+hRc||&|0~Dzs14WeiZ6ESJ(OX>R&zHgLo#gNbz}46
zn>7wTe`f#sXW#sF?%%&`x2SvgH%_6yx_(#Zce9%2^Mc3qLvp9S=NEG7sLRU8c(81C
zUed)yt`>9s=J=_v4qKb_|KHzRt3W|fwPpF|J?Zz(S58l_zRtw{Dq+RvIlKQjx!3i{
zST-F^3UmwQVPk&3@Ao>RO&<<%>lgffyZ!UO-|v}!EXkZ}RoZpo!i79W$NIUp)nPZ!
zAAR)xEAny&6La(8?{`m?&nkJmes9!*V&e&!?w5{Sc$R+de7e8dcTUAUw{G16ouP7L
zN1^h`lP6Dod+{P8?d+_l!QmW*sV~0hl|7LCS-9)@r!Ce0LdDEKu(-*d^E+29=JsMw
z!-M0qo4)S<|9gLrthHG4!2>IUm+x9yR%!e5$z%}`k%WyA2aLTQ#@6~;e|q@zZLsa~
z6}xstN&d7beI){#L%VvSZTlH->!62omy5ix*vqtc9_XMNLBWG70vB5pJ>mHJ^{d^}
zxW-$*7u%XQekrkQ;{3A9y;sWB#ihll>dUq0d{)`38*k=F^t!qAN-fnDa=y^OQ`aJJ
z=rnjSr%z4Io^2i%FI+gVqww*RDLYP`@?wwyA1w9f+xGpTr@FhkrifVO+cum!<>k3l
z_>ocOcNU|!=hj);$v%%MnOENbVT-l(%MdY(4}E`1c0B+4#qft^>8mM|j+y4(GKs5v
zDyo`#cK5I7#KeV03;%Vh&kG1Ta_G>Zihn<!?_L_aHg4~%x3{-{{<^+?Zs1}!!{lQ;
zsZD#gpYQ460o`|PoX+?9`ug-YH#R=tT=44kYta0hqM{?`kt=R}GM-LOO+qTYGL}M<
zPagSv-u}Ju$9U}vuRqoWh)7C$mX(=puiAI8?#+#jb^Woo<JK-OUVQcP&kNT=<^302
zw=H_&F|X>C=DyE!-wTL|9sBk5_0&MwT=|No{TntI{49uNSWvt(=5M@l5QpK489vM8
z{wwdkBPAvEWB&i2@^znQ-xm-PTBLjIA^7;JZvA~8MMXyNb?a>xGgQpXK-Z{$UT*)F
zv-{|xDYEu;b3kjBOJ84O+)(h)Y2Vki`9FK~I2Eh%Pfydm`>&4Wmx1ECPZD$A>RH{k
ze)*>0VOIIWR|WRvr4H`Z>UyD(%Y&XR+I+Y5Yx?D_v2lV?QBhN7|G%BTKQ{W!;{%P%
zA|fImUdR8B%Dbh1;O6G^pZC7+bFZtb>wg~eW$w5CPjQVs+*y7v-P5hEMS%I<!^7>&
z>n<g4jpF3x4Rvc<w0N<nk59-YMJH$H$gNqTii(PMsUJUnG%+)KRA5nHAv4FiT<^h>
zXvHH(zs5dKjH>(3B)|Vt{hU9K{}+Dp*Dw0CRXkHS-uv~ot#j_h9a0ZnTJx()^Z#^%
zImXuUi=NC|o%#Fr`jdZaHgDVQ`10HBe04>|#`pFAf8SEN$PSt#=H%v{e861;+|bPk
z3<OO)$4xoP3qG*(%HO5Q4<A0X`EY<4wA|cxwwa)`^zFC8I*Lb@PMrNsv@b8_+(uvR
ziu%u9efg0m+4uiuy>@^7p>L<OX2r+)7T?Tzv;OZS%a6epfg9VN>|XZZM&KF#{njOJ
z>GNwooy_Cr>)2QMuvPqt43|7;FE87c2@?dwbfa9NqGp|!ncLRJR`&j0@5PKITepUC
z_DM-e-2iP$7P@ll)~R!Itq-36vk*Gf-6w19;o}qXOUx-o#%iwL?o1ER`kvq4-%k(Z
zP_%RY6z<8f@WzJ3X7AaX?E_3qOeV~jabjiga)ueE*<$s-F3$&_^d)Va#$#RnPQ}Vf
zs{Qam+wXUrb8^;fiVBE~oOyoFyjE^;CXM3y7J<Ky^Uw8Pez|1x=6r4u4#jmmhuis|
zzgoTi+s$pMr^V#zemrE9jX!asU*J)ffUNA<PGR*a?|-gbwJPY+l`E<0esdJ8tZprT
zYkb~j@s`iq7eG%nQas`cnif9&qF<nSg5UDwBOQXb&W3{zZg&oIc4n5Z|Fco2MB#|)
zqRTHYy#C6ZwNzcv<^RhPt2SQgwz&2Clk9KoFzS!uDD>ocvSs_f56kxE-rI9C-DJhu
zwY|UJ?e5>T%SzSNkE1a0&r;CUoMNDJ^g7N5fO|VTqYH$Egq%V{r`{K_1h*>UK#>9N
zz_fv#0A9`tJ3Icz8JUXr&Z}1SZ+N^`Ip=q}aB4N*$M(DIm6gvK&HgT(`1SVLH|y+|
zfo=r-t8}m*)KarEmY-w6s+aNp#e&6`UESNe`}{KAmt4Ge(bGL$oxQ(y35sHCD_PmO
zbLSm6F8gLndD*3l7d@-n)fryBxG%oc3U=OmxSXr2E2zd+gso^uv$C?<Y5q=ZpRM(*
z_jjZZ*K)=$*t@rxwfNnG&Mnp_e;wmFH$VTn+3T$rE(EMvy}Hn9Zp7L!(5YI7TDiAg
zUB>}FD;{)7=oVL}jyS0cuM4;p_4MoSfBt;YeNvuM%Zr<@*YCf#{{2tQ|Hl)fqGaZj
z&Re|qFzc>||M&0x-QW9J?~TPjPS@J1d)K^6Bdq2xk_*y_$=ur^QLMK#_mQ?&w(6Q|
z7X%I-+>s)7R_sw_BCl3#Yun9&75p+LXTMA-tniCb3|#l%)Y9xZTSUTUA8wn&ekA6<
zM~dw>k$I-moz8B)vG1?oedGI&Hz)62S^REq{3YSv^Pd0K{vYxE;`iS*`*-bp<Nwv1
zcdOsbZ$G-LzD)l9^lEgcQ+n;vAWc&<vsYhUUjFp6=AD-7+6({LHPoaZ&Y8bRPNv~&
zsKy_L172&sPPlwTdw<~H*!P#`Pra+;x$956{VQwxU#<VD%D37aJ6rX+e_P+TdDoJC
z1<S8yYl(;zwaaYZx^?BgeQ_&8ye4|MOxKT}rlKmudG-4B=TmE6E}cFn{b7N{`m?RI
zEKH17uU>u09si>#DmuFK=ciOvA<o|Z{?`}X<)^C1+E#_EUAy*Djlk)zZ@>RGH8N82
zT(x?2aB}iuP`7FMxqY?2Lt<msu3V|<85A5mxlh)5TSm>!jm+kU+&JuYs+k!W%+I`u
z3A45T)4AyX$31;@=?-`AS4S2{zRb4$zw-FLpSHD@-<(r7zl*xwo*H>;b9#SORaMIE
zZIeze;ghpj5u){!W&YjW<)^ph-rTl#QNqNNDI)#HOCKI$RTbhiH8Js+lyf^wX<~qh
z)YR0-O*-Day}eR0GE;JIzk2sBEI)t!WjCw2=T<9wDl03mTD2<3Xl96x*yWkV=^{LA
z;ih&At_apKFdX1DHnv{w|8{3|{r{EhUtcVL{WasV-qyM|dbSrgMgRY^v;XBq|LfUl
zX>Z^E5h;4Tc6-+8X}U(f!Ex)u9~MMR65(nU>2xtMG+bC>1qz3^x3`~<t&NOZA3k^P
z+)ouYT<wQJR;v`1Uel7{JN^3WDHGqB%T}H|>3Q|al@kU$rY0sCIXP!CL6^36zuJ*|
zbCYYQOOvlmL#V<Z28IUdG(GLVzxnG{_5EnrSM<lS_GPsF1@Zr1C1qd!T4#6v=JNVq
z*EY|ZIkz-CdUJ`@+K(R#S(zBWFD?xa3{<>qGI!?e2%Tqoo7MzqEa?{4_nO3W_`-n$
z4ZArQ#1HW^FziT7OMm|5gZuky6Q5Pp7XHtxeYv@Q;rc&s<5w;I`nc-Thq%9w)8%*N
z8Qbqn&6Aat{q(bji-qY_ijkC@+_Y!+4@yc&1zE_1rKT?ZQ@4M!i0<+=YkcbV#|sM!
zPg?TuVWO{}-?OQaoiX>{eY?JB>()^Bez~hZe(d-y2)F&&reD{L?XOKw{#*6vzEIVh
z+4nEoyUY)}eKD@~UHqe}KeO-GdOuX3eA2@E^t&C8`M!StZvFn)j~ctL-@mV3xze*O
zQA4Qn#gR_oPd{ruRoJ|G{W{o0s`MO(l!U~D<BtQQqi0J=Nu@}%ff_fVAt5_<?_Cyi
z|Lxnie!s8ZYP$XW^U7`8!c0v~vobR;9yrhtY%bNiuBuZmpsTCOoQ>gi_uYF8YpzC>
zS6kbC@Q$51^Xi$Lu<&&;7tfsO`S<;lXza}WX=!OCscCK(_y3-;TdP6oa9%zG1H<VR
zJa?Ae+_@$#?OF4=soJyV&b@l(%$YyuBd^{m+`U_hVU1^?x-rA+?wRro*;{ALoFD!#
z-7kLj4VBc*pKnLx2bs+d4J&$=x;au)`>f__-_P;kn<8IsTsymD{(H6XZicRdZZm#r
zzB<Sl5r0&s?oK=JyBiyw&)fZ8V<XqU`vq^{3j@~$Q`V^c`E&Aldr{%DS7rI1_vc@#
zIdt*rgW|9A*O)!6oBzM^=MBH*x(r8?m0RSe?Pb)cS{dTC{eIo<Teoh_(M`0rww^0H
z>mJwXO<Qtrn=K8}{JvQFQB}|Lsx6Fr=KlMTvbOF&2tSGaRr|&H^Yyz`%2nI%{rJ`X
z_1N|I7p3p-aL=!K9Jlvl@9&bGukB*r-CB71c$q*A!yeTZc?Q?qs;a1Ve)%wefB$<g
zpDqmWur7OZLYtd`VS~&e{)R=<tW#~vnRZ9#O<TNkXXL?zfN80kQ@vL1*%Q;2Xz^WT
z<<h09`QDMIH-XBW;^*fqqmO6REn6Azch1X~nQw1x)z1HYdroVq_`F^FKKwgm#eF<q
zqK&EXz@m>Lug=@<p8WgIr_=i4f9x3<7!L6_@II)0Up@cSsZ)2h%g*$1yS+XC`p?hL
zRXvf*kTO2Oo})>da-)}JW@Th}EX&MFNpT4c4fRr++;uc*lTP-@UzX|T<^&o@luUc@
zG;N8|%$`Rdcj(3JSm2_xFvCRa^rkt@qSZ(x+6$KHcYYKnM_bIhv)gZX`TMvl@rv8;
zmfc?TUzmYmN7o1D1usB_?^*NvCHKoJ_Qts?33^V-oHc9CoDx3MoQ#YMH*U;Ov1Dgr
zV`^0OPl;bwcW#<)^b`-3PibW)_I>Bh`BmD;wH{8a+#5G@ndW7ar(dh)-dr7^vBX2=
z(Hw#O1%L8(&eZ4AXJL4-R{0NuM%L7+Q$PLwyZY9h1&bCrEz7hrR^1rkvogfXy-#Lh
z=B!;MFE4F+&n>!Ye}IO_rK8>As+kuznKLj1?BTFy=$Zx3VPbouC*S^7wa`Iffsfke
zjFq>J9BKJexBt|sQ&aqwn_5}T`fiiH@>lDYZQEYGxVTtKUcTJ^)Z}bq@drUGr?j=T
zO{?k8Tp07CxF1q{+@EPHB_|hGWX8?F5aarTG2qLq*RQAgs9n8s<;k8e^*=s5Y<hU`
z`RA4U_s4^>^37?}#NOViEUmtCcDDKJ1C7k9R;?;Jb^Y2ktJ%ytq4f*ze6l=jAkyo$
zey57=^|ZV{6Fpqi{pL(K|GZc{)<mxV_~L#0>|7UL+{4Q+*5-8B;LDX@|CNgtElQAP
zV0f@<kzEVNfnQqBoc$O@wqKPg;(9Q*)7g)afgz^u@9g4VSJ&6A-MI1pwVRuhe;w67
zpH=cj{MXO(?q4>~S2Z;;SrZ;#8*2aeW&O*k;dP6q$N$?HXZ3lKAOE~-E5-eH&W@gx
z8p*}h?0v4Gth99Ho;@`;nHz&wPT7`scU6ei){O3-uTvA{Pe*22GI%S4YJ$?Kb7x<k
zTmEn7wp{L)f8XC<_Ui5X>+E&`Yx(OoxNY5<So^}c{N=md@2}Z@uZj46w|srsyE_Ya
zdCXP%?rvgk{yZ-aR448K`!-*kmF@H<kzTjY??i>TTEE=NUau*_wNpOUT>EYE(x=lt
zm9?5DC@Vs&<Tf~O|9?;M*)wNE_N<H9xu}0$O{~1_&#Jh)S1aCE-(P+3;K4oBhYufK
zwQgP6y{XIrQXKXS3<<Gk&!(z+%Ktp!K4<lWoNrk>Pk+0rJ^SoB%|A8IjOSmx>~F7o
zdXtLh<;$0?>i+Dwb?errQ(L!e(Yf^^MRl|4PNTDD&vLOfZ_@Ez8RGTy=~E+~!#kJ%
z+*khg*3|8dClA>b?VoQ`d1>W*>)<oC)0}FboGK|Pv8XL6Ej_tOCp0|#^_`u?Ic-go
z+<q`JFucyvtA5KcncMDWPMChpCLjA-uP0u!_*{HDcl*n8*6&NU&Guh@dD4=#(c7O*
z?MCGEjGG4@Pdk~irS^B(T>JXCNmp*%SaI;6<IQbr-@VKG`t4g*RaF$f?UxB<@9({x
zqZ}3=|31%arjOgliWqUdm;j@hS2iXe7wbK`X-!k@lUK_xXWrbl)<x-|&U<M|$-vOi
zsgq7VS@ijILy#lbiCWPL2SEFUE3dB%US9I*iY6}~pOvG>q-W34KEGOfWubF>$)6vE
zzW)BNZ){AywZDFU-p;4f_89HVeZ$;%VAc7vpQ`qDxhPFixol!;X}NONEGfyhg>7wY
zy}iAfbN#ZjvR=)){kVE>TxnU^smC8RM7T7CIxW(xp6Xn6U-xgJbGwS?!-9yo_2J7h
zpIv455`D<dz_4bu(`NIXPxHUuuiyV}|NlByCBds#uUe*;q;9_XGd2Ied`sBkO`C!y
zefj&oK7RfFf4eT{`DsnPG*Q_-W!5si*j-Cxt;?R+#;@(_;+nba<(Us_N|&WpRo$BD
zTeLf_mSJhj2WAF_YoQB21ZNz3{^jLmtKw%p!Zquz#oj*CfBZ3MN%hwchxuRMtA0QA
zcyXy@>^Y3`q{ft~vB79&&t@Lo<(oDI)$OmpSi9Xv?Qzb93A1&J<X`Oxk!P6Z4hdcH
zx_f`$m0Mp2oy!C|$Bp0SLxWt!1ID+vww~UZx9?|~WZTAPy!=IF@9wPhuX!ZQI(_cb
zv?jCsduy24`Bto2bt*RHXpP<cU%!7}y?1Zk_Qs~;j|1c5=P$aLaj%U%FK&JK;>C-N
zc$`g5O<%ouG2#64)7qOu<WGP6S+i>G+SJ3$Q?@L!YZN{3tLymVNWTpB4Pv#mwNWqc
z_k#+D;^Oe;Gk5OH+4R|-JAU)$)bzR4^<O{s@19+Ae1nd6X=$ld;iDt7&VOdio3d}8
zovFFGc<DY3aNXYmZajQwUMg6(VPbB}hr^(9nSnvI@dNXM6_L}HCK$X}lX+hDM!D|0
z!wifG${&8#SXF=1*=%><b_=MIsoWc<I@$C2hl3d=Rk3l`R23K*0-`wV8O)~K;d6I(
zcHX3O`mY27LxN|EJcG2~yEQ!zA0}r0D>(G&Q;}rb!UTf|1CgDlmt4+-=C{h*`*xic
z&EjTY$ngQ`n3Wotm6LPj!Gi@kx5LWIzb|tB&o#C3-OlGGMn;QPt<qAR?0Gb4W7E?+
zxr_`Az1<&}6P$N_y%r7HD2mxO)>;3?>(rWMG7JniW`LYH2j0&0403gC^|?GH_x7gT
z=#3F)VpCmHw{#UTFeE%y{KIe~K<D(OdA8M8E?!iee||Znc6#$^%hV|swN8QTUAe+P
zfpx>aM;|M;-SErUuH$|6>eX4ZW=(oFeK#*3-?O=m6TOy-bh?!M{FDmr-R%2yb^Wus
zlj2tR=!gY-dv{k=Rn0l?J(YRGo_+i5zUwlmuGqPA=Zep+f&6?2erX;1z?|^-*SGEa
z*SgD9w!D{O=wds4kAdO9?MJciA7!&OJUSGw%E0hp+m4sZX5ZP)@SsfzROD`FHMVEy
z;;o;`z`(#Tg$2|~uZYgMbtI0Rp^F=oHyIo}K^+4I1`W;@d5|JdoHH;mEKm`s192gG
z7#b!yfRaB$fDpK@23Iwpf|QMo?aomK28MN=h-3gRoff*wRk}<|-Pz5^z@P(;5zh9*
zpQ`p6`Ck6Z!N8CZ35wTKA3kjOQ@3ABTU*t0CA4sM1~=1AZqmuUz0FrvR`y)b&UNeb
zmiJDZCic9}+q>Ij|DL?t+j6ZcKP|a@@4$hEUAuO1Z3|ox&%h9H2jsRmwaJ0LzP&t$
zFM!5e#N#R)<@(*HrLNq#F|fJ0c~frm-Me>Ry?tByYRToy^p!CtQl(5@I%1P^ZyWgr
zJ3BjjEe-OUTVb<~TU<|LqQ{Db3mqqkZQU5NpMhaPg<u_n$lg2F_9s(<oSmKhIt+b-
zCr_U2XOIPHNCiK?u+TZEacL1VGqVwobEAX9<jIpO|CT@sN*TV@t5$hU^hgPmKK+%O
zfuT$MA^U+gL9W&<_5c6viJS&5+%#`*OTE1<X=6m3?Di0?rONJoCro@}ca?Zrm%S+v
zkDPe*8#e<(o(-tE3Az;vRNV!woB}Sq&a9d?$JfW_#QX27*R1h*SrWB)@#1$%*SAco
zV`Mnc>;8jr!@?gmc5m<Rj|VlFBO_-*N}zoi%*{*R+}RmCX-nnjG+B!RhtSZ_cS_fv
zeEu1BSD%4l$49fB`3xGdA1iD??aS}E3=xwdg~#VuW`~Oj&)69l$Vo#C3=CdO&;<D4
zN-9HNh0VOXyUX+M?FHRzSvj9ELGyj(`RY%0-@krcxpU`CaDuO&z+l1ED$fw1eTcsy
z38|1GkYJH5LrU$gXE*7vHakkTDIPWmiHlnoqV-g-%y~(WX71fxTQiO^Gk^>IfG>OE
z)=xUQB<J?E$Nl!}K*u;#Ro#kxlbaqnZCmc`XDxFBG?rYCtM*+Oa3WTOfk8wO7Cp0O
z%?h%bTV~J1zz`t@itVYhJ2Uh0!VDy)q(*uz4bsxrFQ0ajmxt%cRNKl=OFr*ez4~-!
zcH-WcXzttQ-~{yi+}vPa-`=RGD6z9FqFKpRRZ+Xk-bR_oF)(cS2P(X#+`AX|^KV^f
zSeVx&qnSP1^6#$$?O&es?aj@_^XAFj+_pBwXk{}yztuyP$tN}B`d=Sv<@QpWY*qGV
zM$pPBI;Vq@lNYnGv!~wPwrlt9tG92@zP=Bf6X2Z^Znsj?7}2c9XJ#6M8d15?+j3X$
z+h@04j)5V<9@GWXpL}w~vSn^<i5gP9tJbggm+N<*RWGk0)afzF=kk>6uR|?lrailV
zveQLr){Geir^>*&;fbv=B=5-c^72YaOGjV%S2Qgv`SdhhFBPH6%{~ka4~{APVbG}J
zHn*{;|F@^cZvO5Qt9<?atv9<)3W1D8NJ@P_bIwa7OId{L<)fqBla7GutUQB5{0-$j
z;KF$^xRQ~bvv8qex|+u1lNkjC0h2&o2vgIg1r~3voYpOk?#|wN@z$+Xi{1OPYHIF)
zN~Sf!AQO1zpI`p(U!AF`=}7|~S0%x@7KMjqYJRHPD<vyCHBn;K%9Vlc?(H>p^Mlv#
z-Fx@uj0H=V9=!{4W>$9gTweY==ef2T8W=pN>2q6rYkPitoGk;xhC0-o^tPPk^rn#T
z@a4kleg%5`8~lF#`gP^boipXU46e;H<w1ona#=iuW&Zi)o72y4dcw=lAOvoWLP}#C
hiJJjZeS>qxANgLPcbB4ePkaY5)zj6_Wt~$(69C_%8K(dM

literal 0
HcmV?d00001

diff --git a/docs/screenshots/install_guide/windows_installation_shortcut.png b/docs/screenshots/install_guide/windows_installation_shortcut.png
new file mode 100644
index 0000000000000000000000000000000000000000..014206e70ba98590c0cdce07c549fb9cd9769695
GIT binary patch
literal 19664
zcmeAS@N?(olHy`uVBq!ia0y~yV9aD-U^3xgV_;yo-+bd20|NtNage(c!@6@aFBupZ
zSkfJR9T^xl_H+M9WMyDr;4JWnEM{QfI}E~%$MaXDFfjO}db&7<RK&gATYpC7WaWKx
zW{IE52}*2!6N-~06kQb^g_y-7Zp@x(+wP$>vn@rXPnLb#REK-s=W}$9{#oe2r+H+`
z0@bItAAfjeYqf}<%g1N}i_4jNztkRDH}(lF7FLex)F^tt!}{9Z_p&FgKjr23@BZFh
z{_tM^UG<7puV2>vdihHJ^S@cIX67@>@3FmlHS}ue-TCWQzANAL{qOtw`3wvUM?BBF
zF)%Q6uzN@`FetH2Vq<9NXk5a`ppc}H$-vMtgW2<!viwhuyS3l%UU~ghX3v>IGg$_P
zhQk{tEfMc-o%~7v&)@xy`#&t)?`R(Xx2t)&W#9EesofwY%@?CC*+l*8uK##{@&C_{
z^e?_!|KIl4&;PIdsy=ytx2~A^xI%XM!!2di3=9mbFMD0Gu}b?{_ha7wmVIBV(_iHO
zU0QxY|G)YBCCBUj*B5>;I{wkh?{KE!A~uE`<@f&{e!n1IR_^`r(7Pl@`#<yK7ly~z
zZr!5iqV4(F<k<gxpM$?V`D0&dRQJBR`b)9=AO4ry?LK?+#XYl#JDzEwo1gso;-1&B
z?-!|fdVM_8|My0}WloLooag5IKK2IfY5QFJWTLy*N8f_j%K7K!T8DT1f0J$>eT#n`
z^Yx?81f}=rFRXf1Hl^;#`8|8GZkuj3-yVN?W6_m@`of)Namv3}Kd!LPk=efR?f=k;
zW&%t0&bsw(#f$I1TR+Ly|M?g+tMubz`+twu)!ydPWs5je{%5AWut@3MU0PDAXU$pc
zi@vSD@JIgdR-X&@zZSn=*njW0;;%RMe{O@EE@-;^Y3{2$wM`s98a4z?ovf_pdEImS
z=}FVN7v}a)Si<k6QO~<wc6sKcXMu}U&raGZ9(VBC+{-t)r}}QzDq46&Xwu`C8!EZy
zus;t~wVJkN&Ev9-UoAaf{aWnZk|NWU?YwwNW!=x^|DN?<cDMhdxa<Et{)_4VKDNKu
z*Z-G!*Uz=<FWCQ_%5MdWwmrUg?`-K=lG}dbgo>KyX~(?BGuL^|daY5k<*U7?XK`fd
z+iICDQ@6w(FWqwdP2w&0zR6mOW?N&U!zP-1epkM~I(KpA?PsxW-ai*KrAevQ9+xe@
zP+#+X{!;!w;`M!X|K`=V>;3&z@7Di+ef?y+&z=1je&73U$F5&2v;MKkoN3!1=H}Kl
z&6yLHW)yT$eQi&|8;;qRJ#FUOMCr}(yY|xP6<>{C`ss_QHv&b3C(W6<<*akR)YIaO
z*sIqQPR>95v?8`F`pe0L&nqTviMv*M`M1{n7KyyWyS`n^P1oPB>%3~OUhpsX<;g1i
zx=Ftyr>)*5`lV1KcirPJMWJy@rG1+}WeN#BU;8~$K7G#qdCLS=-ZFb+^{Ql-Z_9)w
zKQ~|TpPu_Y_|(*G6Ot$WJd<uW`RU2qp0;0Dn@>+Ft%^Q*``hAs)9?R#d;i?2X+L&#
z-?I|1{QtWAPN9OMaqpzM<JR{aH*dCoCDpLpr0&=LJ+t?H`?>q&=ga#Y>_3P9+XKyB
zey4AL*k)$$=;u`{bh>jff1S2t-1$N!W=qK@54NaFEw<j}B_*@oU*ewIsjFW%Moi>V
z(u?+Qv-g&*h@7r`yYoh>^xS@(cE26lGBj@qFZ8^$&34IsmEJeA-#D+>D|uHuDniL+
zcHDK<7Q3)FcC9LBPx~&KVpMuhD17VMweA`5DZh8wJ^6O=Qlem|$kvFbHk&>+eVN`X
z{>3at-Ba6X-7GFa%TMW%Vur6vFUjrVxtTw0OYHL7B{p*6mtG0(i}A^+@tM=H<p00_
zAGp8x+y7>${dTbb((-@H`7hUAmW=&zR`Tz`{5|HAzfAx4arcXQYx4!x@Api8w`a3^
z{lE7AtiOKluS<Vi!Y&{4tA+n)A$!*k7R!@QTsBmG+Qi{Bp>N%!Eusx#ty3qdh4Amq
z&Dd)vkh`;#X~N%ilV%(!o%(lMr9oN!o9Aktr%$e)Shn?T$klsg@^8}P_@0X1%8%_|
zJZ;OB`25A+L*GZwuFAMIE!X~ba&$tXr*x*GckF8w-O3laxqqF0A2R>8#BUo<WOylG
zJ4^Oy5zo&b7rxd!krDmv{=3^&mK$I8z29Fq+3De-{JKeY|Kj)G{%HU2uJy}fm-#Q<
zE#H6muEn3J`@b!J`DK5#`{Q0`K}P*z_Y<Bg{l8skJXkQt_Q2LBUr)+d9n7h_bMn__
zxw$P*lv`BpxLpd8k6u@^ja~cj&w|)B7s6CaE*b2ypQV!f`q&B1m5*25vR0{bTP`a3
z(q?CzjQZb&uh-tbC1?I?bKJUH;*OuLyw$yZV_Rl0f3M8)(4vjG%T;4bZH$yms{e#d
z6_%<s-j?h1`;gMK;&am!Upw9AT<sC%cFv5y@%!R+w*HeQOmQyE&6x7#^!@+;=S<PJ
z`)T#pU3}f8*!}-xzyI9)|Alg1R<q^z;P*@B|G)72rMcbTx><j(?DvxYb^3qULk7Nu
zt_tjXWG4Jlc*4iU>FJm7^UTX9E*semkDGhWdi<7AbAE2!tO+e!U0k&`t?&7lbKBGI
z_TR}hIse!XUTeSj`?gAEwE4kztCw(ZHJ_gNc;}y8+pc*0+$DF%ebe5v-tx>*QVaiG
z_V~H$f9n1>hH9sG$(1%u+Vbtjq};a~SJ`i#kn=mzWuI?TwsxkaxT@}S{hyyU&Fj0E
z`L;|-JM$&KXZCXIFE-^Iv+rB2m|O@hg#SL$UT>{w|Myh%m&yCT>ilJ&|8LswKgRX%
zpWo?qd^Y#}n~Ti$pYwjbNiUnTpi<=Sm-9MNET1B$trgjM`G<<YlLsO@jpw*MKY6+;
zcJdPE+aXuog{@Amjd-$T+t>6jCv)vjx4KWL-TZSs({ssN;_D_qxv7%rw%vB|QuRV5
zh1>Ub>GV#kS+UpY>C5Ei>1$_v-8ErJY2>#<ss*uI*Qn%I2l8KC?0Kmy+D#?-wqO0W
z<5Q+AU(QmpQ%7G~eaqA>M_v|f-LSLnm&~P2DK}reeX?x+RITrgZ<_ZOuDEU(BR5_D
z_pv{p^#2!S+WQHu<Nv?dYi>*Al|TIY3(fd1YP@`{Ups$Z-A~<Lr}zJq{r=s2-@i?h
zzucVvSD?4<i@)W+-uk!xmVxzep8s1VTyi(YgdyRxfaiA6^J>LcaxZAS%r=i(s=jW&
z<NdmyXLIak9scpY?t<;XgBxZ@?we%VyMU2lHoHn~jfvN<+2{8-oR6!XIdAVbq1x|1
zr@ycck6)6$ZlA~hx995&es?v_*J4fB-MFN`-_4VmfgwVEf(ZkI3y%sf1A`#5Co_Y?
z5r<0*3<8E2!e8R*ex@=pFbJq)Na4@{5$>I|ukNpv?e{yyU*2p!-^B4?-vhgiA0MPR
z{BAz1bbLZ-u4wP1XFMOh=2T#lN&9@;=|Gj^{59fR>@9R^cp|TdF?yB@d^uU=_`CTq
zlV`rgi^*S`zOlEbZdUnwqtfc?>%e}?(ynvyJWFmGEqWz<T+^!f<Hn+0&4+%@xAO15
z`NN}Q(cj<O{xZK@^uW-nK79VUn3}0^S3ma8UB3IBmH+g(tuMDX^G^EWYIWJ#^|}1#
z`EzB?T{s%FOWEOwz)po3U%z=eEb5P4@_Bhx$*Y>)6>rTHtuC>D-1=W|i@5jX&lYT%
zc4hzccD??yv}uWR;o6%F2lM-u^gntKJ+*YoPNnR(!fIFC7VZeWCU5dqs$>0M{Yx|d
zN$!$Zy~Qi&>BX<HCI2pcvoqahIqBIso2!eBpX*;rHku_SXYHTvchcm9r0K1FGmf9W
zUQit%?v|7O;>^t8NW02;&tE?J8GOaM*iifPqnU9c@!HpKt1EgM{8@Xv{<P*--&_5c
z*5&Q)PQNmx^Zzb62~YcDwF;T9++L}B<h=bau|4%=g`Kmw{>{1vUv$0%?^K9fp!37q
z&R=Zh%l+*&F^*ea8TWVnj+Bqpx_;d&^7+>rmAjs=s|&lfch0f3=f6L`SM48o-}n8T
zMaJLb7KLYTtM8B(|8{%6eX-X1>&`DrPA7lA8+s<&S9}}qq!O*zyd2BG%gnw0RmQxJ
z_@XB6vY#1wW6#;6Ql7iNdOi8YQt&#p%GERD?3(@lPLrnDt$Z>2fthILrY)`?<!^^v
z?{c~LugWiq<;|nNA7w1uQ>-38nrS!pQ!uaJhIGAUkBVQX@>x#JO{@*LlqI5nh`+<%
zKmW;T(NFu1{G7AsGk>A1-X&W-fBpOaB&#~E@7`1!D}U+tr+}#IcHKAqm&fc;U!6Vg
zdTnN0_AmJfXD4lGa_7lYdFB^UI-%>p+8$Qzj!8UPkG{N^c{*(ItI|#1>^8oA`N1jo
zwt3zbHSu`+Lwa8u<s0We5{!Cq`^v12&3}FOi0=H-+!JD~xcNlroF|E?b2={`sSY&z
z7O1#aeDma$@~o?^?)?skYTvTP<o~|Y{}-D4UuHG+(R=MHp`UhzgkBd;NLGy%aZCug
z`s~5g`EMO_A4}*z?@qt6BIWFwz5Y4UFL#91D&H@7BHf=^J-hx}uGWP2QXQNA=Gy3o
z_hbcs{P=NAOHG33>F0a;?|kvt;4|%WrIqUKRONi*Sz9a9e}3N5CFL1@b)|^@q-lb`
zU3a~gn?GImcgqb4&)q*y82>ytqj!n-WvQZqTNRa7DpPlRY_n*;u8=9#C4H9Fugi4f
zIlICeW}p1amwf)Zjo;~Q*00BVezk>ote*eQF#i5^kCM0YJ<q?rdR~0w<_k;T)4|Nk
z{pJ?=KiQ$#c<6<d!QF@Xe)IM}*}lKx*i!%H)+v3v|Ftcc{j4DMRIuzmou4vObo>K7
z=GoQDWv-rBSg=c3<E4%MysVw)uYYy$pCL1;ccMu-SAW9SJGYNs;61cVx?QQJ(>hrB
z<@@D_E-p5k_i07#o;NL#`SX8lGl~!7KJUr?d)bY3I%y}HQw67O@f7!zce(hlchb67
z?KW#?f4}<qpwh=fy@zAUTBTe5$vi5(<6fRx8}d0~uI}aQhBc1^rdRXdeY!l)@9I5^
zJ?8QY*;W5)*_O>escrGfzRt|!lHmdNDw+7rtnji(Ueso<&_xcv8?Wp-89>F=gfDH$
zzn>fxk3W)MS1$3+`knLb^9jWd>$b03%QWeo!Z!aOD*G!xtL^=GOnO0c!TpEktG0J5
zPc^xB<`VClPX1l3Z~Zsyd~jALnxlM=?Muh)5A3%5<uViAGc%RDamjA}bDQ5b{l2|x
z8<$5Fb4S>v)0(_bB3~VBSXL}=KI77*Wp|4T=H-e{_%cm!`I6^TzOb3Z{yOh>gYzuE
z^2^fPYNiJ^xAn}TF1?H2b+vx?+@SwvbxAk=zlkyq^xEas75XtZ;`%mq2cPFN|LOaG
zKkWH0{>b&Vzx+<#mw$2GjPcxk|4zVvDZTx_3oh;VWB1&i;Cb1xf6~i2(~M@N&CwB_
zrN&&pP&VMuWrey}qX{o3wmj3So%BTf*}M~Fmgg_;u9=o9dHP%AzQQi6X`j#hef@pq
z=Pwif&1C(({?75vpVQxe%CBU(bW1*Fm6yDrwD!x0x&-z~c_)kFCTyJjtKhO++=@AA
z^D0(Wt^EDtX^F$$lzB_%Ph-&$XPnQ^eS0alXO)+?_WKhZPi>0r6OP!&N=1|_wYVK!
zxMNrDo97%iBRtK!Hhysv5X|~Dtt~|C)zZ19FE?+GzOvWx$h7@xi>7W#vh=?cxMphV
zR2S!up{J#!<xi<QC0U-2$ea4!^2z6?>;BZ7ynkcT{<|-({A~ZTbK1Wbb=&rRSSDUC
z_(1;g`MS?mzUTMfd0uy<vtDPVfsx)mN6mWXZdu3Io8B#LKR4g2Uh@3=%SWr3^pD0e
z-&V~0zgsFZy`bi&ugFdPRWIW+C(qZ+^_c(n+D5ex+PO<jvKMeq^2=9Y%aaN7G!cp4
zx@P0Yg*8el(>||>x+H3!xT^l<IlXR+yZ&>QC7s*0IW^+pt(SaXmrcFoKj~H`-)#49
zY+_&2rd|3sSLe23=0b(=om$VspI?x64D*fu$tD;*-BfV#lFKi<V!C>jU+#L@w_t|$
zGV43{RjOCDoNirmJ6JQ*x;24y<<cxx>09TP?|iOTo44{}@obwlQ{Ki~SM96t|G~78
z%`EKFLCcp-CCv7kS*^Q*ezlo*+{nG|(laTo^W5g28THBm&z3Y#@|*5${)6k~bH6jT
zauau#HcGcERdjl%oV%SPExB<{`qbh}?s}Q^&X@Kc-=I{hp*LmQtMyC17uCHu^Q-R3
z{Y@Ju>Dk_WcyGs|<<_(AaV%23qgH!Z+9l`jHJ3S)*j5Xit_=HIa(wBlmweix+BY7Q
zxLbXlaQyz`Q){P`X!cLLEStCgPdDowZ$>8Z1*RKzPTF?f^Yd9dTU)^@;a1UA|L!Q&
zzLj=i`WnqXq2zn#OB-z)bzO6Y%Gig;5_@N?O?Yn=x?`sLC!IZoN9RY|94gcA{`%gi
zWc|saNp`NwbL2uNU8}6n{5++-+PPBg-PcVQC$Xg}ynMHL<MWwf+hfa<K6qI5Nw+bn
z>`isJbT>Wu{N_^cS<e^$eqB31k;9|vbOR(CGflc@r10`x^XHu17DArIY74AyOqMI*
zzCAyoTA(nRefy*>wi6f_7-VEgYk6U)F7di_bN2@x(D+gg*G2DJTst{;+cGee%*;^D
zeR_J&w=>UQZoO{jpTGZ0PxExkbIY37Ffz<`nleeRBeHXc-=$4_ps^vLK+jvJEGNG=
zp1)kY?(_Q{=P&R7wcObAGidzCbNTkxHH-|g>QbK3j@d8weQ2*ge(<zT`p+|`%l785
z2Qo95HCm|ZE>73K_f!2{fsg%!zC~M?So&S--mvw7VkU#b^iHQsGv~ygUTzw(Eo$HU
z+I+jKA1~Ygz05cB(}U8eXG-Pfyo=nfY>Q!F=$O0J`xe)&g>Dyg5*GShYLW}|t`jh2
zSg_hfIaBgyo7;uFC4cVK*hQ(#J?pLQd0TL6&l!*f;*qPDxX#hH{Z!aqvrYMh_4_@>
zlTDTjdw$;JG3#=R+m(fXa%~wH6v7rw*m6f@O5heb$IUf!m;9Y9d%rft<$d-2-!gl2
z{3|@HtQSqI`P%Ce-7lPOxs>s`>de(YRDIcPU-2&6vgPIK2Q{xQnXffJGr2K)e#$+i
z`2lx!%}~Gcnm1$Dm-$Qc*w-dsF59-}@uHP->(2k0awb1*{`AX?U#mIK=6lVuRQ=27
zyMD^{+`~n)mK@hImIyG4-&MuCGcHo{fkou*C9Vf%UDCM4{cG#``g@9#rk#(vQWZUW
z{gc$!g^zYj&JVC*biKo?o@zON))(K`+-Ec&PTnmNKha+!&-cSoRZk%)pXr%%rhZvf
zn(Gm-^?pZ2VEweBIR1SXJ{P9yMbzrP{id_r`4#`NF9p-4i~l>k&yM|sakH!aoJ&&=
zKiR0d#`jXx37wl}8zxlVa#A^aTIr=(M&a#Wb2R=fnXUFJWtO_h1L6ITQh0)jKW&S;
zZ<d=8tC6R>VaAU~M$27ZU3SXbdL>U><Nc0|&GMg*bbjgjJ?C2Hx}#@bPqw_f<+kaj
zB`+uRpRbuRuTVre(_@!u_S7wN7yWpbGv)4=$(1RB8)aQ@U);hGGoi-f{Dmu>YtMHo
zsmpfXobO{}HT&GvlRM@F9l9)^S29<`%}waM^0J&KXDd_hOZ~{s?9K7H=Vx(qTjRwN
z4SCt{Q~uY~-#LY>2zLH;WGVlZg<SW}`ARQc>~Y;MEYGwwHz(YCg^m59v)?X%&(v5K
zYA^a~?uuVsJ*GChzAC2*7KOPRUs|VQo&UYvbylfT*=wKsb~VO(1$361$gTRecaqn=
z-cy^m&A420;rw^a5VjK?PM6aEf3Ckd(fjw_nJKK=>D|8PD?^^1PXz^<YUPi>$ZtC}
z8vdyGJzslwkAnOU8*`~io|^T0?>#xF^ibGpM%dHobMJHo%q^+&WAPHuz2vW2>s?Vj
zv0hDO_kZ`R>q4KtT&c8OzUblRLbd%tf3+UH{l)at?rG`dz<oFGuiA81q%HHin&<b(
zGnMy?ZfToWez84s<jtj>7dORt<o(JOo)tgy5`*%~ur;xl{&dK2hxpY9u8dxur)KoW
zrG2XL@sm}a>pxGZ*~z1)t>t+-Jl*{2LYJ3*S=z3~m-L=Y)>F4(y28Xe_m0`RUJj?%
ztF~FMsyJ%%@ps6Mi>H3fUi<A(;^!;%;knn%o_gBckC=Tf^W_qWuI!us3#-^)Po8ut
zk~?zRRgK+?-e^zSJ~egnlCM@1KZ=SKET~-{v+(7H_#AGZ@-1m=C#Ah9K2sIt<nnfz
zuAJv`ryujfO{(UKZrNM8;`FAkmVsA1pSvZ$Tes8F^0iys((^W1!HX~Kntc1%)umfA
zoeInD1|HqsxLwm$aq*Ju&(HR2Z_QSSU13w2tUH$}AXVg1)VImK+h6Pct81I5T>j`;
zwM=B~U*G+!HhFJ~N%Y&LkZGT^?e>n6%4nOOi6z<B^fGnNm&{sZQ-9`@sNm-pku18G
zW%l%4E{M|2XuBTmcw8lO`<ne?yDR>Gy=}KPVgIzxA&uSs`=g$JUi|NM)rTj1PcEkI
zI=pW6>R^rip_jKWFu1?!@e{T+q8CrSy|ro2OOvVVWskBwX8N1*+kaV`*H``Rj$GUp
zf0s?XtMKG!=Dhg%ae<i?eHQw+?-oqi!@McyZ;88^R@%nznls~0K3o3zC7)d2<~@I>
zbnKttbm{CG-%I*?|47;X-y8ly>+_-0U+!@0U*3E@uBhhwPw|(K@ql{^me1eq=x<*=
zci*qw)>9`<3;bgLztvv+zs9VURxe9z<_n0L?|7p9Tj8Yq<ICqar<w1|I(5-}@uqH9
zjohodoMNM&Y|r}Tc19y?y7JF9mF-Epw`rZX4P1E3es|#wf#rDtySSUXzbij*+WXT@
zdj0CEDSfZ6g*&C4I`7_oYTe{5ch&YfN>uno`N!%!H+i;_H}n3RV-IJvMMiHp^8BSp
z$L`2T!%u8|TRmqT-Q!j9YUcaYpliXhLdPf7z3la7bv&&x>*-v%6wPgV3=9I=*^^EB
zXM}V9zQ1o8XH=e4R$%v%w<hfO4N^SaO+k|_)7JQ2vYEQ@uy+2PMf<<_ufG(#|LdH`
z`hSj<zf9l%!)e>U&V0LgffA1^fB3a^Uj4NA->Amc#KurEb*tyE+vnr-J!T!&|M$@Q
z%R%?`m#hChU;Z-w=1;Z1zxRK8n{)Tm$>*B_H*tj9Wmj%qayR7o4?gpzV<GGe3r?@`
zy>$Q2x$j&}(+b|(S5Lh6^Q8LA`*UnP?LQp|j{Ng<Z#ws;s~syUPdRr>U6x^JShv~C
z^SyoTT7`7J{~xsVFYPb6Z}<1q|Jvqvl`kTzuGd!I+;#l_6KlUMzbrE<UHrSFmf2eH
zfm}IvtLLxIeA{?|FYEst<gGfsxBAP+`~J%v?S9n9EVY)eFpB>FHB~Ea=A#Y4@?lp3
zZN+&R7}!&CC&k%)jZu5hU;oqUZ?}AXlijzB!g;@z%HKIP?f;KY+vnzd-9O><roQCB
z(;iYVYd-zkJhS2W=hY?ez8@;SBJ}V6@%^Dfn{-a^=Gi(!F`eOn+6FUE`+rBu*R*FJ
zmXG_D=6E7BsSPwTb>x=H->>!mdcGFq{y24go=&Gli!M6@!>%*8RQ{e#Uw1Kl|Hs^4
z%FjOL?|j+w|M|xJU4ozOfBy>pBKj=b|B`&gw|%8sRZ==688*CJ<9msLfngTX^qB;X
zS+%X6zl!JomSJGX;oY8pU$1flZ}wypCMKps+gM*8G$Yy^9L6IHN6udI+_S%GFT=?_
zQ^Z0H{8wC;zEC0=alP&76t-qf-CP?61*vOlFXvdQ?rnLt^oQ~iFSpQ-vWfF}G{DvI
z($cjP{@Q0)zj(_xi=APCn1_|fea>knvIV=(YFfUqlPUYpzuT5!!9)vHTmOs+zKuK@
zGrI+Zye2VzwfI})b@IS+NuCwU-AXEJoGz=L_OZ)eDDwFEWyi!-t;>@qt<(>GI{oVA
z5WlnkWZ3V>t=qRpzV4LstrOR_o89YKGF_+k?zg%raj%3guS*M&)ze<M^0ocd^=11R
z7+4=o+2YpS@;rX7Nswa-(@B<vEvegidw=vqutnO|%&nR8WcwMHxWK-%|0N#o>UdId
z)3-9@>UO<-7wq=Mrv7Sam7VojFE{<S!u#1tvOQn?cbsK-p;YK~tM^FC5mC97qJ9Os
zy*XQ^_y1b<nX7YF&7BuBj~+LFvgJt5uT@2B&h+t`cCF1)R#Ukgu;*{IR(`A9#!8c;
zw~H7USe2%1k>7hWu*idBQ?FlgtGrjd==-N<%%6OE*(`d>Qgg?jL%{}hDf#+t3%79}
zy}f_ip3q-Mo?R4)*WzYa&>3>+*Xqh3xve)}_PtrX`R}ecMUI6c@1G}ct#G=`68iMU
zpZ?CAs>8=VPL^BvE9|ZN%Gx(|CrjMB?KW1nEVEX~WC&Ap@?0)7;blwX9g!{STZQ{;
zzFsruyV|?{P20UY{`@yC=3CBNZezr_%ZOdeKDKVfoDctGOj~~zINnkYxxebKhUcv}
z(`PyJee2A#SAKJ9Q%S92CWBO`!=?6g&EgY{rK=A%Y1tjTs5vp@>UJ$T1_9f-Q%%lG
zKR4g_#p7GUj{o<97iTQXE?T`RKh%anp~^}-lY!v|8+ZyCIW-c_8hBNw<xYBLz93~k
z`&!FM^6&FK!|T%{?;Q%NI=`^8+DF*;_x&yR6!w4A%{N?sR$XMf-ktnT_Iv;8E?Al6
zrk}RfoAv79uQmQB|D=7Zw3H3nKmEdCbJeqRCjDzz7XHa(^@cfpnKS;rv)=#mIoI77
zzf6lcm!_`a2{?XBWp44G^|M#mM67<q-*xW&iqF?}>|sCp$Mw$YDK|roFZ;@x^~-Py
zv<dt0yYsE`uv_~ZbDK?;=ua(=*|K8)9{tbDe(wRbAGP;2RA_Dv_|18iUm-;O&%r5j
z`yM@>RxGvogS_ACVhzvyi7ymi2K;ffeD!D5ho?SI*FKXuuK)O{aQ)OzvtQlbvM=}6
zg<S!6q8{Wc)cpCl`f^Qe)QPpzZoOrCDl4A*EqR{B#ATai2OG_~6w^KXx_Ytx$Iyg_
z{D+l4EEaeZ_~fGCqbVlb>a&?1uJ<T9pgLv8`YSKH{Xb8i`%3)ctBSg{)8?~r^csCV
zn7!@v{bGqa!|a`X%jPWG^Y`C|4DR2NSJf6)70dp~=y6ZKTv<Bv*Xlh-p6gHHee2(w
z<MsRS*QvS8U-_OE&-k{|bH1$nHonjgWjCcC{B=ElYVERhy>GKPr>f_NPXGI*_Ecf5
z@by*mxxV^w>9g)jdi{8r@gI-KmNQIWlAc}MAogv;`crj3mT70Nxb^qp>@1cz)xhoN
zzPvqbe%WYRuoVCA$lrB`yzlj%ioMC~Wp_~D;ob6F;~y?NdU%!mJhQ(r9{*h7H)*AS
zabg;K=Enp2b8|u~XaBjwIeD(f-ajmfiS5sXoS&LJefxd6!ruT{=P9Q?FW$7QY(we8
zofiXUF8%ZM*Q~#qOGAIACIz;<x^lzr>&wfJl>^$jDyk>$ulcI~_J82k?9j?zG7oI#
znoPCXY%w{0Wu559vRcNQ%V+zwy!=yQwJ7eM&vN@sEBS-J1$-(CmIy!f`nAg4bi??M
zpX7J%S-0cUl^52hoo^kA7peGpY6@HE&wL3`vE%inJ8d<~jOFL~+_ag>ABD**31u$~
z{p0v5<8wyW_NOf;E`8#hcHxe1sYc+oT=wAmxBhbGF1Ek@V^{7gP`lQ(Z1S#>V5_Ow
zFELxSdQ39c%?lsa?Mgb$ebqW*{**6=CZ3LZwrshL#zpb=S)05!<xJWVr#^rEhK9cy
zQCr`uuLCu3{cG=vnf3FkIeGrRxJp*_HS<}ylGe!@23p%+=I)7&7oES+Nj6u`_v6w{
zOe?nJnLK+pOMZdurt`YrmT&Pr{O?L`@OG?i+dV!9itSk!99{AF&tx&*zbTL3R&o0$
ztJvrsTKwGPT<@x%a_(mGZ%@}*=vzyBwyV5#xnG26=w?RmSnh8yDQ^3c&pY=$y;5JQ
zBa?A-{q&{l4~3S$%)J>|b2R)#P@U1;i;MbvD{oufJYRaF=u7z1U1c0sj~?BAV}6f=
z+`_*rSLJK2ORZbIEZ@=YZo;D{Y-^rmp3b|wPWSX|zpEy*I-=!jHy3vHd;dOp_si$c
zry}>v;a~b|`fY{Q?eBy2D=qdrp7?zEuN?2PI<G_16jOiiaRxVa)pEtE=L>0WHn^+U
z&sg>IH+SZWJHE<Jp3B)AYSx~~J9LA&*FHUd_m^Jh(#86_Hy$>ZvRG%ccGA<x9g0g%
zbKbY$xfVG6@|5z7`c3DbnrS9%=RL}Pd*O||W|jIL{T=qEPfgzWhwgPM%>5K?TC1EU
zvikJI8rAd8Te4SwV*BILn)N@^YJc>L$pLfTtM8LMvFUuC(XH+tJH6&0@24}kXKLEZ
z%j(>o9;kZyQ1PXAY>5vnGyl$XmD^KjaV{^4&+g#YIm?3;ex*Ha6KY(--@iLBcve0O
zL&Lkvk)EgPw@-C5VPM$cSQ2)LfnftLWWo$%*ap9F347(=uh(B5>y<9~`>T|}!F@;7
zSFOE29(6DMypz*oS95{;{-4igm;C;g%i!RiaB|a%w?FT&sN8k@vFgm+zJ`Vib3Zi8
z|7n<4{ch(ah=f8WOUpY}kE-s5C4vIG#I4j{zInPp>`z6#a<0nW89g!8eqw1y|MB&@
zS#P;7vVGl#83F6f7s;;dx$<^FY0j;4)5>EOu9RD+b@bn@`;vkC%@?{}yUIQ5i~E+%
z)0ao8zIpGHq4NA@hRfumb#d!|9nNgs;NLyhwbK53`3sZ%k*S-!e=gkZZ@v8Y73sGZ
z=Jnr>pW}OZr<GrZnzl;+<;q*9b{vg-_1*nw?(H?!s}7|4h?V^QW@lUQ%jE5wyJ~uC
zizl7StO&glxZ%_4sgIULUgDnh;biV&%a#<uuIS(g-KSHG7EX+~>{WGjml?S7Sm^pU
z@>Hemx6E{tMHf%RZ1@#*>us~}zl`=9r!!l`|2^VR$#vPezj&5fcZknXlRfrcE0pp&
zi<#zL$eSlPw@h61>rF08f$bL6x4yrO+sMcJx=%+$rFNRwznIn~uWy)nUhh!Yp(nC^
z+JU4;-KU$>g64}At>)c&oAs3Sx(jLc6(Q#jdD-u<(%rH{eDaqk`gvECmK@@bYhPlw
zI(=6ABn|PBZ(B}YUVd|Cf$bkIIn&JsbC*<x%<Z${Ruqm~F(*Lg`QfCP3rCi%jV*6U
z{Lg5$d-MBOdn|UZob+tF?Ca^_=UlgNs(z~aedx5u*Y1o`oBd(hwUdi~MY_mpY<3n=
z*}LC)a^SzO7dX|kcOS^GQsD#-jriZ;oc8Q={M666t1tP-{Bn?8#gzZtC@g4W(dw0}
z<qExQ`duPx6zy407hlY>uT9bDTRPKM-edNSZ@O2i7rl~RHTgf=kyve~bFXGxbL6&;
z*_Ks4al+ckd<*y8<&}@F{5|KJ{@$nCA}*XevEL%hKl;YSEhkD07hcveuwONG;-7nR
z{j+wSJ2ofJ<n3c`r?8)^YHe%HWRFf;62D!~`!mDbr<xM`&)eu0&DIxL$FuG*^E$iT
zb(a3tewT0k3Av%;nf*n2_Rp=~-{sz2S@HDj-Jc#e_e`|>vh6vqgLhT>k<T-{RBE=F
z&7E@d<l2Ilkzt}gEd@0kw|MNIT)RC_95Se){XFOXnHL)b*1vk<zI@><meZGmUGwap
z97=!eqj7b;(!F*1Ej9B$?K-Kk|7gaH|GPAKCa+lMv;S<0`TN_K=UnUb>8*+^(3`j1
z^AD>7%dYLt%G&<cv&3d@>WRHoVzOI*{^p9g?Cq>`uTFYbttr-bH}c`5f@|?I6+gGk
zy0#+vd9cW{33Dgxog<$9yQC_8dYRkuyRL7_d~dDV5IL!AapK=ak;+lpcbiVEZHRa?
zTl-~{;tORLr;OOEW$vQuneNLJ{|(x=_~nzRT?IF6zTOXtUu}6!=k}^yAyd>p)+G1l
zH|*qfF3h|qEVr`#)ofAW73CZ3GCiKIY1KLH)t7lF=w@|jW%$wJ38hiXg8X+jF27yg
z|N5}`?~v#l7jvdfmGVu`jQA%U^`Z4%eeemD+7}Z`s+5gnpL*}^IPm(KXPk}KHu1(U
zYL9cvH@<joZkK(z?J%3?Ec??PJCjUev|k=rac9|ki`Z!;sSk3w9(^kkdU<Ql&-}X`
z+g@$%<DWX6v*O`$h7ieC3%S_UfveZXZ}VMnZ{aVGf=`b!C))H1o1ed%_I2v)I^NXu
zg-11PG+xe{J!O?{S+jB`UzW+*lvi#W-@Tl4d*_nX%M`+9PJWhZK6m2UGoRN)Pj_9p
zl1JL*l;4}QTZ>a~7<hh;Df(4u>3d2!)B5hg;u|+h-1{eG_C7FgaP}|1Q5qR@_KT~B
zP44CG9IZdYWS{5jOjUh;`kcDg>enJGyi+T!tyk9E)iUkkJ@&FPYG#<>M<dgaRrR3>
zjLYwvY`Q%E`SQv-+v;z6vZ1Hl^=8k%vqHx6cWw69l6H?<o}2wA?-4M)tLPu|LsM{O
zINuK~Y2WCXZEnY(z3lsYG|RudWto9W-ukpyx#PhSFYVG7r<O9#eDm&N(xdH#{&_8z
z*rX1&gXYiEW^R)>;p?a!WxF+SN1=teIp1ZYOS9X9{C1wv3#@&7Vg3SB_3VPVec6-m
zuX-u%eAJ`=^TZnGNy!&k@^VsdZ@i)QGCBU}n(R}>{vl7ypSnExCHXjE&MwE7dOZJL
zua{;Ne|6UURz>WC=mzeWB~E%Nd{3V*c22$SIm`K>W#-P~3b&`I=)RqO-{rFSl0CW+
zMcrR2)8#^^t2}kT99n$NZ4Z0BpOt~pxoe-zg;jqavbq;`zPh-!+nn!i@1-|C^ZZ^v
zU&Nhh{_EJohmq$dul=Py<Cyyg0Re$U+|lYUcUFs>k1yOT__>V1Q(2)zKWFZe?UEi+
zj0>w7C*4y*tBw?2>M~7ob9fQguw*+2T+t8JE&jG&rwE%eERg<S`TNi3^V82gS5tV&
z_vu#l`isl$zG_;Pzms8Dp!~t|^rEfLi-k$6WV0uKd2aXJl7Zod)(?CBwcN8KW-k#G
z5D?gA7$I)9(G0YZCIe$-FP4th%M&|4rr&2~xKZ$?a(&|x<>O^)3<;k%Jm1SUsZZwi
zOooQDhv$8l@~|qpRi?tQAbN}KcEy(`I7^?rUccYZJnzne*VorGGgvXr-+Vr<e(AS6
ze2kv%ek+uBZoXgjTKD&ET@DToL3X?J{a@dF&pQ8BU_!~07OP3?PjPT?+~xMK{T}sp
zr!3Q?zBvKzPM0`1?sELCyZ^Us3yVh;GiRxaN^ir3-V3#!`pZpTd|h#zhs|Uz`=uPq
zg?&06RfY@ir8v6$-eN3u@m!tM-u=c4CvJJ0;WD{3eqw8F)Ek`>$99==Z_QorzWAh{
zVr=5yj7d`^W8`ndwTE7kt6h=N{CDmazjd*jJ#I;U{I@Q^{@ilC+RIhKVv{FkFFvVc
z|1y^2sc=_xc*LBgb@eXR)%))Kwl4Ygh41a#pZn9wrJ8f%x6aki51aX*<Iq3meR5Zy
z{yDN<@MEHirj^=DOVz!MzSIA07A|ut{%1Yo(xxf<npS-Y{V1z^W#ZLI^Cm>!lC+$e
z5_d2D!jkFSF-*&~D>|6HCw~sijQlZk!;U@kqTaVG`;>PJ?9yP4ZH>ZrR%loXe%E@G
zEtGosms7-rCH9K1)5V>BwmiBfB9`udImKw<#dCF9+S)HeQ|~Ig+_Pt|Pv3DNmrId<
zPcQv@g8je3-TeKlq9?7Jlo47Zx_a4riG`p5tZ!GlH=&!;dzZzcb^P43MEssC%hkRX
z-t+ABVXe%5;~QotShpJ+ip$%5%)Pbig3767U#+ez<z35tbgk-}%jYup?a;|6s%rlh
z85VXab^F!!D9_@`^v$0RW%g-onNadyz3y!6jnq?%qbJoRBPQa%6~6q^F8<!;<Z_oP
zX0HmbBb}BDRZi|#OMl5aal5~@FWXU@7%RE6>L&VEb>*C7Bdyi%Rup|&VI^BwtkI(~
zdt2$^lQp-4YA%1X+Ts~KgX`nhlH0x+kM{rSFB9`y_Ofcebo`ErtV2G>cjQY<n!d|w
zireKNb3Oar41F2t3tz<qw)H)~SYh^Q-JR(U(lhpm=ZWavW^=o|u%;wNbN?RM%iBJe
z-ufyz`-|SJqcgVd?#~vk*nP4o?|xe4Jip~OYnE(X^S%7Vo0oNAWoD@hA1#e-W_q^g
z{H#wgUov0qHj}xSGOcfeccIKq3-9HdxB1<EvTg1)jT4oRZmoL%%38Z~*Zu#TQs32L
zr<!z^#7$T}`_~F-$?T6szkY7A+Uq&HAgV9@W&0&}uNBJt>Y374JTB$EUS{?r<?h1T
z-FDn@f6DgWjmzKU6~#B{UaY_$j_Z26-=5*H?G6`L-#&NWjTslW=y`9`ty!m~Ja_xF
zZdUJoh4EgmE&J_!#j5RIcKp)WnGhvk5vwM~+Py|^|Gr%tbk#~`eJ(G${L(-DrT^zW
zpYk@aO>Nx%+_Gfiqs)0tE2fkLu9<lzbZ(5D&GQ(=Ouffzbo<3huK9}o<aU{_Z)8-v
z<grg%sB)@w{`J)t-v8$~>$aHBJ8I(`^_Lkpyvi+?rYI<VS5BLIY+3m2r^+vr>JEOH
zDD>*Y;;AK7kIZ`C6gkQzsK|ElAH7*&zG(8qxCc&xQDvnY4<#);)oU;3s-JORMCPB{
z!{<Nmh8$nClgIXw-jmBo@lLm2oHvVWzp!i7+pI@(m#D_o1dFaelyu48ebVH+Iqyt)
zSH^gY^J$y^-JXBxyPL^v-_z%o#8}>)IPLkXNmGw6j+TG_t8V(YOMIM13coOyeB1JF
zd1T}vZO>i))td!950^w;x_QOfanZkLi+Y-zAFZ8~r;!``%Y(BtW$lu;8tX$ROiVet
zjWv_?n)zAJXvHNHc{Bf>^)qb^oaCJ`^M9M3iqN;zsw2xd>lY_fe!l+tkn5UNJiF(w
ze&d}f{rTpx*8)-DTVs7|0*-}#%ylxmI?;8Ba%#Pyw&yv|Tm5;tc2TFkZT5S<%xV*d
zu~Gbmb2l$vDZgyG&_XVD{<68T^@lH>`q40H-(G9A%6*H2C&l@(U-2%AY;(V~a>rB7
z2~SNXEc4nGt^G1Y$0jMWYL|0+j!NeI9R;^nX>xonIc_(<pwz$o#@o^rzO()OpL{-9
z_sZe4>W(+dWj^uN?#XNZz^e44w`uxU6VF`9v|We4JFl)i>2&ssi{@JXg{7@lTTl3>
z#F*cGc<s5XNo&ongGYW!Z%94)b5rW<RWJG01t;uUylKx|*;y(53|%|QgB5@8VBfT(
zv%7dB|A{SLR<V<ge%|v{Ytp{Gvuoc?S@Kiuq0Q|6XPG>5uEl@u+_&+`f3b1K(_;@C
zmfLzg(p`4`Q@-j;-aUmcKs9@9@Yy>SXPoUO>DaR8?mIU9TJ+7EU(2Kxq(<%Kzv*kC
zec^%8d+(ift$%Ws#%?G+ueL=)dFn3x<Vp6&uJ6#d63M&sanB~r+ie%DE}QlK%;dcN
z#V*g(b9P{k*xAKTyE6N)G)y(;OVx6@wRJ|RZ{_mxjPmqJcLiip&G|mhZqe&ozFa<_
z@Fwr6+gtuO>^hmDZ?s*!ZdPi{tm}TNbK^c(l=xg)z`L+7M>&&)rR8h;yZ^@(GgPij
zoM6J_WX`0rm$k)82-FrxYgl4F0a~l^O!&ek^vVO&GMLRc>7Ij=EGMW@VeD{8+GB;X
zVkS#V9visEOL_n1JtKqFsk5`MJ}=|&uqtwr{h9y2*<PpAhC!k3$DP(C<~`eFIT>Dv
z<(|()tCBCuax&cT!CQx8Z1#D{SM>8!>aVNue?xygQMc!0c)?L~?$gff^Wb*Mp}D;c
z4Hx!)c<En1EAQT(NUP<q8<tpe#7`9z5ZERDZvX!}k1FW~P={Pn;iWDk*w-)SEtwuH
z_2c@T?`+Jo&eh&Y@baEr7JDR2Ui;-=S*fpXTQ;xnW9gHAJE70X!6Bml#SFA{U`HR{
z*rrw2J4N;G;(61IRC*f(QeRA4vieE5=>0aRl#1=Gg>z4KsC6gFfaJqpOj~k4;!??l
z#VJ<Hm-Z}^R6p9X?4-h6wwJsb4>JY!>q(yY;^9<0)y}hKPxSMpyXHK98EbcXQ%UM?
zop|LZPF3g5KNnuXU#}ej%305De*3)S`RnudWoqW~dwN{@9d#zH(&$sEjPHrcJ8S1#
zY+RljEV9QheukT)gM&rLiy2FTJF_HrujDs>yU@kLe~-%EE44Lh&hzV{gf_&mxU8tF
zN|l@RWy-X$drQBrT(J42<n;YB*G;T3l9Zo2!_?7J_@a~B<;XjBZ+ogtB9|<?dtWlJ
zU-(C5PUrHYE=$8d-<FuDtRR#5V%`$b)0LC@lGf_1R*~vjA9d}<j{rNf+I$CQIm6Y0
zMN;eC-oJ91+&iyw{ueWMm#IrS#Y`?P&eFbV_Hk*gk-4g%fB>J2mF~-&E19X0suu%l
zu5LPZto_r*m$7?ORPrC?RvkNCIq${9?-v7gUzTjKne}60;oP3pkE-juSQr@}o^W2S
zGS@HsNl=cA=XKw5mZLF-cOU*+_W5{F-r^;t|7Om}{a00OFD`fLJ;#d4Tcmw=|9sN+
zvTwo?)xA7(bFEldTAW+`JZGsMS3dhEO};;D?VD4RbnZSdE=no<=CWiV(yA-1_-$uT
zh5h_3-M&fIzmmu0!M;3qQ~Ox`O#S3e?K>Q29v_<YEOnmI#4kGvI~oe6EKHtsFD2rh
zyYdr(AN|hYEM&!2acfz+`$czdP|NWwgJ(V`I9oES>{WFDH7|K4e3=Gr&l@{jie|!8
z^gy<qgX1nw#qo#J8n(AGU$FhKt$=~yh6C|a8rCPizP|qQ)Ku*+KOXl(+Ql{RZb3)A
z()a)S^}6KsHC+Y=_Xow(&c{~UnS)l2@6)=?%)lUE4_E1MiJ?T;qsqHs3F8a3yOX{Y
zc{RtK-@C;$-QlFo1Thha@Z>KEUf!bH=cq5W2w0}_a<3$BwezgEGj}}f`NqV4YT`!C
zRE7ellDJFxdkmK^nSSBUGFH|@limgTpMInAq-=sw*xj_NUl?3`o~zF7UGmoI=bL|O
zCcbQqFDJegtO>YuSn}*KXQ}sMkNZONW(Tn`us7V_@aamh|I|mUamO=DV!o^7K3~Gl
zd3HKuW45QYq5kC`x^v}LPWm!WY*wTkf2}nC@h!90%3rRqIrAvB(&BdMq4!@SepP2m
z?tWad<=qGI<_QjWSKOOkm_7Yi+0KCL8};3vX1=nP;rpD=5&Apvw1zHo!IwV|*zFha
z*F0eUa&>*()-8RHE9U;KZ+qvtOW~2FFMC}|Ow@AsON|w?zqbWzzKq_U5e~{qa%bE2
z`fRJ-toZfV?zlYXS%rIaKF`?}yG`iYQ`YOnm36=GZWPX1X!mRVUXGSmrz=|?rP|Lr
zwYil20Y~N6tKoBd{=ew|r_n9!xc}2B?WJGtPBSs~Uorj6>DLM`nMx;>DSK!;>#h!{
zIsMeIKP%NF_jACTzTm)5tjT7xFHT53B{c6Rw^PRL=40kl(_gV22wdzMtDdp!_oQ>r
zre5A3JnvVAad__Mdj+pl=k^)3C)*pXofO^MbNaMR=>zw>p_LhP6e3^MMbFcpKT~ku
z-ERv%`aZq6i?M*GW5xad|GtNF&AQ3psegA0`{_!{P;>UlW|NNf9*&u&6Iyv|andXW
zjmN8=mehsIeY`#Ur)Edc&ZD1FRZc74c@$HTaQjX1f_<SM^L8y>Xv5&gF|U4G@r7x5
zo>DS1(mb<wE`9x3Ixp<N+i8(!iXI#6o+++j?%MLo{&UPmj;(>0>LO1`@pFG%`Zq(1
zzoDaH$@Z2>OBfmEGEBNBq>#z5ixZr)kP_>JFVh;#H#1zY{g5_Ix9R@mZ%_5>XVyJ0
zuVZJpAoyd>QENU%hJ?cnOBi8$O|kSyGZ`2<V8ZVd{>=9_&%0B=e~g)7*TJi+!(Sd1
zkJp)d-q+!hY>V};v*!1g+}@rK%4y!yTyvonS9t2X5*C)0cPw?ge-xj$4Y!&<8&q?F
zGW=c!&wN2psqo!NU3KpqHIonTH@)U%n{sCQQj-NdU=<fEJ$G+!<X>hI|7(Zp{<qe(
z!8?3+i@lkBQW?_Ae=%pt^5%{f84%CG;?M<4&+A+Tpl0u71<tdzcM>K9OyY_8lVG)c
zW%RepD!#9of9~pTxv%GY`t_wRmv!b|ne6^+pI$Z_sJ@K5q2Rf^No3=$%!w)UPK7LU
zeq;1J_3@jk>FcHT&VFk&@%&_)eVh7TvqIF$ct%@h&Gf3tuoOwZe%kj`52NpM-BaB>
zpoT^D!s1Em=1ksJ#N%naMW$=>Yv;?NxyW*LyB4SII@}em-~Nc}wB7woJNwvM>-6j(
zV;QaIJZEXzsK-_|pFg!N$x<XdYF_vq3m%VOy*u|;YAnvbW8vc9U{Ud6$&!Ny!8N`(
z_A!rv9T;&@&8+)Zo}b^p?_+QNg{9up9o!$bf7_{_`#-F)&fe~Vc;SXD`;0{sP2Mxe
zON6hFTe|&TRd?RqU946d-|ueCz8(|5%~Ipy`{V4tl=#BlvU{6MdZvArTYpc$EyoMK
zKg_u*T+)8uY^t-byC7b8VVk_pMUPqgh4%b>HhZZo^WB!;lic~X&DVYL{V{v3Abalb
zgF;i6y!C6$J6xLu)+GtjwM<@Tf{BIMEtv@~zE5TZsrz+sli;L#w`DJHxV~7<Smtuh
z`Z>=$Zq9!Cw6bmU-kQ4wZq;S8wZeSwE8dcsu=>mIdp_SkPdK)_`s0>(ov$k%toXfX
z+Fj1Czny2<ek`k$-E6-2VuqXl9@&WPe4BoST=~wCd6|FOJMXG;pS|~Hl)0YqTX6WX
zXz7cVDLXFgvI_Iv&t>)gvCi@)Gxn6*b@ylUt~8&svhLne!|$KpoqQiY!F0=eEt%AK
zla1Dr7b|San5S=Ney#Yj==SxCg`V#(=12$_byx3^_NaHcGIv7hYo|4{>O}jD--~Ur
zRJi@M+ST4T``+=Mh*yCJFMf3ut~QbG&HVm0R;oX3i@1=X%3h(n)3!*P_GfO_x;NJ%
zS&IMj$_YAe@2wGd&+_2%`D4!Zy$9o0YM<JwzU0Wvi`grC%qm&8oqfG`_VL}nerAf<
zK7IT+{pPo?UyCZY-~BF{QS7ko)%R6qr>=!w*?mQg_a*n+Nqu*m-(J1ZA6i@D^j7ZC
ziC>F2#qL#1zgIUq)%MhKn{R0*l1qQveaZdJ(jDX9{b5_J*q_^Zr&6wj=l*Ej{xVnn
z@|Lx~tnTIR_MRLVzqJ0)@#39!br#EhbAR=G{P~x|rL8hA7*^U;{#?CbdWpXM$~)m{
z=7-Fbjddfm_XYgZn=9kc6C<#NNBb1V)6gz|R_(7E*LJ%<&iQw{{^|Bh8dqJX2Tv@&
zT^rwM#-6gej(^+4sO!t__14DZOi!v_dkN&`B8ZzC_ulL{wtJ;TWu-}S<faY3P44*~
z-FdwDnqQZV>80fhy(cewZ+&ofP3n^0EZ#AkGhE+&`uOvA&72LtYZ@ySl`QmdKV!G|
z{PC;o$}iLSN*Z=B@5xkI%lG3@=PK3Nakbu`XP5onRWY|bRx;FSZTIHN+rNI8B+ChU
zM4Hux%K3iWHU}E8yLR0uO`D&6+hzIs?)athxprlH|Hg>sZ?{)*zb3wQ$tUeCqTW-U
zu3B#XrNrHFPT7;Szu*0PRg<&lf!niXc6$}?{%@7!b^hsa>8s2ehLtl`PqECbJ|OP5
zhihm1CG(}5E3Z#YTzUF*-L{XCMZ#x$m`Z;I#LWH?6!|u@*kRl2?_G6iIkub6>)u+D
z`$y|<#^;T%-#%YevHP#0<*t1z6lcGhV4)vp|3lL|aA~De_hk1&&a-MCb|zJ6KVDT4
zJOAH|eF;yaHR9{rmSkIgU`(3#?#5$gCpW8qEZqL(FV-*7o@cP|N06Lo>XwtMv%D5f
zSza^MZ+ZErzcSO^d$+}z<wx`X{>cDJ&)=$FFSp)QwLN39Q<d@E#O01r-xvGdPuis%
zF~3M!rfu<?Zmmx*d8M~|Z(ca--GfYC)!gZ67H5{(26^^x4*YuWjDLTG<n5Q;4@%nm
z%wMMNQeMrk5_>w4Z^EhPOYSn-hnQ!7Ik_P3ok*U{Hj6~3k3!)B$qRY{;#$`y?|t(m
zcg^-$r>~qBINd8C7FzZBg3sTUPuqT{*vmJVu|LuJ8&}~M_3iGp;99<Ip1!}F;z5SI
zIUexqlyrOUt-1MYKK5?e^|VZ;G=7TVWl^U@yPMySR=oJOQ6c(sjA^%}x4!u|E!DZ(
zDt{bX*kumt7^|%3U+=9i@a|da(@l53f7|ks{j{6ME}?3s2H~Y=87p=E*0FqO{U0I!
z*d}q;9r4*Nv+FiETzYULqu4>td%ygIyKfA4%n~eie;E~@qm}#Xpiu9UpVt?D;EtKi
z{5^Fxv(VqVKMV99Ey%TxSTxb(|2eJy_g39Cyx{x8{oK#*ow@eW7v3M||E0ut>szy`
zl;`Pa#R~TV)AxFJ%4-&FujOX__4kKE{E>sJ{w8#~UE+DqP%r!Ak@$X(ew$AmFBIZ`
zU7G$PJO1}AFLvc$e=9%=9e+6rPhG;uz#u~5G9+Tg(ve#(XlH7`8Z@KAM7RA$gK7u`
z)eL8EDF%iEABz$^Pq#5JF!ag4egN6cZBNX+R=!2QeQoo*e_!nWUeMQF`TgPP2ZyJ>
zRR4c6cwKBxbZFt<U!}h$+y4}<`t$Ml%S%hWA6!zsb^CVl+oap8x~9ifb?*DV_x(j~
z{XGuX*TphlU$^tygR+gesf|m_CBy_z{}kU}(VMsDpV-}9rP;3^mhJd|`u<}1Uq@55
z12=a>oP)FkourNK@aahAO*dPVCb)4<eC1QoU6r5HUdAupE|}LI9$$NPYx3k3iZ6Me
zsoQ@RIlHfBZ^@*_=r0%D=at_#$eA5kapXkP#@o%&U+xs2-<dD5?W~SXQi@_^V59k+
z*6x1&+i6lBRm~6Af0J-*-}&*^>^zg)+h-2NzrA1c`Rt`{52j^{%lY0m+x#IzQ2B+y
z9lbkt+s>Ly_`-I0(l&Lm6A!;_%uP%5y#3aJZ+m~PF}L@LQ=Cs6E=BXG#PX}uRw%qY
z%<P$O_<GWpd+%nn?UnmF<Kc|7>a4%_dfE<4zD<4kJ;UtH#e!|&r=IVKoWA6H+OFC*
zlY6#}wfARV?702+?SWm+0=-N0;}`VLt)3vaS1RIq+v@&H&HQ#=;kkb}89eh1vnPIe
zH=}B=;oGhmk*D@1>SZavyj$2`_4sa)o%#VQmA&TDLG>2FZ#R2C{x>1bf68S!O=-QC
zr^V%#aEt3*Xzq{GU7O9S!h7xDN$*+iN4-ukbw|6bQ8|0)m8jcQ_0uQ4cP*;*YwDf$
zCA8|xLGF^Dy{AhaE?CsM<e-&Bq37<v&ojziKXScf^k`eA{{-RbC7G*^FIe7LWy7m<
zyC>63PV8}P-EI@PS6}LGrQ}aLe!Aqcn)fW$>W7=AZ=L_C;L=_PaXB0J=jY}wF7|um
z`?3GhQ+N3##o~IGedm9F$}PW`dwT!(lOi5f-I3i(nuTsH-8gN_{O+gwXBJ#@D4E2!
z^y&Uu)daDfr<>iM)=Hh9_u*ygts_0xT+dCq&*t^()nfijt*3u(n*Ax^<-FY!&IT6m
znVcVM)4$~JuhZt0e^YmTFpRXbQ+TPHraOtRx9_b-)Uy?pCU?W4jysf0DpO97H2mC}
z<K}-Ocgr5<O3Rg}Us%bfp5M1&<)mj9H_MB1D@EJZE>yiEFu!-+&$J~{q4MGrzK9h+
znzU|K@!A=a<DO5JJ=5vEYgMgGoywYJI!#9Fx~{+eoqTJn(Y-4#`*Kz}Kl(G}_|r7W
z@MG1MpU<9Pw%6Un1Tx^$Bt84P8@EUQFL6&y$^C4V<`;LV)W7`0{lafk*zK1cf2rku
zY3pTKtGdn0tv9{ol|JrY72=y6ay0$ZGwBI+E^->5S2Ql!K4Ys#)zjxo{szlsSMcP^
zPD<lC@3~sK&Z_RjWx1`Bz9sS9vk3VpUHdrTuEv#*en)g}vR~zO(vMMpyy{2HDVwK>
zPwQhGE=8Z&rE*vFn(9m6q`i~Y9rVjKIV%2O;+FbXk69X)Y?tuZCFk+$L(ZHfckA`$
zS#Jz90j2Uk(U*RR?lJhIU6HGDcK@fg_=DVs-(GUN^e1=@Nc@NB9^LkO{hy2bW3=bS
zJP^D4|M&gk{EUscX%FvvKfCX{?RImtpWdJ9+uP3S{Heb5XZOjlfCs$at#ALZeX0BG
z<MQ>pFPiM{WKn)4lE?n<V11r=p8V}Ju}WiZZceb+zJj&C(!|7s+^%Te;rrD5zry(R
zw8KijPWs0$x>x_bKJb0|{w-hsT&VxAao6^Dm9`_d&LaDNkL{P~*M02%azeR3$9Dhk
z-TS@c|Go;3=8T$9F7xRqUrcdPo-$FB^@s+>v;XWj6h!L3R4aaFU|?YIboFyt=akR{
E0Ibm7<^TWy

literal 0
HcmV?d00001


From d389f89c496a814d42c531484def653849436990 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 12 Apr 2025 22:47:52 +0200
Subject: [PATCH 2007/2040] Simplified the running documentation

---
 docs/getting_started_running.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
index dbff196b..c89b3288 100644
--- a/docs/getting_started_running.md
+++ b/docs/getting_started_running.md
@@ -2,9 +2,11 @@
 
 ## Game selection
 
+**Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
+
 ### From the launchers
 
-For simplicity, base game and expansions can be started from one of the 3 launchers:
+Base game and expansions can be started from one of the 3 launchers:
 
 - `launch_openmohaa_base`, this starts OpenMoHAA in **Medal of Honor: Allied Assault** mode which is the base game
 - `launch_openmohaa_spearhead`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Spearhead** mode
@@ -12,24 +14,23 @@ For simplicity, base game and expansions can be started from one of the 3 launch
 
 ### From command-line
 
-**Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
+**Spearhead** and **Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable.
 
-**Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable.
+To change the target game, append the following command-line arguments to the `openmohaa` and `omohaaded` executable:
 
-To play an expansion, append the following command-line arguments to the executable:
+- `+set com_target_game 0` for the default base game (mohaa, uses `main` folder)
+- `+set com_target_game 1` for the Spearhead expansion (mohaas, uses `mainta` folder)
+- `+set com_target_game 2` for the Breakthrough expansion (mohaab, uses `maintt` folder)
 
-- `+set com_target_game 1` for the Spearhead expansion (mohaas/mohta, mainta, a.k.a Team Assault)
-- `+set com_target_game 2` for the Breakthrough expansion (mohaab/mohtt, maintt, a.k.a Team Tactics)
-
-With `com_target_game`, OpenMoHAA will support the network protocol accordingly. The default value of `com_target_game` is 0 for the base game (mohaa, main).
+OpenMoHAA will also use the correct network protocol version accordingly. The default value of `com_target_game` is 0.
 
 On Windows, a shortcut can be created to the `openmohaa` executable, with the command-line argument appended from above to play an expansion.
 
 You can now start a local OpenMOHAA server or play on a server.
 
-### Playing with a demo version
+### Using a demo version
 
-The argument `+set com_target_demo 1` must be appended to command-line to play the game or host a server using demo assets. Allied Assault, Spearhead and Breakthrough demos are supported as long as `com_target_game` is set (see above).
+The argument `+set com_target_demo 1` must be appended to command-line to play the game or host a server using demo assets. Allied Assault, Spearhead and Breakthrough demos are supported.
 
 ## User data location
 

From c9ff9416001f3d383d4adc6b86ad73755ceab712 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Apr 2025 00:31:34 +0200
Subject: [PATCH 2008/2040] Implement Instant Action from Breakthrough (#712)

This adds a feature that makes it easy to join a populated low-ping server (matching criteria from configuration file). This feature has been available since MOHAA Breakthrough 2.30.
---
 code/client/cl_instantAction.cpp | 640 +++++++++++++++++++++++++++++++
 code/client/cl_instantAction.h   | 103 +++++
 2 files changed, 743 insertions(+)
 create mode 100644 code/client/cl_instantAction.cpp
 create mode 100644 code/client/cl_instantAction.h

diff --git a/code/client/cl_instantAction.cpp b/code/client/cl_instantAction.cpp
new file mode 100644
index 00000000..1501121a
--- /dev/null
+++ b/code/client/cl_instantAction.cpp
@@ -0,0 +1,640 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cl_ui.h"
+#include "cl_instantAction.h"
+#include "cl_uiserverlist.h"
+#include "../gamespy/sv_gamespy.h"
+
+Event EV_UIInstantAction_AcceptServer
+(
+    "acceptserver",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Connect to the current server"
+);
+
+Event EV_UIInstantAction_RejectServer
+(
+    "rejectserver",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Reject the current server"
+);
+
+Event EV_UIInstantAction_Cancel
+(
+    "ia_cancel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "cancel the server update"
+);
+
+Event EV_UIInstantAction_Refresh
+(
+    "ia_refresh",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Refresh the server list"
+);
+
+CLASS_DECLARATION(UIWidget, UIInstantAction, NULL) {
+    {&EV_UIInstantAction_AcceptServer, &UIInstantAction::Connect      },
+    {&EV_UIInstantAction_RejectServer, &UIInstantAction::Reject       },
+    {&EV_UIInstantAction_Cancel,       &UIInstantAction::CancelRefresh},
+    {&EV_UIInstantAction_Refresh,      &UIInstantAction::Refresh      },
+    {NULL,                             NULL                           }
+};
+
+struct ServerListInstance {
+    int              iServerType;
+    UIInstantAction *pServerList;
+};
+
+ServerListInstance g_IAServerListInst[2];
+
+UIInstantAction::UIInstantAction()
+{
+    state           = IA_INITIALIZE;
+    numFoundServers = 0;
+    numServers      = 0;
+    minPlayers      = 3;
+    startingMaxPing = 100;
+    endingMaxPing   = 1500;
+    maxServers      = -1;
+    servers         = NULL;
+    doneList[0]     = false;
+    doneList[1]     = false;
+    serverList[0]   = NULL;
+    serverList[1]   = NULL;
+
+    ReadIniFile();
+    EnableServerInfo(false);
+
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("ia_refresh_button", new Event(EV_Widget_Disable));
+}
+
+UIInstantAction::~UIInstantAction()
+{
+    CleanUp();
+}
+
+void UIInstantAction::CleanUp()
+{
+    if (serverList[0]) {
+        ServerListFree(serverList[0]);
+        serverList[0] = NULL;
+    }
+
+    if (serverList[1]) {
+        ServerListFree(serverList[1]);
+        serverList[1] = NULL;
+    }
+
+    if (servers) {
+        delete[] servers;
+        servers = NULL;
+    }
+}
+
+void UIInstantAction::Init()
+{
+    const char *secret_key;
+    const char *game_name;
+
+    static const unsigned int iNumConcurrent = 10;
+
+    numFoundServers = 0;
+    numServers      = 0;
+    doneList[0]     = false;
+    doneList[1]     = false;
+
+    EnableServerInfo(false);
+
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("ia_refresh_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("ia_noserverfound", new Event(EV_Widget_Disable));
+
+    Cvar_Set("ia_search_percentage", va("%d %%", 0));
+
+    if (com_target_game->integer < target_game_e::TG_MOHTT) {
+        g_IAServerListInst[0].iServerType = com_target_game->integer;
+        g_IAServerListInst[0].pServerList = this;
+
+        game_name  = GS_GetGameName(com_target_game->integer);
+        secret_key = GS_GetGameKey(com_target_game->integer);
+
+        serverList[0] = ServerListNew(
+            game_name,
+            game_name,
+            secret_key,
+            iNumConcurrent,
+            (void *)&IAServerListCallBack,
+            1,
+            (void *)&g_IAServerListInst[0]
+        );
+
+        ServerListClear(serverList[0]);
+    } else {
+        g_IAServerListInst[0].iServerType = target_game_e::TG_MOHTT;
+        g_IAServerListInst[0].pServerList = this;
+
+        game_name  = GS_GetGameName(target_game_e::TG_MOHTT);
+        secret_key = GS_GetGameKey(target_game_e::TG_MOHTT);
+
+        serverList[0] = ServerListNew(
+            game_name,
+            game_name,
+            secret_key,
+            iNumConcurrent,
+            (void *)&IAServerListCallBack,
+            1,
+            (void *)&g_IAServerListInst[0]
+        );
+
+        ServerListClear(serverList[0]);
+
+        g_IAServerListInst[1].iServerType = target_game_e::TG_MOHTA;
+        g_IAServerListInst[1].pServerList = this;
+
+        game_name  = GS_GetGameName(target_game_e::TG_MOHTA);
+        secret_key = GS_GetGameKey(target_game_e::TG_MOHTA);
+
+        serverList[1] = ServerListNew(
+            game_name,
+            game_name,
+            secret_key,
+            iNumConcurrent,
+            (void *)&IAServerListCallBack,
+            1,
+            (void *)&g_IAServerListInst[1]
+        );
+
+        ServerListClear(serverList[1]);
+    }
+
+    state           = IA_WAITING;
+    numFoundServers = 0;
+
+    ServerListUpdate(serverList[0], true);
+
+    if (serverList[1]) {
+        ServerListUpdate(serverList[1], true);
+    }
+
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Enable));
+    menuManager.PassEventToWidget("searchstatus", new Event(EV_Widget_Enable));
+    menuManager.PassEventToWidget("searchstatuslable", new Event(EV_Widget_Enable));
+}
+
+int UIInstantAction::GetServerIndex(int maxPing, int gameType)
+{
+    int bestPing   = 1500;
+    int bestServer = -1;
+    int i;
+
+    for (i = 0; i < numFoundServers; i++) {
+        const IAServer_t& IAServer = servers[i];
+
+        char *gameVer;
+        float fGameVer;
+        int   ping;
+        int   numPlayers;
+
+        if (IAServer.rejected) {
+            continue;
+        }
+
+        // Skip servers that don't match the provided game type
+        if (ServerGetIntValue(IAServer.server, "g_gametype_i", 1) != gameType) {
+            continue;
+        }
+
+        // Skip servers with high ping
+        ping = ServerGetPing(IAServer.server);
+        if (ping > maxPing) {
+            continue;
+        }
+
+        gameVer = ServerGetStringValue(IAServer.server, "gamever", "1.00");
+        if (com_target_demo->integer && *gameVer != 'd') {
+            // Skip retail servers on demo game
+            continue;
+        } else if (!com_target_demo->integer && *gameVer == 'd') {
+            // Skip demo servers on retail game
+            continue;
+        }
+
+        // Skip incompatible servers
+        fGameVer = atof(gameVer);
+        if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+            if (IAServer.serverGame.serverType == target_game_e::TG_MOHTT) {
+                if (fabs(fGameVer) < 2.3f) {
+                    continue;
+                }
+            } else {
+                if (fabs(fGameVer) < 2.1f) {
+                    continue;
+                }
+            }
+        } else {
+            if (fabs(fGameVer - com_target_version->value) > 0.1f) {
+                continue;
+            }
+        }
+
+        // Skip servers with a password
+        if (ServerGetIntValue(IAServer.server, "password", 0)) {
+            continue;
+        }
+
+        // Skip servers that don't match the minimum number of players
+        numPlayers = ServerGetIntValue(IAServer.server, "numplayers", 0);
+        if (numPlayers < minPlayers) {
+            continue;
+        }
+
+        // Skip full servers
+        if (numPlayers == ServerGetIntValue(IAServer.server, "maxplayers", 0)) {
+            continue;
+        }
+
+        // Skip servers with an higher ping than the best one
+        if (ping >= bestPing) {
+            continue;
+        }
+
+        //
+        // Found a potential server
+        //
+
+        bestPing   = ping;
+        bestServer = i;
+    }
+
+    return bestServer;
+}
+
+void UIInstantAction::ReadIniFile()
+{
+    char       *buffer;
+    const char *p;
+    const char *pVal;
+    int         intValue;
+    char        value[32];
+
+    if (!FS_ReadFileEx("iaction.ini", (void **)&buffer, qtrue)) {
+        return;
+    }
+
+    for (p = buffer; p; p = strstr(pVal, "\n")) {
+        if (sscanf(p, "%31s", value) != 1) {
+            break;
+        }
+
+        pVal = strstr(p, "=");
+        if (!pVal) {
+            break;
+        }
+
+        pVal++;
+
+        if (sscanf(pVal, "%d", &intValue) != 1) {
+            break;
+        }
+
+        if (!Q_stricmpn(value, "MinPlayers", 10)) {
+            minPlayers = intValue;
+        }
+
+        if (!Q_stricmpn(value, "StartingMaxPing", 15)) {
+            startingMaxPing = intValue;
+        }
+
+        if (!Q_stricmpn(value, "EndingMaxPing", 13)) {
+            endingMaxPing = intValue;
+        }
+
+        if (!Q_stricmpn(value, "MaxServers", 10)) {
+            maxServers = intValue;
+        }
+    }
+}
+
+void UIInstantAction::FindServer()
+{
+    int ping;
+    int i;
+
+    currentServer = -1;
+    state         = IA_NONE;
+
+    for (ping = startingMaxPing; ping < endingMaxPing; ping += 100) {
+        //
+        // Find the best server starting from FFA gametype first
+        //
+        for (i = 1; i < 7; i++) {
+            currentServer = GetServerIndex(ping, i);
+            if (currentServer >= 0) {
+                break;
+            }
+        }
+
+        if (currentServer >= 0) {
+            break;
+        }
+    }
+
+    menuManager.PassEventToWidget("ia_refresh_button", new Event(EV_Widget_Enable));
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("searchstatus", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("searchstatuslable", new Event(EV_Widget_Disable));
+
+    if (currentServer < 0) {
+        EnableServerInfo(false);
+
+        menuManager.PassEventToWidget("ia_noserverfound", new Event(EV_Widget_Enable));
+        return;
+    }
+
+    const IAServer_t& IAServer   = servers[currentServer];
+    const char       *hostname   = ServerGetStringValue(IAServer.server, "hostname", "(NONE)");
+    const char       *gametype   = ServerGetStringValue(IAServer.server, "gametype", "(NONE)");
+    int               numplayers = ServerGetIntValue(IAServer.server, "numplayers", 0);
+    int               maxplayers = ServerGetIntValue(IAServer.server, "maxplayers", 0);
+    ping                         = ServerGetPing(IAServer.server);
+
+    Cvar_Set("ia_servername", va("  %s", hostname));
+    Cvar_Set("ia_ping", va("%d", ping));
+    Cvar_Set("ia_gametype", va("%s", gametype));
+    Cvar_Set("ia_players", va("%d", numplayers));
+    Cvar_Set("ia_maxplayers", va("%d", maxplayers));
+
+    EnableServerInfo(true);
+}
+
+void UIInstantAction::Connect(Event *ev)
+{
+    char *gameVer;
+    float fGameVer;
+    bool  bDiffVersion;
+    char  command[256];
+
+    if (currentServer < 0 || currentServer < numServers) {
+        return;
+    }
+
+    const IAServer_t& IAServer = servers[currentServer];
+
+    gameVer = ServerGetStringValue(IAServer.server, "gamever", "1.00");
+    if (gameVer[0] == 'd') {
+        gameVer++;
+    }
+
+    // Skip incompatible servers
+    fGameVer     = atof(gameVer);
+    bDiffVersion = false;
+    if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+        if (IAServer.serverGame.serverType == target_game_e::TG_MOHTT) {
+            if (fabs(fGameVer) < 2.3f) {
+                bDiffVersion = true;
+            }
+        } else {
+            if (fabs(fGameVer) < 2.1f) {
+                bDiffVersion = true;
+            }
+        }
+    } else {
+        if (fabs(fGameVer - com_target_version->value) > 0.1f) {
+            bDiffVersion = true;
+        }
+    }
+
+    if (bDiffVersion) {
+        if (fGameVer - com_target_version->value > 0) {
+            // Older version
+            UI_SetReturnMenuToCurrent();
+            Cvar_Set("com_errormessage", va("Server is version %s, you are using %s", gameVer, "2.40"));
+            UI_PushMenu("wrongversion");
+        } else {
+            // Server version is newer
+            Cvar_Set("dm_serverstatus", va("Can not connect to v%s server, you are using v%s", gameVer, "2.40"));
+        }
+    }
+
+    UI_SetReturnMenuToCurrent();
+    Cvar_Set("g_servertype", va("%d", servers[currentServer].serverGame.serverType));
+
+    Com_sprintf(
+        command,
+        sizeof(command),
+        "connect %s:%i\n",
+        ServerGetAddress(IAServer.server),
+        ServerGetIntValue(IAServer.server, "hostport", PORT_SERVER)
+    );
+    Cbuf_AddText(command);
+}
+
+void UIInstantAction::Reject(Event *ev)
+{
+    servers[currentServer].rejected = 1;
+    FindServer();
+}
+
+void UIInstantAction::Draw()
+{
+    switch (state) {
+    case IA_INITIALIZE:
+        Init();
+        break;
+    case IA_UPDATE:
+        Update();
+        break;
+    case IA_FINISHED:
+        FindServer();
+        break;
+    default:
+        break;
+    }
+
+    if (serverList[0]) {
+        ServerListThink(serverList[0]);
+    }
+
+    if (serverList[1]) {
+        ServerListThink(serverList[1]);
+    }
+}
+
+void UIInstantAction::Update()
+{
+    numFoundServers = 0;
+
+    // count the total number of servers from both server list
+    numServers = ServerListCount(serverList[0]);
+    if (serverList[1]) {
+        numServers += ServerListCount(serverList[1]);
+    }
+
+    state   = IA_FINISHED;
+    servers = new IAServer_t[numServers];
+
+    ServerListHalt(serverList[0]);
+    if (serverList[1]) {
+        ServerListHalt(serverList[1]);
+    }
+
+    ServerListThink(serverList[0]);
+    if (serverList[1]) {
+        ServerListThink(serverList[1]);
+    }
+
+    state = IA_SEARCHING;
+
+    // Start updating the first list
+    doneList[0] = false;
+    ServerListClear(serverList[0]);
+    ServerListUpdate(serverList[0], true);
+
+    // Update the second optional list
+    if (serverList[1]) {
+        doneList[1] = false;
+        ServerListClear(serverList[1]);
+        ServerListUpdate(serverList[1], true);
+    }
+}
+
+int UIInstantAction::AddServer(GServer server, const ServerGame_t& serverGame)
+{
+    servers[numFoundServers].server     = server;
+    servers[numFoundServers].serverGame = serverGame;
+    servers[numFoundServers].rejected   = false;
+    numFoundServers++;
+
+    return numFoundServers;
+}
+
+void UIInstantAction::CancelRefresh(Event *ev)
+{
+    state = IA_FINISHED;
+    ServerListHalt(serverList[0]);
+    ServerListHalt(serverList[1]);
+}
+
+void UIInstantAction::Refresh(Event *ev)
+{
+    state = IA_INITIALIZE;
+}
+
+void UIInstantAction::EnableServerInfo(bool enable)
+{
+    if (enable) {
+        menuManager.PassEventToWidget("iaservername_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_servername_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_ping_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_ping_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_gametype_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_gametype_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_players_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_players_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_maxplayers_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_maxplayers_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("acceptserver", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("rejectserver", new Event(EV_Widget_Enable));
+    } else {
+        menuManager.PassEventToWidget("iaservername_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_servername_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_ping_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_ping_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_gametype_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_gametype_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_players_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_players_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_maxplayers_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_maxplayers_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("acceptserver", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("rejectserver", new Event(EV_Widget_Disable));
+    }
+}
+
+void UIInstantAction::IAServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2)
+{
+    const ServerListInstance *pInstance   = (const ServerListInstance *)instance;
+    UIInstantAction          *pServerList = pInstance->pServerList;
+
+    if (msg == LIST_PROGRESS) {
+        if (pServerList->state == IA_WAITING) {
+            if (pInstance->iServerType == com_target_game->integer) {
+                pServerList->doneList[0] = true;
+            }
+
+            if (com_target_game->integer >= target_game_e::TG_MOHTT && pInstance->iServerType == target_game_e::TG_MOHTA) {
+                pServerList->doneList[1] = true;
+            }
+
+            if (pServerList->doneList[0] && (!pServerList->serverList[1] || pServerList->doneList[1])) {
+                pServerList->state = IA_UPDATE;
+            }
+        } else if (pServerList->state == IA_SEARCHING) {
+            ServerGame_t serverGame;
+            serverGame.serverType = pInstance->iServerType;
+            const int serverIndex = pServerList->AddServer((GServer)param1, serverGame);
+
+            Cvar_Set("ia_search_percentage", va("%d %%", 100 * serverIndex / pServerList->numServers));
+
+            if (pServerList->maxServers >= 0 && serverIndex >= pServerList->maxServers) {
+                // Reached the maximum number of servers, stop there
+                pServerList->doneList[0] = true;
+                ServerListHalt(pServerList->serverList[0]);
+
+                if (pServerList->serverList[1]) {
+                    pServerList->doneList[1] = true;
+                    ServerListHalt(pServerList->serverList[1]);
+                }
+
+                pServerList->state = IA_FINISHED;
+            }
+        }
+    } else if (msg == LIST_STATECHANGED && ServerListState(serverlist) == GServerListState::sl_idle) {
+        if (pInstance->iServerType == com_target_game->integer) {
+            pServerList->doneList[0] = true;
+        }
+
+        if (com_target_game->integer >= target_game_e::TG_MOHTT && pInstance->iServerType == target_game_e::TG_MOHTA) {
+            pServerList->doneList[1] = true;
+        }
+
+        if (pServerList->doneList[0] && (!pServerList->serverList[1] || pServerList->doneList[1])) {
+            if (pServerList->state == IA_WAITING) {
+                pServerList->state = IA_UPDATE;
+            }
+            if (pServerList->state == IA_SEARCHING) {
+                pServerList->state = IA_FINISHED;
+            }
+        }
+    }
+}
diff --git a/code/client/cl_instantAction.h b/code/client/cl_instantAction.h
new file mode 100644
index 00000000..9a838dc5
--- /dev/null
+++ b/code/client/cl_instantAction.h
@@ -0,0 +1,103 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// Added in 2.30
+//  Instantly find a server matching common criterias
+
+#pragma once
+
+#include "../gamespy/goaceng.h"
+
+typedef struct {
+    int serverType;
+} ServerGame_t;
+
+typedef struct {
+    GServer      server;
+    ServerGame_t serverGame;
+    bool         rejected;
+} IAServer_t;
+
+enum IAState_e {
+    IA_NONE,
+    IA_INITIALIZE,
+    IA_WAITING,
+    IA_UPDATE,
+    IA_SEARCHING,
+    IA_FINISHED
+};
+
+class UIInstantAction : public UIWidget
+{
+public:
+    CLASS_PROTOTYPE(UIInstantAction);
+
+public:
+    UIInstantAction();
+    ~UIInstantAction() override;
+
+    void CleanUp();
+    void Init();
+
+    int  GetServerIndex(int maxPing, int gameType);
+    void ReadIniFile();
+    void FindServer();
+    void Connect(Event *ev);
+    void Reject(Event *ev);
+    void Draw();
+    void Update();
+    int  AddServer(GServer server, const ServerGame_t& serverGame);
+    void CancelRefresh(Event *ev);
+    void Refresh(Event *ev);
+    void EnableServerInfo(bool enable);
+
+private:
+    static void IAServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2);
+
+private:
+    //
+    // List
+    //
+    bool        doneList[2];
+    GServerList serverList[2];
+    int         maxServers;
+
+    //
+    // Current states
+    //
+    IAState_e state;
+    int       numServers;
+    int       numFoundServers;
+
+    //
+    // Filters
+    //
+    int minPlayers;
+    int startingMaxPing;
+    int endingMaxPing;
+
+    //
+    // Servers
+    //
+    IAServer_t *servers;
+    int         currentServer;
+};

From cf8af915164bc9be6f0cee30ba7c1473717fbfa2 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Apr 2025 00:40:48 +0200
Subject: [PATCH 2009/2040] Remove macOS package cache due to permission errors

---
 .github/workflows/shared-build-macos.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/shared-build-macos.yml b/.github/workflows/shared-build-macos.yml
index 9061a137..406ec77b 100644
--- a/.github/workflows/shared-build-macos.yml
+++ b/.github/workflows/shared-build-macos.yml
@@ -43,10 +43,10 @@ jobs:
     ###
     # Packages
     ###
-    - uses: tecolicom/actions-use-homebrew-tools@b9c066b79607fa3d71e0be05d7003bb75fd9ff34
-      name: Install required packages
-      with:
-        tools: git flex bison ninja cmake llvm perl
+
+    - name: Install required packages
+      run: |
+        brew install git flex bison ninja cmake llvm perl
 
     - name: Settings
       working-directory: ${{github.workspace}}

From 2a1e2d7d6cb148f43072deb8f208ca2a7c33cf0b Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 15 Apr 2025 18:37:24 +0200
Subject: [PATCH 2010/2040] Check for valid scoreboard menu

Under rare circumstances, the scoreboard menu can be NULL and would cause a crash. This was fixed in mohaab 2.30
---
 code/client/cl_ui.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 7610bd00..e8cef7f9 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -4372,10 +4372,8 @@ UI_ShowScoreboard_f
 void UI_ShowScoreboard_f(const char *pszMenuName)
 {
     if (pszMenuName) {
-        if (scoreboard_menuname.length()) {
-            if (str::icmp(scoreboard_menuname, pszMenuName)) {
-                scoreboard_menu->ForceHide();
-            }
+        if (scoreboard_menuname.length() && str::icmp(scoreboard_menuname, pszMenuName) && scoreboard_menu) {
+            scoreboard_menu->ForceHide();
         }
 
         scoreboard_menuname = pszMenuName;
@@ -4424,7 +4422,10 @@ void UI_HideScoreboard_f(void)
     }
 
     if (scoreboard_menuname.length()) {
-        scoreboard_menu->ForceHide();
+        // Fixed in 2.30 (scoreboard_menu check)
+        if (scoreboard_menu) {
+            scoreboard_menu->ForceHide();
+        }
     }
 }
 

From 689da52ddf0c1bf748842515b2654eb8ffac779e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Apr 2025 22:55:31 +0200
Subject: [PATCH 2011/2040] Master server address update

This uplinks directly with 333networks instead of using a domain as an alias
---
 code/gamespy/sv_gqueryreporting.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index 2a116609..d433cf74 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -63,4 +63,4 @@ typedef struct qr_implementation_s {
     void               *udata;
 } qr_implementation_t, *qr_t;
 
-#define MASTER_SERVER_HOST "master.openmohaa.org"
+#define MASTER_SERVER_HOST "master.333networks.com"

From db7fdd57e45de3f62f3785ad855d26ec0758cebc Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Thu, 17 Apr 2025 23:26:06 +0200
Subject: [PATCH 2012/2040] Add a section about other systems

---
 docs/getting_started_installation.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
index f84c5f5c..d1edfa69 100644
--- a/docs/getting_started_installation.md
+++ b/docs/getting_started_installation.md
@@ -116,3 +116,13 @@ Alternatively, free demo versions are available online. Here are the links to th
 
 1. Can play on MOH:AA 1.00 servers only.
 2. Only compatible with demo servers. These servers can be identified by having the letter `d` at the start of their version number (e.g: `(d2.11)`).
+
+---
+
+## Ports and other systems
+
+OpenMoHAA is officially supported on Windows, Linux and macOS. Below is a list of unofficial open-source ports that required custom modifications to the OpenMoHAA source code to build and run:
+
+- https://github.com/Rinnegatamante/openmohaa
+
+To stay up to date with the latest features and fixes from the official repository, these ports depend on their respective maintainers to synchronize changes with the main OpenMoHAA codebase.

From 9b003b5428f2a2776c70b81886389d481dccd485 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Apr 2025 18:11:18 +0200
Subject: [PATCH 2013/2040] Update OpenAL to version 1.24.3

---
 .github/workflows/shared-build-linux.yml   | 2 +-
 .github/workflows/shared-build-macos.yml   | 2 +-
 .github/workflows/shared-build-windows.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/shared-build-linux.yml b/.github/workflows/shared-build-linux.yml
index 726ec8d5..9bbf28c3 100644
--- a/.github/workflows/shared-build-linux.yml
+++ b/.github/workflows/shared-build-linux.yml
@@ -40,7 +40,7 @@ jobs:
     env:
         wolfssl-version: 'v5.7.6-stable'
         curl-version: '8_12_1'
-        openal-soft-branch: '1.24.2'
+        openal-soft-branch: '1.24.3'
 
     steps:
     ###
diff --git a/.github/workflows/shared-build-macos.yml b/.github/workflows/shared-build-macos.yml
index 406ec77b..d4ba04c1 100644
--- a/.github/workflows/shared-build-macos.yml
+++ b/.github/workflows/shared-build-macos.yml
@@ -35,7 +35,7 @@ jobs:
     name: "Building for platform macos-${{matrix.architecture.name}}"
     runs-on: "macos-15"
     env:
-        openal-soft-branch: '1.24.2'
+        openal-soft-branch: '1.24.3'
         wolfssl-version: 'v5.7.6-stable'
         curl-version: '8_12_1'
 
diff --git a/.github/workflows/shared-build-windows.yml b/.github/workflows/shared-build-windows.yml
index c807b591..d69d04f4 100644
--- a/.github/workflows/shared-build-windows.yml
+++ b/.github/workflows/shared-build-windows.yml
@@ -35,7 +35,7 @@ jobs:
         flexbison-branch: 'v2.5.25'
         wolfssl-version: 'v5.7.6-stable'
         curl-version: '8_12_1'
-        openal-soft-branch: '1.24.2'
+        openal-soft-branch: '1.24.3'
 
     steps:
     ###

From 1758a0cd2e091a7d9e512718256e66a6da22e494 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Apr 2025 18:40:31 +0200
Subject: [PATCH 2014/2040] Move whitelisted server commands to a dedicated
 source file

---
 code/cgame/cg_servercmds.c        | 261 +-------------------------
 code/cgame/cg_servercmds_filter.c | 292 ++++++++++++++++++++++++++++++
 code/cgame/cg_servercmds_filter.h |  30 +++
 3 files changed, 323 insertions(+), 260 deletions(-)
 create mode 100644 code/cgame/cg_servercmds_filter.c
 create mode 100644 code/cgame/cg_servercmds_filter.h

diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index f946fc61..bc9f100a 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 #include "../fgame/bg_voteoptions.h"
-
-static qboolean CG_IsStatementFiltered(char *cmd);
+#include "cg_servercmds_filter.h"
 
 /*
 ================
@@ -458,261 +457,3 @@ void CG_ExecuteNewServerCommands(int latestSequence, qboolean differentServer)
         }
     }
 }
-
-//
-// List of client variables allowed to be changed by the server
-//
-static const char *whiteListedVariables[] = {
-    "r_fastsky", // some mods set this variable to make the sky uniform
-    "ui_hud",
-    "subtitle0",
-    "subtitle1",
-    "subtitle2",
-    "subtitle3",
-    "name",
-    "cg_3rd_person", // for 3rd person server
-    "cg_cameraverticaldisplacement" // for 3rd person server
-};
-
-//
-// List of client variables allowed to be changed by the server
-//
-static const char *whiteListedLocalServerVariables[] = {"ui_hidemouse", "ui_showmouse", "cg_marks_add"};
-
-//
-// List of commands allowed to be executed by the server
-//
-static const char *whiteListedCommands[] = {
-    //
-    // HUD
-    //==========
-    "pushmenu",
-    "pushmenu_teamselect",
-    "pushmenu_weaponselect",
-    "popmenu",
-    "globalwidgetcommand", // used for mods adding custom HUDs
-    "ui_addhud",
-    "ui_removehud",
-    "echo", // to print stuff client-side
-
-    //
-    // Sounds
-    //==========
-    "tmstart",
-    "tmstartloop",
-    "tmstop",
-    "tmvolume",
-    "play",
-    "playmp3",
-    "stopmp3",
-
-    //
-    // Misc
-    //==========
-    "primarydmweapon",
-    "wait",
-    "+moveup", // workaround for mods that want to prevent inactivity when handling the spectate
-    "-moveup",
-    "screenshot",
-    "screenshotJPEG",
-    "levelshot",
-    "`stufftext" // Stufftext detection from Reborn, the player gets kicked without it
-};
-
-//
-// List of commands allowed to be executed by the server
-//
-static const char *whiteListedLocalServerCommands[] = {
-    "spmap", // Used by briefings
-    "map",
-    "disconnect",
-    "cinematic",
-    "showmenu",
-    "hidemenu"
-};
-
-/*
-====================
-CG_IsVariableFiltered
-
-Returns whether or not the variable should be filtered
-====================
-*/
-static qboolean CG_IsVariableFiltered(const char *name)
-{
-    cvar_t *var;
-    size_t i;
-
-    for (i = 0; i < ARRAY_LEN(whiteListedVariables); i++) {
-        if (!Q_stricmp(name, whiteListedVariables[i])) {
-            return qfalse;
-        }
-    }
-
-    if (cgs.localServer) {
-        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerVariables); i++) {
-            if (!Q_stricmp(name, whiteListedLocalServerVariables[i])) {
-                return qfalse;
-            }
-        }
-    }
-
-    // Filtered
-    return qtrue;
-}
-
-/*
-====================
-CG_IsSetVariableFiltered
-
-Returns whether or not the variable should be filtered
-====================
-*/
-static qboolean CG_IsSetVariableFiltered(const char *name, char type)
-{
-    cvar_t *var;
-
-    if (!CG_IsVariableFiltered(name)) {
-        return qfalse;
-    }
-
-    if (type != 'u' && type != 's') {
-        // Don't allow custom info variables to avoid flooding
-        // the client with many serverinfo and userinfo variables
-
-        var = cgi.Cvar_Find(name);
-        if (!var) {
-            // Allow as it doesn't exist
-            return qfalse;
-        }
-
-        if (var->flags & CVAR_USER_CREATED) {
-            // Allow, it's user-created, wouldn't cause issues
-            return qfalse;
-        }
-    }
-
-    // Filtered
-    return qtrue;
-}
-
-/*
-====================
-CG_IsCommandFiltered
-
-Returns whether or not the variable should be filtered
-====================
-*/
-static qboolean CG_IsCommandFiltered(const char *name)
-{
-    size_t i;
-
-    for (i = 0; i < ARRAY_LEN(whiteListedCommands); i++) {
-        if (!Q_stricmp(name, whiteListedCommands[i])) {
-            return qfalse;
-        }
-    }
-
-    if (cgs.localServer) {
-        // Allow more commands when the client is hosting the server
-        // Mostly used on single-player mode, like when briefings switch to the next map
-        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerCommands); i++) {
-            if (!Q_stricmp(name, whiteListedLocalServerCommands[i])) {
-                return qfalse;
-            }
-        }
-    }
-
-    //
-    // Test variables
-    //
-    return CG_IsVariableFiltered(name);
-}
-
-/*
-====================
-RemoveEndToken
-====================
-*/
-static qboolean RemoveEndToken(char* com_token) {
-    char* p;
-
-    for (p = com_token; p[0]; p++) {
-        if (*p == ';') {
-            *p = 0;
-            return qtrue;
-        }
-    }
-
-    return qfalse;
-}
-
-/*
-====================
-CG_IsStatementFiltered
-
-Returns whether or not the statement is filtered
-====================
-*/
-static qboolean CG_IsStatementFiltered(char *cmd)
-{
-    char* parsed;
-    char* p;
-    char com_token[256];
-    qboolean bNextStatement = qfalse;
-
-    parsed = cmd;
-
-    for (Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token)); com_token[0]; Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token))) {
-        bNextStatement = RemoveEndToken(com_token);
-
-        if (com_token[0] == ';') {
-            continue;
-        }
-
-        if (!Q_stricmp(com_token, "set") || !Q_stricmp(com_token, "setu") || !Q_stricmp(com_token, "seta")
-            || !Q_stricmp(com_token, "sets") || !Q_stricmp(com_token, "append")) {
-            char type;
-            
-            if (Q_stricmp(com_token, "append")) {
-                type = com_token[3];
-            } else {
-                type = 0;
-            }
-
-            //
-            // variable
-            //
-            Q_strncpyz(com_token, COM_ParseExt(&parsed, qfalse), sizeof(com_token));
-            bNextStatement |= RemoveEndToken(com_token);
-            if (com_token[0] == ';') {
-                continue;
-            }
-
-            if (CG_IsSetVariableFiltered(com_token, type)) {
-                return qtrue;
-            }
-        } else {
-            //
-            // normal command
-            //
-            if (CG_IsCommandFiltered(com_token)) {
-                return qtrue;
-            }
-        }
-
-        if (!bNextStatement) {
-            // Skip up to the next statement
-            while (parsed && parsed[0]) {
-                char c = parsed[0];
-
-                parsed++;
-                if (c == '\n' || c == ';') {
-                    break;
-                }
-            }
-        }
-    }
-
-    return qfalse;
-}
\ No newline at end of file
diff --git a/code/cgame/cg_servercmds_filter.c b/code/cgame/cg_servercmds_filter.c
new file mode 100644
index 00000000..9e2170f7
--- /dev/null
+++ b/code/cgame/cg_servercmds_filter.c
@@ -0,0 +1,292 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// cg_servercmds_filter.c -- filtered server commands
+
+#include "cg_local.h"
+#include "cg_servercmds_filter.h"
+
+//
+// List of variables allowed to be changed by the server
+//
+static const char *whiteListedVariables[] = {
+    // some mods set this variable to make the sky uniform
+    "r_fastsky",
+
+    "ui_hud",
+    "subtitle0",
+    "subtitle1",
+    "subtitle2",
+    "subtitle3",
+    "name",
+
+    // for 3rd person server
+    "cg_3rd_person",
+    "cg_cameraverticaldisplacement"
+};
+
+//
+// List of variables allowed to be changed by the server
+//
+static const char *whiteListedLocalServerVariables[] = {"ui_hidemouse", "ui_showmouse", "cg_marks_add"};
+
+//
+// List of commands allowed to be executed by the server
+//
+static const char *whiteListedCommands[] = {
+    //
+    // HUD
+    //==========
+    "pushmenu",
+    "pushmenu_teamselect",
+    "pushmenu_weaponselect",
+    "popmenu",
+    "globalwidgetcommand", // used for mods adding custom HUDs
+    "ui_addhud",
+    "ui_removehud",
+    "echo", // to print stuff client-side
+
+    //
+    // Sounds
+    //==========
+    "tmstart",
+    "tmstartloop",
+    "tmstop",
+    "tmvolume",
+    "play",
+    "playmp3",
+    "stopmp3",
+
+    //
+    // Misc
+    //==========
+    "primarydmweapon",
+    "wait",
+    "+moveup", // workaround for mods that want to prevent inactivity when handling the spectate
+    "-moveup",
+    "screenshot",
+    "screenshotJPEG",
+    "levelshot",
+    "`stufftext" // Stufftext detection from Reborn, the player gets kicked without it
+};
+
+//
+// List of commands allowed to be executed locally
+// (when the client also runs the server)
+//
+static const char *whiteListedLocalServerCommands[] = {
+    // Used by briefings
+    "spmap",
+    "map",
+    "disconnect",
+
+    "cinematic",
+    "showmenu",
+    "hidemenu"
+};
+
+
+/*
+====================
+CG_IsVariableFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsVariableFiltered(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_LEN(whiteListedVariables); i++) {
+        if (!Q_stricmp(name, whiteListedVariables[i])) {
+            return qfalse;
+        }
+    }
+
+    if (cgs.localServer) {
+        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerVariables); i++) {
+            if (!Q_stricmp(name, whiteListedLocalServerVariables[i])) {
+                return qfalse;
+            }
+        }
+    }
+
+    // Filtered
+    return qtrue;
+}
+
+/*
+====================
+CG_IsSetVariableFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsSetVariableFiltered(const char *name, char type)
+{
+    cvar_t *var;
+
+    if (!CG_IsVariableFiltered(name)) {
+        return qfalse;
+    }
+
+    if (type != 'u' && type != 's') {
+        // Don't allow custom info variables to avoid flooding
+        // the client with many serverinfo and userinfo variables
+
+        var = cgi.Cvar_Find(name);
+        if (!var) {
+            // Allow as it doesn't exist
+            return qfalse;
+        }
+
+        if (var->flags & CVAR_USER_CREATED) {
+            // Allow, it's user-created, wouldn't cause issues
+            return qfalse;
+        }
+    }
+
+    // Filtered
+    return qtrue;
+}
+
+/*
+====================
+CG_IsCommandFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsCommandFiltered(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_LEN(whiteListedCommands); i++) {
+        if (!Q_stricmp(name, whiteListedCommands[i])) {
+            return qfalse;
+        }
+    }
+
+    if (cgs.localServer) {
+        // Allow more commands when the client is hosting the server
+        // Mostly used on single-player mode, like when briefings switch to the next map
+        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerCommands); i++) {
+            if (!Q_stricmp(name, whiteListedLocalServerCommands[i])) {
+                return qfalse;
+            }
+        }
+    }
+
+    //
+    // Test variables
+    //
+    return CG_IsVariableFiltered(name);
+}
+
+/*
+====================
+RemoveEndToken
+====================
+*/
+static qboolean RemoveEndToken(char* com_token) {
+    char* p;
+
+    for (p = com_token; p[0]; p++) {
+        if (*p == ';') {
+            *p = 0;
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+====================
+CG_IsStatementFiltered
+
+Returns whether or not the statement is filtered
+====================
+*/
+qboolean CG_IsStatementFiltered(char *cmd)
+{
+    char* parsed;
+    char com_token[256];
+    qboolean bNextStatement = qfalse;
+
+    parsed = cmd;
+
+    for (Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token)); com_token[0]; Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token))) {
+        bNextStatement = RemoveEndToken(com_token);
+
+        if (com_token[0] == ';') {
+            continue;
+        }
+
+        if (!Q_stricmp(com_token, "set") || !Q_stricmp(com_token, "setu") || !Q_stricmp(com_token, "seta")
+            || !Q_stricmp(com_token, "sets") || !Q_stricmp(com_token, "append")) {
+            char type;
+            
+            if (Q_stricmp(com_token, "append")) {
+                type = com_token[3];
+            } else {
+                type = 0;
+            }
+
+            //
+            // variable
+            //
+            Q_strncpyz(com_token, COM_ParseExt(&parsed, qfalse), sizeof(com_token));
+            bNextStatement |= RemoveEndToken(com_token);
+            if (com_token[0] == ';') {
+                continue;
+            }
+
+            if (CG_IsSetVariableFiltered(com_token, type)) {
+                return qtrue;
+            }
+        } else {
+            //
+            // normal command
+            //
+            if (CG_IsCommandFiltered(com_token)) {
+                return qtrue;
+            }
+        }
+
+        if (!bNextStatement) {
+            // Skip up to the next statement
+            while (parsed && parsed[0]) {
+                char c = parsed[0];
+
+                parsed++;
+                if (c == '\n' || c == ';') {
+                    break;
+                }
+            }
+        }
+    }
+
+    return qfalse;
+}
+
diff --git a/code/cgame/cg_servercmds_filter.h b/code/cgame/cg_servercmds_filter.h
new file mode 100644
index 00000000..f8351028
--- /dev/null
+++ b/code/cgame/cg_servercmds_filter.h
@@ -0,0 +1,30 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// cg_servercmds_filter.h -- filtered server commands
+
+#pragma once
+
+#include "cg_local.h"
+
+qboolean CG_IsStatementFiltered(char *cmd);
\ No newline at end of file

From 7f662a93df1d903c1d43e98c764e4be743899424 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Apr 2025 18:49:30 +0200
Subject: [PATCH 2015/2040] Update features.md

---
 docs/features.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/features.md b/docs/features.md
index bafa02a4..f260aa41 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -28,7 +28,14 @@ Overall, better compatibility on modern systems and bugfixes.
 - Customizable FOV
 - OpenAL and SDL are used
 - Smoother animations
-- Stufftext protection: commands that the server want clients to execute are now filtered
+
+#### Stufftext restriction
+
+Servers can no longer make players run any command. Only a small number of safe commands are now allowed. This change helps prevent abuse, like unbinding player controls, and improves overall security.
+
+To improve safety and the overall experience for everyone, `stufftext` is now limited to trusted, commonly used commands, like those for controlling in-game music.
+
+The full list can be found in [cgame/cg_servercmds_filter.c](../code/cgame/cg_servercmds_filter.c).
 
 ### Server-side
 

From 6d20a438dbcca5ea5d5fdc8236c0462d3379a289 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Fri, 18 Apr 2025 21:28:12 +0200
Subject: [PATCH 2016/2040] Shorter paragraph

---
 docs/features.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/features.md b/docs/features.md
index f260aa41..2ebf8105 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -33,9 +33,7 @@ Overall, better compatibility on modern systems and bugfixes.
 
 Servers can no longer make players run any command. Only a small number of safe commands are now allowed. This change helps prevent abuse, like unbinding player controls, and improves overall security.
 
-To improve safety and the overall experience for everyone, `stufftext` is now limited to trusted, commonly used commands, like those for controlling in-game music.
-
-The full list can be found in [cgame/cg_servercmds_filter.c](../code/cgame/cg_servercmds_filter.c).
+`stufftext` is now limited to trusted, commonly used commands, like those for controlling in-game music. The full list can be found in [cgame/cg_servercmds_filter.c](../code/cgame/cg_servercmds_filter.c).
 
 ### Server-side
 

From 5ce7f4faa5ec6cf8165ccd70f660641ecef42621 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Apr 2025 13:49:11 +0200
Subject: [PATCH 2017/2040] Compile Windows ARM64 builds using Windows-11 ARM

This allows to distribute the load across completely different hosts and also to make sure it compiles on ARM platforms
---
 .github/workflows/shared-build-windows.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/shared-build-windows.yml b/.github/workflows/shared-build-windows.yml
index d69d04f4..6aa11ad6 100644
--- a/.github/workflows/shared-build-windows.yml
+++ b/.github/workflows/shared-build-windows.yml
@@ -23,13 +23,13 @@ jobs:
     strategy:
       matrix:
         architecture: [
-          {name: 'x64',   config: 'x64',    toolset: 'x64',        arch_option: 'VC-WIN64A'},
-          {name: 'x86',   config: 'Win32',  toolset: 'x64_x86',    arch_option: 'VC-WIN32' },
-          {name: 'arm64', config: 'ARM64',  toolset: 'x64_arm64',  arch_option: 'VC-WIN64-ARM' }
+          {name: 'x64',   os: 'windows-2025',   config: 'x64',    toolset: 'x64',        arch_option: 'VC-WIN64A'    },
+          {name: 'x86',   os: 'windows-2025',   config: 'Win32',  toolset: 'x64_x86',    arch_option: 'VC-WIN32'     },
+          {name: 'arm64', os: 'windows-11-arm', config: 'ARM64',  toolset: 'x64_arm64',  arch_option: 'VC-WIN64-ARM' }
         ]
 
     name: "Building for platform windows-${{matrix.architecture.name}}"
-    runs-on: "windows-2025"
+    runs-on: ${{ matrix.architecture.os }}
     environment: ${{ inputs.environment }}
     env:
         flexbison-branch: 'v2.5.25'
@@ -86,7 +86,11 @@ jobs:
       if: steps.cache-required-packages.outputs.cache-hit != 'true'
       run: |
         $DownloadPath="$($env:USERPROFILE)\Downloads"
-        Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        if ("${{ matrix.architecture.config }}" -ieq "ARM64") {
+          Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-winarm64.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        } else {
+          Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        }
         Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "C:\Packages\ninja"
         Invoke-WebRequest "https://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
         Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "C:\Packages\jom"

From aa54e3c673e402444cc054110179c28a1d0601ff Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Apr 2025 21:11:51 +0200
Subject: [PATCH 2018/2040] Use an epsilon value to check if float numbers are
 equal (#713)

---
 code/script/scriptvariable.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index 99beb73b..943f2832 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -2001,13 +2001,13 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
         return m_data.intValue == value.m_data.intValue;
 
     case VARIABLE_INTEGER + VARIABLE_FLOAT *VARIABLE_MAX: // ( int ) == ( float )
-        return m_data.intValue == value.m_data.floatValue;
+        return fabs(m_data.intValue - value.m_data.floatValue) < 0.0001f;
 
     case VARIABLE_FLOAT + VARIABLE_FLOAT *VARIABLE_MAX: // ( float ) == ( float )
-        return m_data.floatValue == value.m_data.floatValue;
+        return fabs(m_data.floatValue - value.m_data.floatValue) < 0.0001f;
 
     case VARIABLE_FLOAT + VARIABLE_INTEGER *VARIABLE_MAX: // ( float ) == ( int )
-        return m_data.floatValue == value.m_data.intValue;
+        return fabs(m_data.floatValue - value.m_data.intValue) < 0.0001f;
 
     case VARIABLE_CONSTSTRING
         + VARIABLE_CONSTSTRING *VARIABLE_MAX: // ( const string )		==		( const string )
@@ -2059,7 +2059,7 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
         return m_data.charValue == value.m_data.charValue;
 
     case VARIABLE_VECTOR + VARIABLE_VECTOR *VARIABLE_MAX: // ( vector ) == ( vector )
-        return VectorCompare(m_data.vectorValue, value.m_data.vectorValue) ? true : false;
+        return VectorCompareEpsilon(m_data.vectorValue, value.m_data.vectorValue, 0.0001f) ? true : false;
     }
 }
 

From 42326ec7084abdd1d41f34e53e3137ad2e6eabe7 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Apr 2025 21:35:53 +0200
Subject: [PATCH 2019/2040] Fix timestamps printed twice on the same line
 (#714)

---
 code/qcommon/common.c | 84 ++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 03ae938c..dd60651f 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -304,54 +304,56 @@ void QDECL Com_Printf( const char *fmt, ... ) {
             //================
 			size_t msgLen = strlen(msg);
 
-			if (com_logfile_timestamps->integer) {
-				static qboolean no_newline = qfalse;
+            if (msgLen > 0) {
+                if (com_logfile_timestamps->integer) {
+                    static qboolean no_newline = qfalse;
 
-				if (!no_newline) {
-					time_t t;
-					time_t t_gmt;
-					struct tm tms_local;
-					struct tm tms_gm;
-					double tz;
-					const char* tzStr;
-					char buffer[26];
+                    if (!no_newline) {
+                        time_t t;
+                        time_t t_gmt;
+                        struct tm tms_local;
+                        struct tm tms_gm;
+                        double tz;
+                        const char* tzStr;
+                        char buffer[26];
 
-					t = time(NULL);
-#ifdef WIN32
-					localtime_s(&tms_local, &t);
-					gmtime_s(&tms_gm, &t);
-#else
-                    localtime_r(&t, &tms_local);
-                    gmtime_r(&t, &tms_gm);
-#endif
-					t_gmt = mktime(&tms_gm);
-					tz = difftime(t, t_gmt) / 60.0 / 60.0;
+                        t = time(NULL);
+    #ifdef WIN32
+                        localtime_s(&tms_local, &t);
+                        gmtime_s(&tms_gm, &t);
+    #else
+                        localtime_r(&t, &tms_local);
+                        gmtime_r(&t, &tms_gm);
+    #endif
+                        t_gmt = mktime(&tms_gm);
+                        tz = difftime(t, t_gmt) / 60.0 / 60.0;
 
-					strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", &tms_local);
-					FS_Write("[", 1, logfile);
-					FS_Write(buffer, strlen(buffer), logfile);
-					FS_Write(" ", 1, logfile);
+                        strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", &tms_local);
+                        FS_Write("[", 1, logfile);
+                        FS_Write(buffer, strlen(buffer), logfile);
+                        FS_Write(" ", 1, logfile);
 
-					if (tz >= 0) {
-						tzStr = va("UTC+%.03f", tz);
-					} else {
-						tzStr = va("UTC%.03f", tz);
-					}
+                        if (tz >= 0) {
+                            tzStr = va("UTC+%.03f", tz);
+                        } else {
+                            tzStr = va("UTC%.03f", tz);
+                        }
 
-					FS_Write(tzStr, strlen(tzStr), logfile);
-					FS_Write("] ", 2, logfile);
-				}
+                        FS_Write(tzStr, strlen(tzStr), logfile);
+                        FS_Write("] ", 2, logfile);
+                    }
 
-				if (msgLen > 1 && msg[msgLen - 1] != '\n') {
-					// Don't write the time if the previous message has no newline
-					no_newline = qtrue;
-				} else {
-					no_newline = qfalse;
-				}
-			}
-            //================
+                    if (msg[msgLen - 1] != '\n') {
+                        // Don't write the time if the previous message has no newline
+                        no_newline = qtrue;
+                    } else {
+                        no_newline = qfalse;
+                    }
+                }
+                //================
 
-			FS_Write(msg, msgLen, logfile);
+                FS_Write(msg, msgLen, logfile);
+            }
 		}
     }
 

From 5530d3051b00b037cad8519b64faf3b6315eb9f5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 19 Apr 2025 21:36:58 +0200
Subject: [PATCH 2020/2040] Fix missing spaces between product information in
 the logfile

---
 code/qcommon/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index dd60651f..4eb6322e 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -279,7 +279,7 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 			if(logfile)
 			{
 				Com_Printf( "logfile opened on %s\n", asctime( newtime ) );
-				Com_Printf( "=> game is version %s\n", PRODUCT_NAME PRODUCT_VERSION_FULL PLATFORM_STRING PRODUCT_VERSION_DATE );
+				Com_Printf( "=> game is version %s\n", PRODUCT_NAME " " PRODUCT_VERSION_FULL " " PLATFORM_STRING " " PRODUCT_VERSION_DATE );
                 Com_Printf( "=> targeting game ID %d\n", Cvar_VariableIntegerValue( "com_target_game" ) );
 
 				if ( com_logfile->integer > 1 )

From 64f62583ce7027666e76ed3554536a6035747e03 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 20 Apr 2025 21:41:38 +0200
Subject: [PATCH 2021/2040] Set a more explicit version number

Makes it easier to identify the currently running OPM version from the server list, useful for troubleshooting and checking if the server is up to date
---
 code/gamespy/sv_gamespy.c | 13 +++++++------
 code/qcommon/common.c     |  8 ++++----
 code/qcommon/msg.cpp      |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index a3353110..0833bf98 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_shared.h"
 #include "../server/server.h"
+#include "../qcommon/q_version.h"
 #include "sv_gqueryreporting.h"
 #include "sv_gamespy.h"
 
@@ -64,16 +65,16 @@ static const char *GS_GAME_NAME_DEMO[] =
 
 static const char *GS_GAME_VERSION[] =
 {
-    TARGET_GAME_VERSION_MOH,
-    TARGET_GAME_VERSION_MOHTA,
-    TARGET_GAME_VERSION_MOHTT,
+    TARGET_GAME_VERSION_MOH "+" PRODUCT_VERSION,
+    TARGET_GAME_VERSION_MOHTA "+" PRODUCT_VERSION,
+    TARGET_GAME_VERSION_MOHTT "+" PRODUCT_VERSION,
 };
 
 static const char* GS_GAME_VERSION_DEMO[] =
 {
-    TARGET_GAME_VERSION_MOH,
-    "d" TARGET_GAME_VERSION_MOHTA,
-    "d" TARGET_GAME_VERSION_MOHTT_DEMO,
+    TARGET_GAME_VERSION_MOH "+" PRODUCT_VERSION,
+    "d" TARGET_GAME_VERSION_MOHTA "+" PRODUCT_VERSION,
+    "d" TARGET_GAME_VERSION_MOHTT_DEMO "+" PRODUCT_VERSION,
 };
 
 static const unsigned int GAMESPY_DEFAULT_PORT = 12300;
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 4eb6322e..044855c8 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -3128,7 +3128,7 @@ void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 			Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH_DEMO));
         }
 		protocol_version_demo = protocol_version_full = PROTOCOL_MOH;
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOH);
+		Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOH, PRODUCT_VERSION));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOH);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOH);
 		// "main" is already used as first argument of FS_Startup
@@ -3145,7 +3145,7 @@ void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 		}
 		protocol_version_demo = PROTOCOL_MOHTA_DEMO;
 		protocol_version_full = PROTOCOL_MOHTA;
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTA);
+		Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTA, PRODUCT_VERSION));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTA);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTA);
 		if (!bIsDemo) {
@@ -3162,12 +3162,12 @@ void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
             Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
             Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA_DEMO));
-            Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT);
+            Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTT, PRODUCT_VERSION));
 		} else {
 			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA_DEMO));
             Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA_DEMO));
             Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA));
-            Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT_DEMO);
+            Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTT_DEMO, PRODUCT_VERSION));
         }
         protocol_version_demo = PROTOCOL_MOHTA_DEMO;
         protocol_version_full = PROTOCOL_MOHTA;
diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 4d1ee4bc..a83621da 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -292,7 +292,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		if (bits&7) {
 			int nbits;
 			nbits = bits&7;
-			if ( msg->bit + nbits > msg->maxsize << 3 ) {
+			if ( msg->bit + nbits >= msg->maxsize << 3 ) {
 				msg->overflowed = qtrue;
 				return;
 			}
@@ -307,7 +307,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 				Huff_offsetTransmit( &msgHuff.compressor, (value & 0xff), msg->data, &msg->bit, msg->maxsize << 3 );
 				value = (value>>8);
 
-				if ( msg->bit > msg->maxsize << 3 ) {
+				if ( msg->bit >= msg->maxsize << 3 ) {
 					msg->overflowed = qtrue;
 					return;
 				}

From 93335978ea4ba1aff151f929f80562c14cfa01b1 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Apr 2025 20:40:41 +0200
Subject: [PATCH 2022/2040] Code formatting

---
 code/client/cl_uiserverlist.cpp | 548 +++++++++++++++++---------------
 1 file changed, 285 insertions(+), 263 deletions(-)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index a202a3ca..8cd995a3 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -25,7 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../gamespy/sv_gamespy.h"
 #include "../gamespy/common/gsPlatformSocket.h"
 
-Event EV_FAKKServerList_Connect(
+Event EV_FAKKServerList_Connect
+(
     "connect",
     EV_DEFAULT,
     NULL,
@@ -33,7 +34,8 @@ Event EV_FAKKServerList_Connect(
     "Connect to the specified server"
 );
 
-Event EV_FAKKServerList_RefreshServerList(
+Event EV_FAKKServerList_RefreshServerList
+(
     "refreshserverlist",
     EV_DEFAULT,
     NULL,
@@ -41,7 +43,8 @@ Event EV_FAKKServerList_RefreshServerList(
     "Refresh the serverlist"
 );
 
-Event EV_FAKKServerList_RefreshLANServerList(
+Event EV_FAKKServerList_RefreshLANServerList
+(
     "refreshlanserverlist",
     EV_DEFAULT,
     NULL,
@@ -49,7 +52,8 @@ Event EV_FAKKServerList_RefreshLANServerList(
     "Refresh the LAN serverlist"
 );
 
-Event EV_FAKKServerList_CancelRefresh(
+Event EV_FAKKServerList_CancelRefresh
+(
     "cancelrefresh",
     EV_DEFAULT,
     NULL,
@@ -57,7 +61,8 @@ Event EV_FAKKServerList_CancelRefresh(
     "Cancel serverlist Refresh"
 );
 
-Event EV_FAKKServerList_LANListing(
+Event EV_FAKKServerList_LANListing
+(
     "lanlisting",
     EV_DEFAULT,
     NULL,
@@ -65,7 +70,8 @@ Event EV_FAKKServerList_LANListing(
     "Makes this server list to LAN stuff when there's a choice between Internet & LAN servers"
 );
 
-Event EV_FAKKServerList_UpdateServer(
+Event EV_FAKKServerList_UpdateServer
+(
     "updateserver",
     EV_DEFAULT,
     NULL,
@@ -74,73 +80,78 @@ Event EV_FAKKServerList_UpdateServer(
 );
 
 struct ServerListInstance {
-    int iServerType;
-    UIFAKKServerList* serverList;
+    int               iServerType;
+    UIFAKKServerList *serverList;
 };
 
-class FAKKServerListItem : public UIListCtrlItem {
-    UIFAKKServerList* m_parent; // Added in OPM
-    str m_strings[6];
-    str m_sVersion;
-    bool m_bDifferentVersion;
-    bool m_bFavorite;
-    bool m_bQueryDone;
-    bool m_bQueryFailed;
-    int m_iNumPlayers;
+class FAKKServerListItem : public UIListCtrlItem
+{
+    UIFAKKServerList *m_parent; // Added in OPM
+    str               m_strings[6];
+    str               m_sVersion;
+    bool              m_bDifferentVersion;
+    bool              m_bFavorite;
+    bool              m_bQueryDone;
+    bool              m_bQueryFailed;
+    int               m_iNumPlayers;
 
 public:
-    str m_sIP;
+    str          m_sIP;
     unsigned int m_uiRealIP;
-    int m_iPort;
-    int m_iGameSpyPort;
+    int          m_iPort;
+    int          m_iGameSpyPort;
 
 public:
-    FAKKServerListItem(UIFAKKServerList* parent, str string1, str string2, str string3, str string4, str string5, str string6, str ver);
+    FAKKServerListItem(
+        UIFAKKServerList *parent, str string1, str string2, str string3, str string4, str string5, str string6, str ver
+    );
 
     griditemtype_t getListItemType(int index) const override;
-    int getListItemValue(int i) const override;
-    str getListItemString(int i) const override;
-    void setListItemString(int i, str sNewString);
-    void DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont* pFont) override;
-    qboolean IsHeaderEntry() const override;
-    bool IsQueried() const;
-    void SetQueried(bool bIsQueried);
-    bool IfQueryFailed() const;
-    void SetQueryFailed(bool bFailed);
-    void SetNumPlayers(int iNum);
-    bool IsFavorite() const;
-    void SetFavorite(bool bIsFavorite);
-    str GetListItemVersion() const;
-    void SetListItemVersion(str sNewVer);
-    void SetDifferentVersion(bool bIsDifferentVersion);
-    bool IsDifferentVersion() const;
+    int            getListItemValue(int i) const override;
+    str            getListItemString(int i) const override;
+    void           setListItemString(int i, str sNewString);
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+    bool           IsQueried() const;
+    void           SetQueried(bool bIsQueried);
+    bool           IfQueryFailed() const;
+    void           SetQueryFailed(bool bFailed);
+    void           SetNumPlayers(int iNum);
+    bool           IsFavorite() const;
+    void           SetFavorite(bool bIsFavorite);
+    str            GetListItemVersion() const;
+    void           SetListItemVersion(str sNewVer);
+    void           SetDifferentVersion(bool bIsDifferentVersion);
+    bool           IsDifferentVersion() const;
 };
 
-static int g_iTotalNumPlayers;
-qboolean g_bNumericSort = qfalse;
-qboolean g_bReverseSort = qfalse;
-qboolean g_NeedAdditionalLANSearch = qfalse;
-qboolean g_bDoneUpdating[2];
+static int         g_iTotalNumPlayers;
+qboolean           g_bNumericSort            = qfalse;
+qboolean           g_bReverseSort            = qfalse;
+qboolean           g_NeedAdditionalLANSearch = qfalse;
+qboolean           g_bDoneUpdating[2];
 ServerListInstance g_ServerListInst[2];
 
-void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, void* param1, void* param2);
-static void AddFilter(char* filter, const char* value);
+void        UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2);
+static void AddFilter(char *filter, const char *value);
 
-FAKKServerListItem::FAKKServerListItem(UIFAKKServerList* parent, str string1, str string2, str string3, str string4, str string5, str string6, str ver)
+FAKKServerListItem::FAKKServerListItem(
+    UIFAKKServerList *parent, str string1, str string2, str string3, str string4, str string5, str string6, str ver
+)
 {
-    m_parent = parent;
+    m_parent     = parent;
     m_strings[0] = string1;
     m_strings[1] = string2;
     m_strings[2] = string3;
     m_strings[3] = string4;
     m_strings[4] = string5;
     m_strings[5] = string6;
-    m_sVersion = ver;
+    m_sVersion   = ver;
 
-    m_bFavorite = false;
-    m_bQueryDone = false;
+    m_bFavorite    = false;
+    m_bQueryDone   = false;
     m_bQueryFailed = false;
-    m_iNumPlayers = 0;
+    m_iNumPlayers  = 0;
 }
 
 griditemtype_t FAKKServerListItem::getListItemType(int index) const
@@ -163,11 +174,11 @@ void FAKKServerListItem::setListItemString(int i, str sNewString)
     m_strings[i] = sNewString;
 }
 
-void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont* pFont)
+void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont)
 {
     static cvar_t *pColoringType = Cvar_Get("cl_browserdetailedcolors", "0", CVAR_ARCHIVE);
-    UIRect2D newRect = drawRect;
-    vec2_t virtualScale = { 1.f, 1.f };
+    UIRect2D       newRect       = drawRect;
+    vec2_t         virtualScale  = {1.f, 1.f};
 
     /*
     if (m_parent->isVirtual()) {
@@ -180,7 +191,7 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
 
     virtualScale[0] = m_parent->getHighResScale()[0];
     virtualScale[1] = m_parent->getHighResScale()[1];
-    
+
     if (!pColoringType->integer) {
         if (IfQueryFailed() || (IsDifferentVersion() && IsQueried())) {
             if (bSelected) {
@@ -359,66 +370,69 @@ bool FAKKServerListItem::IsDifferentVersion() const
     return m_bDifferentVersion;
 }
 
-CLASS_DECLARATION( UIListCtrl, UIFAKKServerList, NULL )
-{
-    { &EV_UIListBase_ItemSelected,              &UIFAKKServerList::SelectServer },
-    { &EV_UIListBase_ItemDoubleClicked,         &UIFAKKServerList::ConnectServer },
-    { &EV_FAKKServerList_RefreshServerList,     &UIFAKKServerList::RefreshServerList },
-    { &EV_FAKKServerList_RefreshLANServerList,  &UIFAKKServerList::RefreshLANServerList },
-    { &EV_FAKKServerList_CancelRefresh,         &UIFAKKServerList::CancelRefresh },
-    { &EV_FAKKServerList_Connect,               &UIFAKKServerList::ConnectServer },
-    { &EV_FAKKServerList_LANListing,            &UIFAKKServerList::MakeLANListing },
-    { &EV_FAKKServerList_UpdateServer,          &UIFAKKServerList::UpdateServer },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIListCtrl, UIFAKKServerList, NULL) {
+    {&EV_UIListBase_ItemSelected,             &UIFAKKServerList::SelectServer        },
+    {&EV_UIListBase_ItemDoubleClicked,        &UIFAKKServerList::ConnectServer       },
+    {&EV_FAKKServerList_RefreshServerList,    &UIFAKKServerList::RefreshServerList   },
+    {&EV_FAKKServerList_RefreshLANServerList, &UIFAKKServerList::RefreshLANServerList},
+    {&EV_FAKKServerList_CancelRefresh,        &UIFAKKServerList::CancelRefresh       },
+    {&EV_FAKKServerList_Connect,              &UIFAKKServerList::ConnectServer       },
+    {&EV_FAKKServerList_LANListing,           &UIFAKKServerList::MakeLANListing      },
+    {&EV_FAKKServerList_UpdateServer,         &UIFAKKServerList::UpdateServer        },
+    {NULL,                                    NULL                                   }
 };
 
 UIFAKKServerList::UIFAKKServerList()
 {
-	setBackgroundColor(UWhite, true);
+    setBackgroundColor(UWhite, true);
     Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
     Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
 
-	AllowActivate(true);
-	setHeaderFont("facfont-20");
-	m_serverList[0] = NULL;
-	m_serverList[1] = NULL;
-	m_bHasList = false;
-	m_bGettingList[0] = false;
-	m_bGettingList[1] = false;
-	m_bUpdatingList = false;
-	m_bLANListing = false;
-	m_iLastSortColumn = 2;
+    AllowActivate(true);
+    setHeaderFont("facfont-20");
+    m_serverList[0]   = NULL;
+    m_serverList[1]   = NULL;
+    m_bHasList        = false;
+    m_bGettingList[0] = false;
+    m_bGettingList[1] = false;
+    m_bUpdatingList   = false;
+    m_bLANListing     = false;
+    m_iLastSortColumn = 2;
 }
 
-void UIFAKKServerList::SelectServer( Event *ev )
-{
-}
+void UIFAKKServerList::SelectServer(Event *ev) {}
 
-void UIFAKKServerList::ConnectServer( Event *ev )
+void UIFAKKServerList::ConnectServer(Event *ev)
 {
-    const FAKKServerListItem* pItem;
+    const FAKKServerListItem *pItem;
 
     if (getCurrentItem() <= 0) {
         return;
     }
 
-    pItem = static_cast<const FAKKServerListItem*>(GetItem(getCurrentItem()));
+    pItem = static_cast<const FAKKServerListItem *>(GetItem(getCurrentItem()));
     if (pItem->IsDifferentVersion()) {
-        const char* message;
-        float neededVersion = com_target_version->value;
-        float serverVersion = atof(pItem->GetListItemVersion().c_str());
+        const char *message;
+        float       neededVersion = com_target_version->value;
+        float       serverVersion = atof(pItem->GetListItemVersion().c_str());
 
         // Tolerate patch version
         if (fabs(neededVersion - serverVersion) >= 0.1) {
             UI_SetReturnMenuToCurrent();
 
-            message = va("Server is version %s, you are targeting %s", pItem->GetListItemVersion().c_str(), com_target_version->string);
+            message =
+                va("Server is version %s, you are targeting %s",
+                   pItem->GetListItemVersion().c_str(),
+                   com_target_version->string);
             Cvar_Set("com_errormessage", message);
 
             UI_PushMenu("wrongversion");
         } else {
-            message = va("Can not connect to v%s server, you are targeting v%s", pItem->GetListItemVersion().c_str(), com_target_version->string);
-        
+            message =
+                va("Can not connect to v%s server, you are targeting v%s",
+                   pItem->GetListItemVersion().c_str(),
+                   com_target_version->string);
+
             Cvar_Set("dm_serverstatus", message);
         }
     } else {
@@ -432,10 +446,9 @@ void UIFAKKServerList::ConnectServer( Event *ev )
     }
 }
 
-qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
+qboolean UIFAKKServerList::KeyEvent(int key, unsigned int time)
 {
-    switch (key)
-    {
+    switch (key) {
     case K_ENTER:
     case K_KP_ENTER:
         ConnectServer(NULL);
@@ -456,17 +469,17 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
             SelectServer(NULL);
 
             return qtrue;
-        }
-        else {
+        } else {
             return qfalse;
         }
         break;
     case 'u':
     case 'U':
-        if (getCurrentItem() > 0)
-        {
-            const FAKKServerListItem* pItem = static_cast<const FAKKServerListItem*>(GetItem(getCurrentItem()));
-            ServerListAuxUpdate(m_serverList[0], pItem->m_sIP.c_str(), pItem->m_iGameSpyPort, true, GQueryType::qt_status);
+        if (getCurrentItem() > 0) {
+            const FAKKServerListItem *pItem = static_cast<const FAKKServerListItem *>(GetItem(getCurrentItem()));
+            ServerListAuxUpdate(
+                m_serverList[0], pItem->m_sIP.c_str(), pItem->m_iGameSpyPort, true, GQueryType::qt_status
+            );
         }
         return UIListCtrl::KeyEvent(key, time);
     case 'c':
@@ -476,25 +489,33 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
     case 'i':
     case 'I':
         {
-            int i, j;
-            const FAKKServerListItem* pServerItem1;
-            const FAKKServerListItem* pServerItem2;
-            int iNumErrors = 0;
+            int                       i, j;
+            const FAKKServerListItem *pServerItem1;
+            const FAKKServerListItem *pServerItem2;
+            int                       iNumErrors = 0;
 
             for (i = 1; i <= getNumItems(); i++) {
-                pServerItem1 = static_cast<const FAKKServerListItem*>(GetItem(i));
+                pServerItem1 = static_cast<const FAKKServerListItem *>(GetItem(i));
 
                 for (j = i + 1; j <= getNumItems(); j++) {
-                    pServerItem2 = static_cast<const FAKKServerListItem*>(GetItem(j));
+                    pServerItem2 = static_cast<const FAKKServerListItem *>(GetItem(j));
 
                     if (!str::icmp(pServerItem1->m_sIP.c_str(), pServerItem2->m_sIP.c_str())) {
                         if (pServerItem1->m_iPort == pServerItem2->m_iPort) {
-                            Com_DPrintf("*#*#* Duplicate server address: %s:%i\n", pServerItem1->m_sIP.c_str(), pServerItem1->m_iPort);
+                            Com_DPrintf(
+                                "*#*#* Duplicate server address: %s:%i\n",
+                                pServerItem1->m_sIP.c_str(),
+                                pServerItem1->m_iPort
+                            );
                             iNumErrors++;
                         }
 
                         if (pServerItem1->m_iGameSpyPort == pServerItem2->m_iGameSpyPort) {
-                            Com_DPrintf("*#*#* servers at IP %s sharing GameSpy port %i\n", pServerItem1->m_sIP.c_str(), pServerItem1->m_iGameSpyPort);
+                            Com_DPrintf(
+                                "*#*#* servers at IP %s sharing GameSpy port %i\n",
+                                pServerItem1->m_sIP.c_str(),
+                                pServerItem1->m_iGameSpyPort
+                            );
                             iNumErrors++;
                         }
                     }
@@ -509,7 +530,7 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
     }
 }
 
-void UIFAKKServerList::UpdateUIElement( void )
+void UIFAKKServerList::UpdateUIElement(void)
 {
     float width;
 
@@ -527,13 +548,13 @@ void UIFAKKServerList::UpdateUIElement( void )
     uWinMan.ActivateControl(this);
 }
 
-void UIFAKKServerList::RefreshServerList( Event *ev )
+void UIFAKKServerList::RefreshServerList(Event *ev)
 {
-    int i;
-    FAKKServerListItem* pNewServerItem;
+    int                 i;
+    FAKKServerListItem *pNewServerItem;
 
     for (i = 1; i <= getNumItems(); i++) {
-        pNewServerItem = static_cast<FAKKServerListItem*>(GetItem(i));
+        pNewServerItem = static_cast<FAKKServerListItem *>(GetItem(i));
         pNewServerItem->SetQueried(false);
         pNewServerItem->SetNumPlayers(0);
         pNewServerItem->SetQueryFailed(false);
@@ -550,7 +571,7 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
         ServerListFree(m_serverList[1]);
         m_serverList[1] = NULL;
     }
-    
+
     if (!m_serverList[0]) {
         NewServerList();
     }
@@ -560,14 +581,14 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
 
     Cvar_Set("dm_playercount", "0");
     {
-        char filter[2048] = { 0 };
-        static cvar_t* dm_max_players = Cvar_Get("dm_max_players", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_min_players = Cvar_Get("dm_min_players", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_show_demo_servers = Cvar_Get("dm_show_demo_servers", "1", CVAR_ARCHIVE);
-        static cvar_t* dm_realism_mode = Cvar_Get("dm_realism_mode", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_filter_listen = Cvar_Get("dm_filter_listen", "1", CVAR_ARCHIVE);
-        static cvar_t* dm_filter_empty = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_filter_full = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
+        char           filter[2048]         = {0};
+        static cvar_t *dm_max_players       = Cvar_Get("dm_max_players", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_min_players       = Cvar_Get("dm_min_players", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_show_demo_servers = Cvar_Get("dm_show_demo_servers", "1", CVAR_ARCHIVE);
+        static cvar_t *dm_realism_mode      = Cvar_Get("dm_realism_mode", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_filter_listen     = Cvar_Get("dm_filter_listen", "1", CVAR_ARCHIVE);
+        static cvar_t *dm_filter_empty      = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_filter_full       = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
 
         if (dm_min_players->integer) {
             AddFilter(filter, va("numplayers >= %d", dm_min_players->integer));
@@ -607,13 +628,13 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
     m_bUpdatingList = true;
 }
 
-void UIFAKKServerList::RefreshLANServerList( Event *ev )
+void UIFAKKServerList::RefreshLANServerList(Event *ev)
 {
-    int i;
-    FAKKServerListItem* pNewServerItem;
+    int                 i;
+    FAKKServerListItem *pNewServerItem;
 
     for (i = 1; i <= getNumItems(); i++) {
-        pNewServerItem = static_cast<FAKKServerListItem*>(GetItem(i));
+        pNewServerItem = static_cast<FAKKServerListItem *>(GetItem(i));
         pNewServerItem->SetQueried(false);
         pNewServerItem->SetNumPlayers(0);
         pNewServerItem->SetQueryFailed(false);
@@ -629,21 +650,22 @@ void UIFAKKServerList::RefreshLANServerList( Event *ev )
         NewServerList();
     }
 
-    g_bDoneUpdating[0] = false;
-    g_bDoneUpdating[1] = false;
+    g_bDoneUpdating[0]        = false;
+    g_bDoneUpdating[1]        = false;
     g_NeedAdditionalLANSearch = true;
 
     Cvar_Set("dm_playercount", "0");
     // Search all LAN servers from port 12300 to 12316
     ServerListLANUpdate(m_serverList[0], true, 12300, 12316, 1);
-    
+
     if (m_serverList[1]) {
         // If another game is supported search for it
         ServerListLANUpdate(m_serverList[1], true, 12300, 12316, 1);
     }
 }
 
-static void AddFilter(char* filter, const char* value) {
+static void AddFilter(char *filter, const char *value)
+{
     if (*filter) {
         strcat(filter, va(" and %s", value));
     } else {
@@ -651,20 +673,20 @@ static void AddFilter(char* filter, const char* value) {
     }
 }
 
-void UIFAKKServerList::CancelRefresh( Event *ev )
+void UIFAKKServerList::CancelRefresh(Event *ev)
 {
-	ServerListHalt(m_serverList[0]);
+    ServerListHalt(m_serverList[0]);
     if (m_serverList[1]) {
         ServerListHalt(m_serverList[1]);
     }
 }
 
-void UIFAKKServerList::NewServerList( void )
+void UIFAKKServerList::NewServerList(void)
 {
-    int iNumConcurrent;
-    const char* secret_key;
-    const char* game_name;
-    cvar_t* pRateCvar = Cvar_Get("rate", "5000", CVAR_ARCHIVE | CVAR_USERINFO);
+    int         iNumConcurrent;
+    const char *secret_key;
+    const char *game_name;
+    cvar_t     *pRateCvar = Cvar_Get("rate", "5000", CVAR_ARCHIVE | CVAR_USERINFO);
 
     if (pRateCvar->integer <= 3000) {
         iNumConcurrent = 4;
@@ -677,104 +699,107 @@ void UIFAKKServerList::NewServerList( void )
     }
 
     if (com_target_game->integer < target_game_e::TG_MOHTT) {
-        game_name = GS_GetCurrentGameName();
+        game_name  = GS_GetCurrentGameName();
         secret_key = GS_GetCurrentGameKey();
 
         // standard mohaa server
         g_ServerListInst[0].iServerType = com_target_game->integer;
-        g_ServerListInst[0].serverList = this;
+        g_ServerListInst[0].serverList  = this;
 
         m_serverList[0] = ServerListNew(
             game_name,
             game_name,
             secret_key,
             iNumConcurrent,
-            (void*)&UpdateServerListCallBack,
+            (void *)&UpdateServerListCallBack,
             1,
-            (void*)&g_ServerListInst[0]
+            (void *)&g_ServerListInst[0]
         );
 
         m_serverList[1] = NULL;
     } else {
-        static cvar_t* dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", 1);
+        static cvar_t *dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", 1);
 
-        game_name = GS_GetGameName(target_game_e::TG_MOHTT);
+        game_name  = GS_GetGameName(target_game_e::TG_MOHTT);
         secret_key = GS_GetGameKey(target_game_e::TG_MOHTT);
 
         g_ServerListInst[0].iServerType = target_game_e::TG_MOHTT;
-        g_ServerListInst[0].serverList = this;
+        g_ServerListInst[0].serverList  = this;
 
         m_serverList[0] = ServerListNew(
             game_name,
             game_name,
             secret_key,
             iNumConcurrent,
-            (void*)&UpdateServerListCallBack,
+            (void *)&UpdateServerListCallBack,
             1,
-            (void*)&g_ServerListInst[0]
+            (void *)&g_ServerListInst[0]
         );
-        
+
         if (!dm_omit_spearhead->integer) {
             // Since mohtt is compatible with mohta
             // Search for both type of servers
-            game_name = GS_GetGameName(target_game_e::TG_MOHTA);
+            game_name  = GS_GetGameName(target_game_e::TG_MOHTA);
             secret_key = GS_GetGameKey(target_game_e::TG_MOHTA);
 
             g_ServerListInst[1].iServerType = target_game_e::TG_MOHTA;
-            g_ServerListInst[1].serverList = this;
+            g_ServerListInst[1].serverList  = this;
 
             m_serverList[1] = ServerListNew(
                 game_name,
                 game_name,
                 secret_key,
                 iNumConcurrent,
-                (void*)&UpdateServerListCallBack,
+                (void *)&UpdateServerListCallBack,
                 1,
-                (void*)&g_ServerListInst[1]
+                (void *)&g_ServerListInst[1]
             );
         }
     }
 }
 
-void UIFAKKServerList::MakeLANListing( Event *ev )
+void UIFAKKServerList::MakeLANListing(Event *ev)
 {
-	m_bLANListing = true;
+    m_bLANListing = true;
 }
 
-void UIFAKKServerList::UpdateServer( Event *ev )
+void UIFAKKServerList::UpdateServer(Event *ev)
 {
-	if (m_currentItem <= 0) {
-		return;
-	}
+    if (m_currentItem <= 0) {
+        return;
+    }
 
-    FAKKServerListItem* item = (FAKKServerListItem*)GetItem(getCurrentItem());
+    FAKKServerListItem *item = (FAKKServerListItem *)GetItem(getCurrentItem());
     ServerListAuxUpdate(m_serverList[0], item->m_sIP.c_str(), item->m_iGameSpyPort, true, GQueryType::qt_status);
 
     if (com_target_game->integer >= target_game_e::TG_MOHTT) {
-        const cvar_t* dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
+        const cvar_t *dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
         // check for Spearhead
         if (!dm_omit_spearhead->integer) {
-            ServerListAuxUpdate(m_serverList[1], item->m_sIP.c_str(), item->m_iGameSpyPort, true, GQueryType::qt_status);
+            ServerListAuxUpdate(
+                m_serverList[1], item->m_sIP.c_str(), item->m_iGameSpyPort, true, GQueryType::qt_status
+            );
         }
     }
 }
 
-int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname )
+int UIFAKKServerList::ServerCompareFunction(const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname)
 {
-    int iCompResult;
-    int val1, val2;
-    const FAKKServerListItem* fi1 = static_cast<const FAKKServerListItem*>(i1);
-    const FAKKServerListItem* fi2 = static_cast<const FAKKServerListItem*>(i2);
+    int                       iCompResult;
+    int                       val1, val2;
+    const FAKKServerListItem *fi1 = static_cast<const FAKKServerListItem *>(i1);
+    const FAKKServerListItem *fi2 = static_cast<const FAKKServerListItem *>(i2);
 
-    if (fi1->IsFavorite() != fi2->IsFavorite())
-    {
+    if (fi1->IsFavorite() != fi2->IsFavorite()) {
         if (fi1->IsFavorite()) {
             iCompResult = -1;
         } else {
             iCompResult = 1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (fi1->IsQueried() != fi2->IsQueried()) {
         if (fi1->IsQueried()) {
             iCompResult = -1;
@@ -782,16 +807,19 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
             iCompResult = 1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (fi1->IsDifferentVersion() != fi2->IsDifferentVersion()) {
-
         if (fi1->IsDifferentVersion()) {
             iCompResult = 1;
         } else {
             iCompResult = -1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (fi1->IfQueryFailed() != fi2->IfQueryFailed()) {
         if (fi1->IfQueryFailed()) {
             iCompResult = 1;
@@ -799,7 +827,9 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
             iCompResult = -1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (g_bNumericSort) {
         val1 = fi1->getListItemValue(columnname);
         val2 = fi2->getListItemValue(columnname);
@@ -815,8 +845,7 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
         iCompResult = str::icmp(fi1->getListItemString(columnname), fi2->getListItemString(columnname));
     }
 
-    if (!iCompResult)
-    {
+    if (!iCompResult) {
         if (columnname != -2) {
             val1 = fi1->getListItemValue(2);
             val2 = fi2->getListItemValue(2);
@@ -849,11 +878,9 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
 
                 if (val1 < val2) {
                     iCompResult = 1;
-                }
-                else if (val1 > val2) {
+                } else if (val1 > val2) {
                     iCompResult = -1;
-                }
-                else {
+                } else {
                     iCompResult = 0;
                 }
             }
@@ -871,16 +898,17 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
             }
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     }
 
     return iCompResult;
 }
 
-void UIFAKKServerList::Draw( void )
+void UIFAKKServerList::Draw(void)
 {
-    if (m_serverList[0])
-    {
+    if (m_serverList[0]) {
         GServerListState listState[2];
 
         ServerListThink(m_serverList[0]);
@@ -890,22 +918,17 @@ void UIFAKKServerList::Draw( void )
 
         listState[0] = ServerListState(m_serverList[0]);
         listState[1] = m_serverList[1] ? ServerListState(m_serverList[1]) : GServerListState::sl_idle;
-        if (listState[0] != GServerListState::sl_idle || listState[1] != GServerListState::sl_idle)
-        {
+        if (listState[0] != GServerListState::sl_idle || listState[1] != GServerListState::sl_idle) {
             menuManager.PassEventToWidget("refresh", new Event(EV_Widget_Disable));
             menuManager.PassEventToWidget("cancelrefresh", new Event(EV_Widget_Enable));
-        }
-        else
-        {
+        } else {
             menuManager.PassEventToWidget("refresh", new Event(EV_Widget_Enable));
             menuManager.PassEventToWidget("cancelrefresh", new Event(EV_Widget_Disable));
         }
     } else if (!m_bHasList) {
-
         if (m_bLANListing) {
             RefreshLANServerList(NULL);
-        }
-        else {
+        } else {
             RefreshServerList(NULL);
         }
 
@@ -927,14 +950,14 @@ void UIFAKKServerList::Draw( void )
     UIListCtrl::Draw();
 }
 
-void UIFAKKServerList::SortByColumn( int column )
+void UIFAKKServerList::SortByColumn(int column)
 {
-    int i;
-    bool exists = 0;
-    bool numeric = 0;
-    bool reverse = 0;
-    UIListCtrlItem* selected = NULL;
-    bool selvisible = false;
+    int             i;
+    bool            exists     = 0;
+    bool            numeric    = 0;
+    bool            reverse    = 0;
+    UIListCtrlItem *selected   = NULL;
+    bool            selvisible = false;
 
     for (i = 1; i <= m_columnlist.NumObjects(); i++) {
         const columndef_t& def = m_columnlist.ObjectAt(i);
@@ -942,7 +965,7 @@ void UIFAKKServerList::SortByColumn( int column )
             // found one
             numeric = def.numeric;
             reverse = def.reverse_sort;
-            exists = true;
+            exists  = true;
             break;
         }
     }
@@ -953,11 +976,11 @@ void UIFAKKServerList::SortByColumn( int column )
     }
 
     m_iLastSortColumn = column;
-    s_qsortcolumn = column;
-    s_qsortobject = this;
-    s_qsortreverse = reverse;
-    g_bNumericSort = numeric;
-    g_bReverseSort = reverse;
+    s_qsortcolumn     = column;
+    s_qsortobject     = this;
+    s_qsortreverse    = reverse;
+    g_bNumericSort    = numeric;
+    g_bReverseSort    = reverse;
 
     if (getCurrentItem()) {
         selected = m_itemlist.ObjectAt(getCurrentItem());
@@ -983,47 +1006,46 @@ void UIFAKKServerList::SortByColumn( int column )
     }
 }
 
-void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, void* param1, void* param2)
+void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2)
 {
-    int i, j;
-    int iPort, iGameSpyPort;
-    unsigned int iRealIP;
-    str sAddress;
-    GServer server;
-    FAKKServerListItem* pNewServerItem;
-    static int iServerQueryCount = 0;
-    static int iServerTotalCount = 0;
-    UIFAKKServerList* uiServerList;
-    int iServerType;
+    int                 i, j;
+    int                 iPort, iGameSpyPort;
+    unsigned int        iRealIP;
+    str                 sAddress;
+    GServer             server;
+    FAKKServerListItem *pNewServerItem;
+    static int          iServerQueryCount = 0;
+    static int          iServerTotalCount = 0;
+    UIFAKKServerList   *uiServerList;
+    int                 iServerType;
     // filters
-    static cvar_t* dm_filter_empty = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_filter_full = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_filter_pure = Cvar_Get("dm_filter_pure", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_max_ping = Cvar_Get("dm_max_ping", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_free_for_all = Cvar_Get("dm_free_for_all", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_objective_match = Cvar_Get("dm_objective_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_round_based_match = Cvar_Get("dm_round_based_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_team_match = Cvar_Get("dm_team_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_tow_match = Cvar_Get("dm_tow_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_liberation_match = Cvar_Get("dm_liberation_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_run_fast = Cvar_Get("dm_run_fast", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_run_normal = Cvar_Get("dm_run_normal", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_filter_empty      = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_filter_full       = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_filter_pure       = Cvar_Get("dm_filter_pure", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_max_ping          = Cvar_Get("dm_max_ping", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_free_for_all      = Cvar_Get("dm_free_for_all", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_objective_match   = Cvar_Get("dm_objective_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_round_based_match = Cvar_Get("dm_round_based_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_team_match        = Cvar_Get("dm_team_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_tow_match         = Cvar_Get("dm_tow_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_liberation_match  = Cvar_Get("dm_liberation_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_run_fast          = Cvar_Get("dm_run_fast", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_run_normal        = Cvar_Get("dm_run_normal", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_omit_spearhead    = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
 
-    iServerType = ((ServerListInstance*)instance)->iServerType;
-    uiServerList = ((ServerListInstance*)instance)->serverList;
+    iServerType    = ((ServerListInstance *)instance)->iServerType;
+    uiServerList   = ((ServerListInstance *)instance)->serverList;
     pNewServerItem = NULL;
-    server = (GServer)param1;
+    server         = (GServer)param1;
 
-    if (param2)
-    {
-        if (msg == LIST_PROGRESS && param2 == (void*)-1) {
+    if (param2) {
+        if (msg == LIST_PROGRESS && param2 == (void *)-1) {
             iRealIP = inet_addr(ServerGetAddress(server));
             ServerGetIntValue(server, "hostport", PORT_SERVER);
             iGameSpyPort = ServerGetQueryPort(server);
 
             for (i = 1; i <= uiServerList->getNumItems(); i++) {
-                pNewServerItem = static_cast<FAKKServerListItem*>(uiServerList->GetItem(i));
+                pNewServerItem = static_cast<FAKKServerListItem *>(uiServerList->GetItem(i));
                 if (pNewServerItem->m_uiRealIP == iRealIP && pNewServerItem->m_iGameSpyPort == iGameSpyPort) {
                     break;
                 }
@@ -1039,21 +1061,20 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         Cvar_Set("dm_serverstatusbar", va("%i", (int)(uintptr_t)param2));
     }
 
-    if (msg == LIST_PROGRESS)
-    {
-        const char* pszHostName;
-        bool bDiffVersion;
-        bool bIsDemo;
-        str sServerName;
-        str sPlayers;
-        const char* pszGameVer;
-        const char* pszGameVerNumber;
-        float fGameVer;
+    if (msg == LIST_PROGRESS) {
+        const char *pszHostName;
+        bool        bDiffVersion;
+        bool        bIsDemo;
+        str         sServerName;
+        str         sPlayers;
+        const char *pszGameVer;
+        const char *pszGameVerNumber;
+        float       fGameVer;
 
-        pszHostName = ServerGetStringValue(server, "hostname", "(NONE)");
-        bDiffVersion = false;
-        bIsDemo = false;
-        pszGameVer = ServerGetStringValue(server, "gamever", "1.00");
+        pszHostName      = ServerGetStringValue(server, "hostname", "(NONE)");
+        bDiffVersion     = false;
+        bIsDemo          = false;
+        pszGameVer       = ServerGetStringValue(server, "gamever", "1.00");
         pszGameVerNumber = pszGameVer;
 
         if (pszGameVerNumber[0] == 'd') {
@@ -1092,22 +1113,22 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
             sServerName = va(" (d%s) %s", pszGameVerNumber, pszHostName);
         }
 
-        iRealIP = inet_addr(ServerGetAddress(server));
-        iPort = ServerGetIntValue(server, "hostport", PORT_SERVER);
+        iRealIP      = inet_addr(ServerGetAddress(server));
+        iPort        = ServerGetIntValue(server, "hostport", PORT_SERVER);
         iGameSpyPort = ServerGetQueryPort(server);
-        sAddress = va("%s:%i", ServerGetAddress(server), iPort);
+        sAddress     = va("%s:%i", ServerGetAddress(server), iPort);
         sPlayers = va("%d/%d", ServerGetIntValue(server, "numplayers", 0), ServerGetIntValue(server, "maxplayers", 0));
-        
+
         for (i = 1; i <= uiServerList->getNumItems(); i++) {
-            pNewServerItem = static_cast<FAKKServerListItem*>(uiServerList->GetItem(i));
+            pNewServerItem = static_cast<FAKKServerListItem *>(uiServerList->GetItem(i));
             if (pNewServerItem->m_uiRealIP == iRealIP && pNewServerItem->m_iGameSpyPort == iGameSpyPort) {
                 break;
             }
         }
 
         if (i > uiServerList->getNumItems() || !pNewServerItem) {
-            pNewServerItem = new FAKKServerListItem(uiServerList, "?", sAddress, "?", "?/?", "?", "?", "?");
-            pNewServerItem->m_sIP = ServerGetAddress(server);
+            pNewServerItem             = new FAKKServerListItem(uiServerList, "?", sAddress, "?", "?/?", "?", "?", "?");
+            pNewServerItem->m_sIP      = ServerGetAddress(server);
             pNewServerItem->m_uiRealIP = iRealIP;
             pNewServerItem->m_iGameSpyPort = iGameSpyPort;
 
@@ -1131,11 +1152,8 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         Cvar_Set("dm_servercount", va("%d/%d", iServerQueryCount, iServerTotalCount));
 
         uiServerList->SortByLastSortColumn();
-    }
-    else if (msg == LIST_STATECHANGED)
-    {
-        switch (ServerListState(serverlist))
-        {
+    } else if (msg == LIST_STATECHANGED) {
+        switch (ServerListState(serverlist)) {
         case GServerListState::sl_idle:
             if (com_target_game->integer >= target_game_e::TG_MOHTT) {
                 if (iServerType == target_game_e::TG_MOHTT) {
@@ -1159,14 +1177,18 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         case GServerListState::sl_listxfer:
             Cvar_Set("dm_serverstatus", "Getting List.");
             if (com_target_game->integer >= target_game_e::TG_MOHTT) {
-                if (iServerType == target_game_e::TG_MOHTT) uiServerList->m_bGettingList[0] = true;
-                if (iServerType == target_game_e::TG_MOHTA) uiServerList->m_bGettingList[1] = true;
+                if (iServerType == target_game_e::TG_MOHTT) {
+                    uiServerList->m_bGettingList[0] = true;
+                }
+                if (iServerType == target_game_e::TG_MOHTA) {
+                    uiServerList->m_bGettingList[1] = true;
+                }
             } else {
                 uiServerList->m_bGettingList[0] = true;
                 uiServerList->m_bGettingList[1] = false;
             }
             uiServerList->m_bUpdatingList = true;
-            iServerQueryCount = 0;
+            iServerQueryCount             = 0;
             return;
         case GServerListState::sl_lanlist:
             Cvar_Set("dm_serverstatus", "Searching LAN.");
@@ -1175,8 +1197,8 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         case GServerListState::sl_querying:
             Cvar_Set("dm_serverstatus", "Querying Servers.");
             uiServerList->m_bUpdatingList = true;
-            iServerQueryCount = 0;
-            iServerTotalCount = 0;
+            iServerQueryCount             = 0;
+            iServerTotalCount             = 0;
             break;
         default:
             break;
@@ -1247,4 +1269,4 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         }
         */
     }
-}
\ No newline at end of file
+}

From 881d7f2f512646d1380b5c9da38166fec204ac8f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Apr 2025 21:03:42 +0200
Subject: [PATCH 2023/2040] Don't refresh the server list if it's not ready

The server list UI refresh the server list for the first time when drawing. In mohaa (not Spearhead nor Breakthrough), refreshserverlist is also called by clicking "browse internet servers" which causes the list to be queried twice
---
 code/client/cl_uiserverlist.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index 8cd995a3..f5d59c24 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -553,6 +553,17 @@ void UIFAKKServerList::RefreshServerList(Event *ev)
     int                 i;
     FAKKServerListItem *pNewServerItem;
 
+    if (m_serverList[0] && ServerListState(m_serverList[0]) != sl_idle) {
+        // Fixed in OPM
+        //  Only free the server list if it isn't currently being queried.
+        //  The server list must not be queried
+        return;
+    }
+
+    if (m_serverList[1] && ServerListState(m_serverList[1]) != sl_idle) {
+        return;
+    }
+
     for (i = 1; i <= getNumItems(); i++) {
         pNewServerItem = static_cast<FAKKServerListItem *>(GetItem(i));
         pNewServerItem->SetQueried(false);
@@ -562,6 +573,8 @@ void UIFAKKServerList::RefreshServerList(Event *ev)
 
     if (m_serverList[0]) {
         ServerListClear(m_serverList[0]);
+        // Added in 2.0: Free the server list
+        //  Since 2.0, the UI no longer refreshes the server list when clicking "Browse Internet Servers"
         ServerListFree(m_serverList[0]);
         m_serverList[0] = NULL;
     }
@@ -572,7 +585,7 @@ void UIFAKKServerList::RefreshServerList(Event *ev)
         m_serverList[1] = NULL;
     }
 
-    if (!m_serverList[0]) {
+    if (!m_serverList[0] && (com_target_game->integer < target_game_e::TG_MOHTT || !m_serverList[1])) {
         NewServerList();
     }
 
@@ -640,13 +653,15 @@ void UIFAKKServerList::RefreshLANServerList(Event *ev)
         pNewServerItem->SetQueryFailed(false);
     }
 
+    if (m_serverList[0]) {
+        ServerListClear(m_serverList[0]);
+    }
+
     if (m_serverList[1]) {
         ServerListClear(m_serverList[1]);
     }
 
-    if (m_serverList[0]) {
-        ServerListClear(m_serverList[0]);
-    } else {
+    if (!m_serverList[0] && (com_target_game->integer < target_game_e::TG_MOHTT || !m_serverList[1])) {
         NewServerList();
     }
 

From 12880db5578e3e2349b9b60ea05787bfa4019a7a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Apr 2025 21:26:33 +0200
Subject: [PATCH 2024/2040] Don't force HRTF if the speaker type is not
 "Headphones"

---
 code/client/snd_openal_new.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
index 8e5bef71..2e35801c 100644
--- a/code/client/snd_openal_new.cpp
+++ b/code/client/snd_openal_new.cpp
@@ -274,7 +274,7 @@ S_OPENAL_InitContext
 static bool S_OPENAL_InitContext()
 {
     const char *dev;
-    int         attrlist[10];
+    int         attrlist[12];
 
     Com_DPrintf("OpenAL: Context initialization\n");
 
@@ -381,6 +381,11 @@ static bool S_OPENAL_InitContext()
 
 #ifdef ALC_SOFT_output_mode
     attrlist[4] = ALC_OUTPUT_MODE_SOFT;
+    // Disable HRTF by default
+    // For example, actual speakers that are recognized as headphones by the OS
+    // will not get forced HRTF
+    attrlist[6] = ALC_HRTF_SOFT;
+    attrlist[7] = ALC_FALSE;
 
     switch (s_speaker_type->integer) {
     // Two speakers
@@ -391,6 +396,8 @@ static bool S_OPENAL_InitContext()
     // Headphones
     case 1:
         attrlist[5] = ALC_STEREO_HRTF_SOFT;
+        // Allow HRTF mixing (without forcing in case it's unsupported)
+        attrlist[7] = ALC_DONT_CARE_SOFT;
         break;
     // Surround
     case 2:
@@ -413,11 +420,11 @@ static bool S_OPENAL_InitContext()
 
 #ifdef ALC_SOFT_output_limiter
     // Disable limiter
-    attrlist[6] = ALC_OUTPUT_LIMITER_SOFT;
-    attrlist[7] = ALC_FALSE;
+    attrlist[8] = ALC_OUTPUT_LIMITER_SOFT;
+    attrlist[9] = ALC_FALSE;
 #endif
-    attrlist[8] = 0;
-    attrlist[9] = 0;
+    attrlist[10] = 0;
+    attrlist[11] = 0;
 
     Com_Printf("OpenAL: Creating AL context...\n");
     al_context_id = qalcCreateContext(al_device, attrlist);

From a4267d4f77b454aa659e536ae947aa5bede09618 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Mon, 21 Apr 2025 22:31:41 +0200
Subject: [PATCH 2025/2040] Initialize update list only for queries that are
 neither grouprooms or masterinfo

---
 code/gamespy/gserverlist.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 30fc4fd2..e77cbcd3 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -377,8 +377,10 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
     if (error) return error;
     error = SendListRequest(serverlist, filter);
     if (error) return error;
-    error = InitUpdateList(serverlist);
-    if (error) return error;
+    if (querytype != qt_grouprooms && querytype != qt_masterinfo) {
+        error = InitUpdateList(serverlist);
+        if (error) return error;
+    }
     serverlist->nextupdate = 0;
     serverlist->abortupdate = 0;
     // Added in 2.0

From aa7639485eff3ffd966a8332b1b3fc1253f741bd Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 00:16:07 +0200
Subject: [PATCH 2026/2040] Use __linux__ definition to check for linux

---
 code/gamespy/common/gsPlatform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/gamespy/common/gsPlatform.h b/code/gamespy/common/gsPlatform.h
index d7ffb37e..10916417 100644
--- a/code/gamespy/common/gsPlatform.h
+++ b/code/gamespy/common/gsPlatform.h
@@ -23,7 +23,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // Set the platform define
-#if defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined (__linux__) || defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 	#define _UNIX
 #elif __mips64
 	#ifndef _PS2

From ffc35fb5ab048bb647499e8184fcb303ee9ed6c6 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 00:25:35 +0200
Subject: [PATCH 2027/2040] Use the original gqueryreporting from GameSpy SDK

Potentially more stable and thoroughly tested
---
 code/gamespy/sv_gamespy.c         |    4 -
 code/gamespy/sv_gqueryreporting.c | 1149 +++++++++++++++++------------
 code/gamespy/sv_gqueryreporting.h |  201 ++++-
 code/server/sv_main.c             |    2 +-
 4 files changed, 860 insertions(+), 496 deletions(-)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 0833bf98..8a53dd24 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -79,10 +79,6 @@ static const char* GS_GAME_VERSION_DEMO[] =
 
 static const unsigned int GAMESPY_DEFAULT_PORT = 12300;
 
-void qr_send_statechanged(qr_t qrec);
-void qr_shutdown(qr_t qrec);
-void qr_process_queries(qr_t qrec);
-
 int qr_init(
     qr_t              *qrec,
     const char        *ip,
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 7eb6131a..985918ce 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -20,404 +20,144 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../qcommon/q_shared.h"
-#include "sv_gqueryreporting.h"
+/******
+gqueryreporting.h
+GameSpy Query & Reporting SDK 
+  
+Copyright 2000 GameSpy Industries, Inc
 
-#include "common/gsPlatformSocket.h"
-#include "common/gsPlatformUtil.h"
-#include "gutil.h"
+18002 Skypark Circle
+Irvine, CA 92614
+(949)798-4200
+Fax(949)798-4299
+******
 
-static char *queries[] = {"basic", "info", "rules", "players", "status", "packets", "echo", "secure"};
 
-static qr_implementation_t  static_rec;
-static qr_implementation_t *current_rec = &static_rec;
-struct sockaddr_in          hbaddr;
-char                        qr_hostname[64];
+  Please see the GameSpy Query & Reporting SDK documentation for more 
+ information
 
-void        qr_check_queries(qr_t qrec);
-void        qr_check_send_heartbeat(qr_t qrec);
-static void parse_query(qr_t qrec, char *query, struct sockaddr *sender);
-static void send_heartbeat(qr_t qrec, int statechanged);
+ Updated 6/9/99 - DDW
+  Added get_sockaddrin function, and use for resolving
+  Made portable with additions from CEngine code
+  Double check that we don't bind to localhost (instead use INADDR_ANY)
 
-void qr_process_queries(qr_t qrec)
-{
-    if (!qrec) {
-        qrec = current_rec;
-    }
+ Updated 9/1/99 - DDW
+  Add the ability to pass in 0 as the queryport, to allocate it
+  automatically.
 
-    qr_check_send_heartbeat(qrec);
-    qr_check_queries(qrec);
-}
+ Updated 10/11/99 - DDW
+  TCP Heartbeat support (#define TCP_HEARTBEATS)
 
-void qr_process_queries_no_heartbeat(qr_t qrec)
-{
-    if (!qrec) {
-        qrec = current_rec;
-    }
+ Updated 11/20/99 - BGW
+  Split goa_process_queries into two functions: goa_check_queries() and
+  goa_check_send_heartbeat().
 
-    qr_check_queries(qrec);
-}
+ Updated 3/19/00 - DDW
+  Added Dreamcast CE Support
 
-void qr_check_queries(qr_t qrec)
-{
-#define INBUF_LEN 256
-    static char        indata[INBUF_LEN]; //256 byte input buffer
-    struct sockaddr_in saddr;
-    int                error;
+ Updated 4/5/00 - DDW
+  Added Dreamcast Shinobi Support (use sendto/recvfrom for UDP sockets to work
+  around connect bug)
 
-#if defined(_LINUX)
-    unsigned int saddrlen = sizeof(struct sockaddr_in);
+ Updated 4/17/00 - DDW
+  Use a single socket for heartbeats/queries (conserve sockets on DC)
+
+ Updated 5/23/00 - DDW
+  Developer SDK renamed "Query & Reporting SDK"
+  Encapsulate global data in a structure so multiple simultaneous instances
+  can run in the same process. Most developers can just pass NULL for the extra
+  parameter.
+  qr_init now scans for an open port, starting from a base port.
+  heartbeats are sent every 30 seconds now until the first query is received,
+  then they are sent every 5 minutes as recommened by the developer spec
+  this helps remove the problem of dropped heartbeats causing a server to not
+  show up for 5 minutes.
+
+ Updated 10/2/00 - DDW
+  Added qr_process_queries_no_heartbeat, so you can advertise a server on the
+  LAN only.
+ Updated 11/9/00 - DDW
+  Use common alloc/re-alloc functions
+******/
+
+/********
+INCLUDES
+********/
+#if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__) && !defined(__mips64)
+	#include "::nonport.h"
 #else
-    int saddrlen = sizeof(struct sockaddr_in);
+	#include "nonport.h"
+#endif
+#include "sv_gqueryreporting.h"
+#include <stdlib.h>
+#include <stdio.h>
+
+
+#include <string.h>
+#if !defined(UNDER_CE) && !defined(__KATANA__)
+#include <assert.h>
+#else
+#define assert(a)
 #endif
 
-    while (CanReceiveOnSocket((SOCKET)qrec->hbsock)) {
-        //else we have data
-        error = (int)recvfrom((SOCKET)qrec->hbsock, indata, (INBUF_LEN - 1), 0, (struct sockaddr *)&saddr, &saddrlen);
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-        if (gsiSocketIsNotError(error)) {
-            indata[error] = '\0';
-            parse_query(qrec, indata, (struct sockaddr *)&saddr);
-        }
-    }
-}
+/*****
+TCP_HEARTBEATS
+Define this to use reliable heartbeats. Only needed for certain
+classes of peer-to-peer games, please contact us if you are unsure
+whether you need this or not.
+******/
+//#define TCP_HEARTBEATS
 
-void qr_check_send_heartbeat(qr_t qrec)
+/********
+TYPEDEFS
+********/
+typedef unsigned char uchar;
+
+typedef enum {qtunknown, qtbasic, qtinfo, qtrules, qtplayers, qtstatus, qtpackets, qtecho, qtsecure} query_t;
+
+struct qr_implementation_s
 {
-    unsigned long tc;
+	SOCKET querysock;
+	SOCKET hbsock;
+	char gamename[64];
+	char secret_key[128];
+	qr_querycallback_t qr_basic_callback;
+	qr_querycallback_t qr_info_callback;
+	qr_querycallback_t qr_rules_callback;
+	qr_querycallback_t qr_players_callback;
+	unsigned long lastheartbeat;
+	int queryid;
+	int packetnumber;
+	int qport;
+	char no_query;
+    struct sockaddr_in master_saddr;
+    qr_custom_handler_t qr_custom_handler;
+	void *udata;
+};
 
-    tc = current_time();
 
-    if ((SOCKET)qrec->hbsock != INVALID_SOCKET) {
-        if (tc - qrec->lastheartbeat > MAX_HEARTBEAT_TIME || tc < qrec->lastheartbeat) {
-            send_heartbeat(qrec, 0);
-        } else if (qrec->no_query > 0 && tc - qrec->lastheartbeat > MIN_HEARTBEAT_TIME) {
-            send_heartbeat(qrec, 0);
+/********
+VARS
+********/
+static const char *queries[]={"","basic","info","rules","players","status","packets", "echo", "secure"};
+static struct sockaddr_in hbaddr;
+static struct qr_implementation_s static_rec = {INVALID_SOCKET, INVALID_SOCKET};
+static qr_t current_rec = &static_rec;
+char qr_hostname[64] = MASTER_ADDR;
 
-            qrec->no_query++;
-            if (qrec->no_query > 10) {
-                qrec->no_query = 0;
-            }
-        }
-    }
-}
-
-void qr_send_statechanged(qr_t qrec)
-{
-    if (!qrec) {
-        qrec = current_rec;
-    }
-    send_heartbeat(qrec, 1);
-}
-
-void qr_shutdown(qr_t qrec)
-{
-    if (qrec == NULL) {
-        qrec = current_rec;
-    }
-    if (INVALID_SOCKET != (SOCKET)qrec->hbsock && (SOCKET)qrec->querysock) //if we own the socket
-    {
-        closesocket((SOCKET)qrec->hbsock);
-    }
-    qrec->hbsock        = (void *)INVALID_SOCKET;
-    qrec->lastheartbeat = 0;
-    if (qrec->querysock) //if we own the socket
-    {
-        SocketShutDown();
-    }
-    if (qrec != &static_rec) //need to free it, it was dynamically allocated
-    {
-        free(qrec);
-    }
-}
-
-/* Return a sockaddrin for the given host (numeric or DNS) and port)
-Returns the hostent in savehent if it is not NULL */
-static int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent)
-{
-    struct hostent *hent = NULL;
-
-    saddr->sin_family = AF_INET;
-    saddr->sin_port   = htons((unsigned short)port);
-    if (host == NULL) {
-        saddr->sin_addr.s_addr = INADDR_ANY;
-    } else {
-        saddr->sin_addr.s_addr = inet_addr(host);
-    }
-
-    if (saddr->sin_addr.s_addr == INADDR_NONE && strcmp(host, "255.255.255.255") != 0) {
-        hent = gethostbyname(host);
-        if (!hent) {
-            return 0;
-        }
-        saddr->sin_addr.s_addr = *(unsigned int *)hent->h_addr_list[0];
-    }
-    if (savehent != NULL) {
-        *savehent = hent;
-    }
-    return 1;
-}
-
-/* value_for_key: this returns a value for a certain key in s, where s is a string
-containing key\value pairs. If the key does not exist, it returns  NULL.
-Note: the value is stored in a common buffer. If you want to keep it, make a copy! */
-static char *value_for_key(const char *s, const char *key)
-{
-    static int  valueindex;
-    char       *pos, *pos2;
-    char        keyspec[256] = "\\";
-    static char value[2][256];
-
-    valueindex ^= 1;
-    strcat(keyspec, key);
-    strcat(keyspec, "\\");
-    pos = strstr(s, keyspec);
-    if (!pos) {
-        return NULL;
-    }
-    pos += strlen(keyspec);
-    pos2 = value[valueindex];
-    while (*pos && *pos != '\\') {
-        *pos2++ = *pos++;
-    }
-    *pos2 = '\0';
-    return value[valueindex];
-}
-
-static void packet_send(qr_t qrec, struct sockaddr *addr, char *buffer)
-{
-    char keyvalue[80];
-
-    if (!strlen(buffer)) {
-        return;
-    }
-
-    qrec->packetnumber += 1;
-
-    Com_sprintf(keyvalue, sizeof(keyvalue), "\\queryid\\%d.%d", qrec->queryid, qrec->packetnumber);
-    strcat(buffer, keyvalue);
-
-    sendto((SOCKET)qrec->querysock, buffer, (int)strlen(buffer), 0, addr, sizeof(*addr));
-    *buffer = 0;
-}
-
-static void buffer_send(qr_t qrec, struct sockaddr *sender, char *buffer, char *newdata)
-{
-    int   bcount;
-    int   i;
-    char *lastkey;
-    char *pos;
-
-    bcount = 0;
-    if (strlen(newdata) + strlen(buffer) < MAX_INFO_STRING) {
-        strcat(buffer, newdata);
-        return;
-    }
-
-    pos = newdata;
-    while (strlen(pos) > MAX_INFO_STRING) {
-        lastkey = pos;
-
-        for (i = 0; i < MAX_INFO_STRING; ++i) {
-            if (pos[i] == '\\') {
-                if (!(bcount % 2)) {
-                    lastkey = pos + i;
-                }
-
-                ++bcount;
-            }
-        }
-
-        if (lastkey == pos) {
-            return;
-        }
-
-        *lastkey = 0;
-        buffer_send(qrec, sender, buffer, pos);
-        *lastkey = '\\';
-        pos      = lastkey;
-        bcount   = 0;
-
-        if (strlen(buffer) + strlen(lastkey) < MAX_INFO_STRING) {
-            strcat(buffer, pos);
-            return;
-        }
-    }
-
-    packet_send(qrec, sender, buffer);
-    strcpy(buffer, pos);
-}
-
-static void send_basic(qr_t qrec, struct sockaddr *sender, char *outbuf)
-{
-    char keyvalue[MAX_KEYVALUES_LENGTH] = {0};
-
-    qrec->qr_basic_callback(keyvalue, MAX_KEYVALUES_LENGTH, qrec->udata);
-    buffer_send(qrec, sender, outbuf, keyvalue);
-}
-
-static void send_info(qr_t qrec, struct sockaddr *sender, char *outbuf)
-{
-    char keyvalue[MAX_KEYVALUES_LENGTH] = {0};
-
-    qrec->qr_info_callback(keyvalue, MAX_KEYVALUES_LENGTH, qrec->udata);
-    buffer_send(qrec, sender, outbuf, keyvalue);
-}
-
-static void send_rules(qr_t qrec, struct sockaddr *sender, char *outbuf)
-{
-    char keyvalue[MAX_KEYVALUES_LENGTH] = {0};
-
-    qrec->qr_rules_callback(keyvalue, MAX_KEYVALUES_LENGTH, qrec->udata);
-    buffer_send(qrec, sender, outbuf, keyvalue);
-}
-
-static void send_players(qr_t qrec, struct sockaddr *sender, char *outbuf)
-{
-    char keyvalue[MAX_KEYVALUES_LENGTH] = {0};
-
-    qrec->qr_players_callback(keyvalue, MAX_KEYVALUES_LENGTH, qrec->udata);
-    buffer_send(qrec, sender, outbuf, keyvalue);
-}
-
-static void send_echo(qr_t qrec, struct sockaddr *sender, char *outbuf, const char *echostr)
-{
-    char keyvalue[MAX_KEYVALUES_LENGTH] = {0};
-
-    if (strlen(echostr) > 50) {
-        return;
-    }
-
-    Com_sprintf(keyvalue, sizeof(keyvalue), "\\echoresponse\\%s", echostr);
-    buffer_send(qrec, sender, outbuf, keyvalue);
-}
-
-static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *validation)
-{
-    char  keyvalue[256];
-    uchar encrypted_val[128];
-    uchar encoded_val[200];
-    int   keylen;
-
-    if (*validation) {
-        keylen = (int)strlen(validation);
-
-        if (keylen >= ARRAY_LEN(encrypted_val)) {
-            return;
-        }
-
-        strcpy((char *)encrypted_val, validation);
-
-        gs_encrypt((uchar *)qrec->secret_key, (int)strlen(qrec->secret_key), encrypted_val, keylen);
-        gs_encode(encrypted_val, keylen, encoded_val);
-
-        Com_sprintf(keyvalue, sizeof(keyvalue), "\\validate\\%s", encoded_val);
-        buffer_send(qrec, sender, outbuf, keyvalue);
-    }
-
-    Com_sprintf(keyvalue, sizeof(keyvalue), "\\final\\");
-    buffer_send(qrec, sender, outbuf, keyvalue);
-    packet_send(qrec, sender, outbuf);
-}
-
-static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
-{
-    query_t     querytype                    = qtunknown;
-    char        buffer[MAX_KEYVALUES_LENGTH] = {0};
-    const char *value;
-    char        validation[256] = {0};
-
-    if (!qrec) {
-        qrec = current_rec;
-    }
-
-    if (*query == ';') {
-        // custom handler
-        if (qrec->qr_custom_handler) {
-            qrec->qr_custom_handler(query, sender);
-        }
-        return;
-    }
-
-    qrec->packetnumber = 0;
-    qrec->queryid++;
-
-    if (qrec->no_query > 0) {
-        qrec->no_query = 0;
-    }
-
-    for (querytype = qtbasic; querytype <= qtsecure; ++querytype) {
-        value = value_for_key(query, queries[querytype - 1]);
-        if (value) {
-            switch (querytype) {
-            case qtbasic:
-                send_basic(qrec, sender, buffer);
-                break;
-            case qtinfo:
-                send_info(qrec, sender, buffer);
-                break;
-            case qtrules:
-                send_rules(qrec, sender, buffer);
-                break;
-            case qtplayers:
-                send_players(qrec, sender, buffer);
-                break;
-            case qtstatus:
-                send_basic(qrec, sender, buffer);
-                send_info(qrec, sender, buffer);
-                send_rules(qrec, sender, buffer);
-                send_players(qrec, sender, buffer);
-                break;
-            case qtpackets:
-                send_basic(qrec, sender, buffer);
-                packet_send(qrec, sender, buffer);
-                send_info(qrec, sender, buffer);
-                packet_send(qrec, sender, buffer);
-                send_rules(qrec, sender, buffer);
-                packet_send(qrec, sender, buffer);
-                send_players(qrec, sender, buffer);
-                break;
-            case qtecho:
-                send_echo(qrec, sender, buffer, value);
-                break;
-            case qtsecure:
-                strcpy(validation, value);
-                break;
-            default:
-                continue;
-            }
-        }
-    }
-
-    send_final(qrec, sender, buffer, validation);
-}
-
-static void send_heartbeat(qr_t qrec, int statechanged)
-{
-    char buf[256];
-
-    sprintf(buf, "\\heartbeat\\%d\\gamename\\%s", qrec->qport, qrec->gamename);
-
-    if (statechanged) {
-        sprintf(buf + strlen(buf), "\\statechanged\\%d", statechanged);
-    }
-
-    sendto(
-        (SOCKET)qrec->hbsock,
-        buf,
-        (int)strlen(buf),
-        0,
-        (const struct sockaddr *)&qrec->master_saddr,
-        sizeof(qrec->master_saddr)
-    );
-    qrec->lastheartbeat = current_time();
-}
-
-static int do_connect(void *sock, char *addr, int port, struct sockaddr_in *master_saddr)
-{
-    get_sockaddrin(addr, port, master_saddr, NULL);
-    return 0;
-}
+/********
+PROTOTYPES
+********/
+static void send_heartbeat(qr_t qrec, int statechanged);
+static void parse_query(qr_t qrec, char *query, struct sockaddr *sender);
+static int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent);
+static int do_connect(SOCKET sock, char *addr, int port, struct sockaddr_in *master_saddr);
+void qr_check_queries(qr_t qrec);
+void qr_check_send_heartbeat(qr_t qrec);
 
 void init_qrec(
     qr_t              *qrec,
@@ -433,94 +173,96 @@ void init_qrec(
     void              *userdata
 )
 {
-    qr_t qr;
-
-    if (qrec) {
-        qr    = (qr_t)malloc(sizeof(qr_implementation_t));
-        *qrec = qr;
-    } else {
-        qr = &static_rec;
-    }
-
-    strcpy(qr->gamename, gamename);
-    strcpy(qr->secret_key, secret_key);
-
-    qr->qport               = baseport;
-    qr->hbsock              = (void *)hbsock;
-    qr->querysock           = (void *)querysock;
-    qr->queryid             = 1;
-    qr->no_query            = 1;
-    qr->udata               = userdata;
-    qr->qr_basic_callback   = qr_basic_callback;
-    qr->qr_info_callback    = qr_info_callback;
-    qr->lastheartbeat       = 0;
-    qr->packetnumber        = 0;
-    qr->qr_players_callback = qr_players_callback;
-    qr->qr_rules_callback   = qr_rules_callback;
-    qr->qr_custom_handler   = NULL;
+	if (qrec == NULL)
+	{
+		current_rec = &static_rec;
+	}
+	else
+	{
+		current_rec = (qr_t)gsimalloc(sizeof(struct qr_implementation_s));
+		*qrec = current_rec;
+	}
+	strcpy(current_rec->gamename,gamename);
+	strcpy(current_rec->secret_key,secret_key);
+	current_rec->qport = baseport;
+	current_rec->lastheartbeat = 0;
+	current_rec->hbsock = hbsock;
+	current_rec->querysock = querysock;
+	current_rec->packetnumber = 0;
+	current_rec->queryid = 1;
+	current_rec->no_query = 1;
+	current_rec->udata = userdata;
+	current_rec->qr_basic_callback = qr_basic_callback;
+	current_rec->qr_info_callback = qr_info_callback;
+	current_rec->qr_players_callback = qr_players_callback;
+	current_rec->qr_rules_callback = qr_rules_callback;
+    current_rec->qr_custom_handler = NULL;
 }
 
-#define NUM_PORTS_TO_TRY 100
+/****************************************************************************/
+/* PUBLIC FUNCTIONS */
+/****************************************************************************/
 
-int qr_init(
-    qr_t              *qrec,
-    const char        *ip,
-    int                baseport,
-    const char        *gamename,
-    const char        *secret_key,
-    qr_querycallback_t qr_basic_callback,
-    qr_querycallback_t qr_info_callback,
-    qr_querycallback_t qr_rules_callback,
-    qr_querycallback_t qr_players_callback,
-    void              *userdata
-)
+/* qr_init: Initializes the sockets, etc. Returns an error value
+if an error occured, or 0 otherwise */
+int qr_init(qr_t *qrec, const char *ip, int baseport, const char *gamename, const char *secret_key,
+			qr_querycallback_t qr_basic_callback,
+			qr_querycallback_t qr_info_callback,
+			qr_querycallback_t qr_rules_callback,
+			qr_querycallback_t qr_players_callback,
+			void *userdata)
 {
-    struct sockaddr_in saddr;
-    SOCKET             hbsock;
-    int                maxport;
-    int                lasterror = 0;
+	int lasterror;
+	struct sockaddr_in saddr;
+	int saddrlen;
+	int maxport;
+	SOCKET querysock;
+	SOCKET hbsock;
 
-#if defined(_LINUX)
-    unsigned int saddrlen;
+	if (qrec != NULL) //init it to empty
+		*qrec = NULL;
+	//create our sockets
+	SocketStartUp();
+
+	querysock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+#ifdef TCP_HEARTBEATS
+	hbsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 #else
-    int saddrlen;
+	hbsock = querysock; //share the socket
 #endif
+	if (INVALID_SOCKET == querysock || INVALID_SOCKET == hbsock)
+	{
+		return E_GOA_WSOCKERROR;
+	}
 
-    hbsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (hbsock == INVALID_SOCKET) {
-        return 1;
-    }
+	maxport = baseport + NUM_PORTS_TO_TRY;
+	while (baseport < maxport)
+	{
+		get_sockaddrin(ip,baseport,&saddr,NULL);
+		if (saddr.sin_addr.s_addr == htonl(0x7F000001)) //localhost -- we don't want that!
+			saddr.sin_addr.s_addr = INADDR_ANY;
+		
+		
+		lasterror = bind(querysock, (struct sockaddr *)&saddr, sizeof(saddr));
+		if (lasterror == 0)
+			break; //we found a port
+		baseport++;
+	}
 
-    maxport = baseport + NUM_PORTS_TO_TRY;
-    while (baseport < maxport) {
-        get_sockaddrin(ip, baseport, &saddr, NULL);
-        if (saddr.sin_addr.s_addr == htonl(0x7F000001)) { //localhost -- we don't want that!
-            saddr.sin_addr.s_addr = INADDR_ANY;
-        }
+	if (lasterror != 0) //we weren't able to find a port
+	{
+		return E_GOA_BINDERROR;
+	}
 
-        lasterror = bind(hbsock, (struct sockaddr *)&saddr, sizeof(saddr));
-        if (lasterror == 0) {
-            break; //we found a port
-        }
-        baseport++;
-    }
 
-    if (lasterror != 0) //we weren't able to find a port
-    {
-        return 2;
-    }
-
-    if (baseport == 0) //we bound it dynamically
-    {
-        saddrlen = sizeof(saddr);
-
-        lasterror = getsockname(hbsock, (struct sockaddr *)&saddr, &saddrlen);
-
-        if (lasterror) {
-            return 2;
-        }
-        baseport = ntohs(saddr.sin_port);
-    }
+	if (baseport == 0) //we bound it dynamically
+	{
+		saddrlen = sizeof(saddr);
+		lasterror = getsockname(querysock,(struct sockaddr *)&saddr, &saddrlen);
+		if (lasterror)
+			return E_GOA_BINDERROR;
+		baseport = ntohs(saddr.sin_port);
+	}
 
     init_qrec(
         qrec,
@@ -540,5 +282,498 @@ int qr_init(
         qrec = &current_rec;
     }
 
-    return do_connect((void *)hbsock, MASTER_SERVER_HOST, 27900, &(*qrec)->master_saddr);
+	return do_connect(hbsock, qr_hostname, MASTER_PORT, &(*qrec)->master_saddr);
+
 }
+
+/* qr_process_queries: Processes any waiting queries, and sends a
+heartbeat if 5 minutes have elapsed */
+void qr_process_queries(qr_t qrec)
+{
+	if (qrec == NULL)
+		qrec = current_rec;
+	qr_check_send_heartbeat(qrec);
+	qr_check_queries(qrec);
+}
+
+
+/* qr_process_queries_no_heartbeat: Processes any waiting queries, but
+never sends heartbeats */
+void qr_process_queries_no_heartbeat(qr_t qrec)
+{
+	if (qrec == NULL)
+		qrec = current_rec;
+	qr_check_queries(qrec);
+}
+
+
+
+/* qr_check_queries: Processes any waiting queries */
+void qr_check_queries(qr_t qrec)
+{
+	static char indata[INBUF_LEN]; //256 byte input buffer
+	struct sockaddr_in saddr;
+	int saddrlen = sizeof(struct sockaddr_in);
+	fd_set set; 
+	struct timeval timeout = {0,0};
+	int error;
+
+	if (INVALID_SOCKET == qrec->querysock)
+		return; //no sockets to work with!
+
+	FD_ZERO ( &set );
+	FD_SET ( qrec->querysock, &set );
+
+	while (1)
+	{
+		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+		if (-1 == error || 0 == error)
+			return;
+		//else we have data
+		error = recvfrom(qrec->querysock, indata, INBUF_LEN - 1, 0, (struct sockaddr *)&saddr, &saddrlen);
+		if (error != -1)
+		{
+			indata[error] = '\0';
+			parse_query(qrec, indata, (struct sockaddr *)&saddr);
+		}
+	}
+}
+
+/* check_send_heartbeat: Perform any scheduled outgoing
+heartbeats, (every 5 minutes) */
+void qr_check_send_heartbeat(qr_t qrec)
+{
+	unsigned long tc = current_time();
+
+	if (INVALID_SOCKET == qrec->hbsock)
+		return; //no sockets to work with!
+
+	//check if we need to send a heartbet
+	if (tc - qrec->lastheartbeat > HB_TIME || qrec->lastheartbeat == 0 || tc < qrec->lastheartbeat)
+		send_heartbeat(qrec,0);	
+	else if (qrec->no_query > 0 && tc - qrec->lastheartbeat > FIRST_HB_TIME) 
+	{ //check to see if we haven't gotten a query yet
+		send_heartbeat(qrec, 0);
+		qrec->no_query++;
+		if (qrec->no_query > MAX_FIRST_COUNT)
+			qrec->no_query = 0; //stop trying to get first query
+	}
+}
+
+/* qr_send_statechanged: Sends a statechanged heartbeat, call when
+your gamemode changes */
+void qr_send_statechanged(qr_t qrec)
+{
+	if (qrec == NULL)
+		qrec = current_rec;
+	send_heartbeat(qrec, 1);
+}
+
+/* qr_shutdown: Cleans up the sockets and shuts down */
+void qr_shutdown(qr_t qrec)
+{
+	if (qrec == NULL)
+		qrec = current_rec;
+	if (INVALID_SOCKET != qrec->querysock)
+	{
+		closesocket(qrec->querysock);
+	}
+	if (INVALID_SOCKET != qrec->hbsock && qrec->hbsock != qrec->querysock)
+	{
+		closesocket(qrec->hbsock);
+	}
+	qrec->hbsock = INVALID_SOCKET;
+	qrec->querysock = INVALID_SOCKET;
+	qrec->lastheartbeat = 0;
+	if (qrec != &static_rec) //need to gsifree it, it was dynamically allocated
+	{
+		gsifree(qrec);
+	}
+	SocketShutDown();
+}
+
+/****************************************************************************/
+
+static int do_connect(SOCKET sock, char *addr, int port, struct sockaddr_in *master_saddr)
+{
+#ifdef TCP_HEARTBEATS
+	struct sockaddr_in saddr;
+
+	get_sockaddrin(addr, port,&saddr,NULL);
+
+	if (connect (sock, (struct sockaddr *) &saddr, sizeof(saddr)) == -1)
+	{
+		return E_GOA_CONNERROR;
+	}
+#else
+	get_sockaddrin(addr, port, master_saddr, NULL);
+#endif
+	return 0;  
+}
+
+/* Return a sockaddrin for the given host (numeric or DNS) and port)
+Returns the hostent in savehent if it is not NULL */
+static int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent)
+{
+	struct hostent *hent;
+
+	saddr->sin_family = AF_INET;
+	saddr->sin_port = htons((unsigned short)port);
+	if (host == NULL)
+		saddr->sin_addr.s_addr = INADDR_ANY;
+	else
+		saddr->sin_addr.s_addr = inet_addr(host);
+	
+	if (saddr->sin_addr.s_addr == INADDR_NONE && strcmp(host,"255.255.255.255") != 0)
+	{
+		hent = gethostbyname(host);
+		if (!hent)
+			return 0;
+		saddr->sin_addr.s_addr = *(unsigned int *)hent->h_addr_list[0];
+	}
+	if (savehent != NULL)
+		*savehent = hent;
+	return 1;
+
+} 
+
+
+
+/* value_for_key: this returns a value for a certain key in s, where s is a string
+containing key\value pairs. If the key does not exist, it returns  NULL. 
+Note: the value is stored in a common buffer. If you want to keep it, make a copy! */
+static char *value_for_key(const char *s, const char *key)
+{
+	static int valueindex;
+	char *pos,*pos2;
+	char keyspec[256]="\\";
+	static char value[2][256];
+
+	valueindex ^= 1;
+	strcat(keyspec,key);
+	strcat(keyspec,"\\");
+	pos = strstr(s,keyspec);
+	if (!pos)
+		return NULL;
+	pos += strlen(keyspec);
+	pos2 = value[valueindex];
+	while (*pos && *pos != '\\')
+		*pos2++ = *pos++;
+	*pos2 = '\0';
+	return value[valueindex];
+}
+
+/*****************************************************************************/
+/* Various encryption / encoding routines */
+
+#ifndef _GUTIL
+#define _GUTIL
+static void swap_byte ( uchar *a, uchar *b )
+{
+	uchar swapByte; 
+	
+	swapByte = *a; 
+	*a = *b;      
+	*b = swapByte;
+}
+
+static uchar encode_ct ( uchar c )
+{
+	if (c <  26) return ('A'+c);
+	if (c <  52) return ('a'+c-26);
+	if (c <  62) return ('0'+c-52);
+	if (c == 62) return ('+');
+	if (c == 63) return ('/');
+	
+	return 0;
+}
+
+void gs_encode ( uchar *ins, int size, uchar *result )
+{
+	int    i,pos;
+	uchar  trip[3];
+	uchar  kwart[4];
+	
+	i=0;
+	while (i < size)
+	{
+		for (pos=0 ; pos <= 2 ; pos++, i++)
+			if (i < size) trip[pos] = *ins++;
+			else trip[pos] = '\0';
+			kwart[0] =   (trip[0])       >> 2;
+			kwart[1] = (((trip[0]) &  3) << 4) + ((trip[1]) >> 4);
+			kwart[2] = (((trip[1]) & 15) << 2) + ((trip[2]) >> 6);
+			kwart[3] =   (trip[2]) & 63;
+			for (pos=0; pos <= 3; pos++) *result++ = encode_ct(kwart[pos]);
+	}
+	*result='\0';
+}
+
+void gs_encrypt ( uchar *key, int key_len, uchar *buffer_ptr, int buffer_len )
+{ 
+	short counter;     
+	uchar x, y, xorIndex;
+	uchar state[256];       
+	
+	for ( counter = 0; counter < 256; counter++) state[counter] = (uchar) counter;
+	
+	x = 0; y = 0;
+	for ( counter = 0; counter < 256; counter++)
+	{
+		y = (key[x] + state[counter] + y) % 256;
+		x = (x + 1) % key_len;
+		swap_byte ( &state[counter], &state[y] );
+	}
+	
+	x = 0; y = 0;
+	for ( counter = 0; counter < buffer_len; counter ++)
+	{
+		x = (x + buffer_ptr[counter] + 1) % 256;
+		y = (state[x] + y) % 256;
+		swap_byte ( &state[x], &state[y] );
+		xorIndex = (state[x] + state[y]) % 256;
+		buffer_ptr[counter] ^= state[xorIndex];
+	}
+}
+/*****************************************************************************/
+#endif
+
+/* packet_send: sends a key\value packet. Appends the queryid
+key\value pair. Clears the buffer */
+static void packet_send(qr_t qrec, struct sockaddr *addr, char *buffer)
+{
+	char keyvalue[80];
+	
+	if (strlen(buffer) == 0)
+		return; //dont need to send an empty one!
+	qrec->packetnumber++; //packet numbers start at 1
+	snprintf(keyvalue,sizeof(keyvalue),"\\queryid\\%d.%d",qrec->queryid, qrec->packetnumber);
+	strcat(buffer,keyvalue);
+	sendto(qrec->querysock, buffer, strlen(buffer), 0, addr, sizeof(struct sockaddr_in));
+	buffer[0]='\0';
+}
+
+/* buffer_send: appends buffer with newdata. If the combined
+size would be too large, it flushes buffer first. Space is reserved
+on the total size to allow for the queryid key\value */
+static void buffer_send(qr_t qrec, struct sockaddr *sender, char *buffer, char *newdata)
+{
+	char *pos, *lastkey;
+	int bcount = 0;
+
+	if (strlen(buffer) + strlen(newdata) < MAX_DATA_SIZE - 50)
+	{
+		strcat(buffer, newdata);
+	} else
+	{
+		if (strlen(newdata) > MAX_DATA_SIZE - 50) //incoming data is too big already!
+		{
+			lastkey = pos = newdata;
+			while (pos - newdata < MAX_DATA_SIZE-50)
+			{
+				if ('\\' == *pos)
+				{
+					if (bcount % 2 == 0)
+						lastkey = pos;
+					bcount++;
+				}
+				pos++;
+			}
+			if (lastkey == newdata)
+				return; //endless loop - single key was too big!
+			*lastkey = '\0';
+			buffer_send(qrec,sender, buffer, newdata);
+			*lastkey = '\\';
+			buffer_send(qrec,sender, buffer, lastkey); //send the rest!
+		} else
+		{
+			packet_send(qrec,sender, buffer);
+			strcpy(buffer,newdata);
+		}
+	}
+
+}
+
+/* send_basic: sends a response to the basic query */
+static void send_basic(qr_t qrec, struct sockaddr *sender, char *outbuf)
+{
+	char keyvalue[BUF_SIZE] = "";
+
+	assert(qrec->qr_basic_callback);
+	qrec->qr_basic_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+	buffer_send(qrec,sender, outbuf, keyvalue);
+}
+
+/* send_info: sends a response to the info query */
+static void send_info(qr_t qrec, struct sockaddr *sender, char *outbuf)
+{
+	char keyvalue[BUF_SIZE] = "";
+
+	assert(qrec->qr_info_callback);
+	qrec->qr_info_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+	buffer_send(qrec,sender, outbuf, keyvalue);
+
+}
+
+/* send_rules: sends a response to the rules query. */
+static void send_rules(qr_t qrec, struct sockaddr *sender, char *outbuf)
+{
+	char keyvalue[BUF_SIZE] = "";
+
+	assert(qrec->qr_rules_callback);
+	qrec->qr_rules_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+	buffer_send(qrec,sender, outbuf, keyvalue);
+
+}
+
+/* send_players: sends the players and their information.*/
+static void send_players(qr_t qrec, struct sockaddr *sender, char *outbuf)
+{
+	char keyvalue[BUF_SIZE] = "";
+
+	assert(qrec->qr_players_callback);
+	qrec->qr_players_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+	buffer_send(qrec,sender, outbuf, keyvalue);
+
+}
+
+/* send_echo: bounces the echostr back to sender 
+Note: you should always make sure that your echostr doesn't exceed the MAX_DATA_SIZE*/
+static void send_echo(qr_t qrec, struct sockaddr *sender, char *outbuf,char *echostr)
+{
+	char keyvalue[MAX_DATA_SIZE];
+
+	if (strlen(echostr) > MAX_DATA_SIZE - 50)
+		return;
+	snprintf(keyvalue,sizeof(keyvalue),"\\echo\\%s",echostr);
+	buffer_send(qrec,sender, outbuf, keyvalue);
+
+}
+
+/* send_final: sends the remaining data in outbuf. Appends the final
+key\value to the end. Also adds validation if required. */
+static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf,char *validation)
+{
+	char keyvalue[256];
+	char encrypted_val[128]; //don't need to null terminate
+	char encoded_val[200];
+	int keylen;
+	
+	if (validation[0])
+	{
+		keylen = strlen(validation);
+		if (keylen > 128) return;
+		strcpy(encrypted_val, validation);
+		gs_encrypt((uchar *)qrec->secret_key, strlen(qrec->secret_key), (uchar *)encrypted_val, keylen);
+		gs_encode((uchar *)encrypted_val,keylen, (uchar *)encoded_val);
+		snprintf(keyvalue,sizeof(keyvalue),"\\validate\\%s",encoded_val);
+		buffer_send(qrec,sender, outbuf, keyvalue);
+	}
+	
+	snprintf(keyvalue,sizeof(keyvalue),"\\final\\");
+	buffer_send(qrec,sender, outbuf, keyvalue);
+	packet_send(qrec,sender, outbuf);
+}
+
+
+/* parse_query: parse an incoming query (which may contain 1 or more
+individual queries) and reply to each query */
+static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
+{
+	query_t querytype;
+	char buffer[MAX_DATA_SIZE]="";
+	char *value;
+	char validation[256] = "";
+
+    if (qrec == NULL) {
+        qrec = current_rec;
+    }
+
+    if (*query == ';') {
+        // custom handler
+        if (qrec->qr_custom_handler) {
+            qrec->qr_custom_handler(query, sender);
+        }
+        return;
+    }
+
+	qrec->queryid++;
+	qrec->packetnumber = 0;
+	if (qrec->no_query > 0)
+		qrec->no_query = 0;
+
+	for (querytype = qtbasic; querytype <= qtsecure ; querytype++)
+	{
+		if ((value = value_for_key(query, queries[querytype])))
+			switch (querytype)
+			{
+				case qtbasic:
+					send_basic(qrec,sender,buffer);
+					break;
+				case qtinfo:
+					send_info(qrec,sender,buffer);
+					break;
+				case qtrules:
+					send_rules(qrec,sender,buffer);
+					break;
+				case qtplayers:
+					send_players(qrec,sender,buffer);
+					break;
+				case qtstatus:
+					send_basic(qrec,sender,buffer);
+					send_info(qrec,sender,buffer);
+					send_rules(qrec,sender,buffer);
+					send_players(qrec,sender,buffer);
+					break;
+				case qtpackets:
+				/*note: "packets" is NOT a real query type. It is simply here to illustrate
+					how a large query would look if broken into packets */
+					send_basic(qrec,sender,buffer); packet_send(qrec,sender, buffer);
+					send_info(qrec,sender,buffer); packet_send(qrec,sender, buffer);
+					send_rules(qrec,sender,buffer); packet_send(qrec,sender, buffer);
+					send_players(qrec,sender,buffer);
+					break;
+				case qtecho:
+					//note: \echo\value is the syntax here
+					send_echo(qrec,sender,buffer,value);
+					break;
+				case qtsecure:
+					strcpy(validation, value);
+					break;
+				case qtunknown:
+					break;
+
+			}
+	}
+	send_final(qrec,sender,buffer,validation);
+}
+
+/* send_heartbeat: Sends a heartbeat to the gamemaster,
+adds \statechanged\ if statechanged != 0 */
+static void send_heartbeat(qr_t qrec, int statechanged)
+{
+	char buf[256];
+	int ret;
+	
+	snprintf(buf,sizeof(buf),"\\heartbeat\\%d\\gamename\\%s",qrec->qport, qrec->gamename);
+	if (statechanged)
+		strcat(buf,"\\statechanged\\");
+#ifdef TCP_HEARTBEATS
+	ret = send(qrec->hbsock, buf, strlen(buf), 0);
+	if (ret < 0) /* try to reconnect (tcp only) */
+	{
+		closesocket(qrec->hbsock);
+		qrec->hbsock = socket(AF_INET, SOCK_STREAM, IPPROTO_UDP);
+		if (do_connect(qrec->hbsock, qr_hostname, MASTER_PORT) == 0)
+			send(qrec->hbsock, buf, strlen(buf), 0); /* try again */
+	}
+#else
+	ret = sendto(qrec->hbsock, buf, strlen(buf), 0, (const struct sockaddr *)&qrec->master_saddr, sizeof(struct sockaddr_in));
+#endif
+
+	qrec->lastheartbeat = current_time();
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index d433cf74..308bff03 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -20,47 +20,180 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+/******
+gqueryreporting.h
+GameSpy Query & Reporting SDK 
+  
+Copyright 2000 GameSpy Industries, Inc
+
+18002 Skypark Circle
+Irvine, CA 92614
+(949)798-4200
+Fax(949)798-4299
+******
+
+ Please see the GameSpy Query & Reporting SDK documentation for more 
+ information
+
+******/
+
 #pragma once
 
-#include "common/gsPlatformSocket.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#define MAX_KEYVALUES_LENGTH 1400
+/********
+ERROR CONSTANTS
+---------------
+These constants are returned from qr_init to signal an error condition
+***************/
 
-static const unsigned int MIN_HEARTBEAT_TIME = 30000;  // wait at least 30 seconds before new heartbeat can be sent
-static const unsigned int MAX_HEARTBEAT_TIME = 300000; // 5 minutes
+#define E_GOA_WSOCKERROR	1
+#define E_GOA_BINDERROR		2
+#define E_GOA_DNSERROR		3
+#define E_GOA_CONNERROR		4
+/*********
+NUM_PORTS_TO_TRY
+----------------
+This value is the maximum number of ports that will be scanned to
+find an open query port, starting from the value passed to qr_init
+as the base port. Generally there is no reason to modify this value.
+***********/
+#define NUM_PORTS_TO_TRY 100
 
-typedef void (*qr_querycallback_t)(char *outbuf, int maxlen, void *userdata);
+/* The hostname of the master server.
+If the app resolves the hostname, an
+IP can be stored here before calling
+qr_init */
+extern char qr_hostname[64];
+
+/********
+qr_querycallback_t
+-------------------
+This is the prototype for the callback functions your game needs to
+implement for each of the four basic query types. The callback works the
+same for each query type. 
+
+[outbuf] is a pre-allocated buffer for you to place the query reply. It's size is
+[maxlen] (default is 1400). If you need larger, you can adjust the 
+	defines in gqueryreporting.c
+[userdata] is the pointer that was passed into qr_init. You can use this for an
+	object or structure pointer if needed.
+
+Simply fill outbuf with the correct data for the query type (consult the sample
+apps and the GameSpy Developer Spec). 
+outbuf should be a NULL terminated ANSI string.
+********/
+typedef void (*qr_querycallback_t)(char *outbuf, int maxlen, void *userdata);	
 typedef void (*qr_custom_handler_t)(const char *query, struct sockaddr *sender);
 
-typedef enum query_e {
-    qtunknown,
-    qtbasic,
-    qtinfo,
-    qtrules,
-    qtplayers,
-    qtstatus,
-    qtpackets,
-    qtecho,
-    qtsecure
-} query_t;
+/***********
+qr_t
+----
+This abstract type is used to instantiate multiple instances of the
+Query & Reporting SDK (for example, if you are running multiple servers
+in the same process).
+For most games, you can ignore this value and pass NULL in to all functions
+that require it. A single global instance will be used, similar to how the
+original Developer SDK worked
+************/
+typedef struct qr_implementation_s *qr_t;
 
-typedef struct qr_implementation_s {
-    void               *querysock;
-    void               *hbsock;
-    char                gamename[64];
-    char                secret_key[128];
-    qr_querycallback_t  qr_basic_callback;
-    qr_querycallback_t  qr_info_callback;
-    qr_querycallback_t  qr_rules_callback;
-    qr_querycallback_t  qr_players_callback;
-    long unsigned int   lastheartbeat;
-    int                 queryid;
-    int                 packetnumber;
-    int                 qport;
-    char                no_query;
-    struct sockaddr_in  master_saddr;
-    qr_custom_handler_t qr_custom_handler;
-    void               *udata;
-} qr_implementation_t, *qr_t;
 
+/************
+QR_INIT
+--------
+This creates/binds the sockets needed for heartbeats and queries/replies.
+[qrec] if not null, will be filled with the qr_t instance for this server.
+	If you are not using more than one instance of the Query & Reporting SDK you
+	can pass in NULL for this value.
+[ip] is an optional parameter that determines which dotted IP address to bind to on
+	a multi-homed machine. You can pass NULL to bind to all IP addresses.
+[baseport] is the port to accept queries on. If baseport is not available, the
+	Query and Reporting SDK will scan for an available port in the range of 
+	baseport -> baseport + NUM_PORTS_TO_TRY
+	Optionally, you can pass in 0 to have a port chosen automatically
+	(makes it harder for debugging/testing).
+[gamename] is the unique gamename that you were given
+[secretkey] is your unique secret key
+[qr_*_callback] are your data callback functions, this cannot be NULL
+[userdata] is an optional, implementation specific parameter that will be
+	passed to all callback functions. Use it to store an object or structure
+	pointer if needed.
+
+Returns
+0 is successful, otherwise one of the E_GOA constants above.
+************/
+int qr_init(/*[out]*/qr_t *qrec, const char *ip, int baseport, const char *gamename, const char *secret_key,
+			qr_querycallback_t qr_basic_callback,
+			qr_querycallback_t qr_info_callback,
+			qr_querycallback_t qr_rules_callback,
+			qr_querycallback_t qr_players_callback,
+			void *userdata);
+
+
+/*******************
+QR_PROCESS_QUERIES
+-------------------
+This function should be called somewhere in your main program loop to
+process any pending server queries and send a heartbeat if 5 minutes has
+elapsed.
+
+Query replies are very latency sensative, so you should make sure this
+function is called at least every 100ms while your game is in progress.
+The function has very low overhead and should not cause any performance
+problems.
+Unless you are using multiple instances of the SDK, you should pass NULl
+for qrec.
+The no_heartbeat version will not send any heartbeats to the master - use
+this if you only want to advertise your server on the LAN.
+********************/
+void qr_process_queries(qr_t qrec);
+void qr_process_queries_no_heartbeat(qr_t qrec);
+
+/*****************
+QR_SEND_STATECHANGED
+--------------------
+This function forces a \statechanged\ heartbeat to be sent immediately.
+Use it any time you have changed the gamestate of your game to signal the
+master to update your status.
+Also use it before your game exits by changing the gamestate to "exiting"
+and sending a statechanged heartbeat. This will insure that your game
+is removed from the list promptly.
+Unless you are using multiple instances of the SDK, you should pass NULl
+for qrec.
+*******************/
+void qr_send_statechanged(qr_t qrec);
+
+/*****************
+QR_SHUTDOWN
+------------
+This function closes the sockets created in qr_init and takes care of
+any misc. cleanup. You should try to call it when before exiting the server
+if qr_init was called.
+If you pass in a qrec that was returned from qr_init, all resources associated
+with that qrec will be freed. If you passed NULL into qr_int, you can pass
+NULL in here as well.
+******************/
+void qr_shutdown(qr_t qrec);
+
+void qr_check_queries(qr_t qrec);
+
+/********
+DEFINES
+********/
+#define MASTER_PORT 27900
+#define MASTER_ADDR MASTER_SERVER_HOST
+#define FIRST_HB_TIME 30000 /* 30 sec */
+#define HB_TIME 300000 /* 5 minutes */
+#define MAX_FIRST_COUNT 10 /* 10 tries = 5 minutes */
+#define MAX_DATA_SIZE 1400
+#define INBUF_LEN 256
+#define BUF_SIZE 1400
 #define MASTER_SERVER_HOST "master.333networks.com"
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 2c4f5d8b..c2ffbbd7 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -267,7 +267,7 @@ void SV_MasterHeartbeat( void ) {
 
 	if (svs.time >= svs.nextHeartbeatTime)
 	{
-		svs.nextHeartbeatTime = svs.time + MAX_HEARTBEAT_TIME;
+		svs.nextHeartbeatTime = svs.time + HB_TIME;
 		SV_GamespyHeartbeat();
 	}
 }

From 127c9fe8f4fda31cf7b562b006876e4939caa590 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 00:31:39 +0200
Subject: [PATCH 2028/2040] Uncomment WSACleanup()

The previous issue was because gqueryreporting was not calling SocketStartUp() as expected
---
 code/gamespy/common/gsPlatformUtil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/gamespy/common/gsPlatformUtil.c b/code/gamespy/common/gsPlatformUtil.c
index c341e94a..69c81e0c 100644
--- a/code/gamespy/common/gsPlatformUtil.c
+++ b/code/gamespy/common/gsPlatformUtil.c
@@ -439,7 +439,7 @@ void SocketStartUp()
 void SocketShutDown()
 {
 #if defined(_WIN32)
-//	WSACleanup();
+	WSACleanup();
 	#if defined(_X360)
 		XNetCleanup();
 	#endif

From b597240cfda8190997dc893205ef770630ada52f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 00:47:09 +0200
Subject: [PATCH 2029/2040] Link gcd_key to gcd_qr2

This is primarily used for clarity
---
 code/gamespy/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/gamespy/CMakeLists.txt b/code/gamespy/CMakeLists.txt
index c867bfaa..db690703 100644
--- a/code/gamespy/CMakeLists.txt
+++ b/code/gamespy/CMakeLists.txt
@@ -102,4 +102,5 @@ foreach(LIB ${DEPENDENT_LIBS})
 	target_link_libraries(${LIB} PUBLIC gcd_common)
 endforeach()
 
+target_link_libraries(gcd_key PRIVATE gcd_qr2)
 target_link_libraries(gcd_qr2 PRIVATE gcd_natneg)

From fedc993e5735abd1165e963ab7dcc7103bb17790 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 00:59:22 +0200
Subject: [PATCH 2030/2040] Initialize the player buffer list

---
 code/gamespy/sv_gamespy.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 8a53dd24..0dbce869 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -225,6 +225,8 @@ static void players_callback(char *outbuf, int maxlen, void *userdata)
     int            index;
     char           infostring[128];
 
+    outbuf[0] = 0;
+
     if (!svs.clients) {
         return;
     }

From 01367d0731ee31a3df343460635b416766b22fce Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 01:19:48 +0200
Subject: [PATCH 2031/2040] Use a more recent version of the gqueryreporting
 code

---
 code/gamespy/sv_gqueryreporting.c | 1022 +++++++++++++++--------------
 code/gamespy/sv_gqueryreporting.h |   68 +-
 2 files changed, 586 insertions(+), 504 deletions(-)

diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 985918ce..3d549504 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 /******
-gqueryreporting.h
+.c
 GameSpy Query & Reporting SDK 
   
 Copyright 2000 GameSpy Industries, Inc
@@ -84,15 +84,14 @@ Fax(949)798-4299
 INCLUDES
 ********/
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__) && !defined(__mips64)
-	#include "::nonport.h"
+#include "::nonport.h"
 #else
-	#include "nonport.h"
+#include "nonport.h"
 #endif
 #include "sv_gqueryreporting.h"
 #include <stdlib.h>
 #include <stdio.h>
 
-
 #include <string.h>
 #if !defined(UNDER_CE) && !defined(__KATANA__)
 #include <assert.h>
@@ -116,88 +115,78 @@ whether you need this or not.
 TYPEDEFS
 ********/
 typedef unsigned char uchar;
+#if defined(_LINUX) || defined(__linux__)
+typedef unsigned int qrsocklen_t;
+#else
+typedef int qrsocklen_t;
+#endif
 
-typedef enum {qtunknown, qtbasic, qtinfo, qtrules, qtplayers, qtstatus, qtpackets, qtecho, qtsecure} query_t;
-
-struct qr_implementation_s
+typedef enum
 {
-	SOCKET querysock;
-	SOCKET hbsock;
-	char gamename[64];
-	char secret_key[128];
-	qr_querycallback_t qr_basic_callback;
-	qr_querycallback_t qr_info_callback;
-	qr_querycallback_t qr_rules_callback;
-	qr_querycallback_t qr_players_callback;
-	unsigned long lastheartbeat;
-	int queryid;
-	int packetnumber;
-	int qport;
-	char no_query;
-    struct sockaddr_in master_saddr;
-    qr_custom_handler_t qr_custom_handler;
-	void *udata;
-};
+    qtunknown,
+    qtbasic,
+    qtinfo,
+    qtrules,
+    qtplayers,
+    qtstatus,
+    qtpackets,
+    qtecho,
+    qtsecure
+} query_t;
 
+typedef struct qr_implementation_s
+{
+    SOCKET querysock;
+    SOCKET hbsock;
+    char gamename[64];
+    char secret_key[128];
+    qr_querycallback_t qr_basic_callback;
+    qr_querycallback_t qr_info_callback;
+    qr_querycallback_t qr_rules_callback;
+    qr_querycallback_t qr_players_callback;
+    unsigned long lastheartbeat;
+    int queryid;
+    int packetnumber;
+    int qport;
+    char no_query;
+    struct sockaddr_in hbaddr;
+    qr_cdkey_process_t cdkeyprocess;
+    void* udata;
+}* qr_t;
 
 /********
 VARS
 ********/
-static const char *queries[]={"","basic","info","rules","players","status","packets", "echo", "secure"};
+static const char* queries[] = {"", "basic", "info", "rules", "players", "status", "packets", "echo", "secure"};
 static struct sockaddr_in hbaddr;
-static struct qr_implementation_s static_rec = {INVALID_SOCKET, INVALID_SOCKET};
+struct qr_implementation_s static_rec = {INVALID_SOCKET, INVALID_SOCKET};
 static qr_t current_rec = &static_rec;
 char qr_hostname[64] = MASTER_ADDR;
 
+static struct sockaddr_in MasterList[8];
+static char keyvalue[8192];
+static int MasterCount;
+
 /********
 PROTOTYPES
 ********/
 static void send_heartbeat(qr_t qrec, int statechanged);
-static void parse_query(qr_t qrec, char *query, struct sockaddr *sender);
-static int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent);
-static int do_connect(SOCKET sock, char *addr, int port, struct sockaddr_in *master_saddr);
+static void qr_parse_query(qr_t qrec, char* query, int len, struct sockaddr* sender);
+static int do_connect(SOCKET sock, char* addr, int port, struct sockaddr_in* hbaddr);
 void qr_check_queries(qr_t qrec);
 void qr_check_send_heartbeat(qr_t qrec);
 
-void init_qrec(
-    qr_t              *qrec,
-    int                baseport,
-    SOCKET             hbsock,
-    SOCKET             querysock,
-    const char        *gamename,
-    const char        *secret_key,
-    qr_querycallback_t qr_basic_callback,
-    qr_querycallback_t qr_info_callback,
-    qr_querycallback_t qr_rules_callback,
-    qr_querycallback_t qr_players_callback,
-    void              *userdata
-)
-{
-	if (qrec == NULL)
-	{
-		current_rec = &static_rec;
-	}
-	else
-	{
-		current_rec = (qr_t)gsimalloc(sizeof(struct qr_implementation_s));
-		*qrec = current_rec;
-	}
-	strcpy(current_rec->gamename,gamename);
-	strcpy(current_rec->secret_key,secret_key);
-	current_rec->qport = baseport;
-	current_rec->lastheartbeat = 0;
-	current_rec->hbsock = hbsock;
-	current_rec->querysock = querysock;
-	current_rec->packetnumber = 0;
-	current_rec->queryid = 1;
-	current_rec->no_query = 1;
-	current_rec->udata = userdata;
-	current_rec->qr_basic_callback = qr_basic_callback;
-	current_rec->qr_info_callback = qr_info_callback;
-	current_rec->qr_players_callback = qr_players_callback;
-	current_rec->qr_rules_callback = qr_rules_callback;
-    current_rec->qr_custom_handler = NULL;
-}
+static void init_qrec(qr_t* qrec,
+                      int baseport,
+                      SOCKET hbsock,
+                      SOCKET querysock,
+                      const char* gamename,
+                      const char* secret_key,
+                      qr_querycallback_t qr_basic_callback,
+                      qr_querycallback_t qr_info_callback,
+                      qr_querycallback_t qr_rules_callback,
+                      qr_querycallback_t qr_players_callback,
+                      void* userdata);
 
 /****************************************************************************/
 /* PUBLIC FUNCTIONS */
@@ -205,262 +194,331 @@ void init_qrec(
 
 /* qr_init: Initializes the sockets, etc. Returns an error value
 if an error occured, or 0 otherwise */
-int qr_init(qr_t *qrec, const char *ip, int baseport, const char *gamename, const char *secret_key,
-			qr_querycallback_t qr_basic_callback,
-			qr_querycallback_t qr_info_callback,
-			qr_querycallback_t qr_rules_callback,
-			qr_querycallback_t qr_players_callback,
-			void *userdata)
+int qr_init(qr_t* qrec,
+            const char* ip,
+            int baseport,
+            const char* gamename,
+            const char* secret_key,
+            qr_querycallback_t qr_basic_callback,
+            qr_querycallback_t qr_info_callback,
+            qr_querycallback_t qr_rules_callback,
+            qr_querycallback_t qr_players_callback,
+            void* userdata)
 {
-	int lasterror;
-	struct sockaddr_in saddr;
-	int saddrlen;
-	int maxport;
-	SOCKET querysock;
-	SOCKET hbsock;
+    int lasterror;
+    struct sockaddr_in saddr;
+    qrsocklen_t saddrlen;
+    int maxport;
+    SOCKET querysock;
+    SOCKET hbsock;
 
-	if (qrec != NULL) //init it to empty
-		*qrec = NULL;
-	//create our sockets
-	SocketStartUp();
+    if (qrec != NULL) //init it to empty
+        *qrec = NULL;
+    //create our sockets
+    SocketStartUp();
 
-	querysock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    querysock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 #ifdef TCP_HEARTBEATS
-	hbsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    hbsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 #else
-	hbsock = querysock; //share the socket
+    hbsock = querysock; //share the socket
 #endif
-	if (INVALID_SOCKET == querysock || INVALID_SOCKET == hbsock)
-	{
-		return E_GOA_WSOCKERROR;
-	}
+    if (INVALID_SOCKET == querysock || INVALID_SOCKET == hbsock) {
+        return E_GOA_WSOCKERROR;
+    }
 
-	maxport = baseport + NUM_PORTS_TO_TRY;
-	while (baseport < maxport)
-	{
-		get_sockaddrin(ip,baseport,&saddr,NULL);
-		if (saddr.sin_addr.s_addr == htonl(0x7F000001)) //localhost -- we don't want that!
-			saddr.sin_addr.s_addr = INADDR_ANY;
-		
-		
-		lasterror = bind(querysock, (struct sockaddr *)&saddr, sizeof(saddr));
-		if (lasterror == 0)
-			break; //we found a port
-		baseport++;
-	}
+    lasterror = 0;
+    maxport = baseport + NUM_PORTS_TO_TRY;
+    while (baseport < maxport) {
+        get_sockaddrin(ip, baseport, &saddr, NULL);
+        if (saddr.sin_addr.s_addr == htonl(0x7F000001)) //localhost -- we don't want that!
+            saddr.sin_addr.s_addr = INADDR_ANY;
 
-	if (lasterror != 0) //we weren't able to find a port
-	{
-		return E_GOA_BINDERROR;
-	}
+        lasterror = bind(querysock, (struct sockaddr*)&saddr, sizeof(saddr));
+        if (lasterror == 0)
+            break; //we found a port
+        baseport++;
+    }
 
+    if (lasterror != 0) //we weren't able to find a port
+    {
+        return E_GOA_BINDERROR;
+    }
 
-	if (baseport == 0) //we bound it dynamically
-	{
-		saddrlen = sizeof(saddr);
-		lasterror = getsockname(querysock,(struct sockaddr *)&saddr, &saddrlen);
-		if (lasterror)
-			return E_GOA_BINDERROR;
-		baseport = ntohs(saddr.sin_port);
-	}
+    if (baseport == 0) //we bound it dynamically
+    {
+        saddrlen = sizeof(saddr);
+        lasterror = getsockname(querysock, (struct sockaddr*)&saddr, &saddrlen);
+        if (lasterror)
+            return E_GOA_BINDERROR;
+        baseport = ntohs(saddr.sin_port);
+    }
 
-    init_qrec(
-        qrec,
-        baseport,
-        hbsock,
-        hbsock,
-        gamename,
-        secret_key,
-        qr_basic_callback,
-        qr_info_callback,
-        qr_rules_callback,
-        qr_players_callback,
-        userdata
-    );
+    init_qrec(qrec,
+              baseport,
+              hbsock,
+              querysock,
+              gamename,
+              secret_key,
+              qr_basic_callback,
+              qr_info_callback,
+              qr_rules_callback,
+              qr_players_callback,
+              userdata);
 
     if (!qrec) {
         qrec = &current_rec;
     }
 
-	return do_connect(hbsock, qr_hostname, MASTER_PORT, &(*qrec)->master_saddr);
+    return do_connect(hbsock, MASTER_ADDR, MASTER_PORT, &(*qrec)->hbaddr);
+}
 
+void init_qrec(qr_t* qrec,
+               int qport,
+               SOCKET hbsock,
+               SOCKET querysock,
+               const char* gamename,
+               const char* secret_key,
+               qr_querycallback_t qr_basic_callback,
+               qr_querycallback_t qr_info_callback,
+               qr_querycallback_t qr_rules_callback,
+               qr_querycallback_t qr_players_callback,
+               void* userdata)
+{
+    qr_t cr;
+
+    if (qrec == NULL) {
+        cr = &static_rec;
+    } else {
+        *qrec = (qr_t)malloc(sizeof(struct qr_implementation_s));
+        cr = *qrec;
+    }
+
+    strcpy(cr->gamename, gamename);
+    strcpy(cr->secret_key, secret_key);
+
+    cr->qport = qport;
+    cr->lastheartbeat = 0;
+    cr->hbsock = hbsock;
+    cr->querysock = querysock;
+    cr->packetnumber = 0;
+    cr->queryid = 1;
+    cr->no_query = 1;
+    cr->udata = userdata;
+    cr->qr_basic_callback = qr_basic_callback;
+    cr->qr_info_callback = qr_info_callback;
+    cr->qr_players_callback = qr_players_callback;
+    cr->qr_rules_callback = qr_rules_callback;
+    cr->cdkeyprocess = NULL;
+}
+
+int qr_init_socket(qr_t* qrec,
+                   unsigned int s,
+                   const char* gamename,
+                   const char* secret_key,
+                   qr_querycallback_t qr_basic_callback,
+                   qr_querycallback_t qr_info_callback,
+                   qr_querycallback_t qr_rules_callback,
+                   qr_querycallback_t qr_players_callback,
+                   void* userdata)
+{
+    if (qrec) {
+        *qrec = NULL;
+    }
+
+    SocketStartUp();
+    init_qrec(qrec,
+              0,
+              s,
+              s,
+              gamename,
+              secret_key,
+              qr_basic_callback,
+              qr_info_callback,
+              qr_rules_callback,
+              qr_players_callback,
+              userdata);
+
+    return do_connect(s, MASTER_ADDR, MASTER_PORT, &(*qrec)->hbaddr);
 }
 
 /* qr_process_queries: Processes any waiting queries, and sends a
 heartbeat if 5 minutes have elapsed */
 void qr_process_queries(qr_t qrec)
 {
-	if (qrec == NULL)
-		qrec = current_rec;
-	qr_check_send_heartbeat(qrec);
-	qr_check_queries(qrec);
+    if (qrec == NULL)
+        qrec = current_rec;
+    qr_check_send_heartbeat(qrec);
+    qr_check_queries(qrec);
 }
 
-
 /* qr_process_queries_no_heartbeat: Processes any waiting queries, but
 never sends heartbeats */
 void qr_process_queries_no_heartbeat(qr_t qrec)
 {
-	if (qrec == NULL)
-		qrec = current_rec;
-	qr_check_queries(qrec);
+    if (qrec == NULL)
+        qrec = current_rec;
+    qr_check_queries(qrec);
 }
 
-
-
 /* qr_check_queries: Processes any waiting queries */
 void qr_check_queries(qr_t qrec)
 {
-	static char indata[INBUF_LEN]; //256 byte input buffer
-	struct sockaddr_in saddr;
-	int saddrlen = sizeof(struct sockaddr_in);
-	fd_set set; 
-	struct timeval timeout = {0,0};
-	int error;
+    static char indata[INBUF_LEN]; //256 byte input buffer
+    struct sockaddr_in saddr;
+    qrsocklen_t saddrlen = sizeof(struct sockaddr_in);
+    fd_set set;
+    struct timeval timeout = {0, 0};
+    int error;
 
-	if (INVALID_SOCKET == qrec->querysock)
-		return; //no sockets to work with!
+    if (0 == qrec->qport)
+        return;
 
-	FD_ZERO ( &set );
-	FD_SET ( qrec->querysock, &set );
+    FD_ZERO(&set);
+    FD_SET(qrec->querysock, &set);
 
-	while (1)
-	{
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (-1 == error || 0 == error)
-			return;
-		//else we have data
-		error = recvfrom(qrec->querysock, indata, INBUF_LEN - 1, 0, (struct sockaddr *)&saddr, &saddrlen);
-		if (error != -1)
-		{
-			indata[error] = '\0';
-			parse_query(qrec, indata, (struct sockaddr *)&saddr);
-		}
-	}
+    while (1) {
+        error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+        if (gsiSocketIsError(error) || error == 0)
+            return;
+        //else we have data
+        error = recvfrom(qrec->querysock, indata, INBUF_LEN - 1, 0, (struct sockaddr*)&saddr, &saddrlen);
+        if (gsiSocketIsNotError(error)) {
+            indata[error] = '\0';
+            qr_parse_query(qrec, indata, error, (struct sockaddr*)&saddr);
+        }
+    }
 }
 
 /* check_send_heartbeat: Perform any scheduled outgoing
 heartbeats, (every 5 minutes) */
 void qr_check_send_heartbeat(qr_t qrec)
 {
-	unsigned long tc = current_time();
+    unsigned long tc = current_time();
 
-	if (INVALID_SOCKET == qrec->hbsock)
-		return; //no sockets to work with!
+    if (INVALID_SOCKET == qrec->hbsock)
+        return; //no sockets to work with!
 
-	//check if we need to send a heartbet
-	if (tc - qrec->lastheartbeat > HB_TIME || qrec->lastheartbeat == 0 || tc < qrec->lastheartbeat)
-		send_heartbeat(qrec,0);	
-	else if (qrec->no_query > 0 && tc - qrec->lastheartbeat > FIRST_HB_TIME) 
-	{ //check to see if we haven't gotten a query yet
-		send_heartbeat(qrec, 0);
-		qrec->no_query++;
-		if (qrec->no_query > MAX_FIRST_COUNT)
-			qrec->no_query = 0; //stop trying to get first query
-	}
+    //check if we need to send a heartbet
+    if (tc - qrec->lastheartbeat > HB_TIME || qrec->lastheartbeat == 0 || tc < qrec->lastheartbeat)
+        send_heartbeat(qrec, 0);
+    else if (qrec->no_query > 0
+             && tc - qrec->lastheartbeat > FIRST_HB_TIME) { //check to see if we haven't gotten a query yet
+        send_heartbeat(qrec, 0);
+        qrec->no_query++;
+        if (qrec->no_query > MAX_FIRST_COUNT)
+            qrec->no_query = 0; //stop trying to get first query
+    }
 }
 
 /* qr_send_statechanged: Sends a statechanged heartbeat, call when
 your gamemode changes */
 void qr_send_statechanged(qr_t qrec)
 {
-	if (qrec == NULL)
-		qrec = current_rec;
-	send_heartbeat(qrec, 1);
+    if (qrec == NULL)
+        qrec = current_rec;
+    send_heartbeat(qrec, 1);
+}
+
+void qr_send_exiting(qr_t qrec)
+{
+    if (qrec == NULL)
+        qrec = current_rec;
+    send_heartbeat(qrec, 2);
 }
 
 /* qr_shutdown: Cleans up the sockets and shuts down */
 void qr_shutdown(qr_t qrec)
 {
-	if (qrec == NULL)
-		qrec = current_rec;
-	if (INVALID_SOCKET != qrec->querysock)
-	{
-		closesocket(qrec->querysock);
-	}
-	if (INVALID_SOCKET != qrec->hbsock && qrec->hbsock != qrec->querysock)
-	{
-		closesocket(qrec->hbsock);
-	}
-	qrec->hbsock = INVALID_SOCKET;
-	qrec->querysock = INVALID_SOCKET;
-	qrec->lastheartbeat = 0;
-	if (qrec != &static_rec) //need to gsifree it, it was dynamically allocated
-	{
-		gsifree(qrec);
-	}
-	SocketShutDown();
+    if (qrec == NULL)
+        qrec = current_rec;
+    if (INVALID_SOCKET != qrec->querysock && qrec->qport != 0) {
+        closesocket(qrec->querysock);
+    }
+    if (INVALID_SOCKET != qrec->hbsock && qrec->hbsock != qrec->querysock) {
+        closesocket(qrec->hbsock);
+    }
+    qrec->hbsock = INVALID_SOCKET;
+    qrec->querysock = INVALID_SOCKET;
+    qrec->lastheartbeat = 0;
+    if (qrec != &static_rec) //need to gsifree it, it was dynamically allocated
+    {
+        gsifree(qrec);
+    }
+    SocketShutDown();
 }
 
 /****************************************************************************/
 
-static int do_connect(SOCKET sock, char *addr, int port, struct sockaddr_in *master_saddr)
+static int do_connect(SOCKET sock, char* addr, int port, struct sockaddr_in* hbaddr)
 {
 #ifdef TCP_HEARTBEATS
-	struct sockaddr_in saddr;
+    struct sockaddr_in saddr;
 
-	get_sockaddrin(addr, port,&saddr,NULL);
+    get_sockaddrin(addr, port, &saddr, NULL);
 
-	if (connect (sock, (struct sockaddr *) &saddr, sizeof(saddr)) == -1)
-	{
-		return E_GOA_CONNERROR;
-	}
+    if (connect(sock, (struct sockaddr*)&saddr, sizeof(saddr)) == SOCKET_ERROR) {
+        return E_GOA_CONNERROR;
+    }
+
+    add_master(&saddr);
 #else
-	get_sockaddrin(addr, port, master_saddr, NULL);
+    get_sockaddrin(addr, port, hbaddr, NULL);
+    add_master(hbaddr);
 #endif
-	return 0;  
+    return 0;
 }
 
 /* Return a sockaddrin for the given host (numeric or DNS) and port)
 Returns the hostent in savehent if it is not NULL */
-static int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent)
+int get_sockaddrin(const char* host, int port, struct sockaddr_in* saddr, struct hostent** savehent)
 {
-	struct hostent *hent;
-
-	saddr->sin_family = AF_INET;
-	saddr->sin_port = htons((unsigned short)port);
-	if (host == NULL)
-		saddr->sin_addr.s_addr = INADDR_ANY;
-	else
-		saddr->sin_addr.s_addr = inet_addr(host);
-	
-	if (saddr->sin_addr.s_addr == INADDR_NONE && strcmp(host,"255.255.255.255") != 0)
-	{
-		hent = gethostbyname(host);
-		if (!hent)
-			return 0;
-		saddr->sin_addr.s_addr = *(unsigned int *)hent->h_addr_list[0];
-	}
-	if (savehent != NULL)
-		*savehent = hent;
-	return 1;
-
-} 
+    struct hostent* hent;
+    char broadcast_t[] = {
+        '2', '5', '5', '.', '2', '5', '5', '.', '2', '5', '5', '.', '2', '5', '5', '\0'}; //255.255.255.255
+    hent = 0;
 
+    memset(saddr, 0, sizeof(struct sockaddr_in));
+    saddr->sin_family = AF_INET;
+    saddr->sin_port = htons((unsigned short)port);
+    if (host == NULL)
+        saddr->sin_addr.s_addr = INADDR_ANY;
+    else
+        saddr->sin_addr.s_addr = inet_addr(host);
 
+    if (saddr->sin_addr.s_addr == INADDR_NONE && strcmp(host, broadcast_t) != 0) {
+        hent = gethostbyname(host);
+        if (!hent)
+            return 0;
+        saddr->sin_addr.s_addr = *(u_long*)hent->h_addr_list[0];
+    }
+    if (savehent != NULL)
+        *savehent = hent;
+    return 1;
+}
 
 /* value_for_key: this returns a value for a certain key in s, where s is a string
 containing key\value pairs. If the key does not exist, it returns  NULL. 
 Note: the value is stored in a common buffer. If you want to keep it, make a copy! */
-static char *value_for_key(const char *s, const char *key)
+static char* value_for_key(const char* s, const char* key)
 {
-	static int valueindex;
-	char *pos,*pos2;
-	char keyspec[256]="\\";
-	static char value[2][256];
+    static int valueindex;
+    char *pos, *pos2;
+    char keyspec[256] = "\\";
+    static char value[2][256];
 
-	valueindex ^= 1;
-	strcat(keyspec,key);
-	strcat(keyspec,"\\");
-	pos = strstr(s,keyspec);
-	if (!pos)
-		return NULL;
-	pos += strlen(keyspec);
-	pos2 = value[valueindex];
-	while (*pos && *pos != '\\')
-		*pos2++ = *pos++;
-	*pos2 = '\0';
-	return value[valueindex];
+    valueindex ^= 1;
+    strcat(keyspec, key);
+    strcat(keyspec, "\\");
+    pos = strstr(s, keyspec);
+    if (!pos)
+        return NULL;
+    pos += strlen(keyspec);
+    pos2 = value[valueindex];
+    while (*pos && *pos != '\\')
+        *pos2++ = *pos++;
+    *pos2 = '\0';
+    return value[valueindex];
 }
 
 /*****************************************************************************/
@@ -468,310 +526,322 @@ static char *value_for_key(const char *s, const char *key)
 
 #ifndef _GUTIL
 #define _GUTIL
-static void swap_byte ( uchar *a, uchar *b )
+static void swap_byte(uchar* a, uchar* b)
 {
-	uchar swapByte; 
-	
-	swapByte = *a; 
-	*a = *b;      
-	*b = swapByte;
+    uchar swapByte;
+
+    swapByte = *a;
+    *a = *b;
+    *b = swapByte;
 }
 
-static uchar encode_ct ( uchar c )
+static uchar encode_ct(uchar c)
 {
-	if (c <  26) return ('A'+c);
-	if (c <  52) return ('a'+c-26);
-	if (c <  62) return ('0'+c-52);
-	if (c == 62) return ('+');
-	if (c == 63) return ('/');
-	
-	return 0;
+    if (c < 26)
+        return ('A' + c);
+    if (c < 52)
+        return ('a' + c - 26);
+    if (c < 62)
+        return ('0' + c - 52);
+    if (c == 62)
+        return ('+');
+    if (c == 63)
+        return ('/');
+
+    return 0;
 }
 
-void gs_encode ( uchar *ins, int size, uchar *result )
+void gs_encode(uchar* ins, int size, uchar* result)
 {
-	int    i,pos;
-	uchar  trip[3];
-	uchar  kwart[4];
-	
-	i=0;
-	while (i < size)
-	{
-		for (pos=0 ; pos <= 2 ; pos++, i++)
-			if (i < size) trip[pos] = *ins++;
-			else trip[pos] = '\0';
-			kwart[0] =   (trip[0])       >> 2;
-			kwart[1] = (((trip[0]) &  3) << 4) + ((trip[1]) >> 4);
-			kwart[2] = (((trip[1]) & 15) << 2) + ((trip[2]) >> 6);
-			kwart[3] =   (trip[2]) & 63;
-			for (pos=0; pos <= 3; pos++) *result++ = encode_ct(kwart[pos]);
-	}
-	*result='\0';
+    int i, pos;
+    uchar trip[3];
+    uchar kwart[4];
+
+    i = 0;
+    while (i < size) {
+        for (pos = 0; pos <= 2; pos++, i++)
+            if (i < size)
+                trip[pos] = *ins++;
+            else
+                trip[pos] = '\0';
+        kwart[0] = (trip[0]) >> 2;
+        kwart[1] = (((trip[0]) & 3) << 4) + ((trip[1]) >> 4);
+        kwart[2] = (((trip[1]) & 15) << 2) + ((trip[2]) >> 6);
+        kwart[3] = (trip[2]) & 63;
+        for (pos = 0; pos <= 3; pos++)
+            *result++ = encode_ct(kwart[pos]);
+    }
+    *result = '\0';
 }
 
-void gs_encrypt ( uchar *key, int key_len, uchar *buffer_ptr, int buffer_len )
-{ 
-	short counter;     
-	uchar x, y, xorIndex;
-	uchar state[256];       
-	
-	for ( counter = 0; counter < 256; counter++) state[counter] = (uchar) counter;
-	
-	x = 0; y = 0;
-	for ( counter = 0; counter < 256; counter++)
-	{
-		y = (key[x] + state[counter] + y) % 256;
-		x = (x + 1) % key_len;
-		swap_byte ( &state[counter], &state[y] );
-	}
-	
-	x = 0; y = 0;
-	for ( counter = 0; counter < buffer_len; counter ++)
-	{
-		x = (x + buffer_ptr[counter] + 1) % 256;
-		y = (state[x] + y) % 256;
-		swap_byte ( &state[x], &state[y] );
-		xorIndex = (state[x] + state[y]) % 256;
-		buffer_ptr[counter] ^= state[xorIndex];
-	}
+void gs_encrypt(uchar* key, int key_len, uchar* buffer_ptr, int buffer_len)
+{
+    short counter;
+    uchar x, y, xorIndex;
+    uchar state[256];
+
+    for (counter = 0; counter < 256; counter++)
+        state[counter] = (uchar)counter;
+
+    x = 0;
+    y = 0;
+    for (counter = 0; counter < 256; counter++) {
+        y = (key[x] + state[counter] + y) % 256;
+        x = (x + 1) % key_len;
+        swap_byte(&state[counter], &state[y]);
+    }
+
+    x = 0;
+    y = 0;
+    for (counter = 0; counter < buffer_len; counter++) {
+        x = (x + buffer_ptr[counter] + 1) % 256;
+        y = (state[x] + y) % 256;
+        swap_byte(&state[x], &state[y]);
+        xorIndex = (state[x] + state[y]) % 256;
+        buffer_ptr[counter] ^= state[xorIndex];
+    }
 }
 /*****************************************************************************/
 #endif
 
 /* packet_send: sends a key\value packet. Appends the queryid
 key\value pair. Clears the buffer */
-static void packet_send(qr_t qrec, struct sockaddr *addr, char *buffer)
+static void packet_send(qr_t qrec, struct sockaddr* addr, char* buffer)
 {
-	char keyvalue[80];
-	
-	if (strlen(buffer) == 0)
-		return; //dont need to send an empty one!
-	qrec->packetnumber++; //packet numbers start at 1
-	snprintf(keyvalue,sizeof(keyvalue),"\\queryid\\%d.%d",qrec->queryid, qrec->packetnumber);
-	strcat(buffer,keyvalue);
-	sendto(qrec->querysock, buffer, strlen(buffer), 0, addr, sizeof(struct sockaddr_in));
-	buffer[0]='\0';
+    char keyvalue[80];
+
+    if (strlen(buffer) == 0)
+        return;           //dont need to send an empty one!
+    qrec->packetnumber++; //packet numbers start at 1
+    snprintf(keyvalue, sizeof(keyvalue), "\\queryid\\%d.%d", qrec->queryid, qrec->packetnumber);
+    strcat(buffer, keyvalue);
+    sendto(qrec->querysock, buffer, (int)strlen(buffer), 0, addr, sizeof(struct sockaddr_in));
+    buffer[0] = '\0';
 }
 
 /* buffer_send: appends buffer with newdata. If the combined
 size would be too large, it flushes buffer first. Space is reserved
 on the total size to allow for the queryid key\value */
-static void buffer_send(qr_t qrec, struct sockaddr *sender, char *buffer, char *newdata)
+static void buffer_send(qr_t qrec, struct sockaddr* sender, char* buffer, char* newdata)
 {
-	char *pos, *lastkey;
-	int bcount = 0;
-
-	if (strlen(buffer) + strlen(newdata) < MAX_DATA_SIZE - 50)
-	{
-		strcat(buffer, newdata);
-	} else
-	{
-		if (strlen(newdata) > MAX_DATA_SIZE - 50) //incoming data is too big already!
-		{
-			lastkey = pos = newdata;
-			while (pos - newdata < MAX_DATA_SIZE-50)
-			{
-				if ('\\' == *pos)
-				{
-					if (bcount % 2 == 0)
-						lastkey = pos;
-					bcount++;
-				}
-				pos++;
-			}
-			if (lastkey == newdata)
-				return; //endless loop - single key was too big!
-			*lastkey = '\0';
-			buffer_send(qrec,sender, buffer, newdata);
-			*lastkey = '\\';
-			buffer_send(qrec,sender, buffer, lastkey); //send the rest!
-		} else
-		{
-			packet_send(qrec,sender, buffer);
-			strcpy(buffer,newdata);
-		}
-	}
+    char *pos, *lastkey;
+    int bcount = 0;
 
+    if (strlen(buffer) + strlen(newdata) < MAX_DATA_SIZE - 50) {
+        strcat(buffer, newdata);
+    } else {
+        if (strlen(newdata) > MAX_DATA_SIZE - 50) //incoming data is too big already!
+        {
+            lastkey = pos = newdata;
+            while (pos - newdata < MAX_DATA_SIZE - 50) {
+                if ('\\' == *pos) {
+                    if (bcount % 2 == 0)
+                        lastkey = pos;
+                    bcount++;
+                }
+                pos++;
+            }
+            if (lastkey == newdata)
+                return; //endless loop - single key was too big!
+            *lastkey = '\0';
+            buffer_send(qrec, sender, buffer, newdata);
+            *lastkey = '\\';
+            buffer_send(qrec, sender, buffer, lastkey); //send the rest!
+        } else {
+            packet_send(qrec, sender, buffer);
+            strcpy(buffer, newdata);
+        }
+    }
 }
 
 /* send_basic: sends a response to the basic query */
-static void send_basic(qr_t qrec, struct sockaddr *sender, char *outbuf)
+static void send_basic(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-	char keyvalue[BUF_SIZE] = "";
+    char keyvalue[BUF_SIZE] = "";
 
-	assert(qrec->qr_basic_callback);
-	qrec->qr_basic_callback(keyvalue, sizeof(keyvalue), qrec->udata);
-	buffer_send(qrec,sender, outbuf, keyvalue);
+    assert(qrec->qr_basic_callback);
+    qrec->qr_basic_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+    buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
 /* send_info: sends a response to the info query */
-static void send_info(qr_t qrec, struct sockaddr *sender, char *outbuf)
+static void send_info(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-	char keyvalue[BUF_SIZE] = "";
-
-	assert(qrec->qr_info_callback);
-	qrec->qr_info_callback(keyvalue, sizeof(keyvalue), qrec->udata);
-	buffer_send(qrec,sender, outbuf, keyvalue);
+    char keyvalue[BUF_SIZE] = "";
 
+    assert(qrec->qr_info_callback);
+    qrec->qr_info_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+    buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
 /* send_rules: sends a response to the rules query. */
-static void send_rules(qr_t qrec, struct sockaddr *sender, char *outbuf)
+static void send_rules(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-	char keyvalue[BUF_SIZE] = "";
-
-	assert(qrec->qr_rules_callback);
-	qrec->qr_rules_callback(keyvalue, sizeof(keyvalue), qrec->udata);
-	buffer_send(qrec,sender, outbuf, keyvalue);
+    char keyvalue[BUF_SIZE] = "";
 
+    assert(qrec->qr_rules_callback);
+    qrec->qr_rules_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+    buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
 /* send_players: sends the players and their information.*/
-static void send_players(qr_t qrec, struct sockaddr *sender, char *outbuf)
+static void send_players(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-	char keyvalue[BUF_SIZE] = "";
-
-	assert(qrec->qr_players_callback);
-	qrec->qr_players_callback(keyvalue, sizeof(keyvalue), qrec->udata);
-	buffer_send(qrec,sender, outbuf, keyvalue);
-
+    assert(qrec->qr_players_callback);
+    qrec->qr_players_callback(keyvalue, sizeof(keyvalue), qrec->udata);
+    buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
 /* send_echo: bounces the echostr back to sender 
 Note: you should always make sure that your echostr doesn't exceed the MAX_DATA_SIZE*/
-static void send_echo(qr_t qrec, struct sockaddr *sender, char *outbuf,char *echostr)
+static void send_echo(qr_t qrec, struct sockaddr* sender, char* outbuf, char* echostr)
 {
-	char keyvalue[MAX_DATA_SIZE];
-
-	if (strlen(echostr) > MAX_DATA_SIZE - 50)
-		return;
-	snprintf(keyvalue,sizeof(keyvalue),"\\echo\\%s",echostr);
-	buffer_send(qrec,sender, outbuf, keyvalue);
+    char keyvalue[MAX_DATA_SIZE];
 
+    if (strlen(echostr) > MAX_DATA_SIZE - 50)
+        return;
+    snprintf(keyvalue, sizeof(keyvalue), "\\echo\\%s", echostr);
+    buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
 /* send_final: sends the remaining data in outbuf. Appends the final
 key\value to the end. Also adds validation if required. */
-static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf,char *validation)
+static void send_final(qr_t qrec, struct sockaddr* sender, char* outbuf, char* validation)
 {
-	char keyvalue[256];
-	char encrypted_val[128]; //don't need to null terminate
-	char encoded_val[200];
-	int keylen;
-	
-	if (validation[0])
-	{
-		keylen = strlen(validation);
-		if (keylen > 128) return;
-		strcpy(encrypted_val, validation);
-		gs_encrypt((uchar *)qrec->secret_key, strlen(qrec->secret_key), (uchar *)encrypted_val, keylen);
-		gs_encode((uchar *)encrypted_val,keylen, (uchar *)encoded_val);
-		snprintf(keyvalue,sizeof(keyvalue),"\\validate\\%s",encoded_val);
-		buffer_send(qrec,sender, outbuf, keyvalue);
-	}
-	
-	snprintf(keyvalue,sizeof(keyvalue),"\\final\\");
-	buffer_send(qrec,sender, outbuf, keyvalue);
-	packet_send(qrec,sender, outbuf);
-}
+    char keyvalue[256];
+    char encrypted_val[128]; //don't need to null terminate
+    char encoded_val[200];
+    int keylen;
 
+    if (validation[0]) {
+        keylen = (int)strlen(validation);
+        if (keylen > 128)
+            return;
+        strcpy(encrypted_val, validation);
+        gs_encrypt((uchar*)qrec->secret_key, (int)strlen(qrec->secret_key), (uchar*)encrypted_val, keylen);
+        gs_encode((uchar*)encrypted_val, keylen, (uchar*)encoded_val);
+        snprintf(keyvalue, sizeof(keyvalue), "\\validate\\%s", encoded_val);
+        buffer_send(qrec, sender, outbuf, keyvalue);
+    }
+
+    snprintf(keyvalue, sizeof(keyvalue), "\\final\\");
+    buffer_send(qrec, sender, outbuf, keyvalue);
+    packet_send(qrec, sender, outbuf);
+}
 
 /* parse_query: parse an incoming query (which may contain 1 or more
 individual queries) and reply to each query */
-static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
+static void qr_parse_query(qr_t qrec, char* query, int len, struct sockaddr* sender)
 {
-	query_t querytype;
-	char buffer[MAX_DATA_SIZE]="";
-	char *value;
-	char validation[256] = "";
+    int querytype;
+    char buffer[MAX_DATA_SIZE] = "";
+    char* value;
+    char validation[256] = "";
 
-    if (qrec == NULL) {
+    if (qrec == NULL)
         qrec = current_rec;
-    }
-
-    if (*query == ';') {
-        // custom handler
-        if (qrec->qr_custom_handler) {
-            qrec->qr_custom_handler(query, sender);
+    if (query[0] == 0x3B) /* a cdkey query */
+    {
+        if (qrec->cdkeyprocess != NULL) {
+            qrec->cdkeyprocess(query, len, sender);
         }
         return;
     }
 
-	qrec->queryid++;
-	qrec->packetnumber = 0;
-	if (qrec->no_query > 0)
-		qrec->no_query = 0;
+    qrec->queryid++;
+    qrec->packetnumber = 0;
+    if (qrec->no_query > 0)
+        qrec->no_query = 0;
 
-	for (querytype = qtbasic; querytype <= qtsecure ; querytype++)
-	{
-		if ((value = value_for_key(query, queries[querytype])))
-			switch (querytype)
-			{
-				case qtbasic:
-					send_basic(qrec,sender,buffer);
-					break;
-				case qtinfo:
-					send_info(qrec,sender,buffer);
-					break;
-				case qtrules:
-					send_rules(qrec,sender,buffer);
-					break;
-				case qtplayers:
-					send_players(qrec,sender,buffer);
-					break;
-				case qtstatus:
-					send_basic(qrec,sender,buffer);
-					send_info(qrec,sender,buffer);
-					send_rules(qrec,sender,buffer);
-					send_players(qrec,sender,buffer);
-					break;
-				case qtpackets:
-				/*note: "packets" is NOT a real query type. It is simply here to illustrate
-					how a large query would look if broken into packets */
-					send_basic(qrec,sender,buffer); packet_send(qrec,sender, buffer);
-					send_info(qrec,sender,buffer); packet_send(qrec,sender, buffer);
-					send_rules(qrec,sender,buffer); packet_send(qrec,sender, buffer);
-					send_players(qrec,sender,buffer);
-					break;
-				case qtecho:
-					//note: \echo\value is the syntax here
-					send_echo(qrec,sender,buffer,value);
-					break;
-				case qtsecure:
-					strcpy(validation, value);
-					break;
-				case qtunknown:
-					break;
+    for (querytype = qtbasic; querytype <= qtsecure; querytype++) {
+        if ((value = value_for_key(query, queries[querytype])))
+            switch (querytype) {
+            case qtbasic:
+                send_basic(qrec, sender, buffer);
+                break;
+            case qtinfo:
+                send_info(qrec, sender, buffer);
+                break;
+            case qtrules:
+                send_rules(qrec, sender, buffer);
+                break;
+            case qtplayers:
+                send_players(qrec, sender, buffer);
+                break;
+            case qtstatus:
+                send_basic(qrec, sender, buffer);
+                send_info(qrec, sender, buffer);
+                send_rules(qrec, sender, buffer);
+                send_players(qrec, sender, buffer);
+                break;
+            case qtpackets:
+                /*note: "packets" is NOT a real query type. It is simply here to illustrate how a large query would look if broken into packets */
+                send_basic(qrec, sender, buffer);
+                packet_send(qrec, sender, buffer);
+                send_info(qrec, sender, buffer);
+                packet_send(qrec, sender, buffer);
+                send_rules(qrec, sender, buffer);
+                packet_send(qrec, sender, buffer);
+                send_players(qrec, sender, buffer);
+                break;
+            case qtecho:
+                //note: \echo\value is the syntax here
+                send_echo(qrec, sender, buffer, value);
+                break;
+            case qtsecure:
+                strcpy(validation, value);
+                break;
+            case qtunknown:
+                break;
+            }
+    }
+    send_final(qrec, sender, buffer, validation);
+}
 
-			}
-	}
-	send_final(qrec,sender,buffer,validation);
+int get_master_count()
+{
+    return MasterCount;
+}
+
+void clear_master_list()
+{
+    memset(MasterList, 0, sizeof(MasterList));
+    MasterCount = 0;
+}
+
+void add_master(struct sockaddr_in* addr)
+{
+    int i;
+    for (i = 0; i < MasterCount; i++) {
+        if (memcmp(addr, &MasterList[i], sizeof(MasterList[i])) == 0) {
+            return;
+        }
+    }
+    if (i == 8) {
+        return;
+    } else {
+        MasterList[i] = *addr;
+        MasterCount++;
+    }
 }
 
 /* send_heartbeat: Sends a heartbeat to the gamemaster,
 adds \statechanged\ if statechanged != 0 */
 static void send_heartbeat(qr_t qrec, int statechanged)
 {
-	char buf[256];
-	int ret;
-	
-	snprintf(buf,sizeof(buf),"\\heartbeat\\%d\\gamename\\%s",qrec->qport, qrec->gamename);
-	if (statechanged)
-		strcat(buf,"\\statechanged\\");
-#ifdef TCP_HEARTBEATS
-	ret = send(qrec->hbsock, buf, strlen(buf), 0);
-	if (ret < 0) /* try to reconnect (tcp only) */
-	{
-		closesocket(qrec->hbsock);
-		qrec->hbsock = socket(AF_INET, SOCK_STREAM, IPPROTO_UDP);
-		if (do_connect(qrec->hbsock, qr_hostname, MASTER_PORT) == 0)
-			send(qrec->hbsock, buf, strlen(buf), 0); /* try again */
-	}
-#else
-	ret = sendto(qrec->hbsock, buf, strlen(buf), 0, (const struct sockaddr *)&qrec->master_saddr, sizeof(struct sockaddr_in));
-#endif
+    char buf[256];
+    int ret;
+    int i;
 
-	qrec->lastheartbeat = current_time();
+    snprintf(buf, sizeof(buf), "\\heartbeat\\%d\\gamename\\%s", qrec->qport, qrec->gamename);
+    if (statechanged)
+        snprintf(&buf[strlen(buf)], sizeof(buf) - strlen(buf), "\\statechanged\\");
+
+    for (i = 0; i < MasterCount; i++) {
+        ret = sendto(qrec->hbsock, buf, (int)strlen(buf), 0, (struct sockaddr*)&MasterList[i], sizeof(MasterList[i]));
+    }
+
+    qrec->lastheartbeat = current_time();
 }
 
 #ifdef __cplusplus
diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index 308bff03..5a016b73 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -49,10 +49,10 @@ ERROR CONSTANTS
 These constants are returned from qr_init to signal an error condition
 ***************/
 
-#define E_GOA_WSOCKERROR	1
-#define E_GOA_BINDERROR		2
-#define E_GOA_DNSERROR		3
-#define E_GOA_CONNERROR		4
+#define E_GOA_WSOCKERROR 1
+#define E_GOA_BINDERROR  2
+#define E_GOA_DNSERROR   3
+#define E_GOA_CONNERROR  4
 /*********
 NUM_PORTS_TO_TRY
 ----------------
@@ -62,6 +62,20 @@ as the base port. Generally there is no reason to modify this value.
 ***********/
 #define NUM_PORTS_TO_TRY 100
 
+/********
+DEFINES
+********/
+#define MASTER_SERVER_HOST "master.333networks.com"
+#define MASTER_PORT     27900
+//#define MASTER_ADDR     "master." GSI_DOMAIN_NAME
+#define MASTER_ADDR     MASTER_SERVER_HOST
+#define FIRST_HB_TIME   30000  /* 30 sec */
+#define HB_TIME         300000 /* 5 minutes */
+#define MAX_FIRST_COUNT 10     /* 10 tries = 5 minutes */
+#define MAX_DATA_SIZE   1400
+#define INBUF_LEN       256
+#define BUF_SIZE        1400
+
 /* The hostname of the master server.
 If the app resolves the hostname, an
 IP can be stored here before calling
@@ -85,8 +99,9 @@ Simply fill outbuf with the correct data for the query type (consult the sample
 apps and the GameSpy Developer Spec). 
 outbuf should be a NULL terminated ANSI string.
 ********/
-typedef void (*qr_querycallback_t)(char *outbuf, int maxlen, void *userdata);	
-typedef void (*qr_custom_handler_t)(const char *query, struct sockaddr *sender);
+typedef void (*qr_querycallback_t)(char* outbuf, int maxlen, void* userdata);
+
+typedef void (*qr_cdkey_process_t)(char* buf, int len, struct sockaddr* fromaddr);
 
 /***********
 qr_t
@@ -99,8 +114,6 @@ that require it. A single global instance will be used, similar to how the
 original Developer SDK worked
 ************/
 typedef struct qr_implementation_s *qr_t;
-
-
 /************
 QR_INIT
 --------
@@ -125,13 +138,16 @@ This creates/binds the sockets needed for heartbeats and queries/replies.
 Returns
 0 is successful, otherwise one of the E_GOA constants above.
 ************/
-int qr_init(/*[out]*/qr_t *qrec, const char *ip, int baseport, const char *gamename, const char *secret_key,
-			qr_querycallback_t qr_basic_callback,
-			qr_querycallback_t qr_info_callback,
-			qr_querycallback_t qr_rules_callback,
-			qr_querycallback_t qr_players_callback,
-			void *userdata);
-
+int qr_init(/*[out]*/ qr_t* qrec,
+            const char* ip,
+            int baseport,
+            const char* gamename,
+            const char* secret_key,
+            qr_querycallback_t qr_basic_callback,
+            qr_querycallback_t qr_info_callback,
+            qr_querycallback_t qr_rules_callback,
+            qr_querycallback_t qr_players_callback,
+            void* userdata);
 
 /*******************
 QR_PROCESS_QUERIES
@@ -180,20 +196,16 @@ void qr_shutdown(qr_t qrec);
 
 void qr_check_queries(qr_t qrec);
 
-/********
-DEFINES
-********/
-#define MASTER_PORT 27900
-#define MASTER_ADDR MASTER_SERVER_HOST
-#define FIRST_HB_TIME 30000 /* 30 sec */
-#define HB_TIME 300000 /* 5 minutes */
-#define MAX_FIRST_COUNT 10 /* 10 tries = 5 minutes */
-#define MAX_DATA_SIZE 1400
-#define INBUF_LEN 256
-#define BUF_SIZE 1400
-#define MASTER_SERVER_HOST "master.333networks.com"
+void qr_send_exiting(qr_t qrec);
+
+int get_master_count();
+
+void clear_master_list();
+
+int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent);
+
+void add_master(struct sockaddr_in *addr);
 
 #ifdef __cplusplus
 }
 #endif
-

From a2bbf6cff8a94e8ec9c36ad83dfedb0a36f10b0a Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 21:40:34 +0200
Subject: [PATCH 2032/2040] Use functions that return master host information

This splits gamespy client-specific and server-specific code and add common gamespy code to provide more flexibility in the future
---
 code/client/CMakeLists.txt        |  5 ++++
 code/gamespy/cl_gamespy.c         | 36 ++++++++++++++++++++++++++++
 code/gamespy/cl_gamespy.h         | 25 +++++++++++++++++++
 code/gamespy/gserverlist.c        | 12 ++++++++--
 code/gamespy/q_gamespy.c          | 40 +++++++++++++++++++++++++++++++
 code/gamespy/q_gamespy.h          | 29 ++++++++++++++++++++++
 code/gamespy/sv_gamespy.c         | 11 +++++++++
 code/gamespy/sv_gamespy.h         |  2 ++
 code/gamespy/sv_gqueryreporting.c |  2 +-
 code/gamespy/sv_gqueryreporting.h | 13 +++++++---
 code/qcommon/CMakeLists.txt       |  3 +--
 code/server/CMakeLists.txt        |  6 +++++
 12 files changed, 176 insertions(+), 8 deletions(-)
 create mode 100644 code/gamespy/cl_gamespy.c
 create mode 100644 code/gamespy/cl_gamespy.h
 create mode 100644 code/gamespy/q_gamespy.c
 create mode 100644 code/gamespy/q_gamespy.h

diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index b641351c..259e055b 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -7,6 +7,11 @@ add_subdirectory("../cgame" "./cgame")
 file(GLOB SOURCES_CLIENT "./*.c*")
 file(GLOB_RECURSE SOURCES_UILIB "../uilib/*.c*")
 
+set(SOURCES_CLIENT ${SOURCES_CLIENT}
+	# Gamespy
+	"${CMAKE_SOURCE_DIR}/code/gamespy/cl_gamespy.c"
+)
+
 # Made as an interface and not static, as static only links used methods
 add_library(omohclient INTERFACE)
 target_compile_definitions(omohclient INTERFACE APP_MODULE)
diff --git a/code/gamespy/cl_gamespy.c b/code/gamespy/cl_gamespy.c
new file mode 100644
index 00000000..898f5a19
--- /dev/null
+++ b/code/gamespy/cl_gamespy.c
@@ -0,0 +1,36 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "cl_gamespy.h"
+#include "q_gamespy.h"
+
+const char *ServerListGetHost()
+{
+    return Com_GetMasterHost();
+}
+
+int ServerListGetMsPort()
+{
+    return Com_GetMasterQueryPort();
+}
diff --git a/code/gamespy/cl_gamespy.h b/code/gamespy/cl_gamespy.h
new file mode 100644
index 00000000..3032cd72
--- /dev/null
+++ b/code/gamespy/cl_gamespy.h
@@ -0,0 +1,25 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// cl_gamespy.h -- Game-specific client GameSpy code
+
+#pragma once
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index e77cbcd3..4015fb9c 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -48,8 +48,16 @@ Fax(714)549-0757
 // Added in 2.0
 #include "gcrypt.h"
 
-#define MSHOST MASTER_SERVER_HOST
-#define MSPORT	28900
+/**
+ * @brief Custom function used to return the master host, based on game settings
+ * 
+ * @return const char* The master host
+ */
+extern const char *ServerListGetHost();
+extern int ServerGetMsPort();
+
+#define MSHOST ServerListGetHost()
+#define MSPORT ServerListGetMsPort()
 #define SERVER_GROWBY 64
 #define LAN_SEARCH_TIME 3000 //3 sec
 #define LIST_NUMKEYBUCKETS 500
diff --git a/code/gamespy/q_gamespy.c b/code/gamespy/q_gamespy.c
new file mode 100644
index 00000000..853d476c
--- /dev/null
+++ b/code/gamespy/q_gamespy.c
@@ -0,0 +1,40 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "q_gamespy.h"
+
+const char *Com_GetMasterHost()
+{
+    return "master.333networks.com";
+}
+
+int Com_GetMasterQueryPort()
+{
+    return 28900;
+}
+
+int Com_GetMasterHeartbeatPort()
+{
+    return 27900;
+}
diff --git a/code/gamespy/q_gamespy.h b/code/gamespy/q_gamespy.h
new file mode 100644
index 00000000..f002cd0e
--- /dev/null
+++ b/code/gamespy/q_gamespy.h
@@ -0,0 +1,29 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// q_gamespy.h -- Common game-specific GameSpy code shared between client and server
+
+#pragma once
+
+const char *Com_GetMasterHost();
+int Com_GetMasterQueryPort();
+int Com_GetMasterHeartbeatPort();
diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 0dbce869..334f6bf9 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_version.h"
 #include "sv_gqueryreporting.h"
 #include "sv_gamespy.h"
+#include "q_gamespy.h"
 
 #include "gcdkey/gcdkeys.h"
 #include "common/gsCommon.h"
@@ -501,3 +502,13 @@ void SV_GamespyAuthorize(netadr_t from, const char *response)
         break;
     }
 }
+
+const char *qr_get_master_host()
+{
+    return Com_GetMasterHost();
+}
+
+int qr_get_master_port()
+{
+    return Com_GetMasterHeartbeatPort();
+}
diff --git a/code/gamespy/sv_gamespy.h b/code/gamespy/sv_gamespy.h
index ff524699..dc033679 100644
--- a/code/gamespy/sv_gamespy.h
+++ b/code/gamespy/sv_gamespy.h
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+// sv_gamespy.h -- Game-specific server GameSpy code
+
 #pragma once
 
 #ifdef __cplusplus
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 3d549504..44fd0efd 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -161,7 +161,7 @@ static const char* queries[] = {"", "basic", "info", "rules", "players", "status
 static struct sockaddr_in hbaddr;
 struct qr_implementation_s static_rec = {INVALID_SOCKET, INVALID_SOCKET};
 static qr_t current_rec = &static_rec;
-char qr_hostname[64] = MASTER_ADDR;
+//char qr_hostname[64] = MASTER_ADDR;
 
 static struct sockaddr_in MasterList[8];
 static char keyvalue[8192];
diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index 5a016b73..e41fbeab 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -65,10 +65,9 @@ as the base port. Generally there is no reason to modify this value.
 /********
 DEFINES
 ********/
-#define MASTER_SERVER_HOST "master.333networks.com"
-#define MASTER_PORT     27900
+#define MASTER_PORT     qr_get_master_port()
 //#define MASTER_ADDR     "master." GSI_DOMAIN_NAME
-#define MASTER_ADDR     MASTER_SERVER_HOST
+#define MASTER_ADDR     qr_get_master_host()
 #define FIRST_HB_TIME   30000  /* 30 sec */
 #define HB_TIME         300000 /* 5 minutes */
 #define MAX_FIRST_COUNT 10     /* 10 tries = 5 minutes */
@@ -82,6 +81,14 @@ IP can be stored here before calling
 qr_init */
 extern char qr_hostname[64];
 
+/**
+ * @brief Custom function used to return the master host, based on game settings
+ * 
+ * @return const char* The full master server address
+ */
+extern const char *qr_get_master_host();
+extern int qr_get_master_port();
+
 /********
 qr_querycallback_t
 -------------------
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index bde54547..cefb08d1 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -79,8 +79,7 @@ set(SOURCES_COMMON
 	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/unzip.c"
 	# Gamespy
-	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gamespy.c"
-	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gqueryreporting.c"
+	"${CMAKE_SOURCE_DIR}/code/gamespy/q_gamespy.c"
 )
 
 add_subdirectory("../skeletor" "./skeletor")
diff --git a/code/server/CMakeLists.txt b/code/server/CMakeLists.txt
index a171be65..7c06edb1 100644
--- a/code/server/CMakeLists.txt
+++ b/code/server/CMakeLists.txt
@@ -6,6 +6,12 @@ add_subdirectory("../fgame" "./fgame")
 
 file(GLOB_RECURSE SOURCES_SERVER "./*.c*")
 
+set(SOURCES_SERVER ${SOURCES_SERVER}
+	# Gamespy
+	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gamespy.c"
+	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gqueryreporting.c"
+)
+
 add_library(omohserver INTERFACE)
 target_sources(omohserver INTERFACE ${SOURCES_SERVER})
 target_compile_features(omohserver INTERFACE cxx_nullptr)

From 25de66ed80126fe5b904b6a0610196dc08747e60 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 22:01:29 +0200
Subject: [PATCH 2033/2040] Fix wrong function name

---
 code/gamespy/gserverlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 4015fb9c..c0c64cbf 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -54,7 +54,7 @@ Fax(714)549-0757
  * @return const char* The master host
  */
 extern const char *ServerListGetHost();
-extern int ServerGetMsPort();
+extern int ServerListGetMsPort();
 
 #define MSHOST ServerListGetHost()
 #define MSPORT ServerListGetMsPort()

From 73b4569c07829d7b951b0d48bea7e17ddfd7efad Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 22 Apr 2025 22:51:06 +0200
Subject: [PATCH 2034/2040] Add Com_InitGameSpy() for future use

---
 code/gamespy/q_gamespy.c | 4 ++++
 code/gamespy/q_gamespy.h | 2 ++
 code/qcommon/common.c    | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/code/gamespy/q_gamespy.c b/code/gamespy/q_gamespy.c
index 853d476c..3e3de151 100644
--- a/code/gamespy/q_gamespy.c
+++ b/code/gamespy/q_gamespy.c
@@ -24,6 +24,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_gamespy.h"
 
+void Com_InitGameSpy()
+{
+}
+
 const char *Com_GetMasterHost()
 {
     return "master.333networks.com";
diff --git a/code/gamespy/q_gamespy.h b/code/gamespy/q_gamespy.h
index f002cd0e..05ae0431 100644
--- a/code/gamespy/q_gamespy.h
+++ b/code/gamespy/q_gamespy.h
@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
+void Com_InitGameSpy();
+
 const char *Com_GetMasterHost();
 int Com_GetMasterQueryPort();
 int Com_GetMasterHeartbeatPort();
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 044855c8..e25a10e8 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -45,6 +45,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  include "../uilib/ui_public.h"
 #endif
 
+#include "../gamespy/q_gamespy.h"
+
 qboolean CL_FinishedIntro(void);
 
 #ifdef __cplusplus
@@ -1994,6 +1996,8 @@ void Com_Init( char *commandLine ) {
 
 	RecoverLostAutodialData();
 
+    Com_InitGameSpy();
+
 	iEnd = Sys_Milliseconds();
 	Com_Printf( "--- Common Initialization Complete --- %i ms\n", iEnd - iStart );
 }

From 236897cfcce1c9321b9a481cb0920725dc541694 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Apr 2025 00:18:09 +0200
Subject: [PATCH 2035/2040] Set the server list socket as non-blocking

This prevents the game from freezing when the connection is slow or if the master server is unreachable
---
 code/gamespy/goaceng.h     |  6 ++-
 code/gamespy/gserverlist.c | 91 ++++++++++++++++++++++++++++++++------
 2 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/code/gamespy/goaceng.h b/code/gamespy/goaceng.h
index 3aabed11..e1b4345a 100644
--- a/code/gamespy/goaceng.h
+++ b/code/gamespy/goaceng.h
@@ -74,8 +74,10 @@ idle - no processing or querying underway, ready to being updates
 listreq - a server list request has been or is being sent
 listxfer - we are transfering the server list
 lanlist - we are waiting for replies from servers on the LAN
-querying - the servers on the list are being queried */
-typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying} GServerListState;
+querying - the servers on the list are being queried
+connecting (added in OPM) - socket is currently connecting to the master server
+*/
+typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying, sl_connecting} GServerListState;
 
 /* Comparision types for the ServerListSort function
 int - assume the values are int and do an integer compare
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index c0c64cbf..8d9e9755 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -87,6 +87,7 @@ struct GServerListImplementation
     char gamename[32];
     char seckey[32];
     char enginename[32];
+    char filter[256];
     int maxupdates;
     int nextupdate;
     int abortupdate;
@@ -204,10 +205,11 @@ static GError FreeUpdateList(GServerList serverlist)
 }
 
 //create and connect a server list socket
-static GError CreateServerListSocket(GServerList serverlist)
+static GError CreateServerListSocket(GServerList serverlist, gbool async)
 {
     struct   sockaddr_in saddr;
     struct hostent *hent;
+    int lasterr;
 
     saddr.sin_family = AF_INET;
     saddr.sin_port = htons(MSPORT);
@@ -222,10 +224,16 @@ static GError CreateServerListSocket(GServerList serverlist)
     serverlist->slsocket = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
     if (serverlist->slsocket == INVALID_SOCKET)
         return GE_NOSOCKET;
-    if (connect ( serverlist->slsocket, (struct sockaddr *) &saddr, sizeof saddr ) != 0)
+
+    if (async) {
+        SetSockBlocking(serverlist->slsocket, 0);
+    }
+
+    if (connect ( serverlist->slsocket, (struct sockaddr *) &saddr, sizeof saddr ) != 0
+        && (lasterr = GOAGetLastError(serverlist->slsocket), lasterr != WSAEWOULDBLOCK && lasterr != WSAEINPROGRESS))
     {
         closesocket(serverlist->slsocket);
-        return GE_NOCONNECT; 
+        return GE_NOCONNECT;
     }
 
     //else we are connected
@@ -271,8 +279,9 @@ static GError SendListRequest(GServerList serverlist, char *filter)
     char *modifier;
     
     len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
-    if (gsiSocketIsError(len))
+    if (gsiSocketIsError(len)) {
         return GE_NOCONNECT;
+    }
     data[len] = '\0'; //null terminate it
     
     ptr = strstr ( data, SECURE );
@@ -370,6 +379,57 @@ GError ServerListUpdate(GServerList serverlist, gbool async)
     return ServerListUpdate2(serverlist, async, NULL, qt_status);
 }
 
+/* ServerListStartQuery
+-------------------------
+Start querying a GServerList. */
+GError ServerListStartQuery(GServerList serverlist, gbool async)
+{
+    GError error;
+
+    if (serverlist->state != sl_connecting) {
+        return GE_BUSY;
+    }
+
+    if (serverlist->abortupdate) {
+        closesocket(serverlist->slsocket);
+        serverlist->slsocket = INVALID_SOCKET;
+        ServerListModeChange(serverlist, sl_idle);
+        return GE_NOCONNECT;
+    }
+
+    if (async) {
+        // Abort if the socket is in error
+        int so_error;
+        int len = sizeof(so_error);
+        getsockopt(serverlist->slsocket, SOL_SOCKET, SO_ERROR, &so_error, &len);
+
+        if (so_error) {
+            serverlist->state = sl_idle;
+            return GE_NOCONNECT;
+        }
+
+        // Check for pending data
+        char buf;
+        if (recv(serverlist->slsocket, &buf, 1, MSG_PEEK) == -1) {
+            return GE_BUSY;
+        }
+    }
+
+    serverlist->state = sl_idle;
+
+    error = SendListRequest(serverlist, serverlist->filter);
+    if (error) return error;
+    if (serverlist->querytype != qt_grouprooms && serverlist->querytype != qt_masterinfo) {
+        error = InitUpdateList(serverlist);
+        if (error) return error;
+    }
+
+    if (!async)
+        DoSyncLoop(serverlist);
+
+    return 0;
+}
+
 /* ServerListUpdate2
 -------------------------
 Start updating a GServerList. */
@@ -381,22 +441,24 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
         return GE_BUSY;
 
     serverlist->querytype = querytype;
-    error = CreateServerListSocket(serverlist);
+    error = CreateServerListSocket(serverlist, async);
     if (error) return error;
-    error = SendListRequest(serverlist, filter);
-    if (error) return error;
-    if (querytype != qt_grouprooms && querytype != qt_masterinfo) {
-        error = InitUpdateList(serverlist);
-        if (error) return error;
-    }
+
     serverlist->nextupdate = 0;
     serverlist->abortupdate = 0;
     // Added in 2.0
     serverlist->numservers = ServerListCount(serverlist);
     // Added in 2.0
     serverlist->cryptinfo.offset = -1;
-    if (!async)
-        DoSyncLoop(serverlist);
+    strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
+
+    serverlist->state = sl_connecting;
+
+    if (async) {
+        return 0;
+    }
+
+    ServerListStartQuery(serverlist, async);
 
     return 0;
 }
@@ -926,6 +988,9 @@ GError ServerListThink(GServerList serverlist)
                 //do some queries
                 return ServerListQueryLoop(serverlist);
                 break;
+        case sl_connecting:
+                return ServerListStartQuery(serverlist, 1);
+                break;
     }
 
 

From c1efc0e066803944df607c046000e1060abb9cfb Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Wed, 23 Apr 2025 23:56:05 +0200
Subject: [PATCH 2036/2040] Set the minimum number to 30 for cl_maxpackets

20 is the bare minimum for players, any value below makes movements look jittery on a 20 fps server. 30 is the optimal value based on network variation and fps variations
---
 code/client/cl_input.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index 53934b0d..e2f89d1f 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -866,8 +866,8 @@ qboolean CL_ReadyToSendPacket( void ) {
 	}
 
 	// check for exceeding cl_maxpackets
-	if ( cl_maxpackets->integer < 15 ) {
-		Cvar_Set( "cl_maxpackets", "15" );
+	if ( cl_maxpackets->integer < 30 ) {
+		Cvar_Set( "cl_maxpackets", "30" );
 	} else if ( cl_maxpackets->integer > 125 ) {
 		Cvar_Set( "cl_maxpackets", "125" );
 	}

From f2a6278daa2eecf076ea86c571873ac6ce9ca6db Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Apr 2025 16:39:25 +0200
Subject: [PATCH 2037/2040] Fix stage being written past the limit (#716)

---
 code/renderergl1/tr_shader.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 0ba971e7..5902f383 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -3135,7 +3135,13 @@ static shader_t *FinishShader( void ) {
 	// set appropriate stage information
 	//
 	stage = 0;
-	for (shaderStage_t* pStage = &unfoggedStages[0]; pStage->active; pStage++, stage++) {
+	for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
+		shaderStage_t *pStage = &unfoggedStages[stage];
+
+		if ( !pStage->active ) {
+			break;
+		}
+
 		// check for a missing texture
 		if ( !pStage->bundle[0].image[0] ) {
 			ri.Printf( PRINT_WARNING, "Shader %s has a stage with no image\n", shader.name );

From 816126b13a5a9d21122d45f9b979351c8b829f84 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Apr 2025 19:10:08 +0200
Subject: [PATCH 2038/2040] Add ScriptVariable conditions from Ubertools into
 the script lexer

Those are Ubertools / F.A.K.K remnants that are valid in original mohaa script grammar
---
 code/parser/lex_source.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 8ef8afb5..6ae674fc 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -260,6 +260,8 @@ varname		[a-zA-Z0-9_\"$\\]+
 ";"								{ YYLEX( TOKEN_SEMICOLON ); }
 
 "=="							{ YYLEX( TOKEN_EQUALITY ); }
+"ifequal"						{ YYLEX( TOKEN_EQUALITY ); }
+"ifstrequal"					{ YYLEX( TOKEN_EQUALITY ); }
 "||"							{ YYLEX( TOKEN_LOGICAL_OR ); }
 "&&"							{ YYLEX( TOKEN_LOGICAL_AND ); }
 
@@ -267,10 +269,16 @@ varname		[a-zA-Z0-9_\"$\\]+
 "^"								{ YYLEX( TOKEN_BITWISE_EXCL_OR ); }
 "&"								{ YYLEX( TOKEN_BITWISE_AND ); }
 "!="							{ YYLEX( TOKEN_INEQUALITY ); }
+"ifnotequal"					{ YYLEX( TOKEN_INEQUALITY ); }
+"ifstrnotequal"					{ YYLEX( TOKEN_INEQUALITY ); }
 "<"								{ YYLEX( TOKEN_LESS_THAN ); }
+"ifless"						{ YYLEX( TOKEN_LESS_THAN ); }
 ">"								{ YYLEX( TOKEN_GREATER_THAN ); }
+"ifgreater"                     { YYLEX( TOKEN_GREATER_THAN ); }
 "<="							{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); }
+"iflessequal"					{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); }
 ">="							{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); }
+"ifgreaterequal"				{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); }
 [ \t]"-"						{ YYLEX( TOKEN_NEG ); }
 
 "+"								{ YYLEX( TOKEN_PLUS ); }

From 08a985d183fbfe38dcae77424b28ea66ea45612f Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sat, 26 Apr 2025 19:22:34 +0200
Subject: [PATCH 2039/2040] Format script grammar source files

---
 code/parser/bison_source.txt | 340 ++++++++++++++--------------
 code/parser/lex.yy.cpp       |  25 +++
 code/parser/lex_source.txt   | 416 +++++++++++++++++------------------
 code/parser/parsetree.cpp    |   2 +-
 code/parser/parsetree.h      |   2 +-
 code/parser/y.tab.cpp        |  25 +++
 6 files changed, 427 insertions(+), 383 deletions(-)

diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index d58522db..b3ba1d42 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -1,7 +1,7 @@
 %{
 /*
 * ===========================================================================
-* Copyright (C) 2015 the OpenMoHAA team
+* Copyright (C) 2025 the OpenMoHAA team
 * 
 * This file is part of OpenMoHAA source code.
 * 
@@ -57,7 +57,7 @@ int success_pos;
 %precedence TOKEN_EOL
 
 %union {
-	stype_t s;
+    stype_t s;
 }
 
 %left TOKEN_COMMA
@@ -71,11 +71,11 @@ int success_pos;
 %left TOKEN_LEFT_BRACKET TOKEN_RIGHT_BRACKET
 %token TOKEN_LEFT_SQUARE_BRACKET TOKEN_RIGHT_SQUARE_BRACKET
 
-%right	TOKEN_ASSIGNMENT
-		TOKEN_PLUS_EQUALS TOKEN_MINUS_EQUALS TOKEN_MULTIPLY_EQUALS TOKEN_DIVIDE_EQUALS TOKEN_MODULUS_EQUALS
-		TOKEN_AND_EQUALS TOKEN_EXCL_OR_EQUALS TOKEN_OR_EQUALS
-		TOKEN_SHIFT_LEFT_EQUALS TOKEN_SHIFT_RIGHT_EQUALS
-		TOKEN_TERNARY TOKEN_COLON
+%right  TOKEN_ASSIGNMENT
+        TOKEN_PLUS_EQUALS TOKEN_MINUS_EQUALS TOKEN_MULTIPLY_EQUALS TOKEN_DIVIDE_EQUALS TOKEN_MODULUS_EQUALS
+        TOKEN_AND_EQUALS TOKEN_EXCL_OR_EQUALS TOKEN_OR_EQUALS
+        TOKEN_SHIFT_LEFT_EQUALS TOKEN_SHIFT_RIGHT_EQUALS
+        TOKEN_TERNARY TOKEN_COLON
 
 %left TOKEN_LOGICAL_OR
 %left TOKEN_LOGICAL_AND
@@ -109,12 +109,12 @@ int success_pos;
 %right TOKEN_INCREMENT TOKEN_DECREMENT TOKEN_NEG TOKEN_NOT TOKEN_COMPLEMENT
 %left TOKEN_LEFT_SQUARE_BRACKET TOKEN_RIGHT_SQUARE_BRACKET TOKEN_PERIOD
 
-%precedence		TOKEN_CATCH TOKEN_TRY
-				TOKEN_SWITCH TOKEN_CASE
-				TOKEN_BREAK TOKEN_CONTINUE
-				TOKEN_SIZE
-				TOKEN_END TOKEN_RETURN
-				TOKEN_MAKEARRAY TOKEN_ENDARRAY
+%precedence     TOKEN_CATCH TOKEN_TRY
+                TOKEN_SWITCH TOKEN_CASE
+                TOKEN_BREAK TOKEN_CONTINUE
+                TOKEN_SIZE
+                TOKEN_END TOKEN_RETURN
+                TOKEN_MAKEARRAY TOKEN_ENDARRAY
 
 %type <s.val> event_parameter_list event_parameter_list_need event_parameter
 %type <s.val> statement_list statement statement_declaration makearray_statement_list makearray_statement statement_for_condition
@@ -135,207 +135,207 @@ int success_pos;
 %%
 
 program
-	: statement_list[list] { parsedata.val = node1(ENUM_statement_list, $list); }
-	| line_opt { parsedata.val = node0(ENUM_NOP); }
-	;
+    : statement_list[list] { parsedata.val = node1(ENUM_statement_list, $list); }
+    | line_opt { parsedata.val = node0(ENUM_NOP); }
+    ;
 
 statement_list
-	: statement { $$ = linked_list_end($1); }
-	| statement_list statement[stmt] { $$ = append_node($1, $stmt); }
-	;
+    : statement { $$ = linked_list_end($1); }
+    | statement_list statement[stmt] { $$ = append_node($1, $stmt); }
+    ;
 
 statement
-	: line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
-	;
+    : line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
+    ;
 
 statement_declaration
-	: TOKEN_IDENTIFIER event_parameter_list TOKEN_COLON { $$ = node3(ENUM_labeled_statement, $1, $2, TOKPOS(@1)); }
-	| TOKEN_CASE prim_expr event_parameter_list TOKEN_COLON { $$ = node3(ENUM_int_labeled_statement, $2, $3, TOKPOS(@1)); }
-	| compound_statement
-	| selection_statement
-	| iteration_statement
-	| TOKEN_TRY compound_statement[C1] TOKEN_CATCH compound_statement[C2] { $$ = node3(ENUM_try, $C1, $C2, TOKPOS(@1)); }
-	| TOKEN_BREAK { $$ = node1(ENUM_break, TOKPOS(@1)); }
-	| TOKEN_CONTINUE { $$ = node1(ENUM_continue, TOKPOS(@1)); }
-	| TOKEN_IDENTIFIER event_parameter_list { $$ = node3(ENUM_cmd_event_statement, $1, $2, TOKPOS(@1)); }
-	| nonident_prim_expr TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_statement, $1, $2, $3, TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_ASSIGNMENT expr { $$ = node3(ENUM_assignment_statement, $1, $3, TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_PLUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PLUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_MINUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MINUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_MULTIPLY_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MULTIPLY), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_DIVIDE_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_DIVIDE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_MODULUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PERCENTAGE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_AND_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_AND), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_EXCL_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_EXCL_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_SHIFT_LEFT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_LEFT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_SHIFT_RIGHT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_RIGHT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_INCREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_INC), $1, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_DECREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_DEC), $1, TOKPOS(@2)), TOKPOS(@2)); }
-	| TOKEN_SEMICOLON { $$ = node0(ENUM_NOP); }
-	//| TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node3( ENUM_method_event_statement, node_string( parsetree_string( str( $1.stringValue ) + "::" + $3.stringValue ) ), node1( ENUM_NOP, $4 ), TOKPOS(@1) ); }
-	//| nonident_prim_expr TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node4( ENUM_method_event_statement, $1, node_string( parsetree_string( str( $2.stringValue ) + "::" + $4.stringValue ) ), node1( ENUM_NOP, $5 ), TOKPOS(@2) ); }
-	;
-	
+    : TOKEN_IDENTIFIER event_parameter_list TOKEN_COLON { $$ = node3(ENUM_labeled_statement, $1, $2, TOKPOS(@1)); }
+    | TOKEN_CASE prim_expr event_parameter_list TOKEN_COLON { $$ = node3(ENUM_int_labeled_statement, $2, $3, TOKPOS(@1)); }
+    | compound_statement
+    | selection_statement
+    | iteration_statement
+    | TOKEN_TRY compound_statement[C1] TOKEN_CATCH compound_statement[C2] { $$ = node3(ENUM_try, $C1, $C2, TOKPOS(@1)); }
+    | TOKEN_BREAK { $$ = node1(ENUM_break, TOKPOS(@1)); }
+    | TOKEN_CONTINUE { $$ = node1(ENUM_continue, TOKPOS(@1)); }
+    | TOKEN_IDENTIFIER event_parameter_list { $$ = node3(ENUM_cmd_event_statement, $1, $2, TOKPOS(@1)); }
+    | nonident_prim_expr TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_statement, $1, $2, $3, TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_ASSIGNMENT expr { $$ = node3(ENUM_assignment_statement, $1, $3, TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_PLUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PLUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_MINUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MINUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_MULTIPLY_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MULTIPLY), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_DIVIDE_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_DIVIDE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_MODULUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PERCENTAGE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_AND_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_AND), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_EXCL_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_EXCL_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_SHIFT_LEFT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_LEFT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_SHIFT_RIGHT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_RIGHT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_INCREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_INC), $1, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_DECREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_DEC), $1, TOKPOS(@2)), TOKPOS(@2)); }
+    | TOKEN_SEMICOLON { $$ = node0(ENUM_NOP); }
+    //| TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node3( ENUM_method_event_statement, node_string( parsetree_string( str( $1.stringValue ) + "::" + $3.stringValue ) ), node1( ENUM_NOP, $4 ), TOKPOS(@1) ); }
+    //| nonident_prim_expr TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node4( ENUM_method_event_statement, $1, node_string( parsetree_string( str( $2.stringValue ) + "::" + $4.stringValue ) ), node1( ENUM_NOP, $5 ), TOKPOS(@2) ); }
+    ;
+    
 statement_for_condition
-	: line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
-	| line_opt statement_declaration[stmt_decl] TOKEN_SEMICOLON line_opt { $$ = $stmt_decl; }
-	;
+    : line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
+    | line_opt statement_declaration[stmt_decl] TOKEN_SEMICOLON line_opt { $$ = $stmt_decl; }
+    ;
 
 compound_statement
-	: TOKEN_LEFT_BRACES statement_list TOKEN_RIGHT_BRACES { $$ = node1(ENUM_statement_list, $2); }
-	| TOKEN_LEFT_BRACES line_opt TOKEN_RIGHT_BRACES { $$ = node0(ENUM_NOP); }
-	| line_opt compound_statement[comp_stmt] line_opt { $$ = $comp_stmt; }
-	;
+    : TOKEN_LEFT_BRACES statement_list TOKEN_RIGHT_BRACES { $$ = node1(ENUM_statement_list, $2); }
+    | TOKEN_LEFT_BRACES line_opt TOKEN_RIGHT_BRACES { $$ = node0(ENUM_NOP); }
+    | line_opt compound_statement[comp_stmt] line_opt { $$ = $comp_stmt; }
+    ;
 
 selection_statement
-	: TOKEN_IF prim_expr[exp] statement_for_condition[stmt] %prec THEN { $$ = node3(ENUM_if_statement, $exp, $stmt, TOKPOS(@1)); }
-	| TOKEN_IF prim_expr[exp] statement_for_condition[if_stmt] TOKEN_ELSE statement_for_condition[else_stmt] { $$ = node4(ENUM_if_else_statement, $exp, $if_stmt, $else_stmt, TOKPOS(@1)); }
-	| TOKEN_SWITCH prim_expr[exp] compound_statement[comp_stmt] { $$ = node3(ENUM_switch, $exp, $comp_stmt, TOKPOS(@1)); }
-	;
+    : TOKEN_IF prim_expr[exp] statement_for_condition[stmt] %prec THEN { $$ = node3(ENUM_if_statement, $exp, $stmt, TOKPOS(@1)); }
+    | TOKEN_IF prim_expr[exp] statement_for_condition[if_stmt] TOKEN_ELSE statement_for_condition[else_stmt] { $$ = node4(ENUM_if_else_statement, $exp, $if_stmt, $else_stmt, TOKPOS(@1)); }
+    | TOKEN_SWITCH prim_expr[exp] compound_statement[comp_stmt] { $$ = node3(ENUM_switch, $exp, $comp_stmt, TOKPOS(@1)); }
+    ;
 
 iteration_statement
-	: TOKEN_WHILE prim_expr[exp] statement_for_condition[stmt]{ $$ = node4(ENUM_while_statement, $exp, $stmt, node0(ENUM_NOP), TOKPOS(@1)); }
-	| TOKEN_FOR TOKEN_LEFT_BRACKET statement[init_stmt] TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
-	{
-		sval_t while_stmt = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
-		$$ = node1(ENUM_statement_list, append_node(linked_list_end($init_stmt), while_stmt));
-	}
-	| TOKEN_FOR TOKEN_LEFT_BRACKET TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
-	{
-		$$ = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
-	}
-	| TOKEN_DO statement_for_condition[stmt] TOKEN_WHILE prim_expr[exp]{ $$ = node3(ENUM_do, $stmt, $exp, TOKPOS(@1)); }
-	;
+    : TOKEN_WHILE prim_expr[exp] statement_for_condition[stmt]{ $$ = node4(ENUM_while_statement, $exp, $stmt, node0(ENUM_NOP), TOKPOS(@1)); }
+    | TOKEN_FOR TOKEN_LEFT_BRACKET statement[init_stmt] TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
+    {
+        sval_t while_stmt = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
+        $$ = node1(ENUM_statement_list, append_node(linked_list_end($init_stmt), while_stmt));
+    }
+    | TOKEN_FOR TOKEN_LEFT_BRACKET TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
+    {
+        $$ = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
+    }
+    | TOKEN_DO statement_for_condition[stmt] TOKEN_WHILE prim_expr[exp]{ $$ = node3(ENUM_do, $stmt, $exp, TOKPOS(@1)); }
+    ;
 
 expr:
-	expr TOKEN_LOGICAL_AND expr { $$ = node3( ENUM_logical_and, $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_LOGICAL_OR expr { $$ = node3( ENUM_logical_or, $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_BITWISE_AND expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_AND ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_BITWISE_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_OR ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_BITWISE_EXCL_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_EXCL_OR ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_EQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_EQUALITY ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_INEQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_INEQUALITY ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_LESS_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_GREATER_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_LESS_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_GREATER_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_PLUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PLUS ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_MINUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MINUS ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_MULTIPLY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MULTIPLY ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_DIVIDE expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_DIVIDE ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_MODULUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PERCENTAGE ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_SHIFT_LEFT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_LEFT ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_SHIFT_RIGHT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_RIGHT ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_TERNARY expr TOKEN_COLON expr { $$ = node4( ENUM_if_else_statement, $1, $3, $5, TOKPOS(@2) ); }
-	| TOKEN_EOL expr[exp] { $$ = $exp; }
-	| nonident_prim_expr
-	| func_prim_expr
-	| TOKEN_IDENTIFIER { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	;
+    expr TOKEN_LOGICAL_AND expr { $$ = node3( ENUM_logical_and, $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_LOGICAL_OR expr { $$ = node3( ENUM_logical_or, $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_BITWISE_AND expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_AND ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_BITWISE_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_OR ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_BITWISE_EXCL_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_EXCL_OR ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_EQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_EQUALITY ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_INEQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_INEQUALITY ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_LESS_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_GREATER_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_LESS_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_GREATER_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_PLUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PLUS ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_MINUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MINUS ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_MULTIPLY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MULTIPLY ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_DIVIDE expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_DIVIDE ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_MODULUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PERCENTAGE ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_SHIFT_LEFT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_LEFT ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_SHIFT_RIGHT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_RIGHT ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_TERNARY expr TOKEN_COLON expr { $$ = node4( ENUM_if_else_statement, $1, $3, $5, TOKPOS(@2) ); }
+    | TOKEN_EOL expr[exp] { $$ = $exp; }
+    | nonident_prim_expr
+    | func_prim_expr
+    | TOKEN_IDENTIFIER { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    ;
 
 func_prim_expr:
-	TOKEN_IDENTIFIER event_parameter_list_need { $$ = node3(ENUM_cmd_event_expr, $1, $2, TOKPOS(@1)); }
-	| nonident_prim_expr_base TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_expr, $1, $2, $3, TOKPOS(@2)); }
-	| TOKEN_NEG func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
-	| TOKEN_COMPLEMENT func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
-	| TOKEN_NOT func_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
-	| TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON const_array_list
-		{
-			$$ = node3(ENUM_const_array_expr, node2(ENUM_string, $1, TOKPOS(@1)), $3, TOKPOS(@2));
-		}
-	| nonident_prim_expr TOKEN_DOUBLE_COLON const_array_list
-		{
-			$$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2));
-		}
-	| TOKEN_MAKEARRAY makearray_statement_list[stmt] TOKEN_ENDARRAY
-		{
-			$$ = node2(ENUM_makearray, $stmt, TOKPOS(@1));
-		}
-	;
+    TOKEN_IDENTIFIER event_parameter_list_need { $$ = node3(ENUM_cmd_event_expr, $1, $2, TOKPOS(@1)); }
+    | nonident_prim_expr_base TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_expr, $1, $2, $3, TOKPOS(@2)); }
+    | TOKEN_NEG func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
+    | TOKEN_COMPLEMENT func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
+    | TOKEN_NOT func_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
+    | TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON const_array_list
+        {
+            $$ = node3(ENUM_const_array_expr, node2(ENUM_string, $1, TOKPOS(@1)), $3, TOKPOS(@2));
+        }
+    | nonident_prim_expr TOKEN_DOUBLE_COLON const_array_list
+        {
+            $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2));
+        }
+    | TOKEN_MAKEARRAY makearray_statement_list[stmt] TOKEN_ENDARRAY
+        {
+            $$ = node2(ENUM_makearray, $stmt, TOKPOS(@1));
+        }
+    ;
 
 event_parameter_list
-	: { $$ = sval_u{}; $$.node = NULL; }
-	| event_parameter { $$ = $1; }
-	;
+    : { $$ = sval_u{}; $$.node = NULL; }
+    | event_parameter { $$ = $1; }
+    ;
 
 event_parameter_list_need
-	: event_parameter { $$ = $1; }
-	;
+    : event_parameter { $$ = $1; }
+    ;
 
 event_parameter
-	: prim_expr { $$ = linked_list_end($1); }
-	| event_parameter prim_expr { $$ = append_node($1, $2); }
-	;
+    : prim_expr { $$ = linked_list_end($1); }
+    | event_parameter prim_expr { $$ = append_node($1, $2); }
+    ;
 
 const_array_list
-	: const_array { $$ = linked_list_end($1); }
-	| const_array_list TOKEN_DOUBLE_COLON const_array { $$ = append_node($1, $3); }
-	;
+    : const_array { $$ = linked_list_end($1); }
+    | const_array_list TOKEN_DOUBLE_COLON const_array { $$ = append_node($1, $3); }
+    ;
 
 const_array
-	: nonident_prim_expr
-	| identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	;
+    : nonident_prim_expr
+    | identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    ;
 
 prim_expr
-	: nonident_prim_expr
-	| identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	| const_array TOKEN_DOUBLE_COLON const_array_list { $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2)); }
-	;
+    : nonident_prim_expr
+    | identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    | const_array TOKEN_DOUBLE_COLON const_array_list { $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2)); }
+    ;
 
 identifier_prim:
-	TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
-	;
+    TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
+    ;
 
 identifier
-	: TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
-	| TOKEN_STRING { $$ = $1; @$ = @1; }
-	;
+    : TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
+    | TOKEN_STRING { $$ = $1; @$ = @1; }
+    ;
 
 listener_identifier
-	: identifier { $$ = node_listener($1, TOKPOS(@1)); }
-	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
-	;
+    : identifier { $$ = node_listener($1, TOKPOS(@1)); }
+    | TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
+    ;
 
 nonident_prim_expr
-	: nonident_prim_expr_base
-	| TOKEN_NEG nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
-	| TOKEN_COMPLEMENT nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
-	| TOKEN_NOT nonident_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
-	;
+    : nonident_prim_expr_base
+    | TOKEN_NEG nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
+    | TOKEN_COMPLEMENT nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
+    | TOKEN_NOT nonident_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
+    ;
 
 nonident_prim_expr_base
-	: TOKEN_DOLLAR listener_identifier { $$ = node3(ENUM_func1_expr, node1b(OP_UN_TARGETNAME), $2, TOKPOS(@1)); }
-	| nonident_prim_expr TOKEN_PERIOD identifier { $$ = node3(ENUM_field, $1, $3, TOKPOS(@3)); }
-	| nonident_prim_expr TOKEN_PERIOD TOKEN_SIZE { $$ = node3(ENUM_func1_expr, node1b(OP_UN_SIZE), $1, TOKPOS(@3)); }
-	| nonident_prim_expr TOKEN_LEFT_SQUARE_BRACKET expr TOKEN_RIGHT_SQUARE_BRACKET { $$ = node3(ENUM_array_expr, $1, $3, TOKPOS(@2)); }
-	| TOKEN_STRING { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	| TOKEN_INTEGER { $$ = node2(ENUM_integer, $1, TOKPOS(@1)); }
-	| TOKEN_FLOAT { $$ = node2(ENUM_float, $1, TOKPOS(@1)); }
-	| TOKEN_LEFT_BRACKET expr[exp1] expr[exp2] expr[exp3] TOKEN_RIGHT_BRACKET { $$ = node4(ENUM_vector, $exp1, $exp2, $exp3, TOKPOS(@1)); }
-	| TOKEN_LISTENER { $$ = node2(ENUM_listener, $1, TOKPOS(@1)); }
-	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
-	| TOKEN_LEFT_BRACKET expr TOKEN_EOL TOKEN_RIGHT_BRACKET { $$ = $2; }
-	| TOKEN_NULL { $$ = node1(ENUM_NULL, TOKPOS(@1)); }
-	| TOKEN_NIL { $$ = node1(ENUM_NIL, TOKPOS(@1)); }
-	;
+    : TOKEN_DOLLAR listener_identifier { $$ = node3(ENUM_func1_expr, node1b(OP_UN_TARGETNAME), $2, TOKPOS(@1)); }
+    | nonident_prim_expr TOKEN_PERIOD identifier { $$ = node3(ENUM_field, $1, $3, TOKPOS(@3)); }
+    | nonident_prim_expr TOKEN_PERIOD TOKEN_SIZE { $$ = node3(ENUM_func1_expr, node1b(OP_UN_SIZE), $1, TOKPOS(@3)); }
+    | nonident_prim_expr TOKEN_LEFT_SQUARE_BRACKET expr TOKEN_RIGHT_SQUARE_BRACKET { $$ = node3(ENUM_array_expr, $1, $3, TOKPOS(@2)); }
+    | TOKEN_STRING { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    | TOKEN_INTEGER { $$ = node2(ENUM_integer, $1, TOKPOS(@1)); }
+    | TOKEN_FLOAT { $$ = node2(ENUM_float, $1, TOKPOS(@1)); }
+    | TOKEN_LEFT_BRACKET expr[exp1] expr[exp2] expr[exp3] TOKEN_RIGHT_BRACKET { $$ = node4(ENUM_vector, $exp1, $exp2, $exp3, TOKPOS(@1)); }
+    | TOKEN_LISTENER { $$ = node2(ENUM_listener, $1, TOKPOS(@1)); }
+    | TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
+    | TOKEN_LEFT_BRACKET expr TOKEN_EOL TOKEN_RIGHT_BRACKET { $$ = $2; }
+    | TOKEN_NULL { $$ = node1(ENUM_NULL, TOKPOS(@1)); }
+    | TOKEN_NIL { $$ = node1(ENUM_NIL, TOKPOS(@1)); }
+    ;
 
 makearray_statement_list:
-	{ $$ = node0(ENUM_NOP); }
-	| makearray_statement_list[list] makearray_statement[ma_stmt] TOKEN_EOL { $$ = append_node($list, node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
-	| makearray_statement[ma_stmt] TOKEN_EOL { $$ = linked_list_end(node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
-	| TOKEN_EOL makearray_statement_list { $$ = $2; @$ = @2; }
-	;
+    { $$ = node0(ENUM_NOP); }
+    | makearray_statement_list[list] makearray_statement[ma_stmt] TOKEN_EOL { $$ = append_node($list, node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
+    | makearray_statement[ma_stmt] TOKEN_EOL { $$ = linked_list_end(node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
+    | TOKEN_EOL makearray_statement_list { $$ = $2; @$ = @2; }
+    ;
 
 makearray_statement:
-	prim_expr { $$ = linked_list_end( $1 ); }
-	| makearray_statement prim_expr { $$ = append_node( $1, $2 ); }
-	;
+    prim_expr { $$ = linked_list_end( $1 ); }
+    | makearray_statement prim_expr { $$ = append_node( $1, $2 ); }
+    ;
 
 line_opt
-	: {}
-	| TOKEN_EOL
-	;
+    : {}
+    | TOKEN_EOL
+    ;
  
 %%
diff --git a/code/parser/lex.yy.cpp b/code/parser/lex.yy.cpp
index a7175203..225052d9 100644
--- a/code/parser/lex.yy.cpp
+++ b/code/parser/lex.yy.cpp
@@ -1,3 +1,28 @@
+/*
+* ===========================================================================
+* Copyright (C) 2025 the OpenMoHAA team
+* 
+* This file is part of OpenMoHAA source code.
+* 
+* OpenMoHAA source code is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of the License,
+* or (at your option) any later version.
+* 
+* OpenMoHAA source code is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with OpenMoHAA source code; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+* ===========================================================================
+*
+*
+* lex.yy.cpp: original lex generated file (unimplemented)
+*/
+
 #include "scriptcompiler.h"
 #include <stdio.h>
 
diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index 6ae674fc..d97038b0 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -1,7 +1,7 @@
 %{
 /*
 * ===========================================================================
-* Copyright (C) 2015 the OpenMoHAA team
+* Copyright (C) 2025 the OpenMoHAA team
 * 
 * This file is part of OpenMoHAA source code.
 * 
@@ -144,33 +144,29 @@ static bool UseField(void)
     return prev_yylex == TOKEN_PERIOD || prev_yylex == TOKEN_DOLLAR;
 }
 
-#define YY_INPUT(buf,result,max_size) \
-{										\
-	char c;								\
-	int n;								\
-										\
-	c = '*';							\
-	for(n = 0; n < max_size; n++)		\
-	{									\
-		c = *in_ptr++;					\
-		if (!c || c == '\n') {			\
-			break;						\
-		}								\
-										\
-		buf[n] = c;						\
-	}									\
-										\
-	if (c == '\n')						\
-	{									\
-		buf[n++] = c;					\
-	}									\
-	else if (!c)						\
-	{									\
-		in_ptr--;						\
-	}									\
-										\
-	result = n;							\
-}
+#define YY_INPUT(buf, result, max_size)  \
+    {                                    \
+        char c;                          \
+        int  n;                          \
+                                         \
+        c = '*';                         \
+        for (n = 0; n < max_size; n++) { \
+            c = *in_ptr++;               \
+            if (!c || c == '\n') {       \
+                break;                   \
+            }                            \
+                                         \
+            buf[n] = c;                  \
+        }                                \
+                                         \
+        if (c == '\n') {                 \
+            buf[n++] = c;                \
+        } else if (!c) {                 \
+            in_ptr--;                    \
+        }                                \
+                                         \
+        result = n;                      \
+    }
 
 %}
 
@@ -187,195 +183,193 @@ static bool UseField(void)
 %x VARIABLES
 %x IDENTIFIER
 
-string		([^\\\"\r\n]|\\.)*
-identifier	[^\{\}\(\)\[\]\r\n\,:; \t]
-nonexpr		[0-9a-zA-Z_\"'?@#`\.\x80-\xff]
-nonnumeric	[a-zA-Z_\"'?@#`\x80-\xff]
-alphanum	[a-zA-Z0-9_]+
-varname		[a-zA-Z0-9_\"$\\]+
+string          ([^\\\"\r\n]|\\.)*
+identifier      [^\{\}\(\)\[\]\r\n\,:; \t]
+nonexpr         [0-9a-zA-Z_\"'?@#`\.\x80-\xff]
+nonnumeric      [a-zA-Z_\"'?@#`\x80-\xff]
+alphanum        [a-zA-Z0-9_]+
+varname         [a-zA-Z0-9_\"$\\]+
 
 %%
 
-"/*"							{ BEGIN( C_COMMENT ); }
-<C_COMMENT>"*/"					{ BEGIN( INITIAL ); }
-<C_COMMENT>\n					{ ; }
-<C_COMMENT>.					{ ; }
-"*/"							{ Compiler.CompileError( parsedata.pos - yyleng, "'*/' found outside of comment" ); }
+"/*"                            { BEGIN(C_COMMENT); }
+<C_COMMENT>"*/"                 { BEGIN(INITIAL); }
+<C_COMMENT>\n                   { ; }
+<C_COMMENT>.                    { ; }
+"*/"                            { Compiler.CompileError( parsedata.pos - yyleng, "'*/' found outside of comment" ); }
 
-\\[\r\n]+						{ ; }
-"//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
+\\[\r\n]+                       { ; }
+"//"[^\r\n]*                    { if(prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
 
-<VARIABLES>"size"							{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>[ \t]*\./([0-9]*[^0-9[:space:]])	{ YYLEX(TOKEN_PERIOD); }
-<VARIABLES>\"{string}\"						{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
-<VARIABLES>{varname}						{
-												TextEscapeValue(yytext, strlen(yytext));
-												YYLEX(TOKEN_IDENTIFIER);
-											}
-<VARIABLES>[ \t\r\n]						{
-												BEGIN(INITIAL);
-												unput(yytext[yyleng - 1]);
-												yyreducepos(1);
-											}
-<VARIABLES>.								{
-												BEGIN(INITIAL);
-												unput(yytext[yyleng - 1]);
-												yyreducepos(1);
-											}
+<VARIABLES>"size"                           { BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
+<VARIABLES>[ \t]*\./([0-9]*[^0-9[:space:]]) { YYLEX(TOKEN_PERIOD); }
+<VARIABLES>\"{string}\"                     { BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
+<VARIABLES>{varname}                        {
+                                                TextEscapeValue(yytext, strlen(yytext));
+                                                YYLEX(TOKEN_IDENTIFIER);
+                                            }
+<VARIABLES>[ \t\r\n]                        {
+                                                BEGIN(INITIAL);
+                                                unput(yytext[yyleng - 1]);
+                                                yyreducepos(1);
+                                            }
+<VARIABLES>.                                {
+                                                BEGIN(INITIAL);
+                                                unput(yytext[yyleng - 1]);
+                                                yyreducepos(1);
+                                            }
 
-											
+\"{string}\"{nonexpr}           {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
 
-\"{string}\"{nonexpr}			{
-									BEGIN(IDENTIFIER);
-									yymore();
-								}
+\"{string}\"                    { TextEscapeValue(yytext + 1, yyleng - 2); YYLEX(TOKEN_STRING); }
 
-\"{string}\"					{ TextEscapeValue( yytext + 1, yyleng - 2 ); YYLEX( TOKEN_STRING ); }
+"?"                             { YYLEX(TOKEN_TERNARY); }
+"if"                            { YYLEX(TOKEN_IF); }
+"else"                          { YYLEX(TOKEN_ELSE); }
+"while"                         { YYLEX(TOKEN_WHILE); }
+"for"                           { YYLEX(TOKEN_FOR); }
+"do"                            { YYLEX(TOKEN_DO); }
 
-"?"								{ YYLEX( TOKEN_TERNARY ); }
-"if"							{ YYLEX( TOKEN_IF ); }
-"else"							{ YYLEX( TOKEN_ELSE ); }
-"while"							{ YYLEX( TOKEN_WHILE ); }
-"for"							{ YYLEX( TOKEN_FOR ); }
-"do"							{ YYLEX( TOKEN_DO ); }
+"game"                          { BEGIN(VARIABLES); yylval.s.val = node1_(method_game); YYLEX(TOKEN_LISTENER); }
+"group"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_group); YYLEX(TOKEN_LISTENER); }
+"level"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_level); YYLEX(TOKEN_LISTENER); }
+"local"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_local); YYLEX(TOKEN_LISTENER); }
+"parm"                          { BEGIN(VARIABLES); yylval.s.val = node1_(method_parm); YYLEX(TOKEN_LISTENER); }
+"owner"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_owner); YYLEX(TOKEN_LISTENER); }
+"self"                          { BEGIN(VARIABLES); yylval.s.val = node1_(method_self); YYLEX(TOKEN_LISTENER); }
 
-"game"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_game ); YYLEX( TOKEN_LISTENER ); }
-"group"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_group ); YYLEX( TOKEN_LISTENER ); }
-"level"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_level ); YYLEX( TOKEN_LISTENER ); }
-"local"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_local ); YYLEX( TOKEN_LISTENER ); }
-"parm"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_parm ); YYLEX( TOKEN_LISTENER ); }
-"owner"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_owner ); YYLEX( TOKEN_LISTENER ); }
-"self"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_self ); YYLEX( TOKEN_LISTENER ); }
+"{"                             { parsedata.braces_count++; YYLEX(TOKEN_LEFT_BRACES); }
+"}"                             { parsedata.braces_count--; YYLEX(TOKEN_RIGHT_BRACES); }
+"("                             { YYLEX(TOKEN_LEFT_BRACKET); }
+")"                             { BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_BRACKET); }
+"["                             { YYLEX(TOKEN_LEFT_SQUARE_BRACKET); }
+"]"                             { BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_SQUARE_BRACKET); }
 
-"{"								{ parsedata.braces_count++; YYLEX( TOKEN_LEFT_BRACES ); }
-"}"								{ parsedata.braces_count--; YYLEX( TOKEN_RIGHT_BRACES ); }
-"("								{ YYLEX(TOKEN_LEFT_BRACKET); }
-")"								{ BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_BRACKET); }
-"["								{ YYLEX(TOKEN_LEFT_SQUARE_BRACKET); }
-"]"								{ BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_SQUARE_BRACKET); }
+"="                             { YYLEX(TOKEN_ASSIGNMENT); }
+":"                             { YYLEX(TOKEN_COLON); }
+"::"                            { YYLEX(TOKEN_DOUBLE_COLON); }
+";"                             { YYLEX(TOKEN_SEMICOLON); }
 
-"="								{ YYLEX( TOKEN_ASSIGNMENT ); }
-":"								{ YYLEX( TOKEN_COLON ); }
-"::"							{ YYLEX( TOKEN_DOUBLE_COLON ); }
-";"								{ YYLEX( TOKEN_SEMICOLON ); }
+"=="                            { YYLEX(TOKEN_EQUALITY); }
+"ifequal"                       { YYLEX(TOKEN_EQUALITY); }
+"ifstrequal"                    { YYLEX(TOKEN_EQUALITY); }
+"||"                            { YYLEX(TOKEN_LOGICAL_OR); }
+"&&"                            { YYLEX(TOKEN_LOGICAL_AND); }
 
-"=="							{ YYLEX( TOKEN_EQUALITY ); }
-"ifequal"						{ YYLEX( TOKEN_EQUALITY ); }
-"ifstrequal"					{ YYLEX( TOKEN_EQUALITY ); }
-"||"							{ YYLEX( TOKEN_LOGICAL_OR ); }
-"&&"							{ YYLEX( TOKEN_LOGICAL_AND ); }
+"|"                             { YYLEX(TOKEN_BITWISE_OR); }
+"^"                             { YYLEX(TOKEN_BITWISE_EXCL_OR); }
+"&"                             { YYLEX(TOKEN_BITWISE_AND); }
+"!="                            { YYLEX(TOKEN_INEQUALITY); }
+"ifnotequal"                    { YYLEX(TOKEN_INEQUALITY); }
+"ifstrnotequal"                 { YYLEX(TOKEN_INEQUALITY); }
+"<"                             { YYLEX(TOKEN_LESS_THAN); }
+"ifless"                        { YYLEX(TOKEN_LESS_THAN); }
+">"                             { YYLEX(TOKEN_GREATER_THAN); }
+"ifgreater"                     { YYLEX(TOKEN_GREATER_THAN); }
+"<="                            { YYLEX(TOKEN_LESS_THAN_OR_EQUAL); }
+"iflessequal"                   { YYLEX(TOKEN_LESS_THAN_OR_EQUAL); }
+">="                            { YYLEX(TOKEN_GREATER_THAN_OR_EQUAL); }
+"ifgreaterequal"                { YYLEX(TOKEN_GREATER_THAN_OR_EQUAL); }
+[ \t]"-"                        { YYLEX(TOKEN_NEG); }
 
-"|"								{ YYLEX( TOKEN_BITWISE_OR ); }
-"^"								{ YYLEX( TOKEN_BITWISE_EXCL_OR ); }
-"&"								{ YYLEX( TOKEN_BITWISE_AND ); }
-"!="							{ YYLEX( TOKEN_INEQUALITY ); }
-"ifnotequal"					{ YYLEX( TOKEN_INEQUALITY ); }
-"ifstrnotequal"					{ YYLEX( TOKEN_INEQUALITY ); }
-"<"								{ YYLEX( TOKEN_LESS_THAN ); }
-"ifless"						{ YYLEX( TOKEN_LESS_THAN ); }
-">"								{ YYLEX( TOKEN_GREATER_THAN ); }
-"ifgreater"                     { YYLEX( TOKEN_GREATER_THAN ); }
-"<="							{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); }
-"iflessequal"					{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); }
-">="							{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); }
-"ifgreaterequal"				{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); }
-[ \t]"-"						{ YYLEX( TOKEN_NEG ); }
+"+"                             { YYLEX(TOKEN_PLUS); }
+"+="                            { YYLEX(TOKEN_PLUS_EQUALS); }
+"++"|[ \t]"++"                  { YYLEX(TOKEN_INCREMENT); }
+"-"|"-"[ \t]|[ \t]"-"[ \t]      { YYLEX(TOKEN_MINUS); }
+"-="                            { YYLEX(TOKEN_MINUS_EQUALS); }
+[ \t]"-="                       { YYLEX(TOKEN_MINUS_EQUALS); }
+"--"|[ \t]"--"                  { YYLEX(TOKEN_DECREMENT); }
+"*"                             { YYLEX(TOKEN_MULTIPLY); }
+"*="                            { YYLEX(TOKEN_MULTIPLY_EQUALS); }
+"/"                             { YYLEX(TOKEN_DIVIDE); }
+"/="                            { YYLEX(TOKEN_DIVIDE_EQUALS); }
+"%"                             { YYLEX(TOKEN_MODULUS); }
+"%="                            { YYLEX(TOKEN_MODULUS_EQUALS); }
+"<<"                            { YYLEX(TOKEN_SHIFT_LEFT); }
+"<<="                           { YYLEX(TOKEN_SHIFT_LEFT_EQUALS); }
+">>"                            { YYLEX(TOKEN_SHIFT_RIGHT); }
+">>="                           { YYLEX(TOKEN_SHIFT_RIGHT_EQUALS); }
+"&="                            { YYLEX(TOKEN_AND_EQUALS); }
+"^="                            { YYLEX(TOKEN_EXCL_OR_EQUALS); }
+"|="                            { YYLEX(TOKEN_OR_EQUALS); }
+[$]+                            { BEGIN( VARIABLES ); YYLEX(TOKEN_DOLLAR); }
+"!"                             { YYLEX(TOKEN_NOT); }
+"~"                             { YYLEX(TOKEN_COMPLEMENT); }
 
-"+"								{ YYLEX( TOKEN_PLUS ); }
-"+="							{ YYLEX( TOKEN_PLUS_EQUALS ); }
-"++"|[ \t]"++"					{ YYLEX( TOKEN_INCREMENT ); }
-"-"|"-"[ \t]|[ \t]"-"[ \t]		{ YYLEX( TOKEN_MINUS ); }
-"-="							{ YYLEX( TOKEN_MINUS_EQUALS ); }
-[ \t]"-="						{ YYLEX( TOKEN_MINUS_EQUALS ); }
-"--"|[ \t]"--"					{ YYLEX( TOKEN_DECREMENT ); }
-"*"								{ YYLEX( TOKEN_MULTIPLY ); }
-"*="							{ YYLEX( TOKEN_MULTIPLY_EQUALS ); }
-"/"								{ YYLEX( TOKEN_DIVIDE ); }
-"/="							{ YYLEX( TOKEN_DIVIDE_EQUALS ); }
-"%"								{ YYLEX( TOKEN_MODULUS ); }
-"%="							{ YYLEX( TOKEN_MODULUS_EQUALS ); }
-"<<"							{ YYLEX( TOKEN_SHIFT_LEFT ); }
-"<<="							{ YYLEX( TOKEN_SHIFT_LEFT_EQUALS ); }
-">>"							{ YYLEX( TOKEN_SHIFT_RIGHT ); }
-">>="							{ YYLEX( TOKEN_SHIFT_RIGHT_EQUALS ); }
-"&="							{ YYLEX( TOKEN_AND_EQUALS ); }
-"^="							{ YYLEX( TOKEN_EXCL_OR_EQUALS ); }
-"|="							{ YYLEX( TOKEN_OR_EQUALS ); }
-[$]+							{ BEGIN( VARIABLES ); YYLEX( TOKEN_DOLLAR ); }
-"!"								{ YYLEX( TOKEN_NOT ); }
-"~"								{ YYLEX( TOKEN_COMPLEMENT ); }
+"."                             { YYLEX(TOKEN_PERIOD); }
 
-"."								{ YYLEX( TOKEN_PERIOD ); }
+","                             { YYLEX(TOKEN_COMMA); }
 
-","								{ YYLEX( TOKEN_COMMA ); }
+"NULL"                          { YYLEX(TOKEN_NULL); }
+"NIL"                           { YYLEX(TOKEN_NIL); }
 
-"NULL"							{ YYLEX( TOKEN_NULL ); }
-"NIL"							{ YYLEX( TOKEN_NIL ); }
+"try"                           { YYLEX(TOKEN_TRY); }
+"catch"                         { YYLEX(TOKEN_CATCH); }
+"switch"                        { YYLEX(TOKEN_SWITCH); }
 
-"try"							{ YYLEX( TOKEN_TRY ); }
-"catch"							{ YYLEX( TOKEN_CATCH ); }
-"switch"						{ YYLEX( TOKEN_SWITCH ); }
+"case"                          { YYLEX(TOKEN_CASE); }
+"break"                         { YYLEX(TOKEN_BREAK); }
+"continue"                      { YYLEX(TOKEN_CONTINUE); }
 
-"case"							{ YYLEX( TOKEN_CASE ); }
-"break"							{ YYLEX( TOKEN_BREAK ); }
-"continue"						{ YYLEX( TOKEN_CONTINUE ); }
+"makearray"|"makeArray"         { YYLEX(TOKEN_MAKEARRAY); }
+"endarray"|"endArray"           { YYLEX(TOKEN_ENDARRAY); }
 
-"makearray"|"makeArray"			{ YYLEX( TOKEN_MAKEARRAY ); }
-"endarray"|"endArray"			{ YYLEX( TOKEN_ENDARRAY ); }
+[\r\n]+                         { if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
+[ \t]                           { ; }
 
-[\r\n]+							{ if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
-[ \t]							{ ; }
+[0-9]+                                  {
+                                            char* p = nullptr;
+                                            yylval.s.val.intValue = std::strtol(yytext, &p, 10);
+                                            YYLEX(TOKEN_INTEGER);
+                                        }
 
-[0-9]+									{
-											char* p = nullptr;
-											yylval.s.val.intValue = std::strtol(yytext, &p, 10);
-											YYLEX(TOKEN_INTEGER);
-										}
+[0-9\.]+{nonnumeric}                    {
+                                            BEGIN(IDENTIFIER);
+                                            yymore();
+                                        }
 
-[0-9\.]+{nonnumeric}					{
-											BEGIN(IDENTIFIER);
-											yymore();
-										}
+[0-9\.]+|[0-9\.]+("e+"|"e-")+[0-9\.]    {
+                                            char* p = nullptr;
+                                            yylval.s.val.floatValue = std::strtof(yytext, &p);
+                                            YYLEX(TOKEN_FLOAT);
+                                        }
 
-[0-9\.]+|[0-9\.]+("e+"|"e-")+[0-9\.]	{
-											char* p = nullptr;
-											yylval.s.val.floatValue = std::strtof(yytext, &p);
-											YYLEX(TOKEN_FLOAT);
-										}
+<IDENTIFIER>{identifier}*               {
+                                            BEGIN(INITIAL);
+                                            TextEscapeValue(yytext, yyleng);
+                                            YYLEX(TOKEN_IDENTIFIER);
+                                        }
+<IDENTIFIER>[ \t\r\n]                   {
+                                            BEGIN(INITIAL);
+                                            unput(yytext[yyleng - 1]);
+                                            yyreducepos(1);
+                                            TextEscapeValue(yytext, yyleng - 1);
+                                            YYLEXOFF(TOKEN_IDENTIFIER, 1);
+                                        }
+<IDENTIFIER>.                           {
+                                            BEGIN(INITIAL);
+                                            unput(yytext[yyleng - 1]);
+                                            yyreducepos(1);
+                                            TextEscapeValue(yytext, yyleng - 1);
+                                            YYLEXOFF(TOKEN_IDENTIFIER, 1);
+                                        }
 
-<IDENTIFIER>{identifier}*		{
-									BEGIN(INITIAL);
-									TextEscapeValue(yytext, yyleng);
-									YYLEX(TOKEN_IDENTIFIER);
-								}
-<IDENTIFIER>[ \t\r\n]			{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-									TextEscapeValue(yytext, yyleng - 1);
-									YYLEXOFF(TOKEN_IDENTIFIER, 1);
-								}
-<IDENTIFIER>.					{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-									TextEscapeValue(yytext, yyleng - 1);
-									YYLEXOFF(TOKEN_IDENTIFIER, 1);
-								}
+{identifier}                    {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
 
-{identifier}					{
-									BEGIN(IDENTIFIER);
-									yymore();
-								}
+[a-zA-Z0-9_]+                   {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
 
-[a-zA-Z0-9_]+					{
-									BEGIN(IDENTIFIER);
-									yymore();
-								}
+<SCRIPT>[a-zA-Z0-9]+            { BEGIN(INITIAL); }
 
-<SCRIPT>[a-zA-Z0-9]+			{ BEGIN(INITIAL); }
-
-.								{ YY_FATAL_ERROR("bad token:\n"); }
+.                               { YY_FATAL_ERROR("bad token:\n"); }
 
 %{
 
@@ -388,31 +382,31 @@ varname		[a-zA-Z0-9_\"$\\]+
 //
 // Implements yywrap to always append a newline to the source
 //
-int yywrap(void) {
-	if (parseStage == PS_TYPE) {
-		parseStage = PS_BODY;
-		in_ptr = start_ptr;
-		out_pos = 0;
-		success_pos = 0;
-		return 0;
-	}
+int yywrap(void)
+{
+    if (parseStage == PS_TYPE) {
+        parseStage  = PS_BODY;
+        in_ptr      = start_ptr;
+        out_pos     = 0;
+        success_pos = 0;
+        return 0;
+    }
 
-	if (parseStage == PS_BODY)
-	{
-		if (YY_START == C_COMMENT)
-		{
-			Compiler.CompileError(success_pos, "unexpected end of file found in comment");
-			return 1;
-		}
-		
-		parseStage = PS_BODY_END;
-		in_ptr = "\n";
-		return 0;
-	}
+    if (parseStage == PS_BODY) {
+        if (YY_START == C_COMMENT) {
+            Compiler.CompileError(success_pos, "unexpected end of file found in comment");
+            return 1;
+        }
 
-	return 1;
+        parseStage = PS_BODY_END;
+        in_ptr     = "\n";
+        return 0;
+    }
+
+    return 1;
 }
 
-void yy_init_script() {
-	BEGIN(SCRIPT);
+void yy_init_script()
+{
+    BEGIN(SCRIPT);
 }
diff --git a/code/parser/parsetree.cpp b/code/parser/parsetree.cpp
index 30b9d7d0..d1d7480c 100644
--- a/code/parser/parsetree.cpp
+++ b/code/parser/parsetree.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
diff --git a/code/parser/parsetree.h b/code/parser/parsetree.h
index 53133513..757ad013 100644
--- a/code/parser/parsetree.h
+++ b/code/parser/parsetree.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
diff --git a/code/parser/y.tab.cpp b/code/parser/y.tab.cpp
index 3eff57f0..f8f5401f 100644
--- a/code/parser/y.tab.cpp
+++ b/code/parser/y.tab.cpp
@@ -1,3 +1,28 @@
+/*
+* ===========================================================================
+* Copyright (C) 2025 the OpenMoHAA team
+* 
+* This file is part of OpenMoHAA source code.
+* 
+* OpenMoHAA source code is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of the License,
+* or (at your option) any later version.
+* 
+* OpenMoHAA source code is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with OpenMoHAA source code; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+* ===========================================================================
+*
+*
+* y.tab.cpp: original yacc generated file (unimplemented)
+*/
+
 #include "../script/scriptcompiler.h"
 
 typedef int yy_state_type;

From cce81cabffbf9af833cec3523fd91ec7e9194ba5 Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Sun, 27 Apr 2025 22:14:08 +0200
Subject: [PATCH 2040/2040] Implement multi-master queries and heartbeats
 (#717)

Implement multi-master server list query and multi-master heartbeats. The server list is fetched from multiple masters to improve redundancy, reliability and performance. This improves multiplayer availability by implementing support for using multiple masters.
- The server sends an heartbeat to all masters at once
- The client can query up to 4 masters in parallel depending on their rate
---
 code/client/cl_uiserverlist.cpp   |  40 +--
 code/client/cl_uiserverlist.h     |   3 +
 code/gamespy/cl_gamespy.c         |  21 +-
 code/gamespy/cl_gamespy.h         |   2 +
 code/gamespy/goaceng.h            |   2 +-
 code/gamespy/gserverlist.c        | 389 ++++++++++++++++++++++--------
 code/gamespy/q_gamespy.c          | 132 +++++++++-
 code/gamespy/q_gamespy.h          |  13 +-
 code/gamespy/sv_gamespy.c         |  71 +++++-
 code/gamespy/sv_gamespy.h         |   9 +
 code/gamespy/sv_gqueryreporting.c |  43 +++-
 code/gamespy/sv_gqueryreporting.h |   9 +-
 code/qcommon/common.c             |   2 +
 code/server/server.h              |   8 -
 code/server/sv_init.c             |   1 +
 15 files changed, 603 insertions(+), 142 deletions(-)

diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index f5d59c24..28e87c9b 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -132,7 +132,12 @@ qboolean           g_NeedAdditionalLANSearch = qfalse;
 qboolean           g_bDoneUpdating[2];
 ServerListInstance g_ServerListInst[2];
 
-void        UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2);
+// Fixed in OPM
+//  It was a static vaariable inside UpdateServerListCallBack
+//  that was set to 0 when the mode changed. This caused some issues
+static int g_iServerQueryCount = 0;
+static int g_iServerTotalCount = 0;
+
 static void AddFilter(char *filter, const char *value);
 
 FAKKServerListItem::FAKKServerListItem(
@@ -713,6 +718,9 @@ void UIFAKKServerList::NewServerList(void)
         iNumConcurrent = 15;
     }
 
+    g_iServerQueryCount = 0;
+    g_iServerTotalCount = 0;
+
     if (com_target_game->integer < target_game_e::TG_MOHTT) {
         game_name  = GS_GetCurrentGameName();
         secret_key = GS_GetCurrentGameKey();
@@ -1021,7 +1029,7 @@ void UIFAKKServerList::SortByColumn(int column)
     }
 }
 
-void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2)
+void UIFAKKServerList::UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2)
 {
     int                 i, j;
     int                 iPort, iGameSpyPort;
@@ -1029,8 +1037,6 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, v
     str                 sAddress;
     GServer             server;
     FAKKServerListItem *pNewServerItem;
-    static int          iServerQueryCount = 0;
-    static int          iServerTotalCount = 0;
     UIFAKKServerList   *uiServerList;
     int                 iServerType;
     // filters
@@ -1073,7 +1079,10 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, v
             return;
         }
 
-        Cvar_Set("dm_serverstatusbar", va("%i", (int)(uintptr_t)param2));
+        //Cvar_Set("dm_serverstatusbar", va("%i", (int)(uintptr_t)param2));
+        // Fixed in OPM
+        //  As both lists are combined, show the correct percentage
+        Cvar_Set("dm_serverstatusbar", va("%i", 100 * g_iServerQueryCount / g_iServerTotalCount));
     }
 
     if (msg == LIST_PROGRESS) {
@@ -1163,8 +1172,8 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, v
         pNewServerItem->SetQueried(true);
         pNewServerItem->SetNumPlayers(ServerGetIntValue(server, "numplayers", 0));
 
-        iServerQueryCount++;
-        Cvar_Set("dm_servercount", va("%d/%d", iServerQueryCount, iServerTotalCount));
+        g_iServerQueryCount++;
+        Cvar_Set("dm_servercount", va("%d/%d", g_iServerQueryCount, g_iServerTotalCount));
 
         uiServerList->SortByLastSortColumn();
     } else if (msg == LIST_STATECHANGED) {
@@ -1203,7 +1212,6 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, v
                 uiServerList->m_bGettingList[1] = false;
             }
             uiServerList->m_bUpdatingList = true;
-            iServerQueryCount             = 0;
             return;
         case GServerListState::sl_lanlist:
             Cvar_Set("dm_serverstatus", "Searching LAN.");
@@ -1212,18 +1220,22 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, v
         case GServerListState::sl_querying:
             Cvar_Set("dm_serverstatus", "Querying Servers.");
             uiServerList->m_bUpdatingList = true;
-            iServerQueryCount             = 0;
-            iServerTotalCount             = 0;
             break;
         default:
             break;
         }
 
-        if (!uiServerList->m_bGettingList[0] && !uiServerList->m_bGettingList[1]) {
-            return;
-        }
+        //if (!uiServerList->m_bGettingList[0] && !uiServerList->m_bGettingList[1]) {
+        //    return;
+        //}
 
-        iServerTotalCount += ServerListCount(serverlist);
+        // Rebuild the number of servers
+        g_iServerTotalCount = 0;
+        for(i = 0; i < ARRAY_LEN(uiServerList->m_serverList); i++) {
+            if (uiServerList->m_bGettingList[i] && uiServerList->m_serverList[i]) {
+                g_iServerTotalCount += ServerListCount(uiServerList->m_serverList[i]);
+            }
+        }
 
         // Removed in 2.0
         //  Only add entries for servers that are queried successfully
diff --git a/code/client/cl_uiserverlist.h b/code/client/cl_uiserverlist.h
index d8638b32..91c46016 100644
--- a/code/client/cl_uiserverlist.h
+++ b/code/client/cl_uiserverlist.h
@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
+#include "../gamespy/goaceng.h"
+
 class UIFAKKServerList : public UIListCtrl {
 protected:
 	// need a new struct instead of gamespy
@@ -47,6 +49,7 @@ protected:
 	void			MakeLANListing( Event *ev );
 	void			UpdateServer( Event *ev );
 	static int		ServerCompareFunction( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname );
+    static void     UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2);
 public:
 	UIFAKKServerList();
 
diff --git a/code/gamespy/cl_gamespy.c b/code/gamespy/cl_gamespy.c
index 898f5a19..203497ed 100644
--- a/code/gamespy/cl_gamespy.c
+++ b/code/gamespy/cl_gamespy.c
@@ -25,12 +25,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_gamespy.h"
 #include "q_gamespy.h"
 
-const char *ServerListGetHost()
+unsigned int ServerListGetNumMasters()
 {
-    return Com_GetMasterHost();
+    return Com_GetNumMasterEntries();
 }
 
-int ServerListGetMsPort()
+const char *ServerListGetHost(int index)
 {
-    return Com_GetMasterQueryPort();
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.host;
 }
+
+int ServerListGetMsPort(int index)
+{
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.queryport;
+}
+
+void CL_RestartGamespy_f() {}
diff --git a/code/gamespy/cl_gamespy.h b/code/gamespy/cl_gamespy.h
index 3032cd72..45e38ee4 100644
--- a/code/gamespy/cl_gamespy.h
+++ b/code/gamespy/cl_gamespy.h
@@ -23,3 +23,5 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // cl_gamespy.h -- Game-specific client GameSpy code
 
 #pragma once
+
+void CL_RestartGamespy_f();
diff --git a/code/gamespy/goaceng.h b/code/gamespy/goaceng.h
index e1b4345a..b278af78 100644
--- a/code/gamespy/goaceng.h
+++ b/code/gamespy/goaceng.h
@@ -77,7 +77,7 @@ lanlist - we are waiting for replies from servers on the LAN
 querying - the servers on the list are being queried
 connecting (added in OPM) - socket is currently connecting to the master server
 */
-typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying, sl_connecting} GServerListState;
+typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying} GServerListState;
 
 /* Comparision types for the ServerListSort function
 int - assume the values are int and do an integer compare
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 8d9e9755..fefd9f31 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -19,6 +19,24 @@ Fax(714)549-0757
   for this SDK. It also has a change history for the SDK.
 
 ******/
+
+/**
+ * The following modifications were made:
+ *
+ * 1) Non-blocking server list sockets. List requests are asynchronous and won't block the game. The only blocking request could be due to DNS resolution.
+ * 2) Server list sockets will timeout after 10 seconds of no reply.
+ * 3) Parallel server list requests.
+ *  3.1) A pool of sockets is initially created
+ *  3.2) The server list connects idling sockets to available masters, afterwards the server list state is set to `sl_listxfer`.
+ *  3.3) The server list sends the list request to connected masters, and receives the data for each.
+ *  3.4) When finished fetching 1 master (got `\final`), the server list state transitions to `sl_querying`.
+ *  3.5) The server list queries all fetched servers. It can still continue fetching list from currently connected masters
+ *       but it will not connect to other masters while servers are being queried. It won't be sending more queries if remaining masters replied in under 500 ms.
+ *  3.6) When finished querying all fetched servers, the server list restarts from 3.2 and queries next masters.
+ *
+ * The idea here is to ensure the redundancy of the server list between multiple masters even if the results are combined.
+ * Optionally for best results, the game should return a list of masters from the same community.
+ */
 #include "goaceng.h"
 #include "gserver.h"
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
@@ -53,13 +71,16 @@ Fax(714)549-0757
  * 
  * @return const char* The master host
  */
-extern const char *ServerListGetHost();
-extern int ServerListGetMsPort();
+extern unsigned int ServerListGetNumMasters();
+extern const char *ServerListGetHost(int index);
+extern int ServerListGetMsPort(int index);
 
-#define MSHOST ServerListGetHost()
-#define MSPORT ServerListGetMsPort()
+//#define MSHOST ServerListGetHost(0)
+//#define MSPORT ServerListGetMsPort(0)
 #define SERVER_GROWBY 64
 #define LAN_SEARCH_TIME 3000 //3 sec
+#define SERVER_QUERY_MAX_PAUSE 500
+#define INTERNET_SEARCH_TIME 10000 //10 sec
 #define LIST_NUMKEYBUCKETS 500
 #define LIST_NUMKEYCHAINS 4
 
@@ -78,6 +99,17 @@ typedef struct
 } UpdateInfo;
 
 typedef enum { pi_fieldcount, pi_fields, pi_servers } GParseInfoState;
+typedef enum { ls_none, ls_connecting, ls_connected } GListSocketState;
+
+typedef struct GServerListSocketImplementation
+{
+    SOCKET s;
+    GListSocketState socketstate;
+    char data[2048];
+    int oldlen;
+    gsi_time lastreplytime;
+    GCryptInfo cryptinfo;
+} *GServerListSocket;
 
 struct GServerListImplementation
 {
@@ -95,7 +127,10 @@ struct GServerListImplementation
     void *instance;
     char *sortkey;
     gbool sortascending;
-    SOCKET slsocket;
+    GServerListSocket slsockets;
+    int numslsockets;
+    int startslindex;
+    gsi_time lastsltime;
     unsigned long lanstarttime;
     GQueryType querytype;
     HashTable keylist;
@@ -103,9 +138,10 @@ struct GServerListImplementation
     // Added in 2.0
     int numservers;
     // Added in 2.0
-    GCryptInfo cryptinfo;
+    //GCryptInfo cryptinfo;
     // Added in OPM
     int encryptdata;
+    gbool async;
 
     GParseInfoState pistate;
 };
@@ -121,7 +157,7 @@ const int querylengths[NUM_QUERYTYPES] = {7,6,7,9,13,8};
 static void KeyValFree(void *elem);
 static int KeyValCompareKeyA(const void *entry1, const void *entry2);
 static int KeyValHashKeyA(const void *elem, int numbuckets);
-
+static gbool ServerListHasFinishedFetchingList(GServerList serverlist);
 
 /* ServerListNew
 ----------------
@@ -150,6 +186,19 @@ GServerList	ServerListNew(const char *gamename, const char *enginename, const ch
     list->numservers = 0;
     // Added in OPM
     list->encryptdata = 1;
+    list->async = 0;
+
+    list->numslsockets = maxconcupdates / 4;
+    if (list->numslsockets < 1) {
+        list->numslsockets = 1;
+    } else if (list->numslsockets > 4) {
+        // Above 4 seems too much
+        list->numslsockets = 4;
+    }
+    list->slsockets = (GServerListSocket)malloc(sizeof(struct GServerListSocketImplementation) * list->numslsockets);
+    memset(list->slsockets, 0, sizeof(struct GServerListSocketImplementation) * list->numslsockets);
+    list->startslindex = 0;
+    list->lastsltime = current_time();
 
     SocketStartUp();
     return list;	
@@ -163,6 +212,7 @@ void ServerListFree(GServerList serverlist)
     ArrayFree(serverlist->servers);
     TableFree(serverlist->keylist);
     free(serverlist->updatelist);
+    free(serverlist->slsockets);
 
     free(serverlist);
     SocketShutDown();
@@ -205,53 +255,90 @@ static GError FreeUpdateList(GServerList serverlist)
 }
 
 //create and connect a server list socket
-static GError CreateServerListSocket(GServerList serverlist, gbool async)
+static GError CreateServerListSocket(GServerList serverlist, GServerListSocket slsocket, gbool async)
 {
     struct   sockaddr_in saddr;
     struct hostent *hent;
     int lasterr;
+    int i;
+    int port;
+    const char *host;
+
+    if (serverlist->startslindex >= ServerListGetNumMasters()) {
+        return GE_NODNS;
+    }
+
+    if (slsocket->socketstate != ls_none) {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+    }
+
+    port = ServerListGetMsPort(serverlist->startslindex);
+    host = ServerListGetHost(serverlist->startslindex);
 
     saddr.sin_family = AF_INET;
-    saddr.sin_port = htons(MSPORT);
-    saddr.sin_addr.s_addr = inet_addr(MSHOST);
+    saddr.sin_port = htons(port);
+    saddr.sin_addr.s_addr = inet_addr(host);
     if (saddr.sin_addr.s_addr == INADDR_NONE)
     {
-        hent = gethostbyname(MSHOST);
+        hent = gethostbyname(host);
         if (!hent)
             return GE_NODNS; 
         saddr.sin_addr.s_addr = *(u_long *)hent->h_addr_list[0];
     }
-    serverlist->slsocket = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
-    if (serverlist->slsocket == INVALID_SOCKET)
+    slsocket->s = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
+    if (slsocket->s == INVALID_SOCKET)
         return GE_NOSOCKET;
 
     if (async) {
-        SetSockBlocking(serverlist->slsocket, 0);
+        SetSockBlocking(slsocket->s, 0);
     }
 
-    if (connect ( serverlist->slsocket, (struct sockaddr *) &saddr, sizeof saddr ) != 0
-        && (lasterr = GOAGetLastError(serverlist->slsocket), lasterr != WSAEWOULDBLOCK && lasterr != WSAEINPROGRESS))
+    if (connect ( slsocket->s, (struct sockaddr *) &saddr, sizeof saddr ) != 0
+        && (lasterr = GOAGetLastError(slsocket->slsocket), lasterr != WSAEWOULDBLOCK && lasterr != WSAEINPROGRESS))
     {
-        closesocket(serverlist->slsocket);
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
         return GE_NOCONNECT;
     }
 
+    slsocket->socketstate = ls_connecting;
+    slsocket->oldlen = 0;
+    slsocket->cryptinfo.offset = -1;
+    slsocket->lastreplytime = current_time();
+    serverlist->startslindex++;
+
     //else we are connected
     return 0;
 
 
 }
 
+//create and connect a server list sockets
+static GError CreateServerListForAvailableSockets(GServerList serverlist, gbool async)
+{
+    int i;
+
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        if (serverlist->slsockets[i].socketstate == ls_none) {
+            CreateServerListSocket(serverlist, &serverlist->slsockets[i], async);
+        }
+    }
+
+    return 0;
+}
+
 
 //create and connect a server list socket
 static GError CreateServerListLANSocket(GServerList serverlist)
 {
     int optval = 1;
+    GServerListSocket slsocket = &serverlist->slsockets[0];
 
-    serverlist->slsocket = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
-    if (serverlist->slsocket == INVALID_SOCKET)
+    slsocket->s = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    if (slsocket->s == INVALID_SOCKET)
         return GE_NOSOCKET;
-    if (setsockopt(serverlist->slsocket, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval)) != 0)
+    if (setsockopt(slsocket->s, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval)) != 0)
         return GE_NOSOCKET;
 
     //else we are ready to broadcast
@@ -271,14 +358,14 @@ static void ServerListModeChange(GServerList serverlist, GServerListState newsta
 
 // validate us to the master and send a list request
 #define SECURE "\\secure\\"
-static GError SendListRequest(GServerList serverlist, char *filter)
+static GError SendListRequest(GServerList serverlist, GServerListSocket slsocket, char *filter)
 {
     char data[256], *ptr, result[64];
     int len;
     int i;
     char *modifier;
     
-    len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
+    len = recv(slsocket->s, data, sizeof(data) - 1, 0);
     if (gsiSocketIsError(len)) {
         return GE_NOCONNECT;
     }
@@ -309,7 +396,7 @@ static GError SendListRequest(GServerList serverlist, char *filter)
                 serverlist->enginename, ENGINE_VERSION, result); //validate us	
     }
     
-    len = send ( serverlist->slsocket, data, strlen(data), 0 );
+    len = send ( slsocket->s, data, strlen(data), 0 );
     if (gsiSocketIsError(len) || len == 0)
         return GE_NOCONNECT;
 
@@ -330,11 +417,13 @@ static GError SendListRequest(GServerList serverlist, char *filter)
         sprintf(data, "\\list\\%s\\gamename\\%s\\where\\%s\\final\\", modifier, serverlist->gamename, filter);
     else
         sprintf(data, "\\list\\%s\\gamename\\%s\\final\\", modifier, serverlist->gamename);
-    len = send ( serverlist->slsocket, data, strlen(data), 0 );
+    len = send ( slsocket->s, data, strlen(data), 0 );
     if (gsiSocketIsError(len) || len == 0)
         return GE_NOCONNECT;
 
-    ServerListModeChange(serverlist, sl_listxfer);
+    if (serverlist->state == sl_idle) {
+        ServerListModeChange(serverlist, sl_listxfer);
+    }
     return 0;
 }
 
@@ -349,7 +438,7 @@ static GError SendBroadcastRequest(GServerList serverlist, int startport, int en
     for (i = startport ; i <= endport ; i += delta)
     {
         saddr.sin_port = htons(i);
-        sendto(serverlist->slsocket, "\\status\\",8,0,(struct sockaddr *)&saddr,sizeof(saddr));
+        sendto(serverlist->slsockets[0].s, "\\status\\",8,0,(struct sockaddr *)&saddr,sizeof(saddr));
     }
     ServerListModeChange(serverlist, sl_lanlist);
     serverlist->lanstarttime = current_time();
@@ -379,45 +468,58 @@ GError ServerListUpdate(GServerList serverlist, gbool async)
     return ServerListUpdate2(serverlist, async, NULL, qt_status);
 }
 
+/* ServerListCheckSocketError
+-------------------------
+Verify if the server list socket has an error or has timed out, and abort. */
+GError ServerListCheckSocketError(GServerList serverlist, GServerListSocket slsocket)
+{
+    int so_error;
+    int len = sizeof(so_error);
+    getsockopt(slsocket->s, SOL_SOCKET, SO_ERROR, &so_error, &len);
+
+    // Abort if the socket has an error or if it connect/recv has timed out
+    if (so_error || current_time() >= slsocket->lastreplytime + INTERNET_SEARCH_TIME) {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+        slsocket->socketstate = ls_none;
+        return GE_NOCONNECT;
+    }
+
+    return 0;
+}
+
 /* ServerListStartQuery
 -------------------------
 Start querying a GServerList. */
-GError ServerListStartQuery(GServerList serverlist, gbool async)
+GError ServerListStartQuery(GServerList serverlist, GServerListSocket slsocket, gbool async)
 {
     GError error;
+    int i;
 
-    if (serverlist->state != sl_connecting) {
+    if (slsocket->socketstate != ls_connecting) {
         return GE_BUSY;
     }
 
     if (serverlist->abortupdate) {
-        closesocket(serverlist->slsocket);
-        serverlist->slsocket = INVALID_SOCKET;
+        for(i = 0; i < serverlist->numslsockets; i++) {
+            closesocket(serverlist->slsockets[i].s);
+            serverlist->slsockets[i].s = INVALID_SOCKET;
+        }
         ServerListModeChange(serverlist, sl_idle);
         return GE_NOCONNECT;
     }
 
     if (async) {
-        // Abort if the socket is in error
-        int so_error;
-        int len = sizeof(so_error);
-        getsockopt(serverlist->slsocket, SOL_SOCKET, SO_ERROR, &so_error, &len);
-
-        if (so_error) {
-            serverlist->state = sl_idle;
-            return GE_NOCONNECT;
-        }
-
         // Check for pending data
         char buf;
-        if (recv(serverlist->slsocket, &buf, 1, MSG_PEEK) == -1) {
+        if (recv(slsocket->s, &buf, 1, MSG_PEEK) == -1) {
             return GE_BUSY;
         }
     }
 
-    serverlist->state = sl_idle;
+    slsocket->socketstate = ls_connected;
 
-    error = SendListRequest(serverlist, serverlist->filter);
+    error = SendListRequest(serverlist, slsocket, serverlist->filter);
     if (error) return error;
     if (serverlist->querytype != qt_grouprooms && serverlist->querytype != qt_masterinfo) {
         error = InitUpdateList(serverlist);
@@ -436,29 +538,38 @@ Start updating a GServerList. */
 GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQueryType querytype)
 {
     GError error;
+    int i;
 
     if (serverlist->state != sl_idle)
         return GE_BUSY;
 
     serverlist->querytype = querytype;
-    error = CreateServerListSocket(serverlist, async);
-    if (error) return error;
+    error = CreateServerListForAvailableSockets(serverlist, async);
+    //if (error) return error;
 
     serverlist->nextupdate = 0;
     serverlist->abortupdate = 0;
     // Added in 2.0
     serverlist->numservers = ServerListCount(serverlist);
     // Added in 2.0
-    serverlist->cryptinfo.offset = -1;
-    strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
+    //serverlist->cryptinfo.offset = -1;
+    if (filter) {
+        strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
+    } else {
+        serverlist->filter[0] = 0;
+    }
 
-    serverlist->state = sl_connecting;
+    serverlist->async = async;
 
     if (async) {
+        // As it's asynchronous, set the state to transfering
+        ServerListModeChange(serverlist, sl_listxfer);
         return 0;
     }
 
-    ServerListStartQuery(serverlist, async);
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        ServerListStartQuery(serverlist, &serverlist->slsockets[i], async);
+    }
 
     return 0;
 }
@@ -647,7 +758,7 @@ GError ServerListAuxUpdate(GServerList serverlist, const char *ip, int port, gbo
     return 0;
 }
 
-static GError ServerListLANList(GServerList serverlist)
+static GError ServerListLANList(GServerList serverlist, GServerListSocket slsocket)
 {
     struct timeval timeout = {0,0};
     fd_set set;
@@ -659,11 +770,11 @@ static GError ServerListLANList(GServerList serverlist)
     while (1) //we break if the select fails
     {
         FD_ZERO(&set);
-        FD_SET( serverlist->slsocket, &set);
+        FD_SET( slsocket->s, &set);
         error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
         if (gsiSocketIsError(error) || 0 == error) //no data
             break;
-        error = recvfrom(serverlist->slsocket, indata, sizeof(indata) - 1, 0, (struct sockaddr *)&saddr, &saddrlen );
+        error = recvfrom(slsocket->s, indata, sizeof(indata) - 1, 0, (struct sockaddr *)&saddr, &saddrlen );
         if (gsiSocketIsError(error))
             continue; 
         //we got data, add the server to the list to update
@@ -672,8 +783,8 @@ static GError ServerListLANList(GServerList serverlist)
     }
     if (current_time() - serverlist->lanstarttime > LAN_SEARCH_TIME) //done waiting for replies
     {
-        closesocket(serverlist->slsocket);
-        serverlist->slsocket = INVALID_SOCKET;
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
         ServerListModeChange(serverlist, sl_querying);
     }
     return 0;
@@ -769,10 +880,10 @@ static int ServerListParseInfoList(GServerList serverlist, char *data, int len)
 }
 
 //reads the server list from the socket and parses it
-static GError ServerListReadList(GServerList serverlist)
+static GError ServerListReadList(GServerList serverlist, GServerListSocket slsocket)
 {
-    static char data[2048]; //static input buffer
-    static int oldlen = 0;
+    //static char data[2048]; //static input buffer
+    //static int oldlen = 0;
     fd_set set;
     struct timeval timeout = {0,0};
     int len, i;
@@ -781,7 +892,7 @@ static GError ServerListReadList(GServerList serverlist)
     unsigned short port;
 
     FD_ZERO(&set);
-    FD_SET(serverlist->slsocket, &set);
+    FD_SET(slsocket->s, &set);
 #ifndef KGTRN_ACCESS
     i = select( FD_SETSIZE, &set, NULL, NULL, &timeout );
     if (i <= 0)
@@ -789,52 +900,57 @@ static GError ServerListReadList(GServerList serverlist)
 #endif
 
 //append to data
-    len = recv(serverlist->slsocket, data + oldlen, sizeof(data) - oldlen - 1, 0);
+    len = recv(slsocket->s, slsocket->data + slsocket->oldlen, sizeof(slsocket->data) - slsocket->oldlen - 1, 0);
     if (gsiSocketIsError(len) || len == 0)
     {
-        closesocket(serverlist->slsocket);
-        serverlist->slsocket = INVALID_SOCKET;
-        oldlen = 0; //clear data so it can be used again
-        ServerListHalt(serverlist);
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+        slsocket->socketstate = ls_none;
+        slsocket->oldlen = 0; //clear data so it can be used again
+        //ServerListHalt(serverlist);
         ServerListModeChange(serverlist, sl_querying);
         return GE_NOCONNECT;
 
     }
 
-    if (serverlist->encryptdata && serverlist->cryptinfo.offset != -1) {
+    slsocket->lastreplytime = current_time();
+    serverlist->lastsltime = slsocket->lastreplytime;
+
+    if (serverlist->encryptdata && slsocket->cryptinfo.offset != -1) {
         // Added in 2.0
-        crypt_docrypt(&serverlist->cryptinfo, data + oldlen, len);
+        crypt_docrypt(&slsocket->cryptinfo, slsocket->data + slsocket->oldlen, len);
     }
 
-    oldlen += len;
+    slsocket->oldlen += len;
 
-    p = data;
+    p = slsocket->data;
 
     if (!serverlist->encryptdata) {
-        serverlist->cryptinfo.offset = 0;
-    } else if (serverlist->cryptinfo.offset == -1) {
+        slsocket->cryptinfo.offset = 0;
+    } else if (slsocket->cryptinfo.offset == -1) {
         // Added in 2.0
-        if (oldlen > (*p ^ 0xEC)) {
+        if (slsocket->oldlen > (*p ^ 0xEC)) {
             *p ^= 0xEC;
             len = strlen(serverlist->seckey);
             for (i = 0; i < len; i++) {
                 p[i + 1] ^= serverlist->seckey[i];
             }
-            init_crypt_key((unsigned char *)p + 1, *p, &serverlist->cryptinfo);
+            init_crypt_key((unsigned char *)p + 1, *p, &slsocket->cryptinfo);
             p += *p + 1;
-            crypt_docrypt(&serverlist->cryptinfo, (unsigned char *)p, oldlen - (p - data));
+            crypt_docrypt(&slsocket->cryptinfo, (unsigned char *)p, slsocket->oldlen - (p - slsocket->data));
         }
     }
 
-    if (serverlist->cryptinfo.offset != -1)
+    if (slsocket->cryptinfo.offset != -1)
     {
-        while (p - data <= oldlen - 6)
+        while (p - slsocket->data <= slsocket->oldlen - 6)
         {
             if (strncmp(p,"\\final\\",7) == 0 || serverlist->abortupdate)
             {
-                closesocket(serverlist->slsocket);
-                serverlist->slsocket = INVALID_SOCKET;
-                oldlen = 0; //clear data so it can be used again
+                closesocket(slsocket->s);
+                slsocket->s = INVALID_SOCKET;
+                slsocket->socketstate = ls_none;
+                slsocket->oldlen = 0; //clear data so it can be used again
                 if (serverlist->querytype == qt_grouprooms || serverlist->querytype == qt_masterinfo) {
                     ServerListModeChange(serverlist, sl_idle);
                 } else {
@@ -842,11 +958,11 @@ static GError ServerListReadList(GServerList serverlist)
                 }
                 return 0; //get out!!
             }
-            if (oldlen < 6) //no way it could be a full IP, quit
+            if (slsocket->oldlen < 6) //no way it could be a full IP, quit
                 break;
 
             if (serverlist->querytype == qt_grouprooms || serverlist->querytype == qt_masterinfo) {
-                i = ServerListParseInfoList(serverlist, p, oldlen - (p - data));
+                i = ServerListParseInfoList(serverlist, p, slsocket->oldlen - (p - slsocket->data));
                 if (i < 0) {
                     serverlist->abortupdate = 1;
                 } else if (!i) {
@@ -860,14 +976,14 @@ static GError ServerListReadList(GServerList serverlist)
                 p += 2;
                 // Added in 2.0
                 //  Skip adding the server if already exists
-                if (ServerListFindServerMax(serverlist, ip, ntohs(port), serverlist->numservers) == -1) {
+                if (ServerListFindServer(serverlist, ip, ntohs(port)) == -1) {
                     ServerListAddServer(serverlist, ip, ntohs(port), serverlist->querytype);
                 }
             }
         }
     }
-    oldlen = oldlen - (p - data);
-    memmove(data,p,oldlen); //shift it over
+    slsocket->oldlen = slsocket->oldlen - (p - slsocket->data);
+    memmove(slsocket->data,p,slsocket->oldlen); //shift it over
     return 0;
 
 }
@@ -942,14 +1058,30 @@ static GError ServerListQueryLoop(GServerList serverlist)
                 */
             serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
         }
-        
+
     if (serverlist->abortupdate || (serverlist->nextupdate >= ArrayLength(serverlist->servers) && scount == 0)) 
     { //we are done!!
         FreeUpdateList(serverlist);
-        ServerListModeChange(serverlist, sl_idle);
+        if (serverlist->abortupdate) {
+            ServerListModeChange(serverlist, sl_idle);
+            return 0;
+        }
+
+        if (serverlist->startslindex < ServerListGetNumMasters() || !ServerListHasFinishedFetchingList(serverlist)) {
+            ServerListModeChange(serverlist, sl_listxfer);
+        } else {
+            // No more masters
+            ServerListModeChange(serverlist, sl_idle);
+        }
         return 0;
     }
-    
+
+    if (!ServerListHasFinishedFetchingList(serverlist) && current_time() < serverlist->lastsltime + SERVER_QUERY_MAX_PAUSE) {
+        // Make sure to not send out other queries if currently fetching from other lists
+        // to avoid overloading the network
+        return GE_BUSY;
+    }
+
 //now, send out queries on available sockets
     for (i = 0 ; i < serverlist->maxupdates && serverlist->nextupdate < ArrayLength(serverlist->servers) ; i++)
         if (serverlist->updatelist[i].currentserver == NULL) //it's availalbe
@@ -968,31 +1100,96 @@ static GError ServerListQueryLoop(GServerList serverlist)
     return 0;
 }
 
-/* ServerListThink
+/* ServerListThinkSocket
 ------------------
 For use with Async Updates. This needs to be called every ~10ms for list processing and
 updating to occur during async server list updates */
-GError ServerListThink(GServerList serverlist)
+GError ServerListThinkSocket(GServerList serverlist, GServerListSocket slsocket)
 {
+    GError socketerror;
+
+    if (slsocket->s == INVALID_SOCKET) {
+        return GE_NOSOCKET;
+    }
+
+    socketerror = ServerListCheckSocketError(serverlist, slsocket);
+    if (socketerror) {
+        return socketerror;
+    }
+
+    switch(slsocket->socketstate)
+    {
+        case ls_connecting:
+                ServerListStartQuery(serverlist, slsocket, 1);
+                break;
+        case ls_connected:
+                //read the data
+                return ServerListReadList(serverlist, slsocket);
+                break;
+        default:
+                break;
+    }
 
     switch (serverlist->state)
     {
         case sl_idle: return 0;
         case sl_listxfer:
                  //read the data
-                return ServerListReadList(serverlist);
+                //return ServerListReadList(serverlist, slsocket);
                 break;
         case sl_lanlist:
-                return ServerListLANList(serverlist);
-        case sl_querying: 
-                //do some queries
-                return ServerListQueryLoop(serverlist);
-                break;
-        case sl_connecting:
-                return ServerListStartQuery(serverlist, 1);
-                break;
+                return ServerListLANList(serverlist, slsocket);
     }
 
+    return 0;
+}
+
+/* ServerListHasFinishedFetchingList
+------------------
+Whether or not the list has finished fetching */
+static gbool ServerListHasFinishedFetchingList(GServerList serverlist)
+{
+    int i;
+
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        if (serverlist->slsockets[i].s != INVALID_SOCKET) {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+/* ServerListThink
+------------------
+For use with Async Updates. This needs to be called every ~10ms for list processing and
+updating to occur during async server list updates */
+GError ServerListThink(GServerList serverlist)
+{
+    int i;
+
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        ServerListThinkSocket(serverlist, &serverlist->slsockets[i]);
+    }
+
+    switch(serverlist->state)
+    {
+        case sl_idle:
+        case sl_listxfer:
+            if (!serverlist->abortupdate) {
+                if (serverlist->startslindex < ServerListGetNumMasters()) {
+                    CreateServerListForAvailableSockets(serverlist, serverlist->async);
+                } else if (serverlist->state == sl_listxfer && ServerListHasFinishedFetchingList(serverlist)) {
+                    ServerListModeChange(serverlist, sl_idle);
+                }
+            }
+            break;
+        case sl_querying: 
+            //do some queries
+            return ServerListQueryLoop(serverlist);
+        break;
+        default: break;
+    }
 
     return 0;
 }
diff --git a/code/gamespy/q_gamespy.c b/code/gamespy/q_gamespy.c
index 3e3de151..69d98981 100644
--- a/code/gamespy/q_gamespy.c
+++ b/code/gamespy/q_gamespy.c
@@ -23,22 +23,148 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #pragma once
 
 #include "q_gamespy.h"
+#include "../qcommon/qcommon.h"
+#include "cl_gamespy.h"
+#include "sv_gamespy.h"
+
+#define MAX_MASTERS           8
+#define MASTER_DEFAULT_MSPORT 28900
+#define MASTER_DEFAULT_HBPORT 27900
+
+cvar_t *com_master_host[MAX_MASTERS];
+cvar_t *com_master_msport[MAX_MASTERS];
+cvar_t *com_master_hbport[MAX_MASTERS];
+
+master_entry_t entries[MAX_MASTERS];
+int            num_entries = 0;
+
+static void Com_RestartGameSpy_f(void);
+
+static qboolean ShouldRefreshMasters()
+{
+    int i;
+
+    for (i = 0; i < MAX_MASTERS; i++) {
+        if (com_master_host[i] && com_master_host[i]->latchedString) {
+            return qtrue;
+        }
+        if (com_master_msport[i] && com_master_msport[i]->latchedString) {
+            return qtrue;
+        }
+        if (com_master_hbport[i] && com_master_hbport[i]->latchedString) {
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+static void CreateMasterVar(int index, const char *host, int msport, int hbport)
+{
+    assert(index < MAX_MASTERS);
+
+    //
+    // These variables should be modified for testing purposes only.
+    // So prevent them to be saved in the configuration file.
+    //
+    com_master_host[index]   = Cvar_Get(va("com_master%d_host", index), host, CVAR_LATCH | CVAR_TEMP);
+    com_master_msport[index] = Cvar_Get(va("com_master%d_msport", index), va("%d", msport), CVAR_LATCH | CVAR_TEMP);
+    com_master_hbport[index] = Cvar_Get(va("com_master%d_hbport", index), va("%d", hbport), CVAR_LATCH | CVAR_TEMP);
+
+    com_master_host[index]->flags &= ~CVAR_ARCHIVE;
+    com_master_msport[index]->flags &= ~CVAR_ARCHIVE;
+    com_master_hbport[index]->flags &= ~CVAR_ARCHIVE;
+}
+
+qboolean Com_RefreshGameSpyMasters()
+{
+    int      msIndex = 0;
+    int      i;
+    qboolean shouldRestart;
+
+    shouldRestart = ShouldRefreshMasters();
+
+    //
+    // These masters come from the 333networks community and use the same software
+    // that emulate the GameSpy protocol -- see https://333networks.com/
+    // They are managed by different entities, are independent and sync with eachother.
+    //
+    CreateMasterVar(msIndex++, "master.333networks.com", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master.errorist.eu", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master.noccer.de", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master-au.unrealarchive.org", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master.frag-net.com", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+
+    for (; msIndex < MAX_MASTERS; msIndex++) {
+        CreateMasterVar(msIndex, "", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    }
+
+    num_entries = 0;
+
+    //
+    // Find and insert valid entries
+    //
+    for (i = 0; i < MAX_MASTER_SERVERS; i++) {
+        master_entry_t *entry = &entries[num_entries];
+
+        if (com_master_host[i]->string && com_master_host[i]->string[0]) {
+            entry->host      = com_master_host[i]->string;
+            entry->queryport = com_master_msport[i]->integer;
+            entry->hbport    = com_master_hbport[i]->integer;
+            num_entries++;
+        }
+    }
+
+    return shouldRestart;
+}
 
 void Com_InitGameSpy()
 {
+    Com_RefreshGameSpyMasters();
+
+    Cmd_AddCommand("net_gamespy_restart", Com_RestartGameSpy_f);
+}
+
+static void Com_RestartGameSpy_f(void)
+{
+    Com_RefreshGameSpyMasters();
+
+#ifndef DEDICATED
+    CL_RestartGamespy_f();
+#endif
+    SV_RestartGamespy_f();
+}
+
+unsigned int Com_GetNumMasterEntries()
+{
+    return num_entries;
+}
+
+void Com_GetMasterEntry(int index, master_entry_t *entry)
+{
+    if (index >= num_entries) {
+        entry->host      = NULL;
+        entry->hbport    = 0;
+        entry->queryport = 0;
+        return;
+    }
+
+    entry->host      = com_master_host[index]->string;
+    entry->queryport = com_master_msport[index]->integer;
+    entry->hbport    = com_master_hbport[index]->integer;
 }
 
 const char *Com_GetMasterHost()
 {
-    return "master.333networks.com";
+    return com_master_host[0]->string;
 }
 
 int Com_GetMasterQueryPort()
 {
-    return 28900;
+    return com_master_msport[0]->integer;
 }
 
 int Com_GetMasterHeartbeatPort()
 {
-    return 27900;
+    return com_master_hbport[0]->integer;
 }
diff --git a/code/gamespy/q_gamespy.h b/code/gamespy/q_gamespy.h
index 05ae0431..a60baa3e 100644
--- a/code/gamespy/q_gamespy.h
+++ b/code/gamespy/q_gamespy.h
@@ -24,8 +24,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
-void Com_InitGameSpy();
+#include "../qcommon/q_shared.h"
 
+typedef struct {
+    const char *host;
+    int queryport;
+    int hbport;
+} master_entry_t;
+
+void Com_InitGameSpy();
+qboolean Com_RefreshGameSpyMasters();
+
+unsigned int Com_GetNumMasterEntries();
+void Com_GetMasterEntry(int index, master_entry_t* entry);
 const char *Com_GetMasterHost();
 int Com_GetMasterQueryPort();
 int Com_GetMasterHeartbeatPort();
diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 334f6bf9..6f2cc451 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -34,8 +34,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 static char        gamemode[128];
 static qboolean    gcdInitialized = qfalse;
 static qboolean    gcdValid       = qfalse;
+static qboolean    gsRunning      = qfalse;
 extern GSIACResult __GSIACResult;
 
+cvar_t *net_ip           = NULL;
+cvar_t *net_gamespy_port = NULL;
+
 static const char *SECRET_GS_KEYS[] =
 {
     "M5Fdwc",
@@ -255,7 +259,7 @@ static void players_callback(char *outbuf, int maxlen, void *userdata)
             index,
             cl->ping
         );
-        
+
         if (currlen + infolen < maxlen) {
             strcat(outbuf, infostring);
             currlen += infolen;
@@ -302,6 +306,12 @@ void SV_ShutdownGamespy()
         return;
     }
 
+    if (!gsRunning) {
+        // Added in OPM
+        //  Gamespy is not running
+        return;
+    }
+
     strcpy(gamemode, "exiting");
 
     if (gcdInitialized) {
@@ -311,12 +321,12 @@ void SV_ShutdownGamespy()
 
     qr_send_statechanged(NULL);
     qr_shutdown(NULL);
+
+    gsRunning = qfalse;
 }
 
 qboolean SV_InitGamespy()
 {
-    cvar_t     *net_ip;
-    cvar_t     *net_gamespy_port;
     char        secret_key[9];
     const char *secret_gs_key;
     const char *gs_game_name;
@@ -378,6 +388,8 @@ qboolean SV_InitGamespy()
         gcdInitialized = qtrue;
     }
 
+    gsRunning = qtrue;
+
     return qtrue;
 }
 
@@ -503,12 +515,57 @@ void SV_GamespyAuthorize(netadr_t from, const char *response)
     }
 }
 
-const char *qr_get_master_host()
+void SV_RestartGamespy()
 {
-    return Com_GetMasterHost();
+    if (gsRunning) {
+        //
+        // Reinitialize Gamespy
+        //
+        SV_ShutdownGamespy();
+        SV_InitGamespy();
+    }
 }
 
-int qr_get_master_port()
+void SV_RestartGamespy_f()
 {
-    return Com_GetMasterHeartbeatPort();
+    SV_RestartGamespy();
+}
+
+void SV_TryRestartGamespy()
+{
+    if (Com_RefreshGameSpyMasters()) {
+        SV_RestartGamespy();
+        return;
+    }
+
+    if (net_gamespy_port && net_gamespy_port->latchedString) {
+        SV_RestartGamespy();
+        return;
+    }
+
+    if (sv_gamespy && sv_gamespy->latchedString) {
+        SV_RestartGamespy();
+        return;
+    }
+}
+
+unsigned int qr_get_num_masters()
+{
+    return Com_GetNumMasterEntries();
+}
+
+const char *qr_get_master_host(int index)
+{
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.host;
+}
+
+int qr_get_master_port(int index)
+{
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.hbport;
 }
diff --git a/code/gamespy/sv_gamespy.h b/code/gamespy/sv_gamespy.h
index dc033679..769a8afe 100644
--- a/code/gamespy/sv_gamespy.h
+++ b/code/gamespy/sv_gamespy.h
@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
+#include "q_gamespy.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,6 +39,13 @@ extern const char* GS_GetCurrentGameName();
 
 void SV_CreateGamespyChallenge(char* challenge);
 void SV_GamespyAuthorize(netadr_t from, const char* response);
+void SV_GamespyHeartbeat();
+void SV_ProcessGamespyQueries();
+qboolean SV_InitGamespy();
+void SV_ShutdownGamespy();
+void SV_RestartGamespy();
+void SV_RestartGamespy_f();
+void SV_TryRestartGamespy();
 
 #ifdef __cplusplus
 }
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 44fd0efd..0196a538 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -163,9 +163,11 @@ struct qr_implementation_s static_rec = {INVALID_SOCKET, INVALID_SOCKET};
 static qr_t current_rec = &static_rec;
 //char qr_hostname[64] = MASTER_ADDR;
 
-static struct sockaddr_in MasterList[8];
+//static struct sockaddr_in MasterList[8];
+static struct sockaddr_in *MasterList = NULL;
 static char keyvalue[8192];
 static int MasterCount;
+static int MasterMaxCount;
 
 /********
 PROTOTYPES
@@ -173,6 +175,7 @@ PROTOTYPES
 static void send_heartbeat(qr_t qrec, int statechanged);
 static void qr_parse_query(qr_t qrec, char* query, int len, struct sockaddr* sender);
 static int do_connect(SOCKET sock, char* addr, int port, struct sockaddr_in* hbaddr);
+static int do_connect_multi();
 void qr_check_queries(qr_t qrec);
 void qr_check_send_heartbeat(qr_t qrec);
 
@@ -270,7 +273,7 @@ int qr_init(qr_t* qrec,
         qrec = &current_rec;
     }
 
-    return do_connect(hbsock, MASTER_ADDR, MASTER_PORT, &(*qrec)->hbaddr);
+    return do_connect_multi();
 }
 
 void init_qrec(qr_t* qrec,
@@ -339,7 +342,7 @@ int qr_init_socket(qr_t* qrec,
               qr_players_callback,
               userdata);
 
-    return do_connect(s, MASTER_ADDR, MASTER_PORT, &(*qrec)->hbaddr);
+    return do_connect_multi();
 }
 
 /* qr_process_queries: Processes any waiting queries, and sends a
@@ -445,6 +448,14 @@ void qr_shutdown(qr_t qrec)
     {
         gsifree(qrec);
     }
+    
+    if (MasterList) {
+        gsifree(MasterList);
+        MasterList = NULL;
+    }
+
+    MasterCount = 0;
+
     SocketShutDown();
 }
 
@@ -469,6 +480,30 @@ static int do_connect(SOCKET sock, char* addr, int port, struct sockaddr_in* hba
     return 0;
 }
 
+static int do_connect_multi()
+{
+    int i;
+
+    MasterMaxCount = qr_get_num_masters();
+    if (MasterList) {
+        gsifree(MasterList);
+        MasterList = NULL;
+    }
+
+    MasterList = gsimalloc(sizeof(struct sockaddr_in) * MasterMaxCount);
+    MasterCount = 0;
+
+    for(i = 0; i < MasterMaxCount; i++) {
+        struct sockaddr_in hbaddr;
+        if (get_sockaddrin(qr_get_master_host(i), qr_get_master_port(i), &hbaddr, NULL)) {
+            // Valid, add it
+            add_master(&hbaddr);
+        }
+    }
+
+    return 0;
+}
+
 /* Return a sockaddrin for the given host (numeric or DNS) and port)
 Returns the hostent in savehent if it is not NULL */
 int get_sockaddrin(const char* host, int port, struct sockaddr_in* saddr, struct hostent** savehent)
@@ -817,7 +852,7 @@ void add_master(struct sockaddr_in* addr)
             return;
         }
     }
-    if (i == 8) {
+    if (i == MasterMaxCount) {
         return;
     } else {
         MasterList[i] = *addr;
diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index e41fbeab..23823568 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -65,9 +65,9 @@ as the base port. Generally there is no reason to modify this value.
 /********
 DEFINES
 ********/
-#define MASTER_PORT     qr_get_master_port()
+#define MASTER_PORT     qr_get_master_port(0)
 //#define MASTER_ADDR     "master." GSI_DOMAIN_NAME
-#define MASTER_ADDR     qr_get_master_host()
+#define MASTER_ADDR     qr_get_master_host(0)
 #define FIRST_HB_TIME   30000  /* 30 sec */
 #define HB_TIME         300000 /* 5 minutes */
 #define MAX_FIRST_COUNT 10     /* 10 tries = 5 minutes */
@@ -86,8 +86,9 @@ extern char qr_hostname[64];
  * 
  * @return const char* The full master server address
  */
-extern const char *qr_get_master_host();
-extern int qr_get_master_port();
+extern unsigned int qr_get_num_masters();
+extern const char *qr_get_master_host(int index);
+extern int qr_get_master_port(int index);
 
 /********
 qr_querycallback_t
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index e25a10e8..e6018259 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -1996,6 +1996,8 @@ void Com_Init( char *commandLine ) {
 
 	RecoverLostAutodialData();
 
+    // Added in OPM
+    //  Initialize GameSpy related stuff
     Com_InitGameSpy();
 
 	iEnd = Sys_Milliseconds();
diff --git a/code/server/server.h b/code/server/server.h
index 07c593b3..0dba4254 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -633,14 +633,6 @@ void SV_NET_UpdateClientNetProfileInfo(netprofclient_t* netprofile, int rate);
 void SV_NET_UpdateAllNetProfileInfo();
 void SV_NET_CalcTotalNetProfile(netprofclient_t* netprofile, qboolean server);
 
-//
-// sv_gamespy.c
-//
-void SV_GamespyHeartbeat();
-void SV_ProcessGamespyQueries();
-qboolean SV_InitGamespy();
-void SV_ShutdownGamespy();
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 3686f3b7..fb45591a 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../client/client.h"
 #include "../qcommon/tiki.h"
 #include "../qcommon/bg_compat.h"
+#include "../gamespy/sv_gamespy.h"
 
 static char last_mapname[ MAX_QPATH ];
 static int g_iSvsTimeFixupCount;